diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index ac9a2e75218..ff261bad783 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,7 +3,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}
 
 USER vscode
 
-RUN curl -sSf https://rye.astral.sh/get | RYE_VERSION="0.35.0" RYE_INSTALL_OPTION="--yes" bash
+RUN curl -sSf https://rye.astral.sh/get | RYE_VERSION="0.44.0" RYE_INSTALL_OPTION="--yes" bash
 ENV PATH=/home/vscode/.rye/shims:$PATH
 
-RUN echo "[[ -d .venv ]] && source .venv/bin/activate" >> /home/vscode/.bashrc
+RUN echo "[[ -d .venv ]] && source .venv/bin/activate || export PATH=\$PATH" >> /home/vscode/.bashrc
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index bbeb30b148c..c17fdc169fc 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -24,6 +24,9 @@
         }
       }
     }
+  },
+  "features": {
+    "ghcr.io/devcontainers/features/node:1": {}
   }
 
   // Features to add to the dev container. More info: https://containers.dev/features.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 00000000000..0b518c0c98b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,60 @@
+name: Bug report
+description: Report an issue or bug with this library
+labels: ['bug']
+body:
+  - type: checkboxes
+    id: non_api
+    attributes:
+      label: Confirm this is a Python library issue and not an underlying Cloudflare API issue.
+      description: Issues with the underlying Cloudflare API should be reported via [Cloudflare Support](https://developers.cloudflare.com/support/contacting-cloudflare-support)
+      options:
+        - label: This is an issue with the Python library
+          required: true
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is, and any additional context.
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+  - type: textarea
+    id: repro-steps
+    attributes:
+      label: To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. Fetch a '...'
+        2. Update the '....'
+        3. See error
+    validations:
+      required: true
+  - type: textarea
+    id: code-snippets
+    attributes:
+      label: Code snippets
+      description: If applicable, add code snippets to help explain your problem.
+      render: Python
+    validations:
+      required: false
+  - type: input
+    id: os
+    attributes:
+      label: OS
+      placeholder: macOS
+    validations:
+      required: true
+  - type: input
+    id: language-version
+    attributes:
+      label: Python version
+      placeholder: 3.9.0
+    validations:
+      required: true
+  - type: input
+    id: lib-version
+    attributes:
+      label: Library version
+      placeholder: v4.0.0
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 0431334981b..83bedae0dfc 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,9 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: v3.0.0 Beta feedback
-    url: https://github.com/cloudflare/cloudflare-python/discussions/116
-    about: |
-      If you have a feature request or feedback on our new v3 library, please comment in our discussion page.
   - name: Cloudflare support
     url: https://developers.cloudflare.com/support/contacting-cloudflare-support
     about: |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 05859c4703a..0722c756e37 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,12 +2,16 @@ name: CI
 
 on:
   push:
-    branches:
-      - main
+    branches-ignore:
+      - 'generated'
+      - 'codegen/**'
+      - 'integrated/**'
+      - 'stl-preview-head/**'
+      - 'stl-preview-base/**'
   pull_request:
-    branches:
-      - main
-      - next
+    branches-ignore:
+      - 'stl-preview-head/**'
+      - 'stl-preview-base/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -15,19 +19,19 @@ concurrency:
 
 jobs:
   lint:
+    timeout-minutes: 10
     name: lint
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-
+    runs-on: ${{ github.repository == 'stainless-sdks/cloudflare-python' && 'depot-ubuntu-24.04' || 'ubuntu-latest' }}
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.fork
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Install Rye
         run: |
           curl -sSf https://rye.astral.sh/get | bash
           echo "$HOME/.rye/shims" >> $GITHUB_PATH
         env:
-          RYE_VERSION: '0.35.0'
+          RYE_VERSION: '0.44.0'
           RYE_INSTALL_OPTION: '--yes'
 
       - name: Install dependencies
@@ -35,20 +39,61 @@ jobs:
 
       - name: Run lints
         run: ./scripts/lint
+
+  build:
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.fork
+    timeout-minutes: 10
+    name: build
+    permissions:
+      contents: read
+      id-token: write
+    runs-on: ${{ github.repository == 'stainless-sdks/cloudflare-python' && 'depot-ubuntu-24.04' || 'ubuntu-latest' }}
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Install Rye
+        run: |
+          curl -sSf https://rye.astral.sh/get | bash
+          echo "$HOME/.rye/shims" >> $GITHUB_PATH
+        env:
+          RYE_VERSION: '0.44.0'
+          RYE_INSTALL_OPTION: '--yes'
+
+      - name: Install dependencies
+        run: rye sync --all-features
+
+      - name: Run build
+        run: rye build
+
+      - name: Get GitHub OIDC Token
+        if: github.repository == 'stainless-sdks/cloudflare-python'
+        id: github-oidc
+        uses: actions/github-script@v6
+        with:
+          script: core.setOutput('github_token', await core.getIDToken());
+
+      - name: Upload tarball
+        if: github.repository == 'stainless-sdks/cloudflare-python'
+        env:
+          URL: https://pkg.stainless.com/s
+          AUTH: ${{ steps.github-oidc.outputs.github_token }}
+          SHA: ${{ github.sha }}
+        run: ./scripts/utils/upload-artifact.sh
+
   test:
-    name: test
-    runs-on: ubuntu-latest
     timeout-minutes: 30
-
+    name: test
+    runs-on: ${{ github.repository == 'stainless-sdks/cloudflare-python' && 'depot-ubuntu-24.04' || 'ubuntu-latest' }}
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.fork
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Install Rye
         run: |
           curl -sSf https://rye.astral.sh/get | bash
           echo "$HOME/.rye/shims" >> $GITHUB_PATH
         env:
-          RYE_VERSION: '0.35.0'
+          RYE_VERSION: '0.44.0'
           RYE_INSTALL_OPTION: '--yes'
 
       - name: Bootstrap
@@ -56,20 +101,22 @@ jobs:
 
       - name: Run tests
         run: ./scripts/test
+
   examples:
+    timeout-minutes: 10
     name: examples
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
+    runs-on: ${{ github.repository == 'stainless-sdks/cloudflare-python' && 'depot-ubuntu-24.04' || 'ubuntu-latest' }}
+    if: github.repository == 'cloudflare/cloudflare-python' && (github.event_name == 'push' || github.event.pull_request.head.repo.fork)
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Install Rye
         run: |
           curl -sSf https://rye.astral.sh/get | bash
           echo "$HOME/.rye/shims" >> $GITHUB_PATH
         env:
-          RYE_VERSION: '0.35.0'
+          RYE_VERSION: '0.44.0'
           RYE_INSTALL_OPTION: '--yes'
       - name: Install dependencies
         run: |
@@ -78,7 +125,8 @@ jobs:
       - env:
           CLOUDFLARE_ACCOUNT_ID: f037e56e89293a057740de681ac9abbe
           CLOUDFLARE_EMAIL: terraform-acceptance-test@cfapi.net
-          CLOUDFLARE_ZONE_ID: 0da42c8d2132a9ddaf714f9e7c92011
+          CLOUDFLARE_ZONE_ID: 0da42c8d2132a9ddaf714f9e7c920711
           CLOUDFLARE_API_KEY: ${{ secrets.CLOUDFLARE_API_KEY }}
         run: |
-            rye run python ./examples/workers/ai/demo.py
+            rye run python ./examples/ai/demo.py
+            rye run python ./examples/dns/record.py
diff --git a/.github/workflows/detect-breaking-changes.yml b/.github/workflows/detect-breaking-changes.yml
new file mode 100644
index 00000000000..b1ee63a0dd7
--- /dev/null
+++ b/.github/workflows/detect-breaking-changes.yml
@@ -0,0 +1,44 @@
+name: CI
+on:
+  pull_request:
+    branches:
+      - main
+      - next
+
+jobs:
+  detect_breaking_changes:
+    runs-on: 'ubuntu-latest'
+    name: detect-breaking-changes
+    if: false
+    permissions:
+      contents: read
+    steps:
+      - name: Calculate fetch-depth
+        run: |
+          echo "FETCH_DEPTH=$(expr ${{ github.event.pull_request.commits }} + 1)" >> $GITHUB_ENV
+
+      - uses: actions/checkout@v6
+        with:
+          # Ensure we can check out the pull request base in the script below.
+          fetch-depth: ${{ env.FETCH_DEPTH }}
+
+      - name: Install Rye
+        run: |
+          curl -sSf https://rye.astral.sh/get | bash
+          echo "$HOME/.rye/shims" >> $GITHUB_PATH
+        env:
+          RYE_VERSION: '0.44.0'
+          RYE_INSTALL_OPTION: '--yes'
+      - name: Install dependencies
+        run: |
+          rye sync --all-features
+      - name: Detect removed symbols
+        run: |
+          rye run python scripts/detect-breaking-changes.py "${{ github.event.pull_request.base.sha }}"
+
+      - name: Detect breaking changes
+        run: |
+          # Try to check out previous versions of the breaking change detection script. This ensures that
+          # we still detect breaking changes when entire files and their tests are removed.
+          git checkout "${{ github.event.pull_request.base.sha }}" -- ./scripts/detect-breaking-changes 2>/dev/null || true
+          ./scripts/detect-breaking-changes ${{ github.event.pull_request.base.sha }}
\ No newline at end of file
diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml
index 60c0cde4031..b711a25bda7 100644
--- a/.github/workflows/publish-pypi.yml
+++ b/.github/workflows/publish-pypi.yml
@@ -14,14 +14,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Install Rye
         run: |
           curl -sSf https://rye.astral.sh/get | bash
           echo "$HOME/.rye/shims" >> $GITHUB_PATH
         env:
-          RYE_VERSION: '0.35.0'
+          RYE_VERSION: '0.44.0'
           RYE_INSTALL_OPTION: '--yes'
 
       - name: Publish to PyPI
diff --git a/.github/workflows/release-doctor.yml b/.github/workflows/release-doctor.yml
index 1c932dfe391..41be236b980 100644
--- a/.github/workflows/release-doctor.yml
+++ b/.github/workflows/release-doctor.yml
@@ -2,6 +2,8 @@ name: Release Doctor
 
 on:
   pull_request:
+    branches:
+      - main
   workflow_dispatch:
 
 concurrency:
@@ -16,7 +18,7 @@ jobs:
     if: github.repository == 'cloudflare/cloudflare-python' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || startsWith(github.head_ref, 'release-please') || github.head_ref == 'next')
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Check release environment
         run: |
diff --git a/.gitignore b/.gitignore
index 87797408001..95ceb189aa4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 .prism.log
-.vscode
 _dev
 
 __pycache__
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index b4b8d0ff516..1aa8e3f282a 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "3.1.1"
-}
+  ".": "5.0.0-beta.1"
+}
\ No newline at end of file
diff --git a/.stats.yml b/.stats.yml
index 21a17687b3f..2dc0294f22e 100644
--- a/.stats.yml
+++ b/.stats.yml
@@ -1,2 +1,4 @@
-configured_endpoints: 1256
-openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-923d8c7667b68c786e6c026c4f4851798943c7d68ea055c0043d9253413c5847.yml
+configured_endpoints: 2015
+openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-83f49bc3fa9273ef989d3e8bcd27f6fdaa7d04ae2519a91f4878f46acc501bb9.yml
+openapi_spec_hash: 3f4be3af6f51eea4787dc8345f9ca9c1
+config_hash: 9d1829ed664bb3efa8638f98bb32cf46
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000000..5b01030785f
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "python.analysis.importFormat": "relative",
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb4dcb40087..13307919a9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,652 @@
 # Changelog
 
+## 5.0.0-beta.1 (2026-02-13)
+
+Full Changelog: [v4.3.1...v5.0.0-beta.1](https://github.com/cloudflare/cloudflare-python/compare/v4.3.1...v5.0.0-beta.1)
+
+### Features
+
+* chore: IAC-312 update Pages models to ref renamed components ([1f77935](https://github.com/cloudflare/cloudflare-python/commit/1f7793527f61ab9d02cea60b1cb4acce4316c6dd))
+* chore: skip ai.tomarkdown prism tests ([42c44fb](https://github.com/cloudflare/cloudflare-python/commit/42c44fbe37f6f7aa6294c42e4fd8276682cf5f17))
+* chore: skip unsupported auth tests ([322d3f1](https://github.com/cloudflare/cloudflare-python/commit/322d3f12f4ccbbb0c7bac84ac9857b7170593fa5))
+* chore: use 'next' branch for go_sdk_version ([e311a42](https://github.com/cloudflare/cloudflare-python/commit/e311a428faedb698d15c2b898c9b0c65077f1158))
+* chore(abuse_report): unsupported auth scheme ([8b51de3](https://github.com/cloudflare/cloudflare-python/commit/8b51de36d9e5ce5d82bfbae12d0c46f9182c0544))
+* chore(abuse): rename path parameter ([dd0b6fb](https://github.com/cloudflare/cloudflare-python/commit/dd0b6fbd8042a4cde1625d945369b28d6e69bbb0))
+* docs: Deprecate API Shield Schema Validation resources ([40082c2](https://github.com/cloudflare/cloudflare-python/commit/40082c20665a01b760c0ad0057af417c6e942c01))
+* docs: WC-4152 Expose subdomain delete for workers ([fd04baa](https://github.com/cloudflare/cloudflare-python/commit/fd04baa03e03fe1601a0d3db991ddad1f4267f7d))
+* docs(zero_trust_gateway_policy): add /rules/tenants endpoint to Gateway API docs ([3c18fd3](https://github.com/cloudflare/cloudflare-python/commit/3c18fd307d5cf804eb9d68c8474d5ecc5f481a3e))
+* feat: add connectivity directory service APIs to openapi.stainless.yml ([fc06837](https://github.com/cloudflare/cloudflare-python/commit/fc06837d768b4291bbaa1d9a5e0d3303d0a82ba1))
+* feat: Add token validation to stainless config ([a1ddf7e](https://github.com/cloudflare/cloudflare-python/commit/a1ddf7ef6249fb36530a787bfa5987d1ce488e7f))
+* feat: DLP-3878 Switch DLP Predefined Profile endpoints ([43e4f93](https://github.com/cloudflare/cloudflare-python/commit/43e4f93b715142791c7fe39dd248e8592d978f34))
+* feat(abuse_reports): add abuse mitigations in Client API ([ce4789c](https://github.com/cloudflare/cloudflare-python/commit/ce4789cabe80d5833e3393fcd93c92d191c8d5f5))
+* feat(abuse_reports): Expose new abuse report endpoints. GET and LIST. ([b0fc29f](https://github.com/cloudflare/cloudflare-python/commit/b0fc29f708cd4c2fb4237dbe74959ff2b22dcac2))
+* feat(api): add AI Gateway Dynamic Routing endpoints ([db75dd8](https://github.com/cloudflare/cloudflare-python/commit/db75dd838142adbec3d22d28a111574dfd476a2b))
+* feat(api): add mcp portals endpoints ([70e068e](https://github.com/cloudflare/cloudflare-python/commit/70e068e9497013d0c8d8e7689ae87b3beafeeb46))
+* feat(api): RAG-395: add AI Search endpoints ([43a4557](https://github.com/cloudflare/cloudflare-python/commit/43a45575096e189de0cf3009fdd3caaf36fdd20f))
+* feat(api): RAG-586: enable terraform for AI Search instances and tokens ([f5c0d88](https://github.com/cloudflare/cloudflare-python/commit/f5c0d886a357bd3b5f8d565d0af62183edd5b0e2))
+* feat(d1): Add time travel `get_bookmark` and `restore` endpoints ([f2464a6](https://github.com/cloudflare/cloudflare-python/commit/f2464a663b082db061da32a6a50126095099e0bb))
+* feat(fraud): public docs for fraud API ([fd98170](https://github.com/cloudflare/cloudflare-python/commit/fd981700eda867a7bc37e087be5e68bb299963a3))
+* feat(iam): Add SSO Connectors resource to SDKs ([77960c9](https://github.com/cloudflare/cloudflare-python/commit/77960c9620d293937886791fb8c72b43abc1e19e))
+* feat(leaked_credentials_check): Add GET endpoint for leaked_credentials_check/detections ([2f1981a](https://github.com/cloudflare/cloudflare-python/commit/2f1981ab773104a1156e6d80b333274f955eb020))
+* feat(mcp_portals): enable sdks generation ([6965762](https://github.com/cloudflare/cloudflare-python/commit/69657624f4f9f83a41de3f4e927a047d798ca89e))
+* feat(pipelines): Configure SDKs/Terraform to use the new Pipelines, Streams, Sinks routes ([008556f](https://github.com/cloudflare/cloudflare-python/commit/008556f6aa27c2292c24c5ff368f37cce91e2e5b))
+* feat(r2_data_catalog): Configure SDKs/Terraform to use R2 Data Catalog routes ([385fea6](https://github.com/cloudflare/cloudflare-python/commit/385fea63a0a62eefe791920a946d0704c7c790db))
+* feat(radar): add BGP RPKI ASPA endpoints and fix SDK casings ([4146d0d](https://github.com/cloudflare/cloudflare-python/commit/4146d0dab88e791211bfd06c83129ebf8fc1835c))
+* feat(radar): add new group by dimension endpoints; deprecate to_markdown endpoint ([845fba2](https://github.com/cloudflare/cloudflare-python/commit/845fba278d6d58c6b4b8de8fa54d02efdc4dddee))
+* feat(silences): add a new alert silencing api ([1c555af](https://github.com/cloudflare/cloudflare-python/commit/1c555aff6759e40aeaf684ded92e51a2e4400345))
+* feat(tomarkdown): add new markdown supported endpoint ([6a4f824](https://github.com/cloudflare/cloudflare-python/commit/6a4f824f942f35cc8467cdaf950cfb2af4017949))
+* fix: Correctly reflect schema validation model <-> openapi mapping ([01fb118](https://github.com/cloudflare/cloudflare-python/commit/01fb1181dd1aedb409872013251a77912f00476b))
+* fix: move wvpc ([c357dad](https://github.com/cloudflare/cloudflare-python/commit/c357dadc80540a78f7505bc8f8dbcd2f1da69070))
+* fix: tabbing on realtime-kit api resources ([a4762dd](https://github.com/cloudflare/cloudflare-python/commit/a4762dd21ecf123322f80c7cba7f2caa5021efe2))
+* fix: unsupported auth scheme ([292a780](https://github.com/cloudflare/cloudflare-python/commit/292a7807015f76384abe88b86034bc5d1796a51b))
+* fix(ai_controls): incorrect use of standalone_api ([ebcb1d6](https://github.com/cloudflare/cloudflare-python/commit/ebcb1d6d9124a355b06ce80efb8869635bae5e3f))
+* fix(kv): use cursor_limit_pagination for KV list keys endpoint ([fc39041](https://github.com/cloudflare/cloudflare-python/commit/fc39041cfc7c93f3f063b2a016347e043d30a60c))
+* fix(total_tls): use upsert pattern for singleton zone setting ([f4f5156](https://github.com/cloudflare/cloudflare-python/commit/f4f51568c7bb95b99e92b5e867f98e4e96d4d538))
+* refactor(terraform): restructure origin_tls_client_auth to peer subresources ([00a2dec](https://github.com/cloudflare/cloudflare-python/commit/00a2decaebf66b8303de8d2c1e92c2f899d1d50e))
+
+
+### Bug Fixes
+
+* addressing issues in error handling for example script upload ([e3ea504](https://github.com/cloudflare/cloudflare-python/commit/e3ea504c648e1655b51d746fa7030df154d52c87))
+* lint ([b2cfe5e](https://github.com/cloudflare/cloudflare-python/commit/b2cfe5e773ebc2280795ad7e3ea3b5bac03891a2))
+* **types:** allow pyright to infer TypedDict types within SequenceNotStr ([5b81cac](https://github.com/cloudflare/cloudflare-python/commit/5b81cac7357d7699cd64425dc8ed983c3f5d6e21))
+
+
+### Chores
+
+* add missing docstrings ([f109470](https://github.com/cloudflare/cloudflare-python/commit/f1094708108fdc4fd20be9558da5a63791267746))
+* **api:** update composite API spec ([8f3ac3d](https://github.com/cloudflare/cloudflare-python/commit/8f3ac3d78abd667f0f513026ada715145db53d97))
+* **api:** update composite API spec ([f59a327](https://github.com/cloudflare/cloudflare-python/commit/f59a32729d5a0e3cc910bfbbce825365408d4f43))
+* **api:** update composite API spec ([44ae23e](https://github.com/cloudflare/cloudflare-python/commit/44ae23e668d8e78733e0c790d3cdfa5d0b828456))
+* **api:** update composite API spec ([2938b45](https://github.com/cloudflare/cloudflare-python/commit/2938b459e52c5fc3d3f90fbfbf7a25e86f2f8b4c))
+* **api:** update composite API spec ([63a5a9b](https://github.com/cloudflare/cloudflare-python/commit/63a5a9b8927addd36909719ef2c37f43592fc717))
+* **api:** update composite API spec ([3964451](https://github.com/cloudflare/cloudflare-python/commit/39644511ae930fe0654ed6c71367b2b2c0792690))
+* **api:** update composite API spec ([7c35696](https://github.com/cloudflare/cloudflare-python/commit/7c35696aacd53eda55f7afed449614dc9051607f))
+* **api:** update composite API spec ([ee266ad](https://github.com/cloudflare/cloudflare-python/commit/ee266ad2d14f1c00cc746e84bbe405cf2f71ffb9))
+* **api:** update composite API spec ([1cfeef4](https://github.com/cloudflare/cloudflare-python/commit/1cfeef43b5baea7c9e82341236049332e0cab369))
+* **api:** update composite API spec ([e4f787b](https://github.com/cloudflare/cloudflare-python/commit/e4f787b60357b0d9c91450378d6d8320effc8a68))
+* **api:** update composite API spec ([3b3e2d5](https://github.com/cloudflare/cloudflare-python/commit/3b3e2d5fe6f0f1b2f5be2e2ff2f25e2d59832a1a))
+* **api:** update composite API spec ([05e0e8a](https://github.com/cloudflare/cloudflare-python/commit/05e0e8a25f0c69e3f6475b70dd685886e4ff748a))
+* **api:** update composite API spec ([716ad5a](https://github.com/cloudflare/cloudflare-python/commit/716ad5a10b16be431dd4e7f086e2609f3ddf3287))
+* **api:** update composite API spec ([fdf3c53](https://github.com/cloudflare/cloudflare-python/commit/fdf3c53ebd686a638c148b594c40dbbc66878df6))
+* **api:** update composite API spec ([c5f5b46](https://github.com/cloudflare/cloudflare-python/commit/c5f5b4689841964444568309925a75f7d44a7106))
+* **api:** update composite API spec ([9468e7b](https://github.com/cloudflare/cloudflare-python/commit/9468e7b0127a3f42f699f9e8fa497883b5cbf667))
+* **api:** update composite API spec ([249fdaa](https://github.com/cloudflare/cloudflare-python/commit/249fdaabf3eccd032b4585a2d529319b624e7009))
+* **api:** update composite API spec ([19ae710](https://github.com/cloudflare/cloudflare-python/commit/19ae710f5a5be1fa2319377d6e311df8ac935b98))
+* **api:** update composite API spec ([9c3c799](https://github.com/cloudflare/cloudflare-python/commit/9c3c799f1ef7ebec5027205d2e975f1bb01331f4))
+* **api:** update composite API spec ([8462991](https://github.com/cloudflare/cloudflare-python/commit/84629915cdd6ed83dc4d4450701723e2cb227f15))
+* **api:** update composite API spec ([a1a9301](https://github.com/cloudflare/cloudflare-python/commit/a1a93016fb248072b68f97d2c6b5c2dc1a36f870))
+* **api:** update composite API spec ([7f435a6](https://github.com/cloudflare/cloudflare-python/commit/7f435a66ad6092c023bb9fa573ca7017b0732536))
+* **api:** update composite API spec ([76513bf](https://github.com/cloudflare/cloudflare-python/commit/76513bfd2cd1a14c2afb3a65f650e1a0edf2749e))
+* **api:** update composite API spec ([4540857](https://github.com/cloudflare/cloudflare-python/commit/4540857c66063e39e4629642d2b2917f40c73b20))
+* **api:** update composite API spec ([640eb58](https://github.com/cloudflare/cloudflare-python/commit/640eb586205bfd8bf88d515ede14028dc2f9fff9))
+* **api:** update composite API spec ([606e4de](https://github.com/cloudflare/cloudflare-python/commit/606e4de5f24a19a7e10fe8824319aa98fe439202))
+* **api:** update composite API spec ([be9579e](https://github.com/cloudflare/cloudflare-python/commit/be9579e6ec8271281f8497e67ec1f7ab76109b3c))
+* **api:** update composite API spec ([ef37bfc](https://github.com/cloudflare/cloudflare-python/commit/ef37bfc0eb3a5dd8f0bdb91d4e6bdf00f9a6b071))
+* **api:** update composite API spec ([f4cc575](https://github.com/cloudflare/cloudflare-python/commit/f4cc575aa429651cf7141fb47f542f1d8cab9a72))
+* **api:** update composite API spec ([0f87157](https://github.com/cloudflare/cloudflare-python/commit/0f8715705d70c0fe7f02f52ae605ce650486e6c5))
+* **api:** update composite API spec ([ac247ff](https://github.com/cloudflare/cloudflare-python/commit/ac247fffebbcbfff58ef6862247f2b72ff74c6f8))
+* **api:** update composite API spec ([3186483](https://github.com/cloudflare/cloudflare-python/commit/318648332d360503d6e0e1738d4ca87202535a96))
+* **api:** update composite API spec ([7464286](https://github.com/cloudflare/cloudflare-python/commit/7464286b3544db010af78b14ebec2e02609ddc75))
+* **api:** update composite API spec ([064478c](https://github.com/cloudflare/cloudflare-python/commit/064478cd35708cb0eb78b35abc5f4636bd514037))
+* **api:** update composite API spec ([a59d1b6](https://github.com/cloudflare/cloudflare-python/commit/a59d1b68755b777fc8a17018cb062d1a33db723a))
+* **api:** update composite API spec ([f5ca4cc](https://github.com/cloudflare/cloudflare-python/commit/f5ca4ccc70428b1e7614420defbde2a463091456))
+* **api:** update composite API spec ([622f384](https://github.com/cloudflare/cloudflare-python/commit/622f38474dcf9bd9e433189ac0e168c66dbebd7d))
+* **api:** update composite API spec ([64bc54f](https://github.com/cloudflare/cloudflare-python/commit/64bc54ff61983ffa129109dd013cf5bedd25d29d))
+* **api:** update composite API spec ([cb197df](https://github.com/cloudflare/cloudflare-python/commit/cb197dfe45ce225e6d441680e11260cb4c39d24f))
+* **api:** update composite API spec ([cd4f924](https://github.com/cloudflare/cloudflare-python/commit/cd4f924e73268c20f1af894dfd4707c8b18c955f))
+* **api:** update composite API spec ([4e9deac](https://github.com/cloudflare/cloudflare-python/commit/4e9deac8efe75518e113cc4d681929c5a1ae1d7d))
+* **api:** update composite API spec ([fee9ce0](https://github.com/cloudflare/cloudflare-python/commit/fee9ce09141ea3c314dfb6d746472e316e3b515d))
+* **api:** update composite API spec ([315c8eb](https://github.com/cloudflare/cloudflare-python/commit/315c8eb85a3f17299cd81a16ac092e4c85a012a5))
+* **api:** update composite API spec ([bb4311f](https://github.com/cloudflare/cloudflare-python/commit/bb4311fb705edab29746297b91f3478cd179afc8))
+* **api:** update composite API spec ([7e1d8b7](https://github.com/cloudflare/cloudflare-python/commit/7e1d8b72aff2b087f5e3a395a445573b74f0a2f7))
+* **api:** update composite API spec ([2cc2a3f](https://github.com/cloudflare/cloudflare-python/commit/2cc2a3fad9f2f1e9eeee0683a9cff9d330fd6357))
+* **api:** update composite API spec ([2cb9ef9](https://github.com/cloudflare/cloudflare-python/commit/2cb9ef9a29a81faff8fa34ee4e4edbe40f50d507))
+* **api:** update composite API spec ([7199aa3](https://github.com/cloudflare/cloudflare-python/commit/7199aa33f07a631aa066df6da6aa25a86bf3aca8))
+* **api:** update composite API spec ([46ce19f](https://github.com/cloudflare/cloudflare-python/commit/46ce19f5f170aa5b74c6071569666dd59186e3e9))
+* **api:** update composite API spec ([4900594](https://github.com/cloudflare/cloudflare-python/commit/49005943c184ab9f713e664434f05270ca97d619))
+* **api:** update composite API spec ([a009bd0](https://github.com/cloudflare/cloudflare-python/commit/a009bd0251a96e2eafee9411bbc669b82dfba342))
+* **api:** update composite API spec ([b07f0d6](https://github.com/cloudflare/cloudflare-python/commit/b07f0d6468e1cc1d8b5009b252b21a4d9bb0543d))
+* **api:** update composite API spec ([353e11e](https://github.com/cloudflare/cloudflare-python/commit/353e11eba442b1d75b1d42549abb26db9fe9f2c7))
+* **api:** update composite API spec ([b7c4b43](https://github.com/cloudflare/cloudflare-python/commit/b7c4b43635c91a1be5852d9542ca29362e80491b))
+* **api:** update composite API spec ([b8d1c66](https://github.com/cloudflare/cloudflare-python/commit/b8d1c661b9b34b6db72d65ef82db61494013b3ba))
+* **api:** update composite API spec ([93e3971](https://github.com/cloudflare/cloudflare-python/commit/93e39713d9e7d19cb67ec65a6fa9b5c9643d75ed))
+* **api:** update composite API spec ([3d5d0e0](https://github.com/cloudflare/cloudflare-python/commit/3d5d0e0407dec974128bcbf09d8c3b789b2dbcf6))
+* **api:** update composite API spec ([35670b1](https://github.com/cloudflare/cloudflare-python/commit/35670b1611cee8629a86f7e2795fac262dd3394f))
+* **api:** update composite API spec ([5fdf07b](https://github.com/cloudflare/cloudflare-python/commit/5fdf07be01036fb1c08e19f31c05ff995d75e01c))
+* **api:** update composite API spec ([2319591](https://github.com/cloudflare/cloudflare-python/commit/231959124ce85fd5cb6a2f639042459189f3626b))
+* **api:** update composite API spec ([3b70a95](https://github.com/cloudflare/cloudflare-python/commit/3b70a9544c85c451ba277875e1f6cb6188d866f3))
+* **api:** update composite API spec ([ea49058](https://github.com/cloudflare/cloudflare-python/commit/ea49058cc07ca8549b0b0e437af0bf80a92fc65a))
+* **api:** update composite API spec ([6734e9b](https://github.com/cloudflare/cloudflare-python/commit/6734e9ba95be37e8abf917e8e034a4fe8403017f))
+* **api:** update composite API spec ([5f5caef](https://github.com/cloudflare/cloudflare-python/commit/5f5caef1eed2c6a2c5cd80b77c2c7e01e19e57fc))
+* **api:** update composite API spec ([5d19869](https://github.com/cloudflare/cloudflare-python/commit/5d1986964f7344c79285a47c9bd4ae6928805ed5))
+* **api:** update composite API spec ([541c9fb](https://github.com/cloudflare/cloudflare-python/commit/541c9fb7974741641bcef74ba99f7b54f142e0b1))
+* **api:** update composite API spec ([ba5b5fc](https://github.com/cloudflare/cloudflare-python/commit/ba5b5fcd1936b0cadb189ba4c2c674dc6ec956e3))
+* **api:** update composite API spec ([7baa51c](https://github.com/cloudflare/cloudflare-python/commit/7baa51ccf00f66c8871156e674214504984dc066))
+* **api:** update composite API spec ([53d59f4](https://github.com/cloudflare/cloudflare-python/commit/53d59f439ba34edaf2628d89c2a1d7363693a38d))
+* **api:** update composite API spec ([25d603f](https://github.com/cloudflare/cloudflare-python/commit/25d603f8cb36473107bb739c1217a10becd82302))
+* **api:** update composite API spec ([9fd6645](https://github.com/cloudflare/cloudflare-python/commit/9fd66450b998a9b0bea72a8f3ac9fdcb26edd88a))
+* **api:** update composite API spec ([19d1d96](https://github.com/cloudflare/cloudflare-python/commit/19d1d96bae88d6af838574218fc09b541a94da81))
+* **api:** update composite API spec ([f9160a4](https://github.com/cloudflare/cloudflare-python/commit/f9160a47dec2c31bc7f591bc73bc9dff420d10f4))
+* **docs:** use environment variables for authentication in code snippets ([0d829a6](https://github.com/cloudflare/cloudflare-python/commit/0d829a65a46827fe7a69d0efc60af031791887f8))
+* fix inconsequential lint errors ([bf1eac9](https://github.com/cloudflare/cloudflare-python/commit/bf1eac94295240daa425636c03dbbb8ce46c4d52))
+* fix more inconsequential lint errors ([f280942](https://github.com/cloudflare/cloudflare-python/commit/f280942f4c95010c8387d5bff9c05de57ee293a6))
+* **internal:** codegen related update ([0bd5559](https://github.com/cloudflare/cloudflare-python/commit/0bd5559954615d6ef7b18b265af44c27b25988d3))
+* **internal:** codegen related update ([6e5b66f](https://github.com/cloudflare/cloudflare-python/commit/6e5b66f26b600dc345b0579264945fc3311f5269))
+* **internal:** codegen related update ([9fcecd5](https://github.com/cloudflare/cloudflare-python/commit/9fcecd5e59f6b2527c5bd3da7415929f12db34fb))
+* update lockfile ([bd43151](https://github.com/cloudflare/cloudflare-python/commit/bd431513e51b82bff2949adde8d5c1fbfd3cda81))
+
+
+### Documentation
+
+* add v5 migration guide ([9cf7252](https://github.com/cloudflare/cloudflare-python/commit/9cf725244aca719d2b130be1288341ab37085e84))
+
+## 4.3.1 (2025-06-16)
+
+Full Changelog: [v4.3.0...v4.3.1](https://github.com/cloudflare/cloudflare-python/compare/v4.3.0...v4.3.1)
+
+### Bug Fixes
+
+* **api:** Update zone subscription paths ([8917497](https://github.com/cloudflare/cloudflare-python/commit/8917497520e4a1fcc97681685175ab4107e3041c))
+
+
+### Chores
+
+* **internal:** update conftest.py ([c8ae1c4](https://github.com/cloudflare/cloudflare-python/commit/c8ae1c4a73cc8d5804dfcfb059b102eb2443ca86))
+
+## 4.3.0 (2025-06-16)
+
+Full Changelog: [v4.2.0...v4.3.0](https://github.com/cloudflare/cloudflare-python/compare/v4.2.0...v4.3.0)
+
+### Features
+
+* **api:** Add IAM User Groups and AutoRAG ([1cc4487](https://github.com/cloudflare/cloudflare-python/commit/1cc44875013c4f6e1b7629469972ddd130a4c244))
+* **api:** Add new bulk deletion endpoint for ZT infra targets ([a5f7dc7](https://github.com/cloudflare/cloudflare-python/commit/a5f7dc7757ea94f17f8bed472fb7671d369ae6e1))
+* **api:** api update ([eed581b](https://github.com/cloudflare/cloudflare-python/commit/eed581b90816807ee25b70fbe028f2dd9360b50b))
+* **api:** api update ([98fee4a](https://github.com/cloudflare/cloudflare-python/commit/98fee4a2925e1894d3c87836ce63f22b0772f2d6))
+* **api:** api update ([5b9ca58](https://github.com/cloudflare/cloudflare-python/commit/5b9ca588f552a6853f607f5162fcf025e577cc07))
+* **api:** api update ([5824050](https://github.com/cloudflare/cloudflare-python/commit/5824050255ae3685193082ac8eda5e705b1246b3))
+* **api:** api update ([666946a](https://github.com/cloudflare/cloudflare-python/commit/666946a5de14a0f79fec282673b994156f4b7ad4))
+* **api:** api update ([bde7bba](https://github.com/cloudflare/cloudflare-python/commit/bde7bba347aa677babad2c52ff37183a0ccb47a1))
+* **api:** api update ([638a408](https://github.com/cloudflare/cloudflare-python/commit/638a408467ca214e6210c0760fed7f886ef33f1d))
+* **api:** api update ([e8a25d6](https://github.com/cloudflare/cloudflare-python/commit/e8a25d6857ddc301eccf70a4ff8728d2d8295d06))
+* **api:** api update ([c6a8e46](https://github.com/cloudflare/cloudflare-python/commit/c6a8e46d6ab1b59728e97ed2e14ae7ed97d943bf))
+* **api:** api update ([dcfb003](https://github.com/cloudflare/cloudflare-python/commit/dcfb0036e671ef9c492619003589a6bff1ed993a))
+* **api:** api update ([c81d4ce](https://github.com/cloudflare/cloudflare-python/commit/c81d4cefa72e8e53e51f7b1e61f4ed4d101642bb))
+* **api:** api update ([ad5aa87](https://github.com/cloudflare/cloudflare-python/commit/ad5aa879fdb1532745d8581d09ccdd3023486173))
+* **api:** api update ([f0bc6f2](https://github.com/cloudflare/cloudflare-python/commit/f0bc6f2c1cc3cc716e61fe9af0600ce263f198b2))
+* **api:** api update ([ff06097](https://github.com/cloudflare/cloudflare-python/commit/ff06097767b46ce05ce5b3fd6ce262c28338f08a))
+* **api:** api update ([3cd208b](https://github.com/cloudflare/cloudflare-python/commit/3cd208b548b9c17b512998367c6c899007bd47f7))
+* **api:** api update ([694e7bd](https://github.com/cloudflare/cloudflare-python/commit/694e7bdd1981b22ee7b0ddde79b0f2116585969a))
+* **api:** api update ([63e9021](https://github.com/cloudflare/cloudflare-python/commit/63e9021ee79001b4c44d45cd0d56bd5270dc7409))
+* **api:** api update ([784cbd8](https://github.com/cloudflare/cloudflare-python/commit/784cbd8a41b2899ea033f263795429821be9c367))
+* **api:** api update ([c73f7da](https://github.com/cloudflare/cloudflare-python/commit/c73f7da0b97f7e3010dcd3bdc7df62f86f025b1c))
+* **api:** api update ([1239774](https://github.com/cloudflare/cloudflare-python/commit/1239774eaeb2c3f7cc6fd283183ac5d16f196f22))
+* **api:** api update ([70c6acb](https://github.com/cloudflare/cloudflare-python/commit/70c6acb46d69e637339c946cd22d8cacc52a26cb))
+* **api:** api update ([f430026](https://github.com/cloudflare/cloudflare-python/commit/f430026e5b88c6291a5947847d353b01b57ef118))
+* **api:** api update ([69d5705](https://github.com/cloudflare/cloudflare-python/commit/69d570549353c3103a925843e9e48918e39e270c))
+* **api:** api update ([953ea46](https://github.com/cloudflare/cloudflare-python/commit/953ea469bc86a43620d460e94ca1fb2c7ced5d3f))
+* **api:** api update ([ef0e953](https://github.com/cloudflare/cloudflare-python/commit/ef0e95365dae02d85d8fc62c1d68d43450c883e2))
+* **api:** api update ([677bc09](https://github.com/cloudflare/cloudflare-python/commit/677bc09c92b3d955a4703d09a8efc60cd6291c09))
+* **api:** api update ([1c06a6b](https://github.com/cloudflare/cloudflare-python/commit/1c06a6b21e1813f9721a842bbf66940fd14210d4))
+* **api:** api update ([ad75922](https://github.com/cloudflare/cloudflare-python/commit/ad75922803ada5f04c2495989a5cb8d9c371abac))
+* **api:** api update ([6fa8c01](https://github.com/cloudflare/cloudflare-python/commit/6fa8c01474d353c1f83436e54224e481b1106396))
+* **api:** api update ([e0fa8ba](https://github.com/cloudflare/cloudflare-python/commit/e0fa8ba5d60f7960fb626a52c20fd3a5b05ca2cc))
+* **api:** api update ([7ec9f75](https://github.com/cloudflare/cloudflare-python/commit/7ec9f75255ac5406c76af5d477c870f97e6522d8))
+* **api:** fix account ID types ([41069fe](https://github.com/cloudflare/cloudflare-python/commit/41069fe111a574d243f63137e8e8670ca2a1b093))
+* **client:** add follow_redirects request option ([88ec221](https://github.com/cloudflare/cloudflare-python/commit/88ec22171086bd1b87514daec0df62a0dcd01012))
+* **infrastructure_targets:** swap DELETE handler to new endpoint ([eb08f59](https://github.com/cloudflare/cloudflare-python/commit/eb08f599d6788bbba580129605a31256bb1ba1df))
+
+
+### Bug Fixes
+
+* add back kv.namespaces bulk methods ([5d271a4](https://github.com/cloudflare/cloudflare-python/commit/5d271a4267343bc82c45dc60635cd28ca30ebf98))
+* add missing properties ([5777e78](https://github.com/cloudflare/cloudflare-python/commit/5777e787d63491587c4eaf512e738cf49f5e70e5))
+* **AI:** Add explicit variant names for union types ([332065c](https://github.com/cloudflare/cloudflare-python/commit/332065cd40e8809b82dc5d3c2d998d1f752546e3))
+* **api:** 'name' and 'type' are required on dns_record ([d4795c5](https://github.com/cloudflare/cloudflare-python/commit/d4795c5d22c7b8ea28c3e9c1b6dcef59ac7285c2))
+* **client:** correctly parse binary response | stream ([fceaf95](https://github.com/cloudflare/cloudflare-python/commit/fceaf952e4f834bec6dffe0c4d6a9a40952096a0))
+* **config:** Diagnostic errors ([cb5769e](https://github.com/cloudflare/cloudflare-python/commit/cb5769e1395544547519f05995636b6e6001c414))
+* **DLP:** Add explicit variant names ([490c4a7](https://github.com/cloudflare/cloudflare-python/commit/490c4a7cf1367d011e590ce7132132a96ad539ab))
+* **docs/api:** remove references to nonexistent types ([e78bbed](https://github.com/cloudflare/cloudflare-python/commit/e78bbede6d92c10cd8de5df976a14d0a9de9ed07))
+* **workers:** correctly use multipart while uploading scripts ([#2661](https://github.com/cloudflare/cloudflare-python/issues/2661)) ([756dc87](https://github.com/cloudflare/cloudflare-python/commit/756dc87dde3a42c8d4c860ff2239c920c22014ec))
+
+
+### Chores
+
+* **api:** Fix edge IPs variant names ([fa43851](https://github.com/cloudflare/cloudflare-python/commit/fa43851595ab2ce4556e292ab1009dc57a6d90cb))
+* **api:** mark some methods as deprecated ([cc53052](https://github.com/cloudflare/cloudflare-python/commit/cc53052ce07fd4ae796ba897f143bbc76c4a5fc5))
+* **docs:** remove reference to rye shell ([8781542](https://github.com/cloudflare/cloudflare-python/commit/87815427341c4418c2458d31df8c290671fbacf6))
+* **docs:** remove unnecessary param examples ([07f3fd3](https://github.com/cloudflare/cloudflare-python/commit/07f3fd366edd14d22327fa351140df6561acc777))
+* **internal:** codegen related update ([09930a5](https://github.com/cloudflare/cloudflare-python/commit/09930a5ad4c577f26c2832697b95988969d8fba8))
+* **internal:** codegen related update ([5fdf1d6](https://github.com/cloudflare/cloudflare-python/commit/5fdf1d676b8ae8d13c20fa0044432326737fbd0d))
+* **tests:** add tests for httpx client instantiation & proxies ([0291352](https://github.com/cloudflare/cloudflare-python/commit/0291352a035c150268b15424dedb9127d1833d71))
+* **tests:** run tests in parallel ([cc4533e](https://github.com/cloudflare/cloudflare-python/commit/cc4533e3550032e8eecea3140411d7ff05ff9420))
+
+## 4.2.0 (2025-05-21)
+
+Full Changelog: [v4.1.0...v4.2.0](https://github.com/cloudflare/cloudflare-python/compare/v4.1.0...v4.2.0)
+
+### Features
+
+* **access_settings:** add CRUD support ([5c405ce](https://github.com/cloudflare/cloudflare-python/commit/5c405cef8664b45d6d85b3676db276e5712469b9))
+* **api:** api update ([136a09b](https://github.com/cloudflare/cloudflare-python/commit/136a09be1f37d68344d02613e5c7ff1f50652edc))
+* **api:** api update ([607deba](https://github.com/cloudflare/cloudflare-python/commit/607deba07aa95ad3085e1ecac99fc2421c0898e8))
+* **api:** api update ([3a38efd](https://github.com/cloudflare/cloudflare-python/commit/3a38efda7b6d24ccb30a4809978f8c49db379aee))
+* **api:** api update ([19c0409](https://github.com/cloudflare/cloudflare-python/commit/19c0409fbe8a77a61e69bbd7964169681b59bb07))
+* **api:** api update ([3632e3d](https://github.com/cloudflare/cloudflare-python/commit/3632e3d656c1eda0c90987092087b64a9c18aba6))
+* **api:** api update ([4ed10d9](https://github.com/cloudflare/cloudflare-python/commit/4ed10d942594c33d4359616f782a4198934b190f))
+* **api:** api update ([542b143](https://github.com/cloudflare/cloudflare-python/commit/542b143d19eea09701796ca862dcefb790542f2e))
+* **api:** api update ([26e2711](https://github.com/cloudflare/cloudflare-python/commit/26e271148bea672aae2424afa34d1bbe05d5586b))
+* **api:** api update ([91316ee](https://github.com/cloudflare/cloudflare-python/commit/91316eea8a9d0a4780c65ad1680de3f357113d62))
+* **api:** api update ([bc7133d](https://github.com/cloudflare/cloudflare-python/commit/bc7133dd7f5fe6845d885e7e6727bfe6682ea441))
+* **api:** api update ([bb4bd21](https://github.com/cloudflare/cloudflare-python/commit/bb4bd218a1ae33d9dc4aea68975570a9c4255db0))
+* **api:** api update ([2914707](https://github.com/cloudflare/cloudflare-python/commit/29147073fa048ad2758fb72f6190ef8b7cb0b7e7))
+* **api:** api update ([03e79c1](https://github.com/cloudflare/cloudflare-python/commit/03e79c10da77b35afe7915ccb9eb560339841cae))
+* **api:** api update ([edfddf3](https://github.com/cloudflare/cloudflare-python/commit/edfddf31cf1cbc233e90341c3786bbcd873a72ea))
+* **api:** api update ([be32215](https://github.com/cloudflare/cloudflare-python/commit/be32215fc9f229ae6f61ab072bb4ebb3de4109f7))
+* **api:** api update ([5901900](https://github.com/cloudflare/cloudflare-python/commit/59019001da4fe85b326000e37df0e5cb61375945))
+* **api:** api update ([ba166b3](https://github.com/cloudflare/cloudflare-python/commit/ba166b369840ade49924dff938115976e3867a5c))
+* **api:** api update ([d487232](https://github.com/cloudflare/cloudflare-python/commit/d487232e264c310345b3ea85822e550af252c0a4))
+* **api:** api update ([17cb705](https://github.com/cloudflare/cloudflare-python/commit/17cb705744d081357d5f9c418ec3dfb45df60110))
+* **api:** api update ([5ad6267](https://github.com/cloudflare/cloudflare-python/commit/5ad6267fc27d8b5bdba1b5dc570528517ab58b9f))
+* **api:** api update ([f5d07b9](https://github.com/cloudflare/cloudflare-python/commit/f5d07b9dc10febfd488f5955b750820681b6ca33))
+* **api:** api update ([ef764d4](https://github.com/cloudflare/cloudflare-python/commit/ef764d481e5d0f305e887218feb8ccbcdfe2d220))
+* **api:** api update ([f381a98](https://github.com/cloudflare/cloudflare-python/commit/f381a9801f7adedb2738da815b891db8dcd3d26a))
+* **api:** api update ([a45728a](https://github.com/cloudflare/cloudflare-python/commit/a45728adfa9f6048f93f97fe99c63fae8e2847d3))
+* **api:** api update ([4f2fe11](https://github.com/cloudflare/cloudflare-python/commit/4f2fe11cd2be909af128e9d1d8278a96ff4a9456))
+* **api:** api update ([7e458e7](https://github.com/cloudflare/cloudflare-python/commit/7e458e7669fb07b0987b7253ef7e010a52164e90))
+* **api:** api update ([07074f1](https://github.com/cloudflare/cloudflare-python/commit/07074f15880e4ad944381ee7556740d34cb4de4d))
+* **api:** api update ([04834e7](https://github.com/cloudflare/cloudflare-python/commit/04834e7b5f2c48f81df53ae502d57de5846b2fd0))
+* **api:** api update ([ecc0b17](https://github.com/cloudflare/cloudflare-python/commit/ecc0b17e46459f45715591ab8a9c42fa53f58ae5))
+* **api:** api update ([6750cf3](https://github.com/cloudflare/cloudflare-python/commit/6750cf364f95deae9cbfcf7755a5f470d11d82fb))
+* **api:** api update ([0b00d97](https://github.com/cloudflare/cloudflare-python/commit/0b00d971c8df169d5c3985a70bd05f345339adea))
+* **api:** api update ([0e950d6](https://github.com/cloudflare/cloudflare-python/commit/0e950d65a750fb3741d8728c980e804d658c0306))
+* **api:** api update ([23d7f1c](https://github.com/cloudflare/cloudflare-python/commit/23d7f1ca8fda9c31fb1a5ce80ca815d01752e3d7))
+* **api:** api update ([0c6f4a1](https://github.com/cloudflare/cloudflare-python/commit/0c6f4a1c252af1b1da345bea53d0d85939950b23))
+* **api:** api update ([20295df](https://github.com/cloudflare/cloudflare-python/commit/20295df8880c0b22da4ba89d845fcb3d99490021))
+* **api:** api update ([ba2b47a](https://github.com/cloudflare/cloudflare-python/commit/ba2b47ac123e37d4043fe2d74a510ad3202bac7f))
+* **api:** api update ([676ac08](https://github.com/cloudflare/cloudflare-python/commit/676ac089f6b52fc9d26785684e88b74ae74dceb9))
+* **api:** api update ([9ca549e](https://github.com/cloudflare/cloudflare-python/commit/9ca549e242e8e5f537b951c4c24189491928e9f4))
+* **api:** api update ([71efbfa](https://github.com/cloudflare/cloudflare-python/commit/71efbfaf56891305d123d4078f48101fb0c608fe))
+* **api:** api update ([af68ef6](https://github.com/cloudflare/cloudflare-python/commit/af68ef6ac477d9305391318ea5e033f6e111c00e))
+* **api:** api update ([e749879](https://github.com/cloudflare/cloudflare-python/commit/e749879ab0abb0e2383c07efb2f0f546682d9ce7))
+* **api:** manual updates ([6fa22ed](https://github.com/cloudflare/cloudflare-python/commit/6fa22edc2ef43217056a5b0675753cb2341554aa))
+* **api:** manual updates ([e4d4ff5](https://github.com/cloudflare/cloudflare-python/commit/e4d4ff5267aade48da6bddfece3b6d52fb473c26))
+* **api:** update path placeholders ([d2d1c24](https://github.com/cloudflare/cloudflare-python/commit/d2d1c246d0c650e565057f1b98c40054aa693f12))
+* **device_settings:** swap list to get endpoint ([977d5c7](https://github.com/cloudflare/cloudflare-python/commit/977d5c72013c3c55bc235512ec619f90efa7bfc2))
+* **schema_validation:** add mapped endpoints ([7b3a51b](https://github.com/cloudflare/cloudflare-python/commit/7b3a51bc157feccbaee5b22dff61469849bcbf3f))
+* **threat_events:** add list support ([4beeff9](https://github.com/cloudflare/cloudflare-python/commit/4beeff9c87058ce7cb972b2f3826d127775d21eb))
+
+
+### Bug Fixes
+
+* **api:** fix path placeholders ([c8a0db8](https://github.com/cloudflare/cloudflare-python/commit/c8a0db8796322dc391619b9a76c8ce3f551eba2a))
+* **client:** fix bug in Python SDK when subresource has the same name as its parent ([c18a098](https://github.com/cloudflare/cloudflare-python/commit/c18a098640fd597a1fc12db31b40b923dc89101a))
+* **package:** support direct resource imports ([7e46269](https://github.com/cloudflare/cloudflare-python/commit/7e4626961b5c2a425cdee53a2062dcc1fe14f7cd))
+* **urlscanner:** don't unwwrap scan response ([5fe7ea9](https://github.com/cloudflare/cloudflare-python/commit/5fe7ea9b5b31ace57ed670a65c4b276fba5eee18))
+
+
+### Chores
+
+* **ci:** fix installation instructions ([a9bc47f](https://github.com/cloudflare/cloudflare-python/commit/a9bc47fb44bcaf750eb579c327f6a86bf18c6395))
+* **ci:** upload sdks to package manager ([c8af26d](https://github.com/cloudflare/cloudflare-python/commit/c8af26d72d6e0c48acdd9518c42fbfb28809dd45))
+* **internal:** avoid errors for isinstance checks on proxies ([7b734a1](https://github.com/cloudflare/cloudflare-python/commit/7b734a186d2ca69066a75956fcc47ccbe02df0b1))
+* **internal:** codegen related update ([b1fdd11](https://github.com/cloudflare/cloudflare-python/commit/b1fdd1187e9179cb3fd7c92779140d9b6bdc08fd))
+
+## 4.1.0 (2025-03-18)
+
+Full Changelog: [v4.0.0...v4.1.0](https://github.com/cloudflare/cloudflare-python/compare/v4.0.0...v4.1.0)
+
+### Features
+
+* **ai_gateway:** add urls support ([#2539](https://github.com/cloudflare/cloudflare-python/issues/2539)) ([650366e](https://github.com/cloudflare/cloudflare-python/commit/650366eb7f562d7ff3f9cdcdc713a0dac4eef742))
+* **api:** api update ([#2472](https://github.com/cloudflare/cloudflare-python/issues/2472)) ([6b81c50](https://github.com/cloudflare/cloudflare-python/commit/6b81c502a95ebe8973614434039e87fbf7c59bcb))
+* **api:** api update ([#2473](https://github.com/cloudflare/cloudflare-python/issues/2473)) ([eb8ac49](https://github.com/cloudflare/cloudflare-python/commit/eb8ac49d7eed6aa5c5a6ff45aaa8b582013976ea))
+* **api:** api update ([#2474](https://github.com/cloudflare/cloudflare-python/issues/2474)) ([f7a03e2](https://github.com/cloudflare/cloudflare-python/commit/f7a03e224765a2162b5f74ab8ea36eef76fa7237))
+* **api:** api update ([#2476](https://github.com/cloudflare/cloudflare-python/issues/2476)) ([48bdd22](https://github.com/cloudflare/cloudflare-python/commit/48bdd220c6b7ab8ea54853cf6ef7862de9e89e56))
+* **api:** api update ([#2477](https://github.com/cloudflare/cloudflare-python/issues/2477)) ([da2ce0d](https://github.com/cloudflare/cloudflare-python/commit/da2ce0dcaf3806da245f6a9b040d8b5d17d992d3))
+* **api:** api update ([#2478](https://github.com/cloudflare/cloudflare-python/issues/2478)) ([94e997a](https://github.com/cloudflare/cloudflare-python/commit/94e997ac4f6ccf4eeb97726f67139790b6477a95))
+* **api:** api update ([#2479](https://github.com/cloudflare/cloudflare-python/issues/2479)) ([b49f05d](https://github.com/cloudflare/cloudflare-python/commit/b49f05d2186c4166171570236b639f7e77aabd2e))
+* **api:** api update ([#2480](https://github.com/cloudflare/cloudflare-python/issues/2480)) ([b27f1bb](https://github.com/cloudflare/cloudflare-python/commit/b27f1bbc27264c0fe8ee683052e0b698deb91a58))
+* **api:** api update ([#2489](https://github.com/cloudflare/cloudflare-python/issues/2489)) ([7f6d335](https://github.com/cloudflare/cloudflare-python/commit/7f6d33530f1cec482662ad53611ef62d63bcad25))
+* **api:** api update ([#2492](https://github.com/cloudflare/cloudflare-python/issues/2492)) ([12d3ff5](https://github.com/cloudflare/cloudflare-python/commit/12d3ff52795e5da6c30f90ce659f8d4d0bacab18))
+* **api:** api update ([#2493](https://github.com/cloudflare/cloudflare-python/issues/2493)) ([9061b65](https://github.com/cloudflare/cloudflare-python/commit/9061b659bcae3340e18e75eb8178e654a39361a0))
+* **api:** api update ([#2495](https://github.com/cloudflare/cloudflare-python/issues/2495)) ([28d11c6](https://github.com/cloudflare/cloudflare-python/commit/28d11c6027d2ff4546b4f48f929a1140da015740))
+* **api:** api update ([#2496](https://github.com/cloudflare/cloudflare-python/issues/2496)) ([538f71d](https://github.com/cloudflare/cloudflare-python/commit/538f71df81d2181e7724a73b86c181ce3f9b479d))
+* **api:** api update ([#2497](https://github.com/cloudflare/cloudflare-python/issues/2497)) ([e826a02](https://github.com/cloudflare/cloudflare-python/commit/e826a024ab9bad3105cde190ab1e8717ebda80bb))
+* **api:** api update ([#2500](https://github.com/cloudflare/cloudflare-python/issues/2500)) ([b8f02a0](https://github.com/cloudflare/cloudflare-python/commit/b8f02a087be93011eb24532eea5a4c5c0c61dbd1))
+* **api:** api update ([#2501](https://github.com/cloudflare/cloudflare-python/issues/2501)) ([b8b3891](https://github.com/cloudflare/cloudflare-python/commit/b8b3891a42db6f5a1631ceddf5ab581d224e0b40))
+* **api:** api update ([#2502](https://github.com/cloudflare/cloudflare-python/issues/2502)) ([345ac45](https://github.com/cloudflare/cloudflare-python/commit/345ac45b5700bc3d80005c61d716792e39fa4c99))
+* **api:** api update ([#2503](https://github.com/cloudflare/cloudflare-python/issues/2503)) ([80fdb8f](https://github.com/cloudflare/cloudflare-python/commit/80fdb8f78726e093afbfb6e966df4a5b74ded3c9))
+* **api:** api update ([#2516](https://github.com/cloudflare/cloudflare-python/issues/2516)) ([b6adc14](https://github.com/cloudflare/cloudflare-python/commit/b6adc142da1c6f6693c6c41ff3fde485aedd588d))
+* **api:** api update ([#2517](https://github.com/cloudflare/cloudflare-python/issues/2517)) ([401b717](https://github.com/cloudflare/cloudflare-python/commit/401b717505df1746f6ffbbf7f111e7c93e6fae4a))
+* **api:** api update ([#2518](https://github.com/cloudflare/cloudflare-python/issues/2518)) ([e1a2474](https://github.com/cloudflare/cloudflare-python/commit/e1a2474555a21af53b67e13be76d4c99dfbe4814))
+* **api:** api update ([#2520](https://github.com/cloudflare/cloudflare-python/issues/2520)) ([151a44a](https://github.com/cloudflare/cloudflare-python/commit/151a44a584d21d4acbf2459513c585ef937eb984))
+* **api:** api update ([#2522](https://github.com/cloudflare/cloudflare-python/issues/2522)) ([fc6d9d6](https://github.com/cloudflare/cloudflare-python/commit/fc6d9d6359390476e531499034ab114baeb1bcfe))
+* **api:** api update ([#2523](https://github.com/cloudflare/cloudflare-python/issues/2523)) ([43ebeee](https://github.com/cloudflare/cloudflare-python/commit/43ebeee56dea63a55d23665e70ae2a0391d9e66b))
+* **api:** api update ([#2528](https://github.com/cloudflare/cloudflare-python/issues/2528)) ([cc14467](https://github.com/cloudflare/cloudflare-python/commit/cc14467fce380ffe7d1baddb678415b319d48e22))
+* **api:** api update ([#2530](https://github.com/cloudflare/cloudflare-python/issues/2530)) ([4def3c7](https://github.com/cloudflare/cloudflare-python/commit/4def3c7bb1f0fa1189fb0d0e644f54e6453f27ad))
+* **api:** api update ([#2531](https://github.com/cloudflare/cloudflare-python/issues/2531)) ([4aef71e](https://github.com/cloudflare/cloudflare-python/commit/4aef71e490884d29a3e3d8f5cdd97101a464bc3b))
+* **api:** api update ([#2533](https://github.com/cloudflare/cloudflare-python/issues/2533)) ([d231762](https://github.com/cloudflare/cloudflare-python/commit/d23176293003e4788c907ff0417f5470aaa4a31b))
+* **api:** api update ([#2534](https://github.com/cloudflare/cloudflare-python/issues/2534)) ([6bae2c2](https://github.com/cloudflare/cloudflare-python/commit/6bae2c2223a2047270110c8d1cd934e69ef306a9))
+* **api:** api update ([#2535](https://github.com/cloudflare/cloudflare-python/issues/2535)) ([d3821d2](https://github.com/cloudflare/cloudflare-python/commit/d3821d225922bf8bae3484c498e440d4e90dc194))
+* **api:** api update ([#2537](https://github.com/cloudflare/cloudflare-python/issues/2537)) ([7cace87](https://github.com/cloudflare/cloudflare-python/commit/7cace874090689ada3ea6b099e7f304e6b7da6a1))
+* **api:** api update ([#2544](https://github.com/cloudflare/cloudflare-python/issues/2544)) ([7ea429d](https://github.com/cloudflare/cloudflare-python/commit/7ea429d47d7741d1062eded3374c25f6f5965868))
+* **api:** api update ([#2547](https://github.com/cloudflare/cloudflare-python/issues/2547)) ([7b0ce60](https://github.com/cloudflare/cloudflare-python/commit/7b0ce60f9a2ea2b7b7560cbc7da733247f31d63b))
+* **api:** api update ([#2549](https://github.com/cloudflare/cloudflare-python/issues/2549)) ([aca2b76](https://github.com/cloudflare/cloudflare-python/commit/aca2b76e0daa7bef7936aee794b9cbf173ac4e4d))
+* **api:** manual updates ([#2491](https://github.com/cloudflare/cloudflare-python/issues/2491)) ([e93ce12](https://github.com/cloudflare/cloudflare-python/commit/e93ce12a62dc48376a2fafba968a2eeff7f83345))
+* **api:** manual updates ([#2513](https://github.com/cloudflare/cloudflare-python/issues/2513)) ([71e522b](https://github.com/cloudflare/cloudflare-python/commit/71e522b756012338f5909c2644b18c62b430cc0f))
+* **api:** manual updates ([#2526](https://github.com/cloudflare/cloudflare-python/issues/2526)) ([f0b7af9](https://github.com/cloudflare/cloudflare-python/commit/f0b7af9d7cbad933520d3e50657d4762c2ca156d))
+* **api:** manual updates ([#2527](https://github.com/cloudflare/cloudflare-python/issues/2527)) ([aa892cc](https://github.com/cloudflare/cloudflare-python/commit/aa892cc55f7fb177521c2b2010bf760a9975c7cd))
+* **api:** rename browsing_rendering to browser_rendering ([#2488](https://github.com/cloudflare/cloudflare-python/issues/2488)) ([6b3425f](https://github.com/cloudflare/cloudflare-python/commit/6b3425fe978466d1536f77212c4ac36c93aa6105))
+* **browser_rendering:** move methods to top level ([#2490](https://github.com/cloudflare/cloudflare-python/issues/2490)) ([19e4cb0](https://github.com/cloudflare/cloudflare-python/commit/19e4cb01cff0811129fbac3e0f474f04532be483))
+* **browsing_rendering:** add support for subresources ([#2484](https://github.com/cloudflare/cloudflare-python/issues/2484)) ([6739a41](https://github.com/cloudflare/cloudflare-python/commit/6739a4123bcf82fe58143ac51e69f590be8c1822))
+* **cloudforce_one:** fix scans model ([#2504](https://github.com/cloudflare/cloudflare-python/issues/2504)) ([23e94c9](https://github.com/cloudflare/cloudflare-python/commit/23e94c9ee7ae82bc2931d077874a9a17dd8bfec3))
+* **dns_settings:** fix hierarchy ([#2514](https://github.com/cloudflare/cloudflare-python/issues/2514)) ([a95d254](https://github.com/cloudflare/cloudflare-python/commit/a95d254cf22932f9f22e3e27171ae7efe35e6abd))
+* **dns:** split account and zone DNS settings ([#2507](https://github.com/cloudflare/cloudflare-python/issues/2507)) ([6a80948](https://github.com/cloudflare/cloudflare-python/commit/6a809488ff2fd32ef13ad1dc37c1d9a052b79b98))
+* **internal:** group browser rendering ([#2508](https://github.com/cloudflare/cloudflare-python/issues/2508)) ([349e280](https://github.com/cloudflare/cloudflare-python/commit/349e280cd359544242e6c78cacce97f437cf9125))
+* **magic_cloud_networking:** add endpoint mappings ([#2550](https://github.com/cloudflare/cloudflare-python/issues/2550)) ([f0a6a21](https://github.com/cloudflare/cloudflare-python/commit/f0a6a21ceb592b32ea1079abfd42278f1da3d392))
+* **radar:** add compromised credential endpoints ([#2552](https://github.com/cloudflare/cloudflare-python/issues/2552)) ([99c9845](https://github.com/cloudflare/cloudflare-python/commit/99c9845e2548528a5ea0fc1099d3b5c39a165dae))
+* **radar:** add DNS endpoint ([#2487](https://github.com/cloudflare/cloudflare-python/issues/2487)) ([a5d4c51](https://github.com/cloudflare/cloudflare-python/commit/a5d4c51312ec12691f9fa4aa1e5ff3721d927d0a))
+* **threat_events:** fix create endpoint ([#2532](https://github.com/cloudflare/cloudflare-python/issues/2532)) ([0a45fe8](https://github.com/cloudflare/cloudflare-python/commit/0a45fe8002fa64e2dda4fb7e91badb43e0436bcc))
+* **threat_events:** shuffle endpoints from POST => PATCH ([#2525](https://github.com/cloudflare/cloudflare-python/issues/2525)) ([dc037a9](https://github.com/cloudflare/cloudflare-python/commit/dc037a9b9385fc979e11f64e5b576bef3d2a2d0a))
+* **vpc_flows:** add token support ([#2485](https://github.com/cloudflare/cloudflare-python/issues/2485)) ([904614f](https://github.com/cloudflare/cloudflare-python/commit/904614f85526fa63f3eee05532f6285c2c5d0cdd))
+* **waiting_rooms:** add account level list API ([#2524](https://github.com/cloudflare/cloudflare-python/issues/2524)) ([d10fb45](https://github.com/cloudflare/cloudflare-python/commit/d10fb45195b6b6d4b689bc5629877a7dee91a74b))
+* **workers:** add in secrets endpoints ([#2540](https://github.com/cloudflare/cloudflare-python/issues/2540)) ([0f3127d](https://github.com/cloudflare/cloudflare-python/commit/0f3127d57e8675a30f10caf8ba052651e5f75954))
+* **workflows:** add `bulk` support ([#2551](https://github.com/cloudflare/cloudflare-python/issues/2551)) ([45d91e2](https://github.com/cloudflare/cloudflare-python/commit/45d91e2a032aac5b4d1471027dbcd50e873dd0c8))
+
+
+### Bug Fixes
+
+* **api:** missing union discriminator naming ([#2548](https://github.com/cloudflare/cloudflare-python/issues/2548)) ([8c842a3](https://github.com/cloudflare/cloudflare-python/commit/8c842a3fc5e1fb641bb1cb279f5b143ed980bbed))
+* **ci:** ensure pip is always available ([#2543](https://github.com/cloudflare/cloudflare-python/issues/2543)) ([5ab256e](https://github.com/cloudflare/cloudflare-python/commit/5ab256eb4d93222012a808fde8a119a60a4a8bc3))
+* **ci:** remove publishing patch ([#2546](https://github.com/cloudflare/cloudflare-python/issues/2546)) ([2316376](https://github.com/cloudflare/cloudflare-python/commit/2316376a75b6a6ff41e1d1d7510206aa050ece09))
+* **internal:** remove port scans pending path fixes ([#2498](https://github.com/cloudflare/cloudflare-python/issues/2498)) ([f3c8131](https://github.com/cloudflare/cloudflare-python/commit/f3c81313a8878f84abdfcd6b6f9af48126ece4c5))
+* **r2_custom_domain:** update path placeholders to de-duplicate internal values ([#2506](https://github.com/cloudflare/cloudflare-python/issues/2506)) ([1288828](https://github.com/cloudflare/cloudflare-python/commit/1288828790c8cb3ddc38e81fb4e870406a0caab9))
+* **workers_for_platforms:** remove cyclic import due to model ([#2542](https://github.com/cloudflare/cloudflare-python/issues/2542)) ([7d9d338](https://github.com/cloudflare/cloudflare-python/commit/7d9d3381eacc52694d477b388165a26f77bde9b5))
+
+
+### Chores
+
+* **docs:** update client docstring ([#2483](https://github.com/cloudflare/cloudflare-python/issues/2483)) ([e98bd28](https://github.com/cloudflare/cloudflare-python/commit/e98bd2880f1f33083e0ce1e585bcaa635eda4176))
+* **internal:** bump rye to 0.44.0 ([#2536](https://github.com/cloudflare/cloudflare-python/issues/2536)) ([b1a4155](https://github.com/cloudflare/cloudflare-python/commit/b1a4155e83b067684f202159ad4b6f2b1d3c5283))
+* **internal:** codegen related update ([#2475](https://github.com/cloudflare/cloudflare-python/issues/2475)) ([329c314](https://github.com/cloudflare/cloudflare-python/commit/329c314d1756618ef5434817f1077173041a0ebc))
+* **internal:** codegen related update ([#2505](https://github.com/cloudflare/cloudflare-python/issues/2505)) ([ea4d061](https://github.com/cloudflare/cloudflare-python/commit/ea4d06178fa05d7907edd1d2869d566c80a1a567))
+* **internal:** codegen related update ([#2511](https://github.com/cloudflare/cloudflare-python/issues/2511)) ([d8e67ed](https://github.com/cloudflare/cloudflare-python/commit/d8e67ede7ad1363353b09e93d29951df62b87ed5))
+* **internal:** codegen related update ([#2512](https://github.com/cloudflare/cloudflare-python/issues/2512)) ([ee0fa76](https://github.com/cloudflare/cloudflare-python/commit/ee0fa7627138689a4115a9a54e3c504d9ef2d7a9))
+* **internal:** mark VPC and PDF as initialisms ([#2486](https://github.com/cloudflare/cloudflare-python/issues/2486)) ([f0b00be](https://github.com/cloudflare/cloudflare-python/commit/f0b00beeebe149cc989e6c398b5f9ccfd2dce33b))
+* **internal:** remove extra empty newlines ([#2529](https://github.com/cloudflare/cloudflare-python/issues/2529)) ([b1cabe6](https://github.com/cloudflare/cloudflare-python/commit/b1cabe63a9238d0e00cbde50b1a8d1843e26b03b))
+* **internal:** remove unused http client options forwarding ([#2494](https://github.com/cloudflare/cloudflare-python/issues/2494)) ([db37526](https://github.com/cloudflare/cloudflare-python/commit/db375269cd6e68fc5b184384d15f5290e6b63cb7))
+
+
+### Documentation
+
+* update URLs from stainlessapi.com to stainless.com ([#2481](https://github.com/cloudflare/cloudflare-python/issues/2481)) ([fe98b1d](https://github.com/cloudflare/cloudflare-python/commit/fe98b1da5bed21d62ff14cb1c84f8f89da4a03ac))
+
+## 4.0.0 (2025-01-13)
+
+Full Changelog: [v3.1.1...v4.0.0](https://github.com/cloudflare/cloudflare-python/compare/v3.1.1...v4.0.0)
+
+### ⚠ BREAKING CHANGES
+
+* **addressing:** reshuffle relationship in the namespace to align with the product ([#2322](https://github.com/cloudflare/cloudflare-python/issues/2322))
+* **r2:** rename `cf-r2-jurisdiction` to more usable `jurisdiction` parameter ([#2310](https://github.com/cloudflare/cloudflare-python/issues/2310))
+* **r2:** rename `cf-r2-jurisdiction` to more usable `jurisdiction` parameter ([#2309](https://github.com/cloudflare/cloudflare-python/issues/2309))
+* **r2:** rename `cf-r2-jurisdiction` to more usable `jurisdiction` parameter ([#2308](https://github.com/cloudflare/cloudflare-python/issues/2308))
+* **loa_documents:** move download subresource into parent as `get` ([#2304](https://github.com/cloudflare/cloudflare-python/issues/2304))
+* **addressing:** move service bindings to dedicated namespace  ([#2303](https://github.com/cloudflare/cloudflare-python/issues/2303))
+* **ai:** move to dedicated namespace ([#2269](https://github.com/cloudflare/cloudflare-python/issues/2269))
+* **kv:** move analytics under existing namespace ([#2239](https://github.com/cloudflare/cloudflare-python/issues/2239))
+* **zone_transfers:** move under DNS namespace ([#2234](https://github.com/cloudflare/cloudflare-python/issues/2234))
+* **dnssec:** move under DNS namespace ([#2233](https://github.com/cloudflare/cloudflare-python/issues/2233))
+* **url_scanner:** swap all methods to be v2 only ([#2231](https://github.com/cloudflare/cloudflare-python/issues/2231))
+* **warp_connector:** move under zero trust namespace ([#2220](https://github.com/cloudflare/cloudflare-python/issues/2220))
+
+### Features
+
+* **addressing:** move service bindings to dedicated namespace  ([#2303](https://github.com/cloudflare/cloudflare-python/issues/2303)) ([b9a842b](https://github.com/cloudflare/cloudflare-python/commit/b9a842b5a8d4351337422919805d0baf1ec1660d))
+* **addressing:** reshuffle relationship in the namespace to align with the product ([#2322](https://github.com/cloudflare/cloudflare-python/issues/2322)) ([e6a1bfa](https://github.com/cloudflare/cloudflare-python/commit/e6a1bfad0b9885222c8dbec059dd132ba1a21e30))
+* **ai:** add support for search endpoints and finetunes ([#2305](https://github.com/cloudflare/cloudflare-python/issues/2305)) ([4493d6c](https://github.com/cloudflare/cloudflare-python/commit/4493d6c280dae6cfc3ed1c4cb798e51a81061485))
+* **ai:** move AI back to dedicated namespace ([#2277](https://github.com/cloudflare/cloudflare-python/issues/2277)) ([674c2ce](https://github.com/cloudflare/cloudflare-python/commit/674c2cec279102aa762e31ac6407e41a03f40352))
+* **ai:** move to dedicated namespace ([#2269](https://github.com/cloudflare/cloudflare-python/issues/2269)) ([90d0608](https://github.com/cloudflare/cloudflare-python/commit/90d0608e7aaef397b418be05e847c9c4baf41eb8))
+* **api:** Add new Aegis zone setting ([#2319](https://github.com/cloudflare/cloudflare-python/issues/2319)) ([dce9437](https://github.com/cloudflare/cloudflare-python/commit/dce94373dcd139a5fb4d77708f5b4a8a23716438))
+* **api:** Add PATCH zone hold update method ([#2268](https://github.com/cloudflare/cloudflare-python/issues/2268)) ([f21869f](https://github.com/cloudflare/cloudflare-python/commit/f21869ffa917b954d9d35c451942fca34fd1284a))
+* **api:** api shield operations updates; rename discovery resource ([#2296](https://github.com/cloudflare/cloudflare-python/issues/2296)) ([e7936f6](https://github.com/cloudflare/cloudflare-python/commit/e7936f6b3d285bc4243641a66b1c1d7404eb1328))
+* **api:** api update ([#2124](https://github.com/cloudflare/cloudflare-python/issues/2124)) ([e03ce04](https://github.com/cloudflare/cloudflare-python/commit/e03ce048f9686baf14fca16b30d9a20278257f59))
+* **api:** api update ([#2125](https://github.com/cloudflare/cloudflare-python/issues/2125)) ([798b1a0](https://github.com/cloudflare/cloudflare-python/commit/798b1a044e3042346af9c8d301586fa59c67aedf))
+* **api:** api update ([#2126](https://github.com/cloudflare/cloudflare-python/issues/2126)) ([fe787a3](https://github.com/cloudflare/cloudflare-python/commit/fe787a344a1c5f06ceaef8ff8805e7c8072feb19))
+* **api:** api update ([#2127](https://github.com/cloudflare/cloudflare-python/issues/2127)) ([eef643f](https://github.com/cloudflare/cloudflare-python/commit/eef643fdd935224ade161660b54b1758710948d5))
+* **api:** api update ([#2129](https://github.com/cloudflare/cloudflare-python/issues/2129)) ([ff2f5dc](https://github.com/cloudflare/cloudflare-python/commit/ff2f5dc939fc3b3799c875a765a91ee11bdcbd83))
+* **api:** api update ([#2130](https://github.com/cloudflare/cloudflare-python/issues/2130)) ([f57867d](https://github.com/cloudflare/cloudflare-python/commit/f57867db827b54228dd31bf1054fadd1ea808460))
+* **api:** api update ([#2131](https://github.com/cloudflare/cloudflare-python/issues/2131)) ([e077e34](https://github.com/cloudflare/cloudflare-python/commit/e077e34c2219779e808540d268e90f1298b6334f))
+* **api:** api update ([#2132](https://github.com/cloudflare/cloudflare-python/issues/2132)) ([f0898d4](https://github.com/cloudflare/cloudflare-python/commit/f0898d4b3752c6e035f91eb22555a0cc112c8026))
+* **api:** api update ([#2133](https://github.com/cloudflare/cloudflare-python/issues/2133)) ([22d878b](https://github.com/cloudflare/cloudflare-python/commit/22d878bc6dfebc68e65dae946330f01b79b380b7))
+* **api:** api update ([#2135](https://github.com/cloudflare/cloudflare-python/issues/2135)) ([29e0389](https://github.com/cloudflare/cloudflare-python/commit/29e038971efe26a45daaa9b0ac5eab248922f0a7))
+* **api:** api update ([#2136](https://github.com/cloudflare/cloudflare-python/issues/2136)) ([b132a0d](https://github.com/cloudflare/cloudflare-python/commit/b132a0d47fa5b9bdf74271df8be5e9b36095a444))
+* **api:** api update ([#2140](https://github.com/cloudflare/cloudflare-python/issues/2140)) ([385c772](https://github.com/cloudflare/cloudflare-python/commit/385c77263a4515a9c587302d1d94f4a714c9d031))
+* **api:** api update ([#2142](https://github.com/cloudflare/cloudflare-python/issues/2142)) ([0b5a5d0](https://github.com/cloudflare/cloudflare-python/commit/0b5a5d0f0b62f5b9a21e50cb7b4209315a9cb7df))
+* **api:** api update ([#2143](https://github.com/cloudflare/cloudflare-python/issues/2143)) ([2f10d9c](https://github.com/cloudflare/cloudflare-python/commit/2f10d9cc4c1c7d74b011da95e8c94971dccc4a0b))
+* **api:** api update ([#2146](https://github.com/cloudflare/cloudflare-python/issues/2146)) ([c1e8143](https://github.com/cloudflare/cloudflare-python/commit/c1e8143d4fa54667933c9ab50c80b7ee12f0f872))
+* **api:** api update ([#2147](https://github.com/cloudflare/cloudflare-python/issues/2147)) ([abbd9f7](https://github.com/cloudflare/cloudflare-python/commit/abbd9f710f32647ae8987b5cd370c1b1eda158a3))
+* **api:** api update ([#2148](https://github.com/cloudflare/cloudflare-python/issues/2148)) ([178ca7e](https://github.com/cloudflare/cloudflare-python/commit/178ca7e20f6350a13a37b23451ddafc3d77a4a6b))
+* **api:** api update ([#2149](https://github.com/cloudflare/cloudflare-python/issues/2149)) ([b6ca4bd](https://github.com/cloudflare/cloudflare-python/commit/b6ca4bd513190d7b1af48e24cee69340a6158ebd))
+* **api:** api update ([#2150](https://github.com/cloudflare/cloudflare-python/issues/2150)) ([99d9133](https://github.com/cloudflare/cloudflare-python/commit/99d91330f715e705244cc698978cd2ab8548966a))
+* **api:** api update ([#2151](https://github.com/cloudflare/cloudflare-python/issues/2151)) ([0ac8d45](https://github.com/cloudflare/cloudflare-python/commit/0ac8d45b16a19d823b1e04bc2417f6e2a3461cc2))
+* **api:** api update ([#2159](https://github.com/cloudflare/cloudflare-python/issues/2159)) ([1629b7f](https://github.com/cloudflare/cloudflare-python/commit/1629b7f549d9f66bb92b0f6d39e204a164431447))
+* **api:** api update ([#2160](https://github.com/cloudflare/cloudflare-python/issues/2160)) ([bc2b5c4](https://github.com/cloudflare/cloudflare-python/commit/bc2b5c431ad0ad27f107f5ba766ea0c07dfd0177))
+* **api:** api update ([#2161](https://github.com/cloudflare/cloudflare-python/issues/2161)) ([441bcec](https://github.com/cloudflare/cloudflare-python/commit/441bcecde63c193c9e08800ce6ad6f43c022282b))
+* **api:** api update ([#2162](https://github.com/cloudflare/cloudflare-python/issues/2162)) ([5244425](https://github.com/cloudflare/cloudflare-python/commit/5244425b52f1f512931708f879270cd7d287f1d0))
+* **api:** api update ([#2163](https://github.com/cloudflare/cloudflare-python/issues/2163)) ([c2770ee](https://github.com/cloudflare/cloudflare-python/commit/c2770eec423f26d1ecad8a1f836ed5001acce4b1))
+* **api:** api update ([#2167](https://github.com/cloudflare/cloudflare-python/issues/2167)) ([44c9de7](https://github.com/cloudflare/cloudflare-python/commit/44c9de7f4e4f1d294960ef892fe90ba1ed1c65b6))
+* **api:** api update ([#2168](https://github.com/cloudflare/cloudflare-python/issues/2168)) ([86eff89](https://github.com/cloudflare/cloudflare-python/commit/86eff892d605f019f725d914670f442057d8f3fc))
+* **api:** api update ([#2169](https://github.com/cloudflare/cloudflare-python/issues/2169)) ([94403aa](https://github.com/cloudflare/cloudflare-python/commit/94403aa020be977db4313269f5faaaa9a6119a00))
+* **api:** api update ([#2170](https://github.com/cloudflare/cloudflare-python/issues/2170)) ([bfd27f8](https://github.com/cloudflare/cloudflare-python/commit/bfd27f86e196194e3e05330391574cb1d60ff46c))
+* **api:** api update ([#2171](https://github.com/cloudflare/cloudflare-python/issues/2171)) ([f704605](https://github.com/cloudflare/cloudflare-python/commit/f70460538170f4af2d320fe0f46417afba060a0b))
+* **api:** api update ([#2172](https://github.com/cloudflare/cloudflare-python/issues/2172)) ([abbdc97](https://github.com/cloudflare/cloudflare-python/commit/abbdc97e686c637f0479816fc4c1fd158edadc4f))
+* **api:** api update ([#2173](https://github.com/cloudflare/cloudflare-python/issues/2173)) ([9e7ca11](https://github.com/cloudflare/cloudflare-python/commit/9e7ca11b0d9bac42d697b89bb021fd0010aa32cc))
+* **api:** api update ([#2175](https://github.com/cloudflare/cloudflare-python/issues/2175)) ([d22a2de](https://github.com/cloudflare/cloudflare-python/commit/d22a2debd32f0b14a7587317d9a7a8e26e4065d9))
+* **api:** api update ([#2179](https://github.com/cloudflare/cloudflare-python/issues/2179)) ([d39c7b5](https://github.com/cloudflare/cloudflare-python/commit/d39c7b51908c22ed91b2e7f68cb64ebf05bfabb9))
+* **api:** api update ([#2180](https://github.com/cloudflare/cloudflare-python/issues/2180)) ([90be13d](https://github.com/cloudflare/cloudflare-python/commit/90be13db56fb6d1ae93dfa11c80580efc7f98d1c))
+* **api:** api update ([#2181](https://github.com/cloudflare/cloudflare-python/issues/2181)) ([f3c2bb4](https://github.com/cloudflare/cloudflare-python/commit/f3c2bb42b357660881be9cce0dad1b2651e8f3de))
+* **api:** api update ([#2188](https://github.com/cloudflare/cloudflare-python/issues/2188)) ([09acf0a](https://github.com/cloudflare/cloudflare-python/commit/09acf0aba6d4a44ba3ccd8ef3ebcd06bfd10c21a))
+* **api:** api update ([#2197](https://github.com/cloudflare/cloudflare-python/issues/2197)) ([8fb8e8b](https://github.com/cloudflare/cloudflare-python/commit/8fb8e8b2abb398b42890d0dd11590e646e29184b))
+* **api:** api update ([#2198](https://github.com/cloudflare/cloudflare-python/issues/2198)) ([1cad830](https://github.com/cloudflare/cloudflare-python/commit/1cad8304d05e4eee21adb38dde942a27b93b17cc))
+* **api:** api update ([#2199](https://github.com/cloudflare/cloudflare-python/issues/2199)) ([2d5cecb](https://github.com/cloudflare/cloudflare-python/commit/2d5cecb75287ac39d04f04f6ffdcb982f080ff6d))
+* **api:** api update ([#2200](https://github.com/cloudflare/cloudflare-python/issues/2200)) ([5be5fe6](https://github.com/cloudflare/cloudflare-python/commit/5be5fe6c91b8e8ef2fee80ef96eefcbb37f901ac))
+* **api:** api update ([#2201](https://github.com/cloudflare/cloudflare-python/issues/2201)) ([dc752c1](https://github.com/cloudflare/cloudflare-python/commit/dc752c1096a02d869d6cd66f08c180fbfcd92989))
+* **api:** api update ([#2202](https://github.com/cloudflare/cloudflare-python/issues/2202)) ([ace26df](https://github.com/cloudflare/cloudflare-python/commit/ace26df932afdff7531a4797aff9e38563fa3bb0))
+* **api:** api update ([#2203](https://github.com/cloudflare/cloudflare-python/issues/2203)) ([1c97b11](https://github.com/cloudflare/cloudflare-python/commit/1c97b11edd92b89f75685022c95adf0c8167bb0c))
+* **api:** api update ([#2205](https://github.com/cloudflare/cloudflare-python/issues/2205)) ([291389c](https://github.com/cloudflare/cloudflare-python/commit/291389c5d24ff8040ad88143cf76591b71464706))
+* **api:** api update ([#2206](https://github.com/cloudflare/cloudflare-python/issues/2206)) ([546cb1c](https://github.com/cloudflare/cloudflare-python/commit/546cb1c67c6cff1bb71f1df9ecbcc8752f9cce00))
+* **api:** api update ([#2209](https://github.com/cloudflare/cloudflare-python/issues/2209)) ([458a4a5](https://github.com/cloudflare/cloudflare-python/commit/458a4a57c8ef88b19fdacd6e63c24ab1c9191ecc))
+* **api:** api update ([#2211](https://github.com/cloudflare/cloudflare-python/issues/2211)) ([51a0005](https://github.com/cloudflare/cloudflare-python/commit/51a00052d14453eaabd073d7d2fa44f012e5174c))
+* **api:** api update ([#2212](https://github.com/cloudflare/cloudflare-python/issues/2212)) ([19d7551](https://github.com/cloudflare/cloudflare-python/commit/19d7551f7918da44de4d6ac0631655bfcca4a9f5))
+* **api:** api update ([#2216](https://github.com/cloudflare/cloudflare-python/issues/2216)) ([272e71c](https://github.com/cloudflare/cloudflare-python/commit/272e71cf393077037e2098dcedf13e6999fc0a6a))
+* **api:** api update ([#2219](https://github.com/cloudflare/cloudflare-python/issues/2219)) ([88819fc](https://github.com/cloudflare/cloudflare-python/commit/88819fcc48e653a284c6df579b6786276ef83ded))
+* **api:** api update ([#2221](https://github.com/cloudflare/cloudflare-python/issues/2221)) ([0f01824](https://github.com/cloudflare/cloudflare-python/commit/0f018249fc22949f98487b7cc9689fe45646572a))
+* **api:** api update ([#2223](https://github.com/cloudflare/cloudflare-python/issues/2223)) ([2e9734b](https://github.com/cloudflare/cloudflare-python/commit/2e9734b0e74ebf65e1da9e8eadab28947015c786))
+* **api:** api update ([#2227](https://github.com/cloudflare/cloudflare-python/issues/2227)) ([ace3716](https://github.com/cloudflare/cloudflare-python/commit/ace371689884dc6d1e494776aa5960c71c59e2aa))
+* **api:** api update ([#2237](https://github.com/cloudflare/cloudflare-python/issues/2237)) ([adc6f6b](https://github.com/cloudflare/cloudflare-python/commit/adc6f6bc433fe077c51a2f4700eaa541fed9a587))
+* **api:** api update ([#2238](https://github.com/cloudflare/cloudflare-python/issues/2238)) ([84bc37c](https://github.com/cloudflare/cloudflare-python/commit/84bc37c6caabf0e22cb9e09f0c12e3a86c82135a))
+* **api:** api update ([#2243](https://github.com/cloudflare/cloudflare-python/issues/2243)) ([86ca907](https://github.com/cloudflare/cloudflare-python/commit/86ca907944e3d48bdd2c929295f5ccaca3371fd1))
+* **api:** api update ([#2244](https://github.com/cloudflare/cloudflare-python/issues/2244)) ([0978d14](https://github.com/cloudflare/cloudflare-python/commit/0978d147d0022c95225976d5e457fd49eddbd5b2))
+* **api:** api update ([#2245](https://github.com/cloudflare/cloudflare-python/issues/2245)) ([c12dfc0](https://github.com/cloudflare/cloudflare-python/commit/c12dfc071a9e2307c27dd5e9b81444754a1f3646))
+* **api:** api update ([#2247](https://github.com/cloudflare/cloudflare-python/issues/2247)) ([38a93e7](https://github.com/cloudflare/cloudflare-python/commit/38a93e757989c56d759debf0f9767a1f0b3049ce))
+* **api:** api update ([#2266](https://github.com/cloudflare/cloudflare-python/issues/2266)) ([e738082](https://github.com/cloudflare/cloudflare-python/commit/e738082ba761fadc1648e5fec4d85c3bcf113bc7))
+* **api:** api update ([#2273](https://github.com/cloudflare/cloudflare-python/issues/2273)) ([fcf96f7](https://github.com/cloudflare/cloudflare-python/commit/fcf96f73182777bd9242d6fa55d8921ba001cb59))
+* **api:** api update ([#2276](https://github.com/cloudflare/cloudflare-python/issues/2276)) ([d77a47e](https://github.com/cloudflare/cloudflare-python/commit/d77a47e7ecccfeb3dd045e6759b7ccc9f1250ef1))
+* **api:** api update ([#2284](https://github.com/cloudflare/cloudflare-python/issues/2284)) ([982f95a](https://github.com/cloudflare/cloudflare-python/commit/982f95ad5ff7f0271c47f65517ab98bd45dd81ce))
+* **api:** api update ([#2285](https://github.com/cloudflare/cloudflare-python/issues/2285)) ([9cae1f0](https://github.com/cloudflare/cloudflare-python/commit/9cae1f099fde4204821ce3d1cf53f823d340b9ed))
+* **api:** api update ([#2286](https://github.com/cloudflare/cloudflare-python/issues/2286)) ([efa8fcb](https://github.com/cloudflare/cloudflare-python/commit/efa8fcb9241f5dc73d020ba959b5b5c9914362d6))
+* **api:** api update ([#2288](https://github.com/cloudflare/cloudflare-python/issues/2288)) ([52ec839](https://github.com/cloudflare/cloudflare-python/commit/52ec8391c9efe608740ce3118fdd5b6f4fc1e0c7))
+* **api:** api update ([#2290](https://github.com/cloudflare/cloudflare-python/issues/2290)) ([db76849](https://github.com/cloudflare/cloudflare-python/commit/db7684993cff9cde91b0ad21637801cda763e5d7))
+* **api:** api update ([#2291](https://github.com/cloudflare/cloudflare-python/issues/2291)) ([17a3ce1](https://github.com/cloudflare/cloudflare-python/commit/17a3ce1057e0e3b2392fe9131cad1dd75511bfc3))
+* **api:** api update ([#2292](https://github.com/cloudflare/cloudflare-python/issues/2292)) ([5408013](https://github.com/cloudflare/cloudflare-python/commit/5408013619994ba4cc5559774e09a6d42d9abe82))
+* **api:** api update ([#2293](https://github.com/cloudflare/cloudflare-python/issues/2293)) ([f2cdcdc](https://github.com/cloudflare/cloudflare-python/commit/f2cdcdc4d6b545df85cd2f1f0b5de6889d787221))
+* **api:** api update ([#2294](https://github.com/cloudflare/cloudflare-python/issues/2294)) ([17db44d](https://github.com/cloudflare/cloudflare-python/commit/17db44d1b1a346c9e4fcb098a18133cc96a2b4de))
+* **api:** api update ([#2297](https://github.com/cloudflare/cloudflare-python/issues/2297)) ([1d4bea4](https://github.com/cloudflare/cloudflare-python/commit/1d4bea4918fedf83c7e3d23237130767c448f58c))
+* **api:** api update ([#2298](https://github.com/cloudflare/cloudflare-python/issues/2298)) ([2085a9e](https://github.com/cloudflare/cloudflare-python/commit/2085a9ea0312b66a6d354c0ccbfb167339ce43ba))
+* **api:** api update ([#2299](https://github.com/cloudflare/cloudflare-python/issues/2299)) ([429c4ee](https://github.com/cloudflare/cloudflare-python/commit/429c4ee023eeeaf05139c7cf98719686d44d0417))
+* **api:** api update ([#2313](https://github.com/cloudflare/cloudflare-python/issues/2313)) ([6c97352](https://github.com/cloudflare/cloudflare-python/commit/6c97352fd404cffb799f6862d7f00860ad93493d))
+* **api:** api update ([#2315](https://github.com/cloudflare/cloudflare-python/issues/2315)) ([09f456c](https://github.com/cloudflare/cloudflare-python/commit/09f456c084a2ac37f19adcc41b3807256d1ae6f7))
+* **api:** api update ([#2317](https://github.com/cloudflare/cloudflare-python/issues/2317)) ([c6cf3dc](https://github.com/cloudflare/cloudflare-python/commit/c6cf3dc770cff467edcc5d2f6a408bb66be11c7a))
+* **api:** api update ([#2318](https://github.com/cloudflare/cloudflare-python/issues/2318)) ([9229d53](https://github.com/cloudflare/cloudflare-python/commit/9229d539d1e8c2872af176744cabe7c1604fb93f))
+* **api:** api update ([#2320](https://github.com/cloudflare/cloudflare-python/issues/2320)) ([bdb21a5](https://github.com/cloudflare/cloudflare-python/commit/bdb21a52db862066a29a86e2a38477cc9ed9e040))
+* **api:** api update ([#2343](https://github.com/cloudflare/cloudflare-python/issues/2343)) ([1bd37b9](https://github.com/cloudflare/cloudflare-python/commit/1bd37b9d644696f4b5181791810fe39c57654796))
+* **api:** api update ([#2344](https://github.com/cloudflare/cloudflare-python/issues/2344)) ([4423d8f](https://github.com/cloudflare/cloudflare-python/commit/4423d8f45b52ba3cf221c995e066e5d0cff67e9e))
+* **api:** api update ([#2347](https://github.com/cloudflare/cloudflare-python/issues/2347)) ([8225a83](https://github.com/cloudflare/cloudflare-python/commit/8225a833982b22e8d5ef3a9bbe725a97fca7b7e3))
+* **api:** api update ([#2355](https://github.com/cloudflare/cloudflare-python/issues/2355)) ([1dedfa9](https://github.com/cloudflare/cloudflare-python/commit/1dedfa998d98b9dd8cde54f23f01fb65a0fe93bd))
+* **api:** clean up indirect models ([#2155](https://github.com/cloudflare/cloudflare-python/issues/2155)) ([503ab54](https://github.com/cloudflare/cloudflare-python/commit/503ab54a5afff1d832a1f9243bda27ad982e3451))
+* **api:** clean up missing model references ([#2138](https://github.com/cloudflare/cloudflare-python/issues/2138)) ([74f433a](https://github.com/cloudflare/cloudflare-python/commit/74f433a9e010471cfa87af98c2586195fb764c5d))
+* **api:** clean up missing models ([#2178](https://github.com/cloudflare/cloudflare-python/issues/2178)) ([bd94126](https://github.com/cloudflare/cloudflare-python/commit/bd94126a86d0cf376a8856a9c8077600285f2b70))
+* **api:** fix internal URL mappings ([#2267](https://github.com/cloudflare/cloudflare-python/issues/2267)) ([165bc8c](https://github.com/cloudflare/cloudflare-python/commit/165bc8c274b7f6688b95f018fd86d312a5de0a17))
+* **api:** introduce bulk operation methods ([#2177](https://github.com/cloudflare/cloudflare-python/issues/2177)) ([3fd5de2](https://github.com/cloudflare/cloudflare-python/commit/3fd5de24f338955457a1b47fa0fea3d7bfc796cc))
+* **api:** manual updates ([#2164](https://github.com/cloudflare/cloudflare-python/issues/2164)) ([3f20b98](https://github.com/cloudflare/cloudflare-python/commit/3f20b98dee636ed17903cff36351c66e97ac1795))
+* **api:** manual updates ([#2195](https://github.com/cloudflare/cloudflare-python/issues/2195)) ([2de0fb0](https://github.com/cloudflare/cloudflare-python/commit/2de0fb0b3f46aefd97d06e22b6441a573ee228a2))
+* **api:** manual updates ([#2207](https://github.com/cloudflare/cloudflare-python/issues/2207)) ([d40b099](https://github.com/cloudflare/cloudflare-python/commit/d40b09962fc1e3d0f96c2cace0a29a81ff4b026c))
+* **api:** manual updates ([#2226](https://github.com/cloudflare/cloudflare-python/issues/2226)) ([7065932](https://github.com/cloudflare/cloudflare-python/commit/70659321d956ea2512f2a0f7e33c4c198c34ee91))
+* **api:** manual updates ([#2255](https://github.com/cloudflare/cloudflare-python/issues/2255)) ([f70b142](https://github.com/cloudflare/cloudflare-python/commit/f70b142bfe940e4e6566e9e1f815ecda7b5dbe99))
+* **api:** manual updates ([#2295](https://github.com/cloudflare/cloudflare-python/issues/2295)) ([a3043d4](https://github.com/cloudflare/cloudflare-python/commit/a3043d4a8cc00e9c63597e5a6baabd6d207ceb63))
+* **api:** manual updates ([#2301](https://github.com/cloudflare/cloudflare-python/issues/2301)) ([91253c2](https://github.com/cloudflare/cloudflare-python/commit/91253c2a7c5245101caa220f8f44833d8a937008))
+* **api:** manual updates ([#2302](https://github.com/cloudflare/cloudflare-python/issues/2302)) ([df84d3a](https://github.com/cloudflare/cloudflare-python/commit/df84d3a36679693d2bed6ee4f8a73d82fb7fa8ef))
+* **api:** manual updates ([#2312](https://github.com/cloudflare/cloudflare-python/issues/2312)) ([f7ca287](https://github.com/cloudflare/cloudflare-python/commit/f7ca287ebc2001eb8e2c153fbf72561d05a5da63))
+* **api:** manual updates ([#2325](https://github.com/cloudflare/cloudflare-python/issues/2325)) ([2a2e199](https://github.com/cloudflare/cloudflare-python/commit/2a2e1991f7d1831ccd1010fedb699df1f91c89a9))
+* **api:** manual updates ([#2326](https://github.com/cloudflare/cloudflare-python/issues/2326)) ([7e80cb8](https://github.com/cloudflare/cloudflare-python/commit/7e80cb872d94c564f1eef0c8db3f141bcd864259))
+* **api:** manual updates ([#2349](https://github.com/cloudflare/cloudflare-python/issues/2349)) ([878ae25](https://github.com/cloudflare/cloudflare-python/commit/878ae25e6b05626f0b9fc97ecb37728cb54279fd))
+* **api:** manual updates ([#2351](https://github.com/cloudflare/cloudflare-python/issues/2351)) ([85fd586](https://github.com/cloudflare/cloudflare-python/commit/85fd5868a8e6b38f6ba46f06bd7688678892e106))
+* **api:** map in new endpoints for account owned tokens, dns setting views and worker assets ([#2144](https://github.com/cloudflare/cloudflare-python/issues/2144)) ([6e79a67](https://github.com/cloudflare/cloudflare-python/commit/6e79a67fbf36ca0f2325356f7d1137d84f5cb1fc))
+* **api:** map more endpoints ([#2287](https://github.com/cloudflare/cloudflare-python/issues/2287)) ([ce7f872](https://github.com/cloudflare/cloudflare-python/commit/ce7f87207e24de6804309af06b84dfc11c9dded2))
+* **api:** mark JSON as initialism ([#2324](https://github.com/cloudflare/cloudflare-python/issues/2324)) ([da91e21](https://github.com/cloudflare/cloudflare-python/commit/da91e219eda9065b5703aa70bbbcc9340cacf5de))
+* **api:** remap models for magic visibility ([#2128](https://github.com/cloudflare/cloudflare-python/issues/2128)) ([dae1150](https://github.com/cloudflare/cloudflare-python/commit/dae115058bdea915f5aa5b386a68c4387b356ef6))
+* **api:** remove unneeded DNS transforms ([#2341](https://github.com/cloudflare/cloudflare-python/issues/2341)) ([11683b6](https://github.com/cloudflare/cloudflare-python/commit/11683b6141096c18d14e01d11892bd177bdd3040))
+* **api:** skip authorization failures in prism ([#2323](https://github.com/cloudflare/cloudflare-python/issues/2323)) ([cc90fdc](https://github.com/cloudflare/cloudflare-python/commit/cc90fdc42244a7110a6365c66c10bbc1ca9ea46b))
+* **api:** update api shield operation endpoint ([#2348](https://github.com/cloudflare/cloudflare-python/issues/2348)) ([61a852b](https://github.com/cloudflare/cloudflare-python/commit/61a852b624877c54705bb5b5e7648e424cfe9a57))
+* **api:** Update verb on PATCH zone hold method ([#2275](https://github.com/cloudflare/cloudflare-python/issues/2275)) ([5c57d32](https://github.com/cloudflare/cloudflare-python/commit/5c57d32bf17901ec1e258cdbefad49f0f3e2ed06))
+* **api:** update via SDK Studio ([#2182](https://github.com/cloudflare/cloudflare-python/issues/2182)) ([660adfd](https://github.com/cloudflare/cloudflare-python/commit/660adfde851b2e4110bd98070ac7dd684ba009cc))
+* **api:** update via SDK Studio ([#2183](https://github.com/cloudflare/cloudflare-python/issues/2183)) ([cda5a42](https://github.com/cloudflare/cloudflare-python/commit/cda5a42a9ed789b99ae168e52e99255bbf1d946f))
+* **api:** update via SDK Studio ([#2184](https://github.com/cloudflare/cloudflare-python/issues/2184)) ([838f684](https://github.com/cloudflare/cloudflare-python/commit/838f684bb71ddb6f9fc0a8b4830340a14421f15c))
+* **api:** update via SDK Studio ([#2185](https://github.com/cloudflare/cloudflare-python/issues/2185)) ([e727768](https://github.com/cloudflare/cloudflare-python/commit/e727768f549e968b5f906f768a46a7930d59ab4f))
+* **api:** update via SDK Studio ([#2187](https://github.com/cloudflare/cloudflare-python/issues/2187)) ([4e1d81a](https://github.com/cloudflare/cloudflare-python/commit/4e1d81a1640edbde3a58fa79451c0d4287c8abd9))
+* **api:** update via SDK Studio ([#2189](https://github.com/cloudflare/cloudflare-python/issues/2189)) ([93cfe28](https://github.com/cloudflare/cloudflare-python/commit/93cfe2870ad304ba87c7a055685f12121a470b53))
+* **api:** update via SDK Studio ([#2190](https://github.com/cloudflare/cloudflare-python/issues/2190)) ([4b59193](https://github.com/cloudflare/cloudflare-python/commit/4b5919334b2d9d758c1d48e3aca466322c061752))
+* **api:** update via SDK Studio ([#2191](https://github.com/cloudflare/cloudflare-python/issues/2191)) ([b480965](https://github.com/cloudflare/cloudflare-python/commit/b48096544baf31b65ec0a2a7f2279eee8716110f))
+* **api:** update via SDK Studio ([#2192](https://github.com/cloudflare/cloudflare-python/issues/2192)) ([f1b6c86](https://github.com/cloudflare/cloudflare-python/commit/f1b6c86ef5d49e369db6d6edd33527cf06796110))
+* **api:** update via SDK Studio ([#2193](https://github.com/cloudflare/cloudflare-python/issues/2193)) ([d4deaed](https://github.com/cloudflare/cloudflare-python/commit/d4deaed06b6f87c079b07c8b2d00dbe7c857be5c))
+* **api:** update via SDK Studio ([#2194](https://github.com/cloudflare/cloudflare-python/issues/2194)) ([9949651](https://github.com/cloudflare/cloudflare-python/commit/9949651a0667f934d1de17a4ee564a82e313b42f))
+* **cloud_connector:** define body param name ([#2314](https://github.com/cloudflare/cloudflare-python/issues/2314)) ([b04ba76](https://github.com/cloudflare/cloudflare-python/commit/b04ba760dcdc0f7f47edc48613f3f8ee26ba7dc4))
+* **content_scanning:** introduce support ([#2254](https://github.com/cloudflare/cloudflare-python/issues/2254)) ([39bd39c](https://github.com/cloudflare/cloudflare-python/commit/39bd39c5446fe5e7861577fd60a33bbf47ab0459))
+* Delete examples/.keep ([ebd0a3a](https://github.com/cloudflare/cloudflare-python/commit/ebd0a3af400c8a5581c536ec33c2cdaa8c47c230))
+* **dex:** add commands support ([#2248](https://github.com/cloudflare/cloudflare-python/issues/2248)) ([8b5316e](https://github.com/cloudflare/cloudflare-python/commit/8b5316e41c3f991f3d00e8056d6fcc6691ebd315))
+* **dlp:** disable problematic test ([#2261](https://github.com/cloudflare/cloudflare-python/issues/2261)) ([560801e](https://github.com/cloudflare/cloudflare-python/commit/560801e9823b6d14b0fcc81f0dae6a01bf803fdc))
+* **dlp:** skip tests for `entries` update due to HTTP 422 in prism ([#2331](https://github.com/cloudflare/cloudflare-python/issues/2331)) ([0a952c0](https://github.com/cloudflare/cloudflare-python/commit/0a952c0532b30863206e11482f4bca004376012d))
+* **dns_firewall:** break out into standalone package ([#2235](https://github.com/cloudflare/cloudflare-python/issues/2235)) ([34e5a29](https://github.com/cloudflare/cloudflare-python/commit/34e5a2986d27893aad15ba1a5fb2b52b906b742e))
+* **dns:** add models for batch operations and response ([#2339](https://github.com/cloudflare/cloudflare-python/issues/2339)) ([645adba](https://github.com/cloudflare/cloudflare-python/commit/645adba8004c7d1331534c1929cedcd78f990341))
+* **dns:** fix model oneOf ([#2278](https://github.com/cloudflare/cloudflare-python/issues/2278)) ([e5c69df](https://github.com/cloudflare/cloudflare-python/commit/e5c69df85f4b6fb713998a9637b2cec4bf736103))
+* **dns:** remove `delta` model ([#2242](https://github.com/cloudflare/cloudflare-python/issues/2242)) ([571fe0e](https://github.com/cloudflare/cloudflare-python/commit/571fe0eafb49c9354dd72c8108deec22f6e7cced))
+* **dnssec:** move under DNS namespace ([#2233](https://github.com/cloudflare/cloudflare-python/issues/2233)) ([40cb3e1](https://github.com/cloudflare/cloudflare-python/commit/40cb3e10a7f55565fcdeacc7a72541c8ad995f26))
+* **examples:** update paths to reflect namespace changes ([#2334](https://github.com/cloudflare/cloudflare-python/issues/2334)) ([7af6c00](https://github.com/cloudflare/cloudflare-python/commit/7af6c0025b2560a9360a7db24d22e39855c5162d))
+* fix(project): constrain incompatible httpx and pydantic versions ([cb5fbad](https://github.com/cloudflare/cloudflare-python/commit/cb5fbad85238e1d69486c5b0f462bbb2dfc4a196))
+* **fleet_status:** update path placeholders to match conventions ([#2153](https://github.com/cloudflare/cloudflare-python/issues/2153)) ([66d6d48](https://github.com/cloudflare/cloudflare-python/commit/66d6d48e74d138083aaeaa23f3ffd61421cea0e5))
+* generate more types that are used as request bodies ([#2263](https://github.com/cloudflare/cloudflare-python/issues/2263)) ([acbdc24](https://github.com/cloudflare/cloudflare-python/commit/acbdc24863007e8325b9418442177b4c8c8872f7))
+* **iam:** fix model mappings ([#2154](https://github.com/cloudflare/cloudflare-python/issues/2154)) ([354f6d2](https://github.com/cloudflare/cloudflare-python/commit/354f6d28d063a98f23f0164d8d2f52077f541f3f))
+* **infrastructure_targets:** add bulk endpoints ([#2246](https://github.com/cloudflare/cloudflare-python/issues/2246)) ([e2f5e1b](https://github.com/cloudflare/cloudflare-python/commit/e2f5e1b186e276930e96fb0c6abe3367769a1c38))
+* **internal:** update path placeholders ([#2224](https://github.com/cloudflare/cloudflare-python/issues/2224)) ([2cad4a0](https://github.com/cloudflare/cloudflare-python/commit/2cad4a00e9468813e3c41bf22e7bac67e7abdcd3))
+* **kv:** move analytics under existing namespace ([#2239](https://github.com/cloudflare/cloudflare-python/issues/2239)) ([375bc8c](https://github.com/cloudflare/cloudflare-python/commit/375bc8c56e744bc1dfaefc9a508b263d40298c8d))
+* **leaked_credential_check:** add terraform resource ([#2229](https://github.com/cloudflare/cloudflare-python/issues/2229)) ([2b35234](https://github.com/cloudflare/cloudflare-python/commit/2b35234067d54ac83fcf2936cda096ebc00326c9))
+* **list_item:** remove duplicated `anyOf` properties from component ([#2342](https://github.com/cloudflare/cloudflare-python/issues/2342)) ([2a3b8c5](https://github.com/cloudflare/cloudflare-python/commit/2a3b8c5c9564a4fed1ec85e2be1347d0e9dc324a))
+* **loa_documents:** move download subresource into parent as `get` ([#2304](https://github.com/cloudflare/cloudflare-python/issues/2304)) ([c10d3b7](https://github.com/cloudflare/cloudflare-python/commit/c10d3b7485614eb6db9095970cfde190d2d04f26))
+* **origin_post_quantum_encryption:** swap PUT for PATCH operation ([#2321](https://github.com/cloudflare/cloudflare-python/issues/2321)) ([f6b6e83](https://github.com/cloudflare/cloudflare-python/commit/f6b6e83986b80b1efdc20a5cac129d7690f8ce0b))
+* **pagerules:** rename namespace to page_rules ([#2262](https://github.com/cloudflare/cloudflare-python/issues/2262)) ([72b7def](https://github.com/cloudflare/cloudflare-python/commit/72b7defac7788d481c84975c2fdd78a94a0692f1))
+* **python:** expand `model_type` rename to paths as well ([#2156](https://github.com/cloudflare/cloudflare-python/issues/2156)) ([9abf6d5](https://github.com/cloudflare/cloudflare-python/commit/9abf6d52c26439bf77583070e71b0826df8d424d))
+* **r2_bucket:** add `cors` support ([#2196](https://github.com/cloudflare/cloudflare-python/issues/2196)) ([8ed5f71](https://github.com/cloudflare/cloudflare-python/commit/8ed5f71bba52a6946622b7f5067beaea27ccc39e))
+* **r2:** rename `cf-r2-jurisdiction` to more usable `jurisdiction` parameter ([#2308](https://github.com/cloudflare/cloudflare-python/issues/2308)) ([5dfdcbd](https://github.com/cloudflare/cloudflare-python/commit/5dfdcbd6e17515a4aca686e85b16c49e1149640f))
+* **r2:** rename `cf-r2-jurisdiction` to more usable `jurisdiction` parameter ([#2309](https://github.com/cloudflare/cloudflare-python/issues/2309)) ([fd63955](https://github.com/cloudflare/cloudflare-python/commit/fd6395586b30e623f1bab71ac00fea7357411e14))
+* **r2:** rename `cf-r2-jurisdiction` to more usable `jurisdiction` parameter ([#2310](https://github.com/cloudflare/cloudflare-python/issues/2310)) ([a1ef1be](https://github.com/cloudflare/cloudflare-python/commit/a1ef1be8af3964536e101ad12a6f93016dc301da))
+* release: 3.1.1 ([6a4602a](https://github.com/cloudflare/cloudflare-python/commit/6a4602abc1823f5736310de65b31ea2e61150966))
+* swap DNS example to A ([792e093](https://github.com/cloudflare/cloudflare-python/commit/792e09384144e5dd93f95ac3698d4d43446172f0))
+* **tokens:** move condition and policy to shared models ([#2158](https://github.com/cloudflare/cloudflare-python/issues/2158)) ([f92d492](https://github.com/cloudflare/cloudflare-python/commit/f92d4929376afd516df711cf1c924f6271968e02))
+* **tokens:** move token value model to shared ([#2157](https://github.com/cloudflare/cloudflare-python/issues/2157)) ([8c246c1](https://github.com/cloudflare/cloudflare-python/commit/8c246c1361c13e2b1fb113c60ce53a136be44c64))
+* **url_scanner:** swap all methods to be v2 only ([#2231](https://github.com/cloudflare/cloudflare-python/issues/2231)) ([3823729](https://github.com/cloudflare/cloudflare-python/commit/3823729022c9ca725dcedde6aa63c219fa995ee5))
+* **urlscanner:** swap to v2 create ([#2225](https://github.com/cloudflare/cloudflare-python/issues/2225)) ([c04d762](https://github.com/cloudflare/cloudflare-python/commit/c04d762fc05726d68830b088d7fbfd84894fbf32))
+* **warp_connector:** move under zero trust namespace ([#2220](https://github.com/cloudflare/cloudflare-python/issues/2220)) ([de07ba2](https://github.com/cloudflare/cloudflare-python/commit/de07ba24fc81f72885d59f10b4c8e7eef9826944))
+* **workers:** add routes support ([#2279](https://github.com/cloudflare/cloudflare-python/issues/2279)) ([0991241](https://github.com/cloudflare/cloudflare-python/commit/0991241905ea11aa4a19918ec1bce63ce7600202))
+* **zero_trust_device_certificates:** update path placeholders ([#2204](https://github.com/cloudflare/cloudflare-python/issues/2204)) ([f43f392](https://github.com/cloudflare/cloudflare-python/commit/f43f3928ec1abb15151cfb82934de2d20a8e3fed))
+* **zero_trust_device:** reshuffle structure to allow use of custom and default ([#2137](https://github.com/cloudflare/cloudflare-python/issues/2137)) ([e323e62](https://github.com/cloudflare/cloudflare-python/commit/e323e62645bbaac3203bf0119217834683babfef))
+* **zero_trust_organization:** swap to upsert for creation ([#2186](https://github.com/cloudflare/cloudflare-python/issues/2186)) ([eeb6d8e](https://github.com/cloudflare/cloudflare-python/commit/eeb6d8eeb3a39e1a86b557a29a161ff92fd047fe))
+* **zone_settings:** update `origin_max_http_version` model ([#2311](https://github.com/cloudflare/cloudflare-python/issues/2311)) ([20fbd7d](https://github.com/cloudflare/cloudflare-python/commit/20fbd7d260eb6b14adf3b2529aa4b2614eaaabec))
+* **zone_transfers:** move under DNS namespace ([#2234](https://github.com/cloudflare/cloudflare-python/issues/2234)) ([c3cd782](https://github.com/cloudflare/cloudflare-python/commit/c3cd782dea8308b6a4586f596a535ef740369d67))
+
+
+### Bug Fixes
+
+* **api:** better support union schemas with common properties ([#2340](https://github.com/cloudflare/cloudflare-python/issues/2340)) ([e6ff06c](https://github.com/cloudflare/cloudflare-python/commit/e6ff06cb56f6b79e789064217e7ee50f6644ce82))
+* **client:** compat with new httpx 0.28.0 release ([#2228](https://github.com/cloudflare/cloudflare-python/issues/2228)) ([a369813](https://github.com/cloudflare/cloudflare-python/commit/a3698135b838d03f700276109276727471b76ecf))
+* **client:** only call .close() when needed ([#2330](https://github.com/cloudflare/cloudflare-python/issues/2330)) ([349d7af](https://github.com/cloudflare/cloudflare-python/commit/349d7af56845d29df10a1f6666c303e6169e2620))
+* correctly handle deserialising `cls` fields ([#2350](https://github.com/cloudflare/cloudflare-python/issues/2350)) ([a1e865f](https://github.com/cloudflare/cloudflare-python/commit/a1e865f0270d6ee3381b03d1c6d37c2bbbf218dd))
+* **example:** update example to reflect new structure ([d723b37](https://github.com/cloudflare/cloudflare-python/commit/d723b3769b26da7e6110fe831b8b83c6da492cd1))
+* **internal:** add cleaner handling of DNS unions ([#2270](https://github.com/cloudflare/cloudflare-python/issues/2270)) ([582142f](https://github.com/cloudflare/cloudflare-python/commit/582142f123d8a0558f692a2ebd7d611565ce7a98))
+* **project:** constrain incompatible httpx and pydantic versions ([00f4d23](https://github.com/cloudflare/cloudflare-python/commit/00f4d2345834d04ddd3bb343360b2edccc5ca060))
+* **types:** correct forward usage ([41a2158](https://github.com/cloudflare/cloudflare-python/commit/41a215873a52150ce039f36e8733abca5725b030))
+* **types:** work around cyclical import error ([10e2b12](https://github.com/cloudflare/cloudflare-python/commit/10e2b1241cf85c916a60db52fc1707bd88535eff))
+* **urlscanner:** fix invalid schema definition for plain text ([#2256](https://github.com/cloudflare/cloudflare-python/issues/2256)) ([db72d31](https://github.com/cloudflare/cloudflare-python/commit/db72d31b7cc2e4ca249e71c36603a3393c61f093))
+* **waiting_room_rules:** define `body_param_name` for bulk rules endpoint  ([#2139](https://github.com/cloudflare/cloudflare-python/issues/2139)) ([a88b77d](https://github.com/cloudflare/cloudflare-python/commit/a88b77db25873cf057bece8a86e3a6b64746caf4))
+
+
+### Reverts
+
+* fix(project): constrain incompatible httpx and pydantic versions ([4823b68](https://github.com/cloudflare/cloudflare-python/commit/4823b68243dc8c0b26b3c479a08ee607115f8108))
+
+
+### Chores
+
+* add missing isclass check ([#2316](https://github.com/cloudflare/cloudflare-python/issues/2316)) ([a271105](https://github.com/cloudflare/cloudflare-python/commit/a271105854ad21137adef848f77bcb71f8083e77))
+* **examples:** fix DNS record example ([520a260](https://github.com/cloudflare/cloudflare-python/commit/520a260515f5bc041ae3ac81351665d3aceee7ed))
+* fix cyclical imports ([#2353](https://github.com/cloudflare/cloudflare-python/issues/2353)) ([7f83adf](https://github.com/cloudflare/cloudflare-python/commit/7f83adf1533becfec870dd0da2082a0d4c28cec9))
+* **internal:** add support for TypeAliasType ([#2265](https://github.com/cloudflare/cloudflare-python/issues/2265)) ([f68f721](https://github.com/cloudflare/cloudflare-python/commit/f68f721a33eaa613afd35659b2ab597fe4fa6330))
+* **internal:** bump httpx dependency ([#2328](https://github.com/cloudflare/cloudflare-python/issues/2328)) ([799c954](https://github.com/cloudflare/cloudflare-python/commit/799c954083db83726ed5be6a7b0b53713f258f3f))
+* **internal:** bump pydantic dependency ([#2251](https://github.com/cloudflare/cloudflare-python/issues/2251)) ([ff3807c](https://github.com/cloudflare/cloudflare-python/commit/ff3807c96489abd5a16254e242ee51be7e72696d))
+* **internal:** bump pyright ([#2232](https://github.com/cloudflare/cloudflare-python/issues/2232)) ([7d503e6](https://github.com/cloudflare/cloudflare-python/commit/7d503e6c363aa6f78603c9df0bce20edb33a9d50))
+* **internal:** bump pyright ([#2264](https://github.com/cloudflare/cloudflare-python/issues/2264)) ([72e5f89](https://github.com/cloudflare/cloudflare-python/commit/72e5f89f7dec1bb5d37dc374f16858373250ff5b))
+* **internal:** codegen related update ([#2176](https://github.com/cloudflare/cloudflare-python/issues/2176)) ([c810755](https://github.com/cloudflare/cloudflare-python/commit/c810755564d385aceab09b2d3afb6b2186a0a19c))
+* **internal:** codegen related update ([#2213](https://github.com/cloudflare/cloudflare-python/issues/2213)) ([5bf1ef5](https://github.com/cloudflare/cloudflare-python/commit/5bf1ef5e81c43c69294d9c230fb730ebfbee1174))
+* **internal:** codegen related update ([#2214](https://github.com/cloudflare/cloudflare-python/issues/2214)) ([515e68c](https://github.com/cloudflare/cloudflare-python/commit/515e68c5bd6ca9215e35e4d118a0bf9d4dff3e31))
+* **internal:** codegen related update ([#2217](https://github.com/cloudflare/cloudflare-python/issues/2217)) ([09de961](https://github.com/cloudflare/cloudflare-python/commit/09de961772df5289817225b381b41a39073e3037))
+* **internal:** codegen related update ([#2218](https://github.com/cloudflare/cloudflare-python/issues/2218)) ([55b8cff](https://github.com/cloudflare/cloudflare-python/commit/55b8cff543096383728c16394cd10af26c2736ee))
+* **internal:** codegen related update ([#2230](https://github.com/cloudflare/cloudflare-python/issues/2230)) ([1156419](https://github.com/cloudflare/cloudflare-python/commit/1156419c4db1c9cbdc155e0c9a655bda7f16cfea))
+* **internal:** codegen related update ([#2253](https://github.com/cloudflare/cloudflare-python/issues/2253)) ([89e9982](https://github.com/cloudflare/cloudflare-python/commit/89e9982bc2c713aa32c4f39dfd4fe8f02fa6cee8))
+* **internal:** codegen related update ([#2282](https://github.com/cloudflare/cloudflare-python/issues/2282)) ([712c994](https://github.com/cloudflare/cloudflare-python/commit/712c9942761fcae1277545d7814ae07d88a3191e))
+* **internal:** codegen related update ([#2289](https://github.com/cloudflare/cloudflare-python/issues/2289)) ([9cb1e41](https://github.com/cloudflare/cloudflare-python/commit/9cb1e41da92e3610e53562529c702b4cc4a51935))
+* **internal:** codegen related update ([#2300](https://github.com/cloudflare/cloudflare-python/issues/2300)) ([73ec2ba](https://github.com/cloudflare/cloudflare-python/commit/73ec2ba285e5b6693234649f595acae1ed3cda52))
+* **internal:** codegen related update ([#2327](https://github.com/cloudflare/cloudflare-python/issues/2327)) ([ff79b8b](https://github.com/cloudflare/cloudflare-python/commit/ff79b8b6b1ff0fa3c6bb78095e661da4ef89ef6d))
+* **internal:** codegen related update ([#2337](https://github.com/cloudflare/cloudflare-python/issues/2337)) ([e0e0068](https://github.com/cloudflare/cloudflare-python/commit/e0e006853574be398ffa3d3d052b5be42148b1cf))
+* **internal:** exclude mypy from running on tests ([#2222](https://github.com/cloudflare/cloudflare-python/issues/2222)) ([ee088e9](https://github.com/cloudflare/cloudflare-python/commit/ee088e9f998ac5ea8e1e0b2f307c8840c4650580))
+* **internal:** fix formatting ([a824f1b](https://github.com/cloudflare/cloudflare-python/commit/a824f1b1ea42835c2e997410497b93bc4534db04))
+* **internal:** fix some typos ([#2283](https://github.com/cloudflare/cloudflare-python/issues/2283)) ([6b98f7a](https://github.com/cloudflare/cloudflare-python/commit/6b98f7a14e94290f6d289395d1317d6764221a0f))
+* **internal:** remove some duplicated imports ([#2272](https://github.com/cloudflare/cloudflare-python/issues/2272)) ([2fe9a70](https://github.com/cloudflare/cloudflare-python/commit/2fe9a7082bce51ad786821210d444dfa17594dfa))
+* **internal:** skip broken tests ([#2345](https://github.com/cloudflare/cloudflare-python/issues/2345)) ([9228d48](https://github.com/cloudflare/cloudflare-python/commit/9228d480c3839e95ad5bfeb70758ce4db9befa74))
+* **internal:** updated imports ([#2274](https://github.com/cloudflare/cloudflare-python/issues/2274)) ([352b69d](https://github.com/cloudflare/cloudflare-python/commit/352b69df4352df21f9259eced108f9f93ffcd82b))
+* make the `Omit` type public ([#2241](https://github.com/cloudflare/cloudflare-python/issues/2241)) ([4b2bf34](https://github.com/cloudflare/cloudflare-python/commit/4b2bf34d7bd2e0e12b8af49e0347b404c73e44e6))
+* rebuild project due to codegen change ([#2134](https://github.com/cloudflare/cloudflare-python/issues/2134)) ([fdc0bb6](https://github.com/cloudflare/cloudflare-python/commit/fdc0bb6474d791e8fc51adf31e1d2fa8997367e9))
+* rebuild project due to codegen change ([#2141](https://github.com/cloudflare/cloudflare-python/issues/2141)) ([1914be1](https://github.com/cloudflare/cloudflare-python/commit/1914be19fb8b7a98ebda76a3199520acb48a57f2))
+* rebuild project due to codegen change ([#2145](https://github.com/cloudflare/cloudflare-python/issues/2145)) ([6473ee6](https://github.com/cloudflare/cloudflare-python/commit/6473ee69bc6eeaa8b03084a8b0f80420acf1cbc2))
+* rebuild project due to codegen change ([#2165](https://github.com/cloudflare/cloudflare-python/issues/2165)) ([877e8c2](https://github.com/cloudflare/cloudflare-python/commit/877e8c2484c620c3f2b9ac70e26732ef7fcb9afa))
+* rebuild project due to codegen change ([#2174](https://github.com/cloudflare/cloudflare-python/issues/2174)) ([dbebda3](https://github.com/cloudflare/cloudflare-python/commit/dbebda3f4635aed4452e12ff11ea3af2c89f33f2))
+* remove now unused `cached-property` dep ([#2208](https://github.com/cloudflare/cloudflare-python/issues/2208)) ([9218b3b](https://github.com/cloudflare/cloudflare-python/commit/9218b3b48b37ee5d40681aa1395382da18d45862))
+* small refactors ([#2306](https://github.com/cloudflare/cloudflare-python/issues/2306)) ([8edd6d6](https://github.com/cloudflare/cloudflare-python/commit/8edd6d6cbd12b34c420ef2e8b8f2db87390ceb50))
+* switch to TypeAliasType for request tracer ([332f48d](https://github.com/cloudflare/cloudflare-python/commit/332f48d846b2af88a4133e71248ee0d69f5d68b1))
+* updates ([#2260](https://github.com/cloudflare/cloudflare-python/issues/2260)) ([d2f86b6](https://github.com/cloudflare/cloudflare-python/commit/d2f86b69e9268d2151638115b3fdbc3af3094eb9))
+* updates ([#2352](https://github.com/cloudflare/cloudflare-python/issues/2352)) ([b241f5b](https://github.com/cloudflare/cloudflare-python/commit/b241f5b4f5b5607462169164a376bc66c368775b))
+* use TypeAliasType for Pydantic v2 only ([da884ff](https://github.com/cloudflare/cloudflare-python/commit/da884ff78bc24160254501c427d5fac838f0aafc))
+* workaround circular import error ([#2210](https://github.com/cloudflare/cloudflare-python/issues/2210)) ([eb4ca16](https://github.com/cloudflare/cloudflare-python/commit/eb4ca167049be8517da3a422ca80696733550116))
+
+
+### Documentation
+
+* **api.md:** fix return type annotations ([#2215](https://github.com/cloudflare/cloudflare-python/issues/2215)) ([ce08157](https://github.com/cloudflare/cloudflare-python/commit/ce08157eefb2cee486cee2e4e0551e849daca7bf))
+* fix typos ([#2336](https://github.com/cloudflare/cloudflare-python/issues/2336)) ([5a0030a](https://github.com/cloudflare/cloudflare-python/commit/5a0030a63d92763c38338682b6fc91ea4ac5a381))
+* **readme:** example snippet for client context manager ([#2280](https://github.com/cloudflare/cloudflare-python/issues/2280)) ([54e1a34](https://github.com/cloudflare/cloudflare-python/commit/54e1a34f48a56f8403e7bd55722a2023894d91a1))
+* **readme:** fix http client proxies example ([#2252](https://github.com/cloudflare/cloudflare-python/issues/2252)) ([3f9fd35](https://github.com/cloudflare/cloudflare-python/commit/3f9fd35d891c13d409dca89c1d640d73db0a3b01))
+
 ## 3.1.0 (2024-07-16)
 
 Full Changelog: [v3.0.1...v3.1.0](https://github.com/cloudflare/cloudflare-python/compare/v3.0.1...v3.1.0)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 655bcd3b39d..f6d738cea14 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,9 +2,13 @@
 
 ### With Rye
 
-We use [Rye](https://rye.astral.sh/) to manage dependencies so we highly recommend [installing it](https://rye.astral.sh/guide/installation/) as it will automatically provision a Python environment with the expected Python version.
+We use [Rye](https://rye.astral.sh/) to manage dependencies because it will automatically provision a Python environment with the expected Python version. To set it up, run:
 
-After installing Rye, you'll just have to run this command:
+```sh
+$ ./scripts/bootstrap
+```
+
+Or [install Rye manually](https://rye.astral.sh/guide/installation/) and run:
 
 ```sh
 $ rye sync --all-features
@@ -13,8 +17,7 @@ $ rye sync --all-features
 You can then run scripts using `rye run python script.py` or by activating the virtual environment:
 
 ```sh
-$ rye shell
-# or manually activate - https://docs.python.org/3/library/venv.html#how-venvs-work
+# Activate the virtual environment - https://docs.python.org/3/library/venv.html#how-venvs-work
 $ source .venv/bin/activate
 
 # now you can omit the `rye run` prefix
@@ -31,25 +34,25 @@ $ pip install -r requirements-dev.lock
 
 ## Modifying/Adding code
 
-Most of the SDK is generated code, and any modified code will be overridden on the next generation. The
-`src/cloudflare/lib/` and `examples/` directories are exceptions and will never be overridden.
+Most of the SDK is generated code. Modifications to code will be persisted between generations, but may
+result in merge conflicts between manual patches and changes from the generator. The generator will never
+modify the contents of the `src/cloudflare/lib/` and `examples/` directories.
 
 ## Adding and running examples
 
-All files in the `examples/` directory are not modified by the Stainless generator and can be freely edited or
-added to.
+All files in the `examples/` directory are not modified by the generator and can be freely edited or added to.
 
-```bash
+```py
 # add an example to examples/<your-example>.py
 
 #!/usr/bin/env -S rye run python
 …
 ```
 
-```
-chmod +x examples/<your-example>.py
+```sh
+$ chmod +x examples/<your-example>.py
 # run the example against your api
-./examples/<your-example>.py
+$ ./examples/<your-example>.py
 ```
 
 ## Using the repository from source
@@ -58,8 +61,8 @@ If you’d like to use the repository from source, you can either install from g
 
 To install via git:
 
-```bash
-pip install git+ssh://git@github.com/cloudflare/cloudflare-python.git
+```sh
+$ pip install git+ssh://git@github.com/cloudflare/cloudflare-python.git
 ```
 
 Alternatively, you can build from source and install the wheel file:
@@ -68,29 +71,29 @@ Building this package will create two files in the `dist/` directory, a `.tar.gz
 
 To create a distributable version of the library, all you have to do is run this command:
 
-```bash
-rye build
+```sh
+$ rye build
 # or
-python -m build
+$ python -m build
 ```
 
 Then to install:
 
 ```sh
-pip install ./path-to-wheel-file.whl
+$ pip install ./path-to-wheel-file.whl
 ```
 
 ## Running tests
 
 Most tests require you to [set up a mock server](https://github.com/stoplightio/prism) against the OpenAPI spec to run the tests.
 
-```bash
+```sh
 # you will need npm installed
-npx prism mock path/to/your/openapi.yml
+$ npx prism mock path/to/your/openapi.yml
 ```
 
-```bash
-rye run pytest
+```sh
+$ ./scripts/test
 ```
 
 ## Linting and formatting
@@ -100,14 +103,14 @@ This repository uses [ruff](https://github.com/astral-sh/ruff) and
 
 To lint:
 
-```bash
-rye run lint
+```sh
+$ ./scripts/lint
 ```
 
 To format and fix all ruff issues automatically:
 
-```bash
-rye run format
+```sh
+$ ./scripts/format
 ```
 
 ## Publishing and releases
diff --git a/LICENSE b/LICENSE
index 827fca03dd8..27db488677c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2024 Cloudflare
+   Copyright 2026 Cloudflare
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index 2175e1eeb78..9f9d4b169a7 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,23 @@
 # Cloudflare Python API library
 
-[![PyPI version](https://img.shields.io/pypi/v/cloudflare.svg)](https://pypi.org/project/cloudflare/)
+<!-- prettier-ignore -->
+[![PyPI version](https://img.shields.io/pypi/v/cloudflare.svg?label=pypi%20(stable))](https://pypi.org/project/cloudflare/)
 
-The Cloudflare Python library provides convenient access to the Cloudflare REST API from any Python 3.7+
+The Cloudflare Python library provides convenient access to the Cloudflare REST API from any Python 3.9+
 application. The library includes type definitions for all request params and response fields,
 and offers both synchronous and asynchronous clients powered by [httpx](https://github.com/encode/httpx).
 
+It is generated with [Stainless](https://www.stainless.com/).
+
+## MCP Server
+
+Use the Cloudflare MCP Server to enable AI assistants to interact with this API, allowing them to explore endpoints, make test requests, and use documentation to help integrate this SDK into your application.
+
+[![Add to Cursor](https://cursor.com/deeplink/mcp-install-dark.svg)](https://cursor.com/en-US/install-mcp?name=cloudflare-mcp&config=eyJjb21tYW5kIjoibnB4IiwiYXJncyI6WyIteSIsImNsb3VkZmxhcmUtbWNwIl19)
+[![Install in VS Code](https://img.shields.io/badge/_-Add_to_VS_Code-blue?style=for-the-badge&logo=data:image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGZpbGw9Im5vbmUiIHZpZXdCb3g9IjAgMCA0MCA0MCI+PHBhdGggZmlsbD0iI0VFRSIgZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMzAuMjM1IDM5Ljg4NGEyLjQ5MSAyLjQ5MSAwIDAgMS0xLjc4MS0uNzNMMTIuNyAyNC43OGwtMy40NiAyLjYyNC0zLjQwNiAyLjU4MmExLjY2NSAxLjY2NSAwIDAgMS0xLjA4Mi4zMzggMS42NjQgMS42NjQgMCAwIDEtMS4wNDYtLjQzMWwtMi4yLTJhMS42NjYgMS42NjYgMCAwIDEgMC0yLjQ2M0w3LjQ1OCAyMCA0LjY3IDE3LjQ1MyAxLjUwNyAxNC41N2ExLjY2NSAxLjY2NSAwIDAgMSAwLTIuNDYzbDIuMi0yYTEuNjY1IDEuNjY1IDAgMCAxIDIuMTMtLjA5N2w2Ljg2MyA1LjIwOUwyOC40NTIuODQ0YTIuNDg4IDIuNDg4IDAgMCAxIDEuODQxLS43MjljLjM1MS4wMDkuNjk5LjA5MSAxLjAxOS4yNDVsOC4yMzYgMy45NjFhMi41IDIuNSAwIDAgMSAxLjQxNSAyLjI1M3YuMDk5LS4wNDVWMzMuMzd2LS4wNDUuMDk1YTIuNTAxIDIuNTAxIDAgMCAxLTEuNDE2IDIuMjU3bC04LjIzNSAzLjk2MWEyLjQ5MiAyLjQ5MiAwIDAgMS0xLjA3Ny4yNDZabS43MTYtMjguOTQ3LTExLjk0OCA5LjA2MiAxMS45NTIgOS4wNjUtLjAwNC0xOC4xMjdaIi8+PC9zdmc+)](https://vscode.stainless.com/mcp/%7B%22name%22%3A%22cloudflare-mcp%22%2C%22command%22%3A%22npx%22%2C%22args%22%3A%5B%22-y%22%2C%22cloudflare-mcp%22%5D%7D)
+
+> Note: You may need to set environment variables in your MCP client.
+
 ## Documentation
 
 The REST API documentation can be found on [developers.cloudflare.com](https://developers.cloudflare.com/api). The full API of this library can be found in [api.md](api.md).
@@ -14,7 +26,7 @@ The REST API documentation can be found on [developers.cloudflare.com](https://d
 
 ```sh
 # install from PyPI
-pip install cloudflare
+pip install --pre cloudflare
 ```
 
 ## Usage
@@ -26,10 +38,7 @@ import os
 from cloudflare import Cloudflare
 
 client = Cloudflare(
-    # This is the default and can be omitted
-    api_email=os.environ.get("CLOUDFLARE_EMAIL"),
-    # This is the default and can be omitted
-    api_key=os.environ.get("CLOUDFLARE_API_KEY"),
+    api_token=os.environ.get("CLOUDFLARE_API_TOKEN"),  # This is the default and can be omitted
 )
 
 zone = client.zones.create(
@@ -55,10 +64,7 @@ import asyncio
 from cloudflare import AsyncCloudflare
 
 client = AsyncCloudflare(
-    # This is the default and can be omitted
-    api_email=os.environ.get("CLOUDFLARE_EMAIL"),
-    # This is the default and can be omitted
-    api_key=os.environ.get("CLOUDFLARE_API_KEY"),
+    api_token=os.environ.get("CLOUDFLARE_API_TOKEN"),  # This is the default and can be omitted
 )
 
 
@@ -76,6 +82,42 @@ asyncio.run(main())
 
 Functionality between the synchronous and asynchronous clients is otherwise identical.
 
+### With aiohttp
+
+By default, the async client uses `httpx` for HTTP requests. However, for improved concurrency performance you may also use `aiohttp` as the HTTP backend.
+
+You can enable this by installing `aiohttp`:
+
+```sh
+# install from PyPI
+pip install --pre cloudflare[aiohttp]
+```
+
+Then you can enable it by instantiating the client with `http_client=DefaultAioHttpClient()`:
+
+```python
+import os
+import asyncio
+from cloudflare import DefaultAioHttpClient
+from cloudflare import AsyncCloudflare
+
+
+async def main() -> None:
+    async with AsyncCloudflare(
+        api_token=os.environ.get("CLOUDFLARE_API_TOKEN"),  # This is the default and can be omitted
+        http_client=DefaultAioHttpClient(),
+    ) as client:
+        zone = await client.zones.create(
+            account={"id": "023e105f4ecef8ad9ca31a8372d0c353"},
+            name="example.com",
+            type="full",
+        )
+        print(zone.id)
+
+
+asyncio.run(main())
+```
+
 ## Using types
 
 Nested request parameters are [TypedDicts](https://docs.python.org/3/library/typing.html#typing.TypedDict). Responses are [Pydantic models](https://docs.pydantic.dev) which also provide helper methods for things like:
@@ -92,7 +134,7 @@ List methods in the Cloudflare API are paginated.
 This library provides auto-paginating iterators with each list response, so you do not have to request successive pages manually:
 
 ```python
-import cloudflare
+from cloudflare import Cloudflare
 
 client = Cloudflare()
 
@@ -108,7 +150,7 @@ Or, asynchronously:
 
 ```python
 import asyncio
-import cloudflare
+from cloudflare import AsyncCloudflare
 
 client = AsyncCloudflare()
 
@@ -141,11 +183,47 @@ Or just work directly with the returned data:
 ```python
 first_page = await client.accounts.list()
 for account in first_page.result:
-    print(account)
+    print(account.id)
 
 # Remove `await` for non-async usage.
 ```
 
+## Nested params
+
+Nested parameters are dictionaries, typed using `TypedDict`, for example:
+
+```python
+from cloudflare import Cloudflare
+
+client = Cloudflare()
+
+zone = client.zones.create(
+    account={},
+    name="example.com",
+)
+print(zone.account)
+```
+
+## File uploads
+
+Request parameters that correspond to file uploads can be passed as `bytes`, or a [`PathLike`](https://docs.python.org/3/library/os.html#os.PathLike) instance or a tuple of `(filename, contents, media type)`.
+
+```python
+from pathlib import Path
+from cloudflare import Cloudflare
+
+client = Cloudflare()
+
+client.kv.namespaces.values.update(
+    key_name="My-Key",
+    account_id="023e105f4ecef8ad9ca31a8372d0c353",
+    namespace_id="0f2ac74b498b48028cb68387c421e279",
+    value=Path("/path/to/file"),
+)
+```
+
+The async client uses the exact same interface. If you pass a [`PathLike`](https://docs.python.org/3/library/os.html#os.PathLike) instance, the file contents will be read asynchronously automatically.
+
 ## Handling errors
 
 When the library is unable to connect to the API (for example, due to network connection problems or a timeout), a subclass of `cloudflare.APIConnectionError` is raised.
@@ -176,7 +254,7 @@ except cloudflare.APIStatusError as e:
     print(e.response)
 ```
 
-Error codes are as followed:
+Error codes are as follows:
 
 | Status Code | Error Type                 |
 | ----------- | -------------------------- |
@@ -215,7 +293,7 @@ client.with_options(max_retries=5).zones.get(
 ### Timeouts
 
 By default requests time out after 1 minute. You can configure this with a `timeout` option,
-which accepts a float or an [`httpx.Timeout`](https://www.python-httpx.org/advanced/#fine-tuning-the-configuration) object:
+which accepts a float or an [`httpx.Timeout`](https://www.python-httpx.org/advanced/timeouts/#fine-tuning-the-configuration) object:
 
 ```python
 from cloudflare import Cloudflare
@@ -247,12 +325,14 @@ Note that requests that time out are [retried twice by default](#retries).
 
 We use the standard library [`logging`](https://docs.python.org/3/library/logging.html) module.
 
-You can enable logging by setting the environment variable `CLOUDFLARE_LOG` to `debug`.
+You can enable logging by setting the environment variable `CLOUDFLARE_LOG` to `info`.
 
 ```shell
-$ export CLOUDFLARE_LOG=debug
+$ export CLOUDFLARE_LOG=info
 ```
 
+Or to `debug` for more verbose logging.
+
 ### How to tell whether `None` means `null` or missing
 
 In an API response, a field may be explicitly `null`, or missing entirely; in either case, its value is `None` in this library. You can differentiate the two cases with `.model_fields_set`:
@@ -319,8 +399,7 @@ If you need to access undocumented endpoints, params, or response properties, th
 #### Undocumented endpoints
 
 To make requests to undocumented endpoints, you can make requests using `client.get`, `client.post`, and other
-http verbs. Options on the client will be respected (such as retries) will be respected when making this
-request.
+http verbs. Options on the client will be respected (such as retries) when making this request.
 
 ```py
 import httpx
@@ -349,39 +428,67 @@ can also get all the extra fields on the Pydantic model as a dict with
 
 You can directly override the [httpx client](https://www.python-httpx.org/api/#client) to customize it for your use case, including:
 
-- Support for proxies
-- Custom transports
+- Support for [proxies](https://www.python-httpx.org/advanced/proxies/)
+- Custom [transports](https://www.python-httpx.org/advanced/transports/)
 - Additional [advanced](https://www.python-httpx.org/advanced/clients/) functionality
 
 ```python
+import httpx
 from cloudflare import Cloudflare, DefaultHttpxClient
 
 client = Cloudflare(
     # Or use the `CLOUDFLARE_BASE_URL` env var
     base_url="http://my.test.server.example.com:8083",
     http_client=DefaultHttpxClient(
-        proxies="http://my.test.proxy.example.com",
+        proxy="http://my.test.proxy.example.com",
         transport=httpx.HTTPTransport(local_address="0.0.0.0"),
     ),
 )
 ```
 
+You can also customize the client on a per-request basis by using `with_options()`:
+
+```python
+client.with_options(http_client=DefaultHttpxClient(...))
+```
+
 ### Managing HTTP resources
 
 By default the library closes underlying HTTP connections whenever the client is [garbage collected](https://docs.python.org/3/reference/datamodel.html#object.__del__). You can manually close the client using the `.close()` method if desired, or with a context manager that closes when exiting.
 
+```py
+from cloudflare import Cloudflare
+
+with Cloudflare() as client:
+  # make requests here
+  ...
+
+# HTTP client is now closed
+```
+
 ## Semantic versioning
 
 This package generally follows [SemVer](https://semver.org/spec/v2.0.0.html) conventions, though certain backwards-incompatible changes may be released as minor versions:
 
 1. Changes that only affect static types, without breaking runtime behavior.
-1. Changes to library internals which are technically public but not intended or documented for external use. _(Please open a GitHub issue to let us know if you are relying on such internals)_.
+1. Changes to library internals which are technically public but not intended or documented for external use. 
 1. Changes that we do not expect to impact the vast majority of users in practice.
 
-> [!WARNING]
-> In addition to the above, changes to type names, structure or methods _may_ occur as we stabilise the automated codegen pipeline. This will be removed in the future once we are further along and the service owner OpenAPI schemas have reached a higher maturity level where changes are not as constant.
-> If this isn't suitable for your project, we recommend pinning to a known version or using the previous major version.
+### Determining the installed version
+
+If you've upgraded to the latest version but aren't seeing any new features you were expecting then your python environment is likely still using an older version.
+
+You can determine the version that is being used at runtime with:
+
+```py
+import cloudflare
+print(cloudflare.__version__)
+```
 
 ## Requirements
 
-Python 3.7 or higher.
+Python 3.9 or higher.
+
+## Contributing
+
+See [the contributing documentation](./CONTRIBUTING.md).
diff --git a/SECURITY.md b/SECURITY.md
index 0735c892994..f04da23d126 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,3 +1,3 @@
 # Reporting Security Vulnerabilities
 
-Please see [this page](https://www.cloudflare.com/.well-known/security.txt) for information on how to report a vulnerability to Cloudflare. Thanks!
+Please see [this page](https://www.cloudflare.com/.well-known/security.txt) for information on how to report a vulnerability to Cloudflare. Thanks!
\ No newline at end of file
diff --git a/api.md b/api.md
index b2c35ac9ccd..890a848cb44 100644
--- a/api.md
+++ b/api.md
@@ -14,10 +14,18 @@ from cloudflare.types import (
     PaginationInfo,
     Permission,
     PermissionGrant,
+    RatePlan,
     ResponseInfo,
     Result,
     Role,
     SortDirection,
+    Subscription,
+    SubscriptionComponent,
+    SubscriptionZone,
+    Token,
+    TokenConditionCIDRList,
+    TokenPolicy,
+    TokenValue,
 )
 ```
 
@@ -26,56 +34,133 @@ from cloudflare.types import (
 Types:
 
 ```python
-from cloudflare.types.accounts import (
-    Account,
-    AccountUpdateResponse,
-    AccountListResponse,
-    AccountGetResponse,
-)
+from cloudflare.types.accounts import Account, AccountDeleteResponse
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}">client.accounts.<a href="./src/cloudflare/resources/accounts/accounts.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/accounts/account_update_params.py">params</a>) -> <a href="./src/cloudflare/types/accounts/account_update_response.py">object</a></code>
-- <code title="get /accounts">client.accounts.<a href="./src/cloudflare/resources/accounts/accounts.py">list</a>(\*\*<a href="src/cloudflare/types/accounts/account_list_params.py">params</a>) -> <a href="./src/cloudflare/types/accounts/account_list_response.py">SyncV4PagePaginationArray[object]</a></code>
-- <code title="get /accounts/{account_id}">client.accounts.<a href="./src/cloudflare/resources/accounts/accounts.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/accounts/account_get_response.py">object</a></code>
+- <code title="post /accounts">client.accounts.<a href="./src/cloudflare/resources/accounts/accounts.py">create</a>(\*\*<a href="src/cloudflare/types/accounts/account_create_params.py">params</a>) -> <a href="./src/cloudflare/types/accounts/account.py">Optional[Account]</a></code>
+- <code title="put /accounts/{account_id}">client.accounts.<a href="./src/cloudflare/resources/accounts/accounts.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/accounts/account_update_params.py">params</a>) -> <a href="./src/cloudflare/types/accounts/account.py">Optional[Account]</a></code>
+- <code title="get /accounts">client.accounts.<a href="./src/cloudflare/resources/accounts/accounts.py">list</a>(\*\*<a href="src/cloudflare/types/accounts/account_list_params.py">params</a>) -> <a href="./src/cloudflare/types/accounts/account.py">SyncV4PagePaginationArray[Account]</a></code>
+- <code title="delete /accounts/{account_id}">client.accounts.<a href="./src/cloudflare/resources/accounts/accounts.py">delete</a>(\*, account_id) -> <a href="./src/cloudflare/types/accounts/account_delete_response.py">Optional[AccountDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}">client.accounts.<a href="./src/cloudflare/resources/accounts/accounts.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/accounts/account.py">Optional[Account]</a></code>
 
 ## Members
 
 Types:
 
 ```python
-from cloudflare.types.accounts import (
-    Status,
-    UserWithInviteCode,
-    MemberCreateResponse,
-    MemberUpdateResponse,
-    MemberListResponse,
-    MemberDeleteResponse,
-    MemberGetResponse,
-)
+from cloudflare.types.accounts import Status, MemberDeleteResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/members">client.accounts.members.<a href="./src/cloudflare/resources/accounts/members.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/accounts/member_create_params.py">params</a>) -> <a href="./src/cloudflare/types/accounts/member_create_response.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/members/{member_id}">client.accounts.members.<a href="./src/cloudflare/resources/accounts/members.py">update</a>(member_id, \*, account_id, \*\*<a href="src/cloudflare/types/accounts/member_update_params.py">params</a>) -> <a href="./src/cloudflare/types/accounts/member_update_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/members">client.accounts.members.<a href="./src/cloudflare/resources/accounts/members.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/accounts/member_list_params.py">params</a>) -> <a href="./src/cloudflare/types/accounts/member_list_response.py">SyncV4PagePaginationArray[MemberListResponse]</a></code>
-- <code title="delete /accounts/{account_id}/members/{member_id}">client.accounts.members.<a href="./src/cloudflare/resources/accounts/members.py">delete</a>(member_id, \*, account_id) -> <a href="./src/cloudflare/types/accounts/member_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/members/{member_id}">client.accounts.members.<a href="./src/cloudflare/resources/accounts/members.py">get</a>(member_id, \*, account_id) -> <a href="./src/cloudflare/types/accounts/member_get_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/members">client.accounts.members.<a href="./src/cloudflare/resources/accounts/members.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/accounts/member_create_params.py">params</a>) -> <a href="./src/cloudflare/types/shared/member.py">Optional[Member]</a></code>
+- <code title="put /accounts/{account_id}/members/{member_id}">client.accounts.members.<a href="./src/cloudflare/resources/accounts/members.py">update</a>(member_id, \*, account_id, \*\*<a href="src/cloudflare/types/accounts/member_update_params.py">params</a>) -> <a href="./src/cloudflare/types/shared/member.py">Optional[Member]</a></code>
+- <code title="get /accounts/{account_id}/members">client.accounts.members.<a href="./src/cloudflare/resources/accounts/members.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/accounts/member_list_params.py">params</a>) -> <a href="./src/cloudflare/types/shared/member.py">SyncV4PagePaginationArray[Member]</a></code>
+- <code title="delete /accounts/{account_id}/members/{member_id}">client.accounts.members.<a href="./src/cloudflare/resources/accounts/members.py">delete</a>(member_id, \*, account_id) -> <a href="./src/cloudflare/types/accounts/member_delete_response.py">Optional[MemberDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/members/{member_id}">client.accounts.members.<a href="./src/cloudflare/resources/accounts/members.py">get</a>(member_id, \*, account_id) -> <a href="./src/cloudflare/types/shared/member.py">Optional[Member]</a></code>
 
 ## Roles
 
+Methods:
+
+- <code title="get /accounts/{account_id}/roles">client.accounts.roles.<a href="./src/cloudflare/resources/accounts/roles.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/accounts/role_list_params.py">params</a>) -> <a href="./src/cloudflare/types/shared/role.py">SyncV4PagePaginationArray[Role]</a></code>
+- <code title="get /accounts/{account_id}/roles/{role_id}">client.accounts.roles.<a href="./src/cloudflare/resources/accounts/roles.py">get</a>(role_id, \*, account_id) -> <a href="./src/cloudflare/types/shared/role.py">Optional[Role]</a></code>
+
+## Subscriptions
+
+Types:
+
+```python
+from cloudflare.types.accounts import SubscriptionDeleteResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/subscriptions">client.accounts.subscriptions.<a href="./src/cloudflare/resources/accounts/subscriptions.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/accounts/subscription_create_params.py">params</a>) -> <a href="./src/cloudflare/types/shared/subscription.py">Subscription</a></code>
+- <code title="put /accounts/{account_id}/subscriptions/{subscription_identifier}">client.accounts.subscriptions.<a href="./src/cloudflare/resources/accounts/subscriptions.py">update</a>(subscription_identifier, \*, account_id, \*\*<a href="src/cloudflare/types/accounts/subscription_update_params.py">params</a>) -> <a href="./src/cloudflare/types/shared/subscription.py">Subscription</a></code>
+- <code title="delete /accounts/{account_id}/subscriptions/{subscription_identifier}">client.accounts.subscriptions.<a href="./src/cloudflare/resources/accounts/subscriptions.py">delete</a>(subscription_identifier, \*, account_id) -> <a href="./src/cloudflare/types/accounts/subscription_delete_response.py">SubscriptionDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/subscriptions">client.accounts.subscriptions.<a href="./src/cloudflare/resources/accounts/subscriptions.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/shared/subscription.py">SyncSinglePage[Subscription]</a></code>
+
+## Tokens
+
+Types:
+
+```python
+from cloudflare.types.accounts import TokenCreateResponse, TokenDeleteResponse, TokenVerifyResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/tokens">client.accounts.tokens.<a href="./src/cloudflare/resources/accounts/tokens/tokens.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/accounts/token_create_params.py">params</a>) -> <a href="./src/cloudflare/types/accounts/token_create_response.py">Optional[TokenCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/tokens/{token_id}">client.accounts.tokens.<a href="./src/cloudflare/resources/accounts/tokens/tokens.py">update</a>(token_id, \*, account_id, \*\*<a href="src/cloudflare/types/accounts/token_update_params.py">params</a>) -> <a href="./src/cloudflare/types/shared/token.py">Optional[Token]</a></code>
+- <code title="get /accounts/{account_id}/tokens">client.accounts.tokens.<a href="./src/cloudflare/resources/accounts/tokens/tokens.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/accounts/token_list_params.py">params</a>) -> <a href="./src/cloudflare/types/shared/token.py">SyncV4PagePaginationArray[Token]</a></code>
+- <code title="delete /accounts/{account_id}/tokens/{token_id}">client.accounts.tokens.<a href="./src/cloudflare/resources/accounts/tokens/tokens.py">delete</a>(token_id, \*, account_id) -> <a href="./src/cloudflare/types/accounts/token_delete_response.py">Optional[TokenDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/tokens/{token_id}">client.accounts.tokens.<a href="./src/cloudflare/resources/accounts/tokens/tokens.py">get</a>(token_id, \*, account_id) -> <a href="./src/cloudflare/types/shared/token.py">Optional[Token]</a></code>
+- <code title="get /accounts/{account_id}/tokens/verify">client.accounts.tokens.<a href="./src/cloudflare/resources/accounts/tokens/tokens.py">verify</a>(\*, account_id) -> <a href="./src/cloudflare/types/accounts/token_verify_response.py">Optional[TokenVerifyResponse]</a></code>
+
+### PermissionGroups
+
+Types:
+
+```python
+from cloudflare.types.accounts.tokens import PermissionGroupListResponse, PermissionGroupGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/tokens/permission_groups">client.accounts.tokens.permission_groups.<a href="./src/cloudflare/resources/accounts/tokens/permission_groups.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/accounts/tokens/permission_group_list_params.py">params</a>) -> <a href="./src/cloudflare/types/accounts/tokens/permission_group_list_response.py">SyncSinglePage[PermissionGroupListResponse]</a></code>
+- <code title="get /accounts/{account_id}/tokens/permission_groups">client.accounts.tokens.permission_groups.<a href="./src/cloudflare/resources/accounts/tokens/permission_groups.py">get</a>(\*, account_id, \*\*<a href="src/cloudflare/types/accounts/tokens/permission_group_get_params.py">params</a>) -> <a href="./src/cloudflare/types/accounts/tokens/permission_group_get_response.py">Optional[PermissionGroupGetResponse]</a></code>
+
+### Value
+
+Methods:
+
+- <code title="put /accounts/{account_id}/tokens/{token_id}/value">client.accounts.tokens.value.<a href="./src/cloudflare/resources/accounts/tokens/value.py">update</a>(token_id, \*, account_id, \*\*<a href="src/cloudflare/types/accounts/tokens/value_update_params.py">params</a>) -> <a href="./src/cloudflare/types/shared/token_value.py">str</a></code>
+
+## Logs
+
+### Audit
+
+Types:
+
+```python
+from cloudflare.types.accounts.logs import AuditListResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/logs/audit">client.accounts.logs.audit.<a href="./src/cloudflare/resources/accounts/logs/audit.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/accounts/logs/audit_list_params.py">params</a>) -> <a href="./src/cloudflare/types/accounts/logs/audit_list_response.py">SyncCursorPaginationAfter[AuditListResponse]</a></code>
+
+# Organizations
+
+Types:
+
+```python
+from cloudflare.types.organizations import Organization, OrganizationDeleteResponse
+```
+
+Methods:
+
+- <code title="post /organizations">client.organizations.<a href="./src/cloudflare/resources/organizations/organizations.py">create</a>(\*\*<a href="src/cloudflare/types/organizations/organization_create_params.py">params</a>) -> <a href="./src/cloudflare/types/organizations/organization.py">Organization</a></code>
+- <code title="put /organizations/{organization_id}">client.organizations.<a href="./src/cloudflare/resources/organizations/organizations.py">update</a>(organization_id, \*\*<a href="src/cloudflare/types/organizations/organization_update_params.py">params</a>) -> <a href="./src/cloudflare/types/organizations/organization.py">Organization</a></code>
+- <code title="get /organizations">client.organizations.<a href="./src/cloudflare/resources/organizations/organizations.py">list</a>(\*\*<a href="src/cloudflare/types/organizations/organization_list_params.py">params</a>) -> <a href="./src/cloudflare/types/organizations/organization.py">SyncSinglePage[Organization]</a></code>
+- <code title="delete /organizations/{organization_id}">client.organizations.<a href="./src/cloudflare/resources/organizations/organizations.py">delete</a>(organization_id) -> <a href="./src/cloudflare/types/organizations/organization_delete_response.py">OrganizationDeleteResponse</a></code>
+- <code title="get /organizations/{organization_id}">client.organizations.<a href="./src/cloudflare/resources/organizations/organizations.py">get</a>(organization_id) -> <a href="./src/cloudflare/types/organizations/organization.py">Organization</a></code>
+
+## OrganizationProfile
+
 Types:
 
 ```python
-from cloudflare.types.accounts import RoleGetResponse
+from cloudflare.types.organizations import OrganizationProfile
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/roles">client.accounts.roles.<a href="./src/cloudflare/resources/accounts/roles.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/shared/role.py">SyncSinglePage[Role]</a></code>
-- <code title="get /accounts/{account_id}/roles/{role_id}">client.accounts.roles.<a href="./src/cloudflare/resources/accounts/roles.py">get</a>(role_id, \*, account_id) -> <a href="./src/cloudflare/types/accounts/role_get_response.py">object</a></code>
+- <code title="put /organizations/{organization_id}/profile">client.organizations.organization_profile.<a href="./src/cloudflare/resources/organizations/organization_profile.py">update</a>(organization_id, \*\*<a href="src/cloudflare/types/organizations/organization_profile_update_params.py">params</a>) -> None</code>
+- <code title="get /organizations/{organization_id}/profile">client.organizations.organization_profile.<a href="./src/cloudflare/resources/organizations/organization_profile.py">get</a>(organization_id) -> Result</code>
 
 # OriginCACertificates
 
@@ -84,30 +169,28 @@ Types:
 ```python
 from cloudflare.types.origin_ca_certificates import (
     OriginCACertificate,
-    OriginCACertificateCreateResponse,
     OriginCACertificateDeleteResponse,
-    OriginCACertificateGetResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /certificates">client.origin_ca_certificates.<a href="./src/cloudflare/resources/origin_ca_certificates.py">create</a>(\*\*<a href="src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_create_params.py">params</a>) -> <a href="./src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_create_response.py">Optional</a></code>
-- <code title="get /certificates">client.origin_ca_certificates.<a href="./src/cloudflare/resources/origin_ca_certificates.py">list</a>(\*\*<a href="src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_list_params.py">params</a>) -> <a href="./src/cloudflare/types/origin_ca_certificates/origin_ca_certificate.py">SyncSinglePage[OriginCACertificate]</a></code>
-- <code title="delete /certificates/{certificate_id}">client.origin_ca_certificates.<a href="./src/cloudflare/resources/origin_ca_certificates.py">delete</a>(certificate_id) -> <a href="./src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_delete_response.py">Optional</a></code>
-- <code title="get /certificates/{certificate_id}">client.origin_ca_certificates.<a href="./src/cloudflare/resources/origin_ca_certificates.py">get</a>(certificate_id) -> <a href="./src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_get_response.py">Optional</a></code>
+- <code title="post /certificates">client.origin_ca_certificates.<a href="./src/cloudflare/resources/origin_ca_certificates.py">create</a>(\*\*<a href="src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_create_params.py">params</a>) -> <a href="./src/cloudflare/types/origin_ca_certificates/origin_ca_certificate.py">Optional[OriginCACertificate]</a></code>
+- <code title="get /certificates">client.origin_ca_certificates.<a href="./src/cloudflare/resources/origin_ca_certificates.py">list</a>(\*\*<a href="src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_list_params.py">params</a>) -> <a href="./src/cloudflare/types/origin_ca_certificates/origin_ca_certificate.py">SyncV4PagePaginationArray[OriginCACertificate]</a></code>
+- <code title="delete /certificates/{certificate_id}">client.origin_ca_certificates.<a href="./src/cloudflare/resources/origin_ca_certificates.py">delete</a>(certificate_id) -> <a href="./src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_delete_response.py">Optional[OriginCACertificateDeleteResponse]</a></code>
+- <code title="get /certificates/{certificate_id}">client.origin_ca_certificates.<a href="./src/cloudflare/resources/origin_ca_certificates.py">get</a>(certificate_id) -> <a href="./src/cloudflare/types/origin_ca_certificates/origin_ca_certificate.py">Optional[OriginCACertificate]</a></code>
 
 # IPs
 
 Types:
 
 ```python
-from cloudflare.types.ips import IPs, JDCloudIPs, IPListResponse
+from cloudflare.types.ips import IPs, IPListResponse
 ```
 
 Methods:
 
-- <code title="get /ips">client.ips.<a href="./src/cloudflare/resources/ips.py">list</a>(\*\*<a href="src/cloudflare/types/ips/ip_list_params.py">params</a>) -> <a href="./src/cloudflare/types/ips/ip_list_response.py">Optional</a></code>
+- <code title="get /ips">client.ips.<a href="./src/cloudflare/resources/ips.py">list</a>(\*\*<a href="src/cloudflare/types/ips/ip_list_params.py">params</a>) -> <a href="./src/cloudflare/types/ips/ip_list_response.py">Optional[IPListResponse]</a></code>
 
 # Memberships
 
@@ -124,10 +207,10 @@ from cloudflare.types.memberships import (
 
 Methods:
 
-- <code title="put /memberships/{membership_id}">client.memberships.<a href="./src/cloudflare/resources/memberships.py">update</a>(membership_id, \*\*<a href="src/cloudflare/types/memberships/membership_update_params.py">params</a>) -> <a href="./src/cloudflare/types/memberships/membership_update_response.py">Optional</a></code>
+- <code title="put /memberships/{membership_id}">client.memberships.<a href="./src/cloudflare/resources/memberships.py">update</a>(membership_id, \*\*<a href="src/cloudflare/types/memberships/membership_update_params.py">params</a>) -> <a href="./src/cloudflare/types/memberships/membership_update_response.py">Optional[MembershipUpdateResponse]</a></code>
 - <code title="get /memberships">client.memberships.<a href="./src/cloudflare/resources/memberships.py">list</a>(\*\*<a href="src/cloudflare/types/memberships/membership_list_params.py">params</a>) -> <a href="./src/cloudflare/types/memberships/membership.py">SyncV4PagePaginationArray[Membership]</a></code>
-- <code title="delete /memberships/{membership_id}">client.memberships.<a href="./src/cloudflare/resources/memberships.py">delete</a>(membership_id) -> <a href="./src/cloudflare/types/memberships/membership_delete_response.py">Optional</a></code>
-- <code title="get /memberships/{membership_id}">client.memberships.<a href="./src/cloudflare/resources/memberships.py">get</a>(membership_id) -> <a href="./src/cloudflare/types/memberships/membership_get_response.py">Optional</a></code>
+- <code title="delete /memberships/{membership_id}">client.memberships.<a href="./src/cloudflare/resources/memberships.py">delete</a>(membership_id) -> <a href="./src/cloudflare/types/memberships/membership_delete_response.py">Optional[MembershipDeleteResponse]</a></code>
+- <code title="get /memberships/{membership_id}">client.memberships.<a href="./src/cloudflare/resources/memberships.py">get</a>(membership_id) -> <a href="./src/cloudflare/types/memberships/membership_get_response.py">Optional[MembershipGetResponse]</a></code>
 
 # User
 
@@ -139,8 +222,8 @@ from cloudflare.types.user import UserEditResponse, UserGetResponse
 
 Methods:
 
-- <code title="patch /user">client.user.<a href="./src/cloudflare/resources/user/user.py">edit</a>(\*\*<a href="src/cloudflare/types/user/user_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/user/user_edit_response.py">object</a></code>
-- <code title="get /user">client.user.<a href="./src/cloudflare/resources/user/user.py">get</a>() -> <a href="./src/cloudflare/types/user/user_get_response.py">object</a></code>
+- <code title="patch /user">client.user.<a href="./src/cloudflare/resources/user/user.py">edit</a>(\*\*<a href="src/cloudflare/types/user/user_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/user/user_edit_response.py">Optional[UserEditResponse]</a></code>
+- <code title="get /user">client.user.<a href="./src/cloudflare/resources/user/user.py">get</a>() -> <a href="./src/cloudflare/types/user/user_get_response.py">Optional[UserGetResponse]</a></code>
 
 ## AuditLogs
 
@@ -179,79 +262,59 @@ Methods:
 Types:
 
 ```python
-from cloudflare.types.user import Invite, InviteEditResponse, InviteGetResponse
+from cloudflare.types.user import Invite
 ```
 
 Methods:
 
 - <code title="get /user/invites">client.user.invites.<a href="./src/cloudflare/resources/user/invites.py">list</a>() -> <a href="./src/cloudflare/types/user/invite.py">SyncSinglePage[Invite]</a></code>
-- <code title="patch /user/invites/{invite_id}">client.user.invites.<a href="./src/cloudflare/resources/user/invites.py">edit</a>(invite_id, \*\*<a href="src/cloudflare/types/user/invite_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/user/invite_edit_response.py">object</a></code>
-- <code title="get /user/invites/{invite_id}">client.user.invites.<a href="./src/cloudflare/resources/user/invites.py">get</a>(invite_id) -> <a href="./src/cloudflare/types/user/invite_get_response.py">object</a></code>
+- <code title="patch /user/invites/{invite_id}">client.user.invites.<a href="./src/cloudflare/resources/user/invites.py">edit</a>(invite_id, \*\*<a href="src/cloudflare/types/user/invite_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/user/invite.py">Optional[Invite]</a></code>
+- <code title="get /user/invites/{invite_id}">client.user.invites.<a href="./src/cloudflare/resources/user/invites.py">get</a>(invite_id) -> <a href="./src/cloudflare/types/user/invite.py">Optional[Invite]</a></code>
 
 ## Organizations
 
 Types:
 
 ```python
-from cloudflare.types.user import Organization, OrganizationDeleteResponse, OrganizationGetResponse
+from cloudflare.types.user import Organization, OrganizationDeleteResponse
 ```
 
 Methods:
 
 - <code title="get /user/organizations">client.user.organizations.<a href="./src/cloudflare/resources/user/organizations.py">list</a>(\*\*<a href="src/cloudflare/types/user/organization_list_params.py">params</a>) -> <a href="./src/cloudflare/types/user/organization.py">SyncV4PagePaginationArray[Organization]</a></code>
 - <code title="delete /user/organizations/{organization_id}">client.user.organizations.<a href="./src/cloudflare/resources/user/organizations.py">delete</a>(organization_id) -> <a href="./src/cloudflare/types/user/organization_delete_response.py">OrganizationDeleteResponse</a></code>
-- <code title="get /user/organizations/{organization_id}">client.user.organizations.<a href="./src/cloudflare/resources/user/organizations.py">get</a>(organization_id) -> <a href="./src/cloudflare/types/user/organization_get_response.py">object</a></code>
+- <code title="get /user/organizations/{organization_id}">client.user.organizations.<a href="./src/cloudflare/resources/user/organizations.py">get</a>(organization_id) -> object</code>
 
 ## Subscriptions
 
 Types:
 
 ```python
-from cloudflare.types.user import (
-    RatePlan,
-    Subscription,
-    SubscriptionComponent,
-    SubscriptionZone,
-    SubscriptionUpdateResponse,
-    SubscriptionDeleteResponse,
-    SubscriptionEditResponse,
-    SubscriptionGetResponse,
-)
+from cloudflare.types.user import SubscriptionUpdateResponse, SubscriptionDeleteResponse
 ```
 
 Methods:
 
 - <code title="put /user/subscriptions/{identifier}">client.user.subscriptions.<a href="./src/cloudflare/resources/user/subscriptions.py">update</a>(identifier, \*\*<a href="src/cloudflare/types/user/subscription_update_params.py">params</a>) -> <a href="./src/cloudflare/types/user/subscription_update_response.py">SubscriptionUpdateResponse</a></code>
 - <code title="delete /user/subscriptions/{identifier}">client.user.subscriptions.<a href="./src/cloudflare/resources/user/subscriptions.py">delete</a>(identifier) -> <a href="./src/cloudflare/types/user/subscription_delete_response.py">SubscriptionDeleteResponse</a></code>
-- <code title="put /zones/{identifier}/subscription">client.user.subscriptions.<a href="./src/cloudflare/resources/user/subscriptions.py">edit</a>(identifier, \*\*<a href="src/cloudflare/types/user/subscription_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/user/subscription_edit_response.py">SubscriptionEditResponse</a></code>
-- <code title="get /user/subscriptions">client.user.subscriptions.<a href="./src/cloudflare/resources/user/subscriptions.py">get</a>() -> <a href="./src/cloudflare/types/user/subscription_get_response.py">Optional</a></code>
+- <code title="get /user/subscriptions">client.user.subscriptions.<a href="./src/cloudflare/resources/user/subscriptions.py">get</a>() -> <a href="./src/cloudflare/types/shared/subscription.py">SyncSinglePage[Subscription]</a></code>
 
 ## Tokens
 
 Types:
 
 ```python
-from cloudflare.types.user import (
-    CIDRList,
-    Policy,
-    Token,
-    TokenCreateResponse,
-    TokenUpdateResponse,
-    TokenListResponse,
-    TokenDeleteResponse,
-    TokenGetResponse,
-    TokenVerifyResponse,
-)
+from cloudflare.types.user import TokenCreateResponse, TokenDeleteResponse, TokenVerifyResponse
 ```
 
 Methods:
 
-- <code title="post /user/tokens">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">create</a>(\*\*<a href="src/cloudflare/types/user/token_create_params.py">params</a>) -> <a href="./src/cloudflare/types/user/token_create_response.py">Optional</a></code>
-- <code title="put /user/tokens/{token_id}">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">update</a>(token_id, \*\*<a href="src/cloudflare/types/user/token_update_params.py">params</a>) -> <a href="./src/cloudflare/types/user/token_update_response.py">object</a></code>
-- <code title="get /user/tokens">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">list</a>(\*\*<a href="src/cloudflare/types/user/token_list_params.py">params</a>) -> <a href="./src/cloudflare/types/user/token_list_response.py">SyncV4PagePaginationArray[object]</a></code>
-- <code title="delete /user/tokens/{token_id}">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">delete</a>(token_id) -> <a href="./src/cloudflare/types/user/token_delete_response.py">Optional</a></code>
-- <code title="get /user/tokens/{token_id}">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">get</a>(token_id) -> <a href="./src/cloudflare/types/user/token_get_response.py">object</a></code>
-- <code title="get /user/tokens/verify">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">verify</a>() -> <a href="./src/cloudflare/types/user/token_verify_response.py">Optional</a></code>
+- <code title="post /user/tokens">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">create</a>(\*\*<a href="src/cloudflare/types/user/token_create_params.py">params</a>) -> <a href="./src/cloudflare/types/user/token_create_response.py">Optional[TokenCreateResponse]</a></code>
+- <code title="put /user/tokens/{token_id}">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">update</a>(token_id, \*\*<a href="src/cloudflare/types/user/token_update_params.py">params</a>) -> <a href="./src/cloudflare/types/shared/token.py">Optional[Token]</a></code>
+- <code title="get /user/tokens">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">list</a>(\*\*<a href="src/cloudflare/types/user/token_list_params.py">params</a>) -> <a href="./src/cloudflare/types/shared/token.py">SyncV4PagePaginationArray[Token]</a></code>
+- <code title="delete /user/tokens/{token_id}">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">delete</a>(token_id) -> <a href="./src/cloudflare/types/user/token_delete_response.py">Optional[TokenDeleteResponse]</a></code>
+- <code title="get /user/tokens/{token_id}">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">get</a>(token_id) -> <a href="./src/cloudflare/types/shared/token.py">Optional[Token]</a></code>
+- <code title="get /user/tokens/verify">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">verify</a>() -> <a href="./src/cloudflare/types/user/token_verify_response.py">Optional[TokenVerifyResponse]</a></code>
 
 ### PermissionGroups
 
@@ -263,19 +326,13 @@ from cloudflare.types.user.tokens import PermissionGroupListResponse
 
 Methods:
 
-- <code title="get /user/tokens/permission_groups">client.user.tokens.permission_groups.<a href="./src/cloudflare/resources/user/tokens/permission_groups.py">list</a>() -> <a href="./src/cloudflare/types/user/tokens/permission_group_list_response.py">SyncSinglePage[object]</a></code>
+- <code title="get /user/tokens/permission_groups">client.user.tokens.permission_groups.<a href="./src/cloudflare/resources/user/tokens/permission_groups.py">list</a>(\*\*<a href="src/cloudflare/types/user/tokens/permission_group_list_params.py">params</a>) -> <a href="./src/cloudflare/types/user/tokens/permission_group_list_response.py">SyncSinglePage[PermissionGroupListResponse]</a></code>
 
 ### Value
 
-Types:
-
-```python
-from cloudflare.types.user.tokens import Value
-```
-
 Methods:
 
-- <code title="put /user/tokens/{token_id}/value">client.user.tokens.value.<a href="./src/cloudflare/resources/user/tokens/value.py">update</a>(token_id, \*\*<a href="src/cloudflare/types/user/tokens/value_update_params.py">params</a>) -> <a href="./src/cloudflare/types/user/tokens/value.py">str</a></code>
+- <code title="put /user/tokens/{token_id}/value">client.user.tokens.value.<a href="./src/cloudflare/resources/user/tokens/value.py">update</a>(token_id, \*\*<a href="src/cloudflare/types/user/tokens/value_update_params.py">params</a>) -> <a href="./src/cloudflare/types/shared/token_value.py">str</a></code>
 
 # Zones
 
@@ -287,11 +344,11 @@ from cloudflare.types.zones import Type, Zone, ZoneDeleteResponse
 
 Methods:
 
-- <code title="post /zones">client.zones.<a href="./src/cloudflare/resources/zones/zones.py">create</a>(\*\*<a href="src/cloudflare/types/zones/zone_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zones/zone.py">Optional</a></code>
+- <code title="post /zones">client.zones.<a href="./src/cloudflare/resources/zones/zones.py">create</a>(\*\*<a href="src/cloudflare/types/zones/zone_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zones/zone.py">Optional[Zone]</a></code>
 - <code title="get /zones">client.zones.<a href="./src/cloudflare/resources/zones/zones.py">list</a>(\*\*<a href="src/cloudflare/types/zones/zone_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zones/zone.py">SyncV4PagePaginationArray[Zone]</a></code>
-- <code title="delete /zones/{zone_id}">client.zones.<a href="./src/cloudflare/resources/zones/zones.py">delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/zones/zone_delete_response.py">Optional</a></code>
-- <code title="patch /zones/{zone_id}">client.zones.<a href="./src/cloudflare/resources/zones/zones.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/zones/zone_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zones/zone.py">Optional</a></code>
-- <code title="get /zones/{zone_id}">client.zones.<a href="./src/cloudflare/resources/zones/zones.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/zones/zone.py">Optional</a></code>
+- <code title="delete /zones/{zone_id}">client.zones.<a href="./src/cloudflare/resources/zones/zones.py">delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/zones/zone_delete_response.py">Optional[ZoneDeleteResponse]</a></code>
+- <code title="patch /zones/{zone_id}">client.zones.<a href="./src/cloudflare/resources/zones/zones.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/zones/zone_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zones/zone.py">Optional[Zone]</a></code>
+- <code title="get /zones/{zone_id}">client.zones.<a href="./src/cloudflare/resources/zones/zones.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/zones/zone.py">Optional[Zone]</a></code>
 
 ## ActivationCheck
 
@@ -303,7 +360,7 @@ from cloudflare.types.zones import ActivationCheckTriggerResponse
 
 Methods:
 
-- <code title="put /zones/{zone_id}/activation_check">client.zones.activation_check.<a href="./src/cloudflare/resources/zones/activation_check.py">trigger</a>(\*, zone_id) -> <a href="./src/cloudflare/types/zones/activation_check_trigger_response.py">Optional</a></code>
+- <code title="put /zones/{zone_id}/activation_check">client.zones.activation_check.<a href="./src/cloudflare/resources/zones/activation_check.py">trigger</a>(\*, zone_id) -> <a href="./src/cloudflare/types/zones/activation_check_trigger_response.py">Optional[ActivationCheckTriggerResponse]</a></code>
 
 ## Settings
 
@@ -312,6 +369,7 @@ Types:
 ```python
 from cloudflare.types.zones import (
     AdvancedDDoS,
+    Aegis,
     AlwaysOnline,
     AlwaysUseHTTPS,
     AutomaticHTTPSRewrites,
@@ -334,9 +392,7 @@ from cloudflare.types.zones import (
     IPGeolocation,
     IPV6,
     MinTLSVersion,
-    Minify,
     Mirage,
-    MobileRedirect,
     NEL,
     OpportunisticEncryption,
     OpportunisticOnion,
@@ -369,8 +425,8 @@ from cloudflare.types.zones import (
 
 Methods:
 
-- <code title="patch /zones/{zone_id}/settings/{setting_id}">client.zones.settings.<a href="./src/cloudflare/resources/zones/settings.py">edit</a>(setting_id, \*, zone_id, \*\*<a href="src/cloudflare/types/zones/setting_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zones/setting_edit_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/settings/{setting_id}">client.zones.settings.<a href="./src/cloudflare/resources/zones/settings.py">get</a>(setting_id, \*, zone_id) -> <a href="./src/cloudflare/types/zones/setting_get_response.py">Optional</a></code>
+- <code title="patch /zones/{zone_id}/settings/{setting_id}">client.zones.settings.<a href="./src/cloudflare/resources/zones/settings.py">edit</a>(setting_id, \*, zone_id, \*\*<a href="src/cloudflare/types/zones/setting_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zones/setting_edit_response.py">Optional[SettingEditResponse]</a></code>
+- <code title="get /zones/{zone_id}/settings/{setting_id}">client.zones.settings.<a href="./src/cloudflare/resources/zones/settings.py">get</a>(setting_id, \*, zone_id) -> <a href="./src/cloudflare/types/zones/setting_get_response.py">Optional[SettingGetResponse]</a></code>
 
 ## CustomNameservers
 
@@ -382,8 +438,8 @@ from cloudflare.types.zones import CustomNameserverUpdateResponse, CustomNameser
 
 Methods:
 
-- <code title="put /zones/{zone_id}/custom_ns">client.zones.custom_nameservers.<a href="./src/cloudflare/resources/zones/custom_nameservers.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/zones/custom_nameserver_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zones/custom_nameserver_update_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/custom_ns">client.zones.custom_nameservers.<a href="./src/cloudflare/resources/zones/custom_nameservers.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/zones/custom_nameserver_get_response.py">Optional</a></code>
+- <code title="put /zones/{zone_id}/custom_ns">client.zones.custom_nameservers.<a href="./src/cloudflare/resources/zones/custom_nameservers.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/zones/custom_nameserver_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zones/custom_nameserver_update_response.py">SyncSinglePage[CustomNameserverUpdateResponse]</a></code>
+- <code title="get /zones/{zone_id}/custom_ns">client.zones.custom_nameservers.<a href="./src/cloudflare/resources/zones/custom_nameservers.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/zones/custom_nameserver_get_response.py">CustomNameserverGetResponse</a></code>
 
 ## Holds
 
@@ -396,7 +452,8 @@ from cloudflare.types.zones import ZoneHold
 Methods:
 
 - <code title="post /zones/{zone_id}/hold">client.zones.holds.<a href="./src/cloudflare/resources/zones/holds.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/zones/hold_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zones/zone_hold.py">ZoneHold</a></code>
-- <code title="delete /zones/{zone_id}/hold">client.zones.holds.<a href="./src/cloudflare/resources/zones/holds.py">delete</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/zones/hold_delete_params.py">params</a>) -> <a href="./src/cloudflare/types/zones/zone_hold.py">Optional</a></code>
+- <code title="delete /zones/{zone_id}/hold">client.zones.holds.<a href="./src/cloudflare/resources/zones/holds.py">delete</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/zones/hold_delete_params.py">params</a>) -> <a href="./src/cloudflare/types/zones/zone_hold.py">ZoneHold</a></code>
+- <code title="patch /zones/{zone_id}/hold">client.zones.holds.<a href="./src/cloudflare/resources/zones/holds.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/zones/hold_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zones/zone_hold.py">ZoneHold</a></code>
 - <code title="get /zones/{zone_id}/hold">client.zones.holds.<a href="./src/cloudflare/resources/zones/holds.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/zones/zone_hold.py">ZoneHold</a></code>
 
 ## Subscriptions
@@ -404,14 +461,43 @@ Methods:
 Types:
 
 ```python
-from cloudflare.types.zones import SubscriptionCreateResponse, SubscriptionGetResponse
+from cloudflare.types.zones import (
+    SubscriptionCreateResponse,
+    SubscriptionUpdateResponse,
+    SubscriptionGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /zones/{zone_id}/subscription">client.zones.subscriptions.<a href="./src/cloudflare/resources/zones/subscriptions.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/zones/subscription_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zones/subscription_create_response.py">SubscriptionCreateResponse</a></code>
+- <code title="put /zones/{zone_id}/subscription">client.zones.subscriptions.<a href="./src/cloudflare/resources/zones/subscriptions.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/zones/subscription_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zones/subscription_update_response.py">SubscriptionUpdateResponse</a></code>
+- <code title="get /zones/{zone_id}/subscription">client.zones.subscriptions.<a href="./src/cloudflare/resources/zones/subscriptions.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/zones/subscription_get_response.py">SubscriptionGetResponse</a></code>
+
+## Plans
+
+Types:
+
+```python
+from cloudflare.types.zones import AvailableRatePlan
+```
+
+Methods:
+
+- <code title="get /zones/{zone_id}/available_plans">client.zones.plans.<a href="./src/cloudflare/resources/zones/plans.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/zones/available_rate_plan.py">SyncSinglePage[AvailableRatePlan]</a></code>
+- <code title="get /zones/{zone_id}/available_plans/{plan_identifier}">client.zones.plans.<a href="./src/cloudflare/resources/zones/plans.py">get</a>(plan_identifier, \*, zone_id) -> <a href="./src/cloudflare/types/zones/available_rate_plan.py">AvailableRatePlan</a></code>
+
+## RatePlans
+
+Types:
+
+```python
+from cloudflare.types.zones import RatePlanGetResponse
 ```
 
 Methods:
 
-- <code title="post /zones/{identifier}/subscription">client.zones.subscriptions.<a href="./src/cloudflare/resources/zones/subscriptions.py">create</a>(identifier, \*\*<a href="src/cloudflare/types/zones/subscription_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zones/subscription_create_response.py">SubscriptionCreateResponse</a></code>
-- <code title="get /accounts/{account_identifier}/subscriptions">client.zones.subscriptions.<a href="./src/cloudflare/resources/zones/subscriptions.py">list</a>(account_identifier) -> <a href="./src/cloudflare/types/user/subscription.py">SyncSinglePage[Subscription]</a></code>
-- <code title="get /zones/{identifier}/subscription">client.zones.subscriptions.<a href="./src/cloudflare/resources/zones/subscriptions.py">get</a>(identifier) -> <a href="./src/cloudflare/types/zones/subscription_get_response.py">SubscriptionGetResponse</a></code>
+- <code title="get /zones/{zone_id}/available_rate_plans">client.zones.rate_plans.<a href="./src/cloudflare/resources/zones/rate_plans.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/zones/rate_plan_get_response.py">SyncSinglePage[RatePlanGetResponse]</a></code>
 
 # LoadBalancers
 
@@ -488,7 +574,24 @@ from cloudflare.types.load_balancers.monitors import ReferenceGetResponse
 
 Methods:
 
-- <code title="get /accounts/{account_id}/load_balancers/monitors/{monitor_id}/references">client.load_balancers.monitors.references.<a href="./src/cloudflare/resources/load_balancers/monitors/references.py">get</a>(monitor_id, \*, account_id) -> <a href="./src/cloudflare/types/load_balancers/monitors/reference_get_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/load_balancers/monitors/{monitor_id}/references">client.load_balancers.monitors.references.<a href="./src/cloudflare/resources/load_balancers/monitors/references.py">get</a>(monitor_id, \*, account_id) -> <a href="./src/cloudflare/types/load_balancers/monitors/reference_get_response.py">SyncSinglePage[ReferenceGetResponse]</a></code>
+
+## MonitorGroups
+
+Types:
+
+```python
+from cloudflare.types.load_balancers import MonitorGroup
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/load_balancers/monitor_groups">client.load_balancers.monitor_groups.<a href="./src/cloudflare/resources/load_balancers/monitor_groups.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/load_balancers/monitor_group_create_params.py">params</a>) -> <a href="./src/cloudflare/types/load_balancers/monitor_group.py">MonitorGroup</a></code>
+- <code title="put /accounts/{account_id}/load_balancers/monitor_groups/{monitor_group_id}">client.load_balancers.monitor_groups.<a href="./src/cloudflare/resources/load_balancers/monitor_groups.py">update</a>(monitor_group_id, \*, account_id, \*\*<a href="src/cloudflare/types/load_balancers/monitor_group_update_params.py">params</a>) -> <a href="./src/cloudflare/types/load_balancers/monitor_group.py">MonitorGroup</a></code>
+- <code title="get /accounts/{account_id}/load_balancers/monitor_groups">client.load_balancers.monitor_groups.<a href="./src/cloudflare/resources/load_balancers/monitor_groups.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/load_balancers/monitor_group.py">SyncSinglePage[MonitorGroup]</a></code>
+- <code title="delete /accounts/{account_id}/load_balancers/monitor_groups/{monitor_group_id}">client.load_balancers.monitor_groups.<a href="./src/cloudflare/resources/load_balancers/monitor_groups.py">delete</a>(monitor_group_id, \*, account_id) -> <a href="./src/cloudflare/types/load_balancers/monitor_group.py">MonitorGroup</a></code>
+- <code title="patch /accounts/{account_id}/load_balancers/monitor_groups/{monitor_group_id}">client.load_balancers.monitor_groups.<a href="./src/cloudflare/resources/load_balancers/monitor_groups.py">edit</a>(monitor_group_id, \*, account_id, \*\*<a href="src/cloudflare/types/load_balancers/monitor_group_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/load_balancers/monitor_group.py">MonitorGroup</a></code>
+- <code title="get /accounts/{account_id}/load_balancers/monitor_groups/{monitor_group_id}">client.load_balancers.monitor_groups.<a href="./src/cloudflare/resources/load_balancers/monitor_groups.py">get</a>(monitor_group_id, \*, account_id) -> <a href="./src/cloudflare/types/load_balancers/monitor_group.py">MonitorGroup</a></code>
 
 ## Pools
 
@@ -504,6 +607,7 @@ Methods:
 - <code title="put /accounts/{account_id}/load_balancers/pools/{pool_id}">client.load_balancers.pools.<a href="./src/cloudflare/resources/load_balancers/pools/pools.py">update</a>(pool_id, \*, account_id, \*\*<a href="src/cloudflare/types/load_balancers/pool_update_params.py">params</a>) -> <a href="./src/cloudflare/types/load_balancers/pool.py">Pool</a></code>
 - <code title="get /accounts/{account_id}/load_balancers/pools">client.load_balancers.pools.<a href="./src/cloudflare/resources/load_balancers/pools/pools.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/load_balancers/pool_list_params.py">params</a>) -> <a href="./src/cloudflare/types/load_balancers/pool.py">SyncSinglePage[Pool]</a></code>
 - <code title="delete /accounts/{account_id}/load_balancers/pools/{pool_id}">client.load_balancers.pools.<a href="./src/cloudflare/resources/load_balancers/pools/pools.py">delete</a>(pool_id, \*, account_id) -> <a href="./src/cloudflare/types/load_balancers/pool_delete_response.py">PoolDeleteResponse</a></code>
+- <code title="patch /accounts/{account_id}/load_balancers/pools">client.load_balancers.pools.<a href="./src/cloudflare/resources/load_balancers/pools/pools.py">bulk_edit</a>(\*, account_id, \*\*<a href="src/cloudflare/types/load_balancers/pool_bulk_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/load_balancers/pool.py">SyncSinglePage[Pool]</a></code>
 - <code title="patch /accounts/{account_id}/load_balancers/pools/{pool_id}">client.load_balancers.pools.<a href="./src/cloudflare/resources/load_balancers/pools/pools.py">edit</a>(pool_id, \*, account_id, \*\*<a href="src/cloudflare/types/load_balancers/pool_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/load_balancers/pool.py">Pool</a></code>
 - <code title="get /accounts/{account_id}/load_balancers/pools/{pool_id}">client.load_balancers.pools.<a href="./src/cloudflare/resources/load_balancers/pools/pools.py">get</a>(pool_id, \*, account_id) -> <a href="./src/cloudflare/types/load_balancers/pool.py">Pool</a></code>
 
@@ -530,7 +634,7 @@ from cloudflare.types.load_balancers.pools import ReferenceGetResponse
 
 Methods:
 
-- <code title="get /accounts/{account_id}/load_balancers/pools/{pool_id}/references">client.load_balancers.pools.references.<a href="./src/cloudflare/resources/load_balancers/pools/references.py">get</a>(pool_id, \*, account_id) -> <a href="./src/cloudflare/types/load_balancers/pools/reference_get_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/load_balancers/pools/{pool_id}/references">client.load_balancers.pools.references.<a href="./src/cloudflare/resources/load_balancers/pools/references.py">get</a>(pool_id, \*, account_id) -> <a href="./src/cloudflare/types/load_balancers/pools/reference_get_response.py">SyncSinglePage[ReferenceGetResponse]</a></code>
 
 ## Previews
 
@@ -562,12 +666,12 @@ Methods:
 Types:
 
 ```python
-from cloudflare.types.load_balancers import SearchGetResponse
+from cloudflare.types.load_balancers import SearchListResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/load_balancers/search">client.load_balancers.searches.<a href="./src/cloudflare/resources/load_balancers/searches.py">get</a>(\*, account_id, \*\*<a href="src/cloudflare/types/load_balancers/search_get_params.py">params</a>) -> <a href="./src/cloudflare/types/load_balancers/search_get_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/load_balancers/search">client.load_balancers.searches.<a href="./src/cloudflare/resources/load_balancers/searches.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/load_balancers/search_list_params.py">params</a>) -> <a href="./src/cloudflare/types/load_balancers/search_list_response.py">SyncV4PagePagination[SearchListResponse]</a></code>
 
 # Cache
 
@@ -579,7 +683,7 @@ from cloudflare.types.cache import CachePurgeResponse
 
 Methods:
 
-- <code title="post /zones/{zone_id}/purge_cache">client.cache.<a href="./src/cloudflare/resources/cache/cache.py">purge</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/cache/cache_purge_params.py">params</a>) -> <a href="./src/cloudflare/types/cache/cache_purge_response.py">Optional</a></code>
+- <code title="post /zones/{zone_id}/purge_cache">client.cache.<a href="./src/cloudflare/resources/cache/cache.py">purge</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/cache/cache_purge_params.py">params</a>) -> <a href="./src/cloudflare/types/cache/cache_purge_response.py">Optional[CachePurgeResponse]</a></code>
 
 ## CacheReserve
 
@@ -599,10 +703,10 @@ from cloudflare.types.cache import (
 
 Methods:
 
-- <code title="post /zones/{zone_id}/cache/cache_reserve_clear">client.cache.cache_reserve.<a href="./src/cloudflare/resources/cache/cache_reserve.py">clear</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/cache/cache_reserve_clear_params.py">params</a>) -> <a href="./src/cloudflare/types/cache/cache_reserve_clear_response.py">CacheReserveClearResponse</a></code>
-- <code title="patch /zones/{zone_id}/cache/cache_reserve">client.cache.cache_reserve.<a href="./src/cloudflare/resources/cache/cache_reserve.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/cache/cache_reserve_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/cache/cache_reserve_edit_response.py">CacheReserveEditResponse</a></code>
-- <code title="get /zones/{zone_id}/cache/cache_reserve">client.cache.cache_reserve.<a href="./src/cloudflare/resources/cache/cache_reserve.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/cache/cache_reserve_get_response.py">CacheReserveGetResponse</a></code>
-- <code title="get /zones/{zone_id}/cache/cache_reserve_clear">client.cache.cache_reserve.<a href="./src/cloudflare/resources/cache/cache_reserve.py">status</a>(\*, zone_id) -> <a href="./src/cloudflare/types/cache/cache_reserve_status_response.py">CacheReserveStatusResponse</a></code>
+- <code title="post /zones/{zone_id}/cache/cache_reserve_clear">client.cache.cache_reserve.<a href="./src/cloudflare/resources/cache/cache_reserve.py">clear</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/cache/cache_reserve_clear_params.py">params</a>) -> <a href="./src/cloudflare/types/cache/cache_reserve_clear_response.py">Optional[CacheReserveClearResponse]</a></code>
+- <code title="patch /zones/{zone_id}/cache/cache_reserve">client.cache.cache_reserve.<a href="./src/cloudflare/resources/cache/cache_reserve.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/cache/cache_reserve_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/cache/cache_reserve_edit_response.py">Optional[CacheReserveEditResponse]</a></code>
+- <code title="get /zones/{zone_id}/cache/cache_reserve">client.cache.cache_reserve.<a href="./src/cloudflare/resources/cache/cache_reserve.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/cache/cache_reserve_get_response.py">Optional[CacheReserveGetResponse]</a></code>
+- <code title="get /zones/{zone_id}/cache/cache_reserve_clear">client.cache.cache_reserve.<a href="./src/cloudflare/resources/cache/cache_reserve.py">status</a>(\*, zone_id) -> <a href="./src/cloudflare/types/cache/cache_reserve_status_response.py">Optional[CacheReserveStatusResponse]</a></code>
 
 ## SmartTieredCache
 
@@ -618,9 +722,9 @@ from cloudflare.types.cache import (
 
 Methods:
 
-- <code title="delete /zones/{zone_id}/cache/tiered_cache_smart_topology_enable">client.cache.smart_tiered_cache.<a href="./src/cloudflare/resources/cache/smart_tiered_cache.py">delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/cache/smart_tiered_cache_delete_response.py">SmartTieredCacheDeleteResponse</a></code>
-- <code title="patch /zones/{zone_id}/cache/tiered_cache_smart_topology_enable">client.cache.smart_tiered_cache.<a href="./src/cloudflare/resources/cache/smart_tiered_cache.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/cache/smart_tiered_cache_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/cache/smart_tiered_cache_edit_response.py">SmartTieredCacheEditResponse</a></code>
-- <code title="get /zones/{zone_id}/cache/tiered_cache_smart_topology_enable">client.cache.smart_tiered_cache.<a href="./src/cloudflare/resources/cache/smart_tiered_cache.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/cache/smart_tiered_cache_get_response.py">SmartTieredCacheGetResponse</a></code>
+- <code title="delete /zones/{zone_id}/cache/tiered_cache_smart_topology_enable">client.cache.smart_tiered_cache.<a href="./src/cloudflare/resources/cache/smart_tiered_cache.py">delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/cache/smart_tiered_cache_delete_response.py">Optional[SmartTieredCacheDeleteResponse]</a></code>
+- <code title="patch /zones/{zone_id}/cache/tiered_cache_smart_topology_enable">client.cache.smart_tiered_cache.<a href="./src/cloudflare/resources/cache/smart_tiered_cache.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/cache/smart_tiered_cache_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/cache/smart_tiered_cache_edit_response.py">Optional[SmartTieredCacheEditResponse]</a></code>
+- <code title="get /zones/{zone_id}/cache/tiered_cache_smart_topology_enable">client.cache.smart_tiered_cache.<a href="./src/cloudflare/resources/cache/smart_tiered_cache.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/cache/smart_tiered_cache_get_response.py">Optional[SmartTieredCacheGetResponse]</a></code>
 
 ## Variants
 
@@ -629,7 +733,7 @@ Types:
 ```python
 from cloudflare.types.cache import (
     CacheVariant,
-    CacheVariantIdentifier,
+    VariantDeleteResponse,
     VariantEditResponse,
     VariantGetResponse,
 )
@@ -637,9 +741,9 @@ from cloudflare.types.cache import (
 
 Methods:
 
-- <code title="delete /zones/{zone_id}/cache/variants">client.cache.variants.<a href="./src/cloudflare/resources/cache/variants.py">delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/cache/cache_variant.py">CacheVariant</a></code>
-- <code title="patch /zones/{zone_id}/cache/variants">client.cache.variants.<a href="./src/cloudflare/resources/cache/variants.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/cache/variant_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/cache/variant_edit_response.py">VariantEditResponse</a></code>
-- <code title="get /zones/{zone_id}/cache/variants">client.cache.variants.<a href="./src/cloudflare/resources/cache/variants.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/cache/variant_get_response.py">VariantGetResponse</a></code>
+- <code title="delete /zones/{zone_id}/cache/variants">client.cache.variants.<a href="./src/cloudflare/resources/cache/variants.py">delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/cache/variant_delete_response.py">Optional[VariantDeleteResponse]</a></code>
+- <code title="patch /zones/{zone_id}/cache/variants">client.cache.variants.<a href="./src/cloudflare/resources/cache/variants.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/cache/variant_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/cache/variant_edit_response.py">Optional[VariantEditResponse]</a></code>
+- <code title="get /zones/{zone_id}/cache/variants">client.cache.variants.<a href="./src/cloudflare/resources/cache/variants.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/cache/variant_get_response.py">Optional[VariantGetResponse]</a></code>
 
 ## RegionalTieredCache
 
@@ -655,22 +759,16 @@ from cloudflare.types.cache import (
 
 Methods:
 
-- <code title="patch /zones/{zone_id}/cache/regional_tiered_cache">client.cache.regional_tiered_cache.<a href="./src/cloudflare/resources/cache/regional_tiered_cache.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/cache/regional_tiered_cache_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/cache/regional_tiered_cache_edit_response.py">RegionalTieredCacheEditResponse</a></code>
-- <code title="get /zones/{zone_id}/cache/regional_tiered_cache">client.cache.regional_tiered_cache.<a href="./src/cloudflare/resources/cache/regional_tiered_cache.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/cache/regional_tiered_cache_get_response.py">RegionalTieredCacheGetResponse</a></code>
+- <code title="patch /zones/{zone_id}/cache/regional_tiered_cache">client.cache.regional_tiered_cache.<a href="./src/cloudflare/resources/cache/regional_tiered_cache.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/cache/regional_tiered_cache_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/cache/regional_tiered_cache_edit_response.py">Optional[RegionalTieredCacheEditResponse]</a></code>
+- <code title="get /zones/{zone_id}/cache/regional_tiered_cache">client.cache.regional_tiered_cache.<a href="./src/cloudflare/resources/cache/regional_tiered_cache.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/cache/regional_tiered_cache_get_response.py">Optional[RegionalTieredCacheGetResponse]</a></code>
 
 # SSL
 
 ## Analyze
 
-Types:
-
-```python
-from cloudflare.types.ssl import AnalyzeCreateResponse
-```
-
 Methods:
 
-- <code title="post /zones/{zone_id}/ssl/analyze">client.ssl.analyze.<a href="./src/cloudflare/resources/ssl/analyze.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/ssl/analyze_create_params.py">params</a>) -> <a href="./src/cloudflare/types/ssl/analyze_create_response.py">Optional</a></code>
+- <code title="post /zones/{zone_id}/ssl/analyze">client.ssl.analyze.<a href="./src/cloudflare/resources/ssl/analyze.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/ssl/analyze_create_params.py">params</a>) -> object</code>
 
 ## CertificatePacks
 
@@ -682,6 +780,7 @@ from cloudflare.types.ssl import (
     RequestValidity,
     Status,
     ValidationMethod,
+    CertificatePackCreateResponse,
     CertificatePackListResponse,
     CertificatePackDeleteResponse,
     CertificatePackEditResponse,
@@ -691,22 +790,11 @@ from cloudflare.types.ssl import (
 
 Methods:
 
-- <code title="get /zones/{zone_id}/ssl/certificate_packs">client.ssl.certificate_packs.<a href="./src/cloudflare/resources/ssl/certificate_packs/certificate_packs.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/ssl/certificate_pack_list_params.py">params</a>) -> <a href="./src/cloudflare/types/ssl/certificate_pack_list_response.py">SyncSinglePage[object]</a></code>
-- <code title="delete /zones/{zone_id}/ssl/certificate_packs/{certificate_pack_id}">client.ssl.certificate_packs.<a href="./src/cloudflare/resources/ssl/certificate_packs/certificate_packs.py">delete</a>(certificate_pack_id, \*, zone_id) -> <a href="./src/cloudflare/types/ssl/certificate_pack_delete_response.py">Optional</a></code>
-- <code title="patch /zones/{zone_id}/ssl/certificate_packs/{certificate_pack_id}">client.ssl.certificate_packs.<a href="./src/cloudflare/resources/ssl/certificate_packs/certificate_packs.py">edit</a>(certificate_pack_id, \*, zone_id, \*\*<a href="src/cloudflare/types/ssl/certificate_pack_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/ssl/certificate_pack_edit_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/ssl/certificate_packs/{certificate_pack_id}">client.ssl.certificate_packs.<a href="./src/cloudflare/resources/ssl/certificate_packs/certificate_packs.py">get</a>(certificate_pack_id, \*, zone_id) -> <a href="./src/cloudflare/types/ssl/certificate_pack_get_response.py">Optional</a></code>
-
-### Order
-
-Types:
-
-```python
-from cloudflare.types.ssl.certificate_packs import OrderCreateResponse
-```
-
-Methods:
-
-- <code title="post /zones/{zone_id}/ssl/certificate_packs/order">client.ssl.certificate_packs.order.<a href="./src/cloudflare/resources/ssl/certificate_packs/order.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/ssl/certificate_packs/order_create_params.py">params</a>) -> <a href="./src/cloudflare/types/ssl/certificate_packs/order_create_response.py">Optional</a></code>
+- <code title="post /zones/{zone_id}/ssl/certificate_packs/order">client.ssl.certificate_packs.<a href="./src/cloudflare/resources/ssl/certificate_packs/certificate_packs.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/ssl/certificate_pack_create_params.py">params</a>) -> <a href="./src/cloudflare/types/ssl/certificate_pack_create_response.py">Optional[CertificatePackCreateResponse]</a></code>
+- <code title="get /zones/{zone_id}/ssl/certificate_packs">client.ssl.certificate_packs.<a href="./src/cloudflare/resources/ssl/certificate_packs/certificate_packs.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/ssl/certificate_pack_list_params.py">params</a>) -> <a href="./src/cloudflare/types/ssl/certificate_pack_list_response.py">SyncSinglePage[CertificatePackListResponse]</a></code>
+- <code title="delete /zones/{zone_id}/ssl/certificate_packs/{certificate_pack_id}">client.ssl.certificate_packs.<a href="./src/cloudflare/resources/ssl/certificate_packs/certificate_packs.py">delete</a>(certificate_pack_id, \*, zone_id) -> <a href="./src/cloudflare/types/ssl/certificate_pack_delete_response.py">Optional[CertificatePackDeleteResponse]</a></code>
+- <code title="patch /zones/{zone_id}/ssl/certificate_packs/{certificate_pack_id}">client.ssl.certificate_packs.<a href="./src/cloudflare/resources/ssl/certificate_packs/certificate_packs.py">edit</a>(certificate_pack_id, \*, zone_id, \*\*<a href="src/cloudflare/types/ssl/certificate_pack_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/ssl/certificate_pack_edit_response.py">Optional[CertificatePackEditResponse]</a></code>
+- <code title="get /zones/{zone_id}/ssl/certificate_packs/{certificate_pack_id}">client.ssl.certificate_packs.<a href="./src/cloudflare/resources/ssl/certificate_packs/certificate_packs.py">get</a>(certificate_pack_id, \*, zone_id) -> <a href="./src/cloudflare/types/ssl/certificate_pack_get_response.py">Optional[CertificatePackGetResponse]</a></code>
 
 ### Quota
 
@@ -718,7 +806,7 @@ from cloudflare.types.ssl.certificate_packs import QuotaGetResponse
 
 Methods:
 
-- <code title="get /zones/{zone_id}/ssl/certificate_packs/quota">client.ssl.certificate_packs.quota.<a href="./src/cloudflare/resources/ssl/certificate_packs/quota.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/ssl/certificate_packs/quota_get_response.py">Optional</a></code>
+- <code title="get /zones/{zone_id}/ssl/certificate_packs/quota">client.ssl.certificate_packs.quota.<a href="./src/cloudflare/resources/ssl/certificate_packs/quota.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/ssl/certificate_packs/quota_get_response.py">Optional[QuotaGetResponse]</a></code>
 
 ## Recommendations
 
@@ -730,7 +818,7 @@ from cloudflare.types.ssl import RecommendationGetResponse
 
 Methods:
 
-- <code title="get /zones/{zone_identifier}/ssl/recommendation">client.ssl.recommendations.<a href="./src/cloudflare/resources/ssl/recommendations.py">get</a>(zone_identifier) -> <a href="./src/cloudflare/types/ssl/recommendation_get_response.py">Optional</a></code>
+- <code title="get /zones/{zone_id}/ssl/recommendation">client.ssl.recommendations.<a href="./src/cloudflare/resources/ssl/recommendations.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/ssl/recommendation_get_response.py">RecommendationGetResponse</a></code>
 
 ## Universal
 
@@ -744,8 +832,8 @@ from cloudflare.types.ssl.universal import UniversalSSLSettings
 
 Methods:
 
-- <code title="patch /zones/{zone_id}/ssl/universal/settings">client.ssl.universal.settings.<a href="./src/cloudflare/resources/ssl/universal/settings.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/ssl/universal/setting_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/ssl/universal/universal_ssl_settings.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/ssl/universal/settings">client.ssl.universal.settings.<a href="./src/cloudflare/resources/ssl/universal/settings.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/ssl/universal/universal_ssl_settings.py">Optional</a></code>
+- <code title="patch /zones/{zone_id}/ssl/universal/settings">client.ssl.universal.settings.<a href="./src/cloudflare/resources/ssl/universal/settings.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/ssl/universal/setting_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/ssl/universal/universal_ssl_settings.py">Optional[UniversalSSLSettings]</a></code>
+- <code title="get /zones/{zone_id}/ssl/universal/settings">client.ssl.universal.settings.<a href="./src/cloudflare/resources/ssl/universal/settings.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/ssl/universal/universal_ssl_settings.py">Optional[UniversalSSLSettings]</a></code>
 
 ## Verification
 
@@ -757,29 +845,8 @@ from cloudflare.types.ssl import Verification, VerificationEditResponse, Verific
 
 Methods:
 
-- <code title="patch /zones/{zone_id}/ssl/verification/{certificate_pack_id}">client.ssl.verification.<a href="./src/cloudflare/resources/ssl/verification.py">edit</a>(certificate_pack_id, \*, zone_id, \*\*<a href="src/cloudflare/types/ssl/verification_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/ssl/verification_edit_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/ssl/verification">client.ssl.verification.<a href="./src/cloudflare/resources/ssl/verification.py">get</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/ssl/verification_get_params.py">params</a>) -> <a href="./src/cloudflare/types/ssl/verification_get_response.py">Optional</a></code>
-
-# Subscriptions
-
-Types:
-
-```python
-from cloudflare.types.subscriptions import (
-    SubscriptionCreateResponse,
-    SubscriptionUpdateResponse,
-    SubscriptionDeleteResponse,
-    SubscriptionGetResponse,
-)
-```
-
-Methods:
-
-- <code title="post /zones/{identifier}/subscription">client.subscriptions.<a href="./src/cloudflare/resources/subscriptions.py">create</a>(identifier, \*\*<a href="src/cloudflare/types/subscriptions/subscription_create_params.py">params</a>) -> <a href="./src/cloudflare/types/subscriptions/subscription_create_response.py">SubscriptionCreateResponse</a></code>
-- <code title="put /accounts/{account_identifier}/subscriptions/{subscription_identifier}">client.subscriptions.<a href="./src/cloudflare/resources/subscriptions.py">update</a>(subscription_identifier, \*, account_identifier, \*\*<a href="src/cloudflare/types/subscriptions/subscription_update_params.py">params</a>) -> <a href="./src/cloudflare/types/subscriptions/subscription_update_response.py">SubscriptionUpdateResponse</a></code>
-- <code title="get /accounts/{account_identifier}/subscriptions">client.subscriptions.<a href="./src/cloudflare/resources/subscriptions.py">list</a>(account_identifier) -> <a href="./src/cloudflare/types/user/subscription.py">SyncSinglePage[Subscription]</a></code>
-- <code title="delete /accounts/{account_identifier}/subscriptions/{subscription_identifier}">client.subscriptions.<a href="./src/cloudflare/resources/subscriptions.py">delete</a>(subscription_identifier, \*, account_identifier) -> <a href="./src/cloudflare/types/subscriptions/subscription_delete_response.py">SubscriptionDeleteResponse</a></code>
-- <code title="get /zones/{identifier}/subscription">client.subscriptions.<a href="./src/cloudflare/resources/subscriptions.py">get</a>(identifier) -> <a href="./src/cloudflare/types/subscriptions/subscription_get_response.py">SubscriptionGetResponse</a></code>
+- <code title="patch /zones/{zone_id}/ssl/verification/{certificate_pack_id}">client.ssl.verification.<a href="./src/cloudflare/resources/ssl/verification.py">edit</a>(certificate_pack_id, \*, zone_id, \*\*<a href="src/cloudflare/types/ssl/verification_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/ssl/verification_edit_response.py">Optional[VerificationEditResponse]</a></code>
+- <code title="get /zones/{zone_id}/ssl/verification">client.ssl.verification.<a href="./src/cloudflare/resources/ssl/verification.py">get</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/ssl/verification_get_params.py">params</a>) -> <a href="./src/cloudflare/types/ssl/verification_get_response.py">Optional[VerificationGetResponse]</a></code>
 
 # ACM
 
@@ -788,13 +855,19 @@ Methods:
 Types:
 
 ```python
-from cloudflare.types.acm import CertificateAuthority, TotalTLSCreateResponse, TotalTLSGetResponse
+from cloudflare.types.acm import (
+    CertificateAuthority,
+    TotalTLSUpdateResponse,
+    TotalTLSEditResponse,
+    TotalTLSGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /zones/{zone_id}/acm/total_tls">client.acm.total_tls.<a href="./src/cloudflare/resources/acm/total_tls.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/acm/total_tls_create_params.py">params</a>) -> <a href="./src/cloudflare/types/acm/total_tls_create_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/acm/total_tls">client.acm.total_tls.<a href="./src/cloudflare/resources/acm/total_tls.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/acm/total_tls_get_response.py">Optional</a></code>
+- <code title="post /zones/{zone_id}/acm/total_tls">client.acm.total_tls.<a href="./src/cloudflare/resources/acm/total_tls.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/acm/total_tls_update_params.py">params</a>) -> <a href="./src/cloudflare/types/acm/total_tls_update_response.py">Optional[TotalTLSUpdateResponse]</a></code>
+- <code title="post /zones/{zone_id}/acm/total_tls">client.acm.total_tls.<a href="./src/cloudflare/resources/acm/total_tls.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/acm/total_tls_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/acm/total_tls_edit_response.py">Optional[TotalTLSEditResponse]</a></code>
+- <code title="get /zones/{zone_id}/acm/total_tls">client.acm.total_tls.<a href="./src/cloudflare/resources/acm/total_tls.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/acm/total_tls_get_response.py">Optional[TotalTLSGetResponse]</a></code>
 
 # Argo
 
@@ -821,33 +894,8 @@ from cloudflare.types.argo import TieredCachingEditResponse, TieredCachingGetRes
 
 Methods:
 
-- <code title="patch /zones/{zone_id}/argo/tiered_caching">client.argo.tiered_caching.<a href="./src/cloudflare/resources/argo/tiered_caching.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/argo/tiered_caching_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/argo/tiered_caching_edit_response.py">TieredCachingEditResponse</a></code>
-- <code title="get /zones/{zone_id}/argo/tiered_caching">client.argo.tiered_caching.<a href="./src/cloudflare/resources/argo/tiered_caching.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/argo/tiered_caching_get_response.py">TieredCachingGetResponse</a></code>
-
-# Plans
-
-Types:
-
-```python
-from cloudflare.types.plans import AvailableRatePlan
-```
-
-Methods:
-
-- <code title="get /zones/{zone_identifier}/available_plans">client.plans.<a href="./src/cloudflare/resources/plans.py">list</a>(zone_identifier) -> <a href="./src/cloudflare/types/plans/available_rate_plan.py">SyncSinglePage[AvailableRatePlan]</a></code>
-- <code title="get /zones/{zone_identifier}/available_plans/{plan_identifier}">client.plans.<a href="./src/cloudflare/resources/plans.py">get</a>(plan_identifier, \*, zone_identifier) -> <a href="./src/cloudflare/types/plans/available_rate_plan.py">AvailableRatePlan</a></code>
-
-# RatePlans
-
-Types:
-
-```python
-from cloudflare.types.rate_plans import RatePlan, RatePlanGetResponse
-```
-
-Methods:
-
-- <code title="get /zones/{zone_identifier}/available_rate_plans">client.rate_plans.<a href="./src/cloudflare/resources/rate_plans.py">get</a>(zone_identifier) -> <a href="./src/cloudflare/types/rate_plans/rate_plan_get_response.py">Optional</a></code>
+- <code title="patch /zones/{zone_id}/argo/tiered_caching">client.argo.tiered_caching.<a href="./src/cloudflare/resources/argo/tiered_caching.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/argo/tiered_caching_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/argo/tiered_caching_edit_response.py">Optional[TieredCachingEditResponse]</a></code>
+- <code title="get /zones/{zone_id}/argo/tiered_caching">client.argo.tiered_caching.<a href="./src/cloudflare/resources/argo/tiered_caching.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/argo/tiered_caching_get_response.py">Optional[TieredCachingGetResponse]</a></code>
 
 # CertificateAuthorities
 
@@ -866,8 +914,8 @@ from cloudflare.types.certificate_authorities import (
 
 Methods:
 
-- <code title="put /zones/{zone_id}/certificate_authorities/hostname_associations">client.certificate_authorities.hostname_associations.<a href="./src/cloudflare/resources/certificate_authorities/hostname_associations.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/certificate_authorities/hostname_association_update_params.py">params</a>) -> <a href="./src/cloudflare/types/certificate_authorities/hostname_association_update_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/certificate_authorities/hostname_associations">client.certificate_authorities.hostname_associations.<a href="./src/cloudflare/resources/certificate_authorities/hostname_associations.py">get</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/certificate_authorities/hostname_association_get_params.py">params</a>) -> <a href="./src/cloudflare/types/certificate_authorities/hostname_association_get_response.py">Optional</a></code>
+- <code title="put /zones/{zone_id}/certificate_authorities/hostname_associations">client.certificate_authorities.hostname_associations.<a href="./src/cloudflare/resources/certificate_authorities/hostname_associations.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/certificate_authorities/hostname_association_update_params.py">params</a>) -> <a href="./src/cloudflare/types/certificate_authorities/hostname_association_update_response.py">Optional[HostnameAssociationUpdateResponse]</a></code>
+- <code title="get /zones/{zone_id}/certificate_authorities/hostname_associations">client.certificate_authorities.hostname_associations.<a href="./src/cloudflare/resources/certificate_authorities/hostname_associations.py">get</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/certificate_authorities/hostname_association_get_params.py">params</a>) -> <a href="./src/cloudflare/types/certificate_authorities/hostname_association_get_response.py">Optional[HostnameAssociationGetResponse]</a></code>
 
 # ClientCertificates
 
@@ -879,11 +927,11 @@ from cloudflare.types.client_certificates import ClientCertificate
 
 Methods:
 
-- <code title="post /zones/{zone_id}/client_certificates">client.client_certificates.<a href="./src/cloudflare/resources/client_certificates.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/client_certificates/client_certificate_create_params.py">params</a>) -> <a href="./src/cloudflare/types/client_certificates/client_certificate.py">Optional</a></code>
+- <code title="post /zones/{zone_id}/client_certificates">client.client_certificates.<a href="./src/cloudflare/resources/client_certificates.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/client_certificates/client_certificate_create_params.py">params</a>) -> <a href="./src/cloudflare/types/client_certificates/client_certificate.py">Optional[ClientCertificate]</a></code>
 - <code title="get /zones/{zone_id}/client_certificates">client.client_certificates.<a href="./src/cloudflare/resources/client_certificates.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/client_certificates/client_certificate_list_params.py">params</a>) -> <a href="./src/cloudflare/types/client_certificates/client_certificate.py">SyncV4PagePaginationArray[ClientCertificate]</a></code>
-- <code title="delete /zones/{zone_id}/client_certificates/{client_certificate_id}">client.client_certificates.<a href="./src/cloudflare/resources/client_certificates.py">delete</a>(client_certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/client_certificates/client_certificate.py">Optional</a></code>
-- <code title="patch /zones/{zone_id}/client_certificates/{client_certificate_id}">client.client_certificates.<a href="./src/cloudflare/resources/client_certificates.py">edit</a>(client_certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/client_certificates/client_certificate.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/client_certificates/{client_certificate_id}">client.client_certificates.<a href="./src/cloudflare/resources/client_certificates.py">get</a>(client_certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/client_certificates/client_certificate.py">Optional</a></code>
+- <code title="delete /zones/{zone_id}/client_certificates/{client_certificate_id}">client.client_certificates.<a href="./src/cloudflare/resources/client_certificates.py">delete</a>(client_certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/client_certificates/client_certificate.py">Optional[ClientCertificate]</a></code>
+- <code title="patch /zones/{zone_id}/client_certificates/{client_certificate_id}">client.client_certificates.<a href="./src/cloudflare/resources/client_certificates.py">edit</a>(client_certificate_id, \*, zone_id, \*\*<a href="src/cloudflare/types/client_certificates/client_certificate_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/client_certificates/client_certificate.py">Optional[ClientCertificate]</a></code>
+- <code title="get /zones/{zone_id}/client_certificates/{client_certificate_id}">client.client_certificates.<a href="./src/cloudflare/resources/client_certificates.py">get</a>(client_certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/client_certificates/client_certificate.py">Optional[ClientCertificate]</a></code>
 
 # CustomCertificates
 
@@ -894,32 +942,23 @@ from cloudflare.types.custom_certificates import (
     CustomCertificate,
     GeoRestrictions,
     Status,
-    CustomCertificateCreateResponse,
     CustomCertificateDeleteResponse,
-    CustomCertificateEditResponse,
-    CustomCertificateGetResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /zones/{zone_id}/custom_certificates">client.custom_certificates.<a href="./src/cloudflare/resources/custom_certificates/custom_certificates.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/custom_certificates/custom_certificate_create_params.py">params</a>) -> <a href="./src/cloudflare/types/custom_certificates/custom_certificate_create_response.py">Optional</a></code>
+- <code title="post /zones/{zone_id}/custom_certificates">client.custom_certificates.<a href="./src/cloudflare/resources/custom_certificates/custom_certificates.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/custom_certificates/custom_certificate_create_params.py">params</a>) -> <a href="./src/cloudflare/types/custom_certificates/custom_certificate.py">Optional[CustomCertificate]</a></code>
 - <code title="get /zones/{zone_id}/custom_certificates">client.custom_certificates.<a href="./src/cloudflare/resources/custom_certificates/custom_certificates.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/custom_certificates/custom_certificate_list_params.py">params</a>) -> <a href="./src/cloudflare/types/custom_certificates/custom_certificate.py">SyncV4PagePaginationArray[CustomCertificate]</a></code>
-- <code title="delete /zones/{zone_id}/custom_certificates/{custom_certificate_id}">client.custom_certificates.<a href="./src/cloudflare/resources/custom_certificates/custom_certificates.py">delete</a>(custom_certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/custom_certificates/custom_certificate_delete_response.py">Optional</a></code>
-- <code title="patch /zones/{zone_id}/custom_certificates/{custom_certificate_id}">client.custom_certificates.<a href="./src/cloudflare/resources/custom_certificates/custom_certificates.py">edit</a>(custom_certificate_id, \*, zone_id, \*\*<a href="src/cloudflare/types/custom_certificates/custom_certificate_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/custom_certificates/custom_certificate_edit_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/custom_certificates/{custom_certificate_id}">client.custom_certificates.<a href="./src/cloudflare/resources/custom_certificates/custom_certificates.py">get</a>(custom_certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/custom_certificates/custom_certificate_get_response.py">Optional</a></code>
+- <code title="delete /zones/{zone_id}/custom_certificates/{custom_certificate_id}">client.custom_certificates.<a href="./src/cloudflare/resources/custom_certificates/custom_certificates.py">delete</a>(custom_certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/custom_certificates/custom_certificate_delete_response.py">Optional[CustomCertificateDeleteResponse]</a></code>
+- <code title="patch /zones/{zone_id}/custom_certificates/{custom_certificate_id}">client.custom_certificates.<a href="./src/cloudflare/resources/custom_certificates/custom_certificates.py">edit</a>(custom_certificate_id, \*, zone_id, \*\*<a href="src/cloudflare/types/custom_certificates/custom_certificate_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/custom_certificates/custom_certificate.py">Optional[CustomCertificate]</a></code>
+- <code title="get /zones/{zone_id}/custom_certificates/{custom_certificate_id}">client.custom_certificates.<a href="./src/cloudflare/resources/custom_certificates/custom_certificates.py">get</a>(custom_certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/custom_certificates/custom_certificate.py">Optional[CustomCertificate]</a></code>
 
 ## Prioritize
 
-Types:
-
-```python
-from cloudflare.types.custom_certificates import PrioritizeUpdateResponse
-```
-
 Methods:
 
-- <code title="put /zones/{zone_id}/custom_certificates/prioritize">client.custom_certificates.prioritize.<a href="./src/cloudflare/resources/custom_certificates/prioritize.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/custom_certificates/prioritize_update_params.py">params</a>) -> <a href="./src/cloudflare/types/custom_certificates/prioritize_update_response.py">Optional</a></code>
+- <code title="put /zones/{zone_id}/custom_certificates/prioritize">client.custom_certificates.prioritize.<a href="./src/cloudflare/resources/custom_certificates/prioritize.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/custom_certificates/prioritize_update_params.py">params</a>) -> <a href="./src/cloudflare/types/custom_certificates/custom_certificate.py">SyncSinglePage[CustomCertificate]</a></code>
 
 # CustomHostnames
 
@@ -941,11 +980,11 @@ from cloudflare.types.custom_hostnames import (
 
 Methods:
 
-- <code title="post /zones/{zone_id}/custom_hostnames">client.custom_hostnames.<a href="./src/cloudflare/resources/custom_hostnames/custom_hostnames.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/custom_hostnames/custom_hostname_create_params.py">params</a>) -> <a href="./src/cloudflare/types/custom_hostnames/custom_hostname_create_response.py">Optional</a></code>
+- <code title="post /zones/{zone_id}/custom_hostnames">client.custom_hostnames.<a href="./src/cloudflare/resources/custom_hostnames/custom_hostnames.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/custom_hostnames/custom_hostname_create_params.py">params</a>) -> <a href="./src/cloudflare/types/custom_hostnames/custom_hostname_create_response.py">Optional[CustomHostnameCreateResponse]</a></code>
 - <code title="get /zones/{zone_id}/custom_hostnames">client.custom_hostnames.<a href="./src/cloudflare/resources/custom_hostnames/custom_hostnames.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/custom_hostnames/custom_hostname_list_params.py">params</a>) -> <a href="./src/cloudflare/types/custom_hostnames/custom_hostname_list_response.py">SyncV4PagePaginationArray[CustomHostnameListResponse]</a></code>
 - <code title="delete /zones/{zone_id}/custom_hostnames/{custom_hostname_id}">client.custom_hostnames.<a href="./src/cloudflare/resources/custom_hostnames/custom_hostnames.py">delete</a>(custom_hostname_id, \*, zone_id) -> <a href="./src/cloudflare/types/custom_hostnames/custom_hostname_delete_response.py">CustomHostnameDeleteResponse</a></code>
-- <code title="patch /zones/{zone_id}/custom_hostnames/{custom_hostname_id}">client.custom_hostnames.<a href="./src/cloudflare/resources/custom_hostnames/custom_hostnames.py">edit</a>(custom_hostname_id, \*, zone_id, \*\*<a href="src/cloudflare/types/custom_hostnames/custom_hostname_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/custom_hostnames/custom_hostname_edit_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/custom_hostnames/{custom_hostname_id}">client.custom_hostnames.<a href="./src/cloudflare/resources/custom_hostnames/custom_hostnames.py">get</a>(custom_hostname_id, \*, zone_id) -> <a href="./src/cloudflare/types/custom_hostnames/custom_hostname_get_response.py">Optional</a></code>
+- <code title="patch /zones/{zone_id}/custom_hostnames/{custom_hostname_id}">client.custom_hostnames.<a href="./src/cloudflare/resources/custom_hostnames/custom_hostnames.py">edit</a>(custom_hostname_id, \*, zone_id, \*\*<a href="src/cloudflare/types/custom_hostnames/custom_hostname_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/custom_hostnames/custom_hostname_edit_response.py">Optional[CustomHostnameEditResponse]</a></code>
+- <code title="get /zones/{zone_id}/custom_hostnames/{custom_hostname_id}">client.custom_hostnames.<a href="./src/cloudflare/resources/custom_hostnames/custom_hostnames.py">get</a>(custom_hostname_id, \*, zone_id) -> <a href="./src/cloudflare/types/custom_hostnames/custom_hostname_get_response.py">Optional[CustomHostnameGetResponse]</a></code>
 
 ## FallbackOrigin
 
@@ -961,38 +1000,110 @@ from cloudflare.types.custom_hostnames import (
 
 Methods:
 
-- <code title="put /zones/{zone_id}/custom_hostnames/fallback_origin">client.custom_hostnames.fallback_origin.<a href="./src/cloudflare/resources/custom_hostnames/fallback_origin.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/custom_hostnames/fallback_origin_update_params.py">params</a>) -> <a href="./src/cloudflare/types/custom_hostnames/fallback_origin_update_response.py">Optional</a></code>
-- <code title="delete /zones/{zone_id}/custom_hostnames/fallback_origin">client.custom_hostnames.fallback_origin.<a href="./src/cloudflare/resources/custom_hostnames/fallback_origin.py">delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/custom_hostnames/fallback_origin_delete_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/custom_hostnames/fallback_origin">client.custom_hostnames.fallback_origin.<a href="./src/cloudflare/resources/custom_hostnames/fallback_origin.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/custom_hostnames/fallback_origin_get_response.py">Optional</a></code>
+- <code title="put /zones/{zone_id}/custom_hostnames/fallback_origin">client.custom_hostnames.fallback_origin.<a href="./src/cloudflare/resources/custom_hostnames/fallback_origin.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/custom_hostnames/fallback_origin_update_params.py">params</a>) -> <a href="./src/cloudflare/types/custom_hostnames/fallback_origin_update_response.py">Optional[FallbackOriginUpdateResponse]</a></code>
+- <code title="delete /zones/{zone_id}/custom_hostnames/fallback_origin">client.custom_hostnames.fallback_origin.<a href="./src/cloudflare/resources/custom_hostnames/fallback_origin.py">delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/custom_hostnames/fallback_origin_delete_response.py">Optional[FallbackOriginDeleteResponse]</a></code>
+- <code title="get /zones/{zone_id}/custom_hostnames/fallback_origin">client.custom_hostnames.fallback_origin.<a href="./src/cloudflare/resources/custom_hostnames/fallback_origin.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/custom_hostnames/fallback_origin_get_response.py">Optional[FallbackOriginGetResponse]</a></code>
+
+## CertificatePack
+
+### Certificates
+
+Types:
+
+```python
+from cloudflare.types.custom_hostnames.certificate_pack import (
+    CertificateUpdateResponse,
+    CertificateDeleteResponse,
+)
+```
+
+Methods:
+
+- <code title="put /zones/{zone_id}/custom_hostnames/{custom_hostname_id}/certificate_pack/{certificate_pack_id}/certificates/{certificate_id}">client.custom_hostnames.certificate_pack.certificates.<a href="./src/cloudflare/resources/custom_hostnames/certificate_pack/certificates.py">update</a>(certificate_id, \*, zone_id, custom_hostname_id, certificate_pack_id, \*\*<a href="src/cloudflare/types/custom_hostnames/certificate_pack/certificate_update_params.py">params</a>) -> <a href="./src/cloudflare/types/custom_hostnames/certificate_pack/certificate_update_response.py">Optional[CertificateUpdateResponse]</a></code>
+- <code title="delete /zones/{zone_id}/custom_hostnames/{custom_hostname_id}/certificate_pack/{certificate_pack_id}/certificates/{certificate_id}">client.custom_hostnames.certificate_pack.certificates.<a href="./src/cloudflare/resources/custom_hostnames/certificate_pack/certificates.py">delete</a>(certificate_id, \*, zone_id, custom_hostname_id, certificate_pack_id) -> <a href="./src/cloudflare/types/custom_hostnames/certificate_pack/certificate_delete_response.py">CertificateDeleteResponse</a></code>
 
 # CustomNameservers
 
 Types:
 
 ```python
-from cloudflare.types.custom_nameservers import (
-    CustomNameserver,
-    CustomNameserverDeleteResponse,
-    CustomNameserverAvailabiltyResponse,
-    CustomNameserverGetResponse,
+from cloudflare.types.custom_nameservers import CustomNameserver, CustomNameserverDeleteResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/custom_ns">client.custom_nameservers.<a href="./src/cloudflare/resources/custom_nameservers.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/custom_nameservers/custom_nameserver_create_params.py">params</a>) -> <a href="./src/cloudflare/types/custom_nameservers/custom_nameserver.py">Optional[CustomNameserver]</a></code>
+- <code title="delete /accounts/{account_id}/custom_ns/{custom_ns_id}">client.custom_nameservers.<a href="./src/cloudflare/resources/custom_nameservers.py">delete</a>(custom_ns_id, \*, account_id) -> <a href="./src/cloudflare/types/custom_nameservers/custom_nameserver_delete_response.py">SyncSinglePage[CustomNameserverDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/custom_ns">client.custom_nameservers.<a href="./src/cloudflare/resources/custom_nameservers.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/custom_nameservers/custom_nameserver.py">SyncSinglePage[CustomNameserver]</a></code>
+
+# DNSFirewall
+
+Types:
+
+```python
+from cloudflare.types.dns_firewall import (
+    AttackMitigation,
+    FirewallIPs,
+    UpstreamIPs,
+    DNSFirewallCreateResponse,
+    DNSFirewallListResponse,
+    DNSFirewallDeleteResponse,
+    DNSFirewallEditResponse,
+    DNSFirewallGetResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/custom_ns">client.custom_nameservers.<a href="./src/cloudflare/resources/custom_nameservers.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/custom_nameservers/custom_nameserver_create_params.py">params</a>) -> <a href="./src/cloudflare/types/custom_nameservers/custom_nameserver.py">Optional</a></code>
-- <code title="delete /accounts/{account_id}/custom_ns/{custom_ns_id}">client.custom_nameservers.<a href="./src/cloudflare/resources/custom_nameservers.py">delete</a>(custom_ns_id, \*, account_id) -> <a href="./src/cloudflare/types/custom_nameservers/custom_nameserver_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/custom_ns/availability">client.custom_nameservers.<a href="./src/cloudflare/resources/custom_nameservers.py">availabilty</a>(\*, account_id) -> <a href="./src/cloudflare/types/custom_nameservers/custom_nameserver_availabilty_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/custom_ns">client.custom_nameservers.<a href="./src/cloudflare/resources/custom_nameservers.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/custom_nameservers/custom_nameserver_get_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/dns_firewall">client.dns_firewall.<a href="./src/cloudflare/resources/dns_firewall/dns_firewall.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/dns_firewall/dns_firewall_create_params.py">params</a>) -> <a href="./src/cloudflare/types/dns_firewall/dns_firewall_create_response.py">Optional[DNSFirewallCreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/dns_firewall">client.dns_firewall.<a href="./src/cloudflare/resources/dns_firewall/dns_firewall.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/dns_firewall/dns_firewall_list_params.py">params</a>) -> <a href="./src/cloudflare/types/dns_firewall/dns_firewall_list_response.py">SyncV4PagePaginationArray[DNSFirewallListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/dns_firewall/{dns_firewall_id}">client.dns_firewall.<a href="./src/cloudflare/resources/dns_firewall/dns_firewall.py">delete</a>(dns_firewall_id, \*, account_id) -> <a href="./src/cloudflare/types/dns_firewall/dns_firewall_delete_response.py">Optional[DNSFirewallDeleteResponse]</a></code>
+- <code title="patch /accounts/{account_id}/dns_firewall/{dns_firewall_id}">client.dns_firewall.<a href="./src/cloudflare/resources/dns_firewall/dns_firewall.py">edit</a>(dns_firewall_id, \*, account_id, \*\*<a href="src/cloudflare/types/dns_firewall/dns_firewall_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/dns_firewall/dns_firewall_edit_response.py">Optional[DNSFirewallEditResponse]</a></code>
+- <code title="get /accounts/{account_id}/dns_firewall/{dns_firewall_id}">client.dns_firewall.<a href="./src/cloudflare/resources/dns_firewall/dns_firewall.py">get</a>(dns_firewall_id, \*, account_id) -> <a href="./src/cloudflare/types/dns_firewall/dns_firewall_get_response.py">Optional[DNSFirewallGetResponse]</a></code>
+
+## Analytics
+
+### Reports
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dns_firewall/{dns_firewall_id}/dns_analytics/report">client.dns_firewall.analytics.reports.<a href="./src/cloudflare/resources/dns_firewall/analytics/reports/reports.py">get</a>(dns_firewall_id, \*, account_id, \*\*<a href="src/cloudflare/types/dns_firewall/analytics/report_get_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/analytics/report.py">Optional[Report]</a></code>
+
+#### Bytimes
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dns_firewall/{dns_firewall_id}/dns_analytics/report/bytime">client.dns_firewall.analytics.reports.bytimes.<a href="./src/cloudflare/resources/dns_firewall/analytics/reports/bytimes.py">get</a>(dns_firewall_id, \*, account_id, \*\*<a href="src/cloudflare/types/dns_firewall/analytics/reports/bytime_get_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/analytics/reports/by_time.py">Optional[ByTime]</a></code>
+
+## ReverseDNS
+
+Types:
+
+```python
+from cloudflare.types.dns_firewall import ReverseDNSEditResponse, ReverseDNSGetResponse
+```
+
+Methods:
+
+- <code title="patch /accounts/{account_id}/dns_firewall/{dns_firewall_id}/reverse_dns">client.dns_firewall.reverse_dns.<a href="./src/cloudflare/resources/dns_firewall/reverse_dns.py">edit</a>(dns_firewall_id, \*, account_id, \*\*<a href="src/cloudflare/types/dns_firewall/reverse_dns_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/dns_firewall/reverse_dns_edit_response.py">Optional[ReverseDNSEditResponse]</a></code>
+- <code title="get /accounts/{account_id}/dns_firewall/{dns_firewall_id}/reverse_dns">client.dns_firewall.reverse_dns.<a href="./src/cloudflare/resources/dns_firewall/reverse_dns.py">get</a>(dns_firewall_id, \*, account_id) -> <a href="./src/cloudflare/types/dns_firewall/reverse_dns_get_response.py">Optional[ReverseDNSGetResponse]</a></code>
 
 # DNS
 
+## DNSSEC
+
 Types:
 
 ```python
-from cloudflare.types.dns import DNSAnalyticsNominalMetric, DNSAnalyticsQuery
+from cloudflare.types.dns import DNSSEC, DNSSECDeleteResponse
 ```
 
+Methods:
+
+- <code title="delete /zones/{zone_id}/dnssec">client.dns.dnssec.<a href="./src/cloudflare/resources/dns/dnssec.py">delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/dns/dnssec_delete_response.py">str</a></code>
+- <code title="patch /zones/{zone_id}/dnssec">client.dns.dnssec.<a href="./src/cloudflare/resources/dns/dnssec.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/dnssec_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/dnssec.py">Optional[DNSSEC]</a></code>
+- <code title="get /zones/{zone_id}/dnssec">client.dns.dnssec.<a href="./src/cloudflare/resources/dns/dnssec.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/dns/dnssec.py">Optional[DNSSEC]</a></code>
+
 ## Records
 
 Types:
@@ -1001,6 +1112,8 @@ Types:
 from cloudflare.types.dns import (
     ARecord,
     AAAARecord,
+    BatchPatch,
+    BatchPut,
     CAARecord,
     CERTRecord,
     CNAMERecord,
@@ -1013,8 +1126,7 @@ from cloudflare.types.dns import (
     NSRecord,
     PTRRecord,
     Record,
-    RecordMetadata,
-    RecordProcessTiming,
+    RecordResponse,
     RecordTags,
     SMIMEARecord,
     SRVRecord,
@@ -1025,133 +1137,457 @@ from cloudflare.types.dns import (
     TXTRecord,
     URIRecord,
     RecordDeleteResponse,
+    RecordBatchResponse,
     RecordExportResponse,
     RecordImportResponse,
     RecordScanResponse,
+    RecordScanReviewResponse,
+    RecordScanTriggerResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /zones/{zone_id}/dns_records">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/record_create_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/record.py">Optional</a></code>
-- <code title="put /zones/{zone_id}/dns_records/{dns_record_id}">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">update</a>(dns_record_id, \*, zone_id, \*\*<a href="src/cloudflare/types/dns/record_update_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/record.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/dns_records">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/record_list_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/record.py">SyncV4PagePaginationArray[Record]</a></code>
-- <code title="delete /zones/{zone_id}/dns_records/{dns_record_id}">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">delete</a>(dns_record_id, \*, zone_id) -> <a href="./src/cloudflare/types/dns/record_delete_response.py">Optional</a></code>
-- <code title="patch /zones/{zone_id}/dns_records/{dns_record_id}">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">edit</a>(dns_record_id, \*, zone_id, \*\*<a href="src/cloudflare/types/dns/record_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/record.py">Optional</a></code>
+- <code title="post /zones/{zone_id}/dns_records">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/record_create_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/record_response.py">Optional[RecordResponse]</a></code>
+- <code title="put /zones/{zone_id}/dns_records/{dns_record_id}">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">update</a>(dns_record_id, \*, zone_id, \*\*<a href="src/cloudflare/types/dns/record_update_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/record_response.py">Optional[RecordResponse]</a></code>
+- <code title="get /zones/{zone_id}/dns_records">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/record_list_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/record_response.py">SyncV4PagePaginationArray[RecordResponse]</a></code>
+- <code title="delete /zones/{zone_id}/dns_records/{dns_record_id}">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">delete</a>(dns_record_id, \*, zone_id) -> <a href="./src/cloudflare/types/dns/record_delete_response.py">Optional[RecordDeleteResponse]</a></code>
+- <code title="post /zones/{zone_id}/dns_records/batch">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">batch</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/record_batch_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/record_batch_response.py">Optional[RecordBatchResponse]</a></code>
+- <code title="patch /zones/{zone_id}/dns_records/{dns_record_id}">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">edit</a>(dns_record_id, \*, zone_id, \*\*<a href="src/cloudflare/types/dns/record_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/record_response.py">Optional[RecordResponse]</a></code>
 - <code title="get /zones/{zone_id}/dns_records/export">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">export</a>(\*, zone_id) -> str</code>
-- <code title="get /zones/{zone_id}/dns_records/{dns_record_id}">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">get</a>(dns_record_id, \*, zone_id) -> <a href="./src/cloudflare/types/dns/record.py">Optional</a></code>
-- <code title="post /zones/{zone_id}/dns_records/import">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">import\_</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/record_import_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/record_import_response.py">Optional</a></code>
-- <code title="post /zones/{zone_id}/dns_records/scan">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">scan</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/record_scan_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/record_scan_response.py">Optional</a></code>
+- <code title="get /zones/{zone_id}/dns_records/{dns_record_id}">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">get</a>(dns_record_id, \*, zone_id) -> <a href="./src/cloudflare/types/dns/record_response.py">Optional[RecordResponse]</a></code>
+- <code title="post /zones/{zone_id}/dns_records/import">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">import\_</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/record_import_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/record_import_response.py">Optional[RecordImportResponse]</a></code>
+- <code title="post /zones/{zone_id}/dns_records/scan">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">scan</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/record_scan_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/record_scan_response.py">Optional[RecordScanResponse]</a></code>
+- <code title="get /zones/{zone_id}/dns_records/scan/review">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">scan_list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/dns/record_response.py">SyncSinglePage[RecordResponse]</a></code>
+- <code title="post /zones/{zone_id}/dns_records/scan/review">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">scan_review</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/record_scan_review_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/record_scan_review_response.py">Optional[RecordScanReviewResponse]</a></code>
+- <code title="post /zones/{zone_id}/dns_records/scan/trigger">client.dns.records.<a href="./src/cloudflare/resources/dns/records.py">scan_trigger</a>(\*, zone_id) -> <a href="./src/cloudflare/types/dns/record_scan_trigger_response.py">RecordScanTriggerResponse</a></code>
 
 ## Settings
 
+### Zone
+
 Types:
 
 ```python
-from cloudflare.types.dns import DNSSetting, Nameserver, SettingEditResponse, SettingGetResponse
+from cloudflare.types.dns.settings import ZoneEditResponse, ZoneGetResponse
 ```
 
 Methods:
 
-- <code title="patch /{account_or_zone}/{account_or_zone_id}/dns_settings">client.dns.settings.<a href="./src/cloudflare/resources/dns/settings.py">edit</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/dns/setting_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/setting_edit_response.py">Optional</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/dns_settings">client.dns.settings.<a href="./src/cloudflare/resources/dns/settings.py">get</a>(\*, account_id, zone_id) -> <a href="./src/cloudflare/types/dns/setting_get_response.py">Optional</a></code>
-
-## Analytics
+- <code title="patch /zones/{zone_id}/dns_settings">client.dns.settings.zone.<a href="./src/cloudflare/resources/dns/settings/zone.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/settings/zone_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/settings/zone_edit_response.py">Optional[ZoneEditResponse]</a></code>
+- <code title="get /zones/{zone_id}/dns_settings">client.dns.settings.zone.<a href="./src/cloudflare/resources/dns/settings/zone.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/dns/settings/zone_get_response.py">Optional[ZoneGetResponse]</a></code>
 
-### Reports
+### Account
 
 Types:
 
 ```python
-from cloudflare.types.dns.analytics import Report
+from cloudflare.types.dns.settings import AccountEditResponse, AccountGetResponse
 ```
 
 Methods:
 
-- <code title="get /zones/{zone_id}/dns_analytics/report">client.dns.analytics.reports.<a href="./src/cloudflare/resources/dns/analytics/reports/reports.py">get</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/analytics/report_get_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/analytics/report.py">Optional</a></code>
+- <code title="patch /accounts/{account_id}/dns_settings">client.dns.settings.account.<a href="./src/cloudflare/resources/dns/settings/account/account.py">edit</a>(\*, account_id, \*\*<a href="src/cloudflare/types/dns/settings/account_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/settings/account_edit_response.py">Optional[AccountEditResponse]</a></code>
+- <code title="get /accounts/{account_id}/dns_settings">client.dns.settings.account.<a href="./src/cloudflare/resources/dns/settings/account/account.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/dns/settings/account_get_response.py">Optional[AccountGetResponse]</a></code>
 
-#### Bytimes
+#### Views
 
 Types:
 
 ```python
-from cloudflare.types.dns.analytics.reports import ByTime
+from cloudflare.types.dns.settings.account import (
+    ViewCreateResponse,
+    ViewListResponse,
+    ViewDeleteResponse,
+    ViewEditResponse,
+    ViewGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /zones/{zone_id}/dns_analytics/report/bytime">client.dns.analytics.reports.bytimes.<a href="./src/cloudflare/resources/dns/analytics/reports/bytimes.py">get</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/analytics/reports/bytime_get_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/analytics/reports/by_time.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/dns_settings/views">client.dns.settings.account.views.<a href="./src/cloudflare/resources/dns/settings/account/views.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/dns/settings/account/view_create_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/settings/account/view_create_response.py">Optional[ViewCreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/dns_settings/views">client.dns.settings.account.views.<a href="./src/cloudflare/resources/dns/settings/account/views.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/dns/settings/account/view_list_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/settings/account/view_list_response.py">SyncV4PagePaginationArray[ViewListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/dns_settings/views/{view_id}">client.dns.settings.account.views.<a href="./src/cloudflare/resources/dns/settings/account/views.py">delete</a>(view_id, \*, account_id) -> <a href="./src/cloudflare/types/dns/settings/account/view_delete_response.py">Optional[ViewDeleteResponse]</a></code>
+- <code title="patch /accounts/{account_id}/dns_settings/views/{view_id}">client.dns.settings.account.views.<a href="./src/cloudflare/resources/dns/settings/account/views.py">edit</a>(view_id, \*, account_id, \*\*<a href="src/cloudflare/types/dns/settings/account/view_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/settings/account/view_edit_response.py">Optional[ViewEditResponse]</a></code>
+- <code title="get /accounts/{account_id}/dns_settings/views/{view_id}">client.dns.settings.account.views.<a href="./src/cloudflare/resources/dns/settings/account/views.py">get</a>(view_id, \*, account_id) -> <a href="./src/cloudflare/types/dns/settings/account/view_get_response.py">Optional[ViewGetResponse]</a></code>
+
+## Analytics
 
-## Firewall
+### Reports
 
 Types:
 
 ```python
-from cloudflare.types.dns import (
-    AttackMitigation,
-    Firewall,
-    FirewallIPs,
-    UpstreamIPs,
-    FirewallDeleteResponse,
-)
+from cloudflare.types.dns.analytics import Report
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/dns_firewall">client.dns.firewall.<a href="./src/cloudflare/resources/dns/firewall/firewall.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/dns/firewall_create_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/firewall/firewall.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/dns_firewall">client.dns.firewall.<a href="./src/cloudflare/resources/dns/firewall/firewall.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/dns/firewall_list_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/firewall/firewall.py">SyncV4PagePaginationArray[Firewall]</a></code>
-- <code title="delete /accounts/{account_id}/dns_firewall/{dns_firewall_id}">client.dns.firewall.<a href="./src/cloudflare/resources/dns/firewall/firewall.py">delete</a>(dns_firewall_id, \*, account_id) -> <a href="./src/cloudflare/types/dns/firewall_delete_response.py">Optional</a></code>
-- <code title="patch /accounts/{account_id}/dns_firewall/{dns_firewall_id}">client.dns.firewall.<a href="./src/cloudflare/resources/dns/firewall/firewall.py">edit</a>(dns_firewall_id, \*, account_id, \*\*<a href="src/cloudflare/types/dns/firewall_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/firewall/firewall.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/dns_firewall/{dns_firewall_id}">client.dns.firewall.<a href="./src/cloudflare/resources/dns/firewall/firewall.py">get</a>(dns_firewall_id, \*, account_id) -> <a href="./src/cloudflare/types/dns/firewall/firewall.py">Optional</a></code>
+- <code title="get /zones/{zone_id}/dns_analytics/report">client.dns.analytics.reports.<a href="./src/cloudflare/resources/dns/analytics/reports/reports.py">get</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/analytics/report_get_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/analytics/report.py">Optional[Report]</a></code>
 
-### Analytics
+#### Bytimes
 
 Types:
 
 ```python
-from cloudflare.types.dns.firewall import Delta
+from cloudflare.types.dns.analytics.reports import ByTime
 ```
 
-#### Reports
-
 Methods:
 
-- <code title="get /accounts/{account_id}/dns_firewall/{dns_firewall_id}/dns_analytics/report">client.dns.firewall.analytics.reports.<a href="./src/cloudflare/resources/dns/firewall/analytics/reports/reports.py">get</a>(dns_firewall_id, \*, account_id, \*\*<a href="src/cloudflare/types/dns/firewall/analytics/report_get_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/analytics/report.py">Optional</a></code>
-
-##### Bytimes
-
-Methods:
+- <code title="get /zones/{zone_id}/dns_analytics/report/bytime">client.dns.analytics.reports.bytimes.<a href="./src/cloudflare/resources/dns/analytics/reports/bytimes.py">get</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/analytics/reports/bytime_get_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/analytics/reports/by_time.py">Optional[ByTime]</a></code>
 
-- <code title="get /accounts/{account_id}/dns_firewall/{dns_firewall_id}/dns_analytics/report/bytime">client.dns.firewall.analytics.reports.bytimes.<a href="./src/cloudflare/resources/dns/firewall/analytics/reports/bytimes.py">get</a>(dns_firewall_id, \*, account_id, \*\*<a href="src/cloudflare/types/dns/firewall/analytics/reports/bytime_get_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/analytics/reports/by_time.py">Optional</a></code>
+## ZoneTransfers
 
-# DNSSEC
+### ForceAXFR
 
 Types:
 
 ```python
-from cloudflare.types.dnssec import DNSSEC, DNSSECDeleteResponse
+from cloudflare.types.dns.zone_transfers import ForceAXFR
 ```
 
 Methods:
 
-- <code title="delete /zones/{zone_id}/dnssec">client.dnssec.<a href="./src/cloudflare/resources/dnssec.py">delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/dnssec/dnssec_delete_response.py">Optional</a></code>
-- <code title="patch /zones/{zone_id}/dnssec">client.dnssec.<a href="./src/cloudflare/resources/dnssec.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dnssec/dnssec_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/dnssec/dnssec.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/dnssec">client.dnssec.<a href="./src/cloudflare/resources/dnssec.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/dnssec/dnssec.py">Optional</a></code>
+- <code title="post /zones/{zone_id}/secondary_dns/force_axfr">client.dns.zone_transfers.force_axfr.<a href="./src/cloudflare/resources/dns/zone_transfers/force_axfr.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/zone_transfers/force_axfr_create_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/zone_transfers/force_axfr.py">str</a></code>
 
-# EmailRouting
+### Incoming
 
 Types:
 
 ```python
-from cloudflare.types.email_routing import Settings
-```
-
-Methods:
-
-- <code title="post /zones/{zone_identifier}/email/routing/disable">client.email_routing.<a href="./src/cloudflare/resources/email_routing/email_routing.py">disable</a>(zone_identifier, \*\*<a href="src/cloudflare/types/email_routing/email_routing_disable_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/settings.py">Optional</a></code>
-- <code title="post /zones/{zone_identifier}/email/routing/enable">client.email_routing.<a href="./src/cloudflare/resources/email_routing/email_routing.py">enable</a>(zone_identifier, \*\*<a href="src/cloudflare/types/email_routing/email_routing_enable_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/settings.py">Optional</a></code>
-- <code title="get /zones/{zone_identifier}/email/routing">client.email_routing.<a href="./src/cloudflare/resources/email_routing/email_routing.py">get</a>(zone_identifier) -> <a href="./src/cloudflare/types/email_routing/settings.py">Optional</a></code>
-
+from cloudflare.types.dns.zone_transfers import (
+    Incoming,
+    IncomingCreateResponse,
+    IncomingUpdateResponse,
+    IncomingDeleteResponse,
+    IncomingGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /zones/{zone_id}/secondary_dns/incoming">client.dns.zone_transfers.incoming.<a href="./src/cloudflare/resources/dns/zone_transfers/incoming.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/zone_transfers/incoming_create_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/zone_transfers/incoming_create_response.py">Optional[IncomingCreateResponse]</a></code>
+- <code title="put /zones/{zone_id}/secondary_dns/incoming">client.dns.zone_transfers.incoming.<a href="./src/cloudflare/resources/dns/zone_transfers/incoming.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/zone_transfers/incoming_update_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/zone_transfers/incoming_update_response.py">Optional[IncomingUpdateResponse]</a></code>
+- <code title="delete /zones/{zone_id}/secondary_dns/incoming">client.dns.zone_transfers.incoming.<a href="./src/cloudflare/resources/dns/zone_transfers/incoming.py">delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/dns/zone_transfers/incoming_delete_response.py">Optional[IncomingDeleteResponse]</a></code>
+- <code title="get /zones/{zone_id}/secondary_dns/incoming">client.dns.zone_transfers.incoming.<a href="./src/cloudflare/resources/dns/zone_transfers/incoming.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/dns/zone_transfers/incoming_get_response.py">Optional[IncomingGetResponse]</a></code>
+
+### Outgoing
+
+Types:
+
+```python
+from cloudflare.types.dns.zone_transfers import (
+    DisableTransfer,
+    EnableTransfer,
+    Outgoing,
+    OutgoingStatus,
+    OutgoingCreateResponse,
+    OutgoingUpdateResponse,
+    OutgoingDeleteResponse,
+    OutgoingForceNotifyResponse,
+    OutgoingGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /zones/{zone_id}/secondary_dns/outgoing">client.dns.zone_transfers.outgoing.<a href="./src/cloudflare/resources/dns/zone_transfers/outgoing/outgoing.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/zone_transfers/outgoing_create_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/zone_transfers/outgoing_create_response.py">Optional[OutgoingCreateResponse]</a></code>
+- <code title="put /zones/{zone_id}/secondary_dns/outgoing">client.dns.zone_transfers.outgoing.<a href="./src/cloudflare/resources/dns/zone_transfers/outgoing/outgoing.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/zone_transfers/outgoing_update_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/zone_transfers/outgoing_update_response.py">Optional[OutgoingUpdateResponse]</a></code>
+- <code title="delete /zones/{zone_id}/secondary_dns/outgoing">client.dns.zone_transfers.outgoing.<a href="./src/cloudflare/resources/dns/zone_transfers/outgoing/outgoing.py">delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/dns/zone_transfers/outgoing_delete_response.py">Optional[OutgoingDeleteResponse]</a></code>
+- <code title="post /zones/{zone_id}/secondary_dns/outgoing/disable">client.dns.zone_transfers.outgoing.<a href="./src/cloudflare/resources/dns/zone_transfers/outgoing/outgoing.py">disable</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/zone_transfers/outgoing_disable_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/zone_transfers/disable_transfer.py">str</a></code>
+- <code title="post /zones/{zone_id}/secondary_dns/outgoing/enable">client.dns.zone_transfers.outgoing.<a href="./src/cloudflare/resources/dns/zone_transfers/outgoing/outgoing.py">enable</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/zone_transfers/outgoing_enable_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/zone_transfers/enable_transfer.py">str</a></code>
+- <code title="post /zones/{zone_id}/secondary_dns/outgoing/force_notify">client.dns.zone_transfers.outgoing.<a href="./src/cloudflare/resources/dns/zone_transfers/outgoing/outgoing.py">force_notify</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/dns/zone_transfers/outgoing_force_notify_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/zone_transfers/outgoing_force_notify_response.py">str</a></code>
+- <code title="get /zones/{zone_id}/secondary_dns/outgoing">client.dns.zone_transfers.outgoing.<a href="./src/cloudflare/resources/dns/zone_transfers/outgoing/outgoing.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/dns/zone_transfers/outgoing_get_response.py">Optional[OutgoingGetResponse]</a></code>
+
+#### Status
+
+Methods:
+
+- <code title="get /zones/{zone_id}/secondary_dns/outgoing/status">client.dns.zone_transfers.outgoing.status.<a href="./src/cloudflare/resources/dns/zone_transfers/outgoing/status.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/dns/zone_transfers/enable_transfer.py">str</a></code>
+
+### ACLs
+
+Types:
+
+```python
+from cloudflare.types.dns.zone_transfers import ACL, ACLDeleteResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/secondary_dns/acls">client.dns.zone_transfers.acls.<a href="./src/cloudflare/resources/dns/zone_transfers/acls.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/dns/zone_transfers/acl_create_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/zone_transfers/acl.py">Optional[ACL]</a></code>
+- <code title="put /accounts/{account_id}/secondary_dns/acls/{acl_id}">client.dns.zone_transfers.acls.<a href="./src/cloudflare/resources/dns/zone_transfers/acls.py">update</a>(acl_id, \*, account_id, \*\*<a href="src/cloudflare/types/dns/zone_transfers/acl_update_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/zone_transfers/acl.py">Optional[ACL]</a></code>
+- <code title="get /accounts/{account_id}/secondary_dns/acls">client.dns.zone_transfers.acls.<a href="./src/cloudflare/resources/dns/zone_transfers/acls.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/dns/zone_transfers/acl.py">SyncSinglePage[ACL]</a></code>
+- <code title="delete /accounts/{account_id}/secondary_dns/acls/{acl_id}">client.dns.zone_transfers.acls.<a href="./src/cloudflare/resources/dns/zone_transfers/acls.py">delete</a>(acl_id, \*, account_id) -> <a href="./src/cloudflare/types/dns/zone_transfers/acl_delete_response.py">Optional[ACLDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/secondary_dns/acls/{acl_id}">client.dns.zone_transfers.acls.<a href="./src/cloudflare/resources/dns/zone_transfers/acls.py">get</a>(acl_id, \*, account_id) -> <a href="./src/cloudflare/types/dns/zone_transfers/acl.py">Optional[ACL]</a></code>
+
+### Peers
+
+Types:
+
+```python
+from cloudflare.types.dns.zone_transfers import Peer, PeerDeleteResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/secondary_dns/peers">client.dns.zone_transfers.peers.<a href="./src/cloudflare/resources/dns/zone_transfers/peers.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/dns/zone_transfers/peer_create_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/zone_transfers/peer.py">Optional[Peer]</a></code>
+- <code title="put /accounts/{account_id}/secondary_dns/peers/{peer_id}">client.dns.zone_transfers.peers.<a href="./src/cloudflare/resources/dns/zone_transfers/peers.py">update</a>(peer_id, \*, account_id, \*\*<a href="src/cloudflare/types/dns/zone_transfers/peer_update_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/zone_transfers/peer.py">Optional[Peer]</a></code>
+- <code title="get /accounts/{account_id}/secondary_dns/peers">client.dns.zone_transfers.peers.<a href="./src/cloudflare/resources/dns/zone_transfers/peers.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/dns/zone_transfers/peer.py">SyncSinglePage[Peer]</a></code>
+- <code title="delete /accounts/{account_id}/secondary_dns/peers/{peer_id}">client.dns.zone_transfers.peers.<a href="./src/cloudflare/resources/dns/zone_transfers/peers.py">delete</a>(peer_id, \*, account_id) -> <a href="./src/cloudflare/types/dns/zone_transfers/peer_delete_response.py">Optional[PeerDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/secondary_dns/peers/{peer_id}">client.dns.zone_transfers.peers.<a href="./src/cloudflare/resources/dns/zone_transfers/peers.py">get</a>(peer_id, \*, account_id) -> <a href="./src/cloudflare/types/dns/zone_transfers/peer.py">Optional[Peer]</a></code>
+
+### TSIGs
+
+Types:
+
+```python
+from cloudflare.types.dns.zone_transfers import TSIG, TSIGDeleteResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/secondary_dns/tsigs">client.dns.zone_transfers.tsigs.<a href="./src/cloudflare/resources/dns/zone_transfers/tsigs.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/dns/zone_transfers/tsig_create_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/zone_transfers/tsig.py">Optional[TSIG]</a></code>
+- <code title="put /accounts/{account_id}/secondary_dns/tsigs/{tsig_id}">client.dns.zone_transfers.tsigs.<a href="./src/cloudflare/resources/dns/zone_transfers/tsigs.py">update</a>(tsig_id, \*, account_id, \*\*<a href="src/cloudflare/types/dns/zone_transfers/tsig_update_params.py">params</a>) -> <a href="./src/cloudflare/types/dns/zone_transfers/tsig.py">Optional[TSIG]</a></code>
+- <code title="get /accounts/{account_id}/secondary_dns/tsigs">client.dns.zone_transfers.tsigs.<a href="./src/cloudflare/resources/dns/zone_transfers/tsigs.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/dns/zone_transfers/tsig.py">SyncSinglePage[TSIG]</a></code>
+- <code title="delete /accounts/{account_id}/secondary_dns/tsigs/{tsig_id}">client.dns.zone_transfers.tsigs.<a href="./src/cloudflare/resources/dns/zone_transfers/tsigs.py">delete</a>(tsig_id, \*, account_id) -> <a href="./src/cloudflare/types/dns/zone_transfers/tsig_delete_response.py">Optional[TSIGDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/secondary_dns/tsigs/{tsig_id}">client.dns.zone_transfers.tsigs.<a href="./src/cloudflare/resources/dns/zone_transfers/tsigs.py">get</a>(tsig_id, \*, account_id) -> <a href="./src/cloudflare/types/dns/zone_transfers/tsig.py">Optional[TSIG]</a></code>
+
+# EmailSecurity
+
+## Investigate
+
+Types:
+
+```python
+from cloudflare.types.email_security import InvestigateListResponse, InvestigateGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/email-security/investigate">client.email_security.investigate.<a href="./src/cloudflare/resources/email_security/investigate/investigate.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/email_security/investigate_list_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/investigate_list_response.py">SyncV4PagePaginationArray[InvestigateListResponse]</a></code>
+- <code title="get /accounts/{account_id}/email-security/investigate/{postfix_id}">client.email_security.investigate.<a href="./src/cloudflare/resources/email_security/investigate/investigate.py">get</a>(postfix_id, \*, account_id) -> <a href="./src/cloudflare/types/email_security/investigate_get_response.py">InvestigateGetResponse</a></code>
+
+### Detections
+
+Types:
+
+```python
+from cloudflare.types.email_security.investigate import DetectionGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/email-security/investigate/{postfix_id}/detections">client.email_security.investigate.detections.<a href="./src/cloudflare/resources/email_security/investigate/detections.py">get</a>(postfix_id, \*, account_id) -> <a href="./src/cloudflare/types/email_security/investigate/detection_get_response.py">DetectionGetResponse</a></code>
+
+### Preview
+
+Types:
+
+```python
+from cloudflare.types.email_security.investigate import PreviewCreateResponse, PreviewGetResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/email-security/investigate/preview">client.email_security.investigate.preview.<a href="./src/cloudflare/resources/email_security/investigate/preview.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/email_security/investigate/preview_create_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/investigate/preview_create_response.py">PreviewCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/email-security/investigate/{postfix_id}/preview">client.email_security.investigate.preview.<a href="./src/cloudflare/resources/email_security/investigate/preview.py">get</a>(postfix_id, \*, account_id) -> <a href="./src/cloudflare/types/email_security/investigate/preview_get_response.py">PreviewGetResponse</a></code>
+
+### Raw
+
+Types:
+
+```python
+from cloudflare.types.email_security.investigate import RawGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/email-security/investigate/{postfix_id}/raw">client.email_security.investigate.raw.<a href="./src/cloudflare/resources/email_security/investigate/raw.py">get</a>(postfix_id, \*, account_id) -> <a href="./src/cloudflare/types/email_security/investigate/raw_get_response.py">RawGetResponse</a></code>
+
+### Trace
+
+Types:
+
+```python
+from cloudflare.types.email_security.investigate import TraceGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/email-security/investigate/{postfix_id}/trace">client.email_security.investigate.trace.<a href="./src/cloudflare/resources/email_security/investigate/trace.py">get</a>(postfix_id, \*, account_id) -> <a href="./src/cloudflare/types/email_security/investigate/trace_get_response.py">TraceGetResponse</a></code>
+
+### Move
+
+Types:
+
+```python
+from cloudflare.types.email_security.investigate import MoveCreateResponse, MoveBulkResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/email-security/investigate/{postfix_id}/move">client.email_security.investigate.move.<a href="./src/cloudflare/resources/email_security/investigate/move.py">create</a>(postfix_id, \*, account_id, \*\*<a href="src/cloudflare/types/email_security/investigate/move_create_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/investigate/move_create_response.py">SyncSinglePage[MoveCreateResponse]</a></code>
+- <code title="post /accounts/{account_id}/email-security/investigate/move">client.email_security.investigate.move.<a href="./src/cloudflare/resources/email_security/investigate/move.py">bulk</a>(\*, account_id, \*\*<a href="src/cloudflare/types/email_security/investigate/move_bulk_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/investigate/move_bulk_response.py">SyncSinglePage[MoveBulkResponse]</a></code>
+
+### Reclassify
+
+Methods:
+
+- <code title="post /accounts/{account_id}/email-security/investigate/{postfix_id}/reclassify">client.email_security.investigate.reclassify.<a href="./src/cloudflare/resources/email_security/investigate/reclassify.py">create</a>(postfix_id, \*, account_id, \*\*<a href="src/cloudflare/types/email_security/investigate/reclassify_create_params.py">params</a>) -> object</code>
+
+### Release
+
+Types:
+
+```python
+from cloudflare.types.email_security.investigate import ReleaseBulkResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/email-security/investigate/release">client.email_security.investigate.release.<a href="./src/cloudflare/resources/email_security/investigate/release.py">bulk</a>(\*, account_id, \*\*<a href="src/cloudflare/types/email_security/investigate/release_bulk_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/investigate/release_bulk_response.py">SyncSinglePage[ReleaseBulkResponse]</a></code>
+
+## Settings
+
+### AllowPolicies
+
+Types:
+
+```python
+from cloudflare.types.email_security.settings import (
+    AllowPolicyCreateResponse,
+    AllowPolicyListResponse,
+    AllowPolicyDeleteResponse,
+    AllowPolicyEditResponse,
+    AllowPolicyGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/email-security/settings/allow_policies">client.email_security.settings.allow_policies.<a href="./src/cloudflare/resources/email_security/settings/allow_policies.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/email_security/settings/allow_policy_create_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/settings/allow_policy_create_response.py">AllowPolicyCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/email-security/settings/allow_policies">client.email_security.settings.allow_policies.<a href="./src/cloudflare/resources/email_security/settings/allow_policies.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/email_security/settings/allow_policy_list_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/settings/allow_policy_list_response.py">SyncV4PagePaginationArray[AllowPolicyListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/email-security/settings/allow_policies/{policy_id}">client.email_security.settings.allow_policies.<a href="./src/cloudflare/resources/email_security/settings/allow_policies.py">delete</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/email_security/settings/allow_policy_delete_response.py">AllowPolicyDeleteResponse</a></code>
+- <code title="patch /accounts/{account_id}/email-security/settings/allow_policies/{policy_id}">client.email_security.settings.allow_policies.<a href="./src/cloudflare/resources/email_security/settings/allow_policies.py">edit</a>(policy_id, \*, account_id, \*\*<a href="src/cloudflare/types/email_security/settings/allow_policy_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/settings/allow_policy_edit_response.py">AllowPolicyEditResponse</a></code>
+- <code title="get /accounts/{account_id}/email-security/settings/allow_policies/{policy_id}">client.email_security.settings.allow_policies.<a href="./src/cloudflare/resources/email_security/settings/allow_policies.py">get</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/email_security/settings/allow_policy_get_response.py">AllowPolicyGetResponse</a></code>
+
+### BlockSenders
+
+Types:
+
+```python
+from cloudflare.types.email_security.settings import (
+    BlockSenderCreateResponse,
+    BlockSenderListResponse,
+    BlockSenderDeleteResponse,
+    BlockSenderEditResponse,
+    BlockSenderGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/email-security/settings/block_senders">client.email_security.settings.block_senders.<a href="./src/cloudflare/resources/email_security/settings/block_senders.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/email_security/settings/block_sender_create_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/settings/block_sender_create_response.py">BlockSenderCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/email-security/settings/block_senders">client.email_security.settings.block_senders.<a href="./src/cloudflare/resources/email_security/settings/block_senders.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/email_security/settings/block_sender_list_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/settings/block_sender_list_response.py">SyncV4PagePaginationArray[BlockSenderListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/email-security/settings/block_senders/{pattern_id}">client.email_security.settings.block_senders.<a href="./src/cloudflare/resources/email_security/settings/block_senders.py">delete</a>(pattern_id, \*, account_id) -> <a href="./src/cloudflare/types/email_security/settings/block_sender_delete_response.py">BlockSenderDeleteResponse</a></code>
+- <code title="patch /accounts/{account_id}/email-security/settings/block_senders/{pattern_id}">client.email_security.settings.block_senders.<a href="./src/cloudflare/resources/email_security/settings/block_senders.py">edit</a>(pattern_id, \*, account_id, \*\*<a href="src/cloudflare/types/email_security/settings/block_sender_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/settings/block_sender_edit_response.py">BlockSenderEditResponse</a></code>
+- <code title="get /accounts/{account_id}/email-security/settings/block_senders/{pattern_id}">client.email_security.settings.block_senders.<a href="./src/cloudflare/resources/email_security/settings/block_senders.py">get</a>(pattern_id, \*, account_id) -> <a href="./src/cloudflare/types/email_security/settings/block_sender_get_response.py">BlockSenderGetResponse</a></code>
+
+### Domains
+
+Types:
+
+```python
+from cloudflare.types.email_security.settings import (
+    DomainListResponse,
+    DomainDeleteResponse,
+    DomainBulkDeleteResponse,
+    DomainEditResponse,
+    DomainGetResponse,
+)
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/email-security/settings/domains">client.email_security.settings.domains.<a href="./src/cloudflare/resources/email_security/settings/domains.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/email_security/settings/domain_list_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/settings/domain_list_response.py">SyncV4PagePaginationArray[DomainListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/email-security/settings/domains/{domain_id}">client.email_security.settings.domains.<a href="./src/cloudflare/resources/email_security/settings/domains.py">delete</a>(domain_id, \*, account_id) -> <a href="./src/cloudflare/types/email_security/settings/domain_delete_response.py">DomainDeleteResponse</a></code>
+- <code title="delete /accounts/{account_id}/email-security/settings/domains">client.email_security.settings.domains.<a href="./src/cloudflare/resources/email_security/settings/domains.py">bulk_delete</a>(\*, account_id) -> <a href="./src/cloudflare/types/email_security/settings/domain_bulk_delete_response.py">SyncSinglePage[DomainBulkDeleteResponse]</a></code>
+- <code title="patch /accounts/{account_id}/email-security/settings/domains/{domain_id}">client.email_security.settings.domains.<a href="./src/cloudflare/resources/email_security/settings/domains.py">edit</a>(domain_id, \*, account_id, \*\*<a href="src/cloudflare/types/email_security/settings/domain_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/settings/domain_edit_response.py">DomainEditResponse</a></code>
+- <code title="get /accounts/{account_id}/email-security/settings/domains/{domain_id}">client.email_security.settings.domains.<a href="./src/cloudflare/resources/email_security/settings/domains.py">get</a>(domain_id, \*, account_id) -> <a href="./src/cloudflare/types/email_security/settings/domain_get_response.py">DomainGetResponse</a></code>
+
+### ImpersonationRegistry
+
+Types:
+
+```python
+from cloudflare.types.email_security.settings import (
+    ImpersonationRegistryCreateResponse,
+    ImpersonationRegistryListResponse,
+    ImpersonationRegistryDeleteResponse,
+    ImpersonationRegistryEditResponse,
+    ImpersonationRegistryGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/email-security/settings/impersonation_registry">client.email_security.settings.impersonation_registry.<a href="./src/cloudflare/resources/email_security/settings/impersonation_registry.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/email_security/settings/impersonation_registry_create_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/settings/impersonation_registry_create_response.py">ImpersonationRegistryCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/email-security/settings/impersonation_registry">client.email_security.settings.impersonation_registry.<a href="./src/cloudflare/resources/email_security/settings/impersonation_registry.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/email_security/settings/impersonation_registry_list_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/settings/impersonation_registry_list_response.py">SyncV4PagePaginationArray[ImpersonationRegistryListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/email-security/settings/impersonation_registry/{display_name_id}">client.email_security.settings.impersonation_registry.<a href="./src/cloudflare/resources/email_security/settings/impersonation_registry.py">delete</a>(display_name_id, \*, account_id) -> <a href="./src/cloudflare/types/email_security/settings/impersonation_registry_delete_response.py">ImpersonationRegistryDeleteResponse</a></code>
+- <code title="patch /accounts/{account_id}/email-security/settings/impersonation_registry/{display_name_id}">client.email_security.settings.impersonation_registry.<a href="./src/cloudflare/resources/email_security/settings/impersonation_registry.py">edit</a>(display_name_id, \*, account_id, \*\*<a href="src/cloudflare/types/email_security/settings/impersonation_registry_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/settings/impersonation_registry_edit_response.py">ImpersonationRegistryEditResponse</a></code>
+- <code title="get /accounts/{account_id}/email-security/settings/impersonation_registry/{display_name_id}">client.email_security.settings.impersonation_registry.<a href="./src/cloudflare/resources/email_security/settings/impersonation_registry.py">get</a>(display_name_id, \*, account_id) -> <a href="./src/cloudflare/types/email_security/settings/impersonation_registry_get_response.py">ImpersonationRegistryGetResponse</a></code>
+
+### TrustedDomains
+
+Types:
+
+```python
+from cloudflare.types.email_security.settings import (
+    TrustedDomainCreateResponse,
+    TrustedDomainListResponse,
+    TrustedDomainDeleteResponse,
+    TrustedDomainEditResponse,
+    TrustedDomainGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/email-security/settings/trusted_domains">client.email_security.settings.trusted_domains.<a href="./src/cloudflare/resources/email_security/settings/trusted_domains.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/email_security/settings/trusted_domain_create_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/settings/trusted_domain_create_response.py">TrustedDomainCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/email-security/settings/trusted_domains">client.email_security.settings.trusted_domains.<a href="./src/cloudflare/resources/email_security/settings/trusted_domains.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/email_security/settings/trusted_domain_list_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/settings/trusted_domain_list_response.py">SyncV4PagePaginationArray[TrustedDomainListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/email-security/settings/trusted_domains/{trusted_domain_id}">client.email_security.settings.trusted_domains.<a href="./src/cloudflare/resources/email_security/settings/trusted_domains.py">delete</a>(trusted_domain_id, \*, account_id) -> <a href="./src/cloudflare/types/email_security/settings/trusted_domain_delete_response.py">TrustedDomainDeleteResponse</a></code>
+- <code title="patch /accounts/{account_id}/email-security/settings/trusted_domains/{trusted_domain_id}">client.email_security.settings.trusted_domains.<a href="./src/cloudflare/resources/email_security/settings/trusted_domains.py">edit</a>(trusted_domain_id, \*, account_id, \*\*<a href="src/cloudflare/types/email_security/settings/trusted_domain_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/settings/trusted_domain_edit_response.py">TrustedDomainEditResponse</a></code>
+- <code title="get /accounts/{account_id}/email-security/settings/trusted_domains/{trusted_domain_id}">client.email_security.settings.trusted_domains.<a href="./src/cloudflare/resources/email_security/settings/trusted_domains.py">get</a>(trusted_domain_id, \*, account_id) -> <a href="./src/cloudflare/types/email_security/settings/trusted_domain_get_response.py">TrustedDomainGetResponse</a></code>
+
+## Submissions
+
+Types:
+
+```python
+from cloudflare.types.email_security import SubmissionListResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/email-security/submissions">client.email_security.submissions.<a href="./src/cloudflare/resources/email_security/submissions.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/email_security/submission_list_params.py">params</a>) -> <a href="./src/cloudflare/types/email_security/submission_list_response.py">SyncV4PagePaginationArray[SubmissionListResponse]</a></code>
+
+# EmailRouting
+
+Types:
+
+```python
+from cloudflare.types.email_routing import Settings
+```
+
+Methods:
+
+- <code title="post /zones/{zone_id}/email/routing/disable">client.email_routing.<a href="./src/cloudflare/resources/email_routing/email_routing.py">disable</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/email_routing/email_routing_disable_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/settings.py">Optional[Settings]</a></code>
+- <code title="post /zones/{zone_id}/email/routing/enable">client.email_routing.<a href="./src/cloudflare/resources/email_routing/email_routing.py">enable</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/email_routing/email_routing_enable_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/settings.py">Optional[Settings]</a></code>
+- <code title="get /zones/{zone_id}/email/routing">client.email_routing.<a href="./src/cloudflare/resources/email_routing/email_routing.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/email_routing/settings.py">Optional[Settings]</a></code>
+
 ## DNS
 
 Types:
@@ -1162,7 +1598,10 @@ from cloudflare.types.email_routing import DNSRecord, DNSGetResponse
 
 Methods:
 
-- <code title="get /zones/{zone_identifier}/email/routing/dns">client.email_routing.dns.<a href="./src/cloudflare/resources/email_routing/dns.py">get</a>(zone_identifier) -> <a href="./src/cloudflare/types/email_routing/dns_get_response.py">Optional</a></code>
+- <code title="post /zones/{zone_id}/email/routing/dns">client.email_routing.dns.<a href="./src/cloudflare/resources/email_routing/dns.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/email_routing/dns_create_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/settings.py">Optional[Settings]</a></code>
+- <code title="delete /zones/{zone_id}/email/routing/dns">client.email_routing.dns.<a href="./src/cloudflare/resources/email_routing/dns.py">delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/email_routing/dns_record.py">SyncSinglePage[DNSRecord]</a></code>
+- <code title="patch /zones/{zone_id}/email/routing/dns">client.email_routing.dns.<a href="./src/cloudflare/resources/email_routing/dns.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/email_routing/dns_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/settings.py">Optional[Settings]</a></code>
+- <code title="get /zones/{zone_id}/email/routing/dns">client.email_routing.dns.<a href="./src/cloudflare/resources/email_routing/dns.py">get</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/email_routing/dns_get_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/dns_get_response.py">DNSGetResponse</a></code>
 
 ## Rules
 
@@ -1174,11 +1613,11 @@ from cloudflare.types.email_routing import Action, EmailRoutingRule, Matcher
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/email/routing/rules">client.email_routing.rules.<a href="./src/cloudflare/resources/email_routing/rules/rules.py">create</a>(zone_identifier, \*\*<a href="src/cloudflare/types/email_routing/rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/email_routing_rule.py">Optional</a></code>
-- <code title="put /zones/{zone_identifier}/email/routing/rules/{rule_identifier}">client.email_routing.rules.<a href="./src/cloudflare/resources/email_routing/rules/rules.py">update</a>(rule_identifier, \*, zone_identifier, \*\*<a href="src/cloudflare/types/email_routing/rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/email_routing_rule.py">Optional</a></code>
-- <code title="get /zones/{zone_identifier}/email/routing/rules">client.email_routing.rules.<a href="./src/cloudflare/resources/email_routing/rules/rules.py">list</a>(zone_identifier, \*\*<a href="src/cloudflare/types/email_routing/rule_list_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/email_routing_rule.py">SyncV4PagePaginationArray[EmailRoutingRule]</a></code>
-- <code title="delete /zones/{zone_identifier}/email/routing/rules/{rule_identifier}">client.email_routing.rules.<a href="./src/cloudflare/resources/email_routing/rules/rules.py">delete</a>(rule_identifier, \*, zone_identifier) -> <a href="./src/cloudflare/types/email_routing/email_routing_rule.py">Optional</a></code>
-- <code title="get /zones/{zone_identifier}/email/routing/rules/{rule_identifier}">client.email_routing.rules.<a href="./src/cloudflare/resources/email_routing/rules/rules.py">get</a>(rule_identifier, \*, zone_identifier) -> <a href="./src/cloudflare/types/email_routing/email_routing_rule.py">Optional</a></code>
+- <code title="post /zones/{zone_id}/email/routing/rules">client.email_routing.rules.<a href="./src/cloudflare/resources/email_routing/rules/rules.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/email_routing/rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/email_routing_rule.py">Optional[EmailRoutingRule]</a></code>
+- <code title="put /zones/{zone_id}/email/routing/rules/{rule_identifier}">client.email_routing.rules.<a href="./src/cloudflare/resources/email_routing/rules/rules.py">update</a>(rule_identifier, \*, zone_id, \*\*<a href="src/cloudflare/types/email_routing/rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/email_routing_rule.py">Optional[EmailRoutingRule]</a></code>
+- <code title="get /zones/{zone_id}/email/routing/rules">client.email_routing.rules.<a href="./src/cloudflare/resources/email_routing/rules/rules.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/email_routing/rule_list_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/email_routing_rule.py">SyncV4PagePaginationArray[EmailRoutingRule]</a></code>
+- <code title="delete /zones/{zone_id}/email/routing/rules/{rule_identifier}">client.email_routing.rules.<a href="./src/cloudflare/resources/email_routing/rules/rules.py">delete</a>(rule_identifier, \*, zone_id) -> <a href="./src/cloudflare/types/email_routing/email_routing_rule.py">Optional[EmailRoutingRule]</a></code>
+- <code title="get /zones/{zone_id}/email/routing/rules/{rule_identifier}">client.email_routing.rules.<a href="./src/cloudflare/resources/email_routing/rules/rules.py">get</a>(rule_identifier, \*, zone_id) -> <a href="./src/cloudflare/types/email_routing/email_routing_rule.py">Optional[EmailRoutingRule]</a></code>
 
 ### CatchAlls
 
@@ -1195,8 +1634,8 @@ from cloudflare.types.email_routing.rules import (
 
 Methods:
 
-- <code title="put /zones/{zone_identifier}/email/routing/rules/catch_all">client.email_routing.rules.catch_alls.<a href="./src/cloudflare/resources/email_routing/rules/catch_alls.py">update</a>(zone_identifier, \*\*<a href="src/cloudflare/types/email_routing/rules/catch_all_update_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/rules/catch_all_update_response.py">Optional</a></code>
-- <code title="get /zones/{zone_identifier}/email/routing/rules/catch_all">client.email_routing.rules.catch_alls.<a href="./src/cloudflare/resources/email_routing/rules/catch_alls.py">get</a>(zone_identifier) -> <a href="./src/cloudflare/types/email_routing/rules/catch_all_get_response.py">Optional</a></code>
+- <code title="put /zones/{zone_id}/email/routing/rules/catch_all">client.email_routing.rules.catch_alls.<a href="./src/cloudflare/resources/email_routing/rules/catch_alls.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/email_routing/rules/catch_all_update_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/rules/catch_all_update_response.py">Optional[CatchAllUpdateResponse]</a></code>
+- <code title="get /zones/{zone_id}/email/routing/rules/catch_all">client.email_routing.rules.catch_alls.<a href="./src/cloudflare/resources/email_routing/rules/catch_alls.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/email_routing/rules/catch_all_get_response.py">Optional[CatchAllGetResponse]</a></code>
 
 ## Addresses
 
@@ -1208,26 +1647,28 @@ from cloudflare.types.email_routing import Address
 
 Methods:
 
-- <code title="post /accounts/{account_identifier}/email/routing/addresses">client.email_routing.addresses.<a href="./src/cloudflare/resources/email_routing/addresses.py">create</a>(account_identifier, \*\*<a href="src/cloudflare/types/email_routing/address_create_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/address.py">Optional</a></code>
-- <code title="get /accounts/{account_identifier}/email/routing/addresses">client.email_routing.addresses.<a href="./src/cloudflare/resources/email_routing/addresses.py">list</a>(account_identifier, \*\*<a href="src/cloudflare/types/email_routing/address_list_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/address.py">SyncV4PagePaginationArray[Address]</a></code>
-- <code title="delete /accounts/{account_identifier}/email/routing/addresses/{destination_address_identifier}">client.email_routing.addresses.<a href="./src/cloudflare/resources/email_routing/addresses.py">delete</a>(destination_address_identifier, \*, account_identifier) -> <a href="./src/cloudflare/types/email_routing/address.py">Optional</a></code>
-- <code title="get /accounts/{account_identifier}/email/routing/addresses/{destination_address_identifier}">client.email_routing.addresses.<a href="./src/cloudflare/resources/email_routing/addresses.py">get</a>(destination_address_identifier, \*, account_identifier) -> <a href="./src/cloudflare/types/email_routing/address.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/email/routing/addresses">client.email_routing.addresses.<a href="./src/cloudflare/resources/email_routing/addresses.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/email_routing/address_create_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/address.py">Optional[Address]</a></code>
+- <code title="get /accounts/{account_id}/email/routing/addresses">client.email_routing.addresses.<a href="./src/cloudflare/resources/email_routing/addresses.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/email_routing/address_list_params.py">params</a>) -> <a href="./src/cloudflare/types/email_routing/address.py">SyncV4PagePaginationArray[Address]</a></code>
+- <code title="delete /accounts/{account_id}/email/routing/addresses/{destination_address_identifier}">client.email_routing.addresses.<a href="./src/cloudflare/resources/email_routing/addresses.py">delete</a>(destination_address_identifier, \*, account_id) -> <a href="./src/cloudflare/types/email_routing/address.py">Optional[Address]</a></code>
+- <code title="get /accounts/{account_id}/email/routing/addresses/{destination_address_identifier}">client.email_routing.addresses.<a href="./src/cloudflare/resources/email_routing/addresses.py">get</a>(destination_address_identifier, \*, account_id) -> <a href="./src/cloudflare/types/email_routing/address.py">Optional[Address]</a></code>
 
 # Filters
 
 Types:
 
 ```python
-from cloudflare.types.filters import FirewallFilter, FilterCreateResponse
+from cloudflare.types.filters import FirewallFilter, FilterDeleteResponse, FilterBulkDeleteResponse
 ```
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/filters">client.filters.<a href="./src/cloudflare/resources/filters.py">create</a>(zone_identifier, \*\*<a href="src/cloudflare/types/filters/filter_create_params.py">params</a>) -> <a href="./src/cloudflare/types/filters/filter_create_response.py">Optional</a></code>
-- <code title="put /zones/{zone_identifier}/filters/{id}">client.filters.<a href="./src/cloudflare/resources/filters.py">update</a>(id, \*, zone_identifier, \*\*<a href="src/cloudflare/types/filters/filter_update_params.py">params</a>) -> <a href="./src/cloudflare/types/filters/firewall_filter.py">FirewallFilter</a></code>
-- <code title="get /zones/{zone_identifier}/filters">client.filters.<a href="./src/cloudflare/resources/filters.py">list</a>(zone_identifier, \*\*<a href="src/cloudflare/types/filters/filter_list_params.py">params</a>) -> <a href="./src/cloudflare/types/filters/firewall_filter.py">SyncV4PagePaginationArray[FirewallFilter]</a></code>
-- <code title="delete /zones/{zone_identifier}/filters/{id}">client.filters.<a href="./src/cloudflare/resources/filters.py">delete</a>(id, \*, zone_identifier) -> <a href="./src/cloudflare/types/filters/firewall_filter.py">FirewallFilter</a></code>
-- <code title="get /zones/{zone_identifier}/filters/{id}">client.filters.<a href="./src/cloudflare/resources/filters.py">get</a>(id, \*, zone_identifier) -> <a href="./src/cloudflare/types/filters/firewall_filter.py">FirewallFilter</a></code>
+- <code title="post /zones/{zone_id}/filters">client.filters.<a href="./src/cloudflare/resources/filters.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/filters/filter_create_params.py">params</a>) -> <a href="./src/cloudflare/types/filters/firewall_filter.py">SyncSinglePage[FirewallFilter]</a></code>
+- <code title="put /zones/{zone_id}/filters/{filter_id}">client.filters.<a href="./src/cloudflare/resources/filters.py">update</a>(filter_id, \*, zone_id, \*\*<a href="src/cloudflare/types/filters/filter_update_params.py">params</a>) -> <a href="./src/cloudflare/types/filters/firewall_filter.py">FirewallFilter</a></code>
+- <code title="get /zones/{zone_id}/filters">client.filters.<a href="./src/cloudflare/resources/filters.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/filters/filter_list_params.py">params</a>) -> <a href="./src/cloudflare/types/filters/firewall_filter.py">SyncV4PagePaginationArray[FirewallFilter]</a></code>
+- <code title="delete /zones/{zone_id}/filters/{filter_id}">client.filters.<a href="./src/cloudflare/resources/filters.py">delete</a>(filter_id, \*, zone_id) -> <a href="./src/cloudflare/types/filters/filter_delete_response.py">FilterDeleteResponse</a></code>
+- <code title="delete /zones/{zone_id}/filters">client.filters.<a href="./src/cloudflare/resources/filters.py">bulk_delete</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/filters/filter_bulk_delete_params.py">params</a>) -> <a href="./src/cloudflare/types/filters/filter_bulk_delete_response.py">Optional[FilterBulkDeleteResponse]</a></code>
+- <code title="put /zones/{zone_id}/filters">client.filters.<a href="./src/cloudflare/resources/filters.py">bulk_update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/filters/filter_bulk_update_params.py">params</a>) -> <a href="./src/cloudflare/types/filters/firewall_filter.py">SyncSinglePage[FirewallFilter]</a></code>
+- <code title="get /zones/{zone_id}/filters/{filter_id}">client.filters.<a href="./src/cloudflare/resources/filters.py">get</a>(filter_id, \*, zone_id) -> <a href="./src/cloudflare/types/filters/firewall_filter.py">FirewallFilter</a></code>
 
 # Firewall
 
@@ -1248,34 +1689,31 @@ from cloudflare.types.firewall import (
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/firewall/lockdowns">client.firewall.lockdowns.<a href="./src/cloudflare/resources/firewall/lockdowns.py">create</a>(zone_identifier, \*\*<a href="src/cloudflare/types/firewall/lockdown_create_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/lockdown.py">Lockdown</a></code>
-- <code title="put /zones/{zone_identifier}/firewall/lockdowns/{id}">client.firewall.lockdowns.<a href="./src/cloudflare/resources/firewall/lockdowns.py">update</a>(id, \*, zone_identifier, \*\*<a href="src/cloudflare/types/firewall/lockdown_update_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/lockdown.py">Lockdown</a></code>
-- <code title="get /zones/{zone_identifier}/firewall/lockdowns">client.firewall.lockdowns.<a href="./src/cloudflare/resources/firewall/lockdowns.py">list</a>(zone_identifier, \*\*<a href="src/cloudflare/types/firewall/lockdown_list_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/lockdown.py">SyncV4PagePaginationArray[Lockdown]</a></code>
-- <code title="delete /zones/{zone_identifier}/firewall/lockdowns/{id}">client.firewall.lockdowns.<a href="./src/cloudflare/resources/firewall/lockdowns.py">delete</a>(id, \*, zone_identifier) -> <a href="./src/cloudflare/types/firewall/lockdown_delete_response.py">Optional</a></code>
-- <code title="get /zones/{zone_identifier}/firewall/lockdowns/{id}">client.firewall.lockdowns.<a href="./src/cloudflare/resources/firewall/lockdowns.py">get</a>(id, \*, zone_identifier) -> <a href="./src/cloudflare/types/firewall/lockdown.py">Lockdown</a></code>
+- <code title="post /zones/{zone_id}/firewall/lockdowns">client.firewall.lockdowns.<a href="./src/cloudflare/resources/firewall/lockdowns.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/firewall/lockdown_create_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/lockdown.py">Lockdown</a></code>
+- <code title="put /zones/{zone_id}/firewall/lockdowns/{lock_downs_id}">client.firewall.lockdowns.<a href="./src/cloudflare/resources/firewall/lockdowns.py">update</a>(lock_downs_id, \*, zone_id, \*\*<a href="src/cloudflare/types/firewall/lockdown_update_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/lockdown.py">Lockdown</a></code>
+- <code title="get /zones/{zone_id}/firewall/lockdowns">client.firewall.lockdowns.<a href="./src/cloudflare/resources/firewall/lockdowns.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/firewall/lockdown_list_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/lockdown.py">SyncV4PagePaginationArray[Lockdown]</a></code>
+- <code title="delete /zones/{zone_id}/firewall/lockdowns/{lock_downs_id}">client.firewall.lockdowns.<a href="./src/cloudflare/resources/firewall/lockdowns.py">delete</a>(lock_downs_id, \*, zone_id) -> <a href="./src/cloudflare/types/firewall/lockdown_delete_response.py">Optional[LockdownDeleteResponse]</a></code>
+- <code title="get /zones/{zone_id}/firewall/lockdowns/{lock_downs_id}">client.firewall.lockdowns.<a href="./src/cloudflare/resources/firewall/lockdowns.py">get</a>(lock_downs_id, \*, zone_id) -> <a href="./src/cloudflare/types/firewall/lockdown.py">Lockdown</a></code>
 
 ## Rules
 
 Types:
 
 ```python
-from cloudflare.types.firewall import (
-    FirewallRule,
-    Product,
-    DeletedFilter,
-    RuleCreateResponse,
-    RuleEditResponse,
-)
+from cloudflare.types.firewall import DeletedFilter, FirewallRule, Product
 ```
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/firewall/rules">client.firewall.rules.<a href="./src/cloudflare/resources/firewall/rules.py">create</a>(zone_identifier, \*\*<a href="src/cloudflare/types/firewall/rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/rule_create_response.py">Optional</a></code>
-- <code title="put /zones/{zone_identifier}/firewall/rules/{id}">client.firewall.rules.<a href="./src/cloudflare/resources/firewall/rules.py">update</a>(id, \*, zone_identifier, \*\*<a href="src/cloudflare/types/firewall/rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/firewall_rule.py">FirewallRule</a></code>
-- <code title="get /zones/{zone_identifier}/firewall/rules">client.firewall.rules.<a href="./src/cloudflare/resources/firewall/rules.py">list</a>(zone_identifier, \*\*<a href="src/cloudflare/types/firewall/rule_list_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/firewall_rule.py">SyncV4PagePaginationArray[FirewallRule]</a></code>
-- <code title="delete /zones/{zone_identifier}/firewall/rules/{id}">client.firewall.rules.<a href="./src/cloudflare/resources/firewall/rules.py">delete</a>(id, \*, zone_identifier) -> <a href="./src/cloudflare/types/firewall/firewall_rule.py">FirewallRule</a></code>
-- <code title="patch /zones/{zone_identifier}/firewall/rules/{id}">client.firewall.rules.<a href="./src/cloudflare/resources/firewall/rules.py">edit</a>(id, \*, zone_identifier, \*\*<a href="src/cloudflare/types/firewall/rule_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/rule_edit_response.py">Optional</a></code>
-- <code title="get /zones/{zone_identifier}/firewall/rules/{id}">client.firewall.rules.<a href="./src/cloudflare/resources/firewall/rules.py">get</a>(zone_identifier, \*, path_id, \*\*<a href="src/cloudflare/types/firewall/rule_get_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/firewall_rule.py">FirewallRule</a></code>
+- <code title="post /zones/{zone_id}/firewall/rules">client.firewall.rules.<a href="./src/cloudflare/resources/firewall/rules.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/firewall/rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/firewall_rule.py">SyncSinglePage[FirewallRule]</a></code>
+- <code title="put /zones/{zone_id}/firewall/rules/{rule_id}">client.firewall.rules.<a href="./src/cloudflare/resources/firewall/rules.py">update</a>(rule_id, \*, zone_id, \*\*<a href="src/cloudflare/types/firewall/rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/firewall_rule.py">FirewallRule</a></code>
+- <code title="get /zones/{zone_id}/firewall/rules">client.firewall.rules.<a href="./src/cloudflare/resources/firewall/rules.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/firewall/rule_list_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/firewall_rule.py">SyncV4PagePaginationArray[FirewallRule]</a></code>
+- <code title="delete /zones/{zone_id}/firewall/rules/{rule_id}">client.firewall.rules.<a href="./src/cloudflare/resources/firewall/rules.py">delete</a>(rule_id, \*, zone_id) -> <a href="./src/cloudflare/types/firewall/firewall_rule.py">FirewallRule</a></code>
+- <code title="delete /zones/{zone_id}/firewall/rules">client.firewall.rules.<a href="./src/cloudflare/resources/firewall/rules.py">bulk_delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/firewall/firewall_rule.py">SyncSinglePage[FirewallRule]</a></code>
+- <code title="patch /zones/{zone_id}/firewall/rules">client.firewall.rules.<a href="./src/cloudflare/resources/firewall/rules.py">bulk_edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/firewall/rule_bulk_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/firewall_rule.py">SyncSinglePage[FirewallRule]</a></code>
+- <code title="put /zones/{zone_id}/firewall/rules">client.firewall.rules.<a href="./src/cloudflare/resources/firewall/rules.py">bulk_update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/firewall/rule_bulk_update_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/firewall_rule.py">SyncSinglePage[FirewallRule]</a></code>
+- <code title="patch /zones/{zone_id}/firewall/rules/{rule_id}">client.firewall.rules.<a href="./src/cloudflare/resources/firewall/rules.py">edit</a>(rule_id, \*, zone_id) -> <a href="./src/cloudflare/types/firewall/firewall_rule.py">SyncSinglePage[FirewallRule]</a></code>
+- <code title="get /zones/{zone_id}/firewall/rules/{rule_id}">client.firewall.rules.<a href="./src/cloudflare/resources/firewall/rules.py">get</a>(rule_id, \*, zone_id) -> <a href="./src/cloudflare/types/firewall/firewall_rule.py">FirewallRule</a></code>
 
 ## AccessRules
 
@@ -1298,11 +1736,11 @@ from cloudflare.types.firewall import (
 
 Methods:
 
-- <code title="post /{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules">client.firewall.access_rules.<a href="./src/cloudflare/resources/firewall/access_rules.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/firewall/access_rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/access_rule_create_response.py">AccessRuleCreateResponse</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules">client.firewall.access_rules.<a href="./src/cloudflare/resources/firewall/access_rules.py">list</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/firewall/access_rule_list_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/access_rule_list_response.py">SyncV4PagePaginationArray[object]</a></code>
-- <code title="delete /{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{identifier}">client.firewall.access_rules.<a href="./src/cloudflare/resources/firewall/access_rules.py">delete</a>(identifier, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/firewall/access_rule_delete_response.py">Optional</a></code>
-- <code title="patch /{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{identifier}">client.firewall.access_rules.<a href="./src/cloudflare/resources/firewall/access_rules.py">edit</a>(identifier, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/firewall/access_rule_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/access_rule_edit_response.py">AccessRuleEditResponse</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{identifier}">client.firewall.access_rules.<a href="./src/cloudflare/resources/firewall/access_rules.py">get</a>(identifier, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/firewall/access_rule_get_response.py">AccessRuleGetResponse</a></code>
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/firewall/access_rules/rules">client.firewall.access_rules.<a href="./src/cloudflare/resources/firewall/access_rules.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/firewall/access_rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/access_rule_create_response.py">AccessRuleCreateResponse</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/firewall/access_rules/rules">client.firewall.access_rules.<a href="./src/cloudflare/resources/firewall/access_rules.py">list</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/firewall/access_rule_list_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/access_rule_list_response.py">SyncV4PagePaginationArray[AccessRuleListResponse]</a></code>
+- <code title="delete /{accounts_or_zones}/{account_or_zone_id}/firewall/access_rules/rules/{rule_id}">client.firewall.access_rules.<a href="./src/cloudflare/resources/firewall/access_rules.py">delete</a>(rule_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/firewall/access_rule_delete_response.py">Optional[AccessRuleDeleteResponse]</a></code>
+- <code title="patch /{accounts_or_zones}/{account_or_zone_id}/firewall/access_rules/rules/{rule_id}">client.firewall.access_rules.<a href="./src/cloudflare/resources/firewall/access_rules.py">edit</a>(rule_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/firewall/access_rule_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/access_rule_edit_response.py">AccessRuleEditResponse</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/firewall/access_rules/rules/{rule_id}">client.firewall.access_rules.<a href="./src/cloudflare/resources/firewall/access_rules.py">get</a>(rule_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/firewall/access_rule_get_response.py">AccessRuleGetResponse</a></code>
 
 ## UARules
 
@@ -1320,11 +1758,11 @@ from cloudflare.types.firewall import (
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/firewall/ua_rules">client.firewall.ua_rules.<a href="./src/cloudflare/resources/firewall/ua_rules.py">create</a>(zone_identifier, \*\*<a href="src/cloudflare/types/firewall/ua_rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/ua_rule_create_response.py">UARuleCreateResponse</a></code>
-- <code title="put /zones/{zone_identifier}/firewall/ua_rules/{id}">client.firewall.ua_rules.<a href="./src/cloudflare/resources/firewall/ua_rules.py">update</a>(id, \*, zone_identifier, \*\*<a href="src/cloudflare/types/firewall/ua_rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/ua_rule_update_response.py">UARuleUpdateResponse</a></code>
-- <code title="get /zones/{zone_identifier}/firewall/ua_rules">client.firewall.ua_rules.<a href="./src/cloudflare/resources/firewall/ua_rules.py">list</a>(zone_identifier, \*\*<a href="src/cloudflare/types/firewall/ua_rule_list_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/ua_rule_list_response.py">SyncV4PagePaginationArray[UARuleListResponse]</a></code>
-- <code title="delete /zones/{zone_identifier}/firewall/ua_rules/{id}">client.firewall.ua_rules.<a href="./src/cloudflare/resources/firewall/ua_rules.py">delete</a>(id, \*, zone_identifier) -> <a href="./src/cloudflare/types/firewall/ua_rule_delete_response.py">UARuleDeleteResponse</a></code>
-- <code title="get /zones/{zone_identifier}/firewall/ua_rules/{id}">client.firewall.ua_rules.<a href="./src/cloudflare/resources/firewall/ua_rules.py">get</a>(id, \*, zone_identifier) -> <a href="./src/cloudflare/types/firewall/ua_rule_get_response.py">UARuleGetResponse</a></code>
+- <code title="post /zones/{zone_id}/firewall/ua_rules">client.firewall.ua_rules.<a href="./src/cloudflare/resources/firewall/ua_rules.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/firewall/ua_rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/ua_rule_create_response.py">UARuleCreateResponse</a></code>
+- <code title="put /zones/{zone_id}/firewall/ua_rules/{ua_rule_id}">client.firewall.ua_rules.<a href="./src/cloudflare/resources/firewall/ua_rules.py">update</a>(ua_rule_id, \*, zone_id, \*\*<a href="src/cloudflare/types/firewall/ua_rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/ua_rule_update_response.py">UARuleUpdateResponse</a></code>
+- <code title="get /zones/{zone_id}/firewall/ua_rules">client.firewall.ua_rules.<a href="./src/cloudflare/resources/firewall/ua_rules.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/firewall/ua_rule_list_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/ua_rule_list_response.py">SyncV4PagePaginationArray[UARuleListResponse]</a></code>
+- <code title="delete /zones/{zone_id}/firewall/ua_rules/{ua_rule_id}">client.firewall.ua_rules.<a href="./src/cloudflare/resources/firewall/ua_rules.py">delete</a>(ua_rule_id, \*, zone_id) -> <a href="./src/cloudflare/types/firewall/ua_rule_delete_response.py">UARuleDeleteResponse</a></code>
+- <code title="get /zones/{zone_id}/firewall/ua_rules/{ua_rule_id}">client.firewall.ua_rules.<a href="./src/cloudflare/resources/firewall/ua_rules.py">get</a>(ua_rule_id, \*, zone_id) -> <a href="./src/cloudflare/types/firewall/ua_rule_get_response.py">UARuleGetResponse</a></code>
 
 ## WAF
 
@@ -1344,24 +1782,24 @@ from cloudflare.types.firewall.waf import (
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/firewall/waf/overrides">client.firewall.waf.overrides.<a href="./src/cloudflare/resources/firewall/waf/overrides.py">create</a>(zone_identifier, \*\*<a href="src/cloudflare/types/firewall/waf/override_create_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/waf/override.py">Override</a></code>
-- <code title="put /zones/{zone_identifier}/firewall/waf/overrides/{id}">client.firewall.waf.overrides.<a href="./src/cloudflare/resources/firewall/waf/overrides.py">update</a>(id, \*, zone_identifier, \*\*<a href="src/cloudflare/types/firewall/waf/override_update_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/waf/override.py">Override</a></code>
-- <code title="get /zones/{zone_identifier}/firewall/waf/overrides">client.firewall.waf.overrides.<a href="./src/cloudflare/resources/firewall/waf/overrides.py">list</a>(zone_identifier, \*\*<a href="src/cloudflare/types/firewall/waf/override_list_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/waf/override.py">SyncV4PagePaginationArray[Override]</a></code>
-- <code title="delete /zones/{zone_identifier}/firewall/waf/overrides/{id}">client.firewall.waf.overrides.<a href="./src/cloudflare/resources/firewall/waf/overrides.py">delete</a>(id, \*, zone_identifier) -> <a href="./src/cloudflare/types/firewall/waf/override_delete_response.py">Optional</a></code>
-- <code title="get /zones/{zone_identifier}/firewall/waf/overrides/{id}">client.firewall.waf.overrides.<a href="./src/cloudflare/resources/firewall/waf/overrides.py">get</a>(id, \*, zone_identifier) -> <a href="./src/cloudflare/types/firewall/waf/override.py">Override</a></code>
+- <code title="post /zones/{zone_id}/firewall/waf/overrides">client.firewall.waf.overrides.<a href="./src/cloudflare/resources/firewall/waf/overrides.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/firewall/waf/override_create_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/waf/override.py">Override</a></code>
+- <code title="put /zones/{zone_id}/firewall/waf/overrides/{overrides_id}">client.firewall.waf.overrides.<a href="./src/cloudflare/resources/firewall/waf/overrides.py">update</a>(overrides_id, \*, zone_id, \*\*<a href="src/cloudflare/types/firewall/waf/override_update_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/waf/override.py">Override</a></code>
+- <code title="get /zones/{zone_id}/firewall/waf/overrides">client.firewall.waf.overrides.<a href="./src/cloudflare/resources/firewall/waf/overrides.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/firewall/waf/override_list_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/waf/override.py">SyncV4PagePaginationArray[Override]</a></code>
+- <code title="delete /zones/{zone_id}/firewall/waf/overrides/{overrides_id}">client.firewall.waf.overrides.<a href="./src/cloudflare/resources/firewall/waf/overrides.py">delete</a>(overrides_id, \*, zone_id) -> <a href="./src/cloudflare/types/firewall/waf/override_delete_response.py">Optional[OverrideDeleteResponse]</a></code>
+- <code title="get /zones/{zone_id}/firewall/waf/overrides/{overrides_id}">client.firewall.waf.overrides.<a href="./src/cloudflare/resources/firewall/waf/overrides.py">get</a>(overrides_id, \*, zone_id) -> <a href="./src/cloudflare/types/firewall/waf/override.py">Override</a></code>
 
 ### Packages
 
 Types:
 
 ```python
-from cloudflare.types.firewall.waf import PackageListResponse, PackageGetResponse
+from cloudflare.types.firewall.waf import PackageGetResponse
 ```
 
 Methods:
 
-- <code title="get /zones/{zone_identifier}/firewall/waf/packages">client.firewall.waf.packages.<a href="./src/cloudflare/resources/firewall/waf/packages/packages.py">list</a>(zone_identifier, \*\*<a href="src/cloudflare/types/firewall/waf/package_list_params.py">params</a>) -> <a href="./src/cloudflare/types/firewall/waf/package_list_response.py">SyncV4PagePaginationArray[PackageListResponse]</a></code>
-- <code title="get /zones/{zone_identifier}/firewall/waf/packages/{identifier}">client.firewall.waf.packages.<a href="./src/cloudflare/resources/firewall/waf/packages/packages.py">get</a>(identifier, \*, zone_identifier) -> <a href="./src/cloudflare/types/firewall/waf/package_get_response.py">PackageGetResponse</a></code>
+- <code title="get /zones/{zone_id}/firewall/waf/packages">client.firewall.waf.packages.<a href="./src/cloudflare/resources/firewall/waf/packages/packages.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/firewall/waf/package_list_params.py">params</a>) -> SyncV4PagePaginationArray[object]</code>
+- <code title="get /zones/{zone_id}/firewall/waf/packages/{package_id}">client.firewall.waf.packages.<a href="./src/cloudflare/resources/firewall/waf/packages/packages.py">get</a>(package_id, \*, zone_id) -> <a href="./src/cloudflare/types/firewall/waf/package_get_response.py">PackageGetResponse</a></code>
 
 #### Groups
 
@@ -1416,7 +1854,7 @@ Methods:
 
 - <code title="post /zones/{zone_id}/healthchecks">client.healthchecks.<a href="./src/cloudflare/resources/healthchecks/healthchecks.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/healthchecks/healthcheck_create_params.py">params</a>) -> <a href="./src/cloudflare/types/healthchecks/healthcheck.py">Healthcheck</a></code>
 - <code title="put /zones/{zone_id}/healthchecks/{healthcheck_id}">client.healthchecks.<a href="./src/cloudflare/resources/healthchecks/healthchecks.py">update</a>(healthcheck_id, \*, zone_id, \*\*<a href="src/cloudflare/types/healthchecks/healthcheck_update_params.py">params</a>) -> <a href="./src/cloudflare/types/healthchecks/healthcheck.py">Healthcheck</a></code>
-- <code title="get /zones/{zone_id}/healthchecks">client.healthchecks.<a href="./src/cloudflare/resources/healthchecks/healthchecks.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/healthchecks/healthcheck_list_params.py">params</a>) -> <a href="./src/cloudflare/types/healthchecks/healthcheck.py">SyncSinglePage[Healthcheck]</a></code>
+- <code title="get /zones/{zone_id}/healthchecks">client.healthchecks.<a href="./src/cloudflare/resources/healthchecks/healthchecks.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/healthchecks/healthcheck_list_params.py">params</a>) -> <a href="./src/cloudflare/types/healthchecks/healthcheck.py">SyncV4PagePaginationArray[Healthcheck]</a></code>
 - <code title="delete /zones/{zone_id}/healthchecks/{healthcheck_id}">client.healthchecks.<a href="./src/cloudflare/resources/healthchecks/healthchecks.py">delete</a>(healthcheck_id, \*, zone_id) -> <a href="./src/cloudflare/types/healthchecks/healthcheck_delete_response.py">HealthcheckDeleteResponse</a></code>
 - <code title="patch /zones/{zone_id}/healthchecks/{healthcheck_id}">client.healthchecks.<a href="./src/cloudflare/resources/healthchecks/healthchecks.py">edit</a>(healthcheck_id, \*, zone_id, \*\*<a href="src/cloudflare/types/healthchecks/healthcheck_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/healthchecks/healthcheck.py">Healthcheck</a></code>
 - <code title="get /zones/{zone_id}/healthchecks/{healthcheck_id}">client.healthchecks.<a href="./src/cloudflare/resources/healthchecks/healthchecks.py">get</a>(healthcheck_id, \*, zone_id) -> <a href="./src/cloudflare/types/healthchecks/healthcheck.py">Healthcheck</a></code>
@@ -1449,11 +1887,11 @@ from cloudflare.types.keyless_certificates import (
 
 Methods:
 
-- <code title="post /zones/{zone_id}/keyless_certificates">client.keyless_certificates.<a href="./src/cloudflare/resources/keyless_certificates.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/keyless_certificates/keyless_certificate_create_params.py">params</a>) -> <a href="./src/cloudflare/types/keyless_certificates/keyless_certificate.py">Optional</a></code>
+- <code title="post /zones/{zone_id}/keyless_certificates">client.keyless_certificates.<a href="./src/cloudflare/resources/keyless_certificates.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/keyless_certificates/keyless_certificate_create_params.py">params</a>) -> <a href="./src/cloudflare/types/keyless_certificates/keyless_certificate.py">Optional[KeylessCertificate]</a></code>
 - <code title="get /zones/{zone_id}/keyless_certificates">client.keyless_certificates.<a href="./src/cloudflare/resources/keyless_certificates.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/keyless_certificates/keyless_certificate.py">SyncSinglePage[KeylessCertificate]</a></code>
-- <code title="delete /zones/{zone_id}/keyless_certificates/{keyless_certificate_id}">client.keyless_certificates.<a href="./src/cloudflare/resources/keyless_certificates.py">delete</a>(keyless_certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/keyless_certificates/keyless_certificate_delete_response.py">Optional</a></code>
-- <code title="patch /zones/{zone_id}/keyless_certificates/{keyless_certificate_id}">client.keyless_certificates.<a href="./src/cloudflare/resources/keyless_certificates.py">edit</a>(keyless_certificate_id, \*, zone_id, \*\*<a href="src/cloudflare/types/keyless_certificates/keyless_certificate_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/keyless_certificates/keyless_certificate.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/keyless_certificates/{keyless_certificate_id}">client.keyless_certificates.<a href="./src/cloudflare/resources/keyless_certificates.py">get</a>(keyless_certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/keyless_certificates/keyless_certificate.py">Optional</a></code>
+- <code title="delete /zones/{zone_id}/keyless_certificates/{keyless_certificate_id}">client.keyless_certificates.<a href="./src/cloudflare/resources/keyless_certificates.py">delete</a>(keyless_certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/keyless_certificates/keyless_certificate_delete_response.py">Optional[KeylessCertificateDeleteResponse]</a></code>
+- <code title="patch /zones/{zone_id}/keyless_certificates/{keyless_certificate_id}">client.keyless_certificates.<a href="./src/cloudflare/resources/keyless_certificates.py">edit</a>(keyless_certificate_id, \*, zone_id, \*\*<a href="src/cloudflare/types/keyless_certificates/keyless_certificate_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/keyless_certificates/keyless_certificate.py">Optional[KeylessCertificate]</a></code>
+- <code title="get /zones/{zone_id}/keyless_certificates/{keyless_certificate_id}">client.keyless_certificates.<a href="./src/cloudflare/resources/keyless_certificates.py">get</a>(keyless_certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/keyless_certificates/keyless_certificate.py">Optional[KeylessCertificate]</a></code>
 
 # Logpush
 
@@ -1461,40 +1899,28 @@ Methods:
 
 ### Fields
 
-Types:
-
-```python
-from cloudflare.types.logpush.datasets import FieldGetResponse
-```
-
 Methods:
 
-- <code title="get /{account_or_zone}/{account_or_zone_id}/logpush/datasets/{dataset_id}/fields">client.logpush.datasets.fields.<a href="./src/cloudflare/resources/logpush/datasets/fields.py">get</a>(dataset_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/logpush/datasets/field_get_response.py">object</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/logpush/datasets/{dataset_id}/fields">client.logpush.datasets.fields.<a href="./src/cloudflare/resources/logpush/datasets/fields.py">get</a>(dataset_id, \*, account_id, zone_id) -> object</code>
 
 ### Jobs
 
-Types:
-
-```python
-from cloudflare.types.logpush.datasets import JobGetResponse
-```
-
 Methods:
 
-- <code title="get /{account_or_zone}/{account_or_zone_id}/logpush/datasets/{dataset_id}/jobs">client.logpush.datasets.jobs.<a href="./src/cloudflare/resources/logpush/datasets/jobs.py">get</a>(dataset_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/logpush/datasets/job_get_response.py">Optional</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/logpush/datasets/{dataset_id}/jobs">client.logpush.datasets.jobs.<a href="./src/cloudflare/resources/logpush/datasets/jobs.py">get</a>(dataset_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/logpush/logpush_job.py">SyncSinglePage[Optional[LogpushJob]]</a></code>
 
 ## Edge
 
 Types:
 
 ```python
-from cloudflare.types.logpush import InstantLogpushJob, EdgeGetResponse
+from cloudflare.types.logpush import InstantLogpushJob
 ```
 
 Methods:
 
-- <code title="post /zones/{zone_id}/logpush/edge">client.logpush.edge.<a href="./src/cloudflare/resources/logpush/edge.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/logpush/edge_create_params.py">params</a>) -> <a href="./src/cloudflare/types/logpush/instant_logpush_job.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/logpush/edge">client.logpush.edge.<a href="./src/cloudflare/resources/logpush/edge.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/logpush/edge_get_response.py">Optional</a></code>
+- <code title="post /zones/{zone_id}/logpush/edge/jobs">client.logpush.edge.<a href="./src/cloudflare/resources/logpush/edge.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/logpush/edge_create_params.py">params</a>) -> <a href="./src/cloudflare/types/logpush/instant_logpush_job.py">Optional[InstantLogpushJob]</a></code>
+- <code title="get /zones/{zone_id}/logpush/edge/jobs">client.logpush.edge.<a href="./src/cloudflare/resources/logpush/edge.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/logpush/instant_logpush_job.py">SyncSinglePage[Optional[InstantLogpushJob]]</a></code>
 
 ## Jobs
 
@@ -1506,11 +1932,11 @@ from cloudflare.types.logpush import LogpushJob, OutputOptions, JobDeleteRespons
 
 Methods:
 
-- <code title="post /{account_or_zone}/{account_or_zone_id}/logpush/jobs">client.logpush.jobs.<a href="./src/cloudflare/resources/logpush/jobs.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/logpush/job_create_params.py">params</a>) -> <a href="./src/cloudflare/types/logpush/logpush_job.py">Optional</a></code>
-- <code title="put /{account_or_zone}/{account_or_zone_id}/logpush/jobs/{job_id}">client.logpush.jobs.<a href="./src/cloudflare/resources/logpush/jobs.py">update</a>(job_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/logpush/job_update_params.py">params</a>) -> <a href="./src/cloudflare/types/logpush/logpush_job.py">Optional</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/logpush/jobs">client.logpush.jobs.<a href="./src/cloudflare/resources/logpush/jobs.py">list</a>(\*, account_id, zone_id) -> <a href="./src/cloudflare/types/logpush/logpush_job.py">SyncSinglePage[Optional]</a></code>
-- <code title="delete /{account_or_zone}/{account_or_zone_id}/logpush/jobs/{job_id}">client.logpush.jobs.<a href="./src/cloudflare/resources/logpush/jobs.py">delete</a>(job_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/logpush/job_delete_response.py">object</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/logpush/jobs/{job_id}">client.logpush.jobs.<a href="./src/cloudflare/resources/logpush/jobs.py">get</a>(job_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/logpush/logpush_job.py">Optional</a></code>
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/logpush/jobs">client.logpush.jobs.<a href="./src/cloudflare/resources/logpush/jobs.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/logpush/job_create_params.py">params</a>) -> <a href="./src/cloudflare/types/logpush/logpush_job.py">Optional[LogpushJob]</a></code>
+- <code title="put /{accounts_or_zones}/{account_or_zone_id}/logpush/jobs/{job_id}">client.logpush.jobs.<a href="./src/cloudflare/resources/logpush/jobs.py">update</a>(job_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/logpush/job_update_params.py">params</a>) -> <a href="./src/cloudflare/types/logpush/logpush_job.py">Optional[LogpushJob]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/logpush/jobs">client.logpush.jobs.<a href="./src/cloudflare/resources/logpush/jobs.py">list</a>(\*, account_id, zone_id) -> <a href="./src/cloudflare/types/logpush/logpush_job.py">SyncSinglePage[Optional[LogpushJob]]</a></code>
+- <code title="delete /{accounts_or_zones}/{account_or_zone_id}/logpush/jobs/{job_id}">client.logpush.jobs.<a href="./src/cloudflare/resources/logpush/jobs.py">delete</a>(job_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/logpush/job_delete_response.py">Optional[JobDeleteResponse]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/logpush/jobs/{job_id}">client.logpush.jobs.<a href="./src/cloudflare/resources/logpush/jobs.py">get</a>(job_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/logpush/logpush_job.py">Optional[LogpushJob]</a></code>
 
 ## Ownership
 
@@ -1522,21 +1948,26 @@ from cloudflare.types.logpush import OwnershipValidation, OwnershipCreateRespons
 
 Methods:
 
-- <code title="post /{account_or_zone}/{account_or_zone_id}/logpush/ownership">client.logpush.ownership.<a href="./src/cloudflare/resources/logpush/ownership.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/logpush/ownership_create_params.py">params</a>) -> <a href="./src/cloudflare/types/logpush/ownership_create_response.py">Optional</a></code>
-- <code title="post /{account_or_zone}/{account_or_zone_id}/logpush/ownership/validate">client.logpush.ownership.<a href="./src/cloudflare/resources/logpush/ownership.py">validate</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/logpush/ownership_validate_params.py">params</a>) -> <a href="./src/cloudflare/types/logpush/ownership_validation.py">Optional</a></code>
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/logpush/ownership">client.logpush.ownership.<a href="./src/cloudflare/resources/logpush/ownership.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/logpush/ownership_create_params.py">params</a>) -> <a href="./src/cloudflare/types/logpush/ownership_create_response.py">Optional[OwnershipCreateResponse]</a></code>
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/logpush/ownership/validate">client.logpush.ownership.<a href="./src/cloudflare/resources/logpush/ownership.py">validate</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/logpush/ownership_validate_params.py">params</a>) -> <a href="./src/cloudflare/types/logpush/ownership_validation.py">Optional[OwnershipValidation]</a></code>
 
 ## Validate
 
 Types:
 
 ```python
-from cloudflare.types.logpush import ValidateDestinationResponse, ValidateOriginResponse
+from cloudflare.types.logpush import (
+    ValidateDestinationResponse,
+    ValidateDestinationExistsResponse,
+    ValidateOriginResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /{account_or_zone}/{account_or_zone_id}/logpush/validate/destination/exists">client.logpush.validate.<a href="./src/cloudflare/resources/logpush/validate.py">destination</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/logpush/validate_destination_params.py">params</a>) -> <a href="./src/cloudflare/types/logpush/validate_destination_response.py">Optional</a></code>
-- <code title="post /{account_or_zone}/{account_or_zone_id}/logpush/validate/origin">client.logpush.validate.<a href="./src/cloudflare/resources/logpush/validate.py">origin</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/logpush/validate_origin_params.py">params</a>) -> <a href="./src/cloudflare/types/logpush/validate_origin_response.py">Optional</a></code>
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/logpush/validate/destination">client.logpush.validate.<a href="./src/cloudflare/resources/logpush/validate.py">destination</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/logpush/validate_destination_params.py">params</a>) -> <a href="./src/cloudflare/types/logpush/validate_destination_response.py">Optional[ValidateDestinationResponse]</a></code>
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/logpush/validate/destination/exists">client.logpush.validate.<a href="./src/cloudflare/resources/logpush/validate.py">destination_exists</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/logpush/validate_destination_exists_params.py">params</a>) -> <a href="./src/cloudflare/types/logpush/validate_destination_exists_response.py">Optional[ValidateDestinationExistsResponse]</a></code>
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/logpush/validate/origin">client.logpush.validate.<a href="./src/cloudflare/resources/logpush/validate.py">origin</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/logpush/validate_origin_params.py">params</a>) -> <a href="./src/cloudflare/types/logpush/validate_origin_response.py">Optional[ValidateOriginResponse]</a></code>
 
 # Logs
 
@@ -1552,8 +1983,8 @@ from cloudflare.types.logs.control import RetentionCreateResponse, RetentionGetR
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/logs/control/retention/flag">client.logs.control.retention.<a href="./src/cloudflare/resources/logs/control/retention.py">create</a>(zone_identifier, \*\*<a href="src/cloudflare/types/logs/control/retention_create_params.py">params</a>) -> <a href="./src/cloudflare/types/logs/control/retention_create_response.py">RetentionCreateResponse</a></code>
-- <code title="get /zones/{zone_identifier}/logs/control/retention/flag">client.logs.control.retention.<a href="./src/cloudflare/resources/logs/control/retention.py">get</a>(zone_identifier) -> <a href="./src/cloudflare/types/logs/control/retention_get_response.py">RetentionGetResponse</a></code>
+- <code title="post /zones/{zone_id}/logs/control/retention/flag">client.logs.control.retention.<a href="./src/cloudflare/resources/logs/control/retention.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/logs/control/retention_create_params.py">params</a>) -> <a href="./src/cloudflare/types/logs/control/retention_create_response.py">Optional[RetentionCreateResponse]</a></code>
+- <code title="get /zones/{zone_id}/logs/control/retention/flag">client.logs.control.retention.<a href="./src/cloudflare/resources/logs/control/retention.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/logs/control/retention_get_response.py">Optional[RetentionGetResponse]</a></code>
 
 ### Cmb
 
@@ -1562,14 +1993,14 @@ Methods:
 Types:
 
 ```python
-from cloudflare.types.logs.control.cmb import CmbConfig, ConfigDeleteResponse
+from cloudflare.types.logs.control.cmb import CmbConfig
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/logs/control/cmb/config">client.logs.control.cmb.config.<a href="./src/cloudflare/resources/logs/control/cmb/config.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/logs/control/cmb/config_create_params.py">params</a>) -> <a href="./src/cloudflare/types/logs/control/cmb/cmb_config.py">Optional</a></code>
-- <code title="delete /accounts/{account_id}/logs/control/cmb/config">client.logs.control.cmb.config.<a href="./src/cloudflare/resources/logs/control/cmb/config.py">delete</a>(\*, account_id) -> <a href="./src/cloudflare/types/logs/control/cmb/config_delete_response.py">object</a></code>
-- <code title="get /accounts/{account_id}/logs/control/cmb/config">client.logs.control.cmb.config.<a href="./src/cloudflare/resources/logs/control/cmb/config.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/logs/control/cmb/cmb_config.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/logs/control/cmb/config">client.logs.control.cmb.config.<a href="./src/cloudflare/resources/logs/control/cmb/config.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/logs/control/cmb/config_create_params.py">params</a>) -> <a href="./src/cloudflare/types/logs/control/cmb/cmb_config.py">Optional[CmbConfig]</a></code>
+- <code title="delete /accounts/{account_id}/logs/control/cmb/config">client.logs.control.cmb.config.<a href="./src/cloudflare/resources/logs/control/cmb/config.py">delete</a>(\*, account_id) -> object</code>
+- <code title="get /accounts/{account_id}/logs/control/cmb/config">client.logs.control.cmb.config.<a href="./src/cloudflare/resources/logs/control/cmb/config.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/logs/control/cmb/cmb_config.py">Optional[CmbConfig]</a></code>
 
 ## RayID
 
@@ -1581,7 +2012,7 @@ from cloudflare.types.logs import RayIDGetResponse
 
 Methods:
 
-- <code title="get /zones/{zone_identifier}/logs/rayids/{ray_identifier}">client.logs.rayid.<a href="./src/cloudflare/resources/logs/rayid.py">get</a>(ray_identifier, \*, zone_identifier, \*\*<a href="src/cloudflare/types/logs/rayid_get_params.py">params</a>) -> <a href="./src/cloudflare/types/logs/rayid_get_response.py">RayIDGetResponse</a></code>
+- <code title="get /zones/{zone_id}/logs/rayids/{ray_id}">client.logs.rayid.<a href="./src/cloudflare/resources/logs/rayid.py">get</a>(rayid, \*, zone_id, \*\*<a href="src/cloudflare/types/logs/rayid_get_params.py">params</a>) -> <a href="./src/cloudflare/types/logs/rayid_get_response.py">RayIDGetResponse</a></code>
 
 ## Received
 
@@ -1593,7 +2024,7 @@ from cloudflare.types.logs import ReceivedGetResponse
 
 Methods:
 
-- <code title="get /zones/{zone_identifier}/logs/received">client.logs.received.<a href="./src/cloudflare/resources/logs/received/received.py">get</a>(zone_identifier, \*\*<a href="src/cloudflare/types/logs/received_get_params.py">params</a>) -> <a href="./src/cloudflare/types/logs/received_get_response.py">ReceivedGetResponse</a></code>
+- <code title="get /zones/{zone_id}/logs/received">client.logs.received.<a href="./src/cloudflare/resources/logs/received/received.py">get</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/logs/received_get_params.py">params</a>) -> <a href="./src/cloudflare/types/logs/received_get_response.py">ReceivedGetResponse</a></code>
 
 ### Fields
 
@@ -1605,7 +2036,7 @@ from cloudflare.types.logs.received import FieldGetResponse
 
 Methods:
 
-- <code title="get /zones/{zone_identifier}/logs/received/fields">client.logs.received.fields.<a href="./src/cloudflare/resources/logs/received/fields.py">get</a>(zone_identifier) -> <a href="./src/cloudflare/types/logs/received/field_get_response.py">FieldGetResponse</a></code>
+- <code title="get /zones/{zone_id}/logs/received/fields">client.logs.received.fields.<a href="./src/cloudflare/resources/logs/received/fields.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/logs/received/field_get_response.py">FieldGetResponse</a></code>
 
 # OriginTLSClientAuth
 
@@ -1613,8 +2044,8 @@ Types:
 
 ```python
 from cloudflare.types.origin_tls_client_auth import (
-    ZoneAuthenticatedOriginPull,
     OriginTLSClientAuthCreateResponse,
+    OriginTLSClientAuthListResponse,
     OriginTLSClientAuthDeleteResponse,
     OriginTLSClientAuthGetResponse,
 )
@@ -1622,10 +2053,31 @@ from cloudflare.types.origin_tls_client_auth import (
 
 Methods:
 
-- <code title="post /zones/{zone_id}/origin_tls_client_auth">client.origin_tls_client_auth.<a href="./src/cloudflare/resources/origin_tls_client_auth/origin_tls_client_auth.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_create_params.py">params</a>) -> <a href="./src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_create_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/origin_tls_client_auth">client.origin_tls_client_auth.<a href="./src/cloudflare/resources/origin_tls_client_auth/origin_tls_client_auth.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/zone_authenticated_origin_pull.py">SyncSinglePage[ZoneAuthenticatedOriginPull]</a></code>
-- <code title="delete /zones/{zone_id}/origin_tls_client_auth/{certificate_id}">client.origin_tls_client_auth.<a href="./src/cloudflare/resources/origin_tls_client_auth/origin_tls_client_auth.py">delete</a>(certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_delete_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/origin_tls_client_auth/{certificate_id}">client.origin_tls_client_auth.<a href="./src/cloudflare/resources/origin_tls_client_auth/origin_tls_client_auth.py">get</a>(certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_get_response.py">Optional</a></code>
+- <code title="post /zones/{zone_id}/origin_tls_client_auth">client.origin_tls_client_auth.<a href="./src/cloudflare/resources/origin_tls_client_auth/origin_tls_client_auth.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_create_params.py">params</a>) -> <a href="./src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_create_response.py">Optional[OriginTLSClientAuthCreateResponse]</a></code>
+- <code title="get /zones/{zone_id}/origin_tls_client_auth">client.origin_tls_client_auth.<a href="./src/cloudflare/resources/origin_tls_client_auth/origin_tls_client_auth.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_list_response.py">SyncSinglePage[OriginTLSClientAuthListResponse]</a></code>
+- <code title="delete /zones/{zone_id}/origin_tls_client_auth/{certificate_id}">client.origin_tls_client_auth.<a href="./src/cloudflare/resources/origin_tls_client_auth/origin_tls_client_auth.py">delete</a>(certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_delete_response.py">Optional[OriginTLSClientAuthDeleteResponse]</a></code>
+- <code title="get /zones/{zone_id}/origin_tls_client_auth/{certificate_id}">client.origin_tls_client_auth.<a href="./src/cloudflare/resources/origin_tls_client_auth/origin_tls_client_auth.py">get</a>(certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_get_response.py">Optional[OriginTLSClientAuthGetResponse]</a></code>
+
+## ZoneCertificates
+
+Types:
+
+```python
+from cloudflare.types.origin_tls_client_auth import (
+    ZoneAuthenticatedOriginPull,
+    ZoneCertificateCreateResponse,
+    ZoneCertificateListResponse,
+    ZoneCertificateDeleteResponse,
+    ZoneCertificateGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /zones/{zone_id}/origin_tls_client_auth">client.origin_tls_client_auth.zone_certificates.<a href="./src/cloudflare/resources/origin_tls_client_auth/zone_certificates.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/origin_tls_client_auth/zone_certificate_create_params.py">params</a>) -> <a href="./src/cloudflare/types/origin_tls_client_auth/zone_certificate_create_response.py">Optional[ZoneCertificateCreateResponse]</a></code>
+- <code title="get /zones/{zone_id}/origin_tls_client_auth">client.origin_tls_client_auth.zone_certificates.<a href="./src/cloudflare/resources/origin_tls_client_auth/zone_certificates.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/zone_certificate_list_response.py">SyncSinglePage[ZoneCertificateListResponse]</a></code>
+- <code title="delete /zones/{zone_id}/origin_tls_client_auth/{certificate_id}">client.origin_tls_client_auth.zone_certificates.<a href="./src/cloudflare/resources/origin_tls_client_auth/zone_certificates.py">delete</a>(certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/zone_certificate_delete_response.py">Optional[ZoneCertificateDeleteResponse]</a></code>
+- <code title="get /zones/{zone_id}/origin_tls_client_auth/{certificate_id}">client.origin_tls_client_auth.zone_certificates.<a href="./src/cloudflare/resources/origin_tls_client_auth/zone_certificates.py">get</a>(certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/zone_certificate_get_response.py">Optional[ZoneCertificateGetResponse]</a></code>
 
 ## Hostnames
 
@@ -1637,28 +2089,29 @@ from cloudflare.types.origin_tls_client_auth import AuthenticatedOriginPull, Hos
 
 Methods:
 
-- <code title="put /zones/{zone_id}/origin_tls_client_auth/hostnames">client.origin_tls_client_auth.hostnames.<a href="./src/cloudflare/resources/origin_tls_client_auth/hostnames/hostnames.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/origin_tls_client_auth/hostname_update_params.py">params</a>) -> <a href="./src/cloudflare/types/origin_tls_client_auth/hostname_update_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/origin_tls_client_auth/hostnames/{hostname}">client.origin_tls_client_auth.hostnames.<a href="./src/cloudflare/resources/origin_tls_client_auth/hostnames/hostnames.py">get</a>(hostname, \*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/authenticated_origin_pull.py">Optional</a></code>
+- <code title="put /zones/{zone_id}/origin_tls_client_auth/hostnames">client.origin_tls_client_auth.hostnames.<a href="./src/cloudflare/resources/origin_tls_client_auth/hostnames.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/origin_tls_client_auth/hostname_update_params.py">params</a>) -> <a href="./src/cloudflare/types/origin_tls_client_auth/hostname_update_response.py">SyncSinglePage[HostnameUpdateResponse]</a></code>
+- <code title="get /zones/{zone_id}/origin_tls_client_auth/hostnames/{hostname}">client.origin_tls_client_auth.hostnames.<a href="./src/cloudflare/resources/origin_tls_client_auth/hostnames.py">get</a>(hostname, \*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/authenticated_origin_pull.py">Optional[AuthenticatedOriginPull]</a></code>
 
-### Certificates
+## HostnameCertificates
 
 Types:
 
 ```python
-from cloudflare.types.origin_tls_client_auth.hostnames import (
+from cloudflare.types.origin_tls_client_auth import (
     Certificate,
-    CertificateCreateResponse,
-    CertificateDeleteResponse,
-    CertificateGetResponse,
+    HostnameCertificateCreateResponse,
+    HostnameCertificateListResponse,
+    HostnameCertificateDeleteResponse,
+    HostnameCertificateGetResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /zones/{zone_id}/origin_tls_client_auth/hostnames/certificates">client.origin_tls_client_auth.hostnames.certificates.<a href="./src/cloudflare/resources/origin_tls_client_auth/hostnames/certificates.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_create_params.py">params</a>) -> <a href="./src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_create_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/origin_tls_client_auth/hostnames/certificates">client.origin_tls_client_auth.hostnames.certificates.<a href="./src/cloudflare/resources/origin_tls_client_auth/hostnames/certificates.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/authenticated_origin_pull.py">SyncSinglePage[AuthenticatedOriginPull]</a></code>
-- <code title="delete /zones/{zone_id}/origin_tls_client_auth/hostnames/certificates/{certificate_id}">client.origin_tls_client_auth.hostnames.certificates.<a href="./src/cloudflare/resources/origin_tls_client_auth/hostnames/certificates.py">delete</a>(certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_delete_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/origin_tls_client_auth/hostnames/certificates/{certificate_id}">client.origin_tls_client_auth.hostnames.certificates.<a href="./src/cloudflare/resources/origin_tls_client_auth/hostnames/certificates.py">get</a>(certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_get_response.py">Optional</a></code>
+- <code title="post /zones/{zone_id}/origin_tls_client_auth/hostnames/certificates">client.origin_tls_client_auth.hostname_certificates.<a href="./src/cloudflare/resources/origin_tls_client_auth/hostname_certificates.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/origin_tls_client_auth/hostname_certificate_create_params.py">params</a>) -> <a href="./src/cloudflare/types/origin_tls_client_auth/hostname_certificate_create_response.py">Optional[HostnameCertificateCreateResponse]</a></code>
+- <code title="get /zones/{zone_id}/origin_tls_client_auth/hostnames/certificates">client.origin_tls_client_auth.hostname_certificates.<a href="./src/cloudflare/resources/origin_tls_client_auth/hostname_certificates.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/hostname_certificate_list_response.py">SyncSinglePage[HostnameCertificateListResponse]</a></code>
+- <code title="delete /zones/{zone_id}/origin_tls_client_auth/hostnames/certificates/{certificate_id}">client.origin_tls_client_auth.hostname_certificates.<a href="./src/cloudflare/resources/origin_tls_client_auth/hostname_certificates.py">delete</a>(certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/hostname_certificate_delete_response.py">Optional[HostnameCertificateDeleteResponse]</a></code>
+- <code title="get /zones/{zone_id}/origin_tls_client_auth/hostnames/certificates/{certificate_id}">client.origin_tls_client_auth.hostname_certificates.<a href="./src/cloudflare/resources/origin_tls_client_auth/hostname_certificates.py">get</a>(certificate_id, \*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/hostname_certificate_get_response.py">Optional[HostnameCertificateGetResponse]</a></code>
 
 ## Settings
 
@@ -1670,213 +2123,71 @@ from cloudflare.types.origin_tls_client_auth import SettingUpdateResponse, Setti
 
 Methods:
 
-- <code title="put /zones/{zone_id}/origin_tls_client_auth/settings">client.origin_tls_client_auth.settings.<a href="./src/cloudflare/resources/origin_tls_client_auth/settings.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/origin_tls_client_auth/setting_update_params.py">params</a>) -> <a href="./src/cloudflare/types/origin_tls_client_auth/setting_update_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/origin_tls_client_auth/settings">client.origin_tls_client_auth.settings.<a href="./src/cloudflare/resources/origin_tls_client_auth/settings.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/setting_get_response.py">Optional</a></code>
+- <code title="put /zones/{zone_id}/origin_tls_client_auth/settings">client.origin_tls_client_auth.settings.<a href="./src/cloudflare/resources/origin_tls_client_auth/settings.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/origin_tls_client_auth/setting_update_params.py">params</a>) -> <a href="./src/cloudflare/types/origin_tls_client_auth/setting_update_response.py">Optional[SettingUpdateResponse]</a></code>
+- <code title="get /zones/{zone_id}/origin_tls_client_auth/settings">client.origin_tls_client_auth.settings.<a href="./src/cloudflare/resources/origin_tls_client_auth/settings.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/origin_tls_client_auth/setting_get_response.py">Optional[SettingGetResponse]</a></code>
 
-# Pagerules
+# PageRules
 
 Types:
 
 ```python
-from cloudflare.types.pagerules import (
+from cloudflare.types.page_rules import (
     PageRule,
-    Route,
     Target,
-    PageruleCreateResponse,
-    PageruleUpdateResponse,
-    PageruleListResponse,
-    PageruleDeleteResponse,
-    PageruleEditResponse,
-    PageruleGetResponse,
+    PageRuleListResponse,
+    PageRuleDeleteResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /zones/{zone_id}/pagerules">client.pagerules.<a href="./src/cloudflare/resources/pagerules/pagerules.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/pagerules/pagerule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/pagerules/pagerule_create_response.py">PageruleCreateResponse</a></code>
-- <code title="put /zones/{zone_id}/pagerules/{pagerule_id}">client.pagerules.<a href="./src/cloudflare/resources/pagerules/pagerules.py">update</a>(pagerule_id, \*, zone_id, \*\*<a href="src/cloudflare/types/pagerules/pagerule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/pagerules/pagerule_update_response.py">PageruleUpdateResponse</a></code>
-- <code title="get /zones/{zone_id}/pagerules">client.pagerules.<a href="./src/cloudflare/resources/pagerules/pagerules.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/pagerules/pagerule_list_params.py">params</a>) -> <a href="./src/cloudflare/types/pagerules/pagerule_list_response.py">PageruleListResponse</a></code>
-- <code title="delete /zones/{zone_id}/pagerules/{pagerule_id}">client.pagerules.<a href="./src/cloudflare/resources/pagerules/pagerules.py">delete</a>(pagerule_id, \*, zone_id) -> <a href="./src/cloudflare/types/pagerules/pagerule_delete_response.py">Optional</a></code>
-- <code title="patch /zones/{zone_id}/pagerules/{pagerule_id}">client.pagerules.<a href="./src/cloudflare/resources/pagerules/pagerules.py">edit</a>(pagerule_id, \*, zone_id, \*\*<a href="src/cloudflare/types/pagerules/pagerule_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/pagerules/pagerule_edit_response.py">PageruleEditResponse</a></code>
-- <code title="get /zones/{zone_id}/pagerules/{pagerule_id}">client.pagerules.<a href="./src/cloudflare/resources/pagerules/pagerules.py">get</a>(pagerule_id, \*, zone_id) -> <a href="./src/cloudflare/types/pagerules/pagerule_get_response.py">PageruleGetResponse</a></code>
+- <code title="post /zones/{zone_id}/pagerules">client.page_rules.<a href="./src/cloudflare/resources/page_rules.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/page_rules/page_rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/page_rules/page_rule.py">Optional[PageRule]</a></code>
+- <code title="put /zones/{zone_id}/pagerules/{pagerule_id}">client.page_rules.<a href="./src/cloudflare/resources/page_rules.py">update</a>(pagerule_id, \*, zone_id, \*\*<a href="src/cloudflare/types/page_rules/page_rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/page_rules/page_rule.py">Optional[PageRule]</a></code>
+- <code title="get /zones/{zone_id}/pagerules">client.page_rules.<a href="./src/cloudflare/resources/page_rules.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/page_rules/page_rule_list_params.py">params</a>) -> <a href="./src/cloudflare/types/page_rules/page_rule_list_response.py">Optional[PageRuleListResponse]</a></code>
+- <code title="delete /zones/{zone_id}/pagerules/{pagerule_id}">client.page_rules.<a href="./src/cloudflare/resources/page_rules.py">delete</a>(pagerule_id, \*, zone_id) -> <a href="./src/cloudflare/types/page_rules/page_rule_delete_response.py">Optional[PageRuleDeleteResponse]</a></code>
+- <code title="patch /zones/{zone_id}/pagerules/{pagerule_id}">client.page_rules.<a href="./src/cloudflare/resources/page_rules.py">edit</a>(pagerule_id, \*, zone_id, \*\*<a href="src/cloudflare/types/page_rules/page_rule_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/page_rules/page_rule.py">Optional[PageRule]</a></code>
+- <code title="get /zones/{zone_id}/pagerules/{pagerule_id}">client.page_rules.<a href="./src/cloudflare/resources/page_rules.py">get</a>(pagerule_id, \*, zone_id) -> <a href="./src/cloudflare/types/page_rules/page_rule.py">Optional[PageRule]</a></code>
 
-## Settings
+# RateLimits
 
 Types:
 
 ```python
-from cloudflare.types.pagerules import SettingListResponse
+from cloudflare.types.rate_limits import Action, RateLimit, RateLimitDeleteResponse
 ```
 
 Methods:
 
-- <code title="get /zones/{zone_id}/pagerules/settings">client.pagerules.settings.<a href="./src/cloudflare/resources/pagerules/settings.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/pagerules/setting_list_response.py">SettingListResponse</a></code>
+- <code title="post /zones/{zone_id}/rate_limits">client.rate_limits.<a href="./src/cloudflare/resources/rate_limits.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/rate_limits/rate_limit_create_params.py">params</a>) -> <a href="./src/cloudflare/types/rate_limits/rate_limit.py">RateLimit</a></code>
+- <code title="get /zones/{zone_id}/rate_limits">client.rate_limits.<a href="./src/cloudflare/resources/rate_limits.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/rate_limits/rate_limit_list_params.py">params</a>) -> <a href="./src/cloudflare/types/rate_limits/rate_limit.py">SyncV4PagePaginationArray[RateLimit]</a></code>
+- <code title="delete /zones/{zone_id}/rate_limits/{rate_limit_id}">client.rate_limits.<a href="./src/cloudflare/resources/rate_limits.py">delete</a>(rate_limit_id, \*, zone_id) -> <a href="./src/cloudflare/types/rate_limits/rate_limit_delete_response.py">RateLimitDeleteResponse</a></code>
+- <code title="put /zones/{zone_id}/rate_limits/{rate_limit_id}">client.rate_limits.<a href="./src/cloudflare/resources/rate_limits.py">edit</a>(rate_limit_id, \*, zone_id, \*\*<a href="src/cloudflare/types/rate_limits/rate_limit_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/rate_limits/rate_limit.py">RateLimit</a></code>
+- <code title="get /zones/{zone_id}/rate_limits/{rate_limit_id}">client.rate_limits.<a href="./src/cloudflare/resources/rate_limits.py">get</a>(rate_limit_id, \*, zone_id) -> <a href="./src/cloudflare/types/rate_limits/rate_limit.py">RateLimit</a></code>
 
-# RateLimits
+# WaitingRooms
 
 Types:
 
 ```python
-from cloudflare.types.rate_limits import (
-    Action,
-    Methods,
-    RateLimit,
-    RateLimitCreateResponse,
-    RateLimitDeleteResponse,
-    RateLimitEditResponse,
-    RateLimitGetResponse,
+from cloudflare.types.waiting_rooms import (
+    AdditionalRoutes,
+    CookieAttributes,
+    Query,
+    WaitingRoom,
+    WaitingRoomDeleteResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/rate_limits">client.rate_limits.<a href="./src/cloudflare/resources/rate_limits.py">create</a>(zone_identifier, \*\*<a href="src/cloudflare/types/rate_limits/rate_limit_create_params.py">params</a>) -> <a href="./src/cloudflare/types/rate_limits/rate_limit_create_response.py">RateLimitCreateResponse</a></code>
-- <code title="get /zones/{zone_identifier}/rate_limits">client.rate_limits.<a href="./src/cloudflare/resources/rate_limits.py">list</a>(zone_identifier, \*\*<a href="src/cloudflare/types/rate_limits/rate_limit_list_params.py">params</a>) -> <a href="./src/cloudflare/types/rate_limits/rate_limit.py">SyncV4PagePaginationArray[RateLimit]</a></code>
-- <code title="delete /zones/{zone_identifier}/rate_limits/{id}">client.rate_limits.<a href="./src/cloudflare/resources/rate_limits.py">delete</a>(id, \*, zone_identifier) -> <a href="./src/cloudflare/types/rate_limits/rate_limit_delete_response.py">RateLimitDeleteResponse</a></code>
-- <code title="put /zones/{zone_identifier}/rate_limits/{id}">client.rate_limits.<a href="./src/cloudflare/resources/rate_limits.py">edit</a>(id, \*, zone_identifier, \*\*<a href="src/cloudflare/types/rate_limits/rate_limit_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/rate_limits/rate_limit_edit_response.py">RateLimitEditResponse</a></code>
-- <code title="get /zones/{zone_identifier}/rate_limits/{id}">client.rate_limits.<a href="./src/cloudflare/resources/rate_limits.py">get</a>(id, \*, zone_identifier) -> <a href="./src/cloudflare/types/rate_limits/rate_limit_get_response.py">RateLimitGetResponse</a></code>
+- <code title="post /zones/{zone_id}/waiting_rooms">client.waiting_rooms.<a href="./src/cloudflare/resources/waiting_rooms/waiting_rooms.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/waiting_rooms/waiting_room_create_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/waiting_room.py">WaitingRoom</a></code>
+- <code title="put /zones/{zone_id}/waiting_rooms/{waiting_room_id}">client.waiting_rooms.<a href="./src/cloudflare/resources/waiting_rooms/waiting_rooms.py">update</a>(waiting_room_id, \*, zone_id, \*\*<a href="src/cloudflare/types/waiting_rooms/waiting_room_update_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/waiting_room.py">WaitingRoom</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/waiting_rooms">client.waiting_rooms.<a href="./src/cloudflare/resources/waiting_rooms/waiting_rooms.py">list</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/waiting_rooms/waiting_room_list_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/waiting_room.py">SyncV4PagePaginationArray[WaitingRoom]</a></code>
+- <code title="delete /zones/{zone_id}/waiting_rooms/{waiting_room_id}">client.waiting_rooms.<a href="./src/cloudflare/resources/waiting_rooms/waiting_rooms.py">delete</a>(waiting_room_id, \*, zone_id) -> <a href="./src/cloudflare/types/waiting_rooms/waiting_room_delete_response.py">WaitingRoomDeleteResponse</a></code>
+- <code title="patch /zones/{zone_id}/waiting_rooms/{waiting_room_id}">client.waiting_rooms.<a href="./src/cloudflare/resources/waiting_rooms/waiting_rooms.py">edit</a>(waiting_room_id, \*, zone_id, \*\*<a href="src/cloudflare/types/waiting_rooms/waiting_room_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/waiting_room.py">WaitingRoom</a></code>
+- <code title="get /zones/{zone_id}/waiting_rooms/{waiting_room_id}">client.waiting_rooms.<a href="./src/cloudflare/resources/waiting_rooms/waiting_rooms.py">get</a>(waiting_room_id, \*, zone_id) -> <a href="./src/cloudflare/types/waiting_rooms/waiting_room.py">WaitingRoom</a></code>
 
-# SecondaryDNS
-
-## ForceAXFR
-
-Types:
-
-```python
-from cloudflare.types.secondary_dns import ForceAXFR
-```
-
-Methods:
-
-- <code title="post /zones/{zone_id}/secondary_dns/force_axfr">client.secondary_dns.force_axfr.<a href="./src/cloudflare/resources/secondary_dns/force_axfr.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/secondary_dns/force_axfr_create_params.py">params</a>) -> <a href="./src/cloudflare/types/secondary_dns/force_axfr.py">str</a></code>
-
-## Incoming
-
-Types:
-
-```python
-from cloudflare.types.secondary_dns import (
-    Incoming,
-    IncomingCreateResponse,
-    IncomingUpdateResponse,
-    IncomingDeleteResponse,
-    IncomingGetResponse,
-)
-```
-
-Methods:
-
-- <code title="post /zones/{zone_id}/secondary_dns/incoming">client.secondary_dns.incoming.<a href="./src/cloudflare/resources/secondary_dns/incoming.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/secondary_dns/incoming_create_params.py">params</a>) -> <a href="./src/cloudflare/types/secondary_dns/incoming_create_response.py">Optional</a></code>
-- <code title="put /zones/{zone_id}/secondary_dns/incoming">client.secondary_dns.incoming.<a href="./src/cloudflare/resources/secondary_dns/incoming.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/secondary_dns/incoming_update_params.py">params</a>) -> <a href="./src/cloudflare/types/secondary_dns/incoming_update_response.py">Optional</a></code>
-- <code title="delete /zones/{zone_id}/secondary_dns/incoming">client.secondary_dns.incoming.<a href="./src/cloudflare/resources/secondary_dns/incoming.py">delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/secondary_dns/incoming_delete_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/secondary_dns/incoming">client.secondary_dns.incoming.<a href="./src/cloudflare/resources/secondary_dns/incoming.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/secondary_dns/incoming_get_response.py">Optional</a></code>
-
-## Outgoing
-
-Types:
-
-```python
-from cloudflare.types.secondary_dns import (
-    DisableTransfer,
-    EnableTransfer,
-    Outgoing,
-    OutgoingStatus,
-    OutgoingCreateResponse,
-    OutgoingUpdateResponse,
-    OutgoingDeleteResponse,
-    OutgoingForceNotifyResponse,
-    OutgoingGetResponse,
-)
-```
-
-Methods:
-
-- <code title="post /zones/{zone_id}/secondary_dns/outgoing">client.secondary_dns.outgoing.<a href="./src/cloudflare/resources/secondary_dns/outgoing/outgoing.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/secondary_dns/outgoing_create_params.py">params</a>) -> <a href="./src/cloudflare/types/secondary_dns/outgoing_create_response.py">Optional</a></code>
-- <code title="put /zones/{zone_id}/secondary_dns/outgoing">client.secondary_dns.outgoing.<a href="./src/cloudflare/resources/secondary_dns/outgoing/outgoing.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/secondary_dns/outgoing_update_params.py">params</a>) -> <a href="./src/cloudflare/types/secondary_dns/outgoing_update_response.py">Optional</a></code>
-- <code title="delete /zones/{zone_id}/secondary_dns/outgoing">client.secondary_dns.outgoing.<a href="./src/cloudflare/resources/secondary_dns/outgoing/outgoing.py">delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/secondary_dns/outgoing_delete_response.py">Optional</a></code>
-- <code title="post /zones/{zone_id}/secondary_dns/outgoing/disable">client.secondary_dns.outgoing.<a href="./src/cloudflare/resources/secondary_dns/outgoing/outgoing.py">disable</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/secondary_dns/outgoing_disable_params.py">params</a>) -> <a href="./src/cloudflare/types/secondary_dns/disable_transfer.py">str</a></code>
-- <code title="post /zones/{zone_id}/secondary_dns/outgoing/enable">client.secondary_dns.outgoing.<a href="./src/cloudflare/resources/secondary_dns/outgoing/outgoing.py">enable</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/secondary_dns/outgoing_enable_params.py">params</a>) -> <a href="./src/cloudflare/types/secondary_dns/enable_transfer.py">str</a></code>
-- <code title="post /zones/{zone_id}/secondary_dns/outgoing/force_notify">client.secondary_dns.outgoing.<a href="./src/cloudflare/resources/secondary_dns/outgoing/outgoing.py">force_notify</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/secondary_dns/outgoing_force_notify_params.py">params</a>) -> <a href="./src/cloudflare/types/secondary_dns/outgoing_force_notify_response.py">str</a></code>
-- <code title="get /zones/{zone_id}/secondary_dns/outgoing">client.secondary_dns.outgoing.<a href="./src/cloudflare/resources/secondary_dns/outgoing/outgoing.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/secondary_dns/outgoing_get_response.py">Optional</a></code>
-
-### Status
-
-Methods:
-
-- <code title="get /zones/{zone_id}/secondary_dns/outgoing/status">client.secondary_dns.outgoing.status.<a href="./src/cloudflare/resources/secondary_dns/outgoing/status.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/secondary_dns/enable_transfer.py">str</a></code>
-
-## ACLs
-
-Types:
-
-```python
-from cloudflare.types.secondary_dns import ACL, ACLDeleteResponse
-```
-
-Methods:
-
-- <code title="post /accounts/{account_id}/secondary_dns/acls">client.secondary_dns.acls.<a href="./src/cloudflare/resources/secondary_dns/acls.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/secondary_dns/acl_create_params.py">params</a>) -> <a href="./src/cloudflare/types/secondary_dns/acl.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/secondary_dns/acls/{acl_id}">client.secondary_dns.acls.<a href="./src/cloudflare/resources/secondary_dns/acls.py">update</a>(acl_id, \*, account_id, \*\*<a href="src/cloudflare/types/secondary_dns/acl_update_params.py">params</a>) -> <a href="./src/cloudflare/types/secondary_dns/acl.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/secondary_dns/acls">client.secondary_dns.acls.<a href="./src/cloudflare/resources/secondary_dns/acls.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/secondary_dns/acl.py">SyncSinglePage[ACL]</a></code>
-- <code title="delete /accounts/{account_id}/secondary_dns/acls/{acl_id}">client.secondary_dns.acls.<a href="./src/cloudflare/resources/secondary_dns/acls.py">delete</a>(acl_id, \*, account_id) -> <a href="./src/cloudflare/types/secondary_dns/acl_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/secondary_dns/acls/{acl_id}">client.secondary_dns.acls.<a href="./src/cloudflare/resources/secondary_dns/acls.py">get</a>(acl_id, \*, account_id) -> <a href="./src/cloudflare/types/secondary_dns/acl.py">Optional</a></code>
-
-## Peers
-
-Types:
-
-```python
-from cloudflare.types.secondary_dns import Peer, PeerDeleteResponse
-```
-
-Methods:
-
-- <code title="post /accounts/{account_id}/secondary_dns/peers">client.secondary_dns.peers.<a href="./src/cloudflare/resources/secondary_dns/peers.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/secondary_dns/peer_create_params.py">params</a>) -> <a href="./src/cloudflare/types/secondary_dns/peer.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/secondary_dns/peers/{peer_id}">client.secondary_dns.peers.<a href="./src/cloudflare/resources/secondary_dns/peers.py">update</a>(peer_id, \*, account_id, \*\*<a href="src/cloudflare/types/secondary_dns/peer_update_params.py">params</a>) -> <a href="./src/cloudflare/types/secondary_dns/peer.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/secondary_dns/peers">client.secondary_dns.peers.<a href="./src/cloudflare/resources/secondary_dns/peers.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/secondary_dns/peer.py">SyncSinglePage[Peer]</a></code>
-- <code title="delete /accounts/{account_id}/secondary_dns/peers/{peer_id}">client.secondary_dns.peers.<a href="./src/cloudflare/resources/secondary_dns/peers.py">delete</a>(peer_id, \*, account_id) -> <a href="./src/cloudflare/types/secondary_dns/peer_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/secondary_dns/peers/{peer_id}">client.secondary_dns.peers.<a href="./src/cloudflare/resources/secondary_dns/peers.py">get</a>(peer_id, \*, account_id) -> <a href="./src/cloudflare/types/secondary_dns/peer.py">Optional</a></code>
-
-## TSIGs
-
-Types:
-
-```python
-from cloudflare.types.secondary_dns import TSIG, TSIGDeleteResponse
-```
-
-Methods:
-
-- <code title="post /accounts/{account_id}/secondary_dns/tsigs">client.secondary_dns.tsigs.<a href="./src/cloudflare/resources/secondary_dns/tsigs.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/secondary_dns/tsig_create_params.py">params</a>) -> <a href="./src/cloudflare/types/secondary_dns/tsig.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/secondary_dns/tsigs/{tsig_id}">client.secondary_dns.tsigs.<a href="./src/cloudflare/resources/secondary_dns/tsigs.py">update</a>(tsig_id, \*, account_id, \*\*<a href="src/cloudflare/types/secondary_dns/tsig_update_params.py">params</a>) -> <a href="./src/cloudflare/types/secondary_dns/tsig.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/secondary_dns/tsigs">client.secondary_dns.tsigs.<a href="./src/cloudflare/resources/secondary_dns/tsigs.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/secondary_dns/tsig.py">SyncSinglePage[TSIG]</a></code>
-- <code title="delete /accounts/{account_id}/secondary_dns/tsigs/{tsig_id}">client.secondary_dns.tsigs.<a href="./src/cloudflare/resources/secondary_dns/tsigs.py">delete</a>(tsig_id, \*, account_id) -> <a href="./src/cloudflare/types/secondary_dns/tsig_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/secondary_dns/tsigs/{tsig_id}">client.secondary_dns.tsigs.<a href="./src/cloudflare/resources/secondary_dns/tsigs.py">get</a>(tsig_id, \*, account_id) -> <a href="./src/cloudflare/types/secondary_dns/tsig.py">Optional</a></code>
-
-# WaitingRooms
-
-Types:
-
-```python
-from cloudflare.types.waiting_rooms import (
-    AdditionalRoutes,
-    CookieAttributes,
-    Query,
-    WaitingRoom,
-    WaitingRoomDeleteResponse,
-)
-```
-
-Methods:
-
-- <code title="post /zones/{zone_id}/waiting_rooms">client.waiting_rooms.<a href="./src/cloudflare/resources/waiting_rooms/waiting_rooms.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/waiting_rooms/waiting_room_create_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/waiting_room.py">WaitingRoom</a></code>
-- <code title="put /zones/{zone_id}/waiting_rooms/{waiting_room_id}">client.waiting_rooms.<a href="./src/cloudflare/resources/waiting_rooms/waiting_rooms.py">update</a>(waiting_room_id, \*, zone_id, \*\*<a href="src/cloudflare/types/waiting_rooms/waiting_room_update_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/waiting_room.py">WaitingRoom</a></code>
-- <code title="get /zones/{zone_id}/waiting_rooms">client.waiting_rooms.<a href="./src/cloudflare/resources/waiting_rooms/waiting_rooms.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/waiting_rooms/waiting_room_list_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/waiting_room.py">SyncSinglePage[WaitingRoom]</a></code>
-- <code title="delete /zones/{zone_id}/waiting_rooms/{waiting_room_id}">client.waiting_rooms.<a href="./src/cloudflare/resources/waiting_rooms/waiting_rooms.py">delete</a>(waiting_room_id, \*, zone_id) -> <a href="./src/cloudflare/types/waiting_rooms/waiting_room_delete_response.py">WaitingRoomDeleteResponse</a></code>
-- <code title="patch /zones/{zone_id}/waiting_rooms/{waiting_room_id}">client.waiting_rooms.<a href="./src/cloudflare/resources/waiting_rooms/waiting_rooms.py">edit</a>(waiting_room_id, \*, zone_id, \*\*<a href="src/cloudflare/types/waiting_rooms/waiting_room_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/waiting_room.py">WaitingRoom</a></code>
-- <code title="get /zones/{zone_id}/waiting_rooms/{waiting_room_id}">client.waiting_rooms.<a href="./src/cloudflare/resources/waiting_rooms/waiting_rooms.py">get</a>(waiting_room_id, \*, zone_id) -> <a href="./src/cloudflare/types/waiting_rooms/waiting_room.py">WaitingRoom</a></code>
-
-## Page
+## Page
 
 Types:
 
@@ -1900,7 +2211,7 @@ Methods:
 
 - <code title="post /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events">client.waiting_rooms.events.<a href="./src/cloudflare/resources/waiting_rooms/events/events.py">create</a>(waiting_room_id, \*, zone_id, \*\*<a href="src/cloudflare/types/waiting_rooms/event_create_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/event.py">Event</a></code>
 - <code title="put /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events/{event_id}">client.waiting_rooms.events.<a href="./src/cloudflare/resources/waiting_rooms/events/events.py">update</a>(event_id, \*, zone_id, waiting_room_id, \*\*<a href="src/cloudflare/types/waiting_rooms/event_update_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/event.py">Event</a></code>
-- <code title="get /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events">client.waiting_rooms.events.<a href="./src/cloudflare/resources/waiting_rooms/events/events.py">list</a>(waiting_room_id, \*, zone_id, \*\*<a href="src/cloudflare/types/waiting_rooms/event_list_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/event.py">SyncSinglePage[Event]</a></code>
+- <code title="get /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events">client.waiting_rooms.events.<a href="./src/cloudflare/resources/waiting_rooms/events/events.py">list</a>(waiting_room_id, \*, zone_id, \*\*<a href="src/cloudflare/types/waiting_rooms/event_list_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/event.py">SyncV4PagePaginationArray[Event]</a></code>
 - <code title="delete /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events/{event_id}">client.waiting_rooms.events.<a href="./src/cloudflare/resources/waiting_rooms/events/events.py">delete</a>(event_id, \*, zone_id, waiting_room_id) -> <a href="./src/cloudflare/types/waiting_rooms/event_delete_response.py">EventDeleteResponse</a></code>
 - <code title="patch /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events/{event_id}">client.waiting_rooms.events.<a href="./src/cloudflare/resources/waiting_rooms/events/events.py">edit</a>(event_id, \*, zone_id, waiting_room_id, \*\*<a href="src/cloudflare/types/waiting_rooms/event_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/event.py">Event</a></code>
 - <code title="get /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events/{event_id}">client.waiting_rooms.events.<a href="./src/cloudflare/resources/waiting_rooms/events/events.py">get</a>(event_id, \*, zone_id, waiting_room_id) -> <a href="./src/cloudflare/types/waiting_rooms/event.py">Event</a></code>
@@ -1922,22 +2233,16 @@ Methods:
 Types:
 
 ```python
-from cloudflare.types.waiting_rooms import (
-    WaitingRoomRule,
-    RuleCreateResponse,
-    RuleUpdateResponse,
-    RuleDeleteResponse,
-    RuleEditResponse,
-)
+from cloudflare.types.waiting_rooms import WaitingRoomRule
 ```
 
 Methods:
 
-- <code title="post /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules">client.waiting_rooms.rules.<a href="./src/cloudflare/resources/waiting_rooms/rules.py">create</a>(waiting_room_id, \*, zone_id, \*\*<a href="src/cloudflare/types/waiting_rooms/rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/rule_create_response.py">Optional</a></code>
-- <code title="put /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules">client.waiting_rooms.rules.<a href="./src/cloudflare/resources/waiting_rooms/rules.py">update</a>(waiting_room_id, \*, zone_id, \*\*<a href="src/cloudflare/types/waiting_rooms/rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/rule_update_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules">client.waiting_rooms.rules.<a href="./src/cloudflare/resources/waiting_rooms/rules.py">list</a>(waiting_room_id, \*, zone_id) -> <a href="./src/cloudflare/types/waiting_rooms/waiting_room_rule.py">SyncSinglePage[WaitingRoomRule]</a></code>
-- <code title="delete /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules/{rule_id}">client.waiting_rooms.rules.<a href="./src/cloudflare/resources/waiting_rooms/rules.py">delete</a>(rule_id, \*, zone_id, waiting_room_id) -> <a href="./src/cloudflare/types/waiting_rooms/rule_delete_response.py">Optional</a></code>
-- <code title="patch /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules/{rule_id}">client.waiting_rooms.rules.<a href="./src/cloudflare/resources/waiting_rooms/rules.py">edit</a>(rule_id, \*, zone_id, waiting_room_id, \*\*<a href="src/cloudflare/types/waiting_rooms/rule_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/rule_edit_response.py">Optional</a></code>
+- <code title="post /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules">client.waiting_rooms.rules.<a href="./src/cloudflare/resources/waiting_rooms/rules.py">create</a>(waiting_room_id, \*, zone_id, \*\*<a href="src/cloudflare/types/waiting_rooms/rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/waiting_room_rule.py">SyncSinglePage[WaitingRoomRule]</a></code>
+- <code title="put /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules">client.waiting_rooms.rules.<a href="./src/cloudflare/resources/waiting_rooms/rules.py">update</a>(waiting_room_id, \*, zone_id, \*\*<a href="src/cloudflare/types/waiting_rooms/rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/waiting_room_rule.py">SyncSinglePage[WaitingRoomRule]</a></code>
+- <code title="delete /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules/{rule_id}">client.waiting_rooms.rules.<a href="./src/cloudflare/resources/waiting_rooms/rules.py">delete</a>(rule_id, \*, zone_id, waiting_room_id) -> <a href="./src/cloudflare/types/waiting_rooms/waiting_room_rule.py">SyncSinglePage[WaitingRoomRule]</a></code>
+- <code title="patch /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules/{rule_id}">client.waiting_rooms.rules.<a href="./src/cloudflare/resources/waiting_rooms/rules.py">edit</a>(rule_id, \*, zone_id, waiting_room_id, \*\*<a href="src/cloudflare/types/waiting_rooms/rule_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/waiting_rooms/waiting_room_rule.py">SyncSinglePage[WaitingRoomRule]</a></code>
+- <code title="get /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules">client.waiting_rooms.rules.<a href="./src/cloudflare/resources/waiting_rooms/rules.py">get</a>(waiting_room_id, \*, zone_id) -> <a href="./src/cloudflare/types/waiting_rooms/waiting_room_rule.py">SyncSinglePage[WaitingRoomRule]</a></code>
 
 ## Statuses
 
@@ -1982,11 +2287,11 @@ from cloudflare.types.web3 import Hostname, HostnameDeleteResponse
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/web3/hostnames">client.web3.hostnames.<a href="./src/cloudflare/resources/web3/hostnames/hostnames.py">create</a>(zone_identifier, \*\*<a href="src/cloudflare/types/web3/hostname_create_params.py">params</a>) -> <a href="./src/cloudflare/types/web3/hostname.py">Hostname</a></code>
-- <code title="get /zones/{zone_identifier}/web3/hostnames">client.web3.hostnames.<a href="./src/cloudflare/resources/web3/hostnames/hostnames.py">list</a>(zone_identifier) -> <a href="./src/cloudflare/types/web3/hostname.py">SyncSinglePage[Hostname]</a></code>
-- <code title="delete /zones/{zone_identifier}/web3/hostnames/{identifier}">client.web3.hostnames.<a href="./src/cloudflare/resources/web3/hostnames/hostnames.py">delete</a>(identifier, \*, zone_identifier) -> <a href="./src/cloudflare/types/web3/hostname_delete_response.py">Optional</a></code>
-- <code title="patch /zones/{zone_identifier}/web3/hostnames/{identifier}">client.web3.hostnames.<a href="./src/cloudflare/resources/web3/hostnames/hostnames.py">edit</a>(identifier, \*, zone_identifier, \*\*<a href="src/cloudflare/types/web3/hostname_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/web3/hostname.py">Hostname</a></code>
-- <code title="get /zones/{zone_identifier}/web3/hostnames/{identifier}">client.web3.hostnames.<a href="./src/cloudflare/resources/web3/hostnames/hostnames.py">get</a>(identifier, \*, zone_identifier) -> <a href="./src/cloudflare/types/web3/hostname.py">Hostname</a></code>
+- <code title="post /zones/{zone_id}/web3/hostnames">client.web3.hostnames.<a href="./src/cloudflare/resources/web3/hostnames/hostnames.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/web3/hostname_create_params.py">params</a>) -> <a href="./src/cloudflare/types/web3/hostname.py">Hostname</a></code>
+- <code title="get /zones/{zone_id}/web3/hostnames">client.web3.hostnames.<a href="./src/cloudflare/resources/web3/hostnames/hostnames.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/web3/hostname.py">SyncSinglePage[Hostname]</a></code>
+- <code title="delete /zones/{zone_id}/web3/hostnames/{identifier}">client.web3.hostnames.<a href="./src/cloudflare/resources/web3/hostnames/hostnames.py">delete</a>(identifier, \*, zone_id) -> <a href="./src/cloudflare/types/web3/hostname_delete_response.py">Optional[HostnameDeleteResponse]</a></code>
+- <code title="patch /zones/{zone_id}/web3/hostnames/{identifier}">client.web3.hostnames.<a href="./src/cloudflare/resources/web3/hostnames/hostnames.py">edit</a>(identifier, \*, zone_id, \*\*<a href="src/cloudflare/types/web3/hostname_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/web3/hostname.py">Hostname</a></code>
+- <code title="get /zones/{zone_id}/web3/hostnames/{identifier}">client.web3.hostnames.<a href="./src/cloudflare/resources/web3/hostnames/hostnames.py">get</a>(identifier, \*, zone_id) -> <a href="./src/cloudflare/types/web3/hostname.py">Hostname</a></code>
 
 ### IPFSUniversalPaths
 
@@ -2000,8 +2305,8 @@ from cloudflare.types.web3.hostnames.ipfs_universal_paths import ContentList
 
 Methods:
 
-- <code title="put /zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list">client.web3.hostnames.ipfs_universal_paths.content_lists.<a href="./src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/content_lists.py">update</a>(identifier, \*, zone_identifier, \*\*<a href="src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_list_update_params.py">params</a>) -> <a href="./src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_list.py">ContentList</a></code>
-- <code title="get /zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list">client.web3.hostnames.ipfs_universal_paths.content_lists.<a href="./src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/content_lists.py">get</a>(identifier, \*, zone_identifier) -> <a href="./src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_list.py">ContentList</a></code>
+- <code title="put /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list">client.web3.hostnames.ipfs_universal_paths.content_lists.<a href="./src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/content_lists.py">update</a>(identifier, \*, zone_id, \*\*<a href="src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_list_update_params.py">params</a>) -> <a href="./src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_list.py">ContentList</a></code>
+- <code title="get /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list">client.web3.hostnames.ipfs_universal_paths.content_lists.<a href="./src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/content_lists.py">get</a>(identifier, \*, zone_id) -> <a href="./src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_list.py">ContentList</a></code>
 
 ##### Entries
 
@@ -2019,87 +2324,157 @@ from cloudflare.types.web3.hostnames.ipfs_universal_paths.content_lists import (
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries">client.web3.hostnames.ipfs_universal_paths.content_lists.entries.<a href="./src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py">create</a>(identifier, \*, zone_identifier, \*\*<a href="src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_create_params.py">params</a>) -> <a href="./src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_create_response.py">EntryCreateResponse</a></code>
-- <code title="put /zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}">client.web3.hostnames.ipfs_universal_paths.content_lists.entries.<a href="./src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py">update</a>(content_list_entry_identifier, \*, zone_identifier, identifier, \*\*<a href="src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_update_params.py">params</a>) -> <a href="./src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_update_response.py">EntryUpdateResponse</a></code>
-- <code title="get /zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries">client.web3.hostnames.ipfs_universal_paths.content_lists.entries.<a href="./src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py">list</a>(identifier, \*, zone_identifier) -> <a href="./src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_list_response.py">Optional</a></code>
-- <code title="delete /zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}">client.web3.hostnames.ipfs_universal_paths.content_lists.entries.<a href="./src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py">delete</a>(content_list_entry_identifier, \*, zone_identifier, identifier) -> <a href="./src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_delete_response.py">Optional</a></code>
-- <code title="get /zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}">client.web3.hostnames.ipfs_universal_paths.content_lists.entries.<a href="./src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py">get</a>(content_list_entry_identifier, \*, zone_identifier, identifier) -> <a href="./src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_get_response.py">EntryGetResponse</a></code>
+- <code title="post /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries">client.web3.hostnames.ipfs_universal_paths.content_lists.entries.<a href="./src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py">create</a>(identifier, \*, zone_id, \*\*<a href="src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_create_params.py">params</a>) -> <a href="./src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_create_response.py">EntryCreateResponse</a></code>
+- <code title="put /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}">client.web3.hostnames.ipfs_universal_paths.content_lists.entries.<a href="./src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py">update</a>(content_list_entry_identifier, \*, zone_id, identifier, \*\*<a href="src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_update_params.py">params</a>) -> <a href="./src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_update_response.py">EntryUpdateResponse</a></code>
+- <code title="get /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries">client.web3.hostnames.ipfs_universal_paths.content_lists.entries.<a href="./src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py">list</a>(identifier, \*, zone_id) -> <a href="./src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_list_response.py">Optional[EntryListResponse]</a></code>
+- <code title="delete /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}">client.web3.hostnames.ipfs_universal_paths.content_lists.entries.<a href="./src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py">delete</a>(content_list_entry_identifier, \*, zone_id, identifier) -> <a href="./src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_delete_response.py">Optional[EntryDeleteResponse]</a></code>
+- <code title="get /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}">client.web3.hostnames.ipfs_universal_paths.content_lists.entries.<a href="./src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py">get</a>(content_list_entry_identifier, \*, zone_id, identifier) -> <a href="./src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_get_response.py">EntryGetResponse</a></code>
 
 # Workers
 
 Types:
 
+```python
+from cloudflare.types.workers import MigrationStep, SingleStepMigration, WorkerMetadata
+```
+
+## Beta
+
+### Workers
+
+Types:
+
+```python
+from cloudflare.types.workers.beta import Worker, WorkerDeleteResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/workers/workers">client.workers.beta.workers.<a href="./src/cloudflare/resources/workers/beta/workers/workers.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workers/beta/worker_create_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/beta/worker.py">Worker</a></code>
+- <code title="put /accounts/{account_id}/workers/workers/{worker_id}">client.workers.beta.workers.<a href="./src/cloudflare/resources/workers/beta/workers/workers.py">update</a>(worker_id, \*, account_id, \*\*<a href="src/cloudflare/types/workers/beta/worker_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/beta/worker.py">Worker</a></code>
+- <code title="get /accounts/{account_id}/workers/workers">client.workers.beta.workers.<a href="./src/cloudflare/resources/workers/beta/workers/workers.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workers/beta/worker_list_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/beta/worker.py">SyncV4PagePaginationArray[Worker]</a></code>
+- <code title="delete /accounts/{account_id}/workers/workers/{worker_id}">client.workers.beta.workers.<a href="./src/cloudflare/resources/workers/beta/workers/workers.py">delete</a>(worker_id, \*, account_id) -> <a href="./src/cloudflare/types/workers/beta/worker_delete_response.py">WorkerDeleteResponse</a></code>
+- <code title="patch /accounts/{account_id}/workers/workers/{worker_id}">client.workers.beta.workers.<a href="./src/cloudflare/resources/workers/beta/workers/workers.py">edit</a>(worker_id, \*, account_id, \*\*<a href="src/cloudflare/types/workers/beta/worker_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/beta/worker.py">Worker</a></code>
+- <code title="get /accounts/{account_id}/workers/workers/{worker_id}">client.workers.beta.workers.<a href="./src/cloudflare/resources/workers/beta/workers/workers.py">get</a>(worker_id, \*, account_id) -> <a href="./src/cloudflare/types/workers/beta/worker.py">Worker</a></code>
+
+#### Versions
+
+Types:
+
+```python
+from cloudflare.types.workers.beta.workers import Version, VersionDeleteResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/workers/workers/{worker_id}/versions">client.workers.beta.workers.versions.<a href="./src/cloudflare/resources/workers/beta/workers/versions.py">create</a>(worker_id, \*, account_id, \*\*<a href="src/cloudflare/types/workers/beta/workers/version_create_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/beta/workers/version.py">Version</a></code>
+- <code title="get /accounts/{account_id}/workers/workers/{worker_id}/versions">client.workers.beta.workers.versions.<a href="./src/cloudflare/resources/workers/beta/workers/versions.py">list</a>(worker_id, \*, account_id, \*\*<a href="src/cloudflare/types/workers/beta/workers/version_list_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/beta/workers/version.py">SyncV4PagePaginationArray[Version]</a></code>
+- <code title="delete /accounts/{account_id}/workers/workers/{worker_id}/versions/{version_id}">client.workers.beta.workers.versions.<a href="./src/cloudflare/resources/workers/beta/workers/versions.py">delete</a>(version_id, \*, account_id, worker_id) -> <a href="./src/cloudflare/types/workers/beta/workers/version_delete_response.py">VersionDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/workers/workers/{worker_id}/versions/{version_id}">client.workers.beta.workers.versions.<a href="./src/cloudflare/resources/workers/beta/workers/versions.py">get</a>(version_id, \*, account_id, worker_id, \*\*<a href="src/cloudflare/types/workers/beta/workers/version_get_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/beta/workers/version.py">Version</a></code>
+
+## Routes
+
+Types:
+
 ```python
 from cloudflare.types.workers import (
-    Binding,
-    D1Binding,
-    DispatchNamespaceBinding,
-    DurableObjectBinding,
-    KVNamespaceBinding,
-    MigrationStep,
-    MTLSCERTBinding,
-    PlacementConfiguration,
-    R2Binding,
-    ServiceBinding,
-    SingleStepMigration,
-    SteppedMigration,
-    WorkerMetadata,
+    RouteCreateResponse,
+    RouteUpdateResponse,
+    RouteListResponse,
+    RouteDeleteResponse,
+    RouteGetResponse,
 )
 ```
 
-## AI
+Methods:
+
+- <code title="post /zones/{zone_id}/workers/routes">client.workers.routes.<a href="./src/cloudflare/resources/workers/routes.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/workers/route_create_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/route_create_response.py">RouteCreateResponse</a></code>
+- <code title="put /zones/{zone_id}/workers/routes/{route_id}">client.workers.routes.<a href="./src/cloudflare/resources/workers/routes.py">update</a>(route_id, \*, zone_id, \*\*<a href="src/cloudflare/types/workers/route_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/route_update_response.py">RouteUpdateResponse</a></code>
+- <code title="get /zones/{zone_id}/workers/routes">client.workers.routes.<a href="./src/cloudflare/resources/workers/routes.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/workers/route_list_response.py">SyncSinglePage[RouteListResponse]</a></code>
+- <code title="delete /zones/{zone_id}/workers/routes/{route_id}">client.workers.routes.<a href="./src/cloudflare/resources/workers/routes.py">delete</a>(route_id, \*, zone_id) -> <a href="./src/cloudflare/types/workers/route_delete_response.py">RouteDeleteResponse</a></code>
+- <code title="get /zones/{zone_id}/workers/routes/{route_id}">client.workers.routes.<a href="./src/cloudflare/resources/workers/routes.py">get</a>(route_id, \*, zone_id) -> <a href="./src/cloudflare/types/workers/route_get_response.py">RouteGetResponse</a></code>
+
+## Assets
+
+### Upload
+
+Types:
+
+```python
+from cloudflare.types.workers.assets import UploadCreateResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/workers/assets/upload">client.workers.assets.upload.<a href="./src/cloudflare/resources/workers/assets/upload.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workers/assets/upload_create_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/assets/upload_create_response.py">Optional[UploadCreateResponse]</a></code>
+
+## Scripts
 
 Types:
 
 ```python
-from cloudflare.types.workers import AIRunResponse
+from cloudflare.types.workers import (
+    Script,
+    ScriptSetting,
+    ScriptUpdateResponse,
+    ScriptListResponse,
+    ScriptGetResponse,
+    ScriptSearchResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/ai/run/{model_name}">client.workers.ai.<a href="./src/cloudflare/resources/workers/ai/ai.py">run</a>(model_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/ai_run_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/ai_run_response.py">Optional</a></code>
+- <code title="put /accounts/{account_id}/workers/scripts/{script_name}">client.workers.scripts.<a href="./src/cloudflare/resources/workers/scripts/scripts.py">update</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/script_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/script_update_response.py">ScriptUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/workers/scripts">client.workers.scripts.<a href="./src/cloudflare/resources/workers/scripts/scripts.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workers/script_list_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/script_list_response.py">SyncSinglePage[ScriptListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/workers/scripts/{script_name}">client.workers.scripts.<a href="./src/cloudflare/resources/workers/scripts/scripts.py">delete</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/script_delete_params.py">params</a>) -> object</code>
+- <code title="get /accounts/{account_id}/workers/scripts/{script_name}">client.workers.scripts.<a href="./src/cloudflare/resources/workers/scripts/scripts.py">get</a>(script_name, \*, account_id) -> str</code>
+- <code title="get /accounts/{account_id}/workers/scripts-search">client.workers.scripts.<a href="./src/cloudflare/resources/workers/scripts/scripts.py">search</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workers/script_search_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/script_search_response.py">ScriptSearchResponse</a></code>
 
-### Models
+### Assets
 
-#### Schema
+#### Upload
 
 Types:
 
 ```python
-from cloudflare.types.workers.ai.models import SchemaGetResponse
+from cloudflare.types.workers.scripts.assets import UploadCreateResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/ai/models/schema">client.workers.ai.models.schema.<a href="./src/cloudflare/resources/workers/ai/models/schema.py">get</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workers/ai/models/schema_get_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/ai/models/schema_get_response.py">object</a></code>
+- <code title="post /accounts/{account_id}/workers/scripts/{script_name}/assets-upload-session">client.workers.scripts.assets.upload.<a href="./src/cloudflare/resources/workers/scripts/assets/upload.py">create</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/scripts/assets/upload_create_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/scripts/assets/upload_create_response.py">Optional[UploadCreateResponse]</a></code>
 
-## Scripts
+### Subdomain
 
 Types:
 
 ```python
-from cloudflare.types.workers import Script, ScriptSetting
+from cloudflare.types.workers.scripts import (
+    SubdomainCreateResponse,
+    SubdomainDeleteResponse,
+    SubdomainGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/workers/scripts/{script_name}">client.workers.scripts.<a href="./src/cloudflare/resources/workers/scripts/scripts.py">update</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/script_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/script.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/workers/scripts">client.workers.scripts.<a href="./src/cloudflare/resources/workers/scripts/scripts.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/workers/script.py">SyncSinglePage[Script]</a></code>
-- <code title="delete /accounts/{account_id}/workers/scripts/{script_name}">client.workers.scripts.<a href="./src/cloudflare/resources/workers/scripts/scripts.py">delete</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/script_delete_params.py">params</a>) -> None</code>
-- <code title="get /accounts/{account_id}/workers/scripts/{script_name}">client.workers.scripts.<a href="./src/cloudflare/resources/workers/scripts/scripts.py">get</a>(script_name, \*, account_id) -> BinaryAPIResponse</code>
+- <code title="post /accounts/{account_id}/workers/scripts/{script_name}/subdomain">client.workers.scripts.subdomain.<a href="./src/cloudflare/resources/workers/scripts/subdomain.py">create</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/scripts/subdomain_create_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/scripts/subdomain_create_response.py">SubdomainCreateResponse</a></code>
+- <code title="delete /accounts/{account_id}/workers/scripts/{script_name}/subdomain">client.workers.scripts.subdomain.<a href="./src/cloudflare/resources/workers/scripts/subdomain.py">delete</a>(script_name, \*, account_id) -> <a href="./src/cloudflare/types/workers/scripts/subdomain_delete_response.py">SubdomainDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/workers/scripts/{script_name}/subdomain">client.workers.scripts.subdomain.<a href="./src/cloudflare/resources/workers/scripts/subdomain.py">get</a>(script_name, \*, account_id) -> <a href="./src/cloudflare/types/workers/scripts/subdomain_get_response.py">SubdomainGetResponse</a></code>
 
 ### Schedules
 
 Types:
 
 ```python
-from cloudflare.types.workers.scripts import Schedule, ScheduleUpdateResponse, ScheduleGetResponse
+from cloudflare.types.workers.scripts import ScheduleUpdateResponse, ScheduleGetResponse
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/workers/scripts/{script_name}/schedules">client.workers.scripts.schedules.<a href="./src/cloudflare/resources/workers/scripts/schedules.py">update</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/scripts/schedule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/scripts/schedule_update_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/workers/scripts/{script_name}/schedules">client.workers.scripts.schedules.<a href="./src/cloudflare/resources/workers/scripts/schedules.py">get</a>(script_name, \*, account_id) -> <a href="./src/cloudflare/types/workers/scripts/schedule_get_response.py">Optional</a></code>
+- <code title="put /accounts/{account_id}/workers/scripts/{script_name}/schedules">client.workers.scripts.schedules.<a href="./src/cloudflare/resources/workers/scripts/schedules.py">update</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/scripts/schedule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/scripts/schedule_update_response.py">ScheduleUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/workers/scripts/{script_name}/schedules">client.workers.scripts.schedules.<a href="./src/cloudflare/resources/workers/scripts/schedules.py">get</a>(script_name, \*, account_id) -> <a href="./src/cloudflare/types/workers/scripts/schedule_get_response.py">ScheduleGetResponse</a></code>
 
 ### Tail
 
@@ -2116,23 +2491,23 @@ from cloudflare.types.workers.scripts import (
 
 Methods:
 
-- <code title="post /accounts/{account_id}/workers/scripts/{script_name}/tails">client.workers.scripts.tail.<a href="./src/cloudflare/resources/workers/scripts/tail.py">create</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/scripts/tail_create_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/scripts/tail_create_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/workers/scripts/{script_name}/tails">client.workers.scripts.tail.<a href="./src/cloudflare/resources/workers/scripts/tail.py">create</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/scripts/tail_create_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/scripts/tail_create_response.py">TailCreateResponse</a></code>
 - <code title="delete /accounts/{account_id}/workers/scripts/{script_name}/tails/{id}">client.workers.scripts.tail.<a href="./src/cloudflare/resources/workers/scripts/tail.py">delete</a>(id, \*, account_id, script_name) -> <a href="./src/cloudflare/types/workers/scripts/tail_delete_response.py">TailDeleteResponse</a></code>
-- <code title="get /accounts/{account_id}/workers/scripts/{script_name}/tails">client.workers.scripts.tail.<a href="./src/cloudflare/resources/workers/scripts/tail.py">get</a>(script_name, \*, account_id) -> <a href="./src/cloudflare/types/workers/scripts/tail_get_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/workers/scripts/{script_name}/tails">client.workers.scripts.tail.<a href="./src/cloudflare/resources/workers/scripts/tail.py">get</a>(script_name, \*, account_id) -> <a href="./src/cloudflare/types/workers/scripts/tail_get_response.py">TailGetResponse</a></code>
 
 ### Content
 
 Methods:
 
-- <code title="put /accounts/{account_id}/workers/scripts/{script_name}/content">client.workers.scripts.content.<a href="./src/cloudflare/resources/workers/scripts/content.py">update</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/scripts/content_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/script.py">Optional</a></code>
+- <code title="put /accounts/{account_id}/workers/scripts/{script_name}/content">client.workers.scripts.content.<a href="./src/cloudflare/resources/workers/scripts/content.py">update</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/scripts/content_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/script.py">Script</a></code>
 - <code title="get /accounts/{account_id}/workers/scripts/{script_name}/content/v2">client.workers.scripts.content.<a href="./src/cloudflare/resources/workers/scripts/content.py">get</a>(script_name, \*, account_id) -> BinaryAPIResponse</code>
 
 ### Settings
 
 Methods:
 
-- <code title="patch /accounts/{account_id}/workers/scripts/{script_name}/script-settings">client.workers.scripts.settings.<a href="./src/cloudflare/resources/workers/scripts/settings.py">edit</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/scripts/setting_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/script_setting.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/workers/scripts/{script_name}/script-settings">client.workers.scripts.settings.<a href="./src/cloudflare/resources/workers/scripts/settings.py">get</a>(script_name, \*, account_id) -> <a href="./src/cloudflare/types/workers/script_setting.py">Optional</a></code>
+- <code title="patch /accounts/{account_id}/workers/scripts/{script_name}/script-settings">client.workers.scripts.settings.<a href="./src/cloudflare/resources/workers/scripts/settings.py">edit</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/scripts/setting_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/script_setting.py">ScriptSetting</a></code>
+- <code title="get /accounts/{account_id}/workers/scripts/{script_name}/script-settings">client.workers.scripts.settings.<a href="./src/cloudflare/resources/workers/scripts/settings.py">get</a>(script_name, \*, account_id) -> <a href="./src/cloudflare/types/workers/script_setting.py">ScriptSetting</a></code>
 
 ### Deployments
 
@@ -2141,15 +2516,17 @@ Types:
 ```python
 from cloudflare.types.workers.scripts import (
     Deployment,
-    DeploymentCreateResponse,
-    DeploymentGetResponse,
+    DeploymentListResponse,
+    DeploymentDeleteResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/workers/scripts/{script_name}/deployments">client.workers.scripts.deployments.<a href="./src/cloudflare/resources/workers/scripts/deployments.py">create</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/scripts/deployment_create_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/scripts/deployment_create_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/workers/scripts/{script_name}/deployments">client.workers.scripts.deployments.<a href="./src/cloudflare/resources/workers/scripts/deployments.py">get</a>(script_name, \*, account_id) -> <a href="./src/cloudflare/types/workers/scripts/deployment_get_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/workers/scripts/{script_name}/deployments">client.workers.scripts.deployments.<a href="./src/cloudflare/resources/workers/scripts/deployments.py">create</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/scripts/deployment_create_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/scripts/deployment.py">Deployment</a></code>
+- <code title="get /accounts/{account_id}/workers/scripts/{script_name}/deployments">client.workers.scripts.deployments.<a href="./src/cloudflare/resources/workers/scripts/deployments.py">list</a>(script_name, \*, account_id) -> <a href="./src/cloudflare/types/workers/scripts/deployment_list_response.py">DeploymentListResponse</a></code>
+- <code title="delete /accounts/{account_id}/workers/scripts/{script_name}/deployments/{deployment_id}">client.workers.scripts.deployments.<a href="./src/cloudflare/resources/workers/scripts/deployments.py">delete</a>(deployment_id, \*, account_id, script_name) -> <a href="./src/cloudflare/types/workers/scripts/deployment_delete_response.py">DeploymentDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/workers/scripts/{script_name}/deployments/{deployment_id}">client.workers.scripts.deployments.<a href="./src/cloudflare/resources/workers/scripts/deployments.py">get</a>(deployment_id, \*, account_id, script_name) -> <a href="./src/cloudflare/types/workers/scripts/deployment.py">Deployment</a></code>
 
 ### Versions
 
@@ -2165,9 +2542,44 @@ from cloudflare.types.workers.scripts import (
 
 Methods:
 
-- <code title="post /accounts/{account_id}/workers/scripts/{script_name}/versions">client.workers.scripts.versions.<a href="./src/cloudflare/resources/workers/scripts/versions.py">create</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/scripts/version_create_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/scripts/version_create_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/workers/scripts/{script_name}/versions">client.workers.scripts.versions.<a href="./src/cloudflare/resources/workers/scripts/versions.py">create</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/scripts/version_create_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/scripts/version_create_response.py">VersionCreateResponse</a></code>
 - <code title="get /accounts/{account_id}/workers/scripts/{script_name}/versions">client.workers.scripts.versions.<a href="./src/cloudflare/resources/workers/scripts/versions.py">list</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/scripts/version_list_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/scripts/version_list_response.py">SyncV4PagePagination[VersionListResponse]</a></code>
-- <code title="get /accounts/{account_id}/workers/scripts/{script_name}/versions/{version_id}">client.workers.scripts.versions.<a href="./src/cloudflare/resources/workers/scripts/versions.py">get</a>(version_id, \*, account_id, script_name) -> <a href="./src/cloudflare/types/workers/scripts/version_get_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/workers/scripts/{script_name}/versions/{version_id}">client.workers.scripts.versions.<a href="./src/cloudflare/resources/workers/scripts/versions.py">get</a>(version_id, \*, account_id, script_name) -> <a href="./src/cloudflare/types/workers/scripts/version_get_response.py">VersionGetResponse</a></code>
+
+### Secrets
+
+Types:
+
+```python
+from cloudflare.types.workers.scripts import (
+    SecretUpdateResponse,
+    SecretListResponse,
+    SecretGetResponse,
+)
+```
+
+Methods:
+
+- <code title="put /accounts/{account_id}/workers/scripts/{script_name}/secrets">client.workers.scripts.secrets.<a href="./src/cloudflare/resources/workers/scripts/secrets.py">update</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/scripts/secret_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/scripts/secret_update_response.py">Optional[SecretUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/workers/scripts/{script_name}/secrets">client.workers.scripts.secrets.<a href="./src/cloudflare/resources/workers/scripts/secrets.py">list</a>(script_name, \*, account_id) -> <a href="./src/cloudflare/types/workers/scripts/secret_list_response.py">SyncSinglePage[SecretListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/workers/scripts/{script_name}/secrets/{secret_name}">client.workers.scripts.secrets.<a href="./src/cloudflare/resources/workers/scripts/secrets.py">delete</a>(secret_name, \*, account_id, script_name, \*\*<a href="src/cloudflare/types/workers/scripts/secret_delete_params.py">params</a>) -> object</code>
+- <code title="get /accounts/{account_id}/workers/scripts/{script_name}/secrets/{secret_name}">client.workers.scripts.secrets.<a href="./src/cloudflare/resources/workers/scripts/secrets.py">get</a>(secret_name, \*, account_id, script_name, \*\*<a href="src/cloudflare/types/workers/scripts/secret_get_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/scripts/secret_get_response.py">Optional[SecretGetResponse]</a></code>
+
+### ScriptAndVersionSettings
+
+Types:
+
+```python
+from cloudflare.types.workers.scripts import (
+    ScriptAndVersionSettingEditResponse,
+    ScriptAndVersionSettingGetResponse,
+)
+```
+
+Methods:
+
+- <code title="patch /accounts/{account_id}/workers/scripts/{script_name}/settings">client.workers.scripts.script_and_version_settings.<a href="./src/cloudflare/resources/workers/scripts/script_and_version_settings.py">edit</a>(script_name, \*, account_id, \*\*<a href="src/cloudflare/types/workers/scripts/script_and_version_setting_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/scripts/script_and_version_setting_edit_response.py">ScriptAndVersionSettingEditResponse</a></code>
+- <code title="get /accounts/{account_id}/workers/scripts/{script_name}/settings">client.workers.scripts.script_and_version_settings.<a href="./src/cloudflare/resources/workers/scripts/script_and_version_settings.py">get</a>(script_name, \*, account_id) -> <a href="./src/cloudflare/types/workers/scripts/script_and_version_setting_get_response.py">ScriptAndVersionSettingGetResponse</a></code>
 
 ## AccountSettings
 
@@ -2179,8 +2591,8 @@ from cloudflare.types.workers import AccountSettingUpdateResponse, AccountSettin
 
 Methods:
 
-- <code title="put /accounts/{account_id}/workers/account-settings">client.workers.account_settings.<a href="./src/cloudflare/resources/workers/account_settings.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workers/account_setting_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/account_setting_update_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/workers/account-settings">client.workers.account_settings.<a href="./src/cloudflare/resources/workers/account_settings.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/workers/account_setting_get_response.py">Optional</a></code>
+- <code title="put /accounts/{account_id}/workers/account-settings">client.workers.account_settings.<a href="./src/cloudflare/resources/workers/account_settings.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workers/account_setting_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/account_setting_update_response.py">AccountSettingUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/workers/account-settings">client.workers.account_settings.<a href="./src/cloudflare/resources/workers/account_settings.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/workers/account_setting_get_response.py">AccountSettingGetResponse</a></code>
 
 ## Domains
 
@@ -2192,10 +2604,10 @@ from cloudflare.types.workers import Domain
 
 Methods:
 
-- <code title="put /accounts/{account_id}/workers/domains">client.workers.domains.<a href="./src/cloudflare/resources/workers/domains.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workers/domain_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/domain.py">Optional</a></code>
+- <code title="put /accounts/{account_id}/workers/domains">client.workers.domains.<a href="./src/cloudflare/resources/workers/domains.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workers/domain_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/domain.py">Optional[Domain]</a></code>
 - <code title="get /accounts/{account_id}/workers/domains">client.workers.domains.<a href="./src/cloudflare/resources/workers/domains.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workers/domain_list_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/domain.py">SyncSinglePage[Domain]</a></code>
 - <code title="delete /accounts/{account_id}/workers/domains/{domain_id}">client.workers.domains.<a href="./src/cloudflare/resources/workers/domains.py">delete</a>(domain_id, \*, account_id) -> None</code>
-- <code title="get /accounts/{account_id}/workers/domains/{domain_id}">client.workers.domains.<a href="./src/cloudflare/resources/workers/domains.py">get</a>(domain_id, \*, account_id) -> <a href="./src/cloudflare/types/workers/domain.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/workers/domains/{domain_id}">client.workers.domains.<a href="./src/cloudflare/resources/workers/domains.py">get</a>(domain_id, \*, account_id) -> <a href="./src/cloudflare/types/workers/domain.py">Optional[Domain]</a></code>
 
 ## Subdomains
 
@@ -2207,63 +2619,82 @@ from cloudflare.types.workers import SubdomainUpdateResponse, SubdomainGetRespon
 
 Methods:
 
-- <code title="put /accounts/{account_id}/workers/subdomain">client.workers.subdomains.<a href="./src/cloudflare/resources/workers/subdomains.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workers/subdomain_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/subdomain_update_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/workers/subdomain">client.workers.subdomains.<a href="./src/cloudflare/resources/workers/subdomains.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/workers/subdomain_get_response.py">Optional</a></code>
+- <code title="put /accounts/{account_id}/workers/subdomain">client.workers.subdomains.<a href="./src/cloudflare/resources/workers/subdomains.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workers/subdomain_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/subdomain_update_response.py">SubdomainUpdateResponse</a></code>
+- <code title="delete /accounts/{account_id}/workers/subdomain">client.workers.subdomains.<a href="./src/cloudflare/resources/workers/subdomains.py">delete</a>(\*, account_id) -> None</code>
+- <code title="get /accounts/{account_id}/workers/subdomain">client.workers.subdomains.<a href="./src/cloudflare/resources/workers/subdomains.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/workers/subdomain_get_response.py">SubdomainGetResponse</a></code>
 
-# KV
+## Observability
 
-## Namespaces
+### Telemetry
 
 Types:
 
 ```python
-from cloudflare.types.kv import Namespace, NamespaceUpdateResponse, NamespaceDeleteResponse
+from cloudflare.types.workers.observability import (
+    TelemetryKeysResponse,
+    TelemetryQueryResponse,
+    TelemetryValuesResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/storage/kv/namespaces">client.kv.namespaces.<a href="./src/cloudflare/resources/kv/namespaces/namespaces.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/kv/namespace_create_params.py">params</a>) -> <a href="./src/cloudflare/types/kv/namespace.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/storage/kv/namespaces/{namespace_id}">client.kv.namespaces.<a href="./src/cloudflare/resources/kv/namespaces/namespaces.py">update</a>(namespace_id, \*, account_id, \*\*<a href="src/cloudflare/types/kv/namespace_update_params.py">params</a>) -> <a href="./src/cloudflare/types/kv/namespace_update_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/storage/kv/namespaces">client.kv.namespaces.<a href="./src/cloudflare/resources/kv/namespaces/namespaces.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/kv/namespace_list_params.py">params</a>) -> <a href="./src/cloudflare/types/kv/namespace.py">SyncV4PagePaginationArray[Namespace]</a></code>
-- <code title="delete /accounts/{account_id}/storage/kv/namespaces/{namespace_id}">client.kv.namespaces.<a href="./src/cloudflare/resources/kv/namespaces/namespaces.py">delete</a>(namespace_id, \*, account_id) -> <a href="./src/cloudflare/types/kv/namespace_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/storage/kv/namespaces/{namespace_id}">client.kv.namespaces.<a href="./src/cloudflare/resources/kv/namespaces/namespaces.py">get</a>(namespace_id, \*, account_id) -> <a href="./src/cloudflare/types/kv/namespace.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/workers/observability/telemetry/keys">client.workers.observability.telemetry.<a href="./src/cloudflare/resources/workers/observability/telemetry.py">keys</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workers/observability/telemetry_keys_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/observability/telemetry_keys_response.py">SyncSinglePage[TelemetryKeysResponse]</a></code>
+- <code title="post /accounts/{account_id}/workers/observability/telemetry/query">client.workers.observability.telemetry.<a href="./src/cloudflare/resources/workers/observability/telemetry.py">query</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workers/observability/telemetry_query_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/observability/telemetry_query_response.py">TelemetryQueryResponse</a></code>
+- <code title="post /accounts/{account_id}/workers/observability/telemetry/values">client.workers.observability.telemetry.<a href="./src/cloudflare/resources/workers/observability/telemetry.py">values</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workers/observability/telemetry_values_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/observability/telemetry_values_response.py">SyncSinglePage[TelemetryValuesResponse]</a></code>
+
+# KV
 
-### Bulk
+## Namespaces
 
 Types:
 
 ```python
-from cloudflare.types.kv.namespaces import BulkUpdateResponse, BulkDeleteResponse
+from cloudflare.types.kv import (
+    Namespace,
+    NamespaceDeleteResponse,
+    NamespaceBulkDeleteResponse,
+    NamespaceBulkGetResponse,
+    NamespaceBulkUpdateResponse,
+)
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk">client.kv.namespaces.bulk.<a href="./src/cloudflare/resources/kv/namespaces/bulk.py">update</a>(namespace_id, \*, account_id, \*\*<a href="src/cloudflare/types/kv/namespaces/bulk_update_params.py">params</a>) -> <a href="./src/cloudflare/types/kv/namespaces/bulk_update_response.py">Optional</a></code>
-- <code title="delete /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk">client.kv.namespaces.bulk.<a href="./src/cloudflare/resources/kv/namespaces/bulk.py">delete</a>(namespace_id, \*, account_id) -> <a href="./src/cloudflare/types/kv/namespaces/bulk_delete_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/storage/kv/namespaces">client.kv.namespaces.<a href="./src/cloudflare/resources/kv/namespaces/namespaces.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/kv/namespace_create_params.py">params</a>) -> <a href="./src/cloudflare/types/kv/namespace.py">Optional[Namespace]</a></code>
+- <code title="put /accounts/{account_id}/storage/kv/namespaces/{namespace_id}">client.kv.namespaces.<a href="./src/cloudflare/resources/kv/namespaces/namespaces.py">update</a>(namespace_id, \*, account_id, \*\*<a href="src/cloudflare/types/kv/namespace_update_params.py">params</a>) -> <a href="./src/cloudflare/types/kv/namespace.py">Namespace</a></code>
+- <code title="get /accounts/{account_id}/storage/kv/namespaces">client.kv.namespaces.<a href="./src/cloudflare/resources/kv/namespaces/namespaces.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/kv/namespace_list_params.py">params</a>) -> <a href="./src/cloudflare/types/kv/namespace.py">SyncV4PagePaginationArray[Namespace]</a></code>
+- <code title="delete /accounts/{account_id}/storage/kv/namespaces/{namespace_id}">client.kv.namespaces.<a href="./src/cloudflare/resources/kv/namespaces/namespaces.py">delete</a>(namespace_id, \*, account_id) -> <a href="./src/cloudflare/types/kv/namespace_delete_response.py">Optional[NamespaceDeleteResponse]</a></code>
+- <code title="post /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk/delete">client.kv.namespaces.<a href="./src/cloudflare/resources/kv/namespaces/namespaces.py">bulk_delete</a>(namespace_id, \*, account_id, \*\*<a href="src/cloudflare/types/kv/namespace_bulk_delete_params.py">params</a>) -> <a href="./src/cloudflare/types/kv/namespace_bulk_delete_response.py">Optional[NamespaceBulkDeleteResponse]</a></code>
+- <code title="post /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk/get">client.kv.namespaces.<a href="./src/cloudflare/resources/kv/namespaces/namespaces.py">bulk_get</a>(namespace_id, \*, account_id, \*\*<a href="src/cloudflare/types/kv/namespace_bulk_get_params.py">params</a>) -> <a href="./src/cloudflare/types/kv/namespace_bulk_get_response.py">Optional[NamespaceBulkGetResponse]</a></code>
+- <code title="put /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk">client.kv.namespaces.<a href="./src/cloudflare/resources/kv/namespaces/namespaces.py">bulk_update</a>(namespace_id, \*, account_id, \*\*<a href="src/cloudflare/types/kv/namespace_bulk_update_params.py">params</a>) -> <a href="./src/cloudflare/types/kv/namespace_bulk_update_response.py">Optional[NamespaceBulkUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/storage/kv/namespaces/{namespace_id}">client.kv.namespaces.<a href="./src/cloudflare/resources/kv/namespaces/namespaces.py">get</a>(namespace_id, \*, account_id) -> <a href="./src/cloudflare/types/kv/namespace.py">Optional[Namespace]</a></code>
 
 ### Keys
 
 Types:
 
 ```python
-from cloudflare.types.kv.namespaces import Key
+from cloudflare.types.kv.namespaces import (
+    Key,
+    KeyBulkDeleteResponse,
+    KeyBulkGetResponse,
+    KeyBulkUpdateResponse,
+)
 ```
 
 Methods:
 
 - <code title="get /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/keys">client.kv.namespaces.keys.<a href="./src/cloudflare/resources/kv/namespaces/keys.py">list</a>(namespace_id, \*, account_id, \*\*<a href="src/cloudflare/types/kv/namespaces/key_list_params.py">params</a>) -> <a href="./src/cloudflare/types/kv/namespaces/key.py">SyncCursorLimitPagination[Key]</a></code>
+- <code title="post /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk/delete">client.kv.namespaces.keys.<a href="./src/cloudflare/resources/kv/namespaces/keys.py">bulk_delete</a>(namespace_id, \*, account_id, \*\*<a href="src/cloudflare/types/kv/namespaces/key_bulk_delete_params.py">params</a>) -> <a href="./src/cloudflare/types/kv/namespaces/key_bulk_delete_response.py">Optional[KeyBulkDeleteResponse]</a></code>
+- <code title="post /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk/get">client.kv.namespaces.keys.<a href="./src/cloudflare/resources/kv/namespaces/keys.py">bulk_get</a>(namespace_id, \*, account_id, \*\*<a href="src/cloudflare/types/kv/namespaces/key_bulk_get_params.py">params</a>) -> <a href="./src/cloudflare/types/kv/namespaces/key_bulk_get_response.py">Optional[KeyBulkGetResponse]</a></code>
+- <code title="put /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk">client.kv.namespaces.keys.<a href="./src/cloudflare/resources/kv/namespaces/keys.py">bulk_update</a>(namespace_id, \*, account_id, \*\*<a href="src/cloudflare/types/kv/namespaces/key_bulk_update_params.py">params</a>) -> <a href="./src/cloudflare/types/kv/namespaces/key_bulk_update_response.py">Optional[KeyBulkUpdateResponse]</a></code>
 
 ### Metadata
 
-Types:
-
-```python
-from cloudflare.types.kv.namespaces import MetadataGetResponse
-```
-
 Methods:
 
-- <code title="get /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/metadata/{key_name}">client.kv.namespaces.metadata.<a href="./src/cloudflare/resources/kv/namespaces/metadata.py">get</a>(key_name, \*, account_id, namespace_id) -> <a href="./src/cloudflare/types/kv/namespaces/metadata_get_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/metadata/{key_name}">client.kv.namespaces.metadata.<a href="./src/cloudflare/resources/kv/namespaces/metadata.py">get</a>(key_name, \*, account_id, namespace_id) -> object</code>
 
 ### Values
 
@@ -2275,8 +2706,8 @@ from cloudflare.types.kv.namespaces import ValueUpdateResponse, ValueDeleteRespo
 
 Methods:
 
-- <code title="put /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/values/{key_name}">client.kv.namespaces.values.<a href="./src/cloudflare/resources/kv/namespaces/values.py">update</a>(key_name, \*, account_id, namespace_id, \*\*<a href="src/cloudflare/types/kv/namespaces/value_update_params.py">params</a>) -> <a href="./src/cloudflare/types/kv/namespaces/value_update_response.py">Optional</a></code>
-- <code title="delete /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/values/{key_name}">client.kv.namespaces.values.<a href="./src/cloudflare/resources/kv/namespaces/values.py">delete</a>(key_name, \*, account_id, namespace_id) -> <a href="./src/cloudflare/types/kv/namespaces/value_delete_response.py">Optional</a></code>
+- <code title="put /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/values/{key_name}">client.kv.namespaces.values.<a href="./src/cloudflare/resources/kv/namespaces/values.py">update</a>(key_name, \*, account_id, namespace_id, \*\*<a href="src/cloudflare/types/kv/namespaces/value_update_params.py">params</a>) -> <a href="./src/cloudflare/types/kv/namespaces/value_update_response.py">Optional[ValueUpdateResponse]</a></code>
+- <code title="delete /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/values/{key_name}">client.kv.namespaces.values.<a href="./src/cloudflare/resources/kv/namespaces/values.py">delete</a>(key_name, \*, account_id, namespace_id) -> <a href="./src/cloudflare/types/kv/namespaces/value_delete_response.py">Optional[ValueDeleteResponse]</a></code>
 - <code title="get /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/values/{key_name}">client.kv.namespaces.values.<a href="./src/cloudflare/resources/kv/namespaces/values.py">get</a>(key_name, \*, account_id, namespace_id) -> BinaryAPIResponse</code>
 
 # DurableObjects
@@ -2291,7 +2722,7 @@ from cloudflare.types.durable_objects import Namespace
 
 Methods:
 
-- <code title="get /accounts/{account_id}/workers/durable_objects/namespaces">client.durable_objects.namespaces.<a href="./src/cloudflare/resources/durable_objects/namespaces/namespaces.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/durable_objects/namespace.py">SyncSinglePage[Namespace]</a></code>
+- <code title="get /accounts/{account_id}/workers/durable_objects/namespaces">client.durable_objects.namespaces.<a href="./src/cloudflare/resources/durable_objects/namespaces/namespaces.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/durable_objects/namespace_list_params.py">params</a>) -> <a href="./src/cloudflare/types/durable_objects/namespace.py">SyncV4PagePaginationArray[Namespace]</a></code>
 
 ### Objects
 
@@ -2303,57 +2734,95 @@ from cloudflare.types.durable_objects.namespaces import DurableObject
 
 Methods:
 
-- <code title="get /accounts/{account_id}/workers/durable_objects/namespaces/{id}/objects">client.durable_objects.namespaces.objects.<a href="./src/cloudflare/resources/durable_objects/namespaces/objects.py">list</a>(id, \*, account_id, \*\*<a href="src/cloudflare/types/durable_objects/namespaces/object_list_params.py">params</a>) -> <a href="./src/cloudflare/types/durable_objects/namespaces/durable_object.py">SyncCursorLimitPagination[DurableObject]</a></code>
+- <code title="get /accounts/{account_id}/workers/durable_objects/namespaces/{id}/objects">client.durable_objects.namespaces.objects.<a href="./src/cloudflare/resources/durable_objects/namespaces/objects.py">list</a>(id, \*, account_id, \*\*<a href="src/cloudflare/types/durable_objects/namespaces/object_list_params.py">params</a>) -> <a href="./src/cloudflare/types/durable_objects/namespaces/durable_object.py">SyncCursorPaginationAfter[DurableObject]</a></code>
 
 # Queues
 
 Types:
 
 ```python
-from cloudflare.types.queues import Queue, QueueCreated, QueueUpdated, QueueDeleteResponse
+from cloudflare.types.queues import Queue, QueueDeleteResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/queues">client.queues.<a href="./src/cloudflare/resources/queues/queues.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/queues/queue_create_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/queue_created.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/queues/{queue_id}">client.queues.<a href="./src/cloudflare/resources/queues/queues.py">update</a>(queue_id, \*, account_id, \*\*<a href="src/cloudflare/types/queues/queue_update_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/queue_updated.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/queues">client.queues.<a href="./src/cloudflare/resources/queues/queues.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/queues/queue_create_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/queue.py">Optional[Queue]</a></code>
+- <code title="put /accounts/{account_id}/queues/{queue_id}">client.queues.<a href="./src/cloudflare/resources/queues/queues.py">update</a>(queue_id, \*, account_id, \*\*<a href="src/cloudflare/types/queues/queue_update_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/queue.py">Optional[Queue]</a></code>
 - <code title="get /accounts/{account_id}/queues">client.queues.<a href="./src/cloudflare/resources/queues/queues.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/queues/queue.py">SyncSinglePage[Queue]</a></code>
-- <code title="delete /accounts/{account_id}/queues/{queue_id}">client.queues.<a href="./src/cloudflare/resources/queues/queues.py">delete</a>(queue_id, \*, account_id) -> <a href="./src/cloudflare/types/queues/queue_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/queues/{queue_id}">client.queues.<a href="./src/cloudflare/resources/queues/queues.py">get</a>(queue_id, \*, account_id) -> <a href="./src/cloudflare/types/queues/queue.py">Optional</a></code>
+- <code title="delete /accounts/{account_id}/queues/{queue_id}">client.queues.<a href="./src/cloudflare/resources/queues/queues.py">delete</a>(queue_id, \*, account_id) -> <a href="./src/cloudflare/types/queues/queue_delete_response.py">QueueDeleteResponse</a></code>
+- <code title="patch /accounts/{account_id}/queues/{queue_id}">client.queues.<a href="./src/cloudflare/resources/queues/queues.py">edit</a>(queue_id, \*, account_id, \*\*<a href="src/cloudflare/types/queues/queue_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/queue.py">Optional[Queue]</a></code>
+- <code title="get /accounts/{account_id}/queues/{queue_id}">client.queues.<a href="./src/cloudflare/resources/queues/queues.py">get</a>(queue_id, \*, account_id) -> <a href="./src/cloudflare/types/queues/queue.py">Optional[Queue]</a></code>
 
-## Consumers
+## Messages
 
 Types:
 
 ```python
 from cloudflare.types.queues import (
-    Consumer,
-    ConsumerCreateResponse,
-    ConsumerUpdateResponse,
-    ConsumerDeleteResponse,
-    ConsumerGetResponse,
+    MessageAckResponse,
+    MessageBulkPushResponse,
+    MessagePullResponse,
+    MessagePushResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/queues/{queue_id}/consumers">client.queues.consumers.<a href="./src/cloudflare/resources/queues/consumers.py">create</a>(queue_id, \*, account_id, \*\*<a href="src/cloudflare/types/queues/consumer_create_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/consumer_create_response.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}">client.queues.consumers.<a href="./src/cloudflare/resources/queues/consumers.py">update</a>(consumer_id, \*, account_id, queue_id, \*\*<a href="src/cloudflare/types/queues/consumer_update_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/consumer_update_response.py">Optional</a></code>
-- <code title="delete /accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}">client.queues.consumers.<a href="./src/cloudflare/resources/queues/consumers.py">delete</a>(consumer_id, \*, account_id, queue_id) -> <a href="./src/cloudflare/types/queues/consumer_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/queues/{queue_id}/consumers">client.queues.consumers.<a href="./src/cloudflare/resources/queues/consumers.py">get</a>(queue_id, \*, account_id) -> <a href="./src/cloudflare/types/queues/consumer_get_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/queues/{queue_id}/messages/ack">client.queues.messages.<a href="./src/cloudflare/resources/queues/messages.py">ack</a>(queue_id, \*, account_id, \*\*<a href="src/cloudflare/types/queues/message_ack_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/message_ack_response.py">Optional[MessageAckResponse]</a></code>
+- <code title="post /accounts/{account_id}/queues/{queue_id}/messages/batch">client.queues.messages.<a href="./src/cloudflare/resources/queues/messages.py">bulk_push</a>(queue_id, \*, account_id, \*\*<a href="src/cloudflare/types/queues/message_bulk_push_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/message_bulk_push_response.py">MessageBulkPushResponse</a></code>
+- <code title="post /accounts/{account_id}/queues/{queue_id}/messages/pull">client.queues.messages.<a href="./src/cloudflare/resources/queues/messages.py">pull</a>(queue_id, \*, account_id, \*\*<a href="src/cloudflare/types/queues/message_pull_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/message_pull_response.py">Optional[MessagePullResponse]</a></code>
+- <code title="post /accounts/{account_id}/queues/{queue_id}/messages">client.queues.messages.<a href="./src/cloudflare/resources/queues/messages.py">push</a>(queue_id, \*, account_id, \*\*<a href="src/cloudflare/types/queues/message_push_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/message_push_response.py">MessagePushResponse</a></code>
 
-## Messages
+## Purge
+
+Types:
+
+```python
+from cloudflare.types.queues import PurgeStatusResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/queues/{queue_id}/purge">client.queues.purge.<a href="./src/cloudflare/resources/queues/purge.py">start</a>(queue_id, \*, account_id, \*\*<a href="src/cloudflare/types/queues/purge_start_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/queue.py">Optional[Queue]</a></code>
+- <code title="get /accounts/{account_id}/queues/{queue_id}/purge">client.queues.purge.<a href="./src/cloudflare/resources/queues/purge.py">status</a>(queue_id, \*, account_id) -> <a href="./src/cloudflare/types/queues/purge_status_response.py">Optional[PurgeStatusResponse]</a></code>
+
+## Consumers
+
+Types:
+
+```python
+from cloudflare.types.queues import Consumer, ConsumerDeleteResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/queues/{queue_id}/consumers">client.queues.consumers.<a href="./src/cloudflare/resources/queues/consumers.py">create</a>(queue_id, \*, account_id, \*\*<a href="src/cloudflare/types/queues/consumer_create_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/consumer.py">Optional[Consumer]</a></code>
+- <code title="put /accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}">client.queues.consumers.<a href="./src/cloudflare/resources/queues/consumers.py">update</a>(consumer_id, \*, account_id, queue_id, \*\*<a href="src/cloudflare/types/queues/consumer_update_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/consumer.py">Optional[Consumer]</a></code>
+- <code title="get /accounts/{account_id}/queues/{queue_id}/consumers">client.queues.consumers.<a href="./src/cloudflare/resources/queues/consumers.py">list</a>(queue_id, \*, account_id) -> <a href="./src/cloudflare/types/queues/consumer.py">SyncSinglePage[Consumer]</a></code>
+- <code title="delete /accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}">client.queues.consumers.<a href="./src/cloudflare/resources/queues/consumers.py">delete</a>(consumer_id, \*, account_id, queue_id) -> <a href="./src/cloudflare/types/queues/consumer_delete_response.py">ConsumerDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}">client.queues.consumers.<a href="./src/cloudflare/resources/queues/consumers.py">get</a>(consumer_id, \*, account_id, queue_id) -> <a href="./src/cloudflare/types/queues/consumer.py">Optional[Consumer]</a></code>
+
+## Subscriptions
 
 Types:
 
 ```python
-from cloudflare.types.queues import MessageAckResponse, MessagePullResponse
+from cloudflare.types.queues import (
+    SubscriptionCreateResponse,
+    SubscriptionUpdateResponse,
+    SubscriptionListResponse,
+    SubscriptionDeleteResponse,
+    SubscriptionGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/queues/{queue_id}/messages/ack">client.queues.messages.<a href="./src/cloudflare/resources/queues/messages.py">ack</a>(queue_id, \*, account_id, \*\*<a href="src/cloudflare/types/queues/message_ack_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/message_ack_response.py">Optional</a></code>
-- <code title="post /accounts/{account_id}/queues/{queue_id}/messages/pull">client.queues.messages.<a href="./src/cloudflare/resources/queues/messages.py">pull</a>(queue_id, \*, account_id, \*\*<a href="src/cloudflare/types/queues/message_pull_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/message_pull_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/event_subscriptions/subscriptions">client.queues.subscriptions.<a href="./src/cloudflare/resources/queues/subscriptions.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/queues/subscription_create_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/subscription_create_response.py">Optional[SubscriptionCreateResponse]</a></code>
+- <code title="patch /accounts/{account_id}/event_subscriptions/subscriptions/{subscription_id}">client.queues.subscriptions.<a href="./src/cloudflare/resources/queues/subscriptions.py">update</a>(subscription_id, \*, account_id, \*\*<a href="src/cloudflare/types/queues/subscription_update_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/subscription_update_response.py">Optional[SubscriptionUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/event_subscriptions/subscriptions">client.queues.subscriptions.<a href="./src/cloudflare/resources/queues/subscriptions.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/queues/subscription_list_params.py">params</a>) -> <a href="./src/cloudflare/types/queues/subscription_list_response.py">SyncV4PagePaginationArray[SubscriptionListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/event_subscriptions/subscriptions/{subscription_id}">client.queues.subscriptions.<a href="./src/cloudflare/resources/queues/subscriptions.py">delete</a>(subscription_id, \*, account_id) -> <a href="./src/cloudflare/types/queues/subscription_delete_response.py">Optional[SubscriptionDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/event_subscriptions/subscriptions/{subscription_id}">client.queues.subscriptions.<a href="./src/cloudflare/resources/queues/subscriptions.py">get</a>(subscription_id, \*, account_id) -> <a href="./src/cloudflare/types/queues/subscription_get_response.py">Optional[SubscriptionGetResponse]</a></code>
 
 # APIGateway
 
@@ -2362,12 +2831,12 @@ Methods:
 Types:
 
 ```python
-from cloudflare.types.api_gateway import Configuration, ConfigurationUpdateResponse
+from cloudflare.types.api_gateway import Configuration
 ```
 
 Methods:
 
-- <code title="put /zones/{zone_id}/api_gateway/configuration">client.api_gateway.configurations.<a href="./src/cloudflare/resources/api_gateway/configurations.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/configuration_update_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/configuration_update_response.py">ConfigurationUpdateResponse</a></code>
+- <code title="put /zones/{zone_id}/api_gateway/configuration">client.api_gateway.configurations.<a href="./src/cloudflare/resources/api_gateway/configurations.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/configuration_update_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/configuration.py">Configuration</a></code>
 - <code title="get /zones/{zone_id}/api_gateway/configuration">client.api_gateway.configurations.<a href="./src/cloudflare/resources/api_gateway/configurations.py">get</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/configuration_get_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/configuration.py">Configuration</a></code>
 
 ## Discovery
@@ -2387,12 +2856,13 @@ Methods:
 Types:
 
 ```python
-from cloudflare.types.api_gateway.discovery import OperationEditResponse
+from cloudflare.types.api_gateway.discovery import OperationBulkEditResponse, OperationEditResponse
 ```
 
 Methods:
 
 - <code title="get /zones/{zone_id}/api_gateway/discovery/operations">client.api_gateway.discovery.operations.<a href="./src/cloudflare/resources/api_gateway/discovery/operations.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/discovery/operation_list_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/discovery_operation.py">SyncV4PagePaginationArray[DiscoveryOperation]</a></code>
+- <code title="patch /zones/{zone_id}/api_gateway/discovery/operations">client.api_gateway.discovery.operations.<a href="./src/cloudflare/resources/api_gateway/discovery/operations.py">bulk_edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/discovery/operation_bulk_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/discovery/operation_bulk_edit_response.py">OperationBulkEditResponse</a></code>
 - <code title="patch /zones/{zone_id}/api_gateway/discovery/operations/{operation_id}">client.api_gateway.discovery.operations.<a href="./src/cloudflare/resources/api_gateway/discovery/operations.py">edit</a>(operation_id, \*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/discovery/operation_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/discovery/operation_edit_response.py">OperationEditResponse</a></code>
 
 ## Operations
@@ -2405,15 +2875,19 @@ from cloudflare.types.api_gateway import (
     OperationCreateResponse,
     OperationListResponse,
     OperationDeleteResponse,
+    OperationBulkCreateResponse,
+    OperationBulkDeleteResponse,
     OperationGetResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /zones/{zone_id}/api_gateway/operations">client.api_gateway.operations.<a href="./src/cloudflare/resources/api_gateway/operations/operations.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/operation_create_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/operation_create_response.py">OperationCreateResponse</a></code>
+- <code title="post /zones/{zone_id}/api_gateway/operations/item">client.api_gateway.operations.<a href="./src/cloudflare/resources/api_gateway/operations/operations.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/operation_create_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/operation_create_response.py">OperationCreateResponse</a></code>
 - <code title="get /zones/{zone_id}/api_gateway/operations">client.api_gateway.operations.<a href="./src/cloudflare/resources/api_gateway/operations/operations.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/operation_list_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/operation_list_response.py">SyncV4PagePaginationArray[OperationListResponse]</a></code>
 - <code title="delete /zones/{zone_id}/api_gateway/operations/{operation_id}">client.api_gateway.operations.<a href="./src/cloudflare/resources/api_gateway/operations/operations.py">delete</a>(operation_id, \*, zone_id) -> <a href="./src/cloudflare/types/api_gateway/operation_delete_response.py">OperationDeleteResponse</a></code>
+- <code title="post /zones/{zone_id}/api_gateway/operations">client.api_gateway.operations.<a href="./src/cloudflare/resources/api_gateway/operations/operations.py">bulk_create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/operation_bulk_create_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/operation_bulk_create_response.py">SyncSinglePage[OperationBulkCreateResponse]</a></code>
+- <code title="delete /zones/{zone_id}/api_gateway/operations">client.api_gateway.operations.<a href="./src/cloudflare/resources/api_gateway/operations/operations.py">bulk_delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/api_gateway/operation_bulk_delete_response.py">OperationBulkDeleteResponse</a></code>
 - <code title="get /zones/{zone_id}/api_gateway/operations/{operation_id}">client.api_gateway.operations.<a href="./src/cloudflare/resources/api_gateway/operations/operations.py">get</a>(operation_id, \*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/operation_get_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/operation_get_response.py">OperationGetResponse</a></code>
 
 ### SchemaValidation
@@ -2469,19 +2943,19 @@ Types:
 ```python
 from cloudflare.types.api_gateway import (
     Message,
-    PublicSchema,
-    SchemaUpload,
+    OldPublicSchema,
+    UserSchemaCreateResponse,
     UserSchemaDeleteResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /zones/{zone_id}/api_gateway/user_schemas">client.api_gateway.user_schemas.<a href="./src/cloudflare/resources/api_gateway/user_schemas/user_schemas.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/user_schema_create_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/schema_upload.py">SchemaUpload</a></code>
-- <code title="get /zones/{zone_id}/api_gateway/user_schemas">client.api_gateway.user_schemas.<a href="./src/cloudflare/resources/api_gateway/user_schemas/user_schemas.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/user_schema_list_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/public_schema.py">SyncV4PagePaginationArray[PublicSchema]</a></code>
-- <code title="delete /zones/{zone_id}/api_gateway/user_schemas/{schema_id}">client.api_gateway.user_schemas.<a href="./src/cloudflare/resources/api_gateway/user_schemas/user_schemas.py">delete</a>(schema_id, \*, zone_id) -> <a href="./src/cloudflare/types/api_gateway/user_schema_delete_response.py">Optional</a></code>
-- <code title="patch /zones/{zone_id}/api_gateway/user_schemas/{schema_id}">client.api_gateway.user_schemas.<a href="./src/cloudflare/resources/api_gateway/user_schemas/user_schemas.py">edit</a>(schema_id, \*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/user_schema_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/public_schema.py">PublicSchema</a></code>
-- <code title="get /zones/{zone_id}/api_gateway/user_schemas/{schema_id}">client.api_gateway.user_schemas.<a href="./src/cloudflare/resources/api_gateway/user_schemas/user_schemas.py">get</a>(schema_id, \*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/user_schema_get_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/public_schema.py">PublicSchema</a></code>
+- <code title="post /zones/{zone_id}/api_gateway/user_schemas">client.api_gateway.user_schemas.<a href="./src/cloudflare/resources/api_gateway/user_schemas/user_schemas.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/user_schema_create_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/user_schema_create_response.py">UserSchemaCreateResponse</a></code>
+- <code title="get /zones/{zone_id}/api_gateway/user_schemas">client.api_gateway.user_schemas.<a href="./src/cloudflare/resources/api_gateway/user_schemas/user_schemas.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/user_schema_list_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/old_public_schema.py">SyncV4PagePaginationArray[OldPublicSchema]</a></code>
+- <code title="delete /zones/{zone_id}/api_gateway/user_schemas/{schema_id}">client.api_gateway.user_schemas.<a href="./src/cloudflare/resources/api_gateway/user_schemas/user_schemas.py">delete</a>(schema_id, \*, zone_id) -> <a href="./src/cloudflare/types/api_gateway/user_schema_delete_response.py">UserSchemaDeleteResponse</a></code>
+- <code title="patch /zones/{zone_id}/api_gateway/user_schemas/{schema_id}">client.api_gateway.user_schemas.<a href="./src/cloudflare/resources/api_gateway/user_schemas/user_schemas.py">edit</a>(schema_id, \*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/user_schema_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/old_public_schema.py">OldPublicSchema</a></code>
+- <code title="get /zones/{zone_id}/api_gateway/user_schemas/{schema_id}">client.api_gateway.user_schemas.<a href="./src/cloudflare/resources/api_gateway/user_schemas/user_schemas.py">get</a>(schema_id, \*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/user_schema_get_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/old_public_schema.py">OldPublicSchema</a></code>
 
 ### Operations
 
@@ -2495,22 +2969,48 @@ Methods:
 
 - <code title="get /zones/{zone_id}/api_gateway/user_schemas/{schema_id}/operations">client.api_gateway.user_schemas.operations.<a href="./src/cloudflare/resources/api_gateway/user_schemas/operations.py">list</a>(schema_id, \*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/user_schemas/operation_list_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/user_schemas/operation_list_response.py">SyncV4PagePaginationArray[OperationListResponse]</a></code>
 
-# ManagedHeaders
+### Hosts
+
+Types:
+
+```python
+from cloudflare.types.api_gateway.user_schemas import HostListResponse
+```
+
+Methods:
+
+- <code title="get /zones/{zone_id}/api_gateway/user_schemas/hosts">client.api_gateway.user_schemas.hosts.<a href="./src/cloudflare/resources/api_gateway/user_schemas/hosts.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/user_schemas/host_list_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/user_schemas/host_list_response.py">SyncV4PagePaginationArray[HostListResponse]</a></code>
+
+## ExpressionTemplate
+
+### Fallthrough
+
+Types:
+
+```python
+from cloudflare.types.api_gateway.expression_template import FallthroughCreateResponse
+```
+
+Methods:
+
+- <code title="post /zones/{zone_id}/api_gateway/expression-template/fallthrough">client.api_gateway.expression_template.fallthrough.<a href="./src/cloudflare/resources/api_gateway/expression_template/fallthrough.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/api_gateway/expression_template/fallthrough_create_params.py">params</a>) -> <a href="./src/cloudflare/types/api_gateway/expression_template/fallthrough_create_response.py">FallthroughCreateResponse</a></code>
+
+# ManagedTransforms
 
 Types:
 
 ```python
-from cloudflare.types.managed_headers import (
-    RequestModel,
-    ManagedHeaderListResponse,
-    ManagedHeaderEditResponse,
+from cloudflare.types.managed_transforms import (
+    ManagedTransformListResponse,
+    ManagedTransformEditResponse,
 )
 ```
 
 Methods:
 
-- <code title="get /zones/{zone_id}/managed_headers">client.managed_headers.<a href="./src/cloudflare/resources/managed_headers.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/managed_headers/managed_header_list_response.py">ManagedHeaderListResponse</a></code>
-- <code title="patch /zones/{zone_id}/managed_headers">client.managed_headers.<a href="./src/cloudflare/resources/managed_headers.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/managed_headers/managed_header_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/managed_headers/managed_header_edit_response.py">ManagedHeaderEditResponse</a></code>
+- <code title="get /zones/{zone_id}/managed_headers">client.managed_transforms.<a href="./src/cloudflare/resources/managed_transforms.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/managed_transforms/managed_transform_list_response.py">ManagedTransformListResponse</a></code>
+- <code title="delete /zones/{zone_id}/managed_headers">client.managed_transforms.<a href="./src/cloudflare/resources/managed_transforms.py">delete</a>(\*, zone_id) -> None</code>
+- <code title="patch /zones/{zone_id}/managed_headers">client.managed_transforms.<a href="./src/cloudflare/resources/managed_transforms.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/managed_transforms/managed_transform_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/managed_transforms/managed_transform_edit_response.py">ManagedTransformEditResponse</a></code>
 
 # PageShield
 
@@ -2522,8 +3022,8 @@ from cloudflare.types.page_shield import Setting, PageShieldUpdateResponse
 
 Methods:
 
-- <code title="put /zones/{zone_id}/page_shield">client.page_shield.<a href="./src/cloudflare/resources/page_shield/page_shield.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/page_shield/page_shield_update_params.py">params</a>) -> <a href="./src/cloudflare/types/page_shield/page_shield_update_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/page_shield">client.page_shield.<a href="./src/cloudflare/resources/page_shield/page_shield.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/page_shield/setting.py">Optional</a></code>
+- <code title="put /zones/{zone_id}/page_shield">client.page_shield.<a href="./src/cloudflare/resources/page_shield/page_shield.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/page_shield/page_shield_update_params.py">params</a>) -> <a href="./src/cloudflare/types/page_shield/page_shield_update_response.py">Optional[PageShieldUpdateResponse]</a></code>
+- <code title="get /zones/{zone_id}/page_shield">client.page_shield.<a href="./src/cloudflare/resources/page_shield/page_shield.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/page_shield/setting.py">Optional[Setting]</a></code>
 
 ## Policies
 
@@ -2541,11 +3041,11 @@ from cloudflare.types.page_shield import (
 
 Methods:
 
-- <code title="post /zones/{zone_id}/page_shield/policies">client.page_shield.policies.<a href="./src/cloudflare/resources/page_shield/policies.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/page_shield/policy_create_params.py">params</a>) -> <a href="./src/cloudflare/types/page_shield/policy_create_response.py">Optional</a></code>
-- <code title="put /zones/{zone_id}/page_shield/policies/{policy_id}">client.page_shield.policies.<a href="./src/cloudflare/resources/page_shield/policies.py">update</a>(policy_id, \*, zone_id, \*\*<a href="src/cloudflare/types/page_shield/policy_update_params.py">params</a>) -> <a href="./src/cloudflare/types/page_shield/policy_update_response.py">Optional</a></code>
+- <code title="post /zones/{zone_id}/page_shield/policies">client.page_shield.policies.<a href="./src/cloudflare/resources/page_shield/policies.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/page_shield/policy_create_params.py">params</a>) -> <a href="./src/cloudflare/types/page_shield/policy_create_response.py">Optional[PolicyCreateResponse]</a></code>
+- <code title="put /zones/{zone_id}/page_shield/policies/{policy_id}">client.page_shield.policies.<a href="./src/cloudflare/resources/page_shield/policies.py">update</a>(policy_id, \*, zone_id, \*\*<a href="src/cloudflare/types/page_shield/policy_update_params.py">params</a>) -> <a href="./src/cloudflare/types/page_shield/policy_update_response.py">Optional[PolicyUpdateResponse]</a></code>
 - <code title="get /zones/{zone_id}/page_shield/policies">client.page_shield.policies.<a href="./src/cloudflare/resources/page_shield/policies.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/page_shield/policy_list_response.py">SyncSinglePage[PolicyListResponse]</a></code>
 - <code title="delete /zones/{zone_id}/page_shield/policies/{policy_id}">client.page_shield.policies.<a href="./src/cloudflare/resources/page_shield/policies.py">delete</a>(policy_id, \*, zone_id) -> None</code>
-- <code title="get /zones/{zone_id}/page_shield/policies/{policy_id}">client.page_shield.policies.<a href="./src/cloudflare/resources/page_shield/policies.py">get</a>(policy_id, \*, zone_id) -> <a href="./src/cloudflare/types/page_shield/policy_get_response.py">Optional</a></code>
+- <code title="get /zones/{zone_id}/page_shield/policies/{policy_id}">client.page_shield.policies.<a href="./src/cloudflare/resources/page_shield/policies.py">get</a>(policy_id, \*, zone_id) -> <a href="./src/cloudflare/types/page_shield/policy_get_response.py">Optional[PolicyGetResponse]</a></code>
 
 ## Connections
 
@@ -2558,7 +3058,7 @@ from cloudflare.types.page_shield import Connection
 Methods:
 
 - <code title="get /zones/{zone_id}/page_shield/connections">client.page_shield.connections.<a href="./src/cloudflare/resources/page_shield/connections.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/page_shield/connection_list_params.py">params</a>) -> <a href="./src/cloudflare/types/page_shield/connection.py">SyncSinglePage[Connection]</a></code>
-- <code title="get /zones/{zone_id}/page_shield/connections/{connection_id}">client.page_shield.connections.<a href="./src/cloudflare/resources/page_shield/connections.py">get</a>(connection_id, \*, zone_id) -> <a href="./src/cloudflare/types/page_shield/connection.py">Optional</a></code>
+- <code title="get /zones/{zone_id}/page_shield/connections/{connection_id}">client.page_shield.connections.<a href="./src/cloudflare/resources/page_shield/connections.py">get</a>(connection_id, \*, zone_id) -> <a href="./src/cloudflare/types/page_shield/connection.py">Optional[Connection]</a></code>
 
 ## Scripts
 
@@ -2571,7 +3071,7 @@ from cloudflare.types.page_shield import Script, ScriptGetResponse
 Methods:
 
 - <code title="get /zones/{zone_id}/page_shield/scripts">client.page_shield.scripts.<a href="./src/cloudflare/resources/page_shield/scripts.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/page_shield/script_list_params.py">params</a>) -> <a href="./src/cloudflare/types/page_shield/script.py">SyncSinglePage[Script]</a></code>
-- <code title="get /zones/{zone_id}/page_shield/scripts/{script_id}">client.page_shield.scripts.<a href="./src/cloudflare/resources/page_shield/scripts.py">get</a>(script_id, \*, zone_id) -> <a href="./src/cloudflare/types/page_shield/script_get_response.py">Optional</a></code>
+- <code title="get /zones/{zone_id}/page_shield/scripts/{script_id}">client.page_shield.scripts.<a href="./src/cloudflare/resources/page_shield/scripts.py">get</a>(script_id, \*, zone_id) -> <a href="./src/cloudflare/types/page_shield/script_get_response.py">Optional[ScriptGetResponse]</a></code>
 
 ## Cookies
 
@@ -2584,7 +3084,7 @@ from cloudflare.types.page_shield import CookieListResponse, CookieGetResponse
 Methods:
 
 - <code title="get /zones/{zone_id}/page_shield/cookies">client.page_shield.cookies.<a href="./src/cloudflare/resources/page_shield/cookies.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/page_shield/cookie_list_params.py">params</a>) -> <a href="./src/cloudflare/types/page_shield/cookie_list_response.py">SyncSinglePage[CookieListResponse]</a></code>
-- <code title="get /zones/{zone_id}/page_shield/cookies/{cookie_id}">client.page_shield.cookies.<a href="./src/cloudflare/resources/page_shield/cookies.py">get</a>(cookie_id, \*, zone_id) -> <a href="./src/cloudflare/types/page_shield/cookie_get_response.py">Optional</a></code>
+- <code title="get /zones/{zone_id}/page_shield/cookies/{cookie_id}">client.page_shield.cookies.<a href="./src/cloudflare/resources/page_shield/cookies.py">get</a>(cookie_id, \*, zone_id) -> <a href="./src/cloudflare/types/page_shield/cookie_get_response.py">Optional[CookieGetResponse]</a></code>
 
 # Rulesets
 
@@ -2604,11 +3104,11 @@ from cloudflare.types.rulesets import (
 
 Methods:
 
-- <code title="post /{account_or_zone}/{account_or_zone_id}/rulesets">client.rulesets.<a href="./src/cloudflare/resources/rulesets/rulesets.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/rulesets/ruleset_create_params.py">params</a>) -> <a href="./src/cloudflare/types/rulesets/ruleset_create_response.py">RulesetCreateResponse</a></code>
-- <code title="put /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}">client.rulesets.<a href="./src/cloudflare/resources/rulesets/rulesets.py">update</a>(ruleset_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/rulesets/ruleset_update_params.py">params</a>) -> <a href="./src/cloudflare/types/rulesets/ruleset_update_response.py">RulesetUpdateResponse</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/rulesets">client.rulesets.<a href="./src/cloudflare/resources/rulesets/rulesets.py">list</a>(\*, account_id, zone_id) -> <a href="./src/cloudflare/types/rulesets/ruleset_list_response.py">SyncSinglePage[RulesetListResponse]</a></code>
-- <code title="delete /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}">client.rulesets.<a href="./src/cloudflare/resources/rulesets/rulesets.py">delete</a>(ruleset_id, \*, account_id, zone_id) -> None</code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}">client.rulesets.<a href="./src/cloudflare/resources/rulesets/rulesets.py">get</a>(ruleset_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/rulesets/ruleset_get_response.py">RulesetGetResponse</a></code>
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/rulesets">client.rulesets.<a href="./src/cloudflare/resources/rulesets/rulesets.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/rulesets/ruleset_create_params.py">params</a>) -> <a href="./src/cloudflare/types/rulesets/ruleset_create_response.py">RulesetCreateResponse</a></code>
+- <code title="put /{accounts_or_zones}/{account_or_zone_id}/rulesets/{ruleset_id}">client.rulesets.<a href="./src/cloudflare/resources/rulesets/rulesets.py">update</a>(ruleset_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/rulesets/ruleset_update_params.py">params</a>) -> <a href="./src/cloudflare/types/rulesets/ruleset_update_response.py">RulesetUpdateResponse</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/rulesets">client.rulesets.<a href="./src/cloudflare/resources/rulesets/rulesets.py">list</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/rulesets/ruleset_list_params.py">params</a>) -> <a href="./src/cloudflare/types/rulesets/ruleset_list_response.py">SyncCursorPagination[RulesetListResponse]</a></code>
+- <code title="delete /{accounts_or_zones}/{account_or_zone_id}/rulesets/{ruleset_id}">client.rulesets.<a href="./src/cloudflare/resources/rulesets/rulesets.py">delete</a>(ruleset_id, \*, account_id, zone_id) -> None</code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/rulesets/{ruleset_id}">client.rulesets.<a href="./src/cloudflare/resources/rulesets/rulesets.py">get</a>(ruleset_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/rulesets/ruleset_get_response.py">RulesetGetResponse</a></code>
 
 ## Phases
 
@@ -2620,8 +3120,8 @@ from cloudflare.types.rulesets import PhaseUpdateResponse, PhaseGetResponse
 
 Methods:
 
-- <code title="put /{account_or_zone}/{account_or_zone_id}/rulesets/phases/{ruleset_phase}/entrypoint">client.rulesets.phases.<a href="./src/cloudflare/resources/rulesets/phases/phases.py">update</a>(ruleset_phase, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/rulesets/phase_update_params.py">params</a>) -> <a href="./src/cloudflare/types/rulesets/phase_update_response.py">PhaseUpdateResponse</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/rulesets/phases/{ruleset_phase}/entrypoint">client.rulesets.phases.<a href="./src/cloudflare/resources/rulesets/phases/phases.py">get</a>(ruleset_phase, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/rulesets/phase_get_response.py">PhaseGetResponse</a></code>
+- <code title="put /{accounts_or_zones}/{account_or_zone_id}/rulesets/phases/{ruleset_phase}/entrypoint">client.rulesets.phases.<a href="./src/cloudflare/resources/rulesets/phases/phases.py">update</a>(ruleset_phase, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/rulesets/phase_update_params.py">params</a>) -> <a href="./src/cloudflare/types/rulesets/phase_update_response.py">PhaseUpdateResponse</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/rulesets/phases/{ruleset_phase}/entrypoint">client.rulesets.phases.<a href="./src/cloudflare/resources/rulesets/phases/phases.py">get</a>(ruleset_phase, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/rulesets/phase_get_response.py">PhaseGetResponse</a></code>
 
 ### Versions
 
@@ -2633,8 +3133,8 @@ from cloudflare.types.rulesets.phases import VersionListResponse, VersionGetResp
 
 Methods:
 
-- <code title="get /{account_or_zone}/{account_or_zone_id}/rulesets/phases/{ruleset_phase}/entrypoint/versions">client.rulesets.phases.versions.<a href="./src/cloudflare/resources/rulesets/phases/versions.py">list</a>(ruleset_phase, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/rulesets/phases/version_list_response.py">SyncSinglePage[VersionListResponse]</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/rulesets/phases/{ruleset_phase}/entrypoint/versions/{ruleset_version}">client.rulesets.phases.versions.<a href="./src/cloudflare/resources/rulesets/phases/versions.py">get</a>(ruleset_version, \*, ruleset_phase, account_id, zone_id) -> <a href="./src/cloudflare/types/rulesets/phases/version_get_response.py">VersionGetResponse</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/rulesets/phases/{ruleset_phase}/entrypoint/versions">client.rulesets.phases.versions.<a href="./src/cloudflare/resources/rulesets/phases/versions.py">list</a>(ruleset_phase, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/rulesets/phases/version_list_response.py">SyncSinglePage[VersionListResponse]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/rulesets/phases/{ruleset_phase}/entrypoint/versions/{ruleset_version}">client.rulesets.phases.versions.<a href="./src/cloudflare/resources/rulesets/phases/versions.py">get</a>(ruleset_version, \*, ruleset_phase, account_id, zone_id) -> <a href="./src/cloudflare/types/rulesets/phases/version_get_response.py">VersionGetResponse</a></code>
 
 ## Rules
 
@@ -2643,16 +3143,16 @@ Types:
 ```python
 from cloudflare.types.rulesets import (
     BlockRule,
-    ChallengeRule,
     CompressResponseRule,
+    DDoSDynamicRule,
     ExecuteRule,
-    JSChallengeRule,
+    ForceConnectionCloseRule,
+    LogCustomFieldRule,
     LogRule,
     Logging,
     ManagedChallengeRule,
     RedirectRule,
     RewriteRule,
-    RewriteURIPart,
     RouteRule,
     RulesetRule,
     ScoreRule,
@@ -2668,9 +3168,9 @@ from cloudflare.types.rulesets import (
 
 Methods:
 
-- <code title="post /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/rules">client.rulesets.rules.<a href="./src/cloudflare/resources/rulesets/rules.py">create</a>(ruleset_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/rulesets/rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/rulesets/rule_create_response.py">RuleCreateResponse</a></code>
-- <code title="delete /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/rules/{rule_id}">client.rulesets.rules.<a href="./src/cloudflare/resources/rulesets/rules.py">delete</a>(rule_id, \*, ruleset_id, account_id, zone_id) -> <a href="./src/cloudflare/types/rulesets/rule_delete_response.py">RuleDeleteResponse</a></code>
-- <code title="patch /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/rules/{rule_id}">client.rulesets.rules.<a href="./src/cloudflare/resources/rulesets/rules.py">edit</a>(rule_id, \*, ruleset_id, account_id, zone_id, \*\*<a href="src/cloudflare/types/rulesets/rule_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/rulesets/rule_edit_response.py">RuleEditResponse</a></code>
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/rulesets/{ruleset_id}/rules">client.rulesets.rules.<a href="./src/cloudflare/resources/rulesets/rules.py">create</a>(ruleset_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/rulesets/rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/rulesets/rule_create_response.py">RuleCreateResponse</a></code>
+- <code title="delete /{accounts_or_zones}/{account_or_zone_id}/rulesets/{ruleset_id}/rules/{rule_id}">client.rulesets.rules.<a href="./src/cloudflare/resources/rulesets/rules.py">delete</a>(rule_id, \*, ruleset_id, account_id, zone_id) -> <a href="./src/cloudflare/types/rulesets/rule_delete_response.py">RuleDeleteResponse</a></code>
+- <code title="patch /{accounts_or_zones}/{account_or_zone_id}/rulesets/{ruleset_id}/rules/{rule_id}">client.rulesets.rules.<a href="./src/cloudflare/resources/rulesets/rules.py">edit</a>(rule_id, \*, ruleset_id, account_id, zone_id, \*\*<a href="src/cloudflare/types/rulesets/rule_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/rulesets/rule_edit_response.py">RuleEditResponse</a></code>
 
 ## Versions
 
@@ -2682,21 +3182,9 @@ from cloudflare.types.rulesets import VersionListResponse, VersionGetResponse
 
 Methods:
 
-- <code title="get /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions">client.rulesets.versions.<a href="./src/cloudflare/resources/rulesets/versions/versions.py">list</a>(ruleset_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/rulesets/version_list_response.py">SyncSinglePage[VersionListResponse]</a></code>
-- <code title="delete /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions/{ruleset_version}">client.rulesets.versions.<a href="./src/cloudflare/resources/rulesets/versions/versions.py">delete</a>(ruleset_version, \*, ruleset_id, account_id, zone_id) -> None</code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions/{ruleset_version}">client.rulesets.versions.<a href="./src/cloudflare/resources/rulesets/versions/versions.py">get</a>(ruleset_version, \*, ruleset_id, account_id, zone_id) -> <a href="./src/cloudflare/types/rulesets/version_get_response.py">VersionGetResponse</a></code>
-
-### ByTag
-
-Types:
-
-```python
-from cloudflare.types.rulesets.versions import ByTagGetResponse
-```
-
-Methods:
-
-- <code title="get /accounts/{account_id}/rulesets/{ruleset_id}/versions/{ruleset_version}/by_tag/{rule_tag}">client.rulesets.versions.by_tag.<a href="./src/cloudflare/resources/rulesets/versions/by_tag.py">get</a>(rule_tag, \*, account_id, ruleset_id, ruleset_version) -> <a href="./src/cloudflare/types/rulesets/versions/by_tag_get_response.py">ByTagGetResponse</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/rulesets/{ruleset_id}/versions">client.rulesets.versions.<a href="./src/cloudflare/resources/rulesets/versions.py">list</a>(ruleset_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/rulesets/version_list_response.py">SyncSinglePage[VersionListResponse]</a></code>
+- <code title="delete /{accounts_or_zones}/{account_or_zone_id}/rulesets/{ruleset_id}/versions/{ruleset_version}">client.rulesets.versions.<a href="./src/cloudflare/resources/rulesets/versions.py">delete</a>(ruleset_version, \*, ruleset_id, account_id, zone_id) -> None</code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/rulesets/{ruleset_id}/versions/{ruleset_version}">client.rulesets.versions.<a href="./src/cloudflare/resources/rulesets/versions.py">get</a>(ruleset_version, \*, ruleset_id, account_id, zone_id) -> <a href="./src/cloudflare/types/rulesets/version_get_response.py">VersionGetResponse</a></code>
 
 # URLNormalization
 
@@ -2712,6 +3200,7 @@ from cloudflare.types.url_normalization import (
 Methods:
 
 - <code title="put /zones/{zone_id}/url_normalization">client.url_normalization.<a href="./src/cloudflare/resources/url_normalization.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/url_normalization/url_normalization_update_params.py">params</a>) -> <a href="./src/cloudflare/types/url_normalization/url_normalization_update_response.py">URLNormalizationUpdateResponse</a></code>
+- <code title="delete /zones/{zone_id}/url_normalization">client.url_normalization.<a href="./src/cloudflare/resources/url_normalization.py">delete</a>(\*, zone_id) -> None</code>
 - <code title="get /zones/{zone_id}/url_normalization">client.url_normalization.<a href="./src/cloudflare/resources/url_normalization.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/url_normalization/url_normalization_get_response.py">URLNormalizationGetResponse</a></code>
 
 # Spectrum
@@ -2736,7 +3225,7 @@ from cloudflare.types.spectrum.analytics.aggregates import CurrentGetResponse
 
 Methods:
 
-- <code title="get /zones/{zone}/spectrum/analytics/aggregate/current">client.spectrum.analytics.aggregates.currents.<a href="./src/cloudflare/resources/spectrum/analytics/aggregates/currents.py">get</a>(zone, \*\*<a href="src/cloudflare/types/spectrum/analytics/aggregates/current_get_params.py">params</a>) -> <a href="./src/cloudflare/types/spectrum/analytics/aggregates/current_get_response.py">CurrentGetResponse</a></code>
+- <code title="get /zones/{zone_id}/spectrum/analytics/aggregate/current">client.spectrum.analytics.aggregates.currents.<a href="./src/cloudflare/resources/spectrum/analytics/aggregates/currents.py">get</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/spectrum/analytics/aggregates/current_get_params.py">params</a>) -> <a href="./src/cloudflare/types/spectrum/analytics/aggregates/current_get_response.py">Optional[CurrentGetResponse]</a></code>
 
 ### Events
 
@@ -2756,7 +3245,7 @@ from cloudflare.types.spectrum.analytics.events import BytimeGetResponse
 
 Methods:
 
-- <code title="get /zones/{zone}/spectrum/analytics/events/bytime">client.spectrum.analytics.events.bytimes.<a href="./src/cloudflare/resources/spectrum/analytics/events/bytimes.py">get</a>(zone, \*\*<a href="src/cloudflare/types/spectrum/analytics/events/bytime_get_params.py">params</a>) -> <a href="./src/cloudflare/types/spectrum/analytics/events/bytime_get_response.py">Optional</a></code>
+- <code title="get /zones/{zone_id}/spectrum/analytics/events/bytime">client.spectrum.analytics.events.bytimes.<a href="./src/cloudflare/resources/spectrum/analytics/events/bytimes.py">get</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/spectrum/analytics/events/bytime_get_params.py">params</a>) -> <a href="./src/cloudflare/types/spectrum/analytics/events/bytime_get_response.py">Optional[BytimeGetResponse]</a></code>
 
 #### Summaries
 
@@ -2768,7 +3257,7 @@ from cloudflare.types.spectrum.analytics.events import SummaryGetResponse
 
 Methods:
 
-- <code title="get /zones/{zone}/spectrum/analytics/events/summary">client.spectrum.analytics.events.summaries.<a href="./src/cloudflare/resources/spectrum/analytics/events/summaries.py">get</a>(zone, \*\*<a href="src/cloudflare/types/spectrum/analytics/events/summary_get_params.py">params</a>) -> <a href="./src/cloudflare/types/spectrum/analytics/events/summary_get_response.py">Optional</a></code>
+- <code title="get /zones/{zone_id}/spectrum/analytics/events/summary">client.spectrum.analytics.events.summaries.<a href="./src/cloudflare/resources/spectrum/analytics/events/summaries.py">get</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/spectrum/analytics/events/summary_get_params.py">params</a>) -> <a href="./src/cloudflare/types/spectrum/analytics/events/summary_get_response.py">Optional[SummaryGetResponse]</a></code>
 
 ## Apps
 
@@ -2786,11 +3275,11 @@ from cloudflare.types.spectrum import (
 
 Methods:
 
-- <code title="post /zones/{zone}/spectrum/apps">client.spectrum.apps.<a href="./src/cloudflare/resources/spectrum/apps.py">create</a>(zone, \*\*<a href="src/cloudflare/types/spectrum/app_create_params.py">params</a>) -> <a href="./src/cloudflare/types/spectrum/app_create_response.py">Optional</a></code>
-- <code title="put /zones/{zone}/spectrum/apps/{app_id}">client.spectrum.apps.<a href="./src/cloudflare/resources/spectrum/apps.py">update</a>(app_id, \*, zone, \*\*<a href="src/cloudflare/types/spectrum/app_update_params.py">params</a>) -> <a href="./src/cloudflare/types/spectrum/app_update_response.py">Optional</a></code>
-- <code title="get /zones/{zone}/spectrum/apps">client.spectrum.apps.<a href="./src/cloudflare/resources/spectrum/apps.py">list</a>(zone, \*\*<a href="src/cloudflare/types/spectrum/app_list_params.py">params</a>) -> <a href="./src/cloudflare/types/spectrum/app_list_response.py">SyncV4PagePaginationArray[object]</a></code>
-- <code title="delete /zones/{zone}/spectrum/apps/{app_id}">client.spectrum.apps.<a href="./src/cloudflare/resources/spectrum/apps.py">delete</a>(app_id, \*, zone) -> <a href="./src/cloudflare/types/spectrum/app_delete_response.py">Optional</a></code>
-- <code title="get /zones/{zone}/spectrum/apps/{app_id}">client.spectrum.apps.<a href="./src/cloudflare/resources/spectrum/apps.py">get</a>(app_id, \*, zone) -> <a href="./src/cloudflare/types/spectrum/app_get_response.py">AppGetResponse</a></code>
+- <code title="post /zones/{zone_id}/spectrum/apps">client.spectrum.apps.<a href="./src/cloudflare/resources/spectrum/apps.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/spectrum/app_create_params.py">params</a>) -> <a href="./src/cloudflare/types/spectrum/app_create_response.py">Optional[AppCreateResponse]</a></code>
+- <code title="put /zones/{zone_id}/spectrum/apps/{app_id}">client.spectrum.apps.<a href="./src/cloudflare/resources/spectrum/apps.py">update</a>(app_id, \*, zone_id, \*\*<a href="src/cloudflare/types/spectrum/app_update_params.py">params</a>) -> <a href="./src/cloudflare/types/spectrum/app_update_response.py">Optional[AppUpdateResponse]</a></code>
+- <code title="get /zones/{zone_id}/spectrum/apps">client.spectrum.apps.<a href="./src/cloudflare/resources/spectrum/apps.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/spectrum/app_list_params.py">params</a>) -> <a href="./src/cloudflare/types/spectrum/app_list_response.py">SyncV4PagePaginationArray[AppListResponse]</a></code>
+- <code title="delete /zones/{zone_id}/spectrum/apps/{app_id}">client.spectrum.apps.<a href="./src/cloudflare/resources/spectrum/apps.py">delete</a>(app_id, \*, zone_id) -> <a href="./src/cloudflare/types/spectrum/app_delete_response.py">Optional[AppDeleteResponse]</a></code>
+- <code title="get /zones/{zone_id}/spectrum/apps/{app_id}">client.spectrum.apps.<a href="./src/cloudflare/resources/spectrum/apps.py">get</a>(app_id, \*, zone_id) -> <a href="./src/cloudflare/types/spectrum/app_get_response.py">Optional[AppGetResponse]</a></code>
 
 # Addressing
 
@@ -2810,11 +3299,11 @@ from cloudflare.types.addressing import (
 
 Methods:
 
-- <code title="post /zones/{zone_id}/addressing/regional_hostnames">client.addressing.regional_hostnames.<a href="./src/cloudflare/resources/addressing/regional_hostnames/regional_hostnames.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/addressing/regional_hostname_create_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/regional_hostname_create_response.py">Optional</a></code>
+- <code title="post /zones/{zone_id}/addressing/regional_hostnames">client.addressing.regional_hostnames.<a href="./src/cloudflare/resources/addressing/regional_hostnames/regional_hostnames.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/addressing/regional_hostname_create_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/regional_hostname_create_response.py">Optional[RegionalHostnameCreateResponse]</a></code>
 - <code title="get /zones/{zone_id}/addressing/regional_hostnames">client.addressing.regional_hostnames.<a href="./src/cloudflare/resources/addressing/regional_hostnames/regional_hostnames.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/addressing/regional_hostname_list_response.py">SyncSinglePage[RegionalHostnameListResponse]</a></code>
 - <code title="delete /zones/{zone_id}/addressing/regional_hostnames/{hostname}">client.addressing.regional_hostnames.<a href="./src/cloudflare/resources/addressing/regional_hostnames/regional_hostnames.py">delete</a>(hostname, \*, zone_id) -> <a href="./src/cloudflare/types/addressing/regional_hostname_delete_response.py">RegionalHostnameDeleteResponse</a></code>
-- <code title="patch /zones/{zone_id}/addressing/regional_hostnames/{hostname}">client.addressing.regional_hostnames.<a href="./src/cloudflare/resources/addressing/regional_hostnames/regional_hostnames.py">edit</a>(hostname, \*, zone_id, \*\*<a href="src/cloudflare/types/addressing/regional_hostname_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/regional_hostname_edit_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/addressing/regional_hostnames/{hostname}">client.addressing.regional_hostnames.<a href="./src/cloudflare/resources/addressing/regional_hostnames/regional_hostnames.py">get</a>(hostname, \*, zone_id) -> <a href="./src/cloudflare/types/addressing/regional_hostname_get_response.py">Optional</a></code>
+- <code title="patch /zones/{zone_id}/addressing/regional_hostnames/{hostname}">client.addressing.regional_hostnames.<a href="./src/cloudflare/resources/addressing/regional_hostnames/regional_hostnames.py">edit</a>(hostname, \*, zone_id, \*\*<a href="src/cloudflare/types/addressing/regional_hostname_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/regional_hostname_edit_response.py">Optional[RegionalHostnameEditResponse]</a></code>
+- <code title="get /zones/{zone_id}/addressing/regional_hostnames/{hostname}">client.addressing.regional_hostnames.<a href="./src/cloudflare/resources/addressing/regional_hostnames/regional_hostnames.py">get</a>(hostname, \*, zone_id) -> <a href="./src/cloudflare/types/addressing/regional_hostname_get_response.py">Optional[RegionalHostnameGetResponse]</a></code>
 
 ### Regions
 
@@ -2856,11 +3345,11 @@ from cloudflare.types.addressing import (
 
 Methods:
 
-- <code title="post /accounts/{account_id}/addressing/address_maps">client.addressing.address_maps.<a href="./src/cloudflare/resources/addressing/address_maps/address_maps.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/addressing/address_map_create_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/address_map_create_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/addressing/address_maps">client.addressing.address_maps.<a href="./src/cloudflare/resources/addressing/address_maps/address_maps.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/addressing/address_map_create_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/address_map_create_response.py">Optional[AddressMapCreateResponse]</a></code>
 - <code title="get /accounts/{account_id}/addressing/address_maps">client.addressing.address_maps.<a href="./src/cloudflare/resources/addressing/address_maps/address_maps.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/addressing/address_map.py">SyncSinglePage[AddressMap]</a></code>
-- <code title="delete /accounts/{account_id}/addressing/address_maps/{address_map_id}">client.addressing.address_maps.<a href="./src/cloudflare/resources/addressing/address_maps/address_maps.py">delete</a>(address_map_id, \*, account_id) -> <a href="./src/cloudflare/types/addressing/address_map_delete_response.py">Optional</a></code>
-- <code title="patch /accounts/{account_id}/addressing/address_maps/{address_map_id}">client.addressing.address_maps.<a href="./src/cloudflare/resources/addressing/address_maps/address_maps.py">edit</a>(address_map_id, \*, account_id, \*\*<a href="src/cloudflare/types/addressing/address_map_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/address_map.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/addressing/address_maps/{address_map_id}">client.addressing.address_maps.<a href="./src/cloudflare/resources/addressing/address_maps/address_maps.py">get</a>(address_map_id, \*, account_id) -> <a href="./src/cloudflare/types/addressing/address_map_get_response.py">Optional</a></code>
+- <code title="delete /accounts/{account_id}/addressing/address_maps/{address_map_id}">client.addressing.address_maps.<a href="./src/cloudflare/resources/addressing/address_maps/address_maps.py">delete</a>(address_map_id, \*, account_id) -> <a href="./src/cloudflare/types/addressing/address_map_delete_response.py">AddressMapDeleteResponse</a></code>
+- <code title="patch /accounts/{account_id}/addressing/address_maps/{address_map_id}">client.addressing.address_maps.<a href="./src/cloudflare/resources/addressing/address_maps/address_maps.py">edit</a>(address_map_id, \*, account_id, \*\*<a href="src/cloudflare/types/addressing/address_map_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/address_map.py">Optional[AddressMap]</a></code>
+- <code title="get /accounts/{account_id}/addressing/address_maps/{address_map_id}">client.addressing.address_maps.<a href="./src/cloudflare/resources/addressing/address_maps/address_maps.py">get</a>(address_map_id, \*, account_id) -> <a href="./src/cloudflare/types/addressing/address_map_get_response.py">Optional[AddressMapGetResponse]</a></code>
 
 ### Accounts
 
@@ -2872,8 +3361,8 @@ from cloudflare.types.addressing.address_maps import AccountUpdateResponse, Acco
 
 Methods:
 
-- <code title="put /accounts/{account_id}/addressing/address_maps/{address_map_id}/accounts/{account_id}">client.addressing.address_maps.accounts.<a href="./src/cloudflare/resources/addressing/address_maps/accounts.py">update</a>(address_map_id, \*, account_id, \*\*<a href="src/cloudflare/types/addressing/address_maps/account_update_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/address_maps/account_update_response.py">Optional</a></code>
-- <code title="delete /accounts/{account_id}/addressing/address_maps/{address_map_id}/accounts/{account_id}">client.addressing.address_maps.accounts.<a href="./src/cloudflare/resources/addressing/address_maps/accounts.py">delete</a>(address_map_id, \*, account_id) -> <a href="./src/cloudflare/types/addressing/address_maps/account_delete_response.py">Optional</a></code>
+- <code title="put /accounts/{account_id}/addressing/address_maps/{address_map_id}/accounts/{account_id}">client.addressing.address_maps.accounts.<a href="./src/cloudflare/resources/addressing/address_maps/accounts.py">update</a>(address_map_id, \*, account_id, \*\*<a href="src/cloudflare/types/addressing/address_maps/account_update_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/address_maps/account_update_response.py">AccountUpdateResponse</a></code>
+- <code title="delete /accounts/{account_id}/addressing/address_maps/{address_map_id}/accounts/{account_id}">client.addressing.address_maps.accounts.<a href="./src/cloudflare/resources/addressing/address_maps/accounts.py">delete</a>(address_map_id, \*, account_id) -> <a href="./src/cloudflare/types/addressing/address_maps/account_delete_response.py">AccountDeleteResponse</a></code>
 
 ### IPs
 
@@ -2885,8 +3374,8 @@ from cloudflare.types.addressing.address_maps import IPUpdateResponse, IPDeleteR
 
 Methods:
 
-- <code title="put /accounts/{account_id}/addressing/address_maps/{address_map_id}/ips/{ip_address}">client.addressing.address_maps.ips.<a href="./src/cloudflare/resources/addressing/address_maps/ips.py">update</a>(ip_address, \*, account_id, address_map_id, \*\*<a href="src/cloudflare/types/addressing/address_maps/ip_update_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/address_maps/ip_update_response.py">Optional</a></code>
-- <code title="delete /accounts/{account_id}/addressing/address_maps/{address_map_id}/ips/{ip_address}">client.addressing.address_maps.ips.<a href="./src/cloudflare/resources/addressing/address_maps/ips.py">delete</a>(ip_address, \*, account_id, address_map_id) -> <a href="./src/cloudflare/types/addressing/address_maps/ip_delete_response.py">Optional</a></code>
+- <code title="put /accounts/{account_id}/addressing/address_maps/{address_map_id}/ips/{ip_address}">client.addressing.address_maps.ips.<a href="./src/cloudflare/resources/addressing/address_maps/ips.py">update</a>(ip_address, \*, account_id, address_map_id, \*\*<a href="src/cloudflare/types/addressing/address_maps/ip_update_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/address_maps/ip_update_response.py">IPUpdateResponse</a></code>
+- <code title="delete /accounts/{account_id}/addressing/address_maps/{address_map_id}/ips/{ip_address}">client.addressing.address_maps.ips.<a href="./src/cloudflare/resources/addressing/address_maps/ips.py">delete</a>(ip_address, \*, account_id, address_map_id) -> <a href="./src/cloudflare/types/addressing/address_maps/ip_delete_response.py">IPDeleteResponse</a></code>
 
 ### Zones
 
@@ -2898,8 +3387,8 @@ from cloudflare.types.addressing.address_maps import ZoneUpdateResponse, ZoneDel
 
 Methods:
 
-- <code title="put /accounts/{account_id}/addressing/address_maps/{address_map_id}/zones/{zone_id}">client.addressing.address_maps.zones.<a href="./src/cloudflare/resources/addressing/address_maps/zones.py">update</a>(address_map_id, \*, zone_id, account_id, \*\*<a href="src/cloudflare/types/addressing/address_maps/zone_update_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/address_maps/zone_update_response.py">Optional</a></code>
-- <code title="delete /accounts/{account_id}/addressing/address_maps/{address_map_id}/zones/{zone_id}">client.addressing.address_maps.zones.<a href="./src/cloudflare/resources/addressing/address_maps/zones.py">delete</a>(address_map_id, \*, zone_id, account_id) -> <a href="./src/cloudflare/types/addressing/address_maps/zone_delete_response.py">Optional</a></code>
+- <code title="put /accounts/{account_id}/addressing/address_maps/{address_map_id}/zones/{zone_id}">client.addressing.address_maps.zones.<a href="./src/cloudflare/resources/addressing/address_maps/zones.py">update</a>(address_map_id, \*, zone_id, account_id, \*\*<a href="src/cloudflare/types/addressing/address_maps/zone_update_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/address_maps/zone_update_response.py">ZoneUpdateResponse</a></code>
+- <code title="delete /accounts/{account_id}/addressing/address_maps/{address_map_id}/zones/{zone_id}">client.addressing.address_maps.zones.<a href="./src/cloudflare/resources/addressing/address_maps/zones.py">delete</a>(address_map_id, \*, zone_id, account_id) -> <a href="./src/cloudflare/types/addressing/address_maps/zone_delete_response.py">ZoneDeleteResponse</a></code>
 
 ## LOADocuments
 
@@ -2911,15 +3400,10 @@ from cloudflare.types.addressing import LOADocumentCreateResponse
 
 Methods:
 
-- <code title="post /accounts/{account_id}/addressing/loa_documents">client.addressing.loa_documents.<a href="./src/cloudflare/resources/addressing/loa_documents/loa_documents.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/addressing/loa_document_create_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/loa_document_create_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/addressing/loa_documents">client.addressing.loa_documents.<a href="./src/cloudflare/resources/addressing/loa_documents.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/addressing/loa_document_create_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/loa_document_create_response.py">Optional[LOADocumentCreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/addressing/loa_documents/{loa_document_id}/download">client.addressing.loa_documents.<a href="./src/cloudflare/resources/addressing/loa_documents.py">get</a>(loa_document_id, \*, account_id) -> BinaryAPIResponse</code>
 
-### Downloads
-
-Methods:
-
-- <code title="get /accounts/{account_id}/addressing/loa_documents/{loa_document_id}/download">client.addressing.loa_documents.downloads.<a href="./src/cloudflare/resources/addressing/loa_documents/downloads.py">get</a>(loa_document_id, \*, account_id) -> BinaryAPIResponse</code>
-
-## Prefixes
+## Prefixes
 
 Types:
 
@@ -2929,55 +3413,57 @@ from cloudflare.types.addressing import Prefix, PrefixDeleteResponse
 
 Methods:
 
-- <code title="post /accounts/{account_id}/addressing/prefixes">client.addressing.prefixes.<a href="./src/cloudflare/resources/addressing/prefixes/prefixes.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/addressing/prefix_create_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/prefix.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/addressing/prefixes">client.addressing.prefixes.<a href="./src/cloudflare/resources/addressing/prefixes/prefixes.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/addressing/prefix_create_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/prefix.py">Optional[Prefix]</a></code>
 - <code title="get /accounts/{account_id}/addressing/prefixes">client.addressing.prefixes.<a href="./src/cloudflare/resources/addressing/prefixes/prefixes.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/addressing/prefix.py">SyncSinglePage[Prefix]</a></code>
-- <code title="delete /accounts/{account_id}/addressing/prefixes/{prefix_id}">client.addressing.prefixes.<a href="./src/cloudflare/resources/addressing/prefixes/prefixes.py">delete</a>(prefix_id, \*, account_id) -> <a href="./src/cloudflare/types/addressing/prefix_delete_response.py">Optional</a></code>
-- <code title="patch /accounts/{account_id}/addressing/prefixes/{prefix_id}">client.addressing.prefixes.<a href="./src/cloudflare/resources/addressing/prefixes/prefixes.py">edit</a>(prefix_id, \*, account_id, \*\*<a href="src/cloudflare/types/addressing/prefix_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/prefix.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}">client.addressing.prefixes.<a href="./src/cloudflare/resources/addressing/prefixes/prefixes.py">get</a>(prefix_id, \*, account_id) -> <a href="./src/cloudflare/types/addressing/prefix.py">Optional</a></code>
+- <code title="delete /accounts/{account_id}/addressing/prefixes/{prefix_id}">client.addressing.prefixes.<a href="./src/cloudflare/resources/addressing/prefixes/prefixes.py">delete</a>(prefix_id, \*, account_id) -> <a href="./src/cloudflare/types/addressing/prefix_delete_response.py">PrefixDeleteResponse</a></code>
+- <code title="patch /accounts/{account_id}/addressing/prefixes/{prefix_id}">client.addressing.prefixes.<a href="./src/cloudflare/resources/addressing/prefixes/prefixes.py">edit</a>(prefix_id, \*, account_id, \*\*<a href="src/cloudflare/types/addressing/prefix_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/prefix.py">Optional[Prefix]</a></code>
+- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}">client.addressing.prefixes.<a href="./src/cloudflare/resources/addressing/prefixes/prefixes.py">get</a>(prefix_id, \*, account_id) -> <a href="./src/cloudflare/types/addressing/prefix.py">Optional[Prefix]</a></code>
 
-### BGP
-
-#### Bindings
+### ServiceBindings
 
 Types:
 
 ```python
-from cloudflare.types.addressing.prefixes.bgp import ServiceBinding, BindingDeleteResponse
+from cloudflare.types.addressing.prefixes import ServiceBinding, ServiceBindingDeleteResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings">client.addressing.prefixes.bgp.bindings.<a href="./src/cloudflare/resources/addressing/prefixes/bgp/bindings.py">create</a>(prefix_id, \*, account_id, \*\*<a href="src/cloudflare/types/addressing/prefixes/bgp/binding_create_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/prefixes/bgp/service_binding.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings">client.addressing.prefixes.bgp.bindings.<a href="./src/cloudflare/resources/addressing/prefixes/bgp/bindings.py">list</a>(prefix_id, \*, account_id) -> <a href="./src/cloudflare/types/addressing/prefixes/bgp/service_binding.py">SyncSinglePage[ServiceBinding]</a></code>
-- <code title="delete /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings/{binding_id}">client.addressing.prefixes.bgp.bindings.<a href="./src/cloudflare/resources/addressing/prefixes/bgp/bindings.py">delete</a>(binding_id, \*, account_id, prefix_id) -> <a href="./src/cloudflare/types/addressing/prefixes/bgp/binding_delete_response.py">BindingDeleteResponse</a></code>
-- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings/{binding_id}">client.addressing.prefixes.bgp.bindings.<a href="./src/cloudflare/resources/addressing/prefixes/bgp/bindings.py">get</a>(binding_id, \*, account_id, prefix_id) -> <a href="./src/cloudflare/types/addressing/prefixes/bgp/service_binding.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings">client.addressing.prefixes.service_bindings.<a href="./src/cloudflare/resources/addressing/prefixes/service_bindings.py">create</a>(prefix_id, \*, account_id, \*\*<a href="src/cloudflare/types/addressing/prefixes/service_binding_create_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/prefixes/service_binding.py">Optional[ServiceBinding]</a></code>
+- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings">client.addressing.prefixes.service_bindings.<a href="./src/cloudflare/resources/addressing/prefixes/service_bindings.py">list</a>(prefix_id, \*, account_id) -> <a href="./src/cloudflare/types/addressing/prefixes/service_binding.py">SyncSinglePage[ServiceBinding]</a></code>
+- <code title="delete /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings/{binding_id}">client.addressing.prefixes.service_bindings.<a href="./src/cloudflare/resources/addressing/prefixes/service_bindings.py">delete</a>(binding_id, \*, account_id, prefix_id) -> <a href="./src/cloudflare/types/addressing/prefixes/service_binding_delete_response.py">ServiceBindingDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings/{binding_id}">client.addressing.prefixes.service_bindings.<a href="./src/cloudflare/resources/addressing/prefixes/service_bindings.py">get</a>(binding_id, \*, account_id, prefix_id) -> <a href="./src/cloudflare/types/addressing/prefixes/service_binding.py">Optional[ServiceBinding]</a></code>
 
-#### Prefixes
+### BGPPrefixes
 
 Types:
 
 ```python
-from cloudflare.types.addressing.prefixes.bgp import BGPPrefix
+from cloudflare.types.addressing.prefixes import BGPPrefix
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes">client.addressing.prefixes.bgp.prefixes.<a href="./src/cloudflare/resources/addressing/prefixes/bgp/prefixes.py">list</a>(prefix_id, \*, account_id) -> <a href="./src/cloudflare/types/addressing/prefixes/bgp/bgp_prefix.py">SyncSinglePage[BGPPrefix]</a></code>
-- <code title="patch /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}">client.addressing.prefixes.bgp.prefixes.<a href="./src/cloudflare/resources/addressing/prefixes/bgp/prefixes.py">edit</a>(bgp_prefix_id, \*, account_id, prefix_id, \*\*<a href="src/cloudflare/types/addressing/prefixes/bgp/prefix_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/prefixes/bgp/bgp_prefix.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}">client.addressing.prefixes.bgp.prefixes.<a href="./src/cloudflare/resources/addressing/prefixes/bgp/prefixes.py">get</a>(bgp_prefix_id, \*, account_id, prefix_id) -> <a href="./src/cloudflare/types/addressing/prefixes/bgp/bgp_prefix.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes">client.addressing.prefixes.bgp_prefixes.<a href="./src/cloudflare/resources/addressing/prefixes/bgp_prefixes.py">create</a>(prefix_id, \*, account_id, \*\*<a href="src/cloudflare/types/addressing/prefixes/bgp_prefix_create_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/prefixes/bgp_prefix.py">Optional[BGPPrefix]</a></code>
+- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes">client.addressing.prefixes.bgp_prefixes.<a href="./src/cloudflare/resources/addressing/prefixes/bgp_prefixes.py">list</a>(prefix_id, \*, account_id) -> <a href="./src/cloudflare/types/addressing/prefixes/bgp_prefix.py">SyncSinglePage[BGPPrefix]</a></code>
+- <code title="patch /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}">client.addressing.prefixes.bgp_prefixes.<a href="./src/cloudflare/resources/addressing/prefixes/bgp_prefixes.py">edit</a>(bgp_prefix_id, \*, account_id, prefix_id, \*\*<a href="src/cloudflare/types/addressing/prefixes/bgp_prefix_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/prefixes/bgp_prefix.py">Optional[BGPPrefix]</a></code>
+- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}">client.addressing.prefixes.bgp_prefixes.<a href="./src/cloudflare/resources/addressing/prefixes/bgp_prefixes.py">get</a>(bgp_prefix_id, \*, account_id, prefix_id) -> <a href="./src/cloudflare/types/addressing/prefixes/bgp_prefix.py">Optional[BGPPrefix]</a></code>
 
-#### Statuses
+### AdvertisementStatus
 
 Types:
 
 ```python
-from cloudflare.types.addressing.prefixes.bgp import StatusEditResponse, StatusGetResponse
+from cloudflare.types.addressing.prefixes import (
+    AdvertisementStatusEditResponse,
+    AdvertisementStatusGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="patch /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/status">client.addressing.prefixes.bgp.statuses.<a href="./src/cloudflare/resources/addressing/prefixes/bgp/statuses.py">edit</a>(prefix_id, \*, account_id, \*\*<a href="src/cloudflare/types/addressing/prefixes/bgp/status_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/prefixes/bgp/status_edit_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/status">client.addressing.prefixes.bgp.statuses.<a href="./src/cloudflare/resources/addressing/prefixes/bgp/statuses.py">get</a>(prefix_id, \*, account_id) -> <a href="./src/cloudflare/types/addressing/prefixes/bgp/status_get_response.py">Optional</a></code>
+- <code title="patch /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/status">client.addressing.prefixes.advertisement_status.<a href="./src/cloudflare/resources/addressing/prefixes/advertisement_status.py">edit</a>(prefix_id, \*, account_id, \*\*<a href="src/cloudflare/types/addressing/prefixes/advertisement_status_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/prefixes/advertisement_status_edit_response.py">Optional[AdvertisementStatusEditResponse]</a></code>
+- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/status">client.addressing.prefixes.advertisement_status.<a href="./src/cloudflare/resources/addressing/prefixes/advertisement_status.py">get</a>(prefix_id, \*, account_id) -> <a href="./src/cloudflare/types/addressing/prefixes/advertisement_status_get_response.py">Optional[AdvertisementStatusGetResponse]</a></code>
 
 ### Delegations
 
@@ -2989,9 +3475,9 @@ from cloudflare.types.addressing.prefixes import Delegations, DelegationDeleteRe
 
 Methods:
 
-- <code title="post /accounts/{account_id}/addressing/prefixes/{prefix_id}/delegations">client.addressing.prefixes.delegations.<a href="./src/cloudflare/resources/addressing/prefixes/delegations.py">create</a>(prefix_id, \*, account_id, \*\*<a href="src/cloudflare/types/addressing/prefixes/delegation_create_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/prefixes/delegations.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/addressing/prefixes/{prefix_id}/delegations">client.addressing.prefixes.delegations.<a href="./src/cloudflare/resources/addressing/prefixes/delegations.py">create</a>(prefix_id, \*, account_id, \*\*<a href="src/cloudflare/types/addressing/prefixes/delegation_create_params.py">params</a>) -> <a href="./src/cloudflare/types/addressing/prefixes/delegations.py">Optional[Delegations]</a></code>
 - <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/delegations">client.addressing.prefixes.delegations.<a href="./src/cloudflare/resources/addressing/prefixes/delegations.py">list</a>(prefix_id, \*, account_id) -> <a href="./src/cloudflare/types/addressing/prefixes/delegations.py">SyncSinglePage[Delegations]</a></code>
-- <code title="delete /accounts/{account_id}/addressing/prefixes/{prefix_id}/delegations/{delegation_id}">client.addressing.prefixes.delegations.<a href="./src/cloudflare/resources/addressing/prefixes/delegations.py">delete</a>(delegation_id, \*, account_id, prefix_id) -> <a href="./src/cloudflare/types/addressing/prefixes/delegation_delete_response.py">Optional</a></code>
+- <code title="delete /accounts/{account_id}/addressing/prefixes/{prefix_id}/delegations/{delegation_id}">client.addressing.prefixes.delegations.<a href="./src/cloudflare/resources/addressing/prefixes/delegations.py">delete</a>(delegation_id, \*, account_id, prefix_id) -> <a href="./src/cloudflare/types/addressing/prefixes/delegation_delete_response.py">Optional[DelegationDeleteResponse]</a></code>
 
 # AuditLogs
 
@@ -3011,7 +3497,7 @@ from cloudflare.types.billing import ProfileGetResponse
 
 Methods:
 
-- <code title="get /accounts/{account_identifier}/billing/profile">client.billing.profiles.<a href="./src/cloudflare/resources/billing/profiles.py">get</a>(account_identifier) -> <a href="./src/cloudflare/types/billing/profile_get_response.py">ProfileGetResponse</a></code>
+- <code title="get /accounts/{account_id}/billing/profile">client.billing.profiles.<a href="./src/cloudflare/resources/billing/profiles.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/billing/profile_get_response.py">ProfileGetResponse</a></code>
 
 # BrandProtection
 
@@ -3020,17 +3506,63 @@ Types:
 ```python
 from cloudflare.types.brand_protection import (
     Info,
-    RuleMatch,
-    ScanStatus,
     Submit,
-    URLInfoModelResults,
+    BrandProtectionSubmitResponse,
+    BrandProtectionURLInfoResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/brand-protection/submit">client.brand_protection.<a href="./src/cloudflare/resources/brand_protection.py">submit</a>(\*, account_id, \*\*<a href="src/cloudflare/types/brand_protection/brand_protection_submit_params.py">params</a>) -> <a href="./src/cloudflare/types/brand_protection/submit.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/brand-protection/url-info">client.brand_protection.<a href="./src/cloudflare/resources/brand_protection.py">url_info</a>(\*, account_id, \*\*<a href="src/cloudflare/types/brand_protection/brand_protection_url_info_params.py">params</a>) -> <a href="./src/cloudflare/types/brand_protection/info.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/brand-protection/submit">client.brand_protection.<a href="./src/cloudflare/resources/brand_protection/brand_protection.py">submit</a>(\*, account_id) -> <a href="./src/cloudflare/types/brand_protection/brand_protection_submit_response.py">BrandProtectionSubmitResponse</a></code>
+- <code title="get /accounts/{account_id}/brand-protection/url-info">client.brand_protection.<a href="./src/cloudflare/resources/brand_protection/brand_protection.py">url_info</a>(\*, account_id) -> <a href="./src/cloudflare/types/brand_protection/brand_protection_url_info_response.py">SyncSinglePage[BrandProtectionURLInfoResponse]</a></code>
+
+## Queries
+
+Methods:
+
+- <code title="post /accounts/{account_id}/brand-protection/queries">client.brand_protection.queries.<a href="./src/cloudflare/resources/brand_protection/queries.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/brand_protection/query_create_params.py">params</a>) -> None</code>
+- <code title="delete /accounts/{account_id}/brand-protection/queries">client.brand_protection.queries.<a href="./src/cloudflare/resources/brand_protection/queries.py">delete</a>(\*, account_id, \*\*<a href="src/cloudflare/types/brand_protection/query_delete_params.py">params</a>) -> None</code>
+- <code title="post /accounts/{account_id}/brand-protection/queries/bulk">client.brand_protection.queries.<a href="./src/cloudflare/resources/brand_protection/queries.py">bulk</a>(\*, account_id, \*\*<a href="src/cloudflare/types/brand_protection/query_bulk_params.py">params</a>) -> None</code>
+
+## Matches
+
+Types:
+
+```python
+from cloudflare.types.brand_protection import MatchDownloadResponse, MatchGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/brand-protection/matches/download">client.brand_protection.matches.<a href="./src/cloudflare/resources/brand_protection/matches.py">download</a>(\*, account_id, \*\*<a href="src/cloudflare/types/brand_protection/match_download_params.py">params</a>) -> <a href="./src/cloudflare/types/brand_protection/match_download_response.py">MatchDownloadResponse</a></code>
+- <code title="get /accounts/{account_id}/brand-protection/matches">client.brand_protection.matches.<a href="./src/cloudflare/resources/brand_protection/matches.py">get</a>(\*, account_id, \*\*<a href="src/cloudflare/types/brand_protection/match_get_params.py">params</a>) -> <a href="./src/cloudflare/types/brand_protection/match_get_response.py">MatchGetResponse</a></code>
+
+## Logos
+
+Types:
+
+```python
+from cloudflare.types.brand_protection import LogoCreateResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/brand-protection/logos">client.brand_protection.logos.<a href="./src/cloudflare/resources/brand_protection/logos.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/brand_protection/logo_create_params.py">params</a>) -> <a href="./src/cloudflare/types/brand_protection/logo_create_response.py">LogoCreateResponse</a></code>
+- <code title="delete /accounts/{account_id}/brand-protection/logos/{logo_id}">client.brand_protection.logos.<a href="./src/cloudflare/resources/brand_protection/logos.py">delete</a>(logo_id, \*, account_id) -> None</code>
+
+## LogoMatches
+
+Types:
+
+```python
+from cloudflare.types.brand_protection import LogoMatchDownloadResponse, LogoMatchGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/brand-protection/logo-matches/download">client.brand_protection.logo_matches.<a href="./src/cloudflare/resources/brand_protection/logo_matches.py">download</a>(\*, account_id, \*\*<a href="src/cloudflare/types/brand_protection/logo_match_download_params.py">params</a>) -> <a href="./src/cloudflare/types/brand_protection/logo_match_download_response.py">LogoMatchDownloadResponse</a></code>
+- <code title="get /accounts/{account_id}/brand-protection/logo-matches">client.brand_protection.logo_matches.<a href="./src/cloudflare/resources/brand_protection/logo_matches.py">get</a>(\*, account_id, \*\*<a href="src/cloudflare/types/brand_protection/logo_match_get_params.py">params</a>) -> <a href="./src/cloudflare/types/brand_protection/logo_match_get_response.py">LogoMatchGetResponse</a></code>
 
 # Diagnostics
 
@@ -3039,12 +3571,35 @@ Methods:
 Types:
 
 ```python
-from cloudflare.types.diagnostics import Traceroute, TracerouteCreateResponse
+from cloudflare.types.diagnostics import Traceroute
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/diagnostics/traceroute">client.diagnostics.traceroutes.<a href="./src/cloudflare/resources/diagnostics/traceroutes.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/diagnostics/traceroute_create_params.py">params</a>) -> <a href="./src/cloudflare/types/diagnostics/traceroute.py">SyncSinglePage[Traceroute]</a></code>
+
+## EndpointHealthchecks
+
+Types:
+
+```python
+from cloudflare.types.diagnostics import (
+    EndpointHealthcheck,
+    EndpointHealthcheckCreateResponse,
+    EndpointHealthcheckUpdateResponse,
+    EndpointHealthcheckListResponse,
+    EndpointHealthcheckDeleteResponse,
+    EndpointHealthcheckGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/diagnostics/traceroute">client.diagnostics.traceroutes.<a href="./src/cloudflare/resources/diagnostics/traceroutes.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/diagnostics/traceroute_create_params.py">params</a>) -> <a href="./src/cloudflare/types/diagnostics/traceroute_create_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/diagnostics/endpoint-healthchecks">client.diagnostics.endpoint_healthchecks.<a href="./src/cloudflare/resources/diagnostics/endpoint_healthchecks.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/diagnostics/endpoint_healthcheck_create_params.py">params</a>) -> <a href="./src/cloudflare/types/diagnostics/endpoint_healthcheck_create_response.py">Optional[EndpointHealthcheckCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/diagnostics/endpoint-healthchecks/{id}">client.diagnostics.endpoint_healthchecks.<a href="./src/cloudflare/resources/diagnostics/endpoint_healthchecks.py">update</a>(id, \*, account_id, \*\*<a href="src/cloudflare/types/diagnostics/endpoint_healthcheck_update_params.py">params</a>) -> <a href="./src/cloudflare/types/diagnostics/endpoint_healthcheck_update_response.py">Optional[EndpointHealthcheckUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/diagnostics/endpoint-healthchecks">client.diagnostics.endpoint_healthchecks.<a href="./src/cloudflare/resources/diagnostics/endpoint_healthchecks.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/diagnostics/endpoint_healthcheck_list_response.py">Optional[EndpointHealthcheckListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/diagnostics/endpoint-healthchecks/{id}">client.diagnostics.endpoint_healthchecks.<a href="./src/cloudflare/resources/diagnostics/endpoint_healthchecks.py">delete</a>(id, \*, account_id) -> <a href="./src/cloudflare/types/diagnostics/endpoint_healthcheck_delete_response.py">EndpointHealthcheckDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/diagnostics/endpoint-healthchecks/{id}">client.diagnostics.endpoint_healthchecks.<a href="./src/cloudflare/resources/diagnostics/endpoint_healthchecks.py">get</a>(id, \*, account_id) -> <a href="./src/cloudflare/types/diagnostics/endpoint_healthcheck_get_response.py">Optional[EndpointHealthcheckGetResponse]</a></code>
 
 # Images
 
@@ -3148,7 +3703,7 @@ Methods:
 
 Methods:
 
-- <code title="get /accounts/{account_id}/intel/asn/{asn}">client.intel.asn.<a href="./src/cloudflare/resources/intel/asn/asn.py">get</a>(asn, \*, account_id) -> <a href="./src/cloudflare/types/shared/asn.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/intel/asn/{asn}">client.intel.asn.<a href="./src/cloudflare/resources/intel/asn/asn.py">get</a>(asn, \*, account_id) -> <a href="./src/cloudflare/types/shared/asn.py">Optional[ASN]</a></code>
 
 ### Subnets
 
@@ -3167,12 +3722,12 @@ Methods:
 Types:
 
 ```python
-from cloudflare.types.intel import DNS, DNSListResponse
+from cloudflare.types.intel import DNS
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/intel/dns">client.intel.dns.<a href="./src/cloudflare/resources/intel/dns.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/dns_list_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/dns_list_response.py">SyncV4PagePagination[DNSListResponse]</a></code>
+- <code title="get /accounts/{account_id}/intel/dns">client.intel.dns.<a href="./src/cloudflare/resources/intel/dns.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/dns_list_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/dns.py">SyncV4PagePagination[Optional[DNS]]</a></code>
 
 ## Domains
 
@@ -3184,7 +3739,7 @@ from cloudflare.types.intel import Domain
 
 Methods:
 
-- <code title="get /accounts/{account_id}/intel/domain">client.intel.domains.<a href="./src/cloudflare/resources/intel/domains/domains.py">get</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/domain_get_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/domain.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/intel/domain">client.intel.domains.<a href="./src/cloudflare/resources/intel/domains/domains.py">get</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/domain_get_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/domain.py">Optional[Domain]</a></code>
 
 ### Bulks
 
@@ -3196,7 +3751,7 @@ from cloudflare.types.intel.domains import BulkGetResponse
 
 Methods:
 
-- <code title="get /accounts/{account_id}/intel/domain/bulk">client.intel.domains.bulks.<a href="./src/cloudflare/resources/intel/domains/bulks.py">get</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/domains/bulk_get_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/domains/bulk_get_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/intel/domain/bulk">client.intel.domains.bulks.<a href="./src/cloudflare/resources/intel/domains/bulks.py">get</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/domains/bulk_get_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/domains/bulk_get_response.py">Optional[BulkGetResponse]</a></code>
 
 ## DomainHistory
 
@@ -3208,7 +3763,7 @@ from cloudflare.types.intel import DomainHistory, DomainHistoryGetResponse
 
 Methods:
 
-- <code title="get /accounts/{account_id}/intel/domain-history">client.intel.domain_history.<a href="./src/cloudflare/resources/intel/domain_history.py">get</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/domain_history_get_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/domain_history_get_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/intel/domain-history">client.intel.domain_history.<a href="./src/cloudflare/resources/intel/domain_history.py">get</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/domain_history_get_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/domain_history_get_response.py">Optional[DomainHistoryGetResponse]</a></code>
 
 ## IPs
 
@@ -3220,20 +3775,16 @@ from cloudflare.types.intel import IP, IPGetResponse
 
 Methods:
 
-- <code title="get /accounts/{account_id}/intel/ip">client.intel.ips.<a href="./src/cloudflare/resources/intel/ips.py">get</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/ip_get_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/ip_get_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/intel/ip">client.intel.ips.<a href="./src/cloudflare/resources/intel/ips.py">get</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/ip_get_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/ip_get_response.py">Optional[IPGetResponse]</a></code>
 
 ## IPLists
 
 Types:
 
 ```python
-from cloudflare.types.intel import IPList, IPListGetResponse
+from cloudflare.types.intel import IPList
 ```
 
-Methods:
-
-- <code title="get /accounts/{account_id}/intel/ip-list">client.intel.ip_lists.<a href="./src/cloudflare/resources/intel/ip_lists.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/intel/ip_list_get_response.py">Optional</a></code>
-
 ## Miscategorizations
 
 Types:
@@ -3244,7 +3795,7 @@ from cloudflare.types.intel import MiscategorizationCreateResponse
 
 Methods:
 
-- <code title="post /accounts/{account_id}/intel/miscategorization">client.intel.miscategorizations.<a href="./src/cloudflare/resources/intel/miscategorizations.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/miscategorization_create_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/miscategorization_create_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/intel/miscategorization">client.intel.miscategorizations.<a href="./src/cloudflare/resources/intel/miscategorizations.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/miscategorization_create_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/miscategorization_create_response.py">MiscategorizationCreateResponse</a></code>
 
 ## Whois
 
@@ -3256,7 +3807,7 @@ from cloudflare.types.intel import Whois, WhoisGetResponse
 
 Methods:
 
-- <code title="get /accounts/{account_id}/intel/whois">client.intel.whois.<a href="./src/cloudflare/resources/intel/whois.py">get</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/whois_get_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/whois_get_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/intel/whois">client.intel.whois.<a href="./src/cloudflare/resources/intel/whois.py">get</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/whois_get_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/whois_get_response.py">Optional[WhoisGetResponse]</a></code>
 
 ## IndicatorFeeds
 
@@ -3274,11 +3825,11 @@ from cloudflare.types.intel import (
 
 Methods:
 
-- <code title="post /accounts/{account_id}/intel/indicator-feeds">client.intel.indicator_feeds.<a href="./src/cloudflare/resources/intel/indicator_feeds/indicator_feeds.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/indicator_feed_create_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/indicator_feed_create_response.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/intel/indicator-feeds/{feed_id}">client.intel.indicator_feeds.<a href="./src/cloudflare/resources/intel/indicator_feeds/indicator_feeds.py">update</a>(feed_id, \*, account_id, \*\*<a href="src/cloudflare/types/intel/indicator_feed_update_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/indicator_feed_update_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/intel/indicator-feeds">client.intel.indicator_feeds.<a href="./src/cloudflare/resources/intel/indicator_feeds/indicator_feeds.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/indicator_feed_create_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/indicator_feed_create_response.py">Optional[IndicatorFeedCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/intel/indicator-feeds/{feed_id}">client.intel.indicator_feeds.<a href="./src/cloudflare/resources/intel/indicator_feeds/indicator_feeds.py">update</a>(feed_id, \*, account_id, \*\*<a href="src/cloudflare/types/intel/indicator_feed_update_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/indicator_feed_update_response.py">Optional[IndicatorFeedUpdateResponse]</a></code>
 - <code title="get /accounts/{account_id}/intel/indicator-feeds">client.intel.indicator_feeds.<a href="./src/cloudflare/resources/intel/indicator_feeds/indicator_feeds.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/intel/indicator_feed_list_response.py">SyncSinglePage[IndicatorFeedListResponse]</a></code>
 - <code title="get /accounts/{account_id}/intel/indicator-feeds/{feed_id}/data">client.intel.indicator_feeds.<a href="./src/cloudflare/resources/intel/indicator_feeds/indicator_feeds.py">data</a>(feed_id, \*, account_id) -> str</code>
-- <code title="get /accounts/{account_id}/intel/indicator-feeds/{feed_id}">client.intel.indicator_feeds.<a href="./src/cloudflare/resources/intel/indicator_feeds/indicator_feeds.py">get</a>(feed_id, \*, account_id) -> <a href="./src/cloudflare/types/intel/indicator_feed_get_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/intel/indicator-feeds/{feed_id}">client.intel.indicator_feeds.<a href="./src/cloudflare/resources/intel/indicator_feeds/indicator_feeds.py">get</a>(feed_id, \*, account_id) -> <a href="./src/cloudflare/types/intel/indicator_feed_get_response.py">Optional[IndicatorFeedGetResponse]</a></code>
 
 ### Snapshots
 
@@ -3290,7 +3841,7 @@ from cloudflare.types.intel.indicator_feeds import SnapshotUpdateResponse
 
 Methods:
 
-- <code title="put /accounts/{account_id}/intel/indicator-feeds/{feed_id}/snapshot">client.intel.indicator_feeds.snapshots.<a href="./src/cloudflare/resources/intel/indicator_feeds/snapshots.py">update</a>(feed_id, \*, account_id, \*\*<a href="src/cloudflare/types/intel/indicator_feeds/snapshot_update_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/indicator_feeds/snapshot_update_response.py">Optional</a></code>
+- <code title="put /accounts/{account_id}/intel/indicator-feeds/{feed_id}/snapshot">client.intel.indicator_feeds.snapshots.<a href="./src/cloudflare/resources/intel/indicator_feeds/snapshots.py">update</a>(feed_id, \*, account_id, \*\*<a href="src/cloudflare/types/intel/indicator_feeds/snapshot_update_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/indicator_feeds/snapshot_update_response.py">Optional[SnapshotUpdateResponse]</a></code>
 
 ### Permissions
 
@@ -3306,9 +3857,9 @@ from cloudflare.types.intel.indicator_feeds import (
 
 Methods:
 
-- <code title="put /accounts/{account_id}/intel/indicator-feeds/permissions/add">client.intel.indicator_feeds.permissions.<a href="./src/cloudflare/resources/intel/indicator_feeds/permissions.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/indicator_feeds/permission_create_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/indicator_feeds/permission_create_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/intel/indicator-feeds/permissions/view">client.intel.indicator_feeds.permissions.<a href="./src/cloudflare/resources/intel/indicator_feeds/permissions.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/intel/indicator_feeds/permission_list_response.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/intel/indicator-feeds/permissions/remove">client.intel.indicator_feeds.permissions.<a href="./src/cloudflare/resources/intel/indicator_feeds/permissions.py">delete</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/indicator_feeds/permission_delete_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/indicator_feeds/permission_delete_response.py">Optional</a></code>
+- <code title="put /accounts/{account_id}/intel/indicator-feeds/permissions/add">client.intel.indicator_feeds.permissions.<a href="./src/cloudflare/resources/intel/indicator_feeds/permissions.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/indicator_feeds/permission_create_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/indicator_feeds/permission_create_response.py">Optional[PermissionCreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/intel/indicator-feeds/permissions/view">client.intel.indicator_feeds.permissions.<a href="./src/cloudflare/resources/intel/indicator_feeds/permissions.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/intel/indicator_feeds/permission_list_response.py">Optional[PermissionListResponse]</a></code>
+- <code title="put /accounts/{account_id}/intel/indicator-feeds/permissions/remove">client.intel.indicator_feeds.permissions.<a href="./src/cloudflare/resources/intel/indicator_feeds/permissions.py">delete</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/indicator_feeds/permission_delete_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/indicator_feeds/permission_delete_response.py">Optional[PermissionDeleteResponse]</a></code>
 
 ## Sinkholes
 
@@ -3334,7 +3885,7 @@ from cloudflare.types.intel.attack_surface_report import IssueTypeGetResponse
 
 Methods:
 
-- <code title="get /accounts/{account_id}/intel/attack-surface-report/issue-types">client.intel.attack_surface_report.issue_types.<a href="./src/cloudflare/resources/intel/attack_surface_report/issue_types.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/intel/attack_surface_report/issue_type_get_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/intel/attack-surface-report/issue-types">client.intel.attack_surface_report.issue_types.<a href="./src/cloudflare/resources/intel/attack_surface_report/issue_types.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/intel/attack_surface_report/issue_type_get_response.py">SyncSinglePage[IssueTypeGetResponse]</a></code>
 
 ### Issues
 
@@ -3354,11 +3905,11 @@ from cloudflare.types.intel.attack_surface_report import (
 
 Methods:
 
-- <code title="get /accounts/{account_id}/intel/attack-surface-report/issues">client.intel.attack_surface_report.issues.<a href="./src/cloudflare/resources/intel/attack_surface_report/issues.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/attack_surface_report/issue_list_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/attack_surface_report/issue_list_response.py">SyncV4PagePagination[IssueListResponse]</a></code>
-- <code title="get /accounts/{account_id}/intel/attack-surface-report/issues/class">client.intel.attack*surface_report.issues.<a href="./src/cloudflare/resources/intel/attack_surface_report/issues.py">class*</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/attack_surface_report/issue_class_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/attack_surface_report/issue_class_response.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/intel/attack-surface-report/{issue_id}/dismiss">client.intel.attack_surface_report.issues.<a href="./src/cloudflare/resources/intel/attack_surface_report/issues.py">dismiss</a>(issue_id, \*, account_id, \*\*<a href="src/cloudflare/types/intel/attack_surface_report/issue_dismiss_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/attack_surface_report/issue_dismiss_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/intel/attack-surface-report/issues/severity">client.intel.attack_surface_report.issues.<a href="./src/cloudflare/resources/intel/attack_surface_report/issues.py">severity</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/attack_surface_report/issue_severity_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/attack_surface_report/issue_severity_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/intel/attack-surface-report/issues/type">client.intel.attack_surface_report.issues.<a href="./src/cloudflare/resources/intel/attack_surface_report/issues.py">type</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/attack_surface_report/issue_type_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/attack_surface_report/issue_type_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/intel/attack-surface-report/issues">client.intel.attack_surface_report.issues.<a href="./src/cloudflare/resources/intel/attack_surface_report/issues.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/attack_surface_report/issue_list_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/attack_surface_report/issue_list_response.py">SyncV4PagePagination[Optional[IssueListResponse]]</a></code>
+- <code title="get /accounts/{account_id}/intel/attack-surface-report/issues/class">client.intel.attack*surface_report.issues.<a href="./src/cloudflare/resources/intel/attack_surface_report/issues.py">class*</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/attack_surface_report/issue_class_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/attack_surface_report/issue_class_response.py">Optional[IssueClassResponse]</a></code>
+- <code title="put /accounts/{account_id}/intel/attack-surface-report/{issue_id}/dismiss">client.intel.attack_surface_report.issues.<a href="./src/cloudflare/resources/intel/attack_surface_report/issues.py">dismiss</a>(issue_id, \*, account_id, \*\*<a href="src/cloudflare/types/intel/attack_surface_report/issue_dismiss_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/attack_surface_report/issue_dismiss_response.py">IssueDismissResponse</a></code>
+- <code title="get /accounts/{account_id}/intel/attack-surface-report/issues/severity">client.intel.attack_surface_report.issues.<a href="./src/cloudflare/resources/intel/attack_surface_report/issues.py">severity</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/attack_surface_report/issue_severity_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/attack_surface_report/issue_severity_response.py">Optional[IssueSeverityResponse]</a></code>
+- <code title="get /accounts/{account_id}/intel/attack-surface-report/issues/type">client.intel.attack_surface_report.issues.<a href="./src/cloudflare/resources/intel/attack_surface_report/issues.py">type</a>(\*, account_id, \*\*<a href="src/cloudflare/types/intel/attack_surface_report/issue_type_params.py">params</a>) -> <a href="./src/cloudflare/types/intel/attack_surface_report/issue_type_response.py">Optional[IssueTypeResponse]</a></code>
 
 # MagicTransit
 
@@ -3378,15 +3929,17 @@ from cloudflare.types.magic_transit import (
     AppUpdateResponse,
     AppListResponse,
     AppDeleteResponse,
+    AppEditResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/magic/apps">client.magic_transit.apps.<a href="./src/cloudflare/resources/magic_transit/apps.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/app_create_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/app_create_response.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/magic/apps/{account_app_id}">client.magic_transit.apps.<a href="./src/cloudflare/resources/magic_transit/apps.py">update</a>(account_app_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/app_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/app_update_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/magic/apps">client.magic_transit.apps.<a href="./src/cloudflare/resources/magic_transit/apps.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/app_create_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/app_create_response.py">Optional[AppCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/magic/apps/{account_app_id}">client.magic_transit.apps.<a href="./src/cloudflare/resources/magic_transit/apps.py">update</a>(account_app_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/app_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/app_update_response.py">Optional[AppUpdateResponse]</a></code>
 - <code title="get /accounts/{account_id}/magic/apps">client.magic_transit.apps.<a href="./src/cloudflare/resources/magic_transit/apps.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_transit/app_list_response.py">SyncSinglePage[AppListResponse]</a></code>
-- <code title="delete /accounts/{account_id}/magic/apps/{account_app_id}">client.magic_transit.apps.<a href="./src/cloudflare/resources/magic_transit/apps.py">delete</a>(account_app_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_transit/app_delete_response.py">Optional</a></code>
+- <code title="delete /accounts/{account_id}/magic/apps/{account_app_id}">client.magic_transit.apps.<a href="./src/cloudflare/resources/magic_transit/apps.py">delete</a>(account_app_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_transit/app_delete_response.py">Optional[AppDeleteResponse]</a></code>
+- <code title="patch /accounts/{account_id}/magic/apps/{account_app_id}">client.magic_transit.apps.<a href="./src/cloudflare/resources/magic_transit/apps.py">edit</a>(account_app_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/app_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/app_edit_response.py">Optional[AppEditResponse]</a></code>
 
 ## CfInterconnects
 
@@ -3396,6 +3949,7 @@ Types:
 from cloudflare.types.magic_transit import (
     CfInterconnectUpdateResponse,
     CfInterconnectListResponse,
+    CfInterconnectBulkUpdateResponse,
     CfInterconnectGetResponse,
 )
 ```
@@ -3404,6 +3958,7 @@ Methods:
 
 - <code title="put /accounts/{account_id}/magic/cf_interconnects/{cf_interconnect_id}">client.magic_transit.cf_interconnects.<a href="./src/cloudflare/resources/magic_transit/cf_interconnects.py">update</a>(cf_interconnect_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/cf_interconnect_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/cf_interconnect_update_response.py">CfInterconnectUpdateResponse</a></code>
 - <code title="get /accounts/{account_id}/magic/cf_interconnects">client.magic_transit.cf_interconnects.<a href="./src/cloudflare/resources/magic_transit/cf_interconnects.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_transit/cf_interconnect_list_response.py">CfInterconnectListResponse</a></code>
+- <code title="put /accounts/{account_id}/magic/cf_interconnects">client.magic_transit.cf_interconnects.<a href="./src/cloudflare/resources/magic_transit/cf_interconnects.py">bulk_update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/cf_interconnect_bulk_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/cf_interconnect_bulk_update_response.py">CfInterconnectBulkUpdateResponse</a></code>
 - <code title="get /accounts/{account_id}/magic/cf_interconnects/{cf_interconnect_id}">client.magic_transit.cf_interconnects.<a href="./src/cloudflare/resources/magic_transit/cf_interconnects.py">get</a>(cf_interconnect_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_transit/cf_interconnect_get_response.py">CfInterconnectGetResponse</a></code>
 
 ## GRETunnels
@@ -3416,6 +3971,7 @@ from cloudflare.types.magic_transit import (
     GRETunnelUpdateResponse,
     GRETunnelListResponse,
     GRETunnelDeleteResponse,
+    GRETunnelBulkUpdateResponse,
     GRETunnelGetResponse,
 )
 ```
@@ -3426,6 +3982,7 @@ Methods:
 - <code title="put /accounts/{account_id}/magic/gre_tunnels/{gre_tunnel_id}">client.magic_transit.gre_tunnels.<a href="./src/cloudflare/resources/magic_transit/gre_tunnels.py">update</a>(gre_tunnel_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/gre_tunnel_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/gre_tunnel_update_response.py">GRETunnelUpdateResponse</a></code>
 - <code title="get /accounts/{account_id}/magic/gre_tunnels">client.magic_transit.gre_tunnels.<a href="./src/cloudflare/resources/magic_transit/gre_tunnels.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_transit/gre_tunnel_list_response.py">GRETunnelListResponse</a></code>
 - <code title="delete /accounts/{account_id}/magic/gre_tunnels/{gre_tunnel_id}">client.magic_transit.gre_tunnels.<a href="./src/cloudflare/resources/magic_transit/gre_tunnels.py">delete</a>(gre_tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_transit/gre_tunnel_delete_response.py">GRETunnelDeleteResponse</a></code>
+- <code title="put /accounts/{account_id}/magic/gre_tunnels">client.magic_transit.gre_tunnels.<a href="./src/cloudflare/resources/magic_transit/gre_tunnels.py">bulk_update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/gre_tunnel_bulk_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/gre_tunnel_bulk_update_response.py">GRETunnelBulkUpdateResponse</a></code>
 - <code title="get /accounts/{account_id}/magic/gre_tunnels/{gre_tunnel_id}">client.magic_transit.gre_tunnels.<a href="./src/cloudflare/resources/magic_transit/gre_tunnels.py">get</a>(gre_tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_transit/gre_tunnel_get_response.py">GRETunnelGetResponse</a></code>
 
 ## IPSECTunnels
@@ -3439,6 +3996,7 @@ from cloudflare.types.magic_transit import (
     IPSECTunnelUpdateResponse,
     IPSECTunnelListResponse,
     IPSECTunnelDeleteResponse,
+    IPSECTunnelBulkUpdateResponse,
     IPSECTunnelGetResponse,
     IPSECTunnelPSKGenerateResponse,
 )
@@ -3450,6 +4008,7 @@ Methods:
 - <code title="put /accounts/{account_id}/magic/ipsec_tunnels/{ipsec_tunnel_id}">client.magic_transit.ipsec_tunnels.<a href="./src/cloudflare/resources/magic_transit/ipsec_tunnels.py">update</a>(ipsec_tunnel_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/ipsec_tunnel_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/ipsec_tunnel_update_response.py">IPSECTunnelUpdateResponse</a></code>
 - <code title="get /accounts/{account_id}/magic/ipsec_tunnels">client.magic_transit.ipsec_tunnels.<a href="./src/cloudflare/resources/magic_transit/ipsec_tunnels.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_transit/ipsec_tunnel_list_response.py">IPSECTunnelListResponse</a></code>
 - <code title="delete /accounts/{account_id}/magic/ipsec_tunnels/{ipsec_tunnel_id}">client.magic_transit.ipsec_tunnels.<a href="./src/cloudflare/resources/magic_transit/ipsec_tunnels.py">delete</a>(ipsec_tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_transit/ipsec_tunnel_delete_response.py">IPSECTunnelDeleteResponse</a></code>
+- <code title="put /accounts/{account_id}/magic/ipsec_tunnels">client.magic_transit.ipsec_tunnels.<a href="./src/cloudflare/resources/magic_transit/ipsec_tunnels.py">bulk_update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/ipsec_tunnel_bulk_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/ipsec_tunnel_bulk_update_response.py">IPSECTunnelBulkUpdateResponse</a></code>
 - <code title="get /accounts/{account_id}/magic/ipsec_tunnels/{ipsec_tunnel_id}">client.magic_transit.ipsec_tunnels.<a href="./src/cloudflare/resources/magic_transit/ipsec_tunnels.py">get</a>(ipsec_tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_transit/ipsec_tunnel_get_response.py">IPSECTunnelGetResponse</a></code>
 - <code title="post /accounts/{account_id}/magic/ipsec_tunnels/{ipsec_tunnel_id}/psk_generate">client.magic_transit.ipsec_tunnels.<a href="./src/cloudflare/resources/magic_transit/ipsec_tunnels.py">psk_generate</a>(ipsec_tunnel_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/ipsec_tunnel_psk_generate_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/ipsec_tunnel_psk_generate_response.py">IPSECTunnelPSKGenerateResponse</a></code>
 
@@ -3464,6 +4023,7 @@ from cloudflare.types.magic_transit import (
     RouteUpdateResponse,
     RouteListResponse,
     RouteDeleteResponse,
+    RouteBulkUpdateResponse,
     RouteEmptyResponse,
     RouteGetResponse,
 )
@@ -3475,6 +4035,7 @@ Methods:
 - <code title="put /accounts/{account_id}/magic/routes/{route_id}">client.magic_transit.routes.<a href="./src/cloudflare/resources/magic_transit/routes.py">update</a>(route_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/route_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/route_update_response.py">RouteUpdateResponse</a></code>
 - <code title="get /accounts/{account_id}/magic/routes">client.magic_transit.routes.<a href="./src/cloudflare/resources/magic_transit/routes.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_transit/route_list_response.py">RouteListResponse</a></code>
 - <code title="delete /accounts/{account_id}/magic/routes/{route_id}">client.magic_transit.routes.<a href="./src/cloudflare/resources/magic_transit/routes.py">delete</a>(route_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_transit/route_delete_response.py">RouteDeleteResponse</a></code>
+- <code title="put /accounts/{account_id}/magic/routes">client.magic_transit.routes.<a href="./src/cloudflare/resources/magic_transit/routes.py">bulk_update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/route_bulk_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/route_bulk_update_response.py">RouteBulkUpdateResponse</a></code>
 - <code title="delete /accounts/{account_id}/magic/routes">client.magic_transit.routes.<a href="./src/cloudflare/resources/magic_transit/routes.py">empty</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_transit/route_empty_response.py">RouteEmptyResponse</a></code>
 - <code title="get /accounts/{account_id}/magic/routes/{route_id}">client.magic_transit.routes.<a href="./src/cloudflare/resources/magic_transit/routes.py">get</a>(route_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_transit/route_get_response.py">RouteGetResponse</a></code>
 
@@ -3524,13 +4085,12 @@ from cloudflare.types.magic_transit.sites import (
     LANStaticAddressing,
     Nat,
     RoutedSubnet,
-    LANCreateResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/magic/sites/{site_id}/lans">client.magic_transit.sites.lans.<a href="./src/cloudflare/resources/magic_transit/sites/lans.py">create</a>(site_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/sites/lan_create_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/sites/lan_create_response.py">LANCreateResponse</a></code>
+- <code title="post /accounts/{account_id}/magic/sites/{site_id}/lans">client.magic_transit.sites.lans.<a href="./src/cloudflare/resources/magic_transit/sites/lans.py">create</a>(site_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/sites/lan_create_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/sites/lan.py">SyncSinglePage[LAN]</a></code>
 - <code title="put /accounts/{account_id}/magic/sites/{site_id}/lans/{lan_id}">client.magic_transit.sites.lans.<a href="./src/cloudflare/resources/magic_transit/sites/lans.py">update</a>(lan_id, \*, account_id, site_id, \*\*<a href="src/cloudflare/types/magic_transit/sites/lan_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/sites/lan.py">LAN</a></code>
 - <code title="get /accounts/{account_id}/magic/sites/{site_id}/lans">client.magic_transit.sites.lans.<a href="./src/cloudflare/resources/magic_transit/sites/lans.py">list</a>(site_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_transit/sites/lan.py">SyncSinglePage[LAN]</a></code>
 - <code title="delete /accounts/{account_id}/magic/sites/{site_id}/lans/{lan_id}">client.magic_transit.sites.lans.<a href="./src/cloudflare/resources/magic_transit/sites/lans.py">delete</a>(lan_id, \*, account_id, site_id) -> <a href="./src/cloudflare/types/magic_transit/sites/lan.py">LAN</a></code>
@@ -3542,12 +4102,12 @@ Methods:
 Types:
 
 ```python
-from cloudflare.types.magic_transit.sites import WAN, WANStaticAddressing, WANCreateResponse
+from cloudflare.types.magic_transit.sites import WAN, WANStaticAddressing
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/magic/sites/{site_id}/wans">client.magic_transit.sites.wans.<a href="./src/cloudflare/resources/magic_transit/sites/wans.py">create</a>(site_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/sites/wan_create_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/sites/wan_create_response.py">WANCreateResponse</a></code>
+- <code title="post /accounts/{account_id}/magic/sites/{site_id}/wans">client.magic_transit.sites.wans.<a href="./src/cloudflare/resources/magic_transit/sites/wans.py">create</a>(site_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/sites/wan_create_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/sites/wan.py">SyncSinglePage[WAN]</a></code>
 - <code title="put /accounts/{account_id}/magic/sites/{site_id}/wans/{wan_id}">client.magic_transit.sites.wans.<a href="./src/cloudflare/resources/magic_transit/sites/wans.py">update</a>(wan_id, \*, account_id, site_id, \*\*<a href="src/cloudflare/types/magic_transit/sites/wan_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/sites/wan.py">WAN</a></code>
 - <code title="get /accounts/{account_id}/magic/sites/{site_id}/wans">client.magic_transit.sites.wans.<a href="./src/cloudflare/resources/magic_transit/sites/wans.py">list</a>(site_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_transit/sites/wan.py">SyncSinglePage[WAN]</a></code>
 - <code title="delete /accounts/{account_id}/magic/sites/{site_id}/wans/{wan_id}">client.magic_transit.sites.wans.<a href="./src/cloudflare/resources/magic_transit/sites/wans.py">delete</a>(wan_id, \*, account_id, site_id) -> <a href="./src/cloudflare/types/magic_transit/sites/wan.py">WAN</a></code>
@@ -3560,8 +4120,10 @@ Types:
 
 ```python
 from cloudflare.types.magic_transit import (
+    ConnectorCreateResponse,
     ConnectorUpdateResponse,
     ConnectorListResponse,
+    ConnectorDeleteResponse,
     ConnectorEditResponse,
     ConnectorGetResponse,
 )
@@ -3569,495 +4131,748 @@ from cloudflare.types.magic_transit import (
 
 Methods:
 
-- <code title="put /accounts/{account_id}/magic/connectors/{connector_id}">client.magic_transit.connectors.<a href="./src/cloudflare/resources/magic_transit/connectors.py">update</a>(connector_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/connector_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/connector_update_response.py">ConnectorUpdateResponse</a></code>
-- <code title="get /accounts/{account_id}/magic/connectors">client.magic_transit.connectors.<a href="./src/cloudflare/resources/magic_transit/connectors.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_transit/connector_list_response.py">SyncSinglePage[ConnectorListResponse]</a></code>
-- <code title="patch /accounts/{account_id}/magic/connectors/{connector_id}">client.magic_transit.connectors.<a href="./src/cloudflare/resources/magic_transit/connectors.py">edit</a>(connector_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/connector_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/connector_edit_response.py">ConnectorEditResponse</a></code>
-- <code title="get /accounts/{account_id}/magic/connectors/{connector_id}">client.magic_transit.connectors.<a href="./src/cloudflare/resources/magic_transit/connectors.py">get</a>(connector_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_transit/connector_get_response.py">ConnectorGetResponse</a></code>
-
-# MagicNetworkMonitoring
+- <code title="post /accounts/{account_id}/magic/connectors">client.magic_transit.connectors.<a href="./src/cloudflare/resources/magic_transit/connectors/connectors.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/connector_create_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/connector_create_response.py">ConnectorCreateResponse</a></code>
+- <code title="put /accounts/{account_id}/magic/connectors/{connector_id}">client.magic_transit.connectors.<a href="./src/cloudflare/resources/magic_transit/connectors/connectors.py">update</a>(connector_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/connector_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/connector_update_response.py">ConnectorUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/magic/connectors">client.magic_transit.connectors.<a href="./src/cloudflare/resources/magic_transit/connectors/connectors.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_transit/connector_list_response.py">SyncSinglePage[ConnectorListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/magic/connectors/{connector_id}">client.magic_transit.connectors.<a href="./src/cloudflare/resources/magic_transit/connectors/connectors.py">delete</a>(connector_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_transit/connector_delete_response.py">ConnectorDeleteResponse</a></code>
+- <code title="patch /accounts/{account_id}/magic/connectors/{connector_id}">client.magic_transit.connectors.<a href="./src/cloudflare/resources/magic_transit/connectors/connectors.py">edit</a>(connector_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/connector_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/connector_edit_response.py">ConnectorEditResponse</a></code>
+- <code title="get /accounts/{account_id}/magic/connectors/{connector_id}">client.magic_transit.connectors.<a href="./src/cloudflare/resources/magic_transit/connectors/connectors.py">get</a>(connector_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_transit/connector_get_response.py">ConnectorGetResponse</a></code>
 
-## Configs
+### Events
 
 Types:
 
 ```python
-from cloudflare.types.magic_network_monitoring import Configuration
+from cloudflare.types.magic_transit.connectors import EventListResponse, EventGetResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/mnm/config">client.magic_network_monitoring.configs.<a href="./src/cloudflare/resources/magic_network_monitoring/configs/configs.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_network_monitoring/config_create_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_network_monitoring/configuration.py">Configuration</a></code>
-- <code title="put /accounts/{account_id}/mnm/config">client.magic_network_monitoring.configs.<a href="./src/cloudflare/resources/magic_network_monitoring/configs/configs.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_network_monitoring/config_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_network_monitoring/configuration.py">Configuration</a></code>
-- <code title="delete /accounts/{account_id}/mnm/config">client.magic_network_monitoring.configs.<a href="./src/cloudflare/resources/magic_network_monitoring/configs/configs.py">delete</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_network_monitoring/configuration.py">Configuration</a></code>
-- <code title="patch /accounts/{account_id}/mnm/config">client.magic_network_monitoring.configs.<a href="./src/cloudflare/resources/magic_network_monitoring/configs/configs.py">edit</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_network_monitoring/config_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_network_monitoring/configuration.py">Configuration</a></code>
-- <code title="get /accounts/{account_id}/mnm/config">client.magic_network_monitoring.configs.<a href="./src/cloudflare/resources/magic_network_monitoring/configs/configs.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_network_monitoring/configuration.py">Configuration</a></code>
+- <code title="get /accounts/{account_id}/magic/connectors/{connector_id}/telemetry/events">client.magic_transit.connectors.events.<a href="./src/cloudflare/resources/magic_transit/connectors/events/events.py">list</a>(connector_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/connectors/event_list_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/connectors/event_list_response.py">EventListResponse</a></code>
+- <code title="get /accounts/{account_id}/magic/connectors/{connector_id}/telemetry/events/{event_t}.{event_n}">client.magic_transit.connectors.events.<a href="./src/cloudflare/resources/magic_transit/connectors/events/events.py">get</a>(event_n, \*, account_id, connector_id, event_t) -> <a href="./src/cloudflare/types/magic_transit/connectors/event_get_response.py">EventGetResponse</a></code>
 
-### Full
+#### Latest
+
+Types:
+
+```python
+from cloudflare.types.magic_transit.connectors.events import LatestListResponse
+```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/mnm/config/full">client.magic_network_monitoring.configs.full.<a href="./src/cloudflare/resources/magic_network_monitoring/configs/full.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_network_monitoring/configuration.py">Configuration</a></code>
+- <code title="get /accounts/{account_id}/magic/connectors/{connector_id}/telemetry/events/latest">client.magic_transit.connectors.events.latest.<a href="./src/cloudflare/resources/magic_transit/connectors/events/latest.py">list</a>(connector_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_transit/connectors/events/latest_list_response.py">LatestListResponse</a></code>
 
-## Rules
+### Snapshots
 
 Types:
 
 ```python
-from cloudflare.types.magic_network_monitoring import MagicNetworkMonitoringRule
+from cloudflare.types.magic_transit.connectors import SnapshotListResponse, SnapshotGetResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/mnm/rules">client.magic_network_monitoring.rules.<a href="./src/cloudflare/resources/magic_network_monitoring/rules/rules.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_network_monitoring/rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_network_monitoring/magic_network_monitoring_rule.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/mnm/rules">client.magic_network_monitoring.rules.<a href="./src/cloudflare/resources/magic_network_monitoring/rules/rules.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_network_monitoring/rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_network_monitoring/magic_network_monitoring_rule.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/mnm/rules">client.magic_network_monitoring.rules.<a href="./src/cloudflare/resources/magic_network_monitoring/rules/rules.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_network_monitoring/magic_network_monitoring_rule.py">SyncSinglePage[Optional]</a></code>
-- <code title="delete /accounts/{account_id}/mnm/rules/{rule_id}">client.magic_network_monitoring.rules.<a href="./src/cloudflare/resources/magic_network_monitoring/rules/rules.py">delete</a>(rule_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_network_monitoring/magic_network_monitoring_rule.py">Optional</a></code>
-- <code title="patch /accounts/{account_id}/mnm/rules/{rule_id}">client.magic_network_monitoring.rules.<a href="./src/cloudflare/resources/magic_network_monitoring/rules/rules.py">edit</a>(rule_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_network_monitoring/rule_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_network_monitoring/magic_network_monitoring_rule.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/mnm/rules/{rule_id}">client.magic_network_monitoring.rules.<a href="./src/cloudflare/resources/magic_network_monitoring/rules/rules.py">get</a>(rule_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_network_monitoring/magic_network_monitoring_rule.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/magic/connectors/{connector_id}/telemetry/snapshots">client.magic_transit.connectors.snapshots.<a href="./src/cloudflare/resources/magic_transit/connectors/snapshots/snapshots.py">list</a>(connector_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/connectors/snapshot_list_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/connectors/snapshot_list_response.py">SnapshotListResponse</a></code>
+- <code title="get /accounts/{account_id}/magic/connectors/{connector_id}/telemetry/snapshots/{snapshot_t}">client.magic_transit.connectors.snapshots.<a href="./src/cloudflare/resources/magic_transit/connectors/snapshots/snapshots.py">get</a>(snapshot_t, \*, account_id, connector_id) -> <a href="./src/cloudflare/types/magic_transit/connectors/snapshot_get_response.py">SnapshotGetResponse</a></code>
 
-### Advertisements
+#### Latest
 
 Types:
 
 ```python
-from cloudflare.types.magic_network_monitoring.rules import Advertisement
+from cloudflare.types.magic_transit.connectors.snapshots import LatestListResponse
 ```
 
 Methods:
 
-- <code title="patch /accounts/{account_id}/mnm/rules/{rule_id}/advertisement">client.magic_network_monitoring.rules.advertisements.<a href="./src/cloudflare/resources/magic_network_monitoring/rules/advertisements.py">edit</a>(rule_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_network_monitoring/rules/advertisement_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_network_monitoring/rules/advertisement.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/magic/connectors/{connector_id}/telemetry/snapshots/latest">client.magic_transit.connectors.snapshots.latest.<a href="./src/cloudflare/resources/magic_transit/connectors/snapshots/latest.py">list</a>(connector_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_transit/connectors/snapshots/latest_list_response.py">LatestListResponse</a></code>
 
-# MTLSCertificates
+## PCAPs
 
 Types:
 
 ```python
-from cloudflare.types.mtls_certificates import MTLSCertificate, MTLSCertificateCreateResponse
+from cloudflare.types.magic_transit import (
+    PCAP,
+    PCAPFilter,
+    PCAPCreateResponse,
+    PCAPListResponse,
+    PCAPGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/mtls_certificates">client.mtls_certificates.<a href="./src/cloudflare/resources/mtls_certificates/mtls_certificates.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/mtls_certificates/mtls_certificate_create_params.py">params</a>) -> <a href="./src/cloudflare/types/mtls_certificates/mtls_certificate_create_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/mtls_certificates">client.mtls_certificates.<a href="./src/cloudflare/resources/mtls_certificates/mtls_certificates.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/mtls_certificates/mtls_certificate.py">SyncSinglePage[MTLSCertificate]</a></code>
-- <code title="delete /accounts/{account_id}/mtls_certificates/{mtls_certificate_id}">client.mtls_certificates.<a href="./src/cloudflare/resources/mtls_certificates/mtls_certificates.py">delete</a>(mtls_certificate_id, \*, account_id) -> <a href="./src/cloudflare/types/mtls_certificates/mtls_certificate.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/mtls_certificates/{mtls_certificate_id}">client.mtls_certificates.<a href="./src/cloudflare/resources/mtls_certificates/mtls_certificates.py">get</a>(mtls_certificate_id, \*, account_id) -> <a href="./src/cloudflare/types/mtls_certificates/mtls_certificate.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/pcaps">client.magic_transit.pcaps.<a href="./src/cloudflare/resources/magic_transit/pcaps/pcaps.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/pcap_create_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/pcap_create_response.py">PCAPCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/pcaps">client.magic_transit.pcaps.<a href="./src/cloudflare/resources/magic_transit/pcaps/pcaps.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_transit/pcap_list_response.py">SyncSinglePage[PCAPListResponse]</a></code>
+- <code title="get /accounts/{account_id}/pcaps/{pcap_id}">client.magic_transit.pcaps.<a href="./src/cloudflare/resources/magic_transit/pcaps/pcaps.py">get</a>(pcap_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_transit/pcap_get_response.py">PCAPGetResponse</a></code>
+- <code title="put /accounts/{account_id}/pcaps/{pcap_id}/stop">client.magic_transit.pcaps.<a href="./src/cloudflare/resources/magic_transit/pcaps/pcaps.py">stop</a>(pcap_id, \*, account_id) -> None</code>
 
-## Associations
+### Ownership
 
 Types:
 
 ```python
-from cloudflare.types.mtls_certificates import CertificateAsssociation, AssociationGetResponse
+from cloudflare.types.magic_transit.pcaps import Ownership
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/mtls_certificates/{mtls_certificate_id}/associations">client.mtls_certificates.associations.<a href="./src/cloudflare/resources/mtls_certificates/associations.py">get</a>(mtls_certificate_id, \*, account_id) -> <a href="./src/cloudflare/types/mtls_certificates/association_get_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/pcaps/ownership">client.magic_transit.pcaps.ownership.<a href="./src/cloudflare/resources/magic_transit/pcaps/ownership.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/pcaps/ownership_create_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/pcaps/ownership.py">Ownership</a></code>
+- <code title="delete /accounts/{account_id}/pcaps/ownership/{ownership_id}">client.magic_transit.pcaps.ownership.<a href="./src/cloudflare/resources/magic_transit/pcaps/ownership.py">delete</a>(ownership_id, \*, account_id) -> None</code>
+- <code title="get /accounts/{account_id}/pcaps/ownership">client.magic_transit.pcaps.ownership.<a href="./src/cloudflare/resources/magic_transit/pcaps/ownership.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_transit/pcaps/ownership.py">SyncSinglePage[Ownership]</a></code>
+- <code title="post /accounts/{account_id}/pcaps/ownership/validate">client.magic_transit.pcaps.ownership.<a href="./src/cloudflare/resources/magic_transit/pcaps/ownership.py">validate</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_transit/pcaps/ownership_validate_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_transit/pcaps/ownership.py">Ownership</a></code>
 
-# Pages
+### Download
 
-## Projects
+Methods:
+
+- <code title="get /accounts/{account_id}/pcaps/{pcap_id}/download">client.magic_transit.pcaps.download.<a href="./src/cloudflare/resources/magic_transit/pcaps/download.py">get</a>(pcap_id, \*, account_id) -> BinaryAPIResponse</code>
+
+# MagicNetworkMonitoring
+
+## VPCFlows
+
+### Tokens
 
 Types:
 
 ```python
-from cloudflare.types.pages import (
-    Deployment,
-    Project,
-    Stage,
-    ProjectCreateResponse,
-    ProjectDeleteResponse,
-    ProjectEditResponse,
-    ProjectPurgeBuildCacheResponse,
-)
+from cloudflare.types.magic_network_monitoring.vpc_flows import TokenCreateResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/pages/projects">client.pages.projects.<a href="./src/cloudflare/resources/pages/projects/projects.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/pages/project_create_params.py">params</a>) -> <a href="./src/cloudflare/types/pages/project_create_response.py">ProjectCreateResponse</a></code>
-- <code title="get /accounts/{account_id}/pages/projects">client.pages.projects.<a href="./src/cloudflare/resources/pages/projects/projects.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/pages/deployment.py">SyncSinglePage[Deployment]</a></code>
-- <code title="delete /accounts/{account_id}/pages/projects/{project_name}">client.pages.projects.<a href="./src/cloudflare/resources/pages/projects/projects.py">delete</a>(project_name, \*, account_id) -> <a href="./src/cloudflare/types/pages/project_delete_response.py">object</a></code>
-- <code title="patch /accounts/{account_id}/pages/projects/{project_name}">client.pages.projects.<a href="./src/cloudflare/resources/pages/projects/projects.py">edit</a>(project_name, \*, account_id, \*\*<a href="src/cloudflare/types/pages/project_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/pages/project_edit_response.py">ProjectEditResponse</a></code>
-- <code title="get /accounts/{account_id}/pages/projects/{project_name}">client.pages.projects.<a href="./src/cloudflare/resources/pages/projects/projects.py">get</a>(project_name, \*, account_id) -> <a href="./src/cloudflare/types/pages/project.py">Project</a></code>
-- <code title="post /accounts/{account_id}/pages/projects/{project_name}/purge_build_cache">client.pages.projects.<a href="./src/cloudflare/resources/pages/projects/projects.py">purge_build_cache</a>(project_name, \*, account_id) -> <a href="./src/cloudflare/types/pages/project_purge_build_cache_response.py">object</a></code>
+- <code title="post /accounts/{account_id}/mnm/vpc-flows/token">client.magic_network_monitoring.vpc_flows.tokens.<a href="./src/cloudflare/resources/magic_network_monitoring/vpc_flows/tokens.py">create</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_network_monitoring/vpc_flows/token_create_response.py">str</a></code>
 
-### Deployments
+## Configs
 
 Types:
 
 ```python
-from cloudflare.types.pages.projects import DeploymentDeleteResponse
+from cloudflare.types.magic_network_monitoring import Configuration
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/pages/projects/{project_name}/deployments">client.pages.projects.deployments.<a href="./src/cloudflare/resources/pages/projects/deployments/deployments.py">create</a>(project_name, \*, account_id, \*\*<a href="src/cloudflare/types/pages/projects/deployment_create_params.py">params</a>) -> <a href="./src/cloudflare/types/pages/deployment.py">Deployment</a></code>
-- <code title="get /accounts/{account_id}/pages/projects/{project_name}/deployments">client.pages.projects.deployments.<a href="./src/cloudflare/resources/pages/projects/deployments/deployments.py">list</a>(project_name, \*, account_id, \*\*<a href="src/cloudflare/types/pages/projects/deployment_list_params.py">params</a>) -> <a href="./src/cloudflare/types/pages/deployment.py">SyncSinglePage[Deployment]</a></code>
-- <code title="delete /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}">client.pages.projects.deployments.<a href="./src/cloudflare/resources/pages/projects/deployments/deployments.py">delete</a>(deployment_id, \*, account_id, project_name) -> <a href="./src/cloudflare/types/pages/projects/deployment_delete_response.py">object</a></code>
-- <code title="get /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}">client.pages.projects.deployments.<a href="./src/cloudflare/resources/pages/projects/deployments/deployments.py">get</a>(deployment_id, \*, account_id, project_name) -> <a href="./src/cloudflare/types/pages/deployment.py">Deployment</a></code>
-- <code title="post /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/retry">client.pages.projects.deployments.<a href="./src/cloudflare/resources/pages/projects/deployments/deployments.py">retry</a>(deployment_id, \*, account_id, project_name, \*\*<a href="src/cloudflare/types/pages/projects/deployment_retry_params.py">params</a>) -> <a href="./src/cloudflare/types/pages/deployment.py">Deployment</a></code>
-- <code title="post /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/rollback">client.pages.projects.deployments.<a href="./src/cloudflare/resources/pages/projects/deployments/deployments.py">rollback</a>(deployment_id, \*, account_id, project_name, \*\*<a href="src/cloudflare/types/pages/projects/deployment_rollback_params.py">params</a>) -> <a href="./src/cloudflare/types/pages/deployment.py">Deployment</a></code>
+- <code title="post /accounts/{account_id}/mnm/config">client.magic_network_monitoring.configs.<a href="./src/cloudflare/resources/magic_network_monitoring/configs/configs.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_network_monitoring/config_create_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_network_monitoring/configuration.py">Configuration</a></code>
+- <code title="put /accounts/{account_id}/mnm/config">client.magic_network_monitoring.configs.<a href="./src/cloudflare/resources/magic_network_monitoring/configs/configs.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_network_monitoring/config_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_network_monitoring/configuration.py">Configuration</a></code>
+- <code title="delete /accounts/{account_id}/mnm/config">client.magic_network_monitoring.configs.<a href="./src/cloudflare/resources/magic_network_monitoring/configs/configs.py">delete</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_network_monitoring/configuration.py">Configuration</a></code>
+- <code title="patch /accounts/{account_id}/mnm/config">client.magic_network_monitoring.configs.<a href="./src/cloudflare/resources/magic_network_monitoring/configs/configs.py">edit</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_network_monitoring/config_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_network_monitoring/configuration.py">Configuration</a></code>
+- <code title="get /accounts/{account_id}/mnm/config">client.magic_network_monitoring.configs.<a href="./src/cloudflare/resources/magic_network_monitoring/configs/configs.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_network_monitoring/configuration.py">Configuration</a></code>
 
-#### History
+### Full
 
-##### Logs
+Methods:
+
+- <code title="get /accounts/{account_id}/mnm/config/full">client.magic_network_monitoring.configs.full.<a href="./src/cloudflare/resources/magic_network_monitoring/configs/full.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_network_monitoring/configuration.py">Configuration</a></code>
+
+## Rules
 
 Types:
 
 ```python
-from cloudflare.types.pages.projects.deployments.history import LogGetResponse
+from cloudflare.types.magic_network_monitoring import MagicNetworkMonitoringRule
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/history/logs">client.pages.projects.deployments.history.logs.<a href="./src/cloudflare/resources/pages/projects/deployments/history/logs.py">get</a>(deployment_id, \*, account_id, project_name) -> <a href="./src/cloudflare/types/pages/projects/deployments/history/log_get_response.py">LogGetResponse</a></code>
+- <code title="post /accounts/{account_id}/mnm/rules">client.magic_network_monitoring.rules.<a href="./src/cloudflare/resources/magic_network_monitoring/rules/rules.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_network_monitoring/rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_network_monitoring/magic_network_monitoring_rule.py">Optional[MagicNetworkMonitoringRule]</a></code>
+- <code title="put /accounts/{account_id}/mnm/rules">client.magic_network_monitoring.rules.<a href="./src/cloudflare/resources/magic_network_monitoring/rules/rules.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_network_monitoring/rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_network_monitoring/magic_network_monitoring_rule.py">Optional[MagicNetworkMonitoringRule]</a></code>
+- <code title="get /accounts/{account_id}/mnm/rules">client.magic_network_monitoring.rules.<a href="./src/cloudflare/resources/magic_network_monitoring/rules/rules.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_network_monitoring/magic_network_monitoring_rule.py">SyncSinglePage[Optional[MagicNetworkMonitoringRule]]</a></code>
+- <code title="delete /accounts/{account_id}/mnm/rules/{rule_id}">client.magic_network_monitoring.rules.<a href="./src/cloudflare/resources/magic_network_monitoring/rules/rules.py">delete</a>(rule_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_network_monitoring/magic_network_monitoring_rule.py">Optional[MagicNetworkMonitoringRule]</a></code>
+- <code title="patch /accounts/{account_id}/mnm/rules/{rule_id}">client.magic_network_monitoring.rules.<a href="./src/cloudflare/resources/magic_network_monitoring/rules/rules.py">edit</a>(rule_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_network_monitoring/rule_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_network_monitoring/magic_network_monitoring_rule.py">Optional[MagicNetworkMonitoringRule]</a></code>
+- <code title="get /accounts/{account_id}/mnm/rules/{rule_id}">client.magic_network_monitoring.rules.<a href="./src/cloudflare/resources/magic_network_monitoring/rules/rules.py">get</a>(rule_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_network_monitoring/magic_network_monitoring_rule.py">Optional[MagicNetworkMonitoringRule]</a></code>
 
-### Domains
+### Advertisements
 
 Types:
 
 ```python
-from cloudflare.types.pages.projects import (
-    DomainCreateResponse,
-    DomainListResponse,
-    DomainDeleteResponse,
-    DomainEditResponse,
-    DomainGetResponse,
-)
+from cloudflare.types.magic_network_monitoring.rules import Advertisement
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/pages/projects/{project_name}/domains">client.pages.projects.domains.<a href="./src/cloudflare/resources/pages/projects/domains.py">create</a>(project_name, \*, account_id, \*\*<a href="src/cloudflare/types/pages/projects/domain_create_params.py">params</a>) -> <a href="./src/cloudflare/types/pages/projects/domain_create_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/pages/projects/{project_name}/domains">client.pages.projects.domains.<a href="./src/cloudflare/resources/pages/projects/domains.py">list</a>(project_name, \*, account_id) -> <a href="./src/cloudflare/types/pages/projects/domain_list_response.py">SyncSinglePage[object]</a></code>
-- <code title="delete /accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}">client.pages.projects.domains.<a href="./src/cloudflare/resources/pages/projects/domains.py">delete</a>(domain_name, \*, account_id, project_name) -> <a href="./src/cloudflare/types/pages/projects/domain_delete_response.py">object</a></code>
-- <code title="patch /accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}">client.pages.projects.domains.<a href="./src/cloudflare/resources/pages/projects/domains.py">edit</a>(domain_name, \*, account_id, project_name, \*\*<a href="src/cloudflare/types/pages/projects/domain_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/pages/projects/domain_edit_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}">client.pages.projects.domains.<a href="./src/cloudflare/resources/pages/projects/domains.py">get</a>(domain_name, \*, account_id, project_name) -> <a href="./src/cloudflare/types/pages/projects/domain_get_response.py">Optional</a></code>
+- <code title="patch /accounts/{account_id}/mnm/rules/{rule_id}/advertisement">client.magic_network_monitoring.rules.advertisements.<a href="./src/cloudflare/resources/magic_network_monitoring/rules/advertisements.py">edit</a>(rule_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_network_monitoring/rules/advertisement_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_network_monitoring/rules/advertisement.py">Optional[Advertisement]</a></code>
+
+# MagicCloudNetworking
 
-# PCAPs
+## CatalogSyncs
 
 Types:
 
 ```python
-from cloudflare.types.pcaps import (
-    PCAP,
-    PCAPFilter,
-    PCAPCreateResponse,
-    PCAPListResponse,
-    PCAPGetResponse,
+from cloudflare.types.magic_cloud_networking import (
+    CatalogSyncCreateResponse,
+    CatalogSyncUpdateResponse,
+    CatalogSyncListResponse,
+    CatalogSyncDeleteResponse,
+    CatalogSyncEditResponse,
+    CatalogSyncGetResponse,
+    CatalogSyncRefreshResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/pcaps">client.pcaps.<a href="./src/cloudflare/resources/pcaps/pcaps.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/pcaps/pcap_create_params.py">params</a>) -> <a href="./src/cloudflare/types/pcaps/pcap_create_response.py">PCAPCreateResponse</a></code>
-- <code title="get /accounts/{account_id}/pcaps">client.pcaps.<a href="./src/cloudflare/resources/pcaps/pcaps.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/pcaps/pcap_list_response.py">SyncSinglePage[PCAPListResponse]</a></code>
-- <code title="get /accounts/{account_id}/pcaps/{pcap_id}">client.pcaps.<a href="./src/cloudflare/resources/pcaps/pcaps.py">get</a>(pcap_id, \*, account_id) -> <a href="./src/cloudflare/types/pcaps/pcap_get_response.py">PCAPGetResponse</a></code>
+- <code title="post /accounts/{account_id}/magic/cloud/catalog-syncs">client.magic_cloud_networking.catalog_syncs.<a href="./src/cloudflare/resources/magic_cloud_networking/catalog_syncs/catalog_syncs.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/catalog_sync_create_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/catalog_sync_create_response.py">CatalogSyncCreateResponse</a></code>
+- <code title="put /accounts/{account_id}/magic/cloud/catalog-syncs/{sync_id}">client.magic_cloud_networking.catalog_syncs.<a href="./src/cloudflare/resources/magic_cloud_networking/catalog_syncs/catalog_syncs.py">update</a>(sync_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/catalog_sync_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/catalog_sync_update_response.py">CatalogSyncUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/magic/cloud/catalog-syncs">client.magic_cloud_networking.catalog_syncs.<a href="./src/cloudflare/resources/magic_cloud_networking/catalog_syncs/catalog_syncs.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_cloud_networking/catalog_sync_list_response.py">SyncSinglePage[CatalogSyncListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/magic/cloud/catalog-syncs/{sync_id}">client.magic_cloud_networking.catalog_syncs.<a href="./src/cloudflare/resources/magic_cloud_networking/catalog_syncs/catalog_syncs.py">delete</a>(sync_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/catalog_sync_delete_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/catalog_sync_delete_response.py">CatalogSyncDeleteResponse</a></code>
+- <code title="patch /accounts/{account_id}/magic/cloud/catalog-syncs/{sync_id}">client.magic_cloud_networking.catalog_syncs.<a href="./src/cloudflare/resources/magic_cloud_networking/catalog_syncs/catalog_syncs.py">edit</a>(sync_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/catalog_sync_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/catalog_sync_edit_response.py">CatalogSyncEditResponse</a></code>
+- <code title="get /accounts/{account_id}/magic/cloud/catalog-syncs/{sync_id}">client.magic_cloud_networking.catalog_syncs.<a href="./src/cloudflare/resources/magic_cloud_networking/catalog_syncs/catalog_syncs.py">get</a>(sync_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_cloud_networking/catalog_sync_get_response.py">CatalogSyncGetResponse</a></code>
+- <code title="post /accounts/{account_id}/magic/cloud/catalog-syncs/{sync_id}/refresh">client.magic_cloud_networking.catalog_syncs.<a href="./src/cloudflare/resources/magic_cloud_networking/catalog_syncs/catalog_syncs.py">refresh</a>(sync_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_cloud_networking/catalog_sync_refresh_response.py">str</a></code>
 
-## Ownership
+### PrebuiltPolicies
 
 Types:
 
 ```python
-from cloudflare.types.pcaps import Ownership, OwnershipGetResponse
+from cloudflare.types.magic_cloud_networking.catalog_syncs import PrebuiltPolicyListResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/pcaps/ownership">client.pcaps.ownership.<a href="./src/cloudflare/resources/pcaps/ownership.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/pcaps/ownership_create_params.py">params</a>) -> <a href="./src/cloudflare/types/pcaps/ownership.py">Ownership</a></code>
-- <code title="delete /accounts/{account_id}/pcaps/ownership/{ownership_id}">client.pcaps.ownership.<a href="./src/cloudflare/resources/pcaps/ownership.py">delete</a>(ownership_id, \*, account_id) -> None</code>
-- <code title="get /accounts/{account_id}/pcaps/ownership">client.pcaps.ownership.<a href="./src/cloudflare/resources/pcaps/ownership.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/pcaps/ownership_get_response.py">Optional</a></code>
-- <code title="post /accounts/{account_id}/pcaps/ownership/validate">client.pcaps.ownership.<a href="./src/cloudflare/resources/pcaps/ownership.py">validate</a>(\*, account_id, \*\*<a href="src/cloudflare/types/pcaps/ownership_validate_params.py">params</a>) -> <a href="./src/cloudflare/types/pcaps/ownership.py">Ownership</a></code>
+- <code title="get /accounts/{account_id}/magic/cloud/catalog-syncs/prebuilt-policies">client.magic_cloud_networking.catalog_syncs.prebuilt_policies.<a href="./src/cloudflare/resources/magic_cloud_networking/catalog_syncs/prebuilt_policies.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/catalog_syncs/prebuilt_policy_list_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/catalog_syncs/prebuilt_policy_list_response.py">SyncSinglePage[PrebuiltPolicyListResponse]</a></code>
 
-## Download
+## OnRamps
 
-Methods:
+Types:
+
+```python
+from cloudflare.types.magic_cloud_networking import (
+    OnRampCreateResponse,
+    OnRampUpdateResponse,
+    OnRampListResponse,
+    OnRampDeleteResponse,
+    OnRampApplyResponse,
+    OnRampEditResponse,
+    OnRampGetResponse,
+    OnRampPlanResponse,
+)
+```
 
-- <code title="get /accounts/{account_id}/pcaps/{pcap_id}/download">client.pcaps.download.<a href="./src/cloudflare/resources/pcaps/download.py">get</a>(pcap_id, \*, account_id) -> BinaryAPIResponse</code>
+Methods:
 
-# Registrar
+- <code title="post /accounts/{account_id}/magic/cloud/onramps">client.magic_cloud_networking.on_ramps.<a href="./src/cloudflare/resources/magic_cloud_networking/on_ramps/on_ramps.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/on_ramp_create_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/on_ramp_create_response.py">OnRampCreateResponse</a></code>
+- <code title="put /accounts/{account_id}/magic/cloud/onramps/{onramp_id}">client.magic_cloud_networking.on_ramps.<a href="./src/cloudflare/resources/magic_cloud_networking/on_ramps/on_ramps.py">update</a>(onramp_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/on_ramp_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/on_ramp_update_response.py">OnRampUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/magic/cloud/onramps">client.magic_cloud_networking.on_ramps.<a href="./src/cloudflare/resources/magic_cloud_networking/on_ramps/on_ramps.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/on_ramp_list_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/on_ramp_list_response.py">SyncSinglePage[OnRampListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/magic/cloud/onramps/{onramp_id}">client.magic_cloud_networking.on_ramps.<a href="./src/cloudflare/resources/magic_cloud_networking/on_ramps/on_ramps.py">delete</a>(onramp_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/on_ramp_delete_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/on_ramp_delete_response.py">OnRampDeleteResponse</a></code>
+- <code title="post /accounts/{account_id}/magic/cloud/onramps/{onramp_id}/apply">client.magic_cloud_networking.on_ramps.<a href="./src/cloudflare/resources/magic_cloud_networking/on_ramps/on_ramps.py">apply</a>(onramp_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_cloud_networking/on_ramp_apply_response.py">OnRampApplyResponse</a></code>
+- <code title="patch /accounts/{account_id}/magic/cloud/onramps/{onramp_id}">client.magic_cloud_networking.on_ramps.<a href="./src/cloudflare/resources/magic_cloud_networking/on_ramps/on_ramps.py">edit</a>(onramp_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/on_ramp_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/on_ramp_edit_response.py">OnRampEditResponse</a></code>
+- <code title="post /accounts/{account_id}/magic/cloud/onramps/{onramp_id}/export">client.magic_cloud_networking.on_ramps.<a href="./src/cloudflare/resources/magic_cloud_networking/on_ramps/on_ramps.py">export</a>(onramp_id, \*, account_id) -> BinaryAPIResponse</code>
+- <code title="get /accounts/{account_id}/magic/cloud/onramps/{onramp_id}">client.magic_cloud_networking.on_ramps.<a href="./src/cloudflare/resources/magic_cloud_networking/on_ramps/on_ramps.py">get</a>(onramp_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/on_ramp_get_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/on_ramp_get_response.py">OnRampGetResponse</a></code>
+- <code title="post /accounts/{account_id}/magic/cloud/onramps/{onramp_id}/plan">client.magic_cloud_networking.on_ramps.<a href="./src/cloudflare/resources/magic_cloud_networking/on_ramps/on_ramps.py">plan</a>(onramp_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_cloud_networking/on_ramp_plan_response.py">OnRampPlanResponse</a></code>
 
-## Domains
+### AddressSpaces
 
 Types:
 
 ```python
-from cloudflare.types.registrar import Domain, DomainUpdateResponse, DomainGetResponse
+from cloudflare.types.magic_cloud_networking.on_ramps import (
+    AddressSpaceUpdateResponse,
+    AddressSpaceListResponse,
+    AddressSpaceEditResponse,
+)
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/registrar/domains/{domain_name}">client.registrar.domains.<a href="./src/cloudflare/resources/registrar/domains.py">update</a>(domain_name, \*, account_id, \*\*<a href="src/cloudflare/types/registrar/domain_update_params.py">params</a>) -> <a href="./src/cloudflare/types/registrar/domain_update_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/registrar/domains">client.registrar.domains.<a href="./src/cloudflare/resources/registrar/domains.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/registrar/domain.py">SyncSinglePage[Domain]</a></code>
-- <code title="get /accounts/{account_id}/registrar/domains/{domain_name}">client.registrar.domains.<a href="./src/cloudflare/resources/registrar/domains.py">get</a>(domain_name, \*, account_id) -> <a href="./src/cloudflare/types/registrar/domain_get_response.py">Optional</a></code>
-
-# RequestTracers
+- <code title="put /accounts/{account_id}/magic/cloud/onramps/magic_wan_address_space">client.magic_cloud_networking.on_ramps.address_spaces.<a href="./src/cloudflare/resources/magic_cloud_networking/on_ramps/address_spaces.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_update_response.py">AddressSpaceUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/magic/cloud/onramps/magic_wan_address_space">client.magic_cloud_networking.on_ramps.address_spaces.<a href="./src/cloudflare/resources/magic_cloud_networking/on_ramps/address_spaces.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_list_response.py">AddressSpaceListResponse</a></code>
+- <code title="patch /accounts/{account_id}/magic/cloud/onramps/magic_wan_address_space">client.magic_cloud_networking.on_ramps.address_spaces.<a href="./src/cloudflare/resources/magic_cloud_networking/on_ramps/address_spaces.py">edit</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_edit_response.py">AddressSpaceEditResponse</a></code>
 
-## Traces
+## CloudIntegrations
 
 Types:
 
 ```python
-from cloudflare.types.request_tracers import Trace, TraceItem, TraceCreateResponse
+from cloudflare.types.magic_cloud_networking import (
+    CloudIntegrationCreateResponse,
+    CloudIntegrationUpdateResponse,
+    CloudIntegrationListResponse,
+    CloudIntegrationDeleteResponse,
+    CloudIntegrationDiscoverResponse,
+    CloudIntegrationDiscoverAllResponse,
+    CloudIntegrationEditResponse,
+    CloudIntegrationGetResponse,
+    CloudIntegrationInitialSetupResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/request-tracer/trace">client.request_tracers.traces.<a href="./src/cloudflare/resources/request_tracers/traces.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/request_tracers/trace_create_params.py">params</a>) -> <a href="./src/cloudflare/types/request_tracers/trace_create_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/magic/cloud/providers">client.magic_cloud_networking.cloud_integrations.<a href="./src/cloudflare/resources/magic_cloud_networking/cloud_integrations.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/cloud_integration_create_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/cloud_integration_create_response.py">CloudIntegrationCreateResponse</a></code>
+- <code title="put /accounts/{account_id}/magic/cloud/providers/{provider_id}">client.magic_cloud_networking.cloud_integrations.<a href="./src/cloudflare/resources/magic_cloud_networking/cloud_integrations.py">update</a>(provider_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/cloud_integration_update_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/cloud_integration_update_response.py">CloudIntegrationUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/magic/cloud/providers">client.magic_cloud_networking.cloud_integrations.<a href="./src/cloudflare/resources/magic_cloud_networking/cloud_integrations.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/cloud_integration_list_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/cloud_integration_list_response.py">SyncSinglePage[CloudIntegrationListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/magic/cloud/providers/{provider_id}">client.magic_cloud_networking.cloud_integrations.<a href="./src/cloudflare/resources/magic_cloud_networking/cloud_integrations.py">delete</a>(provider_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_cloud_networking/cloud_integration_delete_response.py">CloudIntegrationDeleteResponse</a></code>
+- <code title="post /accounts/{account_id}/magic/cloud/providers/{provider_id}/discover">client.magic_cloud_networking.cloud_integrations.<a href="./src/cloudflare/resources/magic_cloud_networking/cloud_integrations.py">discover</a>(provider_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/cloud_integration_discover_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/cloud_integration_discover_response.py">CloudIntegrationDiscoverResponse</a></code>
+- <code title="post /accounts/{account_id}/magic/cloud/providers/discover">client.magic_cloud_networking.cloud_integrations.<a href="./src/cloudflare/resources/magic_cloud_networking/cloud_integrations.py">discover_all</a>(\*, account_id) -> <a href="./src/cloudflare/types/magic_cloud_networking/cloud_integration_discover_all_response.py">CloudIntegrationDiscoverAllResponse</a></code>
+- <code title="patch /accounts/{account_id}/magic/cloud/providers/{provider_id}">client.magic_cloud_networking.cloud_integrations.<a href="./src/cloudflare/resources/magic_cloud_networking/cloud_integrations.py">edit</a>(provider_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/cloud_integration_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/cloud_integration_edit_response.py">CloudIntegrationEditResponse</a></code>
+- <code title="get /accounts/{account_id}/magic/cloud/providers/{provider_id}">client.magic_cloud_networking.cloud_integrations.<a href="./src/cloudflare/resources/magic_cloud_networking/cloud_integrations.py">get</a>(provider_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/cloud_integration_get_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/cloud_integration_get_response.py">CloudIntegrationGetResponse</a></code>
+- <code title="get /accounts/{account_id}/magic/cloud/providers/{provider_id}/initial_setup">client.magic_cloud_networking.cloud_integrations.<a href="./src/cloudflare/resources/magic_cloud_networking/cloud_integrations.py">initial_setup</a>(provider_id, \*, account_id) -> <a href="./src/cloudflare/types/magic_cloud_networking/cloud_integration_initial_setup_response.py">CloudIntegrationInitialSetupResponse</a></code>
 
-# Rules
-
-## Lists
+## Resources
 
 Types:
 
 ```python
-from cloudflare.types.rules import Hostname, ListsList, Redirect, ListDeleteResponse
+from cloudflare.types.magic_cloud_networking import (
+    ResourceListResponse,
+    ResourceGetResponse,
+    ResourcePolicyPreviewResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/rules/lists">client.rules.lists.<a href="./src/cloudflare/resources/rules/lists/lists.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/rules/list_create_params.py">params</a>) -> <a href="./src/cloudflare/types/rules/lists_list.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/rules/lists/{list_id}">client.rules.lists.<a href="./src/cloudflare/resources/rules/lists/lists.py">update</a>(list_id, \*, account_id, \*\*<a href="src/cloudflare/types/rules/list_update_params.py">params</a>) -> <a href="./src/cloudflare/types/rules/lists_list.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/rules/lists">client.rules.lists.<a href="./src/cloudflare/resources/rules/lists/lists.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/rules/lists_list.py">SyncSinglePage[ListsList]</a></code>
-- <code title="delete /accounts/{account_id}/rules/lists/{list_id}">client.rules.lists.<a href="./src/cloudflare/resources/rules/lists/lists.py">delete</a>(list_id, \*, account_id) -> <a href="./src/cloudflare/types/rules/list_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/rules/lists/{list_id}">client.rules.lists.<a href="./src/cloudflare/resources/rules/lists/lists.py">get</a>(list_id, \*, account_id) -> <a href="./src/cloudflare/types/rules/lists_list.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/magic/cloud/resources">client.magic_cloud_networking.resources.<a href="./src/cloudflare/resources/magic_cloud_networking/resources.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/resource_list_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/resource_list_response.py">SyncV4PagePaginationArray[ResourceListResponse]</a></code>
+- <code title="get /accounts/{account_id}/magic/cloud/resources/export">client.magic_cloud_networking.resources.<a href="./src/cloudflare/resources/magic_cloud_networking/resources.py">export</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/resource_export_params.py">params</a>) -> BinaryAPIResponse</code>
+- <code title="get /accounts/{account_id}/magic/cloud/resources/{resource_id}">client.magic_cloud_networking.resources.<a href="./src/cloudflare/resources/magic_cloud_networking/resources.py">get</a>(resource_id, \*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/resource_get_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/resource_get_response.py">ResourceGetResponse</a></code>
+- <code title="post /accounts/{account_id}/magic/cloud/resources/policy-preview">client.magic_cloud_networking.resources.<a href="./src/cloudflare/resources/magic_cloud_networking/resources.py">policy_preview</a>(\*, account_id, \*\*<a href="src/cloudflare/types/magic_cloud_networking/resource_policy_preview_params.py">params</a>) -> <a href="./src/cloudflare/types/magic_cloud_networking/resource_policy_preview_response.py">str</a></code>
 
-### BulkOperations
+# NetworkInterconnects
+
+## CNIs
 
 Types:
 
 ```python
-from cloudflare.types.rules.lists import OperationStatus, BulkOperationGetResponse
+from cloudflare.types.network_interconnects import (
+    CNICreateResponse,
+    CNIUpdateResponse,
+    CNIListResponse,
+    CNIGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_identifier}/rules/lists/bulk_operations/{operation_id}">client.rules.lists.bulk_operations.<a href="./src/cloudflare/resources/rules/lists/bulk_operations.py">get</a>(operation_id, \*, account_identifier) -> <a href="./src/cloudflare/types/rules/lists/bulk_operation_get_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/cni/cnis">client.network_interconnects.cnis.<a href="./src/cloudflare/resources/network_interconnects/cnis.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/network_interconnects/cni_create_params.py">params</a>) -> <a href="./src/cloudflare/types/network_interconnects/cni_create_response.py">CNICreateResponse</a></code>
+- <code title="put /accounts/{account_id}/cni/cnis/{cni}">client.network_interconnects.cnis.<a href="./src/cloudflare/resources/network_interconnects/cnis.py">update</a>(cni, \*, account_id, \*\*<a href="src/cloudflare/types/network_interconnects/cni_update_params.py">params</a>) -> <a href="./src/cloudflare/types/network_interconnects/cni_update_response.py">CNIUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/cni/cnis">client.network_interconnects.cnis.<a href="./src/cloudflare/resources/network_interconnects/cnis.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/network_interconnects/cni_list_params.py">params</a>) -> <a href="./src/cloudflare/types/network_interconnects/cni_list_response.py">CNIListResponse</a></code>
+- <code title="delete /accounts/{account_id}/cni/cnis/{cni}">client.network_interconnects.cnis.<a href="./src/cloudflare/resources/network_interconnects/cnis.py">delete</a>(cni, \*, account_id) -> None</code>
+- <code title="get /accounts/{account_id}/cni/cnis/{cni}">client.network_interconnects.cnis.<a href="./src/cloudflare/resources/network_interconnects/cnis.py">get</a>(cni, \*, account_id) -> <a href="./src/cloudflare/types/network_interconnects/cni_get_response.py">CNIGetResponse</a></code>
 
-### Items
+## Interconnects
 
 Types:
 
 ```python
-from cloudflare.types.rules.lists import (
-    ListCursor,
-    ListItem,
-    ItemCreateResponse,
-    ItemUpdateResponse,
-    ItemListResponse,
-    ItemDeleteResponse,
-    ItemGetResponse,
+from cloudflare.types.network_interconnects import (
+    InterconnectCreateResponse,
+    InterconnectListResponse,
+    InterconnectGetResponse,
+    InterconnectStatusResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/rules/lists/{list_id}/items">client.rules.lists.items.<a href="./src/cloudflare/resources/rules/lists/items.py">create</a>(list_id, \*, account_id, \*\*<a href="src/cloudflare/types/rules/lists/item_create_params.py">params</a>) -> <a href="./src/cloudflare/types/rules/lists/item_create_response.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/rules/lists/{list_id}/items">client.rules.lists.items.<a href="./src/cloudflare/resources/rules/lists/items.py">update</a>(list_id, \*, account_id, \*\*<a href="src/cloudflare/types/rules/lists/item_update_params.py">params</a>) -> <a href="./src/cloudflare/types/rules/lists/item_update_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/rules/lists/{list_id}/items">client.rules.lists.items.<a href="./src/cloudflare/resources/rules/lists/items.py">list</a>(list_id, \*, account_id, \*\*<a href="src/cloudflare/types/rules/lists/item_list_params.py">params</a>) -> <a href="./src/cloudflare/types/rules/lists/item_list_response.py">SyncCursorPagination[object]</a></code>
-- <code title="delete /accounts/{account_id}/rules/lists/{list_id}/items">client.rules.lists.items.<a href="./src/cloudflare/resources/rules/lists/items.py">delete</a>(list_id, \*, account_id) -> <a href="./src/cloudflare/types/rules/lists/item_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_identifier}/rules/lists/{list_id}/items/{item_id}">client.rules.lists.items.<a href="./src/cloudflare/resources/rules/lists/items.py">get</a>(item_id, \*, account_identifier, list_id) -> <a href="./src/cloudflare/types/rules/lists/item_get_response.py">Optional</a></code>
-
-# Storage
+- <code title="post /accounts/{account_id}/cni/interconnects">client.network_interconnects.interconnects.<a href="./src/cloudflare/resources/network_interconnects/interconnects.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/network_interconnects/interconnect_create_params.py">params</a>) -> <a href="./src/cloudflare/types/network_interconnects/interconnect_create_response.py">InterconnectCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/cni/interconnects">client.network_interconnects.interconnects.<a href="./src/cloudflare/resources/network_interconnects/interconnects.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/network_interconnects/interconnect_list_params.py">params</a>) -> <a href="./src/cloudflare/types/network_interconnects/interconnect_list_response.py">InterconnectListResponse</a></code>
+- <code title="delete /accounts/{account_id}/cni/interconnects/{icon}">client.network_interconnects.interconnects.<a href="./src/cloudflare/resources/network_interconnects/interconnects.py">delete</a>(icon, \*, account_id) -> None</code>
+- <code title="get /accounts/{account_id}/cni/interconnects/{icon}">client.network_interconnects.interconnects.<a href="./src/cloudflare/resources/network_interconnects/interconnects.py">get</a>(icon, \*, account_id) -> <a href="./src/cloudflare/types/network_interconnects/interconnect_get_response.py">InterconnectGetResponse</a></code>
+- <code title="get /accounts/{account_id}/cni/interconnects/{icon}/loa">client.network_interconnects.interconnects.<a href="./src/cloudflare/resources/network_interconnects/interconnects.py">loa</a>(icon, \*, account_id) -> None</code>
+- <code title="get /accounts/{account_id}/cni/interconnects/{icon}/status">client.network_interconnects.interconnects.<a href="./src/cloudflare/resources/network_interconnects/interconnects.py">status</a>(icon, \*, account_id) -> <a href="./src/cloudflare/types/network_interconnects/interconnect_status_response.py">InterconnectStatusResponse</a></code>
 
-## Analytics
+## Settings
 
 Types:
 
 ```python
-from cloudflare.types.storage import Components, Schema
+from cloudflare.types.network_interconnects import SettingUpdateResponse, SettingGetResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/storage/analytics">client.storage.analytics.<a href="./src/cloudflare/resources/storage/analytics.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/storage/analytics_list_params.py">params</a>) -> <a href="./src/cloudflare/types/storage/schema.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/storage/analytics/stored">client.storage.analytics.<a href="./src/cloudflare/resources/storage/analytics.py">stored</a>(\*, account_id, \*\*<a href="src/cloudflare/types/storage/analytics_stored_params.py">params</a>) -> <a href="./src/cloudflare/types/storage/components.py">Optional</a></code>
+- <code title="put /accounts/{account_id}/cni/settings">client.network_interconnects.settings.<a href="./src/cloudflare/resources/network_interconnects/settings.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/network_interconnects/setting_update_params.py">params</a>) -> <a href="./src/cloudflare/types/network_interconnects/setting_update_response.py">SettingUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/cni/settings">client.network_interconnects.settings.<a href="./src/cloudflare/resources/network_interconnects/settings.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/network_interconnects/setting_get_response.py">SettingGetResponse</a></code>
 
-# Stream
+## Slots
 
 Types:
 
 ```python
-from cloudflare.types.stream import AllowedOrigins, Video
+from cloudflare.types.network_interconnects import SlotListResponse, SlotGetResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/stream">client.stream.<a href="./src/cloudflare/resources/stream/stream.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/stream_create_params.py">params</a>) -> None</code>
-- <code title="get /accounts/{account_id}/stream">client.stream.<a href="./src/cloudflare/resources/stream/stream.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/stream_list_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/video.py">SyncSinglePage[Video]</a></code>
-- <code title="delete /accounts/{account_id}/stream/{identifier}">client.stream.<a href="./src/cloudflare/resources/stream/stream.py">delete</a>(identifier, \*, account_id) -> None</code>
-- <code title="get /accounts/{account_id}/stream/{identifier}">client.stream.<a href="./src/cloudflare/resources/stream/stream.py">get</a>(identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/video.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/cni/slots">client.network_interconnects.slots.<a href="./src/cloudflare/resources/network_interconnects/slots.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/network_interconnects/slot_list_params.py">params</a>) -> <a href="./src/cloudflare/types/network_interconnects/slot_list_response.py">SlotListResponse</a></code>
+- <code title="get /accounts/{account_id}/cni/slots/{slot}">client.network_interconnects.slots.<a href="./src/cloudflare/resources/network_interconnects/slots.py">get</a>(slot, \*, account_id) -> <a href="./src/cloudflare/types/network_interconnects/slot_get_response.py">SlotGetResponse</a></code>
 
-## AudioTracks
+# MTLSCertificates
 
 Types:
 
 ```python
-from cloudflare.types.stream import Audio, AudioTrackDeleteResponse, AudioTrackGetResponse
+from cloudflare.types.mtls_certificates import MTLSCertificate, MTLSCertificateCreateResponse
 ```
 
 Methods:
 
-- <code title="delete /accounts/{account_id}/stream/{identifier}/audio/{audio_identifier}">client.stream.audio_tracks.<a href="./src/cloudflare/resources/stream/audio_tracks.py">delete</a>(audio_identifier, \*, account_id, identifier) -> <a href="./src/cloudflare/types/stream/audio_track_delete_response.py">Optional</a></code>
-- <code title="post /accounts/{account_id}/stream/{identifier}/audio/copy">client.stream.audio_tracks.<a href="./src/cloudflare/resources/stream/audio_tracks.py">copy</a>(identifier, \*, account_id, \*\*<a href="src/cloudflare/types/stream/audio_track_copy_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/audio.py">Optional</a></code>
-- <code title="patch /accounts/{account_id}/stream/{identifier}/audio/{audio_identifier}">client.stream.audio_tracks.<a href="./src/cloudflare/resources/stream/audio_tracks.py">edit</a>(audio_identifier, \*, account_id, identifier, \*\*<a href="src/cloudflare/types/stream/audio_track_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/audio.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/stream/{identifier}/audio">client.stream.audio_tracks.<a href="./src/cloudflare/resources/stream/audio_tracks.py">get</a>(identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/audio_track_get_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/mtls_certificates">client.mtls_certificates.<a href="./src/cloudflare/resources/mtls_certificates/mtls_certificates.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/mtls_certificates/mtls_certificate_create_params.py">params</a>) -> <a href="./src/cloudflare/types/mtls_certificates/mtls_certificate_create_response.py">Optional[MTLSCertificateCreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/mtls_certificates">client.mtls_certificates.<a href="./src/cloudflare/resources/mtls_certificates/mtls_certificates.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/mtls_certificates/mtls_certificate.py">SyncSinglePage[MTLSCertificate]</a></code>
+- <code title="delete /accounts/{account_id}/mtls_certificates/{mtls_certificate_id}">client.mtls_certificates.<a href="./src/cloudflare/resources/mtls_certificates/mtls_certificates.py">delete</a>(mtls_certificate_id, \*, account_id) -> <a href="./src/cloudflare/types/mtls_certificates/mtls_certificate.py">Optional[MTLSCertificate]</a></code>
+- <code title="get /accounts/{account_id}/mtls_certificates/{mtls_certificate_id}">client.mtls_certificates.<a href="./src/cloudflare/resources/mtls_certificates/mtls_certificates.py">get</a>(mtls_certificate_id, \*, account_id) -> <a href="./src/cloudflare/types/mtls_certificates/mtls_certificate.py">Optional[MTLSCertificate]</a></code>
 
-## Videos
+## Associations
 
 Types:
 
 ```python
-from cloudflare.types.stream import VideoStorageUsageResponse
+from cloudflare.types.mtls_certificates import CertificateAsssociation
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/stream/storage-usage">client.stream.videos.<a href="./src/cloudflare/resources/stream/videos.py">storage_usage</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/video_storage_usage_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/video_storage_usage_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/mtls_certificates/{mtls_certificate_id}/associations">client.mtls_certificates.associations.<a href="./src/cloudflare/resources/mtls_certificates/associations.py">get</a>(mtls_certificate_id, \*, account_id) -> <a href="./src/cloudflare/types/mtls_certificates/certificate_asssociation.py">SyncSinglePage[CertificateAsssociation]</a></code>
 
-## Clip
+# Pages
+
+## Projects
 
 Types:
 
 ```python
-from cloudflare.types.stream import Clip
+from cloudflare.types.pages import Deployment, Project, Stage
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/stream/clip">client.stream.clip.<a href="./src/cloudflare/resources/stream/clip.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/clip_create_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/clip.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/pages/projects">client.pages.projects.<a href="./src/cloudflare/resources/pages/projects/projects.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/pages/project_create_params.py">params</a>) -> <a href="./src/cloudflare/types/pages/project.py">Project</a></code>
+- <code title="get /accounts/{account_id}/pages/projects">client.pages.projects.<a href="./src/cloudflare/resources/pages/projects/projects.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/pages/project_list_params.py">params</a>) -> <a href="./src/cloudflare/types/pages/project.py">SyncV4PagePaginationArray[Project]</a></code>
+- <code title="delete /accounts/{account_id}/pages/projects/{project_name}">client.pages.projects.<a href="./src/cloudflare/resources/pages/projects/projects.py">delete</a>(project_name, \*, account_id) -> object</code>
+- <code title="patch /accounts/{account_id}/pages/projects/{project_name}">client.pages.projects.<a href="./src/cloudflare/resources/pages/projects/projects.py">edit</a>(project_name, \*, account_id, \*\*<a href="src/cloudflare/types/pages/project_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/pages/project.py">Project</a></code>
+- <code title="get /accounts/{account_id}/pages/projects/{project_name}">client.pages.projects.<a href="./src/cloudflare/resources/pages/projects/projects.py">get</a>(project_name, \*, account_id) -> <a href="./src/cloudflare/types/pages/project.py">Project</a></code>
+- <code title="post /accounts/{account_id}/pages/projects/{project_name}/purge_build_cache">client.pages.projects.<a href="./src/cloudflare/resources/pages/projects/projects.py">purge_build_cache</a>(project_name, \*, account_id) -> object</code>
 
-## Copy
+### Deployments
 
 Methods:
 
-- <code title="post /accounts/{account_id}/stream/copy">client.stream.copy.<a href="./src/cloudflare/resources/stream/copy.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/copy_create_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/video.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/pages/projects/{project_name}/deployments">client.pages.projects.deployments.<a href="./src/cloudflare/resources/pages/projects/deployments/deployments.py">create</a>(project_name, \*, account_id, \*\*<a href="src/cloudflare/types/pages/projects/deployment_create_params.py">params</a>) -> <a href="./src/cloudflare/types/pages/deployment.py">Deployment</a></code>
+- <code title="get /accounts/{account_id}/pages/projects/{project_name}/deployments">client.pages.projects.deployments.<a href="./src/cloudflare/resources/pages/projects/deployments/deployments.py">list</a>(project_name, \*, account_id, \*\*<a href="src/cloudflare/types/pages/projects/deployment_list_params.py">params</a>) -> <a href="./src/cloudflare/types/pages/deployment.py">SyncV4PagePaginationArray[Deployment]</a></code>
+- <code title="delete /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}">client.pages.projects.deployments.<a href="./src/cloudflare/resources/pages/projects/deployments/deployments.py">delete</a>(deployment_id, \*, account_id, project_name) -> object</code>
+- <code title="get /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}">client.pages.projects.deployments.<a href="./src/cloudflare/resources/pages/projects/deployments/deployments.py">get</a>(deployment_id, \*, account_id, project_name) -> <a href="./src/cloudflare/types/pages/deployment.py">Deployment</a></code>
+- <code title="post /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/retry">client.pages.projects.deployments.<a href="./src/cloudflare/resources/pages/projects/deployments/deployments.py">retry</a>(deployment_id, \*, account_id, project_name) -> <a href="./src/cloudflare/types/pages/deployment.py">Deployment</a></code>
+- <code title="post /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/rollback">client.pages.projects.deployments.<a href="./src/cloudflare/resources/pages/projects/deployments/deployments.py">rollback</a>(deployment_id, \*, account_id, project_name) -> <a href="./src/cloudflare/types/pages/deployment.py">Deployment</a></code>
 
-## DirectUpload
+#### History
+
+##### Logs
 
 Types:
 
 ```python
-from cloudflare.types.stream import DirectUploadCreateResponse
+from cloudflare.types.pages.projects.deployments.history import LogGetResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/stream/direct_upload">client.stream.direct_upload.<a href="./src/cloudflare/resources/stream/direct_upload.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/direct_upload_create_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/direct_upload_create_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/history/logs">client.pages.projects.deployments.history.logs.<a href="./src/cloudflare/resources/pages/projects/deployments/history/logs.py">get</a>(deployment_id, \*, account_id, project_name) -> <a href="./src/cloudflare/types/pages/projects/deployments/history/log_get_response.py">LogGetResponse</a></code>
 
-## Keys
+### Domains
 
 Types:
 
 ```python
-from cloudflare.types.stream import Keys, KeyDeleteResponse, KeyGetResponse
+from cloudflare.types.pages.projects import (
+    DomainCreateResponse,
+    DomainListResponse,
+    DomainEditResponse,
+    DomainGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/stream/keys">client.stream.keys.<a href="./src/cloudflare/resources/stream/keys.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/key_create_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/keys.py">Optional</a></code>
-- <code title="delete /accounts/{account_id}/stream/keys/{identifier}">client.stream.keys.<a href="./src/cloudflare/resources/stream/keys.py">delete</a>(identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/key_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/stream/keys">client.stream.keys.<a href="./src/cloudflare/resources/stream/keys.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/stream/key_get_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/pages/projects/{project_name}/domains">client.pages.projects.domains.<a href="./src/cloudflare/resources/pages/projects/domains.py">create</a>(project_name, \*, account_id, \*\*<a href="src/cloudflare/types/pages/projects/domain_create_params.py">params</a>) -> <a href="./src/cloudflare/types/pages/projects/domain_create_response.py">DomainCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/pages/projects/{project_name}/domains">client.pages.projects.domains.<a href="./src/cloudflare/resources/pages/projects/domains.py">list</a>(project_name, \*, account_id) -> <a href="./src/cloudflare/types/pages/projects/domain_list_response.py">SyncSinglePage[DomainListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}">client.pages.projects.domains.<a href="./src/cloudflare/resources/pages/projects/domains.py">delete</a>(domain_name, \*, account_id, project_name) -> object</code>
+- <code title="patch /accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}">client.pages.projects.domains.<a href="./src/cloudflare/resources/pages/projects/domains.py">edit</a>(domain_name, \*, account_id, project_name) -> <a href="./src/cloudflare/types/pages/projects/domain_edit_response.py">DomainEditResponse</a></code>
+- <code title="get /accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}">client.pages.projects.domains.<a href="./src/cloudflare/resources/pages/projects/domains.py">get</a>(domain_name, \*, account_id, project_name) -> <a href="./src/cloudflare/types/pages/projects/domain_get_response.py">DomainGetResponse</a></code>
 
-## LiveInputs
+# Registrar
+
+## Domains
 
 Types:
 
 ```python
-from cloudflare.types.stream import LiveInput, LiveInputListResponse
+from cloudflare.types.registrar import Domain
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/stream/live_inputs">client.stream.live_inputs.<a href="./src/cloudflare/resources/stream/live_inputs/live_inputs.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/live_input_create_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/live_input.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/stream/live_inputs/{live_input_identifier}">client.stream.live_inputs.<a href="./src/cloudflare/resources/stream/live_inputs/live_inputs.py">update</a>(live_input_identifier, \*, account_id, \*\*<a href="src/cloudflare/types/stream/live_input_update_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/live_input.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/stream/live_inputs">client.stream.live_inputs.<a href="./src/cloudflare/resources/stream/live_inputs/live_inputs.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/live_input_list_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/live_input_list_response.py">Optional</a></code>
-- <code title="delete /accounts/{account_id}/stream/live_inputs/{live_input_identifier}">client.stream.live_inputs.<a href="./src/cloudflare/resources/stream/live_inputs/live_inputs.py">delete</a>(live_input_identifier, \*, account_id) -> None</code>
-- <code title="get /accounts/{account_id}/stream/live_inputs/{live_input_identifier}">client.stream.live_inputs.<a href="./src/cloudflare/resources/stream/live_inputs/live_inputs.py">get</a>(live_input_identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/live_input.py">Optional</a></code>
+- <code title="put /accounts/{account_id}/registrar/domains/{domain_name}">client.registrar.domains.<a href="./src/cloudflare/resources/registrar/domains.py">update</a>(domain_name, \*, account_id, \*\*<a href="src/cloudflare/types/registrar/domain_update_params.py">params</a>) -> object</code>
+- <code title="get /accounts/{account_id}/registrar/domains">client.registrar.domains.<a href="./src/cloudflare/resources/registrar/domains.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/registrar/domain.py">SyncSinglePage[Domain]</a></code>
+- <code title="get /accounts/{account_id}/registrar/domains/{domain_name}">client.registrar.domains.<a href="./src/cloudflare/resources/registrar/domains.py">get</a>(domain_name, \*, account_id) -> object</code>
 
-### Outputs
+# RequestTracers
+
+## Traces
 
 Types:
 
 ```python
-from cloudflare.types.stream.live_inputs import Output
+from cloudflare.types.request_tracers import Trace, TraceItem, TraceCreateResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/stream/live_inputs/{live_input_identifier}/outputs">client.stream.live_inputs.outputs.<a href="./src/cloudflare/resources/stream/live_inputs/outputs.py">create</a>(live_input_identifier, \*, account_id, \*\*<a href="src/cloudflare/types/stream/live_inputs/output_create_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/live_inputs/output.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/stream/live_inputs/{live_input_identifier}/outputs/{output_identifier}">client.stream.live_inputs.outputs.<a href="./src/cloudflare/resources/stream/live_inputs/outputs.py">update</a>(output_identifier, \*, account_id, live_input_identifier, \*\*<a href="src/cloudflare/types/stream/live_inputs/output_update_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/live_inputs/output.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/stream/live_inputs/{live_input_identifier}/outputs">client.stream.live_inputs.outputs.<a href="./src/cloudflare/resources/stream/live_inputs/outputs.py">list</a>(live_input_identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/live_inputs/output.py">SyncSinglePage[Output]</a></code>
-- <code title="delete /accounts/{account_id}/stream/live_inputs/{live_input_identifier}/outputs/{output_identifier}">client.stream.live_inputs.outputs.<a href="./src/cloudflare/resources/stream/live_inputs/outputs.py">delete</a>(output_identifier, \*, account_id, live_input_identifier) -> None</code>
+- <code title="post /accounts/{account_id}/request-tracer/trace">client.request_tracers.traces.<a href="./src/cloudflare/resources/request_tracers/traces.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/request_tracers/trace_create_params.py">params</a>) -> <a href="./src/cloudflare/types/request_tracers/trace_create_response.py">Optional[TraceCreateResponse]</a></code>
 
-## Watermarks
+# Rules
+
+## Lists
 
 Types:
 
 ```python
-from cloudflare.types.stream import Watermark, WatermarkDeleteResponse
+from cloudflare.types.rules import (
+    Hostname,
+    ListsList,
+    Redirect,
+    ListCreateResponse,
+    ListUpdateResponse,
+    ListDeleteResponse,
+    ListGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/stream/watermarks">client.stream.watermarks.<a href="./src/cloudflare/resources/stream/watermarks.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/watermark_create_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/watermark.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/stream/watermarks">client.stream.watermarks.<a href="./src/cloudflare/resources/stream/watermarks.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/stream/watermark.py">SyncSinglePage[Watermark]</a></code>
-- <code title="delete /accounts/{account_id}/stream/watermarks/{identifier}">client.stream.watermarks.<a href="./src/cloudflare/resources/stream/watermarks.py">delete</a>(identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/watermark_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/stream/watermarks/{identifier}">client.stream.watermarks.<a href="./src/cloudflare/resources/stream/watermarks.py">get</a>(identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/watermark.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/rules/lists">client.rules.lists.<a href="./src/cloudflare/resources/rules/lists/lists.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/rules/list_create_params.py">params</a>) -> <a href="./src/cloudflare/types/rules/list_create_response.py">ListCreateResponse</a></code>
+- <code title="put /accounts/{account_id}/rules/lists/{list_id}">client.rules.lists.<a href="./src/cloudflare/resources/rules/lists/lists.py">update</a>(list_id, \*, account_id, \*\*<a href="src/cloudflare/types/rules/list_update_params.py">params</a>) -> <a href="./src/cloudflare/types/rules/list_update_response.py">ListUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/rules/lists">client.rules.lists.<a href="./src/cloudflare/resources/rules/lists/lists.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/rules/lists_list.py">SyncSinglePage[ListsList]</a></code>
+- <code title="delete /accounts/{account_id}/rules/lists/{list_id}">client.rules.lists.<a href="./src/cloudflare/resources/rules/lists/lists.py">delete</a>(list_id, \*, account_id) -> <a href="./src/cloudflare/types/rules/list_delete_response.py">ListDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/rules/lists/{list_id}">client.rules.lists.<a href="./src/cloudflare/resources/rules/lists/lists.py">get</a>(list_id, \*, account_id) -> <a href="./src/cloudflare/types/rules/list_get_response.py">ListGetResponse</a></code>
 
-## Webhooks
+### BulkOperations
 
 Types:
 
 ```python
-from cloudflare.types.stream import WebhookUpdateResponse, WebhookDeleteResponse, WebhookGetResponse
+from cloudflare.types.rules.lists import BulkOperationGetResponse
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/stream/webhook">client.stream.webhooks.<a href="./src/cloudflare/resources/stream/webhooks.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/webhook_update_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/webhook_update_response.py">Optional</a></code>
-- <code title="delete /accounts/{account_id}/stream/webhook">client.stream.webhooks.<a href="./src/cloudflare/resources/stream/webhooks.py">delete</a>(\*, account_id) -> <a href="./src/cloudflare/types/stream/webhook_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/stream/webhook">client.stream.webhooks.<a href="./src/cloudflare/resources/stream/webhooks.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/stream/webhook_get_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/rules/lists/bulk_operations/{operation_id}">client.rules.lists.bulk_operations.<a href="./src/cloudflare/resources/rules/lists/bulk_operations.py">get</a>(operation_id, \*, account_id) -> <a href="./src/cloudflare/types/rules/lists/bulk_operation_get_response.py">BulkOperationGetResponse</a></code>
 
-## Captions
+### Items
 
 Types:
 
 ```python
-from cloudflare.types.stream import Caption, CaptionGetResponse
+from cloudflare.types.rules.lists import (
+    ListCursor,
+    ListItem,
+    ItemCreateResponse,
+    ItemUpdateResponse,
+    ItemListResponse,
+    ItemDeleteResponse,
+    ItemGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/stream/{identifier}/captions">client.stream.captions.<a href="./src/cloudflare/resources/stream/captions/captions.py">get</a>(identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/caption_get_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/rules/lists/{list_id}/items">client.rules.lists.items.<a href="./src/cloudflare/resources/rules/lists/items.py">create</a>(list_id, \*, account_id, \*\*<a href="src/cloudflare/types/rules/lists/item_create_params.py">params</a>) -> <a href="./src/cloudflare/types/rules/lists/item_create_response.py">ItemCreateResponse</a></code>
+- <code title="put /accounts/{account_id}/rules/lists/{list_id}/items">client.rules.lists.items.<a href="./src/cloudflare/resources/rules/lists/items.py">update</a>(list_id, \*, account_id, \*\*<a href="src/cloudflare/types/rules/lists/item_update_params.py">params</a>) -> <a href="./src/cloudflare/types/rules/lists/item_update_response.py">ItemUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/rules/lists/{list_id}/items">client.rules.lists.items.<a href="./src/cloudflare/resources/rules/lists/items.py">list</a>(list_id, \*, account_id, \*\*<a href="src/cloudflare/types/rules/lists/item_list_params.py">params</a>) -> <a href="./src/cloudflare/types/rules/lists/item_list_response.py">SyncCursorPaginationAfter[ItemListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/rules/lists/{list_id}/items">client.rules.lists.items.<a href="./src/cloudflare/resources/rules/lists/items.py">delete</a>(list_id, \*, account_id, \*\*<a href="src/cloudflare/types/rules/lists/item_delete_params.py">params</a>) -> <a href="./src/cloudflare/types/rules/lists/item_delete_response.py">ItemDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/rules/lists/{list_id}/items/{item_id}">client.rules.lists.items.<a href="./src/cloudflare/resources/rules/lists/items.py">get</a>(item_id, \*, account_id, list_id) -> <a href="./src/cloudflare/types/rules/lists/item_get_response.py">ItemGetResponse</a></code>
 
-### Language
+# Stream
 
 Types:
 
 ```python
-from cloudflare.types.stream.captions import LanguageDeleteResponse
+from cloudflare.types.stream import AllowedOrigins, Video
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/stream/{identifier}/captions/{language}/generate">client.stream.captions.language.<a href="./src/cloudflare/resources/stream/captions/language/language.py">create</a>(language, \*, account_id, identifier) -> <a href="./src/cloudflare/types/stream/caption.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/stream/{identifier}/captions/{language}">client.stream.captions.language.<a href="./src/cloudflare/resources/stream/captions/language/language.py">update</a>(language, \*, account_id, identifier, \*\*<a href="src/cloudflare/types/stream/captions/language_update_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/caption.py">Optional</a></code>
-- <code title="delete /accounts/{account_id}/stream/{identifier}/captions/{language}">client.stream.captions.language.<a href="./src/cloudflare/resources/stream/captions/language/language.py">delete</a>(language, \*, account_id, identifier) -> <a href="./src/cloudflare/types/stream/captions/language_delete_response.py">str</a></code>
-- <code title="get /accounts/{account_id}/stream/{identifier}/captions/{language}">client.stream.captions.language.<a href="./src/cloudflare/resources/stream/captions/language/language.py">get</a>(language, \*, account_id, identifier) -> <a href="./src/cloudflare/types/stream/caption.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/stream">client.stream.<a href="./src/cloudflare/resources/stream/stream.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/stream_create_params.py">params</a>) -> None</code>
+- <code title="get /accounts/{account_id}/stream">client.stream.<a href="./src/cloudflare/resources/stream/stream.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/stream_list_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/video.py">SyncSinglePage[Video]</a></code>
+- <code title="delete /accounts/{account_id}/stream/{identifier}">client.stream.<a href="./src/cloudflare/resources/stream/stream.py">delete</a>(identifier, \*, account_id) -> None</code>
+- <code title="post /accounts/{account_id}/stream/{identifier}">client.stream.<a href="./src/cloudflare/resources/stream/stream.py">edit</a>(identifier, \*, account_id, \*\*<a href="src/cloudflare/types/stream/stream_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/video.py">Optional[Video]</a></code>
+- <code title="get /accounts/{account_id}/stream/{identifier}">client.stream.<a href="./src/cloudflare/resources/stream/stream.py">get</a>(identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/video.py">Optional[Video]</a></code>
 
-#### Vtt
+## AudioTracks
 
 Types:
 
 ```python
-from cloudflare.types.stream.captions.language import VttGetResponse
+from cloudflare.types.stream import Audio, AudioTrackDeleteResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/stream/{identifier}/captions/{language}/vtt">client.stream.captions.language.vtt.<a href="./src/cloudflare/resources/stream/captions/language/vtt.py">get</a>(language, \*, account_id, identifier) -> str</code>
+- <code title="delete /accounts/{account_id}/stream/{identifier}/audio/{audio_identifier}">client.stream.audio_tracks.<a href="./src/cloudflare/resources/stream/audio_tracks.py">delete</a>(audio_identifier, \*, account_id, identifier) -> <a href="./src/cloudflare/types/stream/audio_track_delete_response.py">str</a></code>
+- <code title="post /accounts/{account_id}/stream/{identifier}/audio/copy">client.stream.audio_tracks.<a href="./src/cloudflare/resources/stream/audio_tracks.py">copy</a>(identifier, \*, account_id, \*\*<a href="src/cloudflare/types/stream/audio_track_copy_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/audio.py">Optional[Audio]</a></code>
+- <code title="patch /accounts/{account_id}/stream/{identifier}/audio/{audio_identifier}">client.stream.audio_tracks.<a href="./src/cloudflare/resources/stream/audio_tracks.py">edit</a>(audio_identifier, \*, account_id, identifier, \*\*<a href="src/cloudflare/types/stream/audio_track_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/audio.py">Optional[Audio]</a></code>
+- <code title="get /accounts/{account_id}/stream/{identifier}/audio">client.stream.audio_tracks.<a href="./src/cloudflare/resources/stream/audio_tracks.py">get</a>(identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/audio.py">SyncSinglePage[Audio]</a></code>
+
+## Videos
+
+Types:
+
+```python
+from cloudflare.types.stream import VideoStorageUsageResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/stream/storage-usage">client.stream.videos.<a href="./src/cloudflare/resources/stream/videos.py">storage_usage</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/video_storage_usage_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/video_storage_usage_response.py">Optional[VideoStorageUsageResponse]</a></code>
+
+## Clip
+
+Types:
+
+```python
+from cloudflare.types.stream import Clip
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/stream/clip">client.stream.clip.<a href="./src/cloudflare/resources/stream/clip.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/clip_create_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/clip.py">Optional[Clip]</a></code>
+
+## Copy
+
+Methods:
+
+- <code title="post /accounts/{account_id}/stream/copy">client.stream.copy.<a href="./src/cloudflare/resources/stream/copy.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/copy_create_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/video.py">Optional[Video]</a></code>
+
+## DirectUpload
+
+Types:
+
+```python
+from cloudflare.types.stream import DirectUploadCreateResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/stream/direct_upload">client.stream.direct_upload.<a href="./src/cloudflare/resources/stream/direct_upload.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/direct_upload_create_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/direct_upload_create_response.py">Optional[DirectUploadCreateResponse]</a></code>
+
+## Keys
+
+Types:
+
+```python
+from cloudflare.types.stream import Keys, KeyDeleteResponse, KeyGetResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/stream/keys">client.stream.keys.<a href="./src/cloudflare/resources/stream/keys.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/key_create_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/keys.py">Optional[Keys]</a></code>
+- <code title="delete /accounts/{account_id}/stream/keys/{identifier}">client.stream.keys.<a href="./src/cloudflare/resources/stream/keys.py">delete</a>(identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/key_delete_response.py">str</a></code>
+- <code title="get /accounts/{account_id}/stream/keys">client.stream.keys.<a href="./src/cloudflare/resources/stream/keys.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/stream/key_get_response.py">SyncSinglePage[KeyGetResponse]</a></code>
+
+## LiveInputs
+
+Types:
+
+```python
+from cloudflare.types.stream import LiveInput, LiveInputListResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/stream/live_inputs">client.stream.live_inputs.<a href="./src/cloudflare/resources/stream/live_inputs/live_inputs.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/live_input_create_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/live_input.py">Optional[LiveInput]</a></code>
+- <code title="put /accounts/{account_id}/stream/live_inputs/{live_input_identifier}">client.stream.live_inputs.<a href="./src/cloudflare/resources/stream/live_inputs/live_inputs.py">update</a>(live_input_identifier, \*, account_id, \*\*<a href="src/cloudflare/types/stream/live_input_update_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/live_input.py">Optional[LiveInput]</a></code>
+- <code title="get /accounts/{account_id}/stream/live_inputs">client.stream.live_inputs.<a href="./src/cloudflare/resources/stream/live_inputs/live_inputs.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/live_input_list_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/live_input_list_response.py">Optional[LiveInputListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/stream/live_inputs/{live_input_identifier}">client.stream.live_inputs.<a href="./src/cloudflare/resources/stream/live_inputs/live_inputs.py">delete</a>(live_input_identifier, \*, account_id) -> None</code>
+- <code title="get /accounts/{account_id}/stream/live_inputs/{live_input_identifier}">client.stream.live_inputs.<a href="./src/cloudflare/resources/stream/live_inputs/live_inputs.py">get</a>(live_input_identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/live_input.py">Optional[LiveInput]</a></code>
+
+### Outputs
+
+Types:
+
+```python
+from cloudflare.types.stream.live_inputs import Output
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/stream/live_inputs/{live_input_identifier}/outputs">client.stream.live_inputs.outputs.<a href="./src/cloudflare/resources/stream/live_inputs/outputs.py">create</a>(live_input_identifier, \*, account_id, \*\*<a href="src/cloudflare/types/stream/live_inputs/output_create_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/live_inputs/output.py">Optional[Output]</a></code>
+- <code title="put /accounts/{account_id}/stream/live_inputs/{live_input_identifier}/outputs/{output_identifier}">client.stream.live_inputs.outputs.<a href="./src/cloudflare/resources/stream/live_inputs/outputs.py">update</a>(output_identifier, \*, account_id, live_input_identifier, \*\*<a href="src/cloudflare/types/stream/live_inputs/output_update_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/live_inputs/output.py">Optional[Output]</a></code>
+- <code title="get /accounts/{account_id}/stream/live_inputs/{live_input_identifier}/outputs">client.stream.live_inputs.outputs.<a href="./src/cloudflare/resources/stream/live_inputs/outputs.py">list</a>(live_input_identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/live_inputs/output.py">SyncSinglePage[Output]</a></code>
+- <code title="delete /accounts/{account_id}/stream/live_inputs/{live_input_identifier}/outputs/{output_identifier}">client.stream.live_inputs.outputs.<a href="./src/cloudflare/resources/stream/live_inputs/outputs.py">delete</a>(output_identifier, \*, account_id, live_input_identifier) -> None</code>
+
+## Watermarks
+
+Types:
+
+```python
+from cloudflare.types.stream import Watermark, WatermarkDeleteResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/stream/watermarks">client.stream.watermarks.<a href="./src/cloudflare/resources/stream/watermarks.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/watermark_create_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/watermark.py">Optional[Watermark]</a></code>
+- <code title="get /accounts/{account_id}/stream/watermarks">client.stream.watermarks.<a href="./src/cloudflare/resources/stream/watermarks.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/stream/watermark.py">SyncSinglePage[Watermark]</a></code>
+- <code title="delete /accounts/{account_id}/stream/watermarks/{identifier}">client.stream.watermarks.<a href="./src/cloudflare/resources/stream/watermarks.py">delete</a>(identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/watermark_delete_response.py">str</a></code>
+- <code title="get /accounts/{account_id}/stream/watermarks/{identifier}">client.stream.watermarks.<a href="./src/cloudflare/resources/stream/watermarks.py">get</a>(identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/watermark.py">Optional[Watermark]</a></code>
+
+## Webhooks
+
+Types:
+
+```python
+from cloudflare.types.stream import WebhookDeleteResponse
+```
+
+Methods:
+
+- <code title="put /accounts/{account_id}/stream/webhook">client.stream.webhooks.<a href="./src/cloudflare/resources/stream/webhooks.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/stream/webhook_update_params.py">params</a>) -> object</code>
+- <code title="delete /accounts/{account_id}/stream/webhook">client.stream.webhooks.<a href="./src/cloudflare/resources/stream/webhooks.py">delete</a>(\*, account_id) -> <a href="./src/cloudflare/types/stream/webhook_delete_response.py">str</a></code>
+- <code title="get /accounts/{account_id}/stream/webhook">client.stream.webhooks.<a href="./src/cloudflare/resources/stream/webhooks.py">get</a>(\*, account_id) -> object</code>
+
+## Captions
+
+Types:
+
+```python
+from cloudflare.types.stream import Caption
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/stream/{identifier}/captions">client.stream.captions.<a href="./src/cloudflare/resources/stream/captions/captions.py">get</a>(identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/caption.py">SyncSinglePage[Caption]</a></code>
+
+### Language
+
+Types:
+
+```python
+from cloudflare.types.stream.captions import LanguageDeleteResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/stream/{identifier}/captions/{language}/generate">client.stream.captions.language.<a href="./src/cloudflare/resources/stream/captions/language/language.py">create</a>(language, \*, account_id, identifier) -> <a href="./src/cloudflare/types/stream/caption.py">Optional[Caption]</a></code>
+- <code title="put /accounts/{account_id}/stream/{identifier}/captions/{language}">client.stream.captions.language.<a href="./src/cloudflare/resources/stream/captions/language/language.py">update</a>(language, \*, account_id, identifier, \*\*<a href="src/cloudflare/types/stream/captions/language_update_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/caption.py">Optional[Caption]</a></code>
+- <code title="delete /accounts/{account_id}/stream/{identifier}/captions/{language}">client.stream.captions.language.<a href="./src/cloudflare/resources/stream/captions/language/language.py">delete</a>(language, \*, account_id, identifier) -> <a href="./src/cloudflare/types/stream/captions/language_delete_response.py">str</a></code>
+- <code title="get /accounts/{account_id}/stream/{identifier}/captions/{language}">client.stream.captions.language.<a href="./src/cloudflare/resources/stream/captions/language/language.py">get</a>(language, \*, account_id, identifier) -> <a href="./src/cloudflare/types/stream/caption.py">Optional[Caption]</a></code>
+
+#### Vtt
+
+Types:
+
+```python
+from cloudflare.types.stream.captions.language import VttGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/stream/{identifier}/captions/{language}/vtt">client.stream.captions.language.vtt.<a href="./src/cloudflare/resources/stream/captions/language/vtt.py">get</a>(language, \*, account_id, identifier) -> str</code>
 
 ## Downloads
 
@@ -4073,9 +4888,9 @@ from cloudflare.types.stream import (
 
 Methods:
 
-- <code title="post /accounts/{account_id}/stream/{identifier}/downloads">client.stream.downloads.<a href="./src/cloudflare/resources/stream/downloads.py">create</a>(identifier, \*, account_id, \*\*<a href="src/cloudflare/types/stream/download_create_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/download_create_response.py">Optional</a></code>
-- <code title="delete /accounts/{account_id}/stream/{identifier}/downloads">client.stream.downloads.<a href="./src/cloudflare/resources/stream/downloads.py">delete</a>(identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/download_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/stream/{identifier}/downloads">client.stream.downloads.<a href="./src/cloudflare/resources/stream/downloads.py">get</a>(identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/download_get_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/stream/{identifier}/downloads">client.stream.downloads.<a href="./src/cloudflare/resources/stream/downloads.py">create</a>(identifier, \*, account_id, \*\*<a href="src/cloudflare/types/stream/download_create_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/download_create_response.py">Optional[DownloadCreateResponse]</a></code>
+- <code title="delete /accounts/{account_id}/stream/{identifier}/downloads">client.stream.downloads.<a href="./src/cloudflare/resources/stream/downloads.py">delete</a>(identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/download_delete_response.py">str</a></code>
+- <code title="get /accounts/{account_id}/stream/{identifier}/downloads">client.stream.downloads.<a href="./src/cloudflare/resources/stream/downloads.py">get</a>(identifier, \*, account_id) -> <a href="./src/cloudflare/types/stream/download_get_response.py">Optional[DownloadGetResponse]</a></code>
 
 ## Embed
 
@@ -4099,7 +4914,7 @@ from cloudflare.types.stream import TokenCreateResponse
 
 Methods:
 
-- <code title="post /accounts/{account_id}/stream/{identifier}/token">client.stream.token.<a href="./src/cloudflare/resources/stream/token.py">create</a>(identifier, \*, account_id, \*\*<a href="src/cloudflare/types/stream/token_create_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/token_create_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/stream/{identifier}/token">client.stream.token.<a href="./src/cloudflare/resources/stream/token.py">create</a>(identifier, \*, account_id, \*\*<a href="src/cloudflare/types/stream/token_create_params.py">params</a>) -> <a href="./src/cloudflare/types/stream/token_create_response.py">Optional[TokenCreateResponse]</a></code>
 
 # Alerting
 
@@ -4113,7 +4928,7 @@ from cloudflare.types.alerting import AvailableAlertListResponse
 
 Methods:
 
-- <code title="get /accounts/{account_id}/alerting/v3/available_alerts">client.alerting.available_alerts.<a href="./src/cloudflare/resources/alerting/available_alerts.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/alerting/available_alert_list_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/alerting/v3/available_alerts">client.alerting.available_alerts.<a href="./src/cloudflare/resources/alerting/available_alerts.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/alerting/available_alert_list_response.py">Optional[AvailableAlertListResponse]</a></code>
 
 ## Destinations
 
@@ -4127,7 +4942,7 @@ from cloudflare.types.alerting.destinations import EligibleGetResponse
 
 Methods:
 
-- <code title="get /accounts/{account_id}/alerting/v3/destinations/eligible">client.alerting.destinations.eligible.<a href="./src/cloudflare/resources/alerting/destinations/eligible.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/alerting/destinations/eligible_get_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/alerting/v3/destinations/eligible">client.alerting.destinations.eligible.<a href="./src/cloudflare/resources/alerting/destinations/eligible.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/alerting/destinations/eligible_get_response.py">Optional[EligibleGetResponse]</a></code>
 
 ### Pagerduty
 
@@ -4138,17 +4953,16 @@ from cloudflare.types.alerting.destinations import (
     Pagerduty,
     PagerdutyCreateResponse,
     PagerdutyDeleteResponse,
-    PagerdutyGetResponse,
     PagerdutyLinkResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/alerting/v3/destinations/pagerduty/connect">client.alerting.destinations.pagerduty.<a href="./src/cloudflare/resources/alerting/destinations/pagerduty.py">create</a>(\*, account_id) -> <a href="./src/cloudflare/types/alerting/destinations/pagerduty_create_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/alerting/v3/destinations/pagerduty/connect">client.alerting.destinations.pagerduty.<a href="./src/cloudflare/resources/alerting/destinations/pagerduty.py">create</a>(\*, account_id) -> <a href="./src/cloudflare/types/alerting/destinations/pagerduty_create_response.py">Optional[PagerdutyCreateResponse]</a></code>
 - <code title="delete /accounts/{account_id}/alerting/v3/destinations/pagerduty">client.alerting.destinations.pagerduty.<a href="./src/cloudflare/resources/alerting/destinations/pagerduty.py">delete</a>(\*, account_id) -> <a href="./src/cloudflare/types/alerting/destinations/pagerduty_delete_response.py">PagerdutyDeleteResponse</a></code>
-- <code title="get /accounts/{account_id}/alerting/v3/destinations/pagerduty">client.alerting.destinations.pagerduty.<a href="./src/cloudflare/resources/alerting/destinations/pagerduty.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/alerting/destinations/pagerduty_get_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/alerting/v3/destinations/pagerduty/connect/{token_id}">client.alerting.destinations.pagerduty.<a href="./src/cloudflare/resources/alerting/destinations/pagerduty.py">link</a>(token_id, \*, account_id) -> <a href="./src/cloudflare/types/alerting/destinations/pagerduty_link_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/alerting/v3/destinations/pagerduty">client.alerting.destinations.pagerduty.<a href="./src/cloudflare/resources/alerting/destinations/pagerduty.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/alerting/destinations/pagerduty.py">SyncSinglePage[Pagerduty]</a></code>
+- <code title="get /accounts/{account_id}/alerting/v3/destinations/pagerduty/connect/{token_id}">client.alerting.destinations.pagerduty.<a href="./src/cloudflare/resources/alerting/destinations/pagerduty.py">link</a>(token_id, \*, account_id) -> <a href="./src/cloudflare/types/alerting/destinations/pagerduty_link_response.py">Optional[PagerdutyLinkResponse]</a></code>
 
 ### Webhooks
 
@@ -4165,11 +4979,11 @@ from cloudflare.types.alerting.destinations import (
 
 Methods:
 
-- <code title="post /accounts/{account_id}/alerting/v3/destinations/webhooks">client.alerting.destinations.webhooks.<a href="./src/cloudflare/resources/alerting/destinations/webhooks.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/alerting/destinations/webhook_create_params.py">params</a>) -> <a href="./src/cloudflare/types/alerting/destinations/webhook_create_response.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/alerting/v3/destinations/webhooks/{webhook_id}">client.alerting.destinations.webhooks.<a href="./src/cloudflare/resources/alerting/destinations/webhooks.py">update</a>(webhook_id, \*, account_id, \*\*<a href="src/cloudflare/types/alerting/destinations/webhook_update_params.py">params</a>) -> <a href="./src/cloudflare/types/alerting/destinations/webhook_update_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/alerting/v3/destinations/webhooks">client.alerting.destinations.webhooks.<a href="./src/cloudflare/resources/alerting/destinations/webhooks.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/alerting/destinations/webhook_create_params.py">params</a>) -> <a href="./src/cloudflare/types/alerting/destinations/webhook_create_response.py">Optional[WebhookCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/alerting/v3/destinations/webhooks/{webhook_id}">client.alerting.destinations.webhooks.<a href="./src/cloudflare/resources/alerting/destinations/webhooks.py">update</a>(webhook_id, \*, account_id, \*\*<a href="src/cloudflare/types/alerting/destinations/webhook_update_params.py">params</a>) -> <a href="./src/cloudflare/types/alerting/destinations/webhook_update_response.py">Optional[WebhookUpdateResponse]</a></code>
 - <code title="get /accounts/{account_id}/alerting/v3/destinations/webhooks">client.alerting.destinations.webhooks.<a href="./src/cloudflare/resources/alerting/destinations/webhooks.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/alerting/destinations/webhooks.py">SyncSinglePage[Webhooks]</a></code>
 - <code title="delete /accounts/{account_id}/alerting/v3/destinations/webhooks/{webhook_id}">client.alerting.destinations.webhooks.<a href="./src/cloudflare/resources/alerting/destinations/webhooks.py">delete</a>(webhook_id, \*, account_id) -> <a href="./src/cloudflare/types/alerting/destinations/webhook_delete_response.py">WebhookDeleteResponse</a></code>
-- <code title="get /accounts/{account_id}/alerting/v3/destinations/webhooks/{webhook_id}">client.alerting.destinations.webhooks.<a href="./src/cloudflare/resources/alerting/destinations/webhooks.py">get</a>(webhook_id, \*, account_id) -> <a href="./src/cloudflare/types/alerting/destinations/webhooks.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/alerting/v3/destinations/webhooks/{webhook_id}">client.alerting.destinations.webhooks.<a href="./src/cloudflare/resources/alerting/destinations/webhooks.py">get</a>(webhook_id, \*, account_id) -> <a href="./src/cloudflare/types/alerting/destinations/webhooks.py">Optional[Webhooks]</a></code>
 
 ## History
 
@@ -4200,11 +5014,33 @@ from cloudflare.types.alerting import (
 
 Methods:
 
-- <code title="post /accounts/{account_id}/alerting/v3/policies">client.alerting.policies.<a href="./src/cloudflare/resources/alerting/policies.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/alerting/policy_create_params.py">params</a>) -> <a href="./src/cloudflare/types/alerting/policy_create_response.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/alerting/v3/policies/{policy_id}">client.alerting.policies.<a href="./src/cloudflare/resources/alerting/policies.py">update</a>(policy_id, \*, account_id, \*\*<a href="src/cloudflare/types/alerting/policy_update_params.py">params</a>) -> <a href="./src/cloudflare/types/alerting/policy_update_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/alerting/v3/policies">client.alerting.policies.<a href="./src/cloudflare/resources/alerting/policies.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/alerting/policy_create_params.py">params</a>) -> <a href="./src/cloudflare/types/alerting/policy_create_response.py">Optional[PolicyCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/alerting/v3/policies/{policy_id}">client.alerting.policies.<a href="./src/cloudflare/resources/alerting/policies.py">update</a>(policy_id, \*, account_id, \*\*<a href="src/cloudflare/types/alerting/policy_update_params.py">params</a>) -> <a href="./src/cloudflare/types/alerting/policy_update_response.py">Optional[PolicyUpdateResponse]</a></code>
 - <code title="get /accounts/{account_id}/alerting/v3/policies">client.alerting.policies.<a href="./src/cloudflare/resources/alerting/policies.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/alerting/policy.py">SyncSinglePage[Policy]</a></code>
 - <code title="delete /accounts/{account_id}/alerting/v3/policies/{policy_id}">client.alerting.policies.<a href="./src/cloudflare/resources/alerting/policies.py">delete</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/alerting/policy_delete_response.py">PolicyDeleteResponse</a></code>
-- <code title="get /accounts/{account_id}/alerting/v3/policies/{policy_id}">client.alerting.policies.<a href="./src/cloudflare/resources/alerting/policies.py">get</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/alerting/policy.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/alerting/v3/policies/{policy_id}">client.alerting.policies.<a href="./src/cloudflare/resources/alerting/policies.py">get</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/alerting/policy.py">Optional[Policy]</a></code>
+
+## Silences
+
+Types:
+
+```python
+from cloudflare.types.alerting import (
+    SilenceCreateResponse,
+    SilenceUpdateResponse,
+    SilenceListResponse,
+    SilenceDeleteResponse,
+    SilenceGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/alerting/v3/silences">client.alerting.silences.<a href="./src/cloudflare/resources/alerting/silences.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/alerting/silence_create_params.py">params</a>) -> <a href="./src/cloudflare/types/alerting/silence_create_response.py">SilenceCreateResponse</a></code>
+- <code title="put /accounts/{account_id}/alerting/v3/silences">client.alerting.silences.<a href="./src/cloudflare/resources/alerting/silences.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/alerting/silence_update_params.py">params</a>) -> <a href="./src/cloudflare/types/alerting/silence_update_response.py">SyncSinglePage[SilenceUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/alerting/v3/silences">client.alerting.silences.<a href="./src/cloudflare/resources/alerting/silences.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/alerting/silence_list_response.py">SyncSinglePage[SilenceListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/alerting/v3/silences/{silence_id}">client.alerting.silences.<a href="./src/cloudflare/resources/alerting/silences.py">delete</a>(silence_id, \*, account_id) -> <a href="./src/cloudflare/types/alerting/silence_delete_response.py">SilenceDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/alerting/v3/silences/{silence_id}">client.alerting.silences.<a href="./src/cloudflare/resources/alerting/silences.py">get</a>(silence_id, \*, account_id) -> <a href="./src/cloudflare/types/alerting/silence_get_response.py">Optional[SilenceGetResponse]</a></code>
 
 # D1
 
@@ -4221,3131 +5057,6055 @@ Types:
 ```python
 from cloudflare.types.d1 import (
     QueryResult,
-    DatabaseCreateResponse,
     DatabaseListResponse,
-    DatabaseDeleteResponse,
-    DatabaseQueryResponse,
+    DatabaseExportResponse,
+    DatabaseImportResponse,
     DatabaseRawResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/d1/database">client.d1.database.<a href="./src/cloudflare/resources/d1/database.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/d1/database_create_params.py">params</a>) -> <a href="./src/cloudflare/types/d1/database_create_response.py">DatabaseCreateResponse</a></code>
-- <code title="get /accounts/{account_id}/d1/database">client.d1.database.<a href="./src/cloudflare/resources/d1/database.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/d1/database_list_params.py">params</a>) -> <a href="./src/cloudflare/types/d1/database_list_response.py">SyncV4PagePaginationArray[DatabaseListResponse]</a></code>
-- <code title="delete /accounts/{account_id}/d1/database/{database_id}">client.d1.database.<a href="./src/cloudflare/resources/d1/database.py">delete</a>(database_id, \*, account_id) -> <a href="./src/cloudflare/types/d1/database_delete_response.py">DatabaseDeleteResponse</a></code>
-- <code title="get /accounts/{account_id}/d1/database/{database_id}">client.d1.database.<a href="./src/cloudflare/resources/d1/database.py">get</a>(database_id, \*, account_id) -> <a href="./src/cloudflare/types/d1/d1.py">D1</a></code>
-- <code title="post /accounts/{account_id}/d1/database/{database_id}/query">client.d1.database.<a href="./src/cloudflare/resources/d1/database.py">query</a>(database_id, \*, account_id, \*\*<a href="src/cloudflare/types/d1/database_query_params.py">params</a>) -> <a href="./src/cloudflare/types/d1/database_query_response.py">DatabaseQueryResponse</a></code>
-- <code title="post /accounts/{account_id}/d1/database/{database_id}/raw">client.d1.database.<a href="./src/cloudflare/resources/d1/database.py">raw</a>(database_id, \*, account_id, \*\*<a href="src/cloudflare/types/d1/database_raw_params.py">params</a>) -> <a href="./src/cloudflare/types/d1/database_raw_response.py">DatabaseRawResponse</a></code>
-
-# R2
+- <code title="post /accounts/{account_id}/d1/database">client.d1.database.<a href="./src/cloudflare/resources/d1/database/database.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/d1/database_create_params.py">params</a>) -> <a href="./src/cloudflare/types/d1/d1.py">D1</a></code>
+- <code title="put /accounts/{account_id}/d1/database/{database_id}">client.d1.database.<a href="./src/cloudflare/resources/d1/database/database.py">update</a>(database_id, \*, account_id, \*\*<a href="src/cloudflare/types/d1/database_update_params.py">params</a>) -> <a href="./src/cloudflare/types/d1/d1.py">D1</a></code>
+- <code title="get /accounts/{account_id}/d1/database">client.d1.database.<a href="./src/cloudflare/resources/d1/database/database.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/d1/database_list_params.py">params</a>) -> <a href="./src/cloudflare/types/d1/database_list_response.py">SyncV4PagePaginationArray[DatabaseListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/d1/database/{database_id}">client.d1.database.<a href="./src/cloudflare/resources/d1/database/database.py">delete</a>(database_id, \*, account_id) -> object</code>
+- <code title="patch /accounts/{account_id}/d1/database/{database_id}">client.d1.database.<a href="./src/cloudflare/resources/d1/database/database.py">edit</a>(database_id, \*, account_id, \*\*<a href="src/cloudflare/types/d1/database_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/d1/d1.py">D1</a></code>
+- <code title="post /accounts/{account_id}/d1/database/{database_id}/export">client.d1.database.<a href="./src/cloudflare/resources/d1/database/database.py">export</a>(database_id, \*, account_id, \*\*<a href="src/cloudflare/types/d1/database_export_params.py">params</a>) -> <a href="./src/cloudflare/types/d1/database_export_response.py">DatabaseExportResponse</a></code>
+- <code title="get /accounts/{account_id}/d1/database/{database_id}">client.d1.database.<a href="./src/cloudflare/resources/d1/database/database.py">get</a>(database_id, \*, account_id) -> <a href="./src/cloudflare/types/d1/d1.py">D1</a></code>
+- <code title="post /accounts/{account_id}/d1/database/{database_id}/import">client.d1.database.<a href="./src/cloudflare/resources/d1/database/database.py">import\_</a>(database_id, \*, account_id, \*\*<a href="src/cloudflare/types/d1/database_import_params.py">params</a>) -> <a href="./src/cloudflare/types/d1/database_import_response.py">DatabaseImportResponse</a></code>
+- <code title="post /accounts/{account_id}/d1/database/{database_id}/query">client.d1.database.<a href="./src/cloudflare/resources/d1/database/database.py">query</a>(database_id, \*, account_id, \*\*<a href="src/cloudflare/types/d1/database_query_params.py">params</a>) -> <a href="./src/cloudflare/types/d1/query_result.py">SyncSinglePage[QueryResult]</a></code>
+- <code title="post /accounts/{account_id}/d1/database/{database_id}/raw">client.d1.database.<a href="./src/cloudflare/resources/d1/database/database.py">raw</a>(database_id, \*, account_id, \*\*<a href="src/cloudflare/types/d1/database_raw_params.py">params</a>) -> <a href="./src/cloudflare/types/d1/database_raw_response.py">SyncSinglePage[DatabaseRawResponse]</a></code>
 
-## Buckets
+### TimeTravel
 
 Types:
 
 ```python
-from cloudflare.types.r2 import Bucket, BucketDeleteResponse
+from cloudflare.types.d1.database import TimeTravelGetBookmarkResponse, TimeTravelRestoreResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/r2/buckets">client.r2.buckets.<a href="./src/cloudflare/resources/r2/buckets.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/r2/bucket_create_params.py">params</a>) -> <a href="./src/cloudflare/types/r2/bucket.py">Bucket</a></code>
-- <code title="get /accounts/{account_id}/r2/buckets">client.r2.buckets.<a href="./src/cloudflare/resources/r2/buckets.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/r2/bucket_list_params.py">params</a>) -> <a href="./src/cloudflare/types/r2/bucket.py">SyncCursorPagination[Bucket]</a></code>
-- <code title="delete /accounts/{account_id}/r2/buckets/{bucket_name}">client.r2.buckets.<a href="./src/cloudflare/resources/r2/buckets.py">delete</a>(bucket_name, \*, account_id) -> <a href="./src/cloudflare/types/r2/bucket_delete_response.py">object</a></code>
-- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}">client.r2.buckets.<a href="./src/cloudflare/resources/r2/buckets.py">get</a>(bucket_name, \*, account_id) -> <a href="./src/cloudflare/types/r2/bucket.py">Bucket</a></code>
+- <code title="get /accounts/{account_id}/d1/database/{database_id}/time_travel/bookmark">client.d1.database.time_travel.<a href="./src/cloudflare/resources/d1/database/time_travel.py">get_bookmark</a>(database_id, \*, account_id, \*\*<a href="src/cloudflare/types/d1/database/time_travel_get_bookmark_params.py">params</a>) -> <a href="./src/cloudflare/types/d1/database/time_travel_get_bookmark_response.py">TimeTravelGetBookmarkResponse</a></code>
+- <code title="post /accounts/{account_id}/d1/database/{database_id}/time_travel/restore">client.d1.database.time_travel.<a href="./src/cloudflare/resources/d1/database/time_travel.py">restore</a>(database_id, \*, account_id, \*\*<a href="src/cloudflare/types/d1/database/time_travel_restore_params.py">params</a>) -> <a href="./src/cloudflare/types/d1/database/time_travel_restore_response.py">TimeTravelRestoreResponse</a></code>
 
-## Sippy
+# R2
+
+## Buckets
 
 Types:
 
 ```python
-from cloudflare.types.r2 import Provider, Sippy, SippyDeleteResponse
+from cloudflare.types.r2 import Bucket, BucketListResponse
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/r2/buckets/{bucket_name}/sippy">client.r2.sippy.<a href="./src/cloudflare/resources/r2/sippy.py">update</a>(bucket_name, \*, account_id, \*\*<a href="src/cloudflare/types/r2/sippy_update_params.py">params</a>) -> <a href="./src/cloudflare/types/r2/sippy.py">Sippy</a></code>
-- <code title="delete /accounts/{account_id}/r2/buckets/{bucket_name}/sippy">client.r2.sippy.<a href="./src/cloudflare/resources/r2/sippy.py">delete</a>(bucket_name, \*, account_id) -> <a href="./src/cloudflare/types/r2/sippy_delete_response.py">SippyDeleteResponse</a></code>
-- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}/sippy">client.r2.sippy.<a href="./src/cloudflare/resources/r2/sippy.py">get</a>(bucket_name, \*, account_id) -> <a href="./src/cloudflare/types/r2/sippy.py">Sippy</a></code>
+- <code title="post /accounts/{account_id}/r2/buckets">client.r2.buckets.<a href="./src/cloudflare/resources/r2/buckets/buckets.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/r2/bucket_create_params.py">params</a>) -> <a href="./src/cloudflare/types/r2/bucket.py">Bucket</a></code>
+- <code title="get /accounts/{account_id}/r2/buckets">client.r2.buckets.<a href="./src/cloudflare/resources/r2/buckets/buckets.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/r2/bucket_list_params.py">params</a>) -> <a href="./src/cloudflare/types/r2/bucket_list_response.py">BucketListResponse</a></code>
+- <code title="delete /accounts/{account_id}/r2/buckets/{bucket_name}">client.r2.buckets.<a href="./src/cloudflare/resources/r2/buckets/buckets.py">delete</a>(bucket_name, \*, account_id) -> object</code>
+- <code title="patch /accounts/{account_id}/r2/buckets/{bucket_name}">client.r2.buckets.<a href="./src/cloudflare/resources/r2/buckets/buckets.py">edit</a>(bucket_name, \*, account_id) -> <a href="./src/cloudflare/types/r2/bucket.py">Bucket</a></code>
+- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}">client.r2.buckets.<a href="./src/cloudflare/resources/r2/buckets/buckets.py">get</a>(bucket_name, \*, account_id) -> <a href="./src/cloudflare/types/r2/bucket.py">Bucket</a></code>
 
-## TemporaryCredentials
+### Lifecycle
 
 Types:
 
 ```python
-from cloudflare.types.r2 import TemporaryCredential, TemporaryCredentialCreateResponse
+from cloudflare.types.r2.buckets import LifecycleGetResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/r2/temp-access-credentials">client.r2.temporary_credentials.<a href="./src/cloudflare/resources/r2/temporary_credentials.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/r2/temporary_credential_create_params.py">params</a>) -> <a href="./src/cloudflare/types/r2/temporary_credential_create_response.py">TemporaryCredentialCreateResponse</a></code>
+- <code title="put /accounts/{account_id}/r2/buckets/{bucket_name}/lifecycle">client.r2.buckets.lifecycle.<a href="./src/cloudflare/resources/r2/buckets/lifecycle.py">update</a>(bucket_name, \*, account_id, \*\*<a href="src/cloudflare/types/r2/buckets/lifecycle_update_params.py">params</a>) -> object</code>
+- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}/lifecycle">client.r2.buckets.lifecycle.<a href="./src/cloudflare/resources/r2/buckets/lifecycle.py">get</a>(bucket_name, \*, account_id) -> <a href="./src/cloudflare/types/r2/buckets/lifecycle_get_response.py">LifecycleGetResponse</a></code>
 
-# WARPConnector
+### CORS
 
 Types:
 
 ```python
-from cloudflare.types.warp_connector import (
-    WARPConnectorCreateResponse,
-    WARPConnectorListResponse,
-    WARPConnectorDeleteResponse,
-    WARPConnectorEditResponse,
-    WARPConnectorGetResponse,
-    WARPConnectorTokenResponse,
-)
+from cloudflare.types.r2.buckets import CORSGetResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/warp_connector">client.warp_connector.<a href="./src/cloudflare/resources/warp_connector.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/warp_connector/warp_connector_create_params.py">params</a>) -> <a href="./src/cloudflare/types/warp_connector/warp_connector_create_response.py">WARPConnectorCreateResponse</a></code>
-- <code title="get /accounts/{account_id}/warp_connector">client.warp_connector.<a href="./src/cloudflare/resources/warp_connector.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/warp_connector/warp_connector_list_params.py">params</a>) -> <a href="./src/cloudflare/types/warp_connector/warp_connector_list_response.py">SyncV4PagePaginationArray[WARPConnectorListResponse]</a></code>
-- <code title="delete /accounts/{account_id}/warp_connector/{tunnel_id}">client.warp_connector.<a href="./src/cloudflare/resources/warp_connector.py">delete</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/warp_connector/warp_connector_delete_response.py">WARPConnectorDeleteResponse</a></code>
-- <code title="patch /accounts/{account_id}/warp_connector/{tunnel_id}">client.warp_connector.<a href="./src/cloudflare/resources/warp_connector.py">edit</a>(tunnel_id, \*, account_id, \*\*<a href="src/cloudflare/types/warp_connector/warp_connector_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/warp_connector/warp_connector_edit_response.py">WARPConnectorEditResponse</a></code>
-- <code title="get /accounts/{account_id}/warp_connector/{tunnel_id}">client.warp_connector.<a href="./src/cloudflare/resources/warp_connector.py">get</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/warp_connector/warp_connector_get_response.py">WARPConnectorGetResponse</a></code>
-- <code title="get /accounts/{account_id}/warp_connector/{tunnel_id}/token">client.warp_connector.<a href="./src/cloudflare/resources/warp_connector.py">token</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/warp_connector/warp_connector_token_response.py">WARPConnectorTokenResponse</a></code>
+- <code title="put /accounts/{account_id}/r2/buckets/{bucket_name}/cors">client.r2.buckets.cors.<a href="./src/cloudflare/resources/r2/buckets/cors.py">update</a>(bucket_name, \*, account_id, \*\*<a href="src/cloudflare/types/r2/buckets/cors_update_params.py">params</a>) -> object</code>
+- <code title="delete /accounts/{account_id}/r2/buckets/{bucket_name}/cors">client.r2.buckets.cors.<a href="./src/cloudflare/resources/r2/buckets/cors.py">delete</a>(bucket_name, \*, account_id) -> object</code>
+- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}/cors">client.r2.buckets.cors.<a href="./src/cloudflare/resources/r2/buckets/cors.py">get</a>(bucket_name, \*, account_id) -> <a href="./src/cloudflare/types/r2/buckets/cors_get_response.py">CORSGetResponse</a></code>
 
-# WorkersForPlatforms
-
-## Dispatch
+### Domains
 
-### Namespaces
+#### Custom
 
 Types:
 
 ```python
-from cloudflare.types.workers_for_platforms.dispatch import (
-    NamespaceCreateResponse,
-    NamespaceListResponse,
-    NamespaceDeleteResponse,
-    NamespaceGetResponse,
+from cloudflare.types.r2.buckets.domains import (
+    CustomCreateResponse,
+    CustomUpdateResponse,
+    CustomListResponse,
+    CustomDeleteResponse,
+    CustomGetResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/workers/dispatch/namespaces">client.workers_for_platforms.dispatch.namespaces.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workers_for_platforms/dispatch/namespace_create_params.py">params</a>) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespace_create_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/workers/dispatch/namespaces">client.workers_for_platforms.dispatch.namespaces.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespace_list_response.py">SyncSinglePage[NamespaceListResponse]</a></code>
-- <code title="delete /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}">client.workers_for_platforms.dispatch.namespaces.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py">delete</a>(dispatch_namespace, \*, account_id) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespace_delete_response.py">object</a></code>
-- <code title="get /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}">client.workers_for_platforms.dispatch.namespaces.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py">get</a>(dispatch_namespace, \*, account_id) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespace_get_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom">client.r2.buckets.domains.custom.<a href="./src/cloudflare/resources/r2/buckets/domains/custom.py">create</a>(bucket_name, \*, account_id, \*\*<a href="src/cloudflare/types/r2/buckets/domains/custom_create_params.py">params</a>) -> <a href="./src/cloudflare/types/r2/buckets/domains/custom_create_response.py">CustomCreateResponse</a></code>
+- <code title="put /accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom/{domain}">client.r2.buckets.domains.custom.<a href="./src/cloudflare/resources/r2/buckets/domains/custom.py">update</a>(domain, \*, account_id, bucket_name, \*\*<a href="src/cloudflare/types/r2/buckets/domains/custom_update_params.py">params</a>) -> <a href="./src/cloudflare/types/r2/buckets/domains/custom_update_response.py">CustomUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom">client.r2.buckets.domains.custom.<a href="./src/cloudflare/resources/r2/buckets/domains/custom.py">list</a>(bucket_name, \*, account_id) -> <a href="./src/cloudflare/types/r2/buckets/domains/custom_list_response.py">CustomListResponse</a></code>
+- <code title="delete /accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom/{domain}">client.r2.buckets.domains.custom.<a href="./src/cloudflare/resources/r2/buckets/domains/custom.py">delete</a>(domain, \*, account_id, bucket_name) -> <a href="./src/cloudflare/types/r2/buckets/domains/custom_delete_response.py">CustomDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom/{domain}">client.r2.buckets.domains.custom.<a href="./src/cloudflare/resources/r2/buckets/domains/custom.py">get</a>(domain, \*, account_id, bucket_name) -> <a href="./src/cloudflare/types/r2/buckets/domains/custom_get_response.py">CustomGetResponse</a></code>
 
-#### Scripts
+#### Managed
 
 Types:
 
 ```python
-from cloudflare.types.workers_for_platforms.dispatch.namespaces import Script
+from cloudflare.types.r2.buckets.domains import ManagedUpdateResponse, ManagedListResponse
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}">client.workers_for_platforms.dispatch.namespaces.scripts.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/scripts.py">update</a>(script_name, \*, account_id, dispatch_namespace, \*\*<a href="src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/script.py">Optional</a></code>
-- <code title="delete /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}">client.workers_for_platforms.dispatch.namespaces.scripts.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/scripts.py">delete</a>(script_name, \*, account_id, dispatch_namespace, \*\*<a href="src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script_delete_params.py">params</a>) -> None</code>
-- <code title="get /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}">client.workers_for_platforms.dispatch.namespaces.scripts.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/scripts.py">get</a>(script_name, \*, account_id, dispatch_namespace) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script.py">Optional</a></code>
-
-##### Content
-
-Methods:
-
-- <code title="put /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/content">client.workers_for_platforms.dispatch.namespaces.scripts.content.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/content.py">update</a>(script_name, \*, account_id, dispatch_namespace, \*\*<a href="src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/content_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/script.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/content">client.workers_for_platforms.dispatch.namespaces.scripts.content.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/content.py">get</a>(script_name, \*, account_id, dispatch_namespace) -> BinaryAPIResponse</code>
+- <code title="put /accounts/{account_id}/r2/buckets/{bucket_name}/domains/managed">client.r2.buckets.domains.managed.<a href="./src/cloudflare/resources/r2/buckets/domains/managed.py">update</a>(bucket_name, \*, account_id, \*\*<a href="src/cloudflare/types/r2/buckets/domains/managed_update_params.py">params</a>) -> <a href="./src/cloudflare/types/r2/buckets/domains/managed_update_response.py">ManagedUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}/domains/managed">client.r2.buckets.domains.managed.<a href="./src/cloudflare/resources/r2/buckets/domains/managed.py">list</a>(bucket_name, \*, account_id) -> <a href="./src/cloudflare/types/r2/buckets/domains/managed_list_response.py">ManagedListResponse</a></code>
 
-##### Settings
+### EventNotifications
 
 Types:
 
 ```python
-from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts import (
-    SettingEditResponse,
-    SettingGetResponse,
-)
+from cloudflare.types.r2.buckets import EventNotificationListResponse, EventNotificationGetResponse
 ```
 
 Methods:
 
-- <code title="patch /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/settings">client.workers_for_platforms.dispatch.namespaces.scripts.settings.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/settings.py">edit</a>(script_name, \*, account_id, dispatch_namespace, \*\*<a href="src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/setting_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/setting_edit_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/settings">client.workers_for_platforms.dispatch.namespaces.scripts.settings.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/settings.py">get</a>(script_name, \*, account_id, dispatch_namespace) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/setting_get_response.py">Optional</a></code>
+- <code title="put /accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}">client.r2.buckets.event_notifications.<a href="./src/cloudflare/resources/r2/buckets/event_notifications.py">update</a>(queue_id, \*, account_id, bucket_name, \*\*<a href="src/cloudflare/types/r2/buckets/event_notification_update_params.py">params</a>) -> object</code>
+- <code title="get /accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration">client.r2.buckets.event_notifications.<a href="./src/cloudflare/resources/r2/buckets/event_notifications.py">list</a>(bucket_name, \*, account_id) -> <a href="./src/cloudflare/types/r2/buckets/event_notification_list_response.py">EventNotificationListResponse</a></code>
+- <code title="delete /accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}">client.r2.buckets.event_notifications.<a href="./src/cloudflare/resources/r2/buckets/event_notifications.py">delete</a>(queue_id, \*, account_id, bucket_name) -> object</code>
+- <code title="get /accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}">client.r2.buckets.event_notifications.<a href="./src/cloudflare/resources/r2/buckets/event_notifications.py">get</a>(queue_id, \*, account_id, bucket_name) -> <a href="./src/cloudflare/types/r2/buckets/event_notification_get_response.py">EventNotificationGetResponse</a></code>
 
-##### Bindings
+### Locks
 
 Types:
 
 ```python
-from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts import BindingGetResponse
+from cloudflare.types.r2.buckets import LockGetResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/bindings">client.workers_for_platforms.dispatch.namespaces.scripts.bindings.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/bindings.py">get</a>(script_name, \*, account_id, dispatch_namespace) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/binding_get_response.py">Optional</a></code>
+- <code title="put /accounts/{account_id}/r2/buckets/{bucket_name}/lock">client.r2.buckets.locks.<a href="./src/cloudflare/resources/r2/buckets/locks.py">update</a>(bucket_name, \*, account_id, \*\*<a href="src/cloudflare/types/r2/buckets/lock_update_params.py">params</a>) -> object</code>
+- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}/lock">client.r2.buckets.locks.<a href="./src/cloudflare/resources/r2/buckets/locks.py">get</a>(bucket_name, \*, account_id) -> <a href="./src/cloudflare/types/r2/buckets/lock_get_response.py">LockGetResponse</a></code>
 
-##### Secrets
+### Metrics
 
 Types:
 
 ```python
-from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts import (
-    SecretUpdateResponse,
-    SecretListResponse,
-)
+from cloudflare.types.r2.buckets import MetricListResponse
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets">client.workers_for_platforms.dispatch.namespaces.scripts.secrets.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/secrets.py">update</a>(script_name, \*, account_id, dispatch_namespace, \*\*<a href="src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_update_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets">client.workers_for_platforms.dispatch.namespaces.scripts.secrets.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/secrets.py">list</a>(script_name, \*, account_id, dispatch_namespace) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_list_response.py">SyncSinglePage[SecretListResponse]</a></code>
+- <code title="get /accounts/{account_id}/r2/metrics">client.r2.buckets.metrics.<a href="./src/cloudflare/resources/r2/buckets/metrics.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/r2/buckets/metric_list_response.py">MetricListResponse</a></code>
 
-##### Tags
+### Sippy
 
 Types:
 
 ```python
-from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts import (
-    TagUpdateResponse,
-    TagListResponse,
-    TagDeleteResponse,
-)
+from cloudflare.types.r2.buckets import Provider, Sippy, SippyDeleteResponse
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/tags">client.workers_for_platforms.dispatch.namespaces.scripts.tags.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/tags.py">update</a>(script_name, \*, account_id, dispatch_namespace, \*\*<a href="src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_update_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/tags">client.workers_for_platforms.dispatch.namespaces.scripts.tags.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/tags.py">list</a>(script_name, \*, account_id, dispatch_namespace) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_list_response.py">SyncSinglePage[TagListResponse]</a></code>
-- <code title="delete /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/tags/{tag}">client.workers_for_platforms.dispatch.namespaces.scripts.tags.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/tags.py">delete</a>(tag, \*, account_id, dispatch_namespace, script_name) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_delete_response.py">object</a></code>
-
-# ZeroTrust
+- <code title="put /accounts/{account_id}/r2/buckets/{bucket_name}/sippy">client.r2.buckets.sippy.<a href="./src/cloudflare/resources/r2/buckets/sippy.py">update</a>(bucket_name, \*, account_id, \*\*<a href="src/cloudflare/types/r2/buckets/sippy_update_params.py">params</a>) -> <a href="./src/cloudflare/types/r2/buckets/sippy.py">Sippy</a></code>
+- <code title="delete /accounts/{account_id}/r2/buckets/{bucket_name}/sippy">client.r2.buckets.sippy.<a href="./src/cloudflare/resources/r2/buckets/sippy.py">delete</a>(bucket_name, \*, account_id) -> <a href="./src/cloudflare/types/r2/buckets/sippy_delete_response.py">SippyDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}/sippy">client.r2.buckets.sippy.<a href="./src/cloudflare/resources/r2/buckets/sippy.py">get</a>(bucket_name, \*, account_id) -> <a href="./src/cloudflare/types/r2/buckets/sippy.py">Sippy</a></code>
 
-## Devices
+## TemporaryCredentials
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust import Device, DeviceGetResponse
+from cloudflare.types.r2 import TemporaryCredential, TemporaryCredentialCreateResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/devices">client.zero_trust.devices.<a href="./src/cloudflare/resources/zero_trust/devices/devices.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/device.py">SyncSinglePage[Device]</a></code>
-- <code title="get /accounts/{account_id}/devices/{device_id}">client.zero_trust.devices.<a href="./src/cloudflare/resources/zero_trust/devices/devices.py">get</a>(device_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/device_get_response.py">DeviceGetResponse</a></code>
+- <code title="post /accounts/{account_id}/r2/temp-access-credentials">client.r2.temporary_credentials.<a href="./src/cloudflare/resources/r2/temporary_credentials.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/r2/temporary_credential_create_params.py">params</a>) -> <a href="./src/cloudflare/types/r2/temporary_credential_create_response.py">TemporaryCredentialCreateResponse</a></code>
 
-### DEXTests
+## SuperSlurper
+
+### Jobs
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.devices import (
-    DEXTest,
-    SchemaData,
-    SchemaHTTP,
-    DEXTestDeleteResponse,
+from cloudflare.types.r2.super_slurper import (
+    JobCreateResponse,
+    JobListResponse,
+    JobAbortResponse,
+    JobAbortAllResponse,
+    JobGetResponse,
+    JobPauseResponse,
+    JobProgressResponse,
+    JobResumeResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/devices/dex_tests">client.zero_trust.devices.dex_tests.<a href="./src/cloudflare/resources/zero_trust/devices/dex_tests.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/dex_test_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/schema_http.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/devices/dex_tests/{dex_test_id}">client.zero_trust.devices.dex_tests.<a href="./src/cloudflare/resources/zero_trust/devices/dex_tests.py">update</a>(dex_test_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/dex_test_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/schema_http.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/devices/dex_tests">client.zero_trust.devices.dex_tests.<a href="./src/cloudflare/resources/zero_trust/devices/dex_tests.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/schema_http.py">SyncSinglePage[SchemaHTTP]</a></code>
-- <code title="delete /accounts/{account_id}/devices/dex_tests/{dex_test_id}">client.zero_trust.devices.dex_tests.<a href="./src/cloudflare/resources/zero_trust/devices/dex_tests.py">delete</a>(dex_test_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/dex_test_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/devices/dex_tests/{dex_test_id}">client.zero_trust.devices.dex_tests.<a href="./src/cloudflare/resources/zero_trust/devices/dex_tests.py">get</a>(dex_test_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/schema_http.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/slurper/jobs">client.r2.super_slurper.jobs.<a href="./src/cloudflare/resources/r2/super_slurper/jobs/jobs.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/r2/super_slurper/job_create_params.py">params</a>) -> <a href="./src/cloudflare/types/r2/super_slurper/job_create_response.py">Optional[JobCreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/slurper/jobs">client.r2.super_slurper.jobs.<a href="./src/cloudflare/resources/r2/super_slurper/jobs/jobs.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/r2/super_slurper/job_list_params.py">params</a>) -> <a href="./src/cloudflare/types/r2/super_slurper/job_list_response.py">SyncSinglePage[JobListResponse]</a></code>
+- <code title="put /accounts/{account_id}/slurper/jobs/{job_id}/abort">client.r2.super_slurper.jobs.<a href="./src/cloudflare/resources/r2/super_slurper/jobs/jobs.py">abort</a>(job_id, \*, account_id) -> <a href="./src/cloudflare/types/r2/super_slurper/job_abort_response.py">str</a></code>
+- <code title="put /accounts/{account_id}/slurper/jobs/abortAll">client.r2.super_slurper.jobs.<a href="./src/cloudflare/resources/r2/super_slurper/jobs/jobs.py">abort_all</a>(\*, account_id) -> <a href="./src/cloudflare/types/r2/super_slurper/job_abort_all_response.py">str</a></code>
+- <code title="get /accounts/{account_id}/slurper/jobs/{job_id}">client.r2.super_slurper.jobs.<a href="./src/cloudflare/resources/r2/super_slurper/jobs/jobs.py">get</a>(job_id, \*, account_id) -> <a href="./src/cloudflare/types/r2/super_slurper/job_get_response.py">Optional[JobGetResponse]</a></code>
+- <code title="put /accounts/{account_id}/slurper/jobs/{job_id}/pause">client.r2.super_slurper.jobs.<a href="./src/cloudflare/resources/r2/super_slurper/jobs/jobs.py">pause</a>(job_id, \*, account_id) -> <a href="./src/cloudflare/types/r2/super_slurper/job_pause_response.py">str</a></code>
+- <code title="get /accounts/{account_id}/slurper/jobs/{job_id}/progress">client.r2.super_slurper.jobs.<a href="./src/cloudflare/resources/r2/super_slurper/jobs/jobs.py">progress</a>(job_id, \*, account_id) -> <a href="./src/cloudflare/types/r2/super_slurper/job_progress_response.py">Optional[JobProgressResponse]</a></code>
+- <code title="put /accounts/{account_id}/slurper/jobs/{job_id}/resume">client.r2.super_slurper.jobs.<a href="./src/cloudflare/resources/r2/super_slurper/jobs/jobs.py">resume</a>(job_id, \*, account_id) -> <a href="./src/cloudflare/types/r2/super_slurper/job_resume_response.py">str</a></code>
 
-### Networks
+#### Logs
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.devices import DeviceNetwork, NetworkDeleteResponse
+from cloudflare.types.r2.super_slurper.jobs import LogListResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/devices/networks">client.zero_trust.devices.networks.<a href="./src/cloudflare/resources/zero_trust/devices/networks.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/network_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/device_network.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/devices/networks/{network_id}">client.zero_trust.devices.networks.<a href="./src/cloudflare/resources/zero_trust/devices/networks.py">update</a>(network_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/network_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/device_network.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/devices/networks">client.zero_trust.devices.networks.<a href="./src/cloudflare/resources/zero_trust/devices/networks.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/device_network.py">SyncSinglePage[DeviceNetwork]</a></code>
-- <code title="delete /accounts/{account_id}/devices/networks/{network_id}">client.zero_trust.devices.networks.<a href="./src/cloudflare/resources/zero_trust/devices/networks.py">delete</a>(network_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/network_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/devices/networks/{network_id}">client.zero_trust.devices.networks.<a href="./src/cloudflare/resources/zero_trust/devices/networks.py">get</a>(network_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/device_network.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/slurper/jobs/{job_id}/logs">client.r2.super_slurper.jobs.logs.<a href="./src/cloudflare/resources/r2/super_slurper/jobs/logs.py">list</a>(job_id, \*, account_id, \*\*<a href="src/cloudflare/types/r2/super_slurper/jobs/log_list_params.py">params</a>) -> <a href="./src/cloudflare/types/r2/super_slurper/jobs/log_list_response.py">SyncSinglePage[LogListResponse]</a></code>
 
-### Policies
+### ConnectivityPrecheck
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.devices import SettingsPolicy, PolicyDeleteResponse
+from cloudflare.types.r2.super_slurper import (
+    ConnectivityPrecheckSourceResponse,
+    ConnectivityPrecheckTargetResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/devices/policy">client.zero_trust.devices.policies.<a href="./src/cloudflare/resources/zero_trust/devices/policies/policies.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/policy_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/settings_policy.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/devices/policies">client.zero_trust.devices.policies.<a href="./src/cloudflare/resources/zero_trust/devices/policies/policies.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/settings_policy.py">SyncSinglePage[SettingsPolicy]</a></code>
-- <code title="delete /accounts/{account_id}/devices/policy/{policy_id}">client.zero_trust.devices.policies.<a href="./src/cloudflare/resources/zero_trust/devices/policies/policies.py">delete</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/policy_delete_response.py">Optional</a></code>
-- <code title="patch /accounts/{account_id}/devices/policy/{policy_id}">client.zero_trust.devices.policies.<a href="./src/cloudflare/resources/zero_trust/devices/policies/policies.py">edit</a>(policy_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/policy_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/settings_policy.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/devices/policy/{policy_id}">client.zero_trust.devices.policies.<a href="./src/cloudflare/resources/zero_trust/devices/policies/policies.py">get</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/settings_policy.py">Optional</a></code>
+- <code title="put /accounts/{account_id}/slurper/source/connectivity-precheck">client.r2.super_slurper.connectivity_precheck.<a href="./src/cloudflare/resources/r2/super_slurper/connectivity_precheck.py">source</a>(\*, account_id, \*\*<a href="src/cloudflare/types/r2/super_slurper/connectivity_precheck_source_params.py">params</a>) -> <a href="./src/cloudflare/types/r2/super_slurper/connectivity_precheck_source_response.py">Optional[ConnectivityPrecheckSourceResponse]</a></code>
+- <code title="put /accounts/{account_id}/slurper/target/connectivity-precheck">client.r2.super_slurper.connectivity_precheck.<a href="./src/cloudflare/resources/r2/super_slurper/connectivity_precheck.py">target</a>(\*, account_id, \*\*<a href="src/cloudflare/types/r2/super_slurper/connectivity_precheck_target_params.py">params</a>) -> <a href="./src/cloudflare/types/r2/super_slurper/connectivity_precheck_target_response.py">Optional[ConnectivityPrecheckTargetResponse]</a></code>
 
-#### DefaultPolicy
+# R2DataCatalog
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.devices.policies import DefaultPolicyGetResponse
+from cloudflare.types.r2_data_catalog import (
+    R2DataCatalogListResponse,
+    R2DataCatalogEnableResponse,
+    R2DataCatalogGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/devices/policy">client.zero_trust.devices.policies.default_policy.<a href="./src/cloudflare/resources/zero_trust/devices/policies/default_policy.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/policies/default_policy_get_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/r2-catalog">client.r2_data_catalog.<a href="./src/cloudflare/resources/r2_data_catalog/r2_data_catalog.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/r2_data_catalog/r2_data_catalog_list_response.py">Optional[R2DataCatalogListResponse]</a></code>
+- <code title="post /accounts/{account_id}/r2-catalog/{bucket_name}/disable">client.r2_data_catalog.<a href="./src/cloudflare/resources/r2_data_catalog/r2_data_catalog.py">disable</a>(bucket_name, \*, account_id) -> None</code>
+- <code title="post /accounts/{account_id}/r2-catalog/{bucket_name}/enable">client.r2_data_catalog.<a href="./src/cloudflare/resources/r2_data_catalog/r2_data_catalog.py">enable</a>(bucket_name, \*, account_id) -> <a href="./src/cloudflare/types/r2_data_catalog/r2_data_catalog_enable_response.py">Optional[R2DataCatalogEnableResponse]</a></code>
+- <code title="get /accounts/{account_id}/r2-catalog/{bucket_name}">client.r2_data_catalog.<a href="./src/cloudflare/resources/r2_data_catalog/r2_data_catalog.py">get</a>(bucket_name, \*, account_id) -> <a href="./src/cloudflare/types/r2_data_catalog/r2_data_catalog_get_response.py">Optional[R2DataCatalogGetResponse]</a></code>
 
-#### Excludes
+## MaintenanceConfigs
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.devices.policies import (
-    SplitTunnelExclude,
-    ExcludeUpdateResponse,
-    ExcludeGetResponse,
+from cloudflare.types.r2_data_catalog import (
+    MaintenanceConfigUpdateResponse,
+    MaintenanceConfigGetResponse,
 )
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/devices/policy/exclude">client.zero_trust.devices.policies.excludes.<a href="./src/cloudflare/resources/zero_trust/devices/policies/excludes.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/policies/exclude_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/policies/exclude_update_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/devices/policy/exclude">client.zero_trust.devices.policies.excludes.<a href="./src/cloudflare/resources/zero_trust/devices/policies/excludes.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/policies/split_tunnel_exclude.py">SyncSinglePage[SplitTunnelExclude]</a></code>
-- <code title="get /accounts/{account_id}/devices/policy/{policy_id}/exclude">client.zero_trust.devices.policies.excludes.<a href="./src/cloudflare/resources/zero_trust/devices/policies/excludes.py">get</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/policies/exclude_get_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/r2-catalog/{bucket_name}/maintenance-configs">client.r2_data_catalog.maintenance_configs.<a href="./src/cloudflare/resources/r2_data_catalog/maintenance_configs.py">update</a>(bucket_name, \*, account_id, \*\*<a href="src/cloudflare/types/r2_data_catalog/maintenance_config_update_params.py">params</a>) -> <a href="./src/cloudflare/types/r2_data_catalog/maintenance_config_update_response.py">Optional[MaintenanceConfigUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/r2-catalog/{bucket_name}/maintenance-configs">client.r2_data_catalog.maintenance_configs.<a href="./src/cloudflare/resources/r2_data_catalog/maintenance_configs.py">get</a>(bucket_name, \*, account_id) -> <a href="./src/cloudflare/types/r2_data_catalog/maintenance_config_get_response.py">Optional[MaintenanceConfigGetResponse]</a></code>
+
+## Credentials
+
+Methods:
+
+- <code title="post /accounts/{account_id}/r2-catalog/{bucket_name}/credential">client.r2_data_catalog.credentials.<a href="./src/cloudflare/resources/r2_data_catalog/credentials.py">create</a>(bucket_name, \*, account_id, \*\*<a href="src/cloudflare/types/r2_data_catalog/credential_create_params.py">params</a>) -> object</code>
 
-#### FallbackDomains
+## Namespaces
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.devices.policies import (
-    FallbackDomain,
-    FallbackDomainPolicy,
-    FallbackDomainUpdateResponse,
-    FallbackDomainGetResponse,
-)
+from cloudflare.types.r2_data_catalog import NamespaceListResponse
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/devices/policy/{policy_id}/fallback_domains">client.zero_trust.devices.policies.fallback_domains.<a href="./src/cloudflare/resources/zero_trust/devices/policies/fallback_domains.py">update</a>(policy_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/policies/fallback_domain_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/policies/fallback_domain_update_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/devices/policy/fallback_domains">client.zero_trust.devices.policies.fallback_domains.<a href="./src/cloudflare/resources/zero_trust/devices/policies/fallback_domains.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/policies/fallback_domain.py">SyncSinglePage[FallbackDomain]</a></code>
-- <code title="get /accounts/{account_id}/devices/policy/{policy_id}/fallback_domains">client.zero_trust.devices.policies.fallback_domains.<a href="./src/cloudflare/resources/zero_trust/devices/policies/fallback_domains.py">get</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/policies/fallback_domain_get_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/r2-catalog/{bucket_name}/namespaces">client.r2_data_catalog.namespaces.<a href="./src/cloudflare/resources/r2_data_catalog/namespaces/namespaces.py">list</a>(bucket_name, \*, account_id, \*\*<a href="src/cloudflare/types/r2_data_catalog/namespace_list_params.py">params</a>) -> <a href="./src/cloudflare/types/r2_data_catalog/namespace_list_response.py">Optional[NamespaceListResponse]</a></code>
 
-#### Includes
+### Tables
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.devices.policies import (
-    SplitTunnelInclude,
-    IncludeUpdateResponse,
-    IncludeGetResponse,
-)
+from cloudflare.types.r2_data_catalog.namespaces import TableListResponse
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/devices/policy/include">client.zero_trust.devices.policies.includes.<a href="./src/cloudflare/resources/zero_trust/devices/policies/includes.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/policies/include_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/policies/include_update_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/devices/policy/include">client.zero_trust.devices.policies.includes.<a href="./src/cloudflare/resources/zero_trust/devices/policies/includes.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/policies/split_tunnel_include.py">SyncSinglePage[SplitTunnelInclude]</a></code>
-- <code title="get /accounts/{account_id}/devices/policy/{policy_id}/include">client.zero_trust.devices.policies.includes.<a href="./src/cloudflare/resources/zero_trust/devices/policies/includes.py">get</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/policies/include_get_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/r2-catalog/{bucket_name}/namespaces/{namespace}/tables">client.r2_data_catalog.namespaces.tables.<a href="./src/cloudflare/resources/r2_data_catalog/namespaces/tables/tables.py">list</a>(namespace, \*, account_id, bucket_name, \*\*<a href="src/cloudflare/types/r2_data_catalog/namespaces/table_list_params.py">params</a>) -> <a href="./src/cloudflare/types/r2_data_catalog/namespaces/table_list_response.py">Optional[TableListResponse]</a></code>
 
-### Posture
+#### MaintenanceConfigs
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.devices import (
-    CarbonblackInput,
-    ClientCertificateInput,
-    CrowdstrikeInput,
-    DeviceInput,
-    DeviceMatch,
-    DevicePostureRule,
-    DiskEncryptionInput,
-    DomainJoinedInput,
-    FileInput,
-    FirewallInput,
-    IntuneInput,
-    KolideInput,
-    OSVersionInput,
-    SentineloneInput,
-    SentineloneS2sInput,
-    TaniumInput,
-    UniqueClientIDInput,
-    WorkspaceOneInput,
-    PostureDeleteResponse,
+from cloudflare.types.r2_data_catalog.namespaces.tables import (
+    MaintenanceConfigUpdateResponse,
+    MaintenanceConfigGetResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/devices/posture">client.zero_trust.devices.posture.<a href="./src/cloudflare/resources/zero_trust/devices/posture/posture.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/posture_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/device_posture_rule.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/devices/posture/{rule_id}">client.zero_trust.devices.posture.<a href="./src/cloudflare/resources/zero_trust/devices/posture/posture.py">update</a>(rule_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/posture_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/device_posture_rule.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/devices/posture">client.zero_trust.devices.posture.<a href="./src/cloudflare/resources/zero_trust/devices/posture/posture.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/device_posture_rule.py">SyncSinglePage[DevicePostureRule]</a></code>
-- <code title="delete /accounts/{account_id}/devices/posture/{rule_id}">client.zero_trust.devices.posture.<a href="./src/cloudflare/resources/zero_trust/devices/posture/posture.py">delete</a>(rule_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/posture_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/devices/posture/{rule_id}">client.zero_trust.devices.posture.<a href="./src/cloudflare/resources/zero_trust/devices/posture/posture.py">get</a>(rule_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/device_posture_rule.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/r2-catalog/{bucket_name}/namespaces/{namespace}/tables/{table_name}/maintenance-configs">client.r2_data_catalog.namespaces.tables.maintenance_configs.<a href="./src/cloudflare/resources/r2_data_catalog/namespaces/tables/maintenance_configs.py">update</a>(table_name, \*, account_id, bucket_name, namespace, \*\*<a href="src/cloudflare/types/r2_data_catalog/namespaces/tables/maintenance_config_update_params.py">params</a>) -> <a href="./src/cloudflare/types/r2_data_catalog/namespaces/tables/maintenance_config_update_response.py">Optional[MaintenanceConfigUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/r2-catalog/{bucket_name}/namespaces/{namespace}/tables/{table_name}/maintenance-configs">client.r2_data_catalog.namespaces.tables.maintenance_configs.<a href="./src/cloudflare/resources/r2_data_catalog/namespaces/tables/maintenance_configs.py">get</a>(table_name, \*, account_id, bucket_name, namespace) -> <a href="./src/cloudflare/types/r2_data_catalog/namespaces/tables/maintenance_config_get_response.py">Optional[MaintenanceConfigGetResponse]</a></code>
 
-#### Integrations
+# WorkersForPlatforms
+
+## Dispatch
+
+### Namespaces
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.devices.posture import Integration, IntegrationDeleteResponse
+from cloudflare.types.workers_for_platforms.dispatch import (
+    NamespaceCreateResponse,
+    NamespaceListResponse,
+    NamespaceGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/workers/dispatch/namespaces">client.workers_for_platforms.dispatch.namespaces.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workers_for_platforms/dispatch/namespace_create_params.py">params</a>) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespace_create_response.py">Optional[NamespaceCreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/workers/dispatch/namespaces">client.workers_for_platforms.dispatch.namespaces.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespace_list_response.py">SyncSinglePage[NamespaceListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}">client.workers_for_platforms.dispatch.namespaces.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py">delete</a>(dispatch_namespace, \*, account_id) -> object</code>
+- <code title="get /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}">client.workers_for_platforms.dispatch.namespaces.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py">get</a>(dispatch_namespace, \*, account_id) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespace_get_response.py">Optional[NamespaceGetResponse]</a></code>
+
+#### Scripts
+
+Types:
+
+```python
+from cloudflare.types.workers_for_platforms.dispatch.namespaces import Script, ScriptUpdateResponse
+```
+
+Methods:
+
+- <code title="put /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}">client.workers_for_platforms.dispatch.namespaces.scripts.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/scripts.py">update</a>(script_name, \*, account_id, dispatch_namespace, \*\*<a href="src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script_update_response.py">ScriptUpdateResponse</a></code>
+- <code title="delete /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}">client.workers_for_platforms.dispatch.namespaces.scripts.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/scripts.py">delete</a>(script_name, \*, account_id, dispatch_namespace, \*\*<a href="src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script_delete_params.py">params</a>) -> object</code>
+- <code title="get /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}">client.workers_for_platforms.dispatch.namespaces.scripts.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/scripts.py">get</a>(script_name, \*, account_id, dispatch_namespace) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script.py">Script</a></code>
+
+##### AssetUpload
+
+Types:
+
+```python
+from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts import (
+    AssetUploadCreateResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/assets-upload-session">client.workers_for_platforms.dispatch.namespaces.scripts.asset_upload.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/asset_upload.py">create</a>(script_name, \*, account_id, dispatch_namespace, \*\*<a href="src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/asset_upload_create_params.py">params</a>) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/asset_upload_create_response.py">Optional[AssetUploadCreateResponse]</a></code>
+
+##### Content
+
+Methods:
+
+- <code title="put /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/content">client.workers_for_platforms.dispatch.namespaces.scripts.content.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/content.py">update</a>(script_name, \*, account_id, dispatch_namespace, \*\*<a href="src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/content_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers/script.py">Script</a></code>
+- <code title="get /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/content">client.workers_for_platforms.dispatch.namespaces.scripts.content.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/content.py">get</a>(script_name, \*, account_id, dispatch_namespace) -> BinaryAPIResponse</code>
+
+##### Settings
+
+Types:
+
+```python
+from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts import (
+    SettingEditResponse,
+    SettingGetResponse,
+)
+```
+
+Methods:
+
+- <code title="patch /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/settings">client.workers_for_platforms.dispatch.namespaces.scripts.settings.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/settings.py">edit</a>(script_name, \*, account_id, dispatch_namespace, \*\*<a href="src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/setting_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/setting_edit_response.py">Optional[SettingEditResponse]</a></code>
+- <code title="get /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/settings">client.workers_for_platforms.dispatch.namespaces.scripts.settings.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/settings.py">get</a>(script_name, \*, account_id, dispatch_namespace) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/setting_get_response.py">Optional[SettingGetResponse]</a></code>
+
+##### Bindings
+
+Types:
+
+```python
+from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts import BindingGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/bindings">client.workers_for_platforms.dispatch.namespaces.scripts.bindings.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/bindings.py">get</a>(script_name, \*, account_id, dispatch_namespace) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/binding_get_response.py">SyncSinglePage[BindingGetResponse]</a></code>
+
+##### Secrets
+
+Types:
+
+```python
+from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts import (
+    SecretUpdateResponse,
+    SecretListResponse,
+    SecretGetResponse,
+)
+```
+
+Methods:
+
+- <code title="put /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets">client.workers_for_platforms.dispatch.namespaces.scripts.secrets.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/secrets.py">update</a>(script_name, \*, account_id, dispatch_namespace, \*\*<a href="src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_update_response.py">SecretUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets">client.workers_for_platforms.dispatch.namespaces.scripts.secrets.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/secrets.py">list</a>(script_name, \*, account_id, dispatch_namespace) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_list_response.py">SyncSinglePage[SecretListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets/{secret_name}">client.workers_for_platforms.dispatch.namespaces.scripts.secrets.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/secrets.py">delete</a>(secret_name, \*, account_id, dispatch_namespace, script_name, \*\*<a href="src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_delete_params.py">params</a>) -> object</code>
+- <code title="get /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets/{secret_name}">client.workers_for_platforms.dispatch.namespaces.scripts.secrets.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/secrets.py">get</a>(secret_name, \*, account_id, dispatch_namespace, script_name, \*\*<a href="src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_get_params.py">params</a>) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_get_response.py">SecretGetResponse</a></code>
+
+##### Tags
+
+Types:
+
+```python
+from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts import (
+    TagUpdateResponse,
+    TagListResponse,
+)
+```
+
+Methods:
+
+- <code title="put /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/tags">client.workers_for_platforms.dispatch.namespaces.scripts.tags.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/tags.py">update</a>(script_name, \*, account_id, dispatch_namespace, \*\*<a href="src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_update_response.py">SyncSinglePage[TagUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/tags">client.workers_for_platforms.dispatch.namespaces.scripts.tags.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/tags.py">list</a>(script_name, \*, account_id, dispatch_namespace) -> <a href="./src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_list_response.py">SyncSinglePage[TagListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/tags/{tag}">client.workers_for_platforms.dispatch.namespaces.scripts.tags.<a href="./src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/tags.py">delete</a>(tag, \*, account_id, dispatch_namespace, script_name) -> object</code>
+
+# ZeroTrust
+
+## Devices
+
+Types:
+
+```python
+from cloudflare.types.zero_trust import Device, DeviceGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/devices">client.zero_trust.devices.<a href="./src/cloudflare/resources/zero_trust/devices/devices.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/device.py">SyncSinglePage[Device]</a></code>
+- <code title="get /accounts/{account_id}/devices/{device_id}">client.zero_trust.devices.<a href="./src/cloudflare/resources/zero_trust/devices/devices.py">get</a>(device_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/device_get_response.py">Optional[DeviceGetResponse]</a></code>
+
+### Devices
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.devices import DeviceListResponse, DeviceGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/devices/physical-devices">client.zero*trust.devices.devices.<a href="./src/cloudflare/resources/zero_trust/devices/devices*.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/device_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/device_list_response.py">SyncCursorPagination[DeviceListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/devices/physical-devices/{device_id}">client.zero*trust.devices.devices.<a href="./src/cloudflare/resources/zero_trust/devices/devices*.py">delete</a>(device_id, \*, account_id) -> object</code>
+- <code title="get /accounts/{account_id}/devices/physical-devices/{device_id}">client.zero*trust.devices.devices.<a href="./src/cloudflare/resources/zero_trust/devices/devices*.py">get</a>(device_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/device_get_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/device_get_response.py">DeviceGetResponse</a></code>
+- <code title="post /accounts/{account_id}/devices/physical-devices/{device_id}/revoke">client.zero*trust.devices.devices.<a href="./src/cloudflare/resources/zero_trust/devices/devices*.py">revoke</a>(device_id, \*, account_id) -> object</code>
+
+### Resilience
+
+#### GlobalWARPOverride
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.devices.resilience import (
+    GlobalWARPOverrideCreateResponse,
+    GlobalWARPOverrideGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/devices/resilience/disconnect">client.zero_trust.devices.resilience.global_warp_override.<a href="./src/cloudflare/resources/zero_trust/devices/resilience/global_warp_override.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/resilience/global_warp_override_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/resilience/global_warp_override_create_response.py">Optional[GlobalWARPOverrideCreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/devices/resilience/disconnect">client.zero_trust.devices.resilience.global_warp_override.<a href="./src/cloudflare/resources/zero_trust/devices/resilience/global_warp_override.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/resilience/global_warp_override_get_response.py">Optional[GlobalWARPOverrideGetResponse]</a></code>
+
+### Registrations
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.devices import RegistrationListResponse, RegistrationGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/devices/registrations">client.zero_trust.devices.registrations.<a href="./src/cloudflare/resources/zero_trust/devices/registrations.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/registration_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/registration_list_response.py">SyncCursorPagination[RegistrationListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/devices/registrations/{registration_id}">client.zero_trust.devices.registrations.<a href="./src/cloudflare/resources/zero_trust/devices/registrations.py">delete</a>(registration_id, \*, account_id) -> object</code>
+- <code title="delete /accounts/{account_id}/devices/registrations">client.zero_trust.devices.registrations.<a href="./src/cloudflare/resources/zero_trust/devices/registrations.py">bulk_delete</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/registration_bulk_delete_params.py">params</a>) -> object</code>
+- <code title="get /accounts/{account_id}/devices/registrations/{registration_id}">client.zero_trust.devices.registrations.<a href="./src/cloudflare/resources/zero_trust/devices/registrations.py">get</a>(registration_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/registration_get_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/registration_get_response.py">RegistrationGetResponse</a></code>
+- <code title="post /accounts/{account_id}/devices/registrations/revoke">client.zero_trust.devices.registrations.<a href="./src/cloudflare/resources/zero_trust/devices/registrations.py">revoke</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/registration_revoke_params.py">params</a>) -> object</code>
+- <code title="post /accounts/{account_id}/devices/registrations/unrevoke">client.zero_trust.devices.registrations.<a href="./src/cloudflare/resources/zero_trust/devices/registrations.py">unrevoke</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/registration_unrevoke_params.py">params</a>) -> object</code>
+
+### DEXTests
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.devices import (
+    SchemaData,
+    SchemaHTTP,
+    DEXTestCreateResponse,
+    DEXTestUpdateResponse,
+    DEXTestListResponse,
+    DEXTestDeleteResponse,
+    DEXTestGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dex/devices/dex_tests">client.zero_trust.devices.dex_tests.<a href="./src/cloudflare/resources/zero_trust/devices/dex_tests.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/dex_test_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/dex_test_create_response.py">Optional[DEXTestCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/dex/devices/dex_tests/{dex_test_id}">client.zero_trust.devices.dex_tests.<a href="./src/cloudflare/resources/zero_trust/devices/dex_tests.py">update</a>(dex_test_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/dex_test_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/dex_test_update_response.py">Optional[DEXTestUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/dex/devices/dex_tests">client.zero_trust.devices.dex_tests.<a href="./src/cloudflare/resources/zero_trust/devices/dex_tests.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/dex_test_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/dex_test_list_response.py">SyncV4PagePaginationArray[DEXTestListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/dex/devices/dex_tests/{dex_test_id}">client.zero_trust.devices.dex_tests.<a href="./src/cloudflare/resources/zero_trust/devices/dex_tests.py">delete</a>(dex_test_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/dex_test_delete_response.py">Optional[DEXTestDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/dex/devices/dex_tests/{dex_test_id}">client.zero_trust.devices.dex_tests.<a href="./src/cloudflare/resources/zero_trust/devices/dex_tests.py">get</a>(dex_test_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/dex_test_get_response.py">Optional[DEXTestGetResponse]</a></code>
+
+### Networks
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.devices import DeviceNetwork
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/devices/networks">client.zero_trust.devices.networks.<a href="./src/cloudflare/resources/zero_trust/devices/networks.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/network_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/device_network.py">Optional[DeviceNetwork]</a></code>
+- <code title="put /accounts/{account_id}/devices/networks/{network_id}">client.zero_trust.devices.networks.<a href="./src/cloudflare/resources/zero_trust/devices/networks.py">update</a>(network_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/network_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/device_network.py">Optional[DeviceNetwork]</a></code>
+- <code title="get /accounts/{account_id}/devices/networks">client.zero_trust.devices.networks.<a href="./src/cloudflare/resources/zero_trust/devices/networks.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/device_network.py">SyncSinglePage[DeviceNetwork]</a></code>
+- <code title="delete /accounts/{account_id}/devices/networks/{network_id}">client.zero_trust.devices.networks.<a href="./src/cloudflare/resources/zero_trust/devices/networks.py">delete</a>(network_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/device_network.py">SyncSinglePage[DeviceNetwork]</a></code>
+- <code title="get /accounts/{account_id}/devices/networks/{network_id}">client.zero_trust.devices.networks.<a href="./src/cloudflare/resources/zero_trust/devices/networks.py">get</a>(network_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/device_network.py">Optional[DeviceNetwork]</a></code>
+
+### FleetStatus
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.devices import FleetStatusGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/devices/{device_id}/fleet-status/live">client.zero_trust.devices.fleet_status.<a href="./src/cloudflare/resources/zero_trust/devices/fleet_status.py">get</a>(device_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/fleet_status_get_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/fleet_status_get_response.py">FleetStatusGetResponse</a></code>
+
+### Policies
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.devices import (
+    DevicePolicyCertificates,
+    FallbackDomain,
+    FallbackDomainPolicy,
+    SettingsPolicy,
+    SplitTunnelExclude,
+    SplitTunnelInclude,
+)
+```
+
+#### Default
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.devices.policies import DefaultEditResponse, DefaultGetResponse
+```
+
+Methods:
+
+- <code title="patch /accounts/{account_id}/devices/policy">client.zero_trust.devices.policies.default.<a href="./src/cloudflare/resources/zero_trust/devices/policies/default/default.py">edit</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/policies/default_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/policies/default_edit_response.py">Optional[DefaultEditResponse]</a></code>
+- <code title="get /accounts/{account_id}/devices/policy">client.zero_trust.devices.policies.default.<a href="./src/cloudflare/resources/zero_trust/devices/policies/default/default.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/policies/default_get_response.py">Optional[DefaultGetResponse]</a></code>
+
+##### Excludes
+
+Methods:
+
+- <code title="put /accounts/{account_id}/devices/policy/exclude">client.zero_trust.devices.policies.default.excludes.<a href="./src/cloudflare/resources/zero_trust/devices/policies/default/excludes.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/policies/default/exclude_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/split_tunnel_exclude.py">SyncSinglePage[SplitTunnelExclude]</a></code>
+- <code title="get /accounts/{account_id}/devices/policy/exclude">client.zero_trust.devices.policies.default.excludes.<a href="./src/cloudflare/resources/zero_trust/devices/policies/default/excludes.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/split_tunnel_exclude.py">SyncSinglePage[SplitTunnelExclude]</a></code>
+
+##### Includes
+
+Methods:
+
+- <code title="put /accounts/{account_id}/devices/policy/include">client.zero_trust.devices.policies.default.includes.<a href="./src/cloudflare/resources/zero_trust/devices/policies/default/includes.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/policies/default/include_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/split_tunnel_include.py">SyncSinglePage[SplitTunnelInclude]</a></code>
+- <code title="get /accounts/{account_id}/devices/policy/include">client.zero_trust.devices.policies.default.includes.<a href="./src/cloudflare/resources/zero_trust/devices/policies/default/includes.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/split_tunnel_include.py">SyncSinglePage[SplitTunnelInclude]</a></code>
+
+##### FallbackDomains
+
+Methods:
+
+- <code title="put /accounts/{account_id}/devices/policy/fallback_domains">client.zero_trust.devices.policies.default.fallback_domains.<a href="./src/cloudflare/resources/zero_trust/devices/policies/default/fallback_domains.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/policies/default/fallback_domain_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/fallback_domain.py">SyncSinglePage[FallbackDomain]</a></code>
+- <code title="get /accounts/{account_id}/devices/policy/fallback_domains">client.zero_trust.devices.policies.default.fallback_domains.<a href="./src/cloudflare/resources/zero_trust/devices/policies/default/fallback_domains.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/fallback_domain.py">SyncSinglePage[FallbackDomain]</a></code>
+
+##### Certificates
+
+Methods:
+
+- <code title="patch /zones/{zone_id}/devices/policy/certificates">client.zero_trust.devices.policies.default.certificates.<a href="./src/cloudflare/resources/zero_trust/devices/policies/default/certificates.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/policies/default/certificate_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/device_policy_certificates.py">Optional[DevicePolicyCertificates]</a></code>
+- <code title="get /zones/{zone_id}/devices/policy/certificates">client.zero_trust.devices.policies.default.certificates.<a href="./src/cloudflare/resources/zero_trust/devices/policies/default/certificates.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/zero_trust/devices/device_policy_certificates.py">Optional[DevicePolicyCertificates]</a></code>
+
+#### Custom
+
+Methods:
+
+- <code title="post /accounts/{account_id}/devices/policy">client.zero_trust.devices.policies.custom.<a href="./src/cloudflare/resources/zero_trust/devices/policies/custom/custom.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/policies/custom_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/settings_policy.py">Optional[SettingsPolicy]</a></code>
+- <code title="get /accounts/{account_id}/devices/policies">client.zero_trust.devices.policies.custom.<a href="./src/cloudflare/resources/zero_trust/devices/policies/custom/custom.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/settings_policy.py">SyncSinglePage[SettingsPolicy]</a></code>
+- <code title="delete /accounts/{account_id}/devices/policy/{policy_id}">client.zero_trust.devices.policies.custom.<a href="./src/cloudflare/resources/zero_trust/devices/policies/custom/custom.py">delete</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/settings_policy.py">SyncSinglePage[SettingsPolicy]</a></code>
+- <code title="patch /accounts/{account_id}/devices/policy/{policy_id}">client.zero_trust.devices.policies.custom.<a href="./src/cloudflare/resources/zero_trust/devices/policies/custom/custom.py">edit</a>(policy_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/policies/custom_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/settings_policy.py">Optional[SettingsPolicy]</a></code>
+- <code title="get /accounts/{account_id}/devices/policy/{policy_id}">client.zero_trust.devices.policies.custom.<a href="./src/cloudflare/resources/zero_trust/devices/policies/custom/custom.py">get</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/settings_policy.py">Optional[SettingsPolicy]</a></code>
+
+##### Excludes
+
+Methods:
+
+- <code title="put /accounts/{account_id}/devices/policy/{policy_id}/exclude">client.zero_trust.devices.policies.custom.excludes.<a href="./src/cloudflare/resources/zero_trust/devices/policies/custom/excludes.py">update</a>(policy_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/policies/custom/exclude_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/split_tunnel_exclude.py">SyncSinglePage[SplitTunnelExclude]</a></code>
+- <code title="get /accounts/{account_id}/devices/policy/{policy_id}/exclude">client.zero_trust.devices.policies.custom.excludes.<a href="./src/cloudflare/resources/zero_trust/devices/policies/custom/excludes.py">get</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/split_tunnel_exclude.py">SyncSinglePage[SplitTunnelExclude]</a></code>
+
+##### Includes
+
+Methods:
+
+- <code title="put /accounts/{account_id}/devices/policy/{policy_id}/include">client.zero_trust.devices.policies.custom.includes.<a href="./src/cloudflare/resources/zero_trust/devices/policies/custom/includes.py">update</a>(policy_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/policies/custom/include_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/split_tunnel_include.py">SyncSinglePage[SplitTunnelInclude]</a></code>
+- <code title="get /accounts/{account_id}/devices/policy/{policy_id}/include">client.zero_trust.devices.policies.custom.includes.<a href="./src/cloudflare/resources/zero_trust/devices/policies/custom/includes.py">get</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/split_tunnel_include.py">SyncSinglePage[SplitTunnelInclude]</a></code>
+
+##### FallbackDomains
+
+Methods:
+
+- <code title="put /accounts/{account_id}/devices/policy/{policy_id}/fallback_domains">client.zero_trust.devices.policies.custom.fallback_domains.<a href="./src/cloudflare/resources/zero_trust/devices/policies/custom/fallback_domains.py">update</a>(policy_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/policies/custom/fallback_domain_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/fallback_domain.py">SyncSinglePage[FallbackDomain]</a></code>
+- <code title="get /accounts/{account_id}/devices/policy/{policy_id}/fallback_domains">client.zero_trust.devices.policies.custom.fallback_domains.<a href="./src/cloudflare/resources/zero_trust/devices/policies/custom/fallback_domains.py">get</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/fallback_domain.py">SyncSinglePage[FallbackDomain]</a></code>
+
+### Posture
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.devices import (
+    CarbonblackInput,
+    ClientCertificateInput,
+    CrowdstrikeInput,
+    DeviceInput,
+    DeviceMatch,
+    DevicePostureRule,
+    DiskEncryptionInput,
+    DomainJoinedInput,
+    FileInput,
+    FirewallInput,
+    IntuneInput,
+    KolideInput,
+    OSVersionInput,
+    SentineloneInput,
+    SentineloneS2sInput,
+    TaniumInput,
+    UniqueClientIDInput,
+    WorkspaceOneInput,
+    PostureDeleteResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/devices/posture">client.zero_trust.devices.posture.<a href="./src/cloudflare/resources/zero_trust/devices/posture/posture.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/posture_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/device_posture_rule.py">Optional[DevicePostureRule]</a></code>
+- <code title="put /accounts/{account_id}/devices/posture/{rule_id}">client.zero_trust.devices.posture.<a href="./src/cloudflare/resources/zero_trust/devices/posture/posture.py">update</a>(rule_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/posture_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/device_posture_rule.py">Optional[DevicePostureRule]</a></code>
+- <code title="get /accounts/{account_id}/devices/posture">client.zero_trust.devices.posture.<a href="./src/cloudflare/resources/zero_trust/devices/posture/posture.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/device_posture_rule.py">SyncSinglePage[DevicePostureRule]</a></code>
+- <code title="delete /accounts/{account_id}/devices/posture/{rule_id}">client.zero_trust.devices.posture.<a href="./src/cloudflare/resources/zero_trust/devices/posture/posture.py">delete</a>(rule_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/posture_delete_response.py">Optional[PostureDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/devices/posture/{rule_id}">client.zero_trust.devices.posture.<a href="./src/cloudflare/resources/zero_trust/devices/posture/posture.py">get</a>(rule_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/device_posture_rule.py">Optional[DevicePostureRule]</a></code>
+
+#### Integrations
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.devices.posture import Integration, IntegrationDeleteResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/devices/posture/integration">client.zero_trust.devices.posture.integrations.<a href="./src/cloudflare/resources/zero_trust/devices/posture/integrations.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/posture/integration_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/posture/integration.py">Optional[Integration]</a></code>
+- <code title="get /accounts/{account_id}/devices/posture/integration">client.zero_trust.devices.posture.integrations.<a href="./src/cloudflare/resources/zero_trust/devices/posture/integrations.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/posture/integration.py">SyncSinglePage[Integration]</a></code>
+- <code title="delete /accounts/{account_id}/devices/posture/integration/{integration_id}">client.zero_trust.devices.posture.integrations.<a href="./src/cloudflare/resources/zero_trust/devices/posture/integrations.py">delete</a>(integration_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/posture/integration_delete_response.py">Optional[IntegrationDeleteResponse]</a></code>
+- <code title="patch /accounts/{account_id}/devices/posture/integration/{integration_id}">client.zero_trust.devices.posture.integrations.<a href="./src/cloudflare/resources/zero_trust/devices/posture/integrations.py">edit</a>(integration_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/posture/integration_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/posture/integration.py">Optional[Integration]</a></code>
+- <code title="get /accounts/{account_id}/devices/posture/integration/{integration_id}">client.zero_trust.devices.posture.integrations.<a href="./src/cloudflare/resources/zero_trust/devices/posture/integrations.py">get</a>(integration_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/posture/integration.py">Optional[Integration]</a></code>
+
+### Revoke
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.devices import RevokeCreateResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/devices/revoke">client.zero_trust.devices.revoke.<a href="./src/cloudflare/resources/zero_trust/devices/revoke.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/revoke_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/revoke_create_response.py">Optional[RevokeCreateResponse]</a></code>
+
+### Settings
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.devices import DeviceSettings
+```
+
+Methods:
+
+- <code title="put /accounts/{account_id}/devices/settings">client.zero_trust.devices.settings.<a href="./src/cloudflare/resources/zero_trust/devices/settings.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/setting_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/device_settings.py">Optional[DeviceSettings]</a></code>
+- <code title="delete /accounts/{account_id}/devices/settings">client.zero_trust.devices.settings.<a href="./src/cloudflare/resources/zero_trust/devices/settings.py">delete</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/device_settings.py">Optional[DeviceSettings]</a></code>
+- <code title="patch /accounts/{account_id}/devices/settings">client.zero_trust.devices.settings.<a href="./src/cloudflare/resources/zero_trust/devices/settings.py">edit</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/setting_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/device_settings.py">Optional[DeviceSettings]</a></code>
+- <code title="get /accounts/{account_id}/devices/settings">client.zero_trust.devices.settings.<a href="./src/cloudflare/resources/zero_trust/devices/settings.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/device_settings.py">Optional[DeviceSettings]</a></code>
+
+### Unrevoke
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.devices import UnrevokeCreateResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/devices/unrevoke">client.zero_trust.devices.unrevoke.<a href="./src/cloudflare/resources/zero_trust/devices/unrevoke.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/unrevoke_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/unrevoke_create_response.py">Optional[UnrevokeCreateResponse]</a></code>
+
+### OverrideCodes
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.devices import OverrideCodeGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/devices/{device_id}/override_codes">client.zero_trust.devices.override_codes.<a href="./src/cloudflare/resources/zero_trust/devices/override_codes.py">list</a>(device_id, \*, account_id) -> SyncSinglePage[object]</code>
+- <code title="get /accounts/{account_id}/devices/registrations/{registration_id}/override_codes">client.zero_trust.devices.override_codes.<a href="./src/cloudflare/resources/zero_trust/devices/override_codes.py">get</a>(registration_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/override_code_get_response.py">OverrideCodeGetResponse</a></code>
+
+## IdentityProviders
+
+Types:
+
+```python
+from cloudflare.types.zero_trust import (
+    AzureAD,
+    GenericOAuthConfig,
+    IdentityProvider,
+    IdentityProviderSCIMConfig,
+    IdentityProviderType,
+    IdentityProviderListResponse,
+    IdentityProviderDeleteResponse,
+)
+```
+
+Methods:
+
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/access/identity_providers">client.zero_trust.identity_providers.<a href="./src/cloudflare/resources/zero_trust/identity_providers/identity_providers.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/identity_provider_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/identity_provider.py">Optional[IdentityProvider]</a></code>
+- <code title="put /{accounts_or_zones}/{account_or_zone_id}/access/identity_providers/{identity_provider_id}">client.zero_trust.identity_providers.<a href="./src/cloudflare/resources/zero_trust/identity_providers/identity_providers.py">update</a>(identity_provider_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/identity_provider_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/identity_provider.py">Optional[IdentityProvider]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/access/identity_providers">client.zero_trust.identity_providers.<a href="./src/cloudflare/resources/zero_trust/identity_providers/identity_providers.py">list</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/identity_provider_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/identity_provider_list_response.py">SyncV4PagePaginationArray[IdentityProviderListResponse]</a></code>
+- <code title="delete /{accounts_or_zones}/{account_or_zone_id}/access/identity_providers/{identity_provider_id}">client.zero_trust.identity_providers.<a href="./src/cloudflare/resources/zero_trust/identity_providers/identity_providers.py">delete</a>(identity_provider_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/identity_provider_delete_response.py">Optional[IdentityProviderDeleteResponse]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/access/identity_providers/{identity_provider_id}">client.zero_trust.identity_providers.<a href="./src/cloudflare/resources/zero_trust/identity_providers/identity_providers.py">get</a>(identity_provider_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/identity_provider.py">Optional[IdentityProvider]</a></code>
+
+### SCIM
+
+#### Groups
+
+Methods:
+
+- <code title="get /accounts/{account_id}/access/identity_providers/{identity_provider_id}/scim/groups">client.zero_trust.identity_providers.scim.groups.<a href="./src/cloudflare/resources/zero_trust/identity_providers/scim/groups.py">list</a>(identity_provider_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/identity_providers/scim/group_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/zero_trust_group.py">SyncV4PagePaginationArray[ZeroTrustGroup]</a></code>
+
+#### Users
+
+Methods:
+
+- <code title="get /accounts/{account_id}/access/identity_providers/{identity_provider_id}/scim/users">client.zero_trust.identity_providers.scim.users.<a href="./src/cloudflare/resources/zero_trust/identity_providers/scim/users.py">list</a>(identity_provider_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/identity_providers/scim/user_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/access_user.py">SyncV4PagePaginationArray[AccessUser]</a></code>
+
+## Organizations
+
+Types:
+
+```python
+from cloudflare.types.zero_trust import LoginDesign, Organization, OrganizationRevokeUsersResponse
+```
+
+Methods:
+
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/access/organizations">client.zero_trust.organizations.<a href="./src/cloudflare/resources/zero_trust/organizations/organizations.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/organization_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/organization.py">Optional[Organization]</a></code>
+- <code title="put /{accounts_or_zones}/{account_or_zone_id}/access/organizations">client.zero_trust.organizations.<a href="./src/cloudflare/resources/zero_trust/organizations/organizations.py">update</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/organization_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/organization.py">Optional[Organization]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/access/organizations">client.zero_trust.organizations.<a href="./src/cloudflare/resources/zero_trust/organizations/organizations.py">list</a>(\*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/organization.py">Optional[Organization]</a></code>
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/access/organizations/revoke_user">client.zero_trust.organizations.<a href="./src/cloudflare/resources/zero_trust/organizations/organizations.py">revoke_users</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/organization_revoke_users_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/organization_revoke_users_response.py">Optional[OrganizationRevokeUsersResponse]</a></code>
+
+### DOH
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.organizations import DOHUpdateResponse, DOHGetResponse
+```
+
+Methods:
+
+- <code title="put /accounts/{account_id}/access/organizations/doh">client.zero_trust.organizations.doh.<a href="./src/cloudflare/resources/zero_trust/organizations/doh.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/organizations/doh_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/organizations/doh_update_response.py">Optional[DOHUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/access/organizations/doh">client.zero_trust.organizations.doh.<a href="./src/cloudflare/resources/zero_trust/organizations/doh.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/organizations/doh_get_response.py">Optional[DOHGetResponse]</a></code>
+
+## Seats
+
+Types:
+
+```python
+from cloudflare.types.zero_trust import Seat
+```
+
+Methods:
+
+- <code title="patch /accounts/{account_id}/access/seats">client.zero_trust.seats.<a href="./src/cloudflare/resources/zero_trust/seats.py">edit</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/seat_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/seat.py">SyncSinglePage[Seat]</a></code>
+
+## Access
+
+### AIControls
+
+#### Mcp
+
+##### Portals
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access.ai_controls.mcp import (
+    PortalCreateResponse,
+    PortalUpdateResponse,
+    PortalListResponse,
+    PortalDeleteResponse,
+    PortalReadResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/access/ai-controls/mcp/portals">client.zero_trust.access.ai_controls.mcp.portals.<a href="./src/cloudflare/resources/zero_trust/access/ai_controls/mcp/portals.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_create_response.py">PortalCreateResponse</a></code>
+- <code title="put /accounts/{account_id}/access/ai-controls/mcp/portals/{id}">client.zero_trust.access.ai_controls.mcp.portals.<a href="./src/cloudflare/resources/zero_trust/access/ai_controls/mcp/portals.py">update</a>(id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_update_response.py">PortalUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/access/ai-controls/mcp/portals">client.zero_trust.access.ai_controls.mcp.portals.<a href="./src/cloudflare/resources/zero_trust/access/ai_controls/mcp/portals.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_list_response.py">SyncV4PagePaginationArray[PortalListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/access/ai-controls/mcp/portals/{id}">client.zero_trust.access.ai_controls.mcp.portals.<a href="./src/cloudflare/resources/zero_trust/access/ai_controls/mcp/portals.py">delete</a>(id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_delete_response.py">PortalDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/access/ai-controls/mcp/portals/{id}">client.zero_trust.access.ai_controls.mcp.portals.<a href="./src/cloudflare/resources/zero_trust/access/ai_controls/mcp/portals.py">read</a>(id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_read_response.py">PortalReadResponse</a></code>
+
+##### Servers
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access.ai_controls.mcp import (
+    ServerCreateResponse,
+    ServerUpdateResponse,
+    ServerListResponse,
+    ServerDeleteResponse,
+    ServerReadResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/access/ai-controls/mcp/servers">client.zero_trust.access.ai_controls.mcp.servers.<a href="./src/cloudflare/resources/zero_trust/access/ai_controls/mcp/servers.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_create_response.py">ServerCreateResponse</a></code>
+- <code title="put /accounts/{account_id}/access/ai-controls/mcp/servers/{id}">client.zero_trust.access.ai_controls.mcp.servers.<a href="./src/cloudflare/resources/zero_trust/access/ai_controls/mcp/servers.py">update</a>(id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_update_response.py">ServerUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/access/ai-controls/mcp/servers">client.zero_trust.access.ai_controls.mcp.servers.<a href="./src/cloudflare/resources/zero_trust/access/ai_controls/mcp/servers.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_list_response.py">SyncV4PagePaginationArray[ServerListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/access/ai-controls/mcp/servers/{id}">client.zero_trust.access.ai_controls.mcp.servers.<a href="./src/cloudflare/resources/zero_trust/access/ai_controls/mcp/servers.py">delete</a>(id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_delete_response.py">ServerDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/access/ai-controls/mcp/servers/{id}">client.zero_trust.access.ai_controls.mcp.servers.<a href="./src/cloudflare/resources/zero_trust/access/ai_controls/mcp/servers.py">read</a>(id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_read_response.py">ServerReadResponse</a></code>
+- <code title="post /accounts/{account_id}/access/ai-controls/mcp/servers/{id}/sync">client.zero_trust.access.ai_controls.mcp.servers.<a href="./src/cloudflare/resources/zero_trust/access/ai_controls/mcp/servers.py">sync</a>(id, \*, account_id) -> object</code>
+
+### GatewayCA
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access import (
+    GatewayCACreateResponse,
+    GatewayCAListResponse,
+    GatewayCADeleteResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/access/gateway_ca">client.zero_trust.access.gateway_ca.<a href="./src/cloudflare/resources/zero_trust/access/gateway_ca.py">create</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/gateway_ca_create_response.py">Optional[GatewayCACreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/access/gateway_ca">client.zero_trust.access.gateway_ca.<a href="./src/cloudflare/resources/zero_trust/access/gateway_ca.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/gateway_ca_list_response.py">SyncSinglePage[GatewayCAListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/access/gateway_ca/{certificate_id}">client.zero_trust.access.gateway_ca.<a href="./src/cloudflare/resources/zero_trust/access/gateway_ca.py">delete</a>(certificate_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/gateway_ca_delete_response.py">Optional[GatewayCADeleteResponse]</a></code>
+
+### Infrastructure
+
+#### Targets
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access.infrastructure import (
+    TargetCreateResponse,
+    TargetUpdateResponse,
+    TargetListResponse,
+    TargetBulkUpdateResponse,
+    TargetGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/infrastructure/targets">client.zero_trust.access.infrastructure.targets.<a href="./src/cloudflare/resources/zero_trust/access/infrastructure/targets.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/infrastructure/target_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/infrastructure/target_create_response.py">Optional[TargetCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/infrastructure/targets/{target_id}">client.zero_trust.access.infrastructure.targets.<a href="./src/cloudflare/resources/zero_trust/access/infrastructure/targets.py">update</a>(target_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/infrastructure/target_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/infrastructure/target_update_response.py">Optional[TargetUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/infrastructure/targets">client.zero_trust.access.infrastructure.targets.<a href="./src/cloudflare/resources/zero_trust/access/infrastructure/targets.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/infrastructure/target_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/infrastructure/target_list_response.py">SyncV4PagePaginationArray[TargetListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/infrastructure/targets/{target_id}">client.zero_trust.access.infrastructure.targets.<a href="./src/cloudflare/resources/zero_trust/access/infrastructure/targets.py">delete</a>(target_id, \*, account_id) -> None</code>
+- <code title="delete /accounts/{account_id}/infrastructure/targets/batch">client.zero_trust.access.infrastructure.targets.<a href="./src/cloudflare/resources/zero_trust/access/infrastructure/targets.py">bulk_delete</a>(\*, account_id) -> None</code>
+- <code title="post /accounts/{account_id}/infrastructure/targets/batch_delete">client.zero_trust.access.infrastructure.targets.<a href="./src/cloudflare/resources/zero_trust/access/infrastructure/targets.py">bulk_delete_v2</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/infrastructure/target_bulk_delete_v2_params.py">params</a>) -> None</code>
+- <code title="put /accounts/{account_id}/infrastructure/targets/batch">client.zero_trust.access.infrastructure.targets.<a href="./src/cloudflare/resources/zero_trust/access/infrastructure/targets.py">bulk_update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/infrastructure/target_bulk_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/infrastructure/target_bulk_update_response.py">SyncSinglePage[TargetBulkUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/infrastructure/targets/{target_id}">client.zero_trust.access.infrastructure.targets.<a href="./src/cloudflare/resources/zero_trust/access/infrastructure/targets.py">get</a>(target_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/infrastructure/target_get_response.py">Optional[TargetGetResponse]</a></code>
+
+### Applications
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access import (
+    AllowedHeaders,
+    AllowedIdPs,
+    AllowedMethods,
+    AllowedOrigins,
+    AppID,
+    Application,
+    ApplicationPolicy,
+    ApplicationSCIMConfig,
+    ApplicationType,
+    CORSHeaders,
+    Decision,
+    OIDCSaaSApp,
+    SaaSAppNameIDFormat,
+    SAMLSaaSApp,
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    SCIMConfigMapping,
+    SelfHostedDomains,
+    ApplicationCreateResponse,
+    ApplicationUpdateResponse,
+    ApplicationListResponse,
+    ApplicationDeleteResponse,
+    ApplicationGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/access/apps">client.zero_trust.access.applications.<a href="./src/cloudflare/resources/zero_trust/access/applications/applications.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/application_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/application_create_response.py">Optional[ApplicationCreateResponse]</a></code>
+- <code title="put /{accounts_or_zones}/{account_or_zone_id}/access/apps/{app_id}">client.zero_trust.access.applications.<a href="./src/cloudflare/resources/zero_trust/access/applications/applications.py">update</a>(app_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/application_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/application_update_response.py">Optional[ApplicationUpdateResponse]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/access/apps">client.zero_trust.access.applications.<a href="./src/cloudflare/resources/zero_trust/access/applications/applications.py">list</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/application_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/application_list_response.py">SyncV4PagePaginationArray[ApplicationListResponse]</a></code>
+- <code title="delete /{accounts_or_zones}/{account_or_zone_id}/access/apps/{app_id}">client.zero_trust.access.applications.<a href="./src/cloudflare/resources/zero_trust/access/applications/applications.py">delete</a>(app_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/application_delete_response.py">Optional[ApplicationDeleteResponse]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/access/apps/{app_id}">client.zero_trust.access.applications.<a href="./src/cloudflare/resources/zero_trust/access/applications/applications.py">get</a>(app_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/application_get_response.py">Optional[ApplicationGetResponse]</a></code>
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/access/apps/{app_id}/revoke_tokens">client.zero_trust.access.applications.<a href="./src/cloudflare/resources/zero_trust/access/applications/applications.py">revoke_tokens</a>(app_id, \*, account_id, zone_id) -> object</code>
+
+#### CAs
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access.applications import CA, CADeleteResponse
+```
+
+Methods:
+
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/access/apps/{app_id}/ca">client.zero_trust.access.applications.cas.<a href="./src/cloudflare/resources/zero_trust/access/applications/cas.py">create</a>(app_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/applications/ca.py">Optional[CA]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/access/apps/ca">client.zero_trust.access.applications.cas.<a href="./src/cloudflare/resources/zero_trust/access/applications/cas.py">list</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/applications/ca_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/applications/ca.py">SyncV4PagePaginationArray[CA]</a></code>
+- <code title="delete /{accounts_or_zones}/{account_or_zone_id}/access/apps/{app_id}/ca">client.zero_trust.access.applications.cas.<a href="./src/cloudflare/resources/zero_trust/access/applications/cas.py">delete</a>(app_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/applications/ca_delete_response.py">Optional[CADeleteResponse]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/access/apps/{app_id}/ca">client.zero_trust.access.applications.cas.<a href="./src/cloudflare/resources/zero_trust/access/applications/cas.py">get</a>(app_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/applications/ca.py">Optional[CA]</a></code>
+
+#### UserPolicyChecks
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access.applications import (
+    UserPolicyCheckGeo,
+    UserPolicyCheckListResponse,
+)
+```
+
+Methods:
+
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/access/apps/{app_id}/user_policy_checks">client.zero_trust.access.applications.user_policy_checks.<a href="./src/cloudflare/resources/zero_trust/access/applications/user_policy_checks.py">list</a>(app_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/applications/user_policy_check_list_response.py">Optional[UserPolicyCheckListResponse]</a></code>
+
+#### Policies
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access.applications import (
+    AccessDevicePostureRule,
+    AccessRule,
+    AnyValidServiceTokenRule,
+    AuthenticationMethodRule,
+    AzureGroupRule,
+    CertificateRule,
+    CountryRule,
+    DomainRule,
+    EmailListRule,
+    EmailRule,
+    EveryoneRule,
+    ExternalEvaluationRule,
+    GitHubOrganizationRule,
+    GroupRule,
+    GSuiteGroupRule,
+    IPListRule,
+    IPRule,
+    OktaGroupRule,
+    SAMLGroupRule,
+    ServiceTokenRule,
+    PolicyCreateResponse,
+    PolicyUpdateResponse,
+    PolicyListResponse,
+    PolicyDeleteResponse,
+    PolicyGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/access/apps/{app_id}/policies">client.zero_trust.access.applications.policies.<a href="./src/cloudflare/resources/zero_trust/access/applications/policies.py">create</a>(app_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/applications/policy_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/applications/policy_create_response.py">Optional[PolicyCreateResponse]</a></code>
+- <code title="put /{accounts_or_zones}/{account_or_zone_id}/access/apps/{app_id}/policies/{policy_id}">client.zero_trust.access.applications.policies.<a href="./src/cloudflare/resources/zero_trust/access/applications/policies.py">update</a>(policy_id, \*, app_id, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/applications/policy_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/applications/policy_update_response.py">Optional[PolicyUpdateResponse]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/access/apps/{app_id}/policies">client.zero_trust.access.applications.policies.<a href="./src/cloudflare/resources/zero_trust/access/applications/policies.py">list</a>(app_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/applications/policy_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/applications/policy_list_response.py">SyncV4PagePaginationArray[PolicyListResponse]</a></code>
+- <code title="delete /{accounts_or_zones}/{account_or_zone_id}/access/apps/{app_id}/policies/{policy_id}">client.zero_trust.access.applications.policies.<a href="./src/cloudflare/resources/zero_trust/access/applications/policies.py">delete</a>(policy_id, \*, app_id, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/applications/policy_delete_response.py">Optional[PolicyDeleteResponse]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/access/apps/{app_id}/policies/{policy_id}">client.zero_trust.access.applications.policies.<a href="./src/cloudflare/resources/zero_trust/access/applications/policies.py">get</a>(policy_id, \*, app_id, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/applications/policy_get_response.py">Optional[PolicyGetResponse]</a></code>
+
+#### PolicyTests
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access.applications import (
+    PolicyTestCreateResponse,
+    PolicyTestGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/access/policy-tests">client.zero_trust.access.applications.policy_tests.<a href="./src/cloudflare/resources/zero_trust/access/applications/policy_tests/policy_tests.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/applications/policy_test_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/applications/policy_test_create_response.py">Optional[PolicyTestCreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/access/policy-tests/{policy_test_id}">client.zero_trust.access.applications.policy_tests.<a href="./src/cloudflare/resources/zero_trust/access/applications/policy_tests/policy_tests.py">get</a>(policy_test_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/applications/policy_test_get_response.py">Optional[PolicyTestGetResponse]</a></code>
+
+##### Users
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access.applications.policy_tests import UserListResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/access/policy-tests/{policy_test_id}/users">client.zero_trust.access.applications.policy_tests.users.<a href="./src/cloudflare/resources/zero_trust/access/applications/policy_tests/users.py">list</a>(policy_test_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/applications/policy_tests/user_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/applications/policy_tests/user_list_response.py">SyncV4PagePaginationArray[UserListResponse]</a></code>
+
+#### Settings
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access.applications import (
+    SettingUpdateResponse,
+    SettingEditResponse,
+)
+```
+
+Methods:
+
+- <code title="put /{accounts_or_zones}/{account_or_zone_id}/access/apps/{app_id}/settings">client.zero_trust.access.applications.settings.<a href="./src/cloudflare/resources/zero_trust/access/applications/settings.py">update</a>(app_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/applications/setting_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/applications/setting_update_response.py">Optional[SettingUpdateResponse]</a></code>
+- <code title="patch /{accounts_or_zones}/{account_or_zone_id}/access/apps/{app_id}/settings">client.zero_trust.access.applications.settings.<a href="./src/cloudflare/resources/zero_trust/access/applications/settings.py">edit</a>(app_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/applications/setting_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/applications/setting_edit_response.py">Optional[SettingEditResponse]</a></code>
+
+### Certificates
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access import (
+    AssociatedHostnames,
+    Certificate,
+    CertificateDeleteResponse,
+)
+```
+
+Methods:
+
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/access/certificates">client.zero_trust.access.certificates.<a href="./src/cloudflare/resources/zero_trust/access/certificates/certificates.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/certificate_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/certificate.py">Optional[Certificate]</a></code>
+- <code title="put /{accounts_or_zones}/{account_or_zone_id}/access/certificates/{certificate_id}">client.zero_trust.access.certificates.<a href="./src/cloudflare/resources/zero_trust/access/certificates/certificates.py">update</a>(certificate_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/certificate_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/certificate.py">Optional[Certificate]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/access/certificates">client.zero_trust.access.certificates.<a href="./src/cloudflare/resources/zero_trust/access/certificates/certificates.py">list</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/certificate_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/certificate.py">SyncV4PagePaginationArray[Certificate]</a></code>
+- <code title="delete /{accounts_or_zones}/{account_or_zone_id}/access/certificates/{certificate_id}">client.zero_trust.access.certificates.<a href="./src/cloudflare/resources/zero_trust/access/certificates/certificates.py">delete</a>(certificate_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/certificate_delete_response.py">Optional[CertificateDeleteResponse]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/access/certificates/{certificate_id}">client.zero_trust.access.certificates.<a href="./src/cloudflare/resources/zero_trust/access/certificates/certificates.py">get</a>(certificate_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/certificate.py">Optional[Certificate]</a></code>
+
+#### Settings
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access.certificates import CertificateSettings
+```
+
+Methods:
+
+- <code title="put /{accounts_or_zones}/{account_or_zone_id}/access/certificates/settings">client.zero_trust.access.certificates.settings.<a href="./src/cloudflare/resources/zero_trust/access/certificates/settings.py">update</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/certificates/setting_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/certificates/certificate_settings.py">SyncSinglePage[CertificateSettings]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/access/certificates/settings">client.zero_trust.access.certificates.settings.<a href="./src/cloudflare/resources/zero_trust/access/certificates/settings.py">get</a>(\*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/certificates/certificate_settings.py">SyncSinglePage[CertificateSettings]</a></code>
+
+### Groups
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access import (
+    ZeroTrustGroup,
+    GroupCreateResponse,
+    GroupUpdateResponse,
+    GroupListResponse,
+    GroupDeleteResponse,
+    GroupGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/access/groups">client.zero_trust.access.groups.<a href="./src/cloudflare/resources/zero_trust/access/groups.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/group_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/group_create_response.py">Optional[GroupCreateResponse]</a></code>
+- <code title="put /{accounts_or_zones}/{account_or_zone_id}/access/groups/{group_id}">client.zero_trust.access.groups.<a href="./src/cloudflare/resources/zero_trust/access/groups.py">update</a>(group_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/group_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/group_update_response.py">Optional[GroupUpdateResponse]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/access/groups">client.zero_trust.access.groups.<a href="./src/cloudflare/resources/zero_trust/access/groups.py">list</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/group_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/group_list_response.py">SyncV4PagePaginationArray[GroupListResponse]</a></code>
+- <code title="delete /{accounts_or_zones}/{account_or_zone_id}/access/groups/{group_id}">client.zero_trust.access.groups.<a href="./src/cloudflare/resources/zero_trust/access/groups.py">delete</a>(group_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/group_delete_response.py">Optional[GroupDeleteResponse]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/access/groups/{group_id}">client.zero_trust.access.groups.<a href="./src/cloudflare/resources/zero_trust/access/groups.py">get</a>(group_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/group_get_response.py">Optional[GroupGetResponse]</a></code>
+
+### ServiceTokens
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access import (
+    ServiceToken,
+    ServiceTokenCreateResponse,
+    ServiceTokenRotateResponse,
+)
+```
+
+Methods:
+
+- <code title="post /{accounts_or_zones}/{account_or_zone_id}/access/service_tokens">client.zero_trust.access.service_tokens.<a href="./src/cloudflare/resources/zero_trust/access/service_tokens.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/service_token_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/service_token_create_response.py">Optional[ServiceTokenCreateResponse]</a></code>
+- <code title="put /{accounts_or_zones}/{account_or_zone_id}/access/service_tokens/{service_token_id}">client.zero_trust.access.service_tokens.<a href="./src/cloudflare/resources/zero_trust/access/service_tokens.py">update</a>(service_token_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/service_token_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/service_token.py">Optional[ServiceToken]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/access/service_tokens">client.zero_trust.access.service_tokens.<a href="./src/cloudflare/resources/zero_trust/access/service_tokens.py">list</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/service_token_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/service_token.py">SyncV4PagePaginationArray[ServiceToken]</a></code>
+- <code title="delete /{accounts_or_zones}/{account_or_zone_id}/access/service_tokens/{service_token_id}">client.zero_trust.access.service_tokens.<a href="./src/cloudflare/resources/zero_trust/access/service_tokens.py">delete</a>(service_token_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/service_token.py">Optional[ServiceToken]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/access/service_tokens/{service_token_id}">client.zero_trust.access.service_tokens.<a href="./src/cloudflare/resources/zero_trust/access/service_tokens.py">get</a>(service_token_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/service_token.py">Optional[ServiceToken]</a></code>
+- <code title="post /accounts/{account_id}/access/service_tokens/{service_token_id}/refresh">client.zero_trust.access.service_tokens.<a href="./src/cloudflare/resources/zero_trust/access/service_tokens.py">refresh</a>(service_token_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/service_token.py">Optional[ServiceToken]</a></code>
+- <code title="post /accounts/{account_id}/access/service_tokens/{service_token_id}/rotate">client.zero_trust.access.service_tokens.<a href="./src/cloudflare/resources/zero_trust/access/service_tokens.py">rotate</a>(service_token_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/service_token_rotate_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/service_token_rotate_response.py">Optional[ServiceTokenRotateResponse]</a></code>
+
+### Bookmarks
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access import Bookmark, BookmarkDeleteResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/access/bookmarks/{bookmark_id}">client.zero_trust.access.bookmarks.<a href="./src/cloudflare/resources/zero_trust/access/bookmarks.py">create</a>(bookmark_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/bookmark_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/bookmark.py">Optional[Bookmark]</a></code>
+- <code title="put /accounts/{account_id}/access/bookmarks/{bookmark_id}">client.zero_trust.access.bookmarks.<a href="./src/cloudflare/resources/zero_trust/access/bookmarks.py">update</a>(bookmark_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/bookmark_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/bookmark.py">Optional[Bookmark]</a></code>
+- <code title="get /accounts/{account_id}/access/bookmarks">client.zero_trust.access.bookmarks.<a href="./src/cloudflare/resources/zero_trust/access/bookmarks.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/bookmark.py">SyncSinglePage[Bookmark]</a></code>
+- <code title="delete /accounts/{account_id}/access/bookmarks/{bookmark_id}">client.zero_trust.access.bookmarks.<a href="./src/cloudflare/resources/zero_trust/access/bookmarks.py">delete</a>(bookmark_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/bookmark_delete_response.py">Optional[BookmarkDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/access/bookmarks/{bookmark_id}">client.zero_trust.access.bookmarks.<a href="./src/cloudflare/resources/zero_trust/access/bookmarks.py">get</a>(bookmark_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/bookmark.py">Optional[Bookmark]</a></code>
+
+### Keys
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access import KeyUpdateResponse, KeyGetResponse, KeyRotateResponse
+```
+
+Methods:
+
+- <code title="put /accounts/{account_id}/access/keys">client.zero_trust.access.keys.<a href="./src/cloudflare/resources/zero_trust/access/keys.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/key_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/key_update_response.py">Optional[KeyUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/access/keys">client.zero_trust.access.keys.<a href="./src/cloudflare/resources/zero_trust/access/keys.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/key_get_response.py">Optional[KeyGetResponse]</a></code>
+- <code title="post /accounts/{account_id}/access/keys/rotate">client.zero_trust.access.keys.<a href="./src/cloudflare/resources/zero_trust/access/keys.py">rotate</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/key_rotate_response.py">Optional[KeyRotateResponse]</a></code>
+
+### Logs
+
+#### AccessRequests
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access.logs import AccessRequestListResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/access/logs/access_requests">client.zero_trust.access.logs.access_requests.<a href="./src/cloudflare/resources/zero_trust/access/logs/access_requests.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/logs/access_request_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/logs/access_request_list_response.py">Optional[AccessRequestListResponse]</a></code>
+
+#### SCIM
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access.logs import AccessRequest
+```
+
+##### Updates
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access.logs.scim import UpdateListResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/access/logs/scim/updates">client.zero_trust.access.logs.scim.updates.<a href="./src/cloudflare/resources/zero_trust/access/logs/scim/updates.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/logs/scim/update_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/logs/scim/update_list_response.py">SyncV4PagePaginationArray[UpdateListResponse]</a></code>
+
+### Users
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access import AccessUser, UserListResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/access/users">client.zero_trust.access.users.<a href="./src/cloudflare/resources/zero_trust/access/users/users.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/user_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/user_list_response.py">SyncV4PagePaginationArray[UserListResponse]</a></code>
+
+#### ActiveSessions
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access.users import (
+    ActiveSessionListResponse,
+    ActiveSessionGetResponse,
+)
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/access/users/{user_id}/active_sessions">client.zero_trust.access.users.active_sessions.<a href="./src/cloudflare/resources/zero_trust/access/users/active_sessions.py">list</a>(user_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/users/active_session_list_response.py">SyncSinglePage[ActiveSessionListResponse]</a></code>
+- <code title="get /accounts/{account_id}/access/users/{user_id}/active_sessions/{nonce}">client.zero_trust.access.users.active_sessions.<a href="./src/cloudflare/resources/zero_trust/access/users/active_sessions.py">get</a>(nonce, \*, account_id, user_id) -> <a href="./src/cloudflare/types/zero_trust/access/users/active_session_get_response.py">Optional[ActiveSessionGetResponse]</a></code>
+
+#### LastSeenIdentity
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access.users import Identity
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/access/users/{user_id}/last_seen_identity">client.zero_trust.access.users.last_seen_identity.<a href="./src/cloudflare/resources/zero_trust/access/users/last_seen_identity.py">get</a>(user_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/users/identity.py">Optional[Identity]</a></code>
+
+#### FailedLogins
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access.users import FailedLoginListResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/access/users/{user_id}/failed_logins">client.zero_trust.access.users.failed_logins.<a href="./src/cloudflare/resources/zero_trust/access/users/failed_logins.py">list</a>(user_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/users/failed_login_list_response.py">SyncSinglePage[FailedLoginListResponse]</a></code>
+
+### CustomPages
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access import (
+    CustomPage,
+    CustomPageWithoutHTML,
+    CustomPageDeleteResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/access/custom_pages">client.zero_trust.access.custom_pages.<a href="./src/cloudflare/resources/zero_trust/access/custom_pages.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/custom_page_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/custom_page_without_html.py">Optional[CustomPageWithoutHTML]</a></code>
+- <code title="put /accounts/{account_id}/access/custom_pages/{custom_page_id}">client.zero_trust.access.custom_pages.<a href="./src/cloudflare/resources/zero_trust/access/custom_pages.py">update</a>(custom_page_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/custom_page_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/custom_page_without_html.py">Optional[CustomPageWithoutHTML]</a></code>
+- <code title="get /accounts/{account_id}/access/custom_pages">client.zero_trust.access.custom_pages.<a href="./src/cloudflare/resources/zero_trust/access/custom_pages.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/custom_page_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/custom_page_without_html.py">SyncV4PagePaginationArray[CustomPageWithoutHTML]</a></code>
+- <code title="delete /accounts/{account_id}/access/custom_pages/{custom_page_id}">client.zero_trust.access.custom_pages.<a href="./src/cloudflare/resources/zero_trust/access/custom_pages.py">delete</a>(custom_page_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/custom_page_delete_response.py">Optional[CustomPageDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/access/custom_pages/{custom_page_id}">client.zero_trust.access.custom_pages.<a href="./src/cloudflare/resources/zero_trust/access/custom_pages.py">get</a>(custom_page_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/custom_page.py">Optional[CustomPage]</a></code>
+
+### Tags
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access import Tag, TagDeleteResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/access/tags">client.zero_trust.access.tags.<a href="./src/cloudflare/resources/zero_trust/access/tags.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/tag_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/tag.py">Optional[Tag]</a></code>
+- <code title="put /accounts/{account_id}/access/tags/{tag_name}">client.zero_trust.access.tags.<a href="./src/cloudflare/resources/zero_trust/access/tags.py">update</a>(tag_name, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/tag_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/tag.py">Optional[Tag]</a></code>
+- <code title="get /accounts/{account_id}/access/tags">client.zero_trust.access.tags.<a href="./src/cloudflare/resources/zero_trust/access/tags.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/tag_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/tag.py">SyncV4PagePaginationArray[Tag]</a></code>
+- <code title="delete /accounts/{account_id}/access/tags/{tag_name}">client.zero_trust.access.tags.<a href="./src/cloudflare/resources/zero_trust/access/tags.py">delete</a>(tag_name, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/tag_delete_response.py">Optional[TagDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/access/tags/{tag_name}">client.zero_trust.access.tags.<a href="./src/cloudflare/resources/zero_trust/access/tags.py">get</a>(tag_name, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/tag.py">Optional[Tag]</a></code>
+
+### Policies
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.access import (
+    ApprovalGroup,
+    Policy,
+    PolicyCreateResponse,
+    PolicyUpdateResponse,
+    PolicyListResponse,
+    PolicyDeleteResponse,
+    PolicyGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/access/policies">client.zero_trust.access.policies.<a href="./src/cloudflare/resources/zero_trust/access/policies.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/policy_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/policy_create_response.py">Optional[PolicyCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/access/policies/{policy_id}">client.zero_trust.access.policies.<a href="./src/cloudflare/resources/zero_trust/access/policies.py">update</a>(policy_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/policy_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/policy_update_response.py">Optional[PolicyUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/access/policies">client.zero_trust.access.policies.<a href="./src/cloudflare/resources/zero_trust/access/policies.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/policy_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/policy_list_response.py">SyncV4PagePaginationArray[PolicyListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/access/policies/{policy_id}">client.zero_trust.access.policies.<a href="./src/cloudflare/resources/zero_trust/access/policies.py">delete</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/policy_delete_response.py">Optional[PolicyDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/access/policies/{policy_id}">client.zero_trust.access.policies.<a href="./src/cloudflare/resources/zero_trust/access/policies.py">get</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/policy_get_response.py">Optional[PolicyGetResponse]</a></code>
+
+## DEX
+
+Types:
+
+```python
+from cloudflare.types.zero_trust import (
+    DigitalExperienceMonitor,
+    NetworkPath,
+    NetworkPathResponse,
+    Percentiles,
+)
+```
+
+### WARPChangeEvents
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dex import WARPChangeEventGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/warp-change-events">client.zero_trust.dex.warp_change_events.<a href="./src/cloudflare/resources/zero_trust/dex/warp_change_events.py">get</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/warp_change_event_get_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/warp_change_event_get_response.py">Optional[WARPChangeEventGetResponse]</a></code>
+
+### Commands
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dex import CommandCreateResponse, CommandListResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dex/commands">client.zero_trust.dex.commands.<a href="./src/cloudflare/resources/zero_trust/dex/commands/commands.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/command_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/command_create_response.py">Optional[CommandCreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/dex/commands">client.zero_trust.dex.commands.<a href="./src/cloudflare/resources/zero_trust/dex/commands/commands.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/command_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/command_list_response.py">SyncV4PagePagination[Optional[CommandListResponse]]</a></code>
+
+#### Devices
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dex.commands import DeviceListResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/commands/devices">client.zero_trust.dex.commands.devices.<a href="./src/cloudflare/resources/zero_trust/dex/commands/devices.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/commands/device_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/commands/device_list_response.py">SyncV4PagePagination[Optional[DeviceListResponse]]</a></code>
+
+#### Downloads
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/commands/{command_id}/downloads/{filename}">client.zero_trust.dex.commands.downloads.<a href="./src/cloudflare/resources/zero_trust/dex/commands/downloads.py">get</a>(filename, \*, account_id, command_id) -> BinaryAPIResponse</code>
+
+#### Quota
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dex.commands import QuotaGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/commands/quota">client.zero_trust.dex.commands.quota.<a href="./src/cloudflare/resources/zero_trust/dex/commands/quota.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dex/commands/quota_get_response.py">Optional[QuotaGetResponse]</a></code>
+
+### Colos
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dex import ColoListResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/colos">client.zero_trust.dex.colos.<a href="./src/cloudflare/resources/zero_trust/dex/colos.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/colo_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/colo_list_response.py">SyncSinglePage[ColoListResponse]</a></code>
+
+### FleetStatus
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dex import (
+    LiveStat,
+    FleetStatusLiveResponse,
+    FleetStatusOverTimeResponse,
+)
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/fleet-status/live">client.zero_trust.dex.fleet_status.<a href="./src/cloudflare/resources/zero_trust/dex/fleet_status/fleet_status.py">live</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/fleet_status_live_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/fleet_status_live_response.py">Optional[FleetStatusLiveResponse]</a></code>
+- <code title="get /accounts/{account_id}/dex/fleet-status/over-time">client.zero_trust.dex.fleet_status.<a href="./src/cloudflare/resources/zero_trust/dex/fleet_status/fleet_status.py">over_time</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/fleet_status_over_time_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/fleet_status_over_time_response.py">Optional[FleetStatusOverTimeResponse]</a></code>
+
+#### Devices
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dex.fleet_status import DeviceListResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/fleet-status/devices">client.zero_trust.dex.fleet_status.devices.<a href="./src/cloudflare/resources/zero_trust/dex/fleet_status/devices.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/fleet_status/device_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/fleet_status/device_list_response.py">SyncV4PagePaginationArray[DeviceListResponse]</a></code>
+
+### HTTPTests
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dex import HTTPDetails
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/http-tests/{test_id}">client.zero_trust.dex.http_tests.<a href="./src/cloudflare/resources/zero_trust/dex/http_tests/http_tests.py">get</a>(test_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/http_test_get_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/http_details.py">Optional[HTTPDetails]</a></code>
+
+#### Percentiles
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dex.http_tests import HTTPDetailsPercentiles, TestStatOverTime
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/http-tests/{test_id}/percentiles">client.zero_trust.dex.http_tests.percentiles.<a href="./src/cloudflare/resources/zero_trust/dex/http_tests/percentiles.py">get</a>(test_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/http_tests/percentile_get_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/http_tests/http_details_percentiles.py">Optional[HTTPDetailsPercentiles]</a></code>
+
+### Tests
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dex import AggregateTimePeriod, Tests
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/tests/overview">client.zero_trust.dex.tests.<a href="./src/cloudflare/resources/zero_trust/dex/tests/tests.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/test_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/tests/tests.py">SyncV4PagePagination[Optional[Tests]]</a></code>
+
+#### UniqueDevices
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dex.tests import UniqueDevices
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/tests/unique-devices">client.zero_trust.dex.tests.unique_devices.<a href="./src/cloudflare/resources/zero_trust/dex/tests/unique_devices.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/tests/unique_device_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/tests/unique_devices.py">Optional[UniqueDevices]</a></code>
+
+### TracerouteTestResults
+
+#### NetworkPath
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dex.traceroute_test_results import NetworkPathGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/traceroute-test-results/{test_result_id}/network-path">client.zero_trust.dex.traceroute_test_results.network_path.<a href="./src/cloudflare/resources/zero_trust/dex/traceroute_test_results/network_path.py">get</a>(test_result_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dex/traceroute_test_results/network_path_get_response.py">Optional[NetworkPathGetResponse]</a></code>
+
+### TracerouteTests
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dex import Traceroute, TracerouteTestPercentilesResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/traceroute-tests/{test_id}">client.zero_trust.dex.traceroute_tests.<a href="./src/cloudflare/resources/zero_trust/dex/traceroute_tests.py">get</a>(test_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/traceroute_test_get_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/traceroute.py">Optional[Traceroute]</a></code>
+- <code title="get /accounts/{account_id}/dex/traceroute-tests/{test_id}/network-path">client.zero_trust.dex.traceroute_tests.<a href="./src/cloudflare/resources/zero_trust/dex/traceroute_tests.py">network_path</a>(test_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/traceroute_test_network_path_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/network_path_response.py">Optional[NetworkPathResponse]</a></code>
+- <code title="get /accounts/{account_id}/dex/traceroute-tests/{test_id}/percentiles">client.zero_trust.dex.traceroute_tests.<a href="./src/cloudflare/resources/zero_trust/dex/traceroute_tests.py">percentiles</a>(test_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/traceroute_test_percentiles_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/traceroute_test_percentiles_response.py">Optional[TracerouteTestPercentilesResponse]</a></code>
+
+## Tunnels
+
+Types:
+
+```python
+from cloudflare.types.zero_trust import Connection, TunnelListResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/tunnels">client.zero_trust.tunnels.<a href="./src/cloudflare/resources/zero_trust/tunnels/tunnels.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnel_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/tunnel_list_response.py">SyncV4PagePaginationArray[TunnelListResponse]</a></code>
+
+### Cloudflared
+
+Methods:
+
+- <code title="post /accounts/{account_id}/cfd_tunnel">client.zero_trust.tunnels.cloudflared.<a href="./src/cloudflare/resources/zero_trust/tunnels/cloudflared/cloudflared.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnels/cloudflared_create_params.py">params</a>) -> <a href="./src/cloudflare/types/shared/cloudflare_tunnel.py">CloudflareTunnel</a></code>
+- <code title="get /accounts/{account_id}/cfd_tunnel">client.zero_trust.tunnels.cloudflared.<a href="./src/cloudflare/resources/zero_trust/tunnels/cloudflared/cloudflared.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnels/cloudflared_list_params.py">params</a>) -> <a href="./src/cloudflare/types/shared/cloudflare_tunnel.py">SyncV4PagePaginationArray[CloudflareTunnel]</a></code>
+- <code title="delete /accounts/{account_id}/cfd_tunnel/{tunnel_id}">client.zero_trust.tunnels.cloudflared.<a href="./src/cloudflare/resources/zero_trust/tunnels/cloudflared/cloudflared.py">delete</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/shared/cloudflare_tunnel.py">CloudflareTunnel</a></code>
+- <code title="patch /accounts/{account_id}/cfd_tunnel/{tunnel_id}">client.zero_trust.tunnels.cloudflared.<a href="./src/cloudflare/resources/zero_trust/tunnels/cloudflared/cloudflared.py">edit</a>(tunnel_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnels/cloudflared_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/shared/cloudflare_tunnel.py">CloudflareTunnel</a></code>
+- <code title="get /accounts/{account_id}/cfd_tunnel/{tunnel_id}">client.zero_trust.tunnels.cloudflared.<a href="./src/cloudflare/resources/zero_trust/tunnels/cloudflared/cloudflared.py">get</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/shared/cloudflare_tunnel.py">CloudflareTunnel</a></code>
+
+#### Configurations
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.tunnels.cloudflared import (
+    ConfigurationUpdateResponse,
+    ConfigurationGetResponse,
+)
+```
+
+Methods:
+
+- <code title="put /accounts/{account_id}/cfd_tunnel/{tunnel_id}/configurations">client.zero_trust.tunnels.cloudflared.configurations.<a href="./src/cloudflare/resources/zero_trust/tunnels/cloudflared/configurations.py">update</a>(tunnel_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnels/cloudflared/configuration_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/tunnels/cloudflared/configuration_update_response.py">Optional[ConfigurationUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/cfd_tunnel/{tunnel_id}/configurations">client.zero_trust.tunnels.cloudflared.configurations.<a href="./src/cloudflare/resources/zero_trust/tunnels/cloudflared/configurations.py">get</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/tunnels/cloudflared/configuration_get_response.py">Optional[ConfigurationGetResponse]</a></code>
+
+#### Connections
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.tunnels.cloudflared import Client
+```
+
+Methods:
+
+- <code title="delete /accounts/{account_id}/cfd_tunnel/{tunnel_id}/connections">client.zero_trust.tunnels.cloudflared.connections.<a href="./src/cloudflare/resources/zero_trust/tunnels/cloudflared/connections.py">delete</a>(tunnel_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnels/cloudflared/connection_delete_params.py">params</a>) -> object</code>
+- <code title="get /accounts/{account_id}/cfd_tunnel/{tunnel_id}/connections">client.zero_trust.tunnels.cloudflared.connections.<a href="./src/cloudflare/resources/zero_trust/tunnels/cloudflared/connections.py">get</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/tunnels/cloudflared/client.py">SyncSinglePage[Client]</a></code>
+
+#### Token
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.tunnels.cloudflared import TokenGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/cfd_tunnel/{tunnel_id}/token">client.zero_trust.tunnels.cloudflared.token.<a href="./src/cloudflare/resources/zero_trust/tunnels/cloudflared/token.py">get</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/tunnels/cloudflared/token_get_response.py">str</a></code>
+
+#### Connectors
+
+Methods:
+
+- <code title="get /accounts/{account_id}/cfd_tunnel/{tunnel_id}/connectors/{connector_id}">client.zero_trust.tunnels.cloudflared.connectors.<a href="./src/cloudflare/resources/zero_trust/tunnels/cloudflared/connectors.py">get</a>(connector_id, \*, account_id, tunnel_id) -> <a href="./src/cloudflare/types/zero_trust/tunnels/cloudflared/client.py">Client</a></code>
+
+#### Management
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.tunnels.cloudflared import ManagementCreateResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/cfd_tunnel/{tunnel_id}/management">client.zero_trust.tunnels.cloudflared.management.<a href="./src/cloudflare/resources/zero_trust/tunnels/cloudflared/management.py">create</a>(tunnel_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnels/cloudflared/management_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/tunnels/cloudflared/management_create_response.py">str</a></code>
+
+### WARPConnector
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.tunnels import (
+    WARPConnectorCreateResponse,
+    WARPConnectorListResponse,
+    WARPConnectorDeleteResponse,
+    WARPConnectorEditResponse,
+    WARPConnectorGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/warp_connector">client.zero_trust.tunnels.warp_connector.<a href="./src/cloudflare/resources/zero_trust/tunnels/warp_connector/warp_connector.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnels/warp_connector_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/tunnels/warp_connector_create_response.py">WARPConnectorCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/warp_connector">client.zero_trust.tunnels.warp_connector.<a href="./src/cloudflare/resources/zero_trust/tunnels/warp_connector/warp_connector.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnels/warp_connector_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/tunnels/warp_connector_list_response.py">SyncV4PagePaginationArray[WARPConnectorListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/warp_connector/{tunnel_id}">client.zero_trust.tunnels.warp_connector.<a href="./src/cloudflare/resources/zero_trust/tunnels/warp_connector/warp_connector.py">delete</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/tunnels/warp_connector_delete_response.py">WARPConnectorDeleteResponse</a></code>
+- <code title="patch /accounts/{account_id}/warp_connector/{tunnel_id}">client.zero_trust.tunnels.warp_connector.<a href="./src/cloudflare/resources/zero_trust/tunnels/warp_connector/warp_connector.py">edit</a>(tunnel_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnels/warp_connector_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/tunnels/warp_connector_edit_response.py">WARPConnectorEditResponse</a></code>
+- <code title="get /accounts/{account_id}/warp_connector/{tunnel_id}">client.zero_trust.tunnels.warp_connector.<a href="./src/cloudflare/resources/zero_trust/tunnels/warp_connector/warp_connector.py">get</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/tunnels/warp_connector_get_response.py">WARPConnectorGetResponse</a></code>
+
+#### Token
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.tunnels.warp_connector import TokenGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/warp_connector/{tunnel_id}/token">client.zero_trust.tunnels.warp_connector.token.<a href="./src/cloudflare/resources/zero_trust/tunnels/warp_connector/token.py">get</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/tunnels/warp_connector/token_get_response.py">str</a></code>
+
+## ConnectivitySettings
+
+Types:
+
+```python
+from cloudflare.types.zero_trust import (
+    ConnectivitySettingEditResponse,
+    ConnectivitySettingGetResponse,
+)
+```
+
+Methods:
+
+- <code title="patch /accounts/{account_id}/zerotrust/connectivity_settings">client.zero_trust.connectivity_settings.<a href="./src/cloudflare/resources/zero_trust/connectivity_settings.py">edit</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/connectivity_setting_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/connectivity_setting_edit_response.py">ConnectivitySettingEditResponse</a></code>
+- <code title="get /accounts/{account_id}/zerotrust/connectivity_settings">client.zero_trust.connectivity_settings.<a href="./src/cloudflare/resources/zero_trust/connectivity_settings.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/connectivity_setting_get_response.py">ConnectivitySettingGetResponse</a></code>
+
+## DLP
+
+### Datasets
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dlp import (
+    Dataset,
+    DatasetArray,
+    DatasetCreation,
+    DatasetCreateResponse,
+    DatasetUpdateResponse,
+    DatasetGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dlp/datasets">client.zero_trust.dlp.datasets.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/dataset_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/dataset_create_response.py">Optional[DatasetCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/dlp/datasets/{dataset_id}">client.zero_trust.dlp.datasets.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py">update</a>(dataset_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/dataset_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/dataset_update_response.py">Optional[DatasetUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/dlp/datasets">client.zero_trust.dlp.datasets.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/dataset.py">SyncSinglePage[Dataset]</a></code>
+- <code title="delete /accounts/{account_id}/dlp/datasets/{dataset_id}">client.zero_trust.dlp.datasets.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py">delete</a>(dataset_id, \*, account_id) -> None</code>
+- <code title="get /accounts/{account_id}/dlp/datasets/{dataset_id}">client.zero_trust.dlp.datasets.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py">get</a>(dataset_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/dataset_get_response.py">Optional[DatasetGetResponse]</a></code>
+
+#### Upload
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dlp.datasets import (
+    NewVersion,
+    UploadCreateResponse,
+    UploadEditResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dlp/datasets/{dataset_id}/upload">client.zero_trust.dlp.datasets.upload.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/upload.py">create</a>(dataset_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/datasets/upload_create_response.py">Optional[UploadCreateResponse]</a></code>
+- <code title="post /accounts/{account_id}/dlp/datasets/{dataset_id}/upload/{version}">client.zero_trust.dlp.datasets.upload.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/upload.py">edit</a>(version, dataset, \*, account_id, dataset_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/datasets/upload_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/datasets/upload_edit_response.py">Optional[UploadEditResponse]</a></code>
+
+#### Versions
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dlp.datasets import VersionCreateResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dlp/datasets/{dataset_id}/versions/{version}">client.zero_trust.dlp.datasets.versions.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/versions/versions.py">create</a>(version, \*, account_id, dataset_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/datasets/version_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/datasets/version_create_response.py">SyncSinglePage[VersionCreateResponse]</a></code>
+
+##### Entries
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dlp.datasets.versions import EntryCreateResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dlp/datasets/{dataset_id}/versions/{version}/entries/{entry_id}">client.zero_trust.dlp.datasets.versions.entries.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/versions/entries.py">create</a>(entry_id, dataset_version_entry, \*, account_id, dataset_id, version, \*\*<a href="src/cloudflare/types/zero_trust/dlp/datasets/versions/entry_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/datasets/versions/entry_create_response.py">Optional[EntryCreateResponse]</a></code>
+
+### Patterns
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dlp import PatternValidateResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dlp/patterns/validate">client.zero_trust.dlp.patterns.<a href="./src/cloudflare/resources/zero_trust/dlp/patterns.py">validate</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/pattern_validate_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/pattern_validate_response.py">Optional[PatternValidateResponse]</a></code>
+
+### PayloadLogs
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dlp import PayloadLogUpdateResponse, PayloadLogGetResponse
+```
+
+Methods:
+
+- <code title="put /accounts/{account_id}/dlp/payload_log">client.zero_trust.dlp.payload_logs.<a href="./src/cloudflare/resources/zero_trust/dlp/payload_logs.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/payload_log_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/payload_log_update_response.py">Optional[PayloadLogUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/dlp/payload_log">client.zero_trust.dlp.payload_logs.<a href="./src/cloudflare/resources/zero_trust/dlp/payload_logs.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/payload_log_get_response.py">Optional[PayloadLogGetResponse]</a></code>
+
+### Email
+
+#### AccountMapping
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dlp.email import (
+    AccountMappingCreateResponse,
+    AccountMappingGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dlp/email/account_mapping">client.zero_trust.dlp.email.account_mapping.<a href="./src/cloudflare/resources/zero_trust/dlp/email/account_mapping.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/email/account_mapping_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/email/account_mapping_create_response.py">Optional[AccountMappingCreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/dlp/email/account_mapping">client.zero_trust.dlp.email.account_mapping.<a href="./src/cloudflare/resources/zero_trust/dlp/email/account_mapping.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/email/account_mapping_get_response.py">Optional[AccountMappingGetResponse]</a></code>
+
+#### Rules
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dlp.email import (
+    RuleCreateResponse,
+    RuleUpdateResponse,
+    RuleListResponse,
+    RuleDeleteResponse,
+    RuleBulkEditResponse,
+    RuleGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dlp/email/rules">client.zero_trust.dlp.email.rules.<a href="./src/cloudflare/resources/zero_trust/dlp/email/rules.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/email/rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/email/rule_create_response.py">Optional[RuleCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/dlp/email/rules/{rule_id}">client.zero_trust.dlp.email.rules.<a href="./src/cloudflare/resources/zero_trust/dlp/email/rules.py">update</a>(rule_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/email/rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/email/rule_update_response.py">Optional[RuleUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/dlp/email/rules">client.zero_trust.dlp.email.rules.<a href="./src/cloudflare/resources/zero_trust/dlp/email/rules.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/email/rule_list_response.py">SyncSinglePage[RuleListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/dlp/email/rules/{rule_id}">client.zero_trust.dlp.email.rules.<a href="./src/cloudflare/resources/zero_trust/dlp/email/rules.py">delete</a>(rule_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/email/rule_delete_response.py">Optional[RuleDeleteResponse]</a></code>
+- <code title="patch /accounts/{account_id}/dlp/email/rules">client.zero_trust.dlp.email.rules.<a href="./src/cloudflare/resources/zero_trust/dlp/email/rules.py">bulk_edit</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/email/rule_bulk_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/email/rule_bulk_edit_response.py">Optional[RuleBulkEditResponse]</a></code>
+- <code title="get /accounts/{account_id}/dlp/email/rules/{rule_id}">client.zero_trust.dlp.email.rules.<a href="./src/cloudflare/resources/zero_trust/dlp/email/rules.py">get</a>(rule_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/email/rule_get_response.py">Optional[RuleGetResponse]</a></code>
+
+### Profiles
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dlp import (
+    ContextAwareness,
+    Profile,
+    SkipConfiguration,
+    ProfileGetResponse,
+)
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dlp/profiles">client.zero_trust.dlp.profiles.<a href="./src/cloudflare/resources/zero_trust/dlp/profiles/profiles.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/profile_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/profile.py">SyncSinglePage[Profile]</a></code>
+- <code title="get /accounts/{account_id}/dlp/profiles/{profile_id}">client.zero_trust.dlp.profiles.<a href="./src/cloudflare/resources/zero_trust/dlp/profiles/profiles.py">get</a>(profile_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/profile_get_response.py">Optional[ProfileGetResponse]</a></code>
+
+#### Custom
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dlp.profiles import (
+    CustomProfile,
+    Pattern,
+    CustomCreateResponse,
+    CustomUpdateResponse,
+    CustomGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dlp/profiles/custom">client.zero_trust.dlp.profiles.custom.<a href="./src/cloudflare/resources/zero_trust/dlp/profiles/custom.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/profiles/custom_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/profiles/custom_create_response.py">Optional[CustomCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/dlp/profiles/custom/{profile_id}">client.zero_trust.dlp.profiles.custom.<a href="./src/cloudflare/resources/zero_trust/dlp/profiles/custom.py">update</a>(profile_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/profiles/custom_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/profiles/custom_update_response.py">Optional[CustomUpdateResponse]</a></code>
+- <code title="delete /accounts/{account_id}/dlp/profiles/custom/{profile_id}">client.zero_trust.dlp.profiles.custom.<a href="./src/cloudflare/resources/zero_trust/dlp/profiles/custom.py">delete</a>(profile_id, \*, account_id) -> object</code>
+- <code title="get /accounts/{account_id}/dlp/profiles/custom/{profile_id}">client.zero_trust.dlp.profiles.custom.<a href="./src/cloudflare/resources/zero_trust/dlp/profiles/custom.py">get</a>(profile_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/profiles/custom_get_response.py">Optional[CustomGetResponse]</a></code>
+
+#### Predefined
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dlp.profiles import (
+    PredefinedProfile,
+    PredefinedUpdateResponse,
+    PredefinedGetResponse,
+)
+```
+
+Methods:
+
+- <code title="put /accounts/{account_id}/dlp/profiles/predefined/{profile_id}/config">client.zero_trust.dlp.profiles.predefined.<a href="./src/cloudflare/resources/zero_trust/dlp/profiles/predefined.py">update</a>(profile_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/profiles/predefined_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/profiles/predefined_update_response.py">Optional[PredefinedUpdateResponse]</a></code>
+- <code title="delete /accounts/{account_id}/dlp/profiles/predefined/{profile_id}">client.zero_trust.dlp.profiles.predefined.<a href="./src/cloudflare/resources/zero_trust/dlp/profiles/predefined.py">delete</a>(profile_id, \*, account_id) -> object</code>
+- <code title="get /accounts/{account_id}/dlp/profiles/predefined/{profile_id}/config">client.zero_trust.dlp.profiles.predefined.<a href="./src/cloudflare/resources/zero_trust/dlp/profiles/predefined.py">get</a>(profile_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/profiles/predefined_get_response.py">Optional[PredefinedGetResponse]</a></code>
+
+### Limits
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dlp import LimitListResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dlp/limits">client.zero_trust.dlp.limits.<a href="./src/cloudflare/resources/zero_trust/dlp/limits.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/limit_list_response.py">Optional[LimitListResponse]</a></code>
+
+### Entries
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dlp import (
+    EntryCreateResponse,
+    EntryUpdateResponse,
+    EntryListResponse,
+    EntryGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dlp/entries">client.zero_trust.dlp.entries.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/entries.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/entry_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/entry_create_response.py">Optional[EntryCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/dlp/entries/{entry_id}">client.zero_trust.dlp.entries.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/entries.py">update</a>(entry_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/entry_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/entry_update_response.py">Optional[EntryUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/dlp/entries">client.zero_trust.dlp.entries.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/entries.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/entry_list_response.py">SyncSinglePage[EntryListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/dlp/entries/{entry_id}">client.zero_trust.dlp.entries.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/entries.py">delete</a>(entry_id, \*, account_id) -> object</code>
+- <code title="get /accounts/{account_id}/dlp/entries/{entry_id}">client.zero_trust.dlp.entries.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/entries.py">get</a>(entry_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/entry_get_response.py">Optional[EntryGetResponse]</a></code>
+
+#### Custom
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dlp.entries import (
+    CustomCreateResponse,
+    CustomUpdateResponse,
+    CustomListResponse,
+    CustomGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dlp/entries">client.zero_trust.dlp.entries.custom.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/custom.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/entries/custom_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/entries/custom_create_response.py">Optional[CustomCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/dlp/entries/custom/{entry_id}">client.zero_trust.dlp.entries.custom.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/custom.py">update</a>(entry_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/entries/custom_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/entries/custom_update_response.py">Optional[CustomUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/dlp/entries">client.zero_trust.dlp.entries.custom.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/custom.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/entries/custom_list_response.py">SyncSinglePage[CustomListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/dlp/entries/{entry_id}">client.zero_trust.dlp.entries.custom.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/custom.py">delete</a>(entry_id, \*, account_id) -> object</code>
+- <code title="get /accounts/{account_id}/dlp/entries/{entry_id}">client.zero_trust.dlp.entries.custom.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/custom.py">get</a>(entry_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/entries/custom_get_response.py">Optional[CustomGetResponse]</a></code>
+
+#### Predefined
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dlp.entries import (
+    PredefinedCreateResponse,
+    PredefinedUpdateResponse,
+    PredefinedListResponse,
+    PredefinedGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dlp/entries/predefined">client.zero_trust.dlp.entries.predefined.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/predefined.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/entries/predefined_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/entries/predefined_create_response.py">Optional[PredefinedCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/dlp/entries/predefined/{entry_id}">client.zero_trust.dlp.entries.predefined.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/predefined.py">update</a>(entry_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/entries/predefined_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/entries/predefined_update_response.py">Optional[PredefinedUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/dlp/entries">client.zero_trust.dlp.entries.predefined.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/predefined.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/entries/predefined_list_response.py">SyncSinglePage[PredefinedListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/dlp/entries/predefined/{entry_id}">client.zero_trust.dlp.entries.predefined.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/predefined.py">delete</a>(entry_id, \*, account_id) -> object</code>
+- <code title="get /accounts/{account_id}/dlp/entries/{entry_id}">client.zero_trust.dlp.entries.predefined.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/predefined.py">get</a>(entry_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/entries/predefined_get_response.py">Optional[PredefinedGetResponse]</a></code>
+
+#### Integration
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.dlp.entries import (
+    IntegrationCreateResponse,
+    IntegrationUpdateResponse,
+    IntegrationListResponse,
+    IntegrationGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dlp/entries/integration">client.zero_trust.dlp.entries.integration.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/integration.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/entries/integration_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/entries/integration_create_response.py">Optional[IntegrationCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/dlp/entries/integration/{entry_id}">client.zero_trust.dlp.entries.integration.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/integration.py">update</a>(entry_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/entries/integration_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/entries/integration_update_response.py">Optional[IntegrationUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/dlp/entries">client.zero_trust.dlp.entries.integration.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/integration.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/entries/integration_list_response.py">SyncSinglePage[IntegrationListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/dlp/entries/integration/{entry_id}">client.zero_trust.dlp.entries.integration.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/integration.py">delete</a>(entry_id, \*, account_id) -> object</code>
+- <code title="get /accounts/{account_id}/dlp/entries/{entry_id}">client.zero_trust.dlp.entries.integration.<a href="./src/cloudflare/resources/zero_trust/dlp/entries/integration.py">get</a>(entry_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/entries/integration_get_response.py">Optional[IntegrationGetResponse]</a></code>
+
+## Gateway
+
+Types:
+
+```python
+from cloudflare.types.zero_trust import GatewayCreateResponse, GatewayListResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/gateway">client.zero_trust.gateway.<a href="./src/cloudflare/resources/zero_trust/gateway/gateway.py">create</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway_create_response.py">Optional[GatewayCreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/gateway">client.zero_trust.gateway.<a href="./src/cloudflare/resources/zero_trust/gateway/gateway.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway_list_response.py">Optional[GatewayListResponse]</a></code>
+
+### AuditSSHSettings
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.gateway import GatewaySettings
+```
+
+Methods:
+
+- <code title="put /accounts/{account_id}/gateway/audit_ssh_settings">client.zero_trust.gateway.audit_ssh_settings.<a href="./src/cloudflare/resources/zero_trust/gateway/audit_ssh_settings.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/audit_ssh_setting_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_settings.py">Optional[GatewaySettings]</a></code>
+- <code title="get /accounts/{account_id}/gateway/audit_ssh_settings">client.zero_trust.gateway.audit_ssh_settings.<a href="./src/cloudflare/resources/zero_trust/gateway/audit_ssh_settings.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_settings.py">Optional[GatewaySettings]</a></code>
+- <code title="post /accounts/{account_id}/gateway/audit_ssh_settings/rotate_seed">client.zero_trust.gateway.audit_ssh_settings.<a href="./src/cloudflare/resources/zero_trust/gateway/audit_ssh_settings.py">rotate_seed</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_settings.py">Optional[GatewaySettings]</a></code>
+
+### Categories
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.gateway import Category
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/gateway/categories">client.zero_trust.gateway.categories.<a href="./src/cloudflare/resources/zero_trust/gateway/categories.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/category.py">SyncSinglePage[Category]</a></code>
+
+### AppTypes
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.gateway import AppType
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/gateway/app_types">client.zero_trust.gateway.app_types.<a href="./src/cloudflare/resources/zero_trust/gateway/app_types.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/app_type.py">SyncSinglePage[AppType]</a></code>
+
+### Configurations
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.gateway import (
+    ActivityLogSettings,
+    AntiVirusSettings,
+    BlockPageSettings,
+    BodyScanningSettings,
+    BrowserIsolationSettings,
+    CustomCertificateSettings,
+    ExtendedEmailMatching,
+    FipsSettings,
+    GatewayConfigurationSettings,
+    NotificationSettings,
+    ProtocolDetection,
+    TLSSettings,
+    ConfigurationUpdateResponse,
+    ConfigurationEditResponse,
+    ConfigurationGetResponse,
+)
+```
+
+Methods:
+
+- <code title="put /accounts/{account_id}/gateway/configuration">client.zero_trust.gateway.configurations.<a href="./src/cloudflare/resources/zero_trust/gateway/configurations/configurations.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/configuration_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/configuration_update_response.py">Optional[ConfigurationUpdateResponse]</a></code>
+- <code title="patch /accounts/{account_id}/gateway/configuration">client.zero_trust.gateway.configurations.<a href="./src/cloudflare/resources/zero_trust/gateway/configurations/configurations.py">edit</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/configuration_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/configuration_edit_response.py">Optional[ConfigurationEditResponse]</a></code>
+- <code title="get /accounts/{account_id}/gateway/configuration">client.zero_trust.gateway.configurations.<a href="./src/cloudflare/resources/zero_trust/gateway/configurations/configurations.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/configuration_get_response.py">Optional[ConfigurationGetResponse]</a></code>
+
+#### CustomCertificate
+
+Methods:
+
+- <code title="get /accounts/{account_id}/gateway/configuration/custom_certificate">client.zero_trust.gateway.configurations.custom_certificate.<a href="./src/cloudflare/resources/zero_trust/gateway/configurations/custom_certificate.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/custom_certificate_settings.py">Optional[CustomCertificateSettings]</a></code>
+
+### Lists
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.gateway import GatewayItem, GatewayList, ListCreateResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/gateway/lists">client.zero_trust.gateway.lists.<a href="./src/cloudflare/resources/zero_trust/gateway/lists/lists.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/list_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/list_create_response.py">Optional[ListCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/gateway/lists/{list_id}">client.zero_trust.gateway.lists.<a href="./src/cloudflare/resources/zero_trust/gateway/lists/lists.py">update</a>(list_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/list_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_list.py">Optional[GatewayList]</a></code>
+- <code title="get /accounts/{account_id}/gateway/lists">client.zero_trust.gateway.lists.<a href="./src/cloudflare/resources/zero_trust/gateway/lists/lists.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/list_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_list.py">SyncSinglePage[GatewayList]</a></code>
+- <code title="delete /accounts/{account_id}/gateway/lists/{list_id}">client.zero_trust.gateway.lists.<a href="./src/cloudflare/resources/zero_trust/gateway/lists/lists.py">delete</a>(list_id, \*, account_id) -> object</code>
+- <code title="patch /accounts/{account_id}/gateway/lists/{list_id}">client.zero_trust.gateway.lists.<a href="./src/cloudflare/resources/zero_trust/gateway/lists/lists.py">edit</a>(list_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/list_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_list.py">Optional[GatewayList]</a></code>
+- <code title="get /accounts/{account_id}/gateway/lists/{list_id}">client.zero_trust.gateway.lists.<a href="./src/cloudflare/resources/zero_trust/gateway/lists/lists.py">get</a>(list_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_list.py">Optional[GatewayList]</a></code>
+
+#### Items
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.gateway.lists import ItemListResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/gateway/lists/{list_id}/items">client.zero_trust.gateway.lists.items.<a href="./src/cloudflare/resources/zero_trust/gateway/lists/items.py">list</a>(list_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/lists/item_list_response.py">SyncSinglePage[ItemListResponse]</a></code>
+
+### Locations
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.gateway import (
+    DOHEndpoint,
+    DOTEndpoint,
+    Endpoint,
+    IPNetwork,
+    IPV4Endpoint,
+    IPV6Endpoint,
+    IPV6Network,
+    Location,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/gateway/locations">client.zero_trust.gateway.locations.<a href="./src/cloudflare/resources/zero_trust/gateway/locations.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/location_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/location.py">Optional[Location]</a></code>
+- <code title="put /accounts/{account_id}/gateway/locations/{location_id}">client.zero_trust.gateway.locations.<a href="./src/cloudflare/resources/zero_trust/gateway/locations.py">update</a>(location_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/location_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/location.py">Optional[Location]</a></code>
+- <code title="get /accounts/{account_id}/gateway/locations">client.zero_trust.gateway.locations.<a href="./src/cloudflare/resources/zero_trust/gateway/locations.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/location.py">SyncSinglePage[Location]</a></code>
+- <code title="delete /accounts/{account_id}/gateway/locations/{location_id}">client.zero_trust.gateway.locations.<a href="./src/cloudflare/resources/zero_trust/gateway/locations.py">delete</a>(location_id, \*, account_id) -> object</code>
+- <code title="get /accounts/{account_id}/gateway/locations/{location_id}">client.zero_trust.gateway.locations.<a href="./src/cloudflare/resources/zero_trust/gateway/locations.py">get</a>(location_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/location.py">Optional[Location]</a></code>
+
+### Logging
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.gateway import LoggingSetting
+```
+
+Methods:
+
+- <code title="put /accounts/{account_id}/gateway/logging">client.zero_trust.gateway.logging.<a href="./src/cloudflare/resources/zero_trust/gateway/logging.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/logging_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/logging_setting.py">Optional[LoggingSetting]</a></code>
+- <code title="get /accounts/{account_id}/gateway/logging">client.zero_trust.gateway.logging.<a href="./src/cloudflare/resources/zero_trust/gateway/logging.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/logging_setting.py">Optional[LoggingSetting]</a></code>
+
+### ProxyEndpoints
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.gateway import GatewayIPs, ProxyEndpoint
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/gateway/proxy_endpoints">client.zero_trust.gateway.proxy_endpoints.<a href="./src/cloudflare/resources/zero_trust/gateway/proxy_endpoints.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/proxy_endpoint_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/proxy_endpoint.py">Optional[ProxyEndpoint]</a></code>
+- <code title="get /accounts/{account_id}/gateway/proxy_endpoints">client.zero_trust.gateway.proxy_endpoints.<a href="./src/cloudflare/resources/zero_trust/gateway/proxy_endpoints.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/proxy_endpoint.py">SyncSinglePage[ProxyEndpoint]</a></code>
+- <code title="delete /accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}">client.zero_trust.gateway.proxy_endpoints.<a href="./src/cloudflare/resources/zero_trust/gateway/proxy_endpoints.py">delete</a>(proxy_endpoint_id, \*, account_id) -> object</code>
+- <code title="patch /accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}">client.zero_trust.gateway.proxy_endpoints.<a href="./src/cloudflare/resources/zero_trust/gateway/proxy_endpoints.py">edit</a>(proxy_endpoint_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/proxy_endpoint_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/proxy_endpoint.py">Optional[ProxyEndpoint]</a></code>
+- <code title="get /accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}">client.zero_trust.gateway.proxy_endpoints.<a href="./src/cloudflare/resources/zero_trust/gateway/proxy_endpoints.py">get</a>(proxy_endpoint_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/proxy_endpoint.py">Optional[ProxyEndpoint]</a></code>
+
+### Rules
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.gateway import (
+    DNSResolverSettingsV4,
+    DNSResolverSettingsV6,
+    GatewayFilter,
+    GatewayRule,
+    RuleSetting,
+    Schedule,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/gateway/rules">client.zero_trust.gateway.rules.<a href="./src/cloudflare/resources/zero_trust/gateway/rules.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_rule.py">Optional[GatewayRule]</a></code>
+- <code title="put /accounts/{account_id}/gateway/rules/{rule_id}">client.zero_trust.gateway.rules.<a href="./src/cloudflare/resources/zero_trust/gateway/rules.py">update</a>(rule_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_rule.py">Optional[GatewayRule]</a></code>
+- <code title="get /accounts/{account_id}/gateway/rules">client.zero_trust.gateway.rules.<a href="./src/cloudflare/resources/zero_trust/gateway/rules.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_rule.py">SyncSinglePage[GatewayRule]</a></code>
+- <code title="delete /accounts/{account_id}/gateway/rules/{rule_id}">client.zero_trust.gateway.rules.<a href="./src/cloudflare/resources/zero_trust/gateway/rules.py">delete</a>(rule_id, \*, account_id) -> object</code>
+- <code title="get /accounts/{account_id}/gateway/rules/{rule_id}">client.zero_trust.gateway.rules.<a href="./src/cloudflare/resources/zero_trust/gateway/rules.py">get</a>(rule_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_rule.py">Optional[GatewayRule]</a></code>
+- <code title="get /accounts/{account_id}/gateway/rules/tenant">client.zero_trust.gateway.rules.<a href="./src/cloudflare/resources/zero_trust/gateway/rules.py">list_tenant</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_rule.py">SyncSinglePage[GatewayRule]</a></code>
+- <code title="post /accounts/{account_id}/gateway/rules/{rule_id}/reset_expiration">client.zero_trust.gateway.rules.<a href="./src/cloudflare/resources/zero_trust/gateway/rules.py">reset_expiration</a>(rule_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_rule.py">Optional[GatewayRule]</a></code>
+
+### Certificates
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.gateway import (
+    CertificateCreateResponse,
+    CertificateListResponse,
+    CertificateDeleteResponse,
+    CertificateActivateResponse,
+    CertificateDeactivateResponse,
+    CertificateGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/gateway/certificates">client.zero_trust.gateway.certificates.<a href="./src/cloudflare/resources/zero_trust/gateway/certificates.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/certificate_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/certificate_create_response.py">Optional[CertificateCreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/gateway/certificates">client.zero_trust.gateway.certificates.<a href="./src/cloudflare/resources/zero_trust/gateway/certificates.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/certificate_list_response.py">SyncSinglePage[CertificateListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/gateway/certificates/{certificate_id}">client.zero_trust.gateway.certificates.<a href="./src/cloudflare/resources/zero_trust/gateway/certificates.py">delete</a>(certificate_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/certificate_delete_response.py">Optional[CertificateDeleteResponse]</a></code>
+- <code title="post /accounts/{account_id}/gateway/certificates/{certificate_id}/activate">client.zero_trust.gateway.certificates.<a href="./src/cloudflare/resources/zero_trust/gateway/certificates.py">activate</a>(certificate_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/certificate_activate_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/certificate_activate_response.py">Optional[CertificateActivateResponse]</a></code>
+- <code title="post /accounts/{account_id}/gateway/certificates/{certificate_id}/deactivate">client.zero_trust.gateway.certificates.<a href="./src/cloudflare/resources/zero_trust/gateway/certificates.py">deactivate</a>(certificate_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/certificate_deactivate_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/certificate_deactivate_response.py">Optional[CertificateDeactivateResponse]</a></code>
+- <code title="get /accounts/{account_id}/gateway/certificates/{certificate_id}">client.zero_trust.gateway.certificates.<a href="./src/cloudflare/resources/zero_trust/gateway/certificates.py">get</a>(certificate_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/certificate_get_response.py">Optional[CertificateGetResponse]</a></code>
+
+## Networks
+
+### Routes
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.networks import NetworkRoute, Route, Teamnet
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/teamnet/routes">client.zero_trust.networks.routes.<a href="./src/cloudflare/resources/zero_trust/networks/routes/routes.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/route_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/route.py">Route</a></code>
+- <code title="get /accounts/{account_id}/teamnet/routes">client.zero_trust.networks.routes.<a href="./src/cloudflare/resources/zero_trust/networks/routes/routes.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/route_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/teamnet.py">SyncV4PagePaginationArray[Teamnet]</a></code>
+- <code title="delete /accounts/{account_id}/teamnet/routes/{route_id}">client.zero_trust.networks.routes.<a href="./src/cloudflare/resources/zero_trust/networks/routes/routes.py">delete</a>(route_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/networks/route.py">Route</a></code>
+- <code title="patch /accounts/{account_id}/teamnet/routes/{route_id}">client.zero_trust.networks.routes.<a href="./src/cloudflare/resources/zero_trust/networks/routes/routes.py">edit</a>(route_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/route_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/route.py">Route</a></code>
+- <code title="get /accounts/{account_id}/teamnet/routes/{route_id}">client.zero_trust.networks.routes.<a href="./src/cloudflare/resources/zero_trust/networks/routes/routes.py">get</a>(route_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/networks/route.py">Route</a></code>
+
+#### IPs
+
+Methods:
+
+- <code title="get /accounts/{account_id}/teamnet/routes/ip/{ip}">client.zero_trust.networks.routes.ips.<a href="./src/cloudflare/resources/zero_trust/networks/routes/ips.py">get</a>(ip, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/routes/ip_get_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/teamnet.py">Teamnet</a></code>
+
+#### Networks
+
+Methods:
+
+- <code title="post /accounts/{account_id}/teamnet/routes/network/{ip_network_encoded}">client.zero_trust.networks.routes.networks.<a href="./src/cloudflare/resources/zero_trust/networks/routes/networks.py">create</a>(ip_network_encoded, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/routes/network_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/route.py">Route</a></code>
+- <code title="delete /accounts/{account_id}/teamnet/routes/network/{ip_network_encoded}">client.zero_trust.networks.routes.networks.<a href="./src/cloudflare/resources/zero_trust/networks/routes/networks.py">delete</a>(ip_network_encoded, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/routes/network_delete_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/route.py">Route</a></code>
+- <code title="patch /accounts/{account_id}/teamnet/routes/network/{ip_network_encoded}">client.zero_trust.networks.routes.networks.<a href="./src/cloudflare/resources/zero_trust/networks/routes/networks.py">edit</a>(ip_network_encoded, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/networks/route.py">Route</a></code>
+
+### VirtualNetworks
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.networks import VirtualNetwork
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/teamnet/virtual_networks">client.zero_trust.networks.virtual_networks.<a href="./src/cloudflare/resources/zero_trust/networks/virtual_networks.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/virtual_network_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/virtual_network.py">VirtualNetwork</a></code>
+- <code title="get /accounts/{account_id}/teamnet/virtual_networks">client.zero_trust.networks.virtual_networks.<a href="./src/cloudflare/resources/zero_trust/networks/virtual_networks.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/virtual_network_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/virtual_network.py">SyncSinglePage[VirtualNetwork]</a></code>
+- <code title="delete /accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}">client.zero_trust.networks.virtual_networks.<a href="./src/cloudflare/resources/zero_trust/networks/virtual_networks.py">delete</a>(virtual_network_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/networks/virtual_network.py">VirtualNetwork</a></code>
+- <code title="patch /accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}">client.zero_trust.networks.virtual_networks.<a href="./src/cloudflare/resources/zero_trust/networks/virtual_networks.py">edit</a>(virtual_network_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/virtual_network_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/virtual_network.py">VirtualNetwork</a></code>
+- <code title="get /accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}">client.zero_trust.networks.virtual_networks.<a href="./src/cloudflare/resources/zero_trust/networks/virtual_networks.py">get</a>(virtual_network_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/networks/virtual_network.py">VirtualNetwork</a></code>
+
+### Subnets
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.networks import SubnetListResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/zerotrust/subnets">client.zero_trust.networks.subnets.<a href="./src/cloudflare/resources/zero_trust/networks/subnets/subnets.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/subnet_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/subnet_list_response.py">SyncV4PagePaginationArray[SubnetListResponse]</a></code>
+
+#### CloudflareSource
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.networks.subnets import CloudflareSourceUpdateResponse
+```
+
+Methods:
+
+- <code title="patch /accounts/{account_id}/zerotrust/subnets/cloudflare_source/{address_family}">client.zero_trust.networks.subnets.cloudflare_source.<a href="./src/cloudflare/resources/zero_trust/networks/subnets/cloudflare_source.py">update</a>(address_family, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/subnets/cloudflare_source_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/subnets/cloudflare_source_update_response.py">CloudflareSourceUpdateResponse</a></code>
+
+### HostnameRoutes
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.networks import HostnameRoute
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/zerotrust/routes/hostname">client.zero_trust.networks.hostname_routes.<a href="./src/cloudflare/resources/zero_trust/networks/hostname_routes.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/hostname_route_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/hostname_route.py">HostnameRoute</a></code>
+- <code title="get /accounts/{account_id}/zerotrust/routes/hostname">client.zero_trust.networks.hostname_routes.<a href="./src/cloudflare/resources/zero_trust/networks/hostname_routes.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/hostname_route_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/hostname_route.py">SyncV4PagePaginationArray[HostnameRoute]</a></code>
+- <code title="delete /accounts/{account_id}/zerotrust/routes/hostname/{hostname_route_id}">client.zero_trust.networks.hostname_routes.<a href="./src/cloudflare/resources/zero_trust/networks/hostname_routes.py">delete</a>(hostname_route_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/networks/hostname_route.py">HostnameRoute</a></code>
+- <code title="patch /accounts/{account_id}/zerotrust/routes/hostname/{hostname_route_id}">client.zero_trust.networks.hostname_routes.<a href="./src/cloudflare/resources/zero_trust/networks/hostname_routes.py">edit</a>(hostname_route_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/hostname_route_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/hostname_route.py">HostnameRoute</a></code>
+- <code title="get /accounts/{account_id}/zerotrust/routes/hostname/{hostname_route_id}">client.zero_trust.networks.hostname_routes.<a href="./src/cloudflare/resources/zero_trust/networks/hostname_routes.py">get</a>(hostname_route_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/networks/hostname_route.py">HostnameRoute</a></code>
+
+## RiskScoring
+
+Types:
+
+```python
+from cloudflare.types.zero_trust import RiskScoringGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/zt_risk_scoring/{user_id}">client.zero_trust.risk_scoring.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/risk_scoring.py">get</a>(user_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring_get_response.py">Optional[RiskScoringGetResponse]</a></code>
+- <code title="post /accounts/{account_id}/zt_risk_scoring/{user_id}/reset">client.zero_trust.risk_scoring.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/risk_scoring.py">reset</a>(user_id, \*, account_id) -> object</code>
+
+### Behaviours
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.risk_scoring import BehaviourUpdateResponse, BehaviourGetResponse
+```
+
+Methods:
+
+- <code title="put /accounts/{account_id}/zt_risk_scoring/behaviors">client.zero_trust.risk_scoring.behaviours.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/behaviours.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/risk_scoring/behaviour_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring/behaviour_update_response.py">Optional[BehaviourUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/zt_risk_scoring/behaviors">client.zero_trust.risk_scoring.behaviours.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/behaviours.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring/behaviour_get_response.py">Optional[BehaviourGetResponse]</a></code>
+
+### Summary
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.risk_scoring import SummaryGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/zt_risk_scoring/summary">client.zero_trust.risk_scoring.summary.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/summary.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring/summary_get_response.py">Optional[SummaryGetResponse]</a></code>
+
+### Integrations
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.risk_scoring import (
+    IntegrationCreateResponse,
+    IntegrationUpdateResponse,
+    IntegrationListResponse,
+    IntegrationGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/zt_risk_scoring/integrations">client.zero_trust.risk_scoring.integrations.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/integrations/integrations.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/risk_scoring/integration_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring/integration_create_response.py">Optional[IntegrationCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/zt_risk_scoring/integrations/{integration_id}">client.zero_trust.risk_scoring.integrations.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/integrations/integrations.py">update</a>(integration_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/risk_scoring/integration_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring/integration_update_response.py">Optional[IntegrationUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/zt_risk_scoring/integrations">client.zero_trust.risk_scoring.integrations.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/integrations/integrations.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring/integration_list_response.py">SyncSinglePage[IntegrationListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/zt_risk_scoring/integrations/{integration_id}">client.zero_trust.risk_scoring.integrations.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/integrations/integrations.py">delete</a>(integration_id, \*, account_id) -> object</code>
+- <code title="get /accounts/{account_id}/zt_risk_scoring/integrations/{integration_id}">client.zero_trust.risk_scoring.integrations.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/integrations/integrations.py">get</a>(integration_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring/integration_get_response.py">Optional[IntegrationGetResponse]</a></code>
+
+#### References
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.risk_scoring.integrations import ReferenceGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/zt_risk_scoring/integrations/reference_id/{reference_id}">client.zero_trust.risk_scoring.integrations.references.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/integrations/references.py">get</a>(reference_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring/integrations/reference_get_response.py">Optional[ReferenceGetResponse]</a></code>
+
+# Turnstile
+
+## Widgets
+
+Types:
+
+```python
+from cloudflare.types.turnstile import Widget, WidgetDomain, WidgetListResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/challenges/widgets">client.turnstile.widgets.<a href="./src/cloudflare/resources/turnstile/widgets.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/turnstile/widget_create_params.py">params</a>) -> <a href="./src/cloudflare/types/turnstile/widget.py">Optional[Widget]</a></code>
+- <code title="put /accounts/{account_id}/challenges/widgets/{sitekey}">client.turnstile.widgets.<a href="./src/cloudflare/resources/turnstile/widgets.py">update</a>(sitekey, \*, account_id, \*\*<a href="src/cloudflare/types/turnstile/widget_update_params.py">params</a>) -> <a href="./src/cloudflare/types/turnstile/widget.py">Optional[Widget]</a></code>
+- <code title="get /accounts/{account_id}/challenges/widgets">client.turnstile.widgets.<a href="./src/cloudflare/resources/turnstile/widgets.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/turnstile/widget_list_params.py">params</a>) -> <a href="./src/cloudflare/types/turnstile/widget_list_response.py">SyncV4PagePaginationArray[WidgetListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/challenges/widgets/{sitekey}">client.turnstile.widgets.<a href="./src/cloudflare/resources/turnstile/widgets.py">delete</a>(sitekey, \*, account_id) -> <a href="./src/cloudflare/types/turnstile/widget.py">Optional[Widget]</a></code>
+- <code title="get /accounts/{account_id}/challenges/widgets/{sitekey}">client.turnstile.widgets.<a href="./src/cloudflare/resources/turnstile/widgets.py">get</a>(sitekey, \*, account_id) -> <a href="./src/cloudflare/types/turnstile/widget.py">Optional[Widget]</a></code>
+- <code title="post /accounts/{account_id}/challenges/widgets/{sitekey}/rotate_secret">client.turnstile.widgets.<a href="./src/cloudflare/resources/turnstile/widgets.py">rotate_secret</a>(sitekey, \*, account_id, \*\*<a href="src/cloudflare/types/turnstile/widget_rotate_secret_params.py">params</a>) -> <a href="./src/cloudflare/types/turnstile/widget.py">Optional[Widget]</a></code>
+
+# Connectivity
+
+## Directory
+
+### Services
+
+Types:
+
+```python
+from cloudflare.types.connectivity.directory import (
+    ServiceCreateResponse,
+    ServiceUpdateResponse,
+    ServiceListResponse,
+    ServiceGetResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/connectivity/directory/services">client.connectivity.directory.services.<a href="./src/cloudflare/resources/connectivity/directory/services.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/connectivity/directory/service_create_params.py">params</a>) -> <a href="./src/cloudflare/types/connectivity/directory/service_create_response.py">Optional[ServiceCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/connectivity/directory/services/{service_id}">client.connectivity.directory.services.<a href="./src/cloudflare/resources/connectivity/directory/services.py">update</a>(service_id, \*, account_id, \*\*<a href="src/cloudflare/types/connectivity/directory/service_update_params.py">params</a>) -> <a href="./src/cloudflare/types/connectivity/directory/service_update_response.py">Optional[ServiceUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/connectivity/directory/services">client.connectivity.directory.services.<a href="./src/cloudflare/resources/connectivity/directory/services.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/connectivity/directory/service_list_params.py">params</a>) -> <a href="./src/cloudflare/types/connectivity/directory/service_list_response.py">SyncV4PagePaginationArray[ServiceListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/connectivity/directory/services/{service_id}">client.connectivity.directory.services.<a href="./src/cloudflare/resources/connectivity/directory/services.py">delete</a>(service_id, \*, account_id) -> None</code>
+- <code title="get /accounts/{account_id}/connectivity/directory/services/{service_id}">client.connectivity.directory.services.<a href="./src/cloudflare/resources/connectivity/directory/services.py">get</a>(service_id, \*, account_id) -> <a href="./src/cloudflare/types/connectivity/directory/service_get_response.py">Optional[ServiceGetResponse]</a></code>
+
+# Hyperdrive
+
+Types:
+
+```python
+from cloudflare.types.hyperdrive import Configuration, Hyperdrive
+```
+
+## Configs
+
+Methods:
+
+- <code title="post /accounts/{account_id}/hyperdrive/configs">client.hyperdrive.configs.<a href="./src/cloudflare/resources/hyperdrive/configs.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/hyperdrive/config_create_params.py">params</a>) -> <a href="./src/cloudflare/types/hyperdrive/hyperdrive.py">Hyperdrive</a></code>
+- <code title="put /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}">client.hyperdrive.configs.<a href="./src/cloudflare/resources/hyperdrive/configs.py">update</a>(hyperdrive_id, \*, account_id, \*\*<a href="src/cloudflare/types/hyperdrive/config_update_params.py">params</a>) -> <a href="./src/cloudflare/types/hyperdrive/hyperdrive.py">Hyperdrive</a></code>
+- <code title="get /accounts/{account_id}/hyperdrive/configs">client.hyperdrive.configs.<a href="./src/cloudflare/resources/hyperdrive/configs.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/hyperdrive/hyperdrive.py">SyncSinglePage[Hyperdrive]</a></code>
+- <code title="delete /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}">client.hyperdrive.configs.<a href="./src/cloudflare/resources/hyperdrive/configs.py">delete</a>(hyperdrive_id, \*, account_id) -> object</code>
+- <code title="patch /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}">client.hyperdrive.configs.<a href="./src/cloudflare/resources/hyperdrive/configs.py">edit</a>(hyperdrive_id, \*, account_id, \*\*<a href="src/cloudflare/types/hyperdrive/config_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/hyperdrive/hyperdrive.py">Hyperdrive</a></code>
+- <code title="get /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}">client.hyperdrive.configs.<a href="./src/cloudflare/resources/hyperdrive/configs.py">get</a>(hyperdrive_id, \*, account_id) -> <a href="./src/cloudflare/types/hyperdrive/hyperdrive.py">Hyperdrive</a></code>
+
+# RUM
+
+## SiteInfo
+
+Types:
+
+```python
+from cloudflare.types.rum import Site, SiteInfoDeleteResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/rum/site_info">client.rum.site_info.<a href="./src/cloudflare/resources/rum/site_info.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/rum/site_info_create_params.py">params</a>) -> <a href="./src/cloudflare/types/rum/site.py">Optional[Site]</a></code>
+- <code title="put /accounts/{account_id}/rum/site_info/{site_id}">client.rum.site_info.<a href="./src/cloudflare/resources/rum/site_info.py">update</a>(site_id, \*, account_id, \*\*<a href="src/cloudflare/types/rum/site_info_update_params.py">params</a>) -> <a href="./src/cloudflare/types/rum/site.py">Optional[Site]</a></code>
+- <code title="get /accounts/{account_id}/rum/site_info/list">client.rum.site_info.<a href="./src/cloudflare/resources/rum/site_info.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/rum/site_info_list_params.py">params</a>) -> <a href="./src/cloudflare/types/rum/site.py">SyncV4PagePaginationArray[Site]</a></code>
+- <code title="delete /accounts/{account_id}/rum/site_info/{site_id}">client.rum.site_info.<a href="./src/cloudflare/resources/rum/site_info.py">delete</a>(site_id, \*, account_id) -> <a href="./src/cloudflare/types/rum/site_info_delete_response.py">Optional[SiteInfoDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/rum/site_info/{site_id}">client.rum.site_info.<a href="./src/cloudflare/resources/rum/site_info.py">get</a>(site_id, \*, account_id) -> <a href="./src/cloudflare/types/rum/site.py">Optional[Site]</a></code>
+
+## Rules
+
+Types:
+
+```python
+from cloudflare.types.rum import (
+    RUMRule,
+    RuleListResponse,
+    RuleDeleteResponse,
+    RuleBulkCreateResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/rum/v2/{ruleset_id}/rule">client.rum.rules.<a href="./src/cloudflare/resources/rum/rules.py">create</a>(ruleset_id, \*, account_id, \*\*<a href="src/cloudflare/types/rum/rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/rum/rum_rule.py">Optional[RUMRule]</a></code>
+- <code title="put /accounts/{account_id}/rum/v2/{ruleset_id}/rule/{rule_id}">client.rum.rules.<a href="./src/cloudflare/resources/rum/rules.py">update</a>(rule_id, \*, account_id, ruleset_id, \*\*<a href="src/cloudflare/types/rum/rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/rum/rum_rule.py">Optional[RUMRule]</a></code>
+- <code title="get /accounts/{account_id}/rum/v2/{ruleset_id}/rules">client.rum.rules.<a href="./src/cloudflare/resources/rum/rules.py">list</a>(ruleset_id, \*, account_id) -> <a href="./src/cloudflare/types/rum/rule_list_response.py">Optional[RuleListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/rum/v2/{ruleset_id}/rule/{rule_id}">client.rum.rules.<a href="./src/cloudflare/resources/rum/rules.py">delete</a>(rule_id, \*, account_id, ruleset_id) -> <a href="./src/cloudflare/types/rum/rule_delete_response.py">Optional[RuleDeleteResponse]</a></code>
+- <code title="post /accounts/{account_id}/rum/v2/{ruleset_id}/rules">client.rum.rules.<a href="./src/cloudflare/resources/rum/rules.py">bulk_create</a>(ruleset_id, \*, account_id, \*\*<a href="src/cloudflare/types/rum/rule_bulk_create_params.py">params</a>) -> <a href="./src/cloudflare/types/rum/rule_bulk_create_response.py">Optional[RuleBulkCreateResponse]</a></code>
+
+# Vectorize
+
+## Indexes
+
+Types:
+
+```python
+from cloudflare.types.vectorize import (
+    CreateIndex,
+    IndexDeleteVectorsByID,
+    IndexDimensionConfiguration,
+    IndexInsert,
+    IndexQuery,
+    IndexUpsert,
+    IndexDeleteResponse,
+    IndexDeleteByIDsResponse,
+    IndexInfoResponse,
+    IndexInsertResponse,
+    IndexListVectorsResponse,
+    IndexQueryResponse,
+    IndexUpsertResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/vectorize/v2/indexes">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes/indexes.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/vectorize/index_create_params.py">params</a>) -> <a href="./src/cloudflare/types/vectorize/create_index.py">Optional[CreateIndex]</a></code>
+- <code title="get /accounts/{account_id}/vectorize/v2/indexes">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes/indexes.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/vectorize/create_index.py">SyncSinglePage[CreateIndex]</a></code>
+- <code title="delete /accounts/{account_id}/vectorize/v2/indexes/{index_name}">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes/indexes.py">delete</a>(index_name, \*, account_id) -> <a href="./src/cloudflare/types/vectorize/index_delete_response.py">Optional[IndexDeleteResponse]</a></code>
+- <code title="post /accounts/{account_id}/vectorize/v2/indexes/{index_name}/delete_by_ids">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes/indexes.py">delete_by_ids</a>(index_name, \*, account_id, \*\*<a href="src/cloudflare/types/vectorize/index_delete_by_ids_params.py">params</a>) -> <a href="./src/cloudflare/types/vectorize/index_delete_by_ids_response.py">Optional[IndexDeleteByIDsResponse]</a></code>
+- <code title="get /accounts/{account_id}/vectorize/v2/indexes/{index_name}">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes/indexes.py">get</a>(index_name, \*, account_id) -> <a href="./src/cloudflare/types/vectorize/create_index.py">Optional[CreateIndex]</a></code>
+- <code title="post /accounts/{account_id}/vectorize/v2/indexes/{index_name}/get_by_ids">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes/indexes.py">get_by_ids</a>(index_name, \*, account_id, \*\*<a href="src/cloudflare/types/vectorize/index_get_by_ids_params.py">params</a>) -> object</code>
+- <code title="get /accounts/{account_id}/vectorize/v2/indexes/{index_name}/info">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes/indexes.py">info</a>(index_name, \*, account_id) -> <a href="./src/cloudflare/types/vectorize/index_info_response.py">Optional[IndexInfoResponse]</a></code>
+- <code title="post /accounts/{account_id}/vectorize/v2/indexes/{index_name}/insert">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes/indexes.py">insert</a>(index_name, \*, account_id, \*\*<a href="src/cloudflare/types/vectorize/index_insert_params.py">params</a>) -> <a href="./src/cloudflare/types/vectorize/index_insert_response.py">Optional[IndexInsertResponse]</a></code>
+- <code title="get /accounts/{account_id}/vectorize/v2/indexes/{index_name}/list">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes/indexes.py">list_vectors</a>(index_name, \*, account_id, \*\*<a href="src/cloudflare/types/vectorize/index_list_vectors_params.py">params</a>) -> <a href="./src/cloudflare/types/vectorize/index_list_vectors_response.py">Optional[IndexListVectorsResponse]</a></code>
+- <code title="post /accounts/{account_id}/vectorize/v2/indexes/{index_name}/query">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes/indexes.py">query</a>(index_name, \*, account_id, \*\*<a href="src/cloudflare/types/vectorize/index_query_params.py">params</a>) -> <a href="./src/cloudflare/types/vectorize/index_query_response.py">Optional[IndexQueryResponse]</a></code>
+- <code title="post /accounts/{account_id}/vectorize/v2/indexes/{index_name}/upsert">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes/indexes.py">upsert</a>(index_name, \*, account_id, \*\*<a href="src/cloudflare/types/vectorize/index_upsert_params.py">params</a>) -> <a href="./src/cloudflare/types/vectorize/index_upsert_response.py">Optional[IndexUpsertResponse]</a></code>
+
+### MetadataIndex
+
+Types:
+
+```python
+from cloudflare.types.vectorize.indexes import (
+    MetadataIndexCreateResponse,
+    MetadataIndexListResponse,
+    MetadataIndexDeleteResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/vectorize/v2/indexes/{index_name}/metadata_index/create">client.vectorize.indexes.metadata_index.<a href="./src/cloudflare/resources/vectorize/indexes/metadata_index.py">create</a>(index_name, \*, account_id, \*\*<a href="src/cloudflare/types/vectorize/indexes/metadata_index_create_params.py">params</a>) -> <a href="./src/cloudflare/types/vectorize/indexes/metadata_index_create_response.py">Optional[MetadataIndexCreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/vectorize/v2/indexes/{index_name}/metadata_index/list">client.vectorize.indexes.metadata_index.<a href="./src/cloudflare/resources/vectorize/indexes/metadata_index.py">list</a>(index_name, \*, account_id) -> <a href="./src/cloudflare/types/vectorize/indexes/metadata_index_list_response.py">Optional[MetadataIndexListResponse]</a></code>
+- <code title="post /accounts/{account_id}/vectorize/v2/indexes/{index_name}/metadata_index/delete">client.vectorize.indexes.metadata_index.<a href="./src/cloudflare/resources/vectorize/indexes/metadata_index.py">delete</a>(index_name, \*, account_id, \*\*<a href="src/cloudflare/types/vectorize/indexes/metadata_index_delete_params.py">params</a>) -> <a href="./src/cloudflare/types/vectorize/indexes/metadata_index_delete_response.py">Optional[MetadataIndexDeleteResponse]</a></code>
+
+# URLScanner
+
+Types:
+
+```python
+from cloudflare.types.url_scanner import URLScannerDomain, URLScannerTask
+```
+
+## Responses
+
+Types:
+
+```python
+from cloudflare.types.url_scanner import ResponseGetResponse
+```
+
+Methods:
+
+- <code title="get /accounts/{account_id}/urlscanner/v2/responses/{response_id}">client.url_scanner.responses.<a href="./src/cloudflare/resources/url_scanner/responses.py">get</a>(response_id, \*, account_id) -> str</code>
+
+## Scans
+
+Types:
+
+```python
+from cloudflare.types.url_scanner import (
+    ScanCreateResponse,
+    ScanListResponse,
+    ScanBulkCreateResponse,
+    ScanDOMResponse,
+    ScanGetResponse,
+    ScanHARResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/urlscanner/v2/scan">client.url_scanner.scans.<a href="./src/cloudflare/resources/url_scanner/scans.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/url_scanner/scan_create_params.py">params</a>) -> <a href="./src/cloudflare/types/url_scanner/scan_create_response.py">ScanCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/urlscanner/v2/search">client.url_scanner.scans.<a href="./src/cloudflare/resources/url_scanner/scans.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/url_scanner/scan_list_params.py">params</a>) -> <a href="./src/cloudflare/types/url_scanner/scan_list_response.py">ScanListResponse</a></code>
+- <code title="post /accounts/{account_id}/urlscanner/v2/bulk">client.url_scanner.scans.<a href="./src/cloudflare/resources/url_scanner/scans.py">bulk_create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/url_scanner/scan_bulk_create_params.py">params</a>) -> <a href="./src/cloudflare/types/url_scanner/scan_bulk_create_response.py">ScanBulkCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/urlscanner/v2/dom/{scan_id}">client.url_scanner.scans.<a href="./src/cloudflare/resources/url_scanner/scans.py">dom</a>(scan_id, \*, account_id) -> str</code>
+- <code title="get /accounts/{account_id}/urlscanner/v2/result/{scan_id}">client.url_scanner.scans.<a href="./src/cloudflare/resources/url_scanner/scans.py">get</a>(scan_id, \*, account_id) -> <a href="./src/cloudflare/types/url_scanner/scan_get_response.py">ScanGetResponse</a></code>
+- <code title="get /accounts/{account_id}/urlscanner/v2/har/{scan_id}">client.url_scanner.scans.<a href="./src/cloudflare/resources/url_scanner/scans.py">har</a>(scan_id, \*, account_id) -> <a href="./src/cloudflare/types/url_scanner/scan_har_response.py">ScanHARResponse</a></code>
+- <code title="get /accounts/{account_id}/urlscanner/v2/screenshots/{scan_id}.png">client.url_scanner.scans.<a href="./src/cloudflare/resources/url_scanner/scans.py">screenshot</a>(scan_id, \*, account_id, \*\*<a href="src/cloudflare/types/url_scanner/scan_screenshot_params.py">params</a>) -> BinaryAPIResponse</code>
+
+# Radar
+
+## AI
+
+### ToMarkdown
+
+Types:
+
+```python
+from cloudflare.types.radar.ai import ToMarkdownCreateResponse
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/ai/tomarkdown">client.radar.ai.to_markdown.<a href="./src/cloudflare/resources/radar/ai/to_markdown.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/radar/ai/to_markdown_create_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ai/to_markdown_create_response.py">SyncSinglePage[ToMarkdownCreateResponse]</a></code>
+
+### Inference
+
+Types:
+
+```python
+from cloudflare.types.radar.ai import (
+    InferenceSummaryV2Response,
+    InferenceTimeseriesGroupsV2Response,
+)
+```
+
+Methods:
+
+- <code title="get /radar/ai/inference/summary/{dimension}">client.radar.ai.inference.<a href="./src/cloudflare/resources/radar/ai/inference/inference.py">summary_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/ai/inference_summary_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ai/inference_summary_v2_response.py">InferenceSummaryV2Response</a></code>
+- <code title="get /radar/ai/inference/timeseries_groups/{dimension}">client.radar.ai.inference.<a href="./src/cloudflare/resources/radar/ai/inference/inference.py">timeseries_groups_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/ai/inference_timeseries_groups_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ai/inference_timeseries_groups_v2_response.py">InferenceTimeseriesGroupsV2Response</a></code>
+
+#### Summary
+
+Types:
+
+```python
+from cloudflare.types.radar.ai.inference import SummaryModelResponse, SummaryTaskResponse
+```
+
+Methods:
+
+- <code title="get /radar/ai/inference/summary/model">client.radar.ai.inference.summary.<a href="./src/cloudflare/resources/radar/ai/inference/summary.py">model</a>(\*\*<a href="src/cloudflare/types/radar/ai/inference/summary_model_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ai/inference/summary_model_response.py">SummaryModelResponse</a></code>
+- <code title="get /radar/ai/inference/summary/task">client.radar.ai.inference.summary.<a href="./src/cloudflare/resources/radar/ai/inference/summary.py">task</a>(\*\*<a href="src/cloudflare/types/radar/ai/inference/summary_task_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ai/inference/summary_task_response.py">SummaryTaskResponse</a></code>
+
+#### TimeseriesGroups
+
+##### Summary
+
+Types:
+
+```python
+from cloudflare.types.radar.ai.inference.timeseries_groups import (
+    SummaryModelResponse,
+    SummaryTaskResponse,
+)
+```
+
+Methods:
+
+- <code title="get /radar/ai/inference/timeseries_groups/model">client.radar.ai.inference.timeseries_groups.summary.<a href="./src/cloudflare/resources/radar/ai/inference/timeseries_groups/summary.py">model</a>(\*\*<a href="src/cloudflare/types/radar/ai/inference/timeseries_groups/summary_model_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ai/inference/timeseries_groups/summary_model_response.py">SummaryModelResponse</a></code>
+- <code title="get /radar/ai/inference/timeseries_groups/task">client.radar.ai.inference.timeseries_groups.summary.<a href="./src/cloudflare/resources/radar/ai/inference/timeseries_groups/summary.py">task</a>(\*\*<a href="src/cloudflare/types/radar/ai/inference/timeseries_groups/summary_task_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ai/inference/timeseries_groups/summary_task_response.py">SummaryTaskResponse</a></code>
+
+### Bots
+
+Types:
+
+```python
+from cloudflare.types.radar.ai import (
+    BotSummaryV2Response,
+    BotTimeseriesResponse,
+    BotTimeseriesGroupsResponse,
+)
+```
+
+Methods:
+
+- <code title="get /radar/ai/bots/summary/{dimension}">client.radar.ai.bots.<a href="./src/cloudflare/resources/radar/ai/bots/bots.py">summary_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/ai/bot_summary_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ai/bot_summary_v2_response.py">BotSummaryV2Response</a></code>
+- <code title="get /radar/ai/bots/timeseries">client.radar.ai.bots.<a href="./src/cloudflare/resources/radar/ai/bots/bots.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/ai/bot_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ai/bot_timeseries_response.py">BotTimeseriesResponse</a></code>
+- <code title="get /radar/ai/bots/timeseries_groups/{dimension}">client.radar.ai.bots.<a href="./src/cloudflare/resources/radar/ai/bots/bots.py">timeseries_groups</a>(dimension, \*\*<a href="src/cloudflare/types/radar/ai/bot_timeseries_groups_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ai/bot_timeseries_groups_response.py">BotTimeseriesGroupsResponse</a></code>
+
+#### Summary
+
+Types:
+
+```python
+from cloudflare.types.radar.ai.bots import SummaryUserAgentResponse
+```
+
+Methods:
+
+- <code title="get /radar/ai/bots/summary/user_agent">client.radar.ai.bots.summary.<a href="./src/cloudflare/resources/radar/ai/bots/summary.py">user_agent</a>(\*\*<a href="src/cloudflare/types/radar/ai/bots/summary_user_agent_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ai/bots/summary_user_agent_response.py">SummaryUserAgentResponse</a></code>
+
+### TimeseriesGroups
+
+Types:
+
+```python
+from cloudflare.types.radar.ai import (
+    TimeseriesGroupSummaryResponse,
+    TimeseriesGroupTimeseriesResponse,
+    TimeseriesGroupTimeseriesGroupsResponse,
+    TimeseriesGroupUserAgentResponse,
+)
+```
+
+Methods:
+
+- <code title="get /radar/ai/bots/summary/{dimension}">client.radar.ai.timeseries_groups.<a href="./src/cloudflare/resources/radar/ai/timeseries_groups.py">summary</a>(dimension, \*\*<a href="src/cloudflare/types/radar/ai/timeseries_group_summary_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ai/timeseries_group_summary_response.py">TimeseriesGroupSummaryResponse</a></code>
+- <code title="get /radar/ai/bots/timeseries">client.radar.ai.timeseries_groups.<a href="./src/cloudflare/resources/radar/ai/timeseries_groups.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/ai/timeseries_group_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ai/timeseries_group_timeseries_response.py">TimeseriesGroupTimeseriesResponse</a></code>
+- <code title="get /radar/ai/bots/timeseries_groups/{dimension}">client.radar.ai.timeseries_groups.<a href="./src/cloudflare/resources/radar/ai/timeseries_groups.py">timeseries_groups</a>(dimension, \*\*<a href="src/cloudflare/types/radar/ai/timeseries_group_timeseries_groups_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ai/timeseries_group_timeseries_groups_response.py">TimeseriesGroupTimeseriesGroupsResponse</a></code>
+- <code title="get /radar/ai/bots/timeseries_groups/user_agent">client.radar.ai.timeseries_groups.<a href="./src/cloudflare/resources/radar/ai/timeseries_groups.py">user_agent</a>(\*\*<a href="src/cloudflare/types/radar/ai/timeseries_group_user_agent_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ai/timeseries_group_user_agent_response.py">TimeseriesGroupUserAgentResponse</a></code>
+
+## CT
+
+Types:
+
+```python
+from cloudflare.types.radar import (
+    CTSummaryResponse,
+    CTTimeseriesResponse,
+    CTTimeseriesGroupsResponse,
+)
+```
+
+Methods:
+
+- <code title="get /radar/ct/summary/{dimension}">client.radar.ct.<a href="./src/cloudflare/resources/radar/ct/ct.py">summary</a>(dimension, \*\*<a href="src/cloudflare/types/radar/ct_summary_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ct_summary_response.py">CTSummaryResponse</a></code>
+- <code title="get /radar/ct/timeseries">client.radar.ct.<a href="./src/cloudflare/resources/radar/ct/ct.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/ct_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ct_timeseries_response.py">CTTimeseriesResponse</a></code>
+- <code title="get /radar/ct/timeseries_groups/{dimension}">client.radar.ct.<a href="./src/cloudflare/resources/radar/ct/ct.py">timeseries_groups</a>(dimension, \*\*<a href="src/cloudflare/types/radar/ct_timeseries_groups_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ct_timeseries_groups_response.py">CTTimeseriesGroupsResponse</a></code>
+
+### Authorities
+
+Types:
+
+```python
+from cloudflare.types.radar.ct import AuthorityListResponse, AuthorityGetResponse
+```
+
+Methods:
+
+- <code title="get /radar/ct/authorities">client.radar.ct.authorities.<a href="./src/cloudflare/resources/radar/ct/authorities.py">list</a>(\*\*<a href="src/cloudflare/types/radar/ct/authority_list_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ct/authority_list_response.py">AuthorityListResponse</a></code>
+- <code title="get /radar/ct/authorities/{ca_slug}">client.radar.ct.authorities.<a href="./src/cloudflare/resources/radar/ct/authorities.py">get</a>(ca_slug, \*\*<a href="src/cloudflare/types/radar/ct/authority_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ct/authority_get_response.py">AuthorityGetResponse</a></code>
+
+### Logs
+
+Types:
+
+```python
+from cloudflare.types.radar.ct import LogListResponse, LogGetResponse
+```
+
+Methods:
+
+- <code title="get /radar/ct/logs">client.radar.ct.logs.<a href="./src/cloudflare/resources/radar/ct/logs.py">list</a>(\*\*<a href="src/cloudflare/types/radar/ct/log_list_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ct/log_list_response.py">LogListResponse</a></code>
+- <code title="get /radar/ct/logs/{log_slug}">client.radar.ct.logs.<a href="./src/cloudflare/resources/radar/ct/logs.py">get</a>(log_slug, \*\*<a href="src/cloudflare/types/radar/ct/log_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ct/log_get_response.py">LogGetResponse</a></code>
+
+## Annotations
+
+Types:
+
+```python
+from cloudflare.types.radar import AnnotationListResponse
+```
+
+Methods:
+
+- <code title="get /radar/annotations">client.radar.annotations.<a href="./src/cloudflare/resources/radar/annotations/annotations.py">list</a>(\*\*<a href="src/cloudflare/types/radar/annotation_list_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/annotation_list_response.py">AnnotationListResponse</a></code>
+
+### Outages
+
+Types:
+
+```python
+from cloudflare.types.radar.annotations import OutageGetResponse, OutageLocationsResponse
+```
+
+Methods:
+
+- <code title="get /radar/annotations/outages">client.radar.annotations.outages.<a href="./src/cloudflare/resources/radar/annotations/outages.py">get</a>(\*\*<a href="src/cloudflare/types/radar/annotations/outage_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/annotations/outage_get_response.py">OutageGetResponse</a></code>
+- <code title="get /radar/annotations/outages/locations">client.radar.annotations.outages.<a href="./src/cloudflare/resources/radar/annotations/outages.py">locations</a>(\*\*<a href="src/cloudflare/types/radar/annotations/outage_locations_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/annotations/outage_locations_response.py">OutageLocationsResponse</a></code>
+
+## BGP
+
+Types:
+
+```python
+from cloudflare.types.radar import BGPTimeseriesResponse
+```
+
+Methods:
+
+- <code title="get /radar/bgp/timeseries">client.radar.bgp.<a href="./src/cloudflare/resources/radar/bgp/bgp.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/bgp_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp_timeseries_response.py">BGPTimeseriesResponse</a></code>
+
+### Leaks
+
+#### Events
+
+Types:
+
+```python
+from cloudflare.types.radar.bgp.leaks import EventListResponse
+```
+
+Methods:
+
+- <code title="get /radar/bgp/leaks/events">client.radar.bgp.leaks.events.<a href="./src/cloudflare/resources/radar/bgp/leaks/events.py">list</a>(\*\*<a href="src/cloudflare/types/radar/bgp/leaks/event_list_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/leaks/event_list_response.py">SyncV4PagePagination[EventListResponse]</a></code>
+
+### Top
+
+Types:
+
+```python
+from cloudflare.types.radar.bgp import TopPrefixesResponse
+```
+
+Methods:
+
+- <code title="get /radar/bgp/top/prefixes">client.radar.bgp.top.<a href="./src/cloudflare/resources/radar/bgp/top/top.py">prefixes</a>(\*\*<a href="src/cloudflare/types/radar/bgp/top_prefixes_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/top_prefixes_response.py">TopPrefixesResponse</a></code>
+
+#### Ases
+
+Types:
+
+```python
+from cloudflare.types.radar.bgp.top import AseGetResponse, AsePrefixesResponse
+```
+
+Methods:
+
+- <code title="get /radar/bgp/top/ases">client.radar.bgp.top.ases.<a href="./src/cloudflare/resources/radar/bgp/top/ases.py">get</a>(\*\*<a href="src/cloudflare/types/radar/bgp/top/ase_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/top/ase_get_response.py">AseGetResponse</a></code>
+- <code title="get /radar/bgp/top/ases/prefixes">client.radar.bgp.top.ases.<a href="./src/cloudflare/resources/radar/bgp/top/ases.py">prefixes</a>(\*\*<a href="src/cloudflare/types/radar/bgp/top/ase_prefixes_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/top/ase_prefixes_response.py">AsePrefixesResponse</a></code>
+
+### Hijacks
+
+#### Events
+
+Types:
+
+```python
+from cloudflare.types.radar.bgp.hijacks import EventListResponse
+```
+
+Methods:
+
+- <code title="get /radar/bgp/hijacks/events">client.radar.bgp.hijacks.events.<a href="./src/cloudflare/resources/radar/bgp/hijacks/events.py">list</a>(\*\*<a href="src/cloudflare/types/radar/bgp/hijacks/event_list_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/hijacks/event_list_response.py">SyncV4PagePagination[EventListResponse]</a></code>
+
+### Routes
+
+Types:
+
+```python
+from cloudflare.types.radar.bgp import (
+    RouteAsesResponse,
+    RouteMoasResponse,
+    RoutePfx2asResponse,
+    RouteRealtimeResponse,
+    RouteStatsResponse,
+)
+```
+
+Methods:
+
+- <code title="get /radar/bgp/routes/ases">client.radar.bgp.routes.<a href="./src/cloudflare/resources/radar/bgp/routes.py">ases</a>(\*\*<a href="src/cloudflare/types/radar/bgp/route_ases_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/route_ases_response.py">RouteAsesResponse</a></code>
+- <code title="get /radar/bgp/routes/moas">client.radar.bgp.routes.<a href="./src/cloudflare/resources/radar/bgp/routes.py">moas</a>(\*\*<a href="src/cloudflare/types/radar/bgp/route_moas_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/route_moas_response.py">RouteMoasResponse</a></code>
+- <code title="get /radar/bgp/routes/pfx2as">client.radar.bgp.routes.<a href="./src/cloudflare/resources/radar/bgp/routes.py">pfx2as</a>(\*\*<a href="src/cloudflare/types/radar/bgp/route_pfx2as_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/route_pfx2as_response.py">RoutePfx2asResponse</a></code>
+- <code title="get /radar/bgp/routes/realtime">client.radar.bgp.routes.<a href="./src/cloudflare/resources/radar/bgp/routes.py">realtime</a>(\*\*<a href="src/cloudflare/types/radar/bgp/route_realtime_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/route_realtime_response.py">RouteRealtimeResponse</a></code>
+- <code title="get /radar/bgp/routes/stats">client.radar.bgp.routes.<a href="./src/cloudflare/resources/radar/bgp/routes.py">stats</a>(\*\*<a href="src/cloudflare/types/radar/bgp/route_stats_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/route_stats_response.py">RouteStatsResponse</a></code>
+
+### IPs
+
+Types:
+
+```python
+from cloudflare.types.radar.bgp import IPTimeseriesResponse
+```
+
+Methods:
+
+- <code title="get /radar/bgp/ips/timeseries">client.radar.bgp.ips.<a href="./src/cloudflare/resources/radar/bgp/ips.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/bgp/ip_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/ip_timeseries_response.py">IPTimeseriesResponse</a></code>
+
+### RPKI
+
+#### ASPA
+
+Types:
+
+```python
+from cloudflare.types.radar.bgp.rpki import (
+    ASPAChangesResponse,
+    ASPASnapshotResponse,
+    ASPATimeseriesResponse,
+)
+```
+
+Methods:
+
+- <code title="get /radar/bgp/rpki/aspa/changes">client.radar.bgp.rpki.aspa.<a href="./src/cloudflare/resources/radar/bgp/rpki/aspa.py">changes</a>(\*\*<a href="src/cloudflare/types/radar/bgp/rpki/aspa_changes_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/rpki/aspa_changes_response.py">ASPAChangesResponse</a></code>
+- <code title="get /radar/bgp/rpki/aspa/snapshot">client.radar.bgp.rpki.aspa.<a href="./src/cloudflare/resources/radar/bgp/rpki/aspa.py">snapshot</a>(\*\*<a href="src/cloudflare/types/radar/bgp/rpki/aspa_snapshot_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/rpki/aspa_snapshot_response.py">ASPASnapshotResponse</a></code>
+- <code title="get /radar/bgp/rpki/aspa/timeseries">client.radar.bgp.rpki.aspa.<a href="./src/cloudflare/resources/radar/bgp/rpki/aspa.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/bgp/rpki/aspa_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/rpki/aspa_timeseries_response.py">ASPATimeseriesResponse</a></code>
+
+## Bots
+
+Types:
+
+```python
+from cloudflare.types.radar import (
+    BotListResponse,
+    BotGetResponse,
+    BotSummaryResponse,
+    BotTimeseriesResponse,
+    BotTimeseriesGroupsResponse,
+)
+```
+
+Methods:
+
+- <code title="get /radar/bots">client.radar.bots.<a href="./src/cloudflare/resources/radar/bots/bots.py">list</a>(\*\*<a href="src/cloudflare/types/radar/bot_list_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bot_list_response.py">BotListResponse</a></code>
+- <code title="get /radar/bots/{bot_slug}">client.radar.bots.<a href="./src/cloudflare/resources/radar/bots/bots.py">get</a>(bot_slug, \*\*<a href="src/cloudflare/types/radar/bot_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bot_get_response.py">BotGetResponse</a></code>
+- <code title="get /radar/bots/summary/{dimension}">client.radar.bots.<a href="./src/cloudflare/resources/radar/bots/bots.py">summary</a>(dimension, \*\*<a href="src/cloudflare/types/radar/bot_summary_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bot_summary_response.py">BotSummaryResponse</a></code>
+- <code title="get /radar/bots/timeseries">client.radar.bots.<a href="./src/cloudflare/resources/radar/bots/bots.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/bot_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bot_timeseries_response.py">BotTimeseriesResponse</a></code>
+- <code title="get /radar/bots/timeseries_groups/{dimension}">client.radar.bots.<a href="./src/cloudflare/resources/radar/bots/bots.py">timeseries_groups</a>(dimension, \*\*<a href="src/cloudflare/types/radar/bot_timeseries_groups_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bot_timeseries_groups_response.py">BotTimeseriesGroupsResponse</a></code>
+
+### WebCrawlers
+
+Types:
+
+```python
+from cloudflare.types.radar.bots import (
+    WebCrawlerSummaryResponse,
+    WebCrawlerTimeseriesGroupsResponse,
+)
+```
+
+Methods:
+
+- <code title="get /radar/bots/crawlers/summary/{dimension}">client.radar.bots.web_crawlers.<a href="./src/cloudflare/resources/radar/bots/web_crawlers.py">summary</a>(dimension, \*\*<a href="src/cloudflare/types/radar/bots/web_crawler_summary_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bots/web_crawler_summary_response.py">WebCrawlerSummaryResponse</a></code>
+- <code title="get /radar/bots/crawlers/timeseries_groups/{dimension}">client.radar.bots.web_crawlers.<a href="./src/cloudflare/resources/radar/bots/web_crawlers.py">timeseries_groups</a>(dimension, \*\*<a href="src/cloudflare/types/radar/bots/web_crawler_timeseries_groups_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bots/web_crawler_timeseries_groups_response.py">WebCrawlerTimeseriesGroupsResponse</a></code>
+
+## Datasets
+
+Types:
+
+```python
+from cloudflare.types.radar import DatasetListResponse, DatasetDownloadResponse, DatasetGetResponse
+```
+
+Methods:
+
+- <code title="get /radar/datasets">client.radar.datasets.<a href="./src/cloudflare/resources/radar/datasets.py">list</a>(\*\*<a href="src/cloudflare/types/radar/dataset_list_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dataset_list_response.py">DatasetListResponse</a></code>
+- <code title="post /radar/datasets/download">client.radar.datasets.<a href="./src/cloudflare/resources/radar/datasets.py">download</a>(\*\*<a href="src/cloudflare/types/radar/dataset_download_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dataset_download_response.py">DatasetDownloadResponse</a></code>
+- <code title="get /radar/datasets/{alias}">client.radar.datasets.<a href="./src/cloudflare/resources/radar/datasets.py">get</a>(alias) -> str</code>
+
+## DNS
+
+Types:
+
+```python
+from cloudflare.types.radar import (
+    DNSSummaryV2Response,
+    DNSTimeseriesResponse,
+    DNSTimeseriesGroupsV2Response,
+)
+```
+
+Methods:
+
+- <code title="get /radar/dns/summary/{dimension}">client.radar.dns.<a href="./src/cloudflare/resources/radar/dns/dns.py">summary_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/dns_summary_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns_summary_v2_response.py">DNSSummaryV2Response</a></code>
+- <code title="get /radar/dns/timeseries">client.radar.dns.<a href="./src/cloudflare/resources/radar/dns/dns.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/dns_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns_timeseries_response.py">DNSTimeseriesResponse</a></code>
+- <code title="get /radar/dns/timeseries_groups/{dimension}">client.radar.dns.<a href="./src/cloudflare/resources/radar/dns/dns.py">timeseries_groups_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/dns_timeseries_groups_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns_timeseries_groups_v2_response.py">DNSTimeseriesGroupsV2Response</a></code>
+
+### Top
+
+Types:
+
+```python
+from cloudflare.types.radar.dns import TopAsesResponse, TopLocationsResponse
+```
+
+Methods:
+
+- <code title="get /radar/dns/top/ases">client.radar.dns.top.<a href="./src/cloudflare/resources/radar/dns/top.py">ases</a>(\*\*<a href="src/cloudflare/types/radar/dns/top_ases_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/top_ases_response.py">TopAsesResponse</a></code>
+- <code title="get /radar/dns/top/locations">client.radar.dns.top.<a href="./src/cloudflare/resources/radar/dns/top.py">locations</a>(\*\*<a href="src/cloudflare/types/radar/dns/top_locations_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/top_locations_response.py">TopLocationsResponse</a></code>
+
+### Summary
+
+Types:
+
+```python
+from cloudflare.types.radar.dns import (
+    SummaryCacheHitResponse,
+    SummaryDNSSECResponse,
+    SummaryDNSSECAwareResponse,
+    SummaryDNSSECE2EResponse,
+    SummaryIPVersionResponse,
+    SummaryMatchingAnswerResponse,
+    SummaryProtocolResponse,
+    SummaryQueryTypeResponse,
+    SummaryResponseCodeResponse,
+    SummaryResponseTTLResponse,
+)
+```
+
+Methods:
+
+- <code title="get /radar/dns/summary/cache_hit">client.radar.dns.summary.<a href="./src/cloudflare/resources/radar/dns/summary.py">cache_hit</a>(\*\*<a href="src/cloudflare/types/radar/dns/summary_cache_hit_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/summary_cache_hit_response.py">SummaryCacheHitResponse</a></code>
+- <code title="get /radar/dns/summary/dnssec">client.radar.dns.summary.<a href="./src/cloudflare/resources/radar/dns/summary.py">dnssec</a>(\*\*<a href="src/cloudflare/types/radar/dns/summary_dnssec_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/summary_dnssec_response.py">SummaryDNSSECResponse</a></code>
+- <code title="get /radar/dns/summary/dnssec_aware">client.radar.dns.summary.<a href="./src/cloudflare/resources/radar/dns/summary.py">dnssec_aware</a>(\*\*<a href="src/cloudflare/types/radar/dns/summary_dnssec_aware_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/summary_dnssec_aware_response.py">SummaryDNSSECAwareResponse</a></code>
+- <code title="get /radar/dns/summary/dnssec_e2e">client.radar.dns.summary.<a href="./src/cloudflare/resources/radar/dns/summary.py">dnssec_e2e</a>(\*\*<a href="src/cloudflare/types/radar/dns/summary_dnssec_e2e_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/summary_dnssec_e2e_response.py">SummaryDNSSECE2EResponse</a></code>
+- <code title="get /radar/dns/summary/ip_version">client.radar.dns.summary.<a href="./src/cloudflare/resources/radar/dns/summary.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/dns/summary_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/summary_ip_version_response.py">SummaryIPVersionResponse</a></code>
+- <code title="get /radar/dns/summary/matching_answer">client.radar.dns.summary.<a href="./src/cloudflare/resources/radar/dns/summary.py">matching_answer</a>(\*\*<a href="src/cloudflare/types/radar/dns/summary_matching_answer_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/summary_matching_answer_response.py">SummaryMatchingAnswerResponse</a></code>
+- <code title="get /radar/dns/summary/protocol">client.radar.dns.summary.<a href="./src/cloudflare/resources/radar/dns/summary.py">protocol</a>(\*\*<a href="src/cloudflare/types/radar/dns/summary_protocol_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/summary_protocol_response.py">SummaryProtocolResponse</a></code>
+- <code title="get /radar/dns/summary/query_type">client.radar.dns.summary.<a href="./src/cloudflare/resources/radar/dns/summary.py">query_type</a>(\*\*<a href="src/cloudflare/types/radar/dns/summary_query_type_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/summary_query_type_response.py">SummaryQueryTypeResponse</a></code>
+- <code title="get /radar/dns/summary/response_code">client.radar.dns.summary.<a href="./src/cloudflare/resources/radar/dns/summary.py">response_code</a>(\*\*<a href="src/cloudflare/types/radar/dns/summary_response_code_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/summary_response_code_response.py">SummaryResponseCodeResponse</a></code>
+- <code title="get /radar/dns/summary/response_ttl">client.radar.dns.summary.<a href="./src/cloudflare/resources/radar/dns/summary.py">response_ttl</a>(\*\*<a href="src/cloudflare/types/radar/dns/summary_response_ttl_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/summary_response_ttl_response.py">SummaryResponseTTLResponse</a></code>
+
+### TimeseriesGroups
+
+Types:
+
+```python
+from cloudflare.types.radar.dns import (
+    TimeseriesGroupCacheHitResponse,
+    TimeseriesGroupDNSSECResponse,
+    TimeseriesGroupDNSSECAwareResponse,
+    TimeseriesGroupDNSSECE2EResponse,
+    TimeseriesGroupIPVersionResponse,
+    TimeseriesGroupMatchingAnswerResponse,
+    TimeseriesGroupProtocolResponse,
+    TimeseriesGroupQueryTypeResponse,
+    TimeseriesGroupResponseCodeResponse,
+    TimeseriesGroupResponseTTLResponse,
+)
+```
+
+Methods:
+
+- <code title="get /radar/dns/timeseries_groups/cache_hit">client.radar.dns.timeseries_groups.<a href="./src/cloudflare/resources/radar/dns/timeseries_groups.py">cache_hit</a>(\*\*<a href="src/cloudflare/types/radar/dns/timeseries_group_cache_hit_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/timeseries_group_cache_hit_response.py">TimeseriesGroupCacheHitResponse</a></code>
+- <code title="get /radar/dns/timeseries_groups/dnssec">client.radar.dns.timeseries_groups.<a href="./src/cloudflare/resources/radar/dns/timeseries_groups.py">dnssec</a>(\*\*<a href="src/cloudflare/types/radar/dns/timeseries_group_dnssec_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/timeseries_group_dnssec_response.py">TimeseriesGroupDNSSECResponse</a></code>
+- <code title="get /radar/dns/timeseries_groups/dnssec_aware">client.radar.dns.timeseries_groups.<a href="./src/cloudflare/resources/radar/dns/timeseries_groups.py">dnssec_aware</a>(\*\*<a href="src/cloudflare/types/radar/dns/timeseries_group_dnssec_aware_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/timeseries_group_dnssec_aware_response.py">TimeseriesGroupDNSSECAwareResponse</a></code>
+- <code title="get /radar/dns/timeseries_groups/dnssec_e2e">client.radar.dns.timeseries_groups.<a href="./src/cloudflare/resources/radar/dns/timeseries_groups.py">dnssec_e2e</a>(\*\*<a href="src/cloudflare/types/radar/dns/timeseries_group_dnssec_e2e_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/timeseries_group_dnssec_e2e_response.py">TimeseriesGroupDNSSECE2EResponse</a></code>
+- <code title="get /radar/dns/timeseries_groups/ip_version">client.radar.dns.timeseries_groups.<a href="./src/cloudflare/resources/radar/dns/timeseries_groups.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/dns/timeseries_group_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/timeseries_group_ip_version_response.py">TimeseriesGroupIPVersionResponse</a></code>
+- <code title="get /radar/dns/timeseries_groups/matching_answer">client.radar.dns.timeseries_groups.<a href="./src/cloudflare/resources/radar/dns/timeseries_groups.py">matching_answer</a>(\*\*<a href="src/cloudflare/types/radar/dns/timeseries_group_matching_answer_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/timeseries_group_matching_answer_response.py">TimeseriesGroupMatchingAnswerResponse</a></code>
+- <code title="get /radar/dns/timeseries_groups/protocol">client.radar.dns.timeseries_groups.<a href="./src/cloudflare/resources/radar/dns/timeseries_groups.py">protocol</a>(\*\*<a href="src/cloudflare/types/radar/dns/timeseries_group_protocol_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/timeseries_group_protocol_response.py">TimeseriesGroupProtocolResponse</a></code>
+- <code title="get /radar/dns/timeseries_groups/query_type">client.radar.dns.timeseries_groups.<a href="./src/cloudflare/resources/radar/dns/timeseries_groups.py">query_type</a>(\*\*<a href="src/cloudflare/types/radar/dns/timeseries_group_query_type_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/timeseries_group_query_type_response.py">TimeseriesGroupQueryTypeResponse</a></code>
+- <code title="get /radar/dns/timeseries_groups/response_code">client.radar.dns.timeseries_groups.<a href="./src/cloudflare/resources/radar/dns/timeseries_groups.py">response_code</a>(\*\*<a href="src/cloudflare/types/radar/dns/timeseries_group_response_code_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/timeseries_group_response_code_response.py">TimeseriesGroupResponseCodeResponse</a></code>
+- <code title="get /radar/dns/timeseries_groups/response_ttl">client.radar.dns.timeseries_groups.<a href="./src/cloudflare/resources/radar/dns/timeseries_groups.py">response_ttl</a>(\*\*<a href="src/cloudflare/types/radar/dns/timeseries_group_response_ttl_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/timeseries_group_response_ttl_response.py">TimeseriesGroupResponseTTLResponse</a></code>
+
+## NetFlows
+
+Types:
+
+```python
+from cloudflare.types.radar import (
+    NetFlowsSummaryResponse,
+    NetFlowsSummaryV2Response,
+    NetFlowsTimeseriesResponse,
+    NetFlowsTimeseriesGroupsResponse,
+)
+```
+
+Methods:
+
+- <code title="get /radar/netflows/summary">client.radar.netflows.<a href="./src/cloudflare/resources/radar/netflows/netflows.py">summary</a>(\*\*<a href="src/cloudflare/types/radar/netflows_summary_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/netflows_summary_response.py">NetFlowsSummaryResponse</a></code>
+- <code title="get /radar/netflows/summary/{dimension}">client.radar.netflows.<a href="./src/cloudflare/resources/radar/netflows/netflows.py">summary_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/netflows_summary_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/netflows_summary_v2_response.py">NetFlowsSummaryV2Response</a></code>
+- <code title="get /radar/netflows/timeseries">client.radar.netflows.<a href="./src/cloudflare/resources/radar/netflows/netflows.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/netflows_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/netflows_timeseries_response.py">NetFlowsTimeseriesResponse</a></code>
+- <code title="get /radar/netflows/timeseries_groups/{dimension}">client.radar.netflows.<a href="./src/cloudflare/resources/radar/netflows/netflows.py">timeseries_groups</a>(dimension, \*\*<a href="src/cloudflare/types/radar/netflows_timeseries_groups_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/netflows_timeseries_groups_response.py">NetFlowsTimeseriesGroupsResponse</a></code>
+
+### Top
+
+Types:
+
+```python
+from cloudflare.types.radar.netflows import TopAsesResponse, TopLocationsResponse
+```
+
+Methods:
+
+- <code title="get /radar/netflows/top/ases">client.radar.netflows.top.<a href="./src/cloudflare/resources/radar/netflows/top.py">ases</a>(\*\*<a href="src/cloudflare/types/radar/netflows/top_ases_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/netflows/top_ases_response.py">TopAsesResponse</a></code>
+- <code title="get /radar/netflows/top/locations">client.radar.netflows.top.<a href="./src/cloudflare/resources/radar/netflows/top.py">locations</a>(\*\*<a href="src/cloudflare/types/radar/netflows/top_locations_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/netflows/top_locations_response.py">TopLocationsResponse</a></code>
+
+## Search
+
+Types:
+
+```python
+from cloudflare.types.radar import SearchGlobalResponse
+```
+
+Methods:
+
+- <code title="get /radar/search/global">client.radar.search.<a href="./src/cloudflare/resources/radar/search.py">global\_</a>(\*\*<a href="src/cloudflare/types/radar/search_global_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/search_global_response.py">SearchGlobalResponse</a></code>
+
+## VerifiedBots
+
+### Top
+
+Types:
+
+```python
+from cloudflare.types.radar.verified_bots import TopBotsResponse, TopCategoriesResponse
+```
+
+Methods:
+
+- <code title="get /radar/verified_bots/top/bots">client.radar.verified_bots.top.<a href="./src/cloudflare/resources/radar/verified_bots/top.py">bots</a>(\*\*<a href="src/cloudflare/types/radar/verified_bots/top_bots_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/verified_bots/top_bots_response.py">TopBotsResponse</a></code>
+- <code title="get /radar/verified_bots/top/categories">client.radar.verified_bots.top.<a href="./src/cloudflare/resources/radar/verified_bots/top.py">categories</a>(\*\*<a href="src/cloudflare/types/radar/verified_bots/top_categories_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/verified_bots/top_categories_response.py">TopCategoriesResponse</a></code>
+
+## AS112
+
+Types:
+
+```python
+from cloudflare.types.radar import (
+    AS112SummaryV2Response,
+    AS112TimeseriesResponse,
+    AS112TimeseriesGroupsV2Response,
+)
+```
+
+Methods:
+
+- <code title="get /radar/as112/summary/{dimension}">client.radar.as112.<a href="./src/cloudflare/resources/radar/as112/as112.py">summary_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/as112_summary_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112_summary_v2_response.py">AS112SummaryV2Response</a></code>
+- <code title="get /radar/as112/timeseries">client.radar.as112.<a href="./src/cloudflare/resources/radar/as112/as112.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/as112_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112_timeseries_response.py">AS112TimeseriesResponse</a></code>
+- <code title="get /radar/as112/timeseries_groups/{dimension}">client.radar.as112.<a href="./src/cloudflare/resources/radar/as112/as112.py">timeseries_groups_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/as112_timeseries_groups_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112_timeseries_groups_v2_response.py">AS112TimeseriesGroupsV2Response</a></code>
+
+### Summary
+
+Types:
+
+```python
+from cloudflare.types.radar.as112 import (
+    SummaryDNSSECResponse,
+    SummaryEdnsResponse,
+    SummaryIPVersionResponse,
+    SummaryProtocolResponse,
+    SummaryQueryTypeResponse,
+    SummaryResponseCodesResponse,
+)
+```
+
+Methods:
+
+- <code title="get /radar/as112/summary/dnssec">client.radar.as112.summary.<a href="./src/cloudflare/resources/radar/as112/summary.py">dnssec</a>(\*\*<a href="src/cloudflare/types/radar/as112/summary_dnssec_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/summary_dnssec_response.py">SummaryDNSSECResponse</a></code>
+- <code title="get /radar/as112/summary/edns">client.radar.as112.summary.<a href="./src/cloudflare/resources/radar/as112/summary.py">edns</a>(\*\*<a href="src/cloudflare/types/radar/as112/summary_edns_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/summary_edns_response.py">SummaryEdnsResponse</a></code>
+- <code title="get /radar/as112/summary/ip_version">client.radar.as112.summary.<a href="./src/cloudflare/resources/radar/as112/summary.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/as112/summary_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/summary_ip_version_response.py">SummaryIPVersionResponse</a></code>
+- <code title="get /radar/as112/summary/protocol">client.radar.as112.summary.<a href="./src/cloudflare/resources/radar/as112/summary.py">protocol</a>(\*\*<a href="src/cloudflare/types/radar/as112/summary_protocol_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/summary_protocol_response.py">SummaryProtocolResponse</a></code>
+- <code title="get /radar/as112/summary/query_type">client.radar.as112.summary.<a href="./src/cloudflare/resources/radar/as112/summary.py">query_type</a>(\*\*<a href="src/cloudflare/types/radar/as112/summary_query_type_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/summary_query_type_response.py">SummaryQueryTypeResponse</a></code>
+- <code title="get /radar/as112/summary/response_codes">client.radar.as112.summary.<a href="./src/cloudflare/resources/radar/as112/summary.py">response_codes</a>(\*\*<a href="src/cloudflare/types/radar/as112/summary_response_codes_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/summary_response_codes_response.py">SummaryResponseCodesResponse</a></code>
+
+### TimeseriesGroups
+
+Types:
+
+```python
+from cloudflare.types.radar.as112 import (
+    TimeseriesGroupDNSSECResponse,
+    TimeseriesGroupEdnsResponse,
+    TimeseriesGroupIPVersionResponse,
+    TimeseriesGroupProtocolResponse,
+    TimeseriesGroupQueryTypeResponse,
+    TimeseriesGroupResponseCodesResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/devices/posture/integration">client.zero_trust.devices.posture.integrations.<a href="./src/cloudflare/resources/zero_trust/devices/posture/integrations.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/posture/integration_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/posture/integration.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/devices/posture/integration">client.zero_trust.devices.posture.integrations.<a href="./src/cloudflare/resources/zero_trust/devices/posture/integrations.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/posture/integration.py">SyncSinglePage[Integration]</a></code>
-- <code title="delete /accounts/{account_id}/devices/posture/integration/{integration_id}">client.zero_trust.devices.posture.integrations.<a href="./src/cloudflare/resources/zero_trust/devices/posture/integrations.py">delete</a>(integration_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/posture/integration_delete_response.py">IntegrationDeleteResponse</a></code>
-- <code title="patch /accounts/{account_id}/devices/posture/integration/{integration_id}">client.zero_trust.devices.posture.integrations.<a href="./src/cloudflare/resources/zero_trust/devices/posture/integrations.py">edit</a>(integration_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/posture/integration_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/posture/integration.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/devices/posture/integration/{integration_id}">client.zero_trust.devices.posture.integrations.<a href="./src/cloudflare/resources/zero_trust/devices/posture/integrations.py">get</a>(integration_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/posture/integration.py">Optional</a></code>
+- <code title="get /radar/as112/timeseries_groups/dnssec">client.radar.as112.timeseries_groups.<a href="./src/cloudflare/resources/radar/as112/timeseries_groups.py">dnssec</a>(\*\*<a href="src/cloudflare/types/radar/as112/timeseries_group_dnssec_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/timeseries_group_dnssec_response.py">TimeseriesGroupDNSSECResponse</a></code>
+- <code title="get /radar/as112/timeseries_groups/edns">client.radar.as112.timeseries_groups.<a href="./src/cloudflare/resources/radar/as112/timeseries_groups.py">edns</a>(\*\*<a href="src/cloudflare/types/radar/as112/timeseries_group_edns_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/timeseries_group_edns_response.py">TimeseriesGroupEdnsResponse</a></code>
+- <code title="get /radar/as112/timeseries_groups/ip_version">client.radar.as112.timeseries_groups.<a href="./src/cloudflare/resources/radar/as112/timeseries_groups.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/as112/timeseries_group_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/timeseries_group_ip_version_response.py">TimeseriesGroupIPVersionResponse</a></code>
+- <code title="get /radar/as112/timeseries_groups/protocol">client.radar.as112.timeseries_groups.<a href="./src/cloudflare/resources/radar/as112/timeseries_groups.py">protocol</a>(\*\*<a href="src/cloudflare/types/radar/as112/timeseries_group_protocol_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/timeseries_group_protocol_response.py">TimeseriesGroupProtocolResponse</a></code>
+- <code title="get /radar/as112/timeseries_groups/query_type">client.radar.as112.timeseries_groups.<a href="./src/cloudflare/resources/radar/as112/timeseries_groups.py">query_type</a>(\*\*<a href="src/cloudflare/types/radar/as112/timeseries_group_query_type_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/timeseries_group_query_type_response.py">TimeseriesGroupQueryTypeResponse</a></code>
+- <code title="get /radar/as112/timeseries_groups/response_codes">client.radar.as112.timeseries_groups.<a href="./src/cloudflare/resources/radar/as112/timeseries_groups.py">response_codes</a>(\*\*<a href="src/cloudflare/types/radar/as112/timeseries_group_response_codes_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/timeseries_group_response_codes_response.py">TimeseriesGroupResponseCodesResponse</a></code>
 
-### Revoke
+### Top
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.devices import RevokeCreateResponse
+from cloudflare.types.radar.as112 import (
+    TopDNSSECResponse,
+    TopEdnsResponse,
+    TopIPVersionResponse,
+    TopLocationsResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/devices/revoke">client.zero_trust.devices.revoke.<a href="./src/cloudflare/resources/zero_trust/devices/revoke.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/revoke_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/revoke_create_response.py">RevokeCreateResponse</a></code>
+- <code title="get /radar/as112/top/locations/dnssec/{dnssec}">client.radar.as112.top.<a href="./src/cloudflare/resources/radar/as112/top.py">dnssec</a>(dnssec, \*\*<a href="src/cloudflare/types/radar/as112/top_dnssec_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/top_dnssec_response.py">TopDNSSECResponse</a></code>
+- <code title="get /radar/as112/top/locations/edns/{edns}">client.radar.as112.top.<a href="./src/cloudflare/resources/radar/as112/top.py">edns</a>(edns, \*\*<a href="src/cloudflare/types/radar/as112/top_edns_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/top_edns_response.py">TopEdnsResponse</a></code>
+- <code title="get /radar/as112/top/locations/ip_version/{ip_version}">client.radar.as112.top.<a href="./src/cloudflare/resources/radar/as112/top.py">ip_version</a>(ip_version, \*\*<a href="src/cloudflare/types/radar/as112/top_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/top_ip_version_response.py">TopIPVersionResponse</a></code>
+- <code title="get /radar/as112/top/locations">client.radar.as112.top.<a href="./src/cloudflare/resources/radar/as112/top.py">locations</a>(\*\*<a href="src/cloudflare/types/radar/as112/top_locations_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/top_locations_response.py">TopLocationsResponse</a></code>
 
-### Settings
+## Email
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.devices import DeviceSettings
+from cloudflare.types.radar import RadarEmailSeries, RadarEmailSummary
+```
+
+### Routing
+
+Types:
+
+```python
+from cloudflare.types.radar.email import RoutingSummaryV2Response, RoutingTimeseriesGroupsV2Response
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/devices/settings">client.zero_trust.devices.settings.<a href="./src/cloudflare/resources/zero_trust/devices/settings.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/setting_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/device_settings.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/devices/settings">client.zero_trust.devices.settings.<a href="./src/cloudflare/resources/zero_trust/devices/settings.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/device_settings.py">Optional</a></code>
+- <code title="get /radar/email/routing/summary/{dimension}">client.radar.email.routing.<a href="./src/cloudflare/resources/radar/email/routing/routing.py">summary_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/email/routing_summary_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing_summary_v2_response.py">RoutingSummaryV2Response</a></code>
+- <code title="get /radar/email/routing/timeseries_groups/{dimension}">client.radar.email.routing.<a href="./src/cloudflare/resources/radar/email/routing/routing.py">timeseries_groups_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/email/routing_timeseries_groups_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing_timeseries_groups_v2_response.py">RoutingTimeseriesGroupsV2Response</a></code>
 
-### Unrevoke
+#### Summary
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.devices import UnrevokeCreateResponse
+from cloudflare.types.radar.email.routing import (
+    SummaryARCResponse,
+    SummaryDKIMResponse,
+    SummaryDMARCResponse,
+    SummaryEncryptedResponse,
+    SummaryIPVersionResponse,
+    SummarySPFResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/devices/unrevoke">client.zero_trust.devices.unrevoke.<a href="./src/cloudflare/resources/zero_trust/devices/unrevoke.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/devices/unrevoke_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/devices/unrevoke_create_response.py">UnrevokeCreateResponse</a></code>
+- <code title="get /radar/email/routing/summary/arc">client.radar.email.routing.summary.<a href="./src/cloudflare/resources/radar/email/routing/summary.py">arc</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/summary_arc_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/summary_arc_response.py">SummaryARCResponse</a></code>
+- <code title="get /radar/email/routing/summary/dkim">client.radar.email.routing.summary.<a href="./src/cloudflare/resources/radar/email/routing/summary.py">dkim</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/summary_dkim_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/summary_dkim_response.py">SummaryDKIMResponse</a></code>
+- <code title="get /radar/email/routing/summary/dmarc">client.radar.email.routing.summary.<a href="./src/cloudflare/resources/radar/email/routing/summary.py">dmarc</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/summary_dmarc_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/summary_dmarc_response.py">SummaryDMARCResponse</a></code>
+- <code title="get /radar/email/routing/summary/encrypted">client.radar.email.routing.summary.<a href="./src/cloudflare/resources/radar/email/routing/summary.py">encrypted</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/summary_encrypted_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/summary_encrypted_response.py">SummaryEncryptedResponse</a></code>
+- <code title="get /radar/email/routing/summary/ip_version">client.radar.email.routing.summary.<a href="./src/cloudflare/resources/radar/email/routing/summary.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/summary_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/summary_ip_version_response.py">SummaryIPVersionResponse</a></code>
+- <code title="get /radar/email/routing/summary/spf">client.radar.email.routing.summary.<a href="./src/cloudflare/resources/radar/email/routing/summary.py">spf</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/summary_spf_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/summary_spf_response.py">SummarySPFResponse</a></code>
 
-### OverrideCodes
+#### TimeseriesGroups
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.devices import OverrideCodeListResponse
+from cloudflare.types.radar.email.routing import (
+    TimeseriesGroupARCResponse,
+    TimeseriesGroupDKIMResponse,
+    TimeseriesGroupDMARCResponse,
+    TimeseriesGroupEncryptedResponse,
+    TimeseriesGroupIPVersionResponse,
+    TimeseriesGroupSPFResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/devices/{device_id}/override_codes">client.zero_trust.devices.override_codes.<a href="./src/cloudflare/resources/zero_trust/devices/override_codes.py">list</a>(device_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/devices/override_code_list_response.py">Optional</a></code>
+- <code title="get /radar/email/routing/timeseries_groups/arc">client.radar.email.routing.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/routing/timeseries_groups.py">arc</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/timeseries_group_arc_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/timeseries_group_arc_response.py">TimeseriesGroupARCResponse</a></code>
+- <code title="get /radar/email/routing/timeseries_groups/dkim">client.radar.email.routing.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/routing/timeseries_groups.py">dkim</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/timeseries_group_dkim_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/timeseries_group_dkim_response.py">TimeseriesGroupDKIMResponse</a></code>
+- <code title="get /radar/email/routing/timeseries_groups/dmarc">client.radar.email.routing.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/routing/timeseries_groups.py">dmarc</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/timeseries_group_dmarc_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/timeseries_group_dmarc_response.py">TimeseriesGroupDMARCResponse</a></code>
+- <code title="get /radar/email/routing/timeseries_groups/encrypted">client.radar.email.routing.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/routing/timeseries_groups.py">encrypted</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/timeseries_group_encrypted_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/timeseries_group_encrypted_response.py">TimeseriesGroupEncryptedResponse</a></code>
+- <code title="get /radar/email/routing/timeseries_groups/ip_version">client.radar.email.routing.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/routing/timeseries_groups.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/timeseries_group_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/timeseries_group_ip_version_response.py">TimeseriesGroupIPVersionResponse</a></code>
+- <code title="get /radar/email/routing/timeseries_groups/spf">client.radar.email.routing.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/routing/timeseries_groups.py">spf</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/timeseries_group_spf_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/timeseries_group_spf_response.py">TimeseriesGroupSPFResponse</a></code>
 
-## IdentityProviders
+### Security
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust import (
-    AzureAD,
-    GenericOAuthConfig,
-    IdentityProvider,
-    IdentityProviderType,
-    SCIMConfig,
-    IdentityProviderListResponse,
-    IdentityProviderDeleteResponse,
+from cloudflare.types.radar.email import (
+    SecuritySummaryV2Response,
+    SecurityTimeseriesGroupsV2Response,
 )
 ```
 
 Methods:
 
-- <code title="post /{account_or_zone}/{account_or_zone_id}/access/identity_providers">client.zero_trust.identity_providers.<a href="./src/cloudflare/resources/zero_trust/identity_providers.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/identity_provider_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/identity_provider.py">Optional</a></code>
-- <code title="put /{account_or_zone}/{account_or_zone_id}/access/identity_providers/{identity_provider_id}">client.zero_trust.identity_providers.<a href="./src/cloudflare/resources/zero_trust/identity_providers.py">update</a>(identity_provider_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/identity_provider_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/identity_provider.py">Optional</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/identity_providers">client.zero_trust.identity_providers.<a href="./src/cloudflare/resources/zero_trust/identity_providers.py">list</a>(\*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/identity_provider_list_response.py">SyncSinglePage[IdentityProviderListResponse]</a></code>
-- <code title="delete /{account_or_zone}/{account_or_zone_id}/access/identity_providers/{identity_provider_id}">client.zero_trust.identity_providers.<a href="./src/cloudflare/resources/zero_trust/identity_providers.py">delete</a>(identity_provider_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/identity_provider_delete_response.py">Optional</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/identity_providers/{identity_provider_id}">client.zero_trust.identity_providers.<a href="./src/cloudflare/resources/zero_trust/identity_providers.py">get</a>(identity_provider_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/identity_provider.py">Optional</a></code>
+- <code title="get /radar/email/security/summary/{dimension}">client.radar.email.security.<a href="./src/cloudflare/resources/radar/email/security/security.py">summary_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/email/security_summary_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security_summary_v2_response.py">SecuritySummaryV2Response</a></code>
+- <code title="get /radar/email/security/timeseries_groups/{dimension}">client.radar.email.security.<a href="./src/cloudflare/resources/radar/email/security/security.py">timeseries_groups_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/email/security_timeseries_groups_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security_timeseries_groups_v2_response.py">SecurityTimeseriesGroupsV2Response</a></code>
 
-## Organizations
+#### Top
+
+##### TLDs
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust import LoginDesign, Organization, OrganizationRevokeUsersResponse
+from cloudflare.types.radar.email.security.top import TLDGetResponse
+```
+
+Methods:
+
+- <code title="get /radar/email/security/top/tlds">client.radar.email.security.top.tlds.<a href="./src/cloudflare/resources/radar/email/security/top/tlds/tlds.py">get</a>(\*\*<a href="src/cloudflare/types/radar/email/security/top/tld_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/top/tld_get_response.py">TLDGetResponse</a></code>
+
+###### Malicious
+
+Types:
+
+```python
+from cloudflare.types.radar.email.security.top.tlds import MaliciousGetResponse
+```
+
+Methods:
+
+- <code title="get /radar/email/security/top/tlds/malicious/{malicious}">client.radar.email.security.top.tlds.malicious.<a href="./src/cloudflare/resources/radar/email/security/top/tlds/malicious.py">get</a>(malicious, \*\*<a href="src/cloudflare/types/radar/email/security/top/tlds/malicious_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/top/tlds/malicious_get_response.py">MaliciousGetResponse</a></code>
+
+###### Spam
+
+Types:
+
+```python
+from cloudflare.types.radar.email.security.top.tlds import SpamGetResponse
+```
+
+Methods:
+
+- <code title="get /radar/email/security/top/tlds/spam/{spam}">client.radar.email.security.top.tlds.spam.<a href="./src/cloudflare/resources/radar/email/security/top/tlds/spam.py">get</a>(spam, \*\*<a href="src/cloudflare/types/radar/email/security/top/tlds/spam_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/top/tlds/spam_get_response.py">SpamGetResponse</a></code>
+
+###### Spoof
+
+Types:
+
+```python
+from cloudflare.types.radar.email.security.top.tlds import SpoofGetResponse
+```
+
+Methods:
+
+- <code title="get /radar/email/security/top/tlds/spoof/{spoof}">client.radar.email.security.top.tlds.spoof.<a href="./src/cloudflare/resources/radar/email/security/top/tlds/spoof.py">get</a>(spoof, \*\*<a href="src/cloudflare/types/radar/email/security/top/tlds/spoof_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/top/tlds/spoof_get_response.py">SpoofGetResponse</a></code>
+
+#### Summary
+
+Types:
+
+```python
+from cloudflare.types.radar.email.security import (
+    SummaryARCResponse,
+    SummaryDKIMResponse,
+    SummaryDMARCResponse,
+    SummaryMaliciousResponse,
+    SummarySpamResponse,
+    SummarySPFResponse,
+    SummarySpoofResponse,
+    SummaryThreatCategoryResponse,
+    SummaryTLSVersionResponse,
+)
+```
+
+Methods:
+
+- <code title="get /radar/email/security/summary/arc">client.radar.email.security.summary.<a href="./src/cloudflare/resources/radar/email/security/summary.py">arc</a>(\*\*<a href="src/cloudflare/types/radar/email/security/summary_arc_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/summary_arc_response.py">SummaryARCResponse</a></code>
+- <code title="get /radar/email/security/summary/dkim">client.radar.email.security.summary.<a href="./src/cloudflare/resources/radar/email/security/summary.py">dkim</a>(\*\*<a href="src/cloudflare/types/radar/email/security/summary_dkim_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/summary_dkim_response.py">SummaryDKIMResponse</a></code>
+- <code title="get /radar/email/security/summary/dmarc">client.radar.email.security.summary.<a href="./src/cloudflare/resources/radar/email/security/summary.py">dmarc</a>(\*\*<a href="src/cloudflare/types/radar/email/security/summary_dmarc_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/summary_dmarc_response.py">SummaryDMARCResponse</a></code>
+- <code title="get /radar/email/security/summary/malicious">client.radar.email.security.summary.<a href="./src/cloudflare/resources/radar/email/security/summary.py">malicious</a>(\*\*<a href="src/cloudflare/types/radar/email/security/summary_malicious_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/summary_malicious_response.py">SummaryMaliciousResponse</a></code>
+- <code title="get /radar/email/security/summary/spam">client.radar.email.security.summary.<a href="./src/cloudflare/resources/radar/email/security/summary.py">spam</a>(\*\*<a href="src/cloudflare/types/radar/email/security/summary_spam_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/summary_spam_response.py">SummarySpamResponse</a></code>
+- <code title="get /radar/email/security/summary/spf">client.radar.email.security.summary.<a href="./src/cloudflare/resources/radar/email/security/summary.py">spf</a>(\*\*<a href="src/cloudflare/types/radar/email/security/summary_spf_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/summary_spf_response.py">SummarySPFResponse</a></code>
+- <code title="get /radar/email/security/summary/spoof">client.radar.email.security.summary.<a href="./src/cloudflare/resources/radar/email/security/summary.py">spoof</a>(\*\*<a href="src/cloudflare/types/radar/email/security/summary_spoof_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/summary_spoof_response.py">SummarySpoofResponse</a></code>
+- <code title="get /radar/email/security/summary/threat_category">client.radar.email.security.summary.<a href="./src/cloudflare/resources/radar/email/security/summary.py">threat_category</a>(\*\*<a href="src/cloudflare/types/radar/email/security/summary_threat_category_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/summary_threat_category_response.py">SummaryThreatCategoryResponse</a></code>
+- <code title="get /radar/email/security/summary/tls_version">client.radar.email.security.summary.<a href="./src/cloudflare/resources/radar/email/security/summary.py">tls_version</a>(\*\*<a href="src/cloudflare/types/radar/email/security/summary_tls_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/summary_tls_version_response.py">SummaryTLSVersionResponse</a></code>
+
+#### TimeseriesGroups
+
+Types:
+
+```python
+from cloudflare.types.radar.email.security import (
+    TimeseriesGroupARCResponse,
+    TimeseriesGroupDKIMResponse,
+    TimeseriesGroupDMARCResponse,
+    TimeseriesGroupMaliciousResponse,
+    TimeseriesGroupSpamResponse,
+    TimeseriesGroupSPFResponse,
+    TimeseriesGroupSpoofResponse,
+    TimeseriesGroupThreatCategoryResponse,
+    TimeseriesGroupTLSVersionResponse,
+)
+```
+
+Methods:
+
+- <code title="get /radar/email/security/timeseries_groups/arc">client.radar.email.security.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/security/timeseries_groups.py">arc</a>(\*\*<a href="src/cloudflare/types/radar/email/security/timeseries_group_arc_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/timeseries_group_arc_response.py">TimeseriesGroupARCResponse</a></code>
+- <code title="get /radar/email/security/timeseries_groups/dkim">client.radar.email.security.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/security/timeseries_groups.py">dkim</a>(\*\*<a href="src/cloudflare/types/radar/email/security/timeseries_group_dkim_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/timeseries_group_dkim_response.py">TimeseriesGroupDKIMResponse</a></code>
+- <code title="get /radar/email/security/timeseries_groups/dmarc">client.radar.email.security.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/security/timeseries_groups.py">dmarc</a>(\*\*<a href="src/cloudflare/types/radar/email/security/timeseries_group_dmarc_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/timeseries_group_dmarc_response.py">TimeseriesGroupDMARCResponse</a></code>
+- <code title="get /radar/email/security/timeseries_groups/malicious">client.radar.email.security.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/security/timeseries_groups.py">malicious</a>(\*\*<a href="src/cloudflare/types/radar/email/security/timeseries_group_malicious_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/timeseries_group_malicious_response.py">TimeseriesGroupMaliciousResponse</a></code>
+- <code title="get /radar/email/security/timeseries_groups/spam">client.radar.email.security.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/security/timeseries_groups.py">spam</a>(\*\*<a href="src/cloudflare/types/radar/email/security/timeseries_group_spam_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/timeseries_group_spam_response.py">TimeseriesGroupSpamResponse</a></code>
+- <code title="get /radar/email/security/timeseries_groups/spf">client.radar.email.security.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/security/timeseries_groups.py">spf</a>(\*\*<a href="src/cloudflare/types/radar/email/security/timeseries_group_spf_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/timeseries_group_spf_response.py">TimeseriesGroupSPFResponse</a></code>
+- <code title="get /radar/email/security/timeseries_groups/spoof">client.radar.email.security.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/security/timeseries_groups.py">spoof</a>(\*\*<a href="src/cloudflare/types/radar/email/security/timeseries_group_spoof_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/timeseries_group_spoof_response.py">TimeseriesGroupSpoofResponse</a></code>
+- <code title="get /radar/email/security/timeseries_groups/threat_category">client.radar.email.security.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/security/timeseries_groups.py">threat_category</a>(\*\*<a href="src/cloudflare/types/radar/email/security/timeseries_group_threat_category_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/timeseries_group_threat_category_response.py">TimeseriesGroupThreatCategoryResponse</a></code>
+- <code title="get /radar/email/security/timeseries_groups/tls_version">client.radar.email.security.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/security/timeseries_groups.py">tls_version</a>(\*\*<a href="src/cloudflare/types/radar/email/security/timeseries_group_tls_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/timeseries_group_tls_version_response.py">TimeseriesGroupTLSVersionResponse</a></code>
+
+## Attacks
+
+### Layer3
+
+Types:
+
+```python
+from cloudflare.types.radar.attacks import (
+    Layer3SummaryV2Response,
+    Layer3TimeseriesResponse,
+    Layer3TimeseriesGroupsV2Response,
+)
+```
+
+Methods:
+
+- <code title="get /radar/attacks/layer3/summary/{dimension}">client.radar.attacks.layer3.<a href="./src/cloudflare/resources/radar/attacks/layer3/layer3.py">summary_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/attacks/layer3_summary_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3_summary_v2_response.py">Layer3SummaryV2Response</a></code>
+- <code title="get /radar/attacks/layer3/timeseries">client.radar.attacks.layer3.<a href="./src/cloudflare/resources/radar/attacks/layer3/layer3.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3_timeseries_response.py">Layer3TimeseriesResponse</a></code>
+- <code title="get /radar/attacks/layer3/timeseries_groups/{dimension}">client.radar.attacks.layer3.<a href="./src/cloudflare/resources/radar/attacks/layer3/layer3.py">timeseries_groups_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/attacks/layer3_timeseries_groups_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3_timeseries_groups_v2_response.py">Layer3TimeseriesGroupsV2Response</a></code>
+
+#### Summary
+
+Types:
+
+```python
+from cloudflare.types.radar.attacks.layer3 import (
+    SummaryBitrateResponse,
+    SummaryDurationResponse,
+    SummaryIndustryResponse,
+    SummaryIPVersionResponse,
+    SummaryProtocolResponse,
+    SummaryVectorResponse,
+    SummaryVerticalResponse,
+)
+```
+
+Methods:
+
+- <code title="get /radar/attacks/layer3/summary/bitrate">client.radar.attacks.layer3.summary.<a href="./src/cloudflare/resources/radar/attacks/layer3/summary.py">bitrate</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/summary_bitrate_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/summary_bitrate_response.py">SummaryBitrateResponse</a></code>
+- <code title="get /radar/attacks/layer3/summary/duration">client.radar.attacks.layer3.summary.<a href="./src/cloudflare/resources/radar/attacks/layer3/summary.py">duration</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/summary_duration_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/summary_duration_response.py">SummaryDurationResponse</a></code>
+- <code title="get /radar/attacks/layer3/summary/industry">client.radar.attacks.layer3.summary.<a href="./src/cloudflare/resources/radar/attacks/layer3/summary.py">industry</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/summary_industry_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/summary_industry_response.py">SummaryIndustryResponse</a></code>
+- <code title="get /radar/attacks/layer3/summary/ip_version">client.radar.attacks.layer3.summary.<a href="./src/cloudflare/resources/radar/attacks/layer3/summary.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/summary_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/summary_ip_version_response.py">SummaryIPVersionResponse</a></code>
+- <code title="get /radar/attacks/layer3/summary/protocol">client.radar.attacks.layer3.summary.<a href="./src/cloudflare/resources/radar/attacks/layer3/summary.py">protocol</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/summary_protocol_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/summary_protocol_response.py">SummaryProtocolResponse</a></code>
+- <code title="get /radar/attacks/layer3/summary/vector">client.radar.attacks.layer3.summary.<a href="./src/cloudflare/resources/radar/attacks/layer3/summary.py">vector</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/summary_vector_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/summary_vector_response.py">SummaryVectorResponse</a></code>
+- <code title="get /radar/attacks/layer3/summary/vertical">client.radar.attacks.layer3.summary.<a href="./src/cloudflare/resources/radar/attacks/layer3/summary.py">vertical</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/summary_vertical_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/summary_vertical_response.py">SummaryVerticalResponse</a></code>
+
+#### TimeseriesGroups
+
+Types:
+
+```python
+from cloudflare.types.radar.attacks.layer3 import (
+    TimeseriesGroupBitrateResponse,
+    TimeseriesGroupDurationResponse,
+    TimeseriesGroupIndustryResponse,
+    TimeseriesGroupIPVersionResponse,
+    TimeseriesGroupProtocolResponse,
+    TimeseriesGroupVectorResponse,
+    TimeseriesGroupVerticalResponse,
+)
+```
+
+Methods:
+
+- <code title="get /radar/attacks/layer3/timeseries_groups/bitrate">client.radar.attacks.layer3.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py">bitrate</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/timeseries_group_bitrate_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/timeseries_group_bitrate_response.py">TimeseriesGroupBitrateResponse</a></code>
+- <code title="get /radar/attacks/layer3/timeseries_groups/duration">client.radar.attacks.layer3.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py">duration</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/timeseries_group_duration_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/timeseries_group_duration_response.py">TimeseriesGroupDurationResponse</a></code>
+- <code title="get /radar/attacks/layer3/timeseries_groups/industry">client.radar.attacks.layer3.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py">industry</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/timeseries_group_industry_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/timeseries_group_industry_response.py">TimeseriesGroupIndustryResponse</a></code>
+- <code title="get /radar/attacks/layer3/timeseries_groups/ip_version">client.radar.attacks.layer3.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/timeseries_group_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/timeseries_group_ip_version_response.py">TimeseriesGroupIPVersionResponse</a></code>
+- <code title="get /radar/attacks/layer3/timeseries_groups/protocol">client.radar.attacks.layer3.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py">protocol</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/timeseries_group_protocol_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/timeseries_group_protocol_response.py">TimeseriesGroupProtocolResponse</a></code>
+- <code title="get /radar/attacks/layer3/timeseries_groups/vector">client.radar.attacks.layer3.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py">vector</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/timeseries_group_vector_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/timeseries_group_vector_response.py">TimeseriesGroupVectorResponse</a></code>
+- <code title="get /radar/attacks/layer3/timeseries_groups/vertical">client.radar.attacks.layer3.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py">vertical</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/timeseries_group_vertical_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/timeseries_group_vertical_response.py">TimeseriesGroupVerticalResponse</a></code>
+
+#### Top
+
+Types:
+
+```python
+from cloudflare.types.radar.attacks.layer3 import (
+    TopAttacksResponse,
+    TopIndustryResponse,
+    TopVerticalResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /{account_or_zone}/{account_or_zone_id}/access/organizations">client.zero_trust.organizations.<a href="./src/cloudflare/resources/zero_trust/organizations.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/organization_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/organization.py">Optional</a></code>
-- <code title="put /{account_or_zone}/{account_or_zone_id}/access/organizations">client.zero_trust.organizations.<a href="./src/cloudflare/resources/zero_trust/organizations.py">update</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/organization_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/organization.py">Optional</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/organizations">client.zero_trust.organizations.<a href="./src/cloudflare/resources/zero_trust/organizations.py">list</a>(\*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/organization.py">Optional</a></code>
-- <code title="post /{account_or_zone}/{account_or_zone_id}/access/organizations/revoke_user">client.zero_trust.organizations.<a href="./src/cloudflare/resources/zero_trust/organizations.py">revoke_users</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/organization_revoke_users_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/organization_revoke_users_response.py">Optional</a></code>
+- <code title="get /radar/attacks/layer3/top/attacks">client.radar.attacks.layer3.top.<a href="./src/cloudflare/resources/radar/attacks/layer3/top/top.py">attacks</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/top_attacks_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/top_attacks_response.py">TopAttacksResponse</a></code>
+- <code title="get /radar/attacks/layer3/top/industry">client.radar.attacks.layer3.top.<a href="./src/cloudflare/resources/radar/attacks/layer3/top/top.py">industry</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/top_industry_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/top_industry_response.py">TopIndustryResponse</a></code>
+- <code title="get /radar/attacks/layer3/top/vertical">client.radar.attacks.layer3.top.<a href="./src/cloudflare/resources/radar/attacks/layer3/top/top.py">vertical</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/top_vertical_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/top_vertical_response.py">TopVerticalResponse</a></code>
 
-## Seats
+##### Locations
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust import Seat, SeatEditResponse
+from cloudflare.types.radar.attacks.layer3.top import LocationOriginResponse, LocationTargetResponse
 ```
 
 Methods:
 
-- <code title="patch /accounts/{account_id}/access/seats">client.zero_trust.seats.<a href="./src/cloudflare/resources/zero_trust/seats.py">edit</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/seat_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/seat_edit_response.py">Optional</a></code>
-
-## Access
-
-Types:
-
-```python
-from cloudflare.types.zero_trust import (
-    AccessDevicePostureRule,
-    AccessRule,
-    AnyValidServiceTokenRule,
-    AuthenticationMethodRule,
-    AzureGroupRule,
-    CertificateRule,
-    CountryRule,
-    DomainRule,
-    EmailListRule,
-    EmailRule,
-    EveryoneRule,
-    ExternalEvaluationRule,
-    GitHubOrganizationRule,
-    GroupRule,
-    GSuiteGroupRule,
-    IPListRule,
-    IPRule,
-    OktaGroupRule,
-    SAMLGroupRule,
-    ServiceTokenRule,
-)
-```
+- <code title="get /radar/attacks/layer3/top/locations/origin">client.radar.attacks.layer3.top.locations.<a href="./src/cloudflare/resources/radar/attacks/layer3/top/locations.py">origin</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/top/location_origin_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/top/location_origin_response.py">LocationOriginResponse</a></code>
+- <code title="get /radar/attacks/layer3/top/locations/target">client.radar.attacks.layer3.top.locations.<a href="./src/cloudflare/resources/radar/attacks/layer3/top/locations.py">target</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/top/location_target_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/top/location_target_response.py">LocationTargetResponse</a></code>
 
-### Applications
+### Layer7
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.access import (
-    AllowedHeaders,
-    AllowedIdPs,
-    AllowedMethods,
-    AllowedOrigins,
-    AppID,
-    Application,
-    ApplicationType,
-    CORSHeaders,
-    Decision,
-    SaaSAppNameFormat,
-    SaaSAppNameIDFormat,
-    SaaSAppSource,
-    SAMLSaaSApp,
-    SelfHostedDomains,
-    ApplicationCreateResponse,
-    ApplicationUpdateResponse,
-    ApplicationListResponse,
-    ApplicationDeleteResponse,
-    ApplicationGetResponse,
-    ApplicationRevokeTokensResponse,
+from cloudflare.types.radar.attacks import (
+    Layer7SummaryV2Response,
+    Layer7TimeseriesResponse,
+    Layer7TimeseriesGroupsV2Response,
 )
 ```
 
 Methods:
 
-- <code title="post /{account_or_zone}/{account_or_zone_id}/access/apps">client.zero_trust.access.applications.<a href="./src/cloudflare/resources/zero_trust/access/applications/applications.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/application_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/application_create_response.py">Optional</a></code>
-- <code title="put /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}">client.zero_trust.access.applications.<a href="./src/cloudflare/resources/zero_trust/access/applications/applications.py">update</a>(app_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/application_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/application_update_response.py">Optional</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/apps">client.zero_trust.access.applications.<a href="./src/cloudflare/resources/zero_trust/access/applications/applications.py">list</a>(\*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/application_list_response.py">SyncSinglePage[ApplicationListResponse]</a></code>
-- <code title="delete /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}">client.zero_trust.access.applications.<a href="./src/cloudflare/resources/zero_trust/access/applications/applications.py">delete</a>(app_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/application_delete_response.py">Optional</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}">client.zero_trust.access.applications.<a href="./src/cloudflare/resources/zero_trust/access/applications/applications.py">get</a>(app_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/application_get_response.py">Optional</a></code>
-- <code title="post /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/revoke_tokens">client.zero_trust.access.applications.<a href="./src/cloudflare/resources/zero_trust/access/applications/applications.py">revoke_tokens</a>(app_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/application_revoke_tokens_response.py">object</a></code>
+- <code title="get /radar/attacks/layer7/summary/{dimension}">client.radar.attacks.layer7.<a href="./src/cloudflare/resources/radar/attacks/layer7/layer7.py">summary_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/attacks/layer7_summary_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7_summary_v2_response.py">Layer7SummaryV2Response</a></code>
+- <code title="get /radar/attacks/layer7/timeseries">client.radar.attacks.layer7.<a href="./src/cloudflare/resources/radar/attacks/layer7/layer7.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7_timeseries_response.py">Layer7TimeseriesResponse</a></code>
+- <code title="get /radar/attacks/layer7/timeseries_groups/{dimension}">client.radar.attacks.layer7.<a href="./src/cloudflare/resources/radar/attacks/layer7/layer7.py">timeseries_groups_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/attacks/layer7_timeseries_groups_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7_timeseries_groups_v2_response.py">Layer7TimeseriesGroupsV2Response</a></code>
 
-#### CAs
+#### Summary
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.access.applications import (
-    CA,
-    CACreateResponse,
-    CADeleteResponse,
-    CAGetResponse,
+from cloudflare.types.radar.attacks.layer7 import (
+    SummaryHTTPMethodResponse,
+    SummaryHTTPVersionResponse,
+    SummaryIndustryResponse,
+    SummaryIPVersionResponse,
+    SummaryManagedRulesResponse,
+    SummaryMitigationProductResponse,
+    SummaryVerticalResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca">client.zero_trust.access.applications.cas.<a href="./src/cloudflare/resources/zero_trust/access/applications/cas.py">create</a>(app_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/applications/ca_create_response.py">Optional</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/apps/ca">client.zero_trust.access.applications.cas.<a href="./src/cloudflare/resources/zero_trust/access/applications/cas.py">list</a>(\*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/applications/ca.py">SyncSinglePage[CA]</a></code>
-- <code title="delete /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca">client.zero_trust.access.applications.cas.<a href="./src/cloudflare/resources/zero_trust/access/applications/cas.py">delete</a>(app_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/applications/ca_delete_response.py">Optional</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca">client.zero_trust.access.applications.cas.<a href="./src/cloudflare/resources/zero_trust/access/applications/cas.py">get</a>(app_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/applications/ca_get_response.py">Optional</a></code>
+- <code title="get /radar/attacks/layer7/summary/http_method">client.radar.attacks.layer7.summary.<a href="./src/cloudflare/resources/radar/attacks/layer7/summary.py">http_method</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/summary_http_method_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/summary_http_method_response.py">SummaryHTTPMethodResponse</a></code>
+- <code title="get /radar/attacks/layer7/summary/http_version">client.radar.attacks.layer7.summary.<a href="./src/cloudflare/resources/radar/attacks/layer7/summary.py">http_version</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/summary_http_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/summary_http_version_response.py">SummaryHTTPVersionResponse</a></code>
+- <code title="get /radar/attacks/layer7/summary/industry">client.radar.attacks.layer7.summary.<a href="./src/cloudflare/resources/radar/attacks/layer7/summary.py">industry</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/summary_industry_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/summary_industry_response.py">SummaryIndustryResponse</a></code>
+- <code title="get /radar/attacks/layer7/summary/ip_version">client.radar.attacks.layer7.summary.<a href="./src/cloudflare/resources/radar/attacks/layer7/summary.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/summary_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/summary_ip_version_response.py">SummaryIPVersionResponse</a></code>
+- <code title="get /radar/attacks/layer7/summary/managed_rules">client.radar.attacks.layer7.summary.<a href="./src/cloudflare/resources/radar/attacks/layer7/summary.py">managed_rules</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/summary_managed_rules_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/summary_managed_rules_response.py">SummaryManagedRulesResponse</a></code>
+- <code title="get /radar/attacks/layer7/summary/mitigation_product">client.radar.attacks.layer7.summary.<a href="./src/cloudflare/resources/radar/attacks/layer7/summary.py">mitigation_product</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/summary_mitigation_product_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/summary_mitigation_product_response.py">SummaryMitigationProductResponse</a></code>
+- <code title="get /radar/attacks/layer7/summary/vertical">client.radar.attacks.layer7.summary.<a href="./src/cloudflare/resources/radar/attacks/layer7/summary.py">vertical</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/summary_vertical_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/summary_vertical_response.py">SummaryVerticalResponse</a></code>
 
-#### UserPolicyChecks
+#### TimeseriesGroups
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.access.applications import (
-    UserPolicyCheckGeo,
-    UserPolicyCheckListResponse,
+from cloudflare.types.radar.attacks.layer7 import (
+    TimeseriesGroupHTTPMethodResponse,
+    TimeseriesGroupHTTPVersionResponse,
+    TimeseriesGroupIndustryResponse,
+    TimeseriesGroupIPVersionResponse,
+    TimeseriesGroupManagedRulesResponse,
+    TimeseriesGroupMitigationProductResponse,
+    TimeseriesGroupVerticalResponse,
 )
 ```
 
 Methods:
 
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/user_policy_checks">client.zero_trust.access.applications.user_policy_checks.<a href="./src/cloudflare/resources/zero_trust/access/applications/user_policy_checks.py">list</a>(app_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/applications/user_policy_check_list_response.py">Optional</a></code>
+- <code title="get /radar/attacks/layer7/timeseries_groups/http_method">client.radar.attacks.layer7.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py">http_method</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_method_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_method_response.py">TimeseriesGroupHTTPMethodResponse</a></code>
+- <code title="get /radar/attacks/layer7/timeseries_groups/http_version">client.radar.attacks.layer7.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py">http_version</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_version_response.py">TimeseriesGroupHTTPVersionResponse</a></code>
+- <code title="get /radar/attacks/layer7/timeseries_groups/industry">client.radar.attacks.layer7.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py">industry</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/timeseries_group_industry_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/timeseries_group_industry_response.py">TimeseriesGroupIndustryResponse</a></code>
+- <code title="get /radar/attacks/layer7/timeseries_groups/ip_version">client.radar.attacks.layer7.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/timeseries_group_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/timeseries_group_ip_version_response.py">TimeseriesGroupIPVersionResponse</a></code>
+- <code title="get /radar/attacks/layer7/timeseries_groups/managed_rules">client.radar.attacks.layer7.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py">managed_rules</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/timeseries_group_managed_rules_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/timeseries_group_managed_rules_response.py">TimeseriesGroupManagedRulesResponse</a></code>
+- <code title="get /radar/attacks/layer7/timeseries_groups/mitigation_product">client.radar.attacks.layer7.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py">mitigation_product</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/timeseries_group_mitigation_product_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/timeseries_group_mitigation_product_response.py">TimeseriesGroupMitigationProductResponse</a></code>
+- <code title="get /radar/attacks/layer7/timeseries_groups/vertical">client.radar.attacks.layer7.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py">vertical</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/timeseries_group_vertical_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/timeseries_group_vertical_response.py">TimeseriesGroupVerticalResponse</a></code>
 
-#### Policies
+#### Top
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.access.applications import (
-    ApprovalGroup,
-    Policy,
-    PolicyCreateResponse,
-    PolicyUpdateResponse,
-    PolicyListResponse,
-    PolicyDeleteResponse,
-    PolicyGetResponse,
+from cloudflare.types.radar.attacks.layer7 import (
+    TopAttacksResponse,
+    TopIndustryResponse,
+    TopVerticalResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/policies">client.zero_trust.access.applications.policies.<a href="./src/cloudflare/resources/zero_trust/access/applications/policies.py">create</a>(app_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/applications/policy_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/applications/policy_create_response.py">Optional</a></code>
-- <code title="put /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/policies/{policy_id}">client.zero_trust.access.applications.policies.<a href="./src/cloudflare/resources/zero_trust/access/applications/policies.py">update</a>(policy_id, \*, app_id, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/applications/policy_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/applications/policy_update_response.py">Optional</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/policies">client.zero_trust.access.applications.policies.<a href="./src/cloudflare/resources/zero_trust/access/applications/policies.py">list</a>(app_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/applications/policy_list_response.py">SyncSinglePage[PolicyListResponse]</a></code>
-- <code title="delete /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/policies/{policy_id}">client.zero_trust.access.applications.policies.<a href="./src/cloudflare/resources/zero_trust/access/applications/policies.py">delete</a>(policy_id, \*, app_id, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/applications/policy_delete_response.py">Optional</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/policies/{policy_id}">client.zero_trust.access.applications.policies.<a href="./src/cloudflare/resources/zero_trust/access/applications/policies.py">get</a>(policy_id, \*, app_id, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/applications/policy_get_response.py">Optional</a></code>
+- <code title="get /radar/attacks/layer7/top/attacks">client.radar.attacks.layer7.top.<a href="./src/cloudflare/resources/radar/attacks/layer7/top/top.py">attacks</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/top_attacks_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/top_attacks_response.py">TopAttacksResponse</a></code>
+- <code title="get /radar/attacks/layer7/top/industry">client.radar.attacks.layer7.top.<a href="./src/cloudflare/resources/radar/attacks/layer7/top/top.py">industry</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/top_industry_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/top_industry_response.py">TopIndustryResponse</a></code>
+- <code title="get /radar/attacks/layer7/top/vertical">client.radar.attacks.layer7.top.<a href="./src/cloudflare/resources/radar/attacks/layer7/top/top.py">vertical</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/top_vertical_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/top_vertical_response.py">TopVerticalResponse</a></code>
 
-### Certificates
+##### Locations
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.access import (
-    AssociatedHostnames,
-    Certificate,
-    CertificateDeleteResponse,
-)
+from cloudflare.types.radar.attacks.layer7.top import LocationOriginResponse, LocationTargetResponse
 ```
 
 Methods:
 
-- <code title="post /{account_or_zone}/{account_or_zone_id}/access/certificates">client.zero_trust.access.certificates.<a href="./src/cloudflare/resources/zero_trust/access/certificates/certificates.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/certificate_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/certificate.py">Optional</a></code>
-- <code title="put /{account_or_zone}/{account_or_zone_id}/access/certificates/{certificate_id}">client.zero_trust.access.certificates.<a href="./src/cloudflare/resources/zero_trust/access/certificates/certificates.py">update</a>(certificate_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/certificate_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/certificate.py">Optional</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/certificates">client.zero_trust.access.certificates.<a href="./src/cloudflare/resources/zero_trust/access/certificates/certificates.py">list</a>(\*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/certificate.py">SyncSinglePage[Certificate]</a></code>
-- <code title="delete /{account_or_zone}/{account_or_zone_id}/access/certificates/{certificate_id}">client.zero_trust.access.certificates.<a href="./src/cloudflare/resources/zero_trust/access/certificates/certificates.py">delete</a>(certificate_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/certificate_delete_response.py">Optional</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/certificates/{certificate_id}">client.zero_trust.access.certificates.<a href="./src/cloudflare/resources/zero_trust/access/certificates/certificates.py">get</a>(certificate_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/certificate.py">Optional</a></code>
+- <code title="get /radar/attacks/layer7/top/locations/origin">client.radar.attacks.layer7.top.locations.<a href="./src/cloudflare/resources/radar/attacks/layer7/top/locations.py">origin</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/top/location_origin_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/top/location_origin_response.py">LocationOriginResponse</a></code>
+- <code title="get /radar/attacks/layer7/top/locations/target">client.radar.attacks.layer7.top.locations.<a href="./src/cloudflare/resources/radar/attacks/layer7/top/locations.py">target</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/top/location_target_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/top/location_target_response.py">LocationTargetResponse</a></code>
 
-#### Settings
+##### Ases
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.access.certificates import (
-    CertificateSettings,
-    SettingUpdateResponse,
-    SettingGetResponse,
-)
+from cloudflare.types.radar.attacks.layer7.top import AseOriginResponse
 ```
 
 Methods:
 
-- <code title="put /{account_or_zone}/{account_or_zone_id}/access/certificates/settings">client.zero_trust.access.certificates.settings.<a href="./src/cloudflare/resources/zero_trust/access/certificates/settings.py">update</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/certificates/setting_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/certificates/setting_update_response.py">Optional</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/certificates/settings">client.zero_trust.access.certificates.settings.<a href="./src/cloudflare/resources/zero_trust/access/certificates/settings.py">get</a>(\*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/certificates/setting_get_response.py">Optional</a></code>
+- <code title="get /radar/attacks/layer7/top/ases/origin">client.radar.attacks.layer7.top.ases.<a href="./src/cloudflare/resources/radar/attacks/layer7/top/ases.py">origin</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/top/ase_origin_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/top/ase_origin_response.py">AseOriginResponse</a></code>
 
-### Groups
+## Entities
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.access import ZeroTrustGroup, GroupDeleteResponse
+from cloudflare.types.radar import EntityGetResponse
 ```
 
 Methods:
 
-- <code title="post /{account_or_zone}/{account_or_zone_id}/access/groups">client.zero_trust.access.groups.<a href="./src/cloudflare/resources/zero_trust/access/groups.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/group_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/zero_trust_group.py">Optional</a></code>
-- <code title="put /{account_or_zone}/{account_or_zone_id}/access/groups/{group_id}">client.zero_trust.access.groups.<a href="./src/cloudflare/resources/zero_trust/access/groups.py">update</a>(group_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/group_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/zero_trust_group.py">Optional</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/groups">client.zero_trust.access.groups.<a href="./src/cloudflare/resources/zero_trust/access/groups.py">list</a>(\*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/zero_trust_group.py">SyncSinglePage[ZeroTrustGroup]</a></code>
-- <code title="delete /{account_or_zone}/{account_or_zone_id}/access/groups/{group_id}">client.zero_trust.access.groups.<a href="./src/cloudflare/resources/zero_trust/access/groups.py">delete</a>(group_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/group_delete_response.py">Optional</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/groups/{group_id}">client.zero_trust.access.groups.<a href="./src/cloudflare/resources/zero_trust/access/groups.py">get</a>(group_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/zero_trust_group.py">Optional</a></code>
+- <code title="get /radar/entities/ip">client.radar.entities.<a href="./src/cloudflare/resources/radar/entities/entities.py">get</a>(\*\*<a href="src/cloudflare/types/radar/entity_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/entity_get_response.py">EntityGetResponse</a></code>
 
-### ServiceTokens
+### ASNs
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.access import (
-    ServiceToken,
-    ServiceTokenCreateResponse,
-    ServiceTokenRotateResponse,
+from cloudflare.types.radar.entities import (
+    ASNListResponse,
+    ASNAsSetResponse,
+    ASNGetResponse,
+    ASNIPResponse,
+    ASNRelResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /{account_or_zone}/{account_or_zone_id}/access/service_tokens">client.zero_trust.access.service_tokens.<a href="./src/cloudflare/resources/zero_trust/access/service_tokens.py">create</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/service_token_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/service_token_create_response.py">Optional</a></code>
-- <code title="put /{account_or_zone}/{account_or_zone_id}/access/service_tokens/{service_token_id}">client.zero_trust.access.service_tokens.<a href="./src/cloudflare/resources/zero_trust/access/service_tokens.py">update</a>(service_token_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/zero_trust/access/service_token_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/service_token.py">Optional</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/service_tokens">client.zero_trust.access.service_tokens.<a href="./src/cloudflare/resources/zero_trust/access/service_tokens.py">list</a>(\*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/service_token.py">SyncSinglePage[ServiceToken]</a></code>
-- <code title="delete /{account_or_zone}/{account_or_zone_id}/access/service_tokens/{service_token_id}">client.zero_trust.access.service_tokens.<a href="./src/cloudflare/resources/zero_trust/access/service_tokens.py">delete</a>(service_token_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/service_token.py">Optional</a></code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/service_tokens/{service_token_id}">client.zero_trust.access.service_tokens.<a href="./src/cloudflare/resources/zero_trust/access/service_tokens.py">get</a>(service_token_id, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/zero_trust/access/service_token.py">Optional</a></code>
-- <code title="post /accounts/{account_id}/access/service_tokens/{service_token_id}/refresh">client.zero_trust.access.service_tokens.<a href="./src/cloudflare/resources/zero_trust/access/service_tokens.py">refresh</a>(service_token_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/service_token.py">Optional</a></code>
-- <code title="post /accounts/{account_id}/access/service_tokens/{service_token_id}/rotate">client.zero_trust.access.service_tokens.<a href="./src/cloudflare/resources/zero_trust/access/service_tokens.py">rotate</a>(service_token_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/service_token_rotate_response.py">Optional</a></code>
+- <code title="get /radar/entities/asns">client.radar.entities.asns.<a href="./src/cloudflare/resources/radar/entities/asns.py">list</a>(\*\*<a href="src/cloudflare/types/radar/entities/asn_list_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/entities/asn_list_response.py">ASNListResponse</a></code>
+- <code title="get /radar/entities/asns/{asn}/as_set">client.radar.entities.asns.<a href="./src/cloudflare/resources/radar/entities/asns.py">as_set</a>(asn, \*\*<a href="src/cloudflare/types/radar/entities/asn_as_set_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/entities/asn_as_set_response.py">ASNAsSetResponse</a></code>
+- <code title="get /radar/entities/asns/{asn}">client.radar.entities.asns.<a href="./src/cloudflare/resources/radar/entities/asns.py">get</a>(asn, \*\*<a href="src/cloudflare/types/radar/entities/asn_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/entities/asn_get_response.py">ASNGetResponse</a></code>
+- <code title="get /radar/entities/asns/ip">client.radar.entities.asns.<a href="./src/cloudflare/resources/radar/entities/asns.py">ip</a>(\*\*<a href="src/cloudflare/types/radar/entities/asn_ip_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/entities/asn_ip_response.py">ASNIPResponse</a></code>
+- <code title="get /radar/entities/asns/{asn}/rel">client.radar.entities.asns.<a href="./src/cloudflare/resources/radar/entities/asns.py">rel</a>(asn, \*\*<a href="src/cloudflare/types/radar/entities/asn_rel_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/entities/asn_rel_response.py">ASNRelResponse</a></code>
 
-### Bookmarks
+### Locations
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.access import Bookmark, BookmarkDeleteResponse
+from cloudflare.types.radar.entities import LocationListResponse, LocationGetResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/access/bookmarks/{bookmark_id}">client.zero_trust.access.bookmarks.<a href="./src/cloudflare/resources/zero_trust/access/bookmarks.py">create</a>(bookmark_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/bookmark_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/bookmark.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/access/bookmarks/{bookmark_id}">client.zero_trust.access.bookmarks.<a href="./src/cloudflare/resources/zero_trust/access/bookmarks.py">update</a>(bookmark_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/bookmark_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/bookmark.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/access/bookmarks">client.zero_trust.access.bookmarks.<a href="./src/cloudflare/resources/zero_trust/access/bookmarks.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/bookmark.py">SyncSinglePage[Bookmark]</a></code>
-- <code title="delete /accounts/{account_id}/access/bookmarks/{bookmark_id}">client.zero_trust.access.bookmarks.<a href="./src/cloudflare/resources/zero_trust/access/bookmarks.py">delete</a>(bookmark_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/bookmark_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/access/bookmarks/{bookmark_id}">client.zero_trust.access.bookmarks.<a href="./src/cloudflare/resources/zero_trust/access/bookmarks.py">get</a>(bookmark_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/bookmark.py">Optional</a></code>
+- <code title="get /radar/entities/locations">client.radar.entities.locations.<a href="./src/cloudflare/resources/radar/entities/locations.py">list</a>(\*\*<a href="src/cloudflare/types/radar/entities/location_list_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/entities/location_list_response.py">LocationListResponse</a></code>
+- <code title="get /radar/entities/locations/{location}">client.radar.entities.locations.<a href="./src/cloudflare/resources/radar/entities/locations.py">get</a>(location, \*\*<a href="src/cloudflare/types/radar/entities/location_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/entities/location_get_response.py">LocationGetResponse</a></code>
 
-### Keys
+## Geolocations
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.access import KeyUpdateResponse, KeyGetResponse, KeyRotateResponse
+from cloudflare.types.radar import GeolocationListResponse, GeolocationGetResponse
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/access/keys">client.zero_trust.access.keys.<a href="./src/cloudflare/resources/zero_trust/access/keys.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/key_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/key_update_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/access/keys">client.zero_trust.access.keys.<a href="./src/cloudflare/resources/zero_trust/access/keys.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/key_get_response.py">Optional</a></code>
-- <code title="post /accounts/{account_id}/access/keys/rotate">client.zero_trust.access.keys.<a href="./src/cloudflare/resources/zero_trust/access/keys.py">rotate</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/key_rotate_response.py">Optional</a></code>
-
-### Logs
+- <code title="get /radar/geolocations">client.radar.geolocations.<a href="./src/cloudflare/resources/radar/geolocations.py">list</a>(\*\*<a href="src/cloudflare/types/radar/geolocation_list_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/geolocation_list_response.py">GeolocationListResponse</a></code>
+- <code title="get /radar/geolocations/{geo_id}">client.radar.geolocations.<a href="./src/cloudflare/resources/radar/geolocations.py">get</a>(geo_id, \*\*<a href="src/cloudflare/types/radar/geolocation_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/geolocation_get_response.py">GeolocationGetResponse</a></code>
 
-#### AccessRequests
+## HTTP
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.access.logs import AccessRequests, AccessRequestListResponse
+from cloudflare.types.radar import (
+    HTTPSummaryV2Response,
+    HTTPTimeseriesResponse,
+    HTTPTimeseriesGroupsV2Response,
+)
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/access/logs/access_requests">client.zero_trust.access.logs.access_requests.<a href="./src/cloudflare/resources/zero_trust/access/logs/access_requests.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/logs/access_request_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/logs/access_request_list_response.py">Optional</a></code>
+- <code title="get /radar/http/summary/{dimension}">client.radar.http.<a href="./src/cloudflare/resources/radar/http/http.py">summary_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/http_summary_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http_summary_v2_response.py">HTTPSummaryV2Response</a></code>
+- <code title="get /radar/http/timeseries">client.radar.http.<a href="./src/cloudflare/resources/radar/http/http.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/http_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http_timeseries_response.py">HTTPTimeseriesResponse</a></code>
+- <code title="get /radar/http/timeseries_groups/{dimension}">client.radar.http.<a href="./src/cloudflare/resources/radar/http/http.py">timeseries_groups_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/http_timeseries_groups_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http_timeseries_groups_v2_response.py">HTTPTimeseriesGroupsV2Response</a></code>
 
-### Users
+### Locations
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.access import AccessUser
+from cloudflare.types.radar.http import LocationGetResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/access/users">client.zero_trust.access.users.<a href="./src/cloudflare/resources/zero_trust/access/users/users.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/access_user.py">SyncSinglePage[AccessUser]</a></code>
+- <code title="get /radar/http/top/locations">client.radar.http.locations.<a href="./src/cloudflare/resources/radar/http/locations/locations.py">get</a>(\*\*<a href="src/cloudflare/types/radar/http/location_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/location_get_response.py">LocationGetResponse</a></code>
 
-#### ActiveSessions
+#### BotClass
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.access.users import (
-    ActiveSessionListResponse,
-    ActiveSessionGetResponse,
-)
+from cloudflare.types.radar.http.locations import BotClassGetResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/access/users/{user_id}/active_sessions">client.zero_trust.access.users.active_sessions.<a href="./src/cloudflare/resources/zero_trust/access/users/active_sessions.py">list</a>(user_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/users/active_session_list_response.py">SyncSinglePage[ActiveSessionListResponse]</a></code>
-- <code title="get /accounts/{account_id}/access/users/{user_id}/active_sessions/{nonce}">client.zero_trust.access.users.active_sessions.<a href="./src/cloudflare/resources/zero_trust/access/users/active_sessions.py">get</a>(nonce, \*, account_id, user_id) -> <a href="./src/cloudflare/types/zero_trust/access/users/active_session_get_response.py">Optional</a></code>
+- <code title="get /radar/http/top/locations/bot_class/{bot_class}">client.radar.http.locations.bot_class.<a href="./src/cloudflare/resources/radar/http/locations/bot_class.py">get</a>(bot_class, \*\*<a href="src/cloudflare/types/radar/http/locations/bot_class_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/locations/bot_class_get_response.py">BotClassGetResponse</a></code>
 
-#### LastSeenIdentity
+#### DeviceType
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.access.users import Identity
+from cloudflare.types.radar.http.locations import DeviceTypeGetResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/access/users/{user_id}/last_seen_identity">client.zero_trust.access.users.last_seen_identity.<a href="./src/cloudflare/resources/zero_trust/access/users/last_seen_identity.py">get</a>(user_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/users/identity.py">Optional</a></code>
+- <code title="get /radar/http/top/locations/device_type/{device_type}">client.radar.http.locations.device_type.<a href="./src/cloudflare/resources/radar/http/locations/device_type.py">get</a>(device_type, \*\*<a href="src/cloudflare/types/radar/http/locations/device_type_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/locations/device_type_get_response.py">DeviceTypeGetResponse</a></code>
 
-#### FailedLogins
+#### HTTPProtocol
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.access.users import FailedLoginListResponse
+from cloudflare.types.radar.http.locations import HTTPProtocolGetResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/access/users/{user_id}/failed_logins">client.zero_trust.access.users.failed_logins.<a href="./src/cloudflare/resources/zero_trust/access/users/failed_logins.py">list</a>(user_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/users/failed_login_list_response.py">SyncSinglePage[FailedLoginListResponse]</a></code>
+- <code title="get /radar/http/top/locations/http_protocol/{http_protocol}">client.radar.http.locations.http_protocol.<a href="./src/cloudflare/resources/radar/http/locations/http_protocol.py">get</a>(http_protocol, \*\*<a href="src/cloudflare/types/radar/http/locations/http_protocol_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/locations/http_protocol_get_response.py">HTTPProtocolGetResponse</a></code>
 
-### CustomPages
+#### HTTPMethod
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.access import (
-    CustomPage,
-    CustomPageWithoutHTML,
-    CustomPageDeleteResponse,
-)
+from cloudflare.types.radar.http.locations import HTTPMethodGetResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/access/custom_pages">client.zero_trust.access.custom_pages.<a href="./src/cloudflare/resources/zero_trust/access/custom_pages.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/custom_page_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/custom_page_without_html.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/access/custom_pages/{custom_page_id}">client.zero_trust.access.custom_pages.<a href="./src/cloudflare/resources/zero_trust/access/custom_pages.py">update</a>(custom_page_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/custom_page_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/custom_page_without_html.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/access/custom_pages">client.zero_trust.access.custom_pages.<a href="./src/cloudflare/resources/zero_trust/access/custom_pages.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/custom_page_without_html.py">SyncSinglePage[CustomPageWithoutHTML]</a></code>
-- <code title="delete /accounts/{account_id}/access/custom_pages/{custom_page_id}">client.zero_trust.access.custom_pages.<a href="./src/cloudflare/resources/zero_trust/access/custom_pages.py">delete</a>(custom_page_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/custom_page_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/access/custom_pages/{custom_page_id}">client.zero_trust.access.custom_pages.<a href="./src/cloudflare/resources/zero_trust/access/custom_pages.py">get</a>(custom_page_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/custom_page.py">Optional</a></code>
+- <code title="get /radar/http/top/locations/http_version/{http_version}">client.radar.http.locations.http_method.<a href="./src/cloudflare/resources/radar/http/locations/http_method.py">get</a>(http_version, \*\*<a href="src/cloudflare/types/radar/http/locations/http_method_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/locations/http_method_get_response.py">HTTPMethodGetResponse</a></code>
 
-### Tags
+#### IPVersion
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.access import Tag, TagDeleteResponse
+from cloudflare.types.radar.http.locations import IPVersionGetResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/access/tags">client.zero_trust.access.tags.<a href="./src/cloudflare/resources/zero_trust/access/tags.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/tag_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/tag.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/access/tags/{tag_name}">client.zero_trust.access.tags.<a href="./src/cloudflare/resources/zero_trust/access/tags.py">update</a>(tag_name, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/tag_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/tag.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/access/tags">client.zero_trust.access.tags.<a href="./src/cloudflare/resources/zero_trust/access/tags.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/tag.py">SyncSinglePage[Tag]</a></code>
-- <code title="delete /accounts/{account_id}/access/tags/{tag_name}">client.zero_trust.access.tags.<a href="./src/cloudflare/resources/zero_trust/access/tags.py">delete</a>(tag_name, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/tag_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/access/tags/{tag_name}">client.zero_trust.access.tags.<a href="./src/cloudflare/resources/zero_trust/access/tags.py">get</a>(tag_name, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/tag.py">Optional</a></code>
+- <code title="get /radar/http/top/locations/ip_version/{ip_version}">client.radar.http.locations.ip_version.<a href="./src/cloudflare/resources/radar/http/locations/ip_version.py">get</a>(ip_version, \*\*<a href="src/cloudflare/types/radar/http/locations/ip_version_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/locations/ip_version_get_response.py">IPVersionGetResponse</a></code>
 
-### Policies
+#### OS
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.access import (
-    PolicyCreateResponse,
-    PolicyUpdateResponse,
-    PolicyListResponse,
-    PolicyDeleteResponse,
-    PolicyGetResponse,
-)
+from cloudflare.types.radar.http.locations import OSGetResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/access/policies">client.zero_trust.access.policies.<a href="./src/cloudflare/resources/zero_trust/access/policies.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/policy_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/policy_create_response.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/access/policies/{policy_id}">client.zero_trust.access.policies.<a href="./src/cloudflare/resources/zero_trust/access/policies.py">update</a>(policy_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/access/policy_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/access/policy_update_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/access/policies">client.zero_trust.access.policies.<a href="./src/cloudflare/resources/zero_trust/access/policies.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/policy_list_response.py">SyncSinglePage[PolicyListResponse]</a></code>
-- <code title="delete /accounts/{account_id}/access/policies/{policy_id}">client.zero_trust.access.policies.<a href="./src/cloudflare/resources/zero_trust/access/policies.py">delete</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/policy_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/access/policies/{policy_id}">client.zero_trust.access.policies.<a href="./src/cloudflare/resources/zero_trust/access/policies.py">get</a>(policy_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/access/policy_get_response.py">Optional</a></code>
+- <code title="get /radar/http/top/locations/os/{os}">client.radar.http.locations.os.<a href="./src/cloudflare/resources/radar/http/locations/os.py">get</a>(os, \*\*<a href="src/cloudflare/types/radar/http/locations/os_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/locations/os_get_response.py">OSGetResponse</a></code>
 
-## DEX
+#### TLSVersion
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust import (
-    DeviceExperienceMonitor,
-    NetworkPath,
-    NetworkPathResponse,
-    Percentiles,
-)
+from cloudflare.types.radar.http.locations import TLSVersionGetResponse
 ```
 
-### Colos
+Methods:
+
+- <code title="get /radar/http/top/locations/tls_version/{tls_version}">client.radar.http.locations.tls_version.<a href="./src/cloudflare/resources/radar/http/locations/tls_version.py">get</a>(tls_version, \*\*<a href="src/cloudflare/types/radar/http/locations/tls_version_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/locations/tls_version_get_response.py">TLSVersionGetResponse</a></code>
+
+#### BrowserFamily
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.dex import ColoListResponse
+from cloudflare.types.radar.http.locations import BrowserFamilyGetResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/dex/colos">client.zero_trust.dex.colos.<a href="./src/cloudflare/resources/zero_trust/dex/colos.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/colo_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/colo_list_response.py">SyncSinglePage[object]</a></code>
+- <code title="get /radar/http/top/locations/browser_family/{browser_family}">client.radar.http.locations.browser_family.<a href="./src/cloudflare/resources/radar/http/locations/browser_family.py">get</a>(browser_family, \*\*<a href="src/cloudflare/types/radar/http/locations/browser_family_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/locations/browser_family_get_response.py">BrowserFamilyGetResponse</a></code>
 
-### FleetStatus
+### Ases
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.dex import LiveStat, FleetStatusLiveResponse
+from cloudflare.types.radar.http import AseGetResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/dex/fleet-status/live">client.zero_trust.dex.fleet_status.<a href="./src/cloudflare/resources/zero_trust/dex/fleet_status/fleet_status.py">live</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/fleet_status_live_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/fleet_status_live_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/dex/fleet-status/over-time">client.zero_trust.dex.fleet_status.<a href="./src/cloudflare/resources/zero_trust/dex/fleet_status/fleet_status.py">over_time</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/fleet_status_over_time_params.py">params</a>) -> None</code>
+- <code title="get /radar/http/top/ases">client.radar.http.ases.<a href="./src/cloudflare/resources/radar/http/ases/ases.py">get</a>(\*\*<a href="src/cloudflare/types/radar/http/ase_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/ase_get_response.py">AseGetResponse</a></code>
 
-#### Devices
+#### BotClass
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.dex.fleet_status import DeviceListResponse
+from cloudflare.types.radar.http.ases import BotClassGetResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/dex/fleet-status/devices">client.zero_trust.dex.fleet_status.devices.<a href="./src/cloudflare/resources/zero_trust/dex/fleet_status/devices.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/fleet_status/device_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/fleet_status/device_list_response.py">SyncV4PagePaginationArray[DeviceListResponse]</a></code>
+- <code title="get /radar/http/top/ases/bot_class/{bot_class}">client.radar.http.ases.bot_class.<a href="./src/cloudflare/resources/radar/http/ases/bot_class.py">get</a>(bot_class, \*\*<a href="src/cloudflare/types/radar/http/ases/bot_class_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/ases/bot_class_get_response.py">BotClassGetResponse</a></code>
 
-### HTTPTests
+#### DeviceType
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.dex import HTTPDetails
+from cloudflare.types.radar.http.ases import DeviceTypeGetResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/dex/http-tests/{test_id}">client.zero_trust.dex.http_tests.<a href="./src/cloudflare/resources/zero_trust/dex/http_tests/http_tests.py">get</a>(test_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/http_test_get_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/http_details.py">Optional</a></code>
+- <code title="get /radar/http/top/ases/device_type/{device_type}">client.radar.http.ases.device_type.<a href="./src/cloudflare/resources/radar/http/ases/device_type.py">get</a>(device_type, \*\*<a href="src/cloudflare/types/radar/http/ases/device_type_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/ases/device_type_get_response.py">DeviceTypeGetResponse</a></code>
 
-#### Percentiles
+#### HTTPProtocol
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.dex.http_tests import HTTPDetailsPercentiles, TestStatOverTime
+from cloudflare.types.radar.http.ases import HTTPProtocolGetResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/dex/http-tests/{test_id}/percentiles">client.zero_trust.dex.http_tests.percentiles.<a href="./src/cloudflare/resources/zero_trust/dex/http_tests/percentiles.py">get</a>(test_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/http_tests/percentile_get_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/http_tests/http_details_percentiles.py">Optional</a></code>
+- <code title="get /radar/http/top/ases/http_protocol/{http_protocol}">client.radar.http.ases.http_protocol.<a href="./src/cloudflare/resources/radar/http/ases/http_protocol.py">get</a>(http_protocol, \*\*<a href="src/cloudflare/types/radar/http/ases/http_protocol_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/ases/http_protocol_get_response.py">HTTPProtocolGetResponse</a></code>
 
-### Tests
+#### HTTPMethod
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.dex import AggregateTimePeriod, Tests, TestListResponse
+from cloudflare.types.radar.http.ases import HTTPMethodGetResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/dex/tests">client.zero_trust.dex.tests.<a href="./src/cloudflare/resources/zero_trust/dex/tests/tests.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/test_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/test_list_response.py">SyncV4PagePagination[TestListResponse]</a></code>
+- <code title="get /radar/http/top/ases/http_version/{http_version}">client.radar.http.ases.http_method.<a href="./src/cloudflare/resources/radar/http/ases/http_method.py">get</a>(http_version, \*\*<a href="src/cloudflare/types/radar/http/ases/http_method_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/ases/http_method_get_response.py">HTTPMethodGetResponse</a></code>
 
-#### UniqueDevices
+#### IPVersion
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.dex.tests import UniqueDevices
+from cloudflare.types.radar.http.ases import IPVersionGetResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/dex/tests/unique-devices">client.zero_trust.dex.tests.unique_devices.<a href="./src/cloudflare/resources/zero_trust/dex/tests/unique_devices.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/tests/unique_device_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/tests/unique_devices.py">Optional</a></code>
-
-### TracerouteTestResults
+- <code title="get /radar/http/top/ases/ip_version/{ip_version}">client.radar.http.ases.ip_version.<a href="./src/cloudflare/resources/radar/http/ases/ip_version.py">get</a>(ip_version, \*\*<a href="src/cloudflare/types/radar/http/ases/ip_version_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/ases/ip_version_get_response.py">IPVersionGetResponse</a></code>
 
-#### NetworkPath
+#### OS
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.dex.traceroute_test_results import NetworkPathGetResponse
+from cloudflare.types.radar.http.ases import OSGetResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/dex/traceroute-test-results/{test_result_id}/network-path">client.zero_trust.dex.traceroute_test_results.network_path.<a href="./src/cloudflare/resources/zero_trust/dex/traceroute_test_results/network_path.py">get</a>(test_result_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dex/traceroute_test_results/network_path_get_response.py">Optional</a></code>
+- <code title="get /radar/http/top/ases/os/{os}">client.radar.http.ases.os.<a href="./src/cloudflare/resources/radar/http/ases/os.py">get</a>(os, \*\*<a href="src/cloudflare/types/radar/http/ases/os_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/ases/os_get_response.py">OSGetResponse</a></code>
 
-### TracerouteTests
+#### TLSVersion
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.dex import Traceroute, TracerouteTestPercentilesResponse
+from cloudflare.types.radar.http.ases import TLSVersionGetResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/dex/traceroute-tests/{test_id}">client.zero_trust.dex.traceroute_tests.<a href="./src/cloudflare/resources/zero_trust/dex/traceroute_tests.py">get</a>(test_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/traceroute_test_get_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/traceroute.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/dex/traceroute-tests/{test_id}/network-path">client.zero_trust.dex.traceroute_tests.<a href="./src/cloudflare/resources/zero_trust/dex/traceroute_tests.py">network_path</a>(test_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/traceroute_test_network_path_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/network_path_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/dex/traceroute-tests/{test_id}/percentiles">client.zero_trust.dex.traceroute_tests.<a href="./src/cloudflare/resources/zero_trust/dex/traceroute_tests.py">percentiles</a>(test_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dex/traceroute_test_percentiles_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dex/traceroute_test_percentiles_response.py">Optional</a></code>
+- <code title="get /radar/http/top/ases/tls_version/{tls_version}">client.radar.http.ases.tls_version.<a href="./src/cloudflare/resources/radar/http/ases/tls_version.py">get</a>(tls_version, \*\*<a href="src/cloudflare/types/radar/http/ases/tls_version_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/ases/tls_version_get_response.py">TLSVersionGetResponse</a></code>
 
-## Tunnels
+#### BrowserFamily
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust import (
-    Connection,
-    TunnelCreateResponse,
-    TunnelListResponse,
-    TunnelDeleteResponse,
-    TunnelEditResponse,
-    TunnelGetResponse,
-)
+from cloudflare.types.radar.http.ases import BrowserFamilyGetResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/tunnels">client.zero_trust.tunnels.<a href="./src/cloudflare/resources/zero_trust/tunnels/tunnels.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnel_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/tunnel_create_response.py">TunnelCreateResponse</a></code>
-- <code title="get /accounts/{account_id}/tunnels">client.zero_trust.tunnels.<a href="./src/cloudflare/resources/zero_trust/tunnels/tunnels.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnel_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/tunnel_list_response.py">SyncV4PagePaginationArray[TunnelListResponse]</a></code>
-- <code title="delete /accounts/{account_id}/tunnels/{tunnel_id}">client.zero_trust.tunnels.<a href="./src/cloudflare/resources/zero_trust/tunnels/tunnels.py">delete</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/tunnel_delete_response.py">TunnelDeleteResponse</a></code>
-- <code title="patch /accounts/{account_id}/cfd_tunnel/{tunnel_id}">client.zero_trust.tunnels.<a href="./src/cloudflare/resources/zero_trust/tunnels/tunnels.py">edit</a>(tunnel_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnel_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/tunnel_edit_response.py">TunnelEditResponse</a></code>
-- <code title="get /accounts/{account_id}/tunnels/{tunnel_id}">client.zero_trust.tunnels.<a href="./src/cloudflare/resources/zero_trust/tunnels/tunnels.py">get</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/tunnel_get_response.py">TunnelGetResponse</a></code>
+- <code title="get /radar/http/top/ases/browser_family/{browser_family}">client.radar.http.ases.browser_family.<a href="./src/cloudflare/resources/radar/http/ases/browser_family.py">get</a>(browser_family, \*\*<a href="src/cloudflare/types/radar/http/ases/browser_family_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/ases/browser_family_get_response.py">BrowserFamilyGetResponse</a></code>
 
-### Configurations
+### Summary
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.tunnels import (
-    ConfigurationUpdateResponse,
-    ConfigurationGetResponse,
+from cloudflare.types.radar.http import (
+    SummaryBotClassResponse,
+    SummaryDeviceTypeResponse,
+    SummaryHTTPProtocolResponse,
+    SummaryHTTPVersionResponse,
+    SummaryIPVersionResponse,
+    SummaryOSResponse,
+    SummaryPostQuantumResponse,
+    SummaryTLSVersionResponse,
 )
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/cfd_tunnel/{tunnel_id}/configurations">client.zero_trust.tunnels.configurations.<a href="./src/cloudflare/resources/zero_trust/tunnels/configurations.py">update</a>(tunnel_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnels/configuration_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/tunnels/configuration_update_response.py">ConfigurationUpdateResponse</a></code>
-- <code title="get /accounts/{account_id}/cfd_tunnel/{tunnel_id}/configurations">client.zero_trust.tunnels.configurations.<a href="./src/cloudflare/resources/zero_trust/tunnels/configurations.py">get</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/tunnels/configuration_get_response.py">ConfigurationGetResponse</a></code>
+- <code title="get /radar/http/summary/bot_class">client.radar.http.summary.<a href="./src/cloudflare/resources/radar/http/summary.py">bot_class</a>(\*\*<a href="src/cloudflare/types/radar/http/summary_bot_class_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/summary_bot_class_response.py">SummaryBotClassResponse</a></code>
+- <code title="get /radar/http/summary/device_type">client.radar.http.summary.<a href="./src/cloudflare/resources/radar/http/summary.py">device_type</a>(\*\*<a href="src/cloudflare/types/radar/http/summary_device_type_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/summary_device_type_response.py">SummaryDeviceTypeResponse</a></code>
+- <code title="get /radar/http/summary/http_protocol">client.radar.http.summary.<a href="./src/cloudflare/resources/radar/http/summary.py">http_protocol</a>(\*\*<a href="src/cloudflare/types/radar/http/summary_http_protocol_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/summary_http_protocol_response.py">SummaryHTTPProtocolResponse</a></code>
+- <code title="get /radar/http/summary/http_version">client.radar.http.summary.<a href="./src/cloudflare/resources/radar/http/summary.py">http_version</a>(\*\*<a href="src/cloudflare/types/radar/http/summary_http_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/summary_http_version_response.py">SummaryHTTPVersionResponse</a></code>
+- <code title="get /radar/http/summary/ip_version">client.radar.http.summary.<a href="./src/cloudflare/resources/radar/http/summary.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/http/summary_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/summary_ip_version_response.py">SummaryIPVersionResponse</a></code>
+- <code title="get /radar/http/summary/os">client.radar.http.summary.<a href="./src/cloudflare/resources/radar/http/summary.py">os</a>(\*\*<a href="src/cloudflare/types/radar/http/summary_os_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/summary_os_response.py">SummaryOSResponse</a></code>
+- <code title="get /radar/http/summary/post_quantum">client.radar.http.summary.<a href="./src/cloudflare/resources/radar/http/summary.py">post_quantum</a>(\*\*<a href="src/cloudflare/types/radar/http/summary_post_quantum_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/summary_post_quantum_response.py">SummaryPostQuantumResponse</a></code>
+- <code title="get /radar/http/summary/tls_version">client.radar.http.summary.<a href="./src/cloudflare/resources/radar/http/summary.py">tls_version</a>(\*\*<a href="src/cloudflare/types/radar/http/summary_tls_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/summary_tls_version_response.py">SummaryTLSVersionResponse</a></code>
 
-### Connections
+### TimeseriesGroups
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.tunnels import (
-    Client,
-    ConnectionDeleteResponse,
-    ConnectionGetResponse,
+from cloudflare.types.radar.http import (
+    TimeseriesGroupBotClassResponse,
+    TimeseriesGroupBrowserResponse,
+    TimeseriesGroupBrowserFamilyResponse,
+    TimeseriesGroupDeviceTypeResponse,
+    TimeseriesGroupHTTPProtocolResponse,
+    TimeseriesGroupHTTPVersionResponse,
+    TimeseriesGroupIPVersionResponse,
+    TimeseriesGroupOSResponse,
+    TimeseriesGroupPostQuantumResponse,
+    TimeseriesGroupTLSVersionResponse,
 )
 ```
 
 Methods:
 
-- <code title="delete /accounts/{account_id}/tunnels/{tunnel_id}/connections">client.zero_trust.tunnels.connections.<a href="./src/cloudflare/resources/zero_trust/tunnels/connections.py">delete</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/tunnels/connection_delete_response.py">ConnectionDeleteResponse</a></code>
-- <code title="get /accounts/{account_id}/cfd_tunnel/{tunnel_id}/connections">client.zero_trust.tunnels.connections.<a href="./src/cloudflare/resources/zero_trust/tunnels/connections.py">get</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/tunnels/connection_get_response.py">Optional</a></code>
+- <code title="get /radar/http/timeseries_groups/bot_class">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">bot_class</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_bot_class_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_bot_class_response.py">TimeseriesGroupBotClassResponse</a></code>
+- <code title="get /radar/http/timeseries_groups/browser">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">browser</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_browser_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_browser_response.py">TimeseriesGroupBrowserResponse</a></code>
+- <code title="get /radar/http/timeseries_groups/browser_family">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">browser_family</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_browser_family_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_browser_family_response.py">TimeseriesGroupBrowserFamilyResponse</a></code>
+- <code title="get /radar/http/timeseries_groups/device_type">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">device_type</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_device_type_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_device_type_response.py">TimeseriesGroupDeviceTypeResponse</a></code>
+- <code title="get /radar/http/timeseries_groups/http_protocol">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">http_protocol</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_http_protocol_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_http_protocol_response.py">TimeseriesGroupHTTPProtocolResponse</a></code>
+- <code title="get /radar/http/timeseries_groups/http_version">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">http_version</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_http_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_http_version_response.py">TimeseriesGroupHTTPVersionResponse</a></code>
+- <code title="get /radar/http/timeseries_groups/ip_version">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_ip_version_response.py">TimeseriesGroupIPVersionResponse</a></code>
+- <code title="get /radar/http/timeseries_groups/os">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">os</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_os_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_os_response.py">TimeseriesGroupOSResponse</a></code>
+- <code title="get /radar/http/timeseries_groups/post_quantum">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">post_quantum</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_post_quantum_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_post_quantum_response.py">TimeseriesGroupPostQuantumResponse</a></code>
+- <code title="get /radar/http/timeseries_groups/tls_version">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">tls_version</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_tls_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_tls_version_response.py">TimeseriesGroupTLSVersionResponse</a></code>
 
-### Token
+### Top
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.tunnels import TokenGetResponse
+from cloudflare.types.radar.http import TopBrowserResponse, TopBrowserFamilyResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/cfd_tunnel/{tunnel_id}/token">client.zero_trust.tunnels.token.<a href="./src/cloudflare/resources/zero_trust/tunnels/token.py">get</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/tunnels/token_get_response.py">TokenGetResponse</a></code>
-
-### Connectors
-
-Methods:
+- <code title="get /radar/http/top/browser">client.radar.http.top.<a href="./src/cloudflare/resources/radar/http/top.py">browser</a>(\*\*<a href="src/cloudflare/types/radar/http/top_browser_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/top_browser_response.py">TopBrowserResponse</a></code>
+- <code title="get /radar/http/top/browser_family">client.radar.http.top.<a href="./src/cloudflare/resources/radar/http/top.py">browser_family</a>(\*\*<a href="src/cloudflare/types/radar/http/top_browser_family_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/top_browser_family_response.py">TopBrowserFamilyResponse</a></code>
 
-- <code title="get /accounts/{account_id}/cfd_tunnel/{tunnel_id}/connectors/{connector_id}">client.zero_trust.tunnels.connectors.<a href="./src/cloudflare/resources/zero_trust/tunnels/connectors.py">get</a>(connector_id, \*, account_id, tunnel_id) -> <a href="./src/cloudflare/types/zero_trust/tunnels/client.py">Client</a></code>
+## Quality
 
-### Management
+### IQI
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.tunnels import ManagementCreateResponse
+from cloudflare.types.radar.quality import IQISummaryResponse, IQITimeseriesGroupsResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/cfd_tunnel/{tunnel_id}/management">client.zero_trust.tunnels.management.<a href="./src/cloudflare/resources/zero_trust/tunnels/management.py">create</a>(tunnel_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnels/management_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/tunnels/management_create_response.py">ManagementCreateResponse</a></code>
+- <code title="get /radar/quality/iqi/summary">client.radar.quality.iqi.<a href="./src/cloudflare/resources/radar/quality/iqi.py">summary</a>(\*\*<a href="src/cloudflare/types/radar/quality/iqi_summary_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/quality/iqi_summary_response.py">IQISummaryResponse</a></code>
+- <code title="get /radar/quality/iqi/timeseries_groups">client.radar.quality.iqi.<a href="./src/cloudflare/resources/radar/quality/iqi.py">timeseries_groups</a>(\*\*<a href="src/cloudflare/types/radar/quality/iqi_timeseries_groups_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/quality/iqi_timeseries_groups_response.py">IQITimeseriesGroupsResponse</a></code>
 
-## ConnectivitySettings
+### Speed
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust import (
-    ConnectivitySettingEditResponse,
-    ConnectivitySettingGetResponse,
-)
+from cloudflare.types.radar.quality import SpeedHistogramResponse, SpeedSummaryResponse
 ```
 
 Methods:
 
-- <code title="patch /accounts/{account_id}/zerotrust/connectivity_settings">client.zero_trust.connectivity_settings.<a href="./src/cloudflare/resources/zero_trust/connectivity_settings.py">edit</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/connectivity_setting_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/connectivity_setting_edit_response.py">ConnectivitySettingEditResponse</a></code>
-- <code title="get /accounts/{account_id}/zerotrust/connectivity_settings">client.zero_trust.connectivity_settings.<a href="./src/cloudflare/resources/zero_trust/connectivity_settings.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/connectivity_setting_get_response.py">ConnectivitySettingGetResponse</a></code>
-
-## DLP
+- <code title="get /radar/quality/speed/histogram">client.radar.quality.speed.<a href="./src/cloudflare/resources/radar/quality/speed/speed.py">histogram</a>(\*\*<a href="src/cloudflare/types/radar/quality/speed_histogram_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/quality/speed_histogram_response.py">SpeedHistogramResponse</a></code>
+- <code title="get /radar/quality/speed/summary">client.radar.quality.speed.<a href="./src/cloudflare/resources/radar/quality/speed/speed.py">summary</a>(\*\*<a href="src/cloudflare/types/radar/quality/speed_summary_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/quality/speed_summary_response.py">SpeedSummaryResponse</a></code>
 
-### Datasets
+#### Top
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.dlp import Dataset, DatasetArray, DatasetCreation
+from cloudflare.types.radar.quality.speed import TopAsesResponse, TopLocationsResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/dlp/datasets">client.zero_trust.dlp.datasets.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/dataset_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/dataset_creation.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/dlp/datasets/{dataset_id}">client.zero_trust.dlp.datasets.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py">update</a>(dataset_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/dataset_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/dataset.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/dlp/datasets">client.zero_trust.dlp.datasets.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/dataset.py">SyncSinglePage[Dataset]</a></code>
-- <code title="delete /accounts/{account_id}/dlp/datasets/{dataset_id}">client.zero_trust.dlp.datasets.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py">delete</a>(dataset_id, \*, account_id) -> None</code>
-- <code title="get /accounts/{account_id}/dlp/datasets/{dataset_id}">client.zero_trust.dlp.datasets.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py">get</a>(dataset_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/dataset.py">Optional</a></code>
+- <code title="get /radar/quality/speed/top/ases">client.radar.quality.speed.top.<a href="./src/cloudflare/resources/radar/quality/speed/top.py">ases</a>(\*\*<a href="src/cloudflare/types/radar/quality/speed/top_ases_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/quality/speed/top_ases_response.py">TopAsesResponse</a></code>
+- <code title="get /radar/quality/speed/top/locations">client.radar.quality.speed.top.<a href="./src/cloudflare/resources/radar/quality/speed/top.py">locations</a>(\*\*<a href="src/cloudflare/types/radar/quality/speed/top_locations_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/quality/speed/top_locations_response.py">TopLocationsResponse</a></code>
 
-#### Upload
+## Ranking
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.dlp.datasets import NewVersion
+from cloudflare.types.radar import RankingTimeseriesGroupsResponse, RankingTopResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/dlp/datasets/{dataset_id}/upload">client.zero_trust.dlp.datasets.upload.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/upload.py">create</a>(dataset_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/datasets/new_version.py">Optional</a></code>
-- <code title="post /accounts/{account_id}/dlp/datasets/{dataset_id}/upload/{version}">client.zero_trust.dlp.datasets.upload.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/upload.py">edit</a>(version, \*, account_id, dataset_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/datasets/upload_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/dataset.py">Optional</a></code>
-
-### Patterns
-
-Methods:
-
-- <code title="post /accounts/{account_id}/dlp/patterns/validate">client.zero_trust.dlp.patterns.<a href="./src/cloudflare/resources/zero_trust/dlp/patterns.py">validate</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/pattern_validate_params.py">params</a>) -> <a href="./src/cloudflare/types/logpush/ownership_validation.py">Optional</a></code>
+- <code title="get /radar/ranking/timeseries_groups">client.radar.ranking.<a href="./src/cloudflare/resources/radar/ranking/ranking.py">timeseries_groups</a>(\*\*<a href="src/cloudflare/types/radar/ranking_timeseries_groups_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ranking_timeseries_groups_response.py">RankingTimeseriesGroupsResponse</a></code>
+- <code title="get /radar/ranking/top">client.radar.ranking.<a href="./src/cloudflare/resources/radar/ranking/ranking.py">top</a>(\*\*<a href="src/cloudflare/types/radar/ranking_top_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ranking_top_response.py">RankingTopResponse</a></code>
 
-### PayloadLogs
+### Domain
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.dlp import PayloadLogUpdateResponse, PayloadLogGetResponse
+from cloudflare.types.radar.ranking import DomainGetResponse
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/dlp/payload_log">client.zero_trust.dlp.payload_logs.<a href="./src/cloudflare/resources/zero_trust/dlp/payload_logs.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/payload_log_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/payload_log_update_response.py">PayloadLogUpdateResponse</a></code>
-- <code title="get /accounts/{account_id}/dlp/payload_log">client.zero_trust.dlp.payload_logs.<a href="./src/cloudflare/resources/zero_trust/dlp/payload_logs.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/payload_log_get_response.py">PayloadLogGetResponse</a></code>
+- <code title="get /radar/ranking/domain/{domain}">client.radar.ranking.domain.<a href="./src/cloudflare/resources/radar/ranking/domain.py">get</a>(domain, \*\*<a href="src/cloudflare/types/radar/ranking/domain_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ranking/domain_get_response.py">DomainGetResponse</a></code>
 
-### Profiles
+### InternetServices
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.dlp import (
-    ContextAwareness,
-    Profile,
-    SkipConfiguration,
-    ProfileGetResponse,
+from cloudflare.types.radar.ranking import (
+    InternetServiceCategoriesResponse,
+    InternetServiceTimeseriesGroupsResponse,
+    InternetServiceTopResponse,
 )
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/dlp/profiles">client.zero_trust.dlp.profiles.<a href="./src/cloudflare/resources/zero_trust/dlp/profiles/profiles.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/profile.py">SyncSinglePage[Profile]</a></code>
-- <code title="get /accounts/{account_id}/dlp/profiles/{profile_id}">client.zero_trust.dlp.profiles.<a href="./src/cloudflare/resources/zero_trust/dlp/profiles/profiles.py">get</a>(profile_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/profile_get_response.py">ProfileGetResponse</a></code>
+- <code title="get /radar/ranking/internet_services/categories">client.radar.ranking.internet_services.<a href="./src/cloudflare/resources/radar/ranking/internet_services.py">categories</a>(\*\*<a href="src/cloudflare/types/radar/ranking/internet_service_categories_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ranking/internet_service_categories_response.py">InternetServiceCategoriesResponse</a></code>
+- <code title="get /radar/ranking/internet_services/timeseries_groups">client.radar.ranking.internet_services.<a href="./src/cloudflare/resources/radar/ranking/internet_services.py">timeseries_groups</a>(\*\*<a href="src/cloudflare/types/radar/ranking/internet_service_timeseries_groups_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ranking/internet_service_timeseries_groups_response.py">InternetServiceTimeseriesGroupsResponse</a></code>
+- <code title="get /radar/ranking/internet_services/top">client.radar.ranking.internet_services.<a href="./src/cloudflare/resources/radar/ranking/internet_services.py">top</a>(\*\*<a href="src/cloudflare/types/radar/ranking/internet_service_top_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ranking/internet_service_top_response.py">InternetServiceTopResponse</a></code>
 
-#### Custom
+## TrafficAnomalies
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.dlp.profiles import (
-    CustomProfile,
-    Pattern,
-    CustomCreateResponse,
-    CustomDeleteResponse,
-)
+from cloudflare.types.radar import TrafficAnomalyGetResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/dlp/profiles/custom">client.zero_trust.dlp.profiles.custom.<a href="./src/cloudflare/resources/zero_trust/dlp/profiles/custom.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/profiles/custom_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/profiles/custom_create_response.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/dlp/profiles/custom/{profile_id}">client.zero_trust.dlp.profiles.custom.<a href="./src/cloudflare/resources/zero_trust/dlp/profiles/custom.py">update</a>(profile_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/profiles/custom_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/profiles/custom_profile.py">CustomProfile</a></code>
-- <code title="delete /accounts/{account_id}/dlp/profiles/custom/{profile_id}">client.zero_trust.dlp.profiles.custom.<a href="./src/cloudflare/resources/zero_trust/dlp/profiles/custom.py">delete</a>(profile_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/profiles/custom_delete_response.py">CustomDeleteResponse</a></code>
-- <code title="get /accounts/{account_id}/dlp/profiles/custom/{profile_id}">client.zero_trust.dlp.profiles.custom.<a href="./src/cloudflare/resources/zero_trust/dlp/profiles/custom.py">get</a>(profile_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/profiles/custom_profile.py">CustomProfile</a></code>
+- <code title="get /radar/traffic_anomalies">client.radar.traffic_anomalies.<a href="./src/cloudflare/resources/radar/traffic_anomalies/traffic_anomalies.py">get</a>(\*\*<a href="src/cloudflare/types/radar/traffic_anomaly_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/traffic_anomaly_get_response.py">TrafficAnomalyGetResponse</a></code>
 
-#### Predefined
+### Locations
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.dlp.profiles import PredefinedProfile
+from cloudflare.types.radar.traffic_anomalies import LocationGetResponse
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/dlp/profiles/predefined/{profile_id}">client.zero_trust.dlp.profiles.predefined.<a href="./src/cloudflare/resources/zero_trust/dlp/profiles/predefined.py">update</a>(profile_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/profiles/predefined_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/profiles/predefined_profile.py">PredefinedProfile</a></code>
-- <code title="get /accounts/{account_id}/dlp/profiles/predefined/{profile_id}">client.zero_trust.dlp.profiles.predefined.<a href="./src/cloudflare/resources/zero_trust/dlp/profiles/predefined.py">get</a>(profile_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/profiles/predefined_profile.py">PredefinedProfile</a></code>
+- <code title="get /radar/traffic_anomalies/locations">client.radar.traffic_anomalies.locations.<a href="./src/cloudflare/resources/radar/traffic_anomalies/locations.py">get</a>(\*\*<a href="src/cloudflare/types/radar/traffic_anomalies/location_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/traffic_anomalies/location_get_response.py">LocationGetResponse</a></code>
 
-## Gateway
+## TCPResetsTimeouts
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust import GatewayCreateResponse, GatewayListResponse
+from cloudflare.types.radar import (
+    TCPResetsTimeoutSummaryResponse,
+    TCPResetsTimeoutTimeseriesGroupsResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/gateway">client.zero_trust.gateway.<a href="./src/cloudflare/resources/zero_trust/gateway/gateway.py">create</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway_create_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/gateway">client.zero_trust.gateway.<a href="./src/cloudflare/resources/zero_trust/gateway/gateway.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway_list_response.py">Optional</a></code>
+- <code title="get /radar/tcp_resets_timeouts/summary">client.radar.tcp_resets_timeouts.<a href="./src/cloudflare/resources/radar/tcp_resets_timeouts.py">summary</a>(\*\*<a href="src/cloudflare/types/radar/tcp_resets_timeout_summary_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/tcp_resets_timeout_summary_response.py">TCPResetsTimeoutSummaryResponse</a></code>
+- <code title="get /radar/tcp_resets_timeouts/timeseries_groups">client.radar.tcp_resets_timeouts.<a href="./src/cloudflare/resources/radar/tcp_resets_timeouts.py">timeseries_groups</a>(\*\*<a href="src/cloudflare/types/radar/tcp_resets_timeout_timeseries_groups_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/tcp_resets_timeout_timeseries_groups_response.py">TCPResetsTimeoutTimeseriesGroupsResponse</a></code>
+
+## RobotsTXT
 
-### AuditSSHSettings
+### Top
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.gateway import GatewaySettings
+from cloudflare.types.radar.robots_txt import TopDomainCategoriesResponse
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/gateway/audit_ssh_settings">client.zero_trust.gateway.audit_ssh_settings.<a href="./src/cloudflare/resources/zero_trust/gateway/audit_ssh_settings.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/audit_ssh_setting_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_settings.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/gateway/audit_ssh_settings">client.zero_trust.gateway.audit_ssh_settings.<a href="./src/cloudflare/resources/zero_trust/gateway/audit_ssh_settings.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_settings.py">Optional</a></code>
+- <code title="get /radar/robots_txt/top/domain_categories">client.radar.robots_txt.top.<a href="./src/cloudflare/resources/radar/robots_txt/top/top.py">domain_categories</a>(\*\*<a href="src/cloudflare/types/radar/robots_txt/top_domain_categories_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/robots_txt/top_domain_categories_response.py">TopDomainCategoriesResponse</a></code>
 
-### Categories
+#### UserAgents
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.gateway import Category
+from cloudflare.types.radar.robots_txt.top import UserAgentDirectiveResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/gateway/categories">client.zero_trust.gateway.categories.<a href="./src/cloudflare/resources/zero_trust/gateway/categories.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/category.py">SyncSinglePage[Category]</a></code>
+- <code title="get /radar/robots_txt/top/user_agents/directive">client.radar.robots_txt.top.user_agents.<a href="./src/cloudflare/resources/radar/robots_txt/top/user_agents.py">directive</a>(\*\*<a href="src/cloudflare/types/radar/robots_txt/top/user_agent_directive_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/robots_txt/top/user_agent_directive_response.py">UserAgentDirectiveResponse</a></code>
 
-### AppTypes
+## LeakedCredentials
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.gateway import AppType
+from cloudflare.types.radar import (
+    LeakedCredentialSummaryV2Response,
+    LeakedCredentialTimeseriesGroupsV2Response,
+)
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/gateway/app_types">client.zero_trust.gateway.app_types.<a href="./src/cloudflare/resources/zero_trust/gateway/app_types.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/app_type.py">SyncSinglePage[AppType]</a></code>
+- <code title="get /radar/leaked_credential_checks/summary/{dimension}">client.radar.leaked_credentials.<a href="./src/cloudflare/resources/radar/leaked_credentials/leaked_credentials.py">summary_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/leaked_credential_summary_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/leaked_credential_summary_v2_response.py">LeakedCredentialSummaryV2Response</a></code>
+- <code title="get /radar/leaked_credential_checks/timeseries_groups/{dimension}">client.radar.leaked_credentials.<a href="./src/cloudflare/resources/radar/leaked_credentials/leaked_credentials.py">timeseries_groups_v2</a>(dimension, \*\*<a href="src/cloudflare/types/radar/leaked_credential_timeseries_groups_v2_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/leaked_credential_timeseries_groups_v2_response.py">LeakedCredentialTimeseriesGroupsV2Response</a></code>
 
-### Configurations
+### Summary
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.gateway import (
-    ActivityLogSettings,
-    AntiVirusSettings,
-    BlockPageSettings,
-    BodyScanningSettings,
-    BrowserIsolationSettings,
-    CustomCertificateSettings,
-    ExtendedEmailMatching,
-    FipsSettings,
-    GatewayConfigurationSettings,
-    NotificationSettings,
-    ProtocolDetection,
-    TLSSettings,
-    ConfigurationUpdateResponse,
-    ConfigurationEditResponse,
-    ConfigurationGetResponse,
+from cloudflare.types.radar.leaked_credentials import (
+    SummaryBotClassResponse,
+    SummaryCompromisedResponse,
 )
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/gateway/configuration">client.zero_trust.gateway.configurations.<a href="./src/cloudflare/resources/zero_trust/gateway/configurations.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/configuration_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/configuration_update_response.py">Optional</a></code>
-- <code title="patch /accounts/{account_id}/gateway/configuration">client.zero_trust.gateway.configurations.<a href="./src/cloudflare/resources/zero_trust/gateway/configurations.py">edit</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/configuration_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/configuration_edit_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/gateway/configuration">client.zero_trust.gateway.configurations.<a href="./src/cloudflare/resources/zero_trust/gateway/configurations.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/configuration_get_response.py">Optional</a></code>
+- <code title="get /radar/leaked_credential_checks/summary/bot_class">client.radar.leaked_credentials.summary.<a href="./src/cloudflare/resources/radar/leaked_credentials/summary.py">bot_class</a>(\*\*<a href="src/cloudflare/types/radar/leaked_credentials/summary_bot_class_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/leaked_credentials/summary_bot_class_response.py">SummaryBotClassResponse</a></code>
+- <code title="get /radar/leaked_credential_checks/summary/compromised">client.radar.leaked_credentials.summary.<a href="./src/cloudflare/resources/radar/leaked_credentials/summary.py">compromised</a>(\*\*<a href="src/cloudflare/types/radar/leaked_credentials/summary_compromised_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/leaked_credentials/summary_compromised_response.py">SummaryCompromisedResponse</a></code>
 
-### Lists
+### TimeseriesGroups
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.gateway import (
-    GatewayItem,
-    GatewayList,
-    ListCreateResponse,
-    ListDeleteResponse,
+from cloudflare.types.radar.leaked_credentials import (
+    TimeseriesGroupBotClassResponse,
+    TimeseriesGroupCompromisedResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/gateway/lists">client.zero_trust.gateway.lists.<a href="./src/cloudflare/resources/zero_trust/gateway/lists/lists.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/list_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/list_create_response.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/gateway/lists/{list_id}">client.zero_trust.gateway.lists.<a href="./src/cloudflare/resources/zero_trust/gateway/lists/lists.py">update</a>(list_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/list_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_list.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/gateway/lists">client.zero_trust.gateway.lists.<a href="./src/cloudflare/resources/zero_trust/gateway/lists/lists.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/list_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_list.py">SyncSinglePage[GatewayList]</a></code>
-- <code title="delete /accounts/{account_id}/gateway/lists/{list_id}">client.zero_trust.gateway.lists.<a href="./src/cloudflare/resources/zero_trust/gateway/lists/lists.py">delete</a>(list_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/list_delete_response.py">Optional</a></code>
-- <code title="patch /accounts/{account_id}/gateway/lists/{list_id}">client.zero_trust.gateway.lists.<a href="./src/cloudflare/resources/zero_trust/gateway/lists/lists.py">edit</a>(list_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/list_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_list.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/gateway/lists/{list_id}">client.zero_trust.gateway.lists.<a href="./src/cloudflare/resources/zero_trust/gateway/lists/lists.py">get</a>(list_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_list.py">Optional</a></code>
+- <code title="get /radar/leaked_credential_checks/timeseries_groups/bot_class">client.radar.leaked_credentials.timeseries_groups.<a href="./src/cloudflare/resources/radar/leaked_credentials/timeseries_groups.py">bot_class</a>(\*\*<a href="src/cloudflare/types/radar/leaked_credentials/timeseries_group_bot_class_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/leaked_credentials/timeseries_group_bot_class_response.py">TimeseriesGroupBotClassResponse</a></code>
+- <code title="get /radar/leaked_credential_checks/timeseries_groups/compromised">client.radar.leaked_credentials.timeseries_groups.<a href="./src/cloudflare/resources/radar/leaked_credentials/timeseries_groups.py">compromised</a>(\*\*<a href="src/cloudflare/types/radar/leaked_credentials/timeseries_group_compromised_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/leaked_credentials/timeseries_group_compromised_response.py">TimeseriesGroupCompromisedResponse</a></code>
 
-#### Items
+# BotManagement
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.gateway.lists import ItemListResponse
+from cloudflare.types.bot_management import (
+    BotFightModeConfiguration,
+    SubscriptionConfiguration,
+    SuperBotFightModeDefinitelyConfiguration,
+    SuperBotFightModeLikelyConfiguration,
+    BotManagementUpdateResponse,
+    BotManagementGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/gateway/lists/{list_id}/items">client.zero_trust.gateway.lists.items.<a href="./src/cloudflare/resources/zero_trust/gateway/lists/items.py">list</a>(list_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/lists/item_list_response.py">SyncSinglePage[ItemListResponse]</a></code>
+- <code title="put /zones/{zone_id}/bot_management">client.bot_management.<a href="./src/cloudflare/resources/bot_management.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/bot_management/bot_management_update_params.py">params</a>) -> <a href="./src/cloudflare/types/bot_management/bot_management_update_response.py">Optional[BotManagementUpdateResponse]</a></code>
+- <code title="get /zones/{zone_id}/bot_management">client.bot_management.<a href="./src/cloudflare/resources/bot_management.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/bot_management/bot_management_get_response.py">Optional[BotManagementGetResponse]</a></code>
 
-### Locations
+# Fraud
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.gateway import Location, LocationDeleteResponse
+from cloudflare.types.fraud import FraudSettings
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/gateway/locations">client.zero_trust.gateway.locations.<a href="./src/cloudflare/resources/zero_trust/gateway/locations.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/location_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/location.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/gateway/locations/{location_id}">client.zero_trust.gateway.locations.<a href="./src/cloudflare/resources/zero_trust/gateway/locations.py">update</a>(location_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/location_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/location.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/gateway/locations">client.zero_trust.gateway.locations.<a href="./src/cloudflare/resources/zero_trust/gateway/locations.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/location.py">SyncSinglePage[Location]</a></code>
-- <code title="delete /accounts/{account_id}/gateway/locations/{location_id}">client.zero_trust.gateway.locations.<a href="./src/cloudflare/resources/zero_trust/gateway/locations.py">delete</a>(location_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/location_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/gateway/locations/{location_id}">client.zero_trust.gateway.locations.<a href="./src/cloudflare/resources/zero_trust/gateway/locations.py">get</a>(location_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/location.py">Optional</a></code>
+- <code title="put /zones/{zone_id}/fraud_detection/settings">client.fraud.<a href="./src/cloudflare/resources/fraud.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/fraud/fraud_update_params.py">params</a>) -> <a href="./src/cloudflare/types/fraud/fraud_settings.py">Optional[FraudSettings]</a></code>
+- <code title="get /zones/{zone_id}/fraud_detection/settings">client.fraud.<a href="./src/cloudflare/resources/fraud.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/fraud/fraud_settings.py">Optional[FraudSettings]</a></code>
 
-### Logging
+# OriginPostQuantumEncryption
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.gateway import LoggingSetting
+from cloudflare.types.origin_post_quantum_encryption import (
+    OriginPostQuantumEncryptionUpdateResponse,
+    OriginPostQuantumEncryptionGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/gateway/logging">client.zero_trust.gateway.logging.<a href="./src/cloudflare/resources/zero_trust/gateway/logging.py">update</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/logging_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/logging_setting.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/gateway/logging">client.zero_trust.gateway.logging.<a href="./src/cloudflare/resources/zero_trust/gateway/logging.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/logging_setting.py">Optional</a></code>
+- <code title="put /zones/{zone_id}/cache/origin_post_quantum_encryption">client.origin_post_quantum_encryption.<a href="./src/cloudflare/resources/origin_post_quantum_encryption.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_update_params.py">params</a>) -> <a href="./src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_update_response.py">Optional[OriginPostQuantumEncryptionUpdateResponse]</a></code>
+- <code title="get /zones/{zone_id}/cache/origin_post_quantum_encryption">client.origin_post_quantum_encryption.<a href="./src/cloudflare/resources/origin_post_quantum_encryption.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_get_response.py">Optional[OriginPostQuantumEncryptionGetResponse]</a></code>
 
-### ProxyEndpoints
+# Zaraz
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.gateway import (
-    GatewayIPs,
-    ProxyEndpoint,
-    ProxyEndpointDeleteResponse,
-    ProxyEndpointGetResponse,
-)
+from cloudflare.types.zaraz import ButtonTextTranslation, NeoEvent
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/gateway/proxy_endpoints">client.zero_trust.gateway.proxy_endpoints.<a href="./src/cloudflare/resources/zero_trust/gateway/proxy_endpoints.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/proxy_endpoint_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/proxy_endpoint.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/gateway/proxy_endpoints">client.zero_trust.gateway.proxy_endpoints.<a href="./src/cloudflare/resources/zero_trust/gateway/proxy_endpoints.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/proxy_endpoint.py">Optional</a></code>
-- <code title="delete /accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}">client.zero_trust.gateway.proxy_endpoints.<a href="./src/cloudflare/resources/zero_trust/gateway/proxy_endpoints.py">delete</a>(proxy_endpoint_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/proxy_endpoint_delete_response.py">Optional</a></code>
-- <code title="patch /accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}">client.zero_trust.gateway.proxy_endpoints.<a href="./src/cloudflare/resources/zero_trust/gateway/proxy_endpoints.py">edit</a>(proxy_endpoint_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/proxy_endpoint_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/proxy_endpoint.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}">client.zero_trust.gateway.proxy_endpoints.<a href="./src/cloudflare/resources/zero_trust/gateway/proxy_endpoints.py">get</a>(proxy_endpoint_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/proxy_endpoint_get_response.py">Optional</a></code>
+- <code title="put /zones/{zone_id}/settings/zaraz/workflow">client.zaraz.<a href="./src/cloudflare/resources/zaraz/zaraz.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/zaraz/zaraz_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zaraz/workflow.py">Workflow</a></code>
 
-### Rules
+## Config
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.gateway import (
-    DNSResolverSettingsV4,
-    DNSResolverSettingsV6,
-    GatewayFilter,
-    GatewayRule,
-    RuleSetting,
-    Schedule,
-    RuleDeleteResponse,
-)
+from cloudflare.types.zaraz import Configuration
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/gateway/rules">client.zero_trust.gateway.rules.<a href="./src/cloudflare/resources/zero_trust/gateway/rules.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_rule.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/gateway/rules/{rule_id}">client.zero_trust.gateway.rules.<a href="./src/cloudflare/resources/zero_trust/gateway/rules.py">update</a>(rule_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_rule.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/gateway/rules">client.zero_trust.gateway.rules.<a href="./src/cloudflare/resources/zero_trust/gateway/rules.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_rule.py">SyncSinglePage[GatewayRule]</a></code>
-- <code title="delete /accounts/{account_id}/gateway/rules/{rule_id}">client.zero_trust.gateway.rules.<a href="./src/cloudflare/resources/zero_trust/gateway/rules.py">delete</a>(rule_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/rule_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/gateway/rules/{rule_id}">client.zero_trust.gateway.rules.<a href="./src/cloudflare/resources/zero_trust/gateway/rules.py">get</a>(rule_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/gateway_rule.py">Optional</a></code>
+- <code title="put /zones/{zone_id}/settings/zaraz/config">client.zaraz.config.<a href="./src/cloudflare/resources/zaraz/config.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/zaraz/config_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zaraz/configuration.py">Configuration</a></code>
+- <code title="get /zones/{zone_id}/settings/zaraz/config">client.zaraz.config.<a href="./src/cloudflare/resources/zaraz/config.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/zaraz/configuration.py">Configuration</a></code>
 
-### Certificates
+## Default
 
-Types:
+Methods:
 
-```python
-from cloudflare.types.zero_trust.gateway import (
-    CertificateCreateResponse,
-    CertificateListResponse,
-    CertificateDeleteResponse,
-    CertificateGetResponse,
-)
-```
+- <code title="get /zones/{zone_id}/settings/zaraz/default">client.zaraz.default.<a href="./src/cloudflare/resources/zaraz/default.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/zaraz/configuration.py">Configuration</a></code>
 
-Methods:
+## Export
 
-- <code title="post /accounts/{account_id}/gateway/certificates">client.zero_trust.gateway.certificates.<a href="./src/cloudflare/resources/zero_trust/gateway/certificates.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/gateway/certificate_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/gateway/certificate_create_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/gateway/certificates">client.zero_trust.gateway.certificates.<a href="./src/cloudflare/resources/zero_trust/gateway/certificates.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/certificate_list_response.py">SyncSinglePage[CertificateListResponse]</a></code>
-- <code title="delete /accounts/{account_id}/gateway/certificates/{certificate_id}">client.zero_trust.gateway.certificates.<a href="./src/cloudflare/resources/zero_trust/gateway/certificates.py">delete</a>(certificate_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/certificate_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/gateway/certificates/{certificate_id}">client.zero_trust.gateway.certificates.<a href="./src/cloudflare/resources/zero_trust/gateway/certificates.py">get</a>(certificate_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/gateway/certificate_get_response.py">Optional</a></code>
+Methods:
 
-## Networks
+- <code title="get /zones/{zone_id}/settings/zaraz/export">client.zaraz.export.<a href="./src/cloudflare/resources/zaraz/export.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/zaraz/configuration.py">Configuration</a></code>
 
-### Routes
+## History
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.networks import NetworkRoute, Route, Teamnet
+from cloudflare.types.zaraz import HistoryListResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/teamnet/routes">client.zero_trust.networks.routes.<a href="./src/cloudflare/resources/zero_trust/networks/routes/routes.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/route_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/route.py">Route</a></code>
-- <code title="get /accounts/{account_id}/teamnet/routes">client.zero_trust.networks.routes.<a href="./src/cloudflare/resources/zero_trust/networks/routes/routes.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/route_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/teamnet.py">SyncV4PagePaginationArray[Teamnet]</a></code>
-- <code title="delete /accounts/{account_id}/teamnet/routes/{route_id}">client.zero_trust.networks.routes.<a href="./src/cloudflare/resources/zero_trust/networks/routes/routes.py">delete</a>(route_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/networks/route.py">Route</a></code>
-- <code title="patch /accounts/{account_id}/teamnet/routes/{route_id}">client.zero_trust.networks.routes.<a href="./src/cloudflare/resources/zero_trust/networks/routes/routes.py">edit</a>(route_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/route_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/route.py">Route</a></code>
-
-#### IPs
+- <code title="put /zones/{zone_id}/settings/zaraz/history">client.zaraz.history.<a href="./src/cloudflare/resources/zaraz/history/history.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/zaraz/history_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zaraz/configuration.py">Configuration</a></code>
+- <code title="get /zones/{zone_id}/settings/zaraz/history">client.zaraz.history.<a href="./src/cloudflare/resources/zaraz/history/history.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/zaraz/history_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zaraz/history_list_response.py">SyncSinglePage[HistoryListResponse]</a></code>
 
-Methods:
+### Configs
 
-- <code title="get /accounts/{account_id}/teamnet/routes/ip/{ip}">client.zero_trust.networks.routes.ips.<a href="./src/cloudflare/resources/zero_trust/networks/routes/ips.py">get</a>(ip, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/routes/ip_get_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/teamnet.py">Teamnet</a></code>
+Types:
 
-#### Networks
+```python
+from cloudflare.types.zaraz.history import ConfigGetResponse
+```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/teamnet/routes/network/{ip_network_encoded}">client.zero_trust.networks.routes.networks.<a href="./src/cloudflare/resources/zero_trust/networks/routes/networks.py">create</a>(ip_network_encoded, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/routes/network_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/route.py">Route</a></code>
-- <code title="delete /accounts/{account_id}/teamnet/routes/network/{ip_network_encoded}">client.zero_trust.networks.routes.networks.<a href="./src/cloudflare/resources/zero_trust/networks/routes/networks.py">delete</a>(ip_network_encoded, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/routes/network_delete_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/route.py">Route</a></code>
-- <code title="patch /accounts/{account_id}/teamnet/routes/network/{ip_network_encoded}">client.zero_trust.networks.routes.networks.<a href="./src/cloudflare/resources/zero_trust/networks/routes/networks.py">edit</a>(ip_network_encoded, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/networks/route.py">Route</a></code>
+- <code title="get /zones/{zone_id}/settings/zaraz/history/configs">client.zaraz.history.configs.<a href="./src/cloudflare/resources/zaraz/history/configs.py">get</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/zaraz/history/config_get_params.py">params</a>) -> <a href="./src/cloudflare/types/zaraz/history/config_get_response.py">ConfigGetResponse</a></code>
 
-### VirtualNetworks
+## Publish
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.networks import (
-    VirtualNetwork,
-    VirtualNetworkCreateResponse,
-    VirtualNetworkDeleteResponse,
-    VirtualNetworkEditResponse,
-)
+from cloudflare.types.zaraz import PublishCreateResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/teamnet/virtual_networks">client.zero_trust.networks.virtual_networks.<a href="./src/cloudflare/resources/zero_trust/networks/virtual_networks.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/virtual_network_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/virtual_network_create_response.py">VirtualNetworkCreateResponse</a></code>
-- <code title="get /accounts/{account_id}/teamnet/virtual_networks">client.zero_trust.networks.virtual_networks.<a href="./src/cloudflare/resources/zero_trust/networks/virtual_networks.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/virtual_network_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/virtual_network.py">SyncSinglePage[VirtualNetwork]</a></code>
-- <code title="delete /accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}">client.zero_trust.networks.virtual_networks.<a href="./src/cloudflare/resources/zero_trust/networks/virtual_networks.py">delete</a>(virtual_network_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/networks/virtual_network_delete_response.py">VirtualNetworkDeleteResponse</a></code>
-- <code title="patch /accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}">client.zero_trust.networks.virtual_networks.<a href="./src/cloudflare/resources/zero_trust/networks/virtual_networks.py">edit</a>(virtual_network_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/networks/virtual_network_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/networks/virtual_network_edit_response.py">VirtualNetworkEditResponse</a></code>
+- <code title="post /zones/{zone_id}/settings/zaraz/publish">client.zaraz.publish.<a href="./src/cloudflare/resources/zaraz/publish.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/zaraz/publish_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zaraz/publish_create_response.py">str</a></code>
 
-## RiskScoring
+## Workflow
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust import RiskScoringGetResponse, RiskScoringResetResponse
+from cloudflare.types.zaraz import Workflow
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_identifier}/zt_risk_scoring/{user_id}">client.zero_trust.risk_scoring.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/risk_scoring.py">get</a>(user_id, \*, account_identifier, \*\*<a href="src/cloudflare/types/zero_trust/risk_scoring_get_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring_get_response.py">RiskScoringGetResponse</a></code>
-- <code title="post /accounts/{account_identifier}/zt_risk_scoring/{user_id}/reset">client.zero_trust.risk_scoring.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/risk_scoring.py">reset</a>(user_id, \*, account_identifier) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring_reset_response.py">RiskScoringResetResponse</a></code>
+- <code title="get /zones/{zone_id}/settings/zaraz/workflow">client.zaraz.workflow.<a href="./src/cloudflare/resources/zaraz/workflow.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/zaraz/workflow.py">Workflow</a></code>
 
-### Behaviours
+# Speed
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.risk_scoring import BehaviourUpdateResponse, BehaviourGetResponse
+from cloudflare.types.speed import LabeledRegion, LighthouseReport, Trend
 ```
 
-Methods:
-
-- <code title="put /accounts/{account_identifier}/zt_risk_scoring/behaviors">client.zero_trust.risk_scoring.behaviours.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/behaviours.py">update</a>(account_identifier, \*\*<a href="src/cloudflare/types/zero_trust/risk_scoring/behaviour_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring/behaviour_update_response.py">BehaviourUpdateResponse</a></code>
-- <code title="get /accounts/{account_identifier}/zt_risk_scoring/behaviors">client.zero_trust.risk_scoring.behaviours.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/behaviours.py">get</a>(account_identifier) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring/behaviour_get_response.py">BehaviourGetResponse</a></code>
-
-### Summary
+## Schedule
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.risk_scoring import SummaryGetResponse
+from cloudflare.types.speed import Schedule, ScheduleCreateResponse, ScheduleDeleteResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_identifier}/zt_risk_scoring/summary">client.zero_trust.risk_scoring.summary.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/summary.py">get</a>(account_identifier, \*\*<a href="src/cloudflare/types/zero_trust/risk_scoring/summary_get_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring/summary_get_response.py">SummaryGetResponse</a></code>
+- <code title="post /zones/{zone_id}/speed_api/schedule/{url}">client.speed.schedule.<a href="./src/cloudflare/resources/speed/schedule.py">create</a>(url, \*, zone_id, \*\*<a href="src/cloudflare/types/speed/schedule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/speed/schedule_create_response.py">Optional[ScheduleCreateResponse]</a></code>
+- <code title="delete /zones/{zone_id}/speed_api/schedule/{url}">client.speed.schedule.<a href="./src/cloudflare/resources/speed/schedule.py">delete</a>(url, \*, zone_id, \*\*<a href="src/cloudflare/types/speed/schedule_delete_params.py">params</a>) -> <a href="./src/cloudflare/types/speed/schedule_delete_response.py">Optional[ScheduleDeleteResponse]</a></code>
+- <code title="get /zones/{zone_id}/speed_api/schedule/{url}">client.speed.schedule.<a href="./src/cloudflare/resources/speed/schedule.py">get</a>(url, \*, zone_id, \*\*<a href="src/cloudflare/types/speed/schedule_get_params.py">params</a>) -> <a href="./src/cloudflare/types/speed/schedule.py">Optional[Schedule]</a></code>
 
-### Integrations
+## Availabilities
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.risk_scoring import (
-    IntegrationCreateResponse,
-    IntegrationUpdateResponse,
-    IntegrationListResponse,
-    IntegrationDeleteResponse,
-    IntegrationGetResponse,
-)
+from cloudflare.types.speed import Availability
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/zt_risk_scoring/integrations">client.zero_trust.risk_scoring.integrations.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/integrations/integrations.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/risk_scoring/integration_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring/integration_create_response.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/zt_risk_scoring/integrations/{integration_id}">client.zero_trust.risk_scoring.integrations.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/integrations/integrations.py">update</a>(integration_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/risk_scoring/integration_update_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring/integration_update_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/zt_risk_scoring/integrations">client.zero_trust.risk_scoring.integrations.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/integrations/integrations.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring/integration_list_response.py">SyncSinglePage[IntegrationListResponse]</a></code>
-- <code title="delete /accounts/{account_id}/zt_risk_scoring/integrations/{integration_id}">client.zero_trust.risk_scoring.integrations.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/integrations/integrations.py">delete</a>(integration_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring/integration_delete_response.py">object</a></code>
-- <code title="get /accounts/{account_id}/zt_risk_scoring/integrations/{integration_id}">client.zero_trust.risk_scoring.integrations.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/integrations/integrations.py">get</a>(integration_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring/integration_get_response.py">Optional</a></code>
+- <code title="get /zones/{zone_id}/speed_api/availabilities">client.speed.availabilities.<a href="./src/cloudflare/resources/speed/availabilities.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/speed/availability.py">Optional[Availability]</a></code>
 
-#### References
+## Pages
 
 Types:
 
 ```python
-from cloudflare.types.zero_trust.risk_scoring.integrations import ReferenceGetResponse
+from cloudflare.types.speed import PageListResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/zt_risk_scoring/integrations/reference_id/{reference_id}">client.zero_trust.risk_scoring.integrations.references.<a href="./src/cloudflare/resources/zero_trust/risk_scoring/integrations/references.py">get</a>(reference_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/risk_scoring/integrations/reference_get_response.py">Optional</a></code>
-
-# Challenges
+- <code title="get /zones/{zone_id}/speed_api/pages">client.speed.pages.<a href="./src/cloudflare/resources/speed/pages/pages.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/speed/page_list_response.py">SyncSinglePage[PageListResponse]</a></code>
+- <code title="get /zones/{zone_id}/speed_api/pages/{url}/trend">client.speed.pages.<a href="./src/cloudflare/resources/speed/pages/pages.py">trend</a>(url, \*, zone_id, \*\*<a href="src/cloudflare/types/speed/page_trend_params.py">params</a>) -> <a href="./src/cloudflare/types/speed/trend.py">Optional[Trend]</a></code>
 
-## Widgets
+### Tests
 
 Types:
 
 ```python
-from cloudflare.types.challenges import Widget, WidgetDomain, WidgetListResponse
+from cloudflare.types.speed.pages import Test, TestDeleteResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/challenges/widgets">client.challenges.widgets.<a href="./src/cloudflare/resources/challenges/widgets.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/challenges/widget_create_params.py">params</a>) -> <a href="./src/cloudflare/types/challenges/widget.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/challenges/widgets/{sitekey}">client.challenges.widgets.<a href="./src/cloudflare/resources/challenges/widgets.py">update</a>(sitekey, \*, account_id, \*\*<a href="src/cloudflare/types/challenges/widget_update_params.py">params</a>) -> <a href="./src/cloudflare/types/challenges/widget.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/challenges/widgets">client.challenges.widgets.<a href="./src/cloudflare/resources/challenges/widgets.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/challenges/widget_list_params.py">params</a>) -> <a href="./src/cloudflare/types/challenges/widget_list_response.py">SyncV4PagePaginationArray[WidgetListResponse]</a></code>
-- <code title="delete /accounts/{account_id}/challenges/widgets/{sitekey}">client.challenges.widgets.<a href="./src/cloudflare/resources/challenges/widgets.py">delete</a>(sitekey, \*, account_id) -> <a href="./src/cloudflare/types/challenges/widget.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/challenges/widgets/{sitekey}">client.challenges.widgets.<a href="./src/cloudflare/resources/challenges/widgets.py">get</a>(sitekey, \*, account_id) -> <a href="./src/cloudflare/types/challenges/widget.py">Optional</a></code>
-- <code title="post /accounts/{account_id}/challenges/widgets/{sitekey}/rotate_secret">client.challenges.widgets.<a href="./src/cloudflare/resources/challenges/widgets.py">rotate_secret</a>(sitekey, \*, account_id, \*\*<a href="src/cloudflare/types/challenges/widget_rotate_secret_params.py">params</a>) -> <a href="./src/cloudflare/types/challenges/widget.py">Optional</a></code>
-
-# Hyperdrive
-
-Types:
-
-```python
-from cloudflare.types.hyperdrive import Configuration, Hyperdrive
-```
+- <code title="post /zones/{zone_id}/speed_api/pages/{url}/tests">client.speed.pages.tests.<a href="./src/cloudflare/resources/speed/pages/tests.py">create</a>(url, \*, zone_id, \*\*<a href="src/cloudflare/types/speed/pages/test_create_params.py">params</a>) -> <a href="./src/cloudflare/types/speed/pages/test.py">Optional[Test]</a></code>
+- <code title="get /zones/{zone_id}/speed_api/pages/{url}/tests">client.speed.pages.tests.<a href="./src/cloudflare/resources/speed/pages/tests.py">list</a>(url, \*, zone_id, \*\*<a href="src/cloudflare/types/speed/pages/test_list_params.py">params</a>) -> <a href="./src/cloudflare/types/speed/pages/test.py">SyncV4PagePaginationArray[Test]</a></code>
+- <code title="delete /zones/{zone_id}/speed_api/pages/{url}/tests">client.speed.pages.tests.<a href="./src/cloudflare/resources/speed/pages/tests.py">delete</a>(url, \*, zone_id, \*\*<a href="src/cloudflare/types/speed/pages/test_delete_params.py">params</a>) -> <a href="./src/cloudflare/types/speed/pages/test_delete_response.py">Optional[TestDeleteResponse]</a></code>
+- <code title="get /zones/{zone_id}/speed_api/pages/{url}/tests/{test_id}">client.speed.pages.tests.<a href="./src/cloudflare/resources/speed/pages/tests.py">get</a>(test_id, \*, zone_id, url) -> <a href="./src/cloudflare/types/speed/pages/test.py">Optional[Test]</a></code>
 
-## Configs
+# DCVDelegation
 
 Types:
 
 ```python
-from cloudflare.types.hyperdrive import ConfigDeleteResponse
+from cloudflare.types.dcv_delegation import DCVDelegationUUID
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/hyperdrive/configs">client.hyperdrive.configs.<a href="./src/cloudflare/resources/hyperdrive/configs.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/hyperdrive/config_create_params.py">params</a>) -> <a href="./src/cloudflare/types/hyperdrive/hyperdrive.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}">client.hyperdrive.configs.<a href="./src/cloudflare/resources/hyperdrive/configs.py">update</a>(hyperdrive_id, \*, account_id, \*\*<a href="src/cloudflare/types/hyperdrive/config_update_params.py">params</a>) -> <a href="./src/cloudflare/types/hyperdrive/hyperdrive.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/hyperdrive/configs">client.hyperdrive.configs.<a href="./src/cloudflare/resources/hyperdrive/configs.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/hyperdrive/hyperdrive.py">SyncSinglePage[Hyperdrive]</a></code>
-- <code title="delete /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}">client.hyperdrive.configs.<a href="./src/cloudflare/resources/hyperdrive/configs.py">delete</a>(hyperdrive_id, \*, account_id) -> <a href="./src/cloudflare/types/hyperdrive/config_delete_response.py">ConfigDeleteResponse</a></code>
-- <code title="patch /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}">client.hyperdrive.configs.<a href="./src/cloudflare/resources/hyperdrive/configs.py">edit</a>(hyperdrive_id, \*, account_id, \*\*<a href="src/cloudflare/types/hyperdrive/config_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/hyperdrive/hyperdrive.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}">client.hyperdrive.configs.<a href="./src/cloudflare/resources/hyperdrive/configs.py">get</a>(hyperdrive_id, \*, account_id) -> <a href="./src/cloudflare/types/hyperdrive/hyperdrive.py">Optional</a></code>
+- <code title="get /zones/{zone_id}/dcv_delegation/uuid">client.dcv_delegation.<a href="./src/cloudflare/resources/dcv_delegation.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/dcv_delegation/dcv_delegation_uuid.py">Optional[DCVDelegationUUID]</a></code>
 
-# RUM
+# Hostnames
 
-## SiteInfo
+## Settings
+
+### TLS
 
 Types:
 
 ```python
-from cloudflare.types.rum import Site, SiteInfoDeleteResponse
+from cloudflare.types.hostnames.settings import (
+    Setting,
+    SettingValue,
+    TLSDeleteResponse,
+    TLSGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/rum/site_info">client.rum.site_info.<a href="./src/cloudflare/resources/rum/site_info.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/rum/site_info_create_params.py">params</a>) -> <a href="./src/cloudflare/types/rum/site.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/rum/site_info/{site_id}">client.rum.site_info.<a href="./src/cloudflare/resources/rum/site_info.py">update</a>(site_id, \*, account_id, \*\*<a href="src/cloudflare/types/rum/site_info_update_params.py">params</a>) -> <a href="./src/cloudflare/types/rum/site.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/rum/site_info/list">client.rum.site_info.<a href="./src/cloudflare/resources/rum/site_info.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/rum/site_info_list_params.py">params</a>) -> <a href="./src/cloudflare/types/rum/site.py">SyncV4PagePaginationArray[Site]</a></code>
-- <code title="delete /accounts/{account_id}/rum/site_info/{site_id}">client.rum.site_info.<a href="./src/cloudflare/resources/rum/site_info.py">delete</a>(site_id, \*, account_id) -> <a href="./src/cloudflare/types/rum/site_info_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/rum/site_info/{site_id}">client.rum.site_info.<a href="./src/cloudflare/resources/rum/site_info.py">get</a>(site_id, \*, account_id) -> <a href="./src/cloudflare/types/rum/site.py">Optional</a></code>
+- <code title="put /zones/{zone_id}/hostnames/settings/{setting_id}/{hostname}">client.hostnames.settings.tls.<a href="./src/cloudflare/resources/hostnames/settings/tls.py">update</a>(hostname, \*, zone_id, setting_id, \*\*<a href="src/cloudflare/types/hostnames/settings/tls_update_params.py">params</a>) -> <a href="./src/cloudflare/types/hostnames/settings/setting.py">Optional[Setting]</a></code>
+- <code title="delete /zones/{zone_id}/hostnames/settings/{setting_id}/{hostname}">client.hostnames.settings.tls.<a href="./src/cloudflare/resources/hostnames/settings/tls.py">delete</a>(hostname, \*, zone_id, setting_id) -> <a href="./src/cloudflare/types/hostnames/settings/tls_delete_response.py">Optional[TLSDeleteResponse]</a></code>
+- <code title="get /zones/{zone_id}/hostnames/settings/{setting_id}">client.hostnames.settings.tls.<a href="./src/cloudflare/resources/hostnames/settings/tls.py">get</a>(setting_id, \*, zone_id) -> <a href="./src/cloudflare/types/hostnames/settings/tls_get_response.py">SyncSinglePage[TLSGetResponse]</a></code>
 
-## Rules
+# Snippets
 
 Types:
 
 ```python
-from cloudflare.types.rum import RUMRule, RuleListResponse, RuleDeleteResponse
+from cloudflare.types.snippets import (
+    SnippetUpdateResponse,
+    SnippetListResponse,
+    SnippetDeleteResponse,
+    SnippetGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/rum/v2/{ruleset_id}/rule">client.rum.rules.<a href="./src/cloudflare/resources/rum/rules.py">create</a>(ruleset_id, \*, account_id, \*\*<a href="src/cloudflare/types/rum/rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/rum/rum_rule.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/rum/v2/{ruleset_id}/rule/{rule_id}">client.rum.rules.<a href="./src/cloudflare/resources/rum/rules.py">update</a>(rule_id, \*, account_id, ruleset_id, \*\*<a href="src/cloudflare/types/rum/rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/rum/rum_rule.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/rum/v2/{ruleset_id}/rules">client.rum.rules.<a href="./src/cloudflare/resources/rum/rules.py">list</a>(ruleset_id, \*, account_id) -> <a href="./src/cloudflare/types/rum/rule_list_response.py">Optional</a></code>
-- <code title="delete /accounts/{account_id}/rum/v2/{ruleset_id}/rule/{rule_id}">client.rum.rules.<a href="./src/cloudflare/resources/rum/rules.py">delete</a>(rule_id, \*, account_id, ruleset_id) -> <a href="./src/cloudflare/types/rum/rule_delete_response.py">Optional</a></code>
+- <code title="put /zones/{zone_id}/snippets/{snippet_name}">client.snippets.<a href="./src/cloudflare/resources/snippets/snippets.py">update</a>(snippet_name, \*, zone_id, \*\*<a href="src/cloudflare/types/snippets/snippet_update_params.py">params</a>) -> <a href="./src/cloudflare/types/snippets/snippet_update_response.py">SnippetUpdateResponse</a></code>
+- <code title="get /zones/{zone_id}/snippets">client.snippets.<a href="./src/cloudflare/resources/snippets/snippets.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/snippets/snippet_list_params.py">params</a>) -> <a href="./src/cloudflare/types/snippets/snippet_list_response.py">SyncV4PagePaginationArray[SnippetListResponse]</a></code>
+- <code title="delete /zones/{zone_id}/snippets/{snippet_name}">client.snippets.<a href="./src/cloudflare/resources/snippets/snippets.py">delete</a>(snippet_name, \*, zone_id) -> <a href="./src/cloudflare/types/snippets/snippet_delete_response.py">str</a></code>
+- <code title="get /zones/{zone_id}/snippets/{snippet_name}">client.snippets.<a href="./src/cloudflare/resources/snippets/snippets.py">get</a>(snippet_name, \*, zone_id) -> <a href="./src/cloudflare/types/snippets/snippet_get_response.py">SnippetGetResponse</a></code>
 
-# Vectorize
+## Content
 
-## Indexes
+Methods:
+
+- <code title="get /zones/{zone_id}/snippets/{snippet_name}/content">client.snippets.content.<a href="./src/cloudflare/resources/snippets/content.py">get</a>(snippet_name, \*, zone_id) -> BinaryAPIResponse</code>
+
+## Rules
 
 Types:
 
 ```python
-from cloudflare.types.vectorize import (
-    CreateIndex,
-    IndexDeleteVectorsByID,
-    IndexDimensionConfiguration,
-    IndexInsert,
-    IndexQuery,
-    IndexUpsert,
-    IndexDeleteResponse,
-    IndexGetByIDsResponse,
-)
+from cloudflare.types.snippets import RuleUpdateResponse, RuleListResponse, RuleDeleteResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/vectorize/indexes">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/vectorize/index_create_params.py">params</a>) -> <a href="./src/cloudflare/types/vectorize/create_index.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/vectorize/indexes/{index_name}">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes.py">update</a>(index_name, \*, account_id, \*\*<a href="src/cloudflare/types/vectorize/index_update_params.py">params</a>) -> <a href="./src/cloudflare/types/vectorize/create_index.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/vectorize/indexes">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/vectorize/create_index.py">SyncSinglePage[CreateIndex]</a></code>
-- <code title="delete /accounts/{account_id}/vectorize/indexes/{index_name}">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes.py">delete</a>(index_name, \*, account_id) -> <a href="./src/cloudflare/types/vectorize/index_delete_response.py">IndexDeleteResponse</a></code>
-- <code title="post /accounts/{account_id}/vectorize/indexes/{index_name}/delete-by-ids">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes.py">delete_by_ids</a>(index_name, \*, account_id, \*\*<a href="src/cloudflare/types/vectorize/index_delete_by_ids_params.py">params</a>) -> <a href="./src/cloudflare/types/vectorize/index_delete_vectors_by_id.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/vectorize/indexes/{index_name}">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes.py">get</a>(index_name, \*, account_id) -> <a href="./src/cloudflare/types/vectorize/create_index.py">Optional</a></code>
-- <code title="post /accounts/{account_id}/vectorize/indexes/{index_name}/get-by-ids">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes.py">get_by_ids</a>(index_name, \*, account_id, \*\*<a href="src/cloudflare/types/vectorize/index_get_by_ids_params.py">params</a>) -> <a href="./src/cloudflare/types/vectorize/index_get_by_ids_response.py">object</a></code>
-- <code title="post /accounts/{account_id}/vectorize/indexes/{index_name}/insert">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes.py">insert</a>(index_name, \*, account_id, \*\*<a href="src/cloudflare/types/vectorize/index_insert_params.py">params</a>) -> <a href="./src/cloudflare/types/vectorize/index_insert.py">Optional</a></code>
-- <code title="post /accounts/{account_id}/vectorize/indexes/{index_name}/query">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes.py">query</a>(index_name, \*, account_id, \*\*<a href="src/cloudflare/types/vectorize/index_query_params.py">params</a>) -> <a href="./src/cloudflare/types/vectorize/index_query.py">Optional</a></code>
-- <code title="post /accounts/{account_id}/vectorize/indexes/{index_name}/upsert">client.vectorize.indexes.<a href="./src/cloudflare/resources/vectorize/indexes.py">upsert</a>(index_name, \*, account_id, \*\*<a href="src/cloudflare/types/vectorize/index_upsert_params.py">params</a>) -> <a href="./src/cloudflare/types/vectorize/index_upsert.py">Optional</a></code>
+- <code title="put /zones/{zone_id}/snippets/snippet_rules">client.snippets.rules.<a href="./src/cloudflare/resources/snippets/rules.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/snippets/rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/snippets/rule_update_response.py">SyncSinglePage[RuleUpdateResponse]</a></code>
+- <code title="get /zones/{zone_id}/snippets/snippet_rules">client.snippets.rules.<a href="./src/cloudflare/resources/snippets/rules.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/snippets/rule_list_response.py">SyncSinglePage[RuleListResponse]</a></code>
+- <code title="delete /zones/{zone_id}/snippets/snippet_rules">client.snippets.rules.<a href="./src/cloudflare/resources/snippets/rules.py">delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/snippets/rule_delete_response.py">SyncSinglePage[RuleDeleteResponse]</a></code>
 
-# URLScanner
+# RealtimeKit
+
+## Apps
 
 Types:
 
 ```python
-from cloudflare.types.url_scanner import URLScannerScanResponse
+from cloudflare.types.realtime_kit import AppGetResponse, AppPostResponse
 ```
 
 Methods:
 
-- <code title="get /accounts/{accountId}/urlscanner/scan">client.url_scanner.<a href="./src/cloudflare/resources/url_scanner/url_scanner.py">scan</a>(account_id, \*\*<a href="src/cloudflare/types/url_scanner/url_scanner_scan_params.py">params</a>) -> <a href="./src/cloudflare/types/url_scanner/url_scanner_scan_response.py">URLScannerScanResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/apps">client.realtime_kit.apps.<a href="./src/cloudflare/resources/realtime_kit/apps.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/realtime_kit/app_get_response.py">AppGetResponse</a></code>
+- <code title="post /accounts/{account_id}/realtime/kit/apps">client.realtime_kit.apps.<a href="./src/cloudflare/resources/realtime_kit/apps.py">post</a>(\*, account_id, \*\*<a href="src/cloudflare/types/realtime_kit/app_post_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/app_post_response.py">AppPostResponse</a></code>
 
-## Scans
+## Meetings
 
 Types:
 
 ```python
-from cloudflare.types.url_scanner import (
-    URLScannerDomain,
-    URLScannerTask,
-    ScanCreateResponse,
-    ScanGetResponse,
-    ScanHarResponse,
+from cloudflare.types.realtime_kit import (
+    MeetingCreateResponse,
+    MeetingAddParticipantResponse,
+    MeetingDeleteMeetingParticipantResponse,
+    MeetingEditParticipantResponse,
+    MeetingGetResponse,
+    MeetingGetMeetingByIDResponse,
+    MeetingGetMeetingParticipantResponse,
+    MeetingGetMeetingParticipantsResponse,
+    MeetingRefreshParticipantTokenResponse,
+    MeetingReplaceMeetingByIDResponse,
+    MeetingUpdateMeetingByIDResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /accounts/{accountId}/urlscanner/scan">client.url_scanner.scans.<a href="./src/cloudflare/resources/url_scanner/scans.py">create</a>(account_id, \*\*<a href="src/cloudflare/types/url_scanner/scan_create_params.py">params</a>) -> <a href="./src/cloudflare/types/url_scanner/scan_create_response.py">ScanCreateResponse</a></code>
-- <code title="get /accounts/{accountId}/urlscanner/scan/{scanId}">client.url_scanner.scans.<a href="./src/cloudflare/resources/url_scanner/scans.py">get</a>(scan_id, \*, account_id, \*\*<a href="src/cloudflare/types/url_scanner/scan_get_params.py">params</a>) -> <a href="./src/cloudflare/types/url_scanner/scan_get_response.py">ScanGetResponse</a></code>
-- <code title="get /accounts/{accountId}/urlscanner/scan/{scanId}/har">client.url_scanner.scans.<a href="./src/cloudflare/resources/url_scanner/scans.py">har</a>(scan_id, \*, account_id) -> <a href="./src/cloudflare/types/url_scanner/scan_har_response.py">ScanHarResponse</a></code>
-- <code title="get /accounts/{accountId}/urlscanner/scan/{scanId}/screenshot">client.url_scanner.scans.<a href="./src/cloudflare/resources/url_scanner/scans.py">screenshot</a>(scan_id, \*, account_id, \*\*<a href="src/cloudflare/types/url_scanner/scan_screenshot_params.py">params</a>) -> BinaryAPIResponse</code>
-
-# Radar
-
-## Annotations
+- <code title="post /accounts/{account_id}/realtime/kit/{app_id}/meetings">client.realtime_kit.meetings.<a href="./src/cloudflare/resources/realtime_kit/meetings.py">create</a>(app_id, \*, account_id, \*\*<a href="src/cloudflare/types/realtime_kit/meeting_create_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/meeting_create_response.py">MeetingCreateResponse</a></code>
+- <code title="post /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants">client.realtime_kit.meetings.<a href="./src/cloudflare/resources/realtime_kit/meetings.py">add_participant</a>(meeting_id, \*, account_id, app_id, \*\*<a href="src/cloudflare/types/realtime_kit/meeting_add_participant_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/meeting_add_participant_response.py">MeetingAddParticipantResponse</a></code>
+- <code title="delete /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants/{participant_id}">client.realtime_kit.meetings.<a href="./src/cloudflare/resources/realtime_kit/meetings.py">delete_meeting_participant</a>(participant_id, \*, account_id, app_id, meeting_id) -> <a href="./src/cloudflare/types/realtime_kit/meeting_delete_meeting_participant_response.py">MeetingDeleteMeetingParticipantResponse</a></code>
+- <code title="patch /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants/{participant_id}">client.realtime_kit.meetings.<a href="./src/cloudflare/resources/realtime_kit/meetings.py">edit_participant</a>(participant_id, \*, account_id, app_id, meeting_id, \*\*<a href="src/cloudflare/types/realtime_kit/meeting_edit_participant_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/meeting_edit_participant_response.py">MeetingEditParticipantResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/meetings">client.realtime_kit.meetings.<a href="./src/cloudflare/resources/realtime_kit/meetings.py">get</a>(app_id, \*, account_id, \*\*<a href="src/cloudflare/types/realtime_kit/meeting_get_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/meeting_get_response.py">MeetingGetResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}">client.realtime_kit.meetings.<a href="./src/cloudflare/resources/realtime_kit/meetings.py">get_meeting_by_id</a>(meeting_id, \*, account_id, app_id, \*\*<a href="src/cloudflare/types/realtime_kit/meeting_get_meeting_by_id_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/meeting_get_meeting_by_id_response.py">MeetingGetMeetingByIDResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants/{participant_id}">client.realtime_kit.meetings.<a href="./src/cloudflare/resources/realtime_kit/meetings.py">get_meeting_participant</a>(participant_id, \*, account_id, app_id, meeting_id) -> <a href="./src/cloudflare/types/realtime_kit/meeting_get_meeting_participant_response.py">MeetingGetMeetingParticipantResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants">client.realtime_kit.meetings.<a href="./src/cloudflare/resources/realtime_kit/meetings.py">get_meeting_participants</a>(meeting_id, \*, account_id, app_id, \*\*<a href="src/cloudflare/types/realtime_kit/meeting_get_meeting_participants_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/meeting_get_meeting_participants_response.py">MeetingGetMeetingParticipantsResponse</a></code>
+- <code title="post /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants/{participant_id}/token">client.realtime_kit.meetings.<a href="./src/cloudflare/resources/realtime_kit/meetings.py">refresh_participant_token</a>(participant_id, \*, account_id, app_id, meeting_id) -> <a href="./src/cloudflare/types/realtime_kit/meeting_refresh_participant_token_response.py">MeetingRefreshParticipantTokenResponse</a></code>
+- <code title="put /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}">client.realtime_kit.meetings.<a href="./src/cloudflare/resources/realtime_kit/meetings.py">replace_meeting_by_id</a>(meeting_id, \*, account_id, app_id, \*\*<a href="src/cloudflare/types/realtime_kit/meeting_replace_meeting_by_id_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/meeting_replace_meeting_by_id_response.py">MeetingReplaceMeetingByIDResponse</a></code>
+- <code title="patch /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}">client.realtime_kit.meetings.<a href="./src/cloudflare/resources/realtime_kit/meetings.py">update_meeting_by_id</a>(meeting_id, \*, account_id, app_id, \*\*<a href="src/cloudflare/types/realtime_kit/meeting_update_meeting_by_id_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/meeting_update_meeting_by_id_response.py">MeetingUpdateMeetingByIDResponse</a></code>
 
-### Outages
+## Presets
 
 Types:
 
 ```python
-from cloudflare.types.radar.annotations import OutageGetResponse, OutageLocationsResponse
+from cloudflare.types.realtime_kit import (
+    PresetCreateResponse,
+    PresetUpdateResponse,
+    PresetDeleteResponse,
+    PresetGetResponse,
+    PresetGetPresetByIDResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/annotations/outages">client.radar.annotations.outages.<a href="./src/cloudflare/resources/radar/annotations/outages.py">get</a>(\*\*<a href="src/cloudflare/types/radar/annotations/outage_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/annotations/outage_get_response.py">OutageGetResponse</a></code>
-- <code title="get /radar/annotations/outages/locations">client.radar.annotations.outages.<a href="./src/cloudflare/resources/radar/annotations/outages.py">locations</a>(\*\*<a href="src/cloudflare/types/radar/annotations/outage_locations_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/annotations/outage_locations_response.py">OutageLocationsResponse</a></code>
+- <code title="post /accounts/{account_id}/realtime/kit/{app_id}/presets">client.realtime_kit.presets.<a href="./src/cloudflare/resources/realtime_kit/presets.py">create</a>(app_id, \*, account_id, \*\*<a href="src/cloudflare/types/realtime_kit/preset_create_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/preset_create_response.py">PresetCreateResponse</a></code>
+- <code title="patch /accounts/{account_id}/realtime/kit/{app_id}/presets/{preset_id}">client.realtime_kit.presets.<a href="./src/cloudflare/resources/realtime_kit/presets.py">update</a>(preset_id, \*, account_id, app_id, \*\*<a href="src/cloudflare/types/realtime_kit/preset_update_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/preset_update_response.py">PresetUpdateResponse</a></code>
+- <code title="delete /accounts/{account_id}/realtime/kit/{app_id}/presets/{preset_id}">client.realtime_kit.presets.<a href="./src/cloudflare/resources/realtime_kit/presets.py">delete</a>(preset_id, \*, account_id, app_id) -> <a href="./src/cloudflare/types/realtime_kit/preset_delete_response.py">PresetDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/presets">client.realtime_kit.presets.<a href="./src/cloudflare/resources/realtime_kit/presets.py">get</a>(app_id, \*, account_id, \*\*<a href="src/cloudflare/types/realtime_kit/preset_get_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/preset_get_response.py">PresetGetResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/presets/{preset_id}">client.realtime_kit.presets.<a href="./src/cloudflare/resources/realtime_kit/presets.py">get_preset_by_id</a>(preset_id, \*, account_id, app_id) -> <a href="./src/cloudflare/types/realtime_kit/preset_get_preset_by_id_response.py">PresetGetPresetByIDResponse</a></code>
 
-## BGP
+## Sessions
 
 Types:
 
 ```python
-from cloudflare.types.radar import BGPTimeseriesResponse
+from cloudflare.types.realtime_kit import (
+    SessionGetParticipantDataFromPeerIDResponse,
+    SessionGetSessionChatResponse,
+    SessionGetSessionDetailsResponse,
+    SessionGetSessionParticipantDetailsResponse,
+    SessionGetSessionParticipantsResponse,
+    SessionGetSessionSummaryResponse,
+    SessionGetSessionTranscriptsResponse,
+    SessionGetSessionsResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/bgp/timeseries">client.radar.bgp.<a href="./src/cloudflare/resources/radar/bgp/bgp.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/bgp_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp_timeseries_response.py">BGPTimeseriesResponse</a></code>
-
-### Leaks
+- <code title="post /accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/summary">client.realtime_kit.sessions.<a href="./src/cloudflare/resources/realtime_kit/sessions.py">generate_summary_of_transcripts</a>(session_id, \*, account_id, app_id) -> None</code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/sessions/peer-report/{peer_id}">client.realtime_kit.sessions.<a href="./src/cloudflare/resources/realtime_kit/sessions.py">get_participant_data_from_peer_id</a>(peer_id, \*, account_id, app_id, \*\*<a href="src/cloudflare/types/realtime_kit/session_get_participant_data_from_peer_id_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/session_get_participant_data_from_peer_id_response.py">SessionGetParticipantDataFromPeerIDResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/chat">client.realtime_kit.sessions.<a href="./src/cloudflare/resources/realtime_kit/sessions.py">get_session_chat</a>(session_id, \*, account_id, app_id) -> <a href="./src/cloudflare/types/realtime_kit/session_get_session_chat_response.py">SessionGetSessionChatResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}">client.realtime_kit.sessions.<a href="./src/cloudflare/resources/realtime_kit/sessions.py">get_session_details</a>(session_id, \*, account_id, app_id, \*\*<a href="src/cloudflare/types/realtime_kit/session_get_session_details_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/session_get_session_details_response.py">SessionGetSessionDetailsResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/participants/{participant_id}">client.realtime_kit.sessions.<a href="./src/cloudflare/resources/realtime_kit/sessions.py">get_session_participant_details</a>(participant_id, \*, account_id, app_id, session_id, \*\*<a href="src/cloudflare/types/realtime_kit/session_get_session_participant_details_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/session_get_session_participant_details_response.py">SessionGetSessionParticipantDetailsResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/participants">client.realtime_kit.sessions.<a href="./src/cloudflare/resources/realtime_kit/sessions.py">get_session_participants</a>(session_id, \*, account_id, app_id, \*\*<a href="src/cloudflare/types/realtime_kit/session_get_session_participants_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/session_get_session_participants_response.py">SessionGetSessionParticipantsResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/summary">client.realtime_kit.sessions.<a href="./src/cloudflare/resources/realtime_kit/sessions.py">get_session_summary</a>(session_id, \*, account_id, app_id) -> <a href="./src/cloudflare/types/realtime_kit/session_get_session_summary_response.py">SessionGetSessionSummaryResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/transcript">client.realtime_kit.sessions.<a href="./src/cloudflare/resources/realtime_kit/sessions.py">get_session_transcripts</a>(session_id, \*, account_id, app_id) -> <a href="./src/cloudflare/types/realtime_kit/session_get_session_transcripts_response.py">SessionGetSessionTranscriptsResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/sessions">client.realtime_kit.sessions.<a href="./src/cloudflare/resources/realtime_kit/sessions.py">get_sessions</a>(app_id, \*, account_id, \*\*<a href="src/cloudflare/types/realtime_kit/session_get_sessions_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/session_get_sessions_response.py">SessionGetSessionsResponse</a></code>
 
-#### Events
+## Recordings
 
 Types:
 
 ```python
-from cloudflare.types.radar.bgp.leaks import EventListResponse
+from cloudflare.types.realtime_kit import (
+    RecordingGetActiveRecordingsResponse,
+    RecordingGetOneRecordingResponse,
+    RecordingGetRecordingsResponse,
+    RecordingPauseResumeStopRecordingResponse,
+    RecordingStartRecordingsResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/bgp/leaks/events">client.radar.bgp.leaks.events.<a href="./src/cloudflare/resources/radar/bgp/leaks/events.py">list</a>(\*\*<a href="src/cloudflare/types/radar/bgp/leaks/event_list_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/leaks/event_list_response.py">SyncV4PagePagination[EventListResponse]</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/recordings/active-recording/{meeting_id}">client.realtime_kit.recordings.<a href="./src/cloudflare/resources/realtime_kit/recordings.py">get_active_recordings</a>(meeting_id, \*, account_id, app_id) -> <a href="./src/cloudflare/types/realtime_kit/recording_get_active_recordings_response.py">RecordingGetActiveRecordingsResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/recordings/{recording_id}">client.realtime_kit.recordings.<a href="./src/cloudflare/resources/realtime_kit/recordings.py">get_one_recording</a>(recording_id, \*, account_id, app_id) -> <a href="./src/cloudflare/types/realtime_kit/recording_get_one_recording_response.py">RecordingGetOneRecordingResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/recordings">client.realtime_kit.recordings.<a href="./src/cloudflare/resources/realtime_kit/recordings.py">get_recordings</a>(app_id, \*, account_id, \*\*<a href="src/cloudflare/types/realtime_kit/recording_get_recordings_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/recording_get_recordings_response.py">RecordingGetRecordingsResponse</a></code>
+- <code title="put /accounts/{account_id}/realtime/kit/{app_id}/recordings/{recording_id}">client.realtime_kit.recordings.<a href="./src/cloudflare/resources/realtime_kit/recordings.py">pause_resume_stop_recording</a>(recording_id, \*, account_id, app_id, \*\*<a href="src/cloudflare/types/realtime_kit/recording_pause_resume_stop_recording_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/recording_pause_resume_stop_recording_response.py">RecordingPauseResumeStopRecordingResponse</a></code>
+- <code title="post /accounts/{account_id}/realtime/kit/{app_id}/recordings">client.realtime_kit.recordings.<a href="./src/cloudflare/resources/realtime_kit/recordings.py">start_recordings</a>(app_id, \*, account_id, \*\*<a href="src/cloudflare/types/realtime_kit/recording_start_recordings_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/recording_start_recordings_response.py">RecordingStartRecordingsResponse</a></code>
+- <code title="post /accounts/{account_id}/realtime/kit/{app_id}/recordings/track">client.realtime_kit.recordings.<a href="./src/cloudflare/resources/realtime_kit/recordings.py">start_track_recording</a>(app_id, \*, account_id, \*\*<a href="src/cloudflare/types/realtime_kit/recording_start_track_recording_params.py">params</a>) -> None</code>
 
-### Top
+## Webhooks
 
 Types:
 
 ```python
-from cloudflare.types.radar.bgp import TopPrefixesResponse
+from cloudflare.types.realtime_kit import (
+    WebhookCreateWebhookResponse,
+    WebhookDeleteWebhookResponse,
+    WebhookEditWebhookResponse,
+    WebhookGetWebhookByIDResponse,
+    WebhookGetWebhooksResponse,
+    WebhookReplaceWebhookResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/bgp/top/prefixes">client.radar.bgp.top.<a href="./src/cloudflare/resources/radar/bgp/top/top.py">prefixes</a>(\*\*<a href="src/cloudflare/types/radar/bgp/top_prefixes_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/top_prefixes_response.py">TopPrefixesResponse</a></code>
+- <code title="post /accounts/{account_id}/realtime/kit/{app_id}/webhooks">client.realtime_kit.webhooks.<a href="./src/cloudflare/resources/realtime_kit/webhooks.py">create_webhook</a>(app_id, \*, account_id, \*\*<a href="src/cloudflare/types/realtime_kit/webhook_create_webhook_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/webhook_create_webhook_response.py">WebhookCreateWebhookResponse</a></code>
+- <code title="delete /accounts/{account_id}/realtime/kit/{app_id}/webhooks/{webhook_id}">client.realtime_kit.webhooks.<a href="./src/cloudflare/resources/realtime_kit/webhooks.py">delete_webhook</a>(webhook_id, \*, account_id, app_id) -> <a href="./src/cloudflare/types/realtime_kit/webhook_delete_webhook_response.py">WebhookDeleteWebhookResponse</a></code>
+- <code title="patch /accounts/{account_id}/realtime/kit/{app_id}/webhooks/{webhook_id}">client.realtime_kit.webhooks.<a href="./src/cloudflare/resources/realtime_kit/webhooks.py">edit_webhook</a>(webhook_id, \*, account_id, app_id, \*\*<a href="src/cloudflare/types/realtime_kit/webhook_edit_webhook_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/webhook_edit_webhook_response.py">WebhookEditWebhookResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/webhooks/{webhook_id}">client.realtime_kit.webhooks.<a href="./src/cloudflare/resources/realtime_kit/webhooks.py">get_webhook_by_id</a>(webhook_id, \*, account_id, app_id) -> <a href="./src/cloudflare/types/realtime_kit/webhook_get_webhook_by_id_response.py">WebhookGetWebhookByIDResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/webhooks">client.realtime_kit.webhooks.<a href="./src/cloudflare/resources/realtime_kit/webhooks.py">get_webhooks</a>(app_id, \*, account_id) -> <a href="./src/cloudflare/types/realtime_kit/webhook_get_webhooks_response.py">WebhookGetWebhooksResponse</a></code>
+- <code title="put /accounts/{account_id}/realtime/kit/{app_id}/webhooks/{webhook_id}">client.realtime_kit.webhooks.<a href="./src/cloudflare/resources/realtime_kit/webhooks.py">replace_webhook</a>(webhook_id, \*, account_id, app_id, \*\*<a href="src/cloudflare/types/realtime_kit/webhook_replace_webhook_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/webhook_replace_webhook_response.py">WebhookReplaceWebhookResponse</a></code>
 
-#### Ases
+## ActiveSession
 
 Types:
 
 ```python
-from cloudflare.types.radar.bgp.top import AseGetResponse, AsePrefixesResponse
+from cloudflare.types.realtime_kit import (
+    ActiveSessionCreatePollResponse,
+    ActiveSessionGetActiveSessionResponse,
+    ActiveSessionKickAllParticipantsResponse,
+    ActiveSessionKickParticipantsResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/bgp/top/ases">client.radar.bgp.top.ases.<a href="./src/cloudflare/resources/radar/bgp/top/ases.py">get</a>(\*\*<a href="src/cloudflare/types/radar/bgp/top/ase_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/top/ase_get_response.py">AseGetResponse</a></code>
-- <code title="get /radar/bgp/top/ases/prefixes">client.radar.bgp.top.ases.<a href="./src/cloudflare/resources/radar/bgp/top/ases.py">prefixes</a>(\*\*<a href="src/cloudflare/types/radar/bgp/top/ase_prefixes_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/top/ase_prefixes_response.py">AsePrefixesResponse</a></code>
-
-### Hijacks
+- <code title="post /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-session/poll">client.realtime_kit.active_session.<a href="./src/cloudflare/resources/realtime_kit/active_session.py">create_poll</a>(meeting_id, \*, account_id, app_id, \*\*<a href="src/cloudflare/types/realtime_kit/active_session_create_poll_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/active_session_create_poll_response.py">ActiveSessionCreatePollResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-session">client.realtime_kit.active_session.<a href="./src/cloudflare/resources/realtime_kit/active_session.py">get_active_session</a>(meeting_id, \*, account_id, app_id) -> <a href="./src/cloudflare/types/realtime_kit/active_session_get_active_session_response.py">ActiveSessionGetActiveSessionResponse</a></code>
+- <code title="post /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-session/kick-all">client.realtime_kit.active_session.<a href="./src/cloudflare/resources/realtime_kit/active_session.py">kick_all_participants</a>(meeting_id, \*, account_id, app_id) -> <a href="./src/cloudflare/types/realtime_kit/active_session_kick_all_participants_response.py">ActiveSessionKickAllParticipantsResponse</a></code>
+- <code title="post /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-session/kick">client.realtime_kit.active_session.<a href="./src/cloudflare/resources/realtime_kit/active_session.py">kick_participants</a>(meeting_id, \*, account_id, app_id, \*\*<a href="src/cloudflare/types/realtime_kit/active_session_kick_participants_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/active_session_kick_participants_response.py">ActiveSessionKickParticipantsResponse</a></code>
 
-#### Events
+## Livestreams
 
 Types:
 
 ```python
-from cloudflare.types.radar.bgp.hijacks import EventListResponse
+from cloudflare.types.realtime_kit import (
+    LivestreamCreateIndependentLivestreamResponse,
+    LivestreamGetActiveLivestreamsForLivestreamIDResponse,
+    LivestreamGetAllLivestreamsResponse,
+    LivestreamGetLivestreamAnalyticsCompleteResponse,
+    LivestreamGetLivestreamSessionDetailsForSessionIDResponse,
+    LivestreamGetLivestreamSessionForLivestreamIDResponse,
+    LivestreamGetMeetingActiveLivestreamsResponse,
+    LivestreamGetOrgAnalyticsResponse,
+    LivestreamStartLivestreamingAMeetingResponse,
+    LivestreamStopLivestreamingAMeetingResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/bgp/hijacks/events">client.radar.bgp.hijacks.events.<a href="./src/cloudflare/resources/radar/bgp/hijacks/events.py">list</a>(\*\*<a href="src/cloudflare/types/radar/bgp/hijacks/event_list_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/hijacks/event_list_response.py">SyncV4PagePagination[EventListResponse]</a></code>
+- <code title="post /accounts/{account_id}/realtime/kit/{app_id}/livestreams">client.realtime_kit.livestreams.<a href="./src/cloudflare/resources/realtime_kit/livestreams.py">create_independent_livestream</a>(app_id, \*, account_id, \*\*<a href="src/cloudflare/types/realtime_kit/livestream_create_independent_livestream_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/livestream_create_independent_livestream_response.py">LivestreamCreateIndependentLivestreamResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/livestreams/{livestream_id}/active-livestream-session">client.realtime_kit.livestreams.<a href="./src/cloudflare/resources/realtime_kit/livestreams.py">get_active_livestreams_for_livestream_id</a>(livestream_id, \*, account_id, app_id) -> <a href="./src/cloudflare/types/realtime_kit/livestream_get_active_livestreams_for_livestream_id_response.py">LivestreamGetActiveLivestreamsForLivestreamIDResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/livestreams">client.realtime_kit.livestreams.<a href="./src/cloudflare/resources/realtime_kit/livestreams.py">get_all_livestreams</a>(app_id, \*, account_id, \*\*<a href="src/cloudflare/types/realtime_kit/livestream_get_all_livestreams_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/livestream_get_all_livestreams_response.py">LivestreamGetAllLivestreamsResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/analytics/livestreams/overall">client.realtime_kit.livestreams.<a href="./src/cloudflare/resources/realtime_kit/livestreams.py">get_livestream_analytics_complete</a>(app_id, \*, account_id, \*\*<a href="src/cloudflare/types/realtime_kit/livestream_get_livestream_analytics_complete_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/livestream_get_livestream_analytics_complete_response.py">LivestreamGetLivestreamAnalyticsCompleteResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/livestreams/sessions/{livestream-session-id}">client.realtime_kit.livestreams.<a href="./src/cloudflare/resources/realtime_kit/livestreams.py">get_livestream_session_details_for_session_id</a>(livestream_session_id, \*, account_id, app_id) -> <a href="./src/cloudflare/types/realtime_kit/livestream_get_livestream_session_details_for_session_id_response.py">LivestreamGetLivestreamSessionDetailsForSessionIDResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/livestreams/{livestream_id}">client.realtime_kit.livestreams.<a href="./src/cloudflare/resources/realtime_kit/livestreams.py">get_livestream_session_for_livestream_id</a>(livestream_id, \*, account_id, app_id, \*\*<a href="src/cloudflare/types/realtime_kit/livestream_get_livestream_session_for_livestream_id_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/livestream_get_livestream_session_for_livestream_id_response.py">LivestreamGetLivestreamSessionForLivestreamIDResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-livestream">client.realtime_kit.livestreams.<a href="./src/cloudflare/resources/realtime_kit/livestreams.py">get_meeting_active_livestreams</a>(meeting_id, \*, account_id, app_id) -> <a href="./src/cloudflare/types/realtime_kit/livestream_get_meeting_active_livestreams_response.py">LivestreamGetMeetingActiveLivestreamsResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/analytics/daywise">client.realtime_kit.livestreams.<a href="./src/cloudflare/resources/realtime_kit/livestreams.py">get_org_analytics</a>(app_id, \*, account_id, \*\*<a href="src/cloudflare/types/realtime_kit/livestream_get_org_analytics_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/livestream_get_org_analytics_response.py">LivestreamGetOrgAnalyticsResponse</a></code>
+- <code title="post /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/livestreams">client.realtime_kit.livestreams.<a href="./src/cloudflare/resources/realtime_kit/livestreams.py">start_livestreaming_a_meeting</a>(meeting_id, \*, account_id, app_id, \*\*<a href="src/cloudflare/types/realtime_kit/livestream_start_livestreaming_a_meeting_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/livestream_start_livestreaming_a_meeting_response.py">LivestreamStartLivestreamingAMeetingResponse</a></code>
+- <code title="post /accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-livestream/stop">client.realtime_kit.livestreams.<a href="./src/cloudflare/resources/realtime_kit/livestreams.py">stop_livestreaming_a_meeting</a>(meeting_id, \*, account_id, app_id) -> <a href="./src/cloudflare/types/realtime_kit/livestream_stop_livestreaming_a_meeting_response.py">LivestreamStopLivestreamingAMeetingResponse</a></code>
 
-### Routes
+## Analytics
 
 Types:
 
 ```python
-from cloudflare.types.radar.bgp import (
-    RouteAsesResponse,
-    RouteMoasResponse,
-    RoutePfx2asResponse,
-    RouteStatsResponse,
-)
+from cloudflare.types.realtime_kit import AnalyticsGetOrgAnalyticsResponse
 ```
 
 Methods:
 
-- <code title="get /radar/bgp/routes/ases">client.radar.bgp.routes.<a href="./src/cloudflare/resources/radar/bgp/routes.py">ases</a>(\*\*<a href="src/cloudflare/types/radar/bgp/route_ases_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/route_ases_response.py">RouteAsesResponse</a></code>
-- <code title="get /radar/bgp/routes/moas">client.radar.bgp.routes.<a href="./src/cloudflare/resources/radar/bgp/routes.py">moas</a>(\*\*<a href="src/cloudflare/types/radar/bgp/route_moas_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/route_moas_response.py">RouteMoasResponse</a></code>
-- <code title="get /radar/bgp/routes/pfx2as">client.radar.bgp.routes.<a href="./src/cloudflare/resources/radar/bgp/routes.py">pfx2as</a>(\*\*<a href="src/cloudflare/types/radar/bgp/route_pfx2as_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/route_pfx2as_response.py">RoutePfx2asResponse</a></code>
-- <code title="get /radar/bgp/routes/stats">client.radar.bgp.routes.<a href="./src/cloudflare/resources/radar/bgp/routes.py">stats</a>(\*\*<a href="src/cloudflare/types/radar/bgp/route_stats_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/route_stats_response.py">RouteStatsResponse</a></code>
+- <code title="get /accounts/{account_id}/realtime/kit/{app_id}/analytics/daywise">client.realtime_kit.analytics.<a href="./src/cloudflare/resources/realtime_kit/analytics.py">get_org_analytics</a>(app_id, \*, account_id, \*\*<a href="src/cloudflare/types/realtime_kit/analytics_get_org_analytics_params.py">params</a>) -> <a href="./src/cloudflare/types/realtime_kit/analytics_get_org_analytics_response.py">AnalyticsGetOrgAnalyticsResponse</a></code>
 
-### IPs
+# Calls
+
+## SFU
 
 Types:
 
 ```python
-from cloudflare.types.radar.bgp import IPTimeseriesResponse
+from cloudflare.types.calls import (
+    SFUCreateResponse,
+    SFUUpdateResponse,
+    SFUListResponse,
+    SFUDeleteResponse,
+    SFUGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/bgp/ips/timeseries">client.radar.bgp.ips.<a href="./src/cloudflare/resources/radar/bgp/ips.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/bgp/ip_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/bgp/ip_timeseries_response.py">IPTimeseriesResponse</a></code>
+- <code title="post /accounts/{account_id}/calls/apps">client.calls.sfu.<a href="./src/cloudflare/resources/calls/sfu.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/calls/sfu_create_params.py">params</a>) -> <a href="./src/cloudflare/types/calls/sfu_create_response.py">Optional[SFUCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/calls/apps/{app_id}">client.calls.sfu.<a href="./src/cloudflare/resources/calls/sfu.py">update</a>(app_id, \*, account_id, \*\*<a href="src/cloudflare/types/calls/sfu_update_params.py">params</a>) -> <a href="./src/cloudflare/types/calls/sfu_update_response.py">Optional[SFUUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/calls/apps">client.calls.sfu.<a href="./src/cloudflare/resources/calls/sfu.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/calls/sfu_list_response.py">SyncSinglePage[SFUListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/calls/apps/{app_id}">client.calls.sfu.<a href="./src/cloudflare/resources/calls/sfu.py">delete</a>(app_id, \*, account_id) -> <a href="./src/cloudflare/types/calls/sfu_delete_response.py">Optional[SFUDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/calls/apps/{app_id}">client.calls.sfu.<a href="./src/cloudflare/resources/calls/sfu.py">get</a>(app_id, \*, account_id) -> <a href="./src/cloudflare/types/calls/sfu_get_response.py">Optional[SFUGetResponse]</a></code>
 
-## Datasets
+## TURN
 
 Types:
 
 ```python
-from cloudflare.types.radar import DatasetListResponse, DatasetDownloadResponse, DatasetGetResponse
+from cloudflare.types.calls import (
+    TURNCreateResponse,
+    TURNUpdateResponse,
+    TURNListResponse,
+    TURNDeleteResponse,
+    TURNGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/datasets">client.radar.datasets.<a href="./src/cloudflare/resources/radar/datasets.py">list</a>(\*\*<a href="src/cloudflare/types/radar/dataset_list_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dataset_list_response.py">DatasetListResponse</a></code>
-- <code title="post /radar/datasets/download">client.radar.datasets.<a href="./src/cloudflare/resources/radar/datasets.py">download</a>(\*\*<a href="src/cloudflare/types/radar/dataset_download_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dataset_download_response.py">DatasetDownloadResponse</a></code>
-- <code title="get /radar/datasets/{alias}">client.radar.datasets.<a href="./src/cloudflare/resources/radar/datasets.py">get</a>(alias) -> str</code>
+- <code title="post /accounts/{account_id}/calls/turn_keys">client.calls.turn.<a href="./src/cloudflare/resources/calls/turn.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/calls/turn_create_params.py">params</a>) -> <a href="./src/cloudflare/types/calls/turn_create_response.py">Optional[TURNCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/calls/turn_keys/{key_id}">client.calls.turn.<a href="./src/cloudflare/resources/calls/turn.py">update</a>(key_id, \*, account_id, \*\*<a href="src/cloudflare/types/calls/turn_update_params.py">params</a>) -> <a href="./src/cloudflare/types/calls/turn_update_response.py">Optional[TURNUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/calls/turn_keys">client.calls.turn.<a href="./src/cloudflare/resources/calls/turn.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/calls/turn_list_response.py">SyncSinglePage[TURNListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/calls/turn_keys/{key_id}">client.calls.turn.<a href="./src/cloudflare/resources/calls/turn.py">delete</a>(key_id, \*, account_id) -> <a href="./src/cloudflare/types/calls/turn_delete_response.py">Optional[TURNDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/calls/turn_keys/{key_id}">client.calls.turn.<a href="./src/cloudflare/resources/calls/turn.py">get</a>(key_id, \*, account_id) -> <a href="./src/cloudflare/types/calls/turn_get_response.py">Optional[TURNGetResponse]</a></code>
 
-## DNS
+# CloudforceOne
 
-### Top
+## Scans
+
+### Results
 
 Types:
 
 ```python
-from cloudflare.types.radar.dns import TopAsesResponse, TopLocationsResponse
+from cloudflare.types.cloudforce_one.scans import ScanResult, ResultGetResponse
 ```
 
 Methods:
 
-- <code title="get /radar/dns/top/ases">client.radar.dns.top.<a href="./src/cloudflare/resources/radar/dns/top.py">ases</a>(\*\*<a href="src/cloudflare/types/radar/dns/top_ases_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/top_ases_response.py">TopAsesResponse</a></code>
-- <code title="get /radar/dns/top/locations">client.radar.dns.top.<a href="./src/cloudflare/resources/radar/dns/top.py">locations</a>(\*\*<a href="src/cloudflare/types/radar/dns/top_locations_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/dns/top_locations_response.py">TopLocationsResponse</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/scans/results/{config_id}">client.cloudforce_one.scans.results.<a href="./src/cloudflare/resources/cloudforce_one/scans/results.py">get</a>(config_id, \*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/scans/result_get_response.py">ResultGetResponse</a></code>
 
-## Netflows
+### Config
 
 Types:
 
 ```python
-from cloudflare.types.radar import NetflowTimeseriesResponse
+from cloudflare.types.cloudforce_one.scans import (
+    ConfigCreateResponse,
+    ConfigListResponse,
+    ConfigEditResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/netflows/timeseries">client.radar.netflows.<a href="./src/cloudflare/resources/radar/netflows/netflows.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/netflow_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/netflow_timeseries_response.py">NetflowTimeseriesResponse</a></code>
+- <code title="post /accounts/{account_id}/cloudforce-one/scans/config">client.cloudforce_one.scans.config.<a href="./src/cloudflare/resources/cloudforce_one/scans/config.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/scans/config_create_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/scans/config_create_response.py">Optional[ConfigCreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/scans/config">client.cloudforce_one.scans.config.<a href="./src/cloudflare/resources/cloudforce_one/scans/config.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/scans/config_list_response.py">SyncSinglePage[ConfigListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/cloudforce-one/scans/config/{config_id}">client.cloudforce_one.scans.config.<a href="./src/cloudflare/resources/cloudforce_one/scans/config.py">delete</a>(config_id, \*, account_id) -> object</code>
+- <code title="patch /accounts/{account_id}/cloudforce-one/scans/config/{config_id}">client.cloudforce_one.scans.config.<a href="./src/cloudflare/resources/cloudforce_one/scans/config.py">edit</a>(config_id, \*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/scans/config_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/scans/config_edit_response.py">Optional[ConfigEditResponse]</a></code>
 
-### Top
+## BinaryStorage
 
 Types:
 
 ```python
-from cloudflare.types.radar.netflows import TopAsesResponse, TopLocationsResponse
+from cloudflare.types.cloudforce_one import BinaryStorageCreateResponse
 ```
 
 Methods:
 
-- <code title="get /radar/netflows/top/ases">client.radar.netflows.top.<a href="./src/cloudflare/resources/radar/netflows/top.py">ases</a>(\*\*<a href="src/cloudflare/types/radar/netflows/top_ases_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/netflows/top_ases_response.py">TopAsesResponse</a></code>
-- <code title="get /radar/netflows/top/locations">client.radar.netflows.top.<a href="./src/cloudflare/resources/radar/netflows/top.py">locations</a>(\*\*<a href="src/cloudflare/types/radar/netflows/top_locations_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/netflows/top_locations_response.py">TopLocationsResponse</a></code>
+- <code title="post /accounts/{account_id}/cloudforce-one/binary">client.cloudforce_one.binary_storage.<a href="./src/cloudflare/resources/cloudforce_one/binary_storage.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/binary_storage_create_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/binary_storage_create_response.py">BinaryStorageCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/binary/{hash}">client.cloudforce_one.binary_storage.<a href="./src/cloudflare/resources/cloudforce_one/binary_storage.py">get</a>(hash, \*, account_id) -> None</code>
 
-## Search
+## Requests
 
 Types:
 
 ```python
-from cloudflare.types.radar import SearchGlobalResponse
+from cloudflare.types.cloudforce_one import (
+    Item,
+    ListItem,
+    Quota,
+    RequestConstants,
+    RequestTypes,
+    RequestDeleteResponse,
+    RequestTypesResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/search/global">client.radar.search.<a href="./src/cloudflare/resources/radar/search.py">global\_</a>(\*\*<a href="src/cloudflare/types/radar/search_global_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/search_global_response.py">SearchGlobalResponse</a></code>
-
-## VerifiedBots
+- <code title="post /accounts/{account_id}/cloudforce-one/requests/new">client.cloudforce_one.requests.<a href="./src/cloudflare/resources/cloudforce_one/requests/requests.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/request_create_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/item.py">Optional[Item]</a></code>
+- <code title="put /accounts/{account_id}/cloudforce-one/requests/{request_id}">client.cloudforce_one.requests.<a href="./src/cloudflare/resources/cloudforce_one/requests/requests.py">update</a>(request_id, \*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/request_update_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/item.py">Optional[Item]</a></code>
+- <code title="post /accounts/{account_id}/cloudforce-one/requests">client.cloudforce_one.requests.<a href="./src/cloudflare/resources/cloudforce_one/requests/requests.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/request_list_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/list_item.py">SyncSinglePage[ListItem]</a></code>
+- <code title="delete /accounts/{account_id}/cloudforce-one/requests/{request_id}">client.cloudforce_one.requests.<a href="./src/cloudflare/resources/cloudforce_one/requests/requests.py">delete</a>(request_id, \*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/request_delete_response.py">RequestDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/requests/constants">client.cloudforce_one.requests.<a href="./src/cloudflare/resources/cloudforce_one/requests/requests.py">constants</a>(\*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/request_constants.py">Optional[RequestConstants]</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/requests/{request_id}">client.cloudforce_one.requests.<a href="./src/cloudflare/resources/cloudforce_one/requests/requests.py">get</a>(request_id, \*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/item.py">Optional[Item]</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/requests/quota">client.cloudforce_one.requests.<a href="./src/cloudflare/resources/cloudforce_one/requests/requests.py">quota</a>(\*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/quota.py">Optional[Quota]</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/requests/types">client.cloudforce_one.requests.<a href="./src/cloudflare/resources/cloudforce_one/requests/requests.py">types</a>(\*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/request_types_response.py">SyncSinglePage[RequestTypesResponse]</a></code>
 
-### Top
+### Message
 
 Types:
 
 ```python
-from cloudflare.types.radar.verified_bots import TopBotsResponse, TopCategoriesResponse
+from cloudflare.types.cloudforce_one.requests import Message, MessageDeleteResponse
 ```
 
 Methods:
 
-- <code title="get /radar/verified_bots/top/bots">client.radar.verified_bots.top.<a href="./src/cloudflare/resources/radar/verified_bots/top.py">bots</a>(\*\*<a href="src/cloudflare/types/radar/verified_bots/top_bots_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/verified_bots/top_bots_response.py">TopBotsResponse</a></code>
-- <code title="get /radar/verified_bots/top/categories">client.radar.verified_bots.top.<a href="./src/cloudflare/resources/radar/verified_bots/top.py">categories</a>(\*\*<a href="src/cloudflare/types/radar/verified_bots/top_categories_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/verified_bots/top_categories_response.py">TopCategoriesResponse</a></code>
+- <code title="post /accounts/{account_id}/cloudforce-one/requests/{request_id}/message/new">client.cloudforce_one.requests.message.<a href="./src/cloudflare/resources/cloudforce_one/requests/message.py">create</a>(request_id, \*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/requests/message_create_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/requests/message.py">Optional[Message]</a></code>
+- <code title="put /accounts/{account_id}/cloudforce-one/requests/{request_id}/message/{message_id}">client.cloudforce_one.requests.message.<a href="./src/cloudflare/resources/cloudforce_one/requests/message.py">update</a>(message_id, \*, account_id, request_id, \*\*<a href="src/cloudflare/types/cloudforce_one/requests/message_update_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/requests/message.py">Optional[Message]</a></code>
+- <code title="delete /accounts/{account_id}/cloudforce-one/requests/{request_id}/message/{message_id}">client.cloudforce_one.requests.message.<a href="./src/cloudflare/resources/cloudforce_one/requests/message.py">delete</a>(message_id, \*, account_id, request_id) -> <a href="./src/cloudflare/types/cloudforce_one/requests/message_delete_response.py">MessageDeleteResponse</a></code>
+- <code title="post /accounts/{account_id}/cloudforce-one/requests/{request_id}/message">client.cloudforce_one.requests.message.<a href="./src/cloudflare/resources/cloudforce_one/requests/message.py">get</a>(request_id, \*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/requests/message_get_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/requests/message.py">SyncSinglePage[Message]</a></code>
 
-## AS112
+### Priority
 
 Types:
 
 ```python
-from cloudflare.types.radar import AS112TimeseriesResponse
+from cloudflare.types.cloudforce_one.requests import (
+    Label,
+    Priority,
+    PriorityEdit,
+    PriorityDeleteResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/as112/timeseries">client.radar.as112.<a href="./src/cloudflare/resources/radar/as112/as112.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/as112_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112_timeseries_response.py">AS112TimeseriesResponse</a></code>
+- <code title="post /accounts/{account_id}/cloudforce-one/requests/priority/new">client.cloudforce_one.requests.priority.<a href="./src/cloudflare/resources/cloudforce_one/requests/priority.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/requests/priority_create_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/requests/priority.py">Optional[Priority]</a></code>
+- <code title="put /accounts/{account_id}/cloudforce-one/requests/priority/{priority_id}">client.cloudforce_one.requests.priority.<a href="./src/cloudflare/resources/cloudforce_one/requests/priority.py">update</a>(priority_id, \*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/requests/priority_update_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/item.py">Optional[Item]</a></code>
+- <code title="delete /accounts/{account_id}/cloudforce-one/requests/priority/{priority_id}">client.cloudforce_one.requests.priority.<a href="./src/cloudflare/resources/cloudforce_one/requests/priority.py">delete</a>(priority_id, \*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/requests/priority_delete_response.py">PriorityDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/requests/priority/{priority_id}">client.cloudforce_one.requests.priority.<a href="./src/cloudflare/resources/cloudforce_one/requests/priority.py">get</a>(priority_id, \*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/item.py">Optional[Item]</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/requests/priority/quota">client.cloudforce_one.requests.priority.<a href="./src/cloudflare/resources/cloudforce_one/requests/priority.py">quota</a>(\*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/quota.py">Optional[Quota]</a></code>
 
-### Summary
+### Assets
 
 Types:
 
 ```python
-from cloudflare.types.radar.as112 import (
-    SummaryDNSSECResponse,
-    SummaryEdnsResponse,
-    SummaryIPVersionResponse,
-    SummaryProtocolResponse,
-    SummaryQueryTypeResponse,
-    SummaryResponseCodesResponse,
+from cloudflare.types.cloudforce_one.requests import (
+    AssetCreateResponse,
+    AssetUpdateResponse,
+    AssetDeleteResponse,
+    AssetGetResponse,
 )
 ```
 
 Methods:
 
-- <code title="get /radar/as112/summary/dnssec">client.radar.as112.summary.<a href="./src/cloudflare/resources/radar/as112/summary.py">dnssec</a>(\*\*<a href="src/cloudflare/types/radar/as112/summary_dnssec_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/summary_dnssec_response.py">SummaryDNSSECResponse</a></code>
-- <code title="get /radar/as112/summary/edns">client.radar.as112.summary.<a href="./src/cloudflare/resources/radar/as112/summary.py">edns</a>(\*\*<a href="src/cloudflare/types/radar/as112/summary_edns_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/summary_edns_response.py">SummaryEdnsResponse</a></code>
-- <code title="get /radar/as112/summary/ip_version">client.radar.as112.summary.<a href="./src/cloudflare/resources/radar/as112/summary.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/as112/summary_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/summary_ip_version_response.py">SummaryIPVersionResponse</a></code>
-- <code title="get /radar/as112/summary/protocol">client.radar.as112.summary.<a href="./src/cloudflare/resources/radar/as112/summary.py">protocol</a>(\*\*<a href="src/cloudflare/types/radar/as112/summary_protocol_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/summary_protocol_response.py">SummaryProtocolResponse</a></code>
-- <code title="get /radar/as112/summary/query_type">client.radar.as112.summary.<a href="./src/cloudflare/resources/radar/as112/summary.py">query_type</a>(\*\*<a href="src/cloudflare/types/radar/as112/summary_query_type_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/summary_query_type_response.py">SummaryQueryTypeResponse</a></code>
-- <code title="get /radar/as112/summary/response_codes">client.radar.as112.summary.<a href="./src/cloudflare/resources/radar/as112/summary.py">response_codes</a>(\*\*<a href="src/cloudflare/types/radar/as112/summary_response_codes_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/summary_response_codes_response.py">SummaryResponseCodesResponse</a></code>
+- <code title="post /accounts/{account_id}/cloudforce-one/requests/{request_id}/asset">client.cloudforce_one.requests.assets.<a href="./src/cloudflare/resources/cloudforce_one/requests/assets.py">create</a>(request_id, \*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/requests/asset_create_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/requests/asset_create_response.py">SyncSinglePage[AssetCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/cloudforce-one/requests/{request_id}/asset/{asset_id}">client.cloudforce_one.requests.assets.<a href="./src/cloudflare/resources/cloudforce_one/requests/assets.py">update</a>(asset_id, \*, account_id, request_id, \*\*<a href="src/cloudflare/types/cloudforce_one/requests/asset_update_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/requests/asset_update_response.py">Optional[AssetUpdateResponse]</a></code>
+- <code title="delete /accounts/{account_id}/cloudforce-one/requests/{request_id}/asset/{asset_id}">client.cloudforce_one.requests.assets.<a href="./src/cloudflare/resources/cloudforce_one/requests/assets.py">delete</a>(asset_id, \*, account_id, request_id) -> <a href="./src/cloudflare/types/cloudforce_one/requests/asset_delete_response.py">AssetDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/requests/{request_id}/asset/{asset_id}">client.cloudforce_one.requests.assets.<a href="./src/cloudflare/resources/cloudforce_one/requests/assets.py">get</a>(asset_id, \*, account_id, request_id) -> <a href="./src/cloudflare/types/cloudforce_one/requests/asset_get_response.py">SyncSinglePage[AssetGetResponse]</a></code>
 
-### TimeseriesGroups
+## ThreatEvents
 
 Types:
 
 ```python
-from cloudflare.types.radar.as112 import (
-    TimeseriesGroupDNSSECResponse,
-    TimeseriesGroupEdnsResponse,
-    TimeseriesGroupIPVersionResponse,
-    TimeseriesGroupProtocolResponse,
-    TimeseriesGroupQueryTypeResponse,
-    TimeseriesGroupResponseCodesResponse,
+from cloudflare.types.cloudforce_one import (
+    ThreatEventCreateResponse,
+    ThreatEventListResponse,
+    ThreatEventDeleteResponse,
+    ThreatEventBulkCreateResponse,
+    ThreatEventEditResponse,
+    ThreatEventGetResponse,
 )
 ```
 
 Methods:
 
-- <code title="get /radar/as112/timeseries_groups/dnssec">client.radar.as112.timeseries_groups.<a href="./src/cloudflare/resources/radar/as112/timeseries_groups.py">dnssec</a>(\*\*<a href="src/cloudflare/types/radar/as112/timeseries_group_dnssec_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/timeseries_group_dnssec_response.py">TimeseriesGroupDNSSECResponse</a></code>
-- <code title="get /radar/as112/timeseries_groups/edns">client.radar.as112.timeseries_groups.<a href="./src/cloudflare/resources/radar/as112/timeseries_groups.py">edns</a>(\*\*<a href="src/cloudflare/types/radar/as112/timeseries_group_edns_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/timeseries_group_edns_response.py">TimeseriesGroupEdnsResponse</a></code>
-- <code title="get /radar/as112/timeseries_groups/ip_version">client.radar.as112.timeseries_groups.<a href="./src/cloudflare/resources/radar/as112/timeseries_groups.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/as112/timeseries_group_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/timeseries_group_ip_version_response.py">TimeseriesGroupIPVersionResponse</a></code>
-- <code title="get /radar/as112/timeseries_groups/protocol">client.radar.as112.timeseries_groups.<a href="./src/cloudflare/resources/radar/as112/timeseries_groups.py">protocol</a>(\*\*<a href="src/cloudflare/types/radar/as112/timeseries_group_protocol_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/timeseries_group_protocol_response.py">TimeseriesGroupProtocolResponse</a></code>
-- <code title="get /radar/as112/timeseries_groups/query_type">client.radar.as112.timeseries_groups.<a href="./src/cloudflare/resources/radar/as112/timeseries_groups.py">query_type</a>(\*\*<a href="src/cloudflare/types/radar/as112/timeseries_group_query_type_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/timeseries_group_query_type_response.py">TimeseriesGroupQueryTypeResponse</a></code>
-- <code title="get /radar/as112/timeseries_groups/response_codes">client.radar.as112.timeseries_groups.<a href="./src/cloudflare/resources/radar/as112/timeseries_groups.py">response_codes</a>(\*\*<a href="src/cloudflare/types/radar/as112/timeseries_group_response_codes_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/timeseries_group_response_codes_response.py">TimeseriesGroupResponseCodesResponse</a></code>
+- <code title="post /accounts/{account_id}/cloudforce-one/events/create">client.cloudforce_one.threat_events.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/threat_events.py">create</a>(\*, path_account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/threat_event_create_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/threat_event_create_response.py">ThreatEventCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/events">client.cloudforce_one.threat_events.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/threat_events.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/threat_event_list_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/threat_event_list_response.py">ThreatEventListResponse</a></code>
+- <code title="delete /accounts/{account_id}/cloudforce-one/events/{event_id}">client.cloudforce_one.threat_events.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/threat_events.py">delete</a>(event_id, \*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/threat_event_delete_response.py">ThreatEventDeleteResponse</a></code>
+- <code title="post /accounts/{account_id}/cloudforce-one/events/create/bulk">client.cloudforce_one.threat_events.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/threat_events.py">bulk_create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/threat_event_bulk_create_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/threat_event_bulk_create_response.py">ThreatEventBulkCreateResponse</a></code>
+- <code title="patch /accounts/{account_id}/cloudforce-one/events/{event_id}">client.cloudforce_one.threat_events.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/threat_events.py">edit</a>(event_id, \*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/threat_event_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/threat_event_edit_response.py">ThreatEventEditResponse</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/events/{event_id}">client.cloudforce_one.threat_events.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/threat_events.py">get</a>(event_id, \*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/threat_event_get_response.py">ThreatEventGetResponse</a></code>
 
-### Top
+### Attackers
 
 Types:
 
 ```python
-from cloudflare.types.radar.as112 import (
-    TopDNSSECResponse,
-    TopEdnsResponse,
-    TopIPVersionResponse,
-    TopLocationsResponse,
-)
+from cloudflare.types.cloudforce_one.threat_events import AttackerListResponse
 ```
 
 Methods:
 
-- <code title="get /radar/as112/top/locations/dnssec/{dnssec}">client.radar.as112.top.<a href="./src/cloudflare/resources/radar/as112/top.py">dnssec</a>(dnssec, \*\*<a href="src/cloudflare/types/radar/as112/top_dnssec_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/top_dnssec_response.py">TopDNSSECResponse</a></code>
-- <code title="get /radar/as112/top/locations/edns/{edns}">client.radar.as112.top.<a href="./src/cloudflare/resources/radar/as112/top.py">edns</a>(edns, \*\*<a href="src/cloudflare/types/radar/as112/top_edns_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/top_edns_response.py">TopEdnsResponse</a></code>
-- <code title="get /radar/as112/top/locations/ip_version/{ip_version}">client.radar.as112.top.<a href="./src/cloudflare/resources/radar/as112/top.py">ip_version</a>(ip_version, \*\*<a href="src/cloudflare/types/radar/as112/top_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/top_ip_version_response.py">TopIPVersionResponse</a></code>
-- <code title="get /radar/as112/top/locations">client.radar.as112.top.<a href="./src/cloudflare/resources/radar/as112/top.py">locations</a>(\*\*<a href="src/cloudflare/types/radar/as112/top_locations_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/as112/top_locations_response.py">TopLocationsResponse</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/events/attackers">client.cloudforce_one.threat_events.attackers.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/attackers.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/threat_events/attacker_list_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/attacker_list_response.py">AttackerListResponse</a></code>
 
-## Email
+### Categories
 
 Types:
 
 ```python
-from cloudflare.types.radar import RadarEmailSeries, RadarEmailSummary
+from cloudflare.types.cloudforce_one.threat_events import (
+    CategoryCreateResponse,
+    CategoryListResponse,
+    CategoryDeleteResponse,
+    CategoryEditResponse,
+    CategoryGetResponse,
+)
 ```
 
-### Routing
+Methods:
 
-#### Summary
+- <code title="post /accounts/{account_id}/cloudforce-one/events/categories/create">client.cloudforce_one.threat_events.categories.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/categories.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/threat_events/category_create_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/category_create_response.py">CategoryCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/events/categories">client.cloudforce_one.threat_events.categories.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/categories.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/threat_events/category_list_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/category_list_response.py">CategoryListResponse</a></code>
+- <code title="delete /accounts/{account_id}/cloudforce-one/events/categories/{category_id}">client.cloudforce_one.threat_events.categories.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/categories.py">delete</a>(category_id, \*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/category_delete_response.py">CategoryDeleteResponse</a></code>
+- <code title="patch /accounts/{account_id}/cloudforce-one/events/categories/{category_id}">client.cloudforce_one.threat_events.categories.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/categories.py">edit</a>(category_id, \*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/threat_events/category_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/category_edit_response.py">CategoryEditResponse</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/events/categories/{category_id}">client.cloudforce_one.threat_events.categories.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/categories.py">get</a>(category_id, \*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/category_get_response.py">CategoryGetResponse</a></code>
+
+### Countries
 
 Types:
 
 ```python
-from cloudflare.types.radar.email.routing import (
-    SummaryARCResponse,
-    SummaryDKIMResponse,
-    SummaryDMARCResponse,
-    SummaryEncryptedResponse,
-    SummaryIPVersionResponse,
-    SummarySPFResponse,
-)
+from cloudflare.types.cloudforce_one.threat_events import CountryListResponse
 ```
 
 Methods:
 
-- <code title="get /radar/email/routing/summary/arc">client.radar.email.routing.summary.<a href="./src/cloudflare/resources/radar/email/routing/summary.py">arc</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/summary_arc_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/summary_arc_response.py">SummaryARCResponse</a></code>
-- <code title="get /radar/email/routing/summary/dkim">client.radar.email.routing.summary.<a href="./src/cloudflare/resources/radar/email/routing/summary.py">dkim</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/summary_dkim_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/summary_dkim_response.py">SummaryDKIMResponse</a></code>
-- <code title="get /radar/email/routing/summary/dmarc">client.radar.email.routing.summary.<a href="./src/cloudflare/resources/radar/email/routing/summary.py">dmarc</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/summary_dmarc_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/summary_dmarc_response.py">SummaryDMARCResponse</a></code>
-- <code title="get /radar/email/routing/summary/encrypted">client.radar.email.routing.summary.<a href="./src/cloudflare/resources/radar/email/routing/summary.py">encrypted</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/summary_encrypted_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/summary_encrypted_response.py">SummaryEncryptedResponse</a></code>
-- <code title="get /radar/email/routing/summary/ip_version">client.radar.email.routing.summary.<a href="./src/cloudflare/resources/radar/email/routing/summary.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/summary_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/summary_ip_version_response.py">SummaryIPVersionResponse</a></code>
-- <code title="get /radar/email/routing/summary/spf">client.radar.email.routing.summary.<a href="./src/cloudflare/resources/radar/email/routing/summary.py">spf</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/summary_spf_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/summary_spf_response.py">SummarySPFResponse</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/events/countries">client.cloudforce_one.threat_events.countries.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/countries.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/country_list_response.py">CountryListResponse</a></code>
 
-#### TimeseriesGroups
+### Datasets
 
 Types:
 
 ```python
-from cloudflare.types.radar.email.routing import (
-    TimeseriesGroupARCResponse,
-    TimeseriesGroupDKIMResponse,
-    TimeseriesGroupDMARCResponse,
-    TimeseriesGroupEncryptedResponse,
-    TimeseriesGroupIPVersionResponse,
-    TimeseriesGroupSPFResponse,
+from cloudflare.types.cloudforce_one.threat_events import (
+    DatasetCreateResponse,
+    DatasetListResponse,
+    DatasetEditResponse,
+    DatasetGetResponse,
+    DatasetRawResponse,
 )
 ```
 
-Methods:
-
-- <code title="get /radar/email/routing/timeseries_groups/arc">client.radar.email.routing.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/routing/timeseries_groups.py">arc</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/timeseries_group_arc_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/timeseries_group_arc_response.py">TimeseriesGroupARCResponse</a></code>
-- <code title="get /radar/email/routing/timeseries_groups/dkim">client.radar.email.routing.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/routing/timeseries_groups.py">dkim</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/timeseries_group_dkim_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/timeseries_group_dkim_response.py">TimeseriesGroupDKIMResponse</a></code>
-- <code title="get /radar/email/routing/timeseries_groups/dmarc">client.radar.email.routing.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/routing/timeseries_groups.py">dmarc</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/timeseries_group_dmarc_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/timeseries_group_dmarc_response.py">TimeseriesGroupDMARCResponse</a></code>
-- <code title="get /radar/email/routing/timeseries_groups/encrypted">client.radar.email.routing.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/routing/timeseries_groups.py">encrypted</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/timeseries_group_encrypted_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/timeseries_group_encrypted_response.py">TimeseriesGroupEncryptedResponse</a></code>
-- <code title="get /radar/email/routing/timeseries_groups/ip_version">client.radar.email.routing.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/routing/timeseries_groups.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/timeseries_group_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/timeseries_group_ip_version_response.py">TimeseriesGroupIPVersionResponse</a></code>
-- <code title="get /radar/email/routing/timeseries_groups/spf">client.radar.email.routing.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/routing/timeseries_groups.py">spf</a>(\*\*<a href="src/cloudflare/types/radar/email/routing/timeseries_group_spf_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/routing/timeseries_group_spf_response.py">TimeseriesGroupSPFResponse</a></code>
-
-### Security
+Methods:
 
-#### Top
+- <code title="post /accounts/{account_id}/cloudforce-one/events/dataset/create">client.cloudforce_one.threat_events.datasets.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/datasets/datasets.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/threat_events/dataset_create_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/dataset_create_response.py">DatasetCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/events/dataset">client.cloudforce_one.threat_events.datasets.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/datasets/datasets.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/dataset_list_response.py">DatasetListResponse</a></code>
+- <code title="patch /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}">client.cloudforce_one.threat_events.datasets.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/datasets/datasets.py">edit</a>(dataset_id, \*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/threat_events/dataset_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/dataset_edit_response.py">DatasetEditResponse</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}">client.cloudforce_one.threat_events.datasets.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/datasets/datasets.py">get</a>(dataset_id, \*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/dataset_get_response.py">DatasetGetResponse</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/events/raw/{dataset_id}/{event_id}">client.cloudforce_one.threat_events.datasets.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/datasets/datasets.py">raw</a>(event_id, \*, account_id, dataset_id) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/dataset_raw_response.py">DatasetRawResponse</a></code>
 
-##### Tlds
+### IndicatorTypes
 
 Types:
 
 ```python
-from cloudflare.types.radar.email.security.top import TldGetResponse
+from cloudflare.types.cloudforce_one.threat_events import IndicatorTypeListResponse
 ```
 
 Methods:
 
-- <code title="get /radar/email/security/top/tlds">client.radar.email.security.top.tlds.<a href="./src/cloudflare/resources/radar/email/security/top/tlds/tlds.py">get</a>(\*\*<a href="src/cloudflare/types/radar/email/security/top/tld_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/top/tld_get_response.py">TldGetResponse</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/events/indicatorTypes">client.cloudforce_one.threat_events.indicator_types.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/indicator_types.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/indicator_type_list_response.py">IndicatorTypeListResponse</a></code>
 
-###### Malicious
+### Raw
 
 Types:
 
 ```python
-from cloudflare.types.radar.email.security.top.tlds import MaliciousGetResponse
+from cloudflare.types.cloudforce_one.threat_events import RawEditResponse, RawGetResponse
 ```
 
 Methods:
 
-- <code title="get /radar/email/security/top/tlds/malicious/{malicious}">client.radar.email.security.top.tlds.malicious.<a href="./src/cloudflare/resources/radar/email/security/top/tlds/malicious.py">get</a>(malicious, \*\*<a href="src/cloudflare/types/radar/email/security/top/tlds/malicious_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/top/tlds/malicious_get_response.py">MaliciousGetResponse</a></code>
+- <code title="patch /accounts/{account_id}/cloudforce-one/events/{event_id}/raw/{raw_id}">client.cloudforce_one.threat_events.raw.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/raw.py">edit</a>(raw_id, \*, account_id, event_id, \*\*<a href="src/cloudflare/types/cloudforce_one/threat_events/raw_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/raw_edit_response.py">RawEditResponse</a></code>
+- <code title="get /accounts/{account_id}/cloudforce-one/events/{event_id}/raw/{raw_id}">client.cloudforce_one.threat_events.raw.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/raw.py">get</a>(raw_id, \*, account_id, event_id) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/raw_get_response.py">RawGetResponse</a></code>
 
-###### Spam
+### Relate
 
 Types:
 
 ```python
-from cloudflare.types.radar.email.security.top.tlds import SpamGetResponse
+from cloudflare.types.cloudforce_one.threat_events import RelateDeleteResponse
 ```
 
 Methods:
 
-- <code title="get /radar/email/security/top/tlds/spam/{spam}">client.radar.email.security.top.tlds.spam.<a href="./src/cloudflare/resources/radar/email/security/top/tlds/spam.py">get</a>(spam, \*\*<a href="src/cloudflare/types/radar/email/security/top/tlds/spam_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/top/tlds/spam_get_response.py">SpamGetResponse</a></code>
+- <code title="delete /accounts/{account_id}/cloudforce-one/events/relate/{event_id}">client.cloudforce_one.threat_events.relate.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/relate.py">delete</a>(event_id, \*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/relate_delete_response.py">RelateDeleteResponse</a></code>
 
-###### Spoof
+### Tags
 
 Types:
 
 ```python
-from cloudflare.types.radar.email.security.top.tlds import SpoofGetResponse
+from cloudflare.types.cloudforce_one.threat_events import TagCreateResponse
 ```
 
 Methods:
 
-- <code title="get /radar/email/security/top/tlds/spoof/{spoof}">client.radar.email.security.top.tlds.spoof.<a href="./src/cloudflare/resources/radar/email/security/top/tlds/spoof.py">get</a>(spoof, \*\*<a href="src/cloudflare/types/radar/email/security/top/tlds/spoof_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/top/tlds/spoof_get_response.py">SpoofGetResponse</a></code>
+- <code title="post /accounts/{account_id}/cloudforce-one/events/tags/create">client.cloudforce_one.threat_events.tags.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/tags.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/threat_events/tag_create_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/tag_create_response.py">TagCreateResponse</a></code>
 
-#### Summary
+### EventTags
 
 Types:
 
 ```python
-from cloudflare.types.radar.email.security import (
-    SummaryARCResponse,
-    SummaryDKIMResponse,
-    SummaryDMARCResponse,
-    SummaryMaliciousResponse,
-    SummarySpamResponse,
-    SummarySPFResponse,
-    SummarySpoofResponse,
-    SummaryThreatCategoryResponse,
-    SummaryTLSVersionResponse,
+from cloudflare.types.cloudforce_one.threat_events import (
+    EventTagCreateResponse,
+    EventTagDeleteResponse,
 )
 ```
 
 Methods:
 
-- <code title="get /radar/email/security/summary/arc">client.radar.email.security.summary.<a href="./src/cloudflare/resources/radar/email/security/summary.py">arc</a>(\*\*<a href="src/cloudflare/types/radar/email/security/summary_arc_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/summary_arc_response.py">SummaryARCResponse</a></code>
-- <code title="get /radar/email/security/summary/dkim">client.radar.email.security.summary.<a href="./src/cloudflare/resources/radar/email/security/summary.py">dkim</a>(\*\*<a href="src/cloudflare/types/radar/email/security/summary_dkim_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/summary_dkim_response.py">SummaryDKIMResponse</a></code>
-- <code title="get /radar/email/security/summary/dmarc">client.radar.email.security.summary.<a href="./src/cloudflare/resources/radar/email/security/summary.py">dmarc</a>(\*\*<a href="src/cloudflare/types/radar/email/security/summary_dmarc_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/summary_dmarc_response.py">SummaryDMARCResponse</a></code>
-- <code title="get /radar/email/security/summary/malicious">client.radar.email.security.summary.<a href="./src/cloudflare/resources/radar/email/security/summary.py">malicious</a>(\*\*<a href="src/cloudflare/types/radar/email/security/summary_malicious_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/summary_malicious_response.py">SummaryMaliciousResponse</a></code>
-- <code title="get /radar/email/security/summary/spam">client.radar.email.security.summary.<a href="./src/cloudflare/resources/radar/email/security/summary.py">spam</a>(\*\*<a href="src/cloudflare/types/radar/email/security/summary_spam_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/summary_spam_response.py">SummarySpamResponse</a></code>
-- <code title="get /radar/email/security/summary/spf">client.radar.email.security.summary.<a href="./src/cloudflare/resources/radar/email/security/summary.py">spf</a>(\*\*<a href="src/cloudflare/types/radar/email/security/summary_spf_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/summary_spf_response.py">SummarySPFResponse</a></code>
-- <code title="get /radar/email/security/summary/spoof">client.radar.email.security.summary.<a href="./src/cloudflare/resources/radar/email/security/summary.py">spoof</a>(\*\*<a href="src/cloudflare/types/radar/email/security/summary_spoof_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/summary_spoof_response.py">SummarySpoofResponse</a></code>
-- <code title="get /radar/email/security/summary/threat_category">client.radar.email.security.summary.<a href="./src/cloudflare/resources/radar/email/security/summary.py">threat_category</a>(\*\*<a href="src/cloudflare/types/radar/email/security/summary_threat_category_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/summary_threat_category_response.py">SummaryThreatCategoryResponse</a></code>
-- <code title="get /radar/email/security/summary/tls_version">client.radar.email.security.summary.<a href="./src/cloudflare/resources/radar/email/security/summary.py">tls_version</a>(\*\*<a href="src/cloudflare/types/radar/email/security/summary_tls_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/summary_tls_version_response.py">SummaryTLSVersionResponse</a></code>
+- <code title="post /accounts/{account_id}/cloudforce-one/events/event_tag/{event_id}/create">client.cloudforce_one.threat_events.event_tags.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/event_tags.py">create</a>(event_id, \*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/threat_events/event_tag_create_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/event_tag_create_response.py">EventTagCreateResponse</a></code>
+- <code title="delete /accounts/{account_id}/cloudforce-one/events/event_tag/{event_id}">client.cloudforce_one.threat_events.event_tags.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/event_tags.py">delete</a>(event_id, \*, account_id) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/event_tag_delete_response.py">EventTagDeleteResponse</a></code>
 
-#### TimeseriesGroups
+### TargetIndustries
 
 Types:
 
 ```python
-from cloudflare.types.radar.email.security import (
-    TimeseriesGroupARCResponse,
-    TimeseriesGroupDKIMResponse,
-    TimeseriesGroupDMARCResponse,
-    TimeseriesGroupMaliciousResponse,
-    TimeseriesGroupSpamResponse,
-    TimeseriesGroupSPFResponse,
-    TimeseriesGroupSpoofResponse,
-    TimeseriesGroupThreatCategoryResponse,
-    TimeseriesGroupTLSVersionResponse,
-)
+from cloudflare.types.cloudforce_one.threat_events import TargetIndustryListResponse
 ```
 
 Methods:
 
-- <code title="get /radar/email/security/timeseries_groups/arc">client.radar.email.security.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/security/timeseries_groups.py">arc</a>(\*\*<a href="src/cloudflare/types/radar/email/security/timeseries_group_arc_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/timeseries_group_arc_response.py">TimeseriesGroupARCResponse</a></code>
-- <code title="get /radar/email/security/timeseries_groups/dkim">client.radar.email.security.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/security/timeseries_groups.py">dkim</a>(\*\*<a href="src/cloudflare/types/radar/email/security/timeseries_group_dkim_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/timeseries_group_dkim_response.py">TimeseriesGroupDKIMResponse</a></code>
-- <code title="get /radar/email/security/timeseries_groups/dmarc">client.radar.email.security.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/security/timeseries_groups.py">dmarc</a>(\*\*<a href="src/cloudflare/types/radar/email/security/timeseries_group_dmarc_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/timeseries_group_dmarc_response.py">TimeseriesGroupDMARCResponse</a></code>
-- <code title="get /radar/email/security/timeseries_groups/malicious">client.radar.email.security.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/security/timeseries_groups.py">malicious</a>(\*\*<a href="src/cloudflare/types/radar/email/security/timeseries_group_malicious_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/timeseries_group_malicious_response.py">TimeseriesGroupMaliciousResponse</a></code>
-- <code title="get /radar/email/security/timeseries_groups/spam">client.radar.email.security.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/security/timeseries_groups.py">spam</a>(\*\*<a href="src/cloudflare/types/radar/email/security/timeseries_group_spam_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/timeseries_group_spam_response.py">TimeseriesGroupSpamResponse</a></code>
-- <code title="get /radar/email/security/timeseries_groups/spf">client.radar.email.security.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/security/timeseries_groups.py">spf</a>(\*\*<a href="src/cloudflare/types/radar/email/security/timeseries_group_spf_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/timeseries_group_spf_response.py">TimeseriesGroupSPFResponse</a></code>
-- <code title="get /radar/email/security/timeseries_groups/spoof">client.radar.email.security.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/security/timeseries_groups.py">spoof</a>(\*\*<a href="src/cloudflare/types/radar/email/security/timeseries_group_spoof_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/timeseries_group_spoof_response.py">TimeseriesGroupSpoofResponse</a></code>
-- <code title="get /radar/email/security/timeseries_groups/threat_category">client.radar.email.security.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/security/timeseries_groups.py">threat_category</a>(\*\*<a href="src/cloudflare/types/radar/email/security/timeseries_group_threat_category_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/timeseries_group_threat_category_response.py">TimeseriesGroupThreatCategoryResponse</a></code>
-- <code title="get /radar/email/security/timeseries_groups/tls_version">client.radar.email.security.timeseries_groups.<a href="./src/cloudflare/resources/radar/email/security/timeseries_groups.py">tls_version</a>(\*\*<a href="src/cloudflare/types/radar/email/security/timeseries_group_tls_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/email/security/timeseries_group_tls_version_response.py">TimeseriesGroupTLSVersionResponse</a></code>
-
-## Attacks
+- <code title="get /accounts/{account_id}/cloudforce-one/events/targetIndustries">client.cloudforce_one.threat_events.target_industries.<a href="./src/cloudflare/resources/cloudforce_one/threat_events/target_industries.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/cloudforce_one/threat_events/target_industry_list_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/threat_events/target_industry_list_response.py">TargetIndustryListResponse</a></code>
 
-### Layer3
+# AIGateway
 
 Types:
 
 ```python
-from cloudflare.types.radar.attacks import Layer3TimeseriesResponse
+from cloudflare.types.ai_gateway import (
+    AIGatewayCreateResponse,
+    AIGatewayUpdateResponse,
+    AIGatewayListResponse,
+    AIGatewayDeleteResponse,
+    AIGatewayGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/attacks/layer3/timeseries">client.radar.attacks.layer3.<a href="./src/cloudflare/resources/radar/attacks/layer3/layer3.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3_timeseries_response.py">Layer3TimeseriesResponse</a></code>
+- <code title="post /accounts/{account_id}/ai-gateway/gateways">client.ai_gateway.<a href="./src/cloudflare/resources/ai_gateway/ai_gateway.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/ai_gateway/ai_gateway_create_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/ai_gateway_create_response.py">AIGatewayCreateResponse</a></code>
+- <code title="put /accounts/{account_id}/ai-gateway/gateways/{id}">client.ai_gateway.<a href="./src/cloudflare/resources/ai_gateway/ai_gateway.py">update</a>(id, \*, account_id, \*\*<a href="src/cloudflare/types/ai_gateway/ai_gateway_update_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/ai_gateway_update_response.py">AIGatewayUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways">client.ai_gateway.<a href="./src/cloudflare/resources/ai_gateway/ai_gateway.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/ai_gateway/ai_gateway_list_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/ai_gateway_list_response.py">SyncV4PagePaginationArray[AIGatewayListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/ai-gateway/gateways/{id}">client.ai_gateway.<a href="./src/cloudflare/resources/ai_gateway/ai_gateway.py">delete</a>(id, \*, account_id) -> <a href="./src/cloudflare/types/ai_gateway/ai_gateway_delete_response.py">AIGatewayDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{id}">client.ai_gateway.<a href="./src/cloudflare/resources/ai_gateway/ai_gateway.py">get</a>(id, \*, account_id) -> <a href="./src/cloudflare/types/ai_gateway/ai_gateway_get_response.py">AIGatewayGetResponse</a></code>
 
-#### Summary
+## EvaluationTypes
 
 Types:
 
 ```python
-from cloudflare.types.radar.attacks.layer3 import (
-    SummaryBitrateResponse,
-    SummaryDurationResponse,
-    SummaryGetResponse,
-    SummaryIPVersionResponse,
-    SummaryProtocolResponse,
-    SummaryVectorResponse,
-)
+from cloudflare.types.ai_gateway import EvaluationTypeListResponse
 ```
 
 Methods:
 
-- <code title="get /radar/attacks/layer3/summary/bitrate">client.radar.attacks.layer3.summary.<a href="./src/cloudflare/resources/radar/attacks/layer3/summary.py">bitrate</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/summary_bitrate_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/summary_bitrate_response.py">SummaryBitrateResponse</a></code>
-- <code title="get /radar/attacks/layer3/summary/duration">client.radar.attacks.layer3.summary.<a href="./src/cloudflare/resources/radar/attacks/layer3/summary.py">duration</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/summary_duration_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/summary_duration_response.py">SummaryDurationResponse</a></code>
-- <code title="get /radar/attacks/layer3/summary">client.radar.attacks.layer3.summary.<a href="./src/cloudflare/resources/radar/attacks/layer3/summary.py">get</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/summary_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/summary_get_response.py">SummaryGetResponse</a></code>
-- <code title="get /radar/attacks/layer3/summary/ip_version">client.radar.attacks.layer3.summary.<a href="./src/cloudflare/resources/radar/attacks/layer3/summary.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/summary_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/summary_ip_version_response.py">SummaryIPVersionResponse</a></code>
-- <code title="get /radar/attacks/layer3/summary/protocol">client.radar.attacks.layer3.summary.<a href="./src/cloudflare/resources/radar/attacks/layer3/summary.py">protocol</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/summary_protocol_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/summary_protocol_response.py">SummaryProtocolResponse</a></code>
-- <code title="get /radar/attacks/layer3/summary/vector">client.radar.attacks.layer3.summary.<a href="./src/cloudflare/resources/radar/attacks/layer3/summary.py">vector</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/summary_vector_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/summary_vector_response.py">SummaryVectorResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-gateway/evaluation-types">client.ai_gateway.evaluation_types.<a href="./src/cloudflare/resources/ai_gateway/evaluation_types.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/ai_gateway/evaluation_type_list_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/evaluation_type_list_response.py">SyncV4PagePaginationArray[EvaluationTypeListResponse]</a></code>
 
-#### TimeseriesGroups
+## Logs
 
 Types:
 
 ```python
-from cloudflare.types.radar.attacks.layer3 import (
-    TimeseriesGroupBitrateResponse,
-    TimeseriesGroupDurationResponse,
-    TimeseriesGroupGetResponse,
-    TimeseriesGroupIndustryResponse,
-    TimeseriesGroupIPVersionResponse,
-    TimeseriesGroupProtocolResponse,
-    TimeseriesGroupVectorResponse,
-    TimeseriesGroupVerticalResponse,
-)
+from cloudflare.types.ai_gateway import LogListResponse, LogDeleteResponse, LogGetResponse
 ```
 
 Methods:
 
-- <code title="get /radar/attacks/layer3/timeseries_groups/bitrate">client.radar.attacks.layer3.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py">bitrate</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/timeseries_group_bitrate_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/timeseries_group_bitrate_response.py">TimeseriesGroupBitrateResponse</a></code>
-- <code title="get /radar/attacks/layer3/timeseries_groups/duration">client.radar.attacks.layer3.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py">duration</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/timeseries_group_duration_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/timeseries_group_duration_response.py">TimeseriesGroupDurationResponse</a></code>
-- <code title="get /radar/attacks/layer3/timeseries_groups">client.radar.attacks.layer3.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py">get</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/timeseries_group_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/timeseries_group_get_response.py">TimeseriesGroupGetResponse</a></code>
-- <code title="get /radar/attacks/layer3/timeseries_groups/industry">client.radar.attacks.layer3.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py">industry</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/timeseries_group_industry_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/timeseries_group_industry_response.py">TimeseriesGroupIndustryResponse</a></code>
-- <code title="get /radar/attacks/layer3/timeseries_groups/ip_version">client.radar.attacks.layer3.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/timeseries_group_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/timeseries_group_ip_version_response.py">TimeseriesGroupIPVersionResponse</a></code>
-- <code title="get /radar/attacks/layer3/timeseries_groups/protocol">client.radar.attacks.layer3.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py">protocol</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/timeseries_group_protocol_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/timeseries_group_protocol_response.py">TimeseriesGroupProtocolResponse</a></code>
-- <code title="get /radar/attacks/layer3/timeseries_groups/vector">client.radar.attacks.layer3.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py">vector</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/timeseries_group_vector_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/timeseries_group_vector_response.py">TimeseriesGroupVectorResponse</a></code>
-- <code title="get /radar/attacks/layer3/timeseries_groups/vertical">client.radar.attacks.layer3.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py">vertical</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/timeseries_group_vertical_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/timeseries_group_vertical_response.py">TimeseriesGroupVerticalResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs">client.ai_gateway.logs.<a href="./src/cloudflare/resources/ai_gateway/logs.py">list</a>(gateway_id, \*, account_id, \*\*<a href="src/cloudflare/types/ai_gateway/log_list_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/log_list_response.py">SyncV4PagePaginationArray[LogListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs">client.ai_gateway.logs.<a href="./src/cloudflare/resources/ai_gateway/logs.py">delete</a>(gateway_id, \*, account_id, \*\*<a href="src/cloudflare/types/ai_gateway/log_delete_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/log_delete_response.py">LogDeleteResponse</a></code>
+- <code title="patch /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}">client.ai_gateway.logs.<a href="./src/cloudflare/resources/ai_gateway/logs.py">edit</a>(id, \*, account_id, gateway_id, \*\*<a href="src/cloudflare/types/ai_gateway/log_edit_params.py">params</a>) -> object</code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}">client.ai_gateway.logs.<a href="./src/cloudflare/resources/ai_gateway/logs.py">get</a>(id, \*, account_id, gateway_id) -> <a href="./src/cloudflare/types/ai_gateway/log_get_response.py">LogGetResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}/request">client.ai_gateway.logs.<a href="./src/cloudflare/resources/ai_gateway/logs.py">request</a>(id, \*, account_id, gateway_id) -> object</code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}/response">client.ai_gateway.logs.<a href="./src/cloudflare/resources/ai_gateway/logs.py">response</a>(id, \*, account_id, gateway_id) -> object</code>
 
-#### Top
+## Datasets
 
 Types:
 
 ```python
-from cloudflare.types.radar.attacks.layer3 import (
-    TopAttacksResponse,
-    TopIndustryResponse,
-    TopVerticalResponse,
+from cloudflare.types.ai_gateway import (
+    DatasetCreateResponse,
+    DatasetUpdateResponse,
+    DatasetListResponse,
+    DatasetDeleteResponse,
+    DatasetGetResponse,
 )
 ```
 
 Methods:
 
-- <code title="get /radar/attacks/layer3/top/attacks">client.radar.attacks.layer3.top.<a href="./src/cloudflare/resources/radar/attacks/layer3/top/top.py">attacks</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/top_attacks_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/top_attacks_response.py">TopAttacksResponse</a></code>
-- <code title="get /radar/attacks/layer3/top/industry">client.radar.attacks.layer3.top.<a href="./src/cloudflare/resources/radar/attacks/layer3/top/top.py">industry</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/top_industry_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/top_industry_response.py">TopIndustryResponse</a></code>
-- <code title="get /radar/attacks/layer3/top/vertical">client.radar.attacks.layer3.top.<a href="./src/cloudflare/resources/radar/attacks/layer3/top/top.py">vertical</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/top_vertical_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/top_vertical_response.py">TopVerticalResponse</a></code>
+- <code title="post /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets">client.ai_gateway.datasets.<a href="./src/cloudflare/resources/ai_gateway/datasets.py">create</a>(gateway_id, \*, account_id, \*\*<a href="src/cloudflare/types/ai_gateway/dataset_create_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/dataset_create_response.py">DatasetCreateResponse</a></code>
+- <code title="put /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets/{id}">client.ai_gateway.datasets.<a href="./src/cloudflare/resources/ai_gateway/datasets.py">update</a>(id, \*, account_id, gateway_id, \*\*<a href="src/cloudflare/types/ai_gateway/dataset_update_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/dataset_update_response.py">DatasetUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets">client.ai_gateway.datasets.<a href="./src/cloudflare/resources/ai_gateway/datasets.py">list</a>(gateway_id, \*, account_id, \*\*<a href="src/cloudflare/types/ai_gateway/dataset_list_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/dataset_list_response.py">SyncV4PagePaginationArray[DatasetListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets/{id}">client.ai_gateway.datasets.<a href="./src/cloudflare/resources/ai_gateway/datasets.py">delete</a>(id, \*, account_id, gateway_id) -> <a href="./src/cloudflare/types/ai_gateway/dataset_delete_response.py">DatasetDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets/{id}">client.ai_gateway.datasets.<a href="./src/cloudflare/resources/ai_gateway/datasets.py">get</a>(id, \*, account_id, gateway_id) -> <a href="./src/cloudflare/types/ai_gateway/dataset_get_response.py">DatasetGetResponse</a></code>
 
-##### Locations
+## Evaluations
 
 Types:
 
 ```python
-from cloudflare.types.radar.attacks.layer3.top import LocationOriginResponse, LocationTargetResponse
+from cloudflare.types.ai_gateway import (
+    EvaluationCreateResponse,
+    EvaluationListResponse,
+    EvaluationDeleteResponse,
+    EvaluationGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/attacks/layer3/top/locations/origin">client.radar.attacks.layer3.top.locations.<a href="./src/cloudflare/resources/radar/attacks/layer3/top/locations.py">origin</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/top/location_origin_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/top/location_origin_response.py">LocationOriginResponse</a></code>
-- <code title="get /radar/attacks/layer3/top/locations/target">client.radar.attacks.layer3.top.locations.<a href="./src/cloudflare/resources/radar/attacks/layer3/top/locations.py">target</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer3/top/location_target_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer3/top/location_target_response.py">LocationTargetResponse</a></code>
+- <code title="post /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations">client.ai_gateway.evaluations.<a href="./src/cloudflare/resources/ai_gateway/evaluations.py">create</a>(gateway_id, \*, account_id, \*\*<a href="src/cloudflare/types/ai_gateway/evaluation_create_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/evaluation_create_response.py">EvaluationCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations">client.ai_gateway.evaluations.<a href="./src/cloudflare/resources/ai_gateway/evaluations.py">list</a>(gateway_id, \*, account_id, \*\*<a href="src/cloudflare/types/ai_gateway/evaluation_list_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/evaluation_list_response.py">SyncV4PagePaginationArray[EvaluationListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations/{id}">client.ai_gateway.evaluations.<a href="./src/cloudflare/resources/ai_gateway/evaluations.py">delete</a>(id, \*, account_id, gateway_id) -> <a href="./src/cloudflare/types/ai_gateway/evaluation_delete_response.py">EvaluationDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations/{id}">client.ai_gateway.evaluations.<a href="./src/cloudflare/resources/ai_gateway/evaluations.py">get</a>(id, \*, account_id, gateway_id) -> <a href="./src/cloudflare/types/ai_gateway/evaluation_get_response.py">EvaluationGetResponse</a></code>
 
-### Layer7
+## DynamicRouting
 
 Types:
 
 ```python
-from cloudflare.types.radar.attacks import Layer7TimeseriesResponse
+from cloudflare.types.ai_gateway import (
+    DynamicRoutingCreateResponse,
+    DynamicRoutingUpdateResponse,
+    DynamicRoutingListResponse,
+    DynamicRoutingDeleteResponse,
+    DynamicRoutingCreateDeploymentResponse,
+    DynamicRoutingCreateVersionResponse,
+    DynamicRoutingGetResponse,
+    DynamicRoutingGetVersionResponse,
+    DynamicRoutingListDeploymentsResponse,
+    DynamicRoutingListVersionsResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/attacks/layer7/timeseries">client.radar.attacks.layer7.<a href="./src/cloudflare/resources/radar/attacks/layer7/layer7.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7_timeseries_response.py">Layer7TimeseriesResponse</a></code>
+- <code title="post /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes">client.ai_gateway.dynamic_routing.<a href="./src/cloudflare/resources/ai_gateway/dynamic_routing.py">create</a>(gateway_id, \*, account_id, \*\*<a href="src/cloudflare/types/ai_gateway/dynamic_routing_create_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/dynamic_routing_create_response.py">DynamicRoutingCreateResponse</a></code>
+- <code title="patch /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}">client.ai_gateway.dynamic_routing.<a href="./src/cloudflare/resources/ai_gateway/dynamic_routing.py">update</a>(id, \*, account_id, gateway_id, \*\*<a href="src/cloudflare/types/ai_gateway/dynamic_routing_update_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/dynamic_routing_update_response.py">DynamicRoutingUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes">client.ai_gateway.dynamic_routing.<a href="./src/cloudflare/resources/ai_gateway/dynamic_routing.py">list</a>(gateway_id, \*, account_id) -> <a href="./src/cloudflare/types/ai_gateway/dynamic_routing_list_response.py">DynamicRoutingListResponse</a></code>
+- <code title="delete /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}">client.ai_gateway.dynamic_routing.<a href="./src/cloudflare/resources/ai_gateway/dynamic_routing.py">delete</a>(id, \*, account_id, gateway_id) -> <a href="./src/cloudflare/types/ai_gateway/dynamic_routing_delete_response.py">DynamicRoutingDeleteResponse</a></code>
+- <code title="post /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/deployments">client.ai_gateway.dynamic_routing.<a href="./src/cloudflare/resources/ai_gateway/dynamic_routing.py">create_deployment</a>(id, \*, account_id, gateway_id, \*\*<a href="src/cloudflare/types/ai_gateway/dynamic_routing_create_deployment_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/dynamic_routing_create_deployment_response.py">DynamicRoutingCreateDeploymentResponse</a></code>
+- <code title="post /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/versions">client.ai_gateway.dynamic_routing.<a href="./src/cloudflare/resources/ai_gateway/dynamic_routing.py">create_version</a>(id, \*, account_id, gateway_id, \*\*<a href="src/cloudflare/types/ai_gateway/dynamic_routing_create_version_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/dynamic_routing_create_version_response.py">DynamicRoutingCreateVersionResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}">client.ai_gateway.dynamic_routing.<a href="./src/cloudflare/resources/ai_gateway/dynamic_routing.py">get</a>(id, \*, account_id, gateway_id) -> <a href="./src/cloudflare/types/ai_gateway/dynamic_routing_get_response.py">DynamicRoutingGetResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/versions/{version_id}">client.ai_gateway.dynamic_routing.<a href="./src/cloudflare/resources/ai_gateway/dynamic_routing.py">get_version</a>(version_id, \*, account_id, gateway_id, id) -> <a href="./src/cloudflare/types/ai_gateway/dynamic_routing_get_version_response.py">DynamicRoutingGetVersionResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/deployments">client.ai_gateway.dynamic_routing.<a href="./src/cloudflare/resources/ai_gateway/dynamic_routing.py">list_deployments</a>(id, \*, account_id, gateway_id) -> <a href="./src/cloudflare/types/ai_gateway/dynamic_routing_list_deployments_response.py">DynamicRoutingListDeploymentsResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/versions">client.ai_gateway.dynamic_routing.<a href="./src/cloudflare/resources/ai_gateway/dynamic_routing.py">list_versions</a>(id, \*, account_id, gateway_id) -> <a href="./src/cloudflare/types/ai_gateway/dynamic_routing_list_versions_response.py">DynamicRoutingListVersionsResponse</a></code>
 
-#### Summary
+## ProviderConfigs
 
 Types:
 
 ```python
-from cloudflare.types.radar.attacks.layer7 import (
-    SummaryGetResponse,
-    SummaryHTTPMethodResponse,
-    SummaryHTTPVersionResponse,
-    SummaryIPVersionResponse,
-    SummaryManagedRulesResponse,
-    SummaryMitigationProductResponse,
-)
+from cloudflare.types.ai_gateway import ProviderConfigCreateResponse, ProviderConfigListResponse
 ```
 
 Methods:
 
-- <code title="get /radar/attacks/layer7/summary">client.radar.attacks.layer7.summary.<a href="./src/cloudflare/resources/radar/attacks/layer7/summary.py">get</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/summary_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/summary_get_response.py">SummaryGetResponse</a></code>
-- <code title="get /radar/attacks/layer7/summary/http_method">client.radar.attacks.layer7.summary.<a href="./src/cloudflare/resources/radar/attacks/layer7/summary.py">http_method</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/summary_http_method_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/summary_http_method_response.py">SummaryHTTPMethodResponse</a></code>
-- <code title="get /radar/attacks/layer7/summary/http_version">client.radar.attacks.layer7.summary.<a href="./src/cloudflare/resources/radar/attacks/layer7/summary.py">http_version</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/summary_http_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/summary_http_version_response.py">SummaryHTTPVersionResponse</a></code>
-- <code title="get /radar/attacks/layer7/summary/ip_version">client.radar.attacks.layer7.summary.<a href="./src/cloudflare/resources/radar/attacks/layer7/summary.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/summary_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/summary_ip_version_response.py">SummaryIPVersionResponse</a></code>
-- <code title="get /radar/attacks/layer7/summary/managed_rules">client.radar.attacks.layer7.summary.<a href="./src/cloudflare/resources/radar/attacks/layer7/summary.py">managed_rules</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/summary_managed_rules_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/summary_managed_rules_response.py">SummaryManagedRulesResponse</a></code>
-- <code title="get /radar/attacks/layer7/summary/mitigation_product">client.radar.attacks.layer7.summary.<a href="./src/cloudflare/resources/radar/attacks/layer7/summary.py">mitigation_product</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/summary_mitigation_product_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/summary_mitigation_product_response.py">SummaryMitigationProductResponse</a></code>
+- <code title="post /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/provider_configs">client.ai_gateway.provider_configs.<a href="./src/cloudflare/resources/ai_gateway/provider_configs.py">create</a>(gateway_id, \*, account_id, \*\*<a href="src/cloudflare/types/ai_gateway/provider_config_create_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/provider_config_create_response.py">ProviderConfigCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/provider_configs">client.ai_gateway.provider_configs.<a href="./src/cloudflare/resources/ai_gateway/provider_configs.py">list</a>(gateway_id, \*, account_id, \*\*<a href="src/cloudflare/types/ai_gateway/provider_config_list_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/provider_config_list_response.py">SyncV4PagePaginationArray[ProviderConfigListResponse]</a></code>
 
-#### TimeseriesGroups
+## URLs
 
 Types:
 
 ```python
-from cloudflare.types.radar.attacks.layer7 import (
-    TimeseriesGroupGetResponse,
-    TimeseriesGroupHTTPMethodResponse,
-    TimeseriesGroupHTTPVersionResponse,
-    TimeseriesGroupIndustryResponse,
-    TimeseriesGroupIPVersionResponse,
-    TimeseriesGroupManagedRulesResponse,
-    TimeseriesGroupMitigationProductResponse,
-    TimeseriesGroupVerticalResponse,
-)
+from cloudflare.types.ai_gateway import URLGetResponse
 ```
 
 Methods:
 
-- <code title="get /radar/attacks/layer7/timeseries_groups">client.radar.attacks.layer7.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py">get</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/timeseries_group_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/timeseries_group_get_response.py">TimeseriesGroupGetResponse</a></code>
-- <code title="get /radar/attacks/layer7/timeseries_groups/http_method">client.radar.attacks.layer7.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py">http_method</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_method_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_method_response.py">TimeseriesGroupHTTPMethodResponse</a></code>
-- <code title="get /radar/attacks/layer7/timeseries_groups/http_version">client.radar.attacks.layer7.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py">http_version</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_version_response.py">TimeseriesGroupHTTPVersionResponse</a></code>
-- <code title="get /radar/attacks/layer7/timeseries_groups/industry">client.radar.attacks.layer7.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py">industry</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/timeseries_group_industry_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/timeseries_group_industry_response.py">TimeseriesGroupIndustryResponse</a></code>
-- <code title="get /radar/attacks/layer7/timeseries_groups/ip_version">client.radar.attacks.layer7.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/timeseries_group_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/timeseries_group_ip_version_response.py">TimeseriesGroupIPVersionResponse</a></code>
-- <code title="get /radar/attacks/layer7/timeseries_groups/managed_rules">client.radar.attacks.layer7.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py">managed_rules</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/timeseries_group_managed_rules_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/timeseries_group_managed_rules_response.py">TimeseriesGroupManagedRulesResponse</a></code>
-- <code title="get /radar/attacks/layer7/timeseries_groups/mitigation_product">client.radar.attacks.layer7.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py">mitigation_product</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/timeseries_group_mitigation_product_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/timeseries_group_mitigation_product_response.py">TimeseriesGroupMitigationProductResponse</a></code>
-- <code title="get /radar/attacks/layer7/timeseries_groups/vertical">client.radar.attacks.layer7.timeseries_groups.<a href="./src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py">vertical</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/timeseries_group_vertical_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/timeseries_group_vertical_response.py">TimeseriesGroupVerticalResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/url/{provider}">client.ai_gateway.urls.<a href="./src/cloudflare/resources/ai_gateway/urls.py">get</a>(provider, \*, account_id, gateway_id) -> <a href="./src/cloudflare/types/ai_gateway/url_get_response.py">str</a></code>
 
-#### Top
+# IAM
+
+## PermissionGroups
 
 Types:
 
 ```python
-from cloudflare.types.radar.attacks.layer7 import (
-    TopAttacksResponse,
-    TopIndustryResponse,
-    TopVerticalResponse,
-)
+from cloudflare.types.iam import PermissionGroupListResponse, PermissionGroupGetResponse
 ```
 
 Methods:
 
-- <code title="get /radar/attacks/layer7/top/attacks">client.radar.attacks.layer7.top.<a href="./src/cloudflare/resources/radar/attacks/layer7/top/top.py">attacks</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/top_attacks_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/top_attacks_response.py">TopAttacksResponse</a></code>
-- <code title="get /radar/attacks/layer7/top/industry">client.radar.attacks.layer7.top.<a href="./src/cloudflare/resources/radar/attacks/layer7/top/top.py">industry</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/top_industry_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/top_industry_response.py">TopIndustryResponse</a></code>
-- <code title="get /radar/attacks/layer7/top/vertical">client.radar.attacks.layer7.top.<a href="./src/cloudflare/resources/radar/attacks/layer7/top/top.py">vertical</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/top_vertical_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/top_vertical_response.py">TopVerticalResponse</a></code>
+- <code title="get /accounts/{account_id}/iam/permission_groups">client.iam.permission_groups.<a href="./src/cloudflare/resources/iam/permission_groups.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/iam/permission_group_list_params.py">params</a>) -> <a href="./src/cloudflare/types/iam/permission_group_list_response.py">SyncV4PagePaginationArray[PermissionGroupListResponse]</a></code>
+- <code title="get /accounts/{account_id}/iam/permission_groups/{permission_group_id}">client.iam.permission_groups.<a href="./src/cloudflare/resources/iam/permission_groups.py">get</a>(permission_group_id, \*, account_id) -> <a href="./src/cloudflare/types/iam/permission_group_get_response.py">Optional[PermissionGroupGetResponse]</a></code>
 
-##### Locations
+## ResourceGroups
 
 Types:
 
 ```python
-from cloudflare.types.radar.attacks.layer7.top import LocationOriginResponse, LocationTargetResponse
+from cloudflare.types.iam import (
+    ResourceGroupCreateResponse,
+    ResourceGroupUpdateResponse,
+    ResourceGroupListResponse,
+    ResourceGroupDeleteResponse,
+    ResourceGroupGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/attacks/layer7/top/locations/origin">client.radar.attacks.layer7.top.locations.<a href="./src/cloudflare/resources/radar/attacks/layer7/top/locations.py">origin</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/top/location_origin_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/top/location_origin_response.py">LocationOriginResponse</a></code>
-- <code title="get /radar/attacks/layer7/top/locations/target">client.radar.attacks.layer7.top.locations.<a href="./src/cloudflare/resources/radar/attacks/layer7/top/locations.py">target</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/top/location_target_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/top/location_target_response.py">LocationTargetResponse</a></code>
+- <code title="post /accounts/{account_id}/iam/resource_groups">client.iam.resource_groups.<a href="./src/cloudflare/resources/iam/resource_groups.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/iam/resource_group_create_params.py">params</a>) -> <a href="./src/cloudflare/types/iam/resource_group_create_response.py">Optional[ResourceGroupCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/iam/resource_groups/{resource_group_id}">client.iam.resource_groups.<a href="./src/cloudflare/resources/iam/resource_groups.py">update</a>(resource_group_id, \*, account_id, \*\*<a href="src/cloudflare/types/iam/resource_group_update_params.py">params</a>) -> <a href="./src/cloudflare/types/iam/resource_group_update_response.py">Optional[ResourceGroupUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/iam/resource_groups">client.iam.resource_groups.<a href="./src/cloudflare/resources/iam/resource_groups.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/iam/resource_group_list_params.py">params</a>) -> <a href="./src/cloudflare/types/iam/resource_group_list_response.py">SyncSinglePage[ResourceGroupListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/iam/resource_groups/{resource_group_id}">client.iam.resource_groups.<a href="./src/cloudflare/resources/iam/resource_groups.py">delete</a>(resource_group_id, \*, account_id) -> <a href="./src/cloudflare/types/iam/resource_group_delete_response.py">Optional[ResourceGroupDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/iam/resource_groups/{resource_group_id}">client.iam.resource_groups.<a href="./src/cloudflare/resources/iam/resource_groups.py">get</a>(resource_group_id, \*, account_id) -> <a href="./src/cloudflare/types/iam/resource_group_get_response.py">Optional[ResourceGroupGetResponse]</a></code>
 
-##### Ases
+## UserGroups
 
 Types:
 
 ```python
-from cloudflare.types.radar.attacks.layer7.top import AseOriginResponse
+from cloudflare.types.iam import (
+    UserGroupCreateResponse,
+    UserGroupUpdateResponse,
+    UserGroupListResponse,
+    UserGroupDeleteResponse,
+    UserGroupGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/attacks/layer7/top/ases/origin">client.radar.attacks.layer7.top.ases.<a href="./src/cloudflare/resources/radar/attacks/layer7/top/ases.py">origin</a>(\*\*<a href="src/cloudflare/types/radar/attacks/layer7/top/ase_origin_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/attacks/layer7/top/ase_origin_response.py">AseOriginResponse</a></code>
+- <code title="post /accounts/{account_id}/iam/user_groups">client.iam.user_groups.<a href="./src/cloudflare/resources/iam/user_groups/user_groups.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/iam/user_group_create_params.py">params</a>) -> <a href="./src/cloudflare/types/iam/user_group_create_response.py">Optional[UserGroupCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/iam/user_groups/{user_group_id}">client.iam.user_groups.<a href="./src/cloudflare/resources/iam/user_groups/user_groups.py">update</a>(user_group_id, \*, account_id, \*\*<a href="src/cloudflare/types/iam/user_group_update_params.py">params</a>) -> <a href="./src/cloudflare/types/iam/user_group_update_response.py">Optional[UserGroupUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/iam/user_groups">client.iam.user_groups.<a href="./src/cloudflare/resources/iam/user_groups/user_groups.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/iam/user_group_list_params.py">params</a>) -> <a href="./src/cloudflare/types/iam/user_group_list_response.py">SyncV4PagePaginationArray[UserGroupListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/iam/user_groups/{user_group_id}">client.iam.user_groups.<a href="./src/cloudflare/resources/iam/user_groups/user_groups.py">delete</a>(user_group_id, \*, account_id) -> <a href="./src/cloudflare/types/iam/user_group_delete_response.py">Optional[UserGroupDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/iam/user_groups/{user_group_id}">client.iam.user_groups.<a href="./src/cloudflare/resources/iam/user_groups/user_groups.py">get</a>(user_group_id, \*, account_id) -> <a href="./src/cloudflare/types/iam/user_group_get_response.py">Optional[UserGroupGetResponse]</a></code>
 
-## Entities
+### Members
 
 Types:
 
 ```python
-from cloudflare.types.radar import EntityGetResponse
+from cloudflare.types.iam.user_groups import (
+    MemberCreateResponse,
+    MemberUpdateResponse,
+    MemberListResponse,
+    MemberDeleteResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/entities/ip">client.radar.entities.<a href="./src/cloudflare/resources/radar/entities/entities.py">get</a>(\*\*<a href="src/cloudflare/types/radar/entity_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/entity_get_response.py">EntityGetResponse</a></code>
+- <code title="post /accounts/{account_id}/iam/user_groups/{user_group_id}/members">client.iam.user_groups.members.<a href="./src/cloudflare/resources/iam/user_groups/members.py">create</a>(user_group_id, \*, account_id, \*\*<a href="src/cloudflare/types/iam/user_groups/member_create_params.py">params</a>) -> <a href="./src/cloudflare/types/iam/user_groups/member_create_response.py">Optional[MemberCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/iam/user_groups/{user_group_id}/members">client.iam.user_groups.members.<a href="./src/cloudflare/resources/iam/user_groups/members.py">update</a>(user_group_id, \*, account_id, \*\*<a href="src/cloudflare/types/iam/user_groups/member_update_params.py">params</a>) -> <a href="./src/cloudflare/types/iam/user_groups/member_update_response.py">SyncSinglePage[MemberUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/iam/user_groups/{user_group_id}/members">client.iam.user_groups.members.<a href="./src/cloudflare/resources/iam/user_groups/members.py">list</a>(user_group_id, \*, account_id, \*\*<a href="src/cloudflare/types/iam/user_groups/member_list_params.py">params</a>) -> <a href="./src/cloudflare/types/iam/user_groups/member_list_response.py">SyncV4PagePaginationArray[MemberListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/iam/user_groups/{user_group_id}/members/{member_id}">client.iam.user_groups.members.<a href="./src/cloudflare/resources/iam/user_groups/members.py">delete</a>(member_id, \*, account_id, user_group_id) -> <a href="./src/cloudflare/types/iam/user_groups/member_delete_response.py">Optional[MemberDeleteResponse]</a></code>
 
-### ASNs
+## SSO
 
 Types:
 
 ```python
-from cloudflare.types.radar.entities import (
-    ASNListResponse,
-    ASNGetResponse,
-    ASNIPResponse,
-    ASNRelResponse,
+from cloudflare.types.iam import (
+    SSOCreateResponse,
+    SSOUpdateResponse,
+    SSOListResponse,
+    SSODeleteResponse,
+    SSOBeginVerificationResponse,
+    SSOGetResponse,
 )
 ```
 
 Methods:
 
-- <code title="get /radar/entities/asns">client.radar.entities.asns.<a href="./src/cloudflare/resources/radar/entities/asns.py">list</a>(\*\*<a href="src/cloudflare/types/radar/entities/asn_list_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/entities/asn_list_response.py">ASNListResponse</a></code>
-- <code title="get /radar/entities/asns/{asn}">client.radar.entities.asns.<a href="./src/cloudflare/resources/radar/entities/asns.py">get</a>(asn, \*\*<a href="src/cloudflare/types/radar/entities/asn_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/entities/asn_get_response.py">ASNGetResponse</a></code>
-- <code title="get /radar/entities/asns/ip">client.radar.entities.asns.<a href="./src/cloudflare/resources/radar/entities/asns.py">ip</a>(\*\*<a href="src/cloudflare/types/radar/entities/asn_ip_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/entities/asn_ip_response.py">ASNIPResponse</a></code>
-- <code title="get /radar/entities/asns/{asn}/rel">client.radar.entities.asns.<a href="./src/cloudflare/resources/radar/entities/asns.py">rel</a>(asn, \*\*<a href="src/cloudflare/types/radar/entities/asn_rel_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/entities/asn_rel_response.py">ASNRelResponse</a></code>
+- <code title="post /accounts/{account_id}/sso_connectors">client.iam.sso.<a href="./src/cloudflare/resources/iam/sso.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/iam/sso_create_params.py">params</a>) -> <a href="./src/cloudflare/types/iam/sso_create_response.py">Optional[SSOCreateResponse]</a></code>
+- <code title="patch /accounts/{account_id}/sso_connectors/{sso_connector_id}">client.iam.sso.<a href="./src/cloudflare/resources/iam/sso.py">update</a>(sso_connector_id, \*, account_id, \*\*<a href="src/cloudflare/types/iam/sso_update_params.py">params</a>) -> <a href="./src/cloudflare/types/iam/sso_update_response.py">Optional[SSOUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/sso_connectors">client.iam.sso.<a href="./src/cloudflare/resources/iam/sso.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/iam/sso_list_response.py">SyncSinglePage[SSOListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/sso_connectors/{sso_connector_id}">client.iam.sso.<a href="./src/cloudflare/resources/iam/sso.py">delete</a>(sso_connector_id, \*, account_id) -> <a href="./src/cloudflare/types/iam/sso_delete_response.py">Optional[SSODeleteResponse]</a></code>
+- <code title="post /accounts/{account_id}/sso_connectors/{sso_connector_id}/begin_verification">client.iam.sso.<a href="./src/cloudflare/resources/iam/sso.py">begin_verification</a>(sso_connector_id, \*, account_id) -> <a href="./src/cloudflare/types/iam/sso_begin_verification_response.py">SSOBeginVerificationResponse</a></code>
+- <code title="get /accounts/{account_id}/sso_connectors/{sso_connector_id}">client.iam.sso.<a href="./src/cloudflare/resources/iam/sso.py">get</a>(sso_connector_id, \*, account_id) -> <a href="./src/cloudflare/types/iam/sso_get_response.py">Optional[SSOGetResponse]</a></code>
 
-### Locations
+# CloudConnector
+
+## Rules
 
 Types:
 
 ```python
-from cloudflare.types.radar.entities import LocationListResponse, LocationGetResponse
+from cloudflare.types.cloud_connector import RuleUpdateResponse, RuleListResponse
 ```
 
 Methods:
 
-- <code title="get /radar/entities/locations">client.radar.entities.locations.<a href="./src/cloudflare/resources/radar/entities/locations.py">list</a>(\*\*<a href="src/cloudflare/types/radar/entities/location_list_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/entities/location_list_response.py">LocationListResponse</a></code>
-- <code title="get /radar/entities/locations/{location}">client.radar.entities.locations.<a href="./src/cloudflare/resources/radar/entities/locations.py">get</a>(location, \*\*<a href="src/cloudflare/types/radar/entities/location_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/entities/location_get_response.py">LocationGetResponse</a></code>
+- <code title="put /zones/{zone_id}/cloud_connector/rules">client.cloud_connector.rules.<a href="./src/cloudflare/resources/cloud_connector/rules.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/cloud_connector/rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/cloud_connector/rule_update_response.py">SyncSinglePage[RuleUpdateResponse]</a></code>
+- <code title="get /zones/{zone_id}/cloud_connector/rules">client.cloud_connector.rules.<a href="./src/cloudflare/resources/cloud_connector/rules.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/cloud_connector/rule_list_response.py">SyncSinglePage[RuleListResponse]</a></code>
 
-## HTTP
+# BotnetFeed
+
+## ASN
 
 Types:
 
 ```python
-from cloudflare.types.radar import HTTPTimeseriesResponse
+from cloudflare.types.botnet_feed import ASNDayReportResponse, ASNFullReportResponse
 ```
 
 Methods:
 
-- <code title="get /radar/http/timeseries">client.radar.http.<a href="./src/cloudflare/resources/radar/http/http.py">timeseries</a>(\*\*<a href="src/cloudflare/types/radar/http_timeseries_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http_timeseries_response.py">HTTPTimeseriesResponse</a></code>
+- <code title="get /accounts/{account_id}/botnet_feed/asn/{asn_id}/day_report">client.botnet_feed.asn.<a href="./src/cloudflare/resources/botnet_feed/asn.py">day_report</a>(asn_id, \*, account_id, \*\*<a href="src/cloudflare/types/botnet_feed/asn_day_report_params.py">params</a>) -> <a href="./src/cloudflare/types/botnet_feed/asn_day_report_response.py">Optional[ASNDayReportResponse]</a></code>
+- <code title="get /accounts/{account_id}/botnet_feed/asn/{asn_id}/full_report">client.botnet_feed.asn.<a href="./src/cloudflare/resources/botnet_feed/asn.py">full_report</a>(asn_id, \*, account_id) -> <a href="./src/cloudflare/types/botnet_feed/asn_full_report_response.py">Optional[ASNFullReportResponse]</a></code>
 
-### Top
+## Configs
+
+### ASN
 
 Types:
 
 ```python
-from cloudflare.types.radar.http import Browser, TopBrowserFamiliesResponse, TopBrowsersResponse
+from cloudflare.types.botnet_feed.configs import ASNDeleteResponse, ASNGetResponse
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/browser_families">client.radar.http.top.<a href="./src/cloudflare/resources/radar/http/top.py">browser_families</a>(\*\*<a href="src/cloudflare/types/radar/http/top_browser_families_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/top_browser_families_response.py">TopBrowserFamiliesResponse</a></code>
-- <code title="get /radar/http/top/browsers">client.radar.http.top.<a href="./src/cloudflare/resources/radar/http/top.py">browsers</a>(\*\*<a href="src/cloudflare/types/radar/http/top_browsers_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/top_browsers_response.py">TopBrowsersResponse</a></code>
+- <code title="delete /accounts/{account_id}/botnet_feed/configs/asn/{asn_id}">client.botnet_feed.configs.asn.<a href="./src/cloudflare/resources/botnet_feed/configs/asn.py">delete</a>(asn_id, \*, account_id) -> <a href="./src/cloudflare/types/botnet_feed/configs/asn_delete_response.py">Optional[ASNDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/botnet_feed/configs/asn">client.botnet_feed.configs.asn.<a href="./src/cloudflare/resources/botnet_feed/configs/asn.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/botnet_feed/configs/asn_get_response.py">Optional[ASNGetResponse]</a></code>
 
-### Locations
+# SecurityTXT
 
 Types:
 
 ```python
-from cloudflare.types.radar.http import LocationGetResponse
+from cloudflare.types.security_txt import (
+    SecurityTXTUpdateResponse,
+    SecurityTXTDeleteResponse,
+    SecurityTXTGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/locations">client.radar.http.locations.<a href="./src/cloudflare/resources/radar/http/locations/locations.py">get</a>(\*\*<a href="src/cloudflare/types/radar/http/location_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/location_get_response.py">LocationGetResponse</a></code>
+- <code title="put /zones/{zone_id}/security-center/securitytxt">client.security_txt.<a href="./src/cloudflare/resources/security_txt.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/security_txt/security_txt_update_params.py">params</a>) -> <a href="./src/cloudflare/types/security_txt/security_txt_update_response.py">SecurityTXTUpdateResponse</a></code>
+- <code title="delete /zones/{zone_id}/security-center/securitytxt">client.security_txt.<a href="./src/cloudflare/resources/security_txt.py">delete</a>(\*, zone_id) -> <a href="./src/cloudflare/types/security_txt/security_txt_delete_response.py">SecurityTXTDeleteResponse</a></code>
+- <code title="get /zones/{zone_id}/security-center/securitytxt">client.security_txt.<a href="./src/cloudflare/resources/security_txt.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/security_txt/security_txt_get_response.py">Optional[SecurityTXTGetResponse]</a></code>
 
-#### BotClass
+# Workflows
 
 Types:
 
 ```python
-from cloudflare.types.radar.http.locations import BotClassGetResponse
+from cloudflare.types.workflows import (
+    WorkflowUpdateResponse,
+    WorkflowListResponse,
+    WorkflowDeleteResponse,
+    WorkflowGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/locations/bot_class/{bot_class}">client.radar.http.locations.bot_class.<a href="./src/cloudflare/resources/radar/http/locations/bot_class.py">get</a>(bot_class, \*\*<a href="src/cloudflare/types/radar/http/locations/bot_class_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/locations/bot_class_get_response.py">BotClassGetResponse</a></code>
+- <code title="put /accounts/{account_id}/workflows/{workflow_name}">client.workflows.<a href="./src/cloudflare/resources/workflows/workflows.py">update</a>(workflow_name, \*, account_id, \*\*<a href="src/cloudflare/types/workflows/workflow_update_params.py">params</a>) -> <a href="./src/cloudflare/types/workflows/workflow_update_response.py">WorkflowUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/workflows">client.workflows.<a href="./src/cloudflare/resources/workflows/workflows.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/workflows/workflow_list_params.py">params</a>) -> <a href="./src/cloudflare/types/workflows/workflow_list_response.py">SyncV4PagePaginationArray[WorkflowListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/workflows/{workflow_name}">client.workflows.<a href="./src/cloudflare/resources/workflows/workflows.py">delete</a>(workflow_name, \*, account_id) -> <a href="./src/cloudflare/types/workflows/workflow_delete_response.py">WorkflowDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/workflows/{workflow_name}">client.workflows.<a href="./src/cloudflare/resources/workflows/workflows.py">get</a>(workflow_name, \*, account_id) -> <a href="./src/cloudflare/types/workflows/workflow_get_response.py">WorkflowGetResponse</a></code>
 
-#### DeviceType
+## Instances
 
 Types:
 
 ```python
-from cloudflare.types.radar.http.locations import DeviceTypeGetResponse
+from cloudflare.types.workflows import (
+    InstanceCreateResponse,
+    InstanceListResponse,
+    InstanceBulkResponse,
+    InstanceGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/locations/device_type/{device_type}">client.radar.http.locations.device_type.<a href="./src/cloudflare/resources/radar/http/locations/device_type.py">get</a>(device_type, \*\*<a href="src/cloudflare/types/radar/http/locations/device_type_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/locations/device_type_get_response.py">DeviceTypeGetResponse</a></code>
+- <code title="post /accounts/{account_id}/workflows/{workflow_name}/instances">client.workflows.instances.<a href="./src/cloudflare/resources/workflows/instances/instances.py">create</a>(workflow_name, \*, account_id, \*\*<a href="src/cloudflare/types/workflows/instance_create_params.py">params</a>) -> <a href="./src/cloudflare/types/workflows/instance_create_response.py">InstanceCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/workflows/{workflow_name}/instances">client.workflows.instances.<a href="./src/cloudflare/resources/workflows/instances/instances.py">list</a>(workflow_name, \*, account_id, \*\*<a href="src/cloudflare/types/workflows/instance_list_params.py">params</a>) -> <a href="./src/cloudflare/types/workflows/instance_list_response.py">SyncV4PagePaginationArray[InstanceListResponse]</a></code>
+- <code title="post /accounts/{account_id}/workflows/{workflow_name}/instances/batch">client.workflows.instances.<a href="./src/cloudflare/resources/workflows/instances/instances.py">bulk</a>(workflow_name, \*, account_id, \*\*<a href="src/cloudflare/types/workflows/instance_bulk_params.py">params</a>) -> <a href="./src/cloudflare/types/workflows/instance_bulk_response.py">SyncSinglePage[InstanceBulkResponse]</a></code>
+- <code title="get /accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}">client.workflows.instances.<a href="./src/cloudflare/resources/workflows/instances/instances.py">get</a>(instance_id, \*, account_id, workflow_name) -> <a href="./src/cloudflare/types/workflows/instance_get_response.py">InstanceGetResponse</a></code>
 
-#### HTTPProtocol
+### Status
 
 Types:
 
 ```python
-from cloudflare.types.radar.http.locations import HTTPProtocolGetResponse
+from cloudflare.types.workflows.instances import StatusEditResponse
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/locations/http_protocol/{http_protocol}">client.radar.http.locations.http_protocol.<a href="./src/cloudflare/resources/radar/http/locations/http_protocol.py">get</a>(http_protocol, \*\*<a href="src/cloudflare/types/radar/http/locations/http_protocol_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/locations/http_protocol_get_response.py">HTTPProtocolGetResponse</a></code>
+- <code title="patch /accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}/status">client.workflows.instances.status.<a href="./src/cloudflare/resources/workflows/instances/status.py">edit</a>(instance_id, \*, account_id, workflow_name, \*\*<a href="src/cloudflare/types/workflows/instances/status_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/workflows/instances/status_edit_response.py">StatusEditResponse</a></code>
 
-#### HTTPMethod
+### Events
+
+Methods:
+
+- <code title="post /accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}/events/{event_type}">client.workflows.instances.events.<a href="./src/cloudflare/resources/workflows/instances/events.py">create</a>(event_type, \*, account_id, workflow_name, instance_id, \*\*<a href="src/cloudflare/types/workflows/instances/event_create_params.py">params</a>) -> object</code>
+
+## Versions
 
 Types:
 
 ```python
-from cloudflare.types.radar.http.locations import HTTPMethodGetResponse
+from cloudflare.types.workflows import VersionListResponse, VersionGetResponse
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/locations/http_version/{http_version}">client.radar.http.locations.http_method.<a href="./src/cloudflare/resources/radar/http/locations/http_method.py">get</a>(http_version, \*\*<a href="src/cloudflare/types/radar/http/locations/http_method_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/locations/http_method_get_response.py">HTTPMethodGetResponse</a></code>
+- <code title="get /accounts/{account_id}/workflows/{workflow_name}/versions">client.workflows.versions.<a href="./src/cloudflare/resources/workflows/versions.py">list</a>(workflow_name, \*, account_id, \*\*<a href="src/cloudflare/types/workflows/version_list_params.py">params</a>) -> <a href="./src/cloudflare/types/workflows/version_list_response.py">SyncV4PagePaginationArray[VersionListResponse]</a></code>
+- <code title="get /accounts/{account_id}/workflows/{workflow_name}/versions/{version_id}">client.workflows.versions.<a href="./src/cloudflare/resources/workflows/versions.py">get</a>(version_id, \*, account_id, workflow_name) -> <a href="./src/cloudflare/types/workflows/version_get_response.py">VersionGetResponse</a></code>
 
-#### IPVersion
+# ResourceSharing
 
 Types:
 
 ```python
-from cloudflare.types.radar.http.locations import IPVersionGetResponse
+from cloudflare.types.resource_sharing import (
+    ResourceSharingCreateResponse,
+    ResourceSharingUpdateResponse,
+    ResourceSharingListResponse,
+    ResourceSharingDeleteResponse,
+    ResourceSharingGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/locations/ip_version/{ip_version}">client.radar.http.locations.ip_version.<a href="./src/cloudflare/resources/radar/http/locations/ip_version.py">get</a>(ip_version, \*\*<a href="src/cloudflare/types/radar/http/locations/ip_version_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/locations/ip_version_get_response.py">IPVersionGetResponse</a></code>
+- <code title="post /accounts/{account_id}/shares">client.resource_sharing.<a href="./src/cloudflare/resources/resource_sharing/resource_sharing.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/resource_sharing/resource_sharing_create_params.py">params</a>) -> <a href="./src/cloudflare/types/resource_sharing/resource_sharing_create_response.py">Optional[ResourceSharingCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/shares/{share_id}">client.resource_sharing.<a href="./src/cloudflare/resources/resource_sharing/resource_sharing.py">update</a>(share_id, \*, account_id, \*\*<a href="src/cloudflare/types/resource_sharing/resource_sharing_update_params.py">params</a>) -> <a href="./src/cloudflare/types/resource_sharing/resource_sharing_update_response.py">Optional[ResourceSharingUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/shares">client.resource_sharing.<a href="./src/cloudflare/resources/resource_sharing/resource_sharing.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/resource_sharing/resource_sharing_list_params.py">params</a>) -> <a href="./src/cloudflare/types/resource_sharing/resource_sharing_list_response.py">SyncV4PagePaginationArray[ResourceSharingListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/shares/{share_id}">client.resource_sharing.<a href="./src/cloudflare/resources/resource_sharing/resource_sharing.py">delete</a>(share_id, \*, account_id) -> <a href="./src/cloudflare/types/resource_sharing/resource_sharing_delete_response.py">Optional[ResourceSharingDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/shares/{share_id}">client.resource_sharing.<a href="./src/cloudflare/resources/resource_sharing/resource_sharing.py">get</a>(share_id, \*, account_id, \*\*<a href="src/cloudflare/types/resource_sharing/resource_sharing_get_params.py">params</a>) -> <a href="./src/cloudflare/types/resource_sharing/resource_sharing_get_response.py">Optional[ResourceSharingGetResponse]</a></code>
 
-#### OS
+## Recipients
 
 Types:
 
 ```python
-from cloudflare.types.radar.http.locations import OSGetResponse
+from cloudflare.types.resource_sharing import (
+    RecipientCreateResponse,
+    RecipientListResponse,
+    RecipientDeleteResponse,
+    RecipientGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/locations/os/{os}">client.radar.http.locations.os.<a href="./src/cloudflare/resources/radar/http/locations/os.py">get</a>(os, \*\*<a href="src/cloudflare/types/radar/http/locations/os_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/locations/os_get_response.py">OSGetResponse</a></code>
+- <code title="post /accounts/{account_id}/shares/{share_id}/recipients">client.resource_sharing.recipients.<a href="./src/cloudflare/resources/resource_sharing/recipients.py">create</a>(share_id, \*, path_account_id, \*\*<a href="src/cloudflare/types/resource_sharing/recipient_create_params.py">params</a>) -> <a href="./src/cloudflare/types/resource_sharing/recipient_create_response.py">Optional[RecipientCreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/shares/{share_id}/recipients">client.resource_sharing.recipients.<a href="./src/cloudflare/resources/resource_sharing/recipients.py">list</a>(share_id, \*, account_id, \*\*<a href="src/cloudflare/types/resource_sharing/recipient_list_params.py">params</a>) -> <a href="./src/cloudflare/types/resource_sharing/recipient_list_response.py">SyncV4PagePaginationArray[RecipientListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/shares/{share_id}/recipients/{recipient_id}">client.resource_sharing.recipients.<a href="./src/cloudflare/resources/resource_sharing/recipients.py">delete</a>(recipient_id, \*, account_id, share_id) -> <a href="./src/cloudflare/types/resource_sharing/recipient_delete_response.py">Optional[RecipientDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/shares/{share_id}/recipients/{recipient_id}">client.resource_sharing.recipients.<a href="./src/cloudflare/resources/resource_sharing/recipients.py">get</a>(recipient_id, \*, account_id, share_id, \*\*<a href="src/cloudflare/types/resource_sharing/recipient_get_params.py">params</a>) -> <a href="./src/cloudflare/types/resource_sharing/recipient_get_response.py">Optional[RecipientGetResponse]</a></code>
 
-#### TLSVersion
+## Resources
 
 Types:
 
 ```python
-from cloudflare.types.radar.http.locations import TLSVersionGetResponse
+from cloudflare.types.resource_sharing import (
+    ResourceCreateResponse,
+    ResourceUpdateResponse,
+    ResourceListResponse,
+    ResourceDeleteResponse,
+    ResourceGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/locations/tls_version/{tls_version}">client.radar.http.locations.tls_version.<a href="./src/cloudflare/resources/radar/http/locations/tls_version.py">get</a>(tls_version, \*\*<a href="src/cloudflare/types/radar/http/locations/tls_version_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/locations/tls_version_get_response.py">TLSVersionGetResponse</a></code>
+- <code title="post /accounts/{account_id}/shares/{share_id}/resources">client.resource_sharing.resources.<a href="./src/cloudflare/resources/resource_sharing/resources.py">create</a>(share_id, \*, account_id, \*\*<a href="src/cloudflare/types/resource_sharing/resource_create_params.py">params</a>) -> <a href="./src/cloudflare/types/resource_sharing/resource_create_response.py">Optional[ResourceCreateResponse]</a></code>
+- <code title="put /accounts/{account_id}/shares/{share_id}/resources/{resource_id}">client.resource_sharing.resources.<a href="./src/cloudflare/resources/resource_sharing/resources.py">update</a>(resource_id, \*, account_id, share_id, \*\*<a href="src/cloudflare/types/resource_sharing/resource_update_params.py">params</a>) -> <a href="./src/cloudflare/types/resource_sharing/resource_update_response.py">Optional[ResourceUpdateResponse]</a></code>
+- <code title="get /accounts/{account_id}/shares/{share_id}/resources">client.resource_sharing.resources.<a href="./src/cloudflare/resources/resource_sharing/resources.py">list</a>(share_id, \*, account_id, \*\*<a href="src/cloudflare/types/resource_sharing/resource_list_params.py">params</a>) -> <a href="./src/cloudflare/types/resource_sharing/resource_list_response.py">SyncV4PagePaginationArray[ResourceListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/shares/{share_id}/resources/{resource_id}">client.resource_sharing.resources.<a href="./src/cloudflare/resources/resource_sharing/resources.py">delete</a>(resource_id, \*, account_id, share_id) -> <a href="./src/cloudflare/types/resource_sharing/resource_delete_response.py">Optional[ResourceDeleteResponse]</a></code>
+- <code title="get /accounts/{account_id}/shares/{share_id}/resources/{resource_id}">client.resource_sharing.resources.<a href="./src/cloudflare/resources/resource_sharing/resources.py">get</a>(resource_id, \*, account_id, share_id) -> <a href="./src/cloudflare/types/resource_sharing/resource_get_response.py">Optional[ResourceGetResponse]</a></code>
 
-#### BrowserFamily
+# LeakedCredentialChecks
 
 Types:
 
 ```python
-from cloudflare.types.radar.http.locations import BrowserFamilyGetResponse
+from cloudflare.types.leaked_credential_checks import (
+    LeakedCredentialCheckCreateResponse,
+    LeakedCredentialCheckGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/locations/browser_family/{browser_family}">client.radar.http.locations.browser_family.<a href="./src/cloudflare/resources/radar/http/locations/browser_family.py">get</a>(browser_family, \*\*<a href="src/cloudflare/types/radar/http/locations/browser_family_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/locations/browser_family_get_response.py">BrowserFamilyGetResponse</a></code>
+- <code title="post /zones/{zone_id}/leaked-credential-checks">client.leaked_credential_checks.<a href="./src/cloudflare/resources/leaked_credential_checks/leaked_credential_checks.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/leaked_credential_checks/leaked_credential_check_create_params.py">params</a>) -> <a href="./src/cloudflare/types/leaked_credential_checks/leaked_credential_check_create_response.py">LeakedCredentialCheckCreateResponse</a></code>
+- <code title="get /zones/{zone_id}/leaked-credential-checks">client.leaked_credential_checks.<a href="./src/cloudflare/resources/leaked_credential_checks/leaked_credential_checks.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/leaked_credential_checks/leaked_credential_check_get_response.py">LeakedCredentialCheckGetResponse</a></code>
 
-### Ases
+## Detections
 
 Types:
 
 ```python
-from cloudflare.types.radar.http import AseGetResponse
+from cloudflare.types.leaked_credential_checks import (
+    DetectionCreateResponse,
+    DetectionUpdateResponse,
+    DetectionListResponse,
+    DetectionGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/ases">client.radar.http.ases.<a href="./src/cloudflare/resources/radar/http/ases/ases.py">get</a>(\*\*<a href="src/cloudflare/types/radar/http/ase_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/ase_get_response.py">AseGetResponse</a></code>
+- <code title="post /zones/{zone_id}/leaked-credential-checks/detections">client.leaked_credential_checks.detections.<a href="./src/cloudflare/resources/leaked_credential_checks/detections.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/leaked_credential_checks/detection_create_params.py">params</a>) -> <a href="./src/cloudflare/types/leaked_credential_checks/detection_create_response.py">DetectionCreateResponse</a></code>
+- <code title="put /zones/{zone_id}/leaked-credential-checks/detections/{detection_id}">client.leaked_credential_checks.detections.<a href="./src/cloudflare/resources/leaked_credential_checks/detections.py">update</a>(detection_id, \*, zone_id, \*\*<a href="src/cloudflare/types/leaked_credential_checks/detection_update_params.py">params</a>) -> <a href="./src/cloudflare/types/leaked_credential_checks/detection_update_response.py">DetectionUpdateResponse</a></code>
+- <code title="get /zones/{zone_id}/leaked-credential-checks/detections">client.leaked_credential_checks.detections.<a href="./src/cloudflare/resources/leaked_credential_checks/detections.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/leaked_credential_checks/detection_list_response.py">SyncSinglePage[DetectionListResponse]</a></code>
+- <code title="delete /zones/{zone_id}/leaked-credential-checks/detections/{detection_id}">client.leaked_credential_checks.detections.<a href="./src/cloudflare/resources/leaked_credential_checks/detections.py">delete</a>(detection_id, \*, zone_id) -> object</code>
+- <code title="get /zones/{zone_id}/leaked-credential-checks/detections/{detection_id}">client.leaked_credential_checks.detections.<a href="./src/cloudflare/resources/leaked_credential_checks/detections.py">get</a>(detection_id, \*, zone_id) -> <a href="./src/cloudflare/types/leaked_credential_checks/detection_get_response.py">DetectionGetResponse</a></code>
 
-#### BotClass
+# ContentScanning
 
 Types:
 
 ```python
-from cloudflare.types.radar.http.ases import BotClassGetResponse
+from cloudflare.types.content_scanning import (
+    ContentScanningCreateResponse,
+    ContentScanningUpdateResponse,
+    ContentScanningGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/ases/bot_class/{bot_class}">client.radar.http.ases.bot_class.<a href="./src/cloudflare/resources/radar/http/ases/bot_class.py">get</a>(bot_class, \*\*<a href="src/cloudflare/types/radar/http/ases/bot_class_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/ases/bot_class_get_response.py">BotClassGetResponse</a></code>
+- <code title="put /zones/{zone_id}/content-upload-scan/settings">client.content_scanning.<a href="./src/cloudflare/resources/content_scanning/content_scanning.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/content_scanning/content_scanning_create_params.py">params</a>) -> <a href="./src/cloudflare/types/content_scanning/content_scanning_create_response.py">ContentScanningCreateResponse</a></code>
+- <code title="put /zones/{zone_id}/content-upload-scan/settings">client.content_scanning.<a href="./src/cloudflare/resources/content_scanning/content_scanning.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/content_scanning/content_scanning_update_params.py">params</a>) -> <a href="./src/cloudflare/types/content_scanning/content_scanning_update_response.py">ContentScanningUpdateResponse</a></code>
+- <code title="post /zones/{zone_id}/content-upload-scan/disable">client.content_scanning.<a href="./src/cloudflare/resources/content_scanning/content_scanning.py">disable</a>(\*, zone_id) -> object</code>
+- <code title="post /zones/{zone_id}/content-upload-scan/enable">client.content_scanning.<a href="./src/cloudflare/resources/content_scanning/content_scanning.py">enable</a>(\*, zone_id) -> object</code>
+- <code title="get /zones/{zone_id}/content-upload-scan/settings">client.content_scanning.<a href="./src/cloudflare/resources/content_scanning/content_scanning.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/content_scanning/content_scanning_get_response.py">ContentScanningGetResponse</a></code>
 
-#### DeviceType
+## Payloads
 
 Types:
 
 ```python
-from cloudflare.types.radar.http.ases import DeviceTypeGetResponse
+from cloudflare.types.content_scanning import (
+    PayloadCreateResponse,
+    PayloadListResponse,
+    PayloadDeleteResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/ases/device_type/{device_type}">client.radar.http.ases.device_type.<a href="./src/cloudflare/resources/radar/http/ases/device_type.py">get</a>(device_type, \*\*<a href="src/cloudflare/types/radar/http/ases/device_type_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/ases/device_type_get_response.py">DeviceTypeGetResponse</a></code>
+- <code title="post /zones/{zone_id}/content-upload-scan/payloads">client.content_scanning.payloads.<a href="./src/cloudflare/resources/content_scanning/payloads.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/content_scanning/payload_create_params.py">params</a>) -> <a href="./src/cloudflare/types/content_scanning/payload_create_response.py">SyncSinglePage[PayloadCreateResponse]</a></code>
+- <code title="get /zones/{zone_id}/content-upload-scan/payloads">client.content_scanning.payloads.<a href="./src/cloudflare/resources/content_scanning/payloads.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/content_scanning/payload_list_response.py">SyncSinglePage[PayloadListResponse]</a></code>
+- <code title="delete /zones/{zone_id}/content-upload-scan/payloads/{expression_id}">client.content_scanning.payloads.<a href="./src/cloudflare/resources/content_scanning/payloads.py">delete</a>(expression_id, \*, zone_id) -> <a href="./src/cloudflare/types/content_scanning/payload_delete_response.py">SyncSinglePage[PayloadDeleteResponse]</a></code>
 
-#### HTTPProtocol
+## Settings
 
 Types:
 
 ```python
-from cloudflare.types.radar.http.ases import HTTPProtocolGetResponse
+from cloudflare.types.content_scanning import SettingGetResponse
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/ases/http_protocol/{http_protocol}">client.radar.http.ases.http_protocol.<a href="./src/cloudflare/resources/radar/http/ases/http_protocol.py">get</a>(http_protocol, \*\*<a href="src/cloudflare/types/radar/http/ases/http_protocol_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/ases/http_protocol_get_response.py">HTTPProtocolGetResponse</a></code>
+- <code title="get /zones/{zone_id}/content-upload-scan/settings">client.content_scanning.settings.<a href="./src/cloudflare/resources/content_scanning/settings.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/content_scanning/setting_get_response.py">SettingGetResponse</a></code>
 
-#### HTTPMethod
+# AbuseReports
 
 Types:
 
 ```python
-from cloudflare.types.radar.http.ases import HTTPMethodGetResponse
+from cloudflare.types.abuse_reports import (
+    AbuseReportCreateResponse,
+    AbuseReportListResponse,
+    AbuseReportGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/ases/http_version/{http_version}">client.radar.http.ases.http_method.<a href="./src/cloudflare/resources/radar/http/ases/http_method.py">get</a>(http_version, \*\*<a href="src/cloudflare/types/radar/http/ases/http_method_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/ases/http_method_get_response.py">HTTPMethodGetResponse</a></code>
+- <code title="post /accounts/{account_id}/abuse-reports/{report_param}">client.abuse_reports.<a href="./src/cloudflare/resources/abuse_reports/abuse_reports.py">create</a>(report_param, \*, account_id, \*\*<a href="src/cloudflare/types/abuse_reports/abuse_report_create_params.py">params</a>) -> <a href="./src/cloudflare/types/abuse_reports/abuse_report_create_response.py">str</a></code>
+- <code title="get /accounts/{account_id}/abuse-reports">client.abuse_reports.<a href="./src/cloudflare/resources/abuse_reports/abuse_reports.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/abuse_reports/abuse_report_list_params.py">params</a>) -> <a href="./src/cloudflare/types/abuse_reports/abuse_report_list_response.py">SyncV4PagePagination[Optional[AbuseReportListResponse]]</a></code>
+- <code title="get /accounts/{account_id}/abuse-reports/{report_param}">client.abuse_reports.<a href="./src/cloudflare/resources/abuse_reports/abuse_reports.py">get</a>(report_param, \*, account_id) -> <a href="./src/cloudflare/types/abuse_reports/abuse_report_get_response.py">AbuseReportGetResponse</a></code>
 
-#### IPVersion
+## Mitigations
 
 Types:
 
 ```python
-from cloudflare.types.radar.http.ases import IPVersionGetResponse
+from cloudflare.types.abuse_reports import MitigationListResponse, MitigationReviewResponse
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/ases/ip_version/{ip_version}">client.radar.http.ases.ip_version.<a href="./src/cloudflare/resources/radar/http/ases/ip_version.py">get</a>(ip_version, \*\*<a href="src/cloudflare/types/radar/http/ases/ip_version_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/ases/ip_version_get_response.py">IPVersionGetResponse</a></code>
+- <code title="get /accounts/{account_id}/abuse-reports/{report_id}/mitigations">client.abuse_reports.mitigations.<a href="./src/cloudflare/resources/abuse_reports/mitigations.py">list</a>(report_id, \*, account_id, \*\*<a href="src/cloudflare/types/abuse_reports/mitigation_list_params.py">params</a>) -> <a href="./src/cloudflare/types/abuse_reports/mitigation_list_response.py">SyncV4PagePagination[Optional[MitigationListResponse]]</a></code>
+- <code title="post /accounts/{account_id}/abuse-reports/{report_id}/mitigations/appeal">client.abuse_reports.mitigations.<a href="./src/cloudflare/resources/abuse_reports/mitigations.py">review</a>(report_id, \*, account_id, \*\*<a href="src/cloudflare/types/abuse_reports/mitigation_review_params.py">params</a>) -> <a href="./src/cloudflare/types/abuse_reports/mitigation_review_response.py">SyncSinglePage[MitigationReviewResponse]</a></code>
 
-#### OS
+# AI
 
 Types:
 
 ```python
-from cloudflare.types.radar.http.ases import OSGetResponse
+from cloudflare.types.ai import AIRunResponse
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/ases/os/{os}">client.radar.http.ases.os.<a href="./src/cloudflare/resources/radar/http/ases/os.py">get</a>(os, \*\*<a href="src/cloudflare/types/radar/http/ases/os_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/ases/os_get_response.py">OSGetResponse</a></code>
+- <code title="post /accounts/{account_id}/ai/run/{model_name}">client.ai.<a href="./src/cloudflare/resources/ai/ai.py">run</a>(model_name, \*, account_id, \*\*<a href="src/cloudflare/types/ai/ai_run_params.py">params</a>) -> <a href="./src/cloudflare/types/ai/ai_run_response.py">Optional[AIRunResponse]</a></code>
 
-#### TLSVersion
+## Finetunes
 
 Types:
 
 ```python
-from cloudflare.types.radar.http.ases import TLSVersionGetResponse
+from cloudflare.types.ai import FinetuneCreateResponse, FinetuneListResponse
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/ases/tls_version/{tls_version}">client.radar.http.ases.tls_version.<a href="./src/cloudflare/resources/radar/http/ases/tls_version.py">get</a>(tls_version, \*\*<a href="src/cloudflare/types/radar/http/ases/tls_version_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/ases/tls_version_get_response.py">TLSVersionGetResponse</a></code>
+- <code title="post /accounts/{account_id}/ai/finetunes">client.ai.finetunes.<a href="./src/cloudflare/resources/ai/finetunes/finetunes.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/ai/finetune_create_params.py">params</a>) -> <a href="./src/cloudflare/types/ai/finetune_create_response.py">FinetuneCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/ai/finetunes">client.ai.finetunes.<a href="./src/cloudflare/resources/ai/finetunes/finetunes.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/ai/finetune_list_response.py">FinetuneListResponse</a></code>
 
-#### BrowserFamily
+### Assets
 
 Types:
 
 ```python
-from cloudflare.types.radar.http.ases import BrowserFamilyGetResponse
+from cloudflare.types.ai.finetunes import AssetCreateResponse
 ```
 
 Methods:
 
-- <code title="get /radar/http/top/ases/browser_family/{browser_family}">client.radar.http.ases.browser_family.<a href="./src/cloudflare/resources/radar/http/ases/browser_family.py">get</a>(browser_family, \*\*<a href="src/cloudflare/types/radar/http/ases/browser_family_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/ases/browser_family_get_response.py">BrowserFamilyGetResponse</a></code>
+- <code title="post /accounts/{account_id}/ai/finetunes/{finetune_id}/finetune-assets">client.ai.finetunes.assets.<a href="./src/cloudflare/resources/ai/finetunes/assets.py">create</a>(finetune_id, \*, account_id, \*\*<a href="src/cloudflare/types/ai/finetunes/asset_create_params.py">params</a>) -> <a href="./src/cloudflare/types/ai/finetunes/asset_create_response.py">AssetCreateResponse</a></code>
 
-### Summary
+### Public
 
 Types:
 
 ```python
-from cloudflare.types.radar.http import (
-    SummaryBotClassResponse,
-    SummaryDeviceTypeResponse,
-    SummaryHTTPProtocolResponse,
-    SummaryHTTPVersionResponse,
-    SummaryIPVersionResponse,
-    SummaryOSResponse,
-    SummaryPostQuantumResponse,
-    SummaryTLSVersionResponse,
-)
+from cloudflare.types.ai.finetunes import PublicListResponse
 ```
 
 Methods:
 
-- <code title="get /radar/http/summary/bot_class">client.radar.http.summary.<a href="./src/cloudflare/resources/radar/http/summary.py">bot_class</a>(\*\*<a href="src/cloudflare/types/radar/http/summary_bot_class_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/summary_bot_class_response.py">SummaryBotClassResponse</a></code>
-- <code title="get /radar/http/summary/device_type">client.radar.http.summary.<a href="./src/cloudflare/resources/radar/http/summary.py">device_type</a>(\*\*<a href="src/cloudflare/types/radar/http/summary_device_type_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/summary_device_type_response.py">SummaryDeviceTypeResponse</a></code>
-- <code title="get /radar/http/summary/http_protocol">client.radar.http.summary.<a href="./src/cloudflare/resources/radar/http/summary.py">http_protocol</a>(\*\*<a href="src/cloudflare/types/radar/http/summary_http_protocol_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/summary_http_protocol_response.py">SummaryHTTPProtocolResponse</a></code>
-- <code title="get /radar/http/summary/http_version">client.radar.http.summary.<a href="./src/cloudflare/resources/radar/http/summary.py">http_version</a>(\*\*<a href="src/cloudflare/types/radar/http/summary_http_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/summary_http_version_response.py">SummaryHTTPVersionResponse</a></code>
-- <code title="get /radar/http/summary/ip_version">client.radar.http.summary.<a href="./src/cloudflare/resources/radar/http/summary.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/http/summary_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/summary_ip_version_response.py">SummaryIPVersionResponse</a></code>
-- <code title="get /radar/http/summary/os">client.radar.http.summary.<a href="./src/cloudflare/resources/radar/http/summary.py">os</a>(\*\*<a href="src/cloudflare/types/radar/http/summary_os_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/summary_os_response.py">SummaryOSResponse</a></code>
-- <code title="get /radar/http/summary/post_quantum">client.radar.http.summary.<a href="./src/cloudflare/resources/radar/http/summary.py">post_quantum</a>(\*\*<a href="src/cloudflare/types/radar/http/summary_post_quantum_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/summary_post_quantum_response.py">SummaryPostQuantumResponse</a></code>
-- <code title="get /radar/http/summary/tls_version">client.radar.http.summary.<a href="./src/cloudflare/resources/radar/http/summary.py">tls_version</a>(\*\*<a href="src/cloudflare/types/radar/http/summary_tls_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/summary_tls_version_response.py">SummaryTLSVersionResponse</a></code>
+- <code title="get /accounts/{account_id}/ai/finetunes/public">client.ai.finetunes.public.<a href="./src/cloudflare/resources/ai/finetunes/public.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/ai/finetunes/public_list_params.py">params</a>) -> <a href="./src/cloudflare/types/ai/finetunes/public_list_response.py">SyncSinglePage[PublicListResponse]</a></code>
 
-### TimeseriesGroups
+## Authors
 
-Types:
+Methods:
 
-```python
-from cloudflare.types.radar.http import (
-    TimeseriesGroupBotClassResponse,
-    TimeseriesGroupBrowserResponse,
-    TimeseriesGroupBrowserFamilyResponse,
-    TimeseriesGroupDeviceTypeResponse,
-    TimeseriesGroupHTTPProtocolResponse,
-    TimeseriesGroupHTTPVersionResponse,
-    TimeseriesGroupIPVersionResponse,
-    TimeseriesGroupOSResponse,
-    TimeseriesGroupPostQuantumResponse,
-    TimeseriesGroupTLSVersionResponse,
-)
-```
+- <code title="get /accounts/{account_id}/ai/authors/search">client.ai.authors.<a href="./src/cloudflare/resources/ai/authors.py">list</a>(\*, account_id) -> SyncSinglePage[object]</code>
+
+## Tasks
 
 Methods:
 
-- <code title="get /radar/http/timeseries_groups/bot_class">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">bot_class</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_bot_class_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_bot_class_response.py">TimeseriesGroupBotClassResponse</a></code>
-- <code title="get /radar/http/timeseries_groups/browser">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">browser</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_browser_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_browser_response.py">TimeseriesGroupBrowserResponse</a></code>
-- <code title="get /radar/http/timeseries_groups/browser_family">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">browser_family</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_browser_family_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_browser_family_response.py">TimeseriesGroupBrowserFamilyResponse</a></code>
-- <code title="get /radar/http/timeseries_groups/device_type">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">device_type</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_device_type_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_device_type_response.py">TimeseriesGroupDeviceTypeResponse</a></code>
-- <code title="get /radar/http/timeseries_groups/http_protocol">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">http_protocol</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_http_protocol_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_http_protocol_response.py">TimeseriesGroupHTTPProtocolResponse</a></code>
-- <code title="get /radar/http/timeseries_groups/http_version">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">http_version</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_http_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_http_version_response.py">TimeseriesGroupHTTPVersionResponse</a></code>
-- <code title="get /radar/http/timeseries_groups/ip_version">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">ip_version</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_ip_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_ip_version_response.py">TimeseriesGroupIPVersionResponse</a></code>
-- <code title="get /radar/http/timeseries_groups/os">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">os</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_os_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_os_response.py">TimeseriesGroupOSResponse</a></code>
-- <code title="get /radar/http/timeseries_groups/post_quantum">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">post_quantum</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_post_quantum_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_post_quantum_response.py">TimeseriesGroupPostQuantumResponse</a></code>
-- <code title="get /radar/http/timeseries_groups/tls_version">client.radar.http.timeseries_groups.<a href="./src/cloudflare/resources/radar/http/timeseries_groups.py">tls_version</a>(\*\*<a href="src/cloudflare/types/radar/http/timeseries_group_tls_version_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/http/timeseries_group_tls_version_response.py">TimeseriesGroupTLSVersionResponse</a></code>
+- <code title="get /accounts/{account_id}/ai/tasks/search">client.ai.tasks.<a href="./src/cloudflare/resources/ai/tasks.py">list</a>(\*, account_id) -> SyncSinglePage[object]</code>
 
-## Quality
+## Models
 
-### IQI
+Methods:
 
-Types:
+- <code title="get /accounts/{account_id}/ai/models/search">client.ai.models.<a href="./src/cloudflare/resources/ai/models/models.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/ai/model_list_params.py">params</a>) -> SyncV4PagePaginationArray[object]</code>
 
-```python
-from cloudflare.types.radar.quality import IQISummaryResponse, IQITimeseriesGroupsResponse
-```
+### Schema
 
 Methods:
 
-- <code title="get /radar/quality/iqi/summary">client.radar.quality.iqi.<a href="./src/cloudflare/resources/radar/quality/iqi.py">summary</a>(\*\*<a href="src/cloudflare/types/radar/quality/iqi_summary_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/quality/iqi_summary_response.py">IQISummaryResponse</a></code>
-- <code title="get /radar/quality/iqi/timeseries_groups">client.radar.quality.iqi.<a href="./src/cloudflare/resources/radar/quality/iqi.py">timeseries_groups</a>(\*\*<a href="src/cloudflare/types/radar/quality/iqi_timeseries_groups_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/quality/iqi_timeseries_groups_response.py">IQITimeseriesGroupsResponse</a></code>
+- <code title="get /accounts/{account_id}/ai/models/schema">client.ai.models.schema.<a href="./src/cloudflare/resources/ai/models/schema.py">get</a>(\*, account_id, \*\*<a href="src/cloudflare/types/ai/models/schema_get_params.py">params</a>) -> object</code>
 
-### Speed
+## ToMarkdown
 
 Types:
 
 ```python
-from cloudflare.types.radar.quality import SpeedHistogramResponse, SpeedSummaryResponse
+from cloudflare.types.ai import ToMarkdownSupportedResponse, ToMarkdownTransformResponse
 ```
 
 Methods:
 
-- <code title="get /radar/quality/speed/histogram">client.radar.quality.speed.<a href="./src/cloudflare/resources/radar/quality/speed/speed.py">histogram</a>(\*\*<a href="src/cloudflare/types/radar/quality/speed_histogram_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/quality/speed_histogram_response.py">SpeedHistogramResponse</a></code>
-- <code title="get /radar/quality/speed/summary">client.radar.quality.speed.<a href="./src/cloudflare/resources/radar/quality/speed/speed.py">summary</a>(\*\*<a href="src/cloudflare/types/radar/quality/speed_summary_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/quality/speed_summary_response.py">SpeedSummaryResponse</a></code>
+- <code title="get /accounts/{account_id}/ai/tomarkdown/supported">client.ai.to_markdown.<a href="./src/cloudflare/resources/ai/to_markdown.py">supported</a>(\*, account_id) -> <a href="./src/cloudflare/types/ai/to_markdown_supported_response.py">SyncSinglePage[ToMarkdownSupportedResponse]</a></code>
+- <code title="post /accounts/{account_id}/ai/tomarkdown">client.ai.to_markdown.<a href="./src/cloudflare/resources/ai/to_markdown.py">transform</a>(\*, account_id, \*\*<a href="src/cloudflare/types/ai/to_markdown_transform_params.py">params</a>) -> <a href="./src/cloudflare/types/ai/to_markdown_transform_response.py">SyncSinglePage[ToMarkdownTransformResponse]</a></code>
 
-#### Top
+# AISearch
+
+## Instances
 
 Types:
 
 ```python
-from cloudflare.types.radar.quality.speed import TopAsesResponse, TopLocationsResponse
+from cloudflare.types.aisearch import (
+    InstanceCreateResponse,
+    InstanceUpdateResponse,
+    InstanceListResponse,
+    InstanceDeleteResponse,
+    InstanceChatCompletionsResponse,
+    InstanceReadResponse,
+    InstanceSearchResponse,
+    InstanceStatsResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/quality/speed/top/ases">client.radar.quality.speed.top.<a href="./src/cloudflare/resources/radar/quality/speed/top.py">ases</a>(\*\*<a href="src/cloudflare/types/radar/quality/speed/top_ases_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/quality/speed/top_ases_response.py">TopAsesResponse</a></code>
-- <code title="get /radar/quality/speed/top/locations">client.radar.quality.speed.top.<a href="./src/cloudflare/resources/radar/quality/speed/top.py">locations</a>(\*\*<a href="src/cloudflare/types/radar/quality/speed/top_locations_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/quality/speed/top_locations_response.py">TopLocationsResponse</a></code>
+- <code title="post /accounts/{account_id}/ai-search/instances">client.aisearch.instances.<a href="./src/cloudflare/resources/aisearch/instances/instances.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/aisearch/instance_create_params.py">params</a>) -> <a href="./src/cloudflare/types/aisearch/instance_create_response.py">InstanceCreateResponse</a></code>
+- <code title="put /accounts/{account_id}/ai-search/instances/{id}">client.aisearch.instances.<a href="./src/cloudflare/resources/aisearch/instances/instances.py">update</a>(id, \*, account_id, \*\*<a href="src/cloudflare/types/aisearch/instance_update_params.py">params</a>) -> <a href="./src/cloudflare/types/aisearch/instance_update_response.py">InstanceUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-search/instances">client.aisearch.instances.<a href="./src/cloudflare/resources/aisearch/instances/instances.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/aisearch/instance_list_params.py">params</a>) -> <a href="./src/cloudflare/types/aisearch/instance_list_response.py">SyncV4PagePaginationArray[InstanceListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/ai-search/instances/{id}">client.aisearch.instances.<a href="./src/cloudflare/resources/aisearch/instances/instances.py">delete</a>(id, \*, account_id) -> <a href="./src/cloudflare/types/aisearch/instance_delete_response.py">InstanceDeleteResponse</a></code>
+- <code title="post /accounts/{account_id}/ai-search/instances/{id}/chat/completions">client.aisearch.instances.<a href="./src/cloudflare/resources/aisearch/instances/instances.py">chat_completions</a>(id, \*, account_id, \*\*<a href="src/cloudflare/types/aisearch/instance_chat_completions_params.py">params</a>) -> <a href="./src/cloudflare/types/aisearch/instance_chat_completions_response.py">InstanceChatCompletionsResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-search/instances/{id}">client.aisearch.instances.<a href="./src/cloudflare/resources/aisearch/instances/instances.py">read</a>(id, \*, account_id) -> <a href="./src/cloudflare/types/aisearch/instance_read_response.py">InstanceReadResponse</a></code>
+- <code title="post /accounts/{account_id}/ai-search/instances/{id}/search">client.aisearch.instances.<a href="./src/cloudflare/resources/aisearch/instances/instances.py">search</a>(id, \*, account_id, \*\*<a href="src/cloudflare/types/aisearch/instance_search_params.py">params</a>) -> <a href="./src/cloudflare/types/aisearch/instance_search_response.py">InstanceSearchResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-search/instances/{id}/stats">client.aisearch.instances.<a href="./src/cloudflare/resources/aisearch/instances/instances.py">stats</a>(id, \*, account_id) -> <a href="./src/cloudflare/types/aisearch/instance_stats_response.py">InstanceStatsResponse</a></code>
 
-## Ranking
+### Items
 
 Types:
 
 ```python
-from cloudflare.types.radar import RankingTimeseriesGroupsResponse, RankingTopResponse
+from cloudflare.types.aisearch.instances import ItemListResponse, ItemGetResponse
 ```
 
 Methods:
 
-- <code title="get /radar/ranking/timeseries_groups">client.radar.ranking.<a href="./src/cloudflare/resources/radar/ranking/ranking.py">timeseries_groups</a>(\*\*<a href="src/cloudflare/types/radar/ranking_timeseries_groups_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ranking_timeseries_groups_response.py">RankingTimeseriesGroupsResponse</a></code>
-- <code title="get /radar/ranking/top">client.radar.ranking.<a href="./src/cloudflare/resources/radar/ranking/ranking.py">top</a>(\*\*<a href="src/cloudflare/types/radar/ranking_top_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ranking_top_response.py">RankingTopResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-search/instances/{id}/items">client.aisearch.instances.items.<a href="./src/cloudflare/resources/aisearch/instances/items.py">list</a>(id, \*, account_id, \*\*<a href="src/cloudflare/types/aisearch/instances/item_list_params.py">params</a>) -> <a href="./src/cloudflare/types/aisearch/instances/item_list_response.py">SyncV4PagePaginationArray[ItemListResponse]</a></code>
+- <code title="get /accounts/{account_id}/ai-search/instances/{id}/items/{item_id}">client.aisearch.instances.items.<a href="./src/cloudflare/resources/aisearch/instances/items.py">get</a>(item_id, \*, account_id, id) -> <a href="./src/cloudflare/types/aisearch/instances/item_get_response.py">ItemGetResponse</a></code>
 
-### Domain
+### Jobs
 
 Types:
 
 ```python
-from cloudflare.types.radar.ranking import DomainGetResponse
+from cloudflare.types.aisearch.instances import (
+    JobCreateResponse,
+    JobListResponse,
+    JobGetResponse,
+    JobLogsResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/ranking/domain/{domain}">client.radar.ranking.domain.<a href="./src/cloudflare/resources/radar/ranking/domain.py">get</a>(domain, \*\*<a href="src/cloudflare/types/radar/ranking/domain_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ranking/domain_get_response.py">DomainGetResponse</a></code>
+- <code title="post /accounts/{account_id}/ai-search/instances/{id}/jobs">client.aisearch.instances.jobs.<a href="./src/cloudflare/resources/aisearch/instances/jobs.py">create</a>(id, \*, account_id) -> <a href="./src/cloudflare/types/aisearch/instances/job_create_response.py">JobCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-search/instances/{id}/jobs">client.aisearch.instances.jobs.<a href="./src/cloudflare/resources/aisearch/instances/jobs.py">list</a>(id, \*, account_id, \*\*<a href="src/cloudflare/types/aisearch/instances/job_list_params.py">params</a>) -> <a href="./src/cloudflare/types/aisearch/instances/job_list_response.py">SyncV4PagePaginationArray[JobListResponse]</a></code>
+- <code title="get /accounts/{account_id}/ai-search/instances/{id}/jobs/{job_id}">client.aisearch.instances.jobs.<a href="./src/cloudflare/resources/aisearch/instances/jobs.py">get</a>(job_id, \*, account_id, id) -> <a href="./src/cloudflare/types/aisearch/instances/job_get_response.py">JobGetResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-search/instances/{id}/jobs/{job_id}/logs">client.aisearch.instances.jobs.<a href="./src/cloudflare/resources/aisearch/instances/jobs.py">logs</a>(job_id, \*, account_id, id, \*\*<a href="src/cloudflare/types/aisearch/instances/job_logs_params.py">params</a>) -> <a href="./src/cloudflare/types/aisearch/instances/job_logs_response.py">JobLogsResponse</a></code>
 
-## TrafficAnomalies
+## Tokens
 
 Types:
 
 ```python
-from cloudflare.types.radar import TrafficAnomalyGetResponse
+from cloudflare.types.aisearch import (
+    TokenCreateResponse,
+    TokenUpdateResponse,
+    TokenListResponse,
+    TokenDeleteResponse,
+    TokenReadResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /radar/traffic_anomalies">client.radar.traffic_anomalies.<a href="./src/cloudflare/resources/radar/traffic_anomalies/traffic_anomalies.py">get</a>(\*\*<a href="src/cloudflare/types/radar/traffic_anomaly_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/traffic_anomaly_get_response.py">TrafficAnomalyGetResponse</a></code>
+- <code title="post /accounts/{account_id}/ai-search/tokens">client.aisearch.tokens.<a href="./src/cloudflare/resources/aisearch/tokens.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/aisearch/token_create_params.py">params</a>) -> <a href="./src/cloudflare/types/aisearch/token_create_response.py">TokenCreateResponse</a></code>
+- <code title="put /accounts/{account_id}/ai-search/tokens/{id}">client.aisearch.tokens.<a href="./src/cloudflare/resources/aisearch/tokens.py">update</a>(id, \*, account_id, \*\*<a href="src/cloudflare/types/aisearch/token_update_params.py">params</a>) -> <a href="./src/cloudflare/types/aisearch/token_update_response.py">TokenUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-search/tokens">client.aisearch.tokens.<a href="./src/cloudflare/resources/aisearch/tokens.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/aisearch/token_list_params.py">params</a>) -> <a href="./src/cloudflare/types/aisearch/token_list_response.py">SyncV4PagePaginationArray[TokenListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/ai-search/tokens/{id}">client.aisearch.tokens.<a href="./src/cloudflare/resources/aisearch/tokens.py">delete</a>(id, \*, account_id) -> <a href="./src/cloudflare/types/aisearch/token_delete_response.py">TokenDeleteResponse</a></code>
+- <code title="get /accounts/{account_id}/ai-search/tokens/{id}">client.aisearch.tokens.<a href="./src/cloudflare/resources/aisearch/tokens.py">read</a>(id, \*, account_id) -> <a href="./src/cloudflare/types/aisearch/token_read_response.py">TokenReadResponse</a></code>
 
-### Locations
+# SecurityCenter
+
+## Insights
 
 Types:
 
 ```python
-from cloudflare.types.radar.traffic_anomalies import LocationGetResponse
+from cloudflare.types.security_center import InsightListResponse, InsightDismissResponse
 ```
 
 Methods:
 
-- <code title="get /radar/traffic_anomalies/locations">client.radar.traffic_anomalies.locations.<a href="./src/cloudflare/resources/radar/traffic_anomalies/locations.py">get</a>(\*\*<a href="src/cloudflare/types/radar/traffic_anomalies/location_get_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/traffic_anomalies/location_get_response.py">LocationGetResponse</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/security-center/insights">client.security_center.insights.<a href="./src/cloudflare/resources/security_center/insights/insights.py">list</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/security_center/insight_list_params.py">params</a>) -> <a href="./src/cloudflare/types/security_center/insight_list_response.py">SyncV4PagePagination[Optional[InsightListResponse]]</a></code>
+- <code title="put /{accounts_or_zones}/{account_or_zone_id}/security-center/insights/{issue_id}/dismiss">client.security_center.insights.<a href="./src/cloudflare/resources/security_center/insights/insights.py">dismiss</a>(issue_id, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/security_center/insight_dismiss_params.py">params</a>) -> <a href="./src/cloudflare/types/security_center/insight_dismiss_response.py">InsightDismissResponse</a></code>
 
-## TCPResetsTimeouts
+### Class
 
 Types:
 
 ```python
-from cloudflare.types.radar import (
-    TCPResetsTimeoutSummaryResponse,
-    TCPResetsTimeoutTimeseriesGroupsResponse,
-)
+from cloudflare.types.security_center.insights import ClassGetResponse
 ```
 
 Methods:
 
-- <code title="get /radar/tcp_resets_timeouts/summary">client.radar.tcp_resets_timeouts.<a href="./src/cloudflare/resources/radar/tcp_resets_timeouts.py">summary</a>(\*\*<a href="src/cloudflare/types/radar/tcp_resets_timeout_summary_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/tcp_resets_timeout_summary_response.py">TCPResetsTimeoutSummaryResponse</a></code>
-- <code title="get /radar/tcp_resets_timeouts/timeseries_groups">client.radar.tcp_resets_timeouts.<a href="./src/cloudflare/resources/radar/tcp_resets_timeouts.py">timeseries_groups</a>(\*\*<a href="src/cloudflare/types/radar/tcp_resets_timeout_timeseries_groups_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/tcp_resets_timeout_timeseries_groups_response.py">TCPResetsTimeoutTimeseriesGroupsResponse</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/security-center/insights/class">client.security*center.insights.class*.<a href="./src/cloudflare/resources/security_center/insights/class_.py">get</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/security_center/insights/class_get_params.py">params</a>) -> <a href="./src/cloudflare/types/security_center/insights/class_get_response.py">Optional[ClassGetResponse]</a></code>
 
-# BotManagement
+### Severity
 
 Types:
 
 ```python
-from cloudflare.types.bot_management import (
-    BotFightModeConfiguration,
-    SubscriptionConfiguration,
-    SuperBotFightModeDefinitelyConfiguration,
-    SuperBotFightModeLikelyConfiguration,
-    BotManagementUpdateResponse,
-    BotManagementGetResponse,
-)
+from cloudflare.types.security_center.insights import SeverityGetResponse
 ```
 
 Methods:
 
-- <code title="put /zones/{zone_id}/bot_management">client.bot_management.<a href="./src/cloudflare/resources/bot_management.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/bot_management/bot_management_update_params.py">params</a>) -> <a href="./src/cloudflare/types/bot_management/bot_management_update_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/bot_management">client.bot_management.<a href="./src/cloudflare/resources/bot_management.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/bot_management/bot_management_get_response.py">Optional</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/security-center/insights/severity">client.security_center.insights.severity.<a href="./src/cloudflare/resources/security_center/insights/severity.py">get</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/security_center/insights/severity_get_params.py">params</a>) -> <a href="./src/cloudflare/types/security_center/insights/severity_get_response.py">Optional[SeverityGetResponse]</a></code>
 
-# OriginPostQuantumEncryption
+### Type
 
 Types:
 
 ```python
-from cloudflare.types.origin_post_quantum_encryption import (
-    OriginPostQuantumEncryptionUpdateResponse,
-    OriginPostQuantumEncryptionGetResponse,
-)
+from cloudflare.types.security_center.insights import TypeGetResponse
 ```
 
 Methods:
 
-- <code title="put /zones/{zone_id}/cache/origin_post_quantum_encryption">client.origin_post_quantum_encryption.<a href="./src/cloudflare/resources/origin_post_quantum_encryption.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_update_params.py">params</a>) -> <a href="./src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_update_response.py">OriginPostQuantumEncryptionUpdateResponse</a></code>
-- <code title="get /zones/{zone_id}/cache/origin_post_quantum_encryption">client.origin_post_quantum_encryption.<a href="./src/cloudflare/resources/origin_post_quantum_encryption.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_get_response.py">OriginPostQuantumEncryptionGetResponse</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/security-center/insights/type">client.security_center.insights.type.<a href="./src/cloudflare/resources/security_center/insights/type.py">get</a>(\*, account_id, zone_id, \*\*<a href="src/cloudflare/types/security_center/insights/type_get_params.py">params</a>) -> <a href="./src/cloudflare/types/security_center/insights/type_get_response.py">Optional[TypeGetResponse]</a></code>
 
-# Speed
+# BrowserRendering
+
+## Content
 
 Types:
 
 ```python
-from cloudflare.types.speed import LabeledRegion, LighthouseReport, Trend
+from cloudflare.types.browser_rendering import ContentCreateResponse
 ```
 
-## Schedule
+Methods:
 
-Types:
+- <code title="post /accounts/{account_id}/browser-rendering/content">client.browser_rendering.content.<a href="./src/cloudflare/resources/browser_rendering/content.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/browser_rendering/content_create_params.py">params</a>) -> <a href="./src/cloudflare/types/browser_rendering/content_create_response.py">str</a></code>
 
-```python
-from cloudflare.types.speed import Schedule, ScheduleCreateResponse, ScheduleDeleteResponse
-```
+## PDF
 
 Methods:
 
-- <code title="post /zones/{zone_id}/speed_api/schedule/{url}">client.speed.schedule.<a href="./src/cloudflare/resources/speed/schedule.py">create</a>(url, \*, zone_id, \*\*<a href="src/cloudflare/types/speed/schedule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/speed/schedule_create_response.py">Optional</a></code>
-- <code title="delete /zones/{zone_id}/speed_api/schedule/{url}">client.speed.schedule.<a href="./src/cloudflare/resources/speed/schedule.py">delete</a>(url, \*, zone_id, \*\*<a href="src/cloudflare/types/speed/schedule_delete_params.py">params</a>) -> <a href="./src/cloudflare/types/speed/schedule_delete_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/speed_api/schedule/{url}">client.speed.schedule.<a href="./src/cloudflare/resources/speed/schedule.py">get</a>(url, \*, zone_id, \*\*<a href="src/cloudflare/types/speed/schedule_get_params.py">params</a>) -> <a href="./src/cloudflare/types/speed/schedule.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/browser-rendering/pdf">client.browser_rendering.pdf.<a href="./src/cloudflare/resources/browser_rendering/pdf.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/browser_rendering/pdf_create_params.py">params</a>) -> BinaryAPIResponse</code>
 
-## Availabilities
+## Scrape
 
 Types:
 
 ```python
-from cloudflare.types.speed import Availability
+from cloudflare.types.browser_rendering import ScrapeCreateResponse
 ```
 
 Methods:
 
-- <code title="get /zones/{zone_id}/speed_api/availabilities">client.speed.availabilities.<a href="./src/cloudflare/resources/speed/availabilities.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/speed/availability.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/browser-rendering/scrape">client.browser_rendering.scrape.<a href="./src/cloudflare/resources/browser_rendering/scrape.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/browser_rendering/scrape_create_params.py">params</a>) -> <a href="./src/cloudflare/types/browser_rendering/scrape_create_response.py">ScrapeCreateResponse</a></code>
 
-## Pages
+## Screenshot
 
 Types:
 
 ```python
-from cloudflare.types.speed import PageListResponse
+from cloudflare.types.browser_rendering import ScreenshotCreateResponse
 ```
 
 Methods:
 
-- <code title="get /zones/{zone_id}/speed_api/pages">client.speed.pages.<a href="./src/cloudflare/resources/speed/pages/pages.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/speed/page_list_response.py">SyncSinglePage[PageListResponse]</a></code>
-- <code title="get /zones/{zone_id}/speed_api/pages/{url}/trend">client.speed.pages.<a href="./src/cloudflare/resources/speed/pages/pages.py">trend</a>(url, \*, zone_id, \*\*<a href="src/cloudflare/types/speed/page_trend_params.py">params</a>) -> <a href="./src/cloudflare/types/speed/trend.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/browser-rendering/screenshot">client.browser_rendering.screenshot.<a href="./src/cloudflare/resources/browser_rendering/screenshot.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/browser_rendering/screenshot_create_params.py">params</a>) -> <a href="./src/cloudflare/types/browser_rendering/screenshot_create_response.py">ScreenshotCreateResponse</a></code>
 
-### Tests
+## Snapshot
 
 Types:
 
 ```python
-from cloudflare.types.speed.pages import Test, TestListResponse, TestDeleteResponse
+from cloudflare.types.browser_rendering import SnapshotCreateResponse
 ```
 
 Methods:
 
-- <code title="post /zones/{zone_id}/speed_api/pages/{url}/tests">client.speed.pages.tests.<a href="./src/cloudflare/resources/speed/pages/tests.py">create</a>(url, \*, zone_id, \*\*<a href="src/cloudflare/types/speed/pages/test_create_params.py">params</a>) -> <a href="./src/cloudflare/types/speed/pages/test.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/speed_api/pages/{url}/tests">client.speed.pages.tests.<a href="./src/cloudflare/resources/speed/pages/tests.py">list</a>(url, \*, zone_id, \*\*<a href="src/cloudflare/types/speed/pages/test_list_params.py">params</a>) -> <a href="./src/cloudflare/types/speed/pages/test_list_response.py">TestListResponse</a></code>
-- <code title="delete /zones/{zone_id}/speed_api/pages/{url}/tests">client.speed.pages.tests.<a href="./src/cloudflare/resources/speed/pages/tests.py">delete</a>(url, \*, zone_id, \*\*<a href="src/cloudflare/types/speed/pages/test_delete_params.py">params</a>) -> <a href="./src/cloudflare/types/speed/pages/test_delete_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/speed_api/pages/{url}/tests/{test_id}">client.speed.pages.tests.<a href="./src/cloudflare/resources/speed/pages/tests.py">get</a>(test_id, \*, zone_id, url) -> <a href="./src/cloudflare/types/speed/pages/test.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/browser-rendering/snapshot">client.browser_rendering.snapshot.<a href="./src/cloudflare/resources/browser_rendering/snapshot.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/browser_rendering/snapshot_create_params.py">params</a>) -> <a href="./src/cloudflare/types/browser_rendering/snapshot_create_response.py">Optional[SnapshotCreateResponse]</a></code>
 
-# DCVDelegation
+## Json
 
 Types:
 
 ```python
-from cloudflare.types.dcv_delegation import DCVDelegationUUID
+from cloudflare.types.browser_rendering import JsonCreateResponse
 ```
 
 Methods:
 
-- <code title="get /zones/{zone_id}/dcv_delegation/uuid">client.dcv_delegation.<a href="./src/cloudflare/resources/dcv_delegation.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/dcv_delegation/dcv_delegation_uuid.py">Optional</a></code>
-
-# Hostnames
-
-## Settings
+- <code title="post /accounts/{account_id}/browser-rendering/json">client.browser_rendering.json.<a href="./src/cloudflare/resources/browser_rendering/json.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/browser_rendering/json_create_params.py">params</a>) -> <a href="./src/cloudflare/types/browser_rendering/json_create_response.py">JsonCreateResponse</a></code>
 
-### TLS
+## Links
 
 Types:
 
 ```python
-from cloudflare.types.hostnames.settings import (
-    Setting,
-    SettingValue,
-    TLSDeleteResponse,
-    TLSGetResponse,
-)
+from cloudflare.types.browser_rendering import LinkCreateResponse
 ```
 
 Methods:
 
-- <code title="put /zones/{zone_id}/hostnames/settings/{setting_id}/{hostname}">client.hostnames.settings.tls.<a href="./src/cloudflare/resources/hostnames/settings/tls.py">update</a>(hostname, \*, zone_id, setting_id, \*\*<a href="src/cloudflare/types/hostnames/settings/tls_update_params.py">params</a>) -> <a href="./src/cloudflare/types/hostnames/settings/setting.py">Optional</a></code>
-- <code title="delete /zones/{zone_id}/hostnames/settings/{setting_id}/{hostname}">client.hostnames.settings.tls.<a href="./src/cloudflare/resources/hostnames/settings/tls.py">delete</a>(hostname, \*, zone_id, setting_id) -> <a href="./src/cloudflare/types/hostnames/settings/tls_delete_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/hostnames/settings/{setting_id}">client.hostnames.settings.tls.<a href="./src/cloudflare/resources/hostnames/settings/tls.py">get</a>(setting_id, \*, zone_id) -> <a href="./src/cloudflare/types/hostnames/settings/tls_get_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/browser-rendering/links">client.browser_rendering.links.<a href="./src/cloudflare/resources/browser_rendering/links.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/browser_rendering/link_create_params.py">params</a>) -> <a href="./src/cloudflare/types/browser_rendering/link_create_response.py">LinkCreateResponse</a></code>
 
-# Snippets
+## Markdown
 
 Types:
 
 ```python
-from cloudflare.types.snippets import Snippet, SnippetDeleteResponse
+from cloudflare.types.browser_rendering import MarkdownCreateResponse
 ```
 
 Methods:
 
-- <code title="put /zones/{zone_id}/snippets/{snippet_name}">client.snippets.<a href="./src/cloudflare/resources/snippets/snippets.py">update</a>(snippet_name, \*, zone_id, \*\*<a href="src/cloudflare/types/snippets/snippet_update_params.py">params</a>) -> <a href="./src/cloudflare/types/snippets/snippet.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/snippets">client.snippets.<a href="./src/cloudflare/resources/snippets/snippets.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/snippets/snippet.py">SyncSinglePage[Snippet]</a></code>
-- <code title="delete /zones/{zone_id}/snippets/{snippet_name}">client.snippets.<a href="./src/cloudflare/resources/snippets/snippets.py">delete</a>(snippet_name, \*, zone_id) -> <a href="./src/cloudflare/types/snippets/snippet_delete_response.py">SnippetDeleteResponse</a></code>
-- <code title="get /zones/{zone_id}/snippets/{snippet_name}">client.snippets.<a href="./src/cloudflare/resources/snippets/snippets.py">get</a>(snippet_name, \*, zone_id) -> <a href="./src/cloudflare/types/snippets/snippet.py">Optional</a></code>
-
-## Content
-
-Methods:
-
-- <code title="get /zones/{zone_id}/snippets/{snippet_name}/content">client.snippets.content.<a href="./src/cloudflare/resources/snippets/content.py">get</a>(snippet_name, \*, zone_id) -> BinaryAPIResponse</code>
+- <code title="post /accounts/{account_id}/browser-rendering/markdown">client.browser_rendering.markdown.<a href="./src/cloudflare/resources/browser_rendering/markdown.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/browser_rendering/markdown_create_params.py">params</a>) -> <a href="./src/cloudflare/types/browser_rendering/markdown_create_response.py">str</a></code>
 
-## Rules
+# CustomPages
 
 Types:
 
 ```python
-from cloudflare.types.snippets import RuleUpdateResponse, RuleListResponse
+from cloudflare.types.custom_pages import (
+    CustomPageUpdateResponse,
+    CustomPageListResponse,
+    CustomPageGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="put /zones/{zone_id}/snippets/snippet_rules">client.snippets.rules.<a href="./src/cloudflare/resources/snippets/rules.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/snippets/rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/snippets/rule_update_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/snippets/snippet_rules">client.snippets.rules.<a href="./src/cloudflare/resources/snippets/rules.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/snippets/rule_list_response.py">SyncSinglePage[RuleListResponse]</a></code>
+- <code title="put /{accounts_or_zones}/{account_or_zone_id}/custom_pages/{identifier}">client.custom_pages.<a href="./src/cloudflare/resources/custom_pages.py">update</a>(identifier, \*, account_id, zone_id, \*\*<a href="src/cloudflare/types/custom_pages/custom_page_update_params.py">params</a>) -> <a href="./src/cloudflare/types/custom_pages/custom_page_update_response.py">Optional[CustomPageUpdateResponse]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/custom_pages">client.custom_pages.<a href="./src/cloudflare/resources/custom_pages.py">list</a>(\*, account_id, zone_id) -> <a href="./src/cloudflare/types/custom_pages/custom_page_list_response.py">SyncSinglePage[CustomPageListResponse]</a></code>
+- <code title="get /{accounts_or_zones}/{account_or_zone_id}/custom_pages/{identifier}">client.custom_pages.<a href="./src/cloudflare/resources/custom_pages.py">get</a>(identifier, \*, account_id, zone_id) -> <a href="./src/cloudflare/types/custom_pages/custom_page_get_response.py">Optional[CustomPageGetResponse]</a></code>
 
-# Calls
+# SecretsStore
+
+## Stores
 
 Types:
 
 ```python
-from cloudflare.types.calls import CallsApp, CallsAppWithSecret, CallListResponse
+from cloudflare.types.secrets_store import (
+    StoreCreateResponse,
+    StoreListResponse,
+    StoreDeleteResponse,
+)
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/calls/apps">client.calls.<a href="./src/cloudflare/resources/calls/calls.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/calls/call_create_params.py">params</a>) -> <a href="./src/cloudflare/types/calls/calls_app_with_secret.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/calls/apps/{app_id}">client.calls.<a href="./src/cloudflare/resources/calls/calls.py">update</a>(app_id, \*, account_id, \*\*<a href="src/cloudflare/types/calls/call_update_params.py">params</a>) -> <a href="./src/cloudflare/types/calls/calls_app.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/calls/apps">client.calls.<a href="./src/cloudflare/resources/calls/calls.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/calls/call_list_response.py">SyncSinglePage[CallListResponse]</a></code>
-- <code title="delete /accounts/{account_id}/calls/apps/{app_id}">client.calls.<a href="./src/cloudflare/resources/calls/calls.py">delete</a>(app_id, \*, account_id) -> <a href="./src/cloudflare/types/calls/calls_app.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/calls/apps/{app_id}">client.calls.<a href="./src/cloudflare/resources/calls/calls.py">get</a>(app_id, \*, account_id) -> <a href="./src/cloudflare/types/calls/calls_app.py">Optional</a></code>
-
-## TURN
+- <code title="post /accounts/{account_id}/secrets_store/stores">client.secrets_store.stores.<a href="./src/cloudflare/resources/secrets_store/stores/stores.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/secrets_store/store_create_params.py">params</a>) -> <a href="./src/cloudflare/types/secrets_store/store_create_response.py">SyncSinglePage[StoreCreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/secrets_store/stores">client.secrets_store.stores.<a href="./src/cloudflare/resources/secrets_store/stores/stores.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/secrets_store/store_list_params.py">params</a>) -> <a href="./src/cloudflare/types/secrets_store/store_list_response.py">SyncV4PagePaginationArray[StoreListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/secrets_store/stores/{store_id}">client.secrets_store.stores.<a href="./src/cloudflare/resources/secrets_store/stores/stores.py">delete</a>(store_id, \*, account_id) -> <a href="./src/cloudflare/types/secrets_store/store_delete_response.py">Optional[StoreDeleteResponse]</a></code>
 
-### Keys
+### Secrets
 
 Types:
 
 ```python
-from cloudflare.types.calls.turn import (
-    KeyCreateResponse,
-    KeyUpdateResponse,
-    KeyListResponse,
-    KeyDeleteResponse,
-    KeyGetResponse,
+from cloudflare.types.secrets_store.stores import (
+    SecretCreateResponse,
+    SecretListResponse,
+    SecretDeleteResponse,
+    SecretBulkDeleteResponse,
+    SecretDuplicateResponse,
+    SecretEditResponse,
+    SecretGetResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/calls/turn_keys">client.calls.turn.keys.<a href="./src/cloudflare/resources/calls/turn/keys.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/calls/turn/key_create_params.py">params</a>) -> <a href="./src/cloudflare/types/calls/turn/key_create_response.py">KeyCreateResponse</a></code>
-- <code title="put /accounts/{account_id}/calls/turn_keys/{key_id}">client.calls.turn.keys.<a href="./src/cloudflare/resources/calls/turn/keys.py">update</a>(key_id, \*, account_id, \*\*<a href="src/cloudflare/types/calls/turn/key_update_params.py">params</a>) -> <a href="./src/cloudflare/types/calls/turn/key_update_response.py">str</a></code>
-- <code title="get /accounts/{account_id}/calls/turn_keys">client.calls.turn.keys.<a href="./src/cloudflare/resources/calls/turn/keys.py">list</a>(\*, account_id) -> <a href="./src/cloudflare/types/calls/turn/key_list_response.py">SyncSinglePage[KeyListResponse]</a></code>
-- <code title="delete /accounts/{account_id}/calls/turn_keys/{key_id}">client.calls.turn.keys.<a href="./src/cloudflare/resources/calls/turn/keys.py">delete</a>(key_id, \*, account_id) -> <a href="./src/cloudflare/types/calls/turn/key_delete_response.py">str</a></code>
-- <code title="get /accounts/{account_id}/calls/turn_keys/{key_id}">client.calls.turn.keys.<a href="./src/cloudflare/resources/calls/turn/keys.py">get</a>(key_id, \*, account_id) -> <a href="./src/cloudflare/types/calls/turn/key_get_response.py">str</a></code>
-
-# CloudforceOne
+- <code title="post /accounts/{account_id}/secrets_store/stores/{store_id}/secrets">client.secrets_store.stores.secrets.<a href="./src/cloudflare/resources/secrets_store/stores/secrets.py">create</a>(store_id, \*, account_id, \*\*<a href="src/cloudflare/types/secrets_store/stores/secret_create_params.py">params</a>) -> <a href="./src/cloudflare/types/secrets_store/stores/secret_create_response.py">SyncSinglePage[SecretCreateResponse]</a></code>
+- <code title="get /accounts/{account_id}/secrets_store/stores/{store_id}/secrets">client.secrets_store.stores.secrets.<a href="./src/cloudflare/resources/secrets_store/stores/secrets.py">list</a>(store_id, \*, account_id, \*\*<a href="src/cloudflare/types/secrets_store/stores/secret_list_params.py">params</a>) -> <a href="./src/cloudflare/types/secrets_store/stores/secret_list_response.py">SyncV4PagePaginationArray[SecretListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/secrets_store/stores/{store_id}/secrets/{secret_id}">client.secrets_store.stores.secrets.<a href="./src/cloudflare/resources/secrets_store/stores/secrets.py">delete</a>(secret_id, \*, account_id, store_id) -> <a href="./src/cloudflare/types/secrets_store/stores/secret_delete_response.py">Optional[SecretDeleteResponse]</a></code>
+- <code title="delete /accounts/{account_id}/secrets_store/stores/{store_id}/secrets">client.secrets_store.stores.secrets.<a href="./src/cloudflare/resources/secrets_store/stores/secrets.py">bulk_delete</a>(store_id, \*, account_id) -> <a href="./src/cloudflare/types/secrets_store/stores/secret_bulk_delete_response.py">SyncSinglePage[SecretBulkDeleteResponse]</a></code>
+- <code title="post /accounts/{account_id}/secrets_store/stores/{store_id}/secrets/{secret_id}/duplicate">client.secrets_store.stores.secrets.<a href="./src/cloudflare/resources/secrets_store/stores/secrets.py">duplicate</a>(secret_id, \*, account_id, store_id, \*\*<a href="src/cloudflare/types/secrets_store/stores/secret_duplicate_params.py">params</a>) -> <a href="./src/cloudflare/types/secrets_store/stores/secret_duplicate_response.py">Optional[SecretDuplicateResponse]</a></code>
+- <code title="patch /accounts/{account_id}/secrets_store/stores/{store_id}/secrets/{secret_id}">client.secrets_store.stores.secrets.<a href="./src/cloudflare/resources/secrets_store/stores/secrets.py">edit</a>(secret_id, \*, account_id, store_id, \*\*<a href="src/cloudflare/types/secrets_store/stores/secret_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/secrets_store/stores/secret_edit_response.py">Optional[SecretEditResponse]</a></code>
+- <code title="get /accounts/{account_id}/secrets_store/stores/{store_id}/secrets/{secret_id}">client.secrets_store.stores.secrets.<a href="./src/cloudflare/resources/secrets_store/stores/secrets.py">get</a>(secret_id, \*, account_id, store_id) -> <a href="./src/cloudflare/types/secrets_store/stores/secret_get_response.py">Optional[SecretGetResponse]</a></code>
 
-## Requests
+## Quota
 
 Types:
 
 ```python
-from cloudflare.types.cloudforce_one import (
-    Item,
-    ListItem,
-    Quota,
-    RequestConstants,
-    RequestTypes,
-    RequestDeleteResponse,
-)
+from cloudflare.types.secrets_store import QuotaGetResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_identifier}/cloudforce-one/requests/new">client.cloudforce_one.requests.<a href="./src/cloudflare/resources/cloudforce_one/requests/requests.py">create</a>(account_identifier, \*\*<a href="src/cloudflare/types/cloudforce_one/request_create_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/item.py">Optional</a></code>
-- <code title="put /accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}">client.cloudforce_one.requests.<a href="./src/cloudflare/resources/cloudforce_one/requests/requests.py">update</a>(request_identifier, \*, account_identifier, \*\*<a href="src/cloudflare/types/cloudforce_one/request_update_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/item.py">Optional</a></code>
-- <code title="post /accounts/{account_identifier}/cloudforce-one/requests">client.cloudforce_one.requests.<a href="./src/cloudflare/resources/cloudforce_one/requests/requests.py">list</a>(account_identifier, \*\*<a href="src/cloudflare/types/cloudforce_one/request_list_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/list_item.py">SyncV4PagePaginationArray[ListItem]</a></code>
-- <code title="delete /accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}">client.cloudforce_one.requests.<a href="./src/cloudflare/resources/cloudforce_one/requests/requests.py">delete</a>(request_identifier, \*, account_identifier) -> <a href="./src/cloudflare/types/cloudforce_one/request_delete_response.py">RequestDeleteResponse</a></code>
-- <code title="get /accounts/{account_identifier}/cloudforce-one/requests/constants">client.cloudforce_one.requests.<a href="./src/cloudflare/resources/cloudforce_one/requests/requests.py">constants</a>(account_identifier) -> <a href="./src/cloudflare/types/cloudforce_one/request_constants.py">Optional</a></code>
-- <code title="get /accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}">client.cloudforce_one.requests.<a href="./src/cloudflare/resources/cloudforce_one/requests/requests.py">get</a>(request_identifier, \*, account_identifier) -> <a href="./src/cloudflare/types/cloudforce_one/item.py">Optional</a></code>
-- <code title="get /accounts/{account_identifier}/cloudforce-one/requests/quota">client.cloudforce_one.requests.<a href="./src/cloudflare/resources/cloudforce_one/requests/requests.py">quota</a>(account_identifier) -> <a href="./src/cloudflare/types/cloudforce_one/quota.py">Optional</a></code>
-- <code title="get /accounts/{account_identifier}/cloudforce-one/requests/types">client.cloudforce_one.requests.<a href="./src/cloudflare/resources/cloudforce_one/requests/requests.py">types</a>(account_identifier) -> <a href="./src/cloudflare/types/cloudforce_one/request_types.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/secrets_store/quota">client.secrets_store.quota.<a href="./src/cloudflare/resources/secrets_store/quota.py">get</a>(\*, account_id) -> <a href="./src/cloudflare/types/secrets_store/quota_get_response.py">Optional[QuotaGetResponse]</a></code>
 
-### Message
+# Pipelines
 
 Types:
 
 ```python
-from cloudflare.types.cloudforce_one.requests import (
-    Message,
-    MessageDeleteResponse,
-    MessageGetResponse,
+from cloudflare.types.pipelines import (
+    PipelineCreateResponse,
+    PipelineUpdateResponse,
+    PipelineListResponse,
+    PipelineCreateV1Response,
+    PipelineGetResponse,
+    PipelineGetV1Response,
+    PipelineListV1Response,
+    PipelineValidateSqlResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}/message/new">client.cloudforce_one.requests.message.<a href="./src/cloudflare/resources/cloudforce_one/requests/message.py">create</a>(request_identifier, \*, account_identifier, \*\*<a href="src/cloudflare/types/cloudforce_one/requests/message_create_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/requests/message.py">Optional</a></code>
-- <code title="put /accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}/message/{message_identifer}">client.cloudforce_one.requests.message.<a href="./src/cloudflare/resources/cloudforce_one/requests/message.py">update</a>(message_identifer, \*, account_identifier, request_identifier, \*\*<a href="src/cloudflare/types/cloudforce_one/requests/message_update_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/requests/message.py">Optional</a></code>
-- <code title="delete /accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}/message/{message_identifer}">client.cloudforce_one.requests.message.<a href="./src/cloudflare/resources/cloudforce_one/requests/message.py">delete</a>(message_identifer, \*, account_identifier, request_identifier) -> <a href="./src/cloudflare/types/cloudforce_one/requests/message_delete_response.py">MessageDeleteResponse</a></code>
-- <code title="post /accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}/message">client.cloudforce_one.requests.message.<a href="./src/cloudflare/resources/cloudforce_one/requests/message.py">get</a>(request_identifier, \*, account_identifier, \*\*<a href="src/cloudflare/types/cloudforce_one/requests/message_get_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/requests/message_get_response.py">Optional</a></code>
+- <code title="post /accounts/{account_id}/pipelines">client.pipelines.<a href="./src/cloudflare/resources/pipelines/pipelines.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/pipelines/pipeline_create_params.py">params</a>) -> <a href="./src/cloudflare/types/pipelines/pipeline_create_response.py">PipelineCreateResponse</a></code>
+- <code title="put /accounts/{account_id}/pipelines/{pipeline_name}">client.pipelines.<a href="./src/cloudflare/resources/pipelines/pipelines.py">update</a>(pipeline_name, \*, account_id, \*\*<a href="src/cloudflare/types/pipelines/pipeline_update_params.py">params</a>) -> <a href="./src/cloudflare/types/pipelines/pipeline_update_response.py">PipelineUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/pipelines">client.pipelines.<a href="./src/cloudflare/resources/pipelines/pipelines.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/pipelines/pipeline_list_params.py">params</a>) -> <a href="./src/cloudflare/types/pipelines/pipeline_list_response.py">PipelineListResponse</a></code>
+- <code title="delete /accounts/{account_id}/pipelines/{pipeline_name}">client.pipelines.<a href="./src/cloudflare/resources/pipelines/pipelines.py">delete</a>(pipeline_name, \*, account_id) -> None</code>
+- <code title="post /accounts/{account_id}/pipelines/v1/pipelines">client.pipelines.<a href="./src/cloudflare/resources/pipelines/pipelines.py">create_v1</a>(\*, account_id, \*\*<a href="src/cloudflare/types/pipelines/pipeline_create_v1_params.py">params</a>) -> <a href="./src/cloudflare/types/pipelines/pipeline_create_v1_response.py">PipelineCreateV1Response</a></code>
+- <code title="delete /accounts/{account_id}/pipelines/v1/pipelines/{pipeline_id}">client.pipelines.<a href="./src/cloudflare/resources/pipelines/pipelines.py">delete_v1</a>(pipeline_id, \*, account_id) -> None</code>
+- <code title="get /accounts/{account_id}/pipelines/{pipeline_name}">client.pipelines.<a href="./src/cloudflare/resources/pipelines/pipelines.py">get</a>(pipeline_name, \*, account_id) -> <a href="./src/cloudflare/types/pipelines/pipeline_get_response.py">PipelineGetResponse</a></code>
+- <code title="get /accounts/{account_id}/pipelines/v1/pipelines/{pipeline_id}">client.pipelines.<a href="./src/cloudflare/resources/pipelines/pipelines.py">get_v1</a>(pipeline_id, \*, account_id) -> <a href="./src/cloudflare/types/pipelines/pipeline_get_v1_response.py">PipelineGetV1Response</a></code>
+- <code title="get /accounts/{account_id}/pipelines/v1/pipelines">client.pipelines.<a href="./src/cloudflare/resources/pipelines/pipelines.py">list_v1</a>(\*, account_id, \*\*<a href="src/cloudflare/types/pipelines/pipeline_list_v1_params.py">params</a>) -> <a href="./src/cloudflare/types/pipelines/pipeline_list_v1_response.py">SyncV4PagePaginationArray[PipelineListV1Response]</a></code>
+- <code title="post /accounts/{account_id}/pipelines/v1/validate_sql">client.pipelines.<a href="./src/cloudflare/resources/pipelines/pipelines.py">validate_sql</a>(\*, account_id, \*\*<a href="src/cloudflare/types/pipelines/pipeline_validate_sql_params.py">params</a>) -> <a href="./src/cloudflare/types/pipelines/pipeline_validate_sql_response.py">PipelineValidateSqlResponse</a></code>
 
-### Priority
+## Sinks
 
 Types:
 
 ```python
-from cloudflare.types.cloudforce_one.requests import (
-    Label,
-    Priority,
-    PriorityEdit,
-    PriorityDeleteResponse,
-)
+from cloudflare.types.pipelines import SinkCreateResponse, SinkListResponse, SinkGetResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_identifier}/cloudforce-one/requests/priority/new">client.cloudforce_one.requests.priority.<a href="./src/cloudflare/resources/cloudforce_one/requests/priority.py">create</a>(account_identifier, \*\*<a href="src/cloudflare/types/cloudforce_one/requests/priority_create_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/requests/priority.py">Optional</a></code>
-- <code title="put /accounts/{account_identifier}/cloudforce-one/requests/priority/{priority_identifer}">client.cloudforce_one.requests.priority.<a href="./src/cloudflare/resources/cloudforce_one/requests/priority.py">update</a>(priority_identifer, \*, account_identifier, \*\*<a href="src/cloudflare/types/cloudforce_one/requests/priority_update_params.py">params</a>) -> <a href="./src/cloudflare/types/cloudforce_one/item.py">Optional</a></code>
-- <code title="delete /accounts/{account_identifier}/cloudforce-one/requests/priority/{priority_identifer}">client.cloudforce_one.requests.priority.<a href="./src/cloudflare/resources/cloudforce_one/requests/priority.py">delete</a>(priority_identifer, \*, account_identifier) -> <a href="./src/cloudflare/types/cloudforce_one/requests/priority_delete_response.py">PriorityDeleteResponse</a></code>
-- <code title="get /accounts/{account_identifier}/cloudforce-one/requests/priority/{priority_identifer}">client.cloudforce_one.requests.priority.<a href="./src/cloudflare/resources/cloudforce_one/requests/priority.py">get</a>(priority_identifer, \*, account_identifier) -> <a href="./src/cloudflare/types/cloudforce_one/item.py">Optional</a></code>
-- <code title="get /accounts/{account_identifier}/cloudforce-one/requests/priority/quota">client.cloudforce_one.requests.priority.<a href="./src/cloudflare/resources/cloudforce_one/requests/priority.py">quota</a>(account_identifier) -> <a href="./src/cloudflare/types/cloudforce_one/quota.py">Optional</a></code>
-
-# EventNotifications
+- <code title="post /accounts/{account_id}/pipelines/v1/sinks">client.pipelines.sinks.<a href="./src/cloudflare/resources/pipelines/sinks.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/pipelines/sink_create_params.py">params</a>) -> <a href="./src/cloudflare/types/pipelines/sink_create_response.py">SinkCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/pipelines/v1/sinks">client.pipelines.sinks.<a href="./src/cloudflare/resources/pipelines/sinks.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/pipelines/sink_list_params.py">params</a>) -> <a href="./src/cloudflare/types/pipelines/sink_list_response.py">SyncV4PagePaginationArray[SinkListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/pipelines/v1/sinks/{sink_id}">client.pipelines.sinks.<a href="./src/cloudflare/resources/pipelines/sinks.py">delete</a>(sink_id, \*, account_id, \*\*<a href="src/cloudflare/types/pipelines/sink_delete_params.py">params</a>) -> None</code>
+- <code title="get /accounts/{account_id}/pipelines/v1/sinks/{sink_id}">client.pipelines.sinks.<a href="./src/cloudflare/resources/pipelines/sinks.py">get</a>(sink_id, \*, account_id) -> <a href="./src/cloudflare/types/pipelines/sink_get_response.py">SinkGetResponse</a></code>
 
-## R2
-
-### Configuration
+## Streams
 
 Types:
 
 ```python
-from cloudflare.types.event_notifications.r2 import ConfigurationGetResponse
+from cloudflare.types.pipelines import (
+    StreamCreateResponse,
+    StreamUpdateResponse,
+    StreamListResponse,
+    StreamGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration">client.event_notifications.r2.configuration.<a href="./src/cloudflare/resources/event_notifications/r2/configuration/configuration.py">get</a>(bucket_name, \*, account_id) -> <a href="./src/cloudflare/types/event_notifications/r2/configuration_get_response.py">ConfigurationGetResponse</a></code>
+- <code title="post /accounts/{account_id}/pipelines/v1/streams">client.pipelines.streams.<a href="./src/cloudflare/resources/pipelines/streams.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/pipelines/stream_create_params.py">params</a>) -> <a href="./src/cloudflare/types/pipelines/stream_create_response.py">StreamCreateResponse</a></code>
+- <code title="patch /accounts/{account_id}/pipelines/v1/streams/{stream_id}">client.pipelines.streams.<a href="./src/cloudflare/resources/pipelines/streams.py">update</a>(stream_id, \*, account_id, \*\*<a href="src/cloudflare/types/pipelines/stream_update_params.py">params</a>) -> <a href="./src/cloudflare/types/pipelines/stream_update_response.py">StreamUpdateResponse</a></code>
+- <code title="get /accounts/{account_id}/pipelines/v1/streams">client.pipelines.streams.<a href="./src/cloudflare/resources/pipelines/streams.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/pipelines/stream_list_params.py">params</a>) -> <a href="./src/cloudflare/types/pipelines/stream_list_response.py">SyncV4PagePaginationArray[StreamListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/pipelines/v1/streams/{stream_id}">client.pipelines.streams.<a href="./src/cloudflare/resources/pipelines/streams.py">delete</a>(stream_id, \*, account_id, \*\*<a href="src/cloudflare/types/pipelines/stream_delete_params.py">params</a>) -> None</code>
+- <code title="get /accounts/{account_id}/pipelines/v1/streams/{stream_id}">client.pipelines.streams.<a href="./src/cloudflare/resources/pipelines/streams.py">get</a>(stream_id, \*, account_id) -> <a href="./src/cloudflare/types/pipelines/stream_get_response.py">StreamGetResponse</a></code>
 
-#### Queues
+# SchemaValidation
+
+## Schemas
 
 Types:
 
 ```python
-from cloudflare.types.event_notifications.r2.configuration import (
-    QueueUpdateResponse,
-    QueueDeleteResponse,
-)
+from cloudflare.types.schema_validation import PublicSchema, SchemaDeleteResponse
 ```
 
 Methods:
 
-- <code title="put /accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}">client.event_notifications.r2.configuration.queues.<a href="./src/cloudflare/resources/event_notifications/r2/configuration/queues.py">update</a>(queue_id, \*, account_id, bucket_name, \*\*<a href="src/cloudflare/types/event_notifications/r2/configuration/queue_update_params.py">params</a>) -> <a href="./src/cloudflare/types/event_notifications/r2/configuration/queue_update_response.py">QueueUpdateResponse</a></code>
-- <code title="delete /accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}">client.event_notifications.r2.configuration.queues.<a href="./src/cloudflare/resources/event_notifications/r2/configuration/queues.py">delete</a>(queue_id, \*, account_id, bucket_name) -> <a href="./src/cloudflare/types/event_notifications/r2/configuration/queue_delete_response.py">QueueDeleteResponse</a></code>
+- <code title="post /zones/{zone_id}/schema_validation/schemas">client.schema_validation.schemas.<a href="./src/cloudflare/resources/schema_validation/schemas.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/schema_validation/schema_create_params.py">params</a>) -> <a href="./src/cloudflare/types/schema_validation/public_schema.py">PublicSchema</a></code>
+- <code title="get /zones/{zone_id}/schema_validation/schemas">client.schema_validation.schemas.<a href="./src/cloudflare/resources/schema_validation/schemas.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/schema_validation/schema_list_params.py">params</a>) -> <a href="./src/cloudflare/types/schema_validation/public_schema.py">SyncV4PagePaginationArray[PublicSchema]</a></code>
+- <code title="delete /zones/{zone_id}/schema_validation/schemas/{schema_id}">client.schema_validation.schemas.<a href="./src/cloudflare/resources/schema_validation/schemas.py">delete</a>(schema_id, \*, zone_id) -> <a href="./src/cloudflare/types/schema_validation/schema_delete_response.py">SchemaDeleteResponse</a></code>
+- <code title="patch /zones/{zone_id}/schema_validation/schemas/{schema_id}">client.schema_validation.schemas.<a href="./src/cloudflare/resources/schema_validation/schemas.py">edit</a>(schema_id, \*, zone_id, \*\*<a href="src/cloudflare/types/schema_validation/schema_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/schema_validation/public_schema.py">PublicSchema</a></code>
+- <code title="get /zones/{zone_id}/schema_validation/schemas/{schema_id}">client.schema_validation.schemas.<a href="./src/cloudflare/resources/schema_validation/schemas.py">get</a>(schema_id, \*, zone_id, \*\*<a href="src/cloudflare/types/schema_validation/schema_get_params.py">params</a>) -> <a href="./src/cloudflare/types/schema_validation/public_schema.py">PublicSchema</a></code>
 
-# AIGateway
+## Settings
 
 Types:
 
 ```python
-from cloudflare.types.ai_gateway import (
-    AIGatewayCreateResponse,
-    AIGatewayUpdateResponse,
-    AIGatewayListResponse,
-    AIGatewayDeleteResponse,
-    AIGatewayGetResponse,
+from cloudflare.types.schema_validation import (
+    SettingUpdateResponse,
+    SettingEditResponse,
+    SettingGetResponse,
 )
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/ai-gateway/gateways">client.ai_gateway.<a href="./src/cloudflare/resources/ai_gateway/ai_gateway.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/ai_gateway/ai_gateway_create_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/ai_gateway_create_response.py">AIGatewayCreateResponse</a></code>
-- <code title="put /accounts/{account_id}/ai-gateway/gateways/{id}">client.ai_gateway.<a href="./src/cloudflare/resources/ai_gateway/ai_gateway.py">update</a>(id, \*, account_id, \*\*<a href="src/cloudflare/types/ai_gateway/ai_gateway_update_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/ai_gateway_update_response.py">AIGatewayUpdateResponse</a></code>
-- <code title="get /accounts/{account_id}/ai-gateway/gateways">client.ai_gateway.<a href="./src/cloudflare/resources/ai_gateway/ai_gateway.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/ai_gateway/ai_gateway_list_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/ai_gateway_list_response.py">SyncV4PagePaginationArray[AIGatewayListResponse]</a></code>
-- <code title="delete /accounts/{account_id}/ai-gateway/gateways/{id}">client.ai_gateway.<a href="./src/cloudflare/resources/ai_gateway/ai_gateway.py">delete</a>(id, \*, account_id) -> <a href="./src/cloudflare/types/ai_gateway/ai_gateway_delete_response.py">AIGatewayDeleteResponse</a></code>
-- <code title="get /accounts/{account_id}/ai-gateway/gateways/{id}">client.ai_gateway.<a href="./src/cloudflare/resources/ai_gateway/ai_gateway.py">get</a>(id, \*, account_id) -> <a href="./src/cloudflare/types/ai_gateway/ai_gateway_get_response.py">AIGatewayGetResponse</a></code>
+- <code title="put /zones/{zone_id}/schema_validation/settings">client.schema_validation.settings.<a href="./src/cloudflare/resources/schema_validation/settings/settings.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/schema_validation/setting_update_params.py">params</a>) -> <a href="./src/cloudflare/types/schema_validation/setting_update_response.py">SettingUpdateResponse</a></code>
+- <code title="patch /zones/{zone_id}/schema_validation/settings">client.schema_validation.settings.<a href="./src/cloudflare/resources/schema_validation/settings/settings.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/schema_validation/setting_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/schema_validation/setting_edit_response.py">SettingEditResponse</a></code>
+- <code title="get /zones/{zone_id}/schema_validation/settings">client.schema_validation.settings.<a href="./src/cloudflare/resources/schema_validation/settings/settings.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/schema_validation/setting_get_response.py">SettingGetResponse</a></code>
 
-## Logs
+### Operations
 
 Types:
 
 ```python
-from cloudflare.types.ai_gateway import LogListResponse
+from cloudflare.types.schema_validation.settings import (
+    OperationUpdateResponse,
+    OperationListResponse,
+    OperationDeleteResponse,
+    OperationBulkEditResponse,
+    OperationGetResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/ai-gateway/gateways/{id}/logs">client.ai_gateway.logs.<a href="./src/cloudflare/resources/ai_gateway/logs.py">list</a>(id, \*, account_id, \*\*<a href="src/cloudflare/types/ai_gateway/log_list_params.py">params</a>) -> <a href="./src/cloudflare/types/ai_gateway/log_list_response.py">SyncV4PagePaginationArray[LogListResponse]</a></code>
+- <code title="put /zones/{zone_id}/schema_validation/settings/operations/{operation_id}">client.schema_validation.settings.operations.<a href="./src/cloudflare/resources/schema_validation/settings/operations.py">update</a>(operation_id, \*, zone_id, \*\*<a href="src/cloudflare/types/schema_validation/settings/operation_update_params.py">params</a>) -> <a href="./src/cloudflare/types/schema_validation/settings/operation_update_response.py">OperationUpdateResponse</a></code>
+- <code title="get /zones/{zone_id}/schema_validation/settings/operations">client.schema_validation.settings.operations.<a href="./src/cloudflare/resources/schema_validation/settings/operations.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/schema_validation/settings/operation_list_params.py">params</a>) -> <a href="./src/cloudflare/types/schema_validation/settings/operation_list_response.py">SyncV4PagePaginationArray[OperationListResponse]</a></code>
+- <code title="delete /zones/{zone_id}/schema_validation/settings/operations/{operation_id}">client.schema_validation.settings.operations.<a href="./src/cloudflare/resources/schema_validation/settings/operations.py">delete</a>(operation_id, \*, zone_id) -> <a href="./src/cloudflare/types/schema_validation/settings/operation_delete_response.py">OperationDeleteResponse</a></code>
+- <code title="patch /zones/{zone_id}/schema_validation/settings/operations">client.schema_validation.settings.operations.<a href="./src/cloudflare/resources/schema_validation/settings/operations.py">bulk_edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/schema_validation/settings/operation_bulk_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/schema_validation/settings/operation_bulk_edit_response.py">OperationBulkEditResponse</a></code>
+- <code title="get /zones/{zone_id}/schema_validation/settings/operations/{operation_id}">client.schema_validation.settings.operations.<a href="./src/cloudflare/resources/schema_validation/settings/operations.py">get</a>(operation_id, \*, zone_id) -> <a href="./src/cloudflare/types/schema_validation/settings/operation_get_response.py">OperationGetResponse</a></code>
 
-# IAM
+# TokenValidation
 
-## PermissionGroups
+## Configuration
 
 Types:
 
 ```python
-from cloudflare.types.iam import PermissionGroupListResponse, PermissionGroupGetResponse
+from cloudflare.types.token_validation import (
+    TokenConfig,
+    ConfigurationDeleteResponse,
+    ConfigurationEditResponse,
+)
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/iam/permission_groups">client.iam.permission_groups.<a href="./src/cloudflare/resources/iam/permission_groups.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/iam/permission_group_list_params.py">params</a>) -> <a href="./src/cloudflare/types/iam/permission_group_list_response.py">SyncV4PagePaginationArray[object]</a></code>
-- <code title="get /accounts/{account_id}/iam/permission_groups/{permission_group_id}">client.iam.permission_groups.<a href="./src/cloudflare/resources/iam/permission_groups.py">get</a>(permission_group_id, \*, account_id) -> <a href="./src/cloudflare/types/iam/permission_group_get_response.py">PermissionGroupGetResponse</a></code>
+- <code title="post /zones/{zone_id}/token_validation/config">client.token_validation.configuration.<a href="./src/cloudflare/resources/token_validation/configuration/configuration.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/token_validation/configuration_create_params.py">params</a>) -> <a href="./src/cloudflare/types/token_validation/token_config.py">TokenConfig</a></code>
+- <code title="get /zones/{zone_id}/token_validation/config">client.token_validation.configuration.<a href="./src/cloudflare/resources/token_validation/configuration/configuration.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/token_validation/configuration_list_params.py">params</a>) -> <a href="./src/cloudflare/types/token_validation/token_config.py">SyncV4PagePaginationArray[TokenConfig]</a></code>
+- <code title="delete /zones/{zone_id}/token_validation/config/{config_id}">client.token_validation.configuration.<a href="./src/cloudflare/resources/token_validation/configuration/configuration.py">delete</a>(config_id, \*, zone_id) -> <a href="./src/cloudflare/types/token_validation/configuration_delete_response.py">ConfigurationDeleteResponse</a></code>
+- <code title="patch /zones/{zone_id}/token_validation/config/{config_id}">client.token_validation.configuration.<a href="./src/cloudflare/resources/token_validation/configuration/configuration.py">edit</a>(config_id, \*, zone_id, \*\*<a href="src/cloudflare/types/token_validation/configuration_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/token_validation/configuration_edit_response.py">ConfigurationEditResponse</a></code>
+- <code title="get /zones/{zone_id}/token_validation/config/{config_id}">client.token_validation.configuration.<a href="./src/cloudflare/resources/token_validation/configuration/configuration.py">get</a>(config_id, \*, zone_id) -> <a href="./src/cloudflare/types/token_validation/token_config.py">TokenConfig</a></code>
 
-## ResourceGroups
+### Credentials
 
 Types:
 
 ```python
-from cloudflare.types.iam import (
-    ResourceGroupCreateResponse,
-    ResourceGroupUpdateResponse,
-    ResourceGroupListResponse,
-    ResourceGroupDeleteResponse,
-    ResourceGroupGetResponse,
-)
+from cloudflare.types.token_validation.configuration import CredentialUpdateResponse
 ```
 
 Methods:
 
-- <code title="post /accounts/{account_id}/iam/resource_groups">client.iam.resource_groups.<a href="./src/cloudflare/resources/iam/resource_groups.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/iam/resource_group_create_params.py">params</a>) -> <a href="./src/cloudflare/types/iam/resource_group_create_response.py">ResourceGroupCreateResponse</a></code>
-- <code title="put /accounts/{account_id}/iam/resource_groups/{resource_group_id}">client.iam.resource_groups.<a href="./src/cloudflare/resources/iam/resource_groups.py">update</a>(resource_group_id, \*, account_id, \*\*<a href="src/cloudflare/types/iam/resource_group_update_params.py">params</a>) -> <a href="./src/cloudflare/types/iam/resource_group_update_response.py">ResourceGroupUpdateResponse</a></code>
-- <code title="get /accounts/{account_id}/iam/resource_groups">client.iam.resource_groups.<a href="./src/cloudflare/resources/iam/resource_groups.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/iam/resource_group_list_params.py">params</a>) -> <a href="./src/cloudflare/types/iam/resource_group_list_response.py">SyncV4PagePaginationArray[object]</a></code>
-- <code title="delete /accounts/{account_id}/iam/resource_groups/{resource_group_id}">client.iam.resource_groups.<a href="./src/cloudflare/resources/iam/resource_groups.py">delete</a>(resource_group_id, \*, account_id) -> <a href="./src/cloudflare/types/iam/resource_group_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/iam/resource_groups/{resource_group_id}">client.iam.resource_groups.<a href="./src/cloudflare/resources/iam/resource_groups.py">get</a>(resource_group_id, \*, account_id) -> <a href="./src/cloudflare/types/iam/resource_group_get_response.py">ResourceGroupGetResponse</a></code>
-
-# CloudConnector
+- <code title="put /zones/{zone_id}/token_validation/config/{config_id}/credentials">client.token_validation.configuration.credentials.<a href="./src/cloudflare/resources/token_validation/configuration/credentials.py">update</a>(config_id, \*, zone_id, \*\*<a href="src/cloudflare/types/token_validation/configuration/credential_update_params.py">params</a>) -> <a href="./src/cloudflare/types/token_validation/configuration/credential_update_response.py">CredentialUpdateResponse</a></code>
 
 ## Rules
 
 Types:
 
 ```python
-from cloudflare.types.cloud_connector import RuleUpdateResponse, RuleListResponse
+from cloudflare.types.token_validation import TokenValidationRule
 ```
 
 Methods:
 
-- <code title="put /zones/{zone_id}/cloud_connector/rules">client.cloud_connector.rules.<a href="./src/cloudflare/resources/cloud_connector/rules.py">update</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/cloud_connector/rule_update_params.py">params</a>) -> <a href="./src/cloudflare/types/cloud_connector/rule_update_response.py">Optional</a></code>
-- <code title="get /zones/{zone_id}/cloud_connector/rules">client.cloud_connector.rules.<a href="./src/cloudflare/resources/cloud_connector/rules.py">list</a>(\*, zone_id) -> <a href="./src/cloudflare/types/cloud_connector/rule_list_response.py">SyncSinglePage[RuleListResponse]</a></code>
+- <code title="post /zones/{zone_id}/token_validation/rules">client.token_validation.rules.<a href="./src/cloudflare/resources/token_validation/rules.py">create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/token_validation/rule_create_params.py">params</a>) -> <a href="./src/cloudflare/types/token_validation/token_validation_rule.py">TokenValidationRule</a></code>
+- <code title="get /zones/{zone_id}/token_validation/rules">client.token_validation.rules.<a href="./src/cloudflare/resources/token_validation/rules.py">list</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/token_validation/rule_list_params.py">params</a>) -> <a href="./src/cloudflare/types/token_validation/token_validation_rule.py">SyncV4PagePaginationArray[TokenValidationRule]</a></code>
+- <code title="delete /zones/{zone_id}/token_validation/rules/{rule_id}">client.token_validation.rules.<a href="./src/cloudflare/resources/token_validation/rules.py">delete</a>(rule_id, \*, zone_id) -> object</code>
+- <code title="post /zones/{zone_id}/token_validation/rules/bulk">client.token_validation.rules.<a href="./src/cloudflare/resources/token_validation/rules.py">bulk_create</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/token_validation/rule_bulk_create_params.py">params</a>) -> <a href="./src/cloudflare/types/token_validation/token_validation_rule.py">SyncSinglePage[TokenValidationRule]</a></code>
+- <code title="patch /zones/{zone_id}/token_validation/rules/bulk">client.token_validation.rules.<a href="./src/cloudflare/resources/token_validation/rules.py">bulk_edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/token_validation/rule_bulk_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/token_validation/token_validation_rule.py">SyncSinglePage[TokenValidationRule]</a></code>
+- <code title="patch /zones/{zone_id}/token_validation/rules/{rule_id}">client.token_validation.rules.<a href="./src/cloudflare/resources/token_validation/rules.py">edit</a>(rule_id, \*, zone_id, \*\*<a href="src/cloudflare/types/token_validation/rule_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/token_validation/token_validation_rule.py">TokenValidationRule</a></code>
+- <code title="get /zones/{zone_id}/token_validation/rules/{rule_id}">client.token_validation.rules.<a href="./src/cloudflare/resources/token_validation/rules.py">get</a>(rule_id, \*, zone_id) -> <a href="./src/cloudflare/types/token_validation/token_validation_rule.py">TokenValidationRule</a></code>
diff --git a/bin/check-release-environment b/bin/check-release-environment
index b659e91535b..b845b0f4c96 100644
--- a/bin/check-release-environment
+++ b/bin/check-release-environment
@@ -3,7 +3,7 @@
 errors=()
 
 if [ -z "${PYPI_TOKEN}" ]; then
-  errors+=("The CLOUDFLARE_PYPI_TOKEN secret has not been set. Please set it in either this repository's secrets or your organization secrets.")
+  errors+=("The PYPI_TOKEN secret has not been set. Please set it in either this repository's secrets or your organization secrets.")
 fi
 
 lenErrors=${#errors[@]}
diff --git a/bin/publish-pypi b/bin/publish-pypi
index 05bfccbb71e..826054e9248 100644
--- a/bin/publish-pypi
+++ b/bin/publish-pypi
@@ -3,7 +3,4 @@
 set -eux
 mkdir -p dist
 rye build --clean
-# Patching importlib-metadata version until upstream library version is updated
-# https://github.com/pypa/twine/issues/977#issuecomment-2189800841
-"$HOME/.rye/self/bin/python3" -m pip install 'importlib-metadata==7.2.1'
 rye publish --yes --token=$PYPI_TOKEN
diff --git a/docs/v5-migration-guide.md b/docs/v5-migration-guide.md
new file mode 100644
index 00000000000..3871fad358c
--- /dev/null
+++ b/docs/v5-migration-guide.md
@@ -0,0 +1,2230 @@
+# Migration Guide: v4.3.1 → v5
+
+This guide helps you migrate your code from v4.3.1 to v5 of the Cloudflare Python SDK.
+
+## Overview
+
+Version 5 introduces several breaking changes across multiple resources. This guide provides detailed migration instructions for each affected resource.
+
+**Important**: This is a beta release. APIs and types may change before the final v5.0.0 release.
+
+## Quick Reference
+
+Resources with breaking changes:
+
+- [Abuse Reports](#abuse-reports)
+- [ACM Total TLS](#acm-total-tls)
+- [API Gateway Configurations](#api-gateway-configurations)
+- [Cloudforce One Threat Events](#cloudforce-one-threat-events)
+- [D1 Database](#d1-database)
+- [Intel Indicator Feeds](#intel-indicator-feeds)
+- [Logpush Edge](#logpush-edge)
+- [Origin TLS Client Auth Hostnames](#origin-tls-client-auth-hostnames)
+- [Queues Consumers](#queues-consumers)
+- [Radar BGP](#radar-bgp)
+- [Rulesets Rules](#rulesets-rules)
+- [Schema Validation Schemas](#schema-validation-schemas)
+- [Snippets](#snippets)
+- [Zero Trust DLP](#zero-trust-dlp)
+- [Zero Trust Networks](#zero-trust-networks)
+
+---
+
+## Abuse Reports
+
+**Resource**: `abusereports`
+
+### Overview
+
+This resource has breaking changes.
+
+### Changes
+
+#### 1. `create()` endpoint changed from `post /accounts/{account_id}/abuse-reports/{report_type}` to `post /accounts/{account_id}/abuse-reports/{report_param}`
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+---
+
+## ACM Total TLS
+
+**Resource**: `acm.totaltls`
+
+### Overview
+
+The ACM Total TLS resource has undergone a method restructuring in v5. The `create()` method has been removed and replaced with two new methods: `update()` and `edit()`, both of which perform similar functionality but with slightly different semantics.
+
+### Changes
+
+#### 1. Removed `create()` Method
+
+**What changed:**
+
+The `create()` method has been completely removed and replaced with `update()` and `edit()` methods. Both new methods use the same endpoint (`POST /zones/{zone_id}/acm/total_tls`) and similar parameters.
+
+**Before (v4.3.1):**
+
+```python
+client.acm.total_tls.create(
+    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+    enabled=True,
+    certificate_authority="google"
+)
+```
+
+**After (v5):**
+
+```python
+# Option 1: Use update()
+client.acm.total_tls.update(
+    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+    enabled=True,
+    certificate_authority="google"
+)
+
+# Option 2: Use edit()
+client.acm.total_tls.edit(
+    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+    enabled=True,
+    certificate_authority="google"
+)
+```
+
+**Actions Needed:**
+
+1. Replace all calls to `create()` with either `update()` or `edit()`
+2. The parameters remain the same: `zone_id`, `enabled`, and optional `certificate_authority`
+3. Update import statements if needed:
+   - Remove: `from cloudflare.types.acm.total_tls_create_response import TotalTLSCreateResponse`
+   - Add: `from cloudflare.types.acm.total_tls_update_response import TotalTLSUpdateResponse`
+   - Or: `from cloudflare.types.acm.total_tls_edit_response import TotalTLSEditResponse`
+
+---
+
+#### 2. Updated Default Value Handling
+
+**What changed:**
+
+The optional parameter `certificate_authority` now uses the `Omit` type instead of `NotGiven`, and its default value changed from `NOT_GIVEN` to `omit`.
+
+**Before (v4.3.1):**
+
+```python
+from cloudflare._types import NOT_GIVEN
+
+result = client.acm.total_tls.create(
+    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+    enabled=True,
+    certificate_authority=NOT_GIVEN  # Old sentinel value
+)
+```
+
+**After (v5):**
+
+```python
+from cloudflare._types import omit
+
+result = client.acm.total_tls.update(
+    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+    enabled=True,
+    certificate_authority=omit  # New sentinel value
+)
+```
+
+**Actions Needed:**
+
+1. If you explicitly used `NOT_GIVEN`, replace it with `omit`
+2. Update imports from `NOT_GIVEN` to `omit`
+3. If you relied on the default behavior (not passing the parameter), no changes are needed
+
+This is part of a broader SDK improvement to provide more precise type hints and better distinguish between omitted parameters and null values.
+
+---
+
+#### 3. Response Type Changes
+
+**What changed:**
+
+The response type has changed from `TotalTLSCreateResponse` to either `TotalTLSUpdateResponse` or `TotalTLSEditResponse`.
+
+**Before (v4.3.1):**
+
+```python
+from cloudflare.types.acm.total_tls_create_response import TotalTLSCreateResponse
+
+result: TotalTLSCreateResponse = client.acm.total_tls.create(
+    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+    enabled=True
+)
+```
+
+**After (v5):**
+
+```python
+from cloudflare.types.acm.total_tls_update_response import TotalTLSUpdateResponse
+
+result: TotalTLSUpdateResponse = client.acm.total_tls.update(
+    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+    enabled=True
+)
+```
+
+**Actions Needed:**
+
+1. Update type annotations in your code
+2. Update import statements to use the new response types
+3. The response structure remains the same, only the type name has changed
+
+Response types were renamed to match the new method names for consistency across the SDK.
+
+---
+
+## API Gateway Configurations
+
+**Resource**: `apigateway.configurations`
+
+### Overview
+
+This resource has breaking changes.
+
+### Changes
+
+#### 1. `ConfigurationUpdateResponse` type removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+---
+
+## Cloudforce One Threat Events
+
+**Resource**: `cloudforceone.threatevents`
+
+### Overview
+
+The Cloudforce One Threat Events resource has undergone significant changes in v5. The `insights` and `crons` sub-resources have been completely removed, and the `get()` method has been deprecated. Several method signatures have been updated to make previously required parameters optional and add support for new features like multiple indicators per event.
+
+### Changes
+
+#### 1. Removed `insights` Sub-Resource
+
+**What changed:**
+
+The entire `insights` sub-resource has been removed, including all associated methods (`create()`, `delete()`, `edit()`, `get()`) and their response types.
+
+**Before (v4.3.1):**
+
+```python
+from cloudflare import Cloudflare
+
+client = Cloudflare()
+
+insights = client.cloudforce_one.threat_events.insights
+
+result = insights.create(
+    account_id="abc123",
+)
+```
+
+**After (v5):**
+
+```python
+# Use the 'insight' parameter when creating events:
+
+result = client.cloudforce_one.threat_events.create(
+    path_account_id="abc123",
+    category="malware",
+    date="2024-01-01T00:00:00Z",
+    event="event description",
+    raw={"key": "value"},
+    tlp="green",
+    insight="your insight text here"  # New parameter
+)
+```
+
+**Actions Needed:**
+
+1. Replace all `insights` sub-resource calls with the main threat events API
+2. Use the new `insight` parameter when creating or editing events
+3. Update import statements to remove insight-related types:
+   - Remove: `InsightCreateResponse`, `InsightDeleteResponse`, `InsightEditResponse`, `InsightGetResponse`
+4. Refactor code that accessed `client.cloudforce_one.threat_events.insights` to use the main API
+
+Insights functionality was consolidated into the main threat events resource to simplify the API structure and make it easier to attach insights directly to events.
+
+---
+
+#### 2. Removed `crons` Sub-Resource
+
+**What changed:**
+
+The entire `crons` sub-resource has been completely removed from the threat events API.
+
+**Before (v4.3.1):**
+
+```python
+from cloudflare import Cloudflare
+
+client = Cloudflare()
+
+crons = client.cloudforce_one.threat_events.crons
+```
+
+**After (v5):**
+
+```python
+
+```
+
+**Actions Needed:**
+
+1. Remove all references to `client.cloudforce_one.threat_events.crons`
+2. If you relied on cron functionality, contact Cloudflare support for alternative scheduling solutions
+3. Consider using external scheduling mechanisms if needed
+
+The crons functionality was removed as part of the API restructuring. Scheduling operations should be handled outside the threat events API.
+
+---
+
+#### 3. Parameter Changes in `create()` Method
+
+**What changed:**
+
+Several parameters in the `create()` method changed from required to optional, and new parameters were added. The `dataset_id` parameter now has different default behavior.
+
+**Before (v4.3.1):**
+
+```python
+result = client.cloudforce_one.threat_events.create(
+    path_account_id="abc123",
+    attacker="attacker-name",  # Required
+    attacker_country="US",      # Required
+    category="malware",
+    date="2024-01-01T00:00:00Z",
+    event="event description",
+    indicator_type="ipv4",      # Required
+    raw={"key": "value"},
+    tlp="green",
+    dataset_id="dataset-123"    # Must be specified
+)
+```
+
+**After (v5):**
+
+```python
+result = client.cloudforce_one.threat_events.create(
+    path_account_id="abc123",
+    category="malware",
+    date="2024-01-01T00:00:00Z",
+    event="event description",
+    raw={"key": "value"},
+    tlp="green",
+    # Optional parameters:
+    attacker="attacker-name",   # Now optional, can be None
+    attacker_country="US",       # Now optional
+    indicator_type="ipv4",       # Now optional
+    dataset_id="dataset-123",    # Optional - uses default if omitted
+    indicator="192.168.1.1",     # Single indicator (legacy)
+    indicators=[                 # New: Multiple indicators support
+        {"type": "ipv4", "value": "192.168.1.1"},
+        {"type": "domain", "value": "malicious.com"}
+    ],
+    insight="threat intelligence insight"  # New parameter
+)
+```
+
+**Actions Needed:**
+
+1. Update method calls - `attacker`, `attacker_country`, and `indicator_type` are now optional
+2. If you want to omit the attacker, set it to `None` explicitly or use the `omit` sentinel
+3. Consider using the new `indicators` array parameter for events with multiple indicators
+4. If you were always specifying `dataset_id`, continue doing so; if not specified, events will be created in the default "Cloudforce One Threat Events" dataset
+5. Add `insight` parameter when you want to attach insights to events
+
+The changes make the API more flexible by allowing events to be created without always specifying an attacker, and enable more complex scenarios like events with multiple indicators. The default dataset behavior simplifies usage for common cases.
+
+---
+
+#### 4. Parameter Changes in `list()` Method
+
+**What changed:**
+
+The `list()` method now supports cursor-based pagination and STIX2 format export. The `dataset_id` parameter behavior changed.
+
+**Before (v4.3.1):**
+
+```python
+from typing import List
+
+result = client.cloudforce_one.threat_events.list(
+    account_id="abc123",
+    dataset_id=["dataset-123"],  # Required, as List[str]
+    page=1,
+    page_size=50
+)
+```
+
+**After (v5):**
+
+```python
+from cloudflare._types import SequenceNotStr
+
+result = client.cloudforce_one.threat_events.list(
+    account_id="abc123",
+    dataset_id=["dataset-123"],  # Optional, now SequenceNotStr[str]
+    cursor="cursor-token",        # New: cursor-based pagination
+    format="json",                # New: "json" or "stix2"
+    page=1,
+    page_size=50
+)
+```
+
+**Actions Needed:**
+
+1. The `dataset_id` parameter is now optional - omit it to list from the default dataset
+2. Update type hints from `List[str]` to `SequenceNotStr[str]` if you have explicit type annotations
+3. For large result sets (beyond 100,000 records), use the new `cursor` parameter for better performance:
+   ```python
+   # First request
+   result = client.cloudforce_one.threat_events.list(
+       account_id="abc123",
+       page_size=50
+   )
+
+   # Get next page using cursor
+   next_cursor = result.result_info.cursor
+   result = client.cloudforce_one.threat_events.list(
+       account_id="abc123",
+       cursor=next_cursor,
+       page_size=50
+   )
+   ```
+4. Use `format="stix2"` if you need STIX2-formatted output
+
+Cursor-based pagination provides better performance and supports deep pagination beyond the 100,000 record limit of offset-based pagination. STIX2 format support enables better integration with threat intelligence platforms.
+
+---
+
+#### 5. Deprecated `get()` Method
+
+**What changed:**
+
+The `get()` method is now deprecated and marked for removal in a future version.
+
+**Before (v4.3.1):**
+
+```python
+result = client.cloudforce_one.threat_events.get(
+    event_id="event-123",
+    account_id="abc123"
+)
+```
+
+**After (v5):**
+
+```python
+result = client.cloudforce_one.threat_events.get(
+    event_id="event-123",
+    account_id="abc123"
+)
+
+# Use the dataset-specific endpoint via the datasets sub-resource:
+result = client.cloudforce_one.threat_events.datasets.events.get(
+    dataset_id="dataset-123",
+    event_id="event-123",
+    account_id="abc123"
+)
+```
+
+**Actions Needed:**
+
+1. Migrate away from the deprecated `get()` method as soon as possible
+2. Use the dataset-specific events endpoint: `/events/dataset/:dataset_id/events/:event_id`
+3. Access this via the datasets sub-resource API (refer to datasets documentation)
+4. Update your code to handle the new endpoint structure
+
+The new API structure requires dataset context for retrieving individual events, providing better data organization and access control.
+
+---
+
+#### 6. Parameter Changes in `edit()` Method
+
+**What changed:**
+
+The `edit()` method now supports additional optional parameters including `created_at`, `dataset_id`, `insight`, and `raw`.
+
+**Before (v4.3.1):**
+
+```python
+result = client.cloudforce_one.threat_events.edit(
+    event_id="event-123",
+    account_id="abc123",
+    attacker="new-attacker",
+    category="malware",
+    date="2024-01-01T00:00:00Z"
+)
+```
+
+**After (v5):**
+
+```python
+result = client.cloudforce_one.threat_events.edit(
+    event_id="event-123",
+    account_id="abc123",
+    attacker="new-attacker",  # Can now be None
+    category="malware",
+    date="2024-01-01T00:00:00Z",
+    # New optional parameters:
+    created_at="2024-01-01T00:00:00Z",
+    dataset_id="dataset-123",
+    insight="updated insight",
+    raw={"updated": "data"}
+)
+```
+
+**Actions Needed:**
+
+1. No changes required for existing code
+2. Optionally use new parameters to update additional fields:
+   - Use `created_at` to set the creation timestamp
+   - Use `dataset_id` to move events between datasets
+   - Use `insight` to update or add insights
+   - Use `raw` to update raw event data
+3. The `attacker` parameter can now be set to `None` to remove the attacker
+
+Additional parameters provide more comprehensive event editing capabilities and better align with the new event model that includes insights and dataset references.
+
+---
+
+#### 7. Parameter Changes in `bulk_create()` Method
+
+**What changed:**
+
+The `bulk_create()` method now supports an optional `include_created_events` parameter.
+
+**Before (v4.3.1):**
+
+```python
+result = client.cloudforce_one.threat_events.bulk_create(
+    account_id="abc123",
+    data=[
+        {"category": "malware", "date": "2024-01-01T00:00:00Z", ...},
+        {"category": "phishing", "date": "2024-01-02T00:00:00Z", ...}
+    ],
+    dataset_id="dataset-123"
+)
+```
+
+**After (v5):**
+
+```python
+result = client.cloudforce_one.threat_events.bulk_create(
+    account_id="abc123",
+    data=[
+        {"category": "malware", "date": "2024-01-01T00:00:00Z", ...},
+        {"category": "phishing", "date": "2024-01-02T00:00:00Z", ...}
+    ],
+    dataset_id="dataset-123",
+    include_created_events=True  # New parameter
+)
+
+```
+
+**Actions Needed:**
+
+1. No changes required for existing code
+2. Set `include_created_events=True` if you need to track which events were created and their locations:
+   ```python
+   result = client.cloudforce_one.threat_events.bulk_create(
+       account_id="abc123",
+       data=events_data,
+       dataset_id="dataset-123",
+       include_created_events=True
+   )
+
+   # Access created event details
+   for event in result.created_events:
+       print(f"Created event {event.uuid} on shard {event.shard_id}")
+   ```
+
+The new parameter provides better tracking and debugging capabilities for bulk operations, allowing developers to verify which events were successfully created and where they're stored.
+
+---
+
+## D1 Database
+
+**Resource**: `d1.database`
+
+### Overview
+
+The D1 Database resource has been **completely rewritten** in v5. While the new implementation provides all the same core functionality, the API surface has changed significantly. All methods that existed in v4.3.1 have been removed and replaced with new implementations that have different signatures, particularly around path structure and method organization.
+
+**IMPORTANT:** Despite methods having the same names (e.g., `create()`, `delete()`, etc.), the new implementation is **not** a drop-in replacement. The path parameter structure has changed, requiring code updates.
+
+### Changes
+
+#### 1. Complete Resource Reimplementation
+
+**What changed:**
+
+The entire D1 Database resource was regenerated from the updated OpenAPI specification. While method names remain similar, the internal implementation and some signatures have changed.
+
+**Impact:**
+This affects all methods: `create()`, `update()`, `list()`, `delete()`, `edit()`, `export()`, `get()`, `params()`, `query()`, `raw()`, and `import_()`.
+
+---
+
+#### 2. Changed Path Structure for `create()` Method
+
+**What changed:**
+
+The endpoint path and parameter structure for creating databases has changed.
+
+**Before (v4.3.1):**
+
+```python
+from cloudflare import Cloudflare
+
+client = Cloudflare()
+
+result = client.d1.database.create(
+    account_id="abc123",
+    name="my-database",
+)
+```
+
+**After (v5):**
+
+```python
+from cloudflare import Cloudflare
+
+client = Cloudflare()
+
+result = client.d1.database.create(
+    account_id="abc123",
+    name="my-database",
+    jurisdiction="eu",                    # Optional
+    primary_location_hint="weur"          # Optional
+)
+```
+
+**Actions Needed:**
+
+1. Update the `create()` method call to use the new parameter structure
+2. Use the optional `jurisdiction` parameter to restrict where the D1 database runs and stores data:
+   - Values: `"eu"` or `"fedramp"`
+3. Use the optional `primary_location_hint` parameter to specify the region:
+   - Values: `"wnam"`, `"enam"`, `"weur"`, `"eeur"`, `"apac"`, `"oc"`
+4. Note: If `jurisdiction` is specified, the `primary_location_hint` is ignored
+
+The new implementation provides explicit control over data residency and regional placement, which is important for compliance and performance requirements.
+
+---
+
+#### 3. New `update()` Method with Different Purpose
+
+**What changed:**
+
+The `update()` method now specifically handles read replication configuration.
+
+**Before (v4.3.1):**
+
+```python
+result = client.d1.database.update(
+)
+```
+
+**After (v5):**
+
+```python
+result = client.d1.database.update(
+    database_id="def456",
+    account_id="abc123",
+    read_replication={
+        "enabled": True,
+        "regions": ["weur", "enam"]
+    }
+)
+```
+
+**Actions Needed:**
+
+1. The `update()` method now requires a `database_id` as the first positional parameter
+2. The method specifically handles read replication configuration
+3. For other database updates, use the new `edit()` method (PATCH) instead
+4. The `read_replication` parameter is required and must include:
+   - `enabled`: Boolean flag
+   - `regions`: Optional list of regions for read replicas
+
+The separation of `update()` (PUT - full updates) and `edit()` (PATCH - partial updates) follows RESTful conventions more closely and provides clearer semantics for different types of updates.
+
+---
+
+#### 4. New `edit()` Method for Partial Updates
+
+**What changed:**
+
+A new `edit()` method was added for partial updates using HTTP PATCH.
+
+**Before (v4.3.1):**
+
+```python
+
+```
+
+**After (v5):**
+
+```python
+result = client.d1.database.edit(
+    database_id="def456",
+    account_id="abc123",
+    read_replication={
+        "enabled": True
+    }
+)
+```
+
+**Actions Needed:**
+
+1. Use `edit()` for partial updates where you want to modify specific fields
+2. Use `update()` when you want to replace the entire configuration
+3. Both methods currently support `read_replication` configuration
+4. The `database_id` is required as the first positional parameter
+
+Having both `update()` and `edit()` methods provides flexibility for different update scenarios and follows standard REST API patterns.
+
+---
+
+#### 5. Updated `list()` Method Return Type
+
+**What changed:**
+
+The `list()` method now returns a paginated response type instead of a simple list.
+
+**Before (v4.3.1):**
+
+```python
+result = client.d1.database.list(
+    account_id="abc123"
+)
+```
+
+**After (v5):**
+
+```python
+from cloudflare.pagination import SyncV4PagePaginationArray
+
+result = client.d1.database.list(
+    account_id="abc123",
+    name="search-term",  # Optional: filter by name
+    page=1,              # Optional: page number
+    per_page=20          # Optional: items per page
+)
+
+for database in result:
+    print(database.name)
+```
+
+**Actions Needed:**
+
+1. Update code that expects a simple list to handle pagination
+2. Use the new optional parameters for filtering and pagination:
+   - `name`: Search for databases by name
+   - `page`: Specify page number (1-indexed)
+   - `per_page`: Set number of items per page
+3. Iterate through the paginated results or convert to a list if needed:
+   ```python
+   all_databases = list(result)
+   ```
+
+Pagination support allows efficient handling of large numbers of databases and follows the standard pattern used across the Cloudflare API.
+
+---
+
+#### 6. Changed `delete()` Method Return Type
+
+**What changed:**
+
+The `delete()` method now returns a generic `object` type instead of a specific response type.
+
+**Before (v4.3.1):**
+
+```python
+result = client.d1.database.delete(
+    database_id="def456",
+    account_id="abc123"
+)
+```
+
+**After (v5):**
+
+```python
+result = client.d1.database.delete(
+    database_id="def456",
+    account_id="abc123"
+)
+```
+
+**Actions Needed:**
+
+1. Update type annotations to expect `object` instead of a specific response type
+2. The method signature requires `database_id` as the first positional parameter
+3. The operation still returns a confirmation, but without a specific type structure
+
+The generic return type simplifies the API and aligns with the actual API behavior.
+
+---
+
+#### 7. Enhanced `export()` Method
+
+**What changed:**
+
+The `export()` method now has a clearer parameter structure with required and optional fields.
+
+**Before (v4.3.1):**
+
+```python
+result = client.d1.database.export(
+)
+```
+
+**After (v5):**
+
+```python
+result = client.d1.database.export(
+    database_id="def456",
+    account_id="abc123",
+    output_format="polling",      # Required: must be "polling"
+    current_bookmark="bookmark",  # Optional: for polling in-progress export
+    dump_options={                # Optional: export configuration
+        "no_data": False,
+        "no_schema": False,
+        "tables": ["table1", "table2"]
+    }
+)
+
+while result.status == "in_progress":
+    result = client.d1.database.export(
+        database_id="def456",
+        account_id="abc123",
+        output_format="polling",
+        current_bookmark=result.bookmark
+    )
+
+if result.status == "complete":
+    download_url = result.url
+```
+
+**Actions Needed:**
+
+1. Always specify `output_format="polling"` (currently the only supported format)
+2. Use the `current_bookmark` parameter to poll for export completion
+3. Configure export options using `dump_options`:
+   - `no_data`: Set to `True` to export schema only
+   - `no_schema`: Set to `True` to export data only
+   - `tables`: List specific tables to export
+4. Implement polling logic to wait for export completion
+5. Note: Exports block the database, so continue polling to avoid automatic cancellation
+
+The new structure makes the async export process more explicit and provides better control over what gets exported.
+
+---
+
+#### 8. Restructured `import_()` Method with Overloads
+
+**What changed:**
+
+The `import_()` method now uses overloaded signatures for different import actions.
+
+**Before (v4.3.1):**
+
+```python
+result = client.d1.database.import_(
+)
+```
+
+**After (v5):**
+
+```python
+
+result = client.d1.database.import_(
+    database_id="def456",
+    account_id="abc123",
+    action="init",
+    etag="md5-hash-of-file"
+)
+upload_url = result.upload_url
+
+result = client.d1.database.import_(
+    database_id="def456",
+    account_id="abc123",
+    action="ingest",
+    etag="md5-hash-of-file",
+    filename="uploaded-filename"
+)
+
+result = client.d1.database.import_(
+    database_id="def456",
+    account_id="abc123",
+    action="poll",
+    current_bookmark="bookmark-from-ingest"
+)
+```
+
+**Actions Needed:**
+
+1. Break your import logic into three stages:
+
+   **Stage 1: Initialize**
+   ```python
+   import hashlib
+
+   # Calculate MD5 hash
+   with open("database.sql", "rb") as f:
+       etag = hashlib.md5(f.read()).hexdigest()
+
+   # Get upload URL
+   result = client.d1.database.import_(
+       database_id="def456",
+       account_id="abc123",
+       action="init",
+       etag=etag
+   )
+   ```
+
+   **Stage 2: Upload and Ingest**
+   ```python
+   # Upload file to the URL (use requests or similar)
+   import requests
+   with open("database.sql", "rb") as f:
+       requests.put(result.upload_url, data=f)
+
+   # Trigger import
+   result = client.d1.database.import_(
+       database_id="def456",
+       account_id="abc123",
+       action="ingest",
+       etag=etag,
+       filename="database.sql"
+   )
+   bookmark = result.bookmark
+   ```
+
+   **Stage 3: Poll for Completion**
+   ```python
+   while True:
+       status = client.d1.database.import_(
+           database_id="def456",
+           account_id="abc123",
+           action="poll",
+           current_bookmark=bookmark
+       )
+       if status.status == "complete":
+           break
+       time.sleep(5)
+   ```
+
+2. Always calculate and provide the MD5 etag of your SQL file
+3. Use the `current_bookmark` to track import progress
+4. Note: Imports block the database for their duration
+
+The overloaded signatures make each import stage explicit and type-safe, reducing errors and making the multi-step process clearer.
+
+---
+
+#### 9. Enhanced `query()` Method with Overloads
+
+**What changed:**
+
+The `query()` method now supports both single-query and batch-query modes via overloads.
+
+**Before (v4.3.1):**
+
+```python
+result = client.d1.database.query(
+)
+```
+
+**After (v5):**
+
+```python
+from cloudflare.pagination import SyncSinglePage
+
+result = client.d1.database.query(
+    database_id="def456",
+    account_id="abc123",
+    sql="SELECT * FROM users WHERE id = ?",
+    params=["123"]  # Optional: parameterized query
+)
+
+result = client.d1.database.query(
+    database_id="def456",
+    account_id="abc123",
+    batch=[
+        {"sql": "SELECT * FROM users", "params": []},
+        {"sql": "SELECT * FROM posts", "params": []}
+    ]
+)
+
+for query_result in result:
+    for row in query_result.results:
+        print(row)
+```
+
+**Actions Needed:**
+
+1. For single queries, use the `sql` parameter with optional `params`:
+   ```python
+   result = client.d1.database.query(
+       database_id="def456",
+       account_id="abc123",
+       sql="SELECT * FROM users WHERE active = ?",
+       params=["true"]
+   )
+   ```
+
+2. For batch queries, use the `batch` parameter:
+   ```python
+   result = client.d1.database.query(
+       database_id="def456",
+       account_id="abc123",
+       batch=[
+           {"sql": "BEGIN TRANSACTION"},
+           {"sql": "INSERT INTO users (name) VALUES (?)", "params": ["John"]},
+           {"sql": "COMMIT"}
+       ]
+   )
+   ```
+
+3. The return type is now `SyncSinglePage[QueryResult]` for pagination support
+4. Use parameterized queries (the `params` array) to prevent SQL injection
+5. Multiple statements in a single SQL string (separated by semicolons) are also supported
+
+Overloads provide type safety for different query modes, and the batch mode enables efficient execution of multiple queries with transaction support.
+
+---
+
+#### 10. Enhanced `raw()` Method with Overloads
+
+**What changed:**
+
+The `raw()` method now supports both single-query and batch-query modes, similar to `query()`, but returns results as arrays instead of objects for better performance.
+
+**Before (v4.3.1):**
+
+```python
+result = client.d1.database.raw(
+)
+```
+
+**After (v5):**
+
+```python
+from cloudflare.pagination import SyncSinglePage
+
+result = client.d1.database.raw(
+    database_id="def456",
+    account_id="abc123",
+    sql="SELECT id, name, email FROM users",
+    params=[]
+)
+
+for query_result in result:
+    for row in query_result.results:
+        # row = [1, "John", "john@example.com"]
+        user_id, name, email = row
+        print(f"{user_id}: {name} <{email}>")
+
+result = client.d1.database.raw(
+    database_id="def456",
+    account_id="abc123",
+    batch=[
+        {"sql": "SELECT * FROM users"},
+        {"sql": "SELECT * FROM posts"}
+    ]
+)
+```
+
+**Actions Needed:**
+
+1. Use `raw()` instead of `query()` when you need better performance
+2. Adapt your code to handle array results instead of object results:
+
+   **Before (with query()):**
+   ```python
+   result = client.d1.database.query(
+       database_id="def456",
+       account_id="abc123",
+       sql="SELECT id, name FROM users"
+   )
+   for row in result[0].results:
+       print(row.id, row.name)  # Object access
+   ```
+
+   **After (with raw()):**
+   ```python
+   result = client.d1.database.raw(
+       database_id="def456",
+       account_id="abc123",
+       sql="SELECT id, name FROM users"
+   )
+   for row in result[0].results:
+       print(row[0], row[1])  # Array access
+       # Or use tuple unpacking:
+       user_id, name = row
+       print(user_id, name)
+   ```
+
+3. Use the `columns` field to map array indices to column names if needed:
+   ```python
+   query_result = list(result)[0]
+   columns = {name: idx for idx, name in enumerate(query_result.columns)}
+
+   for row in query_result.results:
+       user_id = row[columns["id"]]
+       name = row[columns["name"]]
+   ```
+
+4. Batch queries work the same way as in `query()`
+
+The `raw()` method provides a performance-optimized alternative to `query()` by returning results as arrays instead of objects, reducing memory overhead and serialization time for large result sets.
+
+---
+
+#### 11. Removed `params()` Method
+
+**What changed:**
+
+The `params()` method has been completely removed with no direct replacement.
+
+**Before (v4.3.1):**
+
+```python
+result = client.d1.database.params(
+)
+```
+
+**After (v5):**
+
+```python
+# Use query() or raw() methods with the params parameter instead
+
+result = client.d1.database.query(
+    database_id="def456",
+    account_id="abc123",
+    sql="SELECT * FROM users WHERE id = ?",
+    params=["123"]  # Pass params here
+)
+```
+
+**Actions Needed:**
+
+1. Remove all calls to `params()`
+2. Use parameterized queries in `query()` or `raw()` methods:
+   ```python
+   # Instead of a separate params() call, pass params inline:
+   result = client.d1.database.query(
+       database_id="def456",
+       account_id="abc123",
+       sql="SELECT * FROM users WHERE active = ? AND role = ?",
+       params=["true", "admin"]
+   )
+   ```
+
+The functionality was consolidated into the query methods themselves, making parameterized queries more intuitive and eliminating an unnecessary separate method.
+
+---
+
+#### 12. Type Changes: Response Types Removed and Replaced
+
+**What changed:**
+
+Several response types were removed and replaced with new ones.
+
+**Removed Types:**
+- `DatabaseImportResponse`
+- `DatabaseExportResponse`
+- `DatabaseListResponse`
+- `DatabaseRawResponse`
+- `QueryResult`
+
+**Before (v4.3.1):**
+
+```python
+from cloudflare.types.d1 import (
+    DatabaseImportResponse,
+    DatabaseExportResponse,
+    DatabaseListResponse,
+    DatabaseRawResponse,
+    QueryResult
+)
+```
+
+**After (v5):**
+
+```python
+from cloudflare.types.d1.database_import_response import DatabaseImportResponse
+from cloudflare.types.d1.database_export_response import DatabaseExportResponse
+from cloudflare.types.d1.database_list_response import DatabaseListResponse
+from cloudflare.types.d1.database_raw_response import DatabaseRawResponse
+from cloudflare.types.d1.query_result import QueryResult
+```
+
+**Actions Needed:**
+
+1. Update import statements to use the new module paths if you import types directly
+2. The types themselves may have internal structural changes - review your code that accesses response fields
+3. Most code should work without changes if you don't rely on specific type annotations
+
+Types were regenerated from the updated OpenAPI spec to ensure accuracy and maintain consistency with the API.
+
+---
+
+#### 13. Path Parameter Changes Across All Methods
+
+**What changed:**
+
+All methods now require explicit `database_id` where appropriate, moving from a potentially different parameter structure.
+
+**Before (v4.3.1):**
+
+```python
+result = client.d1.database.get(
+    account_id="abc123",
+    database_id="def456"
+)
+```
+
+**After (v5):**
+
+```python
+result = client.d1.database.get(
+    database_id="def456",  # First positional parameter
+    account_id="abc123"     # Named parameter
+)
+```
+
+**Actions Needed:**
+
+1. Review all D1 database method calls
+2. Ensure `database_id` is passed as the first parameter (after `self`) for methods that operate on specific databases
+3. Methods that operate on a specific database:
+   - `update(database_id, ...)`
+   - `delete(database_id, ...)`
+   - `edit(database_id, ...)`
+   - `export(database_id, ...)`
+   - `get(database_id, ...)`
+   - `import_(database_id, ...)`
+   - `query(database_id, ...)`
+   - `raw(database_id, ...)`
+
+4. Methods that operate at the account level:
+   - `create(account_id, ...)` - Creates a new database
+   - `list(account_id, ...)` - Lists all databases
+
+Consistent parameter ordering improves API usability and follows RESTful conventions where resource identifiers appear earlier in the method signature.
+
+---
+
+## General Migration Strategy
+
+Given the extensive nature of changes to the D1 Database resource, we recommend the following migration approach:
+
+1. **Audit Your Code:** Identify all locations where you use `client.d1.database.*` methods
+
+2. **Update Method Calls:** Go through each method call and update according to the specific breaking changes documented above
+
+3. **Test Thoroughly:** The reimplementation means you should test all D1-related functionality, even if the method names haven't changed
+
+4. **Update Type Annotations:** If you use explicit type hints, update them to match the new response types
+
+5. **Handle Pagination:** Update code to handle paginated responses from `list()` and query methods
+
+6. **Review Error Handling:** Error responses may have changed; update your error handling code accordingly
+
+7. **Consider Using Raw Queries:** If performance is critical, evaluate switching from `query()` to `raw()` for read operations
+
+## Summary
+
+The D1 Database resource has been completely overhauled in v5. While this provides a more robust and feature-rich API, it requires careful migration. The key changes are:
+
+- All methods have new implementations with updated signatures
+- Path parameters are now consistently ordered
+- Query methods support both single and batch modes
+- Pagination support for list operations
+- Better type safety with overloaded method signatures
+- Removed `params()` method in favor of inline parameterization
+- New `edit()` method for partial updates
+- Enhanced import/export workflows with explicit multi-step processes
+
+Plan for significant testing time when migrating D1 Database code to v5.
+
+---
+
+## Intel Indicator Feeds
+
+**Resource**: `intel.indicatorfeeds`
+
+### Overview
+
+The Intel Indicator Feeds resource has undergone a structural change in v5 with the removal of the `downloads` sub-resource. The `get()` method that was previously available under the downloads sub-resource has been removed. The main indicator feeds functionality remains largely intact with minor parameter handling improvements.
+
+### Changes
+
+#### 1. Removed `downloads` Sub-Resource
+
+**What changed:**
+
+The entire `downloads` sub-resource has been completely removed, along with its `get()` method.
+
+**Before (v4.3.1):**
+
+```python
+from cloudflare import Cloudflare
+
+client = Cloudflare()
+
+downloads = client.intel.indicator_feeds.downloads
+
+result = downloads.get(
+    feed_id=123,
+    account_id="abc123"
+)
+```
+
+**After (v5):**
+
+```python
+# Use the main data() method instead:
+
+data = client.intel.indicator_feeds.data(
+    feed_id=123,
+    account_id="abc123"
+)
+```
+
+**Actions Needed:**
+
+1. Replace all references to `client.intel.indicator_feeds.downloads` with the main resource
+2. Replace `downloads.get()` calls with `indicator_feeds.data()`:
+
+   **Before:**
+   ```python
+   downloads = client.intel.indicator_feeds.downloads
+   result = downloads.get(
+       feed_id=123,
+       account_id="abc123"
+   )
+   ```
+
+   **After:**
+   ```python
+   result = client.intel.indicator_feeds.data(
+       feed_id=123,
+       account_id="abc123"
+   )
+   ```
+
+3. Remove any imports related to the downloads sub-resource:
+   ```python
+   # Remove these imports
+   from cloudflare.resources.intel.indicator_feeds.downloads import (
+       DownloadsResource,
+       AsyncDownloadsResource
+   )
+   from cloudflare.types.intel.indicator_feeds.download_get_response import (
+       DownloadGetResponse
+   )
+   ```
+
+4. Update type annotations if you were using `DownloadGetResponse`:
+   ```python
+   # The data() method returns str
+   result: str = client.intel.indicator_feeds.data(
+       feed_id=123,
+       account_id="abc123"
+   )
+   ```
+
+The downloads functionality was consolidated into the main indicator feeds resource through the `data()` method, simplifying the API structure and eliminating redundant resource nesting.
+
+---
+
+#### 2. Updated Default Value Handling
+
+**What changed:**
+
+Optional parameters now use the `Omit` type instead of `NotGiven`, and default values changed from `NOT_GIVEN` to `omit`.
+
+**Before (v4.3.1):**
+
+```python
+from cloudflare._types import NOT_GIVEN, NotGiven
+
+result = client.intel.indicator_feeds.create(
+    account_id="abc123",
+    name="My Feed",
+    description=NOT_GIVEN  # Old sentinel value
+)
+```
+
+**After (v5):**
+
+```python
+from cloudflare._types import omit, Omit
+
+result = client.intel.indicator_feeds.create(
+    account_id="abc123",
+    name="My Feed",
+    description=omit  # New sentinel value
+)
+```
+
+**Actions Needed:**
+
+1. If you explicitly used `NOT_GIVEN`, replace it with `omit`:
+   ```python
+   # Before
+   from cloudflare._types import NOT_GIVEN
+
+   result = client.intel.indicator_feeds.create(
+       account_id="abc123",
+       name="My Feed",
+       description=NOT_GIVEN
+   )
+
+   # After
+   from cloudflare._types import omit
+
+   result = client.intel.indicator_feeds.create(
+       account_id="abc123",
+       name="My Feed",
+       description=omit
+   )
+   ```
+
+2. Update type hints from `NotGiven` to `Omit`:
+   ```python
+   # Before
+   from cloudflare._types import NotGiven
+
+   def create_feed(name: str, description: str | NotGiven = NOT_GIVEN):
+       pass
+
+   # After
+   from cloudflare._types import Omit, omit
+
+   def create_feed(name: str, description: str | Omit = omit):
+       pass
+   ```
+
+3. If you relied on the default behavior (not passing optional parameters), no changes are needed:
+   ```python
+   # This works in both versions
+   result = client.intel.indicator_feeds.create(
+       account_id="abc123",
+       name="My Feed"
+   )
+   ```
+
+The `Omit` type provides more precise type hints and better distinguishes between omitted parameters and explicit null values, improving type safety across the SDK.
+
+---
+
+#### 3. Consistent Timeout Parameter Type
+
+**What changed:**
+
+The timeout parameter default value changed from `NOT_GIVEN` to `not_given` (note the lowercase).
+
+**Before (v4.3.1):**
+
+```python
+from cloudflare._types import NOT_GIVEN
+
+result = client.intel.indicator_feeds.list(
+    account_id="abc123",
+    timeout=NOT_GIVEN
+)
+```
+
+**After (v5):**
+
+```python
+from cloudflare._types import not_given
+
+result = client.intel.indicator_feeds.list(
+    account_id="abc123",
+    timeout=not_given
+)
+```
+
+**Actions Needed:**
+
+1. Replace `NOT_GIVEN` with `not_given` for timeout parameters:
+   ```python
+   from cloudflare._types import not_given
+
+   # Explicitly set timeout
+   result = client.intel.indicator_feeds.list(
+       account_id="abc123",
+       timeout=30.0  # 30 seconds
+   )
+
+   # Or use default
+   result = client.intel.indicator_feeds.list(
+       account_id="abc123"
+       # timeout defaults to not_given
+   )
+   ```
+
+2. In practice, you rarely need to explicitly pass the sentinel value - just omit the parameter:
+   ```python
+   # Preferred approach
+   result = client.intel.indicator_feeds.list(
+       account_id="abc123"
+   )
+   ```
+
+The lowercase `not_given` is used consistently for timeout parameters across the SDK, while `omit` is used for business logic parameters, providing clearer semantic meaning.
+
+---
+
+#### 4. Updated Method Signatures (Non-Breaking Changes)
+
+**What changed:**
+
+Several methods had their signatures updated to use the new `Omit` type, but the actual behavior remains the same.
+
+**Methods affected:**
+- `create()`
+- `update()`
+- `list()`
+- `data()`
+- `get()`
+
+**Example - create() method:**
+```python
+# v4.3.1 signature:
+def create(
+    self,
+    *,
+    account_id: str,
+    description: str | NotGiven = NOT_GIVEN,
+    name: str | NotGiven = NOT_GIVEN,
+    ...
+) -> Optional[IndicatorFeedCreateResponse]:
+
+# v5 signature:
+def create(
+    self,
+    *,
+    account_id: str,
+    description: str | Omit = omit,
+    name: str | Omit = omit,
+    ...
+) -> Optional[IndicatorFeedCreateResponse]:
+```
+
+**Before (v4.3.1):**
+
+```python
+from cloudflare import Cloudflare
+from cloudflare._types import NOT_GIVEN
+
+client = Cloudflare()
+account_id = "abc123"
+
+feed = client.intel.indicator_feeds.create(
+    account_id=account_id,
+    name="My Threat Feed",
+    description="Threat intelligence feed"
+)
+
+downloads = client.intel.indicator_feeds.downloads
+data = downloads.get(
+    feed_id=feed.id,
+    account_id=account_id
+)
+
+updated = client.intel.indicator_feeds.update(
+    feed_id=feed.id,
+    account_id=account_id,
+    name="Updated Feed Name",
+    description=NOT_GIVEN
+)
+
+feeds = client.intel.indicator_feeds.list(
+    account_id=account_id
+)
+```
+
+**After (v5):**
+
+```python
+from cloudflare import Cloudflare
+from cloudflare._types import omit
+
+client = Cloudflare()
+account_id = "abc123"
+
+feed = client.intel.indicator_feeds.create(
+    account_id=account_id,
+    name="My Threat Feed",
+    description="Threat intelligence feed"
+)
+
+# Get feed data (no longer uses downloads sub-resource)
+data = client.intel.indicator_feeds.data(
+    feed_id=feed.id,
+    account_id=account_id
+)
+
+updated = client.intel.indicator_feeds.update(
+    feed_id=feed.id,
+    account_id=account_id,
+    name="Updated Feed Name",
+    description=omit  # Or simply omit the parameter
+)
+
+# Or better: just omit optional parameters
+updated = client.intel.indicator_feeds.update(
+    feed_id=feed.id,
+    account_id=account_id,
+    name="Updated Feed Name"
+)
+
+feeds = client.intel.indicator_feeds.list(
+    account_id=account_id
+)
+
+# Use new permissions sub-resource
+permissions = client.intel.indicator_feeds.permissions.list(
+    account_id=account_id
+)
+```
+
+**Actions Needed:**
+
+These changes are largely transparent if you're using the methods normally:
+
+```python
+# This code works in both versions
+result = client.intel.indicator_feeds.create(
+    account_id="abc123",
+    name="My Indicator Feed",
+    description="Feed description"
+)
+
+# Optional parameters can be omitted
+result = client.intel.indicator_feeds.create(
+    account_id="abc123",
+    name="My Indicator Feed"
+)
+```
+
+If you have explicit type annotations:
+```python
+# Before
+from cloudflare._types import NotGiven, NOT_GIVEN
+
+def create_feed(
+    name: str,
+    description: str | NotGiven = NOT_GIVEN
+) -> None:
+    pass
+
+# After
+from cloudflare._types import Omit, omit
+
+def create_feed(
+    name: str,
+    description: str | Omit = omit
+) -> None:
+    pass
+```
+
+Consistent use of `Omit` across all methods improves type safety and provides better IDE support.
+
+---
+
+## New Features in v5
+
+While not breaking changes, the indicator feeds resource gained new functionality through the permissions sub-resource:
+
+---
+
+## Logpush Edge
+
+**Resource**: `logpush.edge`
+
+### Overview
+
+This resource has breaking changes.
+
+### Changes
+
+#### 1. `get()` endpoint changed from `get /zones/{zone_id}/logpush/edge` to `get /zones/{zone_id}/logpush/edge/jobs`
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+---
+
+## Origin TLS Client Auth Hostnames
+
+**Resource**: `origintlsclientauth.hostnames`
+
+### Overview
+
+This resource has breaking changes.
+
+### Changes
+
+#### 1. `create()` method removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+#### 2. `delete()` method removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+#### 3. `list()` method removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+#### 4. `get()` endpoint changed from `get /zones/{zone_id}/origin_tls_client_auth/hostnames/certificates/{certificate_id}` to `get /zones/{zone_id}/origin_tls_client_auth/hostnames/{hostname}`
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+#### 5. `Certificate` type removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+#### 6. `CertificateCreateResponse` type removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+#### 7. `CertificateDeleteResponse` type removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+#### 8. `CertificateGetResponse` type removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+#### 9. `CertificateListResponse` type removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+---
+
+## Queues Consumers
+
+**Resource**: `queues.consumers`
+
+### Overview
+
+The Queues Consumers resource has undergone a significant restructuring in v5. The primary breaking change is the modification of the `get()` method endpoint and the addition of a new `list()` method. This change better aligns with RESTful conventions by separating the concerns of listing all consumers from fetching a specific consumer.
+
+### Changes
+
+#### 1. Changed `get()` Method Endpoint and Signature
+
+**What changed:**
+
+The `get()` method endpoint changed from listing all consumers to fetching a specific consumer by ID. A new `list()` method was added to replace the old `get()` behavior.
+
+**Before (v4.3.1):**
+
+```python
+from cloudflare import Cloudflare
+
+client = Cloudflare()
+
+consumers = client.queues.consumers.get(
+    queue_id="abc123",
+    account_id="def456"
+)
+
+for consumer in consumers:
+    print(f"Consumer: {consumer.consumer_id}")
+```
+
+**After (v5):**
+
+```python
+from cloudflare import Cloudflare
+
+client = Cloudflare()
+
+consumer = client.queues.consumers.get(
+    consumer_id="consumer-123",  # New required parameter
+    account_id="def456",
+    queue_id="abc123"
+)
+
+print(f"Consumer: {consumer.consumer_id}")
+```
+
+**Actions Needed:**
+
+1. **If you were listing all consumers**, replace `get()` with `list()`:
+   ```python
+   # Before
+   consumers = client.queues.consumers.get(
+       queue_id="abc123",
+       account_id="def456"
+   )
+
+   # After
+   consumers = client.queues.consumers.list(
+       queue_id="abc123",
+       account_id="def456"
+   )
+
+   # Both return an iterable of consumers
+   for consumer in consumers:
+       print(consumer.consumer_id)
+   ```
+
+2. **If you were getting a specific consumer** (by filtering the list), use the new `get()` directly:
+   ```python
+   # Before (inefficient)
+   consumers = client.queues.consumers.get(
+       queue_id="abc123",
+       account_id="def456"
+   )
+   consumer = next(c for c in consumers if c.consumer_id == "consumer-123")
+
+   # After (efficient)
+   consumer = client.queues.consumers.get(
+       consumer_id="consumer-123",
+       account_id="def456",
+       queue_id="abc123"
+   )
+   ```
+
+3. **Update type annotations**:
+   ```python
+   # Before
+   from cloudflare.pagination import SyncSinglePage
+   from cloudflare.types.queues import Consumer
+
+   consumers: SyncSinglePage[Consumer] = client.queues.consumers.get(...)
+
+   # After - for list()
+   from cloudflare.pagination import SyncSinglePage
+   from cloudflare.types.queues import Consumer
+
+   consumers: SyncSinglePage[Consumer] = client.queues.consumers.list(...)
+
+   # After - for get()
+   from cloudflare.types.queues import Consumer
+   from typing import Optional
+
+   consumer: Optional[Consumer] = client.queues.consumers.get(...)
+   ```
+
+The change aligns with RESTful API conventions where:
+- `GET /resource` returns a list of resources
+- `GET /resource/{id}` returns a specific resource by ID
+
+The previous implementation had `get()` returning a list, which was semantically incorrect. Now:
+- `list()` returns all consumers for a queue
+- `get()` returns a specific consumer by ID
+
+---
+
+#### 2. Added `list()` Method
+
+**What changed:**
+
+A new `list()` method was added to retrieve all consumers for a queue.
+
+**Before (v4.3.1):**
+
+```python
+consumers = client.queues.consumers.get(
+    queue_id="abc123",
+    account_id="def456"
+)
+```
+
+**After (v5):**
+
+```python
+# Use list() to list consumers
+consumers = client.queues.consumers.list(
+    queue_id="abc123",
+    account_id="def456"
+)
+```
+
+**Actions Needed:**
+
+Simply replace `get()` calls with `list()` when you need all consumers:
+
+```python
+from cloudflare import Cloudflare
+
+client = Cloudflare()
+
+# List all consumers for a queue
+consumers = client.queues.consumers.list(
+    queue_id="abc123",
+    account_id="def456"
+)
+
+# Iterate through consumers
+for consumer in consumers:
+    print(f"Consumer ID: {consumer.consumer_id}")
+    print(f"Script: {consumer.script_name}")
+    print(f"Type: {consumer.type}")
+```
+
+The `list()` method name clearly indicates its purpose of listing multiple resources, improving API discoverability and consistency with other Cloudflare resources.
+
+---
+
+#### 3. Updated Default Value Handling
+
+**What changed:**
+
+Optional parameters now use the `Omit` type instead of `NotGiven`, and default values changed from `NOT_GIVEN` to `omit`.
+
+**Before (v4.3.1):**
+
+```python
+from cloudflare._types import NOT_GIVEN, NotGiven
+
+result = client.queues.consumers.create(
+    queue_id="abc123",
+    account_id="def456",
+    script_name="my-worker",
+    dead_letter_queue=NOT_GIVEN,
+    settings=NOT_GIVEN
+)
+```
+
+**After (v5):**
+
+```python
+from cloudflare._types import omit, Omit
+
+result = client.queues.consumers.create(
+    queue_id="abc123",
+    account_id="def456",
+    script_name="my-worker",
+    dead_letter_queue=omit,
+    settings=omit
+)
+```
+
+**Actions Needed:**
+
+1. **Replace imports**:
+   ```python
+   # Before
+   from cloudflare._types import NOT_GIVEN, NotGiven
+
+   # After
+   from cloudflare._types import omit, Omit
+   ```
+
+2. **Replace sentinel values**:
+   ```python
+   # Before
+   result = client.queues.consumers.create(
+       queue_id="abc123",
+       account_id="def456",
+       dead_letter_queue=NOT_GIVEN
+   )
+
+   # After
+   result = client.queues.consumers.create(
+       queue_id="abc123",
+       account_id="def456",
+       dead_letter_queue=omit
+   )
+   ```
+
+3. **Update type hints**:
+   ```python
+   # Before
+   from cloudflare._types import NotGiven
+
+   def create_consumer(
+       script_name: str,
+       settings: dict | NotGiven = NOT_GIVEN
+   ) -> None:
+       pass
+
+   # After
+   from cloudflare._types import Omit, omit
+
+   def create_consumer(
+       script_name: str,
+       settings: dict | Omit = omit
+   ) -> None:
+       pass
+   ```
+
+4. **Preferred approach - omit optional parameters entirely**:
+   ```python
+   # Best practice: just don't pass optional parameters
+   result = client.queues.consumers.create(
+       queue_id="abc123",
+       account_id="def456",
+       script_name="my-worker"
+       # No need to explicitly pass omit for optional parameters
+   )
+   ```
+
+The `Omit` type provides better type safety and clearer semantics for distinguishing between omitted parameters and explicit null values.
+
+---
+
+#### 4. Consistent Timeout Parameter Handling
+
+**What changed:**
+
+The timeout parameter default value changed from `NOT_GIVEN` to `not_given` (lowercase).
+
+**Before (v4.3.1):**
+
+```python
+from cloudflare._types import NOT_GIVEN
+
+result = client.queues.consumers.list(
+    queue_id="abc123",
+    account_id="def456",
+    timeout=NOT_GIVEN
+)
+```
+
+**After (v5):**
+
+```python
+from cloudflare._types import not_given
+
+result = client.queues.consumers.list(
+    queue_id="abc123",
+    account_id="def456",
+    timeout=not_given
+)
+```
+
+**Actions Needed:**
+
+In practice, you rarely need to explicitly pass the sentinel value:
+
+```python
+# Specify a custom timeout
+result = client.queues.consumers.list(
+    queue_id="abc123",
+    account_id="def456",
+    timeout=30.0  # 30 seconds
+)
+
+# Or use default (preferred)
+result = client.queues.consumers.list(
+    queue_id="abc123",
+    account_id="def456"
+    # timeout defaults to not_given
+)
+```
+
+Consistent use of lowercase `not_given` for infrastructure parameters like timeout improves consistency across the SDK.
+
+---
+
+## Non-Breaking Changes
+
+The following methods retain the same functionality with updated type signatures:
+
+---
+
+## Radar BGP
+
+**Resource**: `radar.bgp`
+
+### Overview
+
+This resource has breaking changes.
+
+### Changes
+
+#### 1. `timeseries()` endpoint changed from `get /radar/bgp/ips/timeseries` to `get /radar/bgp/rpki/aspa/timeseries`
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+#### 2. `IPTimeseriesResponse` type removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+---
+
+## Rulesets Rules
+
+**Resource**: `rulesets.rules`
+
+### Overview
+
+This resource has breaking changes.
+
+### Changes
+
+#### 1. `RewriteURIPart` type removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+---
+
+## Schema Validation Schemas
+
+**Resource**: `schemavalidation.schemas`
+
+### Overview
+
+This resource has breaking changes.
+
+### Changes
+
+#### 1. `SchemaCreateResponse` type removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+#### 2. `SchemaEditResponse` type removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+#### 3. `SchemaGetResponse` type removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+#### 4. `SchemaListResponse` type removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+---
+
+## Snippets
+
+**Resource**: `snippets`
+
+### Overview
+
+This resource has breaking changes.
+
+### Changes
+
+#### 1. `Snippet` type removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+---
+
+## Zero Trust DLP
+
+**Resource**: `zerotrust.dlp`
+
+### Overview
+
+This resource has breaking changes.
+
+### Changes
+
+#### 1. `update()` endpoint changed from `put /accounts/{account_id}/dlp/entries/{entry_id}` to `put /accounts/{account_id}/dlp/entries/integration/{entry_id}`
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+#### 2. `EntryCreateResponse` type removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+#### 3. `EntryGetResponse` type removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+#### 4. `EntryListResponse` type removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+#### 5. `EntryUpdateResponse` type removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+---
+
+## Zero Trust Networks
+
+**Resource**: `zerotrust.networks`
+
+### Overview
+
+This resource has breaking changes.
+
+### Changes
+
+#### 1. `update()` method removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+#### 2. `CloudflareSourceUpdateResponse` type removed
+
+**Actions Needed:**
+
+Review the changes above and update your code accordingly.
+
+---
diff --git a/examples/workers/ai/demo.py b/examples/ai/demo.py
similarity index 93%
rename from examples/workers/ai/demo.py
rename to examples/ai/demo.py
index 18a35dd46a2..8244662c683 100644
--- a/examples/workers/ai/demo.py
+++ b/examples/ai/demo.py
@@ -7,10 +7,9 @@
 if account_id is None:
     sys.exit("CLOUDFLARE_ACCOUNT_ID is not defined")
 
-
 client = Cloudflare()
 
-t = client.workers.ai.run(
+t = client.ai.run(
     "@cf/meta/m2m100-1.2b",
     account_id=account_id,
     text="I'll have an order of the moule frites",
diff --git a/examples/dns/record.py b/examples/dns/record.py
index 091442174c9..87b3d4fd17a 100644
--- a/examples/dns/record.py
+++ b/examples/dns/record.py
@@ -11,10 +11,16 @@
 
 record = client.dns.records.create(
     zone_id=zone_id,
-    type='A',
+    type="A",
     name="www.mydns.com",
     content="198.51.100.1",
-    proxied=True
+    ttl=1,
+    proxied=True,
 )
+assert record is not None
 
-# print(record)
+# clean up after we're done
+client.dns.records.delete(
+    zone_id=zone_id,
+    dns_record_id=record.id,
+)
diff --git a/examples/workers/script_upload.py b/examples/workers/script_upload.py
new file mode 100644
index 00000000000..d7a1cf5823d
--- /dev/null
+++ b/examples/workers/script_upload.py
@@ -0,0 +1,99 @@
+"""Workers Script Upload Example
+
+Generate an API token:
+https://developers.cloudflare.com/fundamentals/api/get-started/create-token/
+(Not Global API Key!)
+
+Find your account id:
+https://developers.cloudflare.com/fundamentals/setup/find-account-and-zone-ids/
+
+Set these environment variables:
+- CLOUDFLARE_API_TOKEN
+- CLOUDFLARE_ACCOUNT_ID
+
+
+### Workers for Platforms ###
+
+For uploading a User Worker to a dispatch namespace:
+https://developers.cloudflare.com/cloudflare-for-platforms/workers-for-platforms/
+
+Change the entire "script = " line to the following:
+"script = client.workers_for_platforms.dispatch.namespaces.scripts.update("
+
+Then, define a "dispatch_namespace_name" variable and add a
+"dispatch_namespace=dispatch_namespace_name" keyword argument to the "update" method.
+"""
+
+import os
+
+from cloudflare import Cloudflare, APIStatusError
+
+API_TOKEN = os.environ.get("CLOUDFLARE_API_TOKEN")
+if API_TOKEN is None:
+    raise RuntimeError("Please set envar CLOUDFLARE_API_TOKEN")
+
+ACCOUNT_ID = os.environ.get("CLOUDFLARE_ACCOUNT_ID")
+if ACCOUNT_ID is None:
+    raise RuntimeError("Please set envar CLOUDFLARE_ACCOUNT_ID")
+
+client = Cloudflare(api_token=API_TOKEN)
+
+
+def main() -> None:
+    """Workers Script Upload Example"""
+
+    script_name = "my-hello-world-script"
+    script_file_name = f"{script_name}.mjs"
+
+    # Workers Scripts prefer Module Syntax
+    # https://blog.cloudflare.com/workers-javascript-modules/
+    script_content = """
+    export default {
+        async fetch(request, env, ctx) {
+            return new Response(env.MESSAGE, { status: 200 });
+        }
+    };
+    """
+
+    try:
+        # https://developers.cloudflare.com/api/resources/workers/subresources/scripts/methods/update/
+        script = client.workers.scripts.update(
+            script_name,
+            account_id=ACCOUNT_ID,  # type: ignore
+            # https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/
+            metadata={
+                "main_module": script_file_name,
+                "bindings": [
+                    {
+                        "type": "plain_text",
+                        "name": "MESSAGE",
+                        "text": "Hello World!",
+                    }
+                ],
+            },
+            files=[
+                # Add main_module file
+                # Note: Content-Type must be "application/javascript" or "text/javascript"
+                (
+                    script_file_name,
+                    bytes(script_content, "utf-8"),
+                    "application/javascript",
+                ),
+                # Can add other files, such as more modules or source maps
+                # (
+                #     source_map_file_name,
+                #     bytes(source_map_content, "utf-8"),
+                #     "application/source-map",
+                # ),
+            ],
+        )
+        print("Script Upload success!")
+        print(script.to_json(indent=2))
+    except APIStatusError as err:
+        print("Script Upload failure!")
+        print(f"Error code: {err.status_code}")
+        print(err)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/mypy.ini b/mypy.ini
deleted file mode 100644
index ec35df6ad25..00000000000
--- a/mypy.ini
+++ /dev/null
@@ -1,47 +0,0 @@
-[mypy]
-pretty = True
-show_error_codes = True
-
-# Exclude _files.py because mypy isn't smart enough to apply
-# the correct type narrowing and as this is an internal module
-# it's fine to just use Pyright.
-exclude = ^(src/cloudflare/_files\.py|_dev/.*\.py|src/cloudflare/resources/zero_trust/identity_providers\.py|src/cloudflare/resources/zero_trust/access/applications/applications\.py|src/cloudflare/resources/workers/ai\.py|src/cloudflare/resources/magic_transit/apps\.py)$
-
-strict_equality = True
-implicit_reexport = True
-check_untyped_defs = True
-no_implicit_optional = True
-
-warn_return_any = True
-warn_unreachable = True
-warn_unused_configs = True
-
-# Turn these options off as it could cause conflicts
-# with the Pyright options.
-warn_unused_ignores = False
-warn_redundant_casts = False
-
-disallow_any_generics = True
-disallow_untyped_defs = True
-disallow_untyped_calls = True
-disallow_subclassing_any = True
-disallow_incomplete_defs = True
-disallow_untyped_decorators = True
-cache_fine_grained = True
-
-# By default, mypy reports an error if you assign a value to the result
-# of a function call that doesn't return anything. We do this in our test
-# cases:
-# ```
-# result = ...
-# assert result is None
-# ```
-# Changing this codegen to make mypy happy would increase complexity
-# and would not be worth it.
-disable_error_code = func-returns-value
-
-# https://github.com/python/mypy/issues/12162
-[mypy.overrides]
-module = "black.files.*"
-ignore_errors = true
-ignore_missing_imports = true
diff --git a/pyproject.toml b/pyproject.toml
index a7dd71ade61..a5a2adb78ec 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,32 +1,32 @@
 [project]
 name = "cloudflare"
-version = "3.1.1"
+version = "5.0.0-beta.1"
 description = "The official Python library for the cloudflare API"
 dynamic = ["readme"]
 license = "Apache-2.0"
 authors = [
 { name = "Cloudflare", email = "api@cloudflare.com" },
 ]
-dependencies = [
-    "httpx>=0.23.0, <0.28",
-    "pydantic>=1.9.0, <2.10",
-    "typing-extensions>=4.7, <5",
-    "anyio>=3.5.0, <5",
-    "distro>=1.7.0, <2",
-    "sniffio",
-    "cached-property; python_version < '3.8'",
 
+dependencies = [
+  "httpx>=0.23.0, <1",
+  "pydantic>=1.9.0, <3",
+  "typing-extensions>=4.10, <5",
+  "anyio>=3.5.0, <5",
+  "distro>=1.7.0, <2",
+  "sniffio",
 ]
-requires-python = ">= 3.7"
+
+requires-python = ">= 3.9"
 classifiers = [
   "Typing :: Typed",
   "Intended Audience :: Developers",
-  "Programming Language :: Python :: 3.7",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Operating System :: OS Independent",
   "Operating System :: POSIX",
   "Operating System :: MacOS",
@@ -36,20 +36,19 @@ classifiers = [
   "License :: OSI Approved :: Apache Software License"
 ]
 
-
-
 [project.urls]
 Homepage = "https://github.com/cloudflare/cloudflare-python"
 Repository = "https://github.com/cloudflare/cloudflare-python"
 
-
+[project.optional-dependencies]
+aiohttp = ["aiohttp", "httpx_aiohttp>=0.1.9"]
 
 [tool.rye]
 managed = true
 # version pins are in requirements-dev.lock
 dev-dependencies = [
-    "pyright>=1.1.359",
-    "mypy",
+    "pyright==1.1.399",
+    "mypy==1.17",
     "respx",
     "pytest",
     "pytest-asyncio",
@@ -59,7 +58,8 @@ dev-dependencies = [
     "dirty-equals>=0.6.0",
     "importlib-metadata>=6.7.0",
     "rich>=13.7.1",
-
+    "pytest-xdist>=3.6.1",
+    "griffe>=1",
 ]
 
 [tool.rye.scripts]
@@ -67,18 +67,21 @@ format = { chain = [
   "format:ruff",
   "format:docs",
   "fix:ruff",
+  # run formatting again to fix any inconsistencies when imports are stripped
+  "format:ruff",
 ]}
-"format:black" = "black ."
 "format:docs" = "python scripts/utils/ruffen-docs.py README.md api.md"
 "format:ruff" = "ruff format"
-"format:isort" = "isort ."
 
 "lint" = { chain = [
   "check:ruff",
   "typecheck",
+  "check:importable",
 ]}
-"check:ruff" = "ruff ."
-"fix:ruff" = "ruff --fix ."
+"check:ruff" = "ruff check ."
+"fix:ruff" = "ruff check --fix ."
+
+"check:importable" = "python -c 'import cloudflare'"
 
 typecheck = { chain = [
   "typecheck:pyright",
@@ -89,7 +92,7 @@ typecheck = { chain = [
 "typecheck:mypy" = "mypy ."
 
 [build-system]
-requires = ["hatchling", "hatch-fancy-pypi-readme"]
+requires = ["hatchling==1.26.3", "hatch-fancy-pypi-readme"]
 build-backend = "hatchling.build"
 
 [tool.hatch.build]
@@ -126,15 +129,12 @@ path = "README.md"
 pattern = '\[(.+?)\]\(((?!https?://)\S+?)\)'
 replacement = '[\1](https://github.com/cloudflare/cloudflare-python/tree/main/\g<2>)'
 
-[tool.black]
-line-length = 120
-target-version = ["py37"]
-
 [tool.pytest.ini_options]
 testpaths = ["tests"]
-addopts = "--tb=short"
+addopts = "--tb=short -n auto"
 xfail_strict = true
 asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "session"
 filterwarnings = [
   "error"
 ]
@@ -144,25 +144,82 @@ filterwarnings = [
 # there are a couple of flags that are still disabled by
 # default in strict mode as they are experimental and niche.
 typeCheckingMode = "strict"
-pythonVersion = "3.7"
+pythonVersion = "3.9"
 
 exclude = [
     "_dev",
     ".venv",
     ".nox",
+    ".git",
 ]
 
 reportImplicitOverride = true
+reportOverlappingOverload = false
 
 reportImportCycles = false
 reportPrivateUsage = false
-reportOverlappingOverload = false
+
+[tool.mypy]
+pretty = true
+show_error_codes = true
+
+# Exclude _files.py because mypy isn't smart enough to apply
+# the correct type narrowing and as this is an internal module
+# it's fine to just use Pyright.
+#
+# We also exclude our `tests` as mypy doesn't always infer
+# types correctly and Pyright will still catch any type errors.
+exclude = ['src/cloudflare/_files.py', '_dev/.*.py', 'tests/.*', 'src/cloudflare/resources/zero_trust/identity_providers\.py', 'src/cloudflare/resources/zero_trust/access/applications/applications\.py', 'src/cloudflare/resources/workers/ai\.py', 'src/cloudflare/resources/magic_transit/apps\.py']
+
+strict_equality = true
+implicit_reexport = true
+check_untyped_defs = true
+no_implicit_optional = true
+
+warn_return_any = true
+warn_unreachable = true
+warn_unused_configs = true
+
+# Turn these options off as it could cause conflicts
+# with the Pyright options.
+warn_unused_ignores = false
+warn_redundant_casts = false
+
+disallow_any_generics = true
+disallow_untyped_defs = true
+disallow_untyped_calls = true
+disallow_subclassing_any = true
+disallow_incomplete_defs = true
+disallow_untyped_decorators = true
+cache_fine_grained = true
+
+# By default, mypy reports an error if you assign a value to the result
+# of a function call that doesn't return anything. We do this in our test
+# cases:
+# ```
+# result = ...
+# assert result is None
+# ```
+# Changing this codegen to make mypy happy would increase complexity
+# and would not be worth it.
+disable_error_code = "func-returns-value,overload-cannot-match"
+
+# https://github.com/python/mypy/issues/12162
+[[tool.mypy.overrides]]
+module = "black.files.*"
+ignore_errors = true
+ignore_missing_imports = true
 
 
 [tool.ruff]
 line-length = 120
 output-format = "grouped"
-target-version = "py37"
+target-version = "py38"
+
+[tool.ruff.format]
+docstring-code-format = true
+
+[tool.ruff.lint]
 select = [
   # isort
   "I",
@@ -170,6 +227,8 @@ select = [
   "B",
   # remove unused imports
   "F401",
+  # check for missing future annotations
+  "FA102",
   # bare except statements
   "E722",
   # unused arguments
@@ -178,7 +237,7 @@ select = [
   "T201",
   "T203",
   # misuse of typing.TYPE_CHECKING
-  "TCH004",
+  "TC004",
   # import rules
   "TID251",
 ]
@@ -191,10 +250,8 @@ unfixable = [
   "T201",
   "T203",
 ]
-ignore-init-module-imports = true
 
-[tool.ruff.format]
-docstring-code-format = true
+extend-safe-fixes = ["FA102"]
 
 [tool.ruff.lint.flake8-tidy-imports.banned-api]
 "functools.lru_cache".msg = "This function does not retain type information for the wrapped function's arguments; The `lru_cache` function from `_utils` should be used instead"
@@ -206,7 +263,7 @@ combine-as-imports = true
 extra-standard-library = ["typing_extensions"]
 known-first-party = ["cloudflare", "tests"]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "bin/**.py" = ["T201", "T203"]
 "scripts/**.py" = ["T201", "T203"]
 "tests/**.py" = ["T201", "T203"]
diff --git a/requirements-dev.lock b/requirements-dev.lock
index d624bbeb64e..9fb207c1220 100644
--- a/requirements-dev.lock
+++ b/requirements-dev.lock
@@ -7,99 +7,146 @@
 #   all-features: true
 #   with-sources: false
 #   generate-hashes: false
+#   universal: false
 
 -e file:.
-annotated-types==0.6.0
+aiohappyeyeballs==2.6.1
+    # via aiohttp
+aiohttp==3.13.2
+    # via cloudflare
+    # via httpx-aiohttp
+aiosignal==1.4.0
+    # via aiohttp
+annotated-types==0.7.0
     # via pydantic
-anyio==4.4.0
+anyio==4.12.0
     # via cloudflare
     # via httpx
-argcomplete==3.1.2
+argcomplete==3.6.3
     # via nox
-attrs==23.1.0
-    # via pytest
-certifi==2023.7.22
+async-timeout==5.0.1
+    # via aiohttp
+attrs==25.4.0
+    # via aiohttp
+    # via nox
+backports-asyncio-runner==1.2.0
+    # via pytest-asyncio
+certifi==2025.11.12
     # via httpcore
     # via httpx
-colorlog==6.7.0
+colorama==0.4.6
+    # via griffe
+colorlog==6.10.1
+    # via nox
+dependency-groups==1.3.1
     # via nox
-dirty-equals==0.6.0
-distlib==0.3.7
+dirty-equals==0.11
+distlib==0.4.0
     # via virtualenv
-distro==1.8.0
+distro==1.9.0
     # via cloudflare
-exceptiongroup==1.1.3
+exceptiongroup==1.3.1
     # via anyio
-filelock==3.12.4
+    # via pytest
+execnet==2.1.2
+    # via pytest-xdist
+filelock==3.19.1
     # via virtualenv
-h11==0.14.0
+frozenlist==1.8.0
+    # via aiohttp
+    # via aiosignal
+griffe==1.14.0
+h11==0.16.0
     # via httpcore
-httpcore==1.0.2
+httpcore==1.0.9
     # via httpx
-httpx==0.25.2
+httpx==0.28.1
     # via cloudflare
+    # via httpx-aiohttp
     # via respx
-idna==3.4
+httpx-aiohttp==0.1.9
+    # via cloudflare
+humanize==4.13.0
+    # via nox
+idna==3.11
     # via anyio
     # via httpx
-importlib-metadata==7.0.0
-iniconfig==2.0.0
+    # via yarl
+importlib-metadata==8.7.0
+iniconfig==2.1.0
     # via pytest
 markdown-it-py==3.0.0
     # via rich
 mdurl==0.1.2
     # via markdown-it-py
-mypy==1.10.1
-mypy-extensions==1.0.0
+multidict==6.7.0
+    # via aiohttp
+    # via yarl
+mypy==1.17.0
+mypy-extensions==1.1.0
     # via mypy
-nodeenv==1.8.0
+nodeenv==1.9.1
     # via pyright
-nox==2023.4.22
-packaging==23.2
+nox==2025.11.12
+packaging==25.0
+    # via dependency-groups
     # via nox
     # via pytest
-platformdirs==3.11.0
+pathspec==0.12.1
+    # via mypy
+platformdirs==4.4.0
     # via virtualenv
-pluggy==1.3.0
+pluggy==1.6.0
     # via pytest
-py==1.11.0
-    # via pytest
-pydantic==2.7.1
+propcache==0.4.1
+    # via aiohttp
+    # via yarl
+pydantic==2.12.5
     # via cloudflare
-pydantic-core==2.18.2
+pydantic-core==2.41.5
     # via pydantic
-pygments==2.18.0
+pygments==2.19.2
+    # via pytest
     # via rich
-pyright==1.1.364
-pytest==7.1.1
+pyright==1.1.399
+pytest==8.4.2
     # via pytest-asyncio
-pytest-asyncio==0.21.1
-python-dateutil==2.8.2
+    # via pytest-xdist
+pytest-asyncio==1.2.0
+pytest-xdist==3.8.0
+python-dateutil==2.9.0.post0
     # via time-machine
-pytz==2023.3.post1
-    # via dirty-equals
-respx==0.20.2
-rich==13.7.1
-ruff==0.1.9
-setuptools==68.2.2
-    # via nodeenv
-six==1.16.0
+respx==0.22.0
+rich==14.2.0
+ruff==0.14.7
+six==1.17.0
     # via python-dateutil
-sniffio==1.3.0
-    # via anyio
+sniffio==1.3.1
     # via cloudflare
-    # via httpx
-time-machine==2.9.0
-tomli==2.0.1
+time-machine==2.19.0
+tomli==2.3.0
+    # via dependency-groups
     # via mypy
+    # via nox
     # via pytest
-typing-extensions==4.8.0
+typing-extensions==4.15.0
+    # via aiosignal
     # via anyio
     # via cloudflare
+    # via exceptiongroup
+    # via multidict
     # via mypy
     # via pydantic
     # via pydantic-core
-virtualenv==20.24.5
+    # via pyright
+    # via pytest-asyncio
+    # via typing-inspection
+    # via virtualenv
+typing-inspection==0.4.2
+    # via pydantic
+virtualenv==20.35.4
     # via nox
-zipp==3.17.0
+yarl==1.22.0
+    # via aiohttp
+zipp==3.23.0
     # via importlib-metadata
diff --git a/requirements.lock b/requirements.lock
index a0d34229e70..c948e87d644 100644
--- a/requirements.lock
+++ b/requirements.lock
@@ -7,39 +7,70 @@
 #   all-features: true
 #   with-sources: false
 #   generate-hashes: false
+#   universal: false
 
 -e file:.
-annotated-types==0.6.0
+aiohappyeyeballs==2.6.1
+    # via aiohttp
+aiohttp==3.13.2
+    # via cloudflare
+    # via httpx-aiohttp
+aiosignal==1.4.0
+    # via aiohttp
+annotated-types==0.7.0
     # via pydantic
-anyio==4.4.0
+anyio==4.12.0
     # via cloudflare
     # via httpx
-certifi==2023.7.22
+async-timeout==5.0.1
+    # via aiohttp
+attrs==25.4.0
+    # via aiohttp
+certifi==2025.11.12
     # via httpcore
     # via httpx
-distro==1.8.0
+distro==1.9.0
     # via cloudflare
-exceptiongroup==1.1.3
+exceptiongroup==1.3.1
     # via anyio
-h11==0.14.0
+frozenlist==1.8.0
+    # via aiohttp
+    # via aiosignal
+h11==0.16.0
     # via httpcore
-httpcore==1.0.2
+httpcore==1.0.9
     # via httpx
-httpx==0.25.2
+httpx==0.28.1
+    # via cloudflare
+    # via httpx-aiohttp
+httpx-aiohttp==0.1.9
     # via cloudflare
-idna==3.4
+idna==3.11
     # via anyio
     # via httpx
-pydantic==2.7.1
+    # via yarl
+multidict==6.7.0
+    # via aiohttp
+    # via yarl
+propcache==0.4.1
+    # via aiohttp
+    # via yarl
+pydantic==2.12.5
     # via cloudflare
-pydantic-core==2.18.2
+pydantic-core==2.41.5
     # via pydantic
-sniffio==1.3.0
-    # via anyio
+sniffio==1.3.1
     # via cloudflare
-    # via httpx
-typing-extensions==4.8.0
+typing-extensions==4.15.0
+    # via aiosignal
     # via anyio
     # via cloudflare
+    # via exceptiongroup
+    # via multidict
     # via pydantic
     # via pydantic-core
+    # via typing-inspection
+typing-inspection==0.4.2
+    # via pydantic
+yarl==1.22.0
+    # via aiohttp
diff --git a/scripts/bootstrap b/scripts/bootstrap
index 8c5c60eba34..b430fee36d6 100755
--- a/scripts/bootstrap
+++ b/scripts/bootstrap
@@ -4,10 +4,18 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-if [ -f "Brewfile" ] && [ "$(uname -s)" = "Darwin" ]; then
+if [ -f "Brewfile" ] && [ "$(uname -s)" = "Darwin" ] && [ "$SKIP_BREW" != "1" ] && [ -t 0 ]; then
   brew bundle check >/dev/null 2>&1 || {
-    echo "==> Installing Homebrew dependencies…"
-    brew bundle
+    echo -n "==> Install Homebrew dependencies? (y/N): "
+    read -r response
+    case "$response" in
+      [yY][eE][sS]|[yY])
+        brew bundle
+        ;;
+      *)
+        ;;
+    esac
+    echo
   }
 fi
 
diff --git a/scripts/detect-breaking-changes b/scripts/detect-breaking-changes
new file mode 100755
index 00000000000..fb28f3a261a
--- /dev/null
+++ b/scripts/detect-breaking-changes
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+echo "==> Detecting breaking changes"
+
+TEST_PATHS=( tests/api_resources tests/test_client.py tests/test_response.py )
+
+for PATHSPEC in "${TEST_PATHS[@]}"; do
+    # Try to check out previous versions of the test files
+    # with the current SDK.
+    git checkout "$1" -- "${PATHSPEC}" 2>/dev/null || true
+done
+
+# Instead of running the tests, use the linter to check if an
+# older test is no longer compatible with the latest SDK.
+./scripts/lint
diff --git a/scripts/detect-breaking-changes.py b/scripts/detect-breaking-changes.py
new file mode 100644
index 00000000000..f8d81890b9b
--- /dev/null
+++ b/scripts/detect-breaking-changes.py
@@ -0,0 +1,79 @@
+from __future__ import annotations
+
+import sys
+from typing import Iterator
+from pathlib import Path
+
+import rich
+import griffe
+from rich.text import Text
+from rich.style import Style
+
+
+def public_members(obj: griffe.Object | griffe.Alias) -> dict[str, griffe.Object | griffe.Alias]:
+    if isinstance(obj, griffe.Alias):
+        # ignore imports for now, they're technically part of the public API
+        # but we don't have good preventative measures in place to prevent
+        # changing them
+        return {}
+
+    return {name: value for name, value in obj.all_members.items() if not name.startswith("_")}
+
+
+def find_breaking_changes(
+    new_obj: griffe.Object | griffe.Alias,
+    old_obj: griffe.Object | griffe.Alias,
+    *,
+    path: list[str],
+) -> Iterator[Text | str]:
+    new_members = public_members(new_obj)
+    old_members = public_members(old_obj)
+
+    for name, old_member in old_members.items():
+        if isinstance(old_member, griffe.Alias) and len(path) > 2:
+            # ignore imports in `/types/` for now, they're technically part of the public API
+            # but we don't have good preventative measures in place to prevent changing them
+            continue
+
+        new_member = new_members.get(name)
+        if new_member is None:
+            cls_name = old_member.__class__.__name__
+            yield Text(f"({cls_name})", style=Style(color="rgb(119, 119, 119)"))
+            yield from [" " for _ in range(10 - len(cls_name))]
+            yield f" {'.'.join(path)}.{name}"
+            yield "\n"
+            continue
+
+        yield from find_breaking_changes(new_member, old_member, path=[*path, name])
+
+
+def main() -> None:
+    try:
+        against_ref = sys.argv[1]
+    except IndexError as err:
+        raise RuntimeError("You must specify a base ref to run breaking change detection against") from err
+
+    package = griffe.load(
+        "cloudflare",
+        search_paths=[Path(__file__).parent.parent.joinpath("src")],
+    )
+    old_package = griffe.load_git(
+        "cloudflare",
+        ref=against_ref,
+        search_paths=["src"],
+    )
+    assert isinstance(package, griffe.Module)
+    assert isinstance(old_package, griffe.Module)
+
+    output = list(find_breaking_changes(package, old_package, path=["cloudflare"]))
+    if output:
+        rich.print(Text("Breaking changes detected!", style=Style(color="rgb(165, 79, 87)")))
+        rich.print()
+
+        for text in output:
+            rich.print(text, end="")
+
+        sys.exit(1)
+
+
+main()
diff --git a/scripts/lint b/scripts/lint
index aa39f69ffbd..3c726986511 100755
--- a/scripts/lint
+++ b/scripts/lint
@@ -4,9 +4,13 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-echo "==> Running lints"
-rye run lint
+if [ "$1" = "--fix" ]; then
+  echo "==> Running lints with --fix"
+  rye run fix:ruff
+else
+  echo "==> Running lints"
+  rye run lint
+fi
 
 echo "==> Making sure it imports"
 rye run python -c 'import cloudflare'
-
diff --git a/scripts/mock b/scripts/mock
index fe89a1d084f..0b28f6ea23d 100755
--- a/scripts/mock
+++ b/scripts/mock
@@ -21,7 +21,7 @@ echo "==> Starting mock server with URL ${URL}"
 
 # Run prism mock on the given spec
 if [ "$1" == "--daemon" ]; then
-  npm exec --package=@stoplight/prism-cli@~5.8 -- prism mock "$URL" &> .prism.log &
+  npm exec --package=@stainless-api/prism-cli@5.15.0 -- prism mock "$URL" &> .prism.log &
 
   # Wait for server to come online
   echo -n "Waiting for server"
@@ -37,5 +37,5 @@ if [ "$1" == "--daemon" ]; then
 
   echo
 else
-  npm exec  --package=@stoplight/prism-cli@~5.8 -- prism mock "$URL"
+  npm exec --package=@stainless-api/prism-cli@5.15.0 -- prism mock "$URL"
 fi
diff --git a/scripts/test b/scripts/test
index b3ace9013bd..dbeda2d2176 100755
--- a/scripts/test
+++ b/scripts/test
@@ -43,7 +43,7 @@ elif ! prism_is_running ; then
   echo -e "To run the server, pass in the path or url of your OpenAPI"
   echo -e "spec to the prism command:"
   echo
-  echo -e "  \$ ${YELLOW}npm exec --package=@stoplight/prism-cli@~5.3.2 -- prism mock path/to/your.openapi.yml${NC}"
+  echo -e "  \$ ${YELLOW}npm exec --package=@stainless-api/prism-cli@5.15.0 -- prism mock path/to/your.openapi.yml${NC}"
   echo
 
   exit 1
@@ -52,5 +52,10 @@ else
   echo
 fi
 
+export DEFER_PYDANTIC_BUILD=false
+
 echo "==> Running tests"
 rye run pytest "$@"
+
+echo "==> Running Pydantic v1 tests"
+rye run nox -s test-pydantic-v1 -- "$@"
diff --git a/scripts/utils/ruffen-docs.py b/scripts/utils/ruffen-docs.py
index 37b3d94f0f8..0cf2bd2fd9d 100644
--- a/scripts/utils/ruffen-docs.py
+++ b/scripts/utils/ruffen-docs.py
@@ -47,7 +47,7 @@ def _md_match(match: Match[str]) -> str:
         with _collect_error(match):
             code = format_code_block(code)
         code = textwrap.indent(code, match["indent"])
-        return f'{match["before"]}{code}{match["after"]}'
+        return f"{match['before']}{code}{match['after']}"
 
     def _pycon_match(match: Match[str]) -> str:
         code = ""
@@ -97,7 +97,7 @@ def finish_fragment() -> None:
     def _md_pycon_match(match: Match[str]) -> str:
         code = _pycon_match(match)
         code = textwrap.indent(code, match["indent"])
-        return f'{match["before"]}{code}{match["after"]}'
+        return f"{match['before']}{code}{match['after']}"
 
     src = MD_RE.sub(_md_match, src)
     src = MD_PYCON_RE.sub(_md_pycon_match, src)
diff --git a/scripts/utils/upload-artifact.sh b/scripts/utils/upload-artifact.sh
new file mode 100755
index 00000000000..fc6462eccf8
--- /dev/null
+++ b/scripts/utils/upload-artifact.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -exuo pipefail
+
+FILENAME=$(basename dist/*.whl)
+
+RESPONSE=$(curl -X POST "$URL?filename=$FILENAME" \
+  -H "Authorization: Bearer $AUTH" \
+  -H "Content-Type: application/json")
+
+SIGNED_URL=$(echo "$RESPONSE" | jq -r '.url')
+
+if [[ "$SIGNED_URL" == "null" ]]; then
+  echo -e "\033[31mFailed to get signed URL.\033[0m"
+  exit 1
+fi
+
+UPLOAD_RESPONSE=$(curl -v -X PUT \
+  -H "Content-Type: binary/octet-stream" \
+  --data-binary "@dist/$FILENAME" "$SIGNED_URL" 2>&1)
+
+if echo "$UPLOAD_RESPONSE" | grep -q "HTTP/[0-9.]* 200"; then
+  echo -e "\033[32mUploaded build to Stainless storage.\033[0m"
+  echo -e "\033[32mInstallation: pip install 'https://pkg.stainless.com/s/cloudflare-python/$SHA/$FILENAME'\033[0m"
+else
+  echo -e "\033[31mFailed to upload artifact.\033[0m"
+  exit 1
+fi
diff --git a/src/cloudflare/__init__.py b/src/cloudflare/__init__.py
index bd005a22911..26a59059d51 100644
--- a/src/cloudflare/__init__.py
+++ b/src/cloudflare/__init__.py
@@ -1,7 +1,9 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+import typing as _t
+
 from . import types
-from ._types import NOT_GIVEN, NoneType, NotGiven, Transport, ProxiesTypes
+from ._types import NOT_GIVEN, Omit, NoneType, NotGiven, Transport, ProxiesTypes, omit, not_given
 from ._utils import file_from_path
 from ._client import (
     Client,
@@ -34,7 +36,7 @@
     UnprocessableEntityError,
     APIResponseValidationError,
 )
-from ._base_client import DefaultHttpxClient, DefaultAsyncHttpxClient
+from ._base_client import DefaultHttpxClient, DefaultAioHttpClient, DefaultAsyncHttpxClient
 from ._utils._logs import setup_logging as _setup_logging
 
 __all__ = [
@@ -46,6 +48,9 @@
     "ProxiesTypes",
     "NotGiven",
     "NOT_GIVEN",
+    "not_given",
+    "Omit",
+    "omit",
     "CloudflareError",
     "APIError",
     "APIStatusError",
@@ -75,8 +80,12 @@
     "DEFAULT_CONNECTION_LIMITS",
     "DefaultHttpxClient",
     "DefaultAsyncHttpxClient",
+    "DefaultAioHttpClient",
 ]
 
+if not _t.TYPE_CHECKING:
+    from ._utils._resources_proxy import resources as resources
+
 _setup_logging()
 
 # Update the __module__ attribute for exported symbols so that
diff --git a/src/cloudflare/_base_client.py b/src/cloudflare/_base_client.py
index ac63cf2cd11..e6310e5837d 100644
--- a/src/cloudflare/_base_client.py
+++ b/src/cloudflare/_base_client.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import sys
 import json
 import time
 import uuid
@@ -35,14 +36,13 @@
 import httpx
 import distro
 import pydantic
-from httpx import URL, Limits
+from httpx import URL
 from pydantic import PrivateAttr
 
 from . import _exceptions
 from ._qs import Querystring
 from ._files import to_httpx_files, async_to_httpx_files
 from ._types import (
-    NOT_GIVEN,
     Body,
     Omit,
     Query,
@@ -50,19 +50,21 @@
     Timeout,
     NotGiven,
     ResponseT,
-    Transport,
     AnyMapping,
     PostParser,
-    ProxiesTypes,
+    BinaryTypes,
     RequestFiles,
     HttpxSendArgs,
-    AsyncTransport,
+    HttpxFileTypes,
     RequestOptions,
+    MultipartSyntax,
+    AsyncBinaryTypes,
     HttpxRequestFiles,
     ModelBuilderProtocol,
+    not_given,
 )
-from ._utils import is_dict, is_list, asyncify, is_given, lru_cache, is_mapping
-from ._compat import model_copy, model_dump
+from ._utils import is_dict, is_list, asyncify, is_given, is_tuple, lru_cache, is_mapping, is_mapping_t, is_sequence_t
+from ._compat import PYDANTIC_V1, model_copy, model_dump
 from ._models import GenericModel, FinalRequestOptions, validate_type, construct_type
 from ._response import (
     APIResponse,
@@ -101,7 +103,11 @@
 _AsyncStreamT = TypeVar("_AsyncStreamT", bound=AsyncStream[Any])
 
 if TYPE_CHECKING:
-    from httpx._config import DEFAULT_TIMEOUT_CONFIG as HTTPX_DEFAULT_TIMEOUT
+    from httpx._config import (
+        DEFAULT_TIMEOUT_CONFIG,  # pyright: ignore[reportPrivateImportUsage]
+    )
+
+    HTTPX_DEFAULT_TIMEOUT = DEFAULT_TIMEOUT_CONFIG
 else:
     try:
         from httpx._config import DEFAULT_TIMEOUT_CONFIG as HTTPX_DEFAULT_TIMEOUT
@@ -118,32 +124,48 @@ class PageInfo:
 
     url: URL | NotGiven
     params: Query | NotGiven
+    json: Body | NotGiven
 
     @overload
     def __init__(
         self,
         *,
         url: URL,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @overload
     def __init__(
         self,
         *,
         params: Query,
-    ) -> None:
-        ...
+    ) -> None: ...
+
+    @overload
+    def __init__(
+        self,
+        *,
+        json: Body,
+    ) -> None: ...
 
     def __init__(
         self,
         *,
-        url: URL | NotGiven = NOT_GIVEN,
-        params: Query | NotGiven = NOT_GIVEN,
+        url: URL | NotGiven = not_given,
+        json: Body | NotGiven = not_given,
+        params: Query | NotGiven = not_given,
     ) -> None:
         self.url = url
+        self.json = json
         self.params = params
 
+    @override
+    def __repr__(self) -> str:
+        if self.url:
+            return f"{self.__class__.__name__}(url={self.url})"
+        if self.json:
+            return f"{self.__class__.__name__}(json={self.json})"
+        return f"{self.__class__.__name__}(params={self.params})"
+
 
 class BasePage(GenericModel, Generic[_T]):
     """
@@ -166,8 +188,7 @@ def has_next_page(self) -> bool:
             return False
         return self.next_page_info() is not None
 
-    def next_page_info(self) -> Optional[PageInfo]:
-        ...
+    def next_page_info(self) -> Optional[PageInfo]: ...
 
     def _get_page_items(self) -> Iterable[_T]:  # type: ignore[empty-body]
         ...
@@ -191,6 +212,19 @@ def _info_to_options(self, info: PageInfo) -> FinalRequestOptions:
             options.url = str(url)
             return options
 
+        if not isinstance(info.json, NotGiven):
+            if not is_mapping(info.json):
+                raise TypeError("Pagination is only supported with mappings")
+
+            if not options.json_data:
+                options.json_data = {**info.json}
+            else:
+                if not is_mapping(options.json_data):
+                    raise TypeError("Pagination is only supported with mappings")
+
+                options.json_data = {**options.json_data, **info.json}
+            return options
+
         raise ValueError("Unexpected PageInfo state")
 
 
@@ -203,6 +237,9 @@ def _set_private_attributes(
         model: Type[_T],
         options: FinalRequestOptions,
     ) -> None:
+        if (not PYDANTIC_V1) and getattr(self, "__pydantic_private__", None) is None:
+            self.__pydantic_private__ = {}
+
         self._model = model
         self._client = client
         self._options = options
@@ -288,6 +325,9 @@ def _set_private_attributes(
         client: AsyncAPIClient,
         options: FinalRequestOptions,
     ) -> None:
+        if (not PYDANTIC_V1) and getattr(self, "__pydantic_private__", None) is None:
+            self.__pydantic_private__ = {}
+
         self._model = model
         self._client = client
         self._options = options
@@ -325,11 +365,9 @@ class BaseClient(Generic[_HttpxClientT, _DefaultStreamT]):
     _client: _HttpxClientT
     _version: str
     _base_url: URL
+    _api_version: str
     max_retries: int
     timeout: Union[float, Timeout, None]
-    _limits: httpx.Limits
-    _proxies: ProxiesTypes | None
-    _transport: Transport | AsyncTransport | None
     _strict_response_validation: bool
     _idempotency_header: str | None
     _default_stream_cls: type[_DefaultStreamT] | None = None
@@ -339,22 +377,18 @@ def __init__(
         *,
         version: str,
         base_url: str | URL,
+        api_version: str,
         _strict_response_validation: bool,
         max_retries: int = DEFAULT_MAX_RETRIES,
         timeout: float | Timeout | None = DEFAULT_TIMEOUT,
-        limits: httpx.Limits,
-        transport: Transport | AsyncTransport | None,
-        proxies: ProxiesTypes | None,
         custom_headers: Mapping[str, str] | None = None,
         custom_query: Mapping[str, object] | None = None,
     ) -> None:
         self._version = version
         self._base_url = self._enforce_trailing_slash(URL(base_url))
+        self.api_version = api_version
         self.max_retries = max_retries
         self.timeout = timeout
-        self._limits = limits
-        self._proxies = proxies
-        self._transport = transport
         self._custom_headers = custom_headers or {}
         self._custom_query = custom_query or {}
         self._strict_response_validation = _strict_response_validation
@@ -402,14 +436,7 @@ def _make_status_error(
     ) -> _exceptions.APIStatusError:
         raise NotImplementedError()
 
-    def _remaining_retries(
-        self,
-        remaining_retries: Optional[int],
-        options: FinalRequestOptions,
-    ) -> int:
-        return remaining_retries if remaining_retries is not None else options.get_max_retries(self.max_retries)
-
-    def _build_headers(self, options: FinalRequestOptions) -> httpx.Headers:
+    def _build_headers(self, options: FinalRequestOptions, *, retries_taken: int = 0) -> httpx.Headers:
         custom_headers = options.headers or {}
         headers_dict = _merge_mappings(self.default_headers, custom_headers)
         self._validate_headers(headers_dict, custom_headers)
@@ -418,8 +445,22 @@ def _build_headers(self, options: FinalRequestOptions) -> httpx.Headers:
         headers = httpx.Headers(headers_dict)
 
         idempotency_header = self._idempotency_header
-        if idempotency_header and options.method.lower() != "get" and idempotency_header not in headers:
-            headers[idempotency_header] = options.idempotency_key or self._idempotency_key()
+        if idempotency_header and options.idempotency_key and idempotency_header not in headers:
+            headers[idempotency_header] = options.idempotency_key
+
+        # Don't set these headers if they were already set or removed by the caller. We check
+        # `custom_headers`, which can contain `Omit()`, instead of `headers` to account for the removal case.
+        lower_custom_headers = [header.lower() for header in custom_headers]
+        if "x-stainless-retry-count" not in lower_custom_headers:
+            headers["x-stainless-retry-count"] = str(retries_taken)
+        if "x-stainless-read-timeout" not in lower_custom_headers:
+            timeout = self.timeout if isinstance(options.timeout, NotGiven) else options.timeout
+            if isinstance(timeout, Timeout):
+                timeout = timeout.read
+            if timeout is not None:
+                headers["x-stainless-read-timeout"] = str(timeout)
+
+        headers["api-version"] = self.api_version
 
         return headers
 
@@ -442,10 +483,23 @@ def _make_sse_decoder(self) -> SSEDecoder | SSEBytesDecoder:
     def _build_request(
         self,
         options: FinalRequestOptions,
+        *,
+        retries_taken: int = 0,
     ) -> httpx.Request:
         if log.isEnabledFor(logging.DEBUG):
-            log.debug("Request options: %s", model_dump(options, exclude_unset=True))
-
+            log.debug(
+                "Request options: %s",
+                model_dump(
+                    options,
+                    exclude_unset=True,
+                    # Pydantic v1 can't dump every type we support in content, so we exclude it for now.
+                    exclude={
+                        "content",
+                    }
+                    if PYDANTIC_V1
+                    else {},
+                ),
+            )
         kwargs: dict[str, Any] = {}
 
         json_data = options.json_data
@@ -457,7 +511,7 @@ def _build_request(
             else:
                 raise RuntimeError(f"Unexpected JSON data type, {type(json_data)}, cannot merge with `extra_body`")
 
-        headers = self._build_headers(options)
+        headers = self._build_headers(options, retries_taken=retries_taken)
         params = _merge_mappings(self.default_query, options.params)
         content_type = headers.get("Content-Type")
         files = options.files
@@ -480,7 +534,24 @@ def _build_request(
                     raise TypeError(
                         f"Expected query input to be a dictionary for multipart requests but got {type(json_data)} instead."
                     )
-                kwargs["data"] = self._serialize_multipartform(json_data)
+
+                if options.multipart_syntax == 'json':
+                    json_data = cast("Mapping[str, object]", json_data)
+                    if is_mapping_t(files):
+                        files = {
+                            **files,
+                            **self._serialize_multiapartform_json(json_data),
+                        }
+                    elif is_sequence_t(files):
+                        files = [
+                            *files,
+                            *self._serialize_multiapartform_json(json_data).items(),
+                        ]
+                    else:
+                        assert not files, "this case should only be hit when there are no files"
+                        files = self._serialize_multiapartform_json(json_data)
+                else:
+                    kwargs["data"] = self._serialize_multipartform(json_data)
 
             # httpx determines whether or not to send a "multipart/form-data"
             # request based on the truthiness of the "files" argument.
@@ -491,22 +562,59 @@ def _build_request(
             if not files:
                 files = cast(HttpxRequestFiles, ForceMultipartDict())
 
+        prepared_url = self._prepare_url(options.url)
+        if "_" in prepared_url.host:
+            # work around https://github.com/encode/httpx/discussions/2880
+            kwargs["extensions"] = {"sni_hostname": prepared_url.host.replace("_", "-")}
+
+        is_body_allowed = options.method.lower() != "get"
+
+        if is_body_allowed:
+            if options.content is not None and json_data is not None:
+                raise TypeError("Passing both `content` and `json_data` is not supported")
+            if options.content is not None and files is not None:
+                raise TypeError("Passing both `content` and `files` is not supported")
+            if options.content is not None:
+                kwargs["content"] = options.content
+            elif isinstance(json_data, bytes):
+                kwargs["content"] = json_data
+            else:
+                kwargs["json"] = json_data if is_given(json_data) else None
+            kwargs["files"] = files
+        else:
+            headers.pop("Content-Type", None)
+            kwargs.pop("data", None)
+
         # TODO: report this error to httpx
         return self._client.build_request(  # pyright: ignore[reportUnknownMemberType]
             headers=headers,
             timeout=self.timeout if isinstance(options.timeout, NotGiven) else options.timeout,
             method=options.method,
-            url=self._prepare_url(options.url),
+            url=prepared_url,
             # the `Query` type that we use is incompatible with qs'
             # `Params` type as it needs to be typed as `Mapping[str, object]`
             # so that passing a `TypedDict` doesn't cause an error.
             # https://github.com/microsoft/pyright/issues/3526#event-6715453066
             params=self.qs.stringify(cast(Mapping[str, Any], params)) if params else None,
-            json=json_data,
-            files=files,
             **kwargs,
         )
 
+    def _serialize_multiapartform_json(self, data: Mapping[str, object]) -> dict[str, HttpxFileTypes]:
+        serialized: dict[str, HttpxFileTypes] = {}
+        for key, value in data.items():
+            if isinstance(value, Mapping) or is_list(value) or is_tuple(value):
+                serialized[key] = (None, json.dumps(value).encode("utf-8"), "application/json")
+            else:
+                serialized[key] = (
+                    None,
+                    self.qs._primitive_value_to_str(
+                        value  # type: ignore
+                    ).encode("utf-8"),
+                    "text/plain",
+                )
+
+        return serialized
+
     def _serialize_multipartform(self, data: Mapping[object, object]) -> dict[str, object]:
         items = self.qs.stringify_items(
             # TODO: type ignore is required as stringify_items is well typed but we can't be
@@ -547,7 +655,7 @@ def _maybe_override_cast_to(self, cast_to: type[ResponseT], options: FinalReques
         # we internally support defining a temporary header to override the
         # default `cast_to` type for use with `.with_raw_response` and `.with_streaming_response`
         # see _response.py for implementation details
-        override_cast_to = headers.pop(OVERRIDE_CAST_TO_HEADER, NOT_GIVEN)
+        override_cast_to = headers.pop(OVERRIDE_CAST_TO_HEADER, not_given)
         if is_given(override_cast_to):
             options.headers = headers
             return cast(Type[ResponseT], override_cast_to)
@@ -686,7 +794,8 @@ def _calculate_retry_timeout(
         if retry_after is not None and 0 < retry_after <= 60:
             return retry_after
 
-        nb_retries = max_retries - remaining_retries
+        # Also cap retry count to 1000 to avoid any potential overflows with `pow`
+        nb_retries = min(max_retries - remaining_retries, 1000)
 
         # Apply exponential backoff, but not more than the max.
         sleep_seconds = min(INITIAL_RETRY_DELAY * pow(2.0, nb_retries), MAX_RETRY_DELAY)
@@ -757,6 +866,9 @@ def __init__(self, **kwargs: Any) -> None:
 
 class SyncHttpxClientWrapper(DefaultHttpxClient):
     def __del__(self) -> None:
+        if self.is_closed:
+            return
+
         try:
             self.close()
         except Exception:
@@ -772,45 +884,14 @@ def __init__(
         *,
         version: str,
         base_url: str | URL,
+        api_version: str,
         max_retries: int = DEFAULT_MAX_RETRIES,
-        timeout: float | Timeout | None | NotGiven = NOT_GIVEN,
-        transport: Transport | None = None,
-        proxies: ProxiesTypes | None = None,
-        limits: Limits | None = None,
+        timeout: float | Timeout | None | NotGiven = not_given,
         http_client: httpx.Client | None = None,
         custom_headers: Mapping[str, str] | None = None,
         custom_query: Mapping[str, object] | None = None,
         _strict_response_validation: bool,
     ) -> None:
-        if limits is not None:
-            warnings.warn(
-                "The `connection_pool_limits` argument is deprecated. The `http_client` argument should be passed instead",
-                category=DeprecationWarning,
-                stacklevel=3,
-            )
-            if http_client is not None:
-                raise ValueError("The `http_client` argument is mutually exclusive with `connection_pool_limits`")
-        else:
-            limits = DEFAULT_CONNECTION_LIMITS
-
-        if transport is not None:
-            warnings.warn(
-                "The `transport` argument is deprecated. The `http_client` argument should be passed instead",
-                category=DeprecationWarning,
-                stacklevel=3,
-            )
-            if http_client is not None:
-                raise ValueError("The `http_client` argument is mutually exclusive with `transport`")
-
-        if proxies is not None:
-            warnings.warn(
-                "The `proxies` argument is deprecated. The `http_client` argument should be passed instead",
-                category=DeprecationWarning,
-                stacklevel=3,
-            )
-            if http_client is not None:
-                raise ValueError("The `http_client` argument is mutually exclusive with `proxies`")
-
         if not is_given(timeout):
             # if the user passed in a custom http client with a non-default
             # timeout set then we use that timeout.
@@ -831,12 +912,10 @@ def __init__(
 
         super().__init__(
             version=version,
-            limits=limits,
             # cast to a valid type because mypy doesn't understand our type narrowing
             timeout=cast(Timeout, timeout),
-            proxies=proxies,
             base_url=base_url,
-            transport=transport,
+            api_version=api_version,
             max_retries=max_retries,
             custom_query=custom_query,
             custom_headers=custom_headers,
@@ -846,10 +925,6 @@ def __init__(
             base_url=base_url,
             # cast to a valid type because mypy doesn't understand our type narrowing
             timeout=cast(Timeout, timeout),
-            proxies=proxies,
-            transport=transport,
-            limits=limits,
-            follow_redirects=True,
         )
 
     def is_closed(self) -> bool:
@@ -899,189 +974,163 @@ def request(
         self,
         cast_to: Type[ResponseT],
         options: FinalRequestOptions,
-        remaining_retries: Optional[int] = None,
         *,
         stream: Literal[True],
         stream_cls: Type[_StreamT],
-    ) -> _StreamT:
-        ...
+    ) -> _StreamT: ...
 
     @overload
     def request(
         self,
         cast_to: Type[ResponseT],
         options: FinalRequestOptions,
-        remaining_retries: Optional[int] = None,
         *,
         stream: Literal[False] = False,
-    ) -> ResponseT:
-        ...
+    ) -> ResponseT: ...
 
     @overload
     def request(
         self,
         cast_to: Type[ResponseT],
         options: FinalRequestOptions,
-        remaining_retries: Optional[int] = None,
         *,
         stream: bool = False,
         stream_cls: Type[_StreamT] | None = None,
-    ) -> ResponseT | _StreamT:
-        ...
+    ) -> ResponseT | _StreamT: ...
 
     def request(
         self,
         cast_to: Type[ResponseT],
         options: FinalRequestOptions,
-        remaining_retries: Optional[int] = None,
         *,
         stream: bool = False,
         stream_cls: type[_StreamT] | None = None,
     ) -> ResponseT | _StreamT:
-        return self._request(
-            cast_to=cast_to,
-            options=options,
-            stream=stream,
-            stream_cls=stream_cls,
-            remaining_retries=remaining_retries,
-        )
+        cast_to = self._maybe_override_cast_to(cast_to, options)
 
-    def _request(
-        self,
-        *,
-        cast_to: Type[ResponseT],
-        options: FinalRequestOptions,
-        remaining_retries: int | None,
-        stream: bool,
-        stream_cls: type[_StreamT] | None,
-    ) -> ResponseT | _StreamT:
         # create a copy of the options we were given so that if the
         # options are mutated later & we then retry, the retries are
         # given the original options
         input_options = model_copy(options)
+        if input_options.idempotency_key is None and input_options.method.lower() != "get":
+            # ensure the idempotency key is reused between requests
+            input_options.idempotency_key = self._idempotency_key()
 
-        cast_to = self._maybe_override_cast_to(cast_to, options)
-        options = self._prepare_options(options)
+        response: httpx.Response | None = None
+        max_retries = input_options.get_max_retries(self.max_retries)
 
-        retries = self._remaining_retries(remaining_retries, options)
-        request = self._build_request(options)
-        self._prepare_request(request)
+        retries_taken = 0
+        for retries_taken in range(max_retries + 1):
+            options = model_copy(input_options)
+            options = self._prepare_options(options)
 
-        kwargs: HttpxSendArgs = {}
-        if self.custom_auth is not None:
-            kwargs["auth"] = self.custom_auth
+            remaining_retries = max_retries - retries_taken
+            request = self._build_request(options, retries_taken=retries_taken)
+            self._prepare_request(request)
 
-        log.debug("Sending HTTP Request: %s %s", request.method, request.url)
+            kwargs: HttpxSendArgs = {}
+            if self.custom_auth is not None:
+                kwargs["auth"] = self.custom_auth
 
-        try:
-            response = self._client.send(
-                request,
-                stream=stream or self._should_stream_response_body(request=request),
-                **kwargs,
-            )
-        except httpx.TimeoutException as err:
-            log.debug("Encountered httpx.TimeoutException", exc_info=True)
-
-            if retries > 0:
-                return self._retry_request(
-                    input_options,
-                    cast_to,
-                    retries,
-                    stream=stream,
-                    stream_cls=stream_cls,
-                    response_headers=None,
-                )
+            if options.follow_redirects is not None:
+                kwargs["follow_redirects"] = options.follow_redirects
 
-            log.debug("Raising timeout error")
-            raise APITimeoutError(request=request) from err
-        except Exception as err:
-            log.debug("Encountered Exception", exc_info=True)
+            log.debug("Sending HTTP Request: %s %s", request.method, request.url)
 
-            if retries > 0:
-                return self._retry_request(
-                    input_options,
-                    cast_to,
-                    retries,
-                    stream=stream,
-                    stream_cls=stream_cls,
-                    response_headers=None,
+            response = None
+            try:
+                response = self._client.send(
+                    request,
+                    stream=stream or self._should_stream_response_body(request=request),
+                    **kwargs,
                 )
+            except httpx.TimeoutException as err:
+                log.debug("Encountered httpx.TimeoutException", exc_info=True)
+
+                if remaining_retries > 0:
+                    self._sleep_for_retry(
+                        retries_taken=retries_taken,
+                        max_retries=max_retries,
+                        options=input_options,
+                        response=None,
+                    )
+                    continue
+
+                log.debug("Raising timeout error")
+                raise APITimeoutError(request=request) from err
+            except Exception as err:
+                log.debug("Encountered Exception", exc_info=True)
+
+                if remaining_retries > 0:
+                    self._sleep_for_retry(
+                        retries_taken=retries_taken,
+                        max_retries=max_retries,
+                        options=input_options,
+                        response=None,
+                    )
+                    continue
+
+                log.debug("Raising connection error")
+                raise APIConnectionError(request=request) from err
+
+            log.debug(
+                'HTTP Response: %s %s "%i %s" %s',
+                request.method,
+                request.url,
+                response.status_code,
+                response.reason_phrase,
+                response.headers,
+            )
 
-            log.debug("Raising connection error")
-            raise APIConnectionError(request=request) from err
+            try:
+                response.raise_for_status()
+            except httpx.HTTPStatusError as err:  # thrown on 4xx and 5xx status code
+                log.debug("Encountered httpx.HTTPStatusError", exc_info=True)
+
+                if remaining_retries > 0 and self._should_retry(err.response):
+                    err.response.close()
+                    self._sleep_for_retry(
+                        retries_taken=retries_taken,
+                        max_retries=max_retries,
+                        options=input_options,
+                        response=response,
+                    )
+                    continue
 
-        log.debug(
-            'HTTP Response: %s %s "%i %s" %s',
-            request.method,
-            request.url,
-            response.status_code,
-            response.reason_phrase,
-            response.headers,
-        )
+                # If the response is streamed then we need to explicitly read the response
+                # to completion before attempting to access the response text.
+                if not err.response.is_closed:
+                    err.response.read()
 
-        try:
-            response.raise_for_status()
-        except httpx.HTTPStatusError as err:  # thrown on 4xx and 5xx status code
-            log.debug("Encountered httpx.HTTPStatusError", exc_info=True)
-
-            if retries > 0 and self._should_retry(err.response):
-                err.response.close()
-                return self._retry_request(
-                    input_options,
-                    cast_to,
-                    retries,
-                    err.response.headers,
-                    stream=stream,
-                    stream_cls=stream_cls,
-                )
+                log.debug("Re-raising status error")
+                raise self._make_status_error_from_response(err.response) from None
 
-            # If the response is streamed then we need to explicitly read the response
-            # to completion before attempting to access the response text.
-            if not err.response.is_closed:
-                err.response.read()
-
-            log.debug("Re-raising status error")
-            raise self._make_status_error_from_response(err.response) from None
+            break
 
+        assert response is not None, "could not resolve response (should never happen)"
         return self._process_response(
             cast_to=cast_to,
             options=options,
             response=response,
             stream=stream,
             stream_cls=stream_cls,
+            retries_taken=retries_taken,
         )
 
-    def _retry_request(
-        self,
-        options: FinalRequestOptions,
-        cast_to: Type[ResponseT],
-        remaining_retries: int,
-        response_headers: httpx.Headers | None,
-        *,
-        stream: bool,
-        stream_cls: type[_StreamT] | None,
-    ) -> ResponseT | _StreamT:
-        remaining = remaining_retries - 1
-        if remaining == 1:
+    def _sleep_for_retry(
+        self, *, retries_taken: int, max_retries: int, options: FinalRequestOptions, response: httpx.Response | None
+    ) -> None:
+        remaining_retries = max_retries - retries_taken
+        if remaining_retries == 1:
             log.debug("1 retry left")
         else:
-            log.debug("%i retries left", remaining)
+            log.debug("%i retries left", remaining_retries)
 
-        timeout = self._calculate_retry_timeout(remaining, options, response_headers)
+        timeout = self._calculate_retry_timeout(remaining_retries, options, response.headers if response else None)
         log.info("Retrying request to %s in %f seconds", options.url, timeout)
 
-        # In a synchronous context we are blocking the entire thread. Up to the library user to run the client in a
-        # different thread if necessary.
         time.sleep(timeout)
 
-        return self._request(
-            options=options,
-            cast_to=cast_to,
-            remaining_retries=remaining,
-            stream=stream,
-            stream_cls=stream_cls,
-        )
-
     def _process_response(
         self,
         *,
@@ -1090,10 +1139,18 @@ def _process_response(
         response: httpx.Response,
         stream: bool,
         stream_cls: type[Stream[Any]] | type[AsyncStream[Any]] | None,
+        retries_taken: int = 0,
     ) -> ResponseT:
         origin = get_origin(cast_to) or cast_to
 
-        if inspect.isclass(origin) and issubclass(origin, BaseAPIResponse):
+        if (
+            inspect.isclass(origin)
+            and issubclass(origin, BaseAPIResponse)
+            # we only want to actually return the custom BaseAPIResponse class if we're
+            # returning the raw response, or if we're not streaming SSE, as if we're streaming
+            # SSE then `cast_to` doesn't actively reflect the type we need to parse into
+            and (not stream or bool(response.request.headers.get(RAW_RESPONSE_HEADER)))
+        ):
             if not issubclass(origin, APIResponse):
                 raise TypeError(f"API Response types must subclass {APIResponse}; Received {origin}")
 
@@ -1107,6 +1164,7 @@ def _process_response(
                     stream=stream,
                     stream_cls=stream_cls,
                     options=options,
+                    retries_taken=retries_taken,
                 ),
             )
 
@@ -1120,6 +1178,7 @@ def _process_response(
             stream=stream,
             stream_cls=stream_cls,
             options=options,
+            retries_taken=retries_taken,
         )
         if bool(response.request.headers.get(RAW_RESPONSE_HEADER)):
             return cast(ResponseT, api_response)
@@ -1152,8 +1211,7 @@ def get(
         cast_to: Type[ResponseT],
         options: RequestOptions = {},
         stream: Literal[False] = False,
-    ) -> ResponseT:
-        ...
+    ) -> ResponseT: ...
 
     @overload
     def get(
@@ -1164,8 +1222,7 @@ def get(
         options: RequestOptions = {},
         stream: Literal[True],
         stream_cls: type[_StreamT],
-    ) -> _StreamT:
-        ...
+    ) -> _StreamT: ...
 
     @overload
     def get(
@@ -1176,8 +1233,7 @@ def get(
         options: RequestOptions = {},
         stream: bool,
         stream_cls: type[_StreamT] | None = None,
-    ) -> ResponseT | _StreamT:
-        ...
+    ) -> ResponseT | _StreamT: ...
 
     def get(
         self,
@@ -1200,11 +1256,11 @@ def post(
         *,
         cast_to: Type[ResponseT],
         body: Body | None = None,
+        content: BinaryTypes | None = None,
         options: RequestOptions = {},
         files: RequestFiles | None = None,
         stream: Literal[False] = False,
-    ) -> ResponseT:
-        ...
+    ) -> ResponseT: ...
 
     @overload
     def post(
@@ -1213,12 +1269,12 @@ def post(
         *,
         cast_to: Type[ResponseT],
         body: Body | None = None,
+        content: BinaryTypes | None = None,
         options: RequestOptions = {},
         files: RequestFiles | None = None,
         stream: Literal[True],
         stream_cls: type[_StreamT],
-    ) -> _StreamT:
-        ...
+    ) -> _StreamT: ...
 
     @overload
     def post(
@@ -1227,12 +1283,12 @@ def post(
         *,
         cast_to: Type[ResponseT],
         body: Body | None = None,
+        content: BinaryTypes | None = None,
         options: RequestOptions = {},
         files: RequestFiles | None = None,
         stream: bool,
         stream_cls: type[_StreamT] | None = None,
-    ) -> ResponseT | _StreamT:
-        ...
+    ) -> ResponseT | _StreamT: ...
 
     def post(
         self,
@@ -1240,13 +1296,25 @@ def post(
         *,
         cast_to: Type[ResponseT],
         body: Body | None = None,
+        content: BinaryTypes | None = None,
         options: RequestOptions = {},
         files: RequestFiles | None = None,
         stream: bool = False,
         stream_cls: type[_StreamT] | None = None,
     ) -> ResponseT | _StreamT:
+        if body is not None and content is not None:
+            raise TypeError("Passing both `body` and `content` is not supported")
+        if files is not None and content is not None:
+            raise TypeError("Passing both `files` and `content` is not supported")
+        if isinstance(body, bytes):
+            warnings.warn(
+                "Passing raw bytes as `body` is deprecated and will be removed in a future version. "
+                "Please pass raw bytes via the `content` parameter instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
         opts = FinalRequestOptions.construct(
-            method="post", url=path, json_data=body, files=to_httpx_files(files), **options
+            method="post", url=path, json_data=body, content=content, files=to_httpx_files(files), **options
         )
         return cast(ResponseT, self.request(cast_to, opts, stream=stream, stream_cls=stream_cls))
 
@@ -1256,9 +1324,24 @@ def patch(
         *,
         cast_to: Type[ResponseT],
         body: Body | None = None,
+        content: BinaryTypes | None = None,
+        files: RequestFiles | None = None,
         options: RequestOptions = {},
     ) -> ResponseT:
-        opts = FinalRequestOptions.construct(method="patch", url=path, json_data=body, **options)
+        if body is not None and content is not None:
+            raise TypeError("Passing both `body` and `content` is not supported")
+        if files is not None and content is not None:
+            raise TypeError("Passing both `files` and `content` is not supported")
+        if isinstance(body, bytes):
+            warnings.warn(
+                "Passing raw bytes as `body` is deprecated and will be removed in a future version. "
+                "Please pass raw bytes via the `content` parameter instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+        opts = FinalRequestOptions.construct(
+            method="patch", url=path, json_data=body, content=content, files=to_httpx_files(files), **options
+        )
         return self.request(cast_to, opts)
 
     def put(
@@ -1267,11 +1350,23 @@ def put(
         *,
         cast_to: Type[ResponseT],
         body: Body | None = None,
+        content: BinaryTypes | None = None,
         files: RequestFiles | None = None,
         options: RequestOptions = {},
     ) -> ResponseT:
+        if body is not None and content is not None:
+            raise TypeError("Passing both `body` and `content` is not supported")
+        if files is not None and content is not None:
+            raise TypeError("Passing both `files` and `content` is not supported")
+        if isinstance(body, bytes):
+            warnings.warn(
+                "Passing raw bytes as `body` is deprecated and will be removed in a future version. "
+                "Please pass raw bytes via the `content` parameter instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
         opts = FinalRequestOptions.construct(
-            method="put", url=path, json_data=body, files=to_httpx_files(files), **options
+            method="put", url=path, json_data=body, content=content, files=to_httpx_files(files), **options
         )
         return self.request(cast_to, opts)
 
@@ -1281,9 +1376,19 @@ def delete(
         *,
         cast_to: Type[ResponseT],
         body: Body | None = None,
+        content: BinaryTypes | None = None,
         options: RequestOptions = {},
     ) -> ResponseT:
-        opts = FinalRequestOptions.construct(method="delete", url=path, json_data=body, **options)
+        if body is not None and content is not None:
+            raise TypeError("Passing both `body` and `content` is not supported")
+        if isinstance(body, bytes):
+            warnings.warn(
+                "Passing raw bytes as `body` is deprecated and will be removed in a future version. "
+                "Please pass raw bytes via the `content` parameter instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+        opts = FinalRequestOptions.construct(method="delete", url=path, json_data=body, content=content, **options)
         return self.request(cast_to, opts)
 
     def get_api_list(
@@ -1308,6 +1413,24 @@ def __init__(self, **kwargs: Any) -> None:
         super().__init__(**kwargs)
 
 
+try:
+    import httpx_aiohttp
+except ImportError:
+
+    class _DefaultAioHttpClient(httpx.AsyncClient):
+        def __init__(self, **_kwargs: Any) -> None:
+            raise RuntimeError("To use the aiohttp client you must have installed the package with the `aiohttp` extra")
+else:
+
+    class _DefaultAioHttpClient(httpx_aiohttp.HttpxAiohttpClient):  # type: ignore
+        def __init__(self, **kwargs: Any) -> None:
+            kwargs.setdefault("timeout", DEFAULT_TIMEOUT)
+            kwargs.setdefault("limits", DEFAULT_CONNECTION_LIMITS)
+            kwargs.setdefault("follow_redirects", True)
+
+            super().__init__(**kwargs)
+
+
 if TYPE_CHECKING:
     DefaultAsyncHttpxClient = httpx.AsyncClient
     """An alias to `httpx.AsyncClient` that provides the same defaults that this SDK
@@ -1316,12 +1439,19 @@ def __init__(self, **kwargs: Any) -> None:
     This is useful because overriding the `http_client` with your own instance of
     `httpx.AsyncClient` will result in httpx's defaults being used, not ours.
     """
+
+    DefaultAioHttpClient = httpx.AsyncClient
+    """An alias to `httpx.AsyncClient` that changes the default HTTP transport to `aiohttp`."""
 else:
     DefaultAsyncHttpxClient = _DefaultAsyncHttpxClient
+    DefaultAioHttpClient = _DefaultAioHttpClient
 
 
 class AsyncHttpxClientWrapper(DefaultAsyncHttpxClient):
     def __del__(self) -> None:
+        if self.is_closed:
+            return
+
         try:
             # TODO(someday): support non asyncio runtimes here
             asyncio.get_running_loop().create_task(self.aclose())
@@ -1338,45 +1468,14 @@ def __init__(
         *,
         version: str,
         base_url: str | URL,
+        api_version: str,
         _strict_response_validation: bool,
         max_retries: int = DEFAULT_MAX_RETRIES,
-        timeout: float | Timeout | None | NotGiven = NOT_GIVEN,
-        transport: AsyncTransport | None = None,
-        proxies: ProxiesTypes | None = None,
-        limits: Limits | None = None,
+        timeout: float | Timeout | None | NotGiven = not_given,
         http_client: httpx.AsyncClient | None = None,
         custom_headers: Mapping[str, str] | None = None,
         custom_query: Mapping[str, object] | None = None,
     ) -> None:
-        if limits is not None:
-            warnings.warn(
-                "The `connection_pool_limits` argument is deprecated. The `http_client` argument should be passed instead",
-                category=DeprecationWarning,
-                stacklevel=3,
-            )
-            if http_client is not None:
-                raise ValueError("The `http_client` argument is mutually exclusive with `connection_pool_limits`")
-        else:
-            limits = DEFAULT_CONNECTION_LIMITS
-
-        if transport is not None:
-            warnings.warn(
-                "The `transport` argument is deprecated. The `http_client` argument should be passed instead",
-                category=DeprecationWarning,
-                stacklevel=3,
-            )
-            if http_client is not None:
-                raise ValueError("The `http_client` argument is mutually exclusive with `transport`")
-
-        if proxies is not None:
-            warnings.warn(
-                "The `proxies` argument is deprecated. The `http_client` argument should be passed instead",
-                category=DeprecationWarning,
-                stacklevel=3,
-            )
-            if http_client is not None:
-                raise ValueError("The `http_client` argument is mutually exclusive with `proxies`")
-
         if not is_given(timeout):
             # if the user passed in a custom http client with a non-default
             # timeout set then we use that timeout.
@@ -1398,11 +1497,9 @@ def __init__(
         super().__init__(
             version=version,
             base_url=base_url,
-            limits=limits,
+            api_version=api_version,
             # cast to a valid type because mypy doesn't understand our type narrowing
             timeout=cast(Timeout, timeout),
-            proxies=proxies,
-            transport=transport,
             max_retries=max_retries,
             custom_query=custom_query,
             custom_headers=custom_headers,
@@ -1412,10 +1509,6 @@ def __init__(
             base_url=base_url,
             # cast to a valid type because mypy doesn't understand our type narrowing
             timeout=cast(Timeout, timeout),
-            proxies=proxies,
-            transport=transport,
-            limits=limits,
-            follow_redirects=True,
         )
 
     def is_closed(self) -> bool:
@@ -1464,9 +1557,7 @@ async def request(
         options: FinalRequestOptions,
         *,
         stream: Literal[False] = False,
-        remaining_retries: Optional[int] = None,
-    ) -> ResponseT:
-        ...
+    ) -> ResponseT: ...
 
     @overload
     async def request(
@@ -1476,9 +1567,7 @@ async def request(
         *,
         stream: Literal[True],
         stream_cls: type[_AsyncStreamT],
-        remaining_retries: Optional[int] = None,
-    ) -> _AsyncStreamT:
-        ...
+    ) -> _AsyncStreamT: ...
 
     @overload
     async def request(
@@ -1488,9 +1577,7 @@ async def request(
         *,
         stream: bool,
         stream_cls: type[_AsyncStreamT] | None = None,
-        remaining_retries: Optional[int] = None,
-    ) -> ResponseT | _AsyncStreamT:
-        ...
+    ) -> ResponseT | _AsyncStreamT: ...
 
     async def request(
         self,
@@ -1499,148 +1586,137 @@ async def request(
         *,
         stream: bool = False,
         stream_cls: type[_AsyncStreamT] | None = None,
-        remaining_retries: Optional[int] = None,
-    ) -> ResponseT | _AsyncStreamT:
-        return await self._request(
-            cast_to=cast_to,
-            options=options,
-            stream=stream,
-            stream_cls=stream_cls,
-            remaining_retries=remaining_retries,
-        )
-
-    async def _request(
-        self,
-        cast_to: Type[ResponseT],
-        options: FinalRequestOptions,
-        *,
-        stream: bool,
-        stream_cls: type[_AsyncStreamT] | None,
-        remaining_retries: int | None,
     ) -> ResponseT | _AsyncStreamT:
         if self._platform is None:
             # `get_platform` can make blocking IO calls so we
             # execute it earlier while we are in an async context
             self._platform = await asyncify(get_platform)()
 
+        cast_to = self._maybe_override_cast_to(cast_to, options)
+
         # create a copy of the options we were given so that if the
         # options are mutated later & we then retry, the retries are
         # given the original options
         input_options = model_copy(options)
+        if input_options.idempotency_key is None and input_options.method.lower() != "get":
+            # ensure the idempotency key is reused between requests
+            input_options.idempotency_key = self._idempotency_key()
 
-        cast_to = self._maybe_override_cast_to(cast_to, options)
-        options = await self._prepare_options(options)
+        response: httpx.Response | None = None
+        max_retries = input_options.get_max_retries(self.max_retries)
 
-        retries = self._remaining_retries(remaining_retries, options)
-        request = self._build_request(options)
-        await self._prepare_request(request)
+        retries_taken = 0
+        for retries_taken in range(max_retries + 1):
+            options = model_copy(input_options)
+            options = await self._prepare_options(options)
 
-        kwargs: HttpxSendArgs = {}
-        if self.custom_auth is not None:
-            kwargs["auth"] = self.custom_auth
+            remaining_retries = max_retries - retries_taken
+            request = self._build_request(options, retries_taken=retries_taken)
+            await self._prepare_request(request)
 
-        try:
-            response = await self._client.send(
-                request,
-                stream=stream or self._should_stream_response_body(request=request),
-                **kwargs,
-            )
-        except httpx.TimeoutException as err:
-            log.debug("Encountered httpx.TimeoutException", exc_info=True)
-
-            if retries > 0:
-                return await self._retry_request(
-                    input_options,
-                    cast_to,
-                    retries,
-                    stream=stream,
-                    stream_cls=stream_cls,
-                    response_headers=None,
-                )
+            kwargs: HttpxSendArgs = {}
+            if self.custom_auth is not None:
+                kwargs["auth"] = self.custom_auth
 
-            log.debug("Raising timeout error")
-            raise APITimeoutError(request=request) from err
-        except Exception as err:
-            log.debug("Encountered Exception", exc_info=True)
+            if options.follow_redirects is not None:
+                kwargs["follow_redirects"] = options.follow_redirects
 
-            if retries > 0:
-                return await self._retry_request(
-                    input_options,
-                    cast_to,
-                    retries,
-                    stream=stream,
-                    stream_cls=stream_cls,
-                    response_headers=None,
+            log.debug("Sending HTTP Request: %s %s", request.method, request.url)
+
+            response = None
+            try:
+                response = await self._client.send(
+                    request,
+                    stream=stream or self._should_stream_response_body(request=request),
+                    **kwargs,
                 )
+            except httpx.TimeoutException as err:
+                log.debug("Encountered httpx.TimeoutException", exc_info=True)
+
+                if remaining_retries > 0:
+                    await self._sleep_for_retry(
+                        retries_taken=retries_taken,
+                        max_retries=max_retries,
+                        options=input_options,
+                        response=None,
+                    )
+                    continue
+
+                log.debug("Raising timeout error")
+                raise APITimeoutError(request=request) from err
+            except Exception as err:
+                log.debug("Encountered Exception", exc_info=True)
+
+                if remaining_retries > 0:
+                    await self._sleep_for_retry(
+                        retries_taken=retries_taken,
+                        max_retries=max_retries,
+                        options=input_options,
+                        response=None,
+                    )
+                    continue
+
+                log.debug("Raising connection error")
+                raise APIConnectionError(request=request) from err
+
+            log.debug(
+                'HTTP Response: %s %s "%i %s" %s',
+                request.method,
+                request.url,
+                response.status_code,
+                response.reason_phrase,
+                response.headers,
+            )
 
-            log.debug("Raising connection error")
-            raise APIConnectionError(request=request) from err
+            try:
+                response.raise_for_status()
+            except httpx.HTTPStatusError as err:  # thrown on 4xx and 5xx status code
+                log.debug("Encountered httpx.HTTPStatusError", exc_info=True)
+
+                if remaining_retries > 0 and self._should_retry(err.response):
+                    await err.response.aclose()
+                    await self._sleep_for_retry(
+                        retries_taken=retries_taken,
+                        max_retries=max_retries,
+                        options=input_options,
+                        response=response,
+                    )
+                    continue
 
-        log.debug(
-            'HTTP Request: %s %s "%i %s"', request.method, request.url, response.status_code, response.reason_phrase
-        )
+                # If the response is streamed then we need to explicitly read the response
+                # to completion before attempting to access the response text.
+                if not err.response.is_closed:
+                    await err.response.aread()
 
-        try:
-            response.raise_for_status()
-        except httpx.HTTPStatusError as err:  # thrown on 4xx and 5xx status code
-            log.debug("Encountered httpx.HTTPStatusError", exc_info=True)
-
-            if retries > 0 and self._should_retry(err.response):
-                await err.response.aclose()
-                return await self._retry_request(
-                    input_options,
-                    cast_to,
-                    retries,
-                    err.response.headers,
-                    stream=stream,
-                    stream_cls=stream_cls,
-                )
+                log.debug("Re-raising status error")
+                raise self._make_status_error_from_response(err.response) from None
 
-            # If the response is streamed then we need to explicitly read the response
-            # to completion before attempting to access the response text.
-            if not err.response.is_closed:
-                await err.response.aread()
-
-            log.debug("Re-raising status error")
-            raise self._make_status_error_from_response(err.response) from None
+            break
 
+        assert response is not None, "could not resolve response (should never happen)"
         return await self._process_response(
             cast_to=cast_to,
             options=options,
             response=response,
             stream=stream,
             stream_cls=stream_cls,
+            retries_taken=retries_taken,
         )
 
-    async def _retry_request(
-        self,
-        options: FinalRequestOptions,
-        cast_to: Type[ResponseT],
-        remaining_retries: int,
-        response_headers: httpx.Headers | None,
-        *,
-        stream: bool,
-        stream_cls: type[_AsyncStreamT] | None,
-    ) -> ResponseT | _AsyncStreamT:
-        remaining = remaining_retries - 1
-        if remaining == 1:
+    async def _sleep_for_retry(
+        self, *, retries_taken: int, max_retries: int, options: FinalRequestOptions, response: httpx.Response | None
+    ) -> None:
+        remaining_retries = max_retries - retries_taken
+        if remaining_retries == 1:
             log.debug("1 retry left")
         else:
-            log.debug("%i retries left", remaining)
+            log.debug("%i retries left", remaining_retries)
 
-        timeout = self._calculate_retry_timeout(remaining, options, response_headers)
+        timeout = self._calculate_retry_timeout(remaining_retries, options, response.headers if response else None)
         log.info("Retrying request to %s in %f seconds", options.url, timeout)
 
         await anyio.sleep(timeout)
 
-        return await self._request(
-            options=options,
-            cast_to=cast_to,
-            remaining_retries=remaining,
-            stream=stream,
-            stream_cls=stream_cls,
-        )
-
     async def _process_response(
         self,
         *,
@@ -1649,10 +1725,18 @@ async def _process_response(
         response: httpx.Response,
         stream: bool,
         stream_cls: type[Stream[Any]] | type[AsyncStream[Any]] | None,
+        retries_taken: int = 0,
     ) -> ResponseT:
         origin = get_origin(cast_to) or cast_to
 
-        if inspect.isclass(origin) and issubclass(origin, BaseAPIResponse):
+        if (
+            inspect.isclass(origin)
+            and issubclass(origin, BaseAPIResponse)
+            # we only want to actually return the custom BaseAPIResponse class if we're
+            # returning the raw response, or if we're not streaming SSE, as if we're streaming
+            # SSE then `cast_to` doesn't actively reflect the type we need to parse into
+            and (not stream or bool(response.request.headers.get(RAW_RESPONSE_HEADER)))
+        ):
             if not issubclass(origin, AsyncAPIResponse):
                 raise TypeError(f"API Response types must subclass {AsyncAPIResponse}; Received {origin}")
 
@@ -1666,6 +1750,7 @@ async def _process_response(
                     stream=stream,
                     stream_cls=stream_cls,
                     options=options,
+                    retries_taken=retries_taken,
                 ),
             )
 
@@ -1679,6 +1764,7 @@ async def _process_response(
             stream=stream,
             stream_cls=stream_cls,
             options=options,
+            retries_taken=retries_taken,
         )
         if bool(response.request.headers.get(RAW_RESPONSE_HEADER)):
             return cast(ResponseT, api_response)
@@ -1701,8 +1787,7 @@ async def get(
         cast_to: Type[ResponseT],
         options: RequestOptions = {},
         stream: Literal[False] = False,
-    ) -> ResponseT:
-        ...
+    ) -> ResponseT: ...
 
     @overload
     async def get(
@@ -1713,8 +1798,7 @@ async def get(
         options: RequestOptions = {},
         stream: Literal[True],
         stream_cls: type[_AsyncStreamT],
-    ) -> _AsyncStreamT:
-        ...
+    ) -> _AsyncStreamT: ...
 
     @overload
     async def get(
@@ -1725,8 +1809,7 @@ async def get(
         options: RequestOptions = {},
         stream: bool,
         stream_cls: type[_AsyncStreamT] | None = None,
-    ) -> ResponseT | _AsyncStreamT:
-        ...
+    ) -> ResponseT | _AsyncStreamT: ...
 
     async def get(
         self,
@@ -1747,11 +1830,11 @@ async def post(
         *,
         cast_to: Type[ResponseT],
         body: Body | None = None,
+        content: AsyncBinaryTypes | None = None,
         files: RequestFiles | None = None,
         options: RequestOptions = {},
         stream: Literal[False] = False,
-    ) -> ResponseT:
-        ...
+    ) -> ResponseT: ...
 
     @overload
     async def post(
@@ -1760,12 +1843,12 @@ async def post(
         *,
         cast_to: Type[ResponseT],
         body: Body | None = None,
+        content: AsyncBinaryTypes | None = None,
         files: RequestFiles | None = None,
         options: RequestOptions = {},
         stream: Literal[True],
         stream_cls: type[_AsyncStreamT],
-    ) -> _AsyncStreamT:
-        ...
+    ) -> _AsyncStreamT: ...
 
     @overload
     async def post(
@@ -1774,12 +1857,12 @@ async def post(
         *,
         cast_to: Type[ResponseT],
         body: Body | None = None,
+        content: AsyncBinaryTypes | None = None,
         files: RequestFiles | None = None,
         options: RequestOptions = {},
         stream: bool,
         stream_cls: type[_AsyncStreamT] | None = None,
-    ) -> ResponseT | _AsyncStreamT:
-        ...
+    ) -> ResponseT | _AsyncStreamT: ...
 
     async def post(
         self,
@@ -1787,13 +1870,25 @@ async def post(
         *,
         cast_to: Type[ResponseT],
         body: Body | None = None,
+        content: AsyncBinaryTypes | None = None,
         files: RequestFiles | None = None,
         options: RequestOptions = {},
         stream: bool = False,
         stream_cls: type[_AsyncStreamT] | None = None,
     ) -> ResponseT | _AsyncStreamT:
+        if body is not None and content is not None:
+            raise TypeError("Passing both `body` and `content` is not supported")
+        if files is not None and content is not None:
+            raise TypeError("Passing both `files` and `content` is not supported")
+        if isinstance(body, bytes):
+            warnings.warn(
+                "Passing raw bytes as `body` is deprecated and will be removed in a future version. "
+                "Please pass raw bytes via the `content` parameter instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
         opts = FinalRequestOptions.construct(
-            method="post", url=path, json_data=body, files=await async_to_httpx_files(files), **options
+            method="post", url=path, json_data=body, content=content, files=await async_to_httpx_files(files), **options
         )
         return await self.request(cast_to, opts, stream=stream, stream_cls=stream_cls)
 
@@ -1803,9 +1898,29 @@ async def patch(
         *,
         cast_to: Type[ResponseT],
         body: Body | None = None,
+        content: AsyncBinaryTypes | None = None,
+        files: RequestFiles | None = None,
         options: RequestOptions = {},
     ) -> ResponseT:
-        opts = FinalRequestOptions.construct(method="patch", url=path, json_data=body, **options)
+        if body is not None and content is not None:
+            raise TypeError("Passing both `body` and `content` is not supported")
+        if files is not None and content is not None:
+            raise TypeError("Passing both `files` and `content` is not supported")
+        if isinstance(body, bytes):
+            warnings.warn(
+                "Passing raw bytes as `body` is deprecated and will be removed in a future version. "
+                "Please pass raw bytes via the `content` parameter instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+        opts = FinalRequestOptions.construct(
+            method="patch",
+            url=path,
+            json_data=body,
+            content=content,
+            files=await async_to_httpx_files(files),
+            **options,
+        )
         return await self.request(cast_to, opts)
 
     async def put(
@@ -1814,11 +1929,23 @@ async def put(
         *,
         cast_to: Type[ResponseT],
         body: Body | None = None,
+        content: AsyncBinaryTypes | None = None,
         files: RequestFiles | None = None,
         options: RequestOptions = {},
     ) -> ResponseT:
+        if body is not None and content is not None:
+            raise TypeError("Passing both `body` and `content` is not supported")
+        if files is not None and content is not None:
+            raise TypeError("Passing both `files` and `content` is not supported")
+        if isinstance(body, bytes):
+            warnings.warn(
+                "Passing raw bytes as `body` is deprecated and will be removed in a future version. "
+                "Please pass raw bytes via the `content` parameter instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
         opts = FinalRequestOptions.construct(
-            method="put", url=path, json_data=body, files=await async_to_httpx_files(files), **options
+            method="put", url=path, json_data=body, content=content, files=await async_to_httpx_files(files), **options
         )
         return await self.request(cast_to, opts)
 
@@ -1828,9 +1955,19 @@ async def delete(
         *,
         cast_to: Type[ResponseT],
         body: Body | None = None,
+        content: AsyncBinaryTypes | None = None,
         options: RequestOptions = {},
     ) -> ResponseT:
-        opts = FinalRequestOptions.construct(method="delete", url=path, json_data=body, **options)
+        if body is not None and content is not None:
+            raise TypeError("Passing both `body` and `content` is not supported")
+        if isinstance(body, bytes):
+            warnings.warn(
+                "Passing raw bytes as `body` is deprecated and will be removed in a future version. "
+                "Please pass raw bytes via the `content` parameter instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+        opts = FinalRequestOptions.construct(method="delete", url=path, json_data=body, content=content, **options)
         return await self.request(cast_to, opts)
 
     def get_api_list(
@@ -1854,8 +1991,9 @@ def make_request_options(
     extra_query: Query | None = None,
     extra_body: Body | None = None,
     idempotency_key: str | None = None,
-    timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    post_parser: PostParser | NotGiven = NOT_GIVEN,
+    timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    post_parser: PostParser | NotGiven = not_given,
+    multipart_syntax: MultipartSyntax | None = None,
 ) -> RequestOptions:
     """Create a dict of type RequestOptions without keys of NotGiven values."""
     options: RequestOptions = {}
@@ -1881,6 +2019,9 @@ def make_request_options(
         # internal
         options["post_parser"] = post_parser  # type: ignore
 
+    if multipart_syntax is not None:
+        options["multipart_syntax"] = multipart_syntax
+
     return options
 
 
@@ -1995,7 +2136,6 @@ def get_python_version() -> str:
 
 def get_architecture() -> Arch:
     try:
-        python_bitness, _ = platform.architecture()
         machine = platform.machine().lower()
     except Exception:
         return "unknown"
@@ -2011,7 +2151,7 @@ def get_architecture() -> Arch:
         return "x64"
 
     # TODO: untested
-    if python_bitness == "32bit":
+    if sys.maxsize <= 2**32:
         return "x32"
 
     if machine:
diff --git a/src/cloudflare/_client.py b/src/cloudflare/_client.py
index 6e2928862dd..edc473185de 100644
--- a/src/cloudflare/_client.py
+++ b/src/cloudflare/_client.py
@@ -3,15 +3,15 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Union, Mapping
+from typing import TYPE_CHECKING, Any, Mapping
+from datetime import datetime
 from typing_extensions import Self, override
 
 import httpx
 
-from . import resources, _exceptions
+from . import _exceptions
 from ._qs import Querystring
 from ._types import (
-    NOT_GIVEN,
     Omit,
     Headers,
     Timeout,
@@ -19,11 +19,10 @@
     Transport,
     ProxiesTypes,
     RequestOptions,
+    not_given,
 )
-from ._utils import (
-    is_given,
-    get_async_library,
-)
+from ._utils import is_given, get_async_library
+from ._compat import cached_property
 from ._version import __version__
 from ._streaming import Stream as Stream, AsyncStream as AsyncStream
 from ._exceptions import APIStatusError
@@ -33,12 +32,246 @@
     AsyncAPIClient,
 )
 
+if TYPE_CHECKING:
+    from .resources import (
+        ai,
+        d1,
+        kv,
+        r2,
+        acm,
+        dns,
+        iam,
+        ips,
+        rum,
+        ssl,
+        argo,
+        logs,
+        user,
+        web3,
+        cache,
+        calls,
+        fraud,
+        intel,
+        pages,
+        radar,
+        rules,
+        speed,
+        zaraz,
+        zones,
+        images,
+        queues,
+        stream,
+        billing,
+        filters,
+        logpush,
+        workers,
+        accounts,
+        aisearch,
+        alerting,
+        firewall,
+        rulesets,
+        snippets,
+        spectrum,
+        hostnames,
+        pipelines,
+        registrar,
+        turnstile,
+        vectorize,
+        workflows,
+        addressing,
+        ai_gateway,
+        audit_logs,
+        hyperdrive,
+        page_rules,
+        zero_trust,
+        api_gateway,
+        botnet_feed,
+        diagnostics,
+        memberships,
+        page_shield,
+        rate_limits,
+        url_scanner,
+        connectivity,
+        custom_pages,
+        dns_firewall,
+        healthchecks,
+        realtime_kit,
+        security_txt,
+        abuse_reports,
+        email_routing,
+        magic_transit,
+        organizations,
+        secrets_store,
+        waiting_rooms,
+        bot_management,
+        cloudforce_one,
+        dcv_delegation,
+        email_security,
+        load_balancers,
+        cloud_connector,
+        durable_objects,
+        r2_data_catalog,
+        request_tracers,
+        security_center,
+        brand_protection,
+        content_scanning,
+        custom_hostnames,
+        resource_sharing,
+        token_validation,
+        browser_rendering,
+        mtls_certificates,
+        schema_validation,
+        url_normalization,
+        custom_nameservers,
+        managed_transforms,
+        client_certificates,
+        custom_certificates,
+        keyless_certificates,
+        network_interconnects,
+        workers_for_platforms,
+        magic_cloud_networking,
+        origin_ca_certificates,
+        origin_tls_client_auth,
+        certificate_authorities,
+        leaked_credential_checks,
+        magic_network_monitoring,
+        origin_post_quantum_encryption,
+    )
+    from .resources.ips import IPsResource, AsyncIPsResource
+    from .resources.ai.ai import AIResource, AsyncAIResource
+    from .resources.d1.d1 import D1Resource, AsyncD1Resource
+    from .resources.fraud import FraudResource, AsyncFraudResource
+    from .resources.kv.kv import KVResource, AsyncKVResource
+    from .resources.r2.r2 import R2Resource, AsyncR2Resource
+    from .resources.acm.acm import ACMResource, AsyncACMResource
+    from .resources.dns.dns import DNSResource, AsyncDNSResource
+    from .resources.filters import FiltersResource, AsyncFiltersResource
+    from .resources.iam.iam import IAMResource, AsyncIAMResource
+    from .resources.rum.rum import RUMResource, AsyncRUMResource
+    from .resources.ssl.ssl import SSLResource, AsyncSSLResource
+    from .resources.argo.argo import ArgoResource, AsyncArgoResource
+    from .resources.logs.logs import LogsResource, AsyncLogsResource
+    from .resources.user.user import UserResource, AsyncUserResource
+    from .resources.web3.web3 import Web3Resource, AsyncWeb3Resource
+    from .resources.audit_logs import AuditLogsResource, AsyncAuditLogsResource
+    from .resources.page_rules import PageRulesResource, AsyncPageRulesResource
+    from .resources.cache.cache import CacheResource, AsyncCacheResource
+    from .resources.calls.calls import CallsResource, AsyncCallsResource
+    from .resources.intel.intel import IntelResource, AsyncIntelResource
+    from .resources.memberships import MembershipsResource, AsyncMembershipsResource
+    from .resources.pages.pages import PagesResource, AsyncPagesResource
+    from .resources.radar.radar import RadarResource, AsyncRadarResource
+    from .resources.rate_limits import RateLimitsResource, AsyncRateLimitsResource
+    from .resources.rules.rules import RulesResource, AsyncRulesResource
+    from .resources.speed.speed import SpeedResource, AsyncSpeedResource
+    from .resources.zaraz.zaraz import ZarazResource, AsyncZarazResource
+    from .resources.zones.zones import ZonesResource, AsyncZonesResource
+    from .resources.custom_pages import CustomPagesResource, AsyncCustomPagesResource
+    from .resources.security_txt import SecurityTXTResource, AsyncSecurityTXTResource
+    from .resources.images.images import ImagesResource, AsyncImagesResource
+    from .resources.queues.queues import QueuesResource, AsyncQueuesResource
+    from .resources.stream.stream import StreamResource, AsyncStreamResource
+    from .resources.bot_management import BotManagementResource, AsyncBotManagementResource
+    from .resources.dcv_delegation import DCVDelegationResource, AsyncDCVDelegationResource
+    from .resources.billing.billing import BillingResource, AsyncBillingResource
+    from .resources.logpush.logpush import LogpushResource, AsyncLogpushResource
+    from .resources.workers.workers import WorkersResource, AsyncWorkersResource
+    from .resources.accounts.accounts import AccountsResource, AsyncAccountsResource
+    from .resources.aisearch.aisearch import AISearchResource, AsyncAISearchResource
+    from .resources.alerting.alerting import AlertingResource, AsyncAlertingResource
+    from .resources.firewall.firewall import FirewallResource, AsyncFirewallResource
+    from .resources.rulesets.rulesets import RulesetsResource, AsyncRulesetsResource
+    from .resources.snippets.snippets import SnippetsResource, AsyncSnippetsResource
+    from .resources.spectrum.spectrum import SpectrumResource, AsyncSpectrumResource
+    from .resources.url_normalization import URLNormalizationResource, AsyncURLNormalizationResource
+    from .resources.custom_nameservers import CustomNameserversResource, AsyncCustomNameserversResource
+    from .resources.managed_transforms import ManagedTransformsResource, AsyncManagedTransformsResource
+    from .resources.client_certificates import ClientCertificatesResource, AsyncClientCertificatesResource
+    from .resources.hostnames.hostnames import HostnamesResource, AsyncHostnamesResource
+    from .resources.pipelines.pipelines import PipelinesResource, AsyncPipelinesResource
+    from .resources.registrar.registrar import RegistrarResource, AsyncRegistrarResource
+    from .resources.turnstile.turnstile import TurnstileResource, AsyncTurnstileResource
+    from .resources.vectorize.vectorize import VectorizeResource, AsyncVectorizeResource
+    from .resources.workflows.workflows import WorkflowsResource, AsyncWorkflowsResource
+    from .resources.keyless_certificates import KeylessCertificatesResource, AsyncKeylessCertificatesResource
+    from .resources.addressing.addressing import AddressingResource, AsyncAddressingResource
+    from .resources.ai_gateway.ai_gateway import AIGatewayResource, AsyncAIGatewayResource
+    from .resources.hyperdrive.hyperdrive import HyperdriveResource, AsyncHyperdriveResource
+    from .resources.zero_trust.zero_trust import ZeroTrustResource, AsyncZeroTrustResource
+    from .resources.origin_ca_certificates import OriginCACertificatesResource, AsyncOriginCACertificatesResource
+    from .resources.api_gateway.api_gateway import APIGatewayResource, AsyncAPIGatewayResource
+    from .resources.botnet_feed.botnet_feed import BotnetFeedResource, AsyncBotnetFeedResource
+    from .resources.diagnostics.diagnostics import DiagnosticsResource, AsyncDiagnosticsResource
+    from .resources.page_shield.page_shield import PageShieldResource, AsyncPageShieldResource
+    from .resources.url_scanner.url_scanner import URLScannerResource, AsyncURLScannerResource
+    from .resources.connectivity.connectivity import ConnectivityResource, AsyncConnectivityResource
+    from .resources.dns_firewall.dns_firewall import DNSFirewallResource, AsyncDNSFirewallResource
+    from .resources.healthchecks.healthchecks import HealthchecksResource, AsyncHealthchecksResource
+    from .resources.realtime_kit.realtime_kit import RealtimeKitResource, AsyncRealtimeKitResource
+    from .resources.abuse_reports.abuse_reports import AbuseReportsResource, AsyncAbuseReportsResource
+    from .resources.email_routing.email_routing import EmailRoutingResource, AsyncEmailRoutingResource
+    from .resources.magic_transit.magic_transit import MagicTransitResource, AsyncMagicTransitResource
+    from .resources.organizations.organizations import OrganizationsResource, AsyncOrganizationsResource
+    from .resources.secrets_store.secrets_store import SecretsStoreResource, AsyncSecretsStoreResource
+    from .resources.waiting_rooms.waiting_rooms import WaitingRoomsResource, AsyncWaitingRoomsResource
+    from .resources.cloudforce_one.cloudforce_one import CloudforceOneResource, AsyncCloudforceOneResource
+    from .resources.email_security.email_security import EmailSecurityResource, AsyncEmailSecurityResource
+    from .resources.load_balancers.load_balancers import LoadBalancersResource, AsyncLoadBalancersResource
+    from .resources.origin_post_quantum_encryption import (
+        OriginPostQuantumEncryptionResource,
+        AsyncOriginPostQuantumEncryptionResource,
+    )
+    from .resources.cloud_connector.cloud_connector import CloudConnectorResource, AsyncCloudConnectorResource
+    from .resources.durable_objects.durable_objects import DurableObjectsResource, AsyncDurableObjectsResource
+    from .resources.r2_data_catalog.r2_data_catalog import R2DataCatalogResource, AsyncR2DataCatalogResource
+    from .resources.request_tracers.request_tracers import RequestTracersResource, AsyncRequestTracersResource
+    from .resources.security_center.security_center import SecurityCenterResource, AsyncSecurityCenterResource
+    from .resources.brand_protection.brand_protection import BrandProtectionResource, AsyncBrandProtectionResource
+    from .resources.content_scanning.content_scanning import ContentScanningResource, AsyncContentScanningResource
+    from .resources.custom_hostnames.custom_hostnames import CustomHostnamesResource, AsyncCustomHostnamesResource
+    from .resources.resource_sharing.resource_sharing import ResourceSharingResource, AsyncResourceSharingResource
+    from .resources.token_validation.token_validation import TokenValidationResource, AsyncTokenValidationResource
+    from .resources.browser_rendering.browser_rendering import BrowserRenderingResource, AsyncBrowserRenderingResource
+    from .resources.mtls_certificates.mtls_certificates import MTLSCertificatesResource, AsyncMTLSCertificatesResource
+    from .resources.schema_validation.schema_validation import SchemaValidationResource, AsyncSchemaValidationResource
+    from .resources.custom_certificates.custom_certificates import (
+        CustomCertificatesResource,
+        AsyncCustomCertificatesResource,
+    )
+    from .resources.network_interconnects.network_interconnects import (
+        NetworkInterconnectsResource,
+        AsyncNetworkInterconnectsResource,
+    )
+    from .resources.workers_for_platforms.workers_for_platforms import (
+        WorkersForPlatformsResource,
+        AsyncWorkersForPlatformsResource,
+    )
+    from .resources.magic_cloud_networking.magic_cloud_networking import (
+        MagicCloudNetworkingResource,
+        AsyncMagicCloudNetworkingResource,
+    )
+    from .resources.origin_tls_client_auth.origin_tls_client_auth import (
+        OriginTLSClientAuthResource,
+        AsyncOriginTLSClientAuthResource,
+    )
+    from .resources.certificate_authorities.certificate_authorities import (
+        CertificateAuthoritiesResource,
+        AsyncCertificateAuthoritiesResource,
+    )
+    from .resources.leaked_credential_checks.leaked_credential_checks import (
+        LeakedCredentialChecksResource,
+        AsyncLeakedCredentialChecksResource,
+    )
+    from .resources.magic_network_monitoring.magic_network_monitoring import (
+        MagicNetworkMonitoringResource,
+        AsyncMagicNetworkMonitoringResource,
+    )
+
 __all__ = [
     "Timeout",
     "Transport",
     "ProxiesTypes",
     "RequestOptions",
-    "resources",
     "Cloudflare",
     "AsyncCloudflare",
     "Client",
@@ -47,94 +280,6 @@
 
 
 class Cloudflare(SyncAPIClient):
-    accounts: resources.AccountsResource
-    origin_ca_certificates: resources.OriginCACertificatesResource
-    ips: resources.IPsResource
-    memberships: resources.MembershipsResource
-    user: resources.UserResource
-    zones: resources.ZonesResource
-    load_balancers: resources.LoadBalancersResource
-    cache: resources.CacheResource
-    ssl: resources.SSLResource
-    subscriptions: resources.SubscriptionsResource
-    acm: resources.ACMResource
-    argo: resources.ArgoResource
-    plans: resources.PlansResource
-    rate_plans: resources.RatePlansResource
-    certificate_authorities: resources.CertificateAuthoritiesResource
-    client_certificates: resources.ClientCertificatesResource
-    custom_certificates: resources.CustomCertificatesResource
-    custom_hostnames: resources.CustomHostnamesResource
-    custom_nameservers: resources.CustomNameserversResource
-    dns: resources.DNSResource
-    dnssec: resources.DNSSECResource
-    email_routing: resources.EmailRoutingResource
-    filters: resources.FiltersResource
-    firewall: resources.FirewallResource
-    healthchecks: resources.HealthchecksResource
-    keyless_certificates: resources.KeylessCertificatesResource
-    logpush: resources.LogpushResource
-    logs: resources.LogsResource
-    origin_tls_client_auth: resources.OriginTLSClientAuthResource
-    pagerules: resources.PagerulesResource
-    rate_limits: resources.RateLimitsResource
-    secondary_dns: resources.SecondaryDNSResource
-    waiting_rooms: resources.WaitingRoomsResource
-    web3: resources.Web3Resource
-    workers: resources.WorkersResource
-    kv: resources.KVResource
-    durable_objects: resources.DurableObjectsResource
-    queues: resources.QueuesResource
-    api_gateway: resources.APIGatewayResource
-    managed_headers: resources.ManagedHeadersResource
-    page_shield: resources.PageShieldResource
-    rulesets: resources.RulesetsResource
-    url_normalization: resources.URLNormalizationResource
-    spectrum: resources.SpectrumResource
-    addressing: resources.AddressingResource
-    audit_logs: resources.AuditLogsResource
-    billing: resources.BillingResource
-    brand_protection: resources.BrandProtectionResource
-    diagnostics: resources.DiagnosticsResource
-    images: resources.ImagesResource
-    intel: resources.IntelResource
-    magic_transit: resources.MagicTransitResource
-    magic_network_monitoring: resources.MagicNetworkMonitoringResource
-    mtls_certificates: resources.MTLSCertificatesResource
-    pages: resources.PagesResource
-    pcaps: resources.PCAPsResource
-    registrar: resources.RegistrarResource
-    request_tracers: resources.RequestTracersResource
-    rules: resources.RulesResource
-    storage: resources.StorageResource
-    stream: resources.StreamResource
-    alerting: resources.AlertingResource
-    d1: resources.D1Resource
-    r2: resources.R2Resource
-    warp_connector: resources.WARPConnectorResource
-    workers_for_platforms: resources.WorkersForPlatformsResource
-    zero_trust: resources.ZeroTrustResource
-    challenges: resources.ChallengesResource
-    hyperdrive: resources.HyperdriveResource
-    rum: resources.RUMResource
-    vectorize: resources.VectorizeResource
-    url_scanner: resources.URLScannerResource
-    radar: resources.RadarResource
-    bot_management: resources.BotManagementResource
-    origin_post_quantum_encryption: resources.OriginPostQuantumEncryptionResource
-    speed: resources.SpeedResource
-    dcv_delegation: resources.DCVDelegationResource
-    hostnames: resources.HostnamesResource
-    snippets: resources.SnippetsResource
-    calls: resources.CallsResource
-    cloudforce_one: resources.CloudforceOneResource
-    event_notifications: resources.EventNotificationsResource
-    ai_gateway: resources.AIGatewayResource
-    iam: resources.IAMResource
-    cloud_connector: resources.CloudConnectorResource
-    with_raw_response: CloudflareWithRawResponse
-    with_streaming_response: CloudflareWithStreamedResponse
-
     # client options
     api_token: str | None
     api_key: str | None
@@ -149,7 +294,8 @@ def __init__(
         api_email: str | None = None,
         user_service_key: str | None = None,
         base_url: str | httpx.URL | None = None,
-        timeout: Union[float, Timeout, None, NotGiven] = NOT_GIVEN,
+        api_version: str | None = None,
+        timeout: float | Timeout | None | NotGiven = not_given,
         max_retries: int = DEFAULT_MAX_RETRIES,
         default_headers: Mapping[str, str] | None = None,
         default_query: Mapping[str, object] | None = None,
@@ -167,7 +313,7 @@ def __init__(
         # part of our public interface in the future.
         _strict_response_validation: bool = False,
     ) -> None:
-        """Construct a new synchronous cloudflare client instance.
+        """Construct a new synchronous Cloudflare client instance.
 
         This automatically infers the following arguments from their corresponding environment variables if they are not provided:
         - `api_token` from `CLOUDFLARE_API_TOKEN`
@@ -196,9 +342,13 @@ def __init__(
         if base_url is None:
             base_url = f"https://api.cloudflare.com/client/v4"
 
+        if api_version is None:
+            api_version = datetime.today().strftime('%Y-%m-%d')
+
         super().__init__(
             version=__version__,
             base_url=base_url,
+            api_version=api_version,
             max_retries=max_retries,
             timeout=timeout,
             http_client=http_client,
@@ -207,93 +357,625 @@ def __init__(
             _strict_response_validation=_strict_response_validation,
         )
 
-        self.accounts = resources.AccountsResource(self)
-        self.origin_ca_certificates = resources.OriginCACertificatesResource(self)
-        self.ips = resources.IPsResource(self)
-        self.memberships = resources.MembershipsResource(self)
-        self.user = resources.UserResource(self)
-        self.zones = resources.ZonesResource(self)
-        self.load_balancers = resources.LoadBalancersResource(self)
-        self.cache = resources.CacheResource(self)
-        self.ssl = resources.SSLResource(self)
-        self.subscriptions = resources.SubscriptionsResource(self)
-        self.acm = resources.ACMResource(self)
-        self.argo = resources.ArgoResource(self)
-        self.plans = resources.PlansResource(self)
-        self.rate_plans = resources.RatePlansResource(self)
-        self.certificate_authorities = resources.CertificateAuthoritiesResource(self)
-        self.client_certificates = resources.ClientCertificatesResource(self)
-        self.custom_certificates = resources.CustomCertificatesResource(self)
-        self.custom_hostnames = resources.CustomHostnamesResource(self)
-        self.custom_nameservers = resources.CustomNameserversResource(self)
-        self.dns = resources.DNSResource(self)
-        self.dnssec = resources.DNSSECResource(self)
-        self.email_routing = resources.EmailRoutingResource(self)
-        self.filters = resources.FiltersResource(self)
-        self.firewall = resources.FirewallResource(self)
-        self.healthchecks = resources.HealthchecksResource(self)
-        self.keyless_certificates = resources.KeylessCertificatesResource(self)
-        self.logpush = resources.LogpushResource(self)
-        self.logs = resources.LogsResource(self)
-        self.origin_tls_client_auth = resources.OriginTLSClientAuthResource(self)
-        self.pagerules = resources.PagerulesResource(self)
-        self.rate_limits = resources.RateLimitsResource(self)
-        self.secondary_dns = resources.SecondaryDNSResource(self)
-        self.waiting_rooms = resources.WaitingRoomsResource(self)
-        self.web3 = resources.Web3Resource(self)
-        self.workers = resources.WorkersResource(self)
-        self.kv = resources.KVResource(self)
-        self.durable_objects = resources.DurableObjectsResource(self)
-        self.queues = resources.QueuesResource(self)
-        self.api_gateway = resources.APIGatewayResource(self)
-        self.managed_headers = resources.ManagedHeadersResource(self)
-        self.page_shield = resources.PageShieldResource(self)
-        self.rulesets = resources.RulesetsResource(self)
-        self.url_normalization = resources.URLNormalizationResource(self)
-        self.spectrum = resources.SpectrumResource(self)
-        self.addressing = resources.AddressingResource(self)
-        self.audit_logs = resources.AuditLogsResource(self)
-        self.billing = resources.BillingResource(self)
-        self.brand_protection = resources.BrandProtectionResource(self)
-        self.diagnostics = resources.DiagnosticsResource(self)
-        self.images = resources.ImagesResource(self)
-        self.intel = resources.IntelResource(self)
-        self.magic_transit = resources.MagicTransitResource(self)
-        self.magic_network_monitoring = resources.MagicNetworkMonitoringResource(self)
-        self.mtls_certificates = resources.MTLSCertificatesResource(self)
-        self.pages = resources.PagesResource(self)
-        self.pcaps = resources.PCAPsResource(self)
-        self.registrar = resources.RegistrarResource(self)
-        self.request_tracers = resources.RequestTracersResource(self)
-        self.rules = resources.RulesResource(self)
-        self.storage = resources.StorageResource(self)
-        self.stream = resources.StreamResource(self)
-        self.alerting = resources.AlertingResource(self)
-        self.d1 = resources.D1Resource(self)
-        self.r2 = resources.R2Resource(self)
-        self.warp_connector = resources.WARPConnectorResource(self)
-        self.workers_for_platforms = resources.WorkersForPlatformsResource(self)
-        self.zero_trust = resources.ZeroTrustResource(self)
-        self.challenges = resources.ChallengesResource(self)
-        self.hyperdrive = resources.HyperdriveResource(self)
-        self.rum = resources.RUMResource(self)
-        self.vectorize = resources.VectorizeResource(self)
-        self.url_scanner = resources.URLScannerResource(self)
-        self.radar = resources.RadarResource(self)
-        self.bot_management = resources.BotManagementResource(self)
-        self.origin_post_quantum_encryption = resources.OriginPostQuantumEncryptionResource(self)
-        self.speed = resources.SpeedResource(self)
-        self.dcv_delegation = resources.DCVDelegationResource(self)
-        self.hostnames = resources.HostnamesResource(self)
-        self.snippets = resources.SnippetsResource(self)
-        self.calls = resources.CallsResource(self)
-        self.cloudforce_one = resources.CloudforceOneResource(self)
-        self.event_notifications = resources.EventNotificationsResource(self)
-        self.ai_gateway = resources.AIGatewayResource(self)
-        self.iam = resources.IAMResource(self)
-        self.cloud_connector = resources.CloudConnectorResource(self)
-        self.with_raw_response = CloudflareWithRawResponse(self)
-        self.with_streaming_response = CloudflareWithStreamedResponse(self)
+    @cached_property
+    def accounts(self) -> AccountsResource:
+        from .resources.accounts import AccountsResource
+
+        return AccountsResource(self)
+
+    @cached_property
+    def organizations(self) -> OrganizationsResource:
+        from .resources.organizations import OrganizationsResource
+
+        return OrganizationsResource(self)
+
+    @cached_property
+    def origin_ca_certificates(self) -> OriginCACertificatesResource:
+        from .resources.origin_ca_certificates import OriginCACertificatesResource
+
+        return OriginCACertificatesResource(self)
+
+    @cached_property
+    def ips(self) -> IPsResource:
+        from .resources.ips import IPsResource
+
+        return IPsResource(self)
+
+    @cached_property
+    def memberships(self) -> MembershipsResource:
+        from .resources.memberships import MembershipsResource
+
+        return MembershipsResource(self)
+
+    @cached_property
+    def user(self) -> UserResource:
+        from .resources.user import UserResource
+
+        return UserResource(self)
+
+    @cached_property
+    def zones(self) -> ZonesResource:
+        from .resources.zones import ZonesResource
+
+        return ZonesResource(self)
+
+    @cached_property
+    def load_balancers(self) -> LoadBalancersResource:
+        from .resources.load_balancers import LoadBalancersResource
+
+        return LoadBalancersResource(self)
+
+    @cached_property
+    def cache(self) -> CacheResource:
+        from .resources.cache import CacheResource
+
+        return CacheResource(self)
+
+    @cached_property
+    def ssl(self) -> SSLResource:
+        from .resources.ssl import SSLResource
+
+        return SSLResource(self)
+
+    @cached_property
+    def acm(self) -> ACMResource:
+        from .resources.acm import ACMResource
+
+        return ACMResource(self)
+
+    @cached_property
+    def argo(self) -> ArgoResource:
+        from .resources.argo import ArgoResource
+
+        return ArgoResource(self)
+
+    @cached_property
+    def certificate_authorities(self) -> CertificateAuthoritiesResource:
+        from .resources.certificate_authorities import CertificateAuthoritiesResource
+
+        return CertificateAuthoritiesResource(self)
+
+    @cached_property
+    def client_certificates(self) -> ClientCertificatesResource:
+        from .resources.client_certificates import ClientCertificatesResource
+
+        return ClientCertificatesResource(self)
+
+    @cached_property
+    def custom_certificates(self) -> CustomCertificatesResource:
+        from .resources.custom_certificates import CustomCertificatesResource
+
+        return CustomCertificatesResource(self)
+
+    @cached_property
+    def custom_hostnames(self) -> CustomHostnamesResource:
+        from .resources.custom_hostnames import CustomHostnamesResource
+
+        return CustomHostnamesResource(self)
+
+    @cached_property
+    def custom_nameservers(self) -> CustomNameserversResource:
+        from .resources.custom_nameservers import CustomNameserversResource
+
+        return CustomNameserversResource(self)
+
+    @cached_property
+    def dns_firewall(self) -> DNSFirewallResource:
+        from .resources.dns_firewall import DNSFirewallResource
+
+        return DNSFirewallResource(self)
+
+    @cached_property
+    def dns(self) -> DNSResource:
+        from .resources.dns import DNSResource
+
+        return DNSResource(self)
+
+    @cached_property
+    def email_security(self) -> EmailSecurityResource:
+        from .resources.email_security import EmailSecurityResource
+
+        return EmailSecurityResource(self)
+
+    @cached_property
+    def email_routing(self) -> EmailRoutingResource:
+        from .resources.email_routing import EmailRoutingResource
+
+        return EmailRoutingResource(self)
+
+    @cached_property
+    def filters(self) -> FiltersResource:
+        from .resources.filters import FiltersResource
+
+        return FiltersResource(self)
+
+    @cached_property
+    def firewall(self) -> FirewallResource:
+        from .resources.firewall import FirewallResource
+
+        return FirewallResource(self)
+
+    @cached_property
+    def healthchecks(self) -> HealthchecksResource:
+        from .resources.healthchecks import HealthchecksResource
+
+        return HealthchecksResource(self)
+
+    @cached_property
+    def keyless_certificates(self) -> KeylessCertificatesResource:
+        from .resources.keyless_certificates import KeylessCertificatesResource
+
+        return KeylessCertificatesResource(self)
+
+    @cached_property
+    def logpush(self) -> LogpushResource:
+        from .resources.logpush import LogpushResource
+
+        return LogpushResource(self)
+
+    @cached_property
+    def logs(self) -> LogsResource:
+        from .resources.logs import LogsResource
+
+        return LogsResource(self)
+
+    @cached_property
+    def origin_tls_client_auth(self) -> OriginTLSClientAuthResource:
+        from .resources.origin_tls_client_auth import OriginTLSClientAuthResource
+
+        return OriginTLSClientAuthResource(self)
+
+    @cached_property
+    def page_rules(self) -> PageRulesResource:
+        from .resources.page_rules import PageRulesResource
+
+        return PageRulesResource(self)
+
+    @cached_property
+    def rate_limits(self) -> RateLimitsResource:
+        from .resources.rate_limits import RateLimitsResource
+
+        return RateLimitsResource(self)
+
+    @cached_property
+    def waiting_rooms(self) -> WaitingRoomsResource:
+        from .resources.waiting_rooms import WaitingRoomsResource
+
+        return WaitingRoomsResource(self)
+
+    @cached_property
+    def web3(self) -> Web3Resource:
+        from .resources.web3 import Web3Resource
+
+        return Web3Resource(self)
+
+    @cached_property
+    def workers(self) -> WorkersResource:
+        from .resources.workers import WorkersResource
+
+        return WorkersResource(self)
+
+    @cached_property
+    def kv(self) -> KVResource:
+        from .resources.kv import KVResource
+
+        return KVResource(self)
+
+    @cached_property
+    def durable_objects(self) -> DurableObjectsResource:
+        from .resources.durable_objects import DurableObjectsResource
+
+        return DurableObjectsResource(self)
+
+    @cached_property
+    def queues(self) -> QueuesResource:
+        from .resources.queues import QueuesResource
+
+        return QueuesResource(self)
+
+    @cached_property
+    def api_gateway(self) -> APIGatewayResource:
+        from .resources.api_gateway import APIGatewayResource
+
+        return APIGatewayResource(self)
+
+    @cached_property
+    def managed_transforms(self) -> ManagedTransformsResource:
+        from .resources.managed_transforms import ManagedTransformsResource
+
+        return ManagedTransformsResource(self)
+
+    @cached_property
+    def page_shield(self) -> PageShieldResource:
+        from .resources.page_shield import PageShieldResource
+
+        return PageShieldResource(self)
+
+    @cached_property
+    def rulesets(self) -> RulesetsResource:
+        from .resources.rulesets import RulesetsResource
+
+        return RulesetsResource(self)
+
+    @cached_property
+    def url_normalization(self) -> URLNormalizationResource:
+        from .resources.url_normalization import URLNormalizationResource
+
+        return URLNormalizationResource(self)
+
+    @cached_property
+    def spectrum(self) -> SpectrumResource:
+        from .resources.spectrum import SpectrumResource
+
+        return SpectrumResource(self)
+
+    @cached_property
+    def addressing(self) -> AddressingResource:
+        from .resources.addressing import AddressingResource
+
+        return AddressingResource(self)
+
+    @cached_property
+    def audit_logs(self) -> AuditLogsResource:
+        from .resources.audit_logs import AuditLogsResource
+
+        return AuditLogsResource(self)
+
+    @cached_property
+    def billing(self) -> BillingResource:
+        from .resources.billing import BillingResource
+
+        return BillingResource(self)
+
+    @cached_property
+    def brand_protection(self) -> BrandProtectionResource:
+        from .resources.brand_protection import BrandProtectionResource
+
+        return BrandProtectionResource(self)
+
+    @cached_property
+    def diagnostics(self) -> DiagnosticsResource:
+        from .resources.diagnostics import DiagnosticsResource
+
+        return DiagnosticsResource(self)
+
+    @cached_property
+    def images(self) -> ImagesResource:
+        from .resources.images import ImagesResource
+
+        return ImagesResource(self)
+
+    @cached_property
+    def intel(self) -> IntelResource:
+        from .resources.intel import IntelResource
+
+        return IntelResource(self)
+
+    @cached_property
+    def magic_transit(self) -> MagicTransitResource:
+        from .resources.magic_transit import MagicTransitResource
+
+        return MagicTransitResource(self)
+
+    @cached_property
+    def magic_network_monitoring(self) -> MagicNetworkMonitoringResource:
+        from .resources.magic_network_monitoring import MagicNetworkMonitoringResource
+
+        return MagicNetworkMonitoringResource(self)
+
+    @cached_property
+    def magic_cloud_networking(self) -> MagicCloudNetworkingResource:
+        from .resources.magic_cloud_networking import MagicCloudNetworkingResource
+
+        return MagicCloudNetworkingResource(self)
+
+    @cached_property
+    def network_interconnects(self) -> NetworkInterconnectsResource:
+        from .resources.network_interconnects import NetworkInterconnectsResource
+
+        return NetworkInterconnectsResource(self)
+
+    @cached_property
+    def mtls_certificates(self) -> MTLSCertificatesResource:
+        from .resources.mtls_certificates import MTLSCertificatesResource
+
+        return MTLSCertificatesResource(self)
+
+    @cached_property
+    def pages(self) -> PagesResource:
+        from .resources.pages import PagesResource
+
+        return PagesResource(self)
+
+    @cached_property
+    def registrar(self) -> RegistrarResource:
+        from .resources.registrar import RegistrarResource
+
+        return RegistrarResource(self)
+
+    @cached_property
+    def request_tracers(self) -> RequestTracersResource:
+        from .resources.request_tracers import RequestTracersResource
+
+        return RequestTracersResource(self)
+
+    @cached_property
+    def rules(self) -> RulesResource:
+        from .resources.rules import RulesResource
+
+        return RulesResource(self)
+
+    @cached_property
+    def stream(self) -> StreamResource:
+        from .resources.stream import StreamResource
+
+        return StreamResource(self)
+
+    @cached_property
+    def alerting(self) -> AlertingResource:
+        from .resources.alerting import AlertingResource
+
+        return AlertingResource(self)
+
+    @cached_property
+    def d1(self) -> D1Resource:
+        from .resources.d1 import D1Resource
+
+        return D1Resource(self)
+
+    @cached_property
+    def r2(self) -> R2Resource:
+        from .resources.r2 import R2Resource
+
+        return R2Resource(self)
+
+    @cached_property
+    def r2_data_catalog(self) -> R2DataCatalogResource:
+        from .resources.r2_data_catalog import R2DataCatalogResource
+
+        return R2DataCatalogResource(self)
+
+    @cached_property
+    def workers_for_platforms(self) -> WorkersForPlatformsResource:
+        from .resources.workers_for_platforms import WorkersForPlatformsResource
+
+        return WorkersForPlatformsResource(self)
+
+    @cached_property
+    def zero_trust(self) -> ZeroTrustResource:
+        from .resources.zero_trust import ZeroTrustResource
+
+        return ZeroTrustResource(self)
+
+    @cached_property
+    def turnstile(self) -> TurnstileResource:
+        from .resources.turnstile import TurnstileResource
+
+        return TurnstileResource(self)
+
+    @cached_property
+    def connectivity(self) -> ConnectivityResource:
+        from .resources.connectivity import ConnectivityResource
+
+        return ConnectivityResource(self)
+
+    @cached_property
+    def hyperdrive(self) -> HyperdriveResource:
+        from .resources.hyperdrive import HyperdriveResource
+
+        return HyperdriveResource(self)
+
+    @cached_property
+    def rum(self) -> RUMResource:
+        from .resources.rum import RUMResource
+
+        return RUMResource(self)
+
+    @cached_property
+    def vectorize(self) -> VectorizeResource:
+        from .resources.vectorize import VectorizeResource
+
+        return VectorizeResource(self)
+
+    @cached_property
+    def url_scanner(self) -> URLScannerResource:
+        from .resources.url_scanner import URLScannerResource
+
+        return URLScannerResource(self)
+
+    @cached_property
+    def radar(self) -> RadarResource:
+        from .resources.radar import RadarResource
+
+        return RadarResource(self)
+
+    @cached_property
+    def bot_management(self) -> BotManagementResource:
+        from .resources.bot_management import BotManagementResource
+
+        return BotManagementResource(self)
+
+    @cached_property
+    def fraud(self) -> FraudResource:
+        from .resources.fraud import FraudResource
+
+        return FraudResource(self)
+
+    @cached_property
+    def origin_post_quantum_encryption(self) -> OriginPostQuantumEncryptionResource:
+        from .resources.origin_post_quantum_encryption import OriginPostQuantumEncryptionResource
+
+        return OriginPostQuantumEncryptionResource(self)
+
+    @cached_property
+    def zaraz(self) -> ZarazResource:
+        from .resources.zaraz import ZarazResource
+
+        return ZarazResource(self)
+
+    @cached_property
+    def speed(self) -> SpeedResource:
+        from .resources.speed import SpeedResource
+
+        return SpeedResource(self)
+
+    @cached_property
+    def dcv_delegation(self) -> DCVDelegationResource:
+        from .resources.dcv_delegation import DCVDelegationResource
+
+        return DCVDelegationResource(self)
+
+    @cached_property
+    def hostnames(self) -> HostnamesResource:
+        from .resources.hostnames import HostnamesResource
+
+        return HostnamesResource(self)
+
+    @cached_property
+    def snippets(self) -> SnippetsResource:
+        from .resources.snippets import SnippetsResource
+
+        return SnippetsResource(self)
+
+    @cached_property
+    def realtime_kit(self) -> RealtimeKitResource:
+        from .resources.realtime_kit import RealtimeKitResource
+
+        return RealtimeKitResource(self)
+
+    @cached_property
+    def calls(self) -> CallsResource:
+        from .resources.calls import CallsResource
+
+        return CallsResource(self)
+
+    @cached_property
+    def cloudforce_one(self) -> CloudforceOneResource:
+        from .resources.cloudforce_one import CloudforceOneResource
+
+        return CloudforceOneResource(self)
+
+    @cached_property
+    def ai_gateway(self) -> AIGatewayResource:
+        from .resources.ai_gateway import AIGatewayResource
+
+        return AIGatewayResource(self)
+
+    @cached_property
+    def iam(self) -> IAMResource:
+        from .resources.iam import IAMResource
+
+        return IAMResource(self)
+
+    @cached_property
+    def cloud_connector(self) -> CloudConnectorResource:
+        from .resources.cloud_connector import CloudConnectorResource
+
+        return CloudConnectorResource(self)
+
+    @cached_property
+    def botnet_feed(self) -> BotnetFeedResource:
+        from .resources.botnet_feed import BotnetFeedResource
+
+        return BotnetFeedResource(self)
+
+    @cached_property
+    def security_txt(self) -> SecurityTXTResource:
+        from .resources.security_txt import SecurityTXTResource
+
+        return SecurityTXTResource(self)
+
+    @cached_property
+    def workflows(self) -> WorkflowsResource:
+        from .resources.workflows import WorkflowsResource
+
+        return WorkflowsResource(self)
+
+    @cached_property
+    def resource_sharing(self) -> ResourceSharingResource:
+        from .resources.resource_sharing import ResourceSharingResource
+
+        return ResourceSharingResource(self)
+
+    @cached_property
+    def leaked_credential_checks(self) -> LeakedCredentialChecksResource:
+        from .resources.leaked_credential_checks import LeakedCredentialChecksResource
+
+        return LeakedCredentialChecksResource(self)
+
+    @cached_property
+    def content_scanning(self) -> ContentScanningResource:
+        from .resources.content_scanning import ContentScanningResource
+
+        return ContentScanningResource(self)
+
+    @cached_property
+    def abuse_reports(self) -> AbuseReportsResource:
+        from .resources.abuse_reports import AbuseReportsResource
+
+        return AbuseReportsResource(self)
+
+    @cached_property
+    def ai(self) -> AIResource:
+        from .resources.ai import AIResource
+
+        return AIResource(self)
+
+    @cached_property
+    def aisearch(self) -> AISearchResource:
+        from .resources.aisearch import AISearchResource
+
+        return AISearchResource(self)
+
+    @cached_property
+    def security_center(self) -> SecurityCenterResource:
+        from .resources.security_center import SecurityCenterResource
+
+        return SecurityCenterResource(self)
+
+    @cached_property
+    def browser_rendering(self) -> BrowserRenderingResource:
+        from .resources.browser_rendering import BrowserRenderingResource
+
+        return BrowserRenderingResource(self)
+
+    @cached_property
+    def custom_pages(self) -> CustomPagesResource:
+        from .resources.custom_pages import CustomPagesResource
+
+        return CustomPagesResource(self)
+
+    @cached_property
+    def secrets_store(self) -> SecretsStoreResource:
+        from .resources.secrets_store import SecretsStoreResource
+
+        return SecretsStoreResource(self)
+
+    @cached_property
+    def pipelines(self) -> PipelinesResource:
+        from .resources.pipelines import PipelinesResource
+
+        return PipelinesResource(self)
+
+    @cached_property
+    def schema_validation(self) -> SchemaValidationResource:
+        from .resources.schema_validation import SchemaValidationResource
+
+        return SchemaValidationResource(self)
+
+    @cached_property
+    def token_validation(self) -> TokenValidationResource:
+        from .resources.token_validation import TokenValidationResource
+
+        return TokenValidationResource(self)
+
+    @cached_property
+    def with_raw_response(self) -> CloudflareWithRawResponse:
+        return CloudflareWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CloudflareWithStreamedResponse:
+        return CloudflareWithStreamedResponse(self)
 
     @property
     @override
@@ -354,24 +1036,16 @@ def default_headers(self) -> dict[str, str | Omit]:
 
     @override
     def _validate_headers(self, headers: Headers, custom_headers: Headers) -> None:
-        if self.api_email and headers.get("X-Auth-Email"):
-            return
-        if isinstance(custom_headers.get("X-Auth-Email"), Omit):
+        if headers.get("X-Auth-Email") or isinstance(custom_headers.get("X-Auth-Email"), Omit):
             return
 
-        if self.api_key and headers.get("X-Auth-Key"):
-            return
-        if isinstance(custom_headers.get("X-Auth-Key"), Omit):
+        if headers.get("X-Auth-Key") or isinstance(custom_headers.get("X-Auth-Key"), Omit):
             return
 
-        if self.api_token and headers.get("Authorization"):
-            return
-        if isinstance(custom_headers.get("Authorization"), Omit):
+        if headers.get("Authorization") or isinstance(custom_headers.get("Authorization"), Omit):
             return
 
-        if self.user_service_key and headers.get("X-Auth-User-Service-Key"):
-            return
-        if isinstance(custom_headers.get("X-Auth-User-Service-Key"), Omit):
+        if headers.get("X-Auth-User-Service-Key") or isinstance(custom_headers.get("X-Auth-User-Service-Key"), Omit):
             return
 
         raise TypeError(
@@ -386,9 +1060,10 @@ def copy(
         api_email: str | None = None,
         user_service_key: str | None = None,
         base_url: str | httpx.URL | None = None,
-        timeout: float | Timeout | None | NotGiven = NOT_GIVEN,
+        api_version: str | None = None,
+        timeout: float | Timeout | None | NotGiven = not_given,
         http_client: httpx.Client | None = None,
-        max_retries: int | NotGiven = NOT_GIVEN,
+        max_retries: int | NotGiven = not_given,
         default_headers: Mapping[str, str] | None = None,
         set_default_headers: Mapping[str, str] | None = None,
         default_query: Mapping[str, object] | None = None,
@@ -423,6 +1098,7 @@ def copy(
             api_email=api_email or self.api_email,
             user_service_key=user_service_key or self.user_service_key,
             base_url=base_url or self.base_url,
+            api_version=api_version or self.api_version,
             timeout=self.timeout if isinstance(timeout, NotGiven) else timeout,
             http_client=http_client,
             max_retries=max_retries if is_given(max_retries) else self.max_retries,
@@ -470,94 +1146,6 @@ def _make_status_error(
 
 
 class AsyncCloudflare(AsyncAPIClient):
-    accounts: resources.AsyncAccountsResource
-    origin_ca_certificates: resources.AsyncOriginCACertificatesResource
-    ips: resources.AsyncIPsResource
-    memberships: resources.AsyncMembershipsResource
-    user: resources.AsyncUserResource
-    zones: resources.AsyncZonesResource
-    load_balancers: resources.AsyncLoadBalancersResource
-    cache: resources.AsyncCacheResource
-    ssl: resources.AsyncSSLResource
-    subscriptions: resources.AsyncSubscriptionsResource
-    acm: resources.AsyncACMResource
-    argo: resources.AsyncArgoResource
-    plans: resources.AsyncPlansResource
-    rate_plans: resources.AsyncRatePlansResource
-    certificate_authorities: resources.AsyncCertificateAuthoritiesResource
-    client_certificates: resources.AsyncClientCertificatesResource
-    custom_certificates: resources.AsyncCustomCertificatesResource
-    custom_hostnames: resources.AsyncCustomHostnamesResource
-    custom_nameservers: resources.AsyncCustomNameserversResource
-    dns: resources.AsyncDNSResource
-    dnssec: resources.AsyncDNSSECResource
-    email_routing: resources.AsyncEmailRoutingResource
-    filters: resources.AsyncFiltersResource
-    firewall: resources.AsyncFirewallResource
-    healthchecks: resources.AsyncHealthchecksResource
-    keyless_certificates: resources.AsyncKeylessCertificatesResource
-    logpush: resources.AsyncLogpushResource
-    logs: resources.AsyncLogsResource
-    origin_tls_client_auth: resources.AsyncOriginTLSClientAuthResource
-    pagerules: resources.AsyncPagerulesResource
-    rate_limits: resources.AsyncRateLimitsResource
-    secondary_dns: resources.AsyncSecondaryDNSResource
-    waiting_rooms: resources.AsyncWaitingRoomsResource
-    web3: resources.AsyncWeb3Resource
-    workers: resources.AsyncWorkersResource
-    kv: resources.AsyncKVResource
-    durable_objects: resources.AsyncDurableObjectsResource
-    queues: resources.AsyncQueuesResource
-    api_gateway: resources.AsyncAPIGatewayResource
-    managed_headers: resources.AsyncManagedHeadersResource
-    page_shield: resources.AsyncPageShieldResource
-    rulesets: resources.AsyncRulesetsResource
-    url_normalization: resources.AsyncURLNormalizationResource
-    spectrum: resources.AsyncSpectrumResource
-    addressing: resources.AsyncAddressingResource
-    audit_logs: resources.AsyncAuditLogsResource
-    billing: resources.AsyncBillingResource
-    brand_protection: resources.AsyncBrandProtectionResource
-    diagnostics: resources.AsyncDiagnosticsResource
-    images: resources.AsyncImagesResource
-    intel: resources.AsyncIntelResource
-    magic_transit: resources.AsyncMagicTransitResource
-    magic_network_monitoring: resources.AsyncMagicNetworkMonitoringResource
-    mtls_certificates: resources.AsyncMTLSCertificatesResource
-    pages: resources.AsyncPagesResource
-    pcaps: resources.AsyncPCAPsResource
-    registrar: resources.AsyncRegistrarResource
-    request_tracers: resources.AsyncRequestTracersResource
-    rules: resources.AsyncRulesResource
-    storage: resources.AsyncStorageResource
-    stream: resources.AsyncStreamResource
-    alerting: resources.AsyncAlertingResource
-    d1: resources.AsyncD1Resource
-    r2: resources.AsyncR2Resource
-    warp_connector: resources.AsyncWARPConnectorResource
-    workers_for_platforms: resources.AsyncWorkersForPlatformsResource
-    zero_trust: resources.AsyncZeroTrustResource
-    challenges: resources.AsyncChallengesResource
-    hyperdrive: resources.AsyncHyperdriveResource
-    rum: resources.AsyncRUMResource
-    vectorize: resources.AsyncVectorizeResource
-    url_scanner: resources.AsyncURLScannerResource
-    radar: resources.AsyncRadarResource
-    bot_management: resources.AsyncBotManagementResource
-    origin_post_quantum_encryption: resources.AsyncOriginPostQuantumEncryptionResource
-    speed: resources.AsyncSpeedResource
-    dcv_delegation: resources.AsyncDCVDelegationResource
-    hostnames: resources.AsyncHostnamesResource
-    snippets: resources.AsyncSnippetsResource
-    calls: resources.AsyncCallsResource
-    cloudforce_one: resources.AsyncCloudforceOneResource
-    event_notifications: resources.AsyncEventNotificationsResource
-    ai_gateway: resources.AsyncAIGatewayResource
-    iam: resources.AsyncIAMResource
-    cloud_connector: resources.AsyncCloudConnectorResource
-    with_raw_response: AsyncCloudflareWithRawResponse
-    with_streaming_response: AsyncCloudflareWithStreamedResponse
-
     # client options
     api_token: str | None
     api_key: str | None
@@ -572,7 +1160,8 @@ def __init__(
         api_email: str | None = None,
         user_service_key: str | None = None,
         base_url: str | httpx.URL | None = None,
-        timeout: Union[float, Timeout, None, NotGiven] = NOT_GIVEN,
+        api_version: str | None = None,
+        timeout: float | Timeout | None | NotGiven = not_given,
         max_retries: int = DEFAULT_MAX_RETRIES,
         default_headers: Mapping[str, str] | None = None,
         default_query: Mapping[str, object] | None = None,
@@ -590,7 +1179,7 @@ def __init__(
         # part of our public interface in the future.
         _strict_response_validation: bool = False,
     ) -> None:
-        """Construct a new async cloudflare client instance.
+        """Construct a new async AsyncCloudflare client instance.
 
         This automatically infers the following arguments from their corresponding environment variables if they are not provided:
         - `api_token` from `CLOUDFLARE_API_TOKEN`
@@ -619,9 +1208,13 @@ def __init__(
         if base_url is None:
             base_url = f"https://api.cloudflare.com/client/v4"
 
+        if api_version is None:
+            api_version = datetime.today().strftime('%Y-%m-%d')
+
         super().__init__(
             version=__version__,
             base_url=base_url,
+            api_version=api_version,
             max_retries=max_retries,
             timeout=timeout,
             http_client=http_client,
@@ -630,141 +1223,673 @@ def __init__(
             _strict_response_validation=_strict_response_validation,
         )
 
-        self.accounts = resources.AsyncAccountsResource(self)
-        self.origin_ca_certificates = resources.AsyncOriginCACertificatesResource(self)
-        self.ips = resources.AsyncIPsResource(self)
-        self.memberships = resources.AsyncMembershipsResource(self)
-        self.user = resources.AsyncUserResource(self)
-        self.zones = resources.AsyncZonesResource(self)
-        self.load_balancers = resources.AsyncLoadBalancersResource(self)
-        self.cache = resources.AsyncCacheResource(self)
-        self.ssl = resources.AsyncSSLResource(self)
-        self.subscriptions = resources.AsyncSubscriptionsResource(self)
-        self.acm = resources.AsyncACMResource(self)
-        self.argo = resources.AsyncArgoResource(self)
-        self.plans = resources.AsyncPlansResource(self)
-        self.rate_plans = resources.AsyncRatePlansResource(self)
-        self.certificate_authorities = resources.AsyncCertificateAuthoritiesResource(self)
-        self.client_certificates = resources.AsyncClientCertificatesResource(self)
-        self.custom_certificates = resources.AsyncCustomCertificatesResource(self)
-        self.custom_hostnames = resources.AsyncCustomHostnamesResource(self)
-        self.custom_nameservers = resources.AsyncCustomNameserversResource(self)
-        self.dns = resources.AsyncDNSResource(self)
-        self.dnssec = resources.AsyncDNSSECResource(self)
-        self.email_routing = resources.AsyncEmailRoutingResource(self)
-        self.filters = resources.AsyncFiltersResource(self)
-        self.firewall = resources.AsyncFirewallResource(self)
-        self.healthchecks = resources.AsyncHealthchecksResource(self)
-        self.keyless_certificates = resources.AsyncKeylessCertificatesResource(self)
-        self.logpush = resources.AsyncLogpushResource(self)
-        self.logs = resources.AsyncLogsResource(self)
-        self.origin_tls_client_auth = resources.AsyncOriginTLSClientAuthResource(self)
-        self.pagerules = resources.AsyncPagerulesResource(self)
-        self.rate_limits = resources.AsyncRateLimitsResource(self)
-        self.secondary_dns = resources.AsyncSecondaryDNSResource(self)
-        self.waiting_rooms = resources.AsyncWaitingRoomsResource(self)
-        self.web3 = resources.AsyncWeb3Resource(self)
-        self.workers = resources.AsyncWorkersResource(self)
-        self.kv = resources.AsyncKVResource(self)
-        self.durable_objects = resources.AsyncDurableObjectsResource(self)
-        self.queues = resources.AsyncQueuesResource(self)
-        self.api_gateway = resources.AsyncAPIGatewayResource(self)
-        self.managed_headers = resources.AsyncManagedHeadersResource(self)
-        self.page_shield = resources.AsyncPageShieldResource(self)
-        self.rulesets = resources.AsyncRulesetsResource(self)
-        self.url_normalization = resources.AsyncURLNormalizationResource(self)
-        self.spectrum = resources.AsyncSpectrumResource(self)
-        self.addressing = resources.AsyncAddressingResource(self)
-        self.audit_logs = resources.AsyncAuditLogsResource(self)
-        self.billing = resources.AsyncBillingResource(self)
-        self.brand_protection = resources.AsyncBrandProtectionResource(self)
-        self.diagnostics = resources.AsyncDiagnosticsResource(self)
-        self.images = resources.AsyncImagesResource(self)
-        self.intel = resources.AsyncIntelResource(self)
-        self.magic_transit = resources.AsyncMagicTransitResource(self)
-        self.magic_network_monitoring = resources.AsyncMagicNetworkMonitoringResource(self)
-        self.mtls_certificates = resources.AsyncMTLSCertificatesResource(self)
-        self.pages = resources.AsyncPagesResource(self)
-        self.pcaps = resources.AsyncPCAPsResource(self)
-        self.registrar = resources.AsyncRegistrarResource(self)
-        self.request_tracers = resources.AsyncRequestTracersResource(self)
-        self.rules = resources.AsyncRulesResource(self)
-        self.storage = resources.AsyncStorageResource(self)
-        self.stream = resources.AsyncStreamResource(self)
-        self.alerting = resources.AsyncAlertingResource(self)
-        self.d1 = resources.AsyncD1Resource(self)
-        self.r2 = resources.AsyncR2Resource(self)
-        self.warp_connector = resources.AsyncWARPConnectorResource(self)
-        self.workers_for_platforms = resources.AsyncWorkersForPlatformsResource(self)
-        self.zero_trust = resources.AsyncZeroTrustResource(self)
-        self.challenges = resources.AsyncChallengesResource(self)
-        self.hyperdrive = resources.AsyncHyperdriveResource(self)
-        self.rum = resources.AsyncRUMResource(self)
-        self.vectorize = resources.AsyncVectorizeResource(self)
-        self.url_scanner = resources.AsyncURLScannerResource(self)
-        self.radar = resources.AsyncRadarResource(self)
-        self.bot_management = resources.AsyncBotManagementResource(self)
-        self.origin_post_quantum_encryption = resources.AsyncOriginPostQuantumEncryptionResource(self)
-        self.speed = resources.AsyncSpeedResource(self)
-        self.dcv_delegation = resources.AsyncDCVDelegationResource(self)
-        self.hostnames = resources.AsyncHostnamesResource(self)
-        self.snippets = resources.AsyncSnippetsResource(self)
-        self.calls = resources.AsyncCallsResource(self)
-        self.cloudforce_one = resources.AsyncCloudforceOneResource(self)
-        self.event_notifications = resources.AsyncEventNotificationsResource(self)
-        self.ai_gateway = resources.AsyncAIGatewayResource(self)
-        self.iam = resources.AsyncIAMResource(self)
-        self.cloud_connector = resources.AsyncCloudConnectorResource(self)
-        self.with_raw_response = AsyncCloudflareWithRawResponse(self)
-        self.with_streaming_response = AsyncCloudflareWithStreamedResponse(self)
+    @cached_property
+    def accounts(self) -> AsyncAccountsResource:
+        from .resources.accounts import AsyncAccountsResource
 
-    @property
-    @override
-    def qs(self) -> Querystring:
-        return Querystring(nested_format="dots", array_format="repeat")
+        return AsyncAccountsResource(self)
 
-    @property
-    @override
-    def auth_headers(self) -> dict[str, str]:
-        if self._api_email:
-            return self._api_email
-        if self._api_key:
-            return self._api_key
-        if self._api_token:
-            return self._api_token
-        if self._user_service_key:
-            return self._user_service_key
-        return {}
+    @cached_property
+    def organizations(self) -> AsyncOrganizationsResource:
+        from .resources.organizations import AsyncOrganizationsResource
 
-    @property
-    def _api_email(self) -> dict[str, str]:
-        api_email = self.api_email
-        if api_email is None:
-            return {}
-        return {"X-Auth-Email": api_email}
+        return AsyncOrganizationsResource(self)
 
-    @property
-    def _api_key(self) -> dict[str, str]:
-        api_key = self.api_key
-        if api_key is None:
-            return {}
-        return {"X-Auth-Key": api_key}
+    @cached_property
+    def origin_ca_certificates(self) -> AsyncOriginCACertificatesResource:
+        from .resources.origin_ca_certificates import AsyncOriginCACertificatesResource
 
-    @property
-    def _api_token(self) -> dict[str, str]:
-        api_token = self.api_token
-        if api_token is None:
-            return {}
-        return {"Authorization": f"Bearer {api_token}"}
+        return AsyncOriginCACertificatesResource(self)
 
-    @property
-    def _user_service_key(self) -> dict[str, str]:
-        user_service_key = self.user_service_key
-        if user_service_key is None:
-            return {}
-        return {"X-Auth-User-Service-Key": user_service_key}
+    @cached_property
+    def ips(self) -> AsyncIPsResource:
+        from .resources.ips import AsyncIPsResource
 
-    @property
+        return AsyncIPsResource(self)
+
+    @cached_property
+    def memberships(self) -> AsyncMembershipsResource:
+        from .resources.memberships import AsyncMembershipsResource
+
+        return AsyncMembershipsResource(self)
+
+    @cached_property
+    def user(self) -> AsyncUserResource:
+        from .resources.user import AsyncUserResource
+
+        return AsyncUserResource(self)
+
+    @cached_property
+    def zones(self) -> AsyncZonesResource:
+        from .resources.zones import AsyncZonesResource
+
+        return AsyncZonesResource(self)
+
+    @cached_property
+    def load_balancers(self) -> AsyncLoadBalancersResource:
+        from .resources.load_balancers import AsyncLoadBalancersResource
+
+        return AsyncLoadBalancersResource(self)
+
+    @cached_property
+    def cache(self) -> AsyncCacheResource:
+        from .resources.cache import AsyncCacheResource
+
+        return AsyncCacheResource(self)
+
+    @cached_property
+    def ssl(self) -> AsyncSSLResource:
+        from .resources.ssl import AsyncSSLResource
+
+        return AsyncSSLResource(self)
+
+    @cached_property
+    def acm(self) -> AsyncACMResource:
+        from .resources.acm import AsyncACMResource
+
+        return AsyncACMResource(self)
+
+    @cached_property
+    def argo(self) -> AsyncArgoResource:
+        from .resources.argo import AsyncArgoResource
+
+        return AsyncArgoResource(self)
+
+    @cached_property
+    def certificate_authorities(self) -> AsyncCertificateAuthoritiesResource:
+        from .resources.certificate_authorities import AsyncCertificateAuthoritiesResource
+
+        return AsyncCertificateAuthoritiesResource(self)
+
+    @cached_property
+    def client_certificates(self) -> AsyncClientCertificatesResource:
+        from .resources.client_certificates import AsyncClientCertificatesResource
+
+        return AsyncClientCertificatesResource(self)
+
+    @cached_property
+    def custom_certificates(self) -> AsyncCustomCertificatesResource:
+        from .resources.custom_certificates import AsyncCustomCertificatesResource
+
+        return AsyncCustomCertificatesResource(self)
+
+    @cached_property
+    def custom_hostnames(self) -> AsyncCustomHostnamesResource:
+        from .resources.custom_hostnames import AsyncCustomHostnamesResource
+
+        return AsyncCustomHostnamesResource(self)
+
+    @cached_property
+    def custom_nameservers(self) -> AsyncCustomNameserversResource:
+        from .resources.custom_nameservers import AsyncCustomNameserversResource
+
+        return AsyncCustomNameserversResource(self)
+
+    @cached_property
+    def dns_firewall(self) -> AsyncDNSFirewallResource:
+        from .resources.dns_firewall import AsyncDNSFirewallResource
+
+        return AsyncDNSFirewallResource(self)
+
+    @cached_property
+    def dns(self) -> AsyncDNSResource:
+        from .resources.dns import AsyncDNSResource
+
+        return AsyncDNSResource(self)
+
+    @cached_property
+    def email_security(self) -> AsyncEmailSecurityResource:
+        from .resources.email_security import AsyncEmailSecurityResource
+
+        return AsyncEmailSecurityResource(self)
+
+    @cached_property
+    def email_routing(self) -> AsyncEmailRoutingResource:
+        from .resources.email_routing import AsyncEmailRoutingResource
+
+        return AsyncEmailRoutingResource(self)
+
+    @cached_property
+    def filters(self) -> AsyncFiltersResource:
+        from .resources.filters import AsyncFiltersResource
+
+        return AsyncFiltersResource(self)
+
+    @cached_property
+    def firewall(self) -> AsyncFirewallResource:
+        from .resources.firewall import AsyncFirewallResource
+
+        return AsyncFirewallResource(self)
+
+    @cached_property
+    def healthchecks(self) -> AsyncHealthchecksResource:
+        from .resources.healthchecks import AsyncHealthchecksResource
+
+        return AsyncHealthchecksResource(self)
+
+    @cached_property
+    def keyless_certificates(self) -> AsyncKeylessCertificatesResource:
+        from .resources.keyless_certificates import AsyncKeylessCertificatesResource
+
+        return AsyncKeylessCertificatesResource(self)
+
+    @cached_property
+    def logpush(self) -> AsyncLogpushResource:
+        from .resources.logpush import AsyncLogpushResource
+
+        return AsyncLogpushResource(self)
+
+    @cached_property
+    def logs(self) -> AsyncLogsResource:
+        from .resources.logs import AsyncLogsResource
+
+        return AsyncLogsResource(self)
+
+    @cached_property
+    def origin_tls_client_auth(self) -> AsyncOriginTLSClientAuthResource:
+        from .resources.origin_tls_client_auth import AsyncOriginTLSClientAuthResource
+
+        return AsyncOriginTLSClientAuthResource(self)
+
+    @cached_property
+    def page_rules(self) -> AsyncPageRulesResource:
+        from .resources.page_rules import AsyncPageRulesResource
+
+        return AsyncPageRulesResource(self)
+
+    @cached_property
+    def rate_limits(self) -> AsyncRateLimitsResource:
+        from .resources.rate_limits import AsyncRateLimitsResource
+
+        return AsyncRateLimitsResource(self)
+
+    @cached_property
+    def waiting_rooms(self) -> AsyncWaitingRoomsResource:
+        from .resources.waiting_rooms import AsyncWaitingRoomsResource
+
+        return AsyncWaitingRoomsResource(self)
+
+    @cached_property
+    def web3(self) -> AsyncWeb3Resource:
+        from .resources.web3 import AsyncWeb3Resource
+
+        return AsyncWeb3Resource(self)
+
+    @cached_property
+    def workers(self) -> AsyncWorkersResource:
+        from .resources.workers import AsyncWorkersResource
+
+        return AsyncWorkersResource(self)
+
+    @cached_property
+    def kv(self) -> AsyncKVResource:
+        from .resources.kv import AsyncKVResource
+
+        return AsyncKVResource(self)
+
+    @cached_property
+    def durable_objects(self) -> AsyncDurableObjectsResource:
+        from .resources.durable_objects import AsyncDurableObjectsResource
+
+        return AsyncDurableObjectsResource(self)
+
+    @cached_property
+    def queues(self) -> AsyncQueuesResource:
+        from .resources.queues import AsyncQueuesResource
+
+        return AsyncQueuesResource(self)
+
+    @cached_property
+    def api_gateway(self) -> AsyncAPIGatewayResource:
+        from .resources.api_gateway import AsyncAPIGatewayResource
+
+        return AsyncAPIGatewayResource(self)
+
+    @cached_property
+    def managed_transforms(self) -> AsyncManagedTransformsResource:
+        from .resources.managed_transforms import AsyncManagedTransformsResource
+
+        return AsyncManagedTransformsResource(self)
+
+    @cached_property
+    def page_shield(self) -> AsyncPageShieldResource:
+        from .resources.page_shield import AsyncPageShieldResource
+
+        return AsyncPageShieldResource(self)
+
+    @cached_property
+    def rulesets(self) -> AsyncRulesetsResource:
+        from .resources.rulesets import AsyncRulesetsResource
+
+        return AsyncRulesetsResource(self)
+
+    @cached_property
+    def url_normalization(self) -> AsyncURLNormalizationResource:
+        from .resources.url_normalization import AsyncURLNormalizationResource
+
+        return AsyncURLNormalizationResource(self)
+
+    @cached_property
+    def spectrum(self) -> AsyncSpectrumResource:
+        from .resources.spectrum import AsyncSpectrumResource
+
+        return AsyncSpectrumResource(self)
+
+    @cached_property
+    def addressing(self) -> AsyncAddressingResource:
+        from .resources.addressing import AsyncAddressingResource
+
+        return AsyncAddressingResource(self)
+
+    @cached_property
+    def audit_logs(self) -> AsyncAuditLogsResource:
+        from .resources.audit_logs import AsyncAuditLogsResource
+
+        return AsyncAuditLogsResource(self)
+
+    @cached_property
+    def billing(self) -> AsyncBillingResource:
+        from .resources.billing import AsyncBillingResource
+
+        return AsyncBillingResource(self)
+
+    @cached_property
+    def brand_protection(self) -> AsyncBrandProtectionResource:
+        from .resources.brand_protection import AsyncBrandProtectionResource
+
+        return AsyncBrandProtectionResource(self)
+
+    @cached_property
+    def diagnostics(self) -> AsyncDiagnosticsResource:
+        from .resources.diagnostics import AsyncDiagnosticsResource
+
+        return AsyncDiagnosticsResource(self)
+
+    @cached_property
+    def images(self) -> AsyncImagesResource:
+        from .resources.images import AsyncImagesResource
+
+        return AsyncImagesResource(self)
+
+    @cached_property
+    def intel(self) -> AsyncIntelResource:
+        from .resources.intel import AsyncIntelResource
+
+        return AsyncIntelResource(self)
+
+    @cached_property
+    def magic_transit(self) -> AsyncMagicTransitResource:
+        from .resources.magic_transit import AsyncMagicTransitResource
+
+        return AsyncMagicTransitResource(self)
+
+    @cached_property
+    def magic_network_monitoring(self) -> AsyncMagicNetworkMonitoringResource:
+        from .resources.magic_network_monitoring import AsyncMagicNetworkMonitoringResource
+
+        return AsyncMagicNetworkMonitoringResource(self)
+
+    @cached_property
+    def magic_cloud_networking(self) -> AsyncMagicCloudNetworkingResource:
+        from .resources.magic_cloud_networking import AsyncMagicCloudNetworkingResource
+
+        return AsyncMagicCloudNetworkingResource(self)
+
+    @cached_property
+    def network_interconnects(self) -> AsyncNetworkInterconnectsResource:
+        from .resources.network_interconnects import AsyncNetworkInterconnectsResource
+
+        return AsyncNetworkInterconnectsResource(self)
+
+    @cached_property
+    def mtls_certificates(self) -> AsyncMTLSCertificatesResource:
+        from .resources.mtls_certificates import AsyncMTLSCertificatesResource
+
+        return AsyncMTLSCertificatesResource(self)
+
+    @cached_property
+    def pages(self) -> AsyncPagesResource:
+        from .resources.pages import AsyncPagesResource
+
+        return AsyncPagesResource(self)
+
+    @cached_property
+    def registrar(self) -> AsyncRegistrarResource:
+        from .resources.registrar import AsyncRegistrarResource
+
+        return AsyncRegistrarResource(self)
+
+    @cached_property
+    def request_tracers(self) -> AsyncRequestTracersResource:
+        from .resources.request_tracers import AsyncRequestTracersResource
+
+        return AsyncRequestTracersResource(self)
+
+    @cached_property
+    def rules(self) -> AsyncRulesResource:
+        from .resources.rules import AsyncRulesResource
+
+        return AsyncRulesResource(self)
+
+    @cached_property
+    def stream(self) -> AsyncStreamResource:
+        from .resources.stream import AsyncStreamResource
+
+        return AsyncStreamResource(self)
+
+    @cached_property
+    def alerting(self) -> AsyncAlertingResource:
+        from .resources.alerting import AsyncAlertingResource
+
+        return AsyncAlertingResource(self)
+
+    @cached_property
+    def d1(self) -> AsyncD1Resource:
+        from .resources.d1 import AsyncD1Resource
+
+        return AsyncD1Resource(self)
+
+    @cached_property
+    def r2(self) -> AsyncR2Resource:
+        from .resources.r2 import AsyncR2Resource
+
+        return AsyncR2Resource(self)
+
+    @cached_property
+    def r2_data_catalog(self) -> AsyncR2DataCatalogResource:
+        from .resources.r2_data_catalog import AsyncR2DataCatalogResource
+
+        return AsyncR2DataCatalogResource(self)
+
+    @cached_property
+    def workers_for_platforms(self) -> AsyncWorkersForPlatformsResource:
+        from .resources.workers_for_platforms import AsyncWorkersForPlatformsResource
+
+        return AsyncWorkersForPlatformsResource(self)
+
+    @cached_property
+    def zero_trust(self) -> AsyncZeroTrustResource:
+        from .resources.zero_trust import AsyncZeroTrustResource
+
+        return AsyncZeroTrustResource(self)
+
+    @cached_property
+    def turnstile(self) -> AsyncTurnstileResource:
+        from .resources.turnstile import AsyncTurnstileResource
+
+        return AsyncTurnstileResource(self)
+
+    @cached_property
+    def connectivity(self) -> AsyncConnectivityResource:
+        from .resources.connectivity import AsyncConnectivityResource
+
+        return AsyncConnectivityResource(self)
+
+    @cached_property
+    def hyperdrive(self) -> AsyncHyperdriveResource:
+        from .resources.hyperdrive import AsyncHyperdriveResource
+
+        return AsyncHyperdriveResource(self)
+
+    @cached_property
+    def rum(self) -> AsyncRUMResource:
+        from .resources.rum import AsyncRUMResource
+
+        return AsyncRUMResource(self)
+
+    @cached_property
+    def vectorize(self) -> AsyncVectorizeResource:
+        from .resources.vectorize import AsyncVectorizeResource
+
+        return AsyncVectorizeResource(self)
+
+    @cached_property
+    def url_scanner(self) -> AsyncURLScannerResource:
+        from .resources.url_scanner import AsyncURLScannerResource
+
+        return AsyncURLScannerResource(self)
+
+    @cached_property
+    def radar(self) -> AsyncRadarResource:
+        from .resources.radar import AsyncRadarResource
+
+        return AsyncRadarResource(self)
+
+    @cached_property
+    def bot_management(self) -> AsyncBotManagementResource:
+        from .resources.bot_management import AsyncBotManagementResource
+
+        return AsyncBotManagementResource(self)
+
+    @cached_property
+    def fraud(self) -> AsyncFraudResource:
+        from .resources.fraud import AsyncFraudResource
+
+        return AsyncFraudResource(self)
+
+    @cached_property
+    def origin_post_quantum_encryption(self) -> AsyncOriginPostQuantumEncryptionResource:
+        from .resources.origin_post_quantum_encryption import AsyncOriginPostQuantumEncryptionResource
+
+        return AsyncOriginPostQuantumEncryptionResource(self)
+
+    @cached_property
+    def zaraz(self) -> AsyncZarazResource:
+        from .resources.zaraz import AsyncZarazResource
+
+        return AsyncZarazResource(self)
+
+    @cached_property
+    def speed(self) -> AsyncSpeedResource:
+        from .resources.speed import AsyncSpeedResource
+
+        return AsyncSpeedResource(self)
+
+    @cached_property
+    def dcv_delegation(self) -> AsyncDCVDelegationResource:
+        from .resources.dcv_delegation import AsyncDCVDelegationResource
+
+        return AsyncDCVDelegationResource(self)
+
+    @cached_property
+    def hostnames(self) -> AsyncHostnamesResource:
+        from .resources.hostnames import AsyncHostnamesResource
+
+        return AsyncHostnamesResource(self)
+
+    @cached_property
+    def snippets(self) -> AsyncSnippetsResource:
+        from .resources.snippets import AsyncSnippetsResource
+
+        return AsyncSnippetsResource(self)
+
+    @cached_property
+    def realtime_kit(self) -> AsyncRealtimeKitResource:
+        from .resources.realtime_kit import AsyncRealtimeKitResource
+
+        return AsyncRealtimeKitResource(self)
+
+    @cached_property
+    def calls(self) -> AsyncCallsResource:
+        from .resources.calls import AsyncCallsResource
+
+        return AsyncCallsResource(self)
+
+    @cached_property
+    def cloudforce_one(self) -> AsyncCloudforceOneResource:
+        from .resources.cloudforce_one import AsyncCloudforceOneResource
+
+        return AsyncCloudforceOneResource(self)
+
+    @cached_property
+    def ai_gateway(self) -> AsyncAIGatewayResource:
+        from .resources.ai_gateway import AsyncAIGatewayResource
+
+        return AsyncAIGatewayResource(self)
+
+    @cached_property
+    def iam(self) -> AsyncIAMResource:
+        from .resources.iam import AsyncIAMResource
+
+        return AsyncIAMResource(self)
+
+    @cached_property
+    def cloud_connector(self) -> AsyncCloudConnectorResource:
+        from .resources.cloud_connector import AsyncCloudConnectorResource
+
+        return AsyncCloudConnectorResource(self)
+
+    @cached_property
+    def botnet_feed(self) -> AsyncBotnetFeedResource:
+        from .resources.botnet_feed import AsyncBotnetFeedResource
+
+        return AsyncBotnetFeedResource(self)
+
+    @cached_property
+    def security_txt(self) -> AsyncSecurityTXTResource:
+        from .resources.security_txt import AsyncSecurityTXTResource
+
+        return AsyncSecurityTXTResource(self)
+
+    @cached_property
+    def workflows(self) -> AsyncWorkflowsResource:
+        from .resources.workflows import AsyncWorkflowsResource
+
+        return AsyncWorkflowsResource(self)
+
+    @cached_property
+    def resource_sharing(self) -> AsyncResourceSharingResource:
+        from .resources.resource_sharing import AsyncResourceSharingResource
+
+        return AsyncResourceSharingResource(self)
+
+    @cached_property
+    def leaked_credential_checks(self) -> AsyncLeakedCredentialChecksResource:
+        from .resources.leaked_credential_checks import AsyncLeakedCredentialChecksResource
+
+        return AsyncLeakedCredentialChecksResource(self)
+
+    @cached_property
+    def content_scanning(self) -> AsyncContentScanningResource:
+        from .resources.content_scanning import AsyncContentScanningResource
+
+        return AsyncContentScanningResource(self)
+
+    @cached_property
+    def abuse_reports(self) -> AsyncAbuseReportsResource:
+        from .resources.abuse_reports import AsyncAbuseReportsResource
+
+        return AsyncAbuseReportsResource(self)
+
+    @cached_property
+    def ai(self) -> AsyncAIResource:
+        from .resources.ai import AsyncAIResource
+
+        return AsyncAIResource(self)
+
+    @cached_property
+    def aisearch(self) -> AsyncAISearchResource:
+        from .resources.aisearch import AsyncAISearchResource
+
+        return AsyncAISearchResource(self)
+
+    @cached_property
+    def security_center(self) -> AsyncSecurityCenterResource:
+        from .resources.security_center import AsyncSecurityCenterResource
+
+        return AsyncSecurityCenterResource(self)
+
+    @cached_property
+    def browser_rendering(self) -> AsyncBrowserRenderingResource:
+        from .resources.browser_rendering import AsyncBrowserRenderingResource
+
+        return AsyncBrowserRenderingResource(self)
+
+    @cached_property
+    def custom_pages(self) -> AsyncCustomPagesResource:
+        from .resources.custom_pages import AsyncCustomPagesResource
+
+        return AsyncCustomPagesResource(self)
+
+    @cached_property
+    def secrets_store(self) -> AsyncSecretsStoreResource:
+        from .resources.secrets_store import AsyncSecretsStoreResource
+
+        return AsyncSecretsStoreResource(self)
+
+    @cached_property
+    def pipelines(self) -> AsyncPipelinesResource:
+        from .resources.pipelines import AsyncPipelinesResource
+
+        return AsyncPipelinesResource(self)
+
+    @cached_property
+    def schema_validation(self) -> AsyncSchemaValidationResource:
+        from .resources.schema_validation import AsyncSchemaValidationResource
+
+        return AsyncSchemaValidationResource(self)
+
+    @cached_property
+    def token_validation(self) -> AsyncTokenValidationResource:
+        from .resources.token_validation import AsyncTokenValidationResource
+
+        return AsyncTokenValidationResource(self)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncCloudflareWithRawResponse:
+        return AsyncCloudflareWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCloudflareWithStreamedResponse:
+        return AsyncCloudflareWithStreamedResponse(self)
+
+    @property
+    @override
+    def qs(self) -> Querystring:
+        return Querystring(nested_format="dots", array_format="repeat")
+
+    @property
+    @override
+    def auth_headers(self) -> dict[str, str]:
+        if self._api_email:
+            return self._api_email
+        if self._api_key:
+            return self._api_key
+        if self._api_token:
+            return self._api_token
+        if self._user_service_key:
+            return self._user_service_key
+        return {}
+
+    @property
+    def _api_email(self) -> dict[str, str]:
+        api_email = self.api_email
+        if api_email is None:
+            return {}
+        return {"X-Auth-Email": api_email}
+
+    @property
+    def _api_key(self) -> dict[str, str]:
+        api_key = self.api_key
+        if api_key is None:
+            return {}
+        return {"X-Auth-Key": api_key}
+
+    @property
+    def _api_token(self) -> dict[str, str]:
+        api_token = self.api_token
+        if api_token is None:
+            return {}
+        return {"Authorization": f"Bearer {api_token}"}
+
+    @property
+    def _user_service_key(self) -> dict[str, str]:
+        user_service_key = self.user_service_key
+        if user_service_key is None:
+            return {}
+        return {"X-Auth-User-Service-Key": user_service_key}
+
+    @property
     @override
     def default_headers(self) -> dict[str, str | Omit]:
         return {
@@ -777,24 +1902,16 @@ def default_headers(self) -> dict[str, str | Omit]:
 
     @override
     def _validate_headers(self, headers: Headers, custom_headers: Headers) -> None:
-        if self.api_email and headers.get("X-Auth-Email"):
-            return
-        if isinstance(custom_headers.get("X-Auth-Email"), Omit):
+        if headers.get("X-Auth-Email") or isinstance(custom_headers.get("X-Auth-Email"), Omit):
             return
 
-        if self.api_key and headers.get("X-Auth-Key"):
-            return
-        if isinstance(custom_headers.get("X-Auth-Key"), Omit):
+        if headers.get("X-Auth-Key") or isinstance(custom_headers.get("X-Auth-Key"), Omit):
             return
 
-        if self.api_token and headers.get("Authorization"):
-            return
-        if isinstance(custom_headers.get("Authorization"), Omit):
+        if headers.get("Authorization") or isinstance(custom_headers.get("Authorization"), Omit):
             return
 
-        if self.user_service_key and headers.get("X-Auth-User-Service-Key"):
-            return
-        if isinstance(custom_headers.get("X-Auth-User-Service-Key"), Omit):
+        if headers.get("X-Auth-User-Service-Key") or isinstance(custom_headers.get("X-Auth-User-Service-Key"), Omit):
             return
 
         raise TypeError(
@@ -809,9 +1926,10 @@ def copy(
         api_email: str | None = None,
         user_service_key: str | None = None,
         base_url: str | httpx.URL | None = None,
-        timeout: float | Timeout | None | NotGiven = NOT_GIVEN,
+        api_version: str | None = None,
+        timeout: float | Timeout | None | NotGiven = not_given,
         http_client: httpx.AsyncClient | None = None,
-        max_retries: int | NotGiven = NOT_GIVEN,
+        max_retries: int | NotGiven = not_given,
         default_headers: Mapping[str, str] | None = None,
         set_default_headers: Mapping[str, str] | None = None,
         default_query: Mapping[str, object] | None = None,
@@ -846,6 +1964,7 @@ def copy(
             api_email=api_email or self.api_email,
             user_service_key=user_service_key or self.user_service_key,
             base_url=base_url or self.base_url,
+            api_version=api_version or self.api_version,
             timeout=self.timeout if isinstance(timeout, NotGiven) else timeout,
             http_client=http_client,
             max_retries=max_retries if is_given(max_retries) else self.max_retries,
@@ -893,419 +2012,2497 @@ def _make_status_error(
 
 
 class CloudflareWithRawResponse:
+    _client: Cloudflare
+
     def __init__(self, client: Cloudflare) -> None:
-        self.accounts = resources.AccountsResourceWithRawResponse(client.accounts)
-        self.origin_ca_certificates = resources.OriginCACertificatesResourceWithRawResponse(
-            client.origin_ca_certificates
-        )
-        self.ips = resources.IPsResourceWithRawResponse(client.ips)
-        self.memberships = resources.MembershipsResourceWithRawResponse(client.memberships)
-        self.user = resources.UserResourceWithRawResponse(client.user)
-        self.zones = resources.ZonesResourceWithRawResponse(client.zones)
-        self.load_balancers = resources.LoadBalancersResourceWithRawResponse(client.load_balancers)
-        self.cache = resources.CacheResourceWithRawResponse(client.cache)
-        self.ssl = resources.SSLResourceWithRawResponse(client.ssl)
-        self.subscriptions = resources.SubscriptionsResourceWithRawResponse(client.subscriptions)
-        self.acm = resources.ACMResourceWithRawResponse(client.acm)
-        self.argo = resources.ArgoResourceWithRawResponse(client.argo)
-        self.plans = resources.PlansResourceWithRawResponse(client.plans)
-        self.rate_plans = resources.RatePlansResourceWithRawResponse(client.rate_plans)
-        self.certificate_authorities = resources.CertificateAuthoritiesResourceWithRawResponse(
-            client.certificate_authorities
-        )
-        self.client_certificates = resources.ClientCertificatesResourceWithRawResponse(client.client_certificates)
-        self.custom_certificates = resources.CustomCertificatesResourceWithRawResponse(client.custom_certificates)
-        self.custom_hostnames = resources.CustomHostnamesResourceWithRawResponse(client.custom_hostnames)
-        self.custom_nameservers = resources.CustomNameserversResourceWithRawResponse(client.custom_nameservers)
-        self.dns = resources.DNSResourceWithRawResponse(client.dns)
-        self.dnssec = resources.DNSSECResourceWithRawResponse(client.dnssec)
-        self.email_routing = resources.EmailRoutingResourceWithRawResponse(client.email_routing)
-        self.filters = resources.FiltersResourceWithRawResponse(client.filters)
-        self.firewall = resources.FirewallResourceWithRawResponse(client.firewall)
-        self.healthchecks = resources.HealthchecksResourceWithRawResponse(client.healthchecks)
-        self.keyless_certificates = resources.KeylessCertificatesResourceWithRawResponse(client.keyless_certificates)
-        self.logpush = resources.LogpushResourceWithRawResponse(client.logpush)
-        self.logs = resources.LogsResourceWithRawResponse(client.logs)
-        self.origin_tls_client_auth = resources.OriginTLSClientAuthResourceWithRawResponse(
-            client.origin_tls_client_auth
-        )
-        self.pagerules = resources.PagerulesResourceWithRawResponse(client.pagerules)
-        self.rate_limits = resources.RateLimitsResourceWithRawResponse(client.rate_limits)
-        self.secondary_dns = resources.SecondaryDNSResourceWithRawResponse(client.secondary_dns)
-        self.waiting_rooms = resources.WaitingRoomsResourceWithRawResponse(client.waiting_rooms)
-        self.web3 = resources.Web3ResourceWithRawResponse(client.web3)
-        self.workers = resources.WorkersResourceWithRawResponse(client.workers)
-        self.kv = resources.KVResourceWithRawResponse(client.kv)
-        self.durable_objects = resources.DurableObjectsResourceWithRawResponse(client.durable_objects)
-        self.queues = resources.QueuesResourceWithRawResponse(client.queues)
-        self.api_gateway = resources.APIGatewayResourceWithRawResponse(client.api_gateway)
-        self.managed_headers = resources.ManagedHeadersResourceWithRawResponse(client.managed_headers)
-        self.page_shield = resources.PageShieldResourceWithRawResponse(client.page_shield)
-        self.rulesets = resources.RulesetsResourceWithRawResponse(client.rulesets)
-        self.url_normalization = resources.URLNormalizationResourceWithRawResponse(client.url_normalization)
-        self.spectrum = resources.SpectrumResourceWithRawResponse(client.spectrum)
-        self.addressing = resources.AddressingResourceWithRawResponse(client.addressing)
-        self.audit_logs = resources.AuditLogsResourceWithRawResponse(client.audit_logs)
-        self.billing = resources.BillingResourceWithRawResponse(client.billing)
-        self.brand_protection = resources.BrandProtectionResourceWithRawResponse(client.brand_protection)
-        self.diagnostics = resources.DiagnosticsResourceWithRawResponse(client.diagnostics)
-        self.images = resources.ImagesResourceWithRawResponse(client.images)
-        self.intel = resources.IntelResourceWithRawResponse(client.intel)
-        self.magic_transit = resources.MagicTransitResourceWithRawResponse(client.magic_transit)
-        self.magic_network_monitoring = resources.MagicNetworkMonitoringResourceWithRawResponse(
-            client.magic_network_monitoring
-        )
-        self.mtls_certificates = resources.MTLSCertificatesResourceWithRawResponse(client.mtls_certificates)
-        self.pages = resources.PagesResourceWithRawResponse(client.pages)
-        self.pcaps = resources.PCAPsResourceWithRawResponse(client.pcaps)
-        self.registrar = resources.RegistrarResourceWithRawResponse(client.registrar)
-        self.request_tracers = resources.RequestTracersResourceWithRawResponse(client.request_tracers)
-        self.rules = resources.RulesResourceWithRawResponse(client.rules)
-        self.storage = resources.StorageResourceWithRawResponse(client.storage)
-        self.stream = resources.StreamResourceWithRawResponse(client.stream)
-        self.alerting = resources.AlertingResourceWithRawResponse(client.alerting)
-        self.d1 = resources.D1ResourceWithRawResponse(client.d1)
-        self.r2 = resources.R2ResourceWithRawResponse(client.r2)
-        self.warp_connector = resources.WARPConnectorResourceWithRawResponse(client.warp_connector)
-        self.workers_for_platforms = resources.WorkersForPlatformsResourceWithRawResponse(client.workers_for_platforms)
-        self.zero_trust = resources.ZeroTrustResourceWithRawResponse(client.zero_trust)
-        self.challenges = resources.ChallengesResourceWithRawResponse(client.challenges)
-        self.hyperdrive = resources.HyperdriveResourceWithRawResponse(client.hyperdrive)
-        self.rum = resources.RUMResourceWithRawResponse(client.rum)
-        self.vectorize = resources.VectorizeResourceWithRawResponse(client.vectorize)
-        self.url_scanner = resources.URLScannerResourceWithRawResponse(client.url_scanner)
-        self.radar = resources.RadarResourceWithRawResponse(client.radar)
-        self.bot_management = resources.BotManagementResourceWithRawResponse(client.bot_management)
-        self.origin_post_quantum_encryption = resources.OriginPostQuantumEncryptionResourceWithRawResponse(
-            client.origin_post_quantum_encryption
-        )
-        self.speed = resources.SpeedResourceWithRawResponse(client.speed)
-        self.dcv_delegation = resources.DCVDelegationResourceWithRawResponse(client.dcv_delegation)
-        self.hostnames = resources.HostnamesResourceWithRawResponse(client.hostnames)
-        self.snippets = resources.SnippetsResourceWithRawResponse(client.snippets)
-        self.calls = resources.CallsResourceWithRawResponse(client.calls)
-        self.cloudforce_one = resources.CloudforceOneResourceWithRawResponse(client.cloudforce_one)
-        self.event_notifications = resources.EventNotificationsResourceWithRawResponse(client.event_notifications)
-        self.ai_gateway = resources.AIGatewayResourceWithRawResponse(client.ai_gateway)
-        self.iam = resources.IAMResourceWithRawResponse(client.iam)
-        self.cloud_connector = resources.CloudConnectorResourceWithRawResponse(client.cloud_connector)
+        self._client = client
+
+    @cached_property
+    def accounts(self) -> accounts.AccountsResourceWithRawResponse:
+        from .resources.accounts import AccountsResourceWithRawResponse
+
+        return AccountsResourceWithRawResponse(self._client.accounts)
+
+    @cached_property
+    def organizations(self) -> organizations.OrganizationsResourceWithRawResponse:
+        from .resources.organizations import OrganizationsResourceWithRawResponse
+
+        return OrganizationsResourceWithRawResponse(self._client.organizations)
+
+    @cached_property
+    def origin_ca_certificates(self) -> origin_ca_certificates.OriginCACertificatesResourceWithRawResponse:
+        from .resources.origin_ca_certificates import OriginCACertificatesResourceWithRawResponse
+
+        return OriginCACertificatesResourceWithRawResponse(self._client.origin_ca_certificates)
+
+    @cached_property
+    def ips(self) -> ips.IPsResourceWithRawResponse:
+        from .resources.ips import IPsResourceWithRawResponse
+
+        return IPsResourceWithRawResponse(self._client.ips)
+
+    @cached_property
+    def memberships(self) -> memberships.MembershipsResourceWithRawResponse:
+        from .resources.memberships import MembershipsResourceWithRawResponse
+
+        return MembershipsResourceWithRawResponse(self._client.memberships)
+
+    @cached_property
+    def user(self) -> user.UserResourceWithRawResponse:
+        from .resources.user import UserResourceWithRawResponse
+
+        return UserResourceWithRawResponse(self._client.user)
+
+    @cached_property
+    def zones(self) -> zones.ZonesResourceWithRawResponse:
+        from .resources.zones import ZonesResourceWithRawResponse
+
+        return ZonesResourceWithRawResponse(self._client.zones)
+
+    @cached_property
+    def load_balancers(self) -> load_balancers.LoadBalancersResourceWithRawResponse:
+        from .resources.load_balancers import LoadBalancersResourceWithRawResponse
+
+        return LoadBalancersResourceWithRawResponse(self._client.load_balancers)
+
+    @cached_property
+    def cache(self) -> cache.CacheResourceWithRawResponse:
+        from .resources.cache import CacheResourceWithRawResponse
+
+        return CacheResourceWithRawResponse(self._client.cache)
+
+    @cached_property
+    def ssl(self) -> ssl.SSLResourceWithRawResponse:
+        from .resources.ssl import SSLResourceWithRawResponse
+
+        return SSLResourceWithRawResponse(self._client.ssl)
+
+    @cached_property
+    def acm(self) -> acm.ACMResourceWithRawResponse:
+        from .resources.acm import ACMResourceWithRawResponse
+
+        return ACMResourceWithRawResponse(self._client.acm)
+
+    @cached_property
+    def argo(self) -> argo.ArgoResourceWithRawResponse:
+        from .resources.argo import ArgoResourceWithRawResponse
+
+        return ArgoResourceWithRawResponse(self._client.argo)
+
+    @cached_property
+    def certificate_authorities(self) -> certificate_authorities.CertificateAuthoritiesResourceWithRawResponse:
+        from .resources.certificate_authorities import CertificateAuthoritiesResourceWithRawResponse
+
+        return CertificateAuthoritiesResourceWithRawResponse(self._client.certificate_authorities)
+
+    @cached_property
+    def client_certificates(self) -> client_certificates.ClientCertificatesResourceWithRawResponse:
+        from .resources.client_certificates import ClientCertificatesResourceWithRawResponse
+
+        return ClientCertificatesResourceWithRawResponse(self._client.client_certificates)
+
+    @cached_property
+    def custom_certificates(self) -> custom_certificates.CustomCertificatesResourceWithRawResponse:
+        from .resources.custom_certificates import CustomCertificatesResourceWithRawResponse
+
+        return CustomCertificatesResourceWithRawResponse(self._client.custom_certificates)
+
+    @cached_property
+    def custom_hostnames(self) -> custom_hostnames.CustomHostnamesResourceWithRawResponse:
+        from .resources.custom_hostnames import CustomHostnamesResourceWithRawResponse
+
+        return CustomHostnamesResourceWithRawResponse(self._client.custom_hostnames)
+
+    @cached_property
+    def custom_nameservers(self) -> custom_nameservers.CustomNameserversResourceWithRawResponse:
+        from .resources.custom_nameservers import CustomNameserversResourceWithRawResponse
+
+        return CustomNameserversResourceWithRawResponse(self._client.custom_nameservers)
+
+    @cached_property
+    def dns_firewall(self) -> dns_firewall.DNSFirewallResourceWithRawResponse:
+        from .resources.dns_firewall import DNSFirewallResourceWithRawResponse
+
+        return DNSFirewallResourceWithRawResponse(self._client.dns_firewall)
+
+    @cached_property
+    def dns(self) -> dns.DNSResourceWithRawResponse:
+        from .resources.dns import DNSResourceWithRawResponse
+
+        return DNSResourceWithRawResponse(self._client.dns)
+
+    @cached_property
+    def email_security(self) -> email_security.EmailSecurityResourceWithRawResponse:
+        from .resources.email_security import EmailSecurityResourceWithRawResponse
+
+        return EmailSecurityResourceWithRawResponse(self._client.email_security)
+
+    @cached_property
+    def email_routing(self) -> email_routing.EmailRoutingResourceWithRawResponse:
+        from .resources.email_routing import EmailRoutingResourceWithRawResponse
+
+        return EmailRoutingResourceWithRawResponse(self._client.email_routing)
+
+    @cached_property
+    def filters(self) -> filters.FiltersResourceWithRawResponse:
+        from .resources.filters import FiltersResourceWithRawResponse
+
+        return FiltersResourceWithRawResponse(self._client.filters)
+
+    @cached_property
+    def firewall(self) -> firewall.FirewallResourceWithRawResponse:
+        from .resources.firewall import FirewallResourceWithRawResponse
+
+        return FirewallResourceWithRawResponse(self._client.firewall)
+
+    @cached_property
+    def healthchecks(self) -> healthchecks.HealthchecksResourceWithRawResponse:
+        from .resources.healthchecks import HealthchecksResourceWithRawResponse
+
+        return HealthchecksResourceWithRawResponse(self._client.healthchecks)
+
+    @cached_property
+    def keyless_certificates(self) -> keyless_certificates.KeylessCertificatesResourceWithRawResponse:
+        from .resources.keyless_certificates import KeylessCertificatesResourceWithRawResponse
+
+        return KeylessCertificatesResourceWithRawResponse(self._client.keyless_certificates)
+
+    @cached_property
+    def logpush(self) -> logpush.LogpushResourceWithRawResponse:
+        from .resources.logpush import LogpushResourceWithRawResponse
+
+        return LogpushResourceWithRawResponse(self._client.logpush)
+
+    @cached_property
+    def logs(self) -> logs.LogsResourceWithRawResponse:
+        from .resources.logs import LogsResourceWithRawResponse
+
+        return LogsResourceWithRawResponse(self._client.logs)
+
+    @cached_property
+    def origin_tls_client_auth(self) -> origin_tls_client_auth.OriginTLSClientAuthResourceWithRawResponse:
+        from .resources.origin_tls_client_auth import OriginTLSClientAuthResourceWithRawResponse
+
+        return OriginTLSClientAuthResourceWithRawResponse(self._client.origin_tls_client_auth)
+
+    @cached_property
+    def page_rules(self) -> page_rules.PageRulesResourceWithRawResponse:
+        from .resources.page_rules import PageRulesResourceWithRawResponse
+
+        return PageRulesResourceWithRawResponse(self._client.page_rules)
+
+    @cached_property
+    def rate_limits(self) -> rate_limits.RateLimitsResourceWithRawResponse:
+        from .resources.rate_limits import RateLimitsResourceWithRawResponse
+
+        return RateLimitsResourceWithRawResponse(self._client.rate_limits)
+
+    @cached_property
+    def waiting_rooms(self) -> waiting_rooms.WaitingRoomsResourceWithRawResponse:
+        from .resources.waiting_rooms import WaitingRoomsResourceWithRawResponse
+
+        return WaitingRoomsResourceWithRawResponse(self._client.waiting_rooms)
+
+    @cached_property
+    def web3(self) -> web3.Web3ResourceWithRawResponse:
+        from .resources.web3 import Web3ResourceWithRawResponse
+
+        return Web3ResourceWithRawResponse(self._client.web3)
+
+    @cached_property
+    def workers(self) -> workers.WorkersResourceWithRawResponse:
+        from .resources.workers import WorkersResourceWithRawResponse
+
+        return WorkersResourceWithRawResponse(self._client.workers)
+
+    @cached_property
+    def kv(self) -> kv.KVResourceWithRawResponse:
+        from .resources.kv import KVResourceWithRawResponse
+
+        return KVResourceWithRawResponse(self._client.kv)
+
+    @cached_property
+    def durable_objects(self) -> durable_objects.DurableObjectsResourceWithRawResponse:
+        from .resources.durable_objects import DurableObjectsResourceWithRawResponse
+
+        return DurableObjectsResourceWithRawResponse(self._client.durable_objects)
+
+    @cached_property
+    def queues(self) -> queues.QueuesResourceWithRawResponse:
+        from .resources.queues import QueuesResourceWithRawResponse
+
+        return QueuesResourceWithRawResponse(self._client.queues)
+
+    @cached_property
+    def api_gateway(self) -> api_gateway.APIGatewayResourceWithRawResponse:
+        from .resources.api_gateway import APIGatewayResourceWithRawResponse
+
+        return APIGatewayResourceWithRawResponse(self._client.api_gateway)
+
+    @cached_property
+    def managed_transforms(self) -> managed_transforms.ManagedTransformsResourceWithRawResponse:
+        from .resources.managed_transforms import ManagedTransformsResourceWithRawResponse
+
+        return ManagedTransformsResourceWithRawResponse(self._client.managed_transforms)
+
+    @cached_property
+    def page_shield(self) -> page_shield.PageShieldResourceWithRawResponse:
+        from .resources.page_shield import PageShieldResourceWithRawResponse
+
+        return PageShieldResourceWithRawResponse(self._client.page_shield)
+
+    @cached_property
+    def rulesets(self) -> rulesets.RulesetsResourceWithRawResponse:
+        from .resources.rulesets import RulesetsResourceWithRawResponse
+
+        return RulesetsResourceWithRawResponse(self._client.rulesets)
+
+    @cached_property
+    def url_normalization(self) -> url_normalization.URLNormalizationResourceWithRawResponse:
+        from .resources.url_normalization import URLNormalizationResourceWithRawResponse
+
+        return URLNormalizationResourceWithRawResponse(self._client.url_normalization)
+
+    @cached_property
+    def spectrum(self) -> spectrum.SpectrumResourceWithRawResponse:
+        from .resources.spectrum import SpectrumResourceWithRawResponse
+
+        return SpectrumResourceWithRawResponse(self._client.spectrum)
+
+    @cached_property
+    def addressing(self) -> addressing.AddressingResourceWithRawResponse:
+        from .resources.addressing import AddressingResourceWithRawResponse
+
+        return AddressingResourceWithRawResponse(self._client.addressing)
+
+    @cached_property
+    def audit_logs(self) -> audit_logs.AuditLogsResourceWithRawResponse:
+        from .resources.audit_logs import AuditLogsResourceWithRawResponse
+
+        return AuditLogsResourceWithRawResponse(self._client.audit_logs)
+
+    @cached_property
+    def billing(self) -> billing.BillingResourceWithRawResponse:
+        from .resources.billing import BillingResourceWithRawResponse
+
+        return BillingResourceWithRawResponse(self._client.billing)
+
+    @cached_property
+    def brand_protection(self) -> brand_protection.BrandProtectionResourceWithRawResponse:
+        from .resources.brand_protection import BrandProtectionResourceWithRawResponse
+
+        return BrandProtectionResourceWithRawResponse(self._client.brand_protection)
+
+    @cached_property
+    def diagnostics(self) -> diagnostics.DiagnosticsResourceWithRawResponse:
+        from .resources.diagnostics import DiagnosticsResourceWithRawResponse
+
+        return DiagnosticsResourceWithRawResponse(self._client.diagnostics)
+
+    @cached_property
+    def images(self) -> images.ImagesResourceWithRawResponse:
+        from .resources.images import ImagesResourceWithRawResponse
+
+        return ImagesResourceWithRawResponse(self._client.images)
+
+    @cached_property
+    def intel(self) -> intel.IntelResourceWithRawResponse:
+        from .resources.intel import IntelResourceWithRawResponse
+
+        return IntelResourceWithRawResponse(self._client.intel)
+
+    @cached_property
+    def magic_transit(self) -> magic_transit.MagicTransitResourceWithRawResponse:
+        from .resources.magic_transit import MagicTransitResourceWithRawResponse
+
+        return MagicTransitResourceWithRawResponse(self._client.magic_transit)
+
+    @cached_property
+    def magic_network_monitoring(self) -> magic_network_monitoring.MagicNetworkMonitoringResourceWithRawResponse:
+        from .resources.magic_network_monitoring import MagicNetworkMonitoringResourceWithRawResponse
+
+        return MagicNetworkMonitoringResourceWithRawResponse(self._client.magic_network_monitoring)
+
+    @cached_property
+    def magic_cloud_networking(self) -> magic_cloud_networking.MagicCloudNetworkingResourceWithRawResponse:
+        from .resources.magic_cloud_networking import MagicCloudNetworkingResourceWithRawResponse
+
+        return MagicCloudNetworkingResourceWithRawResponse(self._client.magic_cloud_networking)
+
+    @cached_property
+    def network_interconnects(self) -> network_interconnects.NetworkInterconnectsResourceWithRawResponse:
+        from .resources.network_interconnects import NetworkInterconnectsResourceWithRawResponse
+
+        return NetworkInterconnectsResourceWithRawResponse(self._client.network_interconnects)
+
+    @cached_property
+    def mtls_certificates(self) -> mtls_certificates.MTLSCertificatesResourceWithRawResponse:
+        from .resources.mtls_certificates import MTLSCertificatesResourceWithRawResponse
+
+        return MTLSCertificatesResourceWithRawResponse(self._client.mtls_certificates)
+
+    @cached_property
+    def pages(self) -> pages.PagesResourceWithRawResponse:
+        from .resources.pages import PagesResourceWithRawResponse
+
+        return PagesResourceWithRawResponse(self._client.pages)
+
+    @cached_property
+    def registrar(self) -> registrar.RegistrarResourceWithRawResponse:
+        from .resources.registrar import RegistrarResourceWithRawResponse
+
+        return RegistrarResourceWithRawResponse(self._client.registrar)
+
+    @cached_property
+    def request_tracers(self) -> request_tracers.RequestTracersResourceWithRawResponse:
+        from .resources.request_tracers import RequestTracersResourceWithRawResponse
+
+        return RequestTracersResourceWithRawResponse(self._client.request_tracers)
+
+    @cached_property
+    def rules(self) -> rules.RulesResourceWithRawResponse:
+        from .resources.rules import RulesResourceWithRawResponse
+
+        return RulesResourceWithRawResponse(self._client.rules)
+
+    @cached_property
+    def stream(self) -> stream.StreamResourceWithRawResponse:
+        from .resources.stream import StreamResourceWithRawResponse
+
+        return StreamResourceWithRawResponse(self._client.stream)
+
+    @cached_property
+    def alerting(self) -> alerting.AlertingResourceWithRawResponse:
+        from .resources.alerting import AlertingResourceWithRawResponse
+
+        return AlertingResourceWithRawResponse(self._client.alerting)
+
+    @cached_property
+    def d1(self) -> d1.D1ResourceWithRawResponse:
+        from .resources.d1 import D1ResourceWithRawResponse
+
+        return D1ResourceWithRawResponse(self._client.d1)
+
+    @cached_property
+    def r2(self) -> r2.R2ResourceWithRawResponse:
+        from .resources.r2 import R2ResourceWithRawResponse
+
+        return R2ResourceWithRawResponse(self._client.r2)
+
+    @cached_property
+    def r2_data_catalog(self) -> r2_data_catalog.R2DataCatalogResourceWithRawResponse:
+        from .resources.r2_data_catalog import R2DataCatalogResourceWithRawResponse
+
+        return R2DataCatalogResourceWithRawResponse(self._client.r2_data_catalog)
+
+    @cached_property
+    def workers_for_platforms(self) -> workers_for_platforms.WorkersForPlatformsResourceWithRawResponse:
+        from .resources.workers_for_platforms import WorkersForPlatformsResourceWithRawResponse
+
+        return WorkersForPlatformsResourceWithRawResponse(self._client.workers_for_platforms)
+
+    @cached_property
+    def zero_trust(self) -> zero_trust.ZeroTrustResourceWithRawResponse:
+        from .resources.zero_trust import ZeroTrustResourceWithRawResponse
+
+        return ZeroTrustResourceWithRawResponse(self._client.zero_trust)
+
+    @cached_property
+    def turnstile(self) -> turnstile.TurnstileResourceWithRawResponse:
+        from .resources.turnstile import TurnstileResourceWithRawResponse
+
+        return TurnstileResourceWithRawResponse(self._client.turnstile)
+
+    @cached_property
+    def connectivity(self) -> connectivity.ConnectivityResourceWithRawResponse:
+        from .resources.connectivity import ConnectivityResourceWithRawResponse
+
+        return ConnectivityResourceWithRawResponse(self._client.connectivity)
+
+    @cached_property
+    def hyperdrive(self) -> hyperdrive.HyperdriveResourceWithRawResponse:
+        from .resources.hyperdrive import HyperdriveResourceWithRawResponse
+
+        return HyperdriveResourceWithRawResponse(self._client.hyperdrive)
+
+    @cached_property
+    def rum(self) -> rum.RUMResourceWithRawResponse:
+        from .resources.rum import RUMResourceWithRawResponse
+
+        return RUMResourceWithRawResponse(self._client.rum)
+
+    @cached_property
+    def vectorize(self) -> vectorize.VectorizeResourceWithRawResponse:
+        from .resources.vectorize import VectorizeResourceWithRawResponse
+
+        return VectorizeResourceWithRawResponse(self._client.vectorize)
+
+    @cached_property
+    def url_scanner(self) -> url_scanner.URLScannerResourceWithRawResponse:
+        from .resources.url_scanner import URLScannerResourceWithRawResponse
+
+        return URLScannerResourceWithRawResponse(self._client.url_scanner)
+
+    @cached_property
+    def radar(self) -> radar.RadarResourceWithRawResponse:
+        from .resources.radar import RadarResourceWithRawResponse
+
+        return RadarResourceWithRawResponse(self._client.radar)
+
+    @cached_property
+    def bot_management(self) -> bot_management.BotManagementResourceWithRawResponse:
+        from .resources.bot_management import BotManagementResourceWithRawResponse
+
+        return BotManagementResourceWithRawResponse(self._client.bot_management)
+
+    @cached_property
+    def fraud(self) -> fraud.FraudResourceWithRawResponse:
+        from .resources.fraud import FraudResourceWithRawResponse
+
+        return FraudResourceWithRawResponse(self._client.fraud)
+
+    @cached_property
+    def origin_post_quantum_encryption(
+        self,
+    ) -> origin_post_quantum_encryption.OriginPostQuantumEncryptionResourceWithRawResponse:
+        from .resources.origin_post_quantum_encryption import OriginPostQuantumEncryptionResourceWithRawResponse
+
+        return OriginPostQuantumEncryptionResourceWithRawResponse(self._client.origin_post_quantum_encryption)
+
+    @cached_property
+    def zaraz(self) -> zaraz.ZarazResourceWithRawResponse:
+        from .resources.zaraz import ZarazResourceWithRawResponse
+
+        return ZarazResourceWithRawResponse(self._client.zaraz)
+
+    @cached_property
+    def speed(self) -> speed.SpeedResourceWithRawResponse:
+        from .resources.speed import SpeedResourceWithRawResponse
+
+        return SpeedResourceWithRawResponse(self._client.speed)
+
+    @cached_property
+    def dcv_delegation(self) -> dcv_delegation.DCVDelegationResourceWithRawResponse:
+        from .resources.dcv_delegation import DCVDelegationResourceWithRawResponse
+
+        return DCVDelegationResourceWithRawResponse(self._client.dcv_delegation)
+
+    @cached_property
+    def hostnames(self) -> hostnames.HostnamesResourceWithRawResponse:
+        from .resources.hostnames import HostnamesResourceWithRawResponse
+
+        return HostnamesResourceWithRawResponse(self._client.hostnames)
+
+    @cached_property
+    def snippets(self) -> snippets.SnippetsResourceWithRawResponse:
+        from .resources.snippets import SnippetsResourceWithRawResponse
+
+        return SnippetsResourceWithRawResponse(self._client.snippets)
+
+    @cached_property
+    def realtime_kit(self) -> realtime_kit.RealtimeKitResourceWithRawResponse:
+        from .resources.realtime_kit import RealtimeKitResourceWithRawResponse
+
+        return RealtimeKitResourceWithRawResponse(self._client.realtime_kit)
+
+    @cached_property
+    def calls(self) -> calls.CallsResourceWithRawResponse:
+        from .resources.calls import CallsResourceWithRawResponse
+
+        return CallsResourceWithRawResponse(self._client.calls)
+
+    @cached_property
+    def cloudforce_one(self) -> cloudforce_one.CloudforceOneResourceWithRawResponse:
+        from .resources.cloudforce_one import CloudforceOneResourceWithRawResponse
+
+        return CloudforceOneResourceWithRawResponse(self._client.cloudforce_one)
+
+    @cached_property
+    def ai_gateway(self) -> ai_gateway.AIGatewayResourceWithRawResponse:
+        from .resources.ai_gateway import AIGatewayResourceWithRawResponse
+
+        return AIGatewayResourceWithRawResponse(self._client.ai_gateway)
+
+    @cached_property
+    def iam(self) -> iam.IAMResourceWithRawResponse:
+        from .resources.iam import IAMResourceWithRawResponse
+
+        return IAMResourceWithRawResponse(self._client.iam)
+
+    @cached_property
+    def cloud_connector(self) -> cloud_connector.CloudConnectorResourceWithRawResponse:
+        from .resources.cloud_connector import CloudConnectorResourceWithRawResponse
+
+        return CloudConnectorResourceWithRawResponse(self._client.cloud_connector)
+
+    @cached_property
+    def botnet_feed(self) -> botnet_feed.BotnetFeedResourceWithRawResponse:
+        from .resources.botnet_feed import BotnetFeedResourceWithRawResponse
+
+        return BotnetFeedResourceWithRawResponse(self._client.botnet_feed)
+
+    @cached_property
+    def security_txt(self) -> security_txt.SecurityTXTResourceWithRawResponse:
+        from .resources.security_txt import SecurityTXTResourceWithRawResponse
+
+        return SecurityTXTResourceWithRawResponse(self._client.security_txt)
+
+    @cached_property
+    def workflows(self) -> workflows.WorkflowsResourceWithRawResponse:
+        from .resources.workflows import WorkflowsResourceWithRawResponse
+
+        return WorkflowsResourceWithRawResponse(self._client.workflows)
+
+    @cached_property
+    def resource_sharing(self) -> resource_sharing.ResourceSharingResourceWithRawResponse:
+        from .resources.resource_sharing import ResourceSharingResourceWithRawResponse
+
+        return ResourceSharingResourceWithRawResponse(self._client.resource_sharing)
+
+    @cached_property
+    def leaked_credential_checks(self) -> leaked_credential_checks.LeakedCredentialChecksResourceWithRawResponse:
+        from .resources.leaked_credential_checks import LeakedCredentialChecksResourceWithRawResponse
+
+        return LeakedCredentialChecksResourceWithRawResponse(self._client.leaked_credential_checks)
+
+    @cached_property
+    def content_scanning(self) -> content_scanning.ContentScanningResourceWithRawResponse:
+        from .resources.content_scanning import ContentScanningResourceWithRawResponse
+
+        return ContentScanningResourceWithRawResponse(self._client.content_scanning)
+
+    @cached_property
+    def abuse_reports(self) -> abuse_reports.AbuseReportsResourceWithRawResponse:
+        from .resources.abuse_reports import AbuseReportsResourceWithRawResponse
+
+        return AbuseReportsResourceWithRawResponse(self._client.abuse_reports)
+
+    @cached_property
+    def ai(self) -> ai.AIResourceWithRawResponse:
+        from .resources.ai import AIResourceWithRawResponse
+
+        return AIResourceWithRawResponse(self._client.ai)
+
+    @cached_property
+    def aisearch(self) -> aisearch.AISearchResourceWithRawResponse:
+        from .resources.aisearch import AISearchResourceWithRawResponse
+
+        return AISearchResourceWithRawResponse(self._client.aisearch)
+
+    @cached_property
+    def security_center(self) -> security_center.SecurityCenterResourceWithRawResponse:
+        from .resources.security_center import SecurityCenterResourceWithRawResponse
+
+        return SecurityCenterResourceWithRawResponse(self._client.security_center)
+
+    @cached_property
+    def browser_rendering(self) -> browser_rendering.BrowserRenderingResourceWithRawResponse:
+        from .resources.browser_rendering import BrowserRenderingResourceWithRawResponse
+
+        return BrowserRenderingResourceWithRawResponse(self._client.browser_rendering)
+
+    @cached_property
+    def custom_pages(self) -> custom_pages.CustomPagesResourceWithRawResponse:
+        from .resources.custom_pages import CustomPagesResourceWithRawResponse
+
+        return CustomPagesResourceWithRawResponse(self._client.custom_pages)
+
+    @cached_property
+    def secrets_store(self) -> secrets_store.SecretsStoreResourceWithRawResponse:
+        from .resources.secrets_store import SecretsStoreResourceWithRawResponse
+
+        return SecretsStoreResourceWithRawResponse(self._client.secrets_store)
+
+    @cached_property
+    def pipelines(self) -> pipelines.PipelinesResourceWithRawResponse:
+        from .resources.pipelines import PipelinesResourceWithRawResponse
+
+        return PipelinesResourceWithRawResponse(self._client.pipelines)
+
+    @cached_property
+    def schema_validation(self) -> schema_validation.SchemaValidationResourceWithRawResponse:
+        from .resources.schema_validation import SchemaValidationResourceWithRawResponse
+
+        return SchemaValidationResourceWithRawResponse(self._client.schema_validation)
+
+    @cached_property
+    def token_validation(self) -> token_validation.TokenValidationResourceWithRawResponse:
+        from .resources.token_validation import TokenValidationResourceWithRawResponse
+
+        return TokenValidationResourceWithRawResponse(self._client.token_validation)
 
 
 class AsyncCloudflareWithRawResponse:
+    _client: AsyncCloudflare
+
     def __init__(self, client: AsyncCloudflare) -> None:
-        self.accounts = resources.AsyncAccountsResourceWithRawResponse(client.accounts)
-        self.origin_ca_certificates = resources.AsyncOriginCACertificatesResourceWithRawResponse(
-            client.origin_ca_certificates
-        )
-        self.ips = resources.AsyncIPsResourceWithRawResponse(client.ips)
-        self.memberships = resources.AsyncMembershipsResourceWithRawResponse(client.memberships)
-        self.user = resources.AsyncUserResourceWithRawResponse(client.user)
-        self.zones = resources.AsyncZonesResourceWithRawResponse(client.zones)
-        self.load_balancers = resources.AsyncLoadBalancersResourceWithRawResponse(client.load_balancers)
-        self.cache = resources.AsyncCacheResourceWithRawResponse(client.cache)
-        self.ssl = resources.AsyncSSLResourceWithRawResponse(client.ssl)
-        self.subscriptions = resources.AsyncSubscriptionsResourceWithRawResponse(client.subscriptions)
-        self.acm = resources.AsyncACMResourceWithRawResponse(client.acm)
-        self.argo = resources.AsyncArgoResourceWithRawResponse(client.argo)
-        self.plans = resources.AsyncPlansResourceWithRawResponse(client.plans)
-        self.rate_plans = resources.AsyncRatePlansResourceWithRawResponse(client.rate_plans)
-        self.certificate_authorities = resources.AsyncCertificateAuthoritiesResourceWithRawResponse(
-            client.certificate_authorities
-        )
-        self.client_certificates = resources.AsyncClientCertificatesResourceWithRawResponse(client.client_certificates)
-        self.custom_certificates = resources.AsyncCustomCertificatesResourceWithRawResponse(client.custom_certificates)
-        self.custom_hostnames = resources.AsyncCustomHostnamesResourceWithRawResponse(client.custom_hostnames)
-        self.custom_nameservers = resources.AsyncCustomNameserversResourceWithRawResponse(client.custom_nameservers)
-        self.dns = resources.AsyncDNSResourceWithRawResponse(client.dns)
-        self.dnssec = resources.AsyncDNSSECResourceWithRawResponse(client.dnssec)
-        self.email_routing = resources.AsyncEmailRoutingResourceWithRawResponse(client.email_routing)
-        self.filters = resources.AsyncFiltersResourceWithRawResponse(client.filters)
-        self.firewall = resources.AsyncFirewallResourceWithRawResponse(client.firewall)
-        self.healthchecks = resources.AsyncHealthchecksResourceWithRawResponse(client.healthchecks)
-        self.keyless_certificates = resources.AsyncKeylessCertificatesResourceWithRawResponse(
-            client.keyless_certificates
-        )
-        self.logpush = resources.AsyncLogpushResourceWithRawResponse(client.logpush)
-        self.logs = resources.AsyncLogsResourceWithRawResponse(client.logs)
-        self.origin_tls_client_auth = resources.AsyncOriginTLSClientAuthResourceWithRawResponse(
-            client.origin_tls_client_auth
-        )
-        self.pagerules = resources.AsyncPagerulesResourceWithRawResponse(client.pagerules)
-        self.rate_limits = resources.AsyncRateLimitsResourceWithRawResponse(client.rate_limits)
-        self.secondary_dns = resources.AsyncSecondaryDNSResourceWithRawResponse(client.secondary_dns)
-        self.waiting_rooms = resources.AsyncWaitingRoomsResourceWithRawResponse(client.waiting_rooms)
-        self.web3 = resources.AsyncWeb3ResourceWithRawResponse(client.web3)
-        self.workers = resources.AsyncWorkersResourceWithRawResponse(client.workers)
-        self.kv = resources.AsyncKVResourceWithRawResponse(client.kv)
-        self.durable_objects = resources.AsyncDurableObjectsResourceWithRawResponse(client.durable_objects)
-        self.queues = resources.AsyncQueuesResourceWithRawResponse(client.queues)
-        self.api_gateway = resources.AsyncAPIGatewayResourceWithRawResponse(client.api_gateway)
-        self.managed_headers = resources.AsyncManagedHeadersResourceWithRawResponse(client.managed_headers)
-        self.page_shield = resources.AsyncPageShieldResourceWithRawResponse(client.page_shield)
-        self.rulesets = resources.AsyncRulesetsResourceWithRawResponse(client.rulesets)
-        self.url_normalization = resources.AsyncURLNormalizationResourceWithRawResponse(client.url_normalization)
-        self.spectrum = resources.AsyncSpectrumResourceWithRawResponse(client.spectrum)
-        self.addressing = resources.AsyncAddressingResourceWithRawResponse(client.addressing)
-        self.audit_logs = resources.AsyncAuditLogsResourceWithRawResponse(client.audit_logs)
-        self.billing = resources.AsyncBillingResourceWithRawResponse(client.billing)
-        self.brand_protection = resources.AsyncBrandProtectionResourceWithRawResponse(client.brand_protection)
-        self.diagnostics = resources.AsyncDiagnosticsResourceWithRawResponse(client.diagnostics)
-        self.images = resources.AsyncImagesResourceWithRawResponse(client.images)
-        self.intel = resources.AsyncIntelResourceWithRawResponse(client.intel)
-        self.magic_transit = resources.AsyncMagicTransitResourceWithRawResponse(client.magic_transit)
-        self.magic_network_monitoring = resources.AsyncMagicNetworkMonitoringResourceWithRawResponse(
-            client.magic_network_monitoring
-        )
-        self.mtls_certificates = resources.AsyncMTLSCertificatesResourceWithRawResponse(client.mtls_certificates)
-        self.pages = resources.AsyncPagesResourceWithRawResponse(client.pages)
-        self.pcaps = resources.AsyncPCAPsResourceWithRawResponse(client.pcaps)
-        self.registrar = resources.AsyncRegistrarResourceWithRawResponse(client.registrar)
-        self.request_tracers = resources.AsyncRequestTracersResourceWithRawResponse(client.request_tracers)
-        self.rules = resources.AsyncRulesResourceWithRawResponse(client.rules)
-        self.storage = resources.AsyncStorageResourceWithRawResponse(client.storage)
-        self.stream = resources.AsyncStreamResourceWithRawResponse(client.stream)
-        self.alerting = resources.AsyncAlertingResourceWithRawResponse(client.alerting)
-        self.d1 = resources.AsyncD1ResourceWithRawResponse(client.d1)
-        self.r2 = resources.AsyncR2ResourceWithRawResponse(client.r2)
-        self.warp_connector = resources.AsyncWARPConnectorResourceWithRawResponse(client.warp_connector)
-        self.workers_for_platforms = resources.AsyncWorkersForPlatformsResourceWithRawResponse(
-            client.workers_for_platforms
-        )
-        self.zero_trust = resources.AsyncZeroTrustResourceWithRawResponse(client.zero_trust)
-        self.challenges = resources.AsyncChallengesResourceWithRawResponse(client.challenges)
-        self.hyperdrive = resources.AsyncHyperdriveResourceWithRawResponse(client.hyperdrive)
-        self.rum = resources.AsyncRUMResourceWithRawResponse(client.rum)
-        self.vectorize = resources.AsyncVectorizeResourceWithRawResponse(client.vectorize)
-        self.url_scanner = resources.AsyncURLScannerResourceWithRawResponse(client.url_scanner)
-        self.radar = resources.AsyncRadarResourceWithRawResponse(client.radar)
-        self.bot_management = resources.AsyncBotManagementResourceWithRawResponse(client.bot_management)
-        self.origin_post_quantum_encryption = resources.AsyncOriginPostQuantumEncryptionResourceWithRawResponse(
-            client.origin_post_quantum_encryption
-        )
-        self.speed = resources.AsyncSpeedResourceWithRawResponse(client.speed)
-        self.dcv_delegation = resources.AsyncDCVDelegationResourceWithRawResponse(client.dcv_delegation)
-        self.hostnames = resources.AsyncHostnamesResourceWithRawResponse(client.hostnames)
-        self.snippets = resources.AsyncSnippetsResourceWithRawResponse(client.snippets)
-        self.calls = resources.AsyncCallsResourceWithRawResponse(client.calls)
-        self.cloudforce_one = resources.AsyncCloudforceOneResourceWithRawResponse(client.cloudforce_one)
-        self.event_notifications = resources.AsyncEventNotificationsResourceWithRawResponse(client.event_notifications)
-        self.ai_gateway = resources.AsyncAIGatewayResourceWithRawResponse(client.ai_gateway)
-        self.iam = resources.AsyncIAMResourceWithRawResponse(client.iam)
-        self.cloud_connector = resources.AsyncCloudConnectorResourceWithRawResponse(client.cloud_connector)
+        self._client = client
+
+    @cached_property
+    def accounts(self) -> accounts.AsyncAccountsResourceWithRawResponse:
+        from .resources.accounts import AsyncAccountsResourceWithRawResponse
+
+        return AsyncAccountsResourceWithRawResponse(self._client.accounts)
+
+    @cached_property
+    def organizations(self) -> organizations.AsyncOrganizationsResourceWithRawResponse:
+        from .resources.organizations import AsyncOrganizationsResourceWithRawResponse
+
+        return AsyncOrganizationsResourceWithRawResponse(self._client.organizations)
+
+    @cached_property
+    def origin_ca_certificates(self) -> origin_ca_certificates.AsyncOriginCACertificatesResourceWithRawResponse:
+        from .resources.origin_ca_certificates import AsyncOriginCACertificatesResourceWithRawResponse
+
+        return AsyncOriginCACertificatesResourceWithRawResponse(self._client.origin_ca_certificates)
+
+    @cached_property
+    def ips(self) -> ips.AsyncIPsResourceWithRawResponse:
+        from .resources.ips import AsyncIPsResourceWithRawResponse
+
+        return AsyncIPsResourceWithRawResponse(self._client.ips)
+
+    @cached_property
+    def memberships(self) -> memberships.AsyncMembershipsResourceWithRawResponse:
+        from .resources.memberships import AsyncMembershipsResourceWithRawResponse
+
+        return AsyncMembershipsResourceWithRawResponse(self._client.memberships)
+
+    @cached_property
+    def user(self) -> user.AsyncUserResourceWithRawResponse:
+        from .resources.user import AsyncUserResourceWithRawResponse
+
+        return AsyncUserResourceWithRawResponse(self._client.user)
+
+    @cached_property
+    def zones(self) -> zones.AsyncZonesResourceWithRawResponse:
+        from .resources.zones import AsyncZonesResourceWithRawResponse
+
+        return AsyncZonesResourceWithRawResponse(self._client.zones)
+
+    @cached_property
+    def load_balancers(self) -> load_balancers.AsyncLoadBalancersResourceWithRawResponse:
+        from .resources.load_balancers import AsyncLoadBalancersResourceWithRawResponse
+
+        return AsyncLoadBalancersResourceWithRawResponse(self._client.load_balancers)
+
+    @cached_property
+    def cache(self) -> cache.AsyncCacheResourceWithRawResponse:
+        from .resources.cache import AsyncCacheResourceWithRawResponse
+
+        return AsyncCacheResourceWithRawResponse(self._client.cache)
+
+    @cached_property
+    def ssl(self) -> ssl.AsyncSSLResourceWithRawResponse:
+        from .resources.ssl import AsyncSSLResourceWithRawResponse
+
+        return AsyncSSLResourceWithRawResponse(self._client.ssl)
+
+    @cached_property
+    def acm(self) -> acm.AsyncACMResourceWithRawResponse:
+        from .resources.acm import AsyncACMResourceWithRawResponse
+
+        return AsyncACMResourceWithRawResponse(self._client.acm)
+
+    @cached_property
+    def argo(self) -> argo.AsyncArgoResourceWithRawResponse:
+        from .resources.argo import AsyncArgoResourceWithRawResponse
+
+        return AsyncArgoResourceWithRawResponse(self._client.argo)
+
+    @cached_property
+    def certificate_authorities(self) -> certificate_authorities.AsyncCertificateAuthoritiesResourceWithRawResponse:
+        from .resources.certificate_authorities import AsyncCertificateAuthoritiesResourceWithRawResponse
+
+        return AsyncCertificateAuthoritiesResourceWithRawResponse(self._client.certificate_authorities)
+
+    @cached_property
+    def client_certificates(self) -> client_certificates.AsyncClientCertificatesResourceWithRawResponse:
+        from .resources.client_certificates import AsyncClientCertificatesResourceWithRawResponse
+
+        return AsyncClientCertificatesResourceWithRawResponse(self._client.client_certificates)
+
+    @cached_property
+    def custom_certificates(self) -> custom_certificates.AsyncCustomCertificatesResourceWithRawResponse:
+        from .resources.custom_certificates import AsyncCustomCertificatesResourceWithRawResponse
+
+        return AsyncCustomCertificatesResourceWithRawResponse(self._client.custom_certificates)
+
+    @cached_property
+    def custom_hostnames(self) -> custom_hostnames.AsyncCustomHostnamesResourceWithRawResponse:
+        from .resources.custom_hostnames import AsyncCustomHostnamesResourceWithRawResponse
+
+        return AsyncCustomHostnamesResourceWithRawResponse(self._client.custom_hostnames)
+
+    @cached_property
+    def custom_nameservers(self) -> custom_nameservers.AsyncCustomNameserversResourceWithRawResponse:
+        from .resources.custom_nameservers import AsyncCustomNameserversResourceWithRawResponse
+
+        return AsyncCustomNameserversResourceWithRawResponse(self._client.custom_nameservers)
+
+    @cached_property
+    def dns_firewall(self) -> dns_firewall.AsyncDNSFirewallResourceWithRawResponse:
+        from .resources.dns_firewall import AsyncDNSFirewallResourceWithRawResponse
+
+        return AsyncDNSFirewallResourceWithRawResponse(self._client.dns_firewall)
+
+    @cached_property
+    def dns(self) -> dns.AsyncDNSResourceWithRawResponse:
+        from .resources.dns import AsyncDNSResourceWithRawResponse
+
+        return AsyncDNSResourceWithRawResponse(self._client.dns)
+
+    @cached_property
+    def email_security(self) -> email_security.AsyncEmailSecurityResourceWithRawResponse:
+        from .resources.email_security import AsyncEmailSecurityResourceWithRawResponse
+
+        return AsyncEmailSecurityResourceWithRawResponse(self._client.email_security)
+
+    @cached_property
+    def email_routing(self) -> email_routing.AsyncEmailRoutingResourceWithRawResponse:
+        from .resources.email_routing import AsyncEmailRoutingResourceWithRawResponse
+
+        return AsyncEmailRoutingResourceWithRawResponse(self._client.email_routing)
+
+    @cached_property
+    def filters(self) -> filters.AsyncFiltersResourceWithRawResponse:
+        from .resources.filters import AsyncFiltersResourceWithRawResponse
+
+        return AsyncFiltersResourceWithRawResponse(self._client.filters)
+
+    @cached_property
+    def firewall(self) -> firewall.AsyncFirewallResourceWithRawResponse:
+        from .resources.firewall import AsyncFirewallResourceWithRawResponse
+
+        return AsyncFirewallResourceWithRawResponse(self._client.firewall)
+
+    @cached_property
+    def healthchecks(self) -> healthchecks.AsyncHealthchecksResourceWithRawResponse:
+        from .resources.healthchecks import AsyncHealthchecksResourceWithRawResponse
+
+        return AsyncHealthchecksResourceWithRawResponse(self._client.healthchecks)
+
+    @cached_property
+    def keyless_certificates(self) -> keyless_certificates.AsyncKeylessCertificatesResourceWithRawResponse:
+        from .resources.keyless_certificates import AsyncKeylessCertificatesResourceWithRawResponse
+
+        return AsyncKeylessCertificatesResourceWithRawResponse(self._client.keyless_certificates)
+
+    @cached_property
+    def logpush(self) -> logpush.AsyncLogpushResourceWithRawResponse:
+        from .resources.logpush import AsyncLogpushResourceWithRawResponse
+
+        return AsyncLogpushResourceWithRawResponse(self._client.logpush)
+
+    @cached_property
+    def logs(self) -> logs.AsyncLogsResourceWithRawResponse:
+        from .resources.logs import AsyncLogsResourceWithRawResponse
+
+        return AsyncLogsResourceWithRawResponse(self._client.logs)
+
+    @cached_property
+    def origin_tls_client_auth(self) -> origin_tls_client_auth.AsyncOriginTLSClientAuthResourceWithRawResponse:
+        from .resources.origin_tls_client_auth import AsyncOriginTLSClientAuthResourceWithRawResponse
+
+        return AsyncOriginTLSClientAuthResourceWithRawResponse(self._client.origin_tls_client_auth)
+
+    @cached_property
+    def page_rules(self) -> page_rules.AsyncPageRulesResourceWithRawResponse:
+        from .resources.page_rules import AsyncPageRulesResourceWithRawResponse
+
+        return AsyncPageRulesResourceWithRawResponse(self._client.page_rules)
+
+    @cached_property
+    def rate_limits(self) -> rate_limits.AsyncRateLimitsResourceWithRawResponse:
+        from .resources.rate_limits import AsyncRateLimitsResourceWithRawResponse
+
+        return AsyncRateLimitsResourceWithRawResponse(self._client.rate_limits)
+
+    @cached_property
+    def waiting_rooms(self) -> waiting_rooms.AsyncWaitingRoomsResourceWithRawResponse:
+        from .resources.waiting_rooms import AsyncWaitingRoomsResourceWithRawResponse
+
+        return AsyncWaitingRoomsResourceWithRawResponse(self._client.waiting_rooms)
+
+    @cached_property
+    def web3(self) -> web3.AsyncWeb3ResourceWithRawResponse:
+        from .resources.web3 import AsyncWeb3ResourceWithRawResponse
+
+        return AsyncWeb3ResourceWithRawResponse(self._client.web3)
+
+    @cached_property
+    def workers(self) -> workers.AsyncWorkersResourceWithRawResponse:
+        from .resources.workers import AsyncWorkersResourceWithRawResponse
+
+        return AsyncWorkersResourceWithRawResponse(self._client.workers)
+
+    @cached_property
+    def kv(self) -> kv.AsyncKVResourceWithRawResponse:
+        from .resources.kv import AsyncKVResourceWithRawResponse
+
+        return AsyncKVResourceWithRawResponse(self._client.kv)
+
+    @cached_property
+    def durable_objects(self) -> durable_objects.AsyncDurableObjectsResourceWithRawResponse:
+        from .resources.durable_objects import AsyncDurableObjectsResourceWithRawResponse
+
+        return AsyncDurableObjectsResourceWithRawResponse(self._client.durable_objects)
+
+    @cached_property
+    def queues(self) -> queues.AsyncQueuesResourceWithRawResponse:
+        from .resources.queues import AsyncQueuesResourceWithRawResponse
+
+        return AsyncQueuesResourceWithRawResponse(self._client.queues)
+
+    @cached_property
+    def api_gateway(self) -> api_gateway.AsyncAPIGatewayResourceWithRawResponse:
+        from .resources.api_gateway import AsyncAPIGatewayResourceWithRawResponse
+
+        return AsyncAPIGatewayResourceWithRawResponse(self._client.api_gateway)
+
+    @cached_property
+    def managed_transforms(self) -> managed_transforms.AsyncManagedTransformsResourceWithRawResponse:
+        from .resources.managed_transforms import AsyncManagedTransformsResourceWithRawResponse
+
+        return AsyncManagedTransformsResourceWithRawResponse(self._client.managed_transforms)
+
+    @cached_property
+    def page_shield(self) -> page_shield.AsyncPageShieldResourceWithRawResponse:
+        from .resources.page_shield import AsyncPageShieldResourceWithRawResponse
+
+        return AsyncPageShieldResourceWithRawResponse(self._client.page_shield)
+
+    @cached_property
+    def rulesets(self) -> rulesets.AsyncRulesetsResourceWithRawResponse:
+        from .resources.rulesets import AsyncRulesetsResourceWithRawResponse
+
+        return AsyncRulesetsResourceWithRawResponse(self._client.rulesets)
+
+    @cached_property
+    def url_normalization(self) -> url_normalization.AsyncURLNormalizationResourceWithRawResponse:
+        from .resources.url_normalization import AsyncURLNormalizationResourceWithRawResponse
+
+        return AsyncURLNormalizationResourceWithRawResponse(self._client.url_normalization)
+
+    @cached_property
+    def spectrum(self) -> spectrum.AsyncSpectrumResourceWithRawResponse:
+        from .resources.spectrum import AsyncSpectrumResourceWithRawResponse
+
+        return AsyncSpectrumResourceWithRawResponse(self._client.spectrum)
+
+    @cached_property
+    def addressing(self) -> addressing.AsyncAddressingResourceWithRawResponse:
+        from .resources.addressing import AsyncAddressingResourceWithRawResponse
+
+        return AsyncAddressingResourceWithRawResponse(self._client.addressing)
+
+    @cached_property
+    def audit_logs(self) -> audit_logs.AsyncAuditLogsResourceWithRawResponse:
+        from .resources.audit_logs import AsyncAuditLogsResourceWithRawResponse
+
+        return AsyncAuditLogsResourceWithRawResponse(self._client.audit_logs)
+
+    @cached_property
+    def billing(self) -> billing.AsyncBillingResourceWithRawResponse:
+        from .resources.billing import AsyncBillingResourceWithRawResponse
+
+        return AsyncBillingResourceWithRawResponse(self._client.billing)
+
+    @cached_property
+    def brand_protection(self) -> brand_protection.AsyncBrandProtectionResourceWithRawResponse:
+        from .resources.brand_protection import AsyncBrandProtectionResourceWithRawResponse
+
+        return AsyncBrandProtectionResourceWithRawResponse(self._client.brand_protection)
+
+    @cached_property
+    def diagnostics(self) -> diagnostics.AsyncDiagnosticsResourceWithRawResponse:
+        from .resources.diagnostics import AsyncDiagnosticsResourceWithRawResponse
+
+        return AsyncDiagnosticsResourceWithRawResponse(self._client.diagnostics)
+
+    @cached_property
+    def images(self) -> images.AsyncImagesResourceWithRawResponse:
+        from .resources.images import AsyncImagesResourceWithRawResponse
+
+        return AsyncImagesResourceWithRawResponse(self._client.images)
+
+    @cached_property
+    def intel(self) -> intel.AsyncIntelResourceWithRawResponse:
+        from .resources.intel import AsyncIntelResourceWithRawResponse
+
+        return AsyncIntelResourceWithRawResponse(self._client.intel)
+
+    @cached_property
+    def magic_transit(self) -> magic_transit.AsyncMagicTransitResourceWithRawResponse:
+        from .resources.magic_transit import AsyncMagicTransitResourceWithRawResponse
+
+        return AsyncMagicTransitResourceWithRawResponse(self._client.magic_transit)
+
+    @cached_property
+    def magic_network_monitoring(self) -> magic_network_monitoring.AsyncMagicNetworkMonitoringResourceWithRawResponse:
+        from .resources.magic_network_monitoring import AsyncMagicNetworkMonitoringResourceWithRawResponse
+
+        return AsyncMagicNetworkMonitoringResourceWithRawResponse(self._client.magic_network_monitoring)
+
+    @cached_property
+    def magic_cloud_networking(self) -> magic_cloud_networking.AsyncMagicCloudNetworkingResourceWithRawResponse:
+        from .resources.magic_cloud_networking import AsyncMagicCloudNetworkingResourceWithRawResponse
+
+        return AsyncMagicCloudNetworkingResourceWithRawResponse(self._client.magic_cloud_networking)
+
+    @cached_property
+    def network_interconnects(self) -> network_interconnects.AsyncNetworkInterconnectsResourceWithRawResponse:
+        from .resources.network_interconnects import AsyncNetworkInterconnectsResourceWithRawResponse
+
+        return AsyncNetworkInterconnectsResourceWithRawResponse(self._client.network_interconnects)
+
+    @cached_property
+    def mtls_certificates(self) -> mtls_certificates.AsyncMTLSCertificatesResourceWithRawResponse:
+        from .resources.mtls_certificates import AsyncMTLSCertificatesResourceWithRawResponse
+
+        return AsyncMTLSCertificatesResourceWithRawResponse(self._client.mtls_certificates)
+
+    @cached_property
+    def pages(self) -> pages.AsyncPagesResourceWithRawResponse:
+        from .resources.pages import AsyncPagesResourceWithRawResponse
+
+        return AsyncPagesResourceWithRawResponse(self._client.pages)
+
+    @cached_property
+    def registrar(self) -> registrar.AsyncRegistrarResourceWithRawResponse:
+        from .resources.registrar import AsyncRegistrarResourceWithRawResponse
+
+        return AsyncRegistrarResourceWithRawResponse(self._client.registrar)
+
+    @cached_property
+    def request_tracers(self) -> request_tracers.AsyncRequestTracersResourceWithRawResponse:
+        from .resources.request_tracers import AsyncRequestTracersResourceWithRawResponse
+
+        return AsyncRequestTracersResourceWithRawResponse(self._client.request_tracers)
+
+    @cached_property
+    def rules(self) -> rules.AsyncRulesResourceWithRawResponse:
+        from .resources.rules import AsyncRulesResourceWithRawResponse
+
+        return AsyncRulesResourceWithRawResponse(self._client.rules)
+
+    @cached_property
+    def stream(self) -> stream.AsyncStreamResourceWithRawResponse:
+        from .resources.stream import AsyncStreamResourceWithRawResponse
+
+        return AsyncStreamResourceWithRawResponse(self._client.stream)
+
+    @cached_property
+    def alerting(self) -> alerting.AsyncAlertingResourceWithRawResponse:
+        from .resources.alerting import AsyncAlertingResourceWithRawResponse
+
+        return AsyncAlertingResourceWithRawResponse(self._client.alerting)
+
+    @cached_property
+    def d1(self) -> d1.AsyncD1ResourceWithRawResponse:
+        from .resources.d1 import AsyncD1ResourceWithRawResponse
+
+        return AsyncD1ResourceWithRawResponse(self._client.d1)
+
+    @cached_property
+    def r2(self) -> r2.AsyncR2ResourceWithRawResponse:
+        from .resources.r2 import AsyncR2ResourceWithRawResponse
+
+        return AsyncR2ResourceWithRawResponse(self._client.r2)
+
+    @cached_property
+    def r2_data_catalog(self) -> r2_data_catalog.AsyncR2DataCatalogResourceWithRawResponse:
+        from .resources.r2_data_catalog import AsyncR2DataCatalogResourceWithRawResponse
+
+        return AsyncR2DataCatalogResourceWithRawResponse(self._client.r2_data_catalog)
+
+    @cached_property
+    def workers_for_platforms(self) -> workers_for_platforms.AsyncWorkersForPlatformsResourceWithRawResponse:
+        from .resources.workers_for_platforms import AsyncWorkersForPlatformsResourceWithRawResponse
+
+        return AsyncWorkersForPlatformsResourceWithRawResponse(self._client.workers_for_platforms)
+
+    @cached_property
+    def zero_trust(self) -> zero_trust.AsyncZeroTrustResourceWithRawResponse:
+        from .resources.zero_trust import AsyncZeroTrustResourceWithRawResponse
+
+        return AsyncZeroTrustResourceWithRawResponse(self._client.zero_trust)
+
+    @cached_property
+    def turnstile(self) -> turnstile.AsyncTurnstileResourceWithRawResponse:
+        from .resources.turnstile import AsyncTurnstileResourceWithRawResponse
+
+        return AsyncTurnstileResourceWithRawResponse(self._client.turnstile)
+
+    @cached_property
+    def connectivity(self) -> connectivity.AsyncConnectivityResourceWithRawResponse:
+        from .resources.connectivity import AsyncConnectivityResourceWithRawResponse
+
+        return AsyncConnectivityResourceWithRawResponse(self._client.connectivity)
+
+    @cached_property
+    def hyperdrive(self) -> hyperdrive.AsyncHyperdriveResourceWithRawResponse:
+        from .resources.hyperdrive import AsyncHyperdriveResourceWithRawResponse
+
+        return AsyncHyperdriveResourceWithRawResponse(self._client.hyperdrive)
+
+    @cached_property
+    def rum(self) -> rum.AsyncRUMResourceWithRawResponse:
+        from .resources.rum import AsyncRUMResourceWithRawResponse
+
+        return AsyncRUMResourceWithRawResponse(self._client.rum)
+
+    @cached_property
+    def vectorize(self) -> vectorize.AsyncVectorizeResourceWithRawResponse:
+        from .resources.vectorize import AsyncVectorizeResourceWithRawResponse
+
+        return AsyncVectorizeResourceWithRawResponse(self._client.vectorize)
+
+    @cached_property
+    def url_scanner(self) -> url_scanner.AsyncURLScannerResourceWithRawResponse:
+        from .resources.url_scanner import AsyncURLScannerResourceWithRawResponse
+
+        return AsyncURLScannerResourceWithRawResponse(self._client.url_scanner)
+
+    @cached_property
+    def radar(self) -> radar.AsyncRadarResourceWithRawResponse:
+        from .resources.radar import AsyncRadarResourceWithRawResponse
+
+        return AsyncRadarResourceWithRawResponse(self._client.radar)
+
+    @cached_property
+    def bot_management(self) -> bot_management.AsyncBotManagementResourceWithRawResponse:
+        from .resources.bot_management import AsyncBotManagementResourceWithRawResponse
+
+        return AsyncBotManagementResourceWithRawResponse(self._client.bot_management)
+
+    @cached_property
+    def fraud(self) -> fraud.AsyncFraudResourceWithRawResponse:
+        from .resources.fraud import AsyncFraudResourceWithRawResponse
+
+        return AsyncFraudResourceWithRawResponse(self._client.fraud)
+
+    @cached_property
+    def origin_post_quantum_encryption(
+        self,
+    ) -> origin_post_quantum_encryption.AsyncOriginPostQuantumEncryptionResourceWithRawResponse:
+        from .resources.origin_post_quantum_encryption import AsyncOriginPostQuantumEncryptionResourceWithRawResponse
+
+        return AsyncOriginPostQuantumEncryptionResourceWithRawResponse(self._client.origin_post_quantum_encryption)
+
+    @cached_property
+    def zaraz(self) -> zaraz.AsyncZarazResourceWithRawResponse:
+        from .resources.zaraz import AsyncZarazResourceWithRawResponse
+
+        return AsyncZarazResourceWithRawResponse(self._client.zaraz)
+
+    @cached_property
+    def speed(self) -> speed.AsyncSpeedResourceWithRawResponse:
+        from .resources.speed import AsyncSpeedResourceWithRawResponse
+
+        return AsyncSpeedResourceWithRawResponse(self._client.speed)
+
+    @cached_property
+    def dcv_delegation(self) -> dcv_delegation.AsyncDCVDelegationResourceWithRawResponse:
+        from .resources.dcv_delegation import AsyncDCVDelegationResourceWithRawResponse
+
+        return AsyncDCVDelegationResourceWithRawResponse(self._client.dcv_delegation)
+
+    @cached_property
+    def hostnames(self) -> hostnames.AsyncHostnamesResourceWithRawResponse:
+        from .resources.hostnames import AsyncHostnamesResourceWithRawResponse
+
+        return AsyncHostnamesResourceWithRawResponse(self._client.hostnames)
+
+    @cached_property
+    def snippets(self) -> snippets.AsyncSnippetsResourceWithRawResponse:
+        from .resources.snippets import AsyncSnippetsResourceWithRawResponse
+
+        return AsyncSnippetsResourceWithRawResponse(self._client.snippets)
+
+    @cached_property
+    def realtime_kit(self) -> realtime_kit.AsyncRealtimeKitResourceWithRawResponse:
+        from .resources.realtime_kit import AsyncRealtimeKitResourceWithRawResponse
+
+        return AsyncRealtimeKitResourceWithRawResponse(self._client.realtime_kit)
+
+    @cached_property
+    def calls(self) -> calls.AsyncCallsResourceWithRawResponse:
+        from .resources.calls import AsyncCallsResourceWithRawResponse
+
+        return AsyncCallsResourceWithRawResponse(self._client.calls)
+
+    @cached_property
+    def cloudforce_one(self) -> cloudforce_one.AsyncCloudforceOneResourceWithRawResponse:
+        from .resources.cloudforce_one import AsyncCloudforceOneResourceWithRawResponse
+
+        return AsyncCloudforceOneResourceWithRawResponse(self._client.cloudforce_one)
+
+    @cached_property
+    def ai_gateway(self) -> ai_gateway.AsyncAIGatewayResourceWithRawResponse:
+        from .resources.ai_gateway import AsyncAIGatewayResourceWithRawResponse
+
+        return AsyncAIGatewayResourceWithRawResponse(self._client.ai_gateway)
+
+    @cached_property
+    def iam(self) -> iam.AsyncIAMResourceWithRawResponse:
+        from .resources.iam import AsyncIAMResourceWithRawResponse
+
+        return AsyncIAMResourceWithRawResponse(self._client.iam)
+
+    @cached_property
+    def cloud_connector(self) -> cloud_connector.AsyncCloudConnectorResourceWithRawResponse:
+        from .resources.cloud_connector import AsyncCloudConnectorResourceWithRawResponse
+
+        return AsyncCloudConnectorResourceWithRawResponse(self._client.cloud_connector)
+
+    @cached_property
+    def botnet_feed(self) -> botnet_feed.AsyncBotnetFeedResourceWithRawResponse:
+        from .resources.botnet_feed import AsyncBotnetFeedResourceWithRawResponse
+
+        return AsyncBotnetFeedResourceWithRawResponse(self._client.botnet_feed)
+
+    @cached_property
+    def security_txt(self) -> security_txt.AsyncSecurityTXTResourceWithRawResponse:
+        from .resources.security_txt import AsyncSecurityTXTResourceWithRawResponse
+
+        return AsyncSecurityTXTResourceWithRawResponse(self._client.security_txt)
+
+    @cached_property
+    def workflows(self) -> workflows.AsyncWorkflowsResourceWithRawResponse:
+        from .resources.workflows import AsyncWorkflowsResourceWithRawResponse
+
+        return AsyncWorkflowsResourceWithRawResponse(self._client.workflows)
+
+    @cached_property
+    def resource_sharing(self) -> resource_sharing.AsyncResourceSharingResourceWithRawResponse:
+        from .resources.resource_sharing import AsyncResourceSharingResourceWithRawResponse
+
+        return AsyncResourceSharingResourceWithRawResponse(self._client.resource_sharing)
+
+    @cached_property
+    def leaked_credential_checks(self) -> leaked_credential_checks.AsyncLeakedCredentialChecksResourceWithRawResponse:
+        from .resources.leaked_credential_checks import AsyncLeakedCredentialChecksResourceWithRawResponse
+
+        return AsyncLeakedCredentialChecksResourceWithRawResponse(self._client.leaked_credential_checks)
+
+    @cached_property
+    def content_scanning(self) -> content_scanning.AsyncContentScanningResourceWithRawResponse:
+        from .resources.content_scanning import AsyncContentScanningResourceWithRawResponse
+
+        return AsyncContentScanningResourceWithRawResponse(self._client.content_scanning)
+
+    @cached_property
+    def abuse_reports(self) -> abuse_reports.AsyncAbuseReportsResourceWithRawResponse:
+        from .resources.abuse_reports import AsyncAbuseReportsResourceWithRawResponse
+
+        return AsyncAbuseReportsResourceWithRawResponse(self._client.abuse_reports)
+
+    @cached_property
+    def ai(self) -> ai.AsyncAIResourceWithRawResponse:
+        from .resources.ai import AsyncAIResourceWithRawResponse
+
+        return AsyncAIResourceWithRawResponse(self._client.ai)
+
+    @cached_property
+    def aisearch(self) -> aisearch.AsyncAISearchResourceWithRawResponse:
+        from .resources.aisearch import AsyncAISearchResourceWithRawResponse
+
+        return AsyncAISearchResourceWithRawResponse(self._client.aisearch)
+
+    @cached_property
+    def security_center(self) -> security_center.AsyncSecurityCenterResourceWithRawResponse:
+        from .resources.security_center import AsyncSecurityCenterResourceWithRawResponse
+
+        return AsyncSecurityCenterResourceWithRawResponse(self._client.security_center)
+
+    @cached_property
+    def browser_rendering(self) -> browser_rendering.AsyncBrowserRenderingResourceWithRawResponse:
+        from .resources.browser_rendering import AsyncBrowserRenderingResourceWithRawResponse
+
+        return AsyncBrowserRenderingResourceWithRawResponse(self._client.browser_rendering)
+
+    @cached_property
+    def custom_pages(self) -> custom_pages.AsyncCustomPagesResourceWithRawResponse:
+        from .resources.custom_pages import AsyncCustomPagesResourceWithRawResponse
+
+        return AsyncCustomPagesResourceWithRawResponse(self._client.custom_pages)
+
+    @cached_property
+    def secrets_store(self) -> secrets_store.AsyncSecretsStoreResourceWithRawResponse:
+        from .resources.secrets_store import AsyncSecretsStoreResourceWithRawResponse
+
+        return AsyncSecretsStoreResourceWithRawResponse(self._client.secrets_store)
+
+    @cached_property
+    def pipelines(self) -> pipelines.AsyncPipelinesResourceWithRawResponse:
+        from .resources.pipelines import AsyncPipelinesResourceWithRawResponse
+
+        return AsyncPipelinesResourceWithRawResponse(self._client.pipelines)
+
+    @cached_property
+    def schema_validation(self) -> schema_validation.AsyncSchemaValidationResourceWithRawResponse:
+        from .resources.schema_validation import AsyncSchemaValidationResourceWithRawResponse
+
+        return AsyncSchemaValidationResourceWithRawResponse(self._client.schema_validation)
+
+    @cached_property
+    def token_validation(self) -> token_validation.AsyncTokenValidationResourceWithRawResponse:
+        from .resources.token_validation import AsyncTokenValidationResourceWithRawResponse
+
+        return AsyncTokenValidationResourceWithRawResponse(self._client.token_validation)
+
+
+class CloudflareWithStreamedResponse:
+    _client: Cloudflare
+
+    def __init__(self, client: Cloudflare) -> None:
+        self._client = client
+
+    @cached_property
+    def accounts(self) -> accounts.AccountsResourceWithStreamingResponse:
+        from .resources.accounts import AccountsResourceWithStreamingResponse
+
+        return AccountsResourceWithStreamingResponse(self._client.accounts)
+
+    @cached_property
+    def organizations(self) -> organizations.OrganizationsResourceWithStreamingResponse:
+        from .resources.organizations import OrganizationsResourceWithStreamingResponse
+
+        return OrganizationsResourceWithStreamingResponse(self._client.organizations)
+
+    @cached_property
+    def origin_ca_certificates(self) -> origin_ca_certificates.OriginCACertificatesResourceWithStreamingResponse:
+        from .resources.origin_ca_certificates import OriginCACertificatesResourceWithStreamingResponse
+
+        return OriginCACertificatesResourceWithStreamingResponse(self._client.origin_ca_certificates)
+
+    @cached_property
+    def ips(self) -> ips.IPsResourceWithStreamingResponse:
+        from .resources.ips import IPsResourceWithStreamingResponse
+
+        return IPsResourceWithStreamingResponse(self._client.ips)
+
+    @cached_property
+    def memberships(self) -> memberships.MembershipsResourceWithStreamingResponse:
+        from .resources.memberships import MembershipsResourceWithStreamingResponse
+
+        return MembershipsResourceWithStreamingResponse(self._client.memberships)
+
+    @cached_property
+    def user(self) -> user.UserResourceWithStreamingResponse:
+        from .resources.user import UserResourceWithStreamingResponse
+
+        return UserResourceWithStreamingResponse(self._client.user)
+
+    @cached_property
+    def zones(self) -> zones.ZonesResourceWithStreamingResponse:
+        from .resources.zones import ZonesResourceWithStreamingResponse
+
+        return ZonesResourceWithStreamingResponse(self._client.zones)
+
+    @cached_property
+    def load_balancers(self) -> load_balancers.LoadBalancersResourceWithStreamingResponse:
+        from .resources.load_balancers import LoadBalancersResourceWithStreamingResponse
+
+        return LoadBalancersResourceWithStreamingResponse(self._client.load_balancers)
+
+    @cached_property
+    def cache(self) -> cache.CacheResourceWithStreamingResponse:
+        from .resources.cache import CacheResourceWithStreamingResponse
+
+        return CacheResourceWithStreamingResponse(self._client.cache)
+
+    @cached_property
+    def ssl(self) -> ssl.SSLResourceWithStreamingResponse:
+        from .resources.ssl import SSLResourceWithStreamingResponse
+
+        return SSLResourceWithStreamingResponse(self._client.ssl)
+
+    @cached_property
+    def acm(self) -> acm.ACMResourceWithStreamingResponse:
+        from .resources.acm import ACMResourceWithStreamingResponse
+
+        return ACMResourceWithStreamingResponse(self._client.acm)
+
+    @cached_property
+    def argo(self) -> argo.ArgoResourceWithStreamingResponse:
+        from .resources.argo import ArgoResourceWithStreamingResponse
+
+        return ArgoResourceWithStreamingResponse(self._client.argo)
+
+    @cached_property
+    def certificate_authorities(self) -> certificate_authorities.CertificateAuthoritiesResourceWithStreamingResponse:
+        from .resources.certificate_authorities import CertificateAuthoritiesResourceWithStreamingResponse
+
+        return CertificateAuthoritiesResourceWithStreamingResponse(self._client.certificate_authorities)
+
+    @cached_property
+    def client_certificates(self) -> client_certificates.ClientCertificatesResourceWithStreamingResponse:
+        from .resources.client_certificates import ClientCertificatesResourceWithStreamingResponse
+
+        return ClientCertificatesResourceWithStreamingResponse(self._client.client_certificates)
+
+    @cached_property
+    def custom_certificates(self) -> custom_certificates.CustomCertificatesResourceWithStreamingResponse:
+        from .resources.custom_certificates import CustomCertificatesResourceWithStreamingResponse
+
+        return CustomCertificatesResourceWithStreamingResponse(self._client.custom_certificates)
+
+    @cached_property
+    def custom_hostnames(self) -> custom_hostnames.CustomHostnamesResourceWithStreamingResponse:
+        from .resources.custom_hostnames import CustomHostnamesResourceWithStreamingResponse
+
+        return CustomHostnamesResourceWithStreamingResponse(self._client.custom_hostnames)
+
+    @cached_property
+    def custom_nameservers(self) -> custom_nameservers.CustomNameserversResourceWithStreamingResponse:
+        from .resources.custom_nameservers import CustomNameserversResourceWithStreamingResponse
+
+        return CustomNameserversResourceWithStreamingResponse(self._client.custom_nameservers)
+
+    @cached_property
+    def dns_firewall(self) -> dns_firewall.DNSFirewallResourceWithStreamingResponse:
+        from .resources.dns_firewall import DNSFirewallResourceWithStreamingResponse
+
+        return DNSFirewallResourceWithStreamingResponse(self._client.dns_firewall)
+
+    @cached_property
+    def dns(self) -> dns.DNSResourceWithStreamingResponse:
+        from .resources.dns import DNSResourceWithStreamingResponse
+
+        return DNSResourceWithStreamingResponse(self._client.dns)
+
+    @cached_property
+    def email_security(self) -> email_security.EmailSecurityResourceWithStreamingResponse:
+        from .resources.email_security import EmailSecurityResourceWithStreamingResponse
+
+        return EmailSecurityResourceWithStreamingResponse(self._client.email_security)
+
+    @cached_property
+    def email_routing(self) -> email_routing.EmailRoutingResourceWithStreamingResponse:
+        from .resources.email_routing import EmailRoutingResourceWithStreamingResponse
+
+        return EmailRoutingResourceWithStreamingResponse(self._client.email_routing)
+
+    @cached_property
+    def filters(self) -> filters.FiltersResourceWithStreamingResponse:
+        from .resources.filters import FiltersResourceWithStreamingResponse
+
+        return FiltersResourceWithStreamingResponse(self._client.filters)
+
+    @cached_property
+    def firewall(self) -> firewall.FirewallResourceWithStreamingResponse:
+        from .resources.firewall import FirewallResourceWithStreamingResponse
+
+        return FirewallResourceWithStreamingResponse(self._client.firewall)
+
+    @cached_property
+    def healthchecks(self) -> healthchecks.HealthchecksResourceWithStreamingResponse:
+        from .resources.healthchecks import HealthchecksResourceWithStreamingResponse
+
+        return HealthchecksResourceWithStreamingResponse(self._client.healthchecks)
+
+    @cached_property
+    def keyless_certificates(self) -> keyless_certificates.KeylessCertificatesResourceWithStreamingResponse:
+        from .resources.keyless_certificates import KeylessCertificatesResourceWithStreamingResponse
+
+        return KeylessCertificatesResourceWithStreamingResponse(self._client.keyless_certificates)
+
+    @cached_property
+    def logpush(self) -> logpush.LogpushResourceWithStreamingResponse:
+        from .resources.logpush import LogpushResourceWithStreamingResponse
+
+        return LogpushResourceWithStreamingResponse(self._client.logpush)
+
+    @cached_property
+    def logs(self) -> logs.LogsResourceWithStreamingResponse:
+        from .resources.logs import LogsResourceWithStreamingResponse
+
+        return LogsResourceWithStreamingResponse(self._client.logs)
+
+    @cached_property
+    def origin_tls_client_auth(self) -> origin_tls_client_auth.OriginTLSClientAuthResourceWithStreamingResponse:
+        from .resources.origin_tls_client_auth import OriginTLSClientAuthResourceWithStreamingResponse
+
+        return OriginTLSClientAuthResourceWithStreamingResponse(self._client.origin_tls_client_auth)
+
+    @cached_property
+    def page_rules(self) -> page_rules.PageRulesResourceWithStreamingResponse:
+        from .resources.page_rules import PageRulesResourceWithStreamingResponse
+
+        return PageRulesResourceWithStreamingResponse(self._client.page_rules)
+
+    @cached_property
+    def rate_limits(self) -> rate_limits.RateLimitsResourceWithStreamingResponse:
+        from .resources.rate_limits import RateLimitsResourceWithStreamingResponse
+
+        return RateLimitsResourceWithStreamingResponse(self._client.rate_limits)
+
+    @cached_property
+    def waiting_rooms(self) -> waiting_rooms.WaitingRoomsResourceWithStreamingResponse:
+        from .resources.waiting_rooms import WaitingRoomsResourceWithStreamingResponse
+
+        return WaitingRoomsResourceWithStreamingResponse(self._client.waiting_rooms)
+
+    @cached_property
+    def web3(self) -> web3.Web3ResourceWithStreamingResponse:
+        from .resources.web3 import Web3ResourceWithStreamingResponse
+
+        return Web3ResourceWithStreamingResponse(self._client.web3)
+
+    @cached_property
+    def workers(self) -> workers.WorkersResourceWithStreamingResponse:
+        from .resources.workers import WorkersResourceWithStreamingResponse
+
+        return WorkersResourceWithStreamingResponse(self._client.workers)
+
+    @cached_property
+    def kv(self) -> kv.KVResourceWithStreamingResponse:
+        from .resources.kv import KVResourceWithStreamingResponse
+
+        return KVResourceWithStreamingResponse(self._client.kv)
+
+    @cached_property
+    def durable_objects(self) -> durable_objects.DurableObjectsResourceWithStreamingResponse:
+        from .resources.durable_objects import DurableObjectsResourceWithStreamingResponse
+
+        return DurableObjectsResourceWithStreamingResponse(self._client.durable_objects)
+
+    @cached_property
+    def queues(self) -> queues.QueuesResourceWithStreamingResponse:
+        from .resources.queues import QueuesResourceWithStreamingResponse
+
+        return QueuesResourceWithStreamingResponse(self._client.queues)
+
+    @cached_property
+    def api_gateway(self) -> api_gateway.APIGatewayResourceWithStreamingResponse:
+        from .resources.api_gateway import APIGatewayResourceWithStreamingResponse
+
+        return APIGatewayResourceWithStreamingResponse(self._client.api_gateway)
+
+    @cached_property
+    def managed_transforms(self) -> managed_transforms.ManagedTransformsResourceWithStreamingResponse:
+        from .resources.managed_transforms import ManagedTransformsResourceWithStreamingResponse
+
+        return ManagedTransformsResourceWithStreamingResponse(self._client.managed_transforms)
+
+    @cached_property
+    def page_shield(self) -> page_shield.PageShieldResourceWithStreamingResponse:
+        from .resources.page_shield import PageShieldResourceWithStreamingResponse
+
+        return PageShieldResourceWithStreamingResponse(self._client.page_shield)
+
+    @cached_property
+    def rulesets(self) -> rulesets.RulesetsResourceWithStreamingResponse:
+        from .resources.rulesets import RulesetsResourceWithStreamingResponse
+
+        return RulesetsResourceWithStreamingResponse(self._client.rulesets)
+
+    @cached_property
+    def url_normalization(self) -> url_normalization.URLNormalizationResourceWithStreamingResponse:
+        from .resources.url_normalization import URLNormalizationResourceWithStreamingResponse
+
+        return URLNormalizationResourceWithStreamingResponse(self._client.url_normalization)
+
+    @cached_property
+    def spectrum(self) -> spectrum.SpectrumResourceWithStreamingResponse:
+        from .resources.spectrum import SpectrumResourceWithStreamingResponse
+
+        return SpectrumResourceWithStreamingResponse(self._client.spectrum)
+
+    @cached_property
+    def addressing(self) -> addressing.AddressingResourceWithStreamingResponse:
+        from .resources.addressing import AddressingResourceWithStreamingResponse
+
+        return AddressingResourceWithStreamingResponse(self._client.addressing)
+
+    @cached_property
+    def audit_logs(self) -> audit_logs.AuditLogsResourceWithStreamingResponse:
+        from .resources.audit_logs import AuditLogsResourceWithStreamingResponse
+
+        return AuditLogsResourceWithStreamingResponse(self._client.audit_logs)
+
+    @cached_property
+    def billing(self) -> billing.BillingResourceWithStreamingResponse:
+        from .resources.billing import BillingResourceWithStreamingResponse
+
+        return BillingResourceWithStreamingResponse(self._client.billing)
+
+    @cached_property
+    def brand_protection(self) -> brand_protection.BrandProtectionResourceWithStreamingResponse:
+        from .resources.brand_protection import BrandProtectionResourceWithStreamingResponse
+
+        return BrandProtectionResourceWithStreamingResponse(self._client.brand_protection)
+
+    @cached_property
+    def diagnostics(self) -> diagnostics.DiagnosticsResourceWithStreamingResponse:
+        from .resources.diagnostics import DiagnosticsResourceWithStreamingResponse
+
+        return DiagnosticsResourceWithStreamingResponse(self._client.diagnostics)
+
+    @cached_property
+    def images(self) -> images.ImagesResourceWithStreamingResponse:
+        from .resources.images import ImagesResourceWithStreamingResponse
+
+        return ImagesResourceWithStreamingResponse(self._client.images)
+
+    @cached_property
+    def intel(self) -> intel.IntelResourceWithStreamingResponse:
+        from .resources.intel import IntelResourceWithStreamingResponse
+
+        return IntelResourceWithStreamingResponse(self._client.intel)
+
+    @cached_property
+    def magic_transit(self) -> magic_transit.MagicTransitResourceWithStreamingResponse:
+        from .resources.magic_transit import MagicTransitResourceWithStreamingResponse
+
+        return MagicTransitResourceWithStreamingResponse(self._client.magic_transit)
+
+    @cached_property
+    def magic_network_monitoring(self) -> magic_network_monitoring.MagicNetworkMonitoringResourceWithStreamingResponse:
+        from .resources.magic_network_monitoring import MagicNetworkMonitoringResourceWithStreamingResponse
+
+        return MagicNetworkMonitoringResourceWithStreamingResponse(self._client.magic_network_monitoring)
+
+    @cached_property
+    def magic_cloud_networking(self) -> magic_cloud_networking.MagicCloudNetworkingResourceWithStreamingResponse:
+        from .resources.magic_cloud_networking import MagicCloudNetworkingResourceWithStreamingResponse
+
+        return MagicCloudNetworkingResourceWithStreamingResponse(self._client.magic_cloud_networking)
+
+    @cached_property
+    def network_interconnects(self) -> network_interconnects.NetworkInterconnectsResourceWithStreamingResponse:
+        from .resources.network_interconnects import NetworkInterconnectsResourceWithStreamingResponse
+
+        return NetworkInterconnectsResourceWithStreamingResponse(self._client.network_interconnects)
+
+    @cached_property
+    def mtls_certificates(self) -> mtls_certificates.MTLSCertificatesResourceWithStreamingResponse:
+        from .resources.mtls_certificates import MTLSCertificatesResourceWithStreamingResponse
+
+        return MTLSCertificatesResourceWithStreamingResponse(self._client.mtls_certificates)
+
+    @cached_property
+    def pages(self) -> pages.PagesResourceWithStreamingResponse:
+        from .resources.pages import PagesResourceWithStreamingResponse
+
+        return PagesResourceWithStreamingResponse(self._client.pages)
+
+    @cached_property
+    def registrar(self) -> registrar.RegistrarResourceWithStreamingResponse:
+        from .resources.registrar import RegistrarResourceWithStreamingResponse
+
+        return RegistrarResourceWithStreamingResponse(self._client.registrar)
+
+    @cached_property
+    def request_tracers(self) -> request_tracers.RequestTracersResourceWithStreamingResponse:
+        from .resources.request_tracers import RequestTracersResourceWithStreamingResponse
+
+        return RequestTracersResourceWithStreamingResponse(self._client.request_tracers)
+
+    @cached_property
+    def rules(self) -> rules.RulesResourceWithStreamingResponse:
+        from .resources.rules import RulesResourceWithStreamingResponse
+
+        return RulesResourceWithStreamingResponse(self._client.rules)
+
+    @cached_property
+    def stream(self) -> stream.StreamResourceWithStreamingResponse:
+        from .resources.stream import StreamResourceWithStreamingResponse
+
+        return StreamResourceWithStreamingResponse(self._client.stream)
+
+    @cached_property
+    def alerting(self) -> alerting.AlertingResourceWithStreamingResponse:
+        from .resources.alerting import AlertingResourceWithStreamingResponse
+
+        return AlertingResourceWithStreamingResponse(self._client.alerting)
+
+    @cached_property
+    def d1(self) -> d1.D1ResourceWithStreamingResponse:
+        from .resources.d1 import D1ResourceWithStreamingResponse
+
+        return D1ResourceWithStreamingResponse(self._client.d1)
+
+    @cached_property
+    def r2(self) -> r2.R2ResourceWithStreamingResponse:
+        from .resources.r2 import R2ResourceWithStreamingResponse
+
+        return R2ResourceWithStreamingResponse(self._client.r2)
+
+    @cached_property
+    def r2_data_catalog(self) -> r2_data_catalog.R2DataCatalogResourceWithStreamingResponse:
+        from .resources.r2_data_catalog import R2DataCatalogResourceWithStreamingResponse
+
+        return R2DataCatalogResourceWithStreamingResponse(self._client.r2_data_catalog)
+
+    @cached_property
+    def workers_for_platforms(self) -> workers_for_platforms.WorkersForPlatformsResourceWithStreamingResponse:
+        from .resources.workers_for_platforms import WorkersForPlatformsResourceWithStreamingResponse
+
+        return WorkersForPlatformsResourceWithStreamingResponse(self._client.workers_for_platforms)
+
+    @cached_property
+    def zero_trust(self) -> zero_trust.ZeroTrustResourceWithStreamingResponse:
+        from .resources.zero_trust import ZeroTrustResourceWithStreamingResponse
+
+        return ZeroTrustResourceWithStreamingResponse(self._client.zero_trust)
+
+    @cached_property
+    def turnstile(self) -> turnstile.TurnstileResourceWithStreamingResponse:
+        from .resources.turnstile import TurnstileResourceWithStreamingResponse
+
+        return TurnstileResourceWithStreamingResponse(self._client.turnstile)
+
+    @cached_property
+    def connectivity(self) -> connectivity.ConnectivityResourceWithStreamingResponse:
+        from .resources.connectivity import ConnectivityResourceWithStreamingResponse
+
+        return ConnectivityResourceWithStreamingResponse(self._client.connectivity)
+
+    @cached_property
+    def hyperdrive(self) -> hyperdrive.HyperdriveResourceWithStreamingResponse:
+        from .resources.hyperdrive import HyperdriveResourceWithStreamingResponse
+
+        return HyperdriveResourceWithStreamingResponse(self._client.hyperdrive)
+
+    @cached_property
+    def rum(self) -> rum.RUMResourceWithStreamingResponse:
+        from .resources.rum import RUMResourceWithStreamingResponse
+
+        return RUMResourceWithStreamingResponse(self._client.rum)
+
+    @cached_property
+    def vectorize(self) -> vectorize.VectorizeResourceWithStreamingResponse:
+        from .resources.vectorize import VectorizeResourceWithStreamingResponse
+
+        return VectorizeResourceWithStreamingResponse(self._client.vectorize)
+
+    @cached_property
+    def url_scanner(self) -> url_scanner.URLScannerResourceWithStreamingResponse:
+        from .resources.url_scanner import URLScannerResourceWithStreamingResponse
+
+        return URLScannerResourceWithStreamingResponse(self._client.url_scanner)
+
+    @cached_property
+    def radar(self) -> radar.RadarResourceWithStreamingResponse:
+        from .resources.radar import RadarResourceWithStreamingResponse
+
+        return RadarResourceWithStreamingResponse(self._client.radar)
+
+    @cached_property
+    def bot_management(self) -> bot_management.BotManagementResourceWithStreamingResponse:
+        from .resources.bot_management import BotManagementResourceWithStreamingResponse
+
+        return BotManagementResourceWithStreamingResponse(self._client.bot_management)
+
+    @cached_property
+    def fraud(self) -> fraud.FraudResourceWithStreamingResponse:
+        from .resources.fraud import FraudResourceWithStreamingResponse
+
+        return FraudResourceWithStreamingResponse(self._client.fraud)
+
+    @cached_property
+    def origin_post_quantum_encryption(
+        self,
+    ) -> origin_post_quantum_encryption.OriginPostQuantumEncryptionResourceWithStreamingResponse:
+        from .resources.origin_post_quantum_encryption import OriginPostQuantumEncryptionResourceWithStreamingResponse
+
+        return OriginPostQuantumEncryptionResourceWithStreamingResponse(self._client.origin_post_quantum_encryption)
+
+    @cached_property
+    def zaraz(self) -> zaraz.ZarazResourceWithStreamingResponse:
+        from .resources.zaraz import ZarazResourceWithStreamingResponse
+
+        return ZarazResourceWithStreamingResponse(self._client.zaraz)
+
+    @cached_property
+    def speed(self) -> speed.SpeedResourceWithStreamingResponse:
+        from .resources.speed import SpeedResourceWithStreamingResponse
+
+        return SpeedResourceWithStreamingResponse(self._client.speed)
+
+    @cached_property
+    def dcv_delegation(self) -> dcv_delegation.DCVDelegationResourceWithStreamingResponse:
+        from .resources.dcv_delegation import DCVDelegationResourceWithStreamingResponse
+
+        return DCVDelegationResourceWithStreamingResponse(self._client.dcv_delegation)
+
+    @cached_property
+    def hostnames(self) -> hostnames.HostnamesResourceWithStreamingResponse:
+        from .resources.hostnames import HostnamesResourceWithStreamingResponse
+
+        return HostnamesResourceWithStreamingResponse(self._client.hostnames)
+
+    @cached_property
+    def snippets(self) -> snippets.SnippetsResourceWithStreamingResponse:
+        from .resources.snippets import SnippetsResourceWithStreamingResponse
+
+        return SnippetsResourceWithStreamingResponse(self._client.snippets)
+
+    @cached_property
+    def realtime_kit(self) -> realtime_kit.RealtimeKitResourceWithStreamingResponse:
+        from .resources.realtime_kit import RealtimeKitResourceWithStreamingResponse
+
+        return RealtimeKitResourceWithStreamingResponse(self._client.realtime_kit)
+
+    @cached_property
+    def calls(self) -> calls.CallsResourceWithStreamingResponse:
+        from .resources.calls import CallsResourceWithStreamingResponse
+
+        return CallsResourceWithStreamingResponse(self._client.calls)
+
+    @cached_property
+    def cloudforce_one(self) -> cloudforce_one.CloudforceOneResourceWithStreamingResponse:
+        from .resources.cloudforce_one import CloudforceOneResourceWithStreamingResponse
+
+        return CloudforceOneResourceWithStreamingResponse(self._client.cloudforce_one)
+
+    @cached_property
+    def ai_gateway(self) -> ai_gateway.AIGatewayResourceWithStreamingResponse:
+        from .resources.ai_gateway import AIGatewayResourceWithStreamingResponse
+
+        return AIGatewayResourceWithStreamingResponse(self._client.ai_gateway)
+
+    @cached_property
+    def iam(self) -> iam.IAMResourceWithStreamingResponse:
+        from .resources.iam import IAMResourceWithStreamingResponse
+
+        return IAMResourceWithStreamingResponse(self._client.iam)
+
+    @cached_property
+    def cloud_connector(self) -> cloud_connector.CloudConnectorResourceWithStreamingResponse:
+        from .resources.cloud_connector import CloudConnectorResourceWithStreamingResponse
+
+        return CloudConnectorResourceWithStreamingResponse(self._client.cloud_connector)
+
+    @cached_property
+    def botnet_feed(self) -> botnet_feed.BotnetFeedResourceWithStreamingResponse:
+        from .resources.botnet_feed import BotnetFeedResourceWithStreamingResponse
 
+        return BotnetFeedResourceWithStreamingResponse(self._client.botnet_feed)
 
-class CloudflareWithStreamedResponse:
-    def __init__(self, client: Cloudflare) -> None:
-        self.accounts = resources.AccountsResourceWithStreamingResponse(client.accounts)
-        self.origin_ca_certificates = resources.OriginCACertificatesResourceWithStreamingResponse(
-            client.origin_ca_certificates
-        )
-        self.ips = resources.IPsResourceWithStreamingResponse(client.ips)
-        self.memberships = resources.MembershipsResourceWithStreamingResponse(client.memberships)
-        self.user = resources.UserResourceWithStreamingResponse(client.user)
-        self.zones = resources.ZonesResourceWithStreamingResponse(client.zones)
-        self.load_balancers = resources.LoadBalancersResourceWithStreamingResponse(client.load_balancers)
-        self.cache = resources.CacheResourceWithStreamingResponse(client.cache)
-        self.ssl = resources.SSLResourceWithStreamingResponse(client.ssl)
-        self.subscriptions = resources.SubscriptionsResourceWithStreamingResponse(client.subscriptions)
-        self.acm = resources.ACMResourceWithStreamingResponse(client.acm)
-        self.argo = resources.ArgoResourceWithStreamingResponse(client.argo)
-        self.plans = resources.PlansResourceWithStreamingResponse(client.plans)
-        self.rate_plans = resources.RatePlansResourceWithStreamingResponse(client.rate_plans)
-        self.certificate_authorities = resources.CertificateAuthoritiesResourceWithStreamingResponse(
-            client.certificate_authorities
-        )
-        self.client_certificates = resources.ClientCertificatesResourceWithStreamingResponse(client.client_certificates)
-        self.custom_certificates = resources.CustomCertificatesResourceWithStreamingResponse(client.custom_certificates)
-        self.custom_hostnames = resources.CustomHostnamesResourceWithStreamingResponse(client.custom_hostnames)
-        self.custom_nameservers = resources.CustomNameserversResourceWithStreamingResponse(client.custom_nameservers)
-        self.dns = resources.DNSResourceWithStreamingResponse(client.dns)
-        self.dnssec = resources.DNSSECResourceWithStreamingResponse(client.dnssec)
-        self.email_routing = resources.EmailRoutingResourceWithStreamingResponse(client.email_routing)
-        self.filters = resources.FiltersResourceWithStreamingResponse(client.filters)
-        self.firewall = resources.FirewallResourceWithStreamingResponse(client.firewall)
-        self.healthchecks = resources.HealthchecksResourceWithStreamingResponse(client.healthchecks)
-        self.keyless_certificates = resources.KeylessCertificatesResourceWithStreamingResponse(
-            client.keyless_certificates
-        )
-        self.logpush = resources.LogpushResourceWithStreamingResponse(client.logpush)
-        self.logs = resources.LogsResourceWithStreamingResponse(client.logs)
-        self.origin_tls_client_auth = resources.OriginTLSClientAuthResourceWithStreamingResponse(
-            client.origin_tls_client_auth
-        )
-        self.pagerules = resources.PagerulesResourceWithStreamingResponse(client.pagerules)
-        self.rate_limits = resources.RateLimitsResourceWithStreamingResponse(client.rate_limits)
-        self.secondary_dns = resources.SecondaryDNSResourceWithStreamingResponse(client.secondary_dns)
-        self.waiting_rooms = resources.WaitingRoomsResourceWithStreamingResponse(client.waiting_rooms)
-        self.web3 = resources.Web3ResourceWithStreamingResponse(client.web3)
-        self.workers = resources.WorkersResourceWithStreamingResponse(client.workers)
-        self.kv = resources.KVResourceWithStreamingResponse(client.kv)
-        self.durable_objects = resources.DurableObjectsResourceWithStreamingResponse(client.durable_objects)
-        self.queues = resources.QueuesResourceWithStreamingResponse(client.queues)
-        self.api_gateway = resources.APIGatewayResourceWithStreamingResponse(client.api_gateway)
-        self.managed_headers = resources.ManagedHeadersResourceWithStreamingResponse(client.managed_headers)
-        self.page_shield = resources.PageShieldResourceWithStreamingResponse(client.page_shield)
-        self.rulesets = resources.RulesetsResourceWithStreamingResponse(client.rulesets)
-        self.url_normalization = resources.URLNormalizationResourceWithStreamingResponse(client.url_normalization)
-        self.spectrum = resources.SpectrumResourceWithStreamingResponse(client.spectrum)
-        self.addressing = resources.AddressingResourceWithStreamingResponse(client.addressing)
-        self.audit_logs = resources.AuditLogsResourceWithStreamingResponse(client.audit_logs)
-        self.billing = resources.BillingResourceWithStreamingResponse(client.billing)
-        self.brand_protection = resources.BrandProtectionResourceWithStreamingResponse(client.brand_protection)
-        self.diagnostics = resources.DiagnosticsResourceWithStreamingResponse(client.diagnostics)
-        self.images = resources.ImagesResourceWithStreamingResponse(client.images)
-        self.intel = resources.IntelResourceWithStreamingResponse(client.intel)
-        self.magic_transit = resources.MagicTransitResourceWithStreamingResponse(client.magic_transit)
-        self.magic_network_monitoring = resources.MagicNetworkMonitoringResourceWithStreamingResponse(
-            client.magic_network_monitoring
-        )
-        self.mtls_certificates = resources.MTLSCertificatesResourceWithStreamingResponse(client.mtls_certificates)
-        self.pages = resources.PagesResourceWithStreamingResponse(client.pages)
-        self.pcaps = resources.PCAPsResourceWithStreamingResponse(client.pcaps)
-        self.registrar = resources.RegistrarResourceWithStreamingResponse(client.registrar)
-        self.request_tracers = resources.RequestTracersResourceWithStreamingResponse(client.request_tracers)
-        self.rules = resources.RulesResourceWithStreamingResponse(client.rules)
-        self.storage = resources.StorageResourceWithStreamingResponse(client.storage)
-        self.stream = resources.StreamResourceWithStreamingResponse(client.stream)
-        self.alerting = resources.AlertingResourceWithStreamingResponse(client.alerting)
-        self.d1 = resources.D1ResourceWithStreamingResponse(client.d1)
-        self.r2 = resources.R2ResourceWithStreamingResponse(client.r2)
-        self.warp_connector = resources.WARPConnectorResourceWithStreamingResponse(client.warp_connector)
-        self.workers_for_platforms = resources.WorkersForPlatformsResourceWithStreamingResponse(
-            client.workers_for_platforms
-        )
-        self.zero_trust = resources.ZeroTrustResourceWithStreamingResponse(client.zero_trust)
-        self.challenges = resources.ChallengesResourceWithStreamingResponse(client.challenges)
-        self.hyperdrive = resources.HyperdriveResourceWithStreamingResponse(client.hyperdrive)
-        self.rum = resources.RUMResourceWithStreamingResponse(client.rum)
-        self.vectorize = resources.VectorizeResourceWithStreamingResponse(client.vectorize)
-        self.url_scanner = resources.URLScannerResourceWithStreamingResponse(client.url_scanner)
-        self.radar = resources.RadarResourceWithStreamingResponse(client.radar)
-        self.bot_management = resources.BotManagementResourceWithStreamingResponse(client.bot_management)
-        self.origin_post_quantum_encryption = resources.OriginPostQuantumEncryptionResourceWithStreamingResponse(
-            client.origin_post_quantum_encryption
-        )
-        self.speed = resources.SpeedResourceWithStreamingResponse(client.speed)
-        self.dcv_delegation = resources.DCVDelegationResourceWithStreamingResponse(client.dcv_delegation)
-        self.hostnames = resources.HostnamesResourceWithStreamingResponse(client.hostnames)
-        self.snippets = resources.SnippetsResourceWithStreamingResponse(client.snippets)
-        self.calls = resources.CallsResourceWithStreamingResponse(client.calls)
-        self.cloudforce_one = resources.CloudforceOneResourceWithStreamingResponse(client.cloudforce_one)
-        self.event_notifications = resources.EventNotificationsResourceWithStreamingResponse(client.event_notifications)
-        self.ai_gateway = resources.AIGatewayResourceWithStreamingResponse(client.ai_gateway)
-        self.iam = resources.IAMResourceWithStreamingResponse(client.iam)
-        self.cloud_connector = resources.CloudConnectorResourceWithStreamingResponse(client.cloud_connector)
+    @cached_property
+    def security_txt(self) -> security_txt.SecurityTXTResourceWithStreamingResponse:
+        from .resources.security_txt import SecurityTXTResourceWithStreamingResponse
+
+        return SecurityTXTResourceWithStreamingResponse(self._client.security_txt)
+
+    @cached_property
+    def workflows(self) -> workflows.WorkflowsResourceWithStreamingResponse:
+        from .resources.workflows import WorkflowsResourceWithStreamingResponse
+
+        return WorkflowsResourceWithStreamingResponse(self._client.workflows)
+
+    @cached_property
+    def resource_sharing(self) -> resource_sharing.ResourceSharingResourceWithStreamingResponse:
+        from .resources.resource_sharing import ResourceSharingResourceWithStreamingResponse
+
+        return ResourceSharingResourceWithStreamingResponse(self._client.resource_sharing)
+
+    @cached_property
+    def leaked_credential_checks(self) -> leaked_credential_checks.LeakedCredentialChecksResourceWithStreamingResponse:
+        from .resources.leaked_credential_checks import LeakedCredentialChecksResourceWithStreamingResponse
+
+        return LeakedCredentialChecksResourceWithStreamingResponse(self._client.leaked_credential_checks)
+
+    @cached_property
+    def content_scanning(self) -> content_scanning.ContentScanningResourceWithStreamingResponse:
+        from .resources.content_scanning import ContentScanningResourceWithStreamingResponse
+
+        return ContentScanningResourceWithStreamingResponse(self._client.content_scanning)
+
+    @cached_property
+    def abuse_reports(self) -> abuse_reports.AbuseReportsResourceWithStreamingResponse:
+        from .resources.abuse_reports import AbuseReportsResourceWithStreamingResponse
+
+        return AbuseReportsResourceWithStreamingResponse(self._client.abuse_reports)
+
+    @cached_property
+    def ai(self) -> ai.AIResourceWithStreamingResponse:
+        from .resources.ai import AIResourceWithStreamingResponse
+
+        return AIResourceWithStreamingResponse(self._client.ai)
+
+    @cached_property
+    def aisearch(self) -> aisearch.AISearchResourceWithStreamingResponse:
+        from .resources.aisearch import AISearchResourceWithStreamingResponse
+
+        return AISearchResourceWithStreamingResponse(self._client.aisearch)
+
+    @cached_property
+    def security_center(self) -> security_center.SecurityCenterResourceWithStreamingResponse:
+        from .resources.security_center import SecurityCenterResourceWithStreamingResponse
+
+        return SecurityCenterResourceWithStreamingResponse(self._client.security_center)
+
+    @cached_property
+    def browser_rendering(self) -> browser_rendering.BrowserRenderingResourceWithStreamingResponse:
+        from .resources.browser_rendering import BrowserRenderingResourceWithStreamingResponse
+
+        return BrowserRenderingResourceWithStreamingResponse(self._client.browser_rendering)
+
+    @cached_property
+    def custom_pages(self) -> custom_pages.CustomPagesResourceWithStreamingResponse:
+        from .resources.custom_pages import CustomPagesResourceWithStreamingResponse
+
+        return CustomPagesResourceWithStreamingResponse(self._client.custom_pages)
+
+    @cached_property
+    def secrets_store(self) -> secrets_store.SecretsStoreResourceWithStreamingResponse:
+        from .resources.secrets_store import SecretsStoreResourceWithStreamingResponse
+
+        return SecretsStoreResourceWithStreamingResponse(self._client.secrets_store)
+
+    @cached_property
+    def pipelines(self) -> pipelines.PipelinesResourceWithStreamingResponse:
+        from .resources.pipelines import PipelinesResourceWithStreamingResponse
+
+        return PipelinesResourceWithStreamingResponse(self._client.pipelines)
+
+    @cached_property
+    def schema_validation(self) -> schema_validation.SchemaValidationResourceWithStreamingResponse:
+        from .resources.schema_validation import SchemaValidationResourceWithStreamingResponse
+
+        return SchemaValidationResourceWithStreamingResponse(self._client.schema_validation)
+
+    @cached_property
+    def token_validation(self) -> token_validation.TokenValidationResourceWithStreamingResponse:
+        from .resources.token_validation import TokenValidationResourceWithStreamingResponse
+
+        return TokenValidationResourceWithStreamingResponse(self._client.token_validation)
 
 
 class AsyncCloudflareWithStreamedResponse:
+    _client: AsyncCloudflare
+
     def __init__(self, client: AsyncCloudflare) -> None:
-        self.accounts = resources.AsyncAccountsResourceWithStreamingResponse(client.accounts)
-        self.origin_ca_certificates = resources.AsyncOriginCACertificatesResourceWithStreamingResponse(
-            client.origin_ca_certificates
-        )
-        self.ips = resources.AsyncIPsResourceWithStreamingResponse(client.ips)
-        self.memberships = resources.AsyncMembershipsResourceWithStreamingResponse(client.memberships)
-        self.user = resources.AsyncUserResourceWithStreamingResponse(client.user)
-        self.zones = resources.AsyncZonesResourceWithStreamingResponse(client.zones)
-        self.load_balancers = resources.AsyncLoadBalancersResourceWithStreamingResponse(client.load_balancers)
-        self.cache = resources.AsyncCacheResourceWithStreamingResponse(client.cache)
-        self.ssl = resources.AsyncSSLResourceWithStreamingResponse(client.ssl)
-        self.subscriptions = resources.AsyncSubscriptionsResourceWithStreamingResponse(client.subscriptions)
-        self.acm = resources.AsyncACMResourceWithStreamingResponse(client.acm)
-        self.argo = resources.AsyncArgoResourceWithStreamingResponse(client.argo)
-        self.plans = resources.AsyncPlansResourceWithStreamingResponse(client.plans)
-        self.rate_plans = resources.AsyncRatePlansResourceWithStreamingResponse(client.rate_plans)
-        self.certificate_authorities = resources.AsyncCertificateAuthoritiesResourceWithStreamingResponse(
-            client.certificate_authorities
-        )
-        self.client_certificates = resources.AsyncClientCertificatesResourceWithStreamingResponse(
-            client.client_certificates
-        )
-        self.custom_certificates = resources.AsyncCustomCertificatesResourceWithStreamingResponse(
-            client.custom_certificates
-        )
-        self.custom_hostnames = resources.AsyncCustomHostnamesResourceWithStreamingResponse(client.custom_hostnames)
-        self.custom_nameservers = resources.AsyncCustomNameserversResourceWithStreamingResponse(
-            client.custom_nameservers
-        )
-        self.dns = resources.AsyncDNSResourceWithStreamingResponse(client.dns)
-        self.dnssec = resources.AsyncDNSSECResourceWithStreamingResponse(client.dnssec)
-        self.email_routing = resources.AsyncEmailRoutingResourceWithStreamingResponse(client.email_routing)
-        self.filters = resources.AsyncFiltersResourceWithStreamingResponse(client.filters)
-        self.firewall = resources.AsyncFirewallResourceWithStreamingResponse(client.firewall)
-        self.healthchecks = resources.AsyncHealthchecksResourceWithStreamingResponse(client.healthchecks)
-        self.keyless_certificates = resources.AsyncKeylessCertificatesResourceWithStreamingResponse(
-            client.keyless_certificates
-        )
-        self.logpush = resources.AsyncLogpushResourceWithStreamingResponse(client.logpush)
-        self.logs = resources.AsyncLogsResourceWithStreamingResponse(client.logs)
-        self.origin_tls_client_auth = resources.AsyncOriginTLSClientAuthResourceWithStreamingResponse(
-            client.origin_tls_client_auth
-        )
-        self.pagerules = resources.AsyncPagerulesResourceWithStreamingResponse(client.pagerules)
-        self.rate_limits = resources.AsyncRateLimitsResourceWithStreamingResponse(client.rate_limits)
-        self.secondary_dns = resources.AsyncSecondaryDNSResourceWithStreamingResponse(client.secondary_dns)
-        self.waiting_rooms = resources.AsyncWaitingRoomsResourceWithStreamingResponse(client.waiting_rooms)
-        self.web3 = resources.AsyncWeb3ResourceWithStreamingResponse(client.web3)
-        self.workers = resources.AsyncWorkersResourceWithStreamingResponse(client.workers)
-        self.kv = resources.AsyncKVResourceWithStreamingResponse(client.kv)
-        self.durable_objects = resources.AsyncDurableObjectsResourceWithStreamingResponse(client.durable_objects)
-        self.queues = resources.AsyncQueuesResourceWithStreamingResponse(client.queues)
-        self.api_gateway = resources.AsyncAPIGatewayResourceWithStreamingResponse(client.api_gateway)
-        self.managed_headers = resources.AsyncManagedHeadersResourceWithStreamingResponse(client.managed_headers)
-        self.page_shield = resources.AsyncPageShieldResourceWithStreamingResponse(client.page_shield)
-        self.rulesets = resources.AsyncRulesetsResourceWithStreamingResponse(client.rulesets)
-        self.url_normalization = resources.AsyncURLNormalizationResourceWithStreamingResponse(client.url_normalization)
-        self.spectrum = resources.AsyncSpectrumResourceWithStreamingResponse(client.spectrum)
-        self.addressing = resources.AsyncAddressingResourceWithStreamingResponse(client.addressing)
-        self.audit_logs = resources.AsyncAuditLogsResourceWithStreamingResponse(client.audit_logs)
-        self.billing = resources.AsyncBillingResourceWithStreamingResponse(client.billing)
-        self.brand_protection = resources.AsyncBrandProtectionResourceWithStreamingResponse(client.brand_protection)
-        self.diagnostics = resources.AsyncDiagnosticsResourceWithStreamingResponse(client.diagnostics)
-        self.images = resources.AsyncImagesResourceWithStreamingResponse(client.images)
-        self.intel = resources.AsyncIntelResourceWithStreamingResponse(client.intel)
-        self.magic_transit = resources.AsyncMagicTransitResourceWithStreamingResponse(client.magic_transit)
-        self.magic_network_monitoring = resources.AsyncMagicNetworkMonitoringResourceWithStreamingResponse(
-            client.magic_network_monitoring
-        )
-        self.mtls_certificates = resources.AsyncMTLSCertificatesResourceWithStreamingResponse(client.mtls_certificates)
-        self.pages = resources.AsyncPagesResourceWithStreamingResponse(client.pages)
-        self.pcaps = resources.AsyncPCAPsResourceWithStreamingResponse(client.pcaps)
-        self.registrar = resources.AsyncRegistrarResourceWithStreamingResponse(client.registrar)
-        self.request_tracers = resources.AsyncRequestTracersResourceWithStreamingResponse(client.request_tracers)
-        self.rules = resources.AsyncRulesResourceWithStreamingResponse(client.rules)
-        self.storage = resources.AsyncStorageResourceWithStreamingResponse(client.storage)
-        self.stream = resources.AsyncStreamResourceWithStreamingResponse(client.stream)
-        self.alerting = resources.AsyncAlertingResourceWithStreamingResponse(client.alerting)
-        self.d1 = resources.AsyncD1ResourceWithStreamingResponse(client.d1)
-        self.r2 = resources.AsyncR2ResourceWithStreamingResponse(client.r2)
-        self.warp_connector = resources.AsyncWARPConnectorResourceWithStreamingResponse(client.warp_connector)
-        self.workers_for_platforms = resources.AsyncWorkersForPlatformsResourceWithStreamingResponse(
-            client.workers_for_platforms
-        )
-        self.zero_trust = resources.AsyncZeroTrustResourceWithStreamingResponse(client.zero_trust)
-        self.challenges = resources.AsyncChallengesResourceWithStreamingResponse(client.challenges)
-        self.hyperdrive = resources.AsyncHyperdriveResourceWithStreamingResponse(client.hyperdrive)
-        self.rum = resources.AsyncRUMResourceWithStreamingResponse(client.rum)
-        self.vectorize = resources.AsyncVectorizeResourceWithStreamingResponse(client.vectorize)
-        self.url_scanner = resources.AsyncURLScannerResourceWithStreamingResponse(client.url_scanner)
-        self.radar = resources.AsyncRadarResourceWithStreamingResponse(client.radar)
-        self.bot_management = resources.AsyncBotManagementResourceWithStreamingResponse(client.bot_management)
-        self.origin_post_quantum_encryption = resources.AsyncOriginPostQuantumEncryptionResourceWithStreamingResponse(
-            client.origin_post_quantum_encryption
+        self._client = client
+
+    @cached_property
+    def accounts(self) -> accounts.AsyncAccountsResourceWithStreamingResponse:
+        from .resources.accounts import AsyncAccountsResourceWithStreamingResponse
+
+        return AsyncAccountsResourceWithStreamingResponse(self._client.accounts)
+
+    @cached_property
+    def organizations(self) -> organizations.AsyncOrganizationsResourceWithStreamingResponse:
+        from .resources.organizations import AsyncOrganizationsResourceWithStreamingResponse
+
+        return AsyncOrganizationsResourceWithStreamingResponse(self._client.organizations)
+
+    @cached_property
+    def origin_ca_certificates(self) -> origin_ca_certificates.AsyncOriginCACertificatesResourceWithStreamingResponse:
+        from .resources.origin_ca_certificates import AsyncOriginCACertificatesResourceWithStreamingResponse
+
+        return AsyncOriginCACertificatesResourceWithStreamingResponse(self._client.origin_ca_certificates)
+
+    @cached_property
+    def ips(self) -> ips.AsyncIPsResourceWithStreamingResponse:
+        from .resources.ips import AsyncIPsResourceWithStreamingResponse
+
+        return AsyncIPsResourceWithStreamingResponse(self._client.ips)
+
+    @cached_property
+    def memberships(self) -> memberships.AsyncMembershipsResourceWithStreamingResponse:
+        from .resources.memberships import AsyncMembershipsResourceWithStreamingResponse
+
+        return AsyncMembershipsResourceWithStreamingResponse(self._client.memberships)
+
+    @cached_property
+    def user(self) -> user.AsyncUserResourceWithStreamingResponse:
+        from .resources.user import AsyncUserResourceWithStreamingResponse
+
+        return AsyncUserResourceWithStreamingResponse(self._client.user)
+
+    @cached_property
+    def zones(self) -> zones.AsyncZonesResourceWithStreamingResponse:
+        from .resources.zones import AsyncZonesResourceWithStreamingResponse
+
+        return AsyncZonesResourceWithStreamingResponse(self._client.zones)
+
+    @cached_property
+    def load_balancers(self) -> load_balancers.AsyncLoadBalancersResourceWithStreamingResponse:
+        from .resources.load_balancers import AsyncLoadBalancersResourceWithStreamingResponse
+
+        return AsyncLoadBalancersResourceWithStreamingResponse(self._client.load_balancers)
+
+    @cached_property
+    def cache(self) -> cache.AsyncCacheResourceWithStreamingResponse:
+        from .resources.cache import AsyncCacheResourceWithStreamingResponse
+
+        return AsyncCacheResourceWithStreamingResponse(self._client.cache)
+
+    @cached_property
+    def ssl(self) -> ssl.AsyncSSLResourceWithStreamingResponse:
+        from .resources.ssl import AsyncSSLResourceWithStreamingResponse
+
+        return AsyncSSLResourceWithStreamingResponse(self._client.ssl)
+
+    @cached_property
+    def acm(self) -> acm.AsyncACMResourceWithStreamingResponse:
+        from .resources.acm import AsyncACMResourceWithStreamingResponse
+
+        return AsyncACMResourceWithStreamingResponse(self._client.acm)
+
+    @cached_property
+    def argo(self) -> argo.AsyncArgoResourceWithStreamingResponse:
+        from .resources.argo import AsyncArgoResourceWithStreamingResponse
+
+        return AsyncArgoResourceWithStreamingResponse(self._client.argo)
+
+    @cached_property
+    def certificate_authorities(
+        self,
+    ) -> certificate_authorities.AsyncCertificateAuthoritiesResourceWithStreamingResponse:
+        from .resources.certificate_authorities import AsyncCertificateAuthoritiesResourceWithStreamingResponse
+
+        return AsyncCertificateAuthoritiesResourceWithStreamingResponse(self._client.certificate_authorities)
+
+    @cached_property
+    def client_certificates(self) -> client_certificates.AsyncClientCertificatesResourceWithStreamingResponse:
+        from .resources.client_certificates import AsyncClientCertificatesResourceWithStreamingResponse
+
+        return AsyncClientCertificatesResourceWithStreamingResponse(self._client.client_certificates)
+
+    @cached_property
+    def custom_certificates(self) -> custom_certificates.AsyncCustomCertificatesResourceWithStreamingResponse:
+        from .resources.custom_certificates import AsyncCustomCertificatesResourceWithStreamingResponse
+
+        return AsyncCustomCertificatesResourceWithStreamingResponse(self._client.custom_certificates)
+
+    @cached_property
+    def custom_hostnames(self) -> custom_hostnames.AsyncCustomHostnamesResourceWithStreamingResponse:
+        from .resources.custom_hostnames import AsyncCustomHostnamesResourceWithStreamingResponse
+
+        return AsyncCustomHostnamesResourceWithStreamingResponse(self._client.custom_hostnames)
+
+    @cached_property
+    def custom_nameservers(self) -> custom_nameservers.AsyncCustomNameserversResourceWithStreamingResponse:
+        from .resources.custom_nameservers import AsyncCustomNameserversResourceWithStreamingResponse
+
+        return AsyncCustomNameserversResourceWithStreamingResponse(self._client.custom_nameservers)
+
+    @cached_property
+    def dns_firewall(self) -> dns_firewall.AsyncDNSFirewallResourceWithStreamingResponse:
+        from .resources.dns_firewall import AsyncDNSFirewallResourceWithStreamingResponse
+
+        return AsyncDNSFirewallResourceWithStreamingResponse(self._client.dns_firewall)
+
+    @cached_property
+    def dns(self) -> dns.AsyncDNSResourceWithStreamingResponse:
+        from .resources.dns import AsyncDNSResourceWithStreamingResponse
+
+        return AsyncDNSResourceWithStreamingResponse(self._client.dns)
+
+    @cached_property
+    def email_security(self) -> email_security.AsyncEmailSecurityResourceWithStreamingResponse:
+        from .resources.email_security import AsyncEmailSecurityResourceWithStreamingResponse
+
+        return AsyncEmailSecurityResourceWithStreamingResponse(self._client.email_security)
+
+    @cached_property
+    def email_routing(self) -> email_routing.AsyncEmailRoutingResourceWithStreamingResponse:
+        from .resources.email_routing import AsyncEmailRoutingResourceWithStreamingResponse
+
+        return AsyncEmailRoutingResourceWithStreamingResponse(self._client.email_routing)
+
+    @cached_property
+    def filters(self) -> filters.AsyncFiltersResourceWithStreamingResponse:
+        from .resources.filters import AsyncFiltersResourceWithStreamingResponse
+
+        return AsyncFiltersResourceWithStreamingResponse(self._client.filters)
+
+    @cached_property
+    def firewall(self) -> firewall.AsyncFirewallResourceWithStreamingResponse:
+        from .resources.firewall import AsyncFirewallResourceWithStreamingResponse
+
+        return AsyncFirewallResourceWithStreamingResponse(self._client.firewall)
+
+    @cached_property
+    def healthchecks(self) -> healthchecks.AsyncHealthchecksResourceWithStreamingResponse:
+        from .resources.healthchecks import AsyncHealthchecksResourceWithStreamingResponse
+
+        return AsyncHealthchecksResourceWithStreamingResponse(self._client.healthchecks)
+
+    @cached_property
+    def keyless_certificates(self) -> keyless_certificates.AsyncKeylessCertificatesResourceWithStreamingResponse:
+        from .resources.keyless_certificates import AsyncKeylessCertificatesResourceWithStreamingResponse
+
+        return AsyncKeylessCertificatesResourceWithStreamingResponse(self._client.keyless_certificates)
+
+    @cached_property
+    def logpush(self) -> logpush.AsyncLogpushResourceWithStreamingResponse:
+        from .resources.logpush import AsyncLogpushResourceWithStreamingResponse
+
+        return AsyncLogpushResourceWithStreamingResponse(self._client.logpush)
+
+    @cached_property
+    def logs(self) -> logs.AsyncLogsResourceWithStreamingResponse:
+        from .resources.logs import AsyncLogsResourceWithStreamingResponse
+
+        return AsyncLogsResourceWithStreamingResponse(self._client.logs)
+
+    @cached_property
+    def origin_tls_client_auth(self) -> origin_tls_client_auth.AsyncOriginTLSClientAuthResourceWithStreamingResponse:
+        from .resources.origin_tls_client_auth import AsyncOriginTLSClientAuthResourceWithStreamingResponse
+
+        return AsyncOriginTLSClientAuthResourceWithStreamingResponse(self._client.origin_tls_client_auth)
+
+    @cached_property
+    def page_rules(self) -> page_rules.AsyncPageRulesResourceWithStreamingResponse:
+        from .resources.page_rules import AsyncPageRulesResourceWithStreamingResponse
+
+        return AsyncPageRulesResourceWithStreamingResponse(self._client.page_rules)
+
+    @cached_property
+    def rate_limits(self) -> rate_limits.AsyncRateLimitsResourceWithStreamingResponse:
+        from .resources.rate_limits import AsyncRateLimitsResourceWithStreamingResponse
+
+        return AsyncRateLimitsResourceWithStreamingResponse(self._client.rate_limits)
+
+    @cached_property
+    def waiting_rooms(self) -> waiting_rooms.AsyncWaitingRoomsResourceWithStreamingResponse:
+        from .resources.waiting_rooms import AsyncWaitingRoomsResourceWithStreamingResponse
+
+        return AsyncWaitingRoomsResourceWithStreamingResponse(self._client.waiting_rooms)
+
+    @cached_property
+    def web3(self) -> web3.AsyncWeb3ResourceWithStreamingResponse:
+        from .resources.web3 import AsyncWeb3ResourceWithStreamingResponse
+
+        return AsyncWeb3ResourceWithStreamingResponse(self._client.web3)
+
+    @cached_property
+    def workers(self) -> workers.AsyncWorkersResourceWithStreamingResponse:
+        from .resources.workers import AsyncWorkersResourceWithStreamingResponse
+
+        return AsyncWorkersResourceWithStreamingResponse(self._client.workers)
+
+    @cached_property
+    def kv(self) -> kv.AsyncKVResourceWithStreamingResponse:
+        from .resources.kv import AsyncKVResourceWithStreamingResponse
+
+        return AsyncKVResourceWithStreamingResponse(self._client.kv)
+
+    @cached_property
+    def durable_objects(self) -> durable_objects.AsyncDurableObjectsResourceWithStreamingResponse:
+        from .resources.durable_objects import AsyncDurableObjectsResourceWithStreamingResponse
+
+        return AsyncDurableObjectsResourceWithStreamingResponse(self._client.durable_objects)
+
+    @cached_property
+    def queues(self) -> queues.AsyncQueuesResourceWithStreamingResponse:
+        from .resources.queues import AsyncQueuesResourceWithStreamingResponse
+
+        return AsyncQueuesResourceWithStreamingResponse(self._client.queues)
+
+    @cached_property
+    def api_gateway(self) -> api_gateway.AsyncAPIGatewayResourceWithStreamingResponse:
+        from .resources.api_gateway import AsyncAPIGatewayResourceWithStreamingResponse
+
+        return AsyncAPIGatewayResourceWithStreamingResponse(self._client.api_gateway)
+
+    @cached_property
+    def managed_transforms(self) -> managed_transforms.AsyncManagedTransformsResourceWithStreamingResponse:
+        from .resources.managed_transforms import AsyncManagedTransformsResourceWithStreamingResponse
+
+        return AsyncManagedTransformsResourceWithStreamingResponse(self._client.managed_transforms)
+
+    @cached_property
+    def page_shield(self) -> page_shield.AsyncPageShieldResourceWithStreamingResponse:
+        from .resources.page_shield import AsyncPageShieldResourceWithStreamingResponse
+
+        return AsyncPageShieldResourceWithStreamingResponse(self._client.page_shield)
+
+    @cached_property
+    def rulesets(self) -> rulesets.AsyncRulesetsResourceWithStreamingResponse:
+        from .resources.rulesets import AsyncRulesetsResourceWithStreamingResponse
+
+        return AsyncRulesetsResourceWithStreamingResponse(self._client.rulesets)
+
+    @cached_property
+    def url_normalization(self) -> url_normalization.AsyncURLNormalizationResourceWithStreamingResponse:
+        from .resources.url_normalization import AsyncURLNormalizationResourceWithStreamingResponse
+
+        return AsyncURLNormalizationResourceWithStreamingResponse(self._client.url_normalization)
+
+    @cached_property
+    def spectrum(self) -> spectrum.AsyncSpectrumResourceWithStreamingResponse:
+        from .resources.spectrum import AsyncSpectrumResourceWithStreamingResponse
+
+        return AsyncSpectrumResourceWithStreamingResponse(self._client.spectrum)
+
+    @cached_property
+    def addressing(self) -> addressing.AsyncAddressingResourceWithStreamingResponse:
+        from .resources.addressing import AsyncAddressingResourceWithStreamingResponse
+
+        return AsyncAddressingResourceWithStreamingResponse(self._client.addressing)
+
+    @cached_property
+    def audit_logs(self) -> audit_logs.AsyncAuditLogsResourceWithStreamingResponse:
+        from .resources.audit_logs import AsyncAuditLogsResourceWithStreamingResponse
+
+        return AsyncAuditLogsResourceWithStreamingResponse(self._client.audit_logs)
+
+    @cached_property
+    def billing(self) -> billing.AsyncBillingResourceWithStreamingResponse:
+        from .resources.billing import AsyncBillingResourceWithStreamingResponse
+
+        return AsyncBillingResourceWithStreamingResponse(self._client.billing)
+
+    @cached_property
+    def brand_protection(self) -> brand_protection.AsyncBrandProtectionResourceWithStreamingResponse:
+        from .resources.brand_protection import AsyncBrandProtectionResourceWithStreamingResponse
+
+        return AsyncBrandProtectionResourceWithStreamingResponse(self._client.brand_protection)
+
+    @cached_property
+    def diagnostics(self) -> diagnostics.AsyncDiagnosticsResourceWithStreamingResponse:
+        from .resources.diagnostics import AsyncDiagnosticsResourceWithStreamingResponse
+
+        return AsyncDiagnosticsResourceWithStreamingResponse(self._client.diagnostics)
+
+    @cached_property
+    def images(self) -> images.AsyncImagesResourceWithStreamingResponse:
+        from .resources.images import AsyncImagesResourceWithStreamingResponse
+
+        return AsyncImagesResourceWithStreamingResponse(self._client.images)
+
+    @cached_property
+    def intel(self) -> intel.AsyncIntelResourceWithStreamingResponse:
+        from .resources.intel import AsyncIntelResourceWithStreamingResponse
+
+        return AsyncIntelResourceWithStreamingResponse(self._client.intel)
+
+    @cached_property
+    def magic_transit(self) -> magic_transit.AsyncMagicTransitResourceWithStreamingResponse:
+        from .resources.magic_transit import AsyncMagicTransitResourceWithStreamingResponse
+
+        return AsyncMagicTransitResourceWithStreamingResponse(self._client.magic_transit)
+
+    @cached_property
+    def magic_network_monitoring(
+        self,
+    ) -> magic_network_monitoring.AsyncMagicNetworkMonitoringResourceWithStreamingResponse:
+        from .resources.magic_network_monitoring import AsyncMagicNetworkMonitoringResourceWithStreamingResponse
+
+        return AsyncMagicNetworkMonitoringResourceWithStreamingResponse(self._client.magic_network_monitoring)
+
+    @cached_property
+    def magic_cloud_networking(self) -> magic_cloud_networking.AsyncMagicCloudNetworkingResourceWithStreamingResponse:
+        from .resources.magic_cloud_networking import AsyncMagicCloudNetworkingResourceWithStreamingResponse
+
+        return AsyncMagicCloudNetworkingResourceWithStreamingResponse(self._client.magic_cloud_networking)
+
+    @cached_property
+    def network_interconnects(self) -> network_interconnects.AsyncNetworkInterconnectsResourceWithStreamingResponse:
+        from .resources.network_interconnects import AsyncNetworkInterconnectsResourceWithStreamingResponse
+
+        return AsyncNetworkInterconnectsResourceWithStreamingResponse(self._client.network_interconnects)
+
+    @cached_property
+    def mtls_certificates(self) -> mtls_certificates.AsyncMTLSCertificatesResourceWithStreamingResponse:
+        from .resources.mtls_certificates import AsyncMTLSCertificatesResourceWithStreamingResponse
+
+        return AsyncMTLSCertificatesResourceWithStreamingResponse(self._client.mtls_certificates)
+
+    @cached_property
+    def pages(self) -> pages.AsyncPagesResourceWithStreamingResponse:
+        from .resources.pages import AsyncPagesResourceWithStreamingResponse
+
+        return AsyncPagesResourceWithStreamingResponse(self._client.pages)
+
+    @cached_property
+    def registrar(self) -> registrar.AsyncRegistrarResourceWithStreamingResponse:
+        from .resources.registrar import AsyncRegistrarResourceWithStreamingResponse
+
+        return AsyncRegistrarResourceWithStreamingResponse(self._client.registrar)
+
+    @cached_property
+    def request_tracers(self) -> request_tracers.AsyncRequestTracersResourceWithStreamingResponse:
+        from .resources.request_tracers import AsyncRequestTracersResourceWithStreamingResponse
+
+        return AsyncRequestTracersResourceWithStreamingResponse(self._client.request_tracers)
+
+    @cached_property
+    def rules(self) -> rules.AsyncRulesResourceWithStreamingResponse:
+        from .resources.rules import AsyncRulesResourceWithStreamingResponse
+
+        return AsyncRulesResourceWithStreamingResponse(self._client.rules)
+
+    @cached_property
+    def stream(self) -> stream.AsyncStreamResourceWithStreamingResponse:
+        from .resources.stream import AsyncStreamResourceWithStreamingResponse
+
+        return AsyncStreamResourceWithStreamingResponse(self._client.stream)
+
+    @cached_property
+    def alerting(self) -> alerting.AsyncAlertingResourceWithStreamingResponse:
+        from .resources.alerting import AsyncAlertingResourceWithStreamingResponse
+
+        return AsyncAlertingResourceWithStreamingResponse(self._client.alerting)
+
+    @cached_property
+    def d1(self) -> d1.AsyncD1ResourceWithStreamingResponse:
+        from .resources.d1 import AsyncD1ResourceWithStreamingResponse
+
+        return AsyncD1ResourceWithStreamingResponse(self._client.d1)
+
+    @cached_property
+    def r2(self) -> r2.AsyncR2ResourceWithStreamingResponse:
+        from .resources.r2 import AsyncR2ResourceWithStreamingResponse
+
+        return AsyncR2ResourceWithStreamingResponse(self._client.r2)
+
+    @cached_property
+    def r2_data_catalog(self) -> r2_data_catalog.AsyncR2DataCatalogResourceWithStreamingResponse:
+        from .resources.r2_data_catalog import AsyncR2DataCatalogResourceWithStreamingResponse
+
+        return AsyncR2DataCatalogResourceWithStreamingResponse(self._client.r2_data_catalog)
+
+    @cached_property
+    def workers_for_platforms(self) -> workers_for_platforms.AsyncWorkersForPlatformsResourceWithStreamingResponse:
+        from .resources.workers_for_platforms import AsyncWorkersForPlatformsResourceWithStreamingResponse
+
+        return AsyncWorkersForPlatformsResourceWithStreamingResponse(self._client.workers_for_platforms)
+
+    @cached_property
+    def zero_trust(self) -> zero_trust.AsyncZeroTrustResourceWithStreamingResponse:
+        from .resources.zero_trust import AsyncZeroTrustResourceWithStreamingResponse
+
+        return AsyncZeroTrustResourceWithStreamingResponse(self._client.zero_trust)
+
+    @cached_property
+    def turnstile(self) -> turnstile.AsyncTurnstileResourceWithStreamingResponse:
+        from .resources.turnstile import AsyncTurnstileResourceWithStreamingResponse
+
+        return AsyncTurnstileResourceWithStreamingResponse(self._client.turnstile)
+
+    @cached_property
+    def connectivity(self) -> connectivity.AsyncConnectivityResourceWithStreamingResponse:
+        from .resources.connectivity import AsyncConnectivityResourceWithStreamingResponse
+
+        return AsyncConnectivityResourceWithStreamingResponse(self._client.connectivity)
+
+    @cached_property
+    def hyperdrive(self) -> hyperdrive.AsyncHyperdriveResourceWithStreamingResponse:
+        from .resources.hyperdrive import AsyncHyperdriveResourceWithStreamingResponse
+
+        return AsyncHyperdriveResourceWithStreamingResponse(self._client.hyperdrive)
+
+    @cached_property
+    def rum(self) -> rum.AsyncRUMResourceWithStreamingResponse:
+        from .resources.rum import AsyncRUMResourceWithStreamingResponse
+
+        return AsyncRUMResourceWithStreamingResponse(self._client.rum)
+
+    @cached_property
+    def vectorize(self) -> vectorize.AsyncVectorizeResourceWithStreamingResponse:
+        from .resources.vectorize import AsyncVectorizeResourceWithStreamingResponse
+
+        return AsyncVectorizeResourceWithStreamingResponse(self._client.vectorize)
+
+    @cached_property
+    def url_scanner(self) -> url_scanner.AsyncURLScannerResourceWithStreamingResponse:
+        from .resources.url_scanner import AsyncURLScannerResourceWithStreamingResponse
+
+        return AsyncURLScannerResourceWithStreamingResponse(self._client.url_scanner)
+
+    @cached_property
+    def radar(self) -> radar.AsyncRadarResourceWithStreamingResponse:
+        from .resources.radar import AsyncRadarResourceWithStreamingResponse
+
+        return AsyncRadarResourceWithStreamingResponse(self._client.radar)
+
+    @cached_property
+    def bot_management(self) -> bot_management.AsyncBotManagementResourceWithStreamingResponse:
+        from .resources.bot_management import AsyncBotManagementResourceWithStreamingResponse
+
+        return AsyncBotManagementResourceWithStreamingResponse(self._client.bot_management)
+
+    @cached_property
+    def fraud(self) -> fraud.AsyncFraudResourceWithStreamingResponse:
+        from .resources.fraud import AsyncFraudResourceWithStreamingResponse
+
+        return AsyncFraudResourceWithStreamingResponse(self._client.fraud)
+
+    @cached_property
+    def origin_post_quantum_encryption(
+        self,
+    ) -> origin_post_quantum_encryption.AsyncOriginPostQuantumEncryptionResourceWithStreamingResponse:
+        from .resources.origin_post_quantum_encryption import (
+            AsyncOriginPostQuantumEncryptionResourceWithStreamingResponse,
         )
-        self.speed = resources.AsyncSpeedResourceWithStreamingResponse(client.speed)
-        self.dcv_delegation = resources.AsyncDCVDelegationResourceWithStreamingResponse(client.dcv_delegation)
-        self.hostnames = resources.AsyncHostnamesResourceWithStreamingResponse(client.hostnames)
-        self.snippets = resources.AsyncSnippetsResourceWithStreamingResponse(client.snippets)
-        self.calls = resources.AsyncCallsResourceWithStreamingResponse(client.calls)
-        self.cloudforce_one = resources.AsyncCloudforceOneResourceWithStreamingResponse(client.cloudforce_one)
-        self.event_notifications = resources.AsyncEventNotificationsResourceWithStreamingResponse(
-            client.event_notifications
+
+        return AsyncOriginPostQuantumEncryptionResourceWithStreamingResponse(
+            self._client.origin_post_quantum_encryption
         )
-        self.ai_gateway = resources.AsyncAIGatewayResourceWithStreamingResponse(client.ai_gateway)
-        self.iam = resources.AsyncIAMResourceWithStreamingResponse(client.iam)
-        self.cloud_connector = resources.AsyncCloudConnectorResourceWithStreamingResponse(client.cloud_connector)
+
+    @cached_property
+    def zaraz(self) -> zaraz.AsyncZarazResourceWithStreamingResponse:
+        from .resources.zaraz import AsyncZarazResourceWithStreamingResponse
+
+        return AsyncZarazResourceWithStreamingResponse(self._client.zaraz)
+
+    @cached_property
+    def speed(self) -> speed.AsyncSpeedResourceWithStreamingResponse:
+        from .resources.speed import AsyncSpeedResourceWithStreamingResponse
+
+        return AsyncSpeedResourceWithStreamingResponse(self._client.speed)
+
+    @cached_property
+    def dcv_delegation(self) -> dcv_delegation.AsyncDCVDelegationResourceWithStreamingResponse:
+        from .resources.dcv_delegation import AsyncDCVDelegationResourceWithStreamingResponse
+
+        return AsyncDCVDelegationResourceWithStreamingResponse(self._client.dcv_delegation)
+
+    @cached_property
+    def hostnames(self) -> hostnames.AsyncHostnamesResourceWithStreamingResponse:
+        from .resources.hostnames import AsyncHostnamesResourceWithStreamingResponse
+
+        return AsyncHostnamesResourceWithStreamingResponse(self._client.hostnames)
+
+    @cached_property
+    def snippets(self) -> snippets.AsyncSnippetsResourceWithStreamingResponse:
+        from .resources.snippets import AsyncSnippetsResourceWithStreamingResponse
+
+        return AsyncSnippetsResourceWithStreamingResponse(self._client.snippets)
+
+    @cached_property
+    def realtime_kit(self) -> realtime_kit.AsyncRealtimeKitResourceWithStreamingResponse:
+        from .resources.realtime_kit import AsyncRealtimeKitResourceWithStreamingResponse
+
+        return AsyncRealtimeKitResourceWithStreamingResponse(self._client.realtime_kit)
+
+    @cached_property
+    def calls(self) -> calls.AsyncCallsResourceWithStreamingResponse:
+        from .resources.calls import AsyncCallsResourceWithStreamingResponse
+
+        return AsyncCallsResourceWithStreamingResponse(self._client.calls)
+
+    @cached_property
+    def cloudforce_one(self) -> cloudforce_one.AsyncCloudforceOneResourceWithStreamingResponse:
+        from .resources.cloudforce_one import AsyncCloudforceOneResourceWithStreamingResponse
+
+        return AsyncCloudforceOneResourceWithStreamingResponse(self._client.cloudforce_one)
+
+    @cached_property
+    def ai_gateway(self) -> ai_gateway.AsyncAIGatewayResourceWithStreamingResponse:
+        from .resources.ai_gateway import AsyncAIGatewayResourceWithStreamingResponse
+
+        return AsyncAIGatewayResourceWithStreamingResponse(self._client.ai_gateway)
+
+    @cached_property
+    def iam(self) -> iam.AsyncIAMResourceWithStreamingResponse:
+        from .resources.iam import AsyncIAMResourceWithStreamingResponse
+
+        return AsyncIAMResourceWithStreamingResponse(self._client.iam)
+
+    @cached_property
+    def cloud_connector(self) -> cloud_connector.AsyncCloudConnectorResourceWithStreamingResponse:
+        from .resources.cloud_connector import AsyncCloudConnectorResourceWithStreamingResponse
+
+        return AsyncCloudConnectorResourceWithStreamingResponse(self._client.cloud_connector)
+
+    @cached_property
+    def botnet_feed(self) -> botnet_feed.AsyncBotnetFeedResourceWithStreamingResponse:
+        from .resources.botnet_feed import AsyncBotnetFeedResourceWithStreamingResponse
+
+        return AsyncBotnetFeedResourceWithStreamingResponse(self._client.botnet_feed)
+
+    @cached_property
+    def security_txt(self) -> security_txt.AsyncSecurityTXTResourceWithStreamingResponse:
+        from .resources.security_txt import AsyncSecurityTXTResourceWithStreamingResponse
+
+        return AsyncSecurityTXTResourceWithStreamingResponse(self._client.security_txt)
+
+    @cached_property
+    def workflows(self) -> workflows.AsyncWorkflowsResourceWithStreamingResponse:
+        from .resources.workflows import AsyncWorkflowsResourceWithStreamingResponse
+
+        return AsyncWorkflowsResourceWithStreamingResponse(self._client.workflows)
+
+    @cached_property
+    def resource_sharing(self) -> resource_sharing.AsyncResourceSharingResourceWithStreamingResponse:
+        from .resources.resource_sharing import AsyncResourceSharingResourceWithStreamingResponse
+
+        return AsyncResourceSharingResourceWithStreamingResponse(self._client.resource_sharing)
+
+    @cached_property
+    def leaked_credential_checks(
+        self,
+    ) -> leaked_credential_checks.AsyncLeakedCredentialChecksResourceWithStreamingResponse:
+        from .resources.leaked_credential_checks import AsyncLeakedCredentialChecksResourceWithStreamingResponse
+
+        return AsyncLeakedCredentialChecksResourceWithStreamingResponse(self._client.leaked_credential_checks)
+
+    @cached_property
+    def content_scanning(self) -> content_scanning.AsyncContentScanningResourceWithStreamingResponse:
+        from .resources.content_scanning import AsyncContentScanningResourceWithStreamingResponse
+
+        return AsyncContentScanningResourceWithStreamingResponse(self._client.content_scanning)
+
+    @cached_property
+    def abuse_reports(self) -> abuse_reports.AsyncAbuseReportsResourceWithStreamingResponse:
+        from .resources.abuse_reports import AsyncAbuseReportsResourceWithStreamingResponse
+
+        return AsyncAbuseReportsResourceWithStreamingResponse(self._client.abuse_reports)
+
+    @cached_property
+    def ai(self) -> ai.AsyncAIResourceWithStreamingResponse:
+        from .resources.ai import AsyncAIResourceWithStreamingResponse
+
+        return AsyncAIResourceWithStreamingResponse(self._client.ai)
+
+    @cached_property
+    def aisearch(self) -> aisearch.AsyncAISearchResourceWithStreamingResponse:
+        from .resources.aisearch import AsyncAISearchResourceWithStreamingResponse
+
+        return AsyncAISearchResourceWithStreamingResponse(self._client.aisearch)
+
+    @cached_property
+    def security_center(self) -> security_center.AsyncSecurityCenterResourceWithStreamingResponse:
+        from .resources.security_center import AsyncSecurityCenterResourceWithStreamingResponse
+
+        return AsyncSecurityCenterResourceWithStreamingResponse(self._client.security_center)
+
+    @cached_property
+    def browser_rendering(self) -> browser_rendering.AsyncBrowserRenderingResourceWithStreamingResponse:
+        from .resources.browser_rendering import AsyncBrowserRenderingResourceWithStreamingResponse
+
+        return AsyncBrowserRenderingResourceWithStreamingResponse(self._client.browser_rendering)
+
+    @cached_property
+    def custom_pages(self) -> custom_pages.AsyncCustomPagesResourceWithStreamingResponse:
+        from .resources.custom_pages import AsyncCustomPagesResourceWithStreamingResponse
+
+        return AsyncCustomPagesResourceWithStreamingResponse(self._client.custom_pages)
+
+    @cached_property
+    def secrets_store(self) -> secrets_store.AsyncSecretsStoreResourceWithStreamingResponse:
+        from .resources.secrets_store import AsyncSecretsStoreResourceWithStreamingResponse
+
+        return AsyncSecretsStoreResourceWithStreamingResponse(self._client.secrets_store)
+
+    @cached_property
+    def pipelines(self) -> pipelines.AsyncPipelinesResourceWithStreamingResponse:
+        from .resources.pipelines import AsyncPipelinesResourceWithStreamingResponse
+
+        return AsyncPipelinesResourceWithStreamingResponse(self._client.pipelines)
+
+    @cached_property
+    def schema_validation(self) -> schema_validation.AsyncSchemaValidationResourceWithStreamingResponse:
+        from .resources.schema_validation import AsyncSchemaValidationResourceWithStreamingResponse
+
+        return AsyncSchemaValidationResourceWithStreamingResponse(self._client.schema_validation)
+
+    @cached_property
+    def token_validation(self) -> token_validation.AsyncTokenValidationResourceWithStreamingResponse:
+        from .resources.token_validation import AsyncTokenValidationResourceWithStreamingResponse
+
+        return AsyncTokenValidationResourceWithStreamingResponse(self._client.token_validation)
 
 
 Client = Cloudflare
diff --git a/src/cloudflare/_compat.py b/src/cloudflare/_compat.py
index c919b5adb3e..be9bcfb2c1f 100644
--- a/src/cloudflare/_compat.py
+++ b/src/cloudflare/_compat.py
@@ -2,24 +2,24 @@
 
 from typing import TYPE_CHECKING, Any, Union, Generic, TypeVar, Callable, cast, overload
 from datetime import date, datetime
-from typing_extensions import Self
+from typing_extensions import Self, Literal
 
 import pydantic
 from pydantic.fields import FieldInfo
 
-from ._types import StrBytesIntFloat
+from ._types import IncEx, StrBytesIntFloat
 
 _T = TypeVar("_T")
 _ModelT = TypeVar("_ModelT", bound=pydantic.BaseModel)
 
-# --------------- Pydantic v2 compatibility ---------------
+# --------------- Pydantic v2, v3 compatibility ---------------
 
 # Pyright incorrectly reports some of our functions as overriding a method when they don't
 # pyright: reportIncompatibleMethodOverride=false
 
+PYDANTIC_V1 = pydantic.VERSION.startswith("1.")
 PYDANTIC_V2 = pydantic.VERSION.startswith("2.")
 
-# v1 re-exports
 if TYPE_CHECKING:
 
     def parse_date(value: date | StrBytesIntFloat) -> date:  # noqa: ARG001
@@ -44,106 +44,116 @@ def is_typeddict(type_: type[Any]) -> bool:  # noqa: ARG001
         ...
 
 else:
-    if PYDANTIC_V2:
-        from pydantic.v1.typing import (
+    # v1 re-exports
+    if PYDANTIC_V1:
+        from pydantic.typing import (
             get_args as get_args,
             is_union as is_union,
             get_origin as get_origin,
             is_typeddict as is_typeddict,
             is_literal_type as is_literal_type,
         )
-        from pydantic.v1.datetime_parse import parse_date as parse_date, parse_datetime as parse_datetime
+        from pydantic.datetime_parse import parse_date as parse_date, parse_datetime as parse_datetime
     else:
-        from pydantic.typing import (
+        from ._utils import (
             get_args as get_args,
             is_union as is_union,
             get_origin as get_origin,
+            parse_date as parse_date,
             is_typeddict as is_typeddict,
+            parse_datetime as parse_datetime,
             is_literal_type as is_literal_type,
         )
-        from pydantic.datetime_parse import parse_date as parse_date, parse_datetime as parse_datetime
 
 
 # refactored config
 if TYPE_CHECKING:
     from pydantic import ConfigDict as ConfigDict
 else:
-    if PYDANTIC_V2:
-        from pydantic import ConfigDict
-    else:
+    if PYDANTIC_V1:
         # TODO: provide an error message here?
         ConfigDict = None
+    else:
+        from pydantic import ConfigDict as ConfigDict
 
 
 # renamed methods / properties
 def parse_obj(model: type[_ModelT], value: object) -> _ModelT:
-    if PYDANTIC_V2:
-        return model.model_validate(value)
-    else:
+    if PYDANTIC_V1:
         return cast(_ModelT, model.parse_obj(value))  # pyright: ignore[reportDeprecated, reportUnnecessaryCast]
+    else:
+        return model.model_validate(value)
 
 
 def field_is_required(field: FieldInfo) -> bool:
-    if PYDANTIC_V2:
-        return field.is_required()
-    return field.required  # type: ignore
+    if PYDANTIC_V1:
+        return field.required  # type: ignore
+    return field.is_required()
 
 
 def field_get_default(field: FieldInfo) -> Any:
     value = field.get_default()
-    if PYDANTIC_V2:
-        from pydantic_core import PydanticUndefined
-
-        if value == PydanticUndefined:
-            return None
+    if PYDANTIC_V1:
         return value
+    from pydantic_core import PydanticUndefined
+
+    if value == PydanticUndefined:
+        return None
     return value
 
 
 def field_outer_type(field: FieldInfo) -> Any:
-    if PYDANTIC_V2:
-        return field.annotation
-    return field.outer_type_  # type: ignore
+    if PYDANTIC_V1:
+        return field.outer_type_  # type: ignore
+    return field.annotation
 
 
 def get_model_config(model: type[pydantic.BaseModel]) -> Any:
-    if PYDANTIC_V2:
-        return model.model_config
-    return model.__config__  # type: ignore
+    if PYDANTIC_V1:
+        return model.__config__  # type: ignore
+    return model.model_config
 
 
 def get_model_fields(model: type[pydantic.BaseModel]) -> dict[str, FieldInfo]:
-    if PYDANTIC_V2:
-        return model.model_fields
-    return model.__fields__  # type: ignore
+    if PYDANTIC_V1:
+        return model.__fields__  # type: ignore
+    return model.model_fields
 
 
 def model_copy(model: _ModelT, *, deep: bool = False) -> _ModelT:
-    if PYDANTIC_V2:
-        return model.model_copy(deep=deep)
-    return model.copy(deep=deep)  # type: ignore
+    if PYDANTIC_V1:
+        return model.copy(deep=deep)  # type: ignore
+    return model.model_copy(deep=deep)
 
 
 def model_json(model: pydantic.BaseModel, *, indent: int | None = None) -> str:
-    if PYDANTIC_V2:
-        return model.model_dump_json(indent=indent)
-    return model.json(indent=indent)  # type: ignore
+    if PYDANTIC_V1:
+        return model.json(indent=indent)  # type: ignore
+    return model.model_dump_json(indent=indent)
 
 
 def model_dump(
     model: pydantic.BaseModel,
     *,
+    exclude: IncEx | None = None,
     exclude_unset: bool = False,
     exclude_defaults: bool = False,
+    warnings: bool = True,
+    mode: Literal["json", "python"] = "python",
 ) -> dict[str, Any]:
-    if PYDANTIC_V2:
+    if (not PYDANTIC_V1) or hasattr(model, "model_dump"):
         return model.model_dump(
+            mode=mode,
+            exclude=exclude,
             exclude_unset=exclude_unset,
             exclude_defaults=exclude_defaults,
+            # warnings are not supported in Pydantic v1
+            warnings=True if PYDANTIC_V1 else warnings,
         )
     return cast(
         "dict[str, Any]",
         model.dict(  # pyright: ignore[reportDeprecated, reportUnnecessaryCast]
+            exclude=exclude,
             exclude_unset=exclude_unset,
             exclude_defaults=exclude_defaults,
         ),
@@ -151,30 +161,26 @@ def model_dump(
 
 
 def model_parse(model: type[_ModelT], data: Any) -> _ModelT:
-    if PYDANTIC_V2:
-        return model.model_validate(data)
-    return model.parse_obj(data)  # pyright: ignore[reportDeprecated]
+    if PYDANTIC_V1:
+        return model.parse_obj(data)  # pyright: ignore[reportDeprecated]
+    return model.model_validate(data)
 
 
 # generic models
 if TYPE_CHECKING:
 
-    class GenericModel(pydantic.BaseModel):
-        ...
+    class GenericModel(pydantic.BaseModel): ...
 
 else:
-    if PYDANTIC_V2:
+    if PYDANTIC_V1:
+        import pydantic.generics
+
+        class GenericModel(pydantic.generics.GenericModel, pydantic.BaseModel): ...
+    else:
         # there no longer needs to be a distinction in v2 but
         # we still have to create our own subclass to avoid
         # inconsistent MRO ordering errors
-        class GenericModel(pydantic.BaseModel):
-            ...
-
-    else:
-        import pydantic.generics
-
-        class GenericModel(pydantic.generics.GenericModel, pydantic.BaseModel):
-            ...
+        class GenericModel(pydantic.BaseModel): ...
 
 
 # cached properties
@@ -193,30 +199,22 @@ class typed_cached_property(Generic[_T]):
         func: Callable[[Any], _T]
         attrname: str | None
 
-        def __init__(self, func: Callable[[Any], _T]) -> None:
-            ...
+        def __init__(self, func: Callable[[Any], _T]) -> None: ...
 
         @overload
-        def __get__(self, instance: None, owner: type[Any] | None = None) -> Self:
-            ...
+        def __get__(self, instance: None, owner: type[Any] | None = None) -> Self: ...
 
         @overload
-        def __get__(self, instance: object, owner: type[Any] | None = None) -> _T:
-            ...
+        def __get__(self, instance: object, owner: type[Any] | None = None) -> _T: ...
 
         def __get__(self, instance: object, owner: type[Any] | None = None) -> _T | Self:
             raise NotImplementedError()
 
-        def __set_name__(self, owner: type[Any], name: str) -> None:
-            ...
+        def __set_name__(self, owner: type[Any], name: str) -> None: ...
 
         # __set__ is not defined at runtime, but @cached_property is designed to be settable
-        def __set__(self, instance: object, value: _T) -> None:
-            ...
+        def __set__(self, instance: object, value: _T) -> None: ...
 else:
-    try:
-        from functools import cached_property as cached_property
-    except ImportError:
-        from cached_property import cached_property as cached_property
+    from functools import cached_property as cached_property
 
     typed_cached_property = cached_property
diff --git a/src/cloudflare/_constants.py b/src/cloudflare/_constants.py
index a2ac3b6f327..6ddf2c7170b 100644
--- a/src/cloudflare/_constants.py
+++ b/src/cloudflare/_constants.py
@@ -6,7 +6,7 @@
 OVERRIDE_CAST_TO_HEADER = "____stainless_override_cast_to"
 
 # default timeout is 1 minute
-DEFAULT_TIMEOUT = httpx.Timeout(timeout=60.0, connect=5.0)
+DEFAULT_TIMEOUT = httpx.Timeout(timeout=60, connect=5.0)
 DEFAULT_MAX_RETRIES = 2
 DEFAULT_CONNECTION_LIMITS = httpx.Limits(max_connections=100, max_keepalive_connections=20)
 
diff --git a/src/cloudflare/_files.py b/src/cloudflare/_files.py
index 0d2022ae79e..0c0ce12faaa 100644
--- a/src/cloudflare/_files.py
+++ b/src/cloudflare/_files.py
@@ -34,18 +34,16 @@ def assert_is_file_content(obj: object, *, key: str | None = None) -> None:
     if not is_file_content(obj):
         prefix = f"Expected entry at `{key}`" if key is not None else f"Expected file input `{obj!r}`"
         raise RuntimeError(
-            f"{prefix} to be bytes, an io.IOBase instance, PathLike or a tuple but received {type(obj)} instead."
+            f"{prefix} to be bytes, an io.IOBase instance, PathLike or a tuple but received {type(obj)} instead. See https://github.com/cloudflare/cloudflare-python/tree/main#file-uploads"
         ) from None
 
 
 @overload
-def to_httpx_files(files: None) -> None:
-    ...
+def to_httpx_files(files: None) -> None: ...
 
 
 @overload
-def to_httpx_files(files: RequestFiles) -> HttpxRequestFiles:
-    ...
+def to_httpx_files(files: RequestFiles) -> HttpxRequestFiles: ...
 
 
 def to_httpx_files(files: RequestFiles | None) -> HttpxRequestFiles | None:
@@ -71,25 +69,23 @@ def _transform_file(file: FileTypes) -> HttpxFileTypes:
         return file
 
     if is_tuple_t(file):
-        return (file[0], _read_file_content(file[1]), *file[2:])
+        return (file[0], read_file_content(file[1]), *file[2:])
 
     raise TypeError(f"Expected file types input to be a FileContent type or to be a tuple")
 
 
-def _read_file_content(file: FileContent) -> HttpxFileContent:
+def read_file_content(file: FileContent) -> HttpxFileContent:
     if isinstance(file, os.PathLike):
         return pathlib.Path(file).read_bytes()
     return file
 
 
 @overload
-async def async_to_httpx_files(files: None) -> None:
-    ...
+async def async_to_httpx_files(files: None) -> None: ...
 
 
 @overload
-async def async_to_httpx_files(files: RequestFiles) -> HttpxRequestFiles:
-    ...
+async def async_to_httpx_files(files: RequestFiles) -> HttpxRequestFiles: ...
 
 
 async def async_to_httpx_files(files: RequestFiles | None) -> HttpxRequestFiles | None:
@@ -115,12 +111,12 @@ async def _async_transform_file(file: FileTypes) -> HttpxFileTypes:
         return file
 
     if is_tuple_t(file):
-        return (file[0], await _async_read_file_content(file[1]), *file[2:])
+        return (file[0], await async_read_file_content(file[1]), *file[2:])
 
     raise TypeError(f"Expected file types input to be a FileContent type or to be a tuple")
 
 
-async def _async_read_file_content(file: FileContent) -> HttpxFileContent:
+async def async_read_file_content(file: FileContent) -> HttpxFileContent:
     if isinstance(file, os.PathLike):
         return await anyio.Path(file).read_bytes()
 
diff --git a/src/cloudflare/_models.py b/src/cloudflare/_models.py
index eb7ce3bde92..e2736299361 100644
--- a/src/cloudflare/_models.py
+++ b/src/cloudflare/_models.py
@@ -2,9 +2,24 @@
 
 import os
 import inspect
-from typing import TYPE_CHECKING, Any, Type, Union, Generic, TypeVar, Callable, cast
+import weakref
+from typing import (
+    IO,
+    TYPE_CHECKING,
+    Any,
+    Type,
+    Union,
+    Generic,
+    TypeVar,
+    Callable,
+    Iterable,
+    Optional,
+    AsyncIterable,
+    cast,
+)
 from datetime import date, datetime
 from typing_extensions import (
+    List,
     Unpack,
     Literal,
     ClassVar,
@@ -19,7 +34,6 @@
 )
 
 import pydantic
-import pydantic.generics
 from pydantic.fields import FieldInfo
 
 from ._types import (
@@ -31,12 +45,14 @@
     Timeout,
     NotGiven,
     AnyMapping,
+    MultipartSyntax,
     HttpxRequestFiles,
 )
 from ._utils import (
     PropertyInfo,
     is_list,
     is_given,
+    json_safe,
     lru_cache,
     is_mapping,
     parse_date,
@@ -45,10 +61,11 @@
     strip_not_given,
     extract_type_arg,
     is_annotated_type,
+    is_type_alias_type,
     strip_annotated_type,
 )
 from ._compat import (
-    PYDANTIC_V2,
+    PYDANTIC_V1,
     ConfigDict,
     GenericModel as BaseGenericModel,
     get_args,
@@ -63,7 +80,7 @@
 from ._constants import RAW_RESPONSE_HEADER
 
 if TYPE_CHECKING:
-    from pydantic_core.core_schema import ModelField, LiteralSchema, ModelFieldsSchema
+    from pydantic_core.core_schema import ModelField, ModelSchema, LiteralSchema, ModelFieldsSchema
 
 __all__ = ["BaseModel", "GenericModel"]
 
@@ -79,11 +96,7 @@ class _ConfigProtocol(Protocol):
 
 
 class BaseModel(pydantic.BaseModel):
-    if PYDANTIC_V2:
-        model_config: ClassVar[ConfigDict] = ConfigDict(
-            extra="allow", defer_build=coerce_boolean(os.environ.get("DEFER_PYDANTIC_BUILD", "true"))
-        )
-    else:
+    if PYDANTIC_V1:
 
         @property
         @override
@@ -93,6 +106,10 @@ def model_fields_set(self) -> set[str]:
 
         class Config(pydantic.BaseConfig):  # pyright: ignore[reportDeprecated]
             extra: Any = pydantic.Extra.allow  # type: ignore
+    else:
+        model_config: ClassVar[ConfigDict] = ConfigDict(
+            extra="allow", defer_build=coerce_boolean(os.environ.get("DEFER_PYDANTIC_BUILD", "true"))
+        )
 
     def to_dict(
         self,
@@ -170,21 +187,21 @@ def to_json(
     @override
     def __str__(self) -> str:
         # mypy complains about an invalid self arg
-        return f'{self.__repr_name__()}({self.__repr_str__(", ")})'  # type: ignore[misc]
+        return f"{self.__repr_name__()}({self.__repr_str__(', ')})"  # type: ignore[misc]
 
     # Override the 'construct' method in a way that supports recursive parsing without validation.
     # Based on https://github.com/samuelcolvin/pydantic/issues/1168#issuecomment-817742836.
     @classmethod
     @override
-    def construct(
-        cls: Type[ModelT],
+    def construct(  # pyright: ignore[reportIncompatibleMethodOverride]
+        __cls: Type[ModelT],
         _fields_set: set[str] | None = None,
         **values: object,
     ) -> ModelT:
-        m = cls.__new__(cls)
+        m = __cls.__new__(__cls)
         fields_values: dict[str, object] = {}
 
-        config = get_model_config(cls)
+        config = get_model_config(__cls)
         populate_by_name = (
             config.allow_population_by_field_name
             if isinstance(config, _ConfigProtocol)
@@ -194,7 +211,7 @@ def construct(
         if _fields_set is None:
             _fields_set = set()
 
-        model_fields = get_model_fields(cls)
+        model_fields = get_model_fields(__cls)
         for name, field in model_fields.items():
             key = field.alias
             if key is None or (key not in values and populate_by_name):
@@ -206,28 +223,32 @@ def construct(
             else:
                 fields_values[name] = field_get_default(field)
 
+        extra_field_type = _get_extra_fields_type(__cls)
+
         _extra = {}
         for key, value in values.items():
             if key not in model_fields:
-                if PYDANTIC_V2:
-                    _extra[key] = value
-                else:
+                parsed = construct_type(value=value, type_=extra_field_type) if extra_field_type is not None else value
+
+                if PYDANTIC_V1:
                     _fields_set.add(key)
-                    fields_values[key] = value
+                    fields_values[key] = parsed
+                else:
+                    _extra[key] = parsed
 
         object.__setattr__(m, "__dict__", fields_values)
 
-        if PYDANTIC_V2:
-            # these properties are copied from Pydantic's `model_construct()` method
-            object.__setattr__(m, "__pydantic_private__", None)
-            object.__setattr__(m, "__pydantic_extra__", _extra)
-            object.__setattr__(m, "__pydantic_fields_set__", _fields_set)
-        else:
+        if PYDANTIC_V1:
             # init_private_attributes() does not exist in v2
             m._init_private_attributes()  # type: ignore
 
             # copied from Pydantic v1's `construct()` method
             object.__setattr__(m, "__fields_set__", _fields_set)
+        else:
+            # these properties are copied from Pydantic's `model_construct()` method
+            object.__setattr__(m, "__pydantic_private__", None)
+            object.__setattr__(m, "__pydantic_extra__", _extra)
+            object.__setattr__(m, "__pydantic_fields_set__", _fields_set)
 
         return m
 
@@ -237,7 +258,7 @@ def construct(
         # although not in practice
         model_construct = construct
 
-    if not PYDANTIC_V2:
+    if PYDANTIC_V1:
         # we define aliases for some of the new pydantic v2 methods so
         # that we can just document these methods without having to specify
         # a specific pydantic version as some users may not know which
@@ -248,15 +269,17 @@ def model_dump(
             self,
             *,
             mode: Literal["json", "python"] | str = "python",
-            include: IncEx = None,
-            exclude: IncEx = None,
-            by_alias: bool = False,
+            include: IncEx | None = None,
+            exclude: IncEx | None = None,
+            context: Any | None = None,
+            by_alias: bool | None = None,
             exclude_unset: bool = False,
             exclude_defaults: bool = False,
             exclude_none: bool = False,
+            exclude_computed_fields: bool = False,
             round_trip: bool = False,
             warnings: bool | Literal["none", "warn", "error"] = True,
-            context: dict[str, Any] | None = None,
+            fallback: Callable[[Any], Any] | None = None,
             serialize_as_any: bool = False,
         ) -> dict[str, Any]:
             """Usage docs: https://docs.pydantic.dev/2.4/concepts/serialization/#modelmodel_dump
@@ -265,22 +288,30 @@ def model_dump(
 
             Args:
                 mode: The mode in which `to_python` should run.
-                    If mode is 'json', the dictionary will only contain JSON serializable types.
-                    If mode is 'python', the dictionary may contain any Python objects.
-                include: A list of fields to include in the output.
-                exclude: A list of fields to exclude from the output.
+                    If mode is 'json', the output will only contain JSON serializable types.
+                    If mode is 'python', the output may contain non-JSON-serializable Python objects.
+                include: A set of fields to include in the output.
+                exclude: A set of fields to exclude from the output.
+                context: Additional context to pass to the serializer.
                 by_alias: Whether to use the field's alias in the dictionary key if defined.
-                exclude_unset: Whether to exclude fields that are unset or None from the output.
-                exclude_defaults: Whether to exclude fields that are set to their default value from the output.
-                exclude_none: Whether to exclude fields that have a value of `None` from the output.
-                round_trip: Whether to enable serialization and deserialization round-trip support.
-                warnings: Whether to log warnings when invalid fields are encountered.
+                exclude_unset: Whether to exclude fields that have not been explicitly set.
+                exclude_defaults: Whether to exclude fields that are set to their default value.
+                exclude_none: Whether to exclude fields that have a value of `None`.
+                exclude_computed_fields: Whether to exclude computed fields.
+                    While this can be useful for round-tripping, it is usually recommended to use the dedicated
+                    `round_trip` parameter instead.
+                round_trip: If True, dumped values should be valid as input for non-idempotent types such as Json[T].
+                warnings: How to handle serialization errors. False/"none" ignores them, True/"warn" logs errors,
+                    "error" raises a [`PydanticSerializationError`][pydantic_core.PydanticSerializationError].
+                fallback: A function to call when an unknown value is encountered. If not provided,
+                    a [`PydanticSerializationError`][pydantic_core.PydanticSerializationError] error is raised.
+                serialize_as_any: Whether to serialize fields with duck-typing serialization behavior.
 
             Returns:
                 A dictionary representation of the model.
             """
-            if mode != "python":
-                raise ValueError("mode is only supported in Pydantic v2")
+            if mode not in {"json", "python"}:
+                raise ValueError("mode must be either 'json' or 'python'")
             if round_trip != False:
                 raise ValueError("round_trip is only supported in Pydantic v2")
             if warnings != True:
@@ -289,29 +320,38 @@ def model_dump(
                 raise ValueError("context is only supported in Pydantic v2")
             if serialize_as_any != False:
                 raise ValueError("serialize_as_any is only supported in Pydantic v2")
-            return super().dict(  # pyright: ignore[reportDeprecated]
+            if fallback is not None:
+                raise ValueError("fallback is only supported in Pydantic v2")
+            if exclude_computed_fields != False:
+                raise ValueError("exclude_computed_fields is only supported in Pydantic v2")
+            dumped = super().dict(  # pyright: ignore[reportDeprecated]
                 include=include,
                 exclude=exclude,
-                by_alias=by_alias,
+                by_alias=by_alias if by_alias is not None else False,
                 exclude_unset=exclude_unset,
                 exclude_defaults=exclude_defaults,
                 exclude_none=exclude_none,
             )
 
+            return cast("dict[str, Any]", json_safe(dumped)) if mode == "json" else dumped
+
         @override
         def model_dump_json(
             self,
             *,
             indent: int | None = None,
-            include: IncEx = None,
-            exclude: IncEx = None,
-            by_alias: bool = False,
+            ensure_ascii: bool = False,
+            include: IncEx | None = None,
+            exclude: IncEx | None = None,
+            context: Any | None = None,
+            by_alias: bool | None = None,
             exclude_unset: bool = False,
             exclude_defaults: bool = False,
             exclude_none: bool = False,
+            exclude_computed_fields: bool = False,
             round_trip: bool = False,
             warnings: bool | Literal["none", "warn", "error"] = True,
-            context: dict[str, Any] | None = None,
+            fallback: Callable[[Any], Any] | None = None,
             serialize_as_any: bool = False,
         ) -> str:
             """Usage docs: https://docs.pydantic.dev/2.4/concepts/serialization/#modelmodel_dump_json
@@ -340,11 +380,17 @@ def model_dump_json(
                 raise ValueError("context is only supported in Pydantic v2")
             if serialize_as_any != False:
                 raise ValueError("serialize_as_any is only supported in Pydantic v2")
+            if fallback is not None:
+                raise ValueError("fallback is only supported in Pydantic v2")
+            if ensure_ascii != False:
+                raise ValueError("ensure_ascii is only supported in Pydantic v2")
+            if exclude_computed_fields != False:
+                raise ValueError("exclude_computed_fields is only supported in Pydantic v2")
             return super().json(  # type: ignore[reportDeprecated]
                 indent=indent,
                 include=include,
                 exclude=exclude,
-                by_alias=by_alias,
+                by_alias=by_alias if by_alias is not None else False,
                 exclude_unset=exclude_unset,
                 exclude_defaults=exclude_defaults,
                 exclude_none=exclude_none,
@@ -355,15 +401,32 @@ def _construct_field(value: object, field: FieldInfo, key: str) -> object:
     if value is None:
         return field_get_default(field)
 
-    if PYDANTIC_V2:
-        type_ = field.annotation
-    else:
+    if PYDANTIC_V1:
         type_ = cast(type, field.outer_type_)  # type: ignore
+    else:
+        type_ = field.annotation  # type: ignore
 
     if type_ is None:
         raise RuntimeError(f"Unexpected field type is None for {key}")
 
-    return construct_type(value=value, type_=type_)
+    return construct_type(value=value, type_=type_, metadata=getattr(field, "metadata", None))
+
+
+def _get_extra_fields_type(cls: type[pydantic.BaseModel]) -> type | None:
+    if PYDANTIC_V1:
+        # TODO
+        return None
+
+    schema = cls.__pydantic_core_schema__
+    if schema["type"] == "model":
+        fields = schema["schema"]
+        if fields["type"] == "model-fields":
+            extras = fields.get("extras_schema")
+            if extras and "cls" in extras:
+                # mypy can't narrow the type
+                return extras["cls"]  # type: ignore[no-any-return]
+
+    return None
 
 
 def is_basemodel(type_: type) -> bool:
@@ -380,6 +443,8 @@ def is_basemodel(type_: type) -> bool:
 
 def is_basemodel_type(type_: type) -> TypeGuard[type[BaseModel] | type[GenericModel]]:
     origin = get_origin(type_) or type_
+    if not inspect.isclass(origin):
+        return False
     return issubclass(origin, BaseModel) or issubclass(origin, GenericModel)
 
 
@@ -406,18 +471,37 @@ def build(
     return cast(_BaseModelT, construct_type(type_=base_model_cls, value=kwargs))
 
 
-def construct_type(*, value: object, type_: object) -> object:
+def construct_type_unchecked(*, value: object, type_: type[_T]) -> _T:
+    """Loose coercion to the expected type with construction of nested values.
+
+    Note: the returned value from this function is not guaranteed to match the
+    given type.
+    """
+    return cast(_T, construct_type(value=value, type_=type_))
+
+
+def construct_type(*, value: object, type_: object, metadata: Optional[List[Any]] = None) -> object:
     """Loose coercion to the expected type with construction of nested values.
 
     If the given value does not match the expected type then it is returned as-is.
     """
+
+    # store a reference to the original type we were given before we extract any inner
+    # types so that we can properly resolve forward references in `TypeAliasType` annotations
+    original_type = None
+
     # we allow `object` as the input type because otherwise, passing things like
     # `Literal['value']` will be reported as a type error by type checkers
     type_ = cast("type[object]", type_)
+    if is_type_alias_type(type_):
+        original_type = type_  # type: ignore[unreachable]
+        type_ = type_.__value__  # type: ignore[unreachable]
 
     # unwrap `Annotated[T, ...]` -> `T`
-    if is_annotated_type(type_):
-        meta: tuple[Any, ...] = get_args(type_)[1:]
+    if metadata is not None and len(metadata) > 0:
+        meta: tuple[Any, ...] = tuple(metadata)
+    elif is_annotated_type(type_):
+        meta = get_args(type_)[1:]
         type_ = extract_type_arg(type_, 0)
     else:
         meta = tuple()
@@ -429,7 +513,7 @@ def construct_type(*, value: object, type_: object) -> object:
 
     if is_union(origin):
         try:
-            return validate_type(type_=cast("type[object]", type_), value=value)
+            return validate_type(type_=cast("type[object]", original_type or type_), value=value)
         except Exception:
             pass
 
@@ -471,7 +555,11 @@ def construct_type(*, value: object, type_: object) -> object:
         _, items_type = get_args(type_)  # Dict[_, items_type]
         return {key: construct_type(value=item, type_=items_type) for key, item in value.items()}
 
-    if not is_literal_type(type_) and (issubclass(origin, BaseModel) or issubclass(origin, GenericModel)):
+    if (
+        not is_literal_type(type_)
+        and inspect.isclass(origin)
+        and (issubclass(origin, BaseModel) or issubclass(origin, GenericModel))
+    ):
         if is_list(value):
             return [cast(Any, type_).construct(**entry) if is_mapping(entry) else entry for entry in value]
 
@@ -517,6 +605,9 @@ class CachedDiscriminatorType(Protocol):
     __discriminator__: DiscriminatorDetails
 
 
+DISCRIMINATOR_CACHE: weakref.WeakKeyDictionary[type, DiscriminatorDetails] = weakref.WeakKeyDictionary()
+
+
 class DiscriminatorDetails:
     field_name: str
     """The name of the discriminator field in the variant class, e.g.
@@ -559,8 +650,9 @@ def __init__(
 
 
 def _build_discriminated_union_meta(*, union: type, meta_annotations: tuple[Any, ...]) -> DiscriminatorDetails | None:
-    if isinstance(union, CachedDiscriminatorType):
-        return union.__discriminator__
+    cached = DISCRIMINATOR_CACHE.get(union)
+    if cached is not None:
+        return cached
 
     discriminator_field_name: str | None = None
 
@@ -578,30 +670,30 @@ def _build_discriminated_union_meta(*, union: type, meta_annotations: tuple[Any,
     for variant in get_args(union):
         variant = strip_annotated_type(variant)
         if is_basemodel_type(variant):
-            if PYDANTIC_V2:
-                field = _extract_field_schema_pv2(variant, discriminator_field_name)
-                if not field:
+            if PYDANTIC_V1:
+                field_info = cast("dict[str, FieldInfo]", variant.__fields__).get(discriminator_field_name)  # pyright: ignore[reportDeprecated, reportUnnecessaryCast]
+                if not field_info:
                     continue
 
                 # Note: if one variant defines an alias then they all should
-                discriminator_alias = field.get("serialization_alias")
-
-                field_schema = field["schema"]
+                discriminator_alias = field_info.alias
 
-                if field_schema["type"] == "literal":
-                    for entry in cast("LiteralSchema", field_schema)["expected"]:
+                if (annotation := getattr(field_info, "annotation", None)) and is_literal_type(annotation):
+                    for entry in get_args(annotation):
                         if isinstance(entry, str):
                             mapping[entry] = variant
             else:
-                field_info = cast("dict[str, FieldInfo]", variant.__fields__).get(discriminator_field_name)  # pyright: ignore[reportDeprecated, reportUnnecessaryCast]
-                if not field_info:
+                field = _extract_field_schema_pv2(variant, discriminator_field_name)
+                if not field:
                     continue
 
                 # Note: if one variant defines an alias then they all should
-                discriminator_alias = field_info.alias
+                discriminator_alias = field.get("serialization_alias")
+
+                field_schema = field["schema"]
 
-                if field_info.annotation and is_literal_type(field_info.annotation):
-                    for entry in get_args(field_info.annotation):
+                if field_schema["type"] == "literal":
+                    for entry in cast("LiteralSchema", field_schema)["expected"]:
                         if isinstance(entry, str):
                             mapping[entry] = variant
 
@@ -613,21 +705,24 @@ def _build_discriminated_union_meta(*, union: type, meta_annotations: tuple[Any,
         discriminator_field=discriminator_field_name,
         discriminator_alias=discriminator_alias,
     )
-    cast(CachedDiscriminatorType, union).__discriminator__ = details
+    DISCRIMINATOR_CACHE.setdefault(union, details)
     return details
 
 
 def _extract_field_schema_pv2(model: type[BaseModel], field_name: str) -> ModelField | None:
     schema = model.__pydantic_core_schema__
+    if schema["type"] == "definitions":
+        schema = schema["schema"]
+
     if schema["type"] != "model":
         return None
 
+    schema = cast("ModelSchema", schema)
     fields_schema = schema["schema"]
     if fields_schema["type"] != "model-fields":
         return None
 
     fields_schema = cast("ModelFieldsSchema", fields_schema)
-
     field = fields_schema["fields"].get(field_name)
     if not field:
         return None
@@ -651,7 +746,7 @@ def set_pydantic_config(typ: Any, config: pydantic.ConfigDict) -> None:
     setattr(typ, "__pydantic_config__", config)  # noqa: B010
 
 
-# our use of subclasssing here causes weirdness for type checkers,
+# our use of subclassing here causes weirdness for type checkers,
 # so we just pretend that we don't subclass
 if TYPE_CHECKING:
     GenericModel = BaseModel
@@ -661,7 +756,7 @@ class GenericModel(BaseGenericModel, BaseModel):
         pass
 
 
-if PYDANTIC_V2:
+if not PYDANTIC_V1:
     from pydantic import TypeAdapter as _TypeAdapter
 
     _CachedTypeAdapter = cast("TypeAdapter[object]", lru_cache(maxsize=None)(_TypeAdapter))
@@ -706,8 +801,11 @@ class FinalRequestOptionsInput(TypedDict, total=False):
     timeout: float | Timeout | None
     files: HttpxRequestFiles | None
     idempotency_key: str
+    content: Union[bytes, bytearray, IO[bytes], Iterable[bytes], AsyncIterable[bytes], None]
     json_data: Body
     extra_json: AnyMapping
+    multipart_syntax: MultipartSyntax
+    follow_redirects: bool
 
 
 @final
@@ -720,19 +818,22 @@ class FinalRequestOptions(pydantic.BaseModel):
     timeout: Union[float, Timeout, None, NotGiven] = NotGiven()
     files: Union[HttpxRequestFiles, None] = None
     idempotency_key: Union[str, None] = None
+    multipart_syntax: Union[MultipartSyntax, None] = None
     post_parser: Union[Callable[[Any], Any], NotGiven] = NotGiven()
+    follow_redirects: Union[bool, None] = None
 
+    content: Union[bytes, bytearray, IO[bytes], Iterable[bytes], AsyncIterable[bytes], None] = None
     # It should be noted that we cannot use `json` here as that would override
     # a BaseModel method in an incompatible fashion.
     json_data: Union[Body, None] = None
     extra_json: Union[AnyMapping, None] = None
 
-    if PYDANTIC_V2:
-        model_config: ClassVar[ConfigDict] = ConfigDict(arbitrary_types_allowed=True)
-    else:
+    if PYDANTIC_V1:
 
         class Config(pydantic.BaseConfig):  # pyright: ignore[reportDeprecated]
             arbitrary_types_allowed: bool = True
+    else:
+        model_config: ClassVar[ConfigDict] = ConfigDict(arbitrary_types_allowed=True)
 
     def get_max_retries(self, max_retries: int) -> int:
         if isinstance(self.max_retries, NotGiven):
@@ -765,9 +866,9 @@ def construct(  # type: ignore
             key: strip_not_given(value)
             for key, value in values.items()
         }
-        if PYDANTIC_V2:
-            return super().model_construct(_fields_set, **kwargs)
-        return cast(FinalRequestOptions, super().construct(_fields_set, **kwargs))  # pyright: ignore[reportDeprecated]
+        if PYDANTIC_V1:
+            return cast(FinalRequestOptions, super().construct(_fields_set, **kwargs))  # pyright: ignore[reportDeprecated]
+        return super().model_construct(_fields_set, **kwargs)
 
     if not TYPE_CHECKING:
         # type checkers incorrectly complain about this assignment
diff --git a/src/cloudflare/_qs.py b/src/cloudflare/_qs.py
index 274320ca5ee..ada6fd3f721 100644
--- a/src/cloudflare/_qs.py
+++ b/src/cloudflare/_qs.py
@@ -4,7 +4,7 @@
 from urllib.parse import parse_qs, urlencode
 from typing_extensions import Literal, get_args
 
-from ._types import NOT_GIVEN, NotGiven, NotGivenOr
+from ._types import NotGiven, not_given
 from ._utils import flatten
 
 _T = TypeVar("_T")
@@ -41,8 +41,8 @@ def stringify(
         self,
         params: Params,
         *,
-        array_format: NotGivenOr[ArrayFormat] = NOT_GIVEN,
-        nested_format: NotGivenOr[NestedFormat] = NOT_GIVEN,
+        array_format: ArrayFormat | NotGiven = not_given,
+        nested_format: NestedFormat | NotGiven = not_given,
     ) -> str:
         return urlencode(
             self.stringify_items(
@@ -56,8 +56,8 @@ def stringify_items(
         self,
         params: Params,
         *,
-        array_format: NotGivenOr[ArrayFormat] = NOT_GIVEN,
-        nested_format: NotGivenOr[NestedFormat] = NOT_GIVEN,
+        array_format: ArrayFormat | NotGiven = not_given,
+        nested_format: NestedFormat | NotGiven = not_given,
     ) -> list[tuple[str, str]]:
         opts = Options(
             qs=self,
@@ -143,8 +143,8 @@ def __init__(
         self,
         qs: Querystring = _qs,
         *,
-        array_format: NotGivenOr[ArrayFormat] = NOT_GIVEN,
-        nested_format: NotGivenOr[NestedFormat] = NOT_GIVEN,
+        array_format: ArrayFormat | NotGiven = not_given,
+        nested_format: NestedFormat | NotGiven = not_given,
     ) -> None:
         self.array_format = qs.array_format if isinstance(array_format, NotGiven) else array_format
         self.nested_format = qs.nested_format if isinstance(nested_format, NotGiven) else nested_format
diff --git a/src/cloudflare/_response.py b/src/cloudflare/_response.py
index 50eb875a5af..c23d0dd7811 100644
--- a/src/cloudflare/_response.py
+++ b/src/cloudflare/_response.py
@@ -25,7 +25,7 @@
 import pydantic
 
 from ._types import NoneType
-from ._utils import is_given, extract_type_arg, is_annotated_type, extract_type_var_from_base
+from ._utils import is_given, extract_type_arg, is_annotated_type, is_type_alias_type, extract_type_var_from_base
 from ._models import BaseModel, is_basemodel
 from ._constants import RAW_RESPONSE_HEADER, OVERRIDE_CAST_TO_HEADER
 from ._streaming import Stream, AsyncStream, is_stream_class_type, extract_stream_chunk_type
@@ -55,6 +55,9 @@ class BaseAPIResponse(Generic[R]):
 
     http_response: httpx.Response
 
+    retries_taken: int
+    """The number of retries made. If no retries happened this will be `0`"""
+
     def __init__(
         self,
         *,
@@ -64,6 +67,7 @@ def __init__(
         stream: bool,
         stream_cls: type[Stream[Any]] | type[AsyncStream[Any]] | None,
         options: FinalRequestOptions,
+        retries_taken: int = 0,
     ) -> None:
         self._cast_to = cast_to
         self._client = client
@@ -72,6 +76,7 @@ def __init__(
         self._stream_cls = stream_cls
         self._options = options
         self.http_response = raw
+        self.retries_taken = retries_taken
 
     @property
     def headers(self) -> httpx.Headers:
@@ -121,9 +126,17 @@ def __repr__(self) -> str:
         )
 
     def _parse(self, *, to: type[_T] | None = None) -> R | _T:
+        cast_to = to if to is not None else self._cast_to
+
+        # unwrap `TypeAlias('Name', T)` -> `T`
+        if is_type_alias_type(cast_to):
+            cast_to = cast_to.__value__  # type: ignore[unreachable]
+
         # unwrap `Annotated[T, ...]` -> `T`
-        if to and is_annotated_type(to):
-            to = extract_type_arg(to, 0)
+        if cast_to and is_annotated_type(cast_to):
+            cast_to = extract_type_arg(cast_to, 0)
+
+        origin = get_origin(cast_to) or cast_to
 
         if self._is_sse_stream:
             if to:
@@ -159,18 +172,12 @@ def _parse(self, *, to: type[_T] | None = None) -> R | _T:
             return cast(
                 R,
                 stream_cls(
-                    cast_to=self._cast_to,
+                    cast_to=cast_to,
                     response=self.http_response,
                     client=cast(Any, self._client),
                 ),
             )
 
-        cast_to = to if to is not None else self._cast_to
-
-        # unwrap `Annotated[T, ...]` -> `T`
-        if is_annotated_type(cast_to):
-            cast_to = extract_type_arg(cast_to, 0)
-
         if cast_to is NoneType:
             return cast(R, None)
 
@@ -187,7 +194,8 @@ def _parse(self, *, to: type[_T] | None = None) -> R | _T:
         if cast_to == float:
             return cast(R, float(response.text))
 
-        origin = get_origin(cast_to) or cast_to
+        if cast_to == bool:
+            return cast(R, response.text.lower() == "true")
 
         if origin == APIResponse:
             raise RuntimeError("Unexpected state - cast_to is `APIResponse`")
@@ -202,7 +210,13 @@ def _parse(self, *, to: type[_T] | None = None) -> R | _T:
                 raise ValueError(f"Subclasses of httpx.Response cannot be passed to `cast_to`")
             return cast(R, response)
 
-        if inspect.isclass(origin) and not issubclass(origin, BaseModel) and issubclass(origin, pydantic.BaseModel):
+        if (
+            inspect.isclass(
+                origin  # pyright: ignore[reportUnknownArgumentType]
+            )
+            and not issubclass(origin, BaseModel)
+            and issubclass(origin, pydantic.BaseModel)
+        ):
             raise TypeError(
                 "Pydantic models must subclass our base model type, e.g. `from cloudflare import BaseModel`"
             )
@@ -221,7 +235,7 @@ def _parse(self, *, to: type[_T] | None = None) -> R | _T:
         # split is required to handle cases where additional information is included
         # in the response, e.g. application/json; charset=utf-8
         content_type, *_ = response.headers.get("content-type", "*").split(";")
-        if content_type != "application/json":
+        if not content_type.endswith("json"):
             if is_basemodel(cast_to):
                 try:
                     data = response.json()
@@ -257,12 +271,10 @@ def _parse(self, *, to: type[_T] | None = None) -> R | _T:
 
 class APIResponse(BaseAPIResponse[R]):
     @overload
-    def parse(self, *, to: type[_T]) -> _T:
-        ...
+    def parse(self, *, to: type[_T]) -> _T: ...
 
     @overload
-    def parse(self) -> R:
-        ...
+    def parse(self) -> R: ...
 
     def parse(self, *, to: type[_T] | None = None) -> R | _T:
         """Returns the rich python representation of this response's data.
@@ -361,12 +373,10 @@ def iter_lines(self) -> Iterator[str]:
 
 class AsyncAPIResponse(BaseAPIResponse[R]):
     @overload
-    async def parse(self, *, to: type[_T]) -> _T:
-        ...
+    async def parse(self, *, to: type[_T]) -> _T: ...
 
     @overload
-    async def parse(self) -> R:
-        ...
+    async def parse(self) -> R: ...
 
     async def parse(self, *, to: type[_T] | None = None) -> R | _T:
         """Returns the rich python representation of this response's data.
diff --git a/src/cloudflare/_streaming.py b/src/cloudflare/_streaming.py
index 0be44fec67a..d26f2aaf70a 100644
--- a/src/cloudflare/_streaming.py
+++ b/src/cloudflare/_streaming.py
@@ -54,12 +54,12 @@ def __stream__(self) -> Iterator[_T]:
         process_data = self._client._process_response_data
         iterator = self._iter_events()
 
-        for sse in iterator:
-            yield process_data(data=sse.json(), cast_to=cast_to, response=response)
-
-        # Ensure the entire stream is consumed
-        for _sse in iterator:
-            ...
+        try:
+            for sse in iterator:
+                yield process_data(data=sse.json(), cast_to=cast_to, response=response)
+        finally:
+            # Ensure the response is closed even if the consumer doesn't read all data
+            response.close()
 
     def __enter__(self) -> Self:
         return self
@@ -118,12 +118,12 @@ async def __stream__(self) -> AsyncIterator[_T]:
         process_data = self._client._process_response_data
         iterator = self._iter_events()
 
-        async for sse in iterator:
-            yield process_data(data=sse.json(), cast_to=cast_to, response=response)
-
-        # Ensure the entire stream is consumed
-        async for _sse in iterator:
-            ...
+        try:
+            async for sse in iterator:
+                yield process_data(data=sse.json(), cast_to=cast_to, response=response)
+        finally:
+            # Ensure the response is closed even if the consumer doesn't read all data
+            await response.aclose()
 
     async def __aenter__(self) -> Self:
         return self
diff --git a/src/cloudflare/_types.py b/src/cloudflare/_types.py
index c9d9bf596ca..e5a095d8f3f 100644
--- a/src/cloudflare/_types.py
+++ b/src/cloudflare/_types.py
@@ -13,10 +13,23 @@
     Mapping,
     TypeVar,
     Callable,
+    Iterable,
+    Iterator,
     Optional,
     Sequence,
+    AsyncIterable,
+)
+from typing_extensions import (
+    Set,
+    Literal,
+    Protocol,
+    TypeAlias,
+    TypedDict,
+    SupportsIndex,
+    overload,
+    override,
+    runtime_checkable,
 )
-from typing_extensions import Literal, Protocol, TypeAlias, TypedDict, override, runtime_checkable
 
 import httpx
 import pydantic
@@ -45,6 +58,13 @@
 else:
     Base64FileInput = Union[IO[bytes], PathLike]
     FileContent = Union[IO[bytes], bytes, PathLike]  # PathLike is not subscriptable in Python 3.8.
+
+
+# Used for sending raw binary data / streaming data in request bodies
+# e.g. for file uploads without multipart encoding
+BinaryTypes = Union[bytes, bytearray, IO[bytes], Iterable[bytes]]
+AsyncBinaryTypes = Union[bytes, bytearray, IO[bytes], AsyncIterable[bytes]]
+
 FileTypes = Union[
     # file (or bytes)
     FileContent,
@@ -71,6 +91,8 @@
 ]
 HttpxRequestFiles = Union[Mapping[str, HttpxFileTypes], Sequence[Tuple[str, HttpxFileTypes]]]
 
+MultipartSyntax = Literal["query", "json"]
+
 # Workaround to support (cast_to: Type[ResponseT]) -> ResponseT
 # where ResponseT includes `None`. In order to support directly
 # passing `None`, overloads would have to be defined for every
@@ -100,24 +122,28 @@ class RequestOptions(TypedDict, total=False):
     params: Query
     extra_json: AnyMapping
     idempotency_key: str
+    multipart_syntax: MultipartSyntax
+    follow_redirects: bool
 
 
 # Sentinel class used until PEP 0661 is accepted
 class NotGiven:
     """
-    A sentinel singleton class used to distinguish omitted keyword arguments
-    from those passed in with the value None (which may have different behavior).
+    For parameters with a meaningful None value, we need to distinguish between
+    the user explicitly passing None, and the user not passing the parameter at
+    all.
+
+    User code shouldn't need to use not_given directly.
 
     For example:
 
     ```py
-    def get(timeout: Union[int, NotGiven, None] = NotGiven()) -> Response:
-        ...
+    def create(timeout: Timeout | None | NotGiven = not_given): ...
 
 
-    get(timeout=1)  # 1s timeout
-    get(timeout=None)  # No timeout
-    get()  # Default timeout behavior, which may not be statically known at the method definition.
+    create(timeout=1)  # 1s timeout
+    create(timeout=None)  # No timeout
+    create()  # Default timeout behavior
     ```
     """
 
@@ -129,13 +155,14 @@ def __repr__(self) -> str:
         return "NOT_GIVEN"
 
 
-NotGivenOr = Union[_T, NotGiven]
+not_given = NotGiven()
+# for backwards compatibility:
 NOT_GIVEN = NotGiven()
 
 
 class Omit:
-    """In certain situations you need to be able to represent a case where a default value has
-    to be explicitly removed and `None` is not an appropriate substitute, for example:
+    """
+    To explicitly omit something from being sent in a request, use `omit`.
 
     ```py
     # as the default `Content-Type` header is `application/json` that will be sent
@@ -145,8 +172,8 @@ class Omit:
     # to look something like: 'multipart/form-data; boundary=0d8382fcf5f8c3be01ca2e11002d2983'
     client.post(..., headers={"Content-Type": "multipart/form-data"})
 
-    # instead you can remove the default `application/json` header by passing Omit
-    client.post(..., headers={"Content-Type": Omit()})
+    # instead you can remove the default `application/json` header by passing omit
+    client.post(..., headers={"Content-Type": omit})
     ```
     """
 
@@ -154,6 +181,9 @@ def __bool__(self) -> Literal[False]:
         return False
 
 
+omit = Omit()
+
+
 @runtime_checkable
 class ModelBuilderProtocol(Protocol):
     @classmethod
@@ -162,16 +192,14 @@ def build(
         *,
         response: Response,
         data: object,
-    ) -> _T:
-        ...
+    ) -> _T: ...
 
 
 Headers = Mapping[str, Union[str, Omit]]
 
 
 class HeadersLikeProtocol(Protocol):
-    def get(self, __key: str) -> str | None:
-        ...
+    def get(self, __key: str) -> str | None: ...
 
 
 HeadersLike = Union[Headers, HeadersLikeProtocol]
@@ -195,8 +223,8 @@ def get(self, __key: str) -> str | None:
 StrBytesIntFloat = Union[str, bytes, int, float]
 
 # Note: copied from Pydantic
-# https://github.com/pydantic/pydantic/blob/32ea570bf96e84234d2992e1ddf40ab8a565925a/pydantic/main.py#L49
-IncEx: TypeAlias = "set[int] | set[str] | dict[int, Any] | dict[str, Any] | None"
+# https://github.com/pydantic/pydantic/blob/6f31f8f68ef011f84357330186f603ff295312fd/pydantic/main.py#L79
+IncEx: TypeAlias = Union[Set[int], Set[str], Mapping[int, Union["IncEx", bool]], Mapping[str, Union["IncEx", bool]]]
 
 PostParser = Callable[[Any], Any]
 
@@ -218,3 +246,28 @@ class _GenericAlias(Protocol):
 
 class HttpxSendArgs(TypedDict, total=False):
     auth: httpx.Auth
+    follow_redirects: bool
+
+
+_T_co = TypeVar("_T_co", covariant=True)
+
+
+if TYPE_CHECKING:
+    # This works because str.__contains__ does not accept object (either in typeshed or at runtime)
+    # https://github.com/hauntsaninja/useful_types/blob/5e9710f3875107d068e7679fd7fec9cfab0eff3b/useful_types/__init__.py#L285
+    #
+    # Note: index() and count() methods are intentionally omitted to allow pyright to properly
+    # infer TypedDict types when dict literals are used in lists assigned to SequenceNotStr.
+    class SequenceNotStr(Protocol[_T_co]):
+        @overload
+        def __getitem__(self, index: SupportsIndex, /) -> _T_co: ...
+        @overload
+        def __getitem__(self, index: slice, /) -> Sequence[_T_co]: ...
+        def __contains__(self, value: object, /) -> bool: ...
+        def __len__(self) -> int: ...
+        def __iter__(self) -> Iterator[_T_co]: ...
+        def __reversed__(self) -> Iterator[_T_co]: ...
+else:
+    # just point this to a normal `Sequence` at runtime to avoid having to special case
+    # deserializing our custom sequence type
+    SequenceNotStr = Sequence
diff --git a/src/cloudflare/_utils/__init__.py b/src/cloudflare/_utils/__init__.py
index 3efe66c8e85..dc64e29a1c0 100644
--- a/src/cloudflare/_utils/__init__.py
+++ b/src/cloudflare/_utils/__init__.py
@@ -6,10 +6,10 @@
     is_list as is_list,
     is_given as is_given,
     is_tuple as is_tuple,
+    json_safe as json_safe,
     lru_cache as lru_cache,
     is_mapping as is_mapping,
     is_tuple_t as is_tuple_t,
-    parse_date as parse_date,
     is_iterable as is_iterable,
     is_sequence as is_sequence,
     coerce_float as coerce_float,
@@ -22,7 +22,6 @@
     coerce_boolean as coerce_boolean,
     coerce_integer as coerce_integer,
     file_from_path as file_from_path,
-    parse_datetime as parse_datetime,
     strip_not_given as strip_not_given,
     deepcopy_minimal as deepcopy_minimal,
     get_async_library as get_async_library,
@@ -31,13 +30,22 @@
     maybe_coerce_boolean as maybe_coerce_boolean,
     maybe_coerce_integer as maybe_coerce_integer,
 )
+from ._compat import (
+    get_args as get_args,
+    is_union as is_union,
+    get_origin as get_origin,
+    is_typeddict as is_typeddict,
+    is_literal_type as is_literal_type,
+)
 from ._typing import (
     is_list_type as is_list_type,
     is_union_type as is_union_type,
     extract_type_arg as extract_type_arg,
     is_iterable_type as is_iterable_type,
     is_required_type as is_required_type,
+    is_sequence_type as is_sequence_type,
     is_annotated_type as is_annotated_type,
+    is_type_alias_type as is_type_alias_type,
     strip_annotated_type as strip_annotated_type,
     extract_type_var_from_base as extract_type_var_from_base,
 )
@@ -53,3 +61,4 @@
     function_has_argument as function_has_argument,
     assert_signatures_in_sync as assert_signatures_in_sync,
 )
+from ._datetime_parse import parse_date as parse_date, parse_datetime as parse_datetime
diff --git a/src/cloudflare/_utils/_compat.py b/src/cloudflare/_utils/_compat.py
new file mode 100644
index 00000000000..dd703233c56
--- /dev/null
+++ b/src/cloudflare/_utils/_compat.py
@@ -0,0 +1,45 @@
+from __future__ import annotations
+
+import sys
+import typing_extensions
+from typing import Any, Type, Union, Literal, Optional
+from datetime import date, datetime
+from typing_extensions import get_args as _get_args, get_origin as _get_origin
+
+from .._types import StrBytesIntFloat
+from ._datetime_parse import parse_date as _parse_date, parse_datetime as _parse_datetime
+
+_LITERAL_TYPES = {Literal, typing_extensions.Literal}
+
+
+def get_args(tp: type[Any]) -> tuple[Any, ...]:
+    return _get_args(tp)
+
+
+def get_origin(tp: type[Any]) -> type[Any] | None:
+    return _get_origin(tp)
+
+
+def is_union(tp: Optional[Type[Any]]) -> bool:
+    if sys.version_info < (3, 10):
+        return tp is Union  # type: ignore[comparison-overlap]
+    else:
+        import types
+
+        return tp is Union or tp is types.UnionType
+
+
+def is_typeddict(tp: Type[Any]) -> bool:
+    return typing_extensions.is_typeddict(tp)
+
+
+def is_literal_type(tp: Type[Any]) -> bool:
+    return get_origin(tp) in _LITERAL_TYPES
+
+
+def parse_date(value: Union[date, StrBytesIntFloat]) -> date:
+    return _parse_date(value)
+
+
+def parse_datetime(value: Union[datetime, StrBytesIntFloat]) -> datetime:
+    return _parse_datetime(value)
diff --git a/src/cloudflare/_utils/_datetime_parse.py b/src/cloudflare/_utils/_datetime_parse.py
new file mode 100644
index 00000000000..7cb9d9e668c
--- /dev/null
+++ b/src/cloudflare/_utils/_datetime_parse.py
@@ -0,0 +1,136 @@
+"""
+This file contains code from https://github.com/pydantic/pydantic/blob/main/pydantic/v1/datetime_parse.py
+without the Pydantic v1 specific errors.
+"""
+
+from __future__ import annotations
+
+import re
+from typing import Dict, Union, Optional
+from datetime import date, datetime, timezone, timedelta
+
+from .._types import StrBytesIntFloat
+
+date_expr = r"(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})"
+time_expr = (
+    r"(?P<hour>\d{1,2}):(?P<minute>\d{1,2})"
+    r"(?::(?P<second>\d{1,2})(?:\.(?P<microsecond>\d{1,6})\d{0,6})?)?"
+    r"(?P<tzinfo>Z|[+-]\d{2}(?::?\d{2})?)?$"
+)
+
+date_re = re.compile(f"{date_expr}$")
+datetime_re = re.compile(f"{date_expr}[T ]{time_expr}")
+
+
+EPOCH = datetime(1970, 1, 1)
+# if greater than this, the number is in ms, if less than or equal it's in seconds
+# (in seconds this is 11th October 2603, in ms it's 20th August 1970)
+MS_WATERSHED = int(2e10)
+# slightly more than datetime.max in ns - (datetime.max - EPOCH).total_seconds() * 1e9
+MAX_NUMBER = int(3e20)
+
+
+def _get_numeric(value: StrBytesIntFloat, native_expected_type: str) -> Union[None, int, float]:
+    if isinstance(value, (int, float)):
+        return value
+    try:
+        return float(value)
+    except ValueError:
+        return None
+    except TypeError:
+        raise TypeError(f"invalid type; expected {native_expected_type}, string, bytes, int or float") from None
+
+
+def _from_unix_seconds(seconds: Union[int, float]) -> datetime:
+    if seconds > MAX_NUMBER:
+        return datetime.max
+    elif seconds < -MAX_NUMBER:
+        return datetime.min
+
+    while abs(seconds) > MS_WATERSHED:
+        seconds /= 1000
+    dt = EPOCH + timedelta(seconds=seconds)
+    return dt.replace(tzinfo=timezone.utc)
+
+
+def _parse_timezone(value: Optional[str]) -> Union[None, int, timezone]:
+    if value == "Z":
+        return timezone.utc
+    elif value is not None:
+        offset_mins = int(value[-2:]) if len(value) > 3 else 0
+        offset = 60 * int(value[1:3]) + offset_mins
+        if value[0] == "-":
+            offset = -offset
+        return timezone(timedelta(minutes=offset))
+    else:
+        return None
+
+
+def parse_datetime(value: Union[datetime, StrBytesIntFloat]) -> datetime:
+    """
+    Parse a datetime/int/float/string and return a datetime.datetime.
+
+    This function supports time zone offsets. When the input contains one,
+    the output uses a timezone with a fixed offset from UTC.
+
+    Raise ValueError if the input is well formatted but not a valid datetime.
+    Raise ValueError if the input isn't well formatted.
+    """
+    if isinstance(value, datetime):
+        return value
+
+    number = _get_numeric(value, "datetime")
+    if number is not None:
+        return _from_unix_seconds(number)
+
+    if isinstance(value, bytes):
+        value = value.decode()
+
+    assert not isinstance(value, (float, int))
+
+    match = datetime_re.match(value)
+    if match is None:
+        raise ValueError("invalid datetime format")
+
+    kw = match.groupdict()
+    if kw["microsecond"]:
+        kw["microsecond"] = kw["microsecond"].ljust(6, "0")
+
+    tzinfo = _parse_timezone(kw.pop("tzinfo"))
+    kw_: Dict[str, Union[None, int, timezone]] = {k: int(v) for k, v in kw.items() if v is not None}
+    kw_["tzinfo"] = tzinfo
+
+    return datetime(**kw_)  # type: ignore
+
+
+def parse_date(value: Union[date, StrBytesIntFloat]) -> date:
+    """
+    Parse a date/int/float/string and return a datetime.date.
+
+    Raise ValueError if the input is well formatted but not a valid date.
+    Raise ValueError if the input isn't well formatted.
+    """
+    if isinstance(value, date):
+        if isinstance(value, datetime):
+            return value.date()
+        else:
+            return value
+
+    number = _get_numeric(value, "date")
+    if number is not None:
+        return _from_unix_seconds(number).date()
+
+    if isinstance(value, bytes):
+        value = value.decode()
+
+    assert not isinstance(value, (float, int))
+    match = date_re.match(value)
+    if match is None:
+        raise ValueError("invalid date format")
+
+    kw = {k: int(v) for k, v in match.groupdict().items()}
+
+    try:
+        return date(**kw)
+    except ValueError:
+        raise ValueError("invalid date format") from None
diff --git a/src/cloudflare/_utils/_proxy.py b/src/cloudflare/_utils/_proxy.py
index c46a62a6982..0f239a33c6d 100644
--- a/src/cloudflare/_utils/_proxy.py
+++ b/src/cloudflare/_utils/_proxy.py
@@ -46,7 +46,10 @@ def __dir__(self) -> Iterable[str]:
     @property  # type: ignore
     @override
     def __class__(self) -> type:  # pyright: ignore
-        proxied = self.__get_proxied__()
+        try:
+            proxied = self.__get_proxied__()
+        except Exception:
+            return type(self)
         if issubclass(type(proxied), LazyProxy):
             return type(proxied)
         return proxied.__class__
@@ -59,5 +62,4 @@ def __as_proxied__(self) -> T:
         return cast(T, self)
 
     @abstractmethod
-    def __load__(self) -> T:
-        ...
+    def __load__(self) -> T: ...
diff --git a/src/cloudflare/_utils/_reflection.py b/src/cloudflare/_utils/_reflection.py
index 9a53c7bd21c..89aa712ac4c 100644
--- a/src/cloudflare/_utils/_reflection.py
+++ b/src/cloudflare/_utils/_reflection.py
@@ -34,7 +34,7 @@ def assert_signatures_in_sync(
 
         if custom_param.annotation != source_param.annotation:
             errors.append(
-                f"types for the `{name}` param are do not match; source={repr(source_param.annotation)} checking={repr(source_param.annotation)}"
+                f"types for the `{name}` param are do not match; source={repr(source_param.annotation)} checking={repr(custom_param.annotation)}"
             )
             continue
 
diff --git a/src/cloudflare/_utils/_resources_proxy.py b/src/cloudflare/_utils/_resources_proxy.py
new file mode 100644
index 00000000000..f7fa42f9c30
--- /dev/null
+++ b/src/cloudflare/_utils/_resources_proxy.py
@@ -0,0 +1,24 @@
+from __future__ import annotations
+
+from typing import Any
+from typing_extensions import override
+
+from ._proxy import LazyProxy
+
+
+class ResourcesProxy(LazyProxy[Any]):
+    """A proxy for the `cloudflare.resources` module.
+
+    This is used so that we can lazily import `cloudflare.resources` only when
+    needed *and* so that users can just import `cloudflare` and reference `cloudflare.resources`
+    """
+
+    @override
+    def __load__(self) -> Any:
+        import importlib
+
+        mod = importlib.import_module("cloudflare.resources")
+        return mod
+
+
+resources = ResourcesProxy().__as_proxied__()
diff --git a/src/cloudflare/_utils/_sync.py b/src/cloudflare/_utils/_sync.py
index d0d810337ec..f6027c183d1 100644
--- a/src/cloudflare/_utils/_sync.py
+++ b/src/cloudflare/_utils/_sync.py
@@ -1,56 +1,49 @@
 from __future__ import annotations
 
+import asyncio
 import functools
 from typing import TypeVar, Callable, Awaitable
 from typing_extensions import ParamSpec
 
 import anyio
+import sniffio
 import anyio.to_thread
 
-from ._reflection import function_has_argument
-
 T_Retval = TypeVar("T_Retval")
 T_ParamSpec = ParamSpec("T_ParamSpec")
 
 
-# copied from `asyncer`, https://github.com/tiangolo/asyncer
-def asyncify(
-    function: Callable[T_ParamSpec, T_Retval],
-    *,
-    cancellable: bool = False,
-    limiter: anyio.CapacityLimiter | None = None,
-) -> Callable[T_ParamSpec, Awaitable[T_Retval]]:
+async def to_thread(
+    func: Callable[T_ParamSpec, T_Retval], /, *args: T_ParamSpec.args, **kwargs: T_ParamSpec.kwargs
+) -> T_Retval:
+    if sniffio.current_async_library() == "asyncio":
+        return await asyncio.to_thread(func, *args, **kwargs)
+
+    return await anyio.to_thread.run_sync(
+        functools.partial(func, *args, **kwargs),
+    )
+
+
+# inspired by `asyncer`, https://github.com/tiangolo/asyncer
+def asyncify(function: Callable[T_ParamSpec, T_Retval]) -> Callable[T_ParamSpec, Awaitable[T_Retval]]:
     """
     Take a blocking function and create an async one that receives the same
-    positional and keyword arguments, and that when called, calls the original function
-    in a worker thread using `anyio.to_thread.run_sync()`. Internally,
-    `asyncer.asyncify()` uses the same `anyio.to_thread.run_sync()`, but it supports
-    keyword arguments additional to positional arguments and it adds better support for
-    autocompletion and inline errors for the arguments of the function called and the
-    return value.
-
-    If the `cancellable` option is enabled and the task waiting for its completion is
-    cancelled, the thread will still run its course but its return value (or any raised
-    exception) will be ignored.
+    positional and keyword arguments.
 
-    Use it like this:
+    Usage:
 
-    ```Python
-    def do_work(arg1, arg2, kwarg1="", kwarg2="") -> str:
-        # Do work
-        return "Some result"
+    ```python
+    def blocking_func(arg1, arg2, kwarg1=None):
+        # blocking code
+        return result
 
 
-    result = await to_thread.asyncify(do_work)("spam", "ham", kwarg1="a", kwarg2="b")
-    print(result)
+    result = asyncify(blocking_function)(arg1, arg2, kwarg1=value1)
     ```
 
     ## Arguments
 
     `function`: a blocking regular callable (e.g. a function)
-    `cancellable`: `True` to allow cancellation of the operation
-    `limiter`: capacity limiter to use to limit the total amount of threads running
-        (if omitted, the default limiter is used)
 
     ## Return
 
@@ -60,22 +53,6 @@ def do_work(arg1, arg2, kwarg1="", kwarg2="") -> str:
     """
 
     async def wrapper(*args: T_ParamSpec.args, **kwargs: T_ParamSpec.kwargs) -> T_Retval:
-        partial_f = functools.partial(function, *args, **kwargs)
-
-        # In `v4.1.0` anyio added the `abandon_on_cancel` argument and deprecated the old
-        # `cancellable` argument, so we need to use the new `abandon_on_cancel` to avoid
-        # surfacing deprecation warnings.
-        if function_has_argument(anyio.to_thread.run_sync, "abandon_on_cancel"):
-            return await anyio.to_thread.run_sync(
-                partial_f,
-                abandon_on_cancel=cancellable,
-                limiter=limiter,
-            )
-
-        return await anyio.to_thread.run_sync(
-            partial_f,
-            cancellable=cancellable,
-            limiter=limiter,
-        )
+        return await to_thread(function, *args, **kwargs)
 
     return wrapper
diff --git a/src/cloudflare/_utils/_transform.py b/src/cloudflare/_utils/_transform.py
index 47e262a515d..5207549207e 100644
--- a/src/cloudflare/_utils/_transform.py
+++ b/src/cloudflare/_utils/_transform.py
@@ -5,27 +5,31 @@
 import pathlib
 from typing import Any, Mapping, TypeVar, cast
 from datetime import date, datetime
-from typing_extensions import Literal, get_args, override, get_type_hints
+from typing_extensions import Literal, get_args, override, get_type_hints as _get_type_hints
 
 import anyio
 import pydantic
 
 from ._utils import (
     is_list,
+    is_given,
+    lru_cache,
     is_mapping,
     is_iterable,
+    is_sequence,
 )
 from .._files import is_base64_file_input
+from ._compat import get_origin, is_typeddict
 from ._typing import (
     is_list_type,
     is_union_type,
     extract_type_arg,
     is_iterable_type,
     is_required_type,
+    is_sequence_type,
     is_annotated_type,
     strip_annotated_type,
 )
-from .._compat import model_dump, is_typeddict
 
 _T = TypeVar("_T")
 
@@ -108,6 +112,7 @@ class Params(TypedDict, total=False):
     return cast(_T, transformed)
 
 
+@lru_cache(maxsize=8096)
 def _get_annotated_type(type_: type) -> type | None:
     """If the given type is an `Annotated` type then it is returned, if not `None` is returned.
 
@@ -126,7 +131,7 @@ def _get_annotated_type(type_: type) -> type | None:
 def _maybe_transform_key(key: str, type_: type) -> str:
     """Transform the given `data` based on the annotations provided in `type_`.
 
-    Note: this function only looks at `Annotated` types that contain `PropertInfo` metadata.
+    Note: this function only looks at `Annotated` types that contain `PropertyInfo` metadata.
     """
     annotated_type = _get_annotated_type(type_)
     if annotated_type is None:
@@ -142,6 +147,10 @@ def _maybe_transform_key(key: str, type_: type) -> str:
     return key
 
 
+def _no_transform_needed(annotation: type) -> bool:
+    return annotation == float or annotation == int
+
+
 def _transform_recursive(
     data: object,
     *,
@@ -160,20 +169,43 @@ def _transform_recursive(
 
             Defaults to the same value as the `annotation` argument.
     """
+    from .._compat import model_dump
+
     if inner_type is None:
         inner_type = annotation
 
     stripped_type = strip_annotated_type(inner_type)
+    origin = get_origin(stripped_type) or stripped_type
     if is_typeddict(stripped_type) and is_mapping(data):
         return _transform_typeddict(data, stripped_type)
 
+    if origin == dict and is_mapping(data):
+        items_type = get_args(stripped_type)[1]
+        return {key: _transform_recursive(value, annotation=items_type) for key, value in data.items()}
+
     if (
         # List[T]
         (is_list_type(stripped_type) and is_list(data))
         # Iterable[T]
         or (is_iterable_type(stripped_type) and is_iterable(data) and not isinstance(data, str))
+        # Sequence[T]
+        or (is_sequence_type(stripped_type) and is_sequence(data) and not isinstance(data, str))
     ):
+        # dicts are technically iterable, but it is an iterable on the keys of the dict and is not usually
+        # intended as an iterable, so we don't transform it.
+        if isinstance(data, dict):
+            return cast(object, data)
+
         inner_type = extract_type_arg(stripped_type, 0)
+        if _no_transform_needed(inner_type):
+            # for some types there is no need to transform anything, so we can get a small
+            # perf boost from skipping that work.
+            #
+            # but we still need to convert to a list to ensure the data is json-serializable
+            if is_list(data):
+                return data
+            return list(data)
+
         return [_transform_recursive(d, annotation=annotation, inner_type=inner_type) for d in data]
 
     if is_union_type(stripped_type):
@@ -186,7 +218,7 @@ def _transform_recursive(
         return data
 
     if isinstance(data, pydantic.BaseModel):
-        return model_dump(data, exclude_unset=True)
+        return model_dump(data, exclude_unset=True, mode="json")
 
     annotated_type = _get_annotated_type(annotation)
     if annotated_type is None:
@@ -235,6 +267,11 @@ def _transform_typeddict(
     result: dict[str, object] = {}
     annotations = get_type_hints(expected_type, include_extras=True)
     for key, value in data.items():
+        if not is_given(value):
+            # we don't need to include omitted values here as they'll
+            # be stripped out before the request is sent anyway
+            continue
+
         type_ = annotations.get(key)
         if type_ is None:
             # we do not have a type annotation for this field, leave it as is
@@ -298,20 +335,43 @@ async def _async_transform_recursive(
 
             Defaults to the same value as the `annotation` argument.
     """
+    from .._compat import model_dump
+
     if inner_type is None:
         inner_type = annotation
 
     stripped_type = strip_annotated_type(inner_type)
+    origin = get_origin(stripped_type) or stripped_type
     if is_typeddict(stripped_type) and is_mapping(data):
         return await _async_transform_typeddict(data, stripped_type)
 
+    if origin == dict and is_mapping(data):
+        items_type = get_args(stripped_type)[1]
+        return {key: _transform_recursive(value, annotation=items_type) for key, value in data.items()}
+
     if (
         # List[T]
         (is_list_type(stripped_type) and is_list(data))
         # Iterable[T]
         or (is_iterable_type(stripped_type) and is_iterable(data) and not isinstance(data, str))
+        # Sequence[T]
+        or (is_sequence_type(stripped_type) and is_sequence(data) and not isinstance(data, str))
     ):
+        # dicts are technically iterable, but it is an iterable on the keys of the dict and is not usually
+        # intended as an iterable, so we don't transform it.
+        if isinstance(data, dict):
+            return cast(object, data)
+
         inner_type = extract_type_arg(stripped_type, 0)
+        if _no_transform_needed(inner_type):
+            # for some types there is no need to transform anything, so we can get a small
+            # perf boost from skipping that work.
+            #
+            # but we still need to convert to a list to ensure the data is json-serializable
+            if is_list(data):
+                return data
+            return list(data)
+
         return [await _async_transform_recursive(d, annotation=annotation, inner_type=inner_type) for d in data]
 
     if is_union_type(stripped_type):
@@ -324,7 +384,7 @@ async def _async_transform_recursive(
         return data
 
     if isinstance(data, pydantic.BaseModel):
-        return model_dump(data, exclude_unset=True)
+        return model_dump(data, exclude_unset=True, mode="json")
 
     annotated_type = _get_annotated_type(annotation)
     if annotated_type is None:
@@ -373,6 +433,11 @@ async def _async_transform_typeddict(
     result: dict[str, object] = {}
     annotations = get_type_hints(expected_type, include_extras=True)
     for key, value in data.items():
+        if not is_given(value):
+            # we don't need to include omitted values here as they'll
+            # be stripped out before the request is sent anyway
+            continue
+
         type_ = annotations.get(key)
         if type_ is None:
             # we do not have a type annotation for this field, leave it as is
@@ -380,3 +445,13 @@ async def _async_transform_typeddict(
         else:
             result[_maybe_transform_key(key, type_)] = await _async_transform_recursive(value, annotation=type_)
     return result
+
+
+@lru_cache(maxsize=8096)
+def get_type_hints(
+    obj: Any,
+    globalns: dict[str, Any] | None = None,
+    localns: Mapping[str, Any] | None = None,
+    include_extras: bool = False,
+) -> dict[str, Any]:
+    return _get_type_hints(obj, globalns=globalns, localns=localns, include_extras=include_extras)
diff --git a/src/cloudflare/_utils/_typing.py b/src/cloudflare/_utils/_typing.py
index c036991f043..193109f3ad2 100644
--- a/src/cloudflare/_utils/_typing.py
+++ b/src/cloudflare/_utils/_typing.py
@@ -1,11 +1,21 @@
 from __future__ import annotations
 
+import sys
+import typing
+import typing_extensions
 from typing import Any, TypeVar, Iterable, cast
 from collections import abc as _c_abc
-from typing_extensions import Required, Annotated, get_args, get_origin
-
+from typing_extensions import (
+    TypeIs,
+    Required,
+    Annotated,
+    get_args,
+    get_origin,
+)
+
+from ._utils import lru_cache
 from .._types import InheritsGeneric
-from .._compat import is_union as _is_union
+from ._compat import is_union as _is_union
 
 
 def is_annotated_type(typ: type) -> bool:
@@ -16,6 +26,11 @@ def is_list_type(typ: type) -> bool:
     return (get_origin(typ) or typ) == list
 
 
+def is_sequence_type(typ: type) -> bool:
+    origin = get_origin(typ) or typ
+    return origin == typing_extensions.Sequence or origin == typing.Sequence or origin == _c_abc.Sequence
+
+
 def is_iterable_type(typ: type) -> bool:
     """If the given type is `typing.Iterable[T]`"""
     origin = get_origin(typ) or typ
@@ -36,7 +51,28 @@ def is_typevar(typ: type) -> bool:
     return type(typ) == TypeVar  # type: ignore
 
 
+_TYPE_ALIAS_TYPES: tuple[type[typing_extensions.TypeAliasType], ...] = (typing_extensions.TypeAliasType,)
+if sys.version_info >= (3, 12):
+    _TYPE_ALIAS_TYPES = (*_TYPE_ALIAS_TYPES, typing.TypeAliasType)
+
+
+def is_type_alias_type(tp: Any, /) -> TypeIs[typing_extensions.TypeAliasType]:
+    """Return whether the provided argument is an instance of `TypeAliasType`.
+
+    ```python
+    type Int = int
+    is_type_alias_type(Int)
+    # > True
+    Str = TypeAliasType("Str", str)
+    is_type_alias_type(Str)
+    # > True
+    ```
+    """
+    return isinstance(tp, _TYPE_ALIAS_TYPES)
+
+
 # Extracts T from Annotated[T, ...] or from Required[Annotated[T, ...]]
+@lru_cache(maxsize=8096)
 def strip_annotated_type(typ: type) -> type:
     if is_required_type(typ) or is_annotated_type(typ):
         return strip_annotated_type(cast(type, get_args(typ)[0]))
@@ -79,7 +115,7 @@ class MyResponse(Foo[_T]):
     ```
     """
     cls = cast(object, get_origin(typ) or typ)
-    if cls in generic_bases:
+    if cls in generic_bases:  # pyright: ignore[reportUnnecessaryContains]
         # we're given the class directly
         return extract_type_arg(typ, index)
 
diff --git a/src/cloudflare/_utils/_utils.py b/src/cloudflare/_utils/_utils.py
index 34797c29057..eec7f4a1f23 100644
--- a/src/cloudflare/_utils/_utils.py
+++ b/src/cloudflare/_utils/_utils.py
@@ -16,12 +16,12 @@
     overload,
 )
 from pathlib import Path
+from datetime import date, datetime
 from typing_extensions import TypeGuard
 
 import sniffio
 
-from .._types import NotGiven, FileTypes, NotGivenOr, HeadersLike
-from .._compat import parse_date as parse_date, parse_datetime as parse_datetime
+from .._types import Omit, NotGiven, FileTypes, HeadersLike
 
 _T = TypeVar("_T")
 _TupleT = TypeVar("_TupleT", bound=Tuple[object, ...])
@@ -63,7 +63,7 @@ def _extract_items(
     try:
         key = path[index]
     except IndexError:
-        if isinstance(obj, NotGiven):
+        if not is_given(obj):
             # no value was provided - we can safely ignore
             return []
 
@@ -71,8 +71,16 @@ def _extract_items(
         from .._files import assert_is_file_content
 
         # We have exhausted the path, return the entry we found.
-        assert_is_file_content(obj, key=flattened_key)
         assert flattened_key is not None
+
+        if is_list(obj):
+            files: list[tuple[str, FileTypes]] = []
+            for entry in obj:
+                assert_is_file_content(entry, key=flattened_key + "[]" if flattened_key else "")
+                files.append((flattened_key + "[]", cast(FileTypes, entry)))
+            return files
+
+        assert_is_file_content(obj, key=flattened_key)
         return [(flattened_key, cast(FileTypes, obj))]
 
     index += 1
@@ -118,14 +126,14 @@ def _extract_items(
     return []
 
 
-def is_given(obj: NotGivenOr[_T]) -> TypeGuard[_T]:
-    return not isinstance(obj, NotGiven)
+def is_given(obj: _T | NotGiven | Omit) -> TypeGuard[_T]:
+    return not isinstance(obj, NotGiven) and not isinstance(obj, Omit)
 
 
 # Type safe methods for narrowing types with TypeVars.
 # The default narrowing for isinstance(obj, dict) is dict[unknown, unknown],
 # however this cause Pyright to rightfully report errors. As we know we don't
-# care about the contained types we can safely use `object` in it's place.
+# care about the contained types we can safely use `object` in its place.
 #
 # There are two separate functions defined, `is_*` and `is_*_t` for different use cases.
 # `is_*` is for when you're dealing with an unknown input
@@ -211,20 +219,17 @@ def required_args(*variants: Sequence[str]) -> Callable[[CallableT], CallableT]:
     Example usage:
     ```py
     @overload
-    def foo(*, a: str) -> str:
-        ...
+    def foo(*, a: str) -> str: ...
 
 
     @overload
-    def foo(*, b: bool) -> str:
-        ...
+    def foo(*, b: bool) -> str: ...
 
 
     # This enforces the same constraints that a static type checker would
     # i.e. that either a or b must be passed to the function
     @required_args(["a"], ["b"])
-    def foo(*, a: str | None = None, b: bool | None = None) -> str:
-        ...
+    def foo(*, a: str | None = None, b: bool | None = None) -> str: ...
     ```
     """
 
@@ -286,18 +291,15 @@ def wrapper(*args: object, **kwargs: object) -> object:
 
 
 @overload
-def strip_not_given(obj: None) -> None:
-    ...
+def strip_not_given(obj: None) -> None: ...
 
 
 @overload
-def strip_not_given(obj: Mapping[_K, _V | NotGiven]) -> dict[_K, _V]:
-    ...
+def strip_not_given(obj: Mapping[_K, _V | NotGiven]) -> dict[_K, _V]: ...
 
 
 @overload
-def strip_not_given(obj: object) -> object:
-    ...
+def strip_not_given(obj: object) -> object: ...
 
 
 def strip_not_given(obj: object | None) -> object:
@@ -369,12 +371,13 @@ def file_from_path(path: str) -> FileTypes:
 
 def get_required_header(headers: HeadersLike, header: str) -> str:
     lower_header = header.lower()
-    if isinstance(headers, Mapping):
-        for k, v in headers.items():
+    if is_mapping_t(headers):
+        # mypy doesn't understand the type narrowing here
+        for k, v in headers.items():  # type: ignore
             if k.lower() == lower_header and isinstance(v, str):
                 return v
 
-    """ to deal with the case where the header looks like Stainless-Event-Id """
+    # to deal with the case where the header looks like Stainless-Event-Id
     intercaps_header = re.sub(r"([^\w])(\w)", lambda pat: pat.group(1) + pat.group(2).upper(), header.capitalize())
 
     for normalized_header in [header, lower_header, header.upper(), intercaps_header]:
@@ -400,3 +403,19 @@ def lru_cache(*, maxsize: int | None = 128) -> Callable[[CallableT], CallableT]:
         maxsize=maxsize,
     )
     return cast(Any, wrapper)  # type: ignore[no-any-return]
+
+
+def json_safe(data: object) -> object:
+    """Translates a mapping / sequence recursively in the same fashion
+    as `pydantic` v2's `model_dump(mode="json")`.
+    """
+    if is_mapping(data):
+        return {json_safe(key): json_safe(value) for key, value in data.items()}
+
+    if is_iterable(data) and not isinstance(data, (str, bytes, bytearray)):
+        return [json_safe(item) for item in data]
+
+    if isinstance(data, (datetime, date)):
+        return data.isoformat()
+
+    return data
diff --git a/src/cloudflare/_version.py b/src/cloudflare/_version.py
index bb20a7d3b8f..d358440ad0c 100644
--- a/src/cloudflare/_version.py
+++ b/src/cloudflare/_version.py
@@ -1,4 +1,4 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 __title__ = "cloudflare"
-__version__ = "3.1.1"  # x-release-please-version
+__version__ = "5.0.0-beta.1"  # x-release-please-version
diff --git a/src/cloudflare/pagination.py b/src/cloudflare/pagination.py
index 7d52fed691a..ee3916506ff 100644
--- a/src/cloudflare/pagination.py
+++ b/src/cloudflare/pagination.py
@@ -17,6 +17,10 @@
     "CursorPaginationResultInfo",
     "SyncCursorPagination",
     "AsyncCursorPagination",
+    "CursorPaginationAfterResultInfo",
+    "CursorPaginationAfterCursors",
+    "SyncCursorPaginationAfter",
+    "AsyncCursorPaginationAfter",
     "CursorLimitPaginationResultInfo",
     "SyncCursorLimitPagination",
     "AsyncCursorLimitPagination",
@@ -45,7 +49,8 @@ class SyncV4PagePagination(BaseSyncPage[_T], BasePage[_T], Generic[_T]):
     def _get_page_items(self) -> List[_T]:
         items = None
         if self.result is not None:
-            items = self.result.items
+            if self.result.items is not None:
+                items = self.result.items
         if not items:
             return []
         return items
@@ -65,7 +70,8 @@ class AsyncV4PagePagination(BaseAsyncPage[_T], BasePage[_T], Generic[_T]):
     def _get_page_items(self) -> List[_T]:
         items = None
         if self.result is not None:
-            items = self.result.items
+            if self.result.items is not None:
+                items = self.result.items
         if not items:
             return []
         return items
@@ -142,7 +148,8 @@ def _get_page_items(self) -> List[_T]:
     def next_page_info(self) -> Optional[PageInfo]:
         cursor = None
         if self.result_info is not None:
-            cursor = self.result_info.cursor
+            if self.result_info.cursor is not None:
+                cursor = self.result_info.cursor
         if not cursor:
             return None
 
@@ -164,13 +171,70 @@ def _get_page_items(self) -> List[_T]:
     def next_page_info(self) -> Optional[PageInfo]:
         cursor = None
         if self.result_info is not None:
-            cursor = self.result_info.cursor
+            if self.result_info.cursor is not None:
+                cursor = self.result_info.cursor
         if not cursor:
             return None
 
         return PageInfo(params={"cursor": cursor})
 
 
+class CursorPaginationAfterCursors(BaseModel):
+    after: Optional[str] = None
+
+
+class CursorPaginationAfterResultInfo(BaseModel):
+    cursors: Optional[CursorPaginationAfterCursors] = None
+
+
+class SyncCursorPaginationAfter(BaseSyncPage[_T], BasePage[_T], Generic[_T]):
+    result: List[_T]
+    result_info: Optional[CursorPaginationAfterResultInfo] = None
+
+    @override
+    def _get_page_items(self) -> List[_T]:
+        result = self.result
+        if not result:
+            return []
+        return result
+
+    @override
+    def next_page_info(self) -> Optional[PageInfo]:
+        after = None
+        if self.result_info is not None:
+            if self.result_info.cursors is not None:
+                if self.result_info.cursors.after is not None:
+                    after = self.result_info.cursors.after
+        if not after:
+            return None
+
+        return PageInfo(params={"cursor": after})
+
+
+class AsyncCursorPaginationAfter(BaseAsyncPage[_T], BasePage[_T], Generic[_T]):
+    result: List[_T]
+    result_info: Optional[CursorPaginationAfterResultInfo] = None
+
+    @override
+    def _get_page_items(self) -> List[_T]:
+        result = self.result
+        if not result:
+            return []
+        return result
+
+    @override
+    def next_page_info(self) -> Optional[PageInfo]:
+        after = None
+        if self.result_info is not None:
+            if self.result_info.cursors is not None:
+                if self.result_info.cursors.after is not None:
+                    after = self.result_info.cursors.after
+        if not after:
+            return None
+
+        return PageInfo(params={"cursor": after})
+
+
 class CursorLimitPaginationResultInfo(BaseModel):
     count: Optional[int] = None
 
@@ -194,7 +258,8 @@ def _get_page_items(self) -> List[_T]:
     def next_page_info(self) -> Optional[PageInfo]:
         cursor = None
         if self.result_info is not None:
-            cursor = self.result_info.cursor
+            if self.result_info.cursor is not None:
+                cursor = self.result_info.cursor
         if not cursor:
             return None
 
@@ -216,7 +281,8 @@ def _get_page_items(self) -> List[_T]:
     def next_page_info(self) -> Optional[PageInfo]:
         cursor = None
         if self.result_info is not None:
-            cursor = self.result_info.cursor
+            if self.result_info.cursor is not None:
+                cursor = self.result_info.cursor
         if not cursor:
             return None
 
diff --git a/src/cloudflare/resources/__init__.py b/src/cloudflare/resources/__init__.py
index 35be298a563..fd8019a9a1a 100644
--- a/src/cloudflare/resources/__init__.py
+++ b/src/cloudflare/resources/__init__.py
@@ -1,1195 +1 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from .d1 import (
-    D1Resource,
-    AsyncD1Resource,
-    D1ResourceWithRawResponse,
-    AsyncD1ResourceWithRawResponse,
-    D1ResourceWithStreamingResponse,
-    AsyncD1ResourceWithStreamingResponse,
-)
-from .kv import (
-    KVResource,
-    AsyncKVResource,
-    KVResourceWithRawResponse,
-    AsyncKVResourceWithRawResponse,
-    KVResourceWithStreamingResponse,
-    AsyncKVResourceWithStreamingResponse,
-)
-from .r2 import (
-    R2Resource,
-    AsyncR2Resource,
-    R2ResourceWithRawResponse,
-    AsyncR2ResourceWithRawResponse,
-    R2ResourceWithStreamingResponse,
-    AsyncR2ResourceWithStreamingResponse,
-)
-from .acm import (
-    ACMResource,
-    AsyncACMResource,
-    ACMResourceWithRawResponse,
-    AsyncACMResourceWithRawResponse,
-    ACMResourceWithStreamingResponse,
-    AsyncACMResourceWithStreamingResponse,
-)
-from .dns import (
-    DNSResource,
-    AsyncDNSResource,
-    DNSResourceWithRawResponse,
-    AsyncDNSResourceWithRawResponse,
-    DNSResourceWithStreamingResponse,
-    AsyncDNSResourceWithStreamingResponse,
-)
-from .iam import (
-    IAMResource,
-    AsyncIAMResource,
-    IAMResourceWithRawResponse,
-    AsyncIAMResourceWithRawResponse,
-    IAMResourceWithStreamingResponse,
-    AsyncIAMResourceWithStreamingResponse,
-)
-from .ips import (
-    IPsResource,
-    AsyncIPsResource,
-    IPsResourceWithRawResponse,
-    AsyncIPsResourceWithRawResponse,
-    IPsResourceWithStreamingResponse,
-    AsyncIPsResourceWithStreamingResponse,
-)
-from .rum import (
-    RUMResource,
-    AsyncRUMResource,
-    RUMResourceWithRawResponse,
-    AsyncRUMResourceWithRawResponse,
-    RUMResourceWithStreamingResponse,
-    AsyncRUMResourceWithStreamingResponse,
-)
-from .ssl import (
-    SSLResource,
-    AsyncSSLResource,
-    SSLResourceWithRawResponse,
-    AsyncSSLResourceWithRawResponse,
-    SSLResourceWithStreamingResponse,
-    AsyncSSLResourceWithStreamingResponse,
-)
-from .argo import (
-    ArgoResource,
-    AsyncArgoResource,
-    ArgoResourceWithRawResponse,
-    AsyncArgoResourceWithRawResponse,
-    ArgoResourceWithStreamingResponse,
-    AsyncArgoResourceWithStreamingResponse,
-)
-from .logs import (
-    LogsResource,
-    AsyncLogsResource,
-    LogsResourceWithRawResponse,
-    AsyncLogsResourceWithRawResponse,
-    LogsResourceWithStreamingResponse,
-    AsyncLogsResourceWithStreamingResponse,
-)
-from .user import (
-    UserResource,
-    AsyncUserResource,
-    UserResourceWithRawResponse,
-    AsyncUserResourceWithRawResponse,
-    UserResourceWithStreamingResponse,
-    AsyncUserResourceWithStreamingResponse,
-)
-from .web3 import (
-    Web3Resource,
-    AsyncWeb3Resource,
-    Web3ResourceWithRawResponse,
-    AsyncWeb3ResourceWithRawResponse,
-    Web3ResourceWithStreamingResponse,
-    AsyncWeb3ResourceWithStreamingResponse,
-)
-from .cache import (
-    CacheResource,
-    AsyncCacheResource,
-    CacheResourceWithRawResponse,
-    AsyncCacheResourceWithRawResponse,
-    CacheResourceWithStreamingResponse,
-    AsyncCacheResourceWithStreamingResponse,
-)
-from .calls import (
-    CallsResource,
-    AsyncCallsResource,
-    CallsResourceWithRawResponse,
-    AsyncCallsResourceWithRawResponse,
-    CallsResourceWithStreamingResponse,
-    AsyncCallsResourceWithStreamingResponse,
-)
-from .intel import (
-    IntelResource,
-    AsyncIntelResource,
-    IntelResourceWithRawResponse,
-    AsyncIntelResourceWithRawResponse,
-    IntelResourceWithStreamingResponse,
-    AsyncIntelResourceWithStreamingResponse,
-)
-from .pages import (
-    PagesResource,
-    AsyncPagesResource,
-    PagesResourceWithRawResponse,
-    AsyncPagesResourceWithRawResponse,
-    PagesResourceWithStreamingResponse,
-    AsyncPagesResourceWithStreamingResponse,
-)
-from .pcaps import (
-    PCAPsResource,
-    AsyncPCAPsResource,
-    PCAPsResourceWithRawResponse,
-    AsyncPCAPsResourceWithRawResponse,
-    PCAPsResourceWithStreamingResponse,
-    AsyncPCAPsResourceWithStreamingResponse,
-)
-from .plans import (
-    PlansResource,
-    AsyncPlansResource,
-    PlansResourceWithRawResponse,
-    AsyncPlansResourceWithRawResponse,
-    PlansResourceWithStreamingResponse,
-    AsyncPlansResourceWithStreamingResponse,
-)
-from .radar import (
-    RadarResource,
-    AsyncRadarResource,
-    RadarResourceWithRawResponse,
-    AsyncRadarResourceWithRawResponse,
-    RadarResourceWithStreamingResponse,
-    AsyncRadarResourceWithStreamingResponse,
-)
-from .rules import (
-    RulesResource,
-    AsyncRulesResource,
-    RulesResourceWithRawResponse,
-    AsyncRulesResourceWithRawResponse,
-    RulesResourceWithStreamingResponse,
-    AsyncRulesResourceWithStreamingResponse,
-)
-from .speed import (
-    SpeedResource,
-    AsyncSpeedResource,
-    SpeedResourceWithRawResponse,
-    AsyncSpeedResourceWithRawResponse,
-    SpeedResourceWithStreamingResponse,
-    AsyncSpeedResourceWithStreamingResponse,
-)
-from .zones import (
-    ZonesResource,
-    AsyncZonesResource,
-    ZonesResourceWithRawResponse,
-    AsyncZonesResourceWithRawResponse,
-    ZonesResourceWithStreamingResponse,
-    AsyncZonesResourceWithStreamingResponse,
-)
-from .dnssec import (
-    DNSSECResource,
-    AsyncDNSSECResource,
-    DNSSECResourceWithRawResponse,
-    AsyncDNSSECResourceWithRawResponse,
-    DNSSECResourceWithStreamingResponse,
-    AsyncDNSSECResourceWithStreamingResponse,
-)
-from .images import (
-    ImagesResource,
-    AsyncImagesResource,
-    ImagesResourceWithRawResponse,
-    AsyncImagesResourceWithRawResponse,
-    ImagesResourceWithStreamingResponse,
-    AsyncImagesResourceWithStreamingResponse,
-)
-from .queues import (
-    QueuesResource,
-    AsyncQueuesResource,
-    QueuesResourceWithRawResponse,
-    AsyncQueuesResourceWithRawResponse,
-    QueuesResourceWithStreamingResponse,
-    AsyncQueuesResourceWithStreamingResponse,
-)
-from .stream import (
-    StreamResource,
-    AsyncStreamResource,
-    StreamResourceWithRawResponse,
-    AsyncStreamResourceWithRawResponse,
-    StreamResourceWithStreamingResponse,
-    AsyncStreamResourceWithStreamingResponse,
-)
-from .billing import (
-    BillingResource,
-    AsyncBillingResource,
-    BillingResourceWithRawResponse,
-    AsyncBillingResourceWithRawResponse,
-    BillingResourceWithStreamingResponse,
-    AsyncBillingResourceWithStreamingResponse,
-)
-from .filters import (
-    FiltersResource,
-    AsyncFiltersResource,
-    FiltersResourceWithRawResponse,
-    AsyncFiltersResourceWithRawResponse,
-    FiltersResourceWithStreamingResponse,
-    AsyncFiltersResourceWithStreamingResponse,
-)
-from .logpush import (
-    LogpushResource,
-    AsyncLogpushResource,
-    LogpushResourceWithRawResponse,
-    AsyncLogpushResourceWithRawResponse,
-    LogpushResourceWithStreamingResponse,
-    AsyncLogpushResourceWithStreamingResponse,
-)
-from .storage import (
-    StorageResource,
-    AsyncStorageResource,
-    StorageResourceWithRawResponse,
-    AsyncStorageResourceWithRawResponse,
-    StorageResourceWithStreamingResponse,
-    AsyncStorageResourceWithStreamingResponse,
-)
-from .workers import (
-    WorkersResource,
-    AsyncWorkersResource,
-    WorkersResourceWithRawResponse,
-    AsyncWorkersResourceWithRawResponse,
-    WorkersResourceWithStreamingResponse,
-    AsyncWorkersResourceWithStreamingResponse,
-)
-from .accounts import (
-    AccountsResource,
-    AsyncAccountsResource,
-    AccountsResourceWithRawResponse,
-    AsyncAccountsResourceWithRawResponse,
-    AccountsResourceWithStreamingResponse,
-    AsyncAccountsResourceWithStreamingResponse,
-)
-from .alerting import (
-    AlertingResource,
-    AsyncAlertingResource,
-    AlertingResourceWithRawResponse,
-    AsyncAlertingResourceWithRawResponse,
-    AlertingResourceWithStreamingResponse,
-    AsyncAlertingResourceWithStreamingResponse,
-)
-from .firewall import (
-    FirewallResource,
-    AsyncFirewallResource,
-    FirewallResourceWithRawResponse,
-    AsyncFirewallResourceWithRawResponse,
-    FirewallResourceWithStreamingResponse,
-    AsyncFirewallResourceWithStreamingResponse,
-)
-from .rulesets import (
-    RulesetsResource,
-    AsyncRulesetsResource,
-    RulesetsResourceWithRawResponse,
-    AsyncRulesetsResourceWithRawResponse,
-    RulesetsResourceWithStreamingResponse,
-    AsyncRulesetsResourceWithStreamingResponse,
-)
-from .snippets import (
-    SnippetsResource,
-    AsyncSnippetsResource,
-    SnippetsResourceWithRawResponse,
-    AsyncSnippetsResourceWithRawResponse,
-    SnippetsResourceWithStreamingResponse,
-    AsyncSnippetsResourceWithStreamingResponse,
-)
-from .spectrum import (
-    SpectrumResource,
-    AsyncSpectrumResource,
-    SpectrumResourceWithRawResponse,
-    AsyncSpectrumResourceWithRawResponse,
-    SpectrumResourceWithStreamingResponse,
-    AsyncSpectrumResourceWithStreamingResponse,
-)
-from .hostnames import (
-    HostnamesResource,
-    AsyncHostnamesResource,
-    HostnamesResourceWithRawResponse,
-    AsyncHostnamesResourceWithRawResponse,
-    HostnamesResourceWithStreamingResponse,
-    AsyncHostnamesResourceWithStreamingResponse,
-)
-from .pagerules import (
-    PagerulesResource,
-    AsyncPagerulesResource,
-    PagerulesResourceWithRawResponse,
-    AsyncPagerulesResourceWithRawResponse,
-    PagerulesResourceWithStreamingResponse,
-    AsyncPagerulesResourceWithStreamingResponse,
-)
-from .registrar import (
-    RegistrarResource,
-    AsyncRegistrarResource,
-    RegistrarResourceWithRawResponse,
-    AsyncRegistrarResourceWithRawResponse,
-    RegistrarResourceWithStreamingResponse,
-    AsyncRegistrarResourceWithStreamingResponse,
-)
-from .vectorize import (
-    VectorizeResource,
-    AsyncVectorizeResource,
-    VectorizeResourceWithRawResponse,
-    AsyncVectorizeResourceWithRawResponse,
-    VectorizeResourceWithStreamingResponse,
-    AsyncVectorizeResourceWithStreamingResponse,
-)
-from .addressing import (
-    AddressingResource,
-    AsyncAddressingResource,
-    AddressingResourceWithRawResponse,
-    AsyncAddressingResourceWithRawResponse,
-    AddressingResourceWithStreamingResponse,
-    AsyncAddressingResourceWithStreamingResponse,
-)
-from .ai_gateway import (
-    AIGatewayResource,
-    AsyncAIGatewayResource,
-    AIGatewayResourceWithRawResponse,
-    AsyncAIGatewayResourceWithRawResponse,
-    AIGatewayResourceWithStreamingResponse,
-    AsyncAIGatewayResourceWithStreamingResponse,
-)
-from .audit_logs import (
-    AuditLogsResource,
-    AsyncAuditLogsResource,
-    AuditLogsResourceWithRawResponse,
-    AsyncAuditLogsResourceWithRawResponse,
-    AuditLogsResourceWithStreamingResponse,
-    AsyncAuditLogsResourceWithStreamingResponse,
-)
-from .challenges import (
-    ChallengesResource,
-    AsyncChallengesResource,
-    ChallengesResourceWithRawResponse,
-    AsyncChallengesResourceWithRawResponse,
-    ChallengesResourceWithStreamingResponse,
-    AsyncChallengesResourceWithStreamingResponse,
-)
-from .hyperdrive import (
-    HyperdriveResource,
-    AsyncHyperdriveResource,
-    HyperdriveResourceWithRawResponse,
-    AsyncHyperdriveResourceWithRawResponse,
-    HyperdriveResourceWithStreamingResponse,
-    AsyncHyperdriveResourceWithStreamingResponse,
-)
-from .rate_plans import (
-    RatePlansResource,
-    AsyncRatePlansResource,
-    RatePlansResourceWithRawResponse,
-    AsyncRatePlansResourceWithRawResponse,
-    RatePlansResourceWithStreamingResponse,
-    AsyncRatePlansResourceWithStreamingResponse,
-)
-from .zero_trust import (
-    ZeroTrustResource,
-    AsyncZeroTrustResource,
-    ZeroTrustResourceWithRawResponse,
-    AsyncZeroTrustResourceWithRawResponse,
-    ZeroTrustResourceWithStreamingResponse,
-    AsyncZeroTrustResourceWithStreamingResponse,
-)
-from .api_gateway import (
-    APIGatewayResource,
-    AsyncAPIGatewayResource,
-    APIGatewayResourceWithRawResponse,
-    AsyncAPIGatewayResourceWithRawResponse,
-    APIGatewayResourceWithStreamingResponse,
-    AsyncAPIGatewayResourceWithStreamingResponse,
-)
-from .diagnostics import (
-    DiagnosticsResource,
-    AsyncDiagnosticsResource,
-    DiagnosticsResourceWithRawResponse,
-    AsyncDiagnosticsResourceWithRawResponse,
-    DiagnosticsResourceWithStreamingResponse,
-    AsyncDiagnosticsResourceWithStreamingResponse,
-)
-from .memberships import (
-    MembershipsResource,
-    AsyncMembershipsResource,
-    MembershipsResourceWithRawResponse,
-    AsyncMembershipsResourceWithRawResponse,
-    MembershipsResourceWithStreamingResponse,
-    AsyncMembershipsResourceWithStreamingResponse,
-)
-from .page_shield import (
-    PageShieldResource,
-    AsyncPageShieldResource,
-    PageShieldResourceWithRawResponse,
-    AsyncPageShieldResourceWithRawResponse,
-    PageShieldResourceWithStreamingResponse,
-    AsyncPageShieldResourceWithStreamingResponse,
-)
-from .rate_limits import (
-    RateLimitsResource,
-    AsyncRateLimitsResource,
-    RateLimitsResourceWithRawResponse,
-    AsyncRateLimitsResourceWithRawResponse,
-    RateLimitsResourceWithStreamingResponse,
-    AsyncRateLimitsResourceWithStreamingResponse,
-)
-from .url_scanner import (
-    URLScannerResource,
-    AsyncURLScannerResource,
-    URLScannerResourceWithRawResponse,
-    AsyncURLScannerResourceWithRawResponse,
-    URLScannerResourceWithStreamingResponse,
-    AsyncURLScannerResourceWithStreamingResponse,
-)
-from .healthchecks import (
-    HealthchecksResource,
-    AsyncHealthchecksResource,
-    HealthchecksResourceWithRawResponse,
-    AsyncHealthchecksResourceWithRawResponse,
-    HealthchecksResourceWithStreamingResponse,
-    AsyncHealthchecksResourceWithStreamingResponse,
-)
-from .email_routing import (
-    EmailRoutingResource,
-    AsyncEmailRoutingResource,
-    EmailRoutingResourceWithRawResponse,
-    AsyncEmailRoutingResourceWithRawResponse,
-    EmailRoutingResourceWithStreamingResponse,
-    AsyncEmailRoutingResourceWithStreamingResponse,
-)
-from .magic_transit import (
-    MagicTransitResource,
-    AsyncMagicTransitResource,
-    MagicTransitResourceWithRawResponse,
-    AsyncMagicTransitResourceWithRawResponse,
-    MagicTransitResourceWithStreamingResponse,
-    AsyncMagicTransitResourceWithStreamingResponse,
-)
-from .secondary_dns import (
-    SecondaryDNSResource,
-    AsyncSecondaryDNSResource,
-    SecondaryDNSResourceWithRawResponse,
-    AsyncSecondaryDNSResourceWithRawResponse,
-    SecondaryDNSResourceWithStreamingResponse,
-    AsyncSecondaryDNSResourceWithStreamingResponse,
-)
-from .subscriptions import (
-    SubscriptionsResource,
-    AsyncSubscriptionsResource,
-    SubscriptionsResourceWithRawResponse,
-    AsyncSubscriptionsResourceWithRawResponse,
-    SubscriptionsResourceWithStreamingResponse,
-    AsyncSubscriptionsResourceWithStreamingResponse,
-)
-from .waiting_rooms import (
-    WaitingRoomsResource,
-    AsyncWaitingRoomsResource,
-    WaitingRoomsResourceWithRawResponse,
-    AsyncWaitingRoomsResourceWithRawResponse,
-    WaitingRoomsResourceWithStreamingResponse,
-    AsyncWaitingRoomsResourceWithStreamingResponse,
-)
-from .bot_management import (
-    BotManagementResource,
-    AsyncBotManagementResource,
-    BotManagementResourceWithRawResponse,
-    AsyncBotManagementResourceWithRawResponse,
-    BotManagementResourceWithStreamingResponse,
-    AsyncBotManagementResourceWithStreamingResponse,
-)
-from .cloudforce_one import (
-    CloudforceOneResource,
-    AsyncCloudforceOneResource,
-    CloudforceOneResourceWithRawResponse,
-    AsyncCloudforceOneResourceWithRawResponse,
-    CloudforceOneResourceWithStreamingResponse,
-    AsyncCloudforceOneResourceWithStreamingResponse,
-)
-from .dcv_delegation import (
-    DCVDelegationResource,
-    AsyncDCVDelegationResource,
-    DCVDelegationResourceWithRawResponse,
-    AsyncDCVDelegationResourceWithRawResponse,
-    DCVDelegationResourceWithStreamingResponse,
-    AsyncDCVDelegationResourceWithStreamingResponse,
-)
-from .load_balancers import (
-    LoadBalancersResource,
-    AsyncLoadBalancersResource,
-    LoadBalancersResourceWithRawResponse,
-    AsyncLoadBalancersResourceWithRawResponse,
-    LoadBalancersResourceWithStreamingResponse,
-    AsyncLoadBalancersResourceWithStreamingResponse,
-)
-from .warp_connector import (
-    WARPConnectorResource,
-    AsyncWARPConnectorResource,
-    WARPConnectorResourceWithRawResponse,
-    AsyncWARPConnectorResourceWithRawResponse,
-    WARPConnectorResourceWithStreamingResponse,
-    AsyncWARPConnectorResourceWithStreamingResponse,
-)
-from .cloud_connector import (
-    CloudConnectorResource,
-    AsyncCloudConnectorResource,
-    CloudConnectorResourceWithRawResponse,
-    AsyncCloudConnectorResourceWithRawResponse,
-    CloudConnectorResourceWithStreamingResponse,
-    AsyncCloudConnectorResourceWithStreamingResponse,
-)
-from .durable_objects import (
-    DurableObjectsResource,
-    AsyncDurableObjectsResource,
-    DurableObjectsResourceWithRawResponse,
-    AsyncDurableObjectsResourceWithRawResponse,
-    DurableObjectsResourceWithStreamingResponse,
-    AsyncDurableObjectsResourceWithStreamingResponse,
-)
-from .managed_headers import (
-    ManagedHeadersResource,
-    AsyncManagedHeadersResource,
-    ManagedHeadersResourceWithRawResponse,
-    AsyncManagedHeadersResourceWithRawResponse,
-    ManagedHeadersResourceWithStreamingResponse,
-    AsyncManagedHeadersResourceWithStreamingResponse,
-)
-from .request_tracers import (
-    RequestTracersResource,
-    AsyncRequestTracersResource,
-    RequestTracersResourceWithRawResponse,
-    AsyncRequestTracersResourceWithRawResponse,
-    RequestTracersResourceWithStreamingResponse,
-    AsyncRequestTracersResourceWithStreamingResponse,
-)
-from .brand_protection import (
-    BrandProtectionResource,
-    AsyncBrandProtectionResource,
-    BrandProtectionResourceWithRawResponse,
-    AsyncBrandProtectionResourceWithRawResponse,
-    BrandProtectionResourceWithStreamingResponse,
-    AsyncBrandProtectionResourceWithStreamingResponse,
-)
-from .custom_hostnames import (
-    CustomHostnamesResource,
-    AsyncCustomHostnamesResource,
-    CustomHostnamesResourceWithRawResponse,
-    AsyncCustomHostnamesResourceWithRawResponse,
-    CustomHostnamesResourceWithStreamingResponse,
-    AsyncCustomHostnamesResourceWithStreamingResponse,
-)
-from .mtls_certificates import (
-    MTLSCertificatesResource,
-    AsyncMTLSCertificatesResource,
-    MTLSCertificatesResourceWithRawResponse,
-    AsyncMTLSCertificatesResourceWithRawResponse,
-    MTLSCertificatesResourceWithStreamingResponse,
-    AsyncMTLSCertificatesResourceWithStreamingResponse,
-)
-from .url_normalization import (
-    URLNormalizationResource,
-    AsyncURLNormalizationResource,
-    URLNormalizationResourceWithRawResponse,
-    AsyncURLNormalizationResourceWithRawResponse,
-    URLNormalizationResourceWithStreamingResponse,
-    AsyncURLNormalizationResourceWithStreamingResponse,
-)
-from .custom_nameservers import (
-    CustomNameserversResource,
-    AsyncCustomNameserversResource,
-    CustomNameserversResourceWithRawResponse,
-    AsyncCustomNameserversResourceWithRawResponse,
-    CustomNameserversResourceWithStreamingResponse,
-    AsyncCustomNameserversResourceWithStreamingResponse,
-)
-from .client_certificates import (
-    ClientCertificatesResource,
-    AsyncClientCertificatesResource,
-    ClientCertificatesResourceWithRawResponse,
-    AsyncClientCertificatesResourceWithRawResponse,
-    ClientCertificatesResourceWithStreamingResponse,
-    AsyncClientCertificatesResourceWithStreamingResponse,
-)
-from .custom_certificates import (
-    CustomCertificatesResource,
-    AsyncCustomCertificatesResource,
-    CustomCertificatesResourceWithRawResponse,
-    AsyncCustomCertificatesResourceWithRawResponse,
-    CustomCertificatesResourceWithStreamingResponse,
-    AsyncCustomCertificatesResourceWithStreamingResponse,
-)
-from .event_notifications import (
-    EventNotificationsResource,
-    AsyncEventNotificationsResource,
-    EventNotificationsResourceWithRawResponse,
-    AsyncEventNotificationsResourceWithRawResponse,
-    EventNotificationsResourceWithStreamingResponse,
-    AsyncEventNotificationsResourceWithStreamingResponse,
-)
-from .keyless_certificates import (
-    KeylessCertificatesResource,
-    AsyncKeylessCertificatesResource,
-    KeylessCertificatesResourceWithRawResponse,
-    AsyncKeylessCertificatesResourceWithRawResponse,
-    KeylessCertificatesResourceWithStreamingResponse,
-    AsyncKeylessCertificatesResourceWithStreamingResponse,
-)
-from .workers_for_platforms import (
-    WorkersForPlatformsResource,
-    AsyncWorkersForPlatformsResource,
-    WorkersForPlatformsResourceWithRawResponse,
-    AsyncWorkersForPlatformsResourceWithRawResponse,
-    WorkersForPlatformsResourceWithStreamingResponse,
-    AsyncWorkersForPlatformsResourceWithStreamingResponse,
-)
-from .origin_ca_certificates import (
-    OriginCACertificatesResource,
-    AsyncOriginCACertificatesResource,
-    OriginCACertificatesResourceWithRawResponse,
-    AsyncOriginCACertificatesResourceWithRawResponse,
-    OriginCACertificatesResourceWithStreamingResponse,
-    AsyncOriginCACertificatesResourceWithStreamingResponse,
-)
-from .origin_tls_client_auth import (
-    OriginTLSClientAuthResource,
-    AsyncOriginTLSClientAuthResource,
-    OriginTLSClientAuthResourceWithRawResponse,
-    AsyncOriginTLSClientAuthResourceWithRawResponse,
-    OriginTLSClientAuthResourceWithStreamingResponse,
-    AsyncOriginTLSClientAuthResourceWithStreamingResponse,
-)
-from .certificate_authorities import (
-    CertificateAuthoritiesResource,
-    AsyncCertificateAuthoritiesResource,
-    CertificateAuthoritiesResourceWithRawResponse,
-    AsyncCertificateAuthoritiesResourceWithRawResponse,
-    CertificateAuthoritiesResourceWithStreamingResponse,
-    AsyncCertificateAuthoritiesResourceWithStreamingResponse,
-)
-from .magic_network_monitoring import (
-    MagicNetworkMonitoringResource,
-    AsyncMagicNetworkMonitoringResource,
-    MagicNetworkMonitoringResourceWithRawResponse,
-    AsyncMagicNetworkMonitoringResourceWithRawResponse,
-    MagicNetworkMonitoringResourceWithStreamingResponse,
-    AsyncMagicNetworkMonitoringResourceWithStreamingResponse,
-)
-from .origin_post_quantum_encryption import (
-    OriginPostQuantumEncryptionResource,
-    AsyncOriginPostQuantumEncryptionResource,
-    OriginPostQuantumEncryptionResourceWithRawResponse,
-    AsyncOriginPostQuantumEncryptionResourceWithRawResponse,
-    OriginPostQuantumEncryptionResourceWithStreamingResponse,
-    AsyncOriginPostQuantumEncryptionResourceWithStreamingResponse,
-)
-
-__all__ = [
-    "AccountsResource",
-    "AsyncAccountsResource",
-    "AccountsResourceWithRawResponse",
-    "AsyncAccountsResourceWithRawResponse",
-    "AccountsResourceWithStreamingResponse",
-    "AsyncAccountsResourceWithStreamingResponse",
-    "OriginCACertificatesResource",
-    "AsyncOriginCACertificatesResource",
-    "OriginCACertificatesResourceWithRawResponse",
-    "AsyncOriginCACertificatesResourceWithRawResponse",
-    "OriginCACertificatesResourceWithStreamingResponse",
-    "AsyncOriginCACertificatesResourceWithStreamingResponse",
-    "IPsResource",
-    "AsyncIPsResource",
-    "IPsResourceWithRawResponse",
-    "AsyncIPsResourceWithRawResponse",
-    "IPsResourceWithStreamingResponse",
-    "AsyncIPsResourceWithStreamingResponse",
-    "MembershipsResource",
-    "AsyncMembershipsResource",
-    "MembershipsResourceWithRawResponse",
-    "AsyncMembershipsResourceWithRawResponse",
-    "MembershipsResourceWithStreamingResponse",
-    "AsyncMembershipsResourceWithStreamingResponse",
-    "UserResource",
-    "AsyncUserResource",
-    "UserResourceWithRawResponse",
-    "AsyncUserResourceWithRawResponse",
-    "UserResourceWithStreamingResponse",
-    "AsyncUserResourceWithStreamingResponse",
-    "ZonesResource",
-    "AsyncZonesResource",
-    "ZonesResourceWithRawResponse",
-    "AsyncZonesResourceWithRawResponse",
-    "ZonesResourceWithStreamingResponse",
-    "AsyncZonesResourceWithStreamingResponse",
-    "LoadBalancersResource",
-    "AsyncLoadBalancersResource",
-    "LoadBalancersResourceWithRawResponse",
-    "AsyncLoadBalancersResourceWithRawResponse",
-    "LoadBalancersResourceWithStreamingResponse",
-    "AsyncLoadBalancersResourceWithStreamingResponse",
-    "CacheResource",
-    "AsyncCacheResource",
-    "CacheResourceWithRawResponse",
-    "AsyncCacheResourceWithRawResponse",
-    "CacheResourceWithStreamingResponse",
-    "AsyncCacheResourceWithStreamingResponse",
-    "SSLResource",
-    "AsyncSSLResource",
-    "SSLResourceWithRawResponse",
-    "AsyncSSLResourceWithRawResponse",
-    "SSLResourceWithStreamingResponse",
-    "AsyncSSLResourceWithStreamingResponse",
-    "SubscriptionsResource",
-    "AsyncSubscriptionsResource",
-    "SubscriptionsResourceWithRawResponse",
-    "AsyncSubscriptionsResourceWithRawResponse",
-    "SubscriptionsResourceWithStreamingResponse",
-    "AsyncSubscriptionsResourceWithStreamingResponse",
-    "ACMResource",
-    "AsyncACMResource",
-    "ACMResourceWithRawResponse",
-    "AsyncACMResourceWithRawResponse",
-    "ACMResourceWithStreamingResponse",
-    "AsyncACMResourceWithStreamingResponse",
-    "ArgoResource",
-    "AsyncArgoResource",
-    "ArgoResourceWithRawResponse",
-    "AsyncArgoResourceWithRawResponse",
-    "ArgoResourceWithStreamingResponse",
-    "AsyncArgoResourceWithStreamingResponse",
-    "PlansResource",
-    "AsyncPlansResource",
-    "PlansResourceWithRawResponse",
-    "AsyncPlansResourceWithRawResponse",
-    "PlansResourceWithStreamingResponse",
-    "AsyncPlansResourceWithStreamingResponse",
-    "RatePlansResource",
-    "AsyncRatePlansResource",
-    "RatePlansResourceWithRawResponse",
-    "AsyncRatePlansResourceWithRawResponse",
-    "RatePlansResourceWithStreamingResponse",
-    "AsyncRatePlansResourceWithStreamingResponse",
-    "CertificateAuthoritiesResource",
-    "AsyncCertificateAuthoritiesResource",
-    "CertificateAuthoritiesResourceWithRawResponse",
-    "AsyncCertificateAuthoritiesResourceWithRawResponse",
-    "CertificateAuthoritiesResourceWithStreamingResponse",
-    "AsyncCertificateAuthoritiesResourceWithStreamingResponse",
-    "ClientCertificatesResource",
-    "AsyncClientCertificatesResource",
-    "ClientCertificatesResourceWithRawResponse",
-    "AsyncClientCertificatesResourceWithRawResponse",
-    "ClientCertificatesResourceWithStreamingResponse",
-    "AsyncClientCertificatesResourceWithStreamingResponse",
-    "CustomCertificatesResource",
-    "AsyncCustomCertificatesResource",
-    "CustomCertificatesResourceWithRawResponse",
-    "AsyncCustomCertificatesResourceWithRawResponse",
-    "CustomCertificatesResourceWithStreamingResponse",
-    "AsyncCustomCertificatesResourceWithStreamingResponse",
-    "CustomHostnamesResource",
-    "AsyncCustomHostnamesResource",
-    "CustomHostnamesResourceWithRawResponse",
-    "AsyncCustomHostnamesResourceWithRawResponse",
-    "CustomHostnamesResourceWithStreamingResponse",
-    "AsyncCustomHostnamesResourceWithStreamingResponse",
-    "CustomNameserversResource",
-    "AsyncCustomNameserversResource",
-    "CustomNameserversResourceWithRawResponse",
-    "AsyncCustomNameserversResourceWithRawResponse",
-    "CustomNameserversResourceWithStreamingResponse",
-    "AsyncCustomNameserversResourceWithStreamingResponse",
-    "DNSResource",
-    "AsyncDNSResource",
-    "DNSResourceWithRawResponse",
-    "AsyncDNSResourceWithRawResponse",
-    "DNSResourceWithStreamingResponse",
-    "AsyncDNSResourceWithStreamingResponse",
-    "DNSSECResource",
-    "AsyncDNSSECResource",
-    "DNSSECResourceWithRawResponse",
-    "AsyncDNSSECResourceWithRawResponse",
-    "DNSSECResourceWithStreamingResponse",
-    "AsyncDNSSECResourceWithStreamingResponse",
-    "EmailRoutingResource",
-    "AsyncEmailRoutingResource",
-    "EmailRoutingResourceWithRawResponse",
-    "AsyncEmailRoutingResourceWithRawResponse",
-    "EmailRoutingResourceWithStreamingResponse",
-    "AsyncEmailRoutingResourceWithStreamingResponse",
-    "FiltersResource",
-    "AsyncFiltersResource",
-    "FiltersResourceWithRawResponse",
-    "AsyncFiltersResourceWithRawResponse",
-    "FiltersResourceWithStreamingResponse",
-    "AsyncFiltersResourceWithStreamingResponse",
-    "FirewallResource",
-    "AsyncFirewallResource",
-    "FirewallResourceWithRawResponse",
-    "AsyncFirewallResourceWithRawResponse",
-    "FirewallResourceWithStreamingResponse",
-    "AsyncFirewallResourceWithStreamingResponse",
-    "HealthchecksResource",
-    "AsyncHealthchecksResource",
-    "HealthchecksResourceWithRawResponse",
-    "AsyncHealthchecksResourceWithRawResponse",
-    "HealthchecksResourceWithStreamingResponse",
-    "AsyncHealthchecksResourceWithStreamingResponse",
-    "KeylessCertificatesResource",
-    "AsyncKeylessCertificatesResource",
-    "KeylessCertificatesResourceWithRawResponse",
-    "AsyncKeylessCertificatesResourceWithRawResponse",
-    "KeylessCertificatesResourceWithStreamingResponse",
-    "AsyncKeylessCertificatesResourceWithStreamingResponse",
-    "LogpushResource",
-    "AsyncLogpushResource",
-    "LogpushResourceWithRawResponse",
-    "AsyncLogpushResourceWithRawResponse",
-    "LogpushResourceWithStreamingResponse",
-    "AsyncLogpushResourceWithStreamingResponse",
-    "LogsResource",
-    "AsyncLogsResource",
-    "LogsResourceWithRawResponse",
-    "AsyncLogsResourceWithRawResponse",
-    "LogsResourceWithStreamingResponse",
-    "AsyncLogsResourceWithStreamingResponse",
-    "OriginTLSClientAuthResource",
-    "AsyncOriginTLSClientAuthResource",
-    "OriginTLSClientAuthResourceWithRawResponse",
-    "AsyncOriginTLSClientAuthResourceWithRawResponse",
-    "OriginTLSClientAuthResourceWithStreamingResponse",
-    "AsyncOriginTLSClientAuthResourceWithStreamingResponse",
-    "PagerulesResource",
-    "AsyncPagerulesResource",
-    "PagerulesResourceWithRawResponse",
-    "AsyncPagerulesResourceWithRawResponse",
-    "PagerulesResourceWithStreamingResponse",
-    "AsyncPagerulesResourceWithStreamingResponse",
-    "RateLimitsResource",
-    "AsyncRateLimitsResource",
-    "RateLimitsResourceWithRawResponse",
-    "AsyncRateLimitsResourceWithRawResponse",
-    "RateLimitsResourceWithStreamingResponse",
-    "AsyncRateLimitsResourceWithStreamingResponse",
-    "SecondaryDNSResource",
-    "AsyncSecondaryDNSResource",
-    "SecondaryDNSResourceWithRawResponse",
-    "AsyncSecondaryDNSResourceWithRawResponse",
-    "SecondaryDNSResourceWithStreamingResponse",
-    "AsyncSecondaryDNSResourceWithStreamingResponse",
-    "WaitingRoomsResource",
-    "AsyncWaitingRoomsResource",
-    "WaitingRoomsResourceWithRawResponse",
-    "AsyncWaitingRoomsResourceWithRawResponse",
-    "WaitingRoomsResourceWithStreamingResponse",
-    "AsyncWaitingRoomsResourceWithStreamingResponse",
-    "Web3Resource",
-    "AsyncWeb3Resource",
-    "Web3ResourceWithRawResponse",
-    "AsyncWeb3ResourceWithRawResponse",
-    "Web3ResourceWithStreamingResponse",
-    "AsyncWeb3ResourceWithStreamingResponse",
-    "WorkersResource",
-    "AsyncWorkersResource",
-    "WorkersResourceWithRawResponse",
-    "AsyncWorkersResourceWithRawResponse",
-    "WorkersResourceWithStreamingResponse",
-    "AsyncWorkersResourceWithStreamingResponse",
-    "KVResource",
-    "AsyncKVResource",
-    "KVResourceWithRawResponse",
-    "AsyncKVResourceWithRawResponse",
-    "KVResourceWithStreamingResponse",
-    "AsyncKVResourceWithStreamingResponse",
-    "DurableObjectsResource",
-    "AsyncDurableObjectsResource",
-    "DurableObjectsResourceWithRawResponse",
-    "AsyncDurableObjectsResourceWithRawResponse",
-    "DurableObjectsResourceWithStreamingResponse",
-    "AsyncDurableObjectsResourceWithStreamingResponse",
-    "QueuesResource",
-    "AsyncQueuesResource",
-    "QueuesResourceWithRawResponse",
-    "AsyncQueuesResourceWithRawResponse",
-    "QueuesResourceWithStreamingResponse",
-    "AsyncQueuesResourceWithStreamingResponse",
-    "APIGatewayResource",
-    "AsyncAPIGatewayResource",
-    "APIGatewayResourceWithRawResponse",
-    "AsyncAPIGatewayResourceWithRawResponse",
-    "APIGatewayResourceWithStreamingResponse",
-    "AsyncAPIGatewayResourceWithStreamingResponse",
-    "ManagedHeadersResource",
-    "AsyncManagedHeadersResource",
-    "ManagedHeadersResourceWithRawResponse",
-    "AsyncManagedHeadersResourceWithRawResponse",
-    "ManagedHeadersResourceWithStreamingResponse",
-    "AsyncManagedHeadersResourceWithStreamingResponse",
-    "PageShieldResource",
-    "AsyncPageShieldResource",
-    "PageShieldResourceWithRawResponse",
-    "AsyncPageShieldResourceWithRawResponse",
-    "PageShieldResourceWithStreamingResponse",
-    "AsyncPageShieldResourceWithStreamingResponse",
-    "RulesetsResource",
-    "AsyncRulesetsResource",
-    "RulesetsResourceWithRawResponse",
-    "AsyncRulesetsResourceWithRawResponse",
-    "RulesetsResourceWithStreamingResponse",
-    "AsyncRulesetsResourceWithStreamingResponse",
-    "URLNormalizationResource",
-    "AsyncURLNormalizationResource",
-    "URLNormalizationResourceWithRawResponse",
-    "AsyncURLNormalizationResourceWithRawResponse",
-    "URLNormalizationResourceWithStreamingResponse",
-    "AsyncURLNormalizationResourceWithStreamingResponse",
-    "SpectrumResource",
-    "AsyncSpectrumResource",
-    "SpectrumResourceWithRawResponse",
-    "AsyncSpectrumResourceWithRawResponse",
-    "SpectrumResourceWithStreamingResponse",
-    "AsyncSpectrumResourceWithStreamingResponse",
-    "AddressingResource",
-    "AsyncAddressingResource",
-    "AddressingResourceWithRawResponse",
-    "AsyncAddressingResourceWithRawResponse",
-    "AddressingResourceWithStreamingResponse",
-    "AsyncAddressingResourceWithStreamingResponse",
-    "AuditLogsResource",
-    "AsyncAuditLogsResource",
-    "AuditLogsResourceWithRawResponse",
-    "AsyncAuditLogsResourceWithRawResponse",
-    "AuditLogsResourceWithStreamingResponse",
-    "AsyncAuditLogsResourceWithStreamingResponse",
-    "BillingResource",
-    "AsyncBillingResource",
-    "BillingResourceWithRawResponse",
-    "AsyncBillingResourceWithRawResponse",
-    "BillingResourceWithStreamingResponse",
-    "AsyncBillingResourceWithStreamingResponse",
-    "BrandProtectionResource",
-    "AsyncBrandProtectionResource",
-    "BrandProtectionResourceWithRawResponse",
-    "AsyncBrandProtectionResourceWithRawResponse",
-    "BrandProtectionResourceWithStreamingResponse",
-    "AsyncBrandProtectionResourceWithStreamingResponse",
-    "DiagnosticsResource",
-    "AsyncDiagnosticsResource",
-    "DiagnosticsResourceWithRawResponse",
-    "AsyncDiagnosticsResourceWithRawResponse",
-    "DiagnosticsResourceWithStreamingResponse",
-    "AsyncDiagnosticsResourceWithStreamingResponse",
-    "ImagesResource",
-    "AsyncImagesResource",
-    "ImagesResourceWithRawResponse",
-    "AsyncImagesResourceWithRawResponse",
-    "ImagesResourceWithStreamingResponse",
-    "AsyncImagesResourceWithStreamingResponse",
-    "IntelResource",
-    "AsyncIntelResource",
-    "IntelResourceWithRawResponse",
-    "AsyncIntelResourceWithRawResponse",
-    "IntelResourceWithStreamingResponse",
-    "AsyncIntelResourceWithStreamingResponse",
-    "MagicTransitResource",
-    "AsyncMagicTransitResource",
-    "MagicTransitResourceWithRawResponse",
-    "AsyncMagicTransitResourceWithRawResponse",
-    "MagicTransitResourceWithStreamingResponse",
-    "AsyncMagicTransitResourceWithStreamingResponse",
-    "MagicNetworkMonitoringResource",
-    "AsyncMagicNetworkMonitoringResource",
-    "MagicNetworkMonitoringResourceWithRawResponse",
-    "AsyncMagicNetworkMonitoringResourceWithRawResponse",
-    "MagicNetworkMonitoringResourceWithStreamingResponse",
-    "AsyncMagicNetworkMonitoringResourceWithStreamingResponse",
-    "MTLSCertificatesResource",
-    "AsyncMTLSCertificatesResource",
-    "MTLSCertificatesResourceWithRawResponse",
-    "AsyncMTLSCertificatesResourceWithRawResponse",
-    "MTLSCertificatesResourceWithStreamingResponse",
-    "AsyncMTLSCertificatesResourceWithStreamingResponse",
-    "PagesResource",
-    "AsyncPagesResource",
-    "PagesResourceWithRawResponse",
-    "AsyncPagesResourceWithRawResponse",
-    "PagesResourceWithStreamingResponse",
-    "AsyncPagesResourceWithStreamingResponse",
-    "PCAPsResource",
-    "AsyncPCAPsResource",
-    "PCAPsResourceWithRawResponse",
-    "AsyncPCAPsResourceWithRawResponse",
-    "PCAPsResourceWithStreamingResponse",
-    "AsyncPCAPsResourceWithStreamingResponse",
-    "RegistrarResource",
-    "AsyncRegistrarResource",
-    "RegistrarResourceWithRawResponse",
-    "AsyncRegistrarResourceWithRawResponse",
-    "RegistrarResourceWithStreamingResponse",
-    "AsyncRegistrarResourceWithStreamingResponse",
-    "RequestTracersResource",
-    "AsyncRequestTracersResource",
-    "RequestTracersResourceWithRawResponse",
-    "AsyncRequestTracersResourceWithRawResponse",
-    "RequestTracersResourceWithStreamingResponse",
-    "AsyncRequestTracersResourceWithStreamingResponse",
-    "RulesResource",
-    "AsyncRulesResource",
-    "RulesResourceWithRawResponse",
-    "AsyncRulesResourceWithRawResponse",
-    "RulesResourceWithStreamingResponse",
-    "AsyncRulesResourceWithStreamingResponse",
-    "StorageResource",
-    "AsyncStorageResource",
-    "StorageResourceWithRawResponse",
-    "AsyncStorageResourceWithRawResponse",
-    "StorageResourceWithStreamingResponse",
-    "AsyncStorageResourceWithStreamingResponse",
-    "StreamResource",
-    "AsyncStreamResource",
-    "StreamResourceWithRawResponse",
-    "AsyncStreamResourceWithRawResponse",
-    "StreamResourceWithStreamingResponse",
-    "AsyncStreamResourceWithStreamingResponse",
-    "AlertingResource",
-    "AsyncAlertingResource",
-    "AlertingResourceWithRawResponse",
-    "AsyncAlertingResourceWithRawResponse",
-    "AlertingResourceWithStreamingResponse",
-    "AsyncAlertingResourceWithStreamingResponse",
-    "D1Resource",
-    "AsyncD1Resource",
-    "D1ResourceWithRawResponse",
-    "AsyncD1ResourceWithRawResponse",
-    "D1ResourceWithStreamingResponse",
-    "AsyncD1ResourceWithStreamingResponse",
-    "R2Resource",
-    "AsyncR2Resource",
-    "R2ResourceWithRawResponse",
-    "AsyncR2ResourceWithRawResponse",
-    "R2ResourceWithStreamingResponse",
-    "AsyncR2ResourceWithStreamingResponse",
-    "WARPConnectorResource",
-    "AsyncWARPConnectorResource",
-    "WARPConnectorResourceWithRawResponse",
-    "AsyncWARPConnectorResourceWithRawResponse",
-    "WARPConnectorResourceWithStreamingResponse",
-    "AsyncWARPConnectorResourceWithStreamingResponse",
-    "WorkersForPlatformsResource",
-    "AsyncWorkersForPlatformsResource",
-    "WorkersForPlatformsResourceWithRawResponse",
-    "AsyncWorkersForPlatformsResourceWithRawResponse",
-    "WorkersForPlatformsResourceWithStreamingResponse",
-    "AsyncWorkersForPlatformsResourceWithStreamingResponse",
-    "ZeroTrustResource",
-    "AsyncZeroTrustResource",
-    "ZeroTrustResourceWithRawResponse",
-    "AsyncZeroTrustResourceWithRawResponse",
-    "ZeroTrustResourceWithStreamingResponse",
-    "AsyncZeroTrustResourceWithStreamingResponse",
-    "ChallengesResource",
-    "AsyncChallengesResource",
-    "ChallengesResourceWithRawResponse",
-    "AsyncChallengesResourceWithRawResponse",
-    "ChallengesResourceWithStreamingResponse",
-    "AsyncChallengesResourceWithStreamingResponse",
-    "HyperdriveResource",
-    "AsyncHyperdriveResource",
-    "HyperdriveResourceWithRawResponse",
-    "AsyncHyperdriveResourceWithRawResponse",
-    "HyperdriveResourceWithStreamingResponse",
-    "AsyncHyperdriveResourceWithStreamingResponse",
-    "RUMResource",
-    "AsyncRUMResource",
-    "RUMResourceWithRawResponse",
-    "AsyncRUMResourceWithRawResponse",
-    "RUMResourceWithStreamingResponse",
-    "AsyncRUMResourceWithStreamingResponse",
-    "VectorizeResource",
-    "AsyncVectorizeResource",
-    "VectorizeResourceWithRawResponse",
-    "AsyncVectorizeResourceWithRawResponse",
-    "VectorizeResourceWithStreamingResponse",
-    "AsyncVectorizeResourceWithStreamingResponse",
-    "URLScannerResource",
-    "AsyncURLScannerResource",
-    "URLScannerResourceWithRawResponse",
-    "AsyncURLScannerResourceWithRawResponse",
-    "URLScannerResourceWithStreamingResponse",
-    "AsyncURLScannerResourceWithStreamingResponse",
-    "RadarResource",
-    "AsyncRadarResource",
-    "RadarResourceWithRawResponse",
-    "AsyncRadarResourceWithRawResponse",
-    "RadarResourceWithStreamingResponse",
-    "AsyncRadarResourceWithStreamingResponse",
-    "BotManagementResource",
-    "AsyncBotManagementResource",
-    "BotManagementResourceWithRawResponse",
-    "AsyncBotManagementResourceWithRawResponse",
-    "BotManagementResourceWithStreamingResponse",
-    "AsyncBotManagementResourceWithStreamingResponse",
-    "OriginPostQuantumEncryptionResource",
-    "AsyncOriginPostQuantumEncryptionResource",
-    "OriginPostQuantumEncryptionResourceWithRawResponse",
-    "AsyncOriginPostQuantumEncryptionResourceWithRawResponse",
-    "OriginPostQuantumEncryptionResourceWithStreamingResponse",
-    "AsyncOriginPostQuantumEncryptionResourceWithStreamingResponse",
-    "SpeedResource",
-    "AsyncSpeedResource",
-    "SpeedResourceWithRawResponse",
-    "AsyncSpeedResourceWithRawResponse",
-    "SpeedResourceWithStreamingResponse",
-    "AsyncSpeedResourceWithStreamingResponse",
-    "DCVDelegationResource",
-    "AsyncDCVDelegationResource",
-    "DCVDelegationResourceWithRawResponse",
-    "AsyncDCVDelegationResourceWithRawResponse",
-    "DCVDelegationResourceWithStreamingResponse",
-    "AsyncDCVDelegationResourceWithStreamingResponse",
-    "HostnamesResource",
-    "AsyncHostnamesResource",
-    "HostnamesResourceWithRawResponse",
-    "AsyncHostnamesResourceWithRawResponse",
-    "HostnamesResourceWithStreamingResponse",
-    "AsyncHostnamesResourceWithStreamingResponse",
-    "SnippetsResource",
-    "AsyncSnippetsResource",
-    "SnippetsResourceWithRawResponse",
-    "AsyncSnippetsResourceWithRawResponse",
-    "SnippetsResourceWithStreamingResponse",
-    "AsyncSnippetsResourceWithStreamingResponse",
-    "CallsResource",
-    "AsyncCallsResource",
-    "CallsResourceWithRawResponse",
-    "AsyncCallsResourceWithRawResponse",
-    "CallsResourceWithStreamingResponse",
-    "AsyncCallsResourceWithStreamingResponse",
-    "CloudforceOneResource",
-    "AsyncCloudforceOneResource",
-    "CloudforceOneResourceWithRawResponse",
-    "AsyncCloudforceOneResourceWithRawResponse",
-    "CloudforceOneResourceWithStreamingResponse",
-    "AsyncCloudforceOneResourceWithStreamingResponse",
-    "EventNotificationsResource",
-    "AsyncEventNotificationsResource",
-    "EventNotificationsResourceWithRawResponse",
-    "AsyncEventNotificationsResourceWithRawResponse",
-    "EventNotificationsResourceWithStreamingResponse",
-    "AsyncEventNotificationsResourceWithStreamingResponse",
-    "AIGatewayResource",
-    "AsyncAIGatewayResource",
-    "AIGatewayResourceWithRawResponse",
-    "AsyncAIGatewayResourceWithRawResponse",
-    "AIGatewayResourceWithStreamingResponse",
-    "AsyncAIGatewayResourceWithStreamingResponse",
-    "IAMResource",
-    "AsyncIAMResource",
-    "IAMResourceWithRawResponse",
-    "AsyncIAMResourceWithRawResponse",
-    "IAMResourceWithStreamingResponse",
-    "AsyncIAMResourceWithStreamingResponse",
-    "CloudConnectorResource",
-    "AsyncCloudConnectorResource",
-    "CloudConnectorResourceWithRawResponse",
-    "AsyncCloudConnectorResourceWithRawResponse",
-    "CloudConnectorResourceWithStreamingResponse",
-    "AsyncCloudConnectorResourceWithStreamingResponse",
-]
diff --git a/src/cloudflare/resources/abuse_reports/__init__.py b/src/cloudflare/resources/abuse_reports/__init__.py
new file mode 100644
index 00000000000..4283c591bc4
--- /dev/null
+++ b/src/cloudflare/resources/abuse_reports/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .mitigations import (
+    MitigationsResource,
+    AsyncMitigationsResource,
+    MitigationsResourceWithRawResponse,
+    AsyncMitigationsResourceWithRawResponse,
+    MitigationsResourceWithStreamingResponse,
+    AsyncMitigationsResourceWithStreamingResponse,
+)
+from .abuse_reports import (
+    AbuseReportsResource,
+    AsyncAbuseReportsResource,
+    AbuseReportsResourceWithRawResponse,
+    AsyncAbuseReportsResourceWithRawResponse,
+    AbuseReportsResourceWithStreamingResponse,
+    AsyncAbuseReportsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "MitigationsResource",
+    "AsyncMitigationsResource",
+    "MitigationsResourceWithRawResponse",
+    "AsyncMitigationsResourceWithRawResponse",
+    "MitigationsResourceWithStreamingResponse",
+    "AsyncMitigationsResourceWithStreamingResponse",
+    "AbuseReportsResource",
+    "AsyncAbuseReportsResource",
+    "AbuseReportsResourceWithRawResponse",
+    "AsyncAbuseReportsResourceWithRawResponse",
+    "AbuseReportsResourceWithStreamingResponse",
+    "AsyncAbuseReportsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/abuse_reports/abuse_reports.py b/src/cloudflare/resources/abuse_reports/abuse_reports.py
new file mode 100644
index 00000000000..9cf0a64aa03
--- /dev/null
+++ b/src/cloudflare/resources/abuse_reports/abuse_reports.py
@@ -0,0 +1,2164 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal, overload
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from .mitigations import (
+    MitigationsResource,
+    AsyncMitigationsResource,
+    MitigationsResourceWithRawResponse,
+    AsyncMitigationsResourceWithRawResponse,
+    MitigationsResourceWithStreamingResponse,
+    AsyncMitigationsResourceWithStreamingResponse,
+)
+from ...pagination import SyncV4PagePagination, AsyncV4PagePagination
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.abuse_reports import abuse_report_list_params, abuse_report_create_params
+from ...types.abuse_reports.abuse_report_get_response import AbuseReportGetResponse
+from ...types.abuse_reports.abuse_report_list_response import AbuseReportListResponse
+from ...types.abuse_reports.abuse_report_create_response import AbuseReportCreateResponse
+
+__all__ = ["AbuseReportsResource", "AsyncAbuseReportsResource"]
+
+
+class AbuseReportsResource(SyncAPIResource):
+    @cached_property
+    def mitigations(self) -> MitigationsResource:
+        return MitigationsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AbuseReportsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AbuseReportsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AbuseReportsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AbuseReportsResourceWithStreamingResponse(self)
+
+    @overload
+    def create(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        act: Literal["abuse_dmca"],
+        address1: str,
+        agent_name: str,
+        agree: Literal[1],
+        city: str,
+        country: str,
+        email: str,
+        email2: str,
+        host_notification: Literal["send"],
+        name: str,
+        original_work: str,
+        owner_notification: Literal["send"],
+        signature: str,
+        state: str,
+        urls: str,
+        comments: str | Omit = omit,
+        company: str | Omit = omit,
+        reported_country: str | Omit = omit,
+        reported_user_agent: str | Omit = omit,
+        tele: str | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Submit the Abuse Report of a particular type
+
+        Args:
+          report_param: The report type for submitted reports.
+
+          act: The report type for submitted reports.
+
+          address1: Text not exceeding 100 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          agent_name: The name of the copyright holder. Text not exceeding 60 characters. This field
+              may be released by Cloudflare to third parties such as the Lumen Database
+              (https://lumendatabase.org/).
+
+          agree: Can be `0` for false or `1` for true. Must be value: 1 for DMCA reports
+
+          city: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          country: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          email: A valid email of the abuse reporter. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          email2: Should match the value provided in `email`
+
+          host_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          name: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          original_work: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          owner_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          signature: Required for DMCA reports, should be same as Name. An affirmation that all
+              information in the report is true and accurate while agreeing to the policies of
+              Cloudflare's abuse reports
+
+          state: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          urls: A list of valid URLs separated by ‘\n’ (new line character). The list of the
+              URLs should not exceed 250 URLs. All URLs should have the same hostname. Each
+              URL should be unique. This field may be released by Cloudflare to third parties
+              such as the Lumen Database (https://lumendatabase.org/).
+
+          comments: Any additional comments about the infringement not exceeding 2000 characters
+
+          company: Text not exceeding 100 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          reported_country: Text containing 2 characters
+
+          reported_user_agent: Text not exceeding 255 characters
+
+          tele: Text not exceeding 20 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          title: Text not exceeding 255 characters
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        act: Literal["abuse_trademark"],
+        email: str,
+        email2: str,
+        host_notification: Literal["send"],
+        justification: str,
+        name: str,
+        owner_notification: Literal["send"],
+        trademark_number: str,
+        trademark_office: str,
+        trademark_symbol: str,
+        urls: str,
+        comments: str | Omit = omit,
+        company: str | Omit = omit,
+        reported_country: str | Omit = omit,
+        reported_user_agent: str | Omit = omit,
+        tele: str | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Submit the Abuse Report of a particular type
+
+        Args:
+          report_param: The report type for submitted reports.
+
+          act: The report type for submitted reports.
+
+          email: A valid email of the abuse reporter. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          email2: Should match the value provided in `email`
+
+          host_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          justification: A detailed description of the infringement, including any necessary access
+              details and the exact steps needed to view the content, not exceeding 5000
+              characters.
+
+          name: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          owner_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          trademark_number: Text not exceeding 1000 characters
+
+          trademark_office: Text not exceeding 1000 characters
+
+          trademark_symbol: Text not exceeding 1000 characters
+
+          urls: A list of valid URLs separated by ‘\n’ (new line character). The list of the
+              URLs should not exceed 250 URLs. All URLs should have the same hostname. Each
+              URL should be unique. This field may be released by Cloudflare to third parties
+              such as the Lumen Database (https://lumendatabase.org/).
+
+          comments: Any additional comments about the infringement not exceeding 2000 characters
+
+          company: Text not exceeding 100 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          reported_country: Text containing 2 characters
+
+          reported_user_agent: Text not exceeding 255 characters
+
+          tele: Text not exceeding 20 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          title: Text not exceeding 255 characters
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        act: Literal["abuse_general"],
+        email: str,
+        email2: str,
+        host_notification: Literal["send", "send-anon"],
+        justification: str,
+        name: str,
+        owner_notification: Literal["send", "send-anon", "none"],
+        urls: str,
+        comments: str | Omit = omit,
+        company: str | Omit = omit,
+        destination_ips: str | Omit = omit,
+        ports_protocols: str | Omit = omit,
+        reported_country: str | Omit = omit,
+        reported_user_agent: str | Omit = omit,
+        source_ips: str | Omit = omit,
+        tele: str | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Submit the Abuse Report of a particular type
+
+        Args:
+          report_param: The report type for submitted reports.
+
+          act: The report type for submitted reports.
+
+          email: A valid email of the abuse reporter. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          email2: Should match the value provided in `email`
+
+          host_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          justification: A detailed description of the infringement, including any necessary access
+              details and the exact steps needed to view the content, not exceeding 5000
+              characters.
+
+          name: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          owner_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          urls: A list of valid URLs separated by ‘\n’ (new line character). The list of the
+              URLs should not exceed 250 URLs. All URLs should have the same hostname. Each
+              URL should be unique. This field may be released by Cloudflare to third parties
+              such as the Lumen Database (https://lumendatabase.org/).
+
+          comments: Any additional comments about the infringement not exceeding 2000 characters
+
+          company: Text not exceeding 100 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          destination_ips: A list of IP addresses separated by ‘\n’ (new line character). The list of
+              destination IPs should not exceed 30 IP addresses. Each one of the IP addresses
+              ought to be unique.
+
+          ports_protocols: A comma separated list of ports and protocols e.g. 80/TCP, 22/UDP. The total
+              size of the field should not exceed 2000 characters. Each individual
+              port/protocol should not exceed 100 characters. The list should not have more
+              than 30 unique ports and protocols.
+
+          reported_country: Text containing 2 characters
+
+          reported_user_agent: Text not exceeding 255 characters
+
+          source_ips: A list of IP addresses separated by ‘\n’ (new line character). The list of
+              source IPs should not exceed 30 IP addresses. Each one of the IP addresses ought
+              to be unique.
+
+          tele: Text not exceeding 20 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          title: Text not exceeding 255 characters
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        act: Literal["abuse_phishing"],
+        email: str,
+        email2: str,
+        host_notification: Literal["send", "send-anon"],
+        justification: str,
+        name: str,
+        owner_notification: Literal["send", "send-anon"],
+        urls: str,
+        comments: str | Omit = omit,
+        company: str | Omit = omit,
+        original_work: str | Omit = omit,
+        reported_country: str | Omit = omit,
+        reported_user_agent: str | Omit = omit,
+        tele: str | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Submit the Abuse Report of a particular type
+
+        Args:
+          report_param: The report type for submitted reports.
+
+          act: The report type for submitted reports.
+
+          email: A valid email of the abuse reporter. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          email2: Should match the value provided in `email`
+
+          host_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          justification: A detailed description of the infringement, including any necessary access
+              details and the exact steps needed to view the content, not exceeding 5000
+              characters.
+
+          name: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          owner_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          urls: A list of valid URLs separated by ‘\n’ (new line character). The list of the
+              URLs should not exceed 250 URLs. All URLs should have the same hostname. Each
+              URL should be unique. This field may be released by Cloudflare to third parties
+              such as the Lumen Database (https://lumendatabase.org/).
+
+          comments: Any additional comments about the infringement not exceeding 2000 characters
+
+          company: Text not exceeding 100 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          original_work: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          reported_country: Text containing 2 characters
+
+          reported_user_agent: Text not exceeding 255 characters
+
+          tele: Text not exceeding 20 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          title: Text not exceeding 255 characters
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        act: Literal["abuse_children"],
+        email: str,
+        email2: str,
+        host_notification: Literal["send", "send-anon"],
+        justification: str,
+        name: str,
+        ncmec_notification: Literal["send", "send-anon"],
+        owner_notification: Literal["send", "send-anon", "none"],
+        urls: str,
+        comments: str | Omit = omit,
+        company: str | Omit = omit,
+        country: str | Omit = omit,
+        reported_country: str | Omit = omit,
+        reported_user_agent: str | Omit = omit,
+        tele: str | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Submit the Abuse Report of a particular type
+
+        Args:
+          report_param: The report type for submitted reports.
+
+          act: The report type for submitted reports.
+
+          email: A valid email of the abuse reporter. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          email2: Should match the value provided in `email`
+
+          host_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          justification: A detailed description of the infringement, including any necessary access
+              details and the exact steps needed to view the content, not exceeding 5000
+              characters.
+
+          name: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          ncmec_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          owner_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          urls: A list of valid URLs separated by ‘\n’ (new line character). The list of the
+              URLs should not exceed 250 URLs. All URLs should have the same hostname. Each
+              URL should be unique. This field may be released by Cloudflare to third parties
+              such as the Lumen Database (https://lumendatabase.org/).
+
+          comments: Any additional comments about the infringement not exceeding 2000 characters
+
+          company: Text not exceeding 100 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          country: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          reported_country: Text containing 2 characters
+
+          reported_user_agent: Text not exceeding 255 characters
+
+          tele: Text not exceeding 20 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          title: Text not exceeding 255 characters
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        act: Literal["abuse_threat"],
+        email: str,
+        email2: str,
+        host_notification: Literal["send", "send-anon"],
+        justification: str,
+        name: str,
+        owner_notification: Literal["send", "send-anon"],
+        urls: str,
+        comments: str | Omit = omit,
+        company: str | Omit = omit,
+        reported_country: str | Omit = omit,
+        reported_user_agent: str | Omit = omit,
+        tele: str | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Submit the Abuse Report of a particular type
+
+        Args:
+          report_param: The report type for submitted reports.
+
+          act: The report type for submitted reports.
+
+          email: A valid email of the abuse reporter. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          email2: Should match the value provided in `email`
+
+          host_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          justification: A detailed description of the infringement, including any necessary access
+              details and the exact steps needed to view the content, not exceeding 5000
+              characters.
+
+          name: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          owner_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          urls: A list of valid URLs separated by ‘\n’ (new line character). The list of the
+              URLs should not exceed 250 URLs. All URLs should have the same hostname. Each
+              URL should be unique. This field may be released by Cloudflare to third parties
+              such as the Lumen Database (https://lumendatabase.org/).
+
+          comments: Any additional comments about the infringement not exceeding 2000 characters
+
+          company: Text not exceeding 100 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          reported_country: Text containing 2 characters
+
+          reported_user_agent: Text not exceeding 255 characters
+
+          tele: Text not exceeding 20 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          title: Text not exceeding 255 characters
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        act: Literal["abuse_registrar_whois"],
+        email: str,
+        email2: str,
+        name: str,
+        owner_notification: Literal["send", "send-anon", "none"],
+        urls: str,
+        comments: str | Omit = omit,
+        company: str | Omit = omit,
+        reported_country: str | Omit = omit,
+        reported_user_agent: str | Omit = omit,
+        tele: str | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Submit the Abuse Report of a particular type
+
+        Args:
+          report_param: The report type for submitted reports.
+
+          act: The report type for submitted reports.
+
+          email: A valid email of the abuse reporter. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          email2: Should match the value provided in `email`
+
+          name: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          owner_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          urls: A list of valid URLs separated by ‘\n’ (new line character). The list of the
+              URLs should not exceed 250 URLs. All URLs should have the same hostname. Each
+              URL should be unique. This field may be released by Cloudflare to third parties
+              such as the Lumen Database (https://lumendatabase.org/).
+
+          comments: Any additional comments about the infringement not exceeding 2000 characters
+
+          company: Text not exceeding 100 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          reported_country: Text containing 2 characters
+
+          reported_user_agent: Text not exceeding 255 characters
+
+          tele: Text not exceeding 20 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          title: Text not exceeding 255 characters
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        act: Literal["abuse_ncsei"],
+        email: str,
+        email2: str,
+        host_notification: Literal["send", "send-anon"],
+        name: str,
+        ncsei_subject_representation: bool,
+        owner_notification: Literal["send", "send-anon", "none"],
+        urls: str,
+        comments: str | Omit = omit,
+        company: str | Omit = omit,
+        country: str | Omit = omit,
+        reported_country: str | Omit = omit,
+        reported_user_agent: str | Omit = omit,
+        tele: str | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Submit the Abuse Report of a particular type
+
+        Args:
+          report_param: The report type for submitted reports.
+
+          act: The report type for submitted reports.
+
+          email: A valid email of the abuse reporter. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          email2: Should match the value provided in `email`
+
+          host_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          name: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          ncsei_subject_representation: If the submitter is the target of NCSEI in the URLs of the abuse report.
+
+          owner_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          urls: A list of valid URLs separated by ‘\n’ (new line character). The list of the
+              URLs should not exceed 250 URLs. All URLs should have the same hostname. Each
+              URL should be unique. This field may be released by Cloudflare to third parties
+              such as the Lumen Database (https://lumendatabase.org/).
+
+          comments: Any additional comments about the infringement not exceeding 2000 characters
+
+          company: Text not exceeding 100 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          country: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          reported_country: Text containing 2 characters
+
+          reported_user_agent: Text not exceeding 255 characters
+
+          tele: Text not exceeding 20 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          title: Text not exceeding 255 characters
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(
+        [
+            "account_id",
+            "act",
+            "address1",
+            "agent_name",
+            "agree",
+            "city",
+            "country",
+            "email",
+            "email2",
+            "host_notification",
+            "name",
+            "original_work",
+            "owner_notification",
+            "signature",
+            "state",
+            "urls",
+        ],
+        [
+            "account_id",
+            "act",
+            "email",
+            "email2",
+            "host_notification",
+            "justification",
+            "name",
+            "owner_notification",
+            "trademark_number",
+            "trademark_office",
+            "trademark_symbol",
+            "urls",
+        ],
+        [
+            "account_id",
+            "act",
+            "email",
+            "email2",
+            "host_notification",
+            "justification",
+            "name",
+            "owner_notification",
+            "urls",
+        ],
+        [
+            "account_id",
+            "act",
+            "email",
+            "email2",
+            "host_notification",
+            "justification",
+            "name",
+            "ncmec_notification",
+            "owner_notification",
+            "urls",
+        ],
+        ["account_id", "act", "email", "email2", "name", "owner_notification", "urls"],
+        [
+            "account_id",
+            "act",
+            "email",
+            "email2",
+            "host_notification",
+            "name",
+            "ncsei_subject_representation",
+            "owner_notification",
+            "urls",
+        ],
+    )
+    def create(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        act: Literal["abuse_dmca"]
+        | Literal["abuse_trademark"]
+        | Literal["abuse_general"]
+        | Literal["abuse_phishing"]
+        | Literal["abuse_children"]
+        | Literal["abuse_threat"]
+        | Literal["abuse_registrar_whois"]
+        | Literal["abuse_ncsei"],
+        address1: str | Omit = omit,
+        agent_name: str | Omit = omit,
+        agree: Literal[1] | Omit = omit,
+        city: str | Omit = omit,
+        country: str | Omit = omit,
+        email: str,
+        email2: str,
+        host_notification: Literal["send"] | Literal["send", "send-anon"] | Omit = omit,
+        name: str,
+        original_work: str | Omit = omit,
+        owner_notification: Literal["send"] | Literal["send", "send-anon", "none"] | Literal["send", "send-anon"],
+        signature: str | Omit = omit,
+        state: str | Omit = omit,
+        urls: str,
+        comments: str | Omit = omit,
+        company: str | Omit = omit,
+        reported_country: str | Omit = omit,
+        reported_user_agent: str | Omit = omit,
+        tele: str | Omit = omit,
+        title: str | Omit = omit,
+        justification: str | Omit = omit,
+        trademark_number: str | Omit = omit,
+        trademark_office: str | Omit = omit,
+        trademark_symbol: str | Omit = omit,
+        destination_ips: str | Omit = omit,
+        ports_protocols: str | Omit = omit,
+        source_ips: str | Omit = omit,
+        ncmec_notification: Literal["send", "send-anon"] | Omit = omit,
+        ncsei_subject_representation: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not report_param:
+            raise ValueError(f"Expected a non-empty value for `report_param` but received {report_param!r}")
+        return self._post(
+            f"/accounts/{account_id}/abuse-reports/{report_param}",
+            body=maybe_transform(
+                {
+                    "act": act,
+                    "address1": address1,
+                    "agent_name": agent_name,
+                    "agree": agree,
+                    "city": city,
+                    "country": country,
+                    "email": email,
+                    "email2": email2,
+                    "host_notification": host_notification,
+                    "name": name,
+                    "original_work": original_work,
+                    "owner_notification": owner_notification,
+                    "signature": signature,
+                    "state": state,
+                    "urls": urls,
+                    "comments": comments,
+                    "company": company,
+                    "reported_country": reported_country,
+                    "reported_user_agent": reported_user_agent,
+                    "tele": tele,
+                    "title": title,
+                    "justification": justification,
+                    "trademark_number": trademark_number,
+                    "trademark_office": trademark_office,
+                    "trademark_symbol": trademark_symbol,
+                    "destination_ips": destination_ips,
+                    "ports_protocols": ports_protocols,
+                    "source_ips": source_ips,
+                    "ncmec_notification": ncmec_notification,
+                    "ncsei_subject_representation": ncsei_subject_representation,
+                },
+                abuse_report_create_params.AbuseReportCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AbuseReportCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        created_after: str | Omit = omit,
+        created_before: str | Omit = omit,
+        domain: str | Omit = omit,
+        mitigation_status: Literal["pending", "active", "in_review", "cancelled", "removed"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        sort: str | Omit = omit,
+        status: Literal["accepted", "in_review"] | Omit = omit,
+        type: Literal["PHISH", "GEN", "THREAT", "DMCA", "EMER", "TM", "REG_WHO", "NCSEI", "NETWORK"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePagination[Optional[AbuseReportListResponse]]:
+        """
+        List the abuse reports for a given account
+
+        Args:
+          created_after: Returns reports created after the specified date
+
+          created_before: Returns reports created before the specified date
+
+          domain: Filter by domain name related to the abuse report
+
+          mitigation_status: Filter reports that have any mitigations in the given status.
+
+          page: Where in pagination to start listing abuse reports
+
+          per_page: How many abuse reports per page to list
+
+          sort: A property to sort by, followed by the order (id, cdate, domain, type, status)
+
+          status: Filter by the status of the report.
+
+          type: Filter by the type of the report.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/abuse-reports",
+            page=SyncV4PagePagination[Optional[AbuseReportListResponse]],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "created_after": created_after,
+                        "created_before": created_before,
+                        "domain": domain,
+                        "mitigation_status": mitigation_status,
+                        "page": page,
+                        "per_page": per_page,
+                        "sort": sort,
+                        "status": status,
+                        "type": type,
+                    },
+                    abuse_report_list_params.AbuseReportListParams,
+                ),
+            ),
+            model=AbuseReportListResponse,
+        )
+
+    def get(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AbuseReportGetResponse:
+        """
+        Retrieve the details of an abuse report.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not report_param:
+            raise ValueError(f"Expected a non-empty value for `report_param` but received {report_param!r}")
+        return self._get(
+            f"/accounts/{account_id}/abuse-reports/{report_param}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AbuseReportGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AbuseReportGetResponse], ResultWrapper[AbuseReportGetResponse]),
+        )
+
+
+class AsyncAbuseReportsResource(AsyncAPIResource):
+    @cached_property
+    def mitigations(self) -> AsyncMitigationsResource:
+        return AsyncMitigationsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncAbuseReportsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAbuseReportsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAbuseReportsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAbuseReportsResourceWithStreamingResponse(self)
+
+    @overload
+    async def create(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        act: Literal["abuse_dmca"],
+        address1: str,
+        agent_name: str,
+        agree: Literal[1],
+        city: str,
+        country: str,
+        email: str,
+        email2: str,
+        host_notification: Literal["send"],
+        name: str,
+        original_work: str,
+        owner_notification: Literal["send"],
+        signature: str,
+        state: str,
+        urls: str,
+        comments: str | Omit = omit,
+        company: str | Omit = omit,
+        reported_country: str | Omit = omit,
+        reported_user_agent: str | Omit = omit,
+        tele: str | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Submit the Abuse Report of a particular type
+
+        Args:
+          report_param: The report type for submitted reports.
+
+          act: The report type for submitted reports.
+
+          address1: Text not exceeding 100 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          agent_name: The name of the copyright holder. Text not exceeding 60 characters. This field
+              may be released by Cloudflare to third parties such as the Lumen Database
+              (https://lumendatabase.org/).
+
+          agree: Can be `0` for false or `1` for true. Must be value: 1 for DMCA reports
+
+          city: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          country: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          email: A valid email of the abuse reporter. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          email2: Should match the value provided in `email`
+
+          host_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          name: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          original_work: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          owner_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          signature: Required for DMCA reports, should be same as Name. An affirmation that all
+              information in the report is true and accurate while agreeing to the policies of
+              Cloudflare's abuse reports
+
+          state: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          urls: A list of valid URLs separated by ‘\n’ (new line character). The list of the
+              URLs should not exceed 250 URLs. All URLs should have the same hostname. Each
+              URL should be unique. This field may be released by Cloudflare to third parties
+              such as the Lumen Database (https://lumendatabase.org/).
+
+          comments: Any additional comments about the infringement not exceeding 2000 characters
+
+          company: Text not exceeding 100 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          reported_country: Text containing 2 characters
+
+          reported_user_agent: Text not exceeding 255 characters
+
+          tele: Text not exceeding 20 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          title: Text not exceeding 255 characters
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        act: Literal["abuse_trademark"],
+        email: str,
+        email2: str,
+        host_notification: Literal["send"],
+        justification: str,
+        name: str,
+        owner_notification: Literal["send"],
+        trademark_number: str,
+        trademark_office: str,
+        trademark_symbol: str,
+        urls: str,
+        comments: str | Omit = omit,
+        company: str | Omit = omit,
+        reported_country: str | Omit = omit,
+        reported_user_agent: str | Omit = omit,
+        tele: str | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Submit the Abuse Report of a particular type
+
+        Args:
+          report_param: The report type for submitted reports.
+
+          act: The report type for submitted reports.
+
+          email: A valid email of the abuse reporter. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          email2: Should match the value provided in `email`
+
+          host_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          justification: A detailed description of the infringement, including any necessary access
+              details and the exact steps needed to view the content, not exceeding 5000
+              characters.
+
+          name: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          owner_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          trademark_number: Text not exceeding 1000 characters
+
+          trademark_office: Text not exceeding 1000 characters
+
+          trademark_symbol: Text not exceeding 1000 characters
+
+          urls: A list of valid URLs separated by ‘\n’ (new line character). The list of the
+              URLs should not exceed 250 URLs. All URLs should have the same hostname. Each
+              URL should be unique. This field may be released by Cloudflare to third parties
+              such as the Lumen Database (https://lumendatabase.org/).
+
+          comments: Any additional comments about the infringement not exceeding 2000 characters
+
+          company: Text not exceeding 100 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          reported_country: Text containing 2 characters
+
+          reported_user_agent: Text not exceeding 255 characters
+
+          tele: Text not exceeding 20 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          title: Text not exceeding 255 characters
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        act: Literal["abuse_general"],
+        email: str,
+        email2: str,
+        host_notification: Literal["send", "send-anon"],
+        justification: str,
+        name: str,
+        owner_notification: Literal["send", "send-anon", "none"],
+        urls: str,
+        comments: str | Omit = omit,
+        company: str | Omit = omit,
+        destination_ips: str | Omit = omit,
+        ports_protocols: str | Omit = omit,
+        reported_country: str | Omit = omit,
+        reported_user_agent: str | Omit = omit,
+        source_ips: str | Omit = omit,
+        tele: str | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Submit the Abuse Report of a particular type
+
+        Args:
+          report_param: The report type for submitted reports.
+
+          act: The report type for submitted reports.
+
+          email: A valid email of the abuse reporter. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          email2: Should match the value provided in `email`
+
+          host_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          justification: A detailed description of the infringement, including any necessary access
+              details and the exact steps needed to view the content, not exceeding 5000
+              characters.
+
+          name: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          owner_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          urls: A list of valid URLs separated by ‘\n’ (new line character). The list of the
+              URLs should not exceed 250 URLs. All URLs should have the same hostname. Each
+              URL should be unique. This field may be released by Cloudflare to third parties
+              such as the Lumen Database (https://lumendatabase.org/).
+
+          comments: Any additional comments about the infringement not exceeding 2000 characters
+
+          company: Text not exceeding 100 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          destination_ips: A list of IP addresses separated by ‘\n’ (new line character). The list of
+              destination IPs should not exceed 30 IP addresses. Each one of the IP addresses
+              ought to be unique.
+
+          ports_protocols: A comma separated list of ports and protocols e.g. 80/TCP, 22/UDP. The total
+              size of the field should not exceed 2000 characters. Each individual
+              port/protocol should not exceed 100 characters. The list should not have more
+              than 30 unique ports and protocols.
+
+          reported_country: Text containing 2 characters
+
+          reported_user_agent: Text not exceeding 255 characters
+
+          source_ips: A list of IP addresses separated by ‘\n’ (new line character). The list of
+              source IPs should not exceed 30 IP addresses. Each one of the IP addresses ought
+              to be unique.
+
+          tele: Text not exceeding 20 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          title: Text not exceeding 255 characters
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        act: Literal["abuse_phishing"],
+        email: str,
+        email2: str,
+        host_notification: Literal["send", "send-anon"],
+        justification: str,
+        name: str,
+        owner_notification: Literal["send", "send-anon"],
+        urls: str,
+        comments: str | Omit = omit,
+        company: str | Omit = omit,
+        original_work: str | Omit = omit,
+        reported_country: str | Omit = omit,
+        reported_user_agent: str | Omit = omit,
+        tele: str | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Submit the Abuse Report of a particular type
+
+        Args:
+          report_param: The report type for submitted reports.
+
+          act: The report type for submitted reports.
+
+          email: A valid email of the abuse reporter. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          email2: Should match the value provided in `email`
+
+          host_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          justification: A detailed description of the infringement, including any necessary access
+              details and the exact steps needed to view the content, not exceeding 5000
+              characters.
+
+          name: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          owner_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          urls: A list of valid URLs separated by ‘\n’ (new line character). The list of the
+              URLs should not exceed 250 URLs. All URLs should have the same hostname. Each
+              URL should be unique. This field may be released by Cloudflare to third parties
+              such as the Lumen Database (https://lumendatabase.org/).
+
+          comments: Any additional comments about the infringement not exceeding 2000 characters
+
+          company: Text not exceeding 100 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          original_work: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          reported_country: Text containing 2 characters
+
+          reported_user_agent: Text not exceeding 255 characters
+
+          tele: Text not exceeding 20 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          title: Text not exceeding 255 characters
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        act: Literal["abuse_children"],
+        email: str,
+        email2: str,
+        host_notification: Literal["send", "send-anon"],
+        justification: str,
+        name: str,
+        ncmec_notification: Literal["send", "send-anon"],
+        owner_notification: Literal["send", "send-anon", "none"],
+        urls: str,
+        comments: str | Omit = omit,
+        company: str | Omit = omit,
+        country: str | Omit = omit,
+        reported_country: str | Omit = omit,
+        reported_user_agent: str | Omit = omit,
+        tele: str | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Submit the Abuse Report of a particular type
+
+        Args:
+          report_param: The report type for submitted reports.
+
+          act: The report type for submitted reports.
+
+          email: A valid email of the abuse reporter. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          email2: Should match the value provided in `email`
+
+          host_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          justification: A detailed description of the infringement, including any necessary access
+              details and the exact steps needed to view the content, not exceeding 5000
+              characters.
+
+          name: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          ncmec_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          owner_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          urls: A list of valid URLs separated by ‘\n’ (new line character). The list of the
+              URLs should not exceed 250 URLs. All URLs should have the same hostname. Each
+              URL should be unique. This field may be released by Cloudflare to third parties
+              such as the Lumen Database (https://lumendatabase.org/).
+
+          comments: Any additional comments about the infringement not exceeding 2000 characters
+
+          company: Text not exceeding 100 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          country: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          reported_country: Text containing 2 characters
+
+          reported_user_agent: Text not exceeding 255 characters
+
+          tele: Text not exceeding 20 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          title: Text not exceeding 255 characters
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        act: Literal["abuse_threat"],
+        email: str,
+        email2: str,
+        host_notification: Literal["send", "send-anon"],
+        justification: str,
+        name: str,
+        owner_notification: Literal["send", "send-anon"],
+        urls: str,
+        comments: str | Omit = omit,
+        company: str | Omit = omit,
+        reported_country: str | Omit = omit,
+        reported_user_agent: str | Omit = omit,
+        tele: str | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Submit the Abuse Report of a particular type
+
+        Args:
+          report_param: The report type for submitted reports.
+
+          act: The report type for submitted reports.
+
+          email: A valid email of the abuse reporter. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          email2: Should match the value provided in `email`
+
+          host_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          justification: A detailed description of the infringement, including any necessary access
+              details and the exact steps needed to view the content, not exceeding 5000
+              characters.
+
+          name: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          owner_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          urls: A list of valid URLs separated by ‘\n’ (new line character). The list of the
+              URLs should not exceed 250 URLs. All URLs should have the same hostname. Each
+              URL should be unique. This field may be released by Cloudflare to third parties
+              such as the Lumen Database (https://lumendatabase.org/).
+
+          comments: Any additional comments about the infringement not exceeding 2000 characters
+
+          company: Text not exceeding 100 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          reported_country: Text containing 2 characters
+
+          reported_user_agent: Text not exceeding 255 characters
+
+          tele: Text not exceeding 20 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          title: Text not exceeding 255 characters
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        act: Literal["abuse_registrar_whois"],
+        email: str,
+        email2: str,
+        name: str,
+        owner_notification: Literal["send", "send-anon", "none"],
+        urls: str,
+        comments: str | Omit = omit,
+        company: str | Omit = omit,
+        reported_country: str | Omit = omit,
+        reported_user_agent: str | Omit = omit,
+        tele: str | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Submit the Abuse Report of a particular type
+
+        Args:
+          report_param: The report type for submitted reports.
+
+          act: The report type for submitted reports.
+
+          email: A valid email of the abuse reporter. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          email2: Should match the value provided in `email`
+
+          name: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          owner_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          urls: A list of valid URLs separated by ‘\n’ (new line character). The list of the
+              URLs should not exceed 250 URLs. All URLs should have the same hostname. Each
+              URL should be unique. This field may be released by Cloudflare to third parties
+              such as the Lumen Database (https://lumendatabase.org/).
+
+          comments: Any additional comments about the infringement not exceeding 2000 characters
+
+          company: Text not exceeding 100 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          reported_country: Text containing 2 characters
+
+          reported_user_agent: Text not exceeding 255 characters
+
+          tele: Text not exceeding 20 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          title: Text not exceeding 255 characters
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        act: Literal["abuse_ncsei"],
+        email: str,
+        email2: str,
+        host_notification: Literal["send", "send-anon"],
+        name: str,
+        ncsei_subject_representation: bool,
+        owner_notification: Literal["send", "send-anon", "none"],
+        urls: str,
+        comments: str | Omit = omit,
+        company: str | Omit = omit,
+        country: str | Omit = omit,
+        reported_country: str | Omit = omit,
+        reported_user_agent: str | Omit = omit,
+        tele: str | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Submit the Abuse Report of a particular type
+
+        Args:
+          report_param: The report type for submitted reports.
+
+          act: The report type for submitted reports.
+
+          email: A valid email of the abuse reporter. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          email2: Should match the value provided in `email`
+
+          host_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          name: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          ncsei_subject_representation: If the submitter is the target of NCSEI in the URLs of the abuse report.
+
+          owner_notification: Notification type based on the abuse type. NOTE: Copyright (DMCA) and Trademark
+              reports cannot be anonymous.
+
+          urls: A list of valid URLs separated by ‘\n’ (new line character). The list of the
+              URLs should not exceed 250 URLs. All URLs should have the same hostname. Each
+              URL should be unique. This field may be released by Cloudflare to third parties
+              such as the Lumen Database (https://lumendatabase.org/).
+
+          comments: Any additional comments about the infringement not exceeding 2000 characters
+
+          company: Text not exceeding 100 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          country: Text not exceeding 255 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          reported_country: Text containing 2 characters
+
+          reported_user_agent: Text not exceeding 255 characters
+
+          tele: Text not exceeding 20 characters. This field may be released by Cloudflare to
+              third parties such as the Lumen Database (https://lumendatabase.org/).
+
+          title: Text not exceeding 255 characters
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(
+        [
+            "account_id",
+            "act",
+            "address1",
+            "agent_name",
+            "agree",
+            "city",
+            "country",
+            "email",
+            "email2",
+            "host_notification",
+            "name",
+            "original_work",
+            "owner_notification",
+            "signature",
+            "state",
+            "urls",
+        ],
+        [
+            "account_id",
+            "act",
+            "email",
+            "email2",
+            "host_notification",
+            "justification",
+            "name",
+            "owner_notification",
+            "trademark_number",
+            "trademark_office",
+            "trademark_symbol",
+            "urls",
+        ],
+        [
+            "account_id",
+            "act",
+            "email",
+            "email2",
+            "host_notification",
+            "justification",
+            "name",
+            "owner_notification",
+            "urls",
+        ],
+        [
+            "account_id",
+            "act",
+            "email",
+            "email2",
+            "host_notification",
+            "justification",
+            "name",
+            "ncmec_notification",
+            "owner_notification",
+            "urls",
+        ],
+        ["account_id", "act", "email", "email2", "name", "owner_notification", "urls"],
+        [
+            "account_id",
+            "act",
+            "email",
+            "email2",
+            "host_notification",
+            "name",
+            "ncsei_subject_representation",
+            "owner_notification",
+            "urls",
+        ],
+    )
+    async def create(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        act: Literal["abuse_dmca"]
+        | Literal["abuse_trademark"]
+        | Literal["abuse_general"]
+        | Literal["abuse_phishing"]
+        | Literal["abuse_children"]
+        | Literal["abuse_threat"]
+        | Literal["abuse_registrar_whois"]
+        | Literal["abuse_ncsei"],
+        address1: str | Omit = omit,
+        agent_name: str | Omit = omit,
+        agree: Literal[1] | Omit = omit,
+        city: str | Omit = omit,
+        country: str | Omit = omit,
+        email: str,
+        email2: str,
+        host_notification: Literal["send"] | Literal["send", "send-anon"] | Omit = omit,
+        name: str,
+        original_work: str | Omit = omit,
+        owner_notification: Literal["send"] | Literal["send", "send-anon", "none"] | Literal["send", "send-anon"],
+        signature: str | Omit = omit,
+        state: str | Omit = omit,
+        urls: str,
+        comments: str | Omit = omit,
+        company: str | Omit = omit,
+        reported_country: str | Omit = omit,
+        reported_user_agent: str | Omit = omit,
+        tele: str | Omit = omit,
+        title: str | Omit = omit,
+        justification: str | Omit = omit,
+        trademark_number: str | Omit = omit,
+        trademark_office: str | Omit = omit,
+        trademark_symbol: str | Omit = omit,
+        destination_ips: str | Omit = omit,
+        ports_protocols: str | Omit = omit,
+        source_ips: str | Omit = omit,
+        ncmec_notification: Literal["send", "send-anon"] | Omit = omit,
+        ncsei_subject_representation: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not report_param:
+            raise ValueError(f"Expected a non-empty value for `report_param` but received {report_param!r}")
+        return await self._post(
+            f"/accounts/{account_id}/abuse-reports/{report_param}",
+            body=await async_maybe_transform(
+                {
+                    "act": act,
+                    "address1": address1,
+                    "agent_name": agent_name,
+                    "agree": agree,
+                    "city": city,
+                    "country": country,
+                    "email": email,
+                    "email2": email2,
+                    "host_notification": host_notification,
+                    "name": name,
+                    "original_work": original_work,
+                    "owner_notification": owner_notification,
+                    "signature": signature,
+                    "state": state,
+                    "urls": urls,
+                    "comments": comments,
+                    "company": company,
+                    "reported_country": reported_country,
+                    "reported_user_agent": reported_user_agent,
+                    "tele": tele,
+                    "title": title,
+                    "justification": justification,
+                    "trademark_number": trademark_number,
+                    "trademark_office": trademark_office,
+                    "trademark_symbol": trademark_symbol,
+                    "destination_ips": destination_ips,
+                    "ports_protocols": ports_protocols,
+                    "source_ips": source_ips,
+                    "ncmec_notification": ncmec_notification,
+                    "ncsei_subject_representation": ncsei_subject_representation,
+                },
+                abuse_report_create_params.AbuseReportCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AbuseReportCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        created_after: str | Omit = omit,
+        created_before: str | Omit = omit,
+        domain: str | Omit = omit,
+        mitigation_status: Literal["pending", "active", "in_review", "cancelled", "removed"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        sort: str | Omit = omit,
+        status: Literal["accepted", "in_review"] | Omit = omit,
+        type: Literal["PHISH", "GEN", "THREAT", "DMCA", "EMER", "TM", "REG_WHO", "NCSEI", "NETWORK"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Optional[AbuseReportListResponse], AsyncV4PagePagination[Optional[AbuseReportListResponse]]]:
+        """
+        List the abuse reports for a given account
+
+        Args:
+          created_after: Returns reports created after the specified date
+
+          created_before: Returns reports created before the specified date
+
+          domain: Filter by domain name related to the abuse report
+
+          mitigation_status: Filter reports that have any mitigations in the given status.
+
+          page: Where in pagination to start listing abuse reports
+
+          per_page: How many abuse reports per page to list
+
+          sort: A property to sort by, followed by the order (id, cdate, domain, type, status)
+
+          status: Filter by the status of the report.
+
+          type: Filter by the type of the report.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/abuse-reports",
+            page=AsyncV4PagePagination[Optional[AbuseReportListResponse]],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "created_after": created_after,
+                        "created_before": created_before,
+                        "domain": domain,
+                        "mitigation_status": mitigation_status,
+                        "page": page,
+                        "per_page": per_page,
+                        "sort": sort,
+                        "status": status,
+                        "type": type,
+                    },
+                    abuse_report_list_params.AbuseReportListParams,
+                ),
+            ),
+            model=AbuseReportListResponse,
+        )
+
+    async def get(
+        self,
+        report_param: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AbuseReportGetResponse:
+        """
+        Retrieve the details of an abuse report.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not report_param:
+            raise ValueError(f"Expected a non-empty value for `report_param` but received {report_param!r}")
+        return await self._get(
+            f"/accounts/{account_id}/abuse-reports/{report_param}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AbuseReportGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AbuseReportGetResponse], ResultWrapper[AbuseReportGetResponse]),
+        )
+
+
+class AbuseReportsResourceWithRawResponse:
+    def __init__(self, abuse_reports: AbuseReportsResource) -> None:
+        self._abuse_reports = abuse_reports
+
+        self.create = to_raw_response_wrapper(
+            abuse_reports.create,
+        )
+        self.list = to_raw_response_wrapper(
+            abuse_reports.list,
+        )
+        self.get = to_raw_response_wrapper(
+            abuse_reports.get,
+        )
+
+    @cached_property
+    def mitigations(self) -> MitigationsResourceWithRawResponse:
+        return MitigationsResourceWithRawResponse(self._abuse_reports.mitigations)
+
+
+class AsyncAbuseReportsResourceWithRawResponse:
+    def __init__(self, abuse_reports: AsyncAbuseReportsResource) -> None:
+        self._abuse_reports = abuse_reports
+
+        self.create = async_to_raw_response_wrapper(
+            abuse_reports.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            abuse_reports.list,
+        )
+        self.get = async_to_raw_response_wrapper(
+            abuse_reports.get,
+        )
+
+    @cached_property
+    def mitigations(self) -> AsyncMitigationsResourceWithRawResponse:
+        return AsyncMitigationsResourceWithRawResponse(self._abuse_reports.mitigations)
+
+
+class AbuseReportsResourceWithStreamingResponse:
+    def __init__(self, abuse_reports: AbuseReportsResource) -> None:
+        self._abuse_reports = abuse_reports
+
+        self.create = to_streamed_response_wrapper(
+            abuse_reports.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            abuse_reports.list,
+        )
+        self.get = to_streamed_response_wrapper(
+            abuse_reports.get,
+        )
+
+    @cached_property
+    def mitigations(self) -> MitigationsResourceWithStreamingResponse:
+        return MitigationsResourceWithStreamingResponse(self._abuse_reports.mitigations)
+
+
+class AsyncAbuseReportsResourceWithStreamingResponse:
+    def __init__(self, abuse_reports: AsyncAbuseReportsResource) -> None:
+        self._abuse_reports = abuse_reports
+
+        self.create = async_to_streamed_response_wrapper(
+            abuse_reports.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            abuse_reports.list,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            abuse_reports.get,
+        )
+
+    @cached_property
+    def mitigations(self) -> AsyncMitigationsResourceWithStreamingResponse:
+        return AsyncMitigationsResourceWithStreamingResponse(self._abuse_reports.mitigations)
diff --git a/src/cloudflare/resources/abuse_reports/mitigations.py b/src/cloudflare/resources/abuse_reports/mitigations.py
new file mode 100644
index 00000000000..298b58d4143
--- /dev/null
+++ b/src/cloudflare/resources/abuse_reports/mitigations.py
@@ -0,0 +1,394 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable, Optional
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePagination, AsyncV4PagePagination
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.abuse_reports import mitigation_list_params, mitigation_review_params
+from ...types.abuse_reports.mitigation_list_response import MitigationListResponse
+from ...types.abuse_reports.mitigation_review_response import MitigationReviewResponse
+
+__all__ = ["MitigationsResource", "AsyncMitigationsResource"]
+
+
+class MitigationsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> MitigationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return MitigationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> MitigationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return MitigationsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        report_id: str,
+        *,
+        account_id: str,
+        effective_after: str | Omit = omit,
+        effective_before: str | Omit = omit,
+        entity_type: Literal["url_pattern", "account", "zone"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        sort: Literal[
+            "type,asc",
+            "type,desc",
+            "effective_date,asc",
+            "effective_date,desc",
+            "status,asc",
+            "status,desc",
+            "entity_type,asc",
+            "entity_type,desc",
+        ]
+        | Omit = omit,
+        status: Literal["pending", "active", "in_review", "cancelled", "removed"] | Omit = omit,
+        type: Literal[
+            "legal_block",
+            "phishing_interstitial",
+            "network_block",
+            "rate_limit_cache",
+            "account_suspend",
+            "redirect_video_stream",
+        ]
+        | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePagination[Optional[MitigationListResponse]]:
+        """
+        List mitigations done to remediate the abuse report.
+
+        Args:
+          effective_after: Returns mitigation that were dispatched after the given date
+
+          effective_before: Returns mitigations that were dispatched before the given date
+
+          entity_type: Filter by the type of entity the mitigation impacts.
+
+          page: Where in pagination to start listing abuse reports
+
+          per_page: How many abuse reports per page to list
+
+          sort: A property to sort by, followed by the order
+
+          status: Filter by the status of the mitigation.
+
+          type: Filter by the type of mitigation. This filter parameter can be specified
+              multiple times to include multiple types of mitigations in the result set, e.g.
+              ?type=rate_limit_cache&type=legal_block.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not report_id:
+            raise ValueError(f"Expected a non-empty value for `report_id` but received {report_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/abuse-reports/{report_id}/mitigations",
+            page=SyncV4PagePagination[Optional[MitigationListResponse]],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "effective_after": effective_after,
+                        "effective_before": effective_before,
+                        "entity_type": entity_type,
+                        "page": page,
+                        "per_page": per_page,
+                        "sort": sort,
+                        "status": status,
+                        "type": type,
+                    },
+                    mitigation_list_params.MitigationListParams,
+                ),
+            ),
+            model=MitigationListResponse,
+        )
+
+    def review(
+        self,
+        report_id: str,
+        *,
+        account_id: str,
+        appeals: Iterable[mitigation_review_params.Appeal],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[MitigationReviewResponse]:
+        """
+        Request a review for mitigations on an account.
+
+        Args:
+          appeals: List of mitigations to appeal.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not report_id:
+            raise ValueError(f"Expected a non-empty value for `report_id` but received {report_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/abuse-reports/{report_id}/mitigations/appeal",
+            page=SyncSinglePage[MitigationReviewResponse],
+            body=maybe_transform({"appeals": appeals}, mitigation_review_params.MitigationReviewParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=MitigationReviewResponse,
+            method="post",
+        )
+
+
+class AsyncMitigationsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncMitigationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncMitigationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncMitigationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncMitigationsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        report_id: str,
+        *,
+        account_id: str,
+        effective_after: str | Omit = omit,
+        effective_before: str | Omit = omit,
+        entity_type: Literal["url_pattern", "account", "zone"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        sort: Literal[
+            "type,asc",
+            "type,desc",
+            "effective_date,asc",
+            "effective_date,desc",
+            "status,asc",
+            "status,desc",
+            "entity_type,asc",
+            "entity_type,desc",
+        ]
+        | Omit = omit,
+        status: Literal["pending", "active", "in_review", "cancelled", "removed"] | Omit = omit,
+        type: Literal[
+            "legal_block",
+            "phishing_interstitial",
+            "network_block",
+            "rate_limit_cache",
+            "account_suspend",
+            "redirect_video_stream",
+        ]
+        | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Optional[MitigationListResponse], AsyncV4PagePagination[Optional[MitigationListResponse]]]:
+        """
+        List mitigations done to remediate the abuse report.
+
+        Args:
+          effective_after: Returns mitigation that were dispatched after the given date
+
+          effective_before: Returns mitigations that were dispatched before the given date
+
+          entity_type: Filter by the type of entity the mitigation impacts.
+
+          page: Where in pagination to start listing abuse reports
+
+          per_page: How many abuse reports per page to list
+
+          sort: A property to sort by, followed by the order
+
+          status: Filter by the status of the mitigation.
+
+          type: Filter by the type of mitigation. This filter parameter can be specified
+              multiple times to include multiple types of mitigations in the result set, e.g.
+              ?type=rate_limit_cache&type=legal_block.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not report_id:
+            raise ValueError(f"Expected a non-empty value for `report_id` but received {report_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/abuse-reports/{report_id}/mitigations",
+            page=AsyncV4PagePagination[Optional[MitigationListResponse]],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "effective_after": effective_after,
+                        "effective_before": effective_before,
+                        "entity_type": entity_type,
+                        "page": page,
+                        "per_page": per_page,
+                        "sort": sort,
+                        "status": status,
+                        "type": type,
+                    },
+                    mitigation_list_params.MitigationListParams,
+                ),
+            ),
+            model=MitigationListResponse,
+        )
+
+    def review(
+        self,
+        report_id: str,
+        *,
+        account_id: str,
+        appeals: Iterable[mitigation_review_params.Appeal],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[MitigationReviewResponse, AsyncSinglePage[MitigationReviewResponse]]:
+        """
+        Request a review for mitigations on an account.
+
+        Args:
+          appeals: List of mitigations to appeal.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not report_id:
+            raise ValueError(f"Expected a non-empty value for `report_id` but received {report_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/abuse-reports/{report_id}/mitigations/appeal",
+            page=AsyncSinglePage[MitigationReviewResponse],
+            body=maybe_transform({"appeals": appeals}, mitigation_review_params.MitigationReviewParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=MitigationReviewResponse,
+            method="post",
+        )
+
+
+class MitigationsResourceWithRawResponse:
+    def __init__(self, mitigations: MitigationsResource) -> None:
+        self._mitigations = mitigations
+
+        self.list = to_raw_response_wrapper(
+            mitigations.list,
+        )
+        self.review = to_raw_response_wrapper(
+            mitigations.review,
+        )
+
+
+class AsyncMitigationsResourceWithRawResponse:
+    def __init__(self, mitigations: AsyncMitigationsResource) -> None:
+        self._mitigations = mitigations
+
+        self.list = async_to_raw_response_wrapper(
+            mitigations.list,
+        )
+        self.review = async_to_raw_response_wrapper(
+            mitigations.review,
+        )
+
+
+class MitigationsResourceWithStreamingResponse:
+    def __init__(self, mitigations: MitigationsResource) -> None:
+        self._mitigations = mitigations
+
+        self.list = to_streamed_response_wrapper(
+            mitigations.list,
+        )
+        self.review = to_streamed_response_wrapper(
+            mitigations.review,
+        )
+
+
+class AsyncMitigationsResourceWithStreamingResponse:
+    def __init__(self, mitigations: AsyncMitigationsResource) -> None:
+        self._mitigations = mitigations
+
+        self.list = async_to_streamed_response_wrapper(
+            mitigations.list,
+        )
+        self.review = async_to_streamed_response_wrapper(
+            mitigations.review,
+        )
diff --git a/src/cloudflare/resources/accounts/__init__.py b/src/cloudflare/resources/accounts/__init__.py
index 4e9d5ed34dd..f136ec47000 100644
--- a/src/cloudflare/resources/accounts/__init__.py
+++ b/src/cloudflare/resources/accounts/__init__.py
@@ -1,5 +1,13 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from .logs import (
+    LogsResource,
+    AsyncLogsResource,
+    LogsResourceWithRawResponse,
+    AsyncLogsResourceWithRawResponse,
+    LogsResourceWithStreamingResponse,
+    AsyncLogsResourceWithStreamingResponse,
+)
 from .roles import (
     RolesResource,
     AsyncRolesResource,
@@ -8,6 +16,14 @@
     RolesResourceWithStreamingResponse,
     AsyncRolesResourceWithStreamingResponse,
 )
+from .tokens import (
+    TokensResource,
+    AsyncTokensResource,
+    TokensResourceWithRawResponse,
+    AsyncTokensResourceWithRawResponse,
+    TokensResourceWithStreamingResponse,
+    AsyncTokensResourceWithStreamingResponse,
+)
 from .members import (
     MembersResource,
     AsyncMembersResource,
@@ -24,6 +40,14 @@
     AccountsResourceWithStreamingResponse,
     AsyncAccountsResourceWithStreamingResponse,
 )
+from .subscriptions import (
+    SubscriptionsResource,
+    AsyncSubscriptionsResource,
+    SubscriptionsResourceWithRawResponse,
+    AsyncSubscriptionsResourceWithRawResponse,
+    SubscriptionsResourceWithStreamingResponse,
+    AsyncSubscriptionsResourceWithStreamingResponse,
+)
 
 __all__ = [
     "MembersResource",
@@ -38,6 +62,24 @@
     "AsyncRolesResourceWithRawResponse",
     "RolesResourceWithStreamingResponse",
     "AsyncRolesResourceWithStreamingResponse",
+    "SubscriptionsResource",
+    "AsyncSubscriptionsResource",
+    "SubscriptionsResourceWithRawResponse",
+    "AsyncSubscriptionsResourceWithRawResponse",
+    "SubscriptionsResourceWithStreamingResponse",
+    "AsyncSubscriptionsResourceWithStreamingResponse",
+    "TokensResource",
+    "AsyncTokensResource",
+    "TokensResourceWithRawResponse",
+    "AsyncTokensResourceWithRawResponse",
+    "TokensResourceWithStreamingResponse",
+    "AsyncTokensResourceWithStreamingResponse",
+    "LogsResource",
+    "AsyncLogsResource",
+    "LogsResourceWithRawResponse",
+    "AsyncLogsResourceWithRawResponse",
+    "LogsResourceWithStreamingResponse",
+    "AsyncLogsResourceWithStreamingResponse",
     "AccountsResource",
     "AsyncAccountsResource",
     "AccountsResourceWithRawResponse",
diff --git a/src/cloudflare/resources/accounts/accounts.py b/src/cloudflare/resources/accounts/accounts.py
index 2d48d9dfe99..aedb92f84e7 100644
--- a/src/cloudflare/resources/accounts/accounts.py
+++ b/src/cloudflare/resources/accounts/accounts.py
@@ -23,12 +23,17 @@
     MembersResourceWithStreamingResponse,
     AsyncMembersResourceWithStreamingResponse,
 )
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
+from .logs.logs import (
+    LogsResource,
+    AsyncLogsResource,
+    LogsResourceWithRawResponse,
+    AsyncLogsResourceWithRawResponse,
+    LogsResourceWithStreamingResponse,
+    AsyncLogsResourceWithStreamingResponse,
+)
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
     to_raw_response_wrapper,
@@ -38,8 +43,26 @@
 )
 from ..._wrappers import ResultWrapper
 from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from .subscriptions import (
+    SubscriptionsResource,
+    AsyncSubscriptionsResource,
+    SubscriptionsResourceWithRawResponse,
+    AsyncSubscriptionsResourceWithRawResponse,
+    SubscriptionsResourceWithStreamingResponse,
+    AsyncSubscriptionsResourceWithStreamingResponse,
+)
+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_update_params
+from ...types.accounts import account_list_params, account_create_params, account_update_params
+from ...types.accounts.account import Account
+from ...types.accounts.account_delete_response import AccountDeleteResponse
 
 __all__ = ["AccountsResource", "AsyncAccountsResource"]
 
@@ -53,33 +76,116 @@ def members(self) -> MembersResource:
     def roles(self) -> RolesResource:
         return RolesResource(self._client)
 
+    @cached_property
+    def subscriptions(self) -> SubscriptionsResource:
+        return SubscriptionsResource(self._client)
+
+    @cached_property
+    def tokens(self) -> TokensResource:
+        return TokensResource(self._client)
+
+    @cached_property
+    def logs(self) -> LogsResource:
+        return LogsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AccountsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AccountsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AccountsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AccountsResourceWithStreamingResponse(self)
 
+    def create(
+        self,
+        *,
+        name: str,
+        type: Literal["standard", "enterprise"] | Omit = omit,
+        unit: account_create_params.Unit | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Account]:
+        """
+        Create an account (only available for tenant admins at this time)
+
+        Args:
+          name: Account name
+
+          unit: information related to the tenant unit, and optionally, an id of the unit to
+              create the account on. see
+              https://developers.cloudflare.com/tenant/how-to/manage-accounts/
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._post(
+            "/accounts",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "type": type,
+                    "unit": unit,
+                },
+                account_create_params.AccountCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Account]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Account]], ResultWrapper[Account]),
+        )
+
     def update(
         self,
         *,
-        account_id: object,
+        account_id: str,
+        id: str,
         name: str,
-        settings: account_update_params.Settings | NotGiven = NOT_GIVEN,
+        type: Literal["standard", "enterprise"],
+        managed_by: account_update_params.ManagedBy | Omit = omit,
+        settings: account_update_params.Settings | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Account]:
         """
         Update an existing account.
 
         Args:
+          account_id: Account identifier tag.
+
+          id: Identifier
+
           name: Account name
 
+          managed_by: Parent container details
+
           settings: Account settings
 
           extra_headers: Send extra headers
@@ -90,11 +196,16 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._put(
             f"/accounts/{account_id}",
             body=maybe_transform(
                 {
+                    "id": id,
                     "name": name,
+                    "type": type,
+                    "managed_by": managed_by,
                     "settings": settings,
                 },
                 account_update_params.AccountUpdateParams,
@@ -104,25 +215,25 @@ def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Account]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[Account]], ResultWrapper[Account]),
         )
 
     def list(
         self,
         *,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        name: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePaginationArray[object]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[Account]:
         """
         List all accounts you have ownership or verified access to.
 
@@ -145,7 +256,7 @@ def list(
         """
         return self._get_api_list(
             "/accounts",
-            page=SyncV4PagePaginationArray[object],
+            page=SyncV4PagePaginationArray[Account],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -161,24 +272,68 @@ def list(
                     account_list_params.AccountListParams,
                 ),
             ),
-            model=object,
+            model=Account,
+        )
+
+    def delete(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AccountDeleteResponse]:
+        """Delete a specific account (only available for tenant admins at this time).
+
+        This
+        is a permanent operation that will delete any zones or other resources under the
+        account
+
+        Args:
+          account_id: The account ID of the account to be deleted
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AccountDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AccountDeleteResponse]], ResultWrapper[AccountDeleteResponse]),
         )
 
     def get(
         self,
         *,
-        account_id: object,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Account]:
         """
         Get information about a specific account that you are a member of.
 
         Args:
+          account_id: Account identifier tag.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -187,6 +342,8 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get(
             f"/accounts/{account_id}",
             options=make_request_options(
@@ -194,9 +351,9 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Account]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[Account]], ResultWrapper[Account]),
         )
 
 
@@ -209,33 +366,116 @@ def members(self) -> AsyncMembersResource:
     def roles(self) -> AsyncRolesResource:
         return AsyncRolesResource(self._client)
 
+    @cached_property
+    def subscriptions(self) -> AsyncSubscriptionsResource:
+        return AsyncSubscriptionsResource(self._client)
+
+    @cached_property
+    def tokens(self) -> AsyncTokensResource:
+        return AsyncTokensResource(self._client)
+
+    @cached_property
+    def logs(self) -> AsyncLogsResource:
+        return AsyncLogsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncAccountsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAccountsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAccountsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAccountsResourceWithStreamingResponse(self)
 
+    async def create(
+        self,
+        *,
+        name: str,
+        type: Literal["standard", "enterprise"] | Omit = omit,
+        unit: account_create_params.Unit | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Account]:
+        """
+        Create an account (only available for tenant admins at this time)
+
+        Args:
+          name: Account name
+
+          unit: information related to the tenant unit, and optionally, an id of the unit to
+              create the account on. see
+              https://developers.cloudflare.com/tenant/how-to/manage-accounts/
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._post(
+            "/accounts",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "type": type,
+                    "unit": unit,
+                },
+                account_create_params.AccountCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Account]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Account]], ResultWrapper[Account]),
+        )
+
     async def update(
         self,
         *,
-        account_id: object,
+        account_id: str,
+        id: str,
         name: str,
-        settings: account_update_params.Settings | NotGiven = NOT_GIVEN,
+        type: Literal["standard", "enterprise"],
+        managed_by: account_update_params.ManagedBy | Omit = omit,
+        settings: account_update_params.Settings | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Account]:
         """
         Update an existing account.
 
         Args:
+          account_id: Account identifier tag.
+
+          id: Identifier
+
           name: Account name
 
+          managed_by: Parent container details
+
           settings: Account settings
 
           extra_headers: Send extra headers
@@ -246,11 +486,16 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._put(
             f"/accounts/{account_id}",
             body=await async_maybe_transform(
                 {
+                    "id": id,
                     "name": name,
+                    "type": type,
+                    "managed_by": managed_by,
                     "settings": settings,
                 },
                 account_update_params.AccountUpdateParams,
@@ -260,25 +505,25 @@ async def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Account]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[Account]], ResultWrapper[Account]),
         )
 
     def list(
         self,
         *,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        name: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[object, AsyncV4PagePaginationArray[object]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Account, AsyncV4PagePaginationArray[Account]]:
         """
         List all accounts you have ownership or verified access to.
 
@@ -301,7 +546,7 @@ def list(
         """
         return self._get_api_list(
             "/accounts",
-            page=AsyncV4PagePaginationArray[object],
+            page=AsyncV4PagePaginationArray[Account],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -317,24 +562,68 @@ def list(
                     account_list_params.AccountListParams,
                 ),
             ),
-            model=object,
+            model=Account,
+        )
+
+    async def delete(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AccountDeleteResponse]:
+        """Delete a specific account (only available for tenant admins at this time).
+
+        This
+        is a permanent operation that will delete any zones or other resources under the
+        account
+
+        Args:
+          account_id: The account ID of the account to be deleted
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AccountDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AccountDeleteResponse]], ResultWrapper[AccountDeleteResponse]),
         )
 
     async def get(
         self,
         *,
-        account_id: object,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Account]:
         """
         Get information about a specific account that you are a member of.
 
         Args:
+          account_id: Account identifier tag.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -343,6 +632,8 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._get(
             f"/accounts/{account_id}",
             options=make_request_options(
@@ -350,9 +641,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Account]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[Account]], ResultWrapper[Account]),
         )
 
 
@@ -360,12 +651,18 @@ class AccountsResourceWithRawResponse:
     def __init__(self, accounts: AccountsResource) -> None:
         self._accounts = accounts
 
+        self.create = to_raw_response_wrapper(
+            accounts.create,
+        )
         self.update = to_raw_response_wrapper(
             accounts.update,
         )
         self.list = to_raw_response_wrapper(
             accounts.list,
         )
+        self.delete = to_raw_response_wrapper(
+            accounts.delete,
+        )
         self.get = to_raw_response_wrapper(
             accounts.get,
         )
@@ -378,17 +675,35 @@ def members(self) -> MembersResourceWithRawResponse:
     def roles(self) -> RolesResourceWithRawResponse:
         return RolesResourceWithRawResponse(self._accounts.roles)
 
+    @cached_property
+    def subscriptions(self) -> SubscriptionsResourceWithRawResponse:
+        return SubscriptionsResourceWithRawResponse(self._accounts.subscriptions)
+
+    @cached_property
+    def tokens(self) -> TokensResourceWithRawResponse:
+        return TokensResourceWithRawResponse(self._accounts.tokens)
+
+    @cached_property
+    def logs(self) -> LogsResourceWithRawResponse:
+        return LogsResourceWithRawResponse(self._accounts.logs)
+
 
 class AsyncAccountsResourceWithRawResponse:
     def __init__(self, accounts: AsyncAccountsResource) -> None:
         self._accounts = accounts
 
+        self.create = async_to_raw_response_wrapper(
+            accounts.create,
+        )
         self.update = async_to_raw_response_wrapper(
             accounts.update,
         )
         self.list = async_to_raw_response_wrapper(
             accounts.list,
         )
+        self.delete = async_to_raw_response_wrapper(
+            accounts.delete,
+        )
         self.get = async_to_raw_response_wrapper(
             accounts.get,
         )
@@ -401,17 +716,35 @@ def members(self) -> AsyncMembersResourceWithRawResponse:
     def roles(self) -> AsyncRolesResourceWithRawResponse:
         return AsyncRolesResourceWithRawResponse(self._accounts.roles)
 
+    @cached_property
+    def subscriptions(self) -> AsyncSubscriptionsResourceWithRawResponse:
+        return AsyncSubscriptionsResourceWithRawResponse(self._accounts.subscriptions)
+
+    @cached_property
+    def tokens(self) -> AsyncTokensResourceWithRawResponse:
+        return AsyncTokensResourceWithRawResponse(self._accounts.tokens)
+
+    @cached_property
+    def logs(self) -> AsyncLogsResourceWithRawResponse:
+        return AsyncLogsResourceWithRawResponse(self._accounts.logs)
+
 
 class AccountsResourceWithStreamingResponse:
     def __init__(self, accounts: AccountsResource) -> None:
         self._accounts = accounts
 
+        self.create = to_streamed_response_wrapper(
+            accounts.create,
+        )
         self.update = to_streamed_response_wrapper(
             accounts.update,
         )
         self.list = to_streamed_response_wrapper(
             accounts.list,
         )
+        self.delete = to_streamed_response_wrapper(
+            accounts.delete,
+        )
         self.get = to_streamed_response_wrapper(
             accounts.get,
         )
@@ -424,17 +757,35 @@ def members(self) -> MembersResourceWithStreamingResponse:
     def roles(self) -> RolesResourceWithStreamingResponse:
         return RolesResourceWithStreamingResponse(self._accounts.roles)
 
+    @cached_property
+    def subscriptions(self) -> SubscriptionsResourceWithStreamingResponse:
+        return SubscriptionsResourceWithStreamingResponse(self._accounts.subscriptions)
+
+    @cached_property
+    def tokens(self) -> TokensResourceWithStreamingResponse:
+        return TokensResourceWithStreamingResponse(self._accounts.tokens)
+
+    @cached_property
+    def logs(self) -> LogsResourceWithStreamingResponse:
+        return LogsResourceWithStreamingResponse(self._accounts.logs)
+
 
 class AsyncAccountsResourceWithStreamingResponse:
     def __init__(self, accounts: AsyncAccountsResource) -> None:
         self._accounts = accounts
 
+        self.create = async_to_streamed_response_wrapper(
+            accounts.create,
+        )
         self.update = async_to_streamed_response_wrapper(
             accounts.update,
         )
         self.list = async_to_streamed_response_wrapper(
             accounts.list,
         )
+        self.delete = async_to_streamed_response_wrapper(
+            accounts.delete,
+        )
         self.get = async_to_streamed_response_wrapper(
             accounts.get,
         )
@@ -446,3 +797,15 @@ def members(self) -> AsyncMembersResourceWithStreamingResponse:
     @cached_property
     def roles(self) -> AsyncRolesResourceWithStreamingResponse:
         return AsyncRolesResourceWithStreamingResponse(self._accounts.roles)
+
+    @cached_property
+    def subscriptions(self) -> AsyncSubscriptionsResourceWithStreamingResponse:
+        return AsyncSubscriptionsResourceWithStreamingResponse(self._accounts.subscriptions)
+
+    @cached_property
+    def tokens(self) -> AsyncTokensResourceWithStreamingResponse:
+        return AsyncTokensResourceWithStreamingResponse(self._accounts.tokens)
+
+    @cached_property
+    def logs(self) -> AsyncLogsResourceWithStreamingResponse:
+        return AsyncLogsResourceWithStreamingResponse(self._accounts.logs)
diff --git a/src/cloudflare/resources/accounts/logs/__init__.py b/src/cloudflare/resources/accounts/logs/__init__.py
new file mode 100644
index 00000000000..5d5ddcdb7e2
--- /dev/null
+++ b/src/cloudflare/resources/accounts/logs/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .logs import (
+    LogsResource,
+    AsyncLogsResource,
+    LogsResourceWithRawResponse,
+    AsyncLogsResourceWithRawResponse,
+    LogsResourceWithStreamingResponse,
+    AsyncLogsResourceWithStreamingResponse,
+)
+from .audit import (
+    AuditResource,
+    AsyncAuditResource,
+    AuditResourceWithRawResponse,
+    AsyncAuditResourceWithRawResponse,
+    AuditResourceWithStreamingResponse,
+    AsyncAuditResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "AuditResource",
+    "AsyncAuditResource",
+    "AuditResourceWithRawResponse",
+    "AsyncAuditResourceWithRawResponse",
+    "AuditResourceWithStreamingResponse",
+    "AsyncAuditResourceWithStreamingResponse",
+    "LogsResource",
+    "AsyncLogsResource",
+    "LogsResourceWithRawResponse",
+    "AsyncLogsResourceWithRawResponse",
+    "LogsResourceWithStreamingResponse",
+    "AsyncLogsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/accounts/logs/audit.py b/src/cloudflare/resources/accounts/logs/audit.py
new file mode 100644
index 00000000000..fd663c7cc68
--- /dev/null
+++ b/src/cloudflare/resources/accounts/logs/audit.py
@@ -0,0 +1,346 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import date
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....pagination import SyncCursorPaginationAfter, AsyncCursorPaginationAfter
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.accounts.logs import audit_list_params
+from ....types.accounts.logs.audit_list_response import AuditListResponse
+
+__all__ = ["AuditResource", "AsyncAuditResource"]
+
+
+class AuditResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AuditResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AuditResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AuditResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AuditResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        before: Union[str, date],
+        since: Union[str, date],
+        id: audit_list_params.ID | Omit = omit,
+        account_name: audit_list_params.AccountName | Omit = omit,
+        action_result: audit_list_params.ActionResult | Omit = omit,
+        action_type: audit_list_params.ActionType | Omit = omit,
+        actor_context: audit_list_params.ActorContext | Omit = omit,
+        actor_email: audit_list_params.ActorEmail | Omit = omit,
+        actor_id: audit_list_params.ActorID | Omit = omit,
+        actor_ip_address: audit_list_params.ActorIPAddress | Omit = omit,
+        actor_token_id: audit_list_params.ActorTokenID | Omit = omit,
+        actor_token_name: audit_list_params.ActorTokenName | Omit = omit,
+        actor_type: audit_list_params.ActorType | Omit = omit,
+        audit_log_id: audit_list_params.AuditLogID | Omit = omit,
+        cursor: str | Omit = omit,
+        direction: Literal["desc", "asc"] | Omit = omit,
+        limit: float | Omit = omit,
+        raw_cf_rayid: audit_list_params.RawCfRayID | Omit = omit,
+        raw_method: audit_list_params.RawMethod | Omit = omit,
+        raw_status_code: audit_list_params.RawStatusCode | Omit = omit,
+        raw_uri: audit_list_params.RawURI | Omit = omit,
+        resource_id: audit_list_params.ResourceID | Omit = omit,
+        resource_product: audit_list_params.ResourceProduct | Omit = omit,
+        resource_scope: audit_list_params.ResourceScope | Omit = omit,
+        resource_type: audit_list_params.ResourceType | Omit = omit,
+        zone_id: audit_list_params.ZoneID | Omit = omit,
+        zone_name: audit_list_params.ZoneName | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncCursorPaginationAfter[AuditListResponse]:
+        """Gets a list of audit logs for an account.
+
+        <br /> <br /> This is the beta release
+        of Audit Logs Version 2. Since this is a beta version, there may be gaps or
+        missing entries in the available audit logs. Be aware of the following
+        limitations. <br /> <ul> <li>Audit logs are available only for the past 30 days.
+        <br /></li> <li>Error handling is not yet implemented. <br /> </li> </ul>
+
+        Args:
+          account_id: The unique id that identifies the account.
+
+          before: Limits the returned results to logs older than the specified date. This can be a
+              date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that
+              conforms to RFC3339.
+
+          since: Limits the returned results to logs newer than the specified date. This can be a
+              date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that
+              conforms to RFC3339.
+
+          cursor: The cursor is an opaque token used to paginate through large sets of records. It
+              indicates the position from which to continue when requesting the next set of
+              records. A valid cursor value can be obtained from the cursor object in the
+              result_info structure of a previous response.
+
+          direction: Sets sorting order.
+
+          limit: The number limits the objects to return. The cursor attribute may be used to
+              iterate over the next batch of objects if there are more than the limit.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/logs/audit",
+            page=SyncCursorPaginationAfter[AuditListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "before": before,
+                        "since": since,
+                        "id": id,
+                        "account_name": account_name,
+                        "action_result": action_result,
+                        "action_type": action_type,
+                        "actor_context": actor_context,
+                        "actor_email": actor_email,
+                        "actor_id": actor_id,
+                        "actor_ip_address": actor_ip_address,
+                        "actor_token_id": actor_token_id,
+                        "actor_token_name": actor_token_name,
+                        "actor_type": actor_type,
+                        "audit_log_id": audit_log_id,
+                        "cursor": cursor,
+                        "direction": direction,
+                        "limit": limit,
+                        "raw_cf_rayid": raw_cf_rayid,
+                        "raw_method": raw_method,
+                        "raw_status_code": raw_status_code,
+                        "raw_uri": raw_uri,
+                        "resource_id": resource_id,
+                        "resource_product": resource_product,
+                        "resource_scope": resource_scope,
+                        "resource_type": resource_type,
+                        "zone_id": zone_id,
+                        "zone_name": zone_name,
+                    },
+                    audit_list_params.AuditListParams,
+                ),
+            ),
+            model=AuditListResponse,
+        )
+
+
+class AsyncAuditResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncAuditResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAuditResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAuditResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAuditResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        before: Union[str, date],
+        since: Union[str, date],
+        id: audit_list_params.ID | Omit = omit,
+        account_name: audit_list_params.AccountName | Omit = omit,
+        action_result: audit_list_params.ActionResult | Omit = omit,
+        action_type: audit_list_params.ActionType | Omit = omit,
+        actor_context: audit_list_params.ActorContext | Omit = omit,
+        actor_email: audit_list_params.ActorEmail | Omit = omit,
+        actor_id: audit_list_params.ActorID | Omit = omit,
+        actor_ip_address: audit_list_params.ActorIPAddress | Omit = omit,
+        actor_token_id: audit_list_params.ActorTokenID | Omit = omit,
+        actor_token_name: audit_list_params.ActorTokenName | Omit = omit,
+        actor_type: audit_list_params.ActorType | Omit = omit,
+        audit_log_id: audit_list_params.AuditLogID | Omit = omit,
+        cursor: str | Omit = omit,
+        direction: Literal["desc", "asc"] | Omit = omit,
+        limit: float | Omit = omit,
+        raw_cf_rayid: audit_list_params.RawCfRayID | Omit = omit,
+        raw_method: audit_list_params.RawMethod | Omit = omit,
+        raw_status_code: audit_list_params.RawStatusCode | Omit = omit,
+        raw_uri: audit_list_params.RawURI | Omit = omit,
+        resource_id: audit_list_params.ResourceID | Omit = omit,
+        resource_product: audit_list_params.ResourceProduct | Omit = omit,
+        resource_scope: audit_list_params.ResourceScope | Omit = omit,
+        resource_type: audit_list_params.ResourceType | Omit = omit,
+        zone_id: audit_list_params.ZoneID | Omit = omit,
+        zone_name: audit_list_params.ZoneName | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[AuditListResponse, AsyncCursorPaginationAfter[AuditListResponse]]:
+        """Gets a list of audit logs for an account.
+
+        <br /> <br /> This is the beta release
+        of Audit Logs Version 2. Since this is a beta version, there may be gaps or
+        missing entries in the available audit logs. Be aware of the following
+        limitations. <br /> <ul> <li>Audit logs are available only for the past 30 days.
+        <br /></li> <li>Error handling is not yet implemented. <br /> </li> </ul>
+
+        Args:
+          account_id: The unique id that identifies the account.
+
+          before: Limits the returned results to logs older than the specified date. This can be a
+              date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that
+              conforms to RFC3339.
+
+          since: Limits the returned results to logs newer than the specified date. This can be a
+              date string 2019-04-30 (interpreted in UTC) or an absolute timestamp that
+              conforms to RFC3339.
+
+          cursor: The cursor is an opaque token used to paginate through large sets of records. It
+              indicates the position from which to continue when requesting the next set of
+              records. A valid cursor value can be obtained from the cursor object in the
+              result_info structure of a previous response.
+
+          direction: Sets sorting order.
+
+          limit: The number limits the objects to return. The cursor attribute may be used to
+              iterate over the next batch of objects if there are more than the limit.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/logs/audit",
+            page=AsyncCursorPaginationAfter[AuditListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "before": before,
+                        "since": since,
+                        "id": id,
+                        "account_name": account_name,
+                        "action_result": action_result,
+                        "action_type": action_type,
+                        "actor_context": actor_context,
+                        "actor_email": actor_email,
+                        "actor_id": actor_id,
+                        "actor_ip_address": actor_ip_address,
+                        "actor_token_id": actor_token_id,
+                        "actor_token_name": actor_token_name,
+                        "actor_type": actor_type,
+                        "audit_log_id": audit_log_id,
+                        "cursor": cursor,
+                        "direction": direction,
+                        "limit": limit,
+                        "raw_cf_rayid": raw_cf_rayid,
+                        "raw_method": raw_method,
+                        "raw_status_code": raw_status_code,
+                        "raw_uri": raw_uri,
+                        "resource_id": resource_id,
+                        "resource_product": resource_product,
+                        "resource_scope": resource_scope,
+                        "resource_type": resource_type,
+                        "zone_id": zone_id,
+                        "zone_name": zone_name,
+                    },
+                    audit_list_params.AuditListParams,
+                ),
+            ),
+            model=AuditListResponse,
+        )
+
+
+class AuditResourceWithRawResponse:
+    def __init__(self, audit: AuditResource) -> None:
+        self._audit = audit
+
+        self.list = to_raw_response_wrapper(
+            audit.list,
+        )
+
+
+class AsyncAuditResourceWithRawResponse:
+    def __init__(self, audit: AsyncAuditResource) -> None:
+        self._audit = audit
+
+        self.list = async_to_raw_response_wrapper(
+            audit.list,
+        )
+
+
+class AuditResourceWithStreamingResponse:
+    def __init__(self, audit: AuditResource) -> None:
+        self._audit = audit
+
+        self.list = to_streamed_response_wrapper(
+            audit.list,
+        )
+
+
+class AsyncAuditResourceWithStreamingResponse:
+    def __init__(self, audit: AsyncAuditResource) -> None:
+        self._audit = audit
+
+        self.list = async_to_streamed_response_wrapper(
+            audit.list,
+        )
diff --git a/src/cloudflare/resources/accounts/logs/logs.py b/src/cloudflare/resources/accounts/logs/logs.py
new file mode 100644
index 00000000000..69595caf7a3
--- /dev/null
+++ b/src/cloudflare/resources/accounts/logs/logs.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .audit import (
+    AuditResource,
+    AsyncAuditResource,
+    AuditResourceWithRawResponse,
+    AsyncAuditResourceWithRawResponse,
+    AuditResourceWithStreamingResponse,
+    AsyncAuditResourceWithStreamingResponse,
+)
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["LogsResource", "AsyncLogsResource"]
+
+
+class LogsResource(SyncAPIResource):
+    @cached_property
+    def audit(self) -> AuditResource:
+        return AuditResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> LogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return LogsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> LogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return LogsResourceWithStreamingResponse(self)
+
+
+class AsyncLogsResource(AsyncAPIResource):
+    @cached_property
+    def audit(self) -> AsyncAuditResource:
+        return AsyncAuditResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncLogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncLogsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncLogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncLogsResourceWithStreamingResponse(self)
+
+
+class LogsResourceWithRawResponse:
+    def __init__(self, logs: LogsResource) -> None:
+        self._logs = logs
+
+    @cached_property
+    def audit(self) -> AuditResourceWithRawResponse:
+        return AuditResourceWithRawResponse(self._logs.audit)
+
+
+class AsyncLogsResourceWithRawResponse:
+    def __init__(self, logs: AsyncLogsResource) -> None:
+        self._logs = logs
+
+    @cached_property
+    def audit(self) -> AsyncAuditResourceWithRawResponse:
+        return AsyncAuditResourceWithRawResponse(self._logs.audit)
+
+
+class LogsResourceWithStreamingResponse:
+    def __init__(self, logs: LogsResource) -> None:
+        self._logs = logs
+
+    @cached_property
+    def audit(self) -> AuditResourceWithStreamingResponse:
+        return AuditResourceWithStreamingResponse(self._logs.audit)
+
+
+class AsyncLogsResourceWithStreamingResponse:
+    def __init__(self, logs: AsyncLogsResource) -> None:
+        self._logs = logs
+
+    @cached_property
+    def audit(self) -> AsyncAuditResourceWithStreamingResponse:
+        return AsyncAuditResourceWithStreamingResponse(self._logs.audit)
diff --git a/src/cloudflare/resources/accounts/members.py b/src/cloudflare/resources/accounts/members.py
index 97716de0279..61eb3ff9fc2 100644
--- a/src/cloudflare/resources/accounts/members.py
+++ b/src/cloudflare/resources/accounts/members.py
@@ -2,17 +2,13 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Iterable, Optional, cast, overload
-from typing_extensions import Literal
+from typing import Type, Iterable, Optional, cast
+from typing_extensions import Literal, overload
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    required_args,
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -25,11 +21,9 @@
 from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.accounts import member_list_params, member_create_params, member_update_params
-from ...types.accounts.member_get_response import MemberGetResponse
-from ...types.accounts.member_list_response import MemberListResponse
-from ...types.accounts.member_create_response import MemberCreateResponse
+from ...types.shared.member import Member
+from ...types.shared_params.role import Role
 from ...types.accounts.member_delete_response import MemberDeleteResponse
-from ...types.accounts.member_update_response import MemberUpdateResponse
 
 __all__ = ["MembersResource", "AsyncMembersResource"]
 
@@ -37,10 +31,21 @@
 class MembersResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> MembersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return MembersResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> MembersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return MembersResourceWithStreamingResponse(self)
 
     @overload
@@ -49,15 +54,15 @@ def create(
         *,
         account_id: str,
         email: str,
-        roles: List[str],
-        status: Literal["accepted", "pending"] | NotGiven = NOT_GIVEN,
+        roles: SequenceNotStr[str],
+        status: Literal["accepted", "pending"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MemberCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Member]:
         """
         Add a user to the list of members for this account.
 
@@ -85,14 +90,14 @@ def create(
         account_id: str,
         email: str,
         policies: Iterable[member_create_params.IAMCreateMemberWithPoliciesPolicy],
-        status: Literal["accepted", "pending"] | NotGiven = NOT_GIVEN,
+        status: Literal["accepted", "pending"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MemberCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Member]:
         """
         Add a user to the list of members for this account.
 
@@ -119,16 +124,16 @@ def create(
         *,
         account_id: str,
         email: str,
-        roles: List[str] | NotGiven = NOT_GIVEN,
-        status: Literal["accepted", "pending"] | NotGiven = NOT_GIVEN,
-        policies: Iterable[member_create_params.IAMCreateMemberWithPoliciesPolicy] | NotGiven = NOT_GIVEN,
+        roles: SequenceNotStr[str] | Omit = omit,
+        status: Literal["accepted", "pending"] | Omit = omit,
+        policies: Iterable[member_create_params.IAMCreateMemberWithPoliciesPolicy] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MemberCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Member]:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._post(
@@ -147,9 +152,9 @@ def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[MemberCreateResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Member]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[MemberCreateResponse]], ResultWrapper[MemberCreateResponse]),
+            cast_to=cast(Type[Optional[Member]], ResultWrapper[Member]),
         )
 
     @overload
@@ -158,14 +163,14 @@ def update(
         member_id: str,
         *,
         account_id: str,
-        roles: Iterable[member_update_params.MemberRole] | NotGiven = NOT_GIVEN,
+        roles: Iterable[Role] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MemberUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Member]:
         """
         Modify an account member.
 
@@ -198,8 +203,8 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MemberUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Member]:
         """
         Modify an account member.
 
@@ -226,15 +231,15 @@ def update(
         member_id: str,
         *,
         account_id: str,
-        roles: Iterable[member_update_params.MemberRole] | NotGiven = NOT_GIVEN,
-        policies: Iterable[member_update_params.IAMUpdateMemberWithPoliciesPolicy] | NotGiven = NOT_GIVEN,
+        roles: Iterable[Role] | Omit = omit,
+        policies: Iterable[member_update_params.IAMUpdateMemberWithPoliciesPolicy] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MemberUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Member]:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not member_id:
@@ -253,27 +258,27 @@ def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[MemberUpdateResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Member]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[MemberUpdateResponse]], ResultWrapper[MemberUpdateResponse]),
+            cast_to=cast(Type[Optional[Member]], ResultWrapper[Member]),
         )
 
     def list(
         self,
         *,
         account_id: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        order: Literal["user.first_name", "user.last_name", "user.email", "status"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        status: Literal["accepted", "pending", "rejected"] | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        order: Literal["user.first_name", "user.last_name", "user.email", "status"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal["accepted", "pending", "rejected"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePaginationArray[MemberListResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[Member]:
         """
         List all members of an account.
 
@@ -302,7 +307,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/members",
-            page=SyncV4PagePaginationArray[MemberListResponse],
+            page=SyncV4PagePaginationArray[Member],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -319,7 +324,7 @@ def list(
                     member_list_params.MemberListParams,
                 ),
             ),
-            model=MemberListResponse,
+            model=Member,
         )
 
     def delete(
@@ -332,7 +337,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MemberDeleteResponse]:
         """
         Remove a member from an account.
@@ -376,8 +381,8 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MemberGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Member]:
         """
         Get information about a specific member of an account.
 
@@ -405,19 +410,30 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[MemberGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Member]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[MemberGetResponse]], ResultWrapper[MemberGetResponse]),
+            cast_to=cast(Type[Optional[Member]], ResultWrapper[Member]),
         )
 
 
 class AsyncMembersResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncMembersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncMembersResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncMembersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncMembersResourceWithStreamingResponse(self)
 
     @overload
@@ -426,15 +442,15 @@ async def create(
         *,
         account_id: str,
         email: str,
-        roles: List[str],
-        status: Literal["accepted", "pending"] | NotGiven = NOT_GIVEN,
+        roles: SequenceNotStr[str],
+        status: Literal["accepted", "pending"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MemberCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Member]:
         """
         Add a user to the list of members for this account.
 
@@ -462,14 +478,14 @@ async def create(
         account_id: str,
         email: str,
         policies: Iterable[member_create_params.IAMCreateMemberWithPoliciesPolicy],
-        status: Literal["accepted", "pending"] | NotGiven = NOT_GIVEN,
+        status: Literal["accepted", "pending"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MemberCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Member]:
         """
         Add a user to the list of members for this account.
 
@@ -496,16 +512,16 @@ async def create(
         *,
         account_id: str,
         email: str,
-        roles: List[str] | NotGiven = NOT_GIVEN,
-        status: Literal["accepted", "pending"] | NotGiven = NOT_GIVEN,
-        policies: Iterable[member_create_params.IAMCreateMemberWithPoliciesPolicy] | NotGiven = NOT_GIVEN,
+        roles: SequenceNotStr[str] | Omit = omit,
+        status: Literal["accepted", "pending"] | Omit = omit,
+        policies: Iterable[member_create_params.IAMCreateMemberWithPoliciesPolicy] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MemberCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Member]:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._post(
@@ -524,9 +540,9 @@ async def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[MemberCreateResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Member]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[MemberCreateResponse]], ResultWrapper[MemberCreateResponse]),
+            cast_to=cast(Type[Optional[Member]], ResultWrapper[Member]),
         )
 
     @overload
@@ -535,14 +551,14 @@ async def update(
         member_id: str,
         *,
         account_id: str,
-        roles: Iterable[member_update_params.MemberRole] | NotGiven = NOT_GIVEN,
+        roles: Iterable[Role] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MemberUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Member]:
         """
         Modify an account member.
 
@@ -575,8 +591,8 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MemberUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Member]:
         """
         Modify an account member.
 
@@ -603,15 +619,15 @@ async def update(
         member_id: str,
         *,
         account_id: str,
-        roles: Iterable[member_update_params.MemberRole] | NotGiven = NOT_GIVEN,
-        policies: Iterable[member_update_params.IAMUpdateMemberWithPoliciesPolicy] | NotGiven = NOT_GIVEN,
+        roles: Iterable[Role] | Omit = omit,
+        policies: Iterable[member_update_params.IAMUpdateMemberWithPoliciesPolicy] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MemberUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Member]:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not member_id:
@@ -630,27 +646,27 @@ async def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[MemberUpdateResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Member]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[MemberUpdateResponse]], ResultWrapper[MemberUpdateResponse]),
+            cast_to=cast(Type[Optional[Member]], ResultWrapper[Member]),
         )
 
     def list(
         self,
         *,
         account_id: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        order: Literal["user.first_name", "user.last_name", "user.email", "status"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        status: Literal["accepted", "pending", "rejected"] | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        order: Literal["user.first_name", "user.last_name", "user.email", "status"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal["accepted", "pending", "rejected"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[MemberListResponse, AsyncV4PagePaginationArray[MemberListResponse]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Member, AsyncV4PagePaginationArray[Member]]:
         """
         List all members of an account.
 
@@ -679,7 +695,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/members",
-            page=AsyncV4PagePaginationArray[MemberListResponse],
+            page=AsyncV4PagePaginationArray[Member],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -696,7 +712,7 @@ def list(
                     member_list_params.MemberListParams,
                 ),
             ),
-            model=MemberListResponse,
+            model=Member,
         )
 
     async def delete(
@@ -709,7 +725,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MemberDeleteResponse]:
         """
         Remove a member from an account.
@@ -753,8 +769,8 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MemberGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Member]:
         """
         Get information about a specific member of an account.
 
@@ -782,9 +798,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[MemberGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Member]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[MemberGetResponse]], ResultWrapper[MemberGetResponse]),
+            cast_to=cast(Type[Optional[Member]], ResultWrapper[Member]),
         )
 
 
diff --git a/src/cloudflare/resources/accounts/roles.py b/src/cloudflare/resources/accounts/roles.py
index f23d3aa498c..399ad9f9449 100644
--- a/src/cloudflare/resources/accounts/roles.py
+++ b/src/cloudflare/resources/accounts/roles.py
@@ -6,7 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -16,8 +17,9 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from ...pagination import SyncSinglePage, AsyncSinglePage
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ..._base_client import AsyncPaginator, make_request_options
+from ...types.accounts import role_list_params
 from ...types.shared.role import Role
 
 __all__ = ["RolesResource", "AsyncRolesResource"]
@@ -26,29 +28,46 @@
 class RolesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RolesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RolesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RolesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RolesResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[Role]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[Role]:
         """
         Get all available roles for an account.
 
         Args:
           account_id: Account identifier tag.
 
+          page: Page number of paginated results.
+
+          per_page: Number of roles per page.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -61,16 +80,26 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/roles",
-            page=SyncSinglePage[Role],
+            page=SyncV4PagePaginationArray[Role],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    role_list_params.RoleListParams,
+                ),
             ),
             model=Role,
         )
 
     def get(
         self,
-        role_id: object,
+        role_id: str,
         *,
         account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@@ -78,14 +107,16 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Role]:
         """
         Get information about a specific role for an account.
 
         Args:
           account_id: Account identifier tag.
 
+          role_id: Role identifier tag.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -96,6 +127,8 @@ def get(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not role_id:
+            raise ValueError(f"Expected a non-empty value for `role_id` but received {role_id!r}")
         return self._get(
             f"/accounts/{account_id}/roles/{role_id}",
             options=make_request_options(
@@ -103,38 +136,55 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Role]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[Role]], ResultWrapper[Role]),
         )
 
 
 class AsyncRolesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRolesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRolesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRolesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRolesResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[Role, AsyncSinglePage[Role]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Role, AsyncV4PagePaginationArray[Role]]:
         """
         Get all available roles for an account.
 
         Args:
           account_id: Account identifier tag.
 
+          page: Page number of paginated results.
+
+          per_page: Number of roles per page.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -147,16 +197,26 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/roles",
-            page=AsyncSinglePage[Role],
+            page=AsyncV4PagePaginationArray[Role],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    role_list_params.RoleListParams,
+                ),
             ),
             model=Role,
         )
 
     async def get(
         self,
-        role_id: object,
+        role_id: str,
         *,
         account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@@ -164,14 +224,16 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Role]:
         """
         Get information about a specific role for an account.
 
         Args:
           account_id: Account identifier tag.
 
+          role_id: Role identifier tag.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -182,6 +244,8 @@ async def get(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not role_id:
+            raise ValueError(f"Expected a non-empty value for `role_id` but received {role_id!r}")
         return await self._get(
             f"/accounts/{account_id}/roles/{role_id}",
             options=make_request_options(
@@ -189,9 +253,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Role]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[Role]], ResultWrapper[Role]),
         )
 
 
diff --git a/src/cloudflare/resources/accounts/subscriptions.py b/src/cloudflare/resources/accounts/subscriptions.py
new file mode 100644
index 00000000000..7209c025dfa
--- /dev/null
+++ b/src/cloudflare/resources/accounts/subscriptions.py
@@ -0,0 +1,528 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.accounts import subscription_create_params, subscription_update_params
+from ...types.shared.subscription import Subscription
+from ...types.shared_params.rate_plan import RatePlan
+from ...types.accounts.subscription_delete_response import SubscriptionDeleteResponse
+
+__all__ = ["SubscriptionsResource", "AsyncSubscriptionsResource"]
+
+
+class SubscriptionsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SubscriptionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SubscriptionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SubscriptionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SubscriptionsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | Omit = omit,
+        rate_plan: RatePlan | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Subscription:
+        """
+        Creates an account subscription.
+
+        Args:
+          account_id: Identifier
+
+          frequency: How often the subscription is renewed automatically.
+
+          rate_plan: The rate plan applied to the subscription.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/subscriptions",
+            body=maybe_transform(
+                {
+                    "frequency": frequency,
+                    "rate_plan": rate_plan,
+                },
+                subscription_create_params.SubscriptionCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Subscription]._unwrapper,
+            ),
+            cast_to=cast(Type[Subscription], ResultWrapper[Subscription]),
+        )
+
+    def update(
+        self,
+        subscription_identifier: str,
+        *,
+        account_id: str,
+        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | Omit = omit,
+        rate_plan: RatePlan | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Subscription:
+        """
+        Updates an account subscription.
+
+        Args:
+          account_id: Identifier
+
+          subscription_identifier: Subscription identifier tag.
+
+          frequency: How often the subscription is renewed automatically.
+
+          rate_plan: The rate plan applied to the subscription.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not subscription_identifier:
+            raise ValueError(
+                f"Expected a non-empty value for `subscription_identifier` but received {subscription_identifier!r}"
+            )
+        return self._put(
+            f"/accounts/{account_id}/subscriptions/{subscription_identifier}",
+            body=maybe_transform(
+                {
+                    "frequency": frequency,
+                    "rate_plan": rate_plan,
+                },
+                subscription_update_params.SubscriptionUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Subscription]._unwrapper,
+            ),
+            cast_to=cast(Type[Subscription], ResultWrapper[Subscription]),
+        )
+
+    def delete(
+        self,
+        subscription_identifier: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SubscriptionDeleteResponse:
+        """
+        Deletes an account's subscription.
+
+        Args:
+          account_id: Identifier
+
+          subscription_identifier: Subscription identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not subscription_identifier:
+            raise ValueError(
+                f"Expected a non-empty value for `subscription_identifier` but received {subscription_identifier!r}"
+            )
+        return self._delete(
+            f"/accounts/{account_id}/subscriptions/{subscription_identifier}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SubscriptionDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SubscriptionDeleteResponse], ResultWrapper[SubscriptionDeleteResponse]),
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[Subscription]:
+        """
+        Lists all of an account's subscriptions.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/subscriptions",
+            page=SyncSinglePage[Subscription],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=Subscription,
+        )
+
+
+class AsyncSubscriptionsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSubscriptionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSubscriptionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSubscriptionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSubscriptionsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | Omit = omit,
+        rate_plan: RatePlan | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Subscription:
+        """
+        Creates an account subscription.
+
+        Args:
+          account_id: Identifier
+
+          frequency: How often the subscription is renewed automatically.
+
+          rate_plan: The rate plan applied to the subscription.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/subscriptions",
+            body=await async_maybe_transform(
+                {
+                    "frequency": frequency,
+                    "rate_plan": rate_plan,
+                },
+                subscription_create_params.SubscriptionCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Subscription]._unwrapper,
+            ),
+            cast_to=cast(Type[Subscription], ResultWrapper[Subscription]),
+        )
+
+    async def update(
+        self,
+        subscription_identifier: str,
+        *,
+        account_id: str,
+        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | Omit = omit,
+        rate_plan: RatePlan | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Subscription:
+        """
+        Updates an account subscription.
+
+        Args:
+          account_id: Identifier
+
+          subscription_identifier: Subscription identifier tag.
+
+          frequency: How often the subscription is renewed automatically.
+
+          rate_plan: The rate plan applied to the subscription.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not subscription_identifier:
+            raise ValueError(
+                f"Expected a non-empty value for `subscription_identifier` but received {subscription_identifier!r}"
+            )
+        return await self._put(
+            f"/accounts/{account_id}/subscriptions/{subscription_identifier}",
+            body=await async_maybe_transform(
+                {
+                    "frequency": frequency,
+                    "rate_plan": rate_plan,
+                },
+                subscription_update_params.SubscriptionUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Subscription]._unwrapper,
+            ),
+            cast_to=cast(Type[Subscription], ResultWrapper[Subscription]),
+        )
+
+    async def delete(
+        self,
+        subscription_identifier: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SubscriptionDeleteResponse:
+        """
+        Deletes an account's subscription.
+
+        Args:
+          account_id: Identifier
+
+          subscription_identifier: Subscription identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not subscription_identifier:
+            raise ValueError(
+                f"Expected a non-empty value for `subscription_identifier` but received {subscription_identifier!r}"
+            )
+        return await self._delete(
+            f"/accounts/{account_id}/subscriptions/{subscription_identifier}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SubscriptionDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SubscriptionDeleteResponse], ResultWrapper[SubscriptionDeleteResponse]),
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Subscription, AsyncSinglePage[Subscription]]:
+        """
+        Lists all of an account's subscriptions.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/subscriptions",
+            page=AsyncSinglePage[Subscription],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=Subscription,
+        )
+
+
+class SubscriptionsResourceWithRawResponse:
+    def __init__(self, subscriptions: SubscriptionsResource) -> None:
+        self._subscriptions = subscriptions
+
+        self.create = to_raw_response_wrapper(
+            subscriptions.create,
+        )
+        self.update = to_raw_response_wrapper(
+            subscriptions.update,
+        )
+        self.delete = to_raw_response_wrapper(
+            subscriptions.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            subscriptions.get,
+        )
+
+
+class AsyncSubscriptionsResourceWithRawResponse:
+    def __init__(self, subscriptions: AsyncSubscriptionsResource) -> None:
+        self._subscriptions = subscriptions
+
+        self.create = async_to_raw_response_wrapper(
+            subscriptions.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            subscriptions.update,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            subscriptions.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            subscriptions.get,
+        )
+
+
+class SubscriptionsResourceWithStreamingResponse:
+    def __init__(self, subscriptions: SubscriptionsResource) -> None:
+        self._subscriptions = subscriptions
+
+        self.create = to_streamed_response_wrapper(
+            subscriptions.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            subscriptions.update,
+        )
+        self.delete = to_streamed_response_wrapper(
+            subscriptions.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            subscriptions.get,
+        )
+
+
+class AsyncSubscriptionsResourceWithStreamingResponse:
+    def __init__(self, subscriptions: AsyncSubscriptionsResource) -> None:
+        self._subscriptions = subscriptions
+
+        self.create = async_to_streamed_response_wrapper(
+            subscriptions.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            subscriptions.update,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            subscriptions.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            subscriptions.get,
+        )
diff --git a/src/cloudflare/resources/accounts/tokens/__init__.py b/src/cloudflare/resources/accounts/tokens/__init__.py
new file mode 100644
index 00000000000..f42f0970969
--- /dev/null
+++ b/src/cloudflare/resources/accounts/tokens/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .value import (
+    ValueResource,
+    AsyncValueResource,
+    ValueResourceWithRawResponse,
+    AsyncValueResourceWithRawResponse,
+    ValueResourceWithStreamingResponse,
+    AsyncValueResourceWithStreamingResponse,
+)
+from .tokens import (
+    TokensResource,
+    AsyncTokensResource,
+    TokensResourceWithRawResponse,
+    AsyncTokensResourceWithRawResponse,
+    TokensResourceWithStreamingResponse,
+    AsyncTokensResourceWithStreamingResponse,
+)
+from .permission_groups import (
+    PermissionGroupsResource,
+    AsyncPermissionGroupsResource,
+    PermissionGroupsResourceWithRawResponse,
+    AsyncPermissionGroupsResourceWithRawResponse,
+    PermissionGroupsResourceWithStreamingResponse,
+    AsyncPermissionGroupsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "PermissionGroupsResource",
+    "AsyncPermissionGroupsResource",
+    "PermissionGroupsResourceWithRawResponse",
+    "AsyncPermissionGroupsResourceWithRawResponse",
+    "PermissionGroupsResourceWithStreamingResponse",
+    "AsyncPermissionGroupsResourceWithStreamingResponse",
+    "ValueResource",
+    "AsyncValueResource",
+    "ValueResourceWithRawResponse",
+    "AsyncValueResourceWithRawResponse",
+    "ValueResourceWithStreamingResponse",
+    "AsyncValueResourceWithStreamingResponse",
+    "TokensResource",
+    "AsyncTokensResource",
+    "TokensResourceWithRawResponse",
+    "AsyncTokensResourceWithRawResponse",
+    "TokensResourceWithStreamingResponse",
+    "AsyncTokensResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/accounts/tokens/permission_groups.py b/src/cloudflare/resources/accounts/tokens/permission_groups.py
new file mode 100644
index 00000000000..2efe092f8ec
--- /dev/null
+++ b/src/cloudflare/resources/accounts/tokens/permission_groups.py
@@ -0,0 +1,324 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.accounts.tokens import permission_group_get_params, permission_group_list_params
+from ....types.accounts.tokens.permission_group_get_response import PermissionGroupGetResponse
+from ....types.accounts.tokens.permission_group_list_response import PermissionGroupListResponse
+
+__all__ = ["PermissionGroupsResource", "AsyncPermissionGroupsResource"]
+
+
+class PermissionGroupsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> PermissionGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return PermissionGroupsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> PermissionGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return PermissionGroupsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        scope: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[PermissionGroupListResponse]:
+        """
+        Find all available permission groups for Account Owned API Tokens
+
+        Args:
+          account_id: Account identifier tag.
+
+          name: Filter by the name of the permission group. The value must be URL-encoded.
+
+          scope: Filter by the scope of the permission group. The value must be URL-encoded.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/tokens/permission_groups",
+            page=SyncSinglePage[PermissionGroupListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "name": name,
+                        "scope": scope,
+                    },
+                    permission_group_list_params.PermissionGroupListParams,
+                ),
+            ),
+            model=PermissionGroupListResponse,
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        scope: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PermissionGroupGetResponse]:
+        """
+        Find all available permission groups for Account Owned API Tokens
+
+        Args:
+          account_id: Account identifier tag.
+
+          name: Filter by the name of the permission group. The value must be URL-encoded.
+
+          scope: Filter by the scope of the permission group. The value must be URL-encoded.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/tokens/permission_groups",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "name": name,
+                        "scope": scope,
+                    },
+                    permission_group_get_params.PermissionGroupGetParams,
+                ),
+                post_parser=ResultWrapper[Optional[PermissionGroupGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PermissionGroupGetResponse]], ResultWrapper[PermissionGroupGetResponse]),
+        )
+
+
+class AsyncPermissionGroupsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncPermissionGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncPermissionGroupsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncPermissionGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncPermissionGroupsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        scope: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[PermissionGroupListResponse, AsyncSinglePage[PermissionGroupListResponse]]:
+        """
+        Find all available permission groups for Account Owned API Tokens
+
+        Args:
+          account_id: Account identifier tag.
+
+          name: Filter by the name of the permission group. The value must be URL-encoded.
+
+          scope: Filter by the scope of the permission group. The value must be URL-encoded.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/tokens/permission_groups",
+            page=AsyncSinglePage[PermissionGroupListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "name": name,
+                        "scope": scope,
+                    },
+                    permission_group_list_params.PermissionGroupListParams,
+                ),
+            ),
+            model=PermissionGroupListResponse,
+        )
+
+    async def get(
+        self,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        scope: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PermissionGroupGetResponse]:
+        """
+        Find all available permission groups for Account Owned API Tokens
+
+        Args:
+          account_id: Account identifier tag.
+
+          name: Filter by the name of the permission group. The value must be URL-encoded.
+
+          scope: Filter by the scope of the permission group. The value must be URL-encoded.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/tokens/permission_groups",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "name": name,
+                        "scope": scope,
+                    },
+                    permission_group_get_params.PermissionGroupGetParams,
+                ),
+                post_parser=ResultWrapper[Optional[PermissionGroupGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PermissionGroupGetResponse]], ResultWrapper[PermissionGroupGetResponse]),
+        )
+
+
+class PermissionGroupsResourceWithRawResponse:
+    def __init__(self, permission_groups: PermissionGroupsResource) -> None:
+        self._permission_groups = permission_groups
+
+        self.list = to_raw_response_wrapper(
+            permission_groups.list,
+        )
+        self.get = to_raw_response_wrapper(
+            permission_groups.get,
+        )
+
+
+class AsyncPermissionGroupsResourceWithRawResponse:
+    def __init__(self, permission_groups: AsyncPermissionGroupsResource) -> None:
+        self._permission_groups = permission_groups
+
+        self.list = async_to_raw_response_wrapper(
+            permission_groups.list,
+        )
+        self.get = async_to_raw_response_wrapper(
+            permission_groups.get,
+        )
+
+
+class PermissionGroupsResourceWithStreamingResponse:
+    def __init__(self, permission_groups: PermissionGroupsResource) -> None:
+        self._permission_groups = permission_groups
+
+        self.list = to_streamed_response_wrapper(
+            permission_groups.list,
+        )
+        self.get = to_streamed_response_wrapper(
+            permission_groups.get,
+        )
+
+
+class AsyncPermissionGroupsResourceWithStreamingResponse:
+    def __init__(self, permission_groups: AsyncPermissionGroupsResource) -> None:
+        self._permission_groups = permission_groups
+
+        self.list = async_to_streamed_response_wrapper(
+            permission_groups.list,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            permission_groups.get,
+        )
diff --git a/src/cloudflare/resources/accounts/tokens/tokens.py b/src/cloudflare/resources/accounts/tokens/tokens.py
new file mode 100644
index 00000000000..eb6d7826528
--- /dev/null
+++ b/src/cloudflare/resources/accounts/tokens/tokens.py
@@ -0,0 +1,869 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Union, Iterable, Optional, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from .value import (
+    ValueResource,
+    AsyncValueResource,
+    ValueResourceWithRawResponse,
+    AsyncValueResourceWithRawResponse,
+    ValueResourceWithStreamingResponse,
+    AsyncValueResourceWithStreamingResponse,
+)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.accounts import token_list_params, token_create_params, token_update_params
+from .permission_groups import (
+    PermissionGroupsResource,
+    AsyncPermissionGroupsResource,
+    PermissionGroupsResourceWithRawResponse,
+    AsyncPermissionGroupsResourceWithRawResponse,
+    PermissionGroupsResourceWithStreamingResponse,
+    AsyncPermissionGroupsResourceWithStreamingResponse,
+)
+from ....types.shared.token import Token
+from ....types.shared_params.token_policy import TokenPolicy
+from ....types.accounts.token_create_response import TokenCreateResponse
+from ....types.accounts.token_delete_response import TokenDeleteResponse
+from ....types.accounts.token_verify_response import TokenVerifyResponse
+
+__all__ = ["TokensResource", "AsyncTokensResource"]
+
+
+class TokensResource(SyncAPIResource):
+    @cached_property
+    def permission_groups(self) -> PermissionGroupsResource:
+        return PermissionGroupsResource(self._client)
+
+    @cached_property
+    def value(self) -> ValueResource:
+        return ValueResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> TokensResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TokensResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TokensResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TokensResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        policies: Iterable[TokenPolicy],
+        condition: token_create_params.Condition | Omit = omit,
+        expires_on: Union[str, datetime] | Omit = omit,
+        not_before: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TokenCreateResponse]:
+        """
+        Create a new Account Owned API token.
+
+        Args:
+          account_id: Account identifier tag.
+
+          name: Token name.
+
+          policies: List of access policies assigned to the token.
+
+          expires_on: The expiration time on or after which the JWT MUST NOT be accepted for
+              processing.
+
+          not_before: The time before which the token MUST NOT be accepted for processing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/tokens",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "policies": policies,
+                    "condition": condition,
+                    "expires_on": expires_on,
+                    "not_before": not_before,
+                },
+                token_create_params.TokenCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TokenCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TokenCreateResponse]], ResultWrapper[TokenCreateResponse]),
+        )
+
+    def update(
+        self,
+        token_id: str,
+        *,
+        account_id: str,
+        name: str,
+        policies: Iterable[TokenPolicy],
+        condition: token_update_params.Condition | Omit = omit,
+        expires_on: Union[str, datetime] | Omit = omit,
+        not_before: Union[str, datetime] | Omit = omit,
+        status: Literal["active", "disabled", "expired"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Token]:
+        """
+        Update an existing token.
+
+        Args:
+          account_id: Account identifier tag.
+
+          token_id: Token identifier tag.
+
+          name: Token name.
+
+          policies: List of access policies assigned to the token.
+
+          expires_on: The expiration time on or after which the JWT MUST NOT be accepted for
+              processing.
+
+          not_before: The time before which the token MUST NOT be accepted for processing.
+
+          status: Status of the token.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not token_id:
+            raise ValueError(f"Expected a non-empty value for `token_id` but received {token_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/tokens/{token_id}",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "policies": policies,
+                    "condition": condition,
+                    "expires_on": expires_on,
+                    "not_before": not_before,
+                    "status": status,
+                },
+                token_update_params.TokenUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Token]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[Token]:
+        """
+        List all Account Owned API tokens created for this account.
+
+        Args:
+          account_id: Account identifier tag.
+
+          direction: Direction to order results.
+
+          page: Page number of paginated results.
+
+          per_page: Maximum number of results per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/tokens",
+            page=SyncV4PagePaginationArray[Token],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    token_list_params.TokenListParams,
+                ),
+            ),
+            model=Token,
+        )
+
+    def delete(
+        self,
+        token_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TokenDeleteResponse]:
+        """
+        Destroy an Account Owned API token.
+
+        Args:
+          account_id: Account identifier tag.
+
+          token_id: Token identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not token_id:
+            raise ValueError(f"Expected a non-empty value for `token_id` but received {token_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/tokens/{token_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TokenDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TokenDeleteResponse]], ResultWrapper[TokenDeleteResponse]),
+        )
+
+    def get(
+        self,
+        token_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Token]:
+        """
+        Get information about a specific Account Owned API token.
+
+        Args:
+          account_id: Account identifier tag.
+
+          token_id: Token identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not token_id:
+            raise ValueError(f"Expected a non-empty value for `token_id` but received {token_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/tokens/{token_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Token]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
+        )
+
+    def verify(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TokenVerifyResponse]:
+        """
+        Test whether a token works.
+
+        Args:
+          account_id: Account identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/tokens/verify",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TokenVerifyResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TokenVerifyResponse]], ResultWrapper[TokenVerifyResponse]),
+        )
+
+
+class AsyncTokensResource(AsyncAPIResource):
+    @cached_property
+    def permission_groups(self) -> AsyncPermissionGroupsResource:
+        return AsyncPermissionGroupsResource(self._client)
+
+    @cached_property
+    def value(self) -> AsyncValueResource:
+        return AsyncValueResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncTokensResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTokensResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTokensResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTokensResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        policies: Iterable[TokenPolicy],
+        condition: token_create_params.Condition | Omit = omit,
+        expires_on: Union[str, datetime] | Omit = omit,
+        not_before: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TokenCreateResponse]:
+        """
+        Create a new Account Owned API token.
+
+        Args:
+          account_id: Account identifier tag.
+
+          name: Token name.
+
+          policies: List of access policies assigned to the token.
+
+          expires_on: The expiration time on or after which the JWT MUST NOT be accepted for
+              processing.
+
+          not_before: The time before which the token MUST NOT be accepted for processing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/tokens",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "policies": policies,
+                    "condition": condition,
+                    "expires_on": expires_on,
+                    "not_before": not_before,
+                },
+                token_create_params.TokenCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TokenCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TokenCreateResponse]], ResultWrapper[TokenCreateResponse]),
+        )
+
+    async def update(
+        self,
+        token_id: str,
+        *,
+        account_id: str,
+        name: str,
+        policies: Iterable[TokenPolicy],
+        condition: token_update_params.Condition | Omit = omit,
+        expires_on: Union[str, datetime] | Omit = omit,
+        not_before: Union[str, datetime] | Omit = omit,
+        status: Literal["active", "disabled", "expired"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Token]:
+        """
+        Update an existing token.
+
+        Args:
+          account_id: Account identifier tag.
+
+          token_id: Token identifier tag.
+
+          name: Token name.
+
+          policies: List of access policies assigned to the token.
+
+          expires_on: The expiration time on or after which the JWT MUST NOT be accepted for
+              processing.
+
+          not_before: The time before which the token MUST NOT be accepted for processing.
+
+          status: Status of the token.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not token_id:
+            raise ValueError(f"Expected a non-empty value for `token_id` but received {token_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/tokens/{token_id}",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "policies": policies,
+                    "condition": condition,
+                    "expires_on": expires_on,
+                    "not_before": not_before,
+                    "status": status,
+                },
+                token_update_params.TokenUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Token]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Token, AsyncV4PagePaginationArray[Token]]:
+        """
+        List all Account Owned API tokens created for this account.
+
+        Args:
+          account_id: Account identifier tag.
+
+          direction: Direction to order results.
+
+          page: Page number of paginated results.
+
+          per_page: Maximum number of results per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/tokens",
+            page=AsyncV4PagePaginationArray[Token],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    token_list_params.TokenListParams,
+                ),
+            ),
+            model=Token,
+        )
+
+    async def delete(
+        self,
+        token_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TokenDeleteResponse]:
+        """
+        Destroy an Account Owned API token.
+
+        Args:
+          account_id: Account identifier tag.
+
+          token_id: Token identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not token_id:
+            raise ValueError(f"Expected a non-empty value for `token_id` but received {token_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/tokens/{token_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TokenDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TokenDeleteResponse]], ResultWrapper[TokenDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        token_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Token]:
+        """
+        Get information about a specific Account Owned API token.
+
+        Args:
+          account_id: Account identifier tag.
+
+          token_id: Token identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not token_id:
+            raise ValueError(f"Expected a non-empty value for `token_id` but received {token_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/tokens/{token_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Token]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
+        )
+
+    async def verify(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TokenVerifyResponse]:
+        """
+        Test whether a token works.
+
+        Args:
+          account_id: Account identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/tokens/verify",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TokenVerifyResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TokenVerifyResponse]], ResultWrapper[TokenVerifyResponse]),
+        )
+
+
+class TokensResourceWithRawResponse:
+    def __init__(self, tokens: TokensResource) -> None:
+        self._tokens = tokens
+
+        self.create = to_raw_response_wrapper(
+            tokens.create,
+        )
+        self.update = to_raw_response_wrapper(
+            tokens.update,
+        )
+        self.list = to_raw_response_wrapper(
+            tokens.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            tokens.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            tokens.get,
+        )
+        self.verify = to_raw_response_wrapper(
+            tokens.verify,
+        )
+
+    @cached_property
+    def permission_groups(self) -> PermissionGroupsResourceWithRawResponse:
+        return PermissionGroupsResourceWithRawResponse(self._tokens.permission_groups)
+
+    @cached_property
+    def value(self) -> ValueResourceWithRawResponse:
+        return ValueResourceWithRawResponse(self._tokens.value)
+
+
+class AsyncTokensResourceWithRawResponse:
+    def __init__(self, tokens: AsyncTokensResource) -> None:
+        self._tokens = tokens
+
+        self.create = async_to_raw_response_wrapper(
+            tokens.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            tokens.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            tokens.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            tokens.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            tokens.get,
+        )
+        self.verify = async_to_raw_response_wrapper(
+            tokens.verify,
+        )
+
+    @cached_property
+    def permission_groups(self) -> AsyncPermissionGroupsResourceWithRawResponse:
+        return AsyncPermissionGroupsResourceWithRawResponse(self._tokens.permission_groups)
+
+    @cached_property
+    def value(self) -> AsyncValueResourceWithRawResponse:
+        return AsyncValueResourceWithRawResponse(self._tokens.value)
+
+
+class TokensResourceWithStreamingResponse:
+    def __init__(self, tokens: TokensResource) -> None:
+        self._tokens = tokens
+
+        self.create = to_streamed_response_wrapper(
+            tokens.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            tokens.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            tokens.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            tokens.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            tokens.get,
+        )
+        self.verify = to_streamed_response_wrapper(
+            tokens.verify,
+        )
+
+    @cached_property
+    def permission_groups(self) -> PermissionGroupsResourceWithStreamingResponse:
+        return PermissionGroupsResourceWithStreamingResponse(self._tokens.permission_groups)
+
+    @cached_property
+    def value(self) -> ValueResourceWithStreamingResponse:
+        return ValueResourceWithStreamingResponse(self._tokens.value)
+
+
+class AsyncTokensResourceWithStreamingResponse:
+    def __init__(self, tokens: AsyncTokensResource) -> None:
+        self._tokens = tokens
+
+        self.create = async_to_streamed_response_wrapper(
+            tokens.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            tokens.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            tokens.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            tokens.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            tokens.get,
+        )
+        self.verify = async_to_streamed_response_wrapper(
+            tokens.verify,
+        )
+
+    @cached_property
+    def permission_groups(self) -> AsyncPermissionGroupsResourceWithStreamingResponse:
+        return AsyncPermissionGroupsResourceWithStreamingResponse(self._tokens.permission_groups)
+
+    @cached_property
+    def value(self) -> AsyncValueResourceWithStreamingResponse:
+        return AsyncValueResourceWithStreamingResponse(self._tokens.value)
diff --git a/src/cloudflare/resources/accounts/tokens/value.py b/src/cloudflare/resources/accounts/tokens/value.py
new file mode 100644
index 00000000000..5e76bc54948
--- /dev/null
+++ b/src/cloudflare/resources/accounts/tokens/value.py
@@ -0,0 +1,194 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.accounts.tokens import value_update_params
+from ....types.shared.token_value import TokenValue
+
+__all__ = ["ValueResource", "AsyncValueResource"]
+
+
+class ValueResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ValueResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ValueResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ValueResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ValueResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        token_id: str,
+        *,
+        account_id: str,
+        body: object,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Roll the Account Owned API token secret.
+
+        Args:
+          account_id: Account identifier tag.
+
+          token_id: Token identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not token_id:
+            raise ValueError(f"Expected a non-empty value for `token_id` but received {token_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/tokens/{token_id}/value",
+            body=maybe_transform(body, value_update_params.ValueUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TokenValue]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class AsyncValueResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncValueResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncValueResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncValueResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncValueResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        token_id: str,
+        *,
+        account_id: str,
+        body: object,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Roll the Account Owned API token secret.
+
+        Args:
+          account_id: Account identifier tag.
+
+          token_id: Token identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not token_id:
+            raise ValueError(f"Expected a non-empty value for `token_id` but received {token_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/tokens/{token_id}/value",
+            body=await async_maybe_transform(body, value_update_params.ValueUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TokenValue]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class ValueResourceWithRawResponse:
+    def __init__(self, value: ValueResource) -> None:
+        self._value = value
+
+        self.update = to_raw_response_wrapper(
+            value.update,
+        )
+
+
+class AsyncValueResourceWithRawResponse:
+    def __init__(self, value: AsyncValueResource) -> None:
+        self._value = value
+
+        self.update = async_to_raw_response_wrapper(
+            value.update,
+        )
+
+
+class ValueResourceWithStreamingResponse:
+    def __init__(self, value: ValueResource) -> None:
+        self._value = value
+
+        self.update = to_streamed_response_wrapper(
+            value.update,
+        )
+
+
+class AsyncValueResourceWithStreamingResponse:
+    def __init__(self, value: AsyncValueResource) -> None:
+        self._value = value
+
+        self.update = async_to_streamed_response_wrapper(
+            value.update,
+        )
diff --git a/src/cloudflare/resources/acm/acm.py b/src/cloudflare/resources/acm/acm.py
index ad401c45360..4d576c8fa13 100644
--- a/src/cloudflare/resources/acm/acm.py
+++ b/src/cloudflare/resources/acm/acm.py
@@ -23,10 +23,21 @@ def total_tls(self) -> TotalTLSResource:
 
     @cached_property
     def with_raw_response(self) -> ACMResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ACMResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ACMResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ACMResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def total_tls(self) -> AsyncTotalTLSResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncACMResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncACMResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncACMResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncACMResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/acm/total_tls.py b/src/cloudflare/resources/acm/total_tls.py
index 22877d9f1a8..ed1c54d9f7e 100644
--- a/src/cloudflare/resources/acm/total_tls.py
+++ b/src/cloudflare/resources/acm/total_tls.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -20,11 +17,12 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from ...types.acm import CertificateAuthority, total_tls_create_params
+from ...types.acm import CertificateAuthority, total_tls_edit_params, total_tls_update_params
 from ..._base_client import make_request_options
 from ...types.acm.certificate_authority import CertificateAuthority
 from ...types.acm.total_tls_get_response import TotalTLSGetResponse
-from ...types.acm.total_tls_create_response import TotalTLSCreateResponse
+from ...types.acm.total_tls_edit_response import TotalTLSEditResponse
+from ...types.acm.total_tls_update_response import TotalTLSUpdateResponse
 
 __all__ = ["TotalTLSResource", "AsyncTotalTLSResource"]
 
@@ -32,30 +30,94 @@
 class TotalTLSResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TotalTLSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TotalTLSResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TotalTLSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TotalTLSResourceWithStreamingResponse(self)
 
-    def create(
+    def update(
+        self,
+        *,
+        zone_id: str,
+        enabled: bool,
+        certificate_authority: CertificateAuthority | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TotalTLSUpdateResponse]:
+        """
+        Set Total TLS Settings or disable the feature for a Zone.
+
+        Args:
+          zone_id: Identifier.
+
+          enabled: If enabled, Total TLS will order a hostname specific TLS certificate for any
+              proxied A, AAAA, or CNAME record in your zone.
+
+          certificate_authority: The Certificate Authority that Total TLS certificates will be issued through.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/acm/total_tls",
+            body=maybe_transform(
+                {
+                    "enabled": enabled,
+                    "certificate_authority": certificate_authority,
+                },
+                total_tls_update_params.TotalTLSUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TotalTLSUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TotalTLSUpdateResponse]], ResultWrapper[TotalTLSUpdateResponse]),
+        )
+
+    def edit(
         self,
         *,
         zone_id: str,
         enabled: bool,
-        certificate_authority: CertificateAuthority | NotGiven = NOT_GIVEN,
+        certificate_authority: CertificateAuthority | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TotalTLSCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TotalTLSEditResponse]:
         """
         Set Total TLS Settings or disable the feature for a Zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           enabled: If enabled, Total TLS will order a hostname specific TLS certificate for any
               proxied A, AAAA, or CNAME record in your zone.
@@ -79,16 +141,16 @@ def create(
                     "enabled": enabled,
                     "certificate_authority": certificate_authority,
                 },
-                total_tls_create_params.TotalTLSCreateParams,
+                total_tls_edit_params.TotalTLSEditParams,
             ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[TotalTLSCreateResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[TotalTLSEditResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[TotalTLSCreateResponse]], ResultWrapper[TotalTLSCreateResponse]),
+            cast_to=cast(Type[Optional[TotalTLSEditResponse]], ResultWrapper[TotalTLSEditResponse]),
         )
 
     def get(
@@ -100,13 +162,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TotalTLSGetResponse]:
         """
         Get Total TLS Settings for a Zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -134,30 +196,41 @@ def get(
 class AsyncTotalTLSResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTotalTLSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTotalTLSResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTotalTLSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTotalTLSResourceWithStreamingResponse(self)
 
-    async def create(
+    async def update(
         self,
         *,
         zone_id: str,
         enabled: bool,
-        certificate_authority: CertificateAuthority | NotGiven = NOT_GIVEN,
+        certificate_authority: CertificateAuthority | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TotalTLSCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TotalTLSUpdateResponse]:
         """
         Set Total TLS Settings or disable the feature for a Zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           enabled: If enabled, Total TLS will order a hostname specific TLS certificate for any
               proxied A, AAAA, or CNAME record in your zone.
@@ -181,16 +254,69 @@ async def create(
                     "enabled": enabled,
                     "certificate_authority": certificate_authority,
                 },
-                total_tls_create_params.TotalTLSCreateParams,
+                total_tls_update_params.TotalTLSUpdateParams,
             ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[TotalTLSCreateResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[TotalTLSUpdateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[TotalTLSCreateResponse]], ResultWrapper[TotalTLSCreateResponse]),
+            cast_to=cast(Type[Optional[TotalTLSUpdateResponse]], ResultWrapper[TotalTLSUpdateResponse]),
+        )
+
+    async def edit(
+        self,
+        *,
+        zone_id: str,
+        enabled: bool,
+        certificate_authority: CertificateAuthority | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TotalTLSEditResponse]:
+        """
+        Set Total TLS Settings or disable the feature for a Zone.
+
+        Args:
+          zone_id: Identifier.
+
+          enabled: If enabled, Total TLS will order a hostname specific TLS certificate for any
+              proxied A, AAAA, or CNAME record in your zone.
+
+          certificate_authority: The Certificate Authority that Total TLS certificates will be issued through.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/acm/total_tls",
+            body=await async_maybe_transform(
+                {
+                    "enabled": enabled,
+                    "certificate_authority": certificate_authority,
+                },
+                total_tls_edit_params.TotalTLSEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TotalTLSEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TotalTLSEditResponse]], ResultWrapper[TotalTLSEditResponse]),
         )
 
     async def get(
@@ -202,13 +328,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TotalTLSGetResponse]:
         """
         Get Total TLS Settings for a Zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -237,8 +363,11 @@ class TotalTLSResourceWithRawResponse:
     def __init__(self, total_tls: TotalTLSResource) -> None:
         self._total_tls = total_tls
 
-        self.create = to_raw_response_wrapper(
-            total_tls.create,
+        self.update = to_raw_response_wrapper(
+            total_tls.update,
+        )
+        self.edit = to_raw_response_wrapper(
+            total_tls.edit,
         )
         self.get = to_raw_response_wrapper(
             total_tls.get,
@@ -249,8 +378,11 @@ class AsyncTotalTLSResourceWithRawResponse:
     def __init__(self, total_tls: AsyncTotalTLSResource) -> None:
         self._total_tls = total_tls
 
-        self.create = async_to_raw_response_wrapper(
-            total_tls.create,
+        self.update = async_to_raw_response_wrapper(
+            total_tls.update,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            total_tls.edit,
         )
         self.get = async_to_raw_response_wrapper(
             total_tls.get,
@@ -261,8 +393,11 @@ class TotalTLSResourceWithStreamingResponse:
     def __init__(self, total_tls: TotalTLSResource) -> None:
         self._total_tls = total_tls
 
-        self.create = to_streamed_response_wrapper(
-            total_tls.create,
+        self.update = to_streamed_response_wrapper(
+            total_tls.update,
+        )
+        self.edit = to_streamed_response_wrapper(
+            total_tls.edit,
         )
         self.get = to_streamed_response_wrapper(
             total_tls.get,
@@ -273,8 +408,11 @@ class AsyncTotalTLSResourceWithStreamingResponse:
     def __init__(self, total_tls: AsyncTotalTLSResource) -> None:
         self._total_tls = total_tls
 
-        self.create = async_to_streamed_response_wrapper(
-            total_tls.create,
+        self.update = async_to_streamed_response_wrapper(
+            total_tls.update,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            total_tls.edit,
         )
         self.get = async_to_streamed_response_wrapper(
             total_tls.get,
diff --git a/src/cloudflare/resources/addressing/address_maps/accounts.py b/src/cloudflare/resources/addressing/address_maps/accounts.py
index a7a4e27322c..9d839d4a42d 100644
--- a/src/cloudflare/resources/addressing/address_maps/accounts.py
+++ b/src/cloudflare/resources/addressing/address_maps/accounts.py
@@ -2,15 +2,10 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
-
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -19,7 +14,6 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ...._wrappers import ResultWrapper
 from ...._base_client import make_request_options
 from ....types.addressing.address_maps import account_update_params
 from ....types.addressing.address_maps.account_delete_response import AccountDeleteResponse
@@ -31,10 +25,21 @@
 class AccountsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AccountsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AccountsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AccountsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AccountsResourceWithStreamingResponse(self)
 
     def update(
@@ -48,15 +53,15 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AccountUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AccountUpdateResponse:
         """
         Add an account as a member of a particular address map.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          address_map_id: Identifier
+          address_map_id: Identifier of an Address Map.
 
           extra_headers: Send extra headers
 
@@ -74,13 +79,9 @@ def update(
             f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/accounts/{account_id}",
             body=maybe_transform(body, account_update_params.AccountUpdateParams),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[AccountUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[AccountUpdateResponse]], ResultWrapper[AccountUpdateResponse]),
+            cast_to=AccountUpdateResponse,
         )
 
     def delete(
@@ -93,15 +94,15 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AccountDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AccountDeleteResponse:
         """
         Remove an account as a member of a particular address map.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          address_map_id: Identifier
+          address_map_id: Identifier of an Address Map.
 
           extra_headers: Send extra headers
 
@@ -118,23 +119,30 @@ def delete(
         return self._delete(
             f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/accounts/{account_id}",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[AccountDeleteResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[AccountDeleteResponse]], ResultWrapper[AccountDeleteResponse]),
+            cast_to=AccountDeleteResponse,
         )
 
 
 class AsyncAccountsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncAccountsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAccountsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAccountsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAccountsResourceWithStreamingResponse(self)
 
     async def update(
@@ -148,15 +156,15 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AccountUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AccountUpdateResponse:
         """
         Add an account as a member of a particular address map.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          address_map_id: Identifier
+          address_map_id: Identifier of an Address Map.
 
           extra_headers: Send extra headers
 
@@ -174,13 +182,9 @@ async def update(
             f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/accounts/{account_id}",
             body=await async_maybe_transform(body, account_update_params.AccountUpdateParams),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[AccountUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[AccountUpdateResponse]], ResultWrapper[AccountUpdateResponse]),
+            cast_to=AccountUpdateResponse,
         )
 
     async def delete(
@@ -193,15 +197,15 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AccountDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AccountDeleteResponse:
         """
         Remove an account as a member of a particular address map.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          address_map_id: Identifier
+          address_map_id: Identifier of an Address Map.
 
           extra_headers: Send extra headers
 
@@ -218,13 +222,9 @@ async def delete(
         return await self._delete(
             f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/accounts/{account_id}",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[AccountDeleteResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[AccountDeleteResponse]], ResultWrapper[AccountDeleteResponse]),
+            cast_to=AccountDeleteResponse,
         )
 
 
diff --git a/src/cloudflare/resources/addressing/address_maps/address_maps.py b/src/cloudflare/resources/addressing/address_maps/address_maps.py
index 755134df84f..af03cd6994b 100644
--- a/src/cloudflare/resources/addressing/address_maps/address_maps.py
+++ b/src/cloudflare/resources/addressing/address_maps/address_maps.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Iterable, Optional, cast
+from typing import Type, Iterable, Optional, cast
 
 import httpx
 
@@ -30,11 +30,8 @@
     AccountsResourceWithStreamingResponse,
     AsyncAccountsResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -70,32 +67,43 @@ def zones(self) -> ZonesResource:
 
     @cached_property
     def with_raw_response(self) -> AddressMapsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AddressMapsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AddressMapsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AddressMapsResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        description: Optional[str] | NotGiven = NOT_GIVEN,
-        enabled: Optional[bool] | NotGiven = NOT_GIVEN,
-        ips: List[str] | NotGiven = NOT_GIVEN,
-        memberships: Iterable[address_map_create_params.Membership] | NotGiven = NOT_GIVEN,
+        description: Optional[str] | Omit = omit,
+        enabled: Optional[bool] | Omit = omit,
+        ips: SequenceNotStr[str] | Omit = omit,
+        memberships: Iterable[address_map_create_params.Membership] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AddressMapCreateResponse]:
         """
         Create a new address map under the account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
           description: An optional description field which may be used to describe the types of IPs or
               zones on the map.
@@ -146,13 +154,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[AddressMap]:
         """
         List all address maps owned by the account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
           extra_headers: Send extra headers
 
@@ -183,17 +191,17 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AddressMapDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AddressMapDeleteResponse:
         """Delete a particular address map owned by the account.
 
         An Address Map must be
         disabled before it can be deleted.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          address_map_id: Identifier
+          address_map_id: Identifier of an Address Map.
 
           extra_headers: Send extra headers
 
@@ -210,13 +218,9 @@ def delete(
         return self._delete(
             f"/accounts/{account_id}/addressing/address_maps/{address_map_id}",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[AddressMapDeleteResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[AddressMapDeleteResponse]], ResultWrapper[AddressMapDeleteResponse]),
+            cast_to=AddressMapDeleteResponse,
         )
 
     def edit(
@@ -224,23 +228,23 @@ def edit(
         address_map_id: str,
         *,
         account_id: str,
-        default_sni: Optional[str] | NotGiven = NOT_GIVEN,
-        description: Optional[str] | NotGiven = NOT_GIVEN,
-        enabled: Optional[bool] | NotGiven = NOT_GIVEN,
+        default_sni: Optional[str] | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        enabled: Optional[bool] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AddressMap]:
         """
         Modify properties of an address map owned by the account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          address_map_id: Identifier
+          address_map_id: Identifier of an Address Map.
 
           default_sni: If you have legacy TLS clients which do not send the TLS server name indicator,
               then you can specify one default SNI on the map. If Cloudflare receives a TLS
@@ -296,15 +300,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AddressMapGetResponse]:
         """
         Show a particular address map owned by the account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          address_map_id: Identifier
+          address_map_id: Identifier of an Address Map.
 
           extra_headers: Send extra headers
 
@@ -346,32 +350,43 @@ def zones(self) -> AsyncZonesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncAddressMapsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAddressMapsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAddressMapsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAddressMapsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        description: Optional[str] | NotGiven = NOT_GIVEN,
-        enabled: Optional[bool] | NotGiven = NOT_GIVEN,
-        ips: List[str] | NotGiven = NOT_GIVEN,
-        memberships: Iterable[address_map_create_params.Membership] | NotGiven = NOT_GIVEN,
+        description: Optional[str] | Omit = omit,
+        enabled: Optional[bool] | Omit = omit,
+        ips: SequenceNotStr[str] | Omit = omit,
+        memberships: Iterable[address_map_create_params.Membership] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AddressMapCreateResponse]:
         """
         Create a new address map under the account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
           description: An optional description field which may be used to describe the types of IPs or
               zones on the map.
@@ -422,13 +437,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[AddressMap, AsyncSinglePage[AddressMap]]:
         """
         List all address maps owned by the account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
           extra_headers: Send extra headers
 
@@ -459,17 +474,17 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AddressMapDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AddressMapDeleteResponse:
         """Delete a particular address map owned by the account.
 
         An Address Map must be
         disabled before it can be deleted.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          address_map_id: Identifier
+          address_map_id: Identifier of an Address Map.
 
           extra_headers: Send extra headers
 
@@ -486,13 +501,9 @@ async def delete(
         return await self._delete(
             f"/accounts/{account_id}/addressing/address_maps/{address_map_id}",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[AddressMapDeleteResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[AddressMapDeleteResponse]], ResultWrapper[AddressMapDeleteResponse]),
+            cast_to=AddressMapDeleteResponse,
         )
 
     async def edit(
@@ -500,23 +511,23 @@ async def edit(
         address_map_id: str,
         *,
         account_id: str,
-        default_sni: Optional[str] | NotGiven = NOT_GIVEN,
-        description: Optional[str] | NotGiven = NOT_GIVEN,
-        enabled: Optional[bool] | NotGiven = NOT_GIVEN,
+        default_sni: Optional[str] | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        enabled: Optional[bool] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AddressMap]:
         """
         Modify properties of an address map owned by the account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          address_map_id: Identifier
+          address_map_id: Identifier of an Address Map.
 
           default_sni: If you have legacy TLS clients which do not send the TLS server name indicator,
               then you can specify one default SNI on the map. If Cloudflare receives a TLS
@@ -572,15 +583,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AddressMapGetResponse]:
         """
         Show a particular address map owned by the account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          address_map_id: Identifier
+          address_map_id: Identifier of an Address Map.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/addressing/address_maps/ips.py b/src/cloudflare/resources/addressing/address_maps/ips.py
index e9edf9881fe..78313356374 100644
--- a/src/cloudflare/resources/addressing/address_maps/ips.py
+++ b/src/cloudflare/resources/addressing/address_maps/ips.py
@@ -2,15 +2,10 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
-
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -19,7 +14,6 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ...._wrappers import ResultWrapper
 from ...._base_client import make_request_options
 from ....types.addressing.address_maps import ip_update_params
 from ....types.addressing.address_maps.ip_delete_response import IPDeleteResponse
@@ -31,10 +25,21 @@
 class IPsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> IPsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return IPsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> IPsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return IPsResourceWithStreamingResponse(self)
 
     def update(
@@ -49,15 +54,15 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IPUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> IPUpdateResponse:
         """
         Add an IP from a prefix owned by the account to a particular address map.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          address_map_id: Identifier
+          address_map_id: Identifier of an Address Map.
 
           ip_address: An IPv4 or IPv6 address.
 
@@ -79,13 +84,9 @@ def update(
             f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/ips/{ip_address}",
             body=maybe_transform(body, ip_update_params.IPUpdateParams),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IPUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[IPUpdateResponse]], ResultWrapper[IPUpdateResponse]),
+            cast_to=IPUpdateResponse,
         )
 
     def delete(
@@ -99,15 +100,15 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IPDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> IPDeleteResponse:
         """
         Remove an IP from a particular address map.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          address_map_id: Identifier
+          address_map_id: Identifier of an Address Map.
 
           ip_address: An IPv4 or IPv6 address.
 
@@ -128,23 +129,30 @@ def delete(
         return self._delete(
             f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/ips/{ip_address}",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IPDeleteResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[IPDeleteResponse]], ResultWrapper[IPDeleteResponse]),
+            cast_to=IPDeleteResponse,
         )
 
 
 class AsyncIPsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncIPsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncIPsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncIPsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncIPsResourceWithStreamingResponse(self)
 
     async def update(
@@ -159,15 +167,15 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IPUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> IPUpdateResponse:
         """
         Add an IP from a prefix owned by the account to a particular address map.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          address_map_id: Identifier
+          address_map_id: Identifier of an Address Map.
 
           ip_address: An IPv4 or IPv6 address.
 
@@ -189,13 +197,9 @@ async def update(
             f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/ips/{ip_address}",
             body=await async_maybe_transform(body, ip_update_params.IPUpdateParams),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IPUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[IPUpdateResponse]], ResultWrapper[IPUpdateResponse]),
+            cast_to=IPUpdateResponse,
         )
 
     async def delete(
@@ -209,15 +213,15 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IPDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> IPDeleteResponse:
         """
         Remove an IP from a particular address map.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          address_map_id: Identifier
+          address_map_id: Identifier of an Address Map.
 
           ip_address: An IPv4 or IPv6 address.
 
@@ -238,13 +242,9 @@ async def delete(
         return await self._delete(
             f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/ips/{ip_address}",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IPDeleteResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[IPDeleteResponse]], ResultWrapper[IPDeleteResponse]),
+            cast_to=IPDeleteResponse,
         )
 
 
diff --git a/src/cloudflare/resources/addressing/address_maps/zones.py b/src/cloudflare/resources/addressing/address_maps/zones.py
index cf592d92645..e6ac1d4e043 100644
--- a/src/cloudflare/resources/addressing/address_maps/zones.py
+++ b/src/cloudflare/resources/addressing/address_maps/zones.py
@@ -2,15 +2,10 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
-
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -19,7 +14,6 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ...._wrappers import ResultWrapper
 from ...._base_client import make_request_options
 from ....types.addressing.address_maps import zone_update_params
 from ....types.addressing.address_maps.zone_delete_response import ZoneDeleteResponse
@@ -31,10 +25,21 @@
 class ZonesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ZonesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ZonesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ZonesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ZonesResourceWithStreamingResponse(self)
 
     def update(
@@ -49,17 +54,17 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ZoneUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ZoneUpdateResponse:
         """
         Add a zone as a member of a particular address map.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier of a zone.
 
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          address_map_id: Identifier
+          address_map_id: Identifier of an Address Map.
 
           extra_headers: Send extra headers
 
@@ -79,13 +84,9 @@ def update(
             f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/zones/{zone_id}",
             body=maybe_transform(body, zone_update_params.ZoneUpdateParams),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ZoneUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[ZoneUpdateResponse]], ResultWrapper[ZoneUpdateResponse]),
+            cast_to=ZoneUpdateResponse,
         )
 
     def delete(
@@ -99,17 +100,17 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ZoneDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ZoneDeleteResponse:
         """
         Remove a zone as a member of a particular address map.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier of a zone.
 
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          address_map_id: Identifier
+          address_map_id: Identifier of an Address Map.
 
           extra_headers: Send extra headers
 
@@ -128,23 +129,30 @@ def delete(
         return self._delete(
             f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/zones/{zone_id}",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ZoneDeleteResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[ZoneDeleteResponse]], ResultWrapper[ZoneDeleteResponse]),
+            cast_to=ZoneDeleteResponse,
         )
 
 
 class AsyncZonesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncZonesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncZonesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncZonesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncZonesResourceWithStreamingResponse(self)
 
     async def update(
@@ -159,17 +167,17 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ZoneUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ZoneUpdateResponse:
         """
         Add a zone as a member of a particular address map.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier of a zone.
 
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          address_map_id: Identifier
+          address_map_id: Identifier of an Address Map.
 
           extra_headers: Send extra headers
 
@@ -189,13 +197,9 @@ async def update(
             f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/zones/{zone_id}",
             body=await async_maybe_transform(body, zone_update_params.ZoneUpdateParams),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ZoneUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[ZoneUpdateResponse]], ResultWrapper[ZoneUpdateResponse]),
+            cast_to=ZoneUpdateResponse,
         )
 
     async def delete(
@@ -209,17 +213,17 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ZoneDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ZoneDeleteResponse:
         """
         Remove a zone as a member of a particular address map.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier of a zone.
 
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          address_map_id: Identifier
+          address_map_id: Identifier of an Address Map.
 
           extra_headers: Send extra headers
 
@@ -238,13 +242,9 @@ async def delete(
         return await self._delete(
             f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/zones/{zone_id}",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ZoneDeleteResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[ZoneDeleteResponse]], ResultWrapper[ZoneDeleteResponse]),
+            cast_to=ZoneDeleteResponse,
         )
 
 
diff --git a/src/cloudflare/resources/addressing/addressing.py b/src/cloudflare/resources/addressing/addressing.py
index 8157035d32f..2ddc2d78362 100644
--- a/src/cloudflare/resources/addressing/addressing.py
+++ b/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,14 +12,6 @@
 )
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
-from .address_maps import (
-    AddressMapsResource,
-    AsyncAddressMapsResource,
-    AddressMapsResourceWithRawResponse,
-    AsyncAddressMapsResourceWithRawResponse,
-    AddressMapsResourceWithStreamingResponse,
-    AsyncAddressMapsResourceWithStreamingResponse,
-)
 from .loa_documents import (
     LOADocumentsResource,
     AsyncLOADocumentsResource,
@@ -36,8 +20,23 @@
     LOADocumentsResourceWithStreamingResponse,
     AsyncLOADocumentsResourceWithStreamingResponse,
 )
-from .prefixes.prefixes import PrefixesResource, AsyncPrefixesResource
-from .regional_hostnames import (
+from .prefixes.prefixes import (
+    PrefixesResource,
+    AsyncPrefixesResource,
+    PrefixesResourceWithRawResponse,
+    AsyncPrefixesResourceWithRawResponse,
+    PrefixesResourceWithStreamingResponse,
+    AsyncPrefixesResourceWithStreamingResponse,
+)
+from .address_maps.address_maps import (
+    AddressMapsResource,
+    AsyncAddressMapsResource,
+    AddressMapsResourceWithRawResponse,
+    AsyncAddressMapsResourceWithRawResponse,
+    AddressMapsResourceWithStreamingResponse,
+    AsyncAddressMapsResourceWithStreamingResponse,
+)
+from .regional_hostnames.regional_hostnames import (
     RegionalHostnamesResource,
     AsyncRegionalHostnamesResource,
     RegionalHostnamesResourceWithRawResponse,
@@ -45,9 +44,6 @@
     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"]
 
@@ -75,10 +71,21 @@ def prefixes(self) -> PrefixesResource:
 
     @cached_property
     def with_raw_response(self) -> AddressingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AddressingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AddressingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AddressingResourceWithStreamingResponse(self)
 
 
@@ -105,10 +112,21 @@ def prefixes(self) -> AsyncPrefixesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncAddressingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAddressingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAddressingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAddressingResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/addressing/loa_documents.py b/src/cloudflare/resources/addressing/loa_documents.py
new file mode 100644
index 00000000000..a1765c32f97
--- /dev/null
+++ b/src/cloudflare/resources/addressing/loa_documents.py
@@ -0,0 +1,304 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    BinaryAPIResponse,
+    AsyncBinaryAPIResponse,
+    StreamedBinaryAPIResponse,
+    AsyncStreamedBinaryAPIResponse,
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    to_custom_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+    to_custom_streamed_response_wrapper,
+    async_to_custom_raw_response_wrapper,
+    async_to_custom_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.addressing import loa_document_create_params
+from ...types.addressing.loa_document_create_response import LOADocumentCreateResponse
+
+__all__ = ["LOADocumentsResource", "AsyncLOADocumentsResource"]
+
+
+class LOADocumentsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> LOADocumentsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return LOADocumentsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> LOADocumentsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return LOADocumentsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        loa_document: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[LOADocumentCreateResponse]:
+        """
+        Submit LOA document (pdf format) under the account.
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          loa_document: LOA document to upload.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        # It should be noted that the actual Content-Type header that will be
+        # sent to the server will contain a `boundary` parameter, e.g.
+        # multipart/form-data; boundary=---abc--
+        extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
+        return self._post(
+            f"/accounts/{account_id}/addressing/loa_documents",
+            body=maybe_transform({"loa_document": loa_document}, loa_document_create_params.LOADocumentCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[LOADocumentCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[LOADocumentCreateResponse]], ResultWrapper[LOADocumentCreateResponse]),
+        )
+
+    def get(
+        self,
+        loa_document_id: Optional[str],
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BinaryAPIResponse:
+        """
+        Download specified LOA document under the account.
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          loa_document_id: Identifier for the uploaded LOA document.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not loa_document_id:
+            raise ValueError(f"Expected a non-empty value for `loa_document_id` but received {loa_document_id!r}")
+        extra_headers = {"Accept": "application/pdf", **(extra_headers or {})}
+        return self._get(
+            f"/accounts/{account_id}/addressing/loa_documents/{loa_document_id}/download",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=BinaryAPIResponse,
+        )
+
+
+class AsyncLOADocumentsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncLOADocumentsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncLOADocumentsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncLOADocumentsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncLOADocumentsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        loa_document: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[LOADocumentCreateResponse]:
+        """
+        Submit LOA document (pdf format) under the account.
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          loa_document: LOA document to upload.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        # It should be noted that the actual Content-Type header that will be
+        # sent to the server will contain a `boundary` parameter, e.g.
+        # multipart/form-data; boundary=---abc--
+        extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
+        return await self._post(
+            f"/accounts/{account_id}/addressing/loa_documents",
+            body=await async_maybe_transform(
+                {"loa_document": loa_document}, loa_document_create_params.LOADocumentCreateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[LOADocumentCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[LOADocumentCreateResponse]], ResultWrapper[LOADocumentCreateResponse]),
+        )
+
+    async def get(
+        self,
+        loa_document_id: Optional[str],
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncBinaryAPIResponse:
+        """
+        Download specified LOA document under the account.
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          loa_document_id: Identifier for the uploaded LOA document.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not loa_document_id:
+            raise ValueError(f"Expected a non-empty value for `loa_document_id` but received {loa_document_id!r}")
+        extra_headers = {"Accept": "application/pdf", **(extra_headers or {})}
+        return await self._get(
+            f"/accounts/{account_id}/addressing/loa_documents/{loa_document_id}/download",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=AsyncBinaryAPIResponse,
+        )
+
+
+class LOADocumentsResourceWithRawResponse:
+    def __init__(self, loa_documents: LOADocumentsResource) -> None:
+        self._loa_documents = loa_documents
+
+        self.create = to_raw_response_wrapper(
+            loa_documents.create,
+        )
+        self.get = to_custom_raw_response_wrapper(
+            loa_documents.get,
+            BinaryAPIResponse,
+        )
+
+
+class AsyncLOADocumentsResourceWithRawResponse:
+    def __init__(self, loa_documents: AsyncLOADocumentsResource) -> None:
+        self._loa_documents = loa_documents
+
+        self.create = async_to_raw_response_wrapper(
+            loa_documents.create,
+        )
+        self.get = async_to_custom_raw_response_wrapper(
+            loa_documents.get,
+            AsyncBinaryAPIResponse,
+        )
+
+
+class LOADocumentsResourceWithStreamingResponse:
+    def __init__(self, loa_documents: LOADocumentsResource) -> None:
+        self._loa_documents = loa_documents
+
+        self.create = to_streamed_response_wrapper(
+            loa_documents.create,
+        )
+        self.get = to_custom_streamed_response_wrapper(
+            loa_documents.get,
+            StreamedBinaryAPIResponse,
+        )
+
+
+class AsyncLOADocumentsResourceWithStreamingResponse:
+    def __init__(self, loa_documents: AsyncLOADocumentsResource) -> None:
+        self._loa_documents = loa_documents
+
+        self.create = async_to_streamed_response_wrapper(
+            loa_documents.create,
+        )
+        self.get = async_to_custom_streamed_response_wrapper(
+            loa_documents.get,
+            AsyncStreamedBinaryAPIResponse,
+        )
diff --git a/src/cloudflare/resources/addressing/loa_documents/__init__.py b/src/cloudflare/resources/addressing/loa_documents/__init__.py
deleted file mode 100644
index 72f6dbba90c..00000000000
--- a/src/cloudflare/resources/addressing/loa_documents/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from .downloads import (
-    DownloadsResource,
-    AsyncDownloadsResource,
-    DownloadsResourceWithRawResponse,
-    AsyncDownloadsResourceWithRawResponse,
-    DownloadsResourceWithStreamingResponse,
-    AsyncDownloadsResourceWithStreamingResponse,
-)
-from .loa_documents import (
-    LOADocumentsResource,
-    AsyncLOADocumentsResource,
-    LOADocumentsResourceWithRawResponse,
-    AsyncLOADocumentsResourceWithRawResponse,
-    LOADocumentsResourceWithStreamingResponse,
-    AsyncLOADocumentsResourceWithStreamingResponse,
-)
-
-__all__ = [
-    "DownloadsResource",
-    "AsyncDownloadsResource",
-    "DownloadsResourceWithRawResponse",
-    "AsyncDownloadsResourceWithRawResponse",
-    "DownloadsResourceWithStreamingResponse",
-    "AsyncDownloadsResourceWithStreamingResponse",
-    "LOADocumentsResource",
-    "AsyncLOADocumentsResource",
-    "LOADocumentsResourceWithRawResponse",
-    "AsyncLOADocumentsResourceWithRawResponse",
-    "LOADocumentsResourceWithStreamingResponse",
-    "AsyncLOADocumentsResourceWithStreamingResponse",
-]
diff --git a/src/cloudflare/resources/addressing/loa_documents/downloads.py b/src/cloudflare/resources/addressing/loa_documents/downloads.py
deleted file mode 100644
index 5540d005306..00000000000
--- a/src/cloudflare/resources/addressing/loa_documents/downloads.py
+++ /dev/null
@@ -1,166 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Optional
-
-import httpx
-
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    BinaryAPIResponse,
-    AsyncBinaryAPIResponse,
-    StreamedBinaryAPIResponse,
-    AsyncStreamedBinaryAPIResponse,
-    to_custom_raw_response_wrapper,
-    to_custom_streamed_response_wrapper,
-    async_to_custom_raw_response_wrapper,
-    async_to_custom_streamed_response_wrapper,
-)
-from ...._base_client import make_request_options
-
-__all__ = ["DownloadsResource", "AsyncDownloadsResource"]
-
-
-class DownloadsResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> DownloadsResourceWithRawResponse:
-        return DownloadsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> DownloadsResourceWithStreamingResponse:
-        return DownloadsResourceWithStreamingResponse(self)
-
-    def get(
-        self,
-        loa_document_id: Optional[str],
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> BinaryAPIResponse:
-        """
-        Download specified LOA document under the account.
-
-        Args:
-          account_id: Identifier
-
-          loa_document_id: Identifier for the uploaded LOA document.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not loa_document_id:
-            raise ValueError(f"Expected a non-empty value for `loa_document_id` but received {loa_document_id!r}")
-        extra_headers = {"Accept": "application/pdf", **(extra_headers or {})}
-        return self._get(
-            f"/accounts/{account_id}/addressing/loa_documents/{loa_document_id}/download",
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=BinaryAPIResponse,
-        )
-
-
-class AsyncDownloadsResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncDownloadsResourceWithRawResponse:
-        return AsyncDownloadsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncDownloadsResourceWithStreamingResponse:
-        return AsyncDownloadsResourceWithStreamingResponse(self)
-
-    async def get(
-        self,
-        loa_document_id: Optional[str],
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncBinaryAPIResponse:
-        """
-        Download specified LOA document under the account.
-
-        Args:
-          account_id: Identifier
-
-          loa_document_id: Identifier for the uploaded LOA document.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not loa_document_id:
-            raise ValueError(f"Expected a non-empty value for `loa_document_id` but received {loa_document_id!r}")
-        extra_headers = {"Accept": "application/pdf", **(extra_headers or {})}
-        return await self._get(
-            f"/accounts/{account_id}/addressing/loa_documents/{loa_document_id}/download",
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=AsyncBinaryAPIResponse,
-        )
-
-
-class DownloadsResourceWithRawResponse:
-    def __init__(self, downloads: DownloadsResource) -> None:
-        self._downloads = downloads
-
-        self.get = to_custom_raw_response_wrapper(
-            downloads.get,
-            BinaryAPIResponse,
-        )
-
-
-class AsyncDownloadsResourceWithRawResponse:
-    def __init__(self, downloads: AsyncDownloadsResource) -> None:
-        self._downloads = downloads
-
-        self.get = async_to_custom_raw_response_wrapper(
-            downloads.get,
-            AsyncBinaryAPIResponse,
-        )
-
-
-class DownloadsResourceWithStreamingResponse:
-    def __init__(self, downloads: DownloadsResource) -> None:
-        self._downloads = downloads
-
-        self.get = to_custom_streamed_response_wrapper(
-            downloads.get,
-            StreamedBinaryAPIResponse,
-        )
-
-
-class AsyncDownloadsResourceWithStreamingResponse:
-    def __init__(self, downloads: AsyncDownloadsResource) -> None:
-        self._downloads = downloads
-
-        self.get = async_to_custom_streamed_response_wrapper(
-            downloads.get,
-            AsyncStreamedBinaryAPIResponse,
-        )
diff --git a/src/cloudflare/resources/addressing/loa_documents/loa_documents.py b/src/cloudflare/resources/addressing/loa_documents/loa_documents.py
deleted file mode 100644
index a783c0551a0..00000000000
--- a/src/cloudflare/resources/addressing/loa_documents/loa_documents.py
+++ /dev/null
@@ -1,211 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Optional, cast
-
-import httpx
-
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from .downloads import (
-    DownloadsResource,
-    AsyncDownloadsResource,
-    DownloadsResourceWithRawResponse,
-    AsyncDownloadsResourceWithRawResponse,
-    DownloadsResourceWithStreamingResponse,
-    AsyncDownloadsResourceWithStreamingResponse,
-)
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
-from ....types.addressing import loa_document_create_params
-from ....types.addressing.loa_document_create_response import LOADocumentCreateResponse
-
-__all__ = ["LOADocumentsResource", "AsyncLOADocumentsResource"]
-
-
-class LOADocumentsResource(SyncAPIResource):
-    @cached_property
-    def downloads(self) -> DownloadsResource:
-        return DownloadsResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> LOADocumentsResourceWithRawResponse:
-        return LOADocumentsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> LOADocumentsResourceWithStreamingResponse:
-        return LOADocumentsResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        *,
-        account_id: str,
-        loa_document: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[LOADocumentCreateResponse]:
-        """
-        Submit LOA document (pdf format) under the account.
-
-        Args:
-          account_id: Identifier
-
-          loa_document: LOA document to upload.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        # It should be noted that the actual Content-Type header that will be
-        # sent to the server will contain a `boundary` parameter, e.g.
-        # multipart/form-data; boundary=---abc--
-        extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
-        return self._post(
-            f"/accounts/{account_id}/addressing/loa_documents",
-            body=maybe_transform({"loa_document": loa_document}, loa_document_create_params.LOADocumentCreateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[LOADocumentCreateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[LOADocumentCreateResponse]], ResultWrapper[LOADocumentCreateResponse]),
-        )
-
-
-class AsyncLOADocumentsResource(AsyncAPIResource):
-    @cached_property
-    def downloads(self) -> AsyncDownloadsResource:
-        return AsyncDownloadsResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncLOADocumentsResourceWithRawResponse:
-        return AsyncLOADocumentsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncLOADocumentsResourceWithStreamingResponse:
-        return AsyncLOADocumentsResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        *,
-        account_id: str,
-        loa_document: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[LOADocumentCreateResponse]:
-        """
-        Submit LOA document (pdf format) under the account.
-
-        Args:
-          account_id: Identifier
-
-          loa_document: LOA document to upload.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        # It should be noted that the actual Content-Type header that will be
-        # sent to the server will contain a `boundary` parameter, e.g.
-        # multipart/form-data; boundary=---abc--
-        extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
-        return await self._post(
-            f"/accounts/{account_id}/addressing/loa_documents",
-            body=await async_maybe_transform(
-                {"loa_document": loa_document}, loa_document_create_params.LOADocumentCreateParams
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[LOADocumentCreateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[LOADocumentCreateResponse]], ResultWrapper[LOADocumentCreateResponse]),
-        )
-
-
-class LOADocumentsResourceWithRawResponse:
-    def __init__(self, loa_documents: LOADocumentsResource) -> None:
-        self._loa_documents = loa_documents
-
-        self.create = to_raw_response_wrapper(
-            loa_documents.create,
-        )
-
-    @cached_property
-    def downloads(self) -> DownloadsResourceWithRawResponse:
-        return DownloadsResourceWithRawResponse(self._loa_documents.downloads)
-
-
-class AsyncLOADocumentsResourceWithRawResponse:
-    def __init__(self, loa_documents: AsyncLOADocumentsResource) -> None:
-        self._loa_documents = loa_documents
-
-        self.create = async_to_raw_response_wrapper(
-            loa_documents.create,
-        )
-
-    @cached_property
-    def downloads(self) -> AsyncDownloadsResourceWithRawResponse:
-        return AsyncDownloadsResourceWithRawResponse(self._loa_documents.downloads)
-
-
-class LOADocumentsResourceWithStreamingResponse:
-    def __init__(self, loa_documents: LOADocumentsResource) -> None:
-        self._loa_documents = loa_documents
-
-        self.create = to_streamed_response_wrapper(
-            loa_documents.create,
-        )
-
-    @cached_property
-    def downloads(self) -> DownloadsResourceWithStreamingResponse:
-        return DownloadsResourceWithStreamingResponse(self._loa_documents.downloads)
-
-
-class AsyncLOADocumentsResourceWithStreamingResponse:
-    def __init__(self, loa_documents: AsyncLOADocumentsResource) -> None:
-        self._loa_documents = loa_documents
-
-        self.create = async_to_streamed_response_wrapper(
-            loa_documents.create,
-        )
-
-    @cached_property
-    def downloads(self) -> AsyncDownloadsResourceWithStreamingResponse:
-        return AsyncDownloadsResourceWithStreamingResponse(self._loa_documents.downloads)
diff --git a/src/cloudflare/resources/addressing/prefixes/__init__.py b/src/cloudflare/resources/addressing/prefixes/__init__.py
index baf5dcefd16..89ce6e1fa39 100644
--- a/src/cloudflare/resources/addressing/prefixes/__init__.py
+++ b/src/cloudflare/resources/addressing/prefixes/__init__.py
@@ -1,13 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from .bgp import (
-    BGPResource,
-    AsyncBGPResource,
-    BGPResourceWithRawResponse,
-    AsyncBGPResourceWithRawResponse,
-    BGPResourceWithStreamingResponse,
-    AsyncBGPResourceWithStreamingResponse,
-)
 from .prefixes import (
     PrefixesResource,
     AsyncPrefixesResource,
@@ -24,14 +16,50 @@
     DelegationsResourceWithStreamingResponse,
     AsyncDelegationsResourceWithStreamingResponse,
 )
+from .bgp_prefixes import (
+    BGPPrefixesResource,
+    AsyncBGPPrefixesResource,
+    BGPPrefixesResourceWithRawResponse,
+    AsyncBGPPrefixesResourceWithRawResponse,
+    BGPPrefixesResourceWithStreamingResponse,
+    AsyncBGPPrefixesResourceWithStreamingResponse,
+)
+from .service_bindings import (
+    ServiceBindingsResource,
+    AsyncServiceBindingsResource,
+    ServiceBindingsResourceWithRawResponse,
+    AsyncServiceBindingsResourceWithRawResponse,
+    ServiceBindingsResourceWithStreamingResponse,
+    AsyncServiceBindingsResourceWithStreamingResponse,
+)
+from .advertisement_status import (
+    AdvertisementStatusResource,
+    AsyncAdvertisementStatusResource,
+    AdvertisementStatusResourceWithRawResponse,
+    AsyncAdvertisementStatusResourceWithRawResponse,
+    AdvertisementStatusResourceWithStreamingResponse,
+    AsyncAdvertisementStatusResourceWithStreamingResponse,
+)
 
 __all__ = [
-    "BGPResource",
-    "AsyncBGPResource",
-    "BGPResourceWithRawResponse",
-    "AsyncBGPResourceWithRawResponse",
-    "BGPResourceWithStreamingResponse",
-    "AsyncBGPResourceWithStreamingResponse",
+    "ServiceBindingsResource",
+    "AsyncServiceBindingsResource",
+    "ServiceBindingsResourceWithRawResponse",
+    "AsyncServiceBindingsResourceWithRawResponse",
+    "ServiceBindingsResourceWithStreamingResponse",
+    "AsyncServiceBindingsResourceWithStreamingResponse",
+    "BGPPrefixesResource",
+    "AsyncBGPPrefixesResource",
+    "BGPPrefixesResourceWithRawResponse",
+    "AsyncBGPPrefixesResourceWithRawResponse",
+    "BGPPrefixesResourceWithStreamingResponse",
+    "AsyncBGPPrefixesResourceWithStreamingResponse",
+    "AdvertisementStatusResource",
+    "AsyncAdvertisementStatusResource",
+    "AdvertisementStatusResourceWithRawResponse",
+    "AsyncAdvertisementStatusResourceWithRawResponse",
+    "AdvertisementStatusResourceWithStreamingResponse",
+    "AsyncAdvertisementStatusResourceWithStreamingResponse",
     "DelegationsResource",
     "AsyncDelegationsResource",
     "DelegationsResourceWithRawResponse",
diff --git a/src/cloudflare/resources/addressing/prefixes/advertisement_status.py b/src/cloudflare/resources/addressing/prefixes/advertisement_status.py
new file mode 100644
index 00000000000..7b71630f5b2
--- /dev/null
+++ b/src/cloudflare/resources/addressing/prefixes/advertisement_status.py
@@ -0,0 +1,342 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import typing_extensions
+from typing import Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.addressing.prefixes import advertisement_status_edit_params
+from ....types.addressing.prefixes.advertisement_status_get_response import AdvertisementStatusGetResponse
+from ....types.addressing.prefixes.advertisement_status_edit_response import AdvertisementStatusEditResponse
+
+__all__ = ["AdvertisementStatusResource", "AsyncAdvertisementStatusResource"]
+
+
+class AdvertisementStatusResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AdvertisementStatusResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AdvertisementStatusResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AdvertisementStatusResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AdvertisementStatusResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated("deprecated")
+    def edit(
+        self,
+        prefix_id: str,
+        *,
+        account_id: str,
+        advertised: bool,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AdvertisementStatusEditResponse]:
+        """
+        Advertise or withdraw the BGP route for a prefix.
+
+        **Deprecated:** Prefer the BGP Prefixes endpoints, which additionally allow for
+        advertising and withdrawing subnets of an IP prefix.
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          advertised: Advertisement status of the prefix. If `true`, the BGP route for the prefix is
+              advertised to the Internet. If `false`, the BGP route is withdrawn.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/status",
+            body=maybe_transform(
+                {"advertised": advertised}, advertisement_status_edit_params.AdvertisementStatusEditParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AdvertisementStatusEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[AdvertisementStatusEditResponse]], ResultWrapper[AdvertisementStatusEditResponse]
+            ),
+        )
+
+    @typing_extensions.deprecated("deprecated")
+    def get(
+        self,
+        prefix_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AdvertisementStatusGetResponse]:
+        """
+        View the current advertisement state for a prefix.
+
+        **Deprecated:** Prefer the BGP Prefixes endpoints, which additionally allow for
+        advertising and withdrawing subnets of an IP prefix.
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/status",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AdvertisementStatusGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AdvertisementStatusGetResponse]], ResultWrapper[AdvertisementStatusGetResponse]),
+        )
+
+
+class AsyncAdvertisementStatusResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncAdvertisementStatusResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAdvertisementStatusResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAdvertisementStatusResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAdvertisementStatusResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated("deprecated")
+    async def edit(
+        self,
+        prefix_id: str,
+        *,
+        account_id: str,
+        advertised: bool,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AdvertisementStatusEditResponse]:
+        """
+        Advertise or withdraw the BGP route for a prefix.
+
+        **Deprecated:** Prefer the BGP Prefixes endpoints, which additionally allow for
+        advertising and withdrawing subnets of an IP prefix.
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          advertised: Advertisement status of the prefix. If `true`, the BGP route for the prefix is
+              advertised to the Internet. If `false`, the BGP route is withdrawn.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/status",
+            body=await async_maybe_transform(
+                {"advertised": advertised}, advertisement_status_edit_params.AdvertisementStatusEditParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AdvertisementStatusEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[AdvertisementStatusEditResponse]], ResultWrapper[AdvertisementStatusEditResponse]
+            ),
+        )
+
+    @typing_extensions.deprecated("deprecated")
+    async def get(
+        self,
+        prefix_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AdvertisementStatusGetResponse]:
+        """
+        View the current advertisement state for a prefix.
+
+        **Deprecated:** Prefer the BGP Prefixes endpoints, which additionally allow for
+        advertising and withdrawing subnets of an IP prefix.
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/status",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AdvertisementStatusGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AdvertisementStatusGetResponse]], ResultWrapper[AdvertisementStatusGetResponse]),
+        )
+
+
+class AdvertisementStatusResourceWithRawResponse:
+    def __init__(self, advertisement_status: AdvertisementStatusResource) -> None:
+        self._advertisement_status = advertisement_status
+
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                advertisement_status.edit,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                advertisement_status.get,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncAdvertisementStatusResourceWithRawResponse:
+    def __init__(self, advertisement_status: AsyncAdvertisementStatusResource) -> None:
+        self._advertisement_status = advertisement_status
+
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                advertisement_status.edit,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                advertisement_status.get,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AdvertisementStatusResourceWithStreamingResponse:
+    def __init__(self, advertisement_status: AdvertisementStatusResource) -> None:
+        self._advertisement_status = advertisement_status
+
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                advertisement_status.edit,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                advertisement_status.get,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncAdvertisementStatusResourceWithStreamingResponse:
+    def __init__(self, advertisement_status: AsyncAdvertisementStatusResource) -> None:
+        self._advertisement_status = advertisement_status
+
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                advertisement_status.edit,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                advertisement_status.get,  # pyright: ignore[reportDeprecated],
+            )
+        )
diff --git a/src/cloudflare/resources/addressing/prefixes/bgp/__init__.py b/src/cloudflare/resources/addressing/prefixes/bgp/__init__.py
deleted file mode 100644
index 8c3709d72cc..00000000000
--- a/src/cloudflare/resources/addressing/prefixes/bgp/__init__.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from .bgp import (
-    BGPResource,
-    AsyncBGPResource,
-    BGPResourceWithRawResponse,
-    AsyncBGPResourceWithRawResponse,
-    BGPResourceWithStreamingResponse,
-    AsyncBGPResourceWithStreamingResponse,
-)
-from .bindings import (
-    BindingsResource,
-    AsyncBindingsResource,
-    BindingsResourceWithRawResponse,
-    AsyncBindingsResourceWithRawResponse,
-    BindingsResourceWithStreamingResponse,
-    AsyncBindingsResourceWithStreamingResponse,
-)
-from .prefixes import (
-    PrefixesResource,
-    AsyncPrefixesResource,
-    PrefixesResourceWithRawResponse,
-    AsyncPrefixesResourceWithRawResponse,
-    PrefixesResourceWithStreamingResponse,
-    AsyncPrefixesResourceWithStreamingResponse,
-)
-from .statuses import (
-    StatusesResource,
-    AsyncStatusesResource,
-    StatusesResourceWithRawResponse,
-    AsyncStatusesResourceWithRawResponse,
-    StatusesResourceWithStreamingResponse,
-    AsyncStatusesResourceWithStreamingResponse,
-)
-
-__all__ = [
-    "BindingsResource",
-    "AsyncBindingsResource",
-    "BindingsResourceWithRawResponse",
-    "AsyncBindingsResourceWithRawResponse",
-    "BindingsResourceWithStreamingResponse",
-    "AsyncBindingsResourceWithStreamingResponse",
-    "PrefixesResource",
-    "AsyncPrefixesResource",
-    "PrefixesResourceWithRawResponse",
-    "AsyncPrefixesResourceWithRawResponse",
-    "PrefixesResourceWithStreamingResponse",
-    "AsyncPrefixesResourceWithStreamingResponse",
-    "StatusesResource",
-    "AsyncStatusesResource",
-    "StatusesResourceWithRawResponse",
-    "AsyncStatusesResourceWithRawResponse",
-    "StatusesResourceWithStreamingResponse",
-    "AsyncStatusesResourceWithStreamingResponse",
-    "BGPResource",
-    "AsyncBGPResource",
-    "BGPResourceWithRawResponse",
-    "AsyncBGPResourceWithRawResponse",
-    "BGPResourceWithStreamingResponse",
-    "AsyncBGPResourceWithStreamingResponse",
-]
diff --git a/src/cloudflare/resources/addressing/prefixes/bgp/bgp.py b/src/cloudflare/resources/addressing/prefixes/bgp/bgp.py
deleted file mode 100644
index 4b5ec4fa6d6..00000000000
--- a/src/cloudflare/resources/addressing/prefixes/bgp/bgp.py
+++ /dev/null
@@ -1,144 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from .bindings import (
-    BindingsResource,
-    AsyncBindingsResource,
-    BindingsResourceWithRawResponse,
-    AsyncBindingsResourceWithRawResponse,
-    BindingsResourceWithStreamingResponse,
-    AsyncBindingsResourceWithStreamingResponse,
-)
-from .prefixes import (
-    PrefixesResource,
-    AsyncPrefixesResource,
-    PrefixesResourceWithRawResponse,
-    AsyncPrefixesResourceWithRawResponse,
-    PrefixesResourceWithStreamingResponse,
-    AsyncPrefixesResourceWithStreamingResponse,
-)
-from .statuses import (
-    StatusesResource,
-    AsyncStatusesResource,
-    StatusesResourceWithRawResponse,
-    AsyncStatusesResourceWithRawResponse,
-    StatusesResourceWithStreamingResponse,
-    AsyncStatusesResourceWithStreamingResponse,
-)
-from ....._compat import cached_property
-from ....._resource import SyncAPIResource, AsyncAPIResource
-
-__all__ = ["BGPResource", "AsyncBGPResource"]
-
-
-class BGPResource(SyncAPIResource):
-    @cached_property
-    def bindings(self) -> BindingsResource:
-        return BindingsResource(self._client)
-
-    @cached_property
-    def prefixes(self) -> PrefixesResource:
-        return PrefixesResource(self._client)
-
-    @cached_property
-    def statuses(self) -> StatusesResource:
-        return StatusesResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> BGPResourceWithRawResponse:
-        return BGPResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> BGPResourceWithStreamingResponse:
-        return BGPResourceWithStreamingResponse(self)
-
-
-class AsyncBGPResource(AsyncAPIResource):
-    @cached_property
-    def bindings(self) -> AsyncBindingsResource:
-        return AsyncBindingsResource(self._client)
-
-    @cached_property
-    def prefixes(self) -> AsyncPrefixesResource:
-        return AsyncPrefixesResource(self._client)
-
-    @cached_property
-    def statuses(self) -> AsyncStatusesResource:
-        return AsyncStatusesResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncBGPResourceWithRawResponse:
-        return AsyncBGPResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncBGPResourceWithStreamingResponse:
-        return AsyncBGPResourceWithStreamingResponse(self)
-
-
-class BGPResourceWithRawResponse:
-    def __init__(self, bgp: BGPResource) -> None:
-        self._bgp = bgp
-
-    @cached_property
-    def bindings(self) -> BindingsResourceWithRawResponse:
-        return BindingsResourceWithRawResponse(self._bgp.bindings)
-
-    @cached_property
-    def prefixes(self) -> PrefixesResourceWithRawResponse:
-        return PrefixesResourceWithRawResponse(self._bgp.prefixes)
-
-    @cached_property
-    def statuses(self) -> StatusesResourceWithRawResponse:
-        return StatusesResourceWithRawResponse(self._bgp.statuses)
-
-
-class AsyncBGPResourceWithRawResponse:
-    def __init__(self, bgp: AsyncBGPResource) -> None:
-        self._bgp = bgp
-
-    @cached_property
-    def bindings(self) -> AsyncBindingsResourceWithRawResponse:
-        return AsyncBindingsResourceWithRawResponse(self._bgp.bindings)
-
-    @cached_property
-    def prefixes(self) -> AsyncPrefixesResourceWithRawResponse:
-        return AsyncPrefixesResourceWithRawResponse(self._bgp.prefixes)
-
-    @cached_property
-    def statuses(self) -> AsyncStatusesResourceWithRawResponse:
-        return AsyncStatusesResourceWithRawResponse(self._bgp.statuses)
-
-
-class BGPResourceWithStreamingResponse:
-    def __init__(self, bgp: BGPResource) -> None:
-        self._bgp = bgp
-
-    @cached_property
-    def bindings(self) -> BindingsResourceWithStreamingResponse:
-        return BindingsResourceWithStreamingResponse(self._bgp.bindings)
-
-    @cached_property
-    def prefixes(self) -> PrefixesResourceWithStreamingResponse:
-        return PrefixesResourceWithStreamingResponse(self._bgp.prefixes)
-
-    @cached_property
-    def statuses(self) -> StatusesResourceWithStreamingResponse:
-        return StatusesResourceWithStreamingResponse(self._bgp.statuses)
-
-
-class AsyncBGPResourceWithStreamingResponse:
-    def __init__(self, bgp: AsyncBGPResource) -> None:
-        self._bgp = bgp
-
-    @cached_property
-    def bindings(self) -> AsyncBindingsResourceWithStreamingResponse:
-        return AsyncBindingsResourceWithStreamingResponse(self._bgp.bindings)
-
-    @cached_property
-    def prefixes(self) -> AsyncPrefixesResourceWithStreamingResponse:
-        return AsyncPrefixesResourceWithStreamingResponse(self._bgp.prefixes)
-
-    @cached_property
-    def statuses(self) -> AsyncStatusesResourceWithStreamingResponse:
-        return AsyncStatusesResourceWithStreamingResponse(self._bgp.statuses)
diff --git a/src/cloudflare/resources/addressing/prefixes/bgp/bindings.py b/src/cloudflare/resources/addressing/prefixes/bgp/bindings.py
deleted file mode 100644
index a2c7b0f566e..00000000000
--- a/src/cloudflare/resources/addressing/prefixes/bgp/bindings.py
+++ /dev/null
@@ -1,523 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Optional, cast
-
-import httpx
-
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ....._compat import cached_property
-from ....._resource import SyncAPIResource, AsyncAPIResource
-from ....._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ....._wrappers import ResultWrapper
-from .....pagination import SyncSinglePage, AsyncSinglePage
-from ....._base_client import AsyncPaginator, make_request_options
-from .....types.addressing.prefixes.bgp import binding_create_params
-from .....types.addressing.prefixes.bgp.service_binding import ServiceBinding
-from .....types.addressing.prefixes.bgp.binding_delete_response import BindingDeleteResponse
-
-__all__ = ["BindingsResource", "AsyncBindingsResource"]
-
-
-class BindingsResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> BindingsResourceWithRawResponse:
-        return BindingsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> BindingsResourceWithStreamingResponse:
-        return BindingsResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        prefix_id: str,
-        *,
-        account_id: str,
-        cidr: str | NotGiven = NOT_GIVEN,
-        service_id: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ServiceBinding]:
-        """
-        Creates a new Service Binding, routing traffic to IPs within the given CIDR to a
-        service running on Cloudflare's network. **Note:** This API may only be used on
-        prefixes currently configured with a Magic Transit service binding, and only
-        allows creating service bindings for the Cloudflare CDN or Cloudflare Spectrum.
-
-        Args:
-          account_id: Identifier
-
-          prefix_id: Identifier
-
-          cidr: IP Prefix in Classless Inter-Domain Routing format.
-
-          service_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not prefix_id:
-            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        return self._post(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings",
-            body=maybe_transform(
-                {
-                    "cidr": cidr,
-                    "service_id": service_id,
-                },
-                binding_create_params.BindingCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ServiceBinding]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ServiceBinding]], ResultWrapper[ServiceBinding]),
-        )
-
-    def list(
-        self,
-        prefix_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[ServiceBinding]:
-        """List the Cloudflare services this prefix is currently bound to.
-
-        Traffic sent to
-        an address within an IP prefix will be routed to the Cloudflare service of the
-        most-specific Service Binding matching the address. **Example:** binding
-        `192.0.2.0/24` to Cloudflare Magic Transit and `192.0.2.1/32` to the Cloudflare
-        CDN would route traffic for `192.0.2.1` to the CDN, and traffic for all other
-        IPs in the prefix to Cloudflare Magic Transit.
-
-        Args:
-          account_id: Identifier
-
-          prefix_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not prefix_id:
-            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings",
-            page=SyncSinglePage[ServiceBinding],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=ServiceBinding,
-        )
-
-    def delete(
-        self,
-        binding_id: str,
-        *,
-        account_id: str,
-        prefix_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> BindingDeleteResponse:
-        """
-        Delete a Service Binding
-
-        Args:
-          account_id: Identifier
-
-          prefix_id: Identifier
-
-          binding_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not prefix_id:
-            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        if not binding_id:
-            raise ValueError(f"Expected a non-empty value for `binding_id` but received {binding_id!r}")
-        return self._delete(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings/{binding_id}",
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=BindingDeleteResponse,
-        )
-
-    def get(
-        self,
-        binding_id: str,
-        *,
-        account_id: str,
-        prefix_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ServiceBinding]:
-        """
-        Fetch a single Service Binding
-
-        Args:
-          account_id: Identifier
-
-          prefix_id: Identifier
-
-          binding_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not prefix_id:
-            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        if not binding_id:
-            raise ValueError(f"Expected a non-empty value for `binding_id` but received {binding_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings/{binding_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ServiceBinding]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ServiceBinding]], ResultWrapper[ServiceBinding]),
-        )
-
-
-class AsyncBindingsResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncBindingsResourceWithRawResponse:
-        return AsyncBindingsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncBindingsResourceWithStreamingResponse:
-        return AsyncBindingsResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        prefix_id: str,
-        *,
-        account_id: str,
-        cidr: str | NotGiven = NOT_GIVEN,
-        service_id: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ServiceBinding]:
-        """
-        Creates a new Service Binding, routing traffic to IPs within the given CIDR to a
-        service running on Cloudflare's network. **Note:** This API may only be used on
-        prefixes currently configured with a Magic Transit service binding, and only
-        allows creating service bindings for the Cloudflare CDN or Cloudflare Spectrum.
-
-        Args:
-          account_id: Identifier
-
-          prefix_id: Identifier
-
-          cidr: IP Prefix in Classless Inter-Domain Routing format.
-
-          service_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not prefix_id:
-            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        return await self._post(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings",
-            body=await async_maybe_transform(
-                {
-                    "cidr": cidr,
-                    "service_id": service_id,
-                },
-                binding_create_params.BindingCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ServiceBinding]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ServiceBinding]], ResultWrapper[ServiceBinding]),
-        )
-
-    def list(
-        self,
-        prefix_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[ServiceBinding, AsyncSinglePage[ServiceBinding]]:
-        """List the Cloudflare services this prefix is currently bound to.
-
-        Traffic sent to
-        an address within an IP prefix will be routed to the Cloudflare service of the
-        most-specific Service Binding matching the address. **Example:** binding
-        `192.0.2.0/24` to Cloudflare Magic Transit and `192.0.2.1/32` to the Cloudflare
-        CDN would route traffic for `192.0.2.1` to the CDN, and traffic for all other
-        IPs in the prefix to Cloudflare Magic Transit.
-
-        Args:
-          account_id: Identifier
-
-          prefix_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not prefix_id:
-            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings",
-            page=AsyncSinglePage[ServiceBinding],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=ServiceBinding,
-        )
-
-    async def delete(
-        self,
-        binding_id: str,
-        *,
-        account_id: str,
-        prefix_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> BindingDeleteResponse:
-        """
-        Delete a Service Binding
-
-        Args:
-          account_id: Identifier
-
-          prefix_id: Identifier
-
-          binding_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not prefix_id:
-            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        if not binding_id:
-            raise ValueError(f"Expected a non-empty value for `binding_id` but received {binding_id!r}")
-        return await self._delete(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings/{binding_id}",
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=BindingDeleteResponse,
-        )
-
-    async def get(
-        self,
-        binding_id: str,
-        *,
-        account_id: str,
-        prefix_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ServiceBinding]:
-        """
-        Fetch a single Service Binding
-
-        Args:
-          account_id: Identifier
-
-          prefix_id: Identifier
-
-          binding_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not prefix_id:
-            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        if not binding_id:
-            raise ValueError(f"Expected a non-empty value for `binding_id` but received {binding_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings/{binding_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ServiceBinding]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ServiceBinding]], ResultWrapper[ServiceBinding]),
-        )
-
-
-class BindingsResourceWithRawResponse:
-    def __init__(self, bindings: BindingsResource) -> None:
-        self._bindings = bindings
-
-        self.create = to_raw_response_wrapper(
-            bindings.create,
-        )
-        self.list = to_raw_response_wrapper(
-            bindings.list,
-        )
-        self.delete = to_raw_response_wrapper(
-            bindings.delete,
-        )
-        self.get = to_raw_response_wrapper(
-            bindings.get,
-        )
-
-
-class AsyncBindingsResourceWithRawResponse:
-    def __init__(self, bindings: AsyncBindingsResource) -> None:
-        self._bindings = bindings
-
-        self.create = async_to_raw_response_wrapper(
-            bindings.create,
-        )
-        self.list = async_to_raw_response_wrapper(
-            bindings.list,
-        )
-        self.delete = async_to_raw_response_wrapper(
-            bindings.delete,
-        )
-        self.get = async_to_raw_response_wrapper(
-            bindings.get,
-        )
-
-
-class BindingsResourceWithStreamingResponse:
-    def __init__(self, bindings: BindingsResource) -> None:
-        self._bindings = bindings
-
-        self.create = to_streamed_response_wrapper(
-            bindings.create,
-        )
-        self.list = to_streamed_response_wrapper(
-            bindings.list,
-        )
-        self.delete = to_streamed_response_wrapper(
-            bindings.delete,
-        )
-        self.get = to_streamed_response_wrapper(
-            bindings.get,
-        )
-
-
-class AsyncBindingsResourceWithStreamingResponse:
-    def __init__(self, bindings: AsyncBindingsResource) -> None:
-        self._bindings = bindings
-
-        self.create = async_to_streamed_response_wrapper(
-            bindings.create,
-        )
-        self.list = async_to_streamed_response_wrapper(
-            bindings.list,
-        )
-        self.delete = async_to_streamed_response_wrapper(
-            bindings.delete,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            bindings.get,
-        )
diff --git a/src/cloudflare/resources/addressing/prefixes/bgp/prefixes.py b/src/cloudflare/resources/addressing/prefixes/bgp/prefixes.py
deleted file mode 100644
index a2a444a4c68..00000000000
--- a/src/cloudflare/resources/addressing/prefixes/bgp/prefixes.py
+++ /dev/null
@@ -1,400 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Optional, cast
-
-import httpx
-
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ....._compat import cached_property
-from ....._resource import SyncAPIResource, AsyncAPIResource
-from ....._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ....._wrappers import ResultWrapper
-from .....pagination import SyncSinglePage, AsyncSinglePage
-from ....._base_client import AsyncPaginator, make_request_options
-from .....types.addressing.prefixes.bgp import prefix_edit_params
-from .....types.addressing.prefixes.bgp.bgp_prefix import BGPPrefix
-
-__all__ = ["PrefixesResource", "AsyncPrefixesResource"]
-
-
-class PrefixesResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> PrefixesResourceWithRawResponse:
-        return PrefixesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> PrefixesResourceWithStreamingResponse:
-        return PrefixesResourceWithStreamingResponse(self)
-
-    def list(
-        self,
-        prefix_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[BGPPrefix]:
-        """List all BGP Prefixes within the specified IP Prefix.
-
-        BGP Prefixes are used to
-        control which specific subnets are advertised to the Internet. It is possible to
-        advertise subnets more specific than an IP Prefix by creating more specific BGP
-        Prefixes.
-
-        Args:
-          account_id: Identifier
-
-          prefix_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not prefix_id:
-            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes",
-            page=SyncSinglePage[BGPPrefix],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=BGPPrefix,
-        )
-
-    def edit(
-        self,
-        bgp_prefix_id: str,
-        *,
-        account_id: str,
-        prefix_id: str,
-        on_demand: prefix_edit_params.OnDemand | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[BGPPrefix]:
-        """
-        Update the properties of a BGP Prefix, such as the on demand advertisement
-        status (advertised or withdrawn).
-
-        Args:
-          account_id: Identifier
-
-          prefix_id: Identifier
-
-          bgp_prefix_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not prefix_id:
-            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        if not bgp_prefix_id:
-            raise ValueError(f"Expected a non-empty value for `bgp_prefix_id` but received {bgp_prefix_id!r}")
-        return self._patch(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}",
-            body=maybe_transform({"on_demand": on_demand}, prefix_edit_params.PrefixEditParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[BGPPrefix]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[BGPPrefix]], ResultWrapper[BGPPrefix]),
-        )
-
-    def get(
-        self,
-        bgp_prefix_id: str,
-        *,
-        account_id: str,
-        prefix_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[BGPPrefix]:
-        """
-        Retrieve a single BGP Prefix according to its identifier
-
-        Args:
-          account_id: Identifier
-
-          prefix_id: Identifier
-
-          bgp_prefix_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not prefix_id:
-            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        if not bgp_prefix_id:
-            raise ValueError(f"Expected a non-empty value for `bgp_prefix_id` but received {bgp_prefix_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[BGPPrefix]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[BGPPrefix]], ResultWrapper[BGPPrefix]),
-        )
-
-
-class AsyncPrefixesResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncPrefixesResourceWithRawResponse:
-        return AsyncPrefixesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncPrefixesResourceWithStreamingResponse:
-        return AsyncPrefixesResourceWithStreamingResponse(self)
-
-    def list(
-        self,
-        prefix_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[BGPPrefix, AsyncSinglePage[BGPPrefix]]:
-        """List all BGP Prefixes within the specified IP Prefix.
-
-        BGP Prefixes are used to
-        control which specific subnets are advertised to the Internet. It is possible to
-        advertise subnets more specific than an IP Prefix by creating more specific BGP
-        Prefixes.
-
-        Args:
-          account_id: Identifier
-
-          prefix_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not prefix_id:
-            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes",
-            page=AsyncSinglePage[BGPPrefix],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=BGPPrefix,
-        )
-
-    async def edit(
-        self,
-        bgp_prefix_id: str,
-        *,
-        account_id: str,
-        prefix_id: str,
-        on_demand: prefix_edit_params.OnDemand | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[BGPPrefix]:
-        """
-        Update the properties of a BGP Prefix, such as the on demand advertisement
-        status (advertised or withdrawn).
-
-        Args:
-          account_id: Identifier
-
-          prefix_id: Identifier
-
-          bgp_prefix_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not prefix_id:
-            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        if not bgp_prefix_id:
-            raise ValueError(f"Expected a non-empty value for `bgp_prefix_id` but received {bgp_prefix_id!r}")
-        return await self._patch(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}",
-            body=await async_maybe_transform({"on_demand": on_demand}, prefix_edit_params.PrefixEditParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[BGPPrefix]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[BGPPrefix]], ResultWrapper[BGPPrefix]),
-        )
-
-    async def get(
-        self,
-        bgp_prefix_id: str,
-        *,
-        account_id: str,
-        prefix_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[BGPPrefix]:
-        """
-        Retrieve a single BGP Prefix according to its identifier
-
-        Args:
-          account_id: Identifier
-
-          prefix_id: Identifier
-
-          bgp_prefix_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not prefix_id:
-            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        if not bgp_prefix_id:
-            raise ValueError(f"Expected a non-empty value for `bgp_prefix_id` but received {bgp_prefix_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[BGPPrefix]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[BGPPrefix]], ResultWrapper[BGPPrefix]),
-        )
-
-
-class PrefixesResourceWithRawResponse:
-    def __init__(self, prefixes: PrefixesResource) -> None:
-        self._prefixes = prefixes
-
-        self.list = to_raw_response_wrapper(
-            prefixes.list,
-        )
-        self.edit = to_raw_response_wrapper(
-            prefixes.edit,
-        )
-        self.get = to_raw_response_wrapper(
-            prefixes.get,
-        )
-
-
-class AsyncPrefixesResourceWithRawResponse:
-    def __init__(self, prefixes: AsyncPrefixesResource) -> None:
-        self._prefixes = prefixes
-
-        self.list = async_to_raw_response_wrapper(
-            prefixes.list,
-        )
-        self.edit = async_to_raw_response_wrapper(
-            prefixes.edit,
-        )
-        self.get = async_to_raw_response_wrapper(
-            prefixes.get,
-        )
-
-
-class PrefixesResourceWithStreamingResponse:
-    def __init__(self, prefixes: PrefixesResource) -> None:
-        self._prefixes = prefixes
-
-        self.list = to_streamed_response_wrapper(
-            prefixes.list,
-        )
-        self.edit = to_streamed_response_wrapper(
-            prefixes.edit,
-        )
-        self.get = to_streamed_response_wrapper(
-            prefixes.get,
-        )
-
-
-class AsyncPrefixesResourceWithStreamingResponse:
-    def __init__(self, prefixes: AsyncPrefixesResource) -> None:
-        self._prefixes = prefixes
-
-        self.list = async_to_streamed_response_wrapper(
-            prefixes.list,
-        )
-        self.edit = async_to_streamed_response_wrapper(
-            prefixes.edit,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            prefixes.get,
-        )
diff --git a/src/cloudflare/resources/addressing/prefixes/bgp/statuses.py b/src/cloudflare/resources/addressing/prefixes/bgp/statuses.py
deleted file mode 100644
index 065c28d426e..00000000000
--- a/src/cloudflare/resources/addressing/prefixes/bgp/statuses.py
+++ /dev/null
@@ -1,280 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Optional, cast
-
-import httpx
-
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ....._compat import cached_property
-from ....._resource import SyncAPIResource, AsyncAPIResource
-from ....._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ....._wrappers import ResultWrapper
-from ....._base_client import make_request_options
-from .....types.addressing.prefixes.bgp import status_edit_params
-from .....types.addressing.prefixes.bgp.status_get_response import StatusGetResponse
-from .....types.addressing.prefixes.bgp.status_edit_response import StatusEditResponse
-
-__all__ = ["StatusesResource", "AsyncStatusesResource"]
-
-
-class StatusesResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> StatusesResourceWithRawResponse:
-        return StatusesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> StatusesResourceWithStreamingResponse:
-        return StatusesResourceWithStreamingResponse(self)
-
-    def edit(
-        self,
-        prefix_id: str,
-        *,
-        account_id: str,
-        advertised: bool,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[StatusEditResponse]:
-        """
-        Advertise or withdraw BGP route for a prefix.
-
-        Args:
-          account_id: Identifier
-
-          prefix_id: Identifier
-
-          advertised: Enablement of prefix advertisement to the Internet.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not prefix_id:
-            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        return self._patch(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/status",
-            body=maybe_transform({"advertised": advertised}, status_edit_params.StatusEditParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[StatusEditResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[StatusEditResponse]], ResultWrapper[StatusEditResponse]),
-        )
-
-    def get(
-        self,
-        prefix_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[StatusGetResponse]:
-        """
-        List the current advertisement state for a prefix.
-
-        Args:
-          account_id: Identifier
-
-          prefix_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not prefix_id:
-            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/status",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[StatusGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[StatusGetResponse]], ResultWrapper[StatusGetResponse]),
-        )
-
-
-class AsyncStatusesResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncStatusesResourceWithRawResponse:
-        return AsyncStatusesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncStatusesResourceWithStreamingResponse:
-        return AsyncStatusesResourceWithStreamingResponse(self)
-
-    async def edit(
-        self,
-        prefix_id: str,
-        *,
-        account_id: str,
-        advertised: bool,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[StatusEditResponse]:
-        """
-        Advertise or withdraw BGP route for a prefix.
-
-        Args:
-          account_id: Identifier
-
-          prefix_id: Identifier
-
-          advertised: Enablement of prefix advertisement to the Internet.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not prefix_id:
-            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        return await self._patch(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/status",
-            body=await async_maybe_transform({"advertised": advertised}, status_edit_params.StatusEditParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[StatusEditResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[StatusEditResponse]], ResultWrapper[StatusEditResponse]),
-        )
-
-    async def get(
-        self,
-        prefix_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[StatusGetResponse]:
-        """
-        List the current advertisement state for a prefix.
-
-        Args:
-          account_id: Identifier
-
-          prefix_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not prefix_id:
-            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/status",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[StatusGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[StatusGetResponse]], ResultWrapper[StatusGetResponse]),
-        )
-
-
-class StatusesResourceWithRawResponse:
-    def __init__(self, statuses: StatusesResource) -> None:
-        self._statuses = statuses
-
-        self.edit = to_raw_response_wrapper(
-            statuses.edit,
-        )
-        self.get = to_raw_response_wrapper(
-            statuses.get,
-        )
-
-
-class AsyncStatusesResourceWithRawResponse:
-    def __init__(self, statuses: AsyncStatusesResource) -> None:
-        self._statuses = statuses
-
-        self.edit = async_to_raw_response_wrapper(
-            statuses.edit,
-        )
-        self.get = async_to_raw_response_wrapper(
-            statuses.get,
-        )
-
-
-class StatusesResourceWithStreamingResponse:
-    def __init__(self, statuses: StatusesResource) -> None:
-        self._statuses = statuses
-
-        self.edit = to_streamed_response_wrapper(
-            statuses.edit,
-        )
-        self.get = to_streamed_response_wrapper(
-            statuses.get,
-        )
-
-
-class AsyncStatusesResourceWithStreamingResponse:
-    def __init__(self, statuses: AsyncStatusesResource) -> None:
-        self._statuses = statuses
-
-        self.edit = async_to_streamed_response_wrapper(
-            statuses.edit,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            statuses.get,
-        )
diff --git a/src/cloudflare/resources/addressing/prefixes/bgp_prefixes.py b/src/cloudflare/resources/addressing/prefixes/bgp_prefixes.py
new file mode 100644
index 00000000000..2f997e3a34f
--- /dev/null
+++ b/src/cloudflare/resources/addressing/prefixes/bgp_prefixes.py
@@ -0,0 +1,563 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.addressing.prefixes import bgp_prefix_edit_params, bgp_prefix_create_params
+from ....types.addressing.prefixes.bgp_prefix import BGPPrefix
+
+__all__ = ["BGPPrefixesResource", "AsyncBGPPrefixesResource"]
+
+
+class BGPPrefixesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> BGPPrefixesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return BGPPrefixesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> BGPPrefixesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return BGPPrefixesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        prefix_id: str,
+        *,
+        account_id: str,
+        cidr: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[BGPPrefix]:
+        """
+        Create a BGP prefix, controlling the BGP advertisement status of a specific
+        subnet. When created, BGP prefixes are initially withdrawn, and can be
+        advertised with the Update BGP Prefix API.
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          cidr: IP Prefix in Classless Inter-Domain Routing format.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes",
+            body=maybe_transform({"cidr": cidr}, bgp_prefix_create_params.BGPPrefixCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[BGPPrefix]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[BGPPrefix]], ResultWrapper[BGPPrefix]),
+        )
+
+    def list(
+        self,
+        prefix_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[BGPPrefix]:
+        """List all BGP Prefixes within the specified IP Prefix.
+
+        BGP Prefixes are used to
+        control which specific subnets are advertised to the Internet. It is possible to
+        advertise subnets more specific than an IP Prefix by creating more specific BGP
+        Prefixes.
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes",
+            page=SyncSinglePage[BGPPrefix],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=BGPPrefix,
+        )
+
+    def edit(
+        self,
+        bgp_prefix_id: str,
+        *,
+        account_id: str,
+        prefix_id: str,
+        asn_prepend_count: int | Omit = omit,
+        auto_advertise_withdraw: bool | Omit = omit,
+        on_demand: bgp_prefix_edit_params.OnDemand | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[BGPPrefix]:
+        """
+        Update the properties of a BGP Prefix, such as the on demand advertisement
+        status (advertised or withdrawn).
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          bgp_prefix_id: Identifier of BGP Prefix.
+
+          asn_prepend_count: Number of times to prepend the Cloudflare ASN to the BGP AS-Path attribute
+
+          auto_advertise_withdraw: Determines if Cloudflare advertises a BYOIP BGP prefix even when there is no
+              matching BGP prefix in the Magic routing table. When true, Cloudflare will
+              automatically withdraw the BGP prefix when there are no matching BGP routes, and
+              will resume advertising when there is at least one matching BGP route.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        if not bgp_prefix_id:
+            raise ValueError(f"Expected a non-empty value for `bgp_prefix_id` but received {bgp_prefix_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}",
+            body=maybe_transform(
+                {
+                    "asn_prepend_count": asn_prepend_count,
+                    "auto_advertise_withdraw": auto_advertise_withdraw,
+                    "on_demand": on_demand,
+                },
+                bgp_prefix_edit_params.BGPPrefixEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[BGPPrefix]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[BGPPrefix]], ResultWrapper[BGPPrefix]),
+        )
+
+    def get(
+        self,
+        bgp_prefix_id: str,
+        *,
+        account_id: str,
+        prefix_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[BGPPrefix]:
+        """
+        Retrieve a single BGP Prefix according to its identifier
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          bgp_prefix_id: Identifier of BGP Prefix.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        if not bgp_prefix_id:
+            raise ValueError(f"Expected a non-empty value for `bgp_prefix_id` but received {bgp_prefix_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[BGPPrefix]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[BGPPrefix]], ResultWrapper[BGPPrefix]),
+        )
+
+
+class AsyncBGPPrefixesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncBGPPrefixesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncBGPPrefixesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncBGPPrefixesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncBGPPrefixesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        prefix_id: str,
+        *,
+        account_id: str,
+        cidr: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[BGPPrefix]:
+        """
+        Create a BGP prefix, controlling the BGP advertisement status of a specific
+        subnet. When created, BGP prefixes are initially withdrawn, and can be
+        advertised with the Update BGP Prefix API.
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          cidr: IP Prefix in Classless Inter-Domain Routing format.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes",
+            body=await async_maybe_transform({"cidr": cidr}, bgp_prefix_create_params.BGPPrefixCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[BGPPrefix]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[BGPPrefix]], ResultWrapper[BGPPrefix]),
+        )
+
+    def list(
+        self,
+        prefix_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[BGPPrefix, AsyncSinglePage[BGPPrefix]]:
+        """List all BGP Prefixes within the specified IP Prefix.
+
+        BGP Prefixes are used to
+        control which specific subnets are advertised to the Internet. It is possible to
+        advertise subnets more specific than an IP Prefix by creating more specific BGP
+        Prefixes.
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes",
+            page=AsyncSinglePage[BGPPrefix],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=BGPPrefix,
+        )
+
+    async def edit(
+        self,
+        bgp_prefix_id: str,
+        *,
+        account_id: str,
+        prefix_id: str,
+        asn_prepend_count: int | Omit = omit,
+        auto_advertise_withdraw: bool | Omit = omit,
+        on_demand: bgp_prefix_edit_params.OnDemand | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[BGPPrefix]:
+        """
+        Update the properties of a BGP Prefix, such as the on demand advertisement
+        status (advertised or withdrawn).
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          bgp_prefix_id: Identifier of BGP Prefix.
+
+          asn_prepend_count: Number of times to prepend the Cloudflare ASN to the BGP AS-Path attribute
+
+          auto_advertise_withdraw: Determines if Cloudflare advertises a BYOIP BGP prefix even when there is no
+              matching BGP prefix in the Magic routing table. When true, Cloudflare will
+              automatically withdraw the BGP prefix when there are no matching BGP routes, and
+              will resume advertising when there is at least one matching BGP route.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        if not bgp_prefix_id:
+            raise ValueError(f"Expected a non-empty value for `bgp_prefix_id` but received {bgp_prefix_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}",
+            body=await async_maybe_transform(
+                {
+                    "asn_prepend_count": asn_prepend_count,
+                    "auto_advertise_withdraw": auto_advertise_withdraw,
+                    "on_demand": on_demand,
+                },
+                bgp_prefix_edit_params.BGPPrefixEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[BGPPrefix]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[BGPPrefix]], ResultWrapper[BGPPrefix]),
+        )
+
+    async def get(
+        self,
+        bgp_prefix_id: str,
+        *,
+        account_id: str,
+        prefix_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[BGPPrefix]:
+        """
+        Retrieve a single BGP Prefix according to its identifier
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          bgp_prefix_id: Identifier of BGP Prefix.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        if not bgp_prefix_id:
+            raise ValueError(f"Expected a non-empty value for `bgp_prefix_id` but received {bgp_prefix_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[BGPPrefix]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[BGPPrefix]], ResultWrapper[BGPPrefix]),
+        )
+
+
+class BGPPrefixesResourceWithRawResponse:
+    def __init__(self, bgp_prefixes: BGPPrefixesResource) -> None:
+        self._bgp_prefixes = bgp_prefixes
+
+        self.create = to_raw_response_wrapper(
+            bgp_prefixes.create,
+        )
+        self.list = to_raw_response_wrapper(
+            bgp_prefixes.list,
+        )
+        self.edit = to_raw_response_wrapper(
+            bgp_prefixes.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            bgp_prefixes.get,
+        )
+
+
+class AsyncBGPPrefixesResourceWithRawResponse:
+    def __init__(self, bgp_prefixes: AsyncBGPPrefixesResource) -> None:
+        self._bgp_prefixes = bgp_prefixes
+
+        self.create = async_to_raw_response_wrapper(
+            bgp_prefixes.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            bgp_prefixes.list,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            bgp_prefixes.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            bgp_prefixes.get,
+        )
+
+
+class BGPPrefixesResourceWithStreamingResponse:
+    def __init__(self, bgp_prefixes: BGPPrefixesResource) -> None:
+        self._bgp_prefixes = bgp_prefixes
+
+        self.create = to_streamed_response_wrapper(
+            bgp_prefixes.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            bgp_prefixes.list,
+        )
+        self.edit = to_streamed_response_wrapper(
+            bgp_prefixes.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            bgp_prefixes.get,
+        )
+
+
+class AsyncBGPPrefixesResourceWithStreamingResponse:
+    def __init__(self, bgp_prefixes: AsyncBGPPrefixesResource) -> None:
+        self._bgp_prefixes = bgp_prefixes
+
+        self.create = async_to_streamed_response_wrapper(
+            bgp_prefixes.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            bgp_prefixes.list,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            bgp_prefixes.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            bgp_prefixes.get,
+        )
diff --git a/src/cloudflare/resources/addressing/prefixes/delegations.py b/src/cloudflare/resources/addressing/prefixes/delegations.py
index 1fed5c0a3ba..cdc8824f1d3 100644
--- a/src/cloudflare/resources/addressing/prefixes/delegations.py
+++ b/src/cloudflare/resources/addressing/prefixes/delegations.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -32,10 +29,21 @@
 class DelegationsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DelegationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DelegationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DelegationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DelegationsResourceWithStreamingResponse(self)
 
     def create(
@@ -50,15 +58,15 @@ def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Delegations]:
         """
         Create a new account delegation for a given IP prefix.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          prefix_id: Identifier
+          prefix_id: Identifier of an IP Prefix.
 
           cidr: IP Prefix in Classless Inter-Domain Routing format.
 
@@ -105,15 +113,15 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Delegations]:
         """
         List all delegations for a given account IP prefix.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          prefix_id: Identifier
+          prefix_id: Identifier of an IP Prefix.
 
           extra_headers: Send extra headers
 
@@ -147,17 +155,17 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DelegationDeleteResponse]:
         """
         Delete an account delegation for a given IP prefix.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          prefix_id: Identifier
+          prefix_id: Identifier of an IP Prefix.
 
-          delegation_id: Delegation identifier tag.
+          delegation_id: Identifier of a Delegation.
 
           extra_headers: Send extra headers
 
@@ -189,10 +197,21 @@ def delete(
 class AsyncDelegationsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDelegationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDelegationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDelegationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDelegationsResourceWithStreamingResponse(self)
 
     async def create(
@@ -207,15 +226,15 @@ async def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Delegations]:
         """
         Create a new account delegation for a given IP prefix.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          prefix_id: Identifier
+          prefix_id: Identifier of an IP Prefix.
 
           cidr: IP Prefix in Classless Inter-Domain Routing format.
 
@@ -262,15 +281,15 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Delegations, AsyncSinglePage[Delegations]]:
         """
         List all delegations for a given account IP prefix.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          prefix_id: Identifier
+          prefix_id: Identifier of an IP Prefix.
 
           extra_headers: Send extra headers
 
@@ -304,17 +323,17 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DelegationDeleteResponse]:
         """
         Delete an account delegation for a given IP prefix.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          prefix_id: Identifier
+          prefix_id: Identifier of an IP Prefix.
 
-          delegation_id: Delegation identifier tag.
+          delegation_id: Identifier of a Delegation.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/addressing/prefixes/prefixes.py b/src/cloudflare/resources/addressing/prefixes/prefixes.py
index ee43ea753db..6c9785fa6cf 100644
--- a/src/cloudflare/resources/addressing/prefixes/prefixes.py
+++ b/src/cloudflare/resources/addressing/prefixes/prefixes.py
@@ -6,20 +6,8 @@
 
 import httpx
 
-from .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,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from .delegations import (
     DelegationsResource,
@@ -37,9 +25,33 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
+from .bgp_prefixes import (
+    BGPPrefixesResource,
+    AsyncBGPPrefixesResource,
+    BGPPrefixesResourceWithRawResponse,
+    AsyncBGPPrefixesResourceWithRawResponse,
+    BGPPrefixesResourceWithStreamingResponse,
+    AsyncBGPPrefixesResourceWithStreamingResponse,
+)
 from ....pagination import SyncSinglePage, AsyncSinglePage
 from ...._base_client import AsyncPaginator, make_request_options
+from .service_bindings import (
+    ServiceBindingsResource,
+    AsyncServiceBindingsResource,
+    ServiceBindingsResourceWithRawResponse,
+    AsyncServiceBindingsResourceWithRawResponse,
+    ServiceBindingsResourceWithStreamingResponse,
+    AsyncServiceBindingsResourceWithStreamingResponse,
+)
 from ....types.addressing import prefix_edit_params, prefix_create_params
+from .advertisement_status import (
+    AdvertisementStatusResource,
+    AsyncAdvertisementStatusResource,
+    AdvertisementStatusResourceWithRawResponse,
+    AsyncAdvertisementStatusResourceWithRawResponse,
+    AdvertisementStatusResourceWithStreamingResponse,
+    AsyncAdvertisementStatusResourceWithStreamingResponse,
+)
 from ....types.addressing.prefix import Prefix
 from ....types.addressing.prefix_delete_response import PrefixDeleteResponse
 
@@ -48,8 +60,16 @@
 
 class PrefixesResource(SyncAPIResource):
     @cached_property
-    def bgp(self) -> BGPResource:
-        return BGPResource(self._client)
+    def service_bindings(self) -> ServiceBindingsResource:
+        return ServiceBindingsResource(self._client)
+
+    @cached_property
+    def bgp_prefixes(self) -> BGPPrefixesResource:
+        return BGPPrefixesResource(self._client)
+
+    @cached_property
+    def advertisement_status(self) -> AdvertisementStatusResource:
+        return AdvertisementStatusResource(self._client)
 
     @cached_property
     def delegations(self) -> DelegationsResource:
@@ -57,36 +77,54 @@ def delegations(self) -> DelegationsResource:
 
     @cached_property
     def with_raw_response(self) -> PrefixesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PrefixesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PrefixesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PrefixesResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        asn: Optional[int],
+        asn: int,
         cidr: str,
-        loa_document_id: Optional[str],
+        delegate_loa_creation: bool | Omit = omit,
+        description: str | Omit = omit,
+        loa_document_id: Optional[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Prefix]:
         """
         Add a new prefix under the account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
           asn: Autonomous System Number (ASN) the prefix will be advertised under.
 
           cidr: IP Prefix in Classless Inter-Domain Routing format.
 
+          delegate_loa_creation: Whether Cloudflare is allowed to generate the LOA document on behalf of the
+              prefix owner.
+
+          description: Description of the prefix.
+
           loa_document_id: Identifier for the uploaded LOA document.
 
           extra_headers: Send extra headers
@@ -105,6 +143,8 @@ def create(
                 {
                     "asn": asn,
                     "cidr": cidr,
+                    "delegate_loa_creation": delegate_loa_creation,
+                    "description": description,
                     "loa_document_id": loa_document_id,
                 },
                 prefix_create_params.PrefixCreateParams,
@@ -128,13 +168,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Prefix]:
         """
         List all prefixes owned by the account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
           extra_headers: Send extra headers
 
@@ -165,15 +205,15 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[PrefixDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PrefixDeleteResponse:
         """
         Delete an unapproved prefix owned by the account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          prefix_id: Identifier
+          prefix_id: Identifier of an IP Prefix.
 
           extra_headers: Send extra headers
 
@@ -190,13 +230,9 @@ def delete(
         return self._delete(
             f"/accounts/{account_id}/addressing/prefixes/{prefix_id}",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[PrefixDeleteResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[PrefixDeleteResponse]], ResultWrapper[PrefixDeleteResponse]),
+            cast_to=PrefixDeleteResponse,
         )
 
     def edit(
@@ -210,15 +246,15 @@ def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Prefix]:
         """
         Modify the description for a prefix owned by the account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          prefix_id: Identifier
+          prefix_id: Identifier of an IP Prefix.
 
           description: Description of the prefix.
 
@@ -257,15 +293,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Prefix]:
         """
         List a particular prefix owned by the account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          prefix_id: Identifier
+          prefix_id: Identifier of an IP Prefix.
 
           extra_headers: Send extra headers
 
@@ -294,8 +330,16 @@ def get(
 
 class AsyncPrefixesResource(AsyncAPIResource):
     @cached_property
-    def bgp(self) -> AsyncBGPResource:
-        return AsyncBGPResource(self._client)
+    def service_bindings(self) -> AsyncServiceBindingsResource:
+        return AsyncServiceBindingsResource(self._client)
+
+    @cached_property
+    def bgp_prefixes(self) -> AsyncBGPPrefixesResource:
+        return AsyncBGPPrefixesResource(self._client)
+
+    @cached_property
+    def advertisement_status(self) -> AsyncAdvertisementStatusResource:
+        return AsyncAdvertisementStatusResource(self._client)
 
     @cached_property
     def delegations(self) -> AsyncDelegationsResource:
@@ -303,36 +347,54 @@ def delegations(self) -> AsyncDelegationsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncPrefixesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPrefixesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPrefixesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPrefixesResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        asn: Optional[int],
+        asn: int,
         cidr: str,
-        loa_document_id: Optional[str],
+        delegate_loa_creation: bool | Omit = omit,
+        description: str | Omit = omit,
+        loa_document_id: Optional[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Prefix]:
         """
         Add a new prefix under the account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
           asn: Autonomous System Number (ASN) the prefix will be advertised under.
 
           cidr: IP Prefix in Classless Inter-Domain Routing format.
 
+          delegate_loa_creation: Whether Cloudflare is allowed to generate the LOA document on behalf of the
+              prefix owner.
+
+          description: Description of the prefix.
+
           loa_document_id: Identifier for the uploaded LOA document.
 
           extra_headers: Send extra headers
@@ -351,6 +413,8 @@ async def create(
                 {
                     "asn": asn,
                     "cidr": cidr,
+                    "delegate_loa_creation": delegate_loa_creation,
+                    "description": description,
                     "loa_document_id": loa_document_id,
                 },
                 prefix_create_params.PrefixCreateParams,
@@ -374,13 +438,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Prefix, AsyncSinglePage[Prefix]]:
         """
         List all prefixes owned by the account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
           extra_headers: Send extra headers
 
@@ -411,15 +475,15 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[PrefixDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PrefixDeleteResponse:
         """
         Delete an unapproved prefix owned by the account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          prefix_id: Identifier
+          prefix_id: Identifier of an IP Prefix.
 
           extra_headers: Send extra headers
 
@@ -436,13 +500,9 @@ async def delete(
         return await self._delete(
             f"/accounts/{account_id}/addressing/prefixes/{prefix_id}",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[PrefixDeleteResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[PrefixDeleteResponse]], ResultWrapper[PrefixDeleteResponse]),
+            cast_to=PrefixDeleteResponse,
         )
 
     async def edit(
@@ -456,15 +516,15 @@ async def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Prefix]:
         """
         Modify the description for a prefix owned by the account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          prefix_id: Identifier
+          prefix_id: Identifier of an IP Prefix.
 
           description: Description of the prefix.
 
@@ -503,15 +563,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Prefix]:
         """
         List a particular prefix owned by the account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
-          prefix_id: Identifier
+          prefix_id: Identifier of an IP Prefix.
 
           extra_headers: Send extra headers
 
@@ -559,8 +619,16 @@ def __init__(self, prefixes: PrefixesResource) -> None:
         )
 
     @cached_property
-    def bgp(self) -> BGPResourceWithRawResponse:
-        return BGPResourceWithRawResponse(self._prefixes.bgp)
+    def service_bindings(self) -> ServiceBindingsResourceWithRawResponse:
+        return ServiceBindingsResourceWithRawResponse(self._prefixes.service_bindings)
+
+    @cached_property
+    def bgp_prefixes(self) -> BGPPrefixesResourceWithRawResponse:
+        return BGPPrefixesResourceWithRawResponse(self._prefixes.bgp_prefixes)
+
+    @cached_property
+    def advertisement_status(self) -> AdvertisementStatusResourceWithRawResponse:
+        return AdvertisementStatusResourceWithRawResponse(self._prefixes.advertisement_status)
 
     @cached_property
     def delegations(self) -> DelegationsResourceWithRawResponse:
@@ -588,8 +656,16 @@ def __init__(self, prefixes: AsyncPrefixesResource) -> None:
         )
 
     @cached_property
-    def bgp(self) -> AsyncBGPResourceWithRawResponse:
-        return AsyncBGPResourceWithRawResponse(self._prefixes.bgp)
+    def service_bindings(self) -> AsyncServiceBindingsResourceWithRawResponse:
+        return AsyncServiceBindingsResourceWithRawResponse(self._prefixes.service_bindings)
+
+    @cached_property
+    def bgp_prefixes(self) -> AsyncBGPPrefixesResourceWithRawResponse:
+        return AsyncBGPPrefixesResourceWithRawResponse(self._prefixes.bgp_prefixes)
+
+    @cached_property
+    def advertisement_status(self) -> AsyncAdvertisementStatusResourceWithRawResponse:
+        return AsyncAdvertisementStatusResourceWithRawResponse(self._prefixes.advertisement_status)
 
     @cached_property
     def delegations(self) -> AsyncDelegationsResourceWithRawResponse:
@@ -617,8 +693,16 @@ def __init__(self, prefixes: PrefixesResource) -> None:
         )
 
     @cached_property
-    def bgp(self) -> BGPResourceWithStreamingResponse:
-        return BGPResourceWithStreamingResponse(self._prefixes.bgp)
+    def service_bindings(self) -> ServiceBindingsResourceWithStreamingResponse:
+        return ServiceBindingsResourceWithStreamingResponse(self._prefixes.service_bindings)
+
+    @cached_property
+    def bgp_prefixes(self) -> BGPPrefixesResourceWithStreamingResponse:
+        return BGPPrefixesResourceWithStreamingResponse(self._prefixes.bgp_prefixes)
+
+    @cached_property
+    def advertisement_status(self) -> AdvertisementStatusResourceWithStreamingResponse:
+        return AdvertisementStatusResourceWithStreamingResponse(self._prefixes.advertisement_status)
 
     @cached_property
     def delegations(self) -> DelegationsResourceWithStreamingResponse:
@@ -646,8 +730,16 @@ def __init__(self, prefixes: AsyncPrefixesResource) -> None:
         )
 
     @cached_property
-    def bgp(self) -> AsyncBGPResourceWithStreamingResponse:
-        return AsyncBGPResourceWithStreamingResponse(self._prefixes.bgp)
+    def service_bindings(self) -> AsyncServiceBindingsResourceWithStreamingResponse:
+        return AsyncServiceBindingsResourceWithStreamingResponse(self._prefixes.service_bindings)
+
+    @cached_property
+    def bgp_prefixes(self) -> AsyncBGPPrefixesResourceWithStreamingResponse:
+        return AsyncBGPPrefixesResourceWithStreamingResponse(self._prefixes.bgp_prefixes)
+
+    @cached_property
+    def advertisement_status(self) -> AsyncAdvertisementStatusResourceWithStreamingResponse:
+        return AsyncAdvertisementStatusResourceWithStreamingResponse(self._prefixes.advertisement_status)
 
     @cached_property
     def delegations(self) -> AsyncDelegationsResourceWithStreamingResponse:
diff --git a/src/cloudflare/resources/addressing/prefixes/service_bindings.py b/src/cloudflare/resources/addressing/prefixes/service_bindings.py
new file mode 100644
index 00000000000..163f77b5a40
--- /dev/null
+++ b/src/cloudflare/resources/addressing/prefixes/service_bindings.py
@@ -0,0 +1,548 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.addressing.prefixes import service_binding_create_params
+from ....types.addressing.prefixes.service_binding import ServiceBinding
+from ....types.addressing.prefixes.service_binding_delete_response import ServiceBindingDeleteResponse
+
+__all__ = ["ServiceBindingsResource", "AsyncServiceBindingsResource"]
+
+
+class ServiceBindingsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ServiceBindingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ServiceBindingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ServiceBindingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ServiceBindingsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        prefix_id: str,
+        *,
+        account_id: str,
+        cidr: str,
+        service_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ServiceBinding]:
+        """
+        Creates a new Service Binding, routing traffic to IPs within the given CIDR to a
+        service running on Cloudflare's network. **NOTE:** The first Service Binding
+        created for an IP Prefix must exactly match the IP Prefix's CIDR. Subsequent
+        Service Bindings may be created with a more-specific CIDR. Refer to the
+        [Service Bindings Documentation](https://developers.cloudflare.com/byoip/service-bindings/)
+        for compatibility details.
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          cidr: IP Prefix in Classless Inter-Domain Routing format.
+
+          service_id: Identifier of a Service on the Cloudflare network. Available services and their
+              IDs may be found in the **List Services** endpoint.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings",
+            body=maybe_transform(
+                {
+                    "cidr": cidr,
+                    "service_id": service_id,
+                },
+                service_binding_create_params.ServiceBindingCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ServiceBinding]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ServiceBinding]], ResultWrapper[ServiceBinding]),
+        )
+
+    def list(
+        self,
+        prefix_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[ServiceBinding]:
+        """List the Cloudflare services this prefix is currently bound to.
+
+        Traffic sent to
+        an address within an IP prefix will be routed to the Cloudflare service of the
+        most-specific Service Binding matching the address. **Example:** binding
+        `192.0.2.0/24` to Cloudflare Magic Transit and `192.0.2.1/32` to the Cloudflare
+        CDN would route traffic for `192.0.2.1` to the CDN, and traffic for all other
+        IPs in the prefix to Cloudflare Magic Transit.
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings",
+            page=SyncSinglePage[ServiceBinding],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=ServiceBinding,
+        )
+
+    def delete(
+        self,
+        binding_id: str,
+        *,
+        account_id: str,
+        prefix_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ServiceBindingDeleteResponse:
+        """
+        Delete a Service Binding
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          binding_id: Identifier of a Service Binding.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        if not binding_id:
+            raise ValueError(f"Expected a non-empty value for `binding_id` but received {binding_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings/{binding_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ServiceBindingDeleteResponse,
+        )
+
+    def get(
+        self,
+        binding_id: str,
+        *,
+        account_id: str,
+        prefix_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ServiceBinding]:
+        """
+        Fetch a single Service Binding
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          binding_id: Identifier of a Service Binding.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        if not binding_id:
+            raise ValueError(f"Expected a non-empty value for `binding_id` but received {binding_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings/{binding_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ServiceBinding]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ServiceBinding]], ResultWrapper[ServiceBinding]),
+        )
+
+
+class AsyncServiceBindingsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncServiceBindingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncServiceBindingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncServiceBindingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncServiceBindingsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        prefix_id: str,
+        *,
+        account_id: str,
+        cidr: str,
+        service_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ServiceBinding]:
+        """
+        Creates a new Service Binding, routing traffic to IPs within the given CIDR to a
+        service running on Cloudflare's network. **NOTE:** The first Service Binding
+        created for an IP Prefix must exactly match the IP Prefix's CIDR. Subsequent
+        Service Bindings may be created with a more-specific CIDR. Refer to the
+        [Service Bindings Documentation](https://developers.cloudflare.com/byoip/service-bindings/)
+        for compatibility details.
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          cidr: IP Prefix in Classless Inter-Domain Routing format.
+
+          service_id: Identifier of a Service on the Cloudflare network. Available services and their
+              IDs may be found in the **List Services** endpoint.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings",
+            body=await async_maybe_transform(
+                {
+                    "cidr": cidr,
+                    "service_id": service_id,
+                },
+                service_binding_create_params.ServiceBindingCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ServiceBinding]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ServiceBinding]], ResultWrapper[ServiceBinding]),
+        )
+
+    def list(
+        self,
+        prefix_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ServiceBinding, AsyncSinglePage[ServiceBinding]]:
+        """List the Cloudflare services this prefix is currently bound to.
+
+        Traffic sent to
+        an address within an IP prefix will be routed to the Cloudflare service of the
+        most-specific Service Binding matching the address. **Example:** binding
+        `192.0.2.0/24` to Cloudflare Magic Transit and `192.0.2.1/32` to the Cloudflare
+        CDN would route traffic for `192.0.2.1` to the CDN, and traffic for all other
+        IPs in the prefix to Cloudflare Magic Transit.
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings",
+            page=AsyncSinglePage[ServiceBinding],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=ServiceBinding,
+        )
+
+    async def delete(
+        self,
+        binding_id: str,
+        *,
+        account_id: str,
+        prefix_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ServiceBindingDeleteResponse:
+        """
+        Delete a Service Binding
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          binding_id: Identifier of a Service Binding.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        if not binding_id:
+            raise ValueError(f"Expected a non-empty value for `binding_id` but received {binding_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings/{binding_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ServiceBindingDeleteResponse,
+        )
+
+    async def get(
+        self,
+        binding_id: str,
+        *,
+        account_id: str,
+        prefix_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ServiceBinding]:
+        """
+        Fetch a single Service Binding
+
+        Args:
+          account_id: Identifier of a Cloudflare account.
+
+          prefix_id: Identifier of an IP Prefix.
+
+          binding_id: Identifier of a Service Binding.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not prefix_id:
+            raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
+        if not binding_id:
+            raise ValueError(f"Expected a non-empty value for `binding_id` but received {binding_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings/{binding_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ServiceBinding]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ServiceBinding]], ResultWrapper[ServiceBinding]),
+        )
+
+
+class ServiceBindingsResourceWithRawResponse:
+    def __init__(self, service_bindings: ServiceBindingsResource) -> None:
+        self._service_bindings = service_bindings
+
+        self.create = to_raw_response_wrapper(
+            service_bindings.create,
+        )
+        self.list = to_raw_response_wrapper(
+            service_bindings.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            service_bindings.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            service_bindings.get,
+        )
+
+
+class AsyncServiceBindingsResourceWithRawResponse:
+    def __init__(self, service_bindings: AsyncServiceBindingsResource) -> None:
+        self._service_bindings = service_bindings
+
+        self.create = async_to_raw_response_wrapper(
+            service_bindings.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            service_bindings.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            service_bindings.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            service_bindings.get,
+        )
+
+
+class ServiceBindingsResourceWithStreamingResponse:
+    def __init__(self, service_bindings: ServiceBindingsResource) -> None:
+        self._service_bindings = service_bindings
+
+        self.create = to_streamed_response_wrapper(
+            service_bindings.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            service_bindings.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            service_bindings.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            service_bindings.get,
+        )
+
+
+class AsyncServiceBindingsResourceWithStreamingResponse:
+    def __init__(self, service_bindings: AsyncServiceBindingsResource) -> None:
+        self._service_bindings = service_bindings
+
+        self.create = async_to_streamed_response_wrapper(
+            service_bindings.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            service_bindings.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            service_bindings.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            service_bindings.get,
+        )
diff --git a/src/cloudflare/resources/addressing/regional_hostnames/regional_hostnames.py b/src/cloudflare/resources/addressing/regional_hostnames/regional_hostnames.py
index 1c719b3da72..e404f48a4d1 100644
--- a/src/cloudflare/resources/addressing/regional_hostnames/regional_hostnames.py
+++ b/src/cloudflare/resources/addressing/regional_hostnames/regional_hostnames.py
@@ -14,11 +14,8 @@
     RegionsResourceWithStreamingResponse,
     AsyncRegionsResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -47,10 +44,21 @@ def regions(self) -> RegionsResource:
 
     @cached_property
     def with_raw_response(self) -> RegionalHostnamesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RegionalHostnamesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RegionalHostnamesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RegionalHostnamesResourceWithStreamingResponse(self)
 
     def create(
@@ -59,12 +67,13 @@ def create(
         zone_id: str,
         hostname: str,
         region_key: str,
+        routing: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RegionalHostnameCreateResponse]:
         """Create a new Regional Hostname entry.
 
@@ -74,13 +83,15 @@ def create(
         [Regional Services](https://developers.cloudflare.com/data-localization/regional-services/get-started/).
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           hostname: DNS hostname to be regionalized, must be a subdomain of the zone. Wildcards are
               supported for one level, e.g `*.example.com`
 
           region_key: Identifying key for the region
 
+          routing: Configure which routing method to use for the regional hostname
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -97,6 +108,7 @@ def create(
                 {
                     "hostname": hostname,
                     "region_key": region_key,
+                    "routing": routing,
                 },
                 regional_hostname_create_params.RegionalHostnameCreateParams,
             ),
@@ -119,13 +131,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[RegionalHostnameListResponse]:
         """
         List all Regional Hostnames within a zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -156,13 +168,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RegionalHostnameDeleteResponse:
         """
         Delete the region configuration for a specific Regional Hostname.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           hostname: DNS hostname to be regionalized, must be a subdomain of the zone. Wildcards are
               supported for one level, e.g `*.example.com`
@@ -198,7 +210,7 @@ def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RegionalHostnameEditResponse]:
         """Update the configuration for a specific Regional Hostname.
 
@@ -206,7 +218,7 @@ def edit(
         of a hostname is mutable.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           hostname: DNS hostname to be regionalized, must be a subdomain of the zone. Wildcards are
               supported for one level, e.g `*.example.com`
@@ -248,13 +260,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RegionalHostnameGetResponse]:
         """
         Fetch the configuration for a specific Regional Hostname, within a zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           hostname: DNS hostname to be regionalized, must be a subdomain of the zone. Wildcards are
               supported for one level, e.g `*.example.com`
@@ -291,10 +303,21 @@ def regions(self) -> AsyncRegionsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncRegionalHostnamesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRegionalHostnamesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRegionalHostnamesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRegionalHostnamesResourceWithStreamingResponse(self)
 
     async def create(
@@ -303,12 +326,13 @@ async def create(
         zone_id: str,
         hostname: str,
         region_key: str,
+        routing: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RegionalHostnameCreateResponse]:
         """Create a new Regional Hostname entry.
 
@@ -318,13 +342,15 @@ async def create(
         [Regional Services](https://developers.cloudflare.com/data-localization/regional-services/get-started/).
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           hostname: DNS hostname to be regionalized, must be a subdomain of the zone. Wildcards are
               supported for one level, e.g `*.example.com`
 
           region_key: Identifying key for the region
 
+          routing: Configure which routing method to use for the regional hostname
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -341,6 +367,7 @@ async def create(
                 {
                     "hostname": hostname,
                     "region_key": region_key,
+                    "routing": routing,
                 },
                 regional_hostname_create_params.RegionalHostnameCreateParams,
             ),
@@ -363,13 +390,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[RegionalHostnameListResponse, AsyncSinglePage[RegionalHostnameListResponse]]:
         """
         List all Regional Hostnames within a zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -400,13 +427,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RegionalHostnameDeleteResponse:
         """
         Delete the region configuration for a specific Regional Hostname.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           hostname: DNS hostname to be regionalized, must be a subdomain of the zone. Wildcards are
               supported for one level, e.g `*.example.com`
@@ -442,7 +469,7 @@ async def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RegionalHostnameEditResponse]:
         """Update the configuration for a specific Regional Hostname.
 
@@ -450,7 +477,7 @@ async def edit(
         of a hostname is mutable.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           hostname: DNS hostname to be regionalized, must be a subdomain of the zone. Wildcards are
               supported for one level, e.g `*.example.com`
@@ -494,13 +521,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RegionalHostnameGetResponse]:
         """
         Fetch the configuration for a specific Regional Hostname, within a zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           hostname: DNS hostname to be regionalized, must be a subdomain of the zone. Wildcards are
               supported for one level, e.g `*.example.com`
diff --git a/src/cloudflare/resources/addressing/regional_hostnames/regions.py b/src/cloudflare/resources/addressing/regional_hostnames/regions.py
index c3432d5cb2b..e94af76ff04 100644
--- a/src/cloudflare/resources/addressing/regional_hostnames/regions.py
+++ b/src/cloudflare/resources/addressing/regional_hostnames/regions.py
@@ -4,7 +4,7 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -23,10 +23,21 @@
 class RegionsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RegionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RegionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RegionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RegionsResourceWithStreamingResponse(self)
 
     def list(
@@ -38,13 +49,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[RegionListResponse]:
         """
         List all Regional Services regions available for use by this account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -69,10 +80,21 @@ def list(
 class AsyncRegionsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRegionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRegionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRegionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRegionsResourceWithStreamingResponse(self)
 
     def list(
@@ -84,13 +106,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[RegionListResponse, AsyncSinglePage[RegionListResponse]]:
         """
         List all Regional Services regions available for use by this account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/addressing/services.py b/src/cloudflare/resources/addressing/services.py
index ff6ef55cfa2..959ced7ff44 100644
--- a/src/cloudflare/resources/addressing/services.py
+++ b/src/cloudflare/resources/addressing/services.py
@@ -4,7 +4,7 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Query, Headers, NotGiven, not_given
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -23,10 +23,21 @@
 class ServicesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ServicesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ServicesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ServicesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ServicesResourceWithStreamingResponse(self)
 
     def list(
@@ -38,7 +49,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[ServiceListResponse]:
         """
         Bring-Your-Own IP (BYOIP) prefixes onboarded to Cloudflare must be bound to a
@@ -47,7 +58,7 @@ def list(
         the Cloudflare network, and their service IDs.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
           extra_headers: Send extra headers
 
@@ -72,10 +83,21 @@ def list(
 class AsyncServicesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncServicesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncServicesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncServicesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncServicesResourceWithStreamingResponse(self)
 
     def list(
@@ -87,7 +109,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[ServiceListResponse, AsyncSinglePage[ServiceListResponse]]:
         """
         Bring-Your-Own IP (BYOIP) prefixes onboarded to Cloudflare must be bound to a
@@ -96,7 +118,7 @@ def list(
         the Cloudflare network, and their service IDs.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/ai/__init__.py b/src/cloudflare/resources/ai/__init__.py
new file mode 100644
index 00000000000..ccf8b736c39
--- /dev/null
+++ b/src/cloudflare/resources/ai/__init__.py
@@ -0,0 +1,89 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .ai import (
+    AIResource,
+    AsyncAIResource,
+    AIResourceWithRawResponse,
+    AsyncAIResourceWithRawResponse,
+    AIResourceWithStreamingResponse,
+    AsyncAIResourceWithStreamingResponse,
+)
+from .tasks import (
+    TasksResource,
+    AsyncTasksResource,
+    TasksResourceWithRawResponse,
+    AsyncTasksResourceWithRawResponse,
+    TasksResourceWithStreamingResponse,
+    AsyncTasksResourceWithStreamingResponse,
+)
+from .models import (
+    ModelsResource,
+    AsyncModelsResource,
+    ModelsResourceWithRawResponse,
+    AsyncModelsResourceWithRawResponse,
+    ModelsResourceWithStreamingResponse,
+    AsyncModelsResourceWithStreamingResponse,
+)
+from .authors import (
+    AuthorsResource,
+    AsyncAuthorsResource,
+    AuthorsResourceWithRawResponse,
+    AsyncAuthorsResourceWithRawResponse,
+    AuthorsResourceWithStreamingResponse,
+    AsyncAuthorsResourceWithStreamingResponse,
+)
+from .finetunes import (
+    FinetunesResource,
+    AsyncFinetunesResource,
+    FinetunesResourceWithRawResponse,
+    AsyncFinetunesResourceWithRawResponse,
+    FinetunesResourceWithStreamingResponse,
+    AsyncFinetunesResourceWithStreamingResponse,
+)
+from .to_markdown import (
+    ToMarkdownResource,
+    AsyncToMarkdownResource,
+    ToMarkdownResourceWithRawResponse,
+    AsyncToMarkdownResourceWithRawResponse,
+    ToMarkdownResourceWithStreamingResponse,
+    AsyncToMarkdownResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "FinetunesResource",
+    "AsyncFinetunesResource",
+    "FinetunesResourceWithRawResponse",
+    "AsyncFinetunesResourceWithRawResponse",
+    "FinetunesResourceWithStreamingResponse",
+    "AsyncFinetunesResourceWithStreamingResponse",
+    "AuthorsResource",
+    "AsyncAuthorsResource",
+    "AuthorsResourceWithRawResponse",
+    "AsyncAuthorsResourceWithRawResponse",
+    "AuthorsResourceWithStreamingResponse",
+    "AsyncAuthorsResourceWithStreamingResponse",
+    "TasksResource",
+    "AsyncTasksResource",
+    "TasksResourceWithRawResponse",
+    "AsyncTasksResourceWithRawResponse",
+    "TasksResourceWithStreamingResponse",
+    "AsyncTasksResourceWithStreamingResponse",
+    "ModelsResource",
+    "AsyncModelsResource",
+    "ModelsResourceWithRawResponse",
+    "AsyncModelsResourceWithRawResponse",
+    "ModelsResourceWithStreamingResponse",
+    "AsyncModelsResourceWithStreamingResponse",
+    "ToMarkdownResource",
+    "AsyncToMarkdownResource",
+    "ToMarkdownResourceWithRawResponse",
+    "AsyncToMarkdownResourceWithRawResponse",
+    "ToMarkdownResourceWithStreamingResponse",
+    "AsyncToMarkdownResourceWithStreamingResponse",
+    "AIResource",
+    "AsyncAIResource",
+    "AIResourceWithRawResponse",
+    "AsyncAIResourceWithRawResponse",
+    "AIResourceWithStreamingResponse",
+    "AsyncAIResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/ai/ai.py b/src/cloudflare/resources/ai/ai.py
new file mode 100644
index 00000000000..9a53d1b3df5
--- /dev/null
+++ b/src/cloudflare/resources/ai/ai.py
@@ -0,0 +1,2137 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Any, Union, Iterable, Optional, cast
+from typing_extensions import overload
+
+import httpx
+
+from .tasks import (
+    TasksResource,
+    AsyncTasksResource,
+    TasksResourceWithRawResponse,
+    AsyncTasksResourceWithRawResponse,
+    TasksResourceWithStreamingResponse,
+    AsyncTasksResourceWithStreamingResponse,
+)
+from .authors import (
+    AuthorsResource,
+    AsyncAuthorsResource,
+    AuthorsResourceWithRawResponse,
+    AsyncAuthorsResourceWithRawResponse,
+    AuthorsResourceWithStreamingResponse,
+    AsyncAuthorsResourceWithStreamingResponse,
+)
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ...types.ai import ai_run_params
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from .to_markdown import (
+    ToMarkdownResource,
+    AsyncToMarkdownResource,
+    ToMarkdownResourceWithRawResponse,
+    AsyncToMarkdownResourceWithRawResponse,
+    ToMarkdownResourceWithStreamingResponse,
+    AsyncToMarkdownResourceWithStreamingResponse,
+)
+from .models.models import (
+    ModelsResource,
+    AsyncModelsResource,
+    ModelsResourceWithRawResponse,
+    AsyncModelsResourceWithRawResponse,
+    ModelsResourceWithStreamingResponse,
+    AsyncModelsResourceWithStreamingResponse,
+)
+from ..._base_client import make_request_options
+from .finetunes.finetunes import (
+    FinetunesResource,
+    AsyncFinetunesResource,
+    FinetunesResourceWithRawResponse,
+    AsyncFinetunesResourceWithRawResponse,
+    FinetunesResourceWithStreamingResponse,
+    AsyncFinetunesResourceWithStreamingResponse,
+)
+from ...types.ai.ai_run_response import AIRunResponse
+
+__all__ = ["AIResource", "AsyncAIResource"]
+
+
+class AIResource(SyncAPIResource):
+    @cached_property
+    def finetunes(self) -> FinetunesResource:
+        return FinetunesResource(self._client)
+
+    @cached_property
+    def authors(self) -> AuthorsResource:
+        return AuthorsResource(self._client)
+
+    @cached_property
+    def tasks(self) -> TasksResource:
+        return TasksResource(self._client)
+
+    @cached_property
+    def models(self) -> ModelsResource:
+        return ModelsResource(self._client)
+
+    @cached_property
+    def to_markdown(self) -> ToMarkdownResource:
+        return ToMarkdownResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AIResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AIResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AIResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AIResourceWithStreamingResponse(self)
+
+    @overload
+    def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        text: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          text: The text that you want to classify
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        prompt: str,
+        guidance: float | Omit = omit,
+        height: int | Omit = omit,
+        image: Iterable[float] | Omit = omit,
+        image_b64: str | Omit = omit,
+        mask: Iterable[float] | Omit = omit,
+        negative_prompt: str | Omit = omit,
+        num_steps: int | Omit = omit,
+        seed: int | Omit = omit,
+        strength: float | Omit = omit,
+        width: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          prompt: A text description of the image you want to generate
+
+          guidance: Controls how closely the generated image should adhere to the prompt; higher
+              values make the image more aligned with the prompt
+
+          height: The height of the generated image in pixels
+
+          image: For use with img2img tasks. An array of integers that represent the image data
+              constrained to 8-bit unsigned integer values
+
+          image_b64: For use with img2img tasks. A base64-encoded string of the input image
+
+          mask: An array representing An array of integers that represent mask image data for
+              inpainting constrained to 8-bit unsigned integer values
+
+          negative_prompt: Text describing elements to avoid in the generated image
+
+          num_steps: The number of diffusion steps; higher values can improve quality but take longer
+
+          seed: Random seed for reproducibility of the image generation
+
+          strength: A value between 0 and 1 indicating how strongly to apply the transformation
+              during img2img tasks; lower values make the output closer to the input image
+
+          width: The width of the generated image in pixels
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        prompt: str,
+        lang: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          prompt: A text description of the audio you want to generate
+
+          lang: The speech language (e.g., 'en' for English, 'fr' for French). Defaults to 'en'
+              if not specified
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        text: Union[str, SequenceNotStr[str]],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          text: The text to embed
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        audio: Iterable[float],
+        source_lang: str | Omit = omit,
+        target_lang: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          audio: An array of integers that represent the audio data constrained to 8-bit unsigned
+              integer values
+
+          source_lang: The language of the recorded audio
+
+          target_lang: The language to translate the transcription into. Currently only English is
+              supported.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        image: Iterable[float],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          image: An array of integers that represent the image data constrained to 8-bit unsigned
+              integer values
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        image: Iterable[float] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          image: An array of integers that represent the image data constrained to 8-bit unsigned
+              integer values
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        prompt: str,
+        frequency_penalty: float | Omit = omit,
+        lora: str | Omit = omit,
+        max_tokens: int | Omit = omit,
+        presence_penalty: float | Omit = omit,
+        raw: bool | Omit = omit,
+        repetition_penalty: float | Omit = omit,
+        response_format: ai_run_params.PromptResponseFormat | Omit = omit,
+        seed: int | Omit = omit,
+        stream: bool | Omit = omit,
+        temperature: float | Omit = omit,
+        top_k: int | Omit = omit,
+        top_p: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          prompt: The input text prompt for the model to generate a response.
+
+          frequency_penalty: Decreases the likelihood of the model repeating the same lines verbatim.
+
+          lora: Name of the LoRA (Low-Rank Adaptation) model to fine-tune the base model.
+
+          max_tokens: The maximum number of tokens to generate in the response.
+
+          presence_penalty: Increases the likelihood of the model introducing new topics.
+
+          raw: If true, a chat template is not applied and you must adhere to the specific
+              model's expected formatting.
+
+          repetition_penalty: Penalty for repeated tokens; higher values discourage repetition.
+
+          seed: Random seed for reproducibility of the generation.
+
+          stream: If true, the response will be streamed back incrementally using SSE, Server Sent
+              Events.
+
+          temperature: Controls the randomness of the output; higher values produce more random
+              results.
+
+          top_k: Limits the AI to choose from the top 'k' most probable words. Lower values make
+              responses more focused; higher values introduce more variety and potential
+              surprises.
+
+          top_p: Adjusts the creativity of the AI's responses by controlling how many possible
+              words it considers. Lower values make outputs more predictable; higher values
+              allow for more varied and creative responses.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        messages: Iterable[ai_run_params.MessagesMessage],
+        frequency_penalty: float | Omit = omit,
+        functions: Iterable[ai_run_params.MessagesFunction] | Omit = omit,
+        max_tokens: int | Omit = omit,
+        presence_penalty: float | Omit = omit,
+        raw: bool | Omit = omit,
+        repetition_penalty: float | Omit = omit,
+        response_format: ai_run_params.MessagesResponseFormat | Omit = omit,
+        seed: int | Omit = omit,
+        stream: bool | Omit = omit,
+        temperature: float | Omit = omit,
+        tools: Iterable[ai_run_params.MessagesTool] | Omit = omit,
+        top_k: int | Omit = omit,
+        top_p: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          messages: An array of message objects representing the conversation history.
+
+          frequency_penalty: Decreases the likelihood of the model repeating the same lines verbatim.
+
+          max_tokens: The maximum number of tokens to generate in the response.
+
+          presence_penalty: Increases the likelihood of the model introducing new topics.
+
+          raw: If true, a chat template is not applied and you must adhere to the specific
+              model's expected formatting.
+
+          repetition_penalty: Penalty for repeated tokens; higher values discourage repetition.
+
+          seed: Random seed for reproducibility of the generation.
+
+          stream: If true, the response will be streamed back incrementally using SSE, Server Sent
+              Events.
+
+          temperature: Controls the randomness of the output; higher values produce more random
+              results.
+
+          tools: A list of tools available for the assistant to use.
+
+          top_k: Limits the AI to choose from the top 'k' most probable words. Lower values make
+              responses more focused; higher values introduce more variety and potential
+              surprises.
+
+          top_p: Adjusts the creativity of the AI's responses by controlling how many possible
+              words it considers. Lower values make outputs more predictable; higher values
+              allow for more varied and creative responses.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        target_lang: str,
+        text: str,
+        source_lang: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          target_lang: The language code to translate the text into (e.g., 'es' for Spanish)
+
+          text: The text to be translated
+
+          source_lang: The language code of the source text (e.g., 'en' for English). Defaults to 'en'
+              if not specified
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        input_text: str,
+        max_length: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          input_text: The text that you want the model to summarize
+
+          max_length: The maximum length of the generated summary in tokens
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        image: Iterable[float],
+        frequency_penalty: float | Omit = omit,
+        max_tokens: int | Omit = omit,
+        presence_penalty: float | Omit = omit,
+        prompt: str | Omit = omit,
+        raw: bool | Omit = omit,
+        repetition_penalty: float | Omit = omit,
+        seed: float | Omit = omit,
+        temperature: float | Omit = omit,
+        top_k: float | Omit = omit,
+        top_p: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          image: An array of integers that represent the image data constrained to 8-bit unsigned
+              integer values
+
+          frequency_penalty: Decreases the likelihood of the model repeating the same lines verbatim.
+
+          max_tokens: The maximum number of tokens to generate in the response.
+
+          presence_penalty: Increases the likelihood of the model introducing new topics.
+
+          prompt: The input text prompt for the model to generate a response.
+
+          raw: If true, a chat template is not applied and you must adhere to the specific
+              model's expected formatting.
+
+          repetition_penalty: Penalty for repeated tokens; higher values discourage repetition.
+
+          seed: Random seed for reproducibility of the generation.
+
+          temperature: Controls the randomness of the output; higher values produce more random
+              results.
+
+          top_k: Limits the AI to choose from the top 'k' most probable words. Lower values make
+              responses more focused; higher values introduce more variety and potential
+              surprises.
+
+          top_p: Controls the creativity of the AI's responses by adjusting how many possible
+              words it considers. Lower values make outputs more predictable; higher values
+              allow for more varied and creative responses.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        image: str,
+        prompt: str,
+        frequency_penalty: float | Omit = omit,
+        ignore_eos: bool | Omit = omit,
+        max_tokens: int | Omit = omit,
+        presence_penalty: float | Omit = omit,
+        repetition_penalty: float | Omit = omit,
+        seed: float | Omit = omit,
+        temperature: float | Omit = omit,
+        top_k: float | Omit = omit,
+        top_p: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          image: Image in base64 encoded format.
+
+          prompt: The input text prompt for the model to generate a response.
+
+          frequency_penalty: Decreases the likelihood of the model repeating the same lines verbatim.
+
+          ignore_eos: Whether to ignore the EOS token and continue generating tokens after the EOS
+              token is generated.
+
+          max_tokens: The maximum number of tokens to generate in the response.
+
+          presence_penalty: Increases the likelihood of the model introducing new topics.
+
+          repetition_penalty: Penalty for repeated tokens; higher values discourage repetition.
+
+          seed: Random seed for reproducibility of the generation.
+
+          temperature: Controls the randomness of the output; higher values produce more random
+              results.
+
+          top_k: Limits the AI to choose from the top 'k' most probable words. Lower values make
+              responses more focused; higher values introduce more variety and potential
+              surprises.
+
+          top_p: Controls the creativity of the AI's responses by adjusting how many possible
+              words it considers. Lower values make outputs more predictable; higher values
+              allow for more varied and creative responses.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        image: str,
+        messages: Iterable[ai_run_params.Variant13Message],
+        frequency_penalty: float | Omit = omit,
+        ignore_eos: bool | Omit = omit,
+        max_tokens: int | Omit = omit,
+        presence_penalty: float | Omit = omit,
+        repetition_penalty: float | Omit = omit,
+        seed: float | Omit = omit,
+        temperature: float | Omit = omit,
+        top_k: float | Omit = omit,
+        top_p: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          image: Image in base64 encoded format.
+
+          messages: An array of message objects representing the conversation history.
+
+          frequency_penalty: Decreases the likelihood of the model repeating the same lines verbatim.
+
+          ignore_eos: Whether to ignore the EOS token and continue generating tokens after the EOS
+              token is generated.
+
+          max_tokens: The maximum number of tokens to generate in the response.
+
+          presence_penalty: Increases the likelihood of the model introducing new topics.
+
+          repetition_penalty: Penalty for repeated tokens; higher values discourage repetition.
+
+          seed: Random seed for reproducibility of the generation.
+
+          temperature: Controls the randomness of the output; higher values produce more random
+              results.
+
+          top_k: Limits the AI to choose from the top 'k' most probable words. Lower values make
+              responses more focused; higher values introduce more variety and potential
+              surprises.
+
+          top_p: Controls the creativity of the AI's responses by adjusting how many possible
+              words it considers. Lower values make outputs more predictable; higher values
+              allow for more varied and creative responses.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        image: str | Omit = omit,
+        text: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          image: Image in base64 encoded format.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(
+        ["account_id", "text"],
+        ["account_id", "prompt"],
+        ["account_id", "audio"],
+        ["account_id", "image"],
+        ["account_id"],
+        ["account_id", "messages"],
+        ["account_id", "target_lang", "text"],
+        ["account_id", "input_text"],
+        ["account_id", "image", "prompt"],
+        ["account_id", "image", "messages"],
+    )
+    def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        text: str | Union[str, SequenceNotStr[str]] | SequenceNotStr[str] | Omit = omit,
+        prompt: str | Omit = omit,
+        guidance: float | Omit = omit,
+        height: int | Omit = omit,
+        image: Iterable[float] | str | Omit = omit,
+        image_b64: str | Omit = omit,
+        mask: Iterable[float] | Omit = omit,
+        negative_prompt: str | Omit = omit,
+        num_steps: int | Omit = omit,
+        seed: int | float | Omit = omit,
+        strength: float | Omit = omit,
+        width: int | Omit = omit,
+        lang: str | Omit = omit,
+        audio: Iterable[float] | Omit = omit,
+        source_lang: str | Omit = omit,
+        target_lang: str | Omit = omit,
+        frequency_penalty: float | Omit = omit,
+        lora: str | Omit = omit,
+        max_tokens: int | Omit = omit,
+        presence_penalty: float | Omit = omit,
+        raw: bool | Omit = omit,
+        repetition_penalty: float | Omit = omit,
+        response_format: ai_run_params.PromptResponseFormat | ai_run_params.MessagesResponseFormat | Omit = omit,
+        stream: bool | Omit = omit,
+        temperature: float | Omit = omit,
+        top_k: int | float | Omit = omit,
+        top_p: float | Omit = omit,
+        messages: Iterable[ai_run_params.MessagesMessage] | Iterable[ai_run_params.Variant13Message] | Omit = omit,
+        functions: Iterable[ai_run_params.MessagesFunction] | Omit = omit,
+        tools: Iterable[ai_run_params.MessagesTool] | Omit = omit,
+        input_text: str | Omit = omit,
+        max_length: int | Omit = omit,
+        ignore_eos: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not model_name:
+            raise ValueError(f"Expected a non-empty value for `model_name` but received {model_name!r}")
+        return cast(
+            Optional[AIRunResponse],
+            self._post(
+                f"/accounts/{account_id}/ai/run/{model_name}",
+                body=maybe_transform(
+                    {
+                        "text": text,
+                        "prompt": prompt,
+                        "guidance": guidance,
+                        "height": height,
+                        "image": image,
+                        "image_b64": image_b64,
+                        "mask": mask,
+                        "negative_prompt": negative_prompt,
+                        "num_steps": num_steps,
+                        "seed": seed,
+                        "strength": strength,
+                        "width": width,
+                        "lang": lang,
+                        "audio": audio,
+                        "source_lang": source_lang,
+                        "target_lang": target_lang,
+                        "frequency_penalty": frequency_penalty,
+                        "lora": lora,
+                        "max_tokens": max_tokens,
+                        "presence_penalty": presence_penalty,
+                        "raw": raw,
+                        "repetition_penalty": repetition_penalty,
+                        "response_format": response_format,
+                        "stream": stream,
+                        "temperature": temperature,
+                        "top_k": top_k,
+                        "top_p": top_p,
+                        "messages": messages,
+                        "functions": functions,
+                        "tools": tools,
+                        "input_text": input_text,
+                        "max_length": max_length,
+                        "ignore_eos": ignore_eos,
+                    },
+                    ai_run_params.AIRunParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[AIRunResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[AIRunResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+
+class AsyncAIResource(AsyncAPIResource):
+    @cached_property
+    def finetunes(self) -> AsyncFinetunesResource:
+        return AsyncFinetunesResource(self._client)
+
+    @cached_property
+    def authors(self) -> AsyncAuthorsResource:
+        return AsyncAuthorsResource(self._client)
+
+    @cached_property
+    def tasks(self) -> AsyncTasksResource:
+        return AsyncTasksResource(self._client)
+
+    @cached_property
+    def models(self) -> AsyncModelsResource:
+        return AsyncModelsResource(self._client)
+
+    @cached_property
+    def to_markdown(self) -> AsyncToMarkdownResource:
+        return AsyncToMarkdownResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncAIResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAIResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAIResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAIResourceWithStreamingResponse(self)
+
+    @overload
+    async def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        text: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          text: The text that you want to classify
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        prompt: str,
+        guidance: float | Omit = omit,
+        height: int | Omit = omit,
+        image: Iterable[float] | Omit = omit,
+        image_b64: str | Omit = omit,
+        mask: Iterable[float] | Omit = omit,
+        negative_prompt: str | Omit = omit,
+        num_steps: int | Omit = omit,
+        seed: int | Omit = omit,
+        strength: float | Omit = omit,
+        width: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          prompt: A text description of the image you want to generate
+
+          guidance: Controls how closely the generated image should adhere to the prompt; higher
+              values make the image more aligned with the prompt
+
+          height: The height of the generated image in pixels
+
+          image: For use with img2img tasks. An array of integers that represent the image data
+              constrained to 8-bit unsigned integer values
+
+          image_b64: For use with img2img tasks. A base64-encoded string of the input image
+
+          mask: An array representing An array of integers that represent mask image data for
+              inpainting constrained to 8-bit unsigned integer values
+
+          negative_prompt: Text describing elements to avoid in the generated image
+
+          num_steps: The number of diffusion steps; higher values can improve quality but take longer
+
+          seed: Random seed for reproducibility of the image generation
+
+          strength: A value between 0 and 1 indicating how strongly to apply the transformation
+              during img2img tasks; lower values make the output closer to the input image
+
+          width: The width of the generated image in pixels
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        prompt: str,
+        lang: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          prompt: A text description of the audio you want to generate
+
+          lang: The speech language (e.g., 'en' for English, 'fr' for French). Defaults to 'en'
+              if not specified
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        text: Union[str, SequenceNotStr[str]],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          text: The text to embed
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        audio: Iterable[float],
+        source_lang: str | Omit = omit,
+        target_lang: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          audio: An array of integers that represent the audio data constrained to 8-bit unsigned
+              integer values
+
+          source_lang: The language of the recorded audio
+
+          target_lang: The language to translate the transcription into. Currently only English is
+              supported.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        image: Iterable[float],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          image: An array of integers that represent the image data constrained to 8-bit unsigned
+              integer values
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        image: Iterable[float] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          image: An array of integers that represent the image data constrained to 8-bit unsigned
+              integer values
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        prompt: str,
+        frequency_penalty: float | Omit = omit,
+        lora: str | Omit = omit,
+        max_tokens: int | Omit = omit,
+        presence_penalty: float | Omit = omit,
+        raw: bool | Omit = omit,
+        repetition_penalty: float | Omit = omit,
+        response_format: ai_run_params.PromptResponseFormat | Omit = omit,
+        seed: int | Omit = omit,
+        stream: bool | Omit = omit,
+        temperature: float | Omit = omit,
+        top_k: int | Omit = omit,
+        top_p: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          prompt: The input text prompt for the model to generate a response.
+
+          frequency_penalty: Decreases the likelihood of the model repeating the same lines verbatim.
+
+          lora: Name of the LoRA (Low-Rank Adaptation) model to fine-tune the base model.
+
+          max_tokens: The maximum number of tokens to generate in the response.
+
+          presence_penalty: Increases the likelihood of the model introducing new topics.
+
+          raw: If true, a chat template is not applied and you must adhere to the specific
+              model's expected formatting.
+
+          repetition_penalty: Penalty for repeated tokens; higher values discourage repetition.
+
+          seed: Random seed for reproducibility of the generation.
+
+          stream: If true, the response will be streamed back incrementally using SSE, Server Sent
+              Events.
+
+          temperature: Controls the randomness of the output; higher values produce more random
+              results.
+
+          top_k: Limits the AI to choose from the top 'k' most probable words. Lower values make
+              responses more focused; higher values introduce more variety and potential
+              surprises.
+
+          top_p: Adjusts the creativity of the AI's responses by controlling how many possible
+              words it considers. Lower values make outputs more predictable; higher values
+              allow for more varied and creative responses.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        messages: Iterable[ai_run_params.MessagesMessage],
+        frequency_penalty: float | Omit = omit,
+        functions: Iterable[ai_run_params.MessagesFunction] | Omit = omit,
+        max_tokens: int | Omit = omit,
+        presence_penalty: float | Omit = omit,
+        raw: bool | Omit = omit,
+        repetition_penalty: float | Omit = omit,
+        response_format: ai_run_params.MessagesResponseFormat | Omit = omit,
+        seed: int | Omit = omit,
+        stream: bool | Omit = omit,
+        temperature: float | Omit = omit,
+        tools: Iterable[ai_run_params.MessagesTool] | Omit = omit,
+        top_k: int | Omit = omit,
+        top_p: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          messages: An array of message objects representing the conversation history.
+
+          frequency_penalty: Decreases the likelihood of the model repeating the same lines verbatim.
+
+          max_tokens: The maximum number of tokens to generate in the response.
+
+          presence_penalty: Increases the likelihood of the model introducing new topics.
+
+          raw: If true, a chat template is not applied and you must adhere to the specific
+              model's expected formatting.
+
+          repetition_penalty: Penalty for repeated tokens; higher values discourage repetition.
+
+          seed: Random seed for reproducibility of the generation.
+
+          stream: If true, the response will be streamed back incrementally using SSE, Server Sent
+              Events.
+
+          temperature: Controls the randomness of the output; higher values produce more random
+              results.
+
+          tools: A list of tools available for the assistant to use.
+
+          top_k: Limits the AI to choose from the top 'k' most probable words. Lower values make
+              responses more focused; higher values introduce more variety and potential
+              surprises.
+
+          top_p: Adjusts the creativity of the AI's responses by controlling how many possible
+              words it considers. Lower values make outputs more predictable; higher values
+              allow for more varied and creative responses.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        target_lang: str,
+        text: str,
+        source_lang: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          target_lang: The language code to translate the text into (e.g., 'es' for Spanish)
+
+          text: The text to be translated
+
+          source_lang: The language code of the source text (e.g., 'en' for English). Defaults to 'en'
+              if not specified
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        input_text: str,
+        max_length: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          input_text: The text that you want the model to summarize
+
+          max_length: The maximum length of the generated summary in tokens
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        image: Iterable[float],
+        frequency_penalty: float | Omit = omit,
+        max_tokens: int | Omit = omit,
+        presence_penalty: float | Omit = omit,
+        prompt: str | Omit = omit,
+        raw: bool | Omit = omit,
+        repetition_penalty: float | Omit = omit,
+        seed: float | Omit = omit,
+        temperature: float | Omit = omit,
+        top_k: float | Omit = omit,
+        top_p: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          image: An array of integers that represent the image data constrained to 8-bit unsigned
+              integer values
+
+          frequency_penalty: Decreases the likelihood of the model repeating the same lines verbatim.
+
+          max_tokens: The maximum number of tokens to generate in the response.
+
+          presence_penalty: Increases the likelihood of the model introducing new topics.
+
+          prompt: The input text prompt for the model to generate a response.
+
+          raw: If true, a chat template is not applied and you must adhere to the specific
+              model's expected formatting.
+
+          repetition_penalty: Penalty for repeated tokens; higher values discourage repetition.
+
+          seed: Random seed for reproducibility of the generation.
+
+          temperature: Controls the randomness of the output; higher values produce more random
+              results.
+
+          top_k: Limits the AI to choose from the top 'k' most probable words. Lower values make
+              responses more focused; higher values introduce more variety and potential
+              surprises.
+
+          top_p: Controls the creativity of the AI's responses by adjusting how many possible
+              words it considers. Lower values make outputs more predictable; higher values
+              allow for more varied and creative responses.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        image: str,
+        prompt: str,
+        frequency_penalty: float | Omit = omit,
+        ignore_eos: bool | Omit = omit,
+        max_tokens: int | Omit = omit,
+        presence_penalty: float | Omit = omit,
+        repetition_penalty: float | Omit = omit,
+        seed: float | Omit = omit,
+        temperature: float | Omit = omit,
+        top_k: float | Omit = omit,
+        top_p: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          image: Image in base64 encoded format.
+
+          prompt: The input text prompt for the model to generate a response.
+
+          frequency_penalty: Decreases the likelihood of the model repeating the same lines verbatim.
+
+          ignore_eos: Whether to ignore the EOS token and continue generating tokens after the EOS
+              token is generated.
+
+          max_tokens: The maximum number of tokens to generate in the response.
+
+          presence_penalty: Increases the likelihood of the model introducing new topics.
+
+          repetition_penalty: Penalty for repeated tokens; higher values discourage repetition.
+
+          seed: Random seed for reproducibility of the generation.
+
+          temperature: Controls the randomness of the output; higher values produce more random
+              results.
+
+          top_k: Limits the AI to choose from the top 'k' most probable words. Lower values make
+              responses more focused; higher values introduce more variety and potential
+              surprises.
+
+          top_p: Controls the creativity of the AI's responses by adjusting how many possible
+              words it considers. Lower values make outputs more predictable; higher values
+              allow for more varied and creative responses.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        image: str,
+        messages: Iterable[ai_run_params.Variant13Message],
+        frequency_penalty: float | Omit = omit,
+        ignore_eos: bool | Omit = omit,
+        max_tokens: int | Omit = omit,
+        presence_penalty: float | Omit = omit,
+        repetition_penalty: float | Omit = omit,
+        seed: float | Omit = omit,
+        temperature: float | Omit = omit,
+        top_k: float | Omit = omit,
+        top_p: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          image: Image in base64 encoded format.
+
+          messages: An array of message objects representing the conversation history.
+
+          frequency_penalty: Decreases the likelihood of the model repeating the same lines verbatim.
+
+          ignore_eos: Whether to ignore the EOS token and continue generating tokens after the EOS
+              token is generated.
+
+          max_tokens: The maximum number of tokens to generate in the response.
+
+          presence_penalty: Increases the likelihood of the model introducing new topics.
+
+          repetition_penalty: Penalty for repeated tokens; higher values discourage repetition.
+
+          seed: Random seed for reproducibility of the generation.
+
+          temperature: Controls the randomness of the output; higher values produce more random
+              results.
+
+          top_k: Limits the AI to choose from the top 'k' most probable words. Lower values make
+              responses more focused; higher values introduce more variety and potential
+              surprises.
+
+          top_p: Controls the creativity of the AI's responses by adjusting how many possible
+              words it considers. Lower values make outputs more predictable; higher values
+              allow for more varied and creative responses.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        image: str | Omit = omit,
+        text: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        """
+        This endpoint provides users with the capability to run specific AI models
+        on-demand.
+
+        By submitting the required input data, users can receive real-time predictions
+        or results generated by the chosen AI model. The endpoint supports various AI
+        model types, ensuring flexibility and adaptability for diverse use cases.
+
+        Model specific inputs available in
+        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+
+        Args:
+          image: Image in base64 encoded format.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(
+        ["account_id", "text"],
+        ["account_id", "prompt"],
+        ["account_id", "audio"],
+        ["account_id", "image"],
+        ["account_id"],
+        ["account_id", "messages"],
+        ["account_id", "target_lang", "text"],
+        ["account_id", "input_text"],
+        ["account_id", "image", "prompt"],
+        ["account_id", "image", "messages"],
+    )
+    async def run(
+        self,
+        model_name: str,
+        *,
+        account_id: str,
+        text: str | Union[str, SequenceNotStr[str]] | SequenceNotStr[str] | Omit = omit,
+        prompt: str | Omit = omit,
+        guidance: float | Omit = omit,
+        height: int | Omit = omit,
+        image: Iterable[float] | str | Omit = omit,
+        image_b64: str | Omit = omit,
+        mask: Iterable[float] | Omit = omit,
+        negative_prompt: str | Omit = omit,
+        num_steps: int | Omit = omit,
+        seed: int | float | Omit = omit,
+        strength: float | Omit = omit,
+        width: int | Omit = omit,
+        lang: str | Omit = omit,
+        audio: Iterable[float] | Omit = omit,
+        source_lang: str | Omit = omit,
+        target_lang: str | Omit = omit,
+        frequency_penalty: float | Omit = omit,
+        lora: str | Omit = omit,
+        max_tokens: int | Omit = omit,
+        presence_penalty: float | Omit = omit,
+        raw: bool | Omit = omit,
+        repetition_penalty: float | Omit = omit,
+        response_format: ai_run_params.PromptResponseFormat | ai_run_params.MessagesResponseFormat | Omit = omit,
+        stream: bool | Omit = omit,
+        temperature: float | Omit = omit,
+        top_k: int | float | Omit = omit,
+        top_p: float | Omit = omit,
+        messages: Iterable[ai_run_params.MessagesMessage] | Iterable[ai_run_params.Variant13Message] | Omit = omit,
+        functions: Iterable[ai_run_params.MessagesFunction] | Omit = omit,
+        tools: Iterable[ai_run_params.MessagesTool] | Omit = omit,
+        input_text: str | Omit = omit,
+        max_length: int | Omit = omit,
+        ignore_eos: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AIRunResponse]:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not model_name:
+            raise ValueError(f"Expected a non-empty value for `model_name` but received {model_name!r}")
+        return cast(
+            Optional[AIRunResponse],
+            await self._post(
+                f"/accounts/{account_id}/ai/run/{model_name}",
+                body=await async_maybe_transform(
+                    {
+                        "text": text,
+                        "prompt": prompt,
+                        "guidance": guidance,
+                        "height": height,
+                        "image": image,
+                        "image_b64": image_b64,
+                        "mask": mask,
+                        "negative_prompt": negative_prompt,
+                        "num_steps": num_steps,
+                        "seed": seed,
+                        "strength": strength,
+                        "width": width,
+                        "lang": lang,
+                        "audio": audio,
+                        "source_lang": source_lang,
+                        "target_lang": target_lang,
+                        "frequency_penalty": frequency_penalty,
+                        "lora": lora,
+                        "max_tokens": max_tokens,
+                        "presence_penalty": presence_penalty,
+                        "raw": raw,
+                        "repetition_penalty": repetition_penalty,
+                        "response_format": response_format,
+                        "stream": stream,
+                        "temperature": temperature,
+                        "top_k": top_k,
+                        "top_p": top_p,
+                        "messages": messages,
+                        "functions": functions,
+                        "tools": tools,
+                        "input_text": input_text,
+                        "max_length": max_length,
+                        "ignore_eos": ignore_eos,
+                    },
+                    ai_run_params.AIRunParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[AIRunResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[AIRunResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+
+class AIResourceWithRawResponse:
+    def __init__(self, ai: AIResource) -> None:
+        self._ai = ai
+
+        self.run = to_raw_response_wrapper(
+            ai.run,
+        )
+
+    @cached_property
+    def finetunes(self) -> FinetunesResourceWithRawResponse:
+        return FinetunesResourceWithRawResponse(self._ai.finetunes)
+
+    @cached_property
+    def authors(self) -> AuthorsResourceWithRawResponse:
+        return AuthorsResourceWithRawResponse(self._ai.authors)
+
+    @cached_property
+    def tasks(self) -> TasksResourceWithRawResponse:
+        return TasksResourceWithRawResponse(self._ai.tasks)
+
+    @cached_property
+    def models(self) -> ModelsResourceWithRawResponse:
+        return ModelsResourceWithRawResponse(self._ai.models)
+
+    @cached_property
+    def to_markdown(self) -> ToMarkdownResourceWithRawResponse:
+        return ToMarkdownResourceWithRawResponse(self._ai.to_markdown)
+
+
+class AsyncAIResourceWithRawResponse:
+    def __init__(self, ai: AsyncAIResource) -> None:
+        self._ai = ai
+
+        self.run = async_to_raw_response_wrapper(
+            ai.run,
+        )
+
+    @cached_property
+    def finetunes(self) -> AsyncFinetunesResourceWithRawResponse:
+        return AsyncFinetunesResourceWithRawResponse(self._ai.finetunes)
+
+    @cached_property
+    def authors(self) -> AsyncAuthorsResourceWithRawResponse:
+        return AsyncAuthorsResourceWithRawResponse(self._ai.authors)
+
+    @cached_property
+    def tasks(self) -> AsyncTasksResourceWithRawResponse:
+        return AsyncTasksResourceWithRawResponse(self._ai.tasks)
+
+    @cached_property
+    def models(self) -> AsyncModelsResourceWithRawResponse:
+        return AsyncModelsResourceWithRawResponse(self._ai.models)
+
+    @cached_property
+    def to_markdown(self) -> AsyncToMarkdownResourceWithRawResponse:
+        return AsyncToMarkdownResourceWithRawResponse(self._ai.to_markdown)
+
+
+class AIResourceWithStreamingResponse:
+    def __init__(self, ai: AIResource) -> None:
+        self._ai = ai
+
+        self.run = to_streamed_response_wrapper(
+            ai.run,
+        )
+
+    @cached_property
+    def finetunes(self) -> FinetunesResourceWithStreamingResponse:
+        return FinetunesResourceWithStreamingResponse(self._ai.finetunes)
+
+    @cached_property
+    def authors(self) -> AuthorsResourceWithStreamingResponse:
+        return AuthorsResourceWithStreamingResponse(self._ai.authors)
+
+    @cached_property
+    def tasks(self) -> TasksResourceWithStreamingResponse:
+        return TasksResourceWithStreamingResponse(self._ai.tasks)
+
+    @cached_property
+    def models(self) -> ModelsResourceWithStreamingResponse:
+        return ModelsResourceWithStreamingResponse(self._ai.models)
+
+    @cached_property
+    def to_markdown(self) -> ToMarkdownResourceWithStreamingResponse:
+        return ToMarkdownResourceWithStreamingResponse(self._ai.to_markdown)
+
+
+class AsyncAIResourceWithStreamingResponse:
+    def __init__(self, ai: AsyncAIResource) -> None:
+        self._ai = ai
+
+        self.run = async_to_streamed_response_wrapper(
+            ai.run,
+        )
+
+    @cached_property
+    def finetunes(self) -> AsyncFinetunesResourceWithStreamingResponse:
+        return AsyncFinetunesResourceWithStreamingResponse(self._ai.finetunes)
+
+    @cached_property
+    def authors(self) -> AsyncAuthorsResourceWithStreamingResponse:
+        return AsyncAuthorsResourceWithStreamingResponse(self._ai.authors)
+
+    @cached_property
+    def tasks(self) -> AsyncTasksResourceWithStreamingResponse:
+        return AsyncTasksResourceWithStreamingResponse(self._ai.tasks)
+
+    @cached_property
+    def models(self) -> AsyncModelsResourceWithStreamingResponse:
+        return AsyncModelsResourceWithStreamingResponse(self._ai.models)
+
+    @cached_property
+    def to_markdown(self) -> AsyncToMarkdownResourceWithStreamingResponse:
+        return AsyncToMarkdownResourceWithStreamingResponse(self._ai.to_markdown)
diff --git a/src/cloudflare/resources/ai/authors.py b/src/cloudflare/resources/ai/authors.py
new file mode 100644
index 00000000000..8f3ceeb8486
--- /dev/null
+++ b/src/cloudflare/resources/ai/authors.py
@@ -0,0 +1,165 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+
+__all__ = ["AuthorsResource", "AsyncAuthorsResource"]
+
+
+class AuthorsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AuthorsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AuthorsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AuthorsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AuthorsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[object]:
+        """
+        Author Search
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai/authors/search",
+            page=SyncSinglePage[object],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=object,
+        )
+
+
+class AsyncAuthorsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncAuthorsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAuthorsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAuthorsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAuthorsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[object, AsyncSinglePage[object]]:
+        """
+        Author Search
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai/authors/search",
+            page=AsyncSinglePage[object],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=object,
+        )
+
+
+class AuthorsResourceWithRawResponse:
+    def __init__(self, authors: AuthorsResource) -> None:
+        self._authors = authors
+
+        self.list = to_raw_response_wrapper(
+            authors.list,
+        )
+
+
+class AsyncAuthorsResourceWithRawResponse:
+    def __init__(self, authors: AsyncAuthorsResource) -> None:
+        self._authors = authors
+
+        self.list = async_to_raw_response_wrapper(
+            authors.list,
+        )
+
+
+class AuthorsResourceWithStreamingResponse:
+    def __init__(self, authors: AuthorsResource) -> None:
+        self._authors = authors
+
+        self.list = to_streamed_response_wrapper(
+            authors.list,
+        )
+
+
+class AsyncAuthorsResourceWithStreamingResponse:
+    def __init__(self, authors: AsyncAuthorsResource) -> None:
+        self._authors = authors
+
+        self.list = async_to_streamed_response_wrapper(
+            authors.list,
+        )
diff --git a/src/cloudflare/resources/ai/finetunes/__init__.py b/src/cloudflare/resources/ai/finetunes/__init__.py
new file mode 100644
index 00000000000..57d977a86f3
--- /dev/null
+++ b/src/cloudflare/resources/ai/finetunes/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .assets import (
+    AssetsResource,
+    AsyncAssetsResource,
+    AssetsResourceWithRawResponse,
+    AsyncAssetsResourceWithRawResponse,
+    AssetsResourceWithStreamingResponse,
+    AsyncAssetsResourceWithStreamingResponse,
+)
+from .public import (
+    PublicResource,
+    AsyncPublicResource,
+    PublicResourceWithRawResponse,
+    AsyncPublicResourceWithRawResponse,
+    PublicResourceWithStreamingResponse,
+    AsyncPublicResourceWithStreamingResponse,
+)
+from .finetunes import (
+    FinetunesResource,
+    AsyncFinetunesResource,
+    FinetunesResourceWithRawResponse,
+    AsyncFinetunesResourceWithRawResponse,
+    FinetunesResourceWithStreamingResponse,
+    AsyncFinetunesResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "AssetsResource",
+    "AsyncAssetsResource",
+    "AssetsResourceWithRawResponse",
+    "AsyncAssetsResourceWithRawResponse",
+    "AssetsResourceWithStreamingResponse",
+    "AsyncAssetsResourceWithStreamingResponse",
+    "PublicResource",
+    "AsyncPublicResource",
+    "PublicResourceWithRawResponse",
+    "AsyncPublicResourceWithRawResponse",
+    "PublicResourceWithStreamingResponse",
+    "AsyncPublicResourceWithStreamingResponse",
+    "FinetunesResource",
+    "AsyncFinetunesResource",
+    "FinetunesResourceWithRawResponse",
+    "AsyncFinetunesResourceWithRawResponse",
+    "FinetunesResourceWithStreamingResponse",
+    "AsyncFinetunesResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/ai/finetunes/assets.py b/src/cloudflare/resources/ai/finetunes/assets.py
new file mode 100644
index 00000000000..50ce6bb6cae
--- /dev/null
+++ b/src/cloudflare/resources/ai/finetunes/assets.py
@@ -0,0 +1,203 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Mapping, cast
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, FileTypes, omit, not_given
+from ...._utils import extract_files, maybe_transform, deepcopy_minimal, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._base_client import make_request_options
+from ....types.ai.finetunes import asset_create_params
+from ....types.ai.finetunes.asset_create_response import AssetCreateResponse
+
+__all__ = ["AssetsResource", "AsyncAssetsResource"]
+
+
+class AssetsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AssetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AssetsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AssetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AssetsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        finetune_id: str,
+        *,
+        account_id: str,
+        file: FileTypes | Omit = omit,
+        file_name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AssetCreateResponse:
+        """
+        Upload a Finetune Asset
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not finetune_id:
+            raise ValueError(f"Expected a non-empty value for `finetune_id` but received {finetune_id!r}")
+        body = deepcopy_minimal(
+            {
+                "file": file,
+                "file_name": file_name,
+            }
+        )
+        files = extract_files(cast(Mapping[str, object], body), paths=[["file"]])
+        # It should be noted that the actual Content-Type header that will be
+        # sent to the server will contain a `boundary` parameter, e.g.
+        # multipart/form-data; boundary=---abc--
+        extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
+        return self._post(
+            f"/accounts/{account_id}/ai/finetunes/{finetune_id}/finetune-assets",
+            body=maybe_transform(body, asset_create_params.AssetCreateParams),
+            files=files,
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=AssetCreateResponse,
+        )
+
+
+class AsyncAssetsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncAssetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAssetsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAssetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAssetsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        finetune_id: str,
+        *,
+        account_id: str,
+        file: FileTypes | Omit = omit,
+        file_name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AssetCreateResponse:
+        """
+        Upload a Finetune Asset
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not finetune_id:
+            raise ValueError(f"Expected a non-empty value for `finetune_id` but received {finetune_id!r}")
+        body = deepcopy_minimal(
+            {
+                "file": file,
+                "file_name": file_name,
+            }
+        )
+        files = extract_files(cast(Mapping[str, object], body), paths=[["file"]])
+        # It should be noted that the actual Content-Type header that will be
+        # sent to the server will contain a `boundary` parameter, e.g.
+        # multipart/form-data; boundary=---abc--
+        extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
+        return await self._post(
+            f"/accounts/{account_id}/ai/finetunes/{finetune_id}/finetune-assets",
+            body=await async_maybe_transform(body, asset_create_params.AssetCreateParams),
+            files=files,
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=AssetCreateResponse,
+        )
+
+
+class AssetsResourceWithRawResponse:
+    def __init__(self, assets: AssetsResource) -> None:
+        self._assets = assets
+
+        self.create = to_raw_response_wrapper(
+            assets.create,
+        )
+
+
+class AsyncAssetsResourceWithRawResponse:
+    def __init__(self, assets: AsyncAssetsResource) -> None:
+        self._assets = assets
+
+        self.create = async_to_raw_response_wrapper(
+            assets.create,
+        )
+
+
+class AssetsResourceWithStreamingResponse:
+    def __init__(self, assets: AssetsResource) -> None:
+        self._assets = assets
+
+        self.create = to_streamed_response_wrapper(
+            assets.create,
+        )
+
+
+class AsyncAssetsResourceWithStreamingResponse:
+    def __init__(self, assets: AsyncAssetsResource) -> None:
+        self._assets = assets
+
+        self.create = async_to_streamed_response_wrapper(
+            assets.create,
+        )
diff --git a/src/cloudflare/resources/ai/finetunes/finetunes.py b/src/cloudflare/resources/ai/finetunes/finetunes.py
new file mode 100644
index 00000000000..e998763b6f2
--- /dev/null
+++ b/src/cloudflare/resources/ai/finetunes/finetunes.py
@@ -0,0 +1,353 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from .assets import (
+    AssetsResource,
+    AsyncAssetsResource,
+    AssetsResourceWithRawResponse,
+    AsyncAssetsResourceWithRawResponse,
+    AssetsResourceWithStreamingResponse,
+    AsyncAssetsResourceWithStreamingResponse,
+)
+from .public import (
+    PublicResource,
+    AsyncPublicResource,
+    PublicResourceWithRawResponse,
+    AsyncPublicResourceWithRawResponse,
+    PublicResourceWithStreamingResponse,
+    AsyncPublicResourceWithStreamingResponse,
+)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ....types.ai import finetune_create_params
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.ai.finetune_list_response import FinetuneListResponse
+from ....types.ai.finetune_create_response import FinetuneCreateResponse
+
+__all__ = ["FinetunesResource", "AsyncFinetunesResource"]
+
+
+class FinetunesResource(SyncAPIResource):
+    @cached_property
+    def assets(self) -> AssetsResource:
+        return AssetsResource(self._client)
+
+    @cached_property
+    def public(self) -> PublicResource:
+        return PublicResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> FinetunesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return FinetunesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> FinetunesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return FinetunesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        model: str,
+        name: str,
+        description: str | Omit = omit,
+        public: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> FinetuneCreateResponse:
+        """
+        Create a new Finetune
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/ai/finetunes",
+            body=maybe_transform(
+                {
+                    "model": model,
+                    "name": name,
+                    "description": description,
+                    "public": public,
+                },
+                finetune_create_params.FinetuneCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[FinetuneCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[FinetuneCreateResponse], ResultWrapper[FinetuneCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> FinetuneListResponse:
+        """
+        List Finetunes
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai/finetunes",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[FinetuneListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[FinetuneListResponse], ResultWrapper[FinetuneListResponse]),
+        )
+
+
+class AsyncFinetunesResource(AsyncAPIResource):
+    @cached_property
+    def assets(self) -> AsyncAssetsResource:
+        return AsyncAssetsResource(self._client)
+
+    @cached_property
+    def public(self) -> AsyncPublicResource:
+        return AsyncPublicResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncFinetunesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncFinetunesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncFinetunesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncFinetunesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        model: str,
+        name: str,
+        description: str | Omit = omit,
+        public: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> FinetuneCreateResponse:
+        """
+        Create a new Finetune
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/ai/finetunes",
+            body=await async_maybe_transform(
+                {
+                    "model": model,
+                    "name": name,
+                    "description": description,
+                    "public": public,
+                },
+                finetune_create_params.FinetuneCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[FinetuneCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[FinetuneCreateResponse], ResultWrapper[FinetuneCreateResponse]),
+        )
+
+    async def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> FinetuneListResponse:
+        """
+        List Finetunes
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai/finetunes",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[FinetuneListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[FinetuneListResponse], ResultWrapper[FinetuneListResponse]),
+        )
+
+
+class FinetunesResourceWithRawResponse:
+    def __init__(self, finetunes: FinetunesResource) -> None:
+        self._finetunes = finetunes
+
+        self.create = to_raw_response_wrapper(
+            finetunes.create,
+        )
+        self.list = to_raw_response_wrapper(
+            finetunes.list,
+        )
+
+    @cached_property
+    def assets(self) -> AssetsResourceWithRawResponse:
+        return AssetsResourceWithRawResponse(self._finetunes.assets)
+
+    @cached_property
+    def public(self) -> PublicResourceWithRawResponse:
+        return PublicResourceWithRawResponse(self._finetunes.public)
+
+
+class AsyncFinetunesResourceWithRawResponse:
+    def __init__(self, finetunes: AsyncFinetunesResource) -> None:
+        self._finetunes = finetunes
+
+        self.create = async_to_raw_response_wrapper(
+            finetunes.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            finetunes.list,
+        )
+
+    @cached_property
+    def assets(self) -> AsyncAssetsResourceWithRawResponse:
+        return AsyncAssetsResourceWithRawResponse(self._finetunes.assets)
+
+    @cached_property
+    def public(self) -> AsyncPublicResourceWithRawResponse:
+        return AsyncPublicResourceWithRawResponse(self._finetunes.public)
+
+
+class FinetunesResourceWithStreamingResponse:
+    def __init__(self, finetunes: FinetunesResource) -> None:
+        self._finetunes = finetunes
+
+        self.create = to_streamed_response_wrapper(
+            finetunes.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            finetunes.list,
+        )
+
+    @cached_property
+    def assets(self) -> AssetsResourceWithStreamingResponse:
+        return AssetsResourceWithStreamingResponse(self._finetunes.assets)
+
+    @cached_property
+    def public(self) -> PublicResourceWithStreamingResponse:
+        return PublicResourceWithStreamingResponse(self._finetunes.public)
+
+
+class AsyncFinetunesResourceWithStreamingResponse:
+    def __init__(self, finetunes: AsyncFinetunesResource) -> None:
+        self._finetunes = finetunes
+
+        self.create = async_to_streamed_response_wrapper(
+            finetunes.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            finetunes.list,
+        )
+
+    @cached_property
+    def assets(self) -> AsyncAssetsResourceWithStreamingResponse:
+        return AsyncAssetsResourceWithStreamingResponse(self._finetunes.assets)
+
+    @cached_property
+    def public(self) -> AsyncPublicResourceWithStreamingResponse:
+        return AsyncPublicResourceWithStreamingResponse(self._finetunes.public)
diff --git a/src/cloudflare/resources/ai/finetunes/public.py b/src/cloudflare/resources/ai/finetunes/public.py
new file mode 100644
index 00000000000..0e8f9e74988
--- /dev/null
+++ b/src/cloudflare/resources/ai/finetunes/public.py
@@ -0,0 +1,208 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.ai.finetunes import public_list_params
+from ....types.ai.finetunes.public_list_response import PublicListResponse
+
+__all__ = ["PublicResource", "AsyncPublicResource"]
+
+
+class PublicResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> PublicResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return PublicResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> PublicResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return PublicResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        limit: float | Omit = omit,
+        offset: float | Omit = omit,
+        order_by: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[PublicListResponse]:
+        """
+        List Public Finetunes
+
+        Args:
+          limit: Pagination Limit
+
+          offset: Pagination Offset
+
+          order_by: Order By Column Name
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai/finetunes/public",
+            page=SyncSinglePage[PublicListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "limit": limit,
+                        "offset": offset,
+                        "order_by": order_by,
+                    },
+                    public_list_params.PublicListParams,
+                ),
+            ),
+            model=PublicListResponse,
+        )
+
+
+class AsyncPublicResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncPublicResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncPublicResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncPublicResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncPublicResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        limit: float | Omit = omit,
+        offset: float | Omit = omit,
+        order_by: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[PublicListResponse, AsyncSinglePage[PublicListResponse]]:
+        """
+        List Public Finetunes
+
+        Args:
+          limit: Pagination Limit
+
+          offset: Pagination Offset
+
+          order_by: Order By Column Name
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai/finetunes/public",
+            page=AsyncSinglePage[PublicListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "limit": limit,
+                        "offset": offset,
+                        "order_by": order_by,
+                    },
+                    public_list_params.PublicListParams,
+                ),
+            ),
+            model=PublicListResponse,
+        )
+
+
+class PublicResourceWithRawResponse:
+    def __init__(self, public: PublicResource) -> None:
+        self._public = public
+
+        self.list = to_raw_response_wrapper(
+            public.list,
+        )
+
+
+class AsyncPublicResourceWithRawResponse:
+    def __init__(self, public: AsyncPublicResource) -> None:
+        self._public = public
+
+        self.list = async_to_raw_response_wrapper(
+            public.list,
+        )
+
+
+class PublicResourceWithStreamingResponse:
+    def __init__(self, public: PublicResource) -> None:
+        self._public = public
+
+        self.list = to_streamed_response_wrapper(
+            public.list,
+        )
+
+
+class AsyncPublicResourceWithStreamingResponse:
+    def __init__(self, public: AsyncPublicResource) -> None:
+        self._public = public
+
+        self.list = async_to_streamed_response_wrapper(
+            public.list,
+        )
diff --git a/src/cloudflare/resources/workers/ai/models/__init__.py b/src/cloudflare/resources/ai/models/__init__.py
similarity index 100%
rename from src/cloudflare/resources/workers/ai/models/__init__.py
rename to src/cloudflare/resources/ai/models/__init__.py
diff --git a/src/cloudflare/resources/ai/models/models.py b/src/cloudflare/resources/ai/models/models.py
new file mode 100644
index 00000000000..9d6d4f9c83d
--- /dev/null
+++ b/src/cloudflare/resources/ai/models/models.py
@@ -0,0 +1,263 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from .schema import (
+    SchemaResource,
+    AsyncSchemaResource,
+    SchemaResourceWithRawResponse,
+    AsyncSchemaResourceWithRawResponse,
+    SchemaResourceWithStreamingResponse,
+    AsyncSchemaResourceWithStreamingResponse,
+)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform
+from ...._compat import cached_property
+from ....types.ai import model_list_params
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+
+__all__ = ["ModelsResource", "AsyncModelsResource"]
+
+
+class ModelsResource(SyncAPIResource):
+    @cached_property
+    def schema(self) -> SchemaResource:
+        return SchemaResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> ModelsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ModelsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ModelsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ModelsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        author: str | Omit = omit,
+        hide_experimental: bool | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        source: float | Omit = omit,
+        task: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[object]:
+        """
+        Model Search
+
+        Args:
+          author: Filter by Author
+
+          hide_experimental: Filter to hide experimental models
+
+          search: Search
+
+          source: Filter by Source Id
+
+          task: Filter by Task Name
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai/models/search",
+            page=SyncV4PagePaginationArray[object],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "author": author,
+                        "hide_experimental": hide_experimental,
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                        "source": source,
+                        "task": task,
+                    },
+                    model_list_params.ModelListParams,
+                ),
+            ),
+            model=object,
+        )
+
+
+class AsyncModelsResource(AsyncAPIResource):
+    @cached_property
+    def schema(self) -> AsyncSchemaResource:
+        return AsyncSchemaResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncModelsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncModelsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncModelsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncModelsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        author: str | Omit = omit,
+        hide_experimental: bool | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        source: float | Omit = omit,
+        task: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[object, AsyncV4PagePaginationArray[object]]:
+        """
+        Model Search
+
+        Args:
+          author: Filter by Author
+
+          hide_experimental: Filter to hide experimental models
+
+          search: Search
+
+          source: Filter by Source Id
+
+          task: Filter by Task Name
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai/models/search",
+            page=AsyncV4PagePaginationArray[object],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "author": author,
+                        "hide_experimental": hide_experimental,
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                        "source": source,
+                        "task": task,
+                    },
+                    model_list_params.ModelListParams,
+                ),
+            ),
+            model=object,
+        )
+
+
+class ModelsResourceWithRawResponse:
+    def __init__(self, models: ModelsResource) -> None:
+        self._models = models
+
+        self.list = to_raw_response_wrapper(
+            models.list,
+        )
+
+    @cached_property
+    def schema(self) -> SchemaResourceWithRawResponse:
+        return SchemaResourceWithRawResponse(self._models.schema)
+
+
+class AsyncModelsResourceWithRawResponse:
+    def __init__(self, models: AsyncModelsResource) -> None:
+        self._models = models
+
+        self.list = async_to_raw_response_wrapper(
+            models.list,
+        )
+
+    @cached_property
+    def schema(self) -> AsyncSchemaResourceWithRawResponse:
+        return AsyncSchemaResourceWithRawResponse(self._models.schema)
+
+
+class ModelsResourceWithStreamingResponse:
+    def __init__(self, models: ModelsResource) -> None:
+        self._models = models
+
+        self.list = to_streamed_response_wrapper(
+            models.list,
+        )
+
+    @cached_property
+    def schema(self) -> SchemaResourceWithStreamingResponse:
+        return SchemaResourceWithStreamingResponse(self._models.schema)
+
+
+class AsyncModelsResourceWithStreamingResponse:
+    def __init__(self, models: AsyncModelsResource) -> None:
+        self._models = models
+
+        self.list = async_to_streamed_response_wrapper(
+            models.list,
+        )
+
+    @cached_property
+    def schema(self) -> AsyncSchemaResourceWithStreamingResponse:
+        return AsyncSchemaResourceWithStreamingResponse(self._models.schema)
diff --git a/src/cloudflare/resources/ai/models/schema.py b/src/cloudflare/resources/ai/models/schema.py
new file mode 100644
index 00000000000..2f12236dd38
--- /dev/null
+++ b/src/cloudflare/resources/ai/models/schema.py
@@ -0,0 +1,183 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.ai.models import schema_get_params
+
+__all__ = ["SchemaResource", "AsyncSchemaResource"]
+
+
+class SchemaResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SchemaResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SchemaResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SchemaResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SchemaResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        model: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Get Model Schema
+
+        Args:
+          model: Model Name
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai/models/schema",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"model": model}, schema_get_params.SchemaGetParams),
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+
+class AsyncSchemaResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSchemaResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSchemaResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSchemaResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSchemaResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        *,
+        account_id: str,
+        model: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Get Model Schema
+
+        Args:
+          model: Model Name
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai/models/schema",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"model": model}, schema_get_params.SchemaGetParams),
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+
+class SchemaResourceWithRawResponse:
+    def __init__(self, schema: SchemaResource) -> None:
+        self._schema = schema
+
+        self.get = to_raw_response_wrapper(
+            schema.get,
+        )
+
+
+class AsyncSchemaResourceWithRawResponse:
+    def __init__(self, schema: AsyncSchemaResource) -> None:
+        self._schema = schema
+
+        self.get = async_to_raw_response_wrapper(
+            schema.get,
+        )
+
+
+class SchemaResourceWithStreamingResponse:
+    def __init__(self, schema: SchemaResource) -> None:
+        self._schema = schema
+
+        self.get = to_streamed_response_wrapper(
+            schema.get,
+        )
+
+
+class AsyncSchemaResourceWithStreamingResponse:
+    def __init__(self, schema: AsyncSchemaResource) -> None:
+        self._schema = schema
+
+        self.get = async_to_streamed_response_wrapper(
+            schema.get,
+        )
diff --git a/src/cloudflare/resources/ai/tasks.py b/src/cloudflare/resources/ai/tasks.py
new file mode 100644
index 00000000000..26fcd51f8b0
--- /dev/null
+++ b/src/cloudflare/resources/ai/tasks.py
@@ -0,0 +1,165 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+
+__all__ = ["TasksResource", "AsyncTasksResource"]
+
+
+class TasksResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> TasksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TasksResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TasksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TasksResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[object]:
+        """
+        Task Search
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai/tasks/search",
+            page=SyncSinglePage[object],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=object,
+        )
+
+
+class AsyncTasksResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncTasksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTasksResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTasksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTasksResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[object, AsyncSinglePage[object]]:
+        """
+        Task Search
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai/tasks/search",
+            page=AsyncSinglePage[object],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=object,
+        )
+
+
+class TasksResourceWithRawResponse:
+    def __init__(self, tasks: TasksResource) -> None:
+        self._tasks = tasks
+
+        self.list = to_raw_response_wrapper(
+            tasks.list,
+        )
+
+
+class AsyncTasksResourceWithRawResponse:
+    def __init__(self, tasks: AsyncTasksResource) -> None:
+        self._tasks = tasks
+
+        self.list = async_to_raw_response_wrapper(
+            tasks.list,
+        )
+
+
+class TasksResourceWithStreamingResponse:
+    def __init__(self, tasks: TasksResource) -> None:
+        self._tasks = tasks
+
+        self.list = to_streamed_response_wrapper(
+            tasks.list,
+        )
+
+
+class AsyncTasksResourceWithStreamingResponse:
+    def __init__(self, tasks: AsyncTasksResource) -> None:
+        self._tasks = tasks
+
+        self.list = async_to_streamed_response_wrapper(
+            tasks.list,
+        )
diff --git a/src/cloudflare/resources/ai/to_markdown.py b/src/cloudflare/resources/ai/to_markdown.py
new file mode 100644
index 00000000000..15cab8aa9e4
--- /dev/null
+++ b/src/cloudflare/resources/ai/to_markdown.py
@@ -0,0 +1,271 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Mapping, cast
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import extract_files, maybe_transform, deepcopy_minimal
+from ..._compat import cached_property
+from ...types.ai import to_markdown_transform_params
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.ai.to_markdown_supported_response import ToMarkdownSupportedResponse
+from ...types.ai.to_markdown_transform_response import ToMarkdownTransformResponse
+
+__all__ = ["ToMarkdownResource", "AsyncToMarkdownResource"]
+
+
+class ToMarkdownResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ToMarkdownResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ToMarkdownResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ToMarkdownResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ToMarkdownResourceWithStreamingResponse(self)
+
+    def supported(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[ToMarkdownSupportedResponse]:
+        """
+        Get all converted formats supported
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai/tomarkdown/supported",
+            page=SyncSinglePage[ToMarkdownSupportedResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=ToMarkdownSupportedResponse,
+        )
+
+    def transform(
+        self,
+        *,
+        account_id: str,
+        file: to_markdown_transform_params.File,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[ToMarkdownTransformResponse]:
+        """
+        Convert Files into Markdown
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        body = deepcopy_minimal(file)
+        files = extract_files(cast(Mapping[str, object], body), paths=[["files", "<array>"]])
+        # It should be noted that the actual Content-Type header that will be
+        # sent to the server will contain a `boundary` parameter, e.g.
+        # multipart/form-data; boundary=---abc--
+        extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
+        return self._get_api_list(  # type: ignore[call-arg]  # pyright: ignore[reportUnknownVariableType, reportCallIssue]
+            f"/accounts/{account_id}/ai/tomarkdown",
+            page=SyncSinglePage[ToMarkdownTransformResponse],
+            body=maybe_transform(body, to_markdown_transform_params.ToMarkdownTransformParams),
+            files=files,  # pyright: ignore[reportCallIssue]  # type: ignore[call-arg]
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=ToMarkdownTransformResponse,
+            method="post",
+        )
+
+
+class AsyncToMarkdownResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncToMarkdownResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncToMarkdownResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncToMarkdownResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncToMarkdownResourceWithStreamingResponse(self)
+
+    def supported(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ToMarkdownSupportedResponse, AsyncSinglePage[ToMarkdownSupportedResponse]]:
+        """
+        Get all converted formats supported
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai/tomarkdown/supported",
+            page=AsyncSinglePage[ToMarkdownSupportedResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=ToMarkdownSupportedResponse,
+        )
+
+    def transform(
+        self,
+        *,
+        account_id: str,
+        file: to_markdown_transform_params.File,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ToMarkdownTransformResponse, AsyncSinglePage[ToMarkdownTransformResponse]]:
+        """
+        Convert Files into Markdown
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        body = deepcopy_minimal(file)
+        files = extract_files(cast(Mapping[str, object], body), paths=[["files", "<array>"]])
+        # It should be noted that the actual Content-Type header that will be
+        # sent to the server will contain a `boundary` parameter, e.g.
+        # multipart/form-data; boundary=---abc--
+        extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
+        return self._get_api_list(  # type: ignore[call-arg]  # pyright: ignore[reportUnknownVariableType, reportCallIssue]
+            f"/accounts/{account_id}/ai/tomarkdown",
+            page=AsyncSinglePage[ToMarkdownTransformResponse],
+            body=maybe_transform(body, to_markdown_transform_params.ToMarkdownTransformParams),
+            files=files,  # pyright: ignore[reportCallIssue]  # type: ignore[call-arg]
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=ToMarkdownTransformResponse,
+            method="post",
+        )
+
+
+class ToMarkdownResourceWithRawResponse:
+    def __init__(self, to_markdown: ToMarkdownResource) -> None:
+        self._to_markdown = to_markdown
+
+        self.supported = to_raw_response_wrapper(
+            to_markdown.supported,
+        )
+        self.transform = to_raw_response_wrapper(
+            to_markdown.transform,
+        )
+
+
+class AsyncToMarkdownResourceWithRawResponse:
+    def __init__(self, to_markdown: AsyncToMarkdownResource) -> None:
+        self._to_markdown = to_markdown
+
+        self.supported = async_to_raw_response_wrapper(
+            to_markdown.supported,
+        )
+        self.transform = async_to_raw_response_wrapper(
+            to_markdown.transform,
+        )
+
+
+class ToMarkdownResourceWithStreamingResponse:
+    def __init__(self, to_markdown: ToMarkdownResource) -> None:
+        self._to_markdown = to_markdown
+
+        self.supported = to_streamed_response_wrapper(
+            to_markdown.supported,
+        )
+        self.transform = to_streamed_response_wrapper(
+            to_markdown.transform,
+        )
+
+
+class AsyncToMarkdownResourceWithStreamingResponse:
+    def __init__(self, to_markdown: AsyncToMarkdownResource) -> None:
+        self._to_markdown = to_markdown
+
+        self.supported = async_to_streamed_response_wrapper(
+            to_markdown.supported,
+        )
+        self.transform = async_to_streamed_response_wrapper(
+            to_markdown.transform,
+        )
diff --git a/src/cloudflare/resources/ai_gateway/__init__.py b/src/cloudflare/resources/ai_gateway/__init__.py
index 95883733129..d149a1d44cb 100644
--- a/src/cloudflare/resources/ai_gateway/__init__.py
+++ b/src/cloudflare/resources/ai_gateway/__init__.py
@@ -8,6 +8,22 @@
     LogsResourceWithStreamingResponse,
     AsyncLogsResourceWithStreamingResponse,
 )
+from .urls import (
+    URLsResource,
+    AsyncURLsResource,
+    URLsResourceWithRawResponse,
+    AsyncURLsResourceWithRawResponse,
+    URLsResourceWithStreamingResponse,
+    AsyncURLsResourceWithStreamingResponse,
+)
+from .datasets import (
+    DatasetsResource,
+    AsyncDatasetsResource,
+    DatasetsResourceWithRawResponse,
+    AsyncDatasetsResourceWithRawResponse,
+    DatasetsResourceWithStreamingResponse,
+    AsyncDatasetsResourceWithStreamingResponse,
+)
 from .ai_gateway import (
     AIGatewayResource,
     AsyncAIGatewayResource,
@@ -16,14 +32,82 @@
     AIGatewayResourceWithStreamingResponse,
     AsyncAIGatewayResourceWithStreamingResponse,
 )
+from .evaluations import (
+    EvaluationsResource,
+    AsyncEvaluationsResource,
+    EvaluationsResourceWithRawResponse,
+    AsyncEvaluationsResourceWithRawResponse,
+    EvaluationsResourceWithStreamingResponse,
+    AsyncEvaluationsResourceWithStreamingResponse,
+)
+from .dynamic_routing import (
+    DynamicRoutingResource,
+    AsyncDynamicRoutingResource,
+    DynamicRoutingResourceWithRawResponse,
+    AsyncDynamicRoutingResourceWithRawResponse,
+    DynamicRoutingResourceWithStreamingResponse,
+    AsyncDynamicRoutingResourceWithStreamingResponse,
+)
+from .evaluation_types import (
+    EvaluationTypesResource,
+    AsyncEvaluationTypesResource,
+    EvaluationTypesResourceWithRawResponse,
+    AsyncEvaluationTypesResourceWithRawResponse,
+    EvaluationTypesResourceWithStreamingResponse,
+    AsyncEvaluationTypesResourceWithStreamingResponse,
+)
+from .provider_configs import (
+    ProviderConfigsResource,
+    AsyncProviderConfigsResource,
+    ProviderConfigsResourceWithRawResponse,
+    AsyncProviderConfigsResourceWithRawResponse,
+    ProviderConfigsResourceWithStreamingResponse,
+    AsyncProviderConfigsResourceWithStreamingResponse,
+)
 
 __all__ = [
+    "EvaluationTypesResource",
+    "AsyncEvaluationTypesResource",
+    "EvaluationTypesResourceWithRawResponse",
+    "AsyncEvaluationTypesResourceWithRawResponse",
+    "EvaluationTypesResourceWithStreamingResponse",
+    "AsyncEvaluationTypesResourceWithStreamingResponse",
     "LogsResource",
     "AsyncLogsResource",
     "LogsResourceWithRawResponse",
     "AsyncLogsResourceWithRawResponse",
     "LogsResourceWithStreamingResponse",
     "AsyncLogsResourceWithStreamingResponse",
+    "DatasetsResource",
+    "AsyncDatasetsResource",
+    "DatasetsResourceWithRawResponse",
+    "AsyncDatasetsResourceWithRawResponse",
+    "DatasetsResourceWithStreamingResponse",
+    "AsyncDatasetsResourceWithStreamingResponse",
+    "EvaluationsResource",
+    "AsyncEvaluationsResource",
+    "EvaluationsResourceWithRawResponse",
+    "AsyncEvaluationsResourceWithRawResponse",
+    "EvaluationsResourceWithStreamingResponse",
+    "AsyncEvaluationsResourceWithStreamingResponse",
+    "DynamicRoutingResource",
+    "AsyncDynamicRoutingResource",
+    "DynamicRoutingResourceWithRawResponse",
+    "AsyncDynamicRoutingResourceWithRawResponse",
+    "DynamicRoutingResourceWithStreamingResponse",
+    "AsyncDynamicRoutingResourceWithStreamingResponse",
+    "ProviderConfigsResource",
+    "AsyncProviderConfigsResource",
+    "ProviderConfigsResourceWithRawResponse",
+    "AsyncProviderConfigsResourceWithRawResponse",
+    "ProviderConfigsResourceWithStreamingResponse",
+    "AsyncProviderConfigsResourceWithStreamingResponse",
+    "URLsResource",
+    "AsyncURLsResource",
+    "URLsResourceWithRawResponse",
+    "AsyncURLsResourceWithRawResponse",
+    "URLsResourceWithStreamingResponse",
+    "AsyncURLsResourceWithStreamingResponse",
     "AIGatewayResource",
     "AsyncAIGatewayResource",
     "AIGatewayResourceWithRawResponse",
diff --git a/src/cloudflare/resources/ai_gateway/ai_gateway.py b/src/cloudflare/resources/ai_gateway/ai_gateway.py
index 6d75bfb8ba3..545ad9b28e6 100644
--- a/src/cloudflare/resources/ai_gateway/ai_gateway.py
+++ b/src/cloudflare/resources/ai_gateway/ai_gateway.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Type, Iterable, Optional, cast
 from typing_extensions import Literal
 
 import httpx
@@ -15,10 +15,23 @@
     LogsResourceWithStreamingResponse,
     AsyncLogsResourceWithStreamingResponse,
 )
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
+from .urls import (
+    URLsResource,
+    AsyncURLsResource,
+    URLsResourceWithRawResponse,
+    AsyncURLsResourceWithRawResponse,
+    URLsResourceWithStreamingResponse,
+    AsyncURLsResourceWithStreamingResponse,
+)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from .datasets import (
+    DatasetsResource,
+    AsyncDatasetsResource,
+    DatasetsResourceWithRawResponse,
+    AsyncDatasetsResourceWithRawResponse,
+    DatasetsResourceWithStreamingResponse,
+    AsyncDatasetsResourceWithStreamingResponse,
 )
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
@@ -29,8 +42,40 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
+from .evaluations import (
+    EvaluationsResource,
+    AsyncEvaluationsResource,
+    EvaluationsResourceWithRawResponse,
+    AsyncEvaluationsResourceWithRawResponse,
+    EvaluationsResourceWithStreamingResponse,
+    AsyncEvaluationsResourceWithStreamingResponse,
+)
 from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ..._base_client import AsyncPaginator, make_request_options
+from .dynamic_routing import (
+    DynamicRoutingResource,
+    AsyncDynamicRoutingResource,
+    DynamicRoutingResourceWithRawResponse,
+    AsyncDynamicRoutingResourceWithRawResponse,
+    DynamicRoutingResourceWithStreamingResponse,
+    AsyncDynamicRoutingResourceWithStreamingResponse,
+)
+from .evaluation_types import (
+    EvaluationTypesResource,
+    AsyncEvaluationTypesResource,
+    EvaluationTypesResourceWithRawResponse,
+    AsyncEvaluationTypesResourceWithRawResponse,
+    EvaluationTypesResourceWithStreamingResponse,
+    AsyncEvaluationTypesResourceWithStreamingResponse,
+)
+from .provider_configs import (
+    ProviderConfigsResource,
+    AsyncProviderConfigsResource,
+    ProviderConfigsResourceWithRawResponse,
+    AsyncProviderConfigsResourceWithRawResponse,
+    ProviderConfigsResourceWithStreamingResponse,
+    AsyncProviderConfigsResourceWithStreamingResponse,
+)
 from ...types.ai_gateway import ai_gateway_list_params, ai_gateway_create_params, ai_gateway_update_params
 from ...types.ai_gateway.ai_gateway_get_response import AIGatewayGetResponse
 from ...types.ai_gateway.ai_gateway_list_response import AIGatewayListResponse
@@ -42,16 +87,51 @@
 
 
 class AIGatewayResource(SyncAPIResource):
+    @cached_property
+    def evaluation_types(self) -> EvaluationTypesResource:
+        return EvaluationTypesResource(self._client)
+
     @cached_property
     def logs(self) -> LogsResource:
         return LogsResource(self._client)
 
+    @cached_property
+    def datasets(self) -> DatasetsResource:
+        return DatasetsResource(self._client)
+
+    @cached_property
+    def evaluations(self) -> EvaluationsResource:
+        return EvaluationsResource(self._client)
+
+    @cached_property
+    def dynamic_routing(self) -> DynamicRoutingResource:
+        return DynamicRoutingResource(self._client)
+
+    @cached_property
+    def provider_configs(self) -> ProviderConfigsResource:
+        return ProviderConfigsResource(self._client)
+
+    @cached_property
+    def urls(self) -> URLsResource:
+        return URLsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AIGatewayResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AIGatewayResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AIGatewayResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AIGatewayResourceWithStreamingResponse(self)
 
     def create(
@@ -65,12 +145,19 @@ def create(
         rate_limiting_interval: Optional[int],
         rate_limiting_limit: Optional[int],
         rate_limiting_technique: Literal["fixed", "sliding"],
+        authentication: bool | Omit = omit,
+        is_default: bool | Omit = omit,
+        log_management: Optional[int] | Omit = omit,
+        log_management_strategy: Optional[Literal["STOP_INSERTING", "DELETE_OLDEST"]] | Omit = omit,
+        logpush: bool | Omit = omit,
+        logpush_public_key: Optional[str] | Omit = omit,
+        zdr: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AIGatewayCreateResponse:
         """
         Create a new Gateway
@@ -99,6 +186,13 @@ def create(
                     "rate_limiting_interval": rate_limiting_interval,
                     "rate_limiting_limit": rate_limiting_limit,
                     "rate_limiting_technique": rate_limiting_technique,
+                    "authentication": authentication,
+                    "is_default": is_default,
+                    "log_management": log_management,
+                    "log_management_strategy": log_management_strategy,
+                    "logpush": logpush,
+                    "logpush_public_key": logpush_public_key,
+                    "zdr": zdr,
                 },
                 ai_gateway_create_params.AIGatewayCreateParams,
             ),
@@ -123,12 +217,23 @@ def update(
         rate_limiting_interval: Optional[int],
         rate_limiting_limit: Optional[int],
         rate_limiting_technique: Literal["fixed", "sliding"],
+        authentication: bool | Omit = omit,
+        dlp: ai_gateway_update_params.DLP | Omit = omit,
+        is_default: bool | Omit = omit,
+        log_management: Optional[int] | Omit = omit,
+        log_management_strategy: Optional[Literal["STOP_INSERTING", "DELETE_OLDEST"]] | Omit = omit,
+        logpush: bool | Omit = omit,
+        logpush_public_key: Optional[str] | Omit = omit,
+        otel: Optional[Iterable[ai_gateway_update_params.Otel]] | Omit = omit,
+        store_id: Optional[str] | Omit = omit,
+        stripe: Optional[ai_gateway_update_params.Stripe] | Omit = omit,
+        zdr: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AIGatewayUpdateResponse:
         """
         Update a Gateway
@@ -158,6 +263,17 @@ def update(
                     "rate_limiting_interval": rate_limiting_interval,
                     "rate_limiting_limit": rate_limiting_limit,
                     "rate_limiting_technique": rate_limiting_technique,
+                    "authentication": authentication,
+                    "dlp": dlp,
+                    "is_default": is_default,
+                    "log_management": log_management,
+                    "log_management_strategy": log_management_strategy,
+                    "logpush": logpush,
+                    "logpush_public_key": logpush_public_key,
+                    "otel": otel,
+                    "store_id": store_id,
+                    "stripe": stripe,
+                    "zdr": zdr,
                 },
                 ai_gateway_update_params.AIGatewayUpdateParams,
             ),
@@ -175,24 +291,21 @@ def list(
         self,
         *,
         account_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        order_by: str | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[AIGatewayListResponse]:
         """
         List Gateways
 
         Args:
-          id: gateway id
-
-          order_by: Order By Column Name
+          search: Search by id
 
           extra_headers: Send extra headers
 
@@ -214,10 +327,9 @@ def list(
                 timeout=timeout,
                 query=maybe_transform(
                     {
-                        "id": id,
-                        "order_by": order_by,
                         "page": page,
                         "per_page": per_page,
+                        "search": search,
                     },
                     ai_gateway_list_params.AIGatewayListParams,
                 ),
@@ -235,12 +347,14 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AIGatewayDeleteResponse:
         """
         Delete a Gateway
 
         Args:
+          id: gateway id
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -275,7 +389,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AIGatewayGetResponse:
         """
         Fetch a Gateway
@@ -309,16 +423,51 @@ def get(
 
 
 class AsyncAIGatewayResource(AsyncAPIResource):
+    @cached_property
+    def evaluation_types(self) -> AsyncEvaluationTypesResource:
+        return AsyncEvaluationTypesResource(self._client)
+
     @cached_property
     def logs(self) -> AsyncLogsResource:
         return AsyncLogsResource(self._client)
 
+    @cached_property
+    def datasets(self) -> AsyncDatasetsResource:
+        return AsyncDatasetsResource(self._client)
+
+    @cached_property
+    def evaluations(self) -> AsyncEvaluationsResource:
+        return AsyncEvaluationsResource(self._client)
+
+    @cached_property
+    def dynamic_routing(self) -> AsyncDynamicRoutingResource:
+        return AsyncDynamicRoutingResource(self._client)
+
+    @cached_property
+    def provider_configs(self) -> AsyncProviderConfigsResource:
+        return AsyncProviderConfigsResource(self._client)
+
+    @cached_property
+    def urls(self) -> AsyncURLsResource:
+        return AsyncURLsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncAIGatewayResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAIGatewayResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAIGatewayResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAIGatewayResourceWithStreamingResponse(self)
 
     async def create(
@@ -332,12 +481,19 @@ async def create(
         rate_limiting_interval: Optional[int],
         rate_limiting_limit: Optional[int],
         rate_limiting_technique: Literal["fixed", "sliding"],
+        authentication: bool | Omit = omit,
+        is_default: bool | Omit = omit,
+        log_management: Optional[int] | Omit = omit,
+        log_management_strategy: Optional[Literal["STOP_INSERTING", "DELETE_OLDEST"]] | Omit = omit,
+        logpush: bool | Omit = omit,
+        logpush_public_key: Optional[str] | Omit = omit,
+        zdr: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AIGatewayCreateResponse:
         """
         Create a new Gateway
@@ -366,6 +522,13 @@ async def create(
                     "rate_limiting_interval": rate_limiting_interval,
                     "rate_limiting_limit": rate_limiting_limit,
                     "rate_limiting_technique": rate_limiting_technique,
+                    "authentication": authentication,
+                    "is_default": is_default,
+                    "log_management": log_management,
+                    "log_management_strategy": log_management_strategy,
+                    "logpush": logpush,
+                    "logpush_public_key": logpush_public_key,
+                    "zdr": zdr,
                 },
                 ai_gateway_create_params.AIGatewayCreateParams,
             ),
@@ -390,12 +553,23 @@ async def update(
         rate_limiting_interval: Optional[int],
         rate_limiting_limit: Optional[int],
         rate_limiting_technique: Literal["fixed", "sliding"],
+        authentication: bool | Omit = omit,
+        dlp: ai_gateway_update_params.DLP | Omit = omit,
+        is_default: bool | Omit = omit,
+        log_management: Optional[int] | Omit = omit,
+        log_management_strategy: Optional[Literal["STOP_INSERTING", "DELETE_OLDEST"]] | Omit = omit,
+        logpush: bool | Omit = omit,
+        logpush_public_key: Optional[str] | Omit = omit,
+        otel: Optional[Iterable[ai_gateway_update_params.Otel]] | Omit = omit,
+        store_id: Optional[str] | Omit = omit,
+        stripe: Optional[ai_gateway_update_params.Stripe] | Omit = omit,
+        zdr: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AIGatewayUpdateResponse:
         """
         Update a Gateway
@@ -425,6 +599,17 @@ async def update(
                     "rate_limiting_interval": rate_limiting_interval,
                     "rate_limiting_limit": rate_limiting_limit,
                     "rate_limiting_technique": rate_limiting_technique,
+                    "authentication": authentication,
+                    "dlp": dlp,
+                    "is_default": is_default,
+                    "log_management": log_management,
+                    "log_management_strategy": log_management_strategy,
+                    "logpush": logpush,
+                    "logpush_public_key": logpush_public_key,
+                    "otel": otel,
+                    "store_id": store_id,
+                    "stripe": stripe,
+                    "zdr": zdr,
                 },
                 ai_gateway_update_params.AIGatewayUpdateParams,
             ),
@@ -442,24 +627,21 @@ def list(
         self,
         *,
         account_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        order_by: str | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[AIGatewayListResponse, AsyncV4PagePaginationArray[AIGatewayListResponse]]:
         """
         List Gateways
 
         Args:
-          id: gateway id
-
-          order_by: Order By Column Name
+          search: Search by id
 
           extra_headers: Send extra headers
 
@@ -481,10 +663,9 @@ def list(
                 timeout=timeout,
                 query=maybe_transform(
                     {
-                        "id": id,
-                        "order_by": order_by,
                         "page": page,
                         "per_page": per_page,
+                        "search": search,
                     },
                     ai_gateway_list_params.AIGatewayListParams,
                 ),
@@ -502,12 +683,14 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AIGatewayDeleteResponse:
         """
         Delete a Gateway
 
         Args:
+          id: gateway id
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -542,7 +725,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AIGatewayGetResponse:
         """
         Fetch a Gateway
@@ -595,10 +778,34 @@ def __init__(self, ai_gateway: AIGatewayResource) -> None:
             ai_gateway.get,
         )
 
+    @cached_property
+    def evaluation_types(self) -> EvaluationTypesResourceWithRawResponse:
+        return EvaluationTypesResourceWithRawResponse(self._ai_gateway.evaluation_types)
+
     @cached_property
     def logs(self) -> LogsResourceWithRawResponse:
         return LogsResourceWithRawResponse(self._ai_gateway.logs)
 
+    @cached_property
+    def datasets(self) -> DatasetsResourceWithRawResponse:
+        return DatasetsResourceWithRawResponse(self._ai_gateway.datasets)
+
+    @cached_property
+    def evaluations(self) -> EvaluationsResourceWithRawResponse:
+        return EvaluationsResourceWithRawResponse(self._ai_gateway.evaluations)
+
+    @cached_property
+    def dynamic_routing(self) -> DynamicRoutingResourceWithRawResponse:
+        return DynamicRoutingResourceWithRawResponse(self._ai_gateway.dynamic_routing)
+
+    @cached_property
+    def provider_configs(self) -> ProviderConfigsResourceWithRawResponse:
+        return ProviderConfigsResourceWithRawResponse(self._ai_gateway.provider_configs)
+
+    @cached_property
+    def urls(self) -> URLsResourceWithRawResponse:
+        return URLsResourceWithRawResponse(self._ai_gateway.urls)
+
 
 class AsyncAIGatewayResourceWithRawResponse:
     def __init__(self, ai_gateway: AsyncAIGatewayResource) -> None:
@@ -620,10 +827,34 @@ def __init__(self, ai_gateway: AsyncAIGatewayResource) -> None:
             ai_gateway.get,
         )
 
+    @cached_property
+    def evaluation_types(self) -> AsyncEvaluationTypesResourceWithRawResponse:
+        return AsyncEvaluationTypesResourceWithRawResponse(self._ai_gateway.evaluation_types)
+
     @cached_property
     def logs(self) -> AsyncLogsResourceWithRawResponse:
         return AsyncLogsResourceWithRawResponse(self._ai_gateway.logs)
 
+    @cached_property
+    def datasets(self) -> AsyncDatasetsResourceWithRawResponse:
+        return AsyncDatasetsResourceWithRawResponse(self._ai_gateway.datasets)
+
+    @cached_property
+    def evaluations(self) -> AsyncEvaluationsResourceWithRawResponse:
+        return AsyncEvaluationsResourceWithRawResponse(self._ai_gateway.evaluations)
+
+    @cached_property
+    def dynamic_routing(self) -> AsyncDynamicRoutingResourceWithRawResponse:
+        return AsyncDynamicRoutingResourceWithRawResponse(self._ai_gateway.dynamic_routing)
+
+    @cached_property
+    def provider_configs(self) -> AsyncProviderConfigsResourceWithRawResponse:
+        return AsyncProviderConfigsResourceWithRawResponse(self._ai_gateway.provider_configs)
+
+    @cached_property
+    def urls(self) -> AsyncURLsResourceWithRawResponse:
+        return AsyncURLsResourceWithRawResponse(self._ai_gateway.urls)
+
 
 class AIGatewayResourceWithStreamingResponse:
     def __init__(self, ai_gateway: AIGatewayResource) -> None:
@@ -645,10 +876,34 @@ def __init__(self, ai_gateway: AIGatewayResource) -> None:
             ai_gateway.get,
         )
 
+    @cached_property
+    def evaluation_types(self) -> EvaluationTypesResourceWithStreamingResponse:
+        return EvaluationTypesResourceWithStreamingResponse(self._ai_gateway.evaluation_types)
+
     @cached_property
     def logs(self) -> LogsResourceWithStreamingResponse:
         return LogsResourceWithStreamingResponse(self._ai_gateway.logs)
 
+    @cached_property
+    def datasets(self) -> DatasetsResourceWithStreamingResponse:
+        return DatasetsResourceWithStreamingResponse(self._ai_gateway.datasets)
+
+    @cached_property
+    def evaluations(self) -> EvaluationsResourceWithStreamingResponse:
+        return EvaluationsResourceWithStreamingResponse(self._ai_gateway.evaluations)
+
+    @cached_property
+    def dynamic_routing(self) -> DynamicRoutingResourceWithStreamingResponse:
+        return DynamicRoutingResourceWithStreamingResponse(self._ai_gateway.dynamic_routing)
+
+    @cached_property
+    def provider_configs(self) -> ProviderConfigsResourceWithStreamingResponse:
+        return ProviderConfigsResourceWithStreamingResponse(self._ai_gateway.provider_configs)
+
+    @cached_property
+    def urls(self) -> URLsResourceWithStreamingResponse:
+        return URLsResourceWithStreamingResponse(self._ai_gateway.urls)
+
 
 class AsyncAIGatewayResourceWithStreamingResponse:
     def __init__(self, ai_gateway: AsyncAIGatewayResource) -> None:
@@ -670,6 +925,30 @@ def __init__(self, ai_gateway: AsyncAIGatewayResource) -> None:
             ai_gateway.get,
         )
 
+    @cached_property
+    def evaluation_types(self) -> AsyncEvaluationTypesResourceWithStreamingResponse:
+        return AsyncEvaluationTypesResourceWithStreamingResponse(self._ai_gateway.evaluation_types)
+
     @cached_property
     def logs(self) -> AsyncLogsResourceWithStreamingResponse:
         return AsyncLogsResourceWithStreamingResponse(self._ai_gateway.logs)
+
+    @cached_property
+    def datasets(self) -> AsyncDatasetsResourceWithStreamingResponse:
+        return AsyncDatasetsResourceWithStreamingResponse(self._ai_gateway.datasets)
+
+    @cached_property
+    def evaluations(self) -> AsyncEvaluationsResourceWithStreamingResponse:
+        return AsyncEvaluationsResourceWithStreamingResponse(self._ai_gateway.evaluations)
+
+    @cached_property
+    def dynamic_routing(self) -> AsyncDynamicRoutingResourceWithStreamingResponse:
+        return AsyncDynamicRoutingResourceWithStreamingResponse(self._ai_gateway.dynamic_routing)
+
+    @cached_property
+    def provider_configs(self) -> AsyncProviderConfigsResourceWithStreamingResponse:
+        return AsyncProviderConfigsResourceWithStreamingResponse(self._ai_gateway.provider_configs)
+
+    @cached_property
+    def urls(self) -> AsyncURLsResourceWithStreamingResponse:
+        return AsyncURLsResourceWithStreamingResponse(self._ai_gateway.urls)
diff --git a/src/cloudflare/resources/ai_gateway/datasets.py b/src/cloudflare/resources/ai_gateway/datasets.py
new file mode 100644
index 00000000000..bb256a33205
--- /dev/null
+++ b/src/cloudflare/resources/ai_gateway/datasets.py
@@ -0,0 +1,671 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.ai_gateway import dataset_list_params, dataset_create_params, dataset_update_params
+from ...types.ai_gateway.dataset_get_response import DatasetGetResponse
+from ...types.ai_gateway.dataset_list_response import DatasetListResponse
+from ...types.ai_gateway.dataset_create_response import DatasetCreateResponse
+from ...types.ai_gateway.dataset_delete_response import DatasetDeleteResponse
+from ...types.ai_gateway.dataset_update_response import DatasetUpdateResponse
+
+__all__ = ["DatasetsResource", "AsyncDatasetsResource"]
+
+
+class DatasetsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> DatasetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return DatasetsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> DatasetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return DatasetsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        gateway_id: str,
+        *,
+        account_id: str,
+        enable: bool,
+        filters: Iterable[dataset_create_params.Filter],
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatasetCreateResponse:
+        """
+        Create a new Dataset
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets",
+            body=maybe_transform(
+                {
+                    "enable": enable,
+                    "filters": filters,
+                    "name": name,
+                },
+                dataset_create_params.DatasetCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DatasetCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DatasetCreateResponse], ResultWrapper[DatasetCreateResponse]),
+        )
+
+    def update(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        enable: bool,
+        filters: Iterable[dataset_update_params.Filter],
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatasetUpdateResponse:
+        """
+        Update a Dataset
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._put(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets/{id}",
+            body=maybe_transform(
+                {
+                    "enable": enable,
+                    "filters": filters,
+                    "name": name,
+                },
+                dataset_update_params.DatasetUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DatasetUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DatasetUpdateResponse], ResultWrapper[DatasetUpdateResponse]),
+        )
+
+    def list(
+        self,
+        gateway_id: str,
+        *,
+        account_id: str,
+        enable: bool | Omit = omit,
+        name: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[DatasetListResponse]:
+        """
+        List Datasets
+
+        Args:
+          gateway_id: gateway id
+
+          search: Search by id, name, filters
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets",
+            page=SyncV4PagePaginationArray[DatasetListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "enable": enable,
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    dataset_list_params.DatasetListParams,
+                ),
+            ),
+            model=DatasetListResponse,
+        )
+
+    def delete(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatasetDeleteResponse:
+        """
+        Delete a Dataset
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DatasetDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DatasetDeleteResponse], ResultWrapper[DatasetDeleteResponse]),
+        )
+
+    def get(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatasetGetResponse:
+        """
+        Fetch a Dataset
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DatasetGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DatasetGetResponse], ResultWrapper[DatasetGetResponse]),
+        )
+
+
+class AsyncDatasetsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncDatasetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncDatasetsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncDatasetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncDatasetsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        gateway_id: str,
+        *,
+        account_id: str,
+        enable: bool,
+        filters: Iterable[dataset_create_params.Filter],
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatasetCreateResponse:
+        """
+        Create a new Dataset
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets",
+            body=await async_maybe_transform(
+                {
+                    "enable": enable,
+                    "filters": filters,
+                    "name": name,
+                },
+                dataset_create_params.DatasetCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DatasetCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DatasetCreateResponse], ResultWrapper[DatasetCreateResponse]),
+        )
+
+    async def update(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        enable: bool,
+        filters: Iterable[dataset_update_params.Filter],
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatasetUpdateResponse:
+        """
+        Update a Dataset
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets/{id}",
+            body=await async_maybe_transform(
+                {
+                    "enable": enable,
+                    "filters": filters,
+                    "name": name,
+                },
+                dataset_update_params.DatasetUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DatasetUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DatasetUpdateResponse], ResultWrapper[DatasetUpdateResponse]),
+        )
+
+    def list(
+        self,
+        gateway_id: str,
+        *,
+        account_id: str,
+        enable: bool | Omit = omit,
+        name: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[DatasetListResponse, AsyncV4PagePaginationArray[DatasetListResponse]]:
+        """
+        List Datasets
+
+        Args:
+          gateway_id: gateway id
+
+          search: Search by id, name, filters
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets",
+            page=AsyncV4PagePaginationArray[DatasetListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "enable": enable,
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    dataset_list_params.DatasetListParams,
+                ),
+            ),
+            model=DatasetListResponse,
+        )
+
+    async def delete(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatasetDeleteResponse:
+        """
+        Delete a Dataset
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DatasetDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DatasetDeleteResponse], ResultWrapper[DatasetDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatasetGetResponse:
+        """
+        Fetch a Dataset
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DatasetGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DatasetGetResponse], ResultWrapper[DatasetGetResponse]),
+        )
+
+
+class DatasetsResourceWithRawResponse:
+    def __init__(self, datasets: DatasetsResource) -> None:
+        self._datasets = datasets
+
+        self.create = to_raw_response_wrapper(
+            datasets.create,
+        )
+        self.update = to_raw_response_wrapper(
+            datasets.update,
+        )
+        self.list = to_raw_response_wrapper(
+            datasets.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            datasets.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            datasets.get,
+        )
+
+
+class AsyncDatasetsResourceWithRawResponse:
+    def __init__(self, datasets: AsyncDatasetsResource) -> None:
+        self._datasets = datasets
+
+        self.create = async_to_raw_response_wrapper(
+            datasets.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            datasets.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            datasets.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            datasets.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            datasets.get,
+        )
+
+
+class DatasetsResourceWithStreamingResponse:
+    def __init__(self, datasets: DatasetsResource) -> None:
+        self._datasets = datasets
+
+        self.create = to_streamed_response_wrapper(
+            datasets.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            datasets.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            datasets.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            datasets.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            datasets.get,
+        )
+
+
+class AsyncDatasetsResourceWithStreamingResponse:
+    def __init__(self, datasets: AsyncDatasetsResource) -> None:
+        self._datasets = datasets
+
+        self.create = async_to_streamed_response_wrapper(
+            datasets.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            datasets.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            datasets.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            datasets.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            datasets.get,
+        )
diff --git a/src/cloudflare/resources/ai_gateway/dynamic_routing.py b/src/cloudflare/resources/ai_gateway/dynamic_routing.py
new file mode 100644
index 00000000000..719f7e12ff7
--- /dev/null
+++ b/src/cloudflare/resources/ai_gateway/dynamic_routing.py
@@ -0,0 +1,1108 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, cast
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.ai_gateway import (
+    dynamic_routing_create_params,
+    dynamic_routing_update_params,
+    dynamic_routing_create_version_params,
+    dynamic_routing_create_deployment_params,
+)
+from ...types.ai_gateway.dynamic_routing_get_response import DynamicRoutingGetResponse
+from ...types.ai_gateway.dynamic_routing_list_response import DynamicRoutingListResponse
+from ...types.ai_gateway.dynamic_routing_create_response import DynamicRoutingCreateResponse
+from ...types.ai_gateway.dynamic_routing_delete_response import DynamicRoutingDeleteResponse
+from ...types.ai_gateway.dynamic_routing_update_response import DynamicRoutingUpdateResponse
+from ...types.ai_gateway.dynamic_routing_get_version_response import DynamicRoutingGetVersionResponse
+from ...types.ai_gateway.dynamic_routing_list_versions_response import DynamicRoutingListVersionsResponse
+from ...types.ai_gateway.dynamic_routing_create_version_response import DynamicRoutingCreateVersionResponse
+from ...types.ai_gateway.dynamic_routing_list_deployments_response import DynamicRoutingListDeploymentsResponse
+from ...types.ai_gateway.dynamic_routing_create_deployment_response import DynamicRoutingCreateDeploymentResponse
+
+__all__ = ["DynamicRoutingResource", "AsyncDynamicRoutingResource"]
+
+
+class DynamicRoutingResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> DynamicRoutingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return DynamicRoutingResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> DynamicRoutingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return DynamicRoutingResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        gateway_id: str,
+        *,
+        account_id: str,
+        elements: Iterable[dynamic_routing_create_params.Element],
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingCreateResponse:
+        """
+        Create a new AI Gateway Dynamic Route.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes",
+            body=maybe_transform(
+                {
+                    "elements": elements,
+                    "name": name,
+                },
+                dynamic_routing_create_params.DynamicRoutingCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DynamicRoutingCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DynamicRoutingCreateResponse], ResultWrapper[DynamicRoutingCreateResponse]),
+        )
+
+    def update(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingUpdateResponse:
+        """
+        Update an AI Gateway Dynamic Route.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}",
+            body=maybe_transform({"name": name}, dynamic_routing_update_params.DynamicRoutingUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DynamicRoutingUpdateResponse,
+        )
+
+    def list(
+        self,
+        gateway_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingListResponse:
+        """
+        List all AI Gateway Dynamic Routes.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DynamicRoutingListResponse,
+        )
+
+    def delete(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingDeleteResponse:
+        """
+        Delete an AI Gateway Dynamic Route.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DynamicRoutingDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DynamicRoutingDeleteResponse], ResultWrapper[DynamicRoutingDeleteResponse]),
+        )
+
+    def create_deployment(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        comment: str,
+        version_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingCreateDeploymentResponse:
+        """
+        Create a new AI Gateway Dynamic Route Deployment.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._post(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/deployments",
+            body=maybe_transform(
+                {
+                    "comment": comment,
+                    "version_id": version_id,
+                },
+                dynamic_routing_create_deployment_params.DynamicRoutingCreateDeploymentParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DynamicRoutingCreateDeploymentResponse]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[DynamicRoutingCreateDeploymentResponse], ResultWrapper[DynamicRoutingCreateDeploymentResponse]
+            ),
+        )
+
+    def create_version(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        comment: str,
+        elements: Iterable[dynamic_routing_create_version_params.Element],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingCreateVersionResponse:
+        """
+        Create a new AI Gateway Dynamic Route Version.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._post(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/versions",
+            body=maybe_transform(
+                {
+                    "comment": comment,
+                    "elements": elements,
+                },
+                dynamic_routing_create_version_params.DynamicRoutingCreateVersionParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DynamicRoutingCreateVersionResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DynamicRoutingCreateVersionResponse], ResultWrapper[DynamicRoutingCreateVersionResponse]),
+        )
+
+    def get(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingGetResponse:
+        """
+        Get an AI Gateway Dynamic Route.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DynamicRoutingGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DynamicRoutingGetResponse], ResultWrapper[DynamicRoutingGetResponse]),
+        )
+
+    def get_version(
+        self,
+        version_id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingGetVersionResponse:
+        """
+        Get an AI Gateway Dynamic Route Version.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not version_id:
+            raise ValueError(f"Expected a non-empty value for `version_id` but received {version_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/versions/{version_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DynamicRoutingGetVersionResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DynamicRoutingGetVersionResponse], ResultWrapper[DynamicRoutingGetVersionResponse]),
+        )
+
+    def list_deployments(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingListDeploymentsResponse:
+        """
+        List all AI Gateway Dynamic Route Deployments.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/deployments",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DynamicRoutingListDeploymentsResponse,
+        )
+
+    def list_versions(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingListVersionsResponse:
+        """
+        List all AI Gateway Dynamic Route Versions.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/versions",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DynamicRoutingListVersionsResponse,
+        )
+
+
+class AsyncDynamicRoutingResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncDynamicRoutingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncDynamicRoutingResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncDynamicRoutingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncDynamicRoutingResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        gateway_id: str,
+        *,
+        account_id: str,
+        elements: Iterable[dynamic_routing_create_params.Element],
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingCreateResponse:
+        """
+        Create a new AI Gateway Dynamic Route.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes",
+            body=await async_maybe_transform(
+                {
+                    "elements": elements,
+                    "name": name,
+                },
+                dynamic_routing_create_params.DynamicRoutingCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DynamicRoutingCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DynamicRoutingCreateResponse], ResultWrapper[DynamicRoutingCreateResponse]),
+        )
+
+    async def update(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingUpdateResponse:
+        """
+        Update an AI Gateway Dynamic Route.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}",
+            body=await async_maybe_transform({"name": name}, dynamic_routing_update_params.DynamicRoutingUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DynamicRoutingUpdateResponse,
+        )
+
+    async def list(
+        self,
+        gateway_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingListResponse:
+        """
+        List all AI Gateway Dynamic Routes.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DynamicRoutingListResponse,
+        )
+
+    async def delete(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingDeleteResponse:
+        """
+        Delete an AI Gateway Dynamic Route.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DynamicRoutingDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DynamicRoutingDeleteResponse], ResultWrapper[DynamicRoutingDeleteResponse]),
+        )
+
+    async def create_deployment(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        comment: str,
+        version_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingCreateDeploymentResponse:
+        """
+        Create a new AI Gateway Dynamic Route Deployment.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/deployments",
+            body=await async_maybe_transform(
+                {
+                    "comment": comment,
+                    "version_id": version_id,
+                },
+                dynamic_routing_create_deployment_params.DynamicRoutingCreateDeploymentParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DynamicRoutingCreateDeploymentResponse]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[DynamicRoutingCreateDeploymentResponse], ResultWrapper[DynamicRoutingCreateDeploymentResponse]
+            ),
+        )
+
+    async def create_version(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        comment: str,
+        elements: Iterable[dynamic_routing_create_version_params.Element],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingCreateVersionResponse:
+        """
+        Create a new AI Gateway Dynamic Route Version.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/versions",
+            body=await async_maybe_transform(
+                {
+                    "comment": comment,
+                    "elements": elements,
+                },
+                dynamic_routing_create_version_params.DynamicRoutingCreateVersionParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DynamicRoutingCreateVersionResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DynamicRoutingCreateVersionResponse], ResultWrapper[DynamicRoutingCreateVersionResponse]),
+        )
+
+    async def get(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingGetResponse:
+        """
+        Get an AI Gateway Dynamic Route.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DynamicRoutingGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DynamicRoutingGetResponse], ResultWrapper[DynamicRoutingGetResponse]),
+        )
+
+    async def get_version(
+        self,
+        version_id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingGetVersionResponse:
+        """
+        Get an AI Gateway Dynamic Route Version.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not version_id:
+            raise ValueError(f"Expected a non-empty value for `version_id` but received {version_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/versions/{version_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DynamicRoutingGetVersionResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DynamicRoutingGetVersionResponse], ResultWrapper[DynamicRoutingGetVersionResponse]),
+        )
+
+    async def list_deployments(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingListDeploymentsResponse:
+        """
+        List all AI Gateway Dynamic Route Deployments.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/deployments",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DynamicRoutingListDeploymentsResponse,
+        )
+
+    async def list_versions(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DynamicRoutingListVersionsResponse:
+        """
+        List all AI Gateway Dynamic Route Versions.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/routes/{id}/versions",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DynamicRoutingListVersionsResponse,
+        )
+
+
+class DynamicRoutingResourceWithRawResponse:
+    def __init__(self, dynamic_routing: DynamicRoutingResource) -> None:
+        self._dynamic_routing = dynamic_routing
+
+        self.create = to_raw_response_wrapper(
+            dynamic_routing.create,
+        )
+        self.update = to_raw_response_wrapper(
+            dynamic_routing.update,
+        )
+        self.list = to_raw_response_wrapper(
+            dynamic_routing.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            dynamic_routing.delete,
+        )
+        self.create_deployment = to_raw_response_wrapper(
+            dynamic_routing.create_deployment,
+        )
+        self.create_version = to_raw_response_wrapper(
+            dynamic_routing.create_version,
+        )
+        self.get = to_raw_response_wrapper(
+            dynamic_routing.get,
+        )
+        self.get_version = to_raw_response_wrapper(
+            dynamic_routing.get_version,
+        )
+        self.list_deployments = to_raw_response_wrapper(
+            dynamic_routing.list_deployments,
+        )
+        self.list_versions = to_raw_response_wrapper(
+            dynamic_routing.list_versions,
+        )
+
+
+class AsyncDynamicRoutingResourceWithRawResponse:
+    def __init__(self, dynamic_routing: AsyncDynamicRoutingResource) -> None:
+        self._dynamic_routing = dynamic_routing
+
+        self.create = async_to_raw_response_wrapper(
+            dynamic_routing.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            dynamic_routing.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            dynamic_routing.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            dynamic_routing.delete,
+        )
+        self.create_deployment = async_to_raw_response_wrapper(
+            dynamic_routing.create_deployment,
+        )
+        self.create_version = async_to_raw_response_wrapper(
+            dynamic_routing.create_version,
+        )
+        self.get = async_to_raw_response_wrapper(
+            dynamic_routing.get,
+        )
+        self.get_version = async_to_raw_response_wrapper(
+            dynamic_routing.get_version,
+        )
+        self.list_deployments = async_to_raw_response_wrapper(
+            dynamic_routing.list_deployments,
+        )
+        self.list_versions = async_to_raw_response_wrapper(
+            dynamic_routing.list_versions,
+        )
+
+
+class DynamicRoutingResourceWithStreamingResponse:
+    def __init__(self, dynamic_routing: DynamicRoutingResource) -> None:
+        self._dynamic_routing = dynamic_routing
+
+        self.create = to_streamed_response_wrapper(
+            dynamic_routing.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            dynamic_routing.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            dynamic_routing.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            dynamic_routing.delete,
+        )
+        self.create_deployment = to_streamed_response_wrapper(
+            dynamic_routing.create_deployment,
+        )
+        self.create_version = to_streamed_response_wrapper(
+            dynamic_routing.create_version,
+        )
+        self.get = to_streamed_response_wrapper(
+            dynamic_routing.get,
+        )
+        self.get_version = to_streamed_response_wrapper(
+            dynamic_routing.get_version,
+        )
+        self.list_deployments = to_streamed_response_wrapper(
+            dynamic_routing.list_deployments,
+        )
+        self.list_versions = to_streamed_response_wrapper(
+            dynamic_routing.list_versions,
+        )
+
+
+class AsyncDynamicRoutingResourceWithStreamingResponse:
+    def __init__(self, dynamic_routing: AsyncDynamicRoutingResource) -> None:
+        self._dynamic_routing = dynamic_routing
+
+        self.create = async_to_streamed_response_wrapper(
+            dynamic_routing.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            dynamic_routing.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            dynamic_routing.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            dynamic_routing.delete,
+        )
+        self.create_deployment = async_to_streamed_response_wrapper(
+            dynamic_routing.create_deployment,
+        )
+        self.create_version = async_to_streamed_response_wrapper(
+            dynamic_routing.create_version,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            dynamic_routing.get,
+        )
+        self.get_version = async_to_streamed_response_wrapper(
+            dynamic_routing.get_version,
+        )
+        self.list_deployments = async_to_streamed_response_wrapper(
+            dynamic_routing.list_deployments,
+        )
+        self.list_versions = async_to_streamed_response_wrapper(
+            dynamic_routing.list_versions,
+        )
diff --git a/src/cloudflare/resources/ai_gateway/evaluation_types.py b/src/cloudflare/resources/ai_gateway/evaluation_types.py
new file mode 100644
index 00000000000..ed06314835d
--- /dev/null
+++ b/src/cloudflare/resources/ai_gateway/evaluation_types.py
@@ -0,0 +1,202 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.ai_gateway import evaluation_type_list_params
+from ...types.ai_gateway.evaluation_type_list_response import EvaluationTypeListResponse
+
+__all__ = ["EvaluationTypesResource", "AsyncEvaluationTypesResource"]
+
+
+class EvaluationTypesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> EvaluationTypesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return EvaluationTypesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> EvaluationTypesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return EvaluationTypesResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        order_by: str | Omit = omit,
+        order_by_direction: Literal["asc", "desc"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[EvaluationTypeListResponse]:
+        """
+        List Evaluators
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai-gateway/evaluation-types",
+            page=SyncV4PagePaginationArray[EvaluationTypeListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "order_by": order_by,
+                        "order_by_direction": order_by_direction,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    evaluation_type_list_params.EvaluationTypeListParams,
+                ),
+            ),
+            model=EvaluationTypeListResponse,
+        )
+
+
+class AsyncEvaluationTypesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncEvaluationTypesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncEvaluationTypesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncEvaluationTypesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncEvaluationTypesResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        order_by: str | Omit = omit,
+        order_by_direction: Literal["asc", "desc"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[EvaluationTypeListResponse, AsyncV4PagePaginationArray[EvaluationTypeListResponse]]:
+        """
+        List Evaluators
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai-gateway/evaluation-types",
+            page=AsyncV4PagePaginationArray[EvaluationTypeListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "order_by": order_by,
+                        "order_by_direction": order_by_direction,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    evaluation_type_list_params.EvaluationTypeListParams,
+                ),
+            ),
+            model=EvaluationTypeListResponse,
+        )
+
+
+class EvaluationTypesResourceWithRawResponse:
+    def __init__(self, evaluation_types: EvaluationTypesResource) -> None:
+        self._evaluation_types = evaluation_types
+
+        self.list = to_raw_response_wrapper(
+            evaluation_types.list,
+        )
+
+
+class AsyncEvaluationTypesResourceWithRawResponse:
+    def __init__(self, evaluation_types: AsyncEvaluationTypesResource) -> None:
+        self._evaluation_types = evaluation_types
+
+        self.list = async_to_raw_response_wrapper(
+            evaluation_types.list,
+        )
+
+
+class EvaluationTypesResourceWithStreamingResponse:
+    def __init__(self, evaluation_types: EvaluationTypesResource) -> None:
+        self._evaluation_types = evaluation_types
+
+        self.list = to_streamed_response_wrapper(
+            evaluation_types.list,
+        )
+
+
+class AsyncEvaluationTypesResourceWithStreamingResponse:
+    def __init__(self, evaluation_types: AsyncEvaluationTypesResource) -> None:
+        self._evaluation_types = evaluation_types
+
+        self.list = async_to_streamed_response_wrapper(
+            evaluation_types.list,
+        )
diff --git a/src/cloudflare/resources/ai_gateway/evaluations.py b/src/cloudflare/resources/ai_gateway/evaluations.py
new file mode 100644
index 00000000000..e3d9fd87309
--- /dev/null
+++ b/src/cloudflare/resources/ai_gateway/evaluations.py
@@ -0,0 +1,546 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.ai_gateway import evaluation_list_params, evaluation_create_params
+from ...types.ai_gateway.evaluation_get_response import EvaluationGetResponse
+from ...types.ai_gateway.evaluation_list_response import EvaluationListResponse
+from ...types.ai_gateway.evaluation_create_response import EvaluationCreateResponse
+from ...types.ai_gateway.evaluation_delete_response import EvaluationDeleteResponse
+
+__all__ = ["EvaluationsResource", "AsyncEvaluationsResource"]
+
+
+class EvaluationsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> EvaluationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return EvaluationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> EvaluationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return EvaluationsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        gateway_id: str,
+        *,
+        account_id: str,
+        dataset_ids: SequenceNotStr[str],
+        evaluation_type_ids: SequenceNotStr[str],
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EvaluationCreateResponse:
+        """
+        Create a new Evaluation
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations",
+            body=maybe_transform(
+                {
+                    "dataset_ids": dataset_ids,
+                    "evaluation_type_ids": evaluation_type_ids,
+                    "name": name,
+                },
+                evaluation_create_params.EvaluationCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[EvaluationCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[EvaluationCreateResponse], ResultWrapper[EvaluationCreateResponse]),
+        )
+
+    def list(
+        self,
+        gateway_id: str,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        processed: bool | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[EvaluationListResponse]:
+        """
+        List Evaluations
+
+        Args:
+          gateway_id: gateway id
+
+          search: Search by id, name
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations",
+            page=SyncV4PagePaginationArray[EvaluationListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                        "processed": processed,
+                        "search": search,
+                    },
+                    evaluation_list_params.EvaluationListParams,
+                ),
+            ),
+            model=EvaluationListResponse,
+        )
+
+    def delete(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EvaluationDeleteResponse:
+        """
+        Delete a Evaluation
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[EvaluationDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[EvaluationDeleteResponse], ResultWrapper[EvaluationDeleteResponse]),
+        )
+
+    def get(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EvaluationGetResponse:
+        """
+        Fetch a Evaluation
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[EvaluationGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[EvaluationGetResponse], ResultWrapper[EvaluationGetResponse]),
+        )
+
+
+class AsyncEvaluationsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncEvaluationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncEvaluationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncEvaluationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncEvaluationsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        gateway_id: str,
+        *,
+        account_id: str,
+        dataset_ids: SequenceNotStr[str],
+        evaluation_type_ids: SequenceNotStr[str],
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EvaluationCreateResponse:
+        """
+        Create a new Evaluation
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations",
+            body=await async_maybe_transform(
+                {
+                    "dataset_ids": dataset_ids,
+                    "evaluation_type_ids": evaluation_type_ids,
+                    "name": name,
+                },
+                evaluation_create_params.EvaluationCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[EvaluationCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[EvaluationCreateResponse], ResultWrapper[EvaluationCreateResponse]),
+        )
+
+    def list(
+        self,
+        gateway_id: str,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        processed: bool | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[EvaluationListResponse, AsyncV4PagePaginationArray[EvaluationListResponse]]:
+        """
+        List Evaluations
+
+        Args:
+          gateway_id: gateway id
+
+          search: Search by id, name
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations",
+            page=AsyncV4PagePaginationArray[EvaluationListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                        "processed": processed,
+                        "search": search,
+                    },
+                    evaluation_list_params.EvaluationListParams,
+                ),
+            ),
+            model=EvaluationListResponse,
+        )
+
+    async def delete(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EvaluationDeleteResponse:
+        """
+        Delete a Evaluation
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[EvaluationDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[EvaluationDeleteResponse], ResultWrapper[EvaluationDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EvaluationGetResponse:
+        """
+        Fetch a Evaluation
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[EvaluationGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[EvaluationGetResponse], ResultWrapper[EvaluationGetResponse]),
+        )
+
+
+class EvaluationsResourceWithRawResponse:
+    def __init__(self, evaluations: EvaluationsResource) -> None:
+        self._evaluations = evaluations
+
+        self.create = to_raw_response_wrapper(
+            evaluations.create,
+        )
+        self.list = to_raw_response_wrapper(
+            evaluations.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            evaluations.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            evaluations.get,
+        )
+
+
+class AsyncEvaluationsResourceWithRawResponse:
+    def __init__(self, evaluations: AsyncEvaluationsResource) -> None:
+        self._evaluations = evaluations
+
+        self.create = async_to_raw_response_wrapper(
+            evaluations.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            evaluations.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            evaluations.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            evaluations.get,
+        )
+
+
+class EvaluationsResourceWithStreamingResponse:
+    def __init__(self, evaluations: EvaluationsResource) -> None:
+        self._evaluations = evaluations
+
+        self.create = to_streamed_response_wrapper(
+            evaluations.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            evaluations.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            evaluations.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            evaluations.get,
+        )
+
+
+class AsyncEvaluationsResourceWithStreamingResponse:
+    def __init__(self, evaluations: AsyncEvaluationsResource) -> None:
+        self._evaluations = evaluations
+
+        self.create = async_to_streamed_response_wrapper(
+            evaluations.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            evaluations.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            evaluations.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            evaluations.get,
+        )
diff --git a/src/cloudflare/resources/ai_gateway/logs.py b/src/cloudflare/resources/ai_gateway/logs.py
index 4ddf4d28468..8518d36781c 100644
--- a/src/cloudflare/resources/ai_gateway/logs.py
+++ b/src/cloudflare/resources/ai_gateway/logs.py
@@ -2,14 +2,14 @@
 
 from __future__ import annotations
 
-from typing import Union
+from typing import Dict, Type, Union, Iterable, Optional, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import maybe_transform
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -18,10 +18,13 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
+from ..._wrappers import ResultWrapper
 from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ..._base_client import AsyncPaginator, make_request_options
-from ...types.ai_gateway import log_list_params
+from ...types.ai_gateway import log_edit_params, log_list_params, log_delete_params
+from ...types.ai_gateway.log_get_response import LogGetResponse
 from ...types.ai_gateway.log_list_response import LogListResponse
+from ...types.ai_gateway.log_delete_response import LogDeleteResponse
 
 __all__ = ["LogsResource", "AsyncLogsResource"]
 
@@ -29,38 +32,68 @@
 class LogsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> LogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LogsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LogsResourceWithStreamingResponse(self)
 
     def list(
         self,
-        id: str,
+        gateway_id: str,
         *,
         account_id: str,
-        cached: bool | NotGiven = NOT_GIVEN,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        end_date: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        order_by: Literal["created_at", "provider"] | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
-        search: str | NotGiven = NOT_GIVEN,
-        start_date: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        success: bool | NotGiven = NOT_GIVEN,
+        cached: bool | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        end_date: Union[str, datetime] | Omit = omit,
+        feedback: Literal[0, 1] | Omit = omit,
+        filters: Iterable[log_list_params.Filter] | Omit = omit,
+        max_cost: float | Omit = omit,
+        max_duration: float | Omit = omit,
+        max_tokens_in: float | Omit = omit,
+        max_tokens_out: float | Omit = omit,
+        max_total_tokens: float | Omit = omit,
+        meta_info: bool | Omit = omit,
+        min_cost: float | Omit = omit,
+        min_duration: float | Omit = omit,
+        min_tokens_in: float | Omit = omit,
+        min_tokens_out: float | Omit = omit,
+        min_total_tokens: float | Omit = omit,
+        model: str | Omit = omit,
+        model_type: str | Omit = omit,
+        order_by: Literal["created_at", "provider", "model", "model_type", "success", "cached"] | Omit = omit,
+        order_by_direction: Literal["asc", "desc"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        provider: str | Omit = omit,
+        request_content_type: str | Omit = omit,
+        response_content_type: str | Omit = omit,
+        search: str | Omit = omit,
+        start_date: Union[str, datetime] | Omit = omit,
+        success: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[LogListResponse]:
         """
         List Gateway Logs
 
         Args:
-          id: gateway id
+          gateway_id: gateway id
 
           extra_headers: Send extra headers
 
@@ -72,10 +105,10 @@ def list(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
         return self._get_api_list(
-            f"/accounts/{account_id}/ai-gateway/gateways/{id}/logs",
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs",
             page=SyncV4PagePaginationArray[LogListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -87,9 +120,28 @@ def list(
                         "cached": cached,
                         "direction": direction,
                         "end_date": end_date,
+                        "feedback": feedback,
+                        "filters": filters,
+                        "max_cost": max_cost,
+                        "max_duration": max_duration,
+                        "max_tokens_in": max_tokens_in,
+                        "max_tokens_out": max_tokens_out,
+                        "max_total_tokens": max_total_tokens,
+                        "meta_info": meta_info,
+                        "min_cost": min_cost,
+                        "min_duration": min_duration,
+                        "min_tokens_in": min_tokens_in,
+                        "min_tokens_out": min_tokens_out,
+                        "min_total_tokens": min_total_tokens,
+                        "model": model,
+                        "model_type": model_type,
                         "order_by": order_by,
+                        "order_by_direction": order_by_direction,
                         "page": page,
                         "per_page": per_page,
+                        "provider": provider,
+                        "request_content_type": request_content_type,
+                        "response_content_type": response_content_type,
                         "search": search,
                         "start_date": start_date,
                         "success": success,
@@ -100,42 +152,322 @@ def list(
             model=LogListResponse,
         )
 
+    def delete(
+        self,
+        gateway_id: str,
+        *,
+        account_id: str,
+        filters: Iterable[log_delete_params.Filter] | Omit = omit,
+        limit: int | Omit = omit,
+        order_by: Literal[
+            "created_at",
+            "provider",
+            "model",
+            "model_type",
+            "success",
+            "cached",
+            "cost",
+            "tokens_in",
+            "tokens_out",
+            "duration",
+            "feedback",
+        ]
+        | Omit = omit,
+        order_by_direction: Literal["asc", "desc"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LogDeleteResponse:
+        """
+        Delete Gateway Logs
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "filters": filters,
+                        "limit": limit,
+                        "order_by": order_by,
+                        "order_by_direction": order_by_direction,
+                    },
+                    log_delete_params.LogDeleteParams,
+                ),
+            ),
+            cast_to=LogDeleteResponse,
+        )
+
+    def edit(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        feedback: Optional[float] | Omit = omit,
+        metadata: Optional[Dict[str, Union[str, float, bool]]] | Omit = omit,
+        score: Optional[float] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Patch Gateway Log
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}",
+            body=maybe_transform(
+                {
+                    "feedback": feedback,
+                    "metadata": metadata,
+                    "score": score,
+                },
+                log_edit_params.LogEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def get(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LogGetResponse:
+        """
+        Get Gateway Log Detail
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[LogGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LogGetResponse], ResultWrapper[LogGetResponse]),
+        )
+
+    def request(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Get Gateway Log Request
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}/request",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=object,
+        )
+
+    def response(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Get Gateway Log Response
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}/response",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=object,
+        )
+
 
 class AsyncLogsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncLogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLogsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLogsResourceWithStreamingResponse(self)
 
     def list(
         self,
-        id: str,
+        gateway_id: str,
         *,
         account_id: str,
-        cached: bool | NotGiven = NOT_GIVEN,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        end_date: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        order_by: Literal["created_at", "provider"] | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
-        search: str | NotGiven = NOT_GIVEN,
-        start_date: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        success: bool | NotGiven = NOT_GIVEN,
+        cached: bool | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        end_date: Union[str, datetime] | Omit = omit,
+        feedback: Literal[0, 1] | Omit = omit,
+        filters: Iterable[log_list_params.Filter] | Omit = omit,
+        max_cost: float | Omit = omit,
+        max_duration: float | Omit = omit,
+        max_tokens_in: float | Omit = omit,
+        max_tokens_out: float | Omit = omit,
+        max_total_tokens: float | Omit = omit,
+        meta_info: bool | Omit = omit,
+        min_cost: float | Omit = omit,
+        min_duration: float | Omit = omit,
+        min_tokens_in: float | Omit = omit,
+        min_tokens_out: float | Omit = omit,
+        min_total_tokens: float | Omit = omit,
+        model: str | Omit = omit,
+        model_type: str | Omit = omit,
+        order_by: Literal["created_at", "provider", "model", "model_type", "success", "cached"] | Omit = omit,
+        order_by_direction: Literal["asc", "desc"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        provider: str | Omit = omit,
+        request_content_type: str | Omit = omit,
+        response_content_type: str | Omit = omit,
+        search: str | Omit = omit,
+        start_date: Union[str, datetime] | Omit = omit,
+        success: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[LogListResponse, AsyncV4PagePaginationArray[LogListResponse]]:
         """
         List Gateway Logs
 
         Args:
-          id: gateway id
+          gateway_id: gateway id
 
           extra_headers: Send extra headers
 
@@ -147,10 +479,10 @@ def list(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
         return self._get_api_list(
-            f"/accounts/{account_id}/ai-gateway/gateways/{id}/logs",
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs",
             page=AsyncV4PagePaginationArray[LogListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -162,9 +494,28 @@ def list(
                         "cached": cached,
                         "direction": direction,
                         "end_date": end_date,
+                        "feedback": feedback,
+                        "filters": filters,
+                        "max_cost": max_cost,
+                        "max_duration": max_duration,
+                        "max_tokens_in": max_tokens_in,
+                        "max_tokens_out": max_tokens_out,
+                        "max_total_tokens": max_total_tokens,
+                        "meta_info": meta_info,
+                        "min_cost": min_cost,
+                        "min_duration": min_duration,
+                        "min_tokens_in": min_tokens_in,
+                        "min_tokens_out": min_tokens_out,
+                        "min_total_tokens": min_total_tokens,
+                        "model": model,
+                        "model_type": model_type,
                         "order_by": order_by,
+                        "order_by_direction": order_by_direction,
                         "page": page,
                         "per_page": per_page,
+                        "provider": provider,
+                        "request_content_type": request_content_type,
+                        "response_content_type": response_content_type,
                         "search": search,
                         "start_date": start_date,
                         "success": success,
@@ -175,6 +526,256 @@ def list(
             model=LogListResponse,
         )
 
+    async def delete(
+        self,
+        gateway_id: str,
+        *,
+        account_id: str,
+        filters: Iterable[log_delete_params.Filter] | Omit = omit,
+        limit: int | Omit = omit,
+        order_by: Literal[
+            "created_at",
+            "provider",
+            "model",
+            "model_type",
+            "success",
+            "cached",
+            "cost",
+            "tokens_in",
+            "tokens_out",
+            "duration",
+            "feedback",
+        ]
+        | Omit = omit,
+        order_by_direction: Literal["asc", "desc"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LogDeleteResponse:
+        """
+        Delete Gateway Logs
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "filters": filters,
+                        "limit": limit,
+                        "order_by": order_by,
+                        "order_by_direction": order_by_direction,
+                    },
+                    log_delete_params.LogDeleteParams,
+                ),
+            ),
+            cast_to=LogDeleteResponse,
+        )
+
+    async def edit(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        feedback: Optional[float] | Omit = omit,
+        metadata: Optional[Dict[str, Union[str, float, bool]]] | Omit = omit,
+        score: Optional[float] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Patch Gateway Log
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}",
+            body=await async_maybe_transform(
+                {
+                    "feedback": feedback,
+                    "metadata": metadata,
+                    "score": score,
+                },
+                log_edit_params.LogEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def get(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LogGetResponse:
+        """
+        Get Gateway Log Detail
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[LogGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LogGetResponse], ResultWrapper[LogGetResponse]),
+        )
+
+    async def request(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Get Gateway Log Request
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}/request",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=object,
+        )
+
+    async def response(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Get Gateway Log Response
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}/response",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=object,
+        )
+
 
 class LogsResourceWithRawResponse:
     def __init__(self, logs: LogsResource) -> None:
@@ -183,6 +784,21 @@ def __init__(self, logs: LogsResource) -> None:
         self.list = to_raw_response_wrapper(
             logs.list,
         )
+        self.delete = to_raw_response_wrapper(
+            logs.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            logs.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            logs.get,
+        )
+        self.request = to_raw_response_wrapper(
+            logs.request,
+        )
+        self.response = to_raw_response_wrapper(
+            logs.response,
+        )
 
 
 class AsyncLogsResourceWithRawResponse:
@@ -192,6 +808,21 @@ def __init__(self, logs: AsyncLogsResource) -> None:
         self.list = async_to_raw_response_wrapper(
             logs.list,
         )
+        self.delete = async_to_raw_response_wrapper(
+            logs.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            logs.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            logs.get,
+        )
+        self.request = async_to_raw_response_wrapper(
+            logs.request,
+        )
+        self.response = async_to_raw_response_wrapper(
+            logs.response,
+        )
 
 
 class LogsResourceWithStreamingResponse:
@@ -201,6 +832,21 @@ def __init__(self, logs: LogsResource) -> None:
         self.list = to_streamed_response_wrapper(
             logs.list,
         )
+        self.delete = to_streamed_response_wrapper(
+            logs.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            logs.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            logs.get,
+        )
+        self.request = to_streamed_response_wrapper(
+            logs.request,
+        )
+        self.response = to_streamed_response_wrapper(
+            logs.response,
+        )
 
 
 class AsyncLogsResourceWithStreamingResponse:
@@ -210,3 +856,18 @@ def __init__(self, logs: AsyncLogsResource) -> None:
         self.list = async_to_streamed_response_wrapper(
             logs.list,
         )
+        self.delete = async_to_streamed_response_wrapper(
+            logs.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            logs.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            logs.get,
+        )
+        self.request = async_to_streamed_response_wrapper(
+            logs.request,
+        )
+        self.response = async_to_streamed_response_wrapper(
+            logs.response,
+        )
diff --git a/src/cloudflare/resources/ai_gateway/provider_configs.py b/src/cloudflare/resources/ai_gateway/provider_configs.py
new file mode 100644
index 00000000000..60c7fc5f891
--- /dev/null
+++ b/src/cloudflare/resources/ai_gateway/provider_configs.py
@@ -0,0 +1,340 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.ai_gateway import provider_config_list_params, provider_config_create_params
+from ...types.ai_gateway.provider_config_list_response import ProviderConfigListResponse
+from ...types.ai_gateway.provider_config_create_response import ProviderConfigCreateResponse
+
+__all__ = ["ProviderConfigsResource", "AsyncProviderConfigsResource"]
+
+
+class ProviderConfigsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ProviderConfigsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ProviderConfigsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ProviderConfigsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ProviderConfigsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        gateway_id: str,
+        *,
+        account_id: str,
+        alias: str,
+        default_config: bool,
+        provider_slug: str,
+        secret: str,
+        secret_id: str,
+        rate_limit: float | Omit = omit,
+        rate_limit_period: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ProviderConfigCreateResponse:
+        """
+        Create a new Provider Configs
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/provider_configs",
+            body=maybe_transform(
+                {
+                    "alias": alias,
+                    "default_config": default_config,
+                    "provider_slug": provider_slug,
+                    "secret": secret,
+                    "secret_id": secret_id,
+                    "rate_limit": rate_limit,
+                    "rate_limit_period": rate_limit_period,
+                },
+                provider_config_create_params.ProviderConfigCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ProviderConfigCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ProviderConfigCreateResponse], ResultWrapper[ProviderConfigCreateResponse]),
+        )
+
+    def list(
+        self,
+        gateway_id: str,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[ProviderConfigListResponse]:
+        """
+        List Provider Configs
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/provider_configs",
+            page=SyncV4PagePaginationArray[ProviderConfigListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    provider_config_list_params.ProviderConfigListParams,
+                ),
+            ),
+            model=ProviderConfigListResponse,
+        )
+
+
+class AsyncProviderConfigsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncProviderConfigsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncProviderConfigsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncProviderConfigsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncProviderConfigsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        gateway_id: str,
+        *,
+        account_id: str,
+        alias: str,
+        default_config: bool,
+        provider_slug: str,
+        secret: str,
+        secret_id: str,
+        rate_limit: float | Omit = omit,
+        rate_limit_period: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ProviderConfigCreateResponse:
+        """
+        Create a new Provider Configs
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/provider_configs",
+            body=await async_maybe_transform(
+                {
+                    "alias": alias,
+                    "default_config": default_config,
+                    "provider_slug": provider_slug,
+                    "secret": secret,
+                    "secret_id": secret_id,
+                    "rate_limit": rate_limit,
+                    "rate_limit_period": rate_limit_period,
+                },
+                provider_config_create_params.ProviderConfigCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ProviderConfigCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ProviderConfigCreateResponse], ResultWrapper[ProviderConfigCreateResponse]),
+        )
+
+    def list(
+        self,
+        gateway_id: str,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ProviderConfigListResponse, AsyncV4PagePaginationArray[ProviderConfigListResponse]]:
+        """
+        List Provider Configs
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/provider_configs",
+            page=AsyncV4PagePaginationArray[ProviderConfigListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    provider_config_list_params.ProviderConfigListParams,
+                ),
+            ),
+            model=ProviderConfigListResponse,
+        )
+
+
+class ProviderConfigsResourceWithRawResponse:
+    def __init__(self, provider_configs: ProviderConfigsResource) -> None:
+        self._provider_configs = provider_configs
+
+        self.create = to_raw_response_wrapper(
+            provider_configs.create,
+        )
+        self.list = to_raw_response_wrapper(
+            provider_configs.list,
+        )
+
+
+class AsyncProviderConfigsResourceWithRawResponse:
+    def __init__(self, provider_configs: AsyncProviderConfigsResource) -> None:
+        self._provider_configs = provider_configs
+
+        self.create = async_to_raw_response_wrapper(
+            provider_configs.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            provider_configs.list,
+        )
+
+
+class ProviderConfigsResourceWithStreamingResponse:
+    def __init__(self, provider_configs: ProviderConfigsResource) -> None:
+        self._provider_configs = provider_configs
+
+        self.create = to_streamed_response_wrapper(
+            provider_configs.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            provider_configs.list,
+        )
+
+
+class AsyncProviderConfigsResourceWithStreamingResponse:
+    def __init__(self, provider_configs: AsyncProviderConfigsResource) -> None:
+        self._provider_configs = provider_configs
+
+        self.create = async_to_streamed_response_wrapper(
+            provider_configs.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            provider_configs.list,
+        )
diff --git a/src/cloudflare/resources/ai_gateway/urls.py b/src/cloudflare/resources/ai_gateway/urls.py
new file mode 100644
index 00000000000..8f660faa164
--- /dev/null
+++ b/src/cloudflare/resources/ai_gateway/urls.py
@@ -0,0 +1,190 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.ai_gateway.url_get_response import URLGetResponse
+
+__all__ = ["URLsResource", "AsyncURLsResource"]
+
+
+class URLsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> URLsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return URLsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> URLsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return URLsResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        provider: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Get Gateway URL
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not provider:
+            raise ValueError(f"Expected a non-empty value for `provider` but received {provider!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/url/{provider}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[URLGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class AsyncURLsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncURLsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncURLsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncURLsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncURLsResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        provider: str,
+        *,
+        account_id: str,
+        gateway_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Get Gateway URL
+
+        Args:
+          gateway_id: gateway id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not gateway_id:
+            raise ValueError(f"Expected a non-empty value for `gateway_id` but received {gateway_id!r}")
+        if not provider:
+            raise ValueError(f"Expected a non-empty value for `provider` but received {provider!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai-gateway/gateways/{gateway_id}/url/{provider}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[URLGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class URLsResourceWithRawResponse:
+    def __init__(self, urls: URLsResource) -> None:
+        self._urls = urls
+
+        self.get = to_raw_response_wrapper(
+            urls.get,
+        )
+
+
+class AsyncURLsResourceWithRawResponse:
+    def __init__(self, urls: AsyncURLsResource) -> None:
+        self._urls = urls
+
+        self.get = async_to_raw_response_wrapper(
+            urls.get,
+        )
+
+
+class URLsResourceWithStreamingResponse:
+    def __init__(self, urls: URLsResource) -> None:
+        self._urls = urls
+
+        self.get = to_streamed_response_wrapper(
+            urls.get,
+        )
+
+
+class AsyncURLsResourceWithStreamingResponse:
+    def __init__(self, urls: AsyncURLsResource) -> None:
+        self._urls = urls
+
+        self.get = async_to_streamed_response_wrapper(
+            urls.get,
+        )
diff --git a/src/cloudflare/resources/aisearch/__init__.py b/src/cloudflare/resources/aisearch/__init__.py
new file mode 100644
index 00000000000..e7d15dd59ad
--- /dev/null
+++ b/src/cloudflare/resources/aisearch/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .tokens import (
+    TokensResource,
+    AsyncTokensResource,
+    TokensResourceWithRawResponse,
+    AsyncTokensResourceWithRawResponse,
+    TokensResourceWithStreamingResponse,
+    AsyncTokensResourceWithStreamingResponse,
+)
+from .aisearch import (
+    AISearchResource,
+    AsyncAISearchResource,
+    AISearchResourceWithRawResponse,
+    AsyncAISearchResourceWithRawResponse,
+    AISearchResourceWithStreamingResponse,
+    AsyncAISearchResourceWithStreamingResponse,
+)
+from .instances import (
+    InstancesResource,
+    AsyncInstancesResource,
+    InstancesResourceWithRawResponse,
+    AsyncInstancesResourceWithRawResponse,
+    InstancesResourceWithStreamingResponse,
+    AsyncInstancesResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "InstancesResource",
+    "AsyncInstancesResource",
+    "InstancesResourceWithRawResponse",
+    "AsyncInstancesResourceWithRawResponse",
+    "InstancesResourceWithStreamingResponse",
+    "AsyncInstancesResourceWithStreamingResponse",
+    "TokensResource",
+    "AsyncTokensResource",
+    "TokensResourceWithRawResponse",
+    "AsyncTokensResourceWithRawResponse",
+    "TokensResourceWithStreamingResponse",
+    "AsyncTokensResourceWithStreamingResponse",
+    "AISearchResource",
+    "AsyncAISearchResource",
+    "AISearchResourceWithRawResponse",
+    "AsyncAISearchResourceWithRawResponse",
+    "AISearchResourceWithStreamingResponse",
+    "AsyncAISearchResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/aisearch/aisearch.py b/src/cloudflare/resources/aisearch/aisearch.py
new file mode 100644
index 00000000000..483739a1224
--- /dev/null
+++ b/src/cloudflare/resources/aisearch/aisearch.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .tokens import (
+    TokensResource,
+    AsyncTokensResource,
+    TokensResourceWithRawResponse,
+    AsyncTokensResourceWithRawResponse,
+    TokensResourceWithStreamingResponse,
+    AsyncTokensResourceWithStreamingResponse,
+)
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .instances.instances import (
+    InstancesResource,
+    AsyncInstancesResource,
+    InstancesResourceWithRawResponse,
+    AsyncInstancesResourceWithRawResponse,
+    InstancesResourceWithStreamingResponse,
+    AsyncInstancesResourceWithStreamingResponse,
+)
+
+__all__ = ["AISearchResource", "AsyncAISearchResource"]
+
+
+class AISearchResource(SyncAPIResource):
+    @cached_property
+    def instances(self) -> InstancesResource:
+        return InstancesResource(self._client)
+
+    @cached_property
+    def tokens(self) -> TokensResource:
+        return TokensResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AISearchResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AISearchResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AISearchResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AISearchResourceWithStreamingResponse(self)
+
+
+class AsyncAISearchResource(AsyncAPIResource):
+    @cached_property
+    def instances(self) -> AsyncInstancesResource:
+        return AsyncInstancesResource(self._client)
+
+    @cached_property
+    def tokens(self) -> AsyncTokensResource:
+        return AsyncTokensResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncAISearchResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAISearchResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAISearchResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAISearchResourceWithStreamingResponse(self)
+
+
+class AISearchResourceWithRawResponse:
+    def __init__(self, aisearch: AISearchResource) -> None:
+        self._aisearch = aisearch
+
+    @cached_property
+    def instances(self) -> InstancesResourceWithRawResponse:
+        return InstancesResourceWithRawResponse(self._aisearch.instances)
+
+    @cached_property
+    def tokens(self) -> TokensResourceWithRawResponse:
+        return TokensResourceWithRawResponse(self._aisearch.tokens)
+
+
+class AsyncAISearchResourceWithRawResponse:
+    def __init__(self, aisearch: AsyncAISearchResource) -> None:
+        self._aisearch = aisearch
+
+    @cached_property
+    def instances(self) -> AsyncInstancesResourceWithRawResponse:
+        return AsyncInstancesResourceWithRawResponse(self._aisearch.instances)
+
+    @cached_property
+    def tokens(self) -> AsyncTokensResourceWithRawResponse:
+        return AsyncTokensResourceWithRawResponse(self._aisearch.tokens)
+
+
+class AISearchResourceWithStreamingResponse:
+    def __init__(self, aisearch: AISearchResource) -> None:
+        self._aisearch = aisearch
+
+    @cached_property
+    def instances(self) -> InstancesResourceWithStreamingResponse:
+        return InstancesResourceWithStreamingResponse(self._aisearch.instances)
+
+    @cached_property
+    def tokens(self) -> TokensResourceWithStreamingResponse:
+        return TokensResourceWithStreamingResponse(self._aisearch.tokens)
+
+
+class AsyncAISearchResourceWithStreamingResponse:
+    def __init__(self, aisearch: AsyncAISearchResource) -> None:
+        self._aisearch = aisearch
+
+    @cached_property
+    def instances(self) -> AsyncInstancesResourceWithStreamingResponse:
+        return AsyncInstancesResourceWithStreamingResponse(self._aisearch.instances)
+
+    @cached_property
+    def tokens(self) -> AsyncTokensResourceWithStreamingResponse:
+        return AsyncTokensResourceWithStreamingResponse(self._aisearch.tokens)
diff --git a/src/cloudflare/resources/aisearch/instances/__init__.py b/src/cloudflare/resources/aisearch/instances/__init__.py
new file mode 100644
index 00000000000..bcd3fe82f43
--- /dev/null
+++ b/src/cloudflare/resources/aisearch/instances/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .jobs import (
+    JobsResource,
+    AsyncJobsResource,
+    JobsResourceWithRawResponse,
+    AsyncJobsResourceWithRawResponse,
+    JobsResourceWithStreamingResponse,
+    AsyncJobsResourceWithStreamingResponse,
+)
+from .items import (
+    ItemsResource,
+    AsyncItemsResource,
+    ItemsResourceWithRawResponse,
+    AsyncItemsResourceWithRawResponse,
+    ItemsResourceWithStreamingResponse,
+    AsyncItemsResourceWithStreamingResponse,
+)
+from .instances import (
+    InstancesResource,
+    AsyncInstancesResource,
+    InstancesResourceWithRawResponse,
+    AsyncInstancesResourceWithRawResponse,
+    InstancesResourceWithStreamingResponse,
+    AsyncInstancesResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ItemsResource",
+    "AsyncItemsResource",
+    "ItemsResourceWithRawResponse",
+    "AsyncItemsResourceWithRawResponse",
+    "ItemsResourceWithStreamingResponse",
+    "AsyncItemsResourceWithStreamingResponse",
+    "JobsResource",
+    "AsyncJobsResource",
+    "JobsResourceWithRawResponse",
+    "AsyncJobsResourceWithRawResponse",
+    "JobsResourceWithStreamingResponse",
+    "AsyncJobsResourceWithStreamingResponse",
+    "InstancesResource",
+    "AsyncInstancesResource",
+    "InstancesResourceWithRawResponse",
+    "AsyncInstancesResourceWithRawResponse",
+    "InstancesResourceWithStreamingResponse",
+    "AsyncInstancesResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/aisearch/instances/instances.py b/src/cloudflare/resources/aisearch/instances/instances.py
new file mode 100644
index 00000000000..44984f27f89
--- /dev/null
+++ b/src/cloudflare/resources/aisearch/instances/instances.py
@@ -0,0 +1,1569 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, cast
+from typing_extensions import Literal
+
+import httpx
+
+from .jobs import (
+    JobsResource,
+    AsyncJobsResource,
+    JobsResourceWithRawResponse,
+    AsyncJobsResourceWithRawResponse,
+    JobsResourceWithStreamingResponse,
+    AsyncJobsResourceWithStreamingResponse,
+)
+from .items import (
+    ItemsResource,
+    AsyncItemsResource,
+    ItemsResourceWithRawResponse,
+    AsyncItemsResourceWithRawResponse,
+    ItemsResourceWithStreamingResponse,
+    AsyncItemsResourceWithStreamingResponse,
+)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.aisearch import (
+    instance_list_params,
+    instance_create_params,
+    instance_search_params,
+    instance_update_params,
+    instance_chat_completions_params,
+)
+from ....types.aisearch.instance_list_response import InstanceListResponse
+from ....types.aisearch.instance_read_response import InstanceReadResponse
+from ....types.aisearch.instance_stats_response import InstanceStatsResponse
+from ....types.aisearch.instance_create_response import InstanceCreateResponse
+from ....types.aisearch.instance_delete_response import InstanceDeleteResponse
+from ....types.aisearch.instance_search_response import InstanceSearchResponse
+from ....types.aisearch.instance_update_response import InstanceUpdateResponse
+from ....types.aisearch.instance_chat_completions_response import InstanceChatCompletionsResponse
+
+__all__ = ["InstancesResource", "AsyncInstancesResource"]
+
+
+class InstancesResource(SyncAPIResource):
+    @cached_property
+    def items(self) -> ItemsResource:
+        return ItemsResource(self._client)
+
+    @cached_property
+    def jobs(self) -> JobsResource:
+        return JobsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> InstancesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return InstancesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> InstancesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return InstancesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        id: str,
+        source: str,
+        type: Literal["r2", "web-crawler"],
+        ai_gateway_id: str | Omit = omit,
+        aisearch_model: Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+        | Omit = omit,
+        chunk: bool | Omit = omit,
+        chunk_overlap: int | Omit = omit,
+        chunk_size: int | Omit = omit,
+        custom_metadata: Iterable[instance_create_params.CustomMetadata] | Omit = omit,
+        embedding_model: Literal[
+            "@cf/qwen/qwen3-embedding-0.6b",
+            "@cf/baai/bge-m3",
+            "@cf/baai/bge-large-en-v1.5",
+            "@cf/google/embeddinggemma-300m",
+            "google-ai-studio/gemini-embedding-001",
+            "openai/text-embedding-3-small",
+            "openai/text-embedding-3-large",
+            "",
+        ]
+        | Omit = omit,
+        hybrid_search_enabled: bool | Omit = omit,
+        max_num_results: int | Omit = omit,
+        metadata: instance_create_params.Metadata | Omit = omit,
+        public_endpoint_params: instance_create_params.PublicEndpointParams | Omit = omit,
+        reranking: bool | Omit = omit,
+        reranking_model: Literal["@cf/baai/bge-reranker-base", ""] | Omit = omit,
+        rewrite_model: Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+        | Omit = omit,
+        rewrite_query: bool | Omit = omit,
+        score_threshold: float | Omit = omit,
+        source_params: instance_create_params.SourceParams | Omit = omit,
+        token_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InstanceCreateResponse:
+        """
+        Create new instances.
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/ai-search/instances",
+            body=maybe_transform(
+                {
+                    "id": id,
+                    "source": source,
+                    "type": type,
+                    "ai_gateway_id": ai_gateway_id,
+                    "aisearch_model": aisearch_model,
+                    "chunk": chunk,
+                    "chunk_overlap": chunk_overlap,
+                    "chunk_size": chunk_size,
+                    "custom_metadata": custom_metadata,
+                    "embedding_model": embedding_model,
+                    "hybrid_search_enabled": hybrid_search_enabled,
+                    "max_num_results": max_num_results,
+                    "metadata": metadata,
+                    "public_endpoint_params": public_endpoint_params,
+                    "reranking": reranking,
+                    "reranking_model": reranking_model,
+                    "rewrite_model": rewrite_model,
+                    "rewrite_query": rewrite_query,
+                    "score_threshold": score_threshold,
+                    "source_params": source_params,
+                    "token_id": token_id,
+                },
+                instance_create_params.InstanceCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[InstanceCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InstanceCreateResponse], ResultWrapper[InstanceCreateResponse]),
+        )
+
+    def update(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        ai_gateway_id: str | Omit = omit,
+        aisearch_model: Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+        | Omit = omit,
+        cache: bool | Omit = omit,
+        cache_threshold: Literal["super_strict_match", "close_enough", "flexible_friend", "anything_goes"]
+        | Omit = omit,
+        chunk: bool | Omit = omit,
+        chunk_overlap: int | Omit = omit,
+        chunk_size: int | Omit = omit,
+        custom_metadata: Iterable[instance_update_params.CustomMetadata] | Omit = omit,
+        embedding_model: Literal[
+            "@cf/qwen/qwen3-embedding-0.6b",
+            "@cf/baai/bge-m3",
+            "@cf/baai/bge-large-en-v1.5",
+            "@cf/google/embeddinggemma-300m",
+            "google-ai-studio/gemini-embedding-001",
+            "openai/text-embedding-3-small",
+            "openai/text-embedding-3-large",
+            "",
+        ]
+        | Omit = omit,
+        hybrid_search_enabled: bool | Omit = omit,
+        max_num_results: int | Omit = omit,
+        metadata: instance_update_params.Metadata | Omit = omit,
+        paused: bool | Omit = omit,
+        public_endpoint_params: instance_update_params.PublicEndpointParams | Omit = omit,
+        reranking: bool | Omit = omit,
+        reranking_model: Literal["@cf/baai/bge-reranker-base", ""] | Omit = omit,
+        rewrite_model: Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+        | Omit = omit,
+        rewrite_query: bool | Omit = omit,
+        score_threshold: float | Omit = omit,
+        source_params: instance_update_params.SourceParams | Omit = omit,
+        summarization: bool | Omit = omit,
+        summarization_model: Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+        | Omit = omit,
+        system_prompt_aisearch: str | Omit = omit,
+        system_prompt_index_summarization: str | Omit = omit,
+        system_prompt_rewrite_query: str | Omit = omit,
+        token_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InstanceUpdateResponse:
+        """
+        Update instances.
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._put(
+            f"/accounts/{account_id}/ai-search/instances/{id}",
+            body=maybe_transform(
+                {
+                    "ai_gateway_id": ai_gateway_id,
+                    "aisearch_model": aisearch_model,
+                    "cache": cache,
+                    "cache_threshold": cache_threshold,
+                    "chunk": chunk,
+                    "chunk_overlap": chunk_overlap,
+                    "chunk_size": chunk_size,
+                    "custom_metadata": custom_metadata,
+                    "embedding_model": embedding_model,
+                    "hybrid_search_enabled": hybrid_search_enabled,
+                    "max_num_results": max_num_results,
+                    "metadata": metadata,
+                    "paused": paused,
+                    "public_endpoint_params": public_endpoint_params,
+                    "reranking": reranking,
+                    "reranking_model": reranking_model,
+                    "rewrite_model": rewrite_model,
+                    "rewrite_query": rewrite_query,
+                    "score_threshold": score_threshold,
+                    "source_params": source_params,
+                    "summarization": summarization,
+                    "summarization_model": summarization_model,
+                    "system_prompt_aisearch": system_prompt_aisearch,
+                    "system_prompt_index_summarization": system_prompt_index_summarization,
+                    "system_prompt_rewrite_query": system_prompt_rewrite_query,
+                    "token_id": token_id,
+                },
+                instance_update_params.InstanceUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[InstanceUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InstanceUpdateResponse], ResultWrapper[InstanceUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[InstanceListResponse]:
+        """
+        List instances.
+
+        Args:
+          search: Search by id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai-search/instances",
+            page=SyncV4PagePaginationArray[InstanceListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    instance_list_params.InstanceListParams,
+                ),
+            ),
+            model=InstanceListResponse,
+        )
+
+    def delete(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InstanceDeleteResponse:
+        """
+        Delete instances.
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/ai-search/instances/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[InstanceDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InstanceDeleteResponse], ResultWrapper[InstanceDeleteResponse]),
+        )
+
+    def chat_completions(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        messages: Iterable[instance_chat_completions_params.Message],
+        aisearch_options: instance_chat_completions_params.AISearchOptions | Omit = omit,
+        model: Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+        | Omit = omit,
+        stream: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InstanceChatCompletionsResponse:
+        """
+        Chat Completions
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._post(
+            f"/accounts/{account_id}/ai-search/instances/{id}/chat/completions",
+            body=maybe_transform(
+                {
+                    "messages": messages,
+                    "aisearch_options": aisearch_options,
+                    "model": model,
+                    "stream": stream,
+                },
+                instance_chat_completions_params.InstanceChatCompletionsParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=InstanceChatCompletionsResponse,
+        )
+
+    def read(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InstanceReadResponse:
+        """
+        Read instances.
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai-search/instances/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[InstanceReadResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InstanceReadResponse], ResultWrapper[InstanceReadResponse]),
+        )
+
+    def search(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        messages: Iterable[instance_search_params.Message],
+        aisearch_options: instance_search_params.AISearchOptions | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InstanceSearchResponse:
+        """
+        Search
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._post(
+            f"/accounts/{account_id}/ai-search/instances/{id}/search",
+            body=maybe_transform(
+                {
+                    "messages": messages,
+                    "aisearch_options": aisearch_options,
+                },
+                instance_search_params.InstanceSearchParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[InstanceSearchResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InstanceSearchResponse], ResultWrapper[InstanceSearchResponse]),
+        )
+
+    def stats(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InstanceStatsResponse:
+        """
+        Stats
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai-search/instances/{id}/stats",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[InstanceStatsResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InstanceStatsResponse], ResultWrapper[InstanceStatsResponse]),
+        )
+
+
+class AsyncInstancesResource(AsyncAPIResource):
+    @cached_property
+    def items(self) -> AsyncItemsResource:
+        return AsyncItemsResource(self._client)
+
+    @cached_property
+    def jobs(self) -> AsyncJobsResource:
+        return AsyncJobsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncInstancesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncInstancesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncInstancesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncInstancesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        id: str,
+        source: str,
+        type: Literal["r2", "web-crawler"],
+        ai_gateway_id: str | Omit = omit,
+        aisearch_model: Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+        | Omit = omit,
+        chunk: bool | Omit = omit,
+        chunk_overlap: int | Omit = omit,
+        chunk_size: int | Omit = omit,
+        custom_metadata: Iterable[instance_create_params.CustomMetadata] | Omit = omit,
+        embedding_model: Literal[
+            "@cf/qwen/qwen3-embedding-0.6b",
+            "@cf/baai/bge-m3",
+            "@cf/baai/bge-large-en-v1.5",
+            "@cf/google/embeddinggemma-300m",
+            "google-ai-studio/gemini-embedding-001",
+            "openai/text-embedding-3-small",
+            "openai/text-embedding-3-large",
+            "",
+        ]
+        | Omit = omit,
+        hybrid_search_enabled: bool | Omit = omit,
+        max_num_results: int | Omit = omit,
+        metadata: instance_create_params.Metadata | Omit = omit,
+        public_endpoint_params: instance_create_params.PublicEndpointParams | Omit = omit,
+        reranking: bool | Omit = omit,
+        reranking_model: Literal["@cf/baai/bge-reranker-base", ""] | Omit = omit,
+        rewrite_model: Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+        | Omit = omit,
+        rewrite_query: bool | Omit = omit,
+        score_threshold: float | Omit = omit,
+        source_params: instance_create_params.SourceParams | Omit = omit,
+        token_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InstanceCreateResponse:
+        """
+        Create new instances.
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/ai-search/instances",
+            body=await async_maybe_transform(
+                {
+                    "id": id,
+                    "source": source,
+                    "type": type,
+                    "ai_gateway_id": ai_gateway_id,
+                    "aisearch_model": aisearch_model,
+                    "chunk": chunk,
+                    "chunk_overlap": chunk_overlap,
+                    "chunk_size": chunk_size,
+                    "custom_metadata": custom_metadata,
+                    "embedding_model": embedding_model,
+                    "hybrid_search_enabled": hybrid_search_enabled,
+                    "max_num_results": max_num_results,
+                    "metadata": metadata,
+                    "public_endpoint_params": public_endpoint_params,
+                    "reranking": reranking,
+                    "reranking_model": reranking_model,
+                    "rewrite_model": rewrite_model,
+                    "rewrite_query": rewrite_query,
+                    "score_threshold": score_threshold,
+                    "source_params": source_params,
+                    "token_id": token_id,
+                },
+                instance_create_params.InstanceCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[InstanceCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InstanceCreateResponse], ResultWrapper[InstanceCreateResponse]),
+        )
+
+    async def update(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        ai_gateway_id: str | Omit = omit,
+        aisearch_model: Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+        | Omit = omit,
+        cache: bool | Omit = omit,
+        cache_threshold: Literal["super_strict_match", "close_enough", "flexible_friend", "anything_goes"]
+        | Omit = omit,
+        chunk: bool | Omit = omit,
+        chunk_overlap: int | Omit = omit,
+        chunk_size: int | Omit = omit,
+        custom_metadata: Iterable[instance_update_params.CustomMetadata] | Omit = omit,
+        embedding_model: Literal[
+            "@cf/qwen/qwen3-embedding-0.6b",
+            "@cf/baai/bge-m3",
+            "@cf/baai/bge-large-en-v1.5",
+            "@cf/google/embeddinggemma-300m",
+            "google-ai-studio/gemini-embedding-001",
+            "openai/text-embedding-3-small",
+            "openai/text-embedding-3-large",
+            "",
+        ]
+        | Omit = omit,
+        hybrid_search_enabled: bool | Omit = omit,
+        max_num_results: int | Omit = omit,
+        metadata: instance_update_params.Metadata | Omit = omit,
+        paused: bool | Omit = omit,
+        public_endpoint_params: instance_update_params.PublicEndpointParams | Omit = omit,
+        reranking: bool | Omit = omit,
+        reranking_model: Literal["@cf/baai/bge-reranker-base", ""] | Omit = omit,
+        rewrite_model: Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+        | Omit = omit,
+        rewrite_query: bool | Omit = omit,
+        score_threshold: float | Omit = omit,
+        source_params: instance_update_params.SourceParams | Omit = omit,
+        summarization: bool | Omit = omit,
+        summarization_model: Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+        | Omit = omit,
+        system_prompt_aisearch: str | Omit = omit,
+        system_prompt_index_summarization: str | Omit = omit,
+        system_prompt_rewrite_query: str | Omit = omit,
+        token_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InstanceUpdateResponse:
+        """
+        Update instances.
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/ai-search/instances/{id}",
+            body=await async_maybe_transform(
+                {
+                    "ai_gateway_id": ai_gateway_id,
+                    "aisearch_model": aisearch_model,
+                    "cache": cache,
+                    "cache_threshold": cache_threshold,
+                    "chunk": chunk,
+                    "chunk_overlap": chunk_overlap,
+                    "chunk_size": chunk_size,
+                    "custom_metadata": custom_metadata,
+                    "embedding_model": embedding_model,
+                    "hybrid_search_enabled": hybrid_search_enabled,
+                    "max_num_results": max_num_results,
+                    "metadata": metadata,
+                    "paused": paused,
+                    "public_endpoint_params": public_endpoint_params,
+                    "reranking": reranking,
+                    "reranking_model": reranking_model,
+                    "rewrite_model": rewrite_model,
+                    "rewrite_query": rewrite_query,
+                    "score_threshold": score_threshold,
+                    "source_params": source_params,
+                    "summarization": summarization,
+                    "summarization_model": summarization_model,
+                    "system_prompt_aisearch": system_prompt_aisearch,
+                    "system_prompt_index_summarization": system_prompt_index_summarization,
+                    "system_prompt_rewrite_query": system_prompt_rewrite_query,
+                    "token_id": token_id,
+                },
+                instance_update_params.InstanceUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[InstanceUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InstanceUpdateResponse], ResultWrapper[InstanceUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[InstanceListResponse, AsyncV4PagePaginationArray[InstanceListResponse]]:
+        """
+        List instances.
+
+        Args:
+          search: Search by id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai-search/instances",
+            page=AsyncV4PagePaginationArray[InstanceListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    instance_list_params.InstanceListParams,
+                ),
+            ),
+            model=InstanceListResponse,
+        )
+
+    async def delete(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InstanceDeleteResponse:
+        """
+        Delete instances.
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/ai-search/instances/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[InstanceDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InstanceDeleteResponse], ResultWrapper[InstanceDeleteResponse]),
+        )
+
+    async def chat_completions(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        messages: Iterable[instance_chat_completions_params.Message],
+        aisearch_options: instance_chat_completions_params.AISearchOptions | Omit = omit,
+        model: Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+        | Omit = omit,
+        stream: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InstanceChatCompletionsResponse:
+        """
+        Chat Completions
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/ai-search/instances/{id}/chat/completions",
+            body=await async_maybe_transform(
+                {
+                    "messages": messages,
+                    "aisearch_options": aisearch_options,
+                    "model": model,
+                    "stream": stream,
+                },
+                instance_chat_completions_params.InstanceChatCompletionsParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=InstanceChatCompletionsResponse,
+        )
+
+    async def read(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InstanceReadResponse:
+        """
+        Read instances.
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai-search/instances/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[InstanceReadResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InstanceReadResponse], ResultWrapper[InstanceReadResponse]),
+        )
+
+    async def search(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        messages: Iterable[instance_search_params.Message],
+        aisearch_options: instance_search_params.AISearchOptions | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InstanceSearchResponse:
+        """
+        Search
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/ai-search/instances/{id}/search",
+            body=await async_maybe_transform(
+                {
+                    "messages": messages,
+                    "aisearch_options": aisearch_options,
+                },
+                instance_search_params.InstanceSearchParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[InstanceSearchResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InstanceSearchResponse], ResultWrapper[InstanceSearchResponse]),
+        )
+
+    async def stats(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InstanceStatsResponse:
+        """
+        Stats
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai-search/instances/{id}/stats",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[InstanceStatsResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InstanceStatsResponse], ResultWrapper[InstanceStatsResponse]),
+        )
+
+
+class InstancesResourceWithRawResponse:
+    def __init__(self, instances: InstancesResource) -> None:
+        self._instances = instances
+
+        self.create = to_raw_response_wrapper(
+            instances.create,
+        )
+        self.update = to_raw_response_wrapper(
+            instances.update,
+        )
+        self.list = to_raw_response_wrapper(
+            instances.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            instances.delete,
+        )
+        self.chat_completions = to_raw_response_wrapper(
+            instances.chat_completions,
+        )
+        self.read = to_raw_response_wrapper(
+            instances.read,
+        )
+        self.search = to_raw_response_wrapper(
+            instances.search,
+        )
+        self.stats = to_raw_response_wrapper(
+            instances.stats,
+        )
+
+    @cached_property
+    def items(self) -> ItemsResourceWithRawResponse:
+        return ItemsResourceWithRawResponse(self._instances.items)
+
+    @cached_property
+    def jobs(self) -> JobsResourceWithRawResponse:
+        return JobsResourceWithRawResponse(self._instances.jobs)
+
+
+class AsyncInstancesResourceWithRawResponse:
+    def __init__(self, instances: AsyncInstancesResource) -> None:
+        self._instances = instances
+
+        self.create = async_to_raw_response_wrapper(
+            instances.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            instances.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            instances.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            instances.delete,
+        )
+        self.chat_completions = async_to_raw_response_wrapper(
+            instances.chat_completions,
+        )
+        self.read = async_to_raw_response_wrapper(
+            instances.read,
+        )
+        self.search = async_to_raw_response_wrapper(
+            instances.search,
+        )
+        self.stats = async_to_raw_response_wrapper(
+            instances.stats,
+        )
+
+    @cached_property
+    def items(self) -> AsyncItemsResourceWithRawResponse:
+        return AsyncItemsResourceWithRawResponse(self._instances.items)
+
+    @cached_property
+    def jobs(self) -> AsyncJobsResourceWithRawResponse:
+        return AsyncJobsResourceWithRawResponse(self._instances.jobs)
+
+
+class InstancesResourceWithStreamingResponse:
+    def __init__(self, instances: InstancesResource) -> None:
+        self._instances = instances
+
+        self.create = to_streamed_response_wrapper(
+            instances.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            instances.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            instances.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            instances.delete,
+        )
+        self.chat_completions = to_streamed_response_wrapper(
+            instances.chat_completions,
+        )
+        self.read = to_streamed_response_wrapper(
+            instances.read,
+        )
+        self.search = to_streamed_response_wrapper(
+            instances.search,
+        )
+        self.stats = to_streamed_response_wrapper(
+            instances.stats,
+        )
+
+    @cached_property
+    def items(self) -> ItemsResourceWithStreamingResponse:
+        return ItemsResourceWithStreamingResponse(self._instances.items)
+
+    @cached_property
+    def jobs(self) -> JobsResourceWithStreamingResponse:
+        return JobsResourceWithStreamingResponse(self._instances.jobs)
+
+
+class AsyncInstancesResourceWithStreamingResponse:
+    def __init__(self, instances: AsyncInstancesResource) -> None:
+        self._instances = instances
+
+        self.create = async_to_streamed_response_wrapper(
+            instances.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            instances.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            instances.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            instances.delete,
+        )
+        self.chat_completions = async_to_streamed_response_wrapper(
+            instances.chat_completions,
+        )
+        self.read = async_to_streamed_response_wrapper(
+            instances.read,
+        )
+        self.search = async_to_streamed_response_wrapper(
+            instances.search,
+        )
+        self.stats = async_to_streamed_response_wrapper(
+            instances.stats,
+        )
+
+    @cached_property
+    def items(self) -> AsyncItemsResourceWithStreamingResponse:
+        return AsyncItemsResourceWithStreamingResponse(self._instances.items)
+
+    @cached_property
+    def jobs(self) -> AsyncJobsResourceWithStreamingResponse:
+        return AsyncJobsResourceWithStreamingResponse(self._instances.jobs)
diff --git a/src/cloudflare/resources/aisearch/instances/items.py b/src/cloudflare/resources/aisearch/instances/items.py
new file mode 100644
index 00000000000..7ed961721d2
--- /dev/null
+++ b/src/cloudflare/resources/aisearch/instances/items.py
@@ -0,0 +1,317 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.aisearch.instances import item_list_params
+from ....types.aisearch.instances.item_get_response import ItemGetResponse
+from ....types.aisearch.instances.item_list_response import ItemListResponse
+
+__all__ = ["ItemsResource", "AsyncItemsResource"]
+
+
+class ItemsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ItemsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ItemsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ItemsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ItemsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        status: Literal["queued", "running", "completed", "error", "skipped"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[ItemListResponse]:
+        """
+        Items List.
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai-search/instances/{id}/items",
+            page=SyncV4PagePaginationArray[ItemListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                        "status": status,
+                    },
+                    item_list_params.ItemListParams,
+                ),
+            ),
+            model=ItemListResponse,
+        )
+
+    def get(
+        self,
+        item_id: str,
+        *,
+        account_id: str,
+        id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ItemGetResponse:
+        """
+        Get Item.
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not item_id:
+            raise ValueError(f"Expected a non-empty value for `item_id` but received {item_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai-search/instances/{id}/items/{item_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ItemGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ItemGetResponse], ResultWrapper[ItemGetResponse]),
+        )
+
+
+class AsyncItemsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncItemsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncItemsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncItemsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncItemsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        status: Literal["queued", "running", "completed", "error", "skipped"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ItemListResponse, AsyncV4PagePaginationArray[ItemListResponse]]:
+        """
+        Items List.
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai-search/instances/{id}/items",
+            page=AsyncV4PagePaginationArray[ItemListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                        "status": status,
+                    },
+                    item_list_params.ItemListParams,
+                ),
+            ),
+            model=ItemListResponse,
+        )
+
+    async def get(
+        self,
+        item_id: str,
+        *,
+        account_id: str,
+        id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ItemGetResponse:
+        """
+        Get Item.
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not item_id:
+            raise ValueError(f"Expected a non-empty value for `item_id` but received {item_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai-search/instances/{id}/items/{item_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ItemGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ItemGetResponse], ResultWrapper[ItemGetResponse]),
+        )
+
+
+class ItemsResourceWithRawResponse:
+    def __init__(self, items: ItemsResource) -> None:
+        self._items = items
+
+        self.list = to_raw_response_wrapper(
+            items.list,
+        )
+        self.get = to_raw_response_wrapper(
+            items.get,
+        )
+
+
+class AsyncItemsResourceWithRawResponse:
+    def __init__(self, items: AsyncItemsResource) -> None:
+        self._items = items
+
+        self.list = async_to_raw_response_wrapper(
+            items.list,
+        )
+        self.get = async_to_raw_response_wrapper(
+            items.get,
+        )
+
+
+class ItemsResourceWithStreamingResponse:
+    def __init__(self, items: ItemsResource) -> None:
+        self._items = items
+
+        self.list = to_streamed_response_wrapper(
+            items.list,
+        )
+        self.get = to_streamed_response_wrapper(
+            items.get,
+        )
+
+
+class AsyncItemsResourceWithStreamingResponse:
+    def __init__(self, items: AsyncItemsResource) -> None:
+        self._items = items
+
+        self.list = async_to_streamed_response_wrapper(
+            items.list,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            items.get,
+        )
diff --git a/src/cloudflare/resources/aisearch/instances/jobs.py b/src/cloudflare/resources/aisearch/instances/jobs.py
new file mode 100644
index 00000000000..2c6bb4226f5
--- /dev/null
+++ b/src/cloudflare/resources/aisearch/instances/jobs.py
@@ -0,0 +1,526 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.aisearch.instances import job_list_params, job_logs_params
+from ....types.aisearch.instances.job_get_response import JobGetResponse
+from ....types.aisearch.instances.job_list_response import JobListResponse
+from ....types.aisearch.instances.job_logs_response import JobLogsResponse
+from ....types.aisearch.instances.job_create_response import JobCreateResponse
+
+__all__ = ["JobsResource", "AsyncJobsResource"]
+
+
+class JobsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> JobsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return JobsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> JobsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return JobsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> JobCreateResponse:
+        """
+        Create new job
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._post(
+            f"/accounts/{account_id}/ai-search/instances/{id}/jobs",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[JobCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[JobCreateResponse], ResultWrapper[JobCreateResponse]),
+        )
+
+    def list(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[JobListResponse]:
+        """
+        List Jobs
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai-search/instances/{id}/jobs",
+            page=SyncV4PagePaginationArray[JobListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    job_list_params.JobListParams,
+                ),
+            ),
+            model=JobListResponse,
+        )
+
+    def get(
+        self,
+        job_id: str,
+        *,
+        account_id: str,
+        id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> JobGetResponse:
+        """
+        Get a Job Details
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not job_id:
+            raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai-search/instances/{id}/jobs/{job_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[JobGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[JobGetResponse], ResultWrapper[JobGetResponse]),
+        )
+
+    def logs(
+        self,
+        job_id: str,
+        *,
+        account_id: str,
+        id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> JobLogsResponse:
+        """
+        List Job Logs
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not job_id:
+            raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai-search/instances/{id}/jobs/{job_id}/logs",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    job_logs_params.JobLogsParams,
+                ),
+                post_parser=ResultWrapper[JobLogsResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[JobLogsResponse], ResultWrapper[JobLogsResponse]),
+        )
+
+
+class AsyncJobsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncJobsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncJobsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncJobsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncJobsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> JobCreateResponse:
+        """
+        Create new job
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/ai-search/instances/{id}/jobs",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[JobCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[JobCreateResponse], ResultWrapper[JobCreateResponse]),
+        )
+
+    def list(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[JobListResponse, AsyncV4PagePaginationArray[JobListResponse]]:
+        """
+        List Jobs
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai-search/instances/{id}/jobs",
+            page=AsyncV4PagePaginationArray[JobListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    job_list_params.JobListParams,
+                ),
+            ),
+            model=JobListResponse,
+        )
+
+    async def get(
+        self,
+        job_id: str,
+        *,
+        account_id: str,
+        id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> JobGetResponse:
+        """
+        Get a Job Details
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not job_id:
+            raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai-search/instances/{id}/jobs/{job_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[JobGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[JobGetResponse], ResultWrapper[JobGetResponse]),
+        )
+
+    async def logs(
+        self,
+        job_id: str,
+        *,
+        account_id: str,
+        id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> JobLogsResponse:
+        """
+        List Job Logs
+
+        Args:
+          id: Use your AI Search ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not job_id:
+            raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai-search/instances/{id}/jobs/{job_id}/logs",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    job_logs_params.JobLogsParams,
+                ),
+                post_parser=ResultWrapper[JobLogsResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[JobLogsResponse], ResultWrapper[JobLogsResponse]),
+        )
+
+
+class JobsResourceWithRawResponse:
+    def __init__(self, jobs: JobsResource) -> None:
+        self._jobs = jobs
+
+        self.create = to_raw_response_wrapper(
+            jobs.create,
+        )
+        self.list = to_raw_response_wrapper(
+            jobs.list,
+        )
+        self.get = to_raw_response_wrapper(
+            jobs.get,
+        )
+        self.logs = to_raw_response_wrapper(
+            jobs.logs,
+        )
+
+
+class AsyncJobsResourceWithRawResponse:
+    def __init__(self, jobs: AsyncJobsResource) -> None:
+        self._jobs = jobs
+
+        self.create = async_to_raw_response_wrapper(
+            jobs.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            jobs.list,
+        )
+        self.get = async_to_raw_response_wrapper(
+            jobs.get,
+        )
+        self.logs = async_to_raw_response_wrapper(
+            jobs.logs,
+        )
+
+
+class JobsResourceWithStreamingResponse:
+    def __init__(self, jobs: JobsResource) -> None:
+        self._jobs = jobs
+
+        self.create = to_streamed_response_wrapper(
+            jobs.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            jobs.list,
+        )
+        self.get = to_streamed_response_wrapper(
+            jobs.get,
+        )
+        self.logs = to_streamed_response_wrapper(
+            jobs.logs,
+        )
+
+
+class AsyncJobsResourceWithStreamingResponse:
+    def __init__(self, jobs: AsyncJobsResource) -> None:
+        self._jobs = jobs
+
+        self.create = async_to_streamed_response_wrapper(
+            jobs.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            jobs.list,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            jobs.get,
+        )
+        self.logs = async_to_streamed_response_wrapper(
+            jobs.logs,
+        )
diff --git a/src/cloudflare/resources/aisearch/tokens.py b/src/cloudflare/resources/aisearch/tokens.py
new file mode 100644
index 00000000000..1834a9b0c6a
--- /dev/null
+++ b/src/cloudflare/resources/aisearch/tokens.py
@@ -0,0 +1,605 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.aisearch import token_list_params, token_create_params, token_update_params
+from ...types.aisearch.token_list_response import TokenListResponse
+from ...types.aisearch.token_read_response import TokenReadResponse
+from ...types.aisearch.token_create_response import TokenCreateResponse
+from ...types.aisearch.token_delete_response import TokenDeleteResponse
+from ...types.aisearch.token_update_response import TokenUpdateResponse
+
+__all__ = ["TokensResource", "AsyncTokensResource"]
+
+
+class TokensResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> TokensResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TokensResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TokensResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TokensResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        cf_api_id: str,
+        cf_api_key: str,
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TokenCreateResponse:
+        """
+        Create new tokens.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/ai-search/tokens",
+            body=maybe_transform(
+                {
+                    "cf_api_id": cf_api_id,
+                    "cf_api_key": cf_api_key,
+                    "name": name,
+                },
+                token_create_params.TokenCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TokenCreateResponse], ResultWrapper[TokenCreateResponse]),
+        )
+
+    def update(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        cf_api_id: str,
+        cf_api_key: str,
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TokenUpdateResponse:
+        """
+        Update tokens.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._put(
+            f"/accounts/{account_id}/ai-search/tokens/{id}",
+            body=maybe_transform(
+                {
+                    "cf_api_id": cf_api_id,
+                    "cf_api_key": cf_api_key,
+                    "name": name,
+                },
+                token_update_params.TokenUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TokenUpdateResponse], ResultWrapper[TokenUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[TokenListResponse]:
+        """
+        List tokens.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai-search/tokens",
+            page=SyncV4PagePaginationArray[TokenListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    token_list_params.TokenListParams,
+                ),
+            ),
+            model=TokenListResponse,
+        )
+
+    def delete(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TokenDeleteResponse:
+        """
+        Delete tokens.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/ai-search/tokens/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TokenDeleteResponse], ResultWrapper[TokenDeleteResponse]),
+        )
+
+    def read(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TokenReadResponse:
+        """
+        Read tokens.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._get(
+            f"/accounts/{account_id}/ai-search/tokens/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenReadResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TokenReadResponse], ResultWrapper[TokenReadResponse]),
+        )
+
+
+class AsyncTokensResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncTokensResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTokensResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTokensResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTokensResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        cf_api_id: str,
+        cf_api_key: str,
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TokenCreateResponse:
+        """
+        Create new tokens.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/ai-search/tokens",
+            body=await async_maybe_transform(
+                {
+                    "cf_api_id": cf_api_id,
+                    "cf_api_key": cf_api_key,
+                    "name": name,
+                },
+                token_create_params.TokenCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TokenCreateResponse], ResultWrapper[TokenCreateResponse]),
+        )
+
+    async def update(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        cf_api_id: str,
+        cf_api_key: str,
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TokenUpdateResponse:
+        """
+        Update tokens.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/ai-search/tokens/{id}",
+            body=await async_maybe_transform(
+                {
+                    "cf_api_id": cf_api_id,
+                    "cf_api_key": cf_api_key,
+                    "name": name,
+                },
+                token_update_params.TokenUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TokenUpdateResponse], ResultWrapper[TokenUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[TokenListResponse, AsyncV4PagePaginationArray[TokenListResponse]]:
+        """
+        List tokens.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/ai-search/tokens",
+            page=AsyncV4PagePaginationArray[TokenListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    token_list_params.TokenListParams,
+                ),
+            ),
+            model=TokenListResponse,
+        )
+
+    async def delete(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TokenDeleteResponse:
+        """
+        Delete tokens.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/ai-search/tokens/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TokenDeleteResponse], ResultWrapper[TokenDeleteResponse]),
+        )
+
+    async def read(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TokenReadResponse:
+        """
+        Read tokens.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/ai-search/tokens/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenReadResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TokenReadResponse], ResultWrapper[TokenReadResponse]),
+        )
+
+
+class TokensResourceWithRawResponse:
+    def __init__(self, tokens: TokensResource) -> None:
+        self._tokens = tokens
+
+        self.create = to_raw_response_wrapper(
+            tokens.create,
+        )
+        self.update = to_raw_response_wrapper(
+            tokens.update,
+        )
+        self.list = to_raw_response_wrapper(
+            tokens.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            tokens.delete,
+        )
+        self.read = to_raw_response_wrapper(
+            tokens.read,
+        )
+
+
+class AsyncTokensResourceWithRawResponse:
+    def __init__(self, tokens: AsyncTokensResource) -> None:
+        self._tokens = tokens
+
+        self.create = async_to_raw_response_wrapper(
+            tokens.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            tokens.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            tokens.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            tokens.delete,
+        )
+        self.read = async_to_raw_response_wrapper(
+            tokens.read,
+        )
+
+
+class TokensResourceWithStreamingResponse:
+    def __init__(self, tokens: TokensResource) -> None:
+        self._tokens = tokens
+
+        self.create = to_streamed_response_wrapper(
+            tokens.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            tokens.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            tokens.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            tokens.delete,
+        )
+        self.read = to_streamed_response_wrapper(
+            tokens.read,
+        )
+
+
+class AsyncTokensResourceWithStreamingResponse:
+    def __init__(self, tokens: AsyncTokensResource) -> None:
+        self._tokens = tokens
+
+        self.create = async_to_streamed_response_wrapper(
+            tokens.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            tokens.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            tokens.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            tokens.delete,
+        )
+        self.read = async_to_streamed_response_wrapper(
+            tokens.read,
+        )
diff --git a/src/cloudflare/resources/alerting/__init__.py b/src/cloudflare/resources/alerting/__init__.py
index 2bf1c17a8f3..28d682d357e 100644
--- a/src/cloudflare/resources/alerting/__init__.py
+++ b/src/cloudflare/resources/alerting/__init__.py
@@ -24,6 +24,14 @@
     PoliciesResourceWithStreamingResponse,
     AsyncPoliciesResourceWithStreamingResponse,
 )
+from .silences import (
+    SilencesResource,
+    AsyncSilencesResource,
+    SilencesResourceWithRawResponse,
+    AsyncSilencesResourceWithRawResponse,
+    SilencesResourceWithStreamingResponse,
+    AsyncSilencesResourceWithStreamingResponse,
+)
 from .destinations import (
     DestinationsResource,
     AsyncDestinationsResource,
@@ -66,6 +74,12 @@
     "AsyncPoliciesResourceWithRawResponse",
     "PoliciesResourceWithStreamingResponse",
     "AsyncPoliciesResourceWithStreamingResponse",
+    "SilencesResource",
+    "AsyncSilencesResource",
+    "SilencesResourceWithRawResponse",
+    "AsyncSilencesResourceWithRawResponse",
+    "SilencesResourceWithStreamingResponse",
+    "AsyncSilencesResourceWithStreamingResponse",
     "AlertingResource",
     "AsyncAlertingResource",
     "AlertingResourceWithRawResponse",
diff --git a/src/cloudflare/resources/alerting/alerting.py b/src/cloudflare/resources/alerting/alerting.py
index 05d80699a14..861ef11fc49 100644
--- a/src/cloudflare/resources/alerting/alerting.py
+++ b/src/cloudflare/resources/alerting/alerting.py
@@ -18,16 +18,16 @@
     PoliciesResourceWithStreamingResponse,
     AsyncPoliciesResourceWithStreamingResponse,
 )
+from .silences import (
+    SilencesResource,
+    AsyncSilencesResource,
+    SilencesResourceWithRawResponse,
+    AsyncSilencesResourceWithRawResponse,
+    SilencesResourceWithStreamingResponse,
+    AsyncSilencesResourceWithStreamingResponse,
+)
 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 +36,14 @@
     AvailableAlertsResourceWithStreamingResponse,
     AsyncAvailableAlertsResourceWithStreamingResponse,
 )
-from .destinations.destinations import DestinationsResource, AsyncDestinationsResource
+from .destinations.destinations import (
+    DestinationsResource,
+    AsyncDestinationsResource,
+    DestinationsResourceWithRawResponse,
+    AsyncDestinationsResourceWithRawResponse,
+    DestinationsResourceWithStreamingResponse,
+    AsyncDestinationsResourceWithStreamingResponse,
+)
 
 __all__ = ["AlertingResource", "AsyncAlertingResource"]
 
@@ -58,12 +65,27 @@ def history(self) -> HistoryResource:
     def policies(self) -> PoliciesResource:
         return PoliciesResource(self._client)
 
+    @cached_property
+    def silences(self) -> SilencesResource:
+        return SilencesResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AlertingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AlertingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AlertingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AlertingResourceWithStreamingResponse(self)
 
 
@@ -84,12 +106,27 @@ def history(self) -> AsyncHistoryResource:
     def policies(self) -> AsyncPoliciesResource:
         return AsyncPoliciesResource(self._client)
 
+    @cached_property
+    def silences(self) -> AsyncSilencesResource:
+        return AsyncSilencesResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncAlertingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAlertingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAlertingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAlertingResourceWithStreamingResponse(self)
 
 
@@ -113,6 +150,10 @@ def history(self) -> HistoryResourceWithRawResponse:
     def policies(self) -> PoliciesResourceWithRawResponse:
         return PoliciesResourceWithRawResponse(self._alerting.policies)
 
+    @cached_property
+    def silences(self) -> SilencesResourceWithRawResponse:
+        return SilencesResourceWithRawResponse(self._alerting.silences)
+
 
 class AsyncAlertingResourceWithRawResponse:
     def __init__(self, alerting: AsyncAlertingResource) -> None:
@@ -134,6 +175,10 @@ def history(self) -> AsyncHistoryResourceWithRawResponse:
     def policies(self) -> AsyncPoliciesResourceWithRawResponse:
         return AsyncPoliciesResourceWithRawResponse(self._alerting.policies)
 
+    @cached_property
+    def silences(self) -> AsyncSilencesResourceWithRawResponse:
+        return AsyncSilencesResourceWithRawResponse(self._alerting.silences)
+
 
 class AlertingResourceWithStreamingResponse:
     def __init__(self, alerting: AlertingResource) -> None:
@@ -155,6 +200,10 @@ def history(self) -> HistoryResourceWithStreamingResponse:
     def policies(self) -> PoliciesResourceWithStreamingResponse:
         return PoliciesResourceWithStreamingResponse(self._alerting.policies)
 
+    @cached_property
+    def silences(self) -> SilencesResourceWithStreamingResponse:
+        return SilencesResourceWithStreamingResponse(self._alerting.silences)
+
 
 class AsyncAlertingResourceWithStreamingResponse:
     def __init__(self, alerting: AsyncAlertingResource) -> None:
@@ -175,3 +224,7 @@ def history(self) -> AsyncHistoryResourceWithStreamingResponse:
     @cached_property
     def policies(self) -> AsyncPoliciesResourceWithStreamingResponse:
         return AsyncPoliciesResourceWithStreamingResponse(self._alerting.policies)
+
+    @cached_property
+    def silences(self) -> AsyncSilencesResourceWithStreamingResponse:
+        return AsyncSilencesResourceWithStreamingResponse(self._alerting.silences)
diff --git a/src/cloudflare/resources/alerting/available_alerts.py b/src/cloudflare/resources/alerting/available_alerts.py
index 8ededcc6759..1286d27f1e6 100644
--- a/src/cloudflare/resources/alerting/available_alerts.py
+++ b/src/cloudflare/resources/alerting/available_alerts.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Query, Headers, NotGiven, not_given
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -25,10 +25,21 @@
 class AvailableAlertsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AvailableAlertsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AvailableAlertsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AvailableAlertsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AvailableAlertsResourceWithStreamingResponse(self)
 
     def list(
@@ -40,7 +51,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AvailableAlertListResponse]:
         """
         Gets a list of all alert types for which an account is eligible.
@@ -74,10 +85,21 @@ def list(
 class AsyncAvailableAlertsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncAvailableAlertsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAvailableAlertsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAvailableAlertsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAvailableAlertsResourceWithStreamingResponse(self)
 
     async def list(
@@ -89,7 +111,7 @@ async def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AvailableAlertListResponse]:
         """
         Gets a list of all alert types for which an account is eligible.
diff --git a/src/cloudflare/resources/alerting/destinations/destinations.py b/src/cloudflare/resources/alerting/destinations/destinations.py
index d5e0b713d3d..8e074ffa262 100644
--- a/src/cloudflare/resources/alerting/destinations/destinations.py
+++ b/src/cloudflare/resources/alerting/destinations/destinations.py
@@ -47,10 +47,21 @@ def webhooks(self) -> WebhooksResource:
 
     @cached_property
     def with_raw_response(self) -> DestinationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DestinationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DestinationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DestinationsResourceWithStreamingResponse(self)
 
 
@@ -69,10 +80,21 @@ def webhooks(self) -> AsyncWebhooksResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncDestinationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDestinationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDestinationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDestinationsResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/alerting/destinations/eligible.py b/src/cloudflare/resources/alerting/destinations/eligible.py
index 9f330cc89c6..76a61c05f51 100644
--- a/src/cloudflare/resources/alerting/destinations/eligible.py
+++ b/src/cloudflare/resources/alerting/destinations/eligible.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -25,10 +25,21 @@
 class EligibleResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> EligibleResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return EligibleResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> EligibleResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return EligibleResourceWithStreamingResponse(self)
 
     def get(
@@ -40,7 +51,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[EligibleGetResponse]:
         """
         Get a list of all delivery mechanism types for which an account is eligible.
@@ -74,10 +85,21 @@ def get(
 class AsyncEligibleResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncEligibleResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncEligibleResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncEligibleResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncEligibleResourceWithStreamingResponse(self)
 
     async def get(
@@ -89,7 +111,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[EligibleGetResponse]:
         """
         Get a list of all delivery mechanism types for which an account is eligible.
diff --git a/src/cloudflare/resources/alerting/destinations/pagerduty.py b/src/cloudflare/resources/alerting/destinations/pagerduty.py
index b6e4f112a41..223dfead7a8 100644
--- a/src/cloudflare/resources/alerting/destinations/pagerduty.py
+++ b/src/cloudflare/resources/alerting/destinations/pagerduty.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -16,8 +16,9 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
-from ....types.alerting.destinations.pagerduty_get_response import PagerdutyGetResponse
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.alerting.destinations.pagerduty import Pagerduty
 from ....types.alerting.destinations.pagerduty_link_response import PagerdutyLinkResponse
 from ....types.alerting.destinations.pagerduty_create_response import PagerdutyCreateResponse
 from ....types.alerting.destinations.pagerduty_delete_response import PagerdutyDeleteResponse
@@ -28,10 +29,21 @@
 class PagerdutyResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PagerdutyResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PagerdutyResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PagerdutyResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PagerdutyResourceWithStreamingResponse(self)
 
     def create(
@@ -43,7 +55,7 @@ def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PagerdutyCreateResponse]:
         """
         Creates a new token for integrating with PagerDuty.
@@ -82,7 +94,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PagerdutyDeleteResponse:
         """
         Deletes all the PagerDuty Services connected to the account.
@@ -117,8 +129,8 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[PagerdutyGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[Pagerduty]:
         """
         Get a list of all configured PagerDuty services.
 
@@ -135,16 +147,13 @@ def get(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/alerting/v3/destinations/pagerduty",
+            page=SyncSinglePage[Pagerduty],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[PagerdutyGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[PagerdutyGetResponse]], ResultWrapper[PagerdutyGetResponse]),
+            model=Pagerduty,
         )
 
     def link(
@@ -157,7 +166,7 @@ def link(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PagerdutyLinkResponse]:
         """
         Links PagerDuty with the account using the integration token.
@@ -195,10 +204,21 @@ def link(
 class AsyncPagerdutyResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPagerdutyResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPagerdutyResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPagerdutyResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPagerdutyResourceWithStreamingResponse(self)
 
     async def create(
@@ -210,7 +230,7 @@ async def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PagerdutyCreateResponse]:
         """
         Creates a new token for integrating with PagerDuty.
@@ -249,7 +269,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PagerdutyDeleteResponse:
         """
         Deletes all the PagerDuty Services connected to the account.
@@ -275,7 +295,7 @@ async def delete(
             cast_to=PagerdutyDeleteResponse,
         )
 
-    async def get(
+    def get(
         self,
         *,
         account_id: str,
@@ -284,8 +304,8 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[PagerdutyGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Pagerduty, AsyncSinglePage[Pagerduty]]:
         """
         Get a list of all configured PagerDuty services.
 
@@ -302,16 +322,13 @@ async def get(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/alerting/v3/destinations/pagerduty",
+            page=AsyncSinglePage[Pagerduty],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[PagerdutyGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[PagerdutyGetResponse]], ResultWrapper[PagerdutyGetResponse]),
+            model=Pagerduty,
         )
 
     async def link(
@@ -324,7 +341,7 @@ async def link(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PagerdutyLinkResponse]:
         """
         Links PagerDuty with the account using the integration token.
diff --git a/src/cloudflare/resources/alerting/destinations/webhooks.py b/src/cloudflare/resources/alerting/destinations/webhooks.py
index 038ec887425..9a83705a4fd 100644
--- a/src/cloudflare/resources/alerting/destinations/webhooks.py
+++ b/src/cloudflare/resources/alerting/destinations/webhooks.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -34,10 +31,21 @@
 class WebhooksResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> WebhooksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return WebhooksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> WebhooksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return WebhooksResourceWithStreamingResponse(self)
 
     def create(
@@ -46,13 +54,13 @@ def create(
         account_id: str,
         name: str,
         url: str,
-        secret: str | NotGiven = NOT_GIVEN,
+        secret: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[WebhookCreateResponse]:
         """
         Creates a new webhook destination.
@@ -106,13 +114,13 @@ def update(
         account_id: str,
         name: str,
         url: str,
-        secret: str | NotGiven = NOT_GIVEN,
+        secret: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[WebhookUpdateResponse]:
         """
         Update a webhook destination.
@@ -172,7 +180,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Webhooks]:
         """
         Gets a list of all configured webhook destinations.
@@ -209,7 +217,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WebhookDeleteResponse:
         """
         Delete a configured webhook destination.
@@ -249,7 +257,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Webhooks]:
         """
         Get details for a single webhooks destination.
@@ -287,10 +295,21 @@ def get(
 class AsyncWebhooksResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncWebhooksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncWebhooksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncWebhooksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncWebhooksResourceWithStreamingResponse(self)
 
     async def create(
@@ -299,13 +318,13 @@ async def create(
         account_id: str,
         name: str,
         url: str,
-        secret: str | NotGiven = NOT_GIVEN,
+        secret: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[WebhookCreateResponse]:
         """
         Creates a new webhook destination.
@@ -359,13 +378,13 @@ async def update(
         account_id: str,
         name: str,
         url: str,
-        secret: str | NotGiven = NOT_GIVEN,
+        secret: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[WebhookUpdateResponse]:
         """
         Update a webhook destination.
@@ -425,7 +444,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Webhooks, AsyncSinglePage[Webhooks]]:
         """
         Gets a list of all configured webhook destinations.
@@ -462,7 +481,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WebhookDeleteResponse:
         """
         Delete a configured webhook destination.
@@ -502,7 +521,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Webhooks]:
         """
         Get details for a single webhooks destination.
diff --git a/src/cloudflare/resources/alerting/history.py b/src/cloudflare/resources/alerting/history.py
index f36f2e6927e..8eee416174e 100644
--- a/src/cloudflare/resources/alerting/history.py
+++ b/src/cloudflare/resources/alerting/history.py
@@ -7,7 +7,7 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
@@ -28,26 +28,37 @@
 class HistoryResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> HistoryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return HistoryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> HistoryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return HistoryResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
-        before: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        before: Union[str, datetime] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        since: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[History]:
         """Gets a list of history records for notifications sent to an account.
 
@@ -103,26 +114,37 @@ def list(
 class AsyncHistoryResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncHistoryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncHistoryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncHistoryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncHistoryResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
-        before: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        before: Union[str, datetime] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        since: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[History, AsyncV4PagePaginationArray[History]]:
         """Gets a list of history records for notifications sent to an account.
 
diff --git a/src/cloudflare/resources/alerting/policies.py b/src/cloudflare/resources/alerting/policies.py
index d951b329903..8f8115ecd60 100644
--- a/src/cloudflare/resources/alerting/policies.py
+++ b/src/cloudflare/resources/alerting/policies.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -37,10 +34,21 @@
 class PoliciesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PoliciesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PoliciesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PoliciesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PoliciesResourceWithStreamingResponse(self)
 
     def create(
@@ -48,6 +56,7 @@ def create(
         *,
         account_id: str,
         alert_type: Literal[
+            "abuse_report_alert",
             "access_custom_certificate_expiration_type",
             "advanced_ddos_attack_l4_alert",
             "advanced_ddos_attack_l7_alert",
@@ -57,12 +66,17 @@ def create(
             "block_notification_block_removed",
             "block_notification_new_block",
             "block_notification_review_rejected",
+            "bot_traffic_basic_alert",
             "brand_protection_alert",
             "brand_protection_digest",
             "clickhouse_alert_fw_anomaly",
             "clickhouse_alert_fw_ent_anomaly",
+            "cloudforce_one_request_notification",
+            "custom_analytics",
+            "custom_bot_detection_alert",
             "custom_ssl_certificate_event_type",
             "dedicated_ssl_certificate_event_type",
+            "device_connectivity_anomaly_alert",
             "dos_attack_l4",
             "dos_attack_l7",
             "expiring_service_token_alert",
@@ -74,11 +88,14 @@ def create(
             "hostname_aop_custom_certificate_expiration_type",
             "http_alert_edge_error",
             "http_alert_origin_error",
+            "image_notification",
+            "image_resizing_notification",
             "incident_alert",
             "load_balancing_health_alert",
             "load_balancing_pool_enablement_alert",
             "logo_match_alert",
             "magic_tunnel_health_check_event",
+            "magic_wan_tunnel_health",
             "maintenance_event_notification",
             "mtls_certificate_store_certificate_expiration_type",
             "pages_event_alert",
@@ -93,10 +110,14 @@ def create(
             "scriptmonitor_alert_new_resources",
             "secondary_dns_all_primaries_failing",
             "secondary_dns_primaries_failing",
+            "secondary_dns_warning",
             "secondary_dns_zone_successfully_updated",
             "secondary_dns_zone_validation_warning",
+            "security_insights_alert",
             "sentinel_alert",
             "stream_live_notifications",
+            "synthetic_test_latency_alert",
+            "synthetic_test_low_availability_alert",
             "traffic_anomalies_alert",
             "tunnel_health_event",
             "tunnel_update_event",
@@ -107,14 +128,15 @@ def create(
         enabled: bool,
         mechanisms: MechanismParam,
         name: str,
-        description: str | NotGiven = NOT_GIVEN,
-        filters: PolicyFilterParam | NotGiven = NOT_GIVEN,
+        alert_interval: str | Omit = omit,
+        description: str | Omit = omit,
+        filters: PolicyFilterParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyCreateResponse]:
         """
         Creates a new Notification policy.
@@ -133,6 +155,9 @@ def create(
 
           name: Name of the policy.
 
+          alert_interval: Optional specification of how often to re-alert from the same incident, not
+              support on all alert types.
+
           description: Optional description for the Notification policy.
 
           filters: Optional filters that allow you to be alerted only on a subset of events for
@@ -157,6 +182,7 @@ def create(
                     "enabled": enabled,
                     "mechanisms": mechanisms,
                     "name": name,
+                    "alert_interval": alert_interval,
                     "description": description,
                     "filters": filters,
                 },
@@ -177,7 +203,9 @@ def update(
         policy_id: str,
         *,
         account_id: str,
+        alert_interval: str | Omit = omit,
         alert_type: Literal[
+            "abuse_report_alert",
             "access_custom_certificate_expiration_type",
             "advanced_ddos_attack_l4_alert",
             "advanced_ddos_attack_l7_alert",
@@ -187,12 +215,17 @@ def update(
             "block_notification_block_removed",
             "block_notification_new_block",
             "block_notification_review_rejected",
+            "bot_traffic_basic_alert",
             "brand_protection_alert",
             "brand_protection_digest",
             "clickhouse_alert_fw_anomaly",
             "clickhouse_alert_fw_ent_anomaly",
+            "cloudforce_one_request_notification",
+            "custom_analytics",
+            "custom_bot_detection_alert",
             "custom_ssl_certificate_event_type",
             "dedicated_ssl_certificate_event_type",
+            "device_connectivity_anomaly_alert",
             "dos_attack_l4",
             "dos_attack_l7",
             "expiring_service_token_alert",
@@ -204,11 +237,14 @@ def update(
             "hostname_aop_custom_certificate_expiration_type",
             "http_alert_edge_error",
             "http_alert_origin_error",
+            "image_notification",
+            "image_resizing_notification",
             "incident_alert",
             "load_balancing_health_alert",
             "load_balancing_pool_enablement_alert",
             "logo_match_alert",
             "magic_tunnel_health_check_event",
+            "magic_wan_tunnel_health",
             "maintenance_event_notification",
             "mtls_certificate_store_certificate_expiration_type",
             "pages_event_alert",
@@ -223,10 +259,14 @@ def update(
             "scriptmonitor_alert_new_resources",
             "secondary_dns_all_primaries_failing",
             "secondary_dns_primaries_failing",
+            "secondary_dns_warning",
             "secondary_dns_zone_successfully_updated",
             "secondary_dns_zone_validation_warning",
+            "security_insights_alert",
             "sentinel_alert",
             "stream_live_notifications",
+            "synthetic_test_latency_alert",
+            "synthetic_test_low_availability_alert",
             "traffic_anomalies_alert",
             "tunnel_health_event",
             "tunnel_update_event",
@@ -234,18 +274,18 @@ def update(
             "web_analytics_metrics_update",
             "zone_aop_custom_certificate_expiration_type",
         ]
-        | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        filters: PolicyFilterParam | NotGiven = NOT_GIVEN,
-        mechanisms: MechanismParam | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        filters: PolicyFilterParam | Omit = omit,
+        mechanisms: MechanismParam | Omit = omit,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyUpdateResponse]:
         """
         Update a Notification policy.
@@ -255,6 +295,9 @@ def update(
 
           policy_id: The unique identifier of a notification policy
 
+          alert_interval: Optional specification of how often to re-alert from the same incident, not
+              support on all alert types.
+
           alert_type: Refers to which event will trigger a Notification dispatch. You can use the
               endpoint to get available alert types which then will give you a list of
               possible values.
@@ -288,6 +331,7 @@ def update(
             f"/accounts/{account_id}/alerting/v3/policies/{policy_id}",
             body=maybe_transform(
                 {
+                    "alert_interval": alert_interval,
                     "alert_type": alert_type,
                     "description": description,
                     "enabled": enabled,
@@ -316,7 +360,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Policy]:
         """
         Get a list of all Notification policies.
@@ -353,7 +397,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PolicyDeleteResponse:
         """
         Delete a Notification policy.
@@ -393,7 +437,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Policy]:
         """
         Get details for a single policy.
@@ -431,10 +475,21 @@ def get(
 class AsyncPoliciesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPoliciesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPoliciesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPoliciesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPoliciesResourceWithStreamingResponse(self)
 
     async def create(
@@ -442,6 +497,7 @@ async def create(
         *,
         account_id: str,
         alert_type: Literal[
+            "abuse_report_alert",
             "access_custom_certificate_expiration_type",
             "advanced_ddos_attack_l4_alert",
             "advanced_ddos_attack_l7_alert",
@@ -451,12 +507,17 @@ async def create(
             "block_notification_block_removed",
             "block_notification_new_block",
             "block_notification_review_rejected",
+            "bot_traffic_basic_alert",
             "brand_protection_alert",
             "brand_protection_digest",
             "clickhouse_alert_fw_anomaly",
             "clickhouse_alert_fw_ent_anomaly",
+            "cloudforce_one_request_notification",
+            "custom_analytics",
+            "custom_bot_detection_alert",
             "custom_ssl_certificate_event_type",
             "dedicated_ssl_certificate_event_type",
+            "device_connectivity_anomaly_alert",
             "dos_attack_l4",
             "dos_attack_l7",
             "expiring_service_token_alert",
@@ -468,11 +529,14 @@ async def create(
             "hostname_aop_custom_certificate_expiration_type",
             "http_alert_edge_error",
             "http_alert_origin_error",
+            "image_notification",
+            "image_resizing_notification",
             "incident_alert",
             "load_balancing_health_alert",
             "load_balancing_pool_enablement_alert",
             "logo_match_alert",
             "magic_tunnel_health_check_event",
+            "magic_wan_tunnel_health",
             "maintenance_event_notification",
             "mtls_certificate_store_certificate_expiration_type",
             "pages_event_alert",
@@ -487,10 +551,14 @@ async def create(
             "scriptmonitor_alert_new_resources",
             "secondary_dns_all_primaries_failing",
             "secondary_dns_primaries_failing",
+            "secondary_dns_warning",
             "secondary_dns_zone_successfully_updated",
             "secondary_dns_zone_validation_warning",
+            "security_insights_alert",
             "sentinel_alert",
             "stream_live_notifications",
+            "synthetic_test_latency_alert",
+            "synthetic_test_low_availability_alert",
             "traffic_anomalies_alert",
             "tunnel_health_event",
             "tunnel_update_event",
@@ -501,14 +569,15 @@ async def create(
         enabled: bool,
         mechanisms: MechanismParam,
         name: str,
-        description: str | NotGiven = NOT_GIVEN,
-        filters: PolicyFilterParam | NotGiven = NOT_GIVEN,
+        alert_interval: str | Omit = omit,
+        description: str | Omit = omit,
+        filters: PolicyFilterParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyCreateResponse]:
         """
         Creates a new Notification policy.
@@ -527,6 +596,9 @@ async def create(
 
           name: Name of the policy.
 
+          alert_interval: Optional specification of how often to re-alert from the same incident, not
+              support on all alert types.
+
           description: Optional description for the Notification policy.
 
           filters: Optional filters that allow you to be alerted only on a subset of events for
@@ -551,6 +623,7 @@ async def create(
                     "enabled": enabled,
                     "mechanisms": mechanisms,
                     "name": name,
+                    "alert_interval": alert_interval,
                     "description": description,
                     "filters": filters,
                 },
@@ -571,7 +644,9 @@ async def update(
         policy_id: str,
         *,
         account_id: str,
+        alert_interval: str | Omit = omit,
         alert_type: Literal[
+            "abuse_report_alert",
             "access_custom_certificate_expiration_type",
             "advanced_ddos_attack_l4_alert",
             "advanced_ddos_attack_l7_alert",
@@ -581,12 +656,17 @@ async def update(
             "block_notification_block_removed",
             "block_notification_new_block",
             "block_notification_review_rejected",
+            "bot_traffic_basic_alert",
             "brand_protection_alert",
             "brand_protection_digest",
             "clickhouse_alert_fw_anomaly",
             "clickhouse_alert_fw_ent_anomaly",
+            "cloudforce_one_request_notification",
+            "custom_analytics",
+            "custom_bot_detection_alert",
             "custom_ssl_certificate_event_type",
             "dedicated_ssl_certificate_event_type",
+            "device_connectivity_anomaly_alert",
             "dos_attack_l4",
             "dos_attack_l7",
             "expiring_service_token_alert",
@@ -598,11 +678,14 @@ async def update(
             "hostname_aop_custom_certificate_expiration_type",
             "http_alert_edge_error",
             "http_alert_origin_error",
+            "image_notification",
+            "image_resizing_notification",
             "incident_alert",
             "load_balancing_health_alert",
             "load_balancing_pool_enablement_alert",
             "logo_match_alert",
             "magic_tunnel_health_check_event",
+            "magic_wan_tunnel_health",
             "maintenance_event_notification",
             "mtls_certificate_store_certificate_expiration_type",
             "pages_event_alert",
@@ -617,10 +700,14 @@ async def update(
             "scriptmonitor_alert_new_resources",
             "secondary_dns_all_primaries_failing",
             "secondary_dns_primaries_failing",
+            "secondary_dns_warning",
             "secondary_dns_zone_successfully_updated",
             "secondary_dns_zone_validation_warning",
+            "security_insights_alert",
             "sentinel_alert",
             "stream_live_notifications",
+            "synthetic_test_latency_alert",
+            "synthetic_test_low_availability_alert",
             "traffic_anomalies_alert",
             "tunnel_health_event",
             "tunnel_update_event",
@@ -628,18 +715,18 @@ async def update(
             "web_analytics_metrics_update",
             "zone_aop_custom_certificate_expiration_type",
         ]
-        | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        filters: PolicyFilterParam | NotGiven = NOT_GIVEN,
-        mechanisms: MechanismParam | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        filters: PolicyFilterParam | Omit = omit,
+        mechanisms: MechanismParam | Omit = omit,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyUpdateResponse]:
         """
         Update a Notification policy.
@@ -649,6 +736,9 @@ async def update(
 
           policy_id: The unique identifier of a notification policy
 
+          alert_interval: Optional specification of how often to re-alert from the same incident, not
+              support on all alert types.
+
           alert_type: Refers to which event will trigger a Notification dispatch. You can use the
               endpoint to get available alert types which then will give you a list of
               possible values.
@@ -682,6 +772,7 @@ async def update(
             f"/accounts/{account_id}/alerting/v3/policies/{policy_id}",
             body=await async_maybe_transform(
                 {
+                    "alert_interval": alert_interval,
                     "alert_type": alert_type,
                     "description": description,
                     "enabled": enabled,
@@ -710,7 +801,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Policy, AsyncSinglePage[Policy]]:
         """
         Get a list of all Notification policies.
@@ -747,7 +838,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PolicyDeleteResponse:
         """
         Delete a Notification policy.
@@ -787,7 +878,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Policy]:
         """
         Get details for a single policy.
diff --git a/src/cloudflare/resources/alerting/silences.py b/src/cloudflare/resources/alerting/silences.py
new file mode 100644
index 00000000000..a024012b058
--- /dev/null
+++ b/src/cloudflare/resources/alerting/silences.py
@@ -0,0 +1,547 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, Optional, cast
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.alerting import silence_create_params, silence_update_params
+from ...types.alerting.silence_get_response import SilenceGetResponse
+from ...types.alerting.silence_list_response import SilenceListResponse
+from ...types.alerting.silence_create_response import SilenceCreateResponse
+from ...types.alerting.silence_delete_response import SilenceDeleteResponse
+from ...types.alerting.silence_update_response import SilenceUpdateResponse
+
+__all__ = ["SilencesResource", "AsyncSilencesResource"]
+
+
+class SilencesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SilencesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SilencesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SilencesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SilencesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        body: Iterable[silence_create_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SilenceCreateResponse:
+        """
+        Creates a new silence for an account.
+
+        Args:
+          account_id: The account id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/alerting/v3/silences",
+            body=maybe_transform(body, Iterable[silence_create_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SilenceCreateResponse,
+        )
+
+    def update(
+        self,
+        *,
+        account_id: str,
+        body: Iterable[silence_update_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[SilenceUpdateResponse]:
+        """
+        Updates existing silences for an account.
+
+        Args:
+          account_id: The account id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/alerting/v3/silences",
+            page=SyncSinglePage[SilenceUpdateResponse],
+            body=maybe_transform(body, Iterable[silence_update_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=SilenceUpdateResponse,
+            method="put",
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[SilenceListResponse]:
+        """
+        Gets a list of silences for an account.
+
+        Args:
+          account_id: The account id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/alerting/v3/silences",
+            page=SyncSinglePage[SilenceListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=SilenceListResponse,
+        )
+
+    def delete(
+        self,
+        silence_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SilenceDeleteResponse:
+        """
+        Deletes an existing silence for an account.
+
+        Args:
+          account_id: The account id
+
+          silence_id: Silence ID
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not silence_id:
+            raise ValueError(f"Expected a non-empty value for `silence_id` but received {silence_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/alerting/v3/silences/{silence_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SilenceDeleteResponse,
+        )
+
+    def get(
+        self,
+        silence_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SilenceGetResponse]:
+        """
+        Gets a specific silence for an account.
+
+        Args:
+          account_id: The account id
+
+          silence_id: Silence ID
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not silence_id:
+            raise ValueError(f"Expected a non-empty value for `silence_id` but received {silence_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/alerting/v3/silences/{silence_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SilenceGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SilenceGetResponse]], ResultWrapper[SilenceGetResponse]),
+        )
+
+
+class AsyncSilencesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSilencesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSilencesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSilencesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSilencesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        body: Iterable[silence_create_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SilenceCreateResponse:
+        """
+        Creates a new silence for an account.
+
+        Args:
+          account_id: The account id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/alerting/v3/silences",
+            body=await async_maybe_transform(body, Iterable[silence_create_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SilenceCreateResponse,
+        )
+
+    def update(
+        self,
+        *,
+        account_id: str,
+        body: Iterable[silence_update_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SilenceUpdateResponse, AsyncSinglePage[SilenceUpdateResponse]]:
+        """
+        Updates existing silences for an account.
+
+        Args:
+          account_id: The account id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/alerting/v3/silences",
+            page=AsyncSinglePage[SilenceUpdateResponse],
+            body=maybe_transform(body, Iterable[silence_update_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=SilenceUpdateResponse,
+            method="put",
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SilenceListResponse, AsyncSinglePage[SilenceListResponse]]:
+        """
+        Gets a list of silences for an account.
+
+        Args:
+          account_id: The account id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/alerting/v3/silences",
+            page=AsyncSinglePage[SilenceListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=SilenceListResponse,
+        )
+
+    async def delete(
+        self,
+        silence_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SilenceDeleteResponse:
+        """
+        Deletes an existing silence for an account.
+
+        Args:
+          account_id: The account id
+
+          silence_id: Silence ID
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not silence_id:
+            raise ValueError(f"Expected a non-empty value for `silence_id` but received {silence_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/alerting/v3/silences/{silence_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SilenceDeleteResponse,
+        )
+
+    async def get(
+        self,
+        silence_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SilenceGetResponse]:
+        """
+        Gets a specific silence for an account.
+
+        Args:
+          account_id: The account id
+
+          silence_id: Silence ID
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not silence_id:
+            raise ValueError(f"Expected a non-empty value for `silence_id` but received {silence_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/alerting/v3/silences/{silence_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SilenceGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SilenceGetResponse]], ResultWrapper[SilenceGetResponse]),
+        )
+
+
+class SilencesResourceWithRawResponse:
+    def __init__(self, silences: SilencesResource) -> None:
+        self._silences = silences
+
+        self.create = to_raw_response_wrapper(
+            silences.create,
+        )
+        self.update = to_raw_response_wrapper(
+            silences.update,
+        )
+        self.list = to_raw_response_wrapper(
+            silences.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            silences.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            silences.get,
+        )
+
+
+class AsyncSilencesResourceWithRawResponse:
+    def __init__(self, silences: AsyncSilencesResource) -> None:
+        self._silences = silences
+
+        self.create = async_to_raw_response_wrapper(
+            silences.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            silences.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            silences.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            silences.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            silences.get,
+        )
+
+
+class SilencesResourceWithStreamingResponse:
+    def __init__(self, silences: SilencesResource) -> None:
+        self._silences = silences
+
+        self.create = to_streamed_response_wrapper(
+            silences.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            silences.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            silences.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            silences.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            silences.get,
+        )
+
+
+class AsyncSilencesResourceWithStreamingResponse:
+    def __init__(self, silences: AsyncSilencesResource) -> None:
+        self._silences = silences
+
+        self.create = async_to_streamed_response_wrapper(
+            silences.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            silences.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            silences.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            silences.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            silences.get,
+        )
diff --git a/src/cloudflare/resources/api_gateway/__init__.py b/src/cloudflare/resources/api_gateway/__init__.py
index c92d2837cfb..c93926a6412 100644
--- a/src/cloudflare/resources/api_gateway/__init__.py
+++ b/src/cloudflare/resources/api_gateway/__init__.py
@@ -56,6 +56,14 @@
     ConfigurationsResourceWithStreamingResponse,
     AsyncConfigurationsResourceWithStreamingResponse,
 )
+from .expression_template import (
+    ExpressionTemplateResource,
+    AsyncExpressionTemplateResource,
+    ExpressionTemplateResourceWithRawResponse,
+    AsyncExpressionTemplateResourceWithRawResponse,
+    ExpressionTemplateResourceWithStreamingResponse,
+    AsyncExpressionTemplateResourceWithStreamingResponse,
+)
 
 __all__ = [
     "ConfigurationsResource",
@@ -94,6 +102,12 @@
     "AsyncUserSchemasResourceWithRawResponse",
     "UserSchemasResourceWithStreamingResponse",
     "AsyncUserSchemasResourceWithStreamingResponse",
+    "ExpressionTemplateResource",
+    "AsyncExpressionTemplateResource",
+    "ExpressionTemplateResourceWithRawResponse",
+    "AsyncExpressionTemplateResourceWithRawResponse",
+    "ExpressionTemplateResourceWithStreamingResponse",
+    "AsyncExpressionTemplateResourceWithStreamingResponse",
     "APIGatewayResource",
     "AsyncAPIGatewayResource",
     "APIGatewayResourceWithRawResponse",
diff --git a/src/cloudflare/resources/api_gateway/api_gateway.py b/src/cloudflare/resources/api_gateway/api_gateway.py
index 5df1917d66b..70917610f7d 100644
--- a/src/cloudflare/resources/api_gateway/api_gateway.py
+++ b/src/cloudflare/resources/api_gateway/api_gateway.py
@@ -10,7 +10,17 @@
     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,
@@ -18,8 +28,7 @@
     SettingsResourceWithStreamingResponse,
     AsyncSettingsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from .discovery import (
+from .discovery.discovery import (
     DiscoveryResource,
     AsyncDiscoveryResource,
     DiscoveryResourceWithRawResponse,
@@ -27,7 +36,7 @@
     DiscoveryResourceWithStreamingResponse,
     AsyncDiscoveryResourceWithStreamingResponse,
 )
-from .operations import (
+from .operations.operations import (
     OperationsResource,
     AsyncOperationsResource,
     OperationsResourceWithRawResponse,
@@ -35,8 +44,7 @@
     OperationsResourceWithStreamingResponse,
     AsyncOperationsResourceWithStreamingResponse,
 )
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .user_schemas import (
+from .user_schemas.user_schemas import (
     UserSchemasResource,
     AsyncUserSchemasResource,
     UserSchemasResourceWithRawResponse,
@@ -44,18 +52,14 @@
     UserSchemasResourceWithStreamingResponse,
     AsyncUserSchemasResourceWithStreamingResponse,
 )
-from .configurations import (
-    ConfigurationsResource,
-    AsyncConfigurationsResource,
-    ConfigurationsResourceWithRawResponse,
-    AsyncConfigurationsResourceWithRawResponse,
-    ConfigurationsResourceWithStreamingResponse,
-    AsyncConfigurationsResourceWithStreamingResponse,
+from .expression_template.expression_template import (
+    ExpressionTemplateResource,
+    AsyncExpressionTemplateResource,
+    ExpressionTemplateResourceWithRawResponse,
+    AsyncExpressionTemplateResourceWithRawResponse,
+    ExpressionTemplateResourceWithStreamingResponse,
+    AsyncExpressionTemplateResourceWithStreamingResponse,
 )
-from .settings.settings import SettingsResource, AsyncSettingsResource
-from .discovery.discovery import DiscoveryResource, AsyncDiscoveryResource
-from .operations.operations import OperationsResource, AsyncOperationsResource
-from .user_schemas.user_schemas import UserSchemasResource, AsyncUserSchemasResource
 
 __all__ = ["APIGatewayResource", "AsyncAPIGatewayResource"]
 
@@ -85,12 +89,27 @@ def settings(self) -> SettingsResource:
     def user_schemas(self) -> UserSchemasResource:
         return UserSchemasResource(self._client)
 
+    @cached_property
+    def expression_template(self) -> ExpressionTemplateResource:
+        return ExpressionTemplateResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> APIGatewayResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return APIGatewayResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> APIGatewayResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return APIGatewayResourceWithStreamingResponse(self)
 
 
@@ -119,12 +138,27 @@ def settings(self) -> AsyncSettingsResource:
     def user_schemas(self) -> AsyncUserSchemasResource:
         return AsyncUserSchemasResource(self._client)
 
+    @cached_property
+    def expression_template(self) -> AsyncExpressionTemplateResource:
+        return AsyncExpressionTemplateResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncAPIGatewayResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAPIGatewayResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAPIGatewayResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAPIGatewayResourceWithStreamingResponse(self)
 
 
@@ -156,6 +190,10 @@ def settings(self) -> SettingsResourceWithRawResponse:
     def user_schemas(self) -> UserSchemasResourceWithRawResponse:
         return UserSchemasResourceWithRawResponse(self._api_gateway.user_schemas)
 
+    @cached_property
+    def expression_template(self) -> ExpressionTemplateResourceWithRawResponse:
+        return ExpressionTemplateResourceWithRawResponse(self._api_gateway.expression_template)
+
 
 class AsyncAPIGatewayResourceWithRawResponse:
     def __init__(self, api_gateway: AsyncAPIGatewayResource) -> None:
@@ -185,6 +223,10 @@ def settings(self) -> AsyncSettingsResourceWithRawResponse:
     def user_schemas(self) -> AsyncUserSchemasResourceWithRawResponse:
         return AsyncUserSchemasResourceWithRawResponse(self._api_gateway.user_schemas)
 
+    @cached_property
+    def expression_template(self) -> AsyncExpressionTemplateResourceWithRawResponse:
+        return AsyncExpressionTemplateResourceWithRawResponse(self._api_gateway.expression_template)
+
 
 class APIGatewayResourceWithStreamingResponse:
     def __init__(self, api_gateway: APIGatewayResource) -> None:
@@ -214,6 +256,10 @@ def settings(self) -> SettingsResourceWithStreamingResponse:
     def user_schemas(self) -> UserSchemasResourceWithStreamingResponse:
         return UserSchemasResourceWithStreamingResponse(self._api_gateway.user_schemas)
 
+    @cached_property
+    def expression_template(self) -> ExpressionTemplateResourceWithStreamingResponse:
+        return ExpressionTemplateResourceWithStreamingResponse(self._api_gateway.expression_template)
+
 
 class AsyncAPIGatewayResourceWithStreamingResponse:
     def __init__(self, api_gateway: AsyncAPIGatewayResource) -> None:
@@ -242,3 +288,7 @@ def settings(self) -> AsyncSettingsResourceWithStreamingResponse:
     @cached_property
     def user_schemas(self) -> AsyncUserSchemasResourceWithStreamingResponse:
         return AsyncUserSchemasResourceWithStreamingResponse(self._api_gateway.user_schemas)
+
+    @cached_property
+    def expression_template(self) -> AsyncExpressionTemplateResourceWithStreamingResponse:
+        return AsyncExpressionTemplateResourceWithStreamingResponse(self._api_gateway.expression_template)
diff --git a/src/cloudflare/resources/api_gateway/configurations.py b/src/cloudflare/resources/api_gateway/configurations.py
index efa78c99742..96cebe13223 100644
--- a/src/cloudflare/resources/api_gateway/configurations.py
+++ b/src/cloudflare/resources/api_gateway/configurations.py
@@ -2,16 +2,12 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Iterable, cast
-from typing_extensions import Literal
+from typing import Type, Iterable, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -24,7 +20,6 @@
 from ..._base_client import make_request_options
 from ...types.api_gateway import configuration_get_params, configuration_update_params
 from ...types.api_gateway.configuration import Configuration
-from ...types.api_gateway.configuration_update_response import ConfigurationUpdateResponse
 
 __all__ = ["ConfigurationsResource", "AsyncConfigurationsResource"]
 
@@ -32,10 +27,21 @@
 class ConfigurationsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ConfigurationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ConfigurationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ConfigurationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ConfigurationsResourceWithStreamingResponse(self)
 
     def update(
@@ -43,18 +49,21 @@ def update(
         *,
         zone_id: str,
         auth_id_characteristics: Iterable[configuration_update_params.AuthIDCharacteristic],
+        normalize: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConfigurationUpdateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Configuration:
         """
-        Set configuration properties
+        Update configuration properties
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
+
+          normalize: Ensures that the configuration is written or retrieved in normalized fashion
 
           extra_headers: Send extra headers
 
@@ -73,30 +82,35 @@ def update(
                 configuration_update_params.ConfigurationUpdateParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"normalize": normalize}, configuration_update_params.ConfigurationUpdateParams),
+                post_parser=ResultWrapper[Configuration]._unwrapper,
             ),
-            cast_to=ConfigurationUpdateResponse,
+            cast_to=cast(Type[Configuration], ResultWrapper[Configuration]),
         )
 
     def get(
         self,
         *,
         zone_id: str,
-        properties: List[Literal["auth_id_characteristics"]] | NotGiven = NOT_GIVEN,
+        normalize: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Configuration:
         """
         Retrieve information about specific configuration properties
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          properties: Requests information about certain properties.
+          normalize: Ensures that the configuration is written or retrieved in normalized fashion
 
           extra_headers: Send extra headers
 
@@ -115,7 +129,7 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=maybe_transform({"properties": properties}, configuration_get_params.ConfigurationGetParams),
+                query=maybe_transform({"normalize": normalize}, configuration_get_params.ConfigurationGetParams),
                 post_parser=ResultWrapper[Configuration]._unwrapper,
             ),
             cast_to=cast(Type[Configuration], ResultWrapper[Configuration]),
@@ -125,10 +139,21 @@ def get(
 class AsyncConfigurationsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncConfigurationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncConfigurationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncConfigurationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncConfigurationsResourceWithStreamingResponse(self)
 
     async def update(
@@ -136,18 +161,21 @@ async def update(
         *,
         zone_id: str,
         auth_id_characteristics: Iterable[configuration_update_params.AuthIDCharacteristic],
+        normalize: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConfigurationUpdateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Configuration:
         """
-        Set configuration properties
+        Update configuration properties
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
+
+          normalize: Ensures that the configuration is written or retrieved in normalized fashion
 
           extra_headers: Send extra headers
 
@@ -166,30 +194,37 @@ async def update(
                 configuration_update_params.ConfigurationUpdateParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"normalize": normalize}, configuration_update_params.ConfigurationUpdateParams
+                ),
+                post_parser=ResultWrapper[Configuration]._unwrapper,
             ),
-            cast_to=ConfigurationUpdateResponse,
+            cast_to=cast(Type[Configuration], ResultWrapper[Configuration]),
         )
 
     async def get(
         self,
         *,
         zone_id: str,
-        properties: List[Literal["auth_id_characteristics"]] | NotGiven = NOT_GIVEN,
+        normalize: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Configuration:
         """
         Retrieve information about specific configuration properties
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          properties: Requests information about certain properties.
+          normalize: Ensures that the configuration is written or retrieved in normalized fashion
 
           extra_headers: Send extra headers
 
@@ -209,7 +244,7 @@ async def get(
                 extra_body=extra_body,
                 timeout=timeout,
                 query=await async_maybe_transform(
-                    {"properties": properties}, configuration_get_params.ConfigurationGetParams
+                    {"normalize": normalize}, configuration_get_params.ConfigurationGetParams
                 ),
                 post_parser=ResultWrapper[Configuration]._unwrapper,
             ),
diff --git a/src/cloudflare/resources/api_gateway/discovery/discovery.py b/src/cloudflare/resources/api_gateway/discovery/discovery.py
index 9decd5b422c..a465c6fc4a9 100644
--- a/src/cloudflare/resources/api_gateway/discovery/discovery.py
+++ b/src/cloudflare/resources/api_gateway/discovery/discovery.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from .operations import (
     OperationsResource,
@@ -37,10 +37,21 @@ def operations(self) -> OperationsResource:
 
     @cached_property
     def with_raw_response(self) -> DiscoveryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DiscoveryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DiscoveryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DiscoveryResourceWithStreamingResponse(self)
 
     def get(
@@ -52,14 +63,14 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> DiscoveryGetResponse:
         """
         Retrieve the most up to date view of discovered operations, rendered as OpenAPI
         schemas
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -91,10 +102,21 @@ def operations(self) -> AsyncOperationsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncDiscoveryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDiscoveryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDiscoveryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDiscoveryResourceWithStreamingResponse(self)
 
     async def get(
@@ -106,14 +128,14 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> DiscoveryGetResponse:
         """
         Retrieve the most up to date view of discovered operations, rendered as OpenAPI
         schemas
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/api_gateway/discovery/operations.py b/src/cloudflare/resources/api_gateway/discovery/operations.py
index 4f7fb29a475..76aeb31fde9 100644
--- a/src/cloudflare/resources/api_gateway/discovery/operations.py
+++ b/src/cloudflare/resources/api_gateway/discovery/operations.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import List, Type, cast
+from typing import Dict, Type, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -23,9 +20,10 @@
 from ...._wrappers import ResultWrapper
 from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ...._base_client import AsyncPaginator, make_request_options
-from ....types.api_gateway.discovery import operation_edit_params, operation_list_params
+from ....types.api_gateway.discovery import operation_edit_params, operation_list_params, operation_bulk_edit_params
 from ....types.api_gateway.discovery_operation import DiscoveryOperation
 from ....types.api_gateway.discovery.operation_edit_response import OperationEditResponse
+from ....types.api_gateway.discovery.operation_bulk_edit_response import OperationBulkEditResponse
 
 __all__ = ["OperationsResource", "AsyncOperationsResource"]
 
@@ -33,39 +31,50 @@
 class OperationsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> OperationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return OperationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> OperationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return OperationsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         zone_id: str,
-        diff: bool | NotGiven = NOT_GIVEN,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        endpoint: str | NotGiven = NOT_GIVEN,
-        host: List[str] | NotGiven = NOT_GIVEN,
-        method: List[str] | NotGiven = NOT_GIVEN,
+        diff: bool | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        endpoint: str | Omit = omit,
+        host: SequenceNotStr[str] | Omit = omit,
+        method: SequenceNotStr[str] | Omit = omit,
         order: Literal["host", "method", "endpoint", "traffic_stats.requests", "traffic_stats.last_updated"]
-        | NotGiven = NOT_GIVEN,
-        origin: Literal["ML", "SessionIdentifier"] | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
-        state: Literal["review", "saved", "ignored"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        origin: Literal["ML", "SessionIdentifier", "LabelDiscovery"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        state: Literal["review", "saved", "ignored"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[DiscoveryOperation]:
         """
         Retrieve the most up to date view of discovered operations
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           diff: When `true`, only return API Discovery results that are not saved into API
               Shield Endpoint Management
@@ -137,26 +146,67 @@ def list(
             model=DiscoveryOperation,
         )
 
+    def bulk_edit(
+        self,
+        *,
+        zone_id: str,
+        body: Dict[str, operation_bulk_edit_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OperationBulkEditResponse:
+        """
+        Update the `state` on one or more discovered operations
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._patch(
+            f"/zones/{zone_id}/api_gateway/discovery/operations",
+            body=maybe_transform(body, operation_bulk_edit_params.OperationBulkEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[OperationBulkEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OperationBulkEditResponse], ResultWrapper[OperationBulkEditResponse]),
+        )
+
     def edit(
         self,
         operation_id: str,
         *,
         zone_id: str,
-        state: Literal["review", "ignored"] | NotGiven = NOT_GIVEN,
+        state: Literal["review", "ignored"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> OperationEditResponse:
         """
         Update the `state` on a discovered operation
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          operation_id: UUID
+          operation_id: UUID.
 
           state: Mark state of operation in API Discovery
 
@@ -192,39 +242,50 @@ def edit(
 class AsyncOperationsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncOperationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncOperationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncOperationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncOperationsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         zone_id: str,
-        diff: bool | NotGiven = NOT_GIVEN,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        endpoint: str | NotGiven = NOT_GIVEN,
-        host: List[str] | NotGiven = NOT_GIVEN,
-        method: List[str] | NotGiven = NOT_GIVEN,
+        diff: bool | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        endpoint: str | Omit = omit,
+        host: SequenceNotStr[str] | Omit = omit,
+        method: SequenceNotStr[str] | Omit = omit,
         order: Literal["host", "method", "endpoint", "traffic_stats.requests", "traffic_stats.last_updated"]
-        | NotGiven = NOT_GIVEN,
-        origin: Literal["ML", "SessionIdentifier"] | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
-        state: Literal["review", "saved", "ignored"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        origin: Literal["ML", "SessionIdentifier", "LabelDiscovery"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        state: Literal["review", "saved", "ignored"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[DiscoveryOperation, AsyncV4PagePaginationArray[DiscoveryOperation]]:
         """
         Retrieve the most up to date view of discovered operations
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           diff: When `true`, only return API Discovery results that are not saved into API
               Shield Endpoint Management
@@ -296,26 +357,67 @@ def list(
             model=DiscoveryOperation,
         )
 
+    async def bulk_edit(
+        self,
+        *,
+        zone_id: str,
+        body: Dict[str, operation_bulk_edit_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OperationBulkEditResponse:
+        """
+        Update the `state` on one or more discovered operations
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._patch(
+            f"/zones/{zone_id}/api_gateway/discovery/operations",
+            body=await async_maybe_transform(body, operation_bulk_edit_params.OperationBulkEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[OperationBulkEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OperationBulkEditResponse], ResultWrapper[OperationBulkEditResponse]),
+        )
+
     async def edit(
         self,
         operation_id: str,
         *,
         zone_id: str,
-        state: Literal["review", "ignored"] | NotGiven = NOT_GIVEN,
+        state: Literal["review", "ignored"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> OperationEditResponse:
         """
         Update the `state` on a discovered operation
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          operation_id: UUID
+          operation_id: UUID.
 
           state: Mark state of operation in API Discovery
 
@@ -355,6 +457,9 @@ def __init__(self, operations: OperationsResource) -> None:
         self.list = to_raw_response_wrapper(
             operations.list,
         )
+        self.bulk_edit = to_raw_response_wrapper(
+            operations.bulk_edit,
+        )
         self.edit = to_raw_response_wrapper(
             operations.edit,
         )
@@ -367,6 +472,9 @@ def __init__(self, operations: AsyncOperationsResource) -> None:
         self.list = async_to_raw_response_wrapper(
             operations.list,
         )
+        self.bulk_edit = async_to_raw_response_wrapper(
+            operations.bulk_edit,
+        )
         self.edit = async_to_raw_response_wrapper(
             operations.edit,
         )
@@ -379,6 +487,9 @@ def __init__(self, operations: OperationsResource) -> None:
         self.list = to_streamed_response_wrapper(
             operations.list,
         )
+        self.bulk_edit = to_streamed_response_wrapper(
+            operations.bulk_edit,
+        )
         self.edit = to_streamed_response_wrapper(
             operations.edit,
         )
@@ -391,6 +502,9 @@ def __init__(self, operations: AsyncOperationsResource) -> None:
         self.list = async_to_streamed_response_wrapper(
             operations.list,
         )
+        self.bulk_edit = async_to_streamed_response_wrapper(
+            operations.bulk_edit,
+        )
         self.edit = async_to_streamed_response_wrapper(
             operations.edit,
         )
diff --git a/src/cloudflare/resources/api_gateway/expression_template/__init__.py b/src/cloudflare/resources/api_gateway/expression_template/__init__.py
new file mode 100644
index 00000000000..40499a81369
--- /dev/null
+++ b/src/cloudflare/resources/api_gateway/expression_template/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .fallthrough import (
+    FallthroughResource,
+    AsyncFallthroughResource,
+    FallthroughResourceWithRawResponse,
+    AsyncFallthroughResourceWithRawResponse,
+    FallthroughResourceWithStreamingResponse,
+    AsyncFallthroughResourceWithStreamingResponse,
+)
+from .expression_template import (
+    ExpressionTemplateResource,
+    AsyncExpressionTemplateResource,
+    ExpressionTemplateResourceWithRawResponse,
+    AsyncExpressionTemplateResourceWithRawResponse,
+    ExpressionTemplateResourceWithStreamingResponse,
+    AsyncExpressionTemplateResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "FallthroughResource",
+    "AsyncFallthroughResource",
+    "FallthroughResourceWithRawResponse",
+    "AsyncFallthroughResourceWithRawResponse",
+    "FallthroughResourceWithStreamingResponse",
+    "AsyncFallthroughResourceWithStreamingResponse",
+    "ExpressionTemplateResource",
+    "AsyncExpressionTemplateResource",
+    "ExpressionTemplateResourceWithRawResponse",
+    "AsyncExpressionTemplateResourceWithRawResponse",
+    "ExpressionTemplateResourceWithStreamingResponse",
+    "AsyncExpressionTemplateResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/api_gateway/expression_template/expression_template.py b/src/cloudflare/resources/api_gateway/expression_template/expression_template.py
new file mode 100644
index 00000000000..e5173f78539
--- /dev/null
+++ b/src/cloudflare/resources/api_gateway/expression_template/expression_template.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from ...._compat import cached_property
+from .fallthrough import (
+    FallthroughResource,
+    AsyncFallthroughResource,
+    FallthroughResourceWithRawResponse,
+    AsyncFallthroughResourceWithRawResponse,
+    FallthroughResourceWithStreamingResponse,
+    AsyncFallthroughResourceWithStreamingResponse,
+)
+from ...._resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["ExpressionTemplateResource", "AsyncExpressionTemplateResource"]
+
+
+class ExpressionTemplateResource(SyncAPIResource):
+    @cached_property
+    def fallthrough(self) -> FallthroughResource:
+        return FallthroughResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> ExpressionTemplateResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ExpressionTemplateResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ExpressionTemplateResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ExpressionTemplateResourceWithStreamingResponse(self)
+
+
+class AsyncExpressionTemplateResource(AsyncAPIResource):
+    @cached_property
+    def fallthrough(self) -> AsyncFallthroughResource:
+        return AsyncFallthroughResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncExpressionTemplateResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncExpressionTemplateResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncExpressionTemplateResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncExpressionTemplateResourceWithStreamingResponse(self)
+
+
+class ExpressionTemplateResourceWithRawResponse:
+    def __init__(self, expression_template: ExpressionTemplateResource) -> None:
+        self._expression_template = expression_template
+
+    @cached_property
+    def fallthrough(self) -> FallthroughResourceWithRawResponse:
+        return FallthroughResourceWithRawResponse(self._expression_template.fallthrough)
+
+
+class AsyncExpressionTemplateResourceWithRawResponse:
+    def __init__(self, expression_template: AsyncExpressionTemplateResource) -> None:
+        self._expression_template = expression_template
+
+    @cached_property
+    def fallthrough(self) -> AsyncFallthroughResourceWithRawResponse:
+        return AsyncFallthroughResourceWithRawResponse(self._expression_template.fallthrough)
+
+
+class ExpressionTemplateResourceWithStreamingResponse:
+    def __init__(self, expression_template: ExpressionTemplateResource) -> None:
+        self._expression_template = expression_template
+
+    @cached_property
+    def fallthrough(self) -> FallthroughResourceWithStreamingResponse:
+        return FallthroughResourceWithStreamingResponse(self._expression_template.fallthrough)
+
+
+class AsyncExpressionTemplateResourceWithStreamingResponse:
+    def __init__(self, expression_template: AsyncExpressionTemplateResource) -> None:
+        self._expression_template = expression_template
+
+    @cached_property
+    def fallthrough(self) -> AsyncFallthroughResourceWithStreamingResponse:
+        return AsyncFallthroughResourceWithStreamingResponse(self._expression_template.fallthrough)
diff --git a/src/cloudflare/resources/api_gateway/expression_template/fallthrough.py b/src/cloudflare/resources/api_gateway/expression_template/fallthrough.py
new file mode 100644
index 00000000000..1434470cfad
--- /dev/null
+++ b/src/cloudflare/resources/api_gateway/expression_template/fallthrough.py
@@ -0,0 +1,188 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, SequenceNotStr, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.api_gateway.expression_template import fallthrough_create_params
+from ....types.api_gateway.expression_template.fallthrough_create_response import FallthroughCreateResponse
+
+__all__ = ["FallthroughResource", "AsyncFallthroughResource"]
+
+
+class FallthroughResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> FallthroughResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return FallthroughResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> FallthroughResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return FallthroughResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        zone_id: str,
+        hosts: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> FallthroughCreateResponse:
+        """
+        Generate fallthrough WAF expression template from a set of API hosts
+
+        Args:
+          zone_id: Identifier.
+
+          hosts: List of hosts to be targeted in the expression
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/api_gateway/expression-template/fallthrough",
+            body=maybe_transform({"hosts": hosts}, fallthrough_create_params.FallthroughCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[FallthroughCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[FallthroughCreateResponse], ResultWrapper[FallthroughCreateResponse]),
+        )
+
+
+class AsyncFallthroughResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncFallthroughResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncFallthroughResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncFallthroughResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncFallthroughResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        hosts: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> FallthroughCreateResponse:
+        """
+        Generate fallthrough WAF expression template from a set of API hosts
+
+        Args:
+          zone_id: Identifier.
+
+          hosts: List of hosts to be targeted in the expression
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/api_gateway/expression-template/fallthrough",
+            body=await async_maybe_transform({"hosts": hosts}, fallthrough_create_params.FallthroughCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[FallthroughCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[FallthroughCreateResponse], ResultWrapper[FallthroughCreateResponse]),
+        )
+
+
+class FallthroughResourceWithRawResponse:
+    def __init__(self, fallthrough: FallthroughResource) -> None:
+        self._fallthrough = fallthrough
+
+        self.create = to_raw_response_wrapper(
+            fallthrough.create,
+        )
+
+
+class AsyncFallthroughResourceWithRawResponse:
+    def __init__(self, fallthrough: AsyncFallthroughResource) -> None:
+        self._fallthrough = fallthrough
+
+        self.create = async_to_raw_response_wrapper(
+            fallthrough.create,
+        )
+
+
+class FallthroughResourceWithStreamingResponse:
+    def __init__(self, fallthrough: FallthroughResource) -> None:
+        self._fallthrough = fallthrough
+
+        self.create = to_streamed_response_wrapper(
+            fallthrough.create,
+        )
+
+
+class AsyncFallthroughResourceWithStreamingResponse:
+    def __init__(self, fallthrough: AsyncFallthroughResource) -> None:
+        self._fallthrough = fallthrough
+
+        self.create = async_to_streamed_response_wrapper(
+            fallthrough.create,
+        )
diff --git a/src/cloudflare/resources/api_gateway/operations/operations.py b/src/cloudflare/resources/api_gateway/operations/operations.py
index cb5b7673217..1a6038c3688 100644
--- a/src/cloudflare/resources/api_gateway/operations/operations.py
+++ b/src/cloudflare/resources/api_gateway/operations/operations.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -21,7 +18,7 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ....pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ...._base_client import AsyncPaginator, make_request_options
 from .schema_validation import (
     SchemaValidationResource,
@@ -31,11 +28,18 @@
     SchemaValidationResourceWithStreamingResponse,
     AsyncSchemaValidationResourceWithStreamingResponse,
 )
-from ....types.api_gateway import operation_get_params, operation_list_params, operation_create_params
+from ....types.api_gateway import (
+    operation_get_params,
+    operation_list_params,
+    operation_create_params,
+    operation_bulk_create_params,
+)
 from ....types.api_gateway.operation_get_response import OperationGetResponse
 from ....types.api_gateway.operation_list_response import OperationListResponse
 from ....types.api_gateway.operation_create_response import OperationCreateResponse
 from ....types.api_gateway.operation_delete_response import OperationDeleteResponse
+from ....types.api_gateway.operation_bulk_create_response import OperationBulkCreateResponse
+from ....types.api_gateway.operation_bulk_delete_response import OperationBulkDeleteResponse
 
 __all__ = ["OperationsResource", "AsyncOperationsResource"]
 
@@ -47,34 +51,56 @@ def schema_validation(self) -> SchemaValidationResource:
 
     @cached_property
     def with_raw_response(self) -> OperationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return OperationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> OperationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return OperationsResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         zone_id: str,
-        body: Iterable[operation_create_params.Body],
+        endpoint: str,
+        host: str,
+        method: Literal["GET", "POST", "HEAD", "OPTIONS", "PUT", "DELETE", "CONNECT", "PATCH", "TRACE"],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> OperationCreateResponse:
-        """Add one or more operations to a zone.
+        """Add one operation to a zone.
 
-        Endpoints can contain path variables.
-        Host, method, endpoint will be normalized to a canoncial form when creating an
-        operation and must be unique on the zone. Inserting an operation that matches an
-        existing one will return the record of the already existing operation and update
-        its last_updated date.
+        Endpoints can contain path variables. Host, method,
+        endpoint will be normalized to a canoncial form when creating an operation and
+        must be unique on the zone. Inserting an operation that matches an existing one
+        will return the record of the already existing operation and update its
+        last_updated date.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
+
+          endpoint: The endpoint which can contain path parameter templates in curly braces, each
+              will be replaced from left to right with {varN}, starting with {var1}, during
+              insertion. This will further be Cloudflare-normalized upon insertion. See:
+              https://developers.cloudflare.com/rules/normalization/how-it-works/.
+
+          host: RFC3986-compliant host.
+
+          method: The HTTP method used to access the endpoint.
 
           extra_headers: Send extra headers
 
@@ -87,8 +113,15 @@ def create(
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._post(
-            f"/zones/{zone_id}/api_gateway/operations",
-            body=maybe_transform(body, operation_create_params.OperationCreateParams),
+            f"/zones/{zone_id}/api_gateway/operations/item",
+            body=maybe_transform(
+                {
+                    "endpoint": endpoint,
+                    "host": host,
+                    "method": method,
+                },
+                operation_create_params.OperationCreateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -103,26 +136,26 @@ def list(
         self,
         *,
         zone_id: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        endpoint: str | NotGiven = NOT_GIVEN,
-        feature: List[Literal["thresholds", "parameter_schemas", "schema_info"]] | NotGiven = NOT_GIVEN,
-        host: List[str] | NotGiven = NOT_GIVEN,
-        method: List[str] | NotGiven = NOT_GIVEN,
-        order: Literal["method", "host", "endpoint", "thresholds.$key"] | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        endpoint: str | Omit = omit,
+        feature: List[Literal["thresholds", "parameter_schemas", "schema_info"]] | Omit = omit,
+        host: SequenceNotStr[str] | Omit = omit,
+        method: SequenceNotStr[str] | Omit = omit,
+        order: Literal["method", "host", "endpoint", "thresholds.$key"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[OperationListResponse]:
         """
         Retrieve information about all operations on a zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           direction: Direction to order results.
 
@@ -188,15 +221,15 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> OperationDeleteResponse:
         """
         Delete an operation
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          operation_id: UUID
+          operation_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -218,26 +251,105 @@ def delete(
             cast_to=OperationDeleteResponse,
         )
 
+    def bulk_create(
+        self,
+        *,
+        zone_id: str,
+        body: Iterable[operation_bulk_create_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[OperationBulkCreateResponse]:
+        """Add one or more operations to a zone.
+
+        Endpoints can contain path variables.
+        Host, method, endpoint will be normalized to a canoncial form when creating an
+        operation and must be unique on the zone. Inserting an operation that matches an
+        existing one will return the record of the already existing operation and update
+        its last_updated date.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/api_gateway/operations",
+            page=SyncSinglePage[OperationBulkCreateResponse],
+            body=maybe_transform(body, Iterable[operation_bulk_create_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=OperationBulkCreateResponse,
+            method="post",
+        )
+
+    def bulk_delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OperationBulkDeleteResponse:
+        """
+        Delete multiple operations
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._delete(
+            f"/zones/{zone_id}/api_gateway/operations",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=OperationBulkDeleteResponse,
+        )
+
     def get(
         self,
         operation_id: str,
         *,
         zone_id: str,
-        feature: List[Literal["thresholds", "parameter_schemas", "schema_info"]] | NotGiven = NOT_GIVEN,
+        feature: List[Literal["thresholds", "parameter_schemas", "schema_info"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> OperationGetResponse:
         """
         Retrieve information about an operation
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          operation_id: UUID
+          operation_id: UUID.
 
           feature: Add feature(s) to the results. The feature name that is given here corresponds
               to the resulting feature object. Have a look at the top-level object description
@@ -276,34 +388,56 @@ def schema_validation(self) -> AsyncSchemaValidationResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncOperationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncOperationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncOperationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncOperationsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         zone_id: str,
-        body: Iterable[operation_create_params.Body],
+        endpoint: str,
+        host: str,
+        method: Literal["GET", "POST", "HEAD", "OPTIONS", "PUT", "DELETE", "CONNECT", "PATCH", "TRACE"],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> OperationCreateResponse:
-        """Add one or more operations to a zone.
+        """Add one operation to a zone.
 
-        Endpoints can contain path variables.
-        Host, method, endpoint will be normalized to a canoncial form when creating an
-        operation and must be unique on the zone. Inserting an operation that matches an
-        existing one will return the record of the already existing operation and update
-        its last_updated date.
+        Endpoints can contain path variables. Host, method,
+        endpoint will be normalized to a canoncial form when creating an operation and
+        must be unique on the zone. Inserting an operation that matches an existing one
+        will return the record of the already existing operation and update its
+        last_updated date.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
+
+          endpoint: The endpoint which can contain path parameter templates in curly braces, each
+              will be replaced from left to right with {varN}, starting with {var1}, during
+              insertion. This will further be Cloudflare-normalized upon insertion. See:
+              https://developers.cloudflare.com/rules/normalization/how-it-works/.
+
+          host: RFC3986-compliant host.
+
+          method: The HTTP method used to access the endpoint.
 
           extra_headers: Send extra headers
 
@@ -316,8 +450,15 @@ async def create(
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return await self._post(
-            f"/zones/{zone_id}/api_gateway/operations",
-            body=await async_maybe_transform(body, operation_create_params.OperationCreateParams),
+            f"/zones/{zone_id}/api_gateway/operations/item",
+            body=await async_maybe_transform(
+                {
+                    "endpoint": endpoint,
+                    "host": host,
+                    "method": method,
+                },
+                operation_create_params.OperationCreateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -332,26 +473,26 @@ def list(
         self,
         *,
         zone_id: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        endpoint: str | NotGiven = NOT_GIVEN,
-        feature: List[Literal["thresholds", "parameter_schemas", "schema_info"]] | NotGiven = NOT_GIVEN,
-        host: List[str] | NotGiven = NOT_GIVEN,
-        method: List[str] | NotGiven = NOT_GIVEN,
-        order: Literal["method", "host", "endpoint", "thresholds.$key"] | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        endpoint: str | Omit = omit,
+        feature: List[Literal["thresholds", "parameter_schemas", "schema_info"]] | Omit = omit,
+        host: SequenceNotStr[str] | Omit = omit,
+        method: SequenceNotStr[str] | Omit = omit,
+        order: Literal["method", "host", "endpoint", "thresholds.$key"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[OperationListResponse, AsyncV4PagePaginationArray[OperationListResponse]]:
         """
         Retrieve information about all operations on a zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           direction: Direction to order results.
 
@@ -417,15 +558,15 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> OperationDeleteResponse:
         """
         Delete an operation
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          operation_id: UUID
+          operation_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -447,26 +588,105 @@ async def delete(
             cast_to=OperationDeleteResponse,
         )
 
+    def bulk_create(
+        self,
+        *,
+        zone_id: str,
+        body: Iterable[operation_bulk_create_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[OperationBulkCreateResponse, AsyncSinglePage[OperationBulkCreateResponse]]:
+        """Add one or more operations to a zone.
+
+        Endpoints can contain path variables.
+        Host, method, endpoint will be normalized to a canoncial form when creating an
+        operation and must be unique on the zone. Inserting an operation that matches an
+        existing one will return the record of the already existing operation and update
+        its last_updated date.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/api_gateway/operations",
+            page=AsyncSinglePage[OperationBulkCreateResponse],
+            body=maybe_transform(body, Iterable[operation_bulk_create_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=OperationBulkCreateResponse,
+            method="post",
+        )
+
+    async def bulk_delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OperationBulkDeleteResponse:
+        """
+        Delete multiple operations
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._delete(
+            f"/zones/{zone_id}/api_gateway/operations",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=OperationBulkDeleteResponse,
+        )
+
     async def get(
         self,
         operation_id: str,
         *,
         zone_id: str,
-        feature: List[Literal["thresholds", "parameter_schemas", "schema_info"]] | NotGiven = NOT_GIVEN,
+        feature: List[Literal["thresholds", "parameter_schemas", "schema_info"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> OperationGetResponse:
         """
         Retrieve information about an operation
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          operation_id: UUID
+          operation_id: UUID.
 
           feature: Add feature(s) to the results. The feature name that is given here corresponds
               to the resulting feature object. Have a look at the top-level object description
@@ -511,6 +731,12 @@ def __init__(self, operations: OperationsResource) -> None:
         self.delete = to_raw_response_wrapper(
             operations.delete,
         )
+        self.bulk_create = to_raw_response_wrapper(
+            operations.bulk_create,
+        )
+        self.bulk_delete = to_raw_response_wrapper(
+            operations.bulk_delete,
+        )
         self.get = to_raw_response_wrapper(
             operations.get,
         )
@@ -533,6 +759,12 @@ def __init__(self, operations: AsyncOperationsResource) -> None:
         self.delete = async_to_raw_response_wrapper(
             operations.delete,
         )
+        self.bulk_create = async_to_raw_response_wrapper(
+            operations.bulk_create,
+        )
+        self.bulk_delete = async_to_raw_response_wrapper(
+            operations.bulk_delete,
+        )
         self.get = async_to_raw_response_wrapper(
             operations.get,
         )
@@ -555,6 +787,12 @@ def __init__(self, operations: OperationsResource) -> None:
         self.delete = to_streamed_response_wrapper(
             operations.delete,
         )
+        self.bulk_create = to_streamed_response_wrapper(
+            operations.bulk_create,
+        )
+        self.bulk_delete = to_streamed_response_wrapper(
+            operations.bulk_delete,
+        )
         self.get = to_streamed_response_wrapper(
             operations.get,
         )
@@ -577,6 +815,12 @@ def __init__(self, operations: AsyncOperationsResource) -> None:
         self.delete = async_to_streamed_response_wrapper(
             operations.delete,
         )
+        self.bulk_create = async_to_streamed_response_wrapper(
+            operations.bulk_create,
+        )
+        self.bulk_delete = async_to_streamed_response_wrapper(
+            operations.bulk_delete,
+        )
         self.get = async_to_streamed_response_wrapper(
             operations.get,
         )
diff --git a/src/cloudflare/resources/api_gateway/operations/schema_validation.py b/src/cloudflare/resources/api_gateway/operations/schema_validation.py
index 75fbceb4e40..5b526d920a8 100644
--- a/src/cloudflare/resources/api_gateway/operations/schema_validation.py
+++ b/src/cloudflare/resources/api_gateway/operations/schema_validation.py
@@ -2,16 +2,14 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -38,32 +36,46 @@
 class SchemaValidationResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SchemaValidationResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SchemaValidationResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SchemaValidationResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SchemaValidationResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     def update(
         self,
         operation_id: str,
         *,
         zone_id: str,
-        mitigation_action: Optional[Literal["log", "block", "none"]] | NotGiven = NOT_GIVEN,
+        mitigation_action: Optional[Literal["log", "block", "none"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SchemaValidationUpdateResponse:
         """
         Updates operation-level schema validation settings on the zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          operation_id: UUID
+          operation_id: UUID.
 
           mitigation_action: When set, this applies a mitigation action to this operation
 
@@ -97,6 +109,9 @@ def update(
             cast_to=SchemaValidationUpdateResponse,
         )
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     def edit(
         self,
         *,
@@ -107,13 +122,13 @@ def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SettingsMultipleRequest:
         """
         Updates multiple operation-level schema validation settings on the zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -138,6 +153,9 @@ def edit(
             cast_to=cast(Type[SettingsMultipleRequest], ResultWrapper[SettingsMultipleRequest]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     def get(
         self,
         operation_id: str,
@@ -148,15 +166,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SchemaValidationGetResponse:
         """
         Retrieves operation-level schema validation settings on the zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          operation_id: UUID
+          operation_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -182,32 +200,46 @@ def get(
 class AsyncSchemaValidationResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSchemaValidationResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSchemaValidationResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSchemaValidationResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSchemaValidationResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     async def update(
         self,
         operation_id: str,
         *,
         zone_id: str,
-        mitigation_action: Optional[Literal["log", "block", "none"]] | NotGiven = NOT_GIVEN,
+        mitigation_action: Optional[Literal["log", "block", "none"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SchemaValidationUpdateResponse:
         """
         Updates operation-level schema validation settings on the zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          operation_id: UUID
+          operation_id: UUID.
 
           mitigation_action: When set, this applies a mitigation action to this operation
 
@@ -241,6 +273,9 @@ async def update(
             cast_to=SchemaValidationUpdateResponse,
         )
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     async def edit(
         self,
         *,
@@ -251,13 +286,13 @@ async def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SettingsMultipleRequest:
         """
         Updates multiple operation-level schema validation settings on the zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -284,6 +319,9 @@ async def edit(
             cast_to=cast(Type[SettingsMultipleRequest], ResultWrapper[SettingsMultipleRequest]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     async def get(
         self,
         operation_id: str,
@@ -294,15 +332,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SchemaValidationGetResponse:
         """
         Retrieves operation-level schema validation settings on the zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          operation_id: UUID
+          operation_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -329,14 +367,20 @@ class SchemaValidationResourceWithRawResponse:
     def __init__(self, schema_validation: SchemaValidationResource) -> None:
         self._schema_validation = schema_validation
 
-        self.update = to_raw_response_wrapper(
-            schema_validation.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                schema_validation.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = to_raw_response_wrapper(
-            schema_validation.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                schema_validation.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_raw_response_wrapper(
-            schema_validation.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                schema_validation.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -344,14 +388,20 @@ class AsyncSchemaValidationResourceWithRawResponse:
     def __init__(self, schema_validation: AsyncSchemaValidationResource) -> None:
         self._schema_validation = schema_validation
 
-        self.update = async_to_raw_response_wrapper(
-            schema_validation.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                schema_validation.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = async_to_raw_response_wrapper(
-            schema_validation.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                schema_validation.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_raw_response_wrapper(
-            schema_validation.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                schema_validation.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -359,14 +409,20 @@ class SchemaValidationResourceWithStreamingResponse:
     def __init__(self, schema_validation: SchemaValidationResource) -> None:
         self._schema_validation = schema_validation
 
-        self.update = to_streamed_response_wrapper(
-            schema_validation.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                schema_validation.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = to_streamed_response_wrapper(
-            schema_validation.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                schema_validation.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_streamed_response_wrapper(
-            schema_validation.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                schema_validation.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -374,12 +430,18 @@ class AsyncSchemaValidationResourceWithStreamingResponse:
     def __init__(self, schema_validation: AsyncSchemaValidationResource) -> None:
         self._schema_validation = schema_validation
 
-        self.update = async_to_streamed_response_wrapper(
-            schema_validation.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                schema_validation.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = async_to_streamed_response_wrapper(
-            schema_validation.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                schema_validation.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_streamed_response_wrapper(
-            schema_validation.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                schema_validation.get,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/api_gateway/schemas.py b/src/cloudflare/resources/api_gateway/schemas.py
index 501680e88a3..2559e6e21c2 100644
--- a/src/cloudflare/resources/api_gateway/schemas.py
+++ b/src/cloudflare/resources/api_gateway/schemas.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -31,30 +28,41 @@
 class SchemasResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SchemasResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SchemasResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SchemasResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SchemasResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         zone_id: str,
-        feature: List[Literal["thresholds", "parameter_schemas", "schema_info"]] | NotGiven = NOT_GIVEN,
-        host: List[str] | NotGiven = NOT_GIVEN,
+        feature: List[Literal["thresholds", "parameter_schemas", "schema_info"]] | Omit = omit,
+        host: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SchemaListResponse:
         """
         Retrieve operations and features as OpenAPI schemas
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           feature: Add feature(s) to the results. The feature name that is given here corresponds
               to the resulting feature object. Have a look at the top-level object description
@@ -95,30 +103,41 @@ def list(
 class AsyncSchemasResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSchemasResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSchemasResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSchemasResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSchemasResourceWithStreamingResponse(self)
 
     async def list(
         self,
         *,
         zone_id: str,
-        feature: List[Literal["thresholds", "parameter_schemas", "schema_info"]] | NotGiven = NOT_GIVEN,
-        host: List[str] | NotGiven = NOT_GIVEN,
+        feature: List[Literal["thresholds", "parameter_schemas", "schema_info"]] | Omit = omit,
+        host: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SchemaListResponse:
         """
         Retrieve operations and features as OpenAPI schemas
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           feature: Add feature(s) to the results. The feature name that is given here corresponds
               to the resulting feature object. Have a look at the top-level object description
diff --git a/src/cloudflare/resources/api_gateway/settings/schema_validation.py b/src/cloudflare/resources/api_gateway/settings/schema_validation.py
index edfbacc9040..edc6f969c00 100644
--- a/src/cloudflare/resources/api_gateway/settings/schema_validation.py
+++ b/src/cloudflare/resources/api_gateway/settings/schema_validation.py
@@ -2,16 +2,14 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import Optional
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -30,30 +28,44 @@
 class SchemaValidationResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SchemaValidationResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SchemaValidationResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SchemaValidationResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SchemaValidationResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     def update(
         self,
         *,
         zone_id: str,
         validation_default_mitigation_action: Literal["none", "log", "block"],
-        validation_override_mitigation_action: Optional[Literal["none", "disable_override"]] | NotGiven = NOT_GIVEN,
+        validation_override_mitigation_action: Optional[Literal["none", "disable_override"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Settings:
         """
         Updates zone level schema validation settings on the zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           validation_default_mitigation_action: The default mitigation action used when there is no mitigation action defined on
               the operation
@@ -98,24 +110,27 @@ def update(
             cast_to=Settings,
         )
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     def edit(
         self,
         *,
         zone_id: str,
-        validation_default_mitigation_action: Optional[Literal["none", "log", "block"]] | NotGiven = NOT_GIVEN,
-        validation_override_mitigation_action: Optional[Literal["none", "disable_override"]] | NotGiven = NOT_GIVEN,
+        validation_default_mitigation_action: Optional[Literal["none", "log", "block"]] | Omit = omit,
+        validation_override_mitigation_action: Optional[Literal["none", "disable_override"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Settings:
         """
         Updates zone level schema validation settings on the zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           validation_default_mitigation_action: The default mitigation action used when there is no mitigation action defined on
               the operation Mitigation actions are as follows:
@@ -161,6 +176,9 @@ def edit(
             cast_to=Settings,
         )
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     def get(
         self,
         *,
@@ -170,13 +188,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Settings:
         """
         Retrieves zone level schema validation settings currently set on the zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -200,30 +218,44 @@ def get(
 class AsyncSchemaValidationResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSchemaValidationResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSchemaValidationResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSchemaValidationResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSchemaValidationResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     async def update(
         self,
         *,
         zone_id: str,
         validation_default_mitigation_action: Literal["none", "log", "block"],
-        validation_override_mitigation_action: Optional[Literal["none", "disable_override"]] | NotGiven = NOT_GIVEN,
+        validation_override_mitigation_action: Optional[Literal["none", "disable_override"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Settings:
         """
         Updates zone level schema validation settings on the zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           validation_default_mitigation_action: The default mitigation action used when there is no mitigation action defined on
               the operation
@@ -268,24 +300,27 @@ async def update(
             cast_to=Settings,
         )
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     async def edit(
         self,
         *,
         zone_id: str,
-        validation_default_mitigation_action: Optional[Literal["none", "log", "block"]] | NotGiven = NOT_GIVEN,
-        validation_override_mitigation_action: Optional[Literal["none", "disable_override"]] | NotGiven = NOT_GIVEN,
+        validation_default_mitigation_action: Optional[Literal["none", "log", "block"]] | Omit = omit,
+        validation_override_mitigation_action: Optional[Literal["none", "disable_override"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Settings:
         """
         Updates zone level schema validation settings on the zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           validation_default_mitigation_action: The default mitigation action used when there is no mitigation action defined on
               the operation Mitigation actions are as follows:
@@ -331,6 +366,9 @@ async def edit(
             cast_to=Settings,
         )
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     async def get(
         self,
         *,
@@ -340,13 +378,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Settings:
         """
         Retrieves zone level schema validation settings currently set on the zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -371,14 +409,20 @@ class SchemaValidationResourceWithRawResponse:
     def __init__(self, schema_validation: SchemaValidationResource) -> None:
         self._schema_validation = schema_validation
 
-        self.update = to_raw_response_wrapper(
-            schema_validation.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                schema_validation.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = to_raw_response_wrapper(
-            schema_validation.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                schema_validation.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_raw_response_wrapper(
-            schema_validation.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                schema_validation.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -386,14 +430,20 @@ class AsyncSchemaValidationResourceWithRawResponse:
     def __init__(self, schema_validation: AsyncSchemaValidationResource) -> None:
         self._schema_validation = schema_validation
 
-        self.update = async_to_raw_response_wrapper(
-            schema_validation.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                schema_validation.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = async_to_raw_response_wrapper(
-            schema_validation.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                schema_validation.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_raw_response_wrapper(
-            schema_validation.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                schema_validation.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -401,14 +451,20 @@ class SchemaValidationResourceWithStreamingResponse:
     def __init__(self, schema_validation: SchemaValidationResource) -> None:
         self._schema_validation = schema_validation
 
-        self.update = to_streamed_response_wrapper(
-            schema_validation.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                schema_validation.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = to_streamed_response_wrapper(
-            schema_validation.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                schema_validation.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_streamed_response_wrapper(
-            schema_validation.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                schema_validation.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -416,12 +472,18 @@ class AsyncSchemaValidationResourceWithStreamingResponse:
     def __init__(self, schema_validation: AsyncSchemaValidationResource) -> None:
         self._schema_validation = schema_validation
 
-        self.update = async_to_streamed_response_wrapper(
-            schema_validation.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                schema_validation.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = async_to_streamed_response_wrapper(
-            schema_validation.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                schema_validation.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_streamed_response_wrapper(
-            schema_validation.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                schema_validation.get,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/api_gateway/settings/settings.py b/src/cloudflare/resources/api_gateway/settings/settings.py
index 867736caef9..543c2a869d1 100644
--- a/src/cloudflare/resources/api_gateway/settings/settings.py
+++ b/src/cloudflare/resources/api_gateway/settings/settings.py
@@ -23,10 +23,21 @@ def schema_validation(self) -> SchemaValidationResource:
 
     @cached_property
     def with_raw_response(self) -> SettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SettingsResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def schema_validation(self) -> AsyncSchemaValidationResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSettingsResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/api_gateway/user_schemas/__init__.py b/src/cloudflare/resources/api_gateway/user_schemas/__init__.py
index 40bf4737372..7c9f80a9f0a 100644
--- a/src/cloudflare/resources/api_gateway/user_schemas/__init__.py
+++ b/src/cloudflare/resources/api_gateway/user_schemas/__init__.py
@@ -1,5 +1,13 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from .hosts import (
+    HostsResource,
+    AsyncHostsResource,
+    HostsResourceWithRawResponse,
+    AsyncHostsResourceWithRawResponse,
+    HostsResourceWithStreamingResponse,
+    AsyncHostsResourceWithStreamingResponse,
+)
 from .operations import (
     OperationsResource,
     AsyncOperationsResource,
@@ -24,6 +32,12 @@
     "AsyncOperationsResourceWithRawResponse",
     "OperationsResourceWithStreamingResponse",
     "AsyncOperationsResourceWithStreamingResponse",
+    "HostsResource",
+    "AsyncHostsResource",
+    "HostsResourceWithRawResponse",
+    "AsyncHostsResourceWithRawResponse",
+    "HostsResourceWithStreamingResponse",
+    "AsyncHostsResourceWithStreamingResponse",
     "UserSchemasResource",
     "AsyncUserSchemasResource",
     "UserSchemasResourceWithRawResponse",
diff --git a/src/cloudflare/resources/api_gateway/user_schemas/hosts.py b/src/cloudflare/resources/api_gateway/user_schemas/hosts.py
new file mode 100644
index 00000000000..01861b64473
--- /dev/null
+++ b/src/cloudflare/resources/api_gateway/user_schemas/hosts.py
@@ -0,0 +1,220 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import typing_extensions
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.api_gateway.user_schemas import host_list_params
+from ....types.api_gateway.user_schemas.host_list_response import HostListResponse
+
+__all__ = ["HostsResource", "AsyncHostsResource"]
+
+
+class HostsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> HostsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return HostsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> HostsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return HostsResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
+    def list(
+        self,
+        *,
+        zone_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[HostListResponse]:
+        """
+        Retrieve schema hosts in a zone
+
+        Args:
+          zone_id: Identifier.
+
+          page: Page number of paginated results.
+
+          per_page: Maximum number of results per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/api_gateway/user_schemas/hosts",
+            page=SyncV4PagePaginationArray[HostListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    host_list_params.HostListParams,
+                ),
+            ),
+            model=HostListResponse,
+        )
+
+
+class AsyncHostsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncHostsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncHostsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncHostsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncHostsResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
+    def list(
+        self,
+        *,
+        zone_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[HostListResponse, AsyncV4PagePaginationArray[HostListResponse]]:
+        """
+        Retrieve schema hosts in a zone
+
+        Args:
+          zone_id: Identifier.
+
+          page: Page number of paginated results.
+
+          per_page: Maximum number of results per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/api_gateway/user_schemas/hosts",
+            page=AsyncV4PagePaginationArray[HostListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    host_list_params.HostListParams,
+                ),
+            ),
+            model=HostListResponse,
+        )
+
+
+class HostsResourceWithRawResponse:
+    def __init__(self, hosts: HostsResource) -> None:
+        self._hosts = hosts
+
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                hosts.list,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncHostsResourceWithRawResponse:
+    def __init__(self, hosts: AsyncHostsResource) -> None:
+        self._hosts = hosts
+
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                hosts.list,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class HostsResourceWithStreamingResponse:
+    def __init__(self, hosts: HostsResource) -> None:
+        self._hosts = hosts
+
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                hosts.list,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncHostsResourceWithStreamingResponse:
+    def __init__(self, hosts: AsyncHostsResource) -> None:
+        self._hosts = hosts
+
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                hosts.list,  # pyright: ignore[reportDeprecated],
+            )
+        )
diff --git a/src/cloudflare/resources/api_gateway/user_schemas/operations.py b/src/cloudflare/resources/api_gateway/user_schemas/operations.py
index 18cb925ea95..d5a04f5f875 100644
--- a/src/cloudflare/resources/api_gateway/user_schemas/operations.py
+++ b/src/cloudflare/resources/api_gateway/user_schemas/operations.py
@@ -2,12 +2,13 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import Any, List, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
 from ...._utils import maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
@@ -28,30 +29,44 @@
 class OperationsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> OperationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return OperationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> OperationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return OperationsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     def list(
         self,
         schema_id: str,
         *,
         zone_id: str,
-        endpoint: str | NotGiven = NOT_GIVEN,
-        feature: List[Literal["thresholds", "parameter_schemas", "schema_info"]] | NotGiven = NOT_GIVEN,
-        host: List[str] | NotGiven = NOT_GIVEN,
-        method: List[str] | NotGiven = NOT_GIVEN,
-        operation_status: Literal["new", "existing"] | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
+        endpoint: str | Omit = omit,
+        feature: List[Literal["thresholds", "parameter_schemas", "schema_info"]] | Omit = omit,
+        host: SequenceNotStr[str] | Omit = omit,
+        method: SequenceNotStr[str] | Omit = omit,
+        operation_status: Literal["new", "existing"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[OperationListResponse]:
         """Retrieves all operations from the schema.
 
@@ -59,7 +74,7 @@ def list(
         Shield Endpoint Management will be returned as full operations.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           endpoint: Filter results to only include endpoints containing this pattern.
 
@@ -120,30 +135,44 @@ def list(
 class AsyncOperationsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncOperationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncOperationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncOperationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncOperationsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     def list(
         self,
         schema_id: str,
         *,
         zone_id: str,
-        endpoint: str | NotGiven = NOT_GIVEN,
-        feature: List[Literal["thresholds", "parameter_schemas", "schema_info"]] | NotGiven = NOT_GIVEN,
-        host: List[str] | NotGiven = NOT_GIVEN,
-        method: List[str] | NotGiven = NOT_GIVEN,
-        operation_status: Literal["new", "existing"] | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
+        endpoint: str | Omit = omit,
+        feature: List[Literal["thresholds", "parameter_schemas", "schema_info"]] | Omit = omit,
+        host: SequenceNotStr[str] | Omit = omit,
+        method: SequenceNotStr[str] | Omit = omit,
+        operation_status: Literal["new", "existing"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[OperationListResponse, AsyncV4PagePaginationArray[OperationListResponse]]:
         """Retrieves all operations from the schema.
 
@@ -151,7 +180,7 @@ def list(
         Shield Endpoint Management will be returned as full operations.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           endpoint: Filter results to only include endpoints containing this pattern.
 
@@ -213,8 +242,10 @@ class OperationsResourceWithRawResponse:
     def __init__(self, operations: OperationsResource) -> None:
         self._operations = operations
 
-        self.list = to_raw_response_wrapper(
-            operations.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                operations.list,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -222,8 +253,10 @@ class AsyncOperationsResourceWithRawResponse:
     def __init__(self, operations: AsyncOperationsResource) -> None:
         self._operations = operations
 
-        self.list = async_to_raw_response_wrapper(
-            operations.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                operations.list,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -231,8 +264,10 @@ class OperationsResourceWithStreamingResponse:
     def __init__(self, operations: OperationsResource) -> None:
         self._operations = operations
 
-        self.list = to_streamed_response_wrapper(
-            operations.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                operations.list,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -240,6 +275,8 @@ class AsyncOperationsResourceWithStreamingResponse:
     def __init__(self, operations: AsyncOperationsResource) -> None:
         self._operations = operations
 
-        self.list = async_to_streamed_response_wrapper(
-            operations.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                operations.list,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/api_gateway/user_schemas/user_schemas.py b/src/cloudflare/resources/api_gateway/user_schemas/user_schemas.py
index 267ebee4be3..e7d9626a705 100644
--- a/src/cloudflare/resources/api_gateway/user_schemas/user_schemas.py
+++ b/src/cloudflare/resources/api_gateway/user_schemas/user_schemas.py
@@ -2,18 +2,22 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Mapping, Optional, cast
+import typing_extensions
+from typing import Type, Mapping, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven, FileTypes
-from ...._utils import (
-    extract_files,
-    maybe_transform,
-    deepcopy_minimal,
-    async_maybe_transform,
+from .hosts import (
+    HostsResource,
+    AsyncHostsResource,
+    HostsResourceWithRawResponse,
+    AsyncHostsResourceWithRawResponse,
+    HostsResourceWithStreamingResponse,
+    AsyncHostsResourceWithStreamingResponse,
 )
+from ...._types import Body, Omit, Query, Headers, NotGiven, FileTypes, omit, not_given
+from ...._utils import extract_files, maybe_transform, deepcopy_minimal, async_maybe_transform
 from ...._compat import cached_property
 from .operations import (
     OperationsResource,
@@ -39,8 +43,8 @@
     user_schema_list_params,
     user_schema_create_params,
 )
-from ....types.api_gateway.public_schema import PublicSchema
-from ....types.api_gateway.schema_upload import SchemaUpload
+from ....types.api_gateway.old_public_schema import OldPublicSchema
+from ....types.api_gateway.user_schema_create_response import UserSchemaCreateResponse
 from ....types.api_gateway.user_schema_delete_response import UserSchemaDeleteResponse
 
 __all__ = ["UserSchemasResource", "AsyncUserSchemasResource"]
@@ -51,34 +55,52 @@ class UserSchemasResource(SyncAPIResource):
     def operations(self) -> OperationsResource:
         return OperationsResource(self._client)
 
+    @cached_property
+    def hosts(self) -> HostsResource:
+        return HostsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> UserSchemasResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return UserSchemasResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> UserSchemasResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return UserSchemasResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     def create(
         self,
         *,
         zone_id: str,
         file: FileTypes,
         kind: Literal["openapi_v3"],
-        name: str | NotGiven = NOT_GIVEN,
-        validation_enabled: Literal["true", "false"] | NotGiven = NOT_GIVEN,
+        name: str | Omit = omit,
+        validation_enabled: Literal["true", "false"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SchemaUpload:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> UserSchemaCreateResponse:
         """
         Upload a schema to a zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           file: Schema file bytes
 
@@ -120,31 +142,34 @@ def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[SchemaUpload]._unwrapper,
+                post_parser=ResultWrapper[UserSchemaCreateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[SchemaUpload], ResultWrapper[SchemaUpload]),
+            cast_to=cast(Type[UserSchemaCreateResponse], ResultWrapper[UserSchemaCreateResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     def list(
         self,
         *,
         zone_id: str,
-        omit_source: bool | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
-        validation_enabled: bool | NotGiven = NOT_GIVEN,
+        omit_source: bool | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        validation_enabled: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePaginationArray[PublicSchema]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[OldPublicSchema]:
         """
         Retrieve information about all schemas on a zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           omit_source: Omit the source-files of schemas and only retrieve their meta-data.
 
@@ -166,7 +191,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
             f"/zones/{zone_id}/api_gateway/user_schemas",
-            page=SyncV4PagePaginationArray[PublicSchema],
+            page=SyncV4PagePaginationArray[OldPublicSchema],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -182,9 +207,12 @@ def list(
                     user_schema_list_params.UserSchemaListParams,
                 ),
             ),
-            model=PublicSchema,
+            model=OldPublicSchema,
         )
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     def delete(
         self,
         schema_id: str,
@@ -195,13 +223,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[UserSchemaDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> UserSchemaDeleteResponse:
         """
         Delete a schema
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -215,41 +243,35 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not schema_id:
             raise ValueError(f"Expected a non-empty value for `schema_id` but received {schema_id!r}")
-        return cast(
-            Optional[UserSchemaDeleteResponse],
-            self._delete(
-                f"/zones/{zone_id}/api_gateway/user_schemas/{schema_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[UserSchemaDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[UserSchemaDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._delete(
+            f"/zones/{zone_id}/api_gateway/user_schemas/{schema_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
+            cast_to=UserSchemaDeleteResponse,
         )
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     def edit(
         self,
         schema_id: str,
         *,
         zone_id: str,
-        validation_enabled: Literal[True] | NotGiven = NOT_GIVEN,
+        validation_enabled: Literal[True] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PublicSchema:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OldPublicSchema:
         """
         Enable validation for a schema
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           validation_enabled: Flag whether schema is enabled for validation.
 
@@ -275,29 +297,32 @@ def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[PublicSchema]._unwrapper,
+                post_parser=ResultWrapper[OldPublicSchema]._unwrapper,
             ),
-            cast_to=cast(Type[PublicSchema], ResultWrapper[PublicSchema]),
+            cast_to=cast(Type[OldPublicSchema], ResultWrapper[OldPublicSchema]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     def get(
         self,
         schema_id: str,
         *,
         zone_id: str,
-        omit_source: bool | NotGiven = NOT_GIVEN,
+        omit_source: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PublicSchema:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OldPublicSchema:
         """
         Retrieve information about a specific schema on a zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           omit_source: Omit the source-files of schemas and only retrieve their meta-data.
 
@@ -321,9 +346,9 @@ def get(
                 extra_body=extra_body,
                 timeout=timeout,
                 query=maybe_transform({"omit_source": omit_source}, user_schema_get_params.UserSchemaGetParams),
-                post_parser=ResultWrapper[PublicSchema]._unwrapper,
+                post_parser=ResultWrapper[OldPublicSchema]._unwrapper,
             ),
-            cast_to=cast(Type[PublicSchema], ResultWrapper[PublicSchema]),
+            cast_to=cast(Type[OldPublicSchema], ResultWrapper[OldPublicSchema]),
         )
 
 
@@ -332,34 +357,52 @@ class AsyncUserSchemasResource(AsyncAPIResource):
     def operations(self) -> AsyncOperationsResource:
         return AsyncOperationsResource(self._client)
 
+    @cached_property
+    def hosts(self) -> AsyncHostsResource:
+        return AsyncHostsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncUserSchemasResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncUserSchemasResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncUserSchemasResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncUserSchemasResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     async def create(
         self,
         *,
         zone_id: str,
         file: FileTypes,
         kind: Literal["openapi_v3"],
-        name: str | NotGiven = NOT_GIVEN,
-        validation_enabled: Literal["true", "false"] | NotGiven = NOT_GIVEN,
+        name: str | Omit = omit,
+        validation_enabled: Literal["true", "false"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SchemaUpload:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> UserSchemaCreateResponse:
         """
         Upload a schema to a zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           file: Schema file bytes
 
@@ -401,31 +444,34 @@ async def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[SchemaUpload]._unwrapper,
+                post_parser=ResultWrapper[UserSchemaCreateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[SchemaUpload], ResultWrapper[SchemaUpload]),
+            cast_to=cast(Type[UserSchemaCreateResponse], ResultWrapper[UserSchemaCreateResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     def list(
         self,
         *,
         zone_id: str,
-        omit_source: bool | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
-        validation_enabled: bool | NotGiven = NOT_GIVEN,
+        omit_source: bool | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        validation_enabled: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[PublicSchema, AsyncV4PagePaginationArray[PublicSchema]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[OldPublicSchema, AsyncV4PagePaginationArray[OldPublicSchema]]:
         """
         Retrieve information about all schemas on a zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           omit_source: Omit the source-files of schemas and only retrieve their meta-data.
 
@@ -447,7 +493,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
             f"/zones/{zone_id}/api_gateway/user_schemas",
-            page=AsyncV4PagePaginationArray[PublicSchema],
+            page=AsyncV4PagePaginationArray[OldPublicSchema],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -463,9 +509,12 @@ def list(
                     user_schema_list_params.UserSchemaListParams,
                 ),
             ),
-            model=PublicSchema,
+            model=OldPublicSchema,
         )
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     async def delete(
         self,
         schema_id: str,
@@ -476,13 +525,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[UserSchemaDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> UserSchemaDeleteResponse:
         """
         Delete a schema
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -496,41 +545,35 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not schema_id:
             raise ValueError(f"Expected a non-empty value for `schema_id` but received {schema_id!r}")
-        return cast(
-            Optional[UserSchemaDeleteResponse],
-            await self._delete(
-                f"/zones/{zone_id}/api_gateway/user_schemas/{schema_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[UserSchemaDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[UserSchemaDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._delete(
+            f"/zones/{zone_id}/api_gateway/user_schemas/{schema_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
+            cast_to=UserSchemaDeleteResponse,
         )
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     async def edit(
         self,
         schema_id: str,
         *,
         zone_id: str,
-        validation_enabled: Literal[True] | NotGiven = NOT_GIVEN,
+        validation_enabled: Literal[True] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PublicSchema:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OldPublicSchema:
         """
         Enable validation for a schema
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           validation_enabled: Flag whether schema is enabled for validation.
 
@@ -556,29 +599,32 @@ async def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[PublicSchema]._unwrapper,
+                post_parser=ResultWrapper[OldPublicSchema]._unwrapper,
             ),
-            cast_to=cast(Type[PublicSchema], ResultWrapper[PublicSchema]),
+            cast_to=cast(Type[OldPublicSchema], ResultWrapper[OldPublicSchema]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Schema Validation API](https://developers.cloudflare.com/api/resources/schema_validation/) instead."
+    )
     async def get(
         self,
         schema_id: str,
         *,
         zone_id: str,
-        omit_source: bool | NotGiven = NOT_GIVEN,
+        omit_source: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PublicSchema:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OldPublicSchema:
         """
         Retrieve information about a specific schema on a zone
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           omit_source: Omit the source-files of schemas and only retrieve their meta-data.
 
@@ -604,9 +650,9 @@ async def get(
                 query=await async_maybe_transform(
                     {"omit_source": omit_source}, user_schema_get_params.UserSchemaGetParams
                 ),
-                post_parser=ResultWrapper[PublicSchema]._unwrapper,
+                post_parser=ResultWrapper[OldPublicSchema]._unwrapper,
             ),
-            cast_to=cast(Type[PublicSchema], ResultWrapper[PublicSchema]),
+            cast_to=cast(Type[OldPublicSchema], ResultWrapper[OldPublicSchema]),
         )
 
 
@@ -614,97 +660,153 @@ class UserSchemasResourceWithRawResponse:
     def __init__(self, user_schemas: UserSchemasResource) -> None:
         self._user_schemas = user_schemas
 
-        self.create = to_raw_response_wrapper(
-            user_schemas.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                user_schemas.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.list = to_raw_response_wrapper(
-            user_schemas.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                user_schemas.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = to_raw_response_wrapper(
-            user_schemas.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                user_schemas.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = to_raw_response_wrapper(
-            user_schemas.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                user_schemas.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_raw_response_wrapper(
-            user_schemas.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                user_schemas.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
     @cached_property
     def operations(self) -> OperationsResourceWithRawResponse:
         return OperationsResourceWithRawResponse(self._user_schemas.operations)
 
+    @cached_property
+    def hosts(self) -> HostsResourceWithRawResponse:
+        return HostsResourceWithRawResponse(self._user_schemas.hosts)
+
 
 class AsyncUserSchemasResourceWithRawResponse:
     def __init__(self, user_schemas: AsyncUserSchemasResource) -> None:
         self._user_schemas = user_schemas
 
-        self.create = async_to_raw_response_wrapper(
-            user_schemas.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                user_schemas.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.list = async_to_raw_response_wrapper(
-            user_schemas.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                user_schemas.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = async_to_raw_response_wrapper(
-            user_schemas.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                user_schemas.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = async_to_raw_response_wrapper(
-            user_schemas.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                user_schemas.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_raw_response_wrapper(
-            user_schemas.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                user_schemas.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
     @cached_property
     def operations(self) -> AsyncOperationsResourceWithRawResponse:
         return AsyncOperationsResourceWithRawResponse(self._user_schemas.operations)
 
+    @cached_property
+    def hosts(self) -> AsyncHostsResourceWithRawResponse:
+        return AsyncHostsResourceWithRawResponse(self._user_schemas.hosts)
+
 
 class UserSchemasResourceWithStreamingResponse:
     def __init__(self, user_schemas: UserSchemasResource) -> None:
         self._user_schemas = user_schemas
 
-        self.create = to_streamed_response_wrapper(
-            user_schemas.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                user_schemas.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.list = to_streamed_response_wrapper(
-            user_schemas.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                user_schemas.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = to_streamed_response_wrapper(
-            user_schemas.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                user_schemas.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = to_streamed_response_wrapper(
-            user_schemas.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                user_schemas.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_streamed_response_wrapper(
-            user_schemas.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                user_schemas.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
     @cached_property
     def operations(self) -> OperationsResourceWithStreamingResponse:
         return OperationsResourceWithStreamingResponse(self._user_schemas.operations)
 
+    @cached_property
+    def hosts(self) -> HostsResourceWithStreamingResponse:
+        return HostsResourceWithStreamingResponse(self._user_schemas.hosts)
+
 
 class AsyncUserSchemasResourceWithStreamingResponse:
     def __init__(self, user_schemas: AsyncUserSchemasResource) -> None:
         self._user_schemas = user_schemas
 
-        self.create = async_to_streamed_response_wrapper(
-            user_schemas.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                user_schemas.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.list = async_to_streamed_response_wrapper(
-            user_schemas.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                user_schemas.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = async_to_streamed_response_wrapper(
-            user_schemas.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                user_schemas.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = async_to_streamed_response_wrapper(
-            user_schemas.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                user_schemas.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_streamed_response_wrapper(
-            user_schemas.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                user_schemas.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
     @cached_property
     def operations(self) -> AsyncOperationsResourceWithStreamingResponse:
         return AsyncOperationsResourceWithStreamingResponse(self._user_schemas.operations)
+
+    @cached_property
+    def hosts(self) -> AsyncHostsResourceWithStreamingResponse:
+        return AsyncHostsResourceWithStreamingResponse(self._user_schemas.hosts)
diff --git a/src/cloudflare/resources/argo/argo.py b/src/cloudflare/resources/argo/argo.py
index f9ce9f32f66..eb94300db7a 100644
--- a/src/cloudflare/resources/argo/argo.py
+++ b/src/cloudflare/resources/argo/argo.py
@@ -35,10 +35,21 @@ def tiered_caching(self) -> TieredCachingResource:
 
     @cached_property
     def with_raw_response(self) -> ArgoResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ArgoResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ArgoResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ArgoResourceWithStreamingResponse(self)
 
 
@@ -53,10 +64,21 @@ def tiered_caching(self) -> AsyncTieredCachingResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncArgoResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncArgoResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncArgoResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncArgoResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/argo/smart_routing.py b/src/cloudflare/resources/argo/smart_routing.py
index 66076b40903..d45d9be9c4d 100644
--- a/src/cloudflare/resources/argo/smart_routing.py
+++ b/src/cloudflare/resources/argo/smart_routing.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, cast
+from typing import Type, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -32,10 +29,21 @@
 class SmartRoutingResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SmartRoutingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SmartRoutingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SmartRoutingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SmartRoutingResourceWithStreamingResponse(self)
 
     def edit(
@@ -48,15 +56,15 @@ def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SmartRoutingEditResponse:
         """
-        Updates enablement of Argo Smart Routing.
+        Configures the value of the Argo Smart Routing enablement setting.
 
         Args:
-          zone_id: Identifier
+          zone_id: Specifies the zone associated with the API call.
 
-          value: Enables Argo Smart Routing.
+          value: Specifies the enablement value of Argo Smart Routing.
 
           extra_headers: Send extra headers
 
@@ -68,22 +76,17 @@ def edit(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            SmartRoutingEditResponse,
-            self._patch(
-                f"/zones/{zone_id}/argo/smart_routing",
-                body=maybe_transform({"value": value}, smart_routing_edit_params.SmartRoutingEditParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[SmartRoutingEditResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[SmartRoutingEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._patch(
+            f"/zones/{zone_id}/argo/smart_routing",
+            body=maybe_transform({"value": value}, smart_routing_edit_params.SmartRoutingEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SmartRoutingEditResponse]._unwrapper,
             ),
+            cast_to=cast(Type[SmartRoutingEditResponse], ResultWrapper[SmartRoutingEditResponse]),
         )
 
     def get(
@@ -95,13 +98,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SmartRoutingGetResponse:
         """
-        Get Argo Smart Routing setting
+        Retrieves the value of Argo Smart Routing enablement setting.
 
         Args:
-          zone_id: Identifier
+          zone_id: Specifies the zone associated with the API call.
 
           extra_headers: Send extra headers
 
@@ -113,31 +116,37 @@ def get(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            SmartRoutingGetResponse,
-            self._get(
-                f"/zones/{zone_id}/argo/smart_routing",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[SmartRoutingGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[SmartRoutingGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._get(
+            f"/zones/{zone_id}/argo/smart_routing",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SmartRoutingGetResponse]._unwrapper,
             ),
+            cast_to=cast(Type[SmartRoutingGetResponse], ResultWrapper[SmartRoutingGetResponse]),
         )
 
 
 class AsyncSmartRoutingResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSmartRoutingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSmartRoutingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSmartRoutingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSmartRoutingResourceWithStreamingResponse(self)
 
     async def edit(
@@ -150,15 +159,15 @@ async def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SmartRoutingEditResponse:
         """
-        Updates enablement of Argo Smart Routing.
+        Configures the value of the Argo Smart Routing enablement setting.
 
         Args:
-          zone_id: Identifier
+          zone_id: Specifies the zone associated with the API call.
 
-          value: Enables Argo Smart Routing.
+          value: Specifies the enablement value of Argo Smart Routing.
 
           extra_headers: Send extra headers
 
@@ -170,22 +179,17 @@ async def edit(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            SmartRoutingEditResponse,
-            await self._patch(
-                f"/zones/{zone_id}/argo/smart_routing",
-                body=await async_maybe_transform({"value": value}, smart_routing_edit_params.SmartRoutingEditParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[SmartRoutingEditResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[SmartRoutingEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._patch(
+            f"/zones/{zone_id}/argo/smart_routing",
+            body=await async_maybe_transform({"value": value}, smart_routing_edit_params.SmartRoutingEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SmartRoutingEditResponse]._unwrapper,
             ),
+            cast_to=cast(Type[SmartRoutingEditResponse], ResultWrapper[SmartRoutingEditResponse]),
         )
 
     async def get(
@@ -197,13 +201,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SmartRoutingGetResponse:
         """
-        Get Argo Smart Routing setting
+        Retrieves the value of Argo Smart Routing enablement setting.
 
         Args:
-          zone_id: Identifier
+          zone_id: Specifies the zone associated with the API call.
 
           extra_headers: Send extra headers
 
@@ -215,21 +219,16 @@ async def get(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            SmartRoutingGetResponse,
-            await self._get(
-                f"/zones/{zone_id}/argo/smart_routing",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[SmartRoutingGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[SmartRoutingGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._get(
+            f"/zones/{zone_id}/argo/smart_routing",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SmartRoutingGetResponse]._unwrapper,
             ),
+            cast_to=cast(Type[SmartRoutingGetResponse], ResultWrapper[SmartRoutingGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/argo/tiered_caching.py b/src/cloudflare/resources/argo/tiered_caching.py
index d11257e0a6c..9662940b73c 100644
--- a/src/cloudflare/resources/argo/tiered_caching.py
+++ b/src/cloudflare/resources/argo/tiered_caching.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Type, cast
+from typing import Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -32,10 +29,21 @@
 class TieredCachingResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TieredCachingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TieredCachingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TieredCachingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TieredCachingResourceWithStreamingResponse(self)
 
     def edit(
@@ -48,13 +56,23 @@ def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TieredCachingEditResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TieredCachingEditResponse]:
         """
-        Updates enablement of Tiered Caching
+        Tiered Cache works by dividing Cloudflare's data centers into a hierarchy of
+        lower-tiers and upper-tiers. If content is not cached in lower-tier data centers
+        (generally the ones closest to a visitor), the lower-tier must ask an upper-tier
+        to see if it has the content. If the upper-tier does not have the content, only
+        the upper-tier can ask the origin for content. This practice improves bandwidth
+        efficiency by limiting the number of data centers that can ask the origin for
+        content, which reduces origin load and makes websites more cost-effective to
+        operate. Additionally, Tiered Cache concentrates connections to origin servers
+        so they come from a small number of data centers rather than the full set of
+        network locations. This results in fewer open connections using server
+        resources.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           value: Enables Tiered Caching.
 
@@ -76,9 +94,9 @@ def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[TieredCachingEditResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[TieredCachingEditResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[TieredCachingEditResponse], ResultWrapper[TieredCachingEditResponse]),
+            cast_to=cast(Type[Optional[TieredCachingEditResponse]], ResultWrapper[TieredCachingEditResponse]),
         )
 
     def get(
@@ -90,13 +108,23 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TieredCachingGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TieredCachingGetResponse]:
         """
-        Get Tiered Caching setting
+        Tiered Cache works by dividing Cloudflare's data centers into a hierarchy of
+        lower-tiers and upper-tiers. If content is not cached in lower-tier data centers
+        (generally the ones closest to a visitor), the lower-tier must ask an upper-tier
+        to see if it has the content. If the upper-tier does not have the content, only
+        the upper-tier can ask the origin for content. This practice improves bandwidth
+        efficiency by limiting the number of data centers that can ask the origin for
+        content, which reduces origin load and makes websites more cost-effective to
+        operate. Additionally, Tiered Cache concentrates connections to origin servers
+        so they come from a small number of data centers rather than the full set of
+        network locations. This results in fewer open connections using server
+        resources.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -115,19 +143,30 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[TieredCachingGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[TieredCachingGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[TieredCachingGetResponse], ResultWrapper[TieredCachingGetResponse]),
+            cast_to=cast(Type[Optional[TieredCachingGetResponse]], ResultWrapper[TieredCachingGetResponse]),
         )
 
 
 class AsyncTieredCachingResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTieredCachingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTieredCachingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTieredCachingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTieredCachingResourceWithStreamingResponse(self)
 
     async def edit(
@@ -140,13 +179,23 @@ async def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TieredCachingEditResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TieredCachingEditResponse]:
         """
-        Updates enablement of Tiered Caching
+        Tiered Cache works by dividing Cloudflare's data centers into a hierarchy of
+        lower-tiers and upper-tiers. If content is not cached in lower-tier data centers
+        (generally the ones closest to a visitor), the lower-tier must ask an upper-tier
+        to see if it has the content. If the upper-tier does not have the content, only
+        the upper-tier can ask the origin for content. This practice improves bandwidth
+        efficiency by limiting the number of data centers that can ask the origin for
+        content, which reduces origin load and makes websites more cost-effective to
+        operate. Additionally, Tiered Cache concentrates connections to origin servers
+        so they come from a small number of data centers rather than the full set of
+        network locations. This results in fewer open connections using server
+        resources.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           value: Enables Tiered Caching.
 
@@ -168,9 +217,9 @@ async def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[TieredCachingEditResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[TieredCachingEditResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[TieredCachingEditResponse], ResultWrapper[TieredCachingEditResponse]),
+            cast_to=cast(Type[Optional[TieredCachingEditResponse]], ResultWrapper[TieredCachingEditResponse]),
         )
 
     async def get(
@@ -182,13 +231,23 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TieredCachingGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TieredCachingGetResponse]:
         """
-        Get Tiered Caching setting
+        Tiered Cache works by dividing Cloudflare's data centers into a hierarchy of
+        lower-tiers and upper-tiers. If content is not cached in lower-tier data centers
+        (generally the ones closest to a visitor), the lower-tier must ask an upper-tier
+        to see if it has the content. If the upper-tier does not have the content, only
+        the upper-tier can ask the origin for content. This practice improves bandwidth
+        efficiency by limiting the number of data centers that can ask the origin for
+        content, which reduces origin load and makes websites more cost-effective to
+        operate. Additionally, Tiered Cache concentrates connections to origin servers
+        so they come from a small number of data centers rather than the full set of
+        network locations. This results in fewer open connections using server
+        resources.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -207,9 +266,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[TieredCachingGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[TieredCachingGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[TieredCachingGetResponse], ResultWrapper[TieredCachingGetResponse]),
+            cast_to=cast(Type[Optional[TieredCachingGetResponse]], ResultWrapper[TieredCachingGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/audit_logs.py b/src/cloudflare/resources/audit_logs.py
index 5958b8541e7..1a682f5ac0e 100644
--- a/src/cloudflare/resources/audit_logs.py
+++ b/src/cloudflare/resources/audit_logs.py
@@ -3,12 +3,12 @@
 from __future__ import annotations
 
 from typing import Union
-from datetime import datetime
+from datetime import date, datetime
 from typing_extensions import Literal
 
 import httpx
 
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from .._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from .._utils import maybe_transform
 from .._compat import cached_property
 from .._resource import SyncAPIResource, AsyncAPIResource
@@ -29,33 +29,44 @@
 class AuditLogsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AuditLogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AuditLogsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AuditLogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AuditLogsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        action: audit_log_list_params.Action | NotGiven = NOT_GIVEN,
-        actor: audit_log_list_params.Actor | NotGiven = NOT_GIVEN,
-        before: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        direction: Literal["desc", "asc"] | NotGiven = NOT_GIVEN,
-        export: bool | NotGiven = NOT_GIVEN,
-        hide_user_logs: bool | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        zone: audit_log_list_params.Zone | NotGiven = NOT_GIVEN,
+        id: str | Omit = omit,
+        action: audit_log_list_params.Action | Omit = omit,
+        actor: audit_log_list_params.Actor | Omit = omit,
+        before: Union[Union[str, date], Union[str, datetime]] | Omit = omit,
+        direction: Literal["desc", "asc"] | Omit = omit,
+        export: bool | Omit = omit,
+        hide_user_logs: bool | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        since: Union[Union[str, date], Union[str, datetime]] | Omit = omit,
+        zone: audit_log_list_params.Zone | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[AuditLog]:
         """Gets a list of audit logs for an account.
 
@@ -67,8 +78,8 @@ def list(
 
           id: Finds a specific log by its ID.
 
-          before: Limits the returned results to logs older than the specified date. This can be a
-              date string `2019-04-30` or an absolute timestamp that conforms to RFC3339.
+          before: Limits the returned results to logs older than the specified date. A `full-date`
+              that conforms to RFC3339.
 
           direction: Changes the direction of the chronological sorting.
 
@@ -80,8 +91,8 @@ def list(
 
           per_page: Sets the number of results to return per page.
 
-          since: Limits the returned results to logs newer than the specified date. This can be a
-              date string `2019-04-30` or an absolute timestamp that conforms to RFC3339.
+          since: Limits the returned results to logs newer than the specified date. A `full-date`
+              that conforms to RFC3339.
 
           extra_headers: Send extra headers
 
@@ -125,33 +136,44 @@ def list(
 class AsyncAuditLogsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncAuditLogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAuditLogsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAuditLogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAuditLogsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        action: audit_log_list_params.Action | NotGiven = NOT_GIVEN,
-        actor: audit_log_list_params.Actor | NotGiven = NOT_GIVEN,
-        before: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        direction: Literal["desc", "asc"] | NotGiven = NOT_GIVEN,
-        export: bool | NotGiven = NOT_GIVEN,
-        hide_user_logs: bool | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        zone: audit_log_list_params.Zone | NotGiven = NOT_GIVEN,
+        id: str | Omit = omit,
+        action: audit_log_list_params.Action | Omit = omit,
+        actor: audit_log_list_params.Actor | Omit = omit,
+        before: Union[Union[str, date], Union[str, datetime]] | Omit = omit,
+        direction: Literal["desc", "asc"] | Omit = omit,
+        export: bool | Omit = omit,
+        hide_user_logs: bool | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        since: Union[Union[str, date], Union[str, datetime]] | Omit = omit,
+        zone: audit_log_list_params.Zone | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[AuditLog, AsyncV4PagePaginationArray[AuditLog]]:
         """Gets a list of audit logs for an account.
 
@@ -163,8 +185,8 @@ def list(
 
           id: Finds a specific log by its ID.
 
-          before: Limits the returned results to logs older than the specified date. This can be a
-              date string `2019-04-30` or an absolute timestamp that conforms to RFC3339.
+          before: Limits the returned results to logs older than the specified date. A `full-date`
+              that conforms to RFC3339.
 
           direction: Changes the direction of the chronological sorting.
 
@@ -176,8 +198,8 @@ def list(
 
           per_page: Sets the number of results to return per page.
 
-          since: Limits the returned results to logs newer than the specified date. This can be a
-              date string `2019-04-30` or an absolute timestamp that conforms to RFC3339.
+          since: Limits the returned results to logs newer than the specified date. A `full-date`
+              that conforms to RFC3339.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/billing/billing.py b/src/cloudflare/resources/billing/billing.py
index 4eb4692ac3a..d57c019144e 100644
--- a/src/cloudflare/resources/billing/billing.py
+++ b/src/cloudflare/resources/billing/billing.py
@@ -23,10 +23,21 @@ def profiles(self) -> ProfilesResource:
 
     @cached_property
     def with_raw_response(self) -> BillingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return BillingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> BillingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return BillingResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def profiles(self) -> AsyncProfilesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncBillingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncBillingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncBillingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncBillingResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/billing/profiles.py b/src/cloudflare/resources/billing/profiles.py
index 4ee42cdb407..f3272600105 100644
--- a/src/cloudflare/resources/billing/profiles.py
+++ b/src/cloudflare/resources/billing/profiles.py
@@ -2,11 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, cast
+import typing_extensions
+from typing import Type, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Query, Headers, NotGiven, not_given
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -25,27 +26,41 @@
 class ProfilesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ProfilesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ProfilesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ProfilesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ProfilesResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def get(
         self,
-        account_identifier: object,
         *,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ProfileGetResponse:
         """
         Gets the current billing profile for the account.
 
         Args:
+          account_id: Identifier
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -54,48 +69,59 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return cast(
-            ProfileGetResponse,
-            self._get(
-                f"/accounts/{account_identifier}/billing/profile",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[ProfileGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ProfileGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/billing/profile",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ProfileGetResponse]._unwrapper,
             ),
+            cast_to=cast(Type[ProfileGetResponse], ResultWrapper[ProfileGetResponse]),
         )
 
 
 class AsyncProfilesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncProfilesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncProfilesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncProfilesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncProfilesResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     async def get(
         self,
-        account_identifier: object,
         *,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ProfileGetResponse:
         """
         Gets the current billing profile for the account.
 
         Args:
+          account_id: Identifier
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -104,21 +130,18 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return cast(
-            ProfileGetResponse,
-            await self._get(
-                f"/accounts/{account_identifier}/billing/profile",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[ProfileGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ProfileGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/billing/profile",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ProfileGetResponse]._unwrapper,
             ),
+            cast_to=cast(Type[ProfileGetResponse], ResultWrapper[ProfileGetResponse]),
         )
 
 
@@ -126,8 +149,10 @@ class ProfilesResourceWithRawResponse:
     def __init__(self, profiles: ProfilesResource) -> None:
         self._profiles = profiles
 
-        self.get = to_raw_response_wrapper(
-            profiles.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                profiles.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -135,8 +160,10 @@ class AsyncProfilesResourceWithRawResponse:
     def __init__(self, profiles: AsyncProfilesResource) -> None:
         self._profiles = profiles
 
-        self.get = async_to_raw_response_wrapper(
-            profiles.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                profiles.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -144,8 +171,10 @@ class ProfilesResourceWithStreamingResponse:
     def __init__(self, profiles: ProfilesResource) -> None:
         self._profiles = profiles
 
-        self.get = to_streamed_response_wrapper(
-            profiles.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                profiles.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -153,6 +182,8 @@ class AsyncProfilesResourceWithStreamingResponse:
     def __init__(self, profiles: AsyncProfilesResource) -> None:
         self._profiles = profiles
 
-        self.get = async_to_streamed_response_wrapper(
-            profiles.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                profiles.get,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/bot_management.py b/src/cloudflare/resources/bot_management.py
index d0974c04dc4..07b76763411 100644
--- a/src/cloudflare/resources/bot_management.py
+++ b/src/cloudflare/resources/bot_management.py
@@ -2,17 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, Optional, cast, overload
-from typing_extensions import Literal
+from typing import Any, Optional, cast
+from typing_extensions import Literal, overload
 
 import httpx
 
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._utils import (
-    required_args,
-    maybe_transform,
-    async_maybe_transform,
-)
+from .._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from .._utils import required_args, maybe_transform, async_maybe_transform
 from .._compat import cached_property
 from .._resource import SyncAPIResource, AsyncAPIResource
 from .._response import (
@@ -33,10 +29,21 @@
 class BotManagementResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> BotManagementResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return BotManagementResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> BotManagementResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return BotManagementResourceWithStreamingResponse(self)
 
     @overload
@@ -44,14 +51,18 @@ def update(
         self,
         *,
         zone_id: str,
-        enable_js: bool | NotGiven = NOT_GIVEN,
-        fight_mode: bool | NotGiven = NOT_GIVEN,
+        ai_bots_protection: Literal["block", "disabled", "only_on_ad_pages"] | Omit = omit,
+        cf_robots_variant: Literal["off", "policy_only"] | Omit = omit,
+        crawler_protection: Literal["enabled", "disabled"] | Omit = omit,
+        enable_js: bool | Omit = omit,
+        fight_mode: bool | Omit = omit,
+        is_robots_txt_managed: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[BotManagementUpdateResponse]:
         """
         Updates the Bot Management configuration for a zone.
@@ -63,16 +74,77 @@ def update(
         - **Bot Management for Enterprise**
 
         See [Bot Plans](https://developers.cloudflare.com/bots/plans/) for more
-        information on the different plans
+        information on the different plans \\
+        If you recently upgraded or downgraded your plan, refer to the following examples
+        to clean up old configurations. Copy and paste the example body to remove old zone
+        configurations based on your current plan.
+
+        #### Clean up configuration for Bot Fight Mode plan
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "sbfm_definitely_automated": "allow",
+          "sbfm_verified_bots": "allow",
+          "sbfm_static_resource_protection": false,
+          "optimize_wordpress": false,
+          "suppress_session_score": false
+        }
+        ```
+
+        #### Clean up configuration for SBFM Pro plan
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "fight_mode": false
+        }
+        ```
+
+        #### Clean up configuration for SBFM Biz plan
+
+        ```json
+        {
+          "fight_mode": false
+        }
+        ```
+
+        #### Clean up configuration for BM Enterprise Subscription plan
+
+        It is strongly recommended that you ensure you have
+        [custom rules](https://developers.cloudflare.com/waf/custom-rules/) in place to
+        protect your zone before disabling the SBFM rules. Without these protections,
+        your zone is vulnerable to attacks.
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "sbfm_definitely_automated": "allow",
+          "sbfm_verified_bots": "allow",
+          "sbfm_static_resource_protection": false,
+          "optimize_wordpress": false,
+          "fight_mode": false
+        }
+        ```
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
+
+          ai_bots_protection: Enable rule to block AI Scrapers and Crawlers. Please note the value
+              `only_on_ad_pages` is currently not available for Enterprise customers.
+
+          cf_robots_variant: Specifies the Robots Access Control License variant to use.
+
+          crawler_protection: Enable rule to punish AI Scrapers and Crawlers via a link maze.
 
           enable_js: Use lightweight, invisible JavaScript detections to improve Bot Management.
               [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
 
           fight_mode: Whether to enable Bot Fight Mode.
 
+          is_robots_txt_managed: Enable cloudflare managed robots.txt. If an existing robots.txt is detected,
+              then managed robots.txt will be prepended to the existing robots.txt.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -88,17 +160,21 @@ def update(
         self,
         *,
         zone_id: str,
-        enable_js: bool | NotGiven = NOT_GIVEN,
-        optimize_wordpress: bool | NotGiven = NOT_GIVEN,
-        sbfm_definitely_automated: Literal["allow", "block", "managed_challenge"] | NotGiven = NOT_GIVEN,
-        sbfm_static_resource_protection: bool | NotGiven = NOT_GIVEN,
-        sbfm_verified_bots: Literal["allow", "block"] | NotGiven = NOT_GIVEN,
+        ai_bots_protection: Literal["block", "disabled", "only_on_ad_pages"] | Omit = omit,
+        cf_robots_variant: Literal["off", "policy_only"] | Omit = omit,
+        crawler_protection: Literal["enabled", "disabled"] | Omit = omit,
+        enable_js: bool | Omit = omit,
+        is_robots_txt_managed: bool | Omit = omit,
+        optimize_wordpress: bool | Omit = omit,
+        sbfm_definitely_automated: Literal["allow", "block", "managed_challenge"] | Omit = omit,
+        sbfm_static_resource_protection: bool | Omit = omit,
+        sbfm_verified_bots: Literal["allow", "block"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[BotManagementUpdateResponse]:
         """
         Updates the Bot Management configuration for a zone.
@@ -110,14 +186,75 @@ def update(
         - **Bot Management for Enterprise**
 
         See [Bot Plans](https://developers.cloudflare.com/bots/plans/) for more
-        information on the different plans
+        information on the different plans \\
+        If you recently upgraded or downgraded your plan, refer to the following examples
+        to clean up old configurations. Copy and paste the example body to remove old zone
+        configurations based on your current plan.
+
+        #### Clean up configuration for Bot Fight Mode plan
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "sbfm_definitely_automated": "allow",
+          "sbfm_verified_bots": "allow",
+          "sbfm_static_resource_protection": false,
+          "optimize_wordpress": false,
+          "suppress_session_score": false
+        }
+        ```
+
+        #### Clean up configuration for SBFM Pro plan
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "fight_mode": false
+        }
+        ```
+
+        #### Clean up configuration for SBFM Biz plan
+
+        ```json
+        {
+          "fight_mode": false
+        }
+        ```
+
+        #### Clean up configuration for BM Enterprise Subscription plan
+
+        It is strongly recommended that you ensure you have
+        [custom rules](https://developers.cloudflare.com/waf/custom-rules/) in place to
+        protect your zone before disabling the SBFM rules. Without these protections,
+        your zone is vulnerable to attacks.
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "sbfm_definitely_automated": "allow",
+          "sbfm_verified_bots": "allow",
+          "sbfm_static_resource_protection": false,
+          "optimize_wordpress": false,
+          "fight_mode": false
+        }
+        ```
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
+
+          ai_bots_protection: Enable rule to block AI Scrapers and Crawlers. Please note the value
+              `only_on_ad_pages` is currently not available for Enterprise customers.
+
+          cf_robots_variant: Specifies the Robots Access Control License variant to use.
+
+          crawler_protection: Enable rule to punish AI Scrapers and Crawlers via a link maze.
 
           enable_js: Use lightweight, invisible JavaScript detections to improve Bot Management.
               [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
 
+          is_robots_txt_managed: Enable cloudflare managed robots.txt. If an existing robots.txt is detected,
+              then managed robots.txt will be prepended to the existing robots.txt.
+
           optimize_wordpress: Whether to optimize Super Bot Fight Mode protections for Wordpress.
 
           sbfm_definitely_automated: Super Bot Fight Mode (SBFM) action to take on definitely automated requests.
@@ -143,18 +280,22 @@ def update(
         self,
         *,
         zone_id: str,
-        enable_js: bool | NotGiven = NOT_GIVEN,
-        optimize_wordpress: bool | NotGiven = NOT_GIVEN,
-        sbfm_definitely_automated: Literal["allow", "block", "managed_challenge"] | NotGiven = NOT_GIVEN,
-        sbfm_likely_automated: Literal["allow", "block", "managed_challenge"] | NotGiven = NOT_GIVEN,
-        sbfm_static_resource_protection: bool | NotGiven = NOT_GIVEN,
-        sbfm_verified_bots: Literal["allow", "block"] | NotGiven = NOT_GIVEN,
+        ai_bots_protection: Literal["block", "disabled", "only_on_ad_pages"] | Omit = omit,
+        cf_robots_variant: Literal["off", "policy_only"] | Omit = omit,
+        crawler_protection: Literal["enabled", "disabled"] | Omit = omit,
+        enable_js: bool | Omit = omit,
+        is_robots_txt_managed: bool | Omit = omit,
+        optimize_wordpress: bool | Omit = omit,
+        sbfm_definitely_automated: Literal["allow", "block", "managed_challenge"] | Omit = omit,
+        sbfm_likely_automated: Literal["allow", "block", "managed_challenge"] | Omit = omit,
+        sbfm_static_resource_protection: bool | Omit = omit,
+        sbfm_verified_bots: Literal["allow", "block"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[BotManagementUpdateResponse]:
         """
         Updates the Bot Management configuration for a zone.
@@ -166,14 +307,75 @@ def update(
         - **Bot Management for Enterprise**
 
         See [Bot Plans](https://developers.cloudflare.com/bots/plans/) for more
-        information on the different plans
+        information on the different plans \\
+        If you recently upgraded or downgraded your plan, refer to the following examples
+        to clean up old configurations. Copy and paste the example body to remove old zone
+        configurations based on your current plan.
+
+        #### Clean up configuration for Bot Fight Mode plan
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "sbfm_definitely_automated": "allow",
+          "sbfm_verified_bots": "allow",
+          "sbfm_static_resource_protection": false,
+          "optimize_wordpress": false,
+          "suppress_session_score": false
+        }
+        ```
+
+        #### Clean up configuration for SBFM Pro plan
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "fight_mode": false
+        }
+        ```
+
+        #### Clean up configuration for SBFM Biz plan
+
+        ```json
+        {
+          "fight_mode": false
+        }
+        ```
+
+        #### Clean up configuration for BM Enterprise Subscription plan
+
+        It is strongly recommended that you ensure you have
+        [custom rules](https://developers.cloudflare.com/waf/custom-rules/) in place to
+        protect your zone before disabling the SBFM rules. Without these protections,
+        your zone is vulnerable to attacks.
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "sbfm_definitely_automated": "allow",
+          "sbfm_verified_bots": "allow",
+          "sbfm_static_resource_protection": false,
+          "optimize_wordpress": false,
+          "fight_mode": false
+        }
+        ```
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
+
+          ai_bots_protection: Enable rule to block AI Scrapers and Crawlers. Please note the value
+              `only_on_ad_pages` is currently not available for Enterprise customers.
+
+          cf_robots_variant: Specifies the Robots Access Control License variant to use.
+
+          crawler_protection: Enable rule to punish AI Scrapers and Crawlers via a link maze.
 
           enable_js: Use lightweight, invisible JavaScript detections to improve Bot Management.
               [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
 
+          is_robots_txt_managed: Enable cloudflare managed robots.txt. If an existing robots.txt is detected,
+              then managed robots.txt will be prepended to the existing robots.txt.
+
           optimize_wordpress: Whether to optimize Super Bot Fight Mode protections for Wordpress.
 
           sbfm_definitely_automated: Super Bot Fight Mode (SBFM) action to take on definitely automated requests.
@@ -201,15 +403,20 @@ def update(
         self,
         *,
         zone_id: str,
-        auto_update_model: bool | NotGiven = NOT_GIVEN,
-        enable_js: bool | NotGiven = NOT_GIVEN,
-        suppress_session_score: bool | NotGiven = NOT_GIVEN,
+        ai_bots_protection: Literal["block", "disabled", "only_on_ad_pages"] | Omit = omit,
+        auto_update_model: bool | Omit = omit,
+        bm_cookie_enabled: bool | Omit = omit,
+        cf_robots_variant: Literal["off", "policy_only"] | Omit = omit,
+        crawler_protection: Literal["enabled", "disabled"] | Omit = omit,
+        enable_js: bool | Omit = omit,
+        is_robots_txt_managed: bool | Omit = omit,
+        suppress_session_score: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[BotManagementUpdateResponse]:
         """
         Updates the Bot Management configuration for a zone.
@@ -221,18 +428,82 @@ def update(
         - **Bot Management for Enterprise**
 
         See [Bot Plans](https://developers.cloudflare.com/bots/plans/) for more
-        information on the different plans
+        information on the different plans \\
+        If you recently upgraded or downgraded your plan, refer to the following examples
+        to clean up old configurations. Copy and paste the example body to remove old zone
+        configurations based on your current plan.
+
+        #### Clean up configuration for Bot Fight Mode plan
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "sbfm_definitely_automated": "allow",
+          "sbfm_verified_bots": "allow",
+          "sbfm_static_resource_protection": false,
+          "optimize_wordpress": false,
+          "suppress_session_score": false
+        }
+        ```
+
+        #### Clean up configuration for SBFM Pro plan
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "fight_mode": false
+        }
+        ```
+
+        #### Clean up configuration for SBFM Biz plan
+
+        ```json
+        {
+          "fight_mode": false
+        }
+        ```
+
+        #### Clean up configuration for BM Enterprise Subscription plan
+
+        It is strongly recommended that you ensure you have
+        [custom rules](https://developers.cloudflare.com/waf/custom-rules/) in place to
+        protect your zone before disabling the SBFM rules. Without these protections,
+        your zone is vulnerable to attacks.
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "sbfm_definitely_automated": "allow",
+          "sbfm_verified_bots": "allow",
+          "sbfm_static_resource_protection": false,
+          "optimize_wordpress": false,
+          "fight_mode": false
+        }
+        ```
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
+
+          ai_bots_protection: Enable rule to block AI Scrapers and Crawlers. Please note the value
+              `only_on_ad_pages` is currently not available for Enterprise customers.
 
           auto_update_model: Automatically update to the newest bot detection models created by Cloudflare as
               they are released.
               [Learn more.](https://developers.cloudflare.com/bots/reference/machine-learning-models#model-versions-and-release-notes)
 
+          bm_cookie_enabled: Indicates that the bot management cookie can be placed on end user devices
+              accessing the site. Defaults to true
+
+          cf_robots_variant: Specifies the Robots Access Control License variant to use.
+
+          crawler_protection: Enable rule to punish AI Scrapers and Crawlers via a link maze.
+
           enable_js: Use lightweight, invisible JavaScript detections to improve Bot Management.
               [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
 
+          is_robots_txt_managed: Enable cloudflare managed robots.txt. If an existing robots.txt is detected,
+              then managed robots.txt will be prepended to the existing robots.txt.
+
           suppress_session_score: Whether to disable tracking the highest bot score for a session in the Bot
               Management cookie.
 
@@ -251,21 +522,26 @@ def update(
         self,
         *,
         zone_id: str,
-        enable_js: bool | NotGiven = NOT_GIVEN,
-        fight_mode: bool | NotGiven = NOT_GIVEN,
-        optimize_wordpress: bool | NotGiven = NOT_GIVEN,
-        sbfm_definitely_automated: Literal["allow", "block", "managed_challenge"] | NotGiven = NOT_GIVEN,
-        sbfm_static_resource_protection: bool | NotGiven = NOT_GIVEN,
-        sbfm_verified_bots: Literal["allow", "block"] | NotGiven = NOT_GIVEN,
-        sbfm_likely_automated: Literal["allow", "block", "managed_challenge"] | NotGiven = NOT_GIVEN,
-        auto_update_model: bool | NotGiven = NOT_GIVEN,
-        suppress_session_score: bool | NotGiven = NOT_GIVEN,
+        ai_bots_protection: Literal["block", "disabled", "only_on_ad_pages"] | Omit = omit,
+        cf_robots_variant: Literal["off", "policy_only"] | Omit = omit,
+        crawler_protection: Literal["enabled", "disabled"] | Omit = omit,
+        enable_js: bool | Omit = omit,
+        fight_mode: bool | Omit = omit,
+        is_robots_txt_managed: bool | Omit = omit,
+        optimize_wordpress: bool | Omit = omit,
+        sbfm_definitely_automated: Literal["allow", "block", "managed_challenge"] | Omit = omit,
+        sbfm_static_resource_protection: bool | Omit = omit,
+        sbfm_verified_bots: Literal["allow", "block"] | Omit = omit,
+        sbfm_likely_automated: Literal["allow", "block", "managed_challenge"] | Omit = omit,
+        auto_update_model: bool | Omit = omit,
+        bm_cookie_enabled: bool | Omit = omit,
+        suppress_session_score: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[BotManagementUpdateResponse]:
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
@@ -275,14 +551,19 @@ def update(
                 f"/zones/{zone_id}/bot_management",
                 body=maybe_transform(
                     {
+                        "ai_bots_protection": ai_bots_protection,
+                        "cf_robots_variant": cf_robots_variant,
+                        "crawler_protection": crawler_protection,
                         "enable_js": enable_js,
                         "fight_mode": fight_mode,
+                        "is_robots_txt_managed": is_robots_txt_managed,
                         "optimize_wordpress": optimize_wordpress,
                         "sbfm_definitely_automated": sbfm_definitely_automated,
                         "sbfm_static_resource_protection": sbfm_static_resource_protection,
                         "sbfm_verified_bots": sbfm_verified_bots,
                         "sbfm_likely_automated": sbfm_likely_automated,
                         "auto_update_model": auto_update_model,
+                        "bm_cookie_enabled": bm_cookie_enabled,
                         "suppress_session_score": suppress_session_score,
                     },
                     bot_management_update_params.BotManagementUpdateParams,
@@ -309,13 +590,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[BotManagementGetResponse]:
         """
         Retrieve a zone's Bot Management Config
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -348,10 +629,21 @@ def get(
 class AsyncBotManagementResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncBotManagementResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncBotManagementResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncBotManagementResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncBotManagementResourceWithStreamingResponse(self)
 
     @overload
@@ -359,14 +651,18 @@ async def update(
         self,
         *,
         zone_id: str,
-        enable_js: bool | NotGiven = NOT_GIVEN,
-        fight_mode: bool | NotGiven = NOT_GIVEN,
+        ai_bots_protection: Literal["block", "disabled", "only_on_ad_pages"] | Omit = omit,
+        cf_robots_variant: Literal["off", "policy_only"] | Omit = omit,
+        crawler_protection: Literal["enabled", "disabled"] | Omit = omit,
+        enable_js: bool | Omit = omit,
+        fight_mode: bool | Omit = omit,
+        is_robots_txt_managed: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[BotManagementUpdateResponse]:
         """
         Updates the Bot Management configuration for a zone.
@@ -378,16 +674,77 @@ async def update(
         - **Bot Management for Enterprise**
 
         See [Bot Plans](https://developers.cloudflare.com/bots/plans/) for more
-        information on the different plans
+        information on the different plans \\
+        If you recently upgraded or downgraded your plan, refer to the following examples
+        to clean up old configurations. Copy and paste the example body to remove old zone
+        configurations based on your current plan.
+
+        #### Clean up configuration for Bot Fight Mode plan
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "sbfm_definitely_automated": "allow",
+          "sbfm_verified_bots": "allow",
+          "sbfm_static_resource_protection": false,
+          "optimize_wordpress": false,
+          "suppress_session_score": false
+        }
+        ```
+
+        #### Clean up configuration for SBFM Pro plan
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "fight_mode": false
+        }
+        ```
+
+        #### Clean up configuration for SBFM Biz plan
+
+        ```json
+        {
+          "fight_mode": false
+        }
+        ```
+
+        #### Clean up configuration for BM Enterprise Subscription plan
+
+        It is strongly recommended that you ensure you have
+        [custom rules](https://developers.cloudflare.com/waf/custom-rules/) in place to
+        protect your zone before disabling the SBFM rules. Without these protections,
+        your zone is vulnerable to attacks.
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "sbfm_definitely_automated": "allow",
+          "sbfm_verified_bots": "allow",
+          "sbfm_static_resource_protection": false,
+          "optimize_wordpress": false,
+          "fight_mode": false
+        }
+        ```
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
+
+          ai_bots_protection: Enable rule to block AI Scrapers and Crawlers. Please note the value
+              `only_on_ad_pages` is currently not available for Enterprise customers.
+
+          cf_robots_variant: Specifies the Robots Access Control License variant to use.
+
+          crawler_protection: Enable rule to punish AI Scrapers and Crawlers via a link maze.
 
           enable_js: Use lightweight, invisible JavaScript detections to improve Bot Management.
               [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
 
           fight_mode: Whether to enable Bot Fight Mode.
 
+          is_robots_txt_managed: Enable cloudflare managed robots.txt. If an existing robots.txt is detected,
+              then managed robots.txt will be prepended to the existing robots.txt.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -403,17 +760,21 @@ async def update(
         self,
         *,
         zone_id: str,
-        enable_js: bool | NotGiven = NOT_GIVEN,
-        optimize_wordpress: bool | NotGiven = NOT_GIVEN,
-        sbfm_definitely_automated: Literal["allow", "block", "managed_challenge"] | NotGiven = NOT_GIVEN,
-        sbfm_static_resource_protection: bool | NotGiven = NOT_GIVEN,
-        sbfm_verified_bots: Literal["allow", "block"] | NotGiven = NOT_GIVEN,
+        ai_bots_protection: Literal["block", "disabled", "only_on_ad_pages"] | Omit = omit,
+        cf_robots_variant: Literal["off", "policy_only"] | Omit = omit,
+        crawler_protection: Literal["enabled", "disabled"] | Omit = omit,
+        enable_js: bool | Omit = omit,
+        is_robots_txt_managed: bool | Omit = omit,
+        optimize_wordpress: bool | Omit = omit,
+        sbfm_definitely_automated: Literal["allow", "block", "managed_challenge"] | Omit = omit,
+        sbfm_static_resource_protection: bool | Omit = omit,
+        sbfm_verified_bots: Literal["allow", "block"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[BotManagementUpdateResponse]:
         """
         Updates the Bot Management configuration for a zone.
@@ -425,14 +786,75 @@ async def update(
         - **Bot Management for Enterprise**
 
         See [Bot Plans](https://developers.cloudflare.com/bots/plans/) for more
-        information on the different plans
+        information on the different plans \\
+        If you recently upgraded or downgraded your plan, refer to the following examples
+        to clean up old configurations. Copy and paste the example body to remove old zone
+        configurations based on your current plan.
+
+        #### Clean up configuration for Bot Fight Mode plan
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "sbfm_definitely_automated": "allow",
+          "sbfm_verified_bots": "allow",
+          "sbfm_static_resource_protection": false,
+          "optimize_wordpress": false,
+          "suppress_session_score": false
+        }
+        ```
+
+        #### Clean up configuration for SBFM Pro plan
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "fight_mode": false
+        }
+        ```
+
+        #### Clean up configuration for SBFM Biz plan
+
+        ```json
+        {
+          "fight_mode": false
+        }
+        ```
+
+        #### Clean up configuration for BM Enterprise Subscription plan
+
+        It is strongly recommended that you ensure you have
+        [custom rules](https://developers.cloudflare.com/waf/custom-rules/) in place to
+        protect your zone before disabling the SBFM rules. Without these protections,
+        your zone is vulnerable to attacks.
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "sbfm_definitely_automated": "allow",
+          "sbfm_verified_bots": "allow",
+          "sbfm_static_resource_protection": false,
+          "optimize_wordpress": false,
+          "fight_mode": false
+        }
+        ```
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
+
+          ai_bots_protection: Enable rule to block AI Scrapers and Crawlers. Please note the value
+              `only_on_ad_pages` is currently not available for Enterprise customers.
+
+          cf_robots_variant: Specifies the Robots Access Control License variant to use.
+
+          crawler_protection: Enable rule to punish AI Scrapers and Crawlers via a link maze.
 
           enable_js: Use lightweight, invisible JavaScript detections to improve Bot Management.
               [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
 
+          is_robots_txt_managed: Enable cloudflare managed robots.txt. If an existing robots.txt is detected,
+              then managed robots.txt will be prepended to the existing robots.txt.
+
           optimize_wordpress: Whether to optimize Super Bot Fight Mode protections for Wordpress.
 
           sbfm_definitely_automated: Super Bot Fight Mode (SBFM) action to take on definitely automated requests.
@@ -458,18 +880,22 @@ async def update(
         self,
         *,
         zone_id: str,
-        enable_js: bool | NotGiven = NOT_GIVEN,
-        optimize_wordpress: bool | NotGiven = NOT_GIVEN,
-        sbfm_definitely_automated: Literal["allow", "block", "managed_challenge"] | NotGiven = NOT_GIVEN,
-        sbfm_likely_automated: Literal["allow", "block", "managed_challenge"] | NotGiven = NOT_GIVEN,
-        sbfm_static_resource_protection: bool | NotGiven = NOT_GIVEN,
-        sbfm_verified_bots: Literal["allow", "block"] | NotGiven = NOT_GIVEN,
+        ai_bots_protection: Literal["block", "disabled", "only_on_ad_pages"] | Omit = omit,
+        cf_robots_variant: Literal["off", "policy_only"] | Omit = omit,
+        crawler_protection: Literal["enabled", "disabled"] | Omit = omit,
+        enable_js: bool | Omit = omit,
+        is_robots_txt_managed: bool | Omit = omit,
+        optimize_wordpress: bool | Omit = omit,
+        sbfm_definitely_automated: Literal["allow", "block", "managed_challenge"] | Omit = omit,
+        sbfm_likely_automated: Literal["allow", "block", "managed_challenge"] | Omit = omit,
+        sbfm_static_resource_protection: bool | Omit = omit,
+        sbfm_verified_bots: Literal["allow", "block"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[BotManagementUpdateResponse]:
         """
         Updates the Bot Management configuration for a zone.
@@ -481,14 +907,75 @@ async def update(
         - **Bot Management for Enterprise**
 
         See [Bot Plans](https://developers.cloudflare.com/bots/plans/) for more
-        information on the different plans
+        information on the different plans \\
+        If you recently upgraded or downgraded your plan, refer to the following examples
+        to clean up old configurations. Copy and paste the example body to remove old zone
+        configurations based on your current plan.
+
+        #### Clean up configuration for Bot Fight Mode plan
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "sbfm_definitely_automated": "allow",
+          "sbfm_verified_bots": "allow",
+          "sbfm_static_resource_protection": false,
+          "optimize_wordpress": false,
+          "suppress_session_score": false
+        }
+        ```
+
+        #### Clean up configuration for SBFM Pro plan
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "fight_mode": false
+        }
+        ```
+
+        #### Clean up configuration for SBFM Biz plan
+
+        ```json
+        {
+          "fight_mode": false
+        }
+        ```
+
+        #### Clean up configuration for BM Enterprise Subscription plan
+
+        It is strongly recommended that you ensure you have
+        [custom rules](https://developers.cloudflare.com/waf/custom-rules/) in place to
+        protect your zone before disabling the SBFM rules. Without these protections,
+        your zone is vulnerable to attacks.
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "sbfm_definitely_automated": "allow",
+          "sbfm_verified_bots": "allow",
+          "sbfm_static_resource_protection": false,
+          "optimize_wordpress": false,
+          "fight_mode": false
+        }
+        ```
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
+
+          ai_bots_protection: Enable rule to block AI Scrapers and Crawlers. Please note the value
+              `only_on_ad_pages` is currently not available for Enterprise customers.
+
+          cf_robots_variant: Specifies the Robots Access Control License variant to use.
+
+          crawler_protection: Enable rule to punish AI Scrapers and Crawlers via a link maze.
 
           enable_js: Use lightweight, invisible JavaScript detections to improve Bot Management.
               [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
 
+          is_robots_txt_managed: Enable cloudflare managed robots.txt. If an existing robots.txt is detected,
+              then managed robots.txt will be prepended to the existing robots.txt.
+
           optimize_wordpress: Whether to optimize Super Bot Fight Mode protections for Wordpress.
 
           sbfm_definitely_automated: Super Bot Fight Mode (SBFM) action to take on definitely automated requests.
@@ -516,15 +1003,20 @@ async def update(
         self,
         *,
         zone_id: str,
-        auto_update_model: bool | NotGiven = NOT_GIVEN,
-        enable_js: bool | NotGiven = NOT_GIVEN,
-        suppress_session_score: bool | NotGiven = NOT_GIVEN,
+        ai_bots_protection: Literal["block", "disabled", "only_on_ad_pages"] | Omit = omit,
+        auto_update_model: bool | Omit = omit,
+        bm_cookie_enabled: bool | Omit = omit,
+        cf_robots_variant: Literal["off", "policy_only"] | Omit = omit,
+        crawler_protection: Literal["enabled", "disabled"] | Omit = omit,
+        enable_js: bool | Omit = omit,
+        is_robots_txt_managed: bool | Omit = omit,
+        suppress_session_score: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[BotManagementUpdateResponse]:
         """
         Updates the Bot Management configuration for a zone.
@@ -536,18 +1028,82 @@ async def update(
         - **Bot Management for Enterprise**
 
         See [Bot Plans](https://developers.cloudflare.com/bots/plans/) for more
-        information on the different plans
+        information on the different plans \\
+        If you recently upgraded or downgraded your plan, refer to the following examples
+        to clean up old configurations. Copy and paste the example body to remove old zone
+        configurations based on your current plan.
+
+        #### Clean up configuration for Bot Fight Mode plan
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "sbfm_definitely_automated": "allow",
+          "sbfm_verified_bots": "allow",
+          "sbfm_static_resource_protection": false,
+          "optimize_wordpress": false,
+          "suppress_session_score": false
+        }
+        ```
+
+        #### Clean up configuration for SBFM Pro plan
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "fight_mode": false
+        }
+        ```
+
+        #### Clean up configuration for SBFM Biz plan
+
+        ```json
+        {
+          "fight_mode": false
+        }
+        ```
+
+        #### Clean up configuration for BM Enterprise Subscription plan
+
+        It is strongly recommended that you ensure you have
+        [custom rules](https://developers.cloudflare.com/waf/custom-rules/) in place to
+        protect your zone before disabling the SBFM rules. Without these protections,
+        your zone is vulnerable to attacks.
+
+        ```json
+        {
+          "sbfm_likely_automated": "allow",
+          "sbfm_definitely_automated": "allow",
+          "sbfm_verified_bots": "allow",
+          "sbfm_static_resource_protection": false,
+          "optimize_wordpress": false,
+          "fight_mode": false
+        }
+        ```
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
+
+          ai_bots_protection: Enable rule to block AI Scrapers and Crawlers. Please note the value
+              `only_on_ad_pages` is currently not available for Enterprise customers.
 
           auto_update_model: Automatically update to the newest bot detection models created by Cloudflare as
               they are released.
               [Learn more.](https://developers.cloudflare.com/bots/reference/machine-learning-models#model-versions-and-release-notes)
 
+          bm_cookie_enabled: Indicates that the bot management cookie can be placed on end user devices
+              accessing the site. Defaults to true
+
+          cf_robots_variant: Specifies the Robots Access Control License variant to use.
+
+          crawler_protection: Enable rule to punish AI Scrapers and Crawlers via a link maze.
+
           enable_js: Use lightweight, invisible JavaScript detections to improve Bot Management.
               [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
 
+          is_robots_txt_managed: Enable cloudflare managed robots.txt. If an existing robots.txt is detected,
+              then managed robots.txt will be prepended to the existing robots.txt.
+
           suppress_session_score: Whether to disable tracking the highest bot score for a session in the Bot
               Management cookie.
 
@@ -566,21 +1122,26 @@ async def update(
         self,
         *,
         zone_id: str,
-        enable_js: bool | NotGiven = NOT_GIVEN,
-        fight_mode: bool | NotGiven = NOT_GIVEN,
-        optimize_wordpress: bool | NotGiven = NOT_GIVEN,
-        sbfm_definitely_automated: Literal["allow", "block", "managed_challenge"] | NotGiven = NOT_GIVEN,
-        sbfm_static_resource_protection: bool | NotGiven = NOT_GIVEN,
-        sbfm_verified_bots: Literal["allow", "block"] | NotGiven = NOT_GIVEN,
-        sbfm_likely_automated: Literal["allow", "block", "managed_challenge"] | NotGiven = NOT_GIVEN,
-        auto_update_model: bool | NotGiven = NOT_GIVEN,
-        suppress_session_score: bool | NotGiven = NOT_GIVEN,
+        ai_bots_protection: Literal["block", "disabled", "only_on_ad_pages"] | Omit = omit,
+        cf_robots_variant: Literal["off", "policy_only"] | Omit = omit,
+        crawler_protection: Literal["enabled", "disabled"] | Omit = omit,
+        enable_js: bool | Omit = omit,
+        fight_mode: bool | Omit = omit,
+        is_robots_txt_managed: bool | Omit = omit,
+        optimize_wordpress: bool | Omit = omit,
+        sbfm_definitely_automated: Literal["allow", "block", "managed_challenge"] | Omit = omit,
+        sbfm_static_resource_protection: bool | Omit = omit,
+        sbfm_verified_bots: Literal["allow", "block"] | Omit = omit,
+        sbfm_likely_automated: Literal["allow", "block", "managed_challenge"] | Omit = omit,
+        auto_update_model: bool | Omit = omit,
+        bm_cookie_enabled: bool | Omit = omit,
+        suppress_session_score: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[BotManagementUpdateResponse]:
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
@@ -590,14 +1151,19 @@ async def update(
                 f"/zones/{zone_id}/bot_management",
                 body=await async_maybe_transform(
                     {
+                        "ai_bots_protection": ai_bots_protection,
+                        "cf_robots_variant": cf_robots_variant,
+                        "crawler_protection": crawler_protection,
                         "enable_js": enable_js,
                         "fight_mode": fight_mode,
+                        "is_robots_txt_managed": is_robots_txt_managed,
                         "optimize_wordpress": optimize_wordpress,
                         "sbfm_definitely_automated": sbfm_definitely_automated,
                         "sbfm_static_resource_protection": sbfm_static_resource_protection,
                         "sbfm_verified_bots": sbfm_verified_bots,
                         "sbfm_likely_automated": sbfm_likely_automated,
                         "auto_update_model": auto_update_model,
+                        "bm_cookie_enabled": bm_cookie_enabled,
                         "suppress_session_score": suppress_session_score,
                     },
                     bot_management_update_params.BotManagementUpdateParams,
@@ -624,13 +1190,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[BotManagementGetResponse]:
         """
         Retrieve a zone's Bot Management Config
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/botnet_feed/__init__.py b/src/cloudflare/resources/botnet_feed/__init__.py
new file mode 100755
index 00000000000..851d69e45a1
--- /dev/null
+++ b/src/cloudflare/resources/botnet_feed/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .asn import (
+    ASNResource,
+    AsyncASNResource,
+    ASNResourceWithRawResponse,
+    AsyncASNResourceWithRawResponse,
+    ASNResourceWithStreamingResponse,
+    AsyncASNResourceWithStreamingResponse,
+)
+from .configs import (
+    ConfigsResource,
+    AsyncConfigsResource,
+    ConfigsResourceWithRawResponse,
+    AsyncConfigsResourceWithRawResponse,
+    ConfigsResourceWithStreamingResponse,
+    AsyncConfigsResourceWithStreamingResponse,
+)
+from .botnet_feed import (
+    BotnetFeedResource,
+    AsyncBotnetFeedResource,
+    BotnetFeedResourceWithRawResponse,
+    AsyncBotnetFeedResourceWithRawResponse,
+    BotnetFeedResourceWithStreamingResponse,
+    AsyncBotnetFeedResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ASNResource",
+    "AsyncASNResource",
+    "ASNResourceWithRawResponse",
+    "AsyncASNResourceWithRawResponse",
+    "ASNResourceWithStreamingResponse",
+    "AsyncASNResourceWithStreamingResponse",
+    "ConfigsResource",
+    "AsyncConfigsResource",
+    "ConfigsResourceWithRawResponse",
+    "AsyncConfigsResourceWithRawResponse",
+    "ConfigsResourceWithStreamingResponse",
+    "AsyncConfigsResourceWithStreamingResponse",
+    "BotnetFeedResource",
+    "AsyncBotnetFeedResource",
+    "BotnetFeedResourceWithRawResponse",
+    "AsyncBotnetFeedResourceWithRawResponse",
+    "BotnetFeedResourceWithStreamingResponse",
+    "AsyncBotnetFeedResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/botnet_feed/asn.py b/src/cloudflare/resources/botnet_feed/asn.py
new file mode 100755
index 00000000000..285845ee622
--- /dev/null
+++ b/src/cloudflare/resources/botnet_feed/asn.py
@@ -0,0 +1,286 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Union, Optional, cast
+from datetime import datetime
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.botnet_feed import asn_day_report_params
+from ...types.botnet_feed.asn_day_report_response import ASNDayReportResponse
+from ...types.botnet_feed.asn_full_report_response import ASNFullReportResponse
+
+__all__ = ["ASNResource", "AsyncASNResource"]
+
+
+class ASNResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ASNResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ASNResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ASNResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ASNResourceWithStreamingResponse(self)
+
+    def day_report(
+        self,
+        asn_id: int,
+        *,
+        account_id: str,
+        date: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ASNDayReportResponse]:
+        """
+        Gets all the data the botnet tracking database has for a given ASN registered to
+        user account for given date. If no date is given, it will return results for the
+        previous day.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/botnet_feed/asn/{asn_id}/day_report",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"date": date}, asn_day_report_params.ASNDayReportParams),
+                post_parser=ResultWrapper[Optional[ASNDayReportResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ASNDayReportResponse]], ResultWrapper[ASNDayReportResponse]),
+        )
+
+    def full_report(
+        self,
+        asn_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ASNFullReportResponse]:
+        """
+        Gets all the data the botnet threat feed tracking database has for a given ASN
+        registered to user account.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/botnet_feed/asn/{asn_id}/full_report",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ASNFullReportResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ASNFullReportResponse]], ResultWrapper[ASNFullReportResponse]),
+        )
+
+
+class AsyncASNResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncASNResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncASNResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncASNResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncASNResourceWithStreamingResponse(self)
+
+    async def day_report(
+        self,
+        asn_id: int,
+        *,
+        account_id: str,
+        date: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ASNDayReportResponse]:
+        """
+        Gets all the data the botnet tracking database has for a given ASN registered to
+        user account for given date. If no date is given, it will return results for the
+        previous day.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/botnet_feed/asn/{asn_id}/day_report",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"date": date}, asn_day_report_params.ASNDayReportParams),
+                post_parser=ResultWrapper[Optional[ASNDayReportResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ASNDayReportResponse]], ResultWrapper[ASNDayReportResponse]),
+        )
+
+    async def full_report(
+        self,
+        asn_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ASNFullReportResponse]:
+        """
+        Gets all the data the botnet threat feed tracking database has for a given ASN
+        registered to user account.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/botnet_feed/asn/{asn_id}/full_report",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ASNFullReportResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ASNFullReportResponse]], ResultWrapper[ASNFullReportResponse]),
+        )
+
+
+class ASNResourceWithRawResponse:
+    def __init__(self, asn: ASNResource) -> None:
+        self._asn = asn
+
+        self.day_report = to_raw_response_wrapper(
+            asn.day_report,
+        )
+        self.full_report = to_raw_response_wrapper(
+            asn.full_report,
+        )
+
+
+class AsyncASNResourceWithRawResponse:
+    def __init__(self, asn: AsyncASNResource) -> None:
+        self._asn = asn
+
+        self.day_report = async_to_raw_response_wrapper(
+            asn.day_report,
+        )
+        self.full_report = async_to_raw_response_wrapper(
+            asn.full_report,
+        )
+
+
+class ASNResourceWithStreamingResponse:
+    def __init__(self, asn: ASNResource) -> None:
+        self._asn = asn
+
+        self.day_report = to_streamed_response_wrapper(
+            asn.day_report,
+        )
+        self.full_report = to_streamed_response_wrapper(
+            asn.full_report,
+        )
+
+
+class AsyncASNResourceWithStreamingResponse:
+    def __init__(self, asn: AsyncASNResource) -> None:
+        self._asn = asn
+
+        self.day_report = async_to_streamed_response_wrapper(
+            asn.day_report,
+        )
+        self.full_report = async_to_streamed_response_wrapper(
+            asn.full_report,
+        )
diff --git a/src/cloudflare/resources/botnet_feed/botnet_feed.py b/src/cloudflare/resources/botnet_feed/botnet_feed.py
new file mode 100755
index 00000000000..5f71396a78d
--- /dev/null
+++ b/src/cloudflare/resources/botnet_feed/botnet_feed.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .asn import (
+    ASNResource,
+    AsyncASNResource,
+    ASNResourceWithRawResponse,
+    AsyncASNResourceWithRawResponse,
+    ASNResourceWithStreamingResponse,
+    AsyncASNResourceWithStreamingResponse,
+)
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .configs.configs import (
+    ConfigsResource,
+    AsyncConfigsResource,
+    ConfigsResourceWithRawResponse,
+    AsyncConfigsResourceWithRawResponse,
+    ConfigsResourceWithStreamingResponse,
+    AsyncConfigsResourceWithStreamingResponse,
+)
+
+__all__ = ["BotnetFeedResource", "AsyncBotnetFeedResource"]
+
+
+class BotnetFeedResource(SyncAPIResource):
+    @cached_property
+    def asn(self) -> ASNResource:
+        return ASNResource(self._client)
+
+    @cached_property
+    def configs(self) -> ConfigsResource:
+        return ConfigsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> BotnetFeedResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return BotnetFeedResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> BotnetFeedResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return BotnetFeedResourceWithStreamingResponse(self)
+
+
+class AsyncBotnetFeedResource(AsyncAPIResource):
+    @cached_property
+    def asn(self) -> AsyncASNResource:
+        return AsyncASNResource(self._client)
+
+    @cached_property
+    def configs(self) -> AsyncConfigsResource:
+        return AsyncConfigsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncBotnetFeedResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncBotnetFeedResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncBotnetFeedResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncBotnetFeedResourceWithStreamingResponse(self)
+
+
+class BotnetFeedResourceWithRawResponse:
+    def __init__(self, botnet_feed: BotnetFeedResource) -> None:
+        self._botnet_feed = botnet_feed
+
+    @cached_property
+    def asn(self) -> ASNResourceWithRawResponse:
+        return ASNResourceWithRawResponse(self._botnet_feed.asn)
+
+    @cached_property
+    def configs(self) -> ConfigsResourceWithRawResponse:
+        return ConfigsResourceWithRawResponse(self._botnet_feed.configs)
+
+
+class AsyncBotnetFeedResourceWithRawResponse:
+    def __init__(self, botnet_feed: AsyncBotnetFeedResource) -> None:
+        self._botnet_feed = botnet_feed
+
+    @cached_property
+    def asn(self) -> AsyncASNResourceWithRawResponse:
+        return AsyncASNResourceWithRawResponse(self._botnet_feed.asn)
+
+    @cached_property
+    def configs(self) -> AsyncConfigsResourceWithRawResponse:
+        return AsyncConfigsResourceWithRawResponse(self._botnet_feed.configs)
+
+
+class BotnetFeedResourceWithStreamingResponse:
+    def __init__(self, botnet_feed: BotnetFeedResource) -> None:
+        self._botnet_feed = botnet_feed
+
+    @cached_property
+    def asn(self) -> ASNResourceWithStreamingResponse:
+        return ASNResourceWithStreamingResponse(self._botnet_feed.asn)
+
+    @cached_property
+    def configs(self) -> ConfigsResourceWithStreamingResponse:
+        return ConfigsResourceWithStreamingResponse(self._botnet_feed.configs)
+
+
+class AsyncBotnetFeedResourceWithStreamingResponse:
+    def __init__(self, botnet_feed: AsyncBotnetFeedResource) -> None:
+        self._botnet_feed = botnet_feed
+
+    @cached_property
+    def asn(self) -> AsyncASNResourceWithStreamingResponse:
+        return AsyncASNResourceWithStreamingResponse(self._botnet_feed.asn)
+
+    @cached_property
+    def configs(self) -> AsyncConfigsResourceWithStreamingResponse:
+        return AsyncConfigsResourceWithStreamingResponse(self._botnet_feed.configs)
diff --git a/src/cloudflare/resources/botnet_feed/configs/__init__.py b/src/cloudflare/resources/botnet_feed/configs/__init__.py
new file mode 100755
index 00000000000..8aa8841973c
--- /dev/null
+++ b/src/cloudflare/resources/botnet_feed/configs/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .asn import (
+    ASNResource,
+    AsyncASNResource,
+    ASNResourceWithRawResponse,
+    AsyncASNResourceWithRawResponse,
+    ASNResourceWithStreamingResponse,
+    AsyncASNResourceWithStreamingResponse,
+)
+from .configs import (
+    ConfigsResource,
+    AsyncConfigsResource,
+    ConfigsResourceWithRawResponse,
+    AsyncConfigsResourceWithRawResponse,
+    ConfigsResourceWithStreamingResponse,
+    AsyncConfigsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ASNResource",
+    "AsyncASNResource",
+    "ASNResourceWithRawResponse",
+    "AsyncASNResourceWithRawResponse",
+    "ASNResourceWithStreamingResponse",
+    "AsyncASNResourceWithStreamingResponse",
+    "ConfigsResource",
+    "AsyncConfigsResource",
+    "ConfigsResourceWithRawResponse",
+    "AsyncConfigsResourceWithRawResponse",
+    "ConfigsResourceWithStreamingResponse",
+    "AsyncConfigsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/botnet_feed/configs/asn.py b/src/cloudflare/resources/botnet_feed/configs/asn.py
new file mode 100755
index 00000000000..e8cf0754eb4
--- /dev/null
+++ b/src/cloudflare/resources/botnet_feed/configs/asn.py
@@ -0,0 +1,271 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.botnet_feed.configs.asn_get_response import ASNGetResponse
+from ....types.botnet_feed.configs.asn_delete_response import ASNDeleteResponse
+
+__all__ = ["ASNResource", "AsyncASNResource"]
+
+
+class ASNResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ASNResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ASNResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ASNResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ASNResourceWithStreamingResponse(self)
+
+    def delete(
+        self,
+        asn_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ASNDeleteResponse]:
+        """
+        Delete an ASN from botnet threat feed for a given user.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/botnet_feed/configs/asn/{asn_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ASNDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ASNDeleteResponse]], ResultWrapper[ASNDeleteResponse]),
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ASNGetResponse]:
+        """
+        Gets a list of all ASNs registered for a user for the DDoS Botnet Feed API.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/botnet_feed/configs/asn",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ASNGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ASNGetResponse]], ResultWrapper[ASNGetResponse]),
+        )
+
+
+class AsyncASNResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncASNResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncASNResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncASNResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncASNResourceWithStreamingResponse(self)
+
+    async def delete(
+        self,
+        asn_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ASNDeleteResponse]:
+        """
+        Delete an ASN from botnet threat feed for a given user.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/botnet_feed/configs/asn/{asn_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ASNDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ASNDeleteResponse]], ResultWrapper[ASNDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ASNGetResponse]:
+        """
+        Gets a list of all ASNs registered for a user for the DDoS Botnet Feed API.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/botnet_feed/configs/asn",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ASNGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ASNGetResponse]], ResultWrapper[ASNGetResponse]),
+        )
+
+
+class ASNResourceWithRawResponse:
+    def __init__(self, asn: ASNResource) -> None:
+        self._asn = asn
+
+        self.delete = to_raw_response_wrapper(
+            asn.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            asn.get,
+        )
+
+
+class AsyncASNResourceWithRawResponse:
+    def __init__(self, asn: AsyncASNResource) -> None:
+        self._asn = asn
+
+        self.delete = async_to_raw_response_wrapper(
+            asn.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            asn.get,
+        )
+
+
+class ASNResourceWithStreamingResponse:
+    def __init__(self, asn: ASNResource) -> None:
+        self._asn = asn
+
+        self.delete = to_streamed_response_wrapper(
+            asn.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            asn.get,
+        )
+
+
+class AsyncASNResourceWithStreamingResponse:
+    def __init__(self, asn: AsyncASNResource) -> None:
+        self._asn = asn
+
+        self.delete = async_to_streamed_response_wrapper(
+            asn.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            asn.get,
+        )
diff --git a/src/cloudflare/resources/botnet_feed/configs/configs.py b/src/cloudflare/resources/botnet_feed/configs/configs.py
new file mode 100755
index 00000000000..6fe692cec0c
--- /dev/null
+++ b/src/cloudflare/resources/botnet_feed/configs/configs.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .asn import (
+    ASNResource,
+    AsyncASNResource,
+    ASNResourceWithRawResponse,
+    AsyncASNResourceWithRawResponse,
+    ASNResourceWithStreamingResponse,
+    AsyncASNResourceWithStreamingResponse,
+)
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["ConfigsResource", "AsyncConfigsResource"]
+
+
+class ConfigsResource(SyncAPIResource):
+    @cached_property
+    def asn(self) -> ASNResource:
+        return ASNResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> ConfigsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ConfigsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ConfigsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ConfigsResourceWithStreamingResponse(self)
+
+
+class AsyncConfigsResource(AsyncAPIResource):
+    @cached_property
+    def asn(self) -> AsyncASNResource:
+        return AsyncASNResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncConfigsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncConfigsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncConfigsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncConfigsResourceWithStreamingResponse(self)
+
+
+class ConfigsResourceWithRawResponse:
+    def __init__(self, configs: ConfigsResource) -> None:
+        self._configs = configs
+
+    @cached_property
+    def asn(self) -> ASNResourceWithRawResponse:
+        return ASNResourceWithRawResponse(self._configs.asn)
+
+
+class AsyncConfigsResourceWithRawResponse:
+    def __init__(self, configs: AsyncConfigsResource) -> None:
+        self._configs = configs
+
+    @cached_property
+    def asn(self) -> AsyncASNResourceWithRawResponse:
+        return AsyncASNResourceWithRawResponse(self._configs.asn)
+
+
+class ConfigsResourceWithStreamingResponse:
+    def __init__(self, configs: ConfigsResource) -> None:
+        self._configs = configs
+
+    @cached_property
+    def asn(self) -> ASNResourceWithStreamingResponse:
+        return ASNResourceWithStreamingResponse(self._configs.asn)
+
+
+class AsyncConfigsResourceWithStreamingResponse:
+    def __init__(self, configs: AsyncConfigsResource) -> None:
+        self._configs = configs
+
+    @cached_property
+    def asn(self) -> AsyncASNResourceWithStreamingResponse:
+        return AsyncASNResourceWithStreamingResponse(self._configs.asn)
diff --git a/src/cloudflare/resources/brand_protection.py b/src/cloudflare/resources/brand_protection.py
deleted file mode 100644
index ce9193d61eb..00000000000
--- a/src/cloudflare/resources/brand_protection.py
+++ /dev/null
@@ -1,278 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Optional, cast
-
-import httpx
-
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from .._compat import cached_property
-from .._resource import SyncAPIResource, AsyncAPIResource
-from .._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from .._wrappers import ResultWrapper
-from .._base_client import make_request_options
-from ..types.brand_protection import brand_protection_submit_params, brand_protection_url_info_params
-from ..types.brand_protection.info import Info
-from ..types.brand_protection.submit import Submit
-
-__all__ = ["BrandProtectionResource", "AsyncBrandProtectionResource"]
-
-
-class BrandProtectionResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> BrandProtectionResourceWithRawResponse:
-        return BrandProtectionResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> BrandProtectionResourceWithStreamingResponse:
-        return BrandProtectionResourceWithStreamingResponse(self)
-
-    def submit(
-        self,
-        *,
-        account_id: str,
-        url: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Submit]:
-        """
-        Submit suspicious URL for scanning
-
-        Args:
-          account_id: Identifier
-
-          url: URL(s) to filter submissions results by
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._post(
-            f"/accounts/{account_id}/brand-protection/submit",
-            body=maybe_transform({"url": url}, brand_protection_submit_params.BrandProtectionSubmitParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[Submit]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Submit]], ResultWrapper[Submit]),
-        )
-
-    def url_info(
-        self,
-        *,
-        account_id: str,
-        url: str | NotGiven = NOT_GIVEN,
-        url_id_param: brand_protection_url_info_params.URLIDParam | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Info]:
-        """
-        Get results for a URL scan
-
-        Args:
-          account_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/brand-protection/url-info",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "url": url,
-                        "url_id_param": url_id_param,
-                    },
-                    brand_protection_url_info_params.BrandProtectionURLInfoParams,
-                ),
-                post_parser=ResultWrapper[Optional[Info]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Info]], ResultWrapper[Info]),
-        )
-
-
-class AsyncBrandProtectionResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncBrandProtectionResourceWithRawResponse:
-        return AsyncBrandProtectionResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncBrandProtectionResourceWithStreamingResponse:
-        return AsyncBrandProtectionResourceWithStreamingResponse(self)
-
-    async def submit(
-        self,
-        *,
-        account_id: str,
-        url: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Submit]:
-        """
-        Submit suspicious URL for scanning
-
-        Args:
-          account_id: Identifier
-
-          url: URL(s) to filter submissions results by
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._post(
-            f"/accounts/{account_id}/brand-protection/submit",
-            body=await async_maybe_transform({"url": url}, brand_protection_submit_params.BrandProtectionSubmitParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[Submit]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Submit]], ResultWrapper[Submit]),
-        )
-
-    async def url_info(
-        self,
-        *,
-        account_id: str,
-        url: str | NotGiven = NOT_GIVEN,
-        url_id_param: brand_protection_url_info_params.URLIDParam | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Info]:
-        """
-        Get results for a URL scan
-
-        Args:
-          account_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/brand-protection/url-info",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=await async_maybe_transform(
-                    {
-                        "url": url,
-                        "url_id_param": url_id_param,
-                    },
-                    brand_protection_url_info_params.BrandProtectionURLInfoParams,
-                ),
-                post_parser=ResultWrapper[Optional[Info]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Info]], ResultWrapper[Info]),
-        )
-
-
-class BrandProtectionResourceWithRawResponse:
-    def __init__(self, brand_protection: BrandProtectionResource) -> None:
-        self._brand_protection = brand_protection
-
-        self.submit = to_raw_response_wrapper(
-            brand_protection.submit,
-        )
-        self.url_info = to_raw_response_wrapper(
-            brand_protection.url_info,
-        )
-
-
-class AsyncBrandProtectionResourceWithRawResponse:
-    def __init__(self, brand_protection: AsyncBrandProtectionResource) -> None:
-        self._brand_protection = brand_protection
-
-        self.submit = async_to_raw_response_wrapper(
-            brand_protection.submit,
-        )
-        self.url_info = async_to_raw_response_wrapper(
-            brand_protection.url_info,
-        )
-
-
-class BrandProtectionResourceWithStreamingResponse:
-    def __init__(self, brand_protection: BrandProtectionResource) -> None:
-        self._brand_protection = brand_protection
-
-        self.submit = to_streamed_response_wrapper(
-            brand_protection.submit,
-        )
-        self.url_info = to_streamed_response_wrapper(
-            brand_protection.url_info,
-        )
-
-
-class AsyncBrandProtectionResourceWithStreamingResponse:
-    def __init__(self, brand_protection: AsyncBrandProtectionResource) -> None:
-        self._brand_protection = brand_protection
-
-        self.submit = async_to_streamed_response_wrapper(
-            brand_protection.submit,
-        )
-        self.url_info = async_to_streamed_response_wrapper(
-            brand_protection.url_info,
-        )
diff --git a/src/cloudflare/resources/brand_protection/__init__.py b/src/cloudflare/resources/brand_protection/__init__.py
new file mode 100644
index 00000000000..1660f110c9b
--- /dev/null
+++ b/src/cloudflare/resources/brand_protection/__init__.py
@@ -0,0 +1,75 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .logos import (
+    LogosResource,
+    AsyncLogosResource,
+    LogosResourceWithRawResponse,
+    AsyncLogosResourceWithRawResponse,
+    LogosResourceWithStreamingResponse,
+    AsyncLogosResourceWithStreamingResponse,
+)
+from .matches import (
+    MatchesResource,
+    AsyncMatchesResource,
+    MatchesResourceWithRawResponse,
+    AsyncMatchesResourceWithRawResponse,
+    MatchesResourceWithStreamingResponse,
+    AsyncMatchesResourceWithStreamingResponse,
+)
+from .queries import (
+    QueriesResource,
+    AsyncQueriesResource,
+    QueriesResourceWithRawResponse,
+    AsyncQueriesResourceWithRawResponse,
+    QueriesResourceWithStreamingResponse,
+    AsyncQueriesResourceWithStreamingResponse,
+)
+from .logo_matches import (
+    LogoMatchesResource,
+    AsyncLogoMatchesResource,
+    LogoMatchesResourceWithRawResponse,
+    AsyncLogoMatchesResourceWithRawResponse,
+    LogoMatchesResourceWithStreamingResponse,
+    AsyncLogoMatchesResourceWithStreamingResponse,
+)
+from .brand_protection import (
+    BrandProtectionResource,
+    AsyncBrandProtectionResource,
+    BrandProtectionResourceWithRawResponse,
+    AsyncBrandProtectionResourceWithRawResponse,
+    BrandProtectionResourceWithStreamingResponse,
+    AsyncBrandProtectionResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "QueriesResource",
+    "AsyncQueriesResource",
+    "QueriesResourceWithRawResponse",
+    "AsyncQueriesResourceWithRawResponse",
+    "QueriesResourceWithStreamingResponse",
+    "AsyncQueriesResourceWithStreamingResponse",
+    "MatchesResource",
+    "AsyncMatchesResource",
+    "MatchesResourceWithRawResponse",
+    "AsyncMatchesResourceWithRawResponse",
+    "MatchesResourceWithStreamingResponse",
+    "AsyncMatchesResourceWithStreamingResponse",
+    "LogosResource",
+    "AsyncLogosResource",
+    "LogosResourceWithRawResponse",
+    "AsyncLogosResourceWithRawResponse",
+    "LogosResourceWithStreamingResponse",
+    "AsyncLogosResourceWithStreamingResponse",
+    "LogoMatchesResource",
+    "AsyncLogoMatchesResource",
+    "LogoMatchesResourceWithRawResponse",
+    "AsyncLogoMatchesResourceWithRawResponse",
+    "LogoMatchesResourceWithStreamingResponse",
+    "AsyncLogoMatchesResourceWithStreamingResponse",
+    "BrandProtectionResource",
+    "AsyncBrandProtectionResource",
+    "BrandProtectionResourceWithRawResponse",
+    "AsyncBrandProtectionResourceWithRawResponse",
+    "BrandProtectionResourceWithStreamingResponse",
+    "AsyncBrandProtectionResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/brand_protection/brand_protection.py b/src/cloudflare/resources/brand_protection/brand_protection.py
new file mode 100644
index 00000000000..efe44ec7d57
--- /dev/null
+++ b/src/cloudflare/resources/brand_protection/brand_protection.py
@@ -0,0 +1,373 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from .logos import (
+    LogosResource,
+    AsyncLogosResource,
+    LogosResourceWithRawResponse,
+    AsyncLogosResourceWithRawResponse,
+    LogosResourceWithStreamingResponse,
+    AsyncLogosResourceWithStreamingResponse,
+)
+from .matches import (
+    MatchesResource,
+    AsyncMatchesResource,
+    MatchesResourceWithRawResponse,
+    AsyncMatchesResourceWithRawResponse,
+    MatchesResourceWithStreamingResponse,
+    AsyncMatchesResourceWithStreamingResponse,
+)
+from .queries import (
+    QueriesResource,
+    AsyncQueriesResource,
+    QueriesResourceWithRawResponse,
+    AsyncQueriesResourceWithRawResponse,
+    QueriesResourceWithStreamingResponse,
+    AsyncQueriesResourceWithStreamingResponse,
+)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from .logo_matches import (
+    LogoMatchesResource,
+    AsyncLogoMatchesResource,
+    LogoMatchesResourceWithRawResponse,
+    AsyncLogoMatchesResourceWithRawResponse,
+    LogoMatchesResourceWithStreamingResponse,
+    AsyncLogoMatchesResourceWithStreamingResponse,
+)
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.brand_protection.brand_protection_submit_response import BrandProtectionSubmitResponse
+from ...types.brand_protection.brand_protection_url_info_response import BrandProtectionURLInfoResponse
+
+__all__ = ["BrandProtectionResource", "AsyncBrandProtectionResource"]
+
+
+class BrandProtectionResource(SyncAPIResource):
+    @cached_property
+    def queries(self) -> QueriesResource:
+        return QueriesResource(self._client)
+
+    @cached_property
+    def matches(self) -> MatchesResource:
+        return MatchesResource(self._client)
+
+    @cached_property
+    def logos(self) -> LogosResource:
+        return LogosResource(self._client)
+
+    @cached_property
+    def logo_matches(self) -> LogoMatchesResource:
+        return LogoMatchesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> BrandProtectionResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return BrandProtectionResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> BrandProtectionResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return BrandProtectionResourceWithStreamingResponse(self)
+
+    def submit(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BrandProtectionSubmitResponse:
+        """
+        Return new URL submissions
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/brand-protection/submit",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=BrandProtectionSubmitResponse,
+        )
+
+    def url_info(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[BrandProtectionURLInfoResponse]:
+        """
+        Return submitted URLs based on ID
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/brand-protection/url-info",
+            page=SyncSinglePage[BrandProtectionURLInfoResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=BrandProtectionURLInfoResponse,
+        )
+
+
+class AsyncBrandProtectionResource(AsyncAPIResource):
+    @cached_property
+    def queries(self) -> AsyncQueriesResource:
+        return AsyncQueriesResource(self._client)
+
+    @cached_property
+    def matches(self) -> AsyncMatchesResource:
+        return AsyncMatchesResource(self._client)
+
+    @cached_property
+    def logos(self) -> AsyncLogosResource:
+        return AsyncLogosResource(self._client)
+
+    @cached_property
+    def logo_matches(self) -> AsyncLogoMatchesResource:
+        return AsyncLogoMatchesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncBrandProtectionResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncBrandProtectionResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncBrandProtectionResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncBrandProtectionResourceWithStreamingResponse(self)
+
+    async def submit(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BrandProtectionSubmitResponse:
+        """
+        Return new URL submissions
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/brand-protection/submit",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=BrandProtectionSubmitResponse,
+        )
+
+    def url_info(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[BrandProtectionURLInfoResponse, AsyncSinglePage[BrandProtectionURLInfoResponse]]:
+        """
+        Return submitted URLs based on ID
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/brand-protection/url-info",
+            page=AsyncSinglePage[BrandProtectionURLInfoResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=BrandProtectionURLInfoResponse,
+        )
+
+
+class BrandProtectionResourceWithRawResponse:
+    def __init__(self, brand_protection: BrandProtectionResource) -> None:
+        self._brand_protection = brand_protection
+
+        self.submit = to_raw_response_wrapper(
+            brand_protection.submit,
+        )
+        self.url_info = to_raw_response_wrapper(
+            brand_protection.url_info,
+        )
+
+    @cached_property
+    def queries(self) -> QueriesResourceWithRawResponse:
+        return QueriesResourceWithRawResponse(self._brand_protection.queries)
+
+    @cached_property
+    def matches(self) -> MatchesResourceWithRawResponse:
+        return MatchesResourceWithRawResponse(self._brand_protection.matches)
+
+    @cached_property
+    def logos(self) -> LogosResourceWithRawResponse:
+        return LogosResourceWithRawResponse(self._brand_protection.logos)
+
+    @cached_property
+    def logo_matches(self) -> LogoMatchesResourceWithRawResponse:
+        return LogoMatchesResourceWithRawResponse(self._brand_protection.logo_matches)
+
+
+class AsyncBrandProtectionResourceWithRawResponse:
+    def __init__(self, brand_protection: AsyncBrandProtectionResource) -> None:
+        self._brand_protection = brand_protection
+
+        self.submit = async_to_raw_response_wrapper(
+            brand_protection.submit,
+        )
+        self.url_info = async_to_raw_response_wrapper(
+            brand_protection.url_info,
+        )
+
+    @cached_property
+    def queries(self) -> AsyncQueriesResourceWithRawResponse:
+        return AsyncQueriesResourceWithRawResponse(self._brand_protection.queries)
+
+    @cached_property
+    def matches(self) -> AsyncMatchesResourceWithRawResponse:
+        return AsyncMatchesResourceWithRawResponse(self._brand_protection.matches)
+
+    @cached_property
+    def logos(self) -> AsyncLogosResourceWithRawResponse:
+        return AsyncLogosResourceWithRawResponse(self._brand_protection.logos)
+
+    @cached_property
+    def logo_matches(self) -> AsyncLogoMatchesResourceWithRawResponse:
+        return AsyncLogoMatchesResourceWithRawResponse(self._brand_protection.logo_matches)
+
+
+class BrandProtectionResourceWithStreamingResponse:
+    def __init__(self, brand_protection: BrandProtectionResource) -> None:
+        self._brand_protection = brand_protection
+
+        self.submit = to_streamed_response_wrapper(
+            brand_protection.submit,
+        )
+        self.url_info = to_streamed_response_wrapper(
+            brand_protection.url_info,
+        )
+
+    @cached_property
+    def queries(self) -> QueriesResourceWithStreamingResponse:
+        return QueriesResourceWithStreamingResponse(self._brand_protection.queries)
+
+    @cached_property
+    def matches(self) -> MatchesResourceWithStreamingResponse:
+        return MatchesResourceWithStreamingResponse(self._brand_protection.matches)
+
+    @cached_property
+    def logos(self) -> LogosResourceWithStreamingResponse:
+        return LogosResourceWithStreamingResponse(self._brand_protection.logos)
+
+    @cached_property
+    def logo_matches(self) -> LogoMatchesResourceWithStreamingResponse:
+        return LogoMatchesResourceWithStreamingResponse(self._brand_protection.logo_matches)
+
+
+class AsyncBrandProtectionResourceWithStreamingResponse:
+    def __init__(self, brand_protection: AsyncBrandProtectionResource) -> None:
+        self._brand_protection = brand_protection
+
+        self.submit = async_to_streamed_response_wrapper(
+            brand_protection.submit,
+        )
+        self.url_info = async_to_streamed_response_wrapper(
+            brand_protection.url_info,
+        )
+
+    @cached_property
+    def queries(self) -> AsyncQueriesResourceWithStreamingResponse:
+        return AsyncQueriesResourceWithStreamingResponse(self._brand_protection.queries)
+
+    @cached_property
+    def matches(self) -> AsyncMatchesResourceWithStreamingResponse:
+        return AsyncMatchesResourceWithStreamingResponse(self._brand_protection.matches)
+
+    @cached_property
+    def logos(self) -> AsyncLogosResourceWithStreamingResponse:
+        return AsyncLogosResourceWithStreamingResponse(self._brand_protection.logos)
+
+    @cached_property
+    def logo_matches(self) -> AsyncLogoMatchesResourceWithStreamingResponse:
+        return AsyncLogoMatchesResourceWithStreamingResponse(self._brand_protection.logo_matches)
diff --git a/src/cloudflare/resources/brand_protection/logo_matches.py b/src/cloudflare/resources/brand_protection/logo_matches.py
new file mode 100644
index 00000000000..abe100862e5
--- /dev/null
+++ b/src/cloudflare/resources/brand_protection/logo_matches.py
@@ -0,0 +1,300 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.brand_protection import logo_match_get_params, logo_match_download_params
+from ...types.brand_protection.logo_match_get_response import LogoMatchGetResponse
+from ...types.brand_protection.logo_match_download_response import LogoMatchDownloadResponse
+
+__all__ = ["LogoMatchesResource", "AsyncLogoMatchesResource"]
+
+
+class LogoMatchesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> LogoMatchesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return LogoMatchesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> LogoMatchesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return LogoMatchesResourceWithStreamingResponse(self)
+
+    def download(
+        self,
+        *,
+        account_id: str,
+        limit: str | Omit = omit,
+        logo_id: SequenceNotStr[str] | Omit = omit,
+        offset: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LogoMatchDownloadResponse:
+        """
+        Return matches as CSV for logo queries based on ID
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/brand-protection/logo-matches/download",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "limit": limit,
+                        "logo_id": logo_id,
+                        "offset": offset,
+                    },
+                    logo_match_download_params.LogoMatchDownloadParams,
+                ),
+            ),
+            cast_to=LogoMatchDownloadResponse,
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        limit: str | Omit = omit,
+        logo_id: SequenceNotStr[str] | Omit = omit,
+        offset: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LogoMatchGetResponse:
+        """
+        Return matches for logo queries based on ID
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/brand-protection/logo-matches",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "limit": limit,
+                        "logo_id": logo_id,
+                        "offset": offset,
+                    },
+                    logo_match_get_params.LogoMatchGetParams,
+                ),
+            ),
+            cast_to=LogoMatchGetResponse,
+        )
+
+
+class AsyncLogoMatchesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncLogoMatchesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncLogoMatchesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncLogoMatchesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncLogoMatchesResourceWithStreamingResponse(self)
+
+    async def download(
+        self,
+        *,
+        account_id: str,
+        limit: str | Omit = omit,
+        logo_id: SequenceNotStr[str] | Omit = omit,
+        offset: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LogoMatchDownloadResponse:
+        """
+        Return matches as CSV for logo queries based on ID
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/brand-protection/logo-matches/download",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "limit": limit,
+                        "logo_id": logo_id,
+                        "offset": offset,
+                    },
+                    logo_match_download_params.LogoMatchDownloadParams,
+                ),
+            ),
+            cast_to=LogoMatchDownloadResponse,
+        )
+
+    async def get(
+        self,
+        *,
+        account_id: str,
+        limit: str | Omit = omit,
+        logo_id: SequenceNotStr[str] | Omit = omit,
+        offset: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LogoMatchGetResponse:
+        """
+        Return matches for logo queries based on ID
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/brand-protection/logo-matches",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "limit": limit,
+                        "logo_id": logo_id,
+                        "offset": offset,
+                    },
+                    logo_match_get_params.LogoMatchGetParams,
+                ),
+            ),
+            cast_to=LogoMatchGetResponse,
+        )
+
+
+class LogoMatchesResourceWithRawResponse:
+    def __init__(self, logo_matches: LogoMatchesResource) -> None:
+        self._logo_matches = logo_matches
+
+        self.download = to_raw_response_wrapper(
+            logo_matches.download,
+        )
+        self.get = to_raw_response_wrapper(
+            logo_matches.get,
+        )
+
+
+class AsyncLogoMatchesResourceWithRawResponse:
+    def __init__(self, logo_matches: AsyncLogoMatchesResource) -> None:
+        self._logo_matches = logo_matches
+
+        self.download = async_to_raw_response_wrapper(
+            logo_matches.download,
+        )
+        self.get = async_to_raw_response_wrapper(
+            logo_matches.get,
+        )
+
+
+class LogoMatchesResourceWithStreamingResponse:
+    def __init__(self, logo_matches: LogoMatchesResource) -> None:
+        self._logo_matches = logo_matches
+
+        self.download = to_streamed_response_wrapper(
+            logo_matches.download,
+        )
+        self.get = to_streamed_response_wrapper(
+            logo_matches.get,
+        )
+
+
+class AsyncLogoMatchesResourceWithStreamingResponse:
+    def __init__(self, logo_matches: AsyncLogoMatchesResource) -> None:
+        self._logo_matches = logo_matches
+
+        self.download = async_to_streamed_response_wrapper(
+            logo_matches.download,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            logo_matches.get,
+        )
diff --git a/src/cloudflare/resources/brand_protection/logos.py b/src/cloudflare/resources/brand_protection/logos.py
new file mode 100644
index 00000000000..fb55402f7e7
--- /dev/null
+++ b/src/cloudflare/resources/brand_protection/logos.py
@@ -0,0 +1,283 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NoneType, NotGiven, FileTypes, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.brand_protection import logo_create_params
+from ...types.brand_protection.logo_create_response import LogoCreateResponse
+
+__all__ = ["LogosResource", "AsyncLogosResource"]
+
+
+class LogosResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> LogosResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return LogosResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> LogosResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return LogosResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        match_type: str | Omit = omit,
+        tag: str | Omit = omit,
+        threshold: float | Omit = omit,
+        image: FileTypes | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LogoCreateResponse:
+        """
+        Return new saved logo queries created from image files
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/brand-protection/logos",
+            body=maybe_transform({"image": image}, logo_create_params.LogoCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "match_type": match_type,
+                        "tag": tag,
+                        "threshold": threshold,
+                    },
+                    logo_create_params.LogoCreateParams,
+                ),
+            ),
+            cast_to=LogoCreateResponse,
+        )
+
+    def delete(
+        self,
+        logo_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Return a success message after deleting saved logo queries by ID
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not logo_id:
+            raise ValueError(f"Expected a non-empty value for `logo_id` but received {logo_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._delete(
+            f"/accounts/{account_id}/brand-protection/logos/{logo_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+
+class AsyncLogosResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncLogosResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncLogosResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncLogosResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncLogosResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        match_type: str | Omit = omit,
+        tag: str | Omit = omit,
+        threshold: float | Omit = omit,
+        image: FileTypes | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LogoCreateResponse:
+        """
+        Return new saved logo queries created from image files
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/brand-protection/logos",
+            body=await async_maybe_transform({"image": image}, logo_create_params.LogoCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "match_type": match_type,
+                        "tag": tag,
+                        "threshold": threshold,
+                    },
+                    logo_create_params.LogoCreateParams,
+                ),
+            ),
+            cast_to=LogoCreateResponse,
+        )
+
+    async def delete(
+        self,
+        logo_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Return a success message after deleting saved logo queries by ID
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not logo_id:
+            raise ValueError(f"Expected a non-empty value for `logo_id` but received {logo_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._delete(
+            f"/accounts/{account_id}/brand-protection/logos/{logo_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+
+class LogosResourceWithRawResponse:
+    def __init__(self, logos: LogosResource) -> None:
+        self._logos = logos
+
+        self.create = to_raw_response_wrapper(
+            logos.create,
+        )
+        self.delete = to_raw_response_wrapper(
+            logos.delete,
+        )
+
+
+class AsyncLogosResourceWithRawResponse:
+    def __init__(self, logos: AsyncLogosResource) -> None:
+        self._logos = logos
+
+        self.create = async_to_raw_response_wrapper(
+            logos.create,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            logos.delete,
+        )
+
+
+class LogosResourceWithStreamingResponse:
+    def __init__(self, logos: LogosResource) -> None:
+        self._logos = logos
+
+        self.create = to_streamed_response_wrapper(
+            logos.create,
+        )
+        self.delete = to_streamed_response_wrapper(
+            logos.delete,
+        )
+
+
+class AsyncLogosResourceWithStreamingResponse:
+    def __init__(self, logos: AsyncLogosResource) -> None:
+        self._logos = logos
+
+        self.create = async_to_streamed_response_wrapper(
+            logos.create,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            logos.delete,
+        )
diff --git a/src/cloudflare/resources/brand_protection/matches.py b/src/cloudflare/resources/brand_protection/matches.py
new file mode 100644
index 00000000000..cf18f113e32
--- /dev/null
+++ b/src/cloudflare/resources/brand_protection/matches.py
@@ -0,0 +1,308 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.brand_protection import match_get_params, match_download_params
+from ...types.brand_protection.match_get_response import MatchGetResponse
+from ...types.brand_protection.match_download_response import MatchDownloadResponse
+
+__all__ = ["MatchesResource", "AsyncMatchesResource"]
+
+
+class MatchesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> MatchesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return MatchesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> MatchesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return MatchesResourceWithStreamingResponse(self)
+
+    def download(
+        self,
+        *,
+        account_id: str,
+        id: str | Omit = omit,
+        include_domain_id: bool | Omit = omit,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MatchDownloadResponse:
+        """
+        Return matches as CSV for string queries based on ID
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/brand-protection/matches/download",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "id": id,
+                        "include_domain_id": include_domain_id,
+                        "limit": limit,
+                        "offset": offset,
+                    },
+                    match_download_params.MatchDownloadParams,
+                ),
+            ),
+            cast_to=MatchDownloadResponse,
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        id: str | Omit = omit,
+        include_domain_id: bool | Omit = omit,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MatchGetResponse:
+        """
+        Return matches for string queries based on ID
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/brand-protection/matches",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "id": id,
+                        "include_domain_id": include_domain_id,
+                        "limit": limit,
+                        "offset": offset,
+                    },
+                    match_get_params.MatchGetParams,
+                ),
+            ),
+            cast_to=MatchGetResponse,
+        )
+
+
+class AsyncMatchesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncMatchesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncMatchesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncMatchesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncMatchesResourceWithStreamingResponse(self)
+
+    async def download(
+        self,
+        *,
+        account_id: str,
+        id: str | Omit = omit,
+        include_domain_id: bool | Omit = omit,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MatchDownloadResponse:
+        """
+        Return matches as CSV for string queries based on ID
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/brand-protection/matches/download",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "id": id,
+                        "include_domain_id": include_domain_id,
+                        "limit": limit,
+                        "offset": offset,
+                    },
+                    match_download_params.MatchDownloadParams,
+                ),
+            ),
+            cast_to=MatchDownloadResponse,
+        )
+
+    async def get(
+        self,
+        *,
+        account_id: str,
+        id: str | Omit = omit,
+        include_domain_id: bool | Omit = omit,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MatchGetResponse:
+        """
+        Return matches for string queries based on ID
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/brand-protection/matches",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "id": id,
+                        "include_domain_id": include_domain_id,
+                        "limit": limit,
+                        "offset": offset,
+                    },
+                    match_get_params.MatchGetParams,
+                ),
+            ),
+            cast_to=MatchGetResponse,
+        )
+
+
+class MatchesResourceWithRawResponse:
+    def __init__(self, matches: MatchesResource) -> None:
+        self._matches = matches
+
+        self.download = to_raw_response_wrapper(
+            matches.download,
+        )
+        self.get = to_raw_response_wrapper(
+            matches.get,
+        )
+
+
+class AsyncMatchesResourceWithRawResponse:
+    def __init__(self, matches: AsyncMatchesResource) -> None:
+        self._matches = matches
+
+        self.download = async_to_raw_response_wrapper(
+            matches.download,
+        )
+        self.get = async_to_raw_response_wrapper(
+            matches.get,
+        )
+
+
+class MatchesResourceWithStreamingResponse:
+    def __init__(self, matches: MatchesResource) -> None:
+        self._matches = matches
+
+        self.download = to_streamed_response_wrapper(
+            matches.download,
+        )
+        self.get = to_streamed_response_wrapper(
+            matches.get,
+        )
+
+
+class AsyncMatchesResourceWithStreamingResponse:
+    def __init__(self, matches: AsyncMatchesResource) -> None:
+        self._matches = matches
+
+        self.download = async_to_streamed_response_wrapper(
+            matches.download,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            matches.get,
+        )
diff --git a/src/cloudflare/resources/brand_protection/queries.py b/src/cloudflare/resources/brand_protection/queries.py
new file mode 100644
index 00000000000..4b7ead75a1c
--- /dev/null
+++ b/src/cloudflare/resources/brand_protection/queries.py
@@ -0,0 +1,419 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Union, Iterable
+from datetime import datetime
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.brand_protection import query_bulk_params, query_create_params, query_delete_params
+
+__all__ = ["QueriesResource", "AsyncQueriesResource"]
+
+
+class QueriesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> QueriesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return QueriesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> QueriesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return QueriesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        id: str | Omit = omit,
+        query_scan: bool | Omit = omit,
+        query_tag: str | Omit = omit,
+        max_time: Union[str, datetime, None] | Omit = omit,
+        min_time: Union[str, datetime, None] | Omit = omit,
+        body_scan: bool | Omit = omit,
+        string_matches: object | Omit = omit,
+        body_tag: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Return a success message after creating new saved string queries
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._post(
+            f"/accounts/{account_id}/brand-protection/queries",
+            body=maybe_transform(
+                {
+                    "max_time": max_time,
+                    "min_time": min_time,
+                    "body_scan": body_scan,
+                    "string_matches": string_matches,
+                    "body_tag": body_tag,
+                },
+                query_create_params.QueryCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "id": id,
+                        "query_scan": query_scan,
+                        "query_tag": query_tag,
+                    },
+                    query_create_params.QueryCreateParams,
+                ),
+            ),
+            cast_to=NoneType,
+        )
+
+    def delete(
+        self,
+        *,
+        account_id: str,
+        id: str | Omit = omit,
+        scan: bool | Omit = omit,
+        tag: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Return a success message after deleting saved string queries by ID
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._delete(
+            f"/accounts/{account_id}/brand-protection/queries",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "id": id,
+                        "scan": scan,
+                        "tag": tag,
+                    },
+                    query_delete_params.QueryDeleteParams,
+                ),
+            ),
+            cast_to=NoneType,
+        )
+
+    def bulk(
+        self,
+        *,
+        account_id: str,
+        queries: Iterable[Dict[str, object]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Return a success message after creating new saved string queries in bulk
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._post(
+            f"/accounts/{account_id}/brand-protection/queries/bulk",
+            body=maybe_transform({"queries": queries}, query_bulk_params.QueryBulkParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+
+class AsyncQueriesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncQueriesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncQueriesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncQueriesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncQueriesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        id: str | Omit = omit,
+        query_scan: bool | Omit = omit,
+        query_tag: str | Omit = omit,
+        max_time: Union[str, datetime, None] | Omit = omit,
+        min_time: Union[str, datetime, None] | Omit = omit,
+        body_scan: bool | Omit = omit,
+        string_matches: object | Omit = omit,
+        body_tag: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Return a success message after creating new saved string queries
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._post(
+            f"/accounts/{account_id}/brand-protection/queries",
+            body=await async_maybe_transform(
+                {
+                    "max_time": max_time,
+                    "min_time": min_time,
+                    "body_scan": body_scan,
+                    "string_matches": string_matches,
+                    "body_tag": body_tag,
+                },
+                query_create_params.QueryCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "id": id,
+                        "query_scan": query_scan,
+                        "query_tag": query_tag,
+                    },
+                    query_create_params.QueryCreateParams,
+                ),
+            ),
+            cast_to=NoneType,
+        )
+
+    async def delete(
+        self,
+        *,
+        account_id: str,
+        id: str | Omit = omit,
+        scan: bool | Omit = omit,
+        tag: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Return a success message after deleting saved string queries by ID
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._delete(
+            f"/accounts/{account_id}/brand-protection/queries",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "id": id,
+                        "scan": scan,
+                        "tag": tag,
+                    },
+                    query_delete_params.QueryDeleteParams,
+                ),
+            ),
+            cast_to=NoneType,
+        )
+
+    async def bulk(
+        self,
+        *,
+        account_id: str,
+        queries: Iterable[Dict[str, object]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Return a success message after creating new saved string queries in bulk
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._post(
+            f"/accounts/{account_id}/brand-protection/queries/bulk",
+            body=await async_maybe_transform({"queries": queries}, query_bulk_params.QueryBulkParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+
+class QueriesResourceWithRawResponse:
+    def __init__(self, queries: QueriesResource) -> None:
+        self._queries = queries
+
+        self.create = to_raw_response_wrapper(
+            queries.create,
+        )
+        self.delete = to_raw_response_wrapper(
+            queries.delete,
+        )
+        self.bulk = to_raw_response_wrapper(
+            queries.bulk,
+        )
+
+
+class AsyncQueriesResourceWithRawResponse:
+    def __init__(self, queries: AsyncQueriesResource) -> None:
+        self._queries = queries
+
+        self.create = async_to_raw_response_wrapper(
+            queries.create,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            queries.delete,
+        )
+        self.bulk = async_to_raw_response_wrapper(
+            queries.bulk,
+        )
+
+
+class QueriesResourceWithStreamingResponse:
+    def __init__(self, queries: QueriesResource) -> None:
+        self._queries = queries
+
+        self.create = to_streamed_response_wrapper(
+            queries.create,
+        )
+        self.delete = to_streamed_response_wrapper(
+            queries.delete,
+        )
+        self.bulk = to_streamed_response_wrapper(
+            queries.bulk,
+        )
+
+
+class AsyncQueriesResourceWithStreamingResponse:
+    def __init__(self, queries: AsyncQueriesResource) -> None:
+        self._queries = queries
+
+        self.create = async_to_streamed_response_wrapper(
+            queries.create,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            queries.delete,
+        )
+        self.bulk = async_to_streamed_response_wrapper(
+            queries.bulk,
+        )
diff --git a/src/cloudflare/resources/browser_rendering/__init__.py b/src/cloudflare/resources/browser_rendering/__init__.py
new file mode 100644
index 00000000000..ca6102ced41
--- /dev/null
+++ b/src/cloudflare/resources/browser_rendering/__init__.py
@@ -0,0 +1,131 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .pdf import (
+    PDFResource,
+    AsyncPDFResource,
+    PDFResourceWithRawResponse,
+    AsyncPDFResourceWithRawResponse,
+    PDFResourceWithStreamingResponse,
+    AsyncPDFResourceWithStreamingResponse,
+)
+from .json import (
+    JsonResource,
+    AsyncJsonResource,
+    JsonResourceWithRawResponse,
+    AsyncJsonResourceWithRawResponse,
+    JsonResourceWithStreamingResponse,
+    AsyncJsonResourceWithStreamingResponse,
+)
+from .links import (
+    LinksResource,
+    AsyncLinksResource,
+    LinksResourceWithRawResponse,
+    AsyncLinksResourceWithRawResponse,
+    LinksResourceWithStreamingResponse,
+    AsyncLinksResourceWithStreamingResponse,
+)
+from .scrape import (
+    ScrapeResource,
+    AsyncScrapeResource,
+    ScrapeResourceWithRawResponse,
+    AsyncScrapeResourceWithRawResponse,
+    ScrapeResourceWithStreamingResponse,
+    AsyncScrapeResourceWithStreamingResponse,
+)
+from .content import (
+    ContentResource,
+    AsyncContentResource,
+    ContentResourceWithRawResponse,
+    AsyncContentResourceWithRawResponse,
+    ContentResourceWithStreamingResponse,
+    AsyncContentResourceWithStreamingResponse,
+)
+from .markdown import (
+    MarkdownResource,
+    AsyncMarkdownResource,
+    MarkdownResourceWithRawResponse,
+    AsyncMarkdownResourceWithRawResponse,
+    MarkdownResourceWithStreamingResponse,
+    AsyncMarkdownResourceWithStreamingResponse,
+)
+from .snapshot import (
+    SnapshotResource,
+    AsyncSnapshotResource,
+    SnapshotResourceWithRawResponse,
+    AsyncSnapshotResourceWithRawResponse,
+    SnapshotResourceWithStreamingResponse,
+    AsyncSnapshotResourceWithStreamingResponse,
+)
+from .screenshot import (
+    ScreenshotResource,
+    AsyncScreenshotResource,
+    ScreenshotResourceWithRawResponse,
+    AsyncScreenshotResourceWithRawResponse,
+    ScreenshotResourceWithStreamingResponse,
+    AsyncScreenshotResourceWithStreamingResponse,
+)
+from .browser_rendering import (
+    BrowserRenderingResource,
+    AsyncBrowserRenderingResource,
+    BrowserRenderingResourceWithRawResponse,
+    AsyncBrowserRenderingResourceWithRawResponse,
+    BrowserRenderingResourceWithStreamingResponse,
+    AsyncBrowserRenderingResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ContentResource",
+    "AsyncContentResource",
+    "ContentResourceWithRawResponse",
+    "AsyncContentResourceWithRawResponse",
+    "ContentResourceWithStreamingResponse",
+    "AsyncContentResourceWithStreamingResponse",
+    "PDFResource",
+    "AsyncPDFResource",
+    "PDFResourceWithRawResponse",
+    "AsyncPDFResourceWithRawResponse",
+    "PDFResourceWithStreamingResponse",
+    "AsyncPDFResourceWithStreamingResponse",
+    "ScrapeResource",
+    "AsyncScrapeResource",
+    "ScrapeResourceWithRawResponse",
+    "AsyncScrapeResourceWithRawResponse",
+    "ScrapeResourceWithStreamingResponse",
+    "AsyncScrapeResourceWithStreamingResponse",
+    "ScreenshotResource",
+    "AsyncScreenshotResource",
+    "ScreenshotResourceWithRawResponse",
+    "AsyncScreenshotResourceWithRawResponse",
+    "ScreenshotResourceWithStreamingResponse",
+    "AsyncScreenshotResourceWithStreamingResponse",
+    "SnapshotResource",
+    "AsyncSnapshotResource",
+    "SnapshotResourceWithRawResponse",
+    "AsyncSnapshotResourceWithRawResponse",
+    "SnapshotResourceWithStreamingResponse",
+    "AsyncSnapshotResourceWithStreamingResponse",
+    "JsonResource",
+    "AsyncJsonResource",
+    "JsonResourceWithRawResponse",
+    "AsyncJsonResourceWithRawResponse",
+    "JsonResourceWithStreamingResponse",
+    "AsyncJsonResourceWithStreamingResponse",
+    "LinksResource",
+    "AsyncLinksResource",
+    "LinksResourceWithRawResponse",
+    "AsyncLinksResourceWithRawResponse",
+    "LinksResourceWithStreamingResponse",
+    "AsyncLinksResourceWithStreamingResponse",
+    "MarkdownResource",
+    "AsyncMarkdownResource",
+    "MarkdownResourceWithRawResponse",
+    "AsyncMarkdownResourceWithRawResponse",
+    "MarkdownResourceWithStreamingResponse",
+    "AsyncMarkdownResourceWithStreamingResponse",
+    "BrowserRenderingResource",
+    "AsyncBrowserRenderingResource",
+    "BrowserRenderingResourceWithRawResponse",
+    "AsyncBrowserRenderingResourceWithRawResponse",
+    "BrowserRenderingResourceWithStreamingResponse",
+    "AsyncBrowserRenderingResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/browser_rendering/browser_rendering.py b/src/cloudflare/resources/browser_rendering/browser_rendering.py
new file mode 100644
index 00000000000..bee931f57df
--- /dev/null
+++ b/src/cloudflare/resources/browser_rendering/browser_rendering.py
@@ -0,0 +1,326 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .pdf import (
+    PDFResource,
+    AsyncPDFResource,
+    PDFResourceWithRawResponse,
+    AsyncPDFResourceWithRawResponse,
+    PDFResourceWithStreamingResponse,
+    AsyncPDFResourceWithStreamingResponse,
+)
+from .json import (
+    JsonResource,
+    AsyncJsonResource,
+    JsonResourceWithRawResponse,
+    AsyncJsonResourceWithRawResponse,
+    JsonResourceWithStreamingResponse,
+    AsyncJsonResourceWithStreamingResponse,
+)
+from .links import (
+    LinksResource,
+    AsyncLinksResource,
+    LinksResourceWithRawResponse,
+    AsyncLinksResourceWithRawResponse,
+    LinksResourceWithStreamingResponse,
+    AsyncLinksResourceWithStreamingResponse,
+)
+from .scrape import (
+    ScrapeResource,
+    AsyncScrapeResource,
+    ScrapeResourceWithRawResponse,
+    AsyncScrapeResourceWithRawResponse,
+    ScrapeResourceWithStreamingResponse,
+    AsyncScrapeResourceWithStreamingResponse,
+)
+from .content import (
+    ContentResource,
+    AsyncContentResource,
+    ContentResourceWithRawResponse,
+    AsyncContentResourceWithRawResponse,
+    ContentResourceWithStreamingResponse,
+    AsyncContentResourceWithStreamingResponse,
+)
+from .markdown import (
+    MarkdownResource,
+    AsyncMarkdownResource,
+    MarkdownResourceWithRawResponse,
+    AsyncMarkdownResourceWithRawResponse,
+    MarkdownResourceWithStreamingResponse,
+    AsyncMarkdownResourceWithStreamingResponse,
+)
+from .snapshot import (
+    SnapshotResource,
+    AsyncSnapshotResource,
+    SnapshotResourceWithRawResponse,
+    AsyncSnapshotResourceWithRawResponse,
+    SnapshotResourceWithStreamingResponse,
+    AsyncSnapshotResourceWithStreamingResponse,
+)
+from ..._compat import cached_property
+from .screenshot import (
+    ScreenshotResource,
+    AsyncScreenshotResource,
+    ScreenshotResourceWithRawResponse,
+    AsyncScreenshotResourceWithRawResponse,
+    ScreenshotResourceWithStreamingResponse,
+    AsyncScreenshotResourceWithStreamingResponse,
+)
+from ..._resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["BrowserRenderingResource", "AsyncBrowserRenderingResource"]
+
+
+class BrowserRenderingResource(SyncAPIResource):
+    @cached_property
+    def content(self) -> ContentResource:
+        return ContentResource(self._client)
+
+    @cached_property
+    def pdf(self) -> PDFResource:
+        return PDFResource(self._client)
+
+    @cached_property
+    def scrape(self) -> ScrapeResource:
+        return ScrapeResource(self._client)
+
+    @cached_property
+    def screenshot(self) -> ScreenshotResource:
+        return ScreenshotResource(self._client)
+
+    @cached_property
+    def snapshot(self) -> SnapshotResource:
+        return SnapshotResource(self._client)
+
+    @cached_property
+    def json(self) -> JsonResource:
+        return JsonResource(self._client)
+
+    @cached_property
+    def links(self) -> LinksResource:
+        return LinksResource(self._client)
+
+    @cached_property
+    def markdown(self) -> MarkdownResource:
+        return MarkdownResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> BrowserRenderingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return BrowserRenderingResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> BrowserRenderingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return BrowserRenderingResourceWithStreamingResponse(self)
+
+
+class AsyncBrowserRenderingResource(AsyncAPIResource):
+    @cached_property
+    def content(self) -> AsyncContentResource:
+        return AsyncContentResource(self._client)
+
+    @cached_property
+    def pdf(self) -> AsyncPDFResource:
+        return AsyncPDFResource(self._client)
+
+    @cached_property
+    def scrape(self) -> AsyncScrapeResource:
+        return AsyncScrapeResource(self._client)
+
+    @cached_property
+    def screenshot(self) -> AsyncScreenshotResource:
+        return AsyncScreenshotResource(self._client)
+
+    @cached_property
+    def snapshot(self) -> AsyncSnapshotResource:
+        return AsyncSnapshotResource(self._client)
+
+    @cached_property
+    def json(self) -> AsyncJsonResource:
+        return AsyncJsonResource(self._client)
+
+    @cached_property
+    def links(self) -> AsyncLinksResource:
+        return AsyncLinksResource(self._client)
+
+    @cached_property
+    def markdown(self) -> AsyncMarkdownResource:
+        return AsyncMarkdownResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncBrowserRenderingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncBrowserRenderingResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncBrowserRenderingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncBrowserRenderingResourceWithStreamingResponse(self)
+
+
+class BrowserRenderingResourceWithRawResponse:
+    def __init__(self, browser_rendering: BrowserRenderingResource) -> None:
+        self._browser_rendering = browser_rendering
+
+    @cached_property
+    def content(self) -> ContentResourceWithRawResponse:
+        return ContentResourceWithRawResponse(self._browser_rendering.content)
+
+    @cached_property
+    def pdf(self) -> PDFResourceWithRawResponse:
+        return PDFResourceWithRawResponse(self._browser_rendering.pdf)
+
+    @cached_property
+    def scrape(self) -> ScrapeResourceWithRawResponse:
+        return ScrapeResourceWithRawResponse(self._browser_rendering.scrape)
+
+    @cached_property
+    def screenshot(self) -> ScreenshotResourceWithRawResponse:
+        return ScreenshotResourceWithRawResponse(self._browser_rendering.screenshot)
+
+    @cached_property
+    def snapshot(self) -> SnapshotResourceWithRawResponse:
+        return SnapshotResourceWithRawResponse(self._browser_rendering.snapshot)
+
+    @cached_property
+    def json(self) -> JsonResourceWithRawResponse:
+        return JsonResourceWithRawResponse(self._browser_rendering.json)
+
+    @cached_property
+    def links(self) -> LinksResourceWithRawResponse:
+        return LinksResourceWithRawResponse(self._browser_rendering.links)
+
+    @cached_property
+    def markdown(self) -> MarkdownResourceWithRawResponse:
+        return MarkdownResourceWithRawResponse(self._browser_rendering.markdown)
+
+
+class AsyncBrowserRenderingResourceWithRawResponse:
+    def __init__(self, browser_rendering: AsyncBrowserRenderingResource) -> None:
+        self._browser_rendering = browser_rendering
+
+    @cached_property
+    def content(self) -> AsyncContentResourceWithRawResponse:
+        return AsyncContentResourceWithRawResponse(self._browser_rendering.content)
+
+    @cached_property
+    def pdf(self) -> AsyncPDFResourceWithRawResponse:
+        return AsyncPDFResourceWithRawResponse(self._browser_rendering.pdf)
+
+    @cached_property
+    def scrape(self) -> AsyncScrapeResourceWithRawResponse:
+        return AsyncScrapeResourceWithRawResponse(self._browser_rendering.scrape)
+
+    @cached_property
+    def screenshot(self) -> AsyncScreenshotResourceWithRawResponse:
+        return AsyncScreenshotResourceWithRawResponse(self._browser_rendering.screenshot)
+
+    @cached_property
+    def snapshot(self) -> AsyncSnapshotResourceWithRawResponse:
+        return AsyncSnapshotResourceWithRawResponse(self._browser_rendering.snapshot)
+
+    @cached_property
+    def json(self) -> AsyncJsonResourceWithRawResponse:
+        return AsyncJsonResourceWithRawResponse(self._browser_rendering.json)
+
+    @cached_property
+    def links(self) -> AsyncLinksResourceWithRawResponse:
+        return AsyncLinksResourceWithRawResponse(self._browser_rendering.links)
+
+    @cached_property
+    def markdown(self) -> AsyncMarkdownResourceWithRawResponse:
+        return AsyncMarkdownResourceWithRawResponse(self._browser_rendering.markdown)
+
+
+class BrowserRenderingResourceWithStreamingResponse:
+    def __init__(self, browser_rendering: BrowserRenderingResource) -> None:
+        self._browser_rendering = browser_rendering
+
+    @cached_property
+    def content(self) -> ContentResourceWithStreamingResponse:
+        return ContentResourceWithStreamingResponse(self._browser_rendering.content)
+
+    @cached_property
+    def pdf(self) -> PDFResourceWithStreamingResponse:
+        return PDFResourceWithStreamingResponse(self._browser_rendering.pdf)
+
+    @cached_property
+    def scrape(self) -> ScrapeResourceWithStreamingResponse:
+        return ScrapeResourceWithStreamingResponse(self._browser_rendering.scrape)
+
+    @cached_property
+    def screenshot(self) -> ScreenshotResourceWithStreamingResponse:
+        return ScreenshotResourceWithStreamingResponse(self._browser_rendering.screenshot)
+
+    @cached_property
+    def snapshot(self) -> SnapshotResourceWithStreamingResponse:
+        return SnapshotResourceWithStreamingResponse(self._browser_rendering.snapshot)
+
+    @cached_property
+    def json(self) -> JsonResourceWithStreamingResponse:
+        return JsonResourceWithStreamingResponse(self._browser_rendering.json)
+
+    @cached_property
+    def links(self) -> LinksResourceWithStreamingResponse:
+        return LinksResourceWithStreamingResponse(self._browser_rendering.links)
+
+    @cached_property
+    def markdown(self) -> MarkdownResourceWithStreamingResponse:
+        return MarkdownResourceWithStreamingResponse(self._browser_rendering.markdown)
+
+
+class AsyncBrowserRenderingResourceWithStreamingResponse:
+    def __init__(self, browser_rendering: AsyncBrowserRenderingResource) -> None:
+        self._browser_rendering = browser_rendering
+
+    @cached_property
+    def content(self) -> AsyncContentResourceWithStreamingResponse:
+        return AsyncContentResourceWithStreamingResponse(self._browser_rendering.content)
+
+    @cached_property
+    def pdf(self) -> AsyncPDFResourceWithStreamingResponse:
+        return AsyncPDFResourceWithStreamingResponse(self._browser_rendering.pdf)
+
+    @cached_property
+    def scrape(self) -> AsyncScrapeResourceWithStreamingResponse:
+        return AsyncScrapeResourceWithStreamingResponse(self._browser_rendering.scrape)
+
+    @cached_property
+    def screenshot(self) -> AsyncScreenshotResourceWithStreamingResponse:
+        return AsyncScreenshotResourceWithStreamingResponse(self._browser_rendering.screenshot)
+
+    @cached_property
+    def snapshot(self) -> AsyncSnapshotResourceWithStreamingResponse:
+        return AsyncSnapshotResourceWithStreamingResponse(self._browser_rendering.snapshot)
+
+    @cached_property
+    def json(self) -> AsyncJsonResourceWithStreamingResponse:
+        return AsyncJsonResourceWithStreamingResponse(self._browser_rendering.json)
+
+    @cached_property
+    def links(self) -> AsyncLinksResourceWithStreamingResponse:
+        return AsyncLinksResourceWithStreamingResponse(self._browser_rendering.links)
+
+    @cached_property
+    def markdown(self) -> AsyncMarkdownResourceWithStreamingResponse:
+        return AsyncMarkdownResourceWithStreamingResponse(self._browser_rendering.markdown)
diff --git a/src/cloudflare/resources/browser_rendering/content.py b/src/cloudflare/resources/browser_rendering/content.py
new file mode 100644
index 00000000000..a70abd0583b
--- /dev/null
+++ b/src/cloudflare/resources/browser_rendering/content.py
@@ -0,0 +1,895 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Type, Iterable, Optional, cast
+from typing_extensions import Literal, overload
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.browser_rendering import content_create_params
+from ...types.browser_rendering.content_create_response import ContentCreateResponse
+
+__all__ = ["ContentResource", "AsyncContentResource"]
+
+
+class ContentResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ContentResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ContentResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ContentResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ContentResourceWithStreamingResponse(self)
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        url: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[content_create_params.Variant0AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[content_create_params.Variant0AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: content_create_params.Variant0Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[content_create_params.Variant0Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: content_create_params.Variant0GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: content_create_params.Variant0Viewport | Omit = omit,
+        wait_for_selector: content_create_params.Variant0WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """Fetches rendered HTML content from provided URL or HTML.
+
+        Check available options
+        like `gotoOptions` and `waitFor*` to control page load behaviour.
+
+        Args:
+          account_id: Account ID.
+
+          url: URL to navigate to, eg. `https://example.com`.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        html: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[content_create_params.Variant1AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[content_create_params.Variant1AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: content_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[content_create_params.Variant1Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: content_create_params.Variant1GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: content_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: content_create_params.Variant1WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """Fetches rendered HTML content from provided URL or HTML.
+
+        Check available options
+        like `gotoOptions` and `waitFor*` to control page load behaviour.
+
+        Args:
+          account_id: Account ID.
+
+          html: Set the content of the page, eg: `<h1>Hello World!!</h1>`. Either `html` or
+              `url` must be set.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "url"], ["account_id", "html"])
+    def create(
+        self,
+        *,
+        account_id: str,
+        url: str | Omit = omit,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[content_create_params.Variant0AddScriptTag]
+        | Iterable[content_create_params.Variant1AddScriptTag]
+        | Omit = omit,
+        add_style_tag: Iterable[content_create_params.Variant0AddStyleTag]
+        | Iterable[content_create_params.Variant1AddStyleTag]
+        | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: content_create_params.Variant0Authenticate
+        | content_create_params.Variant1Authenticate
+        | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[content_create_params.Variant0Cookie]
+        | Iterable[content_create_params.Variant1Cookie]
+        | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: content_create_params.Variant0GotoOptions
+        | content_create_params.Variant1GotoOptions
+        | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: content_create_params.Variant0Viewport | content_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: content_create_params.Variant0WaitForSelector
+        | content_create_params.Variant1WaitForSelector
+        | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        html: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/browser-rendering/content",
+            body=maybe_transform(
+                {
+                    "url": url,
+                    "action_timeout": action_timeout,
+                    "add_script_tag": add_script_tag,
+                    "add_style_tag": add_style_tag,
+                    "allow_request_pattern": allow_request_pattern,
+                    "allow_resource_types": allow_resource_types,
+                    "authenticate": authenticate,
+                    "best_attempt": best_attempt,
+                    "cookies": cookies,
+                    "emulate_media_type": emulate_media_type,
+                    "goto_options": goto_options,
+                    "reject_request_pattern": reject_request_pattern,
+                    "reject_resource_types": reject_resource_types,
+                    "set_extra_http_headers": set_extra_http_headers,
+                    "set_java_script_enabled": set_java_script_enabled,
+                    "user_agent": user_agent,
+                    "viewport": viewport,
+                    "wait_for_selector": wait_for_selector,
+                    "wait_for_timeout": wait_for_timeout,
+                    "html": html,
+                },
+                content_create_params.ContentCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"cache_ttl": cache_ttl}, content_create_params.ContentCreateParams),
+                post_parser=ResultWrapper[Optional[ContentCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class AsyncContentResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncContentResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncContentResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncContentResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncContentResourceWithStreamingResponse(self)
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        url: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[content_create_params.Variant0AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[content_create_params.Variant0AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: content_create_params.Variant0Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[content_create_params.Variant0Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: content_create_params.Variant0GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: content_create_params.Variant0Viewport | Omit = omit,
+        wait_for_selector: content_create_params.Variant0WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """Fetches rendered HTML content from provided URL or HTML.
+
+        Check available options
+        like `gotoOptions` and `waitFor*` to control page load behaviour.
+
+        Args:
+          account_id: Account ID.
+
+          url: URL to navigate to, eg. `https://example.com`.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        html: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[content_create_params.Variant1AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[content_create_params.Variant1AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: content_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[content_create_params.Variant1Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: content_create_params.Variant1GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: content_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: content_create_params.Variant1WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """Fetches rendered HTML content from provided URL or HTML.
+
+        Check available options
+        like `gotoOptions` and `waitFor*` to control page load behaviour.
+
+        Args:
+          account_id: Account ID.
+
+          html: Set the content of the page, eg: `<h1>Hello World!!</h1>`. Either `html` or
+              `url` must be set.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "url"], ["account_id", "html"])
+    async def create(
+        self,
+        *,
+        account_id: str,
+        url: str | Omit = omit,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[content_create_params.Variant0AddScriptTag]
+        | Iterable[content_create_params.Variant1AddScriptTag]
+        | Omit = omit,
+        add_style_tag: Iterable[content_create_params.Variant0AddStyleTag]
+        | Iterable[content_create_params.Variant1AddStyleTag]
+        | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: content_create_params.Variant0Authenticate
+        | content_create_params.Variant1Authenticate
+        | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[content_create_params.Variant0Cookie]
+        | Iterable[content_create_params.Variant1Cookie]
+        | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: content_create_params.Variant0GotoOptions
+        | content_create_params.Variant1GotoOptions
+        | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: content_create_params.Variant0Viewport | content_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: content_create_params.Variant0WaitForSelector
+        | content_create_params.Variant1WaitForSelector
+        | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        html: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/browser-rendering/content",
+            body=await async_maybe_transform(
+                {
+                    "url": url,
+                    "action_timeout": action_timeout,
+                    "add_script_tag": add_script_tag,
+                    "add_style_tag": add_style_tag,
+                    "allow_request_pattern": allow_request_pattern,
+                    "allow_resource_types": allow_resource_types,
+                    "authenticate": authenticate,
+                    "best_attempt": best_attempt,
+                    "cookies": cookies,
+                    "emulate_media_type": emulate_media_type,
+                    "goto_options": goto_options,
+                    "reject_request_pattern": reject_request_pattern,
+                    "reject_resource_types": reject_resource_types,
+                    "set_extra_http_headers": set_extra_http_headers,
+                    "set_java_script_enabled": set_java_script_enabled,
+                    "user_agent": user_agent,
+                    "viewport": viewport,
+                    "wait_for_selector": wait_for_selector,
+                    "wait_for_timeout": wait_for_timeout,
+                    "html": html,
+                },
+                content_create_params.ContentCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"cache_ttl": cache_ttl}, content_create_params.ContentCreateParams),
+                post_parser=ResultWrapper[Optional[ContentCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class ContentResourceWithRawResponse:
+    def __init__(self, content: ContentResource) -> None:
+        self._content = content
+
+        self.create = to_raw_response_wrapper(
+            content.create,
+        )
+
+
+class AsyncContentResourceWithRawResponse:
+    def __init__(self, content: AsyncContentResource) -> None:
+        self._content = content
+
+        self.create = async_to_raw_response_wrapper(
+            content.create,
+        )
+
+
+class ContentResourceWithStreamingResponse:
+    def __init__(self, content: ContentResource) -> None:
+        self._content = content
+
+        self.create = to_streamed_response_wrapper(
+            content.create,
+        )
+
+
+class AsyncContentResourceWithStreamingResponse:
+    def __init__(self, content: AsyncContentResource) -> None:
+        self._content = content
+
+        self.create = async_to_streamed_response_wrapper(
+            content.create,
+        )
diff --git a/src/cloudflare/resources/browser_rendering/json.py b/src/cloudflare/resources/browser_rendering/json.py
new file mode 100644
index 00000000000..4b3a53903f5
--- /dev/null
+++ b/src/cloudflare/resources/browser_rendering/json.py
@@ -0,0 +1,935 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Type, Iterable, cast
+from typing_extensions import Literal, overload
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.browser_rendering import json_create_params
+from ...types.browser_rendering.json_create_response import JsonCreateResponse
+
+__all__ = ["JsonResource", "AsyncJsonResource"]
+
+
+class JsonResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> JsonResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return JsonResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> JsonResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return JsonResourceWithStreamingResponse(self)
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        html: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[json_create_params.Variant0AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[json_create_params.Variant0AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: json_create_params.Variant0Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[json_create_params.Variant0Cookie] | Omit = omit,
+        custom_ai: Iterable[json_create_params.Variant0CustomAI] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: json_create_params.Variant0GotoOptions | Omit = omit,
+        prompt: str | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        response_format: json_create_params.Variant0ResponseFormat | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: json_create_params.Variant0Viewport | Omit = omit,
+        wait_for_selector: json_create_params.Variant0WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> JsonCreateResponse:
+        """Gets json from a webpage from a provided URL or HTML.
+
+        Pass `prompt` or `schema`
+        in the body. Control page loading with `gotoOptions` and `waitFor*` options.
+
+        Args:
+          account_id: Account ID.
+
+          html: Set the content of the page, eg: `<h1>Hello World!!</h1>`. Either `html` or
+              `url` must be set.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          custom_ai: Optional list of custom AI models to use for the request. The models will be
+              tried in the order provided, and in case a model returns an error, the next one
+              will be used as fallback.
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        url: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[json_create_params.Variant1AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[json_create_params.Variant1AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: json_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[json_create_params.Variant1Cookie] | Omit = omit,
+        custom_ai: Iterable[json_create_params.Variant1CustomAI] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: json_create_params.Variant1GotoOptions | Omit = omit,
+        prompt: str | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        response_format: json_create_params.Variant1ResponseFormat | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: json_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: json_create_params.Variant1WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> JsonCreateResponse:
+        """Gets json from a webpage from a provided URL or HTML.
+
+        Pass `prompt` or `schema`
+        in the body. Control page loading with `gotoOptions` and `waitFor*` options.
+
+        Args:
+          account_id: Account ID.
+
+          url: URL to navigate to, eg. `https://example.com`.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          custom_ai: Optional list of custom AI models to use for the request. The models will be
+              tried in the order provided, and in case a model returns an error, the next one
+              will be used as fallback.
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "html"], ["account_id", "url"])
+    def create(
+        self,
+        *,
+        account_id: str,
+        html: str | Omit = omit,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[json_create_params.Variant0AddScriptTag]
+        | Iterable[json_create_params.Variant1AddScriptTag]
+        | Omit = omit,
+        add_style_tag: Iterable[json_create_params.Variant0AddStyleTag]
+        | Iterable[json_create_params.Variant1AddStyleTag]
+        | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: json_create_params.Variant0Authenticate | json_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[json_create_params.Variant0Cookie]
+        | Iterable[json_create_params.Variant1Cookie]
+        | Omit = omit,
+        custom_ai: Iterable[json_create_params.Variant0CustomAI]
+        | Iterable[json_create_params.Variant1CustomAI]
+        | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: json_create_params.Variant0GotoOptions | json_create_params.Variant1GotoOptions | Omit = omit,
+        prompt: str | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        response_format: json_create_params.Variant0ResponseFormat
+        | json_create_params.Variant1ResponseFormat
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: json_create_params.Variant0Viewport | json_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: json_create_params.Variant0WaitForSelector
+        | json_create_params.Variant1WaitForSelector
+        | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        url: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> JsonCreateResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/browser-rendering/json",
+            body=maybe_transform(
+                {
+                    "html": html,
+                    "action_timeout": action_timeout,
+                    "add_script_tag": add_script_tag,
+                    "add_style_tag": add_style_tag,
+                    "allow_request_pattern": allow_request_pattern,
+                    "allow_resource_types": allow_resource_types,
+                    "authenticate": authenticate,
+                    "best_attempt": best_attempt,
+                    "cookies": cookies,
+                    "custom_ai": custom_ai,
+                    "emulate_media_type": emulate_media_type,
+                    "goto_options": goto_options,
+                    "prompt": prompt,
+                    "reject_request_pattern": reject_request_pattern,
+                    "reject_resource_types": reject_resource_types,
+                    "response_format": response_format,
+                    "set_extra_http_headers": set_extra_http_headers,
+                    "set_java_script_enabled": set_java_script_enabled,
+                    "user_agent": user_agent,
+                    "viewport": viewport,
+                    "wait_for_selector": wait_for_selector,
+                    "wait_for_timeout": wait_for_timeout,
+                    "url": url,
+                },
+                json_create_params.JsonCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"cache_ttl": cache_ttl}, json_create_params.JsonCreateParams),
+                post_parser=ResultWrapper[JsonCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[JsonCreateResponse], ResultWrapper[JsonCreateResponse]),
+        )
+
+
+class AsyncJsonResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncJsonResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncJsonResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncJsonResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncJsonResourceWithStreamingResponse(self)
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        html: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[json_create_params.Variant0AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[json_create_params.Variant0AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: json_create_params.Variant0Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[json_create_params.Variant0Cookie] | Omit = omit,
+        custom_ai: Iterable[json_create_params.Variant0CustomAI] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: json_create_params.Variant0GotoOptions | Omit = omit,
+        prompt: str | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        response_format: json_create_params.Variant0ResponseFormat | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: json_create_params.Variant0Viewport | Omit = omit,
+        wait_for_selector: json_create_params.Variant0WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> JsonCreateResponse:
+        """Gets json from a webpage from a provided URL or HTML.
+
+        Pass `prompt` or `schema`
+        in the body. Control page loading with `gotoOptions` and `waitFor*` options.
+
+        Args:
+          account_id: Account ID.
+
+          html: Set the content of the page, eg: `<h1>Hello World!!</h1>`. Either `html` or
+              `url` must be set.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          custom_ai: Optional list of custom AI models to use for the request. The models will be
+              tried in the order provided, and in case a model returns an error, the next one
+              will be used as fallback.
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        url: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[json_create_params.Variant1AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[json_create_params.Variant1AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: json_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[json_create_params.Variant1Cookie] | Omit = omit,
+        custom_ai: Iterable[json_create_params.Variant1CustomAI] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: json_create_params.Variant1GotoOptions | Omit = omit,
+        prompt: str | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        response_format: json_create_params.Variant1ResponseFormat | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: json_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: json_create_params.Variant1WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> JsonCreateResponse:
+        """Gets json from a webpage from a provided URL or HTML.
+
+        Pass `prompt` or `schema`
+        in the body. Control page loading with `gotoOptions` and `waitFor*` options.
+
+        Args:
+          account_id: Account ID.
+
+          url: URL to navigate to, eg. `https://example.com`.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          custom_ai: Optional list of custom AI models to use for the request. The models will be
+              tried in the order provided, and in case a model returns an error, the next one
+              will be used as fallback.
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "html"], ["account_id", "url"])
+    async def create(
+        self,
+        *,
+        account_id: str,
+        html: str | Omit = omit,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[json_create_params.Variant0AddScriptTag]
+        | Iterable[json_create_params.Variant1AddScriptTag]
+        | Omit = omit,
+        add_style_tag: Iterable[json_create_params.Variant0AddStyleTag]
+        | Iterable[json_create_params.Variant1AddStyleTag]
+        | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: json_create_params.Variant0Authenticate | json_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[json_create_params.Variant0Cookie]
+        | Iterable[json_create_params.Variant1Cookie]
+        | Omit = omit,
+        custom_ai: Iterable[json_create_params.Variant0CustomAI]
+        | Iterable[json_create_params.Variant1CustomAI]
+        | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: json_create_params.Variant0GotoOptions | json_create_params.Variant1GotoOptions | Omit = omit,
+        prompt: str | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        response_format: json_create_params.Variant0ResponseFormat
+        | json_create_params.Variant1ResponseFormat
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: json_create_params.Variant0Viewport | json_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: json_create_params.Variant0WaitForSelector
+        | json_create_params.Variant1WaitForSelector
+        | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        url: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> JsonCreateResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/browser-rendering/json",
+            body=await async_maybe_transform(
+                {
+                    "html": html,
+                    "action_timeout": action_timeout,
+                    "add_script_tag": add_script_tag,
+                    "add_style_tag": add_style_tag,
+                    "allow_request_pattern": allow_request_pattern,
+                    "allow_resource_types": allow_resource_types,
+                    "authenticate": authenticate,
+                    "best_attempt": best_attempt,
+                    "cookies": cookies,
+                    "custom_ai": custom_ai,
+                    "emulate_media_type": emulate_media_type,
+                    "goto_options": goto_options,
+                    "prompt": prompt,
+                    "reject_request_pattern": reject_request_pattern,
+                    "reject_resource_types": reject_resource_types,
+                    "response_format": response_format,
+                    "set_extra_http_headers": set_extra_http_headers,
+                    "set_java_script_enabled": set_java_script_enabled,
+                    "user_agent": user_agent,
+                    "viewport": viewport,
+                    "wait_for_selector": wait_for_selector,
+                    "wait_for_timeout": wait_for_timeout,
+                    "url": url,
+                },
+                json_create_params.JsonCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"cache_ttl": cache_ttl}, json_create_params.JsonCreateParams),
+                post_parser=ResultWrapper[JsonCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[JsonCreateResponse], ResultWrapper[JsonCreateResponse]),
+        )
+
+
+class JsonResourceWithRawResponse:
+    def __init__(self, json: JsonResource) -> None:
+        self._json = json
+
+        self.create = to_raw_response_wrapper(
+            json.create,
+        )
+
+
+class AsyncJsonResourceWithRawResponse:
+    def __init__(self, json: AsyncJsonResource) -> None:
+        self._json = json
+
+        self.create = async_to_raw_response_wrapper(
+            json.create,
+        )
+
+
+class JsonResourceWithStreamingResponse:
+    def __init__(self, json: JsonResource) -> None:
+        self._json = json
+
+        self.create = to_streamed_response_wrapper(
+            json.create,
+        )
+
+
+class AsyncJsonResourceWithStreamingResponse:
+    def __init__(self, json: AsyncJsonResource) -> None:
+        self._json = json
+
+        self.create = async_to_streamed_response_wrapper(
+            json.create,
+        )
diff --git a/src/cloudflare/resources/browser_rendering/links.py b/src/cloudflare/resources/browser_rendering/links.py
new file mode 100644
index 00000000000..29c43034e29
--- /dev/null
+++ b/src/cloudflare/resources/browser_rendering/links.py
@@ -0,0 +1,895 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Type, Iterable, cast
+from typing_extensions import Literal, overload
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.browser_rendering import link_create_params
+from ...types.browser_rendering.link_create_response import LinkCreateResponse
+
+__all__ = ["LinksResource", "AsyncLinksResource"]
+
+
+class LinksResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> LinksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return LinksResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> LinksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return LinksResourceWithStreamingResponse(self)
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        html: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[link_create_params.Variant0AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[link_create_params.Variant0AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: link_create_params.Variant0Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[link_create_params.Variant0Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        exclude_external_links: bool | Omit = omit,
+        goto_options: link_create_params.Variant0GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: link_create_params.Variant0Viewport | Omit = omit,
+        visible_links_only: bool | Omit = omit,
+        wait_for_selector: link_create_params.Variant0WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LinkCreateResponse:
+        """
+        Get links from a web page.
+
+        Args:
+          account_id: Account ID.
+
+          html: Set the content of the page, eg: `<h1>Hello World!!</h1>`. Either `html` or
+              `url` must be set.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        url: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[link_create_params.Variant1AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[link_create_params.Variant1AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: link_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[link_create_params.Variant1Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        exclude_external_links: bool | Omit = omit,
+        goto_options: link_create_params.Variant1GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: link_create_params.Variant1Viewport | Omit = omit,
+        visible_links_only: bool | Omit = omit,
+        wait_for_selector: link_create_params.Variant1WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LinkCreateResponse:
+        """
+        Get links from a web page.
+
+        Args:
+          account_id: Account ID.
+
+          url: URL to navigate to, eg. `https://example.com`.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "html"], ["account_id", "url"])
+    def create(
+        self,
+        *,
+        account_id: str,
+        html: str | Omit = omit,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[link_create_params.Variant0AddScriptTag]
+        | Iterable[link_create_params.Variant1AddScriptTag]
+        | Omit = omit,
+        add_style_tag: Iterable[link_create_params.Variant0AddStyleTag]
+        | Iterable[link_create_params.Variant1AddStyleTag]
+        | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: link_create_params.Variant0Authenticate | link_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[link_create_params.Variant0Cookie]
+        | Iterable[link_create_params.Variant1Cookie]
+        | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        exclude_external_links: bool | Omit = omit,
+        goto_options: link_create_params.Variant0GotoOptions | link_create_params.Variant1GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: link_create_params.Variant0Viewport | link_create_params.Variant1Viewport | Omit = omit,
+        visible_links_only: bool | Omit = omit,
+        wait_for_selector: link_create_params.Variant0WaitForSelector
+        | link_create_params.Variant1WaitForSelector
+        | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        url: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LinkCreateResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/browser-rendering/links",
+            body=maybe_transform(
+                {
+                    "html": html,
+                    "action_timeout": action_timeout,
+                    "add_script_tag": add_script_tag,
+                    "add_style_tag": add_style_tag,
+                    "allow_request_pattern": allow_request_pattern,
+                    "allow_resource_types": allow_resource_types,
+                    "authenticate": authenticate,
+                    "best_attempt": best_attempt,
+                    "cookies": cookies,
+                    "emulate_media_type": emulate_media_type,
+                    "exclude_external_links": exclude_external_links,
+                    "goto_options": goto_options,
+                    "reject_request_pattern": reject_request_pattern,
+                    "reject_resource_types": reject_resource_types,
+                    "set_extra_http_headers": set_extra_http_headers,
+                    "set_java_script_enabled": set_java_script_enabled,
+                    "user_agent": user_agent,
+                    "viewport": viewport,
+                    "visible_links_only": visible_links_only,
+                    "wait_for_selector": wait_for_selector,
+                    "wait_for_timeout": wait_for_timeout,
+                    "url": url,
+                },
+                link_create_params.LinkCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"cache_ttl": cache_ttl}, link_create_params.LinkCreateParams),
+                post_parser=ResultWrapper[LinkCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LinkCreateResponse], ResultWrapper[LinkCreateResponse]),
+        )
+
+
+class AsyncLinksResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncLinksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncLinksResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncLinksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncLinksResourceWithStreamingResponse(self)
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        html: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[link_create_params.Variant0AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[link_create_params.Variant0AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: link_create_params.Variant0Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[link_create_params.Variant0Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        exclude_external_links: bool | Omit = omit,
+        goto_options: link_create_params.Variant0GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: link_create_params.Variant0Viewport | Omit = omit,
+        visible_links_only: bool | Omit = omit,
+        wait_for_selector: link_create_params.Variant0WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LinkCreateResponse:
+        """
+        Get links from a web page.
+
+        Args:
+          account_id: Account ID.
+
+          html: Set the content of the page, eg: `<h1>Hello World!!</h1>`. Either `html` or
+              `url` must be set.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        url: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[link_create_params.Variant1AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[link_create_params.Variant1AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: link_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[link_create_params.Variant1Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        exclude_external_links: bool | Omit = omit,
+        goto_options: link_create_params.Variant1GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: link_create_params.Variant1Viewport | Omit = omit,
+        visible_links_only: bool | Omit = omit,
+        wait_for_selector: link_create_params.Variant1WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LinkCreateResponse:
+        """
+        Get links from a web page.
+
+        Args:
+          account_id: Account ID.
+
+          url: URL to navigate to, eg. `https://example.com`.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "html"], ["account_id", "url"])
+    async def create(
+        self,
+        *,
+        account_id: str,
+        html: str | Omit = omit,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[link_create_params.Variant0AddScriptTag]
+        | Iterable[link_create_params.Variant1AddScriptTag]
+        | Omit = omit,
+        add_style_tag: Iterable[link_create_params.Variant0AddStyleTag]
+        | Iterable[link_create_params.Variant1AddStyleTag]
+        | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: link_create_params.Variant0Authenticate | link_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[link_create_params.Variant0Cookie]
+        | Iterable[link_create_params.Variant1Cookie]
+        | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        exclude_external_links: bool | Omit = omit,
+        goto_options: link_create_params.Variant0GotoOptions | link_create_params.Variant1GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: link_create_params.Variant0Viewport | link_create_params.Variant1Viewport | Omit = omit,
+        visible_links_only: bool | Omit = omit,
+        wait_for_selector: link_create_params.Variant0WaitForSelector
+        | link_create_params.Variant1WaitForSelector
+        | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        url: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LinkCreateResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/browser-rendering/links",
+            body=await async_maybe_transform(
+                {
+                    "html": html,
+                    "action_timeout": action_timeout,
+                    "add_script_tag": add_script_tag,
+                    "add_style_tag": add_style_tag,
+                    "allow_request_pattern": allow_request_pattern,
+                    "allow_resource_types": allow_resource_types,
+                    "authenticate": authenticate,
+                    "best_attempt": best_attempt,
+                    "cookies": cookies,
+                    "emulate_media_type": emulate_media_type,
+                    "exclude_external_links": exclude_external_links,
+                    "goto_options": goto_options,
+                    "reject_request_pattern": reject_request_pattern,
+                    "reject_resource_types": reject_resource_types,
+                    "set_extra_http_headers": set_extra_http_headers,
+                    "set_java_script_enabled": set_java_script_enabled,
+                    "user_agent": user_agent,
+                    "viewport": viewport,
+                    "visible_links_only": visible_links_only,
+                    "wait_for_selector": wait_for_selector,
+                    "wait_for_timeout": wait_for_timeout,
+                    "url": url,
+                },
+                link_create_params.LinkCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"cache_ttl": cache_ttl}, link_create_params.LinkCreateParams),
+                post_parser=ResultWrapper[LinkCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LinkCreateResponse], ResultWrapper[LinkCreateResponse]),
+        )
+
+
+class LinksResourceWithRawResponse:
+    def __init__(self, links: LinksResource) -> None:
+        self._links = links
+
+        self.create = to_raw_response_wrapper(
+            links.create,
+        )
+
+
+class AsyncLinksResourceWithRawResponse:
+    def __init__(self, links: AsyncLinksResource) -> None:
+        self._links = links
+
+        self.create = async_to_raw_response_wrapper(
+            links.create,
+        )
+
+
+class LinksResourceWithStreamingResponse:
+    def __init__(self, links: LinksResource) -> None:
+        self._links = links
+
+        self.create = to_streamed_response_wrapper(
+            links.create,
+        )
+
+
+class AsyncLinksResourceWithStreamingResponse:
+    def __init__(self, links: AsyncLinksResource) -> None:
+        self._links = links
+
+        self.create = async_to_streamed_response_wrapper(
+            links.create,
+        )
diff --git a/src/cloudflare/resources/browser_rendering/markdown.py b/src/cloudflare/resources/browser_rendering/markdown.py
new file mode 100644
index 00000000000..ff7768753ca
--- /dev/null
+++ b/src/cloudflare/resources/browser_rendering/markdown.py
@@ -0,0 +1,897 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Type, Iterable, Optional, cast
+from typing_extensions import Literal, overload
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.browser_rendering import markdown_create_params
+from ...types.browser_rendering.markdown_create_response import MarkdownCreateResponse
+
+__all__ = ["MarkdownResource", "AsyncMarkdownResource"]
+
+
+class MarkdownResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> MarkdownResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return MarkdownResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> MarkdownResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return MarkdownResourceWithStreamingResponse(self)
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        url: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[markdown_create_params.Variant0AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[markdown_create_params.Variant0AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: markdown_create_params.Variant0Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[markdown_create_params.Variant0Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: markdown_create_params.Variant0GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: markdown_create_params.Variant0Viewport | Omit = omit,
+        wait_for_selector: markdown_create_params.Variant0WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """Gets markdown of a webpage from provided URL or HTML.
+
+        Control page loading with
+        `gotoOptions` and `waitFor*` options.
+
+        Args:
+          account_id: Account ID.
+
+          url: URL to navigate to, eg. `https://example.com`.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        html: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[markdown_create_params.Variant1AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[markdown_create_params.Variant1AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: markdown_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[markdown_create_params.Variant1Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: markdown_create_params.Variant1GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: markdown_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: markdown_create_params.Variant1WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """Gets markdown of a webpage from provided URL or HTML.
+
+        Control page loading with
+        `gotoOptions` and `waitFor*` options.
+
+        Args:
+          account_id: Account ID.
+
+          html: Set the content of the page, eg: `<h1>Hello World!!</h1>`. Either `html` or
+              `url` must be set.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "url"], ["account_id", "html"])
+    def create(
+        self,
+        *,
+        account_id: str,
+        url: str | Omit = omit,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[markdown_create_params.Variant0AddScriptTag]
+        | Iterable[markdown_create_params.Variant1AddScriptTag]
+        | Omit = omit,
+        add_style_tag: Iterable[markdown_create_params.Variant0AddStyleTag]
+        | Iterable[markdown_create_params.Variant1AddStyleTag]
+        | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: markdown_create_params.Variant0Authenticate
+        | markdown_create_params.Variant1Authenticate
+        | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[markdown_create_params.Variant0Cookie]
+        | Iterable[markdown_create_params.Variant1Cookie]
+        | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: markdown_create_params.Variant0GotoOptions
+        | markdown_create_params.Variant1GotoOptions
+        | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: markdown_create_params.Variant0Viewport | markdown_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: markdown_create_params.Variant0WaitForSelector
+        | markdown_create_params.Variant1WaitForSelector
+        | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        html: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/browser-rendering/markdown",
+            body=maybe_transform(
+                {
+                    "url": url,
+                    "action_timeout": action_timeout,
+                    "add_script_tag": add_script_tag,
+                    "add_style_tag": add_style_tag,
+                    "allow_request_pattern": allow_request_pattern,
+                    "allow_resource_types": allow_resource_types,
+                    "authenticate": authenticate,
+                    "best_attempt": best_attempt,
+                    "cookies": cookies,
+                    "emulate_media_type": emulate_media_type,
+                    "goto_options": goto_options,
+                    "reject_request_pattern": reject_request_pattern,
+                    "reject_resource_types": reject_resource_types,
+                    "set_extra_http_headers": set_extra_http_headers,
+                    "set_java_script_enabled": set_java_script_enabled,
+                    "user_agent": user_agent,
+                    "viewport": viewport,
+                    "wait_for_selector": wait_for_selector,
+                    "wait_for_timeout": wait_for_timeout,
+                    "html": html,
+                },
+                markdown_create_params.MarkdownCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"cache_ttl": cache_ttl}, markdown_create_params.MarkdownCreateParams),
+                post_parser=ResultWrapper[Optional[MarkdownCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class AsyncMarkdownResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncMarkdownResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncMarkdownResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncMarkdownResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncMarkdownResourceWithStreamingResponse(self)
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        url: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[markdown_create_params.Variant0AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[markdown_create_params.Variant0AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: markdown_create_params.Variant0Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[markdown_create_params.Variant0Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: markdown_create_params.Variant0GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: markdown_create_params.Variant0Viewport | Omit = omit,
+        wait_for_selector: markdown_create_params.Variant0WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """Gets markdown of a webpage from provided URL or HTML.
+
+        Control page loading with
+        `gotoOptions` and `waitFor*` options.
+
+        Args:
+          account_id: Account ID.
+
+          url: URL to navigate to, eg. `https://example.com`.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        html: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[markdown_create_params.Variant1AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[markdown_create_params.Variant1AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: markdown_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[markdown_create_params.Variant1Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: markdown_create_params.Variant1GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: markdown_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: markdown_create_params.Variant1WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """Gets markdown of a webpage from provided URL or HTML.
+
+        Control page loading with
+        `gotoOptions` and `waitFor*` options.
+
+        Args:
+          account_id: Account ID.
+
+          html: Set the content of the page, eg: `<h1>Hello World!!</h1>`. Either `html` or
+              `url` must be set.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "url"], ["account_id", "html"])
+    async def create(
+        self,
+        *,
+        account_id: str,
+        url: str | Omit = omit,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[markdown_create_params.Variant0AddScriptTag]
+        | Iterable[markdown_create_params.Variant1AddScriptTag]
+        | Omit = omit,
+        add_style_tag: Iterable[markdown_create_params.Variant0AddStyleTag]
+        | Iterable[markdown_create_params.Variant1AddStyleTag]
+        | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: markdown_create_params.Variant0Authenticate
+        | markdown_create_params.Variant1Authenticate
+        | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[markdown_create_params.Variant0Cookie]
+        | Iterable[markdown_create_params.Variant1Cookie]
+        | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: markdown_create_params.Variant0GotoOptions
+        | markdown_create_params.Variant1GotoOptions
+        | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: markdown_create_params.Variant0Viewport | markdown_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: markdown_create_params.Variant0WaitForSelector
+        | markdown_create_params.Variant1WaitForSelector
+        | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        html: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/browser-rendering/markdown",
+            body=await async_maybe_transform(
+                {
+                    "url": url,
+                    "action_timeout": action_timeout,
+                    "add_script_tag": add_script_tag,
+                    "add_style_tag": add_style_tag,
+                    "allow_request_pattern": allow_request_pattern,
+                    "allow_resource_types": allow_resource_types,
+                    "authenticate": authenticate,
+                    "best_attempt": best_attempt,
+                    "cookies": cookies,
+                    "emulate_media_type": emulate_media_type,
+                    "goto_options": goto_options,
+                    "reject_request_pattern": reject_request_pattern,
+                    "reject_resource_types": reject_resource_types,
+                    "set_extra_http_headers": set_extra_http_headers,
+                    "set_java_script_enabled": set_java_script_enabled,
+                    "user_agent": user_agent,
+                    "viewport": viewport,
+                    "wait_for_selector": wait_for_selector,
+                    "wait_for_timeout": wait_for_timeout,
+                    "html": html,
+                },
+                markdown_create_params.MarkdownCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"cache_ttl": cache_ttl}, markdown_create_params.MarkdownCreateParams
+                ),
+                post_parser=ResultWrapper[Optional[MarkdownCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class MarkdownResourceWithRawResponse:
+    def __init__(self, markdown: MarkdownResource) -> None:
+        self._markdown = markdown
+
+        self.create = to_raw_response_wrapper(
+            markdown.create,
+        )
+
+
+class AsyncMarkdownResourceWithRawResponse:
+    def __init__(self, markdown: AsyncMarkdownResource) -> None:
+        self._markdown = markdown
+
+        self.create = async_to_raw_response_wrapper(
+            markdown.create,
+        )
+
+
+class MarkdownResourceWithStreamingResponse:
+    def __init__(self, markdown: MarkdownResource) -> None:
+        self._markdown = markdown
+
+        self.create = to_streamed_response_wrapper(
+            markdown.create,
+        )
+
+
+class AsyncMarkdownResourceWithStreamingResponse:
+    def __init__(self, markdown: AsyncMarkdownResource) -> None:
+        self._markdown = markdown
+
+        self.create = async_to_streamed_response_wrapper(
+            markdown.create,
+        )
diff --git a/src/cloudflare/resources/browser_rendering/pdf.py b/src/cloudflare/resources/browser_rendering/pdf.py
new file mode 100644
index 00000000000..4ecf823abd4
--- /dev/null
+++ b/src/cloudflare/resources/browser_rendering/pdf.py
@@ -0,0 +1,905 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Iterable
+from typing_extensions import Literal, overload
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    BinaryAPIResponse,
+    AsyncBinaryAPIResponse,
+    StreamedBinaryAPIResponse,
+    AsyncStreamedBinaryAPIResponse,
+    to_custom_raw_response_wrapper,
+    to_custom_streamed_response_wrapper,
+    async_to_custom_raw_response_wrapper,
+    async_to_custom_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.browser_rendering import pdf_create_params
+
+__all__ = ["PDFResource", "AsyncPDFResource"]
+
+
+class PDFResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> PDFResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return PDFResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> PDFResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return PDFResourceWithStreamingResponse(self)
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        html: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[pdf_create_params.Variant0AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[pdf_create_params.Variant0AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: pdf_create_params.Variant0Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[pdf_create_params.Variant0Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: pdf_create_params.Variant0GotoOptions | Omit = omit,
+        pdf_options: pdf_create_params.Variant0PDFOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: pdf_create_params.Variant0Viewport | Omit = omit,
+        wait_for_selector: pdf_create_params.Variant0WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BinaryAPIResponse:
+        """Fetches rendered PDF from provided URL or HTML.
+
+        Check available options like
+        `gotoOptions` and `waitFor*` to control page load behaviour.
+
+        Args:
+          account_id: Account ID.
+
+          html: Set the content of the page, eg: `<h1>Hello World!!</h1>`. Either `html` or
+              `url` must be set.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          pdf_options: Check [options](https://pptr.dev/api/puppeteer.pdfoptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        url: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[pdf_create_params.Variant1AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[pdf_create_params.Variant1AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: pdf_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[pdf_create_params.Variant1Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: pdf_create_params.Variant1GotoOptions | Omit = omit,
+        pdf_options: pdf_create_params.Variant1PDFOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: pdf_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: pdf_create_params.Variant1WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BinaryAPIResponse:
+        """Fetches rendered PDF from provided URL or HTML.
+
+        Check available options like
+        `gotoOptions` and `waitFor*` to control page load behaviour.
+
+        Args:
+          account_id: Account ID.
+
+          url: URL to navigate to, eg. `https://example.com`.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          pdf_options: Check [options](https://pptr.dev/api/puppeteer.pdfoptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "html"], ["account_id", "url"])
+    def create(
+        self,
+        *,
+        account_id: str,
+        html: str | Omit = omit,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[pdf_create_params.Variant0AddScriptTag]
+        | Iterable[pdf_create_params.Variant1AddScriptTag]
+        | Omit = omit,
+        add_style_tag: Iterable[pdf_create_params.Variant0AddStyleTag]
+        | Iterable[pdf_create_params.Variant1AddStyleTag]
+        | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: pdf_create_params.Variant0Authenticate | pdf_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[pdf_create_params.Variant0Cookie] | Iterable[pdf_create_params.Variant1Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: pdf_create_params.Variant0GotoOptions | pdf_create_params.Variant1GotoOptions | Omit = omit,
+        pdf_options: pdf_create_params.Variant0PDFOptions | pdf_create_params.Variant1PDFOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: pdf_create_params.Variant0Viewport | pdf_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: pdf_create_params.Variant0WaitForSelector
+        | pdf_create_params.Variant1WaitForSelector
+        | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        url: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BinaryAPIResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {"Accept": "application/pdf", **(extra_headers or {})}
+        return self._post(
+            f"/accounts/{account_id}/browser-rendering/pdf",
+            body=maybe_transform(
+                {
+                    "html": html,
+                    "action_timeout": action_timeout,
+                    "add_script_tag": add_script_tag,
+                    "add_style_tag": add_style_tag,
+                    "allow_request_pattern": allow_request_pattern,
+                    "allow_resource_types": allow_resource_types,
+                    "authenticate": authenticate,
+                    "best_attempt": best_attempt,
+                    "cookies": cookies,
+                    "emulate_media_type": emulate_media_type,
+                    "goto_options": goto_options,
+                    "pdf_options": pdf_options,
+                    "reject_request_pattern": reject_request_pattern,
+                    "reject_resource_types": reject_resource_types,
+                    "set_extra_http_headers": set_extra_http_headers,
+                    "set_java_script_enabled": set_java_script_enabled,
+                    "user_agent": user_agent,
+                    "viewport": viewport,
+                    "wait_for_selector": wait_for_selector,
+                    "wait_for_timeout": wait_for_timeout,
+                    "url": url,
+                },
+                pdf_create_params.PDFCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"cache_ttl": cache_ttl}, pdf_create_params.PDFCreateParams),
+            ),
+            cast_to=BinaryAPIResponse,
+        )
+
+
+class AsyncPDFResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncPDFResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncPDFResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncPDFResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncPDFResourceWithStreamingResponse(self)
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        html: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[pdf_create_params.Variant0AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[pdf_create_params.Variant0AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: pdf_create_params.Variant0Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[pdf_create_params.Variant0Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: pdf_create_params.Variant0GotoOptions | Omit = omit,
+        pdf_options: pdf_create_params.Variant0PDFOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: pdf_create_params.Variant0Viewport | Omit = omit,
+        wait_for_selector: pdf_create_params.Variant0WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncBinaryAPIResponse:
+        """Fetches rendered PDF from provided URL or HTML.
+
+        Check available options like
+        `gotoOptions` and `waitFor*` to control page load behaviour.
+
+        Args:
+          account_id: Account ID.
+
+          html: Set the content of the page, eg: `<h1>Hello World!!</h1>`. Either `html` or
+              `url` must be set.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          pdf_options: Check [options](https://pptr.dev/api/puppeteer.pdfoptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        url: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[pdf_create_params.Variant1AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[pdf_create_params.Variant1AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: pdf_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[pdf_create_params.Variant1Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: pdf_create_params.Variant1GotoOptions | Omit = omit,
+        pdf_options: pdf_create_params.Variant1PDFOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: pdf_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: pdf_create_params.Variant1WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncBinaryAPIResponse:
+        """Fetches rendered PDF from provided URL or HTML.
+
+        Check available options like
+        `gotoOptions` and `waitFor*` to control page load behaviour.
+
+        Args:
+          account_id: Account ID.
+
+          url: URL to navigate to, eg. `https://example.com`.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          pdf_options: Check [options](https://pptr.dev/api/puppeteer.pdfoptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "html"], ["account_id", "url"])
+    async def create(
+        self,
+        *,
+        account_id: str,
+        html: str | Omit = omit,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[pdf_create_params.Variant0AddScriptTag]
+        | Iterable[pdf_create_params.Variant1AddScriptTag]
+        | Omit = omit,
+        add_style_tag: Iterable[pdf_create_params.Variant0AddStyleTag]
+        | Iterable[pdf_create_params.Variant1AddStyleTag]
+        | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: pdf_create_params.Variant0Authenticate | pdf_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[pdf_create_params.Variant0Cookie] | Iterable[pdf_create_params.Variant1Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: pdf_create_params.Variant0GotoOptions | pdf_create_params.Variant1GotoOptions | Omit = omit,
+        pdf_options: pdf_create_params.Variant0PDFOptions | pdf_create_params.Variant1PDFOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: pdf_create_params.Variant0Viewport | pdf_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: pdf_create_params.Variant0WaitForSelector
+        | pdf_create_params.Variant1WaitForSelector
+        | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        url: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncBinaryAPIResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {"Accept": "application/pdf", **(extra_headers or {})}
+        return await self._post(
+            f"/accounts/{account_id}/browser-rendering/pdf",
+            body=await async_maybe_transform(
+                {
+                    "html": html,
+                    "action_timeout": action_timeout,
+                    "add_script_tag": add_script_tag,
+                    "add_style_tag": add_style_tag,
+                    "allow_request_pattern": allow_request_pattern,
+                    "allow_resource_types": allow_resource_types,
+                    "authenticate": authenticate,
+                    "best_attempt": best_attempt,
+                    "cookies": cookies,
+                    "emulate_media_type": emulate_media_type,
+                    "goto_options": goto_options,
+                    "pdf_options": pdf_options,
+                    "reject_request_pattern": reject_request_pattern,
+                    "reject_resource_types": reject_resource_types,
+                    "set_extra_http_headers": set_extra_http_headers,
+                    "set_java_script_enabled": set_java_script_enabled,
+                    "user_agent": user_agent,
+                    "viewport": viewport,
+                    "wait_for_selector": wait_for_selector,
+                    "wait_for_timeout": wait_for_timeout,
+                    "url": url,
+                },
+                pdf_create_params.PDFCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"cache_ttl": cache_ttl}, pdf_create_params.PDFCreateParams),
+            ),
+            cast_to=AsyncBinaryAPIResponse,
+        )
+
+
+class PDFResourceWithRawResponse:
+    def __init__(self, pdf: PDFResource) -> None:
+        self._pdf = pdf
+
+        self.create = to_custom_raw_response_wrapper(
+            pdf.create,
+            BinaryAPIResponse,
+        )
+
+
+class AsyncPDFResourceWithRawResponse:
+    def __init__(self, pdf: AsyncPDFResource) -> None:
+        self._pdf = pdf
+
+        self.create = async_to_custom_raw_response_wrapper(
+            pdf.create,
+            AsyncBinaryAPIResponse,
+        )
+
+
+class PDFResourceWithStreamingResponse:
+    def __init__(self, pdf: PDFResource) -> None:
+        self._pdf = pdf
+
+        self.create = to_custom_streamed_response_wrapper(
+            pdf.create,
+            StreamedBinaryAPIResponse,
+        )
+
+
+class AsyncPDFResourceWithStreamingResponse:
+    def __init__(self, pdf: AsyncPDFResource) -> None:
+        self._pdf = pdf
+
+        self.create = async_to_custom_streamed_response_wrapper(
+            pdf.create,
+            AsyncStreamedBinaryAPIResponse,
+        )
diff --git a/src/cloudflare/resources/browser_rendering/scrape.py b/src/cloudflare/resources/browser_rendering/scrape.py
new file mode 100644
index 00000000000..05c5e3f1bc6
--- /dev/null
+++ b/src/cloudflare/resources/browser_rendering/scrape.py
@@ -0,0 +1,891 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Type, Iterable, cast
+from typing_extensions import Literal, overload
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.browser_rendering import scrape_create_params
+from ...types.browser_rendering.scrape_create_response import ScrapeCreateResponse
+
+__all__ = ["ScrapeResource", "AsyncScrapeResource"]
+
+
+class ScrapeResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ScrapeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ScrapeResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ScrapeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ScrapeResourceWithStreamingResponse(self)
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        elements: Iterable[scrape_create_params.Variant0Element],
+        html: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[scrape_create_params.Variant0AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[scrape_create_params.Variant0AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: scrape_create_params.Variant0Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[scrape_create_params.Variant0Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: scrape_create_params.Variant0GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: scrape_create_params.Variant0Viewport | Omit = omit,
+        wait_for_selector: scrape_create_params.Variant0WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScrapeCreateResponse:
+        """
+        Get meta attributes like height, width, text and others of selected elements.
+
+        Args:
+          account_id: Account ID.
+
+          html: Set the content of the page, eg: `<h1>Hello World!!</h1>`. Either `html` or
+              `url` must be set.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        elements: Iterable[scrape_create_params.Variant1Element],
+        url: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[scrape_create_params.Variant1AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[scrape_create_params.Variant1AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: scrape_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[scrape_create_params.Variant1Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: scrape_create_params.Variant1GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: scrape_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: scrape_create_params.Variant1WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScrapeCreateResponse:
+        """
+        Get meta attributes like height, width, text and others of selected elements.
+
+        Args:
+          account_id: Account ID.
+
+          url: URL to navigate to, eg. `https://example.com`.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "elements", "html"], ["account_id", "elements", "url"])
+    def create(
+        self,
+        *,
+        account_id: str,
+        elements: Iterable[scrape_create_params.Variant0Element] | Iterable[scrape_create_params.Variant1Element],
+        html: str | Omit = omit,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[scrape_create_params.Variant0AddScriptTag]
+        | Iterable[scrape_create_params.Variant1AddScriptTag]
+        | Omit = omit,
+        add_style_tag: Iterable[scrape_create_params.Variant0AddStyleTag]
+        | Iterable[scrape_create_params.Variant1AddStyleTag]
+        | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: scrape_create_params.Variant0Authenticate
+        | scrape_create_params.Variant1Authenticate
+        | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[scrape_create_params.Variant0Cookie]
+        | Iterable[scrape_create_params.Variant1Cookie]
+        | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: scrape_create_params.Variant0GotoOptions | scrape_create_params.Variant1GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: scrape_create_params.Variant0Viewport | scrape_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: scrape_create_params.Variant0WaitForSelector
+        | scrape_create_params.Variant1WaitForSelector
+        | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        url: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScrapeCreateResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/browser-rendering/scrape",
+            body=maybe_transform(
+                {
+                    "elements": elements,
+                    "html": html,
+                    "action_timeout": action_timeout,
+                    "add_script_tag": add_script_tag,
+                    "add_style_tag": add_style_tag,
+                    "allow_request_pattern": allow_request_pattern,
+                    "allow_resource_types": allow_resource_types,
+                    "authenticate": authenticate,
+                    "best_attempt": best_attempt,
+                    "cookies": cookies,
+                    "emulate_media_type": emulate_media_type,
+                    "goto_options": goto_options,
+                    "reject_request_pattern": reject_request_pattern,
+                    "reject_resource_types": reject_resource_types,
+                    "set_extra_http_headers": set_extra_http_headers,
+                    "set_java_script_enabled": set_java_script_enabled,
+                    "user_agent": user_agent,
+                    "viewport": viewport,
+                    "wait_for_selector": wait_for_selector,
+                    "wait_for_timeout": wait_for_timeout,
+                    "url": url,
+                },
+                scrape_create_params.ScrapeCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"cache_ttl": cache_ttl}, scrape_create_params.ScrapeCreateParams),
+                post_parser=ResultWrapper[ScrapeCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ScrapeCreateResponse], ResultWrapper[ScrapeCreateResponse]),
+        )
+
+
+class AsyncScrapeResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncScrapeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncScrapeResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncScrapeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncScrapeResourceWithStreamingResponse(self)
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        elements: Iterable[scrape_create_params.Variant0Element],
+        html: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[scrape_create_params.Variant0AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[scrape_create_params.Variant0AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: scrape_create_params.Variant0Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[scrape_create_params.Variant0Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: scrape_create_params.Variant0GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: scrape_create_params.Variant0Viewport | Omit = omit,
+        wait_for_selector: scrape_create_params.Variant0WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScrapeCreateResponse:
+        """
+        Get meta attributes like height, width, text and others of selected elements.
+
+        Args:
+          account_id: Account ID.
+
+          html: Set the content of the page, eg: `<h1>Hello World!!</h1>`. Either `html` or
+              `url` must be set.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        elements: Iterable[scrape_create_params.Variant1Element],
+        url: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[scrape_create_params.Variant1AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[scrape_create_params.Variant1AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: scrape_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[scrape_create_params.Variant1Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: scrape_create_params.Variant1GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: scrape_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: scrape_create_params.Variant1WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScrapeCreateResponse:
+        """
+        Get meta attributes like height, width, text and others of selected elements.
+
+        Args:
+          account_id: Account ID.
+
+          url: URL to navigate to, eg. `https://example.com`.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "elements", "html"], ["account_id", "elements", "url"])
+    async def create(
+        self,
+        *,
+        account_id: str,
+        elements: Iterable[scrape_create_params.Variant0Element] | Iterable[scrape_create_params.Variant1Element],
+        html: str | Omit = omit,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[scrape_create_params.Variant0AddScriptTag]
+        | Iterable[scrape_create_params.Variant1AddScriptTag]
+        | Omit = omit,
+        add_style_tag: Iterable[scrape_create_params.Variant0AddStyleTag]
+        | Iterable[scrape_create_params.Variant1AddStyleTag]
+        | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: scrape_create_params.Variant0Authenticate
+        | scrape_create_params.Variant1Authenticate
+        | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[scrape_create_params.Variant0Cookie]
+        | Iterable[scrape_create_params.Variant1Cookie]
+        | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: scrape_create_params.Variant0GotoOptions | scrape_create_params.Variant1GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: scrape_create_params.Variant0Viewport | scrape_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: scrape_create_params.Variant0WaitForSelector
+        | scrape_create_params.Variant1WaitForSelector
+        | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        url: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScrapeCreateResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/browser-rendering/scrape",
+            body=await async_maybe_transform(
+                {
+                    "elements": elements,
+                    "html": html,
+                    "action_timeout": action_timeout,
+                    "add_script_tag": add_script_tag,
+                    "add_style_tag": add_style_tag,
+                    "allow_request_pattern": allow_request_pattern,
+                    "allow_resource_types": allow_resource_types,
+                    "authenticate": authenticate,
+                    "best_attempt": best_attempt,
+                    "cookies": cookies,
+                    "emulate_media_type": emulate_media_type,
+                    "goto_options": goto_options,
+                    "reject_request_pattern": reject_request_pattern,
+                    "reject_resource_types": reject_resource_types,
+                    "set_extra_http_headers": set_extra_http_headers,
+                    "set_java_script_enabled": set_java_script_enabled,
+                    "user_agent": user_agent,
+                    "viewport": viewport,
+                    "wait_for_selector": wait_for_selector,
+                    "wait_for_timeout": wait_for_timeout,
+                    "url": url,
+                },
+                scrape_create_params.ScrapeCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"cache_ttl": cache_ttl}, scrape_create_params.ScrapeCreateParams),
+                post_parser=ResultWrapper[ScrapeCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ScrapeCreateResponse], ResultWrapper[ScrapeCreateResponse]),
+        )
+
+
+class ScrapeResourceWithRawResponse:
+    def __init__(self, scrape: ScrapeResource) -> None:
+        self._scrape = scrape
+
+        self.create = to_raw_response_wrapper(
+            scrape.create,
+        )
+
+
+class AsyncScrapeResourceWithRawResponse:
+    def __init__(self, scrape: AsyncScrapeResource) -> None:
+        self._scrape = scrape
+
+        self.create = async_to_raw_response_wrapper(
+            scrape.create,
+        )
+
+
+class ScrapeResourceWithStreamingResponse:
+    def __init__(self, scrape: ScrapeResource) -> None:
+        self._scrape = scrape
+
+        self.create = to_streamed_response_wrapper(
+            scrape.create,
+        )
+
+
+class AsyncScrapeResourceWithStreamingResponse:
+    def __init__(self, scrape: AsyncScrapeResource) -> None:
+        self._scrape = scrape
+
+        self.create = async_to_streamed_response_wrapper(
+            scrape.create,
+        )
diff --git a/src/cloudflare/resources/browser_rendering/screenshot.py b/src/cloudflare/resources/browser_rendering/screenshot.py
new file mode 100644
index 00000000000..b5a89b5bee3
--- /dev/null
+++ b/src/cloudflare/resources/browser_rendering/screenshot.py
@@ -0,0 +1,934 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Iterable
+from typing_extensions import Literal, overload
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.browser_rendering import screenshot_create_params
+from ...types.browser_rendering.screenshot_create_response import ScreenshotCreateResponse
+
+__all__ = ["ScreenshotResource", "AsyncScreenshotResource"]
+
+
+class ScreenshotResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ScreenshotResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ScreenshotResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ScreenshotResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ScreenshotResourceWithStreamingResponse(self)
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        html: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[screenshot_create_params.Variant0AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[screenshot_create_params.Variant0AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: screenshot_create_params.Variant0Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[screenshot_create_params.Variant0Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: screenshot_create_params.Variant0GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        screenshot_options: screenshot_create_params.Variant0ScreenshotOptions | Omit = omit,
+        scroll_page: bool | Omit = omit,
+        selector: str | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: screenshot_create_params.Variant0Viewport | Omit = omit,
+        wait_for_selector: screenshot_create_params.Variant0WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScreenshotCreateResponse:
+        """Takes a screenshot of a webpage from provided URL or HTML.
+
+        Control page loading
+        with `gotoOptions` and `waitFor*` options. Customize screenshots with
+        `viewport`, `fullPage`, `clip` and others.
+
+        Args:
+          account_id: Account ID.
+
+          html: Set the content of the page, eg: `<h1>Hello World!!</h1>`. Either `html` or
+              `url` must be set.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          screenshot_options: Check [options](https://pptr.dev/api/puppeteer.screenshotoptions).
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        url: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[screenshot_create_params.Variant1AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[screenshot_create_params.Variant1AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: screenshot_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[screenshot_create_params.Variant1Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: screenshot_create_params.Variant1GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        screenshot_options: screenshot_create_params.Variant1ScreenshotOptions | Omit = omit,
+        scroll_page: bool | Omit = omit,
+        selector: str | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: screenshot_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: screenshot_create_params.Variant1WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScreenshotCreateResponse:
+        """Takes a screenshot of a webpage from provided URL or HTML.
+
+        Control page loading
+        with `gotoOptions` and `waitFor*` options. Customize screenshots with
+        `viewport`, `fullPage`, `clip` and others.
+
+        Args:
+          account_id: Account ID.
+
+          url: URL to navigate to, eg. `https://example.com`.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          screenshot_options: Check [options](https://pptr.dev/api/puppeteer.screenshotoptions).
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "html"], ["account_id", "url"])
+    def create(
+        self,
+        *,
+        account_id: str,
+        html: str | Omit = omit,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[screenshot_create_params.Variant0AddScriptTag]
+        | Iterable[screenshot_create_params.Variant1AddScriptTag]
+        | Omit = omit,
+        add_style_tag: Iterable[screenshot_create_params.Variant0AddStyleTag]
+        | Iterable[screenshot_create_params.Variant1AddStyleTag]
+        | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: screenshot_create_params.Variant0Authenticate
+        | screenshot_create_params.Variant1Authenticate
+        | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[screenshot_create_params.Variant0Cookie]
+        | Iterable[screenshot_create_params.Variant1Cookie]
+        | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: screenshot_create_params.Variant0GotoOptions
+        | screenshot_create_params.Variant1GotoOptions
+        | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        screenshot_options: screenshot_create_params.Variant0ScreenshotOptions
+        | screenshot_create_params.Variant1ScreenshotOptions
+        | Omit = omit,
+        scroll_page: bool | Omit = omit,
+        selector: str | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: screenshot_create_params.Variant0Viewport | screenshot_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: screenshot_create_params.Variant0WaitForSelector
+        | screenshot_create_params.Variant1WaitForSelector
+        | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        url: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScreenshotCreateResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/browser-rendering/screenshot",
+            body=maybe_transform(
+                {
+                    "html": html,
+                    "action_timeout": action_timeout,
+                    "add_script_tag": add_script_tag,
+                    "add_style_tag": add_style_tag,
+                    "allow_request_pattern": allow_request_pattern,
+                    "allow_resource_types": allow_resource_types,
+                    "authenticate": authenticate,
+                    "best_attempt": best_attempt,
+                    "cookies": cookies,
+                    "emulate_media_type": emulate_media_type,
+                    "goto_options": goto_options,
+                    "reject_request_pattern": reject_request_pattern,
+                    "reject_resource_types": reject_resource_types,
+                    "screenshot_options": screenshot_options,
+                    "scroll_page": scroll_page,
+                    "selector": selector,
+                    "set_extra_http_headers": set_extra_http_headers,
+                    "set_java_script_enabled": set_java_script_enabled,
+                    "user_agent": user_agent,
+                    "viewport": viewport,
+                    "wait_for_selector": wait_for_selector,
+                    "wait_for_timeout": wait_for_timeout,
+                    "url": url,
+                },
+                screenshot_create_params.ScreenshotCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"cache_ttl": cache_ttl}, screenshot_create_params.ScreenshotCreateParams),
+            ),
+            cast_to=ScreenshotCreateResponse,
+        )
+
+
+class AsyncScreenshotResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncScreenshotResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncScreenshotResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncScreenshotResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncScreenshotResourceWithStreamingResponse(self)
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        html: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[screenshot_create_params.Variant0AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[screenshot_create_params.Variant0AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: screenshot_create_params.Variant0Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[screenshot_create_params.Variant0Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: screenshot_create_params.Variant0GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        screenshot_options: screenshot_create_params.Variant0ScreenshotOptions | Omit = omit,
+        scroll_page: bool | Omit = omit,
+        selector: str | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: screenshot_create_params.Variant0Viewport | Omit = omit,
+        wait_for_selector: screenshot_create_params.Variant0WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScreenshotCreateResponse:
+        """Takes a screenshot of a webpage from provided URL or HTML.
+
+        Control page loading
+        with `gotoOptions` and `waitFor*` options. Customize screenshots with
+        `viewport`, `fullPage`, `clip` and others.
+
+        Args:
+          account_id: Account ID.
+
+          html: Set the content of the page, eg: `<h1>Hello World!!</h1>`. Either `html` or
+              `url` must be set.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          screenshot_options: Check [options](https://pptr.dev/api/puppeteer.screenshotoptions).
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        url: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[screenshot_create_params.Variant1AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[screenshot_create_params.Variant1AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: screenshot_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[screenshot_create_params.Variant1Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: screenshot_create_params.Variant1GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        screenshot_options: screenshot_create_params.Variant1ScreenshotOptions | Omit = omit,
+        scroll_page: bool | Omit = omit,
+        selector: str | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: screenshot_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: screenshot_create_params.Variant1WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScreenshotCreateResponse:
+        """Takes a screenshot of a webpage from provided URL or HTML.
+
+        Control page loading
+        with `gotoOptions` and `waitFor*` options. Customize screenshots with
+        `viewport`, `fullPage`, `clip` and others.
+
+        Args:
+          account_id: Account ID.
+
+          url: URL to navigate to, eg. `https://example.com`.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          screenshot_options: Check [options](https://pptr.dev/api/puppeteer.screenshotoptions).
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "html"], ["account_id", "url"])
+    async def create(
+        self,
+        *,
+        account_id: str,
+        html: str | Omit = omit,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[screenshot_create_params.Variant0AddScriptTag]
+        | Iterable[screenshot_create_params.Variant1AddScriptTag]
+        | Omit = omit,
+        add_style_tag: Iterable[screenshot_create_params.Variant0AddStyleTag]
+        | Iterable[screenshot_create_params.Variant1AddStyleTag]
+        | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: screenshot_create_params.Variant0Authenticate
+        | screenshot_create_params.Variant1Authenticate
+        | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[screenshot_create_params.Variant0Cookie]
+        | Iterable[screenshot_create_params.Variant1Cookie]
+        | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: screenshot_create_params.Variant0GotoOptions
+        | screenshot_create_params.Variant1GotoOptions
+        | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        screenshot_options: screenshot_create_params.Variant0ScreenshotOptions
+        | screenshot_create_params.Variant1ScreenshotOptions
+        | Omit = omit,
+        scroll_page: bool | Omit = omit,
+        selector: str | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: screenshot_create_params.Variant0Viewport | screenshot_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: screenshot_create_params.Variant0WaitForSelector
+        | screenshot_create_params.Variant1WaitForSelector
+        | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        url: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScreenshotCreateResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/browser-rendering/screenshot",
+            body=await async_maybe_transform(
+                {
+                    "html": html,
+                    "action_timeout": action_timeout,
+                    "add_script_tag": add_script_tag,
+                    "add_style_tag": add_style_tag,
+                    "allow_request_pattern": allow_request_pattern,
+                    "allow_resource_types": allow_resource_types,
+                    "authenticate": authenticate,
+                    "best_attempt": best_attempt,
+                    "cookies": cookies,
+                    "emulate_media_type": emulate_media_type,
+                    "goto_options": goto_options,
+                    "reject_request_pattern": reject_request_pattern,
+                    "reject_resource_types": reject_resource_types,
+                    "screenshot_options": screenshot_options,
+                    "scroll_page": scroll_page,
+                    "selector": selector,
+                    "set_extra_http_headers": set_extra_http_headers,
+                    "set_java_script_enabled": set_java_script_enabled,
+                    "user_agent": user_agent,
+                    "viewport": viewport,
+                    "wait_for_selector": wait_for_selector,
+                    "wait_for_timeout": wait_for_timeout,
+                    "url": url,
+                },
+                screenshot_create_params.ScreenshotCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"cache_ttl": cache_ttl}, screenshot_create_params.ScreenshotCreateParams
+                ),
+            ),
+            cast_to=ScreenshotCreateResponse,
+        )
+
+
+class ScreenshotResourceWithRawResponse:
+    def __init__(self, screenshot: ScreenshotResource) -> None:
+        self._screenshot = screenshot
+
+        self.create = to_raw_response_wrapper(
+            screenshot.create,
+        )
+
+
+class AsyncScreenshotResourceWithRawResponse:
+    def __init__(self, screenshot: AsyncScreenshotResource) -> None:
+        self._screenshot = screenshot
+
+        self.create = async_to_raw_response_wrapper(
+            screenshot.create,
+        )
+
+
+class ScreenshotResourceWithStreamingResponse:
+    def __init__(self, screenshot: ScreenshotResource) -> None:
+        self._screenshot = screenshot
+
+        self.create = to_streamed_response_wrapper(
+            screenshot.create,
+        )
+
+
+class AsyncScreenshotResourceWithStreamingResponse:
+    def __init__(self, screenshot: AsyncScreenshotResource) -> None:
+        self._screenshot = screenshot
+
+        self.create = async_to_streamed_response_wrapper(
+            screenshot.create,
+        )
diff --git a/src/cloudflare/resources/browser_rendering/snapshot.py b/src/cloudflare/resources/browser_rendering/snapshot.py
new file mode 100644
index 00000000000..6326f67114f
--- /dev/null
+++ b/src/cloudflare/resources/browser_rendering/snapshot.py
@@ -0,0 +1,913 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Type, Iterable, Optional, cast
+from typing_extensions import Literal, overload
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.browser_rendering import snapshot_create_params
+from ...types.browser_rendering.snapshot_create_response import SnapshotCreateResponse
+
+__all__ = ["SnapshotResource", "AsyncSnapshotResource"]
+
+
+class SnapshotResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SnapshotResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SnapshotResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SnapshotResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SnapshotResourceWithStreamingResponse(self)
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        html: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[snapshot_create_params.Variant0AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[snapshot_create_params.Variant0AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: snapshot_create_params.Variant0Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[snapshot_create_params.Variant0Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: snapshot_create_params.Variant0GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        screenshot_options: snapshot_create_params.Variant0ScreenshotOptions | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: snapshot_create_params.Variant0Viewport | Omit = omit,
+        wait_for_selector: snapshot_create_params.Variant0WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SnapshotCreateResponse]:
+        """Returns the page's HTML content and screenshot.
+
+        Control page loading with
+        `gotoOptions` and `waitFor*` options. Customize screenshots with `viewport`,
+        `fullPage`, `clip` and others.
+
+        Args:
+          account_id: Account ID.
+
+          html: Set the content of the page, eg: `<h1>Hello World!!</h1>`. Either `html` or
+              `url` must be set.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        url: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[snapshot_create_params.Variant1AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[snapshot_create_params.Variant1AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: snapshot_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[snapshot_create_params.Variant1Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: snapshot_create_params.Variant1GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        screenshot_options: snapshot_create_params.Variant1ScreenshotOptions | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: snapshot_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: snapshot_create_params.Variant1WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SnapshotCreateResponse]:
+        """Returns the page's HTML content and screenshot.
+
+        Control page loading with
+        `gotoOptions` and `waitFor*` options. Customize screenshots with `viewport`,
+        `fullPage`, `clip` and others.
+
+        Args:
+          account_id: Account ID.
+
+          url: URL to navigate to, eg. `https://example.com`.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "html"], ["account_id", "url"])
+    def create(
+        self,
+        *,
+        account_id: str,
+        html: str | Omit = omit,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[snapshot_create_params.Variant0AddScriptTag]
+        | Iterable[snapshot_create_params.Variant1AddScriptTag]
+        | Omit = omit,
+        add_style_tag: Iterable[snapshot_create_params.Variant0AddStyleTag]
+        | Iterable[snapshot_create_params.Variant1AddStyleTag]
+        | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: snapshot_create_params.Variant0Authenticate
+        | snapshot_create_params.Variant1Authenticate
+        | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[snapshot_create_params.Variant0Cookie]
+        | Iterable[snapshot_create_params.Variant1Cookie]
+        | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: snapshot_create_params.Variant0GotoOptions
+        | snapshot_create_params.Variant1GotoOptions
+        | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        screenshot_options: snapshot_create_params.Variant0ScreenshotOptions
+        | snapshot_create_params.Variant1ScreenshotOptions
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: snapshot_create_params.Variant0Viewport | snapshot_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: snapshot_create_params.Variant0WaitForSelector
+        | snapshot_create_params.Variant1WaitForSelector
+        | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        url: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SnapshotCreateResponse]:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/browser-rendering/snapshot",
+            body=maybe_transform(
+                {
+                    "html": html,
+                    "action_timeout": action_timeout,
+                    "add_script_tag": add_script_tag,
+                    "add_style_tag": add_style_tag,
+                    "allow_request_pattern": allow_request_pattern,
+                    "allow_resource_types": allow_resource_types,
+                    "authenticate": authenticate,
+                    "best_attempt": best_attempt,
+                    "cookies": cookies,
+                    "emulate_media_type": emulate_media_type,
+                    "goto_options": goto_options,
+                    "reject_request_pattern": reject_request_pattern,
+                    "reject_resource_types": reject_resource_types,
+                    "screenshot_options": screenshot_options,
+                    "set_extra_http_headers": set_extra_http_headers,
+                    "set_java_script_enabled": set_java_script_enabled,
+                    "user_agent": user_agent,
+                    "viewport": viewport,
+                    "wait_for_selector": wait_for_selector,
+                    "wait_for_timeout": wait_for_timeout,
+                    "url": url,
+                },
+                snapshot_create_params.SnapshotCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"cache_ttl": cache_ttl}, snapshot_create_params.SnapshotCreateParams),
+                post_parser=ResultWrapper[Optional[SnapshotCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SnapshotCreateResponse]], ResultWrapper[SnapshotCreateResponse]),
+        )
+
+
+class AsyncSnapshotResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSnapshotResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSnapshotResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSnapshotResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSnapshotResourceWithStreamingResponse(self)
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        html: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[snapshot_create_params.Variant0AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[snapshot_create_params.Variant0AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: snapshot_create_params.Variant0Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[snapshot_create_params.Variant0Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: snapshot_create_params.Variant0GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        screenshot_options: snapshot_create_params.Variant0ScreenshotOptions | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: snapshot_create_params.Variant0Viewport | Omit = omit,
+        wait_for_selector: snapshot_create_params.Variant0WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SnapshotCreateResponse]:
+        """Returns the page's HTML content and screenshot.
+
+        Control page loading with
+        `gotoOptions` and `waitFor*` options. Customize screenshots with `viewport`,
+        `fullPage`, `clip` and others.
+
+        Args:
+          account_id: Account ID.
+
+          html: Set the content of the page, eg: `<h1>Hello World!!</h1>`. Either `html` or
+              `url` must be set.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        url: str,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[snapshot_create_params.Variant1AddScriptTag] | Omit = omit,
+        add_style_tag: Iterable[snapshot_create_params.Variant1AddStyleTag] | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: snapshot_create_params.Variant1Authenticate | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[snapshot_create_params.Variant1Cookie] | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: snapshot_create_params.Variant1GotoOptions | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        screenshot_options: snapshot_create_params.Variant1ScreenshotOptions | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: snapshot_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: snapshot_create_params.Variant1WaitForSelector | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SnapshotCreateResponse]:
+        """Returns the page's HTML content and screenshot.
+
+        Control page loading with
+        `gotoOptions` and `waitFor*` options. Customize screenshots with `viewport`,
+        `fullPage`, `clip` and others.
+
+        Args:
+          account_id: Account ID.
+
+          url: URL to navigate to, eg. `https://example.com`.
+
+          cache_ttl: Cache TTL default is 5s. Set to 0 to disable.
+
+          action_timeout: The maximum duration allowed for the browser action to complete after the page
+              has loaded (such as taking screenshots, extracting content, or generating PDFs).
+              If this time limit is exceeded, the action stops and returns a timeout error.
+
+          add_script_tag: Adds a `<script>` tag into the page with the desired URL or content.
+
+          add_style_tag: Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+              `<style type="text/css">` tag with the content.
+
+          allow_request_pattern: Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'.
+
+          allow_resource_types: Only allow requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          authenticate: Provide credentials for HTTP authentication.
+
+          best_attempt: Attempt to proceed when 'awaited' events fail or timeout.
+
+          cookies: Check [options](https://pptr.dev/api/puppeteer.page.setcookie).
+
+          goto_options: Check [options](https://pptr.dev/api/puppeteer.gotooptions).
+
+          reject_request_pattern: Block undesired requests that match the provided regex patterns, eg.
+              '/^.\\**\\..(css)'.
+
+          reject_resource_types: Block undesired requests that match the provided resource types, eg. 'image' or
+              'script'.
+
+          viewport: Check [options](https://pptr.dev/api/puppeteer.page.setviewport).
+
+          wait_for_selector: Wait for the selector to appear in page. Check
+              [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+
+          wait_for_timeout: Waits for a specified timeout before continuing.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "html"], ["account_id", "url"])
+    async def create(
+        self,
+        *,
+        account_id: str,
+        html: str | Omit = omit,
+        cache_ttl: float | Omit = omit,
+        action_timeout: float | Omit = omit,
+        add_script_tag: Iterable[snapshot_create_params.Variant0AddScriptTag]
+        | Iterable[snapshot_create_params.Variant1AddScriptTag]
+        | Omit = omit,
+        add_style_tag: Iterable[snapshot_create_params.Variant0AddStyleTag]
+        | Iterable[snapshot_create_params.Variant1AddStyleTag]
+        | Omit = omit,
+        allow_request_pattern: SequenceNotStr[str] | Omit = omit,
+        allow_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        authenticate: snapshot_create_params.Variant0Authenticate
+        | snapshot_create_params.Variant1Authenticate
+        | Omit = omit,
+        best_attempt: bool | Omit = omit,
+        cookies: Iterable[snapshot_create_params.Variant0Cookie]
+        | Iterable[snapshot_create_params.Variant1Cookie]
+        | Omit = omit,
+        emulate_media_type: str | Omit = omit,
+        goto_options: snapshot_create_params.Variant0GotoOptions
+        | snapshot_create_params.Variant1GotoOptions
+        | Omit = omit,
+        reject_request_pattern: SequenceNotStr[str] | Omit = omit,
+        reject_resource_types: List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ]
+        | Omit = omit,
+        screenshot_options: snapshot_create_params.Variant0ScreenshotOptions
+        | snapshot_create_params.Variant1ScreenshotOptions
+        | Omit = omit,
+        set_extra_http_headers: Dict[str, str] | Omit = omit,
+        set_java_script_enabled: bool | Omit = omit,
+        user_agent: str | Omit = omit,
+        viewport: snapshot_create_params.Variant0Viewport | snapshot_create_params.Variant1Viewport | Omit = omit,
+        wait_for_selector: snapshot_create_params.Variant0WaitForSelector
+        | snapshot_create_params.Variant1WaitForSelector
+        | Omit = omit,
+        wait_for_timeout: float | Omit = omit,
+        url: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SnapshotCreateResponse]:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/browser-rendering/snapshot",
+            body=await async_maybe_transform(
+                {
+                    "html": html,
+                    "action_timeout": action_timeout,
+                    "add_script_tag": add_script_tag,
+                    "add_style_tag": add_style_tag,
+                    "allow_request_pattern": allow_request_pattern,
+                    "allow_resource_types": allow_resource_types,
+                    "authenticate": authenticate,
+                    "best_attempt": best_attempt,
+                    "cookies": cookies,
+                    "emulate_media_type": emulate_media_type,
+                    "goto_options": goto_options,
+                    "reject_request_pattern": reject_request_pattern,
+                    "reject_resource_types": reject_resource_types,
+                    "screenshot_options": screenshot_options,
+                    "set_extra_http_headers": set_extra_http_headers,
+                    "set_java_script_enabled": set_java_script_enabled,
+                    "user_agent": user_agent,
+                    "viewport": viewport,
+                    "wait_for_selector": wait_for_selector,
+                    "wait_for_timeout": wait_for_timeout,
+                    "url": url,
+                },
+                snapshot_create_params.SnapshotCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"cache_ttl": cache_ttl}, snapshot_create_params.SnapshotCreateParams
+                ),
+                post_parser=ResultWrapper[Optional[SnapshotCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SnapshotCreateResponse]], ResultWrapper[SnapshotCreateResponse]),
+        )
+
+
+class SnapshotResourceWithRawResponse:
+    def __init__(self, snapshot: SnapshotResource) -> None:
+        self._snapshot = snapshot
+
+        self.create = to_raw_response_wrapper(
+            snapshot.create,
+        )
+
+
+class AsyncSnapshotResourceWithRawResponse:
+    def __init__(self, snapshot: AsyncSnapshotResource) -> None:
+        self._snapshot = snapshot
+
+        self.create = async_to_raw_response_wrapper(
+            snapshot.create,
+        )
+
+
+class SnapshotResourceWithStreamingResponse:
+    def __init__(self, snapshot: SnapshotResource) -> None:
+        self._snapshot = snapshot
+
+        self.create = to_streamed_response_wrapper(
+            snapshot.create,
+        )
+
+
+class AsyncSnapshotResourceWithStreamingResponse:
+    def __init__(self, snapshot: AsyncSnapshotResource) -> None:
+        self._snapshot = snapshot
+
+        self.create = async_to_streamed_response_wrapper(
+            snapshot.create,
+        )
diff --git a/src/cloudflare/resources/cache/cache.py b/src/cloudflare/resources/cache/cache.py
index ad1bbcf2b6a..832b66a1363 100644
--- a/src/cloudflare/resources/cache/cache.py
+++ b/src/cloudflare/resources/cache/cache.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Iterable, Optional, cast, overload
+from typing import Type, Iterable, Optional, cast
+from typing_extensions import overload
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    required_args,
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
 from .variants import (
     VariantsResource,
     AsyncVariantsResource,
@@ -79,10 +76,21 @@ def regional_tiered_cache(self) -> RegionalTieredCacheResource:
 
     @cached_property
     def with_raw_response(self) -> CacheResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CacheResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CacheResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CacheResourceWithStreamingResponse(self)
 
     @overload
@@ -90,13 +98,13 @@ def purge(
         self,
         *,
         zone_id: str,
-        tags: List[str] | NotGiven = NOT_GIVEN,
+        tags: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CachePurgeResponse]:
         """### Purge All Cached Content
 
@@ -122,10 +130,6 @@ def purge(
         **hostname**. The port number can be omitted if it is the default port (80 for
         http, 443 for https), but must be included otherwise.
 
-        **NB:** For Zones on Free/Pro/Business plan, you may purge up to 30 URLs in one
-        API call. For Zones on Enterprise plan, you may purge up to 500 URLs in one API
-        call.
-
         Single file purge example with files:
 
         ```
@@ -152,13 +156,7 @@ def purge(
         ### Purge Cached Content by Tag, Host or Prefix
 
         Granularly removes one or more files from Cloudflare's cache either by
-        specifying the host, the associated Cache-Tag, or a Prefix. Only Enterprise
-        customers are permitted to purge by Tag, Host or Prefix.
-
-        **NB:** Cache-Tag, host, and prefix purging each have a rate limit of 30,000
-        purge API calls in every 24 hour period. You may purge up to 30 tags, hosts, or
-        prefixes in one API call. This rate limit can be raised for customers who need
-        to purge at higher volume.
+        specifying the host, the associated Cache-Tag, or a Prefix.
 
         Flex purge with tags:
 
@@ -178,9 +176,14 @@ def purge(
         {"prefixes": ["www.example.com/foo", "images.example.com/bar/baz"]}
         ```
 
+        ### Availability and limits
+
+        please refer to
+        [purge cache availability and limits documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).
+
         Args:
           tags: For more information on cache tags and purging by tags, please refer to
-              [purge by cache-tags documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge-by-tags/#purge-cache-by-cache-tags-enterprise-only).
+              [purge by cache-tags documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge-by-tags/).
 
           extra_headers: Send extra headers
 
@@ -197,13 +200,13 @@ def purge(
         self,
         *,
         zone_id: str,
-        hosts: List[str] | NotGiven = NOT_GIVEN,
+        hosts: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CachePurgeResponse]:
         """### Purge All Cached Content
 
@@ -229,10 +232,6 @@ def purge(
         **hostname**. The port number can be omitted if it is the default port (80 for
         http, 443 for https), but must be included otherwise.
 
-        **NB:** For Zones on Free/Pro/Business plan, you may purge up to 30 URLs in one
-        API call. For Zones on Enterprise plan, you may purge up to 500 URLs in one API
-        call.
-
         Single file purge example with files:
 
         ```
@@ -259,13 +258,7 @@ def purge(
         ### Purge Cached Content by Tag, Host or Prefix
 
         Granularly removes one or more files from Cloudflare's cache either by
-        specifying the host, the associated Cache-Tag, or a Prefix. Only Enterprise
-        customers are permitted to purge by Tag, Host or Prefix.
-
-        **NB:** Cache-Tag, host, and prefix purging each have a rate limit of 30,000
-        purge API calls in every 24 hour period. You may purge up to 30 tags, hosts, or
-        prefixes in one API call. This rate limit can be raised for customers who need
-        to purge at higher volume.
+        specifying the host, the associated Cache-Tag, or a Prefix.
 
         Flex purge with tags:
 
@@ -285,6 +278,11 @@ def purge(
         {"prefixes": ["www.example.com/foo", "images.example.com/bar/baz"]}
         ```
 
+        ### Availability and limits
+
+        please refer to
+        [purge cache availability and limits documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).
+
         Args:
           hosts: For more information purging by hostnames, please refer to
               [purge by hostname documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge-by-hostname/).
@@ -304,13 +302,13 @@ def purge(
         self,
         *,
         zone_id: str,
-        prefixes: List[str] | NotGiven = NOT_GIVEN,
+        prefixes: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CachePurgeResponse]:
         """### Purge All Cached Content
 
@@ -336,10 +334,6 @@ def purge(
         **hostname**. The port number can be omitted if it is the default port (80 for
         http, 443 for https), but must be included otherwise.
 
-        **NB:** For Zones on Free/Pro/Business plan, you may purge up to 30 URLs in one
-        API call. For Zones on Enterprise plan, you may purge up to 500 URLs in one API
-        call.
-
         Single file purge example with files:
 
         ```
@@ -366,13 +360,7 @@ def purge(
         ### Purge Cached Content by Tag, Host or Prefix
 
         Granularly removes one or more files from Cloudflare's cache either by
-        specifying the host, the associated Cache-Tag, or a Prefix. Only Enterprise
-        customers are permitted to purge by Tag, Host or Prefix.
-
-        **NB:** Cache-Tag, host, and prefix purging each have a rate limit of 30,000
-        purge API calls in every 24 hour period. You may purge up to 30 tags, hosts, or
-        prefixes in one API call. This rate limit can be raised for customers who need
-        to purge at higher volume.
+        specifying the host, the associated Cache-Tag, or a Prefix.
 
         Flex purge with tags:
 
@@ -392,6 +380,11 @@ def purge(
         {"prefixes": ["www.example.com/foo", "images.example.com/bar/baz"]}
         ```
 
+        ### Availability and limits
+
+        please refer to
+        [purge cache availability and limits documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).
+
         Args:
           prefixes: For more information on purging by prefixes, please refer to
               [purge by prefix documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge_by_prefix/).
@@ -411,13 +404,13 @@ def purge(
         self,
         *,
         zone_id: str,
-        purge_everything: bool | NotGiven = NOT_GIVEN,
+        purge_everything: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CachePurgeResponse]:
         """### Purge All Cached Content
 
@@ -443,10 +436,6 @@ def purge(
         **hostname**. The port number can be omitted if it is the default port (80 for
         http, 443 for https), but must be included otherwise.
 
-        **NB:** For Zones on Free/Pro/Business plan, you may purge up to 30 URLs in one
-        API call. For Zones on Enterprise plan, you may purge up to 500 URLs in one API
-        call.
-
         Single file purge example with files:
 
         ```
@@ -473,13 +462,7 @@ def purge(
         ### Purge Cached Content by Tag, Host or Prefix
 
         Granularly removes one or more files from Cloudflare's cache either by
-        specifying the host, the associated Cache-Tag, or a Prefix. Only Enterprise
-        customers are permitted to purge by Tag, Host or Prefix.
-
-        **NB:** Cache-Tag, host, and prefix purging each have a rate limit of 30,000
-        purge API calls in every 24 hour period. You may purge up to 30 tags, hosts, or
-        prefixes in one API call. This rate limit can be raised for customers who need
-        to purge at higher volume.
+        specifying the host, the associated Cache-Tag, or a Prefix.
 
         Flex purge with tags:
 
@@ -499,6 +482,11 @@ def purge(
         {"prefixes": ["www.example.com/foo", "images.example.com/bar/baz"]}
         ```
 
+        ### Availability and limits
+
+        please refer to
+        [purge cache availability and limits documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).
+
         Args:
           purge_everything: For more information, please refer to
               [purge everything documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge-everything/).
@@ -518,13 +506,13 @@ def purge(
         self,
         *,
         zone_id: str,
-        files: List[str] | NotGiven = NOT_GIVEN,
+        files: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CachePurgeResponse]:
         """### Purge All Cached Content
 
@@ -550,10 +538,6 @@ def purge(
         **hostname**. The port number can be omitted if it is the default port (80 for
         http, 443 for https), but must be included otherwise.
 
-        **NB:** For Zones on Free/Pro/Business plan, you may purge up to 30 URLs in one
-        API call. For Zones on Enterprise plan, you may purge up to 500 URLs in one API
-        call.
-
         Single file purge example with files:
 
         ```
@@ -580,13 +564,7 @@ def purge(
         ### Purge Cached Content by Tag, Host or Prefix
 
         Granularly removes one or more files from Cloudflare's cache either by
-        specifying the host, the associated Cache-Tag, or a Prefix. Only Enterprise
-        customers are permitted to purge by Tag, Host or Prefix.
-
-        **NB:** Cache-Tag, host, and prefix purging each have a rate limit of 30,000
-        purge API calls in every 24 hour period. You may purge up to 30 tags, hosts, or
-        prefixes in one API call. This rate limit can be raised for customers who need
-        to purge at higher volume.
+        specifying the host, the associated Cache-Tag, or a Prefix.
 
         Flex purge with tags:
 
@@ -606,6 +584,11 @@ def purge(
         {"prefixes": ["www.example.com/foo", "images.example.com/bar/baz"]}
         ```
 
+        ### Availability and limits
+
+        please refer to
+        [purge cache availability and limits documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).
+
         Args:
           files: For more information on purging files, please refer to
               [purge by single-file documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge-by-single-file/).
@@ -625,13 +608,13 @@ def purge(
         self,
         *,
         zone_id: str,
-        files: Iterable[cache_purge_params.CachePurgeSingleFileWithURLAndHeadersFile] | NotGiven = NOT_GIVEN,
+        files: Iterable[cache_purge_params.CachePurgeSingleFileWithURLAndHeadersFile] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CachePurgeResponse]:
         """### Purge All Cached Content
 
@@ -657,10 +640,6 @@ def purge(
         **hostname**. The port number can be omitted if it is the default port (80 for
         http, 443 for https), but must be included otherwise.
 
-        **NB:** For Zones on Free/Pro/Business plan, you may purge up to 30 URLs in one
-        API call. For Zones on Enterprise plan, you may purge up to 500 URLs in one API
-        call.
-
         Single file purge example with files:
 
         ```
@@ -687,13 +666,7 @@ def purge(
         ### Purge Cached Content by Tag, Host or Prefix
 
         Granularly removes one or more files from Cloudflare's cache either by
-        specifying the host, the associated Cache-Tag, or a Prefix. Only Enterprise
-        customers are permitted to purge by Tag, Host or Prefix.
-
-        **NB:** Cache-Tag, host, and prefix purging each have a rate limit of 30,000
-        purge API calls in every 24 hour period. You may purge up to 30 tags, hosts, or
-        prefixes in one API call. This rate limit can be raised for customers who need
-        to purge at higher volume.
+        specifying the host, the associated Cache-Tag, or a Prefix.
 
         Flex purge with tags:
 
@@ -713,6 +686,11 @@ def purge(
         {"prefixes": ["www.example.com/foo", "images.example.com/bar/baz"]}
         ```
 
+        ### Availability and limits
+
+        please refer to
+        [purge cache availability and limits documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).
+
         Args:
           files: For more information on purging files with URL and headers, please refer to
               [purge by single-file documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge-by-single-file/).
@@ -732,19 +710,19 @@ def purge(
         self,
         *,
         zone_id: str,
-        tags: List[str] | NotGiven = NOT_GIVEN,
-        hosts: List[str] | NotGiven = NOT_GIVEN,
-        prefixes: List[str] | NotGiven = NOT_GIVEN,
-        purge_everything: bool | NotGiven = NOT_GIVEN,
-        files: List[str]
+        tags: SequenceNotStr[str] | Omit = omit,
+        hosts: SequenceNotStr[str] | Omit = omit,
+        prefixes: SequenceNotStr[str] | Omit = omit,
+        purge_everything: bool | Omit = omit,
+        files: SequenceNotStr[str]
         | Iterable[cache_purge_params.CachePurgeSingleFileWithURLAndHeadersFile]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CachePurgeResponse]:
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
@@ -790,10 +768,21 @@ def regional_tiered_cache(self) -> AsyncRegionalTieredCacheResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncCacheResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCacheResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCacheResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCacheResourceWithStreamingResponse(self)
 
     @overload
@@ -801,13 +790,13 @@ async def purge(
         self,
         *,
         zone_id: str,
-        tags: List[str] | NotGiven = NOT_GIVEN,
+        tags: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CachePurgeResponse]:
         """### Purge All Cached Content
 
@@ -833,10 +822,6 @@ async def purge(
         **hostname**. The port number can be omitted if it is the default port (80 for
         http, 443 for https), but must be included otherwise.
 
-        **NB:** For Zones on Free/Pro/Business plan, you may purge up to 30 URLs in one
-        API call. For Zones on Enterprise plan, you may purge up to 500 URLs in one API
-        call.
-
         Single file purge example with files:
 
         ```
@@ -863,13 +848,7 @@ async def purge(
         ### Purge Cached Content by Tag, Host or Prefix
 
         Granularly removes one or more files from Cloudflare's cache either by
-        specifying the host, the associated Cache-Tag, or a Prefix. Only Enterprise
-        customers are permitted to purge by Tag, Host or Prefix.
-
-        **NB:** Cache-Tag, host, and prefix purging each have a rate limit of 30,000
-        purge API calls in every 24 hour period. You may purge up to 30 tags, hosts, or
-        prefixes in one API call. This rate limit can be raised for customers who need
-        to purge at higher volume.
+        specifying the host, the associated Cache-Tag, or a Prefix.
 
         Flex purge with tags:
 
@@ -889,9 +868,14 @@ async def purge(
         {"prefixes": ["www.example.com/foo", "images.example.com/bar/baz"]}
         ```
 
+        ### Availability and limits
+
+        please refer to
+        [purge cache availability and limits documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).
+
         Args:
           tags: For more information on cache tags and purging by tags, please refer to
-              [purge by cache-tags documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge-by-tags/#purge-cache-by-cache-tags-enterprise-only).
+              [purge by cache-tags documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge-by-tags/).
 
           extra_headers: Send extra headers
 
@@ -908,13 +892,13 @@ async def purge(
         self,
         *,
         zone_id: str,
-        hosts: List[str] | NotGiven = NOT_GIVEN,
+        hosts: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CachePurgeResponse]:
         """### Purge All Cached Content
 
@@ -940,10 +924,6 @@ async def purge(
         **hostname**. The port number can be omitted if it is the default port (80 for
         http, 443 for https), but must be included otherwise.
 
-        **NB:** For Zones on Free/Pro/Business plan, you may purge up to 30 URLs in one
-        API call. For Zones on Enterprise plan, you may purge up to 500 URLs in one API
-        call.
-
         Single file purge example with files:
 
         ```
@@ -970,13 +950,7 @@ async def purge(
         ### Purge Cached Content by Tag, Host or Prefix
 
         Granularly removes one or more files from Cloudflare's cache either by
-        specifying the host, the associated Cache-Tag, or a Prefix. Only Enterprise
-        customers are permitted to purge by Tag, Host or Prefix.
-
-        **NB:** Cache-Tag, host, and prefix purging each have a rate limit of 30,000
-        purge API calls in every 24 hour period. You may purge up to 30 tags, hosts, or
-        prefixes in one API call. This rate limit can be raised for customers who need
-        to purge at higher volume.
+        specifying the host, the associated Cache-Tag, or a Prefix.
 
         Flex purge with tags:
 
@@ -996,6 +970,11 @@ async def purge(
         {"prefixes": ["www.example.com/foo", "images.example.com/bar/baz"]}
         ```
 
+        ### Availability and limits
+
+        please refer to
+        [purge cache availability and limits documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).
+
         Args:
           hosts: For more information purging by hostnames, please refer to
               [purge by hostname documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge-by-hostname/).
@@ -1015,13 +994,13 @@ async def purge(
         self,
         *,
         zone_id: str,
-        prefixes: List[str] | NotGiven = NOT_GIVEN,
+        prefixes: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CachePurgeResponse]:
         """### Purge All Cached Content
 
@@ -1047,10 +1026,6 @@ async def purge(
         **hostname**. The port number can be omitted if it is the default port (80 for
         http, 443 for https), but must be included otherwise.
 
-        **NB:** For Zones on Free/Pro/Business plan, you may purge up to 30 URLs in one
-        API call. For Zones on Enterprise plan, you may purge up to 500 URLs in one API
-        call.
-
         Single file purge example with files:
 
         ```
@@ -1077,13 +1052,7 @@ async def purge(
         ### Purge Cached Content by Tag, Host or Prefix
 
         Granularly removes one or more files from Cloudflare's cache either by
-        specifying the host, the associated Cache-Tag, or a Prefix. Only Enterprise
-        customers are permitted to purge by Tag, Host or Prefix.
-
-        **NB:** Cache-Tag, host, and prefix purging each have a rate limit of 30,000
-        purge API calls in every 24 hour period. You may purge up to 30 tags, hosts, or
-        prefixes in one API call. This rate limit can be raised for customers who need
-        to purge at higher volume.
+        specifying the host, the associated Cache-Tag, or a Prefix.
 
         Flex purge with tags:
 
@@ -1103,6 +1072,11 @@ async def purge(
         {"prefixes": ["www.example.com/foo", "images.example.com/bar/baz"]}
         ```
 
+        ### Availability and limits
+
+        please refer to
+        [purge cache availability and limits documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).
+
         Args:
           prefixes: For more information on purging by prefixes, please refer to
               [purge by prefix documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge_by_prefix/).
@@ -1122,13 +1096,13 @@ async def purge(
         self,
         *,
         zone_id: str,
-        purge_everything: bool | NotGiven = NOT_GIVEN,
+        purge_everything: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CachePurgeResponse]:
         """### Purge All Cached Content
 
@@ -1154,10 +1128,6 @@ async def purge(
         **hostname**. The port number can be omitted if it is the default port (80 for
         http, 443 for https), but must be included otherwise.
 
-        **NB:** For Zones on Free/Pro/Business plan, you may purge up to 30 URLs in one
-        API call. For Zones on Enterprise plan, you may purge up to 500 URLs in one API
-        call.
-
         Single file purge example with files:
 
         ```
@@ -1184,13 +1154,7 @@ async def purge(
         ### Purge Cached Content by Tag, Host or Prefix
 
         Granularly removes one or more files from Cloudflare's cache either by
-        specifying the host, the associated Cache-Tag, or a Prefix. Only Enterprise
-        customers are permitted to purge by Tag, Host or Prefix.
-
-        **NB:** Cache-Tag, host, and prefix purging each have a rate limit of 30,000
-        purge API calls in every 24 hour period. You may purge up to 30 tags, hosts, or
-        prefixes in one API call. This rate limit can be raised for customers who need
-        to purge at higher volume.
+        specifying the host, the associated Cache-Tag, or a Prefix.
 
         Flex purge with tags:
 
@@ -1210,6 +1174,11 @@ async def purge(
         {"prefixes": ["www.example.com/foo", "images.example.com/bar/baz"]}
         ```
 
+        ### Availability and limits
+
+        please refer to
+        [purge cache availability and limits documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).
+
         Args:
           purge_everything: For more information, please refer to
               [purge everything documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge-everything/).
@@ -1229,13 +1198,13 @@ async def purge(
         self,
         *,
         zone_id: str,
-        files: List[str] | NotGiven = NOT_GIVEN,
+        files: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CachePurgeResponse]:
         """### Purge All Cached Content
 
@@ -1261,10 +1230,6 @@ async def purge(
         **hostname**. The port number can be omitted if it is the default port (80 for
         http, 443 for https), but must be included otherwise.
 
-        **NB:** For Zones on Free/Pro/Business plan, you may purge up to 30 URLs in one
-        API call. For Zones on Enterprise plan, you may purge up to 500 URLs in one API
-        call.
-
         Single file purge example with files:
 
         ```
@@ -1291,13 +1256,7 @@ async def purge(
         ### Purge Cached Content by Tag, Host or Prefix
 
         Granularly removes one or more files from Cloudflare's cache either by
-        specifying the host, the associated Cache-Tag, or a Prefix. Only Enterprise
-        customers are permitted to purge by Tag, Host or Prefix.
-
-        **NB:** Cache-Tag, host, and prefix purging each have a rate limit of 30,000
-        purge API calls in every 24 hour period. You may purge up to 30 tags, hosts, or
-        prefixes in one API call. This rate limit can be raised for customers who need
-        to purge at higher volume.
+        specifying the host, the associated Cache-Tag, or a Prefix.
 
         Flex purge with tags:
 
@@ -1317,6 +1276,11 @@ async def purge(
         {"prefixes": ["www.example.com/foo", "images.example.com/bar/baz"]}
         ```
 
+        ### Availability and limits
+
+        please refer to
+        [purge cache availability and limits documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).
+
         Args:
           files: For more information on purging files, please refer to
               [purge by single-file documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge-by-single-file/).
@@ -1336,13 +1300,13 @@ async def purge(
         self,
         *,
         zone_id: str,
-        files: Iterable[cache_purge_params.CachePurgeSingleFileWithURLAndHeadersFile] | NotGiven = NOT_GIVEN,
+        files: Iterable[cache_purge_params.CachePurgeSingleFileWithURLAndHeadersFile] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CachePurgeResponse]:
         """### Purge All Cached Content
 
@@ -1368,10 +1332,6 @@ async def purge(
         **hostname**. The port number can be omitted if it is the default port (80 for
         http, 443 for https), but must be included otherwise.
 
-        **NB:** For Zones on Free/Pro/Business plan, you may purge up to 30 URLs in one
-        API call. For Zones on Enterprise plan, you may purge up to 500 URLs in one API
-        call.
-
         Single file purge example with files:
 
         ```
@@ -1398,13 +1358,7 @@ async def purge(
         ### Purge Cached Content by Tag, Host or Prefix
 
         Granularly removes one or more files from Cloudflare's cache either by
-        specifying the host, the associated Cache-Tag, or a Prefix. Only Enterprise
-        customers are permitted to purge by Tag, Host or Prefix.
-
-        **NB:** Cache-Tag, host, and prefix purging each have a rate limit of 30,000
-        purge API calls in every 24 hour period. You may purge up to 30 tags, hosts, or
-        prefixes in one API call. This rate limit can be raised for customers who need
-        to purge at higher volume.
+        specifying the host, the associated Cache-Tag, or a Prefix.
 
         Flex purge with tags:
 
@@ -1424,6 +1378,11 @@ async def purge(
         {"prefixes": ["www.example.com/foo", "images.example.com/bar/baz"]}
         ```
 
+        ### Availability and limits
+
+        please refer to
+        [purge cache availability and limits documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/#availability-and-limits).
+
         Args:
           files: For more information on purging files with URL and headers, please refer to
               [purge by single-file documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge-by-single-file/).
@@ -1443,19 +1402,19 @@ async def purge(
         self,
         *,
         zone_id: str,
-        tags: List[str] | NotGiven = NOT_GIVEN,
-        hosts: List[str] | NotGiven = NOT_GIVEN,
-        prefixes: List[str] | NotGiven = NOT_GIVEN,
-        purge_everything: bool | NotGiven = NOT_GIVEN,
-        files: List[str]
+        tags: SequenceNotStr[str] | Omit = omit,
+        hosts: SequenceNotStr[str] | Omit = omit,
+        prefixes: SequenceNotStr[str] | Omit = omit,
+        purge_everything: bool | Omit = omit,
+        files: SequenceNotStr[str]
         | Iterable[cache_purge_params.CachePurgeSingleFileWithURLAndHeadersFile]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CachePurgeResponse]:
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
diff --git a/src/cloudflare/resources/cache/cache_reserve.py b/src/cloudflare/resources/cache/cache_reserve.py
index ad27c95386f..f4196a32033 100644
--- a/src/cloudflare/resources/cache/cache_reserve.py
+++ b/src/cloudflare/resources/cache/cache_reserve.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Type, cast
+from typing import Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -34,10 +31,21 @@
 class CacheReserveResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> CacheReserveResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CacheReserveResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CacheReserveResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CacheReserveResourceWithStreamingResponse(self)
 
     def clear(
@@ -50,8 +58,8 @@ def clear(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> CacheReserveClearResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CacheReserveClearResponse]:
         """
         You can use Cache Reserve Clear to clear your Cache Reserve, but you must first
         disable Cache Reserve. In most cases, this will be accomplished within 24 hours.
@@ -59,7 +67,7 @@ def clear(
         that you cannot undo or cancel this operation.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -79,9 +87,9 @@ def clear(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[CacheReserveClearResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[CacheReserveClearResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[CacheReserveClearResponse], ResultWrapper[CacheReserveClearResponse]),
+            cast_to=cast(Type[Optional[CacheReserveClearResponse]], ResultWrapper[CacheReserveClearResponse]),
         )
 
     def edit(
@@ -94,8 +102,8 @@ def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> CacheReserveEditResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CacheReserveEditResponse]:
         """
         Increase cache lifetimes by automatically storing all cacheable files into
         Cloudflare's persistent object storage buckets. Requires Cache Reserve
@@ -105,7 +113,7 @@ def edit(
         for more information.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           value: Value of the Cache Reserve zone setting.
 
@@ -127,9 +135,9 @@ def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[CacheReserveEditResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[CacheReserveEditResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[CacheReserveEditResponse], ResultWrapper[CacheReserveEditResponse]),
+            cast_to=cast(Type[Optional[CacheReserveEditResponse]], ResultWrapper[CacheReserveEditResponse]),
         )
 
     def get(
@@ -141,8 +149,8 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> CacheReserveGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CacheReserveGetResponse]:
         """
         Increase cache lifetimes by automatically storing all cacheable files into
         Cloudflare's persistent object storage buckets. Requires Cache Reserve
@@ -152,7 +160,7 @@ def get(
         for more information.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -171,9 +179,9 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[CacheReserveGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[CacheReserveGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[CacheReserveGetResponse], ResultWrapper[CacheReserveGetResponse]),
+            cast_to=cast(Type[Optional[CacheReserveGetResponse]], ResultWrapper[CacheReserveGetResponse]),
         )
 
     def status(
@@ -185,8 +193,8 @@ def status(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> CacheReserveStatusResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CacheReserveStatusResponse]:
         """
         You can use Cache Reserve Clear to clear your Cache Reserve, but you must first
         disable Cache Reserve. In most cases, this will be accomplished within 24 hours.
@@ -194,7 +202,7 @@ def status(
         that you cannot undo or cancel this operation.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -213,19 +221,30 @@ def status(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[CacheReserveStatusResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[CacheReserveStatusResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[CacheReserveStatusResponse], ResultWrapper[CacheReserveStatusResponse]),
+            cast_to=cast(Type[Optional[CacheReserveStatusResponse]], ResultWrapper[CacheReserveStatusResponse]),
         )
 
 
 class AsyncCacheReserveResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncCacheReserveResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCacheReserveResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCacheReserveResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCacheReserveResourceWithStreamingResponse(self)
 
     async def clear(
@@ -238,8 +257,8 @@ async def clear(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> CacheReserveClearResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CacheReserveClearResponse]:
         """
         You can use Cache Reserve Clear to clear your Cache Reserve, but you must first
         disable Cache Reserve. In most cases, this will be accomplished within 24 hours.
@@ -247,7 +266,7 @@ async def clear(
         that you cannot undo or cancel this operation.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -267,9 +286,9 @@ async def clear(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[CacheReserveClearResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[CacheReserveClearResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[CacheReserveClearResponse], ResultWrapper[CacheReserveClearResponse]),
+            cast_to=cast(Type[Optional[CacheReserveClearResponse]], ResultWrapper[CacheReserveClearResponse]),
         )
 
     async def edit(
@@ -282,8 +301,8 @@ async def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> CacheReserveEditResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CacheReserveEditResponse]:
         """
         Increase cache lifetimes by automatically storing all cacheable files into
         Cloudflare's persistent object storage buckets. Requires Cache Reserve
@@ -293,7 +312,7 @@ async def edit(
         for more information.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           value: Value of the Cache Reserve zone setting.
 
@@ -315,9 +334,9 @@ async def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[CacheReserveEditResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[CacheReserveEditResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[CacheReserveEditResponse], ResultWrapper[CacheReserveEditResponse]),
+            cast_to=cast(Type[Optional[CacheReserveEditResponse]], ResultWrapper[CacheReserveEditResponse]),
         )
 
     async def get(
@@ -329,8 +348,8 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> CacheReserveGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CacheReserveGetResponse]:
         """
         Increase cache lifetimes by automatically storing all cacheable files into
         Cloudflare's persistent object storage buckets. Requires Cache Reserve
@@ -340,7 +359,7 @@ async def get(
         for more information.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -359,9 +378,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[CacheReserveGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[CacheReserveGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[CacheReserveGetResponse], ResultWrapper[CacheReserveGetResponse]),
+            cast_to=cast(Type[Optional[CacheReserveGetResponse]], ResultWrapper[CacheReserveGetResponse]),
         )
 
     async def status(
@@ -373,8 +392,8 @@ async def status(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> CacheReserveStatusResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CacheReserveStatusResponse]:
         """
         You can use Cache Reserve Clear to clear your Cache Reserve, but you must first
         disable Cache Reserve. In most cases, this will be accomplished within 24 hours.
@@ -382,7 +401,7 @@ async def status(
         that you cannot undo or cancel this operation.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -401,9 +420,9 @@ async def status(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[CacheReserveStatusResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[CacheReserveStatusResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[CacheReserveStatusResponse], ResultWrapper[CacheReserveStatusResponse]),
+            cast_to=cast(Type[Optional[CacheReserveStatusResponse]], ResultWrapper[CacheReserveStatusResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/cache/regional_tiered_cache.py b/src/cloudflare/resources/cache/regional_tiered_cache.py
index ad130a1e6a3..f70da5cadcb 100644
--- a/src/cloudflare/resources/cache/regional_tiered_cache.py
+++ b/src/cloudflare/resources/cache/regional_tiered_cache.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Type, cast
+from typing import Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -32,10 +29,21 @@
 class RegionalTieredCacheResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RegionalTieredCacheResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RegionalTieredCacheResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RegionalTieredCacheResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RegionalTieredCacheResourceWithStreamingResponse(self)
 
     def edit(
@@ -48,15 +56,15 @@ def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RegionalTieredCacheEditResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RegionalTieredCacheEditResponse]:
         """
         Instructs Cloudflare to check a regional hub data center on the way to your
         upper tier. This can help improve performance for smart and custom tiered cache
         topologies.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           value: Value of the Regional Tiered Cache zone setting.
 
@@ -78,9 +86,11 @@ def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[RegionalTieredCacheEditResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[RegionalTieredCacheEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[RegionalTieredCacheEditResponse]], ResultWrapper[RegionalTieredCacheEditResponse]
             ),
-            cast_to=cast(Type[RegionalTieredCacheEditResponse], ResultWrapper[RegionalTieredCacheEditResponse]),
         )
 
     def get(
@@ -92,15 +102,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RegionalTieredCacheGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RegionalTieredCacheGetResponse]:
         """
         Instructs Cloudflare to check a regional hub data center on the way to your
         upper tier. This can help improve performance for smart and custom tiered cache
         topologies.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -119,19 +129,30 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[RegionalTieredCacheGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[RegionalTieredCacheGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[RegionalTieredCacheGetResponse], ResultWrapper[RegionalTieredCacheGetResponse]),
+            cast_to=cast(Type[Optional[RegionalTieredCacheGetResponse]], ResultWrapper[RegionalTieredCacheGetResponse]),
         )
 
 
 class AsyncRegionalTieredCacheResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRegionalTieredCacheResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRegionalTieredCacheResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRegionalTieredCacheResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRegionalTieredCacheResourceWithStreamingResponse(self)
 
     async def edit(
@@ -144,15 +165,15 @@ async def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RegionalTieredCacheEditResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RegionalTieredCacheEditResponse]:
         """
         Instructs Cloudflare to check a regional hub data center on the way to your
         upper tier. This can help improve performance for smart and custom tiered cache
         topologies.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           value: Value of the Regional Tiered Cache zone setting.
 
@@ -176,9 +197,11 @@ async def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[RegionalTieredCacheEditResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[RegionalTieredCacheEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[RegionalTieredCacheEditResponse]], ResultWrapper[RegionalTieredCacheEditResponse]
             ),
-            cast_to=cast(Type[RegionalTieredCacheEditResponse], ResultWrapper[RegionalTieredCacheEditResponse]),
         )
 
     async def get(
@@ -190,15 +213,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RegionalTieredCacheGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RegionalTieredCacheGetResponse]:
         """
         Instructs Cloudflare to check a regional hub data center on the way to your
         upper tier. This can help improve performance for smart and custom tiered cache
         topologies.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -217,9 +240,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[RegionalTieredCacheGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[RegionalTieredCacheGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[RegionalTieredCacheGetResponse], ResultWrapper[RegionalTieredCacheGetResponse]),
+            cast_to=cast(Type[Optional[RegionalTieredCacheGetResponse]], ResultWrapper[RegionalTieredCacheGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/cache/smart_tiered_cache.py b/src/cloudflare/resources/cache/smart_tiered_cache.py
index 44e94e58319..f9eefc2f36f 100644
--- a/src/cloudflare/resources/cache/smart_tiered_cache.py
+++ b/src/cloudflare/resources/cache/smart_tiered_cache.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Type, cast
+from typing import Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -33,10 +30,21 @@
 class SmartTieredCacheResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SmartTieredCacheResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SmartTieredCacheResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SmartTieredCacheResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SmartTieredCacheResourceWithStreamingResponse(self)
 
     def delete(
@@ -48,13 +56,18 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SmartTieredCacheDeleteResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SmartTieredCacheDeleteResponse]:
         """
-        Remvoves enablement of Smart Tiered Cache
+        Smart Tiered Cache dynamically selects the single closest upper tier for each of
+        your website’s origins with no configuration required, using our in-house
+        performance and routing data. Cloudflare collects latency data for each request
+        to an origin, and uses the latency data to determine how well any upper-tier
+        data center is connected with an origin. As a result, Cloudflare can select the
+        data center with the lowest latency to be the upper-tier for an origin.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -73,9 +86,9 @@ def delete(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[SmartTieredCacheDeleteResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[SmartTieredCacheDeleteResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[SmartTieredCacheDeleteResponse], ResultWrapper[SmartTieredCacheDeleteResponse]),
+            cast_to=cast(Type[Optional[SmartTieredCacheDeleteResponse]], ResultWrapper[SmartTieredCacheDeleteResponse]),
         )
 
     def edit(
@@ -88,15 +101,20 @@ def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SmartTieredCacheEditResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SmartTieredCacheEditResponse]:
         """
-        Updates enablement of Tiered Cache
+        Smart Tiered Cache dynamically selects the single closest upper tier for each of
+        your website’s origins with no configuration required, using our in-house
+        performance and routing data. Cloudflare collects latency data for each request
+        to an origin, and uses the latency data to determine how well any upper-tier
+        data center is connected with an origin. As a result, Cloudflare can select the
+        data center with the lowest latency to be the upper-tier for an origin.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          value: Enable or disable the Smart Tiered Cache
+          value: Enable or disable the Smart Tiered Cache.
 
           extra_headers: Send extra headers
 
@@ -116,9 +134,9 @@ def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[SmartTieredCacheEditResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[SmartTieredCacheEditResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[SmartTieredCacheEditResponse], ResultWrapper[SmartTieredCacheEditResponse]),
+            cast_to=cast(Type[Optional[SmartTieredCacheEditResponse]], ResultWrapper[SmartTieredCacheEditResponse]),
         )
 
     def get(
@@ -130,13 +148,18 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SmartTieredCacheGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SmartTieredCacheGetResponse]:
         """
-        Get Smart Tiered Cache setting
+        Smart Tiered Cache dynamically selects the single closest upper tier for each of
+        your website’s origins with no configuration required, using our in-house
+        performance and routing data. Cloudflare collects latency data for each request
+        to an origin, and uses the latency data to determine how well any upper-tier
+        data center is connected with an origin. As a result, Cloudflare can select the
+        data center with the lowest latency to be the upper-tier for an origin.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -155,19 +178,30 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[SmartTieredCacheGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[SmartTieredCacheGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[SmartTieredCacheGetResponse], ResultWrapper[SmartTieredCacheGetResponse]),
+            cast_to=cast(Type[Optional[SmartTieredCacheGetResponse]], ResultWrapper[SmartTieredCacheGetResponse]),
         )
 
 
 class AsyncSmartTieredCacheResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSmartTieredCacheResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSmartTieredCacheResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSmartTieredCacheResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSmartTieredCacheResourceWithStreamingResponse(self)
 
     async def delete(
@@ -179,13 +213,18 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SmartTieredCacheDeleteResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SmartTieredCacheDeleteResponse]:
         """
-        Remvoves enablement of Smart Tiered Cache
+        Smart Tiered Cache dynamically selects the single closest upper tier for each of
+        your website’s origins with no configuration required, using our in-house
+        performance and routing data. Cloudflare collects latency data for each request
+        to an origin, and uses the latency data to determine how well any upper-tier
+        data center is connected with an origin. As a result, Cloudflare can select the
+        data center with the lowest latency to be the upper-tier for an origin.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -204,9 +243,9 @@ async def delete(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[SmartTieredCacheDeleteResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[SmartTieredCacheDeleteResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[SmartTieredCacheDeleteResponse], ResultWrapper[SmartTieredCacheDeleteResponse]),
+            cast_to=cast(Type[Optional[SmartTieredCacheDeleteResponse]], ResultWrapper[SmartTieredCacheDeleteResponse]),
         )
 
     async def edit(
@@ -219,15 +258,20 @@ async def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SmartTieredCacheEditResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SmartTieredCacheEditResponse]:
         """
-        Updates enablement of Tiered Cache
+        Smart Tiered Cache dynamically selects the single closest upper tier for each of
+        your website’s origins with no configuration required, using our in-house
+        performance and routing data. Cloudflare collects latency data for each request
+        to an origin, and uses the latency data to determine how well any upper-tier
+        data center is connected with an origin. As a result, Cloudflare can select the
+        data center with the lowest latency to be the upper-tier for an origin.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          value: Enable or disable the Smart Tiered Cache
+          value: Enable or disable the Smart Tiered Cache.
 
           extra_headers: Send extra headers
 
@@ -249,9 +293,9 @@ async def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[SmartTieredCacheEditResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[SmartTieredCacheEditResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[SmartTieredCacheEditResponse], ResultWrapper[SmartTieredCacheEditResponse]),
+            cast_to=cast(Type[Optional[SmartTieredCacheEditResponse]], ResultWrapper[SmartTieredCacheEditResponse]),
         )
 
     async def get(
@@ -263,13 +307,18 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SmartTieredCacheGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SmartTieredCacheGetResponse]:
         """
-        Get Smart Tiered Cache setting
+        Smart Tiered Cache dynamically selects the single closest upper tier for each of
+        your website’s origins with no configuration required, using our in-house
+        performance and routing data. Cloudflare collects latency data for each request
+        to an origin, and uses the latency data to determine how well any upper-tier
+        data center is connected with an origin. As a result, Cloudflare can select the
+        data center with the lowest latency to be the upper-tier for an origin.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -288,9 +337,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[SmartTieredCacheGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[SmartTieredCacheGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[SmartTieredCacheGetResponse], ResultWrapper[SmartTieredCacheGetResponse]),
+            cast_to=cast(Type[Optional[SmartTieredCacheGetResponse]], ResultWrapper[SmartTieredCacheGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/cache/variants.py b/src/cloudflare/resources/cache/variants.py
index bf705271620..a263f6997d4 100644
--- a/src/cloudflare/resources/cache/variants.py
+++ b/src/cloudflare/resources/cache/variants.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -22,9 +19,9 @@
 from ..._wrappers import ResultWrapper
 from ...types.cache import variant_edit_params
 from ..._base_client import make_request_options
-from ...types.cache.cache_variant import CacheVariant
 from ...types.cache.variant_get_response import VariantGetResponse
 from ...types.cache.variant_edit_response import VariantEditResponse
+from ...types.cache.variant_delete_response import VariantDeleteResponse
 
 __all__ = ["VariantsResource", "AsyncVariantsResource"]
 
@@ -32,10 +29,21 @@
 class VariantsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> VariantsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return VariantsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> VariantsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return VariantsResourceWithStreamingResponse(self)
 
     def delete(
@@ -47,8 +55,8 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> CacheVariant:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[VariantDeleteResponse]:
         """
         Variant support enables caching variants of images with certain file extensions
         in addition to the original. This only applies when the origin server sends the
@@ -57,7 +65,7 @@ def delete(
         be indicated with BYPASS cache status in the response headers.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -76,9 +84,9 @@ def delete(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[CacheVariant]._unwrapper,
+                post_parser=ResultWrapper[Optional[VariantDeleteResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[CacheVariant], ResultWrapper[CacheVariant]),
+            cast_to=cast(Type[Optional[VariantDeleteResponse]], ResultWrapper[VariantDeleteResponse]),
         )
 
     def edit(
@@ -91,8 +99,8 @@ def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> VariantEditResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[VariantEditResponse]:
         """
         Variant support enables caching variants of images with certain file extensions
         in addition to the original. This only applies when the origin server sends the
@@ -101,7 +109,7 @@ def edit(
         be indicated with BYPASS cache status in the response headers.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           value: Value of the zone setting.
 
@@ -123,9 +131,9 @@ def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[VariantEditResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[VariantEditResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[VariantEditResponse], ResultWrapper[VariantEditResponse]),
+            cast_to=cast(Type[Optional[VariantEditResponse]], ResultWrapper[VariantEditResponse]),
         )
 
     def get(
@@ -137,8 +145,8 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> VariantGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[VariantGetResponse]:
         """
         Variant support enables caching variants of images with certain file extensions
         in addition to the original. This only applies when the origin server sends the
@@ -147,7 +155,7 @@ def get(
         be indicated with BYPASS cache status in the response headers.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -166,19 +174,30 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[VariantGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[VariantGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[VariantGetResponse], ResultWrapper[VariantGetResponse]),
+            cast_to=cast(Type[Optional[VariantGetResponse]], ResultWrapper[VariantGetResponse]),
         )
 
 
 class AsyncVariantsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncVariantsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncVariantsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncVariantsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncVariantsResourceWithStreamingResponse(self)
 
     async def delete(
@@ -190,8 +209,8 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> CacheVariant:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[VariantDeleteResponse]:
         """
         Variant support enables caching variants of images with certain file extensions
         in addition to the original. This only applies when the origin server sends the
@@ -200,7 +219,7 @@ async def delete(
         be indicated with BYPASS cache status in the response headers.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -219,9 +238,9 @@ async def delete(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[CacheVariant]._unwrapper,
+                post_parser=ResultWrapper[Optional[VariantDeleteResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[CacheVariant], ResultWrapper[CacheVariant]),
+            cast_to=cast(Type[Optional[VariantDeleteResponse]], ResultWrapper[VariantDeleteResponse]),
         )
 
     async def edit(
@@ -234,8 +253,8 @@ async def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> VariantEditResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[VariantEditResponse]:
         """
         Variant support enables caching variants of images with certain file extensions
         in addition to the original. This only applies when the origin server sends the
@@ -244,7 +263,7 @@ async def edit(
         be indicated with BYPASS cache status in the response headers.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           value: Value of the zone setting.
 
@@ -266,9 +285,9 @@ async def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[VariantEditResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[VariantEditResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[VariantEditResponse], ResultWrapper[VariantEditResponse]),
+            cast_to=cast(Type[Optional[VariantEditResponse]], ResultWrapper[VariantEditResponse]),
         )
 
     async def get(
@@ -280,8 +299,8 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> VariantGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[VariantGetResponse]:
         """
         Variant support enables caching variants of images with certain file extensions
         in addition to the original. This only applies when the origin server sends the
@@ -290,7 +309,7 @@ async def get(
         be indicated with BYPASS cache status in the response headers.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -309,9 +328,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[VariantGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[VariantGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[VariantGetResponse], ResultWrapper[VariantGetResponse]),
+            cast_to=cast(Type[Optional[VariantGetResponse]], ResultWrapper[VariantGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/calls/__init__.py b/src/cloudflare/resources/calls/__init__.py
index 2d00a1bdd9e..6d2da87a3fe 100644
--- a/src/cloudflare/resources/calls/__init__.py
+++ b/src/cloudflare/resources/calls/__init__.py
@@ -1,5 +1,13 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from .sfu import (
+    SFUResource,
+    AsyncSFUResource,
+    SFUResourceWithRawResponse,
+    AsyncSFUResourceWithRawResponse,
+    SFUResourceWithStreamingResponse,
+    AsyncSFUResourceWithStreamingResponse,
+)
 from .turn import (
     TURNResource,
     AsyncTURNResource,
@@ -18,6 +26,12 @@
 )
 
 __all__ = [
+    "SFUResource",
+    "AsyncSFUResource",
+    "SFUResourceWithRawResponse",
+    "AsyncSFUResourceWithRawResponse",
+    "SFUResourceWithStreamingResponse",
+    "AsyncSFUResourceWithStreamingResponse",
     "TURNResource",
     "AsyncTURNResource",
     "TURNResourceWithRawResponse",
diff --git a/src/cloudflare/resources/calls/calls.py b/src/cloudflare/resources/calls/calls.py
index 2e6a89aaf41..426caba933c 100644
--- a/src/cloudflare/resources/calls/calls.py
+++ b/src/cloudflare/resources/calls/calls.py
@@ -2,10 +2,14 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
-
-import httpx
-
+from .sfu import (
+    SFUResource,
+    AsyncSFUResource,
+    SFUResourceWithRawResponse,
+    AsyncSFUResourceWithRawResponse,
+    SFUResourceWithStreamingResponse,
+    AsyncSFUResourceWithStreamingResponse,
+)
 from .turn import (
     TURNResource,
     AsyncTURNResource,
@@ -14,512 +18,77 @@
     TURNResourceWithStreamingResponse,
     AsyncTURNResourceWithStreamingResponse,
 )
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
 from ..._compat import cached_property
-from .turn.turn import TURNResource, AsyncTURNResource
 from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ..._wrappers import ResultWrapper
-from ...pagination import SyncSinglePage, AsyncSinglePage
-from ...types.calls import call_create_params, call_update_params
-from ..._base_client import AsyncPaginator, make_request_options
-from ...types.calls.calls_app import CallsApp
-from ...types.calls.call_list_response import CallListResponse
-from ...types.calls.calls_app_with_secret import CallsAppWithSecret
 
 __all__ = ["CallsResource", "AsyncCallsResource"]
 
 
 class CallsResource(SyncAPIResource):
+    @cached_property
+    def sfu(self) -> SFUResource:
+        return SFUResource(self._client)
+
     @cached_property
     def turn(self) -> TURNResource:
         return TURNResource(self._client)
 
     @cached_property
     def with_raw_response(self) -> CallsResourceWithRawResponse:
-        return CallsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> CallsResourceWithStreamingResponse:
-        return CallsResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        *,
-        account_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CallsAppWithSecret]:
-        """Creates a new Cloudflare calls app.
-
-        An app is an unique enviroment where each
-        Session can access all Tracks within the app.
-
-        Args:
-          account_id: The account identifier tag.
-
-          name: A short description of Calls app, not shown to end users.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._post(
-            f"/accounts/{account_id}/calls/apps",
-            body=maybe_transform({"name": name}, call_create_params.CallCreateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CallsAppWithSecret]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CallsAppWithSecret]], ResultWrapper[CallsAppWithSecret]),
-        )
-
-    def update(
-        self,
-        app_id: str,
-        *,
-        account_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CallsApp]:
-        """
-        Edit details for a single app.
-
-        Args:
-          account_id: The account identifier tag.
-
-          app_id: A Cloudflare-generated unique identifier for a item.
-
-          name: A short description of Calls app, not shown to end users.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not app_id:
-            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
-        return self._put(
-            f"/accounts/{account_id}/calls/apps/{app_id}",
-            body=maybe_transform({"name": name}, call_update_params.CallUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CallsApp]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CallsApp]], ResultWrapper[CallsApp]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[CallListResponse]:
-        """
-        Lists all apps in the Cloudflare account
-
-        Args:
-          account_id: The account identifier tag.
-
-          extra_headers: Send extra headers
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
 
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/calls/apps",
-            page=SyncSinglePage[CallListResponse],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=str,
-        )
-
-    def delete(
-        self,
-        app_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CallsApp]:
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
         """
-        Deletes an app from Cloudflare Calls
-
-        Args:
-          account_id: The account identifier tag.
-
-          app_id: A Cloudflare-generated unique identifier for a item.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
+        return CallsResourceWithRawResponse(self)
 
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not app_id:
-            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
-        return self._delete(
-            f"/accounts/{account_id}/calls/apps/{app_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CallsApp]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CallsApp]], ResultWrapper[CallsApp]),
-        )
-
-    def get(
-        self,
-        app_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CallsApp]:
+    @cached_property
+    def with_streaming_response(self) -> CallsResourceWithStreamingResponse:
         """
-        Fetches details for a single Calls app.
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-        Args:
-          account_id: The account identifier tag.
-
-          app_id: A Cloudflare-generated unique identifier for a item.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
         """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not app_id:
-            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/calls/apps/{app_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CallsApp]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CallsApp]], ResultWrapper[CallsApp]),
-        )
+        return CallsResourceWithStreamingResponse(self)
 
 
 class AsyncCallsResource(AsyncAPIResource):
+    @cached_property
+    def sfu(self) -> AsyncSFUResource:
+        return AsyncSFUResource(self._client)
+
     @cached_property
     def turn(self) -> AsyncTURNResource:
         return AsyncTURNResource(self._client)
 
     @cached_property
     def with_raw_response(self) -> AsyncCallsResourceWithRawResponse:
-        return AsyncCallsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncCallsResourceWithStreamingResponse:
-        return AsyncCallsResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        *,
-        account_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CallsAppWithSecret]:
-        """Creates a new Cloudflare calls app.
-
-        An app is an unique enviroment where each
-        Session can access all Tracks within the app.
-
-        Args:
-          account_id: The account identifier tag.
-
-          name: A short description of Calls app, not shown to end users.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._post(
-            f"/accounts/{account_id}/calls/apps",
-            body=await async_maybe_transform({"name": name}, call_create_params.CallCreateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CallsAppWithSecret]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CallsAppWithSecret]], ResultWrapper[CallsAppWithSecret]),
-        )
-
-    async def update(
-        self,
-        app_id: str,
-        *,
-        account_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CallsApp]:
         """
-        Edit details for a single app.
-
-        Args:
-          account_id: The account identifier tag.
-
-          app_id: A Cloudflare-generated unique identifier for a item.
-
-          name: A short description of Calls app, not shown to end users.
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
 
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
         """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not app_id:
-            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
-        return await self._put(
-            f"/accounts/{account_id}/calls/apps/{app_id}",
-            body=await async_maybe_transform({"name": name}, call_update_params.CallUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CallsApp]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CallsApp]], ResultWrapper[CallsApp]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[CallListResponse, AsyncSinglePage[CallListResponse]]:
-        """
-        Lists all apps in the Cloudflare account
-
-        Args:
-          account_id: The account identifier tag.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/calls/apps",
-            page=AsyncSinglePage[CallListResponse],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=str,
-        )
-
-    async def delete(
-        self,
-        app_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CallsApp]:
-        """
-        Deletes an app from Cloudflare Calls
-
-        Args:
-          account_id: The account identifier tag.
-
-          app_id: A Cloudflare-generated unique identifier for a item.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
+        return AsyncCallsResourceWithRawResponse(self)
 
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not app_id:
-            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
-        return await self._delete(
-            f"/accounts/{account_id}/calls/apps/{app_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CallsApp]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CallsApp]], ResultWrapper[CallsApp]),
-        )
-
-    async def get(
-        self,
-        app_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CallsApp]:
+    @cached_property
+    def with_streaming_response(self) -> AsyncCallsResourceWithStreamingResponse:
         """
-        Fetches details for a single Calls app.
-
-        Args:
-          account_id: The account identifier tag.
-
-          app_id: A Cloudflare-generated unique identifier for a item.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
         """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not app_id:
-            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/calls/apps/{app_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CallsApp]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CallsApp]], ResultWrapper[CallsApp]),
-        )
+        return AsyncCallsResourceWithStreamingResponse(self)
 
 
 class CallsResourceWithRawResponse:
     def __init__(self, calls: CallsResource) -> None:
         self._calls = calls
 
-        self.create = to_raw_response_wrapper(
-            calls.create,
-        )
-        self.update = to_raw_response_wrapper(
-            calls.update,
-        )
-        self.list = to_raw_response_wrapper(
-            calls.list,
-        )
-        self.delete = to_raw_response_wrapper(
-            calls.delete,
-        )
-        self.get = to_raw_response_wrapper(
-            calls.get,
-        )
+    @cached_property
+    def sfu(self) -> SFUResourceWithRawResponse:
+        return SFUResourceWithRawResponse(self._calls.sfu)
 
     @cached_property
     def turn(self) -> TURNResourceWithRawResponse:
@@ -530,21 +99,9 @@ class AsyncCallsResourceWithRawResponse:
     def __init__(self, calls: AsyncCallsResource) -> None:
         self._calls = calls
 
-        self.create = async_to_raw_response_wrapper(
-            calls.create,
-        )
-        self.update = async_to_raw_response_wrapper(
-            calls.update,
-        )
-        self.list = async_to_raw_response_wrapper(
-            calls.list,
-        )
-        self.delete = async_to_raw_response_wrapper(
-            calls.delete,
-        )
-        self.get = async_to_raw_response_wrapper(
-            calls.get,
-        )
+    @cached_property
+    def sfu(self) -> AsyncSFUResourceWithRawResponse:
+        return AsyncSFUResourceWithRawResponse(self._calls.sfu)
 
     @cached_property
     def turn(self) -> AsyncTURNResourceWithRawResponse:
@@ -555,21 +112,9 @@ class CallsResourceWithStreamingResponse:
     def __init__(self, calls: CallsResource) -> None:
         self._calls = calls
 
-        self.create = to_streamed_response_wrapper(
-            calls.create,
-        )
-        self.update = to_streamed_response_wrapper(
-            calls.update,
-        )
-        self.list = to_streamed_response_wrapper(
-            calls.list,
-        )
-        self.delete = to_streamed_response_wrapper(
-            calls.delete,
-        )
-        self.get = to_streamed_response_wrapper(
-            calls.get,
-        )
+    @cached_property
+    def sfu(self) -> SFUResourceWithStreamingResponse:
+        return SFUResourceWithStreamingResponse(self._calls.sfu)
 
     @cached_property
     def turn(self) -> TURNResourceWithStreamingResponse:
@@ -580,21 +125,9 @@ class AsyncCallsResourceWithStreamingResponse:
     def __init__(self, calls: AsyncCallsResource) -> None:
         self._calls = calls
 
-        self.create = async_to_streamed_response_wrapper(
-            calls.create,
-        )
-        self.update = async_to_streamed_response_wrapper(
-            calls.update,
-        )
-        self.list = async_to_streamed_response_wrapper(
-            calls.list,
-        )
-        self.delete = async_to_streamed_response_wrapper(
-            calls.delete,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            calls.get,
-        )
+    @cached_property
+    def sfu(self) -> AsyncSFUResourceWithStreamingResponse:
+        return AsyncSFUResourceWithStreamingResponse(self._calls.sfu)
 
     @cached_property
     def turn(self) -> AsyncTURNResourceWithStreamingResponse:
diff --git a/src/cloudflare/resources/calls/sfu.py b/src/cloudflare/resources/calls/sfu.py
new file mode 100644
index 00000000000..822b9a37002
--- /dev/null
+++ b/src/cloudflare/resources/calls/sfu.py
@@ -0,0 +1,589 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ...types.calls import sfu_create_params, sfu_update_params
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.calls.sfu_get_response import SFUGetResponse
+from ...types.calls.sfu_list_response import SFUListResponse
+from ...types.calls.sfu_create_response import SFUCreateResponse
+from ...types.calls.sfu_delete_response import SFUDeleteResponse
+from ...types.calls.sfu_update_response import SFUUpdateResponse
+
+__all__ = ["SFUResource", "AsyncSFUResource"]
+
+
+class SFUResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SFUResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SFUResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SFUResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SFUResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SFUCreateResponse]:
+        """Creates a new Cloudflare calls app.
+
+        An app is an unique enviroment where each
+        Session can access all Tracks within the app.
+
+        Args:
+          account_id: The account identifier tag.
+
+          name: A short description of Calls app, not shown to end users.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/calls/apps",
+            body=maybe_transform({"name": name}, sfu_create_params.SFUCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SFUCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SFUCreateResponse]], ResultWrapper[SFUCreateResponse]),
+        )
+
+    def update(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SFUUpdateResponse]:
+        """
+        Edit details for a single app.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: A Cloudflare-generated unique identifier for a item.
+
+          name: A short description of Calls app, not shown to end users.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/calls/apps/{app_id}",
+            body=maybe_transform({"name": name}, sfu_update_params.SFUUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SFUUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SFUUpdateResponse]], ResultWrapper[SFUUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[SFUListResponse]:
+        """
+        Lists all apps in the Cloudflare account
+
+        Args:
+          account_id: The account identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/calls/apps",
+            page=SyncSinglePage[SFUListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=SFUListResponse,
+        )
+
+    def delete(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SFUDeleteResponse]:
+        """
+        Deletes an app from Cloudflare Calls
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: A Cloudflare-generated unique identifier for a item.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/calls/apps/{app_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SFUDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SFUDeleteResponse]], ResultWrapper[SFUDeleteResponse]),
+        )
+
+    def get(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SFUGetResponse]:
+        """
+        Fetches details for a single Calls app.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: A Cloudflare-generated unique identifier for a item.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/calls/apps/{app_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SFUGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SFUGetResponse]], ResultWrapper[SFUGetResponse]),
+        )
+
+
+class AsyncSFUResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSFUResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSFUResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSFUResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSFUResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SFUCreateResponse]:
+        """Creates a new Cloudflare calls app.
+
+        An app is an unique enviroment where each
+        Session can access all Tracks within the app.
+
+        Args:
+          account_id: The account identifier tag.
+
+          name: A short description of Calls app, not shown to end users.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/calls/apps",
+            body=await async_maybe_transform({"name": name}, sfu_create_params.SFUCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SFUCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SFUCreateResponse]], ResultWrapper[SFUCreateResponse]),
+        )
+
+    async def update(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SFUUpdateResponse]:
+        """
+        Edit details for a single app.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: A Cloudflare-generated unique identifier for a item.
+
+          name: A short description of Calls app, not shown to end users.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/calls/apps/{app_id}",
+            body=await async_maybe_transform({"name": name}, sfu_update_params.SFUUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SFUUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SFUUpdateResponse]], ResultWrapper[SFUUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SFUListResponse, AsyncSinglePage[SFUListResponse]]:
+        """
+        Lists all apps in the Cloudflare account
+
+        Args:
+          account_id: The account identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/calls/apps",
+            page=AsyncSinglePage[SFUListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=SFUListResponse,
+        )
+
+    async def delete(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SFUDeleteResponse]:
+        """
+        Deletes an app from Cloudflare Calls
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: A Cloudflare-generated unique identifier for a item.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/calls/apps/{app_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SFUDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SFUDeleteResponse]], ResultWrapper[SFUDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SFUGetResponse]:
+        """
+        Fetches details for a single Calls app.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: A Cloudflare-generated unique identifier for a item.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/calls/apps/{app_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SFUGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SFUGetResponse]], ResultWrapper[SFUGetResponse]),
+        )
+
+
+class SFUResourceWithRawResponse:
+    def __init__(self, sfu: SFUResource) -> None:
+        self._sfu = sfu
+
+        self.create = to_raw_response_wrapper(
+            sfu.create,
+        )
+        self.update = to_raw_response_wrapper(
+            sfu.update,
+        )
+        self.list = to_raw_response_wrapper(
+            sfu.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            sfu.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            sfu.get,
+        )
+
+
+class AsyncSFUResourceWithRawResponse:
+    def __init__(self, sfu: AsyncSFUResource) -> None:
+        self._sfu = sfu
+
+        self.create = async_to_raw_response_wrapper(
+            sfu.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            sfu.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            sfu.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            sfu.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            sfu.get,
+        )
+
+
+class SFUResourceWithStreamingResponse:
+    def __init__(self, sfu: SFUResource) -> None:
+        self._sfu = sfu
+
+        self.create = to_streamed_response_wrapper(
+            sfu.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            sfu.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            sfu.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            sfu.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            sfu.get,
+        )
+
+
+class AsyncSFUResourceWithStreamingResponse:
+    def __init__(self, sfu: AsyncSFUResource) -> None:
+        self._sfu = sfu
+
+        self.create = async_to_streamed_response_wrapper(
+            sfu.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            sfu.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            sfu.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            sfu.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            sfu.get,
+        )
diff --git a/src/cloudflare/resources/calls/turn.py b/src/cloudflare/resources/calls/turn.py
new file mode 100644
index 00000000000..fd7479532c0
--- /dev/null
+++ b/src/cloudflare/resources/calls/turn.py
@@ -0,0 +1,585 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ...types.calls import turn_create_params, turn_update_params
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.calls.turn_get_response import TURNGetResponse
+from ...types.calls.turn_list_response import TURNListResponse
+from ...types.calls.turn_create_response import TURNCreateResponse
+from ...types.calls.turn_delete_response import TURNDeleteResponse
+from ...types.calls.turn_update_response import TURNUpdateResponse
+
+__all__ = ["TURNResource", "AsyncTURNResource"]
+
+
+class TURNResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> TURNResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TURNResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TURNResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TURNResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TURNCreateResponse]:
+        """
+        Creates a new Cloudflare Calls TURN key.
+
+        Args:
+          account_id: The account identifier tag.
+
+          name: A short description of a TURN key, not shown to end users.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/calls/turn_keys",
+            body=maybe_transform({"name": name}, turn_create_params.TURNCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TURNCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TURNCreateResponse]], ResultWrapper[TURNCreateResponse]),
+        )
+
+    def update(
+        self,
+        key_id: str,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TURNUpdateResponse]:
+        """
+        Edit details for a single TURN key.
+
+        Args:
+          account_id: The account identifier tag.
+
+          key_id: A Cloudflare-generated unique identifier for a item.
+
+          name: A short description of a TURN key, not shown to end users.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not key_id:
+            raise ValueError(f"Expected a non-empty value for `key_id` but received {key_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/calls/turn_keys/{key_id}",
+            body=maybe_transform({"name": name}, turn_update_params.TURNUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TURNUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TURNUpdateResponse]], ResultWrapper[TURNUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[TURNListResponse]:
+        """
+        Lists all TURN keys in the Cloudflare account
+
+        Args:
+          account_id: The account identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/calls/turn_keys",
+            page=SyncSinglePage[TURNListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=TURNListResponse,
+        )
+
+    def delete(
+        self,
+        key_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TURNDeleteResponse]:
+        """
+        Deletes a TURN key from Cloudflare Calls
+
+        Args:
+          account_id: The account identifier tag.
+
+          key_id: A Cloudflare-generated unique identifier for a item.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not key_id:
+            raise ValueError(f"Expected a non-empty value for `key_id` but received {key_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/calls/turn_keys/{key_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TURNDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TURNDeleteResponse]], ResultWrapper[TURNDeleteResponse]),
+        )
+
+    def get(
+        self,
+        key_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TURNGetResponse]:
+        """
+        Fetches details for a single TURN key.
+
+        Args:
+          account_id: The account identifier tag.
+
+          key_id: A Cloudflare-generated unique identifier for a item.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not key_id:
+            raise ValueError(f"Expected a non-empty value for `key_id` but received {key_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/calls/turn_keys/{key_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TURNGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TURNGetResponse]], ResultWrapper[TURNGetResponse]),
+        )
+
+
+class AsyncTURNResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncTURNResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTURNResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTURNResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTURNResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TURNCreateResponse]:
+        """
+        Creates a new Cloudflare Calls TURN key.
+
+        Args:
+          account_id: The account identifier tag.
+
+          name: A short description of a TURN key, not shown to end users.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/calls/turn_keys",
+            body=await async_maybe_transform({"name": name}, turn_create_params.TURNCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TURNCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TURNCreateResponse]], ResultWrapper[TURNCreateResponse]),
+        )
+
+    async def update(
+        self,
+        key_id: str,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TURNUpdateResponse]:
+        """
+        Edit details for a single TURN key.
+
+        Args:
+          account_id: The account identifier tag.
+
+          key_id: A Cloudflare-generated unique identifier for a item.
+
+          name: A short description of a TURN key, not shown to end users.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not key_id:
+            raise ValueError(f"Expected a non-empty value for `key_id` but received {key_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/calls/turn_keys/{key_id}",
+            body=await async_maybe_transform({"name": name}, turn_update_params.TURNUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TURNUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TURNUpdateResponse]], ResultWrapper[TURNUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[TURNListResponse, AsyncSinglePage[TURNListResponse]]:
+        """
+        Lists all TURN keys in the Cloudflare account
+
+        Args:
+          account_id: The account identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/calls/turn_keys",
+            page=AsyncSinglePage[TURNListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=TURNListResponse,
+        )
+
+    async def delete(
+        self,
+        key_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TURNDeleteResponse]:
+        """
+        Deletes a TURN key from Cloudflare Calls
+
+        Args:
+          account_id: The account identifier tag.
+
+          key_id: A Cloudflare-generated unique identifier for a item.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not key_id:
+            raise ValueError(f"Expected a non-empty value for `key_id` but received {key_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/calls/turn_keys/{key_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TURNDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TURNDeleteResponse]], ResultWrapper[TURNDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        key_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TURNGetResponse]:
+        """
+        Fetches details for a single TURN key.
+
+        Args:
+          account_id: The account identifier tag.
+
+          key_id: A Cloudflare-generated unique identifier for a item.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not key_id:
+            raise ValueError(f"Expected a non-empty value for `key_id` but received {key_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/calls/turn_keys/{key_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TURNGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TURNGetResponse]], ResultWrapper[TURNGetResponse]),
+        )
+
+
+class TURNResourceWithRawResponse:
+    def __init__(self, turn: TURNResource) -> None:
+        self._turn = turn
+
+        self.create = to_raw_response_wrapper(
+            turn.create,
+        )
+        self.update = to_raw_response_wrapper(
+            turn.update,
+        )
+        self.list = to_raw_response_wrapper(
+            turn.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            turn.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            turn.get,
+        )
+
+
+class AsyncTURNResourceWithRawResponse:
+    def __init__(self, turn: AsyncTURNResource) -> None:
+        self._turn = turn
+
+        self.create = async_to_raw_response_wrapper(
+            turn.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            turn.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            turn.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            turn.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            turn.get,
+        )
+
+
+class TURNResourceWithStreamingResponse:
+    def __init__(self, turn: TURNResource) -> None:
+        self._turn = turn
+
+        self.create = to_streamed_response_wrapper(
+            turn.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            turn.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            turn.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            turn.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            turn.get,
+        )
+
+
+class AsyncTURNResourceWithStreamingResponse:
+    def __init__(self, turn: AsyncTURNResource) -> None:
+        self._turn = turn
+
+        self.create = async_to_streamed_response_wrapper(
+            turn.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            turn.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            turn.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            turn.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            turn.get,
+        )
diff --git a/src/cloudflare/resources/calls/turn/__init__.py b/src/cloudflare/resources/calls/turn/__init__.py
deleted file mode 100644
index 4ad11d459cd..00000000000
--- a/src/cloudflare/resources/calls/turn/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from .keys import (
-    KeysResource,
-    AsyncKeysResource,
-    KeysResourceWithRawResponse,
-    AsyncKeysResourceWithRawResponse,
-    KeysResourceWithStreamingResponse,
-    AsyncKeysResourceWithStreamingResponse,
-)
-from .turn import (
-    TURNResource,
-    AsyncTURNResource,
-    TURNResourceWithRawResponse,
-    AsyncTURNResourceWithRawResponse,
-    TURNResourceWithStreamingResponse,
-    AsyncTURNResourceWithStreamingResponse,
-)
-
-__all__ = [
-    "KeysResource",
-    "AsyncKeysResource",
-    "KeysResourceWithRawResponse",
-    "AsyncKeysResourceWithRawResponse",
-    "KeysResourceWithStreamingResponse",
-    "AsyncKeysResourceWithStreamingResponse",
-    "TURNResource",
-    "AsyncTURNResource",
-    "TURNResourceWithRawResponse",
-    "AsyncTURNResourceWithRawResponse",
-    "TURNResourceWithStreamingResponse",
-    "AsyncTURNResourceWithStreamingResponse",
-]
diff --git a/src/cloudflare/resources/calls/turn/keys.py b/src/cloudflare/resources/calls/turn/keys.py
deleted file mode 100644
index bd7dd6712bd..00000000000
--- a/src/cloudflare/resources/calls/turn/keys.py
+++ /dev/null
@@ -1,558 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Optional, cast
-
-import httpx
-
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ...._wrappers import ResultWrapper
-from ....pagination import SyncSinglePage, AsyncSinglePage
-from ...._base_client import AsyncPaginator, make_request_options
-from ....types.calls.turn import key_create_params, key_update_params
-from ....types.calls.turn.key_get_response import KeyGetResponse
-from ....types.calls.turn.key_list_response import KeyListResponse
-from ....types.calls.turn.key_create_response import KeyCreateResponse
-from ....types.calls.turn.key_delete_response import KeyDeleteResponse
-from ....types.calls.turn.key_update_response import KeyUpdateResponse
-
-__all__ = ["KeysResource", "AsyncKeysResource"]
-
-
-class KeysResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> KeysResourceWithRawResponse:
-        return KeysResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> KeysResourceWithStreamingResponse:
-        return KeysResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        *,
-        account_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> KeyCreateResponse:
-        """
-        Creates a new Cloudflare Calls TURN key.
-
-        Args:
-          account_id: The account identifier tag.
-
-          name: A short description of a TURN key, not shown to end users.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._post(
-            f"/accounts/{account_id}/calls/turn_keys",
-            body=maybe_transform({"name": name}, key_create_params.KeyCreateParams),
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=KeyCreateResponse,
-        )
-
-    def update(
-        self,
-        key_id: str,
-        *,
-        account_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> str:
-        """
-        Edit details for a single TURN key.
-
-        Args:
-          account_id: The account identifier tag.
-
-          key_id: A Cloudflare-generated unique identifier for a item.
-
-          name: A short description of a TURN key, not shown to end users.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not key_id:
-            raise ValueError(f"Expected a non-empty value for `key_id` but received {key_id!r}")
-        return self._put(
-            f"/accounts/{account_id}/calls/turn_keys/{key_id}",
-            body=maybe_transform({"name": name}, key_update_params.KeyUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[KeyUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[str], ResultWrapper[str]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[KeyListResponse]:
-        """
-        Lists all TURN keys in the Cloudflare account
-
-        Args:
-          account_id: The account identifier tag.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/calls/turn_keys",
-            page=SyncSinglePage[KeyListResponse],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=str,
-        )
-
-    def delete(
-        self,
-        key_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> str:
-        """
-        Deletes a TURN key from Cloudflare Calls
-
-        Args:
-          account_id: The account identifier tag.
-
-          key_id: A Cloudflare-generated unique identifier for a item.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not key_id:
-            raise ValueError(f"Expected a non-empty value for `key_id` but received {key_id!r}")
-        return self._delete(
-            f"/accounts/{account_id}/calls/turn_keys/{key_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[KeyDeleteResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[str], ResultWrapper[str]),
-        )
-
-    def get(
-        self,
-        key_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> str:
-        """
-        Fetches details for a single TURN key.
-
-        Args:
-          account_id: The account identifier tag.
-
-          key_id: A Cloudflare-generated unique identifier for a item.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not key_id:
-            raise ValueError(f"Expected a non-empty value for `key_id` but received {key_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/calls/turn_keys/{key_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[KeyGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[str], ResultWrapper[str]),
-        )
-
-
-class AsyncKeysResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncKeysResourceWithRawResponse:
-        return AsyncKeysResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncKeysResourceWithStreamingResponse:
-        return AsyncKeysResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        *,
-        account_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> KeyCreateResponse:
-        """
-        Creates a new Cloudflare Calls TURN key.
-
-        Args:
-          account_id: The account identifier tag.
-
-          name: A short description of a TURN key, not shown to end users.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._post(
-            f"/accounts/{account_id}/calls/turn_keys",
-            body=await async_maybe_transform({"name": name}, key_create_params.KeyCreateParams),
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=KeyCreateResponse,
-        )
-
-    async def update(
-        self,
-        key_id: str,
-        *,
-        account_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> str:
-        """
-        Edit details for a single TURN key.
-
-        Args:
-          account_id: The account identifier tag.
-
-          key_id: A Cloudflare-generated unique identifier for a item.
-
-          name: A short description of a TURN key, not shown to end users.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not key_id:
-            raise ValueError(f"Expected a non-empty value for `key_id` but received {key_id!r}")
-        return await self._put(
-            f"/accounts/{account_id}/calls/turn_keys/{key_id}",
-            body=await async_maybe_transform({"name": name}, key_update_params.KeyUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[KeyUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[str], ResultWrapper[str]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[KeyListResponse, AsyncSinglePage[KeyListResponse]]:
-        """
-        Lists all TURN keys in the Cloudflare account
-
-        Args:
-          account_id: The account identifier tag.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/calls/turn_keys",
-            page=AsyncSinglePage[KeyListResponse],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=str,
-        )
-
-    async def delete(
-        self,
-        key_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> str:
-        """
-        Deletes a TURN key from Cloudflare Calls
-
-        Args:
-          account_id: The account identifier tag.
-
-          key_id: A Cloudflare-generated unique identifier for a item.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not key_id:
-            raise ValueError(f"Expected a non-empty value for `key_id` but received {key_id!r}")
-        return await self._delete(
-            f"/accounts/{account_id}/calls/turn_keys/{key_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[KeyDeleteResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[str], ResultWrapper[str]),
-        )
-
-    async def get(
-        self,
-        key_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> str:
-        """
-        Fetches details for a single TURN key.
-
-        Args:
-          account_id: The account identifier tag.
-
-          key_id: A Cloudflare-generated unique identifier for a item.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not key_id:
-            raise ValueError(f"Expected a non-empty value for `key_id` but received {key_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/calls/turn_keys/{key_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[KeyGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[str], ResultWrapper[str]),
-        )
-
-
-class KeysResourceWithRawResponse:
-    def __init__(self, keys: KeysResource) -> None:
-        self._keys = keys
-
-        self.create = to_raw_response_wrapper(
-            keys.create,
-        )
-        self.update = to_raw_response_wrapper(
-            keys.update,
-        )
-        self.list = to_raw_response_wrapper(
-            keys.list,
-        )
-        self.delete = to_raw_response_wrapper(
-            keys.delete,
-        )
-        self.get = to_raw_response_wrapper(
-            keys.get,
-        )
-
-
-class AsyncKeysResourceWithRawResponse:
-    def __init__(self, keys: AsyncKeysResource) -> None:
-        self._keys = keys
-
-        self.create = async_to_raw_response_wrapper(
-            keys.create,
-        )
-        self.update = async_to_raw_response_wrapper(
-            keys.update,
-        )
-        self.list = async_to_raw_response_wrapper(
-            keys.list,
-        )
-        self.delete = async_to_raw_response_wrapper(
-            keys.delete,
-        )
-        self.get = async_to_raw_response_wrapper(
-            keys.get,
-        )
-
-
-class KeysResourceWithStreamingResponse:
-    def __init__(self, keys: KeysResource) -> None:
-        self._keys = keys
-
-        self.create = to_streamed_response_wrapper(
-            keys.create,
-        )
-        self.update = to_streamed_response_wrapper(
-            keys.update,
-        )
-        self.list = to_streamed_response_wrapper(
-            keys.list,
-        )
-        self.delete = to_streamed_response_wrapper(
-            keys.delete,
-        )
-        self.get = to_streamed_response_wrapper(
-            keys.get,
-        )
-
-
-class AsyncKeysResourceWithStreamingResponse:
-    def __init__(self, keys: AsyncKeysResource) -> None:
-        self._keys = keys
-
-        self.create = async_to_streamed_response_wrapper(
-            keys.create,
-        )
-        self.update = async_to_streamed_response_wrapper(
-            keys.update,
-        )
-        self.list = async_to_streamed_response_wrapper(
-            keys.list,
-        )
-        self.delete = async_to_streamed_response_wrapper(
-            keys.delete,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            keys.get,
-        )
diff --git a/src/cloudflare/resources/calls/turn/turn.py b/src/cloudflare/resources/calls/turn/turn.py
deleted file mode 100644
index 830fa7f663b..00000000000
--- a/src/cloudflare/resources/calls/turn/turn.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from .keys import (
-    KeysResource,
-    AsyncKeysResource,
-    KeysResourceWithRawResponse,
-    AsyncKeysResourceWithRawResponse,
-    KeysResourceWithStreamingResponse,
-    AsyncKeysResourceWithStreamingResponse,
-)
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-
-__all__ = ["TURNResource", "AsyncTURNResource"]
-
-
-class TURNResource(SyncAPIResource):
-    @cached_property
-    def keys(self) -> KeysResource:
-        return KeysResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> TURNResourceWithRawResponse:
-        return TURNResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> TURNResourceWithStreamingResponse:
-        return TURNResourceWithStreamingResponse(self)
-
-
-class AsyncTURNResource(AsyncAPIResource):
-    @cached_property
-    def keys(self) -> AsyncKeysResource:
-        return AsyncKeysResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncTURNResourceWithRawResponse:
-        return AsyncTURNResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncTURNResourceWithStreamingResponse:
-        return AsyncTURNResourceWithStreamingResponse(self)
-
-
-class TURNResourceWithRawResponse:
-    def __init__(self, turn: TURNResource) -> None:
-        self._turn = turn
-
-    @cached_property
-    def keys(self) -> KeysResourceWithRawResponse:
-        return KeysResourceWithRawResponse(self._turn.keys)
-
-
-class AsyncTURNResourceWithRawResponse:
-    def __init__(self, turn: AsyncTURNResource) -> None:
-        self._turn = turn
-
-    @cached_property
-    def keys(self) -> AsyncKeysResourceWithRawResponse:
-        return AsyncKeysResourceWithRawResponse(self._turn.keys)
-
-
-class TURNResourceWithStreamingResponse:
-    def __init__(self, turn: TURNResource) -> None:
-        self._turn = turn
-
-    @cached_property
-    def keys(self) -> KeysResourceWithStreamingResponse:
-        return KeysResourceWithStreamingResponse(self._turn.keys)
-
-
-class AsyncTURNResourceWithStreamingResponse:
-    def __init__(self, turn: AsyncTURNResource) -> None:
-        self._turn = turn
-
-    @cached_property
-    def keys(self) -> AsyncKeysResourceWithStreamingResponse:
-        return AsyncKeysResourceWithStreamingResponse(self._turn.keys)
diff --git a/src/cloudflare/resources/certificate_authorities/certificate_authorities.py b/src/cloudflare/resources/certificate_authorities/certificate_authorities.py
index f5ff3cbf4eb..99e853d8f13 100644
--- a/src/cloudflare/resources/certificate_authorities/certificate_authorities.py
+++ b/src/cloudflare/resources/certificate_authorities/certificate_authorities.py
@@ -23,10 +23,21 @@ def hostname_associations(self) -> HostnameAssociationsResource:
 
     @cached_property
     def with_raw_response(self) -> CertificateAuthoritiesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CertificateAuthoritiesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CertificateAuthoritiesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CertificateAuthoritiesResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def hostname_associations(self) -> AsyncHostnameAssociationsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncCertificateAuthoritiesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCertificateAuthoritiesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCertificateAuthoritiesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCertificateAuthoritiesResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/certificate_authorities/hostname_associations.py b/src/cloudflare/resources/certificate_authorities/hostname_associations.py
index 486b397704e..6c525f63bca 100644
--- a/src/cloudflare/resources/certificate_authorities/hostname_associations.py
+++ b/src/cloudflare/resources/certificate_authorities/hostname_associations.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -32,30 +29,41 @@
 class HostnameAssociationsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> HostnameAssociationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return HostnameAssociationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> HostnameAssociationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return HostnameAssociationsResourceWithStreamingResponse(self)
 
     def update(
         self,
         *,
         zone_id: str,
-        hostnames: List[HostnameAssociation] | NotGiven = NOT_GIVEN,
-        mtls_certificate_id: str | NotGiven = NOT_GIVEN,
+        hostnames: SequenceNotStr[HostnameAssociation] | Omit = omit,
+        mtls_certificate_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[HostnameAssociationUpdateResponse]:
         """
         Replace Hostname Associations
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           mtls_certificate_id: The UUID for a certificate that was uploaded to the mTLS Certificate Management
               endpoint. If no mtls_certificate_id is given, the hostnames will be associated
@@ -96,19 +104,19 @@ def get(
         self,
         *,
         zone_id: str,
-        mtls_certificate_id: str | NotGiven = NOT_GIVEN,
+        mtls_certificate_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[HostnameAssociationGetResponse]:
         """
         List Hostname Associations
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           mtls_certificate_id: The UUID to match against for a certificate that was uploaded to the mTLS
               Certificate Management endpoint. If no mtls_certificate_id is given, the results
@@ -144,30 +152,41 @@ def get(
 class AsyncHostnameAssociationsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncHostnameAssociationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncHostnameAssociationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncHostnameAssociationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncHostnameAssociationsResourceWithStreamingResponse(self)
 
     async def update(
         self,
         *,
         zone_id: str,
-        hostnames: List[HostnameAssociation] | NotGiven = NOT_GIVEN,
-        mtls_certificate_id: str | NotGiven = NOT_GIVEN,
+        hostnames: SequenceNotStr[HostnameAssociation] | Omit = omit,
+        mtls_certificate_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[HostnameAssociationUpdateResponse]:
         """
         Replace Hostname Associations
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           mtls_certificate_id: The UUID for a certificate that was uploaded to the mTLS Certificate Management
               endpoint. If no mtls_certificate_id is given, the hostnames will be associated
@@ -208,19 +227,19 @@ async def get(
         self,
         *,
         zone_id: str,
-        mtls_certificate_id: str | NotGiven = NOT_GIVEN,
+        mtls_certificate_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[HostnameAssociationGetResponse]:
         """
         List Hostname Associations
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           mtls_certificate_id: The UUID to match against for a certificate that was uploaded to the mTLS
               Certificate Management endpoint. If no mtls_certificate_id is given, the results
diff --git a/src/cloudflare/resources/challenges/__init__.py b/src/cloudflare/resources/challenges/__init__.py
deleted file mode 100644
index 92f2f7a074a..00000000000
--- a/src/cloudflare/resources/challenges/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from .widgets import (
-    WidgetsResource,
-    AsyncWidgetsResource,
-    WidgetsResourceWithRawResponse,
-    AsyncWidgetsResourceWithRawResponse,
-    WidgetsResourceWithStreamingResponse,
-    AsyncWidgetsResourceWithStreamingResponse,
-)
-from .challenges import (
-    ChallengesResource,
-    AsyncChallengesResource,
-    ChallengesResourceWithRawResponse,
-    AsyncChallengesResourceWithRawResponse,
-    ChallengesResourceWithStreamingResponse,
-    AsyncChallengesResourceWithStreamingResponse,
-)
-
-__all__ = [
-    "WidgetsResource",
-    "AsyncWidgetsResource",
-    "WidgetsResourceWithRawResponse",
-    "AsyncWidgetsResourceWithRawResponse",
-    "WidgetsResourceWithStreamingResponse",
-    "AsyncWidgetsResourceWithStreamingResponse",
-    "ChallengesResource",
-    "AsyncChallengesResource",
-    "ChallengesResourceWithRawResponse",
-    "AsyncChallengesResourceWithRawResponse",
-    "ChallengesResourceWithStreamingResponse",
-    "AsyncChallengesResourceWithStreamingResponse",
-]
diff --git a/src/cloudflare/resources/challenges/challenges.py b/src/cloudflare/resources/challenges/challenges.py
deleted file mode 100644
index b64b5c4dfbd..00000000000
--- a/src/cloudflare/resources/challenges/challenges.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from .widgets import (
-    WidgetsResource,
-    AsyncWidgetsResource,
-    WidgetsResourceWithRawResponse,
-    AsyncWidgetsResourceWithRawResponse,
-    WidgetsResourceWithStreamingResponse,
-    AsyncWidgetsResourceWithStreamingResponse,
-)
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-
-__all__ = ["ChallengesResource", "AsyncChallengesResource"]
-
-
-class ChallengesResource(SyncAPIResource):
-    @cached_property
-    def widgets(self) -> WidgetsResource:
-        return WidgetsResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> ChallengesResourceWithRawResponse:
-        return ChallengesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> ChallengesResourceWithStreamingResponse:
-        return ChallengesResourceWithStreamingResponse(self)
-
-
-class AsyncChallengesResource(AsyncAPIResource):
-    @cached_property
-    def widgets(self) -> AsyncWidgetsResource:
-        return AsyncWidgetsResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncChallengesResourceWithRawResponse:
-        return AsyncChallengesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncChallengesResourceWithStreamingResponse:
-        return AsyncChallengesResourceWithStreamingResponse(self)
-
-
-class ChallengesResourceWithRawResponse:
-    def __init__(self, challenges: ChallengesResource) -> None:
-        self._challenges = challenges
-
-    @cached_property
-    def widgets(self) -> WidgetsResourceWithRawResponse:
-        return WidgetsResourceWithRawResponse(self._challenges.widgets)
-
-
-class AsyncChallengesResourceWithRawResponse:
-    def __init__(self, challenges: AsyncChallengesResource) -> None:
-        self._challenges = challenges
-
-    @cached_property
-    def widgets(self) -> AsyncWidgetsResourceWithRawResponse:
-        return AsyncWidgetsResourceWithRawResponse(self._challenges.widgets)
-
-
-class ChallengesResourceWithStreamingResponse:
-    def __init__(self, challenges: ChallengesResource) -> None:
-        self._challenges = challenges
-
-    @cached_property
-    def widgets(self) -> WidgetsResourceWithStreamingResponse:
-        return WidgetsResourceWithStreamingResponse(self._challenges.widgets)
-
-
-class AsyncChallengesResourceWithStreamingResponse:
-    def __init__(self, challenges: AsyncChallengesResource) -> None:
-        self._challenges = challenges
-
-    @cached_property
-    def widgets(self) -> AsyncWidgetsResourceWithStreamingResponse:
-        return AsyncWidgetsResourceWithStreamingResponse(self._challenges.widgets)
diff --git a/src/cloudflare/resources/client_certificates.py b/src/cloudflare/resources/client_certificates.py
index 238739406c6..3a347848901 100644
--- a/src/cloudflare/resources/client_certificates.py
+++ b/src/cloudflare/resources/client_certificates.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from .._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from .._utils import maybe_transform, async_maybe_transform
 from .._compat import cached_property
 from .._resource import SyncAPIResource, AsyncAPIResource
 from .._response import (
@@ -23,7 +20,11 @@
 from .._wrappers import ResultWrapper
 from ..pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.client_certificates import client_certificate_list_params, client_certificate_create_params
+from ..types.client_certificates import (
+    client_certificate_edit_params,
+    client_certificate_list_params,
+    client_certificate_create_params,
+)
 from ..types.client_certificates.client_certificate import ClientCertificate
 
 __all__ = ["ClientCertificatesResource", "AsyncClientCertificatesResource"]
@@ -32,10 +33,21 @@
 class ClientCertificatesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ClientCertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ClientCertificatesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ClientCertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ClientCertificatesResourceWithStreamingResponse(self)
 
     def create(
@@ -49,13 +61,13 @@ def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ClientCertificate]:
         """
         Create a new API Shield mTLS Client Certificate
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           csr: The Certificate Signing Request (CSR). Must be newline-encoded.
 
@@ -94,25 +106,24 @@ def list(
         self,
         *,
         zone_id: str,
-        limit: int | NotGiven = NOT_GIVEN,
-        offset: int | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        status: Literal["all", "active", "pending_reactivation", "pending_revocation", "revoked"]
-        | NotGiven = NOT_GIVEN,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal["all", "active", "pending_reactivation", "pending_revocation", "revoked"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[ClientCertificate]:
         """
         List all of your Zone's API Shield mTLS Client Certificates by Status and/or
         using Pagination
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           limit: Limit to the number of records returned.
 
@@ -166,16 +177,16 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ClientCertificate]:
         """
         Set a API Shield mTLS Client Certificate to pending_revocation status for
         processing to revoked status.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          client_certificate_id: Identifier
+          client_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -208,21 +219,22 @@ def edit(
         client_certificate_id: str,
         *,
         zone_id: str,
+        reactivate: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ClientCertificate]:
         """
         If a API Shield mTLS Client Certificate is in a pending_revocation state, you
         may reactivate it with this endpoint.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          client_certificate_id: Identifier
+          client_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -240,6 +252,9 @@ def edit(
             )
         return self._patch(
             f"/zones/{zone_id}/client_certificates/{client_certificate_id}",
+            body=maybe_transform(
+                {"reactivate": reactivate}, client_certificate_edit_params.ClientCertificateEditParams
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -260,15 +275,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ClientCertificate]:
         """
         Get Details for a single mTLS API Shield Client Certificate
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          client_certificate_id: Identifier
+          client_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -300,10 +315,21 @@ def get(
 class AsyncClientCertificatesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncClientCertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncClientCertificatesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncClientCertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncClientCertificatesResourceWithStreamingResponse(self)
 
     async def create(
@@ -317,13 +343,13 @@ async def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ClientCertificate]:
         """
         Create a new API Shield mTLS Client Certificate
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           csr: The Certificate Signing Request (CSR). Must be newline-encoded.
 
@@ -362,25 +388,24 @@ def list(
         self,
         *,
         zone_id: str,
-        limit: int | NotGiven = NOT_GIVEN,
-        offset: int | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        status: Literal["all", "active", "pending_reactivation", "pending_revocation", "revoked"]
-        | NotGiven = NOT_GIVEN,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal["all", "active", "pending_reactivation", "pending_revocation", "revoked"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[ClientCertificate, AsyncV4PagePaginationArray[ClientCertificate]]:
         """
         List all of your Zone's API Shield mTLS Client Certificates by Status and/or
         using Pagination
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           limit: Limit to the number of records returned.
 
@@ -434,16 +459,16 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ClientCertificate]:
         """
         Set a API Shield mTLS Client Certificate to pending_revocation status for
         processing to revoked status.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          client_certificate_id: Identifier
+          client_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -476,21 +501,22 @@ async def edit(
         client_certificate_id: str,
         *,
         zone_id: str,
+        reactivate: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ClientCertificate]:
         """
         If a API Shield mTLS Client Certificate is in a pending_revocation state, you
         may reactivate it with this endpoint.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          client_certificate_id: Identifier
+          client_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -508,6 +534,9 @@ async def edit(
             )
         return await self._patch(
             f"/zones/{zone_id}/client_certificates/{client_certificate_id}",
+            body=await async_maybe_transform(
+                {"reactivate": reactivate}, client_certificate_edit_params.ClientCertificateEditParams
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -528,15 +557,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ClientCertificate]:
         """
         Get Details for a single mTLS API Shield Client Certificate
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          client_certificate_id: Identifier
+          client_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/cloud_connector/cloud_connector.py b/src/cloudflare/resources/cloud_connector/cloud_connector.py
index f95e76646df..906fee60939 100644
--- a/src/cloudflare/resources/cloud_connector/cloud_connector.py
+++ b/src/cloudflare/resources/cloud_connector/cloud_connector.py
@@ -23,10 +23,21 @@ def rules(self) -> RulesResource:
 
     @cached_property
     def with_raw_response(self) -> CloudConnectorResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CloudConnectorResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CloudConnectorResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CloudConnectorResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def rules(self) -> AsyncRulesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncCloudConnectorResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCloudConnectorResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCloudConnectorResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCloudConnectorResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/cloud_connector/rules.py b/src/cloudflare/resources/cloud_connector/rules.py
index 0b741471554..565996aa212 100644
--- a/src/cloudflare/resources/cloud_connector/rules.py
+++ b/src/cloudflare/resources/cloud_connector/rules.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Iterable, Optional, cast
+from typing import Iterable
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -19,7 +16,6 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._wrappers import ResultWrapper
 from ...pagination import SyncSinglePage, AsyncSinglePage
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.cloud_connector import rule_update_params
@@ -32,31 +28,40 @@
 class RulesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RulesResourceWithStreamingResponse(self)
 
     def update(
         self,
         *,
         zone_id: str,
-        body: Iterable[rule_update_params.Body],
+        rules: Iterable[rule_update_params.Rule] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RuleUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[RuleUpdateResponse]:
         """
         Put Rules
 
         Args:
-          zone_id: Identifier
-
-          body: List of Cloud Connector rules
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -68,17 +73,15 @@ def update(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._put(
+        return self._get_api_list(
             f"/zones/{zone_id}/cloud_connector/rules",
-            body=maybe_transform(body, rule_update_params.RuleUpdateParams),
+            page=SyncSinglePage[RuleUpdateResponse],
+            body=maybe_transform(rules, Iterable[rule_update_params.Rule]),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RuleUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RuleUpdateResponse]], ResultWrapper[RuleUpdateResponse]),
+            model=RuleUpdateResponse,
+            method="put",
         )
 
     def list(
@@ -90,13 +93,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[RuleListResponse]:
         """
         Rules
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -121,31 +124,40 @@ def list(
 class AsyncRulesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRulesResourceWithStreamingResponse(self)
 
-    async def update(
+    def update(
         self,
         *,
         zone_id: str,
-        body: Iterable[rule_update_params.Body],
+        rules: Iterable[rule_update_params.Rule] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RuleUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[RuleUpdateResponse, AsyncSinglePage[RuleUpdateResponse]]:
         """
         Put Rules
 
         Args:
-          zone_id: Identifier
-
-          body: List of Cloud Connector rules
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -157,17 +169,15 @@ async def update(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._put(
+        return self._get_api_list(
             f"/zones/{zone_id}/cloud_connector/rules",
-            body=await async_maybe_transform(body, rule_update_params.RuleUpdateParams),
+            page=AsyncSinglePage[RuleUpdateResponse],
+            body=maybe_transform(rules, Iterable[rule_update_params.Rule]),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RuleUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RuleUpdateResponse]], ResultWrapper[RuleUpdateResponse]),
+            model=RuleUpdateResponse,
+            method="put",
         )
 
     def list(
@@ -179,13 +189,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[RuleListResponse, AsyncSinglePage[RuleListResponse]]:
         """
         Rules
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/cloudforce_one/__init__.py b/src/cloudflare/resources/cloudforce_one/__init__.py
index 328074fc4b5..6dede9235d6 100644
--- a/src/cloudflare/resources/cloudforce_one/__init__.py
+++ b/src/cloudflare/resources/cloudforce_one/__init__.py
@@ -1,5 +1,13 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from .scans import (
+    ScansResource,
+    AsyncScansResource,
+    ScansResourceWithRawResponse,
+    AsyncScansResourceWithRawResponse,
+    ScansResourceWithStreamingResponse,
+    AsyncScansResourceWithStreamingResponse,
+)
 from .requests import (
     RequestsResource,
     AsyncRequestsResource,
@@ -8,6 +16,22 @@
     RequestsResourceWithStreamingResponse,
     AsyncRequestsResourceWithStreamingResponse,
 )
+from .threat_events import (
+    ThreatEventsResource,
+    AsyncThreatEventsResource,
+    ThreatEventsResourceWithRawResponse,
+    AsyncThreatEventsResourceWithRawResponse,
+    ThreatEventsResourceWithStreamingResponse,
+    AsyncThreatEventsResourceWithStreamingResponse,
+)
+from .binary_storage import (
+    BinaryStorageResource,
+    AsyncBinaryStorageResource,
+    BinaryStorageResourceWithRawResponse,
+    AsyncBinaryStorageResourceWithRawResponse,
+    BinaryStorageResourceWithStreamingResponse,
+    AsyncBinaryStorageResourceWithStreamingResponse,
+)
 from .cloudforce_one import (
     CloudforceOneResource,
     AsyncCloudforceOneResource,
@@ -18,12 +42,30 @@
 )
 
 __all__ = [
+    "ScansResource",
+    "AsyncScansResource",
+    "ScansResourceWithRawResponse",
+    "AsyncScansResourceWithRawResponse",
+    "ScansResourceWithStreamingResponse",
+    "AsyncScansResourceWithStreamingResponse",
+    "BinaryStorageResource",
+    "AsyncBinaryStorageResource",
+    "BinaryStorageResourceWithRawResponse",
+    "AsyncBinaryStorageResourceWithRawResponse",
+    "BinaryStorageResourceWithStreamingResponse",
+    "AsyncBinaryStorageResourceWithStreamingResponse",
     "RequestsResource",
     "AsyncRequestsResource",
     "RequestsResourceWithRawResponse",
     "AsyncRequestsResourceWithRawResponse",
     "RequestsResourceWithStreamingResponse",
     "AsyncRequestsResourceWithStreamingResponse",
+    "ThreatEventsResource",
+    "AsyncThreatEventsResource",
+    "ThreatEventsResourceWithRawResponse",
+    "AsyncThreatEventsResourceWithRawResponse",
+    "ThreatEventsResourceWithStreamingResponse",
+    "AsyncThreatEventsResourceWithStreamingResponse",
     "CloudforceOneResource",
     "AsyncCloudforceOneResource",
     "CloudforceOneResourceWithRawResponse",
diff --git a/src/cloudflare/resources/cloudforce_one/binary_storage.py b/src/cloudflare/resources/cloudforce_one/binary_storage.py
new file mode 100644
index 00000000000..0fe9078f558
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/binary_storage.py
@@ -0,0 +1,287 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Mapping, cast
+
+import httpx
+
+from ..._types import Body, Query, Headers, NoneType, NotGiven, FileTypes, not_given
+from ..._utils import extract_files, maybe_transform, deepcopy_minimal, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.cloudforce_one import binary_storage_create_params
+from ...types.cloudforce_one.binary_storage_create_response import BinaryStorageCreateResponse
+
+__all__ = ["BinaryStorageResource", "AsyncBinaryStorageResource"]
+
+
+class BinaryStorageResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> BinaryStorageResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return BinaryStorageResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> BinaryStorageResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return BinaryStorageResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        file: FileTypes,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BinaryStorageCreateResponse:
+        """
+        Posts a file to Binary Storage
+
+        Args:
+          account_id: Account ID.
+
+          file: The binary file content to upload.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        body = deepcopy_minimal({"file": file})
+        files = extract_files(cast(Mapping[str, object], body), paths=[["file"]])
+        # It should be noted that the actual Content-Type header that will be
+        # sent to the server will contain a `boundary` parameter, e.g.
+        # multipart/form-data; boundary=---abc--
+        extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
+        return self._post(
+            f"/accounts/{account_id}/cloudforce-one/binary",
+            body=maybe_transform(body, binary_storage_create_params.BinaryStorageCreateParams),
+            files=files,
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=BinaryStorageCreateResponse,
+        )
+
+    def get(
+        self,
+        hash: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Retrieves a file from Binary Storage
+
+        Args:
+          account_id: Account ID.
+
+          hash: hash of the binary
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not hash:
+            raise ValueError(f"Expected a non-empty value for `hash` but received {hash!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._get(
+            f"/accounts/{account_id}/cloudforce-one/binary/{hash}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+
+class AsyncBinaryStorageResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncBinaryStorageResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncBinaryStorageResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncBinaryStorageResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncBinaryStorageResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        file: FileTypes,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BinaryStorageCreateResponse:
+        """
+        Posts a file to Binary Storage
+
+        Args:
+          account_id: Account ID.
+
+          file: The binary file content to upload.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        body = deepcopy_minimal({"file": file})
+        files = extract_files(cast(Mapping[str, object], body), paths=[["file"]])
+        # It should be noted that the actual Content-Type header that will be
+        # sent to the server will contain a `boundary` parameter, e.g.
+        # multipart/form-data; boundary=---abc--
+        extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
+        return await self._post(
+            f"/accounts/{account_id}/cloudforce-one/binary",
+            body=await async_maybe_transform(body, binary_storage_create_params.BinaryStorageCreateParams),
+            files=files,
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=BinaryStorageCreateResponse,
+        )
+
+    async def get(
+        self,
+        hash: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Retrieves a file from Binary Storage
+
+        Args:
+          account_id: Account ID.
+
+          hash: hash of the binary
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not hash:
+            raise ValueError(f"Expected a non-empty value for `hash` but received {hash!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._get(
+            f"/accounts/{account_id}/cloudforce-one/binary/{hash}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+
+class BinaryStorageResourceWithRawResponse:
+    def __init__(self, binary_storage: BinaryStorageResource) -> None:
+        self._binary_storage = binary_storage
+
+        self.create = to_raw_response_wrapper(
+            binary_storage.create,
+        )
+        self.get = to_raw_response_wrapper(
+            binary_storage.get,
+        )
+
+
+class AsyncBinaryStorageResourceWithRawResponse:
+    def __init__(self, binary_storage: AsyncBinaryStorageResource) -> None:
+        self._binary_storage = binary_storage
+
+        self.create = async_to_raw_response_wrapper(
+            binary_storage.create,
+        )
+        self.get = async_to_raw_response_wrapper(
+            binary_storage.get,
+        )
+
+
+class BinaryStorageResourceWithStreamingResponse:
+    def __init__(self, binary_storage: BinaryStorageResource) -> None:
+        self._binary_storage = binary_storage
+
+        self.create = to_streamed_response_wrapper(
+            binary_storage.create,
+        )
+        self.get = to_streamed_response_wrapper(
+            binary_storage.get,
+        )
+
+
+class AsyncBinaryStorageResourceWithStreamingResponse:
+    def __init__(self, binary_storage: AsyncBinaryStorageResource) -> None:
+        self._binary_storage = binary_storage
+
+        self.create = async_to_streamed_response_wrapper(
+            binary_storage.create,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            binary_storage.get,
+        )
diff --git a/src/cloudflare/resources/cloudforce_one/cloudforce_one.py b/src/cloudflare/resources/cloudforce_one/cloudforce_one.py
index 9c8929e4f64..9e8c0f29a09 100644
--- a/src/cloudflare/resources/cloudforce_one/cloudforce_one.py
+++ b/src/cloudflare/resources/cloudforce_one/cloudforce_one.py
@@ -2,7 +2,25 @@
 
 from __future__ import annotations
 
-from .requests import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .scans.scans import (
+    ScansResource,
+    AsyncScansResource,
+    ScansResourceWithRawResponse,
+    AsyncScansResourceWithRawResponse,
+    ScansResourceWithStreamingResponse,
+    AsyncScansResourceWithStreamingResponse,
+)
+from .binary_storage import (
+    BinaryStorageResource,
+    AsyncBinaryStorageResource,
+    BinaryStorageResourceWithRawResponse,
+    AsyncBinaryStorageResourceWithRawResponse,
+    BinaryStorageResourceWithStreamingResponse,
+    AsyncBinaryStorageResourceWithStreamingResponse,
+)
+from .requests.requests import (
     RequestsResource,
     AsyncRequestsResource,
     RequestsResourceWithRawResponse,
@@ -10,38 +28,89 @@
     RequestsResourceWithStreamingResponse,
     AsyncRequestsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .requests.requests import RequestsResource, AsyncRequestsResource
+from .threat_events.threat_events import (
+    ThreatEventsResource,
+    AsyncThreatEventsResource,
+    ThreatEventsResourceWithRawResponse,
+    AsyncThreatEventsResourceWithRawResponse,
+    ThreatEventsResourceWithStreamingResponse,
+    AsyncThreatEventsResourceWithStreamingResponse,
+)
 
 __all__ = ["CloudforceOneResource", "AsyncCloudforceOneResource"]
 
 
 class CloudforceOneResource(SyncAPIResource):
+    @cached_property
+    def scans(self) -> ScansResource:
+        return ScansResource(self._client)
+
+    @cached_property
+    def binary_storage(self) -> BinaryStorageResource:
+        return BinaryStorageResource(self._client)
+
     @cached_property
     def requests(self) -> RequestsResource:
         return RequestsResource(self._client)
 
+    @cached_property
+    def threat_events(self) -> ThreatEventsResource:
+        return ThreatEventsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> CloudforceOneResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CloudforceOneResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CloudforceOneResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CloudforceOneResourceWithStreamingResponse(self)
 
 
 class AsyncCloudforceOneResource(AsyncAPIResource):
+    @cached_property
+    def scans(self) -> AsyncScansResource:
+        return AsyncScansResource(self._client)
+
+    @cached_property
+    def binary_storage(self) -> AsyncBinaryStorageResource:
+        return AsyncBinaryStorageResource(self._client)
+
     @cached_property
     def requests(self) -> AsyncRequestsResource:
         return AsyncRequestsResource(self._client)
 
+    @cached_property
+    def threat_events(self) -> AsyncThreatEventsResource:
+        return AsyncThreatEventsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncCloudforceOneResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCloudforceOneResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCloudforceOneResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCloudforceOneResourceWithStreamingResponse(self)
 
 
@@ -49,33 +118,81 @@ class CloudforceOneResourceWithRawResponse:
     def __init__(self, cloudforce_one: CloudforceOneResource) -> None:
         self._cloudforce_one = cloudforce_one
 
+    @cached_property
+    def scans(self) -> ScansResourceWithRawResponse:
+        return ScansResourceWithRawResponse(self._cloudforce_one.scans)
+
+    @cached_property
+    def binary_storage(self) -> BinaryStorageResourceWithRawResponse:
+        return BinaryStorageResourceWithRawResponse(self._cloudforce_one.binary_storage)
+
     @cached_property
     def requests(self) -> RequestsResourceWithRawResponse:
         return RequestsResourceWithRawResponse(self._cloudforce_one.requests)
 
+    @cached_property
+    def threat_events(self) -> ThreatEventsResourceWithRawResponse:
+        return ThreatEventsResourceWithRawResponse(self._cloudforce_one.threat_events)
+
 
 class AsyncCloudforceOneResourceWithRawResponse:
     def __init__(self, cloudforce_one: AsyncCloudforceOneResource) -> None:
         self._cloudforce_one = cloudforce_one
 
+    @cached_property
+    def scans(self) -> AsyncScansResourceWithRawResponse:
+        return AsyncScansResourceWithRawResponse(self._cloudforce_one.scans)
+
+    @cached_property
+    def binary_storage(self) -> AsyncBinaryStorageResourceWithRawResponse:
+        return AsyncBinaryStorageResourceWithRawResponse(self._cloudforce_one.binary_storage)
+
     @cached_property
     def requests(self) -> AsyncRequestsResourceWithRawResponse:
         return AsyncRequestsResourceWithRawResponse(self._cloudforce_one.requests)
 
+    @cached_property
+    def threat_events(self) -> AsyncThreatEventsResourceWithRawResponse:
+        return AsyncThreatEventsResourceWithRawResponse(self._cloudforce_one.threat_events)
+
 
 class CloudforceOneResourceWithStreamingResponse:
     def __init__(self, cloudforce_one: CloudforceOneResource) -> None:
         self._cloudforce_one = cloudforce_one
 
+    @cached_property
+    def scans(self) -> ScansResourceWithStreamingResponse:
+        return ScansResourceWithStreamingResponse(self._cloudforce_one.scans)
+
+    @cached_property
+    def binary_storage(self) -> BinaryStorageResourceWithStreamingResponse:
+        return BinaryStorageResourceWithStreamingResponse(self._cloudforce_one.binary_storage)
+
     @cached_property
     def requests(self) -> RequestsResourceWithStreamingResponse:
         return RequestsResourceWithStreamingResponse(self._cloudforce_one.requests)
 
+    @cached_property
+    def threat_events(self) -> ThreatEventsResourceWithStreamingResponse:
+        return ThreatEventsResourceWithStreamingResponse(self._cloudforce_one.threat_events)
+
 
 class AsyncCloudforceOneResourceWithStreamingResponse:
     def __init__(self, cloudforce_one: AsyncCloudforceOneResource) -> None:
         self._cloudforce_one = cloudforce_one
 
+    @cached_property
+    def scans(self) -> AsyncScansResourceWithStreamingResponse:
+        return AsyncScansResourceWithStreamingResponse(self._cloudforce_one.scans)
+
+    @cached_property
+    def binary_storage(self) -> AsyncBinaryStorageResourceWithStreamingResponse:
+        return AsyncBinaryStorageResourceWithStreamingResponse(self._cloudforce_one.binary_storage)
+
     @cached_property
     def requests(self) -> AsyncRequestsResourceWithStreamingResponse:
         return AsyncRequestsResourceWithStreamingResponse(self._cloudforce_one.requests)
+
+    @cached_property
+    def threat_events(self) -> AsyncThreatEventsResourceWithStreamingResponse:
+        return AsyncThreatEventsResourceWithStreamingResponse(self._cloudforce_one.threat_events)
diff --git a/src/cloudflare/resources/cloudforce_one/requests/__init__.py b/src/cloudflare/resources/cloudforce_one/requests/__init__.py
index 16dfad6eb56..1c33642fc72 100644
--- a/src/cloudflare/resources/cloudforce_one/requests/__init__.py
+++ b/src/cloudflare/resources/cloudforce_one/requests/__init__.py
@@ -1,5 +1,13 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from .assets import (
+    AssetsResource,
+    AsyncAssetsResource,
+    AssetsResourceWithRawResponse,
+    AsyncAssetsResourceWithRawResponse,
+    AssetsResourceWithStreamingResponse,
+    AsyncAssetsResourceWithStreamingResponse,
+)
 from .message import (
     MessageResource,
     AsyncMessageResource,
@@ -38,6 +46,12 @@
     "AsyncPriorityResourceWithRawResponse",
     "PriorityResourceWithStreamingResponse",
     "AsyncPriorityResourceWithStreamingResponse",
+    "AssetsResource",
+    "AsyncAssetsResource",
+    "AssetsResourceWithRawResponse",
+    "AsyncAssetsResourceWithRawResponse",
+    "AssetsResourceWithStreamingResponse",
+    "AsyncAssetsResourceWithStreamingResponse",
     "RequestsResource",
     "AsyncRequestsResource",
     "RequestsResourceWithRawResponse",
diff --git a/src/cloudflare/resources/cloudforce_one/requests/assets.py b/src/cloudflare/resources/cloudforce_one/requests/assets.py
new file mode 100644
index 00000000000..95ff2c31f11
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/requests/assets.py
@@ -0,0 +1,540 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.cloudforce_one.requests import asset_create_params, asset_update_params
+from ....types.cloudforce_one.requests.asset_get_response import AssetGetResponse
+from ....types.cloudforce_one.requests.asset_create_response import AssetCreateResponse
+from ....types.cloudforce_one.requests.asset_delete_response import AssetDeleteResponse
+from ....types.cloudforce_one.requests.asset_update_response import AssetUpdateResponse
+
+__all__ = ["AssetsResource", "AsyncAssetsResource"]
+
+
+class AssetsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AssetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AssetsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AssetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AssetsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        request_id: str,
+        *,
+        account_id: str,
+        page: int,
+        per_page: int,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[AssetCreateResponse]:
+        """
+        List Request Assets
+
+        Args:
+          account_id: Identifier.
+
+          request_id: UUID.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}/asset",
+            page=SyncSinglePage[AssetCreateResponse],
+            body=maybe_transform(
+                {
+                    "page": page,
+                    "per_page": per_page,
+                },
+                asset_create_params.AssetCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=AssetCreateResponse,
+            method="post",
+        )
+
+    def update(
+        self,
+        asset_id: str,
+        *,
+        account_id: str,
+        request_id: str,
+        source: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AssetUpdateResponse]:
+        """
+        Update a Request Asset
+
+        Args:
+          account_id: Identifier.
+
+          request_id: UUID.
+
+          asset_id: UUID.
+
+          source: Asset file to upload.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
+        if not asset_id:
+            raise ValueError(f"Expected a non-empty value for `asset_id` but received {asset_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}/asset/{asset_id}",
+            body=maybe_transform({"source": source}, asset_update_params.AssetUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AssetUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AssetUpdateResponse]], ResultWrapper[AssetUpdateResponse]),
+        )
+
+    def delete(
+        self,
+        asset_id: str,
+        *,
+        account_id: str,
+        request_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AssetDeleteResponse:
+        """
+        Delete a Request Asset
+
+        Args:
+          account_id: Identifier.
+
+          request_id: UUID.
+
+          asset_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
+        if not asset_id:
+            raise ValueError(f"Expected a non-empty value for `asset_id` but received {asset_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}/asset/{asset_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=AssetDeleteResponse,
+        )
+
+    def get(
+        self,
+        asset_id: str,
+        *,
+        account_id: str,
+        request_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[AssetGetResponse]:
+        """
+        Get a Request Asset
+
+        Args:
+          account_id: Identifier.
+
+          request_id: UUID.
+
+          asset_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
+        if not asset_id:
+            raise ValueError(f"Expected a non-empty value for `asset_id` but received {asset_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}/asset/{asset_id}",
+            page=SyncSinglePage[AssetGetResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=AssetGetResponse,
+        )
+
+
+class AsyncAssetsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncAssetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAssetsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAssetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAssetsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        request_id: str,
+        *,
+        account_id: str,
+        page: int,
+        per_page: int,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[AssetCreateResponse, AsyncSinglePage[AssetCreateResponse]]:
+        """
+        List Request Assets
+
+        Args:
+          account_id: Identifier.
+
+          request_id: UUID.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}/asset",
+            page=AsyncSinglePage[AssetCreateResponse],
+            body=maybe_transform(
+                {
+                    "page": page,
+                    "per_page": per_page,
+                },
+                asset_create_params.AssetCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=AssetCreateResponse,
+            method="post",
+        )
+
+    async def update(
+        self,
+        asset_id: str,
+        *,
+        account_id: str,
+        request_id: str,
+        source: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AssetUpdateResponse]:
+        """
+        Update a Request Asset
+
+        Args:
+          account_id: Identifier.
+
+          request_id: UUID.
+
+          asset_id: UUID.
+
+          source: Asset file to upload.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
+        if not asset_id:
+            raise ValueError(f"Expected a non-empty value for `asset_id` but received {asset_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}/asset/{asset_id}",
+            body=await async_maybe_transform({"source": source}, asset_update_params.AssetUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AssetUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AssetUpdateResponse]], ResultWrapper[AssetUpdateResponse]),
+        )
+
+    async def delete(
+        self,
+        asset_id: str,
+        *,
+        account_id: str,
+        request_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AssetDeleteResponse:
+        """
+        Delete a Request Asset
+
+        Args:
+          account_id: Identifier.
+
+          request_id: UUID.
+
+          asset_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
+        if not asset_id:
+            raise ValueError(f"Expected a non-empty value for `asset_id` but received {asset_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}/asset/{asset_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=AssetDeleteResponse,
+        )
+
+    def get(
+        self,
+        asset_id: str,
+        *,
+        account_id: str,
+        request_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[AssetGetResponse, AsyncSinglePage[AssetGetResponse]]:
+        """
+        Get a Request Asset
+
+        Args:
+          account_id: Identifier.
+
+          request_id: UUID.
+
+          asset_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
+        if not asset_id:
+            raise ValueError(f"Expected a non-empty value for `asset_id` but received {asset_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}/asset/{asset_id}",
+            page=AsyncSinglePage[AssetGetResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=AssetGetResponse,
+        )
+
+
+class AssetsResourceWithRawResponse:
+    def __init__(self, assets: AssetsResource) -> None:
+        self._assets = assets
+
+        self.create = to_raw_response_wrapper(
+            assets.create,
+        )
+        self.update = to_raw_response_wrapper(
+            assets.update,
+        )
+        self.delete = to_raw_response_wrapper(
+            assets.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            assets.get,
+        )
+
+
+class AsyncAssetsResourceWithRawResponse:
+    def __init__(self, assets: AsyncAssetsResource) -> None:
+        self._assets = assets
+
+        self.create = async_to_raw_response_wrapper(
+            assets.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            assets.update,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            assets.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            assets.get,
+        )
+
+
+class AssetsResourceWithStreamingResponse:
+    def __init__(self, assets: AssetsResource) -> None:
+        self._assets = assets
+
+        self.create = to_streamed_response_wrapper(
+            assets.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            assets.update,
+        )
+        self.delete = to_streamed_response_wrapper(
+            assets.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            assets.get,
+        )
+
+
+class AsyncAssetsResourceWithStreamingResponse:
+    def __init__(self, assets: AsyncAssetsResource) -> None:
+        self._assets = assets
+
+        self.create = async_to_streamed_response_wrapper(
+            assets.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            assets.update,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            assets.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            assets.get,
+        )
diff --git a/src/cloudflare/resources/cloudforce_one/requests/message.py b/src/cloudflare/resources/cloudforce_one/requests/message.py
index 84388261101..e866faf090e 100644
--- a/src/cloudflare/resources/cloudforce_one/requests/message.py
+++ b/src/cloudflare/resources/cloudforce_one/requests/message.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -22,10 +19,10 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
 from ....types.cloudforce_one.requests import message_get_params, message_create_params, message_update_params
 from ....types.cloudforce_one.requests.message import Message
-from ....types.cloudforce_one.requests.message_get_response import MessageGetResponse
 from ....types.cloudforce_one.requests.message_delete_response import MessageDeleteResponse
 
 __all__ = ["MessageResource", "AsyncMessageResource"]
@@ -34,36 +31,45 @@
 class MessageResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> MessageResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return MessageResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> MessageResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return MessageResourceWithStreamingResponse(self)
 
     def create(
         self,
-        request_identifier: str,
+        request_id: str,
         *,
-        account_identifier: str,
-        content: str | NotGiven = NOT_GIVEN,
+        account_id: str,
+        content: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Message]:
         """
-        Creating a request adds the request into the Cloudforce One queue for analysis.
-        In addition to the content, a short title, type, priority, and releasability
-        should be provided. If one is not provided a default will be assigned.
+        Create a New Request Message
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          request_identifier: UUID
+          request_id: UUID.
 
-          content: Content of message
+          content: Content of message.
 
           extra_headers: Send extra headers
 
@@ -73,12 +79,12 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not request_identifier:
-            raise ValueError(f"Expected a non-empty value for `request_identifier` but received {request_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
         return self._post(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}/message/new",
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}/message/new",
             body=maybe_transform({"content": content}, message_create_params.MessageCreateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -92,39 +98,27 @@ def create(
 
     def update(
         self,
-        message_identifer: int,
+        message_id: int,
         *,
-        account_identifier: str,
-        request_identifier: str,
-        content: str | NotGiven = NOT_GIVEN,
-        priority: str | NotGiven = NOT_GIVEN,
-        request_type: str | NotGiven = NOT_GIVEN,
-        summary: str | NotGiven = NOT_GIVEN,
-        tlp: Literal["clear", "amber", "amber-strict", "green", "red"] | NotGiven = NOT_GIVEN,
+        account_id: str,
+        request_id: str,
+        content: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Message]:
         """
         Update a Request Message
 
         Args:
-          account_identifier: Identifier
-
-          request_identifier: UUID
-
-          content: Request content
-
-          priority: Priority for analyzing the request
-
-          request_type: Requested information from request
+          account_id: Identifier.
 
-          summary: Brief description of the request
+          request_id: UUID.
 
-          tlp: The CISA defined Traffic Light Protocol (TLP)
+          content: Content of message.
 
           extra_headers: Send extra headers
 
@@ -134,22 +128,13 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not request_identifier:
-            raise ValueError(f"Expected a non-empty value for `request_identifier` but received {request_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
         return self._put(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}/message/{message_identifer}",
-            body=maybe_transform(
-                {
-                    "content": content,
-                    "priority": priority,
-                    "request_type": request_type,
-                    "summary": summary,
-                    "tlp": tlp,
-                },
-                message_update_params.MessageUpdateParams,
-            ),
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}/message/{message_id}",
+            body=maybe_transform({"content": content}, message_update_params.MessageUpdateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -162,24 +147,24 @@ def update(
 
     def delete(
         self,
-        message_identifer: int,
+        message_id: int,
         *,
-        account_identifier: str,
-        request_identifier: str,
+        account_id: str,
+        request_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> MessageDeleteResponse:
         """
         Delete a Request Message
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          request_identifier: UUID
+          request_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -189,12 +174,12 @@ def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not request_identifier:
-            raise ValueError(f"Expected a non-empty value for `request_identifier` but received {request_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
         return self._delete(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}/message/{message_identifer}",
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}/message/{message_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -203,41 +188,41 @@ def delete(
 
     def get(
         self,
-        request_identifier: str,
+        request_id: str,
         *,
-        account_identifier: str,
+        account_id: str,
         page: int,
         per_page: int,
-        after: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        before: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        sort_by: str | NotGiven = NOT_GIVEN,
-        sort_order: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
+        after: Union[str, datetime] | Omit = omit,
+        before: Union[str, datetime] | Omit = omit,
+        sort_by: str | Omit = omit,
+        sort_order: Literal["asc", "desc"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MessageGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[Message]:
         """
         List Request Messages
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          request_identifier: UUID
+          request_id: UUID.
 
-          page: Page number of results
+          page: Page number of results.
 
-          per_page: Number of results per page
+          per_page: Number of results per page.
 
-          after: Retrieve messages created after this time
+          after: Retrieve mes ges created after this time.
 
-          before: Retrieve messages created before this time
+          before: Retrieve messages created before this time.
 
-          sort_by: Field to sort results by
+          sort_by: Field to sort results by.
 
-          sort_order: Sort order (asc or desc)
+          sort_order: Sort order (asc or desc).
 
           extra_headers: Send extra headers
 
@@ -247,12 +232,13 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not request_identifier:
-            raise ValueError(f"Expected a non-empty value for `request_identifier` but received {request_identifier!r}")
-        return self._post(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}/message",
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}/message",
+            page=SyncSinglePage[Message],
             body=maybe_transform(
                 {
                     "page": page,
@@ -265,49 +251,55 @@ def get(
                 message_get_params.MessageGetParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[MessageGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[MessageGetResponse]], ResultWrapper[MessageGetResponse]),
+            model=Message,
+            method="post",
         )
 
 
 class AsyncMessageResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncMessageResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncMessageResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncMessageResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncMessageResourceWithStreamingResponse(self)
 
     async def create(
         self,
-        request_identifier: str,
+        request_id: str,
         *,
-        account_identifier: str,
-        content: str | NotGiven = NOT_GIVEN,
+        account_id: str,
+        content: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Message]:
         """
-        Creating a request adds the request into the Cloudforce One queue for analysis.
-        In addition to the content, a short title, type, priority, and releasability
-        should be provided. If one is not provided a default will be assigned.
+        Create a New Request Message
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          request_identifier: UUID
+          request_id: UUID.
 
-          content: Content of message
+          content: Content of message.
 
           extra_headers: Send extra headers
 
@@ -317,12 +309,12 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not request_identifier:
-            raise ValueError(f"Expected a non-empty value for `request_identifier` but received {request_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
         return await self._post(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}/message/new",
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}/message/new",
             body=await async_maybe_transform({"content": content}, message_create_params.MessageCreateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -336,39 +328,27 @@ async def create(
 
     async def update(
         self,
-        message_identifer: int,
+        message_id: int,
         *,
-        account_identifier: str,
-        request_identifier: str,
-        content: str | NotGiven = NOT_GIVEN,
-        priority: str | NotGiven = NOT_GIVEN,
-        request_type: str | NotGiven = NOT_GIVEN,
-        summary: str | NotGiven = NOT_GIVEN,
-        tlp: Literal["clear", "amber", "amber-strict", "green", "red"] | NotGiven = NOT_GIVEN,
+        account_id: str,
+        request_id: str,
+        content: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Message]:
         """
         Update a Request Message
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          request_identifier: UUID
+          request_id: UUID.
 
-          content: Request content
-
-          priority: Priority for analyzing the request
-
-          request_type: Requested information from request
-
-          summary: Brief description of the request
-
-          tlp: The CISA defined Traffic Light Protocol (TLP)
+          content: Content of message.
 
           extra_headers: Send extra headers
 
@@ -378,22 +358,13 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not request_identifier:
-            raise ValueError(f"Expected a non-empty value for `request_identifier` but received {request_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
         return await self._put(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}/message/{message_identifer}",
-            body=await async_maybe_transform(
-                {
-                    "content": content,
-                    "priority": priority,
-                    "request_type": request_type,
-                    "summary": summary,
-                    "tlp": tlp,
-                },
-                message_update_params.MessageUpdateParams,
-            ),
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}/message/{message_id}",
+            body=await async_maybe_transform({"content": content}, message_update_params.MessageUpdateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -406,24 +377,24 @@ async def update(
 
     async def delete(
         self,
-        message_identifer: int,
+        message_id: int,
         *,
-        account_identifier: str,
-        request_identifier: str,
+        account_id: str,
+        request_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> MessageDeleteResponse:
         """
         Delete a Request Message
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          request_identifier: UUID
+          request_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -433,55 +404,55 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not request_identifier:
-            raise ValueError(f"Expected a non-empty value for `request_identifier` but received {request_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
         return await self._delete(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}/message/{message_identifer}",
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}/message/{message_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
             cast_to=MessageDeleteResponse,
         )
 
-    async def get(
+    def get(
         self,
-        request_identifier: str,
+        request_id: str,
         *,
-        account_identifier: str,
+        account_id: str,
         page: int,
         per_page: int,
-        after: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        before: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        sort_by: str | NotGiven = NOT_GIVEN,
-        sort_order: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
+        after: Union[str, datetime] | Omit = omit,
+        before: Union[str, datetime] | Omit = omit,
+        sort_by: str | Omit = omit,
+        sort_order: Literal["asc", "desc"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MessageGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Message, AsyncSinglePage[Message]]:
         """
         List Request Messages
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          request_identifier: UUID
+          request_id: UUID.
 
-          page: Page number of results
+          page: Page number of results.
 
-          per_page: Number of results per page
+          per_page: Number of results per page.
 
-          after: Retrieve messages created after this time
+          after: Retrieve mes ges created after this time.
 
-          before: Retrieve messages created before this time
+          before: Retrieve messages created before this time.
 
-          sort_by: Field to sort results by
+          sort_by: Field to sort results by.
 
-          sort_order: Sort order (asc or desc)
+          sort_order: Sort order (asc or desc).
 
           extra_headers: Send extra headers
 
@@ -491,13 +462,14 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not request_identifier:
-            raise ValueError(f"Expected a non-empty value for `request_identifier` but received {request_identifier!r}")
-        return await self._post(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}/message",
-            body=await async_maybe_transform(
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}/message",
+            page=AsyncSinglePage[Message],
+            body=maybe_transform(
                 {
                     "page": page,
                     "per_page": per_page,
@@ -509,13 +481,10 @@ async def get(
                 message_get_params.MessageGetParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[MessageGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[MessageGetResponse]], ResultWrapper[MessageGetResponse]),
+            model=Message,
+            method="post",
         )
 
 
diff --git a/src/cloudflare/resources/cloudforce_one/requests/priority.py b/src/cloudflare/resources/cloudforce_one/requests/priority.py
index 956da5319ea..080a4a12efd 100644
--- a/src/cloudflare/resources/cloudforce_one/requests/priority.py
+++ b/src/cloudflare/resources/cloudforce_one/requests/priority.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Optional, cast
+from typing import Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, SequenceNotStr, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -35,17 +32,28 @@
 class PriorityResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PriorityResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PriorityResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PriorityResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PriorityResourceWithStreamingResponse(self)
 
     def create(
         self,
-        account_identifier: str,
         *,
-        labels: List[Label],
+        account_id: str,
+        labels: SequenceNotStr[Label],
         priority: int,
         requirement: str,
         tlp: Literal["clear", "amber", "amber-strict", "green", "red"],
@@ -54,21 +62,21 @@ def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Priority]:
         """
-        Create a New Priority Requirement
+        Create a New Priority Intelligence Requirement
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          labels: List of labels
+          labels: List of labels.
 
-          priority: Priority
+          priority: Priority.
 
-          requirement: Requirement
+          requirement: Requirement.
 
-          tlp: The CISA defined Traffic Light Protocol (TLP)
+          tlp: The CISA defined Traffic Light Protocol (TLP).
 
           extra_headers: Send extra headers
 
@@ -78,10 +86,10 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._post(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/priority/new",
+            f"/accounts/{account_id}/cloudforce-one/requests/priority/new",
             body=maybe_transform(
                 {
                     "labels": labels,
@@ -103,10 +111,10 @@ def create(
 
     def update(
         self,
-        priority_identifer: str,
+        priority_id: str,
         *,
-        account_identifier: str,
-        labels: List[Label],
+        account_id: str,
+        labels: SequenceNotStr[Label],
         priority: int,
         requirement: str,
         tlp: Literal["clear", "amber", "amber-strict", "green", "red"],
@@ -115,23 +123,23 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Item]:
         """
         Update a Priority Intelligence Requirement
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          priority_identifer: UUID
+          priority_id: UUID.
 
-          labels: List of labels
+          labels: List of labels.
 
-          priority: Priority
+          priority: Priority.
 
-          requirement: Requirement
+          requirement: Requirement.
 
-          tlp: The CISA defined Traffic Light Protocol (TLP)
+          tlp: The CISA defined Traffic Light Protocol (TLP).
 
           extra_headers: Send extra headers
 
@@ -141,12 +149,12 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not priority_identifer:
-            raise ValueError(f"Expected a non-empty value for `priority_identifer` but received {priority_identifer!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not priority_id:
+            raise ValueError(f"Expected a non-empty value for `priority_id` but received {priority_id!r}")
         return self._put(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/priority/{priority_identifer}",
+            f"/accounts/{account_id}/cloudforce-one/requests/priority/{priority_id}",
             body=maybe_transform(
                 {
                     "labels": labels,
@@ -168,23 +176,23 @@ def update(
 
     def delete(
         self,
-        priority_identifer: str,
+        priority_id: str,
         *,
-        account_identifier: str,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PriorityDeleteResponse:
         """
-        Delete a Priority Intelligence Report
+        Delete a Priority Intelligence Requirement
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          priority_identifer: UUID
+          priority_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -194,12 +202,12 @@ def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not priority_identifer:
-            raise ValueError(f"Expected a non-empty value for `priority_identifer` but received {priority_identifer!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not priority_id:
+            raise ValueError(f"Expected a non-empty value for `priority_id` but received {priority_id!r}")
         return self._delete(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/priority/{priority_identifer}",
+            f"/accounts/{account_id}/cloudforce-one/requests/priority/{priority_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -208,23 +216,23 @@ def delete(
 
     def get(
         self,
-        priority_identifer: str,
+        priority_id: str,
         *,
-        account_identifier: str,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Item]:
         """
         Get a Priority Intelligence Requirement
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          priority_identifer: UUID
+          priority_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -234,12 +242,12 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not priority_identifer:
-            raise ValueError(f"Expected a non-empty value for `priority_identifer` but received {priority_identifer!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not priority_id:
+            raise ValueError(f"Expected a non-empty value for `priority_id` but received {priority_id!r}")
         return self._get(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/priority/{priority_identifer}",
+            f"/accounts/{account_id}/cloudforce-one/requests/priority/{priority_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -252,20 +260,20 @@ def get(
 
     def quota(
         self,
-        account_identifier: str,
         *,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Quota]:
         """
         Get Priority Intelligence Requirement Quota
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -275,10 +283,10 @@ def quota(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/priority/quota",
+            f"/accounts/{account_id}/cloudforce-one/requests/priority/quota",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -293,17 +301,28 @@ def quota(
 class AsyncPriorityResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPriorityResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPriorityResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPriorityResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPriorityResourceWithStreamingResponse(self)
 
     async def create(
         self,
-        account_identifier: str,
         *,
-        labels: List[Label],
+        account_id: str,
+        labels: SequenceNotStr[Label],
         priority: int,
         requirement: str,
         tlp: Literal["clear", "amber", "amber-strict", "green", "red"],
@@ -312,21 +331,21 @@ async def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Priority]:
         """
-        Create a New Priority Requirement
+        Create a New Priority Intelligence Requirement
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          labels: List of labels
+          labels: List of labels.
 
-          priority: Priority
+          priority: Priority.
 
-          requirement: Requirement
+          requirement: Requirement.
 
-          tlp: The CISA defined Traffic Light Protocol (TLP)
+          tlp: The CISA defined Traffic Light Protocol (TLP).
 
           extra_headers: Send extra headers
 
@@ -336,10 +355,10 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._post(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/priority/new",
+            f"/accounts/{account_id}/cloudforce-one/requests/priority/new",
             body=await async_maybe_transform(
                 {
                     "labels": labels,
@@ -361,10 +380,10 @@ async def create(
 
     async def update(
         self,
-        priority_identifer: str,
+        priority_id: str,
         *,
-        account_identifier: str,
-        labels: List[Label],
+        account_id: str,
+        labels: SequenceNotStr[Label],
         priority: int,
         requirement: str,
         tlp: Literal["clear", "amber", "amber-strict", "green", "red"],
@@ -373,23 +392,23 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Item]:
         """
         Update a Priority Intelligence Requirement
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          priority_identifer: UUID
+          priority_id: UUID.
 
-          labels: List of labels
+          labels: List of labels.
 
-          priority: Priority
+          priority: Priority.
 
-          requirement: Requirement
+          requirement: Requirement.
 
-          tlp: The CISA defined Traffic Light Protocol (TLP)
+          tlp: The CISA defined Traffic Light Protocol (TLP).
 
           extra_headers: Send extra headers
 
@@ -399,12 +418,12 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not priority_identifer:
-            raise ValueError(f"Expected a non-empty value for `priority_identifer` but received {priority_identifer!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not priority_id:
+            raise ValueError(f"Expected a non-empty value for `priority_id` but received {priority_id!r}")
         return await self._put(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/priority/{priority_identifer}",
+            f"/accounts/{account_id}/cloudforce-one/requests/priority/{priority_id}",
             body=await async_maybe_transform(
                 {
                     "labels": labels,
@@ -426,23 +445,23 @@ async def update(
 
     async def delete(
         self,
-        priority_identifer: str,
+        priority_id: str,
         *,
-        account_identifier: str,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PriorityDeleteResponse:
         """
-        Delete a Priority Intelligence Report
+        Delete a Priority Intelligence Requirement
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          priority_identifer: UUID
+          priority_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -452,12 +471,12 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not priority_identifer:
-            raise ValueError(f"Expected a non-empty value for `priority_identifer` but received {priority_identifer!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not priority_id:
+            raise ValueError(f"Expected a non-empty value for `priority_id` but received {priority_id!r}")
         return await self._delete(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/priority/{priority_identifer}",
+            f"/accounts/{account_id}/cloudforce-one/requests/priority/{priority_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -466,23 +485,23 @@ async def delete(
 
     async def get(
         self,
-        priority_identifer: str,
+        priority_id: str,
         *,
-        account_identifier: str,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Item]:
         """
         Get a Priority Intelligence Requirement
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          priority_identifer: UUID
+          priority_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -492,12 +511,12 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not priority_identifer:
-            raise ValueError(f"Expected a non-empty value for `priority_identifer` but received {priority_identifer!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not priority_id:
+            raise ValueError(f"Expected a non-empty value for `priority_id` but received {priority_id!r}")
         return await self._get(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/priority/{priority_identifer}",
+            f"/accounts/{account_id}/cloudforce-one/requests/priority/{priority_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -510,20 +529,20 @@ async def get(
 
     async def quota(
         self,
-        account_identifier: str,
         *,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Quota]:
         """
         Get Priority Intelligence Requirement Quota
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -533,10 +552,10 @@ async def quota(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._get(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/priority/quota",
+            f"/accounts/{account_id}/cloudforce-one/requests/priority/quota",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
diff --git a/src/cloudflare/resources/cloudforce_one/requests/requests.py b/src/cloudflare/resources/cloudforce_one/requests/requests.py
index 8d16022f5e3..232f8c6f8b2 100644
--- a/src/cloudflare/resources/cloudforce_one/requests/requests.py
+++ b/src/cloudflare/resources/cloudforce_one/requests/requests.py
@@ -8,6 +8,14 @@
 
 import httpx
 
+from .assets import (
+    AssetsResource,
+    AsyncAssetsResource,
+    AssetsResourceWithRawResponse,
+    AsyncAssetsResourceWithRawResponse,
+    AssetsResourceWithStreamingResponse,
+    AsyncAssetsResourceWithStreamingResponse,
+)
 from .message import (
     MessageResource,
     AsyncMessageResource,
@@ -24,11 +32,8 @@
     PriorityResourceWithStreamingResponse,
     AsyncPriorityResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -38,14 +43,14 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ....pagination import SyncSinglePage, AsyncSinglePage
 from ...._base_client import AsyncPaginator, make_request_options
 from ....types.cloudforce_one import request_list_params, request_create_params, request_update_params
 from ....types.cloudforce_one.item import Item
 from ....types.cloudforce_one.quota import Quota
 from ....types.cloudforce_one.list_item import ListItem
-from ....types.cloudforce_one.request_types import RequestTypes
 from ....types.cloudforce_one.request_constants import RequestConstants
+from ....types.cloudforce_one.request_types_response import RequestTypesResponse
 from ....types.cloudforce_one.request_delete_response import RequestDeleteResponse
 
 __all__ = ["RequestsResource", "AsyncRequestsResource"]
@@ -60,47 +65,62 @@ def message(self) -> MessageResource:
     def priority(self) -> PriorityResource:
         return PriorityResource(self._client)
 
+    @cached_property
+    def assets(self) -> AssetsResource:
+        return AssetsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> RequestsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RequestsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RequestsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RequestsResourceWithStreamingResponse(self)
 
     def create(
         self,
-        account_identifier: str,
         *,
-        content: str | NotGiven = NOT_GIVEN,
-        priority: str | NotGiven = NOT_GIVEN,
-        request_type: str | NotGiven = NOT_GIVEN,
-        summary: str | NotGiven = NOT_GIVEN,
-        tlp: Literal["clear", "amber", "amber-strict", "green", "red"] | NotGiven = NOT_GIVEN,
+        account_id: str,
+        content: str | Omit = omit,
+        priority: str | Omit = omit,
+        request_type: str | Omit = omit,
+        summary: str | Omit = omit,
+        tlp: Literal["clear", "amber", "amber-strict", "green", "red"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Item]:
         """
         Creating a request adds the request into the Cloudforce One queue for analysis.
         In addition to the content, a short title, type, priority, and releasability
-        should be provided. If one is not provided a default will be assigned.
+        should be provided. If one is not provided, a default will be assigned.
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          content: Request content
+          content: Request content.
 
-          priority: Priority for analyzing the request
+          priority: Priority for analyzing the request.
 
-          request_type: Requested information from request
+          request_type: Requested information from request.
 
-          summary: Brief description of the request
+          summary: Brief description of the request.
 
-          tlp: The CISA defined Traffic Light Protocol (TLP)
+          tlp: The CISA defined Traffic Light Protocol (TLP).
 
           extra_headers: Send extra headers
 
@@ -110,10 +130,10 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._post(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/new",
+            f"/accounts/{account_id}/cloudforce-one/requests/new",
             body=maybe_transform(
                 {
                     "content": content,
@@ -136,41 +156,41 @@ def create(
 
     def update(
         self,
-        request_identifier: str,
+        request_id: str,
         *,
-        account_identifier: str,
-        content: str | NotGiven = NOT_GIVEN,
-        priority: str | NotGiven = NOT_GIVEN,
-        request_type: str | NotGiven = NOT_GIVEN,
-        summary: str | NotGiven = NOT_GIVEN,
-        tlp: Literal["clear", "amber", "amber-strict", "green", "red"] | NotGiven = NOT_GIVEN,
+        account_id: str,
+        content: str | Omit = omit,
+        priority: str | Omit = omit,
+        request_type: str | Omit = omit,
+        summary: str | Omit = omit,
+        tlp: Literal["clear", "amber", "amber-strict", "green", "red"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Item]:
         """Updating a request alters the request in the Cloudforce One queue.
 
         This API may
         be used to update any attributes of the request after the initial submission.
-        Only fields that you choose to update need to be add to the request body
+        Only fields that you choose to update need to be add to the request body.
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          request_identifier: UUID
+          request_id: UUID.
 
-          content: Request content
+          content: Request content.
 
-          priority: Priority for analyzing the request
+          priority: Priority for analyzing the request.
 
-          request_type: Requested information from request
+          request_type: Requested information from request.
 
-          summary: Brief description of the request
+          summary: Brief description of the request.
 
-          tlp: The CISA defined Traffic Light Protocol (TLP)
+          tlp: The CISA defined Traffic Light Protocol (TLP).
 
           extra_headers: Send extra headers
 
@@ -180,12 +200,12 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not request_identifier:
-            raise ValueError(f"Expected a non-empty value for `request_identifier` but received {request_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
         return self._put(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}",
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}",
             body=maybe_transform(
                 {
                     "content": content,
@@ -208,50 +228,50 @@ def update(
 
     def list(
         self,
-        account_identifier: str,
         *,
+        account_id: str,
         page: int,
         per_page: int,
-        completed_after: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        completed_before: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        created_after: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        created_before: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        request_type: str | NotGiven = NOT_GIVEN,
-        sort_by: str | NotGiven = NOT_GIVEN,
-        sort_order: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        status: Literal["open", "accepted", "reported", "approved", "completed", "declined"] | NotGiven = NOT_GIVEN,
+        completed_after: Union[str, datetime] | Omit = omit,
+        completed_before: Union[str, datetime] | Omit = omit,
+        created_after: Union[str, datetime] | Omit = omit,
+        created_before: Union[str, datetime] | Omit = omit,
+        request_type: str | Omit = omit,
+        sort_by: str | Omit = omit,
+        sort_order: Literal["asc", "desc"] | Omit = omit,
+        status: Literal["open", "accepted", "reported", "approved", "completed", "declined"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePaginationArray[ListItem]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[ListItem]:
         """
         List Requests
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          page: Page number of results
+          page: Page number of results.
 
-          per_page: Number of results per page
+          per_page: Number of results per page.
 
-          completed_after: Retrieve requests completed after this time
+          completed_after: Retrieve requests completed after this time.
 
-          completed_before: Retrieve requests completed before this time
+          completed_before: Retrieve requests completed before this time.
 
-          created_after: Retrieve requests created after this time
+          created_after: Retrieve requests created after this time.
 
-          created_before: Retrieve requests created before this time
+          created_before: Retrieve requests created before this time.
 
-          request_type: Requested information from request
+          request_type: Requested information from request.
 
-          sort_by: Field to sort results by
+          sort_by: Field to sort results by.
 
-          sort_order: Sort order (asc or desc)
+          sort_order: Sort order (asc or desc).
 
-          status: Request Status
+          status: Request Status.
 
           extra_headers: Send extra headers
 
@@ -261,11 +281,11 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
-            f"/accounts/{account_identifier}/cloudforce-one/requests",
-            page=SyncV4PagePaginationArray[ListItem],
+            f"/accounts/{account_id}/cloudforce-one/requests",
+            page=SyncSinglePage[ListItem],
             body=maybe_transform(
                 {
                     "page": page,
@@ -290,23 +310,23 @@ def list(
 
     def delete(
         self,
-        request_identifier: str,
+        request_id: str,
         *,
-        account_identifier: str,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RequestDeleteResponse:
         """
         Delete a Request
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          request_identifier: UUID
+          request_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -316,12 +336,12 @@ def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not request_identifier:
-            raise ValueError(f"Expected a non-empty value for `request_identifier` but received {request_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
         return self._delete(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}",
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -330,20 +350,20 @@ def delete(
 
     def constants(
         self,
-        account_identifier: str,
         *,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RequestConstants]:
         """
         Get Request Priority, Status, and TLP constants
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -353,10 +373,10 @@ def constants(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/constants",
+            f"/accounts/{account_id}/cloudforce-one/requests/constants",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -369,23 +389,23 @@ def constants(
 
     def get(
         self,
-        request_identifier: str,
+        request_id: str,
         *,
-        account_identifier: str,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Item]:
         """
         Get a Request
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          request_identifier: UUID
+          request_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -395,12 +415,12 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not request_identifier:
-            raise ValueError(f"Expected a non-empty value for `request_identifier` but received {request_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
         return self._get(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}",
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -413,20 +433,20 @@ def get(
 
     def quota(
         self,
-        account_identifier: str,
         *,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Quota]:
         """
         Get Request Quota
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -436,10 +456,10 @@ def quota(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/quota",
+            f"/accounts/{account_id}/cloudforce-one/requests/quota",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -452,20 +472,20 @@ def quota(
 
     def types(
         self,
-        account_identifier: str,
         *,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RequestTypes]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[RequestTypesResponse]:
         """
         Get Request Types
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -475,18 +495,15 @@ def types(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        return self._get(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/types",
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/cloudforce-one/requests/types",
+            page=SyncSinglePage[RequestTypesResponse],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RequestTypes]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RequestTypes]], ResultWrapper[RequestTypes]),
+            model=str,
         )
 
 
@@ -499,47 +516,62 @@ def message(self) -> AsyncMessageResource:
     def priority(self) -> AsyncPriorityResource:
         return AsyncPriorityResource(self._client)
 
+    @cached_property
+    def assets(self) -> AsyncAssetsResource:
+        return AsyncAssetsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncRequestsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRequestsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRequestsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRequestsResourceWithStreamingResponse(self)
 
     async def create(
         self,
-        account_identifier: str,
         *,
-        content: str | NotGiven = NOT_GIVEN,
-        priority: str | NotGiven = NOT_GIVEN,
-        request_type: str | NotGiven = NOT_GIVEN,
-        summary: str | NotGiven = NOT_GIVEN,
-        tlp: Literal["clear", "amber", "amber-strict", "green", "red"] | NotGiven = NOT_GIVEN,
+        account_id: str,
+        content: str | Omit = omit,
+        priority: str | Omit = omit,
+        request_type: str | Omit = omit,
+        summary: str | Omit = omit,
+        tlp: Literal["clear", "amber", "amber-strict", "green", "red"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Item]:
         """
         Creating a request adds the request into the Cloudforce One queue for analysis.
         In addition to the content, a short title, type, priority, and releasability
-        should be provided. If one is not provided a default will be assigned.
+        should be provided. If one is not provided, a default will be assigned.
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          content: Request content
+          content: Request content.
 
-          priority: Priority for analyzing the request
+          priority: Priority for analyzing the request.
 
-          request_type: Requested information from request
+          request_type: Requested information from request.
 
-          summary: Brief description of the request
+          summary: Brief description of the request.
 
-          tlp: The CISA defined Traffic Light Protocol (TLP)
+          tlp: The CISA defined Traffic Light Protocol (TLP).
 
           extra_headers: Send extra headers
 
@@ -549,10 +581,10 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._post(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/new",
+            f"/accounts/{account_id}/cloudforce-one/requests/new",
             body=await async_maybe_transform(
                 {
                     "content": content,
@@ -575,41 +607,41 @@ async def create(
 
     async def update(
         self,
-        request_identifier: str,
+        request_id: str,
         *,
-        account_identifier: str,
-        content: str | NotGiven = NOT_GIVEN,
-        priority: str | NotGiven = NOT_GIVEN,
-        request_type: str | NotGiven = NOT_GIVEN,
-        summary: str | NotGiven = NOT_GIVEN,
-        tlp: Literal["clear", "amber", "amber-strict", "green", "red"] | NotGiven = NOT_GIVEN,
+        account_id: str,
+        content: str | Omit = omit,
+        priority: str | Omit = omit,
+        request_type: str | Omit = omit,
+        summary: str | Omit = omit,
+        tlp: Literal["clear", "amber", "amber-strict", "green", "red"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Item]:
         """Updating a request alters the request in the Cloudforce One queue.
 
         This API may
         be used to update any attributes of the request after the initial submission.
-        Only fields that you choose to update need to be add to the request body
+        Only fields that you choose to update need to be add to the request body.
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          request_identifier: UUID
+          request_id: UUID.
 
-          content: Request content
+          content: Request content.
 
-          priority: Priority for analyzing the request
+          priority: Priority for analyzing the request.
 
-          request_type: Requested information from request
+          request_type: Requested information from request.
 
-          summary: Brief description of the request
+          summary: Brief description of the request.
 
-          tlp: The CISA defined Traffic Light Protocol (TLP)
+          tlp: The CISA defined Traffic Light Protocol (TLP).
 
           extra_headers: Send extra headers
 
@@ -619,12 +651,12 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not request_identifier:
-            raise ValueError(f"Expected a non-empty value for `request_identifier` but received {request_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
         return await self._put(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}",
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}",
             body=await async_maybe_transform(
                 {
                     "content": content,
@@ -647,50 +679,50 @@ async def update(
 
     def list(
         self,
-        account_identifier: str,
         *,
+        account_id: str,
         page: int,
         per_page: int,
-        completed_after: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        completed_before: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        created_after: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        created_before: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        request_type: str | NotGiven = NOT_GIVEN,
-        sort_by: str | NotGiven = NOT_GIVEN,
-        sort_order: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        status: Literal["open", "accepted", "reported", "approved", "completed", "declined"] | NotGiven = NOT_GIVEN,
+        completed_after: Union[str, datetime] | Omit = omit,
+        completed_before: Union[str, datetime] | Omit = omit,
+        created_after: Union[str, datetime] | Omit = omit,
+        created_before: Union[str, datetime] | Omit = omit,
+        request_type: str | Omit = omit,
+        sort_by: str | Omit = omit,
+        sort_order: Literal["asc", "desc"] | Omit = omit,
+        status: Literal["open", "accepted", "reported", "approved", "completed", "declined"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[ListItem, AsyncV4PagePaginationArray[ListItem]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ListItem, AsyncSinglePage[ListItem]]:
         """
         List Requests
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          page: Page number of results
+          page: Page number of results.
 
-          per_page: Number of results per page
+          per_page: Number of results per page.
 
-          completed_after: Retrieve requests completed after this time
+          completed_after: Retrieve requests completed after this time.
 
-          completed_before: Retrieve requests completed before this time
+          completed_before: Retrieve requests completed before this time.
 
-          created_after: Retrieve requests created after this time
+          created_after: Retrieve requests created after this time.
 
-          created_before: Retrieve requests created before this time
+          created_before: Retrieve requests created before this time.
 
-          request_type: Requested information from request
+          request_type: Requested information from request.
 
-          sort_by: Field to sort results by
+          sort_by: Field to sort results by.
 
-          sort_order: Sort order (asc or desc)
+          sort_order: Sort order (asc or desc).
 
-          status: Request Status
+          status: Request Status.
 
           extra_headers: Send extra headers
 
@@ -700,11 +732,11 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
-            f"/accounts/{account_identifier}/cloudforce-one/requests",
-            page=AsyncV4PagePaginationArray[ListItem],
+            f"/accounts/{account_id}/cloudforce-one/requests",
+            page=AsyncSinglePage[ListItem],
             body=maybe_transform(
                 {
                     "page": page,
@@ -729,23 +761,23 @@ def list(
 
     async def delete(
         self,
-        request_identifier: str,
+        request_id: str,
         *,
-        account_identifier: str,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RequestDeleteResponse:
         """
         Delete a Request
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          request_identifier: UUID
+          request_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -755,12 +787,12 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not request_identifier:
-            raise ValueError(f"Expected a non-empty value for `request_identifier` but received {request_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
         return await self._delete(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}",
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -769,20 +801,20 @@ async def delete(
 
     async def constants(
         self,
-        account_identifier: str,
         *,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RequestConstants]:
         """
         Get Request Priority, Status, and TLP constants
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -792,10 +824,10 @@ async def constants(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._get(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/constants",
+            f"/accounts/{account_id}/cloudforce-one/requests/constants",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -808,23 +840,23 @@ async def constants(
 
     async def get(
         self,
-        request_identifier: str,
+        request_id: str,
         *,
-        account_identifier: str,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Item]:
         """
         Get a Request
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
-          request_identifier: UUID
+          request_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -834,12 +866,12 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not request_identifier:
-            raise ValueError(f"Expected a non-empty value for `request_identifier` but received {request_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not request_id:
+            raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}")
         return await self._get(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}",
+            f"/accounts/{account_id}/cloudforce-one/requests/{request_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -852,20 +884,20 @@ async def get(
 
     async def quota(
         self,
-        account_identifier: str,
         *,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Quota]:
         """
         Get Request Quota
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -875,10 +907,10 @@ async def quota(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._get(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/quota",
+            f"/accounts/{account_id}/cloudforce-one/requests/quota",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -889,22 +921,22 @@ async def quota(
             cast_to=cast(Type[Optional[Quota]], ResultWrapper[Quota]),
         )
 
-    async def types(
+    def types(
         self,
-        account_identifier: str,
         *,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RequestTypes]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[RequestTypesResponse, AsyncSinglePage[RequestTypesResponse]]:
         """
         Get Request Types
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -914,18 +946,15 @@ async def types(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        return await self._get(
-            f"/accounts/{account_identifier}/cloudforce-one/requests/types",
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/cloudforce-one/requests/types",
+            page=AsyncSinglePage[RequestTypesResponse],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RequestTypes]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RequestTypes]], ResultWrapper[RequestTypes]),
+            model=str,
         )
 
 
@@ -966,6 +995,10 @@ def message(self) -> MessageResourceWithRawResponse:
     def priority(self) -> PriorityResourceWithRawResponse:
         return PriorityResourceWithRawResponse(self._requests.priority)
 
+    @cached_property
+    def assets(self) -> AssetsResourceWithRawResponse:
+        return AssetsResourceWithRawResponse(self._requests.assets)
+
 
 class AsyncRequestsResourceWithRawResponse:
     def __init__(self, requests: AsyncRequestsResource) -> None:
@@ -1004,6 +1037,10 @@ def message(self) -> AsyncMessageResourceWithRawResponse:
     def priority(self) -> AsyncPriorityResourceWithRawResponse:
         return AsyncPriorityResourceWithRawResponse(self._requests.priority)
 
+    @cached_property
+    def assets(self) -> AsyncAssetsResourceWithRawResponse:
+        return AsyncAssetsResourceWithRawResponse(self._requests.assets)
+
 
 class RequestsResourceWithStreamingResponse:
     def __init__(self, requests: RequestsResource) -> None:
@@ -1042,6 +1079,10 @@ def message(self) -> MessageResourceWithStreamingResponse:
     def priority(self) -> PriorityResourceWithStreamingResponse:
         return PriorityResourceWithStreamingResponse(self._requests.priority)
 
+    @cached_property
+    def assets(self) -> AssetsResourceWithStreamingResponse:
+        return AssetsResourceWithStreamingResponse(self._requests.assets)
+
 
 class AsyncRequestsResourceWithStreamingResponse:
     def __init__(self, requests: AsyncRequestsResource) -> None:
@@ -1079,3 +1120,7 @@ def message(self) -> AsyncMessageResourceWithStreamingResponse:
     @cached_property
     def priority(self) -> AsyncPriorityResourceWithStreamingResponse:
         return AsyncPriorityResourceWithStreamingResponse(self._requests.priority)
+
+    @cached_property
+    def assets(self) -> AsyncAssetsResourceWithStreamingResponse:
+        return AsyncAssetsResourceWithStreamingResponse(self._requests.assets)
diff --git a/src/cloudflare/resources/cloudforce_one/scans/__init__.py b/src/cloudflare/resources/cloudforce_one/scans/__init__.py
new file mode 100644
index 00000000000..3f5bf4ecaaa
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/scans/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .scans import (
+    ScansResource,
+    AsyncScansResource,
+    ScansResourceWithRawResponse,
+    AsyncScansResourceWithRawResponse,
+    ScansResourceWithStreamingResponse,
+    AsyncScansResourceWithStreamingResponse,
+)
+from .config import (
+    ConfigResource,
+    AsyncConfigResource,
+    ConfigResourceWithRawResponse,
+    AsyncConfigResourceWithRawResponse,
+    ConfigResourceWithStreamingResponse,
+    AsyncConfigResourceWithStreamingResponse,
+)
+from .results import (
+    ResultsResource,
+    AsyncResultsResource,
+    ResultsResourceWithRawResponse,
+    AsyncResultsResourceWithRawResponse,
+    ResultsResourceWithStreamingResponse,
+    AsyncResultsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ResultsResource",
+    "AsyncResultsResource",
+    "ResultsResourceWithRawResponse",
+    "AsyncResultsResourceWithRawResponse",
+    "ResultsResourceWithStreamingResponse",
+    "AsyncResultsResourceWithStreamingResponse",
+    "ConfigResource",
+    "AsyncConfigResource",
+    "ConfigResourceWithRawResponse",
+    "AsyncConfigResourceWithRawResponse",
+    "ConfigResourceWithStreamingResponse",
+    "AsyncConfigResourceWithStreamingResponse",
+    "ScansResource",
+    "AsyncScansResource",
+    "ScansResourceWithRawResponse",
+    "AsyncScansResourceWithRawResponse",
+    "ScansResourceWithStreamingResponse",
+    "AsyncScansResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/cloudforce_one/scans/config.py b/src/cloudflare/resources/cloudforce_one/scans/config.py
new file mode 100644
index 00000000000..4f30d5341a1
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/scans/config.py
@@ -0,0 +1,547 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.cloudforce_one.scans import config_edit_params, config_create_params
+from ....types.cloudforce_one.scans.config_edit_response import ConfigEditResponse
+from ....types.cloudforce_one.scans.config_list_response import ConfigListResponse
+from ....types.cloudforce_one.scans.config_create_response import ConfigCreateResponse
+
+__all__ = ["ConfigResource", "AsyncConfigResource"]
+
+
+class ConfigResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ConfigResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ConfigResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ConfigResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ConfigResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        ips: SequenceNotStr[str],
+        frequency: float | Omit = omit,
+        ports: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConfigCreateResponse]:
+        """
+        Create a new Scan Config
+
+        Args:
+          account_id: Defines the Account ID.
+
+          ips: Defines a list of IP addresses or CIDR blocks to scan. The maximum number of
+              total IP addresses allowed is 5000.
+
+          frequency: Defines the number of days between each scan (0 = One-off scan).
+
+          ports: Defines a list of ports to scan. Valid values are:"default", "all", or a
+              comma-separated list of ports or range of ports (e.g. ["1-80", "443"]).
+              "default" scans the 100 most commonly open ports.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/cloudforce-one/scans/config",
+            body=maybe_transform(
+                {
+                    "ips": ips,
+                    "frequency": frequency,
+                    "ports": ports,
+                },
+                config_create_params.ConfigCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ConfigCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ConfigCreateResponse]], ResultWrapper[ConfigCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[ConfigListResponse]:
+        """
+        List Scan Configs
+
+        Args:
+          account_id: Defines the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/cloudforce-one/scans/config",
+            page=SyncSinglePage[ConfigListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=ConfigListResponse,
+        )
+
+    def delete(
+        self,
+        config_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Delete a Scan Config
+
+        Args:
+          account_id: Defines the Account ID.
+
+          config_id: Defines the Config ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not config_id:
+            raise ValueError(f"Expected a non-empty value for `config_id` but received {config_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/cloudforce-one/scans/config/{config_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def edit(
+        self,
+        config_id: str,
+        *,
+        account_id: str,
+        frequency: float | Omit = omit,
+        ips: SequenceNotStr[str] | Omit = omit,
+        ports: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConfigEditResponse]:
+        """
+        Update an existing Scan Config
+
+        Args:
+          account_id: Defines the Account ID.
+
+          config_id: Defines the Config ID.
+
+          frequency: Defines the number of days between each scan (0 = One-off scan).
+
+          ips: Defines a list of IP addresses or CIDR blocks to scan. The maximum number of
+              total IP addresses allowed is 5000.
+
+          ports: Defines a list of ports to scan. Valid values are:"default", "all", or a
+              comma-separated list of ports or range of ports (e.g. ["1-80", "443"]).
+              "default" scans the 100 most commonly open ports.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not config_id:
+            raise ValueError(f"Expected a non-empty value for `config_id` but received {config_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/cloudforce-one/scans/config/{config_id}",
+            body=maybe_transform(
+                {
+                    "frequency": frequency,
+                    "ips": ips,
+                    "ports": ports,
+                },
+                config_edit_params.ConfigEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ConfigEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ConfigEditResponse]], ResultWrapper[ConfigEditResponse]),
+        )
+
+
+class AsyncConfigResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncConfigResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncConfigResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncConfigResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncConfigResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        ips: SequenceNotStr[str],
+        frequency: float | Omit = omit,
+        ports: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConfigCreateResponse]:
+        """
+        Create a new Scan Config
+
+        Args:
+          account_id: Defines the Account ID.
+
+          ips: Defines a list of IP addresses or CIDR blocks to scan. The maximum number of
+              total IP addresses allowed is 5000.
+
+          frequency: Defines the number of days between each scan (0 = One-off scan).
+
+          ports: Defines a list of ports to scan. Valid values are:"default", "all", or a
+              comma-separated list of ports or range of ports (e.g. ["1-80", "443"]).
+              "default" scans the 100 most commonly open ports.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/cloudforce-one/scans/config",
+            body=await async_maybe_transform(
+                {
+                    "ips": ips,
+                    "frequency": frequency,
+                    "ports": ports,
+                },
+                config_create_params.ConfigCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ConfigCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ConfigCreateResponse]], ResultWrapper[ConfigCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ConfigListResponse, AsyncSinglePage[ConfigListResponse]]:
+        """
+        List Scan Configs
+
+        Args:
+          account_id: Defines the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/cloudforce-one/scans/config",
+            page=AsyncSinglePage[ConfigListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=ConfigListResponse,
+        )
+
+    async def delete(
+        self,
+        config_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Delete a Scan Config
+
+        Args:
+          account_id: Defines the Account ID.
+
+          config_id: Defines the Config ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not config_id:
+            raise ValueError(f"Expected a non-empty value for `config_id` but received {config_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/cloudforce-one/scans/config/{config_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def edit(
+        self,
+        config_id: str,
+        *,
+        account_id: str,
+        frequency: float | Omit = omit,
+        ips: SequenceNotStr[str] | Omit = omit,
+        ports: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConfigEditResponse]:
+        """
+        Update an existing Scan Config
+
+        Args:
+          account_id: Defines the Account ID.
+
+          config_id: Defines the Config ID.
+
+          frequency: Defines the number of days between each scan (0 = One-off scan).
+
+          ips: Defines a list of IP addresses or CIDR blocks to scan. The maximum number of
+              total IP addresses allowed is 5000.
+
+          ports: Defines a list of ports to scan. Valid values are:"default", "all", or a
+              comma-separated list of ports or range of ports (e.g. ["1-80", "443"]).
+              "default" scans the 100 most commonly open ports.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not config_id:
+            raise ValueError(f"Expected a non-empty value for `config_id` but received {config_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/cloudforce-one/scans/config/{config_id}",
+            body=await async_maybe_transform(
+                {
+                    "frequency": frequency,
+                    "ips": ips,
+                    "ports": ports,
+                },
+                config_edit_params.ConfigEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ConfigEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ConfigEditResponse]], ResultWrapper[ConfigEditResponse]),
+        )
+
+
+class ConfigResourceWithRawResponse:
+    def __init__(self, config: ConfigResource) -> None:
+        self._config = config
+
+        self.create = to_raw_response_wrapper(
+            config.create,
+        )
+        self.list = to_raw_response_wrapper(
+            config.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            config.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            config.edit,
+        )
+
+
+class AsyncConfigResourceWithRawResponse:
+    def __init__(self, config: AsyncConfigResource) -> None:
+        self._config = config
+
+        self.create = async_to_raw_response_wrapper(
+            config.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            config.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            config.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            config.edit,
+        )
+
+
+class ConfigResourceWithStreamingResponse:
+    def __init__(self, config: ConfigResource) -> None:
+        self._config = config
+
+        self.create = to_streamed_response_wrapper(
+            config.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            config.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            config.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            config.edit,
+        )
+
+
+class AsyncConfigResourceWithStreamingResponse:
+    def __init__(self, config: AsyncConfigResource) -> None:
+        self._config = config
+
+        self.create = async_to_streamed_response_wrapper(
+            config.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            config.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            config.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            config.edit,
+        )
diff --git a/src/cloudflare/resources/cloudforce_one/scans/results.py b/src/cloudflare/resources/cloudforce_one/scans/results.py
new file mode 100644
index 00000000000..30bc7294fd2
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/scans/results.py
@@ -0,0 +1,188 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.cloudforce_one.scans.result_get_response import ResultGetResponse
+
+__all__ = ["ResultsResource", "AsyncResultsResource"]
+
+
+class ResultsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ResultsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ResultsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ResultsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ResultsResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        config_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ResultGetResponse:
+        """
+        Get the Latest Scan Result
+
+        Args:
+          account_id: Defines the Account ID.
+
+          config_id: Defines the Config ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not config_id:
+            raise ValueError(f"Expected a non-empty value for `config_id` but received {config_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cloudforce-one/scans/results/{config_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ResultGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ResultGetResponse], ResultWrapper[ResultGetResponse]),
+        )
+
+
+class AsyncResultsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncResultsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncResultsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncResultsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncResultsResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        config_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ResultGetResponse:
+        """
+        Get the Latest Scan Result
+
+        Args:
+          account_id: Defines the Account ID.
+
+          config_id: Defines the Config ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not config_id:
+            raise ValueError(f"Expected a non-empty value for `config_id` but received {config_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cloudforce-one/scans/results/{config_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ResultGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ResultGetResponse], ResultWrapper[ResultGetResponse]),
+        )
+
+
+class ResultsResourceWithRawResponse:
+    def __init__(self, results: ResultsResource) -> None:
+        self._results = results
+
+        self.get = to_raw_response_wrapper(
+            results.get,
+        )
+
+
+class AsyncResultsResourceWithRawResponse:
+    def __init__(self, results: AsyncResultsResource) -> None:
+        self._results = results
+
+        self.get = async_to_raw_response_wrapper(
+            results.get,
+        )
+
+
+class ResultsResourceWithStreamingResponse:
+    def __init__(self, results: ResultsResource) -> None:
+        self._results = results
+
+        self.get = to_streamed_response_wrapper(
+            results.get,
+        )
+
+
+class AsyncResultsResourceWithStreamingResponse:
+    def __init__(self, results: AsyncResultsResource) -> None:
+        self._results = results
+
+        self.get = async_to_streamed_response_wrapper(
+            results.get,
+        )
diff --git a/src/cloudflare/resources/cloudforce_one/scans/scans.py b/src/cloudflare/resources/cloudforce_one/scans/scans.py
new file mode 100644
index 00000000000..ce6f9039bf9
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/scans/scans.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .config import (
+    ConfigResource,
+    AsyncConfigResource,
+    ConfigResourceWithRawResponse,
+    AsyncConfigResourceWithRawResponse,
+    ConfigResourceWithStreamingResponse,
+    AsyncConfigResourceWithStreamingResponse,
+)
+from .results import (
+    ResultsResource,
+    AsyncResultsResource,
+    ResultsResourceWithRawResponse,
+    AsyncResultsResourceWithRawResponse,
+    ResultsResourceWithStreamingResponse,
+    AsyncResultsResourceWithStreamingResponse,
+)
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["ScansResource", "AsyncScansResource"]
+
+
+class ScansResource(SyncAPIResource):
+    @cached_property
+    def results(self) -> ResultsResource:
+        return ResultsResource(self._client)
+
+    @cached_property
+    def config(self) -> ConfigResource:
+        return ConfigResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> ScansResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ScansResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ScansResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ScansResourceWithStreamingResponse(self)
+
+
+class AsyncScansResource(AsyncAPIResource):
+    @cached_property
+    def results(self) -> AsyncResultsResource:
+        return AsyncResultsResource(self._client)
+
+    @cached_property
+    def config(self) -> AsyncConfigResource:
+        return AsyncConfigResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncScansResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncScansResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncScansResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncScansResourceWithStreamingResponse(self)
+
+
+class ScansResourceWithRawResponse:
+    def __init__(self, scans: ScansResource) -> None:
+        self._scans = scans
+
+    @cached_property
+    def results(self) -> ResultsResourceWithRawResponse:
+        return ResultsResourceWithRawResponse(self._scans.results)
+
+    @cached_property
+    def config(self) -> ConfigResourceWithRawResponse:
+        return ConfigResourceWithRawResponse(self._scans.config)
+
+
+class AsyncScansResourceWithRawResponse:
+    def __init__(self, scans: AsyncScansResource) -> None:
+        self._scans = scans
+
+    @cached_property
+    def results(self) -> AsyncResultsResourceWithRawResponse:
+        return AsyncResultsResourceWithRawResponse(self._scans.results)
+
+    @cached_property
+    def config(self) -> AsyncConfigResourceWithRawResponse:
+        return AsyncConfigResourceWithRawResponse(self._scans.config)
+
+
+class ScansResourceWithStreamingResponse:
+    def __init__(self, scans: ScansResource) -> None:
+        self._scans = scans
+
+    @cached_property
+    def results(self) -> ResultsResourceWithStreamingResponse:
+        return ResultsResourceWithStreamingResponse(self._scans.results)
+
+    @cached_property
+    def config(self) -> ConfigResourceWithStreamingResponse:
+        return ConfigResourceWithStreamingResponse(self._scans.config)
+
+
+class AsyncScansResourceWithStreamingResponse:
+    def __init__(self, scans: AsyncScansResource) -> None:
+        self._scans = scans
+
+    @cached_property
+    def results(self) -> AsyncResultsResourceWithStreamingResponse:
+        return AsyncResultsResourceWithStreamingResponse(self._scans.results)
+
+    @cached_property
+    def config(self) -> AsyncConfigResourceWithStreamingResponse:
+        return AsyncConfigResourceWithStreamingResponse(self._scans.config)
diff --git a/src/cloudflare/resources/cloudforce_one/threat_events/__init__.py b/src/cloudflare/resources/cloudforce_one/threat_events/__init__.py
new file mode 100644
index 00000000000..6c1b93c2881
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/threat_events/__init__.py
@@ -0,0 +1,159 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .raw import (
+    RawResource,
+    AsyncRawResource,
+    RawResourceWithRawResponse,
+    AsyncRawResourceWithRawResponse,
+    RawResourceWithStreamingResponse,
+    AsyncRawResourceWithStreamingResponse,
+)
+from .tags import (
+    TagsResource,
+    AsyncTagsResource,
+    TagsResourceWithRawResponse,
+    AsyncTagsResourceWithRawResponse,
+    TagsResourceWithStreamingResponse,
+    AsyncTagsResourceWithStreamingResponse,
+)
+from .relate import (
+    RelateResource,
+    AsyncRelateResource,
+    RelateResourceWithRawResponse,
+    AsyncRelateResourceWithRawResponse,
+    RelateResourceWithStreamingResponse,
+    AsyncRelateResourceWithStreamingResponse,
+)
+from .datasets import (
+    DatasetsResource,
+    AsyncDatasetsResource,
+    DatasetsResourceWithRawResponse,
+    AsyncDatasetsResourceWithRawResponse,
+    DatasetsResourceWithStreamingResponse,
+    AsyncDatasetsResourceWithStreamingResponse,
+)
+from .attackers import (
+    AttackersResource,
+    AsyncAttackersResource,
+    AttackersResourceWithRawResponse,
+    AsyncAttackersResourceWithRawResponse,
+    AttackersResourceWithStreamingResponse,
+    AsyncAttackersResourceWithStreamingResponse,
+)
+from .countries import (
+    CountriesResource,
+    AsyncCountriesResource,
+    CountriesResourceWithRawResponse,
+    AsyncCountriesResourceWithRawResponse,
+    CountriesResourceWithStreamingResponse,
+    AsyncCountriesResourceWithStreamingResponse,
+)
+from .categories import (
+    CategoriesResource,
+    AsyncCategoriesResource,
+    CategoriesResourceWithRawResponse,
+    AsyncCategoriesResourceWithRawResponse,
+    CategoriesResourceWithStreamingResponse,
+    AsyncCategoriesResourceWithStreamingResponse,
+)
+from .event_tags import (
+    EventTagsResource,
+    AsyncEventTagsResource,
+    EventTagsResourceWithRawResponse,
+    AsyncEventTagsResourceWithRawResponse,
+    EventTagsResourceWithStreamingResponse,
+    AsyncEventTagsResourceWithStreamingResponse,
+)
+from .threat_events import (
+    ThreatEventsResource,
+    AsyncThreatEventsResource,
+    ThreatEventsResourceWithRawResponse,
+    AsyncThreatEventsResourceWithRawResponse,
+    ThreatEventsResourceWithStreamingResponse,
+    AsyncThreatEventsResourceWithStreamingResponse,
+)
+from .indicator_types import (
+    IndicatorTypesResource,
+    AsyncIndicatorTypesResource,
+    IndicatorTypesResourceWithRawResponse,
+    AsyncIndicatorTypesResourceWithRawResponse,
+    IndicatorTypesResourceWithStreamingResponse,
+    AsyncIndicatorTypesResourceWithStreamingResponse,
+)
+from .target_industries import (
+    TargetIndustriesResource,
+    AsyncTargetIndustriesResource,
+    TargetIndustriesResourceWithRawResponse,
+    AsyncTargetIndustriesResourceWithRawResponse,
+    TargetIndustriesResourceWithStreamingResponse,
+    AsyncTargetIndustriesResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "AttackersResource",
+    "AsyncAttackersResource",
+    "AttackersResourceWithRawResponse",
+    "AsyncAttackersResourceWithRawResponse",
+    "AttackersResourceWithStreamingResponse",
+    "AsyncAttackersResourceWithStreamingResponse",
+    "CategoriesResource",
+    "AsyncCategoriesResource",
+    "CategoriesResourceWithRawResponse",
+    "AsyncCategoriesResourceWithRawResponse",
+    "CategoriesResourceWithStreamingResponse",
+    "AsyncCategoriesResourceWithStreamingResponse",
+    "CountriesResource",
+    "AsyncCountriesResource",
+    "CountriesResourceWithRawResponse",
+    "AsyncCountriesResourceWithRawResponse",
+    "CountriesResourceWithStreamingResponse",
+    "AsyncCountriesResourceWithStreamingResponse",
+    "DatasetsResource",
+    "AsyncDatasetsResource",
+    "DatasetsResourceWithRawResponse",
+    "AsyncDatasetsResourceWithRawResponse",
+    "DatasetsResourceWithStreamingResponse",
+    "AsyncDatasetsResourceWithStreamingResponse",
+    "IndicatorTypesResource",
+    "AsyncIndicatorTypesResource",
+    "IndicatorTypesResourceWithRawResponse",
+    "AsyncIndicatorTypesResourceWithRawResponse",
+    "IndicatorTypesResourceWithStreamingResponse",
+    "AsyncIndicatorTypesResourceWithStreamingResponse",
+    "RawResource",
+    "AsyncRawResource",
+    "RawResourceWithRawResponse",
+    "AsyncRawResourceWithRawResponse",
+    "RawResourceWithStreamingResponse",
+    "AsyncRawResourceWithStreamingResponse",
+    "RelateResource",
+    "AsyncRelateResource",
+    "RelateResourceWithRawResponse",
+    "AsyncRelateResourceWithRawResponse",
+    "RelateResourceWithStreamingResponse",
+    "AsyncRelateResourceWithStreamingResponse",
+    "TagsResource",
+    "AsyncTagsResource",
+    "TagsResourceWithRawResponse",
+    "AsyncTagsResourceWithRawResponse",
+    "TagsResourceWithStreamingResponse",
+    "AsyncTagsResourceWithStreamingResponse",
+    "EventTagsResource",
+    "AsyncEventTagsResource",
+    "EventTagsResourceWithRawResponse",
+    "AsyncEventTagsResourceWithRawResponse",
+    "EventTagsResourceWithStreamingResponse",
+    "AsyncEventTagsResourceWithStreamingResponse",
+    "TargetIndustriesResource",
+    "AsyncTargetIndustriesResource",
+    "TargetIndustriesResourceWithRawResponse",
+    "AsyncTargetIndustriesResourceWithRawResponse",
+    "TargetIndustriesResourceWithStreamingResponse",
+    "AsyncTargetIndustriesResourceWithStreamingResponse",
+    "ThreatEventsResource",
+    "AsyncThreatEventsResource",
+    "ThreatEventsResourceWithRawResponse",
+    "AsyncThreatEventsResourceWithRawResponse",
+    "ThreatEventsResourceWithStreamingResponse",
+    "AsyncThreatEventsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/cloudforce_one/threat_events/attackers.py b/src/cloudflare/resources/cloudforce_one/threat_events/attackers.py
new file mode 100644
index 00000000000..657c8816f7e
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/threat_events/attackers.py
@@ -0,0 +1,187 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._base_client import make_request_options
+from ....types.cloudforce_one.threat_events import attacker_list_params
+from ....types.cloudforce_one.threat_events.attacker_list_response import AttackerListResponse
+
+__all__ = ["AttackersResource", "AsyncAttackersResource"]
+
+
+class AttackersResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AttackersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AttackersResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AttackersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AttackersResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        dataset_ids: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AttackerListResponse:
+        """
+        Lists attackers across multiple datasets
+
+        Args:
+          account_id: Account ID.
+
+          dataset_ids: Array of dataset IDs to query attackers from. If not provided, uses the default
+              dataset.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/attackers",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"dataset_ids": dataset_ids}, attacker_list_params.AttackerListParams),
+            ),
+            cast_to=AttackerListResponse,
+        )
+
+
+class AsyncAttackersResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncAttackersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAttackersResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAttackersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAttackersResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        *,
+        account_id: str,
+        dataset_ids: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AttackerListResponse:
+        """
+        Lists attackers across multiple datasets
+
+        Args:
+          account_id: Account ID.
+
+          dataset_ids: Array of dataset IDs to query attackers from. If not provided, uses the default
+              dataset.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/attackers",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"dataset_ids": dataset_ids}, attacker_list_params.AttackerListParams
+                ),
+            ),
+            cast_to=AttackerListResponse,
+        )
+
+
+class AttackersResourceWithRawResponse:
+    def __init__(self, attackers: AttackersResource) -> None:
+        self._attackers = attackers
+
+        self.list = to_raw_response_wrapper(
+            attackers.list,
+        )
+
+
+class AsyncAttackersResourceWithRawResponse:
+    def __init__(self, attackers: AsyncAttackersResource) -> None:
+        self._attackers = attackers
+
+        self.list = async_to_raw_response_wrapper(
+            attackers.list,
+        )
+
+
+class AttackersResourceWithStreamingResponse:
+    def __init__(self, attackers: AttackersResource) -> None:
+        self._attackers = attackers
+
+        self.list = to_streamed_response_wrapper(
+            attackers.list,
+        )
+
+
+class AsyncAttackersResourceWithStreamingResponse:
+    def __init__(self, attackers: AsyncAttackersResource) -> None:
+        self._attackers = attackers
+
+        self.list = async_to_streamed_response_wrapper(
+            attackers.list,
+        )
diff --git a/src/cloudflare/resources/cloudforce_one/threat_events/categories.py b/src/cloudflare/resources/cloudforce_one/threat_events/categories.py
new file mode 100644
index 00000000000..7190ab43560
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/threat_events/categories.py
@@ -0,0 +1,601 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._base_client import make_request_options
+from ....types.cloudforce_one.threat_events import category_edit_params, category_list_params, category_create_params
+from ....types.cloudforce_one.threat_events.category_get_response import CategoryGetResponse
+from ....types.cloudforce_one.threat_events.category_edit_response import CategoryEditResponse
+from ....types.cloudforce_one.threat_events.category_list_response import CategoryListResponse
+from ....types.cloudforce_one.threat_events.category_create_response import CategoryCreateResponse
+from ....types.cloudforce_one.threat_events.category_delete_response import CategoryDeleteResponse
+
+__all__ = ["CategoriesResource", "AsyncCategoriesResource"]
+
+
+class CategoriesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> CategoriesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CategoriesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CategoriesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CategoriesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        kill_chain: float,
+        name: str,
+        mitre_attack: SequenceNotStr[str] | Omit = omit,
+        shortname: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CategoryCreateResponse:
+        """
+        Creates a new category
+
+        Args:
+          account_id: Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/cloudforce-one/events/categories/create",
+            body=maybe_transform(
+                {
+                    "kill_chain": kill_chain,
+                    "name": name,
+                    "mitre_attack": mitre_attack,
+                    "shortname": shortname,
+                },
+                category_create_params.CategoryCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CategoryCreateResponse,
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        dataset_ids: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CategoryListResponse:
+        """
+        Lists categories across multiple datasets
+
+        Args:
+          account_id: Account ID.
+
+          dataset_ids: Array of dataset IDs to query categories from. If not provided, uses the default
+              dataset.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/categories",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"dataset_ids": dataset_ids}, category_list_params.CategoryListParams),
+            ),
+            cast_to=CategoryListResponse,
+        )
+
+    def delete(
+        self,
+        category_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CategoryDeleteResponse:
+        """
+        Deletes a category
+
+        Args:
+          account_id: Account ID.
+
+          category_id: Category UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not category_id:
+            raise ValueError(f"Expected a non-empty value for `category_id` but received {category_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/cloudforce-one/events/categories/{category_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CategoryDeleteResponse,
+        )
+
+    def edit(
+        self,
+        category_id: str,
+        *,
+        account_id: str,
+        kill_chain: float | Omit = omit,
+        mitre_attack: SequenceNotStr[str] | Omit = omit,
+        name: str | Omit = omit,
+        shortname: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CategoryEditResponse:
+        """
+        Updates a category
+
+        Args:
+          account_id: Account ID.
+
+          category_id: Category UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not category_id:
+            raise ValueError(f"Expected a non-empty value for `category_id` but received {category_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/cloudforce-one/events/categories/{category_id}",
+            body=maybe_transform(
+                {
+                    "kill_chain": kill_chain,
+                    "mitre_attack": mitre_attack,
+                    "name": name,
+                    "shortname": shortname,
+                },
+                category_edit_params.CategoryEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CategoryEditResponse,
+        )
+
+    def get(
+        self,
+        category_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CategoryGetResponse:
+        """
+        Reads a category
+
+        Args:
+          account_id: Account ID.
+
+          category_id: Category UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not category_id:
+            raise ValueError(f"Expected a non-empty value for `category_id` but received {category_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/categories/{category_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CategoryGetResponse,
+        )
+
+
+class AsyncCategoriesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncCategoriesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCategoriesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCategoriesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCategoriesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        kill_chain: float,
+        name: str,
+        mitre_attack: SequenceNotStr[str] | Omit = omit,
+        shortname: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CategoryCreateResponse:
+        """
+        Creates a new category
+
+        Args:
+          account_id: Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/cloudforce-one/events/categories/create",
+            body=await async_maybe_transform(
+                {
+                    "kill_chain": kill_chain,
+                    "name": name,
+                    "mitre_attack": mitre_attack,
+                    "shortname": shortname,
+                },
+                category_create_params.CategoryCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CategoryCreateResponse,
+        )
+
+    async def list(
+        self,
+        *,
+        account_id: str,
+        dataset_ids: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CategoryListResponse:
+        """
+        Lists categories across multiple datasets
+
+        Args:
+          account_id: Account ID.
+
+          dataset_ids: Array of dataset IDs to query categories from. If not provided, uses the default
+              dataset.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/categories",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"dataset_ids": dataset_ids}, category_list_params.CategoryListParams
+                ),
+            ),
+            cast_to=CategoryListResponse,
+        )
+
+    async def delete(
+        self,
+        category_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CategoryDeleteResponse:
+        """
+        Deletes a category
+
+        Args:
+          account_id: Account ID.
+
+          category_id: Category UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not category_id:
+            raise ValueError(f"Expected a non-empty value for `category_id` but received {category_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/cloudforce-one/events/categories/{category_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CategoryDeleteResponse,
+        )
+
+    async def edit(
+        self,
+        category_id: str,
+        *,
+        account_id: str,
+        kill_chain: float | Omit = omit,
+        mitre_attack: SequenceNotStr[str] | Omit = omit,
+        name: str | Omit = omit,
+        shortname: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CategoryEditResponse:
+        """
+        Updates a category
+
+        Args:
+          account_id: Account ID.
+
+          category_id: Category UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not category_id:
+            raise ValueError(f"Expected a non-empty value for `category_id` but received {category_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/cloudforce-one/events/categories/{category_id}",
+            body=await async_maybe_transform(
+                {
+                    "kill_chain": kill_chain,
+                    "mitre_attack": mitre_attack,
+                    "name": name,
+                    "shortname": shortname,
+                },
+                category_edit_params.CategoryEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CategoryEditResponse,
+        )
+
+    async def get(
+        self,
+        category_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CategoryGetResponse:
+        """
+        Reads a category
+
+        Args:
+          account_id: Account ID.
+
+          category_id: Category UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not category_id:
+            raise ValueError(f"Expected a non-empty value for `category_id` but received {category_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/categories/{category_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CategoryGetResponse,
+        )
+
+
+class CategoriesResourceWithRawResponse:
+    def __init__(self, categories: CategoriesResource) -> None:
+        self._categories = categories
+
+        self.create = to_raw_response_wrapper(
+            categories.create,
+        )
+        self.list = to_raw_response_wrapper(
+            categories.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            categories.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            categories.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            categories.get,
+        )
+
+
+class AsyncCategoriesResourceWithRawResponse:
+    def __init__(self, categories: AsyncCategoriesResource) -> None:
+        self._categories = categories
+
+        self.create = async_to_raw_response_wrapper(
+            categories.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            categories.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            categories.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            categories.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            categories.get,
+        )
+
+
+class CategoriesResourceWithStreamingResponse:
+    def __init__(self, categories: CategoriesResource) -> None:
+        self._categories = categories
+
+        self.create = to_streamed_response_wrapper(
+            categories.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            categories.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            categories.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            categories.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            categories.get,
+        )
+
+
+class AsyncCategoriesResourceWithStreamingResponse:
+    def __init__(self, categories: AsyncCategoriesResource) -> None:
+        self._categories = categories
+
+        self.create = async_to_streamed_response_wrapper(
+            categories.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            categories.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            categories.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            categories.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            categories.get,
+        )
diff --git a/src/cloudflare/resources/cloudforce_one/threat_events/countries.py b/src/cloudflare/resources/cloudforce_one/threat_events/countries.py
new file mode 100644
index 00000000000..c413c5650b4
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/threat_events/countries.py
@@ -0,0 +1,167 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._base_client import make_request_options
+from ....types.cloudforce_one.threat_events.country_list_response import CountryListResponse
+
+__all__ = ["CountriesResource", "AsyncCountriesResource"]
+
+
+class CountriesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> CountriesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CountriesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CountriesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CountriesResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CountryListResponse:
+        """
+        Retrieves countries information for all countries
+
+        Args:
+          account_id: Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/countries",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CountryListResponse,
+        )
+
+
+class AsyncCountriesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncCountriesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCountriesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCountriesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCountriesResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CountryListResponse:
+        """
+        Retrieves countries information for all countries
+
+        Args:
+          account_id: Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/countries",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CountryListResponse,
+        )
+
+
+class CountriesResourceWithRawResponse:
+    def __init__(self, countries: CountriesResource) -> None:
+        self._countries = countries
+
+        self.list = to_raw_response_wrapper(
+            countries.list,
+        )
+
+
+class AsyncCountriesResourceWithRawResponse:
+    def __init__(self, countries: AsyncCountriesResource) -> None:
+        self._countries = countries
+
+        self.list = async_to_raw_response_wrapper(
+            countries.list,
+        )
+
+
+class CountriesResourceWithStreamingResponse:
+    def __init__(self, countries: CountriesResource) -> None:
+        self._countries = countries
+
+        self.list = to_streamed_response_wrapper(
+            countries.list,
+        )
+
+
+class AsyncCountriesResourceWithStreamingResponse:
+    def __init__(self, countries: AsyncCountriesResource) -> None:
+        self._countries = countries
+
+        self.list = async_to_streamed_response_wrapper(
+            countries.list,
+        )
diff --git a/src/cloudflare/resources/cloudforce_one/threat_events/datasets/__init__.py b/src/cloudflare/resources/cloudforce_one/threat_events/datasets/__init__.py
new file mode 100644
index 00000000000..af825c8e995
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/threat_events/datasets/__init__.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .datasets import (
+    DatasetsResource,
+    AsyncDatasetsResource,
+    DatasetsResourceWithRawResponse,
+    AsyncDatasetsResourceWithRawResponse,
+    DatasetsResourceWithStreamingResponse,
+    AsyncDatasetsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "DatasetsResource",
+    "AsyncDatasetsResource",
+    "DatasetsResourceWithRawResponse",
+    "AsyncDatasetsResourceWithRawResponse",
+    "DatasetsResourceWithStreamingResponse",
+    "AsyncDatasetsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/cloudforce_one/threat_events/datasets/datasets.py b/src/cloudflare/resources/cloudforce_one/threat_events/datasets/datasets.py
new file mode 100644
index 00000000000..6a430786bc9
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/threat_events/datasets/datasets.py
@@ -0,0 +1,597 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ....._types import Body, Query, Headers, NotGiven, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._base_client import make_request_options
+from .....types.cloudforce_one.threat_events import dataset_edit_params, dataset_create_params
+from .....types.cloudforce_one.threat_events.dataset_get_response import DatasetGetResponse
+from .....types.cloudforce_one.threat_events.dataset_raw_response import DatasetRawResponse
+from .....types.cloudforce_one.threat_events.dataset_edit_response import DatasetEditResponse
+from .....types.cloudforce_one.threat_events.dataset_list_response import DatasetListResponse
+from .....types.cloudforce_one.threat_events.dataset_create_response import DatasetCreateResponse
+
+__all__ = ["DatasetsResource", "AsyncDatasetsResource"]
+
+
+class DatasetsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> DatasetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return DatasetsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> DatasetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return DatasetsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        is_public: bool,
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatasetCreateResponse:
+        """
+        Creates a dataset
+
+        Args:
+          account_id: Account ID.
+
+          is_public: If true, then anyone can search the dataset. If false, then its limited to the
+              account.
+
+          name: Used to describe the dataset within the account context.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/cloudforce-one/events/dataset/create",
+            body=maybe_transform(
+                {
+                    "is_public": is_public,
+                    "name": name,
+                },
+                dataset_create_params.DatasetCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DatasetCreateResponse,
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatasetListResponse:
+        """
+        Lists all datasets in an account
+
+        Args:
+          account_id: Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/dataset",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DatasetListResponse,
+        )
+
+    def edit(
+        self,
+        dataset_id: str,
+        *,
+        account_id: str,
+        is_public: bool,
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatasetEditResponse:
+        """
+        Updates an existing dataset
+
+        Args:
+          account_id: Account ID.
+
+          dataset_id: Dataset ID.
+
+          is_public: If true, then anyone can search the dataset. If false, then its limited to the
+              account.
+
+          name: Used to describe the dataset within the account context.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dataset_id:
+            raise ValueError(f"Expected a non-empty value for `dataset_id` but received {dataset_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}",
+            body=maybe_transform(
+                {
+                    "is_public": is_public,
+                    "name": name,
+                },
+                dataset_edit_params.DatasetEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DatasetEditResponse,
+        )
+
+    def get(
+        self,
+        dataset_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatasetGetResponse:
+        """
+        Reads a dataset
+
+        Args:
+          account_id: Account ID.
+
+          dataset_id: Dataset ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dataset_id:
+            raise ValueError(f"Expected a non-empty value for `dataset_id` but received {dataset_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DatasetGetResponse,
+        )
+
+    def raw(
+        self,
+        event_id: str,
+        *,
+        account_id: str,
+        dataset_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatasetRawResponse:
+        """
+        Reads data for a raw event
+
+        Args:
+          account_id: Account ID.
+
+          dataset_id: Dataset ID.
+
+          event_id: Event ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dataset_id:
+            raise ValueError(f"Expected a non-empty value for `dataset_id` but received {dataset_id!r}")
+        if not event_id:
+            raise ValueError(f"Expected a non-empty value for `event_id` but received {event_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/raw/{dataset_id}/{event_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DatasetRawResponse,
+        )
+
+
+class AsyncDatasetsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncDatasetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncDatasetsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncDatasetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncDatasetsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        is_public: bool,
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatasetCreateResponse:
+        """
+        Creates a dataset
+
+        Args:
+          account_id: Account ID.
+
+          is_public: If true, then anyone can search the dataset. If false, then its limited to the
+              account.
+
+          name: Used to describe the dataset within the account context.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/cloudforce-one/events/dataset/create",
+            body=await async_maybe_transform(
+                {
+                    "is_public": is_public,
+                    "name": name,
+                },
+                dataset_create_params.DatasetCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DatasetCreateResponse,
+        )
+
+    async def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatasetListResponse:
+        """
+        Lists all datasets in an account
+
+        Args:
+          account_id: Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/dataset",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DatasetListResponse,
+        )
+
+    async def edit(
+        self,
+        dataset_id: str,
+        *,
+        account_id: str,
+        is_public: bool,
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatasetEditResponse:
+        """
+        Updates an existing dataset
+
+        Args:
+          account_id: Account ID.
+
+          dataset_id: Dataset ID.
+
+          is_public: If true, then anyone can search the dataset. If false, then its limited to the
+              account.
+
+          name: Used to describe the dataset within the account context.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dataset_id:
+            raise ValueError(f"Expected a non-empty value for `dataset_id` but received {dataset_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}",
+            body=await async_maybe_transform(
+                {
+                    "is_public": is_public,
+                    "name": name,
+                },
+                dataset_edit_params.DatasetEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DatasetEditResponse,
+        )
+
+    async def get(
+        self,
+        dataset_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatasetGetResponse:
+        """
+        Reads a dataset
+
+        Args:
+          account_id: Account ID.
+
+          dataset_id: Dataset ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dataset_id:
+            raise ValueError(f"Expected a non-empty value for `dataset_id` but received {dataset_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/dataset/{dataset_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DatasetGetResponse,
+        )
+
+    async def raw(
+        self,
+        event_id: str,
+        *,
+        account_id: str,
+        dataset_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatasetRawResponse:
+        """
+        Reads data for a raw event
+
+        Args:
+          account_id: Account ID.
+
+          dataset_id: Dataset ID.
+
+          event_id: Event ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dataset_id:
+            raise ValueError(f"Expected a non-empty value for `dataset_id` but received {dataset_id!r}")
+        if not event_id:
+            raise ValueError(f"Expected a non-empty value for `event_id` but received {event_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/raw/{dataset_id}/{event_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DatasetRawResponse,
+        )
+
+
+class DatasetsResourceWithRawResponse:
+    def __init__(self, datasets: DatasetsResource) -> None:
+        self._datasets = datasets
+
+        self.create = to_raw_response_wrapper(
+            datasets.create,
+        )
+        self.list = to_raw_response_wrapper(
+            datasets.list,
+        )
+        self.edit = to_raw_response_wrapper(
+            datasets.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            datasets.get,
+        )
+        self.raw = to_raw_response_wrapper(
+            datasets.raw,
+        )
+
+
+class AsyncDatasetsResourceWithRawResponse:
+    def __init__(self, datasets: AsyncDatasetsResource) -> None:
+        self._datasets = datasets
+
+        self.create = async_to_raw_response_wrapper(
+            datasets.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            datasets.list,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            datasets.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            datasets.get,
+        )
+        self.raw = async_to_raw_response_wrapper(
+            datasets.raw,
+        )
+
+
+class DatasetsResourceWithStreamingResponse:
+    def __init__(self, datasets: DatasetsResource) -> None:
+        self._datasets = datasets
+
+        self.create = to_streamed_response_wrapper(
+            datasets.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            datasets.list,
+        )
+        self.edit = to_streamed_response_wrapper(
+            datasets.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            datasets.get,
+        )
+        self.raw = to_streamed_response_wrapper(
+            datasets.raw,
+        )
+
+
+class AsyncDatasetsResourceWithStreamingResponse:
+    def __init__(self, datasets: AsyncDatasetsResource) -> None:
+        self._datasets = datasets
+
+        self.create = async_to_streamed_response_wrapper(
+            datasets.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            datasets.list,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            datasets.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            datasets.get,
+        )
+        self.raw = async_to_streamed_response_wrapper(
+            datasets.raw,
+        )
diff --git a/src/cloudflare/resources/cloudforce_one/threat_events/event_tags.py b/src/cloudflare/resources/cloudforce_one/threat_events/event_tags.py
new file mode 100644
index 00000000000..67ce4f627f8
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/threat_events/event_tags.py
@@ -0,0 +1,295 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, SequenceNotStr, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.cloudforce_one.threat_events import event_tag_create_params
+from ....types.cloudforce_one.threat_events.event_tag_create_response import EventTagCreateResponse
+from ....types.cloudforce_one.threat_events.event_tag_delete_response import EventTagDeleteResponse
+
+__all__ = ["EventTagsResource", "AsyncEventTagsResource"]
+
+
+class EventTagsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> EventTagsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return EventTagsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> EventTagsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return EventTagsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        event_id: str,
+        *,
+        account_id: str,
+        tags: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EventTagCreateResponse:
+        """
+        Adds a tag to an event
+
+        Args:
+          account_id: Account ID.
+
+          event_id: Event UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not event_id:
+            raise ValueError(f"Expected a non-empty value for `event_id` but received {event_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/cloudforce-one/events/event_tag/{event_id}/create",
+            body=maybe_transform({"tags": tags}, event_tag_create_params.EventTagCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[EventTagCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[EventTagCreateResponse], ResultWrapper[EventTagCreateResponse]),
+        )
+
+    def delete(
+        self,
+        event_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EventTagDeleteResponse:
+        """
+        Removes a tag from an event
+
+        Args:
+          account_id: Account ID.
+
+          event_id: Event UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not event_id:
+            raise ValueError(f"Expected a non-empty value for `event_id` but received {event_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/cloudforce-one/events/event_tag/{event_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[EventTagDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[EventTagDeleteResponse], ResultWrapper[EventTagDeleteResponse]),
+        )
+
+
+class AsyncEventTagsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncEventTagsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncEventTagsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncEventTagsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncEventTagsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        event_id: str,
+        *,
+        account_id: str,
+        tags: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EventTagCreateResponse:
+        """
+        Adds a tag to an event
+
+        Args:
+          account_id: Account ID.
+
+          event_id: Event UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not event_id:
+            raise ValueError(f"Expected a non-empty value for `event_id` but received {event_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/cloudforce-one/events/event_tag/{event_id}/create",
+            body=await async_maybe_transform({"tags": tags}, event_tag_create_params.EventTagCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[EventTagCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[EventTagCreateResponse], ResultWrapper[EventTagCreateResponse]),
+        )
+
+    async def delete(
+        self,
+        event_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EventTagDeleteResponse:
+        """
+        Removes a tag from an event
+
+        Args:
+          account_id: Account ID.
+
+          event_id: Event UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not event_id:
+            raise ValueError(f"Expected a non-empty value for `event_id` but received {event_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/cloudforce-one/events/event_tag/{event_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[EventTagDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[EventTagDeleteResponse], ResultWrapper[EventTagDeleteResponse]),
+        )
+
+
+class EventTagsResourceWithRawResponse:
+    def __init__(self, event_tags: EventTagsResource) -> None:
+        self._event_tags = event_tags
+
+        self.create = to_raw_response_wrapper(
+            event_tags.create,
+        )
+        self.delete = to_raw_response_wrapper(
+            event_tags.delete,
+        )
+
+
+class AsyncEventTagsResourceWithRawResponse:
+    def __init__(self, event_tags: AsyncEventTagsResource) -> None:
+        self._event_tags = event_tags
+
+        self.create = async_to_raw_response_wrapper(
+            event_tags.create,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            event_tags.delete,
+        )
+
+
+class EventTagsResourceWithStreamingResponse:
+    def __init__(self, event_tags: EventTagsResource) -> None:
+        self._event_tags = event_tags
+
+        self.create = to_streamed_response_wrapper(
+            event_tags.create,
+        )
+        self.delete = to_streamed_response_wrapper(
+            event_tags.delete,
+        )
+
+
+class AsyncEventTagsResourceWithStreamingResponse:
+    def __init__(self, event_tags: AsyncEventTagsResource) -> None:
+        self._event_tags = event_tags
+
+        self.create = async_to_streamed_response_wrapper(
+            event_tags.create,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            event_tags.delete,
+        )
diff --git a/src/cloudflare/resources/cloudforce_one/threat_events/indicator_types.py b/src/cloudflare/resources/cloudforce_one/threat_events/indicator_types.py
new file mode 100644
index 00000000000..70e20938124
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/threat_events/indicator_types.py
@@ -0,0 +1,183 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import typing_extensions
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._base_client import make_request_options
+from ....types.cloudforce_one.threat_events.indicator_type_list_response import IndicatorTypeListResponse
+
+__all__ = ["IndicatorTypesResource", "AsyncIndicatorTypesResource"]
+
+
+class IndicatorTypesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> IndicatorTypesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return IndicatorTypesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> IndicatorTypesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return IndicatorTypesResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated("deprecated")
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> IndicatorTypeListResponse:
+        """This Method is deprecated.
+
+        Please use /events/dataset/:dataset_id/indicatorTypes
+        instead.
+
+        Args:
+          account_id: Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/indicatorTypes",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=IndicatorTypeListResponse,
+        )
+
+
+class AsyncIndicatorTypesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncIndicatorTypesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncIndicatorTypesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncIndicatorTypesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncIndicatorTypesResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated("deprecated")
+    async def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> IndicatorTypeListResponse:
+        """This Method is deprecated.
+
+        Please use /events/dataset/:dataset_id/indicatorTypes
+        instead.
+
+        Args:
+          account_id: Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/indicatorTypes",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=IndicatorTypeListResponse,
+        )
+
+
+class IndicatorTypesResourceWithRawResponse:
+    def __init__(self, indicator_types: IndicatorTypesResource) -> None:
+        self._indicator_types = indicator_types
+
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                indicator_types.list,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncIndicatorTypesResourceWithRawResponse:
+    def __init__(self, indicator_types: AsyncIndicatorTypesResource) -> None:
+        self._indicator_types = indicator_types
+
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                indicator_types.list,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class IndicatorTypesResourceWithStreamingResponse:
+    def __init__(self, indicator_types: IndicatorTypesResource) -> None:
+        self._indicator_types = indicator_types
+
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                indicator_types.list,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncIndicatorTypesResourceWithStreamingResponse:
+    def __init__(self, indicator_types: AsyncIndicatorTypesResource) -> None:
+        self._indicator_types = indicator_types
+
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                indicator_types.list,  # pyright: ignore[reportDeprecated],
+            )
+        )
diff --git a/src/cloudflare/resources/cloudforce_one/threat_events/raw.py b/src/cloudflare/resources/cloudforce_one/threat_events/raw.py
new file mode 100644
index 00000000000..d12ca4f7eeb
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/threat_events/raw.py
@@ -0,0 +1,314 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._base_client import make_request_options
+from ....types.cloudforce_one.threat_events import raw_edit_params
+from ....types.cloudforce_one.threat_events.raw_get_response import RawGetResponse
+from ....types.cloudforce_one.threat_events.raw_edit_response import RawEditResponse
+
+__all__ = ["RawResource", "AsyncRawResource"]
+
+
+class RawResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> RawResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return RawResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> RawResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return RawResourceWithStreamingResponse(self)
+
+    def edit(
+        self,
+        raw_id: str,
+        *,
+        account_id: str,
+        event_id: str,
+        data: object | Omit = omit,
+        source: str | Omit = omit,
+        tlp: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RawEditResponse:
+        """
+        Updates a raw event
+
+        Args:
+          account_id: Account ID.
+
+          event_id: Event UUID.
+
+          raw_id: Raw Event UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not event_id:
+            raise ValueError(f"Expected a non-empty value for `event_id` but received {event_id!r}")
+        if not raw_id:
+            raise ValueError(f"Expected a non-empty value for `raw_id` but received {raw_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/cloudforce-one/events/{event_id}/raw/{raw_id}",
+            body=maybe_transform(
+                {
+                    "data": data,
+                    "source": source,
+                    "tlp": tlp,
+                },
+                raw_edit_params.RawEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=RawEditResponse,
+        )
+
+    def get(
+        self,
+        raw_id: str,
+        *,
+        account_id: str,
+        event_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RawGetResponse:
+        """
+        Reads data for a raw event
+
+        Args:
+          account_id: Account ID.
+
+          event_id: Event UUID.
+
+          raw_id: Raw Event UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not event_id:
+            raise ValueError(f"Expected a non-empty value for `event_id` but received {event_id!r}")
+        if not raw_id:
+            raise ValueError(f"Expected a non-empty value for `raw_id` but received {raw_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/{event_id}/raw/{raw_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=RawGetResponse,
+        )
+
+
+class AsyncRawResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncRawResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncRawResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncRawResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncRawResourceWithStreamingResponse(self)
+
+    async def edit(
+        self,
+        raw_id: str,
+        *,
+        account_id: str,
+        event_id: str,
+        data: object | Omit = omit,
+        source: str | Omit = omit,
+        tlp: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RawEditResponse:
+        """
+        Updates a raw event
+
+        Args:
+          account_id: Account ID.
+
+          event_id: Event UUID.
+
+          raw_id: Raw Event UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not event_id:
+            raise ValueError(f"Expected a non-empty value for `event_id` but received {event_id!r}")
+        if not raw_id:
+            raise ValueError(f"Expected a non-empty value for `raw_id` but received {raw_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/cloudforce-one/events/{event_id}/raw/{raw_id}",
+            body=await async_maybe_transform(
+                {
+                    "data": data,
+                    "source": source,
+                    "tlp": tlp,
+                },
+                raw_edit_params.RawEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=RawEditResponse,
+        )
+
+    async def get(
+        self,
+        raw_id: str,
+        *,
+        account_id: str,
+        event_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RawGetResponse:
+        """
+        Reads data for a raw event
+
+        Args:
+          account_id: Account ID.
+
+          event_id: Event UUID.
+
+          raw_id: Raw Event UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not event_id:
+            raise ValueError(f"Expected a non-empty value for `event_id` but received {event_id!r}")
+        if not raw_id:
+            raise ValueError(f"Expected a non-empty value for `raw_id` but received {raw_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/{event_id}/raw/{raw_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=RawGetResponse,
+        )
+
+
+class RawResourceWithRawResponse:
+    def __init__(self, raw: RawResource) -> None:
+        self._raw = raw
+
+        self.edit = to_raw_response_wrapper(
+            raw.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            raw.get,
+        )
+
+
+class AsyncRawResourceWithRawResponse:
+    def __init__(self, raw: AsyncRawResource) -> None:
+        self._raw = raw
+
+        self.edit = async_to_raw_response_wrapper(
+            raw.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            raw.get,
+        )
+
+
+class RawResourceWithStreamingResponse:
+    def __init__(self, raw: RawResource) -> None:
+        self._raw = raw
+
+        self.edit = to_streamed_response_wrapper(
+            raw.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            raw.get,
+        )
+
+
+class AsyncRawResourceWithStreamingResponse:
+    def __init__(self, raw: AsyncRawResource) -> None:
+        self._raw = raw
+
+        self.edit = async_to_streamed_response_wrapper(
+            raw.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            raw.get,
+        )
diff --git a/src/cloudflare/resources/cloudforce_one/threat_events/relate.py b/src/cloudflare/resources/cloudforce_one/threat_events/relate.py
new file mode 100644
index 00000000000..bbadf4ae8f0
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/threat_events/relate.py
@@ -0,0 +1,188 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.cloudforce_one.threat_events.relate_delete_response import RelateDeleteResponse
+
+__all__ = ["RelateResource", "AsyncRelateResource"]
+
+
+class RelateResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> RelateResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return RelateResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> RelateResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return RelateResourceWithStreamingResponse(self)
+
+    def delete(
+        self,
+        event_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RelateDeleteResponse:
+        """
+        Removes an event reference
+
+        Args:
+          account_id: Account ID.
+
+          event_id: Event UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not event_id:
+            raise ValueError(f"Expected a non-empty value for `event_id` but received {event_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/cloudforce-one/events/relate/{event_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RelateDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[RelateDeleteResponse], ResultWrapper[RelateDeleteResponse]),
+        )
+
+
+class AsyncRelateResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncRelateResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncRelateResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncRelateResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncRelateResourceWithStreamingResponse(self)
+
+    async def delete(
+        self,
+        event_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RelateDeleteResponse:
+        """
+        Removes an event reference
+
+        Args:
+          account_id: Account ID.
+
+          event_id: Event UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not event_id:
+            raise ValueError(f"Expected a non-empty value for `event_id` but received {event_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/cloudforce-one/events/relate/{event_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RelateDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[RelateDeleteResponse], ResultWrapper[RelateDeleteResponse]),
+        )
+
+
+class RelateResourceWithRawResponse:
+    def __init__(self, relate: RelateResource) -> None:
+        self._relate = relate
+
+        self.delete = to_raw_response_wrapper(
+            relate.delete,
+        )
+
+
+class AsyncRelateResourceWithRawResponse:
+    def __init__(self, relate: AsyncRelateResource) -> None:
+        self._relate = relate
+
+        self.delete = async_to_raw_response_wrapper(
+            relate.delete,
+        )
+
+
+class RelateResourceWithStreamingResponse:
+    def __init__(self, relate: RelateResource) -> None:
+        self._relate = relate
+
+        self.delete = to_streamed_response_wrapper(
+            relate.delete,
+        )
+
+
+class AsyncRelateResourceWithStreamingResponse:
+    def __init__(self, relate: AsyncRelateResource) -> None:
+        self._relate = relate
+
+        self.delete = async_to_streamed_response_wrapper(
+            relate.delete,
+        )
diff --git a/src/cloudflare/resources/cloudforce_one/threat_events/tags.py b/src/cloudflare/resources/cloudforce_one/threat_events/tags.py
new file mode 100644
index 00000000000..bd3bdfee8dc
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/threat_events/tags.py
@@ -0,0 +1,243 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._base_client import make_request_options
+from ....types.cloudforce_one.threat_events import tag_create_params
+from ....types.cloudforce_one.threat_events.tag_create_response import TagCreateResponse
+
+__all__ = ["TagsResource", "AsyncTagsResource"]
+
+
+class TagsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> TagsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TagsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TagsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TagsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        value: str,
+        active_duration: str | Omit = omit,
+        actor_category: str | Omit = omit,
+        alias_group_names: SequenceNotStr[str] | Omit = omit,
+        alias_group_names_internal: SequenceNotStr[str] | Omit = omit,
+        analytic_priority: float | Omit = omit,
+        attribution_confidence: str | Omit = omit,
+        attribution_organization: str | Omit = omit,
+        category_uuid: str | Omit = omit,
+        external_reference_links: SequenceNotStr[str] | Omit = omit,
+        internal_description: str | Omit = omit,
+        motive: str | Omit = omit,
+        opsec_level: str | Omit = omit,
+        origin_country_iso: str | Omit = omit,
+        priority: float | Omit = omit,
+        sophistication_level: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TagCreateResponse:
+        """
+        Creates a new tag to be used accross threat events.
+
+        Args:
+          account_id: Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/cloudforce-one/events/tags/create",
+            body=maybe_transform(
+                {
+                    "value": value,
+                    "active_duration": active_duration,
+                    "actor_category": actor_category,
+                    "alias_group_names": alias_group_names,
+                    "alias_group_names_internal": alias_group_names_internal,
+                    "analytic_priority": analytic_priority,
+                    "attribution_confidence": attribution_confidence,
+                    "attribution_organization": attribution_organization,
+                    "category_uuid": category_uuid,
+                    "external_reference_links": external_reference_links,
+                    "internal_description": internal_description,
+                    "motive": motive,
+                    "opsec_level": opsec_level,
+                    "origin_country_iso": origin_country_iso,
+                    "priority": priority,
+                    "sophistication_level": sophistication_level,
+                },
+                tag_create_params.TagCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=TagCreateResponse,
+        )
+
+
+class AsyncTagsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncTagsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTagsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTagsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTagsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        value: str,
+        active_duration: str | Omit = omit,
+        actor_category: str | Omit = omit,
+        alias_group_names: SequenceNotStr[str] | Omit = omit,
+        alias_group_names_internal: SequenceNotStr[str] | Omit = omit,
+        analytic_priority: float | Omit = omit,
+        attribution_confidence: str | Omit = omit,
+        attribution_organization: str | Omit = omit,
+        category_uuid: str | Omit = omit,
+        external_reference_links: SequenceNotStr[str] | Omit = omit,
+        internal_description: str | Omit = omit,
+        motive: str | Omit = omit,
+        opsec_level: str | Omit = omit,
+        origin_country_iso: str | Omit = omit,
+        priority: float | Omit = omit,
+        sophistication_level: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TagCreateResponse:
+        """
+        Creates a new tag to be used accross threat events.
+
+        Args:
+          account_id: Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/cloudforce-one/events/tags/create",
+            body=await async_maybe_transform(
+                {
+                    "value": value,
+                    "active_duration": active_duration,
+                    "actor_category": actor_category,
+                    "alias_group_names": alias_group_names,
+                    "alias_group_names_internal": alias_group_names_internal,
+                    "analytic_priority": analytic_priority,
+                    "attribution_confidence": attribution_confidence,
+                    "attribution_organization": attribution_organization,
+                    "category_uuid": category_uuid,
+                    "external_reference_links": external_reference_links,
+                    "internal_description": internal_description,
+                    "motive": motive,
+                    "opsec_level": opsec_level,
+                    "origin_country_iso": origin_country_iso,
+                    "priority": priority,
+                    "sophistication_level": sophistication_level,
+                },
+                tag_create_params.TagCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=TagCreateResponse,
+        )
+
+
+class TagsResourceWithRawResponse:
+    def __init__(self, tags: TagsResource) -> None:
+        self._tags = tags
+
+        self.create = to_raw_response_wrapper(
+            tags.create,
+        )
+
+
+class AsyncTagsResourceWithRawResponse:
+    def __init__(self, tags: AsyncTagsResource) -> None:
+        self._tags = tags
+
+        self.create = async_to_raw_response_wrapper(
+            tags.create,
+        )
+
+
+class TagsResourceWithStreamingResponse:
+    def __init__(self, tags: TagsResource) -> None:
+        self._tags = tags
+
+        self.create = to_streamed_response_wrapper(
+            tags.create,
+        )
+
+
+class AsyncTagsResourceWithStreamingResponse:
+    def __init__(self, tags: AsyncTagsResource) -> None:
+        self._tags = tags
+
+        self.create = async_to_streamed_response_wrapper(
+            tags.create,
+        )
diff --git a/src/cloudflare/resources/cloudforce_one/threat_events/target_industries.py b/src/cloudflare/resources/cloudforce_one/threat_events/target_industries.py
new file mode 100644
index 00000000000..226c4e4394d
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/threat_events/target_industries.py
@@ -0,0 +1,189 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._base_client import make_request_options
+from ....types.cloudforce_one.threat_events import target_industry_list_params
+from ....types.cloudforce_one.threat_events.target_industry_list_response import TargetIndustryListResponse
+
+__all__ = ["TargetIndustriesResource", "AsyncTargetIndustriesResource"]
+
+
+class TargetIndustriesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> TargetIndustriesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TargetIndustriesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TargetIndustriesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TargetIndustriesResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        dataset_ids: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TargetIndustryListResponse:
+        """
+        Lists target industries across multiple datasets
+
+        Args:
+          account_id: Account ID.
+
+          dataset_ids: Array of dataset IDs to query target industries from. If not provided, uses the
+              default dataset.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/targetIndustries",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {"dataset_ids": dataset_ids}, target_industry_list_params.TargetIndustryListParams
+                ),
+            ),
+            cast_to=TargetIndustryListResponse,
+        )
+
+
+class AsyncTargetIndustriesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncTargetIndustriesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTargetIndustriesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTargetIndustriesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTargetIndustriesResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        *,
+        account_id: str,
+        dataset_ids: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TargetIndustryListResponse:
+        """
+        Lists target industries across multiple datasets
+
+        Args:
+          account_id: Account ID.
+
+          dataset_ids: Array of dataset IDs to query target industries from. If not provided, uses the
+              default dataset.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/targetIndustries",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"dataset_ids": dataset_ids}, target_industry_list_params.TargetIndustryListParams
+                ),
+            ),
+            cast_to=TargetIndustryListResponse,
+        )
+
+
+class TargetIndustriesResourceWithRawResponse:
+    def __init__(self, target_industries: TargetIndustriesResource) -> None:
+        self._target_industries = target_industries
+
+        self.list = to_raw_response_wrapper(
+            target_industries.list,
+        )
+
+
+class AsyncTargetIndustriesResourceWithRawResponse:
+    def __init__(self, target_industries: AsyncTargetIndustriesResource) -> None:
+        self._target_industries = target_industries
+
+        self.list = async_to_raw_response_wrapper(
+            target_industries.list,
+        )
+
+
+class TargetIndustriesResourceWithStreamingResponse:
+    def __init__(self, target_industries: TargetIndustriesResource) -> None:
+        self._target_industries = target_industries
+
+        self.list = to_streamed_response_wrapper(
+            target_industries.list,
+        )
+
+
+class AsyncTargetIndustriesResourceWithStreamingResponse:
+    def __init__(self, target_industries: AsyncTargetIndustriesResource) -> None:
+        self._target_industries = target_industries
+
+        self.list = async_to_streamed_response_wrapper(
+            target_industries.list,
+        )
diff --git a/src/cloudflare/resources/cloudforce_one/threat_events/threat_events.py b/src/cloudflare/resources/cloudforce_one/threat_events/threat_events.py
new file mode 100644
index 00000000000..a7192f4b7e3
--- /dev/null
+++ b/src/cloudflare/resources/cloudforce_one/threat_events/threat_events.py
@@ -0,0 +1,1234 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import typing_extensions
+from typing import Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from .raw import (
+    RawResource,
+    AsyncRawResource,
+    RawResourceWithRawResponse,
+    AsyncRawResourceWithRawResponse,
+    RawResourceWithStreamingResponse,
+    AsyncRawResourceWithStreamingResponse,
+)
+from .tags import (
+    TagsResource,
+    AsyncTagsResource,
+    TagsResourceWithRawResponse,
+    AsyncTagsResourceWithRawResponse,
+    TagsResourceWithStreamingResponse,
+    AsyncTagsResourceWithStreamingResponse,
+)
+from .relate import (
+    RelateResource,
+    AsyncRelateResource,
+    RelateResourceWithRawResponse,
+    AsyncRelateResourceWithRawResponse,
+    RelateResourceWithStreamingResponse,
+    AsyncRelateResourceWithStreamingResponse,
+)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from .attackers import (
+    AttackersResource,
+    AsyncAttackersResource,
+    AttackersResourceWithRawResponse,
+    AsyncAttackersResourceWithRawResponse,
+    AttackersResourceWithStreamingResponse,
+    AsyncAttackersResourceWithStreamingResponse,
+)
+from .countries import (
+    CountriesResource,
+    AsyncCountriesResource,
+    CountriesResourceWithRawResponse,
+    AsyncCountriesResourceWithRawResponse,
+    CountriesResourceWithStreamingResponse,
+    AsyncCountriesResourceWithStreamingResponse,
+)
+from ...._compat import cached_property
+from .categories import (
+    CategoriesResource,
+    AsyncCategoriesResource,
+    CategoriesResourceWithRawResponse,
+    AsyncCategoriesResourceWithRawResponse,
+    CategoriesResourceWithStreamingResponse,
+    AsyncCategoriesResourceWithStreamingResponse,
+)
+from .event_tags import (
+    EventTagsResource,
+    AsyncEventTagsResource,
+    EventTagsResourceWithRawResponse,
+    AsyncEventTagsResourceWithRawResponse,
+    EventTagsResourceWithStreamingResponse,
+    AsyncEventTagsResourceWithStreamingResponse,
+)
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._base_client import make_request_options
+from .indicator_types import (
+    IndicatorTypesResource,
+    AsyncIndicatorTypesResource,
+    IndicatorTypesResourceWithRawResponse,
+    AsyncIndicatorTypesResourceWithRawResponse,
+    IndicatorTypesResourceWithStreamingResponse,
+    AsyncIndicatorTypesResourceWithStreamingResponse,
+)
+from .datasets.datasets import (
+    DatasetsResource,
+    AsyncDatasetsResource,
+    DatasetsResourceWithRawResponse,
+    AsyncDatasetsResourceWithRawResponse,
+    DatasetsResourceWithStreamingResponse,
+    AsyncDatasetsResourceWithStreamingResponse,
+)
+from .target_industries import (
+    TargetIndustriesResource,
+    AsyncTargetIndustriesResource,
+    TargetIndustriesResourceWithRawResponse,
+    AsyncTargetIndustriesResourceWithRawResponse,
+    TargetIndustriesResourceWithStreamingResponse,
+    AsyncTargetIndustriesResourceWithStreamingResponse,
+)
+from ....types.cloudforce_one import (
+    threat_event_edit_params,
+    threat_event_list_params,
+    threat_event_create_params,
+    threat_event_bulk_create_params,
+)
+from ....types.cloudforce_one.threat_event_get_response import ThreatEventGetResponse
+from ....types.cloudforce_one.threat_event_edit_response import ThreatEventEditResponse
+from ....types.cloudforce_one.threat_event_list_response import ThreatEventListResponse
+from ....types.cloudforce_one.threat_event_create_response import ThreatEventCreateResponse
+from ....types.cloudforce_one.threat_event_delete_response import ThreatEventDeleteResponse
+from ....types.cloudforce_one.threat_event_bulk_create_response import ThreatEventBulkCreateResponse
+
+__all__ = ["ThreatEventsResource", "AsyncThreatEventsResource"]
+
+
+class ThreatEventsResource(SyncAPIResource):
+    @cached_property
+    def attackers(self) -> AttackersResource:
+        return AttackersResource(self._client)
+
+    @cached_property
+    def categories(self) -> CategoriesResource:
+        return CategoriesResource(self._client)
+
+    @cached_property
+    def countries(self) -> CountriesResource:
+        return CountriesResource(self._client)
+
+    @cached_property
+    def datasets(self) -> DatasetsResource:
+        return DatasetsResource(self._client)
+
+    @cached_property
+    def indicator_types(self) -> IndicatorTypesResource:
+        return IndicatorTypesResource(self._client)
+
+    @cached_property
+    def raw(self) -> RawResource:
+        return RawResource(self._client)
+
+    @cached_property
+    def relate(self) -> RelateResource:
+        return RelateResource(self._client)
+
+    @cached_property
+    def tags(self) -> TagsResource:
+        return TagsResource(self._client)
+
+    @cached_property
+    def event_tags(self) -> EventTagsResource:
+        return EventTagsResource(self._client)
+
+    @cached_property
+    def target_industries(self) -> TargetIndustriesResource:
+        return TargetIndustriesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> ThreatEventsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ThreatEventsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ThreatEventsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ThreatEventsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        path_account_id: str,
+        category: str,
+        date: Union[str, datetime],
+        event: str,
+        raw: threat_event_create_params.Raw,
+        tlp: str,
+        body_account_id: float | Omit = omit,
+        attacker: Optional[str] | Omit = omit,
+        attacker_country: str | Omit = omit,
+        dataset_id: str | Omit = omit,
+        indicator: str | Omit = omit,
+        indicators: Iterable[threat_event_create_params.Indicator] | Omit = omit,
+        indicator_type: str | Omit = omit,
+        insight: str | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        target_country: str | Omit = omit,
+        target_industry: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ThreatEventCreateResponse:
+        """
+        To create a dataset, see the
+        [`Create Dataset`](https://developers.cloudflare.com/api/resources/cloudforce_one/subresources/threat_events/subresources/datasets/methods/create/)
+        endpoint. When `datasetId` parameter is unspecified, it will be created in a
+        default dataset named `Cloudforce One Threat Events`.
+
+        Args:
+          path_account_id: Account ID.
+
+          indicators: Array of indicators for this event. Supports multiple indicators per event for
+              complex scenarios.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not path_account_id:
+            raise ValueError(f"Expected a non-empty value for `path_account_id` but received {path_account_id!r}")
+        return self._post(
+            f"/accounts/{path_account_id}/cloudforce-one/events/create",
+            body=maybe_transform(
+                {
+                    "category": category,
+                    "date": date,
+                    "event": event,
+                    "raw": raw,
+                    "tlp": tlp,
+                    "body_account_id": body_account_id,
+                    "attacker": attacker,
+                    "attacker_country": attacker_country,
+                    "dataset_id": dataset_id,
+                    "indicator": indicator,
+                    "indicators": indicators,
+                    "indicator_type": indicator_type,
+                    "insight": insight,
+                    "tags": tags,
+                    "target_country": target_country,
+                    "target_industry": target_industry,
+                },
+                threat_event_create_params.ThreatEventCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ThreatEventCreateResponse,
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        cursor: str | Omit = omit,
+        dataset_id: SequenceNotStr[str] | Omit = omit,
+        force_refresh: bool | Omit = omit,
+        format: Literal["json", "stix2"] | Omit = omit,
+        order: Literal["asc", "desc"] | Omit = omit,
+        order_by: str | Omit = omit,
+        page: float | Omit = omit,
+        page_size: float | Omit = omit,
+        search: Iterable[threat_event_list_params.Search] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ThreatEventListResponse:
+        """
+        When `datasetId` is unspecified, events will be listed from the
+        `Cloudforce One Threat Events` dataset. To list existing datasets (and their
+        IDs), use the
+        [`List Datasets`](https://developers.cloudflare.com/api/resources/cloudforce_one/subresources/threat_events/subresources/datasets/methods/list/)
+        endpoint). Also, must provide query parameters.
+
+        Args:
+          account_id: Account ID.
+
+          cursor: Cursor for pagination. When provided, filters are embedded in the cursor so you
+              only need to pass cursor and pageSize. Returned in the previous response's
+              result_info.cursor field. Use cursor-based pagination for deep pagination
+              (beyond 100,000 records) or for optimal performance.
+
+          page: Page number (1-indexed) for offset-based pagination. Limited to offset of
+              100,000 records. For deep pagination, use cursor-based pagination instead.
+
+          page_size: Number of results per page. Maximum 25,000.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cloudforce-one/events",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "cursor": cursor,
+                        "dataset_id": dataset_id,
+                        "force_refresh": force_refresh,
+                        "format": format,
+                        "order": order,
+                        "order_by": order_by,
+                        "page": page,
+                        "page_size": page_size,
+                        "search": search,
+                    },
+                    threat_event_list_params.ThreatEventListParams,
+                ),
+            ),
+            cast_to=ThreatEventListResponse,
+        )
+
+    def delete(
+        self,
+        event_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ThreatEventDeleteResponse:
+        """The `datasetId` parameter must be defined.
+
+        To list existing datasets (and their
+        IDs) in your account, use the
+        [`List Datasets`](https://developers.cloudflare.com/api/resources/cloudforce_one/subresources/threat_events/subresources/datasets/methods/list/)
+        endpoint.
+
+        Args:
+          account_id: Account ID.
+
+          event_id: Event UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not event_id:
+            raise ValueError(f"Expected a non-empty value for `event_id` but received {event_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/cloudforce-one/events/{event_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ThreatEventDeleteResponse,
+        )
+
+    def bulk_create(
+        self,
+        *,
+        account_id: str,
+        data: Iterable[threat_event_bulk_create_params.Data],
+        dataset_id: str,
+        include_created_events: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ThreatEventBulkCreateResponse:
+        """The `datasetId` parameter must be defined.
+
+        To list existing datasets (and their
+        IDs) in your account, use the
+        [`List Datasets`](https://developers.cloudflare.com/api/resources/cloudforce_one/subresources/threat_events/subresources/datasets/methods/list/)
+        endpoint.
+
+        Args:
+          account_id: Account ID.
+
+          include_created_events: When true, response includes array of created event UUIDs and shard IDs. Useful
+              for tracking which events were created and where.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/cloudforce-one/events/create/bulk",
+            body=maybe_transform(
+                {
+                    "data": data,
+                    "dataset_id": dataset_id,
+                    "include_created_events": include_created_events,
+                },
+                threat_event_bulk_create_params.ThreatEventBulkCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ThreatEventBulkCreateResponse,
+        )
+
+    def edit(
+        self,
+        event_id: str,
+        *,
+        account_id: str,
+        attacker: Optional[str] | Omit = omit,
+        attacker_country: str | Omit = omit,
+        category: str | Omit = omit,
+        created_at: Union[str, datetime] | Omit = omit,
+        dataset_id: str | Omit = omit,
+        date: Union[str, datetime] | Omit = omit,
+        event: str | Omit = omit,
+        indicator: str | Omit = omit,
+        indicator_type: str | Omit = omit,
+        insight: str | Omit = omit,
+        raw: threat_event_edit_params.Raw | Omit = omit,
+        target_country: str | Omit = omit,
+        target_industry: str | Omit = omit,
+        tlp: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ThreatEventEditResponse:
+        """
+        Updates an event
+
+        Args:
+          account_id: Account ID.
+
+          event_id: Event UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not event_id:
+            raise ValueError(f"Expected a non-empty value for `event_id` but received {event_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/cloudforce-one/events/{event_id}",
+            body=maybe_transform(
+                {
+                    "attacker": attacker,
+                    "attacker_country": attacker_country,
+                    "category": category,
+                    "created_at": created_at,
+                    "dataset_id": dataset_id,
+                    "date": date,
+                    "event": event,
+                    "indicator": indicator,
+                    "indicator_type": indicator_type,
+                    "insight": insight,
+                    "raw": raw,
+                    "target_country": target_country,
+                    "target_industry": target_industry,
+                    "tlp": tlp,
+                },
+                threat_event_edit_params.ThreatEventEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ThreatEventEditResponse,
+        )
+
+    @typing_extensions.deprecated("deprecated")
+    def get(
+        self,
+        event_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ThreatEventGetResponse:
+        """This Method is deprecated.
+
+        Please use
+        /events/dataset/:dataset_id/events/:event_id instead.
+
+        Args:
+          account_id: Account ID.
+
+          event_id: Event UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not event_id:
+            raise ValueError(f"Expected a non-empty value for `event_id` but received {event_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/{event_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ThreatEventGetResponse,
+        )
+
+
+class AsyncThreatEventsResource(AsyncAPIResource):
+    @cached_property
+    def attackers(self) -> AsyncAttackersResource:
+        return AsyncAttackersResource(self._client)
+
+    @cached_property
+    def categories(self) -> AsyncCategoriesResource:
+        return AsyncCategoriesResource(self._client)
+
+    @cached_property
+    def countries(self) -> AsyncCountriesResource:
+        return AsyncCountriesResource(self._client)
+
+    @cached_property
+    def datasets(self) -> AsyncDatasetsResource:
+        return AsyncDatasetsResource(self._client)
+
+    @cached_property
+    def indicator_types(self) -> AsyncIndicatorTypesResource:
+        return AsyncIndicatorTypesResource(self._client)
+
+    @cached_property
+    def raw(self) -> AsyncRawResource:
+        return AsyncRawResource(self._client)
+
+    @cached_property
+    def relate(self) -> AsyncRelateResource:
+        return AsyncRelateResource(self._client)
+
+    @cached_property
+    def tags(self) -> AsyncTagsResource:
+        return AsyncTagsResource(self._client)
+
+    @cached_property
+    def event_tags(self) -> AsyncEventTagsResource:
+        return AsyncEventTagsResource(self._client)
+
+    @cached_property
+    def target_industries(self) -> AsyncTargetIndustriesResource:
+        return AsyncTargetIndustriesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncThreatEventsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncThreatEventsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncThreatEventsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncThreatEventsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        path_account_id: str,
+        category: str,
+        date: Union[str, datetime],
+        event: str,
+        raw: threat_event_create_params.Raw,
+        tlp: str,
+        body_account_id: float | Omit = omit,
+        attacker: Optional[str] | Omit = omit,
+        attacker_country: str | Omit = omit,
+        dataset_id: str | Omit = omit,
+        indicator: str | Omit = omit,
+        indicators: Iterable[threat_event_create_params.Indicator] | Omit = omit,
+        indicator_type: str | Omit = omit,
+        insight: str | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        target_country: str | Omit = omit,
+        target_industry: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ThreatEventCreateResponse:
+        """
+        To create a dataset, see the
+        [`Create Dataset`](https://developers.cloudflare.com/api/resources/cloudforce_one/subresources/threat_events/subresources/datasets/methods/create/)
+        endpoint. When `datasetId` parameter is unspecified, it will be created in a
+        default dataset named `Cloudforce One Threat Events`.
+
+        Args:
+          path_account_id: Account ID.
+
+          indicators: Array of indicators for this event. Supports multiple indicators per event for
+              complex scenarios.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not path_account_id:
+            raise ValueError(f"Expected a non-empty value for `path_account_id` but received {path_account_id!r}")
+        return await self._post(
+            f"/accounts/{path_account_id}/cloudforce-one/events/create",
+            body=await async_maybe_transform(
+                {
+                    "category": category,
+                    "date": date,
+                    "event": event,
+                    "raw": raw,
+                    "tlp": tlp,
+                    "body_account_id": body_account_id,
+                    "attacker": attacker,
+                    "attacker_country": attacker_country,
+                    "dataset_id": dataset_id,
+                    "indicator": indicator,
+                    "indicators": indicators,
+                    "indicator_type": indicator_type,
+                    "insight": insight,
+                    "tags": tags,
+                    "target_country": target_country,
+                    "target_industry": target_industry,
+                },
+                threat_event_create_params.ThreatEventCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ThreatEventCreateResponse,
+        )
+
+    async def list(
+        self,
+        *,
+        account_id: str,
+        cursor: str | Omit = omit,
+        dataset_id: SequenceNotStr[str] | Omit = omit,
+        force_refresh: bool | Omit = omit,
+        format: Literal["json", "stix2"] | Omit = omit,
+        order: Literal["asc", "desc"] | Omit = omit,
+        order_by: str | Omit = omit,
+        page: float | Omit = omit,
+        page_size: float | Omit = omit,
+        search: Iterable[threat_event_list_params.Search] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ThreatEventListResponse:
+        """
+        When `datasetId` is unspecified, events will be listed from the
+        `Cloudforce One Threat Events` dataset. To list existing datasets (and their
+        IDs), use the
+        [`List Datasets`](https://developers.cloudflare.com/api/resources/cloudforce_one/subresources/threat_events/subresources/datasets/methods/list/)
+        endpoint). Also, must provide query parameters.
+
+        Args:
+          account_id: Account ID.
+
+          cursor: Cursor for pagination. When provided, filters are embedded in the cursor so you
+              only need to pass cursor and pageSize. Returned in the previous response's
+              result_info.cursor field. Use cursor-based pagination for deep pagination
+              (beyond 100,000 records) or for optimal performance.
+
+          page: Page number (1-indexed) for offset-based pagination. Limited to offset of
+              100,000 records. For deep pagination, use cursor-based pagination instead.
+
+          page_size: Number of results per page. Maximum 25,000.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cloudforce-one/events",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "cursor": cursor,
+                        "dataset_id": dataset_id,
+                        "force_refresh": force_refresh,
+                        "format": format,
+                        "order": order,
+                        "order_by": order_by,
+                        "page": page,
+                        "page_size": page_size,
+                        "search": search,
+                    },
+                    threat_event_list_params.ThreatEventListParams,
+                ),
+            ),
+            cast_to=ThreatEventListResponse,
+        )
+
+    async def delete(
+        self,
+        event_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ThreatEventDeleteResponse:
+        """The `datasetId` parameter must be defined.
+
+        To list existing datasets (and their
+        IDs) in your account, use the
+        [`List Datasets`](https://developers.cloudflare.com/api/resources/cloudforce_one/subresources/threat_events/subresources/datasets/methods/list/)
+        endpoint.
+
+        Args:
+          account_id: Account ID.
+
+          event_id: Event UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not event_id:
+            raise ValueError(f"Expected a non-empty value for `event_id` but received {event_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/cloudforce-one/events/{event_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ThreatEventDeleteResponse,
+        )
+
+    async def bulk_create(
+        self,
+        *,
+        account_id: str,
+        data: Iterable[threat_event_bulk_create_params.Data],
+        dataset_id: str,
+        include_created_events: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ThreatEventBulkCreateResponse:
+        """The `datasetId` parameter must be defined.
+
+        To list existing datasets (and their
+        IDs) in your account, use the
+        [`List Datasets`](https://developers.cloudflare.com/api/resources/cloudforce_one/subresources/threat_events/subresources/datasets/methods/list/)
+        endpoint.
+
+        Args:
+          account_id: Account ID.
+
+          include_created_events: When true, response includes array of created event UUIDs and shard IDs. Useful
+              for tracking which events were created and where.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/cloudforce-one/events/create/bulk",
+            body=await async_maybe_transform(
+                {
+                    "data": data,
+                    "dataset_id": dataset_id,
+                    "include_created_events": include_created_events,
+                },
+                threat_event_bulk_create_params.ThreatEventBulkCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ThreatEventBulkCreateResponse,
+        )
+
+    async def edit(
+        self,
+        event_id: str,
+        *,
+        account_id: str,
+        attacker: Optional[str] | Omit = omit,
+        attacker_country: str | Omit = omit,
+        category: str | Omit = omit,
+        created_at: Union[str, datetime] | Omit = omit,
+        dataset_id: str | Omit = omit,
+        date: Union[str, datetime] | Omit = omit,
+        event: str | Omit = omit,
+        indicator: str | Omit = omit,
+        indicator_type: str | Omit = omit,
+        insight: str | Omit = omit,
+        raw: threat_event_edit_params.Raw | Omit = omit,
+        target_country: str | Omit = omit,
+        target_industry: str | Omit = omit,
+        tlp: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ThreatEventEditResponse:
+        """
+        Updates an event
+
+        Args:
+          account_id: Account ID.
+
+          event_id: Event UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not event_id:
+            raise ValueError(f"Expected a non-empty value for `event_id` but received {event_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/cloudforce-one/events/{event_id}",
+            body=await async_maybe_transform(
+                {
+                    "attacker": attacker,
+                    "attacker_country": attacker_country,
+                    "category": category,
+                    "created_at": created_at,
+                    "dataset_id": dataset_id,
+                    "date": date,
+                    "event": event,
+                    "indicator": indicator,
+                    "indicator_type": indicator_type,
+                    "insight": insight,
+                    "raw": raw,
+                    "target_country": target_country,
+                    "target_industry": target_industry,
+                    "tlp": tlp,
+                },
+                threat_event_edit_params.ThreatEventEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ThreatEventEditResponse,
+        )
+
+    @typing_extensions.deprecated("deprecated")
+    async def get(
+        self,
+        event_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ThreatEventGetResponse:
+        """This Method is deprecated.
+
+        Please use
+        /events/dataset/:dataset_id/events/:event_id instead.
+
+        Args:
+          account_id: Account ID.
+
+          event_id: Event UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not event_id:
+            raise ValueError(f"Expected a non-empty value for `event_id` but received {event_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cloudforce-one/events/{event_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ThreatEventGetResponse,
+        )
+
+
+class ThreatEventsResourceWithRawResponse:
+    def __init__(self, threat_events: ThreatEventsResource) -> None:
+        self._threat_events = threat_events
+
+        self.create = to_raw_response_wrapper(
+            threat_events.create,
+        )
+        self.list = to_raw_response_wrapper(
+            threat_events.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            threat_events.delete,
+        )
+        self.bulk_create = to_raw_response_wrapper(
+            threat_events.bulk_create,
+        )
+        self.edit = to_raw_response_wrapper(
+            threat_events.edit,
+        )
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                threat_events.get,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+    @cached_property
+    def attackers(self) -> AttackersResourceWithRawResponse:
+        return AttackersResourceWithRawResponse(self._threat_events.attackers)
+
+    @cached_property
+    def categories(self) -> CategoriesResourceWithRawResponse:
+        return CategoriesResourceWithRawResponse(self._threat_events.categories)
+
+    @cached_property
+    def countries(self) -> CountriesResourceWithRawResponse:
+        return CountriesResourceWithRawResponse(self._threat_events.countries)
+
+    @cached_property
+    def datasets(self) -> DatasetsResourceWithRawResponse:
+        return DatasetsResourceWithRawResponse(self._threat_events.datasets)
+
+    @cached_property
+    def indicator_types(self) -> IndicatorTypesResourceWithRawResponse:
+        return IndicatorTypesResourceWithRawResponse(self._threat_events.indicator_types)
+
+    @cached_property
+    def raw(self) -> RawResourceWithRawResponse:
+        return RawResourceWithRawResponse(self._threat_events.raw)
+
+    @cached_property
+    def relate(self) -> RelateResourceWithRawResponse:
+        return RelateResourceWithRawResponse(self._threat_events.relate)
+
+    @cached_property
+    def tags(self) -> TagsResourceWithRawResponse:
+        return TagsResourceWithRawResponse(self._threat_events.tags)
+
+    @cached_property
+    def event_tags(self) -> EventTagsResourceWithRawResponse:
+        return EventTagsResourceWithRawResponse(self._threat_events.event_tags)
+
+    @cached_property
+    def target_industries(self) -> TargetIndustriesResourceWithRawResponse:
+        return TargetIndustriesResourceWithRawResponse(self._threat_events.target_industries)
+
+
+class AsyncThreatEventsResourceWithRawResponse:
+    def __init__(self, threat_events: AsyncThreatEventsResource) -> None:
+        self._threat_events = threat_events
+
+        self.create = async_to_raw_response_wrapper(
+            threat_events.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            threat_events.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            threat_events.delete,
+        )
+        self.bulk_create = async_to_raw_response_wrapper(
+            threat_events.bulk_create,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            threat_events.edit,
+        )
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                threat_events.get,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+    @cached_property
+    def attackers(self) -> AsyncAttackersResourceWithRawResponse:
+        return AsyncAttackersResourceWithRawResponse(self._threat_events.attackers)
+
+    @cached_property
+    def categories(self) -> AsyncCategoriesResourceWithRawResponse:
+        return AsyncCategoriesResourceWithRawResponse(self._threat_events.categories)
+
+    @cached_property
+    def countries(self) -> AsyncCountriesResourceWithRawResponse:
+        return AsyncCountriesResourceWithRawResponse(self._threat_events.countries)
+
+    @cached_property
+    def datasets(self) -> AsyncDatasetsResourceWithRawResponse:
+        return AsyncDatasetsResourceWithRawResponse(self._threat_events.datasets)
+
+    @cached_property
+    def indicator_types(self) -> AsyncIndicatorTypesResourceWithRawResponse:
+        return AsyncIndicatorTypesResourceWithRawResponse(self._threat_events.indicator_types)
+
+    @cached_property
+    def raw(self) -> AsyncRawResourceWithRawResponse:
+        return AsyncRawResourceWithRawResponse(self._threat_events.raw)
+
+    @cached_property
+    def relate(self) -> AsyncRelateResourceWithRawResponse:
+        return AsyncRelateResourceWithRawResponse(self._threat_events.relate)
+
+    @cached_property
+    def tags(self) -> AsyncTagsResourceWithRawResponse:
+        return AsyncTagsResourceWithRawResponse(self._threat_events.tags)
+
+    @cached_property
+    def event_tags(self) -> AsyncEventTagsResourceWithRawResponse:
+        return AsyncEventTagsResourceWithRawResponse(self._threat_events.event_tags)
+
+    @cached_property
+    def target_industries(self) -> AsyncTargetIndustriesResourceWithRawResponse:
+        return AsyncTargetIndustriesResourceWithRawResponse(self._threat_events.target_industries)
+
+
+class ThreatEventsResourceWithStreamingResponse:
+    def __init__(self, threat_events: ThreatEventsResource) -> None:
+        self._threat_events = threat_events
+
+        self.create = to_streamed_response_wrapper(
+            threat_events.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            threat_events.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            threat_events.delete,
+        )
+        self.bulk_create = to_streamed_response_wrapper(
+            threat_events.bulk_create,
+        )
+        self.edit = to_streamed_response_wrapper(
+            threat_events.edit,
+        )
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                threat_events.get,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+    @cached_property
+    def attackers(self) -> AttackersResourceWithStreamingResponse:
+        return AttackersResourceWithStreamingResponse(self._threat_events.attackers)
+
+    @cached_property
+    def categories(self) -> CategoriesResourceWithStreamingResponse:
+        return CategoriesResourceWithStreamingResponse(self._threat_events.categories)
+
+    @cached_property
+    def countries(self) -> CountriesResourceWithStreamingResponse:
+        return CountriesResourceWithStreamingResponse(self._threat_events.countries)
+
+    @cached_property
+    def datasets(self) -> DatasetsResourceWithStreamingResponse:
+        return DatasetsResourceWithStreamingResponse(self._threat_events.datasets)
+
+    @cached_property
+    def indicator_types(self) -> IndicatorTypesResourceWithStreamingResponse:
+        return IndicatorTypesResourceWithStreamingResponse(self._threat_events.indicator_types)
+
+    @cached_property
+    def raw(self) -> RawResourceWithStreamingResponse:
+        return RawResourceWithStreamingResponse(self._threat_events.raw)
+
+    @cached_property
+    def relate(self) -> RelateResourceWithStreamingResponse:
+        return RelateResourceWithStreamingResponse(self._threat_events.relate)
+
+    @cached_property
+    def tags(self) -> TagsResourceWithStreamingResponse:
+        return TagsResourceWithStreamingResponse(self._threat_events.tags)
+
+    @cached_property
+    def event_tags(self) -> EventTagsResourceWithStreamingResponse:
+        return EventTagsResourceWithStreamingResponse(self._threat_events.event_tags)
+
+    @cached_property
+    def target_industries(self) -> TargetIndustriesResourceWithStreamingResponse:
+        return TargetIndustriesResourceWithStreamingResponse(self._threat_events.target_industries)
+
+
+class AsyncThreatEventsResourceWithStreamingResponse:
+    def __init__(self, threat_events: AsyncThreatEventsResource) -> None:
+        self._threat_events = threat_events
+
+        self.create = async_to_streamed_response_wrapper(
+            threat_events.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            threat_events.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            threat_events.delete,
+        )
+        self.bulk_create = async_to_streamed_response_wrapper(
+            threat_events.bulk_create,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            threat_events.edit,
+        )
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                threat_events.get,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+    @cached_property
+    def attackers(self) -> AsyncAttackersResourceWithStreamingResponse:
+        return AsyncAttackersResourceWithStreamingResponse(self._threat_events.attackers)
+
+    @cached_property
+    def categories(self) -> AsyncCategoriesResourceWithStreamingResponse:
+        return AsyncCategoriesResourceWithStreamingResponse(self._threat_events.categories)
+
+    @cached_property
+    def countries(self) -> AsyncCountriesResourceWithStreamingResponse:
+        return AsyncCountriesResourceWithStreamingResponse(self._threat_events.countries)
+
+    @cached_property
+    def datasets(self) -> AsyncDatasetsResourceWithStreamingResponse:
+        return AsyncDatasetsResourceWithStreamingResponse(self._threat_events.datasets)
+
+    @cached_property
+    def indicator_types(self) -> AsyncIndicatorTypesResourceWithStreamingResponse:
+        return AsyncIndicatorTypesResourceWithStreamingResponse(self._threat_events.indicator_types)
+
+    @cached_property
+    def raw(self) -> AsyncRawResourceWithStreamingResponse:
+        return AsyncRawResourceWithStreamingResponse(self._threat_events.raw)
+
+    @cached_property
+    def relate(self) -> AsyncRelateResourceWithStreamingResponse:
+        return AsyncRelateResourceWithStreamingResponse(self._threat_events.relate)
+
+    @cached_property
+    def tags(self) -> AsyncTagsResourceWithStreamingResponse:
+        return AsyncTagsResourceWithStreamingResponse(self._threat_events.tags)
+
+    @cached_property
+    def event_tags(self) -> AsyncEventTagsResourceWithStreamingResponse:
+        return AsyncEventTagsResourceWithStreamingResponse(self._threat_events.event_tags)
+
+    @cached_property
+    def target_industries(self) -> AsyncTargetIndustriesResourceWithStreamingResponse:
+        return AsyncTargetIndustriesResourceWithStreamingResponse(self._threat_events.target_industries)
diff --git a/src/cloudflare/resources/connectivity/__init__.py b/src/cloudflare/resources/connectivity/__init__.py
new file mode 100644
index 00000000000..3cfa691be6c
--- /dev/null
+++ b/src/cloudflare/resources/connectivity/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .directory import (
+    DirectoryResource,
+    AsyncDirectoryResource,
+    DirectoryResourceWithRawResponse,
+    AsyncDirectoryResourceWithRawResponse,
+    DirectoryResourceWithStreamingResponse,
+    AsyncDirectoryResourceWithStreamingResponse,
+)
+from .connectivity import (
+    ConnectivityResource,
+    AsyncConnectivityResource,
+    ConnectivityResourceWithRawResponse,
+    AsyncConnectivityResourceWithRawResponse,
+    ConnectivityResourceWithStreamingResponse,
+    AsyncConnectivityResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "DirectoryResource",
+    "AsyncDirectoryResource",
+    "DirectoryResourceWithRawResponse",
+    "AsyncDirectoryResourceWithRawResponse",
+    "DirectoryResourceWithStreamingResponse",
+    "AsyncDirectoryResourceWithStreamingResponse",
+    "ConnectivityResource",
+    "AsyncConnectivityResource",
+    "ConnectivityResourceWithRawResponse",
+    "AsyncConnectivityResourceWithRawResponse",
+    "ConnectivityResourceWithStreamingResponse",
+    "AsyncConnectivityResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/connectivity/connectivity.py b/src/cloudflare/resources/connectivity/connectivity.py
new file mode 100644
index 00000000000..047c49072a3
--- /dev/null
+++ b/src/cloudflare/resources/connectivity/connectivity.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .directory.directory import (
+    DirectoryResource,
+    AsyncDirectoryResource,
+    DirectoryResourceWithRawResponse,
+    AsyncDirectoryResourceWithRawResponse,
+    DirectoryResourceWithStreamingResponse,
+    AsyncDirectoryResourceWithStreamingResponse,
+)
+
+__all__ = ["ConnectivityResource", "AsyncConnectivityResource"]
+
+
+class ConnectivityResource(SyncAPIResource):
+    @cached_property
+    def directory(self) -> DirectoryResource:
+        return DirectoryResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> ConnectivityResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ConnectivityResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ConnectivityResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ConnectivityResourceWithStreamingResponse(self)
+
+
+class AsyncConnectivityResource(AsyncAPIResource):
+    @cached_property
+    def directory(self) -> AsyncDirectoryResource:
+        return AsyncDirectoryResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncConnectivityResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncConnectivityResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncConnectivityResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncConnectivityResourceWithStreamingResponse(self)
+
+
+class ConnectivityResourceWithRawResponse:
+    def __init__(self, connectivity: ConnectivityResource) -> None:
+        self._connectivity = connectivity
+
+    @cached_property
+    def directory(self) -> DirectoryResourceWithRawResponse:
+        return DirectoryResourceWithRawResponse(self._connectivity.directory)
+
+
+class AsyncConnectivityResourceWithRawResponse:
+    def __init__(self, connectivity: AsyncConnectivityResource) -> None:
+        self._connectivity = connectivity
+
+    @cached_property
+    def directory(self) -> AsyncDirectoryResourceWithRawResponse:
+        return AsyncDirectoryResourceWithRawResponse(self._connectivity.directory)
+
+
+class ConnectivityResourceWithStreamingResponse:
+    def __init__(self, connectivity: ConnectivityResource) -> None:
+        self._connectivity = connectivity
+
+    @cached_property
+    def directory(self) -> DirectoryResourceWithStreamingResponse:
+        return DirectoryResourceWithStreamingResponse(self._connectivity.directory)
+
+
+class AsyncConnectivityResourceWithStreamingResponse:
+    def __init__(self, connectivity: AsyncConnectivityResource) -> None:
+        self._connectivity = connectivity
+
+    @cached_property
+    def directory(self) -> AsyncDirectoryResourceWithStreamingResponse:
+        return AsyncDirectoryResourceWithStreamingResponse(self._connectivity.directory)
diff --git a/src/cloudflare/resources/connectivity/directory/__init__.py b/src/cloudflare/resources/connectivity/directory/__init__.py
new file mode 100644
index 00000000000..80fc8709b04
--- /dev/null
+++ b/src/cloudflare/resources/connectivity/directory/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .services import (
+    ServicesResource,
+    AsyncServicesResource,
+    ServicesResourceWithRawResponse,
+    AsyncServicesResourceWithRawResponse,
+    ServicesResourceWithStreamingResponse,
+    AsyncServicesResourceWithStreamingResponse,
+)
+from .directory import (
+    DirectoryResource,
+    AsyncDirectoryResource,
+    DirectoryResourceWithRawResponse,
+    AsyncDirectoryResourceWithRawResponse,
+    DirectoryResourceWithStreamingResponse,
+    AsyncDirectoryResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ServicesResource",
+    "AsyncServicesResource",
+    "ServicesResourceWithRawResponse",
+    "AsyncServicesResourceWithRawResponse",
+    "ServicesResourceWithStreamingResponse",
+    "AsyncServicesResourceWithStreamingResponse",
+    "DirectoryResource",
+    "AsyncDirectoryResource",
+    "DirectoryResourceWithRawResponse",
+    "AsyncDirectoryResourceWithRawResponse",
+    "DirectoryResourceWithStreamingResponse",
+    "AsyncDirectoryResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/connectivity/directory/directory.py b/src/cloudflare/resources/connectivity/directory/directory.py
new file mode 100644
index 00000000000..d1abb26326d
--- /dev/null
+++ b/src/cloudflare/resources/connectivity/directory/directory.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .services import (
+    ServicesResource,
+    AsyncServicesResource,
+    ServicesResourceWithRawResponse,
+    AsyncServicesResourceWithRawResponse,
+    ServicesResourceWithStreamingResponse,
+    AsyncServicesResourceWithStreamingResponse,
+)
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["DirectoryResource", "AsyncDirectoryResource"]
+
+
+class DirectoryResource(SyncAPIResource):
+    @cached_property
+    def services(self) -> ServicesResource:
+        return ServicesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> DirectoryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return DirectoryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> DirectoryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return DirectoryResourceWithStreamingResponse(self)
+
+
+class AsyncDirectoryResource(AsyncAPIResource):
+    @cached_property
+    def services(self) -> AsyncServicesResource:
+        return AsyncServicesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncDirectoryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncDirectoryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncDirectoryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncDirectoryResourceWithStreamingResponse(self)
+
+
+class DirectoryResourceWithRawResponse:
+    def __init__(self, directory: DirectoryResource) -> None:
+        self._directory = directory
+
+    @cached_property
+    def services(self) -> ServicesResourceWithRawResponse:
+        return ServicesResourceWithRawResponse(self._directory.services)
+
+
+class AsyncDirectoryResourceWithRawResponse:
+    def __init__(self, directory: AsyncDirectoryResource) -> None:
+        self._directory = directory
+
+    @cached_property
+    def services(self) -> AsyncServicesResourceWithRawResponse:
+        return AsyncServicesResourceWithRawResponse(self._directory.services)
+
+
+class DirectoryResourceWithStreamingResponse:
+    def __init__(self, directory: DirectoryResource) -> None:
+        self._directory = directory
+
+    @cached_property
+    def services(self) -> ServicesResourceWithStreamingResponse:
+        return ServicesResourceWithStreamingResponse(self._directory.services)
+
+
+class AsyncDirectoryResourceWithStreamingResponse:
+    def __init__(self, directory: AsyncDirectoryResource) -> None:
+        self._directory = directory
+
+    @cached_property
+    def services(self) -> AsyncServicesResourceWithStreamingResponse:
+        return AsyncServicesResourceWithStreamingResponse(self._directory.services)
diff --git a/src/cloudflare/resources/connectivity/directory/services.py b/src/cloudflare/resources/connectivity/directory/services.py
new file mode 100644
index 00000000000..c78911cc7fa
--- /dev/null
+++ b/src/cloudflare/resources/connectivity/directory/services.py
@@ -0,0 +1,635 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.connectivity.directory import service_list_params, service_create_params, service_update_params
+from ....types.connectivity.directory.service_get_response import ServiceGetResponse
+from ....types.connectivity.directory.service_list_response import ServiceListResponse
+from ....types.connectivity.directory.service_create_response import ServiceCreateResponse
+from ....types.connectivity.directory.service_update_response import ServiceUpdateResponse
+
+__all__ = ["ServicesResource", "AsyncServicesResource"]
+
+
+class ServicesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ServicesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ServicesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ServicesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ServicesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        host: service_create_params.Host,
+        name: str,
+        type: Literal["http"],
+        http_port: Optional[int] | Omit = omit,
+        https_port: Optional[int] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ServiceCreateResponse]:
+        """
+        Create connectivity service
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/connectivity/directory/services",
+            body=maybe_transform(
+                {
+                    "host": host,
+                    "name": name,
+                    "type": type,
+                    "http_port": http_port,
+                    "https_port": https_port,
+                },
+                service_create_params.ServiceCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ServiceCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ServiceCreateResponse]], ResultWrapper[ServiceCreateResponse]),
+        )
+
+    def update(
+        self,
+        service_id: str,
+        *,
+        account_id: str,
+        host: service_update_params.Host,
+        name: str,
+        type: Literal["http"],
+        http_port: Optional[int] | Omit = omit,
+        https_port: Optional[int] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ServiceUpdateResponse]:
+        """
+        Update connectivity service
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not service_id:
+            raise ValueError(f"Expected a non-empty value for `service_id` but received {service_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/connectivity/directory/services/{service_id}",
+            body=maybe_transform(
+                {
+                    "host": host,
+                    "name": name,
+                    "type": type,
+                    "http_port": http_port,
+                    "https_port": https_port,
+                },
+                service_update_params.ServiceUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ServiceUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ServiceUpdateResponse]], ResultWrapper[ServiceUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        type: Optional[Literal["http"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[ServiceListResponse]:
+        """
+        List connectivity services
+
+        Args:
+          account_id: Account identifier
+
+          page: Current page in the response
+
+          per_page: Max amount of entries returned per page
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/connectivity/directory/services",
+            page=SyncV4PagePaginationArray[ServiceListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "type": type,
+                    },
+                    service_list_params.ServiceListParams,
+                ),
+            ),
+            model=ServiceListResponse,
+        )
+
+    def delete(
+        self,
+        service_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Delete connectivity service
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not service_id:
+            raise ValueError(f"Expected a non-empty value for `service_id` but received {service_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._delete(
+            f"/accounts/{account_id}/connectivity/directory/services/{service_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    def get(
+        self,
+        service_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ServiceGetResponse]:
+        """
+        Get connectivity service
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not service_id:
+            raise ValueError(f"Expected a non-empty value for `service_id` but received {service_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/connectivity/directory/services/{service_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ServiceGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ServiceGetResponse]], ResultWrapper[ServiceGetResponse]),
+        )
+
+
+class AsyncServicesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncServicesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncServicesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncServicesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncServicesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        host: service_create_params.Host,
+        name: str,
+        type: Literal["http"],
+        http_port: Optional[int] | Omit = omit,
+        https_port: Optional[int] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ServiceCreateResponse]:
+        """
+        Create connectivity service
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/connectivity/directory/services",
+            body=await async_maybe_transform(
+                {
+                    "host": host,
+                    "name": name,
+                    "type": type,
+                    "http_port": http_port,
+                    "https_port": https_port,
+                },
+                service_create_params.ServiceCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ServiceCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ServiceCreateResponse]], ResultWrapper[ServiceCreateResponse]),
+        )
+
+    async def update(
+        self,
+        service_id: str,
+        *,
+        account_id: str,
+        host: service_update_params.Host,
+        name: str,
+        type: Literal["http"],
+        http_port: Optional[int] | Omit = omit,
+        https_port: Optional[int] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ServiceUpdateResponse]:
+        """
+        Update connectivity service
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not service_id:
+            raise ValueError(f"Expected a non-empty value for `service_id` but received {service_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/connectivity/directory/services/{service_id}",
+            body=await async_maybe_transform(
+                {
+                    "host": host,
+                    "name": name,
+                    "type": type,
+                    "http_port": http_port,
+                    "https_port": https_port,
+                },
+                service_update_params.ServiceUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ServiceUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ServiceUpdateResponse]], ResultWrapper[ServiceUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        type: Optional[Literal["http"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ServiceListResponse, AsyncV4PagePaginationArray[ServiceListResponse]]:
+        """
+        List connectivity services
+
+        Args:
+          account_id: Account identifier
+
+          page: Current page in the response
+
+          per_page: Max amount of entries returned per page
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/connectivity/directory/services",
+            page=AsyncV4PagePaginationArray[ServiceListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "type": type,
+                    },
+                    service_list_params.ServiceListParams,
+                ),
+            ),
+            model=ServiceListResponse,
+        )
+
+    async def delete(
+        self,
+        service_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Delete connectivity service
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not service_id:
+            raise ValueError(f"Expected a non-empty value for `service_id` but received {service_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._delete(
+            f"/accounts/{account_id}/connectivity/directory/services/{service_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    async def get(
+        self,
+        service_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ServiceGetResponse]:
+        """
+        Get connectivity service
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not service_id:
+            raise ValueError(f"Expected a non-empty value for `service_id` but received {service_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/connectivity/directory/services/{service_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ServiceGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ServiceGetResponse]], ResultWrapper[ServiceGetResponse]),
+        )
+
+
+class ServicesResourceWithRawResponse:
+    def __init__(self, services: ServicesResource) -> None:
+        self._services = services
+
+        self.create = to_raw_response_wrapper(
+            services.create,
+        )
+        self.update = to_raw_response_wrapper(
+            services.update,
+        )
+        self.list = to_raw_response_wrapper(
+            services.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            services.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            services.get,
+        )
+
+
+class AsyncServicesResourceWithRawResponse:
+    def __init__(self, services: AsyncServicesResource) -> None:
+        self._services = services
+
+        self.create = async_to_raw_response_wrapper(
+            services.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            services.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            services.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            services.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            services.get,
+        )
+
+
+class ServicesResourceWithStreamingResponse:
+    def __init__(self, services: ServicesResource) -> None:
+        self._services = services
+
+        self.create = to_streamed_response_wrapper(
+            services.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            services.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            services.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            services.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            services.get,
+        )
+
+
+class AsyncServicesResourceWithStreamingResponse:
+    def __init__(self, services: AsyncServicesResource) -> None:
+        self._services = services
+
+        self.create = async_to_streamed_response_wrapper(
+            services.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            services.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            services.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            services.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            services.get,
+        )
diff --git a/src/cloudflare/resources/content_scanning/__init__.py b/src/cloudflare/resources/content_scanning/__init__.py
new file mode 100644
index 00000000000..d5da68aef92
--- /dev/null
+++ b/src/cloudflare/resources/content_scanning/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .payloads import (
+    PayloadsResource,
+    AsyncPayloadsResource,
+    PayloadsResourceWithRawResponse,
+    AsyncPayloadsResourceWithRawResponse,
+    PayloadsResourceWithStreamingResponse,
+    AsyncPayloadsResourceWithStreamingResponse,
+)
+from .settings import (
+    SettingsResource,
+    AsyncSettingsResource,
+    SettingsResourceWithRawResponse,
+    AsyncSettingsResourceWithRawResponse,
+    SettingsResourceWithStreamingResponse,
+    AsyncSettingsResourceWithStreamingResponse,
+)
+from .content_scanning import (
+    ContentScanningResource,
+    AsyncContentScanningResource,
+    ContentScanningResourceWithRawResponse,
+    AsyncContentScanningResourceWithRawResponse,
+    ContentScanningResourceWithStreamingResponse,
+    AsyncContentScanningResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "PayloadsResource",
+    "AsyncPayloadsResource",
+    "PayloadsResourceWithRawResponse",
+    "AsyncPayloadsResourceWithRawResponse",
+    "PayloadsResourceWithStreamingResponse",
+    "AsyncPayloadsResourceWithStreamingResponse",
+    "SettingsResource",
+    "AsyncSettingsResource",
+    "SettingsResourceWithRawResponse",
+    "AsyncSettingsResourceWithRawResponse",
+    "SettingsResourceWithStreamingResponse",
+    "AsyncSettingsResourceWithStreamingResponse",
+    "ContentScanningResource",
+    "AsyncContentScanningResource",
+    "ContentScanningResourceWithRawResponse",
+    "AsyncContentScanningResourceWithRawResponse",
+    "ContentScanningResourceWithStreamingResponse",
+    "AsyncContentScanningResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/content_scanning/content_scanning.py b/src/cloudflare/resources/content_scanning/content_scanning.py
new file mode 100644
index 00000000000..ddc8deba657
--- /dev/null
+++ b/src/cloudflare/resources/content_scanning/content_scanning.py
@@ -0,0 +1,627 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from .payloads import (
+    PayloadsResource,
+    AsyncPayloadsResource,
+    PayloadsResourceWithRawResponse,
+    AsyncPayloadsResourceWithRawResponse,
+    PayloadsResourceWithStreamingResponse,
+    AsyncPayloadsResourceWithStreamingResponse,
+)
+from .settings import (
+    SettingsResource,
+    AsyncSettingsResource,
+    SettingsResourceWithRawResponse,
+    AsyncSettingsResourceWithRawResponse,
+    SettingsResourceWithStreamingResponse,
+    AsyncSettingsResourceWithStreamingResponse,
+)
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.content_scanning import content_scanning_create_params, content_scanning_update_params
+from ...types.content_scanning.content_scanning_get_response import ContentScanningGetResponse
+from ...types.content_scanning.content_scanning_create_response import ContentScanningCreateResponse
+from ...types.content_scanning.content_scanning_update_response import ContentScanningUpdateResponse
+
+__all__ = ["ContentScanningResource", "AsyncContentScanningResource"]
+
+
+class ContentScanningResource(SyncAPIResource):
+    @cached_property
+    def payloads(self) -> PayloadsResource:
+        return PayloadsResource(self._client)
+
+    @cached_property
+    def settings(self) -> SettingsResource:
+        return SettingsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> ContentScanningResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ContentScanningResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ContentScanningResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ContentScanningResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        zone_id: str,
+        value: Literal["enabled", "disabled"],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ContentScanningCreateResponse:
+        """
+        Update the Content Scanning status.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          value: The status value for Content Scanning.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/content-upload-scan/settings",
+            body=maybe_transform({"value": value}, content_scanning_create_params.ContentScanningCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ContentScanningCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ContentScanningCreateResponse], ResultWrapper[ContentScanningCreateResponse]),
+        )
+
+    def update(
+        self,
+        *,
+        zone_id: str,
+        value: Literal["enabled", "disabled"],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ContentScanningUpdateResponse:
+        """
+        Update the Content Scanning status.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          value: The status value for Content Scanning.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/content-upload-scan/settings",
+            body=maybe_transform({"value": value}, content_scanning_update_params.ContentScanningUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ContentScanningUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ContentScanningUpdateResponse], ResultWrapper[ContentScanningUpdateResponse]),
+        )
+
+    def disable(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Disable Content Scanning.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/content-upload-scan/disable",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def enable(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Enable Content Scanning.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/content-upload-scan/enable",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ContentScanningGetResponse:
+        """
+        Retrieve the current status of Content Scanning.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/content-upload-scan/settings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ContentScanningGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ContentScanningGetResponse], ResultWrapper[ContentScanningGetResponse]),
+        )
+
+
+class AsyncContentScanningResource(AsyncAPIResource):
+    @cached_property
+    def payloads(self) -> AsyncPayloadsResource:
+        return AsyncPayloadsResource(self._client)
+
+    @cached_property
+    def settings(self) -> AsyncSettingsResource:
+        return AsyncSettingsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncContentScanningResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncContentScanningResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncContentScanningResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncContentScanningResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        value: Literal["enabled", "disabled"],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ContentScanningCreateResponse:
+        """
+        Update the Content Scanning status.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          value: The status value for Content Scanning.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/content-upload-scan/settings",
+            body=await async_maybe_transform(
+                {"value": value}, content_scanning_create_params.ContentScanningCreateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ContentScanningCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ContentScanningCreateResponse], ResultWrapper[ContentScanningCreateResponse]),
+        )
+
+    async def update(
+        self,
+        *,
+        zone_id: str,
+        value: Literal["enabled", "disabled"],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ContentScanningUpdateResponse:
+        """
+        Update the Content Scanning status.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          value: The status value for Content Scanning.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/content-upload-scan/settings",
+            body=await async_maybe_transform(
+                {"value": value}, content_scanning_update_params.ContentScanningUpdateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ContentScanningUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ContentScanningUpdateResponse], ResultWrapper[ContentScanningUpdateResponse]),
+        )
+
+    async def disable(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Disable Content Scanning.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/content-upload-scan/disable",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def enable(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Enable Content Scanning.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/content-upload-scan/enable",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ContentScanningGetResponse:
+        """
+        Retrieve the current status of Content Scanning.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/content-upload-scan/settings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ContentScanningGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ContentScanningGetResponse], ResultWrapper[ContentScanningGetResponse]),
+        )
+
+
+class ContentScanningResourceWithRawResponse:
+    def __init__(self, content_scanning: ContentScanningResource) -> None:
+        self._content_scanning = content_scanning
+
+        self.create = to_raw_response_wrapper(
+            content_scanning.create,
+        )
+        self.update = to_raw_response_wrapper(
+            content_scanning.update,
+        )
+        self.disable = to_raw_response_wrapper(
+            content_scanning.disable,
+        )
+        self.enable = to_raw_response_wrapper(
+            content_scanning.enable,
+        )
+        self.get = to_raw_response_wrapper(
+            content_scanning.get,
+        )
+
+    @cached_property
+    def payloads(self) -> PayloadsResourceWithRawResponse:
+        return PayloadsResourceWithRawResponse(self._content_scanning.payloads)
+
+    @cached_property
+    def settings(self) -> SettingsResourceWithRawResponse:
+        return SettingsResourceWithRawResponse(self._content_scanning.settings)
+
+
+class AsyncContentScanningResourceWithRawResponse:
+    def __init__(self, content_scanning: AsyncContentScanningResource) -> None:
+        self._content_scanning = content_scanning
+
+        self.create = async_to_raw_response_wrapper(
+            content_scanning.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            content_scanning.update,
+        )
+        self.disable = async_to_raw_response_wrapper(
+            content_scanning.disable,
+        )
+        self.enable = async_to_raw_response_wrapper(
+            content_scanning.enable,
+        )
+        self.get = async_to_raw_response_wrapper(
+            content_scanning.get,
+        )
+
+    @cached_property
+    def payloads(self) -> AsyncPayloadsResourceWithRawResponse:
+        return AsyncPayloadsResourceWithRawResponse(self._content_scanning.payloads)
+
+    @cached_property
+    def settings(self) -> AsyncSettingsResourceWithRawResponse:
+        return AsyncSettingsResourceWithRawResponse(self._content_scanning.settings)
+
+
+class ContentScanningResourceWithStreamingResponse:
+    def __init__(self, content_scanning: ContentScanningResource) -> None:
+        self._content_scanning = content_scanning
+
+        self.create = to_streamed_response_wrapper(
+            content_scanning.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            content_scanning.update,
+        )
+        self.disable = to_streamed_response_wrapper(
+            content_scanning.disable,
+        )
+        self.enable = to_streamed_response_wrapper(
+            content_scanning.enable,
+        )
+        self.get = to_streamed_response_wrapper(
+            content_scanning.get,
+        )
+
+    @cached_property
+    def payloads(self) -> PayloadsResourceWithStreamingResponse:
+        return PayloadsResourceWithStreamingResponse(self._content_scanning.payloads)
+
+    @cached_property
+    def settings(self) -> SettingsResourceWithStreamingResponse:
+        return SettingsResourceWithStreamingResponse(self._content_scanning.settings)
+
+
+class AsyncContentScanningResourceWithStreamingResponse:
+    def __init__(self, content_scanning: AsyncContentScanningResource) -> None:
+        self._content_scanning = content_scanning
+
+        self.create = async_to_streamed_response_wrapper(
+            content_scanning.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            content_scanning.update,
+        )
+        self.disable = async_to_streamed_response_wrapper(
+            content_scanning.disable,
+        )
+        self.enable = async_to_streamed_response_wrapper(
+            content_scanning.enable,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            content_scanning.get,
+        )
+
+    @cached_property
+    def payloads(self) -> AsyncPayloadsResourceWithStreamingResponse:
+        return AsyncPayloadsResourceWithStreamingResponse(self._content_scanning.payloads)
+
+    @cached_property
+    def settings(self) -> AsyncSettingsResourceWithStreamingResponse:
+        return AsyncSettingsResourceWithStreamingResponse(self._content_scanning.settings)
diff --git a/src/cloudflare/resources/content_scanning/payloads.py b/src/cloudflare/resources/content_scanning/payloads.py
new file mode 100644
index 00000000000..a093c140132
--- /dev/null
+++ b/src/cloudflare/resources/content_scanning/payloads.py
@@ -0,0 +1,362 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.content_scanning import payload_create_params
+from ...types.content_scanning.payload_list_response import PayloadListResponse
+from ...types.content_scanning.payload_create_response import PayloadCreateResponse
+from ...types.content_scanning.payload_delete_response import PayloadDeleteResponse
+
+__all__ = ["PayloadsResource", "AsyncPayloadsResource"]
+
+
+class PayloadsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> PayloadsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return PayloadsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> PayloadsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return PayloadsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        zone_id: str,
+        body: Iterable[payload_create_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[PayloadCreateResponse]:
+        """
+        Add custom scan expressions for Content Scanning.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/content-upload-scan/payloads",
+            page=SyncSinglePage[PayloadCreateResponse],
+            body=maybe_transform(body, Iterable[payload_create_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=PayloadCreateResponse,
+            method="post",
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[PayloadListResponse]:
+        """
+        Get a list of existing custom scan expressions for Content Scanning.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/content-upload-scan/payloads",
+            page=SyncSinglePage[PayloadListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=PayloadListResponse,
+        )
+
+    def delete(
+        self,
+        expression_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[PayloadDeleteResponse]:
+        """
+        Delete a Content Scan Custom Expression.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          expression_id: defines the unique ID for this custom scan expression.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not expression_id:
+            raise ValueError(f"Expected a non-empty value for `expression_id` but received {expression_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/content-upload-scan/payloads/{expression_id}",
+            page=SyncSinglePage[PayloadDeleteResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=PayloadDeleteResponse,
+            method="delete",
+        )
+
+
+class AsyncPayloadsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncPayloadsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncPayloadsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncPayloadsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncPayloadsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        zone_id: str,
+        body: Iterable[payload_create_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[PayloadCreateResponse, AsyncSinglePage[PayloadCreateResponse]]:
+        """
+        Add custom scan expressions for Content Scanning.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/content-upload-scan/payloads",
+            page=AsyncSinglePage[PayloadCreateResponse],
+            body=maybe_transform(body, Iterable[payload_create_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=PayloadCreateResponse,
+            method="post",
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[PayloadListResponse, AsyncSinglePage[PayloadListResponse]]:
+        """
+        Get a list of existing custom scan expressions for Content Scanning.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/content-upload-scan/payloads",
+            page=AsyncSinglePage[PayloadListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=PayloadListResponse,
+        )
+
+    def delete(
+        self,
+        expression_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[PayloadDeleteResponse, AsyncSinglePage[PayloadDeleteResponse]]:
+        """
+        Delete a Content Scan Custom Expression.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          expression_id: defines the unique ID for this custom scan expression.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not expression_id:
+            raise ValueError(f"Expected a non-empty value for `expression_id` but received {expression_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/content-upload-scan/payloads/{expression_id}",
+            page=AsyncSinglePage[PayloadDeleteResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=PayloadDeleteResponse,
+            method="delete",
+        )
+
+
+class PayloadsResourceWithRawResponse:
+    def __init__(self, payloads: PayloadsResource) -> None:
+        self._payloads = payloads
+
+        self.create = to_raw_response_wrapper(
+            payloads.create,
+        )
+        self.list = to_raw_response_wrapper(
+            payloads.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            payloads.delete,
+        )
+
+
+class AsyncPayloadsResourceWithRawResponse:
+    def __init__(self, payloads: AsyncPayloadsResource) -> None:
+        self._payloads = payloads
+
+        self.create = async_to_raw_response_wrapper(
+            payloads.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            payloads.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            payloads.delete,
+        )
+
+
+class PayloadsResourceWithStreamingResponse:
+    def __init__(self, payloads: PayloadsResource) -> None:
+        self._payloads = payloads
+
+        self.create = to_streamed_response_wrapper(
+            payloads.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            payloads.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            payloads.delete,
+        )
+
+
+class AsyncPayloadsResourceWithStreamingResponse:
+    def __init__(self, payloads: AsyncPayloadsResource) -> None:
+        self._payloads = payloads
+
+        self.create = async_to_streamed_response_wrapper(
+            payloads.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            payloads.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            payloads.delete,
+        )
diff --git a/src/cloudflare/resources/content_scanning/settings.py b/src/cloudflare/resources/content_scanning/settings.py
new file mode 100644
index 00000000000..c9e6ebf8adc
--- /dev/null
+++ b/src/cloudflare/resources/content_scanning/settings.py
@@ -0,0 +1,178 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.content_scanning.setting_get_response import SettingGetResponse
+
+__all__ = ["SettingsResource", "AsyncSettingsResource"]
+
+
+class SettingsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SettingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SettingsResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SettingGetResponse:
+        """
+        Retrieve the current status of Content Scanning.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/content-upload-scan/settings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SettingGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SettingGetResponse], ResultWrapper[SettingGetResponse]),
+        )
+
+
+class AsyncSettingsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSettingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSettingsResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SettingGetResponse:
+        """
+        Retrieve the current status of Content Scanning.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/content-upload-scan/settings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SettingGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SettingGetResponse], ResultWrapper[SettingGetResponse]),
+        )
+
+
+class SettingsResourceWithRawResponse:
+    def __init__(self, settings: SettingsResource) -> None:
+        self._settings = settings
+
+        self.get = to_raw_response_wrapper(
+            settings.get,
+        )
+
+
+class AsyncSettingsResourceWithRawResponse:
+    def __init__(self, settings: AsyncSettingsResource) -> None:
+        self._settings = settings
+
+        self.get = async_to_raw_response_wrapper(
+            settings.get,
+        )
+
+
+class SettingsResourceWithStreamingResponse:
+    def __init__(self, settings: SettingsResource) -> None:
+        self._settings = settings
+
+        self.get = to_streamed_response_wrapper(
+            settings.get,
+        )
+
+
+class AsyncSettingsResourceWithStreamingResponse:
+    def __init__(self, settings: AsyncSettingsResource) -> None:
+        self._settings = settings
+
+        self.get = async_to_streamed_response_wrapper(
+            settings.get,
+        )
diff --git a/src/cloudflare/resources/custom_certificates/custom_certificates.py b/src/cloudflare/resources/custom_certificates/custom_certificates.py
index 2dc84158685..0d205aea65f 100644
--- a/src/cloudflare/resources/custom_certificates/custom_certificates.py
+++ b/src/cloudflare/resources/custom_certificates/custom_certificates.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Optional, cast
-from typing_extensions import Literal
+from typing import Type, Optional, cast
+from typing_extensions import Literal, overload
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from .prioritize import (
     PrioritizeResource,
@@ -40,9 +37,6 @@
 from ...types.custom_hostnames.bundle_method import BundleMethod
 from ...types.custom_certificates.custom_certificate import CustomCertificate
 from ...types.custom_certificates.geo_restrictions_param import GeoRestrictionsParam
-from ...types.custom_certificates.custom_certificate_get_response import CustomCertificateGetResponse
-from ...types.custom_certificates.custom_certificate_edit_response import CustomCertificateEditResponse
-from ...types.custom_certificates.custom_certificate_create_response import CustomCertificateCreateResponse
 from ...types.custom_certificates.custom_certificate_delete_response import CustomCertificateDeleteResponse
 
 __all__ = ["CustomCertificatesResource", "AsyncCustomCertificatesResource"]
@@ -55,10 +49,21 @@ def prioritize(self) -> PrioritizeResource:
 
     @cached_property
     def with_raw_response(self) -> CustomCertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CustomCertificatesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CustomCertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CustomCertificatesResourceWithStreamingResponse(self)
 
     def create(
@@ -67,22 +72,22 @@ def create(
         zone_id: str,
         certificate: str,
         private_key: str,
-        bundle_method: BundleMethod | NotGiven = NOT_GIVEN,
-        geo_restrictions: GeoRestrictionsParam | NotGiven = NOT_GIVEN,
-        policy: str | NotGiven = NOT_GIVEN,
-        type: Literal["legacy_custom", "sni_custom"] | NotGiven = NOT_GIVEN,
+        bundle_method: BundleMethod | Omit = omit,
+        geo_restrictions: GeoRestrictionsParam | Omit = omit,
+        policy: str | Omit = omit,
+        type: Literal["legacy_custom", "sni_custom"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CustomCertificateCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomCertificate]:
         """
         Upload a new SSL certificate for a zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           certificate: The zone's SSL certificate or certificate and the intermediate(s).
 
@@ -124,48 +129,43 @@ def create(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            Optional[CustomCertificateCreateResponse],
-            self._post(
-                f"/zones/{zone_id}/custom_certificates",
-                body=maybe_transform(
-                    {
-                        "certificate": certificate,
-                        "private_key": private_key,
-                        "bundle_method": bundle_method,
-                        "geo_restrictions": geo_restrictions,
-                        "policy": policy,
-                        "type": type,
-                    },
-                    custom_certificate_create_params.CustomCertificateCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[CustomCertificateCreateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[CustomCertificateCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._post(
+            f"/zones/{zone_id}/custom_certificates",
+            body=maybe_transform(
+                {
+                    "certificate": certificate,
+                    "private_key": private_key,
+                    "bundle_method": bundle_method,
+                    "geo_restrictions": geo_restrictions,
+                    "policy": policy,
+                    "type": type,
+                },
+                custom_certificate_create_params.CustomCertificateCreateParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CustomCertificate]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CustomCertificate]], ResultWrapper[CustomCertificate]),
         )
 
     def list(
         self,
         *,
         zone_id: str,
-        match: Literal["any", "all"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        status: Literal["active", "expired", "deleted", "pending", "initializing"] | NotGiven = NOT_GIVEN,
+        match: Literal["any", "all"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal["active", "expired", "deleted", "pending", "initializing"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[CustomCertificate]:
         """List, search, and filter all of your custom SSL certificates.
 
@@ -174,7 +174,7 @@ def list(
         'legacy_custom' certificates will always supercede 'sni_custom' certificates.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           match: Whether to match all search requirements or at least one (any).
 
@@ -225,15 +225,15 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomCertificateDeleteResponse]:
         """
         Remove a SSL certificate from a zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          custom_certificate_id: Identifier
+          custom_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -263,23 +263,20 @@ def delete(
             ),
         )
 
+    @overload
     def edit(
         self,
         custom_certificate_id: str,
         *,
         zone_id: str,
-        bundle_method: BundleMethod | NotGiven = NOT_GIVEN,
-        certificate: str | NotGiven = NOT_GIVEN,
-        geo_restrictions: GeoRestrictionsParam | NotGiven = NOT_GIVEN,
-        policy: str | NotGiven = NOT_GIVEN,
-        private_key: str | NotGiven = NOT_GIVEN,
+        bundle_method: BundleMethod | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CustomCertificateEditResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomCertificate]:
         """Upload a new private key and/or PEM/CRT for the SSL certificate.
 
         Note: PATCHing
@@ -287,17 +284,63 @@ def edit(
         being returned, and the previous one being deleted.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          custom_certificate_id: Identifier
+          custom_certificate_id: Identifier.
 
           bundle_method: A ubiquitous bundle has the highest probability of being verified everywhere,
               even by clients using outdated or unusual trust stores. An optimal bundle uses
               the shortest chain and newest intermediates. And the force bundle verifies the
               chain, but does not otherwise modify it.
 
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def edit(
+        self,
+        custom_certificate_id: str,
+        *,
+        zone_id: str,
+        certificate: str,
+        private_key: str,
+        bundle_method: BundleMethod | Omit = omit,
+        geo_restrictions: GeoRestrictionsParam | Omit = omit,
+        policy: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomCertificate]:
+        """Upload a new private key and/or PEM/CRT for the SSL certificate.
+
+        Note: PATCHing
+        a configuration for sni_custom certificates will result in a new resource id
+        being returned, and the previous one being deleted.
+
+        Args:
+          zone_id: Identifier.
+
+          custom_certificate_id: Identifier.
+
           certificate: The zone's SSL certificate or certificate and the intermediate(s).
 
+          private_key: The zone's private key.
+
+          bundle_method: A ubiquitous bundle has the highest probability of being verified everywhere,
+              even by clients using outdated or unusual trust stores. An optimal bundle uses
+              the shortest chain and newest intermediates. And the force bundle verifies the
+              chain, but does not otherwise modify it.
+
           geo_restrictions: Specify the region where your private key can be held locally for optimal TLS
               performance. HTTPS connections to any excluded data center will still be fully
               encrypted, but will incur some latency while Keyless SSL is used to complete the
@@ -316,8 +359,6 @@ def edit(
               the EU region. If there are too few data centers satisfying the policy, it will
               be rejected.
 
-          private_key: The zone's private key.
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -326,37 +367,52 @@ def edit(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        ...
+
+    @required_args(["zone_id"], ["zone_id", "certificate", "private_key"])
+    def edit(
+        self,
+        custom_certificate_id: str,
+        *,
+        zone_id: str,
+        bundle_method: BundleMethod | Omit = omit,
+        certificate: str | Omit = omit,
+        private_key: str | Omit = omit,
+        geo_restrictions: GeoRestrictionsParam | Omit = omit,
+        policy: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomCertificate]:
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not custom_certificate_id:
             raise ValueError(
                 f"Expected a non-empty value for `custom_certificate_id` but received {custom_certificate_id!r}"
             )
-        return cast(
-            Optional[CustomCertificateEditResponse],
-            self._patch(
-                f"/zones/{zone_id}/custom_certificates/{custom_certificate_id}",
-                body=maybe_transform(
-                    {
-                        "bundle_method": bundle_method,
-                        "certificate": certificate,
-                        "geo_restrictions": geo_restrictions,
-                        "policy": policy,
-                        "private_key": private_key,
-                    },
-                    custom_certificate_edit_params.CustomCertificateEditParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[CustomCertificateEditResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[CustomCertificateEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._patch(
+            f"/zones/{zone_id}/custom_certificates/{custom_certificate_id}",
+            body=maybe_transform(
+                {
+                    "bundle_method": bundle_method,
+                    "certificate": certificate,
+                    "private_key": private_key,
+                    "geo_restrictions": geo_restrictions,
+                    "policy": policy,
+                },
+                custom_certificate_edit_params.CustomCertificateEditParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CustomCertificate]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CustomCertificate]], ResultWrapper[CustomCertificate]),
         )
 
     def get(
@@ -369,15 +425,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CustomCertificateGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomCertificate]:
         """
         SSL Configuration Details
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          custom_certificate_id: Identifier
+          custom_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -393,21 +449,16 @@ def get(
             raise ValueError(
                 f"Expected a non-empty value for `custom_certificate_id` but received {custom_certificate_id!r}"
             )
-        return cast(
-            Optional[CustomCertificateGetResponse],
-            self._get(
-                f"/zones/{zone_id}/custom_certificates/{custom_certificate_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[CustomCertificateGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[CustomCertificateGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._get(
+            f"/zones/{zone_id}/custom_certificates/{custom_certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CustomCertificate]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[CustomCertificate]], ResultWrapper[CustomCertificate]),
         )
 
 
@@ -418,10 +469,21 @@ def prioritize(self) -> AsyncPrioritizeResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncCustomCertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCustomCertificatesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCustomCertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCustomCertificatesResourceWithStreamingResponse(self)
 
     async def create(
@@ -430,22 +492,22 @@ async def create(
         zone_id: str,
         certificate: str,
         private_key: str,
-        bundle_method: BundleMethod | NotGiven = NOT_GIVEN,
-        geo_restrictions: GeoRestrictionsParam | NotGiven = NOT_GIVEN,
-        policy: str | NotGiven = NOT_GIVEN,
-        type: Literal["legacy_custom", "sni_custom"] | NotGiven = NOT_GIVEN,
+        bundle_method: BundleMethod | Omit = omit,
+        geo_restrictions: GeoRestrictionsParam | Omit = omit,
+        policy: str | Omit = omit,
+        type: Literal["legacy_custom", "sni_custom"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CustomCertificateCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomCertificate]:
         """
         Upload a new SSL certificate for a zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           certificate: The zone's SSL certificate or certificate and the intermediate(s).
 
@@ -487,48 +549,43 @@ async def create(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            Optional[CustomCertificateCreateResponse],
-            await self._post(
-                f"/zones/{zone_id}/custom_certificates",
-                body=await async_maybe_transform(
-                    {
-                        "certificate": certificate,
-                        "private_key": private_key,
-                        "bundle_method": bundle_method,
-                        "geo_restrictions": geo_restrictions,
-                        "policy": policy,
-                        "type": type,
-                    },
-                    custom_certificate_create_params.CustomCertificateCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[CustomCertificateCreateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[CustomCertificateCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._post(
+            f"/zones/{zone_id}/custom_certificates",
+            body=await async_maybe_transform(
+                {
+                    "certificate": certificate,
+                    "private_key": private_key,
+                    "bundle_method": bundle_method,
+                    "geo_restrictions": geo_restrictions,
+                    "policy": policy,
+                    "type": type,
+                },
+                custom_certificate_create_params.CustomCertificateCreateParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CustomCertificate]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CustomCertificate]], ResultWrapper[CustomCertificate]),
         )
 
     def list(
         self,
         *,
         zone_id: str,
-        match: Literal["any", "all"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        status: Literal["active", "expired", "deleted", "pending", "initializing"] | NotGiven = NOT_GIVEN,
+        match: Literal["any", "all"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal["active", "expired", "deleted", "pending", "initializing"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[CustomCertificate, AsyncV4PagePaginationArray[CustomCertificate]]:
         """List, search, and filter all of your custom SSL certificates.
 
@@ -537,7 +594,7 @@ def list(
         'legacy_custom' certificates will always supercede 'sni_custom' certificates.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           match: Whether to match all search requirements or at least one (any).
 
@@ -588,15 +645,15 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomCertificateDeleteResponse]:
         """
         Remove a SSL certificate from a zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          custom_certificate_id: Identifier
+          custom_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -626,23 +683,20 @@ async def delete(
             ),
         )
 
+    @overload
     async def edit(
         self,
         custom_certificate_id: str,
         *,
         zone_id: str,
-        bundle_method: BundleMethod | NotGiven = NOT_GIVEN,
-        certificate: str | NotGiven = NOT_GIVEN,
-        geo_restrictions: GeoRestrictionsParam | NotGiven = NOT_GIVEN,
-        policy: str | NotGiven = NOT_GIVEN,
-        private_key: str | NotGiven = NOT_GIVEN,
+        bundle_method: BundleMethod | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CustomCertificateEditResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomCertificate]:
         """Upload a new private key and/or PEM/CRT for the SSL certificate.
 
         Note: PATCHing
@@ -650,17 +704,63 @@ async def edit(
         being returned, and the previous one being deleted.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          custom_certificate_id: Identifier
+          custom_certificate_id: Identifier.
 
           bundle_method: A ubiquitous bundle has the highest probability of being verified everywhere,
               even by clients using outdated or unusual trust stores. An optimal bundle uses
               the shortest chain and newest intermediates. And the force bundle verifies the
               chain, but does not otherwise modify it.
 
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def edit(
+        self,
+        custom_certificate_id: str,
+        *,
+        zone_id: str,
+        certificate: str,
+        private_key: str,
+        bundle_method: BundleMethod | Omit = omit,
+        geo_restrictions: GeoRestrictionsParam | Omit = omit,
+        policy: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomCertificate]:
+        """Upload a new private key and/or PEM/CRT for the SSL certificate.
+
+        Note: PATCHing
+        a configuration for sni_custom certificates will result in a new resource id
+        being returned, and the previous one being deleted.
+
+        Args:
+          zone_id: Identifier.
+
+          custom_certificate_id: Identifier.
+
           certificate: The zone's SSL certificate or certificate and the intermediate(s).
 
+          private_key: The zone's private key.
+
+          bundle_method: A ubiquitous bundle has the highest probability of being verified everywhere,
+              even by clients using outdated or unusual trust stores. An optimal bundle uses
+              the shortest chain and newest intermediates. And the force bundle verifies the
+              chain, but does not otherwise modify it.
+
           geo_restrictions: Specify the region where your private key can be held locally for optimal TLS
               performance. HTTPS connections to any excluded data center will still be fully
               encrypted, but will incur some latency while Keyless SSL is used to complete the
@@ -679,8 +779,6 @@ async def edit(
               the EU region. If there are too few data centers satisfying the policy, it will
               be rejected.
 
-          private_key: The zone's private key.
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -689,37 +787,52 @@ async def edit(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        ...
+
+    @required_args(["zone_id"], ["zone_id", "certificate", "private_key"])
+    async def edit(
+        self,
+        custom_certificate_id: str,
+        *,
+        zone_id: str,
+        bundle_method: BundleMethod | Omit = omit,
+        certificate: str | Omit = omit,
+        private_key: str | Omit = omit,
+        geo_restrictions: GeoRestrictionsParam | Omit = omit,
+        policy: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomCertificate]:
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not custom_certificate_id:
             raise ValueError(
                 f"Expected a non-empty value for `custom_certificate_id` but received {custom_certificate_id!r}"
             )
-        return cast(
-            Optional[CustomCertificateEditResponse],
-            await self._patch(
-                f"/zones/{zone_id}/custom_certificates/{custom_certificate_id}",
-                body=await async_maybe_transform(
-                    {
-                        "bundle_method": bundle_method,
-                        "certificate": certificate,
-                        "geo_restrictions": geo_restrictions,
-                        "policy": policy,
-                        "private_key": private_key,
-                    },
-                    custom_certificate_edit_params.CustomCertificateEditParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[CustomCertificateEditResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[CustomCertificateEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._patch(
+            f"/zones/{zone_id}/custom_certificates/{custom_certificate_id}",
+            body=await async_maybe_transform(
+                {
+                    "bundle_method": bundle_method,
+                    "certificate": certificate,
+                    "private_key": private_key,
+                    "geo_restrictions": geo_restrictions,
+                    "policy": policy,
+                },
+                custom_certificate_edit_params.CustomCertificateEditParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CustomCertificate]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CustomCertificate]], ResultWrapper[CustomCertificate]),
         )
 
     async def get(
@@ -732,15 +845,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CustomCertificateGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomCertificate]:
         """
         SSL Configuration Details
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          custom_certificate_id: Identifier
+          custom_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -756,21 +869,16 @@ async def get(
             raise ValueError(
                 f"Expected a non-empty value for `custom_certificate_id` but received {custom_certificate_id!r}"
             )
-        return cast(
-            Optional[CustomCertificateGetResponse],
-            await self._get(
-                f"/zones/{zone_id}/custom_certificates/{custom_certificate_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[CustomCertificateGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[CustomCertificateGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._get(
+            f"/zones/{zone_id}/custom_certificates/{custom_certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CustomCertificate]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[CustomCertificate]], ResultWrapper[CustomCertificate]),
         )
 
 
diff --git a/src/cloudflare/resources/custom_certificates/prioritize.py b/src/cloudflare/resources/custom_certificates/prioritize.py
index c16c625fb77..dcc12005ba6 100644
--- a/src/cloudflare/resources/custom_certificates/prioritize.py
+++ b/src/cloudflare/resources/custom_certificates/prioritize.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Iterable, Optional, cast
+from typing import Iterable
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -19,10 +16,10 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
 from ...types.custom_certificates import prioritize_update_params
-from ...types.custom_certificates.prioritize_update_response import PrioritizeUpdateResponse
+from ...types.custom_certificates.custom_certificate import CustomCertificate
 
 __all__ = ["PrioritizeResource", "AsyncPrioritizeResource"]
 
@@ -30,10 +27,21 @@
 class PrioritizeResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PrioritizeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PrioritizeResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PrioritizeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PrioritizeResourceWithStreamingResponse(self)
 
     def update(
@@ -46,15 +54,15 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[PrioritizeUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[CustomCertificate]:
         """
         If a zone has multiple SSL certificates, you can set the order in which they
         should be used during a request. The higher priority will break ties across
         overlapping 'legacy_custom' certificates.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           certificates: Array of ordered certificates.
 
@@ -68,30 +76,39 @@ def update(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._put(
+        return self._get_api_list(
             f"/zones/{zone_id}/custom_certificates/prioritize",
+            page=SyncSinglePage[CustomCertificate],
             body=maybe_transform({"certificates": certificates}, prioritize_update_params.PrioritizeUpdateParams),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[PrioritizeUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[PrioritizeUpdateResponse]], ResultWrapper[PrioritizeUpdateResponse]),
+            model=CustomCertificate,
+            method="put",
         )
 
 
 class AsyncPrioritizeResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPrioritizeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPrioritizeResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPrioritizeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPrioritizeResourceWithStreamingResponse(self)
 
-    async def update(
+    def update(
         self,
         *,
         zone_id: str,
@@ -101,15 +118,15 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[PrioritizeUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[CustomCertificate, AsyncSinglePage[CustomCertificate]]:
         """
         If a zone has multiple SSL certificates, you can set the order in which they
         should be used during a request. The higher priority will break ties across
         overlapping 'legacy_custom' certificates.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           certificates: Array of ordered certificates.
 
@@ -123,19 +140,15 @@ async def update(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._put(
+        return self._get_api_list(
             f"/zones/{zone_id}/custom_certificates/prioritize",
-            body=await async_maybe_transform(
-                {"certificates": certificates}, prioritize_update_params.PrioritizeUpdateParams
-            ),
+            page=AsyncSinglePage[CustomCertificate],
+            body=maybe_transform({"certificates": certificates}, prioritize_update_params.PrioritizeUpdateParams),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[PrioritizeUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[PrioritizeUpdateResponse]], ResultWrapper[PrioritizeUpdateResponse]),
+            model=CustomCertificate,
+            method="put",
         )
 
 
diff --git a/src/cloudflare/resources/custom_hostnames/__init__.py b/src/cloudflare/resources/custom_hostnames/__init__.py
index 333e8854818..00e91bd5119 100644
--- a/src/cloudflare/resources/custom_hostnames/__init__.py
+++ b/src/cloudflare/resources/custom_hostnames/__init__.py
@@ -8,6 +8,14 @@
     FallbackOriginResourceWithStreamingResponse,
     AsyncFallbackOriginResourceWithStreamingResponse,
 )
+from .certificate_pack import (
+    CertificatePackResource,
+    AsyncCertificatePackResource,
+    CertificatePackResourceWithRawResponse,
+    AsyncCertificatePackResourceWithRawResponse,
+    CertificatePackResourceWithStreamingResponse,
+    AsyncCertificatePackResourceWithStreamingResponse,
+)
 from .custom_hostnames import (
     CustomHostnamesResource,
     AsyncCustomHostnamesResource,
@@ -24,6 +32,12 @@
     "AsyncFallbackOriginResourceWithRawResponse",
     "FallbackOriginResourceWithStreamingResponse",
     "AsyncFallbackOriginResourceWithStreamingResponse",
+    "CertificatePackResource",
+    "AsyncCertificatePackResource",
+    "CertificatePackResourceWithRawResponse",
+    "AsyncCertificatePackResourceWithRawResponse",
+    "CertificatePackResourceWithStreamingResponse",
+    "AsyncCertificatePackResourceWithStreamingResponse",
     "CustomHostnamesResource",
     "AsyncCustomHostnamesResource",
     "CustomHostnamesResourceWithRawResponse",
diff --git a/src/cloudflare/resources/custom_hostnames/certificate_pack/__init__.py b/src/cloudflare/resources/custom_hostnames/certificate_pack/__init__.py
new file mode 100644
index 00000000000..8588bf81547
--- /dev/null
+++ b/src/cloudflare/resources/custom_hostnames/certificate_pack/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .certificates import (
+    CertificatesResource,
+    AsyncCertificatesResource,
+    CertificatesResourceWithRawResponse,
+    AsyncCertificatesResourceWithRawResponse,
+    CertificatesResourceWithStreamingResponse,
+    AsyncCertificatesResourceWithStreamingResponse,
+)
+from .certificate_pack import (
+    CertificatePackResource,
+    AsyncCertificatePackResource,
+    CertificatePackResourceWithRawResponse,
+    AsyncCertificatePackResourceWithRawResponse,
+    CertificatePackResourceWithStreamingResponse,
+    AsyncCertificatePackResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "CertificatesResource",
+    "AsyncCertificatesResource",
+    "CertificatesResourceWithRawResponse",
+    "AsyncCertificatesResourceWithRawResponse",
+    "CertificatesResourceWithStreamingResponse",
+    "AsyncCertificatesResourceWithStreamingResponse",
+    "CertificatePackResource",
+    "AsyncCertificatePackResource",
+    "CertificatePackResourceWithRawResponse",
+    "AsyncCertificatePackResourceWithRawResponse",
+    "CertificatePackResourceWithStreamingResponse",
+    "AsyncCertificatePackResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/custom_hostnames/certificate_pack/certificate_pack.py b/src/cloudflare/resources/custom_hostnames/certificate_pack/certificate_pack.py
new file mode 100644
index 00000000000..cda40e9baed
--- /dev/null
+++ b/src/cloudflare/resources/custom_hostnames/certificate_pack/certificate_pack.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .certificates import (
+    CertificatesResource,
+    AsyncCertificatesResource,
+    CertificatesResourceWithRawResponse,
+    AsyncCertificatesResourceWithRawResponse,
+    CertificatesResourceWithStreamingResponse,
+    AsyncCertificatesResourceWithStreamingResponse,
+)
+
+__all__ = ["CertificatePackResource", "AsyncCertificatePackResource"]
+
+
+class CertificatePackResource(SyncAPIResource):
+    @cached_property
+    def certificates(self) -> CertificatesResource:
+        return CertificatesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> CertificatePackResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CertificatePackResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CertificatePackResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CertificatePackResourceWithStreamingResponse(self)
+
+
+class AsyncCertificatePackResource(AsyncAPIResource):
+    @cached_property
+    def certificates(self) -> AsyncCertificatesResource:
+        return AsyncCertificatesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncCertificatePackResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCertificatePackResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCertificatePackResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCertificatePackResourceWithStreamingResponse(self)
+
+
+class CertificatePackResourceWithRawResponse:
+    def __init__(self, certificate_pack: CertificatePackResource) -> None:
+        self._certificate_pack = certificate_pack
+
+    @cached_property
+    def certificates(self) -> CertificatesResourceWithRawResponse:
+        return CertificatesResourceWithRawResponse(self._certificate_pack.certificates)
+
+
+class AsyncCertificatePackResourceWithRawResponse:
+    def __init__(self, certificate_pack: AsyncCertificatePackResource) -> None:
+        self._certificate_pack = certificate_pack
+
+    @cached_property
+    def certificates(self) -> AsyncCertificatesResourceWithRawResponse:
+        return AsyncCertificatesResourceWithRawResponse(self._certificate_pack.certificates)
+
+
+class CertificatePackResourceWithStreamingResponse:
+    def __init__(self, certificate_pack: CertificatePackResource) -> None:
+        self._certificate_pack = certificate_pack
+
+    @cached_property
+    def certificates(self) -> CertificatesResourceWithStreamingResponse:
+        return CertificatesResourceWithStreamingResponse(self._certificate_pack.certificates)
+
+
+class AsyncCertificatePackResourceWithStreamingResponse:
+    def __init__(self, certificate_pack: AsyncCertificatePackResource) -> None:
+        self._certificate_pack = certificate_pack
+
+    @cached_property
+    def certificates(self) -> AsyncCertificatesResourceWithStreamingResponse:
+        return AsyncCertificatesResourceWithStreamingResponse(self._certificate_pack.certificates)
diff --git a/src/cloudflare/resources/custom_hostnames/certificate_pack/certificates.py b/src/cloudflare/resources/custom_hostnames/certificate_pack/certificates.py
new file mode 100644
index 00000000000..d3df9504b42
--- /dev/null
+++ b/src/cloudflare/resources/custom_hostnames/certificate_pack/certificates.py
@@ -0,0 +1,369 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.custom_hostnames.certificate_pack import certificate_update_params
+from ....types.custom_hostnames.certificate_pack.certificate_delete_response import CertificateDeleteResponse
+from ....types.custom_hostnames.certificate_pack.certificate_update_response import CertificateUpdateResponse
+
+__all__ = ["CertificatesResource", "AsyncCertificatesResource"]
+
+
+class CertificatesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> CertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CertificatesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CertificatesResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        certificate_id: str,
+        *,
+        zone_id: str,
+        custom_hostname_id: str,
+        certificate_pack_id: str,
+        custom_certificate: str,
+        custom_key: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CertificateUpdateResponse]:
+        """
+        Replace a single custom certificate within a certificate pack that contains two
+        bundled certificates. The replacement must adhere to the following constraints.
+        You can only replace an RSA certificate with another RSA certificate or an ECDSA
+        certificate with another ECDSA certificate.
+
+        Args:
+          zone_id: Identifier.
+
+          custom_hostname_id: Identifier.
+
+          certificate_pack_id: Identifier.
+
+          certificate_id: Identifier.
+
+          custom_certificate: If a custom uploaded certificate is used.
+
+          custom_key: The key for a custom uploaded certificate.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not custom_hostname_id:
+            raise ValueError(f"Expected a non-empty value for `custom_hostname_id` but received {custom_hostname_id!r}")
+        if not certificate_pack_id:
+            raise ValueError(
+                f"Expected a non-empty value for `certificate_pack_id` but received {certificate_pack_id!r}"
+            )
+        if not certificate_id:
+            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/custom_hostnames/{custom_hostname_id}/certificate_pack/{certificate_pack_id}/certificates/{certificate_id}",
+            body=maybe_transform(
+                {
+                    "custom_certificate": custom_certificate,
+                    "custom_key": custom_key,
+                },
+                certificate_update_params.CertificateUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CertificateUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CertificateUpdateResponse]], ResultWrapper[CertificateUpdateResponse]),
+        )
+
+    def delete(
+        self,
+        certificate_id: str,
+        *,
+        zone_id: str,
+        custom_hostname_id: str,
+        certificate_pack_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CertificateDeleteResponse:
+        """
+        Delete a single custom certificate from a certificate pack that contains two
+        bundled certificates. Deletion is subject to the following constraints. You
+        cannot delete a certificate if it is the only remaining certificate in the pack.
+        At least one certificate must remain in the pack.
+
+        Args:
+          zone_id: Identifier.
+
+          custom_hostname_id: Identifier.
+
+          certificate_pack_id: Identifier.
+
+          certificate_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not custom_hostname_id:
+            raise ValueError(f"Expected a non-empty value for `custom_hostname_id` but received {custom_hostname_id!r}")
+        if not certificate_pack_id:
+            raise ValueError(
+                f"Expected a non-empty value for `certificate_pack_id` but received {certificate_pack_id!r}"
+            )
+        if not certificate_id:
+            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
+        return self._delete(
+            f"/zones/{zone_id}/custom_hostnames/{custom_hostname_id}/certificate_pack/{certificate_pack_id}/certificates/{certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CertificateDeleteResponse,
+        )
+
+
+class AsyncCertificatesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncCertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCertificatesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCertificatesResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        certificate_id: str,
+        *,
+        zone_id: str,
+        custom_hostname_id: str,
+        certificate_pack_id: str,
+        custom_certificate: str,
+        custom_key: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CertificateUpdateResponse]:
+        """
+        Replace a single custom certificate within a certificate pack that contains two
+        bundled certificates. The replacement must adhere to the following constraints.
+        You can only replace an RSA certificate with another RSA certificate or an ECDSA
+        certificate with another ECDSA certificate.
+
+        Args:
+          zone_id: Identifier.
+
+          custom_hostname_id: Identifier.
+
+          certificate_pack_id: Identifier.
+
+          certificate_id: Identifier.
+
+          custom_certificate: If a custom uploaded certificate is used.
+
+          custom_key: The key for a custom uploaded certificate.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not custom_hostname_id:
+            raise ValueError(f"Expected a non-empty value for `custom_hostname_id` but received {custom_hostname_id!r}")
+        if not certificate_pack_id:
+            raise ValueError(
+                f"Expected a non-empty value for `certificate_pack_id` but received {certificate_pack_id!r}"
+            )
+        if not certificate_id:
+            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/custom_hostnames/{custom_hostname_id}/certificate_pack/{certificate_pack_id}/certificates/{certificate_id}",
+            body=await async_maybe_transform(
+                {
+                    "custom_certificate": custom_certificate,
+                    "custom_key": custom_key,
+                },
+                certificate_update_params.CertificateUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CertificateUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CertificateUpdateResponse]], ResultWrapper[CertificateUpdateResponse]),
+        )
+
+    async def delete(
+        self,
+        certificate_id: str,
+        *,
+        zone_id: str,
+        custom_hostname_id: str,
+        certificate_pack_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CertificateDeleteResponse:
+        """
+        Delete a single custom certificate from a certificate pack that contains two
+        bundled certificates. Deletion is subject to the following constraints. You
+        cannot delete a certificate if it is the only remaining certificate in the pack.
+        At least one certificate must remain in the pack.
+
+        Args:
+          zone_id: Identifier.
+
+          custom_hostname_id: Identifier.
+
+          certificate_pack_id: Identifier.
+
+          certificate_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not custom_hostname_id:
+            raise ValueError(f"Expected a non-empty value for `custom_hostname_id` but received {custom_hostname_id!r}")
+        if not certificate_pack_id:
+            raise ValueError(
+                f"Expected a non-empty value for `certificate_pack_id` but received {certificate_pack_id!r}"
+            )
+        if not certificate_id:
+            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
+        return await self._delete(
+            f"/zones/{zone_id}/custom_hostnames/{custom_hostname_id}/certificate_pack/{certificate_pack_id}/certificates/{certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CertificateDeleteResponse,
+        )
+
+
+class CertificatesResourceWithRawResponse:
+    def __init__(self, certificates: CertificatesResource) -> None:
+        self._certificates = certificates
+
+        self.update = to_raw_response_wrapper(
+            certificates.update,
+        )
+        self.delete = to_raw_response_wrapper(
+            certificates.delete,
+        )
+
+
+class AsyncCertificatesResourceWithRawResponse:
+    def __init__(self, certificates: AsyncCertificatesResource) -> None:
+        self._certificates = certificates
+
+        self.update = async_to_raw_response_wrapper(
+            certificates.update,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            certificates.delete,
+        )
+
+
+class CertificatesResourceWithStreamingResponse:
+    def __init__(self, certificates: CertificatesResource) -> None:
+        self._certificates = certificates
+
+        self.update = to_streamed_response_wrapper(
+            certificates.update,
+        )
+        self.delete = to_streamed_response_wrapper(
+            certificates.delete,
+        )
+
+
+class AsyncCertificatesResourceWithStreamingResponse:
+    def __init__(self, certificates: AsyncCertificatesResource) -> None:
+        self._certificates = certificates
+
+        self.update = async_to_streamed_response_wrapper(
+            certificates.update,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            certificates.delete,
+        )
diff --git a/src/cloudflare/resources/custom_hostnames/custom_hostnames.py b/src/cloudflare/resources/custom_hostnames/custom_hostnames.py
index 64f36eb8d6e..aa342d44e05 100644
--- a/src/cloudflare/resources/custom_hostnames/custom_hostnames.py
+++ b/src/cloudflare/resources/custom_hostnames/custom_hostnames.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Dict, Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -36,6 +33,14 @@
     custom_hostname_list_params,
     custom_hostname_create_params,
 )
+from .certificate_pack.certificate_pack import (
+    CertificatePackResource,
+    AsyncCertificatePackResource,
+    CertificatePackResourceWithRawResponse,
+    AsyncCertificatePackResourceWithRawResponse,
+    CertificatePackResourceWithStreamingResponse,
+    AsyncCertificatePackResourceWithStreamingResponse,
+)
 from ...types.custom_hostnames.custom_hostname_get_response import CustomHostnameGetResponse
 from ...types.custom_hostnames.custom_hostname_edit_response import CustomHostnameEditResponse
 from ...types.custom_hostnames.custom_hostname_list_response import CustomHostnameListResponse
@@ -50,12 +55,27 @@ class CustomHostnamesResource(SyncAPIResource):
     def fallback_origin(self) -> FallbackOriginResource:
         return FallbackOriginResource(self._client)
 
+    @cached_property
+    def certificate_pack(self) -> CertificatePackResource:
+        return CertificatePackResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> CustomHostnamesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CustomHostnamesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CustomHostnamesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CustomHostnamesResourceWithStreamingResponse(self)
 
     def create(
@@ -63,14 +83,14 @@ def create(
         *,
         zone_id: str,
         hostname: str,
-        ssl: custom_hostname_create_params.SSL,
-        custom_metadata: custom_hostname_create_params.CustomMetadata | NotGiven = NOT_GIVEN,
+        custom_metadata: Dict[str, str] | Omit = omit,
+        ssl: custom_hostname_create_params.SSL | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomHostnameCreateResponse]:
         """
         Add a new custom hostname and request that an SSL certificate be issued for it.
@@ -79,16 +99,20 @@ def create(
         'email' will send an email to the WHOIS contacts on file for the base domain
         plus hostmaster, postmaster, webmaster, admin, administrator. If http is used
         and the domain is not already pointing to the Managed CNAME host, the PATCH
-        method must be used once it is (to complete validation).
+        method must be used once it is (to complete validation). Enable bundling of
+        certificates using the custom_cert_bundle field. The bundling process requires
+        the following condition One certificate in the bundle must use an RSA, and the
+        other must use an ECDSA.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           hostname: The custom hostname that will point to your hostname via CNAME.
 
-          ssl: SSL properties used when creating the custom hostname.
+          custom_metadata: Unique key/value metadata for this hostname. These are per-hostname (customer)
+              settings.
 
-          custom_metadata: These are per-hostname (customer) settings.
+          ssl: SSL properties used when creating the custom hostname.
 
           extra_headers: Send extra headers
 
@@ -105,8 +129,8 @@ def create(
             body=maybe_transform(
                 {
                     "hostname": hostname,
-                    "ssl": ssl,
                     "custom_metadata": custom_metadata,
+                    "ssl": ssl,
                 },
                 custom_hostname_create_params.CustomHostnameCreateParams,
             ),
@@ -124,25 +148,25 @@ def list(
         self,
         *,
         zone_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        hostname: str | NotGiven = NOT_GIVEN,
-        order: Literal["ssl", "ssl_status"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        ssl: Literal[0, 1] | NotGiven = NOT_GIVEN,
+        id: str | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        hostname: str | Omit = omit,
+        order: Literal["ssl", "ssl_status"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        ssl: Literal[0, 1] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[CustomHostnameListResponse]:
         """
         List, search, sort, and filter all of your custom hostnames.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           id: Hostname ID to match against. This ID was generated and returned during the
               initial custom_hostname creation. This parameter cannot be used with the
@@ -205,15 +229,15 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> CustomHostnameDeleteResponse:
         """
         Delete Custom Hostname (and any issued SSL certificates)
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          custom_hostname_id: Identifier
+          custom_hostname_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -240,30 +264,34 @@ def edit(
         custom_hostname_id: str,
         *,
         zone_id: str,
-        custom_metadata: custom_hostname_edit_params.CustomMetadata | NotGiven = NOT_GIVEN,
-        custom_origin_server: str | NotGiven = NOT_GIVEN,
-        custom_origin_sni: str | NotGiven = NOT_GIVEN,
-        ssl: custom_hostname_edit_params.SSL | NotGiven = NOT_GIVEN,
+        custom_metadata: Dict[str, str] | Omit = omit,
+        custom_origin_server: str | Omit = omit,
+        custom_origin_sni: str | Omit = omit,
+        ssl: custom_hostname_edit_params.SSL | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomHostnameEditResponse]:
         """Modify SSL configuration for a custom hostname.
 
         When sent with SSL config that
         matches existing config, used to indicate that hostname should pass domain
         control validation (DCV). Can also be used to change validation type, e.g., from
-        'http' to 'email'.
+        'http' to 'email'. Bundle an existing certificate with another certificate by
+        using the "custom_cert_bundle" field. The bundling process supports combining
+        certificates as long as the following condition is met. One certificate must use
+        the RSA algorithm, and the other must use the ECDSA algorithm.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          custom_hostname_id: Identifier
+          custom_hostname_id: Identifier.
 
-          custom_metadata: These are per-hostname (customer) settings.
+          custom_metadata: Unique key/value metadata for this hostname. These are per-hostname (customer)
+              settings.
 
           custom_origin_server: a valid hostname that’s been added to your DNS zone as an A, AAAA, or CNAME
               record.
@@ -319,15 +347,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomHostnameGetResponse]:
         """
         Custom Hostname Details
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          custom_hostname_id: Identifier
+          custom_hostname_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -359,12 +387,27 @@ class AsyncCustomHostnamesResource(AsyncAPIResource):
     def fallback_origin(self) -> AsyncFallbackOriginResource:
         return AsyncFallbackOriginResource(self._client)
 
+    @cached_property
+    def certificate_pack(self) -> AsyncCertificatePackResource:
+        return AsyncCertificatePackResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncCustomHostnamesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCustomHostnamesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCustomHostnamesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCustomHostnamesResourceWithStreamingResponse(self)
 
     async def create(
@@ -372,14 +415,14 @@ async def create(
         *,
         zone_id: str,
         hostname: str,
-        ssl: custom_hostname_create_params.SSL,
-        custom_metadata: custom_hostname_create_params.CustomMetadata | NotGiven = NOT_GIVEN,
+        custom_metadata: Dict[str, str] | Omit = omit,
+        ssl: custom_hostname_create_params.SSL | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomHostnameCreateResponse]:
         """
         Add a new custom hostname and request that an SSL certificate be issued for it.
@@ -388,16 +431,20 @@ async def create(
         'email' will send an email to the WHOIS contacts on file for the base domain
         plus hostmaster, postmaster, webmaster, admin, administrator. If http is used
         and the domain is not already pointing to the Managed CNAME host, the PATCH
-        method must be used once it is (to complete validation).
+        method must be used once it is (to complete validation). Enable bundling of
+        certificates using the custom_cert_bundle field. The bundling process requires
+        the following condition One certificate in the bundle must use an RSA, and the
+        other must use an ECDSA.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           hostname: The custom hostname that will point to your hostname via CNAME.
 
-          ssl: SSL properties used when creating the custom hostname.
+          custom_metadata: Unique key/value metadata for this hostname. These are per-hostname (customer)
+              settings.
 
-          custom_metadata: These are per-hostname (customer) settings.
+          ssl: SSL properties used when creating the custom hostname.
 
           extra_headers: Send extra headers
 
@@ -414,8 +461,8 @@ async def create(
             body=await async_maybe_transform(
                 {
                     "hostname": hostname,
-                    "ssl": ssl,
                     "custom_metadata": custom_metadata,
+                    "ssl": ssl,
                 },
                 custom_hostname_create_params.CustomHostnameCreateParams,
             ),
@@ -433,25 +480,25 @@ def list(
         self,
         *,
         zone_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        hostname: str | NotGiven = NOT_GIVEN,
-        order: Literal["ssl", "ssl_status"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        ssl: Literal[0, 1] | NotGiven = NOT_GIVEN,
+        id: str | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        hostname: str | Omit = omit,
+        order: Literal["ssl", "ssl_status"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        ssl: Literal[0, 1] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[CustomHostnameListResponse, AsyncV4PagePaginationArray[CustomHostnameListResponse]]:
         """
         List, search, sort, and filter all of your custom hostnames.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           id: Hostname ID to match against. This ID was generated and returned during the
               initial custom_hostname creation. This parameter cannot be used with the
@@ -514,15 +561,15 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> CustomHostnameDeleteResponse:
         """
         Delete Custom Hostname (and any issued SSL certificates)
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          custom_hostname_id: Identifier
+          custom_hostname_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -549,30 +596,34 @@ async def edit(
         custom_hostname_id: str,
         *,
         zone_id: str,
-        custom_metadata: custom_hostname_edit_params.CustomMetadata | NotGiven = NOT_GIVEN,
-        custom_origin_server: str | NotGiven = NOT_GIVEN,
-        custom_origin_sni: str | NotGiven = NOT_GIVEN,
-        ssl: custom_hostname_edit_params.SSL | NotGiven = NOT_GIVEN,
+        custom_metadata: Dict[str, str] | Omit = omit,
+        custom_origin_server: str | Omit = omit,
+        custom_origin_sni: str | Omit = omit,
+        ssl: custom_hostname_edit_params.SSL | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomHostnameEditResponse]:
         """Modify SSL configuration for a custom hostname.
 
         When sent with SSL config that
         matches existing config, used to indicate that hostname should pass domain
         control validation (DCV). Can also be used to change validation type, e.g., from
-        'http' to 'email'.
+        'http' to 'email'. Bundle an existing certificate with another certificate by
+        using the "custom_cert_bundle" field. The bundling process supports combining
+        certificates as long as the following condition is met. One certificate must use
+        the RSA algorithm, and the other must use the ECDSA algorithm.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          custom_hostname_id: Identifier
+          custom_hostname_id: Identifier.
 
-          custom_metadata: These are per-hostname (customer) settings.
+          custom_metadata: Unique key/value metadata for this hostname. These are per-hostname (customer)
+              settings.
 
           custom_origin_server: a valid hostname that’s been added to your DNS zone as an A, AAAA, or CNAME
               record.
@@ -628,15 +679,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomHostnameGetResponse]:
         """
         Custom Hostname Details
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          custom_hostname_id: Identifier
+          custom_hostname_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -687,6 +738,10 @@ def __init__(self, custom_hostnames: CustomHostnamesResource) -> None:
     def fallback_origin(self) -> FallbackOriginResourceWithRawResponse:
         return FallbackOriginResourceWithRawResponse(self._custom_hostnames.fallback_origin)
 
+    @cached_property
+    def certificate_pack(self) -> CertificatePackResourceWithRawResponse:
+        return CertificatePackResourceWithRawResponse(self._custom_hostnames.certificate_pack)
+
 
 class AsyncCustomHostnamesResourceWithRawResponse:
     def __init__(self, custom_hostnames: AsyncCustomHostnamesResource) -> None:
@@ -712,6 +767,10 @@ def __init__(self, custom_hostnames: AsyncCustomHostnamesResource) -> None:
     def fallback_origin(self) -> AsyncFallbackOriginResourceWithRawResponse:
         return AsyncFallbackOriginResourceWithRawResponse(self._custom_hostnames.fallback_origin)
 
+    @cached_property
+    def certificate_pack(self) -> AsyncCertificatePackResourceWithRawResponse:
+        return AsyncCertificatePackResourceWithRawResponse(self._custom_hostnames.certificate_pack)
+
 
 class CustomHostnamesResourceWithStreamingResponse:
     def __init__(self, custom_hostnames: CustomHostnamesResource) -> None:
@@ -737,6 +796,10 @@ def __init__(self, custom_hostnames: CustomHostnamesResource) -> None:
     def fallback_origin(self) -> FallbackOriginResourceWithStreamingResponse:
         return FallbackOriginResourceWithStreamingResponse(self._custom_hostnames.fallback_origin)
 
+    @cached_property
+    def certificate_pack(self) -> CertificatePackResourceWithStreamingResponse:
+        return CertificatePackResourceWithStreamingResponse(self._custom_hostnames.certificate_pack)
+
 
 class AsyncCustomHostnamesResourceWithStreamingResponse:
     def __init__(self, custom_hostnames: AsyncCustomHostnamesResource) -> None:
@@ -761,3 +824,7 @@ def __init__(self, custom_hostnames: AsyncCustomHostnamesResource) -> None:
     @cached_property
     def fallback_origin(self) -> AsyncFallbackOriginResourceWithStreamingResponse:
         return AsyncFallbackOriginResourceWithStreamingResponse(self._custom_hostnames.fallback_origin)
+
+    @cached_property
+    def certificate_pack(self) -> AsyncCertificatePackResourceWithStreamingResponse:
+        return AsyncCertificatePackResourceWithStreamingResponse(self._custom_hostnames.certificate_pack)
diff --git a/src/cloudflare/resources/custom_hostnames/fallback_origin.py b/src/cloudflare/resources/custom_hostnames/fallback_origin.py
index cfaf566b272..3fec4f02098 100644
--- a/src/cloudflare/resources/custom_hostnames/fallback_origin.py
+++ b/src/cloudflare/resources/custom_hostnames/fallback_origin.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -32,10 +29,21 @@
 class FallbackOriginResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> FallbackOriginResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return FallbackOriginResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> FallbackOriginResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return FallbackOriginResourceWithStreamingResponse(self)
 
     def update(
@@ -48,13 +56,13 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[FallbackOriginUpdateResponse]:
         """
         Update Fallback Origin for Custom Hostnames
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           origin: Your origin hostname that requests to your custom hostnames will be sent to.
 
@@ -68,22 +76,17 @@ def update(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            Optional[FallbackOriginUpdateResponse],
-            self._put(
-                f"/zones/{zone_id}/custom_hostnames/fallback_origin",
-                body=maybe_transform({"origin": origin}, fallback_origin_update_params.FallbackOriginUpdateParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[FallbackOriginUpdateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[FallbackOriginUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._put(
+            f"/zones/{zone_id}/custom_hostnames/fallback_origin",
+            body=maybe_transform({"origin": origin}, fallback_origin_update_params.FallbackOriginUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[FallbackOriginUpdateResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[FallbackOriginUpdateResponse]], ResultWrapper[FallbackOriginUpdateResponse]),
         )
 
     def delete(
@@ -95,13 +98,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[FallbackOriginDeleteResponse]:
         """
         Delete Fallback Origin for Custom Hostnames
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -113,21 +116,16 @@ def delete(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            Optional[FallbackOriginDeleteResponse],
-            self._delete(
-                f"/zones/{zone_id}/custom_hostnames/fallback_origin",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[FallbackOriginDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[FallbackOriginDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._delete(
+            f"/zones/{zone_id}/custom_hostnames/fallback_origin",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[FallbackOriginDeleteResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[FallbackOriginDeleteResponse]], ResultWrapper[FallbackOriginDeleteResponse]),
         )
 
     def get(
@@ -139,13 +137,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[FallbackOriginGetResponse]:
         """
         Get Fallback Origin for Custom Hostnames
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -157,31 +155,37 @@ def get(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            Optional[FallbackOriginGetResponse],
-            self._get(
-                f"/zones/{zone_id}/custom_hostnames/fallback_origin",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[FallbackOriginGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[FallbackOriginGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._get(
+            f"/zones/{zone_id}/custom_hostnames/fallback_origin",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[FallbackOriginGetResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[FallbackOriginGetResponse]], ResultWrapper[FallbackOriginGetResponse]),
         )
 
 
 class AsyncFallbackOriginResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncFallbackOriginResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncFallbackOriginResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncFallbackOriginResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncFallbackOriginResourceWithStreamingResponse(self)
 
     async def update(
@@ -194,13 +198,13 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[FallbackOriginUpdateResponse]:
         """
         Update Fallback Origin for Custom Hostnames
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           origin: Your origin hostname that requests to your custom hostnames will be sent to.
 
@@ -214,24 +218,19 @@ async def update(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            Optional[FallbackOriginUpdateResponse],
-            await self._put(
-                f"/zones/{zone_id}/custom_hostnames/fallback_origin",
-                body=await async_maybe_transform(
-                    {"origin": origin}, fallback_origin_update_params.FallbackOriginUpdateParams
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[FallbackOriginUpdateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[FallbackOriginUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._put(
+            f"/zones/{zone_id}/custom_hostnames/fallback_origin",
+            body=await async_maybe_transform(
+                {"origin": origin}, fallback_origin_update_params.FallbackOriginUpdateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[FallbackOriginUpdateResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[FallbackOriginUpdateResponse]], ResultWrapper[FallbackOriginUpdateResponse]),
         )
 
     async def delete(
@@ -243,13 +242,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[FallbackOriginDeleteResponse]:
         """
         Delete Fallback Origin for Custom Hostnames
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -261,21 +260,16 @@ async def delete(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            Optional[FallbackOriginDeleteResponse],
-            await self._delete(
-                f"/zones/{zone_id}/custom_hostnames/fallback_origin",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[FallbackOriginDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[FallbackOriginDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._delete(
+            f"/zones/{zone_id}/custom_hostnames/fallback_origin",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[FallbackOriginDeleteResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[FallbackOriginDeleteResponse]], ResultWrapper[FallbackOriginDeleteResponse]),
         )
 
     async def get(
@@ -287,13 +281,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[FallbackOriginGetResponse]:
         """
         Get Fallback Origin for Custom Hostnames
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -305,21 +299,16 @@ async def get(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            Optional[FallbackOriginGetResponse],
-            await self._get(
-                f"/zones/{zone_id}/custom_hostnames/fallback_origin",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[FallbackOriginGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[FallbackOriginGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._get(
+            f"/zones/{zone_id}/custom_hostnames/fallback_origin",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[FallbackOriginGetResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[FallbackOriginGetResponse]], ResultWrapper[FallbackOriginGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/custom_nameservers.py b/src/cloudflare/resources/custom_nameservers.py
index 29c581ade49..6545ebd198c 100644
--- a/src/cloudflare/resources/custom_nameservers.py
+++ b/src/cloudflare/resources/custom_nameservers.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from .._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from .._utils import maybe_transform, async_maybe_transform
 from .._compat import cached_property
 from .._resource import SyncAPIResource, AsyncAPIResource
 from .._response import (
@@ -20,12 +17,11 @@
     async_to_streamed_response_wrapper,
 )
 from .._wrappers import ResultWrapper
-from .._base_client import make_request_options
+from ..pagination import SyncSinglePage, AsyncSinglePage
+from .._base_client import AsyncPaginator, make_request_options
 from ..types.custom_nameservers import custom_nameserver_create_params
 from ..types.custom_nameservers.custom_nameserver import CustomNameserver
-from ..types.custom_nameservers.custom_nameserver_get_response import CustomNameserverGetResponse
 from ..types.custom_nameservers.custom_nameserver_delete_response import CustomNameserverDeleteResponse
-from ..types.custom_nameservers.custom_nameserver_availabilty_response import CustomNameserverAvailabiltyResponse
 
 __all__ = ["CustomNameserversResource", "AsyncCustomNameserversResource"]
 
@@ -33,10 +29,21 @@
 class CustomNameserversResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> CustomNameserversResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CustomNameserversResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CustomNameserversResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CustomNameserversResourceWithStreamingResponse(self)
 
     def create(
@@ -44,13 +51,13 @@ def create(
         *,
         account_id: str,
         ns_name: str,
-        ns_set: float | NotGiven = NOT_GIVEN,
+        ns_set: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomNameserver]:
         """
         Add Account Custom Nameserver
@@ -101,8 +108,8 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CustomNameserverDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[CustomNameserverDeleteResponse]:
         """
         Delete Account Custom Nameserver
 
@@ -123,57 +130,14 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not custom_ns_id:
             raise ValueError(f"Expected a non-empty value for `custom_ns_id` but received {custom_ns_id!r}")
-        return self._delete(
+        return self._get_api_list(
             f"/accounts/{account_id}/custom_ns/{custom_ns_id}",
+            page=SyncSinglePage[CustomNameserverDeleteResponse],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CustomNameserverDeleteResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CustomNameserverDeleteResponse]], ResultWrapper[CustomNameserverDeleteResponse]),
-        )
-
-    def availabilty(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CustomNameserverAvailabiltyResponse]:
-        """
-        Get Eligible Zones for Account Custom Nameservers
-
-        Args:
-          account_id: Account identifier tag.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/custom_ns/availability",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CustomNameserverAvailabiltyResponse]]._unwrapper,
-            ),
-            cast_to=cast(
-                Type[Optional[CustomNameserverAvailabiltyResponse]], ResultWrapper[CustomNameserverAvailabiltyResponse]
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
+            model=str,
+            method="delete",
         )
 
     def get(
@@ -185,8 +149,8 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CustomNameserverGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[CustomNameserver]:
         """
         List an account's custom nameservers.
 
@@ -203,26 +167,34 @@ def get(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/custom_ns",
+            page=SyncSinglePage[CustomNameserver],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CustomNameserverGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[CustomNameserverGetResponse]], ResultWrapper[CustomNameserverGetResponse]),
+            model=CustomNameserver,
         )
 
 
 class AsyncCustomNameserversResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncCustomNameserversResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCustomNameserversResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCustomNameserversResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCustomNameserversResourceWithStreamingResponse(self)
 
     async def create(
@@ -230,13 +202,13 @@ async def create(
         *,
         account_id: str,
         ns_name: str,
-        ns_set: float | NotGiven = NOT_GIVEN,
+        ns_set: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomNameserver]:
         """
         Add Account Custom Nameserver
@@ -277,7 +249,7 @@ async def create(
             cast_to=cast(Type[Optional[CustomNameserver]], ResultWrapper[CustomNameserver]),
         )
 
-    async def delete(
+    def delete(
         self,
         custom_ns_id: str,
         *,
@@ -287,8 +259,8 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CustomNameserverDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[CustomNameserverDeleteResponse, AsyncSinglePage[CustomNameserverDeleteResponse]]:
         """
         Delete Account Custom Nameserver
 
@@ -309,60 +281,17 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not custom_ns_id:
             raise ValueError(f"Expected a non-empty value for `custom_ns_id` but received {custom_ns_id!r}")
-        return await self._delete(
+        return self._get_api_list(
             f"/accounts/{account_id}/custom_ns/{custom_ns_id}",
+            page=AsyncSinglePage[CustomNameserverDeleteResponse],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CustomNameserverDeleteResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[CustomNameserverDeleteResponse]], ResultWrapper[CustomNameserverDeleteResponse]),
+            model=str,
+            method="delete",
         )
 
-    async def availabilty(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CustomNameserverAvailabiltyResponse]:
-        """
-        Get Eligible Zones for Account Custom Nameservers
-
-        Args:
-          account_id: Account identifier tag.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/custom_ns/availability",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CustomNameserverAvailabiltyResponse]]._unwrapper,
-            ),
-            cast_to=cast(
-                Type[Optional[CustomNameserverAvailabiltyResponse]], ResultWrapper[CustomNameserverAvailabiltyResponse]
-            ),
-        )
-
-    async def get(
+    def get(
         self,
         *,
         account_id: str,
@@ -371,8 +300,8 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CustomNameserverGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[CustomNameserver, AsyncSinglePage[CustomNameserver]]:
         """
         List an account's custom nameservers.
 
@@ -389,16 +318,13 @@ async def get(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/custom_ns",
+            page=AsyncSinglePage[CustomNameserver],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CustomNameserverGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[CustomNameserverGetResponse]], ResultWrapper[CustomNameserverGetResponse]),
+            model=CustomNameserver,
         )
 
 
@@ -412,9 +338,6 @@ def __init__(self, custom_nameservers: CustomNameserversResource) -> None:
         self.delete = to_raw_response_wrapper(
             custom_nameservers.delete,
         )
-        self.availabilty = to_raw_response_wrapper(
-            custom_nameservers.availabilty,
-        )
         self.get = to_raw_response_wrapper(
             custom_nameservers.get,
         )
@@ -430,9 +353,6 @@ def __init__(self, custom_nameservers: AsyncCustomNameserversResource) -> None:
         self.delete = async_to_raw_response_wrapper(
             custom_nameservers.delete,
         )
-        self.availabilty = async_to_raw_response_wrapper(
-            custom_nameservers.availabilty,
-        )
         self.get = async_to_raw_response_wrapper(
             custom_nameservers.get,
         )
@@ -448,9 +368,6 @@ def __init__(self, custom_nameservers: CustomNameserversResource) -> None:
         self.delete = to_streamed_response_wrapper(
             custom_nameservers.delete,
         )
-        self.availabilty = to_streamed_response_wrapper(
-            custom_nameservers.availabilty,
-        )
         self.get = to_streamed_response_wrapper(
             custom_nameservers.get,
         )
@@ -466,9 +383,6 @@ def __init__(self, custom_nameservers: AsyncCustomNameserversResource) -> None:
         self.delete = async_to_streamed_response_wrapper(
             custom_nameservers.delete,
         )
-        self.availabilty = async_to_streamed_response_wrapper(
-            custom_nameservers.availabilty,
-        )
         self.get = async_to_streamed_response_wrapper(
             custom_nameservers.get,
         )
diff --git a/src/cloudflare/resources/custom_pages.py b/src/cloudflare/resources/custom_pages.py
new file mode 100644
index 00000000000..2de87b71570
--- /dev/null
+++ b/src/cloudflare/resources/custom_pages.py
@@ -0,0 +1,526 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from .._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from .._utils import maybe_transform, async_maybe_transform
+from .._compat import cached_property
+from .._resource import SyncAPIResource, AsyncAPIResource
+from .._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from .._wrappers import ResultWrapper
+from ..pagination import SyncSinglePage, AsyncSinglePage
+from .._base_client import AsyncPaginator, make_request_options
+from ..types.custom_pages import custom_page_update_params
+from ..types.custom_pages.custom_page_get_response import CustomPageGetResponse
+from ..types.custom_pages.custom_page_list_response import CustomPageListResponse
+from ..types.custom_pages.custom_page_update_response import CustomPageUpdateResponse
+
+__all__ = ["CustomPagesResource", "AsyncCustomPagesResource"]
+
+
+class CustomPagesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> CustomPagesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CustomPagesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CustomPagesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CustomPagesResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        identifier: Literal[
+            "1000_errors",
+            "500_errors",
+            "basic_challenge",
+            "country_challenge",
+            "ip_block",
+            "managed_challenge",
+            "ratelimit_block",
+            "under_attack",
+            "waf_block",
+            "waf_challenge",
+        ],
+        *,
+        state: Literal["default", "customized"],
+        url: str,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomPageUpdateResponse]:
+        """
+        Updates the configuration of an existing custom page.
+
+        Args:
+          identifier: Error Page Types
+
+          state: The custom page state.
+
+          url: The URL associated with the custom page.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not identifier:
+            raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._put(
+            f"/{account_or_zone}/{account_or_zone_id}/custom_pages/{identifier}",
+            body=maybe_transform(
+                {
+                    "state": state,
+                    "url": url,
+                },
+                custom_page_update_params.CustomPageUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CustomPageUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CustomPageUpdateResponse]], ResultWrapper[CustomPageUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[CustomPageListResponse]:
+        """
+        Fetches all the custom pages.
+
+        Args:
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._get_api_list(
+            f"/{account_or_zone}/{account_or_zone_id}/custom_pages",
+            page=SyncSinglePage[CustomPageListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=CustomPageListResponse,
+        )
+
+    def get(
+        self,
+        identifier: Literal[
+            "1000_errors",
+            "500_errors",
+            "basic_challenge",
+            "country_challenge",
+            "ip_block",
+            "managed_challenge",
+            "ratelimit_block",
+            "under_attack",
+            "waf_block",
+            "waf_challenge",
+        ],
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomPageGetResponse]:
+        """
+        Fetches the details of a custom page.
+
+        Args:
+          identifier: Error Page Types
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not identifier:
+            raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._get(
+            f"/{account_or_zone}/{account_or_zone_id}/custom_pages/{identifier}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CustomPageGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CustomPageGetResponse]], ResultWrapper[CustomPageGetResponse]),
+        )
+
+
+class AsyncCustomPagesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncCustomPagesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCustomPagesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCustomPagesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCustomPagesResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        identifier: Literal[
+            "1000_errors",
+            "500_errors",
+            "basic_challenge",
+            "country_challenge",
+            "ip_block",
+            "managed_challenge",
+            "ratelimit_block",
+            "under_attack",
+            "waf_block",
+            "waf_challenge",
+        ],
+        *,
+        state: Literal["default", "customized"],
+        url: str,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomPageUpdateResponse]:
+        """
+        Updates the configuration of an existing custom page.
+
+        Args:
+          identifier: Error Page Types
+
+          state: The custom page state.
+
+          url: The URL associated with the custom page.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not identifier:
+            raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return await self._put(
+            f"/{account_or_zone}/{account_or_zone_id}/custom_pages/{identifier}",
+            body=await async_maybe_transform(
+                {
+                    "state": state,
+                    "url": url,
+                },
+                custom_page_update_params.CustomPageUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CustomPageUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CustomPageUpdateResponse]], ResultWrapper[CustomPageUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[CustomPageListResponse, AsyncSinglePage[CustomPageListResponse]]:
+        """
+        Fetches all the custom pages.
+
+        Args:
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._get_api_list(
+            f"/{account_or_zone}/{account_or_zone_id}/custom_pages",
+            page=AsyncSinglePage[CustomPageListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=CustomPageListResponse,
+        )
+
+    async def get(
+        self,
+        identifier: Literal[
+            "1000_errors",
+            "500_errors",
+            "basic_challenge",
+            "country_challenge",
+            "ip_block",
+            "managed_challenge",
+            "ratelimit_block",
+            "under_attack",
+            "waf_block",
+            "waf_challenge",
+        ],
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomPageGetResponse]:
+        """
+        Fetches the details of a custom page.
+
+        Args:
+          identifier: Error Page Types
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not identifier:
+            raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return await self._get(
+            f"/{account_or_zone}/{account_or_zone_id}/custom_pages/{identifier}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CustomPageGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CustomPageGetResponse]], ResultWrapper[CustomPageGetResponse]),
+        )
+
+
+class CustomPagesResourceWithRawResponse:
+    def __init__(self, custom_pages: CustomPagesResource) -> None:
+        self._custom_pages = custom_pages
+
+        self.update = to_raw_response_wrapper(
+            custom_pages.update,
+        )
+        self.list = to_raw_response_wrapper(
+            custom_pages.list,
+        )
+        self.get = to_raw_response_wrapper(
+            custom_pages.get,
+        )
+
+
+class AsyncCustomPagesResourceWithRawResponse:
+    def __init__(self, custom_pages: AsyncCustomPagesResource) -> None:
+        self._custom_pages = custom_pages
+
+        self.update = async_to_raw_response_wrapper(
+            custom_pages.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            custom_pages.list,
+        )
+        self.get = async_to_raw_response_wrapper(
+            custom_pages.get,
+        )
+
+
+class CustomPagesResourceWithStreamingResponse:
+    def __init__(self, custom_pages: CustomPagesResource) -> None:
+        self._custom_pages = custom_pages
+
+        self.update = to_streamed_response_wrapper(
+            custom_pages.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            custom_pages.list,
+        )
+        self.get = to_streamed_response_wrapper(
+            custom_pages.get,
+        )
+
+
+class AsyncCustomPagesResourceWithStreamingResponse:
+    def __init__(self, custom_pages: AsyncCustomPagesResource) -> None:
+        self._custom_pages = custom_pages
+
+        self.update = async_to_streamed_response_wrapper(
+            custom_pages.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            custom_pages.list,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            custom_pages.get,
+        )
diff --git a/src/cloudflare/resources/d1/d1.py b/src/cloudflare/resources/d1/d1.py
index 713183e81ab..5ced774c43f 100644
--- a/src/cloudflare/resources/d1/d1.py
+++ b/src/cloudflare/resources/d1/d1.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .database import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .database.database import (
     DatabaseResource,
     AsyncDatabaseResource,
     DatabaseResourceWithRawResponse,
@@ -10,8 +12,6 @@
     DatabaseResourceWithStreamingResponse,
     AsyncDatabaseResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
 
 __all__ = ["D1Resource", "AsyncD1Resource"]
 
@@ -23,10 +23,21 @@ def database(self) -> DatabaseResource:
 
     @cached_property
     def with_raw_response(self) -> D1ResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return D1ResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> D1ResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return D1ResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def database(self) -> AsyncDatabaseResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncD1ResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncD1ResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncD1ResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncD1ResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/d1/database.py b/src/cloudflare/resources/d1/database.py
deleted file mode 100644
index 14a2dfce413..00000000000
--- a/src/cloudflare/resources/d1/database.py
+++ /dev/null
@@ -1,762 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Any, List, Type, cast
-from typing_extensions import Literal
-
-import httpx
-
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ..._compat import cached_property
-from ...types.d1 import database_raw_params, database_list_params, database_query_params, database_create_params
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ..._wrappers import ResultWrapper
-from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
-from ...types.d1.d1 import D1
-from ..._base_client import AsyncPaginator, make_request_options
-from ...types.d1.database_raw_response import DatabaseRawResponse
-from ...types.d1.database_list_response import DatabaseListResponse
-from ...types.d1.database_query_response import DatabaseQueryResponse
-from ...types.d1.database_create_response import DatabaseCreateResponse
-from ...types.d1.database_delete_response import DatabaseDeleteResponse
-
-__all__ = ["DatabaseResource", "AsyncDatabaseResource"]
-
-
-class DatabaseResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> DatabaseResourceWithRawResponse:
-        return DatabaseResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> DatabaseResourceWithStreamingResponse:
-        return DatabaseResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        *,
-        account_id: str,
-        name: str,
-        primary_location_hint: Literal["wnam", "enam", "weur", "eeur", "apac", "oc"] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> DatabaseCreateResponse:
-        """
-        Returns the created D1 database.
-
-        Args:
-          account_id: Account identifier tag.
-
-          primary_location_hint: Specify the region to create the D1 primary, if available. If this option is
-              omitted, the D1 will be created as close as possible to the current user.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._post(
-            f"/accounts/{account_id}/d1/database",
-            body=maybe_transform(
-                {
-                    "name": name,
-                    "primary_location_hint": primary_location_hint,
-                },
-                database_create_params.DatabaseCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[DatabaseCreateResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[DatabaseCreateResponse], ResultWrapper[DatabaseCreateResponse]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePaginationArray[DatabaseListResponse]:
-        """
-        Returns a list of D1 databases.
-
-        Args:
-          account_id: Account identifier tag.
-
-          name: a database name to search for.
-
-          page: Page number of paginated results.
-
-          per_page: Number of items per page.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/d1/database",
-            page=SyncV4PagePaginationArray[DatabaseListResponse],
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "name": name,
-                        "page": page,
-                        "per_page": per_page,
-                    },
-                    database_list_params.DatabaseListParams,
-                ),
-            ),
-            model=DatabaseListResponse,
-        )
-
-    def delete(
-        self,
-        database_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> DatabaseDeleteResponse:
-        """
-        Deletes the specified D1 database.
-
-        Args:
-          account_id: Account identifier tag.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not database_id:
-            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
-        return cast(
-            DatabaseDeleteResponse,
-            self._delete(
-                f"/accounts/{account_id}/d1/database/{database_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[DatabaseDeleteResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DatabaseDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    def get(
-        self,
-        database_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> D1:
-        """
-        Returns the specified D1 database.
-
-        Args:
-          account_id: Account identifier tag.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not database_id:
-            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/d1/database/{database_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[D1]._unwrapper,
-            ),
-            cast_to=cast(Type[D1], ResultWrapper[D1]),
-        )
-
-    def query(
-        self,
-        database_id: str,
-        *,
-        account_id: str,
-        sql: str,
-        params: List[str] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> DatabaseQueryResponse:
-        """
-        Returns the query result as an object.
-
-        Args:
-          account_id: Account identifier tag.
-
-          sql: Your SQL query. Supports multiple statements, joined by semicolons, which will
-              be executed as a batch.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not database_id:
-            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
-        return self._post(
-            f"/accounts/{account_id}/d1/database/{database_id}/query",
-            body=maybe_transform(
-                {
-                    "sql": sql,
-                    "params": params,
-                },
-                database_query_params.DatabaseQueryParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[DatabaseQueryResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[DatabaseQueryResponse], ResultWrapper[DatabaseQueryResponse]),
-        )
-
-    def raw(
-        self,
-        database_id: str,
-        *,
-        account_id: str,
-        sql: str,
-        params: List[str] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> DatabaseRawResponse:
-        """Returns the query result rows as arrays rather than objects.
-
-        This is a
-        performance-optimized version of the /query endpoint.
-
-        Args:
-          account_id: Account identifier tag.
-
-          sql: Your SQL query. Supports multiple statements, joined by semicolons, which will
-              be executed as a batch.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not database_id:
-            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
-        return self._post(
-            f"/accounts/{account_id}/d1/database/{database_id}/raw",
-            body=maybe_transform(
-                {
-                    "sql": sql,
-                    "params": params,
-                },
-                database_raw_params.DatabaseRawParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[DatabaseRawResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[DatabaseRawResponse], ResultWrapper[DatabaseRawResponse]),
-        )
-
-
-class AsyncDatabaseResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncDatabaseResourceWithRawResponse:
-        return AsyncDatabaseResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncDatabaseResourceWithStreamingResponse:
-        return AsyncDatabaseResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        *,
-        account_id: str,
-        name: str,
-        primary_location_hint: Literal["wnam", "enam", "weur", "eeur", "apac", "oc"] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> DatabaseCreateResponse:
-        """
-        Returns the created D1 database.
-
-        Args:
-          account_id: Account identifier tag.
-
-          primary_location_hint: Specify the region to create the D1 primary, if available. If this option is
-              omitted, the D1 will be created as close as possible to the current user.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._post(
-            f"/accounts/{account_id}/d1/database",
-            body=await async_maybe_transform(
-                {
-                    "name": name,
-                    "primary_location_hint": primary_location_hint,
-                },
-                database_create_params.DatabaseCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[DatabaseCreateResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[DatabaseCreateResponse], ResultWrapper[DatabaseCreateResponse]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[DatabaseListResponse, AsyncV4PagePaginationArray[DatabaseListResponse]]:
-        """
-        Returns a list of D1 databases.
-
-        Args:
-          account_id: Account identifier tag.
-
-          name: a database name to search for.
-
-          page: Page number of paginated results.
-
-          per_page: Number of items per page.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/d1/database",
-            page=AsyncV4PagePaginationArray[DatabaseListResponse],
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "name": name,
-                        "page": page,
-                        "per_page": per_page,
-                    },
-                    database_list_params.DatabaseListParams,
-                ),
-            ),
-            model=DatabaseListResponse,
-        )
-
-    async def delete(
-        self,
-        database_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> DatabaseDeleteResponse:
-        """
-        Deletes the specified D1 database.
-
-        Args:
-          account_id: Account identifier tag.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not database_id:
-            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
-        return cast(
-            DatabaseDeleteResponse,
-            await self._delete(
-                f"/accounts/{account_id}/d1/database/{database_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[DatabaseDeleteResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DatabaseDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    async def get(
-        self,
-        database_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> D1:
-        """
-        Returns the specified D1 database.
-
-        Args:
-          account_id: Account identifier tag.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not database_id:
-            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/d1/database/{database_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[D1]._unwrapper,
-            ),
-            cast_to=cast(Type[D1], ResultWrapper[D1]),
-        )
-
-    async def query(
-        self,
-        database_id: str,
-        *,
-        account_id: str,
-        sql: str,
-        params: List[str] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> DatabaseQueryResponse:
-        """
-        Returns the query result as an object.
-
-        Args:
-          account_id: Account identifier tag.
-
-          sql: Your SQL query. Supports multiple statements, joined by semicolons, which will
-              be executed as a batch.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not database_id:
-            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
-        return await self._post(
-            f"/accounts/{account_id}/d1/database/{database_id}/query",
-            body=await async_maybe_transform(
-                {
-                    "sql": sql,
-                    "params": params,
-                },
-                database_query_params.DatabaseQueryParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[DatabaseQueryResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[DatabaseQueryResponse], ResultWrapper[DatabaseQueryResponse]),
-        )
-
-    async def raw(
-        self,
-        database_id: str,
-        *,
-        account_id: str,
-        sql: str,
-        params: List[str] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> DatabaseRawResponse:
-        """Returns the query result rows as arrays rather than objects.
-
-        This is a
-        performance-optimized version of the /query endpoint.
-
-        Args:
-          account_id: Account identifier tag.
-
-          sql: Your SQL query. Supports multiple statements, joined by semicolons, which will
-              be executed as a batch.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not database_id:
-            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
-        return await self._post(
-            f"/accounts/{account_id}/d1/database/{database_id}/raw",
-            body=await async_maybe_transform(
-                {
-                    "sql": sql,
-                    "params": params,
-                },
-                database_raw_params.DatabaseRawParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[DatabaseRawResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[DatabaseRawResponse], ResultWrapper[DatabaseRawResponse]),
-        )
-
-
-class DatabaseResourceWithRawResponse:
-    def __init__(self, database: DatabaseResource) -> None:
-        self._database = database
-
-        self.create = to_raw_response_wrapper(
-            database.create,
-        )
-        self.list = to_raw_response_wrapper(
-            database.list,
-        )
-        self.delete = to_raw_response_wrapper(
-            database.delete,
-        )
-        self.get = to_raw_response_wrapper(
-            database.get,
-        )
-        self.query = to_raw_response_wrapper(
-            database.query,
-        )
-        self.raw = to_raw_response_wrapper(
-            database.raw,
-        )
-
-
-class AsyncDatabaseResourceWithRawResponse:
-    def __init__(self, database: AsyncDatabaseResource) -> None:
-        self._database = database
-
-        self.create = async_to_raw_response_wrapper(
-            database.create,
-        )
-        self.list = async_to_raw_response_wrapper(
-            database.list,
-        )
-        self.delete = async_to_raw_response_wrapper(
-            database.delete,
-        )
-        self.get = async_to_raw_response_wrapper(
-            database.get,
-        )
-        self.query = async_to_raw_response_wrapper(
-            database.query,
-        )
-        self.raw = async_to_raw_response_wrapper(
-            database.raw,
-        )
-
-
-class DatabaseResourceWithStreamingResponse:
-    def __init__(self, database: DatabaseResource) -> None:
-        self._database = database
-
-        self.create = to_streamed_response_wrapper(
-            database.create,
-        )
-        self.list = to_streamed_response_wrapper(
-            database.list,
-        )
-        self.delete = to_streamed_response_wrapper(
-            database.delete,
-        )
-        self.get = to_streamed_response_wrapper(
-            database.get,
-        )
-        self.query = to_streamed_response_wrapper(
-            database.query,
-        )
-        self.raw = to_streamed_response_wrapper(
-            database.raw,
-        )
-
-
-class AsyncDatabaseResourceWithStreamingResponse:
-    def __init__(self, database: AsyncDatabaseResource) -> None:
-        self._database = database
-
-        self.create = async_to_streamed_response_wrapper(
-            database.create,
-        )
-        self.list = async_to_streamed_response_wrapper(
-            database.list,
-        )
-        self.delete = async_to_streamed_response_wrapper(
-            database.delete,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            database.get,
-        )
-        self.query = async_to_streamed_response_wrapper(
-            database.query,
-        )
-        self.raw = async_to_streamed_response_wrapper(
-            database.raw,
-        )
diff --git a/src/cloudflare/resources/d1/database/__init__.py b/src/cloudflare/resources/d1/database/__init__.py
new file mode 100644
index 00000000000..5834ebb6a1f
--- /dev/null
+++ b/src/cloudflare/resources/d1/database/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .database import (
+    DatabaseResource,
+    AsyncDatabaseResource,
+    DatabaseResourceWithRawResponse,
+    AsyncDatabaseResourceWithRawResponse,
+    DatabaseResourceWithStreamingResponse,
+    AsyncDatabaseResourceWithStreamingResponse,
+)
+from .time_travel import (
+    TimeTravelResource,
+    AsyncTimeTravelResource,
+    TimeTravelResourceWithRawResponse,
+    AsyncTimeTravelResourceWithRawResponse,
+    TimeTravelResourceWithStreamingResponse,
+    AsyncTimeTravelResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "TimeTravelResource",
+    "AsyncTimeTravelResource",
+    "TimeTravelResourceWithRawResponse",
+    "AsyncTimeTravelResourceWithRawResponse",
+    "TimeTravelResourceWithStreamingResponse",
+    "AsyncTimeTravelResourceWithStreamingResponse",
+    "DatabaseResource",
+    "AsyncDatabaseResource",
+    "DatabaseResourceWithRawResponse",
+    "AsyncDatabaseResourceWithRawResponse",
+    "DatabaseResourceWithStreamingResponse",
+    "AsyncDatabaseResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/d1/database/database.py b/src/cloudflare/resources/d1/database/database.py
new file mode 100644
index 00000000000..75d928a5a70
--- /dev/null
+++ b/src/cloudflare/resources/d1/database/database.py
@@ -0,0 +1,1756 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, Optional, cast
+from typing_extensions import Literal, overload
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import required_args, maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ....types.d1 import (
+    database_raw_params,
+    database_edit_params,
+    database_list_params,
+    database_query_params,
+    database_create_params,
+    database_export_params,
+    database_import_params,
+    database_update_params,
+)
+from .time_travel import (
+    TimeTravelResource,
+    AsyncTimeTravelResource,
+    TimeTravelResourceWithRawResponse,
+    AsyncTimeTravelResourceWithRawResponse,
+    TimeTravelResourceWithStreamingResponse,
+    AsyncTimeTravelResourceWithStreamingResponse,
+)
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ....types.d1.d1 import D1
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.d1.query_result import QueryResult
+from ....types.d1.database_raw_response import DatabaseRawResponse
+from ....types.d1.database_list_response import DatabaseListResponse
+from ....types.d1.database_export_response import DatabaseExportResponse
+from ....types.d1.database_import_response import DatabaseImportResponse
+
+__all__ = ["DatabaseResource", "AsyncDatabaseResource"]
+
+
+class DatabaseResource(SyncAPIResource):
+    @cached_property
+    def time_travel(self) -> TimeTravelResource:
+        return TimeTravelResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> DatabaseResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return DatabaseResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> DatabaseResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return DatabaseResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        jurisdiction: Literal["eu", "fedramp"] | Omit = omit,
+        primary_location_hint: Literal["wnam", "enam", "weur", "eeur", "apac", "oc"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> D1:
+        """
+        Returns the created D1 database.
+
+        Args:
+          account_id: Account identifier tag.
+
+          name: D1 database name.
+
+          jurisdiction: Specify the location to restrict the D1 database to run and store data. If this
+              option is present, the location hint is ignored.
+
+          primary_location_hint: Specify the region to create the D1 primary, if available. If this option is
+              omitted, the D1 will be created as close as possible to the current user.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/d1/database",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "jurisdiction": jurisdiction,
+                    "primary_location_hint": primary_location_hint,
+                },
+                database_create_params.DatabaseCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[D1]._unwrapper,
+            ),
+            cast_to=cast(Type[D1], ResultWrapper[D1]),
+        )
+
+    def update(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        read_replication: database_update_params.ReadReplication,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> D1:
+        """
+        Updates the specified D1 database.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          read_replication: Configuration for D1 read replication.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/d1/database/{database_id}",
+            body=maybe_transform({"read_replication": read_replication}, database_update_params.DatabaseUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[D1]._unwrapper,
+            ),
+            cast_to=cast(Type[D1], ResultWrapper[D1]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[DatabaseListResponse]:
+        """
+        Returns a list of D1 databases.
+
+        Args:
+          account_id: Account identifier tag.
+
+          name: a database name to search for.
+
+          page: Page number of paginated results.
+
+          per_page: Number of items per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/d1/database",
+            page=SyncV4PagePaginationArray[DatabaseListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    database_list_params.DatabaseListParams,
+                ),
+            ),
+            model=DatabaseListResponse,
+        )
+
+    def delete(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Deletes the specified D1 database.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/d1/database/{database_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def edit(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        read_replication: database_edit_params.ReadReplication | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> D1:
+        """
+        Updates partially the specified D1 database.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          read_replication: Configuration for D1 read replication.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/d1/database/{database_id}",
+            body=maybe_transform({"read_replication": read_replication}, database_edit_params.DatabaseEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[D1]._unwrapper,
+            ),
+            cast_to=cast(Type[D1], ResultWrapper[D1]),
+        )
+
+    def export(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        output_format: Literal["polling"],
+        current_bookmark: str | Omit = omit,
+        dump_options: database_export_params.DumpOptions | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatabaseExportResponse:
+        """Returns a URL where the SQL contents of your D1 can be downloaded.
+
+        Note: this
+        process may take some time for larger DBs, during which your D1 will be
+        unavailable to serve queries. To avoid blocking your DB unnecessarily, an
+        in-progress export must be continually polled or will automatically cancel.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          output_format: Specifies that you will poll this endpoint until the export completes
+
+          current_bookmark: To poll an in-progress export, provide the current bookmark (returned by your
+              first polling response)
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/d1/database/{database_id}/export",
+            body=maybe_transform(
+                {
+                    "output_format": output_format,
+                    "current_bookmark": current_bookmark,
+                    "dump_options": dump_options,
+                },
+                database_export_params.DatabaseExportParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DatabaseExportResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DatabaseExportResponse], ResultWrapper[DatabaseExportResponse]),
+        )
+
+    def get(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> D1:
+        """
+        Returns the specified D1 database.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/d1/database/{database_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[D1]._unwrapper,
+            ),
+            cast_to=cast(Type[D1], ResultWrapper[D1]),
+        )
+
+    @overload
+    def import_(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        action: Literal["init"],
+        etag: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatabaseImportResponse:
+        """
+        Generates a temporary URL for uploading an SQL file to, then instructing the D1
+        to import it and polling it for status updates. Imports block the D1 for their
+        duration.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          action: Indicates you have a new SQL file to upload.
+
+          etag: Required when action is 'init' or 'ingest'. An md5 hash of the file you're
+              uploading. Used to check if it already exists, and validate its contents before
+              ingesting.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def import_(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        action: Literal["ingest"],
+        etag: str,
+        filename: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatabaseImportResponse:
+        """
+        Generates a temporary URL for uploading an SQL file to, then instructing the D1
+        to import it and polling it for status updates. Imports block the D1 for their
+        duration.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          action: Indicates you've finished uploading to tell the D1 to start consuming it
+
+          etag: An md5 hash of the file you're uploading. Used to check if it already exists,
+              and validate its contents before ingesting.
+
+          filename: The filename you have successfully uploaded.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def import_(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        action: Literal["poll"],
+        current_bookmark: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatabaseImportResponse:
+        """
+        Generates a temporary URL for uploading an SQL file to, then instructing the D1
+        to import it and polling it for status updates. Imports block the D1 for their
+        duration.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          action: Indicates you've finished uploading to tell the D1 to start consuming it
+
+          current_bookmark: This identifies the currently-running import, checking its status.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(
+        ["account_id", "action", "etag"],
+        ["account_id", "action", "etag", "filename"],
+        ["account_id", "action", "current_bookmark"],
+    )
+    def import_(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        action: Literal["init"] | Literal["ingest"] | Literal["poll"],
+        etag: str | Omit = omit,
+        filename: str | Omit = omit,
+        current_bookmark: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatabaseImportResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/d1/database/{database_id}/import",
+            body=maybe_transform(
+                {
+                    "action": action,
+                    "etag": etag,
+                    "filename": filename,
+                    "current_bookmark": current_bookmark,
+                },
+                database_import_params.DatabaseImportParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DatabaseImportResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DatabaseImportResponse], ResultWrapper[DatabaseImportResponse]),
+        )
+
+    @overload
+    def query(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        sql: str,
+        params: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[QueryResult]:
+        """
+        Returns the query result as an object.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          sql: Your SQL query. Supports multiple statements, joined by semicolons, which will
+              be executed as a batch.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def query(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        batch: Iterable[database_query_params.MultipleQueriesBatch],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[QueryResult]:
+        """
+        Returns the query result as an object.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "sql"], ["account_id", "batch"])
+    def query(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        sql: str | Omit = omit,
+        params: SequenceNotStr[str] | Omit = omit,
+        batch: Iterable[database_query_params.MultipleQueriesBatch] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[QueryResult]:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/d1/database/{database_id}/query",
+            page=SyncSinglePage[QueryResult],
+            body=maybe_transform(
+                {
+                    "sql": sql,
+                    "params": params,
+                    "batch": batch,
+                },
+                database_query_params.DatabaseQueryParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=QueryResult,
+            method="post",
+        )
+
+    @overload
+    def raw(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        sql: str,
+        params: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[DatabaseRawResponse]:
+        """Returns the query result rows as arrays rather than objects.
+
+        This is a
+        performance-optimized version of the /query endpoint.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          sql: Your SQL query. Supports multiple statements, joined by semicolons, which will
+              be executed as a batch.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def raw(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        batch: Iterable[database_raw_params.MultipleQueriesBatch],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[DatabaseRawResponse]:
+        """Returns the query result rows as arrays rather than objects.
+
+        This is a
+        performance-optimized version of the /query endpoint.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "sql"], ["account_id", "batch"])
+    def raw(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        sql: str | Omit = omit,
+        params: SequenceNotStr[str] | Omit = omit,
+        batch: Iterable[database_raw_params.MultipleQueriesBatch] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[DatabaseRawResponse]:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/d1/database/{database_id}/raw",
+            page=SyncSinglePage[DatabaseRawResponse],
+            body=maybe_transform(
+                {
+                    "sql": sql,
+                    "params": params,
+                    "batch": batch,
+                },
+                database_raw_params.DatabaseRawParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=DatabaseRawResponse,
+            method="post",
+        )
+
+
+class AsyncDatabaseResource(AsyncAPIResource):
+    @cached_property
+    def time_travel(self) -> AsyncTimeTravelResource:
+        return AsyncTimeTravelResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncDatabaseResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncDatabaseResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncDatabaseResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncDatabaseResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        jurisdiction: Literal["eu", "fedramp"] | Omit = omit,
+        primary_location_hint: Literal["wnam", "enam", "weur", "eeur", "apac", "oc"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> D1:
+        """
+        Returns the created D1 database.
+
+        Args:
+          account_id: Account identifier tag.
+
+          name: D1 database name.
+
+          jurisdiction: Specify the location to restrict the D1 database to run and store data. If this
+              option is present, the location hint is ignored.
+
+          primary_location_hint: Specify the region to create the D1 primary, if available. If this option is
+              omitted, the D1 will be created as close as possible to the current user.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/d1/database",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "jurisdiction": jurisdiction,
+                    "primary_location_hint": primary_location_hint,
+                },
+                database_create_params.DatabaseCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[D1]._unwrapper,
+            ),
+            cast_to=cast(Type[D1], ResultWrapper[D1]),
+        )
+
+    async def update(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        read_replication: database_update_params.ReadReplication,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> D1:
+        """
+        Updates the specified D1 database.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          read_replication: Configuration for D1 read replication.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/d1/database/{database_id}",
+            body=await async_maybe_transform(
+                {"read_replication": read_replication}, database_update_params.DatabaseUpdateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[D1]._unwrapper,
+            ),
+            cast_to=cast(Type[D1], ResultWrapper[D1]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[DatabaseListResponse, AsyncV4PagePaginationArray[DatabaseListResponse]]:
+        """
+        Returns a list of D1 databases.
+
+        Args:
+          account_id: Account identifier tag.
+
+          name: a database name to search for.
+
+          page: Page number of paginated results.
+
+          per_page: Number of items per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/d1/database",
+            page=AsyncV4PagePaginationArray[DatabaseListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    database_list_params.DatabaseListParams,
+                ),
+            ),
+            model=DatabaseListResponse,
+        )
+
+    async def delete(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Deletes the specified D1 database.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/d1/database/{database_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def edit(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        read_replication: database_edit_params.ReadReplication | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> D1:
+        """
+        Updates partially the specified D1 database.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          read_replication: Configuration for D1 read replication.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/d1/database/{database_id}",
+            body=await async_maybe_transform(
+                {"read_replication": read_replication}, database_edit_params.DatabaseEditParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[D1]._unwrapper,
+            ),
+            cast_to=cast(Type[D1], ResultWrapper[D1]),
+        )
+
+    async def export(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        output_format: Literal["polling"],
+        current_bookmark: str | Omit = omit,
+        dump_options: database_export_params.DumpOptions | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatabaseExportResponse:
+        """Returns a URL where the SQL contents of your D1 can be downloaded.
+
+        Note: this
+        process may take some time for larger DBs, during which your D1 will be
+        unavailable to serve queries. To avoid blocking your DB unnecessarily, an
+        in-progress export must be continually polled or will automatically cancel.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          output_format: Specifies that you will poll this endpoint until the export completes
+
+          current_bookmark: To poll an in-progress export, provide the current bookmark (returned by your
+              first polling response)
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/d1/database/{database_id}/export",
+            body=await async_maybe_transform(
+                {
+                    "output_format": output_format,
+                    "current_bookmark": current_bookmark,
+                    "dump_options": dump_options,
+                },
+                database_export_params.DatabaseExportParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DatabaseExportResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DatabaseExportResponse], ResultWrapper[DatabaseExportResponse]),
+        )
+
+    async def get(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> D1:
+        """
+        Returns the specified D1 database.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/d1/database/{database_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[D1]._unwrapper,
+            ),
+            cast_to=cast(Type[D1], ResultWrapper[D1]),
+        )
+
+    @overload
+    async def import_(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        action: Literal["init"],
+        etag: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatabaseImportResponse:
+        """
+        Generates a temporary URL for uploading an SQL file to, then instructing the D1
+        to import it and polling it for status updates. Imports block the D1 for their
+        duration.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          action: Indicates you have a new SQL file to upload.
+
+          etag: Required when action is 'init' or 'ingest'. An md5 hash of the file you're
+              uploading. Used to check if it already exists, and validate its contents before
+              ingesting.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def import_(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        action: Literal["ingest"],
+        etag: str,
+        filename: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatabaseImportResponse:
+        """
+        Generates a temporary URL for uploading an SQL file to, then instructing the D1
+        to import it and polling it for status updates. Imports block the D1 for their
+        duration.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          action: Indicates you've finished uploading to tell the D1 to start consuming it
+
+          etag: An md5 hash of the file you're uploading. Used to check if it already exists,
+              and validate its contents before ingesting.
+
+          filename: The filename you have successfully uploaded.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def import_(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        action: Literal["poll"],
+        current_bookmark: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatabaseImportResponse:
+        """
+        Generates a temporary URL for uploading an SQL file to, then instructing the D1
+        to import it and polling it for status updates. Imports block the D1 for their
+        duration.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          action: Indicates you've finished uploading to tell the D1 to start consuming it
+
+          current_bookmark: This identifies the currently-running import, checking its status.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(
+        ["account_id", "action", "etag"],
+        ["account_id", "action", "etag", "filename"],
+        ["account_id", "action", "current_bookmark"],
+    )
+    async def import_(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        action: Literal["init"] | Literal["ingest"] | Literal["poll"],
+        etag: str | Omit = omit,
+        filename: str | Omit = omit,
+        current_bookmark: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DatabaseImportResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/d1/database/{database_id}/import",
+            body=await async_maybe_transform(
+                {
+                    "action": action,
+                    "etag": etag,
+                    "filename": filename,
+                    "current_bookmark": current_bookmark,
+                },
+                database_import_params.DatabaseImportParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DatabaseImportResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DatabaseImportResponse], ResultWrapper[DatabaseImportResponse]),
+        )
+
+    @overload
+    def query(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        sql: str,
+        params: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[QueryResult, AsyncSinglePage[QueryResult]]:
+        """
+        Returns the query result as an object.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          sql: Your SQL query. Supports multiple statements, joined by semicolons, which will
+              be executed as a batch.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def query(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        batch: Iterable[database_query_params.MultipleQueriesBatch],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[QueryResult, AsyncSinglePage[QueryResult]]:
+        """
+        Returns the query result as an object.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "sql"], ["account_id", "batch"])
+    def query(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        sql: str | Omit = omit,
+        params: SequenceNotStr[str] | Omit = omit,
+        batch: Iterable[database_query_params.MultipleQueriesBatch] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[QueryResult, AsyncSinglePage[QueryResult]]:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/d1/database/{database_id}/query",
+            page=AsyncSinglePage[QueryResult],
+            body=maybe_transform(
+                {
+                    "sql": sql,
+                    "params": params,
+                    "batch": batch,
+                },
+                database_query_params.DatabaseQueryParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=QueryResult,
+            method="post",
+        )
+
+    @overload
+    def raw(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        sql: str,
+        params: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[DatabaseRawResponse, AsyncSinglePage[DatabaseRawResponse]]:
+        """Returns the query result rows as arrays rather than objects.
+
+        This is a
+        performance-optimized version of the /query endpoint.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          sql: Your SQL query. Supports multiple statements, joined by semicolons, which will
+              be executed as a batch.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def raw(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        batch: Iterable[database_raw_params.MultipleQueriesBatch],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[DatabaseRawResponse, AsyncSinglePage[DatabaseRawResponse]]:
+        """Returns the query result rows as arrays rather than objects.
+
+        This is a
+        performance-optimized version of the /query endpoint.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "sql"], ["account_id", "batch"])
+    def raw(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        sql: str | Omit = omit,
+        params: SequenceNotStr[str] | Omit = omit,
+        batch: Iterable[database_raw_params.MultipleQueriesBatch] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[DatabaseRawResponse, AsyncSinglePage[DatabaseRawResponse]]:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/d1/database/{database_id}/raw",
+            page=AsyncSinglePage[DatabaseRawResponse],
+            body=maybe_transform(
+                {
+                    "sql": sql,
+                    "params": params,
+                    "batch": batch,
+                },
+                database_raw_params.DatabaseRawParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=DatabaseRawResponse,
+            method="post",
+        )
+
+
+class DatabaseResourceWithRawResponse:
+    def __init__(self, database: DatabaseResource) -> None:
+        self._database = database
+
+        self.create = to_raw_response_wrapper(
+            database.create,
+        )
+        self.update = to_raw_response_wrapper(
+            database.update,
+        )
+        self.list = to_raw_response_wrapper(
+            database.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            database.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            database.edit,
+        )
+        self.export = to_raw_response_wrapper(
+            database.export,
+        )
+        self.get = to_raw_response_wrapper(
+            database.get,
+        )
+        self.import_ = to_raw_response_wrapper(
+            database.import_,
+        )
+        self.query = to_raw_response_wrapper(
+            database.query,
+        )
+        self.raw = to_raw_response_wrapper(
+            database.raw,
+        )
+
+    @cached_property
+    def time_travel(self) -> TimeTravelResourceWithRawResponse:
+        return TimeTravelResourceWithRawResponse(self._database.time_travel)
+
+
+class AsyncDatabaseResourceWithRawResponse:
+    def __init__(self, database: AsyncDatabaseResource) -> None:
+        self._database = database
+
+        self.create = async_to_raw_response_wrapper(
+            database.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            database.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            database.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            database.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            database.edit,
+        )
+        self.export = async_to_raw_response_wrapper(
+            database.export,
+        )
+        self.get = async_to_raw_response_wrapper(
+            database.get,
+        )
+        self.import_ = async_to_raw_response_wrapper(
+            database.import_,
+        )
+        self.query = async_to_raw_response_wrapper(
+            database.query,  # pyright: ignore[reportArgumentType]
+        )
+        self.raw = async_to_raw_response_wrapper(
+            database.raw,  # pyright: ignore[reportArgumentType]
+        )
+
+    @cached_property
+    def time_travel(self) -> AsyncTimeTravelResourceWithRawResponse:
+        return AsyncTimeTravelResourceWithRawResponse(self._database.time_travel)
+
+
+class DatabaseResourceWithStreamingResponse:
+    def __init__(self, database: DatabaseResource) -> None:
+        self._database = database
+
+        self.create = to_streamed_response_wrapper(
+            database.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            database.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            database.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            database.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            database.edit,
+        )
+        self.export = to_streamed_response_wrapper(
+            database.export,
+        )
+        self.get = to_streamed_response_wrapper(
+            database.get,
+        )
+        self.import_ = to_streamed_response_wrapper(
+            database.import_,
+        )
+        self.query = to_streamed_response_wrapper(
+            database.query,
+        )
+        self.raw = to_streamed_response_wrapper(
+            database.raw,
+        )
+
+    @cached_property
+    def time_travel(self) -> TimeTravelResourceWithStreamingResponse:
+        return TimeTravelResourceWithStreamingResponse(self._database.time_travel)
+
+
+class AsyncDatabaseResourceWithStreamingResponse:
+    def __init__(self, database: AsyncDatabaseResource) -> None:
+        self._database = database
+
+        self.create = async_to_streamed_response_wrapper(
+            database.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            database.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            database.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            database.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            database.edit,
+        )
+        self.export = async_to_streamed_response_wrapper(
+            database.export,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            database.get,
+        )
+        self.import_ = async_to_streamed_response_wrapper(
+            database.import_,
+        )
+        self.query = async_to_streamed_response_wrapper(
+            database.query,  # pyright: ignore[reportArgumentType]
+        )
+        self.raw = async_to_streamed_response_wrapper(
+            database.raw,  # pyright: ignore[reportArgumentType]
+        )
+
+    @cached_property
+    def time_travel(self) -> AsyncTimeTravelResourceWithStreamingResponse:
+        return AsyncTimeTravelResourceWithStreamingResponse(self._database.time_travel)
diff --git a/src/cloudflare/resources/d1/database/time_travel.py b/src/cloudflare/resources/d1/database/time_travel.py
new file mode 100644
index 00000000000..a3f6c68447d
--- /dev/null
+++ b/src/cloudflare/resources/d1/database/time_travel.py
@@ -0,0 +1,340 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Union, cast
+from datetime import datetime
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.d1.database import time_travel_restore_params, time_travel_get_bookmark_params
+from ....types.d1.database.time_travel_restore_response import TimeTravelRestoreResponse
+from ....types.d1.database.time_travel_get_bookmark_response import TimeTravelGetBookmarkResponse
+
+__all__ = ["TimeTravelResource", "AsyncTimeTravelResource"]
+
+
+class TimeTravelResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> TimeTravelResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TimeTravelResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TimeTravelResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TimeTravelResourceWithStreamingResponse(self)
+
+    def get_bookmark(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        timestamp: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeTravelGetBookmarkResponse:
+        """
+        Retrieves the current bookmark, or the nearest bookmark at or before a provided
+        timestamp. Bookmarks can be used with the restore endpoint to revert the
+        database to a previous point in time.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          timestamp: An optional ISO 8601 timestamp. If provided, returns the nearest available
+              bookmark at or before this timestamp. If omitted, returns the current bookmark.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/d1/database/{database_id}/time_travel/bookmark",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {"timestamp": timestamp}, time_travel_get_bookmark_params.TimeTravelGetBookmarkParams
+                ),
+                post_parser=ResultWrapper[TimeTravelGetBookmarkResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeTravelGetBookmarkResponse], ResultWrapper[TimeTravelGetBookmarkResponse]),
+        )
+
+    def restore(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        bookmark: str | Omit = omit,
+        timestamp: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeTravelRestoreResponse:
+        """
+        Restores a D1 database to a previous point in time either via a bookmark or a
+        timestamp.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          bookmark: A bookmark to restore the database to. Required if `timestamp` is not provided.
+
+          timestamp: An ISO 8601 timestamp to restore the database to. Required if `bookmark` is not
+              provided.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/d1/database/{database_id}/time_travel/restore",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "bookmark": bookmark,
+                        "timestamp": timestamp,
+                    },
+                    time_travel_restore_params.TimeTravelRestoreParams,
+                ),
+                post_parser=ResultWrapper[TimeTravelRestoreResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeTravelRestoreResponse], ResultWrapper[TimeTravelRestoreResponse]),
+        )
+
+
+class AsyncTimeTravelResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncTimeTravelResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTimeTravelResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTimeTravelResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTimeTravelResourceWithStreamingResponse(self)
+
+    async def get_bookmark(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        timestamp: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeTravelGetBookmarkResponse:
+        """
+        Retrieves the current bookmark, or the nearest bookmark at or before a provided
+        timestamp. Bookmarks can be used with the restore endpoint to revert the
+        database to a previous point in time.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          timestamp: An optional ISO 8601 timestamp. If provided, returns the nearest available
+              bookmark at or before this timestamp. If omitted, returns the current bookmark.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/d1/database/{database_id}/time_travel/bookmark",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"timestamp": timestamp}, time_travel_get_bookmark_params.TimeTravelGetBookmarkParams
+                ),
+                post_parser=ResultWrapper[TimeTravelGetBookmarkResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeTravelGetBookmarkResponse], ResultWrapper[TimeTravelGetBookmarkResponse]),
+        )
+
+    async def restore(
+        self,
+        database_id: str,
+        *,
+        account_id: str,
+        bookmark: str | Omit = omit,
+        timestamp: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeTravelRestoreResponse:
+        """
+        Restores a D1 database to a previous point in time either via a bookmark or a
+        timestamp.
+
+        Args:
+          account_id: Account identifier tag.
+
+          database_id: D1 database identifier (UUID).
+
+          bookmark: A bookmark to restore the database to. Required if `timestamp` is not provided.
+
+          timestamp: An ISO 8601 timestamp to restore the database to. Required if `bookmark` is not
+              provided.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not database_id:
+            raise ValueError(f"Expected a non-empty value for `database_id` but received {database_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/d1/database/{database_id}/time_travel/restore",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "bookmark": bookmark,
+                        "timestamp": timestamp,
+                    },
+                    time_travel_restore_params.TimeTravelRestoreParams,
+                ),
+                post_parser=ResultWrapper[TimeTravelRestoreResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeTravelRestoreResponse], ResultWrapper[TimeTravelRestoreResponse]),
+        )
+
+
+class TimeTravelResourceWithRawResponse:
+    def __init__(self, time_travel: TimeTravelResource) -> None:
+        self._time_travel = time_travel
+
+        self.get_bookmark = to_raw_response_wrapper(
+            time_travel.get_bookmark,
+        )
+        self.restore = to_raw_response_wrapper(
+            time_travel.restore,
+        )
+
+
+class AsyncTimeTravelResourceWithRawResponse:
+    def __init__(self, time_travel: AsyncTimeTravelResource) -> None:
+        self._time_travel = time_travel
+
+        self.get_bookmark = async_to_raw_response_wrapper(
+            time_travel.get_bookmark,
+        )
+        self.restore = async_to_raw_response_wrapper(
+            time_travel.restore,
+        )
+
+
+class TimeTravelResourceWithStreamingResponse:
+    def __init__(self, time_travel: TimeTravelResource) -> None:
+        self._time_travel = time_travel
+
+        self.get_bookmark = to_streamed_response_wrapper(
+            time_travel.get_bookmark,
+        )
+        self.restore = to_streamed_response_wrapper(
+            time_travel.restore,
+        )
+
+
+class AsyncTimeTravelResourceWithStreamingResponse:
+    def __init__(self, time_travel: AsyncTimeTravelResource) -> None:
+        self._time_travel = time_travel
+
+        self.get_bookmark = async_to_streamed_response_wrapper(
+            time_travel.get_bookmark,
+        )
+        self.restore = async_to_streamed_response_wrapper(
+            time_travel.restore,
+        )
diff --git a/src/cloudflare/resources/dcv_delegation.py b/src/cloudflare/resources/dcv_delegation.py
index 127c13a15c5..f421bf26ac2 100644
--- a/src/cloudflare/resources/dcv_delegation.py
+++ b/src/cloudflare/resources/dcv_delegation.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from .._types import Body, Query, Headers, NotGiven, not_given
 from .._compat import cached_property
 from .._resource import SyncAPIResource, AsyncAPIResource
 from .._response import (
@@ -25,10 +25,21 @@
 class DCVDelegationResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DCVDelegationResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DCVDelegationResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DCVDelegationResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DCVDelegationResourceWithStreamingResponse(self)
 
     def get(
@@ -40,14 +51,14 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DCVDelegationUUID]:
         """
         Retrieve the account and zone specific unique identifier used as part of the
         CNAME target for DCV Delegation.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -75,10 +86,21 @@ def get(
 class AsyncDCVDelegationResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDCVDelegationResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDCVDelegationResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDCVDelegationResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDCVDelegationResourceWithStreamingResponse(self)
 
     async def get(
@@ -90,14 +112,14 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DCVDelegationUUID]:
         """
         Retrieve the account and zone specific unique identifier used as part of the
         CNAME target for DCV Delegation.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/diagnostics/__init__.py b/src/cloudflare/resources/diagnostics/__init__.py
index 4ccc6dce7cb..0c5fba15051 100644
--- a/src/cloudflare/resources/diagnostics/__init__.py
+++ b/src/cloudflare/resources/diagnostics/__init__.py
@@ -16,6 +16,14 @@
     TraceroutesResourceWithStreamingResponse,
     AsyncTraceroutesResourceWithStreamingResponse,
 )
+from .endpoint_healthchecks import (
+    EndpointHealthchecksResource,
+    AsyncEndpointHealthchecksResource,
+    EndpointHealthchecksResourceWithRawResponse,
+    AsyncEndpointHealthchecksResourceWithRawResponse,
+    EndpointHealthchecksResourceWithStreamingResponse,
+    AsyncEndpointHealthchecksResourceWithStreamingResponse,
+)
 
 __all__ = [
     "TraceroutesResource",
@@ -24,6 +32,12 @@
     "AsyncTraceroutesResourceWithRawResponse",
     "TraceroutesResourceWithStreamingResponse",
     "AsyncTraceroutesResourceWithStreamingResponse",
+    "EndpointHealthchecksResource",
+    "AsyncEndpointHealthchecksResource",
+    "EndpointHealthchecksResourceWithRawResponse",
+    "AsyncEndpointHealthchecksResourceWithRawResponse",
+    "EndpointHealthchecksResourceWithStreamingResponse",
+    "AsyncEndpointHealthchecksResourceWithStreamingResponse",
     "DiagnosticsResource",
     "AsyncDiagnosticsResource",
     "DiagnosticsResourceWithRawResponse",
diff --git a/src/cloudflare/resources/diagnostics/diagnostics.py b/src/cloudflare/resources/diagnostics/diagnostics.py
index 629321688d5..440f6803afe 100644
--- a/src/cloudflare/resources/diagnostics/diagnostics.py
+++ b/src/cloudflare/resources/diagnostics/diagnostics.py
@@ -12,6 +12,14 @@
     TraceroutesResourceWithStreamingResponse,
     AsyncTraceroutesResourceWithStreamingResponse,
 )
+from .endpoint_healthchecks import (
+    EndpointHealthchecksResource,
+    AsyncEndpointHealthchecksResource,
+    EndpointHealthchecksResourceWithRawResponse,
+    AsyncEndpointHealthchecksResourceWithRawResponse,
+    EndpointHealthchecksResourceWithStreamingResponse,
+    AsyncEndpointHealthchecksResourceWithStreamingResponse,
+)
 
 __all__ = ["DiagnosticsResource", "AsyncDiagnosticsResource"]
 
@@ -21,12 +29,27 @@ class DiagnosticsResource(SyncAPIResource):
     def traceroutes(self) -> TraceroutesResource:
         return TraceroutesResource(self._client)
 
+    @cached_property
+    def endpoint_healthchecks(self) -> EndpointHealthchecksResource:
+        return EndpointHealthchecksResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> DiagnosticsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DiagnosticsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DiagnosticsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DiagnosticsResourceWithStreamingResponse(self)
 
 
@@ -35,12 +58,27 @@ class AsyncDiagnosticsResource(AsyncAPIResource):
     def traceroutes(self) -> AsyncTraceroutesResource:
         return AsyncTraceroutesResource(self._client)
 
+    @cached_property
+    def endpoint_healthchecks(self) -> AsyncEndpointHealthchecksResource:
+        return AsyncEndpointHealthchecksResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncDiagnosticsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDiagnosticsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDiagnosticsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDiagnosticsResourceWithStreamingResponse(self)
 
 
@@ -52,6 +90,10 @@ def __init__(self, diagnostics: DiagnosticsResource) -> None:
     def traceroutes(self) -> TraceroutesResourceWithRawResponse:
         return TraceroutesResourceWithRawResponse(self._diagnostics.traceroutes)
 
+    @cached_property
+    def endpoint_healthchecks(self) -> EndpointHealthchecksResourceWithRawResponse:
+        return EndpointHealthchecksResourceWithRawResponse(self._diagnostics.endpoint_healthchecks)
+
 
 class AsyncDiagnosticsResourceWithRawResponse:
     def __init__(self, diagnostics: AsyncDiagnosticsResource) -> None:
@@ -61,6 +103,10 @@ def __init__(self, diagnostics: AsyncDiagnosticsResource) -> None:
     def traceroutes(self) -> AsyncTraceroutesResourceWithRawResponse:
         return AsyncTraceroutesResourceWithRawResponse(self._diagnostics.traceroutes)
 
+    @cached_property
+    def endpoint_healthchecks(self) -> AsyncEndpointHealthchecksResourceWithRawResponse:
+        return AsyncEndpointHealthchecksResourceWithRawResponse(self._diagnostics.endpoint_healthchecks)
+
 
 class DiagnosticsResourceWithStreamingResponse:
     def __init__(self, diagnostics: DiagnosticsResource) -> None:
@@ -70,6 +116,10 @@ def __init__(self, diagnostics: DiagnosticsResource) -> None:
     def traceroutes(self) -> TraceroutesResourceWithStreamingResponse:
         return TraceroutesResourceWithStreamingResponse(self._diagnostics.traceroutes)
 
+    @cached_property
+    def endpoint_healthchecks(self) -> EndpointHealthchecksResourceWithStreamingResponse:
+        return EndpointHealthchecksResourceWithStreamingResponse(self._diagnostics.endpoint_healthchecks)
+
 
 class AsyncDiagnosticsResourceWithStreamingResponse:
     def __init__(self, diagnostics: AsyncDiagnosticsResource) -> None:
@@ -78,3 +128,7 @@ def __init__(self, diagnostics: AsyncDiagnosticsResource) -> None:
     @cached_property
     def traceroutes(self) -> AsyncTraceroutesResourceWithStreamingResponse:
         return AsyncTraceroutesResourceWithStreamingResponse(self._diagnostics.traceroutes)
+
+    @cached_property
+    def endpoint_healthchecks(self) -> AsyncEndpointHealthchecksResourceWithStreamingResponse:
+        return AsyncEndpointHealthchecksResourceWithStreamingResponse(self._diagnostics.endpoint_healthchecks)
diff --git a/src/cloudflare/resources/diagnostics/endpoint_healthchecks.py b/src/cloudflare/resources/diagnostics/endpoint_healthchecks.py
new file mode 100644
index 00000000000..0bba3422e7d
--- /dev/null
+++ b/src/cloudflare/resources/diagnostics/endpoint_healthchecks.py
@@ -0,0 +1,647 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.diagnostics import endpoint_healthcheck_create_params, endpoint_healthcheck_update_params
+from ...types.diagnostics.endpoint_healthcheck_get_response import EndpointHealthcheckGetResponse
+from ...types.diagnostics.endpoint_healthcheck_list_response import EndpointHealthcheckListResponse
+from ...types.diagnostics.endpoint_healthcheck_create_response import EndpointHealthcheckCreateResponse
+from ...types.diagnostics.endpoint_healthcheck_delete_response import EndpointHealthcheckDeleteResponse
+from ...types.diagnostics.endpoint_healthcheck_update_response import EndpointHealthcheckUpdateResponse
+
+__all__ = ["EndpointHealthchecksResource", "AsyncEndpointHealthchecksResource"]
+
+
+class EndpointHealthchecksResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> EndpointHealthchecksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return EndpointHealthchecksResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> EndpointHealthchecksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return EndpointHealthchecksResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        check_type: Literal["icmp"],
+        endpoint: str,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EndpointHealthcheckCreateResponse]:
+        """
+        Create Endpoint Health Check.
+
+        Args:
+          account_id: Identifier
+
+          check_type: type of check to perform
+
+          endpoint: the IP address of the host to perform checks against
+
+          name: Optional name associated with this check
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/diagnostics/endpoint-healthchecks",
+            body=maybe_transform(
+                {
+                    "check_type": check_type,
+                    "endpoint": endpoint,
+                    "name": name,
+                },
+                endpoint_healthcheck_create_params.EndpointHealthcheckCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[EndpointHealthcheckCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[EndpointHealthcheckCreateResponse]], ResultWrapper[EndpointHealthcheckCreateResponse]
+            ),
+        )
+
+    def update(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        check_type: Literal["icmp"],
+        endpoint: str,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EndpointHealthcheckUpdateResponse]:
+        """
+        Update a Endpoint Health Check.
+
+        Args:
+          account_id: Identifier
+
+          id: UUID.
+
+          check_type: type of check to perform
+
+          endpoint: the IP address of the host to perform checks against
+
+          name: Optional name associated with this check
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._put(
+            f"/accounts/{account_id}/diagnostics/endpoint-healthchecks/{id}",
+            body=maybe_transform(
+                {
+                    "check_type": check_type,
+                    "endpoint": endpoint,
+                    "name": name,
+                },
+                endpoint_healthcheck_update_params.EndpointHealthcheckUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[EndpointHealthcheckUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[EndpointHealthcheckUpdateResponse]], ResultWrapper[EndpointHealthcheckUpdateResponse]
+            ),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EndpointHealthcheckListResponse]:
+        """
+        List Endpoint Health Checks.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/diagnostics/endpoint-healthchecks",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[EndpointHealthcheckListResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[EndpointHealthcheckListResponse]], ResultWrapper[EndpointHealthcheckListResponse]
+            ),
+        )
+
+    def delete(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EndpointHealthcheckDeleteResponse:
+        """
+        Delete Endpoint Health Check.
+
+        Args:
+          account_id: Identifier
+
+          id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/diagnostics/endpoint-healthchecks/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=EndpointHealthcheckDeleteResponse,
+        )
+
+    def get(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EndpointHealthcheckGetResponse]:
+        """
+        Get a single Endpoint Health Check.
+
+        Args:
+          account_id: Identifier
+
+          id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._get(
+            f"/accounts/{account_id}/diagnostics/endpoint-healthchecks/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[EndpointHealthcheckGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[EndpointHealthcheckGetResponse]], ResultWrapper[EndpointHealthcheckGetResponse]),
+        )
+
+
+class AsyncEndpointHealthchecksResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncEndpointHealthchecksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncEndpointHealthchecksResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncEndpointHealthchecksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncEndpointHealthchecksResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        check_type: Literal["icmp"],
+        endpoint: str,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EndpointHealthcheckCreateResponse]:
+        """
+        Create Endpoint Health Check.
+
+        Args:
+          account_id: Identifier
+
+          check_type: type of check to perform
+
+          endpoint: the IP address of the host to perform checks against
+
+          name: Optional name associated with this check
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/diagnostics/endpoint-healthchecks",
+            body=await async_maybe_transform(
+                {
+                    "check_type": check_type,
+                    "endpoint": endpoint,
+                    "name": name,
+                },
+                endpoint_healthcheck_create_params.EndpointHealthcheckCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[EndpointHealthcheckCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[EndpointHealthcheckCreateResponse]], ResultWrapper[EndpointHealthcheckCreateResponse]
+            ),
+        )
+
+    async def update(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        check_type: Literal["icmp"],
+        endpoint: str,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EndpointHealthcheckUpdateResponse]:
+        """
+        Update a Endpoint Health Check.
+
+        Args:
+          account_id: Identifier
+
+          id: UUID.
+
+          check_type: type of check to perform
+
+          endpoint: the IP address of the host to perform checks against
+
+          name: Optional name associated with this check
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/diagnostics/endpoint-healthchecks/{id}",
+            body=await async_maybe_transform(
+                {
+                    "check_type": check_type,
+                    "endpoint": endpoint,
+                    "name": name,
+                },
+                endpoint_healthcheck_update_params.EndpointHealthcheckUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[EndpointHealthcheckUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[EndpointHealthcheckUpdateResponse]], ResultWrapper[EndpointHealthcheckUpdateResponse]
+            ),
+        )
+
+    async def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EndpointHealthcheckListResponse]:
+        """
+        List Endpoint Health Checks.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/diagnostics/endpoint-healthchecks",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[EndpointHealthcheckListResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[EndpointHealthcheckListResponse]], ResultWrapper[EndpointHealthcheckListResponse]
+            ),
+        )
+
+    async def delete(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EndpointHealthcheckDeleteResponse:
+        """
+        Delete Endpoint Health Check.
+
+        Args:
+          account_id: Identifier
+
+          id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/diagnostics/endpoint-healthchecks/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=EndpointHealthcheckDeleteResponse,
+        )
+
+    async def get(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EndpointHealthcheckGetResponse]:
+        """
+        Get a single Endpoint Health Check.
+
+        Args:
+          account_id: Identifier
+
+          id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/diagnostics/endpoint-healthchecks/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[EndpointHealthcheckGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[EndpointHealthcheckGetResponse]], ResultWrapper[EndpointHealthcheckGetResponse]),
+        )
+
+
+class EndpointHealthchecksResourceWithRawResponse:
+    def __init__(self, endpoint_healthchecks: EndpointHealthchecksResource) -> None:
+        self._endpoint_healthchecks = endpoint_healthchecks
+
+        self.create = to_raw_response_wrapper(
+            endpoint_healthchecks.create,
+        )
+        self.update = to_raw_response_wrapper(
+            endpoint_healthchecks.update,
+        )
+        self.list = to_raw_response_wrapper(
+            endpoint_healthchecks.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            endpoint_healthchecks.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            endpoint_healthchecks.get,
+        )
+
+
+class AsyncEndpointHealthchecksResourceWithRawResponse:
+    def __init__(self, endpoint_healthchecks: AsyncEndpointHealthchecksResource) -> None:
+        self._endpoint_healthchecks = endpoint_healthchecks
+
+        self.create = async_to_raw_response_wrapper(
+            endpoint_healthchecks.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            endpoint_healthchecks.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            endpoint_healthchecks.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            endpoint_healthchecks.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            endpoint_healthchecks.get,
+        )
+
+
+class EndpointHealthchecksResourceWithStreamingResponse:
+    def __init__(self, endpoint_healthchecks: EndpointHealthchecksResource) -> None:
+        self._endpoint_healthchecks = endpoint_healthchecks
+
+        self.create = to_streamed_response_wrapper(
+            endpoint_healthchecks.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            endpoint_healthchecks.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            endpoint_healthchecks.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            endpoint_healthchecks.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            endpoint_healthchecks.get,
+        )
+
+
+class AsyncEndpointHealthchecksResourceWithStreamingResponse:
+    def __init__(self, endpoint_healthchecks: AsyncEndpointHealthchecksResource) -> None:
+        self._endpoint_healthchecks = endpoint_healthchecks
+
+        self.create = async_to_streamed_response_wrapper(
+            endpoint_healthchecks.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            endpoint_healthchecks.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            endpoint_healthchecks.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            endpoint_healthchecks.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            endpoint_healthchecks.get,
+        )
diff --git a/src/cloudflare/resources/diagnostics/traceroutes.py b/src/cloudflare/resources/diagnostics/traceroutes.py
index 61741357995..115fbfcfeb8 100644
--- a/src/cloudflare/resources/diagnostics/traceroutes.py
+++ b/src/cloudflare/resources/diagnostics/traceroutes.py
@@ -2,15 +2,10 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Optional, cast
-
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -19,10 +14,10 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
 from ...types.diagnostics import traceroute_create_params
-from ...types.diagnostics.traceroute_create_response import TracerouteCreateResponse
+from ...types.diagnostics.traceroute import Traceroute
 
 __all__ = ["TraceroutesResource", "AsyncTraceroutesResource"]
 
@@ -30,26 +25,37 @@
 class TraceroutesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TraceroutesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TraceroutesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TraceroutesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TraceroutesResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        targets: List[str],
-        colos: List[str] | NotGiven = NOT_GIVEN,
-        options: traceroute_create_params.Options | NotGiven = NOT_GIVEN,
+        targets: SequenceNotStr[str],
+        colos: SequenceNotStr[str] | Omit = omit,
+        options: traceroute_create_params.Options | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TracerouteCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[Traceroute]:
         """
         Run traceroutes from Cloudflare colos.
 
@@ -69,8 +75,9 @@ def create(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._post(
+        return self._get_api_list(
             f"/accounts/{account_id}/diagnostics/traceroute",
+            page=SyncSinglePage[Traceroute],
             body=maybe_transform(
                 {
                     "targets": targets,
@@ -80,39 +87,47 @@ def create(
                 traceroute_create_params.TracerouteCreateParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[TracerouteCreateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[TracerouteCreateResponse]], ResultWrapper[TracerouteCreateResponse]),
+            model=Traceroute,
+            method="post",
         )
 
 
 class AsyncTraceroutesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTraceroutesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTraceroutesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTraceroutesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTraceroutesResourceWithStreamingResponse(self)
 
-    async def create(
+    def create(
         self,
         *,
         account_id: str,
-        targets: List[str],
-        colos: List[str] | NotGiven = NOT_GIVEN,
-        options: traceroute_create_params.Options | NotGiven = NOT_GIVEN,
+        targets: SequenceNotStr[str],
+        colos: SequenceNotStr[str] | Omit = omit,
+        options: traceroute_create_params.Options | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TracerouteCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Traceroute, AsyncSinglePage[Traceroute]]:
         """
         Run traceroutes from Cloudflare colos.
 
@@ -132,9 +147,10 @@ async def create(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._post(
+        return self._get_api_list(
             f"/accounts/{account_id}/diagnostics/traceroute",
-            body=await async_maybe_transform(
+            page=AsyncSinglePage[Traceroute],
+            body=maybe_transform(
                 {
                     "targets": targets,
                     "colos": colos,
@@ -143,13 +159,10 @@ async def create(
                 traceroute_create_params.TracerouteCreateParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[TracerouteCreateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[TracerouteCreateResponse]], ResultWrapper[TracerouteCreateResponse]),
+            model=Traceroute,
+            method="post",
         )
 
 
diff --git a/src/cloudflare/resources/dns/__init__.py b/src/cloudflare/resources/dns/__init__.py
index 7e394f00159..58768dba906 100644
--- a/src/cloudflare/resources/dns/__init__.py
+++ b/src/cloudflare/resources/dns/__init__.py
@@ -8,6 +8,14 @@
     DNSResourceWithStreamingResponse,
     AsyncDNSResourceWithStreamingResponse,
 )
+from .dnssec import (
+    DNSSECResource,
+    AsyncDNSSECResource,
+    DNSSECResourceWithRawResponse,
+    AsyncDNSSECResourceWithRawResponse,
+    DNSSECResourceWithStreamingResponse,
+    AsyncDNSSECResourceWithStreamingResponse,
+)
 from .records import (
     RecordsResource,
     AsyncRecordsResource,
@@ -16,14 +24,6 @@
     RecordsResourceWithStreamingResponse,
     AsyncRecordsResourceWithStreamingResponse,
 )
-from .firewall import (
-    FirewallResource,
-    AsyncFirewallResource,
-    FirewallResourceWithRawResponse,
-    AsyncFirewallResourceWithRawResponse,
-    FirewallResourceWithStreamingResponse,
-    AsyncFirewallResourceWithStreamingResponse,
-)
 from .settings import (
     SettingsResource,
     AsyncSettingsResource,
@@ -40,8 +40,22 @@
     AnalyticsResourceWithStreamingResponse,
     AsyncAnalyticsResourceWithStreamingResponse,
 )
+from .zone_transfers import (
+    ZoneTransfersResource,
+    AsyncZoneTransfersResource,
+    ZoneTransfersResourceWithRawResponse,
+    AsyncZoneTransfersResourceWithRawResponse,
+    ZoneTransfersResourceWithStreamingResponse,
+    AsyncZoneTransfersResourceWithStreamingResponse,
+)
 
 __all__ = [
+    "DNSSECResource",
+    "AsyncDNSSECResource",
+    "DNSSECResourceWithRawResponse",
+    "AsyncDNSSECResourceWithRawResponse",
+    "DNSSECResourceWithStreamingResponse",
+    "AsyncDNSSECResourceWithStreamingResponse",
     "RecordsResource",
     "AsyncRecordsResource",
     "RecordsResourceWithRawResponse",
@@ -60,12 +74,12 @@
     "AsyncAnalyticsResourceWithRawResponse",
     "AnalyticsResourceWithStreamingResponse",
     "AsyncAnalyticsResourceWithStreamingResponse",
-    "FirewallResource",
-    "AsyncFirewallResource",
-    "FirewallResourceWithRawResponse",
-    "AsyncFirewallResourceWithRawResponse",
-    "FirewallResourceWithStreamingResponse",
-    "AsyncFirewallResourceWithStreamingResponse",
+    "ZoneTransfersResource",
+    "AsyncZoneTransfersResource",
+    "ZoneTransfersResourceWithRawResponse",
+    "AsyncZoneTransfersResourceWithRawResponse",
+    "ZoneTransfersResourceWithStreamingResponse",
+    "AsyncZoneTransfersResourceWithStreamingResponse",
     "DNSResource",
     "AsyncDNSResource",
     "DNSResourceWithRawResponse",
diff --git a/src/cloudflare/resources/dns/analytics/analytics.py b/src/cloudflare/resources/dns/analytics/analytics.py
index c08523958f5..87700f33d41 100644
--- a/src/cloudflare/resources/dns/analytics/analytics.py
+++ b/src/cloudflare/resources/dns/analytics/analytics.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .reports import (
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .reports.reports import (
     ReportsResource,
     AsyncReportsResource,
     ReportsResourceWithRawResponse,
@@ -10,9 +12,6 @@
     ReportsResourceWithStreamingResponse,
     AsyncReportsResourceWithStreamingResponse,
 )
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from .reports.reports import ReportsResource, AsyncReportsResource
 
 __all__ = ["AnalyticsResource", "AsyncAnalyticsResource"]
 
@@ -24,10 +23,21 @@ def reports(self) -> ReportsResource:
 
     @cached_property
     def with_raw_response(self) -> AnalyticsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AnalyticsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AnalyticsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AnalyticsResourceWithStreamingResponse(self)
 
 
@@ -38,10 +48,21 @@ def reports(self) -> AsyncReportsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncAnalyticsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAnalyticsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAnalyticsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAnalyticsResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/dns/analytics/reports/bytimes.py b/src/cloudflare/resources/dns/analytics/reports/bytimes.py
index 2832c5b6782..ea25529f907 100644
--- a/src/cloudflare/resources/dns/analytics/reports/bytimes.py
+++ b/src/cloudflare/resources/dns/analytics/reports/bytimes.py
@@ -4,14 +4,12 @@
 
 from typing import Type, Union, Optional, cast
 from datetime import datetime
+from typing_extensions import Literal
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -22,8 +20,6 @@
 )
 from ....._wrappers import ResultWrapper
 from ....._base_client import make_request_options
-from .....types.dns.firewall import Delta
-from .....types.dns.firewall.delta import Delta
 from .....types.dns.analytics.reports import bytime_get_params
 from .....types.dns.analytics.reports.by_time import ByTime
 
@@ -33,30 +29,42 @@
 class BytimesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> BytimesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return BytimesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> BytimesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return BytimesResourceWithStreamingResponse(self)
 
     def get(
         self,
         *,
         zone_id: str,
-        dimensions: str | NotGiven = NOT_GIVEN,
-        filters: str | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        metrics: str | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        sort: str | NotGiven = NOT_GIVEN,
-        time_delta: Delta | NotGiven = NOT_GIVEN,
-        until: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        dimensions: str | Omit = omit,
+        filters: str | Omit = omit,
+        limit: int | Omit = omit,
+        metrics: str | Omit = omit,
+        since: Union[str, datetime] | Omit = omit,
+        sort: str | Omit = omit,
+        time_delta: Literal["all", "auto", "year", "quarter", "month", "week", "day", "hour", "dekaminute", "minute"]
+        | Omit = omit,
+        until: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ByTime]:
         """
         Retrieves a list of aggregate metrics grouped by time interval.
@@ -66,7 +74,7 @@ def get(
         for detailed information about the available query parameters.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           dimensions: A comma-separated list of dimensions to group results by.
 
@@ -124,30 +132,42 @@ def get(
 class AsyncBytimesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncBytimesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncBytimesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncBytimesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncBytimesResourceWithStreamingResponse(self)
 
     async def get(
         self,
         *,
         zone_id: str,
-        dimensions: str | NotGiven = NOT_GIVEN,
-        filters: str | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        metrics: str | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        sort: str | NotGiven = NOT_GIVEN,
-        time_delta: Delta | NotGiven = NOT_GIVEN,
-        until: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        dimensions: str | Omit = omit,
+        filters: str | Omit = omit,
+        limit: int | Omit = omit,
+        metrics: str | Omit = omit,
+        since: Union[str, datetime] | Omit = omit,
+        sort: str | Omit = omit,
+        time_delta: Literal["all", "auto", "year", "quarter", "month", "week", "day", "hour", "dekaminute", "minute"]
+        | Omit = omit,
+        until: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ByTime]:
         """
         Retrieves a list of aggregate metrics grouped by time interval.
@@ -157,7 +177,7 @@ async def get(
         for detailed information about the available query parameters.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           dimensions: A comma-separated list of dimensions to group results by.
 
diff --git a/src/cloudflare/resources/dns/analytics/reports/reports.py b/src/cloudflare/resources/dns/analytics/reports/reports.py
index 6faf0eead08..2d1379eb601 100644
--- a/src/cloudflare/resources/dns/analytics/reports/reports.py
+++ b/src/cloudflare/resources/dns/analytics/reports/reports.py
@@ -15,11 +15,8 @@
     BytimesResourceWithStreamingResponse,
     AsyncBytimesResourceWithStreamingResponse,
 )
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -43,29 +40,40 @@ def bytimes(self) -> BytimesResource:
 
     @cached_property
     def with_raw_response(self) -> ReportsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ReportsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ReportsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ReportsResourceWithStreamingResponse(self)
 
     def get(
         self,
         *,
         zone_id: str,
-        dimensions: str | NotGiven = NOT_GIVEN,
-        filters: str | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        metrics: str | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        sort: str | NotGiven = NOT_GIVEN,
-        until: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        dimensions: str | Omit = omit,
+        filters: str | Omit = omit,
+        limit: int | Omit = omit,
+        metrics: str | Omit = omit,
+        since: Union[str, datetime] | Omit = omit,
+        sort: str | Omit = omit,
+        until: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Report]:
         """
         Retrieves a list of summarised aggregate metrics over a given time period.
@@ -75,7 +83,7 @@ def get(
         for detailed information about the available query parameters.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           dimensions: A comma-separated list of dimensions to group results by.
 
@@ -134,29 +142,40 @@ def bytimes(self) -> AsyncBytimesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncReportsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncReportsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncReportsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncReportsResourceWithStreamingResponse(self)
 
     async def get(
         self,
         *,
         zone_id: str,
-        dimensions: str | NotGiven = NOT_GIVEN,
-        filters: str | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        metrics: str | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        sort: str | NotGiven = NOT_GIVEN,
-        until: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        dimensions: str | Omit = omit,
+        filters: str | Omit = omit,
+        limit: int | Omit = omit,
+        metrics: str | Omit = omit,
+        since: Union[str, datetime] | Omit = omit,
+        sort: str | Omit = omit,
+        until: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Report]:
         """
         Retrieves a list of summarised aggregate metrics over a given time period.
@@ -166,7 +185,7 @@ async def get(
         for detailed information about the available query parameters.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           dimensions: A comma-separated list of dimensions to group results by.
 
diff --git a/src/cloudflare/resources/dns/dns.py b/src/cloudflare/resources/dns/dns.py
index 7f758f9e906..a4c4157a412 100644
--- a/src/cloudflare/resources/dns/dns.py
+++ b/src/cloudflare/resources/dns/dns.py
@@ -2,6 +2,14 @@
 
 from __future__ import annotations
 
+from .dnssec import (
+    DNSSECResource,
+    AsyncDNSSECResource,
+    DNSSECResourceWithRawResponse,
+    AsyncDNSSECResourceWithRawResponse,
+    DNSSECResourceWithStreamingResponse,
+    AsyncDNSSECResourceWithStreamingResponse,
+)
 from .records import (
     RecordsResource,
     AsyncRecordsResource,
@@ -10,15 +18,9 @@
     RecordsResourceWithStreamingResponse,
     AsyncRecordsResourceWithStreamingResponse,
 )
-from .firewall import (
-    FirewallResource,
-    AsyncFirewallResource,
-    FirewallResourceWithRawResponse,
-    AsyncFirewallResourceWithRawResponse,
-    FirewallResourceWithStreamingResponse,
-    AsyncFirewallResourceWithStreamingResponse,
-)
-from .settings import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .settings.settings import (
     SettingsResource,
     AsyncSettingsResource,
     SettingsResourceWithRawResponse,
@@ -26,8 +28,7 @@
     SettingsResourceWithStreamingResponse,
     AsyncSettingsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from .analytics import (
+from .analytics.analytics import (
     AnalyticsResource,
     AsyncAnalyticsResource,
     AnalyticsResourceWithRawResponse,
@@ -35,14 +36,23 @@
     AnalyticsResourceWithStreamingResponse,
     AsyncAnalyticsResourceWithStreamingResponse,
 )
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .firewall.firewall import FirewallResource, AsyncFirewallResource
-from .analytics.analytics import AnalyticsResource, AsyncAnalyticsResource
+from .zone_transfers.zone_transfers import (
+    ZoneTransfersResource,
+    AsyncZoneTransfersResource,
+    ZoneTransfersResourceWithRawResponse,
+    AsyncZoneTransfersResourceWithRawResponse,
+    ZoneTransfersResourceWithStreamingResponse,
+    AsyncZoneTransfersResourceWithStreamingResponse,
+)
 
 __all__ = ["DNSResource", "AsyncDNSResource"]
 
 
 class DNSResource(SyncAPIResource):
+    @cached_property
+    def dnssec(self) -> DNSSECResource:
+        return DNSSECResource(self._client)
+
     @cached_property
     def records(self) -> RecordsResource:
         return RecordsResource(self._client)
@@ -56,19 +66,34 @@ def analytics(self) -> AnalyticsResource:
         return AnalyticsResource(self._client)
 
     @cached_property
-    def firewall(self) -> FirewallResource:
-        return FirewallResource(self._client)
+    def zone_transfers(self) -> ZoneTransfersResource:
+        return ZoneTransfersResource(self._client)
 
     @cached_property
     def with_raw_response(self) -> DNSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DNSResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DNSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DNSResourceWithStreamingResponse(self)
 
 
 class AsyncDNSResource(AsyncAPIResource):
+    @cached_property
+    def dnssec(self) -> AsyncDNSSECResource:
+        return AsyncDNSSECResource(self._client)
+
     @cached_property
     def records(self) -> AsyncRecordsResource:
         return AsyncRecordsResource(self._client)
@@ -82,15 +107,26 @@ def analytics(self) -> AsyncAnalyticsResource:
         return AsyncAnalyticsResource(self._client)
 
     @cached_property
-    def firewall(self) -> AsyncFirewallResource:
-        return AsyncFirewallResource(self._client)
+    def zone_transfers(self) -> AsyncZoneTransfersResource:
+        return AsyncZoneTransfersResource(self._client)
 
     @cached_property
     def with_raw_response(self) -> AsyncDNSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDNSResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDNSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDNSResourceWithStreamingResponse(self)
 
 
@@ -98,6 +134,10 @@ class DNSResourceWithRawResponse:
     def __init__(self, dns: DNSResource) -> None:
         self._dns = dns
 
+    @cached_property
+    def dnssec(self) -> DNSSECResourceWithRawResponse:
+        return DNSSECResourceWithRawResponse(self._dns.dnssec)
+
     @cached_property
     def records(self) -> RecordsResourceWithRawResponse:
         return RecordsResourceWithRawResponse(self._dns.records)
@@ -111,14 +151,18 @@ def analytics(self) -> AnalyticsResourceWithRawResponse:
         return AnalyticsResourceWithRawResponse(self._dns.analytics)
 
     @cached_property
-    def firewall(self) -> FirewallResourceWithRawResponse:
-        return FirewallResourceWithRawResponse(self._dns.firewall)
+    def zone_transfers(self) -> ZoneTransfersResourceWithRawResponse:
+        return ZoneTransfersResourceWithRawResponse(self._dns.zone_transfers)
 
 
 class AsyncDNSResourceWithRawResponse:
     def __init__(self, dns: AsyncDNSResource) -> None:
         self._dns = dns
 
+    @cached_property
+    def dnssec(self) -> AsyncDNSSECResourceWithRawResponse:
+        return AsyncDNSSECResourceWithRawResponse(self._dns.dnssec)
+
     @cached_property
     def records(self) -> AsyncRecordsResourceWithRawResponse:
         return AsyncRecordsResourceWithRawResponse(self._dns.records)
@@ -132,14 +176,18 @@ def analytics(self) -> AsyncAnalyticsResourceWithRawResponse:
         return AsyncAnalyticsResourceWithRawResponse(self._dns.analytics)
 
     @cached_property
-    def firewall(self) -> AsyncFirewallResourceWithRawResponse:
-        return AsyncFirewallResourceWithRawResponse(self._dns.firewall)
+    def zone_transfers(self) -> AsyncZoneTransfersResourceWithRawResponse:
+        return AsyncZoneTransfersResourceWithRawResponse(self._dns.zone_transfers)
 
 
 class DNSResourceWithStreamingResponse:
     def __init__(self, dns: DNSResource) -> None:
         self._dns = dns
 
+    @cached_property
+    def dnssec(self) -> DNSSECResourceWithStreamingResponse:
+        return DNSSECResourceWithStreamingResponse(self._dns.dnssec)
+
     @cached_property
     def records(self) -> RecordsResourceWithStreamingResponse:
         return RecordsResourceWithStreamingResponse(self._dns.records)
@@ -153,14 +201,18 @@ def analytics(self) -> AnalyticsResourceWithStreamingResponse:
         return AnalyticsResourceWithStreamingResponse(self._dns.analytics)
 
     @cached_property
-    def firewall(self) -> FirewallResourceWithStreamingResponse:
-        return FirewallResourceWithStreamingResponse(self._dns.firewall)
+    def zone_transfers(self) -> ZoneTransfersResourceWithStreamingResponse:
+        return ZoneTransfersResourceWithStreamingResponse(self._dns.zone_transfers)
 
 
 class AsyncDNSResourceWithStreamingResponse:
     def __init__(self, dns: AsyncDNSResource) -> None:
         self._dns = dns
 
+    @cached_property
+    def dnssec(self) -> AsyncDNSSECResourceWithStreamingResponse:
+        return AsyncDNSSECResourceWithStreamingResponse(self._dns.dnssec)
+
     @cached_property
     def records(self) -> AsyncRecordsResourceWithStreamingResponse:
         return AsyncRecordsResourceWithStreamingResponse(self._dns.records)
@@ -174,5 +226,5 @@ def analytics(self) -> AsyncAnalyticsResourceWithStreamingResponse:
         return AsyncAnalyticsResourceWithStreamingResponse(self._dns.analytics)
 
     @cached_property
-    def firewall(self) -> AsyncFirewallResourceWithStreamingResponse:
-        return AsyncFirewallResourceWithStreamingResponse(self._dns.firewall)
+    def zone_transfers(self) -> AsyncZoneTransfersResourceWithStreamingResponse:
+        return AsyncZoneTransfersResourceWithStreamingResponse(self._dns.zone_transfers)
diff --git a/src/cloudflare/resources/dns/dnssec.py b/src/cloudflare/resources/dns/dnssec.py
new file mode 100644
index 00000000000..a2b78039737
--- /dev/null
+++ b/src/cloudflare/resources/dns/dnssec.py
@@ -0,0 +1,446 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...types.dns import dnssec_edit_params
+from ..._base_client import make_request_options
+from ...types.dns.dnssec import DNSSEC
+from ...types.dns.dnssec_delete_response import DNSSECDeleteResponse
+
+__all__ = ["DNSSECResource", "AsyncDNSSECResource"]
+
+
+class DNSSECResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> DNSSECResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return DNSSECResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> DNSSECResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return DNSSECResourceWithStreamingResponse(self)
+
+    def delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Delete DNSSEC.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._delete(
+            f"/zones/{zone_id}/dnssec",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DNSSECDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+    def edit(
+        self,
+        *,
+        zone_id: str,
+        dnssec_multi_signer: bool | Omit = omit,
+        dnssec_presigned: bool | Omit = omit,
+        dnssec_use_nsec3: bool | Omit = omit,
+        status: Literal["active", "disabled"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DNSSEC]:
+        """
+        Enable or disable DNSSEC.
+
+        Args:
+          zone_id: Identifier.
+
+          dnssec_multi_signer: If true, multi-signer DNSSEC is enabled on the zone, allowing multiple providers
+              to serve a DNSSEC-signed zone at the same time. This is required for DNSKEY
+              records (except those automatically generated by Cloudflare) to be added to the
+              zone.
+
+              See
+              [Multi-signer DNSSEC](https://developers.cloudflare.com/dns/dnssec/multi-signer-dnssec/)
+              for details.
+
+          dnssec_presigned: If true, allows Cloudflare to transfer in a DNSSEC-signed zone including
+              signatures from an external provider, without requiring Cloudflare to sign any
+              records on the fly.
+
+              Note that this feature has some limitations. See
+              [Cloudflare as Secondary](https://developers.cloudflare.com/dns/zone-setups/zone-transfers/cloudflare-as-secondary/setup/#dnssec)
+              for details.
+
+          dnssec_use_nsec3: If true, enables the use of NSEC3 together with DNSSEC on the zone. Combined
+              with setting dnssec_presigned to true, this enables the use of NSEC3 records
+              when transferring in from an external provider. If dnssec_presigned is instead
+              set to false (default), NSEC3 records will be generated and signed at request
+              time.
+
+              See
+              [DNSSEC with NSEC3](https://developers.cloudflare.com/dns/dnssec/enable-nsec3/)
+              for details.
+
+          status: Status of DNSSEC, based on user-desired state and presence of necessary records.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._patch(
+            f"/zones/{zone_id}/dnssec",
+            body=maybe_transform(
+                {
+                    "dnssec_multi_signer": dnssec_multi_signer,
+                    "dnssec_presigned": dnssec_presigned,
+                    "dnssec_use_nsec3": dnssec_use_nsec3,
+                    "status": status,
+                },
+                dnssec_edit_params.DNSSECEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DNSSEC]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DNSSEC]], ResultWrapper[DNSSEC]),
+        )
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DNSSEC]:
+        """
+        Details about DNSSEC status and configuration.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/dnssec",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DNSSEC]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DNSSEC]], ResultWrapper[DNSSEC]),
+        )
+
+
+class AsyncDNSSECResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncDNSSECResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncDNSSECResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncDNSSECResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncDNSSECResourceWithStreamingResponse(self)
+
+    async def delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Delete DNSSEC.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._delete(
+            f"/zones/{zone_id}/dnssec",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DNSSECDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+    async def edit(
+        self,
+        *,
+        zone_id: str,
+        dnssec_multi_signer: bool | Omit = omit,
+        dnssec_presigned: bool | Omit = omit,
+        dnssec_use_nsec3: bool | Omit = omit,
+        status: Literal["active", "disabled"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DNSSEC]:
+        """
+        Enable or disable DNSSEC.
+
+        Args:
+          zone_id: Identifier.
+
+          dnssec_multi_signer: If true, multi-signer DNSSEC is enabled on the zone, allowing multiple providers
+              to serve a DNSSEC-signed zone at the same time. This is required for DNSKEY
+              records (except those automatically generated by Cloudflare) to be added to the
+              zone.
+
+              See
+              [Multi-signer DNSSEC](https://developers.cloudflare.com/dns/dnssec/multi-signer-dnssec/)
+              for details.
+
+          dnssec_presigned: If true, allows Cloudflare to transfer in a DNSSEC-signed zone including
+              signatures from an external provider, without requiring Cloudflare to sign any
+              records on the fly.
+
+              Note that this feature has some limitations. See
+              [Cloudflare as Secondary](https://developers.cloudflare.com/dns/zone-setups/zone-transfers/cloudflare-as-secondary/setup/#dnssec)
+              for details.
+
+          dnssec_use_nsec3: If true, enables the use of NSEC3 together with DNSSEC on the zone. Combined
+              with setting dnssec_presigned to true, this enables the use of NSEC3 records
+              when transferring in from an external provider. If dnssec_presigned is instead
+              set to false (default), NSEC3 records will be generated and signed at request
+              time.
+
+              See
+              [DNSSEC with NSEC3](https://developers.cloudflare.com/dns/dnssec/enable-nsec3/)
+              for details.
+
+          status: Status of DNSSEC, based on user-desired state and presence of necessary records.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._patch(
+            f"/zones/{zone_id}/dnssec",
+            body=await async_maybe_transform(
+                {
+                    "dnssec_multi_signer": dnssec_multi_signer,
+                    "dnssec_presigned": dnssec_presigned,
+                    "dnssec_use_nsec3": dnssec_use_nsec3,
+                    "status": status,
+                },
+                dnssec_edit_params.DNSSECEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DNSSEC]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DNSSEC]], ResultWrapper[DNSSEC]),
+        )
+
+    async def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DNSSEC]:
+        """
+        Details about DNSSEC status and configuration.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/dnssec",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DNSSEC]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DNSSEC]], ResultWrapper[DNSSEC]),
+        )
+
+
+class DNSSECResourceWithRawResponse:
+    def __init__(self, dnssec: DNSSECResource) -> None:
+        self._dnssec = dnssec
+
+        self.delete = to_raw_response_wrapper(
+            dnssec.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            dnssec.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            dnssec.get,
+        )
+
+
+class AsyncDNSSECResourceWithRawResponse:
+    def __init__(self, dnssec: AsyncDNSSECResource) -> None:
+        self._dnssec = dnssec
+
+        self.delete = async_to_raw_response_wrapper(
+            dnssec.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            dnssec.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            dnssec.get,
+        )
+
+
+class DNSSECResourceWithStreamingResponse:
+    def __init__(self, dnssec: DNSSECResource) -> None:
+        self._dnssec = dnssec
+
+        self.delete = to_streamed_response_wrapper(
+            dnssec.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            dnssec.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            dnssec.get,
+        )
+
+
+class AsyncDNSSECResourceWithStreamingResponse:
+    def __init__(self, dnssec: AsyncDNSSECResource) -> None:
+        self._dnssec = dnssec
+
+        self.delete = async_to_streamed_response_wrapper(
+            dnssec.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            dnssec.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            dnssec.get,
+        )
diff --git a/src/cloudflare/resources/dns/firewall/__init__.py b/src/cloudflare/resources/dns/firewall/__init__.py
deleted file mode 100644
index 0d9d0b6aae2..00000000000
--- a/src/cloudflare/resources/dns/firewall/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from .firewall import (
-    FirewallResource,
-    AsyncFirewallResource,
-    FirewallResourceWithRawResponse,
-    AsyncFirewallResourceWithRawResponse,
-    FirewallResourceWithStreamingResponse,
-    AsyncFirewallResourceWithStreamingResponse,
-)
-from .analytics import (
-    AnalyticsResource,
-    AsyncAnalyticsResource,
-    AnalyticsResourceWithRawResponse,
-    AsyncAnalyticsResourceWithRawResponse,
-    AnalyticsResourceWithStreamingResponse,
-    AsyncAnalyticsResourceWithStreamingResponse,
-)
-
-__all__ = [
-    "AnalyticsResource",
-    "AsyncAnalyticsResource",
-    "AnalyticsResourceWithRawResponse",
-    "AsyncAnalyticsResourceWithRawResponse",
-    "AnalyticsResourceWithStreamingResponse",
-    "AsyncAnalyticsResourceWithStreamingResponse",
-    "FirewallResource",
-    "AsyncFirewallResource",
-    "FirewallResourceWithRawResponse",
-    "AsyncFirewallResourceWithRawResponse",
-    "FirewallResourceWithStreamingResponse",
-    "AsyncFirewallResourceWithStreamingResponse",
-]
diff --git a/src/cloudflare/resources/dns/firewall/analytics/analytics.py b/src/cloudflare/resources/dns/firewall/analytics/analytics.py
deleted file mode 100644
index 14e9b86b117..00000000000
--- a/src/cloudflare/resources/dns/firewall/analytics/analytics.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from .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"]
-
-
-class AnalyticsResource(SyncAPIResource):
-    @cached_property
-    def reports(self) -> ReportsResource:
-        return ReportsResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AnalyticsResourceWithRawResponse:
-        return AnalyticsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AnalyticsResourceWithStreamingResponse:
-        return AnalyticsResourceWithStreamingResponse(self)
-
-
-class AsyncAnalyticsResource(AsyncAPIResource):
-    @cached_property
-    def reports(self) -> AsyncReportsResource:
-        return AsyncReportsResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncAnalyticsResourceWithRawResponse:
-        return AsyncAnalyticsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncAnalyticsResourceWithStreamingResponse:
-        return AsyncAnalyticsResourceWithStreamingResponse(self)
-
-
-class AnalyticsResourceWithRawResponse:
-    def __init__(self, analytics: AnalyticsResource) -> None:
-        self._analytics = analytics
-
-    @cached_property
-    def reports(self) -> ReportsResourceWithRawResponse:
-        return ReportsResourceWithRawResponse(self._analytics.reports)
-
-
-class AsyncAnalyticsResourceWithRawResponse:
-    def __init__(self, analytics: AsyncAnalyticsResource) -> None:
-        self._analytics = analytics
-
-    @cached_property
-    def reports(self) -> AsyncReportsResourceWithRawResponse:
-        return AsyncReportsResourceWithRawResponse(self._analytics.reports)
-
-
-class AnalyticsResourceWithStreamingResponse:
-    def __init__(self, analytics: AnalyticsResource) -> None:
-        self._analytics = analytics
-
-    @cached_property
-    def reports(self) -> ReportsResourceWithStreamingResponse:
-        return ReportsResourceWithStreamingResponse(self._analytics.reports)
-
-
-class AsyncAnalyticsResourceWithStreamingResponse:
-    def __init__(self, analytics: AsyncAnalyticsResource) -> None:
-        self._analytics = analytics
-
-    @cached_property
-    def reports(self) -> AsyncReportsResourceWithStreamingResponse:
-        return AsyncReportsResourceWithStreamingResponse(self._analytics.reports)
diff --git a/src/cloudflare/resources/dns/firewall/analytics/reports/bytimes.py b/src/cloudflare/resources/dns/firewall/analytics/reports/bytimes.py
deleted file mode 100644
index f11dd11b4ad..00000000000
--- a/src/cloudflare/resources/dns/firewall/analytics/reports/bytimes.py
+++ /dev/null
@@ -1,258 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Union, Optional, cast
-from datetime import datetime
-
-import httpx
-
-from ......_types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ......_utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ......_compat import cached_property
-from ......_resource import SyncAPIResource, AsyncAPIResource
-from ......_response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ......_wrappers import ResultWrapper
-from ......_base_client import make_request_options
-from ......types.dns.firewall import Delta
-from ......types.dns.firewall.delta import Delta
-from ......types.dns.analytics.reports.by_time import ByTime
-from ......types.dns.firewall.analytics.reports import bytime_get_params
-
-__all__ = ["BytimesResource", "AsyncBytimesResource"]
-
-
-class BytimesResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> BytimesResourceWithRawResponse:
-        return BytimesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> BytimesResourceWithStreamingResponse:
-        return BytimesResourceWithStreamingResponse(self)
-
-    def get(
-        self,
-        dns_firewall_id: str,
-        *,
-        account_id: str,
-        dimensions: str | NotGiven = NOT_GIVEN,
-        filters: str | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        metrics: str | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        sort: str | NotGiven = NOT_GIVEN,
-        time_delta: Delta | NotGiven = NOT_GIVEN,
-        until: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ByTime]:
-        """
-        Retrieves a list of aggregate metrics grouped by time interval.
-
-        See
-        [Analytics API properties](https://developers.cloudflare.com/dns/reference/analytics-api-properties/)
-        for detailed information about the available query parameters.
-
-        Args:
-          account_id: Identifier
-
-          dns_firewall_id: Identifier
-
-          dimensions: A comma-separated list of dimensions to group results by.
-
-          filters: Segmentation filter in 'attribute operator value' format.
-
-          limit: Limit number of returned metrics.
-
-          metrics: A comma-separated list of metrics to query.
-
-          since: Start date and time of requesting data period in ISO 8601 format.
-
-          sort: A comma-separated list of dimensions to sort by, where each dimension may be
-              prefixed by - (descending) or + (ascending).
-
-          time_delta: Unit of time to group data by.
-
-          until: End date and time of requesting data period in ISO 8601 format.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not dns_firewall_id:
-            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}/dns_analytics/report/bytime",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "dimensions": dimensions,
-                        "filters": filters,
-                        "limit": limit,
-                        "metrics": metrics,
-                        "since": since,
-                        "sort": sort,
-                        "time_delta": time_delta,
-                        "until": until,
-                    },
-                    bytime_get_params.BytimeGetParams,
-                ),
-                post_parser=ResultWrapper[Optional[ByTime]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ByTime]], ResultWrapper[ByTime]),
-        )
-
-
-class AsyncBytimesResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncBytimesResourceWithRawResponse:
-        return AsyncBytimesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncBytimesResourceWithStreamingResponse:
-        return AsyncBytimesResourceWithStreamingResponse(self)
-
-    async def get(
-        self,
-        dns_firewall_id: str,
-        *,
-        account_id: str,
-        dimensions: str | NotGiven = NOT_GIVEN,
-        filters: str | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        metrics: str | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        sort: str | NotGiven = NOT_GIVEN,
-        time_delta: Delta | NotGiven = NOT_GIVEN,
-        until: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ByTime]:
-        """
-        Retrieves a list of aggregate metrics grouped by time interval.
-
-        See
-        [Analytics API properties](https://developers.cloudflare.com/dns/reference/analytics-api-properties/)
-        for detailed information about the available query parameters.
-
-        Args:
-          account_id: Identifier
-
-          dns_firewall_id: Identifier
-
-          dimensions: A comma-separated list of dimensions to group results by.
-
-          filters: Segmentation filter in 'attribute operator value' format.
-
-          limit: Limit number of returned metrics.
-
-          metrics: A comma-separated list of metrics to query.
-
-          since: Start date and time of requesting data period in ISO 8601 format.
-
-          sort: A comma-separated list of dimensions to sort by, where each dimension may be
-              prefixed by - (descending) or + (ascending).
-
-          time_delta: Unit of time to group data by.
-
-          until: End date and time of requesting data period in ISO 8601 format.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not dns_firewall_id:
-            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}/dns_analytics/report/bytime",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=await async_maybe_transform(
-                    {
-                        "dimensions": dimensions,
-                        "filters": filters,
-                        "limit": limit,
-                        "metrics": metrics,
-                        "since": since,
-                        "sort": sort,
-                        "time_delta": time_delta,
-                        "until": until,
-                    },
-                    bytime_get_params.BytimeGetParams,
-                ),
-                post_parser=ResultWrapper[Optional[ByTime]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ByTime]], ResultWrapper[ByTime]),
-        )
-
-
-class BytimesResourceWithRawResponse:
-    def __init__(self, bytimes: BytimesResource) -> None:
-        self._bytimes = bytimes
-
-        self.get = to_raw_response_wrapper(
-            bytimes.get,
-        )
-
-
-class AsyncBytimesResourceWithRawResponse:
-    def __init__(self, bytimes: AsyncBytimesResource) -> None:
-        self._bytimes = bytimes
-
-        self.get = async_to_raw_response_wrapper(
-            bytimes.get,
-        )
-
-
-class BytimesResourceWithStreamingResponse:
-    def __init__(self, bytimes: BytimesResource) -> None:
-        self._bytimes = bytimes
-
-        self.get = to_streamed_response_wrapper(
-            bytimes.get,
-        )
-
-
-class AsyncBytimesResourceWithStreamingResponse:
-    def __init__(self, bytimes: AsyncBytimesResource) -> None:
-        self._bytimes = bytimes
-
-        self.get = async_to_streamed_response_wrapper(
-            bytimes.get,
-        )
diff --git a/src/cloudflare/resources/dns/firewall/firewall.py b/src/cloudflare/resources/dns/firewall/firewall.py
deleted file mode 100644
index 608e46bb270..00000000000
--- a/src/cloudflare/resources/dns/firewall/firewall.py
+++ /dev/null
@@ -1,827 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List, Type, Optional, cast
-
-import httpx
-
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from .analytics import (
-    AnalyticsResource,
-    AsyncAnalyticsResource,
-    AnalyticsResourceWithRawResponse,
-    AsyncAnalyticsResourceWithRawResponse,
-    AnalyticsResourceWithStreamingResponse,
-    AsyncAnalyticsResourceWithStreamingResponse,
-)
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ...._wrappers import ResultWrapper
-from ....types.dns import firewall_edit_params, firewall_list_params, firewall_create_params
-from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
-from ...._base_client import AsyncPaginator, make_request_options
-from .analytics.analytics import AnalyticsResource, AsyncAnalyticsResource
-from ....types.dns.firewall.firewall import Firewall
-from ....types.dns.firewall_ips_param import FirewallIPsParam
-from ....types.dns.upstream_ips_param import UpstreamIPsParam
-from ....types.dns.attack_mitigation_param import AttackMitigationParam
-from ....types.dns.firewall_delete_response import FirewallDeleteResponse
-
-__all__ = ["FirewallResource", "AsyncFirewallResource"]
-
-
-class FirewallResource(SyncAPIResource):
-    @cached_property
-    def analytics(self) -> AnalyticsResource:
-        return AnalyticsResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> FirewallResourceWithRawResponse:
-        return FirewallResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> FirewallResourceWithStreamingResponse:
-        return FirewallResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        *,
-        account_id: str,
-        name: str,
-        upstream_ips: List[UpstreamIPsParam],
-        attack_mitigation: Optional[AttackMitigationParam] | NotGiven = NOT_GIVEN,
-        deprecate_any_requests: bool | NotGiven = NOT_GIVEN,
-        ecs_fallback: bool | NotGiven = NOT_GIVEN,
-        maximum_cache_ttl: float | NotGiven = NOT_GIVEN,
-        minimum_cache_ttl: float | NotGiven = NOT_GIVEN,
-        negative_cache_ttl: Optional[float] | NotGiven = NOT_GIVEN,
-        ratelimit: Optional[float] | NotGiven = NOT_GIVEN,
-        retries: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Firewall]:
-        """
-        Create a configured DNS Firewall Cluster.
-
-        Args:
-          account_id: Identifier
-
-          name: DNS Firewall Cluster Name.
-
-          attack_mitigation: Attack mitigation settings.
-
-          deprecate_any_requests: Deprecate the response to ANY requests.
-
-          ecs_fallback: Forward client IP (resolver) subnet if no EDNS Client Subnet is sent.
-
-          maximum_cache_ttl: Maximum DNS cache TTL. This setting sets an upper bound on DNS TTLs for purposes
-              of caching between DNS Firewall and the upstream servers. Higher TTLs will be
-              decreased to the maximum defined here for caching purposes.
-
-          minimum_cache_ttl: Minimum DNS cache TTL. This setting sets a lower bound on DNS TTLs for purposes
-              of caching between DNS Firewall and the upstream servers. Lower TTLs will be
-              increased to the minimum defined here for caching purposes.
-
-          negative_cache_ttl: Negative DNS cache TTL. This setting controls how long DNS Firewall should cache
-              negative responses (e.g., NXDOMAIN) from the upstream servers.
-
-          ratelimit: Ratelimit in queries per second per datacenter (applies to DNS queries sent to
-              the upstream nameservers configured on the cluster).
-
-          retries: Number of retries for fetching DNS responses from upstream nameservers (not
-              counting the initial attempt).
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._post(
-            f"/accounts/{account_id}/dns_firewall",
-            body=maybe_transform(
-                {
-                    "name": name,
-                    "upstream_ips": upstream_ips,
-                    "attack_mitigation": attack_mitigation,
-                    "deprecate_any_requests": deprecate_any_requests,
-                    "ecs_fallback": ecs_fallback,
-                    "maximum_cache_ttl": maximum_cache_ttl,
-                    "minimum_cache_ttl": minimum_cache_ttl,
-                    "negative_cache_ttl": negative_cache_ttl,
-                    "ratelimit": ratelimit,
-                    "retries": retries,
-                },
-                firewall_create_params.FirewallCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[Firewall]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Firewall]], ResultWrapper[Firewall]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePaginationArray[Firewall]:
-        """
-        List configured DNS Firewall clusters for an account.
-
-        Args:
-          account_id: Identifier
-
-          page: Page number of paginated results.
-
-          per_page: Number of clusters per page.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/dns_firewall",
-            page=SyncV4PagePaginationArray[Firewall],
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "page": page,
-                        "per_page": per_page,
-                    },
-                    firewall_list_params.FirewallListParams,
-                ),
-            ),
-            model=Firewall,
-        )
-
-    def delete(
-        self,
-        dns_firewall_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[FirewallDeleteResponse]:
-        """
-        Delete a configured DNS Firewall Cluster.
-
-        Args:
-          account_id: Identifier
-
-          dns_firewall_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not dns_firewall_id:
-            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
-        return self._delete(
-            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[FirewallDeleteResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[FirewallDeleteResponse]], ResultWrapper[FirewallDeleteResponse]),
-        )
-
-    def edit(
-        self,
-        dns_firewall_id: str,
-        *,
-        account_id: str,
-        id: str,
-        deprecate_any_requests: bool,
-        dns_firewall_ips: List[FirewallIPsParam],
-        ecs_fallback: bool,
-        maximum_cache_ttl: float,
-        minimum_cache_ttl: float,
-        name: str,
-        upstream_ips: List[UpstreamIPsParam],
-        attack_mitigation: Optional[AttackMitigationParam] | NotGiven = NOT_GIVEN,
-        negative_cache_ttl: Optional[float] | NotGiven = NOT_GIVEN,
-        ratelimit: Optional[float] | NotGiven = NOT_GIVEN,
-        retries: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Firewall]:
-        """
-        Modify a DNS Firewall Cluster configuration.
-
-        Args:
-          account_id: Identifier
-
-          dns_firewall_id: Identifier
-
-          id: Identifier
-
-          deprecate_any_requests: Deprecate the response to ANY requests.
-
-          ecs_fallback: Forward client IP (resolver) subnet if no EDNS Client Subnet is sent.
-
-          maximum_cache_ttl: Maximum DNS cache TTL. This setting sets an upper bound on DNS TTLs for purposes
-              of caching between DNS Firewall and the upstream servers. Higher TTLs will be
-              decreased to the maximum defined here for caching purposes.
-
-          minimum_cache_ttl: Minimum DNS cache TTL. This setting sets a lower bound on DNS TTLs for purposes
-              of caching between DNS Firewall and the upstream servers. Lower TTLs will be
-              increased to the minimum defined here for caching purposes.
-
-          name: DNS Firewall Cluster Name.
-
-          attack_mitigation: Attack mitigation settings.
-
-          negative_cache_ttl: Negative DNS cache TTL. This setting controls how long DNS Firewall should cache
-              negative responses (e.g., NXDOMAIN) from the upstream servers.
-
-          ratelimit: Ratelimit in queries per second per datacenter (applies to DNS queries sent to
-              the upstream nameservers configured on the cluster).
-
-          retries: Number of retries for fetching DNS responses from upstream nameservers (not
-              counting the initial attempt).
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not dns_firewall_id:
-            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
-        return self._patch(
-            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}",
-            body=maybe_transform(
-                {
-                    "id": id,
-                    "deprecate_any_requests": deprecate_any_requests,
-                    "dns_firewall_ips": dns_firewall_ips,
-                    "ecs_fallback": ecs_fallback,
-                    "maximum_cache_ttl": maximum_cache_ttl,
-                    "minimum_cache_ttl": minimum_cache_ttl,
-                    "name": name,
-                    "upstream_ips": upstream_ips,
-                    "attack_mitigation": attack_mitigation,
-                    "negative_cache_ttl": negative_cache_ttl,
-                    "ratelimit": ratelimit,
-                    "retries": retries,
-                },
-                firewall_edit_params.FirewallEditParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[Firewall]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Firewall]], ResultWrapper[Firewall]),
-        )
-
-    def get(
-        self,
-        dns_firewall_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Firewall]:
-        """
-        Show a single configured DNS Firewall cluster for an account.
-
-        Args:
-          account_id: Identifier
-
-          dns_firewall_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not dns_firewall_id:
-            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[Firewall]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Firewall]], ResultWrapper[Firewall]),
-        )
-
-
-class AsyncFirewallResource(AsyncAPIResource):
-    @cached_property
-    def analytics(self) -> AsyncAnalyticsResource:
-        return AsyncAnalyticsResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncFirewallResourceWithRawResponse:
-        return AsyncFirewallResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncFirewallResourceWithStreamingResponse:
-        return AsyncFirewallResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        *,
-        account_id: str,
-        name: str,
-        upstream_ips: List[UpstreamIPsParam],
-        attack_mitigation: Optional[AttackMitigationParam] | NotGiven = NOT_GIVEN,
-        deprecate_any_requests: bool | NotGiven = NOT_GIVEN,
-        ecs_fallback: bool | NotGiven = NOT_GIVEN,
-        maximum_cache_ttl: float | NotGiven = NOT_GIVEN,
-        minimum_cache_ttl: float | NotGiven = NOT_GIVEN,
-        negative_cache_ttl: Optional[float] | NotGiven = NOT_GIVEN,
-        ratelimit: Optional[float] | NotGiven = NOT_GIVEN,
-        retries: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Firewall]:
-        """
-        Create a configured DNS Firewall Cluster.
-
-        Args:
-          account_id: Identifier
-
-          name: DNS Firewall Cluster Name.
-
-          attack_mitigation: Attack mitigation settings.
-
-          deprecate_any_requests: Deprecate the response to ANY requests.
-
-          ecs_fallback: Forward client IP (resolver) subnet if no EDNS Client Subnet is sent.
-
-          maximum_cache_ttl: Maximum DNS cache TTL. This setting sets an upper bound on DNS TTLs for purposes
-              of caching between DNS Firewall and the upstream servers. Higher TTLs will be
-              decreased to the maximum defined here for caching purposes.
-
-          minimum_cache_ttl: Minimum DNS cache TTL. This setting sets a lower bound on DNS TTLs for purposes
-              of caching between DNS Firewall and the upstream servers. Lower TTLs will be
-              increased to the minimum defined here for caching purposes.
-
-          negative_cache_ttl: Negative DNS cache TTL. This setting controls how long DNS Firewall should cache
-              negative responses (e.g., NXDOMAIN) from the upstream servers.
-
-          ratelimit: Ratelimit in queries per second per datacenter (applies to DNS queries sent to
-              the upstream nameservers configured on the cluster).
-
-          retries: Number of retries for fetching DNS responses from upstream nameservers (not
-              counting the initial attempt).
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._post(
-            f"/accounts/{account_id}/dns_firewall",
-            body=await async_maybe_transform(
-                {
-                    "name": name,
-                    "upstream_ips": upstream_ips,
-                    "attack_mitigation": attack_mitigation,
-                    "deprecate_any_requests": deprecate_any_requests,
-                    "ecs_fallback": ecs_fallback,
-                    "maximum_cache_ttl": maximum_cache_ttl,
-                    "minimum_cache_ttl": minimum_cache_ttl,
-                    "negative_cache_ttl": negative_cache_ttl,
-                    "ratelimit": ratelimit,
-                    "retries": retries,
-                },
-                firewall_create_params.FirewallCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[Firewall]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Firewall]], ResultWrapper[Firewall]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[Firewall, AsyncV4PagePaginationArray[Firewall]]:
-        """
-        List configured DNS Firewall clusters for an account.
-
-        Args:
-          account_id: Identifier
-
-          page: Page number of paginated results.
-
-          per_page: Number of clusters per page.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/dns_firewall",
-            page=AsyncV4PagePaginationArray[Firewall],
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "page": page,
-                        "per_page": per_page,
-                    },
-                    firewall_list_params.FirewallListParams,
-                ),
-            ),
-            model=Firewall,
-        )
-
-    async def delete(
-        self,
-        dns_firewall_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[FirewallDeleteResponse]:
-        """
-        Delete a configured DNS Firewall Cluster.
-
-        Args:
-          account_id: Identifier
-
-          dns_firewall_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not dns_firewall_id:
-            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
-        return await self._delete(
-            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[FirewallDeleteResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[FirewallDeleteResponse]], ResultWrapper[FirewallDeleteResponse]),
-        )
-
-    async def edit(
-        self,
-        dns_firewall_id: str,
-        *,
-        account_id: str,
-        id: str,
-        deprecate_any_requests: bool,
-        dns_firewall_ips: List[FirewallIPsParam],
-        ecs_fallback: bool,
-        maximum_cache_ttl: float,
-        minimum_cache_ttl: float,
-        name: str,
-        upstream_ips: List[UpstreamIPsParam],
-        attack_mitigation: Optional[AttackMitigationParam] | NotGiven = NOT_GIVEN,
-        negative_cache_ttl: Optional[float] | NotGiven = NOT_GIVEN,
-        ratelimit: Optional[float] | NotGiven = NOT_GIVEN,
-        retries: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Firewall]:
-        """
-        Modify a DNS Firewall Cluster configuration.
-
-        Args:
-          account_id: Identifier
-
-          dns_firewall_id: Identifier
-
-          id: Identifier
-
-          deprecate_any_requests: Deprecate the response to ANY requests.
-
-          ecs_fallback: Forward client IP (resolver) subnet if no EDNS Client Subnet is sent.
-
-          maximum_cache_ttl: Maximum DNS cache TTL. This setting sets an upper bound on DNS TTLs for purposes
-              of caching between DNS Firewall and the upstream servers. Higher TTLs will be
-              decreased to the maximum defined here for caching purposes.
-
-          minimum_cache_ttl: Minimum DNS cache TTL. This setting sets a lower bound on DNS TTLs for purposes
-              of caching between DNS Firewall and the upstream servers. Lower TTLs will be
-              increased to the minimum defined here for caching purposes.
-
-          name: DNS Firewall Cluster Name.
-
-          attack_mitigation: Attack mitigation settings.
-
-          negative_cache_ttl: Negative DNS cache TTL. This setting controls how long DNS Firewall should cache
-              negative responses (e.g., NXDOMAIN) from the upstream servers.
-
-          ratelimit: Ratelimit in queries per second per datacenter (applies to DNS queries sent to
-              the upstream nameservers configured on the cluster).
-
-          retries: Number of retries for fetching DNS responses from upstream nameservers (not
-              counting the initial attempt).
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not dns_firewall_id:
-            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
-        return await self._patch(
-            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}",
-            body=await async_maybe_transform(
-                {
-                    "id": id,
-                    "deprecate_any_requests": deprecate_any_requests,
-                    "dns_firewall_ips": dns_firewall_ips,
-                    "ecs_fallback": ecs_fallback,
-                    "maximum_cache_ttl": maximum_cache_ttl,
-                    "minimum_cache_ttl": minimum_cache_ttl,
-                    "name": name,
-                    "upstream_ips": upstream_ips,
-                    "attack_mitigation": attack_mitigation,
-                    "negative_cache_ttl": negative_cache_ttl,
-                    "ratelimit": ratelimit,
-                    "retries": retries,
-                },
-                firewall_edit_params.FirewallEditParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[Firewall]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Firewall]], ResultWrapper[Firewall]),
-        )
-
-    async def get(
-        self,
-        dns_firewall_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Firewall]:
-        """
-        Show a single configured DNS Firewall cluster for an account.
-
-        Args:
-          account_id: Identifier
-
-          dns_firewall_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not dns_firewall_id:
-            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[Firewall]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Firewall]], ResultWrapper[Firewall]),
-        )
-
-
-class FirewallResourceWithRawResponse:
-    def __init__(self, firewall: FirewallResource) -> None:
-        self._firewall = firewall
-
-        self.create = to_raw_response_wrapper(
-            firewall.create,
-        )
-        self.list = to_raw_response_wrapper(
-            firewall.list,
-        )
-        self.delete = to_raw_response_wrapper(
-            firewall.delete,
-        )
-        self.edit = to_raw_response_wrapper(
-            firewall.edit,
-        )
-        self.get = to_raw_response_wrapper(
-            firewall.get,
-        )
-
-    @cached_property
-    def analytics(self) -> AnalyticsResourceWithRawResponse:
-        return AnalyticsResourceWithRawResponse(self._firewall.analytics)
-
-
-class AsyncFirewallResourceWithRawResponse:
-    def __init__(self, firewall: AsyncFirewallResource) -> None:
-        self._firewall = firewall
-
-        self.create = async_to_raw_response_wrapper(
-            firewall.create,
-        )
-        self.list = async_to_raw_response_wrapper(
-            firewall.list,
-        )
-        self.delete = async_to_raw_response_wrapper(
-            firewall.delete,
-        )
-        self.edit = async_to_raw_response_wrapper(
-            firewall.edit,
-        )
-        self.get = async_to_raw_response_wrapper(
-            firewall.get,
-        )
-
-    @cached_property
-    def analytics(self) -> AsyncAnalyticsResourceWithRawResponse:
-        return AsyncAnalyticsResourceWithRawResponse(self._firewall.analytics)
-
-
-class FirewallResourceWithStreamingResponse:
-    def __init__(self, firewall: FirewallResource) -> None:
-        self._firewall = firewall
-
-        self.create = to_streamed_response_wrapper(
-            firewall.create,
-        )
-        self.list = to_streamed_response_wrapper(
-            firewall.list,
-        )
-        self.delete = to_streamed_response_wrapper(
-            firewall.delete,
-        )
-        self.edit = to_streamed_response_wrapper(
-            firewall.edit,
-        )
-        self.get = to_streamed_response_wrapper(
-            firewall.get,
-        )
-
-    @cached_property
-    def analytics(self) -> AnalyticsResourceWithStreamingResponse:
-        return AnalyticsResourceWithStreamingResponse(self._firewall.analytics)
-
-
-class AsyncFirewallResourceWithStreamingResponse:
-    def __init__(self, firewall: AsyncFirewallResource) -> None:
-        self._firewall = firewall
-
-        self.create = async_to_streamed_response_wrapper(
-            firewall.create,
-        )
-        self.list = async_to_streamed_response_wrapper(
-            firewall.list,
-        )
-        self.delete = async_to_streamed_response_wrapper(
-            firewall.delete,
-        )
-        self.edit = async_to_streamed_response_wrapper(
-            firewall.edit,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            firewall.get,
-        )
-
-    @cached_property
-    def analytics(self) -> AsyncAnalyticsResourceWithStreamingResponse:
-        return AsyncAnalyticsResourceWithStreamingResponse(self._firewall.analytics)
diff --git a/src/cloudflare/resources/dns/records.py b/src/cloudflare/resources/dns/records.py
index feb3b54b6e5..1353b2d22c4 100644
--- a/src/cloudflare/resources/dns/records.py
+++ b/src/cloudflare/resources/dns/records.py
@@ -2,17 +2,14 @@
 
 from __future__ import annotations
 
-from typing import Any, List, Type, Optional, cast, overload
-from typing_extensions import Literal
+import typing_extensions
+from typing import Any, Type, Iterable, Optional, cast
+from typing_extensions import Literal, overload
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    required_args,
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -26,19 +23,26 @@
     record_edit_params,
     record_list_params,
     record_scan_params,
+    record_batch_params,
     record_create_params,
     record_import_params,
     record_update_params,
+    record_scan_review_params,
 )
-from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ..._base_client import AsyncPaginator, make_request_options
-from ...types.dns.record import Record
 from ...types.dns.ttl_param import TTLParam
 from ...types.dns.record_tags import RecordTags
+from ...types.dns.batch_put_param import BatchPutParam
+from ...types.dns.record_response import RecordResponse
+from ...types.dns.batch_patch_param import BatchPatchParam
 from ...types.shared.sort_direction import SortDirection
 from ...types.dns.record_scan_response import RecordScanResponse
+from ...types.dns.record_batch_response import RecordBatchResponse
 from ...types.dns.record_delete_response import RecordDeleteResponse
 from ...types.dns.record_import_response import RecordImportResponse
+from ...types.dns.record_scan_review_response import RecordScanReviewResponse
+from ...types.dns.record_scan_trigger_response import RecordScanTriggerResponse
 
 __all__ = ["RecordsResource", "AsyncRecordsResource"]
 
@@ -46,10 +50,21 @@
 class RecordsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RecordsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RecordsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RecordsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RecordsResourceWithStreamingResponse(self)
 
     @overload
@@ -57,21 +72,21 @@ def create(
         self,
         *,
         zone_id: str,
-        content: str,
         name: str,
+        ttl: TTLParam,
         type: Literal["A"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.ARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -83,27 +98,27 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          content: A valid IPv4 address.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: A valid IPv4 address.
+
           proxied: Whether the record is receiving the performance and security benefits of
               Cloudflare.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          settings: Settings for the DNS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -120,21 +135,21 @@ def create(
         self,
         *,
         zone_id: str,
-        content: str,
         name: str,
+        ttl: TTLParam,
         type: Literal["AAAA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.AAAARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -146,27 +161,27 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          content: A valid IPv6 address.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: A valid IPv6 address.
+
           proxied: Whether the record is receiving the performance and security benefits of
               Cloudflare.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          settings: Settings for the DNS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -183,20 +198,21 @@ def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.CAARecordData,
         name: str,
-        type: Literal["CAA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["CNAME"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.CNAMERecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -208,24 +224,27 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a CAA record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: A valid hostname. Must not match the record's name.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -242,20 +261,22 @@ def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.CERTRecordData,
         name: str,
-        type: Literal["CERT"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["MX"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        priority: float | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.MXRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -267,24 +288,30 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a CERT record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: A valid mail server hostname.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          priority: Required for MX, SRV and URI records; unused by other record types. Records with
+              lower priorities are preferred.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -301,21 +328,21 @@ def create(
         self,
         *,
         zone_id: str,
-        content: object,
         name: str,
-        type: Literal["CNAME"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["NS"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.NSRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -327,27 +354,27 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          content: A valid hostname. Must not match the record's name.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: A valid name server host name.
+
           proxied: Whether the record is receiving the performance and security benefits of
               Cloudflare.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          settings: Settings for the DNS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -364,20 +391,21 @@ def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.DNSKEYRecordData,
         name: str,
-        type: Literal["DNSKEY"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["OPENPGPKEY"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.DNSRecordsOpenpgpkeyRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -389,24 +417,27 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a DNSKEY record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -423,20 +454,21 @@ def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.DSRecordData,
         name: str,
-        type: Literal["DS"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["PTR"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.PTRRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -448,24 +480,27 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a DS record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: Domain name pointing to the address.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -482,20 +517,21 @@ def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.HTTPSRecordData,
         name: str,
-        type: Literal["HTTPS"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["TXT"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.TXTRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -507,24 +543,32 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a HTTPS record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: Text content for the record. The content must consist of quoted "character
+              strings" (RFC 1035), each with a length of up to 255 bytes. Strings exceeding
+              this allowed maximum length are automatically split.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+              Learn more at
+              <https://www.cloudflare.com/learning/dns/dns-records/dns-txt-record/>.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -541,20 +585,21 @@ def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.LOCRecordData,
         name: str,
-        type: Literal["LOC"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["CAA"],
+        comment: str | Omit = omit,
+        data: record_create_params.CAARecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.CAARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -566,24 +611,27 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a LOC record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a CAA record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -600,21 +648,21 @@ def create(
         self,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        priority: float,
-        type: Literal["MX"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["CERT"],
+        comment: str | Omit = omit,
+        data: record_create_params.CERTRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.CERTRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -626,27 +674,27 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
-
-          content: A valid mail server hostname.
+          zone_id: Identifier.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          priority: Required for MX, SRV and URI records; unused by other record types. Records with
-              lower priorities are preferred.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a CERT record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -663,20 +711,21 @@ def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.NAPTRRecordData,
         name: str,
-        type: Literal["NAPTR"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["DNSKEY"],
+        comment: str | Omit = omit,
+        data: record_create_params.DNSKEYRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.DNSKEYRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -688,24 +737,27 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a NAPTR record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a DNSKEY record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -722,20 +774,21 @@ def create(
         self,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["NS"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["DS"],
+        comment: str | Omit = omit,
+        data: record_create_params.DSRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.DSRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -747,24 +800,27 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          content: A valid name server host name.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a DS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -781,20 +837,21 @@ def create(
         self,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["PTR"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["HTTPS"],
+        comment: str | Omit = omit,
+        data: record_create_params.HTTPSRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.HTTPSRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -806,24 +863,27 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          content: Domain name pointing to the address.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a HTTPS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -840,20 +900,21 @@ def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.SMIMEARecordData,
         name: str,
-        type: Literal["SMIMEA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["LOC"],
+        comment: str | Omit = omit,
+        data: record_create_params.LOCRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.LOCRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -865,24 +926,27 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a SMIMEA record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a LOC record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -899,20 +963,21 @@ def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.SRVRecordData,
         name: str,
-        type: Literal["SRV"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["NAPTR"],
+        comment: str | Omit = omit,
+        data: record_create_params.NAPTRRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.NAPTRRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -924,26 +989,27 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a SRV record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode. For SRV records, the first
-              label is normally a service and the second a protocol name, each starting with
-              an underscore.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a NAPTR record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -960,20 +1026,21 @@ def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.SSHFPRecordData,
         name: str,
-        type: Literal["SSHFP"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SMIMEA"],
+        comment: str | Omit = omit,
+        data: record_create_params.SMIMEARecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.SMIMEARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -985,24 +1052,27 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a SSHFP record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SMIMEA record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -1019,20 +1089,21 @@ def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.SVCBRecordData,
         name: str,
-        type: Literal["SVCB"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SRV"],
+        comment: str | Omit = omit,
+        data: record_create_params.SRVRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.SRVRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -1044,24 +1115,27 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a SVCB record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SRV record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -1078,20 +1152,21 @@ def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.TLSARecordData,
         name: str,
-        type: Literal["TLSA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SSHFP"],
+        comment: str | Omit = omit,
+        data: record_create_params.SSHFPRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.SSHFPRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -1103,24 +1178,27 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a TLSA record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SSHFP record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -1137,20 +1215,21 @@ def create(
         self,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["TXT"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SVCB"],
+        comment: str | Omit = omit,
+        data: record_create_params.SVCBRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.SVCBRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -1162,25 +1241,91 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          content: Text content for the record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          data: Components of a SVCB record.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
           tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        *,
+        zone_id: str,
+        name: str,
+        ttl: TTLParam,
+        type: Literal["TLSA"],
+        comment: str | Omit = omit,
+        data: record_create_params.TLSARecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.TLSARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Create a new DNS record for a zone.
+
+        Notes:
+
+        - A/AAAA records cannot exist on the same name as CNAME records.
+        - NS records cannot exist on the same name as any other record type.
+        - Domain names are always represented in Punycode, even if Unicode characters
+          were used when creating the record.
+
+        Args:
+          zone_id: Identifier.
+
+          name: Complete DNS record name, including the zone name, in Punycode.
+
           ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
               Value must be between 60 and 86400, with the minimum reduced to 30 for
               Enterprise zones.
 
+          type: Record type.
+
+          comment: Comments or notes about the DNS record. This field has no effect on DNS
+              responses.
+
+          data: Components of a TLSA record.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -1196,21 +1341,22 @@ def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.URIRecordData,
         name: str,
-        priority: float,
+        ttl: TTLParam,
         type: Literal["URI"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        data: record_create_params.URIRecordData | Omit = omit,
+        priority: float | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.URIRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -1222,27 +1368,30 @@ def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a URI record.
-
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          priority: Required for MX, SRV and URI records; unused by other record types. Records with
-              lower priorities are preferred.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a URI record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          priority: Required for MX, SRV and URI records; unused by other record types. Records with
+              lower priorities are preferred.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -1254,43 +1403,61 @@ def create(
         """
         ...
 
-    @required_args(
-        ["zone_id", "content", "name", "type"],
-        ["zone_id", "data", "name", "type"],
-        ["zone_id", "content", "name", "priority", "type"],
-        ["zone_id", "data", "name", "priority", "type"],
-    )
+    @required_args(["zone_id", "name", "ttl", "type"])
     def create(
         self,
         *,
         zone_id: str,
-        content: str | object | NotGiven = NOT_GIVEN,
         name: str,
+        ttl: TTLParam,
         type: Literal["A"]
         | Literal["AAAA"]
+        | Literal["CNAME"]
+        | Literal["MX"]
+        | Literal["NS"]
+        | Literal["OPENPGPKEY"]
+        | Literal["PTR"]
+        | Literal["TXT"]
         | Literal["CAA"]
         | Literal["CERT"]
-        | Literal["CNAME"]
         | Literal["DNSKEY"]
         | Literal["DS"]
         | Literal["HTTPS"]
         | Literal["LOC"]
-        | Literal["MX"]
         | Literal["NAPTR"]
-        | Literal["NS"]
-        | Literal["PTR"]
         | Literal["SMIMEA"]
         | Literal["SRV"]
         | Literal["SSHFP"]
         | Literal["SVCB"]
         | Literal["TLSA"]
-        | Literal["TXT"]
         | Literal["URI"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.ARecordSettings
+        | record_create_params.AAAARecordSettings
+        | record_create_params.CNAMERecordSettings
+        | record_create_params.MXRecordSettings
+        | record_create_params.NSRecordSettings
+        | record_create_params.DNSRecordsOpenpgpkeyRecordSettings
+        | record_create_params.PTRRecordSettings
+        | record_create_params.TXTRecordSettings
+        | record_create_params.CAARecordSettings
+        | record_create_params.CERTRecordSettings
+        | record_create_params.DNSKEYRecordSettings
+        | record_create_params.DSRecordSettings
+        | record_create_params.HTTPSRecordSettings
+        | record_create_params.LOCRecordSettings
+        | record_create_params.NAPTRRecordSettings
+        | record_create_params.SMIMEARecordSettings
+        | record_create_params.SRVRecordSettings
+        | record_create_params.SSHFPRecordSettings
+        | record_create_params.SVCBRecordSettings
+        | record_create_params.TLSARecordSettings
+        | record_create_params.URIRecordSettings
+        | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
+        priority: float | Omit = omit,
         data: record_create_params.CAARecordData
         | record_create_params.CERTRecordData
         | record_create_params.DNSKEYRecordData
@@ -1301,34 +1468,35 @@ def create(
         | record_create_params.SMIMEARecordData
         | record_create_params.SRVRecordData
         | record_create_params.SSHFPRecordData
+        | record_create_params.SVCBRecordData
+        | record_create_params.TLSARecordData
         | record_create_params.URIRecordData
-        | NotGiven = NOT_GIVEN,
-        priority: float | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return cast(
-            Optional[Record],
+            Optional[RecordResponse],
             self._post(
                 f"/zones/{zone_id}/dns_records",
                 body=maybe_transform(
                     {
-                        "content": content,
                         "name": name,
+                        "ttl": ttl,
                         "type": type,
-                        "id": id,
                         "comment": comment,
+                        "content": content,
                         "proxied": proxied,
+                        "settings": settings,
                         "tags": tags,
-                        "ttl": ttl,
-                        "data": data,
                         "priority": priority,
+                        "data": data,
                     },
                     record_create_params.RecordCreateParams,
                 ),
@@ -1337,10 +1505,10 @@ def create(
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[Optional[Record]]._unwrapper,
+                    post_parser=ResultWrapper[Optional[RecordResponse]]._unwrapper,
                 ),
                 cast_to=cast(
-                    Any, ResultWrapper[Record]
+                    Any, ResultWrapper[RecordResponse]
                 ),  # Union types cannot be passed in as arguments in the type system
             ),
         )
@@ -1351,22 +1519,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
+        ttl: TTLParam,
         type: Literal["A"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.ARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -1376,29 +1545,29 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: A valid IPv4 address.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: A valid IPv4 address.
+
           proxied: Whether the record is receiving the performance and security benefits of
               Cloudflare.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          settings: Settings for the DNS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -1416,22 +1585,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
+        ttl: TTLParam,
         type: Literal["AAAA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.AAAARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -1441,29 +1611,29 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: A valid IPv6 address.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: A valid IPv6 address.
+
           proxied: Whether the record is receiving the performance and security benefits of
               Cloudflare.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          settings: Settings for the DNS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -1481,21 +1651,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.CAARecordData,
         name: str,
-        type: Literal["CAA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["CNAME"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.CNAMERecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -1505,26 +1677,29 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a CAA record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: A valid hostname. Must not match the record's name.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -1542,21 +1717,24 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.CERTRecordData,
         name: str,
-        type: Literal["CERT"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["MX"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        priority: float | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.MXRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -1566,26 +1744,32 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a CERT record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: A valid mail server hostname.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          priority: Required for MX, SRV and URI records; unused by other record types. Records with
+              lower priorities are preferred.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -1603,22 +1787,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: object,
         name: str,
-        type: Literal["CNAME"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["NS"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.NSRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -1628,29 +1813,29 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: A valid hostname. Must not match the record's name.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: A valid name server host name.
+
           proxied: Whether the record is receiving the performance and security benefits of
               Cloudflare.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          settings: Settings for the DNS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -1668,21 +1853,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.DNSKEYRecordData,
         name: str,
-        type: Literal["DNSKEY"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["OPENPGPKEY"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.DNSRecordsOpenpgpkeyRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -1692,26 +1879,29 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a DNSKEY record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -1729,21 +1919,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.DSRecordData,
         name: str,
-        type: Literal["DS"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["PTR"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.PTRRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -1753,27 +1945,30 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a DS record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: Domain name pointing to the address.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
           tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -1790,21 +1985,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.HTTPSRecordData,
         name: str,
-        type: Literal["HTTPS"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["TXT"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.TXTRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -1814,26 +2011,34 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a HTTPS record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: Text content for the record. The content must consist of quoted "character
+              strings" (RFC 1035), each with a length of up to 255 bytes. Strings exceeding
+              this allowed maximum length are automatically split.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+              Learn more at
+              <https://www.cloudflare.com/learning/dns/dns-records/dns-txt-record/>.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -1851,21 +2056,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.LOCRecordData,
         name: str,
-        type: Literal["LOC"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["CAA"],
+        comment: str | Omit = omit,
+        data: record_update_params.CAARecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.CAARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -1875,26 +2082,29 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a LOC record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a CAA record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -1912,22 +2122,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        priority: float,
-        type: Literal["MX"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["CERT"],
+        comment: str | Omit = omit,
+        data: record_update_params.CERTRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.CERTRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -1937,29 +2148,29 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
-
-          dns_record_id: Identifier
+          zone_id: Identifier.
 
-          content: A valid mail server hostname.
+          dns_record_id: Identifier.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          priority: Required for MX, SRV and URI records; unused by other record types. Records with
-              lower priorities are preferred.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a CERT record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -1977,21 +2188,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.NAPTRRecordData,
         name: str,
-        type: Literal["NAPTR"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["DNSKEY"],
+        comment: str | Omit = omit,
+        data: record_update_params.DNSKEYRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.DNSKEYRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -2001,26 +2214,29 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a NAPTR record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a DNSKEY record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -2038,21 +2254,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["NS"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["DS"],
+        comment: str | Omit = omit,
+        data: record_update_params.DSRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.DSRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -2062,26 +2280,29 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: A valid name server host name.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a DS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -2099,21 +2320,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["PTR"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["HTTPS"],
+        comment: str | Omit = omit,
+        data: record_update_params.HTTPSRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.HTTPSRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -2123,26 +2346,29 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: Domain name pointing to the address.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a HTTPS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -2160,21 +2386,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.SMIMEARecordData,
         name: str,
-        type: Literal["SMIMEA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["LOC"],
+        comment: str | Omit = omit,
+        data: record_update_params.LOCRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.LOCRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -2184,26 +2412,29 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a SMIMEA record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a LOC record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -2221,21 +2452,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.SRVRecordData,
         name: str,
-        type: Literal["SRV"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["NAPTR"],
+        comment: str | Omit = omit,
+        data: record_update_params.NAPTRRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.NAPTRRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -2245,28 +2478,29 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a SRV record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode. For SRV records, the first
-              label is normally a service and the second a protocol name, each starting with
-              an underscore.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a NAPTR record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -2284,21 +2518,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.SSHFPRecordData,
         name: str,
-        type: Literal["SSHFP"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SMIMEA"],
+        comment: str | Omit = omit,
+        data: record_update_params.SMIMEARecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.SMIMEARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -2308,26 +2544,29 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a SSHFP record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SMIMEA record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -2345,21 +2584,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.SVCBRecordData,
         name: str,
-        type: Literal["SVCB"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SRV"],
+        comment: str | Omit = omit,
+        data: record_update_params.SRVRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.SRVRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -2369,26 +2610,29 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a SVCB record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SRV record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -2406,21 +2650,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.TLSARecordData,
         name: str,
-        type: Literal["TLSA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SSHFP"],
+        comment: str | Omit = omit,
+        data: record_update_params.SSHFPRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.SSHFPRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -2430,26 +2676,29 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a TLSA record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SSHFP record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -2467,21 +2716,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["TXT"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SVCB"],
+        comment: str | Omit = omit,
+        data: record_update_params.SVCBRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.SVCBRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -2491,26 +2742,29 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: Text content for the record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SVCB record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -2528,22 +2782,23 @@ def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.URIRecordData,
         name: str,
-        priority: float,
-        type: Literal["URI"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["TLSA"],
+        comment: str | Omit = omit,
+        data: record_update_params.TLSARecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.TLSARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -2553,29 +2808,29 @@ def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
-
-          dns_record_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a URI record.
+          dns_record_id: Identifier.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          priority: Required for MX, SRV and URI records; unused by other record types. Records with
-              lower priorities are preferred.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a TLSA record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -2587,44 +2842,132 @@ def update(
         """
         ...
 
-    @required_args(
-        ["zone_id", "content", "name", "type"],
-        ["zone_id", "data", "name", "type"],
-        ["zone_id", "content", "name", "priority", "type"],
-        ["zone_id", "data", "name", "priority", "type"],
-    )
+    @overload
     def update(
         self,
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str | object | NotGiven = NOT_GIVEN,
         name: str,
-        type: Literal["A"]
-        | Literal["AAAA"]
-        | Literal["CAA"]
-        | Literal["CERT"]
-        | Literal["CNAME"]
-        | Literal["DNSKEY"]
-        | Literal["DS"]
-        | Literal["HTTPS"]
-        | Literal["LOC"]
-        | Literal["MX"]
-        | Literal["NAPTR"]
+        ttl: TTLParam,
+        type: Literal["URI"],
+        comment: str | Omit = omit,
+        data: record_update_params.URIRecordData | Omit = omit,
+        priority: float | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.URIRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
+
+        Notes:
+
+        - A/AAAA records cannot exist on the same name as CNAME records.
+        - NS records cannot exist on the same name as any other record type.
+        - Domain names are always represented in Punycode, even if Unicode characters
+          were used when creating the record.
+
+        Args:
+          zone_id: Identifier.
+
+          dns_record_id: Identifier.
+
+          name: Complete DNS record name, including the zone name, in Punycode.
+
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
+
+          type: Record type.
+
+          comment: Comments or notes about the DNS record. This field has no effect on DNS
+              responses.
+
+          data: Components of a URI record.
+
+          priority: Required for MX, SRV and URI records; unused by other record types. Records with
+              lower priorities are preferred.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["zone_id", "name", "ttl", "type"])
+    def update(
+        self,
+        dns_record_id: str,
+        *,
+        zone_id: str,
+        name: str,
+        ttl: TTLParam,
+        type: Literal["A"]
+        | Literal["AAAA"]
+        | Literal["CNAME"]
+        | Literal["MX"]
         | Literal["NS"]
+        | Literal["OPENPGPKEY"]
         | Literal["PTR"]
+        | Literal["TXT"]
+        | Literal["CAA"]
+        | Literal["CERT"]
+        | Literal["DNSKEY"]
+        | Literal["DS"]
+        | Literal["HTTPS"]
+        | Literal["LOC"]
+        | Literal["NAPTR"]
         | Literal["SMIMEA"]
         | Literal["SRV"]
         | Literal["SSHFP"]
         | Literal["SVCB"]
         | Literal["TLSA"]
-        | Literal["TXT"]
         | Literal["URI"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.ARecordSettings
+        | record_update_params.AAAARecordSettings
+        | record_update_params.CNAMERecordSettings
+        | record_update_params.MXRecordSettings
+        | record_update_params.NSRecordSettings
+        | record_update_params.DNSRecordsOpenpgpkeyRecordSettings
+        | record_update_params.PTRRecordSettings
+        | record_update_params.TXTRecordSettings
+        | record_update_params.CAARecordSettings
+        | record_update_params.CERTRecordSettings
+        | record_update_params.DNSKEYRecordSettings
+        | record_update_params.DSRecordSettings
+        | record_update_params.HTTPSRecordSettings
+        | record_update_params.LOCRecordSettings
+        | record_update_params.NAPTRRecordSettings
+        | record_update_params.SMIMEARecordSettings
+        | record_update_params.SRVRecordSettings
+        | record_update_params.SSHFPRecordSettings
+        | record_update_params.SVCBRecordSettings
+        | record_update_params.TLSARecordSettings
+        | record_update_params.URIRecordSettings
+        | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
+        priority: float | Omit = omit,
         data: record_update_params.CAARecordData
         | record_update_params.CERTRecordData
         | record_update_params.DNSKEYRecordData
@@ -2635,36 +2978,37 @@ def update(
         | record_update_params.SMIMEARecordData
         | record_update_params.SRVRecordData
         | record_update_params.SSHFPRecordData
+        | record_update_params.SVCBRecordData
+        | record_update_params.TLSARecordData
         | record_update_params.URIRecordData
-        | NotGiven = NOT_GIVEN,
-        priority: float | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not dns_record_id:
             raise ValueError(f"Expected a non-empty value for `dns_record_id` but received {dns_record_id!r}")
         return cast(
-            Optional[Record],
+            Optional[RecordResponse],
             self._put(
                 f"/zones/{zone_id}/dns_records/{dns_record_id}",
                 body=maybe_transform(
                     {
-                        "content": content,
                         "name": name,
+                        "ttl": ttl,
                         "type": type,
-                        "id": id,
                         "comment": comment,
+                        "content": content,
                         "proxied": proxied,
+                        "settings": settings,
                         "tags": tags,
-                        "ttl": ttl,
-                        "data": data,
                         "priority": priority,
+                        "data": data,
                     },
                     record_update_params.RecordUpdateParams,
                 ),
@@ -2673,10 +3017,10 @@ def update(
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[Optional[Record]]._unwrapper,
+                    post_parser=ResultWrapper[Optional[RecordResponse]]._unwrapper,
                 ),
                 cast_to=cast(
-                    Any, ResultWrapper[Record]
+                    Any, ResultWrapper[RecordResponse]
                 ),  # Union types cannot be passed in as arguments in the type system
             ),
         )
@@ -2685,18 +3029,18 @@ def list(
         self,
         *,
         zone_id: str,
-        comment: record_list_params.Comment | NotGiven = NOT_GIVEN,
-        content: str | NotGiven = NOT_GIVEN,
-        direction: SortDirection | NotGiven = NOT_GIVEN,
-        match: Literal["any", "all"] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        order: Literal["type", "name", "content", "ttl", "proxied"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        search: str | NotGiven = NOT_GIVEN,
-        tag: record_list_params.Tag | NotGiven = NOT_GIVEN,
-        tag_match: Literal["any", "all"] | NotGiven = NOT_GIVEN,
+        comment: record_list_params.Comment | Omit = omit,
+        content: record_list_params.Content | Omit = omit,
+        direction: SortDirection | Omit = omit,
+        match: Literal["any", "all"] | Omit = omit,
+        name: record_list_params.Name | Omit = omit,
+        order: Literal["type", "name", "content", "ttl", "proxied"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        proxied: bool | Omit = omit,
+        search: str | Omit = omit,
+        tag: record_list_params.Tag | Omit = omit,
+        tag_match: Literal["any", "all"] | Omit = omit,
         type: Literal[
             "A",
             "AAAA",
@@ -2710,6 +3054,7 @@ def list(
             "MX",
             "NAPTR",
             "NS",
+            "OPENPGPKEY",
             "PTR",
             "SMIMEA",
             "SRV",
@@ -2719,21 +3064,19 @@ def list(
             "TXT",
             "URI",
         ]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePaginationArray[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[RecordResponse]:
         """
         List, search, sort, and filter a zones' DNS records.
 
         Args:
-          zone_id: Identifier
-
-          content: DNS record content.
+          zone_id: Identifier.
 
           direction: Direction to order DNS records in.
 
@@ -2742,8 +3085,6 @@ def list(
               instead. Note that the interaction between tag filters is controlled by the
               `tag-match` parameter instead.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
-
           order: Field to order DNS records by.
 
           page: Page number of paginated results.
@@ -2778,7 +3119,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
             f"/zones/{zone_id}/dns_records",
-            page=SyncV4PagePaginationArray[Record],
+            page=SyncV4PagePaginationArray[RecordResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -2803,7 +3144,7 @@ def list(
                     record_list_params.RecordListParams,
                 ),
             ),
-            model=cast(Any, Record),  # Union types cannot be passed in as arguments in the type system
+            model=cast(Any, RecordResponse),  # Union types cannot be passed in as arguments in the type system
         )
 
     def delete(
@@ -2816,15 +3157,15 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RecordDeleteResponse]:
         """
         Delete DNS Record
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -2850,28 +3191,97 @@ def delete(
             cast_to=cast(Type[Optional[RecordDeleteResponse]], ResultWrapper[RecordDeleteResponse]),
         )
 
+    def batch(
+        self,
+        *,
+        zone_id: str,
+        deletes: Iterable[record_batch_params.Delete] | Omit = omit,
+        patches: Iterable[BatchPatchParam] | Omit = omit,
+        posts: Iterable[record_batch_params.Post] | Omit = omit,
+        puts: Iterable[BatchPutParam] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordBatchResponse]:
+        """
+        Send a Batch of DNS Record API calls to be executed together.
+
+        Notes:
+
+        - Although Cloudflare will execute the batched operations in a single database
+          transaction, Cloudflare's distributed KV store must treat each record change
+          as a single key-value pair. This means that the propagation of changes is not
+          atomic. See
+          [the documentation](https://developers.cloudflare.com/dns/manage-dns-records/how-to/batch-record-changes/ "Batch DNS records")
+          for more information.
+        - The operations you specify within the /batch request body are always executed
+          in the following order:
+
+          - Deletes
+          - Patches
+          - Puts
+          - Posts
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/dns_records/batch",
+            body=maybe_transform(
+                {
+                    "deletes": deletes,
+                    "patches": patches,
+                    "posts": posts,
+                    "puts": puts,
+                },
+                record_batch_params.RecordBatchParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RecordBatchResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RecordBatchResponse]], ResultWrapper[RecordBatchResponse]),
+        )
+
     @overload
     def edit(
         self,
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
+        ttl: TTLParam,
         type: Literal["A"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.ARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -2881,29 +3291,29 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: A valid IPv4 address.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: A valid IPv4 address.
+
           proxied: Whether the record is receiving the performance and security benefits of
               Cloudflare.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          settings: Settings for the DNS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -2921,22 +3331,23 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
+        ttl: TTLParam,
         type: Literal["AAAA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.AAAARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -2946,29 +3357,29 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: A valid IPv6 address.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: A valid IPv6 address.
+
           proxied: Whether the record is receiving the performance and security benefits of
               Cloudflare.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          settings: Settings for the DNS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -2986,21 +3397,23 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.CAARecordData,
         name: str,
-        type: Literal["CAA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["CNAME"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.CNAMERecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -3010,26 +3423,29 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a CAA record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: A valid hostname. Must not match the record's name.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -3047,21 +3463,24 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.CERTRecordData,
         name: str,
-        type: Literal["CERT"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["MX"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        priority: float | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.MXRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -3071,26 +3490,32 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a CERT record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: A valid mail server hostname.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          priority: Required for MX, SRV and URI records; unused by other record types. Records with
+              lower priorities are preferred.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -3108,22 +3533,23 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: object,
         name: str,
-        type: Literal["CNAME"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["NS"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.NSRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -3133,29 +3559,29 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: A valid hostname. Must not match the record's name.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: A valid name server host name.
+
           proxied: Whether the record is receiving the performance and security benefits of
               Cloudflare.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          settings: Settings for the DNS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -3173,21 +3599,23 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.DNSKEYRecordData,
         name: str,
-        type: Literal["DNSKEY"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["OPENPGPKEY"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.DNSRecordsOpenpgpkeyRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -3197,26 +3625,29 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a DNSKEY record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -3234,21 +3665,23 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.DSRecordData,
         name: str,
-        type: Literal["DS"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["PTR"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.PTRRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -3258,26 +3691,29 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a DS record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: Domain name pointing to the address.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -3295,21 +3731,23 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.HTTPSRecordData,
         name: str,
-        type: Literal["HTTPS"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["TXT"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.TXTRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -3319,26 +3757,34 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a HTTPS record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: Text content for the record. The content must consist of quoted "character
+              strings" (RFC 1035), each with a length of up to 255 bytes. Strings exceeding
+              this allowed maximum length are automatically split.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+              Learn more at
+              <https://www.cloudflare.com/learning/dns/dns-records/dns-txt-record/>.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -3356,21 +3802,23 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.LOCRecordData,
         name: str,
-        type: Literal["LOC"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["CAA"],
+        comment: str | Omit = omit,
+        data: record_edit_params.CAARecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.CAARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -3380,26 +3828,29 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a LOC record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a CAA record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -3417,22 +3868,23 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        priority: float,
-        type: Literal["MX"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["CERT"],
+        comment: str | Omit = omit,
+        data: record_edit_params.CERTRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.CERTRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -3442,29 +3894,29 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
-
-          dns_record_id: Identifier
+          zone_id: Identifier.
 
-          content: A valid mail server hostname.
+          dns_record_id: Identifier.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          priority: Required for MX, SRV and URI records; unused by other record types. Records with
-              lower priorities are preferred.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a CERT record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -3482,21 +3934,23 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.NAPTRRecordData,
         name: str,
-        type: Literal["NAPTR"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["DNSKEY"],
+        comment: str | Omit = omit,
+        data: record_edit_params.DNSKEYRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.DNSKEYRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -3506,26 +3960,29 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a NAPTR record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a DNSKEY record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -3543,21 +4000,23 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["NS"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["DS"],
+        comment: str | Omit = omit,
+        data: record_edit_params.DSRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.DSRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -3567,26 +4026,29 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: A valid name server host name.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a DS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -3604,21 +4066,23 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["PTR"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["HTTPS"],
+        comment: str | Omit = omit,
+        data: record_edit_params.HTTPSRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.HTTPSRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -3628,26 +4092,29 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: Domain name pointing to the address.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a HTTPS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -3665,21 +4132,23 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.SMIMEARecordData,
         name: str,
-        type: Literal["SMIMEA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["LOC"],
+        comment: str | Omit = omit,
+        data: record_edit_params.LOCRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.LOCRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -3689,26 +4158,29 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a SMIMEA record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a LOC record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -3726,21 +4198,23 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.SRVRecordData,
         name: str,
-        type: Literal["SRV"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["NAPTR"],
+        comment: str | Omit = omit,
+        data: record_edit_params.NAPTRRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.NAPTRRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -3750,28 +4224,29 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a SRV record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode. For SRV records, the first
-              label is normally a service and the second a protocol name, each starting with
-              an underscore.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a NAPTR record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -3789,21 +4264,23 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.SSHFPRecordData,
         name: str,
-        type: Literal["SSHFP"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SMIMEA"],
+        comment: str | Omit = omit,
+        data: record_edit_params.SMIMEARecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.SMIMEARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -3813,26 +4290,29 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a SSHFP record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SMIMEA record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -3850,21 +4330,23 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.SVCBRecordData,
         name: str,
-        type: Literal["SVCB"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SRV"],
+        comment: str | Omit = omit,
+        data: record_edit_params.SRVRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.SRVRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -3874,26 +4356,29 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a SVCB record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SRV record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -3911,21 +4396,23 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.TLSARecordData,
         name: str,
-        type: Literal["TLSA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SSHFP"],
+        comment: str | Omit = omit,
+        data: record_edit_params.SSHFPRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.SSHFPRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -3935,26 +4422,29 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a TLSA record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SSHFP record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -3972,21 +4462,23 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["TXT"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SVCB"],
+        comment: str | Omit = omit,
+        data: record_edit_params.SVCBRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.SVCBRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -3996,27 +4488,96 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: Text content for the record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          data: Components of a SVCB record.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
           tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def edit(
+        self,
+        dns_record_id: str,
+        *,
+        zone_id: str,
+        name: str,
+        ttl: TTLParam,
+        type: Literal["TLSA"],
+        comment: str | Omit = omit,
+        data: record_edit_params.TLSARecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.TLSARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
+
+        Notes:
+
+        - A/AAAA records cannot exist on the same name as CNAME records.
+        - NS records cannot exist on the same name as any other record type.
+        - Domain names are always represented in Punycode, even if Unicode characters
+          were used when creating the record.
+
+        Args:
+          zone_id: Identifier.
+
+          dns_record_id: Identifier.
+
+          name: Complete DNS record name, including the zone name, in Punycode.
+
           ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
               Value must be between 60 and 86400, with the minimum reduced to 30 for
               Enterprise zones.
 
+          type: Record type.
+
+          comment: Comments or notes about the DNS record. This field has no effect on DNS
+              responses.
+
+          data: Components of a TLSA record.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -4033,22 +4594,24 @@ def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.URIRecordData,
         name: str,
-        priority: float,
+        ttl: TTLParam,
         type: Literal["URI"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        data: record_edit_params.URIRecordData | Omit = omit,
+        priority: float | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.URIRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -4058,29 +4621,32 @@ def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
-
-          dns_record_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a URI record.
+          dns_record_id: Identifier.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          priority: Required for MX, SRV and URI records; unused by other record types. Records with
-              lower priorities are preferred.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a URI record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          priority: Required for MX, SRV and URI records; unused by other record types. Records with
+              lower priorities are preferred.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -4092,44 +4658,62 @@ def edit(
         """
         ...
 
-    @required_args(
-        ["zone_id", "content", "name", "type"],
-        ["zone_id", "data", "name", "type"],
-        ["zone_id", "content", "name", "priority", "type"],
-        ["zone_id", "data", "name", "priority", "type"],
-    )
+    @required_args(["zone_id", "name", "ttl", "type"])
     def edit(
         self,
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str | object | NotGiven = NOT_GIVEN,
         name: str,
+        ttl: TTLParam,
         type: Literal["A"]
         | Literal["AAAA"]
+        | Literal["CNAME"]
+        | Literal["MX"]
+        | Literal["NS"]
+        | Literal["OPENPGPKEY"]
+        | Literal["PTR"]
+        | Literal["TXT"]
         | Literal["CAA"]
         | Literal["CERT"]
-        | Literal["CNAME"]
         | Literal["DNSKEY"]
         | Literal["DS"]
         | Literal["HTTPS"]
         | Literal["LOC"]
-        | Literal["MX"]
         | Literal["NAPTR"]
-        | Literal["NS"]
-        | Literal["PTR"]
         | Literal["SMIMEA"]
         | Literal["SRV"]
         | Literal["SSHFP"]
         | Literal["SVCB"]
         | Literal["TLSA"]
-        | Literal["TXT"]
         | Literal["URI"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.ARecordSettings
+        | record_edit_params.AAAARecordSettings
+        | record_edit_params.CNAMERecordSettings
+        | record_edit_params.MXRecordSettings
+        | record_edit_params.NSRecordSettings
+        | record_edit_params.DNSRecordsOpenpgpkeyRecordSettings
+        | record_edit_params.PTRRecordSettings
+        | record_edit_params.TXTRecordSettings
+        | record_edit_params.CAARecordSettings
+        | record_edit_params.CERTRecordSettings
+        | record_edit_params.DNSKEYRecordSettings
+        | record_edit_params.DSRecordSettings
+        | record_edit_params.HTTPSRecordSettings
+        | record_edit_params.LOCRecordSettings
+        | record_edit_params.NAPTRRecordSettings
+        | record_edit_params.SMIMEARecordSettings
+        | record_edit_params.SRVRecordSettings
+        | record_edit_params.SSHFPRecordSettings
+        | record_edit_params.SVCBRecordSettings
+        | record_edit_params.TLSARecordSettings
+        | record_edit_params.URIRecordSettings
+        | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
+        priority: float | Omit = omit,
         data: record_edit_params.CAARecordData
         | record_edit_params.CERTRecordData
         | record_edit_params.DNSKEYRecordData
@@ -4140,36 +4724,37 @@ def edit(
         | record_edit_params.SMIMEARecordData
         | record_edit_params.SRVRecordData
         | record_edit_params.SSHFPRecordData
+        | record_edit_params.SVCBRecordData
+        | record_edit_params.TLSARecordData
         | record_edit_params.URIRecordData
-        | NotGiven = NOT_GIVEN,
-        priority: float | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not dns_record_id:
             raise ValueError(f"Expected a non-empty value for `dns_record_id` but received {dns_record_id!r}")
         return cast(
-            Optional[Record],
+            Optional[RecordResponse],
             self._patch(
                 f"/zones/{zone_id}/dns_records/{dns_record_id}",
                 body=maybe_transform(
                     {
-                        "content": content,
                         "name": name,
+                        "ttl": ttl,
                         "type": type,
-                        "id": id,
                         "comment": comment,
+                        "content": content,
                         "proxied": proxied,
+                        "settings": settings,
                         "tags": tags,
-                        "ttl": ttl,
-                        "data": data,
                         "priority": priority,
+                        "data": data,
                     },
                     record_edit_params.RecordEditParams,
                 ),
@@ -4178,10 +4763,10 @@ def edit(
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[Optional[Record]]._unwrapper,
+                    post_parser=ResultWrapper[Optional[RecordResponse]]._unwrapper,
                 ),
                 cast_to=cast(
-                    Any, ResultWrapper[Record]
+                    Any, ResultWrapper[RecordResponse]
                 ),  # Union types cannot be passed in as arguments in the type system
             ),
         )
@@ -4195,7 +4780,7 @@ def export(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> str:
         """
         You can export your
@@ -4207,7 +4792,7 @@ def export(
         for more information.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -4238,15 +4823,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         DNS Record Details
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -4261,7 +4846,7 @@ def get(
         if not dns_record_id:
             raise ValueError(f"Expected a non-empty value for `dns_record_id` but received {dns_record_id!r}")
         return cast(
-            Optional[Record],
+            Optional[RecordResponse],
             self._get(
                 f"/zones/{zone_id}/dns_records/{dns_record_id}",
                 options=make_request_options(
@@ -4269,10 +4854,10 @@ def get(
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[Optional[Record]]._unwrapper,
+                    post_parser=ResultWrapper[Optional[RecordResponse]]._unwrapper,
                 ),
                 cast_to=cast(
-                    Any, ResultWrapper[Record]
+                    Any, ResultWrapper[RecordResponse]
                 ),  # Union types cannot be passed in as arguments in the type system
             ),
         )
@@ -4282,13 +4867,13 @@ def import_(
         *,
         zone_id: str,
         file: str,
-        proxied: str | NotGiven = NOT_GIVEN,
+        proxied: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RecordImportResponse]:
         """
         You can upload your
@@ -4301,7 +4886,7 @@ def import_(
         for more information.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           file: BIND config to import.
 
@@ -4346,6 +4931,9 @@ def import_(
             cast_to=cast(Type[Optional[RecordImportResponse]], ResultWrapper[RecordImportResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "This endpoint is deprecated in favor of a new asynchronous version. Please use the [/scan/trigger](https://developers.cloudflare.com/api/resources/dns/subresources/records/methods/scan/trigger) and [/scan/review](https://developers.cloudflare.com/api/resources/dns/subresources/records/methods/scan/review) endpoints instead.\n"
+    )
     def scan(
         self,
         *,
@@ -4356,14 +4944,14 @@ def scan(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RecordScanResponse]:
         """
         Scan for common DNS records on your domain and automatically add them to your
         zone. Useful if you haven't updated your nameservers yet.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -4388,14 +4976,154 @@ def scan(
             cast_to=cast(Type[Optional[RecordScanResponse]], ResultWrapper[RecordScanResponse]),
         )
 
+    def scan_list(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[RecordResponse]:
+        """
+        Retrieves the list of DNS records discovered up to this point by the
+        asynchronous scan. These records are temporary until explicitly accepted or
+        rejected via `POST /scan/review`. Additional records may be discovered by the
+        scan later.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/dns_records/scan/review",
+            page=SyncSinglePage[RecordResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, RecordResponse),  # Union types cannot be passed in as arguments in the type system
+        )
+
+    def scan_review(
+        self,
+        *,
+        zone_id: str,
+        accepts: Iterable[record_scan_review_params.Accept] | Omit = omit,
+        rejects: Iterable[record_scan_review_params.Reject] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordScanReviewResponse]:
+        """Accept or reject DNS records found by the DNS records scan.
+
+        Accepted records
+        will be permanently added to the zone, while rejected records will be
+        permanently deleted.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/dns_records/scan/review",
+            body=maybe_transform(
+                {
+                    "accepts": accepts,
+                    "rejects": rejects,
+                },
+                record_scan_review_params.RecordScanReviewParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RecordScanReviewResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RecordScanReviewResponse]], ResultWrapper[RecordScanReviewResponse]),
+        )
+
+    def scan_trigger(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RecordScanTriggerResponse:
+        """Initiates an asynchronous scan for common DNS records on your domain.
+
+        Note that
+        this **does not** automatically add records to your zone. The scan runs in the
+        background, and results can be reviewed later using the `/scan/review`
+        endpoints. Useful if you haven't updated your nameservers yet.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/dns_records/scan/trigger",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=RecordScanTriggerResponse,
+        )
+
 
 class AsyncRecordsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRecordsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRecordsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRecordsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRecordsResourceWithStreamingResponse(self)
 
     @overload
@@ -4403,21 +5131,21 @@ async def create(
         self,
         *,
         zone_id: str,
-        content: str,
         name: str,
+        ttl: TTLParam,
         type: Literal["A"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.ARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -4429,27 +5157,27 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          content: A valid IPv4 address.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: A valid IPv4 address.
+
           proxied: Whether the record is receiving the performance and security benefits of
               Cloudflare.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          settings: Settings for the DNS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -4466,21 +5194,21 @@ async def create(
         self,
         *,
         zone_id: str,
-        content: str,
         name: str,
+        ttl: TTLParam,
         type: Literal["AAAA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.AAAARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -4492,27 +5220,27 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          content: A valid IPv6 address.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: A valid IPv6 address.
+
           proxied: Whether the record is receiving the performance and security benefits of
               Cloudflare.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          settings: Settings for the DNS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -4529,20 +5257,21 @@ async def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.CAARecordData,
         name: str,
-        type: Literal["CAA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["CNAME"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.CNAMERecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -4554,24 +5283,27 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a CAA record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: A valid hostname. Must not match the record's name.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -4588,20 +5320,22 @@ async def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.CERTRecordData,
         name: str,
-        type: Literal["CERT"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["MX"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        priority: float | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.MXRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -4613,24 +5347,30 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a CERT record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: A valid mail server hostname.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          priority: Required for MX, SRV and URI records; unused by other record types. Records with
+              lower priorities are preferred.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -4647,21 +5387,21 @@ async def create(
         self,
         *,
         zone_id: str,
-        content: object,
         name: str,
-        type: Literal["CNAME"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["NS"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.NSRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -4673,27 +5413,27 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          content: A valid hostname. Must not match the record's name.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: A valid name server host name.
+
           proxied: Whether the record is receiving the performance and security benefits of
               Cloudflare.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          settings: Settings for the DNS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -4710,20 +5450,21 @@ async def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.DNSKEYRecordData,
         name: str,
-        type: Literal["DNSKEY"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["OPENPGPKEY"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.DNSRecordsOpenpgpkeyRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -4735,24 +5476,27 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a DNSKEY record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -4769,20 +5513,21 @@ async def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.DSRecordData,
         name: str,
-        type: Literal["DS"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["PTR"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.PTRRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -4794,25 +5539,96 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a DS record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: Domain name pointing to the address.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
           tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        name: str,
+        ttl: TTLParam,
+        type: Literal["TXT"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.TXTRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Create a new DNS record for a zone.
+
+        Notes:
+
+        - A/AAAA records cannot exist on the same name as CNAME records.
+        - NS records cannot exist on the same name as any other record type.
+        - Domain names are always represented in Punycode, even if Unicode characters
+          were used when creating the record.
+
+        Args:
+          zone_id: Identifier.
+
+          name: Complete DNS record name, including the zone name, in Punycode.
+
           ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
               Value must be between 60 and 86400, with the minimum reduced to 30 for
               Enterprise zones.
 
+          type: Record type.
+
+          comment: Comments or notes about the DNS record. This field has no effect on DNS
+              responses.
+
+          content: Text content for the record. The content must consist of quoted "character
+              strings" (RFC 1035), each with a length of up to 255 bytes. Strings exceeding
+              this allowed maximum length are automatically split.
+
+              Learn more at
+              <https://www.cloudflare.com/learning/dns/dns-records/dns-txt-record/>.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -4828,20 +5644,21 @@ async def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.HTTPSRecordData,
         name: str,
-        type: Literal["HTTPS"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["CAA"],
+        comment: str | Omit = omit,
+        data: record_create_params.CAARecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.CAARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -4853,24 +5670,27 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a HTTPS record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a CAA record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -4887,20 +5707,21 @@ async def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.LOCRecordData,
         name: str,
-        type: Literal["LOC"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["CERT"],
+        comment: str | Omit = omit,
+        data: record_create_params.CERTRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.CERTRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -4912,24 +5733,27 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a LOC record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a CERT record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -4946,21 +5770,21 @@ async def create(
         self,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        priority: float,
-        type: Literal["MX"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["DNSKEY"],
+        comment: str | Omit = omit,
+        data: record_create_params.DNSKEYRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.DNSKEYRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -4972,27 +5796,27 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
-
-          content: A valid mail server hostname.
+          zone_id: Identifier.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          priority: Required for MX, SRV and URI records; unused by other record types. Records with
-              lower priorities are preferred.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a DNSKEY record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -5009,20 +5833,21 @@ async def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.NAPTRRecordData,
         name: str,
-        type: Literal["NAPTR"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["DS"],
+        comment: str | Omit = omit,
+        data: record_create_params.DSRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.DSRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -5034,24 +5859,27 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a NAPTR record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a DS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -5068,20 +5896,21 @@ async def create(
         self,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["NS"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["HTTPS"],
+        comment: str | Omit = omit,
+        data: record_create_params.HTTPSRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.HTTPSRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -5093,24 +5922,27 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          content: A valid name server host name.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a HTTPS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -5127,20 +5959,21 @@ async def create(
         self,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["PTR"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["LOC"],
+        comment: str | Omit = omit,
+        data: record_create_params.LOCRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.LOCRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -5152,24 +5985,27 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          content: Domain name pointing to the address.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a LOC record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -5186,20 +6022,21 @@ async def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.SMIMEARecordData,
         name: str,
-        type: Literal["SMIMEA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["NAPTR"],
+        comment: str | Omit = omit,
+        data: record_create_params.NAPTRRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.NAPTRRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -5211,24 +6048,27 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a SMIMEA record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a NAPTR record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -5245,20 +6085,21 @@ async def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.SRVRecordData,
         name: str,
-        type: Literal["SRV"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SMIMEA"],
+        comment: str | Omit = omit,
+        data: record_create_params.SMIMEARecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.SMIMEARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -5270,26 +6111,27 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a SRV record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode. For SRV records, the first
-              label is normally a service and the second a protocol name, each starting with
-              an underscore.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SMIMEA record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -5306,20 +6148,21 @@ async def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.SSHFPRecordData,
         name: str,
-        type: Literal["SSHFP"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SRV"],
+        comment: str | Omit = omit,
+        data: record_create_params.SRVRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.SRVRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -5331,24 +6174,27 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a SSHFP record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SRV record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -5365,20 +6211,21 @@ async def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.SVCBRecordData,
         name: str,
-        type: Literal["SVCB"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SSHFP"],
+        comment: str | Omit = omit,
+        data: record_create_params.SSHFPRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.SSHFPRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -5390,24 +6237,27 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a SVCB record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SSHFP record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -5424,20 +6274,21 @@ async def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.TLSARecordData,
         name: str,
-        type: Literal["TLSA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SVCB"],
+        comment: str | Omit = omit,
+        data: record_create_params.SVCBRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.SVCBRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -5449,24 +6300,27 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a TLSA record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SVCB record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -5483,20 +6337,21 @@ async def create(
         self,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["TXT"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["TLSA"],
+        comment: str | Omit = omit,
+        data: record_create_params.TLSARecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.TLSARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -5508,24 +6363,27 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          content: Text content for the record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a TLSA record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -5542,21 +6400,22 @@ async def create(
         self,
         *,
         zone_id: str,
-        data: record_create_params.URIRecordData,
         name: str,
-        priority: float,
+        ttl: TTLParam,
         type: Literal["URI"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        data: record_create_params.URIRecordData | Omit = omit,
+        priority: float | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.URIRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         Create a new DNS record for a zone.
 
@@ -5568,27 +6427,30 @@ async def create(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
-
-          data: Components of a URI record.
+          zone_id: Identifier.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          priority: Required for MX, SRV and URI records; unused by other record types. Records with
-              lower priorities are preferred.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a URI record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          priority: Required for MX, SRV and URI records; unused by other record types. Records with
+              lower priorities are preferred.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -5600,43 +6462,61 @@ async def create(
         """
         ...
 
-    @required_args(
-        ["zone_id", "content", "name", "type"],
-        ["zone_id", "data", "name", "type"],
-        ["zone_id", "content", "name", "priority", "type"],
-        ["zone_id", "data", "name", "priority", "type"],
-    )
+    @required_args(["zone_id", "name", "ttl", "type"])
     async def create(
         self,
         *,
         zone_id: str,
-        content: str | object | NotGiven = NOT_GIVEN,
         name: str,
+        ttl: TTLParam,
         type: Literal["A"]
         | Literal["AAAA"]
+        | Literal["CNAME"]
+        | Literal["MX"]
+        | Literal["NS"]
+        | Literal["OPENPGPKEY"]
+        | Literal["PTR"]
+        | Literal["TXT"]
         | Literal["CAA"]
         | Literal["CERT"]
-        | Literal["CNAME"]
         | Literal["DNSKEY"]
         | Literal["DS"]
         | Literal["HTTPS"]
         | Literal["LOC"]
-        | Literal["MX"]
         | Literal["NAPTR"]
-        | Literal["NS"]
-        | Literal["PTR"]
         | Literal["SMIMEA"]
         | Literal["SRV"]
         | Literal["SSHFP"]
         | Literal["SVCB"]
         | Literal["TLSA"]
-        | Literal["TXT"]
         | Literal["URI"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_create_params.ARecordSettings
+        | record_create_params.AAAARecordSettings
+        | record_create_params.CNAMERecordSettings
+        | record_create_params.MXRecordSettings
+        | record_create_params.NSRecordSettings
+        | record_create_params.DNSRecordsOpenpgpkeyRecordSettings
+        | record_create_params.PTRRecordSettings
+        | record_create_params.TXTRecordSettings
+        | record_create_params.CAARecordSettings
+        | record_create_params.CERTRecordSettings
+        | record_create_params.DNSKEYRecordSettings
+        | record_create_params.DSRecordSettings
+        | record_create_params.HTTPSRecordSettings
+        | record_create_params.LOCRecordSettings
+        | record_create_params.NAPTRRecordSettings
+        | record_create_params.SMIMEARecordSettings
+        | record_create_params.SRVRecordSettings
+        | record_create_params.SSHFPRecordSettings
+        | record_create_params.SVCBRecordSettings
+        | record_create_params.TLSARecordSettings
+        | record_create_params.URIRecordSettings
+        | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
+        priority: float | Omit = omit,
         data: record_create_params.CAARecordData
         | record_create_params.CERTRecordData
         | record_create_params.DNSKEYRecordData
@@ -5647,34 +6527,35 @@ async def create(
         | record_create_params.SMIMEARecordData
         | record_create_params.SRVRecordData
         | record_create_params.SSHFPRecordData
+        | record_create_params.SVCBRecordData
+        | record_create_params.TLSARecordData
         | record_create_params.URIRecordData
-        | NotGiven = NOT_GIVEN,
-        priority: float | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return cast(
-            Optional[Record],
+            Optional[RecordResponse],
             await self._post(
                 f"/zones/{zone_id}/dns_records",
                 body=await async_maybe_transform(
                     {
-                        "content": content,
                         "name": name,
+                        "ttl": ttl,
                         "type": type,
-                        "id": id,
                         "comment": comment,
+                        "content": content,
                         "proxied": proxied,
+                        "settings": settings,
                         "tags": tags,
-                        "ttl": ttl,
-                        "data": data,
                         "priority": priority,
+                        "data": data,
                     },
                     record_create_params.RecordCreateParams,
                 ),
@@ -5683,10 +6564,10 @@ async def create(
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[Optional[Record]]._unwrapper,
+                    post_parser=ResultWrapper[Optional[RecordResponse]]._unwrapper,
                 ),
                 cast_to=cast(
-                    Any, ResultWrapper[Record]
+                    Any, ResultWrapper[RecordResponse]
                 ),  # Union types cannot be passed in as arguments in the type system
             ),
         )
@@ -5697,22 +6578,89 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["A"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["A"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.ARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
+
+        Notes:
+
+        - A/AAAA records cannot exist on the same name as CNAME records.
+        - NS records cannot exist on the same name as any other record type.
+        - Domain names are always represented in Punycode, even if Unicode characters
+          were used when creating the record.
+
+        Args:
+          zone_id: Identifier.
+
+          dns_record_id: Identifier.
+
+          name: Complete DNS record name, including the zone name, in Punycode.
+
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
+
+          type: Record type.
+
+          comment: Comments or notes about the DNS record. This field has no effect on DNS
+              responses.
+
+          content: A valid IPv4 address.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def update(
+        self,
+        dns_record_id: str,
+        *,
+        zone_id: str,
+        name: str,
+        ttl: TTLParam,
+        type: Literal["AAAA"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.AAAARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -5722,29 +6670,29 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: A valid IPv4 address.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: A valid IPv6 address.
+
           proxied: Whether the record is receiving the performance and security benefits of
               Cloudflare.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          settings: Settings for the DNS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -5762,22 +6710,23 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["AAAA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["CNAME"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.CNAMERecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -5787,29 +6736,29 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: A valid IPv6 address.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: A valid hostname. Must not match the record's name.
+
           proxied: Whether the record is receiving the performance and security benefits of
               Cloudflare.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          settings: Settings for the DNS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -5827,21 +6776,24 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.CAARecordData,
         name: str,
-        type: Literal["CAA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["MX"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        priority: float | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.MXRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -5851,26 +6803,32 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a CAA record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: A valid mail server hostname.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          priority: Required for MX, SRV and URI records; unused by other record types. Records with
+              lower priorities are preferred.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -5888,21 +6846,23 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.CERTRecordData,
         name: str,
-        type: Literal["CERT"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["NS"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.NSRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -5912,26 +6872,29 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a CERT record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: A valid name server host name.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -5949,22 +6912,23 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: object,
         name: str,
-        type: Literal["CNAME"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["OPENPGPKEY"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.DNSRecordsOpenpgpkeyRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -5974,29 +6938,29 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: A valid hostname. Must not match the record's name.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)
+
           proxied: Whether the record is receiving the performance and security benefits of
               Cloudflare.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          settings: Settings for the DNS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -6014,21 +6978,23 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.DNSKEYRecordData,
         name: str,
-        type: Literal["DNSKEY"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["PTR"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.PTRRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -6038,26 +7004,29 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a DNSKEY record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: Domain name pointing to the address.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -6075,21 +7044,23 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.DSRecordData,
         name: str,
-        type: Literal["DS"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["TXT"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.TXTRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -6099,26 +7070,34 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a DS record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: Text content for the record. The content must consist of quoted "character
+              strings" (RFC 1035), each with a length of up to 255 bytes. Strings exceeding
+              this allowed maximum length are automatically split.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+              Learn more at
+              <https://www.cloudflare.com/learning/dns/dns-records/dns-txt-record/>.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -6136,21 +7115,23 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.HTTPSRecordData,
         name: str,
-        type: Literal["HTTPS"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["CAA"],
+        comment: str | Omit = omit,
+        data: record_update_params.CAARecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.CAARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -6160,26 +7141,29 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a HTTPS record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a CAA record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -6197,21 +7181,23 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.LOCRecordData,
         name: str,
-        type: Literal["LOC"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["CERT"],
+        comment: str | Omit = omit,
+        data: record_update_params.CERTRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.CERTRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -6221,26 +7207,29 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a LOC record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a CERT record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -6258,22 +7247,23 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        priority: float,
-        type: Literal["MX"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["DNSKEY"],
+        comment: str | Omit = omit,
+        data: record_update_params.DNSKEYRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.DNSKEYRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -6283,29 +7273,29 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
-
-          dns_record_id: Identifier
+          zone_id: Identifier.
 
-          content: A valid mail server hostname.
+          dns_record_id: Identifier.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          priority: Required for MX, SRV and URI records; unused by other record types. Records with
-              lower priorities are preferred.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a DNSKEY record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -6323,21 +7313,23 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.NAPTRRecordData,
         name: str,
-        type: Literal["NAPTR"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["DS"],
+        comment: str | Omit = omit,
+        data: record_update_params.DSRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.DSRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -6347,26 +7339,29 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a NAPTR record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a DS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -6384,21 +7379,23 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["NS"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["HTTPS"],
+        comment: str | Omit = omit,
+        data: record_update_params.HTTPSRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.HTTPSRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -6408,26 +7405,29 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: A valid name server host name.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a HTTPS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -6445,21 +7445,23 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["PTR"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["LOC"],
+        comment: str | Omit = omit,
+        data: record_update_params.LOCRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.LOCRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -6469,26 +7471,29 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: Domain name pointing to the address.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a LOC record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -6506,21 +7511,23 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.SMIMEARecordData,
         name: str,
-        type: Literal["SMIMEA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["NAPTR"],
+        comment: str | Omit = omit,
+        data: record_update_params.NAPTRRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.NAPTRRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -6530,26 +7537,29 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a SMIMEA record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a NAPTR record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -6567,21 +7577,23 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.SRVRecordData,
         name: str,
-        type: Literal["SRV"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SMIMEA"],
+        comment: str | Omit = omit,
+        data: record_update_params.SMIMEARecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.SMIMEARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -6591,28 +7603,29 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a SRV record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode. For SRV records, the first
-              label is normally a service and the second a protocol name, each starting with
-              an underscore.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SMIMEA record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -6630,21 +7643,23 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.SSHFPRecordData,
         name: str,
-        type: Literal["SSHFP"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SRV"],
+        comment: str | Omit = omit,
+        data: record_update_params.SRVRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.SRVRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -6654,26 +7669,29 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a SSHFP record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SRV record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -6691,21 +7709,23 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.SVCBRecordData,
         name: str,
-        type: Literal["SVCB"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SSHFP"],
+        comment: str | Omit = omit,
+        data: record_update_params.SSHFPRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.SSHFPRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -6715,26 +7735,29 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a SVCB record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SSHFP record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -6752,21 +7775,23 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.TLSARecordData,
         name: str,
-        type: Literal["TLSA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SVCB"],
+        comment: str | Omit = omit,
+        data: record_update_params.SVCBRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.SVCBRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -6776,26 +7801,29 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a TLSA record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SVCB record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -6813,21 +7841,23 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["TXT"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["TLSA"],
+        comment: str | Omit = omit,
+        data: record_update_params.TLSARecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.TLSARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -6837,26 +7867,29 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: Text content for the record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a TLSA record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -6874,22 +7907,24 @@ async def update(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_update_params.URIRecordData,
         name: str,
-        priority: float,
+        ttl: TTLParam,
         type: Literal["URI"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        data: record_update_params.URIRecordData | Omit = omit,
+        priority: float | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.URIRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Overwrite an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Overwrite an existing DNS record.
 
         Notes:
 
@@ -6899,29 +7934,32 @@ async def update(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
-
-          dns_record_id: Identifier
+          zone_id: Identifier.
 
-          data: Components of a URI record.
+          dns_record_id: Identifier.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          priority: Required for MX, SRV and URI records; unused by other record types. Records with
-              lower priorities are preferred.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a URI record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          priority: Required for MX, SRV and URI records; unused by other record types. Records with
+              lower priorities are preferred.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -6933,44 +7971,62 @@ async def update(
         """
         ...
 
-    @required_args(
-        ["zone_id", "content", "name", "type"],
-        ["zone_id", "data", "name", "type"],
-        ["zone_id", "content", "name", "priority", "type"],
-        ["zone_id", "data", "name", "priority", "type"],
-    )
+    @required_args(["zone_id", "name", "ttl", "type"])
     async def update(
         self,
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str | object | NotGiven = NOT_GIVEN,
         name: str,
+        ttl: TTLParam,
         type: Literal["A"]
         | Literal["AAAA"]
+        | Literal["CNAME"]
+        | Literal["MX"]
+        | Literal["NS"]
+        | Literal["OPENPGPKEY"]
+        | Literal["PTR"]
+        | Literal["TXT"]
         | Literal["CAA"]
         | Literal["CERT"]
-        | Literal["CNAME"]
         | Literal["DNSKEY"]
         | Literal["DS"]
         | Literal["HTTPS"]
         | Literal["LOC"]
-        | Literal["MX"]
         | Literal["NAPTR"]
-        | Literal["NS"]
-        | Literal["PTR"]
         | Literal["SMIMEA"]
         | Literal["SRV"]
         | Literal["SSHFP"]
         | Literal["SVCB"]
         | Literal["TLSA"]
-        | Literal["TXT"]
         | Literal["URI"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_update_params.ARecordSettings
+        | record_update_params.AAAARecordSettings
+        | record_update_params.CNAMERecordSettings
+        | record_update_params.MXRecordSettings
+        | record_update_params.NSRecordSettings
+        | record_update_params.DNSRecordsOpenpgpkeyRecordSettings
+        | record_update_params.PTRRecordSettings
+        | record_update_params.TXTRecordSettings
+        | record_update_params.CAARecordSettings
+        | record_update_params.CERTRecordSettings
+        | record_update_params.DNSKEYRecordSettings
+        | record_update_params.DSRecordSettings
+        | record_update_params.HTTPSRecordSettings
+        | record_update_params.LOCRecordSettings
+        | record_update_params.NAPTRRecordSettings
+        | record_update_params.SMIMEARecordSettings
+        | record_update_params.SRVRecordSettings
+        | record_update_params.SSHFPRecordSettings
+        | record_update_params.SVCBRecordSettings
+        | record_update_params.TLSARecordSettings
+        | record_update_params.URIRecordSettings
+        | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
+        priority: float | Omit = omit,
         data: record_update_params.CAARecordData
         | record_update_params.CERTRecordData
         | record_update_params.DNSKEYRecordData
@@ -6981,36 +8037,37 @@ async def update(
         | record_update_params.SMIMEARecordData
         | record_update_params.SRVRecordData
         | record_update_params.SSHFPRecordData
+        | record_update_params.SVCBRecordData
+        | record_update_params.TLSARecordData
         | record_update_params.URIRecordData
-        | NotGiven = NOT_GIVEN,
-        priority: float | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not dns_record_id:
             raise ValueError(f"Expected a non-empty value for `dns_record_id` but received {dns_record_id!r}")
         return cast(
-            Optional[Record],
+            Optional[RecordResponse],
             await self._put(
                 f"/zones/{zone_id}/dns_records/{dns_record_id}",
                 body=await async_maybe_transform(
                     {
-                        "content": content,
                         "name": name,
+                        "ttl": ttl,
                         "type": type,
-                        "id": id,
                         "comment": comment,
+                        "content": content,
                         "proxied": proxied,
+                        "settings": settings,
                         "tags": tags,
-                        "ttl": ttl,
-                        "data": data,
                         "priority": priority,
+                        "data": data,
                     },
                     record_update_params.RecordUpdateParams,
                 ),
@@ -7019,10 +8076,10 @@ async def update(
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[Optional[Record]]._unwrapper,
+                    post_parser=ResultWrapper[Optional[RecordResponse]]._unwrapper,
                 ),
                 cast_to=cast(
-                    Any, ResultWrapper[Record]
+                    Any, ResultWrapper[RecordResponse]
                 ),  # Union types cannot be passed in as arguments in the type system
             ),
         )
@@ -7031,18 +8088,18 @@ def list(
         self,
         *,
         zone_id: str,
-        comment: record_list_params.Comment | NotGiven = NOT_GIVEN,
-        content: str | NotGiven = NOT_GIVEN,
-        direction: SortDirection | NotGiven = NOT_GIVEN,
-        match: Literal["any", "all"] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        order: Literal["type", "name", "content", "ttl", "proxied"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        search: str | NotGiven = NOT_GIVEN,
-        tag: record_list_params.Tag | NotGiven = NOT_GIVEN,
-        tag_match: Literal["any", "all"] | NotGiven = NOT_GIVEN,
+        comment: record_list_params.Comment | Omit = omit,
+        content: record_list_params.Content | Omit = omit,
+        direction: SortDirection | Omit = omit,
+        match: Literal["any", "all"] | Omit = omit,
+        name: record_list_params.Name | Omit = omit,
+        order: Literal["type", "name", "content", "ttl", "proxied"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        proxied: bool | Omit = omit,
+        search: str | Omit = omit,
+        tag: record_list_params.Tag | Omit = omit,
+        tag_match: Literal["any", "all"] | Omit = omit,
         type: Literal[
             "A",
             "AAAA",
@@ -7056,6 +8113,7 @@ def list(
             "MX",
             "NAPTR",
             "NS",
+            "OPENPGPKEY",
             "PTR",
             "SMIMEA",
             "SRV",
@@ -7065,21 +8123,19 @@ def list(
             "TXT",
             "URI",
         ]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[Record, AsyncV4PagePaginationArray[Record]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[RecordResponse, AsyncV4PagePaginationArray[RecordResponse]]:
         """
         List, search, sort, and filter a zones' DNS records.
 
         Args:
-          zone_id: Identifier
-
-          content: DNS record content.
+          zone_id: Identifier.
 
           direction: Direction to order DNS records in.
 
@@ -7088,8 +8144,6 @@ def list(
               instead. Note that the interaction between tag filters is controlled by the
               `tag-match` parameter instead.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
-
           order: Field to order DNS records by.
 
           page: Page number of paginated results.
@@ -7124,7 +8178,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
             f"/zones/{zone_id}/dns_records",
-            page=AsyncV4PagePaginationArray[Record],
+            page=AsyncV4PagePaginationArray[RecordResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -7149,7 +8203,7 @@ def list(
                     record_list_params.RecordListParams,
                 ),
             ),
-            model=cast(Any, Record),  # Union types cannot be passed in as arguments in the type system
+            model=cast(Any, RecordResponse),  # Union types cannot be passed in as arguments in the type system
         )
 
     async def delete(
@@ -7162,15 +8216,163 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RecordDeleteResponse]:
         """
         Delete DNS Record
 
-        Args:
-          zone_id: Identifier
+        Args:
+          zone_id: Identifier.
+
+          dns_record_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not dns_record_id:
+            raise ValueError(f"Expected a non-empty value for `dns_record_id` but received {dns_record_id!r}")
+        return await self._delete(
+            f"/zones/{zone_id}/dns_records/{dns_record_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RecordDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RecordDeleteResponse]], ResultWrapper[RecordDeleteResponse]),
+        )
+
+    async def batch(
+        self,
+        *,
+        zone_id: str,
+        deletes: Iterable[record_batch_params.Delete] | Omit = omit,
+        patches: Iterable[BatchPatchParam] | Omit = omit,
+        posts: Iterable[record_batch_params.Post] | Omit = omit,
+        puts: Iterable[BatchPutParam] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordBatchResponse]:
+        """
+        Send a Batch of DNS Record API calls to be executed together.
+
+        Notes:
+
+        - Although Cloudflare will execute the batched operations in a single database
+          transaction, Cloudflare's distributed KV store must treat each record change
+          as a single key-value pair. This means that the propagation of changes is not
+          atomic. See
+          [the documentation](https://developers.cloudflare.com/dns/manage-dns-records/how-to/batch-record-changes/ "Batch DNS records")
+          for more information.
+        - The operations you specify within the /batch request body are always executed
+          in the following order:
+
+          - Deletes
+          - Patches
+          - Puts
+          - Posts
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/dns_records/batch",
+            body=await async_maybe_transform(
+                {
+                    "deletes": deletes,
+                    "patches": patches,
+                    "posts": posts,
+                    "puts": puts,
+                },
+                record_batch_params.RecordBatchParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RecordBatchResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RecordBatchResponse]], ResultWrapper[RecordBatchResponse]),
+        )
+
+    @overload
+    async def edit(
+        self,
+        dns_record_id: str,
+        *,
+        zone_id: str,
+        name: str,
+        ttl: TTLParam,
+        type: Literal["A"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.ARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
+
+        Notes:
+
+        - A/AAAA records cannot exist on the same name as CNAME records.
+        - NS records cannot exist on the same name as any other record type.
+        - Domain names are always represented in Punycode, even if Unicode characters
+          were used when creating the record.
+
+        Args:
+          zone_id: Identifier.
+
+          dns_record_id: Identifier.
+
+          name: Complete DNS record name, including the zone name, in Punycode.
+
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
+
+          type: Record type.
+
+          comment: Comments or notes about the DNS record. This field has no effect on DNS
+              responses.
+
+          content: A valid IPv4 address.
 
-          dns_record_id: Identifier
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -7180,21 +8382,7 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        if not dns_record_id:
-            raise ValueError(f"Expected a non-empty value for `dns_record_id` but received {dns_record_id!r}")
-        return await self._delete(
-            f"/zones/{zone_id}/dns_records/{dns_record_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RecordDeleteResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[RecordDeleteResponse]], ResultWrapper[RecordDeleteResponse]),
-        )
+        ...
 
     @overload
     async def edit(
@@ -7202,22 +8390,23 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["A"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["AAAA"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.AAAARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -7227,29 +8416,29 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: A valid IPv4 address.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: A valid IPv6 address.
+
           proxied: Whether the record is receiving the performance and security benefits of
               Cloudflare.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          settings: Settings for the DNS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -7267,22 +8456,23 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["AAAA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["CNAME"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.CNAMERecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -7292,29 +8482,29 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: A valid IPv6 address.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: A valid hostname. Must not match the record's name.
+
           proxied: Whether the record is receiving the performance and security benefits of
               Cloudflare.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          settings: Settings for the DNS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -7332,21 +8522,24 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.CAARecordData,
         name: str,
-        type: Literal["CAA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["MX"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        priority: float | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.MXRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -7356,26 +8549,32 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a CAA record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: A valid mail server hostname.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          priority: Required for MX, SRV and URI records; unused by other record types. Records with
+              lower priorities are preferred.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -7393,21 +8592,23 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.CERTRecordData,
         name: str,
-        type: Literal["CERT"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["NS"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.NSRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -7417,26 +8618,29 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a CERT record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: A valid name server host name.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -7454,22 +8658,23 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: object,
         name: str,
-        type: Literal["CNAME"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["OPENPGPKEY"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.DNSRecordsOpenpgpkeyRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -7479,29 +8684,29 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: A valid hostname. Must not match the record's name.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
+          content: A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)
+
           proxied: Whether the record is receiving the performance and security benefits of
               Cloudflare.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          settings: Settings for the DNS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -7519,21 +8724,23 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.DNSKEYRecordData,
         name: str,
-        type: Literal["DNSKEY"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["PTR"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.PTRRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -7543,26 +8750,29 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a DNSKEY record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: Domain name pointing to the address.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -7580,21 +8790,23 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.DSRecordData,
         name: str,
-        type: Literal["DS"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["TXT"],
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.TXTRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -7604,26 +8816,34 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a DS record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          content: Text content for the record. The content must consist of quoted "character
+              strings" (RFC 1035), each with a length of up to 255 bytes. Strings exceeding
+              this allowed maximum length are automatically split.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+              Learn more at
+              <https://www.cloudflare.com/learning/dns/dns-records/dns-txt-record/>.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -7641,21 +8861,23 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.HTTPSRecordData,
         name: str,
-        type: Literal["HTTPS"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["CAA"],
+        comment: str | Omit = omit,
+        data: record_edit_params.CAARecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.CAARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -7665,26 +8887,29 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a HTTPS record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a CAA record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -7702,21 +8927,23 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.LOCRecordData,
         name: str,
-        type: Literal["LOC"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["CERT"],
+        comment: str | Omit = omit,
+        data: record_edit_params.CERTRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.CERTRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -7726,26 +8953,29 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a LOC record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a CERT record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -7763,22 +8993,23 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        priority: float,
-        type: Literal["MX"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["DNSKEY"],
+        comment: str | Omit = omit,
+        data: record_edit_params.DNSKEYRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.DNSKEYRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -7788,29 +9019,29 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
-
-          content: A valid mail server hostname.
+          dns_record_id: Identifier.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          priority: Required for MX, SRV and URI records; unused by other record types. Records with
-              lower priorities are preferred.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a DNSKEY record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -7828,21 +9059,23 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.NAPTRRecordData,
         name: str,
-        type: Literal["NAPTR"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["DS"],
+        comment: str | Omit = omit,
+        data: record_edit_params.DSRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.DSRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -7852,26 +9085,29 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a NAPTR record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a DS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -7889,21 +9125,23 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["NS"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["HTTPS"],
+        comment: str | Omit = omit,
+        data: record_edit_params.HTTPSRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.HTTPSRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -7913,26 +9151,29 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: A valid name server host name.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a HTTPS record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -7950,21 +9191,23 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["PTR"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["LOC"],
+        comment: str | Omit = omit,
+        data: record_edit_params.LOCRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.LOCRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -7974,26 +9217,29 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: Domain name pointing to the address.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a LOC record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -8011,21 +9257,23 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.SMIMEARecordData,
         name: str,
-        type: Literal["SMIMEA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["NAPTR"],
+        comment: str | Omit = omit,
+        data: record_edit_params.NAPTRRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.NAPTRRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -8035,26 +9283,29 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a SMIMEA record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a NAPTR record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -8072,21 +9323,23 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.SRVRecordData,
         name: str,
-        type: Literal["SRV"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SMIMEA"],
+        comment: str | Omit = omit,
+        data: record_edit_params.SMIMEARecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.SMIMEARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -8096,28 +9349,29 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a SRV record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode. For SRV records, the first
-              label is normally a service and the second a protocol name, each starting with
-              an underscore.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SMIMEA record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -8135,21 +9389,23 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.SSHFPRecordData,
         name: str,
-        type: Literal["SSHFP"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SRV"],
+        comment: str | Omit = omit,
+        data: record_edit_params.SRVRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.SRVRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -8159,26 +9415,29 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a SSHFP record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SRV record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -8196,21 +9455,23 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.SVCBRecordData,
         name: str,
-        type: Literal["SVCB"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SSHFP"],
+        comment: str | Omit = omit,
+        data: record_edit_params.SSHFPRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.SSHFPRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -8220,26 +9481,29 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a SVCB record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SSHFP record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -8257,21 +9521,23 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.TLSARecordData,
         name: str,
-        type: Literal["TLSA"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["SVCB"],
+        comment: str | Omit = omit,
+        data: record_edit_params.SVCBRecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.SVCBRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -8281,26 +9547,29 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          data: Components of a TLSA record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a SVCB record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -8318,21 +9587,23 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str,
         name: str,
-        type: Literal["TXT"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        ttl: TTLParam,
+        type: Literal["TLSA"],
+        comment: str | Omit = omit,
+        data: record_edit_params.TLSARecordData | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.TLSARecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -8342,26 +9613,29 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
-          content: Text content for the record.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a TLSA record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -8379,22 +9653,24 @@ async def edit(
         dns_record_id: str,
         *,
         zone_id: str,
-        data: record_edit_params.URIRecordData,
         name: str,
-        priority: float,
+        ttl: TTLParam,
         type: Literal["URI"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        data: record_edit_params.URIRecordData | Omit = omit,
+        priority: float | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.URIRecordSettings | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
-        """Update an existing DNS record.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
+        """
+        Update an existing DNS record.
 
         Notes:
 
@@ -8404,29 +9680,32 @@ async def edit(
           were used when creating the record.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
-
-          data: Components of a URI record.
+          dns_record_id: Identifier.
 
-          name: DNS record name (or @ for the zone apex) in Punycode.
+          name: Complete DNS record name, including the zone name, in Punycode.
 
-          priority: Required for MX, SRV and URI records; unused by other record types. Records with
-              lower priorities are preferred.
+          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+              Value must be between 60 and 86400, with the minimum reduced to 30 for
+              Enterprise zones.
 
           type: Record type.
 
-          id: Identifier
-
           comment: Comments or notes about the DNS record. This field has no effect on DNS
               responses.
 
-          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
+          data: Components of a URI record.
 
-          ttl: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-              Value must be between 60 and 86400, with the minimum reduced to 30 for
-              Enterprise zones.
+          priority: Required for MX, SRV and URI records; unused by other record types. Records with
+              lower priorities are preferred.
+
+          proxied: Whether the record is receiving the performance and security benefits of
+              Cloudflare.
+
+          settings: Settings for the DNS record.
+
+          tags: Custom tags for the DNS record. This field has no effect on DNS responses.
 
           extra_headers: Send extra headers
 
@@ -8438,44 +9717,62 @@ async def edit(
         """
         ...
 
-    @required_args(
-        ["zone_id", "content", "name", "type"],
-        ["zone_id", "data", "name", "type"],
-        ["zone_id", "content", "name", "priority", "type"],
-        ["zone_id", "data", "name", "priority", "type"],
-    )
+    @required_args(["zone_id", "name", "ttl", "type"])
     async def edit(
         self,
         dns_record_id: str,
         *,
         zone_id: str,
-        content: str | object | NotGiven = NOT_GIVEN,
         name: str,
+        ttl: TTLParam,
         type: Literal["A"]
         | Literal["AAAA"]
+        | Literal["CNAME"]
+        | Literal["MX"]
+        | Literal["NS"]
+        | Literal["OPENPGPKEY"]
+        | Literal["PTR"]
+        | Literal["TXT"]
         | Literal["CAA"]
         | Literal["CERT"]
-        | Literal["CNAME"]
         | Literal["DNSKEY"]
         | Literal["DS"]
         | Literal["HTTPS"]
         | Literal["LOC"]
-        | Literal["MX"]
         | Literal["NAPTR"]
-        | Literal["NS"]
-        | Literal["PTR"]
         | Literal["SMIMEA"]
         | Literal["SRV"]
         | Literal["SSHFP"]
         | Literal["SVCB"]
         | Literal["TLSA"]
-        | Literal["TXT"]
         | Literal["URI"],
-        id: str | NotGiven = NOT_GIVEN,
-        comment: str | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        tags: List[RecordTags] | NotGiven = NOT_GIVEN,
-        ttl: TTLParam | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        content: str | Omit = omit,
+        proxied: bool | Omit = omit,
+        settings: record_edit_params.ARecordSettings
+        | record_edit_params.AAAARecordSettings
+        | record_edit_params.CNAMERecordSettings
+        | record_edit_params.MXRecordSettings
+        | record_edit_params.NSRecordSettings
+        | record_edit_params.DNSRecordsOpenpgpkeyRecordSettings
+        | record_edit_params.PTRRecordSettings
+        | record_edit_params.TXTRecordSettings
+        | record_edit_params.CAARecordSettings
+        | record_edit_params.CERTRecordSettings
+        | record_edit_params.DNSKEYRecordSettings
+        | record_edit_params.DSRecordSettings
+        | record_edit_params.HTTPSRecordSettings
+        | record_edit_params.LOCRecordSettings
+        | record_edit_params.NAPTRRecordSettings
+        | record_edit_params.SMIMEARecordSettings
+        | record_edit_params.SRVRecordSettings
+        | record_edit_params.SSHFPRecordSettings
+        | record_edit_params.SVCBRecordSettings
+        | record_edit_params.TLSARecordSettings
+        | record_edit_params.URIRecordSettings
+        | Omit = omit,
+        tags: SequenceNotStr[RecordTags] | Omit = omit,
+        priority: float | Omit = omit,
         data: record_edit_params.CAARecordData
         | record_edit_params.CERTRecordData
         | record_edit_params.DNSKEYRecordData
@@ -8486,36 +9783,37 @@ async def edit(
         | record_edit_params.SMIMEARecordData
         | record_edit_params.SRVRecordData
         | record_edit_params.SSHFPRecordData
+        | record_edit_params.SVCBRecordData
+        | record_edit_params.TLSARecordData
         | record_edit_params.URIRecordData
-        | NotGiven = NOT_GIVEN,
-        priority: float | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not dns_record_id:
             raise ValueError(f"Expected a non-empty value for `dns_record_id` but received {dns_record_id!r}")
         return cast(
-            Optional[Record],
+            Optional[RecordResponse],
             await self._patch(
                 f"/zones/{zone_id}/dns_records/{dns_record_id}",
                 body=await async_maybe_transform(
                     {
-                        "content": content,
                         "name": name,
+                        "ttl": ttl,
                         "type": type,
-                        "id": id,
                         "comment": comment,
+                        "content": content,
                         "proxied": proxied,
+                        "settings": settings,
                         "tags": tags,
-                        "ttl": ttl,
-                        "data": data,
                         "priority": priority,
+                        "data": data,
                     },
                     record_edit_params.RecordEditParams,
                 ),
@@ -8524,10 +9822,10 @@ async def edit(
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[Optional[Record]]._unwrapper,
+                    post_parser=ResultWrapper[Optional[RecordResponse]]._unwrapper,
                 ),
                 cast_to=cast(
-                    Any, ResultWrapper[Record]
+                    Any, ResultWrapper[RecordResponse]
                 ),  # Union types cannot be passed in as arguments in the type system
             ),
         )
@@ -8541,7 +9839,7 @@ async def export(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> str:
         """
         You can export your
@@ -8553,7 +9851,7 @@ async def export(
         for more information.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -8584,15 +9882,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Record]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordResponse]:
         """
         DNS Record Details
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          dns_record_id: Identifier
+          dns_record_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -8607,7 +9905,7 @@ async def get(
         if not dns_record_id:
             raise ValueError(f"Expected a non-empty value for `dns_record_id` but received {dns_record_id!r}")
         return cast(
-            Optional[Record],
+            Optional[RecordResponse],
             await self._get(
                 f"/zones/{zone_id}/dns_records/{dns_record_id}",
                 options=make_request_options(
@@ -8615,10 +9913,10 @@ async def get(
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[Optional[Record]]._unwrapper,
+                    post_parser=ResultWrapper[Optional[RecordResponse]]._unwrapper,
                 ),
                 cast_to=cast(
-                    Any, ResultWrapper[Record]
+                    Any, ResultWrapper[RecordResponse]
                 ),  # Union types cannot be passed in as arguments in the type system
             ),
         )
@@ -8628,13 +9926,13 @@ async def import_(
         *,
         zone_id: str,
         file: str,
-        proxied: str | NotGiven = NOT_GIVEN,
+        proxied: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RecordImportResponse]:
         """
         You can upload your
@@ -8647,7 +9945,7 @@ async def import_(
         for more information.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           file: BIND config to import.
 
@@ -8692,6 +9990,9 @@ async def import_(
             cast_to=cast(Type[Optional[RecordImportResponse]], ResultWrapper[RecordImportResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "This endpoint is deprecated in favor of a new asynchronous version. Please use the [/scan/trigger](https://developers.cloudflare.com/api/resources/dns/subresources/records/methods/scan/trigger) and [/scan/review](https://developers.cloudflare.com/api/resources/dns/subresources/records/methods/scan/review) endpoints instead.\n"
+    )
     async def scan(
         self,
         *,
@@ -8702,14 +10003,14 @@ async def scan(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RecordScanResponse]:
         """
         Scan for common DNS records on your domain and automatically add them to your
         zone. Useful if you haven't updated your nameservers yet.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -8734,6 +10035,135 @@ async def scan(
             cast_to=cast(Type[Optional[RecordScanResponse]], ResultWrapper[RecordScanResponse]),
         )
 
+    def scan_list(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[RecordResponse, AsyncSinglePage[RecordResponse]]:
+        """
+        Retrieves the list of DNS records discovered up to this point by the
+        asynchronous scan. These records are temporary until explicitly accepted or
+        rejected via `POST /scan/review`. Additional records may be discovered by the
+        scan later.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/dns_records/scan/review",
+            page=AsyncSinglePage[RecordResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, RecordResponse),  # Union types cannot be passed in as arguments in the type system
+        )
+
+    async def scan_review(
+        self,
+        *,
+        zone_id: str,
+        accepts: Iterable[record_scan_review_params.Accept] | Omit = omit,
+        rejects: Iterable[record_scan_review_params.Reject] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecordScanReviewResponse]:
+        """Accept or reject DNS records found by the DNS records scan.
+
+        Accepted records
+        will be permanently added to the zone, while rejected records will be
+        permanently deleted.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/dns_records/scan/review",
+            body=await async_maybe_transform(
+                {
+                    "accepts": accepts,
+                    "rejects": rejects,
+                },
+                record_scan_review_params.RecordScanReviewParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RecordScanReviewResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RecordScanReviewResponse]], ResultWrapper[RecordScanReviewResponse]),
+        )
+
+    async def scan_trigger(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RecordScanTriggerResponse:
+        """Initiates an asynchronous scan for common DNS records on your domain.
+
+        Note that
+        this **does not** automatically add records to your zone. The scan runs in the
+        background, and results can be reviewed later using the `/scan/review`
+        endpoints. Useful if you haven't updated your nameservers yet.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/dns_records/scan/trigger",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=RecordScanTriggerResponse,
+        )
+
 
 class RecordsResourceWithRawResponse:
     def __init__(self, records: RecordsResource) -> None:
@@ -8751,6 +10181,9 @@ def __init__(self, records: RecordsResource) -> None:
         self.delete = to_raw_response_wrapper(
             records.delete,
         )
+        self.batch = to_raw_response_wrapper(
+            records.batch,
+        )
         self.edit = to_raw_response_wrapper(
             records.edit,
         )
@@ -8763,8 +10196,19 @@ def __init__(self, records: RecordsResource) -> None:
         self.import_ = to_raw_response_wrapper(
             records.import_,
         )
-        self.scan = to_raw_response_wrapper(
-            records.scan,
+        self.scan = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                records.scan,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.scan_list = to_raw_response_wrapper(
+            records.scan_list,
+        )
+        self.scan_review = to_raw_response_wrapper(
+            records.scan_review,
+        )
+        self.scan_trigger = to_raw_response_wrapper(
+            records.scan_trigger,
         )
 
 
@@ -8784,6 +10228,9 @@ def __init__(self, records: AsyncRecordsResource) -> None:
         self.delete = async_to_raw_response_wrapper(
             records.delete,
         )
+        self.batch = async_to_raw_response_wrapper(
+            records.batch,
+        )
         self.edit = async_to_raw_response_wrapper(
             records.edit,
         )
@@ -8796,8 +10243,19 @@ def __init__(self, records: AsyncRecordsResource) -> None:
         self.import_ = async_to_raw_response_wrapper(
             records.import_,
         )
-        self.scan = async_to_raw_response_wrapper(
-            records.scan,
+        self.scan = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                records.scan,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.scan_list = async_to_raw_response_wrapper(
+            records.scan_list,
+        )
+        self.scan_review = async_to_raw_response_wrapper(
+            records.scan_review,
+        )
+        self.scan_trigger = async_to_raw_response_wrapper(
+            records.scan_trigger,
         )
 
 
@@ -8817,6 +10275,9 @@ def __init__(self, records: RecordsResource) -> None:
         self.delete = to_streamed_response_wrapper(
             records.delete,
         )
+        self.batch = to_streamed_response_wrapper(
+            records.batch,
+        )
         self.edit = to_streamed_response_wrapper(
             records.edit,
         )
@@ -8829,8 +10290,19 @@ def __init__(self, records: RecordsResource) -> None:
         self.import_ = to_streamed_response_wrapper(
             records.import_,
         )
-        self.scan = to_streamed_response_wrapper(
-            records.scan,
+        self.scan = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                records.scan,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.scan_list = to_streamed_response_wrapper(
+            records.scan_list,
+        )
+        self.scan_review = to_streamed_response_wrapper(
+            records.scan_review,
+        )
+        self.scan_trigger = to_streamed_response_wrapper(
+            records.scan_trigger,
         )
 
 
@@ -8850,6 +10322,9 @@ def __init__(self, records: AsyncRecordsResource) -> None:
         self.delete = async_to_streamed_response_wrapper(
             records.delete,
         )
+        self.batch = async_to_streamed_response_wrapper(
+            records.batch,
+        )
         self.edit = async_to_streamed_response_wrapper(
             records.edit,
         )
@@ -8862,6 +10337,17 @@ def __init__(self, records: AsyncRecordsResource) -> None:
         self.import_ = async_to_streamed_response_wrapper(
             records.import_,
         )
-        self.scan = async_to_streamed_response_wrapper(
-            records.scan,
+        self.scan = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                records.scan,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.scan_list = async_to_streamed_response_wrapper(
+            records.scan_list,
+        )
+        self.scan_review = async_to_streamed_response_wrapper(
+            records.scan_review,
+        )
+        self.scan_trigger = async_to_streamed_response_wrapper(
+            records.scan_trigger,
         )
diff --git a/src/cloudflare/resources/dns/settings.py b/src/cloudflare/resources/dns/settings.py
deleted file mode 100644
index 097801053cc..00000000000
--- a/src/cloudflare/resources/dns/settings.py
+++ /dev/null
@@ -1,309 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Optional, cast
-
-import httpx
-
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ..._wrappers import ResultWrapper
-from ...types.dns import setting_edit_params
-from ..._base_client import make_request_options
-from ...types.dns.dns_setting_param import DNSSettingParam
-from ...types.dns.setting_get_response import SettingGetResponse
-from ...types.dns.setting_edit_response import SettingEditResponse
-
-__all__ = ["SettingsResource", "AsyncSettingsResource"]
-
-
-class SettingsResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> SettingsResourceWithRawResponse:
-        return SettingsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
-        return SettingsResourceWithStreamingResponse(self)
-
-    def edit(
-        self,
-        *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        zone_defaults: DNSSettingParam | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Update DNS settings for an account or zone
-
-        Args:
-          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-
-          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if account_id and zone_id:
-            raise ValueError("You cannot provide both account_id and zone_id")
-
-        if account_id:
-            account_or_zone = "accounts"
-            account_or_zone_id = account_id
-        else:
-            if not zone_id:
-                raise ValueError("You must provide either account_id or zone_id")
-
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return self._patch(
-            f"/{account_or_zone}/{account_or_zone_id}/dns_settings",
-            body=maybe_transform({"zone_defaults": zone_defaults}, setting_edit_params.SettingEditParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SettingEditResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[SettingEditResponse]], ResultWrapper[SettingEditResponse]),
-        )
-
-    def get(
-        self,
-        *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingGetResponse]:
-        """
-        Show DNS settings for an account or zone
-
-        Args:
-          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-
-          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if account_id and zone_id:
-            raise ValueError("You cannot provide both account_id and zone_id")
-
-        if account_id:
-            account_or_zone = "accounts"
-            account_or_zone_id = account_id
-        else:
-            if not zone_id:
-                raise ValueError("You must provide either account_id or zone_id")
-
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return self._get(
-            f"/{account_or_zone}/{account_or_zone_id}/dns_settings",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SettingGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[SettingGetResponse]], ResultWrapper[SettingGetResponse]),
-        )
-
-
-class AsyncSettingsResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
-        return AsyncSettingsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
-        return AsyncSettingsResourceWithStreamingResponse(self)
-
-    async def edit(
-        self,
-        *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        zone_defaults: DNSSettingParam | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Update DNS settings for an account or zone
-
-        Args:
-          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-
-          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if account_id and zone_id:
-            raise ValueError("You cannot provide both account_id and zone_id")
-
-        if account_id:
-            account_or_zone = "accounts"
-            account_or_zone_id = account_id
-        else:
-            if not zone_id:
-                raise ValueError("You must provide either account_id or zone_id")
-
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return await self._patch(
-            f"/{account_or_zone}/{account_or_zone_id}/dns_settings",
-            body=await async_maybe_transform({"zone_defaults": zone_defaults}, setting_edit_params.SettingEditParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SettingEditResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[SettingEditResponse]], ResultWrapper[SettingEditResponse]),
-        )
-
-    async def get(
-        self,
-        *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingGetResponse]:
-        """
-        Show DNS settings for an account or zone
-
-        Args:
-          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-
-          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if account_id and zone_id:
-            raise ValueError("You cannot provide both account_id and zone_id")
-
-        if account_id:
-            account_or_zone = "accounts"
-            account_or_zone_id = account_id
-        else:
-            if not zone_id:
-                raise ValueError("You must provide either account_id or zone_id")
-
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return await self._get(
-            f"/{account_or_zone}/{account_or_zone_id}/dns_settings",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SettingGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[SettingGetResponse]], ResultWrapper[SettingGetResponse]),
-        )
-
-
-class SettingsResourceWithRawResponse:
-    def __init__(self, settings: SettingsResource) -> None:
-        self._settings = settings
-
-        self.edit = to_raw_response_wrapper(
-            settings.edit,
-        )
-        self.get = to_raw_response_wrapper(
-            settings.get,
-        )
-
-
-class AsyncSettingsResourceWithRawResponse:
-    def __init__(self, settings: AsyncSettingsResource) -> None:
-        self._settings = settings
-
-        self.edit = async_to_raw_response_wrapper(
-            settings.edit,
-        )
-        self.get = async_to_raw_response_wrapper(
-            settings.get,
-        )
-
-
-class SettingsResourceWithStreamingResponse:
-    def __init__(self, settings: SettingsResource) -> None:
-        self._settings = settings
-
-        self.edit = to_streamed_response_wrapper(
-            settings.edit,
-        )
-        self.get = to_streamed_response_wrapper(
-            settings.get,
-        )
-
-
-class AsyncSettingsResourceWithStreamingResponse:
-    def __init__(self, settings: AsyncSettingsResource) -> None:
-        self._settings = settings
-
-        self.edit = async_to_streamed_response_wrapper(
-            settings.edit,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            settings.get,
-        )
diff --git a/src/cloudflare/resources/dns/settings/__init__.py b/src/cloudflare/resources/dns/settings/__init__.py
new file mode 100644
index 00000000000..d9cc83fd9d1
--- /dev/null
+++ b/src/cloudflare/resources/dns/settings/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .zone import (
+    ZoneResource,
+    AsyncZoneResource,
+    ZoneResourceWithRawResponse,
+    AsyncZoneResourceWithRawResponse,
+    ZoneResourceWithStreamingResponse,
+    AsyncZoneResourceWithStreamingResponse,
+)
+from .account import (
+    AccountResource,
+    AsyncAccountResource,
+    AccountResourceWithRawResponse,
+    AsyncAccountResourceWithRawResponse,
+    AccountResourceWithStreamingResponse,
+    AsyncAccountResourceWithStreamingResponse,
+)
+from .settings import (
+    SettingsResource,
+    AsyncSettingsResource,
+    SettingsResourceWithRawResponse,
+    AsyncSettingsResourceWithRawResponse,
+    SettingsResourceWithStreamingResponse,
+    AsyncSettingsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ZoneResource",
+    "AsyncZoneResource",
+    "ZoneResourceWithRawResponse",
+    "AsyncZoneResourceWithRawResponse",
+    "ZoneResourceWithStreamingResponse",
+    "AsyncZoneResourceWithStreamingResponse",
+    "AccountResource",
+    "AsyncAccountResource",
+    "AccountResourceWithRawResponse",
+    "AsyncAccountResourceWithRawResponse",
+    "AccountResourceWithStreamingResponse",
+    "AsyncAccountResourceWithStreamingResponse",
+    "SettingsResource",
+    "AsyncSettingsResource",
+    "SettingsResourceWithRawResponse",
+    "AsyncSettingsResourceWithRawResponse",
+    "SettingsResourceWithStreamingResponse",
+    "AsyncSettingsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/dns/settings/account/__init__.py b/src/cloudflare/resources/dns/settings/account/__init__.py
new file mode 100644
index 00000000000..90a8fa4dbdb
--- /dev/null
+++ b/src/cloudflare/resources/dns/settings/account/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .views import (
+    ViewsResource,
+    AsyncViewsResource,
+    ViewsResourceWithRawResponse,
+    AsyncViewsResourceWithRawResponse,
+    ViewsResourceWithStreamingResponse,
+    AsyncViewsResourceWithStreamingResponse,
+)
+from .account import (
+    AccountResource,
+    AsyncAccountResource,
+    AccountResourceWithRawResponse,
+    AsyncAccountResourceWithRawResponse,
+    AccountResourceWithStreamingResponse,
+    AsyncAccountResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ViewsResource",
+    "AsyncViewsResource",
+    "ViewsResourceWithRawResponse",
+    "AsyncViewsResourceWithRawResponse",
+    "ViewsResourceWithStreamingResponse",
+    "AsyncViewsResourceWithStreamingResponse",
+    "AccountResource",
+    "AsyncAccountResource",
+    "AccountResourceWithRawResponse",
+    "AsyncAccountResourceWithRawResponse",
+    "AccountResourceWithStreamingResponse",
+    "AsyncAccountResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/dns/settings/account/account.py b/src/cloudflare/resources/dns/settings/account/account.py
new file mode 100644
index 00000000000..0dac25f716e
--- /dev/null
+++ b/src/cloudflare/resources/dns/settings/account/account.py
@@ -0,0 +1,307 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from .views import (
+    ViewsResource,
+    AsyncViewsResource,
+    ViewsResourceWithRawResponse,
+    AsyncViewsResourceWithRawResponse,
+    ViewsResourceWithStreamingResponse,
+    AsyncViewsResourceWithStreamingResponse,
+)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.dns.settings import account_edit_params
+from .....types.dns.settings.account_get_response import AccountGetResponse
+from .....types.dns.settings.account_edit_response import AccountEditResponse
+
+__all__ = ["AccountResource", "AsyncAccountResource"]
+
+
+class AccountResource(SyncAPIResource):
+    @cached_property
+    def views(self) -> ViewsResource:
+        return ViewsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AccountResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AccountResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AccountResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AccountResourceWithStreamingResponse(self)
+
+    def edit(
+        self,
+        *,
+        account_id: str,
+        zone_defaults: account_edit_params.ZoneDefaults | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AccountEditResponse]:
+        """
+        Update DNS settings for an account
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/dns_settings",
+            body=maybe_transform({"zone_defaults": zone_defaults}, account_edit_params.AccountEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AccountEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AccountEditResponse]], ResultWrapper[AccountEditResponse]),
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AccountGetResponse]:
+        """
+        Show DNS settings for an account
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/dns_settings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AccountGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AccountGetResponse]], ResultWrapper[AccountGetResponse]),
+        )
+
+
+class AsyncAccountResource(AsyncAPIResource):
+    @cached_property
+    def views(self) -> AsyncViewsResource:
+        return AsyncViewsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncAccountResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAccountResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAccountResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAccountResourceWithStreamingResponse(self)
+
+    async def edit(
+        self,
+        *,
+        account_id: str,
+        zone_defaults: account_edit_params.ZoneDefaults | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AccountEditResponse]:
+        """
+        Update DNS settings for an account
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/dns_settings",
+            body=await async_maybe_transform({"zone_defaults": zone_defaults}, account_edit_params.AccountEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AccountEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AccountEditResponse]], ResultWrapper[AccountEditResponse]),
+        )
+
+    async def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AccountGetResponse]:
+        """
+        Show DNS settings for an account
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/dns_settings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AccountGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AccountGetResponse]], ResultWrapper[AccountGetResponse]),
+        )
+
+
+class AccountResourceWithRawResponse:
+    def __init__(self, account: AccountResource) -> None:
+        self._account = account
+
+        self.edit = to_raw_response_wrapper(
+            account.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            account.get,
+        )
+
+    @cached_property
+    def views(self) -> ViewsResourceWithRawResponse:
+        return ViewsResourceWithRawResponse(self._account.views)
+
+
+class AsyncAccountResourceWithRawResponse:
+    def __init__(self, account: AsyncAccountResource) -> None:
+        self._account = account
+
+        self.edit = async_to_raw_response_wrapper(
+            account.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            account.get,
+        )
+
+    @cached_property
+    def views(self) -> AsyncViewsResourceWithRawResponse:
+        return AsyncViewsResourceWithRawResponse(self._account.views)
+
+
+class AccountResourceWithStreamingResponse:
+    def __init__(self, account: AccountResource) -> None:
+        self._account = account
+
+        self.edit = to_streamed_response_wrapper(
+            account.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            account.get,
+        )
+
+    @cached_property
+    def views(self) -> ViewsResourceWithStreamingResponse:
+        return ViewsResourceWithStreamingResponse(self._account.views)
+
+
+class AsyncAccountResourceWithStreamingResponse:
+    def __init__(self, account: AsyncAccountResource) -> None:
+        self._account = account
+
+        self.edit = async_to_streamed_response_wrapper(
+            account.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            account.get,
+        )
+
+    @cached_property
+    def views(self) -> AsyncViewsResourceWithStreamingResponse:
+        return AsyncViewsResourceWithStreamingResponse(self._account.views)
diff --git a/src/cloudflare/resources/dns/settings/account/views.py b/src/cloudflare/resources/dns/settings/account/views.py
new file mode 100644
index 00000000000..9087a872c50
--- /dev/null
+++ b/src/cloudflare/resources/dns/settings/account/views.py
@@ -0,0 +1,702 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from .....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.dns.settings.account import view_edit_params, view_list_params, view_create_params
+from .....types.dns.settings.account.view_get_response import ViewGetResponse
+from .....types.dns.settings.account.view_edit_response import ViewEditResponse
+from .....types.dns.settings.account.view_list_response import ViewListResponse
+from .....types.dns.settings.account.view_create_response import ViewCreateResponse
+from .....types.dns.settings.account.view_delete_response import ViewDeleteResponse
+
+__all__ = ["ViewsResource", "AsyncViewsResource"]
+
+
+class ViewsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ViewsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ViewsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ViewsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ViewsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        zones: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ViewCreateResponse]:
+        """
+        Create Internal DNS View for an account
+
+        Args:
+          account_id: Identifier.
+
+          name: The name of the view.
+
+          zones: The list of zones linked to this view.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/dns_settings/views",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "zones": zones,
+                },
+                view_create_params.ViewCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ViewCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ViewCreateResponse]], ResultWrapper[ViewCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        match: Literal["any", "all"] | Omit = omit,
+        name: view_list_params.Name | Omit = omit,
+        order: Literal["name", "created_on", "modified_on"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        zone_id: str | Omit = omit,
+        zone_name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[ViewListResponse]:
+        """
+        List DNS Internal Views for an Account
+
+        Args:
+          account_id: Identifier.
+
+          direction: Direction to order DNS views in.
+
+          match: Whether to match all search requirements or at least one (any). If set to `all`,
+              acts like a logical AND between filters. If set to `any`, acts like a logical OR
+              instead.
+
+          order: Field to order DNS views by.
+
+          page: Page number of paginated results.
+
+          per_page: Number of DNS views per page.
+
+          zone_id: A zone ID that exists in the zones list for the view.
+
+          zone_name: A zone name that exists in the zones list for the view.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dns_settings/views",
+            page=SyncV4PagePaginationArray[ViewListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "match": match,
+                        "name": name,
+                        "order": order,
+                        "page": page,
+                        "per_page": per_page,
+                        "zone_id": zone_id,
+                        "zone_name": zone_name,
+                    },
+                    view_list_params.ViewListParams,
+                ),
+            ),
+            model=ViewListResponse,
+        )
+
+    def delete(
+        self,
+        view_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ViewDeleteResponse]:
+        """
+        Delete an existing Internal DNS View
+
+        Args:
+          account_id: Identifier.
+
+          view_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not view_id:
+            raise ValueError(f"Expected a non-empty value for `view_id` but received {view_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/dns_settings/views/{view_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ViewDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ViewDeleteResponse]], ResultWrapper[ViewDeleteResponse]),
+        )
+
+    def edit(
+        self,
+        view_id: str,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        zones: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ViewEditResponse]:
+        """
+        Update an existing Internal DNS View
+
+        Args:
+          account_id: Identifier.
+
+          view_id: Identifier.
+
+          name: The name of the view.
+
+          zones: The list of zones linked to this view.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not view_id:
+            raise ValueError(f"Expected a non-empty value for `view_id` but received {view_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/dns_settings/views/{view_id}",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "zones": zones,
+                },
+                view_edit_params.ViewEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ViewEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ViewEditResponse]], ResultWrapper[ViewEditResponse]),
+        )
+
+    def get(
+        self,
+        view_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ViewGetResponse]:
+        """
+        Get DNS Internal View
+
+        Args:
+          account_id: Identifier.
+
+          view_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not view_id:
+            raise ValueError(f"Expected a non-empty value for `view_id` but received {view_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/dns_settings/views/{view_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ViewGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ViewGetResponse]], ResultWrapper[ViewGetResponse]),
+        )
+
+
+class AsyncViewsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncViewsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncViewsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncViewsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncViewsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        zones: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ViewCreateResponse]:
+        """
+        Create Internal DNS View for an account
+
+        Args:
+          account_id: Identifier.
+
+          name: The name of the view.
+
+          zones: The list of zones linked to this view.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/dns_settings/views",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "zones": zones,
+                },
+                view_create_params.ViewCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ViewCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ViewCreateResponse]], ResultWrapper[ViewCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        match: Literal["any", "all"] | Omit = omit,
+        name: view_list_params.Name | Omit = omit,
+        order: Literal["name", "created_on", "modified_on"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        zone_id: str | Omit = omit,
+        zone_name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ViewListResponse, AsyncV4PagePaginationArray[ViewListResponse]]:
+        """
+        List DNS Internal Views for an Account
+
+        Args:
+          account_id: Identifier.
+
+          direction: Direction to order DNS views in.
+
+          match: Whether to match all search requirements or at least one (any). If set to `all`,
+              acts like a logical AND between filters. If set to `any`, acts like a logical OR
+              instead.
+
+          order: Field to order DNS views by.
+
+          page: Page number of paginated results.
+
+          per_page: Number of DNS views per page.
+
+          zone_id: A zone ID that exists in the zones list for the view.
+
+          zone_name: A zone name that exists in the zones list for the view.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dns_settings/views",
+            page=AsyncV4PagePaginationArray[ViewListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "match": match,
+                        "name": name,
+                        "order": order,
+                        "page": page,
+                        "per_page": per_page,
+                        "zone_id": zone_id,
+                        "zone_name": zone_name,
+                    },
+                    view_list_params.ViewListParams,
+                ),
+            ),
+            model=ViewListResponse,
+        )
+
+    async def delete(
+        self,
+        view_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ViewDeleteResponse]:
+        """
+        Delete an existing Internal DNS View
+
+        Args:
+          account_id: Identifier.
+
+          view_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not view_id:
+            raise ValueError(f"Expected a non-empty value for `view_id` but received {view_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/dns_settings/views/{view_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ViewDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ViewDeleteResponse]], ResultWrapper[ViewDeleteResponse]),
+        )
+
+    async def edit(
+        self,
+        view_id: str,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        zones: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ViewEditResponse]:
+        """
+        Update an existing Internal DNS View
+
+        Args:
+          account_id: Identifier.
+
+          view_id: Identifier.
+
+          name: The name of the view.
+
+          zones: The list of zones linked to this view.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not view_id:
+            raise ValueError(f"Expected a non-empty value for `view_id` but received {view_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/dns_settings/views/{view_id}",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "zones": zones,
+                },
+                view_edit_params.ViewEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ViewEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ViewEditResponse]], ResultWrapper[ViewEditResponse]),
+        )
+
+    async def get(
+        self,
+        view_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ViewGetResponse]:
+        """
+        Get DNS Internal View
+
+        Args:
+          account_id: Identifier.
+
+          view_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not view_id:
+            raise ValueError(f"Expected a non-empty value for `view_id` but received {view_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/dns_settings/views/{view_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ViewGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ViewGetResponse]], ResultWrapper[ViewGetResponse]),
+        )
+
+
+class ViewsResourceWithRawResponse:
+    def __init__(self, views: ViewsResource) -> None:
+        self._views = views
+
+        self.create = to_raw_response_wrapper(
+            views.create,
+        )
+        self.list = to_raw_response_wrapper(
+            views.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            views.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            views.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            views.get,
+        )
+
+
+class AsyncViewsResourceWithRawResponse:
+    def __init__(self, views: AsyncViewsResource) -> None:
+        self._views = views
+
+        self.create = async_to_raw_response_wrapper(
+            views.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            views.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            views.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            views.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            views.get,
+        )
+
+
+class ViewsResourceWithStreamingResponse:
+    def __init__(self, views: ViewsResource) -> None:
+        self._views = views
+
+        self.create = to_streamed_response_wrapper(
+            views.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            views.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            views.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            views.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            views.get,
+        )
+
+
+class AsyncViewsResourceWithStreamingResponse:
+    def __init__(self, views: AsyncViewsResource) -> None:
+        self._views = views
+
+        self.create = async_to_streamed_response_wrapper(
+            views.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            views.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            views.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            views.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            views.get,
+        )
diff --git a/src/cloudflare/resources/dns/settings/settings.py b/src/cloudflare/resources/dns/settings/settings.py
new file mode 100644
index 00000000000..47edf45e499
--- /dev/null
+++ b/src/cloudflare/resources/dns/settings/settings.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .zone import (
+    ZoneResource,
+    AsyncZoneResource,
+    ZoneResourceWithRawResponse,
+    AsyncZoneResourceWithRawResponse,
+    ZoneResourceWithStreamingResponse,
+    AsyncZoneResourceWithStreamingResponse,
+)
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .account.account import (
+    AccountResource,
+    AsyncAccountResource,
+    AccountResourceWithRawResponse,
+    AsyncAccountResourceWithRawResponse,
+    AccountResourceWithStreamingResponse,
+    AsyncAccountResourceWithStreamingResponse,
+)
+
+__all__ = ["SettingsResource", "AsyncSettingsResource"]
+
+
+class SettingsResource(SyncAPIResource):
+    @cached_property
+    def zone(self) -> ZoneResource:
+        return ZoneResource(self._client)
+
+    @cached_property
+    def account(self) -> AccountResource:
+        return AccountResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> SettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SettingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SettingsResourceWithStreamingResponse(self)
+
+
+class AsyncSettingsResource(AsyncAPIResource):
+    @cached_property
+    def zone(self) -> AsyncZoneResource:
+        return AsyncZoneResource(self._client)
+
+    @cached_property
+    def account(self) -> AsyncAccountResource:
+        return AsyncAccountResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSettingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSettingsResourceWithStreamingResponse(self)
+
+
+class SettingsResourceWithRawResponse:
+    def __init__(self, settings: SettingsResource) -> None:
+        self._settings = settings
+
+    @cached_property
+    def zone(self) -> ZoneResourceWithRawResponse:
+        return ZoneResourceWithRawResponse(self._settings.zone)
+
+    @cached_property
+    def account(self) -> AccountResourceWithRawResponse:
+        return AccountResourceWithRawResponse(self._settings.account)
+
+
+class AsyncSettingsResourceWithRawResponse:
+    def __init__(self, settings: AsyncSettingsResource) -> None:
+        self._settings = settings
+
+    @cached_property
+    def zone(self) -> AsyncZoneResourceWithRawResponse:
+        return AsyncZoneResourceWithRawResponse(self._settings.zone)
+
+    @cached_property
+    def account(self) -> AsyncAccountResourceWithRawResponse:
+        return AsyncAccountResourceWithRawResponse(self._settings.account)
+
+
+class SettingsResourceWithStreamingResponse:
+    def __init__(self, settings: SettingsResource) -> None:
+        self._settings = settings
+
+    @cached_property
+    def zone(self) -> ZoneResourceWithStreamingResponse:
+        return ZoneResourceWithStreamingResponse(self._settings.zone)
+
+    @cached_property
+    def account(self) -> AccountResourceWithStreamingResponse:
+        return AccountResourceWithStreamingResponse(self._settings.account)
+
+
+class AsyncSettingsResourceWithStreamingResponse:
+    def __init__(self, settings: AsyncSettingsResource) -> None:
+        self._settings = settings
+
+    @cached_property
+    def zone(self) -> AsyncZoneResourceWithStreamingResponse:
+        return AsyncZoneResourceWithStreamingResponse(self._settings.zone)
+
+    @cached_property
+    def account(self) -> AsyncAccountResourceWithStreamingResponse:
+        return AsyncAccountResourceWithStreamingResponse(self._settings.account)
diff --git a/src/cloudflare/resources/dns/settings/zone.py b/src/cloudflare/resources/dns/settings/zone.py
new file mode 100644
index 00000000000..e6192dd17c4
--- /dev/null
+++ b/src/cloudflare/resources/dns/settings/zone.py
@@ -0,0 +1,362 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.dns.settings import zone_edit_params
+from ....types.dns.settings.zone_get_response import ZoneGetResponse
+from ....types.dns.settings.zone_edit_response import ZoneEditResponse
+
+__all__ = ["ZoneResource", "AsyncZoneResource"]
+
+
+class ZoneResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ZoneResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ZoneResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ZoneResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ZoneResourceWithStreamingResponse(self)
+
+    def edit(
+        self,
+        *,
+        zone_id: str,
+        flatten_all_cnames: bool | Omit = omit,
+        foundation_dns: bool | Omit = omit,
+        internal_dns: zone_edit_params.InternalDNS | Omit = omit,
+        multi_provider: bool | Omit = omit,
+        nameservers: zone_edit_params.Nameservers | Omit = omit,
+        ns_ttl: float | Omit = omit,
+        secondary_overrides: bool | Omit = omit,
+        soa: zone_edit_params.SOA | Omit = omit,
+        zone_mode: Literal["standard", "cdn_only", "dns_only"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ZoneEditResponse]:
+        """
+        Update DNS settings for a zone
+
+        Args:
+          zone_id: Identifier.
+
+          flatten_all_cnames: Whether to flatten all CNAME records in the zone. Note that, due to DNS
+              limitations, a CNAME record at the zone apex will always be flattened.
+
+          foundation_dns: Whether to enable Foundation DNS Advanced Nameservers on the zone.
+
+          internal_dns: Settings for this internal zone.
+
+          multi_provider: Whether to enable multi-provider DNS, which causes Cloudflare to activate the
+              zone even when non-Cloudflare NS records exist, and to respect NS records at the
+              zone apex during outbound zone transfers.
+
+          nameservers: Settings determining the nameservers through which the zone should be available.
+
+          ns_ttl: The time to live (TTL) of the zone's nameserver (NS) records.
+
+          secondary_overrides: Allows a Secondary DNS zone to use (proxied) override records and CNAME
+              flattening at the zone apex.
+
+          soa: Components of the zone's SOA record.
+
+          zone_mode: Whether the zone mode is a regular or CDN/DNS only zone.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._patch(
+            f"/zones/{zone_id}/dns_settings",
+            body=maybe_transform(
+                {
+                    "flatten_all_cnames": flatten_all_cnames,
+                    "foundation_dns": foundation_dns,
+                    "internal_dns": internal_dns,
+                    "multi_provider": multi_provider,
+                    "nameservers": nameservers,
+                    "ns_ttl": ns_ttl,
+                    "secondary_overrides": secondary_overrides,
+                    "soa": soa,
+                    "zone_mode": zone_mode,
+                },
+                zone_edit_params.ZoneEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ZoneEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ZoneEditResponse]], ResultWrapper[ZoneEditResponse]),
+        )
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ZoneGetResponse]:
+        """
+        Show DNS settings for a zone
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/dns_settings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ZoneGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ZoneGetResponse]], ResultWrapper[ZoneGetResponse]),
+        )
+
+
+class AsyncZoneResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncZoneResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncZoneResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncZoneResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncZoneResourceWithStreamingResponse(self)
+
+    async def edit(
+        self,
+        *,
+        zone_id: str,
+        flatten_all_cnames: bool | Omit = omit,
+        foundation_dns: bool | Omit = omit,
+        internal_dns: zone_edit_params.InternalDNS | Omit = omit,
+        multi_provider: bool | Omit = omit,
+        nameservers: zone_edit_params.Nameservers | Omit = omit,
+        ns_ttl: float | Omit = omit,
+        secondary_overrides: bool | Omit = omit,
+        soa: zone_edit_params.SOA | Omit = omit,
+        zone_mode: Literal["standard", "cdn_only", "dns_only"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ZoneEditResponse]:
+        """
+        Update DNS settings for a zone
+
+        Args:
+          zone_id: Identifier.
+
+          flatten_all_cnames: Whether to flatten all CNAME records in the zone. Note that, due to DNS
+              limitations, a CNAME record at the zone apex will always be flattened.
+
+          foundation_dns: Whether to enable Foundation DNS Advanced Nameservers on the zone.
+
+          internal_dns: Settings for this internal zone.
+
+          multi_provider: Whether to enable multi-provider DNS, which causes Cloudflare to activate the
+              zone even when non-Cloudflare NS records exist, and to respect NS records at the
+              zone apex during outbound zone transfers.
+
+          nameservers: Settings determining the nameservers through which the zone should be available.
+
+          ns_ttl: The time to live (TTL) of the zone's nameserver (NS) records.
+
+          secondary_overrides: Allows a Secondary DNS zone to use (proxied) override records and CNAME
+              flattening at the zone apex.
+
+          soa: Components of the zone's SOA record.
+
+          zone_mode: Whether the zone mode is a regular or CDN/DNS only zone.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._patch(
+            f"/zones/{zone_id}/dns_settings",
+            body=await async_maybe_transform(
+                {
+                    "flatten_all_cnames": flatten_all_cnames,
+                    "foundation_dns": foundation_dns,
+                    "internal_dns": internal_dns,
+                    "multi_provider": multi_provider,
+                    "nameservers": nameservers,
+                    "ns_ttl": ns_ttl,
+                    "secondary_overrides": secondary_overrides,
+                    "soa": soa,
+                    "zone_mode": zone_mode,
+                },
+                zone_edit_params.ZoneEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ZoneEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ZoneEditResponse]], ResultWrapper[ZoneEditResponse]),
+        )
+
+    async def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ZoneGetResponse]:
+        """
+        Show DNS settings for a zone
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/dns_settings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ZoneGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ZoneGetResponse]], ResultWrapper[ZoneGetResponse]),
+        )
+
+
+class ZoneResourceWithRawResponse:
+    def __init__(self, zone: ZoneResource) -> None:
+        self._zone = zone
+
+        self.edit = to_raw_response_wrapper(
+            zone.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            zone.get,
+        )
+
+
+class AsyncZoneResourceWithRawResponse:
+    def __init__(self, zone: AsyncZoneResource) -> None:
+        self._zone = zone
+
+        self.edit = async_to_raw_response_wrapper(
+            zone.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            zone.get,
+        )
+
+
+class ZoneResourceWithStreamingResponse:
+    def __init__(self, zone: ZoneResource) -> None:
+        self._zone = zone
+
+        self.edit = to_streamed_response_wrapper(
+            zone.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            zone.get,
+        )
+
+
+class AsyncZoneResourceWithStreamingResponse:
+    def __init__(self, zone: AsyncZoneResource) -> None:
+        self._zone = zone
+
+        self.edit = async_to_streamed_response_wrapper(
+            zone.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            zone.get,
+        )
diff --git a/src/cloudflare/resources/dns/zone_transfers/__init__.py b/src/cloudflare/resources/dns/zone_transfers/__init__.py
new file mode 100644
index 00000000000..01cd689bd75
--- /dev/null
+++ b/src/cloudflare/resources/dns/zone_transfers/__init__.py
@@ -0,0 +1,103 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .acls import (
+    ACLsResource,
+    AsyncACLsResource,
+    ACLsResourceWithRawResponse,
+    AsyncACLsResourceWithRawResponse,
+    ACLsResourceWithStreamingResponse,
+    AsyncACLsResourceWithStreamingResponse,
+)
+from .peers import (
+    PeersResource,
+    AsyncPeersResource,
+    PeersResourceWithRawResponse,
+    AsyncPeersResourceWithRawResponse,
+    PeersResourceWithStreamingResponse,
+    AsyncPeersResourceWithStreamingResponse,
+)
+from .tsigs import (
+    TSIGsResource,
+    AsyncTSIGsResource,
+    TSIGsResourceWithRawResponse,
+    AsyncTSIGsResourceWithRawResponse,
+    TSIGsResourceWithStreamingResponse,
+    AsyncTSIGsResourceWithStreamingResponse,
+)
+from .incoming import (
+    IncomingResource,
+    AsyncIncomingResource,
+    IncomingResourceWithRawResponse,
+    AsyncIncomingResourceWithRawResponse,
+    IncomingResourceWithStreamingResponse,
+    AsyncIncomingResourceWithStreamingResponse,
+)
+from .outgoing import (
+    OutgoingResource,
+    AsyncOutgoingResource,
+    OutgoingResourceWithRawResponse,
+    AsyncOutgoingResourceWithRawResponse,
+    OutgoingResourceWithStreamingResponse,
+    AsyncOutgoingResourceWithStreamingResponse,
+)
+from .force_axfr import (
+    ForceAXFRResource,
+    AsyncForceAXFRResource,
+    ForceAXFRResourceWithRawResponse,
+    AsyncForceAXFRResourceWithRawResponse,
+    ForceAXFRResourceWithStreamingResponse,
+    AsyncForceAXFRResourceWithStreamingResponse,
+)
+from .zone_transfers import (
+    ZoneTransfersResource,
+    AsyncZoneTransfersResource,
+    ZoneTransfersResourceWithRawResponse,
+    AsyncZoneTransfersResourceWithRawResponse,
+    ZoneTransfersResourceWithStreamingResponse,
+    AsyncZoneTransfersResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ForceAXFRResource",
+    "AsyncForceAXFRResource",
+    "ForceAXFRResourceWithRawResponse",
+    "AsyncForceAXFRResourceWithRawResponse",
+    "ForceAXFRResourceWithStreamingResponse",
+    "AsyncForceAXFRResourceWithStreamingResponse",
+    "IncomingResource",
+    "AsyncIncomingResource",
+    "IncomingResourceWithRawResponse",
+    "AsyncIncomingResourceWithRawResponse",
+    "IncomingResourceWithStreamingResponse",
+    "AsyncIncomingResourceWithStreamingResponse",
+    "OutgoingResource",
+    "AsyncOutgoingResource",
+    "OutgoingResourceWithRawResponse",
+    "AsyncOutgoingResourceWithRawResponse",
+    "OutgoingResourceWithStreamingResponse",
+    "AsyncOutgoingResourceWithStreamingResponse",
+    "ACLsResource",
+    "AsyncACLsResource",
+    "ACLsResourceWithRawResponse",
+    "AsyncACLsResourceWithRawResponse",
+    "ACLsResourceWithStreamingResponse",
+    "AsyncACLsResourceWithStreamingResponse",
+    "PeersResource",
+    "AsyncPeersResource",
+    "PeersResourceWithRawResponse",
+    "AsyncPeersResourceWithRawResponse",
+    "PeersResourceWithStreamingResponse",
+    "AsyncPeersResourceWithStreamingResponse",
+    "TSIGsResource",
+    "AsyncTSIGsResource",
+    "TSIGsResourceWithRawResponse",
+    "AsyncTSIGsResourceWithRawResponse",
+    "TSIGsResourceWithStreamingResponse",
+    "AsyncTSIGsResourceWithStreamingResponse",
+    "ZoneTransfersResource",
+    "AsyncZoneTransfersResource",
+    "ZoneTransfersResourceWithRawResponse",
+    "AsyncZoneTransfersResourceWithRawResponse",
+    "ZoneTransfersResourceWithStreamingResponse",
+    "AsyncZoneTransfersResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/secondary_dns/acls.py b/src/cloudflare/resources/dns/zone_transfers/acls.py
similarity index 83%
rename from src/cloudflare/resources/secondary_dns/acls.py
rename to src/cloudflare/resources/dns/zone_transfers/acls.py
index 9266ddbfe07..1bc1881c3de 100644
--- a/src/cloudflare/resources/secondary_dns/acls.py
+++ b/src/cloudflare/resources/dns/zone_transfers/acls.py
@@ -6,25 +6,22 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
     to_raw_response_wrapper,
     to_streamed_response_wrapper,
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._wrappers import ResultWrapper
-from ...pagination import SyncSinglePage, AsyncSinglePage
-from ..._base_client import AsyncPaginator, make_request_options
-from ...types.secondary_dns import acl_create_params, acl_update_params
-from ...types.secondary_dns.acl import ACL
-from ...types.secondary_dns.acl_delete_response import ACLDeleteResponse
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.dns.zone_transfers import acl_create_params, acl_update_params
+from ....types.dns.zone_transfers.acl import ACL
+from ....types.dns.zone_transfers.acl_delete_response import ACLDeleteResponse
 
 __all__ = ["ACLsResource", "AsyncACLsResource"]
 
@@ -32,28 +29,48 @@
 class ACLsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ACLsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ACLsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ACLsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ACLsResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        body: object,
+        ip_range: str,
+        name: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ACL]:
         """
         Create ACL.
 
         Args:
+          ip_range: Allowed IPv4/IPv6 address range of primary or secondary nameservers. This will
+              be applied for the entire account. The IP range is used to allow additional
+              NOTIFY IPs for secondary zones and IPs Cloudflare allows AXFR/IXFR requests from
+              for primary zones. CIDRs are limited to a maximum of /24 for IPv4 and /64 for
+              IPv6 respectively.
+
+          name: The name of the acl.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -66,7 +83,13 @@ def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._post(
             f"/accounts/{account_id}/secondary_dns/acls",
-            body=maybe_transform(body, acl_create_params.ACLCreateParams),
+            body=maybe_transform(
+                {
+                    "ip_range": ip_range,
+                    "name": name,
+                },
+                acl_create_params.ACLCreateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -89,7 +112,7 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ACL]:
         """
         Modify ACL.
@@ -143,7 +166,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[ACL]:
         """
         List ACLs.
@@ -178,7 +201,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ACLDeleteResponse]:
         """
         Delete ACL.
@@ -218,7 +241,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ACL]:
         """
         Get ACL.
@@ -252,28 +275,48 @@ def get(
 class AsyncACLsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncACLsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncACLsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncACLsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncACLsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        body: object,
+        ip_range: str,
+        name: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ACL]:
         """
         Create ACL.
 
         Args:
+          ip_range: Allowed IPv4/IPv6 address range of primary or secondary nameservers. This will
+              be applied for the entire account. The IP range is used to allow additional
+              NOTIFY IPs for secondary zones and IPs Cloudflare allows AXFR/IXFR requests from
+              for primary zones. CIDRs are limited to a maximum of /24 for IPv4 and /64 for
+              IPv6 respectively.
+
+          name: The name of the acl.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -286,7 +329,13 @@ async def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._post(
             f"/accounts/{account_id}/secondary_dns/acls",
-            body=await async_maybe_transform(body, acl_create_params.ACLCreateParams),
+            body=await async_maybe_transform(
+                {
+                    "ip_range": ip_range,
+                    "name": name,
+                },
+                acl_create_params.ACLCreateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -309,7 +358,7 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ACL]:
         """
         Modify ACL.
@@ -363,7 +412,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[ACL, AsyncSinglePage[ACL]]:
         """
         List ACLs.
@@ -398,7 +447,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ACLDeleteResponse]:
         """
         Delete ACL.
@@ -438,7 +487,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ACL]:
         """
         Get ACL.
diff --git a/src/cloudflare/resources/dns/zone_transfers/force_axfr.py b/src/cloudflare/resources/dns/zone_transfers/force_axfr.py
new file mode 100644
index 00000000000..a9d4f10976b
--- /dev/null
+++ b/src/cloudflare/resources/dns/zone_transfers/force_axfr.py
@@ -0,0 +1,180 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.dns.zone_transfers import force_axfr_create_params
+from ....types.dns.zone_transfers.force_axfr import ForceAXFR
+
+__all__ = ["ForceAXFRResource", "AsyncForceAXFRResource"]
+
+
+class ForceAXFRResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ForceAXFRResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ForceAXFRResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ForceAXFRResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ForceAXFRResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        zone_id: str,
+        body: object,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Sends AXFR zone transfer request to primary nameserver(s).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/secondary_dns/force_axfr",
+            body=maybe_transform(body, force_axfr_create_params.ForceAXFRCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ForceAXFR]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class AsyncForceAXFRResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncForceAXFRResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncForceAXFRResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncForceAXFRResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncForceAXFRResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        body: object,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Sends AXFR zone transfer request to primary nameserver(s).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/secondary_dns/force_axfr",
+            body=await async_maybe_transform(body, force_axfr_create_params.ForceAXFRCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ForceAXFR]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class ForceAXFRResourceWithRawResponse:
+    def __init__(self, force_axfr: ForceAXFRResource) -> None:
+        self._force_axfr = force_axfr
+
+        self.create = to_raw_response_wrapper(
+            force_axfr.create,
+        )
+
+
+class AsyncForceAXFRResourceWithRawResponse:
+    def __init__(self, force_axfr: AsyncForceAXFRResource) -> None:
+        self._force_axfr = force_axfr
+
+        self.create = async_to_raw_response_wrapper(
+            force_axfr.create,
+        )
+
+
+class ForceAXFRResourceWithStreamingResponse:
+    def __init__(self, force_axfr: ForceAXFRResource) -> None:
+        self._force_axfr = force_axfr
+
+        self.create = to_streamed_response_wrapper(
+            force_axfr.create,
+        )
+
+
+class AsyncForceAXFRResourceWithStreamingResponse:
+    def __init__(self, force_axfr: AsyncForceAXFRResource) -> None:
+        self._force_axfr = force_axfr
+
+        self.create = async_to_streamed_response_wrapper(
+            force_axfr.create,
+        )
diff --git a/src/cloudflare/resources/dns/zone_transfers/incoming.py b/src/cloudflare/resources/dns/zone_transfers/incoming.py
new file mode 100644
index 00000000000..d2b75511030
--- /dev/null
+++ b/src/cloudflare/resources/dns/zone_transfers/incoming.py
@@ -0,0 +1,509 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, SequenceNotStr, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.dns.zone_transfers import incoming_create_params, incoming_update_params
+from ....types.dns.zone_transfers.incoming_get_response import IncomingGetResponse
+from ....types.dns.zone_transfers.incoming_create_response import IncomingCreateResponse
+from ....types.dns.zone_transfers.incoming_delete_response import IncomingDeleteResponse
+from ....types.dns.zone_transfers.incoming_update_response import IncomingUpdateResponse
+
+__all__ = ["IncomingResource", "AsyncIncomingResource"]
+
+
+class IncomingResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> IncomingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return IncomingResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> IncomingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return IncomingResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        zone_id: str,
+        auto_refresh_seconds: float,
+        name: str,
+        peers: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IncomingCreateResponse]:
+        """
+        Create secondary zone configuration for incoming zone transfers.
+
+        Args:
+          auto_refresh_seconds: How often should a secondary zone auto refresh regardless of DNS NOTIFY. Not
+              applicable for primary zones.
+
+          name: Zone name.
+
+          peers: A list of peer tags.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/secondary_dns/incoming",
+            body=maybe_transform(
+                {
+                    "auto_refresh_seconds": auto_refresh_seconds,
+                    "name": name,
+                    "peers": peers,
+                },
+                incoming_create_params.IncomingCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[IncomingCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IncomingCreateResponse]], ResultWrapper[IncomingCreateResponse]),
+        )
+
+    def update(
+        self,
+        *,
+        zone_id: str,
+        auto_refresh_seconds: float,
+        name: str,
+        peers: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IncomingUpdateResponse]:
+        """
+        Update secondary zone configuration for incoming zone transfers.
+
+        Args:
+          auto_refresh_seconds: How often should a secondary zone auto refresh regardless of DNS NOTIFY. Not
+              applicable for primary zones.
+
+          name: Zone name.
+
+          peers: A list of peer tags.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/secondary_dns/incoming",
+            body=maybe_transform(
+                {
+                    "auto_refresh_seconds": auto_refresh_seconds,
+                    "name": name,
+                    "peers": peers,
+                },
+                incoming_update_params.IncomingUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[IncomingUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IncomingUpdateResponse]], ResultWrapper[IncomingUpdateResponse]),
+        )
+
+    def delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IncomingDeleteResponse]:
+        """
+        Delete secondary zone configuration for incoming zone transfers.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._delete(
+            f"/zones/{zone_id}/secondary_dns/incoming",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[IncomingDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IncomingDeleteResponse]], ResultWrapper[IncomingDeleteResponse]),
+        )
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IncomingGetResponse]:
+        """
+        Get secondary zone configuration for incoming zone transfers.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/secondary_dns/incoming",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[IncomingGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IncomingGetResponse]], ResultWrapper[IncomingGetResponse]),
+        )
+
+
+class AsyncIncomingResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncIncomingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncIncomingResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncIncomingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncIncomingResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        auto_refresh_seconds: float,
+        name: str,
+        peers: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IncomingCreateResponse]:
+        """
+        Create secondary zone configuration for incoming zone transfers.
+
+        Args:
+          auto_refresh_seconds: How often should a secondary zone auto refresh regardless of DNS NOTIFY. Not
+              applicable for primary zones.
+
+          name: Zone name.
+
+          peers: A list of peer tags.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/secondary_dns/incoming",
+            body=await async_maybe_transform(
+                {
+                    "auto_refresh_seconds": auto_refresh_seconds,
+                    "name": name,
+                    "peers": peers,
+                },
+                incoming_create_params.IncomingCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[IncomingCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IncomingCreateResponse]], ResultWrapper[IncomingCreateResponse]),
+        )
+
+    async def update(
+        self,
+        *,
+        zone_id: str,
+        auto_refresh_seconds: float,
+        name: str,
+        peers: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IncomingUpdateResponse]:
+        """
+        Update secondary zone configuration for incoming zone transfers.
+
+        Args:
+          auto_refresh_seconds: How often should a secondary zone auto refresh regardless of DNS NOTIFY. Not
+              applicable for primary zones.
+
+          name: Zone name.
+
+          peers: A list of peer tags.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/secondary_dns/incoming",
+            body=await async_maybe_transform(
+                {
+                    "auto_refresh_seconds": auto_refresh_seconds,
+                    "name": name,
+                    "peers": peers,
+                },
+                incoming_update_params.IncomingUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[IncomingUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IncomingUpdateResponse]], ResultWrapper[IncomingUpdateResponse]),
+        )
+
+    async def delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IncomingDeleteResponse]:
+        """
+        Delete secondary zone configuration for incoming zone transfers.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._delete(
+            f"/zones/{zone_id}/secondary_dns/incoming",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[IncomingDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IncomingDeleteResponse]], ResultWrapper[IncomingDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IncomingGetResponse]:
+        """
+        Get secondary zone configuration for incoming zone transfers.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/secondary_dns/incoming",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[IncomingGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IncomingGetResponse]], ResultWrapper[IncomingGetResponse]),
+        )
+
+
+class IncomingResourceWithRawResponse:
+    def __init__(self, incoming: IncomingResource) -> None:
+        self._incoming = incoming
+
+        self.create = to_raw_response_wrapper(
+            incoming.create,
+        )
+        self.update = to_raw_response_wrapper(
+            incoming.update,
+        )
+        self.delete = to_raw_response_wrapper(
+            incoming.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            incoming.get,
+        )
+
+
+class AsyncIncomingResourceWithRawResponse:
+    def __init__(self, incoming: AsyncIncomingResource) -> None:
+        self._incoming = incoming
+
+        self.create = async_to_raw_response_wrapper(
+            incoming.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            incoming.update,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            incoming.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            incoming.get,
+        )
+
+
+class IncomingResourceWithStreamingResponse:
+    def __init__(self, incoming: IncomingResource) -> None:
+        self._incoming = incoming
+
+        self.create = to_streamed_response_wrapper(
+            incoming.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            incoming.update,
+        )
+        self.delete = to_streamed_response_wrapper(
+            incoming.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            incoming.get,
+        )
+
+
+class AsyncIncomingResourceWithStreamingResponse:
+    def __init__(self, incoming: AsyncIncomingResource) -> None:
+        self._incoming = incoming
+
+        self.create = async_to_streamed_response_wrapper(
+            incoming.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            incoming.update,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            incoming.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            incoming.get,
+        )
diff --git a/src/cloudflare/resources/secondary_dns/outgoing/__init__.py b/src/cloudflare/resources/dns/zone_transfers/outgoing/__init__.py
similarity index 100%
rename from src/cloudflare/resources/secondary_dns/outgoing/__init__.py
rename to src/cloudflare/resources/dns/zone_transfers/outgoing/__init__.py
diff --git a/src/cloudflare/resources/dns/zone_transfers/outgoing/outgoing.py b/src/cloudflare/resources/dns/zone_transfers/outgoing/outgoing.py
new file mode 100644
index 00000000000..be827a34571
--- /dev/null
+++ b/src/cloudflare/resources/dns/zone_transfers/outgoing/outgoing.py
@@ -0,0 +1,802 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from .status import (
+    StatusResource,
+    AsyncStatusResource,
+    StatusResourceWithRawResponse,
+    AsyncStatusResourceWithRawResponse,
+    StatusResourceWithStreamingResponse,
+    AsyncStatusResourceWithStreamingResponse,
+)
+from ....._types import Body, Query, Headers, NotGiven, SequenceNotStr, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.dns.zone_transfers import (
+    outgoing_create_params,
+    outgoing_enable_params,
+    outgoing_update_params,
+    outgoing_disable_params,
+    outgoing_force_notify_params,
+)
+from .....types.dns.zone_transfers.enable_transfer import EnableTransfer
+from .....types.dns.zone_transfers.disable_transfer import DisableTransfer
+from .....types.dns.zone_transfers.outgoing_get_response import OutgoingGetResponse
+from .....types.dns.zone_transfers.outgoing_create_response import OutgoingCreateResponse
+from .....types.dns.zone_transfers.outgoing_delete_response import OutgoingDeleteResponse
+from .....types.dns.zone_transfers.outgoing_update_response import OutgoingUpdateResponse
+from .....types.dns.zone_transfers.outgoing_force_notify_response import OutgoingForceNotifyResponse
+
+__all__ = ["OutgoingResource", "AsyncOutgoingResource"]
+
+
+class OutgoingResource(SyncAPIResource):
+    @cached_property
+    def status(self) -> StatusResource:
+        return StatusResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> OutgoingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return OutgoingResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> OutgoingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return OutgoingResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        zone_id: str,
+        name: str,
+        peers: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[OutgoingCreateResponse]:
+        """
+        Create primary zone configuration for outgoing zone transfers.
+
+        Args:
+          name: Zone name.
+
+          peers: A list of peer tags.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/secondary_dns/outgoing",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "peers": peers,
+                },
+                outgoing_create_params.OutgoingCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OutgoingCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[OutgoingCreateResponse]], ResultWrapper[OutgoingCreateResponse]),
+        )
+
+    def update(
+        self,
+        *,
+        zone_id: str,
+        name: str,
+        peers: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[OutgoingUpdateResponse]:
+        """
+        Update primary zone configuration for outgoing zone transfers.
+
+        Args:
+          name: Zone name.
+
+          peers: A list of peer tags.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/secondary_dns/outgoing",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "peers": peers,
+                },
+                outgoing_update_params.OutgoingUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OutgoingUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[OutgoingUpdateResponse]], ResultWrapper[OutgoingUpdateResponse]),
+        )
+
+    def delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[OutgoingDeleteResponse]:
+        """
+        Delete primary zone configuration for outgoing zone transfers.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._delete(
+            f"/zones/{zone_id}/secondary_dns/outgoing",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OutgoingDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[OutgoingDeleteResponse]], ResultWrapper[OutgoingDeleteResponse]),
+        )
+
+    def disable(
+        self,
+        *,
+        zone_id: str,
+        body: object,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Disable outgoing zone transfers for primary zone and clears IXFR backlog of
+        primary zone.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/secondary_dns/outgoing/disable",
+            body=maybe_transform(body, outgoing_disable_params.OutgoingDisableParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DisableTransfer]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+    def enable(
+        self,
+        *,
+        zone_id: str,
+        body: object,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Enable outgoing zone transfers for primary zone.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/secondary_dns/outgoing/enable",
+            body=maybe_transform(body, outgoing_enable_params.OutgoingEnableParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[EnableTransfer]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+    def force_notify(
+        self,
+        *,
+        zone_id: str,
+        body: object,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Notifies the secondary nameserver(s) and clears IXFR backlog of primary zone.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/secondary_dns/outgoing/force_notify",
+            body=maybe_transform(body, outgoing_force_notify_params.OutgoingForceNotifyParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OutgoingForceNotifyResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[OutgoingGetResponse]:
+        """
+        Get primary zone configuration for outgoing zone transfers.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/secondary_dns/outgoing",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OutgoingGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[OutgoingGetResponse]], ResultWrapper[OutgoingGetResponse]),
+        )
+
+
+class AsyncOutgoingResource(AsyncAPIResource):
+    @cached_property
+    def status(self) -> AsyncStatusResource:
+        return AsyncStatusResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncOutgoingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncOutgoingResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncOutgoingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncOutgoingResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        name: str,
+        peers: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[OutgoingCreateResponse]:
+        """
+        Create primary zone configuration for outgoing zone transfers.
+
+        Args:
+          name: Zone name.
+
+          peers: A list of peer tags.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/secondary_dns/outgoing",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "peers": peers,
+                },
+                outgoing_create_params.OutgoingCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OutgoingCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[OutgoingCreateResponse]], ResultWrapper[OutgoingCreateResponse]),
+        )
+
+    async def update(
+        self,
+        *,
+        zone_id: str,
+        name: str,
+        peers: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[OutgoingUpdateResponse]:
+        """
+        Update primary zone configuration for outgoing zone transfers.
+
+        Args:
+          name: Zone name.
+
+          peers: A list of peer tags.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/secondary_dns/outgoing",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "peers": peers,
+                },
+                outgoing_update_params.OutgoingUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OutgoingUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[OutgoingUpdateResponse]], ResultWrapper[OutgoingUpdateResponse]),
+        )
+
+    async def delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[OutgoingDeleteResponse]:
+        """
+        Delete primary zone configuration for outgoing zone transfers.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._delete(
+            f"/zones/{zone_id}/secondary_dns/outgoing",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OutgoingDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[OutgoingDeleteResponse]], ResultWrapper[OutgoingDeleteResponse]),
+        )
+
+    async def disable(
+        self,
+        *,
+        zone_id: str,
+        body: object,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Disable outgoing zone transfers for primary zone and clears IXFR backlog of
+        primary zone.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/secondary_dns/outgoing/disable",
+            body=await async_maybe_transform(body, outgoing_disable_params.OutgoingDisableParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DisableTransfer]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+    async def enable(
+        self,
+        *,
+        zone_id: str,
+        body: object,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Enable outgoing zone transfers for primary zone.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/secondary_dns/outgoing/enable",
+            body=await async_maybe_transform(body, outgoing_enable_params.OutgoingEnableParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[EnableTransfer]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+    async def force_notify(
+        self,
+        *,
+        zone_id: str,
+        body: object,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Notifies the secondary nameserver(s) and clears IXFR backlog of primary zone.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/secondary_dns/outgoing/force_notify",
+            body=await async_maybe_transform(body, outgoing_force_notify_params.OutgoingForceNotifyParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OutgoingForceNotifyResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+    async def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[OutgoingGetResponse]:
+        """
+        Get primary zone configuration for outgoing zone transfers.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/secondary_dns/outgoing",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OutgoingGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[OutgoingGetResponse]], ResultWrapper[OutgoingGetResponse]),
+        )
+
+
+class OutgoingResourceWithRawResponse:
+    def __init__(self, outgoing: OutgoingResource) -> None:
+        self._outgoing = outgoing
+
+        self.create = to_raw_response_wrapper(
+            outgoing.create,
+        )
+        self.update = to_raw_response_wrapper(
+            outgoing.update,
+        )
+        self.delete = to_raw_response_wrapper(
+            outgoing.delete,
+        )
+        self.disable = to_raw_response_wrapper(
+            outgoing.disable,
+        )
+        self.enable = to_raw_response_wrapper(
+            outgoing.enable,
+        )
+        self.force_notify = to_raw_response_wrapper(
+            outgoing.force_notify,
+        )
+        self.get = to_raw_response_wrapper(
+            outgoing.get,
+        )
+
+    @cached_property
+    def status(self) -> StatusResourceWithRawResponse:
+        return StatusResourceWithRawResponse(self._outgoing.status)
+
+
+class AsyncOutgoingResourceWithRawResponse:
+    def __init__(self, outgoing: AsyncOutgoingResource) -> None:
+        self._outgoing = outgoing
+
+        self.create = async_to_raw_response_wrapper(
+            outgoing.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            outgoing.update,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            outgoing.delete,
+        )
+        self.disable = async_to_raw_response_wrapper(
+            outgoing.disable,
+        )
+        self.enable = async_to_raw_response_wrapper(
+            outgoing.enable,
+        )
+        self.force_notify = async_to_raw_response_wrapper(
+            outgoing.force_notify,
+        )
+        self.get = async_to_raw_response_wrapper(
+            outgoing.get,
+        )
+
+    @cached_property
+    def status(self) -> AsyncStatusResourceWithRawResponse:
+        return AsyncStatusResourceWithRawResponse(self._outgoing.status)
+
+
+class OutgoingResourceWithStreamingResponse:
+    def __init__(self, outgoing: OutgoingResource) -> None:
+        self._outgoing = outgoing
+
+        self.create = to_streamed_response_wrapper(
+            outgoing.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            outgoing.update,
+        )
+        self.delete = to_streamed_response_wrapper(
+            outgoing.delete,
+        )
+        self.disable = to_streamed_response_wrapper(
+            outgoing.disable,
+        )
+        self.enable = to_streamed_response_wrapper(
+            outgoing.enable,
+        )
+        self.force_notify = to_streamed_response_wrapper(
+            outgoing.force_notify,
+        )
+        self.get = to_streamed_response_wrapper(
+            outgoing.get,
+        )
+
+    @cached_property
+    def status(self) -> StatusResourceWithStreamingResponse:
+        return StatusResourceWithStreamingResponse(self._outgoing.status)
+
+
+class AsyncOutgoingResourceWithStreamingResponse:
+    def __init__(self, outgoing: AsyncOutgoingResource) -> None:
+        self._outgoing = outgoing
+
+        self.create = async_to_streamed_response_wrapper(
+            outgoing.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            outgoing.update,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            outgoing.delete,
+        )
+        self.disable = async_to_streamed_response_wrapper(
+            outgoing.disable,
+        )
+        self.enable = async_to_streamed_response_wrapper(
+            outgoing.enable,
+        )
+        self.force_notify = async_to_streamed_response_wrapper(
+            outgoing.force_notify,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            outgoing.get,
+        )
+
+    @cached_property
+    def status(self) -> AsyncStatusResourceWithStreamingResponse:
+        return AsyncStatusResourceWithStreamingResponse(self._outgoing.status)
diff --git a/src/cloudflare/resources/dns/zone_transfers/outgoing/status.py b/src/cloudflare/resources/dns/zone_transfers/outgoing/status.py
new file mode 100644
index 00000000000..7fdfddd1406
--- /dev/null
+++ b/src/cloudflare/resources/dns/zone_transfers/outgoing/status.py
@@ -0,0 +1,174 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ....._types import Body, Query, Headers, NotGiven, not_given
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.dns.zone_transfers.enable_transfer import EnableTransfer
+
+__all__ = ["StatusResource", "AsyncStatusResource"]
+
+
+class StatusResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> StatusResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return StatusResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> StatusResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return StatusResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Get primary zone transfer status.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/secondary_dns/outgoing/status",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[EnableTransfer]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class AsyncStatusResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncStatusResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncStatusResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncStatusResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncStatusResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Get primary zone transfer status.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/secondary_dns/outgoing/status",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[EnableTransfer]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class StatusResourceWithRawResponse:
+    def __init__(self, status: StatusResource) -> None:
+        self._status = status
+
+        self.get = to_raw_response_wrapper(
+            status.get,
+        )
+
+
+class AsyncStatusResourceWithRawResponse:
+    def __init__(self, status: AsyncStatusResource) -> None:
+        self._status = status
+
+        self.get = async_to_raw_response_wrapper(
+            status.get,
+        )
+
+
+class StatusResourceWithStreamingResponse:
+    def __init__(self, status: StatusResource) -> None:
+        self._status = status
+
+        self.get = to_streamed_response_wrapper(
+            status.get,
+        )
+
+
+class AsyncStatusResourceWithStreamingResponse:
+    def __init__(self, status: AsyncStatusResource) -> None:
+        self._status = status
+
+        self.get = async_to_streamed_response_wrapper(
+            status.get,
+        )
diff --git a/src/cloudflare/resources/secondary_dns/peers.py b/src/cloudflare/resources/dns/zone_transfers/peers.py
similarity index 87%
rename from src/cloudflare/resources/secondary_dns/peers.py
rename to src/cloudflare/resources/dns/zone_transfers/peers.py
index b8f485bcde8..034156f7433 100644
--- a/src/cloudflare/resources/secondary_dns/peers.py
+++ b/src/cloudflare/resources/dns/zone_transfers/peers.py
@@ -6,25 +6,22 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
     to_raw_response_wrapper,
     to_streamed_response_wrapper,
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._wrappers import ResultWrapper
-from ...pagination import SyncSinglePage, AsyncSinglePage
-from ..._base_client import AsyncPaginator, make_request_options
-from ...types.secondary_dns import peer_create_params, peer_update_params
-from ...types.secondary_dns.peer import Peer
-from ...types.secondary_dns.peer_delete_response import PeerDeleteResponse
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.dns.zone_transfers import peer_create_params, peer_update_params
+from ....types.dns.zone_transfers.peer import Peer
+from ....types.dns.zone_transfers.peer_delete_response import PeerDeleteResponse
 
 __all__ = ["PeersResource", "AsyncPeersResource"]
 
@@ -32,28 +29,41 @@
 class PeersResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PeersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PeersResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PeersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PeersResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        body: object,
+        name: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Peer]:
         """
         Create Peer.
 
         Args:
+          name: The name of the peer.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -66,7 +76,7 @@ def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._post(
             f"/accounts/{account_id}/secondary_dns/peers",
-            body=maybe_transform(body, peer_create_params.PeerCreateParams),
+            body=maybe_transform({"name": name}, peer_create_params.PeerCreateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -83,16 +93,16 @@ def update(
         *,
         account_id: str,
         name: str,
-        ip: str | NotGiven = NOT_GIVEN,
-        ixfr_enable: bool | NotGiven = NOT_GIVEN,
-        port: float | NotGiven = NOT_GIVEN,
-        tsig_id: str | NotGiven = NOT_GIVEN,
+        ip: str | Omit = omit,
+        ixfr_enable: bool | Omit = omit,
+        port: float | Omit = omit,
+        tsig_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Peer]:
         """
         Modify Peer.
@@ -157,7 +167,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Peer]:
         """
         List Peers.
@@ -192,7 +202,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PeerDeleteResponse]:
         """
         Delete Peer.
@@ -232,7 +242,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Peer]:
         """
         Get Peer.
@@ -266,28 +276,41 @@ def get(
 class AsyncPeersResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPeersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPeersResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPeersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPeersResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        body: object,
+        name: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Peer]:
         """
         Create Peer.
 
         Args:
+          name: The name of the peer.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -300,7 +323,7 @@ async def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._post(
             f"/accounts/{account_id}/secondary_dns/peers",
-            body=await async_maybe_transform(body, peer_create_params.PeerCreateParams),
+            body=await async_maybe_transform({"name": name}, peer_create_params.PeerCreateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -317,16 +340,16 @@ async def update(
         *,
         account_id: str,
         name: str,
-        ip: str | NotGiven = NOT_GIVEN,
-        ixfr_enable: bool | NotGiven = NOT_GIVEN,
-        port: float | NotGiven = NOT_GIVEN,
-        tsig_id: str | NotGiven = NOT_GIVEN,
+        ip: str | Omit = omit,
+        ixfr_enable: bool | Omit = omit,
+        port: float | Omit = omit,
+        tsig_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Peer]:
         """
         Modify Peer.
@@ -391,7 +414,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Peer, AsyncSinglePage[Peer]]:
         """
         List Peers.
@@ -426,7 +449,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PeerDeleteResponse]:
         """
         Delete Peer.
@@ -466,7 +489,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Peer]:
         """
         Get Peer.
diff --git a/src/cloudflare/resources/secondary_dns/tsigs.py b/src/cloudflare/resources/dns/zone_transfers/tsigs.py
similarity index 89%
rename from src/cloudflare/resources/secondary_dns/tsigs.py
rename to src/cloudflare/resources/dns/zone_transfers/tsigs.py
index 6b1caa49fe6..8bb678709d2 100644
--- a/src/cloudflare/resources/secondary_dns/tsigs.py
+++ b/src/cloudflare/resources/dns/zone_transfers/tsigs.py
@@ -6,25 +6,22 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
     to_raw_response_wrapper,
     to_streamed_response_wrapper,
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._wrappers import ResultWrapper
-from ...pagination import SyncSinglePage, AsyncSinglePage
-from ..._base_client import AsyncPaginator, make_request_options
-from ...types.secondary_dns import tsig_create_params, tsig_update_params
-from ...types.secondary_dns.tsig import TSIG
-from ...types.secondary_dns.tsig_delete_response import TSIGDeleteResponse
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.dns.zone_transfers import tsig_create_params, tsig_update_params
+from ....types.dns.zone_transfers.tsig import TSIG
+from ....types.dns.zone_transfers.tsig_delete_response import TSIGDeleteResponse
 
 __all__ = ["TSIGsResource", "AsyncTSIGsResource"]
 
@@ -32,10 +29,21 @@
 class TSIGsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TSIGsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TSIGsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TSIGsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TSIGsResourceWithStreamingResponse(self)
 
     def create(
@@ -50,7 +58,7 @@ def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TSIG]:
         """
         Create TSIG.
@@ -105,7 +113,7 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TSIG]:
         """
         Modify TSIG.
@@ -158,7 +166,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[TSIG]:
         """
         List TSIGs.
@@ -193,7 +201,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TSIGDeleteResponse]:
         """
         Delete TSIG.
@@ -233,7 +241,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TSIG]:
         """
         Get TSIG.
@@ -267,10 +275,21 @@ def get(
 class AsyncTSIGsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTSIGsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTSIGsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTSIGsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTSIGsResourceWithStreamingResponse(self)
 
     async def create(
@@ -285,7 +304,7 @@ async def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TSIG]:
         """
         Create TSIG.
@@ -340,7 +359,7 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TSIG]:
         """
         Modify TSIG.
@@ -393,7 +412,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[TSIG, AsyncSinglePage[TSIG]]:
         """
         List TSIGs.
@@ -428,7 +447,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TSIGDeleteResponse]:
         """
         Delete TSIG.
@@ -468,7 +487,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TSIG]:
         """
         Get TSIG.
diff --git a/src/cloudflare/resources/dns/zone_transfers/zone_transfers.py b/src/cloudflare/resources/dns/zone_transfers/zone_transfers.py
new file mode 100644
index 00000000000..fd1d79142b9
--- /dev/null
+++ b/src/cloudflare/resources/dns/zone_transfers/zone_transfers.py
@@ -0,0 +1,262 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .acls import (
+    ACLsResource,
+    AsyncACLsResource,
+    ACLsResourceWithRawResponse,
+    AsyncACLsResourceWithRawResponse,
+    ACLsResourceWithStreamingResponse,
+    AsyncACLsResourceWithStreamingResponse,
+)
+from .peers import (
+    PeersResource,
+    AsyncPeersResource,
+    PeersResourceWithRawResponse,
+    AsyncPeersResourceWithRawResponse,
+    PeersResourceWithStreamingResponse,
+    AsyncPeersResourceWithStreamingResponse,
+)
+from .tsigs import (
+    TSIGsResource,
+    AsyncTSIGsResource,
+    TSIGsResourceWithRawResponse,
+    AsyncTSIGsResourceWithRawResponse,
+    TSIGsResourceWithStreamingResponse,
+    AsyncTSIGsResourceWithStreamingResponse,
+)
+from .incoming import (
+    IncomingResource,
+    AsyncIncomingResource,
+    IncomingResourceWithRawResponse,
+    AsyncIncomingResourceWithRawResponse,
+    IncomingResourceWithStreamingResponse,
+    AsyncIncomingResourceWithStreamingResponse,
+)
+from ...._compat import cached_property
+from .force_axfr import (
+    ForceAXFRResource,
+    AsyncForceAXFRResource,
+    ForceAXFRResourceWithRawResponse,
+    AsyncForceAXFRResourceWithRawResponse,
+    ForceAXFRResourceWithStreamingResponse,
+    AsyncForceAXFRResourceWithStreamingResponse,
+)
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .outgoing.outgoing import (
+    OutgoingResource,
+    AsyncOutgoingResource,
+    OutgoingResourceWithRawResponse,
+    AsyncOutgoingResourceWithRawResponse,
+    OutgoingResourceWithStreamingResponse,
+    AsyncOutgoingResourceWithStreamingResponse,
+)
+
+__all__ = ["ZoneTransfersResource", "AsyncZoneTransfersResource"]
+
+
+class ZoneTransfersResource(SyncAPIResource):
+    @cached_property
+    def force_axfr(self) -> ForceAXFRResource:
+        return ForceAXFRResource(self._client)
+
+    @cached_property
+    def incoming(self) -> IncomingResource:
+        return IncomingResource(self._client)
+
+    @cached_property
+    def outgoing(self) -> OutgoingResource:
+        return OutgoingResource(self._client)
+
+    @cached_property
+    def acls(self) -> ACLsResource:
+        return ACLsResource(self._client)
+
+    @cached_property
+    def peers(self) -> PeersResource:
+        return PeersResource(self._client)
+
+    @cached_property
+    def tsigs(self) -> TSIGsResource:
+        return TSIGsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> ZoneTransfersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ZoneTransfersResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ZoneTransfersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ZoneTransfersResourceWithStreamingResponse(self)
+
+
+class AsyncZoneTransfersResource(AsyncAPIResource):
+    @cached_property
+    def force_axfr(self) -> AsyncForceAXFRResource:
+        return AsyncForceAXFRResource(self._client)
+
+    @cached_property
+    def incoming(self) -> AsyncIncomingResource:
+        return AsyncIncomingResource(self._client)
+
+    @cached_property
+    def outgoing(self) -> AsyncOutgoingResource:
+        return AsyncOutgoingResource(self._client)
+
+    @cached_property
+    def acls(self) -> AsyncACLsResource:
+        return AsyncACLsResource(self._client)
+
+    @cached_property
+    def peers(self) -> AsyncPeersResource:
+        return AsyncPeersResource(self._client)
+
+    @cached_property
+    def tsigs(self) -> AsyncTSIGsResource:
+        return AsyncTSIGsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncZoneTransfersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncZoneTransfersResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncZoneTransfersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncZoneTransfersResourceWithStreamingResponse(self)
+
+
+class ZoneTransfersResourceWithRawResponse:
+    def __init__(self, zone_transfers: ZoneTransfersResource) -> None:
+        self._zone_transfers = zone_transfers
+
+    @cached_property
+    def force_axfr(self) -> ForceAXFRResourceWithRawResponse:
+        return ForceAXFRResourceWithRawResponse(self._zone_transfers.force_axfr)
+
+    @cached_property
+    def incoming(self) -> IncomingResourceWithRawResponse:
+        return IncomingResourceWithRawResponse(self._zone_transfers.incoming)
+
+    @cached_property
+    def outgoing(self) -> OutgoingResourceWithRawResponse:
+        return OutgoingResourceWithRawResponse(self._zone_transfers.outgoing)
+
+    @cached_property
+    def acls(self) -> ACLsResourceWithRawResponse:
+        return ACLsResourceWithRawResponse(self._zone_transfers.acls)
+
+    @cached_property
+    def peers(self) -> PeersResourceWithRawResponse:
+        return PeersResourceWithRawResponse(self._zone_transfers.peers)
+
+    @cached_property
+    def tsigs(self) -> TSIGsResourceWithRawResponse:
+        return TSIGsResourceWithRawResponse(self._zone_transfers.tsigs)
+
+
+class AsyncZoneTransfersResourceWithRawResponse:
+    def __init__(self, zone_transfers: AsyncZoneTransfersResource) -> None:
+        self._zone_transfers = zone_transfers
+
+    @cached_property
+    def force_axfr(self) -> AsyncForceAXFRResourceWithRawResponse:
+        return AsyncForceAXFRResourceWithRawResponse(self._zone_transfers.force_axfr)
+
+    @cached_property
+    def incoming(self) -> AsyncIncomingResourceWithRawResponse:
+        return AsyncIncomingResourceWithRawResponse(self._zone_transfers.incoming)
+
+    @cached_property
+    def outgoing(self) -> AsyncOutgoingResourceWithRawResponse:
+        return AsyncOutgoingResourceWithRawResponse(self._zone_transfers.outgoing)
+
+    @cached_property
+    def acls(self) -> AsyncACLsResourceWithRawResponse:
+        return AsyncACLsResourceWithRawResponse(self._zone_transfers.acls)
+
+    @cached_property
+    def peers(self) -> AsyncPeersResourceWithRawResponse:
+        return AsyncPeersResourceWithRawResponse(self._zone_transfers.peers)
+
+    @cached_property
+    def tsigs(self) -> AsyncTSIGsResourceWithRawResponse:
+        return AsyncTSIGsResourceWithRawResponse(self._zone_transfers.tsigs)
+
+
+class ZoneTransfersResourceWithStreamingResponse:
+    def __init__(self, zone_transfers: ZoneTransfersResource) -> None:
+        self._zone_transfers = zone_transfers
+
+    @cached_property
+    def force_axfr(self) -> ForceAXFRResourceWithStreamingResponse:
+        return ForceAXFRResourceWithStreamingResponse(self._zone_transfers.force_axfr)
+
+    @cached_property
+    def incoming(self) -> IncomingResourceWithStreamingResponse:
+        return IncomingResourceWithStreamingResponse(self._zone_transfers.incoming)
+
+    @cached_property
+    def outgoing(self) -> OutgoingResourceWithStreamingResponse:
+        return OutgoingResourceWithStreamingResponse(self._zone_transfers.outgoing)
+
+    @cached_property
+    def acls(self) -> ACLsResourceWithStreamingResponse:
+        return ACLsResourceWithStreamingResponse(self._zone_transfers.acls)
+
+    @cached_property
+    def peers(self) -> PeersResourceWithStreamingResponse:
+        return PeersResourceWithStreamingResponse(self._zone_transfers.peers)
+
+    @cached_property
+    def tsigs(self) -> TSIGsResourceWithStreamingResponse:
+        return TSIGsResourceWithStreamingResponse(self._zone_transfers.tsigs)
+
+
+class AsyncZoneTransfersResourceWithStreamingResponse:
+    def __init__(self, zone_transfers: AsyncZoneTransfersResource) -> None:
+        self._zone_transfers = zone_transfers
+
+    @cached_property
+    def force_axfr(self) -> AsyncForceAXFRResourceWithStreamingResponse:
+        return AsyncForceAXFRResourceWithStreamingResponse(self._zone_transfers.force_axfr)
+
+    @cached_property
+    def incoming(self) -> AsyncIncomingResourceWithStreamingResponse:
+        return AsyncIncomingResourceWithStreamingResponse(self._zone_transfers.incoming)
+
+    @cached_property
+    def outgoing(self) -> AsyncOutgoingResourceWithStreamingResponse:
+        return AsyncOutgoingResourceWithStreamingResponse(self._zone_transfers.outgoing)
+
+    @cached_property
+    def acls(self) -> AsyncACLsResourceWithStreamingResponse:
+        return AsyncACLsResourceWithStreamingResponse(self._zone_transfers.acls)
+
+    @cached_property
+    def peers(self) -> AsyncPeersResourceWithStreamingResponse:
+        return AsyncPeersResourceWithStreamingResponse(self._zone_transfers.peers)
+
+    @cached_property
+    def tsigs(self) -> AsyncTSIGsResourceWithStreamingResponse:
+        return AsyncTSIGsResourceWithStreamingResponse(self._zone_transfers.tsigs)
diff --git a/src/cloudflare/resources/dns_firewall/__init__.py b/src/cloudflare/resources/dns_firewall/__init__.py
new file mode 100644
index 00000000000..e5a2a706b3a
--- /dev/null
+++ b/src/cloudflare/resources/dns_firewall/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .analytics import (
+    AnalyticsResource,
+    AsyncAnalyticsResource,
+    AnalyticsResourceWithRawResponse,
+    AsyncAnalyticsResourceWithRawResponse,
+    AnalyticsResourceWithStreamingResponse,
+    AsyncAnalyticsResourceWithStreamingResponse,
+)
+from .reverse_dns import (
+    ReverseDNSResource,
+    AsyncReverseDNSResource,
+    ReverseDNSResourceWithRawResponse,
+    AsyncReverseDNSResourceWithRawResponse,
+    ReverseDNSResourceWithStreamingResponse,
+    AsyncReverseDNSResourceWithStreamingResponse,
+)
+from .dns_firewall import (
+    DNSFirewallResource,
+    AsyncDNSFirewallResource,
+    DNSFirewallResourceWithRawResponse,
+    AsyncDNSFirewallResourceWithRawResponse,
+    DNSFirewallResourceWithStreamingResponse,
+    AsyncDNSFirewallResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "AnalyticsResource",
+    "AsyncAnalyticsResource",
+    "AnalyticsResourceWithRawResponse",
+    "AsyncAnalyticsResourceWithRawResponse",
+    "AnalyticsResourceWithStreamingResponse",
+    "AsyncAnalyticsResourceWithStreamingResponse",
+    "ReverseDNSResource",
+    "AsyncReverseDNSResource",
+    "ReverseDNSResourceWithRawResponse",
+    "AsyncReverseDNSResourceWithRawResponse",
+    "ReverseDNSResourceWithStreamingResponse",
+    "AsyncReverseDNSResourceWithStreamingResponse",
+    "DNSFirewallResource",
+    "AsyncDNSFirewallResource",
+    "DNSFirewallResourceWithRawResponse",
+    "AsyncDNSFirewallResourceWithRawResponse",
+    "DNSFirewallResourceWithStreamingResponse",
+    "AsyncDNSFirewallResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/dns/firewall/analytics/__init__.py b/src/cloudflare/resources/dns_firewall/analytics/__init__.py
similarity index 100%
rename from src/cloudflare/resources/dns/firewall/analytics/__init__.py
rename to src/cloudflare/resources/dns_firewall/analytics/__init__.py
diff --git a/src/cloudflare/resources/dns_firewall/analytics/analytics.py b/src/cloudflare/resources/dns_firewall/analytics/analytics.py
new file mode 100644
index 00000000000..87700f33d41
--- /dev/null
+++ b/src/cloudflare/resources/dns_firewall/analytics/analytics.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .reports.reports import (
+    ReportsResource,
+    AsyncReportsResource,
+    ReportsResourceWithRawResponse,
+    AsyncReportsResourceWithRawResponse,
+    ReportsResourceWithStreamingResponse,
+    AsyncReportsResourceWithStreamingResponse,
+)
+
+__all__ = ["AnalyticsResource", "AsyncAnalyticsResource"]
+
+
+class AnalyticsResource(SyncAPIResource):
+    @cached_property
+    def reports(self) -> ReportsResource:
+        return ReportsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AnalyticsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AnalyticsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AnalyticsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AnalyticsResourceWithStreamingResponse(self)
+
+
+class AsyncAnalyticsResource(AsyncAPIResource):
+    @cached_property
+    def reports(self) -> AsyncReportsResource:
+        return AsyncReportsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncAnalyticsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAnalyticsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAnalyticsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAnalyticsResourceWithStreamingResponse(self)
+
+
+class AnalyticsResourceWithRawResponse:
+    def __init__(self, analytics: AnalyticsResource) -> None:
+        self._analytics = analytics
+
+    @cached_property
+    def reports(self) -> ReportsResourceWithRawResponse:
+        return ReportsResourceWithRawResponse(self._analytics.reports)
+
+
+class AsyncAnalyticsResourceWithRawResponse:
+    def __init__(self, analytics: AsyncAnalyticsResource) -> None:
+        self._analytics = analytics
+
+    @cached_property
+    def reports(self) -> AsyncReportsResourceWithRawResponse:
+        return AsyncReportsResourceWithRawResponse(self._analytics.reports)
+
+
+class AnalyticsResourceWithStreamingResponse:
+    def __init__(self, analytics: AnalyticsResource) -> None:
+        self._analytics = analytics
+
+    @cached_property
+    def reports(self) -> ReportsResourceWithStreamingResponse:
+        return ReportsResourceWithStreamingResponse(self._analytics.reports)
+
+
+class AsyncAnalyticsResourceWithStreamingResponse:
+    def __init__(self, analytics: AsyncAnalyticsResource) -> None:
+        self._analytics = analytics
+
+    @cached_property
+    def reports(self) -> AsyncReportsResourceWithStreamingResponse:
+        return AsyncReportsResourceWithStreamingResponse(self._analytics.reports)
diff --git a/src/cloudflare/resources/dns/firewall/analytics/reports/__init__.py b/src/cloudflare/resources/dns_firewall/analytics/reports/__init__.py
similarity index 100%
rename from src/cloudflare/resources/dns/firewall/analytics/reports/__init__.py
rename to src/cloudflare/resources/dns_firewall/analytics/reports/__init__.py
diff --git a/src/cloudflare/resources/dns_firewall/analytics/reports/bytimes.py b/src/cloudflare/resources/dns_firewall/analytics/reports/bytimes.py
new file mode 100644
index 00000000000..ee2e650d980
--- /dev/null
+++ b/src/cloudflare/resources/dns_firewall/analytics/reports/bytimes.py
@@ -0,0 +1,278 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Union, Optional, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.dns.analytics.reports.by_time import ByTime
+from .....types.dns_firewall.analytics.reports import bytime_get_params
+
+__all__ = ["BytimesResource", "AsyncBytimesResource"]
+
+
+class BytimesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> BytimesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return BytimesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> BytimesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return BytimesResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        dns_firewall_id: str,
+        *,
+        account_id: str,
+        dimensions: str | Omit = omit,
+        filters: str | Omit = omit,
+        limit: int | Omit = omit,
+        metrics: str | Omit = omit,
+        since: Union[str, datetime] | Omit = omit,
+        sort: str | Omit = omit,
+        time_delta: Literal["all", "auto", "year", "quarter", "month", "week", "day", "hour", "dekaminute", "minute"]
+        | Omit = omit,
+        until: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ByTime]:
+        """
+        Retrieves a list of aggregate metrics grouped by time interval.
+
+        See
+        [Analytics API properties](https://developers.cloudflare.com/dns/reference/analytics-api-properties/)
+        for detailed information about the available query parameters.
+
+        Args:
+          account_id: Identifier.
+
+          dns_firewall_id: Identifier.
+
+          dimensions: A comma-separated list of dimensions to group results by.
+
+          filters: Segmentation filter in 'attribute operator value' format.
+
+          limit: Limit number of returned metrics.
+
+          metrics: A comma-separated list of metrics to query.
+
+          since: Start date and time of requesting data period in ISO 8601 format.
+
+          sort: A comma-separated list of dimensions to sort by, where each dimension may be
+              prefixed by - (descending) or + (ascending).
+
+          time_delta: Unit of time to group data by.
+
+          until: End date and time of requesting data period in ISO 8601 format.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dns_firewall_id:
+            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}/dns_analytics/report/bytime",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "dimensions": dimensions,
+                        "filters": filters,
+                        "limit": limit,
+                        "metrics": metrics,
+                        "since": since,
+                        "sort": sort,
+                        "time_delta": time_delta,
+                        "until": until,
+                    },
+                    bytime_get_params.BytimeGetParams,
+                ),
+                post_parser=ResultWrapper[Optional[ByTime]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ByTime]], ResultWrapper[ByTime]),
+        )
+
+
+class AsyncBytimesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncBytimesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncBytimesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncBytimesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncBytimesResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        dns_firewall_id: str,
+        *,
+        account_id: str,
+        dimensions: str | Omit = omit,
+        filters: str | Omit = omit,
+        limit: int | Omit = omit,
+        metrics: str | Omit = omit,
+        since: Union[str, datetime] | Omit = omit,
+        sort: str | Omit = omit,
+        time_delta: Literal["all", "auto", "year", "quarter", "month", "week", "day", "hour", "dekaminute", "minute"]
+        | Omit = omit,
+        until: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ByTime]:
+        """
+        Retrieves a list of aggregate metrics grouped by time interval.
+
+        See
+        [Analytics API properties](https://developers.cloudflare.com/dns/reference/analytics-api-properties/)
+        for detailed information about the available query parameters.
+
+        Args:
+          account_id: Identifier.
+
+          dns_firewall_id: Identifier.
+
+          dimensions: A comma-separated list of dimensions to group results by.
+
+          filters: Segmentation filter in 'attribute operator value' format.
+
+          limit: Limit number of returned metrics.
+
+          metrics: A comma-separated list of metrics to query.
+
+          since: Start date and time of requesting data period in ISO 8601 format.
+
+          sort: A comma-separated list of dimensions to sort by, where each dimension may be
+              prefixed by - (descending) or + (ascending).
+
+          time_delta: Unit of time to group data by.
+
+          until: End date and time of requesting data period in ISO 8601 format.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dns_firewall_id:
+            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}/dns_analytics/report/bytime",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "dimensions": dimensions,
+                        "filters": filters,
+                        "limit": limit,
+                        "metrics": metrics,
+                        "since": since,
+                        "sort": sort,
+                        "time_delta": time_delta,
+                        "until": until,
+                    },
+                    bytime_get_params.BytimeGetParams,
+                ),
+                post_parser=ResultWrapper[Optional[ByTime]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ByTime]], ResultWrapper[ByTime]),
+        )
+
+
+class BytimesResourceWithRawResponse:
+    def __init__(self, bytimes: BytimesResource) -> None:
+        self._bytimes = bytimes
+
+        self.get = to_raw_response_wrapper(
+            bytimes.get,
+        )
+
+
+class AsyncBytimesResourceWithRawResponse:
+    def __init__(self, bytimes: AsyncBytimesResource) -> None:
+        self._bytimes = bytimes
+
+        self.get = async_to_raw_response_wrapper(
+            bytimes.get,
+        )
+
+
+class BytimesResourceWithStreamingResponse:
+    def __init__(self, bytimes: BytimesResource) -> None:
+        self._bytimes = bytimes
+
+        self.get = to_streamed_response_wrapper(
+            bytimes.get,
+        )
+
+
+class AsyncBytimesResourceWithStreamingResponse:
+    def __init__(self, bytimes: AsyncBytimesResource) -> None:
+        self._bytimes = bytimes
+
+        self.get = async_to_streamed_response_wrapper(
+            bytimes.get,
+        )
diff --git a/src/cloudflare/resources/dns/firewall/analytics/reports/reports.py b/src/cloudflare/resources/dns_firewall/analytics/reports/reports.py
similarity index 79%
rename from src/cloudflare/resources/dns/firewall/analytics/reports/reports.py
rename to src/cloudflare/resources/dns_firewall/analytics/reports/reports.py
index 387bdb32beb..00c7ccd859b 100644
--- a/src/cloudflare/resources/dns/firewall/analytics/reports/reports.py
+++ b/src/cloudflare/resources/dns_firewall/analytics/reports/reports.py
@@ -15,23 +15,20 @@
     BytimesResourceWithStreamingResponse,
     AsyncBytimesResourceWithStreamingResponse,
 )
-from ......_types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ......_utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ......_compat import cached_property
-from ......_resource import SyncAPIResource, AsyncAPIResource
-from ......_response import (
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
     to_raw_response_wrapper,
     to_streamed_response_wrapper,
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ......_wrappers import ResultWrapper
-from ......_base_client import make_request_options
-from ......types.dns.analytics.report import Report
-from ......types.dns.firewall.analytics import report_get_params
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.dns.analytics.report import Report
+from .....types.dns_firewall.analytics import report_get_params
 
 __all__ = ["ReportsResource", "AsyncReportsResource"]
 
@@ -43,10 +40,21 @@ def bytimes(self) -> BytimesResource:
 
     @cached_property
     def with_raw_response(self) -> ReportsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ReportsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ReportsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ReportsResourceWithStreamingResponse(self)
 
     def get(
@@ -54,19 +62,19 @@ def get(
         dns_firewall_id: str,
         *,
         account_id: str,
-        dimensions: str | NotGiven = NOT_GIVEN,
-        filters: str | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        metrics: str | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        sort: str | NotGiven = NOT_GIVEN,
-        until: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        dimensions: str | Omit = omit,
+        filters: str | Omit = omit,
+        limit: int | Omit = omit,
+        metrics: str | Omit = omit,
+        since: Union[str, datetime] | Omit = omit,
+        sort: str | Omit = omit,
+        until: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Report]:
         """
         Retrieves a list of summarised aggregate metrics over a given time period.
@@ -76,9 +84,9 @@ def get(
         for detailed information about the available query parameters.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          dns_firewall_id: Identifier
+          dns_firewall_id: Identifier.
 
           dimensions: A comma-separated list of dimensions to group results by.
 
@@ -139,10 +147,21 @@ def bytimes(self) -> AsyncBytimesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncReportsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncReportsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncReportsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncReportsResourceWithStreamingResponse(self)
 
     async def get(
@@ -150,19 +169,19 @@ async def get(
         dns_firewall_id: str,
         *,
         account_id: str,
-        dimensions: str | NotGiven = NOT_GIVEN,
-        filters: str | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        metrics: str | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        sort: str | NotGiven = NOT_GIVEN,
-        until: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        dimensions: str | Omit = omit,
+        filters: str | Omit = omit,
+        limit: int | Omit = omit,
+        metrics: str | Omit = omit,
+        since: Union[str, datetime] | Omit = omit,
+        sort: str | Omit = omit,
+        until: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Report]:
         """
         Retrieves a list of summarised aggregate metrics over a given time period.
@@ -172,9 +191,9 @@ async def get(
         for detailed information about the available query parameters.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          dns_firewall_id: Identifier
+          dns_firewall_id: Identifier.
 
           dimensions: A comma-separated list of dimensions to group results by.
 
diff --git a/src/cloudflare/resources/dns_firewall/dns_firewall.py b/src/cloudflare/resources/dns_firewall/dns_firewall.py
new file mode 100644
index 00000000000..4f3c7490cb4
--- /dev/null
+++ b/src/cloudflare/resources/dns_firewall/dns_firewall.py
@@ -0,0 +1,943 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from .reverse_dns import (
+    ReverseDNSResource,
+    AsyncReverseDNSResource,
+    ReverseDNSResourceWithRawResponse,
+    AsyncReverseDNSResourceWithRawResponse,
+    ReverseDNSResourceWithStreamingResponse,
+    AsyncReverseDNSResourceWithStreamingResponse,
+)
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from .analytics.analytics import (
+    AnalyticsResource,
+    AsyncAnalyticsResource,
+    AnalyticsResourceWithRawResponse,
+    AsyncAnalyticsResourceWithRawResponse,
+    AnalyticsResourceWithStreamingResponse,
+    AsyncAnalyticsResourceWithStreamingResponse,
+)
+from ...types.dns_firewall import (
+    dns_firewall_edit_params,
+    dns_firewall_list_params,
+    dns_firewall_create_params,
+)
+from ...types.dns_firewall.upstream_ips import UpstreamIPs
+from ...types.dns_firewall.attack_mitigation_param import AttackMitigationParam
+from ...types.dns_firewall.dns_firewall_get_response import DNSFirewallGetResponse
+from ...types.dns_firewall.dns_firewall_edit_response import DNSFirewallEditResponse
+from ...types.dns_firewall.dns_firewall_list_response import DNSFirewallListResponse
+from ...types.dns_firewall.dns_firewall_create_response import DNSFirewallCreateResponse
+from ...types.dns_firewall.dns_firewall_delete_response import DNSFirewallDeleteResponse
+
+__all__ = ["DNSFirewallResource", "AsyncDNSFirewallResource"]
+
+
+class DNSFirewallResource(SyncAPIResource):
+    @cached_property
+    def analytics(self) -> AnalyticsResource:
+        return AnalyticsResource(self._client)
+
+    @cached_property
+    def reverse_dns(self) -> ReverseDNSResource:
+        return ReverseDNSResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> DNSFirewallResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return DNSFirewallResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> DNSFirewallResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return DNSFirewallResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        upstream_ips: SequenceNotStr[UpstreamIPs],
+        attack_mitigation: Optional[AttackMitigationParam] | Omit = omit,
+        deprecate_any_requests: bool | Omit = omit,
+        ecs_fallback: bool | Omit = omit,
+        maximum_cache_ttl: float | Omit = omit,
+        minimum_cache_ttl: float | Omit = omit,
+        negative_cache_ttl: Optional[float] | Omit = omit,
+        ratelimit: Optional[float] | Omit = omit,
+        retries: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DNSFirewallCreateResponse]:
+        """
+        Create a DNS Firewall cluster
+
+        Args:
+          account_id: Identifier.
+
+          name: DNS Firewall cluster name
+
+          attack_mitigation: Attack mitigation settings
+
+          deprecate_any_requests: Whether to refuse to answer queries for the ANY type
+
+          ecs_fallback: Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent
+
+          maximum_cache_ttl: By default, Cloudflare attempts to cache responses for as long as indicated by
+              the TTL received from upstream nameservers. This setting sets an upper bound on
+              this duration. For caching purposes, higher TTLs will be decreased to the
+              maximum value defined by this setting.
+
+              This setting does not affect the TTL value in the DNS response Cloudflare
+              returns to clients. Cloudflare will always forward the TTL value received from
+              upstream nameservers.
+
+          minimum_cache_ttl: By default, Cloudflare attempts to cache responses for as long as indicated by
+              the TTL received from upstream nameservers. This setting sets a lower bound on
+              this duration. For caching purposes, lower TTLs will be increased to the minimum
+              value defined by this setting.
+
+              This setting does not affect the TTL value in the DNS response Cloudflare
+              returns to clients. Cloudflare will always forward the TTL value received from
+              upstream nameservers.
+
+              Note that, even with this setting, there is no guarantee that a response will be
+              cached for at least the specified duration. Cached responses may be removed
+              earlier for capacity or other operational reasons.
+
+          negative_cache_ttl: This setting controls how long DNS Firewall should cache negative responses
+              (e.g., NXDOMAIN) from the upstream servers.
+
+              This setting does not affect the TTL value in the DNS response Cloudflare
+              returns to clients. Cloudflare will always forward the TTL value received from
+              upstream nameservers.
+
+          ratelimit: Ratelimit in queries per second per datacenter (applies to DNS queries sent to
+              the upstream nameservers configured on the cluster)
+
+          retries: Number of retries for fetching DNS responses from upstream nameservers (not
+              counting the initial attempt)
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/dns_firewall",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "upstream_ips": upstream_ips,
+                    "attack_mitigation": attack_mitigation,
+                    "deprecate_any_requests": deprecate_any_requests,
+                    "ecs_fallback": ecs_fallback,
+                    "maximum_cache_ttl": maximum_cache_ttl,
+                    "minimum_cache_ttl": minimum_cache_ttl,
+                    "negative_cache_ttl": negative_cache_ttl,
+                    "ratelimit": ratelimit,
+                    "retries": retries,
+                },
+                dns_firewall_create_params.DNSFirewallCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DNSFirewallCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DNSFirewallCreateResponse]], ResultWrapper[DNSFirewallCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[DNSFirewallListResponse]:
+        """
+        List DNS Firewall clusters for an account
+
+        Args:
+          account_id: Identifier.
+
+          page: Page number of paginated results
+
+          per_page: Number of clusters per page
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dns_firewall",
+            page=SyncV4PagePaginationArray[DNSFirewallListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    dns_firewall_list_params.DNSFirewallListParams,
+                ),
+            ),
+            model=DNSFirewallListResponse,
+        )
+
+    def delete(
+        self,
+        dns_firewall_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DNSFirewallDeleteResponse]:
+        """
+        Delete a DNS Firewall cluster
+
+        Args:
+          account_id: Identifier.
+
+          dns_firewall_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dns_firewall_id:
+            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DNSFirewallDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DNSFirewallDeleteResponse]], ResultWrapper[DNSFirewallDeleteResponse]),
+        )
+
+    def edit(
+        self,
+        dns_firewall_id: str,
+        *,
+        account_id: str,
+        attack_mitigation: Optional[AttackMitigationParam] | Omit = omit,
+        deprecate_any_requests: bool | Omit = omit,
+        ecs_fallback: bool | Omit = omit,
+        maximum_cache_ttl: float | Omit = omit,
+        minimum_cache_ttl: float | Omit = omit,
+        name: str | Omit = omit,
+        negative_cache_ttl: Optional[float] | Omit = omit,
+        ratelimit: Optional[float] | Omit = omit,
+        retries: float | Omit = omit,
+        upstream_ips: SequenceNotStr[UpstreamIPs] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DNSFirewallEditResponse]:
+        """
+        Modify the configuration of a DNS Firewall cluster
+
+        Args:
+          account_id: Identifier.
+
+          dns_firewall_id: Identifier.
+
+          attack_mitigation: Attack mitigation settings
+
+          deprecate_any_requests: Whether to refuse to answer queries for the ANY type
+
+          ecs_fallback: Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent
+
+          maximum_cache_ttl: By default, Cloudflare attempts to cache responses for as long as indicated by
+              the TTL received from upstream nameservers. This setting sets an upper bound on
+              this duration. For caching purposes, higher TTLs will be decreased to the
+              maximum value defined by this setting.
+
+              This setting does not affect the TTL value in the DNS response Cloudflare
+              returns to clients. Cloudflare will always forward the TTL value received from
+              upstream nameservers.
+
+          minimum_cache_ttl: By default, Cloudflare attempts to cache responses for as long as indicated by
+              the TTL received from upstream nameservers. This setting sets a lower bound on
+              this duration. For caching purposes, lower TTLs will be increased to the minimum
+              value defined by this setting.
+
+              This setting does not affect the TTL value in the DNS response Cloudflare
+              returns to clients. Cloudflare will always forward the TTL value received from
+              upstream nameservers.
+
+              Note that, even with this setting, there is no guarantee that a response will be
+              cached for at least the specified duration. Cached responses may be removed
+              earlier for capacity or other operational reasons.
+
+          name: DNS Firewall cluster name
+
+          negative_cache_ttl: This setting controls how long DNS Firewall should cache negative responses
+              (e.g., NXDOMAIN) from the upstream servers.
+
+              This setting does not affect the TTL value in the DNS response Cloudflare
+              returns to clients. Cloudflare will always forward the TTL value received from
+              upstream nameservers.
+
+          ratelimit: Ratelimit in queries per second per datacenter (applies to DNS queries sent to
+              the upstream nameservers configured on the cluster)
+
+          retries: Number of retries for fetching DNS responses from upstream nameservers (not
+              counting the initial attempt)
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dns_firewall_id:
+            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}",
+            body=maybe_transform(
+                {
+                    "attack_mitigation": attack_mitigation,
+                    "deprecate_any_requests": deprecate_any_requests,
+                    "ecs_fallback": ecs_fallback,
+                    "maximum_cache_ttl": maximum_cache_ttl,
+                    "minimum_cache_ttl": minimum_cache_ttl,
+                    "name": name,
+                    "negative_cache_ttl": negative_cache_ttl,
+                    "ratelimit": ratelimit,
+                    "retries": retries,
+                    "upstream_ips": upstream_ips,
+                },
+                dns_firewall_edit_params.DNSFirewallEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DNSFirewallEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DNSFirewallEditResponse]], ResultWrapper[DNSFirewallEditResponse]),
+        )
+
+    def get(
+        self,
+        dns_firewall_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DNSFirewallGetResponse]:
+        """
+        Show a single DNS Firewall cluster for an account
+
+        Args:
+          account_id: Identifier.
+
+          dns_firewall_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dns_firewall_id:
+            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DNSFirewallGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DNSFirewallGetResponse]], ResultWrapper[DNSFirewallGetResponse]),
+        )
+
+
+class AsyncDNSFirewallResource(AsyncAPIResource):
+    @cached_property
+    def analytics(self) -> AsyncAnalyticsResource:
+        return AsyncAnalyticsResource(self._client)
+
+    @cached_property
+    def reverse_dns(self) -> AsyncReverseDNSResource:
+        return AsyncReverseDNSResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncDNSFirewallResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncDNSFirewallResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncDNSFirewallResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncDNSFirewallResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        upstream_ips: SequenceNotStr[UpstreamIPs],
+        attack_mitigation: Optional[AttackMitigationParam] | Omit = omit,
+        deprecate_any_requests: bool | Omit = omit,
+        ecs_fallback: bool | Omit = omit,
+        maximum_cache_ttl: float | Omit = omit,
+        minimum_cache_ttl: float | Omit = omit,
+        negative_cache_ttl: Optional[float] | Omit = omit,
+        ratelimit: Optional[float] | Omit = omit,
+        retries: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DNSFirewallCreateResponse]:
+        """
+        Create a DNS Firewall cluster
+
+        Args:
+          account_id: Identifier.
+
+          name: DNS Firewall cluster name
+
+          attack_mitigation: Attack mitigation settings
+
+          deprecate_any_requests: Whether to refuse to answer queries for the ANY type
+
+          ecs_fallback: Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent
+
+          maximum_cache_ttl: By default, Cloudflare attempts to cache responses for as long as indicated by
+              the TTL received from upstream nameservers. This setting sets an upper bound on
+              this duration. For caching purposes, higher TTLs will be decreased to the
+              maximum value defined by this setting.
+
+              This setting does not affect the TTL value in the DNS response Cloudflare
+              returns to clients. Cloudflare will always forward the TTL value received from
+              upstream nameservers.
+
+          minimum_cache_ttl: By default, Cloudflare attempts to cache responses for as long as indicated by
+              the TTL received from upstream nameservers. This setting sets a lower bound on
+              this duration. For caching purposes, lower TTLs will be increased to the minimum
+              value defined by this setting.
+
+              This setting does not affect the TTL value in the DNS response Cloudflare
+              returns to clients. Cloudflare will always forward the TTL value received from
+              upstream nameservers.
+
+              Note that, even with this setting, there is no guarantee that a response will be
+              cached for at least the specified duration. Cached responses may be removed
+              earlier for capacity or other operational reasons.
+
+          negative_cache_ttl: This setting controls how long DNS Firewall should cache negative responses
+              (e.g., NXDOMAIN) from the upstream servers.
+
+              This setting does not affect the TTL value in the DNS response Cloudflare
+              returns to clients. Cloudflare will always forward the TTL value received from
+              upstream nameservers.
+
+          ratelimit: Ratelimit in queries per second per datacenter (applies to DNS queries sent to
+              the upstream nameservers configured on the cluster)
+
+          retries: Number of retries for fetching DNS responses from upstream nameservers (not
+              counting the initial attempt)
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/dns_firewall",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "upstream_ips": upstream_ips,
+                    "attack_mitigation": attack_mitigation,
+                    "deprecate_any_requests": deprecate_any_requests,
+                    "ecs_fallback": ecs_fallback,
+                    "maximum_cache_ttl": maximum_cache_ttl,
+                    "minimum_cache_ttl": minimum_cache_ttl,
+                    "negative_cache_ttl": negative_cache_ttl,
+                    "ratelimit": ratelimit,
+                    "retries": retries,
+                },
+                dns_firewall_create_params.DNSFirewallCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DNSFirewallCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DNSFirewallCreateResponse]], ResultWrapper[DNSFirewallCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[DNSFirewallListResponse, AsyncV4PagePaginationArray[DNSFirewallListResponse]]:
+        """
+        List DNS Firewall clusters for an account
+
+        Args:
+          account_id: Identifier.
+
+          page: Page number of paginated results
+
+          per_page: Number of clusters per page
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dns_firewall",
+            page=AsyncV4PagePaginationArray[DNSFirewallListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    dns_firewall_list_params.DNSFirewallListParams,
+                ),
+            ),
+            model=DNSFirewallListResponse,
+        )
+
+    async def delete(
+        self,
+        dns_firewall_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DNSFirewallDeleteResponse]:
+        """
+        Delete a DNS Firewall cluster
+
+        Args:
+          account_id: Identifier.
+
+          dns_firewall_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dns_firewall_id:
+            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DNSFirewallDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DNSFirewallDeleteResponse]], ResultWrapper[DNSFirewallDeleteResponse]),
+        )
+
+    async def edit(
+        self,
+        dns_firewall_id: str,
+        *,
+        account_id: str,
+        attack_mitigation: Optional[AttackMitigationParam] | Omit = omit,
+        deprecate_any_requests: bool | Omit = omit,
+        ecs_fallback: bool | Omit = omit,
+        maximum_cache_ttl: float | Omit = omit,
+        minimum_cache_ttl: float | Omit = omit,
+        name: str | Omit = omit,
+        negative_cache_ttl: Optional[float] | Omit = omit,
+        ratelimit: Optional[float] | Omit = omit,
+        retries: float | Omit = omit,
+        upstream_ips: SequenceNotStr[UpstreamIPs] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DNSFirewallEditResponse]:
+        """
+        Modify the configuration of a DNS Firewall cluster
+
+        Args:
+          account_id: Identifier.
+
+          dns_firewall_id: Identifier.
+
+          attack_mitigation: Attack mitigation settings
+
+          deprecate_any_requests: Whether to refuse to answer queries for the ANY type
+
+          ecs_fallback: Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent
+
+          maximum_cache_ttl: By default, Cloudflare attempts to cache responses for as long as indicated by
+              the TTL received from upstream nameservers. This setting sets an upper bound on
+              this duration. For caching purposes, higher TTLs will be decreased to the
+              maximum value defined by this setting.
+
+              This setting does not affect the TTL value in the DNS response Cloudflare
+              returns to clients. Cloudflare will always forward the TTL value received from
+              upstream nameservers.
+
+          minimum_cache_ttl: By default, Cloudflare attempts to cache responses for as long as indicated by
+              the TTL received from upstream nameservers. This setting sets a lower bound on
+              this duration. For caching purposes, lower TTLs will be increased to the minimum
+              value defined by this setting.
+
+              This setting does not affect the TTL value in the DNS response Cloudflare
+              returns to clients. Cloudflare will always forward the TTL value received from
+              upstream nameservers.
+
+              Note that, even with this setting, there is no guarantee that a response will be
+              cached for at least the specified duration. Cached responses may be removed
+              earlier for capacity or other operational reasons.
+
+          name: DNS Firewall cluster name
+
+          negative_cache_ttl: This setting controls how long DNS Firewall should cache negative responses
+              (e.g., NXDOMAIN) from the upstream servers.
+
+              This setting does not affect the TTL value in the DNS response Cloudflare
+              returns to clients. Cloudflare will always forward the TTL value received from
+              upstream nameservers.
+
+          ratelimit: Ratelimit in queries per second per datacenter (applies to DNS queries sent to
+              the upstream nameservers configured on the cluster)
+
+          retries: Number of retries for fetching DNS responses from upstream nameservers (not
+              counting the initial attempt)
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dns_firewall_id:
+            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}",
+            body=await async_maybe_transform(
+                {
+                    "attack_mitigation": attack_mitigation,
+                    "deprecate_any_requests": deprecate_any_requests,
+                    "ecs_fallback": ecs_fallback,
+                    "maximum_cache_ttl": maximum_cache_ttl,
+                    "minimum_cache_ttl": minimum_cache_ttl,
+                    "name": name,
+                    "negative_cache_ttl": negative_cache_ttl,
+                    "ratelimit": ratelimit,
+                    "retries": retries,
+                    "upstream_ips": upstream_ips,
+                },
+                dns_firewall_edit_params.DNSFirewallEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DNSFirewallEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DNSFirewallEditResponse]], ResultWrapper[DNSFirewallEditResponse]),
+        )
+
+    async def get(
+        self,
+        dns_firewall_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DNSFirewallGetResponse]:
+        """
+        Show a single DNS Firewall cluster for an account
+
+        Args:
+          account_id: Identifier.
+
+          dns_firewall_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dns_firewall_id:
+            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DNSFirewallGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DNSFirewallGetResponse]], ResultWrapper[DNSFirewallGetResponse]),
+        )
+
+
+class DNSFirewallResourceWithRawResponse:
+    def __init__(self, dns_firewall: DNSFirewallResource) -> None:
+        self._dns_firewall = dns_firewall
+
+        self.create = to_raw_response_wrapper(
+            dns_firewall.create,
+        )
+        self.list = to_raw_response_wrapper(
+            dns_firewall.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            dns_firewall.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            dns_firewall.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            dns_firewall.get,
+        )
+
+    @cached_property
+    def analytics(self) -> AnalyticsResourceWithRawResponse:
+        return AnalyticsResourceWithRawResponse(self._dns_firewall.analytics)
+
+    @cached_property
+    def reverse_dns(self) -> ReverseDNSResourceWithRawResponse:
+        return ReverseDNSResourceWithRawResponse(self._dns_firewall.reverse_dns)
+
+
+class AsyncDNSFirewallResourceWithRawResponse:
+    def __init__(self, dns_firewall: AsyncDNSFirewallResource) -> None:
+        self._dns_firewall = dns_firewall
+
+        self.create = async_to_raw_response_wrapper(
+            dns_firewall.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            dns_firewall.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            dns_firewall.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            dns_firewall.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            dns_firewall.get,
+        )
+
+    @cached_property
+    def analytics(self) -> AsyncAnalyticsResourceWithRawResponse:
+        return AsyncAnalyticsResourceWithRawResponse(self._dns_firewall.analytics)
+
+    @cached_property
+    def reverse_dns(self) -> AsyncReverseDNSResourceWithRawResponse:
+        return AsyncReverseDNSResourceWithRawResponse(self._dns_firewall.reverse_dns)
+
+
+class DNSFirewallResourceWithStreamingResponse:
+    def __init__(self, dns_firewall: DNSFirewallResource) -> None:
+        self._dns_firewall = dns_firewall
+
+        self.create = to_streamed_response_wrapper(
+            dns_firewall.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            dns_firewall.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            dns_firewall.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            dns_firewall.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            dns_firewall.get,
+        )
+
+    @cached_property
+    def analytics(self) -> AnalyticsResourceWithStreamingResponse:
+        return AnalyticsResourceWithStreamingResponse(self._dns_firewall.analytics)
+
+    @cached_property
+    def reverse_dns(self) -> ReverseDNSResourceWithStreamingResponse:
+        return ReverseDNSResourceWithStreamingResponse(self._dns_firewall.reverse_dns)
+
+
+class AsyncDNSFirewallResourceWithStreamingResponse:
+    def __init__(self, dns_firewall: AsyncDNSFirewallResource) -> None:
+        self._dns_firewall = dns_firewall
+
+        self.create = async_to_streamed_response_wrapper(
+            dns_firewall.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            dns_firewall.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            dns_firewall.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            dns_firewall.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            dns_firewall.get,
+        )
+
+    @cached_property
+    def analytics(self) -> AsyncAnalyticsResourceWithStreamingResponse:
+        return AsyncAnalyticsResourceWithStreamingResponse(self._dns_firewall.analytics)
+
+    @cached_property
+    def reverse_dns(self) -> AsyncReverseDNSResourceWithStreamingResponse:
+        return AsyncReverseDNSResourceWithStreamingResponse(self._dns_firewall.reverse_dns)
diff --git a/src/cloudflare/resources/dns_firewall/reverse_dns.py b/src/cloudflare/resources/dns_firewall/reverse_dns.py
new file mode 100644
index 00000000000..bb4a2db63b0
--- /dev/null
+++ b/src/cloudflare/resources/dns_firewall/reverse_dns.py
@@ -0,0 +1,299 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Type, Optional, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.dns_firewall import reverse_dns_edit_params
+from ...types.dns_firewall.reverse_dns_get_response import ReverseDNSGetResponse
+from ...types.dns_firewall.reverse_dns_edit_response import ReverseDNSEditResponse
+
+__all__ = ["ReverseDNSResource", "AsyncReverseDNSResource"]
+
+
+class ReverseDNSResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ReverseDNSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ReverseDNSResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ReverseDNSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ReverseDNSResourceWithStreamingResponse(self)
+
+    def edit(
+        self,
+        dns_firewall_id: str,
+        *,
+        account_id: str,
+        ptr: Dict[str, str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ReverseDNSEditResponse]:
+        """
+        Update reverse DNS configuration (PTR records) for a DNS Firewall cluster
+
+        Args:
+          account_id: Identifier.
+
+          dns_firewall_id: Identifier.
+
+          ptr: Map of cluster IP addresses to PTR record contents
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dns_firewall_id:
+            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}/reverse_dns",
+            body=maybe_transform({"ptr": ptr}, reverse_dns_edit_params.ReverseDNSEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ReverseDNSEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ReverseDNSEditResponse]], ResultWrapper[ReverseDNSEditResponse]),
+        )
+
+    def get(
+        self,
+        dns_firewall_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ReverseDNSGetResponse]:
+        """
+        Show reverse DNS configuration (PTR records) for a DNS Firewall cluster
+
+        Args:
+          account_id: Identifier.
+
+          dns_firewall_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dns_firewall_id:
+            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}/reverse_dns",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ReverseDNSGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ReverseDNSGetResponse]], ResultWrapper[ReverseDNSGetResponse]),
+        )
+
+
+class AsyncReverseDNSResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncReverseDNSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncReverseDNSResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncReverseDNSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncReverseDNSResourceWithStreamingResponse(self)
+
+    async def edit(
+        self,
+        dns_firewall_id: str,
+        *,
+        account_id: str,
+        ptr: Dict[str, str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ReverseDNSEditResponse]:
+        """
+        Update reverse DNS configuration (PTR records) for a DNS Firewall cluster
+
+        Args:
+          account_id: Identifier.
+
+          dns_firewall_id: Identifier.
+
+          ptr: Map of cluster IP addresses to PTR record contents
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dns_firewall_id:
+            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}/reverse_dns",
+            body=await async_maybe_transform({"ptr": ptr}, reverse_dns_edit_params.ReverseDNSEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ReverseDNSEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ReverseDNSEditResponse]], ResultWrapper[ReverseDNSEditResponse]),
+        )
+
+    async def get(
+        self,
+        dns_firewall_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ReverseDNSGetResponse]:
+        """
+        Show reverse DNS configuration (PTR records) for a DNS Firewall cluster
+
+        Args:
+          account_id: Identifier.
+
+          dns_firewall_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dns_firewall_id:
+            raise ValueError(f"Expected a non-empty value for `dns_firewall_id` but received {dns_firewall_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/dns_firewall/{dns_firewall_id}/reverse_dns",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ReverseDNSGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ReverseDNSGetResponse]], ResultWrapper[ReverseDNSGetResponse]),
+        )
+
+
+class ReverseDNSResourceWithRawResponse:
+    def __init__(self, reverse_dns: ReverseDNSResource) -> None:
+        self._reverse_dns = reverse_dns
+
+        self.edit = to_raw_response_wrapper(
+            reverse_dns.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            reverse_dns.get,
+        )
+
+
+class AsyncReverseDNSResourceWithRawResponse:
+    def __init__(self, reverse_dns: AsyncReverseDNSResource) -> None:
+        self._reverse_dns = reverse_dns
+
+        self.edit = async_to_raw_response_wrapper(
+            reverse_dns.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            reverse_dns.get,
+        )
+
+
+class ReverseDNSResourceWithStreamingResponse:
+    def __init__(self, reverse_dns: ReverseDNSResource) -> None:
+        self._reverse_dns = reverse_dns
+
+        self.edit = to_streamed_response_wrapper(
+            reverse_dns.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            reverse_dns.get,
+        )
+
+
+class AsyncReverseDNSResourceWithStreamingResponse:
+    def __init__(self, reverse_dns: AsyncReverseDNSResource) -> None:
+        self._reverse_dns = reverse_dns
+
+        self.edit = async_to_streamed_response_wrapper(
+            reverse_dns.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            reverse_dns.get,
+        )
diff --git a/src/cloudflare/resources/dnssec.py b/src/cloudflare/resources/dnssec.py
deleted file mode 100644
index 577e7edfcf0..00000000000
--- a/src/cloudflare/resources/dnssec.py
+++ /dev/null
@@ -1,413 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Any, Type, Optional, cast
-from typing_extensions import Literal
-
-import httpx
-
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from .._compat import cached_property
-from .._resource import SyncAPIResource, AsyncAPIResource
-from .._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from .._wrappers import ResultWrapper
-from .._base_client import make_request_options
-from ..types.dnssec import dnssec_edit_params
-from ..types.dnssec.dnssec import DNSSEC
-from ..types.dnssec.dnssec_delete_response import DNSSECDeleteResponse
-
-__all__ = ["DNSSECResource", "AsyncDNSSECResource"]
-
-
-class DNSSECResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> DNSSECResourceWithRawResponse:
-        return DNSSECResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> DNSSECResourceWithStreamingResponse:
-        return DNSSECResourceWithStreamingResponse(self)
-
-    def delete(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DNSSECDeleteResponse]:
-        """
-        Delete DNSSEC.
-
-        Args:
-          zone_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            Optional[DNSSECDeleteResponse],
-            self._delete(
-                f"/zones/{zone_id}/dnssec",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[DNSSECDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DNSSECDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    def edit(
-        self,
-        *,
-        zone_id: str,
-        dnssec_multi_signer: bool | NotGiven = NOT_GIVEN,
-        dnssec_presigned: bool | NotGiven = NOT_GIVEN,
-        status: Literal["active", "disabled"] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DNSSEC]:
-        """
-        Enable or disable DNSSEC.
-
-        Args:
-          zone_id: Identifier
-
-          dnssec_multi_signer: If true, multi-signer DNSSEC is enabled on the zone, allowing multiple providers
-              to serve a DNSSEC-signed zone at the same time. This is required for DNSKEY
-              records (except those automatically generated by Cloudflare) to be added to the
-              zone.
-
-              See
-              [Multi-signer DNSSEC](https://developers.cloudflare.com/dns/dnssec/multi-signer-dnssec/)
-              for details.
-
-          dnssec_presigned: If true, allows Cloudflare to transfer in a DNSSEC-signed zone including
-              signatures from an external provider, without requiring Cloudflare to sign any
-              records on the fly.
-
-              Note that this feature has some limitations. See
-              [Cloudflare as Secondary](https://developers.cloudflare.com/dns/zone-setups/zone-transfers/cloudflare-as-secondary/setup/#dnssec)
-              for details.
-
-          status: Status of DNSSEC, based on user-desired state and presence of necessary records.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._patch(
-            f"/zones/{zone_id}/dnssec",
-            body=maybe_transform(
-                {
-                    "dnssec_multi_signer": dnssec_multi_signer,
-                    "dnssec_presigned": dnssec_presigned,
-                    "status": status,
-                },
-                dnssec_edit_params.DNSSECEditParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[DNSSEC]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[DNSSEC]], ResultWrapper[DNSSEC]),
-        )
-
-    def get(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DNSSEC]:
-        """
-        Details about DNSSEC status and configuration.
-
-        Args:
-          zone_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._get(
-            f"/zones/{zone_id}/dnssec",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[DNSSEC]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[DNSSEC]], ResultWrapper[DNSSEC]),
-        )
-
-
-class AsyncDNSSECResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncDNSSECResourceWithRawResponse:
-        return AsyncDNSSECResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncDNSSECResourceWithStreamingResponse:
-        return AsyncDNSSECResourceWithStreamingResponse(self)
-
-    async def delete(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DNSSECDeleteResponse]:
-        """
-        Delete DNSSEC.
-
-        Args:
-          zone_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            Optional[DNSSECDeleteResponse],
-            await self._delete(
-                f"/zones/{zone_id}/dnssec",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[DNSSECDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DNSSECDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    async def edit(
-        self,
-        *,
-        zone_id: str,
-        dnssec_multi_signer: bool | NotGiven = NOT_GIVEN,
-        dnssec_presigned: bool | NotGiven = NOT_GIVEN,
-        status: Literal["active", "disabled"] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DNSSEC]:
-        """
-        Enable or disable DNSSEC.
-
-        Args:
-          zone_id: Identifier
-
-          dnssec_multi_signer: If true, multi-signer DNSSEC is enabled on the zone, allowing multiple providers
-              to serve a DNSSEC-signed zone at the same time. This is required for DNSKEY
-              records (except those automatically generated by Cloudflare) to be added to the
-              zone.
-
-              See
-              [Multi-signer DNSSEC](https://developers.cloudflare.com/dns/dnssec/multi-signer-dnssec/)
-              for details.
-
-          dnssec_presigned: If true, allows Cloudflare to transfer in a DNSSEC-signed zone including
-              signatures from an external provider, without requiring Cloudflare to sign any
-              records on the fly.
-
-              Note that this feature has some limitations. See
-              [Cloudflare as Secondary](https://developers.cloudflare.com/dns/zone-setups/zone-transfers/cloudflare-as-secondary/setup/#dnssec)
-              for details.
-
-          status: Status of DNSSEC, based on user-desired state and presence of necessary records.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._patch(
-            f"/zones/{zone_id}/dnssec",
-            body=await async_maybe_transform(
-                {
-                    "dnssec_multi_signer": dnssec_multi_signer,
-                    "dnssec_presigned": dnssec_presigned,
-                    "status": status,
-                },
-                dnssec_edit_params.DNSSECEditParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[DNSSEC]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[DNSSEC]], ResultWrapper[DNSSEC]),
-        )
-
-    async def get(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DNSSEC]:
-        """
-        Details about DNSSEC status and configuration.
-
-        Args:
-          zone_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._get(
-            f"/zones/{zone_id}/dnssec",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[DNSSEC]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[DNSSEC]], ResultWrapper[DNSSEC]),
-        )
-
-
-class DNSSECResourceWithRawResponse:
-    def __init__(self, dnssec: DNSSECResource) -> None:
-        self._dnssec = dnssec
-
-        self.delete = to_raw_response_wrapper(
-            dnssec.delete,
-        )
-        self.edit = to_raw_response_wrapper(
-            dnssec.edit,
-        )
-        self.get = to_raw_response_wrapper(
-            dnssec.get,
-        )
-
-
-class AsyncDNSSECResourceWithRawResponse:
-    def __init__(self, dnssec: AsyncDNSSECResource) -> None:
-        self._dnssec = dnssec
-
-        self.delete = async_to_raw_response_wrapper(
-            dnssec.delete,
-        )
-        self.edit = async_to_raw_response_wrapper(
-            dnssec.edit,
-        )
-        self.get = async_to_raw_response_wrapper(
-            dnssec.get,
-        )
-
-
-class DNSSECResourceWithStreamingResponse:
-    def __init__(self, dnssec: DNSSECResource) -> None:
-        self._dnssec = dnssec
-
-        self.delete = to_streamed_response_wrapper(
-            dnssec.delete,
-        )
-        self.edit = to_streamed_response_wrapper(
-            dnssec.edit,
-        )
-        self.get = to_streamed_response_wrapper(
-            dnssec.get,
-        )
-
-
-class AsyncDNSSECResourceWithStreamingResponse:
-    def __init__(self, dnssec: AsyncDNSSECResource) -> None:
-        self._dnssec = dnssec
-
-        self.delete = async_to_streamed_response_wrapper(
-            dnssec.delete,
-        )
-        self.edit = async_to_streamed_response_wrapper(
-            dnssec.edit,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            dnssec.get,
-        )
diff --git a/src/cloudflare/resources/durable_objects/durable_objects.py b/src/cloudflare/resources/durable_objects/durable_objects.py
index 97f13cd09ec..51d31f138e1 100644
--- a/src/cloudflare/resources/durable_objects/durable_objects.py
+++ b/src/cloudflare/resources/durable_objects/durable_objects.py
@@ -3,7 +3,8 @@
 from __future__ import annotations
 
 from ..._compat import cached_property
-from .namespaces import (
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .namespaces.namespaces import (
     NamespacesResource,
     AsyncNamespacesResource,
     NamespacesResourceWithRawResponse,
@@ -11,8 +12,6 @@
     NamespacesResourceWithStreamingResponse,
     AsyncNamespacesResourceWithStreamingResponse,
 )
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .namespaces.namespaces import NamespacesResource, AsyncNamespacesResource
 
 __all__ = ["DurableObjectsResource", "AsyncDurableObjectsResource"]
 
@@ -24,10 +23,21 @@ def namespaces(self) -> NamespacesResource:
 
     @cached_property
     def with_raw_response(self) -> DurableObjectsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DurableObjectsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DurableObjectsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DurableObjectsResourceWithStreamingResponse(self)
 
 
@@ -38,10 +48,21 @@ def namespaces(self) -> AsyncNamespacesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncDurableObjectsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDurableObjectsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDurableObjectsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDurableObjectsResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/durable_objects/namespaces/namespaces.py b/src/cloudflare/resources/durable_objects/namespaces/namespaces.py
index c663cfe151a..b35378602bc 100644
--- a/src/cloudflare/resources/durable_objects/namespaces/namespaces.py
+++ b/src/cloudflare/resources/durable_objects/namespaces/namespaces.py
@@ -12,7 +12,8 @@
     ObjectsResourceWithStreamingResponse,
     AsyncObjectsResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -21,8 +22,9 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ....pagination import SyncSinglePage, AsyncSinglePage
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ...._base_client import AsyncPaginator, make_request_options
+from ....types.durable_objects import namespace_list_params
 from ....types.durable_objects.namespace import Namespace
 
 __all__ = ["NamespacesResource", "AsyncNamespacesResource"]
@@ -35,28 +37,45 @@ def objects(self) -> ObjectsResource:
 
     @cached_property
     def with_raw_response(self) -> NamespacesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return NamespacesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> NamespacesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return NamespacesResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[Namespace]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[Namespace]:
         """
         Returns the Durable Object namespaces owned by an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          page: Current page.
+
+          per_page: Items per-page.
 
           extra_headers: Send extra headers
 
@@ -70,9 +89,19 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/workers/durable_objects/namespaces",
-            page=SyncSinglePage[Namespace],
+            page=SyncV4PagePaginationArray[Namespace],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    namespace_list_params.NamespaceListParams,
+                ),
             ),
             model=Namespace,
         )
@@ -85,28 +114,45 @@ def objects(self) -> AsyncObjectsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncNamespacesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncNamespacesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncNamespacesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncNamespacesResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[Namespace, AsyncSinglePage[Namespace]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Namespace, AsyncV4PagePaginationArray[Namespace]]:
         """
         Returns the Durable Object namespaces owned by an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          page: Current page.
+
+          per_page: Items per-page.
 
           extra_headers: Send extra headers
 
@@ -120,9 +166,19 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/workers/durable_objects/namespaces",
-            page=AsyncSinglePage[Namespace],
+            page=AsyncV4PagePaginationArray[Namespace],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    namespace_list_params.NamespaceListParams,
+                ),
             ),
             model=Namespace,
         )
diff --git a/src/cloudflare/resources/durable_objects/namespaces/objects.py b/src/cloudflare/resources/durable_objects/namespaces/objects.py
index 8203cafb04c..64e42f7f928 100644
--- a/src/cloudflare/resources/durable_objects/namespaces/objects.py
+++ b/src/cloudflare/resources/durable_objects/namespaces/objects.py
@@ -4,7 +4,7 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ...._utils import maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
@@ -14,7 +14,7 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ....pagination import SyncCursorLimitPagination, AsyncCursorLimitPagination
+from ....pagination import SyncCursorPaginationAfter, AsyncCursorPaginationAfter
 from ...._base_client import AsyncPaginator, make_request_options
 from ....types.durable_objects.namespaces import object_list_params
 from ....types.durable_objects.namespaces.durable_object import DurableObject
@@ -25,10 +25,21 @@
 class ObjectsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ObjectsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ObjectsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ObjectsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ObjectsResourceWithStreamingResponse(self)
 
     def list(
@@ -36,20 +47,20 @@ def list(
         id: str,
         *,
         account_id: str,
-        cursor: str | NotGiven = NOT_GIVEN,
-        limit: float | NotGiven = NOT_GIVEN,
+        cursor: str | Omit = omit,
+        limit: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncCursorLimitPagination[DurableObject]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncCursorPaginationAfter[DurableObject]:
         """
         Returns the Durable Objects in a given namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           id: ID of the namespace.
 
@@ -74,7 +85,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/workers/durable_objects/namespaces/{id}/objects",
-            page=SyncCursorLimitPagination[DurableObject],
+            page=SyncCursorPaginationAfter[DurableObject],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -95,10 +106,21 @@ def list(
 class AsyncObjectsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncObjectsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncObjectsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncObjectsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncObjectsResourceWithStreamingResponse(self)
 
     def list(
@@ -106,20 +128,20 @@ def list(
         id: str,
         *,
         account_id: str,
-        cursor: str | NotGiven = NOT_GIVEN,
-        limit: float | NotGiven = NOT_GIVEN,
+        cursor: str | Omit = omit,
+        limit: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[DurableObject, AsyncCursorLimitPagination[DurableObject]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[DurableObject, AsyncCursorPaginationAfter[DurableObject]]:
         """
         Returns the Durable Objects in a given namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           id: ID of the namespace.
 
@@ -144,7 +166,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/workers/durable_objects/namespaces/{id}/objects",
-            page=AsyncCursorLimitPagination[DurableObject],
+            page=AsyncCursorPaginationAfter[DurableObject],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
diff --git a/src/cloudflare/resources/email_routing/addresses.py b/src/cloudflare/resources/email_routing/addresses.py
index 24d0ccf8fee..4cf6946ce13 100644
--- a/src/cloudflare/resources/email_routing/addresses.py
+++ b/src/cloudflare/resources/email_routing/addresses.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -32,23 +29,34 @@
 class AddressesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AddressesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AddressesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AddressesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AddressesResourceWithStreamingResponse(self)
 
     def create(
         self,
-        account_identifier: str,
         *,
+        account_id: str,
         email: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Address]:
         """Create a destination address to forward your emails to.
 
@@ -56,7 +64,7 @@ def create(
         need to be verified before they can be used.
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
           email: The contact email address of the user.
 
@@ -68,10 +76,10 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._post(
-            f"/accounts/{account_identifier}/email/routing/addresses",
+            f"/accounts/{account_id}/email/routing/addresses",
             body=maybe_transform({"email": email}, address_create_params.AddressCreateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -85,24 +93,24 @@ def create(
 
     def list(
         self,
-        account_identifier: str,
         *,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        verified: Literal[True, False] | NotGiven = NOT_GIVEN,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        verified: Literal[True, False] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[Address]:
         """
         Lists existing destination addresses.
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
           direction: Sorts results in an ascending or descending order.
 
@@ -120,10 +128,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
-            f"/accounts/{account_identifier}/email/routing/addresses",
+            f"/accounts/{account_id}/email/routing/addresses",
             page=SyncV4PagePaginationArray[Address],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -147,19 +155,19 @@ def delete(
         self,
         destination_address_identifier: str,
         *,
-        account_identifier: str,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Address]:
         """
         Deletes a specific destination address.
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
           destination_address_identifier: Destination address identifier.
 
@@ -171,14 +179,14 @@ def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not destination_address_identifier:
             raise ValueError(
                 f"Expected a non-empty value for `destination_address_identifier` but received {destination_address_identifier!r}"
             )
         return self._delete(
-            f"/accounts/{account_identifier}/email/routing/addresses/{destination_address_identifier}",
+            f"/accounts/{account_id}/email/routing/addresses/{destination_address_identifier}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -193,19 +201,19 @@ def get(
         self,
         destination_address_identifier: str,
         *,
-        account_identifier: str,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Address]:
         """
         Gets information for a specific destination email already created.
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
           destination_address_identifier: Destination address identifier.
 
@@ -217,14 +225,14 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not destination_address_identifier:
             raise ValueError(
                 f"Expected a non-empty value for `destination_address_identifier` but received {destination_address_identifier!r}"
             )
         return self._get(
-            f"/accounts/{account_identifier}/email/routing/addresses/{destination_address_identifier}",
+            f"/accounts/{account_id}/email/routing/addresses/{destination_address_identifier}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -239,23 +247,34 @@ def get(
 class AsyncAddressesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncAddressesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAddressesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAddressesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAddressesResourceWithStreamingResponse(self)
 
     async def create(
         self,
-        account_identifier: str,
         *,
+        account_id: str,
         email: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Address]:
         """Create a destination address to forward your emails to.
 
@@ -263,7 +282,7 @@ async def create(
         need to be verified before they can be used.
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
           email: The contact email address of the user.
 
@@ -275,10 +294,10 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._post(
-            f"/accounts/{account_identifier}/email/routing/addresses",
+            f"/accounts/{account_id}/email/routing/addresses",
             body=await async_maybe_transform({"email": email}, address_create_params.AddressCreateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -292,24 +311,24 @@ async def create(
 
     def list(
         self,
-        account_identifier: str,
         *,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        verified: Literal[True, False] | NotGiven = NOT_GIVEN,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        verified: Literal[True, False] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Address, AsyncV4PagePaginationArray[Address]]:
         """
         Lists existing destination addresses.
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
           direction: Sorts results in an ascending or descending order.
 
@@ -327,10 +346,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
-            f"/accounts/{account_identifier}/email/routing/addresses",
+            f"/accounts/{account_id}/email/routing/addresses",
             page=AsyncV4PagePaginationArray[Address],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -354,19 +373,19 @@ async def delete(
         self,
         destination_address_identifier: str,
         *,
-        account_identifier: str,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Address]:
         """
         Deletes a specific destination address.
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
           destination_address_identifier: Destination address identifier.
 
@@ -378,14 +397,14 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not destination_address_identifier:
             raise ValueError(
                 f"Expected a non-empty value for `destination_address_identifier` but received {destination_address_identifier!r}"
             )
         return await self._delete(
-            f"/accounts/{account_identifier}/email/routing/addresses/{destination_address_identifier}",
+            f"/accounts/{account_id}/email/routing/addresses/{destination_address_identifier}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -400,19 +419,19 @@ async def get(
         self,
         destination_address_identifier: str,
         *,
-        account_identifier: str,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Address]:
         """
         Gets information for a specific destination email already created.
 
         Args:
-          account_identifier: Identifier
+          account_id: Identifier.
 
           destination_address_identifier: Destination address identifier.
 
@@ -424,14 +443,14 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not destination_address_identifier:
             raise ValueError(
                 f"Expected a non-empty value for `destination_address_identifier` but received {destination_address_identifier!r}"
             )
         return await self._get(
-            f"/accounts/{account_identifier}/email/routing/addresses/{destination_address_identifier}",
+            f"/accounts/{account_id}/email/routing/addresses/{destination_address_identifier}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
diff --git a/src/cloudflare/resources/email_routing/dns.py b/src/cloudflare/resources/email_routing/dns.py
index 52ed8de53e3..2dce6f176e8 100644
--- a/src/cloudflare/resources/email_routing/dns.py
+++ b/src/cloudflare/resources/email_routing/dns.py
@@ -2,11 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Any, Type, Optional, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -16,7 +17,11 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.email_routing import dns_get_params, dns_edit_params, dns_create_params
+from ...types.email_routing.settings import Settings
+from ...types.email_routing.dns_record import DNSRecord
 from ...types.email_routing.dns_get_response import DNSGetResponse
 
 __all__ = ["DNSResource", "AsyncDNSResource"]
@@ -25,28 +30,85 @@
 class DNSResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DNSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DNSResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DNSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DNSResourceWithStreamingResponse(self)
 
-    def get(
+    def create(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DNSGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Settings]:
+        """Enable you Email Routing zone.
+
+        Add and lock the necessary MX and SPF records.
+
+        Args:
+          zone_id: Identifier.
+
+          name: Domain of your zone.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
         """
-        Show the DNS records needed to configure your Email Routing zone.
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/email/routing/dns",
+            body=maybe_transform({"name": name}, dns_create_params.DNSCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Settings]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Settings]], ResultWrapper[Settings]),
+        )
+
+    def delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[DNSRecord]:
+        """Disable your Email Routing zone.
+
+        Also removes additional MX records previously
+        required for Email Routing to work.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -56,46 +118,189 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        return self._get(
-            f"/zones/{zone_identifier}/email/routing/dns",
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/email/routing/dns",
+            page=SyncSinglePage[DNSRecord],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=DNSRecord,
+            method="delete",
+        )
+
+    def edit(
+        self,
+        *,
+        zone_id: str,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Settings]:
+        """
+        Unlock MX Records previously locked by Email Routing.
+
+        Args:
+          zone_id: Identifier.
+
+          name: Domain of your zone.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._patch(
+            f"/zones/{zone_id}/email/routing/dns",
+            body=maybe_transform({"name": name}, dns_edit_params.DNSEditParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[DNSGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Settings]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Settings]], ResultWrapper[Settings]),
+        )
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        subdomain: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DNSGetResponse:
+        """
+        Show the DNS records needed to configure your Email Routing zone.
+
+        Args:
+          zone_id: Identifier.
+
+          subdomain: Domain of your zone.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return cast(
+            DNSGetResponse,
+            self._get(
+                f"/zones/{zone_id}/email/routing/dns",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    query=maybe_transform({"subdomain": subdomain}, dns_get_params.DNSGetParams),
+                ),
+                cast_to=cast(Any, DNSGetResponse),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[DNSGetResponse]], ResultWrapper[DNSGetResponse]),
         )
 
 
 class AsyncDNSResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDNSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDNSResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDNSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDNSResourceWithStreamingResponse(self)
 
-    async def get(
+    async def create(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DNSGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Settings]:
+        """Enable you Email Routing zone.
+
+        Add and lock the necessary MX and SPF records.
+
+        Args:
+          zone_id: Identifier.
+
+          name: Domain of your zone.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
         """
-        Show the DNS records needed to configure your Email Routing zone.
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/email/routing/dns",
+            body=await async_maybe_transform({"name": name}, dns_create_params.DNSCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Settings]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Settings]], ResultWrapper[Settings]),
+        )
+
+    def delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[DNSRecord, AsyncSinglePage[DNSRecord]]:
+        """Disable your Email Routing zone.
+
+        Also removes additional MX records previously
+        required for Email Routing to work.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -105,18 +310,104 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        return await self._get(
-            f"/zones/{zone_identifier}/email/routing/dns",
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/email/routing/dns",
+            page=AsyncSinglePage[DNSRecord],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=DNSRecord,
+            method="delete",
+        )
+
+    async def edit(
+        self,
+        *,
+        zone_id: str,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Settings]:
+        """
+        Unlock MX Records previously locked by Email Routing.
+
+        Args:
+          zone_id: Identifier.
+
+          name: Domain of your zone.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._patch(
+            f"/zones/{zone_id}/email/routing/dns",
+            body=await async_maybe_transform({"name": name}, dns_edit_params.DNSEditParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[DNSGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Settings]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Settings]], ResultWrapper[Settings]),
+        )
+
+    async def get(
+        self,
+        *,
+        zone_id: str,
+        subdomain: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DNSGetResponse:
+        """
+        Show the DNS records needed to configure your Email Routing zone.
+
+        Args:
+          zone_id: Identifier.
+
+          subdomain: Domain of your zone.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return cast(
+            DNSGetResponse,
+            await self._get(
+                f"/zones/{zone_id}/email/routing/dns",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    query=await async_maybe_transform({"subdomain": subdomain}, dns_get_params.DNSGetParams),
+                ),
+                cast_to=cast(Any, DNSGetResponse),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[DNSGetResponse]], ResultWrapper[DNSGetResponse]),
         )
 
 
@@ -124,6 +415,15 @@ class DNSResourceWithRawResponse:
     def __init__(self, dns: DNSResource) -> None:
         self._dns = dns
 
+        self.create = to_raw_response_wrapper(
+            dns.create,
+        )
+        self.delete = to_raw_response_wrapper(
+            dns.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            dns.edit,
+        )
         self.get = to_raw_response_wrapper(
             dns.get,
         )
@@ -133,6 +433,15 @@ class AsyncDNSResourceWithRawResponse:
     def __init__(self, dns: AsyncDNSResource) -> None:
         self._dns = dns
 
+        self.create = async_to_raw_response_wrapper(
+            dns.create,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            dns.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            dns.edit,
+        )
         self.get = async_to_raw_response_wrapper(
             dns.get,
         )
@@ -142,6 +451,15 @@ class DNSResourceWithStreamingResponse:
     def __init__(self, dns: DNSResource) -> None:
         self._dns = dns
 
+        self.create = to_streamed_response_wrapper(
+            dns.create,
+        )
+        self.delete = to_streamed_response_wrapper(
+            dns.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            dns.edit,
+        )
         self.get = to_streamed_response_wrapper(
             dns.get,
         )
@@ -151,6 +469,15 @@ class AsyncDNSResourceWithStreamingResponse:
     def __init__(self, dns: AsyncDNSResource) -> None:
         self._dns = dns
 
+        self.create = async_to_streamed_response_wrapper(
+            dns.create,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            dns.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            dns.edit,
+        )
         self.get = async_to_streamed_response_wrapper(
             dns.get,
         )
diff --git a/src/cloudflare/resources/email_routing/email_routing.py b/src/cloudflare/resources/email_routing/email_routing.py
index a784226f1f4..58e4029f429 100644
--- a/src/cloudflare/resources/email_routing/email_routing.py
+++ b/src/cloudflare/resources/email_routing/email_routing.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import Type, Optional, cast
 
 import httpx
@@ -14,19 +15,8 @@
     DNSResourceWithStreamingResponse,
     AsyncDNSResourceWithStreamingResponse,
 )
-from .rules import (
-    RulesResource,
-    AsyncRulesResource,
-    RulesResourceWithRawResponse,
-    AsyncRulesResourceWithRawResponse,
-    RulesResourceWithStreamingResponse,
-    AsyncRulesResourceWithStreamingResponse,
-)
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from .addresses import (
     AddressesResource,
@@ -44,7 +34,14 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from .rules.rules import RulesResource, AsyncRulesResource
+from .rules.rules import (
+    RulesResource,
+    AsyncRulesResource,
+    RulesResourceWithRawResponse,
+    AsyncRulesResourceWithRawResponse,
+    RulesResourceWithStreamingResponse,
+    AsyncRulesResourceWithStreamingResponse,
+)
 from ..._base_client import make_request_options
 from ...types.email_routing import email_routing_enable_params, email_routing_disable_params
 from ...types.email_routing.settings import Settings
@@ -67,23 +64,35 @@ def addresses(self) -> AddressesResource:
 
     @cached_property
     def with_raw_response(self) -> EmailRoutingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return EmailRoutingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> EmailRoutingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return EmailRoutingResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def disable(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         body: object,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Settings]:
         """Disable your Email Routing zone.
 
@@ -91,7 +100,7 @@ def disable(
         required for Email Routing to work.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -101,10 +110,10 @@ def disable(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._post(
-            f"/zones/{zone_identifier}/email/routing/disable",
+            f"/zones/{zone_id}/email/routing/disable",
             body=maybe_transform(body, email_routing_disable_params.EmailRoutingDisableParams),
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -116,24 +125,25 @@ def disable(
             cast_to=cast(Type[Optional[Settings]], ResultWrapper[Settings]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     def enable(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         body: object,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Settings]:
         """Enable you Email Routing zone.
 
         Add and lock the necessary MX and SPF records.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -143,10 +153,10 @@ def enable(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._post(
-            f"/zones/{zone_identifier}/email/routing/enable",
+            f"/zones/{zone_id}/email/routing/enable",
             body=maybe_transform(body, email_routing_enable_params.EmailRoutingEnableParams),
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -160,20 +170,20 @@ def enable(
 
     def get(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Settings]:
         """
         Get information about the settings for your Email Routing zone.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -183,10 +193,10 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get(
-            f"/zones/{zone_identifier}/email/routing",
+            f"/zones/{zone_id}/email/routing",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -213,23 +223,35 @@ def addresses(self) -> AsyncAddressesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncEmailRoutingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncEmailRoutingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncEmailRoutingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncEmailRoutingResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     async def disable(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         body: object,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Settings]:
         """Disable your Email Routing zone.
 
@@ -237,7 +259,7 @@ async def disable(
         required for Email Routing to work.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -247,10 +269,10 @@ async def disable(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return await self._post(
-            f"/zones/{zone_identifier}/email/routing/disable",
+            f"/zones/{zone_id}/email/routing/disable",
             body=await async_maybe_transform(body, email_routing_disable_params.EmailRoutingDisableParams),
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -262,24 +284,25 @@ async def disable(
             cast_to=cast(Type[Optional[Settings]], ResultWrapper[Settings]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def enable(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         body: object,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Settings]:
         """Enable you Email Routing zone.
 
         Add and lock the necessary MX and SPF records.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -289,10 +312,10 @@ async def enable(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return await self._post(
-            f"/zones/{zone_identifier}/email/routing/enable",
+            f"/zones/{zone_id}/email/routing/enable",
             body=await async_maybe_transform(body, email_routing_enable_params.EmailRoutingEnableParams),
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -306,20 +329,20 @@ async def enable(
 
     async def get(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Settings]:
         """
         Get information about the settings for your Email Routing zone.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -329,10 +352,10 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return await self._get(
-            f"/zones/{zone_identifier}/email/routing",
+            f"/zones/{zone_id}/email/routing",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -348,11 +371,15 @@ class EmailRoutingResourceWithRawResponse:
     def __init__(self, email_routing: EmailRoutingResource) -> None:
         self._email_routing = email_routing
 
-        self.disable = to_raw_response_wrapper(
-            email_routing.disable,
+        self.disable = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                email_routing.disable,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.enable = to_raw_response_wrapper(
-            email_routing.enable,
+        self.enable = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                email_routing.enable,  # pyright: ignore[reportDeprecated],
+            )
         )
         self.get = to_raw_response_wrapper(
             email_routing.get,
@@ -375,11 +402,15 @@ class AsyncEmailRoutingResourceWithRawResponse:
     def __init__(self, email_routing: AsyncEmailRoutingResource) -> None:
         self._email_routing = email_routing
 
-        self.disable = async_to_raw_response_wrapper(
-            email_routing.disable,
+        self.disable = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                email_routing.disable,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.enable = async_to_raw_response_wrapper(
-            email_routing.enable,
+        self.enable = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                email_routing.enable,  # pyright: ignore[reportDeprecated],
+            )
         )
         self.get = async_to_raw_response_wrapper(
             email_routing.get,
@@ -402,11 +433,15 @@ class EmailRoutingResourceWithStreamingResponse:
     def __init__(self, email_routing: EmailRoutingResource) -> None:
         self._email_routing = email_routing
 
-        self.disable = to_streamed_response_wrapper(
-            email_routing.disable,
+        self.disable = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                email_routing.disable,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.enable = to_streamed_response_wrapper(
-            email_routing.enable,
+        self.enable = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                email_routing.enable,  # pyright: ignore[reportDeprecated],
+            )
         )
         self.get = to_streamed_response_wrapper(
             email_routing.get,
@@ -429,11 +464,15 @@ class AsyncEmailRoutingResourceWithStreamingResponse:
     def __init__(self, email_routing: AsyncEmailRoutingResource) -> None:
         self._email_routing = email_routing
 
-        self.disable = async_to_streamed_response_wrapper(
-            email_routing.disable,
+        self.disable = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                email_routing.disable,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.enable = async_to_streamed_response_wrapper(
-            email_routing.enable,
+        self.enable = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                email_routing.enable,  # pyright: ignore[reportDeprecated],
+            )
         )
         self.get = async_to_streamed_response_wrapper(
             email_routing.get,
diff --git a/src/cloudflare/resources/email_routing/rules/catch_alls.py b/src/cloudflare/resources/email_routing/rules/catch_alls.py
index 14135aadea5..0ce7f69c823 100644
--- a/src/cloudflare/resources/email_routing/rules/catch_alls.py
+++ b/src/cloudflare/resources/email_routing/rules/catch_alls.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -34,33 +31,44 @@
 class CatchAllsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> CatchAllsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CatchAllsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CatchAllsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CatchAllsResourceWithStreamingResponse(self)
 
     def update(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         actions: Iterable[CatchAllActionParam],
         matchers: Iterable[CatchAllMatcherParam],
-        enabled: Literal[True, False] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        enabled: Literal[True, False] | Omit = omit,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CatchAllUpdateResponse]:
         """
         Enable or disable catch-all routing rule, or change action to forward to
         specific destination address.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           actions: List actions for the catch-all routing rule.
 
@@ -78,10 +86,10 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._put(
-            f"/zones/{zone_identifier}/email/routing/rules/catch_all",
+            f"/zones/{zone_id}/email/routing/rules/catch_all",
             body=maybe_transform(
                 {
                     "actions": actions,
@@ -103,20 +111,20 @@ def update(
 
     def get(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CatchAllGetResponse]:
         """
         Get information on the default catch-all routing rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -126,10 +134,10 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get(
-            f"/zones/{zone_identifier}/email/routing/rules/catch_all",
+            f"/zones/{zone_id}/email/routing/rules/catch_all",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -144,33 +152,44 @@ def get(
 class AsyncCatchAllsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncCatchAllsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCatchAllsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCatchAllsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCatchAllsResourceWithStreamingResponse(self)
 
     async def update(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         actions: Iterable[CatchAllActionParam],
         matchers: Iterable[CatchAllMatcherParam],
-        enabled: Literal[True, False] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        enabled: Literal[True, False] | Omit = omit,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CatchAllUpdateResponse]:
         """
         Enable or disable catch-all routing rule, or change action to forward to
         specific destination address.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           actions: List actions for the catch-all routing rule.
 
@@ -188,10 +207,10 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return await self._put(
-            f"/zones/{zone_identifier}/email/routing/rules/catch_all",
+            f"/zones/{zone_id}/email/routing/rules/catch_all",
             body=await async_maybe_transform(
                 {
                     "actions": actions,
@@ -213,20 +232,20 @@ async def update(
 
     async def get(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CatchAllGetResponse]:
         """
         Get information on the default catch-all routing rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -236,10 +255,10 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return await self._get(
-            f"/zones/{zone_identifier}/email/routing/rules/catch_all",
+            f"/zones/{zone_id}/email/routing/rules/catch_all",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
diff --git a/src/cloudflare/resources/email_routing/rules/rules.py b/src/cloudflare/resources/email_routing/rules/rules.py
index 520f6cd4641..55c49d259cd 100644
--- a/src/cloudflare/resources/email_routing/rules/rules.py
+++ b/src/cloudflare/resources/email_routing/rules/rules.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from .catch_alls import (
     CatchAllsResource,
@@ -46,27 +43,38 @@ def catch_alls(self) -> CatchAllsResource:
 
     @cached_property
     def with_raw_response(self) -> RulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RulesResourceWithStreamingResponse(self)
 
     def create(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         actions: Iterable[ActionParam],
         matchers: Iterable[MatcherParam],
-        enabled: Literal[True, False] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        priority: float | NotGiven = NOT_GIVEN,
+        enabled: Literal[True, False] | Omit = omit,
+        name: str | Omit = omit,
+        priority: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[EmailRoutingRule]:
         """
         Rules consist of a set of criteria for matching emails (such as an email being
@@ -74,7 +82,7 @@ def create(
         email (like forwarding it to a specific destination address).
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           actions: List actions patterns.
 
@@ -94,10 +102,10 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._post(
-            f"/zones/{zone_identifier}/email/routing/rules",
+            f"/zones/{zone_id}/email/routing/rules",
             body=maybe_transform(
                 {
                     "actions": actions,
@@ -122,24 +130,24 @@ def update(
         self,
         rule_identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         actions: Iterable[ActionParam],
         matchers: Iterable[MatcherParam],
-        enabled: Literal[True, False] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        priority: float | NotGiven = NOT_GIVEN,
+        enabled: Literal[True, False] | Omit = omit,
+        name: str | Omit = omit,
+        priority: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[EmailRoutingRule]:
         """
         Update actions and matches, or enable/disable specific routing rules.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           rule_identifier: Routing rule identifier.
 
@@ -161,12 +169,12 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not rule_identifier:
             raise ValueError(f"Expected a non-empty value for `rule_identifier` but received {rule_identifier!r}")
         return self._put(
-            f"/zones/{zone_identifier}/email/routing/rules/{rule_identifier}",
+            f"/zones/{zone_id}/email/routing/rules/{rule_identifier}",
             body=maybe_transform(
                 {
                     "actions": actions,
@@ -189,23 +197,23 @@ def update(
 
     def list(
         self,
-        zone_identifier: str,
         *,
-        enabled: Literal[True, False] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        enabled: Literal[True, False] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[EmailRoutingRule]:
         """
         Lists existing routing rules.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           enabled: Filter by enabled routing rules.
 
@@ -221,10 +229,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/email/routing/rules",
+            f"/zones/{zone_id}/email/routing/rules",
             page=SyncV4PagePaginationArray[EmailRoutingRule],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -247,19 +255,19 @@ def delete(
         self,
         rule_identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[EmailRoutingRule]:
         """
         Delete a specific routing rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           rule_identifier: Routing rule identifier.
 
@@ -271,12 +279,12 @@ def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not rule_identifier:
             raise ValueError(f"Expected a non-empty value for `rule_identifier` but received {rule_identifier!r}")
         return self._delete(
-            f"/zones/{zone_identifier}/email/routing/rules/{rule_identifier}",
+            f"/zones/{zone_id}/email/routing/rules/{rule_identifier}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -291,19 +299,19 @@ def get(
         self,
         rule_identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[EmailRoutingRule]:
         """
         Get information for a specific routing rule already created.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           rule_identifier: Routing rule identifier.
 
@@ -315,12 +323,12 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not rule_identifier:
             raise ValueError(f"Expected a non-empty value for `rule_identifier` but received {rule_identifier!r}")
         return self._get(
-            f"/zones/{zone_identifier}/email/routing/rules/{rule_identifier}",
+            f"/zones/{zone_id}/email/routing/rules/{rule_identifier}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -339,27 +347,38 @@ def catch_alls(self) -> AsyncCatchAllsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncRulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRulesResourceWithStreamingResponse(self)
 
     async def create(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         actions: Iterable[ActionParam],
         matchers: Iterable[MatcherParam],
-        enabled: Literal[True, False] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        priority: float | NotGiven = NOT_GIVEN,
+        enabled: Literal[True, False] | Omit = omit,
+        name: str | Omit = omit,
+        priority: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[EmailRoutingRule]:
         """
         Rules consist of a set of criteria for matching emails (such as an email being
@@ -367,7 +386,7 @@ async def create(
         email (like forwarding it to a specific destination address).
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           actions: List actions patterns.
 
@@ -387,10 +406,10 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return await self._post(
-            f"/zones/{zone_identifier}/email/routing/rules",
+            f"/zones/{zone_id}/email/routing/rules",
             body=await async_maybe_transform(
                 {
                     "actions": actions,
@@ -415,24 +434,24 @@ async def update(
         self,
         rule_identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         actions: Iterable[ActionParam],
         matchers: Iterable[MatcherParam],
-        enabled: Literal[True, False] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        priority: float | NotGiven = NOT_GIVEN,
+        enabled: Literal[True, False] | Omit = omit,
+        name: str | Omit = omit,
+        priority: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[EmailRoutingRule]:
         """
         Update actions and matches, or enable/disable specific routing rules.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           rule_identifier: Routing rule identifier.
 
@@ -454,12 +473,12 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not rule_identifier:
             raise ValueError(f"Expected a non-empty value for `rule_identifier` but received {rule_identifier!r}")
         return await self._put(
-            f"/zones/{zone_identifier}/email/routing/rules/{rule_identifier}",
+            f"/zones/{zone_id}/email/routing/rules/{rule_identifier}",
             body=await async_maybe_transform(
                 {
                     "actions": actions,
@@ -482,23 +501,23 @@ async def update(
 
     def list(
         self,
-        zone_identifier: str,
         *,
-        enabled: Literal[True, False] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        enabled: Literal[True, False] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[EmailRoutingRule, AsyncV4PagePaginationArray[EmailRoutingRule]]:
         """
         Lists existing routing rules.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           enabled: Filter by enabled routing rules.
 
@@ -514,10 +533,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/email/routing/rules",
+            f"/zones/{zone_id}/email/routing/rules",
             page=AsyncV4PagePaginationArray[EmailRoutingRule],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -540,19 +559,19 @@ async def delete(
         self,
         rule_identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[EmailRoutingRule]:
         """
         Delete a specific routing rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           rule_identifier: Routing rule identifier.
 
@@ -564,12 +583,12 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not rule_identifier:
             raise ValueError(f"Expected a non-empty value for `rule_identifier` but received {rule_identifier!r}")
         return await self._delete(
-            f"/zones/{zone_identifier}/email/routing/rules/{rule_identifier}",
+            f"/zones/{zone_id}/email/routing/rules/{rule_identifier}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -584,19 +603,19 @@ async def get(
         self,
         rule_identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[EmailRoutingRule]:
         """
         Get information for a specific routing rule already created.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           rule_identifier: Routing rule identifier.
 
@@ -608,12 +627,12 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not rule_identifier:
             raise ValueError(f"Expected a non-empty value for `rule_identifier` but received {rule_identifier!r}")
         return await self._get(
-            f"/zones/{zone_identifier}/email/routing/rules/{rule_identifier}",
+            f"/zones/{zone_id}/email/routing/rules/{rule_identifier}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
diff --git a/src/cloudflare/resources/email_security/__init__.py b/src/cloudflare/resources/email_security/__init__.py
new file mode 100644
index 00000000000..092b0ddf17c
--- /dev/null
+++ b/src/cloudflare/resources/email_security/__init__.py
@@ -0,0 +1,61 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .settings import (
+    SettingsResource,
+    AsyncSettingsResource,
+    SettingsResourceWithRawResponse,
+    AsyncSettingsResourceWithRawResponse,
+    SettingsResourceWithStreamingResponse,
+    AsyncSettingsResourceWithStreamingResponse,
+)
+from .investigate import (
+    InvestigateResource,
+    AsyncInvestigateResource,
+    InvestigateResourceWithRawResponse,
+    AsyncInvestigateResourceWithRawResponse,
+    InvestigateResourceWithStreamingResponse,
+    AsyncInvestigateResourceWithStreamingResponse,
+)
+from .submissions import (
+    SubmissionsResource,
+    AsyncSubmissionsResource,
+    SubmissionsResourceWithRawResponse,
+    AsyncSubmissionsResourceWithRawResponse,
+    SubmissionsResourceWithStreamingResponse,
+    AsyncSubmissionsResourceWithStreamingResponse,
+)
+from .email_security import (
+    EmailSecurityResource,
+    AsyncEmailSecurityResource,
+    EmailSecurityResourceWithRawResponse,
+    AsyncEmailSecurityResourceWithRawResponse,
+    EmailSecurityResourceWithStreamingResponse,
+    AsyncEmailSecurityResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "InvestigateResource",
+    "AsyncInvestigateResource",
+    "InvestigateResourceWithRawResponse",
+    "AsyncInvestigateResourceWithRawResponse",
+    "InvestigateResourceWithStreamingResponse",
+    "AsyncInvestigateResourceWithStreamingResponse",
+    "SettingsResource",
+    "AsyncSettingsResource",
+    "SettingsResourceWithRawResponse",
+    "AsyncSettingsResourceWithRawResponse",
+    "SettingsResourceWithStreamingResponse",
+    "AsyncSettingsResourceWithStreamingResponse",
+    "SubmissionsResource",
+    "AsyncSubmissionsResource",
+    "SubmissionsResourceWithRawResponse",
+    "AsyncSubmissionsResourceWithRawResponse",
+    "SubmissionsResourceWithStreamingResponse",
+    "AsyncSubmissionsResourceWithStreamingResponse",
+    "EmailSecurityResource",
+    "AsyncEmailSecurityResource",
+    "EmailSecurityResourceWithRawResponse",
+    "AsyncEmailSecurityResourceWithRawResponse",
+    "EmailSecurityResourceWithStreamingResponse",
+    "AsyncEmailSecurityResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/email_security/email_security.py b/src/cloudflare/resources/email_security/email_security.py
new file mode 100644
index 00000000000..e66c2ed32c6
--- /dev/null
+++ b/src/cloudflare/resources/email_security/email_security.py
@@ -0,0 +1,166 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .submissions import (
+    SubmissionsResource,
+    AsyncSubmissionsResource,
+    SubmissionsResourceWithRawResponse,
+    AsyncSubmissionsResourceWithRawResponse,
+    SubmissionsResourceWithStreamingResponse,
+    AsyncSubmissionsResourceWithStreamingResponse,
+)
+from .settings.settings import (
+    SettingsResource,
+    AsyncSettingsResource,
+    SettingsResourceWithRawResponse,
+    AsyncSettingsResourceWithRawResponse,
+    SettingsResourceWithStreamingResponse,
+    AsyncSettingsResourceWithStreamingResponse,
+)
+from .investigate.investigate import (
+    InvestigateResource,
+    AsyncInvestigateResource,
+    InvestigateResourceWithRawResponse,
+    AsyncInvestigateResourceWithRawResponse,
+    InvestigateResourceWithStreamingResponse,
+    AsyncInvestigateResourceWithStreamingResponse,
+)
+
+__all__ = ["EmailSecurityResource", "AsyncEmailSecurityResource"]
+
+
+class EmailSecurityResource(SyncAPIResource):
+    @cached_property
+    def investigate(self) -> InvestigateResource:
+        return InvestigateResource(self._client)
+
+    @cached_property
+    def settings(self) -> SettingsResource:
+        return SettingsResource(self._client)
+
+    @cached_property
+    def submissions(self) -> SubmissionsResource:
+        return SubmissionsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> EmailSecurityResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return EmailSecurityResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> EmailSecurityResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return EmailSecurityResourceWithStreamingResponse(self)
+
+
+class AsyncEmailSecurityResource(AsyncAPIResource):
+    @cached_property
+    def investigate(self) -> AsyncInvestigateResource:
+        return AsyncInvestigateResource(self._client)
+
+    @cached_property
+    def settings(self) -> AsyncSettingsResource:
+        return AsyncSettingsResource(self._client)
+
+    @cached_property
+    def submissions(self) -> AsyncSubmissionsResource:
+        return AsyncSubmissionsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncEmailSecurityResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncEmailSecurityResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncEmailSecurityResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncEmailSecurityResourceWithStreamingResponse(self)
+
+
+class EmailSecurityResourceWithRawResponse:
+    def __init__(self, email_security: EmailSecurityResource) -> None:
+        self._email_security = email_security
+
+    @cached_property
+    def investigate(self) -> InvestigateResourceWithRawResponse:
+        return InvestigateResourceWithRawResponse(self._email_security.investigate)
+
+    @cached_property
+    def settings(self) -> SettingsResourceWithRawResponse:
+        return SettingsResourceWithRawResponse(self._email_security.settings)
+
+    @cached_property
+    def submissions(self) -> SubmissionsResourceWithRawResponse:
+        return SubmissionsResourceWithRawResponse(self._email_security.submissions)
+
+
+class AsyncEmailSecurityResourceWithRawResponse:
+    def __init__(self, email_security: AsyncEmailSecurityResource) -> None:
+        self._email_security = email_security
+
+    @cached_property
+    def investigate(self) -> AsyncInvestigateResourceWithRawResponse:
+        return AsyncInvestigateResourceWithRawResponse(self._email_security.investigate)
+
+    @cached_property
+    def settings(self) -> AsyncSettingsResourceWithRawResponse:
+        return AsyncSettingsResourceWithRawResponse(self._email_security.settings)
+
+    @cached_property
+    def submissions(self) -> AsyncSubmissionsResourceWithRawResponse:
+        return AsyncSubmissionsResourceWithRawResponse(self._email_security.submissions)
+
+
+class EmailSecurityResourceWithStreamingResponse:
+    def __init__(self, email_security: EmailSecurityResource) -> None:
+        self._email_security = email_security
+
+    @cached_property
+    def investigate(self) -> InvestigateResourceWithStreamingResponse:
+        return InvestigateResourceWithStreamingResponse(self._email_security.investigate)
+
+    @cached_property
+    def settings(self) -> SettingsResourceWithStreamingResponse:
+        return SettingsResourceWithStreamingResponse(self._email_security.settings)
+
+    @cached_property
+    def submissions(self) -> SubmissionsResourceWithStreamingResponse:
+        return SubmissionsResourceWithStreamingResponse(self._email_security.submissions)
+
+
+class AsyncEmailSecurityResourceWithStreamingResponse:
+    def __init__(self, email_security: AsyncEmailSecurityResource) -> None:
+        self._email_security = email_security
+
+    @cached_property
+    def investigate(self) -> AsyncInvestigateResourceWithStreamingResponse:
+        return AsyncInvestigateResourceWithStreamingResponse(self._email_security.investigate)
+
+    @cached_property
+    def settings(self) -> AsyncSettingsResourceWithStreamingResponse:
+        return AsyncSettingsResourceWithStreamingResponse(self._email_security.settings)
+
+    @cached_property
+    def submissions(self) -> AsyncSubmissionsResourceWithStreamingResponse:
+        return AsyncSubmissionsResourceWithStreamingResponse(self._email_security.submissions)
diff --git a/src/cloudflare/resources/email_security/investigate/__init__.py b/src/cloudflare/resources/email_security/investigate/__init__.py
new file mode 100644
index 00000000000..5b206205771
--- /dev/null
+++ b/src/cloudflare/resources/email_security/investigate/__init__.py
@@ -0,0 +1,117 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .raw import (
+    RawResource,
+    AsyncRawResource,
+    RawResourceWithRawResponse,
+    AsyncRawResourceWithRawResponse,
+    RawResourceWithStreamingResponse,
+    AsyncRawResourceWithStreamingResponse,
+)
+from .move import (
+    MoveResource,
+    AsyncMoveResource,
+    MoveResourceWithRawResponse,
+    AsyncMoveResourceWithRawResponse,
+    MoveResourceWithStreamingResponse,
+    AsyncMoveResourceWithStreamingResponse,
+)
+from .trace import (
+    TraceResource,
+    AsyncTraceResource,
+    TraceResourceWithRawResponse,
+    AsyncTraceResourceWithRawResponse,
+    TraceResourceWithStreamingResponse,
+    AsyncTraceResourceWithStreamingResponse,
+)
+from .preview import (
+    PreviewResource,
+    AsyncPreviewResource,
+    PreviewResourceWithRawResponse,
+    AsyncPreviewResourceWithRawResponse,
+    PreviewResourceWithStreamingResponse,
+    AsyncPreviewResourceWithStreamingResponse,
+)
+from .release import (
+    ReleaseResource,
+    AsyncReleaseResource,
+    ReleaseResourceWithRawResponse,
+    AsyncReleaseResourceWithRawResponse,
+    ReleaseResourceWithStreamingResponse,
+    AsyncReleaseResourceWithStreamingResponse,
+)
+from .detections import (
+    DetectionsResource,
+    AsyncDetectionsResource,
+    DetectionsResourceWithRawResponse,
+    AsyncDetectionsResourceWithRawResponse,
+    DetectionsResourceWithStreamingResponse,
+    AsyncDetectionsResourceWithStreamingResponse,
+)
+from .reclassify import (
+    ReclassifyResource,
+    AsyncReclassifyResource,
+    ReclassifyResourceWithRawResponse,
+    AsyncReclassifyResourceWithRawResponse,
+    ReclassifyResourceWithStreamingResponse,
+    AsyncReclassifyResourceWithStreamingResponse,
+)
+from .investigate import (
+    InvestigateResource,
+    AsyncInvestigateResource,
+    InvestigateResourceWithRawResponse,
+    AsyncInvestigateResourceWithRawResponse,
+    InvestigateResourceWithStreamingResponse,
+    AsyncInvestigateResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "DetectionsResource",
+    "AsyncDetectionsResource",
+    "DetectionsResourceWithRawResponse",
+    "AsyncDetectionsResourceWithRawResponse",
+    "DetectionsResourceWithStreamingResponse",
+    "AsyncDetectionsResourceWithStreamingResponse",
+    "PreviewResource",
+    "AsyncPreviewResource",
+    "PreviewResourceWithRawResponse",
+    "AsyncPreviewResourceWithRawResponse",
+    "PreviewResourceWithStreamingResponse",
+    "AsyncPreviewResourceWithStreamingResponse",
+    "RawResource",
+    "AsyncRawResource",
+    "RawResourceWithRawResponse",
+    "AsyncRawResourceWithRawResponse",
+    "RawResourceWithStreamingResponse",
+    "AsyncRawResourceWithStreamingResponse",
+    "TraceResource",
+    "AsyncTraceResource",
+    "TraceResourceWithRawResponse",
+    "AsyncTraceResourceWithRawResponse",
+    "TraceResourceWithStreamingResponse",
+    "AsyncTraceResourceWithStreamingResponse",
+    "MoveResource",
+    "AsyncMoveResource",
+    "MoveResourceWithRawResponse",
+    "AsyncMoveResourceWithRawResponse",
+    "MoveResourceWithStreamingResponse",
+    "AsyncMoveResourceWithStreamingResponse",
+    "ReclassifyResource",
+    "AsyncReclassifyResource",
+    "ReclassifyResourceWithRawResponse",
+    "AsyncReclassifyResourceWithRawResponse",
+    "ReclassifyResourceWithStreamingResponse",
+    "AsyncReclassifyResourceWithStreamingResponse",
+    "ReleaseResource",
+    "AsyncReleaseResource",
+    "ReleaseResourceWithRawResponse",
+    "AsyncReleaseResourceWithRawResponse",
+    "ReleaseResourceWithStreamingResponse",
+    "AsyncReleaseResourceWithStreamingResponse",
+    "InvestigateResource",
+    "AsyncInvestigateResource",
+    "InvestigateResourceWithRawResponse",
+    "AsyncInvestigateResourceWithRawResponse",
+    "InvestigateResourceWithStreamingResponse",
+    "AsyncInvestigateResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/email_security/investigate/detections.py b/src/cloudflare/resources/email_security/investigate/detections.py
new file mode 100644
index 00000000000..f3e5c978d25
--- /dev/null
+++ b/src/cloudflare/resources/email_security/investigate/detections.py
@@ -0,0 +1,190 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.email_security.investigate.detection_get_response import DetectionGetResponse
+
+__all__ = ["DetectionsResource", "AsyncDetectionsResource"]
+
+
+class DetectionsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> DetectionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return DetectionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> DetectionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return DetectionsResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        postfix_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DetectionGetResponse:
+        """
+        Returns detection details such as threat categories and sender information for
+        non-benign messages.
+
+        Args:
+          account_id: Account Identifier
+
+          postfix_id: The identifier of the message.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not postfix_id:
+            raise ValueError(f"Expected a non-empty value for `postfix_id` but received {postfix_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/email-security/investigate/{postfix_id}/detections",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DetectionGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DetectionGetResponse], ResultWrapper[DetectionGetResponse]),
+        )
+
+
+class AsyncDetectionsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncDetectionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncDetectionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncDetectionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncDetectionsResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        postfix_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DetectionGetResponse:
+        """
+        Returns detection details such as threat categories and sender information for
+        non-benign messages.
+
+        Args:
+          account_id: Account Identifier
+
+          postfix_id: The identifier of the message.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not postfix_id:
+            raise ValueError(f"Expected a non-empty value for `postfix_id` but received {postfix_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/email-security/investigate/{postfix_id}/detections",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DetectionGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DetectionGetResponse], ResultWrapper[DetectionGetResponse]),
+        )
+
+
+class DetectionsResourceWithRawResponse:
+    def __init__(self, detections: DetectionsResource) -> None:
+        self._detections = detections
+
+        self.get = to_raw_response_wrapper(
+            detections.get,
+        )
+
+
+class AsyncDetectionsResourceWithRawResponse:
+    def __init__(self, detections: AsyncDetectionsResource) -> None:
+        self._detections = detections
+
+        self.get = async_to_raw_response_wrapper(
+            detections.get,
+        )
+
+
+class DetectionsResourceWithStreamingResponse:
+    def __init__(self, detections: DetectionsResource) -> None:
+        self._detections = detections
+
+        self.get = to_streamed_response_wrapper(
+            detections.get,
+        )
+
+
+class AsyncDetectionsResourceWithStreamingResponse:
+    def __init__(self, detections: AsyncDetectionsResource) -> None:
+        self._detections = detections
+
+        self.get = async_to_streamed_response_wrapper(
+            detections.get,
+        )
diff --git a/src/cloudflare/resources/email_security/investigate/investigate.py b/src/cloudflare/resources/email_security/investigate/investigate.py
new file mode 100644
index 00000000000..4d937d99aa8
--- /dev/null
+++ b/src/cloudflare/resources/email_security/investigate/investigate.py
@@ -0,0 +1,678 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Union, Optional, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from .raw import (
+    RawResource,
+    AsyncRawResource,
+    RawResourceWithRawResponse,
+    AsyncRawResourceWithRawResponse,
+    RawResourceWithStreamingResponse,
+    AsyncRawResourceWithStreamingResponse,
+)
+from .move import (
+    MoveResource,
+    AsyncMoveResource,
+    MoveResourceWithRawResponse,
+    AsyncMoveResourceWithRawResponse,
+    MoveResourceWithStreamingResponse,
+    AsyncMoveResourceWithStreamingResponse,
+)
+from .trace import (
+    TraceResource,
+    AsyncTraceResource,
+    TraceResourceWithRawResponse,
+    AsyncTraceResourceWithRawResponse,
+    TraceResourceWithStreamingResponse,
+    AsyncTraceResourceWithStreamingResponse,
+)
+from .preview import (
+    PreviewResource,
+    AsyncPreviewResource,
+    PreviewResourceWithRawResponse,
+    AsyncPreviewResourceWithRawResponse,
+    PreviewResourceWithStreamingResponse,
+    AsyncPreviewResourceWithStreamingResponse,
+)
+from .release import (
+    ReleaseResource,
+    AsyncReleaseResource,
+    ReleaseResourceWithRawResponse,
+    AsyncReleaseResourceWithRawResponse,
+    ReleaseResourceWithStreamingResponse,
+    AsyncReleaseResourceWithStreamingResponse,
+)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform
+from ...._compat import cached_property
+from .detections import (
+    DetectionsResource,
+    AsyncDetectionsResource,
+    DetectionsResourceWithRawResponse,
+    AsyncDetectionsResourceWithRawResponse,
+    DetectionsResourceWithStreamingResponse,
+    AsyncDetectionsResourceWithStreamingResponse,
+)
+from .reclassify import (
+    ReclassifyResource,
+    AsyncReclassifyResource,
+    ReclassifyResourceWithRawResponse,
+    AsyncReclassifyResourceWithRawResponse,
+    ReclassifyResourceWithStreamingResponse,
+    AsyncReclassifyResourceWithStreamingResponse,
+)
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.email_security import investigate_list_params
+from ....types.email_security.investigate_get_response import InvestigateGetResponse
+from ....types.email_security.investigate_list_response import InvestigateListResponse
+
+__all__ = ["InvestigateResource", "AsyncInvestigateResource"]
+
+
+class InvestigateResource(SyncAPIResource):
+    @cached_property
+    def detections(self) -> DetectionsResource:
+        return DetectionsResource(self._client)
+
+    @cached_property
+    def preview(self) -> PreviewResource:
+        return PreviewResource(self._client)
+
+    @cached_property
+    def raw(self) -> RawResource:
+        return RawResource(self._client)
+
+    @cached_property
+    def trace(self) -> TraceResource:
+        return TraceResource(self._client)
+
+    @cached_property
+    def move(self) -> MoveResource:
+        return MoveResource(self._client)
+
+    @cached_property
+    def reclassify(self) -> ReclassifyResource:
+        return ReclassifyResource(self._client)
+
+    @cached_property
+    def release(self) -> ReleaseResource:
+        return ReleaseResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> InvestigateResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return InvestigateResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> InvestigateResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return InvestigateResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        action_log: bool | Omit = omit,
+        alert_id: str | Omit = omit,
+        cursor: str | Omit = omit,
+        detections_only: bool | Omit = omit,
+        domain: str | Omit = omit,
+        end: Union[str, datetime] | Omit = omit,
+        final_disposition: Literal["MALICIOUS", "SUSPICIOUS", "SPOOF", "SPAM", "BULK", "NONE"] | Omit = omit,
+        message_action: Literal["PREVIEW", "QUARANTINE_RELEASED", "MOVED"] | Omit = omit,
+        message_id: str | Omit = omit,
+        metric: str | Omit = omit,
+        page: Optional[int] | Omit = omit,
+        per_page: int | Omit = omit,
+        query: str | Omit = omit,
+        recipient: str | Omit = omit,
+        sender: str | Omit = omit,
+        start: Union[str, datetime] | Omit = omit,
+        subject: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[InvestigateListResponse]:
+        """Returns information for each email that matches the search parameter(s).
+
+        If the
+        search takes too long, the endpoint returns 202 with a Location header pointing
+        to a polling endpoint where results can be retrieved once ready.
+
+        Args:
+          account_id: Account Identifier
+
+          action_log: Determines if the message action log is included in the response.
+
+          detections_only: Determines if the search results will include detections or not.
+
+          domain: The sender domains the search filters by.
+
+          end: The end of the search date range. Defaults to `now`.
+
+          final_disposition: The dispositions the search filters by.
+
+          message_action: The message actions the search filters by.
+
+          page: Deprecated: Use cursor pagination instead.
+
+          per_page: The number of results per page.
+
+          query: The space-delimited term used in the query. The search is case-insensitive.
+
+              The content of the following email metadata fields are searched:
+
+              - alert_id
+              - CC
+              - From (envelope_from)
+              - From Name
+              - final_disposition
+              - md5 hash (of any attachment)
+              - sha1 hash (of any attachment)
+              - sha256 hash (of any attachment)
+              - name (of any attachment)
+              - Reason
+              - Received DateTime (yyyy-mm-ddThh:mm:ss)
+              - Sent DateTime (yyyy-mm-ddThh:mm:ss)
+              - ReplyTo
+              - To (envelope_to)
+              - To Name
+              - Message-ID
+              - smtp_helo_server_ip
+              - smtp_previous_hop_ip
+              - x_originating_ip
+              - Subject
+
+          start: The beginning of the search date range. Defaults to `now - 30 days`.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/investigate",
+            page=SyncV4PagePaginationArray[InvestigateListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "action_log": action_log,
+                        "alert_id": alert_id,
+                        "cursor": cursor,
+                        "detections_only": detections_only,
+                        "domain": domain,
+                        "end": end,
+                        "final_disposition": final_disposition,
+                        "message_action": message_action,
+                        "message_id": message_id,
+                        "metric": metric,
+                        "page": page,
+                        "per_page": per_page,
+                        "query": query,
+                        "recipient": recipient,
+                        "sender": sender,
+                        "start": start,
+                        "subject": subject,
+                    },
+                    investigate_list_params.InvestigateListParams,
+                ),
+            ),
+            model=InvestigateListResponse,
+        )
+
+    def get(
+        self,
+        postfix_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InvestigateGetResponse:
+        """
+        Get message details
+
+        Args:
+          account_id: Account Identifier
+
+          postfix_id: The identifier of the message.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not postfix_id:
+            raise ValueError(f"Expected a non-empty value for `postfix_id` but received {postfix_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/email-security/investigate/{postfix_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[InvestigateGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InvestigateGetResponse], ResultWrapper[InvestigateGetResponse]),
+        )
+
+
+class AsyncInvestigateResource(AsyncAPIResource):
+    @cached_property
+    def detections(self) -> AsyncDetectionsResource:
+        return AsyncDetectionsResource(self._client)
+
+    @cached_property
+    def preview(self) -> AsyncPreviewResource:
+        return AsyncPreviewResource(self._client)
+
+    @cached_property
+    def raw(self) -> AsyncRawResource:
+        return AsyncRawResource(self._client)
+
+    @cached_property
+    def trace(self) -> AsyncTraceResource:
+        return AsyncTraceResource(self._client)
+
+    @cached_property
+    def move(self) -> AsyncMoveResource:
+        return AsyncMoveResource(self._client)
+
+    @cached_property
+    def reclassify(self) -> AsyncReclassifyResource:
+        return AsyncReclassifyResource(self._client)
+
+    @cached_property
+    def release(self) -> AsyncReleaseResource:
+        return AsyncReleaseResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncInvestigateResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncInvestigateResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncInvestigateResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncInvestigateResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        action_log: bool | Omit = omit,
+        alert_id: str | Omit = omit,
+        cursor: str | Omit = omit,
+        detections_only: bool | Omit = omit,
+        domain: str | Omit = omit,
+        end: Union[str, datetime] | Omit = omit,
+        final_disposition: Literal["MALICIOUS", "SUSPICIOUS", "SPOOF", "SPAM", "BULK", "NONE"] | Omit = omit,
+        message_action: Literal["PREVIEW", "QUARANTINE_RELEASED", "MOVED"] | Omit = omit,
+        message_id: str | Omit = omit,
+        metric: str | Omit = omit,
+        page: Optional[int] | Omit = omit,
+        per_page: int | Omit = omit,
+        query: str | Omit = omit,
+        recipient: str | Omit = omit,
+        sender: str | Omit = omit,
+        start: Union[str, datetime] | Omit = omit,
+        subject: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[InvestigateListResponse, AsyncV4PagePaginationArray[InvestigateListResponse]]:
+        """Returns information for each email that matches the search parameter(s).
+
+        If the
+        search takes too long, the endpoint returns 202 with a Location header pointing
+        to a polling endpoint where results can be retrieved once ready.
+
+        Args:
+          account_id: Account Identifier
+
+          action_log: Determines if the message action log is included in the response.
+
+          detections_only: Determines if the search results will include detections or not.
+
+          domain: The sender domains the search filters by.
+
+          end: The end of the search date range. Defaults to `now`.
+
+          final_disposition: The dispositions the search filters by.
+
+          message_action: The message actions the search filters by.
+
+          page: Deprecated: Use cursor pagination instead.
+
+          per_page: The number of results per page.
+
+          query: The space-delimited term used in the query. The search is case-insensitive.
+
+              The content of the following email metadata fields are searched:
+
+              - alert_id
+              - CC
+              - From (envelope_from)
+              - From Name
+              - final_disposition
+              - md5 hash (of any attachment)
+              - sha1 hash (of any attachment)
+              - sha256 hash (of any attachment)
+              - name (of any attachment)
+              - Reason
+              - Received DateTime (yyyy-mm-ddThh:mm:ss)
+              - Sent DateTime (yyyy-mm-ddThh:mm:ss)
+              - ReplyTo
+              - To (envelope_to)
+              - To Name
+              - Message-ID
+              - smtp_helo_server_ip
+              - smtp_previous_hop_ip
+              - x_originating_ip
+              - Subject
+
+          start: The beginning of the search date range. Defaults to `now - 30 days`.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/investigate",
+            page=AsyncV4PagePaginationArray[InvestigateListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "action_log": action_log,
+                        "alert_id": alert_id,
+                        "cursor": cursor,
+                        "detections_only": detections_only,
+                        "domain": domain,
+                        "end": end,
+                        "final_disposition": final_disposition,
+                        "message_action": message_action,
+                        "message_id": message_id,
+                        "metric": metric,
+                        "page": page,
+                        "per_page": per_page,
+                        "query": query,
+                        "recipient": recipient,
+                        "sender": sender,
+                        "start": start,
+                        "subject": subject,
+                    },
+                    investigate_list_params.InvestigateListParams,
+                ),
+            ),
+            model=InvestigateListResponse,
+        )
+
+    async def get(
+        self,
+        postfix_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InvestigateGetResponse:
+        """
+        Get message details
+
+        Args:
+          account_id: Account Identifier
+
+          postfix_id: The identifier of the message.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not postfix_id:
+            raise ValueError(f"Expected a non-empty value for `postfix_id` but received {postfix_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/email-security/investigate/{postfix_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[InvestigateGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InvestigateGetResponse], ResultWrapper[InvestigateGetResponse]),
+        )
+
+
+class InvestigateResourceWithRawResponse:
+    def __init__(self, investigate: InvestigateResource) -> None:
+        self._investigate = investigate
+
+        self.list = to_raw_response_wrapper(
+            investigate.list,
+        )
+        self.get = to_raw_response_wrapper(
+            investigate.get,
+        )
+
+    @cached_property
+    def detections(self) -> DetectionsResourceWithRawResponse:
+        return DetectionsResourceWithRawResponse(self._investigate.detections)
+
+    @cached_property
+    def preview(self) -> PreviewResourceWithRawResponse:
+        return PreviewResourceWithRawResponse(self._investigate.preview)
+
+    @cached_property
+    def raw(self) -> RawResourceWithRawResponse:
+        return RawResourceWithRawResponse(self._investigate.raw)
+
+    @cached_property
+    def trace(self) -> TraceResourceWithRawResponse:
+        return TraceResourceWithRawResponse(self._investigate.trace)
+
+    @cached_property
+    def move(self) -> MoveResourceWithRawResponse:
+        return MoveResourceWithRawResponse(self._investigate.move)
+
+    @cached_property
+    def reclassify(self) -> ReclassifyResourceWithRawResponse:
+        return ReclassifyResourceWithRawResponse(self._investigate.reclassify)
+
+    @cached_property
+    def release(self) -> ReleaseResourceWithRawResponse:
+        return ReleaseResourceWithRawResponse(self._investigate.release)
+
+
+class AsyncInvestigateResourceWithRawResponse:
+    def __init__(self, investigate: AsyncInvestigateResource) -> None:
+        self._investigate = investigate
+
+        self.list = async_to_raw_response_wrapper(
+            investigate.list,
+        )
+        self.get = async_to_raw_response_wrapper(
+            investigate.get,
+        )
+
+    @cached_property
+    def detections(self) -> AsyncDetectionsResourceWithRawResponse:
+        return AsyncDetectionsResourceWithRawResponse(self._investigate.detections)
+
+    @cached_property
+    def preview(self) -> AsyncPreviewResourceWithRawResponse:
+        return AsyncPreviewResourceWithRawResponse(self._investigate.preview)
+
+    @cached_property
+    def raw(self) -> AsyncRawResourceWithRawResponse:
+        return AsyncRawResourceWithRawResponse(self._investigate.raw)
+
+    @cached_property
+    def trace(self) -> AsyncTraceResourceWithRawResponse:
+        return AsyncTraceResourceWithRawResponse(self._investigate.trace)
+
+    @cached_property
+    def move(self) -> AsyncMoveResourceWithRawResponse:
+        return AsyncMoveResourceWithRawResponse(self._investigate.move)
+
+    @cached_property
+    def reclassify(self) -> AsyncReclassifyResourceWithRawResponse:
+        return AsyncReclassifyResourceWithRawResponse(self._investigate.reclassify)
+
+    @cached_property
+    def release(self) -> AsyncReleaseResourceWithRawResponse:
+        return AsyncReleaseResourceWithRawResponse(self._investigate.release)
+
+
+class InvestigateResourceWithStreamingResponse:
+    def __init__(self, investigate: InvestigateResource) -> None:
+        self._investigate = investigate
+
+        self.list = to_streamed_response_wrapper(
+            investigate.list,
+        )
+        self.get = to_streamed_response_wrapper(
+            investigate.get,
+        )
+
+    @cached_property
+    def detections(self) -> DetectionsResourceWithStreamingResponse:
+        return DetectionsResourceWithStreamingResponse(self._investigate.detections)
+
+    @cached_property
+    def preview(self) -> PreviewResourceWithStreamingResponse:
+        return PreviewResourceWithStreamingResponse(self._investigate.preview)
+
+    @cached_property
+    def raw(self) -> RawResourceWithStreamingResponse:
+        return RawResourceWithStreamingResponse(self._investigate.raw)
+
+    @cached_property
+    def trace(self) -> TraceResourceWithStreamingResponse:
+        return TraceResourceWithStreamingResponse(self._investigate.trace)
+
+    @cached_property
+    def move(self) -> MoveResourceWithStreamingResponse:
+        return MoveResourceWithStreamingResponse(self._investigate.move)
+
+    @cached_property
+    def reclassify(self) -> ReclassifyResourceWithStreamingResponse:
+        return ReclassifyResourceWithStreamingResponse(self._investigate.reclassify)
+
+    @cached_property
+    def release(self) -> ReleaseResourceWithStreamingResponse:
+        return ReleaseResourceWithStreamingResponse(self._investigate.release)
+
+
+class AsyncInvestigateResourceWithStreamingResponse:
+    def __init__(self, investigate: AsyncInvestigateResource) -> None:
+        self._investigate = investigate
+
+        self.list = async_to_streamed_response_wrapper(
+            investigate.list,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            investigate.get,
+        )
+
+    @cached_property
+    def detections(self) -> AsyncDetectionsResourceWithStreamingResponse:
+        return AsyncDetectionsResourceWithStreamingResponse(self._investigate.detections)
+
+    @cached_property
+    def preview(self) -> AsyncPreviewResourceWithStreamingResponse:
+        return AsyncPreviewResourceWithStreamingResponse(self._investigate.preview)
+
+    @cached_property
+    def raw(self) -> AsyncRawResourceWithStreamingResponse:
+        return AsyncRawResourceWithStreamingResponse(self._investigate.raw)
+
+    @cached_property
+    def trace(self) -> AsyncTraceResourceWithStreamingResponse:
+        return AsyncTraceResourceWithStreamingResponse(self._investigate.trace)
+
+    @cached_property
+    def move(self) -> AsyncMoveResourceWithStreamingResponse:
+        return AsyncMoveResourceWithStreamingResponse(self._investigate.move)
+
+    @cached_property
+    def reclassify(self) -> AsyncReclassifyResourceWithStreamingResponse:
+        return AsyncReclassifyResourceWithStreamingResponse(self._investigate.reclassify)
+
+    @cached_property
+    def release(self) -> AsyncReleaseResourceWithStreamingResponse:
+        return AsyncReleaseResourceWithStreamingResponse(self._investigate.release)
diff --git a/src/cloudflare/resources/email_security/investigate/move.py b/src/cloudflare/resources/email_security/investigate/move.py
new file mode 100644
index 00000000000..489423e8a70
--- /dev/null
+++ b/src/cloudflare/resources/email_security/investigate/move.py
@@ -0,0 +1,315 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.email_security.investigate import move_bulk_params, move_create_params
+from ....types.email_security.investigate.move_bulk_response import MoveBulkResponse
+from ....types.email_security.investigate.move_create_response import MoveCreateResponse
+
+__all__ = ["MoveResource", "AsyncMoveResource"]
+
+
+class MoveResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> MoveResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return MoveResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> MoveResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return MoveResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        postfix_id: str,
+        *,
+        account_id: str,
+        destination: Literal[
+            "Inbox", "JunkEmail", "DeletedItems", "RecoverableItemsDeletions", "RecoverableItemsPurges"
+        ],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[MoveCreateResponse]:
+        """
+        Move a message
+
+        Args:
+          account_id: Account Identifier
+
+          postfix_id: The identifier of the message.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not postfix_id:
+            raise ValueError(f"Expected a non-empty value for `postfix_id` but received {postfix_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/investigate/{postfix_id}/move",
+            page=SyncSinglePage[MoveCreateResponse],
+            body=maybe_transform({"destination": destination}, move_create_params.MoveCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=MoveCreateResponse,
+            method="post",
+        )
+
+    def bulk(
+        self,
+        *,
+        account_id: str,
+        destination: Literal[
+            "Inbox", "JunkEmail", "DeletedItems", "RecoverableItemsDeletions", "RecoverableItemsPurges"
+        ],
+        ids: SequenceNotStr[str] | Omit = omit,
+        postfix_ids: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[MoveBulkResponse]:
+        """
+        Maximum batch size: 100 messages per request
+
+        Args:
+          account_id: Account Identifier
+
+          ids: List of message IDs to move.
+
+          postfix_ids: Deprecated: Use `ids` instead. List of message IDs to move.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/investigate/move",
+            page=SyncSinglePage[MoveBulkResponse],
+            body=maybe_transform(
+                {
+                    "destination": destination,
+                    "ids": ids,
+                    "postfix_ids": postfix_ids,
+                },
+                move_bulk_params.MoveBulkParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=MoveBulkResponse,
+            method="post",
+        )
+
+
+class AsyncMoveResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncMoveResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncMoveResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncMoveResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncMoveResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        postfix_id: str,
+        *,
+        account_id: str,
+        destination: Literal[
+            "Inbox", "JunkEmail", "DeletedItems", "RecoverableItemsDeletions", "RecoverableItemsPurges"
+        ],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[MoveCreateResponse, AsyncSinglePage[MoveCreateResponse]]:
+        """
+        Move a message
+
+        Args:
+          account_id: Account Identifier
+
+          postfix_id: The identifier of the message.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not postfix_id:
+            raise ValueError(f"Expected a non-empty value for `postfix_id` but received {postfix_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/investigate/{postfix_id}/move",
+            page=AsyncSinglePage[MoveCreateResponse],
+            body=maybe_transform({"destination": destination}, move_create_params.MoveCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=MoveCreateResponse,
+            method="post",
+        )
+
+    def bulk(
+        self,
+        *,
+        account_id: str,
+        destination: Literal[
+            "Inbox", "JunkEmail", "DeletedItems", "RecoverableItemsDeletions", "RecoverableItemsPurges"
+        ],
+        ids: SequenceNotStr[str] | Omit = omit,
+        postfix_ids: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[MoveBulkResponse, AsyncSinglePage[MoveBulkResponse]]:
+        """
+        Maximum batch size: 100 messages per request
+
+        Args:
+          account_id: Account Identifier
+
+          ids: List of message IDs to move.
+
+          postfix_ids: Deprecated: Use `ids` instead. List of message IDs to move.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/investigate/move",
+            page=AsyncSinglePage[MoveBulkResponse],
+            body=maybe_transform(
+                {
+                    "destination": destination,
+                    "ids": ids,
+                    "postfix_ids": postfix_ids,
+                },
+                move_bulk_params.MoveBulkParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=MoveBulkResponse,
+            method="post",
+        )
+
+
+class MoveResourceWithRawResponse:
+    def __init__(self, move: MoveResource) -> None:
+        self._move = move
+
+        self.create = to_raw_response_wrapper(
+            move.create,
+        )
+        self.bulk = to_raw_response_wrapper(
+            move.bulk,
+        )
+
+
+class AsyncMoveResourceWithRawResponse:
+    def __init__(self, move: AsyncMoveResource) -> None:
+        self._move = move
+
+        self.create = async_to_raw_response_wrapper(
+            move.create,
+        )
+        self.bulk = async_to_raw_response_wrapper(
+            move.bulk,
+        )
+
+
+class MoveResourceWithStreamingResponse:
+    def __init__(self, move: MoveResource) -> None:
+        self._move = move
+
+        self.create = to_streamed_response_wrapper(
+            move.create,
+        )
+        self.bulk = to_streamed_response_wrapper(
+            move.bulk,
+        )
+
+
+class AsyncMoveResourceWithStreamingResponse:
+    def __init__(self, move: AsyncMoveResource) -> None:
+        self._move = move
+
+        self.create = async_to_streamed_response_wrapper(
+            move.create,
+        )
+        self.bulk = async_to_streamed_response_wrapper(
+            move.bulk,
+        )
diff --git a/src/cloudflare/resources/email_security/investigate/preview.py b/src/cloudflare/resources/email_security/investigate/preview.py
new file mode 100644
index 00000000000..eb256fad862
--- /dev/null
+++ b/src/cloudflare/resources/email_security/investigate/preview.py
@@ -0,0 +1,291 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.email_security.investigate import preview_create_params
+from ....types.email_security.investigate.preview_get_response import PreviewGetResponse
+from ....types.email_security.investigate.preview_create_response import PreviewCreateResponse
+
+__all__ = ["PreviewResource", "AsyncPreviewResource"]
+
+
+class PreviewResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> PreviewResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return PreviewResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> PreviewResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return PreviewResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        postfix_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PreviewCreateResponse:
+        """
+        Preview for non-detection messages
+
+        Args:
+          account_id: Account Identifier
+
+          postfix_id: The identifier of the message.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/email-security/investigate/preview",
+            body=maybe_transform({"postfix_id": postfix_id}, preview_create_params.PreviewCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PreviewCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PreviewCreateResponse], ResultWrapper[PreviewCreateResponse]),
+        )
+
+    def get(
+        self,
+        postfix_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PreviewGetResponse:
+        """
+        Returns a preview of the message body as a base64 encoded PNG image for
+        non-benign messages.
+
+        Args:
+          account_id: Account Identifier
+
+          postfix_id: The identifier of the message.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not postfix_id:
+            raise ValueError(f"Expected a non-empty value for `postfix_id` but received {postfix_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/email-security/investigate/{postfix_id}/preview",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PreviewGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PreviewGetResponse], ResultWrapper[PreviewGetResponse]),
+        )
+
+
+class AsyncPreviewResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncPreviewResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncPreviewResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncPreviewResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncPreviewResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        postfix_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PreviewCreateResponse:
+        """
+        Preview for non-detection messages
+
+        Args:
+          account_id: Account Identifier
+
+          postfix_id: The identifier of the message.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/email-security/investigate/preview",
+            body=await async_maybe_transform({"postfix_id": postfix_id}, preview_create_params.PreviewCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PreviewCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PreviewCreateResponse], ResultWrapper[PreviewCreateResponse]),
+        )
+
+    async def get(
+        self,
+        postfix_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PreviewGetResponse:
+        """
+        Returns a preview of the message body as a base64 encoded PNG image for
+        non-benign messages.
+
+        Args:
+          account_id: Account Identifier
+
+          postfix_id: The identifier of the message.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not postfix_id:
+            raise ValueError(f"Expected a non-empty value for `postfix_id` but received {postfix_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/email-security/investigate/{postfix_id}/preview",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PreviewGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PreviewGetResponse], ResultWrapper[PreviewGetResponse]),
+        )
+
+
+class PreviewResourceWithRawResponse:
+    def __init__(self, preview: PreviewResource) -> None:
+        self._preview = preview
+
+        self.create = to_raw_response_wrapper(
+            preview.create,
+        )
+        self.get = to_raw_response_wrapper(
+            preview.get,
+        )
+
+
+class AsyncPreviewResourceWithRawResponse:
+    def __init__(self, preview: AsyncPreviewResource) -> None:
+        self._preview = preview
+
+        self.create = async_to_raw_response_wrapper(
+            preview.create,
+        )
+        self.get = async_to_raw_response_wrapper(
+            preview.get,
+        )
+
+
+class PreviewResourceWithStreamingResponse:
+    def __init__(self, preview: PreviewResource) -> None:
+        self._preview = preview
+
+        self.create = to_streamed_response_wrapper(
+            preview.create,
+        )
+        self.get = to_streamed_response_wrapper(
+            preview.get,
+        )
+
+
+class AsyncPreviewResourceWithStreamingResponse:
+    def __init__(self, preview: AsyncPreviewResource) -> None:
+        self._preview = preview
+
+        self.create = async_to_streamed_response_wrapper(
+            preview.create,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            preview.get,
+        )
diff --git a/src/cloudflare/resources/email_security/investigate/raw.py b/src/cloudflare/resources/email_security/investigate/raw.py
new file mode 100644
index 00000000000..473f6a6330e
--- /dev/null
+++ b/src/cloudflare/resources/email_security/investigate/raw.py
@@ -0,0 +1,188 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.email_security.investigate.raw_get_response import RawGetResponse
+
+__all__ = ["RawResource", "AsyncRawResource"]
+
+
+class RawResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> RawResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return RawResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> RawResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return RawResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        postfix_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RawGetResponse:
+        """
+        Returns the raw eml of any non-benign message.
+
+        Args:
+          account_id: Account Identifier
+
+          postfix_id: The identifier of the message.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not postfix_id:
+            raise ValueError(f"Expected a non-empty value for `postfix_id` but received {postfix_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/email-security/investigate/{postfix_id}/raw",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RawGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[RawGetResponse], ResultWrapper[RawGetResponse]),
+        )
+
+
+class AsyncRawResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncRawResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncRawResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncRawResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncRawResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        postfix_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RawGetResponse:
+        """
+        Returns the raw eml of any non-benign message.
+
+        Args:
+          account_id: Account Identifier
+
+          postfix_id: The identifier of the message.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not postfix_id:
+            raise ValueError(f"Expected a non-empty value for `postfix_id` but received {postfix_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/email-security/investigate/{postfix_id}/raw",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RawGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[RawGetResponse], ResultWrapper[RawGetResponse]),
+        )
+
+
+class RawResourceWithRawResponse:
+    def __init__(self, raw: RawResource) -> None:
+        self._raw = raw
+
+        self.get = to_raw_response_wrapper(
+            raw.get,
+        )
+
+
+class AsyncRawResourceWithRawResponse:
+    def __init__(self, raw: AsyncRawResource) -> None:
+        self._raw = raw
+
+        self.get = async_to_raw_response_wrapper(
+            raw.get,
+        )
+
+
+class RawResourceWithStreamingResponse:
+    def __init__(self, raw: RawResource) -> None:
+        self._raw = raw
+
+        self.get = to_streamed_response_wrapper(
+            raw.get,
+        )
+
+
+class AsyncRawResourceWithStreamingResponse:
+    def __init__(self, raw: AsyncRawResource) -> None:
+        self._raw = raw
+
+        self.get = async_to_streamed_response_wrapper(
+            raw.get,
+        )
diff --git a/src/cloudflare/resources/email_security/investigate/reclassify.py b/src/cloudflare/resources/email_security/investigate/reclassify.py
new file mode 100644
index 00000000000..61efd16b622
--- /dev/null
+++ b/src/cloudflare/resources/email_security/investigate/reclassify.py
@@ -0,0 +1,216 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.email_security.investigate import reclassify_create_params
+
+__all__ = ["ReclassifyResource", "AsyncReclassifyResource"]
+
+
+class ReclassifyResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ReclassifyResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ReclassifyResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ReclassifyResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ReclassifyResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        postfix_id: str,
+        *,
+        account_id: str,
+        expected_disposition: Literal["NONE", "BULK", "MALICIOUS", "SPAM", "SPOOF", "SUSPICIOUS"],
+        eml_content: str | Omit = omit,
+        escalated_submission_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Change email classfication
+
+        Args:
+          account_id: Account Identifier
+
+          postfix_id: The identifier of the message.
+
+          eml_content: Base64 encoded content of the EML file
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not postfix_id:
+            raise ValueError(f"Expected a non-empty value for `postfix_id` but received {postfix_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/email-security/investigate/{postfix_id}/reclassify",
+            body=maybe_transform(
+                {
+                    "expected_disposition": expected_disposition,
+                    "eml_content": eml_content,
+                    "escalated_submission_id": escalated_submission_id,
+                },
+                reclassify_create_params.ReclassifyCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+
+class AsyncReclassifyResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncReclassifyResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncReclassifyResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncReclassifyResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncReclassifyResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        postfix_id: str,
+        *,
+        account_id: str,
+        expected_disposition: Literal["NONE", "BULK", "MALICIOUS", "SPAM", "SPOOF", "SUSPICIOUS"],
+        eml_content: str | Omit = omit,
+        escalated_submission_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Change email classfication
+
+        Args:
+          account_id: Account Identifier
+
+          postfix_id: The identifier of the message.
+
+          eml_content: Base64 encoded content of the EML file
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not postfix_id:
+            raise ValueError(f"Expected a non-empty value for `postfix_id` but received {postfix_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/email-security/investigate/{postfix_id}/reclassify",
+            body=await async_maybe_transform(
+                {
+                    "expected_disposition": expected_disposition,
+                    "eml_content": eml_content,
+                    "escalated_submission_id": escalated_submission_id,
+                },
+                reclassify_create_params.ReclassifyCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+
+class ReclassifyResourceWithRawResponse:
+    def __init__(self, reclassify: ReclassifyResource) -> None:
+        self._reclassify = reclassify
+
+        self.create = to_raw_response_wrapper(
+            reclassify.create,
+        )
+
+
+class AsyncReclassifyResourceWithRawResponse:
+    def __init__(self, reclassify: AsyncReclassifyResource) -> None:
+        self._reclassify = reclassify
+
+        self.create = async_to_raw_response_wrapper(
+            reclassify.create,
+        )
+
+
+class ReclassifyResourceWithStreamingResponse:
+    def __init__(self, reclassify: ReclassifyResource) -> None:
+        self._reclassify = reclassify
+
+        self.create = to_streamed_response_wrapper(
+            reclassify.create,
+        )
+
+
+class AsyncReclassifyResourceWithStreamingResponse:
+    def __init__(self, reclassify: AsyncReclassifyResource) -> None:
+        self._reclassify = reclassify
+
+        self.create = async_to_streamed_response_wrapper(
+            reclassify.create,
+        )
diff --git a/src/cloudflare/resources/email_security/investigate/release.py b/src/cloudflare/resources/email_security/investigate/release.py
new file mode 100644
index 00000000000..12789ed5119
--- /dev/null
+++ b/src/cloudflare/resources/email_security/investigate/release.py
@@ -0,0 +1,181 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, SequenceNotStr, not_given
+from ...._utils import maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.email_security.investigate.release_bulk_response import ReleaseBulkResponse
+
+__all__ = ["ReleaseResource", "AsyncReleaseResource"]
+
+
+class ReleaseResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ReleaseResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ReleaseResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ReleaseResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ReleaseResourceWithStreamingResponse(self)
+
+    def bulk(
+        self,
+        *,
+        account_id: str,
+        body: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[ReleaseBulkResponse]:
+        """
+        Release messages from quarantine
+
+        Args:
+          account_id: Account Identifier
+
+          body: A list of messages identfied by their `postfix_id`s that should be released.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/investigate/release",
+            page=SyncSinglePage[ReleaseBulkResponse],
+            body=maybe_transform(body, SequenceNotStr[str]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=ReleaseBulkResponse,
+            method="post",
+        )
+
+
+class AsyncReleaseResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncReleaseResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncReleaseResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncReleaseResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncReleaseResourceWithStreamingResponse(self)
+
+    def bulk(
+        self,
+        *,
+        account_id: str,
+        body: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ReleaseBulkResponse, AsyncSinglePage[ReleaseBulkResponse]]:
+        """
+        Release messages from quarantine
+
+        Args:
+          account_id: Account Identifier
+
+          body: A list of messages identfied by their `postfix_id`s that should be released.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/investigate/release",
+            page=AsyncSinglePage[ReleaseBulkResponse],
+            body=maybe_transform(body, SequenceNotStr[str]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=ReleaseBulkResponse,
+            method="post",
+        )
+
+
+class ReleaseResourceWithRawResponse:
+    def __init__(self, release: ReleaseResource) -> None:
+        self._release = release
+
+        self.bulk = to_raw_response_wrapper(
+            release.bulk,
+        )
+
+
+class AsyncReleaseResourceWithRawResponse:
+    def __init__(self, release: AsyncReleaseResource) -> None:
+        self._release = release
+
+        self.bulk = async_to_raw_response_wrapper(
+            release.bulk,
+        )
+
+
+class ReleaseResourceWithStreamingResponse:
+    def __init__(self, release: ReleaseResource) -> None:
+        self._release = release
+
+        self.bulk = to_streamed_response_wrapper(
+            release.bulk,
+        )
+
+
+class AsyncReleaseResourceWithStreamingResponse:
+    def __init__(self, release: AsyncReleaseResource) -> None:
+        self._release = release
+
+        self.bulk = async_to_streamed_response_wrapper(
+            release.bulk,
+        )
diff --git a/src/cloudflare/resources/email_security/investigate/trace.py b/src/cloudflare/resources/email_security/investigate/trace.py
new file mode 100644
index 00000000000..6ca1601d587
--- /dev/null
+++ b/src/cloudflare/resources/email_security/investigate/trace.py
@@ -0,0 +1,188 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.email_security.investigate.trace_get_response import TraceGetResponse
+
+__all__ = ["TraceResource", "AsyncTraceResource"]
+
+
+class TraceResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> TraceResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TraceResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TraceResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TraceResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        postfix_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TraceGetResponse:
+        """
+        Get email trace
+
+        Args:
+          account_id: Account Identifier
+
+          postfix_id: The identifier of the message.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not postfix_id:
+            raise ValueError(f"Expected a non-empty value for `postfix_id` but received {postfix_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/email-security/investigate/{postfix_id}/trace",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TraceGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TraceGetResponse], ResultWrapper[TraceGetResponse]),
+        )
+
+
+class AsyncTraceResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncTraceResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTraceResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTraceResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTraceResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        postfix_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TraceGetResponse:
+        """
+        Get email trace
+
+        Args:
+          account_id: Account Identifier
+
+          postfix_id: The identifier of the message.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not postfix_id:
+            raise ValueError(f"Expected a non-empty value for `postfix_id` but received {postfix_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/email-security/investigate/{postfix_id}/trace",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TraceGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TraceGetResponse], ResultWrapper[TraceGetResponse]),
+        )
+
+
+class TraceResourceWithRawResponse:
+    def __init__(self, trace: TraceResource) -> None:
+        self._trace = trace
+
+        self.get = to_raw_response_wrapper(
+            trace.get,
+        )
+
+
+class AsyncTraceResourceWithRawResponse:
+    def __init__(self, trace: AsyncTraceResource) -> None:
+        self._trace = trace
+
+        self.get = async_to_raw_response_wrapper(
+            trace.get,
+        )
+
+
+class TraceResourceWithStreamingResponse:
+    def __init__(self, trace: TraceResource) -> None:
+        self._trace = trace
+
+        self.get = to_streamed_response_wrapper(
+            trace.get,
+        )
+
+
+class AsyncTraceResourceWithStreamingResponse:
+    def __init__(self, trace: AsyncTraceResource) -> None:
+        self._trace = trace
+
+        self.get = async_to_streamed_response_wrapper(
+            trace.get,
+        )
diff --git a/src/cloudflare/resources/email_security/settings/__init__.py b/src/cloudflare/resources/email_security/settings/__init__.py
new file mode 100644
index 00000000000..0c5dd6337f8
--- /dev/null
+++ b/src/cloudflare/resources/email_security/settings/__init__.py
@@ -0,0 +1,89 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .domains import (
+    DomainsResource,
+    AsyncDomainsResource,
+    DomainsResourceWithRawResponse,
+    AsyncDomainsResourceWithRawResponse,
+    DomainsResourceWithStreamingResponse,
+    AsyncDomainsResourceWithStreamingResponse,
+)
+from .settings import (
+    SettingsResource,
+    AsyncSettingsResource,
+    SettingsResourceWithRawResponse,
+    AsyncSettingsResourceWithRawResponse,
+    SettingsResourceWithStreamingResponse,
+    AsyncSettingsResourceWithStreamingResponse,
+)
+from .block_senders import (
+    BlockSendersResource,
+    AsyncBlockSendersResource,
+    BlockSendersResourceWithRawResponse,
+    AsyncBlockSendersResourceWithRawResponse,
+    BlockSendersResourceWithStreamingResponse,
+    AsyncBlockSendersResourceWithStreamingResponse,
+)
+from .allow_policies import (
+    AllowPoliciesResource,
+    AsyncAllowPoliciesResource,
+    AllowPoliciesResourceWithRawResponse,
+    AsyncAllowPoliciesResourceWithRawResponse,
+    AllowPoliciesResourceWithStreamingResponse,
+    AsyncAllowPoliciesResourceWithStreamingResponse,
+)
+from .trusted_domains import (
+    TrustedDomainsResource,
+    AsyncTrustedDomainsResource,
+    TrustedDomainsResourceWithRawResponse,
+    AsyncTrustedDomainsResourceWithRawResponse,
+    TrustedDomainsResourceWithStreamingResponse,
+    AsyncTrustedDomainsResourceWithStreamingResponse,
+)
+from .impersonation_registry import (
+    ImpersonationRegistryResource,
+    AsyncImpersonationRegistryResource,
+    ImpersonationRegistryResourceWithRawResponse,
+    AsyncImpersonationRegistryResourceWithRawResponse,
+    ImpersonationRegistryResourceWithStreamingResponse,
+    AsyncImpersonationRegistryResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "AllowPoliciesResource",
+    "AsyncAllowPoliciesResource",
+    "AllowPoliciesResourceWithRawResponse",
+    "AsyncAllowPoliciesResourceWithRawResponse",
+    "AllowPoliciesResourceWithStreamingResponse",
+    "AsyncAllowPoliciesResourceWithStreamingResponse",
+    "BlockSendersResource",
+    "AsyncBlockSendersResource",
+    "BlockSendersResourceWithRawResponse",
+    "AsyncBlockSendersResourceWithRawResponse",
+    "BlockSendersResourceWithStreamingResponse",
+    "AsyncBlockSendersResourceWithStreamingResponse",
+    "DomainsResource",
+    "AsyncDomainsResource",
+    "DomainsResourceWithRawResponse",
+    "AsyncDomainsResourceWithRawResponse",
+    "DomainsResourceWithStreamingResponse",
+    "AsyncDomainsResourceWithStreamingResponse",
+    "ImpersonationRegistryResource",
+    "AsyncImpersonationRegistryResource",
+    "ImpersonationRegistryResourceWithRawResponse",
+    "AsyncImpersonationRegistryResourceWithRawResponse",
+    "ImpersonationRegistryResourceWithStreamingResponse",
+    "AsyncImpersonationRegistryResourceWithStreamingResponse",
+    "TrustedDomainsResource",
+    "AsyncTrustedDomainsResource",
+    "TrustedDomainsResourceWithRawResponse",
+    "AsyncTrustedDomainsResourceWithRawResponse",
+    "TrustedDomainsResourceWithStreamingResponse",
+    "AsyncTrustedDomainsResourceWithStreamingResponse",
+    "SettingsResource",
+    "AsyncSettingsResource",
+    "SettingsResourceWithRawResponse",
+    "AsyncSettingsResourceWithRawResponse",
+    "SettingsResourceWithStreamingResponse",
+    "AsyncSettingsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/email_security/settings/allow_policies.py b/src/cloudflare/resources/email_security/settings/allow_policies.py
new file mode 100644
index 00000000000..a2b0da56230
--- /dev/null
+++ b/src/cloudflare/resources/email_security/settings/allow_policies.py
@@ -0,0 +1,798 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.email_security.settings import (
+    allow_policy_edit_params,
+    allow_policy_list_params,
+    allow_policy_create_params,
+)
+from ....types.email_security.settings.allow_policy_get_response import AllowPolicyGetResponse
+from ....types.email_security.settings.allow_policy_edit_response import AllowPolicyEditResponse
+from ....types.email_security.settings.allow_policy_list_response import AllowPolicyListResponse
+from ....types.email_security.settings.allow_policy_create_response import AllowPolicyCreateResponse
+from ....types.email_security.settings.allow_policy_delete_response import AllowPolicyDeleteResponse
+
+__all__ = ["AllowPoliciesResource", "AsyncAllowPoliciesResource"]
+
+
+class AllowPoliciesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AllowPoliciesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AllowPoliciesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AllowPoliciesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AllowPoliciesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        is_acceptable_sender: bool,
+        is_exempt_recipient: bool,
+        is_regex: bool,
+        is_trusted_sender: bool,
+        pattern: str,
+        pattern_type: Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"],
+        verify_sender: bool,
+        comments: Optional[str] | Omit = omit,
+        is_recipient: bool | Omit = omit,
+        is_sender: bool | Omit = omit,
+        is_spoof: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AllowPolicyCreateResponse:
+        """
+        Create an email allow policy
+
+        Args:
+          account_id: Account Identifier
+
+          is_acceptable_sender: Messages from this sender will be exempted from Spam, Spoof and Bulk
+              dispositions. Note: This will not exempt messages with Malicious or Suspicious
+              dispositions.
+
+          is_exempt_recipient: Messages to this recipient will bypass all detections.
+
+          is_trusted_sender: Messages from this sender will bypass all detections and link following.
+
+          verify_sender: Enforce DMARC, SPF or DKIM authentication. When on, Email Security only honors
+              policies that pass authentication.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/email-security/settings/allow_policies",
+            body=maybe_transform(
+                {
+                    "is_acceptable_sender": is_acceptable_sender,
+                    "is_exempt_recipient": is_exempt_recipient,
+                    "is_regex": is_regex,
+                    "is_trusted_sender": is_trusted_sender,
+                    "pattern": pattern,
+                    "pattern_type": pattern_type,
+                    "verify_sender": verify_sender,
+                    "comments": comments,
+                    "is_recipient": is_recipient,
+                    "is_sender": is_sender,
+                    "is_spoof": is_spoof,
+                },
+                allow_policy_create_params.AllowPolicyCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AllowPolicyCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AllowPolicyCreateResponse], ResultWrapper[AllowPolicyCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        is_acceptable_sender: bool | Omit = omit,
+        is_exempt_recipient: bool | Omit = omit,
+        is_recipient: bool | Omit = omit,
+        is_sender: bool | Omit = omit,
+        is_spoof: bool | Omit = omit,
+        is_trusted_sender: bool | Omit = omit,
+        order: Literal["pattern", "created_at"] | Omit = omit,
+        page: int | Omit = omit,
+        pattern: str | Omit = omit,
+        pattern_type: Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"] | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        verify_sender: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[AllowPolicyListResponse]:
+        """
+        Lists, searches, and sorts an account’s email allow policies.
+
+        Args:
+          account_id: Account Identifier
+
+          direction: The sorting direction.
+
+          order: The field to sort by.
+
+          page: The page number of paginated results.
+
+          per_page: The number of results per page.
+
+          search: Allows searching in multiple properties of a record simultaneously. This
+              parameter is intended for human users, not automation. Its exact behavior is
+              intentionally left unspecified and is subject to change in the future.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/settings/allow_policies",
+            page=SyncV4PagePaginationArray[AllowPolicyListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "is_acceptable_sender": is_acceptable_sender,
+                        "is_exempt_recipient": is_exempt_recipient,
+                        "is_recipient": is_recipient,
+                        "is_sender": is_sender,
+                        "is_spoof": is_spoof,
+                        "is_trusted_sender": is_trusted_sender,
+                        "order": order,
+                        "page": page,
+                        "pattern": pattern,
+                        "pattern_type": pattern_type,
+                        "per_page": per_page,
+                        "search": search,
+                        "verify_sender": verify_sender,
+                    },
+                    allow_policy_list_params.AllowPolicyListParams,
+                ),
+            ),
+            model=AllowPolicyListResponse,
+        )
+
+    def delete(
+        self,
+        policy_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AllowPolicyDeleteResponse:
+        """
+        Delete an email allow policy
+
+        Args:
+          account_id: Account Identifier
+
+          policy_id: The unique identifier for the allow policy.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/email-security/settings/allow_policies/{policy_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AllowPolicyDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AllowPolicyDeleteResponse], ResultWrapper[AllowPolicyDeleteResponse]),
+        )
+
+    def edit(
+        self,
+        policy_id: int,
+        *,
+        account_id: str,
+        comments: Optional[str] | Omit = omit,
+        is_acceptable_sender: Optional[bool] | Omit = omit,
+        is_exempt_recipient: Optional[bool] | Omit = omit,
+        is_regex: Optional[bool] | Omit = omit,
+        is_trusted_sender: Optional[bool] | Omit = omit,
+        pattern: Optional[str] | Omit = omit,
+        pattern_type: Optional[Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"]] | Omit = omit,
+        verify_sender: Optional[bool] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AllowPolicyEditResponse:
+        """
+        Update an email allow policy
+
+        Args:
+          account_id: Account Identifier
+
+          policy_id: The unique identifier for the allow policy.
+
+          is_acceptable_sender: Messages from this sender will be exempted from Spam, Spoof and Bulk
+              dispositions. Note: This will not exempt messages with Malicious or Suspicious
+              dispositions.
+
+          is_exempt_recipient: Messages to this recipient will bypass all detections.
+
+          is_trusted_sender: Messages from this sender will bypass all detections and link following.
+
+          verify_sender: Enforce DMARC, SPF or DKIM authentication. When on, Email Security only honors
+              policies that pass authentication.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/email-security/settings/allow_policies/{policy_id}",
+            body=maybe_transform(
+                {
+                    "comments": comments,
+                    "is_acceptable_sender": is_acceptable_sender,
+                    "is_exempt_recipient": is_exempt_recipient,
+                    "is_regex": is_regex,
+                    "is_trusted_sender": is_trusted_sender,
+                    "pattern": pattern,
+                    "pattern_type": pattern_type,
+                    "verify_sender": verify_sender,
+                },
+                allow_policy_edit_params.AllowPolicyEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AllowPolicyEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AllowPolicyEditResponse], ResultWrapper[AllowPolicyEditResponse]),
+        )
+
+    def get(
+        self,
+        policy_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AllowPolicyGetResponse:
+        """
+        Get an email allow policy
+
+        Args:
+          account_id: Account Identifier
+
+          policy_id: The unique identifier for the allow policy.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/email-security/settings/allow_policies/{policy_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AllowPolicyGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AllowPolicyGetResponse], ResultWrapper[AllowPolicyGetResponse]),
+        )
+
+
+class AsyncAllowPoliciesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncAllowPoliciesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAllowPoliciesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAllowPoliciesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAllowPoliciesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        is_acceptable_sender: bool,
+        is_exempt_recipient: bool,
+        is_regex: bool,
+        is_trusted_sender: bool,
+        pattern: str,
+        pattern_type: Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"],
+        verify_sender: bool,
+        comments: Optional[str] | Omit = omit,
+        is_recipient: bool | Omit = omit,
+        is_sender: bool | Omit = omit,
+        is_spoof: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AllowPolicyCreateResponse:
+        """
+        Create an email allow policy
+
+        Args:
+          account_id: Account Identifier
+
+          is_acceptable_sender: Messages from this sender will be exempted from Spam, Spoof and Bulk
+              dispositions. Note: This will not exempt messages with Malicious or Suspicious
+              dispositions.
+
+          is_exempt_recipient: Messages to this recipient will bypass all detections.
+
+          is_trusted_sender: Messages from this sender will bypass all detections and link following.
+
+          verify_sender: Enforce DMARC, SPF or DKIM authentication. When on, Email Security only honors
+              policies that pass authentication.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/email-security/settings/allow_policies",
+            body=await async_maybe_transform(
+                {
+                    "is_acceptable_sender": is_acceptable_sender,
+                    "is_exempt_recipient": is_exempt_recipient,
+                    "is_regex": is_regex,
+                    "is_trusted_sender": is_trusted_sender,
+                    "pattern": pattern,
+                    "pattern_type": pattern_type,
+                    "verify_sender": verify_sender,
+                    "comments": comments,
+                    "is_recipient": is_recipient,
+                    "is_sender": is_sender,
+                    "is_spoof": is_spoof,
+                },
+                allow_policy_create_params.AllowPolicyCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AllowPolicyCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AllowPolicyCreateResponse], ResultWrapper[AllowPolicyCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        is_acceptable_sender: bool | Omit = omit,
+        is_exempt_recipient: bool | Omit = omit,
+        is_recipient: bool | Omit = omit,
+        is_sender: bool | Omit = omit,
+        is_spoof: bool | Omit = omit,
+        is_trusted_sender: bool | Omit = omit,
+        order: Literal["pattern", "created_at"] | Omit = omit,
+        page: int | Omit = omit,
+        pattern: str | Omit = omit,
+        pattern_type: Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"] | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        verify_sender: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[AllowPolicyListResponse, AsyncV4PagePaginationArray[AllowPolicyListResponse]]:
+        """
+        Lists, searches, and sorts an account’s email allow policies.
+
+        Args:
+          account_id: Account Identifier
+
+          direction: The sorting direction.
+
+          order: The field to sort by.
+
+          page: The page number of paginated results.
+
+          per_page: The number of results per page.
+
+          search: Allows searching in multiple properties of a record simultaneously. This
+              parameter is intended for human users, not automation. Its exact behavior is
+              intentionally left unspecified and is subject to change in the future.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/settings/allow_policies",
+            page=AsyncV4PagePaginationArray[AllowPolicyListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "is_acceptable_sender": is_acceptable_sender,
+                        "is_exempt_recipient": is_exempt_recipient,
+                        "is_recipient": is_recipient,
+                        "is_sender": is_sender,
+                        "is_spoof": is_spoof,
+                        "is_trusted_sender": is_trusted_sender,
+                        "order": order,
+                        "page": page,
+                        "pattern": pattern,
+                        "pattern_type": pattern_type,
+                        "per_page": per_page,
+                        "search": search,
+                        "verify_sender": verify_sender,
+                    },
+                    allow_policy_list_params.AllowPolicyListParams,
+                ),
+            ),
+            model=AllowPolicyListResponse,
+        )
+
+    async def delete(
+        self,
+        policy_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AllowPolicyDeleteResponse:
+        """
+        Delete an email allow policy
+
+        Args:
+          account_id: Account Identifier
+
+          policy_id: The unique identifier for the allow policy.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/email-security/settings/allow_policies/{policy_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AllowPolicyDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AllowPolicyDeleteResponse], ResultWrapper[AllowPolicyDeleteResponse]),
+        )
+
+    async def edit(
+        self,
+        policy_id: int,
+        *,
+        account_id: str,
+        comments: Optional[str] | Omit = omit,
+        is_acceptable_sender: Optional[bool] | Omit = omit,
+        is_exempt_recipient: Optional[bool] | Omit = omit,
+        is_regex: Optional[bool] | Omit = omit,
+        is_trusted_sender: Optional[bool] | Omit = omit,
+        pattern: Optional[str] | Omit = omit,
+        pattern_type: Optional[Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"]] | Omit = omit,
+        verify_sender: Optional[bool] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AllowPolicyEditResponse:
+        """
+        Update an email allow policy
+
+        Args:
+          account_id: Account Identifier
+
+          policy_id: The unique identifier for the allow policy.
+
+          is_acceptable_sender: Messages from this sender will be exempted from Spam, Spoof and Bulk
+              dispositions. Note: This will not exempt messages with Malicious or Suspicious
+              dispositions.
+
+          is_exempt_recipient: Messages to this recipient will bypass all detections.
+
+          is_trusted_sender: Messages from this sender will bypass all detections and link following.
+
+          verify_sender: Enforce DMARC, SPF or DKIM authentication. When on, Email Security only honors
+              policies that pass authentication.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/email-security/settings/allow_policies/{policy_id}",
+            body=await async_maybe_transform(
+                {
+                    "comments": comments,
+                    "is_acceptable_sender": is_acceptable_sender,
+                    "is_exempt_recipient": is_exempt_recipient,
+                    "is_regex": is_regex,
+                    "is_trusted_sender": is_trusted_sender,
+                    "pattern": pattern,
+                    "pattern_type": pattern_type,
+                    "verify_sender": verify_sender,
+                },
+                allow_policy_edit_params.AllowPolicyEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AllowPolicyEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AllowPolicyEditResponse], ResultWrapper[AllowPolicyEditResponse]),
+        )
+
+    async def get(
+        self,
+        policy_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AllowPolicyGetResponse:
+        """
+        Get an email allow policy
+
+        Args:
+          account_id: Account Identifier
+
+          policy_id: The unique identifier for the allow policy.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/email-security/settings/allow_policies/{policy_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AllowPolicyGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AllowPolicyGetResponse], ResultWrapper[AllowPolicyGetResponse]),
+        )
+
+
+class AllowPoliciesResourceWithRawResponse:
+    def __init__(self, allow_policies: AllowPoliciesResource) -> None:
+        self._allow_policies = allow_policies
+
+        self.create = to_raw_response_wrapper(
+            allow_policies.create,
+        )
+        self.list = to_raw_response_wrapper(
+            allow_policies.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            allow_policies.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            allow_policies.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            allow_policies.get,
+        )
+
+
+class AsyncAllowPoliciesResourceWithRawResponse:
+    def __init__(self, allow_policies: AsyncAllowPoliciesResource) -> None:
+        self._allow_policies = allow_policies
+
+        self.create = async_to_raw_response_wrapper(
+            allow_policies.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            allow_policies.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            allow_policies.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            allow_policies.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            allow_policies.get,
+        )
+
+
+class AllowPoliciesResourceWithStreamingResponse:
+    def __init__(self, allow_policies: AllowPoliciesResource) -> None:
+        self._allow_policies = allow_policies
+
+        self.create = to_streamed_response_wrapper(
+            allow_policies.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            allow_policies.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            allow_policies.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            allow_policies.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            allow_policies.get,
+        )
+
+
+class AsyncAllowPoliciesResourceWithStreamingResponse:
+    def __init__(self, allow_policies: AsyncAllowPoliciesResource) -> None:
+        self._allow_policies = allow_policies
+
+        self.create = async_to_streamed_response_wrapper(
+            allow_policies.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            allow_policies.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            allow_policies.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            allow_policies.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            allow_policies.get,
+        )
diff --git a/src/cloudflare/resources/email_security/settings/block_senders.py b/src/cloudflare/resources/email_security/settings/block_senders.py
new file mode 100644
index 00000000000..350053cb5b4
--- /dev/null
+++ b/src/cloudflare/resources/email_security/settings/block_senders.py
@@ -0,0 +1,682 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.email_security.settings import (
+    block_sender_edit_params,
+    block_sender_list_params,
+    block_sender_create_params,
+)
+from ....types.email_security.settings.block_sender_get_response import BlockSenderGetResponse
+from ....types.email_security.settings.block_sender_edit_response import BlockSenderEditResponse
+from ....types.email_security.settings.block_sender_list_response import BlockSenderListResponse
+from ....types.email_security.settings.block_sender_create_response import BlockSenderCreateResponse
+from ....types.email_security.settings.block_sender_delete_response import BlockSenderDeleteResponse
+
+__all__ = ["BlockSendersResource", "AsyncBlockSendersResource"]
+
+
+class BlockSendersResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> BlockSendersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return BlockSendersResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> BlockSendersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return BlockSendersResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        is_regex: bool,
+        pattern: str,
+        pattern_type: Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"],
+        comments: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BlockSenderCreateResponse:
+        """
+        Create a blocked email sender
+
+        Args:
+          account_id: Account Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/email-security/settings/block_senders",
+            body=maybe_transform(
+                {
+                    "is_regex": is_regex,
+                    "pattern": pattern,
+                    "pattern_type": pattern_type,
+                    "comments": comments,
+                },
+                block_sender_create_params.BlockSenderCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[BlockSenderCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BlockSenderCreateResponse], ResultWrapper[BlockSenderCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        order: Literal["pattern", "created_at"] | Omit = omit,
+        page: int | Omit = omit,
+        pattern: str | Omit = omit,
+        pattern_type: Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"] | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[BlockSenderListResponse]:
+        """
+        List blocked email senders
+
+        Args:
+          account_id: Account Identifier
+
+          direction: The sorting direction.
+
+          order: The field to sort by.
+
+          page: The page number of paginated results.
+
+          per_page: The number of results per page.
+
+          search: Allows searching in multiple properties of a record simultaneously. This
+              parameter is intended for human users, not automation. Its exact behavior is
+              intentionally left unspecified and is subject to change in the future.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/settings/block_senders",
+            page=SyncV4PagePaginationArray[BlockSenderListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "order": order,
+                        "page": page,
+                        "pattern": pattern,
+                        "pattern_type": pattern_type,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    block_sender_list_params.BlockSenderListParams,
+                ),
+            ),
+            model=BlockSenderListResponse,
+        )
+
+    def delete(
+        self,
+        pattern_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BlockSenderDeleteResponse:
+        """
+        Delete a blocked email sender
+
+        Args:
+          account_id: Account Identifier
+
+          pattern_id: The unique identifier for the allow policy.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/email-security/settings/block_senders/{pattern_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[BlockSenderDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BlockSenderDeleteResponse], ResultWrapper[BlockSenderDeleteResponse]),
+        )
+
+    def edit(
+        self,
+        pattern_id: int,
+        *,
+        account_id: str,
+        comments: Optional[str] | Omit = omit,
+        is_regex: Optional[bool] | Omit = omit,
+        pattern: Optional[str] | Omit = omit,
+        pattern_type: Optional[Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BlockSenderEditResponse:
+        """
+        Update a blocked email sender
+
+        Args:
+          account_id: Account Identifier
+
+          pattern_id: The unique identifier for the allow policy.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/email-security/settings/block_senders/{pattern_id}",
+            body=maybe_transform(
+                {
+                    "comments": comments,
+                    "is_regex": is_regex,
+                    "pattern": pattern,
+                    "pattern_type": pattern_type,
+                },
+                block_sender_edit_params.BlockSenderEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[BlockSenderEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BlockSenderEditResponse], ResultWrapper[BlockSenderEditResponse]),
+        )
+
+    def get(
+        self,
+        pattern_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BlockSenderGetResponse:
+        """
+        Get a blocked email sender
+
+        Args:
+          account_id: Account Identifier
+
+          pattern_id: The unique identifier for the allow policy.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/email-security/settings/block_senders/{pattern_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[BlockSenderGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BlockSenderGetResponse], ResultWrapper[BlockSenderGetResponse]),
+        )
+
+
+class AsyncBlockSendersResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncBlockSendersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncBlockSendersResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncBlockSendersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncBlockSendersResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        is_regex: bool,
+        pattern: str,
+        pattern_type: Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"],
+        comments: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BlockSenderCreateResponse:
+        """
+        Create a blocked email sender
+
+        Args:
+          account_id: Account Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/email-security/settings/block_senders",
+            body=await async_maybe_transform(
+                {
+                    "is_regex": is_regex,
+                    "pattern": pattern,
+                    "pattern_type": pattern_type,
+                    "comments": comments,
+                },
+                block_sender_create_params.BlockSenderCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[BlockSenderCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BlockSenderCreateResponse], ResultWrapper[BlockSenderCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        order: Literal["pattern", "created_at"] | Omit = omit,
+        page: int | Omit = omit,
+        pattern: str | Omit = omit,
+        pattern_type: Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"] | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[BlockSenderListResponse, AsyncV4PagePaginationArray[BlockSenderListResponse]]:
+        """
+        List blocked email senders
+
+        Args:
+          account_id: Account Identifier
+
+          direction: The sorting direction.
+
+          order: The field to sort by.
+
+          page: The page number of paginated results.
+
+          per_page: The number of results per page.
+
+          search: Allows searching in multiple properties of a record simultaneously. This
+              parameter is intended for human users, not automation. Its exact behavior is
+              intentionally left unspecified and is subject to change in the future.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/settings/block_senders",
+            page=AsyncV4PagePaginationArray[BlockSenderListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "order": order,
+                        "page": page,
+                        "pattern": pattern,
+                        "pattern_type": pattern_type,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    block_sender_list_params.BlockSenderListParams,
+                ),
+            ),
+            model=BlockSenderListResponse,
+        )
+
+    async def delete(
+        self,
+        pattern_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BlockSenderDeleteResponse:
+        """
+        Delete a blocked email sender
+
+        Args:
+          account_id: Account Identifier
+
+          pattern_id: The unique identifier for the allow policy.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/email-security/settings/block_senders/{pattern_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[BlockSenderDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BlockSenderDeleteResponse], ResultWrapper[BlockSenderDeleteResponse]),
+        )
+
+    async def edit(
+        self,
+        pattern_id: int,
+        *,
+        account_id: str,
+        comments: Optional[str] | Omit = omit,
+        is_regex: Optional[bool] | Omit = omit,
+        pattern: Optional[str] | Omit = omit,
+        pattern_type: Optional[Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BlockSenderEditResponse:
+        """
+        Update a blocked email sender
+
+        Args:
+          account_id: Account Identifier
+
+          pattern_id: The unique identifier for the allow policy.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/email-security/settings/block_senders/{pattern_id}",
+            body=await async_maybe_transform(
+                {
+                    "comments": comments,
+                    "is_regex": is_regex,
+                    "pattern": pattern,
+                    "pattern_type": pattern_type,
+                },
+                block_sender_edit_params.BlockSenderEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[BlockSenderEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BlockSenderEditResponse], ResultWrapper[BlockSenderEditResponse]),
+        )
+
+    async def get(
+        self,
+        pattern_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BlockSenderGetResponse:
+        """
+        Get a blocked email sender
+
+        Args:
+          account_id: Account Identifier
+
+          pattern_id: The unique identifier for the allow policy.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/email-security/settings/block_senders/{pattern_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[BlockSenderGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BlockSenderGetResponse], ResultWrapper[BlockSenderGetResponse]),
+        )
+
+
+class BlockSendersResourceWithRawResponse:
+    def __init__(self, block_senders: BlockSendersResource) -> None:
+        self._block_senders = block_senders
+
+        self.create = to_raw_response_wrapper(
+            block_senders.create,
+        )
+        self.list = to_raw_response_wrapper(
+            block_senders.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            block_senders.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            block_senders.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            block_senders.get,
+        )
+
+
+class AsyncBlockSendersResourceWithRawResponse:
+    def __init__(self, block_senders: AsyncBlockSendersResource) -> None:
+        self._block_senders = block_senders
+
+        self.create = async_to_raw_response_wrapper(
+            block_senders.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            block_senders.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            block_senders.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            block_senders.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            block_senders.get,
+        )
+
+
+class BlockSendersResourceWithStreamingResponse:
+    def __init__(self, block_senders: BlockSendersResource) -> None:
+        self._block_senders = block_senders
+
+        self.create = to_streamed_response_wrapper(
+            block_senders.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            block_senders.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            block_senders.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            block_senders.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            block_senders.get,
+        )
+
+
+class AsyncBlockSendersResourceWithStreamingResponse:
+    def __init__(self, block_senders: AsyncBlockSendersResource) -> None:
+        self._block_senders = block_senders
+
+        self.create = async_to_streamed_response_wrapper(
+            block_senders.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            block_senders.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            block_senders.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            block_senders.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            block_senders.get,
+        )
diff --git a/src/cloudflare/resources/email_security/settings/domains.py b/src/cloudflare/resources/email_security/settings/domains.py
new file mode 100644
index 00000000000..9f8f717056a
--- /dev/null
+++ b/src/cloudflare/resources/email_security/settings/domains.py
@@ -0,0 +1,728 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.email_security.settings import domain_edit_params, domain_list_params
+from ....types.email_security.settings.domain_get_response import DomainGetResponse
+from ....types.email_security.settings.domain_edit_response import DomainEditResponse
+from ....types.email_security.settings.domain_list_response import DomainListResponse
+from ....types.email_security.settings.domain_delete_response import DomainDeleteResponse
+from ....types.email_security.settings.domain_bulk_delete_response import DomainBulkDeleteResponse
+
+__all__ = ["DomainsResource", "AsyncDomainsResource"]
+
+
+class DomainsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> DomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return DomainsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> DomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return DomainsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        active_delivery_mode: Literal["DIRECT", "BCC", "JOURNAL", "API", "RETRO_SCAN"] | Omit = omit,
+        allowed_delivery_mode: Literal["DIRECT", "BCC", "JOURNAL", "API", "RETRO_SCAN"] | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        domain: SequenceNotStr[str] | Omit = omit,
+        integration_id: str | Omit = omit,
+        order: Literal["domain", "created_at"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[DomainListResponse]:
+        """
+        Lists, searches, and sorts an account’s email domains.
+
+        Args:
+          account_id: Account Identifier
+
+          active_delivery_mode: Filters response to domains with the currently active delivery mode.
+
+          allowed_delivery_mode: Filters response to domains with the provided delivery mode.
+
+          direction: The sorting direction.
+
+          domain: Filters results by the provided domains, allowing for multiple occurrences.
+
+          integration_id: Filters response to domains with the provided integration ID.
+
+          order: The field to sort by.
+
+          page: The page number of paginated results.
+
+          per_page: The number of results per page.
+
+          search: Allows searching in multiple properties of a record simultaneously. This
+              parameter is intended for human users, not automation. Its exact behavior is
+              intentionally left unspecified and is subject to change in the future.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/settings/domains",
+            page=SyncV4PagePaginationArray[DomainListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "active_delivery_mode": active_delivery_mode,
+                        "allowed_delivery_mode": allowed_delivery_mode,
+                        "direction": direction,
+                        "domain": domain,
+                        "integration_id": integration_id,
+                        "order": order,
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    domain_list_params.DomainListParams,
+                ),
+            ),
+            model=DomainListResponse,
+        )
+
+    def delete(
+        self,
+        domain_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DomainDeleteResponse:
+        """
+        Unprotect an email domain
+
+        Args:
+          account_id: Account Identifier
+
+          domain_id: The unique identifier for the domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/email-security/settings/domains/{domain_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DomainDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DomainDeleteResponse], ResultWrapper[DomainDeleteResponse]),
+        )
+
+    def bulk_delete(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[DomainBulkDeleteResponse]:
+        """
+        Unprotect multiple email domains
+
+        Args:
+          account_id: Account Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/settings/domains",
+            page=SyncSinglePage[DomainBulkDeleteResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=DomainBulkDeleteResponse,
+            method="delete",
+        )
+
+    def edit(
+        self,
+        domain_id: int,
+        *,
+        account_id: str,
+        ip_restrictions: SequenceNotStr[str],
+        allowed_delivery_modes: List[Literal["DIRECT", "BCC", "JOURNAL", "API", "RETRO_SCAN"]] | Omit = omit,
+        domain: str | Omit = omit,
+        drop_dispositions: List[
+            Literal[
+                "MALICIOUS",
+                "MALICIOUS-BEC",
+                "SUSPICIOUS",
+                "SPOOF",
+                "SPAM",
+                "BULK",
+                "ENCRYPTED",
+                "EXTERNAL",
+                "UNKNOWN",
+                "NONE",
+            ]
+        ]
+        | Omit = omit,
+        folder: Literal["AllItems", "Inbox"] | Omit = omit,
+        integration_id: str | Omit = omit,
+        lookback_hops: int | Omit = omit,
+        regions: List[Literal["GLOBAL", "AU", "DE", "IN", "US"]] | Omit = omit,
+        require_tls_inbound: bool | Omit = omit,
+        require_tls_outbound: bool | Omit = omit,
+        transport: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DomainEditResponse:
+        """
+        Update an email domain
+
+        Args:
+          account_id: Account Identifier
+
+          domain_id: The unique identifier for the domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/email-security/settings/domains/{domain_id}",
+            body=maybe_transform(
+                {
+                    "ip_restrictions": ip_restrictions,
+                    "allowed_delivery_modes": allowed_delivery_modes,
+                    "domain": domain,
+                    "drop_dispositions": drop_dispositions,
+                    "folder": folder,
+                    "integration_id": integration_id,
+                    "lookback_hops": lookback_hops,
+                    "regions": regions,
+                    "require_tls_inbound": require_tls_inbound,
+                    "require_tls_outbound": require_tls_outbound,
+                    "transport": transport,
+                },
+                domain_edit_params.DomainEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DomainEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DomainEditResponse], ResultWrapper[DomainEditResponse]),
+        )
+
+    def get(
+        self,
+        domain_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DomainGetResponse:
+        """
+        Get an email domain
+
+        Args:
+          account_id: Account Identifier
+
+          domain_id: The unique identifier for the domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/email-security/settings/domains/{domain_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DomainGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DomainGetResponse], ResultWrapper[DomainGetResponse]),
+        )
+
+
+class AsyncDomainsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncDomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncDomainsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncDomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncDomainsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        active_delivery_mode: Literal["DIRECT", "BCC", "JOURNAL", "API", "RETRO_SCAN"] | Omit = omit,
+        allowed_delivery_mode: Literal["DIRECT", "BCC", "JOURNAL", "API", "RETRO_SCAN"] | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        domain: SequenceNotStr[str] | Omit = omit,
+        integration_id: str | Omit = omit,
+        order: Literal["domain", "created_at"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[DomainListResponse, AsyncV4PagePaginationArray[DomainListResponse]]:
+        """
+        Lists, searches, and sorts an account’s email domains.
+
+        Args:
+          account_id: Account Identifier
+
+          active_delivery_mode: Filters response to domains with the currently active delivery mode.
+
+          allowed_delivery_mode: Filters response to domains with the provided delivery mode.
+
+          direction: The sorting direction.
+
+          domain: Filters results by the provided domains, allowing for multiple occurrences.
+
+          integration_id: Filters response to domains with the provided integration ID.
+
+          order: The field to sort by.
+
+          page: The page number of paginated results.
+
+          per_page: The number of results per page.
+
+          search: Allows searching in multiple properties of a record simultaneously. This
+              parameter is intended for human users, not automation. Its exact behavior is
+              intentionally left unspecified and is subject to change in the future.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/settings/domains",
+            page=AsyncV4PagePaginationArray[DomainListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "active_delivery_mode": active_delivery_mode,
+                        "allowed_delivery_mode": allowed_delivery_mode,
+                        "direction": direction,
+                        "domain": domain,
+                        "integration_id": integration_id,
+                        "order": order,
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    domain_list_params.DomainListParams,
+                ),
+            ),
+            model=DomainListResponse,
+        )
+
+    async def delete(
+        self,
+        domain_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DomainDeleteResponse:
+        """
+        Unprotect an email domain
+
+        Args:
+          account_id: Account Identifier
+
+          domain_id: The unique identifier for the domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/email-security/settings/domains/{domain_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DomainDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DomainDeleteResponse], ResultWrapper[DomainDeleteResponse]),
+        )
+
+    def bulk_delete(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[DomainBulkDeleteResponse, AsyncSinglePage[DomainBulkDeleteResponse]]:
+        """
+        Unprotect multiple email domains
+
+        Args:
+          account_id: Account Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/settings/domains",
+            page=AsyncSinglePage[DomainBulkDeleteResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=DomainBulkDeleteResponse,
+            method="delete",
+        )
+
+    async def edit(
+        self,
+        domain_id: int,
+        *,
+        account_id: str,
+        ip_restrictions: SequenceNotStr[str],
+        allowed_delivery_modes: List[Literal["DIRECT", "BCC", "JOURNAL", "API", "RETRO_SCAN"]] | Omit = omit,
+        domain: str | Omit = omit,
+        drop_dispositions: List[
+            Literal[
+                "MALICIOUS",
+                "MALICIOUS-BEC",
+                "SUSPICIOUS",
+                "SPOOF",
+                "SPAM",
+                "BULK",
+                "ENCRYPTED",
+                "EXTERNAL",
+                "UNKNOWN",
+                "NONE",
+            ]
+        ]
+        | Omit = omit,
+        folder: Literal["AllItems", "Inbox"] | Omit = omit,
+        integration_id: str | Omit = omit,
+        lookback_hops: int | Omit = omit,
+        regions: List[Literal["GLOBAL", "AU", "DE", "IN", "US"]] | Omit = omit,
+        require_tls_inbound: bool | Omit = omit,
+        require_tls_outbound: bool | Omit = omit,
+        transport: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DomainEditResponse:
+        """
+        Update an email domain
+
+        Args:
+          account_id: Account Identifier
+
+          domain_id: The unique identifier for the domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/email-security/settings/domains/{domain_id}",
+            body=await async_maybe_transform(
+                {
+                    "ip_restrictions": ip_restrictions,
+                    "allowed_delivery_modes": allowed_delivery_modes,
+                    "domain": domain,
+                    "drop_dispositions": drop_dispositions,
+                    "folder": folder,
+                    "integration_id": integration_id,
+                    "lookback_hops": lookback_hops,
+                    "regions": regions,
+                    "require_tls_inbound": require_tls_inbound,
+                    "require_tls_outbound": require_tls_outbound,
+                    "transport": transport,
+                },
+                domain_edit_params.DomainEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DomainEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DomainEditResponse], ResultWrapper[DomainEditResponse]),
+        )
+
+    async def get(
+        self,
+        domain_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DomainGetResponse:
+        """
+        Get an email domain
+
+        Args:
+          account_id: Account Identifier
+
+          domain_id: The unique identifier for the domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/email-security/settings/domains/{domain_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DomainGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DomainGetResponse], ResultWrapper[DomainGetResponse]),
+        )
+
+
+class DomainsResourceWithRawResponse:
+    def __init__(self, domains: DomainsResource) -> None:
+        self._domains = domains
+
+        self.list = to_raw_response_wrapper(
+            domains.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            domains.delete,
+        )
+        self.bulk_delete = to_raw_response_wrapper(
+            domains.bulk_delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            domains.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            domains.get,
+        )
+
+
+class AsyncDomainsResourceWithRawResponse:
+    def __init__(self, domains: AsyncDomainsResource) -> None:
+        self._domains = domains
+
+        self.list = async_to_raw_response_wrapper(
+            domains.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            domains.delete,
+        )
+        self.bulk_delete = async_to_raw_response_wrapper(
+            domains.bulk_delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            domains.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            domains.get,
+        )
+
+
+class DomainsResourceWithStreamingResponse:
+    def __init__(self, domains: DomainsResource) -> None:
+        self._domains = domains
+
+        self.list = to_streamed_response_wrapper(
+            domains.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            domains.delete,
+        )
+        self.bulk_delete = to_streamed_response_wrapper(
+            domains.bulk_delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            domains.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            domains.get,
+        )
+
+
+class AsyncDomainsResourceWithStreamingResponse:
+    def __init__(self, domains: AsyncDomainsResource) -> None:
+        self._domains = domains
+
+        self.list = async_to_streamed_response_wrapper(
+            domains.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            domains.delete,
+        )
+        self.bulk_delete = async_to_streamed_response_wrapper(
+            domains.bulk_delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            domains.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            domains.get,
+        )
diff --git a/src/cloudflare/resources/email_security/settings/impersonation_registry.py b/src/cloudflare/resources/email_security/settings/impersonation_registry.py
new file mode 100644
index 00000000000..e5dcaae2429
--- /dev/null
+++ b/src/cloudflare/resources/email_security/settings/impersonation_registry.py
@@ -0,0 +1,662 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.email_security.settings import (
+    impersonation_registry_edit_params,
+    impersonation_registry_list_params,
+    impersonation_registry_create_params,
+)
+from ....types.email_security.settings.impersonation_registry_get_response import ImpersonationRegistryGetResponse
+from ....types.email_security.settings.impersonation_registry_edit_response import ImpersonationRegistryEditResponse
+from ....types.email_security.settings.impersonation_registry_list_response import ImpersonationRegistryListResponse
+from ....types.email_security.settings.impersonation_registry_create_response import ImpersonationRegistryCreateResponse
+from ....types.email_security.settings.impersonation_registry_delete_response import ImpersonationRegistryDeleteResponse
+
+__all__ = ["ImpersonationRegistryResource", "AsyncImpersonationRegistryResource"]
+
+
+class ImpersonationRegistryResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ImpersonationRegistryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ImpersonationRegistryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ImpersonationRegistryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ImpersonationRegistryResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        email: str,
+        is_email_regex: bool,
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ImpersonationRegistryCreateResponse:
+        """
+        Create an entry in impersonation registry
+
+        Args:
+          account_id: Account Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/email-security/settings/impersonation_registry",
+            body=maybe_transform(
+                {
+                    "email": email,
+                    "is_email_regex": is_email_regex,
+                    "name": name,
+                },
+                impersonation_registry_create_params.ImpersonationRegistryCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ImpersonationRegistryCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ImpersonationRegistryCreateResponse], ResultWrapper[ImpersonationRegistryCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        order: Literal["name", "email", "created_at"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        provenance: Literal["A1S_INTERNAL", "SNOOPY-CASB_OFFICE_365", "SNOOPY-OFFICE_365", "SNOOPY-GOOGLE_DIRECTORY"]
+        | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[ImpersonationRegistryListResponse]:
+        """
+        Lists, searches, and sorts entries in the impersonation registry.
+
+        Args:
+          account_id: Account Identifier
+
+          direction: The sorting direction.
+
+          order: The field to sort by.
+
+          page: The page number of paginated results.
+
+          per_page: The number of results per page.
+
+          search: Allows searching in multiple properties of a record simultaneously. This
+              parameter is intended for human users, not automation. Its exact behavior is
+              intentionally left unspecified and is subject to change in the future.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/settings/impersonation_registry",
+            page=SyncV4PagePaginationArray[ImpersonationRegistryListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "order": order,
+                        "page": page,
+                        "per_page": per_page,
+                        "provenance": provenance,
+                        "search": search,
+                    },
+                    impersonation_registry_list_params.ImpersonationRegistryListParams,
+                ),
+            ),
+            model=ImpersonationRegistryListResponse,
+        )
+
+    def delete(
+        self,
+        display_name_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ImpersonationRegistryDeleteResponse:
+        """
+        Delete an entry from impersonation registry
+
+        Args:
+          account_id: Account Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/email-security/settings/impersonation_registry/{display_name_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ImpersonationRegistryDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ImpersonationRegistryDeleteResponse], ResultWrapper[ImpersonationRegistryDeleteResponse]),
+        )
+
+    def edit(
+        self,
+        display_name_id: int,
+        *,
+        account_id: str,
+        email: Optional[str] | Omit = omit,
+        is_email_regex: Optional[bool] | Omit = omit,
+        name: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ImpersonationRegistryEditResponse:
+        """
+        Update an entry in impersonation registry
+
+        Args:
+          account_id: Account Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/email-security/settings/impersonation_registry/{display_name_id}",
+            body=maybe_transform(
+                {
+                    "email": email,
+                    "is_email_regex": is_email_regex,
+                    "name": name,
+                },
+                impersonation_registry_edit_params.ImpersonationRegistryEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ImpersonationRegistryEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ImpersonationRegistryEditResponse], ResultWrapper[ImpersonationRegistryEditResponse]),
+        )
+
+    def get(
+        self,
+        display_name_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ImpersonationRegistryGetResponse:
+        """
+        Get an entry in impersonation registry
+
+        Args:
+          account_id: Account Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/email-security/settings/impersonation_registry/{display_name_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ImpersonationRegistryGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ImpersonationRegistryGetResponse], ResultWrapper[ImpersonationRegistryGetResponse]),
+        )
+
+
+class AsyncImpersonationRegistryResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncImpersonationRegistryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncImpersonationRegistryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncImpersonationRegistryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncImpersonationRegistryResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        email: str,
+        is_email_regex: bool,
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ImpersonationRegistryCreateResponse:
+        """
+        Create an entry in impersonation registry
+
+        Args:
+          account_id: Account Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/email-security/settings/impersonation_registry",
+            body=await async_maybe_transform(
+                {
+                    "email": email,
+                    "is_email_regex": is_email_regex,
+                    "name": name,
+                },
+                impersonation_registry_create_params.ImpersonationRegistryCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ImpersonationRegistryCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ImpersonationRegistryCreateResponse], ResultWrapper[ImpersonationRegistryCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        order: Literal["name", "email", "created_at"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        provenance: Literal["A1S_INTERNAL", "SNOOPY-CASB_OFFICE_365", "SNOOPY-OFFICE_365", "SNOOPY-GOOGLE_DIRECTORY"]
+        | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[
+        ImpersonationRegistryListResponse, AsyncV4PagePaginationArray[ImpersonationRegistryListResponse]
+    ]:
+        """
+        Lists, searches, and sorts entries in the impersonation registry.
+
+        Args:
+          account_id: Account Identifier
+
+          direction: The sorting direction.
+
+          order: The field to sort by.
+
+          page: The page number of paginated results.
+
+          per_page: The number of results per page.
+
+          search: Allows searching in multiple properties of a record simultaneously. This
+              parameter is intended for human users, not automation. Its exact behavior is
+              intentionally left unspecified and is subject to change in the future.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/settings/impersonation_registry",
+            page=AsyncV4PagePaginationArray[ImpersonationRegistryListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "order": order,
+                        "page": page,
+                        "per_page": per_page,
+                        "provenance": provenance,
+                        "search": search,
+                    },
+                    impersonation_registry_list_params.ImpersonationRegistryListParams,
+                ),
+            ),
+            model=ImpersonationRegistryListResponse,
+        )
+
+    async def delete(
+        self,
+        display_name_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ImpersonationRegistryDeleteResponse:
+        """
+        Delete an entry from impersonation registry
+
+        Args:
+          account_id: Account Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/email-security/settings/impersonation_registry/{display_name_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ImpersonationRegistryDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ImpersonationRegistryDeleteResponse], ResultWrapper[ImpersonationRegistryDeleteResponse]),
+        )
+
+    async def edit(
+        self,
+        display_name_id: int,
+        *,
+        account_id: str,
+        email: Optional[str] | Omit = omit,
+        is_email_regex: Optional[bool] | Omit = omit,
+        name: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ImpersonationRegistryEditResponse:
+        """
+        Update an entry in impersonation registry
+
+        Args:
+          account_id: Account Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/email-security/settings/impersonation_registry/{display_name_id}",
+            body=await async_maybe_transform(
+                {
+                    "email": email,
+                    "is_email_regex": is_email_regex,
+                    "name": name,
+                },
+                impersonation_registry_edit_params.ImpersonationRegistryEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ImpersonationRegistryEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ImpersonationRegistryEditResponse], ResultWrapper[ImpersonationRegistryEditResponse]),
+        )
+
+    async def get(
+        self,
+        display_name_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ImpersonationRegistryGetResponse:
+        """
+        Get an entry in impersonation registry
+
+        Args:
+          account_id: Account Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/email-security/settings/impersonation_registry/{display_name_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ImpersonationRegistryGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ImpersonationRegistryGetResponse], ResultWrapper[ImpersonationRegistryGetResponse]),
+        )
+
+
+class ImpersonationRegistryResourceWithRawResponse:
+    def __init__(self, impersonation_registry: ImpersonationRegistryResource) -> None:
+        self._impersonation_registry = impersonation_registry
+
+        self.create = to_raw_response_wrapper(
+            impersonation_registry.create,
+        )
+        self.list = to_raw_response_wrapper(
+            impersonation_registry.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            impersonation_registry.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            impersonation_registry.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            impersonation_registry.get,
+        )
+
+
+class AsyncImpersonationRegistryResourceWithRawResponse:
+    def __init__(self, impersonation_registry: AsyncImpersonationRegistryResource) -> None:
+        self._impersonation_registry = impersonation_registry
+
+        self.create = async_to_raw_response_wrapper(
+            impersonation_registry.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            impersonation_registry.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            impersonation_registry.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            impersonation_registry.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            impersonation_registry.get,
+        )
+
+
+class ImpersonationRegistryResourceWithStreamingResponse:
+    def __init__(self, impersonation_registry: ImpersonationRegistryResource) -> None:
+        self._impersonation_registry = impersonation_registry
+
+        self.create = to_streamed_response_wrapper(
+            impersonation_registry.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            impersonation_registry.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            impersonation_registry.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            impersonation_registry.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            impersonation_registry.get,
+        )
+
+
+class AsyncImpersonationRegistryResourceWithStreamingResponse:
+    def __init__(self, impersonation_registry: AsyncImpersonationRegistryResource) -> None:
+        self._impersonation_registry = impersonation_registry
+
+        self.create = async_to_streamed_response_wrapper(
+            impersonation_registry.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            impersonation_registry.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            impersonation_registry.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            impersonation_registry.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            impersonation_registry.get,
+        )
diff --git a/src/cloudflare/resources/email_security/settings/settings.py b/src/cloudflare/resources/email_security/settings/settings.py
new file mode 100644
index 00000000000..5e8816863ef
--- /dev/null
+++ b/src/cloudflare/resources/email_security/settings/settings.py
@@ -0,0 +1,230 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .domains import (
+    DomainsResource,
+    AsyncDomainsResource,
+    DomainsResourceWithRawResponse,
+    AsyncDomainsResourceWithRawResponse,
+    DomainsResourceWithStreamingResponse,
+    AsyncDomainsResourceWithStreamingResponse,
+)
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .block_senders import (
+    BlockSendersResource,
+    AsyncBlockSendersResource,
+    BlockSendersResourceWithRawResponse,
+    AsyncBlockSendersResourceWithRawResponse,
+    BlockSendersResourceWithStreamingResponse,
+    AsyncBlockSendersResourceWithStreamingResponse,
+)
+from .allow_policies import (
+    AllowPoliciesResource,
+    AsyncAllowPoliciesResource,
+    AllowPoliciesResourceWithRawResponse,
+    AsyncAllowPoliciesResourceWithRawResponse,
+    AllowPoliciesResourceWithStreamingResponse,
+    AsyncAllowPoliciesResourceWithStreamingResponse,
+)
+from .trusted_domains import (
+    TrustedDomainsResource,
+    AsyncTrustedDomainsResource,
+    TrustedDomainsResourceWithRawResponse,
+    AsyncTrustedDomainsResourceWithRawResponse,
+    TrustedDomainsResourceWithStreamingResponse,
+    AsyncTrustedDomainsResourceWithStreamingResponse,
+)
+from .impersonation_registry import (
+    ImpersonationRegistryResource,
+    AsyncImpersonationRegistryResource,
+    ImpersonationRegistryResourceWithRawResponse,
+    AsyncImpersonationRegistryResourceWithRawResponse,
+    ImpersonationRegistryResourceWithStreamingResponse,
+    AsyncImpersonationRegistryResourceWithStreamingResponse,
+)
+
+__all__ = ["SettingsResource", "AsyncSettingsResource"]
+
+
+class SettingsResource(SyncAPIResource):
+    @cached_property
+    def allow_policies(self) -> AllowPoliciesResource:
+        return AllowPoliciesResource(self._client)
+
+    @cached_property
+    def block_senders(self) -> BlockSendersResource:
+        return BlockSendersResource(self._client)
+
+    @cached_property
+    def domains(self) -> DomainsResource:
+        return DomainsResource(self._client)
+
+    @cached_property
+    def impersonation_registry(self) -> ImpersonationRegistryResource:
+        return ImpersonationRegistryResource(self._client)
+
+    @cached_property
+    def trusted_domains(self) -> TrustedDomainsResource:
+        return TrustedDomainsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> SettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SettingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SettingsResourceWithStreamingResponse(self)
+
+
+class AsyncSettingsResource(AsyncAPIResource):
+    @cached_property
+    def allow_policies(self) -> AsyncAllowPoliciesResource:
+        return AsyncAllowPoliciesResource(self._client)
+
+    @cached_property
+    def block_senders(self) -> AsyncBlockSendersResource:
+        return AsyncBlockSendersResource(self._client)
+
+    @cached_property
+    def domains(self) -> AsyncDomainsResource:
+        return AsyncDomainsResource(self._client)
+
+    @cached_property
+    def impersonation_registry(self) -> AsyncImpersonationRegistryResource:
+        return AsyncImpersonationRegistryResource(self._client)
+
+    @cached_property
+    def trusted_domains(self) -> AsyncTrustedDomainsResource:
+        return AsyncTrustedDomainsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSettingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSettingsResourceWithStreamingResponse(self)
+
+
+class SettingsResourceWithRawResponse:
+    def __init__(self, settings: SettingsResource) -> None:
+        self._settings = settings
+
+    @cached_property
+    def allow_policies(self) -> AllowPoliciesResourceWithRawResponse:
+        return AllowPoliciesResourceWithRawResponse(self._settings.allow_policies)
+
+    @cached_property
+    def block_senders(self) -> BlockSendersResourceWithRawResponse:
+        return BlockSendersResourceWithRawResponse(self._settings.block_senders)
+
+    @cached_property
+    def domains(self) -> DomainsResourceWithRawResponse:
+        return DomainsResourceWithRawResponse(self._settings.domains)
+
+    @cached_property
+    def impersonation_registry(self) -> ImpersonationRegistryResourceWithRawResponse:
+        return ImpersonationRegistryResourceWithRawResponse(self._settings.impersonation_registry)
+
+    @cached_property
+    def trusted_domains(self) -> TrustedDomainsResourceWithRawResponse:
+        return TrustedDomainsResourceWithRawResponse(self._settings.trusted_domains)
+
+
+class AsyncSettingsResourceWithRawResponse:
+    def __init__(self, settings: AsyncSettingsResource) -> None:
+        self._settings = settings
+
+    @cached_property
+    def allow_policies(self) -> AsyncAllowPoliciesResourceWithRawResponse:
+        return AsyncAllowPoliciesResourceWithRawResponse(self._settings.allow_policies)
+
+    @cached_property
+    def block_senders(self) -> AsyncBlockSendersResourceWithRawResponse:
+        return AsyncBlockSendersResourceWithRawResponse(self._settings.block_senders)
+
+    @cached_property
+    def domains(self) -> AsyncDomainsResourceWithRawResponse:
+        return AsyncDomainsResourceWithRawResponse(self._settings.domains)
+
+    @cached_property
+    def impersonation_registry(self) -> AsyncImpersonationRegistryResourceWithRawResponse:
+        return AsyncImpersonationRegistryResourceWithRawResponse(self._settings.impersonation_registry)
+
+    @cached_property
+    def trusted_domains(self) -> AsyncTrustedDomainsResourceWithRawResponse:
+        return AsyncTrustedDomainsResourceWithRawResponse(self._settings.trusted_domains)
+
+
+class SettingsResourceWithStreamingResponse:
+    def __init__(self, settings: SettingsResource) -> None:
+        self._settings = settings
+
+    @cached_property
+    def allow_policies(self) -> AllowPoliciesResourceWithStreamingResponse:
+        return AllowPoliciesResourceWithStreamingResponse(self._settings.allow_policies)
+
+    @cached_property
+    def block_senders(self) -> BlockSendersResourceWithStreamingResponse:
+        return BlockSendersResourceWithStreamingResponse(self._settings.block_senders)
+
+    @cached_property
+    def domains(self) -> DomainsResourceWithStreamingResponse:
+        return DomainsResourceWithStreamingResponse(self._settings.domains)
+
+    @cached_property
+    def impersonation_registry(self) -> ImpersonationRegistryResourceWithStreamingResponse:
+        return ImpersonationRegistryResourceWithStreamingResponse(self._settings.impersonation_registry)
+
+    @cached_property
+    def trusted_domains(self) -> TrustedDomainsResourceWithStreamingResponse:
+        return TrustedDomainsResourceWithStreamingResponse(self._settings.trusted_domains)
+
+
+class AsyncSettingsResourceWithStreamingResponse:
+    def __init__(self, settings: AsyncSettingsResource) -> None:
+        self._settings = settings
+
+    @cached_property
+    def allow_policies(self) -> AsyncAllowPoliciesResourceWithStreamingResponse:
+        return AsyncAllowPoliciesResourceWithStreamingResponse(self._settings.allow_policies)
+
+    @cached_property
+    def block_senders(self) -> AsyncBlockSendersResourceWithStreamingResponse:
+        return AsyncBlockSendersResourceWithStreamingResponse(self._settings.block_senders)
+
+    @cached_property
+    def domains(self) -> AsyncDomainsResourceWithStreamingResponse:
+        return AsyncDomainsResourceWithStreamingResponse(self._settings.domains)
+
+    @cached_property
+    def impersonation_registry(self) -> AsyncImpersonationRegistryResourceWithStreamingResponse:
+        return AsyncImpersonationRegistryResourceWithStreamingResponse(self._settings.impersonation_registry)
+
+    @cached_property
+    def trusted_domains(self) -> AsyncTrustedDomainsResourceWithStreamingResponse:
+        return AsyncTrustedDomainsResourceWithStreamingResponse(self._settings.trusted_domains)
diff --git a/src/cloudflare/resources/email_security/settings/trusted_domains.py b/src/cloudflare/resources/email_security/settings/trusted_domains.py
new file mode 100644
index 00000000000..184b212d2ee
--- /dev/null
+++ b/src/cloudflare/resources/email_security/settings/trusted_domains.py
@@ -0,0 +1,830 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Any, Type, Iterable, Optional, cast
+from typing_extensions import Literal, overload
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import required_args, maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.email_security.settings import (
+    trusted_domain_edit_params,
+    trusted_domain_list_params,
+    trusted_domain_create_params,
+)
+from ....types.email_security.settings.trusted_domain_get_response import TrustedDomainGetResponse
+from ....types.email_security.settings.trusted_domain_edit_response import TrustedDomainEditResponse
+from ....types.email_security.settings.trusted_domain_list_response import TrustedDomainListResponse
+from ....types.email_security.settings.trusted_domain_create_response import TrustedDomainCreateResponse
+from ....types.email_security.settings.trusted_domain_delete_response import TrustedDomainDeleteResponse
+
+__all__ = ["TrustedDomainsResource", "AsyncTrustedDomainsResource"]
+
+
+class TrustedDomainsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> TrustedDomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TrustedDomainsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TrustedDomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TrustedDomainsResourceWithStreamingResponse(self)
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        is_recent: bool,
+        is_regex: bool,
+        is_similarity: bool,
+        pattern: str,
+        comments: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TrustedDomainCreateResponse:
+        """
+        Create a trusted email domain
+
+        Args:
+          account_id: Account Identifier
+
+          is_recent: Select to prevent recently registered domains from triggering a Suspicious or
+              Malicious disposition.
+
+          is_similarity: Select for partner or other approved domains that have similar spelling to your
+              connected domains. Prevents listed domains from triggering a Spoof disposition.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        body: Iterable[trusted_domain_create_params.Variant1Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TrustedDomainCreateResponse:
+        """
+        Create a trusted email domain
+
+        Args:
+          account_id: Account Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "is_recent", "is_regex", "is_similarity", "pattern"], ["account_id", "body"])
+    def create(
+        self,
+        *,
+        account_id: str,
+        is_recent: bool | Omit = omit,
+        is_regex: bool | Omit = omit,
+        is_similarity: bool | Omit = omit,
+        pattern: str | Omit = omit,
+        comments: Optional[str] | Omit = omit,
+        body: Iterable[trusted_domain_create_params.Variant1Body] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TrustedDomainCreateResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return cast(
+            TrustedDomainCreateResponse,
+            self._post(
+                f"/accounts/{account_id}/email-security/settings/trusted_domains",
+                body=maybe_transform(
+                    {
+                        "is_recent": is_recent,
+                        "is_regex": is_regex,
+                        "is_similarity": is_similarity,
+                        "pattern": pattern,
+                        "comments": comments,
+                        "body": body,
+                    },
+                    trusted_domain_create_params.TrustedDomainCreateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[TrustedDomainCreateResponse]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[TrustedDomainCreateResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        is_recent: bool | Omit = omit,
+        is_similarity: bool | Omit = omit,
+        order: Literal["pattern", "created_at"] | Omit = omit,
+        page: int | Omit = omit,
+        pattern: str | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[TrustedDomainListResponse]:
+        """
+        Lists, searches, and sorts an account’s trusted email domains.
+
+        Args:
+          account_id: Account Identifier
+
+          direction: The sorting direction.
+
+          order: The field to sort by.
+
+          page: The page number of paginated results.
+
+          per_page: The number of results per page.
+
+          search: Allows searching in multiple properties of a record simultaneously. This
+              parameter is intended for human users, not automation. Its exact behavior is
+              intentionally left unspecified and is subject to change in the future.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/settings/trusted_domains",
+            page=SyncV4PagePaginationArray[TrustedDomainListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "is_recent": is_recent,
+                        "is_similarity": is_similarity,
+                        "order": order,
+                        "page": page,
+                        "pattern": pattern,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    trusted_domain_list_params.TrustedDomainListParams,
+                ),
+            ),
+            model=TrustedDomainListResponse,
+        )
+
+    def delete(
+        self,
+        trusted_domain_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TrustedDomainDeleteResponse:
+        """
+        Delete a trusted email domain
+
+        Args:
+          account_id: Account Identifier
+
+          trusted_domain_id: The unique identifier for the trusted domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/email-security/settings/trusted_domains/{trusted_domain_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TrustedDomainDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TrustedDomainDeleteResponse], ResultWrapper[TrustedDomainDeleteResponse]),
+        )
+
+    def edit(
+        self,
+        trusted_domain_id: int,
+        *,
+        account_id: str,
+        comments: str | Omit = omit,
+        is_recent: bool | Omit = omit,
+        is_regex: bool | Omit = omit,
+        is_similarity: bool | Omit = omit,
+        pattern: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TrustedDomainEditResponse:
+        """
+        Update a trusted email domain
+
+        Args:
+          account_id: Account Identifier
+
+          trusted_domain_id: The unique identifier for the trusted domain.
+
+          is_recent: Select to prevent recently registered domains from triggering a Suspicious or
+              Malicious disposition.
+
+          is_similarity: Select for partner or other approved domains that have similar spelling to your
+              connected domains. Prevents listed domains from triggering a Spoof disposition.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/email-security/settings/trusted_domains/{trusted_domain_id}",
+            body=maybe_transform(
+                {
+                    "comments": comments,
+                    "is_recent": is_recent,
+                    "is_regex": is_regex,
+                    "is_similarity": is_similarity,
+                    "pattern": pattern,
+                },
+                trusted_domain_edit_params.TrustedDomainEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TrustedDomainEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TrustedDomainEditResponse], ResultWrapper[TrustedDomainEditResponse]),
+        )
+
+    def get(
+        self,
+        trusted_domain_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TrustedDomainGetResponse:
+        """
+        Get a trusted email domain
+
+        Args:
+          account_id: Account Identifier
+
+          trusted_domain_id: The unique identifier for the trusted domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/email-security/settings/trusted_domains/{trusted_domain_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TrustedDomainGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TrustedDomainGetResponse], ResultWrapper[TrustedDomainGetResponse]),
+        )
+
+
+class AsyncTrustedDomainsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncTrustedDomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTrustedDomainsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTrustedDomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTrustedDomainsResourceWithStreamingResponse(self)
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        is_recent: bool,
+        is_regex: bool,
+        is_similarity: bool,
+        pattern: str,
+        comments: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TrustedDomainCreateResponse:
+        """
+        Create a trusted email domain
+
+        Args:
+          account_id: Account Identifier
+
+          is_recent: Select to prevent recently registered domains from triggering a Suspicious or
+              Malicious disposition.
+
+          is_similarity: Select for partner or other approved domains that have similar spelling to your
+              connected domains. Prevents listed domains from triggering a Spoof disposition.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        body: Iterable[trusted_domain_create_params.Variant1Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TrustedDomainCreateResponse:
+        """
+        Create a trusted email domain
+
+        Args:
+          account_id: Account Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "is_recent", "is_regex", "is_similarity", "pattern"], ["account_id", "body"])
+    async def create(
+        self,
+        *,
+        account_id: str,
+        is_recent: bool | Omit = omit,
+        is_regex: bool | Omit = omit,
+        is_similarity: bool | Omit = omit,
+        pattern: str | Omit = omit,
+        comments: Optional[str] | Omit = omit,
+        body: Iterable[trusted_domain_create_params.Variant1Body] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TrustedDomainCreateResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return cast(
+            TrustedDomainCreateResponse,
+            await self._post(
+                f"/accounts/{account_id}/email-security/settings/trusted_domains",
+                body=await async_maybe_transform(
+                    {
+                        "is_recent": is_recent,
+                        "is_regex": is_regex,
+                        "is_similarity": is_similarity,
+                        "pattern": pattern,
+                        "comments": comments,
+                        "body": body,
+                    },
+                    trusted_domain_create_params.TrustedDomainCreateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[TrustedDomainCreateResponse]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[TrustedDomainCreateResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        is_recent: bool | Omit = omit,
+        is_similarity: bool | Omit = omit,
+        order: Literal["pattern", "created_at"] | Omit = omit,
+        page: int | Omit = omit,
+        pattern: str | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[TrustedDomainListResponse, AsyncV4PagePaginationArray[TrustedDomainListResponse]]:
+        """
+        Lists, searches, and sorts an account’s trusted email domains.
+
+        Args:
+          account_id: Account Identifier
+
+          direction: The sorting direction.
+
+          order: The field to sort by.
+
+          page: The page number of paginated results.
+
+          per_page: The number of results per page.
+
+          search: Allows searching in multiple properties of a record simultaneously. This
+              parameter is intended for human users, not automation. Its exact behavior is
+              intentionally left unspecified and is subject to change in the future.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/settings/trusted_domains",
+            page=AsyncV4PagePaginationArray[TrustedDomainListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "is_recent": is_recent,
+                        "is_similarity": is_similarity,
+                        "order": order,
+                        "page": page,
+                        "pattern": pattern,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    trusted_domain_list_params.TrustedDomainListParams,
+                ),
+            ),
+            model=TrustedDomainListResponse,
+        )
+
+    async def delete(
+        self,
+        trusted_domain_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TrustedDomainDeleteResponse:
+        """
+        Delete a trusted email domain
+
+        Args:
+          account_id: Account Identifier
+
+          trusted_domain_id: The unique identifier for the trusted domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/email-security/settings/trusted_domains/{trusted_domain_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TrustedDomainDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TrustedDomainDeleteResponse], ResultWrapper[TrustedDomainDeleteResponse]),
+        )
+
+    async def edit(
+        self,
+        trusted_domain_id: int,
+        *,
+        account_id: str,
+        comments: str | Omit = omit,
+        is_recent: bool | Omit = omit,
+        is_regex: bool | Omit = omit,
+        is_similarity: bool | Omit = omit,
+        pattern: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TrustedDomainEditResponse:
+        """
+        Update a trusted email domain
+
+        Args:
+          account_id: Account Identifier
+
+          trusted_domain_id: The unique identifier for the trusted domain.
+
+          is_recent: Select to prevent recently registered domains from triggering a Suspicious or
+              Malicious disposition.
+
+          is_similarity: Select for partner or other approved domains that have similar spelling to your
+              connected domains. Prevents listed domains from triggering a Spoof disposition.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/email-security/settings/trusted_domains/{trusted_domain_id}",
+            body=await async_maybe_transform(
+                {
+                    "comments": comments,
+                    "is_recent": is_recent,
+                    "is_regex": is_regex,
+                    "is_similarity": is_similarity,
+                    "pattern": pattern,
+                },
+                trusted_domain_edit_params.TrustedDomainEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TrustedDomainEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TrustedDomainEditResponse], ResultWrapper[TrustedDomainEditResponse]),
+        )
+
+    async def get(
+        self,
+        trusted_domain_id: int,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TrustedDomainGetResponse:
+        """
+        Get a trusted email domain
+
+        Args:
+          account_id: Account Identifier
+
+          trusted_domain_id: The unique identifier for the trusted domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/email-security/settings/trusted_domains/{trusted_domain_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TrustedDomainGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TrustedDomainGetResponse], ResultWrapper[TrustedDomainGetResponse]),
+        )
+
+
+class TrustedDomainsResourceWithRawResponse:
+    def __init__(self, trusted_domains: TrustedDomainsResource) -> None:
+        self._trusted_domains = trusted_domains
+
+        self.create = to_raw_response_wrapper(
+            trusted_domains.create,
+        )
+        self.list = to_raw_response_wrapper(
+            trusted_domains.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            trusted_domains.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            trusted_domains.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            trusted_domains.get,
+        )
+
+
+class AsyncTrustedDomainsResourceWithRawResponse:
+    def __init__(self, trusted_domains: AsyncTrustedDomainsResource) -> None:
+        self._trusted_domains = trusted_domains
+
+        self.create = async_to_raw_response_wrapper(
+            trusted_domains.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            trusted_domains.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            trusted_domains.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            trusted_domains.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            trusted_domains.get,
+        )
+
+
+class TrustedDomainsResourceWithStreamingResponse:
+    def __init__(self, trusted_domains: TrustedDomainsResource) -> None:
+        self._trusted_domains = trusted_domains
+
+        self.create = to_streamed_response_wrapper(
+            trusted_domains.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            trusted_domains.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            trusted_domains.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            trusted_domains.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            trusted_domains.get,
+        )
+
+
+class AsyncTrustedDomainsResourceWithStreamingResponse:
+    def __init__(self, trusted_domains: AsyncTrustedDomainsResource) -> None:
+        self._trusted_domains = trusted_domains
+
+        self.create = async_to_streamed_response_wrapper(
+            trusted_domains.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            trusted_domains.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            trusted_domains.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            trusted_domains.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            trusted_domains.get,
+        )
diff --git a/src/cloudflare/resources/email_security/submissions.py b/src/cloudflare/resources/email_security/submissions.py
new file mode 100644
index 00000000000..4e8ff7ee97b
--- /dev/null
+++ b/src/cloudflare/resources/email_security/submissions.py
@@ -0,0 +1,252 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.email_security import submission_list_params
+from ...types.email_security.submission_list_response import SubmissionListResponse
+
+__all__ = ["SubmissionsResource", "AsyncSubmissionsResource"]
+
+
+class SubmissionsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SubmissionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SubmissionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SubmissionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SubmissionsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        end: Union[str, datetime] | Omit = omit,
+        original_disposition: Literal["MALICIOUS", "SUSPICIOUS", "SPOOF", "SPAM", "BULK", "NONE"] | Omit = omit,
+        outcome_disposition: Literal["MALICIOUS", "SUSPICIOUS", "SPOOF", "SPAM", "BULK", "NONE"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        query: Optional[str] | Omit = omit,
+        requested_disposition: Literal["MALICIOUS", "SUSPICIOUS", "SPOOF", "SPAM", "BULK", "NONE"] | Omit = omit,
+        start: Union[str, datetime] | Omit = omit,
+        status: str | Omit = omit,
+        submission_id: str | Omit = omit,
+        type: Literal["TEAM", "USER"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[SubmissionListResponse]:
+        """
+        This endpoint returns information for submissions to made to reclassify emails.
+
+        Args:
+          account_id: Account Identifier
+
+          end: The end of the search date range. Defaults to `now`.
+
+          page: The page number of paginated results.
+
+          per_page: The number of results per page.
+
+          start: The beginning of the search date range. Defaults to `now - 30 days`.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/submissions",
+            page=SyncV4PagePaginationArray[SubmissionListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "end": end,
+                        "original_disposition": original_disposition,
+                        "outcome_disposition": outcome_disposition,
+                        "page": page,
+                        "per_page": per_page,
+                        "query": query,
+                        "requested_disposition": requested_disposition,
+                        "start": start,
+                        "status": status,
+                        "submission_id": submission_id,
+                        "type": type,
+                    },
+                    submission_list_params.SubmissionListParams,
+                ),
+            ),
+            model=SubmissionListResponse,
+        )
+
+
+class AsyncSubmissionsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSubmissionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSubmissionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSubmissionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSubmissionsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        end: Union[str, datetime] | Omit = omit,
+        original_disposition: Literal["MALICIOUS", "SUSPICIOUS", "SPOOF", "SPAM", "BULK", "NONE"] | Omit = omit,
+        outcome_disposition: Literal["MALICIOUS", "SUSPICIOUS", "SPOOF", "SPAM", "BULK", "NONE"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        query: Optional[str] | Omit = omit,
+        requested_disposition: Literal["MALICIOUS", "SUSPICIOUS", "SPOOF", "SPAM", "BULK", "NONE"] | Omit = omit,
+        start: Union[str, datetime] | Omit = omit,
+        status: str | Omit = omit,
+        submission_id: str | Omit = omit,
+        type: Literal["TEAM", "USER"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SubmissionListResponse, AsyncV4PagePaginationArray[SubmissionListResponse]]:
+        """
+        This endpoint returns information for submissions to made to reclassify emails.
+
+        Args:
+          account_id: Account Identifier
+
+          end: The end of the search date range. Defaults to `now`.
+
+          page: The page number of paginated results.
+
+          per_page: The number of results per page.
+
+          start: The beginning of the search date range. Defaults to `now - 30 days`.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/email-security/submissions",
+            page=AsyncV4PagePaginationArray[SubmissionListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "end": end,
+                        "original_disposition": original_disposition,
+                        "outcome_disposition": outcome_disposition,
+                        "page": page,
+                        "per_page": per_page,
+                        "query": query,
+                        "requested_disposition": requested_disposition,
+                        "start": start,
+                        "status": status,
+                        "submission_id": submission_id,
+                        "type": type,
+                    },
+                    submission_list_params.SubmissionListParams,
+                ),
+            ),
+            model=SubmissionListResponse,
+        )
+
+
+class SubmissionsResourceWithRawResponse:
+    def __init__(self, submissions: SubmissionsResource) -> None:
+        self._submissions = submissions
+
+        self.list = to_raw_response_wrapper(
+            submissions.list,
+        )
+
+
+class AsyncSubmissionsResourceWithRawResponse:
+    def __init__(self, submissions: AsyncSubmissionsResource) -> None:
+        self._submissions = submissions
+
+        self.list = async_to_raw_response_wrapper(
+            submissions.list,
+        )
+
+
+class SubmissionsResourceWithStreamingResponse:
+    def __init__(self, submissions: SubmissionsResource) -> None:
+        self._submissions = submissions
+
+        self.list = to_streamed_response_wrapper(
+            submissions.list,
+        )
+
+
+class AsyncSubmissionsResourceWithStreamingResponse:
+    def __init__(self, submissions: AsyncSubmissionsResource) -> None:
+        self._submissions = submissions
+
+        self.list = async_to_streamed_response_wrapper(
+            submissions.list,
+        )
diff --git a/src/cloudflare/resources/event_notifications/__init__.py b/src/cloudflare/resources/event_notifications/__init__.py
deleted file mode 100644
index b0d56c216b8..00000000000
--- a/src/cloudflare/resources/event_notifications/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from .r2 import (
-    R2Resource,
-    AsyncR2Resource,
-    R2ResourceWithRawResponse,
-    AsyncR2ResourceWithRawResponse,
-    R2ResourceWithStreamingResponse,
-    AsyncR2ResourceWithStreamingResponse,
-)
-from .event_notifications import (
-    EventNotificationsResource,
-    AsyncEventNotificationsResource,
-    EventNotificationsResourceWithRawResponse,
-    AsyncEventNotificationsResourceWithRawResponse,
-    EventNotificationsResourceWithStreamingResponse,
-    AsyncEventNotificationsResourceWithStreamingResponse,
-)
-
-__all__ = [
-    "R2Resource",
-    "AsyncR2Resource",
-    "R2ResourceWithRawResponse",
-    "AsyncR2ResourceWithRawResponse",
-    "R2ResourceWithStreamingResponse",
-    "AsyncR2ResourceWithStreamingResponse",
-    "EventNotificationsResource",
-    "AsyncEventNotificationsResource",
-    "EventNotificationsResourceWithRawResponse",
-    "AsyncEventNotificationsResourceWithRawResponse",
-    "EventNotificationsResourceWithStreamingResponse",
-    "AsyncEventNotificationsResourceWithStreamingResponse",
-]
diff --git a/src/cloudflare/resources/event_notifications/event_notifications.py b/src/cloudflare/resources/event_notifications/event_notifications.py
deleted file mode 100644
index d0ed187d73c..00000000000
--- a/src/cloudflare/resources/event_notifications/event_notifications.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from .r2 import (
-    R2Resource,
-    AsyncR2Resource,
-    R2ResourceWithRawResponse,
-    AsyncR2ResourceWithRawResponse,
-    R2ResourceWithStreamingResponse,
-    AsyncR2ResourceWithStreamingResponse,
-)
-from .r2.r2 import R2Resource, AsyncR2Resource
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-
-__all__ = ["EventNotificationsResource", "AsyncEventNotificationsResource"]
-
-
-class EventNotificationsResource(SyncAPIResource):
-    @cached_property
-    def r2(self) -> R2Resource:
-        return R2Resource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> EventNotificationsResourceWithRawResponse:
-        return EventNotificationsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> EventNotificationsResourceWithStreamingResponse:
-        return EventNotificationsResourceWithStreamingResponse(self)
-
-
-class AsyncEventNotificationsResource(AsyncAPIResource):
-    @cached_property
-    def r2(self) -> AsyncR2Resource:
-        return AsyncR2Resource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncEventNotificationsResourceWithRawResponse:
-        return AsyncEventNotificationsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncEventNotificationsResourceWithStreamingResponse:
-        return AsyncEventNotificationsResourceWithStreamingResponse(self)
-
-
-class EventNotificationsResourceWithRawResponse:
-    def __init__(self, event_notifications: EventNotificationsResource) -> None:
-        self._event_notifications = event_notifications
-
-    @cached_property
-    def r2(self) -> R2ResourceWithRawResponse:
-        return R2ResourceWithRawResponse(self._event_notifications.r2)
-
-
-class AsyncEventNotificationsResourceWithRawResponse:
-    def __init__(self, event_notifications: AsyncEventNotificationsResource) -> None:
-        self._event_notifications = event_notifications
-
-    @cached_property
-    def r2(self) -> AsyncR2ResourceWithRawResponse:
-        return AsyncR2ResourceWithRawResponse(self._event_notifications.r2)
-
-
-class EventNotificationsResourceWithStreamingResponse:
-    def __init__(self, event_notifications: EventNotificationsResource) -> None:
-        self._event_notifications = event_notifications
-
-    @cached_property
-    def r2(self) -> R2ResourceWithStreamingResponse:
-        return R2ResourceWithStreamingResponse(self._event_notifications.r2)
-
-
-class AsyncEventNotificationsResourceWithStreamingResponse:
-    def __init__(self, event_notifications: AsyncEventNotificationsResource) -> None:
-        self._event_notifications = event_notifications
-
-    @cached_property
-    def r2(self) -> AsyncR2ResourceWithStreamingResponse:
-        return AsyncR2ResourceWithStreamingResponse(self._event_notifications.r2)
diff --git a/src/cloudflare/resources/event_notifications/r2/__init__.py b/src/cloudflare/resources/event_notifications/r2/__init__.py
deleted file mode 100644
index 6d6123f2e43..00000000000
--- a/src/cloudflare/resources/event_notifications/r2/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from .r2 import (
-    R2Resource,
-    AsyncR2Resource,
-    R2ResourceWithRawResponse,
-    AsyncR2ResourceWithRawResponse,
-    R2ResourceWithStreamingResponse,
-    AsyncR2ResourceWithStreamingResponse,
-)
-from .configuration import (
-    ConfigurationResource,
-    AsyncConfigurationResource,
-    ConfigurationResourceWithRawResponse,
-    AsyncConfigurationResourceWithRawResponse,
-    ConfigurationResourceWithStreamingResponse,
-    AsyncConfigurationResourceWithStreamingResponse,
-)
-
-__all__ = [
-    "ConfigurationResource",
-    "AsyncConfigurationResource",
-    "ConfigurationResourceWithRawResponse",
-    "AsyncConfigurationResourceWithRawResponse",
-    "ConfigurationResourceWithStreamingResponse",
-    "AsyncConfigurationResourceWithStreamingResponse",
-    "R2Resource",
-    "AsyncR2Resource",
-    "R2ResourceWithRawResponse",
-    "AsyncR2ResourceWithRawResponse",
-    "R2ResourceWithStreamingResponse",
-    "AsyncR2ResourceWithStreamingResponse",
-]
diff --git a/src/cloudflare/resources/event_notifications/r2/configuration/__init__.py b/src/cloudflare/resources/event_notifications/r2/configuration/__init__.py
deleted file mode 100644
index 500f08ff784..00000000000
--- a/src/cloudflare/resources/event_notifications/r2/configuration/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from .queues import (
-    QueuesResource,
-    AsyncQueuesResource,
-    QueuesResourceWithRawResponse,
-    AsyncQueuesResourceWithRawResponse,
-    QueuesResourceWithStreamingResponse,
-    AsyncQueuesResourceWithStreamingResponse,
-)
-from .configuration import (
-    ConfigurationResource,
-    AsyncConfigurationResource,
-    ConfigurationResourceWithRawResponse,
-    AsyncConfigurationResourceWithRawResponse,
-    ConfigurationResourceWithStreamingResponse,
-    AsyncConfigurationResourceWithStreamingResponse,
-)
-
-__all__ = [
-    "QueuesResource",
-    "AsyncQueuesResource",
-    "QueuesResourceWithRawResponse",
-    "AsyncQueuesResourceWithRawResponse",
-    "QueuesResourceWithStreamingResponse",
-    "AsyncQueuesResourceWithStreamingResponse",
-    "ConfigurationResource",
-    "AsyncConfigurationResource",
-    "ConfigurationResourceWithRawResponse",
-    "AsyncConfigurationResourceWithRawResponse",
-    "ConfigurationResourceWithStreamingResponse",
-    "AsyncConfigurationResourceWithStreamingResponse",
-]
diff --git a/src/cloudflare/resources/event_notifications/r2/configuration/configuration.py b/src/cloudflare/resources/event_notifications/r2/configuration/configuration.py
deleted file mode 100644
index c1c541c1d96..00000000000
--- a/src/cloudflare/resources/event_notifications/r2/configuration/configuration.py
+++ /dev/null
@@ -1,200 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, cast
-
-import httpx
-
-from .queues import (
-    QueuesResource,
-    AsyncQueuesResource,
-    QueuesResourceWithRawResponse,
-    AsyncQueuesResourceWithRawResponse,
-    QueuesResourceWithStreamingResponse,
-    AsyncQueuesResourceWithStreamingResponse,
-)
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._compat import cached_property
-from ....._resource import SyncAPIResource, AsyncAPIResource
-from ....._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ....._wrappers import ResultWrapper
-from ....._base_client import make_request_options
-from .....types.event_notifications.r2.configuration_get_response import ConfigurationGetResponse
-
-__all__ = ["ConfigurationResource", "AsyncConfigurationResource"]
-
-
-class ConfigurationResource(SyncAPIResource):
-    @cached_property
-    def queues(self) -> QueuesResource:
-        return QueuesResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> ConfigurationResourceWithRawResponse:
-        return ConfigurationResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> ConfigurationResourceWithStreamingResponse:
-        return ConfigurationResourceWithStreamingResponse(self)
-
-    def get(
-        self,
-        bucket_name: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConfigurationGetResponse:
-        """
-        Returns all notification rules for each queue for which bucket notifications are
-        produced.
-
-        Args:
-          account_id: Identifier
-
-          bucket_name: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not bucket_name:
-            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
-        return self._get(
-            f"/accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[ConfigurationGetResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[ConfigurationGetResponse], ResultWrapper[ConfigurationGetResponse]),
-        )
-
-
-class AsyncConfigurationResource(AsyncAPIResource):
-    @cached_property
-    def queues(self) -> AsyncQueuesResource:
-        return AsyncQueuesResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncConfigurationResourceWithRawResponse:
-        return AsyncConfigurationResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncConfigurationResourceWithStreamingResponse:
-        return AsyncConfigurationResourceWithStreamingResponse(self)
-
-    async def get(
-        self,
-        bucket_name: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConfigurationGetResponse:
-        """
-        Returns all notification rules for each queue for which bucket notifications are
-        produced.
-
-        Args:
-          account_id: Identifier
-
-          bucket_name: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not bucket_name:
-            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
-        return await self._get(
-            f"/accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[ConfigurationGetResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[ConfigurationGetResponse], ResultWrapper[ConfigurationGetResponse]),
-        )
-
-
-class ConfigurationResourceWithRawResponse:
-    def __init__(self, configuration: ConfigurationResource) -> None:
-        self._configuration = configuration
-
-        self.get = to_raw_response_wrapper(
-            configuration.get,
-        )
-
-    @cached_property
-    def queues(self) -> QueuesResourceWithRawResponse:
-        return QueuesResourceWithRawResponse(self._configuration.queues)
-
-
-class AsyncConfigurationResourceWithRawResponse:
-    def __init__(self, configuration: AsyncConfigurationResource) -> None:
-        self._configuration = configuration
-
-        self.get = async_to_raw_response_wrapper(
-            configuration.get,
-        )
-
-    @cached_property
-    def queues(self) -> AsyncQueuesResourceWithRawResponse:
-        return AsyncQueuesResourceWithRawResponse(self._configuration.queues)
-
-
-class ConfigurationResourceWithStreamingResponse:
-    def __init__(self, configuration: ConfigurationResource) -> None:
-        self._configuration = configuration
-
-        self.get = to_streamed_response_wrapper(
-            configuration.get,
-        )
-
-    @cached_property
-    def queues(self) -> QueuesResourceWithStreamingResponse:
-        return QueuesResourceWithStreamingResponse(self._configuration.queues)
-
-
-class AsyncConfigurationResourceWithStreamingResponse:
-    def __init__(self, configuration: AsyncConfigurationResource) -> None:
-        self._configuration = configuration
-
-        self.get = async_to_streamed_response_wrapper(
-            configuration.get,
-        )
-
-    @cached_property
-    def queues(self) -> AsyncQueuesResourceWithStreamingResponse:
-        return AsyncQueuesResourceWithStreamingResponse(self._configuration.queues)
diff --git a/src/cloudflare/resources/event_notifications/r2/configuration/queues.py b/src/cloudflare/resources/event_notifications/r2/configuration/queues.py
deleted file mode 100644
index 6b4d28e5383..00000000000
--- a/src/cloudflare/resources/event_notifications/r2/configuration/queues.py
+++ /dev/null
@@ -1,316 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Any, Type, Iterable, cast
-
-import httpx
-
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ....._compat import cached_property
-from ....._resource import SyncAPIResource, AsyncAPIResource
-from ....._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ....._wrappers import ResultWrapper
-from ....._base_client import make_request_options
-from .....types.event_notifications.r2.configuration import queue_update_params
-from .....types.event_notifications.r2.configuration.queue_delete_response import QueueDeleteResponse
-from .....types.event_notifications.r2.configuration.queue_update_response import QueueUpdateResponse
-
-__all__ = ["QueuesResource", "AsyncQueuesResource"]
-
-
-class QueuesResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> QueuesResourceWithRawResponse:
-        return QueuesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> QueuesResourceWithStreamingResponse:
-        return QueuesResourceWithStreamingResponse(self)
-
-    def update(
-        self,
-        queue_id: str,
-        *,
-        account_id: str,
-        bucket_name: str,
-        rules: Iterable[queue_update_params.Rule] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> QueueUpdateResponse:
-        """
-        Define the rules for a given queue which will determine event notification
-        production.
-
-        Args:
-          account_id: Identifier
-
-          bucket_name: Identifier
-
-          queue_id: Identifier
-
-          rules: Array of rules to drive notifications
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not bucket_name:
-            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
-        if not queue_id:
-            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
-        return self._put(
-            f"/accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}",
-            body=maybe_transform({"rules": rules}, queue_update_params.QueueUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[QueueUpdateResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[QueueUpdateResponse], ResultWrapper[QueueUpdateResponse]),
-        )
-
-    def delete(
-        self,
-        queue_id: str,
-        *,
-        account_id: str,
-        bucket_name: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> QueueDeleteResponse:
-        """Turn off all event notifications configured for delivery to a given queue.
-
-        No
-        further notifications will be produced for the queue once complete.
-
-        Args:
-          account_id: Identifier
-
-          bucket_name: Identifier
-
-          queue_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not bucket_name:
-            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
-        if not queue_id:
-            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
-        return cast(
-            QueueDeleteResponse,
-            self._delete(
-                f"/accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[QueueDeleteResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[QueueDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class AsyncQueuesResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncQueuesResourceWithRawResponse:
-        return AsyncQueuesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncQueuesResourceWithStreamingResponse:
-        return AsyncQueuesResourceWithStreamingResponse(self)
-
-    async def update(
-        self,
-        queue_id: str,
-        *,
-        account_id: str,
-        bucket_name: str,
-        rules: Iterable[queue_update_params.Rule] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> QueueUpdateResponse:
-        """
-        Define the rules for a given queue which will determine event notification
-        production.
-
-        Args:
-          account_id: Identifier
-
-          bucket_name: Identifier
-
-          queue_id: Identifier
-
-          rules: Array of rules to drive notifications
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not bucket_name:
-            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
-        if not queue_id:
-            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
-        return await self._put(
-            f"/accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}",
-            body=await async_maybe_transform({"rules": rules}, queue_update_params.QueueUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[QueueUpdateResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[QueueUpdateResponse], ResultWrapper[QueueUpdateResponse]),
-        )
-
-    async def delete(
-        self,
-        queue_id: str,
-        *,
-        account_id: str,
-        bucket_name: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> QueueDeleteResponse:
-        """Turn off all event notifications configured for delivery to a given queue.
-
-        No
-        further notifications will be produced for the queue once complete.
-
-        Args:
-          account_id: Identifier
-
-          bucket_name: Identifier
-
-          queue_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not bucket_name:
-            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
-        if not queue_id:
-            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
-        return cast(
-            QueueDeleteResponse,
-            await self._delete(
-                f"/accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[QueueDeleteResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[QueueDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class QueuesResourceWithRawResponse:
-    def __init__(self, queues: QueuesResource) -> None:
-        self._queues = queues
-
-        self.update = to_raw_response_wrapper(
-            queues.update,
-        )
-        self.delete = to_raw_response_wrapper(
-            queues.delete,
-        )
-
-
-class AsyncQueuesResourceWithRawResponse:
-    def __init__(self, queues: AsyncQueuesResource) -> None:
-        self._queues = queues
-
-        self.update = async_to_raw_response_wrapper(
-            queues.update,
-        )
-        self.delete = async_to_raw_response_wrapper(
-            queues.delete,
-        )
-
-
-class QueuesResourceWithStreamingResponse:
-    def __init__(self, queues: QueuesResource) -> None:
-        self._queues = queues
-
-        self.update = to_streamed_response_wrapper(
-            queues.update,
-        )
-        self.delete = to_streamed_response_wrapper(
-            queues.delete,
-        )
-
-
-class AsyncQueuesResourceWithStreamingResponse:
-    def __init__(self, queues: AsyncQueuesResource) -> None:
-        self._queues = queues
-
-        self.update = async_to_streamed_response_wrapper(
-            queues.update,
-        )
-        self.delete = async_to_streamed_response_wrapper(
-            queues.delete,
-        )
diff --git a/src/cloudflare/resources/event_notifications/r2/r2.py b/src/cloudflare/resources/event_notifications/r2/r2.py
deleted file mode 100644
index 4103c51b0f8..00000000000
--- a/src/cloudflare/resources/event_notifications/r2/r2.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from .configuration import (
-    ConfigurationResource,
-    AsyncConfigurationResource,
-    ConfigurationResourceWithRawResponse,
-    AsyncConfigurationResourceWithRawResponse,
-    ConfigurationResourceWithStreamingResponse,
-    AsyncConfigurationResourceWithStreamingResponse,
-)
-from .configuration.configuration import ConfigurationResource, AsyncConfigurationResource
-
-__all__ = ["R2Resource", "AsyncR2Resource"]
-
-
-class R2Resource(SyncAPIResource):
-    @cached_property
-    def configuration(self) -> ConfigurationResource:
-        return ConfigurationResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> R2ResourceWithRawResponse:
-        return R2ResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> R2ResourceWithStreamingResponse:
-        return R2ResourceWithStreamingResponse(self)
-
-
-class AsyncR2Resource(AsyncAPIResource):
-    @cached_property
-    def configuration(self) -> AsyncConfigurationResource:
-        return AsyncConfigurationResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncR2ResourceWithRawResponse:
-        return AsyncR2ResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncR2ResourceWithStreamingResponse:
-        return AsyncR2ResourceWithStreamingResponse(self)
-
-
-class R2ResourceWithRawResponse:
-    def __init__(self, r2: R2Resource) -> None:
-        self._r2 = r2
-
-    @cached_property
-    def configuration(self) -> ConfigurationResourceWithRawResponse:
-        return ConfigurationResourceWithRawResponse(self._r2.configuration)
-
-
-class AsyncR2ResourceWithRawResponse:
-    def __init__(self, r2: AsyncR2Resource) -> None:
-        self._r2 = r2
-
-    @cached_property
-    def configuration(self) -> AsyncConfigurationResourceWithRawResponse:
-        return AsyncConfigurationResourceWithRawResponse(self._r2.configuration)
-
-
-class R2ResourceWithStreamingResponse:
-    def __init__(self, r2: R2Resource) -> None:
-        self._r2 = r2
-
-    @cached_property
-    def configuration(self) -> ConfigurationResourceWithStreamingResponse:
-        return ConfigurationResourceWithStreamingResponse(self._r2.configuration)
-
-
-class AsyncR2ResourceWithStreamingResponse:
-    def __init__(self, r2: AsyncR2Resource) -> None:
-        self._r2 = r2
-
-    @cached_property
-    def configuration(self) -> AsyncConfigurationResourceWithStreamingResponse:
-        return AsyncConfigurationResourceWithStreamingResponse(self._r2.configuration)
diff --git a/src/cloudflare/resources/filters.py b/src/cloudflare/resources/filters.py
index ce71f975685..9ecfd9dc3ab 100644
--- a/src/cloudflare/resources/filters.py
+++ b/src/cloudflare/resources/filters.py
@@ -3,15 +3,12 @@
 from __future__ import annotations
 
 import typing_extensions
-from typing import Type, Optional, cast
+from typing import Type, Iterable, Optional, cast
 
 import httpx
 
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from .._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from .._utils import maybe_transform, async_maybe_transform
 from .._compat import cached_property
 from .._resource import SyncAPIResource, AsyncAPIResource
 from .._response import (
@@ -21,11 +18,18 @@
     async_to_streamed_response_wrapper,
 )
 from .._wrappers import ResultWrapper
-from ..pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.filters import filter_list_params, filter_create_params, filter_update_params
+from ..types.filters import (
+    filter_list_params,
+    filter_update_params,
+    filter_bulk_delete_params,
+    filter_bulk_update_params,
+)
 from ..types.filters.firewall_filter import FirewallFilter
-from ..types.filters.filter_create_response import FilterCreateResponse
+from ..types.filters.firewall_filter_param import FirewallFilterParam
+from ..types.filters.filter_delete_response import FilterDeleteResponse
+from ..types.filters.filter_bulk_delete_response import FilterBulkDeleteResponse
 
 __all__ = ["FiltersResource", "AsyncFiltersResource"]
 
@@ -33,10 +37,21 @@
 class FiltersResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> FiltersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return FiltersResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> FiltersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return FiltersResourceWithStreamingResponse(self)
 
     @typing_extensions.deprecated(
@@ -44,21 +59,21 @@ def with_streaming_response(self) -> FiltersResourceWithStreamingResponse:
     )
     def create(
         self,
-        zone_identifier: str,
         *,
-        body: object,
+        zone_id: str,
+        body: Iterable[FirewallFilterParam],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[FilterCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[FirewallFilter]:
         """
         Creates one or more filters.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
           extra_headers: Send extra headers
 
@@ -68,19 +83,17 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        return self._post(
-            f"/zones/{zone_identifier}/filters",
-            body=maybe_transform(body, filter_create_params.FilterCreateParams),
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/filters",
+            page=SyncSinglePage[FirewallFilter],
+            body=maybe_transform(body, Iterable[FirewallFilterParam]),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[FilterCreateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[FilterCreateResponse]], ResultWrapper[FilterCreateResponse]),
+            model=FirewallFilter,
+            method="post",
         )
 
     @typing_extensions.deprecated(
@@ -88,24 +101,36 @@ def create(
     )
     def update(
         self,
-        id: str,
+        filter_id: str,
         *,
-        zone_identifier: str,
-        body: object,
+        zone_id: str,
+        description: str | Omit = omit,
+        expression: str | Omit = omit,
+        paused: bool | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> FirewallFilter:
         """
         Updates an existing filter.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the filter.
+          filter_id: The unique identifier of the filter.
+
+          description: An informative summary of the filter.
+
+          expression: The filter expression. For more information, refer to
+              [Expressions](https://developers.cloudflare.com/ruleset-engine/rules-language/expressions/).
+
+          paused: When true, indicates that the filter is currently paused.
+
+          ref: A short reference tag. Allows you to select related filters.
 
           extra_headers: Send extra headers
 
@@ -115,13 +140,21 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not filter_id:
+            raise ValueError(f"Expected a non-empty value for `filter_id` but received {filter_id!r}")
         return self._put(
-            f"/zones/{zone_identifier}/filters/{id}",
-            body=maybe_transform(body, filter_update_params.FilterUpdateParams),
+            f"/zones/{zone_id}/filters/{filter_id}",
+            body=maybe_transform(
+                {
+                    "description": description,
+                    "expression": expression,
+                    "paused": paused,
+                    "ref": ref,
+                },
+                filter_update_params.FilterUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -137,21 +170,21 @@ def update(
     )
     def list(
         self,
-        zone_identifier: str,
         *,
-        id: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        paused: bool | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        id: str | Omit = omit,
+        description: str | Omit = omit,
+        expression: str | Omit = omit,
+        page: float | Omit = omit,
+        paused: bool | Omit = omit,
+        per_page: float | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[FirewallFilter]:
         """Fetches filters in a zone.
 
@@ -159,7 +192,7 @@ def list(
         parameters.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
           id: The unique identifier of the filter.
 
@@ -183,10 +216,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/filters",
+            f"/zones/{zone_id}/filters",
             page=SyncV4PagePaginationArray[FirewallFilter],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -214,23 +247,23 @@ def list(
     )
     def delete(
         self,
-        id: str,
+        filter_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> FirewallFilter:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> FilterDeleteResponse:
         """
         Deletes an existing filter.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the filter.
+          filter_id: The unique identifier of the filter.
 
           extra_headers: Send extra headers
 
@@ -240,20 +273,106 @@ def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not filter_id:
+            raise ValueError(f"Expected a non-empty value for `filter_id` but received {filter_id!r}")
         return self._delete(
-            f"/zones/{zone_identifier}/filters/{id}",
+            f"/zones/{zone_id}/filters/{filter_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[FirewallFilter]._unwrapper,
+                post_parser=ResultWrapper[FilterDeleteResponse]._unwrapper,
             ),
-            cast_to=cast(Type[FirewallFilter], ResultWrapper[FirewallFilter]),
+            cast_to=cast(Type[FilterDeleteResponse], ResultWrapper[FilterDeleteResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "The Filters API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details."
+    )
+    def bulk_delete(
+        self,
+        *,
+        zone_id: str,
+        id: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[FilterBulkDeleteResponse]:
+        """
+        Deletes one or more existing filters.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._delete(
+            f"/zones/{zone_id}/filters",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"id": id}, filter_bulk_delete_params.FilterBulkDeleteParams),
+                post_parser=ResultWrapper[Optional[FilterBulkDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[FilterBulkDeleteResponse]], ResultWrapper[FilterBulkDeleteResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "The Filters API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details."
+    )
+    def bulk_update(
+        self,
+        *,
+        zone_id: str,
+        body: Iterable[filter_bulk_update_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[FirewallFilter]:
+        """
+        Updates one or more existing filters.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/filters",
+            page=SyncSinglePage[FirewallFilter],
+            body=maybe_transform(body, Iterable[filter_bulk_update_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=FirewallFilter,
+            method="put",
         )
 
     @typing_extensions.deprecated(
@@ -261,23 +380,23 @@ def delete(
     )
     def get(
         self,
-        id: str,
+        filter_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> FirewallFilter:
         """
         Fetches the details of a filter.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the filter.
+          filter_id: The unique identifier of the filter.
 
           extra_headers: Send extra headers
 
@@ -287,12 +406,12 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not filter_id:
+            raise ValueError(f"Expected a non-empty value for `filter_id` but received {filter_id!r}")
         return self._get(
-            f"/zones/{zone_identifier}/filters/{id}",
+            f"/zones/{zone_id}/filters/{filter_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -307,32 +426,43 @@ def get(
 class AsyncFiltersResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncFiltersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncFiltersResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncFiltersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncFiltersResourceWithStreamingResponse(self)
 
     @typing_extensions.deprecated(
         "The Filters API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details."
     )
-    async def create(
+    def create(
         self,
-        zone_identifier: str,
         *,
-        body: object,
+        zone_id: str,
+        body: Iterable[FirewallFilterParam],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[FilterCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[FirewallFilter, AsyncSinglePage[FirewallFilter]]:
         """
         Creates one or more filters.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
           extra_headers: Send extra headers
 
@@ -342,19 +472,17 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        return await self._post(
-            f"/zones/{zone_identifier}/filters",
-            body=await async_maybe_transform(body, filter_create_params.FilterCreateParams),
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/filters",
+            page=AsyncSinglePage[FirewallFilter],
+            body=maybe_transform(body, Iterable[FirewallFilterParam]),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[FilterCreateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[FilterCreateResponse]], ResultWrapper[FilterCreateResponse]),
+            model=FirewallFilter,
+            method="post",
         )
 
     @typing_extensions.deprecated(
@@ -362,24 +490,36 @@ async def create(
     )
     async def update(
         self,
-        id: str,
+        filter_id: str,
         *,
-        zone_identifier: str,
-        body: object,
+        zone_id: str,
+        description: str | Omit = omit,
+        expression: str | Omit = omit,
+        paused: bool | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> FirewallFilter:
         """
         Updates an existing filter.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the filter.
+          filter_id: The unique identifier of the filter.
+
+          description: An informative summary of the filter.
+
+          expression: The filter expression. For more information, refer to
+              [Expressions](https://developers.cloudflare.com/ruleset-engine/rules-language/expressions/).
+
+          paused: When true, indicates that the filter is currently paused.
+
+          ref: A short reference tag. Allows you to select related filters.
 
           extra_headers: Send extra headers
 
@@ -389,13 +529,21 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not filter_id:
+            raise ValueError(f"Expected a non-empty value for `filter_id` but received {filter_id!r}")
         return await self._put(
-            f"/zones/{zone_identifier}/filters/{id}",
-            body=await async_maybe_transform(body, filter_update_params.FilterUpdateParams),
+            f"/zones/{zone_id}/filters/{filter_id}",
+            body=await async_maybe_transform(
+                {
+                    "description": description,
+                    "expression": expression,
+                    "paused": paused,
+                    "ref": ref,
+                },
+                filter_update_params.FilterUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -411,21 +559,21 @@ async def update(
     )
     def list(
         self,
-        zone_identifier: str,
         *,
-        id: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        paused: bool | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        id: str | Omit = omit,
+        description: str | Omit = omit,
+        expression: str | Omit = omit,
+        page: float | Omit = omit,
+        paused: bool | Omit = omit,
+        per_page: float | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[FirewallFilter, AsyncV4PagePaginationArray[FirewallFilter]]:
         """Fetches filters in a zone.
 
@@ -433,7 +581,7 @@ def list(
         parameters.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
           id: The unique identifier of the filter.
 
@@ -457,10 +605,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/filters",
+            f"/zones/{zone_id}/filters",
             page=AsyncV4PagePaginationArray[FirewallFilter],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -488,23 +636,23 @@ def list(
     )
     async def delete(
         self,
-        id: str,
+        filter_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> FirewallFilter:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> FilterDeleteResponse:
         """
         Deletes an existing filter.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the filter.
+          filter_id: The unique identifier of the filter.
 
           extra_headers: Send extra headers
 
@@ -514,20 +662,106 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not filter_id:
+            raise ValueError(f"Expected a non-empty value for `filter_id` but received {filter_id!r}")
         return await self._delete(
-            f"/zones/{zone_identifier}/filters/{id}",
+            f"/zones/{zone_id}/filters/{filter_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[FirewallFilter]._unwrapper,
+                post_parser=ResultWrapper[FilterDeleteResponse]._unwrapper,
             ),
-            cast_to=cast(Type[FirewallFilter], ResultWrapper[FirewallFilter]),
+            cast_to=cast(Type[FilterDeleteResponse], ResultWrapper[FilterDeleteResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "The Filters API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details."
+    )
+    async def bulk_delete(
+        self,
+        *,
+        zone_id: str,
+        id: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[FilterBulkDeleteResponse]:
+        """
+        Deletes one or more existing filters.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._delete(
+            f"/zones/{zone_id}/filters",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"id": id}, filter_bulk_delete_params.FilterBulkDeleteParams),
+                post_parser=ResultWrapper[Optional[FilterBulkDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[FilterBulkDeleteResponse]], ResultWrapper[FilterBulkDeleteResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "The Filters API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details."
+    )
+    def bulk_update(
+        self,
+        *,
+        zone_id: str,
+        body: Iterable[filter_bulk_update_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[FirewallFilter, AsyncSinglePage[FirewallFilter]]:
+        """
+        Updates one or more existing filters.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/filters",
+            page=AsyncSinglePage[FirewallFilter],
+            body=maybe_transform(body, Iterable[filter_bulk_update_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=FirewallFilter,
+            method="put",
         )
 
     @typing_extensions.deprecated(
@@ -535,23 +769,23 @@ async def delete(
     )
     async def get(
         self,
-        id: str,
+        filter_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> FirewallFilter:
         """
         Fetches the details of a filter.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the filter.
+          filter_id: The unique identifier of the filter.
 
           extra_headers: Send extra headers
 
@@ -561,12 +795,12 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not filter_id:
+            raise ValueError(f"Expected a non-empty value for `filter_id` but received {filter_id!r}")
         return await self._get(
-            f"/zones/{zone_identifier}/filters/{id}",
+            f"/zones/{zone_id}/filters/{filter_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -584,27 +818,37 @@ def __init__(self, filters: FiltersResource) -> None:
 
         self.create = (  # pyright: ignore[reportDeprecated]
             to_raw_response_wrapper(
-                filters.create  # pyright: ignore[reportDeprecated],
+                filters.create,  # pyright: ignore[reportDeprecated],
             )
         )
         self.update = (  # pyright: ignore[reportDeprecated]
             to_raw_response_wrapper(
-                filters.update  # pyright: ignore[reportDeprecated],
+                filters.update,  # pyright: ignore[reportDeprecated],
             )
         )
         self.list = (  # pyright: ignore[reportDeprecated]
             to_raw_response_wrapper(
-                filters.list  # pyright: ignore[reportDeprecated],
+                filters.list,  # pyright: ignore[reportDeprecated],
             )
         )
         self.delete = (  # pyright: ignore[reportDeprecated]
             to_raw_response_wrapper(
-                filters.delete  # pyright: ignore[reportDeprecated],
+                filters.delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_delete = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                filters.bulk_delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_update = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                filters.bulk_update,  # pyright: ignore[reportDeprecated],
             )
         )
         self.get = (  # pyright: ignore[reportDeprecated]
             to_raw_response_wrapper(
-                filters.get  # pyright: ignore[reportDeprecated],
+                filters.get,  # pyright: ignore[reportDeprecated],
             )
         )
 
@@ -615,27 +859,37 @@ def __init__(self, filters: AsyncFiltersResource) -> None:
 
         self.create = (  # pyright: ignore[reportDeprecated]
             async_to_raw_response_wrapper(
-                filters.create  # pyright: ignore[reportDeprecated],
+                filters.create,  # pyright: ignore[reportDeprecated],
             )
         )
         self.update = (  # pyright: ignore[reportDeprecated]
             async_to_raw_response_wrapper(
-                filters.update  # pyright: ignore[reportDeprecated],
+                filters.update,  # pyright: ignore[reportDeprecated],
             )
         )
         self.list = (  # pyright: ignore[reportDeprecated]
             async_to_raw_response_wrapper(
-                filters.list  # pyright: ignore[reportDeprecated],
+                filters.list,  # pyright: ignore[reportDeprecated],
             )
         )
         self.delete = (  # pyright: ignore[reportDeprecated]
             async_to_raw_response_wrapper(
-                filters.delete  # pyright: ignore[reportDeprecated],
+                filters.delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_delete = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                filters.bulk_delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_update = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                filters.bulk_update,  # pyright: ignore[reportDeprecated],
             )
         )
         self.get = (  # pyright: ignore[reportDeprecated]
             async_to_raw_response_wrapper(
-                filters.get  # pyright: ignore[reportDeprecated],
+                filters.get,  # pyright: ignore[reportDeprecated],
             )
         )
 
@@ -646,27 +900,37 @@ def __init__(self, filters: FiltersResource) -> None:
 
         self.create = (  # pyright: ignore[reportDeprecated]
             to_streamed_response_wrapper(
-                filters.create  # pyright: ignore[reportDeprecated],
+                filters.create,  # pyright: ignore[reportDeprecated],
             )
         )
         self.update = (  # pyright: ignore[reportDeprecated]
             to_streamed_response_wrapper(
-                filters.update  # pyright: ignore[reportDeprecated],
+                filters.update,  # pyright: ignore[reportDeprecated],
             )
         )
         self.list = (  # pyright: ignore[reportDeprecated]
             to_streamed_response_wrapper(
-                filters.list  # pyright: ignore[reportDeprecated],
+                filters.list,  # pyright: ignore[reportDeprecated],
             )
         )
         self.delete = (  # pyright: ignore[reportDeprecated]
             to_streamed_response_wrapper(
-                filters.delete  # pyright: ignore[reportDeprecated],
+                filters.delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_delete = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                filters.bulk_delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_update = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                filters.bulk_update,  # pyright: ignore[reportDeprecated],
             )
         )
         self.get = (  # pyright: ignore[reportDeprecated]
             to_streamed_response_wrapper(
-                filters.get  # pyright: ignore[reportDeprecated],
+                filters.get,  # pyright: ignore[reportDeprecated],
             )
         )
 
@@ -677,26 +941,36 @@ def __init__(self, filters: AsyncFiltersResource) -> None:
 
         self.create = (  # pyright: ignore[reportDeprecated]
             async_to_streamed_response_wrapper(
-                filters.create  # pyright: ignore[reportDeprecated],
+                filters.create,  # pyright: ignore[reportDeprecated],
             )
         )
         self.update = (  # pyright: ignore[reportDeprecated]
             async_to_streamed_response_wrapper(
-                filters.update  # pyright: ignore[reportDeprecated],
+                filters.update,  # pyright: ignore[reportDeprecated],
             )
         )
         self.list = (  # pyright: ignore[reportDeprecated]
             async_to_streamed_response_wrapper(
-                filters.list  # pyright: ignore[reportDeprecated],
+                filters.list,  # pyright: ignore[reportDeprecated],
             )
         )
         self.delete = (  # pyright: ignore[reportDeprecated]
             async_to_streamed_response_wrapper(
-                filters.delete  # pyright: ignore[reportDeprecated],
+                filters.delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_delete = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                filters.bulk_delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_update = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                filters.bulk_update,  # pyright: ignore[reportDeprecated],
             )
         )
         self.get = (  # pyright: ignore[reportDeprecated]
             async_to_streamed_response_wrapper(
-                filters.get  # pyright: ignore[reportDeprecated],
+                filters.get,  # pyright: ignore[reportDeprecated],
             )
         )
diff --git a/src/cloudflare/resources/firewall/access_rules.py b/src/cloudflare/resources/firewall/access_rules.py
index 80afe6dd910..ed893e5a5b3 100644
--- a/src/cloudflare/resources/firewall/access_rules.py
+++ b/src/cloudflare/resources/firewall/access_rules.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Optional, cast
+from typing import Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -26,6 +23,7 @@
 from ...types.firewall import access_rule_edit_params, access_rule_list_params, access_rule_create_params
 from ...types.firewall.access_rule_get_response import AccessRuleGetResponse
 from ...types.firewall.access_rule_edit_response import AccessRuleEditResponse
+from ...types.firewall.access_rule_list_response import AccessRuleListResponse
 from ...types.firewall.access_rule_create_response import AccessRuleCreateResponse
 from ...types.firewall.access_rule_delete_response import AccessRuleDeleteResponse
 
@@ -35,10 +33,21 @@
 class AccessRulesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AccessRulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AccessRulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AccessRulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AccessRulesResourceWithStreamingResponse(self)
 
     def create(
@@ -46,15 +55,15 @@ def create(
         *,
         configuration: access_rule_create_params.Configuration,
         mode: Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"],
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        notes: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        notes: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AccessRuleCreateResponse:
         """Creates a new IP Access rule for an account or zone.
 
@@ -95,49 +104,46 @@ def create(
 
             account_or_zone = "zones"
             account_or_zone_id = zone_id
-        return cast(
-            AccessRuleCreateResponse,
-            self._post(
-                f"/{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules",
-                body=maybe_transform(
-                    {
-                        "configuration": configuration,
-                        "mode": mode,
-                        "notes": notes,
-                    },
-                    access_rule_create_params.AccessRuleCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[AccessRuleCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AccessRuleCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._post(
+            f"/{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules",
+            body=maybe_transform(
+                {
+                    "configuration": configuration,
+                    "mode": mode,
+                    "notes": notes,
+                },
+                access_rule_create_params.AccessRuleCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AccessRuleCreateResponse]._unwrapper,
             ),
+            cast_to=cast(Type[AccessRuleCreateResponse], ResultWrapper[AccessRuleCreateResponse]),
         )
 
     def list(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        egs_pagination: access_rule_list_params.EgsPagination | NotGiven = NOT_GIVEN,
-        filters: access_rule_list_params.Filters | NotGiven = NOT_GIVEN,
-        order: Literal["configuration.target", "configuration.value", "mode"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        configuration: access_rule_list_params.Configuration | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        match: Literal["any", "all"] | Omit = omit,
+        mode: Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"] | Omit = omit,
+        notes: str | Omit = omit,
+        order: Literal["configuration.target", "configuration.value", "mode"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePaginationArray[object]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[AccessRuleListResponse]:
         """Fetches IP Access rules of an account or zone.
 
         These rules apply to all the
@@ -149,13 +155,22 @@ def list(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          direction: The direction used to sort returned rules.
+          direction: Defines the direction used to sort returned rules.
+
+          match: Defines the search requirements. When set to `all`, all the search requirements
+              must match. When set to `any`, only one of the search requirements has to match.
+
+          mode: The action to apply to a matched request.
+
+          notes: Defines the string to search for in the notes of existing IP Access rules.
+              Notes: For example, the string 'attack' would match IP Access rules with notes
+              'Attack 26/02' and 'Attack 27/02'. The search is case insensitive.
 
-          order: The field used to sort returned rules.
+          order: Defines the field used to sort returned rules.
 
-          page: Requested page within paginated list of results.
+          page: Defines the requested page within paginated list of results.
 
-          per_page: Maximum number of results requested.
+          per_page: Defines the maximum number of results requested.
 
           extra_headers: Send extra headers
 
@@ -179,7 +194,7 @@ def list(
             account_or_zone_id = zone_id
         return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules",
-            page=SyncV4PagePaginationArray[object],
+            page=SyncV4PagePaginationArray[AccessRuleListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -187,9 +202,11 @@ def list(
                 timeout=timeout,
                 query=maybe_transform(
                     {
+                        "configuration": configuration,
                         "direction": direction,
-                        "egs_pagination": egs_pagination,
-                        "filters": filters,
+                        "match": match,
+                        "mode": mode,
+                        "notes": notes,
                         "order": order,
                         "page": page,
                         "per_page": per_page,
@@ -197,21 +214,21 @@ def list(
                     access_rule_list_params.AccessRuleListParams,
                 ),
             ),
-            model=object,
+            model=AccessRuleListResponse,
         )
 
     def delete(
         self,
-        identifier: object,
+        rule_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AccessRuleDeleteResponse]:
         """
         Deletes an existing IP Access rule defined.
@@ -219,6 +236,8 @@ def delete(
         Note: This operation will affect all zones in the account or zone.
 
         Args:
+          rule_id: Unique identifier for a rule.
+
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
@@ -231,6 +250,8 @@ def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
 
@@ -244,7 +265,7 @@ def delete(
             account_or_zone = "zones"
             account_or_zone_id = zone_id
         return self._delete(
-            f"/{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{identifier}",
+            f"/{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{rule_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -257,19 +278,19 @@ def delete(
 
     def edit(
         self,
-        identifier: object,
+        rule_id: str,
         *,
         configuration: access_rule_edit_params.Configuration,
         mode: Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"],
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        notes: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        notes: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AccessRuleEditResponse:
         """
         Updates an IP Access rule defined.
@@ -277,6 +298,8 @@ def edit(
         Note: This operation will affect all zones in the account or zone.
 
         Args:
+          rule_id: Unique identifier for a rule.
+
           configuration: The rule configuration.
 
           mode: The action to apply to a matched request.
@@ -295,6 +318,8 @@ def edit(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
 
@@ -307,48 +332,45 @@ def edit(
 
             account_or_zone = "zones"
             account_or_zone_id = zone_id
-        return cast(
-            AccessRuleEditResponse,
-            self._patch(
-                f"/{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{identifier}",
-                body=maybe_transform(
-                    {
-                        "configuration": configuration,
-                        "mode": mode,
-                        "notes": notes,
-                    },
-                    access_rule_edit_params.AccessRuleEditParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[AccessRuleEditResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AccessRuleEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._patch(
+            f"/{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{rule_id}",
+            body=maybe_transform(
+                {
+                    "configuration": configuration,
+                    "mode": mode,
+                    "notes": notes,
+                },
+                access_rule_edit_params.AccessRuleEditParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AccessRuleEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AccessRuleEditResponse], ResultWrapper[AccessRuleEditResponse]),
         )
 
     def get(
         self,
-        identifier: object,
+        rule_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AccessRuleGetResponse:
         """
         Fetches the details of an IP Access rule defined.
 
         Args:
+          rule_id: Unique identifier for a rule.
+
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
@@ -361,6 +383,8 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
 
@@ -373,31 +397,37 @@ def get(
 
             account_or_zone = "zones"
             account_or_zone_id = zone_id
-        return cast(
-            AccessRuleGetResponse,
-            self._get(
-                f"/{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{identifier}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[AccessRuleGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AccessRuleGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._get(
+            f"/{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{rule_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AccessRuleGetResponse]._unwrapper,
             ),
+            cast_to=cast(Type[AccessRuleGetResponse], ResultWrapper[AccessRuleGetResponse]),
         )
 
 
 class AsyncAccessRulesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncAccessRulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAccessRulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAccessRulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAccessRulesResourceWithStreamingResponse(self)
 
     async def create(
@@ -405,15 +435,15 @@ async def create(
         *,
         configuration: access_rule_create_params.Configuration,
         mode: Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"],
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        notes: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        notes: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AccessRuleCreateResponse:
         """Creates a new IP Access rule for an account or zone.
 
@@ -454,49 +484,46 @@ async def create(
 
             account_or_zone = "zones"
             account_or_zone_id = zone_id
-        return cast(
-            AccessRuleCreateResponse,
-            await self._post(
-                f"/{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules",
-                body=await async_maybe_transform(
-                    {
-                        "configuration": configuration,
-                        "mode": mode,
-                        "notes": notes,
-                    },
-                    access_rule_create_params.AccessRuleCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[AccessRuleCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AccessRuleCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._post(
+            f"/{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules",
+            body=await async_maybe_transform(
+                {
+                    "configuration": configuration,
+                    "mode": mode,
+                    "notes": notes,
+                },
+                access_rule_create_params.AccessRuleCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AccessRuleCreateResponse]._unwrapper,
             ),
+            cast_to=cast(Type[AccessRuleCreateResponse], ResultWrapper[AccessRuleCreateResponse]),
         )
 
     def list(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        egs_pagination: access_rule_list_params.EgsPagination | NotGiven = NOT_GIVEN,
-        filters: access_rule_list_params.Filters | NotGiven = NOT_GIVEN,
-        order: Literal["configuration.target", "configuration.value", "mode"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        configuration: access_rule_list_params.Configuration | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        match: Literal["any", "all"] | Omit = omit,
+        mode: Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"] | Omit = omit,
+        notes: str | Omit = omit,
+        order: Literal["configuration.target", "configuration.value", "mode"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[object, AsyncV4PagePaginationArray[object]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[AccessRuleListResponse, AsyncV4PagePaginationArray[AccessRuleListResponse]]:
         """Fetches IP Access rules of an account or zone.
 
         These rules apply to all the
@@ -508,13 +535,22 @@ def list(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          direction: The direction used to sort returned rules.
+          direction: Defines the direction used to sort returned rules.
+
+          match: Defines the search requirements. When set to `all`, all the search requirements
+              must match. When set to `any`, only one of the search requirements has to match.
+
+          mode: The action to apply to a matched request.
+
+          notes: Defines the string to search for in the notes of existing IP Access rules.
+              Notes: For example, the string 'attack' would match IP Access rules with notes
+              'Attack 26/02' and 'Attack 27/02'. The search is case insensitive.
 
-          order: The field used to sort returned rules.
+          order: Defines the field used to sort returned rules.
 
-          page: Requested page within paginated list of results.
+          page: Defines the requested page within paginated list of results.
 
-          per_page: Maximum number of results requested.
+          per_page: Defines the maximum number of results requested.
 
           extra_headers: Send extra headers
 
@@ -538,7 +574,7 @@ def list(
             account_or_zone_id = zone_id
         return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules",
-            page=AsyncV4PagePaginationArray[object],
+            page=AsyncV4PagePaginationArray[AccessRuleListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -546,9 +582,11 @@ def list(
                 timeout=timeout,
                 query=maybe_transform(
                     {
+                        "configuration": configuration,
                         "direction": direction,
-                        "egs_pagination": egs_pagination,
-                        "filters": filters,
+                        "match": match,
+                        "mode": mode,
+                        "notes": notes,
                         "order": order,
                         "page": page,
                         "per_page": per_page,
@@ -556,21 +594,21 @@ def list(
                     access_rule_list_params.AccessRuleListParams,
                 ),
             ),
-            model=object,
+            model=AccessRuleListResponse,
         )
 
     async def delete(
         self,
-        identifier: object,
+        rule_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AccessRuleDeleteResponse]:
         """
         Deletes an existing IP Access rule defined.
@@ -578,6 +616,8 @@ async def delete(
         Note: This operation will affect all zones in the account or zone.
 
         Args:
+          rule_id: Unique identifier for a rule.
+
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
@@ -590,6 +630,8 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
 
@@ -603,7 +645,7 @@ async def delete(
             account_or_zone = "zones"
             account_or_zone_id = zone_id
         return await self._delete(
-            f"/{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{identifier}",
+            f"/{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{rule_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -616,19 +658,19 @@ async def delete(
 
     async def edit(
         self,
-        identifier: object,
+        rule_id: str,
         *,
         configuration: access_rule_edit_params.Configuration,
         mode: Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"],
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        notes: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        notes: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AccessRuleEditResponse:
         """
         Updates an IP Access rule defined.
@@ -636,6 +678,8 @@ async def edit(
         Note: This operation will affect all zones in the account or zone.
 
         Args:
+          rule_id: Unique identifier for a rule.
+
           configuration: The rule configuration.
 
           mode: The action to apply to a matched request.
@@ -654,6 +698,8 @@ async def edit(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
 
@@ -666,48 +712,45 @@ async def edit(
 
             account_or_zone = "zones"
             account_or_zone_id = zone_id
-        return cast(
-            AccessRuleEditResponse,
-            await self._patch(
-                f"/{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{identifier}",
-                body=await async_maybe_transform(
-                    {
-                        "configuration": configuration,
-                        "mode": mode,
-                        "notes": notes,
-                    },
-                    access_rule_edit_params.AccessRuleEditParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[AccessRuleEditResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AccessRuleEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._patch(
+            f"/{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{rule_id}",
+            body=await async_maybe_transform(
+                {
+                    "configuration": configuration,
+                    "mode": mode,
+                    "notes": notes,
+                },
+                access_rule_edit_params.AccessRuleEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AccessRuleEditResponse]._unwrapper,
             ),
+            cast_to=cast(Type[AccessRuleEditResponse], ResultWrapper[AccessRuleEditResponse]),
         )
 
     async def get(
         self,
-        identifier: object,
+        rule_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AccessRuleGetResponse:
         """
         Fetches the details of an IP Access rule defined.
 
         Args:
+          rule_id: Unique identifier for a rule.
+
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
@@ -720,6 +763,8 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
 
@@ -732,21 +777,16 @@ async def get(
 
             account_or_zone = "zones"
             account_or_zone_id = zone_id
-        return cast(
-            AccessRuleGetResponse,
-            await self._get(
-                f"/{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{identifier}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[AccessRuleGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AccessRuleGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._get(
+            f"/{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{rule_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AccessRuleGetResponse]._unwrapper,
             ),
+            cast_to=cast(Type[AccessRuleGetResponse], ResultWrapper[AccessRuleGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/firewall/firewall.py b/src/cloudflare/resources/firewall/firewall.py
index 77990b2476c..f221580e6d1 100644
--- a/src/cloudflare/resources/firewall/firewall.py
+++ b/src/cloudflare/resources/firewall/firewall.py
@@ -2,14 +2,6 @@
 
 from __future__ import annotations
 
-from .waf import (
-    WAFResource,
-    AsyncWAFResource,
-    WAFResourceWithRawResponse,
-    AsyncWAFResourceWithRawResponse,
-    WAFResourceWithStreamingResponse,
-    AsyncWAFResourceWithStreamingResponse,
-)
 from .rules import (
     RulesResource,
     AsyncRulesResource,
@@ -18,7 +10,14 @@
     RulesResourceWithStreamingResponse,
     AsyncRulesResourceWithStreamingResponse,
 )
-from .waf.waf import WAFResource, AsyncWAFResource
+from .waf.waf import (
+    WAFResource,
+    AsyncWAFResource,
+    WAFResourceWithRawResponse,
+    AsyncWAFResourceWithRawResponse,
+    WAFResourceWithStreamingResponse,
+    AsyncWAFResourceWithStreamingResponse,
+)
 from .ua_rules import (
     UARulesResource,
     AsyncUARulesResource,
@@ -72,10 +71,21 @@ def waf(self) -> WAFResource:
 
     @cached_property
     def with_raw_response(self) -> FirewallResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return FirewallResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> FirewallResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return FirewallResourceWithStreamingResponse(self)
 
 
@@ -102,10 +112,21 @@ def waf(self) -> AsyncWAFResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncFirewallResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncFirewallResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncFirewallResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncFirewallResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/firewall/lockdowns.py b/src/cloudflare/resources/firewall/lockdowns.py
index 52479f92639..5204a546420 100644
--- a/src/cloudflare/resources/firewall/lockdowns.py
+++ b/src/cloudflare/resources/firewall/lockdowns.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -25,6 +22,8 @@
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.firewall import lockdown_list_params, lockdown_create_params, lockdown_update_params
 from ...types.firewall.lockdown import Lockdown
+from ...types.firewall.waf.override_url import OverrideURL
+from ...types.firewall.configuration_param import ConfigurationParam
 from ...types.firewall.lockdown_delete_response import LockdownDeleteResponse
 
 __all__ = ["LockdownsResource", "AsyncLockdownsResource"]
@@ -33,29 +32,61 @@
 class LockdownsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> LockdownsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LockdownsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LockdownsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LockdownsResourceWithStreamingResponse(self)
 
     def create(
         self,
-        zone_identifier: str,
         *,
-        body: object,
+        zone_id: str,
+        configurations: ConfigurationParam,
+        urls: SequenceNotStr[OverrideURL],
+        description: str | Omit = omit,
+        paused: bool | Omit = omit,
+        priority: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Lockdown:
         """
         Creates a new Zone Lockdown rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
+
+          configurations: A list of IP addresses or CIDR ranges that will be allowed to access the URLs
+              specified in the Zone Lockdown rule. You can include any number of `ip` or
+              `ip_range` configurations.
+
+          urls: The URLs to include in the current WAF override. You can use wildcards. Each
+              entered URL will be escaped before use, which means you can only use simple
+              wildcard patterns.
+
+          description: An informative summary of the rule. This value is sanitized and any tags will be
+              removed.
+
+          paused: When true, indicates that the rule is currently paused.
+
+          priority: The priority of the rule to control the processing order. A lower number
+              indicates higher priority. If not provided, any rules with a configured priority
+              will be processed before rules without a priority.
 
           extra_headers: Send extra headers
 
@@ -65,11 +96,20 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._post(
-            f"/zones/{zone_identifier}/firewall/lockdowns",
-            body=maybe_transform(body, lockdown_create_params.LockdownCreateParams),
+            f"/zones/{zone_id}/firewall/lockdowns",
+            body=maybe_transform(
+                {
+                    "configurations": configurations,
+                    "urls": urls,
+                    "description": description,
+                    "paused": paused,
+                    "priority": priority,
+                },
+                lockdown_create_params.LockdownCreateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -82,24 +122,33 @@ def create(
 
     def update(
         self,
-        id: str,
+        lock_downs_id: str,
         *,
-        zone_identifier: str,
-        body: object,
+        zone_id: str,
+        configurations: ConfigurationParam,
+        urls: SequenceNotStr[OverrideURL],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Lockdown:
         """
         Updates an existing Zone Lockdown rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
+
+          lock_downs_id: The unique identifier of the Zone Lockdown rule.
 
-          id: The unique identifier of the Zone Lockdown rule.
+          configurations: A list of IP addresses or CIDR ranges that will be allowed to access the URLs
+              specified in the Zone Lockdown rule. You can include any number of `ip` or
+              `ip_range` configurations.
+
+          urls: The URLs to include in the current WAF override. You can use wildcards. Each
+              entered URL will be escaped before use, which means you can only use simple
+              wildcard patterns.
 
           extra_headers: Send extra headers
 
@@ -109,13 +158,19 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not lock_downs_id:
+            raise ValueError(f"Expected a non-empty value for `lock_downs_id` but received {lock_downs_id!r}")
         return self._put(
-            f"/zones/{zone_identifier}/firewall/lockdowns/{id}",
-            body=maybe_transform(body, lockdown_update_params.LockdownUpdateParams),
+            f"/zones/{zone_id}/firewall/lockdowns/{lock_downs_id}",
+            body=maybe_transform(
+                {
+                    "configurations": configurations,
+                    "urls": urls,
+                },
+                lockdown_update_params.LockdownUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -128,25 +183,25 @@ def update(
 
     def list(
         self,
-        zone_identifier: str,
         *,
-        created_on: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        description_search: str | NotGiven = NOT_GIVEN,
-        ip: str | NotGiven = NOT_GIVEN,
-        ip_range_search: str | NotGiven = NOT_GIVEN,
-        ip_search: str | NotGiven = NOT_GIVEN,
-        modified_on: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        priority: float | NotGiven = NOT_GIVEN,
-        uri_search: str | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        created_on: Union[str, datetime] | Omit = omit,
+        description: str | Omit = omit,
+        description_search: str | Omit = omit,
+        ip: str | Omit = omit,
+        ip_range_search: str | Omit = omit,
+        ip_search: str | Omit = omit,
+        modified_on: Union[str, datetime] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        priority: float | Omit = omit,
+        uri_search: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[Lockdown]:
         """Fetches Zone Lockdown rules.
 
@@ -154,7 +209,7 @@ def list(
         parameters.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
           created_on: The timestamp of when the rule was created.
 
@@ -189,10 +244,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/firewall/lockdowns",
+            f"/zones/{zone_id}/firewall/lockdowns",
             page=SyncV4PagePaginationArray[Lockdown],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -221,23 +276,23 @@ def list(
 
     def delete(
         self,
-        id: str,
+        lock_downs_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LockdownDeleteResponse]:
         """
         Deletes an existing Zone Lockdown rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the Zone Lockdown rule.
+          lock_downs_id: The unique identifier of the Zone Lockdown rule.
 
           extra_headers: Send extra headers
 
@@ -247,12 +302,12 @@ def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not lock_downs_id:
+            raise ValueError(f"Expected a non-empty value for `lock_downs_id` but received {lock_downs_id!r}")
         return self._delete(
-            f"/zones/{zone_identifier}/firewall/lockdowns/{id}",
+            f"/zones/{zone_id}/firewall/lockdowns/{lock_downs_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -265,23 +320,23 @@ def delete(
 
     def get(
         self,
-        id: str,
+        lock_downs_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Lockdown:
         """
         Fetches the details of a Zone Lockdown rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the Zone Lockdown rule.
+          lock_downs_id: The unique identifier of the Zone Lockdown rule.
 
           extra_headers: Send extra headers
 
@@ -291,12 +346,12 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not lock_downs_id:
+            raise ValueError(f"Expected a non-empty value for `lock_downs_id` but received {lock_downs_id!r}")
         return self._get(
-            f"/zones/{zone_identifier}/firewall/lockdowns/{id}",
+            f"/zones/{zone_id}/firewall/lockdowns/{lock_downs_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -311,29 +366,61 @@ def get(
 class AsyncLockdownsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncLockdownsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLockdownsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLockdownsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLockdownsResourceWithStreamingResponse(self)
 
     async def create(
         self,
-        zone_identifier: str,
         *,
-        body: object,
+        zone_id: str,
+        configurations: ConfigurationParam,
+        urls: SequenceNotStr[OverrideURL],
+        description: str | Omit = omit,
+        paused: bool | Omit = omit,
+        priority: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Lockdown:
         """
         Creates a new Zone Lockdown rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
+
+          configurations: A list of IP addresses or CIDR ranges that will be allowed to access the URLs
+              specified in the Zone Lockdown rule. You can include any number of `ip` or
+              `ip_range` configurations.
+
+          urls: The URLs to include in the current WAF override. You can use wildcards. Each
+              entered URL will be escaped before use, which means you can only use simple
+              wildcard patterns.
+
+          description: An informative summary of the rule. This value is sanitized and any tags will be
+              removed.
+
+          paused: When true, indicates that the rule is currently paused.
+
+          priority: The priority of the rule to control the processing order. A lower number
+              indicates higher priority. If not provided, any rules with a configured priority
+              will be processed before rules without a priority.
 
           extra_headers: Send extra headers
 
@@ -343,11 +430,20 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return await self._post(
-            f"/zones/{zone_identifier}/firewall/lockdowns",
-            body=await async_maybe_transform(body, lockdown_create_params.LockdownCreateParams),
+            f"/zones/{zone_id}/firewall/lockdowns",
+            body=await async_maybe_transform(
+                {
+                    "configurations": configurations,
+                    "urls": urls,
+                    "description": description,
+                    "paused": paused,
+                    "priority": priority,
+                },
+                lockdown_create_params.LockdownCreateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -360,24 +456,33 @@ async def create(
 
     async def update(
         self,
-        id: str,
+        lock_downs_id: str,
         *,
-        zone_identifier: str,
-        body: object,
+        zone_id: str,
+        configurations: ConfigurationParam,
+        urls: SequenceNotStr[OverrideURL],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Lockdown:
         """
         Updates an existing Zone Lockdown rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
+
+          lock_downs_id: The unique identifier of the Zone Lockdown rule.
 
-          id: The unique identifier of the Zone Lockdown rule.
+          configurations: A list of IP addresses or CIDR ranges that will be allowed to access the URLs
+              specified in the Zone Lockdown rule. You can include any number of `ip` or
+              `ip_range` configurations.
+
+          urls: The URLs to include in the current WAF override. You can use wildcards. Each
+              entered URL will be escaped before use, which means you can only use simple
+              wildcard patterns.
 
           extra_headers: Send extra headers
 
@@ -387,13 +492,19 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not lock_downs_id:
+            raise ValueError(f"Expected a non-empty value for `lock_downs_id` but received {lock_downs_id!r}")
         return await self._put(
-            f"/zones/{zone_identifier}/firewall/lockdowns/{id}",
-            body=await async_maybe_transform(body, lockdown_update_params.LockdownUpdateParams),
+            f"/zones/{zone_id}/firewall/lockdowns/{lock_downs_id}",
+            body=await async_maybe_transform(
+                {
+                    "configurations": configurations,
+                    "urls": urls,
+                },
+                lockdown_update_params.LockdownUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -406,25 +517,25 @@ async def update(
 
     def list(
         self,
-        zone_identifier: str,
         *,
-        created_on: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        description_search: str | NotGiven = NOT_GIVEN,
-        ip: str | NotGiven = NOT_GIVEN,
-        ip_range_search: str | NotGiven = NOT_GIVEN,
-        ip_search: str | NotGiven = NOT_GIVEN,
-        modified_on: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        priority: float | NotGiven = NOT_GIVEN,
-        uri_search: str | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        created_on: Union[str, datetime] | Omit = omit,
+        description: str | Omit = omit,
+        description_search: str | Omit = omit,
+        ip: str | Omit = omit,
+        ip_range_search: str | Omit = omit,
+        ip_search: str | Omit = omit,
+        modified_on: Union[str, datetime] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        priority: float | Omit = omit,
+        uri_search: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Lockdown, AsyncV4PagePaginationArray[Lockdown]]:
         """Fetches Zone Lockdown rules.
 
@@ -432,7 +543,7 @@ def list(
         parameters.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
           created_on: The timestamp of when the rule was created.
 
@@ -467,10 +578,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/firewall/lockdowns",
+            f"/zones/{zone_id}/firewall/lockdowns",
             page=AsyncV4PagePaginationArray[Lockdown],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -499,23 +610,23 @@ def list(
 
     async def delete(
         self,
-        id: str,
+        lock_downs_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LockdownDeleteResponse]:
         """
         Deletes an existing Zone Lockdown rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the Zone Lockdown rule.
+          lock_downs_id: The unique identifier of the Zone Lockdown rule.
 
           extra_headers: Send extra headers
 
@@ -525,12 +636,12 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not lock_downs_id:
+            raise ValueError(f"Expected a non-empty value for `lock_downs_id` but received {lock_downs_id!r}")
         return await self._delete(
-            f"/zones/{zone_identifier}/firewall/lockdowns/{id}",
+            f"/zones/{zone_id}/firewall/lockdowns/{lock_downs_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -543,23 +654,23 @@ async def delete(
 
     async def get(
         self,
-        id: str,
+        lock_downs_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Lockdown:
         """
         Fetches the details of a Zone Lockdown rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the Zone Lockdown rule.
+          lock_downs_id: The unique identifier of the Zone Lockdown rule.
 
           extra_headers: Send extra headers
 
@@ -569,12 +680,12 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not lock_downs_id:
+            raise ValueError(f"Expected a non-empty value for `lock_downs_id` but received {lock_downs_id!r}")
         return await self._get(
-            f"/zones/{zone_identifier}/firewall/lockdowns/{id}",
+            f"/zones/{zone_id}/firewall/lockdowns/{lock_downs_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
diff --git a/src/cloudflare/resources/firewall/rules.py b/src/cloudflare/resources/firewall/rules.py
index 7eb3973dc9f..cfa893c5cc1 100644
--- a/src/cloudflare/resources/firewall/rules.py
+++ b/src/cloudflare/resources/firewall/rules.py
@@ -3,15 +3,12 @@
 from __future__ import annotations
 
 import typing_extensions
-from typing import Type, Optional, cast
+from typing import Type, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -21,18 +18,17 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.firewall import (
-    rule_get_params,
-    rule_edit_params,
     rule_list_params,
     rule_create_params,
     rule_update_params,
+    rule_bulk_edit_params,
+    rule_bulk_update_params,
 )
 from ...types.firewall.firewall_rule import FirewallRule
-from ...types.firewall.rule_edit_response import RuleEditResponse
-from ...types.firewall.rule_create_response import RuleCreateResponse
+from ...types.filters.firewall_filter_param import FirewallFilterParam
 
 __all__ = ["RulesResource", "AsyncRulesResource"]
 
@@ -40,10 +36,21 @@
 class RulesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RulesResourceWithStreamingResponse(self)
 
     @typing_extensions.deprecated(
@@ -51,21 +58,25 @@ def with_streaming_response(self) -> RulesResourceWithStreamingResponse:
     )
     def create(
         self,
-        zone_identifier: str,
         *,
-        body: object,
+        zone_id: str,
+        action: rule_create_params.Action,
+        filter: FirewallFilterParam,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RuleCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[FirewallRule]:
         """
         Create one or more firewall rules.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
+
+          action: The action to perform when the threshold of matched traffic within the
+              configured period is exceeded.
 
           extra_headers: Send extra headers
 
@@ -75,19 +86,23 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        return self._post(
-            f"/zones/{zone_identifier}/firewall/rules",
-            body=maybe_transform(body, rule_create_params.RuleCreateParams),
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/firewall/rules",
+            page=SyncSinglePage[FirewallRule],
+            body=maybe_transform(
+                {
+                    "action": action,
+                    "filter": filter,
+                },
+                rule_create_params.RuleCreateParams,
+            ),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RuleCreateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RuleCreateResponse]], ResultWrapper[RuleCreateResponse]),
+            model=FirewallRule,
+            method="post",
         )
 
     @typing_extensions.deprecated(
@@ -95,24 +110,28 @@ def create(
     )
     def update(
         self,
-        id: str,
+        rule_id: str,
         *,
-        zone_identifier: str,
-        body: object,
+        zone_id: str,
+        action: rule_update_params.Action,
+        filter: FirewallFilterParam,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> FirewallRule:
         """
         Updates an existing firewall rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the firewall rule.
+          rule_id: The unique identifier of the firewall rule.
+
+          action: The action to perform when the threshold of matched traffic within the
+              configured period is exceeded.
 
           extra_headers: Send extra headers
 
@@ -122,13 +141,19 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
         return self._put(
-            f"/zones/{zone_identifier}/firewall/rules/{id}",
-            body=maybe_transform(body, rule_update_params.RuleUpdateParams),
+            f"/zones/{zone_id}/firewall/rules/{rule_id}",
+            body=maybe_transform(
+                {
+                    "action": action,
+                    "filter": filter,
+                },
+                rule_update_params.RuleUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -144,20 +169,20 @@ def update(
     )
     def list(
         self,
-        zone_identifier: str,
         *,
-        id: str | NotGiven = NOT_GIVEN,
-        action: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        paused: bool | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        id: str | Omit = omit,
+        action: str | Omit = omit,
+        description: str | Omit = omit,
+        page: float | Omit = omit,
+        paused: bool | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[FirewallRule]:
         """Fetches firewall rules in a zone.
 
@@ -165,7 +190,7 @@ def list(
         optional parameters.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
           id: The unique identifier of the firewall rule.
 
@@ -187,10 +212,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/firewall/rules",
+            f"/zones/{zone_id}/firewall/rules",
             page=SyncV4PagePaginationArray[FirewallRule],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -217,23 +242,23 @@ def list(
     )
     def delete(
         self,
-        id: str,
+        rule_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> FirewallRule:
         """
         Deletes an existing firewall rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the firewall rule.
+          rule_id: The unique identifier of the firewall rule.
 
           extra_headers: Send extra headers
 
@@ -243,12 +268,12 @@ def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
         return self._delete(
-            f"/zones/{zone_identifier}/firewall/rules/{id}",
+            f"/zones/{zone_id}/firewall/rules/{rule_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -262,26 +287,149 @@ def delete(
     @typing_extensions.deprecated(
         "The Firewall Rules API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details."
     )
-    def edit(
+    def bulk_delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[FirewallRule]:
+        """
+        Deletes existing firewall rules.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/firewall/rules",
+            page=SyncSinglePage[FirewallRule],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=FirewallRule,
+            method="delete",
+        )
+
+    @typing_extensions.deprecated(
+        "The Firewall Rules API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details."
+    )
+    def bulk_edit(
+        self,
+        *,
+        zone_id: str,
+        body: object,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[FirewallRule]:
+        """
+        Updates the priority of existing firewall rules.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/firewall/rules",
+            page=SyncSinglePage[FirewallRule],
+            body=maybe_transform(body, rule_bulk_edit_params.RuleBulkEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=FirewallRule,
+            method="patch",
+        )
+
+    @typing_extensions.deprecated(
+        "The Firewall Rules API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details."
+    )
+    def bulk_update(
         self,
-        id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         body: object,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RuleEditResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[FirewallRule]:
+        """
+        Updates one or more existing firewall rules.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/firewall/rules",
+            page=SyncSinglePage[FirewallRule],
+            body=maybe_transform(body, rule_bulk_update_params.RuleBulkUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=FirewallRule,
+            method="put",
+        )
+
+    @typing_extensions.deprecated(
+        "The Firewall Rules API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details."
+    )
+    def edit(
+        self,
+        rule_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[FirewallRule]:
         """
         Updates the priority of an existing firewall rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the firewall rule.
+          rule_id: The unique identifier of the firewall rule.
 
           extra_headers: Send extra headers
 
@@ -291,21 +439,18 @@ def edit(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
-        return self._patch(
-            f"/zones/{zone_identifier}/firewall/rules/{id}",
-            body=maybe_transform(body, rule_edit_params.RuleEditParams),
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/firewall/rules/{rule_id}",
+            page=SyncSinglePage[FirewallRule],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RuleEditResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RuleEditResponse]], ResultWrapper[RuleEditResponse]),
+            model=FirewallRule,
+            method="patch",
         )
 
     @typing_extensions.deprecated(
@@ -313,26 +458,23 @@ def edit(
     )
     def get(
         self,
-        zone_identifier: str,
+        rule_id: str,
         *,
-        path_id: str,
-        query_id: str | NotGiven = NOT_GIVEN,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> FirewallRule:
         """
         Fetches the details of a firewall rule.
 
         Args:
-          path_id: The unique identifier of the firewall rule.
-
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          query_id: The unique identifier of the firewall rule.
+          rule_id: The unique identifier of the firewall rule.
 
           extra_headers: Send extra headers
 
@@ -342,18 +484,17 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not path_id:
-            raise ValueError(f"Expected a non-empty value for `path_id` but received {path_id!r}")
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
         return self._get(
-            f"/zones/{zone_identifier}/firewall/rules/{path_id}",
+            f"/zones/{zone_id}/firewall/rules/{rule_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=maybe_transform({"id": query_id}, rule_get_params.RuleGetParams),
                 post_parser=ResultWrapper[FirewallRule]._unwrapper,
             ),
             cast_to=cast(Type[FirewallRule], ResultWrapper[FirewallRule]),
@@ -363,32 +504,47 @@ def get(
 class AsyncRulesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRulesResourceWithStreamingResponse(self)
 
     @typing_extensions.deprecated(
         "The Firewall Rules API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details."
     )
-    async def create(
+    def create(
         self,
-        zone_identifier: str,
         *,
-        body: object,
+        zone_id: str,
+        action: rule_create_params.Action,
+        filter: FirewallFilterParam,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RuleCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[FirewallRule, AsyncSinglePage[FirewallRule]]:
         """
         Create one or more firewall rules.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
+
+          action: The action to perform when the threshold of matched traffic within the
+              configured period is exceeded.
 
           extra_headers: Send extra headers
 
@@ -398,19 +554,23 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        return await self._post(
-            f"/zones/{zone_identifier}/firewall/rules",
-            body=await async_maybe_transform(body, rule_create_params.RuleCreateParams),
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/firewall/rules",
+            page=AsyncSinglePage[FirewallRule],
+            body=maybe_transform(
+                {
+                    "action": action,
+                    "filter": filter,
+                },
+                rule_create_params.RuleCreateParams,
+            ),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RuleCreateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RuleCreateResponse]], ResultWrapper[RuleCreateResponse]),
+            model=FirewallRule,
+            method="post",
         )
 
     @typing_extensions.deprecated(
@@ -418,24 +578,28 @@ async def create(
     )
     async def update(
         self,
-        id: str,
+        rule_id: str,
         *,
-        zone_identifier: str,
-        body: object,
+        zone_id: str,
+        action: rule_update_params.Action,
+        filter: FirewallFilterParam,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> FirewallRule:
         """
         Updates an existing firewall rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the firewall rule.
+          rule_id: The unique identifier of the firewall rule.
+
+          action: The action to perform when the threshold of matched traffic within the
+              configured period is exceeded.
 
           extra_headers: Send extra headers
 
@@ -445,13 +609,19 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
         return await self._put(
-            f"/zones/{zone_identifier}/firewall/rules/{id}",
-            body=await async_maybe_transform(body, rule_update_params.RuleUpdateParams),
+            f"/zones/{zone_id}/firewall/rules/{rule_id}",
+            body=await async_maybe_transform(
+                {
+                    "action": action,
+                    "filter": filter,
+                },
+                rule_update_params.RuleUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -467,20 +637,20 @@ async def update(
     )
     def list(
         self,
-        zone_identifier: str,
         *,
-        id: str | NotGiven = NOT_GIVEN,
-        action: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        paused: bool | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        id: str | Omit = omit,
+        action: str | Omit = omit,
+        description: str | Omit = omit,
+        page: float | Omit = omit,
+        paused: bool | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[FirewallRule, AsyncV4PagePaginationArray[FirewallRule]]:
         """Fetches firewall rules in a zone.
 
@@ -488,7 +658,7 @@ def list(
         optional parameters.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
           id: The unique identifier of the firewall rule.
 
@@ -510,10 +680,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/firewall/rules",
+            f"/zones/{zone_id}/firewall/rules",
             page=AsyncV4PagePaginationArray[FirewallRule],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -540,23 +710,23 @@ def list(
     )
     async def delete(
         self,
-        id: str,
+        rule_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> FirewallRule:
         """
         Deletes an existing firewall rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the firewall rule.
+          rule_id: The unique identifier of the firewall rule.
 
           extra_headers: Send extra headers
 
@@ -566,12 +736,12 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
         return await self._delete(
-            f"/zones/{zone_identifier}/firewall/rules/{id}",
+            f"/zones/{zone_id}/firewall/rules/{rule_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -585,26 +755,149 @@ async def delete(
     @typing_extensions.deprecated(
         "The Firewall Rules API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details."
     )
-    async def edit(
+    def bulk_delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[FirewallRule, AsyncSinglePage[FirewallRule]]:
+        """
+        Deletes existing firewall rules.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/firewall/rules",
+            page=AsyncSinglePage[FirewallRule],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=FirewallRule,
+            method="delete",
+        )
+
+    @typing_extensions.deprecated(
+        "The Firewall Rules API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details."
+    )
+    def bulk_edit(
         self,
-        id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         body: object,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RuleEditResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[FirewallRule, AsyncSinglePage[FirewallRule]]:
+        """
+        Updates the priority of existing firewall rules.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/firewall/rules",
+            page=AsyncSinglePage[FirewallRule],
+            body=maybe_transform(body, rule_bulk_edit_params.RuleBulkEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=FirewallRule,
+            method="patch",
+        )
+
+    @typing_extensions.deprecated(
+        "The Firewall Rules API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details."
+    )
+    def bulk_update(
+        self,
+        *,
+        zone_id: str,
+        body: object,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[FirewallRule, AsyncSinglePage[FirewallRule]]:
+        """
+        Updates one or more existing firewall rules.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/firewall/rules",
+            page=AsyncSinglePage[FirewallRule],
+            body=maybe_transform(body, rule_bulk_update_params.RuleBulkUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=FirewallRule,
+            method="put",
+        )
+
+    @typing_extensions.deprecated(
+        "The Firewall Rules API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details."
+    )
+    def edit(
+        self,
+        rule_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[FirewallRule, AsyncSinglePage[FirewallRule]]:
         """
         Updates the priority of an existing firewall rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the firewall rule.
+          rule_id: The unique identifier of the firewall rule.
 
           extra_headers: Send extra headers
 
@@ -614,21 +907,18 @@ async def edit(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
-        return await self._patch(
-            f"/zones/{zone_identifier}/firewall/rules/{id}",
-            body=await async_maybe_transform(body, rule_edit_params.RuleEditParams),
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/firewall/rules/{rule_id}",
+            page=AsyncSinglePage[FirewallRule],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RuleEditResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RuleEditResponse]], ResultWrapper[RuleEditResponse]),
+            model=FirewallRule,
+            method="patch",
         )
 
     @typing_extensions.deprecated(
@@ -636,26 +926,23 @@ async def edit(
     )
     async def get(
         self,
-        zone_identifier: str,
+        rule_id: str,
         *,
-        path_id: str,
-        query_id: str | NotGiven = NOT_GIVEN,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> FirewallRule:
         """
         Fetches the details of a firewall rule.
 
         Args:
-          path_id: The unique identifier of the firewall rule.
+          zone_id: Defines an identifier.
 
-          zone_identifier: Identifier
-
-          query_id: The unique identifier of the firewall rule.
+          rule_id: The unique identifier of the firewall rule.
 
           extra_headers: Send extra headers
 
@@ -665,18 +952,17 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not path_id:
-            raise ValueError(f"Expected a non-empty value for `path_id` but received {path_id!r}")
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
         return await self._get(
-            f"/zones/{zone_identifier}/firewall/rules/{path_id}",
+            f"/zones/{zone_id}/firewall/rules/{rule_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=await async_maybe_transform({"id": query_id}, rule_get_params.RuleGetParams),
                 post_parser=ResultWrapper[FirewallRule]._unwrapper,
             ),
             cast_to=cast(Type[FirewallRule], ResultWrapper[FirewallRule]),
@@ -689,32 +975,47 @@ def __init__(self, rules: RulesResource) -> None:
 
         self.create = (  # pyright: ignore[reportDeprecated]
             to_raw_response_wrapper(
-                rules.create  # pyright: ignore[reportDeprecated],
+                rules.create,  # pyright: ignore[reportDeprecated],
             )
         )
         self.update = (  # pyright: ignore[reportDeprecated]
             to_raw_response_wrapper(
-                rules.update  # pyright: ignore[reportDeprecated],
+                rules.update,  # pyright: ignore[reportDeprecated],
             )
         )
         self.list = (  # pyright: ignore[reportDeprecated]
             to_raw_response_wrapper(
-                rules.list  # pyright: ignore[reportDeprecated],
+                rules.list,  # pyright: ignore[reportDeprecated],
             )
         )
         self.delete = (  # pyright: ignore[reportDeprecated]
             to_raw_response_wrapper(
-                rules.delete  # pyright: ignore[reportDeprecated],
+                rules.delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_delete = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                rules.bulk_delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_edit = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                rules.bulk_edit,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_update = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                rules.bulk_update,  # pyright: ignore[reportDeprecated],
             )
         )
         self.edit = (  # pyright: ignore[reportDeprecated]
             to_raw_response_wrapper(
-                rules.edit  # pyright: ignore[reportDeprecated],
+                rules.edit,  # pyright: ignore[reportDeprecated],
             )
         )
         self.get = (  # pyright: ignore[reportDeprecated]
             to_raw_response_wrapper(
-                rules.get  # pyright: ignore[reportDeprecated],
+                rules.get,  # pyright: ignore[reportDeprecated],
             )
         )
 
@@ -725,32 +1026,47 @@ def __init__(self, rules: AsyncRulesResource) -> None:
 
         self.create = (  # pyright: ignore[reportDeprecated]
             async_to_raw_response_wrapper(
-                rules.create  # pyright: ignore[reportDeprecated],
+                rules.create,  # pyright: ignore[reportDeprecated],
             )
         )
         self.update = (  # pyright: ignore[reportDeprecated]
             async_to_raw_response_wrapper(
-                rules.update  # pyright: ignore[reportDeprecated],
+                rules.update,  # pyright: ignore[reportDeprecated],
             )
         )
         self.list = (  # pyright: ignore[reportDeprecated]
             async_to_raw_response_wrapper(
-                rules.list  # pyright: ignore[reportDeprecated],
+                rules.list,  # pyright: ignore[reportDeprecated],
             )
         )
         self.delete = (  # pyright: ignore[reportDeprecated]
             async_to_raw_response_wrapper(
-                rules.delete  # pyright: ignore[reportDeprecated],
+                rules.delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_delete = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                rules.bulk_delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_edit = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                rules.bulk_edit,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_update = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                rules.bulk_update,  # pyright: ignore[reportDeprecated],
             )
         )
         self.edit = (  # pyright: ignore[reportDeprecated]
             async_to_raw_response_wrapper(
-                rules.edit  # pyright: ignore[reportDeprecated],
+                rules.edit,  # pyright: ignore[reportDeprecated],
             )
         )
         self.get = (  # pyright: ignore[reportDeprecated]
             async_to_raw_response_wrapper(
-                rules.get  # pyright: ignore[reportDeprecated],
+                rules.get,  # pyright: ignore[reportDeprecated],
             )
         )
 
@@ -761,32 +1077,47 @@ def __init__(self, rules: RulesResource) -> None:
 
         self.create = (  # pyright: ignore[reportDeprecated]
             to_streamed_response_wrapper(
-                rules.create  # pyright: ignore[reportDeprecated],
+                rules.create,  # pyright: ignore[reportDeprecated],
             )
         )
         self.update = (  # pyright: ignore[reportDeprecated]
             to_streamed_response_wrapper(
-                rules.update  # pyright: ignore[reportDeprecated],
+                rules.update,  # pyright: ignore[reportDeprecated],
             )
         )
         self.list = (  # pyright: ignore[reportDeprecated]
             to_streamed_response_wrapper(
-                rules.list  # pyright: ignore[reportDeprecated],
+                rules.list,  # pyright: ignore[reportDeprecated],
             )
         )
         self.delete = (  # pyright: ignore[reportDeprecated]
             to_streamed_response_wrapper(
-                rules.delete  # pyright: ignore[reportDeprecated],
+                rules.delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_delete = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                rules.bulk_delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_edit = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                rules.bulk_edit,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_update = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                rules.bulk_update,  # pyright: ignore[reportDeprecated],
             )
         )
         self.edit = (  # pyright: ignore[reportDeprecated]
             to_streamed_response_wrapper(
-                rules.edit  # pyright: ignore[reportDeprecated],
+                rules.edit,  # pyright: ignore[reportDeprecated],
             )
         )
         self.get = (  # pyright: ignore[reportDeprecated]
             to_streamed_response_wrapper(
-                rules.get  # pyright: ignore[reportDeprecated],
+                rules.get,  # pyright: ignore[reportDeprecated],
             )
         )
 
@@ -797,31 +1128,46 @@ def __init__(self, rules: AsyncRulesResource) -> None:
 
         self.create = (  # pyright: ignore[reportDeprecated]
             async_to_streamed_response_wrapper(
-                rules.create  # pyright: ignore[reportDeprecated],
+                rules.create,  # pyright: ignore[reportDeprecated],
             )
         )
         self.update = (  # pyright: ignore[reportDeprecated]
             async_to_streamed_response_wrapper(
-                rules.update  # pyright: ignore[reportDeprecated],
+                rules.update,  # pyright: ignore[reportDeprecated],
             )
         )
         self.list = (  # pyright: ignore[reportDeprecated]
             async_to_streamed_response_wrapper(
-                rules.list  # pyright: ignore[reportDeprecated],
+                rules.list,  # pyright: ignore[reportDeprecated],
             )
         )
         self.delete = (  # pyright: ignore[reportDeprecated]
             async_to_streamed_response_wrapper(
-                rules.delete  # pyright: ignore[reportDeprecated],
+                rules.delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_delete = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                rules.bulk_delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_edit = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                rules.bulk_edit,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_update = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                rules.bulk_update,  # pyright: ignore[reportDeprecated],
             )
         )
         self.edit = (  # pyright: ignore[reportDeprecated]
             async_to_streamed_response_wrapper(
-                rules.edit  # pyright: ignore[reportDeprecated],
+                rules.edit,  # pyright: ignore[reportDeprecated],
             )
         )
         self.get = (  # pyright: ignore[reportDeprecated]
             async_to_streamed_response_wrapper(
-                rules.get  # pyright: ignore[reportDeprecated],
+                rules.get,  # pyright: ignore[reportDeprecated],
             )
         )
diff --git a/src/cloudflare/resources/firewall/ua_rules.py b/src/cloudflare/resources/firewall/ua_rules.py
index 3aec71bcbda..d9e987a57c2 100644
--- a/src/cloudflare/resources/firewall/ua_rules.py
+++ b/src/cloudflare/resources/firewall/ua_rules.py
@@ -2,15 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, cast
+from typing import Type, cast
+from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -35,29 +33,50 @@
 class UARulesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> UARulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return UARulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> UARulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return UARulesResourceWithStreamingResponse(self)
 
     def create(
         self,
-        zone_identifier: str,
         *,
-        body: object,
+        zone_id: str,
+        configuration: ua_rule_create_params.Configuration,
+        mode: Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"],
+        description: str | Omit = omit,
+        paused: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> UARuleCreateResponse:
         """
         Creates a new User Agent Blocking rule in a zone.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
+
+          mode: The action to apply to a matched request.
+
+          description: An informative summary of the rule. This value is sanitized and any tags will be
+              removed.
+
+          paused: When true, indicates that the rule is currently paused.
 
           extra_headers: Send extra headers
 
@@ -67,46 +86,61 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        return cast(
-            UARuleCreateResponse,
-            self._post(
-                f"/zones/{zone_identifier}/firewall/ua_rules",
-                body=maybe_transform(body, ua_rule_create_params.UARuleCreateParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[UARuleCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[UARuleCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/firewall/ua_rules",
+            body=maybe_transform(
+                {
+                    "configuration": configuration,
+                    "mode": mode,
+                    "description": description,
+                    "paused": paused,
+                },
+                ua_rule_create_params.UARuleCreateParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[UARuleCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[UARuleCreateResponse], ResultWrapper[UARuleCreateResponse]),
         )
 
     def update(
         self,
-        id: str,
+        ua_rule_id: str,
         *,
-        zone_identifier: str,
-        body: object,
+        zone_id: str,
+        configuration: ua_rule_update_params.Configuration,
+        mode: Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"],
+        description: str | Omit = omit,
+        paused: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> UARuleUpdateResponse:
         """
         Updates an existing User Agent Blocking rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
+
+          ua_rule_id: The unique identifier of the User Agent Blocking rule.
 
-          id: The unique identifier of the User Agent Blocking rule.
+          configuration: The rule configuration.
+
+          mode: The action to apply to a matched request.
+
+          description: An informative summary of the rule. This value is sanitized and any tags will be
+              removed.
+
+          paused: When true, indicates that the rule is currently paused.
 
           extra_headers: Send extra headers
 
@@ -116,43 +150,46 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
-        return cast(
-            UARuleUpdateResponse,
-            self._put(
-                f"/zones/{zone_identifier}/firewall/ua_rules/{id}",
-                body=maybe_transform(body, ua_rule_update_params.UARuleUpdateParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[UARuleUpdateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[UARuleUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not ua_rule_id:
+            raise ValueError(f"Expected a non-empty value for `ua_rule_id` but received {ua_rule_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/firewall/ua_rules/{ua_rule_id}",
+            body=maybe_transform(
+                {
+                    "configuration": configuration,
+                    "mode": mode,
+                    "description": description,
+                    "paused": paused,
+                },
+                ua_rule_update_params.UARuleUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[UARuleUpdateResponse]._unwrapper,
             ),
+            cast_to=cast(Type[UARuleUpdateResponse], ResultWrapper[UARuleUpdateResponse]),
         )
 
     def list(
         self,
-        zone_identifier: str,
         *,
-        description: str | NotGiven = NOT_GIVEN,
-        description_search: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        ua_search: str | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        description: str | Omit = omit,
+        page: float | Omit = omit,
+        paused: bool | Omit = omit,
+        per_page: float | Omit = omit,
+        user_agent: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[UARuleListResponse]:
         """Fetches User Agent Blocking rules in a zone.
 
@@ -160,18 +197,18 @@ def list(
         several optional parameters.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
           description: A string to search for in the description of existing rules.
 
-          description_search: A string to search for in the description of existing rules.
-
           page: Page number of paginated results.
 
+          paused: When true, indicates that the rule is currently paused.
+
           per_page: The maximum number of results per page. You can only set the value to `1` or to
               a multiple of 5 such as `5`, `10`, `15`, or `20`.
 
-          ua_search: A string to search for in the user agent values of existing rules.
+          user_agent: A string to search for in the user agent values of existing rules.
 
           extra_headers: Send extra headers
 
@@ -181,10 +218,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/firewall/ua_rules",
+            f"/zones/{zone_id}/firewall/ua_rules",
             page=SyncV4PagePaginationArray[UARuleListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -194,10 +231,10 @@ def list(
                 query=maybe_transform(
                     {
                         "description": description,
-                        "description_search": description_search,
                         "page": page,
+                        "paused": paused,
                         "per_page": per_page,
-                        "ua_search": ua_search,
+                        "user_agent": user_agent,
                     },
                     ua_rule_list_params.UARuleListParams,
                 ),
@@ -207,23 +244,23 @@ def list(
 
     def delete(
         self,
-        id: str,
+        ua_rule_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> UARuleDeleteResponse:
         """
         Deletes an existing User Agent Blocking rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the User Agent Blocking rule.
+          ua_rule_id: The unique identifier of the User Agent Blocking rule.
 
           extra_headers: Send extra headers
 
@@ -233,12 +270,12 @@ def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not ua_rule_id:
+            raise ValueError(f"Expected a non-empty value for `ua_rule_id` but received {ua_rule_id!r}")
         return self._delete(
-            f"/zones/{zone_identifier}/firewall/ua_rules/{id}",
+            f"/zones/{zone_id}/firewall/ua_rules/{ua_rule_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -251,23 +288,23 @@ def delete(
 
     def get(
         self,
-        id: str,
+        ua_rule_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> UARuleGetResponse:
         """
         Fetches the details of a User Agent Blocking rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the User Agent Blocking rule.
+          ua_rule_id: The unique identifier of the User Agent Blocking rule.
 
           extra_headers: Send extra headers
 
@@ -277,54 +314,70 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
-        return cast(
-            UARuleGetResponse,
-            self._get(
-                f"/zones/{zone_identifier}/firewall/ua_rules/{id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[UARuleGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[UARuleGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not ua_rule_id:
+            raise ValueError(f"Expected a non-empty value for `ua_rule_id` but received {ua_rule_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/firewall/ua_rules/{ua_rule_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[UARuleGetResponse]._unwrapper,
             ),
+            cast_to=cast(Type[UARuleGetResponse], ResultWrapper[UARuleGetResponse]),
         )
 
 
 class AsyncUARulesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncUARulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncUARulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncUARulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncUARulesResourceWithStreamingResponse(self)
 
     async def create(
         self,
-        zone_identifier: str,
         *,
-        body: object,
+        zone_id: str,
+        configuration: ua_rule_create_params.Configuration,
+        mode: Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"],
+        description: str | Omit = omit,
+        paused: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> UARuleCreateResponse:
         """
         Creates a new User Agent Blocking rule in a zone.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
+
+          mode: The action to apply to a matched request.
+
+          description: An informative summary of the rule. This value is sanitized and any tags will be
+              removed.
+
+          paused: When true, indicates that the rule is currently paused.
 
           extra_headers: Send extra headers
 
@@ -334,46 +387,61 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        return cast(
-            UARuleCreateResponse,
-            await self._post(
-                f"/zones/{zone_identifier}/firewall/ua_rules",
-                body=await async_maybe_transform(body, ua_rule_create_params.UARuleCreateParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[UARuleCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[UARuleCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/firewall/ua_rules",
+            body=await async_maybe_transform(
+                {
+                    "configuration": configuration,
+                    "mode": mode,
+                    "description": description,
+                    "paused": paused,
+                },
+                ua_rule_create_params.UARuleCreateParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[UARuleCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[UARuleCreateResponse], ResultWrapper[UARuleCreateResponse]),
         )
 
     async def update(
         self,
-        id: str,
+        ua_rule_id: str,
         *,
-        zone_identifier: str,
-        body: object,
+        zone_id: str,
+        configuration: ua_rule_update_params.Configuration,
+        mode: Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"],
+        description: str | Omit = omit,
+        paused: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> UARuleUpdateResponse:
         """
         Updates an existing User Agent Blocking rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
+
+          ua_rule_id: The unique identifier of the User Agent Blocking rule.
+
+          configuration: The rule configuration.
 
-          id: The unique identifier of the User Agent Blocking rule.
+          mode: The action to apply to a matched request.
+
+          description: An informative summary of the rule. This value is sanitized and any tags will be
+              removed.
+
+          paused: When true, indicates that the rule is currently paused.
 
           extra_headers: Send extra headers
 
@@ -383,43 +451,46 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
-        return cast(
-            UARuleUpdateResponse,
-            await self._put(
-                f"/zones/{zone_identifier}/firewall/ua_rules/{id}",
-                body=await async_maybe_transform(body, ua_rule_update_params.UARuleUpdateParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[UARuleUpdateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[UARuleUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not ua_rule_id:
+            raise ValueError(f"Expected a non-empty value for `ua_rule_id` but received {ua_rule_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/firewall/ua_rules/{ua_rule_id}",
+            body=await async_maybe_transform(
+                {
+                    "configuration": configuration,
+                    "mode": mode,
+                    "description": description,
+                    "paused": paused,
+                },
+                ua_rule_update_params.UARuleUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[UARuleUpdateResponse]._unwrapper,
             ),
+            cast_to=cast(Type[UARuleUpdateResponse], ResultWrapper[UARuleUpdateResponse]),
         )
 
     def list(
         self,
-        zone_identifier: str,
         *,
-        description: str | NotGiven = NOT_GIVEN,
-        description_search: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        ua_search: str | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        description: str | Omit = omit,
+        page: float | Omit = omit,
+        paused: bool | Omit = omit,
+        per_page: float | Omit = omit,
+        user_agent: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[UARuleListResponse, AsyncV4PagePaginationArray[UARuleListResponse]]:
         """Fetches User Agent Blocking rules in a zone.
 
@@ -427,18 +498,18 @@ def list(
         several optional parameters.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
           description: A string to search for in the description of existing rules.
 
-          description_search: A string to search for in the description of existing rules.
-
           page: Page number of paginated results.
 
+          paused: When true, indicates that the rule is currently paused.
+
           per_page: The maximum number of results per page. You can only set the value to `1` or to
               a multiple of 5 such as `5`, `10`, `15`, or `20`.
 
-          ua_search: A string to search for in the user agent values of existing rules.
+          user_agent: A string to search for in the user agent values of existing rules.
 
           extra_headers: Send extra headers
 
@@ -448,10 +519,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/firewall/ua_rules",
+            f"/zones/{zone_id}/firewall/ua_rules",
             page=AsyncV4PagePaginationArray[UARuleListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -461,10 +532,10 @@ def list(
                 query=maybe_transform(
                     {
                         "description": description,
-                        "description_search": description_search,
                         "page": page,
+                        "paused": paused,
                         "per_page": per_page,
-                        "ua_search": ua_search,
+                        "user_agent": user_agent,
                     },
                     ua_rule_list_params.UARuleListParams,
                 ),
@@ -474,23 +545,23 @@ def list(
 
     async def delete(
         self,
-        id: str,
+        ua_rule_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> UARuleDeleteResponse:
         """
         Deletes an existing User Agent Blocking rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the User Agent Blocking rule.
+          ua_rule_id: The unique identifier of the User Agent Blocking rule.
 
           extra_headers: Send extra headers
 
@@ -500,12 +571,12 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not ua_rule_id:
+            raise ValueError(f"Expected a non-empty value for `ua_rule_id` but received {ua_rule_id!r}")
         return await self._delete(
-            f"/zones/{zone_identifier}/firewall/ua_rules/{id}",
+            f"/zones/{zone_id}/firewall/ua_rules/{ua_rule_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -518,23 +589,23 @@ async def delete(
 
     async def get(
         self,
-        id: str,
+        ua_rule_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> UARuleGetResponse:
         """
         Fetches the details of a User Agent Blocking rule.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the User Agent Blocking rule.
+          ua_rule_id: The unique identifier of the User Agent Blocking rule.
 
           extra_headers: Send extra headers
 
@@ -544,25 +615,20 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
-        return cast(
-            UARuleGetResponse,
-            await self._get(
-                f"/zones/{zone_identifier}/firewall/ua_rules/{id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[UARuleGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[UARuleGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not ua_rule_id:
+            raise ValueError(f"Expected a non-empty value for `ua_rule_id` but received {ua_rule_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/firewall/ua_rules/{ua_rule_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[UARuleGetResponse]._unwrapper,
             ),
+            cast_to=cast(Type[UARuleGetResponse], ResultWrapper[UARuleGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/firewall/waf/overrides.py b/src/cloudflare/resources/firewall/waf/overrides.py
index 0562584da76..b6a07f1ca89 100644
--- a/src/cloudflare/resources/firewall/waf/overrides.py
+++ b/src/cloudflare/resources/firewall/waf/overrides.py
@@ -2,15 +2,13 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import Type, Optional, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -22,8 +20,15 @@
 from ...._wrappers import ResultWrapper
 from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ...._base_client import AsyncPaginator, make_request_options
-from ....types.firewall.waf import override_list_params, override_create_params, override_update_params
+from ....types.firewall.waf import (
+    override_list_params,
+    override_create_params,
+    override_update_params,
+)
 from ....types.firewall.waf.override import Override
+from ....types.firewall.waf.override_url import OverrideURL
+from ....types.firewall.waf.waf_rule_param import WAFRuleParam
+from ....types.firewall.waf.rewrite_action_param import RewriteActionParam
 from ....types.firewall.waf.override_delete_response import OverrideDeleteResponse
 
 __all__ = ["OverridesResource", "AsyncOverridesResource"]
@@ -32,23 +37,35 @@
 class OverridesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> OverridesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return OverridesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> OverridesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return OverridesResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def create(
         self,
-        zone_identifier: str,
         *,
-        body: object,
+        zone_id: str,
+        urls: SequenceNotStr[OverrideURL],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Override:
         """
         Creates a URI-based WAF override for a zone.
@@ -57,7 +74,11 @@ def create(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
+
+          urls: The URLs to include in the current WAF override. You can use wildcards. Each
+              entered URL will be escaped before use, which means you can only use simple
+              wildcard patterns.
 
           extra_headers: Send extra headers
 
@@ -67,11 +88,11 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._post(
-            f"/zones/{zone_identifier}/firewall/waf/overrides",
-            body=maybe_transform(body, override_create_params.OverrideCreateParams),
+            f"/zones/{zone_id}/firewall/waf/overrides",
+            body=maybe_transform({"urls": urls}, override_create_params.OverrideCreateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -82,18 +103,22 @@ def create(
             cast_to=cast(Type[Override], ResultWrapper[Override]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     def update(
         self,
-        id: str,
+        overrides_id: str,
         *,
-        zone_identifier: str,
-        body: object,
+        zone_id: str,
+        id: str,
+        rewrite_action: RewriteActionParam,
+        rules: WAFRuleParam,
+        urls: SequenceNotStr[OverrideURL],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Override:
         """
         Updates an existing URI-based WAF override.
@@ -102,9 +127,24 @@ def update(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
+
+          overrides_id: The unique identifier of the WAF override.
+
+          id: Defines an identifier.
 
-          id: The unique identifier of the WAF override.
+          rewrite_action: Specifies that, when a WAF rule matches, its configured action will be replaced
+              by the action configured in this object.
+
+          rules: An object that allows you to override the action of specific WAF rules. Each key
+              of this object must be the ID of a WAF rule, and each value must be a valid WAF
+              action. Unless you are disabling a rule, ensure that you also enable the rule
+              group that this WAF rule belongs to. When creating a new URI-based WAF override,
+              you must provide a `groups` object or a `rules` object.
+
+          urls: The URLs to include in the current WAF override. You can use wildcards. Each
+              entered URL will be escaped before use, which means you can only use simple
+              wildcard patterns.
 
           extra_headers: Send extra headers
 
@@ -114,13 +154,21 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not overrides_id:
+            raise ValueError(f"Expected a non-empty value for `overrides_id` but received {overrides_id!r}")
         return self._put(
-            f"/zones/{zone_identifier}/firewall/waf/overrides/{id}",
-            body=maybe_transform(body, override_update_params.OverrideUpdateParams),
+            f"/zones/{zone_id}/firewall/waf/overrides/{overrides_id}",
+            body=maybe_transform(
+                {
+                    "id": id,
+                    "rewrite_action": rewrite_action,
+                    "rules": rules,
+                    "urls": urls,
+                },
+                override_update_params.OverrideUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -131,18 +179,19 @@ def update(
             cast_to=cast(Type[Override], ResultWrapper[Override]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
-        zone_identifier: str,
         *,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[Override]:
         """
         Fetches the URI-based WAF overrides in a zone.
@@ -151,7 +200,7 @@ def list(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
           page: The page number of paginated results.
 
@@ -165,10 +214,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/firewall/waf/overrides",
+            f"/zones/{zone_id}/firewall/waf/overrides",
             page=SyncV4PagePaginationArray[Override],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -186,17 +235,18 @@ def list(
             model=Override,
         )
 
+    @typing_extensions.deprecated("deprecated")
     def delete(
         self,
-        id: str,
+        overrides_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[OverrideDeleteResponse]:
         """
         Deletes an existing URI-based WAF override.
@@ -205,9 +255,9 @@ def delete(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the WAF override.
+          overrides_id: The unique identifier of the WAF override.
 
           extra_headers: Send extra headers
 
@@ -217,12 +267,12 @@ def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not overrides_id:
+            raise ValueError(f"Expected a non-empty value for `overrides_id` but received {overrides_id!r}")
         return self._delete(
-            f"/zones/{zone_identifier}/firewall/waf/overrides/{id}",
+            f"/zones/{zone_id}/firewall/waf/overrides/{overrides_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -233,17 +283,18 @@ def delete(
             cast_to=cast(Type[Optional[OverrideDeleteResponse]], ResultWrapper[OverrideDeleteResponse]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     def get(
         self,
-        id: str,
+        overrides_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Override:
         """
         Fetches the details of a URI-based WAF override.
@@ -252,9 +303,9 @@ def get(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the WAF override.
+          overrides_id: The unique identifier of the WAF override.
 
           extra_headers: Send extra headers
 
@@ -264,12 +315,12 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not overrides_id:
+            raise ValueError(f"Expected a non-empty value for `overrides_id` but received {overrides_id!r}")
         return self._get(
-            f"/zones/{zone_identifier}/firewall/waf/overrides/{id}",
+            f"/zones/{zone_id}/firewall/waf/overrides/{overrides_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -284,23 +335,35 @@ def get(
 class AsyncOverridesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncOverridesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncOverridesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncOverridesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncOverridesResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     async def create(
         self,
-        zone_identifier: str,
         *,
-        body: object,
+        zone_id: str,
+        urls: SequenceNotStr[OverrideURL],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Override:
         """
         Creates a URI-based WAF override for a zone.
@@ -309,7 +372,11 @@ async def create(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
+
+          urls: The URLs to include in the current WAF override. You can use wildcards. Each
+              entered URL will be escaped before use, which means you can only use simple
+              wildcard patterns.
 
           extra_headers: Send extra headers
 
@@ -319,11 +386,11 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return await self._post(
-            f"/zones/{zone_identifier}/firewall/waf/overrides",
-            body=await async_maybe_transform(body, override_create_params.OverrideCreateParams),
+            f"/zones/{zone_id}/firewall/waf/overrides",
+            body=await async_maybe_transform({"urls": urls}, override_create_params.OverrideCreateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -334,18 +401,22 @@ async def create(
             cast_to=cast(Type[Override], ResultWrapper[Override]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def update(
         self,
-        id: str,
+        overrides_id: str,
         *,
-        zone_identifier: str,
-        body: object,
+        zone_id: str,
+        id: str,
+        rewrite_action: RewriteActionParam,
+        rules: WAFRuleParam,
+        urls: SequenceNotStr[OverrideURL],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Override:
         """
         Updates an existing URI-based WAF override.
@@ -354,9 +425,24 @@ async def update(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
+
+          overrides_id: The unique identifier of the WAF override.
+
+          id: Defines an identifier.
+
+          rewrite_action: Specifies that, when a WAF rule matches, its configured action will be replaced
+              by the action configured in this object.
 
-          id: The unique identifier of the WAF override.
+          rules: An object that allows you to override the action of specific WAF rules. Each key
+              of this object must be the ID of a WAF rule, and each value must be a valid WAF
+              action. Unless you are disabling a rule, ensure that you also enable the rule
+              group that this WAF rule belongs to. When creating a new URI-based WAF override,
+              you must provide a `groups` object or a `rules` object.
+
+          urls: The URLs to include in the current WAF override. You can use wildcards. Each
+              entered URL will be escaped before use, which means you can only use simple
+              wildcard patterns.
 
           extra_headers: Send extra headers
 
@@ -366,13 +452,21 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not overrides_id:
+            raise ValueError(f"Expected a non-empty value for `overrides_id` but received {overrides_id!r}")
         return await self._put(
-            f"/zones/{zone_identifier}/firewall/waf/overrides/{id}",
-            body=await async_maybe_transform(body, override_update_params.OverrideUpdateParams),
+            f"/zones/{zone_id}/firewall/waf/overrides/{overrides_id}",
+            body=await async_maybe_transform(
+                {
+                    "id": id,
+                    "rewrite_action": rewrite_action,
+                    "rules": rules,
+                    "urls": urls,
+                },
+                override_update_params.OverrideUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -383,18 +477,19 @@ async def update(
             cast_to=cast(Type[Override], ResultWrapper[Override]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
-        zone_identifier: str,
         *,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Override, AsyncV4PagePaginationArray[Override]]:
         """
         Fetches the URI-based WAF overrides in a zone.
@@ -403,7 +498,7 @@ def list(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
           page: The page number of paginated results.
 
@@ -417,10 +512,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/firewall/waf/overrides",
+            f"/zones/{zone_id}/firewall/waf/overrides",
             page=AsyncV4PagePaginationArray[Override],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -438,17 +533,18 @@ def list(
             model=Override,
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def delete(
         self,
-        id: str,
+        overrides_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[OverrideDeleteResponse]:
         """
         Deletes an existing URI-based WAF override.
@@ -457,9 +553,9 @@ async def delete(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the WAF override.
+          overrides_id: The unique identifier of the WAF override.
 
           extra_headers: Send extra headers
 
@@ -469,12 +565,12 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not overrides_id:
+            raise ValueError(f"Expected a non-empty value for `overrides_id` but received {overrides_id!r}")
         return await self._delete(
-            f"/zones/{zone_identifier}/firewall/waf/overrides/{id}",
+            f"/zones/{zone_id}/firewall/waf/overrides/{overrides_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -485,17 +581,18 @@ async def delete(
             cast_to=cast(Type[Optional[OverrideDeleteResponse]], ResultWrapper[OverrideDeleteResponse]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def get(
         self,
-        id: str,
+        overrides_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Override:
         """
         Fetches the details of a URI-based WAF override.
@@ -504,9 +601,9 @@ async def get(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the WAF override.
+          overrides_id: The unique identifier of the WAF override.
 
           extra_headers: Send extra headers
 
@@ -516,12 +613,12 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not overrides_id:
+            raise ValueError(f"Expected a non-empty value for `overrides_id` but received {overrides_id!r}")
         return await self._get(
-            f"/zones/{zone_identifier}/firewall/waf/overrides/{id}",
+            f"/zones/{zone_id}/firewall/waf/overrides/{overrides_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -537,20 +634,30 @@ class OverridesResourceWithRawResponse:
     def __init__(self, overrides: OverridesResource) -> None:
         self._overrides = overrides
 
-        self.create = to_raw_response_wrapper(
-            overrides.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                overrides.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.update = to_raw_response_wrapper(
-            overrides.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                overrides.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.list = to_raw_response_wrapper(
-            overrides.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                overrides.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = to_raw_response_wrapper(
-            overrides.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                overrides.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_raw_response_wrapper(
-            overrides.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                overrides.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -558,20 +665,30 @@ class AsyncOverridesResourceWithRawResponse:
     def __init__(self, overrides: AsyncOverridesResource) -> None:
         self._overrides = overrides
 
-        self.create = async_to_raw_response_wrapper(
-            overrides.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                overrides.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.update = async_to_raw_response_wrapper(
-            overrides.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                overrides.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.list = async_to_raw_response_wrapper(
-            overrides.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                overrides.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = async_to_raw_response_wrapper(
-            overrides.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                overrides.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_raw_response_wrapper(
-            overrides.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                overrides.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -579,20 +696,30 @@ class OverridesResourceWithStreamingResponse:
     def __init__(self, overrides: OverridesResource) -> None:
         self._overrides = overrides
 
-        self.create = to_streamed_response_wrapper(
-            overrides.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                overrides.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.update = to_streamed_response_wrapper(
-            overrides.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                overrides.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.list = to_streamed_response_wrapper(
-            overrides.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                overrides.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = to_streamed_response_wrapper(
-            overrides.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                overrides.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_streamed_response_wrapper(
-            overrides.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                overrides.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -600,18 +727,28 @@ class AsyncOverridesResourceWithStreamingResponse:
     def __init__(self, overrides: AsyncOverridesResource) -> None:
         self._overrides = overrides
 
-        self.create = async_to_streamed_response_wrapper(
-            overrides.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                overrides.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.update = async_to_streamed_response_wrapper(
-            overrides.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                overrides.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.list = async_to_streamed_response_wrapper(
-            overrides.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                overrides.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = async_to_streamed_response_wrapper(
-            overrides.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                overrides.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_streamed_response_wrapper(
-            overrides.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                overrides.get,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/firewall/waf/packages/groups.py b/src/cloudflare/resources/firewall/waf/packages/groups.py
index a3835297072..e6c16052876 100644
--- a/src/cloudflare/resources/firewall/waf/packages/groups.py
+++ b/src/cloudflare/resources/firewall/waf/packages/groups.py
@@ -2,16 +2,14 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import Any, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -34,31 +32,43 @@
 class GroupsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> GroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return GroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> GroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return GroupsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
         package_id: str,
         *,
         zone_id: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        match: Literal["any", "all"] | NotGiven = NOT_GIVEN,
-        mode: Literal["on", "off"] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        order: Literal["mode", "rules_count"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        rules_count: float | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        match: Literal["any", "all"] | Omit = omit,
+        mode: Literal["on", "off"] | Omit = omit,
+        name: str | Omit = omit,
+        order: Literal["mode", "rules_count"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        rules_count: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[Group]:
         """
         Fetches the WAF rule groups in a WAF package.
@@ -67,27 +77,28 @@ def list(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_id: Identifier
+          zone_id: Defines an identifier of a schema.
 
-          package_id: The unique identifier of a WAF package.
+          package_id: Defines the unique identifier of a WAF package.
 
-          direction: The direction used to sort returned rule groups.
+          direction: Defines the direction used to sort returned rule groups.
 
-          match: When set to `all`, all the search requirements must match. When set to `any`,
-              only one of the search requirements has to match.
+          match: Defines the condition for search requirements. When set to `all`, all the search
+              requirements must match. When set to `any`, only one of the search requirements
+              has to match.
 
-          mode: The state of the rules contained in the rule group. When `on`, the rules in the
-              group are configurable/usable.
+          mode: Defines the state of the rules contained in the rule group. When `on`, the rules
+              in the group are configurable/usable.
 
-          name: The name of the rule group.
+          name: Defines the name of the rule group.
 
-          order: The field used to sort returned rule groups.
+          order: Defines the field used to sort returned rule groups.
 
-          page: The page number of paginated results.
+          page: Defines the page number of paginated results.
 
-          per_page: The number of rule groups per page.
+          per_page: Defines the number of rule groups per page.
 
-          rules_count: The number of rules in the current rule group.
+          rules_count: Defines the number of rules in the current rule group.
 
           extra_headers: Send extra headers
 
@@ -126,19 +137,20 @@ def list(
             model=Group,
         )
 
+    @typing_extensions.deprecated("deprecated")
     def edit(
         self,
         group_id: str,
         *,
         zone_id: str,
         package_id: str,
-        mode: Literal["on", "off"] | NotGiven = NOT_GIVEN,
+        mode: Literal["on", "off"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> GroupEditResponse:
         """Updates a WAF rule group.
 
@@ -149,14 +161,14 @@ def edit(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_id: Identifier
+          zone_id: Defines an identifier of a schema.
 
-          package_id: The unique identifier of a WAF package.
+          package_id: Defines the unique identifier of a WAF package.
 
-          group_id: The unique identifier of a WAF package.
+          group_id: Defines the unique identifier of a WAF package.
 
-          mode: The state of the rules contained in the rule group. When `on`, the rules in the
-              group are configurable/usable.
+          mode: Defines the state of the rules contained in the rule group. When `on`, the rules
+              in the group are configurable/usable.
 
           extra_headers: Send extra headers
 
@@ -190,6 +202,7 @@ def edit(
             ),
         )
 
+    @typing_extensions.deprecated("deprecated")
     def get(
         self,
         group_id: str,
@@ -201,7 +214,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> GroupGetResponse:
         """
         Fetches the details of a WAF rule group.
@@ -210,11 +223,11 @@ def get(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_id: Identifier
+          zone_id: Defines an identifier of a schema.
 
-          package_id: The unique identifier of a WAF package.
+          package_id: Defines the unique identifier of a WAF package.
 
-          group_id: The unique identifier of a WAF package.
+          group_id: Defines the unique identifier of a WAF package.
 
           extra_headers: Send extra headers
 
@@ -251,31 +264,43 @@ def get(
 class AsyncGroupsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncGroupsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
         package_id: str,
         *,
         zone_id: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        match: Literal["any", "all"] | NotGiven = NOT_GIVEN,
-        mode: Literal["on", "off"] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        order: Literal["mode", "rules_count"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        rules_count: float | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        match: Literal["any", "all"] | Omit = omit,
+        mode: Literal["on", "off"] | Omit = omit,
+        name: str | Omit = omit,
+        order: Literal["mode", "rules_count"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        rules_count: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Group, AsyncV4PagePaginationArray[Group]]:
         """
         Fetches the WAF rule groups in a WAF package.
@@ -284,27 +309,28 @@ def list(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_id: Identifier
+          zone_id: Defines an identifier of a schema.
 
-          package_id: The unique identifier of a WAF package.
+          package_id: Defines the unique identifier of a WAF package.
 
-          direction: The direction used to sort returned rule groups.
+          direction: Defines the direction used to sort returned rule groups.
 
-          match: When set to `all`, all the search requirements must match. When set to `any`,
-              only one of the search requirements has to match.
+          match: Defines the condition for search requirements. When set to `all`, all the search
+              requirements must match. When set to `any`, only one of the search requirements
+              has to match.
 
-          mode: The state of the rules contained in the rule group. When `on`, the rules in the
-              group are configurable/usable.
+          mode: Defines the state of the rules contained in the rule group. When `on`, the rules
+              in the group are configurable/usable.
 
-          name: The name of the rule group.
+          name: Defines the name of the rule group.
 
-          order: The field used to sort returned rule groups.
+          order: Defines the field used to sort returned rule groups.
 
-          page: The page number of paginated results.
+          page: Defines the page number of paginated results.
 
-          per_page: The number of rule groups per page.
+          per_page: Defines the number of rule groups per page.
 
-          rules_count: The number of rules in the current rule group.
+          rules_count: Defines the number of rules in the current rule group.
 
           extra_headers: Send extra headers
 
@@ -343,19 +369,20 @@ def list(
             model=Group,
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def edit(
         self,
         group_id: str,
         *,
         zone_id: str,
         package_id: str,
-        mode: Literal["on", "off"] | NotGiven = NOT_GIVEN,
+        mode: Literal["on", "off"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> GroupEditResponse:
         """Updates a WAF rule group.
 
@@ -366,14 +393,14 @@ async def edit(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_id: Identifier
+          zone_id: Defines an identifier of a schema.
 
-          package_id: The unique identifier of a WAF package.
+          package_id: Defines the unique identifier of a WAF package.
 
-          group_id: The unique identifier of a WAF package.
+          group_id: Defines the unique identifier of a WAF package.
 
-          mode: The state of the rules contained in the rule group. When `on`, the rules in the
-              group are configurable/usable.
+          mode: Defines the state of the rules contained in the rule group. When `on`, the rules
+              in the group are configurable/usable.
 
           extra_headers: Send extra headers
 
@@ -407,6 +434,7 @@ async def edit(
             ),
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def get(
         self,
         group_id: str,
@@ -418,7 +446,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> GroupGetResponse:
         """
         Fetches the details of a WAF rule group.
@@ -427,11 +455,11 @@ async def get(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_id: Identifier
+          zone_id: Defines an identifier of a schema.
 
-          package_id: The unique identifier of a WAF package.
+          package_id: Defines the unique identifier of a WAF package.
 
-          group_id: The unique identifier of a WAF package.
+          group_id: Defines the unique identifier of a WAF package.
 
           extra_headers: Send extra headers
 
@@ -469,14 +497,20 @@ class GroupsResourceWithRawResponse:
     def __init__(self, groups: GroupsResource) -> None:
         self._groups = groups
 
-        self.list = to_raw_response_wrapper(
-            groups.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                groups.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = to_raw_response_wrapper(
-            groups.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                groups.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_raw_response_wrapper(
-            groups.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                groups.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -484,14 +518,20 @@ class AsyncGroupsResourceWithRawResponse:
     def __init__(self, groups: AsyncGroupsResource) -> None:
         self._groups = groups
 
-        self.list = async_to_raw_response_wrapper(
-            groups.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                groups.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = async_to_raw_response_wrapper(
-            groups.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                groups.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_raw_response_wrapper(
-            groups.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                groups.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -499,14 +539,20 @@ class GroupsResourceWithStreamingResponse:
     def __init__(self, groups: GroupsResource) -> None:
         self._groups = groups
 
-        self.list = to_streamed_response_wrapper(
-            groups.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                groups.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = to_streamed_response_wrapper(
-            groups.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                groups.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_streamed_response_wrapper(
-            groups.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                groups.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -514,12 +560,18 @@ class AsyncGroupsResourceWithStreamingResponse:
     def __init__(self, groups: AsyncGroupsResource) -> None:
         self._groups = groups
 
-        self.list = async_to_streamed_response_wrapper(
-            groups.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                groups.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = async_to_streamed_response_wrapper(
-            groups.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                groups.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_streamed_response_wrapper(
-            groups.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                groups.get,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/firewall/waf/packages/packages.py b/src/cloudflare/resources/firewall/waf/packages/packages.py
index b4d5b62323a..97a9afe75a4 100644
--- a/src/cloudflare/resources/firewall/waf/packages/packages.py
+++ b/src/cloudflare/resources/firewall/waf/packages/packages.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import Any, cast
 from typing_extensions import Literal
 
@@ -23,7 +24,7 @@
     GroupsResourceWithStreamingResponse,
     AsyncGroupsResourceWithStreamingResponse,
 )
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ....._utils import maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
@@ -37,7 +38,6 @@
 from ....._base_client import AsyncPaginator, make_request_options
 from .....types.firewall.waf import package_list_params
 from .....types.firewall.waf.package_get_response import PackageGetResponse
-from .....types.firewall.waf.package_list_response import PackageListResponse
 
 __all__ = ["PackagesResource", "AsyncPackagesResource"]
 
@@ -53,29 +53,41 @@ def rules(self) -> RulesResource:
 
     @cached_property
     def with_raw_response(self) -> PackagesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PackagesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PackagesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PackagesResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
-        zone_identifier: str,
         *,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        match: Literal["any", "all"] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        order: Literal["name"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        match: Literal["any", "all"] | Omit = omit,
+        name: str | Omit = omit,
+        order: Literal["name"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePaginationArray[PackageListResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[object]:
         """
         Fetches WAF packages for a zone.
 
@@ -83,7 +95,7 @@ def list(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
           direction: The direction used to sort returned packages.
 
@@ -106,11 +118,11 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/firewall/waf/packages",
-            page=SyncV4PagePaginationArray[PackageListResponse],
+            f"/zones/{zone_id}/firewall/waf/packages",
+            page=SyncV4PagePaginationArray[object],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -128,20 +140,21 @@ def list(
                     package_list_params.PackageListParams,
                 ),
             ),
-            model=cast(Any, PackageListResponse),  # Union types cannot be passed in as arguments in the type system
+            model=object,
         )
 
+    @typing_extensions.deprecated("deprecated")
     def get(
         self,
-        identifier: str,
+        package_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PackageGetResponse:
         """
         Fetches the details of a WAF package.
@@ -150,9 +163,9 @@ def get(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          identifier: Identifier
+          package_id: Defines a package identifier.
 
           extra_headers: Send extra headers
 
@@ -162,14 +175,14 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not identifier:
-            raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not package_id:
+            raise ValueError(f"Expected a non-empty value for `package_id` but received {package_id!r}")
         return cast(
             PackageGetResponse,
             self._get(
-                f"/zones/{zone_identifier}/firewall/waf/packages/{identifier}",
+                f"/zones/{zone_id}/firewall/waf/packages/{package_id}",
                 options=make_request_options(
                     extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
                 ),
@@ -191,29 +204,41 @@ def rules(self) -> AsyncRulesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncPackagesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPackagesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPackagesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPackagesResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
-        zone_identifier: str,
         *,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        match: Literal["any", "all"] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        order: Literal["name"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        match: Literal["any", "all"] | Omit = omit,
+        name: str | Omit = omit,
+        order: Literal["name"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[PackageListResponse, AsyncV4PagePaginationArray[PackageListResponse]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[object, AsyncV4PagePaginationArray[object]]:
         """
         Fetches WAF packages for a zone.
 
@@ -221,7 +246,7 @@ def list(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
           direction: The direction used to sort returned packages.
 
@@ -244,11 +269,11 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/firewall/waf/packages",
-            page=AsyncV4PagePaginationArray[PackageListResponse],
+            f"/zones/{zone_id}/firewall/waf/packages",
+            page=AsyncV4PagePaginationArray[object],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -266,20 +291,21 @@ def list(
                     package_list_params.PackageListParams,
                 ),
             ),
-            model=cast(Any, PackageListResponse),  # Union types cannot be passed in as arguments in the type system
+            model=object,
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def get(
         self,
-        identifier: str,
+        package_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PackageGetResponse:
         """
         Fetches the details of a WAF package.
@@ -288,9 +314,9 @@ async def get(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          identifier: Identifier
+          package_id: Defines a package identifier.
 
           extra_headers: Send extra headers
 
@@ -300,14 +326,14 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not identifier:
-            raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not package_id:
+            raise ValueError(f"Expected a non-empty value for `package_id` but received {package_id!r}")
         return cast(
             PackageGetResponse,
             await self._get(
-                f"/zones/{zone_identifier}/firewall/waf/packages/{identifier}",
+                f"/zones/{zone_id}/firewall/waf/packages/{package_id}",
                 options=make_request_options(
                     extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
                 ),
@@ -322,11 +348,15 @@ class PackagesResourceWithRawResponse:
     def __init__(self, packages: PackagesResource) -> None:
         self._packages = packages
 
-        self.list = to_raw_response_wrapper(
-            packages.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                packages.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_raw_response_wrapper(
-            packages.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                packages.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
     @cached_property
@@ -342,11 +372,15 @@ class AsyncPackagesResourceWithRawResponse:
     def __init__(self, packages: AsyncPackagesResource) -> None:
         self._packages = packages
 
-        self.list = async_to_raw_response_wrapper(
-            packages.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                packages.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_raw_response_wrapper(
-            packages.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                packages.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
     @cached_property
@@ -362,11 +396,15 @@ class PackagesResourceWithStreamingResponse:
     def __init__(self, packages: PackagesResource) -> None:
         self._packages = packages
 
-        self.list = to_streamed_response_wrapper(
-            packages.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                packages.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_streamed_response_wrapper(
-            packages.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                packages.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
     @cached_property
@@ -382,11 +420,15 @@ class AsyncPackagesResourceWithStreamingResponse:
     def __init__(self, packages: AsyncPackagesResource) -> None:
         self._packages = packages
 
-        self.list = async_to_streamed_response_wrapper(
-            packages.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                packages.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_streamed_response_wrapper(
-            packages.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                packages.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
     @cached_property
diff --git a/src/cloudflare/resources/firewall/waf/packages/rules.py b/src/cloudflare/resources/firewall/waf/packages/rules.py
index 697ce9315d8..c59f9780c36 100644
--- a/src/cloudflare/resources/firewall/waf/packages/rules.py
+++ b/src/cloudflare/resources/firewall/waf/packages/rules.py
@@ -2,16 +2,14 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import Any, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -34,32 +32,44 @@
 class RulesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RulesResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
         package_id: str,
         *,
         zone_id: str,
-        description: str | NotGiven = NOT_GIVEN,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        group_id: str | NotGiven = NOT_GIVEN,
-        match: Literal["any", "all"] | NotGiven = NOT_GIVEN,
-        mode: Literal["DIS", "CHL", "BLK", "SIM"] | NotGiven = NOT_GIVEN,
-        order: Literal["priority", "group_id", "description"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        priority: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        group_id: str | Omit = omit,
+        match: Literal["any", "all"] | Omit = omit,
+        mode: Literal["DIS", "CHL", "BLK", "SIM"] | Omit = omit,
+        order: Literal["priority", "group_id", "description"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        priority: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[RuleListResponse]:
         """
         Fetches WAF rules in a WAF package.
@@ -68,28 +78,29 @@ def list(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_id: Identifier
+          zone_id: Defines an identifier of a schema.
 
-          package_id: The unique identifier of a WAF package.
+          package_id: Defines the unique identifier of a WAF package.
 
-          description: The public description of the WAF rule.
+          description: Defines the public description of the WAF rule.
 
-          direction: The direction used to sort returned rules.
+          direction: Defines the direction used to sort returned rules.
 
-          group_id: The unique identifier of the rule group.
+          group_id: Defines the unique identifier of the rule group.
 
-          match: When set to `all`, all the search requirements must match. When set to `any`,
-              only one of the search requirements has to match.
+          match: Defines the search requirements. When set to `all`, all the search requirements
+              must match. When set to `any`, only one of the search requirements has to match.
 
-          mode: The action/mode a rule has been overridden to perform.
+          mode: Defines the action/mode a rule has been overridden to perform.
 
-          order: The field used to sort returned rules.
+          order: Defines the field used to sort returned rules.
 
-          page: The page number of paginated results.
+          page: Defines the page number of paginated results.
 
-          per_page: The number of rules per page.
+          per_page: Defines the number of rules per page.
 
-          priority: The order in which the individual WAF rule is executed within its rule group.
+          priority: Defines the order in which the individual WAF rule is executed within its rule
+              group.
 
           extra_headers: Send extra headers
 
@@ -129,19 +140,20 @@ def list(
             model=cast(Any, RuleListResponse),  # Union types cannot be passed in as arguments in the type system
         )
 
+    @typing_extensions.deprecated("deprecated")
     def edit(
         self,
         rule_id: str,
         *,
         zone_id: str,
         package_id: str,
-        mode: Literal["default", "disable", "simulate", "block", "challenge", "on", "off"] | NotGiven = NOT_GIVEN,
+        mode: Literal["default", "disable", "simulate", "block", "challenge", "on", "off"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """Updates a WAF rule.
 
@@ -151,14 +163,14 @@ def edit(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_id: Identifier
+          zone_id: Defines an identifier of a schema.
 
-          package_id: The unique identifier of a WAF package.
+          package_id: Defines the unique identifier of a WAF package.
 
-          rule_id: The unique identifier of a WAF package.
+          rule_id: Defines the unique identifier of a WAF package.
 
-          mode: The mode/action of the rule when triggered. You must use a value from the
-              `allowed_modes` array of the current rule.
+          mode: Defines the mode/action of the rule when triggered. You must use a value from
+              the `allowed_modes` array of the current rule.
 
           extra_headers: Send extra headers
 
@@ -192,6 +204,7 @@ def edit(
             ),
         )
 
+    @typing_extensions.deprecated("deprecated")
     def get(
         self,
         rule_id: str,
@@ -203,7 +216,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleGetResponse:
         """
         Fetches the details of a WAF rule in a WAF package.
@@ -212,11 +225,11 @@ def get(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_id: Identifier
+          zone_id: Defines an identifier of a schema.
 
-          package_id: The unique identifier of a WAF package.
+          package_id: Defines the unique identifier of a WAF package.
 
-          rule_id: The unique identifier of a WAF package.
+          rule_id: Defines the unique identifier of a WAF package.
 
           extra_headers: Send extra headers
 
@@ -253,32 +266,44 @@ def get(
 class AsyncRulesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRulesResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
         package_id: str,
         *,
         zone_id: str,
-        description: str | NotGiven = NOT_GIVEN,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        group_id: str | NotGiven = NOT_GIVEN,
-        match: Literal["any", "all"] | NotGiven = NOT_GIVEN,
-        mode: Literal["DIS", "CHL", "BLK", "SIM"] | NotGiven = NOT_GIVEN,
-        order: Literal["priority", "group_id", "description"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        priority: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        group_id: str | Omit = omit,
+        match: Literal["any", "all"] | Omit = omit,
+        mode: Literal["DIS", "CHL", "BLK", "SIM"] | Omit = omit,
+        order: Literal["priority", "group_id", "description"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        priority: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[RuleListResponse, AsyncV4PagePaginationArray[RuleListResponse]]:
         """
         Fetches WAF rules in a WAF package.
@@ -287,28 +312,29 @@ def list(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_id: Identifier
+          zone_id: Defines an identifier of a schema.
 
-          package_id: The unique identifier of a WAF package.
+          package_id: Defines the unique identifier of a WAF package.
 
-          description: The public description of the WAF rule.
+          description: Defines the public description of the WAF rule.
 
-          direction: The direction used to sort returned rules.
+          direction: Defines the direction used to sort returned rules.
 
-          group_id: The unique identifier of the rule group.
+          group_id: Defines the unique identifier of the rule group.
 
-          match: When set to `all`, all the search requirements must match. When set to `any`,
-              only one of the search requirements has to match.
+          match: Defines the search requirements. When set to `all`, all the search requirements
+              must match. When set to `any`, only one of the search requirements has to match.
 
-          mode: The action/mode a rule has been overridden to perform.
+          mode: Defines the action/mode a rule has been overridden to perform.
 
-          order: The field used to sort returned rules.
+          order: Defines the field used to sort returned rules.
 
-          page: The page number of paginated results.
+          page: Defines the page number of paginated results.
 
-          per_page: The number of rules per page.
+          per_page: Defines the number of rules per page.
 
-          priority: The order in which the individual WAF rule is executed within its rule group.
+          priority: Defines the order in which the individual WAF rule is executed within its rule
+              group.
 
           extra_headers: Send extra headers
 
@@ -348,19 +374,20 @@ def list(
             model=cast(Any, RuleListResponse),  # Union types cannot be passed in as arguments in the type system
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def edit(
         self,
         rule_id: str,
         *,
         zone_id: str,
         package_id: str,
-        mode: Literal["default", "disable", "simulate", "block", "challenge", "on", "off"] | NotGiven = NOT_GIVEN,
+        mode: Literal["default", "disable", "simulate", "block", "challenge", "on", "off"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """Updates a WAF rule.
 
@@ -370,14 +397,14 @@ async def edit(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_id: Identifier
+          zone_id: Defines an identifier of a schema.
 
-          package_id: The unique identifier of a WAF package.
+          package_id: Defines the unique identifier of a WAF package.
 
-          rule_id: The unique identifier of a WAF package.
+          rule_id: Defines the unique identifier of a WAF package.
 
-          mode: The mode/action of the rule when triggered. You must use a value from the
-              `allowed_modes` array of the current rule.
+          mode: Defines the mode/action of the rule when triggered. You must use a value from
+              the `allowed_modes` array of the current rule.
 
           extra_headers: Send extra headers
 
@@ -411,6 +438,7 @@ async def edit(
             ),
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def get(
         self,
         rule_id: str,
@@ -422,7 +450,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleGetResponse:
         """
         Fetches the details of a WAF rule in a WAF package.
@@ -431,11 +459,11 @@ async def get(
         [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
 
         Args:
-          zone_id: Identifier
+          zone_id: Defines an identifier of a schema.
 
-          package_id: The unique identifier of a WAF package.
+          package_id: Defines the unique identifier of a WAF package.
 
-          rule_id: The unique identifier of a WAF package.
+          rule_id: Defines the unique identifier of a WAF package.
 
           extra_headers: Send extra headers
 
@@ -473,14 +501,20 @@ class RulesResourceWithRawResponse:
     def __init__(self, rules: RulesResource) -> None:
         self._rules = rules
 
-        self.list = to_raw_response_wrapper(
-            rules.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                rules.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = to_raw_response_wrapper(
-            rules.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                rules.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_raw_response_wrapper(
-            rules.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                rules.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -488,14 +522,20 @@ class AsyncRulesResourceWithRawResponse:
     def __init__(self, rules: AsyncRulesResource) -> None:
         self._rules = rules
 
-        self.list = async_to_raw_response_wrapper(
-            rules.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                rules.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = async_to_raw_response_wrapper(
-            rules.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                rules.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_raw_response_wrapper(
-            rules.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                rules.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -503,14 +543,20 @@ class RulesResourceWithStreamingResponse:
     def __init__(self, rules: RulesResource) -> None:
         self._rules = rules
 
-        self.list = to_streamed_response_wrapper(
-            rules.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                rules.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = to_streamed_response_wrapper(
-            rules.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                rules.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_streamed_response_wrapper(
-            rules.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                rules.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -518,12 +564,18 @@ class AsyncRulesResourceWithStreamingResponse:
     def __init__(self, rules: AsyncRulesResource) -> None:
         self._rules = rules
 
-        self.list = async_to_streamed_response_wrapper(
-            rules.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                rules.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = async_to_streamed_response_wrapper(
-            rules.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                rules.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_streamed_response_wrapper(
-            rules.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                rules.get,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/firewall/waf/waf.py b/src/cloudflare/resources/firewall/waf/waf.py
index 1a4ec228629..fb7d3bc0a5e 100644
--- a/src/cloudflare/resources/firewall/waf/waf.py
+++ b/src/cloudflare/resources/firewall/waf/waf.py
@@ -2,14 +2,6 @@
 
 from __future__ import annotations
 
-from .packages import (
-    PackagesResource,
-    AsyncPackagesResource,
-    PackagesResourceWithRawResponse,
-    AsyncPackagesResourceWithRawResponse,
-    PackagesResourceWithStreamingResponse,
-    AsyncPackagesResourceWithStreamingResponse,
-)
 from .overrides import (
     OverridesResource,
     AsyncOverridesResource,
@@ -20,7 +12,14 @@
 )
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
-from .packages.packages import PackagesResource, AsyncPackagesResource
+from .packages.packages import (
+    PackagesResource,
+    AsyncPackagesResource,
+    PackagesResourceWithRawResponse,
+    AsyncPackagesResourceWithRawResponse,
+    PackagesResourceWithStreamingResponse,
+    AsyncPackagesResourceWithStreamingResponse,
+)
 
 __all__ = ["WAFResource", "AsyncWAFResource"]
 
@@ -36,10 +35,21 @@ def packages(self) -> PackagesResource:
 
     @cached_property
     def with_raw_response(self) -> WAFResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return WAFResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> WAFResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return WAFResourceWithStreamingResponse(self)
 
 
@@ -54,10 +64,21 @@ def packages(self) -> AsyncPackagesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncWAFResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncWAFResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncWAFResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncWAFResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/fraud.py b/src/cloudflare/resources/fraud.py
new file mode 100644
index 00000000000..0d4c657d1c8
--- /dev/null
+++ b/src/cloudflare/resources/fraud.py
@@ -0,0 +1,319 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from .._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from .._utils import maybe_transform, async_maybe_transform
+from .._compat import cached_property
+from .._resource import SyncAPIResource, AsyncAPIResource
+from .._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from .._wrappers import ResultWrapper
+from ..types.fraud import fraud_update_params
+from .._base_client import make_request_options
+from ..types.fraud.fraud_settings import FraudSettings
+
+__all__ = ["FraudResource", "AsyncFraudResource"]
+
+
+class FraudResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> FraudResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return FraudResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> FraudResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return FraudResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        *,
+        zone_id: str,
+        user_profiles: Literal["enabled", "disabled"] | Omit = omit,
+        username_expressions: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[FraudSettings]:
+        """
+        Update Fraud Detection settings for a zone.
+
+        Notes on `username_expressions` behavior:
+
+        - If omitted or set to null, expressions are not modified.
+        - If provided as an empty array `[]`, all expressions will be cleared.
+
+        Args:
+          zone_id: Identifier.
+
+          user_profiles: Whether Fraud User Profiles is enabled for the zone.
+
+          username_expressions: List of expressions to detect usernames in write HTTP requests.
+
+              - Maximum of 10 expressions.
+              - Omit or set to null to leave unchanged on update.
+              - Provide an empty array `[]` to clear all expressions on update.
+              - Invalid expressions will result in a 10400 Bad Request with details in the
+                `messages` array.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/fraud_detection/settings",
+            body=maybe_transform(
+                {
+                    "user_profiles": user_profiles,
+                    "username_expressions": username_expressions,
+                },
+                fraud_update_params.FraudUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[FraudSettings]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[FraudSettings]], ResultWrapper[FraudSettings]),
+        )
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[FraudSettings]:
+        """
+        Retrieve Fraud Detection settings for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/fraud_detection/settings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[FraudSettings]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[FraudSettings]], ResultWrapper[FraudSettings]),
+        )
+
+
+class AsyncFraudResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncFraudResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncFraudResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncFraudResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncFraudResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        *,
+        zone_id: str,
+        user_profiles: Literal["enabled", "disabled"] | Omit = omit,
+        username_expressions: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[FraudSettings]:
+        """
+        Update Fraud Detection settings for a zone.
+
+        Notes on `username_expressions` behavior:
+
+        - If omitted or set to null, expressions are not modified.
+        - If provided as an empty array `[]`, all expressions will be cleared.
+
+        Args:
+          zone_id: Identifier.
+
+          user_profiles: Whether Fraud User Profiles is enabled for the zone.
+
+          username_expressions: List of expressions to detect usernames in write HTTP requests.
+
+              - Maximum of 10 expressions.
+              - Omit or set to null to leave unchanged on update.
+              - Provide an empty array `[]` to clear all expressions on update.
+              - Invalid expressions will result in a 10400 Bad Request with details in the
+                `messages` array.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/fraud_detection/settings",
+            body=await async_maybe_transform(
+                {
+                    "user_profiles": user_profiles,
+                    "username_expressions": username_expressions,
+                },
+                fraud_update_params.FraudUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[FraudSettings]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[FraudSettings]], ResultWrapper[FraudSettings]),
+        )
+
+    async def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[FraudSettings]:
+        """
+        Retrieve Fraud Detection settings for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/fraud_detection/settings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[FraudSettings]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[FraudSettings]], ResultWrapper[FraudSettings]),
+        )
+
+
+class FraudResourceWithRawResponse:
+    def __init__(self, fraud: FraudResource) -> None:
+        self._fraud = fraud
+
+        self.update = to_raw_response_wrapper(
+            fraud.update,
+        )
+        self.get = to_raw_response_wrapper(
+            fraud.get,
+        )
+
+
+class AsyncFraudResourceWithRawResponse:
+    def __init__(self, fraud: AsyncFraudResource) -> None:
+        self._fraud = fraud
+
+        self.update = async_to_raw_response_wrapper(
+            fraud.update,
+        )
+        self.get = async_to_raw_response_wrapper(
+            fraud.get,
+        )
+
+
+class FraudResourceWithStreamingResponse:
+    def __init__(self, fraud: FraudResource) -> None:
+        self._fraud = fraud
+
+        self.update = to_streamed_response_wrapper(
+            fraud.update,
+        )
+        self.get = to_streamed_response_wrapper(
+            fraud.get,
+        )
+
+
+class AsyncFraudResourceWithStreamingResponse:
+    def __init__(self, fraud: AsyncFraudResource) -> None:
+        self._fraud = fraud
+
+        self.update = async_to_streamed_response_wrapper(
+            fraud.update,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            fraud.get,
+        )
diff --git a/src/cloudflare/resources/healthchecks/healthchecks.py b/src/cloudflare/resources/healthchecks/healthchecks.py
index 7097e46f114..0b4d04b4036 100644
--- a/src/cloudflare/resources/healthchecks/healthchecks.py
+++ b/src/cloudflare/resources/healthchecks/healthchecks.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from .previews import (
     PreviewsResource,
     AsyncPreviewsResource,
@@ -28,7 +25,7 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from ...pagination import SyncSinglePage, AsyncSinglePage
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.healthchecks import (
     healthcheck_edit_params,
@@ -52,10 +49,21 @@ def previews(self) -> PreviewsResource:
 
     @cached_property
     def with_raw_response(self) -> HealthchecksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return HealthchecksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> HealthchecksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return HealthchecksResourceWithStreamingResponse(self)
 
     def create(
@@ -64,23 +72,23 @@ def create(
         zone_id: str,
         address: str,
         name: str,
-        check_regions: Optional[List[CheckRegion]] | NotGiven = NOT_GIVEN,
-        consecutive_fails: int | NotGiven = NOT_GIVEN,
-        consecutive_successes: int | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        http_config: Optional[HTTPConfigurationParam] | NotGiven = NOT_GIVEN,
-        interval: int | NotGiven = NOT_GIVEN,
-        retries: int | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
-        tcp_config: Optional[TCPConfigurationParam] | NotGiven = NOT_GIVEN,
-        healthcheck_timeout: int | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        check_regions: Optional[List[CheckRegion]] | Omit = omit,
+        consecutive_fails: int | Omit = omit,
+        consecutive_successes: int | Omit = omit,
+        description: str | Omit = omit,
+        http_config: Optional[HTTPConfigurationParam] | Omit = omit,
+        interval: int | Omit = omit,
+        retries: int | Omit = omit,
+        suspended: bool | Omit = omit,
+        tcp_config: Optional[TCPConfigurationParam] | Omit = omit,
+        healthcheck_timeout: int | Omit = omit,
+        type: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Healthcheck:
         """
         Create a new health check.
@@ -147,7 +155,7 @@ def create(
                     "retries": retries,
                     "suspended": suspended,
                     "tcp_config": tcp_config,
-                    "timeout": healthcheck_timeout,
+                    "healthcheck_timeout": healthcheck_timeout,
                     "type": type,
                 },
                 healthcheck_create_params.HealthcheckCreateParams,
@@ -169,23 +177,23 @@ def update(
         zone_id: str,
         address: str,
         name: str,
-        check_regions: Optional[List[CheckRegion]] | NotGiven = NOT_GIVEN,
-        consecutive_fails: int | NotGiven = NOT_GIVEN,
-        consecutive_successes: int | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        http_config: Optional[HTTPConfigurationParam] | NotGiven = NOT_GIVEN,
-        interval: int | NotGiven = NOT_GIVEN,
-        retries: int | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
-        tcp_config: Optional[TCPConfigurationParam] | NotGiven = NOT_GIVEN,
-        healthcheck_timeout: int | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        check_regions: Optional[List[CheckRegion]] | Omit = omit,
+        consecutive_fails: int | Omit = omit,
+        consecutive_successes: int | Omit = omit,
+        description: str | Omit = omit,
+        http_config: Optional[HTTPConfigurationParam] | Omit = omit,
+        interval: int | Omit = omit,
+        retries: int | Omit = omit,
+        suspended: bool | Omit = omit,
+        tcp_config: Optional[TCPConfigurationParam] | Omit = omit,
+        healthcheck_timeout: int | Omit = omit,
+        type: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Healthcheck:
         """
         Update a configured health check.
@@ -256,7 +264,7 @@ def update(
                     "retries": retries,
                     "suspended": suspended,
                     "tcp_config": tcp_config,
-                    "timeout": healthcheck_timeout,
+                    "healthcheck_timeout": healthcheck_timeout,
                     "type": type,
                 },
                 healthcheck_update_params.HealthcheckUpdateParams,
@@ -275,15 +283,15 @@ def list(
         self,
         *,
         zone_id: str,
-        page: object | NotGiven = NOT_GIVEN,
-        per_page: object | NotGiven = NOT_GIVEN,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[Healthcheck]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[Healthcheck]:
         """
         List configured health checks.
 
@@ -306,7 +314,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
             f"/zones/{zone_id}/healthchecks",
-            page=SyncSinglePage[Healthcheck],
+            page=SyncV4PagePaginationArray[Healthcheck],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -333,7 +341,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> HealthcheckDeleteResponse:
         """
         Delete a health check.
@@ -374,23 +382,23 @@ def edit(
         zone_id: str,
         address: str,
         name: str,
-        check_regions: Optional[List[CheckRegion]] | NotGiven = NOT_GIVEN,
-        consecutive_fails: int | NotGiven = NOT_GIVEN,
-        consecutive_successes: int | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        http_config: Optional[HTTPConfigurationParam] | NotGiven = NOT_GIVEN,
-        interval: int | NotGiven = NOT_GIVEN,
-        retries: int | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
-        tcp_config: Optional[TCPConfigurationParam] | NotGiven = NOT_GIVEN,
-        healthcheck_timeout: int | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        check_regions: Optional[List[CheckRegion]] | Omit = omit,
+        consecutive_fails: int | Omit = omit,
+        consecutive_successes: int | Omit = omit,
+        description: str | Omit = omit,
+        http_config: Optional[HTTPConfigurationParam] | Omit = omit,
+        interval: int | Omit = omit,
+        retries: int | Omit = omit,
+        suspended: bool | Omit = omit,
+        tcp_config: Optional[TCPConfigurationParam] | Omit = omit,
+        healthcheck_timeout: int | Omit = omit,
+        type: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Healthcheck:
         """
         Patch a configured health check.
@@ -461,7 +469,7 @@ def edit(
                     "retries": retries,
                     "suspended": suspended,
                     "tcp_config": tcp_config,
-                    "timeout": healthcheck_timeout,
+                    "healthcheck_timeout": healthcheck_timeout,
                     "type": type,
                 },
                 healthcheck_edit_params.HealthcheckEditParams,
@@ -486,7 +494,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Healthcheck:
         """
         Fetch a single configured health check.
@@ -528,10 +536,21 @@ def previews(self) -> AsyncPreviewsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncHealthchecksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncHealthchecksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncHealthchecksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncHealthchecksResourceWithStreamingResponse(self)
 
     async def create(
@@ -540,23 +559,23 @@ async def create(
         zone_id: str,
         address: str,
         name: str,
-        check_regions: Optional[List[CheckRegion]] | NotGiven = NOT_GIVEN,
-        consecutive_fails: int | NotGiven = NOT_GIVEN,
-        consecutive_successes: int | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        http_config: Optional[HTTPConfigurationParam] | NotGiven = NOT_GIVEN,
-        interval: int | NotGiven = NOT_GIVEN,
-        retries: int | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
-        tcp_config: Optional[TCPConfigurationParam] | NotGiven = NOT_GIVEN,
-        healthcheck_timeout: int | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        check_regions: Optional[List[CheckRegion]] | Omit = omit,
+        consecutive_fails: int | Omit = omit,
+        consecutive_successes: int | Omit = omit,
+        description: str | Omit = omit,
+        http_config: Optional[HTTPConfigurationParam] | Omit = omit,
+        interval: int | Omit = omit,
+        retries: int | Omit = omit,
+        suspended: bool | Omit = omit,
+        tcp_config: Optional[TCPConfigurationParam] | Omit = omit,
+        healthcheck_timeout: int | Omit = omit,
+        type: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Healthcheck:
         """
         Create a new health check.
@@ -623,7 +642,7 @@ async def create(
                     "retries": retries,
                     "suspended": suspended,
                     "tcp_config": tcp_config,
-                    "timeout": healthcheck_timeout,
+                    "healthcheck_timeout": healthcheck_timeout,
                     "type": type,
                 },
                 healthcheck_create_params.HealthcheckCreateParams,
@@ -645,23 +664,23 @@ async def update(
         zone_id: str,
         address: str,
         name: str,
-        check_regions: Optional[List[CheckRegion]] | NotGiven = NOT_GIVEN,
-        consecutive_fails: int | NotGiven = NOT_GIVEN,
-        consecutive_successes: int | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        http_config: Optional[HTTPConfigurationParam] | NotGiven = NOT_GIVEN,
-        interval: int | NotGiven = NOT_GIVEN,
-        retries: int | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
-        tcp_config: Optional[TCPConfigurationParam] | NotGiven = NOT_GIVEN,
-        healthcheck_timeout: int | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        check_regions: Optional[List[CheckRegion]] | Omit = omit,
+        consecutive_fails: int | Omit = omit,
+        consecutive_successes: int | Omit = omit,
+        description: str | Omit = omit,
+        http_config: Optional[HTTPConfigurationParam] | Omit = omit,
+        interval: int | Omit = omit,
+        retries: int | Omit = omit,
+        suspended: bool | Omit = omit,
+        tcp_config: Optional[TCPConfigurationParam] | Omit = omit,
+        healthcheck_timeout: int | Omit = omit,
+        type: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Healthcheck:
         """
         Update a configured health check.
@@ -732,7 +751,7 @@ async def update(
                     "retries": retries,
                     "suspended": suspended,
                     "tcp_config": tcp_config,
-                    "timeout": healthcheck_timeout,
+                    "healthcheck_timeout": healthcheck_timeout,
                     "type": type,
                 },
                 healthcheck_update_params.HealthcheckUpdateParams,
@@ -751,15 +770,15 @@ def list(
         self,
         *,
         zone_id: str,
-        page: object | NotGiven = NOT_GIVEN,
-        per_page: object | NotGiven = NOT_GIVEN,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[Healthcheck, AsyncSinglePage[Healthcheck]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Healthcheck, AsyncV4PagePaginationArray[Healthcheck]]:
         """
         List configured health checks.
 
@@ -782,7 +801,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
             f"/zones/{zone_id}/healthchecks",
-            page=AsyncSinglePage[Healthcheck],
+            page=AsyncV4PagePaginationArray[Healthcheck],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -809,7 +828,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> HealthcheckDeleteResponse:
         """
         Delete a health check.
@@ -850,23 +869,23 @@ async def edit(
         zone_id: str,
         address: str,
         name: str,
-        check_regions: Optional[List[CheckRegion]] | NotGiven = NOT_GIVEN,
-        consecutive_fails: int | NotGiven = NOT_GIVEN,
-        consecutive_successes: int | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        http_config: Optional[HTTPConfigurationParam] | NotGiven = NOT_GIVEN,
-        interval: int | NotGiven = NOT_GIVEN,
-        retries: int | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
-        tcp_config: Optional[TCPConfigurationParam] | NotGiven = NOT_GIVEN,
-        healthcheck_timeout: int | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        check_regions: Optional[List[CheckRegion]] | Omit = omit,
+        consecutive_fails: int | Omit = omit,
+        consecutive_successes: int | Omit = omit,
+        description: str | Omit = omit,
+        http_config: Optional[HTTPConfigurationParam] | Omit = omit,
+        interval: int | Omit = omit,
+        retries: int | Omit = omit,
+        suspended: bool | Omit = omit,
+        tcp_config: Optional[TCPConfigurationParam] | Omit = omit,
+        healthcheck_timeout: int | Omit = omit,
+        type: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Healthcheck:
         """
         Patch a configured health check.
@@ -937,7 +956,7 @@ async def edit(
                     "retries": retries,
                     "suspended": suspended,
                     "tcp_config": tcp_config,
-                    "timeout": healthcheck_timeout,
+                    "healthcheck_timeout": healthcheck_timeout,
                     "type": type,
                 },
                 healthcheck_edit_params.HealthcheckEditParams,
@@ -962,7 +981,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Healthcheck:
         """
         Fetch a single configured health check.
diff --git a/src/cloudflare/resources/healthchecks/previews.py b/src/cloudflare/resources/healthchecks/previews.py
index d6593156765..a5e5c0cb278 100644
--- a/src/cloudflare/resources/healthchecks/previews.py
+++ b/src/cloudflare/resources/healthchecks/previews.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -34,10 +31,21 @@
 class PreviewsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PreviewsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PreviewsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PreviewsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PreviewsResourceWithStreamingResponse(self)
 
     def create(
@@ -46,23 +54,23 @@ def create(
         zone_id: str,
         address: str,
         name: str,
-        check_regions: Optional[List[CheckRegion]] | NotGiven = NOT_GIVEN,
-        consecutive_fails: int | NotGiven = NOT_GIVEN,
-        consecutive_successes: int | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        http_config: Optional[HTTPConfigurationParam] | NotGiven = NOT_GIVEN,
-        interval: int | NotGiven = NOT_GIVEN,
-        retries: int | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
-        tcp_config: Optional[TCPConfigurationParam] | NotGiven = NOT_GIVEN,
-        healthcheck_timeout: int | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        check_regions: Optional[List[CheckRegion]] | Omit = omit,
+        consecutive_fails: int | Omit = omit,
+        consecutive_successes: int | Omit = omit,
+        description: str | Omit = omit,
+        http_config: Optional[HTTPConfigurationParam] | Omit = omit,
+        interval: int | Omit = omit,
+        retries: int | Omit = omit,
+        suspended: bool | Omit = omit,
+        tcp_config: Optional[TCPConfigurationParam] | Omit = omit,
+        healthcheck_timeout: int | Omit = omit,
+        type: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Healthcheck:
         """
         Create a new preview health check.
@@ -129,7 +137,7 @@ def create(
                     "retries": retries,
                     "suspended": suspended,
                     "tcp_config": tcp_config,
-                    "timeout": healthcheck_timeout,
+                    "healthcheck_timeout": healthcheck_timeout,
                     "type": type,
                 },
                 preview_create_params.PreviewCreateParams,
@@ -154,7 +162,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PreviewDeleteResponse:
         """
         Delete a health check.
@@ -198,7 +206,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Healthcheck:
         """
         Fetch a single configured health check preview.
@@ -236,10 +244,21 @@ def get(
 class AsyncPreviewsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPreviewsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPreviewsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPreviewsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPreviewsResourceWithStreamingResponse(self)
 
     async def create(
@@ -248,23 +267,23 @@ async def create(
         zone_id: str,
         address: str,
         name: str,
-        check_regions: Optional[List[CheckRegion]] | NotGiven = NOT_GIVEN,
-        consecutive_fails: int | NotGiven = NOT_GIVEN,
-        consecutive_successes: int | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        http_config: Optional[HTTPConfigurationParam] | NotGiven = NOT_GIVEN,
-        interval: int | NotGiven = NOT_GIVEN,
-        retries: int | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
-        tcp_config: Optional[TCPConfigurationParam] | NotGiven = NOT_GIVEN,
-        healthcheck_timeout: int | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        check_regions: Optional[List[CheckRegion]] | Omit = omit,
+        consecutive_fails: int | Omit = omit,
+        consecutive_successes: int | Omit = omit,
+        description: str | Omit = omit,
+        http_config: Optional[HTTPConfigurationParam] | Omit = omit,
+        interval: int | Omit = omit,
+        retries: int | Omit = omit,
+        suspended: bool | Omit = omit,
+        tcp_config: Optional[TCPConfigurationParam] | Omit = omit,
+        healthcheck_timeout: int | Omit = omit,
+        type: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Healthcheck:
         """
         Create a new preview health check.
@@ -331,7 +350,7 @@ async def create(
                     "retries": retries,
                     "suspended": suspended,
                     "tcp_config": tcp_config,
-                    "timeout": healthcheck_timeout,
+                    "healthcheck_timeout": healthcheck_timeout,
                     "type": type,
                 },
                 preview_create_params.PreviewCreateParams,
@@ -356,7 +375,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PreviewDeleteResponse:
         """
         Delete a health check.
@@ -400,7 +419,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Healthcheck:
         """
         Fetch a single configured health check preview.
diff --git a/src/cloudflare/resources/hostnames/hostnames.py b/src/cloudflare/resources/hostnames/hostnames.py
index 8b2b6c2dab1..aab0b8e2160 100644
--- a/src/cloudflare/resources/hostnames/hostnames.py
+++ b/src/cloudflare/resources/hostnames/hostnames.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .settings import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .settings.settings import (
     SettingsResource,
     AsyncSettingsResource,
     SettingsResourceWithRawResponse,
@@ -10,9 +12,6 @@
     SettingsResourceWithStreamingResponse,
     AsyncSettingsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .settings.settings import SettingsResource, AsyncSettingsResource
 
 __all__ = ["HostnamesResource", "AsyncHostnamesResource"]
 
@@ -24,10 +23,21 @@ def settings(self) -> SettingsResource:
 
     @cached_property
     def with_raw_response(self) -> HostnamesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return HostnamesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> HostnamesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return HostnamesResourceWithStreamingResponse(self)
 
 
@@ -38,10 +48,21 @@ def settings(self) -> AsyncSettingsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncHostnamesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncHostnamesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncHostnamesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncHostnamesResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/hostnames/settings/settings.py b/src/cloudflare/resources/hostnames/settings/settings.py
index 9f31fc518e0..d819fbec1fc 100644
--- a/src/cloudflare/resources/hostnames/settings/settings.py
+++ b/src/cloudflare/resources/hostnames/settings/settings.py
@@ -23,10 +23,21 @@ def tls(self) -> TLSResource:
 
     @cached_property
     def with_raw_response(self) -> SettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SettingsResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def tls(self) -> AsyncTLSResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSettingsResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/hostnames/settings/tls.py b/src/cloudflare/resources/hostnames/settings/tls.py
index 32cf20e4ec3..1444a94a19a 100644
--- a/src/cloudflare/resources/hostnames/settings/tls.py
+++ b/src/cloudflare/resources/hostnames/settings/tls.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -21,7 +18,8 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
 from ....types.hostnames.settings import tls_update_params
 from ....types.hostnames.settings.setting import Setting
 from ....types.hostnames.settings.tls_get_response import TLSGetResponse
@@ -34,10 +32,21 @@
 class TLSResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TLSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TLSResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TLSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TLSResourceWithStreamingResponse(self)
 
     def update(
@@ -52,13 +61,13 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Setting]:
         """
         Update the tls setting value for the hostname.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           setting_id: The TLS Setting name.
 
@@ -104,13 +113,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TLSDeleteResponse]:
         """
         Delete the tls setting value for the hostname.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           setting_id: The TLS Setting name.
 
@@ -152,13 +161,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TLSGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[TLSGetResponse]:
         """
         List the requested TLS setting for the hostnames under this zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           setting_id: The TLS Setting name.
 
@@ -174,26 +183,34 @@ def get(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not setting_id:
             raise ValueError(f"Expected a non-empty value for `setting_id` but received {setting_id!r}")
-        return self._get(
+        return self._get_api_list(
             f"/zones/{zone_id}/hostnames/settings/{setting_id}",
+            page=SyncSinglePage[TLSGetResponse],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[TLSGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[TLSGetResponse]], ResultWrapper[TLSGetResponse]),
+            model=TLSGetResponse,
         )
 
 
 class AsyncTLSResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTLSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTLSResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTLSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTLSResourceWithStreamingResponse(self)
 
     async def update(
@@ -208,13 +225,13 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Setting]:
         """
         Update the tls setting value for the hostname.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           setting_id: The TLS Setting name.
 
@@ -260,13 +277,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TLSDeleteResponse]:
         """
         Delete the tls setting value for the hostname.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           setting_id: The TLS Setting name.
 
@@ -298,7 +315,7 @@ async def delete(
             cast_to=cast(Type[Optional[TLSDeleteResponse]], ResultWrapper[TLSDeleteResponse]),
         )
 
-    async def get(
+    def get(
         self,
         setting_id: Literal["ciphers", "min_tls_version", "http2"],
         *,
@@ -308,13 +325,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TLSGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[TLSGetResponse, AsyncSinglePage[TLSGetResponse]]:
         """
         List the requested TLS setting for the hostnames under this zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           setting_id: The TLS Setting name.
 
@@ -330,16 +347,13 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not setting_id:
             raise ValueError(f"Expected a non-empty value for `setting_id` but received {setting_id!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/zones/{zone_id}/hostnames/settings/{setting_id}",
+            page=AsyncSinglePage[TLSGetResponse],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[TLSGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[TLSGetResponse]], ResultWrapper[TLSGetResponse]),
+            model=TLSGetResponse,
         )
 
 
diff --git a/src/cloudflare/resources/hyperdrive/configs.py b/src/cloudflare/resources/hyperdrive/configs.py
index 47c9a7cd72a..46b31fafe33 100644
--- a/src/cloudflare/resources/hyperdrive/configs.py
+++ b/src/cloudflare/resources/hyperdrive/configs.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -24,8 +21,6 @@
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.hyperdrive import config_edit_params, config_create_params, config_update_params
 from ...types.hyperdrive.hyperdrive import Hyperdrive
-from ...types.hyperdrive.configuration_param import ConfigurationParam
-from ...types.hyperdrive.config_delete_response import ConfigDeleteResponse
 
 __all__ = ["ConfigsResource", "AsyncConfigsResource"]
 
@@ -33,10 +28,21 @@
 class ConfigsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ConfigsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ConfigsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ConfigsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ConfigsResourceWithStreamingResponse(self)
 
     def create(
@@ -44,20 +50,28 @@ def create(
         *,
         account_id: str,
         name: str,
-        origin: ConfigurationParam,
-        caching: config_create_params.Caching | NotGiven = NOT_GIVEN,
+        origin: config_create_params.Origin,
+        caching: config_create_params.Caching | Omit = omit,
+        mtls: config_create_params.MTLS | Omit = omit,
+        origin_connection_limit: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Hyperdrive]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Hyperdrive:
         """
         Creates and returns a new Hyperdrive configuration.
 
         Args:
-          account_id: Identifier
+          account_id: Define configurations using a unique string identifier.
+
+          name: The name of the Hyperdrive configuration. Used to identify the configuration in
+              the Cloudflare dashboard and API.
+
+          origin_connection_limit: The (soft) maximum number of connections the Hyperdrive is allowed to make to
+              the origin database.
 
           extra_headers: Send extra headers
 
@@ -76,6 +90,8 @@ def create(
                     "name": name,
                     "origin": origin,
                     "caching": caching,
+                    "mtls": mtls,
+                    "origin_connection_limit": origin_connection_limit,
                 },
                 config_create_params.ConfigCreateParams,
             ),
@@ -84,9 +100,9 @@ def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Hyperdrive]]._unwrapper,
+                post_parser=ResultWrapper[Hyperdrive]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Hyperdrive]], ResultWrapper[Hyperdrive]),
+            cast_to=cast(Type[Hyperdrive], ResultWrapper[Hyperdrive]),
         )
 
     def update(
@@ -95,22 +111,30 @@ def update(
         *,
         account_id: str,
         name: str,
-        origin: ConfigurationParam,
-        caching: config_update_params.Caching | NotGiven = NOT_GIVEN,
+        origin: config_update_params.Origin,
+        caching: config_update_params.Caching | Omit = omit,
+        mtls: config_update_params.MTLS | Omit = omit,
+        origin_connection_limit: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Hyperdrive]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Hyperdrive:
         """
         Updates and returns the specified Hyperdrive configuration.
 
         Args:
-          account_id: Identifier
+          account_id: Define configurations using a unique string identifier.
+
+          hyperdrive_id: Define configurations using a unique string identifier.
 
-          hyperdrive_id: Identifier
+          name: The name of the Hyperdrive configuration. Used to identify the configuration in
+              the Cloudflare dashboard and API.
+
+          origin_connection_limit: The (soft) maximum number of connections the Hyperdrive is allowed to make to
+              the origin database.
 
           extra_headers: Send extra headers
 
@@ -131,6 +155,8 @@ def update(
                     "name": name,
                     "origin": origin,
                     "caching": caching,
+                    "mtls": mtls,
+                    "origin_connection_limit": origin_connection_limit,
                 },
                 config_update_params.ConfigUpdateParams,
             ),
@@ -139,9 +165,9 @@ def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Hyperdrive]]._unwrapper,
+                post_parser=ResultWrapper[Hyperdrive]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Hyperdrive]], ResultWrapper[Hyperdrive]),
+            cast_to=cast(Type[Hyperdrive], ResultWrapper[Hyperdrive]),
         )
 
     def list(
@@ -153,13 +179,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Hyperdrive]:
         """
-        Returns a list of Hyperdrives
+        Returns a list of Hyperdrives.
 
         Args:
-          account_id: Identifier
+          account_id: Define configurations using a unique string identifier.
 
           extra_headers: Send extra headers
 
@@ -190,15 +216,15 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConfigDeleteResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
         Deletes the specified Hyperdrive.
 
         Args:
-          account_id: Identifier
+          account_id: Define configurations using a unique string identifier.
 
-          hyperdrive_id: Identifier
+          hyperdrive_id: Define configurations using a unique string identifier.
 
           extra_headers: Send extra headers
 
@@ -212,21 +238,16 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not hyperdrive_id:
             raise ValueError(f"Expected a non-empty value for `hyperdrive_id` but received {hyperdrive_id!r}")
-        return cast(
-            ConfigDeleteResponse,
-            self._delete(
-                f"/accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[ConfigDeleteResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ConfigDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._delete(
+            f"/accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     def edit(
@@ -234,25 +255,33 @@ def edit(
         hyperdrive_id: str,
         *,
         account_id: str,
-        caching: config_edit_params.Caching | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        origin: ConfigurationParam | NotGiven = NOT_GIVEN,
+        caching: config_edit_params.Caching | Omit = omit,
+        mtls: config_edit_params.MTLS | Omit = omit,
+        name: str | Omit = omit,
+        origin: config_edit_params.Origin | Omit = omit,
+        origin_connection_limit: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Hyperdrive]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Hyperdrive:
         """Patches and returns the specified Hyperdrive configuration.
 
-        Updates to the
-        origin and caching settings are applied with an all-or-nothing approach.
+        Custom caching
+        settings are not kept if caching is disabled.
 
         Args:
-          account_id: Identifier
+          account_id: Define configurations using a unique string identifier.
+
+          hyperdrive_id: Define configurations using a unique string identifier.
+
+          name: The name of the Hyperdrive configuration. Used to identify the configuration in
+              the Cloudflare dashboard and API.
 
-          hyperdrive_id: Identifier
+          origin_connection_limit: The (soft) maximum number of connections the Hyperdrive is allowed to make to
+              the origin database.
 
           extra_headers: Send extra headers
 
@@ -271,8 +300,10 @@ def edit(
             body=maybe_transform(
                 {
                     "caching": caching,
+                    "mtls": mtls,
                     "name": name,
                     "origin": origin,
+                    "origin_connection_limit": origin_connection_limit,
                 },
                 config_edit_params.ConfigEditParams,
             ),
@@ -281,9 +312,9 @@ def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Hyperdrive]]._unwrapper,
+                post_parser=ResultWrapper[Hyperdrive]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Hyperdrive]], ResultWrapper[Hyperdrive]),
+            cast_to=cast(Type[Hyperdrive], ResultWrapper[Hyperdrive]),
         )
 
     def get(
@@ -296,15 +327,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Hyperdrive]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Hyperdrive:
         """
         Returns the specified Hyperdrive configuration.
 
         Args:
-          account_id: Identifier
+          account_id: Define configurations using a unique string identifier.
 
-          hyperdrive_id: Identifier
+          hyperdrive_id: Define configurations using a unique string identifier.
 
           extra_headers: Send extra headers
 
@@ -325,19 +356,30 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Hyperdrive]]._unwrapper,
+                post_parser=ResultWrapper[Hyperdrive]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Hyperdrive]], ResultWrapper[Hyperdrive]),
+            cast_to=cast(Type[Hyperdrive], ResultWrapper[Hyperdrive]),
         )
 
 
 class AsyncConfigsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncConfigsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncConfigsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncConfigsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncConfigsResourceWithStreamingResponse(self)
 
     async def create(
@@ -345,20 +387,28 @@ async def create(
         *,
         account_id: str,
         name: str,
-        origin: ConfigurationParam,
-        caching: config_create_params.Caching | NotGiven = NOT_GIVEN,
+        origin: config_create_params.Origin,
+        caching: config_create_params.Caching | Omit = omit,
+        mtls: config_create_params.MTLS | Omit = omit,
+        origin_connection_limit: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Hyperdrive]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Hyperdrive:
         """
         Creates and returns a new Hyperdrive configuration.
 
         Args:
-          account_id: Identifier
+          account_id: Define configurations using a unique string identifier.
+
+          name: The name of the Hyperdrive configuration. Used to identify the configuration in
+              the Cloudflare dashboard and API.
+
+          origin_connection_limit: The (soft) maximum number of connections the Hyperdrive is allowed to make to
+              the origin database.
 
           extra_headers: Send extra headers
 
@@ -377,6 +427,8 @@ async def create(
                     "name": name,
                     "origin": origin,
                     "caching": caching,
+                    "mtls": mtls,
+                    "origin_connection_limit": origin_connection_limit,
                 },
                 config_create_params.ConfigCreateParams,
             ),
@@ -385,9 +437,9 @@ async def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Hyperdrive]]._unwrapper,
+                post_parser=ResultWrapper[Hyperdrive]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Hyperdrive]], ResultWrapper[Hyperdrive]),
+            cast_to=cast(Type[Hyperdrive], ResultWrapper[Hyperdrive]),
         )
 
     async def update(
@@ -396,22 +448,30 @@ async def update(
         *,
         account_id: str,
         name: str,
-        origin: ConfigurationParam,
-        caching: config_update_params.Caching | NotGiven = NOT_GIVEN,
+        origin: config_update_params.Origin,
+        caching: config_update_params.Caching | Omit = omit,
+        mtls: config_update_params.MTLS | Omit = omit,
+        origin_connection_limit: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Hyperdrive]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Hyperdrive:
         """
         Updates and returns the specified Hyperdrive configuration.
 
         Args:
-          account_id: Identifier
+          account_id: Define configurations using a unique string identifier.
+
+          hyperdrive_id: Define configurations using a unique string identifier.
 
-          hyperdrive_id: Identifier
+          name: The name of the Hyperdrive configuration. Used to identify the configuration in
+              the Cloudflare dashboard and API.
+
+          origin_connection_limit: The (soft) maximum number of connections the Hyperdrive is allowed to make to
+              the origin database.
 
           extra_headers: Send extra headers
 
@@ -432,6 +492,8 @@ async def update(
                     "name": name,
                     "origin": origin,
                     "caching": caching,
+                    "mtls": mtls,
+                    "origin_connection_limit": origin_connection_limit,
                 },
                 config_update_params.ConfigUpdateParams,
             ),
@@ -440,9 +502,9 @@ async def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Hyperdrive]]._unwrapper,
+                post_parser=ResultWrapper[Hyperdrive]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Hyperdrive]], ResultWrapper[Hyperdrive]),
+            cast_to=cast(Type[Hyperdrive], ResultWrapper[Hyperdrive]),
         )
 
     def list(
@@ -454,13 +516,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Hyperdrive, AsyncSinglePage[Hyperdrive]]:
         """
-        Returns a list of Hyperdrives
+        Returns a list of Hyperdrives.
 
         Args:
-          account_id: Identifier
+          account_id: Define configurations using a unique string identifier.
 
           extra_headers: Send extra headers
 
@@ -491,15 +553,15 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConfigDeleteResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
         Deletes the specified Hyperdrive.
 
         Args:
-          account_id: Identifier
+          account_id: Define configurations using a unique string identifier.
 
-          hyperdrive_id: Identifier
+          hyperdrive_id: Define configurations using a unique string identifier.
 
           extra_headers: Send extra headers
 
@@ -513,21 +575,16 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not hyperdrive_id:
             raise ValueError(f"Expected a non-empty value for `hyperdrive_id` but received {hyperdrive_id!r}")
-        return cast(
-            ConfigDeleteResponse,
-            await self._delete(
-                f"/accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[ConfigDeleteResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ConfigDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._delete(
+            f"/accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     async def edit(
@@ -535,25 +592,33 @@ async def edit(
         hyperdrive_id: str,
         *,
         account_id: str,
-        caching: config_edit_params.Caching | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        origin: ConfigurationParam | NotGiven = NOT_GIVEN,
+        caching: config_edit_params.Caching | Omit = omit,
+        mtls: config_edit_params.MTLS | Omit = omit,
+        name: str | Omit = omit,
+        origin: config_edit_params.Origin | Omit = omit,
+        origin_connection_limit: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Hyperdrive]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Hyperdrive:
         """Patches and returns the specified Hyperdrive configuration.
 
-        Updates to the
-        origin and caching settings are applied with an all-or-nothing approach.
+        Custom caching
+        settings are not kept if caching is disabled.
 
         Args:
-          account_id: Identifier
+          account_id: Define configurations using a unique string identifier.
+
+          hyperdrive_id: Define configurations using a unique string identifier.
+
+          name: The name of the Hyperdrive configuration. Used to identify the configuration in
+              the Cloudflare dashboard and API.
 
-          hyperdrive_id: Identifier
+          origin_connection_limit: The (soft) maximum number of connections the Hyperdrive is allowed to make to
+              the origin database.
 
           extra_headers: Send extra headers
 
@@ -572,8 +637,10 @@ async def edit(
             body=await async_maybe_transform(
                 {
                     "caching": caching,
+                    "mtls": mtls,
                     "name": name,
                     "origin": origin,
+                    "origin_connection_limit": origin_connection_limit,
                 },
                 config_edit_params.ConfigEditParams,
             ),
@@ -582,9 +649,9 @@ async def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Hyperdrive]]._unwrapper,
+                post_parser=ResultWrapper[Hyperdrive]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Hyperdrive]], ResultWrapper[Hyperdrive]),
+            cast_to=cast(Type[Hyperdrive], ResultWrapper[Hyperdrive]),
         )
 
     async def get(
@@ -597,15 +664,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Hyperdrive]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Hyperdrive:
         """
         Returns the specified Hyperdrive configuration.
 
         Args:
-          account_id: Identifier
+          account_id: Define configurations using a unique string identifier.
 
-          hyperdrive_id: Identifier
+          hyperdrive_id: Define configurations using a unique string identifier.
 
           extra_headers: Send extra headers
 
@@ -626,9 +693,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Hyperdrive]]._unwrapper,
+                post_parser=ResultWrapper[Hyperdrive]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Hyperdrive]], ResultWrapper[Hyperdrive]),
+            cast_to=cast(Type[Hyperdrive], ResultWrapper[Hyperdrive]),
         )
 
 
diff --git a/src/cloudflare/resources/hyperdrive/hyperdrive.py b/src/cloudflare/resources/hyperdrive/hyperdrive.py
index fbca61fe44f..e1184bb47f0 100644
--- a/src/cloudflare/resources/hyperdrive/hyperdrive.py
+++ b/src/cloudflare/resources/hyperdrive/hyperdrive.py
@@ -23,10 +23,21 @@ def configs(self) -> ConfigsResource:
 
     @cached_property
     def with_raw_response(self) -> HyperdriveResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return HyperdriveResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> HyperdriveResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return HyperdriveResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def configs(self) -> AsyncConfigsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncHyperdriveResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncHyperdriveResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncHyperdriveResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncHyperdriveResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/iam/__init__.py b/src/cloudflare/resources/iam/__init__.py
index a233360f769..66454d4091b 100644
--- a/src/cloudflare/resources/iam/__init__.py
+++ b/src/cloudflare/resources/iam/__init__.py
@@ -8,6 +8,22 @@
     IAMResourceWithStreamingResponse,
     AsyncIAMResourceWithStreamingResponse,
 )
+from .sso import (
+    SSOResource,
+    AsyncSSOResource,
+    SSOResourceWithRawResponse,
+    AsyncSSOResourceWithRawResponse,
+    SSOResourceWithStreamingResponse,
+    AsyncSSOResourceWithStreamingResponse,
+)
+from .user_groups import (
+    UserGroupsResource,
+    AsyncUserGroupsResource,
+    UserGroupsResourceWithRawResponse,
+    AsyncUserGroupsResourceWithRawResponse,
+    UserGroupsResourceWithStreamingResponse,
+    AsyncUserGroupsResourceWithStreamingResponse,
+)
 from .resource_groups import (
     ResourceGroupsResource,
     AsyncResourceGroupsResource,
@@ -38,6 +54,18 @@
     "AsyncResourceGroupsResourceWithRawResponse",
     "ResourceGroupsResourceWithStreamingResponse",
     "AsyncResourceGroupsResourceWithStreamingResponse",
+    "UserGroupsResource",
+    "AsyncUserGroupsResource",
+    "UserGroupsResourceWithRawResponse",
+    "AsyncUserGroupsResourceWithRawResponse",
+    "UserGroupsResourceWithStreamingResponse",
+    "AsyncUserGroupsResourceWithStreamingResponse",
+    "SSOResource",
+    "AsyncSSOResource",
+    "SSOResourceWithRawResponse",
+    "AsyncSSOResourceWithRawResponse",
+    "SSOResourceWithStreamingResponse",
+    "AsyncSSOResourceWithStreamingResponse",
     "IAMResource",
     "AsyncIAMResource",
     "IAMResourceWithRawResponse",
diff --git a/src/cloudflare/resources/iam/iam.py b/src/cloudflare/resources/iam/iam.py
index c8dd72b1cdb..22d66c0c186 100644
--- a/src/cloudflare/resources/iam/iam.py
+++ b/src/cloudflare/resources/iam/iam.py
@@ -2,6 +2,14 @@
 
 from __future__ import annotations
 
+from .sso import (
+    SSOResource,
+    AsyncSSOResource,
+    SSOResourceWithRawResponse,
+    AsyncSSOResourceWithRawResponse,
+    SSOResourceWithStreamingResponse,
+    AsyncSSOResourceWithStreamingResponse,
+)
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from .resource_groups import (
@@ -20,6 +28,14 @@
     PermissionGroupsResourceWithStreamingResponse,
     AsyncPermissionGroupsResourceWithStreamingResponse,
 )
+from .user_groups.user_groups import (
+    UserGroupsResource,
+    AsyncUserGroupsResource,
+    UserGroupsResourceWithRawResponse,
+    AsyncUserGroupsResourceWithRawResponse,
+    UserGroupsResourceWithStreamingResponse,
+    AsyncUserGroupsResourceWithStreamingResponse,
+)
 
 __all__ = ["IAMResource", "AsyncIAMResource"]
 
@@ -33,12 +49,31 @@ def permission_groups(self) -> PermissionGroupsResource:
     def resource_groups(self) -> ResourceGroupsResource:
         return ResourceGroupsResource(self._client)
 
+    @cached_property
+    def user_groups(self) -> UserGroupsResource:
+        return UserGroupsResource(self._client)
+
+    @cached_property
+    def sso(self) -> SSOResource:
+        return SSOResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> IAMResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return IAMResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> IAMResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return IAMResourceWithStreamingResponse(self)
 
 
@@ -51,12 +86,31 @@ def permission_groups(self) -> AsyncPermissionGroupsResource:
     def resource_groups(self) -> AsyncResourceGroupsResource:
         return AsyncResourceGroupsResource(self._client)
 
+    @cached_property
+    def user_groups(self) -> AsyncUserGroupsResource:
+        return AsyncUserGroupsResource(self._client)
+
+    @cached_property
+    def sso(self) -> AsyncSSOResource:
+        return AsyncSSOResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncIAMResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncIAMResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncIAMResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncIAMResourceWithStreamingResponse(self)
 
 
@@ -72,6 +126,14 @@ def permission_groups(self) -> PermissionGroupsResourceWithRawResponse:
     def resource_groups(self) -> ResourceGroupsResourceWithRawResponse:
         return ResourceGroupsResourceWithRawResponse(self._iam.resource_groups)
 
+    @cached_property
+    def user_groups(self) -> UserGroupsResourceWithRawResponse:
+        return UserGroupsResourceWithRawResponse(self._iam.user_groups)
+
+    @cached_property
+    def sso(self) -> SSOResourceWithRawResponse:
+        return SSOResourceWithRawResponse(self._iam.sso)
+
 
 class AsyncIAMResourceWithRawResponse:
     def __init__(self, iam: AsyncIAMResource) -> None:
@@ -85,6 +147,14 @@ def permission_groups(self) -> AsyncPermissionGroupsResourceWithRawResponse:
     def resource_groups(self) -> AsyncResourceGroupsResourceWithRawResponse:
         return AsyncResourceGroupsResourceWithRawResponse(self._iam.resource_groups)
 
+    @cached_property
+    def user_groups(self) -> AsyncUserGroupsResourceWithRawResponse:
+        return AsyncUserGroupsResourceWithRawResponse(self._iam.user_groups)
+
+    @cached_property
+    def sso(self) -> AsyncSSOResourceWithRawResponse:
+        return AsyncSSOResourceWithRawResponse(self._iam.sso)
+
 
 class IAMResourceWithStreamingResponse:
     def __init__(self, iam: IAMResource) -> None:
@@ -98,6 +168,14 @@ def permission_groups(self) -> PermissionGroupsResourceWithStreamingResponse:
     def resource_groups(self) -> ResourceGroupsResourceWithStreamingResponse:
         return ResourceGroupsResourceWithStreamingResponse(self._iam.resource_groups)
 
+    @cached_property
+    def user_groups(self) -> UserGroupsResourceWithStreamingResponse:
+        return UserGroupsResourceWithStreamingResponse(self._iam.user_groups)
+
+    @cached_property
+    def sso(self) -> SSOResourceWithStreamingResponse:
+        return SSOResourceWithStreamingResponse(self._iam.sso)
+
 
 class AsyncIAMResourceWithStreamingResponse:
     def __init__(self, iam: AsyncIAMResource) -> None:
@@ -110,3 +188,11 @@ def permission_groups(self) -> AsyncPermissionGroupsResourceWithStreamingRespons
     @cached_property
     def resource_groups(self) -> AsyncResourceGroupsResourceWithStreamingResponse:
         return AsyncResourceGroupsResourceWithStreamingResponse(self._iam.resource_groups)
+
+    @cached_property
+    def user_groups(self) -> AsyncUserGroupsResourceWithStreamingResponse:
+        return AsyncUserGroupsResourceWithStreamingResponse(self._iam.user_groups)
+
+    @cached_property
+    def sso(self) -> AsyncSSOResourceWithStreamingResponse:
+        return AsyncSSOResourceWithStreamingResponse(self._iam.sso)
diff --git a/src/cloudflare/resources/iam/permission_groups.py b/src/cloudflare/resources/iam/permission_groups.py
index a73299d11ad..712f5d8da74 100644
--- a/src/cloudflare/resources/iam/permission_groups.py
+++ b/src/cloudflare/resources/iam/permission_groups.py
@@ -2,9 +2,11 @@
 
 from __future__ import annotations
 
+from typing import Type, Optional, cast
+
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
@@ -14,10 +16,12 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
+from ..._wrappers import ResultWrapper
 from ...types.iam import permission_group_list_params
 from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.iam.permission_group_get_response import PermissionGroupGetResponse
+from ...types.iam.permission_group_list_response import PermissionGroupListResponse
 
 __all__ = ["PermissionGroupsResource", "AsyncPermissionGroupsResource"]
 
@@ -25,28 +29,39 @@
 class PermissionGroupsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PermissionGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PermissionGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PermissionGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PermissionGroupsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        label: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        id: str | Omit = omit,
+        label: str | Omit = omit,
+        name: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePaginationArray[object]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[PermissionGroupListResponse]:
         """
         List all the permissions groups for an account.
 
@@ -75,7 +90,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/iam/permission_groups",
-            page=SyncV4PagePaginationArray[object],
+            page=SyncV4PagePaginationArray[PermissionGroupListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -92,7 +107,7 @@ def list(
                     permission_group_list_params.PermissionGroupListParams,
                 ),
             ),
-            model=object,
+            model=PermissionGroupListResponse,
         )
 
     def get(
@@ -105,8 +120,8 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PermissionGroupGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PermissionGroupGetResponse]:
         """
         Get information about a specific permission group in an account.
 
@@ -132,37 +147,52 @@ def get(
         return self._get(
             f"/accounts/{account_id}/iam/permission_groups/{permission_group_id}",
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PermissionGroupGetResponse]]._unwrapper,
             ),
-            cast_to=PermissionGroupGetResponse,
+            cast_to=cast(Type[Optional[PermissionGroupGetResponse]], ResultWrapper[PermissionGroupGetResponse]),
         )
 
 
 class AsyncPermissionGroupsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPermissionGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPermissionGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPermissionGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPermissionGroupsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        label: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        id: str | Omit = omit,
+        label: str | Omit = omit,
+        name: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[object, AsyncV4PagePaginationArray[object]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[PermissionGroupListResponse, AsyncV4PagePaginationArray[PermissionGroupListResponse]]:
         """
         List all the permissions groups for an account.
 
@@ -191,7 +221,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/iam/permission_groups",
-            page=AsyncV4PagePaginationArray[object],
+            page=AsyncV4PagePaginationArray[PermissionGroupListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -208,7 +238,7 @@ def list(
                     permission_group_list_params.PermissionGroupListParams,
                 ),
             ),
-            model=object,
+            model=PermissionGroupListResponse,
         )
 
     async def get(
@@ -221,8 +251,8 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PermissionGroupGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PermissionGroupGetResponse]:
         """
         Get information about a specific permission group in an account.
 
@@ -248,9 +278,13 @@ async def get(
         return await self._get(
             f"/accounts/{account_id}/iam/permission_groups/{permission_group_id}",
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PermissionGroupGetResponse]]._unwrapper,
             ),
-            cast_to=PermissionGroupGetResponse,
+            cast_to=cast(Type[Optional[PermissionGroupGetResponse]], ResultWrapper[PermissionGroupGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/iam/resource_groups.py b/src/cloudflare/resources/iam/resource_groups.py
index d31ccfb2bd4..c312bf952ec 100644
--- a/src/cloudflare/resources/iam/resource_groups.py
+++ b/src/cloudflare/resources/iam/resource_groups.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -21,9 +18,10 @@
 )
 from ..._wrappers import ResultWrapper
 from ...types.iam import resource_group_list_params, resource_group_create_params, resource_group_update_params
-from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...pagination import SyncSinglePage, AsyncSinglePage
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.iam.resource_group_get_response import ResourceGroupGetResponse
+from ...types.iam.resource_group_list_response import ResourceGroupListResponse
 from ...types.iam.resource_group_create_response import ResourceGroupCreateResponse
 from ...types.iam.resource_group_delete_response import ResourceGroupDeleteResponse
 from ...types.iam.resource_group_update_response import ResourceGroupUpdateResponse
@@ -34,34 +32,45 @@
 class ResourceGroupsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ResourceGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ResourceGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ResourceGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ResourceGroupsResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
+        name: str,
         scope: resource_group_create_params.Scope,
-        meta: object | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ResourceGroupCreateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceGroupCreateResponse]:
         """
         Create a new Resource Group under the specified account.
 
         Args:
           account_id: Account identifier tag.
 
-          scope: A scope is a combination of scope objects which provides additional context.
+          name: Name of the resource group
 
-          meta: Attributes associated to the resource group.
+          scope: A scope is a combination of scope objects which provides additional context.
 
           extra_headers: Send extra headers
 
@@ -77,15 +86,19 @@ def create(
             f"/accounts/{account_id}/iam/resource_groups",
             body=maybe_transform(
                 {
+                    "name": name,
                     "scope": scope,
-                    "meta": meta,
                 },
                 resource_group_create_params.ResourceGroupCreateParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceGroupCreateResponse]]._unwrapper,
             ),
-            cast_to=ResourceGroupCreateResponse,
+            cast_to=cast(Type[Optional[ResourceGroupCreateResponse]], ResultWrapper[ResourceGroupCreateResponse]),
         )
 
     def update(
@@ -93,15 +106,15 @@ def update(
         resource_group_id: str,
         *,
         account_id: str,
-        scope: resource_group_update_params.Scope,
-        meta: object | NotGiven = NOT_GIVEN,
+        name: str | Omit = omit,
+        scope: resource_group_update_params.Scope | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ResourceGroupUpdateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceGroupUpdateResponse]:
         """
         Modify an existing resource group.
 
@@ -110,9 +123,9 @@ def update(
 
           resource_group_id: Resource Group identifier tag.
 
-          scope: A scope is a combination of scope objects which provides additional context.
+          name: Name of the resource group
 
-          meta: Attributes associated to the resource group.
+          scope: A scope is a combination of scope objects which provides additional context.
 
           extra_headers: Send extra headers
 
@@ -130,32 +143,34 @@ def update(
             f"/accounts/{account_id}/iam/resource_groups/{resource_group_id}",
             body=maybe_transform(
                 {
+                    "name": name,
                     "scope": scope,
-                    "meta": meta,
                 },
                 resource_group_update_params.ResourceGroupUpdateParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceGroupUpdateResponse]]._unwrapper,
             ),
-            cast_to=ResourceGroupUpdateResponse,
+            cast_to=cast(Type[Optional[ResourceGroupUpdateResponse]], ResultWrapper[ResourceGroupUpdateResponse]),
         )
 
     def list(
         self,
         *,
         account_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        id: str | Omit = omit,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePaginationArray[object]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[ResourceGroupListResponse]:
         """
         List all the resource groups for an account.
 
@@ -166,10 +181,6 @@ def list(
 
           name: Name of the resource group to be fetched.
 
-          page: Page number of paginated results.
-
-          per_page: Maximum number of results per page.
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -182,7 +193,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/iam/resource_groups",
-            page=SyncV4PagePaginationArray[object],
+            page=SyncSinglePage[ResourceGroupListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -192,13 +203,11 @@ def list(
                     {
                         "id": id,
                         "name": name,
-                        "page": page,
-                        "per_page": per_page,
                     },
                     resource_group_list_params.ResourceGroupListParams,
                 ),
             ),
-            model=object,
+            model=ResourceGroupListResponse,
         )
 
     def delete(
@@ -211,7 +220,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ResourceGroupDeleteResponse]:
         """
         Remove a resource group from an account.
@@ -255,8 +264,8 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ResourceGroupGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceGroupGetResponse]:
         """
         Get information about a specific resource group in an account.
 
@@ -280,43 +289,58 @@ def get(
         return self._get(
             f"/accounts/{account_id}/iam/resource_groups/{resource_group_id}",
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceGroupGetResponse]]._unwrapper,
             ),
-            cast_to=ResourceGroupGetResponse,
+            cast_to=cast(Type[Optional[ResourceGroupGetResponse]], ResultWrapper[ResourceGroupGetResponse]),
         )
 
 
 class AsyncResourceGroupsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncResourceGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncResourceGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncResourceGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncResourceGroupsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
+        name: str,
         scope: resource_group_create_params.Scope,
-        meta: object | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ResourceGroupCreateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceGroupCreateResponse]:
         """
         Create a new Resource Group under the specified account.
 
         Args:
           account_id: Account identifier tag.
 
-          scope: A scope is a combination of scope objects which provides additional context.
+          name: Name of the resource group
 
-          meta: Attributes associated to the resource group.
+          scope: A scope is a combination of scope objects which provides additional context.
 
           extra_headers: Send extra headers
 
@@ -332,15 +356,19 @@ async def create(
             f"/accounts/{account_id}/iam/resource_groups",
             body=await async_maybe_transform(
                 {
+                    "name": name,
                     "scope": scope,
-                    "meta": meta,
                 },
                 resource_group_create_params.ResourceGroupCreateParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceGroupCreateResponse]]._unwrapper,
             ),
-            cast_to=ResourceGroupCreateResponse,
+            cast_to=cast(Type[Optional[ResourceGroupCreateResponse]], ResultWrapper[ResourceGroupCreateResponse]),
         )
 
     async def update(
@@ -348,15 +376,15 @@ async def update(
         resource_group_id: str,
         *,
         account_id: str,
-        scope: resource_group_update_params.Scope,
-        meta: object | NotGiven = NOT_GIVEN,
+        name: str | Omit = omit,
+        scope: resource_group_update_params.Scope | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ResourceGroupUpdateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceGroupUpdateResponse]:
         """
         Modify an existing resource group.
 
@@ -365,9 +393,9 @@ async def update(
 
           resource_group_id: Resource Group identifier tag.
 
-          scope: A scope is a combination of scope objects which provides additional context.
+          name: Name of the resource group
 
-          meta: Attributes associated to the resource group.
+          scope: A scope is a combination of scope objects which provides additional context.
 
           extra_headers: Send extra headers
 
@@ -385,32 +413,34 @@ async def update(
             f"/accounts/{account_id}/iam/resource_groups/{resource_group_id}",
             body=await async_maybe_transform(
                 {
+                    "name": name,
                     "scope": scope,
-                    "meta": meta,
                 },
                 resource_group_update_params.ResourceGroupUpdateParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceGroupUpdateResponse]]._unwrapper,
             ),
-            cast_to=ResourceGroupUpdateResponse,
+            cast_to=cast(Type[Optional[ResourceGroupUpdateResponse]], ResultWrapper[ResourceGroupUpdateResponse]),
         )
 
     def list(
         self,
         *,
         account_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        id: str | Omit = omit,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[object, AsyncV4PagePaginationArray[object]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ResourceGroupListResponse, AsyncSinglePage[ResourceGroupListResponse]]:
         """
         List all the resource groups for an account.
 
@@ -421,10 +451,6 @@ def list(
 
           name: Name of the resource group to be fetched.
 
-          page: Page number of paginated results.
-
-          per_page: Maximum number of results per page.
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -437,7 +463,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/iam/resource_groups",
-            page=AsyncV4PagePaginationArray[object],
+            page=AsyncSinglePage[ResourceGroupListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -447,13 +473,11 @@ def list(
                     {
                         "id": id,
                         "name": name,
-                        "page": page,
-                        "per_page": per_page,
                     },
                     resource_group_list_params.ResourceGroupListParams,
                 ),
             ),
-            model=object,
+            model=ResourceGroupListResponse,
         )
 
     async def delete(
@@ -466,7 +490,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ResourceGroupDeleteResponse]:
         """
         Remove a resource group from an account.
@@ -510,8 +534,8 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ResourceGroupGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceGroupGetResponse]:
         """
         Get information about a specific resource group in an account.
 
@@ -535,9 +559,13 @@ async def get(
         return await self._get(
             f"/accounts/{account_id}/iam/resource_groups/{resource_group_id}",
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceGroupGetResponse]]._unwrapper,
             ),
-            cast_to=ResourceGroupGetResponse,
+            cast_to=cast(Type[Optional[ResourceGroupGetResponse]], ResultWrapper[ResourceGroupGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/iam/sso.py b/src/cloudflare/resources/iam/sso.py
new file mode 100644
index 00000000000..3903e7639b5
--- /dev/null
+++ b/src/cloudflare/resources/iam/sso.py
@@ -0,0 +1,722 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...types.iam import sso_create_params, sso_update_params
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.iam.sso_get_response import SSOGetResponse
+from ...types.iam.sso_list_response import SSOListResponse
+from ...types.iam.sso_create_response import SSOCreateResponse
+from ...types.iam.sso_delete_response import SSODeleteResponse
+from ...types.iam.sso_update_response import SSOUpdateResponse
+from ...types.iam.sso_begin_verification_response import SSOBeginVerificationResponse
+
+__all__ = ["SSOResource", "AsyncSSOResource"]
+
+
+class SSOResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SSOResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SSOResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SSOResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SSOResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        email_domain: str,
+        begin_verification: bool | Omit = omit,
+        use_fedramp_language: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SSOCreateResponse]:
+        """
+        Initialize new SSO connector
+
+        Args:
+          account_id: Account identifier tag.
+
+          email_domain: Email domain of the new SSO connector
+
+          begin_verification: Begin the verification process after creation
+
+          use_fedramp_language: Controls the display of FedRAMP language to the user during SSO login
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/sso_connectors",
+            body=maybe_transform(
+                {
+                    "email_domain": email_domain,
+                    "begin_verification": begin_verification,
+                    "use_fedramp_language": use_fedramp_language,
+                },
+                sso_create_params.SSOCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SSOCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SSOCreateResponse]], ResultWrapper[SSOCreateResponse]),
+        )
+
+    def update(
+        self,
+        sso_connector_id: str,
+        *,
+        account_id: str,
+        enabled: bool | Omit = omit,
+        use_fedramp_language: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SSOUpdateResponse]:
+        """
+        Update SSO connector state
+
+        Args:
+          account_id: Account identifier tag.
+
+          sso_connector_id: SSO Connector identifier tag.
+
+          enabled: SSO Connector enabled state
+
+          use_fedramp_language: Controls the display of FedRAMP language to the user during SSO login
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sso_connector_id:
+            raise ValueError(f"Expected a non-empty value for `sso_connector_id` but received {sso_connector_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/sso_connectors/{sso_connector_id}",
+            body=maybe_transform(
+                {
+                    "enabled": enabled,
+                    "use_fedramp_language": use_fedramp_language,
+                },
+                sso_update_params.SSOUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SSOUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SSOUpdateResponse]], ResultWrapper[SSOUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[SSOListResponse]:
+        """
+        Get all SSO connectors
+
+        Args:
+          account_id: Account identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/sso_connectors",
+            page=SyncSinglePage[SSOListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=SSOListResponse,
+        )
+
+    def delete(
+        self,
+        sso_connector_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SSODeleteResponse]:
+        """
+        Delete SSO connector
+
+        Args:
+          account_id: Account identifier tag.
+
+          sso_connector_id: SSO Connector identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sso_connector_id:
+            raise ValueError(f"Expected a non-empty value for `sso_connector_id` but received {sso_connector_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/sso_connectors/{sso_connector_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SSODeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SSODeleteResponse]], ResultWrapper[SSODeleteResponse]),
+        )
+
+    def begin_verification(
+        self,
+        sso_connector_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SSOBeginVerificationResponse:
+        """
+        Begin SSO connector verification
+
+        Args:
+          account_id: Account identifier tag.
+
+          sso_connector_id: SSO Connector identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sso_connector_id:
+            raise ValueError(f"Expected a non-empty value for `sso_connector_id` but received {sso_connector_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/sso_connectors/{sso_connector_id}/begin_verification",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SSOBeginVerificationResponse,
+        )
+
+    def get(
+        self,
+        sso_connector_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SSOGetResponse]:
+        """
+        Get single SSO connector
+
+        Args:
+          account_id: Account identifier tag.
+
+          sso_connector_id: SSO Connector identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sso_connector_id:
+            raise ValueError(f"Expected a non-empty value for `sso_connector_id` but received {sso_connector_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/sso_connectors/{sso_connector_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SSOGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SSOGetResponse]], ResultWrapper[SSOGetResponse]),
+        )
+
+
+class AsyncSSOResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSSOResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSSOResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSSOResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSSOResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        email_domain: str,
+        begin_verification: bool | Omit = omit,
+        use_fedramp_language: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SSOCreateResponse]:
+        """
+        Initialize new SSO connector
+
+        Args:
+          account_id: Account identifier tag.
+
+          email_domain: Email domain of the new SSO connector
+
+          begin_verification: Begin the verification process after creation
+
+          use_fedramp_language: Controls the display of FedRAMP language to the user during SSO login
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/sso_connectors",
+            body=await async_maybe_transform(
+                {
+                    "email_domain": email_domain,
+                    "begin_verification": begin_verification,
+                    "use_fedramp_language": use_fedramp_language,
+                },
+                sso_create_params.SSOCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SSOCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SSOCreateResponse]], ResultWrapper[SSOCreateResponse]),
+        )
+
+    async def update(
+        self,
+        sso_connector_id: str,
+        *,
+        account_id: str,
+        enabled: bool | Omit = omit,
+        use_fedramp_language: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SSOUpdateResponse]:
+        """
+        Update SSO connector state
+
+        Args:
+          account_id: Account identifier tag.
+
+          sso_connector_id: SSO Connector identifier tag.
+
+          enabled: SSO Connector enabled state
+
+          use_fedramp_language: Controls the display of FedRAMP language to the user during SSO login
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sso_connector_id:
+            raise ValueError(f"Expected a non-empty value for `sso_connector_id` but received {sso_connector_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/sso_connectors/{sso_connector_id}",
+            body=await async_maybe_transform(
+                {
+                    "enabled": enabled,
+                    "use_fedramp_language": use_fedramp_language,
+                },
+                sso_update_params.SSOUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SSOUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SSOUpdateResponse]], ResultWrapper[SSOUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SSOListResponse, AsyncSinglePage[SSOListResponse]]:
+        """
+        Get all SSO connectors
+
+        Args:
+          account_id: Account identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/sso_connectors",
+            page=AsyncSinglePage[SSOListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=SSOListResponse,
+        )
+
+    async def delete(
+        self,
+        sso_connector_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SSODeleteResponse]:
+        """
+        Delete SSO connector
+
+        Args:
+          account_id: Account identifier tag.
+
+          sso_connector_id: SSO Connector identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sso_connector_id:
+            raise ValueError(f"Expected a non-empty value for `sso_connector_id` but received {sso_connector_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/sso_connectors/{sso_connector_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SSODeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SSODeleteResponse]], ResultWrapper[SSODeleteResponse]),
+        )
+
+    async def begin_verification(
+        self,
+        sso_connector_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SSOBeginVerificationResponse:
+        """
+        Begin SSO connector verification
+
+        Args:
+          account_id: Account identifier tag.
+
+          sso_connector_id: SSO Connector identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sso_connector_id:
+            raise ValueError(f"Expected a non-empty value for `sso_connector_id` but received {sso_connector_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/sso_connectors/{sso_connector_id}/begin_verification",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SSOBeginVerificationResponse,
+        )
+
+    async def get(
+        self,
+        sso_connector_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SSOGetResponse]:
+        """
+        Get single SSO connector
+
+        Args:
+          account_id: Account identifier tag.
+
+          sso_connector_id: SSO Connector identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sso_connector_id:
+            raise ValueError(f"Expected a non-empty value for `sso_connector_id` but received {sso_connector_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/sso_connectors/{sso_connector_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SSOGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SSOGetResponse]], ResultWrapper[SSOGetResponse]),
+        )
+
+
+class SSOResourceWithRawResponse:
+    def __init__(self, sso: SSOResource) -> None:
+        self._sso = sso
+
+        self.create = to_raw_response_wrapper(
+            sso.create,
+        )
+        self.update = to_raw_response_wrapper(
+            sso.update,
+        )
+        self.list = to_raw_response_wrapper(
+            sso.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            sso.delete,
+        )
+        self.begin_verification = to_raw_response_wrapper(
+            sso.begin_verification,
+        )
+        self.get = to_raw_response_wrapper(
+            sso.get,
+        )
+
+
+class AsyncSSOResourceWithRawResponse:
+    def __init__(self, sso: AsyncSSOResource) -> None:
+        self._sso = sso
+
+        self.create = async_to_raw_response_wrapper(
+            sso.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            sso.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            sso.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            sso.delete,
+        )
+        self.begin_verification = async_to_raw_response_wrapper(
+            sso.begin_verification,
+        )
+        self.get = async_to_raw_response_wrapper(
+            sso.get,
+        )
+
+
+class SSOResourceWithStreamingResponse:
+    def __init__(self, sso: SSOResource) -> None:
+        self._sso = sso
+
+        self.create = to_streamed_response_wrapper(
+            sso.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            sso.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            sso.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            sso.delete,
+        )
+        self.begin_verification = to_streamed_response_wrapper(
+            sso.begin_verification,
+        )
+        self.get = to_streamed_response_wrapper(
+            sso.get,
+        )
+
+
+class AsyncSSOResourceWithStreamingResponse:
+    def __init__(self, sso: AsyncSSOResource) -> None:
+        self._sso = sso
+
+        self.create = async_to_streamed_response_wrapper(
+            sso.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            sso.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            sso.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            sso.delete,
+        )
+        self.begin_verification = async_to_streamed_response_wrapper(
+            sso.begin_verification,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            sso.get,
+        )
diff --git a/src/cloudflare/resources/iam/user_groups/__init__.py b/src/cloudflare/resources/iam/user_groups/__init__.py
new file mode 100644
index 00000000000..7d2d6fac17b
--- /dev/null
+++ b/src/cloudflare/resources/iam/user_groups/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .members import (
+    MembersResource,
+    AsyncMembersResource,
+    MembersResourceWithRawResponse,
+    AsyncMembersResourceWithRawResponse,
+    MembersResourceWithStreamingResponse,
+    AsyncMembersResourceWithStreamingResponse,
+)
+from .user_groups import (
+    UserGroupsResource,
+    AsyncUserGroupsResource,
+    UserGroupsResourceWithRawResponse,
+    AsyncUserGroupsResourceWithRawResponse,
+    UserGroupsResourceWithStreamingResponse,
+    AsyncUserGroupsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "MembersResource",
+    "AsyncMembersResource",
+    "MembersResourceWithRawResponse",
+    "AsyncMembersResourceWithRawResponse",
+    "MembersResourceWithStreamingResponse",
+    "AsyncMembersResourceWithStreamingResponse",
+    "UserGroupsResource",
+    "AsyncUserGroupsResource",
+    "UserGroupsResourceWithRawResponse",
+    "AsyncUserGroupsResourceWithRawResponse",
+    "UserGroupsResourceWithStreamingResponse",
+    "AsyncUserGroupsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/iam/user_groups/members.py b/src/cloudflare/resources/iam/user_groups/members.py
new file mode 100644
index 00000000000..b7241b5c2c9
--- /dev/null
+++ b/src/cloudflare/resources/iam/user_groups/members.py
@@ -0,0 +1,538 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, Optional, cast
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.iam.user_groups import member_list_params, member_create_params, member_update_params
+from ....types.iam.user_groups.member_list_response import MemberListResponse
+from ....types.iam.user_groups.member_create_response import MemberCreateResponse
+from ....types.iam.user_groups.member_delete_response import MemberDeleteResponse
+from ....types.iam.user_groups.member_update_response import MemberUpdateResponse
+
+__all__ = ["MembersResource", "AsyncMembersResource"]
+
+
+class MembersResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> MembersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return MembersResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> MembersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return MembersResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        user_group_id: str,
+        *,
+        account_id: str,
+        body: Iterable[member_create_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[MemberCreateResponse]:
+        """
+        Add members to a User Group.
+
+        Args:
+          account_id: Account identifier tag.
+
+          user_group_id: User Group identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not user_group_id:
+            raise ValueError(f"Expected a non-empty value for `user_group_id` but received {user_group_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/iam/user_groups/{user_group_id}/members",
+            body=maybe_transform(body, Iterable[member_create_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[MemberCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[MemberCreateResponse]], ResultWrapper[MemberCreateResponse]),
+        )
+
+    def update(
+        self,
+        user_group_id: str,
+        *,
+        account_id: str,
+        body: Iterable[member_update_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[MemberUpdateResponse]:
+        """
+        Replace the set of members attached to a User Group.
+
+        Args:
+          account_id: Account identifier tag.
+
+          user_group_id: User Group identifier tag.
+
+          body: Set/Replace members to a user group.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not user_group_id:
+            raise ValueError(f"Expected a non-empty value for `user_group_id` but received {user_group_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/iam/user_groups/{user_group_id}/members",
+            page=SyncSinglePage[MemberUpdateResponse],
+            body=maybe_transform(body, Iterable[member_update_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=MemberUpdateResponse,
+            method="put",
+        )
+
+    def list(
+        self,
+        user_group_id: str,
+        *,
+        account_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[MemberListResponse]:
+        """
+        List all the members attached to a user group.
+
+        Args:
+          account_id: Account identifier tag.
+
+          user_group_id: User Group identifier tag.
+
+          page: Page number of paginated results.
+
+          per_page: Maximum number of results per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not user_group_id:
+            raise ValueError(f"Expected a non-empty value for `user_group_id` but received {user_group_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/iam/user_groups/{user_group_id}/members",
+            page=SyncV4PagePaginationArray[MemberListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    member_list_params.MemberListParams,
+                ),
+            ),
+            model=MemberListResponse,
+        )
+
+    def delete(
+        self,
+        member_id: str,
+        *,
+        account_id: str,
+        user_group_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[MemberDeleteResponse]:
+        """
+        Remove a member from User Group
+
+        Args:
+          account_id: Account identifier tag.
+
+          user_group_id: User Group identifier tag.
+
+          member_id: The identifier of an existing account Member.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not user_group_id:
+            raise ValueError(f"Expected a non-empty value for `user_group_id` but received {user_group_id!r}")
+        if not member_id:
+            raise ValueError(f"Expected a non-empty value for `member_id` but received {member_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/iam/user_groups/{user_group_id}/members/{member_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[MemberDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[MemberDeleteResponse]], ResultWrapper[MemberDeleteResponse]),
+        )
+
+
+class AsyncMembersResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncMembersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncMembersResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncMembersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncMembersResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        user_group_id: str,
+        *,
+        account_id: str,
+        body: Iterable[member_create_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[MemberCreateResponse]:
+        """
+        Add members to a User Group.
+
+        Args:
+          account_id: Account identifier tag.
+
+          user_group_id: User Group identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not user_group_id:
+            raise ValueError(f"Expected a non-empty value for `user_group_id` but received {user_group_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/iam/user_groups/{user_group_id}/members",
+            body=await async_maybe_transform(body, Iterable[member_create_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[MemberCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[MemberCreateResponse]], ResultWrapper[MemberCreateResponse]),
+        )
+
+    def update(
+        self,
+        user_group_id: str,
+        *,
+        account_id: str,
+        body: Iterable[member_update_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[MemberUpdateResponse, AsyncSinglePage[MemberUpdateResponse]]:
+        """
+        Replace the set of members attached to a User Group.
+
+        Args:
+          account_id: Account identifier tag.
+
+          user_group_id: User Group identifier tag.
+
+          body: Set/Replace members to a user group.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not user_group_id:
+            raise ValueError(f"Expected a non-empty value for `user_group_id` but received {user_group_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/iam/user_groups/{user_group_id}/members",
+            page=AsyncSinglePage[MemberUpdateResponse],
+            body=maybe_transform(body, Iterable[member_update_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=MemberUpdateResponse,
+            method="put",
+        )
+
+    def list(
+        self,
+        user_group_id: str,
+        *,
+        account_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[MemberListResponse, AsyncV4PagePaginationArray[MemberListResponse]]:
+        """
+        List all the members attached to a user group.
+
+        Args:
+          account_id: Account identifier tag.
+
+          user_group_id: User Group identifier tag.
+
+          page: Page number of paginated results.
+
+          per_page: Maximum number of results per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not user_group_id:
+            raise ValueError(f"Expected a non-empty value for `user_group_id` but received {user_group_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/iam/user_groups/{user_group_id}/members",
+            page=AsyncV4PagePaginationArray[MemberListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    member_list_params.MemberListParams,
+                ),
+            ),
+            model=MemberListResponse,
+        )
+
+    async def delete(
+        self,
+        member_id: str,
+        *,
+        account_id: str,
+        user_group_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[MemberDeleteResponse]:
+        """
+        Remove a member from User Group
+
+        Args:
+          account_id: Account identifier tag.
+
+          user_group_id: User Group identifier tag.
+
+          member_id: The identifier of an existing account Member.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not user_group_id:
+            raise ValueError(f"Expected a non-empty value for `user_group_id` but received {user_group_id!r}")
+        if not member_id:
+            raise ValueError(f"Expected a non-empty value for `member_id` but received {member_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/iam/user_groups/{user_group_id}/members/{member_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[MemberDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[MemberDeleteResponse]], ResultWrapper[MemberDeleteResponse]),
+        )
+
+
+class MembersResourceWithRawResponse:
+    def __init__(self, members: MembersResource) -> None:
+        self._members = members
+
+        self.create = to_raw_response_wrapper(
+            members.create,
+        )
+        self.update = to_raw_response_wrapper(
+            members.update,
+        )
+        self.list = to_raw_response_wrapper(
+            members.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            members.delete,
+        )
+
+
+class AsyncMembersResourceWithRawResponse:
+    def __init__(self, members: AsyncMembersResource) -> None:
+        self._members = members
+
+        self.create = async_to_raw_response_wrapper(
+            members.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            members.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            members.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            members.delete,
+        )
+
+
+class MembersResourceWithStreamingResponse:
+    def __init__(self, members: MembersResource) -> None:
+        self._members = members
+
+        self.create = to_streamed_response_wrapper(
+            members.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            members.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            members.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            members.delete,
+        )
+
+
+class AsyncMembersResourceWithStreamingResponse:
+    def __init__(self, members: AsyncMembersResource) -> None:
+        self._members = members
+
+        self.create = async_to_streamed_response_wrapper(
+            members.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            members.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            members.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            members.delete,
+        )
diff --git a/src/cloudflare/resources/iam/user_groups/user_groups.py b/src/cloudflare/resources/iam/user_groups/user_groups.py
new file mode 100644
index 00000000000..d42f7d28b55
--- /dev/null
+++ b/src/cloudflare/resources/iam/user_groups/user_groups.py
@@ -0,0 +1,719 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, Optional, cast
+
+import httpx
+
+from .members import (
+    MembersResource,
+    AsyncMembersResource,
+    MembersResourceWithRawResponse,
+    AsyncMembersResourceWithRawResponse,
+    MembersResourceWithStreamingResponse,
+    AsyncMembersResourceWithStreamingResponse,
+)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....types.iam import user_group_list_params, user_group_create_params, user_group_update_params
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.iam.user_group_get_response import UserGroupGetResponse
+from ....types.iam.user_group_list_response import UserGroupListResponse
+from ....types.iam.user_group_create_response import UserGroupCreateResponse
+from ....types.iam.user_group_delete_response import UserGroupDeleteResponse
+from ....types.iam.user_group_update_response import UserGroupUpdateResponse
+
+__all__ = ["UserGroupsResource", "AsyncUserGroupsResource"]
+
+
+class UserGroupsResource(SyncAPIResource):
+    @cached_property
+    def members(self) -> MembersResource:
+        return MembersResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> UserGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return UserGroupsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> UserGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return UserGroupsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        policies: Iterable[user_group_create_params.Policy],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UserGroupCreateResponse]:
+        """
+        Create a new user group under the specified account.
+
+        Args:
+          account_id: Account identifier tag.
+
+          name: Name of the User group.
+
+          policies: Policies attached to the User group
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/iam/user_groups",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "policies": policies,
+                },
+                user_group_create_params.UserGroupCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[UserGroupCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[UserGroupCreateResponse]], ResultWrapper[UserGroupCreateResponse]),
+        )
+
+    def update(
+        self,
+        user_group_id: str,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        policies: Iterable[user_group_update_params.Policy] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UserGroupUpdateResponse]:
+        """
+        Modify an existing user group.
+
+        Args:
+          account_id: Account identifier tag.
+
+          user_group_id: User Group identifier tag.
+
+          name: Name of the User group.
+
+          policies: Policies attached to the User group
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not user_group_id:
+            raise ValueError(f"Expected a non-empty value for `user_group_id` but received {user_group_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/iam/user_groups/{user_group_id}",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "policies": policies,
+                },
+                user_group_update_params.UserGroupUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[UserGroupUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[UserGroupUpdateResponse]], ResultWrapper[UserGroupUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        id: str | Omit = omit,
+        direction: str | Omit = omit,
+        fuzzy_name: str | Omit = omit,
+        name: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[UserGroupListResponse]:
+        """
+        List all the user groups for an account.
+
+        Args:
+          account_id: Account identifier tag.
+
+          id: ID of the user group to be fetched.
+
+          direction: The sort order of returned user groups by name. Default sort order is ascending.
+              To switch to descending, set this parameter to "desc"
+
+          fuzzy_name: A string used for searching for user groups containing that substring.
+
+          name: Name of the user group to be fetched.
+
+          page: Page number of paginated results.
+
+          per_page: Maximum number of results per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/iam/user_groups",
+            page=SyncV4PagePaginationArray[UserGroupListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "id": id,
+                        "direction": direction,
+                        "fuzzy_name": fuzzy_name,
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    user_group_list_params.UserGroupListParams,
+                ),
+            ),
+            model=UserGroupListResponse,
+        )
+
+    def delete(
+        self,
+        user_group_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UserGroupDeleteResponse]:
+        """
+        Remove a user group from an account.
+
+        Args:
+          account_id: Account identifier tag.
+
+          user_group_id: User Group identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not user_group_id:
+            raise ValueError(f"Expected a non-empty value for `user_group_id` but received {user_group_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/iam/user_groups/{user_group_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[UserGroupDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[UserGroupDeleteResponse]], ResultWrapper[UserGroupDeleteResponse]),
+        )
+
+    def get(
+        self,
+        user_group_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UserGroupGetResponse]:
+        """
+        Get information about a specific user group in an account.
+
+        Args:
+          account_id: Account identifier tag.
+
+          user_group_id: User Group identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not user_group_id:
+            raise ValueError(f"Expected a non-empty value for `user_group_id` but received {user_group_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/iam/user_groups/{user_group_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[UserGroupGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[UserGroupGetResponse]], ResultWrapper[UserGroupGetResponse]),
+        )
+
+
+class AsyncUserGroupsResource(AsyncAPIResource):
+    @cached_property
+    def members(self) -> AsyncMembersResource:
+        return AsyncMembersResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncUserGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncUserGroupsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncUserGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncUserGroupsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        policies: Iterable[user_group_create_params.Policy],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UserGroupCreateResponse]:
+        """
+        Create a new user group under the specified account.
+
+        Args:
+          account_id: Account identifier tag.
+
+          name: Name of the User group.
+
+          policies: Policies attached to the User group
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/iam/user_groups",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "policies": policies,
+                },
+                user_group_create_params.UserGroupCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[UserGroupCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[UserGroupCreateResponse]], ResultWrapper[UserGroupCreateResponse]),
+        )
+
+    async def update(
+        self,
+        user_group_id: str,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        policies: Iterable[user_group_update_params.Policy] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UserGroupUpdateResponse]:
+        """
+        Modify an existing user group.
+
+        Args:
+          account_id: Account identifier tag.
+
+          user_group_id: User Group identifier tag.
+
+          name: Name of the User group.
+
+          policies: Policies attached to the User group
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not user_group_id:
+            raise ValueError(f"Expected a non-empty value for `user_group_id` but received {user_group_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/iam/user_groups/{user_group_id}",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "policies": policies,
+                },
+                user_group_update_params.UserGroupUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[UserGroupUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[UserGroupUpdateResponse]], ResultWrapper[UserGroupUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        id: str | Omit = omit,
+        direction: str | Omit = omit,
+        fuzzy_name: str | Omit = omit,
+        name: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[UserGroupListResponse, AsyncV4PagePaginationArray[UserGroupListResponse]]:
+        """
+        List all the user groups for an account.
+
+        Args:
+          account_id: Account identifier tag.
+
+          id: ID of the user group to be fetched.
+
+          direction: The sort order of returned user groups by name. Default sort order is ascending.
+              To switch to descending, set this parameter to "desc"
+
+          fuzzy_name: A string used for searching for user groups containing that substring.
+
+          name: Name of the user group to be fetched.
+
+          page: Page number of paginated results.
+
+          per_page: Maximum number of results per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/iam/user_groups",
+            page=AsyncV4PagePaginationArray[UserGroupListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "id": id,
+                        "direction": direction,
+                        "fuzzy_name": fuzzy_name,
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    user_group_list_params.UserGroupListParams,
+                ),
+            ),
+            model=UserGroupListResponse,
+        )
+
+    async def delete(
+        self,
+        user_group_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UserGroupDeleteResponse]:
+        """
+        Remove a user group from an account.
+
+        Args:
+          account_id: Account identifier tag.
+
+          user_group_id: User Group identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not user_group_id:
+            raise ValueError(f"Expected a non-empty value for `user_group_id` but received {user_group_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/iam/user_groups/{user_group_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[UserGroupDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[UserGroupDeleteResponse]], ResultWrapper[UserGroupDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        user_group_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UserGroupGetResponse]:
+        """
+        Get information about a specific user group in an account.
+
+        Args:
+          account_id: Account identifier tag.
+
+          user_group_id: User Group identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not user_group_id:
+            raise ValueError(f"Expected a non-empty value for `user_group_id` but received {user_group_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/iam/user_groups/{user_group_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[UserGroupGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[UserGroupGetResponse]], ResultWrapper[UserGroupGetResponse]),
+        )
+
+
+class UserGroupsResourceWithRawResponse:
+    def __init__(self, user_groups: UserGroupsResource) -> None:
+        self._user_groups = user_groups
+
+        self.create = to_raw_response_wrapper(
+            user_groups.create,
+        )
+        self.update = to_raw_response_wrapper(
+            user_groups.update,
+        )
+        self.list = to_raw_response_wrapper(
+            user_groups.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            user_groups.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            user_groups.get,
+        )
+
+    @cached_property
+    def members(self) -> MembersResourceWithRawResponse:
+        return MembersResourceWithRawResponse(self._user_groups.members)
+
+
+class AsyncUserGroupsResourceWithRawResponse:
+    def __init__(self, user_groups: AsyncUserGroupsResource) -> None:
+        self._user_groups = user_groups
+
+        self.create = async_to_raw_response_wrapper(
+            user_groups.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            user_groups.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            user_groups.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            user_groups.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            user_groups.get,
+        )
+
+    @cached_property
+    def members(self) -> AsyncMembersResourceWithRawResponse:
+        return AsyncMembersResourceWithRawResponse(self._user_groups.members)
+
+
+class UserGroupsResourceWithStreamingResponse:
+    def __init__(self, user_groups: UserGroupsResource) -> None:
+        self._user_groups = user_groups
+
+        self.create = to_streamed_response_wrapper(
+            user_groups.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            user_groups.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            user_groups.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            user_groups.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            user_groups.get,
+        )
+
+    @cached_property
+    def members(self) -> MembersResourceWithStreamingResponse:
+        return MembersResourceWithStreamingResponse(self._user_groups.members)
+
+
+class AsyncUserGroupsResourceWithStreamingResponse:
+    def __init__(self, user_groups: AsyncUserGroupsResource) -> None:
+        self._user_groups = user_groups
+
+        self.create = async_to_streamed_response_wrapper(
+            user_groups.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            user_groups.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            user_groups.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            user_groups.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            user_groups.get,
+        )
+
+    @cached_property
+    def members(self) -> AsyncMembersResourceWithStreamingResponse:
+        return AsyncMembersResourceWithStreamingResponse(self._user_groups.members)
diff --git a/src/cloudflare/resources/images/images.py b/src/cloudflare/resources/images/images.py
index 211ccd371e1..89e40405f5b 100644
--- a/src/cloudflare/resources/images/images.py
+++ b/src/cloudflare/resources/images/images.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from .v1 import (
+from .v1.v1 import (
     V1Resource,
     AsyncV1Resource,
     V1ResourceWithRawResponse,
@@ -10,7 +10,7 @@
     V1ResourceWithStreamingResponse,
     AsyncV1ResourceWithStreamingResponse,
 )
-from .v2 import (
+from .v2.v2 import (
     V2Resource,
     AsyncV2Resource,
     V2ResourceWithRawResponse,
@@ -18,8 +18,6 @@
     V2ResourceWithStreamingResponse,
     AsyncV2ResourceWithStreamingResponse,
 )
-from .v1.v1 import V1Resource, AsyncV1Resource
-from .v2.v2 import V2Resource, AsyncV2Resource
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 
@@ -37,10 +35,21 @@ def v2(self) -> V2Resource:
 
     @cached_property
     def with_raw_response(self) -> ImagesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ImagesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ImagesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ImagesResourceWithStreamingResponse(self)
 
 
@@ -55,10 +64,21 @@ def v2(self) -> AsyncV2Resource:
 
     @cached_property
     def with_raw_response(self) -> AsyncImagesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncImagesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncImagesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncImagesResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/images/v1/blobs.py b/src/cloudflare/resources/images/v1/blobs.py
index d8e492724aa..31ce1c36469 100644
--- a/src/cloudflare/resources/images/v1/blobs.py
+++ b/src/cloudflare/resources/images/v1/blobs.py
@@ -4,7 +4,7 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -25,10 +25,21 @@
 class BlobsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> BlobsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return BlobsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> BlobsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return BlobsResourceWithStreamingResponse(self)
 
     def get(
@@ -41,7 +52,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> BinaryAPIResponse:
         """Fetch base image.
 
@@ -78,10 +89,21 @@ def get(
 class AsyncBlobsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncBlobsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncBlobsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncBlobsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncBlobsResourceWithStreamingResponse(self)
 
     async def get(
@@ -94,7 +116,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncBinaryAPIResponse:
         """Fetch base image.
 
diff --git a/src/cloudflare/resources/images/v1/keys.py b/src/cloudflare/resources/images/v1/keys.py
index fb2704fbcf5..e90c7efde18 100644
--- a/src/cloudflare/resources/images/v1/keys.py
+++ b/src/cloudflare/resources/images/v1/keys.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -27,10 +27,21 @@
 class KeysResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> KeysResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return KeysResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> KeysResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return KeysResourceWithStreamingResponse(self)
 
     def update(
@@ -43,7 +54,7 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> KeyUpdateResponse:
         """Create a new signing key with specified name.
 
@@ -85,7 +96,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> KeyListResponse:
         """Lists your signing keys.
 
@@ -126,7 +137,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> KeyDeleteResponse:
         """Delete signing key with specified name.
 
@@ -164,10 +175,21 @@ def delete(
 class AsyncKeysResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncKeysResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncKeysResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncKeysResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncKeysResourceWithStreamingResponse(self)
 
     async def update(
@@ -180,7 +202,7 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> KeyUpdateResponse:
         """Create a new signing key with specified name.
 
@@ -222,7 +244,7 @@ async def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> KeyListResponse:
         """Lists your signing keys.
 
@@ -263,7 +285,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> KeyDeleteResponse:
         """Delete signing key with specified name.
 
diff --git a/src/cloudflare/resources/images/v1/stats.py b/src/cloudflare/resources/images/v1/stats.py
index bff97af42d4..48a656e33fa 100644
--- a/src/cloudflare/resources/images/v1/stats.py
+++ b/src/cloudflare/resources/images/v1/stats.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -25,10 +25,21 @@
 class StatsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> StatsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return StatsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> StatsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return StatsResourceWithStreamingResponse(self)
 
     def get(
@@ -40,10 +51,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Stat:
-        """
-        Fetch usage statistics details for Cloudflare Images.
+        """Fetch image statistics details for Cloudflare Images.
+
+        The returned statistics
+        detail storage usage, including the current image count vs this account's
+        allowance.
 
         Args:
           account_id: Account identifier tag.
@@ -74,10 +88,21 @@ def get(
 class AsyncStatsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncStatsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncStatsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncStatsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncStatsResourceWithStreamingResponse(self)
 
     async def get(
@@ -89,10 +114,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Stat:
-        """
-        Fetch usage statistics details for Cloudflare Images.
+        """Fetch image statistics details for Cloudflare Images.
+
+        The returned statistics
+        detail storage usage, including the current image count vs this account's
+        allowance.
 
         Args:
           account_id: Account identifier tag.
diff --git a/src/cloudflare/resources/images/v1/v1.py b/src/cloudflare/resources/images/v1/v1.py
index 094a8bb7375..a1f22cb3caf 100644
--- a/src/cloudflare/resources/images/v1/v1.py
+++ b/src/cloudflare/resources/images/v1/v1.py
@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, cast
+import typing_extensions
+from typing import Any, Type, Mapping, Optional, cast
 
 import httpx
 
@@ -38,11 +39,8 @@
     VariantsResourceWithStreamingResponse,
     AsyncVariantsResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, FileTypes, omit, not_given
+from ...._utils import extract_files, maybe_transform, deepcopy_minimal, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -81,26 +79,39 @@ def blobs(self) -> BlobsResource:
 
     @cached_property
     def with_raw_response(self) -> V1ResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return V1ResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> V1ResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return V1ResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        file: object | NotGiven = NOT_GIVEN,
-        metadata: object | NotGiven = NOT_GIVEN,
-        require_signed_urls: bool | NotGiven = NOT_GIVEN,
-        url: str | NotGiven = NOT_GIVEN,
+        id: str | Omit = omit,
+        creator: str | Omit = omit,
+        file: FileTypes | Omit = omit,
+        metadata: object | Omit = omit,
+        require_signed_urls: bool | Omit = omit,
+        url: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Image:
         """
         Upload an image with up to 10 Megabytes using a single HTTP POST
@@ -110,6 +121,10 @@ def create(
         Args:
           account_id: Account identifier tag.
 
+          id: An optional custom unique identifier for your image.
+
+          creator: Can set the creator field with an internal user ID.
+
           file: An image binary data. Only needed when type is uploading a file.
 
           metadata: User modifiable key-value store. Can use used for keeping references to another
@@ -130,21 +145,25 @@ def create(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        body = deepcopy_minimal(
+            {
+                "id": id,
+                "creator": creator,
+                "file": file,
+                "metadata": metadata,
+                "require_signed_urls": require_signed_urls,
+                "url": url,
+            }
+        )
+        files = extract_files(cast(Mapping[str, object], body), paths=[["file"]])
         # It should be noted that the actual Content-Type header that will be
         # sent to the server will contain a `boundary` parameter, e.g.
         # multipart/form-data; boundary=---abc--
         extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
         return self._post(
             f"/accounts/{account_id}/images/v1",
-            body=maybe_transform(
-                {
-                    "file": file,
-                    "metadata": metadata,
-                    "require_signed_urls": require_signed_urls,
-                    "url": url,
-                },
-                v1_create_params.V1CreateParams,
-            ),
+            body=maybe_transform(body, v1_create_params.V1CreateParams),
+            files=files,
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -155,18 +174,20 @@ def create(
             cast_to=cast(Type[Image], ResultWrapper[Image]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
         *,
         account_id: str,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        creator: Optional[str] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePagination[V1ListResponse]:
         """List up to 100 images with one request.
 
@@ -176,6 +197,9 @@ def list(
         Args:
           account_id: Account identifier tag.
 
+          creator: Internal user ID set within the creator field. Setting to empty string "" will
+              return images where creator field is not set
+
           page: Page number of paginated results.
 
           per_page: Number of items per page.
@@ -200,6 +224,7 @@ def list(
                 timeout=timeout,
                 query=maybe_transform(
                     {
+                        "creator": creator,
                         "page": page,
                         "per_page": per_page,
                     },
@@ -219,7 +244,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> V1DeleteResponse:
         """Delete an image on Cloudflare Images.
 
@@ -265,14 +290,15 @@ def edit(
         image_id: str,
         *,
         account_id: str,
-        metadata: object | NotGiven = NOT_GIVEN,
-        require_signed_urls: bool | NotGiven = NOT_GIVEN,
+        creator: str | Omit = omit,
+        metadata: object | Omit = omit,
+        require_signed_urls: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Image:
         """Update image access control.
 
@@ -284,6 +310,8 @@ def edit(
 
           image_id: Image unique identifier.
 
+          creator: Can set the creator field with an internal user ID.
+
           metadata: User modifiable key-value store. Can be used for keeping references to another
               system of record for managing images. No change if not specified.
 
@@ -307,6 +335,7 @@ def edit(
             f"/accounts/{account_id}/images/v1/{image_id}",
             body=maybe_transform(
                 {
+                    "creator": creator,
                     "metadata": metadata,
                     "require_signed_urls": require_signed_urls,
                 },
@@ -332,7 +361,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Image:
         """
         Fetch details for a single image.
@@ -386,26 +415,39 @@ def blobs(self) -> AsyncBlobsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncV1ResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncV1ResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncV1ResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncV1ResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        file: object | NotGiven = NOT_GIVEN,
-        metadata: object | NotGiven = NOT_GIVEN,
-        require_signed_urls: bool | NotGiven = NOT_GIVEN,
-        url: str | NotGiven = NOT_GIVEN,
+        id: str | Omit = omit,
+        creator: str | Omit = omit,
+        file: FileTypes | Omit = omit,
+        metadata: object | Omit = omit,
+        require_signed_urls: bool | Omit = omit,
+        url: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Image:
         """
         Upload an image with up to 10 Megabytes using a single HTTP POST
@@ -415,6 +457,10 @@ async def create(
         Args:
           account_id: Account identifier tag.
 
+          id: An optional custom unique identifier for your image.
+
+          creator: Can set the creator field with an internal user ID.
+
           file: An image binary data. Only needed when type is uploading a file.
 
           metadata: User modifiable key-value store. Can use used for keeping references to another
@@ -435,21 +481,25 @@ async def create(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        body = deepcopy_minimal(
+            {
+                "id": id,
+                "creator": creator,
+                "file": file,
+                "metadata": metadata,
+                "require_signed_urls": require_signed_urls,
+                "url": url,
+            }
+        )
+        files = extract_files(cast(Mapping[str, object], body), paths=[["file"]])
         # It should be noted that the actual Content-Type header that will be
         # sent to the server will contain a `boundary` parameter, e.g.
         # multipart/form-data; boundary=---abc--
         extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
         return await self._post(
             f"/accounts/{account_id}/images/v1",
-            body=await async_maybe_transform(
-                {
-                    "file": file,
-                    "metadata": metadata,
-                    "require_signed_urls": require_signed_urls,
-                    "url": url,
-                },
-                v1_create_params.V1CreateParams,
-            ),
+            body=await async_maybe_transform(body, v1_create_params.V1CreateParams),
+            files=files,
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -460,18 +510,20 @@ async def create(
             cast_to=cast(Type[Image], ResultWrapper[Image]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
         *,
         account_id: str,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        creator: Optional[str] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[V1ListResponse, AsyncV4PagePagination[V1ListResponse]]:
         """List up to 100 images with one request.
 
@@ -481,6 +533,9 @@ def list(
         Args:
           account_id: Account identifier tag.
 
+          creator: Internal user ID set within the creator field. Setting to empty string "" will
+              return images where creator field is not set
+
           page: Page number of paginated results.
 
           per_page: Number of items per page.
@@ -505,6 +560,7 @@ def list(
                 timeout=timeout,
                 query=maybe_transform(
                     {
+                        "creator": creator,
                         "page": page,
                         "per_page": per_page,
                     },
@@ -524,7 +580,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> V1DeleteResponse:
         """Delete an image on Cloudflare Images.
 
@@ -570,14 +626,15 @@ async def edit(
         image_id: str,
         *,
         account_id: str,
-        metadata: object | NotGiven = NOT_GIVEN,
-        require_signed_urls: bool | NotGiven = NOT_GIVEN,
+        creator: str | Omit = omit,
+        metadata: object | Omit = omit,
+        require_signed_urls: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Image:
         """Update image access control.
 
@@ -589,6 +646,8 @@ async def edit(
 
           image_id: Image unique identifier.
 
+          creator: Can set the creator field with an internal user ID.
+
           metadata: User modifiable key-value store. Can be used for keeping references to another
               system of record for managing images. No change if not specified.
 
@@ -612,6 +671,7 @@ async def edit(
             f"/accounts/{account_id}/images/v1/{image_id}",
             body=await async_maybe_transform(
                 {
+                    "creator": creator,
                     "metadata": metadata,
                     "require_signed_urls": require_signed_urls,
                 },
@@ -637,7 +697,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Image:
         """
         Fetch details for a single image.
@@ -679,8 +739,10 @@ def __init__(self, v1: V1Resource) -> None:
         self.create = to_raw_response_wrapper(
             v1.create,
         )
-        self.list = to_raw_response_wrapper(
-            v1.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                v1.list,  # pyright: ignore[reportDeprecated],
+            )
         )
         self.delete = to_raw_response_wrapper(
             v1.delete,
@@ -716,8 +778,10 @@ def __init__(self, v1: AsyncV1Resource) -> None:
         self.create = async_to_raw_response_wrapper(
             v1.create,
         )
-        self.list = async_to_raw_response_wrapper(
-            v1.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                v1.list,  # pyright: ignore[reportDeprecated],
+            )
         )
         self.delete = async_to_raw_response_wrapper(
             v1.delete,
@@ -753,8 +817,10 @@ def __init__(self, v1: V1Resource) -> None:
         self.create = to_streamed_response_wrapper(
             v1.create,
         )
-        self.list = to_streamed_response_wrapper(
-            v1.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                v1.list,  # pyright: ignore[reportDeprecated],
+            )
         )
         self.delete = to_streamed_response_wrapper(
             v1.delete,
@@ -790,8 +856,10 @@ def __init__(self, v1: AsyncV1Resource) -> None:
         self.create = async_to_streamed_response_wrapper(
             v1.create,
         )
-        self.list = async_to_streamed_response_wrapper(
-            v1.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                v1.list,  # pyright: ignore[reportDeprecated],
+            )
         )
         self.delete = async_to_streamed_response_wrapper(
             v1.delete,
diff --git a/src/cloudflare/resources/images/v1/variants.py b/src/cloudflare/resources/images/v1/variants.py
index e81e9a49cd2..b681a359f93 100644
--- a/src/cloudflare/resources/images/v1/variants.py
+++ b/src/cloudflare/resources/images/v1/variants.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -34,10 +31,21 @@
 class VariantsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> VariantsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return VariantsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> VariantsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return VariantsResourceWithStreamingResponse(self)
 
     def create(
@@ -46,13 +54,13 @@ def create(
         account_id: str,
         id: str,
         options: variant_create_params.Options,
-        never_require_signed_urls: bool | NotGiven = NOT_GIVEN,
+        never_require_signed_urls: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> VariantCreateResponse:
         """
         Specify variants that allow you to resize images for different use cases.
@@ -104,7 +112,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Variant:
         """
         Lists existing variants.
@@ -144,7 +152,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> VariantDeleteResponse:
         """
         Deleting a variant purges the cache for all images associated with the variant.
@@ -187,13 +195,13 @@ def edit(
         *,
         account_id: str,
         options: variant_edit_params.Options,
-        never_require_signed_urls: bool | NotGiven = NOT_GIVEN,
+        never_require_signed_urls: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> VariantEditResponse:
         """
         Updating a variant purges the cache for all images associated with the variant.
@@ -247,7 +255,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> VariantGetResponse:
         """
         Fetch details for a single variant.
@@ -283,10 +291,21 @@ def get(
 class AsyncVariantsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncVariantsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncVariantsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncVariantsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncVariantsResourceWithStreamingResponse(self)
 
     async def create(
@@ -295,13 +314,13 @@ async def create(
         account_id: str,
         id: str,
         options: variant_create_params.Options,
-        never_require_signed_urls: bool | NotGiven = NOT_GIVEN,
+        never_require_signed_urls: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> VariantCreateResponse:
         """
         Specify variants that allow you to resize images for different use cases.
@@ -353,7 +372,7 @@ async def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Variant:
         """
         Lists existing variants.
@@ -393,7 +412,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> VariantDeleteResponse:
         """
         Deleting a variant purges the cache for all images associated with the variant.
@@ -436,13 +455,13 @@ async def edit(
         *,
         account_id: str,
         options: variant_edit_params.Options,
-        never_require_signed_urls: bool | NotGiven = NOT_GIVEN,
+        never_require_signed_urls: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> VariantEditResponse:
         """
         Updating a variant purges the cache for all images associated with the variant.
@@ -496,7 +515,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> VariantGetResponse:
         """
         Fetch details for a single variant.
diff --git a/src/cloudflare/resources/images/v2/direct_uploads.py b/src/cloudflare/resources/images/v2/direct_uploads.py
index 85950b687e7..0ad7b440335 100644
--- a/src/cloudflare/resources/images/v2/direct_uploads.py
+++ b/src/cloudflare/resources/images/v2/direct_uploads.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -31,26 +28,38 @@
 class DirectUploadsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DirectUploadsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DirectUploadsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DirectUploadsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DirectUploadsResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        expiry: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        metadata: object | NotGiven = NOT_GIVEN,
-        require_signed_urls: bool | NotGiven = NOT_GIVEN,
+        id: str | Omit = omit,
+        creator: str | Omit = omit,
+        expiry: Union[str, datetime] | Omit = omit,
+        metadata: object | Omit = omit,
+        require_signed_urls: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> DirectUploadCreateResponse:
         """Direct uploads allow users to upload images without API keys.
 
@@ -69,6 +78,8 @@ def create(
               and utf8 characters. Cannot start nor end with a / (forward slash). Cannot be a
               UUID.
 
+          creator: Can set the creator field with an internal user ID.
+
           expiry: The date after which the upload will not be accepted. Minimum: Now + 2 minutes.
               Maximum: Now + 6 hours.
 
@@ -96,6 +107,7 @@ def create(
             body=maybe_transform(
                 {
                     "id": id,
+                    "creator": creator,
                     "expiry": expiry,
                     "metadata": metadata,
                     "require_signed_urls": require_signed_urls,
@@ -116,26 +128,38 @@ def create(
 class AsyncDirectUploadsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDirectUploadsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDirectUploadsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDirectUploadsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDirectUploadsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        expiry: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        metadata: object | NotGiven = NOT_GIVEN,
-        require_signed_urls: bool | NotGiven = NOT_GIVEN,
+        id: str | Omit = omit,
+        creator: str | Omit = omit,
+        expiry: Union[str, datetime] | Omit = omit,
+        metadata: object | Omit = omit,
+        require_signed_urls: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> DirectUploadCreateResponse:
         """Direct uploads allow users to upload images without API keys.
 
@@ -154,6 +178,8 @@ async def create(
               and utf8 characters. Cannot start nor end with a / (forward slash). Cannot be a
               UUID.
 
+          creator: Can set the creator field with an internal user ID.
+
           expiry: The date after which the upload will not be accepted. Minimum: Now + 2 minutes.
               Maximum: Now + 6 hours.
 
@@ -181,6 +207,7 @@ async def create(
             body=await async_maybe_transform(
                 {
                     "id": id,
+                    "creator": creator,
                     "expiry": expiry,
                     "metadata": metadata,
                     "require_signed_urls": require_signed_urls,
diff --git a/src/cloudflare/resources/images/v2/v2.py b/src/cloudflare/resources/images/v2/v2.py
index 2aba0656813..b69ff0e8420 100644
--- a/src/cloudflare/resources/images/v2/v2.py
+++ b/src/cloudflare/resources/images/v2/v2.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -43,40 +40,99 @@ def direct_uploads(self) -> DirectUploadsResource:
 
     @cached_property
     def with_raw_response(self) -> V2ResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return V2ResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> V2ResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return V2ResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
-        continuation_token: Optional[str] | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        sort_order: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
+        continuation_token: Optional[str] | Omit = omit,
+        creator: Optional[str] | Omit = omit,
+        meta: v2_list_params.Meta | Omit = omit,
+        per_page: float | Omit = omit,
+        sort_order: Literal["asc", "desc"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> V2ListResponse:
-        """List up to 10000 images with one request.
+        """List up to 10000 images with up to 1000 results per page.
+
+        Use the optional
+        parameters below to get a specific range of images. Pagination is supported via
+        continuation_token.
+
+        **Metadata Filtering (Optional):**
+
+        You can optionally filter images by custom metadata fields using the
+        `meta.<field>[<operator>]=<value>` syntax.
+
+        **Supported Operators:**
 
-        Use the optional parameters below to
-        get a specific range of images. Endpoint returns continuation_token if more
-        images are present.
+        - `eq` / `eq:string` / `eq:number` / `eq:boolean` - Exact match
+        - `in` / `in:string` / `in:number` - Match any value in list (pipe-separated)
+
+        **Metadata Filter Constraints:**
+
+        - Maximum 5 metadata filters per request
+        - Maximum 5 levels of nesting (e.g., `meta.first.second.third.fourth.fifth`)
+        - Maximum 10 elements for list operators (`in`)
+        - Supports string, number, and boolean value types
+
+        **Examples:**
+
+        ```
+        # List all images
+        /images/v2
+
+        # Filter by metadata [eq]
+        /images/v2?meta.status[eq:string]=active
+
+        # Filter by metadata [in]
+        /images/v2?meta.status[in]=pending|deleted|flagged
+
+        # Filter by metadata [in:number]
+        /images/v2?meta.ratings[in:number]=4|5
+
+        # Filter by nested metadata
+        /images/v2?meta.region.name[eq]=eu-west
+
+        # Combine metadata filters with creator
+        /images/v2?meta.status[eq]=active&creator=user123
+
+        # Multiple metadata filters (AND logic)
+        /images/v2?meta.status[eq]=active&meta.priority[eq:number]=5
+        ```
 
         Args:
           account_id: Account identifier tag.
 
-          continuation_token: Continuation token for a next page. List images V2 returns continuation_token
+          continuation_token: Continuation token to fetch next page. Passed as a query param when requesting
+              List V2 api endpoint.
+
+          creator: Internal user ID set within the creator field. Setting to empty string "" will
+              return images where creator field is not set
 
-          per_page: Number of items per page.
+          per_page: Number of items per page
 
-          sort_order: Sorting order by upload time.
+          sort_order: Sorting order by upload time
 
           extra_headers: Send extra headers
 
@@ -98,6 +154,8 @@ def list(
                 query=maybe_transform(
                     {
                         "continuation_token": continuation_token,
+                        "creator": creator,
+                        "meta": meta,
                         "per_page": per_page,
                         "sort_order": sort_order,
                     },
@@ -116,40 +174,99 @@ def direct_uploads(self) -> AsyncDirectUploadsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncV2ResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncV2ResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncV2ResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncV2ResourceWithStreamingResponse(self)
 
     async def list(
         self,
         *,
         account_id: str,
-        continuation_token: Optional[str] | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        sort_order: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
+        continuation_token: Optional[str] | Omit = omit,
+        creator: Optional[str] | Omit = omit,
+        meta: v2_list_params.Meta | Omit = omit,
+        per_page: float | Omit = omit,
+        sort_order: Literal["asc", "desc"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> V2ListResponse:
-        """List up to 10000 images with one request.
+        """List up to 10000 images with up to 1000 results per page.
+
+        Use the optional
+        parameters below to get a specific range of images. Pagination is supported via
+        continuation_token.
+
+        **Metadata Filtering (Optional):**
+
+        You can optionally filter images by custom metadata fields using the
+        `meta.<field>[<operator>]=<value>` syntax.
+
+        **Supported Operators:**
+
+        - `eq` / `eq:string` / `eq:number` / `eq:boolean` - Exact match
+        - `in` / `in:string` / `in:number` - Match any value in list (pipe-separated)
 
-        Use the optional parameters below to
-        get a specific range of images. Endpoint returns continuation_token if more
-        images are present.
+        **Metadata Filter Constraints:**
+
+        - Maximum 5 metadata filters per request
+        - Maximum 5 levels of nesting (e.g., `meta.first.second.third.fourth.fifth`)
+        - Maximum 10 elements for list operators (`in`)
+        - Supports string, number, and boolean value types
+
+        **Examples:**
+
+        ```
+        # List all images
+        /images/v2
+
+        # Filter by metadata [eq]
+        /images/v2?meta.status[eq:string]=active
+
+        # Filter by metadata [in]
+        /images/v2?meta.status[in]=pending|deleted|flagged
+
+        # Filter by metadata [in:number]
+        /images/v2?meta.ratings[in:number]=4|5
+
+        # Filter by nested metadata
+        /images/v2?meta.region.name[eq]=eu-west
+
+        # Combine metadata filters with creator
+        /images/v2?meta.status[eq]=active&creator=user123
+
+        # Multiple metadata filters (AND logic)
+        /images/v2?meta.status[eq]=active&meta.priority[eq:number]=5
+        ```
 
         Args:
           account_id: Account identifier tag.
 
-          continuation_token: Continuation token for a next page. List images V2 returns continuation_token
+          continuation_token: Continuation token to fetch next page. Passed as a query param when requesting
+              List V2 api endpoint.
+
+          creator: Internal user ID set within the creator field. Setting to empty string "" will
+              return images where creator field is not set
 
-          per_page: Number of items per page.
+          per_page: Number of items per page
 
-          sort_order: Sorting order by upload time.
+          sort_order: Sorting order by upload time
 
           extra_headers: Send extra headers
 
@@ -171,6 +288,8 @@ async def list(
                 query=await async_maybe_transform(
                     {
                         "continuation_token": continuation_token,
+                        "creator": creator,
+                        "meta": meta,
                         "per_page": per_page,
                         "sort_order": sort_order,
                     },
diff --git a/src/cloudflare/resources/intel/__init__.py b/src/cloudflare/resources/intel/__init__.py
index 126ee686dad..7aedf4bf491 100644
--- a/src/cloudflare/resources/intel/__init__.py
+++ b/src/cloudflare/resources/intel/__init__.py
@@ -48,14 +48,6 @@
     DomainsResourceWithStreamingResponse,
     AsyncDomainsResourceWithStreamingResponse,
 )
-from .ip_lists import (
-    IPListsResource,
-    AsyncIPListsResource,
-    IPListsResourceWithRawResponse,
-    AsyncIPListsResourceWithRawResponse,
-    IPListsResourceWithStreamingResponse,
-    AsyncIPListsResourceWithStreamingResponse,
-)
 from .sinkholes import (
     SinkholesResource,
     AsyncSinkholesResource,
@@ -128,12 +120,6 @@
     "AsyncIPsResourceWithRawResponse",
     "IPsResourceWithStreamingResponse",
     "AsyncIPsResourceWithStreamingResponse",
-    "IPListsResource",
-    "AsyncIPListsResource",
-    "IPListsResourceWithRawResponse",
-    "AsyncIPListsResourceWithRawResponse",
-    "IPListsResourceWithStreamingResponse",
-    "AsyncIPListsResourceWithStreamingResponse",
     "MiscategorizationsResource",
     "AsyncMiscategorizationsResource",
     "MiscategorizationsResourceWithRawResponse",
diff --git a/src/cloudflare/resources/intel/asn/asn.py b/src/cloudflare/resources/intel/asn/asn.py
index d8084c9b2c8..7cd66848da8 100644
--- a/src/cloudflare/resources/intel/asn/asn.py
+++ b/src/cloudflare/resources/intel/asn/asn.py
@@ -14,7 +14,7 @@
     SubnetsResourceWithStreamingResponse,
     AsyncSubnetsResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -37,10 +37,21 @@ def subnets(self) -> SubnetsResource:
 
     @cached_property
     def with_raw_response(self) -> ASNResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ASNResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ASNResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ASNResourceWithStreamingResponse(self)
 
     def get(
@@ -53,13 +64,14 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ASN]:
         """
-        Get ASN Overview
+        Gets an overview of the Autonomous System Number (ASN) and a list of subnets for
+        it.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -91,10 +103,21 @@ def subnets(self) -> AsyncSubnetsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncASNResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncASNResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncASNResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncASNResourceWithStreamingResponse(self)
 
     async def get(
@@ -107,13 +130,14 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ASN]:
         """
-        Get ASN Overview
+        Gets an overview of the Autonomous System Number (ASN) and a list of subnets for
+        it.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/intel/asn/subnets.py b/src/cloudflare/resources/intel/asn/subnets.py
index 0bc5182e2bf..e1643a47223 100644
--- a/src/cloudflare/resources/intel/asn/subnets.py
+++ b/src/cloudflare/resources/intel/asn/subnets.py
@@ -4,7 +4,7 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -23,10 +23,21 @@
 class SubnetsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SubnetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SubnetsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SubnetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SubnetsResourceWithStreamingResponse(self)
 
     def get(
@@ -39,13 +50,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SubnetGetResponse:
         """
-        Get ASN Subnets
+        Get ASN Subnets.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -69,10 +80,21 @@ def get(
 class AsyncSubnetsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSubnetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSubnetsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSubnetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSubnetsResourceWithStreamingResponse(self)
 
     async def get(
@@ -85,13 +107,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SubnetGetResponse:
         """
-        Get ASN Subnets
+        Get ASN Subnets.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/intel/attack_surface_report/attack_surface_report.py b/src/cloudflare/resources/intel/attack_surface_report/attack_surface_report.py
index 0cb2fabd7b1..36fe0388e71 100644
--- a/src/cloudflare/resources/intel/attack_surface_report/attack_surface_report.py
+++ b/src/cloudflare/resources/intel/attack_surface_report/attack_surface_report.py
@@ -35,10 +35,21 @@ def issues(self) -> IssuesResource:
 
     @cached_property
     def with_raw_response(self) -> AttackSurfaceReportResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AttackSurfaceReportResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AttackSurfaceReportResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AttackSurfaceReportResourceWithStreamingResponse(self)
 
 
@@ -53,10 +64,21 @@ def issues(self) -> AsyncIssuesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncAttackSurfaceReportResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAttackSurfaceReportResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAttackSurfaceReportResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAttackSurfaceReportResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/intel/attack_surface_report/issue_types.py b/src/cloudflare/resources/intel/attack_surface_report/issue_types.py
index c29c09235d0..79ddfe66bdb 100644
--- a/src/cloudflare/resources/intel/attack_surface_report/issue_types.py
+++ b/src/cloudflare/resources/intel/attack_surface_report/issue_types.py
@@ -2,11 +2,9 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
-
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -15,8 +13,8 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
 from ....types.intel.attack_surface_report.issue_type_get_response import IssueTypeGetResponse
 
 __all__ = ["IssueTypesResource", "AsyncIssueTypesResource"]
@@ -25,10 +23,21 @@
 class IssueTypesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> IssueTypesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return IssueTypesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> IssueTypesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return IssueTypesResourceWithStreamingResponse(self)
 
     def get(
@@ -40,13 +49,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IssueTypeGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[IssueTypeGetResponse]:
         """
-        Get Security Center Issues Types
+        Retrieves Security Center Issues Types
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -58,29 +67,37 @@ def get(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/intel/attack-surface-report/issue-types",
+            page=SyncSinglePage[IssueTypeGetResponse],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IssueTypeGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[IssueTypeGetResponse]], ResultWrapper[IssueTypeGetResponse]),
+            model=str,
         )
 
 
 class AsyncIssueTypesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncIssueTypesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncIssueTypesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncIssueTypesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncIssueTypesResourceWithStreamingResponse(self)
 
-    async def get(
+    def get(
         self,
         *,
         account_id: str,
@@ -89,13 +106,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IssueTypeGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[IssueTypeGetResponse, AsyncSinglePage[IssueTypeGetResponse]]:
         """
-        Get Security Center Issues Types
+        Retrieves Security Center Issues Types
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -107,16 +124,13 @@ async def get(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/intel/attack-surface-report/issue-types",
+            page=AsyncSinglePage[IssueTypeGetResponse],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IssueTypeGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[IssueTypeGetResponse]], ResultWrapper[IssueTypeGetResponse]),
+            model=str,
         )
 
 
diff --git a/src/cloudflare/resources/intel/attack_surface_report/issues.py b/src/cloudflare/resources/intel/attack_surface_report/issues.py
index 1045499937e..33e0db7d9ca 100644
--- a/src/cloudflare/resources/intel/attack_surface_report/issues.py
+++ b/src/cloudflare/resources/intel/attack_surface_report/issues.py
@@ -2,15 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, List, Type, Optional, cast
+import typing_extensions
+from typing import List, Type, Optional, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -43,45 +41,57 @@
 class IssuesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> IssuesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return IssuesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> IssuesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return IssuesResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
         *,
         account_id: str,
-        dismissed: bool | NotGiven = NOT_GIVEN,
-        issue_class: List[str] | NotGiven = NOT_GIVEN,
-        issue_class_neq: List[str] | NotGiven = NOT_GIVEN,
-        issue_type: List[IssueType] | NotGiven = NOT_GIVEN,
-        issue_type_neq: List[IssueType] | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
-        product: List[str] | NotGiven = NOT_GIVEN,
-        product_neq: List[str] | NotGiven = NOT_GIVEN,
-        severity: List[SeverityQueryParam] | NotGiven = NOT_GIVEN,
-        severity_neq: List[SeverityQueryParam] | NotGiven = NOT_GIVEN,
-        subject: List[str] | NotGiven = NOT_GIVEN,
-        subject_neq: List[str] | NotGiven = NOT_GIVEN,
+        dismissed: bool | Omit = omit,
+        issue_class: SequenceNotStr[str] | Omit = omit,
+        issue_class_neq: SequenceNotStr[str] | Omit = omit,
+        issue_type: List[IssueType] | Omit = omit,
+        issue_type_neq: List[IssueType] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        product: SequenceNotStr[str] | Omit = omit,
+        product_neq: SequenceNotStr[str] | Omit = omit,
+        severity: List[SeverityQueryParam] | Omit = omit,
+        severity_neq: List[SeverityQueryParam] | Omit = omit,
+        subject: SequenceNotStr[str] | Omit = omit,
+        subject_neq: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePagination[IssueListResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePagination[Optional[IssueListResponse]]:
         """
-        Get Security Center Issues
+        Retrieves Security Center Issues
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          page: Current page within paginated list of results
+          page: Specifies the current page within paginated list of results.
 
-          per_page: Number of results per page of results
+          per_page: Sets the number of results per page of results.
 
           extra_headers: Send extra headers
 
@@ -95,7 +105,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/intel/attack-surface-report/issues",
-            page=SyncV4PagePagination[IssueListResponse],
+            page=SyncV4PagePagination[Optional[IssueListResponse]],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -123,33 +133,34 @@ def list(
             model=IssueListResponse,
         )
 
+    @typing_extensions.deprecated("deprecated")
     def class_(
         self,
         *,
         account_id: str,
-        dismissed: bool | NotGiven = NOT_GIVEN,
-        issue_class: List[str] | NotGiven = NOT_GIVEN,
-        issue_class_neq: List[str] | NotGiven = NOT_GIVEN,
-        issue_type: List[IssueType] | NotGiven = NOT_GIVEN,
-        issue_type_neq: List[IssueType] | NotGiven = NOT_GIVEN,
-        product: List[str] | NotGiven = NOT_GIVEN,
-        product_neq: List[str] | NotGiven = NOT_GIVEN,
-        severity: List[SeverityQueryParam] | NotGiven = NOT_GIVEN,
-        severity_neq: List[SeverityQueryParam] | NotGiven = NOT_GIVEN,
-        subject: List[str] | NotGiven = NOT_GIVEN,
-        subject_neq: List[str] | NotGiven = NOT_GIVEN,
+        dismissed: bool | Omit = omit,
+        issue_class: SequenceNotStr[str] | Omit = omit,
+        issue_class_neq: SequenceNotStr[str] | Omit = omit,
+        issue_type: List[IssueType] | Omit = omit,
+        issue_type_neq: List[IssueType] | Omit = omit,
+        product: SequenceNotStr[str] | Omit = omit,
+        product_neq: SequenceNotStr[str] | Omit = omit,
+        severity: List[SeverityQueryParam] | Omit = omit,
+        severity_neq: List[SeverityQueryParam] | Omit = omit,
+        subject: SequenceNotStr[str] | Omit = omit,
+        subject_neq: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IssueClassResponse]:
         """
-        Get Security Center Issue Counts by Class
+        Retrieves Security Center Issue Counts by Class
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -189,24 +200,25 @@ def class_(
             cast_to=cast(Type[Optional[IssueClassResponse]], ResultWrapper[IssueClassResponse]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     def dismiss(
         self,
         issue_id: str,
         *,
         account_id: str,
-        dismiss: bool | NotGiven = NOT_GIVEN,
+        dismiss: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IssueDismissResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> IssueDismissResponse:
         """
-        Archive Security Center Insight
+        Archives Security Center Insight
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -220,51 +232,43 @@ def dismiss(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not issue_id:
             raise ValueError(f"Expected a non-empty value for `issue_id` but received {issue_id!r}")
-        return cast(
-            Optional[IssueDismissResponse],
-            self._put(
-                f"/accounts/{account_id}/intel/attack-surface-report/{issue_id}/dismiss",
-                body=maybe_transform({"dismiss": dismiss}, issue_dismiss_params.IssueDismissParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[IssueDismissResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[IssueDismissResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._put(
+            f"/accounts/{account_id}/intel/attack-surface-report/{issue_id}/dismiss",
+            body=maybe_transform({"dismiss": dismiss}, issue_dismiss_params.IssueDismissParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
+            cast_to=IssueDismissResponse,
         )
 
+    @typing_extensions.deprecated("deprecated")
     def severity(
         self,
         *,
         account_id: str,
-        dismissed: bool | NotGiven = NOT_GIVEN,
-        issue_class: List[str] | NotGiven = NOT_GIVEN,
-        issue_class_neq: List[str] | NotGiven = NOT_GIVEN,
-        issue_type: List[IssueType] | NotGiven = NOT_GIVEN,
-        issue_type_neq: List[IssueType] | NotGiven = NOT_GIVEN,
-        product: List[str] | NotGiven = NOT_GIVEN,
-        product_neq: List[str] | NotGiven = NOT_GIVEN,
-        severity: List[SeverityQueryParam] | NotGiven = NOT_GIVEN,
-        severity_neq: List[SeverityQueryParam] | NotGiven = NOT_GIVEN,
-        subject: List[str] | NotGiven = NOT_GIVEN,
-        subject_neq: List[str] | NotGiven = NOT_GIVEN,
+        dismissed: bool | Omit = omit,
+        issue_class: SequenceNotStr[str] | Omit = omit,
+        issue_class_neq: SequenceNotStr[str] | Omit = omit,
+        issue_type: List[IssueType] | Omit = omit,
+        issue_type_neq: List[IssueType] | Omit = omit,
+        product: SequenceNotStr[str] | Omit = omit,
+        product_neq: SequenceNotStr[str] | Omit = omit,
+        severity: List[SeverityQueryParam] | Omit = omit,
+        severity_neq: List[SeverityQueryParam] | Omit = omit,
+        subject: SequenceNotStr[str] | Omit = omit,
+        subject_neq: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IssueSeverityResponse]:
         """
-        Get Security Center Issue Counts by Severity
+        Retrieves Security Center Issue Counts by Severity
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -304,33 +308,34 @@ def severity(
             cast_to=cast(Type[Optional[IssueSeverityResponse]], ResultWrapper[IssueSeverityResponse]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     def type(
         self,
         *,
         account_id: str,
-        dismissed: bool | NotGiven = NOT_GIVEN,
-        issue_class: List[str] | NotGiven = NOT_GIVEN,
-        issue_class_neq: List[str] | NotGiven = NOT_GIVEN,
-        issue_type: List[IssueType] | NotGiven = NOT_GIVEN,
-        issue_type_neq: List[IssueType] | NotGiven = NOT_GIVEN,
-        product: List[str] | NotGiven = NOT_GIVEN,
-        product_neq: List[str] | NotGiven = NOT_GIVEN,
-        severity: List[SeverityQueryParam] | NotGiven = NOT_GIVEN,
-        severity_neq: List[SeverityQueryParam] | NotGiven = NOT_GIVEN,
-        subject: List[str] | NotGiven = NOT_GIVEN,
-        subject_neq: List[str] | NotGiven = NOT_GIVEN,
+        dismissed: bool | Omit = omit,
+        issue_class: SequenceNotStr[str] | Omit = omit,
+        issue_class_neq: SequenceNotStr[str] | Omit = omit,
+        issue_type: List[IssueType] | Omit = omit,
+        issue_type_neq: List[IssueType] | Omit = omit,
+        product: SequenceNotStr[str] | Omit = omit,
+        product_neq: SequenceNotStr[str] | Omit = omit,
+        severity: List[SeverityQueryParam] | Omit = omit,
+        severity_neq: List[SeverityQueryParam] | Omit = omit,
+        subject: SequenceNotStr[str] | Omit = omit,
+        subject_neq: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IssueTypeResponse]:
         """
-        Get Security Center Issue Counts by Type
+        Retrieves Security Center Issue Counts by Type
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -374,45 +379,57 @@ def type(
 class AsyncIssuesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncIssuesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncIssuesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncIssuesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncIssuesResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
         *,
         account_id: str,
-        dismissed: bool | NotGiven = NOT_GIVEN,
-        issue_class: List[str] | NotGiven = NOT_GIVEN,
-        issue_class_neq: List[str] | NotGiven = NOT_GIVEN,
-        issue_type: List[IssueType] | NotGiven = NOT_GIVEN,
-        issue_type_neq: List[IssueType] | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
-        product: List[str] | NotGiven = NOT_GIVEN,
-        product_neq: List[str] | NotGiven = NOT_GIVEN,
-        severity: List[SeverityQueryParam] | NotGiven = NOT_GIVEN,
-        severity_neq: List[SeverityQueryParam] | NotGiven = NOT_GIVEN,
-        subject: List[str] | NotGiven = NOT_GIVEN,
-        subject_neq: List[str] | NotGiven = NOT_GIVEN,
+        dismissed: bool | Omit = omit,
+        issue_class: SequenceNotStr[str] | Omit = omit,
+        issue_class_neq: SequenceNotStr[str] | Omit = omit,
+        issue_type: List[IssueType] | Omit = omit,
+        issue_type_neq: List[IssueType] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        product: SequenceNotStr[str] | Omit = omit,
+        product_neq: SequenceNotStr[str] | Omit = omit,
+        severity: List[SeverityQueryParam] | Omit = omit,
+        severity_neq: List[SeverityQueryParam] | Omit = omit,
+        subject: SequenceNotStr[str] | Omit = omit,
+        subject_neq: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[IssueListResponse, AsyncV4PagePagination[IssueListResponse]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Optional[IssueListResponse], AsyncV4PagePagination[Optional[IssueListResponse]]]:
         """
-        Get Security Center Issues
+        Retrieves Security Center Issues
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          page: Current page within paginated list of results
+          page: Specifies the current page within paginated list of results.
 
-          per_page: Number of results per page of results
+          per_page: Sets the number of results per page of results.
 
           extra_headers: Send extra headers
 
@@ -426,7 +443,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/intel/attack-surface-report/issues",
-            page=AsyncV4PagePagination[IssueListResponse],
+            page=AsyncV4PagePagination[Optional[IssueListResponse]],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -454,33 +471,34 @@ def list(
             model=IssueListResponse,
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def class_(
         self,
         *,
         account_id: str,
-        dismissed: bool | NotGiven = NOT_GIVEN,
-        issue_class: List[str] | NotGiven = NOT_GIVEN,
-        issue_class_neq: List[str] | NotGiven = NOT_GIVEN,
-        issue_type: List[IssueType] | NotGiven = NOT_GIVEN,
-        issue_type_neq: List[IssueType] | NotGiven = NOT_GIVEN,
-        product: List[str] | NotGiven = NOT_GIVEN,
-        product_neq: List[str] | NotGiven = NOT_GIVEN,
-        severity: List[SeverityQueryParam] | NotGiven = NOT_GIVEN,
-        severity_neq: List[SeverityQueryParam] | NotGiven = NOT_GIVEN,
-        subject: List[str] | NotGiven = NOT_GIVEN,
-        subject_neq: List[str] | NotGiven = NOT_GIVEN,
+        dismissed: bool | Omit = omit,
+        issue_class: SequenceNotStr[str] | Omit = omit,
+        issue_class_neq: SequenceNotStr[str] | Omit = omit,
+        issue_type: List[IssueType] | Omit = omit,
+        issue_type_neq: List[IssueType] | Omit = omit,
+        product: SequenceNotStr[str] | Omit = omit,
+        product_neq: SequenceNotStr[str] | Omit = omit,
+        severity: List[SeverityQueryParam] | Omit = omit,
+        severity_neq: List[SeverityQueryParam] | Omit = omit,
+        subject: SequenceNotStr[str] | Omit = omit,
+        subject_neq: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IssueClassResponse]:
         """
-        Get Security Center Issue Counts by Class
+        Retrieves Security Center Issue Counts by Class
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -520,24 +538,25 @@ async def class_(
             cast_to=cast(Type[Optional[IssueClassResponse]], ResultWrapper[IssueClassResponse]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def dismiss(
         self,
         issue_id: str,
         *,
         account_id: str,
-        dismiss: bool | NotGiven = NOT_GIVEN,
+        dismiss: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IssueDismissResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> IssueDismissResponse:
         """
-        Archive Security Center Insight
+        Archives Security Center Insight
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -551,51 +570,43 @@ async def dismiss(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not issue_id:
             raise ValueError(f"Expected a non-empty value for `issue_id` but received {issue_id!r}")
-        return cast(
-            Optional[IssueDismissResponse],
-            await self._put(
-                f"/accounts/{account_id}/intel/attack-surface-report/{issue_id}/dismiss",
-                body=await async_maybe_transform({"dismiss": dismiss}, issue_dismiss_params.IssueDismissParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[IssueDismissResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[IssueDismissResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._put(
+            f"/accounts/{account_id}/intel/attack-surface-report/{issue_id}/dismiss",
+            body=await async_maybe_transform({"dismiss": dismiss}, issue_dismiss_params.IssueDismissParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
+            cast_to=IssueDismissResponse,
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def severity(
         self,
         *,
         account_id: str,
-        dismissed: bool | NotGiven = NOT_GIVEN,
-        issue_class: List[str] | NotGiven = NOT_GIVEN,
-        issue_class_neq: List[str] | NotGiven = NOT_GIVEN,
-        issue_type: List[IssueType] | NotGiven = NOT_GIVEN,
-        issue_type_neq: List[IssueType] | NotGiven = NOT_GIVEN,
-        product: List[str] | NotGiven = NOT_GIVEN,
-        product_neq: List[str] | NotGiven = NOT_GIVEN,
-        severity: List[SeverityQueryParam] | NotGiven = NOT_GIVEN,
-        severity_neq: List[SeverityQueryParam] | NotGiven = NOT_GIVEN,
-        subject: List[str] | NotGiven = NOT_GIVEN,
-        subject_neq: List[str] | NotGiven = NOT_GIVEN,
+        dismissed: bool | Omit = omit,
+        issue_class: SequenceNotStr[str] | Omit = omit,
+        issue_class_neq: SequenceNotStr[str] | Omit = omit,
+        issue_type: List[IssueType] | Omit = omit,
+        issue_type_neq: List[IssueType] | Omit = omit,
+        product: SequenceNotStr[str] | Omit = omit,
+        product_neq: SequenceNotStr[str] | Omit = omit,
+        severity: List[SeverityQueryParam] | Omit = omit,
+        severity_neq: List[SeverityQueryParam] | Omit = omit,
+        subject: SequenceNotStr[str] | Omit = omit,
+        subject_neq: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IssueSeverityResponse]:
         """
-        Get Security Center Issue Counts by Severity
+        Retrieves Security Center Issue Counts by Severity
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -635,33 +646,34 @@ async def severity(
             cast_to=cast(Type[Optional[IssueSeverityResponse]], ResultWrapper[IssueSeverityResponse]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def type(
         self,
         *,
         account_id: str,
-        dismissed: bool | NotGiven = NOT_GIVEN,
-        issue_class: List[str] | NotGiven = NOT_GIVEN,
-        issue_class_neq: List[str] | NotGiven = NOT_GIVEN,
-        issue_type: List[IssueType] | NotGiven = NOT_GIVEN,
-        issue_type_neq: List[IssueType] | NotGiven = NOT_GIVEN,
-        product: List[str] | NotGiven = NOT_GIVEN,
-        product_neq: List[str] | NotGiven = NOT_GIVEN,
-        severity: List[SeverityQueryParam] | NotGiven = NOT_GIVEN,
-        severity_neq: List[SeverityQueryParam] | NotGiven = NOT_GIVEN,
-        subject: List[str] | NotGiven = NOT_GIVEN,
-        subject_neq: List[str] | NotGiven = NOT_GIVEN,
+        dismissed: bool | Omit = omit,
+        issue_class: SequenceNotStr[str] | Omit = omit,
+        issue_class_neq: SequenceNotStr[str] | Omit = omit,
+        issue_type: List[IssueType] | Omit = omit,
+        issue_type_neq: List[IssueType] | Omit = omit,
+        product: SequenceNotStr[str] | Omit = omit,
+        product_neq: SequenceNotStr[str] | Omit = omit,
+        severity: List[SeverityQueryParam] | Omit = omit,
+        severity_neq: List[SeverityQueryParam] | Omit = omit,
+        subject: SequenceNotStr[str] | Omit = omit,
+        subject_neq: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IssueTypeResponse]:
         """
-        Get Security Center Issue Counts by Type
+        Retrieves Security Center Issue Counts by Type
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -706,20 +718,30 @@ class IssuesResourceWithRawResponse:
     def __init__(self, issues: IssuesResource) -> None:
         self._issues = issues
 
-        self.list = to_raw_response_wrapper(
-            issues.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                issues.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.class_ = to_raw_response_wrapper(
-            issues.class_,
+        self.class_ = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                issues.class_,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dismiss = to_raw_response_wrapper(
-            issues.dismiss,
+        self.dismiss = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                issues.dismiss,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.severity = to_raw_response_wrapper(
-            issues.severity,
+        self.severity = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                issues.severity,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.type = to_raw_response_wrapper(
-            issues.type,
+        self.type = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                issues.type,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -727,20 +749,30 @@ class AsyncIssuesResourceWithRawResponse:
     def __init__(self, issues: AsyncIssuesResource) -> None:
         self._issues = issues
 
-        self.list = async_to_raw_response_wrapper(
-            issues.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                issues.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.class_ = async_to_raw_response_wrapper(
-            issues.class_,
+        self.class_ = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                issues.class_,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dismiss = async_to_raw_response_wrapper(
-            issues.dismiss,
+        self.dismiss = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                issues.dismiss,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.severity = async_to_raw_response_wrapper(
-            issues.severity,
+        self.severity = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                issues.severity,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.type = async_to_raw_response_wrapper(
-            issues.type,
+        self.type = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                issues.type,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -748,20 +780,30 @@ class IssuesResourceWithStreamingResponse:
     def __init__(self, issues: IssuesResource) -> None:
         self._issues = issues
 
-        self.list = to_streamed_response_wrapper(
-            issues.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                issues.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.class_ = to_streamed_response_wrapper(
-            issues.class_,
+        self.class_ = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                issues.class_,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dismiss = to_streamed_response_wrapper(
-            issues.dismiss,
+        self.dismiss = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                issues.dismiss,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.severity = to_streamed_response_wrapper(
-            issues.severity,
+        self.severity = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                issues.severity,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.type = to_streamed_response_wrapper(
-            issues.type,
+        self.type = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                issues.type,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -769,18 +811,28 @@ class AsyncIssuesResourceWithStreamingResponse:
     def __init__(self, issues: AsyncIssuesResource) -> None:
         self._issues = issues
 
-        self.list = async_to_streamed_response_wrapper(
-            issues.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                issues.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.class_ = async_to_streamed_response_wrapper(
-            issues.class_,
+        self.class_ = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                issues.class_,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dismiss = async_to_streamed_response_wrapper(
-            issues.dismiss,
+        self.dismiss = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                issues.dismiss,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.severity = async_to_streamed_response_wrapper(
-            issues.severity,
+        self.severity = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                issues.severity,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.type = async_to_streamed_response_wrapper(
-            issues.type,
+        self.type = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                issues.type,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/intel/dns.py b/src/cloudflare/resources/intel/dns.py
index 94c5cc0f84f..9ce121c3c4d 100644
--- a/src/cloudflare/resources/intel/dns.py
+++ b/src/cloudflare/resources/intel/dns.py
@@ -2,9 +2,11 @@
 
 from __future__ import annotations
 
+from typing import Optional
+
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
@@ -17,7 +19,7 @@
 from ...pagination import SyncV4PagePagination, AsyncV4PagePagination
 from ...types.intel import dns_list_params
 from ..._base_client import AsyncPaginator, make_request_options
-from ...types.intel.dns_list_response import DNSListResponse
+from ...types.intel.dns import DNS
 
 __all__ = ["DNSResource", "AsyncDNSResource"]
 
@@ -25,32 +27,43 @@
 class DNSResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DNSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DNSResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DNSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DNSResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
-        ipv4: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        start_end_params: dns_list_params.StartEndParams | NotGiven = NOT_GIVEN,
+        ipv4: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        start_end_params: dns_list_params.StartEndParams | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePagination[DNSListResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePagination[Optional[DNS]]:
         """
-        Get Passive DNS by IP
+        Gets a list of all the domains that have resolved to a specific IP address.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           page: Requested page within paginated list of results.
 
@@ -68,7 +81,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/intel/dns",
-            page=SyncV4PagePagination[DNSListResponse],
+            page=SyncV4PagePagination[Optional[DNS]],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -84,39 +97,50 @@ def list(
                     dns_list_params.DNSListParams,
                 ),
             ),
-            model=DNSListResponse,
+            model=DNS,
         )
 
 
 class AsyncDNSResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDNSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDNSResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDNSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDNSResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
-        ipv4: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        start_end_params: dns_list_params.StartEndParams | NotGiven = NOT_GIVEN,
+        ipv4: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        start_end_params: dns_list_params.StartEndParams | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[DNSListResponse, AsyncV4PagePagination[DNSListResponse]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Optional[DNS], AsyncV4PagePagination[Optional[DNS]]]:
         """
-        Get Passive DNS by IP
+        Gets a list of all the domains that have resolved to a specific IP address.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           page: Requested page within paginated list of results.
 
@@ -134,7 +158,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/intel/dns",
-            page=AsyncV4PagePagination[DNSListResponse],
+            page=AsyncV4PagePagination[Optional[DNS]],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -150,7 +174,7 @@ def list(
                     dns_list_params.DNSListParams,
                 ),
             ),
-            model=DNSListResponse,
+            model=DNS,
         )
 
 
diff --git a/src/cloudflare/resources/intel/domain_history.py b/src/cloudflare/resources/intel/domain_history.py
index 819f4154b0f..7822bba7881 100644
--- a/src/cloudflare/resources/intel/domain_history.py
+++ b/src/cloudflare/resources/intel/domain_history.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -30,29 +27,41 @@
 class DomainHistoryResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DomainHistoryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DomainHistoryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DomainHistoryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DomainHistoryResourceWithStreamingResponse(self)
 
     def get(
         self,
         *,
         account_id: str,
-        domain: str | NotGiven = NOT_GIVEN,
+        domain: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DomainHistoryGetResponse]:
         """
-        Get Domain History
+        Gets historical security threat and content categories currently and previously
+        assigned to a domain.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -81,29 +90,41 @@ def get(
 class AsyncDomainHistoryResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDomainHistoryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDomainHistoryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDomainHistoryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDomainHistoryResourceWithStreamingResponse(self)
 
     async def get(
         self,
         *,
         account_id: str,
-        domain: str | NotGiven = NOT_GIVEN,
+        domain: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DomainHistoryGetResponse]:
         """
-        Get Domain History
+        Gets historical security threat and content categories currently and previously
+        assigned to a domain.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/intel/domains/bulks.py b/src/cloudflare/resources/intel/domains/bulks.py
index 86a51260bd7..009c7e1ee66 100644
--- a/src/cloudflare/resources/intel/domains/bulks.py
+++ b/src/cloudflare/resources/intel/domains/bulks.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -30,31 +27,42 @@
 class BulksResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> BulksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return BulksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> BulksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return BulksResourceWithStreamingResponse(self)
 
     def get(
         self,
         *,
         account_id: str,
-        domain: object | NotGiven = NOT_GIVEN,
+        domain: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[BulkGetResponse]:
         """
-        Get Multiple Domain Details
+        Same as summary.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          domain: Accepts multiple values, i.e. `?domain=cloudflare.com&domain=example.com`.
+          domain: Accepts multiple values like `?domain=cloudflare.com&domain=example.com`.
 
           extra_headers: Send extra headers
 
@@ -83,31 +91,42 @@ def get(
 class AsyncBulksResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncBulksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncBulksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncBulksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncBulksResourceWithStreamingResponse(self)
 
     async def get(
         self,
         *,
         account_id: str,
-        domain: object | NotGiven = NOT_GIVEN,
+        domain: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[BulkGetResponse]:
         """
-        Get Multiple Domain Details
+        Same as summary.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          domain: Accepts multiple values, i.e. `?domain=cloudflare.com&domain=example.com`.
+          domain: Accepts multiple values like `?domain=cloudflare.com&domain=example.com`.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/intel/domains/domains.py b/src/cloudflare/resources/intel/domains/domains.py
index 18d75cbf4f4..9856f1af26b 100644
--- a/src/cloudflare/resources/intel/domains/domains.py
+++ b/src/cloudflare/resources/intel/domains/domains.py
@@ -14,11 +14,8 @@
     BulksResourceWithStreamingResponse,
     AsyncBulksResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -42,29 +39,40 @@ def bulks(self) -> BulksResource:
 
     @cached_property
     def with_raw_response(self) -> DomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DomainsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DomainsResourceWithStreamingResponse(self)
 
     def get(
         self,
         *,
         account_id: str,
-        domain: str | NotGiven = NOT_GIVEN,
+        domain: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Domain]:
         """
-        Get Domain Details
+        Gets security details and statistics about a domain.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -97,29 +105,40 @@ def bulks(self) -> AsyncBulksResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncDomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDomainsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDomainsResourceWithStreamingResponse(self)
 
     async def get(
         self,
         *,
         account_id: str,
-        domain: str | NotGiven = NOT_GIVEN,
+        domain: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Domain]:
         """
-        Get Domain Details
+        Gets security details and statistics about a domain.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/intel/indicator_feeds/indicator_feeds.py b/src/cloudflare/resources/intel/indicator_feeds/indicator_feeds.py
index 06fe7ca7890..4123cc30790 100644
--- a/src/cloudflare/resources/intel/indicator_feeds/indicator_feeds.py
+++ b/src/cloudflare/resources/intel/indicator_feeds/indicator_feeds.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from .snapshots import (
     SnapshotsResource,
     AsyncSnapshotsResource,
@@ -58,24 +55,35 @@ def permissions(self) -> PermissionsResource:
 
     @cached_property
     def with_raw_response(self) -> IndicatorFeedsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return IndicatorFeedsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> IndicatorFeedsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return IndicatorFeedsResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        description: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IndicatorFeedCreateResponse]:
         """
         Create new indicator feed
@@ -121,16 +129,17 @@ def update(
         feed_id: int,
         *,
         account_id: str,
-        description: str | NotGiven = NOT_GIVEN,
-        is_attributable: bool | NotGiven = NOT_GIVEN,
-        is_public: bool | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        is_attributable: bool | Omit = omit,
+        is_downloadable: bool | Omit = omit,
+        is_public: bool | Omit = omit,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IndicatorFeedUpdateResponse]:
         """
         Update indicator feed metadata
@@ -144,6 +153,8 @@ def update(
 
           is_attributable: The new is_attributable value of the feed
 
+          is_downloadable: The new is_downloadable value of the feed
+
           is_public: The new is_public value of the feed
 
           name: The new name of the feed
@@ -164,6 +175,7 @@ def update(
                 {
                     "description": description,
                     "is_attributable": is_attributable,
+                    "is_downloadable": is_downloadable,
                     "is_public": is_public,
                     "name": name,
                 },
@@ -188,7 +200,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[IndicatorFeedListResponse]:
         """
         Get indicator feeds owned by this account
@@ -225,7 +237,7 @@ def data(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> str:
         """
         Get indicator feed data
@@ -264,7 +276,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IndicatorFeedGetResponse]:
         """
         Get indicator feed metadata
@@ -308,24 +320,35 @@ def permissions(self) -> AsyncPermissionsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncIndicatorFeedsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncIndicatorFeedsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncIndicatorFeedsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncIndicatorFeedsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        description: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IndicatorFeedCreateResponse]:
         """
         Create new indicator feed
@@ -371,16 +394,17 @@ async def update(
         feed_id: int,
         *,
         account_id: str,
-        description: str | NotGiven = NOT_GIVEN,
-        is_attributable: bool | NotGiven = NOT_GIVEN,
-        is_public: bool | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        is_attributable: bool | Omit = omit,
+        is_downloadable: bool | Omit = omit,
+        is_public: bool | Omit = omit,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IndicatorFeedUpdateResponse]:
         """
         Update indicator feed metadata
@@ -394,6 +418,8 @@ async def update(
 
           is_attributable: The new is_attributable value of the feed
 
+          is_downloadable: The new is_downloadable value of the feed
+
           is_public: The new is_public value of the feed
 
           name: The new name of the feed
@@ -414,6 +440,7 @@ async def update(
                 {
                     "description": description,
                     "is_attributable": is_attributable,
+                    "is_downloadable": is_downloadable,
                     "is_public": is_public,
                     "name": name,
                 },
@@ -438,7 +465,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[IndicatorFeedListResponse, AsyncSinglePage[IndicatorFeedListResponse]]:
         """
         Get indicator feeds owned by this account
@@ -475,7 +502,7 @@ async def data(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> str:
         """
         Get indicator feed data
@@ -514,7 +541,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IndicatorFeedGetResponse]:
         """
         Get indicator feed metadata
diff --git a/src/cloudflare/resources/intel/indicator_feeds/permissions.py b/src/cloudflare/resources/intel/indicator_feeds/permissions.py
index cba5e239a46..fc98e15a3a9 100644
--- a/src/cloudflare/resources/intel/indicator_feeds/permissions.py
+++ b/src/cloudflare/resources/intel/indicator_feeds/permissions.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -32,24 +29,35 @@
 class PermissionsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PermissionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PermissionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PermissionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PermissionsResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        account_tag: str | NotGiven = NOT_GIVEN,
-        feed_id: int | NotGiven = NOT_GIVEN,
+        account_tag: str | Omit = omit,
+        feed_id: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PermissionCreateResponse]:
         """
         Grant permission to indicator feed
@@ -99,7 +107,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PermissionListResponse]:
         """
         List indicator feed permissions
@@ -133,14 +141,14 @@ def delete(
         self,
         *,
         account_id: str,
-        account_tag: str | NotGiven = NOT_GIVEN,
-        feed_id: int | NotGiven = NOT_GIVEN,
+        account_tag: str | Omit = omit,
+        feed_id: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PermissionDeleteResponse]:
         """
         Revoke permission to indicator feed
@@ -185,24 +193,35 @@ def delete(
 class AsyncPermissionsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPermissionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPermissionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPermissionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPermissionsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        account_tag: str | NotGiven = NOT_GIVEN,
-        feed_id: int | NotGiven = NOT_GIVEN,
+        account_tag: str | Omit = omit,
+        feed_id: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PermissionCreateResponse]:
         """
         Grant permission to indicator feed
@@ -252,7 +271,7 @@ async def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PermissionListResponse]:
         """
         List indicator feed permissions
@@ -286,14 +305,14 @@ async def delete(
         self,
         *,
         account_id: str,
-        account_tag: str | NotGiven = NOT_GIVEN,
-        feed_id: int | NotGiven = NOT_GIVEN,
+        account_tag: str | Omit = omit,
+        feed_id: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PermissionDeleteResponse]:
         """
         Revoke permission to indicator feed
diff --git a/src/cloudflare/resources/intel/indicator_feeds/snapshots.py b/src/cloudflare/resources/intel/indicator_feeds/snapshots.py
index b2e4466cc2e..0dc19ac33f9 100644
--- a/src/cloudflare/resources/intel/indicator_feeds/snapshots.py
+++ b/src/cloudflare/resources/intel/indicator_feeds/snapshots.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -30,10 +27,21 @@
 class SnapshotsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SnapshotsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SnapshotsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SnapshotsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SnapshotsResourceWithStreamingResponse(self)
 
     def update(
@@ -41,13 +49,13 @@ def update(
         feed_id: int,
         *,
         account_id: str,
-        source: str | NotGiven = NOT_GIVEN,
+        source: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SnapshotUpdateResponse]:
         """
         Update indicator feed data
@@ -90,10 +98,21 @@ def update(
 class AsyncSnapshotsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSnapshotsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSnapshotsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSnapshotsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSnapshotsResourceWithStreamingResponse(self)
 
     async def update(
@@ -101,13 +120,13 @@ async def update(
         feed_id: int,
         *,
         account_id: str,
-        source: str | NotGiven = NOT_GIVEN,
+        source: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SnapshotUpdateResponse]:
         """
         Update indicator feed data
diff --git a/src/cloudflare/resources/intel/intel.py b/src/cloudflare/resources/intel/intel.py
index 5dc3092ce45..98914905391 100644
--- a/src/cloudflare/resources/intel/intel.py
+++ b/src/cloudflare/resources/intel/intel.py
@@ -2,14 +2,6 @@
 
 from __future__ import annotations
 
-from .asn import (
-    ASNResource,
-    AsyncASNResource,
-    ASNResourceWithRawResponse,
-    AsyncASNResourceWithRawResponse,
-    ASNResourceWithStreamingResponse,
-    AsyncASNResourceWithStreamingResponse,
-)
 from .dns import (
     DNSResource,
     AsyncDNSResource,
@@ -34,22 +26,13 @@
     WhoisResourceWithStreamingResponse,
     AsyncWhoisResourceWithStreamingResponse,
 )
-from .asn.asn import ASNResource, AsyncASNResource
-from .domains import (
-    DomainsResource,
-    AsyncDomainsResource,
-    DomainsResourceWithRawResponse,
-    AsyncDomainsResourceWithRawResponse,
-    DomainsResourceWithStreamingResponse,
-    AsyncDomainsResourceWithStreamingResponse,
-)
-from .ip_lists import (
-    IPListsResource,
-    AsyncIPListsResource,
-    IPListsResourceWithRawResponse,
-    AsyncIPListsResourceWithRawResponse,
-    IPListsResourceWithStreamingResponse,
-    AsyncIPListsResourceWithStreamingResponse,
+from .asn.asn import (
+    ASNResource,
+    AsyncASNResource,
+    ASNResourceWithRawResponse,
+    AsyncASNResourceWithRawResponse,
+    ASNResourceWithStreamingResponse,
+    AsyncASNResourceWithStreamingResponse,
 )
 from ..._compat import cached_property
 from .sinkholes import (
@@ -69,14 +52,13 @@
     DomainHistoryResourceWithStreamingResponse,
     AsyncDomainHistoryResourceWithStreamingResponse,
 )
-from .domains.domains import DomainsResource, AsyncDomainsResource
-from .indicator_feeds import (
-    IndicatorFeedsResource,
-    AsyncIndicatorFeedsResource,
-    IndicatorFeedsResourceWithRawResponse,
-    AsyncIndicatorFeedsResourceWithRawResponse,
-    IndicatorFeedsResourceWithStreamingResponse,
-    AsyncIndicatorFeedsResourceWithStreamingResponse,
+from .domains.domains import (
+    DomainsResource,
+    AsyncDomainsResource,
+    DomainsResourceWithRawResponse,
+    AsyncDomainsResourceWithRawResponse,
+    DomainsResourceWithStreamingResponse,
+    AsyncDomainsResourceWithStreamingResponse,
 )
 from .miscategorizations import (
     MiscategorizationsResource,
@@ -86,7 +68,15 @@
     MiscategorizationsResourceWithStreamingResponse,
     AsyncMiscategorizationsResourceWithStreamingResponse,
 )
-from .attack_surface_report import (
+from .indicator_feeds.indicator_feeds import (
+    IndicatorFeedsResource,
+    AsyncIndicatorFeedsResource,
+    IndicatorFeedsResourceWithRawResponse,
+    AsyncIndicatorFeedsResourceWithRawResponse,
+    IndicatorFeedsResourceWithStreamingResponse,
+    AsyncIndicatorFeedsResourceWithStreamingResponse,
+)
+from .attack_surface_report.attack_surface_report import (
     AttackSurfaceReportResource,
     AsyncAttackSurfaceReportResource,
     AttackSurfaceReportResourceWithRawResponse,
@@ -94,8 +84,6 @@
     AttackSurfaceReportResourceWithStreamingResponse,
     AsyncAttackSurfaceReportResourceWithStreamingResponse,
 )
-from .indicator_feeds.indicator_feeds import IndicatorFeedsResource, AsyncIndicatorFeedsResource
-from .attack_surface_report.attack_surface_report import AttackSurfaceReportResource, AsyncAttackSurfaceReportResource
 
 __all__ = ["IntelResource", "AsyncIntelResource"]
 
@@ -121,10 +109,6 @@ def domain_history(self) -> DomainHistoryResource:
     def ips(self) -> IPsResource:
         return IPsResource(self._client)
 
-    @cached_property
-    def ip_lists(self) -> IPListsResource:
-        return IPListsResource(self._client)
-
     @cached_property
     def miscategorizations(self) -> MiscategorizationsResource:
         return MiscategorizationsResource(self._client)
@@ -147,10 +131,21 @@ def attack_surface_report(self) -> AttackSurfaceReportResource:
 
     @cached_property
     def with_raw_response(self) -> IntelResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return IntelResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> IntelResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return IntelResourceWithStreamingResponse(self)
 
 
@@ -175,10 +170,6 @@ def domain_history(self) -> AsyncDomainHistoryResource:
     def ips(self) -> AsyncIPsResource:
         return AsyncIPsResource(self._client)
 
-    @cached_property
-    def ip_lists(self) -> AsyncIPListsResource:
-        return AsyncIPListsResource(self._client)
-
     @cached_property
     def miscategorizations(self) -> AsyncMiscategorizationsResource:
         return AsyncMiscategorizationsResource(self._client)
@@ -201,10 +192,21 @@ def attack_surface_report(self) -> AsyncAttackSurfaceReportResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncIntelResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncIntelResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncIntelResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncIntelResourceWithStreamingResponse(self)
 
 
@@ -232,10 +234,6 @@ def domain_history(self) -> DomainHistoryResourceWithRawResponse:
     def ips(self) -> IPsResourceWithRawResponse:
         return IPsResourceWithRawResponse(self._intel.ips)
 
-    @cached_property
-    def ip_lists(self) -> IPListsResourceWithRawResponse:
-        return IPListsResourceWithRawResponse(self._intel.ip_lists)
-
     @cached_property
     def miscategorizations(self) -> MiscategorizationsResourceWithRawResponse:
         return MiscategorizationsResourceWithRawResponse(self._intel.miscategorizations)
@@ -281,10 +279,6 @@ def domain_history(self) -> AsyncDomainHistoryResourceWithRawResponse:
     def ips(self) -> AsyncIPsResourceWithRawResponse:
         return AsyncIPsResourceWithRawResponse(self._intel.ips)
 
-    @cached_property
-    def ip_lists(self) -> AsyncIPListsResourceWithRawResponse:
-        return AsyncIPListsResourceWithRawResponse(self._intel.ip_lists)
-
     @cached_property
     def miscategorizations(self) -> AsyncMiscategorizationsResourceWithRawResponse:
         return AsyncMiscategorizationsResourceWithRawResponse(self._intel.miscategorizations)
@@ -330,10 +324,6 @@ def domain_history(self) -> DomainHistoryResourceWithStreamingResponse:
     def ips(self) -> IPsResourceWithStreamingResponse:
         return IPsResourceWithStreamingResponse(self._intel.ips)
 
-    @cached_property
-    def ip_lists(self) -> IPListsResourceWithStreamingResponse:
-        return IPListsResourceWithStreamingResponse(self._intel.ip_lists)
-
     @cached_property
     def miscategorizations(self) -> MiscategorizationsResourceWithStreamingResponse:
         return MiscategorizationsResourceWithStreamingResponse(self._intel.miscategorizations)
@@ -379,10 +369,6 @@ def domain_history(self) -> AsyncDomainHistoryResourceWithStreamingResponse:
     def ips(self) -> AsyncIPsResourceWithStreamingResponse:
         return AsyncIPsResourceWithStreamingResponse(self._intel.ips)
 
-    @cached_property
-    def ip_lists(self) -> AsyncIPListsResourceWithStreamingResponse:
-        return AsyncIPListsResourceWithStreamingResponse(self._intel.ip_lists)
-
     @cached_property
     def miscategorizations(self) -> AsyncMiscategorizationsResourceWithStreamingResponse:
         return AsyncMiscategorizationsResourceWithStreamingResponse(self._intel.miscategorizations)
diff --git a/src/cloudflare/resources/intel/ip_lists.py b/src/cloudflare/resources/intel/ip_lists.py
deleted file mode 100644
index 71a5e24ea72..00000000000
--- a/src/cloudflare/resources/intel/ip_lists.py
+++ /dev/null
@@ -1,156 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Optional, cast
-
-import httpx
-
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
-from ...types.intel.ip_list_get_response import IPListGetResponse
-
-__all__ = ["IPListsResource", "AsyncIPListsResource"]
-
-
-class IPListsResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> IPListsResourceWithRawResponse:
-        return IPListsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> IPListsResourceWithStreamingResponse:
-        return IPListsResourceWithStreamingResponse(self)
-
-    def get(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IPListGetResponse]:
-        """
-        Get IP Lists
-
-        Args:
-          account_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/intel/ip-list",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IPListGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IPListGetResponse]], ResultWrapper[IPListGetResponse]),
-        )
-
-
-class AsyncIPListsResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncIPListsResourceWithRawResponse:
-        return AsyncIPListsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncIPListsResourceWithStreamingResponse:
-        return AsyncIPListsResourceWithStreamingResponse(self)
-
-    async def get(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IPListGetResponse]:
-        """
-        Get IP Lists
-
-        Args:
-          account_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/intel/ip-list",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IPListGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IPListGetResponse]], ResultWrapper[IPListGetResponse]),
-        )
-
-
-class IPListsResourceWithRawResponse:
-    def __init__(self, ip_lists: IPListsResource) -> None:
-        self._ip_lists = ip_lists
-
-        self.get = to_raw_response_wrapper(
-            ip_lists.get,
-        )
-
-
-class AsyncIPListsResourceWithRawResponse:
-    def __init__(self, ip_lists: AsyncIPListsResource) -> None:
-        self._ip_lists = ip_lists
-
-        self.get = async_to_raw_response_wrapper(
-            ip_lists.get,
-        )
-
-
-class IPListsResourceWithStreamingResponse:
-    def __init__(self, ip_lists: IPListsResource) -> None:
-        self._ip_lists = ip_lists
-
-        self.get = to_streamed_response_wrapper(
-            ip_lists.get,
-        )
-
-
-class AsyncIPListsResourceWithStreamingResponse:
-    def __init__(self, ip_lists: AsyncIPListsResource) -> None:
-        self._ip_lists = ip_lists
-
-        self.get = async_to_streamed_response_wrapper(
-            ip_lists.get,
-        )
diff --git a/src/cloudflare/resources/intel/ips.py b/src/cloudflare/resources/intel/ips.py
index b652e3a4898..4ac92b3f687 100644
--- a/src/cloudflare/resources/intel/ips.py
+++ b/src/cloudflare/resources/intel/ips.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -30,30 +27,43 @@
 class IPsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> IPsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return IPsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> IPsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return IPsResourceWithStreamingResponse(self)
 
     def get(
         self,
         *,
         account_id: str,
-        ipv4: str | NotGiven = NOT_GIVEN,
-        ipv6: str | NotGiven = NOT_GIVEN,
+        ipv4: str | Omit = omit,
+        ipv6: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IPGetResponse]:
         """
-        Get IP Overview
+        Gets the geolocation, ASN, infrastructure type of the ASN, and any security
+        threat categories of an IP address. **Must provide ip query parameters.** For
+        example, `/intel/ip?ipv4=1.1.1.1` or `/intel/ip?ipv6=2001:db8::1`.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -88,30 +98,43 @@ def get(
 class AsyncIPsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncIPsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncIPsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncIPsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncIPsResourceWithStreamingResponse(self)
 
     async def get(
         self,
         *,
         account_id: str,
-        ipv4: str | NotGiven = NOT_GIVEN,
-        ipv6: str | NotGiven = NOT_GIVEN,
+        ipv4: str | Omit = omit,
+        ipv6: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IPGetResponse]:
         """
-        Get IP Overview
+        Gets the geolocation, ASN, infrastructure type of the ASN, and any security
+        threat categories of an IP address. **Must provide ip query parameters.** For
+        example, `/intel/ip?ipv4=1.1.1.1` or `/intel/ip?ipv6=2001:db8::1`.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/intel/miscategorizations.py b/src/cloudflare/resources/intel/miscategorizations.py
index dfb119d4d40..c4590330302 100644
--- a/src/cloudflare/resources/intel/miscategorizations.py
+++ b/src/cloudflare/resources/intel/miscategorizations.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, Iterable, Optional, cast
+from typing import Iterable, Optional
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -20,7 +17,6 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._wrappers import ResultWrapper
 from ...types.intel import miscategorization_create_params
 from ..._base_client import make_request_options
 from ...types.intel.miscategorization_create_response import MiscategorizationCreateResponse
@@ -31,35 +27,46 @@
 class MiscategorizationsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> MiscategorizationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return MiscategorizationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> MiscategorizationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return MiscategorizationsResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        content_adds: Iterable[float] | NotGiven = NOT_GIVEN,
-        content_removes: Iterable[float] | NotGiven = NOT_GIVEN,
-        indicator_type: Literal["domain", "ipv4", "ipv6", "url"] | NotGiven = NOT_GIVEN,
-        ip: object | NotGiven = NOT_GIVEN,
-        security_adds: Iterable[float] | NotGiven = NOT_GIVEN,
-        security_removes: Iterable[float] | NotGiven = NOT_GIVEN,
-        url: str | NotGiven = NOT_GIVEN,
+        content_adds: Iterable[int] | Omit = omit,
+        content_removes: Iterable[int] | Omit = omit,
+        indicator_type: Literal["domain", "ipv4", "ipv6", "url"] | Omit = omit,
+        ip: Optional[str] | Omit = omit,
+        security_adds: Iterable[int] | Omit = omit,
+        security_removes: Iterable[int] | Omit = omit,
+        url: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MiscategorizationCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MiscategorizationCreateResponse:
         """
-        Create Miscategorization
+        Allows you to submit requests to change a domain’s category.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           content_adds: Content category IDs to add.
 
@@ -85,68 +92,70 @@ def create(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            Optional[MiscategorizationCreateResponse],
-            self._post(
-                f"/accounts/{account_id}/intel/miscategorization",
-                body=maybe_transform(
-                    {
-                        "content_adds": content_adds,
-                        "content_removes": content_removes,
-                        "indicator_type": indicator_type,
-                        "ip": ip,
-                        "security_adds": security_adds,
-                        "security_removes": security_removes,
-                        "url": url,
-                    },
-                    miscategorization_create_params.MiscategorizationCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[MiscategorizationCreateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[MiscategorizationCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._post(
+            f"/accounts/{account_id}/intel/miscategorization",
+            body=maybe_transform(
+                {
+                    "content_adds": content_adds,
+                    "content_removes": content_removes,
+                    "indicator_type": indicator_type,
+                    "ip": ip,
+                    "security_adds": security_adds,
+                    "security_removes": security_removes,
+                    "url": url,
+                },
+                miscategorization_create_params.MiscategorizationCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
+            cast_to=MiscategorizationCreateResponse,
         )
 
 
 class AsyncMiscategorizationsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncMiscategorizationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncMiscategorizationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncMiscategorizationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncMiscategorizationsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        content_adds: Iterable[float] | NotGiven = NOT_GIVEN,
-        content_removes: Iterable[float] | NotGiven = NOT_GIVEN,
-        indicator_type: Literal["domain", "ipv4", "ipv6", "url"] | NotGiven = NOT_GIVEN,
-        ip: object | NotGiven = NOT_GIVEN,
-        security_adds: Iterable[float] | NotGiven = NOT_GIVEN,
-        security_removes: Iterable[float] | NotGiven = NOT_GIVEN,
-        url: str | NotGiven = NOT_GIVEN,
+        content_adds: Iterable[int] | Omit = omit,
+        content_removes: Iterable[int] | Omit = omit,
+        indicator_type: Literal["domain", "ipv4", "ipv6", "url"] | Omit = omit,
+        ip: Optional[str] | Omit = omit,
+        security_adds: Iterable[int] | Omit = omit,
+        security_removes: Iterable[int] | Omit = omit,
+        url: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MiscategorizationCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MiscategorizationCreateResponse:
         """
-        Create Miscategorization
+        Allows you to submit requests to change a domain’s category.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           content_adds: Content category IDs to add.
 
@@ -172,33 +181,24 @@ async def create(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            Optional[MiscategorizationCreateResponse],
-            await self._post(
-                f"/accounts/{account_id}/intel/miscategorization",
-                body=await async_maybe_transform(
-                    {
-                        "content_adds": content_adds,
-                        "content_removes": content_removes,
-                        "indicator_type": indicator_type,
-                        "ip": ip,
-                        "security_adds": security_adds,
-                        "security_removes": security_removes,
-                        "url": url,
-                    },
-                    miscategorization_create_params.MiscategorizationCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[MiscategorizationCreateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[MiscategorizationCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._post(
+            f"/accounts/{account_id}/intel/miscategorization",
+            body=await async_maybe_transform(
+                {
+                    "content_adds": content_adds,
+                    "content_removes": content_removes,
+                    "indicator_type": indicator_type,
+                    "ip": ip,
+                    "security_adds": security_adds,
+                    "security_removes": security_removes,
+                    "url": url,
+                },
+                miscategorization_create_params.MiscategorizationCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
+            cast_to=MiscategorizationCreateResponse,
         )
 
 
diff --git a/src/cloudflare/resources/intel/sinkholes.py b/src/cloudflare/resources/intel/sinkholes.py
index 42afd8a78c0..e9cce87bbd0 100644
--- a/src/cloudflare/resources/intel/sinkholes.py
+++ b/src/cloudflare/resources/intel/sinkholes.py
@@ -4,7 +4,7 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Query, Headers, NotGiven, not_given
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -23,10 +23,21 @@
 class SinkholesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SinkholesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SinkholesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SinkholesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SinkholesResourceWithStreamingResponse(self)
 
     def list(
@@ -38,7 +49,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Sinkhole]:
         """
         List sinkholes owned by this account
@@ -69,10 +80,21 @@ def list(
 class AsyncSinkholesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSinkholesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSinkholesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSinkholesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSinkholesResourceWithStreamingResponse(self)
 
     def list(
@@ -84,7 +106,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Sinkhole, AsyncSinglePage[Sinkhole]]:
         """
         List sinkholes owned by this account
diff --git a/src/cloudflare/resources/intel/whois.py b/src/cloudflare/resources/intel/whois.py
index ebef795bb02..852e7142c0d 100644
--- a/src/cloudflare/resources/intel/whois.py
+++ b/src/cloudflare/resources/intel/whois.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -30,29 +27,40 @@
 class WhoisResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> WhoisResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return WhoisResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> WhoisResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return WhoisResourceWithStreamingResponse(self)
 
     def get(
         self,
         *,
         account_id: str,
-        domain: str | NotGiven = NOT_GIVEN,
+        domain: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[WhoisGetResponse]:
         """
         Get WHOIS Record
 
         Args:
-          account_id: Identifier
+          account_id: Use to uniquely identify or reference the resource.
 
           extra_headers: Send extra headers
 
@@ -81,29 +89,40 @@ def get(
 class AsyncWhoisResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncWhoisResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncWhoisResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncWhoisResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncWhoisResourceWithStreamingResponse(self)
 
     async def get(
         self,
         *,
         account_id: str,
-        domain: str | NotGiven = NOT_GIVEN,
+        domain: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[WhoisGetResponse]:
         """
         Get WHOIS Record
 
         Args:
-          account_id: Identifier
+          account_id: Use to uniquely identify or reference the resource.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/ips.py b/src/cloudflare/resources/ips.py
index 9beb8f86528..29d43e4eaa5 100644
--- a/src/cloudflare/resources/ips.py
+++ b/src/cloudflare/resources/ips.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from .._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from .._utils import maybe_transform, async_maybe_transform
 from .._compat import cached_property
 from .._resource import SyncAPIResource, AsyncAPIResource
 from .._response import (
@@ -30,22 +27,33 @@
 class IPsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> IPsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return IPsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> IPsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return IPsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
-        networks: str | NotGiven = NOT_GIVEN,
+        networks: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IPListResponse]:
         """
         Get IPs used on the Cloudflare/JD Cloud network, see
@@ -86,22 +94,33 @@ def list(
 class AsyncIPsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncIPsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncIPsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncIPsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncIPsResourceWithStreamingResponse(self)
 
     async def list(
         self,
         *,
-        networks: str | NotGiven = NOT_GIVEN,
+        networks: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IPListResponse]:
         """
         Get IPs used on the Cloudflare/JD Cloud network, see
diff --git a/src/cloudflare/resources/keyless_certificates.py b/src/cloudflare/resources/keyless_certificates.py
index 8aec29d7a7d..e7406b9ad41 100644
--- a/src/cloudflare/resources/keyless_certificates.py
+++ b/src/cloudflare/resources/keyless_certificates.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from .._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from .._utils import maybe_transform, async_maybe_transform
 from .._compat import cached_property
 from .._resource import SyncAPIResource, AsyncAPIResource
 from .._response import (
@@ -35,10 +32,21 @@
 class KeylessCertificatesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> KeylessCertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return KeylessCertificatesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> KeylessCertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return KeylessCertificatesResourceWithStreamingResponse(self)
 
     def create(
@@ -48,21 +56,21 @@ def create(
         certificate: str,
         host: str,
         port: float,
-        bundle_method: BundleMethod | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        tunnel: TunnelParam | NotGiven = NOT_GIVEN,
+        bundle_method: BundleMethod | Omit = omit,
+        name: str | Omit = omit,
+        tunnel: TunnelParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[KeylessCertificate]:
         """
         Create Keyless SSL Configuration
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           certificate: The zone's SSL certificate or SSL certificate and intermediate(s).
 
@@ -122,13 +130,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[KeylessCertificate]:
         """
         List all Keyless SSL configurations for a given zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -159,15 +167,15 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[KeylessCertificateDeleteResponse]:
         """
         Delete Keyless SSL Configuration
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          keyless_certificate_id: Identifier
+          keyless_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -202,17 +210,17 @@ def edit(
         keyless_certificate_id: str,
         *,
         zone_id: str,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        host: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        port: float | NotGiven = NOT_GIVEN,
-        tunnel: TunnelParam | NotGiven = NOT_GIVEN,
+        enabled: bool | Omit = omit,
+        host: str | Omit = omit,
+        name: str | Omit = omit,
+        port: float | Omit = omit,
+        tunnel: TunnelParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[KeylessCertificate]:
         """This will update attributes of a Keyless SSL.
 
@@ -220,9 +228,9 @@ def edit(
         following: host,name,port.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          keyless_certificate_id: Identifier
+          keyless_certificate_id: Identifier.
 
           enabled: Whether or not the Keyless SSL is on or off.
 
@@ -281,15 +289,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[KeylessCertificate]:
         """
         Get details for one Keyless SSL configuration.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          keyless_certificate_id: Identifier
+          keyless_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -321,10 +329,21 @@ def get(
 class AsyncKeylessCertificatesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncKeylessCertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncKeylessCertificatesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncKeylessCertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncKeylessCertificatesResourceWithStreamingResponse(self)
 
     async def create(
@@ -334,21 +353,21 @@ async def create(
         certificate: str,
         host: str,
         port: float,
-        bundle_method: BundleMethod | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        tunnel: TunnelParam | NotGiven = NOT_GIVEN,
+        bundle_method: BundleMethod | Omit = omit,
+        name: str | Omit = omit,
+        tunnel: TunnelParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[KeylessCertificate]:
         """
         Create Keyless SSL Configuration
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           certificate: The zone's SSL certificate or SSL certificate and intermediate(s).
 
@@ -408,13 +427,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[KeylessCertificate, AsyncSinglePage[KeylessCertificate]]:
         """
         List all Keyless SSL configurations for a given zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -445,15 +464,15 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[KeylessCertificateDeleteResponse]:
         """
         Delete Keyless SSL Configuration
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          keyless_certificate_id: Identifier
+          keyless_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -488,17 +507,17 @@ async def edit(
         keyless_certificate_id: str,
         *,
         zone_id: str,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        host: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        port: float | NotGiven = NOT_GIVEN,
-        tunnel: TunnelParam | NotGiven = NOT_GIVEN,
+        enabled: bool | Omit = omit,
+        host: str | Omit = omit,
+        name: str | Omit = omit,
+        port: float | Omit = omit,
+        tunnel: TunnelParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[KeylessCertificate]:
         """This will update attributes of a Keyless SSL.
 
@@ -506,9 +525,9 @@ async def edit(
         following: host,name,port.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          keyless_certificate_id: Identifier
+          keyless_certificate_id: Identifier.
 
           enabled: Whether or not the Keyless SSL is on or off.
 
@@ -567,15 +586,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[KeylessCertificate]:
         """
         Get details for one Keyless SSL configuration.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          keyless_certificate_id: Identifier
+          keyless_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/kv/kv.py b/src/cloudflare/resources/kv/kv.py
index 4adb24ff8f6..e6c1cc36c57 100644
--- a/src/cloudflare/resources/kv/kv.py
+++ b/src/cloudflare/resources/kv/kv.py
@@ -3,7 +3,8 @@
 from __future__ import annotations
 
 from ..._compat import cached_property
-from .namespaces import (
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .namespaces.namespaces import (
     NamespacesResource,
     AsyncNamespacesResource,
     NamespacesResourceWithRawResponse,
@@ -11,8 +12,6 @@
     NamespacesResourceWithStreamingResponse,
     AsyncNamespacesResourceWithStreamingResponse,
 )
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .namespaces.namespaces import NamespacesResource, AsyncNamespacesResource
 
 __all__ = ["KVResource", "AsyncKVResource"]
 
@@ -24,10 +23,21 @@ def namespaces(self) -> NamespacesResource:
 
     @cached_property
     def with_raw_response(self) -> KVResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return KVResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> KVResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return KVResourceWithStreamingResponse(self)
 
 
@@ -38,10 +48,21 @@ def namespaces(self) -> AsyncNamespacesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncKVResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncKVResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncKVResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncKVResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/kv/namespaces/__init__.py b/src/cloudflare/resources/kv/namespaces/__init__.py
index 0784dbb3103..eaf6f601cea 100644
--- a/src/cloudflare/resources/kv/namespaces/__init__.py
+++ b/src/cloudflare/resources/kv/namespaces/__init__.py
@@ -1,13 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from .bulk import (
-    BulkResource,
-    AsyncBulkResource,
-    BulkResourceWithRawResponse,
-    AsyncBulkResourceWithRawResponse,
-    BulkResourceWithStreamingResponse,
-    AsyncBulkResourceWithStreamingResponse,
-)
 from .keys import (
     KeysResource,
     AsyncKeysResource,
@@ -42,12 +34,6 @@
 )
 
 __all__ = [
-    "BulkResource",
-    "AsyncBulkResource",
-    "BulkResourceWithRawResponse",
-    "AsyncBulkResourceWithRawResponse",
-    "BulkResourceWithStreamingResponse",
-    "AsyncBulkResourceWithStreamingResponse",
     "KeysResource",
     "AsyncKeysResource",
     "KeysResourceWithRawResponse",
diff --git a/src/cloudflare/resources/kv/namespaces/bulk.py b/src/cloudflare/resources/kv/namespaces/bulk.py
deleted file mode 100644
index 6c9c6a7d1a7..00000000000
--- a/src/cloudflare/resources/kv/namespaces/bulk.py
+++ /dev/null
@@ -1,292 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Iterable, Optional, cast
-
-import httpx
-
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
-from ....types.kv.namespaces import bulk_update_params
-from ....types.kv.namespaces.bulk_delete_response import BulkDeleteResponse
-from ....types.kv.namespaces.bulk_update_response import BulkUpdateResponse
-
-__all__ = ["BulkResource", "AsyncBulkResource"]
-
-
-class BulkResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> BulkResourceWithRawResponse:
-        return BulkResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> BulkResourceWithStreamingResponse:
-        return BulkResourceWithStreamingResponse(self)
-
-    def update(
-        self,
-        namespace_id: str,
-        *,
-        account_id: str,
-        body: Iterable[bulk_update_params.Body],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[BulkUpdateResponse]:
-        """Write multiple keys and values at once.
-
-        Body should be an array of up to 10,000
-        key-value pairs to be stored, along with optional expiration information.
-        Existing values and expirations will be overwritten. If neither `expiration` nor
-        `expiration_ttl` is specified, the key-value pair will never expire. If both are
-        set, `expiration_ttl` is used and `expiration` is ignored. The entire request
-        size must be 100 megabytes or less.
-
-        Args:
-          account_id: Identifier
-
-          namespace_id: Namespace identifier tag.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not namespace_id:
-            raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
-        return self._put(
-            f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk",
-            body=maybe_transform(body, bulk_update_params.BulkUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[BulkUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[BulkUpdateResponse]], ResultWrapper[BulkUpdateResponse]),
-        )
-
-    def delete(
-        self,
-        namespace_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[BulkDeleteResponse]:
-        """Remove multiple KV pairs from the namespace.
-
-        Body should be an array of up to
-        10,000 keys to be removed.
-
-        Args:
-          account_id: Identifier
-
-          namespace_id: Namespace identifier tag.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not namespace_id:
-            raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
-        return self._delete(
-            f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[BulkDeleteResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[BulkDeleteResponse]], ResultWrapper[BulkDeleteResponse]),
-        )
-
-
-class AsyncBulkResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncBulkResourceWithRawResponse:
-        return AsyncBulkResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncBulkResourceWithStreamingResponse:
-        return AsyncBulkResourceWithStreamingResponse(self)
-
-    async def update(
-        self,
-        namespace_id: str,
-        *,
-        account_id: str,
-        body: Iterable[bulk_update_params.Body],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[BulkUpdateResponse]:
-        """Write multiple keys and values at once.
-
-        Body should be an array of up to 10,000
-        key-value pairs to be stored, along with optional expiration information.
-        Existing values and expirations will be overwritten. If neither `expiration` nor
-        `expiration_ttl` is specified, the key-value pair will never expire. If both are
-        set, `expiration_ttl` is used and `expiration` is ignored. The entire request
-        size must be 100 megabytes or less.
-
-        Args:
-          account_id: Identifier
-
-          namespace_id: Namespace identifier tag.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not namespace_id:
-            raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
-        return await self._put(
-            f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk",
-            body=await async_maybe_transform(body, bulk_update_params.BulkUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[BulkUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[BulkUpdateResponse]], ResultWrapper[BulkUpdateResponse]),
-        )
-
-    async def delete(
-        self,
-        namespace_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[BulkDeleteResponse]:
-        """Remove multiple KV pairs from the namespace.
-
-        Body should be an array of up to
-        10,000 keys to be removed.
-
-        Args:
-          account_id: Identifier
-
-          namespace_id: Namespace identifier tag.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not namespace_id:
-            raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
-        return await self._delete(
-            f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[BulkDeleteResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[BulkDeleteResponse]], ResultWrapper[BulkDeleteResponse]),
-        )
-
-
-class BulkResourceWithRawResponse:
-    def __init__(self, bulk: BulkResource) -> None:
-        self._bulk = bulk
-
-        self.update = to_raw_response_wrapper(
-            bulk.update,
-        )
-        self.delete = to_raw_response_wrapper(
-            bulk.delete,
-        )
-
-
-class AsyncBulkResourceWithRawResponse:
-    def __init__(self, bulk: AsyncBulkResource) -> None:
-        self._bulk = bulk
-
-        self.update = async_to_raw_response_wrapper(
-            bulk.update,
-        )
-        self.delete = async_to_raw_response_wrapper(
-            bulk.delete,
-        )
-
-
-class BulkResourceWithStreamingResponse:
-    def __init__(self, bulk: BulkResource) -> None:
-        self._bulk = bulk
-
-        self.update = to_streamed_response_wrapper(
-            bulk.update,
-        )
-        self.delete = to_streamed_response_wrapper(
-            bulk.delete,
-        )
-
-
-class AsyncBulkResourceWithStreamingResponse:
-    def __init__(self, bulk: AsyncBulkResource) -> None:
-        self._bulk = bulk
-
-        self.update = async_to_streamed_response_wrapper(
-            bulk.update,
-        )
-        self.delete = async_to_streamed_response_wrapper(
-            bulk.delete,
-        )
diff --git a/src/cloudflare/resources/kv/namespaces/keys.py b/src/cloudflare/resources/kv/namespaces/keys.py
index c61d663f9ba..15f21598540 100644
--- a/src/cloudflare/resources/kv/namespaces/keys.py
+++ b/src/cloudflare/resources/kv/namespaces/keys.py
@@ -2,10 +2,14 @@
 
 from __future__ import annotations
 
+import typing_extensions
+from typing import Any, Type, Iterable, Optional, cast
+from typing_extensions import Literal
+
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import maybe_transform
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -14,10 +18,14 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
+from ...._wrappers import ResultWrapper
 from ....pagination import SyncCursorLimitPagination, AsyncCursorLimitPagination
 from ...._base_client import AsyncPaginator, make_request_options
-from ....types.kv.namespaces import key_list_params
+from ....types.kv.namespaces import key_list_params, key_bulk_get_params, key_bulk_update_params
 from ....types.kv.namespaces.key import Key
+from ....types.kv.namespaces.key_bulk_get_response import KeyBulkGetResponse
+from ....types.kv.namespaces.key_bulk_delete_response import KeyBulkDeleteResponse
+from ....types.kv.namespaces.key_bulk_update_response import KeyBulkUpdateResponse
 
 __all__ = ["KeysResource", "AsyncKeysResource"]
 
@@ -25,10 +33,21 @@
 class KeysResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> KeysResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return KeysResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> KeysResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return KeysResourceWithStreamingResponse(self)
 
     def list(
@@ -36,21 +55,21 @@ def list(
         namespace_id: str,
         *,
         account_id: str,
-        cursor: str | NotGiven = NOT_GIVEN,
-        limit: float | NotGiven = NOT_GIVEN,
-        prefix: str | NotGiven = NOT_GIVEN,
+        cursor: str | Omit = omit,
+        limit: float | Omit = omit,
+        prefix: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncCursorLimitPagination[Key]:
         """
         Lists a namespace's keys.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           namespace_id: Namespace identifier tag.
 
@@ -59,11 +78,11 @@ def list(
               parameter. A valid value for the cursor can be obtained from the `cursors`
               object in the `result_info` structure.
 
-          limit: The number of keys to return. The cursor attribute may be used to iterate over
-              the next batch of keys if there are more than the limit.
+          limit: Limits the number of keys returned in the response. The cursor attribute may be
+              used to iterate over the next batch of keys if there are more than the limit.
 
-          prefix: A string prefix used to filter down which keys will be returned. Exact matches
-              and any key names that begin with the prefix will be returned.
+          prefix: Filters returned keys by a name prefix. Exact matches and any key names that
+              begin with the prefix will be returned.
 
           extra_headers: Send extra headers
 
@@ -97,14 +116,197 @@ def list(
             model=Key,
         )
 
+    @typing_extensions.deprecated("Please use kv.namespaces.bulk_delete instead")
+    def bulk_delete(
+        self,
+        namespace_id: str,
+        *,
+        account_id: str,
+        body: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[KeyBulkDeleteResponse]:
+        """Remove multiple KV pairs from the namespace.
+
+        Body should be an array of up to
+        10,000 keys to be removed.
+
+        Args:
+          account_id: Identifier.
+
+          namespace_id: Namespace identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not namespace_id:
+            raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk/delete",
+            body=maybe_transform(body, SequenceNotStr[str]),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[KeyBulkDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[KeyBulkDeleteResponse]], ResultWrapper[KeyBulkDeleteResponse]),
+        )
+
+    @typing_extensions.deprecated("Please use kv.namespaces.bulk_get instead")
+    def bulk_get(
+        self,
+        namespace_id: str,
+        *,
+        account_id: str,
+        keys: SequenceNotStr[str],
+        type: Literal["text", "json"] | Omit = omit,
+        with_metadata: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[KeyBulkGetResponse]:
+        """Retrieve up to 100 KV pairs from the namespace.
+
+        Keys must contain text-based
+        values. JSON values can optionally be parsed instead of being returned as a
+        string value. Metadata can be included if `withMetadata` is true.
+
+        Args:
+          account_id: Identifier.
+
+          namespace_id: Namespace identifier tag.
+
+          keys: Array of keys to retrieve (maximum of 100).
+
+          type: Whether to parse JSON values in the response.
+
+          with_metadata: Whether to include metadata in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not namespace_id:
+            raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
+        return cast(
+            Optional[KeyBulkGetResponse],
+            self._post(
+                f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk/get",
+                body=maybe_transform(
+                    {
+                        "keys": keys,
+                        "type": type,
+                        "with_metadata": with_metadata,
+                    },
+                    key_bulk_get_params.KeyBulkGetParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[KeyBulkGetResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[KeyBulkGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    @typing_extensions.deprecated("Please use kv.namespaces.bulk_update instead")
+    def bulk_update(
+        self,
+        namespace_id: str,
+        *,
+        account_id: str,
+        body: Iterable[key_bulk_update_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[KeyBulkUpdateResponse]:
+        """Write multiple keys and values at once.
+
+        Body should be an array of up to 10,000
+        key-value pairs to be stored, along with optional expiration information.
+        Existing values and expirations will be overwritten. If neither `expiration` nor
+        `expiration_ttl` is specified, the key-value pair will never expire. If both are
+        set, `expiration_ttl` is used and `expiration` is ignored. The entire request
+        size must be 100 megabytes or less.
+
+        Args:
+          account_id: Identifier.
+
+          namespace_id: Namespace identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not namespace_id:
+            raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk",
+            body=maybe_transform(body, Iterable[key_bulk_update_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[KeyBulkUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[KeyBulkUpdateResponse]], ResultWrapper[KeyBulkUpdateResponse]),
+        )
+
 
 class AsyncKeysResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncKeysResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncKeysResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncKeysResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncKeysResourceWithStreamingResponse(self)
 
     def list(
@@ -112,21 +314,21 @@ def list(
         namespace_id: str,
         *,
         account_id: str,
-        cursor: str | NotGiven = NOT_GIVEN,
-        limit: float | NotGiven = NOT_GIVEN,
-        prefix: str | NotGiven = NOT_GIVEN,
+        cursor: str | Omit = omit,
+        limit: float | Omit = omit,
+        prefix: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Key, AsyncCursorLimitPagination[Key]]:
         """
         Lists a namespace's keys.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           namespace_id: Namespace identifier tag.
 
@@ -135,11 +337,11 @@ def list(
               parameter. A valid value for the cursor can be obtained from the `cursors`
               object in the `result_info` structure.
 
-          limit: The number of keys to return. The cursor attribute may be used to iterate over
-              the next batch of keys if there are more than the limit.
+          limit: Limits the number of keys returned in the response. The cursor attribute may be
+              used to iterate over the next batch of keys if there are more than the limit.
 
-          prefix: A string prefix used to filter down which keys will be returned. Exact matches
-              and any key names that begin with the prefix will be returned.
+          prefix: Filters returned keys by a name prefix. Exact matches and any key names that
+              begin with the prefix will be returned.
 
           extra_headers: Send extra headers
 
@@ -173,6 +375,178 @@ def list(
             model=Key,
         )
 
+    @typing_extensions.deprecated("Please use kv.namespaces.bulk_delete instead")
+    async def bulk_delete(
+        self,
+        namespace_id: str,
+        *,
+        account_id: str,
+        body: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[KeyBulkDeleteResponse]:
+        """Remove multiple KV pairs from the namespace.
+
+        Body should be an array of up to
+        10,000 keys to be removed.
+
+        Args:
+          account_id: Identifier.
+
+          namespace_id: Namespace identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not namespace_id:
+            raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk/delete",
+            body=await async_maybe_transform(body, SequenceNotStr[str]),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[KeyBulkDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[KeyBulkDeleteResponse]], ResultWrapper[KeyBulkDeleteResponse]),
+        )
+
+    @typing_extensions.deprecated("Please use kv.namespaces.bulk_get instead")
+    async def bulk_get(
+        self,
+        namespace_id: str,
+        *,
+        account_id: str,
+        keys: SequenceNotStr[str],
+        type: Literal["text", "json"] | Omit = omit,
+        with_metadata: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[KeyBulkGetResponse]:
+        """Retrieve up to 100 KV pairs from the namespace.
+
+        Keys must contain text-based
+        values. JSON values can optionally be parsed instead of being returned as a
+        string value. Metadata can be included if `withMetadata` is true.
+
+        Args:
+          account_id: Identifier.
+
+          namespace_id: Namespace identifier tag.
+
+          keys: Array of keys to retrieve (maximum of 100).
+
+          type: Whether to parse JSON values in the response.
+
+          with_metadata: Whether to include metadata in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not namespace_id:
+            raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
+        return cast(
+            Optional[KeyBulkGetResponse],
+            await self._post(
+                f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk/get",
+                body=await async_maybe_transform(
+                    {
+                        "keys": keys,
+                        "type": type,
+                        "with_metadata": with_metadata,
+                    },
+                    key_bulk_get_params.KeyBulkGetParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[KeyBulkGetResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[KeyBulkGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    @typing_extensions.deprecated("Please use kv.namespaces.bulk_update instead")
+    async def bulk_update(
+        self,
+        namespace_id: str,
+        *,
+        account_id: str,
+        body: Iterable[key_bulk_update_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[KeyBulkUpdateResponse]:
+        """Write multiple keys and values at once.
+
+        Body should be an array of up to 10,000
+        key-value pairs to be stored, along with optional expiration information.
+        Existing values and expirations will be overwritten. If neither `expiration` nor
+        `expiration_ttl` is specified, the key-value pair will never expire. If both are
+        set, `expiration_ttl` is used and `expiration` is ignored. The entire request
+        size must be 100 megabytes or less.
+
+        Args:
+          account_id: Identifier.
+
+          namespace_id: Namespace identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not namespace_id:
+            raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk",
+            body=await async_maybe_transform(body, Iterable[key_bulk_update_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[KeyBulkUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[KeyBulkUpdateResponse]], ResultWrapper[KeyBulkUpdateResponse]),
+        )
+
 
 class KeysResourceWithRawResponse:
     def __init__(self, keys: KeysResource) -> None:
@@ -181,6 +555,21 @@ def __init__(self, keys: KeysResource) -> None:
         self.list = to_raw_response_wrapper(
             keys.list,
         )
+        self.bulk_delete = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                keys.bulk_delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                keys.bulk_get,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_update = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                keys.bulk_update,  # pyright: ignore[reportDeprecated],
+            )
+        )
 
 
 class AsyncKeysResourceWithRawResponse:
@@ -190,6 +579,21 @@ def __init__(self, keys: AsyncKeysResource) -> None:
         self.list = async_to_raw_response_wrapper(
             keys.list,
         )
+        self.bulk_delete = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                keys.bulk_delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                keys.bulk_get,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_update = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                keys.bulk_update,  # pyright: ignore[reportDeprecated],
+            )
+        )
 
 
 class KeysResourceWithStreamingResponse:
@@ -199,6 +603,21 @@ def __init__(self, keys: KeysResource) -> None:
         self.list = to_streamed_response_wrapper(
             keys.list,
         )
+        self.bulk_delete = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                keys.bulk_delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                keys.bulk_get,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_update = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                keys.bulk_update,  # pyright: ignore[reportDeprecated],
+            )
+        )
 
 
 class AsyncKeysResourceWithStreamingResponse:
@@ -208,3 +627,18 @@ def __init__(self, keys: AsyncKeysResource) -> None:
         self.list = async_to_streamed_response_wrapper(
             keys.list,
         )
+        self.bulk_delete = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                keys.bulk_delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                keys.bulk_get,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_update = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                keys.bulk_update,  # pyright: ignore[reportDeprecated],
+            )
+        )
diff --git a/src/cloudflare/resources/kv/namespaces/metadata.py b/src/cloudflare/resources/kv/namespaces/metadata.py
index 1aef3f0725d..9310c0f11d0 100644
--- a/src/cloudflare/resources/kv/namespaces/metadata.py
+++ b/src/cloudflare/resources/kv/namespaces/metadata.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -17,7 +17,6 @@
 )
 from ...._wrappers import ResultWrapper
 from ...._base_client import make_request_options
-from ....types.kv.namespaces.metadata_get_response import MetadataGetResponse
 
 __all__ = ["MetadataResource", "AsyncMetadataResource"]
 
@@ -25,10 +24,21 @@
 class MetadataResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> MetadataResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return MetadataResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> MetadataResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return MetadataResourceWithStreamingResponse(self)
 
     def get(
@@ -42,8 +52,8 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MetadataGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """Returns the metadata associated with the given key in the given namespace.
 
         Use
@@ -51,7 +61,7 @@ def get(
         name.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           namespace_id: Namespace identifier tag.
 
@@ -79,19 +89,30 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[MetadataGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[MetadataGetResponse]], ResultWrapper[MetadataGetResponse]),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
 
 class AsyncMetadataResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncMetadataResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncMetadataResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncMetadataResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncMetadataResourceWithStreamingResponse(self)
 
     async def get(
@@ -105,8 +126,8 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[MetadataGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """Returns the metadata associated with the given key in the given namespace.
 
         Use
@@ -114,7 +135,7 @@ async def get(
         name.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           namespace_id: Namespace identifier tag.
 
@@ -142,9 +163,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[MetadataGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[MetadataGetResponse]], ResultWrapper[MetadataGetResponse]),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
 
diff --git a/src/cloudflare/resources/kv/namespaces/namespaces.py b/src/cloudflare/resources/kv/namespaces/namespaces.py
index 6f82507c4e0..211ee6fcb6f 100644
--- a/src/cloudflare/resources/kv/namespaces/namespaces.py
+++ b/src/cloudflare/resources/kv/namespaces/namespaces.py
@@ -2,19 +2,11 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Any, Type, Iterable, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from .bulk import (
-    BulkResource,
-    AsyncBulkResource,
-    BulkResourceWithRawResponse,
-    AsyncBulkResourceWithRawResponse,
-    BulkResourceWithStreamingResponse,
-    AsyncBulkResourceWithStreamingResponse,
-)
 from .keys import (
     KeysResource,
     AsyncKeysResource,
@@ -39,13 +31,16 @@
     MetadataResourceWithStreamingResponse,
     AsyncMetadataResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
-from ....types.kv import namespace_list_params, namespace_create_params, namespace_update_params
+from ....types.kv import (
+    namespace_list_params,
+    namespace_create_params,
+    namespace_update_params,
+    namespace_bulk_get_params,
+    namespace_bulk_update_params,
+)
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
     to_raw_response_wrapper,
@@ -58,16 +53,14 @@
 from ...._base_client import AsyncPaginator, make_request_options
 from ....types.kv.namespace import Namespace
 from ....types.kv.namespace_delete_response import NamespaceDeleteResponse
-from ....types.kv.namespace_update_response import NamespaceUpdateResponse
+from ....types.kv.namespace_bulk_get_response import NamespaceBulkGetResponse
+from ....types.kv.namespace_bulk_delete_response import NamespaceBulkDeleteResponse
+from ....types.kv.namespace_bulk_update_response import NamespaceBulkUpdateResponse
 
 __all__ = ["NamespacesResource", "AsyncNamespacesResource"]
 
 
 class NamespacesResource(SyncAPIResource):
-    @cached_property
-    def bulk(self) -> BulkResource:
-        return BulkResource(self._client)
-
     @cached_property
     def keys(self) -> KeysResource:
         return KeysResource(self._client)
@@ -82,10 +75,21 @@ def values(self) -> ValuesResource:
 
     @cached_property
     def with_raw_response(self) -> NamespacesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return NamespacesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> NamespacesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return NamespacesResourceWithStreamingResponse(self)
 
     def create(
@@ -98,7 +102,7 @@ def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Namespace]:
         """Creates a namespace under the given title.
 
@@ -107,7 +111,7 @@ def create(
         to be replaced.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           title: A human-readable string name for a Namespace.
 
@@ -145,13 +149,13 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[NamespaceUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Namespace:
         """
         Modifies a namespace's title.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           namespace_id: Namespace identifier tag.
 
@@ -177,31 +181,31 @@ def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[NamespaceUpdateResponse]]._unwrapper,
+                post_parser=ResultWrapper[Namespace]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[NamespaceUpdateResponse]], ResultWrapper[NamespaceUpdateResponse]),
+            cast_to=cast(Type[Namespace], ResultWrapper[Namespace]),
         )
 
     def list(
         self,
         *,
         account_id: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        order: Literal["id", "title"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        order: Literal["id", "title"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[Namespace]:
         """
         Returns the namespaces owned by an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           direction: Direction to order namespaces.
 
@@ -252,13 +256,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[NamespaceDeleteResponse]:
         """
         Deletes the namespace corresponding to the given ID.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           namespace_id: Namespace identifier tag.
 
@@ -286,6 +290,175 @@ def delete(
             cast_to=cast(Type[Optional[NamespaceDeleteResponse]], ResultWrapper[NamespaceDeleteResponse]),
         )
 
+    def bulk_delete(
+        self,
+        namespace_id: str,
+        *,
+        account_id: str,
+        body: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[NamespaceBulkDeleteResponse]:
+        """Remove multiple KV pairs from the namespace.
+
+        Body should be an array of up to
+        10,000 keys to be removed.
+
+        Args:
+          account_id: Identifier.
+
+          namespace_id: Namespace identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not namespace_id:
+            raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk/delete",
+            body=maybe_transform(body, SequenceNotStr[str]),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[NamespaceBulkDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[NamespaceBulkDeleteResponse]], ResultWrapper[NamespaceBulkDeleteResponse]),
+        )
+
+    def bulk_get(
+        self,
+        namespace_id: str,
+        *,
+        account_id: str,
+        keys: SequenceNotStr[str],
+        type: Literal["text", "json"] | Omit = omit,
+        with_metadata: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[NamespaceBulkGetResponse]:
+        """Retrieve up to 100 KV pairs from the namespace.
+
+        Keys must contain text-based
+        values. JSON values can optionally be parsed instead of being returned as a
+        string value. Metadata can be included if `withMetadata` is true.
+
+        Args:
+          account_id: Identifier.
+
+          namespace_id: Namespace identifier tag.
+
+          keys: Array of keys to retrieve (maximum of 100).
+
+          type: Whether to parse JSON values in the response.
+
+          with_metadata: Whether to include metadata in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not namespace_id:
+            raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
+        return cast(
+            Optional[NamespaceBulkGetResponse],
+            self._post(
+                f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk/get",
+                body=maybe_transform(
+                    {
+                        "keys": keys,
+                        "type": type,
+                        "with_metadata": with_metadata,
+                    },
+                    namespace_bulk_get_params.NamespaceBulkGetParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[NamespaceBulkGetResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[NamespaceBulkGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    def bulk_update(
+        self,
+        namespace_id: str,
+        *,
+        account_id: str,
+        body: Iterable[namespace_bulk_update_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[NamespaceBulkUpdateResponse]:
+        """Write multiple keys and values at once.
+
+        Body should be an array of up to 10,000
+        key-value pairs to be stored, along with optional expiration information.
+        Existing values and expirations will be overwritten. If neither `expiration` nor
+        `expiration_ttl` is specified, the key-value pair will never expire. If both are
+        set, `expiration_ttl` is used and `expiration` is ignored. The entire request
+        size must be 100 megabytes or less.
+
+        Args:
+          account_id: Identifier.
+
+          namespace_id: Namespace identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not namespace_id:
+            raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk",
+            body=maybe_transform(body, Iterable[namespace_bulk_update_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[NamespaceBulkUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[NamespaceBulkUpdateResponse]], ResultWrapper[NamespaceBulkUpdateResponse]),
+        )
+
     def get(
         self,
         namespace_id: str,
@@ -296,13 +469,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Namespace]:
         """
         Get the namespace corresponding to the given ID.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           namespace_id: Namespace identifier tag.
 
@@ -332,10 +505,6 @@ def get(
 
 
 class AsyncNamespacesResource(AsyncAPIResource):
-    @cached_property
-    def bulk(self) -> AsyncBulkResource:
-        return AsyncBulkResource(self._client)
-
     @cached_property
     def keys(self) -> AsyncKeysResource:
         return AsyncKeysResource(self._client)
@@ -350,10 +519,21 @@ def values(self) -> AsyncValuesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncNamespacesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncNamespacesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncNamespacesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncNamespacesResourceWithStreamingResponse(self)
 
     async def create(
@@ -366,7 +546,7 @@ async def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Namespace]:
         """Creates a namespace under the given title.
 
@@ -375,7 +555,7 @@ async def create(
         to be replaced.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           title: A human-readable string name for a Namespace.
 
@@ -413,13 +593,13 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[NamespaceUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Namespace:
         """
         Modifies a namespace's title.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           namespace_id: Namespace identifier tag.
 
@@ -445,31 +625,31 @@ async def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[NamespaceUpdateResponse]]._unwrapper,
+                post_parser=ResultWrapper[Namespace]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[NamespaceUpdateResponse]], ResultWrapper[NamespaceUpdateResponse]),
+            cast_to=cast(Type[Namespace], ResultWrapper[Namespace]),
         )
 
     def list(
         self,
         *,
         account_id: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        order: Literal["id", "title"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        order: Literal["id", "title"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Namespace, AsyncV4PagePaginationArray[Namespace]]:
         """
         Returns the namespaces owned by an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           direction: Direction to order namespaces.
 
@@ -520,13 +700,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[NamespaceDeleteResponse]:
         """
         Deletes the namespace corresponding to the given ID.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           namespace_id: Namespace identifier tag.
 
@@ -554,6 +734,175 @@ async def delete(
             cast_to=cast(Type[Optional[NamespaceDeleteResponse]], ResultWrapper[NamespaceDeleteResponse]),
         )
 
+    async def bulk_delete(
+        self,
+        namespace_id: str,
+        *,
+        account_id: str,
+        body: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[NamespaceBulkDeleteResponse]:
+        """Remove multiple KV pairs from the namespace.
+
+        Body should be an array of up to
+        10,000 keys to be removed.
+
+        Args:
+          account_id: Identifier.
+
+          namespace_id: Namespace identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not namespace_id:
+            raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk/delete",
+            body=await async_maybe_transform(body, SequenceNotStr[str]),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[NamespaceBulkDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[NamespaceBulkDeleteResponse]], ResultWrapper[NamespaceBulkDeleteResponse]),
+        )
+
+    async def bulk_get(
+        self,
+        namespace_id: str,
+        *,
+        account_id: str,
+        keys: SequenceNotStr[str],
+        type: Literal["text", "json"] | Omit = omit,
+        with_metadata: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[NamespaceBulkGetResponse]:
+        """Retrieve up to 100 KV pairs from the namespace.
+
+        Keys must contain text-based
+        values. JSON values can optionally be parsed instead of being returned as a
+        string value. Metadata can be included if `withMetadata` is true.
+
+        Args:
+          account_id: Identifier.
+
+          namespace_id: Namespace identifier tag.
+
+          keys: Array of keys to retrieve (maximum of 100).
+
+          type: Whether to parse JSON values in the response.
+
+          with_metadata: Whether to include metadata in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not namespace_id:
+            raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
+        return cast(
+            Optional[NamespaceBulkGetResponse],
+            await self._post(
+                f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk/get",
+                body=await async_maybe_transform(
+                    {
+                        "keys": keys,
+                        "type": type,
+                        "with_metadata": with_metadata,
+                    },
+                    namespace_bulk_get_params.NamespaceBulkGetParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[NamespaceBulkGetResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[NamespaceBulkGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    async def bulk_update(
+        self,
+        namespace_id: str,
+        *,
+        account_id: str,
+        body: Iterable[namespace_bulk_update_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[NamespaceBulkUpdateResponse]:
+        """Write multiple keys and values at once.
+
+        Body should be an array of up to 10,000
+        key-value pairs to be stored, along with optional expiration information.
+        Existing values and expirations will be overwritten. If neither `expiration` nor
+        `expiration_ttl` is specified, the key-value pair will never expire. If both are
+        set, `expiration_ttl` is used and `expiration` is ignored. The entire request
+        size must be 100 megabytes or less.
+
+        Args:
+          account_id: Identifier.
+
+          namespace_id: Namespace identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not namespace_id:
+            raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk",
+            body=await async_maybe_transform(body, Iterable[namespace_bulk_update_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[NamespaceBulkUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[NamespaceBulkUpdateResponse]], ResultWrapper[NamespaceBulkUpdateResponse]),
+        )
+
     async def get(
         self,
         namespace_id: str,
@@ -564,13 +913,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Namespace]:
         """
         Get the namespace corresponding to the given ID.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           namespace_id: Namespace identifier tag.
 
@@ -615,14 +964,19 @@ def __init__(self, namespaces: NamespacesResource) -> None:
         self.delete = to_raw_response_wrapper(
             namespaces.delete,
         )
+        self.bulk_delete = to_raw_response_wrapper(
+            namespaces.bulk_delete,
+        )
+        self.bulk_get = to_raw_response_wrapper(
+            namespaces.bulk_get,
+        )
+        self.bulk_update = to_raw_response_wrapper(
+            namespaces.bulk_update,
+        )
         self.get = to_raw_response_wrapper(
             namespaces.get,
         )
 
-    @cached_property
-    def bulk(self) -> BulkResourceWithRawResponse:
-        return BulkResourceWithRawResponse(self._namespaces.bulk)
-
     @cached_property
     def keys(self) -> KeysResourceWithRawResponse:
         return KeysResourceWithRawResponse(self._namespaces.keys)
@@ -652,14 +1006,19 @@ def __init__(self, namespaces: AsyncNamespacesResource) -> None:
         self.delete = async_to_raw_response_wrapper(
             namespaces.delete,
         )
+        self.bulk_delete = async_to_raw_response_wrapper(
+            namespaces.bulk_delete,
+        )
+        self.bulk_get = async_to_raw_response_wrapper(
+            namespaces.bulk_get,
+        )
+        self.bulk_update = async_to_raw_response_wrapper(
+            namespaces.bulk_update,
+        )
         self.get = async_to_raw_response_wrapper(
             namespaces.get,
         )
 
-    @cached_property
-    def bulk(self) -> AsyncBulkResourceWithRawResponse:
-        return AsyncBulkResourceWithRawResponse(self._namespaces.bulk)
-
     @cached_property
     def keys(self) -> AsyncKeysResourceWithRawResponse:
         return AsyncKeysResourceWithRawResponse(self._namespaces.keys)
@@ -689,14 +1048,19 @@ def __init__(self, namespaces: NamespacesResource) -> None:
         self.delete = to_streamed_response_wrapper(
             namespaces.delete,
         )
+        self.bulk_delete = to_streamed_response_wrapper(
+            namespaces.bulk_delete,
+        )
+        self.bulk_get = to_streamed_response_wrapper(
+            namespaces.bulk_get,
+        )
+        self.bulk_update = to_streamed_response_wrapper(
+            namespaces.bulk_update,
+        )
         self.get = to_streamed_response_wrapper(
             namespaces.get,
         )
 
-    @cached_property
-    def bulk(self) -> BulkResourceWithStreamingResponse:
-        return BulkResourceWithStreamingResponse(self._namespaces.bulk)
-
     @cached_property
     def keys(self) -> KeysResourceWithStreamingResponse:
         return KeysResourceWithStreamingResponse(self._namespaces.keys)
@@ -726,14 +1090,19 @@ def __init__(self, namespaces: AsyncNamespacesResource) -> None:
         self.delete = async_to_streamed_response_wrapper(
             namespaces.delete,
         )
+        self.bulk_delete = async_to_streamed_response_wrapper(
+            namespaces.bulk_delete,
+        )
+        self.bulk_get = async_to_streamed_response_wrapper(
+            namespaces.bulk_get,
+        )
+        self.bulk_update = async_to_streamed_response_wrapper(
+            namespaces.bulk_update,
+        )
         self.get = async_to_streamed_response_wrapper(
             namespaces.get,
         )
 
-    @cached_property
-    def bulk(self) -> AsyncBulkResourceWithStreamingResponse:
-        return AsyncBulkResourceWithStreamingResponse(self._namespaces.bulk)
-
     @cached_property
     def keys(self) -> AsyncKeysResourceWithStreamingResponse:
         return AsyncKeysResourceWithStreamingResponse(self._namespaces.keys)
diff --git a/src/cloudflare/resources/kv/namespaces/values.py b/src/cloudflare/resources/kv/namespaces/values.py
index 67c7e92f75d..cfabd2a52d1 100644
--- a/src/cloudflare/resources/kv/namespaces/values.py
+++ b/src/cloudflare/resources/kv/namespaces/values.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Type, Union, Mapping, Optional, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, FileTypes, omit, not_given
+from ...._utils import extract_files, maybe_transform, deepcopy_minimal, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -39,10 +36,21 @@
 class ValuesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ValuesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ValuesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ValuesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ValuesResourceWithStreamingResponse(self)
 
     def update(
@@ -51,36 +59,45 @@ def update(
         *,
         account_id: str,
         namespace_id: str,
-        metadata: str,
-        value: str,
+        value: Union[str, FileTypes],
+        expiration: float | Omit = omit,
+        expiration_ttl: float | Omit = omit,
+        metadata: object | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ValueUpdateResponse]:
         """Write a value identified by a key.
 
         Use URL-encoding to use special characters
         (for example, `:`, `!`, `%`) in the key name. Body should be the value to be
-        stored along with JSON metadata to be associated with the key/value pair.
-        Existing values, expirations, and metadata will be overwritten. If neither
-        `expiration` nor `expiration_ttl` is specified, the key-value pair will never
-        expire. If both are set, `expiration_ttl` is used and `expiration` is ignored.
+        stored. If JSON metadata to be associated with the key/value pair is needed, use
+        `multipart/form-data` content type for your PUT request (see dropdown below in
+        `REQUEST BODY SCHEMA`). Existing values, expirations, and metadata will be
+        overwritten. If neither `expiration` nor `expiration_ttl` is specified, the
+        key-value pair will never expire. If both are set, `expiration_ttl` is used and
+        `expiration` is ignored.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           namespace_id: Namespace identifier tag.
 
           key_name: A key's name. The name may be at most 512 bytes. All printable, non-whitespace
               characters are valid. Use percent-encoding to define key names as part of a URL.
 
-          metadata: Arbitrary JSON to be associated with a key/value pair.
-
           value: A byte sequence to be stored, up to 25 MiB in length.
 
+          expiration: Expires the key at a certain time, measured in number of seconds since the UNIX
+              epoch.
+
+          expiration_ttl: Expires the key after a number of seconds. Must be at least 60.
+
+          metadata: Associates arbitrary JSON data with a key/value pair.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -95,24 +112,34 @@ def update(
             raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
         if not key_name:
             raise ValueError(f"Expected a non-empty value for `key_name` but received {key_name!r}")
+        body = deepcopy_minimal(
+            {
+                "value": value,
+                "metadata": metadata,
+            }
+        )
+        files = extract_files(cast(Mapping[str, object], body), paths=[["value"]])
         # It should be noted that the actual Content-Type header that will be
         # sent to the server will contain a `boundary` parameter, e.g.
         # multipart/form-data; boundary=---abc--
         extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
         return self._put(
             f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/values/{key_name}",
-            body=maybe_transform(
-                {
-                    "metadata": metadata,
-                    "value": value,
-                },
-                value_update_params.ValueUpdateParams,
-            ),
+            body=maybe_transform(body, value_update_params.ValueUpdateParams),
+            files=files,
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "expiration": expiration,
+                        "expiration_ttl": expiration_ttl,
+                    },
+                    value_update_params.ValueUpdateParams,
+                ),
+                multipart_syntax="json",
                 post_parser=ResultWrapper[Optional[ValueUpdateResponse]]._unwrapper,
             ),
             cast_to=cast(Type[Optional[ValueUpdateResponse]], ResultWrapper[ValueUpdateResponse]),
@@ -129,7 +156,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ValueDeleteResponse]:
         """Remove a KV pair from the namespace.
 
@@ -137,7 +164,7 @@ def delete(
         (for example, `:`, `!`, `%`) in the key name.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           namespace_id: Namespace identifier tag.
 
@@ -181,7 +208,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> BinaryAPIResponse:
         """Returns the value associated with the given key in the given namespace.
 
@@ -192,7 +219,7 @@ def get(
         response header.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           namespace_id: Namespace identifier tag.
 
@@ -226,10 +253,21 @@ def get(
 class AsyncValuesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncValuesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncValuesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncValuesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncValuesResourceWithStreamingResponse(self)
 
     async def update(
@@ -238,36 +276,45 @@ async def update(
         *,
         account_id: str,
         namespace_id: str,
-        metadata: str,
-        value: str,
+        value: Union[str, FileTypes],
+        expiration: float | Omit = omit,
+        expiration_ttl: float | Omit = omit,
+        metadata: object | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ValueUpdateResponse]:
         """Write a value identified by a key.
 
         Use URL-encoding to use special characters
         (for example, `:`, `!`, `%`) in the key name. Body should be the value to be
-        stored along with JSON metadata to be associated with the key/value pair.
-        Existing values, expirations, and metadata will be overwritten. If neither
-        `expiration` nor `expiration_ttl` is specified, the key-value pair will never
-        expire. If both are set, `expiration_ttl` is used and `expiration` is ignored.
+        stored. If JSON metadata to be associated with the key/value pair is needed, use
+        `multipart/form-data` content type for your PUT request (see dropdown below in
+        `REQUEST BODY SCHEMA`). Existing values, expirations, and metadata will be
+        overwritten. If neither `expiration` nor `expiration_ttl` is specified, the
+        key-value pair will never expire. If both are set, `expiration_ttl` is used and
+        `expiration` is ignored.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           namespace_id: Namespace identifier tag.
 
           key_name: A key's name. The name may be at most 512 bytes. All printable, non-whitespace
               characters are valid. Use percent-encoding to define key names as part of a URL.
 
-          metadata: Arbitrary JSON to be associated with a key/value pair.
-
           value: A byte sequence to be stored, up to 25 MiB in length.
 
+          expiration: Expires the key at a certain time, measured in number of seconds since the UNIX
+              epoch.
+
+          expiration_ttl: Expires the key after a number of seconds. Must be at least 60.
+
+          metadata: Associates arbitrary JSON data with a key/value pair.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -282,24 +329,34 @@ async def update(
             raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
         if not key_name:
             raise ValueError(f"Expected a non-empty value for `key_name` but received {key_name!r}")
+        body = deepcopy_minimal(
+            {
+                "value": value,
+                "metadata": metadata,
+            }
+        )
+        files = extract_files(cast(Mapping[str, object], body), paths=[["value"]])
         # It should be noted that the actual Content-Type header that will be
         # sent to the server will contain a `boundary` parameter, e.g.
         # multipart/form-data; boundary=---abc--
         extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
         return await self._put(
             f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/values/{key_name}",
-            body=await async_maybe_transform(
-                {
-                    "metadata": metadata,
-                    "value": value,
-                },
-                value_update_params.ValueUpdateParams,
-            ),
+            body=await async_maybe_transform(body, value_update_params.ValueUpdateParams),
+            files=files,
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "expiration": expiration,
+                        "expiration_ttl": expiration_ttl,
+                    },
+                    value_update_params.ValueUpdateParams,
+                ),
+                multipart_syntax="json",
                 post_parser=ResultWrapper[Optional[ValueUpdateResponse]]._unwrapper,
             ),
             cast_to=cast(Type[Optional[ValueUpdateResponse]], ResultWrapper[ValueUpdateResponse]),
@@ -316,7 +373,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ValueDeleteResponse]:
         """Remove a KV pair from the namespace.
 
@@ -324,7 +381,7 @@ async def delete(
         (for example, `:`, `!`, `%`) in the key name.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           namespace_id: Namespace identifier tag.
 
@@ -368,7 +425,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncBinaryAPIResponse:
         """Returns the value associated with the given key in the given namespace.
 
@@ -379,7 +436,7 @@ async def get(
         response header.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           namespace_id: Namespace identifier tag.
 
diff --git a/src/cloudflare/resources/leaked_credential_checks/__init__.py b/src/cloudflare/resources/leaked_credential_checks/__init__.py
new file mode 100644
index 00000000000..a96abb9a3e0
--- /dev/null
+++ b/src/cloudflare/resources/leaked_credential_checks/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .detections import (
+    DetectionsResource,
+    AsyncDetectionsResource,
+    DetectionsResourceWithRawResponse,
+    AsyncDetectionsResourceWithRawResponse,
+    DetectionsResourceWithStreamingResponse,
+    AsyncDetectionsResourceWithStreamingResponse,
+)
+from .leaked_credential_checks import (
+    LeakedCredentialChecksResource,
+    AsyncLeakedCredentialChecksResource,
+    LeakedCredentialChecksResourceWithRawResponse,
+    AsyncLeakedCredentialChecksResourceWithRawResponse,
+    LeakedCredentialChecksResourceWithStreamingResponse,
+    AsyncLeakedCredentialChecksResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "DetectionsResource",
+    "AsyncDetectionsResource",
+    "DetectionsResourceWithRawResponse",
+    "AsyncDetectionsResourceWithRawResponse",
+    "DetectionsResourceWithStreamingResponse",
+    "AsyncDetectionsResourceWithStreamingResponse",
+    "LeakedCredentialChecksResource",
+    "AsyncLeakedCredentialChecksResource",
+    "LeakedCredentialChecksResourceWithRawResponse",
+    "AsyncLeakedCredentialChecksResourceWithRawResponse",
+    "LeakedCredentialChecksResourceWithStreamingResponse",
+    "AsyncLeakedCredentialChecksResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/leaked_credential_checks/detections.py b/src/cloudflare/resources/leaked_credential_checks/detections.py
new file mode 100644
index 00000000000..811169a7a8c
--- /dev/null
+++ b/src/cloudflare/resources/leaked_credential_checks/detections.py
@@ -0,0 +1,620 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.leaked_credential_checks import detection_create_params, detection_update_params
+from ...types.leaked_credential_checks.detection_get_response import DetectionGetResponse
+from ...types.leaked_credential_checks.detection_list_response import DetectionListResponse
+from ...types.leaked_credential_checks.detection_create_response import DetectionCreateResponse
+from ...types.leaked_credential_checks.detection_update_response import DetectionUpdateResponse
+
+__all__ = ["DetectionsResource", "AsyncDetectionsResource"]
+
+
+class DetectionsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> DetectionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return DetectionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> DetectionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return DetectionsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        zone_id: str,
+        password: str | Omit = omit,
+        username: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DetectionCreateResponse:
+        """
+        Create user-defined detection pattern for Leaked Credential Checks.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          password: Defines ehe ruleset expression to use in matching the password in a request.
+
+          username: Defines the ruleset expression to use in matching the username in a request.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/leaked-credential-checks/detections",
+            body=maybe_transform(
+                {
+                    "password": password,
+                    "username": username,
+                },
+                detection_create_params.DetectionCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DetectionCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DetectionCreateResponse], ResultWrapper[DetectionCreateResponse]),
+        )
+
+    def update(
+        self,
+        detection_id: str,
+        *,
+        zone_id: str,
+        password: str | Omit = omit,
+        username: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DetectionUpdateResponse:
+        """
+        Update user-defined detection pattern for Leaked Credential Checks.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          detection_id: Defines the unique ID for this custom detection.
+
+          password: Defines ehe ruleset expression to use in matching the password in a request.
+
+          username: Defines the ruleset expression to use in matching the username in a request.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not detection_id:
+            raise ValueError(f"Expected a non-empty value for `detection_id` but received {detection_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/leaked-credential-checks/detections/{detection_id}",
+            body=maybe_transform(
+                {
+                    "password": password,
+                    "username": username,
+                },
+                detection_update_params.DetectionUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DetectionUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DetectionUpdateResponse], ResultWrapper[DetectionUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[DetectionListResponse]:
+        """
+        List user-defined detection patterns for Leaked Credential Checks.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/leaked-credential-checks/detections",
+            page=SyncSinglePage[DetectionListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=DetectionListResponse,
+        )
+
+    def delete(
+        self,
+        detection_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Remove user-defined detection pattern for Leaked Credential Checks.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          detection_id: Defines the unique ID for this custom detection.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not detection_id:
+            raise ValueError(f"Expected a non-empty value for `detection_id` but received {detection_id!r}")
+        return self._delete(
+            f"/zones/{zone_id}/leaked-credential-checks/detections/{detection_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def get(
+        self,
+        detection_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DetectionGetResponse:
+        """
+        Get user-defined detection pattern for Leaked Credential Checks.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          detection_id: Defines the unique ID for this custom detection.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not detection_id:
+            raise ValueError(f"Expected a non-empty value for `detection_id` but received {detection_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/leaked-credential-checks/detections/{detection_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DetectionGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DetectionGetResponse], ResultWrapper[DetectionGetResponse]),
+        )
+
+
+class AsyncDetectionsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncDetectionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncDetectionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncDetectionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncDetectionsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        password: str | Omit = omit,
+        username: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DetectionCreateResponse:
+        """
+        Create user-defined detection pattern for Leaked Credential Checks.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          password: Defines ehe ruleset expression to use in matching the password in a request.
+
+          username: Defines the ruleset expression to use in matching the username in a request.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/leaked-credential-checks/detections",
+            body=await async_maybe_transform(
+                {
+                    "password": password,
+                    "username": username,
+                },
+                detection_create_params.DetectionCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DetectionCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DetectionCreateResponse], ResultWrapper[DetectionCreateResponse]),
+        )
+
+    async def update(
+        self,
+        detection_id: str,
+        *,
+        zone_id: str,
+        password: str | Omit = omit,
+        username: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DetectionUpdateResponse:
+        """
+        Update user-defined detection pattern for Leaked Credential Checks.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          detection_id: Defines the unique ID for this custom detection.
+
+          password: Defines ehe ruleset expression to use in matching the password in a request.
+
+          username: Defines the ruleset expression to use in matching the username in a request.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not detection_id:
+            raise ValueError(f"Expected a non-empty value for `detection_id` but received {detection_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/leaked-credential-checks/detections/{detection_id}",
+            body=await async_maybe_transform(
+                {
+                    "password": password,
+                    "username": username,
+                },
+                detection_update_params.DetectionUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DetectionUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DetectionUpdateResponse], ResultWrapper[DetectionUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[DetectionListResponse, AsyncSinglePage[DetectionListResponse]]:
+        """
+        List user-defined detection patterns for Leaked Credential Checks.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/leaked-credential-checks/detections",
+            page=AsyncSinglePage[DetectionListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=DetectionListResponse,
+        )
+
+    async def delete(
+        self,
+        detection_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Remove user-defined detection pattern for Leaked Credential Checks.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          detection_id: Defines the unique ID for this custom detection.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not detection_id:
+            raise ValueError(f"Expected a non-empty value for `detection_id` but received {detection_id!r}")
+        return await self._delete(
+            f"/zones/{zone_id}/leaked-credential-checks/detections/{detection_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def get(
+        self,
+        detection_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DetectionGetResponse:
+        """
+        Get user-defined detection pattern for Leaked Credential Checks.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          detection_id: Defines the unique ID for this custom detection.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not detection_id:
+            raise ValueError(f"Expected a non-empty value for `detection_id` but received {detection_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/leaked-credential-checks/detections/{detection_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DetectionGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DetectionGetResponse], ResultWrapper[DetectionGetResponse]),
+        )
+
+
+class DetectionsResourceWithRawResponse:
+    def __init__(self, detections: DetectionsResource) -> None:
+        self._detections = detections
+
+        self.create = to_raw_response_wrapper(
+            detections.create,
+        )
+        self.update = to_raw_response_wrapper(
+            detections.update,
+        )
+        self.list = to_raw_response_wrapper(
+            detections.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            detections.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            detections.get,
+        )
+
+
+class AsyncDetectionsResourceWithRawResponse:
+    def __init__(self, detections: AsyncDetectionsResource) -> None:
+        self._detections = detections
+
+        self.create = async_to_raw_response_wrapper(
+            detections.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            detections.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            detections.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            detections.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            detections.get,
+        )
+
+
+class DetectionsResourceWithStreamingResponse:
+    def __init__(self, detections: DetectionsResource) -> None:
+        self._detections = detections
+
+        self.create = to_streamed_response_wrapper(
+            detections.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            detections.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            detections.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            detections.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            detections.get,
+        )
+
+
+class AsyncDetectionsResourceWithStreamingResponse:
+    def __init__(self, detections: AsyncDetectionsResource) -> None:
+        self._detections = detections
+
+        self.create = async_to_streamed_response_wrapper(
+            detections.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            detections.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            detections.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            detections.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            detections.get,
+        )
diff --git a/src/cloudflare/resources/leaked_credential_checks/leaked_credential_checks.py b/src/cloudflare/resources/leaked_credential_checks/leaked_credential_checks.py
new file mode 100644
index 00000000000..00e8ed4590d
--- /dev/null
+++ b/src/cloudflare/resources/leaked_credential_checks/leaked_credential_checks.py
@@ -0,0 +1,317 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from .detections import (
+    DetectionsResource,
+    AsyncDetectionsResource,
+    DetectionsResourceWithRawResponse,
+    AsyncDetectionsResourceWithRawResponse,
+    DetectionsResourceWithStreamingResponse,
+    AsyncDetectionsResourceWithStreamingResponse,
+)
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.leaked_credential_checks import leaked_credential_check_create_params
+from ...types.leaked_credential_checks.leaked_credential_check_get_response import LeakedCredentialCheckGetResponse
+from ...types.leaked_credential_checks.leaked_credential_check_create_response import (
+    LeakedCredentialCheckCreateResponse,
+)
+
+__all__ = ["LeakedCredentialChecksResource", "AsyncLeakedCredentialChecksResource"]
+
+
+class LeakedCredentialChecksResource(SyncAPIResource):
+    @cached_property
+    def detections(self) -> DetectionsResource:
+        return DetectionsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> LeakedCredentialChecksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return LeakedCredentialChecksResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> LeakedCredentialChecksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return LeakedCredentialChecksResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        zone_id: str,
+        enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LeakedCredentialCheckCreateResponse:
+        """
+        Updates the current status of Leaked Credential Checks.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          enabled: Determines whether or not Leaked Credential Checks are enabled.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/leaked-credential-checks",
+            body=maybe_transform(
+                {"enabled": enabled}, leaked_credential_check_create_params.LeakedCredentialCheckCreateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[LeakedCredentialCheckCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LeakedCredentialCheckCreateResponse], ResultWrapper[LeakedCredentialCheckCreateResponse]),
+        )
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LeakedCredentialCheckGetResponse:
+        """
+        Retrieves the current status of Leaked Credential Checks.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/leaked-credential-checks",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[LeakedCredentialCheckGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LeakedCredentialCheckGetResponse], ResultWrapper[LeakedCredentialCheckGetResponse]),
+        )
+
+
+class AsyncLeakedCredentialChecksResource(AsyncAPIResource):
+    @cached_property
+    def detections(self) -> AsyncDetectionsResource:
+        return AsyncDetectionsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncLeakedCredentialChecksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncLeakedCredentialChecksResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncLeakedCredentialChecksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncLeakedCredentialChecksResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LeakedCredentialCheckCreateResponse:
+        """
+        Updates the current status of Leaked Credential Checks.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          enabled: Determines whether or not Leaked Credential Checks are enabled.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/leaked-credential-checks",
+            body=await async_maybe_transform(
+                {"enabled": enabled}, leaked_credential_check_create_params.LeakedCredentialCheckCreateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[LeakedCredentialCheckCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LeakedCredentialCheckCreateResponse], ResultWrapper[LeakedCredentialCheckCreateResponse]),
+        )
+
+    async def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LeakedCredentialCheckGetResponse:
+        """
+        Retrieves the current status of Leaked Credential Checks.
+
+        Args:
+          zone_id: Defines an identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/leaked-credential-checks",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[LeakedCredentialCheckGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LeakedCredentialCheckGetResponse], ResultWrapper[LeakedCredentialCheckGetResponse]),
+        )
+
+
+class LeakedCredentialChecksResourceWithRawResponse:
+    def __init__(self, leaked_credential_checks: LeakedCredentialChecksResource) -> None:
+        self._leaked_credential_checks = leaked_credential_checks
+
+        self.create = to_raw_response_wrapper(
+            leaked_credential_checks.create,
+        )
+        self.get = to_raw_response_wrapper(
+            leaked_credential_checks.get,
+        )
+
+    @cached_property
+    def detections(self) -> DetectionsResourceWithRawResponse:
+        return DetectionsResourceWithRawResponse(self._leaked_credential_checks.detections)
+
+
+class AsyncLeakedCredentialChecksResourceWithRawResponse:
+    def __init__(self, leaked_credential_checks: AsyncLeakedCredentialChecksResource) -> None:
+        self._leaked_credential_checks = leaked_credential_checks
+
+        self.create = async_to_raw_response_wrapper(
+            leaked_credential_checks.create,
+        )
+        self.get = async_to_raw_response_wrapper(
+            leaked_credential_checks.get,
+        )
+
+    @cached_property
+    def detections(self) -> AsyncDetectionsResourceWithRawResponse:
+        return AsyncDetectionsResourceWithRawResponse(self._leaked_credential_checks.detections)
+
+
+class LeakedCredentialChecksResourceWithStreamingResponse:
+    def __init__(self, leaked_credential_checks: LeakedCredentialChecksResource) -> None:
+        self._leaked_credential_checks = leaked_credential_checks
+
+        self.create = to_streamed_response_wrapper(
+            leaked_credential_checks.create,
+        )
+        self.get = to_streamed_response_wrapper(
+            leaked_credential_checks.get,
+        )
+
+    @cached_property
+    def detections(self) -> DetectionsResourceWithStreamingResponse:
+        return DetectionsResourceWithStreamingResponse(self._leaked_credential_checks.detections)
+
+
+class AsyncLeakedCredentialChecksResourceWithStreamingResponse:
+    def __init__(self, leaked_credential_checks: AsyncLeakedCredentialChecksResource) -> None:
+        self._leaked_credential_checks = leaked_credential_checks
+
+        self.create = async_to_streamed_response_wrapper(
+            leaked_credential_checks.create,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            leaked_credential_checks.get,
+        )
+
+    @cached_property
+    def detections(self) -> AsyncDetectionsResourceWithStreamingResponse:
+        return AsyncDetectionsResourceWithStreamingResponse(self._leaked_credential_checks.detections)
diff --git a/src/cloudflare/resources/load_balancers/__init__.py b/src/cloudflare/resources/load_balancers/__init__.py
index a6ca61a9b10..15be6ff96c2 100644
--- a/src/cloudflare/resources/load_balancers/__init__.py
+++ b/src/cloudflare/resources/load_balancers/__init__.py
@@ -48,6 +48,14 @@
     LoadBalancersResourceWithStreamingResponse,
     AsyncLoadBalancersResourceWithStreamingResponse,
 )
+from .monitor_groups import (
+    MonitorGroupsResource,
+    AsyncMonitorGroupsResource,
+    MonitorGroupsResourceWithRawResponse,
+    AsyncMonitorGroupsResourceWithRawResponse,
+    MonitorGroupsResourceWithStreamingResponse,
+    AsyncMonitorGroupsResourceWithStreamingResponse,
+)
 
 __all__ = [
     "MonitorsResource",
@@ -56,6 +64,12 @@
     "AsyncMonitorsResourceWithRawResponse",
     "MonitorsResourceWithStreamingResponse",
     "AsyncMonitorsResourceWithStreamingResponse",
+    "MonitorGroupsResource",
+    "AsyncMonitorGroupsResource",
+    "MonitorGroupsResourceWithRawResponse",
+    "AsyncMonitorGroupsResourceWithRawResponse",
+    "MonitorGroupsResourceWithStreamingResponse",
+    "AsyncMonitorGroupsResourceWithStreamingResponse",
     "PoolsResource",
     "AsyncPoolsResource",
     "PoolsResourceWithRawResponse",
diff --git a/src/cloudflare/resources/load_balancers/load_balancers.py b/src/cloudflare/resources/load_balancers/load_balancers.py
index 5474bf9e565..228f48335be 100644
--- a/src/cloudflare/resources/load_balancers/load_balancers.py
+++ b/src/cloudflare/resources/load_balancers/load_balancers.py
@@ -2,18 +2,10 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Iterable, cast
+from typing import Dict, Type, Iterable, cast
 
 import httpx
 
-from .pools import (
-    PoolsResource,
-    AsyncPoolsResource,
-    PoolsResourceWithRawResponse,
-    AsyncPoolsResourceWithRawResponse,
-    PoolsResourceWithStreamingResponse,
-    AsyncPoolsResourceWithStreamingResponse,
-)
 from .regions import (
     RegionsResource,
     AsyncRegionsResource,
@@ -22,19 +14,8 @@
     RegionsResourceWithStreamingResponse,
     AsyncRegionsResourceWithStreamingResponse,
 )
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from .monitors import (
-    MonitorsResource,
-    AsyncMonitorsResource,
-    MonitorsResourceWithRawResponse,
-    AsyncMonitorsResourceWithRawResponse,
-    MonitorsResourceWithStreamingResponse,
-    AsyncMonitorsResourceWithStreamingResponse,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from .previews import (
     PreviewsResource,
     AsyncPreviewsResource,
@@ -60,10 +41,32 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from .pools.pools import PoolsResource, AsyncPoolsResource
+from .pools.pools import (
+    PoolsResource,
+    AsyncPoolsResource,
+    PoolsResourceWithRawResponse,
+    AsyncPoolsResourceWithRawResponse,
+    PoolsResourceWithStreamingResponse,
+    AsyncPoolsResourceWithStreamingResponse,
+)
 from ...pagination import SyncSinglePage, AsyncSinglePage
 from ..._base_client import AsyncPaginator, make_request_options
-from .monitors.monitors import MonitorsResource, AsyncMonitorsResource
+from .monitor_groups import (
+    MonitorGroupsResource,
+    AsyncMonitorGroupsResource,
+    MonitorGroupsResourceWithRawResponse,
+    AsyncMonitorGroupsResourceWithRawResponse,
+    MonitorGroupsResourceWithStreamingResponse,
+    AsyncMonitorGroupsResourceWithStreamingResponse,
+)
+from .monitors.monitors import (
+    MonitorsResource,
+    AsyncMonitorsResource,
+    MonitorsResourceWithRawResponse,
+    AsyncMonitorsResourceWithRawResponse,
+    MonitorsResourceWithStreamingResponse,
+    AsyncMonitorsResourceWithStreamingResponse,
+)
 from ...types.load_balancers import (
     SteeringPolicy,
     SessionAffinity,
@@ -90,6 +93,10 @@ class LoadBalancersResource(SyncAPIResource):
     def monitors(self) -> MonitorsResource:
         return MonitorsResource(self._client)
 
+    @cached_property
+    def monitor_groups(self) -> MonitorGroupsResource:
+        return MonitorGroupsResource(self._client)
+
     @cached_property
     def pools(self) -> PoolsResource:
         return PoolsResource(self._client)
@@ -108,39 +115,51 @@ def searches(self) -> SearchesResource:
 
     @cached_property
     def with_raw_response(self) -> LoadBalancersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LoadBalancersResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LoadBalancersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LoadBalancersResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         zone_id: str,
-        default_pools: List[DefaultPools],
-        fallback_pool: object,
+        default_pools: SequenceNotStr[DefaultPools],
+        fallback_pool: str,
         name: str,
-        adaptive_routing: AdaptiveRoutingParam | NotGiven = NOT_GIVEN,
-        country_pools: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        location_strategy: LocationStrategyParam | NotGiven = NOT_GIVEN,
-        pop_pools: object | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        random_steering: RandomSteeringParam | NotGiven = NOT_GIVEN,
-        region_pools: object | NotGiven = NOT_GIVEN,
-        rules: Iterable[RulesParam] | NotGiven = NOT_GIVEN,
-        session_affinity: SessionAffinity | NotGiven = NOT_GIVEN,
-        session_affinity_attributes: SessionAffinityAttributesParam | NotGiven = NOT_GIVEN,
-        session_affinity_ttl: float | NotGiven = NOT_GIVEN,
-        steering_policy: SteeringPolicy | NotGiven = NOT_GIVEN,
-        ttl: float | NotGiven = NOT_GIVEN,
+        adaptive_routing: AdaptiveRoutingParam | Omit = omit,
+        country_pools: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        description: str | Omit = omit,
+        location_strategy: LocationStrategyParam | Omit = omit,
+        networks: SequenceNotStr[str] | Omit = omit,
+        pop_pools: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        proxied: bool | Omit = omit,
+        random_steering: RandomSteeringParam | Omit = omit,
+        region_pools: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        rules: Iterable[RulesParam] | Omit = omit,
+        session_affinity: SessionAffinity | Omit = omit,
+        session_affinity_attributes: SessionAffinityAttributesParam | Omit = omit,
+        session_affinity_ttl: float | Omit = omit,
+        steering_policy: SteeringPolicy | Omit = omit,
+        ttl: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LoadBalancer:
         """
         Create a new load balancer.
@@ -172,7 +191,9 @@ def create(
           location_strategy: Controls location-based steering for non-proxied requests. See `steering_policy`
               to learn how steering is affected.
 
-          pop_pools: (Enterprise only): A mapping of Cloudflare PoP identifiers to a list of pool IDs
+          networks: List of networks where Load Balancer or Pool is enabled.
+
+          pop_pools: Enterprise only: A mapping of Cloudflare PoP identifiers to a list of pool IDs
               (ordered by their failover priority) for the PoP (datacenter). Any PoPs not
               explicitly defined will fall back to using the corresponding country_pool, then
               region_pool mapping if it exists else to default_pools.
@@ -196,41 +217,37 @@ def create(
               execute.
 
           session_affinity: Specifies the type of session affinity the load balancer should use unless
-              specified as `"none"` or "" (default). The supported types are:
-
-              - `"cookie"`: On the first request to a proxied load balancer, a cookie is
-                generated, encoding information of which origin the request will be forwarded
-                to. Subsequent requests, by the same client to the same load balancer, will be
-                sent to the origin server the cookie encodes, for the duration of the cookie
-                and as long as the origin server remains healthy. If the cookie has expired or
-                the origin server is unhealthy, then a new origin server is calculated and
-                used.
-              - `"ip_cookie"`: Behaves the same as `"cookie"` except the initial origin
-                selection is stable and based on the client's ip address.
-              - `"header"`: On the first request to a proxied load balancer, a session key
-                based on the configured HTTP headers (see
-                `session_affinity_attributes.headers`) is generated, encoding the request
-                headers used for storing in the load balancer session state which origin the
-                request will be forwarded to. Subsequent requests to the load balancer with
-                the same headers will be sent to the same origin server, for the duration of
-                the session and as long as the origin server remains healthy. If the session
-                has been idle for the duration of `session_affinity_ttl` seconds or the origin
-                server is unhealthy, then a new origin server is calculated and used. See
-                `headers` in `session_affinity_attributes` for additional required
-                configuration.
+              specified as `"none"`. The supported types are: - `"cookie"`: On the first
+              request to a proxied load balancer, a cookie is generated, encoding information
+              of which origin the request will be forwarded to. Subsequent requests, by the
+              same client to the same load balancer, will be sent to the origin server the
+              cookie encodes, for the duration of the cookie and as long as the origin server
+              remains healthy. If the cookie has expired or the origin server is unhealthy,
+              then a new origin server is calculated and used. - `"ip_cookie"`: Behaves the
+              same as `"cookie"` except the initial origin selection is stable and based on
+              the client's ip address. - `"header"`: On the first request to a proxied load
+              balancer, a session key based on the configured HTTP headers (see
+              `session_affinity_attributes.headers`) is generated, encoding the request
+              headers used for storing in the load balancer session state which origin the
+              request will be forwarded to. Subsequent requests to the load balancer with the
+              same headers will be sent to the same origin server, for the duration of the
+              session and as long as the origin server remains healthy. If the session has
+              been idle for the duration of `session_affinity_ttl` seconds or the origin
+              server is unhealthy, then a new origin server is calculated and used. See
+              `headers` in `session_affinity_attributes` for additional required
+              configuration.
 
           session_affinity_attributes: Configures attributes for session affinity.
 
           session_affinity_ttl: Time, in seconds, until a client's session expires after being created. Once the
               expiry time has been reached, subsequent requests may get sent to a different
-              origin server. The accepted ranges per `session_affinity` policy are:
-
-              - `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used
-                unless explicitly set. The accepted range of values is between [1800, 604800].
-              - `"header"`: The current default of 1800 seconds will be used unless explicitly
-                set. The accepted range of values is between [30, 3600]. Note: With session
-                affinity by header, sessions only expire after they haven't been used for the
-                number of seconds specified.
+              origin server. The accepted ranges per `session_affinity` policy are: -
+              `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used unless
+              explicitly set. The accepted range of values is between [1800, 604800]. -
+              `"header"`: The current default of 1800 seconds will be used unless explicitly
+              set. The accepted range of values is between [30, 3600]. Note: With session
+              affinity by header, sessions only expire after they haven't been used for the
+              number of seconds specified.
 
           steering_policy: Steering Policy for this load balancer.
 
@@ -279,6 +296,7 @@ def create(
                     "country_pools": country_pools,
                     "description": description,
                     "location_strategy": location_strategy,
+                    "networks": networks,
                     "pop_pools": pop_pools,
                     "proxied": proxied,
                     "random_steering": random_steering,
@@ -307,30 +325,31 @@ def update(
         load_balancer_id: str,
         *,
         zone_id: str,
-        default_pools: List[DefaultPools],
-        fallback_pool: object,
+        default_pools: SequenceNotStr[DefaultPools],
+        fallback_pool: str,
         name: str,
-        adaptive_routing: AdaptiveRoutingParam | NotGiven = NOT_GIVEN,
-        country_pools: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        location_strategy: LocationStrategyParam | NotGiven = NOT_GIVEN,
-        pop_pools: object | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        random_steering: RandomSteeringParam | NotGiven = NOT_GIVEN,
-        region_pools: object | NotGiven = NOT_GIVEN,
-        rules: Iterable[RulesParam] | NotGiven = NOT_GIVEN,
-        session_affinity: SessionAffinity | NotGiven = NOT_GIVEN,
-        session_affinity_attributes: SessionAffinityAttributesParam | NotGiven = NOT_GIVEN,
-        session_affinity_ttl: float | NotGiven = NOT_GIVEN,
-        steering_policy: SteeringPolicy | NotGiven = NOT_GIVEN,
-        ttl: float | NotGiven = NOT_GIVEN,
+        adaptive_routing: AdaptiveRoutingParam | Omit = omit,
+        country_pools: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        location_strategy: LocationStrategyParam | Omit = omit,
+        networks: SequenceNotStr[str] | Omit = omit,
+        pop_pools: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        proxied: bool | Omit = omit,
+        random_steering: RandomSteeringParam | Omit = omit,
+        region_pools: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        rules: Iterable[RulesParam] | Omit = omit,
+        session_affinity: SessionAffinity | Omit = omit,
+        session_affinity_attributes: SessionAffinityAttributesParam | Omit = omit,
+        session_affinity_ttl: float | Omit = omit,
+        steering_policy: SteeringPolicy | Omit = omit,
+        ttl: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LoadBalancer:
         """
         Update a configured load balancer.
@@ -364,7 +383,9 @@ def update(
           location_strategy: Controls location-based steering for non-proxied requests. See `steering_policy`
               to learn how steering is affected.
 
-          pop_pools: (Enterprise only): A mapping of Cloudflare PoP identifiers to a list of pool IDs
+          networks: List of networks where Load Balancer or Pool is enabled.
+
+          pop_pools: Enterprise only: A mapping of Cloudflare PoP identifiers to a list of pool IDs
               (ordered by their failover priority) for the PoP (datacenter). Any PoPs not
               explicitly defined will fall back to using the corresponding country_pool, then
               region_pool mapping if it exists else to default_pools.
@@ -388,41 +409,37 @@ def update(
               execute.
 
           session_affinity: Specifies the type of session affinity the load balancer should use unless
-              specified as `"none"` or "" (default). The supported types are:
-
-              - `"cookie"`: On the first request to a proxied load balancer, a cookie is
-                generated, encoding information of which origin the request will be forwarded
-                to. Subsequent requests, by the same client to the same load balancer, will be
-                sent to the origin server the cookie encodes, for the duration of the cookie
-                and as long as the origin server remains healthy. If the cookie has expired or
-                the origin server is unhealthy, then a new origin server is calculated and
-                used.
-              - `"ip_cookie"`: Behaves the same as `"cookie"` except the initial origin
-                selection is stable and based on the client's ip address.
-              - `"header"`: On the first request to a proxied load balancer, a session key
-                based on the configured HTTP headers (see
-                `session_affinity_attributes.headers`) is generated, encoding the request
-                headers used for storing in the load balancer session state which origin the
-                request will be forwarded to. Subsequent requests to the load balancer with
-                the same headers will be sent to the same origin server, for the duration of
-                the session and as long as the origin server remains healthy. If the session
-                has been idle for the duration of `session_affinity_ttl` seconds or the origin
-                server is unhealthy, then a new origin server is calculated and used. See
-                `headers` in `session_affinity_attributes` for additional required
-                configuration.
+              specified as `"none"`. The supported types are: - `"cookie"`: On the first
+              request to a proxied load balancer, a cookie is generated, encoding information
+              of which origin the request will be forwarded to. Subsequent requests, by the
+              same client to the same load balancer, will be sent to the origin server the
+              cookie encodes, for the duration of the cookie and as long as the origin server
+              remains healthy. If the cookie has expired or the origin server is unhealthy,
+              then a new origin server is calculated and used. - `"ip_cookie"`: Behaves the
+              same as `"cookie"` except the initial origin selection is stable and based on
+              the client's ip address. - `"header"`: On the first request to a proxied load
+              balancer, a session key based on the configured HTTP headers (see
+              `session_affinity_attributes.headers`) is generated, encoding the request
+              headers used for storing in the load balancer session state which origin the
+              request will be forwarded to. Subsequent requests to the load balancer with the
+              same headers will be sent to the same origin server, for the duration of the
+              session and as long as the origin server remains healthy. If the session has
+              been idle for the duration of `session_affinity_ttl` seconds or the origin
+              server is unhealthy, then a new origin server is calculated and used. See
+              `headers` in `session_affinity_attributes` for additional required
+              configuration.
 
           session_affinity_attributes: Configures attributes for session affinity.
 
           session_affinity_ttl: Time, in seconds, until a client's session expires after being created. Once the
               expiry time has been reached, subsequent requests may get sent to a different
-              origin server. The accepted ranges per `session_affinity` policy are:
-
-              - `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used
-                unless explicitly set. The accepted range of values is between [1800, 604800].
-              - `"header"`: The current default of 1800 seconds will be used unless explicitly
-                set. The accepted range of values is between [30, 3600]. Note: With session
-                affinity by header, sessions only expire after they haven't been used for the
-                number of seconds specified.
+              origin server. The accepted ranges per `session_affinity` policy are: -
+              `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used unless
+              explicitly set. The accepted range of values is between [1800, 604800]. -
+              `"header"`: The current default of 1800 seconds will be used unless explicitly
+              set. The accepted range of values is between [30, 3600]. Note: With session
+              affinity by header, sessions only expire after they haven't been used for the
+              number of seconds specified.
 
           steering_policy: Steering Policy for this load balancer.
 
@@ -474,6 +491,7 @@ def update(
                     "description": description,
                     "enabled": enabled,
                     "location_strategy": location_strategy,
+                    "networks": networks,
                     "pop_pools": pop_pools,
                     "proxied": proxied,
                     "random_steering": random_steering,
@@ -506,7 +524,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[LoadBalancer]:
         """
         List configured load balancers.
@@ -541,7 +559,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LoadBalancerDeleteResponse:
         """
         Delete a configured load balancer.
@@ -576,30 +594,30 @@ def edit(
         load_balancer_id: str,
         *,
         zone_id: str,
-        adaptive_routing: AdaptiveRoutingParam | NotGiven = NOT_GIVEN,
-        country_pools: object | NotGiven = NOT_GIVEN,
-        default_pools: List[DefaultPools] | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        fallback_pool: object | NotGiven = NOT_GIVEN,
-        location_strategy: LocationStrategyParam | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        pop_pools: object | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        random_steering: RandomSteeringParam | NotGiven = NOT_GIVEN,
-        region_pools: object | NotGiven = NOT_GIVEN,
-        rules: Iterable[RulesParam] | NotGiven = NOT_GIVEN,
-        session_affinity: SessionAffinity | NotGiven = NOT_GIVEN,
-        session_affinity_attributes: SessionAffinityAttributesParam | NotGiven = NOT_GIVEN,
-        session_affinity_ttl: float | NotGiven = NOT_GIVEN,
-        steering_policy: SteeringPolicy | NotGiven = NOT_GIVEN,
-        ttl: float | NotGiven = NOT_GIVEN,
+        adaptive_routing: AdaptiveRoutingParam | Omit = omit,
+        country_pools: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        default_pools: SequenceNotStr[DefaultPools] | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        fallback_pool: str | Omit = omit,
+        location_strategy: LocationStrategyParam | Omit = omit,
+        name: str | Omit = omit,
+        pop_pools: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        proxied: bool | Omit = omit,
+        random_steering: RandomSteeringParam | Omit = omit,
+        region_pools: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        rules: Iterable[RulesParam] | Omit = omit,
+        session_affinity: SessionAffinity | Omit = omit,
+        session_affinity_attributes: SessionAffinityAttributesParam | Omit = omit,
+        session_affinity_ttl: float | Omit = omit,
+        steering_policy: SteeringPolicy | Omit = omit,
+        ttl: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LoadBalancer:
         """
         Apply changes to an existing load balancer, overwriting the supplied properties.
@@ -633,7 +651,7 @@ def edit(
               exists as a DNS record in Cloudflare's DNS, the Load Balancer will take
               precedence and the DNS record will not be used.
 
-          pop_pools: (Enterprise only): A mapping of Cloudflare PoP identifiers to a list of pool IDs
+          pop_pools: Enterprise only: A mapping of Cloudflare PoP identifiers to a list of pool IDs
               (ordered by their failover priority) for the PoP (datacenter). Any PoPs not
               explicitly defined will fall back to using the corresponding country_pool, then
               region_pool mapping if it exists else to default_pools.
@@ -657,41 +675,37 @@ def edit(
               execute.
 
           session_affinity: Specifies the type of session affinity the load balancer should use unless
-              specified as `"none"` or "" (default). The supported types are:
-
-              - `"cookie"`: On the first request to a proxied load balancer, a cookie is
-                generated, encoding information of which origin the request will be forwarded
-                to. Subsequent requests, by the same client to the same load balancer, will be
-                sent to the origin server the cookie encodes, for the duration of the cookie
-                and as long as the origin server remains healthy. If the cookie has expired or
-                the origin server is unhealthy, then a new origin server is calculated and
-                used.
-              - `"ip_cookie"`: Behaves the same as `"cookie"` except the initial origin
-                selection is stable and based on the client's ip address.
-              - `"header"`: On the first request to a proxied load balancer, a session key
-                based on the configured HTTP headers (see
-                `session_affinity_attributes.headers`) is generated, encoding the request
-                headers used for storing in the load balancer session state which origin the
-                request will be forwarded to. Subsequent requests to the load balancer with
-                the same headers will be sent to the same origin server, for the duration of
-                the session and as long as the origin server remains healthy. If the session
-                has been idle for the duration of `session_affinity_ttl` seconds or the origin
-                server is unhealthy, then a new origin server is calculated and used. See
-                `headers` in `session_affinity_attributes` for additional required
-                configuration.
+              specified as `"none"`. The supported types are: - `"cookie"`: On the first
+              request to a proxied load balancer, a cookie is generated, encoding information
+              of which origin the request will be forwarded to. Subsequent requests, by the
+              same client to the same load balancer, will be sent to the origin server the
+              cookie encodes, for the duration of the cookie and as long as the origin server
+              remains healthy. If the cookie has expired or the origin server is unhealthy,
+              then a new origin server is calculated and used. - `"ip_cookie"`: Behaves the
+              same as `"cookie"` except the initial origin selection is stable and based on
+              the client's ip address. - `"header"`: On the first request to a proxied load
+              balancer, a session key based on the configured HTTP headers (see
+              `session_affinity_attributes.headers`) is generated, encoding the request
+              headers used for storing in the load balancer session state which origin the
+              request will be forwarded to. Subsequent requests to the load balancer with the
+              same headers will be sent to the same origin server, for the duration of the
+              session and as long as the origin server remains healthy. If the session has
+              been idle for the duration of `session_affinity_ttl` seconds or the origin
+              server is unhealthy, then a new origin server is calculated and used. See
+              `headers` in `session_affinity_attributes` for additional required
+              configuration.
 
           session_affinity_attributes: Configures attributes for session affinity.
 
           session_affinity_ttl: Time, in seconds, until a client's session expires after being created. Once the
               expiry time has been reached, subsequent requests may get sent to a different
-              origin server. The accepted ranges per `session_affinity` policy are:
-
-              - `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used
-                unless explicitly set. The accepted range of values is between [1800, 604800].
-              - `"header"`: The current default of 1800 seconds will be used unless explicitly
-                set. The accepted range of values is between [30, 3600]. Note: With session
-                affinity by header, sessions only expire after they haven't been used for the
-                number of seconds specified.
+              origin server. The accepted ranges per `session_affinity` policy are: -
+              `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used unless
+              explicitly set. The accepted range of values is between [1800, 604800]. -
+              `"header"`: The current default of 1800 seconds will be used unless explicitly
+              set. The accepted range of values is between [30, 3600]. Note: With session
+              affinity by header, sessions only expire after they haven't been used for the
+              number of seconds specified.
 
           steering_policy: Steering Policy for this load balancer.
 
@@ -776,7 +790,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LoadBalancer:
         """
         Fetch a single configured load balancer.
@@ -812,6 +826,10 @@ class AsyncLoadBalancersResource(AsyncAPIResource):
     def monitors(self) -> AsyncMonitorsResource:
         return AsyncMonitorsResource(self._client)
 
+    @cached_property
+    def monitor_groups(self) -> AsyncMonitorGroupsResource:
+        return AsyncMonitorGroupsResource(self._client)
+
     @cached_property
     def pools(self) -> AsyncPoolsResource:
         return AsyncPoolsResource(self._client)
@@ -830,39 +848,51 @@ def searches(self) -> AsyncSearchesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncLoadBalancersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLoadBalancersResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLoadBalancersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLoadBalancersResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         zone_id: str,
-        default_pools: List[DefaultPools],
-        fallback_pool: object,
+        default_pools: SequenceNotStr[DefaultPools],
+        fallback_pool: str,
         name: str,
-        adaptive_routing: AdaptiveRoutingParam | NotGiven = NOT_GIVEN,
-        country_pools: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        location_strategy: LocationStrategyParam | NotGiven = NOT_GIVEN,
-        pop_pools: object | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        random_steering: RandomSteeringParam | NotGiven = NOT_GIVEN,
-        region_pools: object | NotGiven = NOT_GIVEN,
-        rules: Iterable[RulesParam] | NotGiven = NOT_GIVEN,
-        session_affinity: SessionAffinity | NotGiven = NOT_GIVEN,
-        session_affinity_attributes: SessionAffinityAttributesParam | NotGiven = NOT_GIVEN,
-        session_affinity_ttl: float | NotGiven = NOT_GIVEN,
-        steering_policy: SteeringPolicy | NotGiven = NOT_GIVEN,
-        ttl: float | NotGiven = NOT_GIVEN,
+        adaptive_routing: AdaptiveRoutingParam | Omit = omit,
+        country_pools: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        description: str | Omit = omit,
+        location_strategy: LocationStrategyParam | Omit = omit,
+        networks: SequenceNotStr[str] | Omit = omit,
+        pop_pools: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        proxied: bool | Omit = omit,
+        random_steering: RandomSteeringParam | Omit = omit,
+        region_pools: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        rules: Iterable[RulesParam] | Omit = omit,
+        session_affinity: SessionAffinity | Omit = omit,
+        session_affinity_attributes: SessionAffinityAttributesParam | Omit = omit,
+        session_affinity_ttl: float | Omit = omit,
+        steering_policy: SteeringPolicy | Omit = omit,
+        ttl: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LoadBalancer:
         """
         Create a new load balancer.
@@ -894,7 +924,9 @@ async def create(
           location_strategy: Controls location-based steering for non-proxied requests. See `steering_policy`
               to learn how steering is affected.
 
-          pop_pools: (Enterprise only): A mapping of Cloudflare PoP identifiers to a list of pool IDs
+          networks: List of networks where Load Balancer or Pool is enabled.
+
+          pop_pools: Enterprise only: A mapping of Cloudflare PoP identifiers to a list of pool IDs
               (ordered by their failover priority) for the PoP (datacenter). Any PoPs not
               explicitly defined will fall back to using the corresponding country_pool, then
               region_pool mapping if it exists else to default_pools.
@@ -918,41 +950,37 @@ async def create(
               execute.
 
           session_affinity: Specifies the type of session affinity the load balancer should use unless
-              specified as `"none"` or "" (default). The supported types are:
-
-              - `"cookie"`: On the first request to a proxied load balancer, a cookie is
-                generated, encoding information of which origin the request will be forwarded
-                to. Subsequent requests, by the same client to the same load balancer, will be
-                sent to the origin server the cookie encodes, for the duration of the cookie
-                and as long as the origin server remains healthy. If the cookie has expired or
-                the origin server is unhealthy, then a new origin server is calculated and
-                used.
-              - `"ip_cookie"`: Behaves the same as `"cookie"` except the initial origin
-                selection is stable and based on the client's ip address.
-              - `"header"`: On the first request to a proxied load balancer, a session key
-                based on the configured HTTP headers (see
-                `session_affinity_attributes.headers`) is generated, encoding the request
-                headers used for storing in the load balancer session state which origin the
-                request will be forwarded to. Subsequent requests to the load balancer with
-                the same headers will be sent to the same origin server, for the duration of
-                the session and as long as the origin server remains healthy. If the session
-                has been idle for the duration of `session_affinity_ttl` seconds or the origin
-                server is unhealthy, then a new origin server is calculated and used. See
-                `headers` in `session_affinity_attributes` for additional required
-                configuration.
+              specified as `"none"`. The supported types are: - `"cookie"`: On the first
+              request to a proxied load balancer, a cookie is generated, encoding information
+              of which origin the request will be forwarded to. Subsequent requests, by the
+              same client to the same load balancer, will be sent to the origin server the
+              cookie encodes, for the duration of the cookie and as long as the origin server
+              remains healthy. If the cookie has expired or the origin server is unhealthy,
+              then a new origin server is calculated and used. - `"ip_cookie"`: Behaves the
+              same as `"cookie"` except the initial origin selection is stable and based on
+              the client's ip address. - `"header"`: On the first request to a proxied load
+              balancer, a session key based on the configured HTTP headers (see
+              `session_affinity_attributes.headers`) is generated, encoding the request
+              headers used for storing in the load balancer session state which origin the
+              request will be forwarded to. Subsequent requests to the load balancer with the
+              same headers will be sent to the same origin server, for the duration of the
+              session and as long as the origin server remains healthy. If the session has
+              been idle for the duration of `session_affinity_ttl` seconds or the origin
+              server is unhealthy, then a new origin server is calculated and used. See
+              `headers` in `session_affinity_attributes` for additional required
+              configuration.
 
           session_affinity_attributes: Configures attributes for session affinity.
 
           session_affinity_ttl: Time, in seconds, until a client's session expires after being created. Once the
               expiry time has been reached, subsequent requests may get sent to a different
-              origin server. The accepted ranges per `session_affinity` policy are:
-
-              - `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used
-                unless explicitly set. The accepted range of values is between [1800, 604800].
-              - `"header"`: The current default of 1800 seconds will be used unless explicitly
-                set. The accepted range of values is between [30, 3600]. Note: With session
-                affinity by header, sessions only expire after they haven't been used for the
-                number of seconds specified.
+              origin server. The accepted ranges per `session_affinity` policy are: -
+              `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used unless
+              explicitly set. The accepted range of values is between [1800, 604800]. -
+              `"header"`: The current default of 1800 seconds will be used unless explicitly
+              set. The accepted range of values is between [30, 3600]. Note: With session
+              affinity by header, sessions only expire after they haven't been used for the
+              number of seconds specified.
 
           steering_policy: Steering Policy for this load balancer.
 
@@ -1001,6 +1029,7 @@ async def create(
                     "country_pools": country_pools,
                     "description": description,
                     "location_strategy": location_strategy,
+                    "networks": networks,
                     "pop_pools": pop_pools,
                     "proxied": proxied,
                     "random_steering": random_steering,
@@ -1029,30 +1058,31 @@ async def update(
         load_balancer_id: str,
         *,
         zone_id: str,
-        default_pools: List[DefaultPools],
-        fallback_pool: object,
+        default_pools: SequenceNotStr[DefaultPools],
+        fallback_pool: str,
         name: str,
-        adaptive_routing: AdaptiveRoutingParam | NotGiven = NOT_GIVEN,
-        country_pools: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        location_strategy: LocationStrategyParam | NotGiven = NOT_GIVEN,
-        pop_pools: object | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        random_steering: RandomSteeringParam | NotGiven = NOT_GIVEN,
-        region_pools: object | NotGiven = NOT_GIVEN,
-        rules: Iterable[RulesParam] | NotGiven = NOT_GIVEN,
-        session_affinity: SessionAffinity | NotGiven = NOT_GIVEN,
-        session_affinity_attributes: SessionAffinityAttributesParam | NotGiven = NOT_GIVEN,
-        session_affinity_ttl: float | NotGiven = NOT_GIVEN,
-        steering_policy: SteeringPolicy | NotGiven = NOT_GIVEN,
-        ttl: float | NotGiven = NOT_GIVEN,
+        adaptive_routing: AdaptiveRoutingParam | Omit = omit,
+        country_pools: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        location_strategy: LocationStrategyParam | Omit = omit,
+        networks: SequenceNotStr[str] | Omit = omit,
+        pop_pools: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        proxied: bool | Omit = omit,
+        random_steering: RandomSteeringParam | Omit = omit,
+        region_pools: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        rules: Iterable[RulesParam] | Omit = omit,
+        session_affinity: SessionAffinity | Omit = omit,
+        session_affinity_attributes: SessionAffinityAttributesParam | Omit = omit,
+        session_affinity_ttl: float | Omit = omit,
+        steering_policy: SteeringPolicy | Omit = omit,
+        ttl: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LoadBalancer:
         """
         Update a configured load balancer.
@@ -1086,7 +1116,9 @@ async def update(
           location_strategy: Controls location-based steering for non-proxied requests. See `steering_policy`
               to learn how steering is affected.
 
-          pop_pools: (Enterprise only): A mapping of Cloudflare PoP identifiers to a list of pool IDs
+          networks: List of networks where Load Balancer or Pool is enabled.
+
+          pop_pools: Enterprise only: A mapping of Cloudflare PoP identifiers to a list of pool IDs
               (ordered by their failover priority) for the PoP (datacenter). Any PoPs not
               explicitly defined will fall back to using the corresponding country_pool, then
               region_pool mapping if it exists else to default_pools.
@@ -1110,41 +1142,37 @@ async def update(
               execute.
 
           session_affinity: Specifies the type of session affinity the load balancer should use unless
-              specified as `"none"` or "" (default). The supported types are:
-
-              - `"cookie"`: On the first request to a proxied load balancer, a cookie is
-                generated, encoding information of which origin the request will be forwarded
-                to. Subsequent requests, by the same client to the same load balancer, will be
-                sent to the origin server the cookie encodes, for the duration of the cookie
-                and as long as the origin server remains healthy. If the cookie has expired or
-                the origin server is unhealthy, then a new origin server is calculated and
-                used.
-              - `"ip_cookie"`: Behaves the same as `"cookie"` except the initial origin
-                selection is stable and based on the client's ip address.
-              - `"header"`: On the first request to a proxied load balancer, a session key
-                based on the configured HTTP headers (see
-                `session_affinity_attributes.headers`) is generated, encoding the request
-                headers used for storing in the load balancer session state which origin the
-                request will be forwarded to. Subsequent requests to the load balancer with
-                the same headers will be sent to the same origin server, for the duration of
-                the session and as long as the origin server remains healthy. If the session
-                has been idle for the duration of `session_affinity_ttl` seconds or the origin
-                server is unhealthy, then a new origin server is calculated and used. See
-                `headers` in `session_affinity_attributes` for additional required
-                configuration.
+              specified as `"none"`. The supported types are: - `"cookie"`: On the first
+              request to a proxied load balancer, a cookie is generated, encoding information
+              of which origin the request will be forwarded to. Subsequent requests, by the
+              same client to the same load balancer, will be sent to the origin server the
+              cookie encodes, for the duration of the cookie and as long as the origin server
+              remains healthy. If the cookie has expired or the origin server is unhealthy,
+              then a new origin server is calculated and used. - `"ip_cookie"`: Behaves the
+              same as `"cookie"` except the initial origin selection is stable and based on
+              the client's ip address. - `"header"`: On the first request to a proxied load
+              balancer, a session key based on the configured HTTP headers (see
+              `session_affinity_attributes.headers`) is generated, encoding the request
+              headers used for storing in the load balancer session state which origin the
+              request will be forwarded to. Subsequent requests to the load balancer with the
+              same headers will be sent to the same origin server, for the duration of the
+              session and as long as the origin server remains healthy. If the session has
+              been idle for the duration of `session_affinity_ttl` seconds or the origin
+              server is unhealthy, then a new origin server is calculated and used. See
+              `headers` in `session_affinity_attributes` for additional required
+              configuration.
 
           session_affinity_attributes: Configures attributes for session affinity.
 
           session_affinity_ttl: Time, in seconds, until a client's session expires after being created. Once the
               expiry time has been reached, subsequent requests may get sent to a different
-              origin server. The accepted ranges per `session_affinity` policy are:
-
-              - `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used
-                unless explicitly set. The accepted range of values is between [1800, 604800].
-              - `"header"`: The current default of 1800 seconds will be used unless explicitly
-                set. The accepted range of values is between [30, 3600]. Note: With session
-                affinity by header, sessions only expire after they haven't been used for the
-                number of seconds specified.
+              origin server. The accepted ranges per `session_affinity` policy are: -
+              `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used unless
+              explicitly set. The accepted range of values is between [1800, 604800]. -
+              `"header"`: The current default of 1800 seconds will be used unless explicitly
+              set. The accepted range of values is between [30, 3600]. Note: With session
+              affinity by header, sessions only expire after they haven't been used for the
+              number of seconds specified.
 
           steering_policy: Steering Policy for this load balancer.
 
@@ -1196,6 +1224,7 @@ async def update(
                     "description": description,
                     "enabled": enabled,
                     "location_strategy": location_strategy,
+                    "networks": networks,
                     "pop_pools": pop_pools,
                     "proxied": proxied,
                     "random_steering": random_steering,
@@ -1228,7 +1257,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[LoadBalancer, AsyncSinglePage[LoadBalancer]]:
         """
         List configured load balancers.
@@ -1263,7 +1292,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LoadBalancerDeleteResponse:
         """
         Delete a configured load balancer.
@@ -1298,30 +1327,30 @@ async def edit(
         load_balancer_id: str,
         *,
         zone_id: str,
-        adaptive_routing: AdaptiveRoutingParam | NotGiven = NOT_GIVEN,
-        country_pools: object | NotGiven = NOT_GIVEN,
-        default_pools: List[DefaultPools] | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        fallback_pool: object | NotGiven = NOT_GIVEN,
-        location_strategy: LocationStrategyParam | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        pop_pools: object | NotGiven = NOT_GIVEN,
-        proxied: bool | NotGiven = NOT_GIVEN,
-        random_steering: RandomSteeringParam | NotGiven = NOT_GIVEN,
-        region_pools: object | NotGiven = NOT_GIVEN,
-        rules: Iterable[RulesParam] | NotGiven = NOT_GIVEN,
-        session_affinity: SessionAffinity | NotGiven = NOT_GIVEN,
-        session_affinity_attributes: SessionAffinityAttributesParam | NotGiven = NOT_GIVEN,
-        session_affinity_ttl: float | NotGiven = NOT_GIVEN,
-        steering_policy: SteeringPolicy | NotGiven = NOT_GIVEN,
-        ttl: float | NotGiven = NOT_GIVEN,
+        adaptive_routing: AdaptiveRoutingParam | Omit = omit,
+        country_pools: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        default_pools: SequenceNotStr[DefaultPools] | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        fallback_pool: str | Omit = omit,
+        location_strategy: LocationStrategyParam | Omit = omit,
+        name: str | Omit = omit,
+        pop_pools: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        proxied: bool | Omit = omit,
+        random_steering: RandomSteeringParam | Omit = omit,
+        region_pools: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        rules: Iterable[RulesParam] | Omit = omit,
+        session_affinity: SessionAffinity | Omit = omit,
+        session_affinity_attributes: SessionAffinityAttributesParam | Omit = omit,
+        session_affinity_ttl: float | Omit = omit,
+        steering_policy: SteeringPolicy | Omit = omit,
+        ttl: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LoadBalancer:
         """
         Apply changes to an existing load balancer, overwriting the supplied properties.
@@ -1355,7 +1384,7 @@ async def edit(
               exists as a DNS record in Cloudflare's DNS, the Load Balancer will take
               precedence and the DNS record will not be used.
 
-          pop_pools: (Enterprise only): A mapping of Cloudflare PoP identifiers to a list of pool IDs
+          pop_pools: Enterprise only: A mapping of Cloudflare PoP identifiers to a list of pool IDs
               (ordered by their failover priority) for the PoP (datacenter). Any PoPs not
               explicitly defined will fall back to using the corresponding country_pool, then
               region_pool mapping if it exists else to default_pools.
@@ -1379,41 +1408,37 @@ async def edit(
               execute.
 
           session_affinity: Specifies the type of session affinity the load balancer should use unless
-              specified as `"none"` or "" (default). The supported types are:
-
-              - `"cookie"`: On the first request to a proxied load balancer, a cookie is
-                generated, encoding information of which origin the request will be forwarded
-                to. Subsequent requests, by the same client to the same load balancer, will be
-                sent to the origin server the cookie encodes, for the duration of the cookie
-                and as long as the origin server remains healthy. If the cookie has expired or
-                the origin server is unhealthy, then a new origin server is calculated and
-                used.
-              - `"ip_cookie"`: Behaves the same as `"cookie"` except the initial origin
-                selection is stable and based on the client's ip address.
-              - `"header"`: On the first request to a proxied load balancer, a session key
-                based on the configured HTTP headers (see
-                `session_affinity_attributes.headers`) is generated, encoding the request
-                headers used for storing in the load balancer session state which origin the
-                request will be forwarded to. Subsequent requests to the load balancer with
-                the same headers will be sent to the same origin server, for the duration of
-                the session and as long as the origin server remains healthy. If the session
-                has been idle for the duration of `session_affinity_ttl` seconds or the origin
-                server is unhealthy, then a new origin server is calculated and used. See
-                `headers` in `session_affinity_attributes` for additional required
-                configuration.
+              specified as `"none"`. The supported types are: - `"cookie"`: On the first
+              request to a proxied load balancer, a cookie is generated, encoding information
+              of which origin the request will be forwarded to. Subsequent requests, by the
+              same client to the same load balancer, will be sent to the origin server the
+              cookie encodes, for the duration of the cookie and as long as the origin server
+              remains healthy. If the cookie has expired or the origin server is unhealthy,
+              then a new origin server is calculated and used. - `"ip_cookie"`: Behaves the
+              same as `"cookie"` except the initial origin selection is stable and based on
+              the client's ip address. - `"header"`: On the first request to a proxied load
+              balancer, a session key based on the configured HTTP headers (see
+              `session_affinity_attributes.headers`) is generated, encoding the request
+              headers used for storing in the load balancer session state which origin the
+              request will be forwarded to. Subsequent requests to the load balancer with the
+              same headers will be sent to the same origin server, for the duration of the
+              session and as long as the origin server remains healthy. If the session has
+              been idle for the duration of `session_affinity_ttl` seconds or the origin
+              server is unhealthy, then a new origin server is calculated and used. See
+              `headers` in `session_affinity_attributes` for additional required
+              configuration.
 
           session_affinity_attributes: Configures attributes for session affinity.
 
           session_affinity_ttl: Time, in seconds, until a client's session expires after being created. Once the
               expiry time has been reached, subsequent requests may get sent to a different
-              origin server. The accepted ranges per `session_affinity` policy are:
-
-              - `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used
-                unless explicitly set. The accepted range of values is between [1800, 604800].
-              - `"header"`: The current default of 1800 seconds will be used unless explicitly
-                set. The accepted range of values is between [30, 3600]. Note: With session
-                affinity by header, sessions only expire after they haven't been used for the
-                number of seconds specified.
+              origin server. The accepted ranges per `session_affinity` policy are: -
+              `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used unless
+              explicitly set. The accepted range of values is between [1800, 604800]. -
+              `"header"`: The current default of 1800 seconds will be used unless explicitly
+              set. The accepted range of values is between [30, 3600]. Note: With session
+              affinity by header, sessions only expire after they haven't been used for the
+              number of seconds specified.
 
           steering_policy: Steering Policy for this load balancer.
 
@@ -1498,7 +1523,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LoadBalancer:
         """
         Fetch a single configured load balancer.
@@ -1556,6 +1581,10 @@ def __init__(self, load_balancers: LoadBalancersResource) -> None:
     def monitors(self) -> MonitorsResourceWithRawResponse:
         return MonitorsResourceWithRawResponse(self._load_balancers.monitors)
 
+    @cached_property
+    def monitor_groups(self) -> MonitorGroupsResourceWithRawResponse:
+        return MonitorGroupsResourceWithRawResponse(self._load_balancers.monitor_groups)
+
     @cached_property
     def pools(self) -> PoolsResourceWithRawResponse:
         return PoolsResourceWithRawResponse(self._load_balancers.pools)
@@ -1600,6 +1629,10 @@ def __init__(self, load_balancers: AsyncLoadBalancersResource) -> None:
     def monitors(self) -> AsyncMonitorsResourceWithRawResponse:
         return AsyncMonitorsResourceWithRawResponse(self._load_balancers.monitors)
 
+    @cached_property
+    def monitor_groups(self) -> AsyncMonitorGroupsResourceWithRawResponse:
+        return AsyncMonitorGroupsResourceWithRawResponse(self._load_balancers.monitor_groups)
+
     @cached_property
     def pools(self) -> AsyncPoolsResourceWithRawResponse:
         return AsyncPoolsResourceWithRawResponse(self._load_balancers.pools)
@@ -1644,6 +1677,10 @@ def __init__(self, load_balancers: LoadBalancersResource) -> None:
     def monitors(self) -> MonitorsResourceWithStreamingResponse:
         return MonitorsResourceWithStreamingResponse(self._load_balancers.monitors)
 
+    @cached_property
+    def monitor_groups(self) -> MonitorGroupsResourceWithStreamingResponse:
+        return MonitorGroupsResourceWithStreamingResponse(self._load_balancers.monitor_groups)
+
     @cached_property
     def pools(self) -> PoolsResourceWithStreamingResponse:
         return PoolsResourceWithStreamingResponse(self._load_balancers.pools)
@@ -1688,6 +1725,10 @@ def __init__(self, load_balancers: AsyncLoadBalancersResource) -> None:
     def monitors(self) -> AsyncMonitorsResourceWithStreamingResponse:
         return AsyncMonitorsResourceWithStreamingResponse(self._load_balancers.monitors)
 
+    @cached_property
+    def monitor_groups(self) -> AsyncMonitorGroupsResourceWithStreamingResponse:
+        return AsyncMonitorGroupsResourceWithStreamingResponse(self._load_balancers.monitor_groups)
+
     @cached_property
     def pools(self) -> AsyncPoolsResourceWithStreamingResponse:
         return AsyncPoolsResourceWithStreamingResponse(self._load_balancers.pools)
diff --git a/src/cloudflare/resources/load_balancers/monitor_groups.py b/src/cloudflare/resources/load_balancers/monitor_groups.py
new file mode 100644
index 00000000000..b07f8c4f7c7
--- /dev/null
+++ b/src/cloudflare/resources/load_balancers/monitor_groups.py
@@ -0,0 +1,757 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, cast
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.load_balancers import monitor_group_edit_params, monitor_group_create_params, monitor_group_update_params
+from ...types.load_balancers.monitor_group import MonitorGroup
+
+__all__ = ["MonitorGroupsResource", "AsyncMonitorGroupsResource"]
+
+
+class MonitorGroupsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> MonitorGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return MonitorGroupsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> MonitorGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return MonitorGroupsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        id: str,
+        description: str,
+        members: Iterable[monitor_group_create_params.Member],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MonitorGroup:
+        """
+        Create a new monitor group.
+
+        Args:
+          account_id: Identifier.
+
+          id: The ID of the Monitor Group to use for checking the health of origins within
+              this pool.
+
+          description: A short description of the monitor group
+
+          members: List of monitors in this group
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/load_balancers/monitor_groups",
+            body=maybe_transform(
+                {
+                    "id": id,
+                    "description": description,
+                    "members": members,
+                },
+                monitor_group_create_params.MonitorGroupCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[MonitorGroup]._unwrapper,
+            ),
+            cast_to=cast(Type[MonitorGroup], ResultWrapper[MonitorGroup]),
+        )
+
+    def update(
+        self,
+        monitor_group_id: str,
+        *,
+        account_id: str,
+        id: str,
+        description: str,
+        members: Iterable[monitor_group_update_params.Member],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MonitorGroup:
+        """
+        Modify a configured monitor group.
+
+        Args:
+          account_id: Identifier.
+
+          id: The ID of the Monitor Group to use for checking the health of origins within
+              this pool.
+
+          description: A short description of the monitor group
+
+          members: List of monitors in this group
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not monitor_group_id:
+            raise ValueError(f"Expected a non-empty value for `monitor_group_id` but received {monitor_group_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/load_balancers/monitor_groups/{monitor_group_id}",
+            body=maybe_transform(
+                {
+                    "id": id,
+                    "description": description,
+                    "members": members,
+                },
+                monitor_group_update_params.MonitorGroupUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[MonitorGroup]._unwrapper,
+            ),
+            cast_to=cast(Type[MonitorGroup], ResultWrapper[MonitorGroup]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[MonitorGroup]:
+        """
+        List configured monitor groups.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/load_balancers/monitor_groups",
+            page=SyncSinglePage[MonitorGroup],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=MonitorGroup,
+        )
+
+    def delete(
+        self,
+        monitor_group_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MonitorGroup:
+        """
+        Delete a configured monitor group.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not monitor_group_id:
+            raise ValueError(f"Expected a non-empty value for `monitor_group_id` but received {monitor_group_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/load_balancers/monitor_groups/{monitor_group_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[MonitorGroup]._unwrapper,
+            ),
+            cast_to=cast(Type[MonitorGroup], ResultWrapper[MonitorGroup]),
+        )
+
+    def edit(
+        self,
+        monitor_group_id: str,
+        *,
+        account_id: str,
+        id: str,
+        description: str,
+        members: Iterable[monitor_group_edit_params.Member],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MonitorGroup:
+        """
+        Apply changes to an existing monitor group, overwriting the supplied properties.
+
+        Args:
+          account_id: Identifier.
+
+          id: The ID of the Monitor Group to use for checking the health of origins within
+              this pool.
+
+          description: A short description of the monitor group
+
+          members: List of monitors in this group
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not monitor_group_id:
+            raise ValueError(f"Expected a non-empty value for `monitor_group_id` but received {monitor_group_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/load_balancers/monitor_groups/{monitor_group_id}",
+            body=maybe_transform(
+                {
+                    "id": id,
+                    "description": description,
+                    "members": members,
+                },
+                monitor_group_edit_params.MonitorGroupEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[MonitorGroup]._unwrapper,
+            ),
+            cast_to=cast(Type[MonitorGroup], ResultWrapper[MonitorGroup]),
+        )
+
+    def get(
+        self,
+        monitor_group_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MonitorGroup:
+        """
+        Fetch a single configured monitor group.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not monitor_group_id:
+            raise ValueError(f"Expected a non-empty value for `monitor_group_id` but received {monitor_group_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/load_balancers/monitor_groups/{monitor_group_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[MonitorGroup]._unwrapper,
+            ),
+            cast_to=cast(Type[MonitorGroup], ResultWrapper[MonitorGroup]),
+        )
+
+
+class AsyncMonitorGroupsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncMonitorGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncMonitorGroupsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncMonitorGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncMonitorGroupsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        id: str,
+        description: str,
+        members: Iterable[monitor_group_create_params.Member],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MonitorGroup:
+        """
+        Create a new monitor group.
+
+        Args:
+          account_id: Identifier.
+
+          id: The ID of the Monitor Group to use for checking the health of origins within
+              this pool.
+
+          description: A short description of the monitor group
+
+          members: List of monitors in this group
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/load_balancers/monitor_groups",
+            body=await async_maybe_transform(
+                {
+                    "id": id,
+                    "description": description,
+                    "members": members,
+                },
+                monitor_group_create_params.MonitorGroupCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[MonitorGroup]._unwrapper,
+            ),
+            cast_to=cast(Type[MonitorGroup], ResultWrapper[MonitorGroup]),
+        )
+
+    async def update(
+        self,
+        monitor_group_id: str,
+        *,
+        account_id: str,
+        id: str,
+        description: str,
+        members: Iterable[monitor_group_update_params.Member],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MonitorGroup:
+        """
+        Modify a configured monitor group.
+
+        Args:
+          account_id: Identifier.
+
+          id: The ID of the Monitor Group to use for checking the health of origins within
+              this pool.
+
+          description: A short description of the monitor group
+
+          members: List of monitors in this group
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not monitor_group_id:
+            raise ValueError(f"Expected a non-empty value for `monitor_group_id` but received {monitor_group_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/load_balancers/monitor_groups/{monitor_group_id}",
+            body=await async_maybe_transform(
+                {
+                    "id": id,
+                    "description": description,
+                    "members": members,
+                },
+                monitor_group_update_params.MonitorGroupUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[MonitorGroup]._unwrapper,
+            ),
+            cast_to=cast(Type[MonitorGroup], ResultWrapper[MonitorGroup]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[MonitorGroup, AsyncSinglePage[MonitorGroup]]:
+        """
+        List configured monitor groups.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/load_balancers/monitor_groups",
+            page=AsyncSinglePage[MonitorGroup],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=MonitorGroup,
+        )
+
+    async def delete(
+        self,
+        monitor_group_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MonitorGroup:
+        """
+        Delete a configured monitor group.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not monitor_group_id:
+            raise ValueError(f"Expected a non-empty value for `monitor_group_id` but received {monitor_group_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/load_balancers/monitor_groups/{monitor_group_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[MonitorGroup]._unwrapper,
+            ),
+            cast_to=cast(Type[MonitorGroup], ResultWrapper[MonitorGroup]),
+        )
+
+    async def edit(
+        self,
+        monitor_group_id: str,
+        *,
+        account_id: str,
+        id: str,
+        description: str,
+        members: Iterable[monitor_group_edit_params.Member],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MonitorGroup:
+        """
+        Apply changes to an existing monitor group, overwriting the supplied properties.
+
+        Args:
+          account_id: Identifier.
+
+          id: The ID of the Monitor Group to use for checking the health of origins within
+              this pool.
+
+          description: A short description of the monitor group
+
+          members: List of monitors in this group
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not monitor_group_id:
+            raise ValueError(f"Expected a non-empty value for `monitor_group_id` but received {monitor_group_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/load_balancers/monitor_groups/{monitor_group_id}",
+            body=await async_maybe_transform(
+                {
+                    "id": id,
+                    "description": description,
+                    "members": members,
+                },
+                monitor_group_edit_params.MonitorGroupEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[MonitorGroup]._unwrapper,
+            ),
+            cast_to=cast(Type[MonitorGroup], ResultWrapper[MonitorGroup]),
+        )
+
+    async def get(
+        self,
+        monitor_group_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MonitorGroup:
+        """
+        Fetch a single configured monitor group.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not monitor_group_id:
+            raise ValueError(f"Expected a non-empty value for `monitor_group_id` but received {monitor_group_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/load_balancers/monitor_groups/{monitor_group_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[MonitorGroup]._unwrapper,
+            ),
+            cast_to=cast(Type[MonitorGroup], ResultWrapper[MonitorGroup]),
+        )
+
+
+class MonitorGroupsResourceWithRawResponse:
+    def __init__(self, monitor_groups: MonitorGroupsResource) -> None:
+        self._monitor_groups = monitor_groups
+
+        self.create = to_raw_response_wrapper(
+            monitor_groups.create,
+        )
+        self.update = to_raw_response_wrapper(
+            monitor_groups.update,
+        )
+        self.list = to_raw_response_wrapper(
+            monitor_groups.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            monitor_groups.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            monitor_groups.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            monitor_groups.get,
+        )
+
+
+class AsyncMonitorGroupsResourceWithRawResponse:
+    def __init__(self, monitor_groups: AsyncMonitorGroupsResource) -> None:
+        self._monitor_groups = monitor_groups
+
+        self.create = async_to_raw_response_wrapper(
+            monitor_groups.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            monitor_groups.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            monitor_groups.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            monitor_groups.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            monitor_groups.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            monitor_groups.get,
+        )
+
+
+class MonitorGroupsResourceWithStreamingResponse:
+    def __init__(self, monitor_groups: MonitorGroupsResource) -> None:
+        self._monitor_groups = monitor_groups
+
+        self.create = to_streamed_response_wrapper(
+            monitor_groups.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            monitor_groups.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            monitor_groups.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            monitor_groups.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            monitor_groups.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            monitor_groups.get,
+        )
+
+
+class AsyncMonitorGroupsResourceWithStreamingResponse:
+    def __init__(self, monitor_groups: AsyncMonitorGroupsResource) -> None:
+        self._monitor_groups = monitor_groups
+
+        self.create = async_to_streamed_response_wrapper(
+            monitor_groups.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            monitor_groups.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            monitor_groups.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            monitor_groups.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            monitor_groups.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            monitor_groups.get,
+        )
diff --git a/src/cloudflare/resources/load_balancers/monitors/monitors.py b/src/cloudflare/resources/load_balancers/monitors/monitors.py
index ed24c10037a..4137d8448f6 100644
--- a/src/cloudflare/resources/load_balancers/monitors/monitors.py
+++ b/src/cloudflare/resources/load_balancers/monitors/monitors.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Type, cast
+from typing import Dict, Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
@@ -15,11 +15,8 @@
     PreviewsResourceWithStreamingResponse,
     AsyncPreviewsResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from .references import (
     ReferencesResource,
@@ -57,47 +54,55 @@ def references(self) -> ReferencesResource:
 
     @cached_property
     def with_raw_response(self) -> MonitorsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return MonitorsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> MonitorsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return MonitorsResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        expected_codes: str,
-        allow_insecure: bool | NotGiven = NOT_GIVEN,
-        consecutive_down: int | NotGiven = NOT_GIVEN,
-        consecutive_up: int | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        expected_body: str | NotGiven = NOT_GIVEN,
-        follow_redirects: bool | NotGiven = NOT_GIVEN,
-        header: object | NotGiven = NOT_GIVEN,
-        interval: int | NotGiven = NOT_GIVEN,
-        method: str | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        port: int | NotGiven = NOT_GIVEN,
-        probe_zone: str | NotGiven = NOT_GIVEN,
-        retries: int | NotGiven = NOT_GIVEN,
-        load_balancer_monitor_timeout: int | NotGiven = NOT_GIVEN,
-        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | NotGiven = NOT_GIVEN,
+        allow_insecure: bool | Omit = omit,
+        consecutive_down: int | Omit = omit,
+        consecutive_up: int | Omit = omit,
+        description: str | Omit = omit,
+        expected_body: str | Omit = omit,
+        expected_codes: str | Omit = omit,
+        follow_redirects: bool | Omit = omit,
+        header: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        interval: int | Omit = omit,
+        method: str | Omit = omit,
+        path: str | Omit = omit,
+        port: Optional[int] | Omit = omit,
+        probe_zone: str | Omit = omit,
+        retries: int | Omit = omit,
+        load_balancer_monitor_timeout: int | Omit = omit,
+        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Monitor:
         """
         Create a configured monitor.
 
         Args:
-          account_id: Identifier
-
-          expected_codes: The expected HTTP response code or code range of the health check. This
-              parameter is only valid for HTTP and HTTPS monitors.
+          account_id: Identifier.
 
           allow_insecure: Do not validate the certificate when monitor use HTTPS. This parameter is
               currently only valid for HTTP and HTTPS monitors.
@@ -114,6 +119,9 @@ def create(
               is not found, the origin will be marked as unhealthy. This parameter is only
               valid for HTTP and HTTPS monitors.
 
+          expected_codes: The expected HTTP response code or code range of the health check. This
+              parameter is only valid for HTTP and HTTPS monitors.
+
           follow_redirects: Follow redirects if returned by the origin. This parameter is only valid for
               HTTP and HTTPS monitors.
 
@@ -159,12 +167,12 @@ def create(
             f"/accounts/{account_id}/load_balancers/monitors",
             body=maybe_transform(
                 {
-                    "expected_codes": expected_codes,
                     "allow_insecure": allow_insecure,
                     "consecutive_down": consecutive_down,
                     "consecutive_up": consecutive_up,
                     "description": description,
                     "expected_body": expected_body,
+                    "expected_codes": expected_codes,
                     "follow_redirects": follow_redirects,
                     "header": header,
                     "interval": interval,
@@ -173,7 +181,7 @@ def create(
                     "port": port,
                     "probe_zone": probe_zone,
                     "retries": retries,
-                    "timeout": load_balancer_monitor_timeout,
+                    "load_balancer_monitor_timeout": load_balancer_monitor_timeout,
                     "type": type,
                 },
                 monitor_create_params.MonitorCreateParams,
@@ -193,37 +201,34 @@ def update(
         monitor_id: str,
         *,
         account_id: str,
-        expected_codes: str,
-        allow_insecure: bool | NotGiven = NOT_GIVEN,
-        consecutive_down: int | NotGiven = NOT_GIVEN,
-        consecutive_up: int | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        expected_body: str | NotGiven = NOT_GIVEN,
-        follow_redirects: bool | NotGiven = NOT_GIVEN,
-        header: object | NotGiven = NOT_GIVEN,
-        interval: int | NotGiven = NOT_GIVEN,
-        method: str | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        port: int | NotGiven = NOT_GIVEN,
-        probe_zone: str | NotGiven = NOT_GIVEN,
-        retries: int | NotGiven = NOT_GIVEN,
-        load_balancer_monitor_timeout: int | NotGiven = NOT_GIVEN,
-        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | NotGiven = NOT_GIVEN,
+        allow_insecure: bool | Omit = omit,
+        consecutive_down: int | Omit = omit,
+        consecutive_up: int | Omit = omit,
+        description: str | Omit = omit,
+        expected_body: str | Omit = omit,
+        expected_codes: str | Omit = omit,
+        follow_redirects: bool | Omit = omit,
+        header: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        interval: int | Omit = omit,
+        method: str | Omit = omit,
+        path: str | Omit = omit,
+        port: Optional[int] | Omit = omit,
+        probe_zone: str | Omit = omit,
+        retries: int | Omit = omit,
+        load_balancer_monitor_timeout: int | Omit = omit,
+        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Monitor:
         """
         Modify a configured monitor.
 
         Args:
-          account_id: Identifier
-
-          expected_codes: The expected HTTP response code or code range of the health check. This
-              parameter is only valid for HTTP and HTTPS monitors.
+          account_id: Identifier.
 
           allow_insecure: Do not validate the certificate when monitor use HTTPS. This parameter is
               currently only valid for HTTP and HTTPS monitors.
@@ -240,6 +245,9 @@ def update(
               is not found, the origin will be marked as unhealthy. This parameter is only
               valid for HTTP and HTTPS monitors.
 
+          expected_codes: The expected HTTP response code or code range of the health check. This
+              parameter is only valid for HTTP and HTTPS monitors.
+
           follow_redirects: Follow redirects if returned by the origin. This parameter is only valid for
               HTTP and HTTPS monitors.
 
@@ -287,12 +295,12 @@ def update(
             f"/accounts/{account_id}/load_balancers/monitors/{monitor_id}",
             body=maybe_transform(
                 {
-                    "expected_codes": expected_codes,
                     "allow_insecure": allow_insecure,
                     "consecutive_down": consecutive_down,
                     "consecutive_up": consecutive_up,
                     "description": description,
                     "expected_body": expected_body,
+                    "expected_codes": expected_codes,
                     "follow_redirects": follow_redirects,
                     "header": header,
                     "interval": interval,
@@ -301,7 +309,7 @@ def update(
                     "port": port,
                     "probe_zone": probe_zone,
                     "retries": retries,
-                    "timeout": load_balancer_monitor_timeout,
+                    "load_balancer_monitor_timeout": load_balancer_monitor_timeout,
                     "type": type,
                 },
                 monitor_update_params.MonitorUpdateParams,
@@ -325,13 +333,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Monitor]:
         """
         List configured monitors for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -362,13 +370,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> MonitorDeleteResponse:
         """
         Delete a configured monitor.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -399,37 +407,34 @@ def edit(
         monitor_id: str,
         *,
         account_id: str,
-        expected_codes: str,
-        allow_insecure: bool | NotGiven = NOT_GIVEN,
-        consecutive_down: int | NotGiven = NOT_GIVEN,
-        consecutive_up: int | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        expected_body: str | NotGiven = NOT_GIVEN,
-        follow_redirects: bool | NotGiven = NOT_GIVEN,
-        header: object | NotGiven = NOT_GIVEN,
-        interval: int | NotGiven = NOT_GIVEN,
-        method: str | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        port: int | NotGiven = NOT_GIVEN,
-        probe_zone: str | NotGiven = NOT_GIVEN,
-        retries: int | NotGiven = NOT_GIVEN,
-        load_balancer_monitor_timeout: int | NotGiven = NOT_GIVEN,
-        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | NotGiven = NOT_GIVEN,
+        allow_insecure: bool | Omit = omit,
+        consecutive_down: int | Omit = omit,
+        consecutive_up: int | Omit = omit,
+        description: str | Omit = omit,
+        expected_body: str | Omit = omit,
+        expected_codes: str | Omit = omit,
+        follow_redirects: bool | Omit = omit,
+        header: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        interval: int | Omit = omit,
+        method: str | Omit = omit,
+        path: str | Omit = omit,
+        port: Optional[int] | Omit = omit,
+        probe_zone: str | Omit = omit,
+        retries: int | Omit = omit,
+        load_balancer_monitor_timeout: int | Omit = omit,
+        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Monitor:
         """
         Apply changes to an existing monitor, overwriting the supplied properties.
 
         Args:
-          account_id: Identifier
-
-          expected_codes: The expected HTTP response code or code range of the health check. This
-              parameter is only valid for HTTP and HTTPS monitors.
+          account_id: Identifier.
 
           allow_insecure: Do not validate the certificate when monitor use HTTPS. This parameter is
               currently only valid for HTTP and HTTPS monitors.
@@ -446,6 +451,9 @@ def edit(
               is not found, the origin will be marked as unhealthy. This parameter is only
               valid for HTTP and HTTPS monitors.
 
+          expected_codes: The expected HTTP response code or code range of the health check. This
+              parameter is only valid for HTTP and HTTPS monitors.
+
           follow_redirects: Follow redirects if returned by the origin. This parameter is only valid for
               HTTP and HTTPS monitors.
 
@@ -493,12 +501,12 @@ def edit(
             f"/accounts/{account_id}/load_balancers/monitors/{monitor_id}",
             body=maybe_transform(
                 {
-                    "expected_codes": expected_codes,
                     "allow_insecure": allow_insecure,
                     "consecutive_down": consecutive_down,
                     "consecutive_up": consecutive_up,
                     "description": description,
                     "expected_body": expected_body,
+                    "expected_codes": expected_codes,
                     "follow_redirects": follow_redirects,
                     "header": header,
                     "interval": interval,
@@ -507,7 +515,7 @@ def edit(
                     "port": port,
                     "probe_zone": probe_zone,
                     "retries": retries,
-                    "timeout": load_balancer_monitor_timeout,
+                    "load_balancer_monitor_timeout": load_balancer_monitor_timeout,
                     "type": type,
                 },
                 monitor_edit_params.MonitorEditParams,
@@ -532,13 +540,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Monitor:
         """
         List a single configured monitor for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -576,47 +584,55 @@ def references(self) -> AsyncReferencesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncMonitorsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncMonitorsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncMonitorsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncMonitorsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        expected_codes: str,
-        allow_insecure: bool | NotGiven = NOT_GIVEN,
-        consecutive_down: int | NotGiven = NOT_GIVEN,
-        consecutive_up: int | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        expected_body: str | NotGiven = NOT_GIVEN,
-        follow_redirects: bool | NotGiven = NOT_GIVEN,
-        header: object | NotGiven = NOT_GIVEN,
-        interval: int | NotGiven = NOT_GIVEN,
-        method: str | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        port: int | NotGiven = NOT_GIVEN,
-        probe_zone: str | NotGiven = NOT_GIVEN,
-        retries: int | NotGiven = NOT_GIVEN,
-        load_balancer_monitor_timeout: int | NotGiven = NOT_GIVEN,
-        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | NotGiven = NOT_GIVEN,
+        allow_insecure: bool | Omit = omit,
+        consecutive_down: int | Omit = omit,
+        consecutive_up: int | Omit = omit,
+        description: str | Omit = omit,
+        expected_body: str | Omit = omit,
+        expected_codes: str | Omit = omit,
+        follow_redirects: bool | Omit = omit,
+        header: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        interval: int | Omit = omit,
+        method: str | Omit = omit,
+        path: str | Omit = omit,
+        port: Optional[int] | Omit = omit,
+        probe_zone: str | Omit = omit,
+        retries: int | Omit = omit,
+        load_balancer_monitor_timeout: int | Omit = omit,
+        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Monitor:
         """
         Create a configured monitor.
 
         Args:
-          account_id: Identifier
-
-          expected_codes: The expected HTTP response code or code range of the health check. This
-              parameter is only valid for HTTP and HTTPS monitors.
+          account_id: Identifier.
 
           allow_insecure: Do not validate the certificate when monitor use HTTPS. This parameter is
               currently only valid for HTTP and HTTPS monitors.
@@ -633,6 +649,9 @@ async def create(
               is not found, the origin will be marked as unhealthy. This parameter is only
               valid for HTTP and HTTPS monitors.
 
+          expected_codes: The expected HTTP response code or code range of the health check. This
+              parameter is only valid for HTTP and HTTPS monitors.
+
           follow_redirects: Follow redirects if returned by the origin. This parameter is only valid for
               HTTP and HTTPS monitors.
 
@@ -678,12 +697,12 @@ async def create(
             f"/accounts/{account_id}/load_balancers/monitors",
             body=await async_maybe_transform(
                 {
-                    "expected_codes": expected_codes,
                     "allow_insecure": allow_insecure,
                     "consecutive_down": consecutive_down,
                     "consecutive_up": consecutive_up,
                     "description": description,
                     "expected_body": expected_body,
+                    "expected_codes": expected_codes,
                     "follow_redirects": follow_redirects,
                     "header": header,
                     "interval": interval,
@@ -692,7 +711,7 @@ async def create(
                     "port": port,
                     "probe_zone": probe_zone,
                     "retries": retries,
-                    "timeout": load_balancer_monitor_timeout,
+                    "load_balancer_monitor_timeout": load_balancer_monitor_timeout,
                     "type": type,
                 },
                 monitor_create_params.MonitorCreateParams,
@@ -712,37 +731,34 @@ async def update(
         monitor_id: str,
         *,
         account_id: str,
-        expected_codes: str,
-        allow_insecure: bool | NotGiven = NOT_GIVEN,
-        consecutive_down: int | NotGiven = NOT_GIVEN,
-        consecutive_up: int | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        expected_body: str | NotGiven = NOT_GIVEN,
-        follow_redirects: bool | NotGiven = NOT_GIVEN,
-        header: object | NotGiven = NOT_GIVEN,
-        interval: int | NotGiven = NOT_GIVEN,
-        method: str | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        port: int | NotGiven = NOT_GIVEN,
-        probe_zone: str | NotGiven = NOT_GIVEN,
-        retries: int | NotGiven = NOT_GIVEN,
-        load_balancer_monitor_timeout: int | NotGiven = NOT_GIVEN,
-        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | NotGiven = NOT_GIVEN,
+        allow_insecure: bool | Omit = omit,
+        consecutive_down: int | Omit = omit,
+        consecutive_up: int | Omit = omit,
+        description: str | Omit = omit,
+        expected_body: str | Omit = omit,
+        expected_codes: str | Omit = omit,
+        follow_redirects: bool | Omit = omit,
+        header: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        interval: int | Omit = omit,
+        method: str | Omit = omit,
+        path: str | Omit = omit,
+        port: Optional[int] | Omit = omit,
+        probe_zone: str | Omit = omit,
+        retries: int | Omit = omit,
+        load_balancer_monitor_timeout: int | Omit = omit,
+        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Monitor:
         """
         Modify a configured monitor.
 
         Args:
-          account_id: Identifier
-
-          expected_codes: The expected HTTP response code or code range of the health check. This
-              parameter is only valid for HTTP and HTTPS monitors.
+          account_id: Identifier.
 
           allow_insecure: Do not validate the certificate when monitor use HTTPS. This parameter is
               currently only valid for HTTP and HTTPS monitors.
@@ -759,6 +775,9 @@ async def update(
               is not found, the origin will be marked as unhealthy. This parameter is only
               valid for HTTP and HTTPS monitors.
 
+          expected_codes: The expected HTTP response code or code range of the health check. This
+              parameter is only valid for HTTP and HTTPS monitors.
+
           follow_redirects: Follow redirects if returned by the origin. This parameter is only valid for
               HTTP and HTTPS monitors.
 
@@ -806,12 +825,12 @@ async def update(
             f"/accounts/{account_id}/load_balancers/monitors/{monitor_id}",
             body=await async_maybe_transform(
                 {
-                    "expected_codes": expected_codes,
                     "allow_insecure": allow_insecure,
                     "consecutive_down": consecutive_down,
                     "consecutive_up": consecutive_up,
                     "description": description,
                     "expected_body": expected_body,
+                    "expected_codes": expected_codes,
                     "follow_redirects": follow_redirects,
                     "header": header,
                     "interval": interval,
@@ -820,7 +839,7 @@ async def update(
                     "port": port,
                     "probe_zone": probe_zone,
                     "retries": retries,
-                    "timeout": load_balancer_monitor_timeout,
+                    "load_balancer_monitor_timeout": load_balancer_monitor_timeout,
                     "type": type,
                 },
                 monitor_update_params.MonitorUpdateParams,
@@ -844,13 +863,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Monitor, AsyncSinglePage[Monitor]]:
         """
         List configured monitors for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -881,13 +900,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> MonitorDeleteResponse:
         """
         Delete a configured monitor.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -918,37 +937,34 @@ async def edit(
         monitor_id: str,
         *,
         account_id: str,
-        expected_codes: str,
-        allow_insecure: bool | NotGiven = NOT_GIVEN,
-        consecutive_down: int | NotGiven = NOT_GIVEN,
-        consecutive_up: int | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        expected_body: str | NotGiven = NOT_GIVEN,
-        follow_redirects: bool | NotGiven = NOT_GIVEN,
-        header: object | NotGiven = NOT_GIVEN,
-        interval: int | NotGiven = NOT_GIVEN,
-        method: str | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        port: int | NotGiven = NOT_GIVEN,
-        probe_zone: str | NotGiven = NOT_GIVEN,
-        retries: int | NotGiven = NOT_GIVEN,
-        load_balancer_monitor_timeout: int | NotGiven = NOT_GIVEN,
-        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | NotGiven = NOT_GIVEN,
+        allow_insecure: bool | Omit = omit,
+        consecutive_down: int | Omit = omit,
+        consecutive_up: int | Omit = omit,
+        description: str | Omit = omit,
+        expected_body: str | Omit = omit,
+        expected_codes: str | Omit = omit,
+        follow_redirects: bool | Omit = omit,
+        header: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        interval: int | Omit = omit,
+        method: str | Omit = omit,
+        path: str | Omit = omit,
+        port: Optional[int] | Omit = omit,
+        probe_zone: str | Omit = omit,
+        retries: int | Omit = omit,
+        load_balancer_monitor_timeout: int | Omit = omit,
+        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Monitor:
         """
         Apply changes to an existing monitor, overwriting the supplied properties.
 
         Args:
-          account_id: Identifier
-
-          expected_codes: The expected HTTP response code or code range of the health check. This
-              parameter is only valid for HTTP and HTTPS monitors.
+          account_id: Identifier.
 
           allow_insecure: Do not validate the certificate when monitor use HTTPS. This parameter is
               currently only valid for HTTP and HTTPS monitors.
@@ -965,6 +981,9 @@ async def edit(
               is not found, the origin will be marked as unhealthy. This parameter is only
               valid for HTTP and HTTPS monitors.
 
+          expected_codes: The expected HTTP response code or code range of the health check. This
+              parameter is only valid for HTTP and HTTPS monitors.
+
           follow_redirects: Follow redirects if returned by the origin. This parameter is only valid for
               HTTP and HTTPS monitors.
 
@@ -1012,12 +1031,12 @@ async def edit(
             f"/accounts/{account_id}/load_balancers/monitors/{monitor_id}",
             body=await async_maybe_transform(
                 {
-                    "expected_codes": expected_codes,
                     "allow_insecure": allow_insecure,
                     "consecutive_down": consecutive_down,
                     "consecutive_up": consecutive_up,
                     "description": description,
                     "expected_body": expected_body,
+                    "expected_codes": expected_codes,
                     "follow_redirects": follow_redirects,
                     "header": header,
                     "interval": interval,
@@ -1026,7 +1045,7 @@ async def edit(
                     "port": port,
                     "probe_zone": probe_zone,
                     "retries": retries,
-                    "timeout": load_balancer_monitor_timeout,
+                    "load_balancer_monitor_timeout": load_balancer_monitor_timeout,
                     "type": type,
                 },
                 monitor_edit_params.MonitorEditParams,
@@ -1051,13 +1070,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Monitor:
         """
         List a single configured monitor for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/load_balancers/monitors/previews.py b/src/cloudflare/resources/load_balancers/monitors/previews.py
index 4de5c71cf24..93dc55e8c55 100644
--- a/src/cloudflare/resources/load_balancers/monitors/previews.py
+++ b/src/cloudflare/resources/load_balancers/monitors/previews.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Type, cast
+from typing import Dict, Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -31,10 +28,21 @@
 class PreviewsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PreviewsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PreviewsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PreviewsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PreviewsResourceWithStreamingResponse(self)
 
     def create(
@@ -42,28 +50,28 @@ def create(
         monitor_id: str,
         *,
         account_id: str,
-        expected_codes: str,
-        allow_insecure: bool | NotGiven = NOT_GIVEN,
-        consecutive_down: int | NotGiven = NOT_GIVEN,
-        consecutive_up: int | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        expected_body: str | NotGiven = NOT_GIVEN,
-        follow_redirects: bool | NotGiven = NOT_GIVEN,
-        header: object | NotGiven = NOT_GIVEN,
-        interval: int | NotGiven = NOT_GIVEN,
-        method: str | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        port: int | NotGiven = NOT_GIVEN,
-        probe_zone: str | NotGiven = NOT_GIVEN,
-        retries: int | NotGiven = NOT_GIVEN,
-        load_balancer_monitor_timeout: int | NotGiven = NOT_GIVEN,
-        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | NotGiven = NOT_GIVEN,
+        allow_insecure: bool | Omit = omit,
+        consecutive_down: int | Omit = omit,
+        consecutive_up: int | Omit = omit,
+        description: str | Omit = omit,
+        expected_body: str | Omit = omit,
+        expected_codes: str | Omit = omit,
+        follow_redirects: bool | Omit = omit,
+        header: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        interval: int | Omit = omit,
+        method: str | Omit = omit,
+        path: str | Omit = omit,
+        port: Optional[int] | Omit = omit,
+        probe_zone: str | Omit = omit,
+        retries: int | Omit = omit,
+        load_balancer_monitor_timeout: int | Omit = omit,
+        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PreviewCreateResponse:
         """Preview pools using the specified monitor with provided monitor details.
 
@@ -71,10 +79,7 @@ def create(
         returned preview_id can be used in the preview endpoint to retrieve the results.
 
         Args:
-          account_id: Identifier
-
-          expected_codes: The expected HTTP response code or code range of the health check. This
-              parameter is only valid for HTTP and HTTPS monitors.
+          account_id: Identifier.
 
           allow_insecure: Do not validate the certificate when monitor use HTTPS. This parameter is
               currently only valid for HTTP and HTTPS monitors.
@@ -91,6 +96,9 @@ def create(
               is not found, the origin will be marked as unhealthy. This parameter is only
               valid for HTTP and HTTPS monitors.
 
+          expected_codes: The expected HTTP response code or code range of the health check. This
+              parameter is only valid for HTTP and HTTPS monitors.
+
           follow_redirects: Follow redirects if returned by the origin. This parameter is only valid for
               HTTP and HTTPS monitors.
 
@@ -138,12 +146,12 @@ def create(
             f"/accounts/{account_id}/load_balancers/monitors/{monitor_id}/preview",
             body=maybe_transform(
                 {
-                    "expected_codes": expected_codes,
                     "allow_insecure": allow_insecure,
                     "consecutive_down": consecutive_down,
                     "consecutive_up": consecutive_up,
                     "description": description,
                     "expected_body": expected_body,
+                    "expected_codes": expected_codes,
                     "follow_redirects": follow_redirects,
                     "header": header,
                     "interval": interval,
@@ -152,7 +160,7 @@ def create(
                     "port": port,
                     "probe_zone": probe_zone,
                     "retries": retries,
-                    "timeout": load_balancer_monitor_timeout,
+                    "load_balancer_monitor_timeout": load_balancer_monitor_timeout,
                     "type": type,
                 },
                 preview_create_params.PreviewCreateParams,
@@ -171,10 +179,21 @@ def create(
 class AsyncPreviewsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPreviewsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPreviewsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPreviewsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPreviewsResourceWithStreamingResponse(self)
 
     async def create(
@@ -182,28 +201,28 @@ async def create(
         monitor_id: str,
         *,
         account_id: str,
-        expected_codes: str,
-        allow_insecure: bool | NotGiven = NOT_GIVEN,
-        consecutive_down: int | NotGiven = NOT_GIVEN,
-        consecutive_up: int | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        expected_body: str | NotGiven = NOT_GIVEN,
-        follow_redirects: bool | NotGiven = NOT_GIVEN,
-        header: object | NotGiven = NOT_GIVEN,
-        interval: int | NotGiven = NOT_GIVEN,
-        method: str | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        port: int | NotGiven = NOT_GIVEN,
-        probe_zone: str | NotGiven = NOT_GIVEN,
-        retries: int | NotGiven = NOT_GIVEN,
-        load_balancer_monitor_timeout: int | NotGiven = NOT_GIVEN,
-        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | NotGiven = NOT_GIVEN,
+        allow_insecure: bool | Omit = omit,
+        consecutive_down: int | Omit = omit,
+        consecutive_up: int | Omit = omit,
+        description: str | Omit = omit,
+        expected_body: str | Omit = omit,
+        expected_codes: str | Omit = omit,
+        follow_redirects: bool | Omit = omit,
+        header: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        interval: int | Omit = omit,
+        method: str | Omit = omit,
+        path: str | Omit = omit,
+        port: Optional[int] | Omit = omit,
+        probe_zone: str | Omit = omit,
+        retries: int | Omit = omit,
+        load_balancer_monitor_timeout: int | Omit = omit,
+        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PreviewCreateResponse:
         """Preview pools using the specified monitor with provided monitor details.
 
@@ -211,10 +230,7 @@ async def create(
         returned preview_id can be used in the preview endpoint to retrieve the results.
 
         Args:
-          account_id: Identifier
-
-          expected_codes: The expected HTTP response code or code range of the health check. This
-              parameter is only valid for HTTP and HTTPS monitors.
+          account_id: Identifier.
 
           allow_insecure: Do not validate the certificate when monitor use HTTPS. This parameter is
               currently only valid for HTTP and HTTPS monitors.
@@ -231,6 +247,9 @@ async def create(
               is not found, the origin will be marked as unhealthy. This parameter is only
               valid for HTTP and HTTPS monitors.
 
+          expected_codes: The expected HTTP response code or code range of the health check. This
+              parameter is only valid for HTTP and HTTPS monitors.
+
           follow_redirects: Follow redirects if returned by the origin. This parameter is only valid for
               HTTP and HTTPS monitors.
 
@@ -278,12 +297,12 @@ async def create(
             f"/accounts/{account_id}/load_balancers/monitors/{monitor_id}/preview",
             body=await async_maybe_transform(
                 {
-                    "expected_codes": expected_codes,
                     "allow_insecure": allow_insecure,
                     "consecutive_down": consecutive_down,
                     "consecutive_up": consecutive_up,
                     "description": description,
                     "expected_body": expected_body,
+                    "expected_codes": expected_codes,
                     "follow_redirects": follow_redirects,
                     "header": header,
                     "interval": interval,
@@ -292,7 +311,7 @@ async def create(
                     "port": port,
                     "probe_zone": probe_zone,
                     "retries": retries,
-                    "timeout": load_balancer_monitor_timeout,
+                    "load_balancer_monitor_timeout": load_balancer_monitor_timeout,
                     "type": type,
                 },
                 preview_create_params.PreviewCreateParams,
diff --git a/src/cloudflare/resources/load_balancers/monitors/references.py b/src/cloudflare/resources/load_balancers/monitors/references.py
index ef46a6ac365..0730278f0df 100644
--- a/src/cloudflare/resources/load_balancers/monitors/references.py
+++ b/src/cloudflare/resources/load_balancers/monitors/references.py
@@ -2,11 +2,9 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
-
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -15,8 +13,8 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
 from ....types.load_balancers.monitors.reference_get_response import ReferenceGetResponse
 
 __all__ = ["ReferencesResource", "AsyncReferencesResource"]
@@ -25,10 +23,21 @@
 class ReferencesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ReferencesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ReferencesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ReferencesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ReferencesResourceWithStreamingResponse(self)
 
     def get(
@@ -41,13 +50,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ReferenceGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[ReferenceGetResponse]:
         """
         Get the list of resources that reference the provided monitor.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -61,29 +70,37 @@ def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not monitor_id:
             raise ValueError(f"Expected a non-empty value for `monitor_id` but received {monitor_id!r}")
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/load_balancers/monitors/{monitor_id}/references",
+            page=SyncSinglePage[ReferenceGetResponse],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ReferenceGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[ReferenceGetResponse]], ResultWrapper[ReferenceGetResponse]),
+            model=ReferenceGetResponse,
         )
 
 
 class AsyncReferencesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncReferencesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncReferencesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncReferencesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncReferencesResourceWithStreamingResponse(self)
 
-    async def get(
+    def get(
         self,
         monitor_id: str,
         *,
@@ -93,13 +110,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ReferenceGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ReferenceGetResponse, AsyncSinglePage[ReferenceGetResponse]]:
         """
         Get the list of resources that reference the provided monitor.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -113,16 +130,13 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not monitor_id:
             raise ValueError(f"Expected a non-empty value for `monitor_id` but received {monitor_id!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/load_balancers/monitors/{monitor_id}/references",
+            page=AsyncSinglePage[ReferenceGetResponse],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ReferenceGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[ReferenceGetResponse]], ResultWrapper[ReferenceGetResponse]),
+            model=ReferenceGetResponse,
         )
 
 
diff --git a/src/cloudflare/resources/load_balancers/pools/health.py b/src/cloudflare/resources/load_balancers/pools/health.py
index 0f583723a77..1cd0e96d1de 100644
--- a/src/cloudflare/resources/load_balancers/pools/health.py
+++ b/src/cloudflare/resources/load_balancers/pools/health.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, cast
+from typing import Dict, Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -32,10 +29,21 @@
 class HealthResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> HealthResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return HealthResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> HealthResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return HealthResourceWithStreamingResponse(self)
 
     def create(
@@ -43,28 +51,28 @@ def create(
         pool_id: str,
         *,
         account_id: str,
-        expected_codes: str,
-        allow_insecure: bool | NotGiven = NOT_GIVEN,
-        consecutive_down: int | NotGiven = NOT_GIVEN,
-        consecutive_up: int | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        expected_body: str | NotGiven = NOT_GIVEN,
-        follow_redirects: bool | NotGiven = NOT_GIVEN,
-        header: object | NotGiven = NOT_GIVEN,
-        interval: int | NotGiven = NOT_GIVEN,
-        method: str | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        port: int | NotGiven = NOT_GIVEN,
-        probe_zone: str | NotGiven = NOT_GIVEN,
-        retries: int | NotGiven = NOT_GIVEN,
-        load_balancer_monitor_timeout: int | NotGiven = NOT_GIVEN,
-        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | NotGiven = NOT_GIVEN,
+        allow_insecure: bool | Omit = omit,
+        consecutive_down: int | Omit = omit,
+        consecutive_up: int | Omit = omit,
+        description: str | Omit = omit,
+        expected_body: str | Omit = omit,
+        expected_codes: str | Omit = omit,
+        follow_redirects: bool | Omit = omit,
+        header: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        interval: int | Omit = omit,
+        method: str | Omit = omit,
+        path: str | Omit = omit,
+        port: Optional[int] | Omit = omit,
+        probe_zone: str | Omit = omit,
+        retries: int | Omit = omit,
+        load_balancer_monitor_timeout: int | Omit = omit,
+        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> HealthCreateResponse:
         """Preview pool health using provided monitor details.
 
@@ -72,10 +80,7 @@ def create(
         be used in the preview endpoint to retrieve the results.
 
         Args:
-          account_id: Identifier
-
-          expected_codes: The expected HTTP response code or code range of the health check. This
-              parameter is only valid for HTTP and HTTPS monitors.
+          account_id: Identifier.
 
           allow_insecure: Do not validate the certificate when monitor use HTTPS. This parameter is
               currently only valid for HTTP and HTTPS monitors.
@@ -92,6 +97,9 @@ def create(
               is not found, the origin will be marked as unhealthy. This parameter is only
               valid for HTTP and HTTPS monitors.
 
+          expected_codes: The expected HTTP response code or code range of the health check. This
+              parameter is only valid for HTTP and HTTPS monitors.
+
           follow_redirects: Follow redirects if returned by the origin. This parameter is only valid for
               HTTP and HTTPS monitors.
 
@@ -139,12 +147,12 @@ def create(
             f"/accounts/{account_id}/load_balancers/pools/{pool_id}/preview",
             body=maybe_transform(
                 {
-                    "expected_codes": expected_codes,
                     "allow_insecure": allow_insecure,
                     "consecutive_down": consecutive_down,
                     "consecutive_up": consecutive_up,
                     "description": description,
                     "expected_body": expected_body,
+                    "expected_codes": expected_codes,
                     "follow_redirects": follow_redirects,
                     "header": header,
                     "interval": interval,
@@ -153,7 +161,7 @@ def create(
                     "port": port,
                     "probe_zone": probe_zone,
                     "retries": retries,
-                    "timeout": load_balancer_monitor_timeout,
+                    "load_balancer_monitor_timeout": load_balancer_monitor_timeout,
                     "type": type,
                 },
                 health_create_params.HealthCreateParams,
@@ -178,13 +186,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> HealthGetResponse:
         """
         Fetch the latest pool health status for a single pool.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -198,31 +206,37 @@ def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not pool_id:
             raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}")
-        return cast(
-            HealthGetResponse,
-            self._get(
-                f"/accounts/{account_id}/load_balancers/pools/{pool_id}/health",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[HealthGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[HealthGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._get(
+            f"/accounts/{account_id}/load_balancers/pools/{pool_id}/health",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[HealthGetResponse]._unwrapper,
             ),
+            cast_to=cast(Type[HealthGetResponse], ResultWrapper[HealthGetResponse]),
         )
 
 
 class AsyncHealthResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncHealthResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncHealthResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncHealthResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncHealthResourceWithStreamingResponse(self)
 
     async def create(
@@ -230,28 +244,28 @@ async def create(
         pool_id: str,
         *,
         account_id: str,
-        expected_codes: str,
-        allow_insecure: bool | NotGiven = NOT_GIVEN,
-        consecutive_down: int | NotGiven = NOT_GIVEN,
-        consecutive_up: int | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        expected_body: str | NotGiven = NOT_GIVEN,
-        follow_redirects: bool | NotGiven = NOT_GIVEN,
-        header: object | NotGiven = NOT_GIVEN,
-        interval: int | NotGiven = NOT_GIVEN,
-        method: str | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        port: int | NotGiven = NOT_GIVEN,
-        probe_zone: str | NotGiven = NOT_GIVEN,
-        retries: int | NotGiven = NOT_GIVEN,
-        load_balancer_monitor_timeout: int | NotGiven = NOT_GIVEN,
-        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | NotGiven = NOT_GIVEN,
+        allow_insecure: bool | Omit = omit,
+        consecutive_down: int | Omit = omit,
+        consecutive_up: int | Omit = omit,
+        description: str | Omit = omit,
+        expected_body: str | Omit = omit,
+        expected_codes: str | Omit = omit,
+        follow_redirects: bool | Omit = omit,
+        header: Dict[str, SequenceNotStr[str]] | Omit = omit,
+        interval: int | Omit = omit,
+        method: str | Omit = omit,
+        path: str | Omit = omit,
+        port: Optional[int] | Omit = omit,
+        probe_zone: str | Omit = omit,
+        retries: int | Omit = omit,
+        load_balancer_monitor_timeout: int | Omit = omit,
+        type: Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> HealthCreateResponse:
         """Preview pool health using provided monitor details.
 
@@ -259,10 +273,7 @@ async def create(
         be used in the preview endpoint to retrieve the results.
 
         Args:
-          account_id: Identifier
-
-          expected_codes: The expected HTTP response code or code range of the health check. This
-              parameter is only valid for HTTP and HTTPS monitors.
+          account_id: Identifier.
 
           allow_insecure: Do not validate the certificate when monitor use HTTPS. This parameter is
               currently only valid for HTTP and HTTPS monitors.
@@ -279,6 +290,9 @@ async def create(
               is not found, the origin will be marked as unhealthy. This parameter is only
               valid for HTTP and HTTPS monitors.
 
+          expected_codes: The expected HTTP response code or code range of the health check. This
+              parameter is only valid for HTTP and HTTPS monitors.
+
           follow_redirects: Follow redirects if returned by the origin. This parameter is only valid for
               HTTP and HTTPS monitors.
 
@@ -326,12 +340,12 @@ async def create(
             f"/accounts/{account_id}/load_balancers/pools/{pool_id}/preview",
             body=await async_maybe_transform(
                 {
-                    "expected_codes": expected_codes,
                     "allow_insecure": allow_insecure,
                     "consecutive_down": consecutive_down,
                     "consecutive_up": consecutive_up,
                     "description": description,
                     "expected_body": expected_body,
+                    "expected_codes": expected_codes,
                     "follow_redirects": follow_redirects,
                     "header": header,
                     "interval": interval,
@@ -340,7 +354,7 @@ async def create(
                     "port": port,
                     "probe_zone": probe_zone,
                     "retries": retries,
-                    "timeout": load_balancer_monitor_timeout,
+                    "load_balancer_monitor_timeout": load_balancer_monitor_timeout,
                     "type": type,
                 },
                 health_create_params.HealthCreateParams,
@@ -365,13 +379,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> HealthGetResponse:
         """
         Fetch the latest pool health status for a single pool.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -385,21 +399,16 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not pool_id:
             raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}")
-        return cast(
-            HealthGetResponse,
-            await self._get(
-                f"/accounts/{account_id}/load_balancers/pools/{pool_id}/health",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[HealthGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[HealthGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._get(
+            f"/accounts/{account_id}/load_balancers/pools/{pool_id}/health",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[HealthGetResponse]._unwrapper,
             ),
+            cast_to=cast(Type[HealthGetResponse], ResultWrapper[HealthGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/load_balancers/pools/pools.py b/src/cloudflare/resources/load_balancers/pools/pools.py
index 332d6f7146c..7d3c3876c67 100644
--- a/src/cloudflare/resources/load_balancers/pools/pools.py
+++ b/src/cloudflare/resources/load_balancers/pools/pools.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from typing import List, Type, Iterable, Optional, cast
+from typing_extensions import Literal
 
 import httpx
 
@@ -14,11 +15,8 @@
     HealthResourceWithStreamingResponse,
     AsyncHealthResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from .references import (
     ReferencesResource,
@@ -43,6 +41,7 @@
     pool_list_params,
     pool_create_params,
     pool_update_params,
+    pool_bulk_edit_params,
 )
 from ....types.load_balancers.pool import Pool
 from ....types.load_balancers.check_region import CheckRegion
@@ -66,10 +65,21 @@ def references(self) -> ReferencesResource:
 
     @cached_property
     def with_raw_response(self) -> PoolsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PoolsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PoolsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PoolsResourceWithStreamingResponse(self)
 
     def create(
@@ -78,28 +88,29 @@ def create(
         account_id: str,
         name: str,
         origins: Iterable[OriginParam],
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        latitude: float | NotGiven = NOT_GIVEN,
-        load_shedding: LoadSheddingParam | NotGiven = NOT_GIVEN,
-        longitude: float | NotGiven = NOT_GIVEN,
-        minimum_origins: int | NotGiven = NOT_GIVEN,
-        monitor: object | NotGiven = NOT_GIVEN,
-        notification_email: str | NotGiven = NOT_GIVEN,
-        notification_filter: Optional[NotificationFilterParam] | NotGiven = NOT_GIVEN,
-        origin_steering: OriginSteeringParam | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        latitude: float | Omit = omit,
+        load_shedding: Optional[LoadSheddingParam] | Omit = omit,
+        longitude: float | Omit = omit,
+        minimum_origins: int | Omit = omit,
+        monitor: str | Omit = omit,
+        monitor_group: str | Omit = omit,
+        notification_email: str | Omit = omit,
+        notification_filter: Optional[NotificationFilterParam] | Omit = omit,
+        origin_steering: Optional[OriginSteeringParam] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Pool:
         """
         Create a new pool.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           name: A short name (tag) for the pool. Only alphanumeric characters, hyphens, and
               underscores are allowed.
@@ -128,6 +139,9 @@ def create(
           monitor: The ID of the Monitor to use for checking the health of origins within this
               pool.
 
+          monitor_group: The ID of the Monitor Group to use for checking the health of origins within
+              this pool.
+
           notification_email: This field is now deprecated. It has been moved to Cloudflare's Centralized
               Notification service
               https://developers.cloudflare.com/fundamentals/notifications/. The email address
@@ -163,6 +177,7 @@ def create(
                     "longitude": longitude,
                     "minimum_origins": minimum_origins,
                     "monitor": monitor,
+                    "monitor_group": monitor_group,
                     "notification_email": notification_email,
                     "notification_filter": notification_filter,
                     "origin_steering": origin_steering,
@@ -186,29 +201,30 @@ def update(
         account_id: str,
         name: str,
         origins: Iterable[OriginParam],
-        check_regions: Optional[List[CheckRegion]] | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        latitude: float | NotGiven = NOT_GIVEN,
-        load_shedding: LoadSheddingParam | NotGiven = NOT_GIVEN,
-        longitude: float | NotGiven = NOT_GIVEN,
-        minimum_origins: int | NotGiven = NOT_GIVEN,
-        monitor: object | NotGiven = NOT_GIVEN,
-        notification_email: str | NotGiven = NOT_GIVEN,
-        notification_filter: Optional[NotificationFilterParam] | NotGiven = NOT_GIVEN,
-        origin_steering: OriginSteeringParam | NotGiven = NOT_GIVEN,
+        check_regions: Optional[List[CheckRegion]] | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        latitude: float | Omit = omit,
+        load_shedding: Optional[LoadSheddingParam] | Omit = omit,
+        longitude: float | Omit = omit,
+        minimum_origins: int | Omit = omit,
+        monitor: str | Omit = omit,
+        monitor_group: str | Omit = omit,
+        notification_email: str | Omit = omit,
+        notification_filter: Optional[NotificationFilterParam] | Omit = omit,
+        origin_steering: Optional[OriginSteeringParam] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Pool:
         """
         Modify a configured pool.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           name: A short name (tag) for the pool. Only alphanumeric characters, hyphens, and
               underscores are allowed.
@@ -240,6 +256,9 @@ def update(
           monitor: The ID of the Monitor to use for checking the health of origins within this
               pool.
 
+          monitor_group: The ID of the Monitor Group to use for checking the health of origins within
+              this pool.
+
           notification_email: This field is now deprecated. It has been moved to Cloudflare's Centralized
               Notification service
               https://developers.cloudflare.com/fundamentals/notifications/. The email address
@@ -278,6 +297,7 @@ def update(
                     "longitude": longitude,
                     "minimum_origins": minimum_origins,
                     "monitor": monitor,
+                    "monitor_group": monitor_group,
                     "notification_email": notification_email,
                     "notification_filter": notification_filter,
                     "origin_steering": origin_steering,
@@ -298,19 +318,19 @@ def list(
         self,
         *,
         account_id: str,
-        monitor: object | NotGiven = NOT_GIVEN,
+        monitor: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Pool]:
         """
         List configured pools.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           monitor: The ID of the Monitor to use for checking the health of origins within this
               pool.
@@ -348,13 +368,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PoolDeleteResponse:
         """
         Delete a configured pool.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -380,36 +400,84 @@ def delete(
             cast_to=cast(Type[PoolDeleteResponse], ResultWrapper[PoolDeleteResponse]),
         )
 
+    def bulk_edit(
+        self,
+        *,
+        account_id: str,
+        notification_email: Literal[""] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[Pool]:
+        """Apply changes to a number of existing pools, overwriting the supplied
+        properties.
+
+        Pools are ordered by ascending `name`. Returns the list of affected
+        pools. Supports the standard pagination query parameters, either
+        `limit`/`offset` or `per_page`/`page`.
+
+        Args:
+          account_id: Identifier.
+
+          notification_email: The email address to send health status notifications to. This field is now
+              deprecated in favor of Cloudflare Notifications for Load Balancing, so only
+              resetting this field with an empty string `""` is accepted.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/load_balancers/pools",
+            page=SyncSinglePage[Pool],
+            body=maybe_transform({"notification_email": notification_email}, pool_bulk_edit_params.PoolBulkEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=Pool,
+            method="patch",
+        )
+
     def edit(
         self,
         pool_id: str,
         *,
         account_id: str,
-        check_regions: Optional[List[CheckRegion]] | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        latitude: float | NotGiven = NOT_GIVEN,
-        load_shedding: LoadSheddingParam | NotGiven = NOT_GIVEN,
-        longitude: float | NotGiven = NOT_GIVEN,
-        minimum_origins: int | NotGiven = NOT_GIVEN,
-        monitor: object | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        notification_email: str | NotGiven = NOT_GIVEN,
-        notification_filter: Optional[NotificationFilterParam] | NotGiven = NOT_GIVEN,
-        origin_steering: OriginSteeringParam | NotGiven = NOT_GIVEN,
-        origins: Iterable[OriginParam] | NotGiven = NOT_GIVEN,
+        check_regions: Optional[List[CheckRegion]] | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        latitude: float | Omit = omit,
+        load_shedding: Optional[LoadSheddingParam] | Omit = omit,
+        longitude: float | Omit = omit,
+        minimum_origins: int | Omit = omit,
+        monitor: str | Omit = omit,
+        monitor_group: str | Omit = omit,
+        name: str | Omit = omit,
+        notification_email: str | Omit = omit,
+        notification_filter: Optional[NotificationFilterParam] | Omit = omit,
+        origin_steering: Optional[OriginSteeringParam] | Omit = omit,
+        origins: Iterable[OriginParam] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Pool:
         """
         Apply changes to an existing pool, overwriting the supplied properties.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           check_regions: A list of regions from which to run health checks. Null means every Cloudflare
               data center.
@@ -435,6 +503,9 @@ def edit(
           monitor: The ID of the Monitor to use for checking the health of origins within this
               pool.
 
+          monitor_group: The ID of the Monitor Group to use for checking the health of origins within
+              this pool.
+
           name: A short name (tag) for the pool. Only alphanumeric characters, hyphens, and
               underscores are allowed.
 
@@ -477,6 +548,7 @@ def edit(
                     "longitude": longitude,
                     "minimum_origins": minimum_origins,
                     "monitor": monitor,
+                    "monitor_group": monitor_group,
                     "name": name,
                     "notification_email": notification_email,
                     "notification_filter": notification_filter,
@@ -505,13 +577,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Pool:
         """
         Fetch a single configured pool.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -549,10 +621,21 @@ def references(self) -> AsyncReferencesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncPoolsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPoolsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPoolsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPoolsResourceWithStreamingResponse(self)
 
     async def create(
@@ -561,28 +644,29 @@ async def create(
         account_id: str,
         name: str,
         origins: Iterable[OriginParam],
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        latitude: float | NotGiven = NOT_GIVEN,
-        load_shedding: LoadSheddingParam | NotGiven = NOT_GIVEN,
-        longitude: float | NotGiven = NOT_GIVEN,
-        minimum_origins: int | NotGiven = NOT_GIVEN,
-        monitor: object | NotGiven = NOT_GIVEN,
-        notification_email: str | NotGiven = NOT_GIVEN,
-        notification_filter: Optional[NotificationFilterParam] | NotGiven = NOT_GIVEN,
-        origin_steering: OriginSteeringParam | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        latitude: float | Omit = omit,
+        load_shedding: Optional[LoadSheddingParam] | Omit = omit,
+        longitude: float | Omit = omit,
+        minimum_origins: int | Omit = omit,
+        monitor: str | Omit = omit,
+        monitor_group: str | Omit = omit,
+        notification_email: str | Omit = omit,
+        notification_filter: Optional[NotificationFilterParam] | Omit = omit,
+        origin_steering: Optional[OriginSteeringParam] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Pool:
         """
         Create a new pool.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           name: A short name (tag) for the pool. Only alphanumeric characters, hyphens, and
               underscores are allowed.
@@ -611,6 +695,9 @@ async def create(
           monitor: The ID of the Monitor to use for checking the health of origins within this
               pool.
 
+          monitor_group: The ID of the Monitor Group to use for checking the health of origins within
+              this pool.
+
           notification_email: This field is now deprecated. It has been moved to Cloudflare's Centralized
               Notification service
               https://developers.cloudflare.com/fundamentals/notifications/. The email address
@@ -646,6 +733,7 @@ async def create(
                     "longitude": longitude,
                     "minimum_origins": minimum_origins,
                     "monitor": monitor,
+                    "monitor_group": monitor_group,
                     "notification_email": notification_email,
                     "notification_filter": notification_filter,
                     "origin_steering": origin_steering,
@@ -669,29 +757,30 @@ async def update(
         account_id: str,
         name: str,
         origins: Iterable[OriginParam],
-        check_regions: Optional[List[CheckRegion]] | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        latitude: float | NotGiven = NOT_GIVEN,
-        load_shedding: LoadSheddingParam | NotGiven = NOT_GIVEN,
-        longitude: float | NotGiven = NOT_GIVEN,
-        minimum_origins: int | NotGiven = NOT_GIVEN,
-        monitor: object | NotGiven = NOT_GIVEN,
-        notification_email: str | NotGiven = NOT_GIVEN,
-        notification_filter: Optional[NotificationFilterParam] | NotGiven = NOT_GIVEN,
-        origin_steering: OriginSteeringParam | NotGiven = NOT_GIVEN,
+        check_regions: Optional[List[CheckRegion]] | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        latitude: float | Omit = omit,
+        load_shedding: Optional[LoadSheddingParam] | Omit = omit,
+        longitude: float | Omit = omit,
+        minimum_origins: int | Omit = omit,
+        monitor: str | Omit = omit,
+        monitor_group: str | Omit = omit,
+        notification_email: str | Omit = omit,
+        notification_filter: Optional[NotificationFilterParam] | Omit = omit,
+        origin_steering: Optional[OriginSteeringParam] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Pool:
         """
         Modify a configured pool.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           name: A short name (tag) for the pool. Only alphanumeric characters, hyphens, and
               underscores are allowed.
@@ -723,6 +812,9 @@ async def update(
           monitor: The ID of the Monitor to use for checking the health of origins within this
               pool.
 
+          monitor_group: The ID of the Monitor Group to use for checking the health of origins within
+              this pool.
+
           notification_email: This field is now deprecated. It has been moved to Cloudflare's Centralized
               Notification service
               https://developers.cloudflare.com/fundamentals/notifications/. The email address
@@ -761,6 +853,7 @@ async def update(
                     "longitude": longitude,
                     "minimum_origins": minimum_origins,
                     "monitor": monitor,
+                    "monitor_group": monitor_group,
                     "notification_email": notification_email,
                     "notification_filter": notification_filter,
                     "origin_steering": origin_steering,
@@ -781,19 +874,19 @@ def list(
         self,
         *,
         account_id: str,
-        monitor: object | NotGiven = NOT_GIVEN,
+        monitor: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Pool, AsyncSinglePage[Pool]]:
         """
         List configured pools.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           monitor: The ID of the Monitor to use for checking the health of origins within this
               pool.
@@ -831,13 +924,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PoolDeleteResponse:
         """
         Delete a configured pool.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -863,36 +956,84 @@ async def delete(
             cast_to=cast(Type[PoolDeleteResponse], ResultWrapper[PoolDeleteResponse]),
         )
 
+    def bulk_edit(
+        self,
+        *,
+        account_id: str,
+        notification_email: Literal[""] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Pool, AsyncSinglePage[Pool]]:
+        """Apply changes to a number of existing pools, overwriting the supplied
+        properties.
+
+        Pools are ordered by ascending `name`. Returns the list of affected
+        pools. Supports the standard pagination query parameters, either
+        `limit`/`offset` or `per_page`/`page`.
+
+        Args:
+          account_id: Identifier.
+
+          notification_email: The email address to send health status notifications to. This field is now
+              deprecated in favor of Cloudflare Notifications for Load Balancing, so only
+              resetting this field with an empty string `""` is accepted.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/load_balancers/pools",
+            page=AsyncSinglePage[Pool],
+            body=maybe_transform({"notification_email": notification_email}, pool_bulk_edit_params.PoolBulkEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=Pool,
+            method="patch",
+        )
+
     async def edit(
         self,
         pool_id: str,
         *,
         account_id: str,
-        check_regions: Optional[List[CheckRegion]] | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        latitude: float | NotGiven = NOT_GIVEN,
-        load_shedding: LoadSheddingParam | NotGiven = NOT_GIVEN,
-        longitude: float | NotGiven = NOT_GIVEN,
-        minimum_origins: int | NotGiven = NOT_GIVEN,
-        monitor: object | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        notification_email: str | NotGiven = NOT_GIVEN,
-        notification_filter: Optional[NotificationFilterParam] | NotGiven = NOT_GIVEN,
-        origin_steering: OriginSteeringParam | NotGiven = NOT_GIVEN,
-        origins: Iterable[OriginParam] | NotGiven = NOT_GIVEN,
+        check_regions: Optional[List[CheckRegion]] | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        latitude: float | Omit = omit,
+        load_shedding: Optional[LoadSheddingParam] | Omit = omit,
+        longitude: float | Omit = omit,
+        minimum_origins: int | Omit = omit,
+        monitor: str | Omit = omit,
+        monitor_group: str | Omit = omit,
+        name: str | Omit = omit,
+        notification_email: str | Omit = omit,
+        notification_filter: Optional[NotificationFilterParam] | Omit = omit,
+        origin_steering: Optional[OriginSteeringParam] | Omit = omit,
+        origins: Iterable[OriginParam] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Pool:
         """
         Apply changes to an existing pool, overwriting the supplied properties.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           check_regions: A list of regions from which to run health checks. Null means every Cloudflare
               data center.
@@ -918,6 +1059,9 @@ async def edit(
           monitor: The ID of the Monitor to use for checking the health of origins within this
               pool.
 
+          monitor_group: The ID of the Monitor Group to use for checking the health of origins within
+              this pool.
+
           name: A short name (tag) for the pool. Only alphanumeric characters, hyphens, and
               underscores are allowed.
 
@@ -960,6 +1104,7 @@ async def edit(
                     "longitude": longitude,
                     "minimum_origins": minimum_origins,
                     "monitor": monitor,
+                    "monitor_group": monitor_group,
                     "name": name,
                     "notification_email": notification_email,
                     "notification_filter": notification_filter,
@@ -988,13 +1133,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Pool:
         """
         Fetch a single configured pool.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -1037,6 +1182,9 @@ def __init__(self, pools: PoolsResource) -> None:
         self.delete = to_raw_response_wrapper(
             pools.delete,
         )
+        self.bulk_edit = to_raw_response_wrapper(
+            pools.bulk_edit,
+        )
         self.edit = to_raw_response_wrapper(
             pools.edit,
         )
@@ -1069,6 +1217,9 @@ def __init__(self, pools: AsyncPoolsResource) -> None:
         self.delete = async_to_raw_response_wrapper(
             pools.delete,
         )
+        self.bulk_edit = async_to_raw_response_wrapper(
+            pools.bulk_edit,
+        )
         self.edit = async_to_raw_response_wrapper(
             pools.edit,
         )
@@ -1101,6 +1252,9 @@ def __init__(self, pools: PoolsResource) -> None:
         self.delete = to_streamed_response_wrapper(
             pools.delete,
         )
+        self.bulk_edit = to_streamed_response_wrapper(
+            pools.bulk_edit,
+        )
         self.edit = to_streamed_response_wrapper(
             pools.edit,
         )
@@ -1133,6 +1287,9 @@ def __init__(self, pools: AsyncPoolsResource) -> None:
         self.delete = async_to_streamed_response_wrapper(
             pools.delete,
         )
+        self.bulk_edit = async_to_streamed_response_wrapper(
+            pools.bulk_edit,
+        )
         self.edit = async_to_streamed_response_wrapper(
             pools.edit,
         )
diff --git a/src/cloudflare/resources/load_balancers/pools/references.py b/src/cloudflare/resources/load_balancers/pools/references.py
index 6f75e55bb3e..2bdf9464def 100644
--- a/src/cloudflare/resources/load_balancers/pools/references.py
+++ b/src/cloudflare/resources/load_balancers/pools/references.py
@@ -2,11 +2,9 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
-
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -15,8 +13,8 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
 from ....types.load_balancers.pools.reference_get_response import ReferenceGetResponse
 
 __all__ = ["ReferencesResource", "AsyncReferencesResource"]
@@ -25,10 +23,21 @@
 class ReferencesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ReferencesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ReferencesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ReferencesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ReferencesResourceWithStreamingResponse(self)
 
     def get(
@@ -41,13 +50,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ReferenceGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[ReferenceGetResponse]:
         """
         Get the list of resources that reference the provided pool.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -61,29 +70,37 @@ def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not pool_id:
             raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}")
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/load_balancers/pools/{pool_id}/references",
+            page=SyncSinglePage[ReferenceGetResponse],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ReferenceGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[ReferenceGetResponse]], ResultWrapper[ReferenceGetResponse]),
+            model=ReferenceGetResponse,
         )
 
 
 class AsyncReferencesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncReferencesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncReferencesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncReferencesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncReferencesResourceWithStreamingResponse(self)
 
-    async def get(
+    def get(
         self,
         pool_id: str,
         *,
@@ -93,13 +110,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ReferenceGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ReferenceGetResponse, AsyncSinglePage[ReferenceGetResponse]]:
         """
         Get the list of resources that reference the provided pool.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -113,16 +130,13 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not pool_id:
             raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/load_balancers/pools/{pool_id}/references",
+            page=AsyncSinglePage[ReferenceGetResponse],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ReferenceGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[ReferenceGetResponse]], ResultWrapper[ReferenceGetResponse]),
+            model=ReferenceGetResponse,
         )
 
 
diff --git a/src/cloudflare/resources/load_balancers/previews.py b/src/cloudflare/resources/load_balancers/previews.py
index a444e682d3e..9aa003c8728 100644
--- a/src/cloudflare/resources/load_balancers/previews.py
+++ b/src/cloudflare/resources/load_balancers/previews.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Query, Headers, NotGiven, not_given
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -25,10 +25,21 @@
 class PreviewsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PreviewsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PreviewsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PreviewsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PreviewsResourceWithStreamingResponse(self)
 
     def get(
@@ -41,13 +52,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PreviewGetResponse:
         """
         Get the result of a previous preview operation using the provided preview_id.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -77,10 +88,21 @@ def get(
 class AsyncPreviewsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPreviewsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPreviewsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPreviewsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPreviewsResourceWithStreamingResponse(self)
 
     async def get(
@@ -93,13 +115,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PreviewGetResponse:
         """
         Get the result of a previous preview operation using the provided preview_id.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/load_balancers/regions.py b/src/cloudflare/resources/load_balancers/regions.py
index 38b0f38de4a..d885fe0838d 100644
--- a/src/cloudflare/resources/load_balancers/regions.py
+++ b/src/cloudflare/resources/load_balancers/regions.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -32,31 +29,42 @@
 class RegionsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RegionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RegionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RegionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RegionsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
-        country_code_a2: str | NotGiven = NOT_GIVEN,
-        subdivision_code: str | NotGiven = NOT_GIVEN,
-        subdivision_code_a2: str | NotGiven = NOT_GIVEN,
+        country_code_a2: str | Omit = omit,
+        subdivision_code: str | Omit = omit,
+        subdivision_code_a2: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RegionListResponse:
         """
         List all region mappings.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           country_code_a2: Two-letter alpha-2 country code followed in ISO 3166-1.
 
@@ -111,13 +119,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RegionGetResponse:
         """
         Get a single region mapping.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           region_id: A list of Cloudflare regions. WNAM: Western North America, ENAM: Eastern North
               America, WEU: Western Europe, EEU: Eastern Europe, NSAM: Northern South America,
@@ -158,31 +166,42 @@ def get(
 class AsyncRegionsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRegionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRegionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRegionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRegionsResourceWithStreamingResponse(self)
 
     async def list(
         self,
         *,
         account_id: str,
-        country_code_a2: str | NotGiven = NOT_GIVEN,
-        subdivision_code: str | NotGiven = NOT_GIVEN,
-        subdivision_code_a2: str | NotGiven = NOT_GIVEN,
+        country_code_a2: str | Omit = omit,
+        subdivision_code: str | Omit = omit,
+        subdivision_code_a2: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RegionListResponse:
         """
         List all region mappings.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           country_code_a2: Two-letter alpha-2 country code followed in ISO 3166-1.
 
@@ -237,13 +256,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RegionGetResponse:
         """
         Get a single region mapping.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           region_id: A list of Cloudflare regions. WNAM: Western North America, ENAM: Eastern North
               America, WEU: Western Europe, EEU: Eastern Europe, NSAM: Northern South America,
diff --git a/src/cloudflare/resources/load_balancers/searches.py b/src/cloudflare/resources/load_balancers/searches.py
index c0e2eaf46c9..0bf1c0e6e04 100644
--- a/src/cloudflare/resources/load_balancers/searches.py
+++ b/src/cloudflare/resources/load_balancers/searches.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -19,10 +16,10 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
-from ...types.load_balancers import search_get_params
-from ...types.load_balancers.search_get_response import SearchGetResponse
+from ...pagination import SyncV4PagePagination, AsyncV4PagePagination
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.load_balancers import search_list_params
+from ...types.load_balancers.search_list_response import SearchListResponse
 
 __all__ = ["SearchesResource", "AsyncSearchesResource"]
 
@@ -30,31 +27,48 @@
 class SearchesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SearchesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SearchesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SearchesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SearchesResourceWithStreamingResponse(self)
 
-    def get(
+    def list(
         self,
         *,
         account_id: str,
-        page: object | NotGiven = NOT_GIVEN,
-        per_page: object | NotGiven = NOT_GIVEN,
-        search_params: search_get_params.SearchParams | NotGiven = NOT_GIVEN,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        query: str | Omit = omit,
+        references: Literal["", "*", "referral", "referrer"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SearchGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePagination[SearchListResponse]:
         """
         Search for Load Balancing resources.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          query: Search query term.
+
+          references: The type of references to include. "\\**" to include both referral and referrer
+              references. "" to not include any reference information.
 
           extra_headers: Send extra headers
 
@@ -66,8 +80,9 @@ def get(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/load_balancers/search",
+            page=SyncV4PagePagination[SearchListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -77,44 +92,61 @@ def get(
                     {
                         "page": page,
                         "per_page": per_page,
-                        "search_params": search_params,
+                        "query": query,
+                        "references": references,
                     },
-                    search_get_params.SearchGetParams,
+                    search_list_params.SearchListParams,
                 ),
-                post_parser=ResultWrapper[Optional[SearchGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[SearchGetResponse]], ResultWrapper[SearchGetResponse]),
+            model=SearchListResponse,
         )
 
 
 class AsyncSearchesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSearchesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSearchesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSearchesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSearchesResourceWithStreamingResponse(self)
 
-    async def get(
+    def list(
         self,
         *,
         account_id: str,
-        page: object | NotGiven = NOT_GIVEN,
-        per_page: object | NotGiven = NOT_GIVEN,
-        search_params: search_get_params.SearchParams | NotGiven = NOT_GIVEN,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        query: str | Omit = omit,
+        references: Literal["", "*", "referral", "referrer"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SearchGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SearchListResponse, AsyncV4PagePagination[SearchListResponse]]:
         """
         Search for Load Balancing resources.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          query: Search query term.
+
+          references: The type of references to include. "\\**" to include both referral and referrer
+              references. "" to not include any reference information.
 
           extra_headers: Send extra headers
 
@@ -126,24 +158,25 @@ async def get(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/load_balancers/search",
+            page=AsyncV4PagePagination[SearchListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=await async_maybe_transform(
+                query=maybe_transform(
                     {
                         "page": page,
                         "per_page": per_page,
-                        "search_params": search_params,
+                        "query": query,
+                        "references": references,
                     },
-                    search_get_params.SearchGetParams,
+                    search_list_params.SearchListParams,
                 ),
-                post_parser=ResultWrapper[Optional[SearchGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[SearchGetResponse]], ResultWrapper[SearchGetResponse]),
+            model=SearchListResponse,
         )
 
 
@@ -151,8 +184,8 @@ class SearchesResourceWithRawResponse:
     def __init__(self, searches: SearchesResource) -> None:
         self._searches = searches
 
-        self.get = to_raw_response_wrapper(
-            searches.get,
+        self.list = to_raw_response_wrapper(
+            searches.list,
         )
 
 
@@ -160,8 +193,8 @@ class AsyncSearchesResourceWithRawResponse:
     def __init__(self, searches: AsyncSearchesResource) -> None:
         self._searches = searches
 
-        self.get = async_to_raw_response_wrapper(
-            searches.get,
+        self.list = async_to_raw_response_wrapper(
+            searches.list,
         )
 
 
@@ -169,8 +202,8 @@ class SearchesResourceWithStreamingResponse:
     def __init__(self, searches: SearchesResource) -> None:
         self._searches = searches
 
-        self.get = to_streamed_response_wrapper(
-            searches.get,
+        self.list = to_streamed_response_wrapper(
+            searches.list,
         )
 
 
@@ -178,6 +211,6 @@ class AsyncSearchesResourceWithStreamingResponse:
     def __init__(self, searches: AsyncSearchesResource) -> None:
         self._searches = searches
 
-        self.get = async_to_streamed_response_wrapper(
-            searches.get,
+        self.list = async_to_streamed_response_wrapper(
+            searches.list,
         )
diff --git a/src/cloudflare/resources/logpush/datasets/datasets.py b/src/cloudflare/resources/logpush/datasets/datasets.py
index e2218d3f1db..2fd38e2140d 100644
--- a/src/cloudflare/resources/logpush/datasets/datasets.py
+++ b/src/cloudflare/resources/logpush/datasets/datasets.py
@@ -35,10 +35,21 @@ def jobs(self) -> JobsResource:
 
     @cached_property
     def with_raw_response(self) -> DatasetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DatasetsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DatasetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DatasetsResourceWithStreamingResponse(self)
 
 
@@ -53,10 +64,21 @@ def jobs(self) -> AsyncJobsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncDatasetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDatasetsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDatasetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDatasetsResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/logpush/datasets/fields.py b/src/cloudflare/resources/logpush/datasets/fields.py
index 5e661edf514..3a7c6ee4802 100644
--- a/src/cloudflare/resources/logpush/datasets/fields.py
+++ b/src/cloudflare/resources/logpush/datasets/fields.py
@@ -3,10 +3,11 @@
 from __future__ import annotations
 
 from typing import Type, Optional, cast
+from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -24,28 +25,72 @@
 class FieldsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> FieldsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return FieldsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> FieldsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return FieldsResourceWithStreamingResponse(self)
 
     def get(
         self,
-        dataset_id: Optional[str],
+        dataset_id: Optional[
+            Literal[
+                "access_requests",
+                "audit_logs",
+                "audit_logs_v2",
+                "biso_user_actions",
+                "casb_findings",
+                "device_posture_results",
+                "dex_application_tests",
+                "dex_device_state_events",
+                "dlp_forensic_copies",
+                "dns_firewall_logs",
+                "dns_logs",
+                "email_security_alerts",
+                "firewall_events",
+                "gateway_dns",
+                "gateway_http",
+                "gateway_network",
+                "http_requests",
+                "ipsec_logs",
+                "magic_ids_detections",
+                "nel_reports",
+                "network_analytics_logs",
+                "page_shield_events",
+                "sinkhole_http_logs",
+                "spectrum_events",
+                "ssh_logs",
+                "warp_config_changes",
+                "warp_toggle_changes",
+                "workers_trace_events",
+                "zaraz_events",
+                "zero_trust_network_sessions",
+            ]
+        ],
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """Lists all fields available for a dataset.
 
-        The response result is an object with
+        The response result is. an object with
         key-value pairs, where keys are field names, and values are descriptions.
 
         Args:
@@ -94,28 +139,72 @@ def get(
 class AsyncFieldsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncFieldsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncFieldsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncFieldsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncFieldsResourceWithStreamingResponse(self)
 
     async def get(
         self,
-        dataset_id: Optional[str],
+        dataset_id: Optional[
+            Literal[
+                "access_requests",
+                "audit_logs",
+                "audit_logs_v2",
+                "biso_user_actions",
+                "casb_findings",
+                "device_posture_results",
+                "dex_application_tests",
+                "dex_device_state_events",
+                "dlp_forensic_copies",
+                "dns_firewall_logs",
+                "dns_logs",
+                "email_security_alerts",
+                "firewall_events",
+                "gateway_dns",
+                "gateway_http",
+                "gateway_network",
+                "http_requests",
+                "ipsec_logs",
+                "magic_ids_detections",
+                "nel_reports",
+                "network_analytics_logs",
+                "page_shield_events",
+                "sinkhole_http_logs",
+                "spectrum_events",
+                "ssh_logs",
+                "warp_config_changes",
+                "warp_toggle_changes",
+                "workers_trace_events",
+                "zaraz_events",
+                "zero_trust_network_sessions",
+            ]
+        ],
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """Lists all fields available for a dataset.
 
-        The response result is an object with
+        The response result is. an object with
         key-value pairs, where keys are field names, and values are descriptions.
 
         Args:
diff --git a/src/cloudflare/resources/logpush/datasets/jobs.py b/src/cloudflare/resources/logpush/datasets/jobs.py
index f96da336d34..bb893c22f04 100644
--- a/src/cloudflare/resources/logpush/datasets/jobs.py
+++ b/src/cloudflare/resources/logpush/datasets/jobs.py
@@ -2,11 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Optional
+from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -15,9 +16,9 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
-from ....types.logpush.datasets.job_get_response import JobGetResponse
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.logpush.logpush_job import LogpushJob
 
 __all__ = ["JobsResource", "AsyncJobsResource"]
 
@@ -25,25 +26,69 @@
 class JobsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> JobsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return JobsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> JobsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return JobsResourceWithStreamingResponse(self)
 
     def get(
         self,
-        dataset_id: Optional[str],
+        dataset_id: Optional[
+            Literal[
+                "access_requests",
+                "audit_logs",
+                "audit_logs_v2",
+                "biso_user_actions",
+                "casb_findings",
+                "device_posture_results",
+                "dex_application_tests",
+                "dex_device_state_events",
+                "dlp_forensic_copies",
+                "dns_firewall_logs",
+                "dns_logs",
+                "email_security_alerts",
+                "firewall_events",
+                "gateway_dns",
+                "gateway_http",
+                "gateway_network",
+                "http_requests",
+                "ipsec_logs",
+                "magic_ids_detections",
+                "nel_reports",
+                "network_analytics_logs",
+                "page_shield_events",
+                "sinkhole_http_logs",
+                "spectrum_events",
+                "ssh_logs",
+                "warp_config_changes",
+                "warp_toggle_changes",
+                "workers_trace_events",
+                "zaraz_events",
+                "zero_trust_network_sessions",
+            ]
+        ],
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[JobGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[Optional[LogpushJob]]:
         """
         Lists Logpush jobs for an account or zone for a dataset.
 
@@ -77,41 +122,82 @@ def get(
 
             account_or_zone = "zones"
             account_or_zone_id = zone_id
-        return self._get(
+        return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/logpush/datasets/{dataset_id}/jobs",
+            page=SyncSinglePage[Optional[LogpushJob]],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[JobGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[JobGetResponse]], ResultWrapper[JobGetResponse]),
+            model=LogpushJob,
         )
 
 
 class AsyncJobsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncJobsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncJobsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncJobsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncJobsResourceWithStreamingResponse(self)
 
-    async def get(
+    def get(
         self,
-        dataset_id: Optional[str],
+        dataset_id: Optional[
+            Literal[
+                "access_requests",
+                "audit_logs",
+                "audit_logs_v2",
+                "biso_user_actions",
+                "casb_findings",
+                "device_posture_results",
+                "dex_application_tests",
+                "dex_device_state_events",
+                "dlp_forensic_copies",
+                "dns_firewall_logs",
+                "dns_logs",
+                "email_security_alerts",
+                "firewall_events",
+                "gateway_dns",
+                "gateway_http",
+                "gateway_network",
+                "http_requests",
+                "ipsec_logs",
+                "magic_ids_detections",
+                "nel_reports",
+                "network_analytics_logs",
+                "page_shield_events",
+                "sinkhole_http_logs",
+                "spectrum_events",
+                "ssh_logs",
+                "warp_config_changes",
+                "warp_toggle_changes",
+                "workers_trace_events",
+                "zaraz_events",
+                "zero_trust_network_sessions",
+            ]
+        ],
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[JobGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Optional[LogpushJob], AsyncSinglePage[Optional[LogpushJob]]]:
         """
         Lists Logpush jobs for an account or zone for a dataset.
 
@@ -145,16 +231,13 @@ async def get(
 
             account_or_zone = "zones"
             account_or_zone_id = zone_id
-        return await self._get(
+        return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/logpush/datasets/{dataset_id}/jobs",
+            page=AsyncSinglePage[Optional[LogpushJob]],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[JobGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[JobGetResponse]], ResultWrapper[JobGetResponse]),
+            model=LogpushJob,
         )
 
 
diff --git a/src/cloudflare/resources/logpush/edge.py b/src/cloudflare/resources/logpush/edge.py
index a708f47cfb3..5404dffd698 100644
--- a/src/cloudflare/resources/logpush/edge.py
+++ b/src/cloudflare/resources/logpush/edge.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -20,9 +17,9 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
 from ...types.logpush import edge_create_params
-from ...types.logpush.edge_get_response import EdgeGetResponse
 from ...types.logpush.instant_logpush_job import InstantLogpushJob
 
 __all__ = ["EdgeResource", "AsyncEdgeResource"]
@@ -31,31 +28,42 @@
 class EdgeResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> EdgeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return EdgeResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> EdgeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return EdgeResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         zone_id: str,
-        fields: str | NotGiven = NOT_GIVEN,
-        filter: str | NotGiven = NOT_GIVEN,
-        sample: int | NotGiven = NOT_GIVEN,
+        fields: str | Omit = omit,
+        filter: str | Omit = omit,
+        sample: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[InstantLogpushJob]:
         """
         Creates a new Instant Logs job for a zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           fields: Comma-separated list of fields.
 
@@ -76,7 +84,7 @@ def create(
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._post(
-            f"/zones/{zone_id}/logpush/edge",
+            f"/zones/{zone_id}/logpush/edge/jobs",
             body=maybe_transform(
                 {
                     "fields": fields,
@@ -104,13 +112,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[EdgeGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[Optional[InstantLogpushJob]]:
         """
         Lists Instant Logs jobs for a zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -122,47 +130,55 @@ def get(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._get(
-            f"/zones/{zone_id}/logpush/edge",
+        return self._get_api_list(
+            f"/zones/{zone_id}/logpush/edge/jobs",
+            page=SyncSinglePage[Optional[InstantLogpushJob]],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[EdgeGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[EdgeGetResponse]], ResultWrapper[EdgeGetResponse]),
+            model=InstantLogpushJob,
         )
 
 
 class AsyncEdgeResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncEdgeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncEdgeResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncEdgeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncEdgeResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         zone_id: str,
-        fields: str | NotGiven = NOT_GIVEN,
-        filter: str | NotGiven = NOT_GIVEN,
-        sample: int | NotGiven = NOT_GIVEN,
+        fields: str | Omit = omit,
+        filter: str | Omit = omit,
+        sample: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[InstantLogpushJob]:
         """
         Creates a new Instant Logs job for a zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           fields: Comma-separated list of fields.
 
@@ -183,7 +199,7 @@ async def create(
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return await self._post(
-            f"/zones/{zone_id}/logpush/edge",
+            f"/zones/{zone_id}/logpush/edge/jobs",
             body=await async_maybe_transform(
                 {
                     "fields": fields,
@@ -202,7 +218,7 @@ async def create(
             cast_to=cast(Type[Optional[InstantLogpushJob]], ResultWrapper[InstantLogpushJob]),
         )
 
-    async def get(
+    def get(
         self,
         *,
         zone_id: str,
@@ -211,13 +227,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[EdgeGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Optional[InstantLogpushJob], AsyncSinglePage[Optional[InstantLogpushJob]]]:
         """
         Lists Instant Logs jobs for a zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -229,16 +245,13 @@ async def get(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._get(
-            f"/zones/{zone_id}/logpush/edge",
+        return self._get_api_list(
+            f"/zones/{zone_id}/logpush/edge/jobs",
+            page=AsyncSinglePage[Optional[InstantLogpushJob]],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[EdgeGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[EdgeGetResponse]], ResultWrapper[EdgeGetResponse]),
+            model=InstantLogpushJob,
         )
 
 
diff --git a/src/cloudflare/resources/logpush/jobs.py b/src/cloudflare/resources/logpush/jobs.py
index 142476cb9a4..584c266b841 100644
--- a/src/cloudflare/resources/logpush/jobs.py
+++ b/src/cloudflare/resources/logpush/jobs.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Type, Union, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -25,6 +22,7 @@
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.logpush import job_create_params, job_update_params
 from ...types.logpush.logpush_job import LogpushJob
+from ...types.logpush.job_delete_response import JobDeleteResponse
 from ...types.logpush.output_options_param import OutputOptionsParam
 
 __all__ = ["JobsResource", "AsyncJobsResource"]
@@ -33,42 +31,88 @@
 class JobsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> JobsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return JobsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> JobsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return JobsResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         destination_conf: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        dataset: Optional[str] | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        frequency: Optional[Literal["high", "low"]] | NotGiven = NOT_GIVEN,
-        kind: Optional[Literal["edge"]] | NotGiven = NOT_GIVEN,
-        logpull_options: Optional[str] | NotGiven = NOT_GIVEN,
-        max_upload_bytes: Optional[int] | NotGiven = NOT_GIVEN,
-        max_upload_interval_seconds: Optional[int] | NotGiven = NOT_GIVEN,
-        max_upload_records: Optional[int] | NotGiven = NOT_GIVEN,
-        name: Optional[str] | NotGiven = NOT_GIVEN,
-        output_options: Optional[OutputOptionsParam] | NotGiven = NOT_GIVEN,
-        ownership_challenge: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        dataset: Optional[
+            Literal[
+                "access_requests",
+                "audit_logs",
+                "audit_logs_v2",
+                "biso_user_actions",
+                "casb_findings",
+                "device_posture_results",
+                "dex_application_tests",
+                "dex_device_state_events",
+                "dlp_forensic_copies",
+                "dns_firewall_logs",
+                "dns_logs",
+                "email_security_alerts",
+                "firewall_events",
+                "gateway_dns",
+                "gateway_http",
+                "gateway_network",
+                "http_requests",
+                "ipsec_logs",
+                "magic_ids_detections",
+                "nel_reports",
+                "network_analytics_logs",
+                "page_shield_events",
+                "sinkhole_http_logs",
+                "spectrum_events",
+                "ssh_logs",
+                "warp_config_changes",
+                "warp_toggle_changes",
+                "workers_trace_events",
+                "zaraz_events",
+                "zero_trust_network_sessions",
+            ]
+        ]
+        | Omit = omit,
+        enabled: bool | Omit = omit,
+        filter: Optional[str] | Omit = omit,
+        frequency: Optional[Literal["high", "low"]] | Omit = omit,
+        kind: Literal["", "edge"] | Omit = omit,
+        logpull_options: Optional[str] | Omit = omit,
+        max_upload_bytes: Union[Literal[0], int, None] | Omit = omit,
+        max_upload_interval_seconds: Union[Literal[0], int, None] | Omit = omit,
+        max_upload_records: Union[Literal[0], int, None] | Omit = omit,
+        name: Optional[str] | Omit = omit,
+        output_options: Optional[OutputOptionsParam] | Omit = omit,
+        ownership_challenge: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LogpushJob]:
         """
         Creates a new Logpush job for an account or zone.
 
         Args:
-          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data will be pushed.
-              Additional configuration parameters supported by the destination may be
+          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data. will be
+              pushed. Additional configuration parameters supported by the destination may be
               included.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
@@ -80,14 +124,17 @@ def create(
 
           enabled: Flag that indicates if the job is enabled.
 
-          frequency: This field is deprecated. Please use `max_upload_*` parameters instead. The
+          filter: The filters to select the events to include and/or remove from your logs. For
+              more information, refer to
+              [Filters](https://developers.cloudflare.com/logs/reference/filters/).
+
+          frequency: This field is deprecated. Please use `max_upload_*` parameters instead. . The
               frequency at which Cloudflare sends batches of logs to your destination. Setting
               frequency to high sends your logs in larger quantities of smaller files. Setting
               frequency to low sends logs in smaller quantities of larger files.
 
           kind: The kind parameter (optional) is used to differentiate between Logpush and Edge
-              Log Delivery jobs. Currently, Edge Log Delivery is only supported for the
-              `http_requests` dataset.
+              Log Delivery jobs (when supported by the dataset).
 
           logpull_options: This field is deprecated. Use `output_options` instead. Configuration string. It
               specifies things like requested fields and timestamp formats. If migrating from
@@ -98,21 +145,19 @@ def create(
           max_upload_bytes: The maximum uncompressed file size of a batch of logs. This setting value must
               be between `5 MB` and `1 GB`, or `0` to disable it. Note that you cannot set a
               minimum file size; this means that log files may be much smaller than this batch
-              size. This parameter is not available for jobs with `edge` as its kind.
+              size.
 
           max_upload_interval_seconds: The maximum interval in seconds for log batches. This setting must be between 30
               and 300 seconds (5 minutes), or `0` to disable it. Note that you cannot specify
               a minimum interval for log batches; this means that log files may be sent in
-              shorter intervals than this. This parameter is only used for jobs with `edge` as
-              its kind.
+              shorter intervals than this.
 
           max_upload_records: The maximum number of log lines per batch. This setting must be between 1000 and
               1,000,000 lines, or `0` to disable it. Note that you cannot specify a minimum
               number of log lines per batch; this means that log files may contain many fewer
-              lines than this. This parameter is not available for jobs with `edge` as its
-              kind.
+              lines than this.
 
-          name: Optional human readable job name. Not unique. Cloudflare suggests that you set
+          name: Optional human readable job name. Not unique. Cloudflare suggests. that you set
               this to a meaningful string, like the domain name, to make it easier to identify
               your job.
 
@@ -148,6 +193,7 @@ def create(
                     "destination_conf": destination_conf,
                     "dataset": dataset,
                     "enabled": enabled,
+                    "filter": filter,
                     "frequency": frequency,
                     "kind": kind,
                     "logpull_options": logpull_options,
@@ -174,24 +220,26 @@ def update(
         self,
         job_id: int,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        destination_conf: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        frequency: Optional[Literal["high", "low"]] | NotGiven = NOT_GIVEN,
-        kind: Optional[Literal["edge"]] | NotGiven = NOT_GIVEN,
-        logpull_options: Optional[str] | NotGiven = NOT_GIVEN,
-        max_upload_bytes: Optional[int] | NotGiven = NOT_GIVEN,
-        max_upload_interval_seconds: Optional[int] | NotGiven = NOT_GIVEN,
-        max_upload_records: Optional[int] | NotGiven = NOT_GIVEN,
-        output_options: Optional[OutputOptionsParam] | NotGiven = NOT_GIVEN,
-        ownership_challenge: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        destination_conf: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        filter: Optional[str] | Omit = omit,
+        frequency: Optional[Literal["high", "low"]] | Omit = omit,
+        kind: Literal["", "edge"] | Omit = omit,
+        logpull_options: Optional[str] | Omit = omit,
+        max_upload_bytes: Union[Literal[0], int, None] | Omit = omit,
+        max_upload_interval_seconds: Union[Literal[0], int, None] | Omit = omit,
+        max_upload_records: Union[Literal[0], int, None] | Omit = omit,
+        name: Optional[str] | Omit = omit,
+        output_options: Optional[OutputOptionsParam] | Omit = omit,
+        ownership_challenge: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LogpushJob]:
         """
         Updates a Logpush job.
@@ -203,20 +251,23 @@ def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data will be pushed.
-              Additional configuration parameters supported by the destination may be
+          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data. will be
+              pushed. Additional configuration parameters supported by the destination may be
               included.
 
           enabled: Flag that indicates if the job is enabled.
 
-          frequency: This field is deprecated. Please use `max_upload_*` parameters instead. The
+          filter: The filters to select the events to include and/or remove from your logs. For
+              more information, refer to
+              [Filters](https://developers.cloudflare.com/logs/reference/filters/).
+
+          frequency: This field is deprecated. Please use `max_upload_*` parameters instead. . The
               frequency at which Cloudflare sends batches of logs to your destination. Setting
               frequency to high sends your logs in larger quantities of smaller files. Setting
               frequency to low sends logs in smaller quantities of larger files.
 
           kind: The kind parameter (optional) is used to differentiate between Logpush and Edge
-              Log Delivery jobs. Currently, Edge Log Delivery is only supported for the
-              `http_requests` dataset.
+              Log Delivery jobs (when supported by the dataset).
 
           logpull_options: This field is deprecated. Use `output_options` instead. Configuration string. It
               specifies things like requested fields and timestamp formats. If migrating from
@@ -227,19 +278,21 @@ def update(
           max_upload_bytes: The maximum uncompressed file size of a batch of logs. This setting value must
               be between `5 MB` and `1 GB`, or `0` to disable it. Note that you cannot set a
               minimum file size; this means that log files may be much smaller than this batch
-              size. This parameter is not available for jobs with `edge` as its kind.
+              size.
 
           max_upload_interval_seconds: The maximum interval in seconds for log batches. This setting must be between 30
               and 300 seconds (5 minutes), or `0` to disable it. Note that you cannot specify
               a minimum interval for log batches; this means that log files may be sent in
-              shorter intervals than this. This parameter is only used for jobs with `edge` as
-              its kind.
+              shorter intervals than this.
 
           max_upload_records: The maximum number of log lines per batch. This setting must be between 1000 and
               1,000,000 lines, or `0` to disable it. Note that you cannot specify a minimum
               number of log lines per batch; this means that log files may contain many fewer
-              lines than this. This parameter is not available for jobs with `edge` as its
-              kind.
+              lines than this.
+
+          name: Optional human readable job name. Not unique. Cloudflare suggests. that you set
+              this to a meaningful string, like the domain name, to make it easier to identify
+              your job.
 
           output_options: The structured replacement for `logpull_options`. When including this field, the
               `logpull_option` field will be ignored.
@@ -272,12 +325,14 @@ def update(
                 {
                     "destination_conf": destination_conf,
                     "enabled": enabled,
+                    "filter": filter,
                     "frequency": frequency,
                     "kind": kind,
                     "logpull_options": logpull_options,
                     "max_upload_bytes": max_upload_bytes,
                     "max_upload_interval_seconds": max_upload_interval_seconds,
                     "max_upload_records": max_upload_records,
+                    "name": name,
                     "output_options": output_options,
                     "ownership_challenge": ownership_challenge,
                 },
@@ -296,14 +351,14 @@ def update(
     def list(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Optional[LogpushJob]]:
         """
         Lists Logpush jobs for an account or zone.
@@ -346,15 +401,15 @@ def delete(
         self,
         job_id: int,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[JobDeleteResponse]:
         """
         Deletes a Logpush job.
 
@@ -392,23 +447,23 @@ def delete(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[JobDeleteResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[JobDeleteResponse]], ResultWrapper[JobDeleteResponse]),
         )
 
     def get(
         self,
         job_id: int,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LogpushJob]:
         """
         Gets the details of a Logpush job.
@@ -456,42 +511,88 @@ def get(
 class AsyncJobsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncJobsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncJobsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncJobsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncJobsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         destination_conf: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        dataset: Optional[str] | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        frequency: Optional[Literal["high", "low"]] | NotGiven = NOT_GIVEN,
-        kind: Optional[Literal["edge"]] | NotGiven = NOT_GIVEN,
-        logpull_options: Optional[str] | NotGiven = NOT_GIVEN,
-        max_upload_bytes: Optional[int] | NotGiven = NOT_GIVEN,
-        max_upload_interval_seconds: Optional[int] | NotGiven = NOT_GIVEN,
-        max_upload_records: Optional[int] | NotGiven = NOT_GIVEN,
-        name: Optional[str] | NotGiven = NOT_GIVEN,
-        output_options: Optional[OutputOptionsParam] | NotGiven = NOT_GIVEN,
-        ownership_challenge: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        dataset: Optional[
+            Literal[
+                "access_requests",
+                "audit_logs",
+                "audit_logs_v2",
+                "biso_user_actions",
+                "casb_findings",
+                "device_posture_results",
+                "dex_application_tests",
+                "dex_device_state_events",
+                "dlp_forensic_copies",
+                "dns_firewall_logs",
+                "dns_logs",
+                "email_security_alerts",
+                "firewall_events",
+                "gateway_dns",
+                "gateway_http",
+                "gateway_network",
+                "http_requests",
+                "ipsec_logs",
+                "magic_ids_detections",
+                "nel_reports",
+                "network_analytics_logs",
+                "page_shield_events",
+                "sinkhole_http_logs",
+                "spectrum_events",
+                "ssh_logs",
+                "warp_config_changes",
+                "warp_toggle_changes",
+                "workers_trace_events",
+                "zaraz_events",
+                "zero_trust_network_sessions",
+            ]
+        ]
+        | Omit = omit,
+        enabled: bool | Omit = omit,
+        filter: Optional[str] | Omit = omit,
+        frequency: Optional[Literal["high", "low"]] | Omit = omit,
+        kind: Literal["", "edge"] | Omit = omit,
+        logpull_options: Optional[str] | Omit = omit,
+        max_upload_bytes: Union[Literal[0], int, None] | Omit = omit,
+        max_upload_interval_seconds: Union[Literal[0], int, None] | Omit = omit,
+        max_upload_records: Union[Literal[0], int, None] | Omit = omit,
+        name: Optional[str] | Omit = omit,
+        output_options: Optional[OutputOptionsParam] | Omit = omit,
+        ownership_challenge: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LogpushJob]:
         """
         Creates a new Logpush job for an account or zone.
 
         Args:
-          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data will be pushed.
-              Additional configuration parameters supported by the destination may be
+          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data. will be
+              pushed. Additional configuration parameters supported by the destination may be
               included.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
@@ -503,14 +604,17 @@ async def create(
 
           enabled: Flag that indicates if the job is enabled.
 
-          frequency: This field is deprecated. Please use `max_upload_*` parameters instead. The
+          filter: The filters to select the events to include and/or remove from your logs. For
+              more information, refer to
+              [Filters](https://developers.cloudflare.com/logs/reference/filters/).
+
+          frequency: This field is deprecated. Please use `max_upload_*` parameters instead. . The
               frequency at which Cloudflare sends batches of logs to your destination. Setting
               frequency to high sends your logs in larger quantities of smaller files. Setting
               frequency to low sends logs in smaller quantities of larger files.
 
           kind: The kind parameter (optional) is used to differentiate between Logpush and Edge
-              Log Delivery jobs. Currently, Edge Log Delivery is only supported for the
-              `http_requests` dataset.
+              Log Delivery jobs (when supported by the dataset).
 
           logpull_options: This field is deprecated. Use `output_options` instead. Configuration string. It
               specifies things like requested fields and timestamp formats. If migrating from
@@ -521,21 +625,19 @@ async def create(
           max_upload_bytes: The maximum uncompressed file size of a batch of logs. This setting value must
               be between `5 MB` and `1 GB`, or `0` to disable it. Note that you cannot set a
               minimum file size; this means that log files may be much smaller than this batch
-              size. This parameter is not available for jobs with `edge` as its kind.
+              size.
 
           max_upload_interval_seconds: The maximum interval in seconds for log batches. This setting must be between 30
               and 300 seconds (5 minutes), or `0` to disable it. Note that you cannot specify
               a minimum interval for log batches; this means that log files may be sent in
-              shorter intervals than this. This parameter is only used for jobs with `edge` as
-              its kind.
+              shorter intervals than this.
 
           max_upload_records: The maximum number of log lines per batch. This setting must be between 1000 and
               1,000,000 lines, or `0` to disable it. Note that you cannot specify a minimum
               number of log lines per batch; this means that log files may contain many fewer
-              lines than this. This parameter is not available for jobs with `edge` as its
-              kind.
+              lines than this.
 
-          name: Optional human readable job name. Not unique. Cloudflare suggests that you set
+          name: Optional human readable job name. Not unique. Cloudflare suggests. that you set
               this to a meaningful string, like the domain name, to make it easier to identify
               your job.
 
@@ -571,6 +673,7 @@ async def create(
                     "destination_conf": destination_conf,
                     "dataset": dataset,
                     "enabled": enabled,
+                    "filter": filter,
                     "frequency": frequency,
                     "kind": kind,
                     "logpull_options": logpull_options,
@@ -597,24 +700,26 @@ async def update(
         self,
         job_id: int,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        destination_conf: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        frequency: Optional[Literal["high", "low"]] | NotGiven = NOT_GIVEN,
-        kind: Optional[Literal["edge"]] | NotGiven = NOT_GIVEN,
-        logpull_options: Optional[str] | NotGiven = NOT_GIVEN,
-        max_upload_bytes: Optional[int] | NotGiven = NOT_GIVEN,
-        max_upload_interval_seconds: Optional[int] | NotGiven = NOT_GIVEN,
-        max_upload_records: Optional[int] | NotGiven = NOT_GIVEN,
-        output_options: Optional[OutputOptionsParam] | NotGiven = NOT_GIVEN,
-        ownership_challenge: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        destination_conf: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        filter: Optional[str] | Omit = omit,
+        frequency: Optional[Literal["high", "low"]] | Omit = omit,
+        kind: Literal["", "edge"] | Omit = omit,
+        logpull_options: Optional[str] | Omit = omit,
+        max_upload_bytes: Union[Literal[0], int, None] | Omit = omit,
+        max_upload_interval_seconds: Union[Literal[0], int, None] | Omit = omit,
+        max_upload_records: Union[Literal[0], int, None] | Omit = omit,
+        name: Optional[str] | Omit = omit,
+        output_options: Optional[OutputOptionsParam] | Omit = omit,
+        ownership_challenge: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LogpushJob]:
         """
         Updates a Logpush job.
@@ -626,20 +731,23 @@ async def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data will be pushed.
-              Additional configuration parameters supported by the destination may be
+          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data. will be
+              pushed. Additional configuration parameters supported by the destination may be
               included.
 
           enabled: Flag that indicates if the job is enabled.
 
-          frequency: This field is deprecated. Please use `max_upload_*` parameters instead. The
+          filter: The filters to select the events to include and/or remove from your logs. For
+              more information, refer to
+              [Filters](https://developers.cloudflare.com/logs/reference/filters/).
+
+          frequency: This field is deprecated. Please use `max_upload_*` parameters instead. . The
               frequency at which Cloudflare sends batches of logs to your destination. Setting
               frequency to high sends your logs in larger quantities of smaller files. Setting
               frequency to low sends logs in smaller quantities of larger files.
 
           kind: The kind parameter (optional) is used to differentiate between Logpush and Edge
-              Log Delivery jobs. Currently, Edge Log Delivery is only supported for the
-              `http_requests` dataset.
+              Log Delivery jobs (when supported by the dataset).
 
           logpull_options: This field is deprecated. Use `output_options` instead. Configuration string. It
               specifies things like requested fields and timestamp formats. If migrating from
@@ -650,19 +758,21 @@ async def update(
           max_upload_bytes: The maximum uncompressed file size of a batch of logs. This setting value must
               be between `5 MB` and `1 GB`, or `0` to disable it. Note that you cannot set a
               minimum file size; this means that log files may be much smaller than this batch
-              size. This parameter is not available for jobs with `edge` as its kind.
+              size.
 
           max_upload_interval_seconds: The maximum interval in seconds for log batches. This setting must be between 30
               and 300 seconds (5 minutes), or `0` to disable it. Note that you cannot specify
               a minimum interval for log batches; this means that log files may be sent in
-              shorter intervals than this. This parameter is only used for jobs with `edge` as
-              its kind.
+              shorter intervals than this.
 
           max_upload_records: The maximum number of log lines per batch. This setting must be between 1000 and
               1,000,000 lines, or `0` to disable it. Note that you cannot specify a minimum
               number of log lines per batch; this means that log files may contain many fewer
-              lines than this. This parameter is not available for jobs with `edge` as its
-              kind.
+              lines than this.
+
+          name: Optional human readable job name. Not unique. Cloudflare suggests. that you set
+              this to a meaningful string, like the domain name, to make it easier to identify
+              your job.
 
           output_options: The structured replacement for `logpull_options`. When including this field, the
               `logpull_option` field will be ignored.
@@ -695,12 +805,14 @@ async def update(
                 {
                     "destination_conf": destination_conf,
                     "enabled": enabled,
+                    "filter": filter,
                     "frequency": frequency,
                     "kind": kind,
                     "logpull_options": logpull_options,
                     "max_upload_bytes": max_upload_bytes,
                     "max_upload_interval_seconds": max_upload_interval_seconds,
                     "max_upload_records": max_upload_records,
+                    "name": name,
                     "output_options": output_options,
                     "ownership_challenge": ownership_challenge,
                 },
@@ -719,14 +831,14 @@ async def update(
     def list(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Optional[LogpushJob], AsyncSinglePage[Optional[LogpushJob]]]:
         """
         Lists Logpush jobs for an account or zone.
@@ -769,15 +881,15 @@ async def delete(
         self,
         job_id: int,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[JobDeleteResponse]:
         """
         Deletes a Logpush job.
 
@@ -815,23 +927,23 @@ async def delete(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[JobDeleteResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[JobDeleteResponse]], ResultWrapper[JobDeleteResponse]),
         )
 
     async def get(
         self,
         job_id: int,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LogpushJob]:
         """
         Gets the details of a Logpush job.
diff --git a/src/cloudflare/resources/logpush/logpush.py b/src/cloudflare/resources/logpush/logpush.py
index 4b316a9b912..c511e905a9b 100644
--- a/src/cloudflare/resources/logpush/logpush.py
+++ b/src/cloudflare/resources/logpush/logpush.py
@@ -18,14 +18,6 @@
     JobsResourceWithStreamingResponse,
     AsyncJobsResourceWithStreamingResponse,
 )
-from .datasets import (
-    DatasetsResource,
-    AsyncDatasetsResource,
-    DatasetsResourceWithRawResponse,
-    AsyncDatasetsResourceWithRawResponse,
-    DatasetsResourceWithStreamingResponse,
-    AsyncDatasetsResourceWithStreamingResponse,
-)
 from .validate import (
     ValidateResource,
     AsyncValidateResource,
@@ -44,7 +36,14 @@
     AsyncOwnershipResourceWithStreamingResponse,
 )
 from ..._resource import SyncAPIResource, AsyncAPIResource
-from .datasets.datasets import DatasetsResource, AsyncDatasetsResource
+from .datasets.datasets import (
+    DatasetsResource,
+    AsyncDatasetsResource,
+    DatasetsResourceWithRawResponse,
+    AsyncDatasetsResourceWithRawResponse,
+    DatasetsResourceWithStreamingResponse,
+    AsyncDatasetsResourceWithStreamingResponse,
+)
 
 __all__ = ["LogpushResource", "AsyncLogpushResource"]
 
@@ -72,10 +71,21 @@ def validate(self) -> ValidateResource:
 
     @cached_property
     def with_raw_response(self) -> LogpushResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LogpushResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LogpushResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LogpushResourceWithStreamingResponse(self)
 
 
@@ -102,10 +112,21 @@ def validate(self) -> AsyncValidateResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncLogpushResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLogpushResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLogpushResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLogpushResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/logpush/ownership.py b/src/cloudflare/resources/logpush/ownership.py
index 42cf9a9ab36..c10b76d96c2 100644
--- a/src/cloudflare/resources/logpush/ownership.py
+++ b/src/cloudflare/resources/logpush/ownership.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -31,31 +28,42 @@
 class OwnershipResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> OwnershipResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return OwnershipResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> OwnershipResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return OwnershipResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         destination_conf: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[OwnershipCreateResponse]:
         """
         Gets a new ownership challenge sent to your destination.
 
         Args:
-          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data will be pushed.
-              Additional configuration parameters supported by the destination may be
+          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data. will be
+              pushed. Additional configuration parameters supported by the destination may be
               included.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
@@ -100,21 +108,21 @@ def validate(
         *,
         destination_conf: str,
         ownership_challenge: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[OwnershipValidation]:
         """
         Validates ownership challenge of the destination.
 
         Args:
-          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data will be pushed.
-              Additional configuration parameters supported by the destination may be
+          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data. will be
+              pushed. Additional configuration parameters supported by the destination may be
               included.
 
           ownership_challenge: Ownership challenge token to prove destination ownership.
@@ -166,31 +174,42 @@ def validate(
 class AsyncOwnershipResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncOwnershipResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncOwnershipResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncOwnershipResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncOwnershipResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         destination_conf: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[OwnershipCreateResponse]:
         """
         Gets a new ownership challenge sent to your destination.
 
         Args:
-          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data will be pushed.
-              Additional configuration parameters supported by the destination may be
+          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data. will be
+              pushed. Additional configuration parameters supported by the destination may be
               included.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
@@ -237,21 +256,21 @@ async def validate(
         *,
         destination_conf: str,
         ownership_challenge: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[OwnershipValidation]:
         """
         Validates ownership challenge of the destination.
 
         Args:
-          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data will be pushed.
-              Additional configuration parameters supported by the destination may be
+          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data. will be
+              pushed. Additional configuration parameters supported by the destination may be
               included.
 
           ownership_challenge: Ownership challenge token to prove destination ownership.
diff --git a/src/cloudflare/resources/logpush/validate.py b/src/cloudflare/resources/logpush/validate.py
index 2de975b9580..cfeeb0f3af0 100644
--- a/src/cloudflare/resources/logpush/validate.py
+++ b/src/cloudflare/resources/logpush/validate.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -21,9 +18,10 @@
 )
 from ..._wrappers import ResultWrapper
 from ..._base_client import make_request_options
-from ...types.logpush import validate_origin_params, validate_destination_params
+from ...types.logpush import validate_origin_params, validate_destination_params, validate_destination_exists_params
 from ...types.logpush.validate_origin_response import ValidateOriginResponse
 from ...types.logpush.validate_destination_response import ValidateDestinationResponse
+from ...types.logpush.validate_destination_exists_response import ValidateDestinationExistsResponse
 
 __all__ = ["ValidateResource", "AsyncValidateResource"]
 
@@ -31,31 +29,42 @@
 class ValidateResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ValidateResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ValidateResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ValidateResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ValidateResourceWithStreamingResponse(self)
 
     def destination(
         self,
         *,
         destination_conf: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ValidateDestinationResponse]:
         """
-        Checks if there is an existing job with a destination.
+        Validates destination.
 
         Args:
-          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data will be pushed.
-              Additional configuration parameters supported by the destination may be
+          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data. will be
+              pushed. Additional configuration parameters supported by the destination may be
               included.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
@@ -83,7 +92,7 @@ def destination(
             account_or_zone = "zones"
             account_or_zone_id = zone_id
         return self._post(
-            f"/{account_or_zone}/{account_or_zone_id}/logpush/validate/destination/exists",
+            f"/{account_or_zone}/{account_or_zone_id}/logpush/validate/destination",
             body=maybe_transform(
                 {"destination_conf": destination_conf}, validate_destination_params.ValidateDestinationParams
             ),
@@ -97,18 +106,81 @@ def destination(
             cast_to=cast(Type[Optional[ValidateDestinationResponse]], ResultWrapper[ValidateDestinationResponse]),
         )
 
+    def destination_exists(
+        self,
+        *,
+        destination_conf: str,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ValidateDestinationExistsResponse]:
+        """
+        Checks if there is an existing job with a destination.
+
+        Args:
+          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data. will be
+              pushed. Additional configuration parameters supported by the destination may be
+              included.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._post(
+            f"/{account_or_zone}/{account_or_zone_id}/logpush/validate/destination/exists",
+            body=maybe_transform(
+                {"destination_conf": destination_conf},
+                validate_destination_exists_params.ValidateDestinationExistsParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ValidateDestinationExistsResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[ValidateDestinationExistsResponse]], ResultWrapper[ValidateDestinationExistsResponse]
+            ),
+        )
+
     def origin(
         self,
         *,
         logpull_options: Optional[str],
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ValidateOriginResponse]:
         """
         Validates logpull origin with logpull_options.
@@ -161,31 +233,42 @@ def origin(
 class AsyncValidateResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncValidateResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncValidateResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncValidateResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncValidateResourceWithStreamingResponse(self)
 
     async def destination(
         self,
         *,
         destination_conf: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ValidateDestinationResponse]:
         """
-        Checks if there is an existing job with a destination.
+        Validates destination.
 
         Args:
-          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data will be pushed.
-              Additional configuration parameters supported by the destination may be
+          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data. will be
+              pushed. Additional configuration parameters supported by the destination may be
               included.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
@@ -213,7 +296,7 @@ async def destination(
             account_or_zone = "zones"
             account_or_zone_id = zone_id
         return await self._post(
-            f"/{account_or_zone}/{account_or_zone_id}/logpush/validate/destination/exists",
+            f"/{account_or_zone}/{account_or_zone_id}/logpush/validate/destination",
             body=await async_maybe_transform(
                 {"destination_conf": destination_conf}, validate_destination_params.ValidateDestinationParams
             ),
@@ -227,18 +310,81 @@ async def destination(
             cast_to=cast(Type[Optional[ValidateDestinationResponse]], ResultWrapper[ValidateDestinationResponse]),
         )
 
+    async def destination_exists(
+        self,
+        *,
+        destination_conf: str,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ValidateDestinationExistsResponse]:
+        """
+        Checks if there is an existing job with a destination.
+
+        Args:
+          destination_conf: Uniquely identifies a resource (such as an s3 bucket) where data. will be
+              pushed. Additional configuration parameters supported by the destination may be
+              included.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return await self._post(
+            f"/{account_or_zone}/{account_or_zone_id}/logpush/validate/destination/exists",
+            body=await async_maybe_transform(
+                {"destination_conf": destination_conf},
+                validate_destination_exists_params.ValidateDestinationExistsParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ValidateDestinationExistsResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[ValidateDestinationExistsResponse]], ResultWrapper[ValidateDestinationExistsResponse]
+            ),
+        )
+
     async def origin(
         self,
         *,
         logpull_options: Optional[str],
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ValidateOriginResponse]:
         """
         Validates logpull origin with logpull_options.
@@ -297,6 +443,9 @@ def __init__(self, validate: ValidateResource) -> None:
         self.destination = to_raw_response_wrapper(
             validate.destination,
         )
+        self.destination_exists = to_raw_response_wrapper(
+            validate.destination_exists,
+        )
         self.origin = to_raw_response_wrapper(
             validate.origin,
         )
@@ -309,6 +458,9 @@ def __init__(self, validate: AsyncValidateResource) -> None:
         self.destination = async_to_raw_response_wrapper(
             validate.destination,
         )
+        self.destination_exists = async_to_raw_response_wrapper(
+            validate.destination_exists,
+        )
         self.origin = async_to_raw_response_wrapper(
             validate.origin,
         )
@@ -321,6 +473,9 @@ def __init__(self, validate: ValidateResource) -> None:
         self.destination = to_streamed_response_wrapper(
             validate.destination,
         )
+        self.destination_exists = to_streamed_response_wrapper(
+            validate.destination_exists,
+        )
         self.origin = to_streamed_response_wrapper(
             validate.origin,
         )
@@ -333,6 +488,9 @@ def __init__(self, validate: AsyncValidateResource) -> None:
         self.destination = async_to_streamed_response_wrapper(
             validate.destination,
         )
+        self.destination_exists = async_to_streamed_response_wrapper(
+            validate.destination_exists,
+        )
         self.origin = async_to_streamed_response_wrapper(
             validate.origin,
         )
diff --git a/src/cloudflare/resources/logs/control/cmb/cmb.py b/src/cloudflare/resources/logs/control/cmb/cmb.py
index c24d2105c2c..56f946d9c8b 100644
--- a/src/cloudflare/resources/logs/control/cmb/cmb.py
+++ b/src/cloudflare/resources/logs/control/cmb/cmb.py
@@ -23,10 +23,21 @@ def config(self) -> ConfigResource:
 
     @cached_property
     def with_raw_response(self) -> CmbResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CmbResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CmbResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CmbResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def config(self) -> AsyncConfigResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncCmbResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCmbResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCmbResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCmbResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/logs/control/cmb/config.py b/src/cloudflare/resources/logs/control/cmb/config.py
index ac19a9921c9..bf0fe2e3c0c 100644
--- a/src/cloudflare/resources/logs/control/cmb/config.py
+++ b/src/cloudflare/resources/logs/control/cmb/config.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -30,31 +27,45 @@
 class ConfigResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ConfigResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ConfigResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ConfigResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ConfigResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        regions: str | NotGiven = NOT_GIVEN,
+        allow_out_of_region_access: bool | Omit = omit,
+        regions: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CmbConfig]:
         """
         Updates CMB config.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          regions: Comma-separated list of regions.
+          allow_out_of_region_access: Allow out of region access
+
+          regions: Name of the region.
 
           extra_headers: Send extra headers
 
@@ -68,7 +79,13 @@ def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._post(
             f"/accounts/{account_id}/logs/control/cmb/config",
-            body=maybe_transform({"regions": regions}, config_create_params.ConfigCreateParams),
+            body=maybe_transform(
+                {
+                    "allow_out_of_region_access": allow_out_of_region_access,
+                    "regions": regions,
+                },
+                config_create_params.ConfigCreateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -88,13 +105,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Deletes CMB config.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -127,13 +144,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CmbConfig]:
         """
         Gets CMB config.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -161,31 +178,45 @@ def get(
 class AsyncConfigResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncConfigResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncConfigResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncConfigResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncConfigResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        regions: str | NotGiven = NOT_GIVEN,
+        allow_out_of_region_access: bool | Omit = omit,
+        regions: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CmbConfig]:
         """
         Updates CMB config.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          regions: Comma-separated list of regions.
+          allow_out_of_region_access: Allow out of region access
+
+          regions: Name of the region.
 
           extra_headers: Send extra headers
 
@@ -199,7 +230,13 @@ async def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._post(
             f"/accounts/{account_id}/logs/control/cmb/config",
-            body=await async_maybe_transform({"regions": regions}, config_create_params.ConfigCreateParams),
+            body=await async_maybe_transform(
+                {
+                    "allow_out_of_region_access": allow_out_of_region_access,
+                    "regions": regions,
+                },
+                config_create_params.ConfigCreateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -219,13 +256,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Deletes CMB config.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -258,13 +295,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CmbConfig]:
         """
         Gets CMB config.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/logs/control/control.py b/src/cloudflare/resources/logs/control/control.py
index b642e31a573..a7881e09753 100644
--- a/src/cloudflare/resources/logs/control/control.py
+++ b/src/cloudflare/resources/logs/control/control.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from .cmb import (
+from .cmb.cmb import (
     CmbResource,
     AsyncCmbResource,
     CmbResourceWithRawResponse,
@@ -10,7 +10,6 @@
     CmbResourceWithStreamingResponse,
     AsyncCmbResourceWithStreamingResponse,
 )
-from .cmb.cmb import CmbResource, AsyncCmbResource
 from .retention import (
     RetentionResource,
     AsyncRetentionResource,
@@ -36,10 +35,21 @@ def cmb(self) -> CmbResource:
 
     @cached_property
     def with_raw_response(self) -> ControlResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ControlResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ControlResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ControlResourceWithStreamingResponse(self)
 
 
@@ -54,10 +64,21 @@ def cmb(self) -> AsyncCmbResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncControlResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncControlResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncControlResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncControlResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/logs/control/retention.py b/src/cloudflare/resources/logs/control/retention.py
index ad95003425b..3485d0a5d1f 100644
--- a/src/cloudflare/resources/logs/control/retention.py
+++ b/src/cloudflare/resources/logs/control/retention.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -31,29 +28,40 @@
 class RetentionResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RetentionResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RetentionResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RetentionResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RetentionResourceWithStreamingResponse(self)
 
     def create(
         self,
-        zone_identifier: str,
         *,
-        flag: bool,
+        zone_id: str,
+        flag: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RetentionCreateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RetentionCreateResponse]:
         """
         Updates log retention flag for Logpull API.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           flag: The log retention flag for Logpull API.
 
@@ -65,37 +73,37 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._post(
-            f"/zones/{zone_identifier}/logs/control/retention/flag",
+            f"/zones/{zone_id}/logs/control/retention/flag",
             body=maybe_transform({"flag": flag}, retention_create_params.RetentionCreateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[RetentionCreateResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[RetentionCreateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[RetentionCreateResponse], ResultWrapper[RetentionCreateResponse]),
+            cast_to=cast(Type[Optional[RetentionCreateResponse]], ResultWrapper[RetentionCreateResponse]),
         )
 
     def get(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RetentionGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RetentionGetResponse]:
         """
         Gets log retention flag for Logpull API.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -105,47 +113,58 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get(
-            f"/zones/{zone_identifier}/logs/control/retention/flag",
+            f"/zones/{zone_id}/logs/control/retention/flag",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[RetentionGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[RetentionGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[RetentionGetResponse], ResultWrapper[RetentionGetResponse]),
+            cast_to=cast(Type[Optional[RetentionGetResponse]], ResultWrapper[RetentionGetResponse]),
         )
 
 
 class AsyncRetentionResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRetentionResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRetentionResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRetentionResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRetentionResourceWithStreamingResponse(self)
 
     async def create(
         self,
-        zone_identifier: str,
         *,
-        flag: bool,
+        zone_id: str,
+        flag: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RetentionCreateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RetentionCreateResponse]:
         """
         Updates log retention flag for Logpull API.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           flag: The log retention flag for Logpull API.
 
@@ -157,37 +176,37 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return await self._post(
-            f"/zones/{zone_identifier}/logs/control/retention/flag",
+            f"/zones/{zone_id}/logs/control/retention/flag",
             body=await async_maybe_transform({"flag": flag}, retention_create_params.RetentionCreateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[RetentionCreateResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[RetentionCreateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[RetentionCreateResponse], ResultWrapper[RetentionCreateResponse]),
+            cast_to=cast(Type[Optional[RetentionCreateResponse]], ResultWrapper[RetentionCreateResponse]),
         )
 
     async def get(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RetentionGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RetentionGetResponse]:
         """
         Gets log retention flag for Logpull API.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -197,18 +216,18 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return await self._get(
-            f"/zones/{zone_identifier}/logs/control/retention/flag",
+            f"/zones/{zone_id}/logs/control/retention/flag",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[RetentionGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[RetentionGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[RetentionGetResponse], ResultWrapper[RetentionGetResponse]),
+            cast_to=cast(Type[Optional[RetentionGetResponse]], ResultWrapper[RetentionGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/logs/logs.py b/src/cloudflare/resources/logs/logs.py
index b868582e35b..edf8286a42b 100644
--- a/src/cloudflare/resources/logs/logs.py
+++ b/src/cloudflare/resources/logs/logs.py
@@ -10,7 +10,9 @@
     RayIDResourceWithStreamingResponse,
     AsyncRayIDResourceWithStreamingResponse,
 )
-from .control import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .control.control import (
     ControlResource,
     AsyncControlResource,
     ControlResourceWithRawResponse,
@@ -18,7 +20,7 @@
     ControlResourceWithStreamingResponse,
     AsyncControlResourceWithStreamingResponse,
 )
-from .received import (
+from .received.received import (
     ReceivedResource,
     AsyncReceivedResource,
     ReceivedResourceWithRawResponse,
@@ -26,10 +28,6 @@
     ReceivedResourceWithStreamingResponse,
     AsyncReceivedResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .control.control import ControlResource, AsyncControlResource
-from .received.received import ReceivedResource, AsyncReceivedResource
 
 __all__ = ["LogsResource", "AsyncLogsResource"]
 
@@ -49,10 +47,21 @@ def received(self) -> ReceivedResource:
 
     @cached_property
     def with_raw_response(self) -> LogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LogsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LogsResourceWithStreamingResponse(self)
 
 
@@ -71,10 +80,21 @@ def received(self) -> AsyncReceivedResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncLogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLogsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLogsResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/logs/rayid.py b/src/cloudflare/resources/logs/rayid.py
index 2cc4d4c11dc..1f38aa3d088 100644
--- a/src/cloudflare/resources/logs/rayid.py
+++ b/src/cloudflare/resources/logs/rayid.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -30,25 +27,36 @@
 class RayIDResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RayIDResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RayIDResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RayIDResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RayIDResourceWithStreamingResponse(self)
 
     def get(
         self,
-        ray_identifier: str,
+        rayid: str,
         *,
-        zone_identifier: str,
-        fields: str | NotGiven = NOT_GIVEN,
-        timestamps: Literal["unix", "unixnano", "rfc3339"] | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        fields: str | Omit = omit,
+        timestamps: Literal["unix", "unixnano", "rfc3339"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RayIDGetResponse:
         """The `/rayids` api route allows lookups by specific rayid.
 
@@ -56,9 +64,9 @@ def get(
         return zero, one, or more records (ray ids are not unique).
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
-          ray_identifier: Ray identifier.
+          rayid: Ray identifier.
 
           fields: The `/received` route by default returns a limited set of fields, and allows
               customers to override the default field set by specifying individual fields. The
@@ -86,14 +94,14 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not ray_identifier:
-            raise ValueError(f"Expected a non-empty value for `ray_identifier` but received {ray_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rayid:
+            raise ValueError(f"Expected a non-empty value for `rayid` but received {rayid!r}")
         return cast(
             RayIDGetResponse,
             self._get(
-                f"/zones/{zone_identifier}/logs/rayids/{ray_identifier}",
+                f"/zones/{zone_id}/logs/rayids/{rayid}",
                 options=make_request_options(
                     extra_headers=extra_headers,
                     extra_query=extra_query,
@@ -115,25 +123,36 @@ def get(
 class AsyncRayIDResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRayIDResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRayIDResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRayIDResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRayIDResourceWithStreamingResponse(self)
 
     async def get(
         self,
-        ray_identifier: str,
+        rayid: str,
         *,
-        zone_identifier: str,
-        fields: str | NotGiven = NOT_GIVEN,
-        timestamps: Literal["unix", "unixnano", "rfc3339"] | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        fields: str | Omit = omit,
+        timestamps: Literal["unix", "unixnano", "rfc3339"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RayIDGetResponse:
         """The `/rayids` api route allows lookups by specific rayid.
 
@@ -141,9 +160,9 @@ async def get(
         return zero, one, or more records (ray ids are not unique).
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
-          ray_identifier: Ray identifier.
+          rayid: Ray identifier.
 
           fields: The `/received` route by default returns a limited set of fields, and allows
               customers to override the default field set by specifying individual fields. The
@@ -171,14 +190,14 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not ray_identifier:
-            raise ValueError(f"Expected a non-empty value for `ray_identifier` but received {ray_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rayid:
+            raise ValueError(f"Expected a non-empty value for `rayid` but received {rayid!r}")
         return cast(
             RayIDGetResponse,
             await self._get(
-                f"/zones/{zone_identifier}/logs/rayids/{ray_identifier}",
+                f"/zones/{zone_id}/logs/rayids/{rayid}",
                 options=make_request_options(
                     extra_headers=extra_headers,
                     extra_query=extra_query,
diff --git a/src/cloudflare/resources/logs/received/fields.py b/src/cloudflare/resources/logs/received/fields.py
index f8e041e7866..4527eff4bcd 100644
--- a/src/cloudflare/resources/logs/received/fields.py
+++ b/src/cloudflare/resources/logs/received/fields.py
@@ -4,7 +4,7 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -22,22 +22,33 @@
 class FieldsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> FieldsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return FieldsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> FieldsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return FieldsResourceWithStreamingResponse(self)
 
     def get(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> FieldGetResponse:
         """Lists all fields available.
 
@@ -45,7 +56,7 @@ def get(
         where keys are field names, and values are descriptions.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -55,10 +66,10 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get(
-            f"/zones/{zone_identifier}/logs/received/fields",
+            f"/zones/{zone_id}/logs/received/fields",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -69,22 +80,33 @@ def get(
 class AsyncFieldsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncFieldsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncFieldsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncFieldsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncFieldsResourceWithStreamingResponse(self)
 
     async def get(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> FieldGetResponse:
         """Lists all fields available.
 
@@ -92,7 +114,7 @@ async def get(
         where keys are field names, and values are descriptions.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -102,10 +124,10 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return await self._get(
-            f"/zones/{zone_identifier}/logs/received/fields",
+            f"/zones/{zone_id}/logs/received/fields",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
diff --git a/src/cloudflare/resources/logs/received/received.py b/src/cloudflare/resources/logs/received/received.py
index ce56f1d3f04..bbb7f57a210 100644
--- a/src/cloudflare/resources/logs/received/received.py
+++ b/src/cloudflare/resources/logs/received/received.py
@@ -15,11 +15,8 @@
     FieldsResourceWithStreamingResponse,
     AsyncFieldsResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -42,28 +39,39 @@ def fields(self) -> FieldsResource:
 
     @cached_property
     def with_raw_response(self) -> ReceivedResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ReceivedResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ReceivedResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ReceivedResourceWithStreamingResponse(self)
 
     def get(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         end: Union[str, int],
-        count: int | NotGiven = NOT_GIVEN,
-        fields: str | NotGiven = NOT_GIVEN,
-        sample: float | NotGiven = NOT_GIVEN,
-        start: Union[str, int] | NotGiven = NOT_GIVEN,
-        timestamps: Literal["unix", "unixnano", "rfc3339"] | NotGiven = NOT_GIVEN,
+        count: int | Omit = omit,
+        fields: str | Omit = omit,
+        sample: float | Omit = omit,
+        start: Union[str, int] | Omit = omit,
+        timestamps: Literal["unix", "unixnano", "rfc3339"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ReceivedGetResponse:
         """The `/received` api route allows customers to retrieve their edge HTTP logs.
 
@@ -77,7 +85,7 @@ def get(
         will be handled properly.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           end: Sets the (exclusive) end of the requested time frame. This can be a unix
               timestamp (in seconds or nanoseconds), or an absolute timestamp that conforms to
@@ -129,12 +137,12 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return cast(
             ReceivedGetResponse,
             self._get(
-                f"/zones/{zone_identifier}/logs/received",
+                f"/zones/{zone_id}/logs/received",
                 options=make_request_options(
                     extra_headers=extra_headers,
                     extra_query=extra_query,
@@ -166,28 +174,39 @@ def fields(self) -> AsyncFieldsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncReceivedResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncReceivedResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncReceivedResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncReceivedResourceWithStreamingResponse(self)
 
     async def get(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         end: Union[str, int],
-        count: int | NotGiven = NOT_GIVEN,
-        fields: str | NotGiven = NOT_GIVEN,
-        sample: float | NotGiven = NOT_GIVEN,
-        start: Union[str, int] | NotGiven = NOT_GIVEN,
-        timestamps: Literal["unix", "unixnano", "rfc3339"] | NotGiven = NOT_GIVEN,
+        count: int | Omit = omit,
+        fields: str | Omit = omit,
+        sample: float | Omit = omit,
+        start: Union[str, int] | Omit = omit,
+        timestamps: Literal["unix", "unixnano", "rfc3339"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ReceivedGetResponse:
         """The `/received` api route allows customers to retrieve their edge HTTP logs.
 
@@ -201,7 +220,7 @@ async def get(
         will be handled properly.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier.
 
           end: Sets the (exclusive) end of the requested time frame. This can be a unix
               timestamp (in seconds or nanoseconds), or an absolute timestamp that conforms to
@@ -253,12 +272,12 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return cast(
             ReceivedGetResponse,
             await self._get(
-                f"/zones/{zone_identifier}/logs/received",
+                f"/zones/{zone_id}/logs/received",
                 options=make_request_options(
                     extra_headers=extra_headers,
                     extra_query=extra_query,
diff --git a/src/cloudflare/resources/magic_cloud_networking/__init__.py b/src/cloudflare/resources/magic_cloud_networking/__init__.py
new file mode 100644
index 00000000000..3c758eda376
--- /dev/null
+++ b/src/cloudflare/resources/magic_cloud_networking/__init__.py
@@ -0,0 +1,75 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .on_ramps import (
+    OnRampsResource,
+    AsyncOnRampsResource,
+    OnRampsResourceWithRawResponse,
+    AsyncOnRampsResourceWithRawResponse,
+    OnRampsResourceWithStreamingResponse,
+    AsyncOnRampsResourceWithStreamingResponse,
+)
+from .resources import (
+    ResourcesResource,
+    AsyncResourcesResource,
+    ResourcesResourceWithRawResponse,
+    AsyncResourcesResourceWithRawResponse,
+    ResourcesResourceWithStreamingResponse,
+    AsyncResourcesResourceWithStreamingResponse,
+)
+from .catalog_syncs import (
+    CatalogSyncsResource,
+    AsyncCatalogSyncsResource,
+    CatalogSyncsResourceWithRawResponse,
+    AsyncCatalogSyncsResourceWithRawResponse,
+    CatalogSyncsResourceWithStreamingResponse,
+    AsyncCatalogSyncsResourceWithStreamingResponse,
+)
+from .cloud_integrations import (
+    CloudIntegrationsResource,
+    AsyncCloudIntegrationsResource,
+    CloudIntegrationsResourceWithRawResponse,
+    AsyncCloudIntegrationsResourceWithRawResponse,
+    CloudIntegrationsResourceWithStreamingResponse,
+    AsyncCloudIntegrationsResourceWithStreamingResponse,
+)
+from .magic_cloud_networking import (
+    MagicCloudNetworkingResource,
+    AsyncMagicCloudNetworkingResource,
+    MagicCloudNetworkingResourceWithRawResponse,
+    AsyncMagicCloudNetworkingResourceWithRawResponse,
+    MagicCloudNetworkingResourceWithStreamingResponse,
+    AsyncMagicCloudNetworkingResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "CatalogSyncsResource",
+    "AsyncCatalogSyncsResource",
+    "CatalogSyncsResourceWithRawResponse",
+    "AsyncCatalogSyncsResourceWithRawResponse",
+    "CatalogSyncsResourceWithStreamingResponse",
+    "AsyncCatalogSyncsResourceWithStreamingResponse",
+    "OnRampsResource",
+    "AsyncOnRampsResource",
+    "OnRampsResourceWithRawResponse",
+    "AsyncOnRampsResourceWithRawResponse",
+    "OnRampsResourceWithStreamingResponse",
+    "AsyncOnRampsResourceWithStreamingResponse",
+    "CloudIntegrationsResource",
+    "AsyncCloudIntegrationsResource",
+    "CloudIntegrationsResourceWithRawResponse",
+    "AsyncCloudIntegrationsResourceWithRawResponse",
+    "CloudIntegrationsResourceWithStreamingResponse",
+    "AsyncCloudIntegrationsResourceWithStreamingResponse",
+    "ResourcesResource",
+    "AsyncResourcesResource",
+    "ResourcesResourceWithRawResponse",
+    "AsyncResourcesResourceWithRawResponse",
+    "ResourcesResourceWithStreamingResponse",
+    "AsyncResourcesResourceWithStreamingResponse",
+    "MagicCloudNetworkingResource",
+    "AsyncMagicCloudNetworkingResource",
+    "MagicCloudNetworkingResourceWithRawResponse",
+    "AsyncMagicCloudNetworkingResourceWithRawResponse",
+    "MagicCloudNetworkingResourceWithStreamingResponse",
+    "AsyncMagicCloudNetworkingResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/magic_cloud_networking/catalog_syncs/__init__.py b/src/cloudflare/resources/magic_cloud_networking/catalog_syncs/__init__.py
new file mode 100644
index 00000000000..f9bf98aaa56
--- /dev/null
+++ b/src/cloudflare/resources/magic_cloud_networking/catalog_syncs/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .catalog_syncs import (
+    CatalogSyncsResource,
+    AsyncCatalogSyncsResource,
+    CatalogSyncsResourceWithRawResponse,
+    AsyncCatalogSyncsResourceWithRawResponse,
+    CatalogSyncsResourceWithStreamingResponse,
+    AsyncCatalogSyncsResourceWithStreamingResponse,
+)
+from .prebuilt_policies import (
+    PrebuiltPoliciesResource,
+    AsyncPrebuiltPoliciesResource,
+    PrebuiltPoliciesResourceWithRawResponse,
+    AsyncPrebuiltPoliciesResourceWithRawResponse,
+    PrebuiltPoliciesResourceWithStreamingResponse,
+    AsyncPrebuiltPoliciesResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "PrebuiltPoliciesResource",
+    "AsyncPrebuiltPoliciesResource",
+    "PrebuiltPoliciesResourceWithRawResponse",
+    "AsyncPrebuiltPoliciesResourceWithRawResponse",
+    "PrebuiltPoliciesResourceWithStreamingResponse",
+    "AsyncPrebuiltPoliciesResourceWithStreamingResponse",
+    "CatalogSyncsResource",
+    "AsyncCatalogSyncsResource",
+    "CatalogSyncsResourceWithRawResponse",
+    "AsyncCatalogSyncsResourceWithRawResponse",
+    "CatalogSyncsResourceWithStreamingResponse",
+    "AsyncCatalogSyncsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/magic_cloud_networking/catalog_syncs/catalog_syncs.py b/src/cloudflare/resources/magic_cloud_networking/catalog_syncs/catalog_syncs.py
new file mode 100644
index 00000000000..98112dbdf70
--- /dev/null
+++ b/src/cloudflare/resources/magic_cloud_networking/catalog_syncs/catalog_syncs.py
@@ -0,0 +1,857 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, strip_not_given, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from .prebuilt_policies import (
+    PrebuiltPoliciesResource,
+    AsyncPrebuiltPoliciesResource,
+    PrebuiltPoliciesResourceWithRawResponse,
+    AsyncPrebuiltPoliciesResourceWithRawResponse,
+    PrebuiltPoliciesResourceWithStreamingResponse,
+    AsyncPrebuiltPoliciesResourceWithStreamingResponse,
+)
+from ....types.magic_cloud_networking import (
+    catalog_sync_edit_params,
+    catalog_sync_create_params,
+    catalog_sync_delete_params,
+    catalog_sync_update_params,
+)
+from ....types.magic_cloud_networking.catalog_sync_get_response import CatalogSyncGetResponse
+from ....types.magic_cloud_networking.catalog_sync_edit_response import CatalogSyncEditResponse
+from ....types.magic_cloud_networking.catalog_sync_list_response import CatalogSyncListResponse
+from ....types.magic_cloud_networking.catalog_sync_create_response import CatalogSyncCreateResponse
+from ....types.magic_cloud_networking.catalog_sync_delete_response import CatalogSyncDeleteResponse
+from ....types.magic_cloud_networking.catalog_sync_update_response import CatalogSyncUpdateResponse
+from ....types.magic_cloud_networking.catalog_sync_refresh_response import CatalogSyncRefreshResponse
+
+__all__ = ["CatalogSyncsResource", "AsyncCatalogSyncsResource"]
+
+
+class CatalogSyncsResource(SyncAPIResource):
+    @cached_property
+    def prebuilt_policies(self) -> PrebuiltPoliciesResource:
+        return PrebuiltPoliciesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> CatalogSyncsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CatalogSyncsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CatalogSyncsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CatalogSyncsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        destination_type: Literal["NONE", "ZERO_TRUST_LIST"],
+        name: str,
+        update_mode: Literal["AUTO", "MANUAL"],
+        description: str | Omit = omit,
+        policy: str | Omit = omit,
+        forwarded: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CatalogSyncCreateResponse:
+        """
+        Create a new Catalog Sync (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {**strip_not_given({"forwarded": forwarded}), **(extra_headers or {})}
+        return self._post(
+            f"/accounts/{account_id}/magic/cloud/catalog-syncs",
+            body=maybe_transform(
+                {
+                    "destination_type": destination_type,
+                    "name": name,
+                    "update_mode": update_mode,
+                    "description": description,
+                    "policy": policy,
+                },
+                catalog_sync_create_params.CatalogSyncCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CatalogSyncCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CatalogSyncCreateResponse], ResultWrapper[CatalogSyncCreateResponse]),
+        )
+
+    def update(
+        self,
+        sync_id: str,
+        *,
+        account_id: str,
+        description: str | Omit = omit,
+        name: str | Omit = omit,
+        policy: str | Omit = omit,
+        update_mode: Literal["AUTO", "MANUAL"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CatalogSyncUpdateResponse:
+        """
+        Update a Catalog Sync (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sync_id:
+            raise ValueError(f"Expected a non-empty value for `sync_id` but received {sync_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/magic/cloud/catalog-syncs/{sync_id}",
+            body=maybe_transform(
+                {
+                    "description": description,
+                    "name": name,
+                    "policy": policy,
+                    "update_mode": update_mode,
+                },
+                catalog_sync_update_params.CatalogSyncUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CatalogSyncUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CatalogSyncUpdateResponse], ResultWrapper[CatalogSyncUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[CatalogSyncListResponse]:
+        """
+        List Catalog Syncs (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/magic/cloud/catalog-syncs",
+            page=SyncSinglePage[CatalogSyncListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=CatalogSyncListResponse,
+        )
+
+    def delete(
+        self,
+        sync_id: str,
+        *,
+        account_id: str,
+        delete_destination: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CatalogSyncDeleteResponse:
+        """
+        Delete a Catalog Sync (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sync_id:
+            raise ValueError(f"Expected a non-empty value for `sync_id` but received {sync_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/magic/cloud/catalog-syncs/{sync_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {"delete_destination": delete_destination}, catalog_sync_delete_params.CatalogSyncDeleteParams
+                ),
+                post_parser=ResultWrapper[CatalogSyncDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CatalogSyncDeleteResponse], ResultWrapper[CatalogSyncDeleteResponse]),
+        )
+
+    def edit(
+        self,
+        sync_id: str,
+        *,
+        account_id: str,
+        description: str | Omit = omit,
+        name: str | Omit = omit,
+        policy: str | Omit = omit,
+        update_mode: Literal["AUTO", "MANUAL"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CatalogSyncEditResponse:
+        """
+        Update a Catalog Sync (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sync_id:
+            raise ValueError(f"Expected a non-empty value for `sync_id` but received {sync_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/magic/cloud/catalog-syncs/{sync_id}",
+            body=maybe_transform(
+                {
+                    "description": description,
+                    "name": name,
+                    "policy": policy,
+                    "update_mode": update_mode,
+                },
+                catalog_sync_edit_params.CatalogSyncEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CatalogSyncEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CatalogSyncEditResponse], ResultWrapper[CatalogSyncEditResponse]),
+        )
+
+    def get(
+        self,
+        sync_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CatalogSyncGetResponse:
+        """
+        Read a Catalog Sync (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sync_id:
+            raise ValueError(f"Expected a non-empty value for `sync_id` but received {sync_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/magic/cloud/catalog-syncs/{sync_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CatalogSyncGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CatalogSyncGetResponse], ResultWrapper[CatalogSyncGetResponse]),
+        )
+
+    def refresh(
+        self,
+        sync_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Refresh a Catalog Sync's destination by running the sync policy against latest
+        resource catalog (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sync_id:
+            raise ValueError(f"Expected a non-empty value for `sync_id` but received {sync_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/magic/cloud/catalog-syncs/{sync_id}/refresh",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CatalogSyncRefreshResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class AsyncCatalogSyncsResource(AsyncAPIResource):
+    @cached_property
+    def prebuilt_policies(self) -> AsyncPrebuiltPoliciesResource:
+        return AsyncPrebuiltPoliciesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncCatalogSyncsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCatalogSyncsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCatalogSyncsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCatalogSyncsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        destination_type: Literal["NONE", "ZERO_TRUST_LIST"],
+        name: str,
+        update_mode: Literal["AUTO", "MANUAL"],
+        description: str | Omit = omit,
+        policy: str | Omit = omit,
+        forwarded: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CatalogSyncCreateResponse:
+        """
+        Create a new Catalog Sync (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {**strip_not_given({"forwarded": forwarded}), **(extra_headers or {})}
+        return await self._post(
+            f"/accounts/{account_id}/magic/cloud/catalog-syncs",
+            body=await async_maybe_transform(
+                {
+                    "destination_type": destination_type,
+                    "name": name,
+                    "update_mode": update_mode,
+                    "description": description,
+                    "policy": policy,
+                },
+                catalog_sync_create_params.CatalogSyncCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CatalogSyncCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CatalogSyncCreateResponse], ResultWrapper[CatalogSyncCreateResponse]),
+        )
+
+    async def update(
+        self,
+        sync_id: str,
+        *,
+        account_id: str,
+        description: str | Omit = omit,
+        name: str | Omit = omit,
+        policy: str | Omit = omit,
+        update_mode: Literal["AUTO", "MANUAL"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CatalogSyncUpdateResponse:
+        """
+        Update a Catalog Sync (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sync_id:
+            raise ValueError(f"Expected a non-empty value for `sync_id` but received {sync_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/magic/cloud/catalog-syncs/{sync_id}",
+            body=await async_maybe_transform(
+                {
+                    "description": description,
+                    "name": name,
+                    "policy": policy,
+                    "update_mode": update_mode,
+                },
+                catalog_sync_update_params.CatalogSyncUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CatalogSyncUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CatalogSyncUpdateResponse], ResultWrapper[CatalogSyncUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[CatalogSyncListResponse, AsyncSinglePage[CatalogSyncListResponse]]:
+        """
+        List Catalog Syncs (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/magic/cloud/catalog-syncs",
+            page=AsyncSinglePage[CatalogSyncListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=CatalogSyncListResponse,
+        )
+
+    async def delete(
+        self,
+        sync_id: str,
+        *,
+        account_id: str,
+        delete_destination: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CatalogSyncDeleteResponse:
+        """
+        Delete a Catalog Sync (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sync_id:
+            raise ValueError(f"Expected a non-empty value for `sync_id` but received {sync_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/magic/cloud/catalog-syncs/{sync_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"delete_destination": delete_destination}, catalog_sync_delete_params.CatalogSyncDeleteParams
+                ),
+                post_parser=ResultWrapper[CatalogSyncDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CatalogSyncDeleteResponse], ResultWrapper[CatalogSyncDeleteResponse]),
+        )
+
+    async def edit(
+        self,
+        sync_id: str,
+        *,
+        account_id: str,
+        description: str | Omit = omit,
+        name: str | Omit = omit,
+        policy: str | Omit = omit,
+        update_mode: Literal["AUTO", "MANUAL"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CatalogSyncEditResponse:
+        """
+        Update a Catalog Sync (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sync_id:
+            raise ValueError(f"Expected a non-empty value for `sync_id` but received {sync_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/magic/cloud/catalog-syncs/{sync_id}",
+            body=await async_maybe_transform(
+                {
+                    "description": description,
+                    "name": name,
+                    "policy": policy,
+                    "update_mode": update_mode,
+                },
+                catalog_sync_edit_params.CatalogSyncEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CatalogSyncEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CatalogSyncEditResponse], ResultWrapper[CatalogSyncEditResponse]),
+        )
+
+    async def get(
+        self,
+        sync_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CatalogSyncGetResponse:
+        """
+        Read a Catalog Sync (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sync_id:
+            raise ValueError(f"Expected a non-empty value for `sync_id` but received {sync_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/magic/cloud/catalog-syncs/{sync_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CatalogSyncGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CatalogSyncGetResponse], ResultWrapper[CatalogSyncGetResponse]),
+        )
+
+    async def refresh(
+        self,
+        sync_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Refresh a Catalog Sync's destination by running the sync policy against latest
+        resource catalog (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sync_id:
+            raise ValueError(f"Expected a non-empty value for `sync_id` but received {sync_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/magic/cloud/catalog-syncs/{sync_id}/refresh",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CatalogSyncRefreshResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class CatalogSyncsResourceWithRawResponse:
+    def __init__(self, catalog_syncs: CatalogSyncsResource) -> None:
+        self._catalog_syncs = catalog_syncs
+
+        self.create = to_raw_response_wrapper(
+            catalog_syncs.create,
+        )
+        self.update = to_raw_response_wrapper(
+            catalog_syncs.update,
+        )
+        self.list = to_raw_response_wrapper(
+            catalog_syncs.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            catalog_syncs.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            catalog_syncs.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            catalog_syncs.get,
+        )
+        self.refresh = to_raw_response_wrapper(
+            catalog_syncs.refresh,
+        )
+
+    @cached_property
+    def prebuilt_policies(self) -> PrebuiltPoliciesResourceWithRawResponse:
+        return PrebuiltPoliciesResourceWithRawResponse(self._catalog_syncs.prebuilt_policies)
+
+
+class AsyncCatalogSyncsResourceWithRawResponse:
+    def __init__(self, catalog_syncs: AsyncCatalogSyncsResource) -> None:
+        self._catalog_syncs = catalog_syncs
+
+        self.create = async_to_raw_response_wrapper(
+            catalog_syncs.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            catalog_syncs.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            catalog_syncs.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            catalog_syncs.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            catalog_syncs.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            catalog_syncs.get,
+        )
+        self.refresh = async_to_raw_response_wrapper(
+            catalog_syncs.refresh,
+        )
+
+    @cached_property
+    def prebuilt_policies(self) -> AsyncPrebuiltPoliciesResourceWithRawResponse:
+        return AsyncPrebuiltPoliciesResourceWithRawResponse(self._catalog_syncs.prebuilt_policies)
+
+
+class CatalogSyncsResourceWithStreamingResponse:
+    def __init__(self, catalog_syncs: CatalogSyncsResource) -> None:
+        self._catalog_syncs = catalog_syncs
+
+        self.create = to_streamed_response_wrapper(
+            catalog_syncs.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            catalog_syncs.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            catalog_syncs.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            catalog_syncs.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            catalog_syncs.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            catalog_syncs.get,
+        )
+        self.refresh = to_streamed_response_wrapper(
+            catalog_syncs.refresh,
+        )
+
+    @cached_property
+    def prebuilt_policies(self) -> PrebuiltPoliciesResourceWithStreamingResponse:
+        return PrebuiltPoliciesResourceWithStreamingResponse(self._catalog_syncs.prebuilt_policies)
+
+
+class AsyncCatalogSyncsResourceWithStreamingResponse:
+    def __init__(self, catalog_syncs: AsyncCatalogSyncsResource) -> None:
+        self._catalog_syncs = catalog_syncs
+
+        self.create = async_to_streamed_response_wrapper(
+            catalog_syncs.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            catalog_syncs.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            catalog_syncs.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            catalog_syncs.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            catalog_syncs.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            catalog_syncs.get,
+        )
+        self.refresh = async_to_streamed_response_wrapper(
+            catalog_syncs.refresh,
+        )
+
+    @cached_property
+    def prebuilt_policies(self) -> AsyncPrebuiltPoliciesResourceWithStreamingResponse:
+        return AsyncPrebuiltPoliciesResourceWithStreamingResponse(self._catalog_syncs.prebuilt_policies)
diff --git a/src/cloudflare/resources/magic_cloud_networking/catalog_syncs/prebuilt_policies.py b/src/cloudflare/resources/magic_cloud_networking/catalog_syncs/prebuilt_policies.py
new file mode 100644
index 00000000000..360302ee218
--- /dev/null
+++ b/src/cloudflare/resources/magic_cloud_networking/catalog_syncs/prebuilt_policies.py
@@ -0,0 +1,188 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.magic_cloud_networking.catalog_syncs import prebuilt_policy_list_params
+from ....types.magic_cloud_networking.catalog_syncs.prebuilt_policy_list_response import PrebuiltPolicyListResponse
+
+__all__ = ["PrebuiltPoliciesResource", "AsyncPrebuiltPoliciesResource"]
+
+
+class PrebuiltPoliciesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> PrebuiltPoliciesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return PrebuiltPoliciesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> PrebuiltPoliciesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return PrebuiltPoliciesResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        destination_type: Literal["NONE", "ZERO_TRUST_LIST"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[PrebuiltPolicyListResponse]:
+        """
+        List prebuilt catalog sync policies (Closed Beta).
+
+        Args:
+          destination_type: Specify type of destination, omit to return all.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/magic/cloud/catalog-syncs/prebuilt-policies",
+            page=SyncSinglePage[PrebuiltPolicyListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {"destination_type": destination_type}, prebuilt_policy_list_params.PrebuiltPolicyListParams
+                ),
+            ),
+            model=PrebuiltPolicyListResponse,
+        )
+
+
+class AsyncPrebuiltPoliciesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncPrebuiltPoliciesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncPrebuiltPoliciesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncPrebuiltPoliciesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncPrebuiltPoliciesResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        destination_type: Literal["NONE", "ZERO_TRUST_LIST"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[PrebuiltPolicyListResponse, AsyncSinglePage[PrebuiltPolicyListResponse]]:
+        """
+        List prebuilt catalog sync policies (Closed Beta).
+
+        Args:
+          destination_type: Specify type of destination, omit to return all.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/magic/cloud/catalog-syncs/prebuilt-policies",
+            page=AsyncSinglePage[PrebuiltPolicyListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {"destination_type": destination_type}, prebuilt_policy_list_params.PrebuiltPolicyListParams
+                ),
+            ),
+            model=PrebuiltPolicyListResponse,
+        )
+
+
+class PrebuiltPoliciesResourceWithRawResponse:
+    def __init__(self, prebuilt_policies: PrebuiltPoliciesResource) -> None:
+        self._prebuilt_policies = prebuilt_policies
+
+        self.list = to_raw_response_wrapper(
+            prebuilt_policies.list,
+        )
+
+
+class AsyncPrebuiltPoliciesResourceWithRawResponse:
+    def __init__(self, prebuilt_policies: AsyncPrebuiltPoliciesResource) -> None:
+        self._prebuilt_policies = prebuilt_policies
+
+        self.list = async_to_raw_response_wrapper(
+            prebuilt_policies.list,
+        )
+
+
+class PrebuiltPoliciesResourceWithStreamingResponse:
+    def __init__(self, prebuilt_policies: PrebuiltPoliciesResource) -> None:
+        self._prebuilt_policies = prebuilt_policies
+
+        self.list = to_streamed_response_wrapper(
+            prebuilt_policies.list,
+        )
+
+
+class AsyncPrebuiltPoliciesResourceWithStreamingResponse:
+    def __init__(self, prebuilt_policies: AsyncPrebuiltPoliciesResource) -> None:
+        self._prebuilt_policies = prebuilt_policies
+
+        self.list = async_to_streamed_response_wrapper(
+            prebuilt_policies.list,
+        )
diff --git a/src/cloudflare/resources/magic_cloud_networking/cloud_integrations.py b/src/cloudflare/resources/magic_cloud_networking/cloud_integrations.py
new file mode 100644
index 00000000000..8953e359d8d
--- /dev/null
+++ b/src/cloudflare/resources/magic_cloud_networking/cloud_integrations.py
@@ -0,0 +1,1063 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Any, Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, strip_not_given, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.magic_cloud_networking import (
+    cloud_integration_get_params,
+    cloud_integration_edit_params,
+    cloud_integration_list_params,
+    cloud_integration_create_params,
+    cloud_integration_update_params,
+    cloud_integration_discover_params,
+)
+from ...types.magic_cloud_networking.cloud_integration_get_response import CloudIntegrationGetResponse
+from ...types.magic_cloud_networking.cloud_integration_edit_response import CloudIntegrationEditResponse
+from ...types.magic_cloud_networking.cloud_integration_list_response import CloudIntegrationListResponse
+from ...types.magic_cloud_networking.cloud_integration_create_response import CloudIntegrationCreateResponse
+from ...types.magic_cloud_networking.cloud_integration_delete_response import CloudIntegrationDeleteResponse
+from ...types.magic_cloud_networking.cloud_integration_update_response import CloudIntegrationUpdateResponse
+from ...types.magic_cloud_networking.cloud_integration_discover_response import CloudIntegrationDiscoverResponse
+from ...types.magic_cloud_networking.cloud_integration_discover_all_response import CloudIntegrationDiscoverAllResponse
+from ...types.magic_cloud_networking.cloud_integration_initial_setup_response import (
+    CloudIntegrationInitialSetupResponse,
+)
+
+__all__ = ["CloudIntegrationsResource", "AsyncCloudIntegrationsResource"]
+
+
+class CloudIntegrationsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> CloudIntegrationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CloudIntegrationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CloudIntegrationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CloudIntegrationsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"],
+        friendly_name: str,
+        description: str | Omit = omit,
+        forwarded: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudIntegrationCreateResponse:
+        """
+        Create a new Cloud Integration (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {**strip_not_given({"forwarded": forwarded}), **(extra_headers or {})}
+        return self._post(
+            f"/accounts/{account_id}/magic/cloud/providers",
+            body=maybe_transform(
+                {
+                    "cloud_type": cloud_type,
+                    "friendly_name": friendly_name,
+                    "description": description,
+                },
+                cloud_integration_create_params.CloudIntegrationCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CloudIntegrationCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudIntegrationCreateResponse], ResultWrapper[CloudIntegrationCreateResponse]),
+        )
+
+    def update(
+        self,
+        provider_id: str,
+        *,
+        account_id: str,
+        aws_arn: str | Omit = omit,
+        azure_subscription_id: str | Omit = omit,
+        azure_tenant_id: str | Omit = omit,
+        description: str | Omit = omit,
+        friendly_name: str | Omit = omit,
+        gcp_project_id: str | Omit = omit,
+        gcp_service_account_email: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudIntegrationUpdateResponse:
+        """
+        Update a Cloud Integration (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not provider_id:
+            raise ValueError(f"Expected a non-empty value for `provider_id` but received {provider_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/magic/cloud/providers/{provider_id}",
+            body=maybe_transform(
+                {
+                    "aws_arn": aws_arn,
+                    "azure_subscription_id": azure_subscription_id,
+                    "azure_tenant_id": azure_tenant_id,
+                    "description": description,
+                    "friendly_name": friendly_name,
+                    "gcp_project_id": gcp_project_id,
+                    "gcp_service_account_email": gcp_service_account_email,
+                },
+                cloud_integration_update_params.CloudIntegrationUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CloudIntegrationUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudIntegrationUpdateResponse], ResultWrapper[CloudIntegrationUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        cloudflare: bool | Omit = omit,
+        desc: bool | Omit = omit,
+        order_by: str | Omit = omit,
+        status: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[CloudIntegrationListResponse]:
+        """
+        List Cloud Integrations (Closed Beta).
+
+        Args:
+          order_by: One of ["updated_at", "id", "cloud_type", "name"].
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/magic/cloud/providers",
+            page=SyncSinglePage[CloudIntegrationListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "cloudflare": cloudflare,
+                        "desc": desc,
+                        "order_by": order_by,
+                        "status": status,
+                    },
+                    cloud_integration_list_params.CloudIntegrationListParams,
+                ),
+            ),
+            model=CloudIntegrationListResponse,
+        )
+
+    def delete(
+        self,
+        provider_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudIntegrationDeleteResponse:
+        """
+        Delete a Cloud Integration (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not provider_id:
+            raise ValueError(f"Expected a non-empty value for `provider_id` but received {provider_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/magic/cloud/providers/{provider_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CloudIntegrationDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudIntegrationDeleteResponse], ResultWrapper[CloudIntegrationDeleteResponse]),
+        )
+
+    def discover(
+        self,
+        provider_id: str,
+        *,
+        account_id: str,
+        v2: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudIntegrationDiscoverResponse:
+        """
+        Run discovery for a Cloud Integration (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not provider_id:
+            raise ValueError(f"Expected a non-empty value for `provider_id` but received {provider_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/magic/cloud/providers/{provider_id}/discover",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"v2": v2}, cloud_integration_discover_params.CloudIntegrationDiscoverParams),
+            ),
+            cast_to=CloudIntegrationDiscoverResponse,
+        )
+
+    def discover_all(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudIntegrationDiscoverAllResponse:
+        """
+        Run discovery for all Cloud Integrations in an account (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/magic/cloud/providers/discover",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CloudIntegrationDiscoverAllResponse,
+        )
+
+    def edit(
+        self,
+        provider_id: str,
+        *,
+        account_id: str,
+        aws_arn: str | Omit = omit,
+        azure_subscription_id: str | Omit = omit,
+        azure_tenant_id: str | Omit = omit,
+        description: str | Omit = omit,
+        friendly_name: str | Omit = omit,
+        gcp_project_id: str | Omit = omit,
+        gcp_service_account_email: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudIntegrationEditResponse:
+        """
+        Update a Cloud Integration (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not provider_id:
+            raise ValueError(f"Expected a non-empty value for `provider_id` but received {provider_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/magic/cloud/providers/{provider_id}",
+            body=maybe_transform(
+                {
+                    "aws_arn": aws_arn,
+                    "azure_subscription_id": azure_subscription_id,
+                    "azure_tenant_id": azure_tenant_id,
+                    "description": description,
+                    "friendly_name": friendly_name,
+                    "gcp_project_id": gcp_project_id,
+                    "gcp_service_account_email": gcp_service_account_email,
+                },
+                cloud_integration_edit_params.CloudIntegrationEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CloudIntegrationEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudIntegrationEditResponse], ResultWrapper[CloudIntegrationEditResponse]),
+        )
+
+    def get(
+        self,
+        provider_id: str,
+        *,
+        account_id: str,
+        status: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudIntegrationGetResponse:
+        """
+        Read a Cloud Integration (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not provider_id:
+            raise ValueError(f"Expected a non-empty value for `provider_id` but received {provider_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/magic/cloud/providers/{provider_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"status": status}, cloud_integration_get_params.CloudIntegrationGetParams),
+                post_parser=ResultWrapper[CloudIntegrationGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudIntegrationGetResponse], ResultWrapper[CloudIntegrationGetResponse]),
+        )
+
+    def initial_setup(
+        self,
+        provider_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudIntegrationInitialSetupResponse:
+        """
+        Get initial configuration to complete Cloud Integration setup (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not provider_id:
+            raise ValueError(f"Expected a non-empty value for `provider_id` but received {provider_id!r}")
+        return cast(
+            CloudIntegrationInitialSetupResponse,
+            self._get(
+                f"/accounts/{account_id}/magic/cloud/providers/{provider_id}/initial_setup",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[CloudIntegrationInitialSetupResponse]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[CloudIntegrationInitialSetupResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+
+class AsyncCloudIntegrationsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncCloudIntegrationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCloudIntegrationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCloudIntegrationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCloudIntegrationsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"],
+        friendly_name: str,
+        description: str | Omit = omit,
+        forwarded: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudIntegrationCreateResponse:
+        """
+        Create a new Cloud Integration (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {**strip_not_given({"forwarded": forwarded}), **(extra_headers or {})}
+        return await self._post(
+            f"/accounts/{account_id}/magic/cloud/providers",
+            body=await async_maybe_transform(
+                {
+                    "cloud_type": cloud_type,
+                    "friendly_name": friendly_name,
+                    "description": description,
+                },
+                cloud_integration_create_params.CloudIntegrationCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CloudIntegrationCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudIntegrationCreateResponse], ResultWrapper[CloudIntegrationCreateResponse]),
+        )
+
+    async def update(
+        self,
+        provider_id: str,
+        *,
+        account_id: str,
+        aws_arn: str | Omit = omit,
+        azure_subscription_id: str | Omit = omit,
+        azure_tenant_id: str | Omit = omit,
+        description: str | Omit = omit,
+        friendly_name: str | Omit = omit,
+        gcp_project_id: str | Omit = omit,
+        gcp_service_account_email: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudIntegrationUpdateResponse:
+        """
+        Update a Cloud Integration (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not provider_id:
+            raise ValueError(f"Expected a non-empty value for `provider_id` but received {provider_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/magic/cloud/providers/{provider_id}",
+            body=await async_maybe_transform(
+                {
+                    "aws_arn": aws_arn,
+                    "azure_subscription_id": azure_subscription_id,
+                    "azure_tenant_id": azure_tenant_id,
+                    "description": description,
+                    "friendly_name": friendly_name,
+                    "gcp_project_id": gcp_project_id,
+                    "gcp_service_account_email": gcp_service_account_email,
+                },
+                cloud_integration_update_params.CloudIntegrationUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CloudIntegrationUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudIntegrationUpdateResponse], ResultWrapper[CloudIntegrationUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        cloudflare: bool | Omit = omit,
+        desc: bool | Omit = omit,
+        order_by: str | Omit = omit,
+        status: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[CloudIntegrationListResponse, AsyncSinglePage[CloudIntegrationListResponse]]:
+        """
+        List Cloud Integrations (Closed Beta).
+
+        Args:
+          order_by: One of ["updated_at", "id", "cloud_type", "name"].
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/magic/cloud/providers",
+            page=AsyncSinglePage[CloudIntegrationListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "cloudflare": cloudflare,
+                        "desc": desc,
+                        "order_by": order_by,
+                        "status": status,
+                    },
+                    cloud_integration_list_params.CloudIntegrationListParams,
+                ),
+            ),
+            model=CloudIntegrationListResponse,
+        )
+
+    async def delete(
+        self,
+        provider_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudIntegrationDeleteResponse:
+        """
+        Delete a Cloud Integration (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not provider_id:
+            raise ValueError(f"Expected a non-empty value for `provider_id` but received {provider_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/magic/cloud/providers/{provider_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CloudIntegrationDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudIntegrationDeleteResponse], ResultWrapper[CloudIntegrationDeleteResponse]),
+        )
+
+    async def discover(
+        self,
+        provider_id: str,
+        *,
+        account_id: str,
+        v2: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudIntegrationDiscoverResponse:
+        """
+        Run discovery for a Cloud Integration (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not provider_id:
+            raise ValueError(f"Expected a non-empty value for `provider_id` but received {provider_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/magic/cloud/providers/{provider_id}/discover",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"v2": v2}, cloud_integration_discover_params.CloudIntegrationDiscoverParams
+                ),
+            ),
+            cast_to=CloudIntegrationDiscoverResponse,
+        )
+
+    async def discover_all(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudIntegrationDiscoverAllResponse:
+        """
+        Run discovery for all Cloud Integrations in an account (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/magic/cloud/providers/discover",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CloudIntegrationDiscoverAllResponse,
+        )
+
+    async def edit(
+        self,
+        provider_id: str,
+        *,
+        account_id: str,
+        aws_arn: str | Omit = omit,
+        azure_subscription_id: str | Omit = omit,
+        azure_tenant_id: str | Omit = omit,
+        description: str | Omit = omit,
+        friendly_name: str | Omit = omit,
+        gcp_project_id: str | Omit = omit,
+        gcp_service_account_email: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudIntegrationEditResponse:
+        """
+        Update a Cloud Integration (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not provider_id:
+            raise ValueError(f"Expected a non-empty value for `provider_id` but received {provider_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/magic/cloud/providers/{provider_id}",
+            body=await async_maybe_transform(
+                {
+                    "aws_arn": aws_arn,
+                    "azure_subscription_id": azure_subscription_id,
+                    "azure_tenant_id": azure_tenant_id,
+                    "description": description,
+                    "friendly_name": friendly_name,
+                    "gcp_project_id": gcp_project_id,
+                    "gcp_service_account_email": gcp_service_account_email,
+                },
+                cloud_integration_edit_params.CloudIntegrationEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CloudIntegrationEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudIntegrationEditResponse], ResultWrapper[CloudIntegrationEditResponse]),
+        )
+
+    async def get(
+        self,
+        provider_id: str,
+        *,
+        account_id: str,
+        status: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudIntegrationGetResponse:
+        """
+        Read a Cloud Integration (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not provider_id:
+            raise ValueError(f"Expected a non-empty value for `provider_id` but received {provider_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/magic/cloud/providers/{provider_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"status": status}, cloud_integration_get_params.CloudIntegrationGetParams
+                ),
+                post_parser=ResultWrapper[CloudIntegrationGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudIntegrationGetResponse], ResultWrapper[CloudIntegrationGetResponse]),
+        )
+
+    async def initial_setup(
+        self,
+        provider_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudIntegrationInitialSetupResponse:
+        """
+        Get initial configuration to complete Cloud Integration setup (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not provider_id:
+            raise ValueError(f"Expected a non-empty value for `provider_id` but received {provider_id!r}")
+        return cast(
+            CloudIntegrationInitialSetupResponse,
+            await self._get(
+                f"/accounts/{account_id}/magic/cloud/providers/{provider_id}/initial_setup",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[CloudIntegrationInitialSetupResponse]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[CloudIntegrationInitialSetupResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+
+class CloudIntegrationsResourceWithRawResponse:
+    def __init__(self, cloud_integrations: CloudIntegrationsResource) -> None:
+        self._cloud_integrations = cloud_integrations
+
+        self.create = to_raw_response_wrapper(
+            cloud_integrations.create,
+        )
+        self.update = to_raw_response_wrapper(
+            cloud_integrations.update,
+        )
+        self.list = to_raw_response_wrapper(
+            cloud_integrations.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            cloud_integrations.delete,
+        )
+        self.discover = to_raw_response_wrapper(
+            cloud_integrations.discover,
+        )
+        self.discover_all = to_raw_response_wrapper(
+            cloud_integrations.discover_all,
+        )
+        self.edit = to_raw_response_wrapper(
+            cloud_integrations.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            cloud_integrations.get,
+        )
+        self.initial_setup = to_raw_response_wrapper(
+            cloud_integrations.initial_setup,
+        )
+
+
+class AsyncCloudIntegrationsResourceWithRawResponse:
+    def __init__(self, cloud_integrations: AsyncCloudIntegrationsResource) -> None:
+        self._cloud_integrations = cloud_integrations
+
+        self.create = async_to_raw_response_wrapper(
+            cloud_integrations.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            cloud_integrations.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            cloud_integrations.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            cloud_integrations.delete,
+        )
+        self.discover = async_to_raw_response_wrapper(
+            cloud_integrations.discover,
+        )
+        self.discover_all = async_to_raw_response_wrapper(
+            cloud_integrations.discover_all,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            cloud_integrations.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            cloud_integrations.get,
+        )
+        self.initial_setup = async_to_raw_response_wrapper(
+            cloud_integrations.initial_setup,
+        )
+
+
+class CloudIntegrationsResourceWithStreamingResponse:
+    def __init__(self, cloud_integrations: CloudIntegrationsResource) -> None:
+        self._cloud_integrations = cloud_integrations
+
+        self.create = to_streamed_response_wrapper(
+            cloud_integrations.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            cloud_integrations.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            cloud_integrations.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            cloud_integrations.delete,
+        )
+        self.discover = to_streamed_response_wrapper(
+            cloud_integrations.discover,
+        )
+        self.discover_all = to_streamed_response_wrapper(
+            cloud_integrations.discover_all,
+        )
+        self.edit = to_streamed_response_wrapper(
+            cloud_integrations.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            cloud_integrations.get,
+        )
+        self.initial_setup = to_streamed_response_wrapper(
+            cloud_integrations.initial_setup,
+        )
+
+
+class AsyncCloudIntegrationsResourceWithStreamingResponse:
+    def __init__(self, cloud_integrations: AsyncCloudIntegrationsResource) -> None:
+        self._cloud_integrations = cloud_integrations
+
+        self.create = async_to_streamed_response_wrapper(
+            cloud_integrations.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            cloud_integrations.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            cloud_integrations.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            cloud_integrations.delete,
+        )
+        self.discover = async_to_streamed_response_wrapper(
+            cloud_integrations.discover,
+        )
+        self.discover_all = async_to_streamed_response_wrapper(
+            cloud_integrations.discover_all,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            cloud_integrations.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            cloud_integrations.get,
+        )
+        self.initial_setup = async_to_streamed_response_wrapper(
+            cloud_integrations.initial_setup,
+        )
diff --git a/src/cloudflare/resources/magic_cloud_networking/magic_cloud_networking.py b/src/cloudflare/resources/magic_cloud_networking/magic_cloud_networking.py
new file mode 100644
index 00000000000..1e3121e7530
--- /dev/null
+++ b/src/cloudflare/resources/magic_cloud_networking/magic_cloud_networking.py
@@ -0,0 +1,198 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from ..._compat import cached_property
+from .resources import (
+    ResourcesResource,
+    AsyncResourcesResource,
+    ResourcesResourceWithRawResponse,
+    AsyncResourcesResourceWithRawResponse,
+    ResourcesResourceWithStreamingResponse,
+    AsyncResourcesResourceWithStreamingResponse,
+)
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .on_ramps.on_ramps import (
+    OnRampsResource,
+    AsyncOnRampsResource,
+    OnRampsResourceWithRawResponse,
+    AsyncOnRampsResourceWithRawResponse,
+    OnRampsResourceWithStreamingResponse,
+    AsyncOnRampsResourceWithStreamingResponse,
+)
+from .cloud_integrations import (
+    CloudIntegrationsResource,
+    AsyncCloudIntegrationsResource,
+    CloudIntegrationsResourceWithRawResponse,
+    AsyncCloudIntegrationsResourceWithRawResponse,
+    CloudIntegrationsResourceWithStreamingResponse,
+    AsyncCloudIntegrationsResourceWithStreamingResponse,
+)
+from .catalog_syncs.catalog_syncs import (
+    CatalogSyncsResource,
+    AsyncCatalogSyncsResource,
+    CatalogSyncsResourceWithRawResponse,
+    AsyncCatalogSyncsResourceWithRawResponse,
+    CatalogSyncsResourceWithStreamingResponse,
+    AsyncCatalogSyncsResourceWithStreamingResponse,
+)
+
+__all__ = ["MagicCloudNetworkingResource", "AsyncMagicCloudNetworkingResource"]
+
+
+class MagicCloudNetworkingResource(SyncAPIResource):
+    @cached_property
+    def catalog_syncs(self) -> CatalogSyncsResource:
+        return CatalogSyncsResource(self._client)
+
+    @cached_property
+    def on_ramps(self) -> OnRampsResource:
+        return OnRampsResource(self._client)
+
+    @cached_property
+    def cloud_integrations(self) -> CloudIntegrationsResource:
+        return CloudIntegrationsResource(self._client)
+
+    @cached_property
+    def resources(self) -> ResourcesResource:
+        return ResourcesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> MagicCloudNetworkingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return MagicCloudNetworkingResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> MagicCloudNetworkingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return MagicCloudNetworkingResourceWithStreamingResponse(self)
+
+
+class AsyncMagicCloudNetworkingResource(AsyncAPIResource):
+    @cached_property
+    def catalog_syncs(self) -> AsyncCatalogSyncsResource:
+        return AsyncCatalogSyncsResource(self._client)
+
+    @cached_property
+    def on_ramps(self) -> AsyncOnRampsResource:
+        return AsyncOnRampsResource(self._client)
+
+    @cached_property
+    def cloud_integrations(self) -> AsyncCloudIntegrationsResource:
+        return AsyncCloudIntegrationsResource(self._client)
+
+    @cached_property
+    def resources(self) -> AsyncResourcesResource:
+        return AsyncResourcesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncMagicCloudNetworkingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncMagicCloudNetworkingResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncMagicCloudNetworkingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncMagicCloudNetworkingResourceWithStreamingResponse(self)
+
+
+class MagicCloudNetworkingResourceWithRawResponse:
+    def __init__(self, magic_cloud_networking: MagicCloudNetworkingResource) -> None:
+        self._magic_cloud_networking = magic_cloud_networking
+
+    @cached_property
+    def catalog_syncs(self) -> CatalogSyncsResourceWithRawResponse:
+        return CatalogSyncsResourceWithRawResponse(self._magic_cloud_networking.catalog_syncs)
+
+    @cached_property
+    def on_ramps(self) -> OnRampsResourceWithRawResponse:
+        return OnRampsResourceWithRawResponse(self._magic_cloud_networking.on_ramps)
+
+    @cached_property
+    def cloud_integrations(self) -> CloudIntegrationsResourceWithRawResponse:
+        return CloudIntegrationsResourceWithRawResponse(self._magic_cloud_networking.cloud_integrations)
+
+    @cached_property
+    def resources(self) -> ResourcesResourceWithRawResponse:
+        return ResourcesResourceWithRawResponse(self._magic_cloud_networking.resources)
+
+
+class AsyncMagicCloudNetworkingResourceWithRawResponse:
+    def __init__(self, magic_cloud_networking: AsyncMagicCloudNetworkingResource) -> None:
+        self._magic_cloud_networking = magic_cloud_networking
+
+    @cached_property
+    def catalog_syncs(self) -> AsyncCatalogSyncsResourceWithRawResponse:
+        return AsyncCatalogSyncsResourceWithRawResponse(self._magic_cloud_networking.catalog_syncs)
+
+    @cached_property
+    def on_ramps(self) -> AsyncOnRampsResourceWithRawResponse:
+        return AsyncOnRampsResourceWithRawResponse(self._magic_cloud_networking.on_ramps)
+
+    @cached_property
+    def cloud_integrations(self) -> AsyncCloudIntegrationsResourceWithRawResponse:
+        return AsyncCloudIntegrationsResourceWithRawResponse(self._magic_cloud_networking.cloud_integrations)
+
+    @cached_property
+    def resources(self) -> AsyncResourcesResourceWithRawResponse:
+        return AsyncResourcesResourceWithRawResponse(self._magic_cloud_networking.resources)
+
+
+class MagicCloudNetworkingResourceWithStreamingResponse:
+    def __init__(self, magic_cloud_networking: MagicCloudNetworkingResource) -> None:
+        self._magic_cloud_networking = magic_cloud_networking
+
+    @cached_property
+    def catalog_syncs(self) -> CatalogSyncsResourceWithStreamingResponse:
+        return CatalogSyncsResourceWithStreamingResponse(self._magic_cloud_networking.catalog_syncs)
+
+    @cached_property
+    def on_ramps(self) -> OnRampsResourceWithStreamingResponse:
+        return OnRampsResourceWithStreamingResponse(self._magic_cloud_networking.on_ramps)
+
+    @cached_property
+    def cloud_integrations(self) -> CloudIntegrationsResourceWithStreamingResponse:
+        return CloudIntegrationsResourceWithStreamingResponse(self._magic_cloud_networking.cloud_integrations)
+
+    @cached_property
+    def resources(self) -> ResourcesResourceWithStreamingResponse:
+        return ResourcesResourceWithStreamingResponse(self._magic_cloud_networking.resources)
+
+
+class AsyncMagicCloudNetworkingResourceWithStreamingResponse:
+    def __init__(self, magic_cloud_networking: AsyncMagicCloudNetworkingResource) -> None:
+        self._magic_cloud_networking = magic_cloud_networking
+
+    @cached_property
+    def catalog_syncs(self) -> AsyncCatalogSyncsResourceWithStreamingResponse:
+        return AsyncCatalogSyncsResourceWithStreamingResponse(self._magic_cloud_networking.catalog_syncs)
+
+    @cached_property
+    def on_ramps(self) -> AsyncOnRampsResourceWithStreamingResponse:
+        return AsyncOnRampsResourceWithStreamingResponse(self._magic_cloud_networking.on_ramps)
+
+    @cached_property
+    def cloud_integrations(self) -> AsyncCloudIntegrationsResourceWithStreamingResponse:
+        return AsyncCloudIntegrationsResourceWithStreamingResponse(self._magic_cloud_networking.cloud_integrations)
+
+    @cached_property
+    def resources(self) -> AsyncResourcesResourceWithStreamingResponse:
+        return AsyncResourcesResourceWithStreamingResponse(self._magic_cloud_networking.resources)
diff --git a/src/cloudflare/resources/magic_cloud_networking/on_ramps/__init__.py b/src/cloudflare/resources/magic_cloud_networking/on_ramps/__init__.py
new file mode 100644
index 00000000000..add114e008d
--- /dev/null
+++ b/src/cloudflare/resources/magic_cloud_networking/on_ramps/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .on_ramps import (
+    OnRampsResource,
+    AsyncOnRampsResource,
+    OnRampsResourceWithRawResponse,
+    AsyncOnRampsResourceWithRawResponse,
+    OnRampsResourceWithStreamingResponse,
+    AsyncOnRampsResourceWithStreamingResponse,
+)
+from .address_spaces import (
+    AddressSpacesResource,
+    AsyncAddressSpacesResource,
+    AddressSpacesResourceWithRawResponse,
+    AsyncAddressSpacesResourceWithRawResponse,
+    AddressSpacesResourceWithStreamingResponse,
+    AsyncAddressSpacesResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "AddressSpacesResource",
+    "AsyncAddressSpacesResource",
+    "AddressSpacesResourceWithRawResponse",
+    "AsyncAddressSpacesResourceWithRawResponse",
+    "AddressSpacesResourceWithStreamingResponse",
+    "AsyncAddressSpacesResourceWithStreamingResponse",
+    "OnRampsResource",
+    "AsyncOnRampsResource",
+    "OnRampsResourceWithRawResponse",
+    "AsyncOnRampsResourceWithRawResponse",
+    "OnRampsResourceWithStreamingResponse",
+    "AsyncOnRampsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/magic_cloud_networking/on_ramps/address_spaces.py b/src/cloudflare/resources/magic_cloud_networking/on_ramps/address_spaces.py
new file mode 100644
index 00000000000..ea74a5cb0e0
--- /dev/null
+++ b/src/cloudflare/resources/magic_cloud_networking/on_ramps/address_spaces.py
@@ -0,0 +1,360 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, SequenceNotStr, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.magic_cloud_networking.on_ramps import address_space_edit_params, address_space_update_params
+from ....types.magic_cloud_networking.on_ramps.address_space_edit_response import AddressSpaceEditResponse
+from ....types.magic_cloud_networking.on_ramps.address_space_list_response import AddressSpaceListResponse
+from ....types.magic_cloud_networking.on_ramps.address_space_update_response import AddressSpaceUpdateResponse
+
+__all__ = ["AddressSpacesResource", "AsyncAddressSpacesResource"]
+
+
+class AddressSpacesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AddressSpacesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AddressSpacesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AddressSpacesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AddressSpacesResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        *,
+        account_id: str,
+        prefixes: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AddressSpaceUpdateResponse:
+        """
+        Update the Magic WAN Address Space (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/magic/cloud/onramps/magic_wan_address_space",
+            body=maybe_transform({"prefixes": prefixes}, address_space_update_params.AddressSpaceUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AddressSpaceUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AddressSpaceUpdateResponse], ResultWrapper[AddressSpaceUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AddressSpaceListResponse:
+        """
+        Read the Magic WAN Address Space (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/magic/cloud/onramps/magic_wan_address_space",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AddressSpaceListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AddressSpaceListResponse], ResultWrapper[AddressSpaceListResponse]),
+        )
+
+    def edit(
+        self,
+        *,
+        account_id: str,
+        prefixes: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AddressSpaceEditResponse:
+        """
+        Update the Magic WAN Address Space (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/magic/cloud/onramps/magic_wan_address_space",
+            body=maybe_transform({"prefixes": prefixes}, address_space_edit_params.AddressSpaceEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AddressSpaceEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AddressSpaceEditResponse], ResultWrapper[AddressSpaceEditResponse]),
+        )
+
+
+class AsyncAddressSpacesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncAddressSpacesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAddressSpacesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAddressSpacesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAddressSpacesResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        *,
+        account_id: str,
+        prefixes: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AddressSpaceUpdateResponse:
+        """
+        Update the Magic WAN Address Space (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/magic/cloud/onramps/magic_wan_address_space",
+            body=await async_maybe_transform(
+                {"prefixes": prefixes}, address_space_update_params.AddressSpaceUpdateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AddressSpaceUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AddressSpaceUpdateResponse], ResultWrapper[AddressSpaceUpdateResponse]),
+        )
+
+    async def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AddressSpaceListResponse:
+        """
+        Read the Magic WAN Address Space (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/magic/cloud/onramps/magic_wan_address_space",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AddressSpaceListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AddressSpaceListResponse], ResultWrapper[AddressSpaceListResponse]),
+        )
+
+    async def edit(
+        self,
+        *,
+        account_id: str,
+        prefixes: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AddressSpaceEditResponse:
+        """
+        Update the Magic WAN Address Space (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/magic/cloud/onramps/magic_wan_address_space",
+            body=await async_maybe_transform({"prefixes": prefixes}, address_space_edit_params.AddressSpaceEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[AddressSpaceEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AddressSpaceEditResponse], ResultWrapper[AddressSpaceEditResponse]),
+        )
+
+
+class AddressSpacesResourceWithRawResponse:
+    def __init__(self, address_spaces: AddressSpacesResource) -> None:
+        self._address_spaces = address_spaces
+
+        self.update = to_raw_response_wrapper(
+            address_spaces.update,
+        )
+        self.list = to_raw_response_wrapper(
+            address_spaces.list,
+        )
+        self.edit = to_raw_response_wrapper(
+            address_spaces.edit,
+        )
+
+
+class AsyncAddressSpacesResourceWithRawResponse:
+    def __init__(self, address_spaces: AsyncAddressSpacesResource) -> None:
+        self._address_spaces = address_spaces
+
+        self.update = async_to_raw_response_wrapper(
+            address_spaces.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            address_spaces.list,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            address_spaces.edit,
+        )
+
+
+class AddressSpacesResourceWithStreamingResponse:
+    def __init__(self, address_spaces: AddressSpacesResource) -> None:
+        self._address_spaces = address_spaces
+
+        self.update = to_streamed_response_wrapper(
+            address_spaces.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            address_spaces.list,
+        )
+        self.edit = to_streamed_response_wrapper(
+            address_spaces.edit,
+        )
+
+
+class AsyncAddressSpacesResourceWithStreamingResponse:
+    def __init__(self, address_spaces: AsyncAddressSpacesResource) -> None:
+        self._address_spaces = address_spaces
+
+        self.update = async_to_streamed_response_wrapper(
+            address_spaces.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            address_spaces.list,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            address_spaces.edit,
+        )
diff --git a/src/cloudflare/resources/magic_cloud_networking/on_ramps/on_ramps.py b/src/cloudflare/resources/magic_cloud_networking/on_ramps/on_ramps.py
new file mode 100644
index 00000000000..589e6689a8c
--- /dev/null
+++ b/src/cloudflare/resources/magic_cloud_networking/on_ramps/on_ramps.py
@@ -0,0 +1,1200 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, strip_not_given, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    BinaryAPIResponse,
+    AsyncBinaryAPIResponse,
+    StreamedBinaryAPIResponse,
+    AsyncStreamedBinaryAPIResponse,
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    to_custom_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+    to_custom_streamed_response_wrapper,
+    async_to_custom_raw_response_wrapper,
+    async_to_custom_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from .address_spaces import (
+    AddressSpacesResource,
+    AsyncAddressSpacesResource,
+    AddressSpacesResourceWithRawResponse,
+    AsyncAddressSpacesResourceWithRawResponse,
+    AddressSpacesResourceWithStreamingResponse,
+    AsyncAddressSpacesResourceWithStreamingResponse,
+)
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.magic_cloud_networking import (
+    on_ramp_get_params,
+    on_ramp_edit_params,
+    on_ramp_list_params,
+    on_ramp_create_params,
+    on_ramp_delete_params,
+    on_ramp_update_params,
+)
+from ....types.magic_cloud_networking.on_ramp_get_response import OnRampGetResponse
+from ....types.magic_cloud_networking.on_ramp_edit_response import OnRampEditResponse
+from ....types.magic_cloud_networking.on_ramp_list_response import OnRampListResponse
+from ....types.magic_cloud_networking.on_ramp_plan_response import OnRampPlanResponse
+from ....types.magic_cloud_networking.on_ramp_apply_response import OnRampApplyResponse
+from ....types.magic_cloud_networking.on_ramp_create_response import OnRampCreateResponse
+from ....types.magic_cloud_networking.on_ramp_delete_response import OnRampDeleteResponse
+from ....types.magic_cloud_networking.on_ramp_update_response import OnRampUpdateResponse
+
+__all__ = ["OnRampsResource", "AsyncOnRampsResource"]
+
+
+class OnRampsResource(SyncAPIResource):
+    @cached_property
+    def address_spaces(self) -> AddressSpacesResource:
+        return AddressSpacesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> OnRampsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return OnRampsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> OnRampsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return OnRampsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        cloud_type: Literal["AWS", "AZURE", "GOOGLE"],
+        dynamic_routing: bool,
+        install_routes_in_cloud: bool,
+        install_routes_in_magic_wan: bool,
+        name: str,
+        type: Literal["OnrampTypeSingle", "OnrampTypeHub"],
+        adopted_hub_id: str | Omit = omit,
+        attached_hubs: SequenceNotStr[str] | Omit = omit,
+        attached_vpcs: SequenceNotStr[str] | Omit = omit,
+        cloud_asn: int | Omit = omit,
+        description: str | Omit = omit,
+        hub_provider_id: str | Omit = omit,
+        manage_hub_to_hub_attachments: bool | Omit = omit,
+        manage_vpc_to_hub_attachments: bool | Omit = omit,
+        region: str | Omit = omit,
+        vpc: str | Omit = omit,
+        forwarded: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OnRampCreateResponse:
+        """
+        Create a new On-ramp (Closed Beta).
+
+        Args:
+          dynamic_routing: if set to true, install_routes_in_cloud and install_routes_in_magic_wan should
+              be set to false
+
+          cloud_asn: the ASN to use on the cloud side. If unset or zero, the cloud's default will be
+              used.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {**strip_not_given({"forwarded": forwarded}), **(extra_headers or {})}
+        return self._post(
+            f"/accounts/{account_id}/magic/cloud/onramps",
+            body=maybe_transform(
+                {
+                    "cloud_type": cloud_type,
+                    "dynamic_routing": dynamic_routing,
+                    "install_routes_in_cloud": install_routes_in_cloud,
+                    "install_routes_in_magic_wan": install_routes_in_magic_wan,
+                    "name": name,
+                    "type": type,
+                    "adopted_hub_id": adopted_hub_id,
+                    "attached_hubs": attached_hubs,
+                    "attached_vpcs": attached_vpcs,
+                    "cloud_asn": cloud_asn,
+                    "description": description,
+                    "hub_provider_id": hub_provider_id,
+                    "manage_hub_to_hub_attachments": manage_hub_to_hub_attachments,
+                    "manage_vpc_to_hub_attachments": manage_vpc_to_hub_attachments,
+                    "region": region,
+                    "vpc": vpc,
+                },
+                on_ramp_create_params.OnRampCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[OnRampCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OnRampCreateResponse], ResultWrapper[OnRampCreateResponse]),
+        )
+
+    def update(
+        self,
+        onramp_id: str,
+        *,
+        account_id: str,
+        attached_hubs: SequenceNotStr[str] | Omit = omit,
+        attached_vpcs: SequenceNotStr[str] | Omit = omit,
+        description: str | Omit = omit,
+        install_routes_in_cloud: bool | Omit = omit,
+        install_routes_in_magic_wan: bool | Omit = omit,
+        manage_hub_to_hub_attachments: bool | Omit = omit,
+        manage_vpc_to_hub_attachments: bool | Omit = omit,
+        name: str | Omit = omit,
+        vpc: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OnRampUpdateResponse:
+        """
+        Update an On-ramp (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not onramp_id:
+            raise ValueError(f"Expected a non-empty value for `onramp_id` but received {onramp_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/magic/cloud/onramps/{onramp_id}",
+            body=maybe_transform(
+                {
+                    "attached_hubs": attached_hubs,
+                    "attached_vpcs": attached_vpcs,
+                    "description": description,
+                    "install_routes_in_cloud": install_routes_in_cloud,
+                    "install_routes_in_magic_wan": install_routes_in_magic_wan,
+                    "manage_hub_to_hub_attachments": manage_hub_to_hub_attachments,
+                    "manage_vpc_to_hub_attachments": manage_vpc_to_hub_attachments,
+                    "name": name,
+                    "vpc": vpc,
+                },
+                on_ramp_update_params.OnRampUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[OnRampUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OnRampUpdateResponse], ResultWrapper[OnRampUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        desc: bool | Omit = omit,
+        order_by: str | Omit = omit,
+        status: bool | Omit = omit,
+        vpcs: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[OnRampListResponse]:
+        """
+        List On-ramps (Closed Beta).
+
+        Args:
+          order_by: One of ["updated_at", "id", "cloud_type", "name"].
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/magic/cloud/onramps",
+            page=SyncSinglePage[OnRampListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "desc": desc,
+                        "order_by": order_by,
+                        "status": status,
+                        "vpcs": vpcs,
+                    },
+                    on_ramp_list_params.OnRampListParams,
+                ),
+            ),
+            model=OnRampListResponse,
+        )
+
+    def delete(
+        self,
+        onramp_id: str,
+        *,
+        account_id: str,
+        destroy: bool | Omit = omit,
+        force: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OnRampDeleteResponse:
+        """
+        Delete an On-ramp (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not onramp_id:
+            raise ValueError(f"Expected a non-empty value for `onramp_id` but received {onramp_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/magic/cloud/onramps/{onramp_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "destroy": destroy,
+                        "force": force,
+                    },
+                    on_ramp_delete_params.OnRampDeleteParams,
+                ),
+                post_parser=ResultWrapper[OnRampDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OnRampDeleteResponse], ResultWrapper[OnRampDeleteResponse]),
+        )
+
+    def apply(
+        self,
+        onramp_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OnRampApplyResponse:
+        """
+        Apply an On-ramp (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not onramp_id:
+            raise ValueError(f"Expected a non-empty value for `onramp_id` but received {onramp_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/magic/cloud/onramps/{onramp_id}/apply",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=OnRampApplyResponse,
+        )
+
+    def edit(
+        self,
+        onramp_id: str,
+        *,
+        account_id: str,
+        attached_hubs: SequenceNotStr[str] | Omit = omit,
+        attached_vpcs: SequenceNotStr[str] | Omit = omit,
+        description: str | Omit = omit,
+        install_routes_in_cloud: bool | Omit = omit,
+        install_routes_in_magic_wan: bool | Omit = omit,
+        manage_hub_to_hub_attachments: bool | Omit = omit,
+        manage_vpc_to_hub_attachments: bool | Omit = omit,
+        name: str | Omit = omit,
+        vpc: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OnRampEditResponse:
+        """
+        Update an On-ramp (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not onramp_id:
+            raise ValueError(f"Expected a non-empty value for `onramp_id` but received {onramp_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/magic/cloud/onramps/{onramp_id}",
+            body=maybe_transform(
+                {
+                    "attached_hubs": attached_hubs,
+                    "attached_vpcs": attached_vpcs,
+                    "description": description,
+                    "install_routes_in_cloud": install_routes_in_cloud,
+                    "install_routes_in_magic_wan": install_routes_in_magic_wan,
+                    "manage_hub_to_hub_attachments": manage_hub_to_hub_attachments,
+                    "manage_vpc_to_hub_attachments": manage_vpc_to_hub_attachments,
+                    "name": name,
+                    "vpc": vpc,
+                },
+                on_ramp_edit_params.OnRampEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[OnRampEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OnRampEditResponse], ResultWrapper[OnRampEditResponse]),
+        )
+
+    def export(
+        self,
+        onramp_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BinaryAPIResponse:
+        """
+        Export an On-ramp to terraform ready file(s) (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not onramp_id:
+            raise ValueError(f"Expected a non-empty value for `onramp_id` but received {onramp_id!r}")
+        extra_headers = {"Accept": "application/zip", **(extra_headers or {})}
+        return self._post(
+            f"/accounts/{account_id}/magic/cloud/onramps/{onramp_id}/export",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=BinaryAPIResponse,
+        )
+
+    def get(
+        self,
+        onramp_id: str,
+        *,
+        account_id: str,
+        planned_resources: bool | Omit = omit,
+        post_apply_resources: bool | Omit = omit,
+        status: bool | Omit = omit,
+        vpcs: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OnRampGetResponse:
+        """
+        Read an On-ramp (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not onramp_id:
+            raise ValueError(f"Expected a non-empty value for `onramp_id` but received {onramp_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/magic/cloud/onramps/{onramp_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "planned_resources": planned_resources,
+                        "post_apply_resources": post_apply_resources,
+                        "status": status,
+                        "vpcs": vpcs,
+                    },
+                    on_ramp_get_params.OnRampGetParams,
+                ),
+                post_parser=ResultWrapper[OnRampGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OnRampGetResponse], ResultWrapper[OnRampGetResponse]),
+        )
+
+    def plan(
+        self,
+        onramp_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OnRampPlanResponse:
+        """
+        Plan an On-ramp (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not onramp_id:
+            raise ValueError(f"Expected a non-empty value for `onramp_id` but received {onramp_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/magic/cloud/onramps/{onramp_id}/plan",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=OnRampPlanResponse,
+        )
+
+
+class AsyncOnRampsResource(AsyncAPIResource):
+    @cached_property
+    def address_spaces(self) -> AsyncAddressSpacesResource:
+        return AsyncAddressSpacesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncOnRampsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncOnRampsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncOnRampsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncOnRampsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        cloud_type: Literal["AWS", "AZURE", "GOOGLE"],
+        dynamic_routing: bool,
+        install_routes_in_cloud: bool,
+        install_routes_in_magic_wan: bool,
+        name: str,
+        type: Literal["OnrampTypeSingle", "OnrampTypeHub"],
+        adopted_hub_id: str | Omit = omit,
+        attached_hubs: SequenceNotStr[str] | Omit = omit,
+        attached_vpcs: SequenceNotStr[str] | Omit = omit,
+        cloud_asn: int | Omit = omit,
+        description: str | Omit = omit,
+        hub_provider_id: str | Omit = omit,
+        manage_hub_to_hub_attachments: bool | Omit = omit,
+        manage_vpc_to_hub_attachments: bool | Omit = omit,
+        region: str | Omit = omit,
+        vpc: str | Omit = omit,
+        forwarded: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OnRampCreateResponse:
+        """
+        Create a new On-ramp (Closed Beta).
+
+        Args:
+          dynamic_routing: if set to true, install_routes_in_cloud and install_routes_in_magic_wan should
+              be set to false
+
+          cloud_asn: the ASN to use on the cloud side. If unset or zero, the cloud's default will be
+              used.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {**strip_not_given({"forwarded": forwarded}), **(extra_headers or {})}
+        return await self._post(
+            f"/accounts/{account_id}/magic/cloud/onramps",
+            body=await async_maybe_transform(
+                {
+                    "cloud_type": cloud_type,
+                    "dynamic_routing": dynamic_routing,
+                    "install_routes_in_cloud": install_routes_in_cloud,
+                    "install_routes_in_magic_wan": install_routes_in_magic_wan,
+                    "name": name,
+                    "type": type,
+                    "adopted_hub_id": adopted_hub_id,
+                    "attached_hubs": attached_hubs,
+                    "attached_vpcs": attached_vpcs,
+                    "cloud_asn": cloud_asn,
+                    "description": description,
+                    "hub_provider_id": hub_provider_id,
+                    "manage_hub_to_hub_attachments": manage_hub_to_hub_attachments,
+                    "manage_vpc_to_hub_attachments": manage_vpc_to_hub_attachments,
+                    "region": region,
+                    "vpc": vpc,
+                },
+                on_ramp_create_params.OnRampCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[OnRampCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OnRampCreateResponse], ResultWrapper[OnRampCreateResponse]),
+        )
+
+    async def update(
+        self,
+        onramp_id: str,
+        *,
+        account_id: str,
+        attached_hubs: SequenceNotStr[str] | Omit = omit,
+        attached_vpcs: SequenceNotStr[str] | Omit = omit,
+        description: str | Omit = omit,
+        install_routes_in_cloud: bool | Omit = omit,
+        install_routes_in_magic_wan: bool | Omit = omit,
+        manage_hub_to_hub_attachments: bool | Omit = omit,
+        manage_vpc_to_hub_attachments: bool | Omit = omit,
+        name: str | Omit = omit,
+        vpc: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OnRampUpdateResponse:
+        """
+        Update an On-ramp (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not onramp_id:
+            raise ValueError(f"Expected a non-empty value for `onramp_id` but received {onramp_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/magic/cloud/onramps/{onramp_id}",
+            body=await async_maybe_transform(
+                {
+                    "attached_hubs": attached_hubs,
+                    "attached_vpcs": attached_vpcs,
+                    "description": description,
+                    "install_routes_in_cloud": install_routes_in_cloud,
+                    "install_routes_in_magic_wan": install_routes_in_magic_wan,
+                    "manage_hub_to_hub_attachments": manage_hub_to_hub_attachments,
+                    "manage_vpc_to_hub_attachments": manage_vpc_to_hub_attachments,
+                    "name": name,
+                    "vpc": vpc,
+                },
+                on_ramp_update_params.OnRampUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[OnRampUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OnRampUpdateResponse], ResultWrapper[OnRampUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        desc: bool | Omit = omit,
+        order_by: str | Omit = omit,
+        status: bool | Omit = omit,
+        vpcs: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[OnRampListResponse, AsyncSinglePage[OnRampListResponse]]:
+        """
+        List On-ramps (Closed Beta).
+
+        Args:
+          order_by: One of ["updated_at", "id", "cloud_type", "name"].
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/magic/cloud/onramps",
+            page=AsyncSinglePage[OnRampListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "desc": desc,
+                        "order_by": order_by,
+                        "status": status,
+                        "vpcs": vpcs,
+                    },
+                    on_ramp_list_params.OnRampListParams,
+                ),
+            ),
+            model=OnRampListResponse,
+        )
+
+    async def delete(
+        self,
+        onramp_id: str,
+        *,
+        account_id: str,
+        destroy: bool | Omit = omit,
+        force: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OnRampDeleteResponse:
+        """
+        Delete an On-ramp (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not onramp_id:
+            raise ValueError(f"Expected a non-empty value for `onramp_id` but received {onramp_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/magic/cloud/onramps/{onramp_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "destroy": destroy,
+                        "force": force,
+                    },
+                    on_ramp_delete_params.OnRampDeleteParams,
+                ),
+                post_parser=ResultWrapper[OnRampDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OnRampDeleteResponse], ResultWrapper[OnRampDeleteResponse]),
+        )
+
+    async def apply(
+        self,
+        onramp_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OnRampApplyResponse:
+        """
+        Apply an On-ramp (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not onramp_id:
+            raise ValueError(f"Expected a non-empty value for `onramp_id` but received {onramp_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/magic/cloud/onramps/{onramp_id}/apply",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=OnRampApplyResponse,
+        )
+
+    async def edit(
+        self,
+        onramp_id: str,
+        *,
+        account_id: str,
+        attached_hubs: SequenceNotStr[str] | Omit = omit,
+        attached_vpcs: SequenceNotStr[str] | Omit = omit,
+        description: str | Omit = omit,
+        install_routes_in_cloud: bool | Omit = omit,
+        install_routes_in_magic_wan: bool | Omit = omit,
+        manage_hub_to_hub_attachments: bool | Omit = omit,
+        manage_vpc_to_hub_attachments: bool | Omit = omit,
+        name: str | Omit = omit,
+        vpc: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OnRampEditResponse:
+        """
+        Update an On-ramp (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not onramp_id:
+            raise ValueError(f"Expected a non-empty value for `onramp_id` but received {onramp_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/magic/cloud/onramps/{onramp_id}",
+            body=await async_maybe_transform(
+                {
+                    "attached_hubs": attached_hubs,
+                    "attached_vpcs": attached_vpcs,
+                    "description": description,
+                    "install_routes_in_cloud": install_routes_in_cloud,
+                    "install_routes_in_magic_wan": install_routes_in_magic_wan,
+                    "manage_hub_to_hub_attachments": manage_hub_to_hub_attachments,
+                    "manage_vpc_to_hub_attachments": manage_vpc_to_hub_attachments,
+                    "name": name,
+                    "vpc": vpc,
+                },
+                on_ramp_edit_params.OnRampEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[OnRampEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OnRampEditResponse], ResultWrapper[OnRampEditResponse]),
+        )
+
+    async def export(
+        self,
+        onramp_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncBinaryAPIResponse:
+        """
+        Export an On-ramp to terraform ready file(s) (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not onramp_id:
+            raise ValueError(f"Expected a non-empty value for `onramp_id` but received {onramp_id!r}")
+        extra_headers = {"Accept": "application/zip", **(extra_headers or {})}
+        return await self._post(
+            f"/accounts/{account_id}/magic/cloud/onramps/{onramp_id}/export",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=AsyncBinaryAPIResponse,
+        )
+
+    async def get(
+        self,
+        onramp_id: str,
+        *,
+        account_id: str,
+        planned_resources: bool | Omit = omit,
+        post_apply_resources: bool | Omit = omit,
+        status: bool | Omit = omit,
+        vpcs: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OnRampGetResponse:
+        """
+        Read an On-ramp (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not onramp_id:
+            raise ValueError(f"Expected a non-empty value for `onramp_id` but received {onramp_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/magic/cloud/onramps/{onramp_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "planned_resources": planned_resources,
+                        "post_apply_resources": post_apply_resources,
+                        "status": status,
+                        "vpcs": vpcs,
+                    },
+                    on_ramp_get_params.OnRampGetParams,
+                ),
+                post_parser=ResultWrapper[OnRampGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OnRampGetResponse], ResultWrapper[OnRampGetResponse]),
+        )
+
+    async def plan(
+        self,
+        onramp_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OnRampPlanResponse:
+        """
+        Plan an On-ramp (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not onramp_id:
+            raise ValueError(f"Expected a non-empty value for `onramp_id` but received {onramp_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/magic/cloud/onramps/{onramp_id}/plan",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=OnRampPlanResponse,
+        )
+
+
+class OnRampsResourceWithRawResponse:
+    def __init__(self, on_ramps: OnRampsResource) -> None:
+        self._on_ramps = on_ramps
+
+        self.create = to_raw_response_wrapper(
+            on_ramps.create,
+        )
+        self.update = to_raw_response_wrapper(
+            on_ramps.update,
+        )
+        self.list = to_raw_response_wrapper(
+            on_ramps.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            on_ramps.delete,
+        )
+        self.apply = to_raw_response_wrapper(
+            on_ramps.apply,
+        )
+        self.edit = to_raw_response_wrapper(
+            on_ramps.edit,
+        )
+        self.export = to_custom_raw_response_wrapper(
+            on_ramps.export,
+            BinaryAPIResponse,
+        )
+        self.get = to_raw_response_wrapper(
+            on_ramps.get,
+        )
+        self.plan = to_raw_response_wrapper(
+            on_ramps.plan,
+        )
+
+    @cached_property
+    def address_spaces(self) -> AddressSpacesResourceWithRawResponse:
+        return AddressSpacesResourceWithRawResponse(self._on_ramps.address_spaces)
+
+
+class AsyncOnRampsResourceWithRawResponse:
+    def __init__(self, on_ramps: AsyncOnRampsResource) -> None:
+        self._on_ramps = on_ramps
+
+        self.create = async_to_raw_response_wrapper(
+            on_ramps.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            on_ramps.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            on_ramps.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            on_ramps.delete,
+        )
+        self.apply = async_to_raw_response_wrapper(
+            on_ramps.apply,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            on_ramps.edit,
+        )
+        self.export = async_to_custom_raw_response_wrapper(
+            on_ramps.export,
+            AsyncBinaryAPIResponse,
+        )
+        self.get = async_to_raw_response_wrapper(
+            on_ramps.get,
+        )
+        self.plan = async_to_raw_response_wrapper(
+            on_ramps.plan,
+        )
+
+    @cached_property
+    def address_spaces(self) -> AsyncAddressSpacesResourceWithRawResponse:
+        return AsyncAddressSpacesResourceWithRawResponse(self._on_ramps.address_spaces)
+
+
+class OnRampsResourceWithStreamingResponse:
+    def __init__(self, on_ramps: OnRampsResource) -> None:
+        self._on_ramps = on_ramps
+
+        self.create = to_streamed_response_wrapper(
+            on_ramps.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            on_ramps.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            on_ramps.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            on_ramps.delete,
+        )
+        self.apply = to_streamed_response_wrapper(
+            on_ramps.apply,
+        )
+        self.edit = to_streamed_response_wrapper(
+            on_ramps.edit,
+        )
+        self.export = to_custom_streamed_response_wrapper(
+            on_ramps.export,
+            StreamedBinaryAPIResponse,
+        )
+        self.get = to_streamed_response_wrapper(
+            on_ramps.get,
+        )
+        self.plan = to_streamed_response_wrapper(
+            on_ramps.plan,
+        )
+
+    @cached_property
+    def address_spaces(self) -> AddressSpacesResourceWithStreamingResponse:
+        return AddressSpacesResourceWithStreamingResponse(self._on_ramps.address_spaces)
+
+
+class AsyncOnRampsResourceWithStreamingResponse:
+    def __init__(self, on_ramps: AsyncOnRampsResource) -> None:
+        self._on_ramps = on_ramps
+
+        self.create = async_to_streamed_response_wrapper(
+            on_ramps.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            on_ramps.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            on_ramps.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            on_ramps.delete,
+        )
+        self.apply = async_to_streamed_response_wrapper(
+            on_ramps.apply,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            on_ramps.edit,
+        )
+        self.export = async_to_custom_streamed_response_wrapper(
+            on_ramps.export,
+            AsyncStreamedBinaryAPIResponse,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            on_ramps.get,
+        )
+        self.plan = async_to_streamed_response_wrapper(
+            on_ramps.plan,
+        )
+
+    @cached_property
+    def address_spaces(self) -> AsyncAddressSpacesResourceWithStreamingResponse:
+        return AsyncAddressSpacesResourceWithStreamingResponse(self._on_ramps.address_spaces)
diff --git a/src/cloudflare/resources/magic_cloud_networking/resources.py b/src/cloudflare/resources/magic_cloud_networking/resources.py
new file mode 100644
index 00000000000..a6fa0be26aa
--- /dev/null
+++ b/src/cloudflare/resources/magic_cloud_networking/resources.py
@@ -0,0 +1,831 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    BinaryAPIResponse,
+    AsyncBinaryAPIResponse,
+    StreamedBinaryAPIResponse,
+    AsyncStreamedBinaryAPIResponse,
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    to_custom_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+    to_custom_streamed_response_wrapper,
+    async_to_custom_raw_response_wrapper,
+    async_to_custom_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.magic_cloud_networking import (
+    resource_get_params,
+    resource_list_params,
+    resource_export_params,
+    resource_policy_preview_params,
+)
+from ...types.magic_cloud_networking.resource_get_response import ResourceGetResponse
+from ...types.magic_cloud_networking.resource_list_response import ResourceListResponse
+from ...types.magic_cloud_networking.resource_policy_preview_response import ResourcePolicyPreviewResponse
+
+__all__ = ["ResourcesResource", "AsyncResourcesResource"]
+
+
+class ResourcesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ResourcesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ResourcesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ResourcesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ResourcesResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        cloudflare: bool | Omit = omit,
+        desc: bool | Omit = omit,
+        managed: bool | Omit = omit,
+        order_by: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        provider_id: str | Omit = omit,
+        region: str | Omit = omit,
+        resource_group: str | Omit = omit,
+        resource_id: SequenceNotStr[str] | Omit = omit,
+        resource_type: List[
+            Literal[
+                "aws_customer_gateway",
+                "aws_egress_only_internet_gateway",
+                "aws_internet_gateway",
+                "aws_instance",
+                "aws_network_interface",
+                "aws_route",
+                "aws_route_table",
+                "aws_route_table_association",
+                "aws_subnet",
+                "aws_vpc",
+                "aws_vpc_ipv4_cidr_block_association",
+                "aws_vpn_connection",
+                "aws_vpn_connection_route",
+                "aws_vpn_gateway",
+                "aws_security_group",
+                "aws_vpc_security_group_ingress_rule",
+                "aws_vpc_security_group_egress_rule",
+                "aws_ec2_managed_prefix_list",
+                "aws_ec2_transit_gateway",
+                "aws_ec2_transit_gateway_prefix_list_reference",
+                "aws_ec2_transit_gateway_vpc_attachment",
+                "azurerm_application_security_group",
+                "azurerm_lb",
+                "azurerm_lb_backend_address_pool",
+                "azurerm_lb_nat_pool",
+                "azurerm_lb_nat_rule",
+                "azurerm_lb_rule",
+                "azurerm_local_network_gateway",
+                "azurerm_network_interface",
+                "azurerm_network_interface_application_security_group_association",
+                "azurerm_network_interface_backend_address_pool_association",
+                "azurerm_network_interface_security_group_association",
+                "azurerm_network_security_group",
+                "azurerm_public_ip",
+                "azurerm_route",
+                "azurerm_route_table",
+                "azurerm_subnet",
+                "azurerm_subnet_route_table_association",
+                "azurerm_virtual_machine",
+                "azurerm_virtual_network_gateway_connection",
+                "azurerm_virtual_network",
+                "azurerm_virtual_network_gateway",
+                "google_compute_network",
+                "google_compute_subnetwork",
+                "google_compute_vpn_gateway",
+                "google_compute_vpn_tunnel",
+                "google_compute_route",
+                "google_compute_address",
+                "google_compute_global_address",
+                "google_compute_router",
+                "google_compute_interconnect_attachment",
+                "google_compute_ha_vpn_gateway",
+                "google_compute_forwarding_rule",
+                "google_compute_network_firewall_policy",
+                "google_compute_network_firewall_policy_rule",
+                "cloudflare_static_route",
+                "cloudflare_ipsec_tunnel",
+            ]
+        ]
+        | Omit = omit,
+        search: SequenceNotStr[str] | Omit = omit,
+        v2: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[ResourceListResponse]:
+        """
+        List resources in the Resource Catalog (Closed Beta).
+
+        Args:
+          order_by: One of ["id", "resource_type", "region"].
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/magic/cloud/resources",
+            page=SyncV4PagePaginationArray[ResourceListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "cloudflare": cloudflare,
+                        "desc": desc,
+                        "managed": managed,
+                        "order_by": order_by,
+                        "page": page,
+                        "per_page": per_page,
+                        "provider_id": provider_id,
+                        "region": region,
+                        "resource_group": resource_group,
+                        "resource_id": resource_id,
+                        "resource_type": resource_type,
+                        "search": search,
+                        "v2": v2,
+                    },
+                    resource_list_params.ResourceListParams,
+                ),
+            ),
+            model=ResourceListResponse,
+        )
+
+    def export(
+        self,
+        *,
+        account_id: str,
+        desc: bool | Omit = omit,
+        order_by: str | Omit = omit,
+        provider_id: str | Omit = omit,
+        region: str | Omit = omit,
+        resource_group: str | Omit = omit,
+        resource_id: SequenceNotStr[str] | Omit = omit,
+        resource_type: List[
+            Literal[
+                "aws_customer_gateway",
+                "aws_egress_only_internet_gateway",
+                "aws_internet_gateway",
+                "aws_instance",
+                "aws_network_interface",
+                "aws_route",
+                "aws_route_table",
+                "aws_route_table_association",
+                "aws_subnet",
+                "aws_vpc",
+                "aws_vpc_ipv4_cidr_block_association",
+                "aws_vpn_connection",
+                "aws_vpn_connection_route",
+                "aws_vpn_gateway",
+                "aws_security_group",
+                "aws_vpc_security_group_ingress_rule",
+                "aws_vpc_security_group_egress_rule",
+                "aws_ec2_managed_prefix_list",
+                "aws_ec2_transit_gateway",
+                "aws_ec2_transit_gateway_prefix_list_reference",
+                "aws_ec2_transit_gateway_vpc_attachment",
+                "azurerm_application_security_group",
+                "azurerm_lb",
+                "azurerm_lb_backend_address_pool",
+                "azurerm_lb_nat_pool",
+                "azurerm_lb_nat_rule",
+                "azurerm_lb_rule",
+                "azurerm_local_network_gateway",
+                "azurerm_network_interface",
+                "azurerm_network_interface_application_security_group_association",
+                "azurerm_network_interface_backend_address_pool_association",
+                "azurerm_network_interface_security_group_association",
+                "azurerm_network_security_group",
+                "azurerm_public_ip",
+                "azurerm_route",
+                "azurerm_route_table",
+                "azurerm_subnet",
+                "azurerm_subnet_route_table_association",
+                "azurerm_virtual_machine",
+                "azurerm_virtual_network_gateway_connection",
+                "azurerm_virtual_network",
+                "azurerm_virtual_network_gateway",
+                "google_compute_network",
+                "google_compute_subnetwork",
+                "google_compute_vpn_gateway",
+                "google_compute_vpn_tunnel",
+                "google_compute_route",
+                "google_compute_address",
+                "google_compute_global_address",
+                "google_compute_router",
+                "google_compute_interconnect_attachment",
+                "google_compute_ha_vpn_gateway",
+                "google_compute_forwarding_rule",
+                "google_compute_network_firewall_policy",
+                "google_compute_network_firewall_policy_rule",
+                "cloudflare_static_route",
+                "cloudflare_ipsec_tunnel",
+            ]
+        ]
+        | Omit = omit,
+        search: SequenceNotStr[str] | Omit = omit,
+        v2: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BinaryAPIResponse:
+        """
+        Export resources in the Resource Catalog as a JSON file (Closed Beta).
+
+        Args:
+          order_by: One of ["id", "resource_type", "region"].
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {"Accept": "application/octet-stream", **(extra_headers or {})}
+        return self._get(
+            f"/accounts/{account_id}/magic/cloud/resources/export",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "desc": desc,
+                        "order_by": order_by,
+                        "provider_id": provider_id,
+                        "region": region,
+                        "resource_group": resource_group,
+                        "resource_id": resource_id,
+                        "resource_type": resource_type,
+                        "search": search,
+                        "v2": v2,
+                    },
+                    resource_export_params.ResourceExportParams,
+                ),
+            ),
+            cast_to=BinaryAPIResponse,
+        )
+
+    def get(
+        self,
+        resource_id: str,
+        *,
+        account_id: str,
+        v2: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ResourceGetResponse:
+        """
+        Read an resource from the Resource Catalog (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not resource_id:
+            raise ValueError(f"Expected a non-empty value for `resource_id` but received {resource_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/magic/cloud/resources/{resource_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"v2": v2}, resource_get_params.ResourceGetParams),
+                post_parser=ResultWrapper[ResourceGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ResourceGetResponse], ResultWrapper[ResourceGetResponse]),
+        )
+
+    def policy_preview(
+        self,
+        *,
+        account_id: str,
+        policy: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Preview Rego query result against the latest resource catalog (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/magic/cloud/resources/policy-preview",
+            body=maybe_transform({"policy": policy}, resource_policy_preview_params.ResourcePolicyPreviewParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ResourcePolicyPreviewResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class AsyncResourcesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncResourcesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncResourcesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncResourcesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncResourcesResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        cloudflare: bool | Omit = omit,
+        desc: bool | Omit = omit,
+        managed: bool | Omit = omit,
+        order_by: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        provider_id: str | Omit = omit,
+        region: str | Omit = omit,
+        resource_group: str | Omit = omit,
+        resource_id: SequenceNotStr[str] | Omit = omit,
+        resource_type: List[
+            Literal[
+                "aws_customer_gateway",
+                "aws_egress_only_internet_gateway",
+                "aws_internet_gateway",
+                "aws_instance",
+                "aws_network_interface",
+                "aws_route",
+                "aws_route_table",
+                "aws_route_table_association",
+                "aws_subnet",
+                "aws_vpc",
+                "aws_vpc_ipv4_cidr_block_association",
+                "aws_vpn_connection",
+                "aws_vpn_connection_route",
+                "aws_vpn_gateway",
+                "aws_security_group",
+                "aws_vpc_security_group_ingress_rule",
+                "aws_vpc_security_group_egress_rule",
+                "aws_ec2_managed_prefix_list",
+                "aws_ec2_transit_gateway",
+                "aws_ec2_transit_gateway_prefix_list_reference",
+                "aws_ec2_transit_gateway_vpc_attachment",
+                "azurerm_application_security_group",
+                "azurerm_lb",
+                "azurerm_lb_backend_address_pool",
+                "azurerm_lb_nat_pool",
+                "azurerm_lb_nat_rule",
+                "azurerm_lb_rule",
+                "azurerm_local_network_gateway",
+                "azurerm_network_interface",
+                "azurerm_network_interface_application_security_group_association",
+                "azurerm_network_interface_backend_address_pool_association",
+                "azurerm_network_interface_security_group_association",
+                "azurerm_network_security_group",
+                "azurerm_public_ip",
+                "azurerm_route",
+                "azurerm_route_table",
+                "azurerm_subnet",
+                "azurerm_subnet_route_table_association",
+                "azurerm_virtual_machine",
+                "azurerm_virtual_network_gateway_connection",
+                "azurerm_virtual_network",
+                "azurerm_virtual_network_gateway",
+                "google_compute_network",
+                "google_compute_subnetwork",
+                "google_compute_vpn_gateway",
+                "google_compute_vpn_tunnel",
+                "google_compute_route",
+                "google_compute_address",
+                "google_compute_global_address",
+                "google_compute_router",
+                "google_compute_interconnect_attachment",
+                "google_compute_ha_vpn_gateway",
+                "google_compute_forwarding_rule",
+                "google_compute_network_firewall_policy",
+                "google_compute_network_firewall_policy_rule",
+                "cloudflare_static_route",
+                "cloudflare_ipsec_tunnel",
+            ]
+        ]
+        | Omit = omit,
+        search: SequenceNotStr[str] | Omit = omit,
+        v2: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ResourceListResponse, AsyncV4PagePaginationArray[ResourceListResponse]]:
+        """
+        List resources in the Resource Catalog (Closed Beta).
+
+        Args:
+          order_by: One of ["id", "resource_type", "region"].
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/magic/cloud/resources",
+            page=AsyncV4PagePaginationArray[ResourceListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "cloudflare": cloudflare,
+                        "desc": desc,
+                        "managed": managed,
+                        "order_by": order_by,
+                        "page": page,
+                        "per_page": per_page,
+                        "provider_id": provider_id,
+                        "region": region,
+                        "resource_group": resource_group,
+                        "resource_id": resource_id,
+                        "resource_type": resource_type,
+                        "search": search,
+                        "v2": v2,
+                    },
+                    resource_list_params.ResourceListParams,
+                ),
+            ),
+            model=ResourceListResponse,
+        )
+
+    async def export(
+        self,
+        *,
+        account_id: str,
+        desc: bool | Omit = omit,
+        order_by: str | Omit = omit,
+        provider_id: str | Omit = omit,
+        region: str | Omit = omit,
+        resource_group: str | Omit = omit,
+        resource_id: SequenceNotStr[str] | Omit = omit,
+        resource_type: List[
+            Literal[
+                "aws_customer_gateway",
+                "aws_egress_only_internet_gateway",
+                "aws_internet_gateway",
+                "aws_instance",
+                "aws_network_interface",
+                "aws_route",
+                "aws_route_table",
+                "aws_route_table_association",
+                "aws_subnet",
+                "aws_vpc",
+                "aws_vpc_ipv4_cidr_block_association",
+                "aws_vpn_connection",
+                "aws_vpn_connection_route",
+                "aws_vpn_gateway",
+                "aws_security_group",
+                "aws_vpc_security_group_ingress_rule",
+                "aws_vpc_security_group_egress_rule",
+                "aws_ec2_managed_prefix_list",
+                "aws_ec2_transit_gateway",
+                "aws_ec2_transit_gateway_prefix_list_reference",
+                "aws_ec2_transit_gateway_vpc_attachment",
+                "azurerm_application_security_group",
+                "azurerm_lb",
+                "azurerm_lb_backend_address_pool",
+                "azurerm_lb_nat_pool",
+                "azurerm_lb_nat_rule",
+                "azurerm_lb_rule",
+                "azurerm_local_network_gateway",
+                "azurerm_network_interface",
+                "azurerm_network_interface_application_security_group_association",
+                "azurerm_network_interface_backend_address_pool_association",
+                "azurerm_network_interface_security_group_association",
+                "azurerm_network_security_group",
+                "azurerm_public_ip",
+                "azurerm_route",
+                "azurerm_route_table",
+                "azurerm_subnet",
+                "azurerm_subnet_route_table_association",
+                "azurerm_virtual_machine",
+                "azurerm_virtual_network_gateway_connection",
+                "azurerm_virtual_network",
+                "azurerm_virtual_network_gateway",
+                "google_compute_network",
+                "google_compute_subnetwork",
+                "google_compute_vpn_gateway",
+                "google_compute_vpn_tunnel",
+                "google_compute_route",
+                "google_compute_address",
+                "google_compute_global_address",
+                "google_compute_router",
+                "google_compute_interconnect_attachment",
+                "google_compute_ha_vpn_gateway",
+                "google_compute_forwarding_rule",
+                "google_compute_network_firewall_policy",
+                "google_compute_network_firewall_policy_rule",
+                "cloudflare_static_route",
+                "cloudflare_ipsec_tunnel",
+            ]
+        ]
+        | Omit = omit,
+        search: SequenceNotStr[str] | Omit = omit,
+        v2: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncBinaryAPIResponse:
+        """
+        Export resources in the Resource Catalog as a JSON file (Closed Beta).
+
+        Args:
+          order_by: One of ["id", "resource_type", "region"].
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {"Accept": "application/octet-stream", **(extra_headers or {})}
+        return await self._get(
+            f"/accounts/{account_id}/magic/cloud/resources/export",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "desc": desc,
+                        "order_by": order_by,
+                        "provider_id": provider_id,
+                        "region": region,
+                        "resource_group": resource_group,
+                        "resource_id": resource_id,
+                        "resource_type": resource_type,
+                        "search": search,
+                        "v2": v2,
+                    },
+                    resource_export_params.ResourceExportParams,
+                ),
+            ),
+            cast_to=AsyncBinaryAPIResponse,
+        )
+
+    async def get(
+        self,
+        resource_id: str,
+        *,
+        account_id: str,
+        v2: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ResourceGetResponse:
+        """
+        Read an resource from the Resource Catalog (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not resource_id:
+            raise ValueError(f"Expected a non-empty value for `resource_id` but received {resource_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/magic/cloud/resources/{resource_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"v2": v2}, resource_get_params.ResourceGetParams),
+                post_parser=ResultWrapper[ResourceGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ResourceGetResponse], ResultWrapper[ResourceGetResponse]),
+        )
+
+    async def policy_preview(
+        self,
+        *,
+        account_id: str,
+        policy: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Preview Rego query result against the latest resource catalog (Closed Beta).
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/magic/cloud/resources/policy-preview",
+            body=await async_maybe_transform(
+                {"policy": policy}, resource_policy_preview_params.ResourcePolicyPreviewParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ResourcePolicyPreviewResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class ResourcesResourceWithRawResponse:
+    def __init__(self, resources: ResourcesResource) -> None:
+        self._resources = resources
+
+        self.list = to_raw_response_wrapper(
+            resources.list,
+        )
+        self.export = to_custom_raw_response_wrapper(
+            resources.export,
+            BinaryAPIResponse,
+        )
+        self.get = to_raw_response_wrapper(
+            resources.get,
+        )
+        self.policy_preview = to_raw_response_wrapper(
+            resources.policy_preview,
+        )
+
+
+class AsyncResourcesResourceWithRawResponse:
+    def __init__(self, resources: AsyncResourcesResource) -> None:
+        self._resources = resources
+
+        self.list = async_to_raw_response_wrapper(
+            resources.list,
+        )
+        self.export = async_to_custom_raw_response_wrapper(
+            resources.export,
+            AsyncBinaryAPIResponse,
+        )
+        self.get = async_to_raw_response_wrapper(
+            resources.get,
+        )
+        self.policy_preview = async_to_raw_response_wrapper(
+            resources.policy_preview,
+        )
+
+
+class ResourcesResourceWithStreamingResponse:
+    def __init__(self, resources: ResourcesResource) -> None:
+        self._resources = resources
+
+        self.list = to_streamed_response_wrapper(
+            resources.list,
+        )
+        self.export = to_custom_streamed_response_wrapper(
+            resources.export,
+            StreamedBinaryAPIResponse,
+        )
+        self.get = to_streamed_response_wrapper(
+            resources.get,
+        )
+        self.policy_preview = to_streamed_response_wrapper(
+            resources.policy_preview,
+        )
+
+
+class AsyncResourcesResourceWithStreamingResponse:
+    def __init__(self, resources: AsyncResourcesResource) -> None:
+        self._resources = resources
+
+        self.list = async_to_streamed_response_wrapper(
+            resources.list,
+        )
+        self.export = async_to_custom_streamed_response_wrapper(
+            resources.export,
+            AsyncStreamedBinaryAPIResponse,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            resources.get,
+        )
+        self.policy_preview = async_to_streamed_response_wrapper(
+            resources.policy_preview,
+        )
diff --git a/src/cloudflare/resources/magic_network_monitoring/__init__.py b/src/cloudflare/resources/magic_network_monitoring/__init__.py
index ddc8bc54f41..6d9edbdda33 100644
--- a/src/cloudflare/resources/magic_network_monitoring/__init__.py
+++ b/src/cloudflare/resources/magic_network_monitoring/__init__.py
@@ -16,6 +16,14 @@
     ConfigsResourceWithStreamingResponse,
     AsyncConfigsResourceWithStreamingResponse,
 )
+from .vpc_flows import (
+    VPCFlowsResource,
+    AsyncVPCFlowsResource,
+    VPCFlowsResourceWithRawResponse,
+    AsyncVPCFlowsResourceWithRawResponse,
+    VPCFlowsResourceWithStreamingResponse,
+    AsyncVPCFlowsResourceWithStreamingResponse,
+)
 from .magic_network_monitoring import (
     MagicNetworkMonitoringResource,
     AsyncMagicNetworkMonitoringResource,
@@ -26,6 +34,12 @@
 )
 
 __all__ = [
+    "VPCFlowsResource",
+    "AsyncVPCFlowsResource",
+    "VPCFlowsResourceWithRawResponse",
+    "AsyncVPCFlowsResourceWithRawResponse",
+    "VPCFlowsResourceWithStreamingResponse",
+    "AsyncVPCFlowsResourceWithStreamingResponse",
     "ConfigsResource",
     "AsyncConfigsResource",
     "ConfigsResourceWithRawResponse",
diff --git a/src/cloudflare/resources/magic_network_monitoring/configs/configs.py b/src/cloudflare/resources/magic_network_monitoring/configs/configs.py
index ea4fc1e11d7..217848dca6a 100644
--- a/src/cloudflare/resources/magic_network_monitoring/configs/configs.py
+++ b/src/cloudflare/resources/magic_network_monitoring/configs/configs.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Type, cast
+from typing import Type, Iterable, cast
 
 import httpx
 
@@ -14,11 +14,8 @@
     FullResourceWithStreamingResponse,
     AsyncFullResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -42,28 +39,47 @@ def full(self) -> FullResource:
 
     @cached_property
     def with_raw_response(self) -> ConfigsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ConfigsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ConfigsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ConfigsResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        body: object,
+        default_sampling: float,
+        name: str,
+        router_ips: SequenceNotStr[str] | Omit = omit,
+        warp_devices: Iterable[config_create_params.WARPDevice] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Configuration:
         """
         Create a new network monitoring configuration.
 
         Args:
+          default_sampling: Fallback sampling rate of flow messages being sent in packets per second. This
+              should match the packet sampling rate configured on the router.
+
+          name: The account name.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -76,7 +92,15 @@ def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._post(
             f"/accounts/{account_id}/mnm/config",
-            body=maybe_transform(body, config_create_params.ConfigCreateParams),
+            body=maybe_transform(
+                {
+                    "default_sampling": default_sampling,
+                    "name": name,
+                    "router_ips": router_ips,
+                    "warp_devices": warp_devices,
+                },
+                config_create_params.ConfigCreateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -91,19 +115,27 @@ def update(
         self,
         *,
         account_id: str,
-        body: object,
+        default_sampling: float,
+        name: str,
+        router_ips: SequenceNotStr[str] | Omit = omit,
+        warp_devices: Iterable[config_update_params.WARPDevice] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Configuration:
         """
         Update an existing network monitoring configuration, requires the entire
         configuration to be updated at once.
 
         Args:
+          default_sampling: Fallback sampling rate of flow messages being sent in packets per second. This
+              should match the packet sampling rate configured on the router.
+
+          name: The account name.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -116,7 +148,15 @@ def update(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._put(
             f"/accounts/{account_id}/mnm/config",
-            body=maybe_transform(body, config_update_params.ConfigUpdateParams),
+            body=maybe_transform(
+                {
+                    "default_sampling": default_sampling,
+                    "name": name,
+                    "router_ips": router_ips,
+                    "warp_devices": warp_devices,
+                },
+                config_update_params.ConfigUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -136,7 +176,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Configuration:
         """
         Delete an existing network monitoring configuration.
@@ -168,18 +208,26 @@ def edit(
         self,
         *,
         account_id: str,
-        body: object,
+        default_sampling: float | Omit = omit,
+        name: str | Omit = omit,
+        router_ips: SequenceNotStr[str] | Omit = omit,
+        warp_devices: Iterable[config_edit_params.WARPDevice] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Configuration:
         """
         Update fields in an existing network monitoring configuration.
 
         Args:
+          default_sampling: Fallback sampling rate of flow messages being sent in packets per second. This
+              should match the packet sampling rate configured on the router.
+
+          name: The account name.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -192,7 +240,15 @@ def edit(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._patch(
             f"/accounts/{account_id}/mnm/config",
-            body=maybe_transform(body, config_edit_params.ConfigEditParams),
+            body=maybe_transform(
+                {
+                    "default_sampling": default_sampling,
+                    "name": name,
+                    "router_ips": router_ips,
+                    "warp_devices": warp_devices,
+                },
+                config_edit_params.ConfigEditParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -212,10 +268,10 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Configuration:
         """
-        Lists default sampling and router IPs for account.
+        Lists default sampling, router IPs and warp devices for account.
 
         Args:
           extra_headers: Send extra headers
@@ -248,28 +304,47 @@ def full(self) -> AsyncFullResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncConfigsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncConfigsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncConfigsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncConfigsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        body: object,
+        default_sampling: float,
+        name: str,
+        router_ips: SequenceNotStr[str] | Omit = omit,
+        warp_devices: Iterable[config_create_params.WARPDevice] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Configuration:
         """
         Create a new network monitoring configuration.
 
         Args:
+          default_sampling: Fallback sampling rate of flow messages being sent in packets per second. This
+              should match the packet sampling rate configured on the router.
+
+          name: The account name.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -282,7 +357,15 @@ async def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._post(
             f"/accounts/{account_id}/mnm/config",
-            body=await async_maybe_transform(body, config_create_params.ConfigCreateParams),
+            body=await async_maybe_transform(
+                {
+                    "default_sampling": default_sampling,
+                    "name": name,
+                    "router_ips": router_ips,
+                    "warp_devices": warp_devices,
+                },
+                config_create_params.ConfigCreateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -297,19 +380,27 @@ async def update(
         self,
         *,
         account_id: str,
-        body: object,
+        default_sampling: float,
+        name: str,
+        router_ips: SequenceNotStr[str] | Omit = omit,
+        warp_devices: Iterable[config_update_params.WARPDevice] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Configuration:
         """
         Update an existing network monitoring configuration, requires the entire
         configuration to be updated at once.
 
         Args:
+          default_sampling: Fallback sampling rate of flow messages being sent in packets per second. This
+              should match the packet sampling rate configured on the router.
+
+          name: The account name.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -322,7 +413,15 @@ async def update(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._put(
             f"/accounts/{account_id}/mnm/config",
-            body=await async_maybe_transform(body, config_update_params.ConfigUpdateParams),
+            body=await async_maybe_transform(
+                {
+                    "default_sampling": default_sampling,
+                    "name": name,
+                    "router_ips": router_ips,
+                    "warp_devices": warp_devices,
+                },
+                config_update_params.ConfigUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -342,7 +441,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Configuration:
         """
         Delete an existing network monitoring configuration.
@@ -374,18 +473,26 @@ async def edit(
         self,
         *,
         account_id: str,
-        body: object,
+        default_sampling: float | Omit = omit,
+        name: str | Omit = omit,
+        router_ips: SequenceNotStr[str] | Omit = omit,
+        warp_devices: Iterable[config_edit_params.WARPDevice] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Configuration:
         """
         Update fields in an existing network monitoring configuration.
 
         Args:
+          default_sampling: Fallback sampling rate of flow messages being sent in packets per second. This
+              should match the packet sampling rate configured on the router.
+
+          name: The account name.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -398,7 +505,15 @@ async def edit(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._patch(
             f"/accounts/{account_id}/mnm/config",
-            body=await async_maybe_transform(body, config_edit_params.ConfigEditParams),
+            body=await async_maybe_transform(
+                {
+                    "default_sampling": default_sampling,
+                    "name": name,
+                    "router_ips": router_ips,
+                    "warp_devices": warp_devices,
+                },
+                config_edit_params.ConfigEditParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -418,10 +533,10 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Configuration:
         """
-        Lists default sampling and router IPs for account.
+        Lists default sampling, router IPs and warp devices for account.
 
         Args:
           extra_headers: Send extra headers
diff --git a/src/cloudflare/resources/magic_network_monitoring/configs/full.py b/src/cloudflare/resources/magic_network_monitoring/configs/full.py
index 3e7c2df80e9..c6ff6036bb7 100644
--- a/src/cloudflare/resources/magic_network_monitoring/configs/full.py
+++ b/src/cloudflare/resources/magic_network_monitoring/configs/full.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -25,10 +25,21 @@
 class FullResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> FullResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return FullResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> FullResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return FullResourceWithStreamingResponse(self)
 
     def get(
@@ -40,10 +51,10 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Configuration:
         """
-        Lists default sampling, router IPs, and rules for account.
+        Lists default sampling, router IPs, warp devices, and rules for account.
 
         Args:
           extra_headers: Send extra headers
@@ -72,10 +83,21 @@ def get(
 class AsyncFullResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncFullResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncFullResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncFullResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncFullResourceWithStreamingResponse(self)
 
     async def get(
@@ -87,10 +109,10 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Configuration:
         """
-        Lists default sampling, router IPs, and rules for account.
+        Lists default sampling, router IPs, warp devices, and rules for account.
 
         Args:
           extra_headers: Send extra headers
diff --git a/src/cloudflare/resources/magic_network_monitoring/magic_network_monitoring.py b/src/cloudflare/resources/magic_network_monitoring/magic_network_monitoring.py
index 528cbaa79ef..67de552c10b 100644
--- a/src/cloudflare/resources/magic_network_monitoring/magic_network_monitoring.py
+++ b/src/cloudflare/resources/magic_network_monitoring/magic_network_monitoring.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .rules import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .rules.rules import (
     RulesResource,
     AsyncRulesResource,
     RulesResourceWithRawResponse,
@@ -10,7 +12,7 @@
     RulesResourceWithStreamingResponse,
     AsyncRulesResourceWithStreamingResponse,
 )
-from .configs import (
+from .configs.configs import (
     ConfigsResource,
     AsyncConfigsResource,
     ConfigsResourceWithRawResponse,
@@ -18,15 +20,23 @@
     ConfigsResourceWithStreamingResponse,
     AsyncConfigsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .rules.rules import RulesResource, AsyncRulesResource
-from .configs.configs import ConfigsResource, AsyncConfigsResource
+from .vpc_flows.vpc_flows import (
+    VPCFlowsResource,
+    AsyncVPCFlowsResource,
+    VPCFlowsResourceWithRawResponse,
+    AsyncVPCFlowsResourceWithRawResponse,
+    VPCFlowsResourceWithStreamingResponse,
+    AsyncVPCFlowsResourceWithStreamingResponse,
+)
 
 __all__ = ["MagicNetworkMonitoringResource", "AsyncMagicNetworkMonitoringResource"]
 
 
 class MagicNetworkMonitoringResource(SyncAPIResource):
+    @cached_property
+    def vpc_flows(self) -> VPCFlowsResource:
+        return VPCFlowsResource(self._client)
+
     @cached_property
     def configs(self) -> ConfigsResource:
         return ConfigsResource(self._client)
@@ -37,14 +47,29 @@ def rules(self) -> RulesResource:
 
     @cached_property
     def with_raw_response(self) -> MagicNetworkMonitoringResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return MagicNetworkMonitoringResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> MagicNetworkMonitoringResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return MagicNetworkMonitoringResourceWithStreamingResponse(self)
 
 
 class AsyncMagicNetworkMonitoringResource(AsyncAPIResource):
+    @cached_property
+    def vpc_flows(self) -> AsyncVPCFlowsResource:
+        return AsyncVPCFlowsResource(self._client)
+
     @cached_property
     def configs(self) -> AsyncConfigsResource:
         return AsyncConfigsResource(self._client)
@@ -55,10 +80,21 @@ def rules(self) -> AsyncRulesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncMagicNetworkMonitoringResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncMagicNetworkMonitoringResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncMagicNetworkMonitoringResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncMagicNetworkMonitoringResourceWithStreamingResponse(self)
 
 
@@ -66,6 +102,10 @@ class MagicNetworkMonitoringResourceWithRawResponse:
     def __init__(self, magic_network_monitoring: MagicNetworkMonitoringResource) -> None:
         self._magic_network_monitoring = magic_network_monitoring
 
+    @cached_property
+    def vpc_flows(self) -> VPCFlowsResourceWithRawResponse:
+        return VPCFlowsResourceWithRawResponse(self._magic_network_monitoring.vpc_flows)
+
     @cached_property
     def configs(self) -> ConfigsResourceWithRawResponse:
         return ConfigsResourceWithRawResponse(self._magic_network_monitoring.configs)
@@ -79,6 +119,10 @@ class AsyncMagicNetworkMonitoringResourceWithRawResponse:
     def __init__(self, magic_network_monitoring: AsyncMagicNetworkMonitoringResource) -> None:
         self._magic_network_monitoring = magic_network_monitoring
 
+    @cached_property
+    def vpc_flows(self) -> AsyncVPCFlowsResourceWithRawResponse:
+        return AsyncVPCFlowsResourceWithRawResponse(self._magic_network_monitoring.vpc_flows)
+
     @cached_property
     def configs(self) -> AsyncConfigsResourceWithRawResponse:
         return AsyncConfigsResourceWithRawResponse(self._magic_network_monitoring.configs)
@@ -92,6 +136,10 @@ class MagicNetworkMonitoringResourceWithStreamingResponse:
     def __init__(self, magic_network_monitoring: MagicNetworkMonitoringResource) -> None:
         self._magic_network_monitoring = magic_network_monitoring
 
+    @cached_property
+    def vpc_flows(self) -> VPCFlowsResourceWithStreamingResponse:
+        return VPCFlowsResourceWithStreamingResponse(self._magic_network_monitoring.vpc_flows)
+
     @cached_property
     def configs(self) -> ConfigsResourceWithStreamingResponse:
         return ConfigsResourceWithStreamingResponse(self._magic_network_monitoring.configs)
@@ -105,6 +153,10 @@ class AsyncMagicNetworkMonitoringResourceWithStreamingResponse:
     def __init__(self, magic_network_monitoring: AsyncMagicNetworkMonitoringResource) -> None:
         self._magic_network_monitoring = magic_network_monitoring
 
+    @cached_property
+    def vpc_flows(self) -> AsyncVPCFlowsResourceWithStreamingResponse:
+        return AsyncVPCFlowsResourceWithStreamingResponse(self._magic_network_monitoring.vpc_flows)
+
     @cached_property
     def configs(self) -> AsyncConfigsResourceWithStreamingResponse:
         return AsyncConfigsResourceWithStreamingResponse(self._magic_network_monitoring.configs)
diff --git a/src/cloudflare/resources/magic_network_monitoring/rules/advertisements.py b/src/cloudflare/resources/magic_network_monitoring/rules/advertisements.py
index b50a63f2784..96590f760c5 100644
--- a/src/cloudflare/resources/magic_network_monitoring/rules/advertisements.py
+++ b/src/cloudflare/resources/magic_network_monitoring/rules/advertisements.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -30,10 +27,21 @@
 class AdvertisementsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AdvertisementsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AdvertisementsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AdvertisementsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AdvertisementsResourceWithStreamingResponse(self)
 
     def edit(
@@ -47,7 +55,7 @@ def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Advertisement]:
         """Update advertisement for rule.
 
@@ -85,10 +93,21 @@ def edit(
 class AsyncAdvertisementsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncAdvertisementsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAdvertisementsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAdvertisementsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAdvertisementsResourceWithStreamingResponse(self)
 
     async def edit(
@@ -102,7 +121,7 @@ async def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Advertisement]:
         """Update advertisement for rule.
 
diff --git a/src/cloudflare/resources/magic_network_monitoring/rules/rules.py b/src/cloudflare/resources/magic_network_monitoring/rules/rules.py
index d963c020ce0..ccd2abdc545 100644
--- a/src/cloudflare/resources/magic_network_monitoring/rules/rules.py
+++ b/src/cloudflare/resources/magic_network_monitoring/rules/rules.py
@@ -3,14 +3,12 @@
 from __future__ import annotations
 
 from typing import Type, Optional, cast
+from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -43,23 +41,39 @@ def advertisements(self) -> AdvertisementsResource:
 
     @cached_property
     def with_raw_response(self) -> RulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RulesResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        body: object,
+        duration: Literal["1m", "5m", "10m", "15m", "20m", "30m", "45m", "60m"],
+        name: str,
+        automatic_advertisement: Optional[bool] | Omit = omit,
+        bandwidth: float | Omit = omit,
+        packet_threshold: float | Omit = omit,
+        prefixes: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MagicNetworkMonitoringRule]:
         """Create network monitoring rules for account.
 
@@ -67,6 +81,24 @@ def create(
         single rule per API request.
 
         Args:
+          duration: The amount of time that the rule threshold must be exceeded to send an alert
+              notification. The final value must be equivalent to one of the following 8
+              values ["1m","5m","10m","15m","20m","30m","45m","60m"].
+
+          name: The name of the rule. Must be unique. Supports characters A-Z, a-z, 0-9,
+              underscore (\\__), dash (-), period (.), and tilde (~). You can’t have a space in
+              the rule name. Max 256 characters.
+
+          automatic_advertisement: Toggle on if you would like Cloudflare to automatically advertise the IP
+              Prefixes within the rule via Magic Transit when the rule is triggered. Only
+              available for users of Magic Transit.
+
+          bandwidth: The number of bits per second for the rule. When this value is exceeded for the
+              set duration, an alert notification is sent. Minimum of 1 and no maximum.
+
+          packet_threshold: The number of packets per second for the rule. When this value is exceeded for
+              the set duration, an alert notification is sent. Minimum of 1 and no maximum.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -79,7 +111,17 @@ def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._post(
             f"/accounts/{account_id}/mnm/rules",
-            body=maybe_transform(body, rule_create_params.RuleCreateParams),
+            body=maybe_transform(
+                {
+                    "duration": duration,
+                    "name": name,
+                    "automatic_advertisement": automatic_advertisement,
+                    "bandwidth": bandwidth,
+                    "packet_threshold": packet_threshold,
+                    "prefixes": prefixes,
+                },
+                rule_create_params.RuleCreateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -94,18 +136,44 @@ def update(
         self,
         *,
         account_id: str,
-        body: object,
+        duration: Literal["1m", "5m", "10m", "15m", "20m", "30m", "45m", "60m"],
+        name: str,
+        id: str | Omit = omit,
+        automatic_advertisement: Optional[bool] | Omit = omit,
+        bandwidth: float | Omit = omit,
+        packet_threshold: float | Omit = omit,
+        prefixes: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MagicNetworkMonitoringRule]:
         """
         Update network monitoring rules for account.
 
         Args:
+          duration: The amount of time that the rule threshold must be exceeded to send an alert
+              notification. The final value must be equivalent to one of the following 8
+              values ["1m","5m","10m","15m","20m","30m","45m","60m"].
+
+          name: The name of the rule. Must be unique. Supports characters A-Z, a-z, 0-9,
+              underscore (\\__), dash (-), period (.), and tilde (~). You can’t have a space in
+              the rule name. Max 256 characters.
+
+          id: The id of the rule. Must be unique.
+
+          automatic_advertisement: Toggle on if you would like Cloudflare to automatically advertise the IP
+              Prefixes within the rule via Magic Transit when the rule is triggered. Only
+              available for users of Magic Transit.
+
+          bandwidth: The number of bits per second for the rule. When this value is exceeded for the
+              set duration, an alert notification is sent. Minimum of 1 and no maximum.
+
+          packet_threshold: The number of packets per second for the rule. When this value is exceeded for
+              the set duration, an alert notification is sent. Minimum of 1 and no maximum.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -118,7 +186,18 @@ def update(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._put(
             f"/accounts/{account_id}/mnm/rules",
-            body=maybe_transform(body, rule_update_params.RuleUpdateParams),
+            body=maybe_transform(
+                {
+                    "duration": duration,
+                    "name": name,
+                    "id": id,
+                    "automatic_advertisement": automatic_advertisement,
+                    "bandwidth": bandwidth,
+                    "packet_threshold": packet_threshold,
+                    "prefixes": prefixes,
+                },
+                rule_update_params.RuleUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -138,7 +217,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Optional[MagicNetworkMonitoringRule]]:
         """
         Lists network monitoring rules for account.
@@ -173,7 +252,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MagicNetworkMonitoringRule]:
         """
         Delete a network monitoring rule for account.
@@ -210,13 +289,18 @@ def edit(
         rule_id: str,
         *,
         account_id: str,
-        body: object,
+        automatic_advertisement: Optional[bool] | Omit = omit,
+        bandwidth: float | Omit = omit,
+        duration: Literal["1m", "5m", "10m", "15m", "20m", "30m", "45m", "60m"] | Omit = omit,
+        name: str | Omit = omit,
+        packet_threshold: float | Omit = omit,
+        prefixes: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MagicNetworkMonitoringRule]:
         """
         Update a network monitoring rule for account.
@@ -224,6 +308,24 @@ def edit(
         Args:
           rule_id: The id of the rule. Must be unique.
 
+          automatic_advertisement: Toggle on if you would like Cloudflare to automatically advertise the IP
+              Prefixes within the rule via Magic Transit when the rule is triggered. Only
+              available for users of Magic Transit.
+
+          bandwidth: The number of bits per second for the rule. When this value is exceeded for the
+              set duration, an alert notification is sent. Minimum of 1 and no maximum.
+
+          duration: The amount of time that the rule threshold must be exceeded to send an alert
+              notification. The final value must be equivalent to one of the following 8
+              values ["1m","5m","10m","15m","20m","30m","45m","60m"].
+
+          name: The name of the rule. Must be unique. Supports characters A-Z, a-z, 0-9,
+              underscore (\\__), dash (-), period (.), and tilde (~). You can’t have a space in
+              the rule name. Max 256 characters.
+
+          packet_threshold: The number of packets per second for the rule. When this value is exceeded for
+              the set duration, an alert notification is sent. Minimum of 1 and no maximum.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -238,7 +340,17 @@ def edit(
             raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
         return self._patch(
             f"/accounts/{account_id}/mnm/rules/{rule_id}",
-            body=maybe_transform(body, rule_edit_params.RuleEditParams),
+            body=maybe_transform(
+                {
+                    "automatic_advertisement": automatic_advertisement,
+                    "bandwidth": bandwidth,
+                    "duration": duration,
+                    "name": name,
+                    "packet_threshold": packet_threshold,
+                    "prefixes": prefixes,
+                },
+                rule_edit_params.RuleEditParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -259,7 +371,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MagicNetworkMonitoringRule]:
         """
         List a single network monitoring rule for account.
@@ -299,23 +411,39 @@ def advertisements(self) -> AsyncAdvertisementsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncRulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRulesResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        body: object,
+        duration: Literal["1m", "5m", "10m", "15m", "20m", "30m", "45m", "60m"],
+        name: str,
+        automatic_advertisement: Optional[bool] | Omit = omit,
+        bandwidth: float | Omit = omit,
+        packet_threshold: float | Omit = omit,
+        prefixes: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MagicNetworkMonitoringRule]:
         """Create network monitoring rules for account.
 
@@ -323,6 +451,24 @@ async def create(
         single rule per API request.
 
         Args:
+          duration: The amount of time that the rule threshold must be exceeded to send an alert
+              notification. The final value must be equivalent to one of the following 8
+              values ["1m","5m","10m","15m","20m","30m","45m","60m"].
+
+          name: The name of the rule. Must be unique. Supports characters A-Z, a-z, 0-9,
+              underscore (\\__), dash (-), period (.), and tilde (~). You can’t have a space in
+              the rule name. Max 256 characters.
+
+          automatic_advertisement: Toggle on if you would like Cloudflare to automatically advertise the IP
+              Prefixes within the rule via Magic Transit when the rule is triggered. Only
+              available for users of Magic Transit.
+
+          bandwidth: The number of bits per second for the rule. When this value is exceeded for the
+              set duration, an alert notification is sent. Minimum of 1 and no maximum.
+
+          packet_threshold: The number of packets per second for the rule. When this value is exceeded for
+              the set duration, an alert notification is sent. Minimum of 1 and no maximum.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -335,7 +481,17 @@ async def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._post(
             f"/accounts/{account_id}/mnm/rules",
-            body=await async_maybe_transform(body, rule_create_params.RuleCreateParams),
+            body=await async_maybe_transform(
+                {
+                    "duration": duration,
+                    "name": name,
+                    "automatic_advertisement": automatic_advertisement,
+                    "bandwidth": bandwidth,
+                    "packet_threshold": packet_threshold,
+                    "prefixes": prefixes,
+                },
+                rule_create_params.RuleCreateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -350,18 +506,44 @@ async def update(
         self,
         *,
         account_id: str,
-        body: object,
+        duration: Literal["1m", "5m", "10m", "15m", "20m", "30m", "45m", "60m"],
+        name: str,
+        id: str | Omit = omit,
+        automatic_advertisement: Optional[bool] | Omit = omit,
+        bandwidth: float | Omit = omit,
+        packet_threshold: float | Omit = omit,
+        prefixes: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MagicNetworkMonitoringRule]:
         """
         Update network monitoring rules for account.
 
         Args:
+          duration: The amount of time that the rule threshold must be exceeded to send an alert
+              notification. The final value must be equivalent to one of the following 8
+              values ["1m","5m","10m","15m","20m","30m","45m","60m"].
+
+          name: The name of the rule. Must be unique. Supports characters A-Z, a-z, 0-9,
+              underscore (\\__), dash (-), period (.), and tilde (~). You can’t have a space in
+              the rule name. Max 256 characters.
+
+          id: The id of the rule. Must be unique.
+
+          automatic_advertisement: Toggle on if you would like Cloudflare to automatically advertise the IP
+              Prefixes within the rule via Magic Transit when the rule is triggered. Only
+              available for users of Magic Transit.
+
+          bandwidth: The number of bits per second for the rule. When this value is exceeded for the
+              set duration, an alert notification is sent. Minimum of 1 and no maximum.
+
+          packet_threshold: The number of packets per second for the rule. When this value is exceeded for
+              the set duration, an alert notification is sent. Minimum of 1 and no maximum.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -374,7 +556,18 @@ async def update(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._put(
             f"/accounts/{account_id}/mnm/rules",
-            body=await async_maybe_transform(body, rule_update_params.RuleUpdateParams),
+            body=await async_maybe_transform(
+                {
+                    "duration": duration,
+                    "name": name,
+                    "id": id,
+                    "automatic_advertisement": automatic_advertisement,
+                    "bandwidth": bandwidth,
+                    "packet_threshold": packet_threshold,
+                    "prefixes": prefixes,
+                },
+                rule_update_params.RuleUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -394,7 +587,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Optional[MagicNetworkMonitoringRule], AsyncSinglePage[Optional[MagicNetworkMonitoringRule]]]:
         """
         Lists network monitoring rules for account.
@@ -429,7 +622,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MagicNetworkMonitoringRule]:
         """
         Delete a network monitoring rule for account.
@@ -466,13 +659,18 @@ async def edit(
         rule_id: str,
         *,
         account_id: str,
-        body: object,
+        automatic_advertisement: Optional[bool] | Omit = omit,
+        bandwidth: float | Omit = omit,
+        duration: Literal["1m", "5m", "10m", "15m", "20m", "30m", "45m", "60m"] | Omit = omit,
+        name: str | Omit = omit,
+        packet_threshold: float | Omit = omit,
+        prefixes: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MagicNetworkMonitoringRule]:
         """
         Update a network monitoring rule for account.
@@ -480,6 +678,24 @@ async def edit(
         Args:
           rule_id: The id of the rule. Must be unique.
 
+          automatic_advertisement: Toggle on if you would like Cloudflare to automatically advertise the IP
+              Prefixes within the rule via Magic Transit when the rule is triggered. Only
+              available for users of Magic Transit.
+
+          bandwidth: The number of bits per second for the rule. When this value is exceeded for the
+              set duration, an alert notification is sent. Minimum of 1 and no maximum.
+
+          duration: The amount of time that the rule threshold must be exceeded to send an alert
+              notification. The final value must be equivalent to one of the following 8
+              values ["1m","5m","10m","15m","20m","30m","45m","60m"].
+
+          name: The name of the rule. Must be unique. Supports characters A-Z, a-z, 0-9,
+              underscore (\\__), dash (-), period (.), and tilde (~). You can’t have a space in
+              the rule name. Max 256 characters.
+
+          packet_threshold: The number of packets per second for the rule. When this value is exceeded for
+              the set duration, an alert notification is sent. Minimum of 1 and no maximum.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -494,7 +710,17 @@ async def edit(
             raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
         return await self._patch(
             f"/accounts/{account_id}/mnm/rules/{rule_id}",
-            body=await async_maybe_transform(body, rule_edit_params.RuleEditParams),
+            body=await async_maybe_transform(
+                {
+                    "automatic_advertisement": automatic_advertisement,
+                    "bandwidth": bandwidth,
+                    "duration": duration,
+                    "name": name,
+                    "packet_threshold": packet_threshold,
+                    "prefixes": prefixes,
+                },
+                rule_edit_params.RuleEditParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -515,7 +741,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MagicNetworkMonitoringRule]:
         """
         List a single network monitoring rule for account.
diff --git a/src/cloudflare/resources/magic_network_monitoring/vpc_flows/__init__.py b/src/cloudflare/resources/magic_network_monitoring/vpc_flows/__init__.py
new file mode 100644
index 00000000000..7ded783363c
--- /dev/null
+++ b/src/cloudflare/resources/magic_network_monitoring/vpc_flows/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .tokens import (
+    TokensResource,
+    AsyncTokensResource,
+    TokensResourceWithRawResponse,
+    AsyncTokensResourceWithRawResponse,
+    TokensResourceWithStreamingResponse,
+    AsyncTokensResourceWithStreamingResponse,
+)
+from .vpc_flows import (
+    VPCFlowsResource,
+    AsyncVPCFlowsResource,
+    VPCFlowsResourceWithRawResponse,
+    AsyncVPCFlowsResourceWithRawResponse,
+    VPCFlowsResourceWithStreamingResponse,
+    AsyncVPCFlowsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "TokensResource",
+    "AsyncTokensResource",
+    "TokensResourceWithRawResponse",
+    "AsyncTokensResourceWithRawResponse",
+    "TokensResourceWithStreamingResponse",
+    "AsyncTokensResourceWithStreamingResponse",
+    "VPCFlowsResource",
+    "AsyncVPCFlowsResource",
+    "VPCFlowsResourceWithRawResponse",
+    "AsyncVPCFlowsResourceWithRawResponse",
+    "VPCFlowsResourceWithStreamingResponse",
+    "AsyncVPCFlowsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/magic_network_monitoring/vpc_flows/tokens.py b/src/cloudflare/resources/magic_network_monitoring/vpc_flows/tokens.py
new file mode 100644
index 00000000000..be0e187d9d1
--- /dev/null
+++ b/src/cloudflare/resources/magic_network_monitoring/vpc_flows/tokens.py
@@ -0,0 +1,174 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.magic_network_monitoring.vpc_flows.token_create_response import TokenCreateResponse
+
+__all__ = ["TokensResource", "AsyncTokensResource"]
+
+
+class TokensResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> TokensResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TokensResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TokensResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TokensResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Generate authentication token for VPC flow logs export.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/mnm/vpc-flows/token",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class AsyncTokensResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncTokensResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTokensResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTokensResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTokensResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Generate authentication token for VPC flow logs export.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/mnm/vpc-flows/token",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class TokensResourceWithRawResponse:
+    def __init__(self, tokens: TokensResource) -> None:
+        self._tokens = tokens
+
+        self.create = to_raw_response_wrapper(
+            tokens.create,
+        )
+
+
+class AsyncTokensResourceWithRawResponse:
+    def __init__(self, tokens: AsyncTokensResource) -> None:
+        self._tokens = tokens
+
+        self.create = async_to_raw_response_wrapper(
+            tokens.create,
+        )
+
+
+class TokensResourceWithStreamingResponse:
+    def __init__(self, tokens: TokensResource) -> None:
+        self._tokens = tokens
+
+        self.create = to_streamed_response_wrapper(
+            tokens.create,
+        )
+
+
+class AsyncTokensResourceWithStreamingResponse:
+    def __init__(self, tokens: AsyncTokensResource) -> None:
+        self._tokens = tokens
+
+        self.create = async_to_streamed_response_wrapper(
+            tokens.create,
+        )
diff --git a/src/cloudflare/resources/magic_network_monitoring/vpc_flows/vpc_flows.py b/src/cloudflare/resources/magic_network_monitoring/vpc_flows/vpc_flows.py
new file mode 100644
index 00000000000..69ea9bcbb7b
--- /dev/null
+++ b/src/cloudflare/resources/magic_network_monitoring/vpc_flows/vpc_flows.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .tokens import (
+    TokensResource,
+    AsyncTokensResource,
+    TokensResourceWithRawResponse,
+    AsyncTokensResourceWithRawResponse,
+    TokensResourceWithStreamingResponse,
+    AsyncTokensResourceWithStreamingResponse,
+)
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["VPCFlowsResource", "AsyncVPCFlowsResource"]
+
+
+class VPCFlowsResource(SyncAPIResource):
+    @cached_property
+    def tokens(self) -> TokensResource:
+        return TokensResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> VPCFlowsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return VPCFlowsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> VPCFlowsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return VPCFlowsResourceWithStreamingResponse(self)
+
+
+class AsyncVPCFlowsResource(AsyncAPIResource):
+    @cached_property
+    def tokens(self) -> AsyncTokensResource:
+        return AsyncTokensResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncVPCFlowsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncVPCFlowsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncVPCFlowsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncVPCFlowsResourceWithStreamingResponse(self)
+
+
+class VPCFlowsResourceWithRawResponse:
+    def __init__(self, vpc_flows: VPCFlowsResource) -> None:
+        self._vpc_flows = vpc_flows
+
+    @cached_property
+    def tokens(self) -> TokensResourceWithRawResponse:
+        return TokensResourceWithRawResponse(self._vpc_flows.tokens)
+
+
+class AsyncVPCFlowsResourceWithRawResponse:
+    def __init__(self, vpc_flows: AsyncVPCFlowsResource) -> None:
+        self._vpc_flows = vpc_flows
+
+    @cached_property
+    def tokens(self) -> AsyncTokensResourceWithRawResponse:
+        return AsyncTokensResourceWithRawResponse(self._vpc_flows.tokens)
+
+
+class VPCFlowsResourceWithStreamingResponse:
+    def __init__(self, vpc_flows: VPCFlowsResource) -> None:
+        self._vpc_flows = vpc_flows
+
+    @cached_property
+    def tokens(self) -> TokensResourceWithStreamingResponse:
+        return TokensResourceWithStreamingResponse(self._vpc_flows.tokens)
+
+
+class AsyncVPCFlowsResourceWithStreamingResponse:
+    def __init__(self, vpc_flows: AsyncVPCFlowsResource) -> None:
+        self._vpc_flows = vpc_flows
+
+    @cached_property
+    def tokens(self) -> AsyncTokensResourceWithStreamingResponse:
+        return AsyncTokensResourceWithStreamingResponse(self._vpc_flows.tokens)
diff --git a/src/cloudflare/resources/magic_transit/__init__.py b/src/cloudflare/resources/magic_transit/__init__.py
index db6f2e65c99..205acea4112 100644
--- a/src/cloudflare/resources/magic_transit/__init__.py
+++ b/src/cloudflare/resources/magic_transit/__init__.py
@@ -8,6 +8,14 @@
     AppsResourceWithStreamingResponse,
     AsyncAppsResourceWithStreamingResponse,
 )
+from .pcaps import (
+    PCAPsResource,
+    AsyncPCAPsResource,
+    PCAPsResourceWithRawResponse,
+    AsyncPCAPsResourceWithRawResponse,
+    PCAPsResourceWithStreamingResponse,
+    AsyncPCAPsResourceWithStreamingResponse,
+)
 from .sites import (
     SitesResource,
     AsyncSitesResource,
@@ -108,6 +116,12 @@
     "AsyncConnectorsResourceWithRawResponse",
     "ConnectorsResourceWithStreamingResponse",
     "AsyncConnectorsResourceWithStreamingResponse",
+    "PCAPsResource",
+    "AsyncPCAPsResource",
+    "PCAPsResourceWithRawResponse",
+    "AsyncPCAPsResourceWithRawResponse",
+    "PCAPsResourceWithStreamingResponse",
+    "AsyncPCAPsResourceWithStreamingResponse",
     "MagicTransitResource",
     "AsyncMagicTransitResource",
     "MagicTransitResourceWithRawResponse",
diff --git a/src/cloudflare/resources/magic_transit/apps.py b/src/cloudflare/resources/magic_transit/apps.py
index d2f727e82ea..11604493a1f 100644
--- a/src/cloudflare/resources/magic_transit/apps.py
+++ b/src/cloudflare/resources/magic_transit/apps.py
@@ -2,16 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Optional, cast, overload
+from typing import Any, Type, Optional, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    required_args,
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -23,7 +19,8 @@
 from ..._wrappers import ResultWrapper
 from ...pagination import SyncSinglePage, AsyncSinglePage
 from ..._base_client import AsyncPaginator, make_request_options
-from ...types.magic_transit import app_create_params, app_update_params
+from ...types.magic_transit import app_edit_params, app_create_params, app_update_params
+from ...types.magic_transit.app_edit_response import AppEditResponse
 from ...types.magic_transit.app_list_response import AppListResponse
 from ...types.magic_transit.app_create_response import AppCreateResponse
 from ...types.magic_transit.app_delete_response import AppDeleteResponse
@@ -35,24 +32,37 @@
 class AppsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AppsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AppsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AppsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AppsResourceWithStreamingResponse(self)
 
-    @overload
     def create(
         self,
         *,
         account_id: str,
-        body: object,
+        name: str,
+        type: str,
+        hostnames: SequenceNotStr[str] | Omit = omit,
+        ip_subnets: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AppCreateResponse]:
         """
         Creates a new App for an account
@@ -60,34 +70,14 @@ def create(
         Args:
           account_id: Identifier
 
-          extra_headers: Send extra headers
+          name: Display name for the app.
 
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
+          type: Category of the app.
 
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def create(
-        self,
-        *,
-        account_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AppCreateResponse]:
-        """
-        Creates a new App for an account
+          hostnames: FQDNs to associate with traffic decisions.
 
-        Args:
-          account_id: Identifier
+          ip_subnets: IPv4 CIDRs to associate with traffic decisions. (IPv6 CIDRs are currently
+              unsupported)
 
           extra_headers: Send extra headers
 
@@ -97,26 +87,19 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        ...
-
-    @required_args(["account_id", "body"])
-    def create(
-        self,
-        *,
-        account_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AppCreateResponse]:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._post(
             f"/accounts/{account_id}/magic/apps",
-            body=maybe_transform(body, app_create_params.AppCreateParams),
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "type": type,
+                    "hostnames": hostnames,
+                    "ip_subnets": ip_subnets,
+                },
+                app_create_params.AppCreateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -127,19 +110,21 @@ def create(
             cast_to=cast(Type[Optional[AppCreateResponse]], ResultWrapper[AppCreateResponse]),
         )
 
-    @overload
     def update(
         self,
         account_app_id: str,
         *,
         account_id: str,
-        body: object,
+        hostnames: SequenceNotStr[str] | Omit = omit,
+        ip_subnets: SequenceNotStr[str] | Omit = omit,
+        name: str | Omit = omit,
+        type: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AppUpdateResponse]:
         """
         Updates an Account App
@@ -149,37 +134,14 @@ def update(
 
           account_app_id: Identifier
 
-          extra_headers: Send extra headers
+          hostnames: FQDNs to associate with traffic decisions.
 
-          extra_query: Add additional query parameters to the request
+          ip_subnets: IPv4 CIDRs to associate with traffic decisions. (IPv6 CIDRs are currently
+              unsupported)
 
-          extra_body: Add additional JSON properties to the request
+          name: Display name for the app.
 
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def update(
-        self,
-        account_app_id: str,
-        *,
-        account_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AppUpdateResponse]:
-        """
-        Updates an Account App
-
-        Args:
-          account_id: Identifier
-
-          account_app_id: Identifier
+          type: Category of the app.
 
           extra_headers: Send extra headers
 
@@ -189,93 +151,21 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        ...
-
-    @overload
-    def update(
-        self,
-        account_app_id: str,
-        *,
-        account_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AppUpdateResponse]:
-        """
-        Updates an Account App
-
-        Args:
-          account_id: Identifier
-
-          account_app_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def update(
-        self,
-        account_app_id: str,
-        *,
-        account_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AppUpdateResponse]:
-        """
-        Updates an Account App
-
-        Args:
-          account_id: Identifier
-
-          account_app_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @required_args(["account_id", "body"])
-    def update(
-        self,
-        account_app_id: str,
-        *,
-        account_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AppUpdateResponse]:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not account_app_id:
             raise ValueError(f"Expected a non-empty value for `account_app_id` but received {account_app_id!r}")
         return self._put(
             f"/accounts/{account_id}/magic/apps/{account_app_id}",
-            body=maybe_transform(body, app_update_params.AppUpdateParams),
+            body=maybe_transform(
+                {
+                    "hostnames": hostnames,
+                    "ip_subnets": ip_subnets,
+                    "name": name,
+                    "type": type,
+                },
+                app_update_params.AppUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -295,7 +185,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[AppListResponse]:
         """
         Lists Apps associated with an account.
@@ -332,7 +222,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AppDeleteResponse]:
         """
         Deletes specific Account App.
@@ -366,63 +256,38 @@ def delete(
             cast_to=cast(Type[Optional[AppDeleteResponse]], ResultWrapper[AppDeleteResponse]),
         )
 
-
-class AsyncAppsResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncAppsResourceWithRawResponse:
-        return AsyncAppsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncAppsResourceWithStreamingResponse:
-        return AsyncAppsResourceWithStreamingResponse(self)
-
-    @overload
-    async def create(
+    def edit(
         self,
+        account_app_id: str,
         *,
         account_id: str,
-        body: object,
+        hostnames: SequenceNotStr[str] | Omit = omit,
+        ip_subnets: SequenceNotStr[str] | Omit = omit,
+        name: str | Omit = omit,
+        type: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AppCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AppEditResponse]:
         """
-        Creates a new App for an account
+        Updates an Account App
 
         Args:
           account_id: Identifier
 
-          extra_headers: Send extra headers
+          account_app_id: Identifier
 
-          extra_query: Add additional query parameters to the request
+          hostnames: FQDNs to associate with traffic decisions.
 
-          extra_body: Add additional JSON properties to the request
+          ip_subnets: IPv4 CIDRs to associate with traffic decisions. (IPv6 CIDRs are currently
+              unsupported)
 
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
+          name: Display name for the app.
 
-    @overload
-    async def create(
-        self,
-        *,
-        account_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AppCreateResponse]:
-        """
-        Creates a new App for an account
-
-        Args:
-          account_id: Identifier
+          type: Category of the app.
 
           extra_headers: Send extra headers
 
@@ -432,89 +297,81 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        ...
-
-    @required_args(["account_id", "body"])
-    async def create(
-        self,
-        *,
-        account_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AppCreateResponse]:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._post(
-            f"/accounts/{account_id}/magic/apps",
-            body=await async_maybe_transform(body, app_create_params.AppCreateParams),
+        if not account_app_id:
+            raise ValueError(f"Expected a non-empty value for `account_app_id` but received {account_app_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/magic/apps/{account_app_id}",
+            body=maybe_transform(
+                {
+                    "hostnames": hostnames,
+                    "ip_subnets": ip_subnets,
+                    "name": name,
+                    "type": type,
+                },
+                app_edit_params.AppEditParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[AppCreateResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[AppEditResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[AppCreateResponse]], ResultWrapper[AppCreateResponse]),
+            cast_to=cast(Type[Optional[AppEditResponse]], ResultWrapper[AppEditResponse]),
         )
 
-    @overload
-    async def update(
-        self,
-        account_app_id: str,
-        *,
-        account_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AppUpdateResponse]:
-        """
-        Updates an Account App
-
-        Args:
-          account_id: Identifier
-
-          account_app_id: Identifier
 
-          extra_headers: Send extra headers
+class AsyncAppsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncAppsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
 
-          extra_query: Add additional query parameters to the request
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAppsResourceWithRawResponse(self)
 
-          extra_body: Add additional JSON properties to the request
+    @cached_property
+    def with_streaming_response(self) -> AsyncAppsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
         """
-        ...
+        return AsyncAppsResourceWithStreamingResponse(self)
 
-    @overload
-    async def update(
+    async def create(
         self,
-        account_app_id: str,
         *,
         account_id: str,
-        body: object,
+        name: str,
+        type: str,
+        hostnames: SequenceNotStr[str] | Omit = omit,
+        ip_subnets: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AppUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AppCreateResponse]:
         """
-        Updates an Account App
+        Creates a new App for an account
 
         Args:
           account_id: Identifier
 
-          account_app_id: Identifier
+          name: Display name for the app.
+
+          type: Category of the app.
+
+          hostnames: FQDNs to associate with traffic decisions.
+
+          ip_subnets: IPv4 CIDRs to associate with traffic decisions. (IPv6 CIDRs are currently
+              unsupported)
 
           extra_headers: Send extra headers
 
@@ -524,21 +381,44 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        ...
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/magic/apps",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "type": type,
+                    "hostnames": hostnames,
+                    "ip_subnets": ip_subnets,
+                },
+                app_create_params.AppCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AppCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AppCreateResponse]], ResultWrapper[AppCreateResponse]),
+        )
 
-    @overload
     async def update(
         self,
         account_app_id: str,
         *,
         account_id: str,
-        body: object,
+        hostnames: SequenceNotStr[str] | Omit = omit,
+        ip_subnets: SequenceNotStr[str] | Omit = omit,
+        name: str | Omit = omit,
+        type: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AppUpdateResponse]:
         """
         Updates an Account App
@@ -548,37 +428,14 @@ async def update(
 
           account_app_id: Identifier
 
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
+          hostnames: FQDNs to associate with traffic decisions.
 
-          extra_body: Add additional JSON properties to the request
+          ip_subnets: IPv4 CIDRs to associate with traffic decisions. (IPv6 CIDRs are currently
+              unsupported)
 
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
+          name: Display name for the app.
 
-    @overload
-    async def update(
-        self,
-        account_app_id: str,
-        *,
-        account_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AppUpdateResponse]:
-        """
-        Updates an Account App
-
-        Args:
-          account_id: Identifier
-
-          account_app_id: Identifier
+          type: Category of the app.
 
           extra_headers: Send extra headers
 
@@ -588,29 +445,21 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        ...
-
-    @required_args(["account_id", "body"])
-    async def update(
-        self,
-        account_app_id: str,
-        *,
-        account_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AppUpdateResponse]:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not account_app_id:
             raise ValueError(f"Expected a non-empty value for `account_app_id` but received {account_app_id!r}")
         return await self._put(
             f"/accounts/{account_id}/magic/apps/{account_app_id}",
-            body=await async_maybe_transform(body, app_update_params.AppUpdateParams),
+            body=await async_maybe_transform(
+                {
+                    "hostnames": hostnames,
+                    "ip_subnets": ip_subnets,
+                    "name": name,
+                    "type": type,
+                },
+                app_update_params.AppUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -630,7 +479,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[AppListResponse, AsyncSinglePage[AppListResponse]]:
         """
         Lists Apps associated with an account.
@@ -667,7 +516,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AppDeleteResponse]:
         """
         Deletes specific Account App.
@@ -701,6 +550,72 @@ async def delete(
             cast_to=cast(Type[Optional[AppDeleteResponse]], ResultWrapper[AppDeleteResponse]),
         )
 
+    async def edit(
+        self,
+        account_app_id: str,
+        *,
+        account_id: str,
+        hostnames: SequenceNotStr[str] | Omit = omit,
+        ip_subnets: SequenceNotStr[str] | Omit = omit,
+        name: str | Omit = omit,
+        type: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AppEditResponse]:
+        """
+        Updates an Account App
+
+        Args:
+          account_id: Identifier
+
+          account_app_id: Identifier
+
+          hostnames: FQDNs to associate with traffic decisions.
+
+          ip_subnets: IPv4 CIDRs to associate with traffic decisions. (IPv6 CIDRs are currently
+              unsupported)
+
+          name: Display name for the app.
+
+          type: Category of the app.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not account_app_id:
+            raise ValueError(f"Expected a non-empty value for `account_app_id` but received {account_app_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/magic/apps/{account_app_id}",
+            body=await async_maybe_transform(
+                {
+                    "hostnames": hostnames,
+                    "ip_subnets": ip_subnets,
+                    "name": name,
+                    "type": type,
+                },
+                app_edit_params.AppEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AppEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AppEditResponse]], ResultWrapper[AppEditResponse]),
+        )
+
 
 class AppsResourceWithRawResponse:
     def __init__(self, apps: AppsResource) -> None:
@@ -718,6 +633,9 @@ def __init__(self, apps: AppsResource) -> None:
         self.delete = to_raw_response_wrapper(
             apps.delete,
         )
+        self.edit = to_raw_response_wrapper(
+            apps.edit,
+        )
 
 
 class AsyncAppsResourceWithRawResponse:
@@ -736,6 +654,9 @@ def __init__(self, apps: AsyncAppsResource) -> None:
         self.delete = async_to_raw_response_wrapper(
             apps.delete,
         )
+        self.edit = async_to_raw_response_wrapper(
+            apps.edit,
+        )
 
 
 class AppsResourceWithStreamingResponse:
@@ -754,6 +675,9 @@ def __init__(self, apps: AppsResource) -> None:
         self.delete = to_streamed_response_wrapper(
             apps.delete,
         )
+        self.edit = to_streamed_response_wrapper(
+            apps.edit,
+        )
 
 
 class AsyncAppsResourceWithStreamingResponse:
@@ -772,3 +696,6 @@ def __init__(self, apps: AsyncAppsResource) -> None:
         self.delete = async_to_streamed_response_wrapper(
             apps.delete,
         )
+        self.edit = async_to_streamed_response_wrapper(
+            apps.edit,
+        )
diff --git a/src/cloudflare/resources/magic_transit/cf_interconnects.py b/src/cloudflare/resources/magic_transit/cf_interconnects.py
index 1b8f9558567..dcdb90f68cd 100644
--- a/src/cloudflare/resources/magic_transit/cf_interconnects.py
+++ b/src/cloudflare/resources/magic_transit/cf_interconnects.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import is_given, maybe_transform, strip_not_given, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -21,10 +18,12 @@
 )
 from ..._wrappers import ResultWrapper
 from ..._base_client import make_request_options
-from ...types.magic_transit import cf_interconnect_update_params
+from ...types.magic_transit import cf_interconnect_update_params, cf_interconnect_bulk_update_params
+from ...types.magic_transit.health_check_param import HealthCheckParam
 from ...types.magic_transit.cf_interconnect_get_response import CfInterconnectGetResponse
 from ...types.magic_transit.cf_interconnect_list_response import CfInterconnectListResponse
 from ...types.magic_transit.cf_interconnect_update_response import CfInterconnectUpdateResponse
+from ...types.magic_transit.cf_interconnect_bulk_update_response import CfInterconnectBulkUpdateResponse
 
 __all__ = ["CfInterconnectsResource", "AsyncCfInterconnectsResource"]
 
@@ -32,10 +31,21 @@
 class CfInterconnectsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> CfInterconnectsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CfInterconnectsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CfInterconnectsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CfInterconnectsResourceWithStreamingResponse(self)
 
     def update(
@@ -43,17 +53,20 @@ def update(
         cf_interconnect_id: str,
         *,
         account_id: str,
-        description: str | NotGiven = NOT_GIVEN,
-        gre: cf_interconnect_update_params.GRE | NotGiven = NOT_GIVEN,
-        health_check: cf_interconnect_update_params.HealthCheck | NotGiven = NOT_GIVEN,
-        interface_address: str | NotGiven = NOT_GIVEN,
-        mtu: int | NotGiven = NOT_GIVEN,
+        automatic_return_routing: bool | Omit = omit,
+        description: str | Omit = omit,
+        gre: cf_interconnect_update_params.GRE | Omit = omit,
+        health_check: HealthCheckParam | Omit = omit,
+        interface_address: str | Omit = omit,
+        interface_address6: str | Omit = omit,
+        mtu: int | Omit = omit,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> CfInterconnectUpdateResponse:
         """Updates a specific interconnect associated with an account.
 
@@ -66,6 +79,9 @@ def update(
 
           cf_interconnect_id: Identifier
 
+          automatic_return_routing: True if automatic stateful return routing should be enabled for a tunnel, false
+              otherwise.
+
           description: An optional description of the interconnect.
 
           gre: The configuration specific to GRE interconnects.
@@ -74,6 +90,11 @@ def update(
               of the tunnel. Select the subnet from the following private IP space:
               10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
 
+          interface_address6: A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+              address being the first IP of the subnet and not same as the address of
+              virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+              interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+
           mtu: The Maximum Transmission Unit (MTU) in bytes for the interconnect. The minimum
               value is 576.
 
@@ -89,14 +110,26 @@ def update(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not cf_interconnect_id:
             raise ValueError(f"Expected a non-empty value for `cf_interconnect_id` but received {cf_interconnect_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return self._put(
             f"/accounts/{account_id}/magic/cf_interconnects/{cf_interconnect_id}",
             body=maybe_transform(
                 {
+                    "automatic_return_routing": automatic_return_routing,
                     "description": description,
                     "gre": gre,
                     "health_check": health_check,
                     "interface_address": interface_address,
+                    "interface_address6": interface_address6,
                     "mtu": mtu,
                 },
                 cf_interconnect_update_params.CfInterconnectUpdateParams,
@@ -115,12 +148,13 @@ def list(
         self,
         *,
         account_id: str,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> CfInterconnectListResponse:
         """
         Lists interconnects associated with an account.
@@ -138,6 +172,16 @@ def list(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return self._get(
             f"/accounts/{account_id}/magic/cf_interconnects",
             options=make_request_options(
@@ -150,17 +194,73 @@ def list(
             cast_to=cast(Type[CfInterconnectListResponse], ResultWrapper[CfInterconnectListResponse]),
         )
 
+    def bulk_update(
+        self,
+        *,
+        account_id: str,
+        body: object,
+        x_magic_new_hc_target: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CfInterconnectBulkUpdateResponse:
+        """Updates multiple interconnects associated with an account.
+
+        Use
+        `?validate_only=true` as an optional query parameter to only run validation
+        without persisting changes.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
+        return self._put(
+            f"/accounts/{account_id}/magic/cf_interconnects",
+            body=maybe_transform(body, cf_interconnect_bulk_update_params.CfInterconnectBulkUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CfInterconnectBulkUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CfInterconnectBulkUpdateResponse], ResultWrapper[CfInterconnectBulkUpdateResponse]),
+        )
+
     def get(
         self,
         cf_interconnect_id: str,
         *,
         account_id: str,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> CfInterconnectGetResponse:
         """
         Lists details for a specific interconnect.
@@ -182,6 +282,16 @@ def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not cf_interconnect_id:
             raise ValueError(f"Expected a non-empty value for `cf_interconnect_id` but received {cf_interconnect_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return self._get(
             f"/accounts/{account_id}/magic/cf_interconnects/{cf_interconnect_id}",
             options=make_request_options(
@@ -198,10 +308,21 @@ def get(
 class AsyncCfInterconnectsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncCfInterconnectsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCfInterconnectsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCfInterconnectsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCfInterconnectsResourceWithStreamingResponse(self)
 
     async def update(
@@ -209,17 +330,20 @@ async def update(
         cf_interconnect_id: str,
         *,
         account_id: str,
-        description: str | NotGiven = NOT_GIVEN,
-        gre: cf_interconnect_update_params.GRE | NotGiven = NOT_GIVEN,
-        health_check: cf_interconnect_update_params.HealthCheck | NotGiven = NOT_GIVEN,
-        interface_address: str | NotGiven = NOT_GIVEN,
-        mtu: int | NotGiven = NOT_GIVEN,
+        automatic_return_routing: bool | Omit = omit,
+        description: str | Omit = omit,
+        gre: cf_interconnect_update_params.GRE | Omit = omit,
+        health_check: HealthCheckParam | Omit = omit,
+        interface_address: str | Omit = omit,
+        interface_address6: str | Omit = omit,
+        mtu: int | Omit = omit,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> CfInterconnectUpdateResponse:
         """Updates a specific interconnect associated with an account.
 
@@ -232,6 +356,9 @@ async def update(
 
           cf_interconnect_id: Identifier
 
+          automatic_return_routing: True if automatic stateful return routing should be enabled for a tunnel, false
+              otherwise.
+
           description: An optional description of the interconnect.
 
           gre: The configuration specific to GRE interconnects.
@@ -240,6 +367,11 @@ async def update(
               of the tunnel. Select the subnet from the following private IP space:
               10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
 
+          interface_address6: A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+              address being the first IP of the subnet and not same as the address of
+              virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+              interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+
           mtu: The Maximum Transmission Unit (MTU) in bytes for the interconnect. The minimum
               value is 576.
 
@@ -255,14 +387,26 @@ async def update(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not cf_interconnect_id:
             raise ValueError(f"Expected a non-empty value for `cf_interconnect_id` but received {cf_interconnect_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return await self._put(
             f"/accounts/{account_id}/magic/cf_interconnects/{cf_interconnect_id}",
             body=await async_maybe_transform(
                 {
+                    "automatic_return_routing": automatic_return_routing,
                     "description": description,
                     "gre": gre,
                     "health_check": health_check,
                     "interface_address": interface_address,
+                    "interface_address6": interface_address6,
                     "mtu": mtu,
                 },
                 cf_interconnect_update_params.CfInterconnectUpdateParams,
@@ -281,12 +425,13 @@ async def list(
         self,
         *,
         account_id: str,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> CfInterconnectListResponse:
         """
         Lists interconnects associated with an account.
@@ -304,6 +449,16 @@ async def list(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return await self._get(
             f"/accounts/{account_id}/magic/cf_interconnects",
             options=make_request_options(
@@ -316,17 +471,73 @@ async def list(
             cast_to=cast(Type[CfInterconnectListResponse], ResultWrapper[CfInterconnectListResponse]),
         )
 
+    async def bulk_update(
+        self,
+        *,
+        account_id: str,
+        body: object,
+        x_magic_new_hc_target: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CfInterconnectBulkUpdateResponse:
+        """Updates multiple interconnects associated with an account.
+
+        Use
+        `?validate_only=true` as an optional query parameter to only run validation
+        without persisting changes.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
+        return await self._put(
+            f"/accounts/{account_id}/magic/cf_interconnects",
+            body=await async_maybe_transform(body, cf_interconnect_bulk_update_params.CfInterconnectBulkUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CfInterconnectBulkUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CfInterconnectBulkUpdateResponse], ResultWrapper[CfInterconnectBulkUpdateResponse]),
+        )
+
     async def get(
         self,
         cf_interconnect_id: str,
         *,
         account_id: str,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> CfInterconnectGetResponse:
         """
         Lists details for a specific interconnect.
@@ -348,6 +559,16 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not cf_interconnect_id:
             raise ValueError(f"Expected a non-empty value for `cf_interconnect_id` but received {cf_interconnect_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return await self._get(
             f"/accounts/{account_id}/magic/cf_interconnects/{cf_interconnect_id}",
             options=make_request_options(
@@ -371,6 +592,9 @@ def __init__(self, cf_interconnects: CfInterconnectsResource) -> None:
         self.list = to_raw_response_wrapper(
             cf_interconnects.list,
         )
+        self.bulk_update = to_raw_response_wrapper(
+            cf_interconnects.bulk_update,
+        )
         self.get = to_raw_response_wrapper(
             cf_interconnects.get,
         )
@@ -386,6 +610,9 @@ def __init__(self, cf_interconnects: AsyncCfInterconnectsResource) -> None:
         self.list = async_to_raw_response_wrapper(
             cf_interconnects.list,
         )
+        self.bulk_update = async_to_raw_response_wrapper(
+            cf_interconnects.bulk_update,
+        )
         self.get = async_to_raw_response_wrapper(
             cf_interconnects.get,
         )
@@ -401,6 +628,9 @@ def __init__(self, cf_interconnects: CfInterconnectsResource) -> None:
         self.list = to_streamed_response_wrapper(
             cf_interconnects.list,
         )
+        self.bulk_update = to_streamed_response_wrapper(
+            cf_interconnects.bulk_update,
+        )
         self.get = to_streamed_response_wrapper(
             cf_interconnects.get,
         )
@@ -416,6 +646,9 @@ def __init__(self, cf_interconnects: AsyncCfInterconnectsResource) -> None:
         self.list = async_to_streamed_response_wrapper(
             cf_interconnects.list,
         )
+        self.bulk_update = async_to_streamed_response_wrapper(
+            cf_interconnects.bulk_update,
+        )
         self.get = async_to_streamed_response_wrapper(
             cf_interconnects.get,
         )
diff --git a/src/cloudflare/resources/magic_transit/connectors.py b/src/cloudflare/resources/magic_transit/connectors.py
deleted file mode 100644
index 0f881783b86..00000000000
--- a/src/cloudflare/resources/magic_transit/connectors.py
+++ /dev/null
@@ -1,507 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, cast
-
-import httpx
-
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ..._wrappers import ResultWrapper
-from ...pagination import SyncSinglePage, AsyncSinglePage
-from ..._base_client import AsyncPaginator, make_request_options
-from ...types.magic_transit import connector_edit_params, connector_update_params
-from ...types.magic_transit.connector_get_response import ConnectorGetResponse
-from ...types.magic_transit.connector_edit_response import ConnectorEditResponse
-from ...types.magic_transit.connector_list_response import ConnectorListResponse
-from ...types.magic_transit.connector_update_response import ConnectorUpdateResponse
-
-__all__ = ["ConnectorsResource", "AsyncConnectorsResource"]
-
-
-class ConnectorsResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> ConnectorsResourceWithRawResponse:
-        return ConnectorsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> ConnectorsResourceWithStreamingResponse:
-        return ConnectorsResourceWithStreamingResponse(self)
-
-    def update(
-        self,
-        connector_id: str,
-        *,
-        account_id: str,
-        activated: bool | NotGiven = NOT_GIVEN,
-        interrupt_window_duration_hours: float | NotGiven = NOT_GIVEN,
-        interrupt_window_hour_of_day: float | NotGiven = NOT_GIVEN,
-        notes: str | NotGiven = NOT_GIVEN,
-        timezone: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConnectorUpdateResponse:
-        """
-        Replace Connector
-
-        Args:
-          account_id: Account identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not connector_id:
-            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
-        return self._put(
-            f"/accounts/{account_id}/magic/connectors/{connector_id}",
-            body=maybe_transform(
-                {
-                    "activated": activated,
-                    "interrupt_window_duration_hours": interrupt_window_duration_hours,
-                    "interrupt_window_hour_of_day": interrupt_window_hour_of_day,
-                    "notes": notes,
-                    "timezone": timezone,
-                },
-                connector_update_params.ConnectorUpdateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[ConnectorUpdateResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[ConnectorUpdateResponse], ResultWrapper[ConnectorUpdateResponse]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[ConnectorListResponse]:
-        """
-        List Connectors
-
-        Args:
-          account_id: Account identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/magic/connectors",
-            page=SyncSinglePage[ConnectorListResponse],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=ConnectorListResponse,
-        )
-
-    def edit(
-        self,
-        connector_id: str,
-        *,
-        account_id: str,
-        activated: bool | NotGiven = NOT_GIVEN,
-        interrupt_window_duration_hours: float | NotGiven = NOT_GIVEN,
-        interrupt_window_hour_of_day: float | NotGiven = NOT_GIVEN,
-        notes: str | NotGiven = NOT_GIVEN,
-        timezone: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConnectorEditResponse:
-        """
-        Update Connector
-
-        Args:
-          account_id: Account identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not connector_id:
-            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
-        return self._patch(
-            f"/accounts/{account_id}/magic/connectors/{connector_id}",
-            body=maybe_transform(
-                {
-                    "activated": activated,
-                    "interrupt_window_duration_hours": interrupt_window_duration_hours,
-                    "interrupt_window_hour_of_day": interrupt_window_hour_of_day,
-                    "notes": notes,
-                    "timezone": timezone,
-                },
-                connector_edit_params.ConnectorEditParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[ConnectorEditResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[ConnectorEditResponse], ResultWrapper[ConnectorEditResponse]),
-        )
-
-    def get(
-        self,
-        connector_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConnectorGetResponse:
-        """
-        Fetch Connector
-
-        Args:
-          account_id: Account identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not connector_id:
-            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/magic/connectors/{connector_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[ConnectorGetResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[ConnectorGetResponse], ResultWrapper[ConnectorGetResponse]),
-        )
-
-
-class AsyncConnectorsResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncConnectorsResourceWithRawResponse:
-        return AsyncConnectorsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncConnectorsResourceWithStreamingResponse:
-        return AsyncConnectorsResourceWithStreamingResponse(self)
-
-    async def update(
-        self,
-        connector_id: str,
-        *,
-        account_id: str,
-        activated: bool | NotGiven = NOT_GIVEN,
-        interrupt_window_duration_hours: float | NotGiven = NOT_GIVEN,
-        interrupt_window_hour_of_day: float | NotGiven = NOT_GIVEN,
-        notes: str | NotGiven = NOT_GIVEN,
-        timezone: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConnectorUpdateResponse:
-        """
-        Replace Connector
-
-        Args:
-          account_id: Account identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not connector_id:
-            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
-        return await self._put(
-            f"/accounts/{account_id}/magic/connectors/{connector_id}",
-            body=await async_maybe_transform(
-                {
-                    "activated": activated,
-                    "interrupt_window_duration_hours": interrupt_window_duration_hours,
-                    "interrupt_window_hour_of_day": interrupt_window_hour_of_day,
-                    "notes": notes,
-                    "timezone": timezone,
-                },
-                connector_update_params.ConnectorUpdateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[ConnectorUpdateResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[ConnectorUpdateResponse], ResultWrapper[ConnectorUpdateResponse]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[ConnectorListResponse, AsyncSinglePage[ConnectorListResponse]]:
-        """
-        List Connectors
-
-        Args:
-          account_id: Account identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/magic/connectors",
-            page=AsyncSinglePage[ConnectorListResponse],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=ConnectorListResponse,
-        )
-
-    async def edit(
-        self,
-        connector_id: str,
-        *,
-        account_id: str,
-        activated: bool | NotGiven = NOT_GIVEN,
-        interrupt_window_duration_hours: float | NotGiven = NOT_GIVEN,
-        interrupt_window_hour_of_day: float | NotGiven = NOT_GIVEN,
-        notes: str | NotGiven = NOT_GIVEN,
-        timezone: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConnectorEditResponse:
-        """
-        Update Connector
-
-        Args:
-          account_id: Account identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not connector_id:
-            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
-        return await self._patch(
-            f"/accounts/{account_id}/magic/connectors/{connector_id}",
-            body=await async_maybe_transform(
-                {
-                    "activated": activated,
-                    "interrupt_window_duration_hours": interrupt_window_duration_hours,
-                    "interrupt_window_hour_of_day": interrupt_window_hour_of_day,
-                    "notes": notes,
-                    "timezone": timezone,
-                },
-                connector_edit_params.ConnectorEditParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[ConnectorEditResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[ConnectorEditResponse], ResultWrapper[ConnectorEditResponse]),
-        )
-
-    async def get(
-        self,
-        connector_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConnectorGetResponse:
-        """
-        Fetch Connector
-
-        Args:
-          account_id: Account identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not connector_id:
-            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/magic/connectors/{connector_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[ConnectorGetResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[ConnectorGetResponse], ResultWrapper[ConnectorGetResponse]),
-        )
-
-
-class ConnectorsResourceWithRawResponse:
-    def __init__(self, connectors: ConnectorsResource) -> None:
-        self._connectors = connectors
-
-        self.update = to_raw_response_wrapper(
-            connectors.update,
-        )
-        self.list = to_raw_response_wrapper(
-            connectors.list,
-        )
-        self.edit = to_raw_response_wrapper(
-            connectors.edit,
-        )
-        self.get = to_raw_response_wrapper(
-            connectors.get,
-        )
-
-
-class AsyncConnectorsResourceWithRawResponse:
-    def __init__(self, connectors: AsyncConnectorsResource) -> None:
-        self._connectors = connectors
-
-        self.update = async_to_raw_response_wrapper(
-            connectors.update,
-        )
-        self.list = async_to_raw_response_wrapper(
-            connectors.list,
-        )
-        self.edit = async_to_raw_response_wrapper(
-            connectors.edit,
-        )
-        self.get = async_to_raw_response_wrapper(
-            connectors.get,
-        )
-
-
-class ConnectorsResourceWithStreamingResponse:
-    def __init__(self, connectors: ConnectorsResource) -> None:
-        self._connectors = connectors
-
-        self.update = to_streamed_response_wrapper(
-            connectors.update,
-        )
-        self.list = to_streamed_response_wrapper(
-            connectors.list,
-        )
-        self.edit = to_streamed_response_wrapper(
-            connectors.edit,
-        )
-        self.get = to_streamed_response_wrapper(
-            connectors.get,
-        )
-
-
-class AsyncConnectorsResourceWithStreamingResponse:
-    def __init__(self, connectors: AsyncConnectorsResource) -> None:
-        self._connectors = connectors
-
-        self.update = async_to_streamed_response_wrapper(
-            connectors.update,
-        )
-        self.list = async_to_streamed_response_wrapper(
-            connectors.list,
-        )
-        self.edit = async_to_streamed_response_wrapper(
-            connectors.edit,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            connectors.get,
-        )
diff --git a/src/cloudflare/resources/magic_transit/connectors/__init__.py b/src/cloudflare/resources/magic_transit/connectors/__init__.py
new file mode 100644
index 00000000000..6382ec9cb9a
--- /dev/null
+++ b/src/cloudflare/resources/magic_transit/connectors/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .events import (
+    EventsResource,
+    AsyncEventsResource,
+    EventsResourceWithRawResponse,
+    AsyncEventsResourceWithRawResponse,
+    EventsResourceWithStreamingResponse,
+    AsyncEventsResourceWithStreamingResponse,
+)
+from .snapshots import (
+    SnapshotsResource,
+    AsyncSnapshotsResource,
+    SnapshotsResourceWithRawResponse,
+    AsyncSnapshotsResourceWithRawResponse,
+    SnapshotsResourceWithStreamingResponse,
+    AsyncSnapshotsResourceWithStreamingResponse,
+)
+from .connectors import (
+    ConnectorsResource,
+    AsyncConnectorsResource,
+    ConnectorsResourceWithRawResponse,
+    AsyncConnectorsResourceWithRawResponse,
+    ConnectorsResourceWithStreamingResponse,
+    AsyncConnectorsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "EventsResource",
+    "AsyncEventsResource",
+    "EventsResourceWithRawResponse",
+    "AsyncEventsResourceWithRawResponse",
+    "EventsResourceWithStreamingResponse",
+    "AsyncEventsResourceWithStreamingResponse",
+    "SnapshotsResource",
+    "AsyncSnapshotsResource",
+    "SnapshotsResourceWithRawResponse",
+    "AsyncSnapshotsResourceWithRawResponse",
+    "SnapshotsResourceWithStreamingResponse",
+    "AsyncSnapshotsResourceWithStreamingResponse",
+    "ConnectorsResource",
+    "AsyncConnectorsResource",
+    "ConnectorsResourceWithRawResponse",
+    "AsyncConnectorsResourceWithRawResponse",
+    "ConnectorsResourceWithStreamingResponse",
+    "AsyncConnectorsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/magic_transit/connectors/connectors.py b/src/cloudflare/resources/magic_transit/connectors/connectors.py
new file mode 100644
index 00000000000..961707d44dc
--- /dev/null
+++ b/src/cloudflare/resources/magic_transit/connectors/connectors.py
@@ -0,0 +1,832 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from .events.events import (
+    EventsResource,
+    AsyncEventsResource,
+    EventsResourceWithRawResponse,
+    AsyncEventsResourceWithRawResponse,
+    EventsResourceWithStreamingResponse,
+    AsyncEventsResourceWithStreamingResponse,
+)
+from ...._base_client import AsyncPaginator, make_request_options
+from .snapshots.snapshots import (
+    SnapshotsResource,
+    AsyncSnapshotsResource,
+    SnapshotsResourceWithRawResponse,
+    AsyncSnapshotsResourceWithRawResponse,
+    SnapshotsResourceWithStreamingResponse,
+    AsyncSnapshotsResourceWithStreamingResponse,
+)
+from ....types.magic_transit import connector_edit_params, connector_create_params, connector_update_params
+from ....types.magic_transit.connector_get_response import ConnectorGetResponse
+from ....types.magic_transit.connector_edit_response import ConnectorEditResponse
+from ....types.magic_transit.connector_list_response import ConnectorListResponse
+from ....types.magic_transit.connector_create_response import ConnectorCreateResponse
+from ....types.magic_transit.connector_delete_response import ConnectorDeleteResponse
+from ....types.magic_transit.connector_update_response import ConnectorUpdateResponse
+
+__all__ = ["ConnectorsResource", "AsyncConnectorsResource"]
+
+
+class ConnectorsResource(SyncAPIResource):
+    @cached_property
+    def events(self) -> EventsResource:
+        return EventsResource(self._client)
+
+    @cached_property
+    def snapshots(self) -> SnapshotsResource:
+        return SnapshotsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> ConnectorsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ConnectorsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ConnectorsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ConnectorsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        device: connector_create_params.Device,
+        activated: bool | Omit = omit,
+        interrupt_window_duration_hours: float | Omit = omit,
+        interrupt_window_hour_of_day: float | Omit = omit,
+        notes: str | Omit = omit,
+        timezone: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ConnectorCreateResponse:
+        """
+        Add a connector to your account
+
+        Args:
+          account_id: Account identifier
+
+          device: Exactly one of id, serial_number, or provision_license must be provided.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/magic/connectors",
+            body=maybe_transform(
+                {
+                    "device": device,
+                    "activated": activated,
+                    "interrupt_window_duration_hours": interrupt_window_duration_hours,
+                    "interrupt_window_hour_of_day": interrupt_window_hour_of_day,
+                    "notes": notes,
+                    "timezone": timezone,
+                },
+                connector_create_params.ConnectorCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ConnectorCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ConnectorCreateResponse], ResultWrapper[ConnectorCreateResponse]),
+        )
+
+    def update(
+        self,
+        connector_id: str,
+        *,
+        account_id: str,
+        activated: bool | Omit = omit,
+        interrupt_window_duration_hours: float | Omit = omit,
+        interrupt_window_hour_of_day: float | Omit = omit,
+        notes: str | Omit = omit,
+        provision_license: bool | Omit = omit,
+        timezone: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ConnectorUpdateResponse:
+        """
+        Replace Connector or Re-provision License Key
+
+        Args:
+          account_id: Account identifier
+
+          provision_license: When true, regenerate license key for the connector.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}",
+            body=maybe_transform(
+                {
+                    "activated": activated,
+                    "interrupt_window_duration_hours": interrupt_window_duration_hours,
+                    "interrupt_window_hour_of_day": interrupt_window_hour_of_day,
+                    "notes": notes,
+                    "provision_license": provision_license,
+                    "timezone": timezone,
+                },
+                connector_update_params.ConnectorUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ConnectorUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ConnectorUpdateResponse], ResultWrapper[ConnectorUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[ConnectorListResponse]:
+        """
+        List Connectors
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/magic/connectors",
+            page=SyncSinglePage[ConnectorListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=ConnectorListResponse,
+        )
+
+    def delete(
+        self,
+        connector_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ConnectorDeleteResponse:
+        """
+        Remove a connector from your account
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ConnectorDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ConnectorDeleteResponse], ResultWrapper[ConnectorDeleteResponse]),
+        )
+
+    def edit(
+        self,
+        connector_id: str,
+        *,
+        account_id: str,
+        activated: bool | Omit = omit,
+        interrupt_window_duration_hours: float | Omit = omit,
+        interrupt_window_hour_of_day: float | Omit = omit,
+        notes: str | Omit = omit,
+        provision_license: bool | Omit = omit,
+        timezone: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ConnectorEditResponse:
+        """
+        Edit Connector to update specific properties or Re-provision License Key
+
+        Args:
+          account_id: Account identifier
+
+          provision_license: When true, regenerate license key for the connector.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}",
+            body=maybe_transform(
+                {
+                    "activated": activated,
+                    "interrupt_window_duration_hours": interrupt_window_duration_hours,
+                    "interrupt_window_hour_of_day": interrupt_window_hour_of_day,
+                    "notes": notes,
+                    "provision_license": provision_license,
+                    "timezone": timezone,
+                },
+                connector_edit_params.ConnectorEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ConnectorEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ConnectorEditResponse], ResultWrapper[ConnectorEditResponse]),
+        )
+
+    def get(
+        self,
+        connector_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ConnectorGetResponse:
+        """
+        Fetch Connector
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ConnectorGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ConnectorGetResponse], ResultWrapper[ConnectorGetResponse]),
+        )
+
+
+class AsyncConnectorsResource(AsyncAPIResource):
+    @cached_property
+    def events(self) -> AsyncEventsResource:
+        return AsyncEventsResource(self._client)
+
+    @cached_property
+    def snapshots(self) -> AsyncSnapshotsResource:
+        return AsyncSnapshotsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncConnectorsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncConnectorsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncConnectorsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncConnectorsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        device: connector_create_params.Device,
+        activated: bool | Omit = omit,
+        interrupt_window_duration_hours: float | Omit = omit,
+        interrupt_window_hour_of_day: float | Omit = omit,
+        notes: str | Omit = omit,
+        timezone: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ConnectorCreateResponse:
+        """
+        Add a connector to your account
+
+        Args:
+          account_id: Account identifier
+
+          device: Exactly one of id, serial_number, or provision_license must be provided.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/magic/connectors",
+            body=await async_maybe_transform(
+                {
+                    "device": device,
+                    "activated": activated,
+                    "interrupt_window_duration_hours": interrupt_window_duration_hours,
+                    "interrupt_window_hour_of_day": interrupt_window_hour_of_day,
+                    "notes": notes,
+                    "timezone": timezone,
+                },
+                connector_create_params.ConnectorCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ConnectorCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ConnectorCreateResponse], ResultWrapper[ConnectorCreateResponse]),
+        )
+
+    async def update(
+        self,
+        connector_id: str,
+        *,
+        account_id: str,
+        activated: bool | Omit = omit,
+        interrupt_window_duration_hours: float | Omit = omit,
+        interrupt_window_hour_of_day: float | Omit = omit,
+        notes: str | Omit = omit,
+        provision_license: bool | Omit = omit,
+        timezone: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ConnectorUpdateResponse:
+        """
+        Replace Connector or Re-provision License Key
+
+        Args:
+          account_id: Account identifier
+
+          provision_license: When true, regenerate license key for the connector.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}",
+            body=await async_maybe_transform(
+                {
+                    "activated": activated,
+                    "interrupt_window_duration_hours": interrupt_window_duration_hours,
+                    "interrupt_window_hour_of_day": interrupt_window_hour_of_day,
+                    "notes": notes,
+                    "provision_license": provision_license,
+                    "timezone": timezone,
+                },
+                connector_update_params.ConnectorUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ConnectorUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ConnectorUpdateResponse], ResultWrapper[ConnectorUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ConnectorListResponse, AsyncSinglePage[ConnectorListResponse]]:
+        """
+        List Connectors
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/magic/connectors",
+            page=AsyncSinglePage[ConnectorListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=ConnectorListResponse,
+        )
+
+    async def delete(
+        self,
+        connector_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ConnectorDeleteResponse:
+        """
+        Remove a connector from your account
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ConnectorDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ConnectorDeleteResponse], ResultWrapper[ConnectorDeleteResponse]),
+        )
+
+    async def edit(
+        self,
+        connector_id: str,
+        *,
+        account_id: str,
+        activated: bool | Omit = omit,
+        interrupt_window_duration_hours: float | Omit = omit,
+        interrupt_window_hour_of_day: float | Omit = omit,
+        notes: str | Omit = omit,
+        provision_license: bool | Omit = omit,
+        timezone: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ConnectorEditResponse:
+        """
+        Edit Connector to update specific properties or Re-provision License Key
+
+        Args:
+          account_id: Account identifier
+
+          provision_license: When true, regenerate license key for the connector.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}",
+            body=await async_maybe_transform(
+                {
+                    "activated": activated,
+                    "interrupt_window_duration_hours": interrupt_window_duration_hours,
+                    "interrupt_window_hour_of_day": interrupt_window_hour_of_day,
+                    "notes": notes,
+                    "provision_license": provision_license,
+                    "timezone": timezone,
+                },
+                connector_edit_params.ConnectorEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ConnectorEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ConnectorEditResponse], ResultWrapper[ConnectorEditResponse]),
+        )
+
+    async def get(
+        self,
+        connector_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ConnectorGetResponse:
+        """
+        Fetch Connector
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ConnectorGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ConnectorGetResponse], ResultWrapper[ConnectorGetResponse]),
+        )
+
+
+class ConnectorsResourceWithRawResponse:
+    def __init__(self, connectors: ConnectorsResource) -> None:
+        self._connectors = connectors
+
+        self.create = to_raw_response_wrapper(
+            connectors.create,
+        )
+        self.update = to_raw_response_wrapper(
+            connectors.update,
+        )
+        self.list = to_raw_response_wrapper(
+            connectors.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            connectors.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            connectors.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            connectors.get,
+        )
+
+    @cached_property
+    def events(self) -> EventsResourceWithRawResponse:
+        return EventsResourceWithRawResponse(self._connectors.events)
+
+    @cached_property
+    def snapshots(self) -> SnapshotsResourceWithRawResponse:
+        return SnapshotsResourceWithRawResponse(self._connectors.snapshots)
+
+
+class AsyncConnectorsResourceWithRawResponse:
+    def __init__(self, connectors: AsyncConnectorsResource) -> None:
+        self._connectors = connectors
+
+        self.create = async_to_raw_response_wrapper(
+            connectors.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            connectors.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            connectors.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            connectors.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            connectors.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            connectors.get,
+        )
+
+    @cached_property
+    def events(self) -> AsyncEventsResourceWithRawResponse:
+        return AsyncEventsResourceWithRawResponse(self._connectors.events)
+
+    @cached_property
+    def snapshots(self) -> AsyncSnapshotsResourceWithRawResponse:
+        return AsyncSnapshotsResourceWithRawResponse(self._connectors.snapshots)
+
+
+class ConnectorsResourceWithStreamingResponse:
+    def __init__(self, connectors: ConnectorsResource) -> None:
+        self._connectors = connectors
+
+        self.create = to_streamed_response_wrapper(
+            connectors.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            connectors.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            connectors.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            connectors.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            connectors.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            connectors.get,
+        )
+
+    @cached_property
+    def events(self) -> EventsResourceWithStreamingResponse:
+        return EventsResourceWithStreamingResponse(self._connectors.events)
+
+    @cached_property
+    def snapshots(self) -> SnapshotsResourceWithStreamingResponse:
+        return SnapshotsResourceWithStreamingResponse(self._connectors.snapshots)
+
+
+class AsyncConnectorsResourceWithStreamingResponse:
+    def __init__(self, connectors: AsyncConnectorsResource) -> None:
+        self._connectors = connectors
+
+        self.create = async_to_streamed_response_wrapper(
+            connectors.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            connectors.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            connectors.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            connectors.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            connectors.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            connectors.get,
+        )
+
+    @cached_property
+    def events(self) -> AsyncEventsResourceWithStreamingResponse:
+        return AsyncEventsResourceWithStreamingResponse(self._connectors.events)
+
+    @cached_property
+    def snapshots(self) -> AsyncSnapshotsResourceWithStreamingResponse:
+        return AsyncSnapshotsResourceWithStreamingResponse(self._connectors.snapshots)
diff --git a/src/cloudflare/resources/magic_transit/connectors/events/__init__.py b/src/cloudflare/resources/magic_transit/connectors/events/__init__.py
new file mode 100644
index 00000000000..57baa6d06b5
--- /dev/null
+++ b/src/cloudflare/resources/magic_transit/connectors/events/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .events import (
+    EventsResource,
+    AsyncEventsResource,
+    EventsResourceWithRawResponse,
+    AsyncEventsResourceWithRawResponse,
+    EventsResourceWithStreamingResponse,
+    AsyncEventsResourceWithStreamingResponse,
+)
+from .latest import (
+    LatestResource,
+    AsyncLatestResource,
+    LatestResourceWithRawResponse,
+    AsyncLatestResourceWithRawResponse,
+    LatestResourceWithStreamingResponse,
+    AsyncLatestResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "LatestResource",
+    "AsyncLatestResource",
+    "LatestResourceWithRawResponse",
+    "AsyncLatestResourceWithRawResponse",
+    "LatestResourceWithStreamingResponse",
+    "AsyncLatestResourceWithStreamingResponse",
+    "EventsResource",
+    "AsyncEventsResource",
+    "EventsResourceWithRawResponse",
+    "AsyncEventsResourceWithRawResponse",
+    "EventsResourceWithStreamingResponse",
+    "AsyncEventsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/magic_transit/connectors/events/events.py b/src/cloudflare/resources/magic_transit/connectors/events/events.py
new file mode 100644
index 00000000000..d02f170e0f5
--- /dev/null
+++ b/src/cloudflare/resources/magic_transit/connectors/events/events.py
@@ -0,0 +1,353 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from .latest import (
+    LatestResource,
+    AsyncLatestResource,
+    LatestResourceWithRawResponse,
+    AsyncLatestResourceWithRawResponse,
+    LatestResourceWithStreamingResponse,
+    AsyncLatestResourceWithStreamingResponse,
+)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.magic_transit.connectors import event_list_params
+from .....types.magic_transit.connectors.event_get_response import EventGetResponse
+from .....types.magic_transit.connectors.event_list_response import EventListResponse
+
+__all__ = ["EventsResource", "AsyncEventsResource"]
+
+
+class EventsResource(SyncAPIResource):
+    @cached_property
+    def latest(self) -> LatestResource:
+        return LatestResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> EventsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return EventsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> EventsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return EventsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        connector_id: str,
+        *,
+        account_id: str,
+        from_: float,
+        to: float,
+        cursor: str | Omit = omit,
+        k: str | Omit = omit,
+        limit: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EventListResponse:
+        """
+        List Events
+
+        Args:
+          account_id: Account identifier
+
+          k: Filter by event kind
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}/telemetry/events",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "from_": from_,
+                        "to": to,
+                        "cursor": cursor,
+                        "k": k,
+                        "limit": limit,
+                    },
+                    event_list_params.EventListParams,
+                ),
+                post_parser=ResultWrapper[EventListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[EventListResponse], ResultWrapper[EventListResponse]),
+        )
+
+    def get(
+        self,
+        event_n: float,
+        *,
+        account_id: str,
+        connector_id: str,
+        event_t: float,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EventGetResponse:
+        """
+        Get Event
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}/telemetry/events/{event_t}.{event_n}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[EventGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[EventGetResponse], ResultWrapper[EventGetResponse]),
+        )
+
+
+class AsyncEventsResource(AsyncAPIResource):
+    @cached_property
+    def latest(self) -> AsyncLatestResource:
+        return AsyncLatestResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncEventsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncEventsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncEventsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncEventsResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        connector_id: str,
+        *,
+        account_id: str,
+        from_: float,
+        to: float,
+        cursor: str | Omit = omit,
+        k: str | Omit = omit,
+        limit: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EventListResponse:
+        """
+        List Events
+
+        Args:
+          account_id: Account identifier
+
+          k: Filter by event kind
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}/telemetry/events",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "from_": from_,
+                        "to": to,
+                        "cursor": cursor,
+                        "k": k,
+                        "limit": limit,
+                    },
+                    event_list_params.EventListParams,
+                ),
+                post_parser=ResultWrapper[EventListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[EventListResponse], ResultWrapper[EventListResponse]),
+        )
+
+    async def get(
+        self,
+        event_n: float,
+        *,
+        account_id: str,
+        connector_id: str,
+        event_t: float,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EventGetResponse:
+        """
+        Get Event
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}/telemetry/events/{event_t}.{event_n}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[EventGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[EventGetResponse], ResultWrapper[EventGetResponse]),
+        )
+
+
+class EventsResourceWithRawResponse:
+    def __init__(self, events: EventsResource) -> None:
+        self._events = events
+
+        self.list = to_raw_response_wrapper(
+            events.list,
+        )
+        self.get = to_raw_response_wrapper(
+            events.get,
+        )
+
+    @cached_property
+    def latest(self) -> LatestResourceWithRawResponse:
+        return LatestResourceWithRawResponse(self._events.latest)
+
+
+class AsyncEventsResourceWithRawResponse:
+    def __init__(self, events: AsyncEventsResource) -> None:
+        self._events = events
+
+        self.list = async_to_raw_response_wrapper(
+            events.list,
+        )
+        self.get = async_to_raw_response_wrapper(
+            events.get,
+        )
+
+    @cached_property
+    def latest(self) -> AsyncLatestResourceWithRawResponse:
+        return AsyncLatestResourceWithRawResponse(self._events.latest)
+
+
+class EventsResourceWithStreamingResponse:
+    def __init__(self, events: EventsResource) -> None:
+        self._events = events
+
+        self.list = to_streamed_response_wrapper(
+            events.list,
+        )
+        self.get = to_streamed_response_wrapper(
+            events.get,
+        )
+
+    @cached_property
+    def latest(self) -> LatestResourceWithStreamingResponse:
+        return LatestResourceWithStreamingResponse(self._events.latest)
+
+
+class AsyncEventsResourceWithStreamingResponse:
+    def __init__(self, events: AsyncEventsResource) -> None:
+        self._events = events
+
+        self.list = async_to_streamed_response_wrapper(
+            events.list,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            events.get,
+        )
+
+    @cached_property
+    def latest(self) -> AsyncLatestResourceWithStreamingResponse:
+        return AsyncLatestResourceWithStreamingResponse(self._events.latest)
diff --git a/src/cloudflare/resources/magic_transit/connectors/events/latest.py b/src/cloudflare/resources/magic_transit/connectors/events/latest.py
new file mode 100644
index 00000000000..a3bec2ee768
--- /dev/null
+++ b/src/cloudflare/resources/magic_transit/connectors/events/latest.py
@@ -0,0 +1,184 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ....._types import Body, Query, Headers, NotGiven, not_given
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.magic_transit.connectors.events.latest_list_response import LatestListResponse
+
+__all__ = ["LatestResource", "AsyncLatestResource"]
+
+
+class LatestResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> LatestResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return LatestResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> LatestResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return LatestResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        connector_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LatestListResponse:
+        """
+        Get latest Events
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}/telemetry/events/latest",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[LatestListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LatestListResponse], ResultWrapper[LatestListResponse]),
+        )
+
+
+class AsyncLatestResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncLatestResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncLatestResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncLatestResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncLatestResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        connector_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LatestListResponse:
+        """
+        Get latest Events
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}/telemetry/events/latest",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[LatestListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LatestListResponse], ResultWrapper[LatestListResponse]),
+        )
+
+
+class LatestResourceWithRawResponse:
+    def __init__(self, latest: LatestResource) -> None:
+        self._latest = latest
+
+        self.list = to_raw_response_wrapper(
+            latest.list,
+        )
+
+
+class AsyncLatestResourceWithRawResponse:
+    def __init__(self, latest: AsyncLatestResource) -> None:
+        self._latest = latest
+
+        self.list = async_to_raw_response_wrapper(
+            latest.list,
+        )
+
+
+class LatestResourceWithStreamingResponse:
+    def __init__(self, latest: LatestResource) -> None:
+        self._latest = latest
+
+        self.list = to_streamed_response_wrapper(
+            latest.list,
+        )
+
+
+class AsyncLatestResourceWithStreamingResponse:
+    def __init__(self, latest: AsyncLatestResource) -> None:
+        self._latest = latest
+
+        self.list = async_to_streamed_response_wrapper(
+            latest.list,
+        )
diff --git a/src/cloudflare/resources/magic_transit/connectors/snapshots/__init__.py b/src/cloudflare/resources/magic_transit/connectors/snapshots/__init__.py
new file mode 100644
index 00000000000..a0edd39e9de
--- /dev/null
+++ b/src/cloudflare/resources/magic_transit/connectors/snapshots/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .latest import (
+    LatestResource,
+    AsyncLatestResource,
+    LatestResourceWithRawResponse,
+    AsyncLatestResourceWithRawResponse,
+    LatestResourceWithStreamingResponse,
+    AsyncLatestResourceWithStreamingResponse,
+)
+from .snapshots import (
+    SnapshotsResource,
+    AsyncSnapshotsResource,
+    SnapshotsResourceWithRawResponse,
+    AsyncSnapshotsResourceWithRawResponse,
+    SnapshotsResourceWithStreamingResponse,
+    AsyncSnapshotsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "LatestResource",
+    "AsyncLatestResource",
+    "LatestResourceWithRawResponse",
+    "AsyncLatestResourceWithRawResponse",
+    "LatestResourceWithStreamingResponse",
+    "AsyncLatestResourceWithStreamingResponse",
+    "SnapshotsResource",
+    "AsyncSnapshotsResource",
+    "SnapshotsResourceWithRawResponse",
+    "AsyncSnapshotsResourceWithRawResponse",
+    "SnapshotsResourceWithStreamingResponse",
+    "AsyncSnapshotsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/magic_transit/connectors/snapshots/latest.py b/src/cloudflare/resources/magic_transit/connectors/snapshots/latest.py
new file mode 100644
index 00000000000..6f682411445
--- /dev/null
+++ b/src/cloudflare/resources/magic_transit/connectors/snapshots/latest.py
@@ -0,0 +1,184 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ....._types import Body, Query, Headers, NotGiven, not_given
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.magic_transit.connectors.snapshots.latest_list_response import LatestListResponse
+
+__all__ = ["LatestResource", "AsyncLatestResource"]
+
+
+class LatestResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> LatestResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return LatestResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> LatestResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return LatestResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        connector_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LatestListResponse:
+        """
+        Get latest Snapshots
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}/telemetry/snapshots/latest",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[LatestListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LatestListResponse], ResultWrapper[LatestListResponse]),
+        )
+
+
+class AsyncLatestResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncLatestResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncLatestResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncLatestResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncLatestResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        connector_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LatestListResponse:
+        """
+        Get latest Snapshots
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}/telemetry/snapshots/latest",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[LatestListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LatestListResponse], ResultWrapper[LatestListResponse]),
+        )
+
+
+class LatestResourceWithRawResponse:
+    def __init__(self, latest: LatestResource) -> None:
+        self._latest = latest
+
+        self.list = to_raw_response_wrapper(
+            latest.list,
+        )
+
+
+class AsyncLatestResourceWithRawResponse:
+    def __init__(self, latest: AsyncLatestResource) -> None:
+        self._latest = latest
+
+        self.list = async_to_raw_response_wrapper(
+            latest.list,
+        )
+
+
+class LatestResourceWithStreamingResponse:
+    def __init__(self, latest: LatestResource) -> None:
+        self._latest = latest
+
+        self.list = to_streamed_response_wrapper(
+            latest.list,
+        )
+
+
+class AsyncLatestResourceWithStreamingResponse:
+    def __init__(self, latest: AsyncLatestResource) -> None:
+        self._latest = latest
+
+        self.list = async_to_streamed_response_wrapper(
+            latest.list,
+        )
diff --git a/src/cloudflare/resources/magic_transit/connectors/snapshots/snapshots.py b/src/cloudflare/resources/magic_transit/connectors/snapshots/snapshots.py
new file mode 100644
index 00000000000..6a2d8029801
--- /dev/null
+++ b/src/cloudflare/resources/magic_transit/connectors/snapshots/snapshots.py
@@ -0,0 +1,343 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from .latest import (
+    LatestResource,
+    AsyncLatestResource,
+    LatestResourceWithRawResponse,
+    AsyncLatestResourceWithRawResponse,
+    LatestResourceWithStreamingResponse,
+    AsyncLatestResourceWithStreamingResponse,
+)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.magic_transit.connectors import snapshot_list_params
+from .....types.magic_transit.connectors.snapshot_get_response import SnapshotGetResponse
+from .....types.magic_transit.connectors.snapshot_list_response import SnapshotListResponse
+
+__all__ = ["SnapshotsResource", "AsyncSnapshotsResource"]
+
+
+class SnapshotsResource(SyncAPIResource):
+    @cached_property
+    def latest(self) -> LatestResource:
+        return LatestResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> SnapshotsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SnapshotsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SnapshotsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SnapshotsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        connector_id: str,
+        *,
+        account_id: str,
+        from_: float,
+        to: float,
+        cursor: str | Omit = omit,
+        limit: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SnapshotListResponse:
+        """
+        List Snapshots
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}/telemetry/snapshots",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "from_": from_,
+                        "to": to,
+                        "cursor": cursor,
+                        "limit": limit,
+                    },
+                    snapshot_list_params.SnapshotListParams,
+                ),
+                post_parser=ResultWrapper[SnapshotListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SnapshotListResponse], ResultWrapper[SnapshotListResponse]),
+        )
+
+    def get(
+        self,
+        snapshot_t: float,
+        *,
+        account_id: str,
+        connector_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SnapshotGetResponse:
+        """
+        Get Snapshot
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}/telemetry/snapshots/{snapshot_t}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SnapshotGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SnapshotGetResponse], ResultWrapper[SnapshotGetResponse]),
+        )
+
+
+class AsyncSnapshotsResource(AsyncAPIResource):
+    @cached_property
+    def latest(self) -> AsyncLatestResource:
+        return AsyncLatestResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncSnapshotsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSnapshotsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSnapshotsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSnapshotsResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        connector_id: str,
+        *,
+        account_id: str,
+        from_: float,
+        to: float,
+        cursor: str | Omit = omit,
+        limit: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SnapshotListResponse:
+        """
+        List Snapshots
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}/telemetry/snapshots",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "from_": from_,
+                        "to": to,
+                        "cursor": cursor,
+                        "limit": limit,
+                    },
+                    snapshot_list_params.SnapshotListParams,
+                ),
+                post_parser=ResultWrapper[SnapshotListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SnapshotListResponse], ResultWrapper[SnapshotListResponse]),
+        )
+
+    async def get(
+        self,
+        snapshot_t: float,
+        *,
+        account_id: str,
+        connector_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SnapshotGetResponse:
+        """
+        Get Snapshot
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/magic/connectors/{connector_id}/telemetry/snapshots/{snapshot_t}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SnapshotGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SnapshotGetResponse], ResultWrapper[SnapshotGetResponse]),
+        )
+
+
+class SnapshotsResourceWithRawResponse:
+    def __init__(self, snapshots: SnapshotsResource) -> None:
+        self._snapshots = snapshots
+
+        self.list = to_raw_response_wrapper(
+            snapshots.list,
+        )
+        self.get = to_raw_response_wrapper(
+            snapshots.get,
+        )
+
+    @cached_property
+    def latest(self) -> LatestResourceWithRawResponse:
+        return LatestResourceWithRawResponse(self._snapshots.latest)
+
+
+class AsyncSnapshotsResourceWithRawResponse:
+    def __init__(self, snapshots: AsyncSnapshotsResource) -> None:
+        self._snapshots = snapshots
+
+        self.list = async_to_raw_response_wrapper(
+            snapshots.list,
+        )
+        self.get = async_to_raw_response_wrapper(
+            snapshots.get,
+        )
+
+    @cached_property
+    def latest(self) -> AsyncLatestResourceWithRawResponse:
+        return AsyncLatestResourceWithRawResponse(self._snapshots.latest)
+
+
+class SnapshotsResourceWithStreamingResponse:
+    def __init__(self, snapshots: SnapshotsResource) -> None:
+        self._snapshots = snapshots
+
+        self.list = to_streamed_response_wrapper(
+            snapshots.list,
+        )
+        self.get = to_streamed_response_wrapper(
+            snapshots.get,
+        )
+
+    @cached_property
+    def latest(self) -> LatestResourceWithStreamingResponse:
+        return LatestResourceWithStreamingResponse(self._snapshots.latest)
+
+
+class AsyncSnapshotsResourceWithStreamingResponse:
+    def __init__(self, snapshots: AsyncSnapshotsResource) -> None:
+        self._snapshots = snapshots
+
+        self.list = async_to_streamed_response_wrapper(
+            snapshots.list,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            snapshots.get,
+        )
+
+    @cached_property
+    def latest(self) -> AsyncLatestResourceWithStreamingResponse:
+        return AsyncLatestResourceWithStreamingResponse(self._snapshots.latest)
diff --git a/src/cloudflare/resources/magic_transit/gre_tunnels.py b/src/cloudflare/resources/magic_transit/gre_tunnels.py
index 32c92784750..ffd5ac90504 100644
--- a/src/cloudflare/resources/magic_transit/gre_tunnels.py
+++ b/src/cloudflare/resources/magic_transit/gre_tunnels.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import is_given, maybe_transform, strip_not_given, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -21,13 +18,13 @@
 )
 from ..._wrappers import ResultWrapper
 from ..._base_client import make_request_options
-from ...types.magic_transit import gre_tunnel_create_params, gre_tunnel_update_params
-from ...types.magic_transit.health_check_param import HealthCheckParam
+from ...types.magic_transit import gre_tunnel_create_params, gre_tunnel_update_params, gre_tunnel_bulk_update_params
 from ...types.magic_transit.gre_tunnel_get_response import GRETunnelGetResponse
 from ...types.magic_transit.gre_tunnel_list_response import GRETunnelListResponse
 from ...types.magic_transit.gre_tunnel_create_response import GRETunnelCreateResponse
 from ...types.magic_transit.gre_tunnel_delete_response import GRETunnelDeleteResponse
 from ...types.magic_transit.gre_tunnel_update_response import GRETunnelUpdateResponse
+from ...types.magic_transit.gre_tunnel_bulk_update_response import GRETunnelBulkUpdateResponse
 
 __all__ = ["GRETunnelsResource", "AsyncGRETunnelsResource"]
 
@@ -35,25 +32,47 @@
 class GRETunnelsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> GRETunnelsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return GRETunnelsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> GRETunnelsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return GRETunnelsResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        body: object,
+        cloudflare_gre_endpoint: str,
+        customer_gre_endpoint: str,
+        interface_address: str,
+        name: str,
+        automatic_return_routing: bool | Omit = omit,
+        bgp: gre_tunnel_create_params.BGP | Omit = omit,
+        description: str | Omit = omit,
+        health_check: gre_tunnel_create_params.HealthCheck | Omit = omit,
+        interface_address6: str | Omit = omit,
+        mtu: int | Omit = omit,
+        ttl: int | Omit = omit,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> GRETunnelCreateResponse:
-        """Creates new GRE tunnels.
+        """Creates a new GRE tunnel.
 
         Use `?validate_only=true` as an optional query
         parameter to only run validation without persisting changes.
@@ -61,6 +80,32 @@ def create(
         Args:
           account_id: Identifier
 
+          cloudflare_gre_endpoint: The IP address assigned to the Cloudflare side of the GRE tunnel.
+
+          customer_gre_endpoint: The IP address assigned to the customer side of the GRE tunnel.
+
+          interface_address: A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+              of the tunnel. Select the subnet from the following private IP space:
+              10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+
+          name: The name of the tunnel. The name cannot contain spaces or special characters,
+              must be 15 characters or less, and cannot share a name with another GRE tunnel.
+
+          automatic_return_routing: True if automatic stateful return routing should be enabled for a tunnel, false
+              otherwise.
+
+          description: An optional description of the GRE tunnel.
+
+          interface_address6: A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+              address being the first IP of the subnet and not same as the address of
+              virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+              interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+
+          mtu: Maximum Transmission Unit (MTU) in bytes for the GRE tunnel. The minimum value
+              is 576.
+
+          ttl: Time To Live (TTL) in number of hops of the GRE tunnel.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -71,9 +116,34 @@ def create(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return self._post(
             f"/accounts/{account_id}/magic/gre_tunnels",
-            body=maybe_transform(body, gre_tunnel_create_params.GRETunnelCreateParams),
+            body=maybe_transform(
+                {
+                    "cloudflare_gre_endpoint": cloudflare_gre_endpoint,
+                    "customer_gre_endpoint": customer_gre_endpoint,
+                    "interface_address": interface_address,
+                    "name": name,
+                    "automatic_return_routing": automatic_return_routing,
+                    "bgp": bgp,
+                    "description": description,
+                    "health_check": health_check,
+                    "interface_address6": interface_address6,
+                    "mtu": mtu,
+                    "ttl": ttl,
+                },
+                gre_tunnel_create_params.GRETunnelCreateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -93,16 +163,19 @@ def update(
         customer_gre_endpoint: str,
         interface_address: str,
         name: str,
-        description: str | NotGiven = NOT_GIVEN,
-        health_check: HealthCheckParam | NotGiven = NOT_GIVEN,
-        mtu: int | NotGiven = NOT_GIVEN,
-        ttl: int | NotGiven = NOT_GIVEN,
+        automatic_return_routing: bool | Omit = omit,
+        description: str | Omit = omit,
+        health_check: gre_tunnel_update_params.HealthCheck | Omit = omit,
+        interface_address6: str | Omit = omit,
+        mtu: int | Omit = omit,
+        ttl: int | Omit = omit,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> GRETunnelUpdateResponse:
         """Updates a specific GRE tunnel.
 
@@ -125,8 +198,16 @@ def update(
           name: The name of the tunnel. The name cannot contain spaces or special characters,
               must be 15 characters or less, and cannot share a name with another GRE tunnel.
 
+          automatic_return_routing: True if automatic stateful return routing should be enabled for a tunnel, false
+              otherwise.
+
           description: An optional description of the GRE tunnel.
 
+          interface_address6: A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+              address being the first IP of the subnet and not same as the address of
+              virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+              interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+
           mtu: Maximum Transmission Unit (MTU) in bytes for the GRE tunnel. The minimum value
               is 576.
 
@@ -144,6 +225,16 @@ def update(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not gre_tunnel_id:
             raise ValueError(f"Expected a non-empty value for `gre_tunnel_id` but received {gre_tunnel_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return self._put(
             f"/accounts/{account_id}/magic/gre_tunnels/{gre_tunnel_id}",
             body=maybe_transform(
@@ -152,8 +243,10 @@ def update(
                     "customer_gre_endpoint": customer_gre_endpoint,
                     "interface_address": interface_address,
                     "name": name,
+                    "automatic_return_routing": automatic_return_routing,
                     "description": description,
                     "health_check": health_check,
+                    "interface_address6": interface_address6,
                     "mtu": mtu,
                     "ttl": ttl,
                 },
@@ -173,12 +266,13 @@ def list(
         self,
         *,
         account_id: str,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> GRETunnelListResponse:
         """
         Lists GRE tunnels associated with an account.
@@ -196,6 +290,16 @@ def list(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return self._get(
             f"/accounts/{account_id}/magic/gre_tunnels",
             options=make_request_options(
@@ -213,12 +317,13 @@ def delete(
         gre_tunnel_id: str,
         *,
         account_id: str,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> GRETunnelDeleteResponse:
         """Disables and removes a specific static GRE tunnel.
 
@@ -242,6 +347,16 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not gre_tunnel_id:
             raise ValueError(f"Expected a non-empty value for `gre_tunnel_id` but received {gre_tunnel_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return self._delete(
             f"/accounts/{account_id}/magic/gre_tunnels/{gre_tunnel_id}",
             options=make_request_options(
@@ -254,17 +369,72 @@ def delete(
             cast_to=cast(Type[GRETunnelDeleteResponse], ResultWrapper[GRETunnelDeleteResponse]),
         )
 
+    def bulk_update(
+        self,
+        *,
+        account_id: str,
+        body: object,
+        x_magic_new_hc_target: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> GRETunnelBulkUpdateResponse:
+        """Updates multiple GRE tunnels.
+
+        Use `?validate_only=true` as an optional query
+        parameter to only run validation without persisting changes.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
+        return self._put(
+            f"/accounts/{account_id}/magic/gre_tunnels",
+            body=maybe_transform(body, gre_tunnel_bulk_update_params.GRETunnelBulkUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[GRETunnelBulkUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[GRETunnelBulkUpdateResponse], ResultWrapper[GRETunnelBulkUpdateResponse]),
+        )
+
     def get(
         self,
         gre_tunnel_id: str,
         *,
         account_id: str,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> GRETunnelGetResponse:
         """
         Lists informtion for a specific GRE tunnel.
@@ -286,6 +456,16 @@ def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not gre_tunnel_id:
             raise ValueError(f"Expected a non-empty value for `gre_tunnel_id` but received {gre_tunnel_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return self._get(
             f"/accounts/{account_id}/magic/gre_tunnels/{gre_tunnel_id}",
             options=make_request_options(
@@ -302,25 +482,47 @@ def get(
 class AsyncGRETunnelsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncGRETunnelsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncGRETunnelsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncGRETunnelsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncGRETunnelsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        body: object,
+        cloudflare_gre_endpoint: str,
+        customer_gre_endpoint: str,
+        interface_address: str,
+        name: str,
+        automatic_return_routing: bool | Omit = omit,
+        bgp: gre_tunnel_create_params.BGP | Omit = omit,
+        description: str | Omit = omit,
+        health_check: gre_tunnel_create_params.HealthCheck | Omit = omit,
+        interface_address6: str | Omit = omit,
+        mtu: int | Omit = omit,
+        ttl: int | Omit = omit,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> GRETunnelCreateResponse:
-        """Creates new GRE tunnels.
+        """Creates a new GRE tunnel.
 
         Use `?validate_only=true` as an optional query
         parameter to only run validation without persisting changes.
@@ -328,6 +530,32 @@ async def create(
         Args:
           account_id: Identifier
 
+          cloudflare_gre_endpoint: The IP address assigned to the Cloudflare side of the GRE tunnel.
+
+          customer_gre_endpoint: The IP address assigned to the customer side of the GRE tunnel.
+
+          interface_address: A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+              of the tunnel. Select the subnet from the following private IP space:
+              10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+
+          name: The name of the tunnel. The name cannot contain spaces or special characters,
+              must be 15 characters or less, and cannot share a name with another GRE tunnel.
+
+          automatic_return_routing: True if automatic stateful return routing should be enabled for a tunnel, false
+              otherwise.
+
+          description: An optional description of the GRE tunnel.
+
+          interface_address6: A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+              address being the first IP of the subnet and not same as the address of
+              virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+              interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+
+          mtu: Maximum Transmission Unit (MTU) in bytes for the GRE tunnel. The minimum value
+              is 576.
+
+          ttl: Time To Live (TTL) in number of hops of the GRE tunnel.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -338,9 +566,34 @@ async def create(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return await self._post(
             f"/accounts/{account_id}/magic/gre_tunnels",
-            body=await async_maybe_transform(body, gre_tunnel_create_params.GRETunnelCreateParams),
+            body=await async_maybe_transform(
+                {
+                    "cloudflare_gre_endpoint": cloudflare_gre_endpoint,
+                    "customer_gre_endpoint": customer_gre_endpoint,
+                    "interface_address": interface_address,
+                    "name": name,
+                    "automatic_return_routing": automatic_return_routing,
+                    "bgp": bgp,
+                    "description": description,
+                    "health_check": health_check,
+                    "interface_address6": interface_address6,
+                    "mtu": mtu,
+                    "ttl": ttl,
+                },
+                gre_tunnel_create_params.GRETunnelCreateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -360,16 +613,19 @@ async def update(
         customer_gre_endpoint: str,
         interface_address: str,
         name: str,
-        description: str | NotGiven = NOT_GIVEN,
-        health_check: HealthCheckParam | NotGiven = NOT_GIVEN,
-        mtu: int | NotGiven = NOT_GIVEN,
-        ttl: int | NotGiven = NOT_GIVEN,
+        automatic_return_routing: bool | Omit = omit,
+        description: str | Omit = omit,
+        health_check: gre_tunnel_update_params.HealthCheck | Omit = omit,
+        interface_address6: str | Omit = omit,
+        mtu: int | Omit = omit,
+        ttl: int | Omit = omit,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> GRETunnelUpdateResponse:
         """Updates a specific GRE tunnel.
 
@@ -392,8 +648,16 @@ async def update(
           name: The name of the tunnel. The name cannot contain spaces or special characters,
               must be 15 characters or less, and cannot share a name with another GRE tunnel.
 
+          automatic_return_routing: True if automatic stateful return routing should be enabled for a tunnel, false
+              otherwise.
+
           description: An optional description of the GRE tunnel.
 
+          interface_address6: A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+              address being the first IP of the subnet and not same as the address of
+              virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+              interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+
           mtu: Maximum Transmission Unit (MTU) in bytes for the GRE tunnel. The minimum value
               is 576.
 
@@ -411,6 +675,16 @@ async def update(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not gre_tunnel_id:
             raise ValueError(f"Expected a non-empty value for `gre_tunnel_id` but received {gre_tunnel_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return await self._put(
             f"/accounts/{account_id}/magic/gre_tunnels/{gre_tunnel_id}",
             body=await async_maybe_transform(
@@ -419,8 +693,10 @@ async def update(
                     "customer_gre_endpoint": customer_gre_endpoint,
                     "interface_address": interface_address,
                     "name": name,
+                    "automatic_return_routing": automatic_return_routing,
                     "description": description,
                     "health_check": health_check,
+                    "interface_address6": interface_address6,
                     "mtu": mtu,
                     "ttl": ttl,
                 },
@@ -440,12 +716,13 @@ async def list(
         self,
         *,
         account_id: str,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> GRETunnelListResponse:
         """
         Lists GRE tunnels associated with an account.
@@ -463,6 +740,16 @@ async def list(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return await self._get(
             f"/accounts/{account_id}/magic/gre_tunnels",
             options=make_request_options(
@@ -480,12 +767,13 @@ async def delete(
         gre_tunnel_id: str,
         *,
         account_id: str,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> GRETunnelDeleteResponse:
         """Disables and removes a specific static GRE tunnel.
 
@@ -509,6 +797,16 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not gre_tunnel_id:
             raise ValueError(f"Expected a non-empty value for `gre_tunnel_id` but received {gre_tunnel_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return await self._delete(
             f"/accounts/{account_id}/magic/gre_tunnels/{gre_tunnel_id}",
             options=make_request_options(
@@ -521,17 +819,72 @@ async def delete(
             cast_to=cast(Type[GRETunnelDeleteResponse], ResultWrapper[GRETunnelDeleteResponse]),
         )
 
+    async def bulk_update(
+        self,
+        *,
+        account_id: str,
+        body: object,
+        x_magic_new_hc_target: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> GRETunnelBulkUpdateResponse:
+        """Updates multiple GRE tunnels.
+
+        Use `?validate_only=true` as an optional query
+        parameter to only run validation without persisting changes.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
+        return await self._put(
+            f"/accounts/{account_id}/magic/gre_tunnels",
+            body=await async_maybe_transform(body, gre_tunnel_bulk_update_params.GRETunnelBulkUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[GRETunnelBulkUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[GRETunnelBulkUpdateResponse], ResultWrapper[GRETunnelBulkUpdateResponse]),
+        )
+
     async def get(
         self,
         gre_tunnel_id: str,
         *,
         account_id: str,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> GRETunnelGetResponse:
         """
         Lists informtion for a specific GRE tunnel.
@@ -553,6 +906,16 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not gre_tunnel_id:
             raise ValueError(f"Expected a non-empty value for `gre_tunnel_id` but received {gre_tunnel_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return await self._get(
             f"/accounts/{account_id}/magic/gre_tunnels/{gre_tunnel_id}",
             options=make_request_options(
@@ -582,6 +945,9 @@ def __init__(self, gre_tunnels: GRETunnelsResource) -> None:
         self.delete = to_raw_response_wrapper(
             gre_tunnels.delete,
         )
+        self.bulk_update = to_raw_response_wrapper(
+            gre_tunnels.bulk_update,
+        )
         self.get = to_raw_response_wrapper(
             gre_tunnels.get,
         )
@@ -603,6 +969,9 @@ def __init__(self, gre_tunnels: AsyncGRETunnelsResource) -> None:
         self.delete = async_to_raw_response_wrapper(
             gre_tunnels.delete,
         )
+        self.bulk_update = async_to_raw_response_wrapper(
+            gre_tunnels.bulk_update,
+        )
         self.get = async_to_raw_response_wrapper(
             gre_tunnels.get,
         )
@@ -624,6 +993,9 @@ def __init__(self, gre_tunnels: GRETunnelsResource) -> None:
         self.delete = to_streamed_response_wrapper(
             gre_tunnels.delete,
         )
+        self.bulk_update = to_streamed_response_wrapper(
+            gre_tunnels.bulk_update,
+        )
         self.get = to_streamed_response_wrapper(
             gre_tunnels.get,
         )
@@ -645,6 +1017,9 @@ def __init__(self, gre_tunnels: AsyncGRETunnelsResource) -> None:
         self.delete = async_to_streamed_response_wrapper(
             gre_tunnels.delete,
         )
+        self.bulk_update = async_to_streamed_response_wrapper(
+            gre_tunnels.bulk_update,
+        )
         self.get = async_to_streamed_response_wrapper(
             gre_tunnels.get,
         )
diff --git a/src/cloudflare/resources/magic_transit/ipsec_tunnels.py b/src/cloudflare/resources/magic_transit/ipsec_tunnels.py
index f7b347a9460..e12f29bb249 100644
--- a/src/cloudflare/resources/magic_transit/ipsec_tunnels.py
+++ b/src/cloudflare/resources/magic_transit/ipsec_tunnels.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import is_given, maybe_transform, strip_not_given, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -24,14 +21,15 @@
 from ...types.magic_transit import (
     ipsec_tunnel_create_params,
     ipsec_tunnel_update_params,
+    ipsec_tunnel_bulk_update_params,
     ipsec_tunnel_psk_generate_params,
 )
-from ...types.magic_transit.health_check_param import HealthCheckParam
 from ...types.magic_transit.ipsec_tunnel_get_response import IPSECTunnelGetResponse
 from ...types.magic_transit.ipsec_tunnel_list_response import IPSECTunnelListResponse
 from ...types.magic_transit.ipsec_tunnel_create_response import IPSECTunnelCreateResponse
 from ...types.magic_transit.ipsec_tunnel_delete_response import IPSECTunnelDeleteResponse
 from ...types.magic_transit.ipsec_tunnel_update_response import IPSECTunnelUpdateResponse
+from ...types.magic_transit.ipsec_tunnel_bulk_update_response import IPSECTunnelBulkUpdateResponse
 from ...types.magic_transit.ipsec_tunnel_psk_generate_response import IPSECTunnelPSKGenerateResponse
 
 __all__ = ["IPSECTunnelsResource", "AsyncIPSECTunnelsResource"]
@@ -40,10 +38,21 @@
 class IPSECTunnelsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> IPSECTunnelsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return IPSECTunnelsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> IPSECTunnelsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return IPSECTunnelsResourceWithStreamingResponse(self)
 
     def create(
@@ -53,19 +62,24 @@ def create(
         cloudflare_endpoint: str,
         interface_address: str,
         name: str,
-        customer_endpoint: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        health_check: HealthCheckParam | NotGiven = NOT_GIVEN,
-        psk: str | NotGiven = NOT_GIVEN,
-        replay_protection: bool | NotGiven = NOT_GIVEN,
+        automatic_return_routing: bool | Omit = omit,
+        bgp: ipsec_tunnel_create_params.BGP | Omit = omit,
+        custom_remote_identities: ipsec_tunnel_create_params.CustomRemoteIdentities | Omit = omit,
+        customer_endpoint: str | Omit = omit,
+        description: str | Omit = omit,
+        health_check: ipsec_tunnel_create_params.HealthCheck | Omit = omit,
+        interface_address6: str | Omit = omit,
+        psk: str | Omit = omit,
+        replay_protection: bool | Omit = omit,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPSECTunnelCreateResponse:
-        """Creates new IPsec tunnels associated with an account.
+        """Creates a new IPsec tunnel associated with an account.
 
         Use `?validate_only=true`
         as an optional query parameter to only run validation without persisting
@@ -82,11 +96,19 @@ def create(
 
           name: The name of the IPsec tunnel. The name cannot share a name with other tunnels.
 
+          automatic_return_routing: True if automatic stateful return routing should be enabled for a tunnel, false
+              otherwise.
+
           customer_endpoint: The IP address assigned to the customer side of the IPsec tunnel. Not required,
               but must be set for proactive traceroutes to work.
 
           description: An optional description forthe IPsec tunnel.
 
+          interface_address6: A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+              address being the first IP of the subnet and not same as the address of
+              virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+              interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+
           psk: A randomly generated or provided string for use in the IPsec tunnel.
 
           replay_protection: If `true`, then IPsec replay protection will be supported in the
@@ -102,6 +124,16 @@ def create(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return self._post(
             f"/accounts/{account_id}/magic/ipsec_tunnels",
             body=maybe_transform(
@@ -109,9 +141,13 @@ def create(
                     "cloudflare_endpoint": cloudflare_endpoint,
                     "interface_address": interface_address,
                     "name": name,
+                    "automatic_return_routing": automatic_return_routing,
+                    "bgp": bgp,
+                    "custom_remote_identities": custom_remote_identities,
                     "customer_endpoint": customer_endpoint,
                     "description": description,
                     "health_check": health_check,
+                    "interface_address6": interface_address6,
                     "psk": psk,
                     "replay_protection": replay_protection,
                 },
@@ -135,17 +171,22 @@ def update(
         cloudflare_endpoint: str,
         interface_address: str,
         name: str,
-        customer_endpoint: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        health_check: HealthCheckParam | NotGiven = NOT_GIVEN,
-        psk: str | NotGiven = NOT_GIVEN,
-        replay_protection: bool | NotGiven = NOT_GIVEN,
+        automatic_return_routing: bool | Omit = omit,
+        bgp: ipsec_tunnel_update_params.BGP | Omit = omit,
+        custom_remote_identities: ipsec_tunnel_update_params.CustomRemoteIdentities | Omit = omit,
+        customer_endpoint: str | Omit = omit,
+        description: str | Omit = omit,
+        health_check: ipsec_tunnel_update_params.HealthCheck | Omit = omit,
+        interface_address6: str | Omit = omit,
+        psk: str | Omit = omit,
+        replay_protection: bool | Omit = omit,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPSECTunnelUpdateResponse:
         """Updates a specific IPsec tunnel associated with an account.
 
@@ -166,11 +207,19 @@ def update(
 
           name: The name of the IPsec tunnel. The name cannot share a name with other tunnels.
 
+          automatic_return_routing: True if automatic stateful return routing should be enabled for a tunnel, false
+              otherwise.
+
           customer_endpoint: The IP address assigned to the customer side of the IPsec tunnel. Not required,
               but must be set for proactive traceroutes to work.
 
           description: An optional description forthe IPsec tunnel.
 
+          interface_address6: A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+              address being the first IP of the subnet and not same as the address of
+              virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+              interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+
           psk: A randomly generated or provided string for use in the IPsec tunnel.
 
           replay_protection: If `true`, then IPsec replay protection will be supported in the
@@ -188,6 +237,16 @@ def update(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not ipsec_tunnel_id:
             raise ValueError(f"Expected a non-empty value for `ipsec_tunnel_id` but received {ipsec_tunnel_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return self._put(
             f"/accounts/{account_id}/magic/ipsec_tunnels/{ipsec_tunnel_id}",
             body=maybe_transform(
@@ -195,9 +254,13 @@ def update(
                     "cloudflare_endpoint": cloudflare_endpoint,
                     "interface_address": interface_address,
                     "name": name,
+                    "automatic_return_routing": automatic_return_routing,
+                    "bgp": bgp,
+                    "custom_remote_identities": custom_remote_identities,
                     "customer_endpoint": customer_endpoint,
                     "description": description,
                     "health_check": health_check,
+                    "interface_address6": interface_address6,
                     "psk": psk,
                     "replay_protection": replay_protection,
                 },
@@ -217,12 +280,13 @@ def list(
         self,
         *,
         account_id: str,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPSECTunnelListResponse:
         """
         Lists IPsec tunnels associated with an account.
@@ -240,6 +304,16 @@ def list(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return self._get(
             f"/accounts/{account_id}/magic/ipsec_tunnels",
             options=make_request_options(
@@ -257,12 +331,13 @@ def delete(
         ipsec_tunnel_id: str,
         *,
         account_id: str,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPSECTunnelDeleteResponse:
         """
         Disables and removes a specific static IPsec Tunnel associated with an account.
@@ -286,6 +361,16 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not ipsec_tunnel_id:
             raise ValueError(f"Expected a non-empty value for `ipsec_tunnel_id` but received {ipsec_tunnel_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return self._delete(
             f"/accounts/{account_id}/magic/ipsec_tunnels/{ipsec_tunnel_id}",
             options=make_request_options(
@@ -298,17 +383,73 @@ def delete(
             cast_to=cast(Type[IPSECTunnelDeleteResponse], ResultWrapper[IPSECTunnelDeleteResponse]),
         )
 
+    def bulk_update(
+        self,
+        *,
+        account_id: str,
+        body: object,
+        x_magic_new_hc_target: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> IPSECTunnelBulkUpdateResponse:
+        """Update multiple IPsec tunnels associated with an account.
+
+        Use
+        `?validate_only=true` as an optional query parameter to only run validation
+        without persisting changes.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
+        return self._put(
+            f"/accounts/{account_id}/magic/ipsec_tunnels",
+            body=maybe_transform(body, ipsec_tunnel_bulk_update_params.IPSECTunnelBulkUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[IPSECTunnelBulkUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[IPSECTunnelBulkUpdateResponse], ResultWrapper[IPSECTunnelBulkUpdateResponse]),
+        )
+
     def get(
         self,
         ipsec_tunnel_id: str,
         *,
         account_id: str,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPSECTunnelGetResponse:
         """
         Lists details for a specific IPsec tunnel.
@@ -330,6 +471,16 @@ def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not ipsec_tunnel_id:
             raise ValueError(f"Expected a non-empty value for `ipsec_tunnel_id` but received {ipsec_tunnel_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return self._get(
             f"/accounts/{account_id}/magic/ipsec_tunnels/{ipsec_tunnel_id}",
             options=make_request_options(
@@ -353,7 +504,7 @@ def psk_generate(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPSECTunnelPSKGenerateResponse:
         """
         Generates a Pre Shared Key for a specific IPsec tunnel used in the IKE session.
@@ -396,10 +547,21 @@ def psk_generate(
 class AsyncIPSECTunnelsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncIPSECTunnelsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncIPSECTunnelsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncIPSECTunnelsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncIPSECTunnelsResourceWithStreamingResponse(self)
 
     async def create(
@@ -409,19 +571,24 @@ async def create(
         cloudflare_endpoint: str,
         interface_address: str,
         name: str,
-        customer_endpoint: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        health_check: HealthCheckParam | NotGiven = NOT_GIVEN,
-        psk: str | NotGiven = NOT_GIVEN,
-        replay_protection: bool | NotGiven = NOT_GIVEN,
+        automatic_return_routing: bool | Omit = omit,
+        bgp: ipsec_tunnel_create_params.BGP | Omit = omit,
+        custom_remote_identities: ipsec_tunnel_create_params.CustomRemoteIdentities | Omit = omit,
+        customer_endpoint: str | Omit = omit,
+        description: str | Omit = omit,
+        health_check: ipsec_tunnel_create_params.HealthCheck | Omit = omit,
+        interface_address6: str | Omit = omit,
+        psk: str | Omit = omit,
+        replay_protection: bool | Omit = omit,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPSECTunnelCreateResponse:
-        """Creates new IPsec tunnels associated with an account.
+        """Creates a new IPsec tunnel associated with an account.
 
         Use `?validate_only=true`
         as an optional query parameter to only run validation without persisting
@@ -438,11 +605,19 @@ async def create(
 
           name: The name of the IPsec tunnel. The name cannot share a name with other tunnels.
 
+          automatic_return_routing: True if automatic stateful return routing should be enabled for a tunnel, false
+              otherwise.
+
           customer_endpoint: The IP address assigned to the customer side of the IPsec tunnel. Not required,
               but must be set for proactive traceroutes to work.
 
           description: An optional description forthe IPsec tunnel.
 
+          interface_address6: A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+              address being the first IP of the subnet and not same as the address of
+              virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+              interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+
           psk: A randomly generated or provided string for use in the IPsec tunnel.
 
           replay_protection: If `true`, then IPsec replay protection will be supported in the
@@ -458,6 +633,16 @@ async def create(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return await self._post(
             f"/accounts/{account_id}/magic/ipsec_tunnels",
             body=await async_maybe_transform(
@@ -465,9 +650,13 @@ async def create(
                     "cloudflare_endpoint": cloudflare_endpoint,
                     "interface_address": interface_address,
                     "name": name,
+                    "automatic_return_routing": automatic_return_routing,
+                    "bgp": bgp,
+                    "custom_remote_identities": custom_remote_identities,
                     "customer_endpoint": customer_endpoint,
                     "description": description,
                     "health_check": health_check,
+                    "interface_address6": interface_address6,
                     "psk": psk,
                     "replay_protection": replay_protection,
                 },
@@ -491,17 +680,22 @@ async def update(
         cloudflare_endpoint: str,
         interface_address: str,
         name: str,
-        customer_endpoint: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        health_check: HealthCheckParam | NotGiven = NOT_GIVEN,
-        psk: str | NotGiven = NOT_GIVEN,
-        replay_protection: bool | NotGiven = NOT_GIVEN,
+        automatic_return_routing: bool | Omit = omit,
+        bgp: ipsec_tunnel_update_params.BGP | Omit = omit,
+        custom_remote_identities: ipsec_tunnel_update_params.CustomRemoteIdentities | Omit = omit,
+        customer_endpoint: str | Omit = omit,
+        description: str | Omit = omit,
+        health_check: ipsec_tunnel_update_params.HealthCheck | Omit = omit,
+        interface_address6: str | Omit = omit,
+        psk: str | Omit = omit,
+        replay_protection: bool | Omit = omit,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPSECTunnelUpdateResponse:
         """Updates a specific IPsec tunnel associated with an account.
 
@@ -522,11 +716,19 @@ async def update(
 
           name: The name of the IPsec tunnel. The name cannot share a name with other tunnels.
 
+          automatic_return_routing: True if automatic stateful return routing should be enabled for a tunnel, false
+              otherwise.
+
           customer_endpoint: The IP address assigned to the customer side of the IPsec tunnel. Not required,
               but must be set for proactive traceroutes to work.
 
           description: An optional description forthe IPsec tunnel.
 
+          interface_address6: A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+              address being the first IP of the subnet and not same as the address of
+              virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+              interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+
           psk: A randomly generated or provided string for use in the IPsec tunnel.
 
           replay_protection: If `true`, then IPsec replay protection will be supported in the
@@ -544,6 +746,16 @@ async def update(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not ipsec_tunnel_id:
             raise ValueError(f"Expected a non-empty value for `ipsec_tunnel_id` but received {ipsec_tunnel_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return await self._put(
             f"/accounts/{account_id}/magic/ipsec_tunnels/{ipsec_tunnel_id}",
             body=await async_maybe_transform(
@@ -551,9 +763,13 @@ async def update(
                     "cloudflare_endpoint": cloudflare_endpoint,
                     "interface_address": interface_address,
                     "name": name,
+                    "automatic_return_routing": automatic_return_routing,
+                    "bgp": bgp,
+                    "custom_remote_identities": custom_remote_identities,
                     "customer_endpoint": customer_endpoint,
                     "description": description,
                     "health_check": health_check,
+                    "interface_address6": interface_address6,
                     "psk": psk,
                     "replay_protection": replay_protection,
                 },
@@ -573,12 +789,13 @@ async def list(
         self,
         *,
         account_id: str,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPSECTunnelListResponse:
         """
         Lists IPsec tunnels associated with an account.
@@ -596,6 +813,16 @@ async def list(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return await self._get(
             f"/accounts/{account_id}/magic/ipsec_tunnels",
             options=make_request_options(
@@ -613,12 +840,13 @@ async def delete(
         ipsec_tunnel_id: str,
         *,
         account_id: str,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPSECTunnelDeleteResponse:
         """
         Disables and removes a specific static IPsec Tunnel associated with an account.
@@ -642,6 +870,16 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not ipsec_tunnel_id:
             raise ValueError(f"Expected a non-empty value for `ipsec_tunnel_id` but received {ipsec_tunnel_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return await self._delete(
             f"/accounts/{account_id}/magic/ipsec_tunnels/{ipsec_tunnel_id}",
             options=make_request_options(
@@ -654,17 +892,73 @@ async def delete(
             cast_to=cast(Type[IPSECTunnelDeleteResponse], ResultWrapper[IPSECTunnelDeleteResponse]),
         )
 
+    async def bulk_update(
+        self,
+        *,
+        account_id: str,
+        body: object,
+        x_magic_new_hc_target: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> IPSECTunnelBulkUpdateResponse:
+        """Update multiple IPsec tunnels associated with an account.
+
+        Use
+        `?validate_only=true` as an optional query parameter to only run validation
+        without persisting changes.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
+        return await self._put(
+            f"/accounts/{account_id}/magic/ipsec_tunnels",
+            body=await async_maybe_transform(body, ipsec_tunnel_bulk_update_params.IPSECTunnelBulkUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[IPSECTunnelBulkUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[IPSECTunnelBulkUpdateResponse], ResultWrapper[IPSECTunnelBulkUpdateResponse]),
+        )
+
     async def get(
         self,
         ipsec_tunnel_id: str,
         *,
         account_id: str,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPSECTunnelGetResponse:
         """
         Lists details for a specific IPsec tunnel.
@@ -686,6 +980,16 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not ipsec_tunnel_id:
             raise ValueError(f"Expected a non-empty value for `ipsec_tunnel_id` but received {ipsec_tunnel_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return await self._get(
             f"/accounts/{account_id}/magic/ipsec_tunnels/{ipsec_tunnel_id}",
             options=make_request_options(
@@ -709,7 +1013,7 @@ async def psk_generate(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPSECTunnelPSKGenerateResponse:
         """
         Generates a Pre Shared Key for a specific IPsec tunnel used in the IKE session.
@@ -765,6 +1069,9 @@ def __init__(self, ipsec_tunnels: IPSECTunnelsResource) -> None:
         self.delete = to_raw_response_wrapper(
             ipsec_tunnels.delete,
         )
+        self.bulk_update = to_raw_response_wrapper(
+            ipsec_tunnels.bulk_update,
+        )
         self.get = to_raw_response_wrapper(
             ipsec_tunnels.get,
         )
@@ -789,6 +1096,9 @@ def __init__(self, ipsec_tunnels: AsyncIPSECTunnelsResource) -> None:
         self.delete = async_to_raw_response_wrapper(
             ipsec_tunnels.delete,
         )
+        self.bulk_update = async_to_raw_response_wrapper(
+            ipsec_tunnels.bulk_update,
+        )
         self.get = async_to_raw_response_wrapper(
             ipsec_tunnels.get,
         )
@@ -813,6 +1123,9 @@ def __init__(self, ipsec_tunnels: IPSECTunnelsResource) -> None:
         self.delete = to_streamed_response_wrapper(
             ipsec_tunnels.delete,
         )
+        self.bulk_update = to_streamed_response_wrapper(
+            ipsec_tunnels.bulk_update,
+        )
         self.get = to_streamed_response_wrapper(
             ipsec_tunnels.get,
         )
@@ -837,6 +1150,9 @@ def __init__(self, ipsec_tunnels: AsyncIPSECTunnelsResource) -> None:
         self.delete = async_to_streamed_response_wrapper(
             ipsec_tunnels.delete,
         )
+        self.bulk_update = async_to_streamed_response_wrapper(
+            ipsec_tunnels.bulk_update,
+        )
         self.get = async_to_streamed_response_wrapper(
             ipsec_tunnels.get,
         )
diff --git a/src/cloudflare/resources/magic_transit/magic_transit.py b/src/cloudflare/resources/magic_transit/magic_transit.py
index 7eeb84551cf..25525b42650 100644
--- a/src/cloudflare/resources/magic_transit/magic_transit.py
+++ b/src/cloudflare/resources/magic_transit/magic_transit.py
@@ -10,14 +10,6 @@
     AppsResourceWithStreamingResponse,
     AsyncAppsResourceWithStreamingResponse,
 )
-from .sites import (
-    SitesResource,
-    AsyncSitesResource,
-    SitesResourceWithRawResponse,
-    AsyncSitesResourceWithRawResponse,
-    SitesResourceWithStreamingResponse,
-    AsyncSitesResourceWithStreamingResponse,
-)
 from .routes import (
     RoutesResource,
     AsyncRoutesResource,
@@ -27,14 +19,6 @@
     AsyncRoutesResourceWithStreamingResponse,
 )
 from ..._compat import cached_property
-from .connectors import (
-    ConnectorsResource,
-    AsyncConnectorsResource,
-    ConnectorsResourceWithRawResponse,
-    AsyncConnectorsResourceWithRawResponse,
-    ConnectorsResourceWithStreamingResponse,
-    AsyncConnectorsResourceWithStreamingResponse,
-)
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from .gre_tunnels import (
     GRETunnelsResource,
@@ -44,7 +28,22 @@
     GRETunnelsResourceWithStreamingResponse,
     AsyncGRETunnelsResourceWithStreamingResponse,
 )
-from .sites.sites import SitesResource, AsyncSitesResource
+from .pcaps.pcaps import (
+    PCAPsResource,
+    AsyncPCAPsResource,
+    PCAPsResourceWithRawResponse,
+    AsyncPCAPsResourceWithRawResponse,
+    PCAPsResourceWithStreamingResponse,
+    AsyncPCAPsResourceWithStreamingResponse,
+)
+from .sites.sites import (
+    SitesResource,
+    AsyncSitesResource,
+    SitesResourceWithRawResponse,
+    AsyncSitesResourceWithRawResponse,
+    SitesResourceWithStreamingResponse,
+    AsyncSitesResourceWithStreamingResponse,
+)
 from .ipsec_tunnels import (
     IPSECTunnelsResource,
     AsyncIPSECTunnelsResource,
@@ -61,6 +60,14 @@
     CfInterconnectsResourceWithStreamingResponse,
     AsyncCfInterconnectsResourceWithStreamingResponse,
 )
+from .connectors.connectors import (
+    ConnectorsResource,
+    AsyncConnectorsResource,
+    ConnectorsResourceWithRawResponse,
+    AsyncConnectorsResourceWithRawResponse,
+    ConnectorsResourceWithStreamingResponse,
+    AsyncConnectorsResourceWithStreamingResponse,
+)
 
 __all__ = ["MagicTransitResource", "AsyncMagicTransitResource"]
 
@@ -94,12 +101,27 @@ def sites(self) -> SitesResource:
     def connectors(self) -> ConnectorsResource:
         return ConnectorsResource(self._client)
 
+    @cached_property
+    def pcaps(self) -> PCAPsResource:
+        return PCAPsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> MagicTransitResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return MagicTransitResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> MagicTransitResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return MagicTransitResourceWithStreamingResponse(self)
 
 
@@ -132,12 +154,27 @@ def sites(self) -> AsyncSitesResource:
     def connectors(self) -> AsyncConnectorsResource:
         return AsyncConnectorsResource(self._client)
 
+    @cached_property
+    def pcaps(self) -> AsyncPCAPsResource:
+        return AsyncPCAPsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncMagicTransitResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncMagicTransitResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncMagicTransitResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncMagicTransitResourceWithStreamingResponse(self)
 
 
@@ -173,6 +210,10 @@ def sites(self) -> SitesResourceWithRawResponse:
     def connectors(self) -> ConnectorsResourceWithRawResponse:
         return ConnectorsResourceWithRawResponse(self._magic_transit.connectors)
 
+    @cached_property
+    def pcaps(self) -> PCAPsResourceWithRawResponse:
+        return PCAPsResourceWithRawResponse(self._magic_transit.pcaps)
+
 
 class AsyncMagicTransitResourceWithRawResponse:
     def __init__(self, magic_transit: AsyncMagicTransitResource) -> None:
@@ -206,6 +247,10 @@ def sites(self) -> AsyncSitesResourceWithRawResponse:
     def connectors(self) -> AsyncConnectorsResourceWithRawResponse:
         return AsyncConnectorsResourceWithRawResponse(self._magic_transit.connectors)
 
+    @cached_property
+    def pcaps(self) -> AsyncPCAPsResourceWithRawResponse:
+        return AsyncPCAPsResourceWithRawResponse(self._magic_transit.pcaps)
+
 
 class MagicTransitResourceWithStreamingResponse:
     def __init__(self, magic_transit: MagicTransitResource) -> None:
@@ -239,6 +284,10 @@ def sites(self) -> SitesResourceWithStreamingResponse:
     def connectors(self) -> ConnectorsResourceWithStreamingResponse:
         return ConnectorsResourceWithStreamingResponse(self._magic_transit.connectors)
 
+    @cached_property
+    def pcaps(self) -> PCAPsResourceWithStreamingResponse:
+        return PCAPsResourceWithStreamingResponse(self._magic_transit.pcaps)
+
 
 class AsyncMagicTransitResourceWithStreamingResponse:
     def __init__(self, magic_transit: AsyncMagicTransitResource) -> None:
@@ -271,3 +320,7 @@ def sites(self) -> AsyncSitesResourceWithStreamingResponse:
     @cached_property
     def connectors(self) -> AsyncConnectorsResourceWithStreamingResponse:
         return AsyncConnectorsResourceWithStreamingResponse(self._magic_transit.connectors)
+
+    @cached_property
+    def pcaps(self) -> AsyncPCAPsResourceWithStreamingResponse:
+        return AsyncPCAPsResourceWithStreamingResponse(self._magic_transit.pcaps)
diff --git a/src/cloudflare/resources/pcaps/__init__.py b/src/cloudflare/resources/magic_transit/pcaps/__init__.py
similarity index 100%
rename from src/cloudflare/resources/pcaps/__init__.py
rename to src/cloudflare/resources/magic_transit/pcaps/__init__.py
diff --git a/src/cloudflare/resources/pcaps/download.py b/src/cloudflare/resources/magic_transit/pcaps/download.py
similarity index 77%
rename from src/cloudflare/resources/pcaps/download.py
rename to src/cloudflare/resources/magic_transit/pcaps/download.py
index 84cfebf9c6b..780af5ba4ce 100644
--- a/src/cloudflare/resources/pcaps/download.py
+++ b/src/cloudflare/resources/magic_transit/pcaps/download.py
@@ -4,10 +4,10 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
     BinaryAPIResponse,
     AsyncBinaryAPIResponse,
     StreamedBinaryAPIResponse,
@@ -17,7 +17,7 @@
     async_to_custom_raw_response_wrapper,
     async_to_custom_streamed_response_wrapper,
 )
-from ..._base_client import make_request_options
+from ...._base_client import make_request_options
 
 __all__ = ["DownloadResource", "AsyncDownloadResource"]
 
@@ -25,10 +25,21 @@
 class DownloadResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DownloadResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DownloadResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DownloadResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DownloadResourceWithStreamingResponse(self)
 
     def get(
@@ -41,16 +52,16 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> BinaryAPIResponse:
         """Download PCAP information into a file.
 
         Response is a binary PCAP file.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          pcap_id: Identifier
+          pcap_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -77,10 +88,21 @@ def get(
 class AsyncDownloadResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDownloadResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDownloadResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDownloadResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDownloadResourceWithStreamingResponse(self)
 
     async def get(
@@ -93,16 +115,16 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncBinaryAPIResponse:
         """Download PCAP information into a file.
 
         Response is a binary PCAP file.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          pcap_id: Identifier
+          pcap_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/magic_transit/pcaps/ownership.py b/src/cloudflare/resources/magic_transit/pcaps/ownership.py
new file mode 100644
index 00000000000..76e096bbcfd
--- /dev/null
+++ b/src/cloudflare/resources/magic_transit/pcaps/ownership.py
@@ -0,0 +1,485 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NoneType, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.magic_transit.pcaps import ownership_create_params, ownership_validate_params
+from ....types.magic_transit.pcaps.ownership import Ownership
+
+__all__ = ["OwnershipResource", "AsyncOwnershipResource"]
+
+
+class OwnershipResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> OwnershipResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return OwnershipResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> OwnershipResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return OwnershipResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        destination_conf: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Ownership:
+        """
+        Adds an AWS or GCP bucket to use with full packet captures.
+
+        Args:
+          account_id: Identifier.
+
+          destination_conf: The full URI for the bucket. This field only applies to `full` packet captures.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/pcaps/ownership",
+            body=maybe_transform({"destination_conf": destination_conf}, ownership_create_params.OwnershipCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Ownership]._unwrapper,
+            ),
+            cast_to=cast(Type[Ownership], ResultWrapper[Ownership]),
+        )
+
+    def delete(
+        self,
+        ownership_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Deletes buckets added to the packet captures API.
+
+        Args:
+          account_id: Identifier.
+
+          ownership_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not ownership_id:
+            raise ValueError(f"Expected a non-empty value for `ownership_id` but received {ownership_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._delete(
+            f"/accounts/{account_id}/pcaps/ownership/{ownership_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[Ownership]:
+        """
+        List all buckets configured for use with PCAPs API.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/pcaps/ownership",
+            page=SyncSinglePage[Ownership],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=Ownership,
+        )
+
+    def validate(
+        self,
+        *,
+        account_id: str,
+        destination_conf: str,
+        ownership_challenge: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Ownership:
+        """
+        Validates buckets added to the packet captures API.
+
+        Args:
+          account_id: Identifier.
+
+          destination_conf: The full URI for the bucket. This field only applies to `full` packet captures.
+
+          ownership_challenge: The ownership challenge filename stored in the bucket.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/pcaps/ownership/validate",
+            body=maybe_transform(
+                {
+                    "destination_conf": destination_conf,
+                    "ownership_challenge": ownership_challenge,
+                },
+                ownership_validate_params.OwnershipValidateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Ownership]._unwrapper,
+            ),
+            cast_to=cast(Type[Ownership], ResultWrapper[Ownership]),
+        )
+
+
+class AsyncOwnershipResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncOwnershipResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncOwnershipResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncOwnershipResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncOwnershipResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        destination_conf: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Ownership:
+        """
+        Adds an AWS or GCP bucket to use with full packet captures.
+
+        Args:
+          account_id: Identifier.
+
+          destination_conf: The full URI for the bucket. This field only applies to `full` packet captures.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/pcaps/ownership",
+            body=await async_maybe_transform(
+                {"destination_conf": destination_conf}, ownership_create_params.OwnershipCreateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Ownership]._unwrapper,
+            ),
+            cast_to=cast(Type[Ownership], ResultWrapper[Ownership]),
+        )
+
+    async def delete(
+        self,
+        ownership_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Deletes buckets added to the packet captures API.
+
+        Args:
+          account_id: Identifier.
+
+          ownership_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not ownership_id:
+            raise ValueError(f"Expected a non-empty value for `ownership_id` but received {ownership_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._delete(
+            f"/accounts/{account_id}/pcaps/ownership/{ownership_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Ownership, AsyncSinglePage[Ownership]]:
+        """
+        List all buckets configured for use with PCAPs API.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/pcaps/ownership",
+            page=AsyncSinglePage[Ownership],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=Ownership,
+        )
+
+    async def validate(
+        self,
+        *,
+        account_id: str,
+        destination_conf: str,
+        ownership_challenge: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Ownership:
+        """
+        Validates buckets added to the packet captures API.
+
+        Args:
+          account_id: Identifier.
+
+          destination_conf: The full URI for the bucket. This field only applies to `full` packet captures.
+
+          ownership_challenge: The ownership challenge filename stored in the bucket.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/pcaps/ownership/validate",
+            body=await async_maybe_transform(
+                {
+                    "destination_conf": destination_conf,
+                    "ownership_challenge": ownership_challenge,
+                },
+                ownership_validate_params.OwnershipValidateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Ownership]._unwrapper,
+            ),
+            cast_to=cast(Type[Ownership], ResultWrapper[Ownership]),
+        )
+
+
+class OwnershipResourceWithRawResponse:
+    def __init__(self, ownership: OwnershipResource) -> None:
+        self._ownership = ownership
+
+        self.create = to_raw_response_wrapper(
+            ownership.create,
+        )
+        self.delete = to_raw_response_wrapper(
+            ownership.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            ownership.get,
+        )
+        self.validate = to_raw_response_wrapper(
+            ownership.validate,
+        )
+
+
+class AsyncOwnershipResourceWithRawResponse:
+    def __init__(self, ownership: AsyncOwnershipResource) -> None:
+        self._ownership = ownership
+
+        self.create = async_to_raw_response_wrapper(
+            ownership.create,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            ownership.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            ownership.get,
+        )
+        self.validate = async_to_raw_response_wrapper(
+            ownership.validate,
+        )
+
+
+class OwnershipResourceWithStreamingResponse:
+    def __init__(self, ownership: OwnershipResource) -> None:
+        self._ownership = ownership
+
+        self.create = to_streamed_response_wrapper(
+            ownership.create,
+        )
+        self.delete = to_streamed_response_wrapper(
+            ownership.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            ownership.get,
+        )
+        self.validate = to_streamed_response_wrapper(
+            ownership.validate,
+        )
+
+
+class AsyncOwnershipResourceWithStreamingResponse:
+    def __init__(self, ownership: AsyncOwnershipResource) -> None:
+        self._ownership = ownership
+
+        self.create = async_to_streamed_response_wrapper(
+            ownership.create,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            ownership.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            ownership.get,
+        )
+        self.validate = async_to_streamed_response_wrapper(
+            ownership.validate,
+        )
diff --git a/src/cloudflare/resources/magic_transit/pcaps/pcaps.py b/src/cloudflare/resources/magic_transit/pcaps/pcaps.py
new file mode 100644
index 00000000000..27d7c351c5f
--- /dev/null
+++ b/src/cloudflare/resources/magic_transit/pcaps/pcaps.py
@@ -0,0 +1,782 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Any, Union, cast
+from datetime import datetime
+from typing_extensions import Literal, overload
+
+import httpx
+
+from .download import (
+    DownloadResource,
+    AsyncDownloadResource,
+    DownloadResourceWithRawResponse,
+    AsyncDownloadResourceWithRawResponse,
+    DownloadResourceWithStreamingResponse,
+    AsyncDownloadResourceWithStreamingResponse,
+)
+from ...._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
+from ...._utils import required_args, maybe_transform, async_maybe_transform
+from .ownership import (
+    OwnershipResource,
+    AsyncOwnershipResource,
+    OwnershipResourceWithRawResponse,
+    AsyncOwnershipResourceWithRawResponse,
+    OwnershipResourceWithStreamingResponse,
+    AsyncOwnershipResourceWithStreamingResponse,
+)
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.magic_transit import pcap_create_params
+from ....types.magic_transit.pcap_filter_param import PCAPFilterParam
+from ....types.magic_transit.pcap_get_response import PCAPGetResponse
+from ....types.magic_transit.pcap_list_response import PCAPListResponse
+from ....types.magic_transit.pcap_create_response import PCAPCreateResponse
+
+__all__ = ["PCAPsResource", "AsyncPCAPsResource"]
+
+
+class PCAPsResource(SyncAPIResource):
+    @cached_property
+    def ownership(self) -> OwnershipResource:
+        return OwnershipResource(self._client)
+
+    @cached_property
+    def download(self) -> DownloadResource:
+        return DownloadResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> PCAPsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return PCAPsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> PCAPsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return PCAPsResourceWithStreamingResponse(self)
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        packet_limit: float,
+        system: Literal["magic-transit"],
+        time_limit: float,
+        type: Literal["simple", "full"],
+        filter_v1: PCAPFilterParam | Omit = omit,
+        offset_time: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PCAPCreateResponse:
+        """
+        Create new PCAP request for account.
+
+        Args:
+          account_id: Identifier.
+
+          packet_limit: The limit of packets contained in a packet capture.
+
+          system: The system used to collect packet captures.
+
+          time_limit: The packet capture duration in seconds.
+
+          type: The type of packet capture. `Simple` captures sampled packets, and `full`
+              captures entire payloads and non-sampled packets.
+
+          filter_v1: The packet capture filter. When this field is empty, all packets are captured.
+
+          offset_time: The RFC 3339 offset timestamp from which to query backwards for packets. Must be
+              within the last 24h. When this field is empty, defaults to time of request.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        colo_name: str,
+        destination_conf: str,
+        system: Literal["magic-transit"],
+        time_limit: float,
+        type: Literal["simple", "full"],
+        byte_limit: float | Omit = omit,
+        filter_v1: PCAPFilterParam | Omit = omit,
+        packet_limit: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PCAPCreateResponse:
+        """
+        Create new PCAP request for account.
+
+        Args:
+          account_id: Identifier.
+
+          colo_name: The name of the data center used for the packet capture. This can be a specific
+              colo (ord02) or a multi-colo name (ORD). This field only applies to `full`
+              packet captures.
+
+          destination_conf: The full URI for the bucket. This field only applies to `full` packet captures.
+
+          system: The system used to collect packet captures.
+
+          time_limit: The packet capture duration in seconds.
+
+          type: The type of packet capture. `Simple` captures sampled packets, and `full`
+              captures entire payloads and non-sampled packets.
+
+          byte_limit: The maximum number of bytes to capture. This field only applies to `full` packet
+              captures.
+
+          filter_v1: The packet capture filter. When this field is empty, all packets are captured.
+
+          packet_limit: The limit of packets contained in a packet capture.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(
+        ["account_id", "packet_limit", "system", "time_limit", "type"],
+        ["account_id", "colo_name", "destination_conf", "system", "time_limit", "type"],
+    )
+    def create(
+        self,
+        *,
+        account_id: str,
+        packet_limit: float | Omit = omit,
+        system: Literal["magic-transit"],
+        time_limit: float,
+        type: Literal["simple", "full"],
+        filter_v1: PCAPFilterParam | Omit = omit,
+        offset_time: Union[str, datetime] | Omit = omit,
+        colo_name: str | Omit = omit,
+        destination_conf: str | Omit = omit,
+        byte_limit: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PCAPCreateResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return cast(
+            PCAPCreateResponse,
+            self._post(
+                f"/accounts/{account_id}/pcaps",
+                body=maybe_transform(
+                    {
+                        "packet_limit": packet_limit,
+                        "system": system,
+                        "time_limit": time_limit,
+                        "type": type,
+                        "filter_v1": filter_v1,
+                        "offset_time": offset_time,
+                        "colo_name": colo_name,
+                        "destination_conf": destination_conf,
+                        "byte_limit": byte_limit,
+                    },
+                    pcap_create_params.PCAPCreateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[PCAPCreateResponse]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[PCAPCreateResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[PCAPListResponse]:
+        """
+        Lists all packet capture requests for an account.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/pcaps",
+            page=SyncSinglePage[PCAPListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, PCAPListResponse),  # Union types cannot be passed in as arguments in the type system
+        )
+
+    def get(
+        self,
+        pcap_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PCAPGetResponse:
+        """
+        Get information for a PCAP request by id.
+
+        Args:
+          account_id: Identifier.
+
+          pcap_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not pcap_id:
+            raise ValueError(f"Expected a non-empty value for `pcap_id` but received {pcap_id!r}")
+        return cast(
+            PCAPGetResponse,
+            self._get(
+                f"/accounts/{account_id}/pcaps/{pcap_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[PCAPGetResponse]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[PCAPGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    def stop(
+        self,
+        pcap_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Stop full PCAP.
+
+        Args:
+          account_id: Identifier.
+
+          pcap_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not pcap_id:
+            raise ValueError(f"Expected a non-empty value for `pcap_id` but received {pcap_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._put(
+            f"/accounts/{account_id}/pcaps/{pcap_id}/stop",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+
+class AsyncPCAPsResource(AsyncAPIResource):
+    @cached_property
+    def ownership(self) -> AsyncOwnershipResource:
+        return AsyncOwnershipResource(self._client)
+
+    @cached_property
+    def download(self) -> AsyncDownloadResource:
+        return AsyncDownloadResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncPCAPsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncPCAPsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncPCAPsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncPCAPsResourceWithStreamingResponse(self)
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        packet_limit: float,
+        system: Literal["magic-transit"],
+        time_limit: float,
+        type: Literal["simple", "full"],
+        filter_v1: PCAPFilterParam | Omit = omit,
+        offset_time: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PCAPCreateResponse:
+        """
+        Create new PCAP request for account.
+
+        Args:
+          account_id: Identifier.
+
+          packet_limit: The limit of packets contained in a packet capture.
+
+          system: The system used to collect packet captures.
+
+          time_limit: The packet capture duration in seconds.
+
+          type: The type of packet capture. `Simple` captures sampled packets, and `full`
+              captures entire payloads and non-sampled packets.
+
+          filter_v1: The packet capture filter. When this field is empty, all packets are captured.
+
+          offset_time: The RFC 3339 offset timestamp from which to query backwards for packets. Must be
+              within the last 24h. When this field is empty, defaults to time of request.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        colo_name: str,
+        destination_conf: str,
+        system: Literal["magic-transit"],
+        time_limit: float,
+        type: Literal["simple", "full"],
+        byte_limit: float | Omit = omit,
+        filter_v1: PCAPFilterParam | Omit = omit,
+        packet_limit: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PCAPCreateResponse:
+        """
+        Create new PCAP request for account.
+
+        Args:
+          account_id: Identifier.
+
+          colo_name: The name of the data center used for the packet capture. This can be a specific
+              colo (ord02) or a multi-colo name (ORD). This field only applies to `full`
+              packet captures.
+
+          destination_conf: The full URI for the bucket. This field only applies to `full` packet captures.
+
+          system: The system used to collect packet captures.
+
+          time_limit: The packet capture duration in seconds.
+
+          type: The type of packet capture. `Simple` captures sampled packets, and `full`
+              captures entire payloads and non-sampled packets.
+
+          byte_limit: The maximum number of bytes to capture. This field only applies to `full` packet
+              captures.
+
+          filter_v1: The packet capture filter. When this field is empty, all packets are captured.
+
+          packet_limit: The limit of packets contained in a packet capture.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(
+        ["account_id", "packet_limit", "system", "time_limit", "type"],
+        ["account_id", "colo_name", "destination_conf", "system", "time_limit", "type"],
+    )
+    async def create(
+        self,
+        *,
+        account_id: str,
+        packet_limit: float | Omit = omit,
+        system: Literal["magic-transit"],
+        time_limit: float,
+        type: Literal["simple", "full"],
+        filter_v1: PCAPFilterParam | Omit = omit,
+        offset_time: Union[str, datetime] | Omit = omit,
+        colo_name: str | Omit = omit,
+        destination_conf: str | Omit = omit,
+        byte_limit: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PCAPCreateResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return cast(
+            PCAPCreateResponse,
+            await self._post(
+                f"/accounts/{account_id}/pcaps",
+                body=await async_maybe_transform(
+                    {
+                        "packet_limit": packet_limit,
+                        "system": system,
+                        "time_limit": time_limit,
+                        "type": type,
+                        "filter_v1": filter_v1,
+                        "offset_time": offset_time,
+                        "colo_name": colo_name,
+                        "destination_conf": destination_conf,
+                        "byte_limit": byte_limit,
+                    },
+                    pcap_create_params.PCAPCreateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[PCAPCreateResponse]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[PCAPCreateResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[PCAPListResponse, AsyncSinglePage[PCAPListResponse]]:
+        """
+        Lists all packet capture requests for an account.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/pcaps",
+            page=AsyncSinglePage[PCAPListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, PCAPListResponse),  # Union types cannot be passed in as arguments in the type system
+        )
+
+    async def get(
+        self,
+        pcap_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PCAPGetResponse:
+        """
+        Get information for a PCAP request by id.
+
+        Args:
+          account_id: Identifier.
+
+          pcap_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not pcap_id:
+            raise ValueError(f"Expected a non-empty value for `pcap_id` but received {pcap_id!r}")
+        return cast(
+            PCAPGetResponse,
+            await self._get(
+                f"/accounts/{account_id}/pcaps/{pcap_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[PCAPGetResponse]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[PCAPGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    async def stop(
+        self,
+        pcap_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Stop full PCAP.
+
+        Args:
+          account_id: Identifier.
+
+          pcap_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not pcap_id:
+            raise ValueError(f"Expected a non-empty value for `pcap_id` but received {pcap_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._put(
+            f"/accounts/{account_id}/pcaps/{pcap_id}/stop",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+
+class PCAPsResourceWithRawResponse:
+    def __init__(self, pcaps: PCAPsResource) -> None:
+        self._pcaps = pcaps
+
+        self.create = to_raw_response_wrapper(
+            pcaps.create,
+        )
+        self.list = to_raw_response_wrapper(
+            pcaps.list,
+        )
+        self.get = to_raw_response_wrapper(
+            pcaps.get,
+        )
+        self.stop = to_raw_response_wrapper(
+            pcaps.stop,
+        )
+
+    @cached_property
+    def ownership(self) -> OwnershipResourceWithRawResponse:
+        return OwnershipResourceWithRawResponse(self._pcaps.ownership)
+
+    @cached_property
+    def download(self) -> DownloadResourceWithRawResponse:
+        return DownloadResourceWithRawResponse(self._pcaps.download)
+
+
+class AsyncPCAPsResourceWithRawResponse:
+    def __init__(self, pcaps: AsyncPCAPsResource) -> None:
+        self._pcaps = pcaps
+
+        self.create = async_to_raw_response_wrapper(
+            pcaps.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            pcaps.list,
+        )
+        self.get = async_to_raw_response_wrapper(
+            pcaps.get,
+        )
+        self.stop = async_to_raw_response_wrapper(
+            pcaps.stop,
+        )
+
+    @cached_property
+    def ownership(self) -> AsyncOwnershipResourceWithRawResponse:
+        return AsyncOwnershipResourceWithRawResponse(self._pcaps.ownership)
+
+    @cached_property
+    def download(self) -> AsyncDownloadResourceWithRawResponse:
+        return AsyncDownloadResourceWithRawResponse(self._pcaps.download)
+
+
+class PCAPsResourceWithStreamingResponse:
+    def __init__(self, pcaps: PCAPsResource) -> None:
+        self._pcaps = pcaps
+
+        self.create = to_streamed_response_wrapper(
+            pcaps.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            pcaps.list,
+        )
+        self.get = to_streamed_response_wrapper(
+            pcaps.get,
+        )
+        self.stop = to_streamed_response_wrapper(
+            pcaps.stop,
+        )
+
+    @cached_property
+    def ownership(self) -> OwnershipResourceWithStreamingResponse:
+        return OwnershipResourceWithStreamingResponse(self._pcaps.ownership)
+
+    @cached_property
+    def download(self) -> DownloadResourceWithStreamingResponse:
+        return DownloadResourceWithStreamingResponse(self._pcaps.download)
+
+
+class AsyncPCAPsResourceWithStreamingResponse:
+    def __init__(self, pcaps: AsyncPCAPsResource) -> None:
+        self._pcaps = pcaps
+
+        self.create = async_to_streamed_response_wrapper(
+            pcaps.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            pcaps.list,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            pcaps.get,
+        )
+        self.stop = async_to_streamed_response_wrapper(
+            pcaps.stop,
+        )
+
+    @cached_property
+    def ownership(self) -> AsyncOwnershipResourceWithStreamingResponse:
+        return AsyncOwnershipResourceWithStreamingResponse(self._pcaps.ownership)
+
+    @cached_property
+    def download(self) -> AsyncDownloadResourceWithStreamingResponse:
+        return AsyncDownloadResourceWithStreamingResponse(self._pcaps.download)
diff --git a/src/cloudflare/resources/magic_transit/routes.py b/src/cloudflare/resources/magic_transit/routes.py
index 7d122a07e8e..b38cd58d58e 100644
--- a/src/cloudflare/resources/magic_transit/routes.py
+++ b/src/cloudflare/resources/magic_transit/routes.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, cast
+from typing import Type, Iterable, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -21,7 +18,7 @@
 )
 from ..._wrappers import ResultWrapper
 from ..._base_client import make_request_options
-from ...types.magic_transit import route_create_params, route_update_params
+from ...types.magic_transit import route_create_params, route_update_params, route_bulk_update_params
 from ...types.magic_transit.scope_param import ScopeParam
 from ...types.magic_transit.route_get_response import RouteGetResponse
 from ...types.magic_transit.route_list_response import RouteListResponse
@@ -29,6 +26,7 @@
 from ...types.magic_transit.route_create_response import RouteCreateResponse
 from ...types.magic_transit.route_delete_response import RouteDeleteResponse
 from ...types.magic_transit.route_update_response import RouteUpdateResponse
+from ...types.magic_transit.route_bulk_update_response import RouteBulkUpdateResponse
 
 __all__ = ["RoutesResource", "AsyncRoutesResource"]
 
@@ -36,23 +34,39 @@
 class RoutesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RoutesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RoutesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RoutesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RoutesResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        body: object,
+        nexthop: str,
+        prefix: str,
+        priority: int,
+        description: str | Omit = omit,
+        scope: ScopeParam | Omit = omit,
+        weight: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RouteCreateResponse:
         """Creates a new Magic static route.
 
@@ -62,6 +76,18 @@ def create(
         Args:
           account_id: Identifier
 
+          nexthop: The next-hop IP Address for the static route.
+
+          prefix: IP Prefix in Classless Inter-Domain Routing format.
+
+          priority: Priority of the static route.
+
+          description: An optional human provided description of the static route.
+
+          scope: Used only for ECMP routes.
+
+          weight: Optional weight of the ECMP scope - if provided.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -74,7 +100,17 @@ def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._post(
             f"/accounts/{account_id}/magic/routes",
-            body=maybe_transform(body, route_create_params.RouteCreateParams),
+            body=maybe_transform(
+                {
+                    "nexthop": nexthop,
+                    "prefix": prefix,
+                    "priority": priority,
+                    "description": description,
+                    "scope": scope,
+                    "weight": weight,
+                },
+                route_create_params.RouteCreateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -93,15 +129,15 @@ def update(
         nexthop: str,
         prefix: str,
         priority: int,
-        description: str | NotGiven = NOT_GIVEN,
-        scope: ScopeParam | NotGiven = NOT_GIVEN,
-        weight: int | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        scope: ScopeParam | Omit = omit,
+        weight: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RouteUpdateResponse:
         """Update a specific Magic static route.
 
@@ -169,7 +205,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RouteListResponse:
         """
         List all Magic static routes.
@@ -209,7 +245,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RouteDeleteResponse:
         """
         Disable and remove a specific Magic static route.
@@ -243,6 +279,50 @@ def delete(
             cast_to=cast(Type[RouteDeleteResponse], ResultWrapper[RouteDeleteResponse]),
         )
 
+    def bulk_update(
+        self,
+        *,
+        account_id: str,
+        routes: Iterable[route_bulk_update_params.Route],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RouteBulkUpdateResponse:
+        """Update multiple Magic static routes.
+
+        Use `?validate_only=true` as an optional
+        query parameter to run validation only without persisting changes. Only fields
+        for a route that need to be changed need be provided.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/magic/routes",
+            body=maybe_transform({"routes": routes}, route_bulk_update_params.RouteBulkUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RouteBulkUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[RouteBulkUpdateResponse], ResultWrapper[RouteBulkUpdateResponse]),
+        )
+
     def empty(
         self,
         *,
@@ -252,7 +332,7 @@ def empty(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RouteEmptyResponse:
         """
         Delete multiple Magic static routes.
@@ -292,7 +372,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RouteGetResponse:
         """
         Get a specific Magic static route.
@@ -330,23 +410,39 @@ def get(
 class AsyncRoutesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRoutesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRoutesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRoutesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRoutesResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        body: object,
+        nexthop: str,
+        prefix: str,
+        priority: int,
+        description: str | Omit = omit,
+        scope: ScopeParam | Omit = omit,
+        weight: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RouteCreateResponse:
         """Creates a new Magic static route.
 
@@ -356,6 +452,18 @@ async def create(
         Args:
           account_id: Identifier
 
+          nexthop: The next-hop IP Address for the static route.
+
+          prefix: IP Prefix in Classless Inter-Domain Routing format.
+
+          priority: Priority of the static route.
+
+          description: An optional human provided description of the static route.
+
+          scope: Used only for ECMP routes.
+
+          weight: Optional weight of the ECMP scope - if provided.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -368,7 +476,17 @@ async def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._post(
             f"/accounts/{account_id}/magic/routes",
-            body=await async_maybe_transform(body, route_create_params.RouteCreateParams),
+            body=await async_maybe_transform(
+                {
+                    "nexthop": nexthop,
+                    "prefix": prefix,
+                    "priority": priority,
+                    "description": description,
+                    "scope": scope,
+                    "weight": weight,
+                },
+                route_create_params.RouteCreateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -387,15 +505,15 @@ async def update(
         nexthop: str,
         prefix: str,
         priority: int,
-        description: str | NotGiven = NOT_GIVEN,
-        scope: ScopeParam | NotGiven = NOT_GIVEN,
-        weight: int | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        scope: ScopeParam | Omit = omit,
+        weight: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RouteUpdateResponse:
         """Update a specific Magic static route.
 
@@ -463,7 +581,7 @@ async def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RouteListResponse:
         """
         List all Magic static routes.
@@ -503,7 +621,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RouteDeleteResponse:
         """
         Disable and remove a specific Magic static route.
@@ -537,6 +655,50 @@ async def delete(
             cast_to=cast(Type[RouteDeleteResponse], ResultWrapper[RouteDeleteResponse]),
         )
 
+    async def bulk_update(
+        self,
+        *,
+        account_id: str,
+        routes: Iterable[route_bulk_update_params.Route],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RouteBulkUpdateResponse:
+        """Update multiple Magic static routes.
+
+        Use `?validate_only=true` as an optional
+        query parameter to run validation only without persisting changes. Only fields
+        for a route that need to be changed need be provided.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/magic/routes",
+            body=await async_maybe_transform({"routes": routes}, route_bulk_update_params.RouteBulkUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RouteBulkUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[RouteBulkUpdateResponse], ResultWrapper[RouteBulkUpdateResponse]),
+        )
+
     async def empty(
         self,
         *,
@@ -546,7 +708,7 @@ async def empty(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RouteEmptyResponse:
         """
         Delete multiple Magic static routes.
@@ -586,7 +748,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RouteGetResponse:
         """
         Get a specific Magic static route.
@@ -637,6 +799,9 @@ def __init__(self, routes: RoutesResource) -> None:
         self.delete = to_raw_response_wrapper(
             routes.delete,
         )
+        self.bulk_update = to_raw_response_wrapper(
+            routes.bulk_update,
+        )
         self.empty = to_raw_response_wrapper(
             routes.empty,
         )
@@ -661,6 +826,9 @@ def __init__(self, routes: AsyncRoutesResource) -> None:
         self.delete = async_to_raw_response_wrapper(
             routes.delete,
         )
+        self.bulk_update = async_to_raw_response_wrapper(
+            routes.bulk_update,
+        )
         self.empty = async_to_raw_response_wrapper(
             routes.empty,
         )
@@ -685,6 +853,9 @@ def __init__(self, routes: RoutesResource) -> None:
         self.delete = to_streamed_response_wrapper(
             routes.delete,
         )
+        self.bulk_update = to_streamed_response_wrapper(
+            routes.bulk_update,
+        )
         self.empty = to_streamed_response_wrapper(
             routes.empty,
         )
@@ -709,6 +880,9 @@ def __init__(self, routes: AsyncRoutesResource) -> None:
         self.delete = async_to_streamed_response_wrapper(
             routes.delete,
         )
+        self.bulk_update = async_to_streamed_response_wrapper(
+            routes.bulk_update,
+        )
         self.empty = async_to_streamed_response_wrapper(
             routes.empty,
         )
diff --git a/src/cloudflare/resources/magic_transit/sites/acls.py b/src/cloudflare/resources/magic_transit/sites/acls.py
index b7957dd5131..309e9a5c9ac 100644
--- a/src/cloudflare/resources/magic_transit/sites/acls.py
+++ b/src/cloudflare/resources/magic_transit/sites/acls.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -33,10 +30,21 @@
 class ACLsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ACLsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ACLsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ACLsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ACLsResourceWithStreamingResponse(self)
 
     def create(
@@ -47,15 +55,16 @@ def create(
         lan_1: ACLConfigurationParam,
         lan_2: ACLConfigurationParam,
         name: str,
-        description: str | NotGiven = NOT_GIVEN,
-        forward_locally: bool | NotGiven = NOT_GIVEN,
-        protocols: List[AllowedProtocol] | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        forward_locally: bool | Omit = omit,
+        protocols: List[AllowedProtocol] | Omit = omit,
+        unidirectional: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ACL:
         """
         Creates a new Site ACL.
@@ -74,6 +83,10 @@ def create(
               traffic locally on the Magic Connector. If not included in request, will default
               to false.
 
+          unidirectional: The desired traffic direction for this ACL policy. If set to "false", the policy
+              will allow bidirectional traffic. If set to "true", the policy will only allow
+              traffic in one direction. If not included in request, will default to false.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -96,6 +109,7 @@ def create(
                     "description": description,
                     "forward_locally": forward_locally,
                     "protocols": protocols,
+                    "unidirectional": unidirectional,
                 },
                 acl_create_params.ACLCreateParams,
             ),
@@ -115,18 +129,19 @@ def update(
         *,
         account_id: str,
         site_id: str,
-        description: str | NotGiven = NOT_GIVEN,
-        forward_locally: bool | NotGiven = NOT_GIVEN,
-        lan_1: ACLConfigurationParam | NotGiven = NOT_GIVEN,
-        lan_2: ACLConfigurationParam | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        protocols: List[AllowedProtocol] | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        forward_locally: bool | Omit = omit,
+        lan_1: ACLConfigurationParam | Omit = omit,
+        lan_2: ACLConfigurationParam | Omit = omit,
+        name: str | Omit = omit,
+        protocols: List[AllowedProtocol] | Omit = omit,
+        unidirectional: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ACL:
         """
         Update a specific Site ACL.
@@ -147,6 +162,10 @@ def update(
 
           name: The name of the ACL.
 
+          unidirectional: The desired traffic direction for this ACL policy. If set to "false", the policy
+              will allow bidirectional traffic. If set to "true", the policy will only allow
+              traffic in one direction. If not included in request, will default to false.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -171,6 +190,7 @@ def update(
                     "lan_2": lan_2,
                     "name": name,
                     "protocols": protocols,
+                    "unidirectional": unidirectional,
                 },
                 acl_update_params.ACLUpdateParams,
             ),
@@ -194,7 +214,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[ACL]:
         """
         Lists Site ACLs associated with an account.
@@ -236,7 +256,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ACL:
         """
         Remove a specific Site ACL.
@@ -280,18 +300,19 @@ def edit(
         *,
         account_id: str,
         site_id: str,
-        description: str | NotGiven = NOT_GIVEN,
-        forward_locally: bool | NotGiven = NOT_GIVEN,
-        lan_1: ACLConfigurationParam | NotGiven = NOT_GIVEN,
-        lan_2: ACLConfigurationParam | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        protocols: List[AllowedProtocol] | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        forward_locally: bool | Omit = omit,
+        lan_1: ACLConfigurationParam | Omit = omit,
+        lan_2: ACLConfigurationParam | Omit = omit,
+        name: str | Omit = omit,
+        protocols: List[AllowedProtocol] | Omit = omit,
+        unidirectional: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ACL:
         """
         Patch a specific Site ACL.
@@ -312,6 +333,10 @@ def edit(
 
           name: The name of the ACL.
 
+          unidirectional: The desired traffic direction for this ACL policy. If set to "false", the policy
+              will allow bidirectional traffic. If set to "true", the policy will only allow
+              traffic in one direction. If not included in request, will default to false.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -336,6 +361,7 @@ def edit(
                     "lan_2": lan_2,
                     "name": name,
                     "protocols": protocols,
+                    "unidirectional": unidirectional,
                 },
                 acl_edit_params.ACLEditParams,
             ),
@@ -360,7 +386,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ACL:
         """
         Get a specific Site ACL.
@@ -402,10 +428,21 @@ def get(
 class AsyncACLsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncACLsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncACLsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncACLsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncACLsResourceWithStreamingResponse(self)
 
     async def create(
@@ -416,15 +453,16 @@ async def create(
         lan_1: ACLConfigurationParam,
         lan_2: ACLConfigurationParam,
         name: str,
-        description: str | NotGiven = NOT_GIVEN,
-        forward_locally: bool | NotGiven = NOT_GIVEN,
-        protocols: List[AllowedProtocol] | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        forward_locally: bool | Omit = omit,
+        protocols: List[AllowedProtocol] | Omit = omit,
+        unidirectional: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ACL:
         """
         Creates a new Site ACL.
@@ -443,6 +481,10 @@ async def create(
               traffic locally on the Magic Connector. If not included in request, will default
               to false.
 
+          unidirectional: The desired traffic direction for this ACL policy. If set to "false", the policy
+              will allow bidirectional traffic. If set to "true", the policy will only allow
+              traffic in one direction. If not included in request, will default to false.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -465,6 +507,7 @@ async def create(
                     "description": description,
                     "forward_locally": forward_locally,
                     "protocols": protocols,
+                    "unidirectional": unidirectional,
                 },
                 acl_create_params.ACLCreateParams,
             ),
@@ -484,18 +527,19 @@ async def update(
         *,
         account_id: str,
         site_id: str,
-        description: str | NotGiven = NOT_GIVEN,
-        forward_locally: bool | NotGiven = NOT_GIVEN,
-        lan_1: ACLConfigurationParam | NotGiven = NOT_GIVEN,
-        lan_2: ACLConfigurationParam | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        protocols: List[AllowedProtocol] | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        forward_locally: bool | Omit = omit,
+        lan_1: ACLConfigurationParam | Omit = omit,
+        lan_2: ACLConfigurationParam | Omit = omit,
+        name: str | Omit = omit,
+        protocols: List[AllowedProtocol] | Omit = omit,
+        unidirectional: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ACL:
         """
         Update a specific Site ACL.
@@ -516,6 +560,10 @@ async def update(
 
           name: The name of the ACL.
 
+          unidirectional: The desired traffic direction for this ACL policy. If set to "false", the policy
+              will allow bidirectional traffic. If set to "true", the policy will only allow
+              traffic in one direction. If not included in request, will default to false.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -540,6 +588,7 @@ async def update(
                     "lan_2": lan_2,
                     "name": name,
                     "protocols": protocols,
+                    "unidirectional": unidirectional,
                 },
                 acl_update_params.ACLUpdateParams,
             ),
@@ -563,7 +612,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[ACL, AsyncSinglePage[ACL]]:
         """
         Lists Site ACLs associated with an account.
@@ -605,7 +654,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ACL:
         """
         Remove a specific Site ACL.
@@ -649,18 +698,19 @@ async def edit(
         *,
         account_id: str,
         site_id: str,
-        description: str | NotGiven = NOT_GIVEN,
-        forward_locally: bool | NotGiven = NOT_GIVEN,
-        lan_1: ACLConfigurationParam | NotGiven = NOT_GIVEN,
-        lan_2: ACLConfigurationParam | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        protocols: List[AllowedProtocol] | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        forward_locally: bool | Omit = omit,
+        lan_1: ACLConfigurationParam | Omit = omit,
+        lan_2: ACLConfigurationParam | Omit = omit,
+        name: str | Omit = omit,
+        protocols: List[AllowedProtocol] | Omit = omit,
+        unidirectional: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ACL:
         """
         Patch a specific Site ACL.
@@ -681,6 +731,10 @@ async def edit(
 
           name: The name of the ACL.
 
+          unidirectional: The desired traffic direction for this ACL policy. If set to "false", the policy
+              will allow bidirectional traffic. If set to "true", the policy will only allow
+              traffic in one direction. If not included in request, will default to false.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -705,6 +759,7 @@ async def edit(
                     "lan_2": lan_2,
                     "name": name,
                     "protocols": protocols,
+                    "unidirectional": unidirectional,
                 },
                 acl_edit_params.ACLEditParams,
             ),
@@ -729,7 +784,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ACL:
         """
         Get a specific Site ACL.
diff --git a/src/cloudflare/resources/magic_transit/sites/lans.py b/src/cloudflare/resources/magic_transit/sites/lans.py
index 8232dbc6418..a38a961f721 100644
--- a/src/cloudflare/resources/magic_transit/sites/lans.py
+++ b/src/cloudflare/resources/magic_transit/sites/lans.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -29,7 +26,6 @@
 )
 from ....types.magic_transit.sites.lan import LAN
 from ....types.magic_transit.sites.nat_param import NatParam
-from ....types.magic_transit.sites.lan_create_response import LANCreateResponse
 from ....types.magic_transit.sites.routed_subnet_param import RoutedSubnetParam
 from ....types.magic_transit.sites.lan_static_addressing_param import LANStaticAddressingParam
 
@@ -39,10 +35,21 @@
 class LANsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> LANsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LANsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LANsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LANsResourceWithStreamingResponse(self)
 
     def create(
@@ -50,20 +57,21 @@ def create(
         site_id: str,
         *,
         account_id: str,
-        physport: int,
-        vlan_tag: int,
-        ha_link: bool | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        nat: NatParam | NotGiven = NOT_GIVEN,
-        routed_subnets: Iterable[RoutedSubnetParam] | NotGiven = NOT_GIVEN,
-        static_addressing: LANStaticAddressingParam | NotGiven = NOT_GIVEN,
+        bond_id: int | Omit = omit,
+        ha_link: bool | Omit = omit,
+        name: str | Omit = omit,
+        nat: NatParam | Omit = omit,
+        physport: int | Omit = omit,
+        routed_subnets: Iterable[RoutedSubnetParam] | Omit = omit,
+        static_addressing: LANStaticAddressingParam | Omit = omit,
+        vlan_tag: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> LANCreateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[LAN]:
         """Creates a new Site LAN.
 
         If the site is in high availability mode,
@@ -74,8 +82,6 @@ def create(
 
           site_id: Identifier
 
-          vlan_tag: VLAN port number.
-
           ha_link: mark true to use this LAN for HA probing. only works for site with HA turned on.
               only one LAN can be set as the ha_link.
 
@@ -83,6 +89,8 @@ def create(
               optional (if omitted, use DHCP). However, if in high availability mode,
               static_address is required along with secondary and virtual address.
 
+          vlan_tag: VLAN ID. Use zero for untagged.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -95,28 +103,27 @@ def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not site_id:
             raise ValueError(f"Expected a non-empty value for `site_id` but received {site_id!r}")
-        return self._post(
+        return self._get_api_list(
             f"/accounts/{account_id}/magic/sites/{site_id}/lans",
+            page=SyncSinglePage[LAN],
             body=maybe_transform(
                 {
-                    "physport": physport,
-                    "vlan_tag": vlan_tag,
+                    "bond_id": bond_id,
                     "ha_link": ha_link,
                     "name": name,
                     "nat": nat,
+                    "physport": physport,
                     "routed_subnets": routed_subnets,
                     "static_addressing": static_addressing,
+                    "vlan_tag": vlan_tag,
                 },
                 lan_create_params.LANCreateParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[LANCreateResponse]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[LANCreateResponse], ResultWrapper[LANCreateResponse]),
+            model=LAN,
+            method="post",
         )
 
     def update(
@@ -125,18 +132,19 @@ def update(
         *,
         account_id: str,
         site_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        nat: NatParam | NotGiven = NOT_GIVEN,
-        physport: int | NotGiven = NOT_GIVEN,
-        routed_subnets: Iterable[RoutedSubnetParam] | NotGiven = NOT_GIVEN,
-        static_addressing: LANStaticAddressingParam | NotGiven = NOT_GIVEN,
-        vlan_tag: int | NotGiven = NOT_GIVEN,
+        bond_id: int | Omit = omit,
+        name: str | Omit = omit,
+        nat: NatParam | Omit = omit,
+        physport: int | Omit = omit,
+        routed_subnets: Iterable[RoutedSubnetParam] | Omit = omit,
+        static_addressing: LANStaticAddressingParam | Omit = omit,
+        vlan_tag: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LAN:
         """
         Update a specific Site LAN.
@@ -152,7 +160,7 @@ def update(
               optional (if omitted, use DHCP). However, if in high availability mode,
               static_address is required along with secondary and virtual address.
 
-          vlan_tag: VLAN port number.
+          vlan_tag: VLAN ID. Use zero for untagged.
 
           extra_headers: Send extra headers
 
@@ -172,6 +180,7 @@ def update(
             f"/accounts/{account_id}/magic/sites/{site_id}/lans/{lan_id}",
             body=maybe_transform(
                 {
+                    "bond_id": bond_id,
                     "name": name,
                     "nat": nat,
                     "physport": physport,
@@ -201,7 +210,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[LAN]:
         """
         Lists Site LANs associated with an account.
@@ -243,7 +252,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LAN:
         """
         Remove a specific Site LAN.
@@ -287,18 +296,19 @@ def edit(
         *,
         account_id: str,
         site_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        nat: NatParam | NotGiven = NOT_GIVEN,
-        physport: int | NotGiven = NOT_GIVEN,
-        routed_subnets: Iterable[RoutedSubnetParam] | NotGiven = NOT_GIVEN,
-        static_addressing: LANStaticAddressingParam | NotGiven = NOT_GIVEN,
-        vlan_tag: int | NotGiven = NOT_GIVEN,
+        bond_id: int | Omit = omit,
+        name: str | Omit = omit,
+        nat: NatParam | Omit = omit,
+        physport: int | Omit = omit,
+        routed_subnets: Iterable[RoutedSubnetParam] | Omit = omit,
+        static_addressing: LANStaticAddressingParam | Omit = omit,
+        vlan_tag: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LAN:
         """
         Patch a specific Site LAN.
@@ -314,7 +324,7 @@ def edit(
               optional (if omitted, use DHCP). However, if in high availability mode,
               static_address is required along with secondary and virtual address.
 
-          vlan_tag: VLAN port number.
+          vlan_tag: VLAN ID. Use zero for untagged.
 
           extra_headers: Send extra headers
 
@@ -334,6 +344,7 @@ def edit(
             f"/accounts/{account_id}/magic/sites/{site_id}/lans/{lan_id}",
             body=maybe_transform(
                 {
+                    "bond_id": bond_id,
                     "name": name,
                     "nat": nat,
                     "physport": physport,
@@ -364,7 +375,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LAN:
         """
         Get a specific Site LAN.
@@ -406,31 +417,43 @@ def get(
 class AsyncLANsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncLANsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLANsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLANsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLANsResourceWithStreamingResponse(self)
 
-    async def create(
+    def create(
         self,
         site_id: str,
         *,
         account_id: str,
-        physport: int,
-        vlan_tag: int,
-        ha_link: bool | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        nat: NatParam | NotGiven = NOT_GIVEN,
-        routed_subnets: Iterable[RoutedSubnetParam] | NotGiven = NOT_GIVEN,
-        static_addressing: LANStaticAddressingParam | NotGiven = NOT_GIVEN,
+        bond_id: int | Omit = omit,
+        ha_link: bool | Omit = omit,
+        name: str | Omit = omit,
+        nat: NatParam | Omit = omit,
+        physport: int | Omit = omit,
+        routed_subnets: Iterable[RoutedSubnetParam] | Omit = omit,
+        static_addressing: LANStaticAddressingParam | Omit = omit,
+        vlan_tag: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> LANCreateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[LAN, AsyncSinglePage[LAN]]:
         """Creates a new Site LAN.
 
         If the site is in high availability mode,
@@ -441,8 +464,6 @@ async def create(
 
           site_id: Identifier
 
-          vlan_tag: VLAN port number.
-
           ha_link: mark true to use this LAN for HA probing. only works for site with HA turned on.
               only one LAN can be set as the ha_link.
 
@@ -450,6 +471,8 @@ async def create(
               optional (if omitted, use DHCP). However, if in high availability mode,
               static_address is required along with secondary and virtual address.
 
+          vlan_tag: VLAN ID. Use zero for untagged.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -462,28 +485,27 @@ async def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not site_id:
             raise ValueError(f"Expected a non-empty value for `site_id` but received {site_id!r}")
-        return await self._post(
+        return self._get_api_list(
             f"/accounts/{account_id}/magic/sites/{site_id}/lans",
-            body=await async_maybe_transform(
+            page=AsyncSinglePage[LAN],
+            body=maybe_transform(
                 {
-                    "physport": physport,
-                    "vlan_tag": vlan_tag,
+                    "bond_id": bond_id,
                     "ha_link": ha_link,
                     "name": name,
                     "nat": nat,
+                    "physport": physport,
                     "routed_subnets": routed_subnets,
                     "static_addressing": static_addressing,
+                    "vlan_tag": vlan_tag,
                 },
                 lan_create_params.LANCreateParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[LANCreateResponse]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[LANCreateResponse], ResultWrapper[LANCreateResponse]),
+            model=LAN,
+            method="post",
         )
 
     async def update(
@@ -492,18 +514,19 @@ async def update(
         *,
         account_id: str,
         site_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        nat: NatParam | NotGiven = NOT_GIVEN,
-        physport: int | NotGiven = NOT_GIVEN,
-        routed_subnets: Iterable[RoutedSubnetParam] | NotGiven = NOT_GIVEN,
-        static_addressing: LANStaticAddressingParam | NotGiven = NOT_GIVEN,
-        vlan_tag: int | NotGiven = NOT_GIVEN,
+        bond_id: int | Omit = omit,
+        name: str | Omit = omit,
+        nat: NatParam | Omit = omit,
+        physport: int | Omit = omit,
+        routed_subnets: Iterable[RoutedSubnetParam] | Omit = omit,
+        static_addressing: LANStaticAddressingParam | Omit = omit,
+        vlan_tag: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LAN:
         """
         Update a specific Site LAN.
@@ -519,7 +542,7 @@ async def update(
               optional (if omitted, use DHCP). However, if in high availability mode,
               static_address is required along with secondary and virtual address.
 
-          vlan_tag: VLAN port number.
+          vlan_tag: VLAN ID. Use zero for untagged.
 
           extra_headers: Send extra headers
 
@@ -539,6 +562,7 @@ async def update(
             f"/accounts/{account_id}/magic/sites/{site_id}/lans/{lan_id}",
             body=await async_maybe_transform(
                 {
+                    "bond_id": bond_id,
                     "name": name,
                     "nat": nat,
                     "physport": physport,
@@ -568,7 +592,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[LAN, AsyncSinglePage[LAN]]:
         """
         Lists Site LANs associated with an account.
@@ -610,7 +634,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LAN:
         """
         Remove a specific Site LAN.
@@ -654,18 +678,19 @@ async def edit(
         *,
         account_id: str,
         site_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        nat: NatParam | NotGiven = NOT_GIVEN,
-        physport: int | NotGiven = NOT_GIVEN,
-        routed_subnets: Iterable[RoutedSubnetParam] | NotGiven = NOT_GIVEN,
-        static_addressing: LANStaticAddressingParam | NotGiven = NOT_GIVEN,
-        vlan_tag: int | NotGiven = NOT_GIVEN,
+        bond_id: int | Omit = omit,
+        name: str | Omit = omit,
+        nat: NatParam | Omit = omit,
+        physport: int | Omit = omit,
+        routed_subnets: Iterable[RoutedSubnetParam] | Omit = omit,
+        static_addressing: LANStaticAddressingParam | Omit = omit,
+        vlan_tag: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LAN:
         """
         Patch a specific Site LAN.
@@ -681,7 +706,7 @@ async def edit(
               optional (if omitted, use DHCP). However, if in high availability mode,
               static_address is required along with secondary and virtual address.
 
-          vlan_tag: VLAN port number.
+          vlan_tag: VLAN ID. Use zero for untagged.
 
           extra_headers: Send extra headers
 
@@ -701,6 +726,7 @@ async def edit(
             f"/accounts/{account_id}/magic/sites/{site_id}/lans/{lan_id}",
             body=await async_maybe_transform(
                 {
+                    "bond_id": bond_id,
                     "name": name,
                     "nat": nat,
                     "physport": physport,
@@ -731,7 +757,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LAN:
         """
         Get a specific Site LAN.
diff --git a/src/cloudflare/resources/magic_transit/sites/sites.py b/src/cloudflare/resources/magic_transit/sites/sites.py
index ac9dec96af6..cc3cb96bf58 100644
--- a/src/cloudflare/resources/magic_transit/sites/sites.py
+++ b/src/cloudflare/resources/magic_transit/sites/sites.py
@@ -30,11 +30,8 @@
     WANsResourceWithStreamingResponse,
     AsyncWANsResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import is_given, maybe_transform, strip_not_given, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -73,10 +70,21 @@ def wans(self) -> WANsResource:
 
     @cached_property
     def with_raw_response(self) -> SitesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SitesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SitesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SitesResourceWithStreamingResponse(self)
 
     def create(
@@ -84,17 +92,17 @@ def create(
         *,
         account_id: str,
         name: str,
-        connector_id: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        ha_mode: bool | NotGiven = NOT_GIVEN,
-        location: SiteLocationParam | NotGiven = NOT_GIVEN,
-        secondary_connector_id: str | NotGiven = NOT_GIVEN,
+        connector_id: str | Omit = omit,
+        description: str | Omit = omit,
+        ha_mode: bool | Omit = omit,
+        location: SiteLocationParam | Omit = omit,
+        secondary_connector_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Site:
         """
         Creates a new Site
@@ -151,17 +159,17 @@ def update(
         site_id: str,
         *,
         account_id: str,
-        connector_id: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        location: SiteLocationParam | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        secondary_connector_id: str | NotGiven = NOT_GIVEN,
+        connector_id: str | Omit = omit,
+        description: str | Omit = omit,
+        location: SiteLocationParam | Omit = omit,
+        name: str | Omit = omit,
+        secondary_connector_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Site:
         """
         Update a specific Site.
@@ -217,24 +225,24 @@ def list(
         self,
         *,
         account_id: str,
-        connector_identifier: str | NotGiven = NOT_GIVEN,
+        connectorid: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Site]:
         """Lists Sites associated with an account.
 
-        Use connector_identifier query param to
-        return sites where connector_identifier matches either site.ConnectorID or
+        Use connectorid query param to return
+        sites where connectorid matches either site.ConnectorID or
         site.SecondaryConnectorID.
 
         Args:
           account_id: Identifier
 
-          connector_identifier: Identifier
+          connectorid: Identifier
 
           extra_headers: Send extra headers
 
@@ -254,7 +262,7 @@ def list(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=maybe_transform({"connector_identifier": connector_identifier}, site_list_params.SiteListParams),
+                query=maybe_transform({"connectorid": connectorid}, site_list_params.SiteListParams),
             ),
             model=Site,
         )
@@ -269,7 +277,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Site:
         """
         Remove a specific Site.
@@ -308,17 +316,17 @@ def edit(
         site_id: str,
         *,
         account_id: str,
-        connector_id: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        location: SiteLocationParam | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        secondary_connector_id: str | NotGiven = NOT_GIVEN,
+        connector_id: str | Omit = omit,
+        description: str | Omit = omit,
+        location: SiteLocationParam | Omit = omit,
+        name: str | Omit = omit,
+        secondary_connector_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Site:
         """
         Patch a specific Site.
@@ -375,12 +383,13 @@ def get(
         site_id: str,
         *,
         account_id: str,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Site:
         """
         Get a specific Site.
@@ -402,6 +411,16 @@ def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not site_id:
             raise ValueError(f"Expected a non-empty value for `site_id` but received {site_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return self._get(
             f"/accounts/{account_id}/magic/sites/{site_id}",
             options=make_request_options(
@@ -430,10 +449,21 @@ def wans(self) -> AsyncWANsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncSitesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSitesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSitesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSitesResourceWithStreamingResponse(self)
 
     async def create(
@@ -441,17 +471,17 @@ async def create(
         *,
         account_id: str,
         name: str,
-        connector_id: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        ha_mode: bool | NotGiven = NOT_GIVEN,
-        location: SiteLocationParam | NotGiven = NOT_GIVEN,
-        secondary_connector_id: str | NotGiven = NOT_GIVEN,
+        connector_id: str | Omit = omit,
+        description: str | Omit = omit,
+        ha_mode: bool | Omit = omit,
+        location: SiteLocationParam | Omit = omit,
+        secondary_connector_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Site:
         """
         Creates a new Site
@@ -508,17 +538,17 @@ async def update(
         site_id: str,
         *,
         account_id: str,
-        connector_id: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        location: SiteLocationParam | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        secondary_connector_id: str | NotGiven = NOT_GIVEN,
+        connector_id: str | Omit = omit,
+        description: str | Omit = omit,
+        location: SiteLocationParam | Omit = omit,
+        name: str | Omit = omit,
+        secondary_connector_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Site:
         """
         Update a specific Site.
@@ -574,24 +604,24 @@ def list(
         self,
         *,
         account_id: str,
-        connector_identifier: str | NotGiven = NOT_GIVEN,
+        connectorid: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Site, AsyncSinglePage[Site]]:
         """Lists Sites associated with an account.
 
-        Use connector_identifier query param to
-        return sites where connector_identifier matches either site.ConnectorID or
+        Use connectorid query param to return
+        sites where connectorid matches either site.ConnectorID or
         site.SecondaryConnectorID.
 
         Args:
           account_id: Identifier
 
-          connector_identifier: Identifier
+          connectorid: Identifier
 
           extra_headers: Send extra headers
 
@@ -611,7 +641,7 @@ def list(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=maybe_transform({"connector_identifier": connector_identifier}, site_list_params.SiteListParams),
+                query=maybe_transform({"connectorid": connectorid}, site_list_params.SiteListParams),
             ),
             model=Site,
         )
@@ -626,7 +656,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Site:
         """
         Remove a specific Site.
@@ -665,17 +695,17 @@ async def edit(
         site_id: str,
         *,
         account_id: str,
-        connector_id: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        location: SiteLocationParam | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        secondary_connector_id: str | NotGiven = NOT_GIVEN,
+        connector_id: str | Omit = omit,
+        description: str | Omit = omit,
+        location: SiteLocationParam | Omit = omit,
+        name: str | Omit = omit,
+        secondary_connector_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Site:
         """
         Patch a specific Site.
@@ -732,12 +762,13 @@ async def get(
         site_id: str,
         *,
         account_id: str,
+        x_magic_new_hc_target: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Site:
         """
         Get a specific Site.
@@ -759,6 +790,16 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not site_id:
             raise ValueError(f"Expected a non-empty value for `site_id` but received {site_id!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "x-magic-new-hc-target": ("true" if x_magic_new_hc_target else "false")
+                    if is_given(x_magic_new_hc_target)
+                    else not_given
+                }
+            ),
+            **(extra_headers or {}),
+        }
         return await self._get(
             f"/accounts/{account_id}/magic/sites/{site_id}",
             options=make_request_options(
diff --git a/src/cloudflare/resources/magic_transit/sites/wans.py b/src/cloudflare/resources/magic_transit/sites/wans.py
index eb7364a3e58..b6e574898d4 100644
--- a/src/cloudflare/resources/magic_transit/sites/wans.py
+++ b/src/cloudflare/resources/magic_transit/sites/wans.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -24,7 +21,6 @@
 from ...._base_client import AsyncPaginator, make_request_options
 from ....types.magic_transit.sites import wan_edit_params, wan_create_params, wan_update_params
 from ....types.magic_transit.sites.wan import WAN
-from ....types.magic_transit.sites.wan_create_response import WANCreateResponse
 from ....types.magic_transit.sites.wan_static_addressing_param import WANStaticAddressingParam
 
 __all__ = ["WANsResource", "AsyncWANsResource"]
@@ -33,10 +29,21 @@
 class WANsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> WANsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return WANsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> WANsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return WANsResourceWithStreamingResponse(self)
 
     def create(
@@ -45,17 +52,17 @@ def create(
         *,
         account_id: str,
         physport: int,
-        vlan_tag: int,
-        name: str | NotGiven = NOT_GIVEN,
-        priority: int | NotGiven = NOT_GIVEN,
-        static_addressing: WANStaticAddressingParam | NotGiven = NOT_GIVEN,
+        name: str | Omit = omit,
+        priority: int | Omit = omit,
+        static_addressing: WANStaticAddressingParam | Omit = omit,
+        vlan_tag: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> WANCreateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[WAN]:
         """
         Creates a new Site WAN.
 
@@ -64,11 +71,11 @@ def create(
 
           site_id: Identifier
 
-          vlan_tag: VLAN port number.
-
           static_addressing: (optional) if omitted, use DHCP. Submit secondary_address when site is in high
               availability mode.
 
+          vlan_tag: VLAN ID. Use zero for untagged.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -81,26 +88,24 @@ def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not site_id:
             raise ValueError(f"Expected a non-empty value for `site_id` but received {site_id!r}")
-        return self._post(
+        return self._get_api_list(
             f"/accounts/{account_id}/magic/sites/{site_id}/wans",
+            page=SyncSinglePage[WAN],
             body=maybe_transform(
                 {
                     "physport": physport,
-                    "vlan_tag": vlan_tag,
                     "name": name,
                     "priority": priority,
                     "static_addressing": static_addressing,
+                    "vlan_tag": vlan_tag,
                 },
                 wan_create_params.WANCreateParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[WANCreateResponse]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[WANCreateResponse], ResultWrapper[WANCreateResponse]),
+            model=WAN,
+            method="post",
         )
 
     def update(
@@ -109,17 +114,17 @@ def update(
         *,
         account_id: str,
         site_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        physport: int | NotGiven = NOT_GIVEN,
-        priority: int | NotGiven = NOT_GIVEN,
-        static_addressing: WANStaticAddressingParam | NotGiven = NOT_GIVEN,
-        vlan_tag: int | NotGiven = NOT_GIVEN,
+        name: str | Omit = omit,
+        physport: int | Omit = omit,
+        priority: int | Omit = omit,
+        static_addressing: WANStaticAddressingParam | Omit = omit,
+        vlan_tag: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WAN:
         """
         Update a specific Site WAN.
@@ -134,7 +139,7 @@ def update(
           static_addressing: (optional) if omitted, use DHCP. Submit secondary_address when site is in high
               availability mode.
 
-          vlan_tag: VLAN port number.
+          vlan_tag: VLAN ID. Use zero for untagged.
 
           extra_headers: Send extra headers
 
@@ -182,7 +187,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[WAN]:
         """
         Lists Site WANs associated with an account.
@@ -224,7 +229,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WAN:
         """
         Remove a specific Site WAN.
@@ -268,17 +273,17 @@ def edit(
         *,
         account_id: str,
         site_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        physport: int | NotGiven = NOT_GIVEN,
-        priority: int | NotGiven = NOT_GIVEN,
-        static_addressing: WANStaticAddressingParam | NotGiven = NOT_GIVEN,
-        vlan_tag: int | NotGiven = NOT_GIVEN,
+        name: str | Omit = omit,
+        physport: int | Omit = omit,
+        priority: int | Omit = omit,
+        static_addressing: WANStaticAddressingParam | Omit = omit,
+        vlan_tag: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WAN:
         """
         Patch a specific Site WAN.
@@ -293,7 +298,7 @@ def edit(
           static_addressing: (optional) if omitted, use DHCP. Submit secondary_address when site is in high
               availability mode.
 
-          vlan_tag: VLAN port number.
+          vlan_tag: VLAN ID. Use zero for untagged.
 
           extra_headers: Send extra headers
 
@@ -342,7 +347,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WAN:
         """
         Get a specific Site WAN.
@@ -384,29 +389,40 @@ def get(
 class AsyncWANsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncWANsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncWANsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncWANsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncWANsResourceWithStreamingResponse(self)
 
-    async def create(
+    def create(
         self,
         site_id: str,
         *,
         account_id: str,
         physport: int,
-        vlan_tag: int,
-        name: str | NotGiven = NOT_GIVEN,
-        priority: int | NotGiven = NOT_GIVEN,
-        static_addressing: WANStaticAddressingParam | NotGiven = NOT_GIVEN,
+        name: str | Omit = omit,
+        priority: int | Omit = omit,
+        static_addressing: WANStaticAddressingParam | Omit = omit,
+        vlan_tag: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> WANCreateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[WAN, AsyncSinglePage[WAN]]:
         """
         Creates a new Site WAN.
 
@@ -415,11 +431,11 @@ async def create(
 
           site_id: Identifier
 
-          vlan_tag: VLAN port number.
-
           static_addressing: (optional) if omitted, use DHCP. Submit secondary_address when site is in high
               availability mode.
 
+          vlan_tag: VLAN ID. Use zero for untagged.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -432,26 +448,24 @@ async def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not site_id:
             raise ValueError(f"Expected a non-empty value for `site_id` but received {site_id!r}")
-        return await self._post(
+        return self._get_api_list(
             f"/accounts/{account_id}/magic/sites/{site_id}/wans",
-            body=await async_maybe_transform(
+            page=AsyncSinglePage[WAN],
+            body=maybe_transform(
                 {
                     "physport": physport,
-                    "vlan_tag": vlan_tag,
                     "name": name,
                     "priority": priority,
                     "static_addressing": static_addressing,
+                    "vlan_tag": vlan_tag,
                 },
                 wan_create_params.WANCreateParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[WANCreateResponse]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[WANCreateResponse], ResultWrapper[WANCreateResponse]),
+            model=WAN,
+            method="post",
         )
 
     async def update(
@@ -460,17 +474,17 @@ async def update(
         *,
         account_id: str,
         site_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        physport: int | NotGiven = NOT_GIVEN,
-        priority: int | NotGiven = NOT_GIVEN,
-        static_addressing: WANStaticAddressingParam | NotGiven = NOT_GIVEN,
-        vlan_tag: int | NotGiven = NOT_GIVEN,
+        name: str | Omit = omit,
+        physport: int | Omit = omit,
+        priority: int | Omit = omit,
+        static_addressing: WANStaticAddressingParam | Omit = omit,
+        vlan_tag: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WAN:
         """
         Update a specific Site WAN.
@@ -485,7 +499,7 @@ async def update(
           static_addressing: (optional) if omitted, use DHCP. Submit secondary_address when site is in high
               availability mode.
 
-          vlan_tag: VLAN port number.
+          vlan_tag: VLAN ID. Use zero for untagged.
 
           extra_headers: Send extra headers
 
@@ -533,7 +547,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[WAN, AsyncSinglePage[WAN]]:
         """
         Lists Site WANs associated with an account.
@@ -575,7 +589,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WAN:
         """
         Remove a specific Site WAN.
@@ -619,17 +633,17 @@ async def edit(
         *,
         account_id: str,
         site_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        physport: int | NotGiven = NOT_GIVEN,
-        priority: int | NotGiven = NOT_GIVEN,
-        static_addressing: WANStaticAddressingParam | NotGiven = NOT_GIVEN,
-        vlan_tag: int | NotGiven = NOT_GIVEN,
+        name: str | Omit = omit,
+        physport: int | Omit = omit,
+        priority: int | Omit = omit,
+        static_addressing: WANStaticAddressingParam | Omit = omit,
+        vlan_tag: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WAN:
         """
         Patch a specific Site WAN.
@@ -644,7 +658,7 @@ async def edit(
           static_addressing: (optional) if omitted, use DHCP. Submit secondary_address when site is in high
               availability mode.
 
-          vlan_tag: VLAN port number.
+          vlan_tag: VLAN ID. Use zero for untagged.
 
           extra_headers: Send extra headers
 
@@ -693,7 +707,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WAN:
         """
         Get a specific Site WAN.
diff --git a/src/cloudflare/resources/managed_headers.py b/src/cloudflare/resources/managed_headers.py
deleted file mode 100644
index 6f625e31c16..00000000000
--- a/src/cloudflare/resources/managed_headers.py
+++ /dev/null
@@ -1,254 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Iterable
-
-import httpx
-
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from .._compat import cached_property
-from .._resource import SyncAPIResource, AsyncAPIResource
-from .._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from .._base_client import make_request_options
-from ..types.managed_headers import managed_header_edit_params
-from ..types.managed_headers.request_model_param import RequestModelParam
-from ..types.managed_headers.managed_header_edit_response import ManagedHeaderEditResponse
-from ..types.managed_headers.managed_header_list_response import ManagedHeaderListResponse
-
-__all__ = ["ManagedHeadersResource", "AsyncManagedHeadersResource"]
-
-
-class ManagedHeadersResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> ManagedHeadersResourceWithRawResponse:
-        return ManagedHeadersResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> ManagedHeadersResourceWithStreamingResponse:
-        return ManagedHeadersResourceWithStreamingResponse(self)
-
-    def list(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ManagedHeaderListResponse:
-        """
-        Fetches a list of all Managed Transforms.
-
-        Args:
-          zone_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._get(
-            f"/zones/{zone_id}/managed_headers",
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=ManagedHeaderListResponse,
-        )
-
-    def edit(
-        self,
-        *,
-        zone_id: str,
-        managed_request_headers: Iterable[RequestModelParam],
-        managed_response_headers: Iterable[RequestModelParam],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ManagedHeaderEditResponse:
-        """
-        Updates the status of one or more Managed Transforms.
-
-        Args:
-          zone_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._patch(
-            f"/zones/{zone_id}/managed_headers",
-            body=maybe_transform(
-                {
-                    "managed_request_headers": managed_request_headers,
-                    "managed_response_headers": managed_response_headers,
-                },
-                managed_header_edit_params.ManagedHeaderEditParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=ManagedHeaderEditResponse,
-        )
-
-
-class AsyncManagedHeadersResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncManagedHeadersResourceWithRawResponse:
-        return AsyncManagedHeadersResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncManagedHeadersResourceWithStreamingResponse:
-        return AsyncManagedHeadersResourceWithStreamingResponse(self)
-
-    async def list(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ManagedHeaderListResponse:
-        """
-        Fetches a list of all Managed Transforms.
-
-        Args:
-          zone_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._get(
-            f"/zones/{zone_id}/managed_headers",
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=ManagedHeaderListResponse,
-        )
-
-    async def edit(
-        self,
-        *,
-        zone_id: str,
-        managed_request_headers: Iterable[RequestModelParam],
-        managed_response_headers: Iterable[RequestModelParam],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ManagedHeaderEditResponse:
-        """
-        Updates the status of one or more Managed Transforms.
-
-        Args:
-          zone_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._patch(
-            f"/zones/{zone_id}/managed_headers",
-            body=await async_maybe_transform(
-                {
-                    "managed_request_headers": managed_request_headers,
-                    "managed_response_headers": managed_response_headers,
-                },
-                managed_header_edit_params.ManagedHeaderEditParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=ManagedHeaderEditResponse,
-        )
-
-
-class ManagedHeadersResourceWithRawResponse:
-    def __init__(self, managed_headers: ManagedHeadersResource) -> None:
-        self._managed_headers = managed_headers
-
-        self.list = to_raw_response_wrapper(
-            managed_headers.list,
-        )
-        self.edit = to_raw_response_wrapper(
-            managed_headers.edit,
-        )
-
-
-class AsyncManagedHeadersResourceWithRawResponse:
-    def __init__(self, managed_headers: AsyncManagedHeadersResource) -> None:
-        self._managed_headers = managed_headers
-
-        self.list = async_to_raw_response_wrapper(
-            managed_headers.list,
-        )
-        self.edit = async_to_raw_response_wrapper(
-            managed_headers.edit,
-        )
-
-
-class ManagedHeadersResourceWithStreamingResponse:
-    def __init__(self, managed_headers: ManagedHeadersResource) -> None:
-        self._managed_headers = managed_headers
-
-        self.list = to_streamed_response_wrapper(
-            managed_headers.list,
-        )
-        self.edit = to_streamed_response_wrapper(
-            managed_headers.edit,
-        )
-
-
-class AsyncManagedHeadersResourceWithStreamingResponse:
-    def __init__(self, managed_headers: AsyncManagedHeadersResource) -> None:
-        self._managed_headers = managed_headers
-
-        self.list = async_to_streamed_response_wrapper(
-            managed_headers.list,
-        )
-        self.edit = async_to_streamed_response_wrapper(
-            managed_headers.edit,
-        )
diff --git a/src/cloudflare/resources/managed_transforms.py b/src/cloudflare/resources/managed_transforms.py
new file mode 100644
index 00000000000..1b70c745c06
--- /dev/null
+++ b/src/cloudflare/resources/managed_transforms.py
@@ -0,0 +1,381 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, cast
+
+import httpx
+
+from .._types import Body, Query, Headers, NoneType, NotGiven, not_given
+from .._utils import maybe_transform, async_maybe_transform
+from .._compat import cached_property
+from .._resource import SyncAPIResource, AsyncAPIResource
+from .._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from .._wrappers import ResultWrapper
+from .._base_client import make_request_options
+from ..types.managed_transforms import managed_transform_edit_params
+from ..types.managed_transforms.managed_transform_edit_response import ManagedTransformEditResponse
+from ..types.managed_transforms.managed_transform_list_response import ManagedTransformListResponse
+
+__all__ = ["ManagedTransformsResource", "AsyncManagedTransformsResource"]
+
+
+class ManagedTransformsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ManagedTransformsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ManagedTransformsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ManagedTransformsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ManagedTransformsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ManagedTransformListResponse:
+        """
+        Fetches a list of all Managed Transforms.
+
+        Args:
+          zone_id: The unique ID of the zone.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/managed_headers",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ManagedTransformListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ManagedTransformListResponse], ResultWrapper[ManagedTransformListResponse]),
+        )
+
+    def delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Disables all Managed Transforms.
+
+        Args:
+          zone_id: The unique ID of the zone.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._delete(
+            f"/zones/{zone_id}/managed_headers",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    def edit(
+        self,
+        *,
+        zone_id: str,
+        managed_request_headers: Iterable[managed_transform_edit_params.ManagedRequestHeader],
+        managed_response_headers: Iterable[managed_transform_edit_params.ManagedResponseHeader],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ManagedTransformEditResponse:
+        """
+        Updates the status of one or more Managed Transforms.
+
+        Args:
+          zone_id: The unique ID of the zone.
+
+          managed_request_headers: The list of Managed Request Transforms.
+
+          managed_response_headers: The list of Managed Response Transforms.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._patch(
+            f"/zones/{zone_id}/managed_headers",
+            body=maybe_transform(
+                {
+                    "managed_request_headers": managed_request_headers,
+                    "managed_response_headers": managed_response_headers,
+                },
+                managed_transform_edit_params.ManagedTransformEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ManagedTransformEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ManagedTransformEditResponse], ResultWrapper[ManagedTransformEditResponse]),
+        )
+
+
+class AsyncManagedTransformsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncManagedTransformsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncManagedTransformsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncManagedTransformsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncManagedTransformsResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ManagedTransformListResponse:
+        """
+        Fetches a list of all Managed Transforms.
+
+        Args:
+          zone_id: The unique ID of the zone.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/managed_headers",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ManagedTransformListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ManagedTransformListResponse], ResultWrapper[ManagedTransformListResponse]),
+        )
+
+    async def delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Disables all Managed Transforms.
+
+        Args:
+          zone_id: The unique ID of the zone.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._delete(
+            f"/zones/{zone_id}/managed_headers",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    async def edit(
+        self,
+        *,
+        zone_id: str,
+        managed_request_headers: Iterable[managed_transform_edit_params.ManagedRequestHeader],
+        managed_response_headers: Iterable[managed_transform_edit_params.ManagedResponseHeader],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ManagedTransformEditResponse:
+        """
+        Updates the status of one or more Managed Transforms.
+
+        Args:
+          zone_id: The unique ID of the zone.
+
+          managed_request_headers: The list of Managed Request Transforms.
+
+          managed_response_headers: The list of Managed Response Transforms.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._patch(
+            f"/zones/{zone_id}/managed_headers",
+            body=await async_maybe_transform(
+                {
+                    "managed_request_headers": managed_request_headers,
+                    "managed_response_headers": managed_response_headers,
+                },
+                managed_transform_edit_params.ManagedTransformEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ManagedTransformEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ManagedTransformEditResponse], ResultWrapper[ManagedTransformEditResponse]),
+        )
+
+
+class ManagedTransformsResourceWithRawResponse:
+    def __init__(self, managed_transforms: ManagedTransformsResource) -> None:
+        self._managed_transforms = managed_transforms
+
+        self.list = to_raw_response_wrapper(
+            managed_transforms.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            managed_transforms.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            managed_transforms.edit,
+        )
+
+
+class AsyncManagedTransformsResourceWithRawResponse:
+    def __init__(self, managed_transforms: AsyncManagedTransformsResource) -> None:
+        self._managed_transforms = managed_transforms
+
+        self.list = async_to_raw_response_wrapper(
+            managed_transforms.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            managed_transforms.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            managed_transforms.edit,
+        )
+
+
+class ManagedTransformsResourceWithStreamingResponse:
+    def __init__(self, managed_transforms: ManagedTransformsResource) -> None:
+        self._managed_transforms = managed_transforms
+
+        self.list = to_streamed_response_wrapper(
+            managed_transforms.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            managed_transforms.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            managed_transforms.edit,
+        )
+
+
+class AsyncManagedTransformsResourceWithStreamingResponse:
+    def __init__(self, managed_transforms: AsyncManagedTransformsResource) -> None:
+        self._managed_transforms = managed_transforms
+
+        self.list = async_to_streamed_response_wrapper(
+            managed_transforms.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            managed_transforms.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            managed_transforms.edit,
+        )
diff --git a/src/cloudflare/resources/memberships.py b/src/cloudflare/resources/memberships.py
index eee1608095c..1bc6e6ba7b3 100644
--- a/src/cloudflare/resources/memberships.py
+++ b/src/cloudflare/resources/memberships.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from .._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from .._utils import maybe_transform, async_maybe_transform
 from .._compat import cached_property
 from .._resource import SyncAPIResource, AsyncAPIResource
 from .._response import (
@@ -35,10 +32,21 @@
 class MembershipsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> MembershipsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return MembershipsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> MembershipsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return MembershipsResourceWithStreamingResponse(self)
 
     def update(
@@ -51,7 +59,7 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MembershipUpdateResponse]:
         """
         Accept or reject this account invitation.
@@ -87,19 +95,19 @@ def update(
     def list(
         self,
         *,
-        account: membership_list_params.Account | NotGiven = NOT_GIVEN,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        order: Literal["id", "account.name", "status"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        status: Literal["accepted", "pending", "rejected"] | NotGiven = NOT_GIVEN,
+        account: membership_list_params.Account | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        name: str | Omit = omit,
+        order: Literal["id", "account.name", "status"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal["accepted", "pending", "rejected"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[Membership]:
         """
         List memberships of accounts the user can access.
@@ -158,7 +166,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MembershipDeleteResponse]:
         """
         Remove the associated member from an account.
@@ -197,7 +205,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MembershipGetResponse]:
         """
         Get a specific membership.
@@ -231,10 +239,21 @@ def get(
 class AsyncMembershipsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncMembershipsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncMembershipsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncMembershipsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncMembershipsResourceWithStreamingResponse(self)
 
     async def update(
@@ -247,7 +266,7 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MembershipUpdateResponse]:
         """
         Accept or reject this account invitation.
@@ -283,19 +302,19 @@ async def update(
     def list(
         self,
         *,
-        account: membership_list_params.Account | NotGiven = NOT_GIVEN,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        order: Literal["id", "account.name", "status"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        status: Literal["accepted", "pending", "rejected"] | NotGiven = NOT_GIVEN,
+        account: membership_list_params.Account | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        name: str | Omit = omit,
+        order: Literal["id", "account.name", "status"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal["accepted", "pending", "rejected"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Membership, AsyncV4PagePaginationArray[Membership]]:
         """
         List memberships of accounts the user can access.
@@ -354,7 +373,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MembershipDeleteResponse]:
         """
         Remove the associated member from an account.
@@ -393,7 +412,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MembershipGetResponse]:
         """
         Get a specific membership.
diff --git a/src/cloudflare/resources/mtls_certificates/associations.py b/src/cloudflare/resources/mtls_certificates/associations.py
index 89da4efe30e..a76063559c4 100644
--- a/src/cloudflare/resources/mtls_certificates/associations.py
+++ b/src/cloudflare/resources/mtls_certificates/associations.py
@@ -2,11 +2,9 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
-
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Query, Headers, NotGiven, not_given
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -15,9 +13,9 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
-from ...types.mtls_certificates.association_get_response import AssociationGetResponse
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.mtls_certificates.certificate_asssociation import CertificateAsssociation
 
 __all__ = ["AssociationsResource", "AsyncAssociationsResource"]
 
@@ -25,10 +23,21 @@
 class AssociationsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AssociationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AssociationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AssociationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AssociationsResourceWithStreamingResponse(self)
 
     def get(
@@ -41,15 +50,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AssociationGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[CertificateAsssociation]:
         """
         Lists all active associations between the certificate and Cloudflare services.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          mtls_certificate_id: Identifier
+          mtls_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -65,29 +74,37 @@ def get(
             raise ValueError(
                 f"Expected a non-empty value for `mtls_certificate_id` but received {mtls_certificate_id!r}"
             )
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/mtls_certificates/{mtls_certificate_id}/associations",
+            page=SyncSinglePage[CertificateAsssociation],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[AssociationGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[AssociationGetResponse]], ResultWrapper[AssociationGetResponse]),
+            model=CertificateAsssociation,
         )
 
 
 class AsyncAssociationsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncAssociationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAssociationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAssociationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAssociationsResourceWithStreamingResponse(self)
 
-    async def get(
+    def get(
         self,
         mtls_certificate_id: str,
         *,
@@ -97,15 +114,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AssociationGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[CertificateAsssociation, AsyncSinglePage[CertificateAsssociation]]:
         """
         Lists all active associations between the certificate and Cloudflare services.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          mtls_certificate_id: Identifier
+          mtls_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -121,16 +138,13 @@ async def get(
             raise ValueError(
                 f"Expected a non-empty value for `mtls_certificate_id` but received {mtls_certificate_id!r}"
             )
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/mtls_certificates/{mtls_certificate_id}/associations",
+            page=AsyncSinglePage[CertificateAsssociation],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[AssociationGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[AssociationGetResponse]], ResultWrapper[AssociationGetResponse]),
+            model=CertificateAsssociation,
         )
 
 
diff --git a/src/cloudflare/resources/mtls_certificates/mtls_certificates.py b/src/cloudflare/resources/mtls_certificates/mtls_certificates.py
index c9a0deacd8d..663dbe56585 100644
--- a/src/cloudflare/resources/mtls_certificates/mtls_certificates.py
+++ b/src/cloudflare/resources/mtls_certificates/mtls_certificates.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -44,10 +41,21 @@ def associations(self) -> AssociationsResource:
 
     @cached_property
     def with_raw_response(self) -> MTLSCertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return MTLSCertificatesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> MTLSCertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return MTLSCertificatesResourceWithStreamingResponse(self)
 
     def create(
@@ -56,20 +64,20 @@ def create(
         account_id: str,
         ca: bool,
         certificates: str,
-        name: str | NotGiven = NOT_GIVEN,
-        private_key: str | NotGiven = NOT_GIVEN,
+        name: str | Omit = omit,
+        private_key: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MTLSCertificateCreateResponse]:
         """
         Upload a certificate that you want to use with mTLS-enabled Cloudflare services.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           ca: Indicates whether the certificate is a CA or leaf certificate.
 
@@ -77,7 +85,8 @@ def create(
 
           name: Optional unique name for the certificate. Only used for human readability.
 
-          private_key: The private key for the certificate
+          private_key: The private key for the certificate. This field is only needed for specific use
+              cases such as using a custom certificate with Zero Trust's block page.
 
           extra_headers: Send extra headers
 
@@ -119,13 +128,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[MTLSCertificate]:
         """
         Lists all mTLS certificates.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -156,16 +165,16 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MTLSCertificate]:
         """
         Deletes the mTLS certificate unless the certificate is in use by one or more
         Cloudflare services.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          mtls_certificate_id: Identifier
+          mtls_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -203,15 +212,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MTLSCertificate]:
         """
         Fetches a single mTLS certificate.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          mtls_certificate_id: Identifier
+          mtls_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -247,10 +256,21 @@ def associations(self) -> AsyncAssociationsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncMTLSCertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncMTLSCertificatesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncMTLSCertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncMTLSCertificatesResourceWithStreamingResponse(self)
 
     async def create(
@@ -259,20 +279,20 @@ async def create(
         account_id: str,
         ca: bool,
         certificates: str,
-        name: str | NotGiven = NOT_GIVEN,
-        private_key: str | NotGiven = NOT_GIVEN,
+        name: str | Omit = omit,
+        private_key: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MTLSCertificateCreateResponse]:
         """
         Upload a certificate that you want to use with mTLS-enabled Cloudflare services.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           ca: Indicates whether the certificate is a CA or leaf certificate.
 
@@ -280,7 +300,8 @@ async def create(
 
           name: Optional unique name for the certificate. Only used for human readability.
 
-          private_key: The private key for the certificate
+          private_key: The private key for the certificate. This field is only needed for specific use
+              cases such as using a custom certificate with Zero Trust's block page.
 
           extra_headers: Send extra headers
 
@@ -322,13 +343,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[MTLSCertificate, AsyncSinglePage[MTLSCertificate]]:
         """
         Lists all mTLS certificates.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -359,16 +380,16 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MTLSCertificate]:
         """
         Deletes the mTLS certificate unless the certificate is in use by one or more
         Cloudflare services.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          mtls_certificate_id: Identifier
+          mtls_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -406,15 +427,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MTLSCertificate]:
         """
         Fetches a single mTLS certificate.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          mtls_certificate_id: Identifier
+          mtls_certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/network_interconnects/__init__.py b/src/cloudflare/resources/network_interconnects/__init__.py
new file mode 100644
index 00000000000..bfd7a1174e2
--- /dev/null
+++ b/src/cloudflare/resources/network_interconnects/__init__.py
@@ -0,0 +1,75 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .cnis import (
+    CNIsResource,
+    AsyncCNIsResource,
+    CNIsResourceWithRawResponse,
+    AsyncCNIsResourceWithRawResponse,
+    CNIsResourceWithStreamingResponse,
+    AsyncCNIsResourceWithStreamingResponse,
+)
+from .slots import (
+    SlotsResource,
+    AsyncSlotsResource,
+    SlotsResourceWithRawResponse,
+    AsyncSlotsResourceWithRawResponse,
+    SlotsResourceWithStreamingResponse,
+    AsyncSlotsResourceWithStreamingResponse,
+)
+from .settings import (
+    SettingsResource,
+    AsyncSettingsResource,
+    SettingsResourceWithRawResponse,
+    AsyncSettingsResourceWithRawResponse,
+    SettingsResourceWithStreamingResponse,
+    AsyncSettingsResourceWithStreamingResponse,
+)
+from .interconnects import (
+    InterconnectsResource,
+    AsyncInterconnectsResource,
+    InterconnectsResourceWithRawResponse,
+    AsyncInterconnectsResourceWithRawResponse,
+    InterconnectsResourceWithStreamingResponse,
+    AsyncInterconnectsResourceWithStreamingResponse,
+)
+from .network_interconnects import (
+    NetworkInterconnectsResource,
+    AsyncNetworkInterconnectsResource,
+    NetworkInterconnectsResourceWithRawResponse,
+    AsyncNetworkInterconnectsResourceWithRawResponse,
+    NetworkInterconnectsResourceWithStreamingResponse,
+    AsyncNetworkInterconnectsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "CNIsResource",
+    "AsyncCNIsResource",
+    "CNIsResourceWithRawResponse",
+    "AsyncCNIsResourceWithRawResponse",
+    "CNIsResourceWithStreamingResponse",
+    "AsyncCNIsResourceWithStreamingResponse",
+    "InterconnectsResource",
+    "AsyncInterconnectsResource",
+    "InterconnectsResourceWithRawResponse",
+    "AsyncInterconnectsResourceWithRawResponse",
+    "InterconnectsResourceWithStreamingResponse",
+    "AsyncInterconnectsResourceWithStreamingResponse",
+    "SettingsResource",
+    "AsyncSettingsResource",
+    "SettingsResourceWithRawResponse",
+    "AsyncSettingsResourceWithRawResponse",
+    "SettingsResourceWithStreamingResponse",
+    "AsyncSettingsResourceWithStreamingResponse",
+    "SlotsResource",
+    "AsyncSlotsResource",
+    "SlotsResourceWithRawResponse",
+    "AsyncSlotsResourceWithRawResponse",
+    "SlotsResourceWithStreamingResponse",
+    "AsyncSlotsResourceWithStreamingResponse",
+    "NetworkInterconnectsResource",
+    "AsyncNetworkInterconnectsResource",
+    "NetworkInterconnectsResourceWithRawResponse",
+    "AsyncNetworkInterconnectsResourceWithRawResponse",
+    "NetworkInterconnectsResourceWithStreamingResponse",
+    "AsyncNetworkInterconnectsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/network_interconnects/cnis.py b/src/cloudflare/resources/network_interconnects/cnis.py
new file mode 100644
index 00000000000..bdbbcbbd217
--- /dev/null
+++ b/src/cloudflare/resources/network_interconnects/cnis.py
@@ -0,0 +1,650 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.network_interconnects import cni_list_params, cni_create_params, cni_update_params
+from ...types.network_interconnects.cni_get_response import CNIGetResponse
+from ...types.network_interconnects.cni_list_response import CNIListResponse
+from ...types.network_interconnects.cni_create_response import CNICreateResponse
+from ...types.network_interconnects.cni_update_response import CNIUpdateResponse
+
+__all__ = ["CNIsResource", "AsyncCNIsResource"]
+
+
+class CNIsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> CNIsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CNIsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CNIsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CNIsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        account: str,
+        interconnect: str,
+        magic: cni_create_params.Magic,
+        bgp: cni_create_params.BGP | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CNICreateResponse:
+        """
+        Create a new CNI object
+
+        Args:
+          account_id: Customer account tag
+
+          account: Customer account tag
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/cni/cnis",
+            body=maybe_transform(
+                {
+                    "account": account,
+                    "interconnect": interconnect,
+                    "magic": magic,
+                    "bgp": bgp,
+                },
+                cni_create_params.CNICreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CNICreateResponse,
+        )
+
+    def update(
+        self,
+        cni: str,
+        *,
+        account_id: str,
+        id: str,
+        account: str,
+        cust_ip: str,
+        interconnect: str,
+        magic: cni_update_params.Magic,
+        p2p_ip: str,
+        bgp: cni_update_params.BGP | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CNIUpdateResponse:
+        """
+        Modify stored information about a CNI object
+
+        Args:
+          account_id: Customer account tag
+
+          account: Customer account tag
+
+          cust_ip: Customer end of the point-to-point link
+
+              This should always be inside the same prefix as `p2p_ip`.
+
+          interconnect: Interconnect identifier hosting this CNI
+
+          p2p_ip: Cloudflare end of the point-to-point link
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not cni:
+            raise ValueError(f"Expected a non-empty value for `cni` but received {cni!r}")
+        return self._put(
+            f"/accounts/{account_id}/cni/cnis/{cni}",
+            body=maybe_transform(
+                {
+                    "id": id,
+                    "account": account,
+                    "cust_ip": cust_ip,
+                    "interconnect": interconnect,
+                    "magic": magic,
+                    "p2p_ip": p2p_ip,
+                    "bgp": bgp,
+                },
+                cni_update_params.CNIUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CNIUpdateResponse,
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        cursor: Optional[int] | Omit = omit,
+        limit: Optional[int] | Omit = omit,
+        slot: Optional[str] | Omit = omit,
+        tunnel_id: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CNIListResponse:
+        """
+        List existing CNI objects
+
+        Args:
+          account_id: Customer account tag
+
+          slot: If specified, only show CNIs associated with the specified slot
+
+          tunnel_id: If specified, only show cnis associated with the specified tunnel id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cni/cnis",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "cursor": cursor,
+                        "limit": limit,
+                        "slot": slot,
+                        "tunnel_id": tunnel_id,
+                    },
+                    cni_list_params.CNIListParams,
+                ),
+            ),
+            cast_to=CNIListResponse,
+        )
+
+    def delete(
+        self,
+        cni: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Delete a specified CNI object
+
+        Args:
+          account_id: Customer account tag
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not cni:
+            raise ValueError(f"Expected a non-empty value for `cni` but received {cni!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._delete(
+            f"/accounts/{account_id}/cni/cnis/{cni}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    def get(
+        self,
+        cni: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CNIGetResponse:
+        """
+        Get information about a CNI object
+
+        Args:
+          account_id: Customer account tag
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not cni:
+            raise ValueError(f"Expected a non-empty value for `cni` but received {cni!r}")
+        return self._get(
+            f"/accounts/{account_id}/cni/cnis/{cni}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CNIGetResponse,
+        )
+
+
+class AsyncCNIsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncCNIsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCNIsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCNIsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCNIsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        account: str,
+        interconnect: str,
+        magic: cni_create_params.Magic,
+        bgp: cni_create_params.BGP | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CNICreateResponse:
+        """
+        Create a new CNI object
+
+        Args:
+          account_id: Customer account tag
+
+          account: Customer account tag
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/cni/cnis",
+            body=await async_maybe_transform(
+                {
+                    "account": account,
+                    "interconnect": interconnect,
+                    "magic": magic,
+                    "bgp": bgp,
+                },
+                cni_create_params.CNICreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CNICreateResponse,
+        )
+
+    async def update(
+        self,
+        cni: str,
+        *,
+        account_id: str,
+        id: str,
+        account: str,
+        cust_ip: str,
+        interconnect: str,
+        magic: cni_update_params.Magic,
+        p2p_ip: str,
+        bgp: cni_update_params.BGP | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CNIUpdateResponse:
+        """
+        Modify stored information about a CNI object
+
+        Args:
+          account_id: Customer account tag
+
+          account: Customer account tag
+
+          cust_ip: Customer end of the point-to-point link
+
+              This should always be inside the same prefix as `p2p_ip`.
+
+          interconnect: Interconnect identifier hosting this CNI
+
+          p2p_ip: Cloudflare end of the point-to-point link
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not cni:
+            raise ValueError(f"Expected a non-empty value for `cni` but received {cni!r}")
+        return await self._put(
+            f"/accounts/{account_id}/cni/cnis/{cni}",
+            body=await async_maybe_transform(
+                {
+                    "id": id,
+                    "account": account,
+                    "cust_ip": cust_ip,
+                    "interconnect": interconnect,
+                    "magic": magic,
+                    "p2p_ip": p2p_ip,
+                    "bgp": bgp,
+                },
+                cni_update_params.CNIUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CNIUpdateResponse,
+        )
+
+    async def list(
+        self,
+        *,
+        account_id: str,
+        cursor: Optional[int] | Omit = omit,
+        limit: Optional[int] | Omit = omit,
+        slot: Optional[str] | Omit = omit,
+        tunnel_id: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CNIListResponse:
+        """
+        List existing CNI objects
+
+        Args:
+          account_id: Customer account tag
+
+          slot: If specified, only show CNIs associated with the specified slot
+
+          tunnel_id: If specified, only show cnis associated with the specified tunnel id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cni/cnis",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "cursor": cursor,
+                        "limit": limit,
+                        "slot": slot,
+                        "tunnel_id": tunnel_id,
+                    },
+                    cni_list_params.CNIListParams,
+                ),
+            ),
+            cast_to=CNIListResponse,
+        )
+
+    async def delete(
+        self,
+        cni: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Delete a specified CNI object
+
+        Args:
+          account_id: Customer account tag
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not cni:
+            raise ValueError(f"Expected a non-empty value for `cni` but received {cni!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._delete(
+            f"/accounts/{account_id}/cni/cnis/{cni}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    async def get(
+        self,
+        cni: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CNIGetResponse:
+        """
+        Get information about a CNI object
+
+        Args:
+          account_id: Customer account tag
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not cni:
+            raise ValueError(f"Expected a non-empty value for `cni` but received {cni!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cni/cnis/{cni}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CNIGetResponse,
+        )
+
+
+class CNIsResourceWithRawResponse:
+    def __init__(self, cnis: CNIsResource) -> None:
+        self._cnis = cnis
+
+        self.create = to_raw_response_wrapper(
+            cnis.create,
+        )
+        self.update = to_raw_response_wrapper(
+            cnis.update,
+        )
+        self.list = to_raw_response_wrapper(
+            cnis.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            cnis.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            cnis.get,
+        )
+
+
+class AsyncCNIsResourceWithRawResponse:
+    def __init__(self, cnis: AsyncCNIsResource) -> None:
+        self._cnis = cnis
+
+        self.create = async_to_raw_response_wrapper(
+            cnis.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            cnis.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            cnis.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            cnis.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            cnis.get,
+        )
+
+
+class CNIsResourceWithStreamingResponse:
+    def __init__(self, cnis: CNIsResource) -> None:
+        self._cnis = cnis
+
+        self.create = to_streamed_response_wrapper(
+            cnis.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            cnis.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            cnis.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            cnis.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            cnis.get,
+        )
+
+
+class AsyncCNIsResourceWithStreamingResponse:
+    def __init__(self, cnis: AsyncCNIsResource) -> None:
+        self._cnis = cnis
+
+        self.create = async_to_streamed_response_wrapper(
+            cnis.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            cnis.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            cnis.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            cnis.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            cnis.get,
+        )
diff --git a/src/cloudflare/resources/network_interconnects/interconnects.py b/src/cloudflare/resources/network_interconnects/interconnects.py
new file mode 100644
index 00000000000..f6f091ecedf
--- /dev/null
+++ b/src/cloudflare/resources/network_interconnects/interconnects.py
@@ -0,0 +1,833 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Any, Optional, cast
+from typing_extensions import Literal, overload
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.network_interconnects import interconnect_list_params, interconnect_create_params
+from ...types.network_interconnects.interconnect_get_response import InterconnectGetResponse
+from ...types.network_interconnects.interconnect_list_response import InterconnectListResponse
+from ...types.network_interconnects.interconnect_create_response import InterconnectCreateResponse
+from ...types.network_interconnects.interconnect_status_response import InterconnectStatusResponse
+
+__all__ = ["InterconnectsResource", "AsyncInterconnectsResource"]
+
+
+class InterconnectsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> InterconnectsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return InterconnectsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> InterconnectsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return InterconnectsResourceWithStreamingResponse(self)
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        account: str,
+        slot_id: str,
+        type: str,
+        speed: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InterconnectCreateResponse:
+        """
+        Create a new interconnect
+
+        Args:
+          account_id: Customer account tag
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        account: str,
+        bandwidth: Literal["50M", "100M", "200M", "300M", "400M", "500M", "1G", "2G", "5G", "10G", "20G", "50G"],
+        pairing_key: str,
+        type: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InterconnectCreateResponse:
+        """
+        Create a new interconnect
+
+        Args:
+          account_id: Customer account tag
+
+          bandwidth: Bandwidth structure as visible through the customer-facing API.
+
+          pairing_key: Pairing key provided by GCP
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(
+        ["account_id", "account", "slot_id", "type"], ["account_id", "account", "bandwidth", "pairing_key", "type"]
+    )
+    def create(
+        self,
+        *,
+        account_id: str,
+        account: str,
+        slot_id: str | Omit = omit,
+        type: str,
+        speed: Optional[str] | Omit = omit,
+        bandwidth: Literal["50M", "100M", "200M", "300M", "400M", "500M", "1G", "2G", "5G", "10G", "20G", "50G"]
+        | Omit = omit,
+        pairing_key: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InterconnectCreateResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return cast(
+            InterconnectCreateResponse,
+            self._post(
+                f"/accounts/{account_id}/cni/interconnects",
+                body=maybe_transform(
+                    {
+                        "account": account,
+                        "slot_id": slot_id,
+                        "type": type,
+                        "speed": speed,
+                        "bandwidth": bandwidth,
+                        "pairing_key": pairing_key,
+                    },
+                    interconnect_create_params.InterconnectCreateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                ),
+                cast_to=cast(
+                    Any, InterconnectCreateResponse
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        cursor: Optional[int] | Omit = omit,
+        limit: Optional[int] | Omit = omit,
+        site: Optional[str] | Omit = omit,
+        type: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InterconnectListResponse:
+        """
+        List existing interconnects
+
+        Args:
+          account_id: Customer account tag
+
+          site: If specified, only show interconnects located at the given site
+
+          type: If specified, only show interconnects of the given type
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cni/interconnects",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "cursor": cursor,
+                        "limit": limit,
+                        "site": site,
+                        "type": type,
+                    },
+                    interconnect_list_params.InterconnectListParams,
+                ),
+            ),
+            cast_to=InterconnectListResponse,
+        )
+
+    def delete(
+        self,
+        icon: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Delete an interconnect object
+
+        Args:
+          account_id: Customer account tag
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not icon:
+            raise ValueError(f"Expected a non-empty value for `icon` but received {icon!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._delete(
+            f"/accounts/{account_id}/cni/interconnects/{icon}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    def get(
+        self,
+        icon: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InterconnectGetResponse:
+        """
+        Get information about an interconnect object
+
+        Args:
+          account_id: Customer account tag
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not icon:
+            raise ValueError(f"Expected a non-empty value for `icon` but received {icon!r}")
+        return cast(
+            InterconnectGetResponse,
+            self._get(
+                f"/accounts/{account_id}/cni/interconnects/{icon}",
+                options=make_request_options(
+                    extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                ),
+                cast_to=cast(
+                    Any, InterconnectGetResponse
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    def loa(
+        self,
+        icon: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Generate the Letter of Authorization (LOA) for a given interconnect
+
+        Args:
+          account_id: Customer account tag
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not icon:
+            raise ValueError(f"Expected a non-empty value for `icon` but received {icon!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._get(
+            f"/accounts/{account_id}/cni/interconnects/{icon}/loa",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    def status(
+        self,
+        icon: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InterconnectStatusResponse:
+        """
+        Get the current status of an interconnect object
+
+        Args:
+          account_id: Customer account tag
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not icon:
+            raise ValueError(f"Expected a non-empty value for `icon` but received {icon!r}")
+        return cast(
+            InterconnectStatusResponse,
+            self._get(
+                f"/accounts/{account_id}/cni/interconnects/{icon}/status",
+                options=make_request_options(
+                    extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                ),
+                cast_to=cast(
+                    Any, InterconnectStatusResponse
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+
+class AsyncInterconnectsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncInterconnectsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncInterconnectsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncInterconnectsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncInterconnectsResourceWithStreamingResponse(self)
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        account: str,
+        slot_id: str,
+        type: str,
+        speed: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InterconnectCreateResponse:
+        """
+        Create a new interconnect
+
+        Args:
+          account_id: Customer account tag
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        account: str,
+        bandwidth: Literal["50M", "100M", "200M", "300M", "400M", "500M", "1G", "2G", "5G", "10G", "20G", "50G"],
+        pairing_key: str,
+        type: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InterconnectCreateResponse:
+        """
+        Create a new interconnect
+
+        Args:
+          account_id: Customer account tag
+
+          bandwidth: Bandwidth structure as visible through the customer-facing API.
+
+          pairing_key: Pairing key provided by GCP
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(
+        ["account_id", "account", "slot_id", "type"], ["account_id", "account", "bandwidth", "pairing_key", "type"]
+    )
+    async def create(
+        self,
+        *,
+        account_id: str,
+        account: str,
+        slot_id: str | Omit = omit,
+        type: str,
+        speed: Optional[str] | Omit = omit,
+        bandwidth: Literal["50M", "100M", "200M", "300M", "400M", "500M", "1G", "2G", "5G", "10G", "20G", "50G"]
+        | Omit = omit,
+        pairing_key: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InterconnectCreateResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return cast(
+            InterconnectCreateResponse,
+            await self._post(
+                f"/accounts/{account_id}/cni/interconnects",
+                body=await async_maybe_transform(
+                    {
+                        "account": account,
+                        "slot_id": slot_id,
+                        "type": type,
+                        "speed": speed,
+                        "bandwidth": bandwidth,
+                        "pairing_key": pairing_key,
+                    },
+                    interconnect_create_params.InterconnectCreateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                ),
+                cast_to=cast(
+                    Any, InterconnectCreateResponse
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    async def list(
+        self,
+        *,
+        account_id: str,
+        cursor: Optional[int] | Omit = omit,
+        limit: Optional[int] | Omit = omit,
+        site: Optional[str] | Omit = omit,
+        type: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InterconnectListResponse:
+        """
+        List existing interconnects
+
+        Args:
+          account_id: Customer account tag
+
+          site: If specified, only show interconnects located at the given site
+
+          type: If specified, only show interconnects of the given type
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cni/interconnects",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "cursor": cursor,
+                        "limit": limit,
+                        "site": site,
+                        "type": type,
+                    },
+                    interconnect_list_params.InterconnectListParams,
+                ),
+            ),
+            cast_to=InterconnectListResponse,
+        )
+
+    async def delete(
+        self,
+        icon: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Delete an interconnect object
+
+        Args:
+          account_id: Customer account tag
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not icon:
+            raise ValueError(f"Expected a non-empty value for `icon` but received {icon!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._delete(
+            f"/accounts/{account_id}/cni/interconnects/{icon}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    async def get(
+        self,
+        icon: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InterconnectGetResponse:
+        """
+        Get information about an interconnect object
+
+        Args:
+          account_id: Customer account tag
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not icon:
+            raise ValueError(f"Expected a non-empty value for `icon` but received {icon!r}")
+        return cast(
+            InterconnectGetResponse,
+            await self._get(
+                f"/accounts/{account_id}/cni/interconnects/{icon}",
+                options=make_request_options(
+                    extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                ),
+                cast_to=cast(
+                    Any, InterconnectGetResponse
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    async def loa(
+        self,
+        icon: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Generate the Letter of Authorization (LOA) for a given interconnect
+
+        Args:
+          account_id: Customer account tag
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not icon:
+            raise ValueError(f"Expected a non-empty value for `icon` but received {icon!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._get(
+            f"/accounts/{account_id}/cni/interconnects/{icon}/loa",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    async def status(
+        self,
+        icon: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InterconnectStatusResponse:
+        """
+        Get the current status of an interconnect object
+
+        Args:
+          account_id: Customer account tag
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not icon:
+            raise ValueError(f"Expected a non-empty value for `icon` but received {icon!r}")
+        return cast(
+            InterconnectStatusResponse,
+            await self._get(
+                f"/accounts/{account_id}/cni/interconnects/{icon}/status",
+                options=make_request_options(
+                    extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                ),
+                cast_to=cast(
+                    Any, InterconnectStatusResponse
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+
+class InterconnectsResourceWithRawResponse:
+    def __init__(self, interconnects: InterconnectsResource) -> None:
+        self._interconnects = interconnects
+
+        self.create = to_raw_response_wrapper(
+            interconnects.create,
+        )
+        self.list = to_raw_response_wrapper(
+            interconnects.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            interconnects.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            interconnects.get,
+        )
+        self.loa = to_raw_response_wrapper(
+            interconnects.loa,
+        )
+        self.status = to_raw_response_wrapper(
+            interconnects.status,
+        )
+
+
+class AsyncInterconnectsResourceWithRawResponse:
+    def __init__(self, interconnects: AsyncInterconnectsResource) -> None:
+        self._interconnects = interconnects
+
+        self.create = async_to_raw_response_wrapper(
+            interconnects.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            interconnects.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            interconnects.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            interconnects.get,
+        )
+        self.loa = async_to_raw_response_wrapper(
+            interconnects.loa,
+        )
+        self.status = async_to_raw_response_wrapper(
+            interconnects.status,
+        )
+
+
+class InterconnectsResourceWithStreamingResponse:
+    def __init__(self, interconnects: InterconnectsResource) -> None:
+        self._interconnects = interconnects
+
+        self.create = to_streamed_response_wrapper(
+            interconnects.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            interconnects.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            interconnects.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            interconnects.get,
+        )
+        self.loa = to_streamed_response_wrapper(
+            interconnects.loa,
+        )
+        self.status = to_streamed_response_wrapper(
+            interconnects.status,
+        )
+
+
+class AsyncInterconnectsResourceWithStreamingResponse:
+    def __init__(self, interconnects: AsyncInterconnectsResource) -> None:
+        self._interconnects = interconnects
+
+        self.create = async_to_streamed_response_wrapper(
+            interconnects.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            interconnects.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            interconnects.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            interconnects.get,
+        )
+        self.loa = async_to_streamed_response_wrapper(
+            interconnects.loa,
+        )
+        self.status = async_to_streamed_response_wrapper(
+            interconnects.status,
+        )
diff --git a/src/cloudflare/resources/network_interconnects/network_interconnects.py b/src/cloudflare/resources/network_interconnects/network_interconnects.py
new file mode 100644
index 00000000000..3f8d44d1161
--- /dev/null
+++ b/src/cloudflare/resources/network_interconnects/network_interconnects.py
@@ -0,0 +1,198 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .cnis import (
+    CNIsResource,
+    AsyncCNIsResource,
+    CNIsResourceWithRawResponse,
+    AsyncCNIsResourceWithRawResponse,
+    CNIsResourceWithStreamingResponse,
+    AsyncCNIsResourceWithStreamingResponse,
+)
+from .slots import (
+    SlotsResource,
+    AsyncSlotsResource,
+    SlotsResourceWithRawResponse,
+    AsyncSlotsResourceWithRawResponse,
+    SlotsResourceWithStreamingResponse,
+    AsyncSlotsResourceWithStreamingResponse,
+)
+from .settings import (
+    SettingsResource,
+    AsyncSettingsResource,
+    SettingsResourceWithRawResponse,
+    AsyncSettingsResourceWithRawResponse,
+    SettingsResourceWithStreamingResponse,
+    AsyncSettingsResourceWithStreamingResponse,
+)
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .interconnects import (
+    InterconnectsResource,
+    AsyncInterconnectsResource,
+    InterconnectsResourceWithRawResponse,
+    AsyncInterconnectsResourceWithRawResponse,
+    InterconnectsResourceWithStreamingResponse,
+    AsyncInterconnectsResourceWithStreamingResponse,
+)
+
+__all__ = ["NetworkInterconnectsResource", "AsyncNetworkInterconnectsResource"]
+
+
+class NetworkInterconnectsResource(SyncAPIResource):
+    @cached_property
+    def cnis(self) -> CNIsResource:
+        return CNIsResource(self._client)
+
+    @cached_property
+    def interconnects(self) -> InterconnectsResource:
+        return InterconnectsResource(self._client)
+
+    @cached_property
+    def settings(self) -> SettingsResource:
+        return SettingsResource(self._client)
+
+    @cached_property
+    def slots(self) -> SlotsResource:
+        return SlotsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> NetworkInterconnectsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return NetworkInterconnectsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> NetworkInterconnectsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return NetworkInterconnectsResourceWithStreamingResponse(self)
+
+
+class AsyncNetworkInterconnectsResource(AsyncAPIResource):
+    @cached_property
+    def cnis(self) -> AsyncCNIsResource:
+        return AsyncCNIsResource(self._client)
+
+    @cached_property
+    def interconnects(self) -> AsyncInterconnectsResource:
+        return AsyncInterconnectsResource(self._client)
+
+    @cached_property
+    def settings(self) -> AsyncSettingsResource:
+        return AsyncSettingsResource(self._client)
+
+    @cached_property
+    def slots(self) -> AsyncSlotsResource:
+        return AsyncSlotsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncNetworkInterconnectsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncNetworkInterconnectsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncNetworkInterconnectsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncNetworkInterconnectsResourceWithStreamingResponse(self)
+
+
+class NetworkInterconnectsResourceWithRawResponse:
+    def __init__(self, network_interconnects: NetworkInterconnectsResource) -> None:
+        self._network_interconnects = network_interconnects
+
+    @cached_property
+    def cnis(self) -> CNIsResourceWithRawResponse:
+        return CNIsResourceWithRawResponse(self._network_interconnects.cnis)
+
+    @cached_property
+    def interconnects(self) -> InterconnectsResourceWithRawResponse:
+        return InterconnectsResourceWithRawResponse(self._network_interconnects.interconnects)
+
+    @cached_property
+    def settings(self) -> SettingsResourceWithRawResponse:
+        return SettingsResourceWithRawResponse(self._network_interconnects.settings)
+
+    @cached_property
+    def slots(self) -> SlotsResourceWithRawResponse:
+        return SlotsResourceWithRawResponse(self._network_interconnects.slots)
+
+
+class AsyncNetworkInterconnectsResourceWithRawResponse:
+    def __init__(self, network_interconnects: AsyncNetworkInterconnectsResource) -> None:
+        self._network_interconnects = network_interconnects
+
+    @cached_property
+    def cnis(self) -> AsyncCNIsResourceWithRawResponse:
+        return AsyncCNIsResourceWithRawResponse(self._network_interconnects.cnis)
+
+    @cached_property
+    def interconnects(self) -> AsyncInterconnectsResourceWithRawResponse:
+        return AsyncInterconnectsResourceWithRawResponse(self._network_interconnects.interconnects)
+
+    @cached_property
+    def settings(self) -> AsyncSettingsResourceWithRawResponse:
+        return AsyncSettingsResourceWithRawResponse(self._network_interconnects.settings)
+
+    @cached_property
+    def slots(self) -> AsyncSlotsResourceWithRawResponse:
+        return AsyncSlotsResourceWithRawResponse(self._network_interconnects.slots)
+
+
+class NetworkInterconnectsResourceWithStreamingResponse:
+    def __init__(self, network_interconnects: NetworkInterconnectsResource) -> None:
+        self._network_interconnects = network_interconnects
+
+    @cached_property
+    def cnis(self) -> CNIsResourceWithStreamingResponse:
+        return CNIsResourceWithStreamingResponse(self._network_interconnects.cnis)
+
+    @cached_property
+    def interconnects(self) -> InterconnectsResourceWithStreamingResponse:
+        return InterconnectsResourceWithStreamingResponse(self._network_interconnects.interconnects)
+
+    @cached_property
+    def settings(self) -> SettingsResourceWithStreamingResponse:
+        return SettingsResourceWithStreamingResponse(self._network_interconnects.settings)
+
+    @cached_property
+    def slots(self) -> SlotsResourceWithStreamingResponse:
+        return SlotsResourceWithStreamingResponse(self._network_interconnects.slots)
+
+
+class AsyncNetworkInterconnectsResourceWithStreamingResponse:
+    def __init__(self, network_interconnects: AsyncNetworkInterconnectsResource) -> None:
+        self._network_interconnects = network_interconnects
+
+    @cached_property
+    def cnis(self) -> AsyncCNIsResourceWithStreamingResponse:
+        return AsyncCNIsResourceWithStreamingResponse(self._network_interconnects.cnis)
+
+    @cached_property
+    def interconnects(self) -> AsyncInterconnectsResourceWithStreamingResponse:
+        return AsyncInterconnectsResourceWithStreamingResponse(self._network_interconnects.interconnects)
+
+    @cached_property
+    def settings(self) -> AsyncSettingsResourceWithStreamingResponse:
+        return AsyncSettingsResourceWithStreamingResponse(self._network_interconnects.settings)
+
+    @cached_property
+    def slots(self) -> AsyncSlotsResourceWithStreamingResponse:
+        return AsyncSlotsResourceWithStreamingResponse(self._network_interconnects.slots)
diff --git a/src/cloudflare/resources/network_interconnects/settings.py b/src/cloudflare/resources/network_interconnects/settings.py
new file mode 100644
index 00000000000..5999015aecb
--- /dev/null
+++ b/src/cloudflare/resources/network_interconnects/settings.py
@@ -0,0 +1,250 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.network_interconnects import setting_update_params
+from ...types.network_interconnects.setting_get_response import SettingGetResponse
+from ...types.network_interconnects.setting_update_response import SettingUpdateResponse
+
+__all__ = ["SettingsResource", "AsyncSettingsResource"]
+
+
+class SettingsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SettingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SettingsResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        *,
+        account_id: str,
+        default_asn: Optional[int] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SettingUpdateResponse:
+        """
+        Update the current settings for the active account
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/cni/settings",
+            body=maybe_transform({"default_asn": default_asn}, setting_update_params.SettingUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SettingUpdateResponse,
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SettingGetResponse:
+        """
+        Get the current settings for the active account
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cni/settings",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SettingGetResponse,
+        )
+
+
+class AsyncSettingsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSettingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSettingsResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        *,
+        account_id: str,
+        default_asn: Optional[int] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SettingUpdateResponse:
+        """
+        Update the current settings for the active account
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/cni/settings",
+            body=await async_maybe_transform({"default_asn": default_asn}, setting_update_params.SettingUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SettingUpdateResponse,
+        )
+
+    async def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SettingGetResponse:
+        """
+        Get the current settings for the active account
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cni/settings",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SettingGetResponse,
+        )
+
+
+class SettingsResourceWithRawResponse:
+    def __init__(self, settings: SettingsResource) -> None:
+        self._settings = settings
+
+        self.update = to_raw_response_wrapper(
+            settings.update,
+        )
+        self.get = to_raw_response_wrapper(
+            settings.get,
+        )
+
+
+class AsyncSettingsResourceWithRawResponse:
+    def __init__(self, settings: AsyncSettingsResource) -> None:
+        self._settings = settings
+
+        self.update = async_to_raw_response_wrapper(
+            settings.update,
+        )
+        self.get = async_to_raw_response_wrapper(
+            settings.get,
+        )
+
+
+class SettingsResourceWithStreamingResponse:
+    def __init__(self, settings: SettingsResource) -> None:
+        self._settings = settings
+
+        self.update = to_streamed_response_wrapper(
+            settings.update,
+        )
+        self.get = to_streamed_response_wrapper(
+            settings.get,
+        )
+
+
+class AsyncSettingsResourceWithStreamingResponse:
+    def __init__(self, settings: AsyncSettingsResource) -> None:
+        self._settings = settings
+
+        self.update = async_to_streamed_response_wrapper(
+            settings.update,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            settings.get,
+        )
diff --git a/src/cloudflare/resources/network_interconnects/slots.py b/src/cloudflare/resources/network_interconnects/slots.py
new file mode 100644
index 00000000000..cdecb4d13d2
--- /dev/null
+++ b/src/cloudflare/resources/network_interconnects/slots.py
@@ -0,0 +1,316 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.network_interconnects import slot_list_params
+from ...types.network_interconnects.slot_get_response import SlotGetResponse
+from ...types.network_interconnects.slot_list_response import SlotListResponse
+
+__all__ = ["SlotsResource", "AsyncSlotsResource"]
+
+
+class SlotsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SlotsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SlotsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SlotsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SlotsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        address_contains: Optional[str] | Omit = omit,
+        cursor: Optional[int] | Omit = omit,
+        limit: Optional[int] | Omit = omit,
+        occupied: Optional[bool] | Omit = omit,
+        site: Optional[str] | Omit = omit,
+        speed: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SlotListResponse:
+        """
+        Retrieve a list of all slots matching the specified parameters
+
+        Args:
+          account_id: Customer account tag
+
+          address_contains: If specified, only show slots with the given text in their address field
+
+          occupied: If specified, only show slots with a specific occupied/unoccupied state
+
+          site: If specified, only show slots located at the given site
+
+          speed: If specified, only show slots that support the given speed
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cni/slots",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "address_contains": address_contains,
+                        "cursor": cursor,
+                        "limit": limit,
+                        "occupied": occupied,
+                        "site": site,
+                        "speed": speed,
+                    },
+                    slot_list_params.SlotListParams,
+                ),
+            ),
+            cast_to=SlotListResponse,
+        )
+
+    def get(
+        self,
+        slot: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SlotGetResponse:
+        """
+        Get information about the specified slot
+
+        Args:
+          account_id: Customer account tag
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not slot:
+            raise ValueError(f"Expected a non-empty value for `slot` but received {slot!r}")
+        return self._get(
+            f"/accounts/{account_id}/cni/slots/{slot}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SlotGetResponse,
+        )
+
+
+class AsyncSlotsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSlotsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSlotsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSlotsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSlotsResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        *,
+        account_id: str,
+        address_contains: Optional[str] | Omit = omit,
+        cursor: Optional[int] | Omit = omit,
+        limit: Optional[int] | Omit = omit,
+        occupied: Optional[bool] | Omit = omit,
+        site: Optional[str] | Omit = omit,
+        speed: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SlotListResponse:
+        """
+        Retrieve a list of all slots matching the specified parameters
+
+        Args:
+          account_id: Customer account tag
+
+          address_contains: If specified, only show slots with the given text in their address field
+
+          occupied: If specified, only show slots with a specific occupied/unoccupied state
+
+          site: If specified, only show slots located at the given site
+
+          speed: If specified, only show slots that support the given speed
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cni/slots",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "address_contains": address_contains,
+                        "cursor": cursor,
+                        "limit": limit,
+                        "occupied": occupied,
+                        "site": site,
+                        "speed": speed,
+                    },
+                    slot_list_params.SlotListParams,
+                ),
+            ),
+            cast_to=SlotListResponse,
+        )
+
+    async def get(
+        self,
+        slot: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SlotGetResponse:
+        """
+        Get information about the specified slot
+
+        Args:
+          account_id: Customer account tag
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not slot:
+            raise ValueError(f"Expected a non-empty value for `slot` but received {slot!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cni/slots/{slot}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SlotGetResponse,
+        )
+
+
+class SlotsResourceWithRawResponse:
+    def __init__(self, slots: SlotsResource) -> None:
+        self._slots = slots
+
+        self.list = to_raw_response_wrapper(
+            slots.list,
+        )
+        self.get = to_raw_response_wrapper(
+            slots.get,
+        )
+
+
+class AsyncSlotsResourceWithRawResponse:
+    def __init__(self, slots: AsyncSlotsResource) -> None:
+        self._slots = slots
+
+        self.list = async_to_raw_response_wrapper(
+            slots.list,
+        )
+        self.get = async_to_raw_response_wrapper(
+            slots.get,
+        )
+
+
+class SlotsResourceWithStreamingResponse:
+    def __init__(self, slots: SlotsResource) -> None:
+        self._slots = slots
+
+        self.list = to_streamed_response_wrapper(
+            slots.list,
+        )
+        self.get = to_streamed_response_wrapper(
+            slots.get,
+        )
+
+
+class AsyncSlotsResourceWithStreamingResponse:
+    def __init__(self, slots: AsyncSlotsResource) -> None:
+        self._slots = slots
+
+        self.list = async_to_streamed_response_wrapper(
+            slots.list,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            slots.get,
+        )
diff --git a/src/cloudflare/resources/organizations/__init__.py b/src/cloudflare/resources/organizations/__init__.py
new file mode 100644
index 00000000000..c87211e2b2c
--- /dev/null
+++ b/src/cloudflare/resources/organizations/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .organizations import (
+    OrganizationsResource,
+    AsyncOrganizationsResource,
+    OrganizationsResourceWithRawResponse,
+    AsyncOrganizationsResourceWithRawResponse,
+    OrganizationsResourceWithStreamingResponse,
+    AsyncOrganizationsResourceWithStreamingResponse,
+)
+from .organization_profile import (
+    OrganizationProfileResource,
+    AsyncOrganizationProfileResource,
+    OrganizationProfileResourceWithRawResponse,
+    AsyncOrganizationProfileResourceWithRawResponse,
+    OrganizationProfileResourceWithStreamingResponse,
+    AsyncOrganizationProfileResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "OrganizationProfileResource",
+    "AsyncOrganizationProfileResource",
+    "OrganizationProfileResourceWithRawResponse",
+    "AsyncOrganizationProfileResourceWithRawResponse",
+    "OrganizationProfileResourceWithStreamingResponse",
+    "AsyncOrganizationProfileResourceWithStreamingResponse",
+    "OrganizationsResource",
+    "AsyncOrganizationsResource",
+    "OrganizationsResourceWithRawResponse",
+    "AsyncOrganizationsResourceWithRawResponse",
+    "OrganizationsResourceWithStreamingResponse",
+    "AsyncOrganizationsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/organizations/organization_profile.py b/src/cloudflare/resources/organizations/organization_profile.py
new file mode 100644
index 00000000000..48efaa1b042
--- /dev/null
+++ b/src/cloudflare/resources/organizations/organization_profile.py
@@ -0,0 +1,296 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ..._types import Body, Query, Headers, NoneType, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.organizations import organization_profile_update_params
+from ...types.organizations.organization_profile_get_params import (  # type: ignore[import-not-found]  # pyright: ignore[reportMissingImports]
+    Result,  # pyright: ignore[reportUnknownVariableType]
+)
+
+__all__ = ["OrganizationProfileResource", "AsyncOrganizationProfileResource"]
+
+
+class OrganizationProfileResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> OrganizationProfileResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return OrganizationProfileResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> OrganizationProfileResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return OrganizationProfileResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        organization_id: str,
+        *,
+        business_address: str,
+        business_email: str,
+        business_name: str,
+        business_phone: str,
+        external_metadata: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """Modify organization profile.
+
+        (Currently in Closed Beta - see
+        https://developers.cloudflare.com/fundamentals/organizations/)
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not organization_id:
+            raise ValueError(f"Expected a non-empty value for `organization_id` but received {organization_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._put(
+            f"/organizations/{organization_id}/profile",
+            body=maybe_transform(
+                {
+                    "business_address": business_address,
+                    "business_email": business_email,
+                    "business_name": business_name,
+                    "business_phone": business_phone,
+                    "external_metadata": external_metadata,
+                },
+                organization_profile_update_params.OrganizationProfileUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    def get(  # pyright: ignore[reportUnknownParameterType]
+        self,
+        organization_id: str,
+        *,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Result:
+        """Get an organizations profile if it exists.
+
+        (Currently in Closed Beta - see
+        https://developers.cloudflare.com/fundamentals/organizations/)
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not organization_id:
+            raise ValueError(f"Expected a non-empty value for `organization_id` but received {organization_id!r}")
+        return self._get(  # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType, reportUnknownArgumentType]
+            f"/organizations/{organization_id}/profile",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Result]._unwrapper,  # pyright: ignore[reportUnknownMemberType, reportUnknownArgumentType]
+            ),
+            cast_to=cast(Type[Result], ResultWrapper[Result]),  # pyright: ignore[reportUnknownArgumentType]
+        )
+
+
+class AsyncOrganizationProfileResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncOrganizationProfileResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncOrganizationProfileResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncOrganizationProfileResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncOrganizationProfileResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        organization_id: str,
+        *,
+        business_address: str,
+        business_email: str,
+        business_name: str,
+        business_phone: str,
+        external_metadata: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """Modify organization profile.
+
+        (Currently in Closed Beta - see
+        https://developers.cloudflare.com/fundamentals/organizations/)
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not organization_id:
+            raise ValueError(f"Expected a non-empty value for `organization_id` but received {organization_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._put(
+            f"/organizations/{organization_id}/profile",
+            body=await async_maybe_transform(
+                {
+                    "business_address": business_address,
+                    "business_email": business_email,
+                    "business_name": business_name,
+                    "business_phone": business_phone,
+                    "external_metadata": external_metadata,
+                },
+                organization_profile_update_params.OrganizationProfileUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    async def get(  # pyright: ignore[reportUnknownParameterType]
+        self,
+        organization_id: str,
+        *,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Result:
+        """Get an organizations profile if it exists.
+
+        (Currently in Closed Beta - see
+        https://developers.cloudflare.com/fundamentals/organizations/)
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not organization_id:
+            raise ValueError(f"Expected a non-empty value for `organization_id` but received {organization_id!r}")
+        return await self._get(  # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType, reportUnknownArgumentType]
+            f"/organizations/{organization_id}/profile",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Result]._unwrapper,  # pyright: ignore[reportUnknownMemberType, reportUnknownArgumentType]
+            ),
+            cast_to=cast(Type[Result], ResultWrapper[Result]),  # pyright: ignore[reportUnknownArgumentType]
+        )
+
+
+class OrganizationProfileResourceWithRawResponse:
+    def __init__(self, organization_profile: OrganizationProfileResource) -> None:
+        self._organization_profile = organization_profile
+
+        self.update = to_raw_response_wrapper(
+            organization_profile.update,
+        )
+        self.get = to_raw_response_wrapper(
+            organization_profile.get,  # pyright: ignore[reportUnknownMemberType, reportUnknownArgumentType]
+        )
+
+
+class AsyncOrganizationProfileResourceWithRawResponse:
+    def __init__(self, organization_profile: AsyncOrganizationProfileResource) -> None:
+        self._organization_profile = organization_profile
+
+        self.update = async_to_raw_response_wrapper(
+            organization_profile.update,
+        )
+        self.get = async_to_raw_response_wrapper(
+            organization_profile.get,  # pyright: ignore[reportUnknownMemberType, reportUnknownArgumentType]
+        )
+
+
+class OrganizationProfileResourceWithStreamingResponse:
+    def __init__(self, organization_profile: OrganizationProfileResource) -> None:
+        self._organization_profile = organization_profile
+
+        self.update = to_streamed_response_wrapper(
+            organization_profile.update,
+        )
+        self.get = to_streamed_response_wrapper(
+            organization_profile.get,  # pyright: ignore[reportUnknownMemberType, reportUnknownArgumentType]
+        )
+
+
+class AsyncOrganizationProfileResourceWithStreamingResponse:
+    def __init__(self, organization_profile: AsyncOrganizationProfileResource) -> None:
+        self._organization_profile = organization_profile
+
+        self.update = async_to_streamed_response_wrapper(
+            organization_profile.update,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            organization_profile.get,  # pyright: ignore[reportUnknownMemberType, reportUnknownArgumentType]
+        )
diff --git a/src/cloudflare/resources/organizations/organizations.py b/src/cloudflare/resources/organizations/organizations.py
new file mode 100644
index 00000000000..9609b441df2
--- /dev/null
+++ b/src/cloudflare/resources/organizations/organizations.py
@@ -0,0 +1,664 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from .organization_profile import (
+    OrganizationProfileResource,
+    AsyncOrganizationProfileResource,
+    OrganizationProfileResourceWithRawResponse,
+    AsyncOrganizationProfileResourceWithRawResponse,
+    OrganizationProfileResourceWithStreamingResponse,
+    AsyncOrganizationProfileResourceWithStreamingResponse,
+)
+from ...types.organizations import organization_list_params, organization_create_params, organization_update_params
+from ...types.organizations.organization import Organization
+from ...types.organizations.organization_delete_response import OrganizationDeleteResponse
+
+__all__ = ["OrganizationsResource", "AsyncOrganizationsResource"]
+
+
+class OrganizationsResource(SyncAPIResource):
+    @cached_property
+    def organization_profile(self) -> OrganizationProfileResource:
+        return OrganizationProfileResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> OrganizationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return OrganizationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> OrganizationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return OrganizationsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        name: str,
+        parent: organization_create_params.Parent | Omit = omit,
+        profile: organization_create_params.Profile | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Organization:
+        """Create a new organization for a user.
+
+        (Currently in Closed Beta - see
+        https://developers.cloudflare.com/fundamentals/organizations/)
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._post(
+            "/organizations",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "parent": parent,
+                    "profile": profile,
+                },
+                organization_create_params.OrganizationCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Organization]._unwrapper,
+            ),
+            cast_to=cast(Type[Organization], ResultWrapper[Organization]),
+        )
+
+    def update(
+        self,
+        organization_id: str,
+        *,
+        name: str,
+        parent: organization_update_params.Parent | Omit = omit,
+        profile: organization_update_params.Profile | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Organization:
+        """Modify organization.
+
+        (Currently in Closed Beta - see
+        https://developers.cloudflare.com/fundamentals/organizations/)
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not organization_id:
+            raise ValueError(f"Expected a non-empty value for `organization_id` but received {organization_id!r}")
+        return self._put(
+            f"/organizations/{organization_id}",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "parent": parent,
+                    "profile": profile,
+                },
+                organization_update_params.OrganizationUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Organization]._unwrapper,
+            ),
+            cast_to=cast(Type[Organization], ResultWrapper[Organization]),
+        )
+
+    def list(
+        self,
+        *,
+        id: SequenceNotStr[str] | Omit = omit,
+        containing: organization_list_params.Containing | Omit = omit,
+        name: organization_list_params.Name | Omit = omit,
+        page_size: int | Omit = omit,
+        page_token: str | Omit = omit,
+        parent: organization_list_params.Parent | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[Organization]:
+        """Retrieve a list of organizations a particular user has access to.
+
+        (Currently in
+        Closed Beta - see https://developers.cloudflare.com/fundamentals/organizations/)
+
+        Args:
+          id: Only return organizations with the specified IDs (ex. id=foo&id=bar). Send
+              multiple elements by repeating the query value.
+
+          page_size: The amount of items to return. Defaults to 10.
+
+          page_token: An opaque token returned from the last list response that when provided will
+              retrieve the next page.
+
+              Parameters used to filter the retrieved list must remain in subsequent requests
+              with a page token.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get_api_list(
+            "/organizations",
+            page=SyncSinglePage[Organization],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "id": id,
+                        "containing": containing,
+                        "name": name,
+                        "page_size": page_size,
+                        "page_token": page_token,
+                        "parent": parent,
+                    },
+                    organization_list_params.OrganizationListParams,
+                ),
+            ),
+            model=Organization,
+        )
+
+    def delete(
+        self,
+        organization_id: str,
+        *,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OrganizationDeleteResponse:
+        """Delete an organization.
+
+        The organization MUST be empty before deleting. It must
+        not contain any sub-organizations, accounts, members or users. (Currently in
+        Closed Beta - see https://developers.cloudflare.com/fundamentals/organizations/)
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not organization_id:
+            raise ValueError(f"Expected a non-empty value for `organization_id` but received {organization_id!r}")
+        return self._delete(
+            f"/organizations/{organization_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[OrganizationDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OrganizationDeleteResponse], ResultWrapper[OrganizationDeleteResponse]),
+        )
+
+    def get(
+        self,
+        organization_id: str,
+        *,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Organization:
+        """Retrieve the details of a certain organization.
+
+        (Currently in Closed Beta - see
+        https://developers.cloudflare.com/fundamentals/organizations/)
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not organization_id:
+            raise ValueError(f"Expected a non-empty value for `organization_id` but received {organization_id!r}")
+        return self._get(
+            f"/organizations/{organization_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Organization]._unwrapper,
+            ),
+            cast_to=cast(Type[Organization], ResultWrapper[Organization]),
+        )
+
+
+class AsyncOrganizationsResource(AsyncAPIResource):
+    @cached_property
+    def organization_profile(self) -> AsyncOrganizationProfileResource:
+        return AsyncOrganizationProfileResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncOrganizationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncOrganizationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncOrganizationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncOrganizationsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        name: str,
+        parent: organization_create_params.Parent | Omit = omit,
+        profile: organization_create_params.Profile | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Organization:
+        """Create a new organization for a user.
+
+        (Currently in Closed Beta - see
+        https://developers.cloudflare.com/fundamentals/organizations/)
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._post(
+            "/organizations",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "parent": parent,
+                    "profile": profile,
+                },
+                organization_create_params.OrganizationCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Organization]._unwrapper,
+            ),
+            cast_to=cast(Type[Organization], ResultWrapper[Organization]),
+        )
+
+    async def update(
+        self,
+        organization_id: str,
+        *,
+        name: str,
+        parent: organization_update_params.Parent | Omit = omit,
+        profile: organization_update_params.Profile | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Organization:
+        """Modify organization.
+
+        (Currently in Closed Beta - see
+        https://developers.cloudflare.com/fundamentals/organizations/)
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not organization_id:
+            raise ValueError(f"Expected a non-empty value for `organization_id` but received {organization_id!r}")
+        return await self._put(
+            f"/organizations/{organization_id}",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "parent": parent,
+                    "profile": profile,
+                },
+                organization_update_params.OrganizationUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Organization]._unwrapper,
+            ),
+            cast_to=cast(Type[Organization], ResultWrapper[Organization]),
+        )
+
+    def list(
+        self,
+        *,
+        id: SequenceNotStr[str] | Omit = omit,
+        containing: organization_list_params.Containing | Omit = omit,
+        name: organization_list_params.Name | Omit = omit,
+        page_size: int | Omit = omit,
+        page_token: str | Omit = omit,
+        parent: organization_list_params.Parent | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Organization, AsyncSinglePage[Organization]]:
+        """Retrieve a list of organizations a particular user has access to.
+
+        (Currently in
+        Closed Beta - see https://developers.cloudflare.com/fundamentals/organizations/)
+
+        Args:
+          id: Only return organizations with the specified IDs (ex. id=foo&id=bar). Send
+              multiple elements by repeating the query value.
+
+          page_size: The amount of items to return. Defaults to 10.
+
+          page_token: An opaque token returned from the last list response that when provided will
+              retrieve the next page.
+
+              Parameters used to filter the retrieved list must remain in subsequent requests
+              with a page token.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get_api_list(
+            "/organizations",
+            page=AsyncSinglePage[Organization],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "id": id,
+                        "containing": containing,
+                        "name": name,
+                        "page_size": page_size,
+                        "page_token": page_token,
+                        "parent": parent,
+                    },
+                    organization_list_params.OrganizationListParams,
+                ),
+            ),
+            model=Organization,
+        )
+
+    async def delete(
+        self,
+        organization_id: str,
+        *,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OrganizationDeleteResponse:
+        """Delete an organization.
+
+        The organization MUST be empty before deleting. It must
+        not contain any sub-organizations, accounts, members or users. (Currently in
+        Closed Beta - see https://developers.cloudflare.com/fundamentals/organizations/)
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not organization_id:
+            raise ValueError(f"Expected a non-empty value for `organization_id` but received {organization_id!r}")
+        return await self._delete(
+            f"/organizations/{organization_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[OrganizationDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OrganizationDeleteResponse], ResultWrapper[OrganizationDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        organization_id: str,
+        *,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Organization:
+        """Retrieve the details of a certain organization.
+
+        (Currently in Closed Beta - see
+        https://developers.cloudflare.com/fundamentals/organizations/)
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not organization_id:
+            raise ValueError(f"Expected a non-empty value for `organization_id` but received {organization_id!r}")
+        return await self._get(
+            f"/organizations/{organization_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Organization]._unwrapper,
+            ),
+            cast_to=cast(Type[Organization], ResultWrapper[Organization]),
+        )
+
+
+class OrganizationsResourceWithRawResponse:
+    def __init__(self, organizations: OrganizationsResource) -> None:
+        self._organizations = organizations
+
+        self.create = to_raw_response_wrapper(
+            organizations.create,
+        )
+        self.update = to_raw_response_wrapper(
+            organizations.update,
+        )
+        self.list = to_raw_response_wrapper(
+            organizations.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            organizations.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            organizations.get,
+        )
+
+    @cached_property
+    def organization_profile(self) -> OrganizationProfileResourceWithRawResponse:
+        return OrganizationProfileResourceWithRawResponse(self._organizations.organization_profile)
+
+
+class AsyncOrganizationsResourceWithRawResponse:
+    def __init__(self, organizations: AsyncOrganizationsResource) -> None:
+        self._organizations = organizations
+
+        self.create = async_to_raw_response_wrapper(
+            organizations.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            organizations.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            organizations.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            organizations.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            organizations.get,
+        )
+
+    @cached_property
+    def organization_profile(self) -> AsyncOrganizationProfileResourceWithRawResponse:
+        return AsyncOrganizationProfileResourceWithRawResponse(self._organizations.organization_profile)
+
+
+class OrganizationsResourceWithStreamingResponse:
+    def __init__(self, organizations: OrganizationsResource) -> None:
+        self._organizations = organizations
+
+        self.create = to_streamed_response_wrapper(
+            organizations.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            organizations.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            organizations.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            organizations.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            organizations.get,
+        )
+
+    @cached_property
+    def organization_profile(self) -> OrganizationProfileResourceWithStreamingResponse:
+        return OrganizationProfileResourceWithStreamingResponse(self._organizations.organization_profile)
+
+
+class AsyncOrganizationsResourceWithStreamingResponse:
+    def __init__(self, organizations: AsyncOrganizationsResource) -> None:
+        self._organizations = organizations
+
+        self.create = async_to_streamed_response_wrapper(
+            organizations.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            organizations.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            organizations.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            organizations.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            organizations.get,
+        )
+
+    @cached_property
+    def organization_profile(self) -> AsyncOrganizationProfileResourceWithStreamingResponse:
+        return AsyncOrganizationProfileResourceWithStreamingResponse(self._organizations.organization_profile)
diff --git a/src/cloudflare/resources/origin_ca_certificates.py b/src/cloudflare/resources/origin_ca_certificates.py
index d9c889e484e..094ff74f3c7 100644
--- a/src/cloudflare/resources/origin_ca_certificates.py
+++ b/src/cloudflare/resources/origin_ca_certificates.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Iterable, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from .._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from .._utils import maybe_transform, async_maybe_transform
 from .._compat import cached_property
 from .._resource import SyncAPIResource, AsyncAPIResource
 from .._response import (
@@ -21,14 +18,12 @@
 )
 from .._wrappers import ResultWrapper
 from ..types.ssl import RequestValidity
-from ..pagination import SyncSinglePage, AsyncSinglePage
+from ..pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from .._base_client import AsyncPaginator, make_request_options
 from ..types.ssl.request_validity import RequestValidity
 from ..types.origin_ca_certificates import origin_ca_certificate_list_params, origin_ca_certificate_create_params
 from ..types.shared.certificate_request_type import CertificateRequestType
 from ..types.origin_ca_certificates.origin_ca_certificate import OriginCACertificate
-from ..types.origin_ca_certificates.origin_ca_certificate_get_response import OriginCACertificateGetResponse
-from ..types.origin_ca_certificates.origin_ca_certificate_create_response import OriginCACertificateCreateResponse
 from ..types.origin_ca_certificates.origin_ca_certificate_delete_response import OriginCACertificateDeleteResponse
 
 __all__ = ["OriginCACertificatesResource", "AsyncOriginCACertificatesResource"]
@@ -37,30 +32,41 @@
 class OriginCACertificatesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> OriginCACertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return OriginCACertificatesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> OriginCACertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return OriginCACertificatesResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
-        csr: str | NotGiven = NOT_GIVEN,
-        hostnames: Iterable[object] | NotGiven = NOT_GIVEN,
-        request_type: CertificateRequestType | NotGiven = NOT_GIVEN,
-        requested_validity: RequestValidity | NotGiven = NOT_GIVEN,
+        csr: str,
+        hostnames: SequenceNotStr[str],
+        request_type: CertificateRequestType,
+        requested_validity: RequestValidity | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OriginCACertificateCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[OriginCACertificate]:
         """Create an Origin CA certificate.
 
-        Use your Origin CA Key as your User Service Key
-        when calling this endpoint ([see above](#requests)).
+        You can use an Origin CA Key as your User
+        Service Key or an API token when calling this endpoint ([see above](#requests)).
 
         Args:
           csr: The Certificate Signing Request (CSR). Must be newline-encoded.
@@ -81,51 +87,58 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return cast(
-            Optional[OriginCACertificateCreateResponse],
-            self._post(
-                "/certificates",
-                body=maybe_transform(
-                    {
-                        "csr": csr,
-                        "hostnames": hostnames,
-                        "request_type": request_type,
-                        "requested_validity": requested_validity,
-                    },
-                    origin_ca_certificate_create_params.OriginCACertificateCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[OriginCACertificateCreateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[OriginCACertificateCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._post(
+            "/certificates",
+            body=maybe_transform(
+                {
+                    "csr": csr,
+                    "hostnames": hostnames,
+                    "request_type": request_type,
+                    "requested_validity": requested_validity,
+                },
+                origin_ca_certificate_create_params.OriginCACertificateCreateParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OriginCACertificate]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[OriginCACertificate]], ResultWrapper[OriginCACertificate]),
         )
 
     def list(
         self,
         *,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[OriginCACertificate]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[OriginCACertificate]:
         """List all existing Origin CA certificates for a given zone.
 
-        Use your Origin CA
-        Key as your User Service Key when calling this endpoint
+        You can use an Origin
+        CA Key as your User Service Key or an API token when calling this endpoint
         ([see above](#requests)).
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
+
+          limit: Limit to the number of records returned.
+
+          offset: Offset the results
+
+          page: Page number of paginated results.
+
+          per_page: Number of records per page.
 
           extra_headers: Send extra headers
 
@@ -137,14 +150,21 @@ def list(
         """
         return self._get_api_list(
             "/certificates",
-            page=SyncSinglePage[OriginCACertificate],
+            page=SyncV4PagePaginationArray[OriginCACertificate],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
                 query=maybe_transform(
-                    {"zone_id": zone_id}, origin_ca_certificate_list_params.OriginCACertificateListParams
+                    {
+                        "zone_id": zone_id,
+                        "limit": limit,
+                        "offset": offset,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    origin_ca_certificate_list_params.OriginCACertificateListParams,
                 ),
             ),
             model=OriginCACertificate,
@@ -159,16 +179,16 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[OriginCACertificateDeleteResponse]:
         """Revoke an existing Origin CA certificate by its serial number.
 
-        Use your Origin
-        CA Key as your User Service Key when calling this endpoint
-        ([see above](#requests)).
+        You can use an
+        Origin CA Key as your User Service Key or an API token when calling this
+        endpoint ([see above](#requests)).
 
         Args:
-          certificate_id: Identifier
+          certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -203,16 +223,16 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OriginCACertificateGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[OriginCACertificate]:
         """Get an existing Origin CA certificate by its serial number.
 
-        Use your Origin CA
-        Key as your User Service Key when calling this endpoint
-        ([see above](#requests)).
+        You can use an
+        Origin CA Key as your User Service Key or an API token when calling this
+        endpoint ([see above](#requests)).
 
         Args:
-          certificate_id: Identifier
+          certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -224,51 +244,57 @@ def get(
         """
         if not certificate_id:
             raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
-        return cast(
-            Optional[OriginCACertificateGetResponse],
-            self._get(
-                f"/certificates/{certificate_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[OriginCACertificateGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[OriginCACertificateGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._get(
+            f"/certificates/{certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OriginCACertificate]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[OriginCACertificate]], ResultWrapper[OriginCACertificate]),
         )
 
 
 class AsyncOriginCACertificatesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncOriginCACertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncOriginCACertificatesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncOriginCACertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncOriginCACertificatesResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
-        csr: str | NotGiven = NOT_GIVEN,
-        hostnames: Iterable[object] | NotGiven = NOT_GIVEN,
-        request_type: CertificateRequestType | NotGiven = NOT_GIVEN,
-        requested_validity: RequestValidity | NotGiven = NOT_GIVEN,
+        csr: str,
+        hostnames: SequenceNotStr[str],
+        request_type: CertificateRequestType,
+        requested_validity: RequestValidity | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OriginCACertificateCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[OriginCACertificate]:
         """Create an Origin CA certificate.
 
-        Use your Origin CA Key as your User Service Key
-        when calling this endpoint ([see above](#requests)).
+        You can use an Origin CA Key as your User
+        Service Key or an API token when calling this endpoint ([see above](#requests)).
 
         Args:
           csr: The Certificate Signing Request (CSR). Must be newline-encoded.
@@ -289,51 +315,58 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return cast(
-            Optional[OriginCACertificateCreateResponse],
-            await self._post(
-                "/certificates",
-                body=await async_maybe_transform(
-                    {
-                        "csr": csr,
-                        "hostnames": hostnames,
-                        "request_type": request_type,
-                        "requested_validity": requested_validity,
-                    },
-                    origin_ca_certificate_create_params.OriginCACertificateCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[OriginCACertificateCreateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[OriginCACertificateCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._post(
+            "/certificates",
+            body=await async_maybe_transform(
+                {
+                    "csr": csr,
+                    "hostnames": hostnames,
+                    "request_type": request_type,
+                    "requested_validity": requested_validity,
+                },
+                origin_ca_certificate_create_params.OriginCACertificateCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OriginCACertificate]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[OriginCACertificate]], ResultWrapper[OriginCACertificate]),
         )
 
     def list(
         self,
         *,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[OriginCACertificate, AsyncSinglePage[OriginCACertificate]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[OriginCACertificate, AsyncV4PagePaginationArray[OriginCACertificate]]:
         """List all existing Origin CA certificates for a given zone.
 
-        Use your Origin CA
-        Key as your User Service Key when calling this endpoint
+        You can use an Origin
+        CA Key as your User Service Key or an API token when calling this endpoint
         ([see above](#requests)).
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
+
+          limit: Limit to the number of records returned.
+
+          offset: Offset the results
+
+          page: Page number of paginated results.
+
+          per_page: Number of records per page.
 
           extra_headers: Send extra headers
 
@@ -345,14 +378,21 @@ def list(
         """
         return self._get_api_list(
             "/certificates",
-            page=AsyncSinglePage[OriginCACertificate],
+            page=AsyncV4PagePaginationArray[OriginCACertificate],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
                 query=maybe_transform(
-                    {"zone_id": zone_id}, origin_ca_certificate_list_params.OriginCACertificateListParams
+                    {
+                        "zone_id": zone_id,
+                        "limit": limit,
+                        "offset": offset,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    origin_ca_certificate_list_params.OriginCACertificateListParams,
                 ),
             ),
             model=OriginCACertificate,
@@ -367,16 +407,16 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[OriginCACertificateDeleteResponse]:
         """Revoke an existing Origin CA certificate by its serial number.
 
-        Use your Origin
-        CA Key as your User Service Key when calling this endpoint
-        ([see above](#requests)).
+        You can use an
+        Origin CA Key as your User Service Key or an API token when calling this
+        endpoint ([see above](#requests)).
 
         Args:
-          certificate_id: Identifier
+          certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -411,16 +451,16 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OriginCACertificateGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[OriginCACertificate]:
         """Get an existing Origin CA certificate by its serial number.
 
-        Use your Origin CA
-        Key as your User Service Key when calling this endpoint
-        ([see above](#requests)).
+        You can use an
+        Origin CA Key as your User Service Key or an API token when calling this
+        endpoint ([see above](#requests)).
 
         Args:
-          certificate_id: Identifier
+          certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -432,21 +472,16 @@ async def get(
         """
         if not certificate_id:
             raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
-        return cast(
-            Optional[OriginCACertificateGetResponse],
-            await self._get(
-                f"/certificates/{certificate_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[OriginCACertificateGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[OriginCACertificateGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._get(
+            f"/certificates/{certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OriginCACertificate]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[OriginCACertificate]], ResultWrapper[OriginCACertificate]),
         )
 
 
diff --git a/src/cloudflare/resources/origin_post_quantum_encryption.py b/src/cloudflare/resources/origin_post_quantum_encryption.py
index 8ff26e81893..d049002bc21 100644
--- a/src/cloudflare/resources/origin_post_quantum_encryption.py
+++ b/src/cloudflare/resources/origin_post_quantum_encryption.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, cast
+from typing import Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from .._types import Body, Query, Headers, NotGiven, not_given
+from .._utils import maybe_transform, async_maybe_transform
 from .._compat import cached_property
 from .._resource import SyncAPIResource, AsyncAPIResource
 from .._response import (
@@ -36,10 +33,21 @@
 class OriginPostQuantumEncryptionResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> OriginPostQuantumEncryptionResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return OriginPostQuantumEncryptionResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> OriginPostQuantumEncryptionResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return OriginPostQuantumEncryptionResourceWithStreamingResponse(self)
 
     def update(
@@ -52,18 +60,18 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> OriginPostQuantumEncryptionUpdateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[OriginPostQuantumEncryptionUpdateResponse]:
         """
         Instructs Cloudflare to use Post-Quantum (PQ) key agreement algorithms when
         connecting to your origin. Preferred instructs Cloudflare to opportunistically
         send a Post-Quantum keyshare in the first message to the origin (for fastest
         connections when the origin supports and prefers PQ), supported means that PQ
         algorithms are advertised but only used when requested by the origin, and off
-        means that PQ algorithms are not advertised
+        means that PQ algorithms are not advertised.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           value: Value of the Origin Post Quantum Encryption Setting.
 
@@ -77,24 +85,21 @@ def update(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            OriginPostQuantumEncryptionUpdateResponse,
-            self._put(
-                f"/zones/{zone_id}/cache/origin_post_quantum_encryption",
-                body=maybe_transform(
-                    {"value": value},
-                    origin_post_quantum_encryption_update_params.OriginPostQuantumEncryptionUpdateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[OriginPostQuantumEncryptionUpdateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[OriginPostQuantumEncryptionUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._put(
+            f"/zones/{zone_id}/cache/origin_post_quantum_encryption",
+            body=maybe_transform(
+                {"value": value}, origin_post_quantum_encryption_update_params.OriginPostQuantumEncryptionUpdateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OriginPostQuantumEncryptionUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[OriginPostQuantumEncryptionUpdateResponse]],
+                ResultWrapper[OriginPostQuantumEncryptionUpdateResponse],
             ),
         )
 
@@ -107,18 +112,18 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> OriginPostQuantumEncryptionGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[OriginPostQuantumEncryptionGetResponse]:
         """
         Instructs Cloudflare to use Post-Quantum (PQ) key agreement algorithms when
         connecting to your origin. Preferred instructs Cloudflare to opportunistically
         send a Post-Quantum keyshare in the first message to the origin (for fastest
         connections when the origin supports and prefers PQ), supported means that PQ
         algorithms are advertised but only used when requested by the origin, and off
-        means that PQ algorithms are not advertised
+        means that PQ algorithms are not advertised.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -130,20 +135,18 @@ def get(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            OriginPostQuantumEncryptionGetResponse,
-            self._get(
-                f"/zones/{zone_id}/cache/origin_post_quantum_encryption",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[OriginPostQuantumEncryptionGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[OriginPostQuantumEncryptionGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._get(
+            f"/zones/{zone_id}/cache/origin_post_quantum_encryption",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OriginPostQuantumEncryptionGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[OriginPostQuantumEncryptionGetResponse]],
+                ResultWrapper[OriginPostQuantumEncryptionGetResponse],
             ),
         )
 
@@ -151,10 +154,21 @@ def get(
 class AsyncOriginPostQuantumEncryptionResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncOriginPostQuantumEncryptionResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncOriginPostQuantumEncryptionResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncOriginPostQuantumEncryptionResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncOriginPostQuantumEncryptionResourceWithStreamingResponse(self)
 
     async def update(
@@ -167,18 +181,18 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> OriginPostQuantumEncryptionUpdateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[OriginPostQuantumEncryptionUpdateResponse]:
         """
         Instructs Cloudflare to use Post-Quantum (PQ) key agreement algorithms when
         connecting to your origin. Preferred instructs Cloudflare to opportunistically
         send a Post-Quantum keyshare in the first message to the origin (for fastest
         connections when the origin supports and prefers PQ), supported means that PQ
         algorithms are advertised but only used when requested by the origin, and off
-        means that PQ algorithms are not advertised
+        means that PQ algorithms are not advertised.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           value: Value of the Origin Post Quantum Encryption Setting.
 
@@ -192,24 +206,21 @@ async def update(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            OriginPostQuantumEncryptionUpdateResponse,
-            await self._put(
-                f"/zones/{zone_id}/cache/origin_post_quantum_encryption",
-                body=await async_maybe_transform(
-                    {"value": value},
-                    origin_post_quantum_encryption_update_params.OriginPostQuantumEncryptionUpdateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[OriginPostQuantumEncryptionUpdateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[OriginPostQuantumEncryptionUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._put(
+            f"/zones/{zone_id}/cache/origin_post_quantum_encryption",
+            body=await async_maybe_transform(
+                {"value": value}, origin_post_quantum_encryption_update_params.OriginPostQuantumEncryptionUpdateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OriginPostQuantumEncryptionUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[OriginPostQuantumEncryptionUpdateResponse]],
+                ResultWrapper[OriginPostQuantumEncryptionUpdateResponse],
             ),
         )
 
@@ -222,18 +233,18 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> OriginPostQuantumEncryptionGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[OriginPostQuantumEncryptionGetResponse]:
         """
         Instructs Cloudflare to use Post-Quantum (PQ) key agreement algorithms when
         connecting to your origin. Preferred instructs Cloudflare to opportunistically
         send a Post-Quantum keyshare in the first message to the origin (for fastest
         connections when the origin supports and prefers PQ), supported means that PQ
         algorithms are advertised but only used when requested by the origin, and off
-        means that PQ algorithms are not advertised
+        means that PQ algorithms are not advertised.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -245,20 +256,18 @@ async def get(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            OriginPostQuantumEncryptionGetResponse,
-            await self._get(
-                f"/zones/{zone_id}/cache/origin_post_quantum_encryption",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[OriginPostQuantumEncryptionGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[OriginPostQuantumEncryptionGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._get(
+            f"/zones/{zone_id}/cache/origin_post_quantum_encryption",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OriginPostQuantumEncryptionGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[OriginPostQuantumEncryptionGetResponse]],
+                ResultWrapper[OriginPostQuantumEncryptionGetResponse],
             ),
         )
 
diff --git a/src/cloudflare/resources/origin_tls_client_auth/__init__.py b/src/cloudflare/resources/origin_tls_client_auth/__init__.py
index 6c12314975a..611e0ad7097 100644
--- a/src/cloudflare/resources/origin_tls_client_auth/__init__.py
+++ b/src/cloudflare/resources/origin_tls_client_auth/__init__.py
@@ -16,6 +16,22 @@
     HostnamesResourceWithStreamingResponse,
     AsyncHostnamesResourceWithStreamingResponse,
 )
+from .zone_certificates import (
+    ZoneCertificatesResource,
+    AsyncZoneCertificatesResource,
+    ZoneCertificatesResourceWithRawResponse,
+    AsyncZoneCertificatesResourceWithRawResponse,
+    ZoneCertificatesResourceWithStreamingResponse,
+    AsyncZoneCertificatesResourceWithStreamingResponse,
+)
+from .hostname_certificates import (
+    HostnameCertificatesResource,
+    AsyncHostnameCertificatesResource,
+    HostnameCertificatesResourceWithRawResponse,
+    AsyncHostnameCertificatesResourceWithRawResponse,
+    HostnameCertificatesResourceWithStreamingResponse,
+    AsyncHostnameCertificatesResourceWithStreamingResponse,
+)
 from .origin_tls_client_auth import (
     OriginTLSClientAuthResource,
     AsyncOriginTLSClientAuthResource,
@@ -26,12 +42,24 @@
 )
 
 __all__ = [
+    "ZoneCertificatesResource",
+    "AsyncZoneCertificatesResource",
+    "ZoneCertificatesResourceWithRawResponse",
+    "AsyncZoneCertificatesResourceWithRawResponse",
+    "ZoneCertificatesResourceWithStreamingResponse",
+    "AsyncZoneCertificatesResourceWithStreamingResponse",
     "HostnamesResource",
     "AsyncHostnamesResource",
     "HostnamesResourceWithRawResponse",
     "AsyncHostnamesResourceWithRawResponse",
     "HostnamesResourceWithStreamingResponse",
     "AsyncHostnamesResourceWithStreamingResponse",
+    "HostnameCertificatesResource",
+    "AsyncHostnameCertificatesResource",
+    "HostnameCertificatesResourceWithRawResponse",
+    "AsyncHostnameCertificatesResourceWithRawResponse",
+    "HostnameCertificatesResourceWithStreamingResponse",
+    "AsyncHostnameCertificatesResourceWithStreamingResponse",
     "SettingsResource",
     "AsyncSettingsResource",
     "SettingsResourceWithRawResponse",
diff --git a/src/cloudflare/resources/origin_tls_client_auth/hostname_certificates.py b/src/cloudflare/resources/origin_tls_client_auth/hostname_certificates.py
new file mode 100644
index 00000000000..f95b8739151
--- /dev/null
+++ b/src/cloudflare/resources/origin_tls_client_auth/hostname_certificates.py
@@ -0,0 +1,506 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.origin_tls_client_auth import hostname_certificate_create_params
+from ...types.origin_tls_client_auth.hostname_certificate_get_response import HostnameCertificateGetResponse
+from ...types.origin_tls_client_auth.hostname_certificate_list_response import HostnameCertificateListResponse
+from ...types.origin_tls_client_auth.hostname_certificate_create_response import HostnameCertificateCreateResponse
+from ...types.origin_tls_client_auth.hostname_certificate_delete_response import HostnameCertificateDeleteResponse
+
+__all__ = ["HostnameCertificatesResource", "AsyncHostnameCertificatesResource"]
+
+
+class HostnameCertificatesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> HostnameCertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return HostnameCertificatesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> HostnameCertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return HostnameCertificatesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        zone_id: str,
+        certificate: str,
+        private_key: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[HostnameCertificateCreateResponse]:
+        """Upload a certificate to be used for client authentication on a hostname.
+
+        10
+        hostname certificates per zone are allowed.
+
+        Args:
+          zone_id: Identifier.
+
+          certificate: The hostname certificate.
+
+          private_key: The hostname certificate's private key.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/certificates",
+            body=maybe_transform(
+                {
+                    "certificate": certificate,
+                    "private_key": private_key,
+                },
+                hostname_certificate_create_params.HostnameCertificateCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[HostnameCertificateCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[HostnameCertificateCreateResponse]], ResultWrapper[HostnameCertificateCreateResponse]
+            ),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[HostnameCertificateListResponse]:
+        """
+        List Certificates
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/certificates",
+            page=SyncSinglePage[HostnameCertificateListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=HostnameCertificateListResponse,
+        )
+
+    def delete(
+        self,
+        certificate_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[HostnameCertificateDeleteResponse]:
+        """
+        Delete Hostname Client Certificate
+
+        Args:
+          zone_id: Identifier.
+
+          certificate_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not certificate_id:
+            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
+        return self._delete(
+            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/certificates/{certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[HostnameCertificateDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[HostnameCertificateDeleteResponse]], ResultWrapper[HostnameCertificateDeleteResponse]
+            ),
+        )
+
+    def get(
+        self,
+        certificate_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[HostnameCertificateGetResponse]:
+        """
+        Get the certificate by ID to be used for client authentication on a hostname.
+
+        Args:
+          zone_id: Identifier.
+
+          certificate_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not certificate_id:
+            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/certificates/{certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[HostnameCertificateGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[HostnameCertificateGetResponse]], ResultWrapper[HostnameCertificateGetResponse]),
+        )
+
+
+class AsyncHostnameCertificatesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncHostnameCertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncHostnameCertificatesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncHostnameCertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncHostnameCertificatesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        certificate: str,
+        private_key: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[HostnameCertificateCreateResponse]:
+        """Upload a certificate to be used for client authentication on a hostname.
+
+        10
+        hostname certificates per zone are allowed.
+
+        Args:
+          zone_id: Identifier.
+
+          certificate: The hostname certificate.
+
+          private_key: The hostname certificate's private key.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/certificates",
+            body=await async_maybe_transform(
+                {
+                    "certificate": certificate,
+                    "private_key": private_key,
+                },
+                hostname_certificate_create_params.HostnameCertificateCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[HostnameCertificateCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[HostnameCertificateCreateResponse]], ResultWrapper[HostnameCertificateCreateResponse]
+            ),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[HostnameCertificateListResponse, AsyncSinglePage[HostnameCertificateListResponse]]:
+        """
+        List Certificates
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/certificates",
+            page=AsyncSinglePage[HostnameCertificateListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=HostnameCertificateListResponse,
+        )
+
+    async def delete(
+        self,
+        certificate_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[HostnameCertificateDeleteResponse]:
+        """
+        Delete Hostname Client Certificate
+
+        Args:
+          zone_id: Identifier.
+
+          certificate_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not certificate_id:
+            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
+        return await self._delete(
+            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/certificates/{certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[HostnameCertificateDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[HostnameCertificateDeleteResponse]], ResultWrapper[HostnameCertificateDeleteResponse]
+            ),
+        )
+
+    async def get(
+        self,
+        certificate_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[HostnameCertificateGetResponse]:
+        """
+        Get the certificate by ID to be used for client authentication on a hostname.
+
+        Args:
+          zone_id: Identifier.
+
+          certificate_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not certificate_id:
+            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/certificates/{certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[HostnameCertificateGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[HostnameCertificateGetResponse]], ResultWrapper[HostnameCertificateGetResponse]),
+        )
+
+
+class HostnameCertificatesResourceWithRawResponse:
+    def __init__(self, hostname_certificates: HostnameCertificatesResource) -> None:
+        self._hostname_certificates = hostname_certificates
+
+        self.create = to_raw_response_wrapper(
+            hostname_certificates.create,
+        )
+        self.list = to_raw_response_wrapper(
+            hostname_certificates.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            hostname_certificates.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            hostname_certificates.get,
+        )
+
+
+class AsyncHostnameCertificatesResourceWithRawResponse:
+    def __init__(self, hostname_certificates: AsyncHostnameCertificatesResource) -> None:
+        self._hostname_certificates = hostname_certificates
+
+        self.create = async_to_raw_response_wrapper(
+            hostname_certificates.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            hostname_certificates.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            hostname_certificates.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            hostname_certificates.get,
+        )
+
+
+class HostnameCertificatesResourceWithStreamingResponse:
+    def __init__(self, hostname_certificates: HostnameCertificatesResource) -> None:
+        self._hostname_certificates = hostname_certificates
+
+        self.create = to_streamed_response_wrapper(
+            hostname_certificates.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            hostname_certificates.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            hostname_certificates.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            hostname_certificates.get,
+        )
+
+
+class AsyncHostnameCertificatesResourceWithStreamingResponse:
+    def __init__(self, hostname_certificates: AsyncHostnameCertificatesResource) -> None:
+        self._hostname_certificates = hostname_certificates
+
+        self.create = async_to_streamed_response_wrapper(
+            hostname_certificates.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            hostname_certificates.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            hostname_certificates.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            hostname_certificates.get,
+        )
diff --git a/src/cloudflare/resources/origin_tls_client_auth/hostnames.py b/src/cloudflare/resources/origin_tls_client_auth/hostnames.py
new file mode 100644
index 00000000000..a4f59591ae7
--- /dev/null
+++ b/src/cloudflare/resources/origin_tls_client_auth/hostnames.py
@@ -0,0 +1,292 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, Optional, cast
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.origin_tls_client_auth import hostname_update_params
+from ...types.origin_tls_client_auth.hostname_update_response import HostnameUpdateResponse
+from ...types.origin_tls_client_auth.authenticated_origin_pull import AuthenticatedOriginPull
+
+__all__ = ["HostnamesResource", "AsyncHostnamesResource"]
+
+
+class HostnamesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> HostnamesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return HostnamesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> HostnamesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return HostnamesResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        *,
+        zone_id: str,
+        config: Iterable[hostname_update_params.Config],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[HostnameUpdateResponse]:
+        """
+        Associate a hostname to a certificate and enable, disable or invalidate the
+        association. If disabled, client certificate will not be sent to the hostname
+        even if activated at the zone level. 100 maximum associations on a single
+        certificate are allowed. Note: Use a null value for parameter _enabled_ to
+        invalidate the association.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/origin_tls_client_auth/hostnames",
+            page=SyncSinglePage[HostnameUpdateResponse],
+            body=maybe_transform({"config": config}, hostname_update_params.HostnameUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=HostnameUpdateResponse,
+            method="put",
+        )
+
+    def get(
+        self,
+        hostname: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AuthenticatedOriginPull]:
+        """
+        Get the Hostname Status for Client Authentication
+
+        Args:
+          zone_id: Identifier.
+
+          hostname: The hostname on the origin for which the client certificate uploaded will be
+              used.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not hostname:
+            raise ValueError(f"Expected a non-empty value for `hostname` but received {hostname!r}")
+        return self._get(
+            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/{hostname}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AuthenticatedOriginPull]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AuthenticatedOriginPull]], ResultWrapper[AuthenticatedOriginPull]),
+        )
+
+
+class AsyncHostnamesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncHostnamesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncHostnamesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncHostnamesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncHostnamesResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        *,
+        zone_id: str,
+        config: Iterable[hostname_update_params.Config],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[HostnameUpdateResponse, AsyncSinglePage[HostnameUpdateResponse]]:
+        """
+        Associate a hostname to a certificate and enable, disable or invalidate the
+        association. If disabled, client certificate will not be sent to the hostname
+        even if activated at the zone level. 100 maximum associations on a single
+        certificate are allowed. Note: Use a null value for parameter _enabled_ to
+        invalidate the association.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/origin_tls_client_auth/hostnames",
+            page=AsyncSinglePage[HostnameUpdateResponse],
+            body=maybe_transform({"config": config}, hostname_update_params.HostnameUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=HostnameUpdateResponse,
+            method="put",
+        )
+
+    async def get(
+        self,
+        hostname: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AuthenticatedOriginPull]:
+        """
+        Get the Hostname Status for Client Authentication
+
+        Args:
+          zone_id: Identifier.
+
+          hostname: The hostname on the origin for which the client certificate uploaded will be
+              used.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not hostname:
+            raise ValueError(f"Expected a non-empty value for `hostname` but received {hostname!r}")
+        return await self._get(
+            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/{hostname}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AuthenticatedOriginPull]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AuthenticatedOriginPull]], ResultWrapper[AuthenticatedOriginPull]),
+        )
+
+
+class HostnamesResourceWithRawResponse:
+    def __init__(self, hostnames: HostnamesResource) -> None:
+        self._hostnames = hostnames
+
+        self.update = to_raw_response_wrapper(
+            hostnames.update,
+        )
+        self.get = to_raw_response_wrapper(
+            hostnames.get,
+        )
+
+
+class AsyncHostnamesResourceWithRawResponse:
+    def __init__(self, hostnames: AsyncHostnamesResource) -> None:
+        self._hostnames = hostnames
+
+        self.update = async_to_raw_response_wrapper(
+            hostnames.update,
+        )
+        self.get = async_to_raw_response_wrapper(
+            hostnames.get,
+        )
+
+
+class HostnamesResourceWithStreamingResponse:
+    def __init__(self, hostnames: HostnamesResource) -> None:
+        self._hostnames = hostnames
+
+        self.update = to_streamed_response_wrapper(
+            hostnames.update,
+        )
+        self.get = to_streamed_response_wrapper(
+            hostnames.get,
+        )
+
+
+class AsyncHostnamesResourceWithStreamingResponse:
+    def __init__(self, hostnames: AsyncHostnamesResource) -> None:
+        self._hostnames = hostnames
+
+        self.update = async_to_streamed_response_wrapper(
+            hostnames.update,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            hostnames.get,
+        )
diff --git a/src/cloudflare/resources/origin_tls_client_auth/hostnames/__init__.py b/src/cloudflare/resources/origin_tls_client_auth/hostnames/__init__.py
deleted file mode 100644
index 0e6260acee3..00000000000
--- a/src/cloudflare/resources/origin_tls_client_auth/hostnames/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from .hostnames import (
-    HostnamesResource,
-    AsyncHostnamesResource,
-    HostnamesResourceWithRawResponse,
-    AsyncHostnamesResourceWithRawResponse,
-    HostnamesResourceWithStreamingResponse,
-    AsyncHostnamesResourceWithStreamingResponse,
-)
-from .certificates import (
-    CertificatesResource,
-    AsyncCertificatesResource,
-    CertificatesResourceWithRawResponse,
-    AsyncCertificatesResourceWithRawResponse,
-    CertificatesResourceWithStreamingResponse,
-    AsyncCertificatesResourceWithStreamingResponse,
-)
-
-__all__ = [
-    "CertificatesResource",
-    "AsyncCertificatesResource",
-    "CertificatesResourceWithRawResponse",
-    "AsyncCertificatesResourceWithRawResponse",
-    "CertificatesResourceWithStreamingResponse",
-    "AsyncCertificatesResourceWithStreamingResponse",
-    "HostnamesResource",
-    "AsyncHostnamesResource",
-    "HostnamesResourceWithRawResponse",
-    "AsyncHostnamesResourceWithRawResponse",
-    "HostnamesResourceWithStreamingResponse",
-    "AsyncHostnamesResourceWithStreamingResponse",
-]
diff --git a/src/cloudflare/resources/origin_tls_client_auth/hostnames/certificates.py b/src/cloudflare/resources/origin_tls_client_auth/hostnames/certificates.py
deleted file mode 100644
index cbcf295a206..00000000000
--- a/src/cloudflare/resources/origin_tls_client_auth/hostnames/certificates.py
+++ /dev/null
@@ -1,479 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Optional, cast
-
-import httpx
-
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ...._wrappers import ResultWrapper
-from ....pagination import SyncSinglePage, AsyncSinglePage
-from ...._base_client import AsyncPaginator, make_request_options
-from ....types.origin_tls_client_auth.hostnames import certificate_create_params
-from ....types.origin_tls_client_auth.authenticated_origin_pull import AuthenticatedOriginPull
-from ....types.origin_tls_client_auth.hostnames.certificate_get_response import CertificateGetResponse
-from ....types.origin_tls_client_auth.hostnames.certificate_create_response import CertificateCreateResponse
-from ....types.origin_tls_client_auth.hostnames.certificate_delete_response import CertificateDeleteResponse
-
-__all__ = ["CertificatesResource", "AsyncCertificatesResource"]
-
-
-class CertificatesResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> CertificatesResourceWithRawResponse:
-        return CertificatesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> CertificatesResourceWithStreamingResponse:
-        return CertificatesResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        *,
-        zone_id: str,
-        certificate: str,
-        private_key: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CertificateCreateResponse]:
-        """Upload a certificate to be used for client authentication on a hostname.
-
-        10
-        hostname certificates per zone are allowed.
-
-        Args:
-          zone_id: Identifier
-
-          certificate: The hostname certificate.
-
-          private_key: The hostname certificate's private key.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._post(
-            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/certificates",
-            body=maybe_transform(
-                {
-                    "certificate": certificate,
-                    "private_key": private_key,
-                },
-                certificate_create_params.CertificateCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CertificateCreateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CertificateCreateResponse]], ResultWrapper[CertificateCreateResponse]),
-        )
-
-    def list(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[AuthenticatedOriginPull]:
-        """
-        List Certificates
-
-        Args:
-          zone_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._get_api_list(
-            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/certificates",
-            page=SyncSinglePage[AuthenticatedOriginPull],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=AuthenticatedOriginPull,
-        )
-
-    def delete(
-        self,
-        certificate_id: str,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CertificateDeleteResponse]:
-        """
-        Delete Hostname Client Certificate
-
-        Args:
-          zone_id: Identifier
-
-          certificate_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        if not certificate_id:
-            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
-        return self._delete(
-            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/certificates/{certificate_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CertificateDeleteResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CertificateDeleteResponse]], ResultWrapper[CertificateDeleteResponse]),
-        )
-
-    def get(
-        self,
-        certificate_id: str,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CertificateGetResponse]:
-        """
-        Get the certificate by ID to be used for client authentication on a hostname.
-
-        Args:
-          zone_id: Identifier
-
-          certificate_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        if not certificate_id:
-            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
-        return self._get(
-            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/certificates/{certificate_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CertificateGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CertificateGetResponse]], ResultWrapper[CertificateGetResponse]),
-        )
-
-
-class AsyncCertificatesResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncCertificatesResourceWithRawResponse:
-        return AsyncCertificatesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncCertificatesResourceWithStreamingResponse:
-        return AsyncCertificatesResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        *,
-        zone_id: str,
-        certificate: str,
-        private_key: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CertificateCreateResponse]:
-        """Upload a certificate to be used for client authentication on a hostname.
-
-        10
-        hostname certificates per zone are allowed.
-
-        Args:
-          zone_id: Identifier
-
-          certificate: The hostname certificate.
-
-          private_key: The hostname certificate's private key.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._post(
-            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/certificates",
-            body=await async_maybe_transform(
-                {
-                    "certificate": certificate,
-                    "private_key": private_key,
-                },
-                certificate_create_params.CertificateCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CertificateCreateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CertificateCreateResponse]], ResultWrapper[CertificateCreateResponse]),
-        )
-
-    def list(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[AuthenticatedOriginPull, AsyncSinglePage[AuthenticatedOriginPull]]:
-        """
-        List Certificates
-
-        Args:
-          zone_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._get_api_list(
-            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/certificates",
-            page=AsyncSinglePage[AuthenticatedOriginPull],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=AuthenticatedOriginPull,
-        )
-
-    async def delete(
-        self,
-        certificate_id: str,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CertificateDeleteResponse]:
-        """
-        Delete Hostname Client Certificate
-
-        Args:
-          zone_id: Identifier
-
-          certificate_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        if not certificate_id:
-            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
-        return await self._delete(
-            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/certificates/{certificate_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CertificateDeleteResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CertificateDeleteResponse]], ResultWrapper[CertificateDeleteResponse]),
-        )
-
-    async def get(
-        self,
-        certificate_id: str,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CertificateGetResponse]:
-        """
-        Get the certificate by ID to be used for client authentication on a hostname.
-
-        Args:
-          zone_id: Identifier
-
-          certificate_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        if not certificate_id:
-            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
-        return await self._get(
-            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/certificates/{certificate_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CertificateGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CertificateGetResponse]], ResultWrapper[CertificateGetResponse]),
-        )
-
-
-class CertificatesResourceWithRawResponse:
-    def __init__(self, certificates: CertificatesResource) -> None:
-        self._certificates = certificates
-
-        self.create = to_raw_response_wrapper(
-            certificates.create,
-        )
-        self.list = to_raw_response_wrapper(
-            certificates.list,
-        )
-        self.delete = to_raw_response_wrapper(
-            certificates.delete,
-        )
-        self.get = to_raw_response_wrapper(
-            certificates.get,
-        )
-
-
-class AsyncCertificatesResourceWithRawResponse:
-    def __init__(self, certificates: AsyncCertificatesResource) -> None:
-        self._certificates = certificates
-
-        self.create = async_to_raw_response_wrapper(
-            certificates.create,
-        )
-        self.list = async_to_raw_response_wrapper(
-            certificates.list,
-        )
-        self.delete = async_to_raw_response_wrapper(
-            certificates.delete,
-        )
-        self.get = async_to_raw_response_wrapper(
-            certificates.get,
-        )
-
-
-class CertificatesResourceWithStreamingResponse:
-    def __init__(self, certificates: CertificatesResource) -> None:
-        self._certificates = certificates
-
-        self.create = to_streamed_response_wrapper(
-            certificates.create,
-        )
-        self.list = to_streamed_response_wrapper(
-            certificates.list,
-        )
-        self.delete = to_streamed_response_wrapper(
-            certificates.delete,
-        )
-        self.get = to_streamed_response_wrapper(
-            certificates.get,
-        )
-
-
-class AsyncCertificatesResourceWithStreamingResponse:
-    def __init__(self, certificates: AsyncCertificatesResource) -> None:
-        self._certificates = certificates
-
-        self.create = async_to_streamed_response_wrapper(
-            certificates.create,
-        )
-        self.list = async_to_streamed_response_wrapper(
-            certificates.list,
-        )
-        self.delete = async_to_streamed_response_wrapper(
-            certificates.delete,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            certificates.get,
-        )
diff --git a/src/cloudflare/resources/origin_tls_client_auth/hostnames/hostnames.py b/src/cloudflare/resources/origin_tls_client_auth/hostnames/hostnames.py
deleted file mode 100644
index a481ade84de..00000000000
--- a/src/cloudflare/resources/origin_tls_client_auth/hostnames/hostnames.py
+++ /dev/null
@@ -1,308 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Iterable, Optional, cast
-
-import httpx
-
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ...._wrappers import ResultWrapper
-from .certificates import (
-    CertificatesResource,
-    AsyncCertificatesResource,
-    CertificatesResourceWithRawResponse,
-    AsyncCertificatesResourceWithRawResponse,
-    CertificatesResourceWithStreamingResponse,
-    AsyncCertificatesResourceWithStreamingResponse,
-)
-from ...._base_client import make_request_options
-from ....types.origin_tls_client_auth import hostname_update_params
-from ....types.origin_tls_client_auth.hostname_update_response import HostnameUpdateResponse
-from ....types.origin_tls_client_auth.authenticated_origin_pull import AuthenticatedOriginPull
-
-__all__ = ["HostnamesResource", "AsyncHostnamesResource"]
-
-
-class HostnamesResource(SyncAPIResource):
-    @cached_property
-    def certificates(self) -> CertificatesResource:
-        return CertificatesResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> HostnamesResourceWithRawResponse:
-        return HostnamesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> HostnamesResourceWithStreamingResponse:
-        return HostnamesResourceWithStreamingResponse(self)
-
-    def update(
-        self,
-        *,
-        zone_id: str,
-        config: Iterable[hostname_update_params.Config],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[HostnameUpdateResponse]:
-        """
-        Associate a hostname to a certificate and enable, disable or invalidate the
-        association. If disabled, client certificate will not be sent to the hostname
-        even if activated at the zone level. 100 maximum associations on a single
-        certificate are allowed. Note: Use a null value for parameter _enabled_ to
-        invalidate the association.
-
-        Args:
-          zone_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._put(
-            f"/zones/{zone_id}/origin_tls_client_auth/hostnames",
-            body=maybe_transform({"config": config}, hostname_update_params.HostnameUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[HostnameUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[HostnameUpdateResponse]], ResultWrapper[HostnameUpdateResponse]),
-        )
-
-    def get(
-        self,
-        hostname: str,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AuthenticatedOriginPull]:
-        """
-        Get the Hostname Status for Client Authentication
-
-        Args:
-          zone_id: Identifier
-
-          hostname: The hostname on the origin for which the client certificate uploaded will be
-              used.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        if not hostname:
-            raise ValueError(f"Expected a non-empty value for `hostname` but received {hostname!r}")
-        return self._get(
-            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/{hostname}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[AuthenticatedOriginPull]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[AuthenticatedOriginPull]], ResultWrapper[AuthenticatedOriginPull]),
-        )
-
-
-class AsyncHostnamesResource(AsyncAPIResource):
-    @cached_property
-    def certificates(self) -> AsyncCertificatesResource:
-        return AsyncCertificatesResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncHostnamesResourceWithRawResponse:
-        return AsyncHostnamesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncHostnamesResourceWithStreamingResponse:
-        return AsyncHostnamesResourceWithStreamingResponse(self)
-
-    async def update(
-        self,
-        *,
-        zone_id: str,
-        config: Iterable[hostname_update_params.Config],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[HostnameUpdateResponse]:
-        """
-        Associate a hostname to a certificate and enable, disable or invalidate the
-        association. If disabled, client certificate will not be sent to the hostname
-        even if activated at the zone level. 100 maximum associations on a single
-        certificate are allowed. Note: Use a null value for parameter _enabled_ to
-        invalidate the association.
-
-        Args:
-          zone_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._put(
-            f"/zones/{zone_id}/origin_tls_client_auth/hostnames",
-            body=await async_maybe_transform({"config": config}, hostname_update_params.HostnameUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[HostnameUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[HostnameUpdateResponse]], ResultWrapper[HostnameUpdateResponse]),
-        )
-
-    async def get(
-        self,
-        hostname: str,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AuthenticatedOriginPull]:
-        """
-        Get the Hostname Status for Client Authentication
-
-        Args:
-          zone_id: Identifier
-
-          hostname: The hostname on the origin for which the client certificate uploaded will be
-              used.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        if not hostname:
-            raise ValueError(f"Expected a non-empty value for `hostname` but received {hostname!r}")
-        return await self._get(
-            f"/zones/{zone_id}/origin_tls_client_auth/hostnames/{hostname}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[AuthenticatedOriginPull]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[AuthenticatedOriginPull]], ResultWrapper[AuthenticatedOriginPull]),
-        )
-
-
-class HostnamesResourceWithRawResponse:
-    def __init__(self, hostnames: HostnamesResource) -> None:
-        self._hostnames = hostnames
-
-        self.update = to_raw_response_wrapper(
-            hostnames.update,
-        )
-        self.get = to_raw_response_wrapper(
-            hostnames.get,
-        )
-
-    @cached_property
-    def certificates(self) -> CertificatesResourceWithRawResponse:
-        return CertificatesResourceWithRawResponse(self._hostnames.certificates)
-
-
-class AsyncHostnamesResourceWithRawResponse:
-    def __init__(self, hostnames: AsyncHostnamesResource) -> None:
-        self._hostnames = hostnames
-
-        self.update = async_to_raw_response_wrapper(
-            hostnames.update,
-        )
-        self.get = async_to_raw_response_wrapper(
-            hostnames.get,
-        )
-
-    @cached_property
-    def certificates(self) -> AsyncCertificatesResourceWithRawResponse:
-        return AsyncCertificatesResourceWithRawResponse(self._hostnames.certificates)
-
-
-class HostnamesResourceWithStreamingResponse:
-    def __init__(self, hostnames: HostnamesResource) -> None:
-        self._hostnames = hostnames
-
-        self.update = to_streamed_response_wrapper(
-            hostnames.update,
-        )
-        self.get = to_streamed_response_wrapper(
-            hostnames.get,
-        )
-
-    @cached_property
-    def certificates(self) -> CertificatesResourceWithStreamingResponse:
-        return CertificatesResourceWithStreamingResponse(self._hostnames.certificates)
-
-
-class AsyncHostnamesResourceWithStreamingResponse:
-    def __init__(self, hostnames: AsyncHostnamesResource) -> None:
-        self._hostnames = hostnames
-
-        self.update = async_to_streamed_response_wrapper(
-            hostnames.update,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            hostnames.get,
-        )
-
-    @cached_property
-    def certificates(self) -> AsyncCertificatesResourceWithStreamingResponse:
-        return AsyncCertificatesResourceWithStreamingResponse(self._hostnames.certificates)
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 1eabc1123fe..1f418d7b2c4 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
@@ -2,15 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, Optional, cast
+import typing_extensions
+from typing import Type, Optional, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from .settings import (
     SettingsResource,
     AsyncSettingsResource,
@@ -38,10 +36,25 @@
 from ..._wrappers import ResultWrapper
 from ...pagination import SyncSinglePage, AsyncSinglePage
 from ..._base_client import AsyncPaginator, make_request_options
-from .hostnames.hostnames import HostnamesResource, AsyncHostnamesResource
+from .zone_certificates import (
+    ZoneCertificatesResource,
+    AsyncZoneCertificatesResource,
+    ZoneCertificatesResourceWithRawResponse,
+    AsyncZoneCertificatesResourceWithRawResponse,
+    ZoneCertificatesResourceWithStreamingResponse,
+    AsyncZoneCertificatesResourceWithStreamingResponse,
+)
+from .hostname_certificates import (
+    HostnameCertificatesResource,
+    AsyncHostnameCertificatesResource,
+    HostnameCertificatesResourceWithRawResponse,
+    AsyncHostnameCertificatesResourceWithRawResponse,
+    HostnameCertificatesResourceWithStreamingResponse,
+    AsyncHostnameCertificatesResourceWithStreamingResponse,
+)
 from ...types.origin_tls_client_auth import origin_tls_client_auth_create_params
-from ...types.origin_tls_client_auth.zone_authenticated_origin_pull import ZoneAuthenticatedOriginPull
 from ...types.origin_tls_client_auth.origin_tls_client_auth_get_response import OriginTLSClientAuthGetResponse
+from ...types.origin_tls_client_auth.origin_tls_client_auth_list_response import OriginTLSClientAuthListResponse
 from ...types.origin_tls_client_auth.origin_tls_client_auth_create_response import OriginTLSClientAuthCreateResponse
 from ...types.origin_tls_client_auth.origin_tls_client_auth_delete_response import OriginTLSClientAuthDeleteResponse
 
@@ -49,22 +62,44 @@
 
 
 class OriginTLSClientAuthResource(SyncAPIResource):
+    @cached_property
+    def zone_certificates(self) -> ZoneCertificatesResource:
+        return ZoneCertificatesResource(self._client)
+
     @cached_property
     def hostnames(self) -> HostnamesResource:
         return HostnamesResource(self._client)
 
+    @cached_property
+    def hostname_certificates(self) -> HostnameCertificatesResource:
+        return HostnameCertificatesResource(self._client)
+
     @cached_property
     def settings(self) -> SettingsResource:
         return SettingsResource(self._client)
 
     @cached_property
     def with_raw_response(self) -> OriginTLSClientAuthResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return OriginTLSClientAuthResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> OriginTLSClientAuthResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return OriginTLSClientAuthResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use zone_certificates.create for zone-level certificates. This method will be removed in a future major version."
+    )
     def create(
         self,
         *,
@@ -76,7 +111,7 @@ def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[OriginTLSClientAuthCreateResponse]:
         """
         Upload your own certificate you want Cloudflare to use for edge-to-origin
@@ -86,7 +121,7 @@ def create(
         to see the uploaded certificate in use.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           certificate: The zone's leaf certificate.
 
@@ -102,30 +137,30 @@ def create(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            Optional[OriginTLSClientAuthCreateResponse],
-            self._post(
-                f"/zones/{zone_id}/origin_tls_client_auth",
-                body=maybe_transform(
-                    {
-                        "certificate": certificate,
-                        "private_key": private_key,
-                    },
-                    origin_tls_client_auth_create_params.OriginTLSClientAuthCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[OriginTLSClientAuthCreateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[OriginTLSClientAuthCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._post(
+            f"/zones/{zone_id}/origin_tls_client_auth",
+            body=maybe_transform(
+                {
+                    "certificate": certificate,
+                    "private_key": private_key,
+                },
+                origin_tls_client_auth_create_params.OriginTLSClientAuthCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OriginTLSClientAuthCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[OriginTLSClientAuthCreateResponse]], ResultWrapper[OriginTLSClientAuthCreateResponse]
             ),
         )
 
+    @typing_extensions.deprecated(
+        "Use zone_certificates.list for zone-level certificates. This method will be removed in a future major version."
+    )
     def list(
         self,
         *,
@@ -135,13 +170,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[ZoneAuthenticatedOriginPull]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[OriginTLSClientAuthListResponse]:
         """
         List Certificates
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -155,13 +190,16 @@ def list(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
             f"/zones/{zone_id}/origin_tls_client_auth",
-            page=SyncSinglePage[ZoneAuthenticatedOriginPull],
+            page=SyncSinglePage[OriginTLSClientAuthListResponse],
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            model=ZoneAuthenticatedOriginPull,
+            model=OriginTLSClientAuthListResponse,
         )
 
+    @typing_extensions.deprecated(
+        "Use zone_certificates.delete for zone-level certificates. This method will be removed in a future major version."
+    )
     def delete(
         self,
         certificate_id: str,
@@ -172,15 +210,15 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[OriginTLSClientAuthDeleteResponse]:
         """
         Delete Certificate
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          certificate_id: Identifier
+          certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -194,23 +232,23 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not certificate_id:
             raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
-        return cast(
-            Optional[OriginTLSClientAuthDeleteResponse],
-            self._delete(
-                f"/zones/{zone_id}/origin_tls_client_auth/{certificate_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[OriginTLSClientAuthDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[OriginTLSClientAuthDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._delete(
+            f"/zones/{zone_id}/origin_tls_client_auth/{certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OriginTLSClientAuthDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[OriginTLSClientAuthDeleteResponse]], ResultWrapper[OriginTLSClientAuthDeleteResponse]
             ),
         )
 
+    @typing_extensions.deprecated(
+        "Use zone_certificates.get for zone-level certificates. This method will be removed in a future major version."
+    )
     def get(
         self,
         certificate_id: str,
@@ -221,15 +259,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[OriginTLSClientAuthGetResponse]:
         """
         Get Certificate Details
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          certificate_id: Identifier
+          certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -243,41 +281,58 @@ def get(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not certificate_id:
             raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
-        return cast(
-            Optional[OriginTLSClientAuthGetResponse],
-            self._get(
-                f"/zones/{zone_id}/origin_tls_client_auth/{certificate_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[OriginTLSClientAuthGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[OriginTLSClientAuthGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._get(
+            f"/zones/{zone_id}/origin_tls_client_auth/{certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OriginTLSClientAuthGetResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[OriginTLSClientAuthGetResponse]], ResultWrapper[OriginTLSClientAuthGetResponse]),
         )
 
 
 class AsyncOriginTLSClientAuthResource(AsyncAPIResource):
+    @cached_property
+    def zone_certificates(self) -> AsyncZoneCertificatesResource:
+        return AsyncZoneCertificatesResource(self._client)
+
     @cached_property
     def hostnames(self) -> AsyncHostnamesResource:
         return AsyncHostnamesResource(self._client)
 
+    @cached_property
+    def hostname_certificates(self) -> AsyncHostnameCertificatesResource:
+        return AsyncHostnameCertificatesResource(self._client)
+
     @cached_property
     def settings(self) -> AsyncSettingsResource:
         return AsyncSettingsResource(self._client)
 
     @cached_property
     def with_raw_response(self) -> AsyncOriginTLSClientAuthResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncOriginTLSClientAuthResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncOriginTLSClientAuthResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncOriginTLSClientAuthResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use zone_certificates.create for zone-level certificates. This method will be removed in a future major version."
+    )
     async def create(
         self,
         *,
@@ -289,7 +344,7 @@ async def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[OriginTLSClientAuthCreateResponse]:
         """
         Upload your own certificate you want Cloudflare to use for edge-to-origin
@@ -299,7 +354,7 @@ async def create(
         to see the uploaded certificate in use.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           certificate: The zone's leaf certificate.
 
@@ -315,30 +370,30 @@ async def create(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            Optional[OriginTLSClientAuthCreateResponse],
-            await self._post(
-                f"/zones/{zone_id}/origin_tls_client_auth",
-                body=await async_maybe_transform(
-                    {
-                        "certificate": certificate,
-                        "private_key": private_key,
-                    },
-                    origin_tls_client_auth_create_params.OriginTLSClientAuthCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[OriginTLSClientAuthCreateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[OriginTLSClientAuthCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._post(
+            f"/zones/{zone_id}/origin_tls_client_auth",
+            body=await async_maybe_transform(
+                {
+                    "certificate": certificate,
+                    "private_key": private_key,
+                },
+                origin_tls_client_auth_create_params.OriginTLSClientAuthCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OriginTLSClientAuthCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[OriginTLSClientAuthCreateResponse]], ResultWrapper[OriginTLSClientAuthCreateResponse]
             ),
         )
 
+    @typing_extensions.deprecated(
+        "Use zone_certificates.list for zone-level certificates. This method will be removed in a future major version."
+    )
     def list(
         self,
         *,
@@ -348,13 +403,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[ZoneAuthenticatedOriginPull, AsyncSinglePage[ZoneAuthenticatedOriginPull]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[OriginTLSClientAuthListResponse, AsyncSinglePage[OriginTLSClientAuthListResponse]]:
         """
         List Certificates
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -368,13 +423,16 @@ def list(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
             f"/zones/{zone_id}/origin_tls_client_auth",
-            page=AsyncSinglePage[ZoneAuthenticatedOriginPull],
+            page=AsyncSinglePage[OriginTLSClientAuthListResponse],
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            model=ZoneAuthenticatedOriginPull,
+            model=OriginTLSClientAuthListResponse,
         )
 
+    @typing_extensions.deprecated(
+        "Use zone_certificates.delete for zone-level certificates. This method will be removed in a future major version."
+    )
     async def delete(
         self,
         certificate_id: str,
@@ -385,15 +443,15 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[OriginTLSClientAuthDeleteResponse]:
         """
         Delete Certificate
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          certificate_id: Identifier
+          certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -407,23 +465,23 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not certificate_id:
             raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
-        return cast(
-            Optional[OriginTLSClientAuthDeleteResponse],
-            await self._delete(
-                f"/zones/{zone_id}/origin_tls_client_auth/{certificate_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[OriginTLSClientAuthDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[OriginTLSClientAuthDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._delete(
+            f"/zones/{zone_id}/origin_tls_client_auth/{certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OriginTLSClientAuthDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[OriginTLSClientAuthDeleteResponse]], ResultWrapper[OriginTLSClientAuthDeleteResponse]
             ),
         )
 
+    @typing_extensions.deprecated(
+        "Use zone_certificates.get for zone-level certificates. This method will be removed in a future major version."
+    )
     async def get(
         self,
         certificate_id: str,
@@ -434,15 +492,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[OriginTLSClientAuthGetResponse]:
         """
         Get Certificate Details
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          certificate_id: Identifier
+          certificate_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -456,21 +514,16 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not certificate_id:
             raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
-        return cast(
-            Optional[OriginTLSClientAuthGetResponse],
-            await self._get(
-                f"/zones/{zone_id}/origin_tls_client_auth/{certificate_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[OriginTLSClientAuthGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[OriginTLSClientAuthGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._get(
+            f"/zones/{zone_id}/origin_tls_client_auth/{certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[OriginTLSClientAuthGetResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[OriginTLSClientAuthGetResponse]], ResultWrapper[OriginTLSClientAuthGetResponse]),
         )
 
 
@@ -478,23 +531,39 @@ class OriginTLSClientAuthResourceWithRawResponse:
     def __init__(self, origin_tls_client_auth: OriginTLSClientAuthResource) -> None:
         self._origin_tls_client_auth = origin_tls_client_auth
 
-        self.create = to_raw_response_wrapper(
-            origin_tls_client_auth.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                origin_tls_client_auth.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.list = to_raw_response_wrapper(
-            origin_tls_client_auth.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                origin_tls_client_auth.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = to_raw_response_wrapper(
-            origin_tls_client_auth.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                origin_tls_client_auth.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_raw_response_wrapper(
-            origin_tls_client_auth.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                origin_tls_client_auth.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
+    @cached_property
+    def zone_certificates(self) -> ZoneCertificatesResourceWithRawResponse:
+        return ZoneCertificatesResourceWithRawResponse(self._origin_tls_client_auth.zone_certificates)
+
     @cached_property
     def hostnames(self) -> HostnamesResourceWithRawResponse:
         return HostnamesResourceWithRawResponse(self._origin_tls_client_auth.hostnames)
 
+    @cached_property
+    def hostname_certificates(self) -> HostnameCertificatesResourceWithRawResponse:
+        return HostnameCertificatesResourceWithRawResponse(self._origin_tls_client_auth.hostname_certificates)
+
     @cached_property
     def settings(self) -> SettingsResourceWithRawResponse:
         return SettingsResourceWithRawResponse(self._origin_tls_client_auth.settings)
@@ -504,23 +573,39 @@ class AsyncOriginTLSClientAuthResourceWithRawResponse:
     def __init__(self, origin_tls_client_auth: AsyncOriginTLSClientAuthResource) -> None:
         self._origin_tls_client_auth = origin_tls_client_auth
 
-        self.create = async_to_raw_response_wrapper(
-            origin_tls_client_auth.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                origin_tls_client_auth.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.list = async_to_raw_response_wrapper(
-            origin_tls_client_auth.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                origin_tls_client_auth.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = async_to_raw_response_wrapper(
-            origin_tls_client_auth.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                origin_tls_client_auth.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_raw_response_wrapper(
-            origin_tls_client_auth.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                origin_tls_client_auth.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
+    @cached_property
+    def zone_certificates(self) -> AsyncZoneCertificatesResourceWithRawResponse:
+        return AsyncZoneCertificatesResourceWithRawResponse(self._origin_tls_client_auth.zone_certificates)
+
     @cached_property
     def hostnames(self) -> AsyncHostnamesResourceWithRawResponse:
         return AsyncHostnamesResourceWithRawResponse(self._origin_tls_client_auth.hostnames)
 
+    @cached_property
+    def hostname_certificates(self) -> AsyncHostnameCertificatesResourceWithRawResponse:
+        return AsyncHostnameCertificatesResourceWithRawResponse(self._origin_tls_client_auth.hostname_certificates)
+
     @cached_property
     def settings(self) -> AsyncSettingsResourceWithRawResponse:
         return AsyncSettingsResourceWithRawResponse(self._origin_tls_client_auth.settings)
@@ -530,23 +615,39 @@ class OriginTLSClientAuthResourceWithStreamingResponse:
     def __init__(self, origin_tls_client_auth: OriginTLSClientAuthResource) -> None:
         self._origin_tls_client_auth = origin_tls_client_auth
 
-        self.create = to_streamed_response_wrapper(
-            origin_tls_client_auth.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                origin_tls_client_auth.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.list = to_streamed_response_wrapper(
-            origin_tls_client_auth.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                origin_tls_client_auth.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = to_streamed_response_wrapper(
-            origin_tls_client_auth.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                origin_tls_client_auth.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_streamed_response_wrapper(
-            origin_tls_client_auth.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                origin_tls_client_auth.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
+    @cached_property
+    def zone_certificates(self) -> ZoneCertificatesResourceWithStreamingResponse:
+        return ZoneCertificatesResourceWithStreamingResponse(self._origin_tls_client_auth.zone_certificates)
+
     @cached_property
     def hostnames(self) -> HostnamesResourceWithStreamingResponse:
         return HostnamesResourceWithStreamingResponse(self._origin_tls_client_auth.hostnames)
 
+    @cached_property
+    def hostname_certificates(self) -> HostnameCertificatesResourceWithStreamingResponse:
+        return HostnameCertificatesResourceWithStreamingResponse(self._origin_tls_client_auth.hostname_certificates)
+
     @cached_property
     def settings(self) -> SettingsResourceWithStreamingResponse:
         return SettingsResourceWithStreamingResponse(self._origin_tls_client_auth.settings)
@@ -556,23 +657,41 @@ class AsyncOriginTLSClientAuthResourceWithStreamingResponse:
     def __init__(self, origin_tls_client_auth: AsyncOriginTLSClientAuthResource) -> None:
         self._origin_tls_client_auth = origin_tls_client_auth
 
-        self.create = async_to_streamed_response_wrapper(
-            origin_tls_client_auth.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                origin_tls_client_auth.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.list = async_to_streamed_response_wrapper(
-            origin_tls_client_auth.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                origin_tls_client_auth.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = async_to_streamed_response_wrapper(
-            origin_tls_client_auth.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                origin_tls_client_auth.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_streamed_response_wrapper(
-            origin_tls_client_auth.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                origin_tls_client_auth.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
+    @cached_property
+    def zone_certificates(self) -> AsyncZoneCertificatesResourceWithStreamingResponse:
+        return AsyncZoneCertificatesResourceWithStreamingResponse(self._origin_tls_client_auth.zone_certificates)
+
     @cached_property
     def hostnames(self) -> AsyncHostnamesResourceWithStreamingResponse:
         return AsyncHostnamesResourceWithStreamingResponse(self._origin_tls_client_auth.hostnames)
 
+    @cached_property
+    def hostname_certificates(self) -> AsyncHostnameCertificatesResourceWithStreamingResponse:
+        return AsyncHostnameCertificatesResourceWithStreamingResponse(
+            self._origin_tls_client_auth.hostname_certificates
+        )
+
     @cached_property
     def settings(self) -> AsyncSettingsResourceWithStreamingResponse:
         return AsyncSettingsResourceWithStreamingResponse(self._origin_tls_client_auth.settings)
diff --git a/src/cloudflare/resources/origin_tls_client_auth/settings.py b/src/cloudflare/resources/origin_tls_client_auth/settings.py
index 1342bbbf064..9ae74bc3bc1 100644
--- a/src/cloudflare/resources/origin_tls_client_auth/settings.py
+++ b/src/cloudflare/resources/origin_tls_client_auth/settings.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -31,10 +28,21 @@
 class SettingsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SettingsResourceWithStreamingResponse(self)
 
     def update(
@@ -47,7 +55,7 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SettingUpdateResponse]:
         """Enable or disable zone-level authenticated origin pulls.
 
@@ -56,7 +64,7 @@ def update(
         use.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           enabled: Indicates whether zone-level authenticated origin pulls is enabled.
 
@@ -92,7 +100,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SettingGetResponse]:
         """Get whether zone-level authenticated origin pulls is enabled or not.
 
@@ -100,7 +108,7 @@ def get(
         by default.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -128,10 +136,21 @@ def get(
 class AsyncSettingsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSettingsResourceWithStreamingResponse(self)
 
     async def update(
@@ -144,7 +163,7 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SettingUpdateResponse]:
         """Enable or disable zone-level authenticated origin pulls.
 
@@ -153,7 +172,7 @@ async def update(
         use.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           enabled: Indicates whether zone-level authenticated origin pulls is enabled.
 
@@ -189,7 +208,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SettingGetResponse]:
         """Get whether zone-level authenticated origin pulls is enabled or not.
 
@@ -197,7 +216,7 @@ async def get(
         by default.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/origin_tls_client_auth/zone_certificates.py b/src/cloudflare/resources/origin_tls_client_auth/zone_certificates.py
new file mode 100644
index 00000000000..8056208ce43
--- /dev/null
+++ b/src/cloudflare/resources/origin_tls_client_auth/zone_certificates.py
@@ -0,0 +1,502 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.origin_tls_client_auth import zone_certificate_create_params
+from ...types.origin_tls_client_auth.zone_certificate_get_response import ZoneCertificateGetResponse
+from ...types.origin_tls_client_auth.zone_certificate_list_response import ZoneCertificateListResponse
+from ...types.origin_tls_client_auth.zone_certificate_create_response import ZoneCertificateCreateResponse
+from ...types.origin_tls_client_auth.zone_certificate_delete_response import ZoneCertificateDeleteResponse
+
+__all__ = ["ZoneCertificatesResource", "AsyncZoneCertificatesResource"]
+
+
+class ZoneCertificatesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ZoneCertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ZoneCertificatesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ZoneCertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ZoneCertificatesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        zone_id: str,
+        certificate: str,
+        private_key: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ZoneCertificateCreateResponse]:
+        """
+        Upload your own certificate you want Cloudflare to use for edge-to-origin
+        communication to override the shared certificate. Please note that it is
+        important to keep only one certificate active. Also, make sure to enable
+        zone-level authenticated origin pulls by making a PUT call to settings endpoint
+        to see the uploaded certificate in use.
+
+        Args:
+          zone_id: Identifier.
+
+          certificate: The zone's leaf certificate.
+
+          private_key: The zone's private key.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/origin_tls_client_auth",
+            body=maybe_transform(
+                {
+                    "certificate": certificate,
+                    "private_key": private_key,
+                },
+                zone_certificate_create_params.ZoneCertificateCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ZoneCertificateCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ZoneCertificateCreateResponse]], ResultWrapper[ZoneCertificateCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[ZoneCertificateListResponse]:
+        """
+        List Certificates
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/origin_tls_client_auth",
+            page=SyncSinglePage[ZoneCertificateListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=ZoneCertificateListResponse,
+        )
+
+    def delete(
+        self,
+        certificate_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ZoneCertificateDeleteResponse]:
+        """
+        Delete Certificate
+
+        Args:
+          zone_id: Identifier.
+
+          certificate_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not certificate_id:
+            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
+        return self._delete(
+            f"/zones/{zone_id}/origin_tls_client_auth/{certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ZoneCertificateDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ZoneCertificateDeleteResponse]], ResultWrapper[ZoneCertificateDeleteResponse]),
+        )
+
+    def get(
+        self,
+        certificate_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ZoneCertificateGetResponse]:
+        """
+        Get Certificate Details
+
+        Args:
+          zone_id: Identifier.
+
+          certificate_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not certificate_id:
+            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/origin_tls_client_auth/{certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ZoneCertificateGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ZoneCertificateGetResponse]], ResultWrapper[ZoneCertificateGetResponse]),
+        )
+
+
+class AsyncZoneCertificatesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncZoneCertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncZoneCertificatesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncZoneCertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncZoneCertificatesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        certificate: str,
+        private_key: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ZoneCertificateCreateResponse]:
+        """
+        Upload your own certificate you want Cloudflare to use for edge-to-origin
+        communication to override the shared certificate. Please note that it is
+        important to keep only one certificate active. Also, make sure to enable
+        zone-level authenticated origin pulls by making a PUT call to settings endpoint
+        to see the uploaded certificate in use.
+
+        Args:
+          zone_id: Identifier.
+
+          certificate: The zone's leaf certificate.
+
+          private_key: The zone's private key.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/origin_tls_client_auth",
+            body=await async_maybe_transform(
+                {
+                    "certificate": certificate,
+                    "private_key": private_key,
+                },
+                zone_certificate_create_params.ZoneCertificateCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ZoneCertificateCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ZoneCertificateCreateResponse]], ResultWrapper[ZoneCertificateCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ZoneCertificateListResponse, AsyncSinglePage[ZoneCertificateListResponse]]:
+        """
+        List Certificates
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/origin_tls_client_auth",
+            page=AsyncSinglePage[ZoneCertificateListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=ZoneCertificateListResponse,
+        )
+
+    async def delete(
+        self,
+        certificate_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ZoneCertificateDeleteResponse]:
+        """
+        Delete Certificate
+
+        Args:
+          zone_id: Identifier.
+
+          certificate_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not certificate_id:
+            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
+        return await self._delete(
+            f"/zones/{zone_id}/origin_tls_client_auth/{certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ZoneCertificateDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ZoneCertificateDeleteResponse]], ResultWrapper[ZoneCertificateDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        certificate_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ZoneCertificateGetResponse]:
+        """
+        Get Certificate Details
+
+        Args:
+          zone_id: Identifier.
+
+          certificate_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not certificate_id:
+            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/origin_tls_client_auth/{certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ZoneCertificateGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ZoneCertificateGetResponse]], ResultWrapper[ZoneCertificateGetResponse]),
+        )
+
+
+class ZoneCertificatesResourceWithRawResponse:
+    def __init__(self, zone_certificates: ZoneCertificatesResource) -> None:
+        self._zone_certificates = zone_certificates
+
+        self.create = to_raw_response_wrapper(
+            zone_certificates.create,
+        )
+        self.list = to_raw_response_wrapper(
+            zone_certificates.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            zone_certificates.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            zone_certificates.get,
+        )
+
+
+class AsyncZoneCertificatesResourceWithRawResponse:
+    def __init__(self, zone_certificates: AsyncZoneCertificatesResource) -> None:
+        self._zone_certificates = zone_certificates
+
+        self.create = async_to_raw_response_wrapper(
+            zone_certificates.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            zone_certificates.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            zone_certificates.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            zone_certificates.get,
+        )
+
+
+class ZoneCertificatesResourceWithStreamingResponse:
+    def __init__(self, zone_certificates: ZoneCertificatesResource) -> None:
+        self._zone_certificates = zone_certificates
+
+        self.create = to_streamed_response_wrapper(
+            zone_certificates.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            zone_certificates.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            zone_certificates.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            zone_certificates.get,
+        )
+
+
+class AsyncZoneCertificatesResourceWithStreamingResponse:
+    def __init__(self, zone_certificates: AsyncZoneCertificatesResource) -> None:
+        self._zone_certificates = zone_certificates
+
+        self.create = async_to_streamed_response_wrapper(
+            zone_certificates.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            zone_certificates.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            zone_certificates.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            zone_certificates.get,
+        )
diff --git a/src/cloudflare/resources/page_rules.py b/src/cloudflare/resources/page_rules.py
new file mode 100644
index 00000000000..d687a14e8c0
--- /dev/null
+++ b/src/cloudflare/resources/page_rules.py
@@ -0,0 +1,883 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from .._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from .._utils import maybe_transform, async_maybe_transform
+from .._compat import cached_property
+from .._resource import SyncAPIResource, AsyncAPIResource
+from .._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from .._wrappers import ResultWrapper
+from .._base_client import make_request_options
+from ..types.page_rules import (
+    page_rule_edit_params,
+    page_rule_list_params,
+    page_rule_create_params,
+    page_rule_update_params,
+)
+from ..types.page_rules.page_rule import PageRule
+from ..types.page_rules.target_param import TargetParam
+from ..types.page_rules.page_rule_list_response import PageRuleListResponse
+from ..types.page_rules.page_rule_delete_response import PageRuleDeleteResponse
+
+__all__ = ["PageRulesResource", "AsyncPageRulesResource"]
+
+
+class PageRulesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> PageRulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return PageRulesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> PageRulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return PageRulesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        zone_id: str,
+        actions: Iterable[page_rule_create_params.Action],
+        targets: Iterable[TargetParam],
+        priority: int | Omit = omit,
+        status: Literal["active", "disabled"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PageRule]:
+        """
+        Creates a new Page Rule.
+
+        Args:
+          zone_id: Identifier.
+
+          actions: The set of actions to perform if the targets of this rule match the request.
+              Actions can redirect to another URL or override settings, but not both.
+
+          targets: The rule targets to evaluate on each request.
+
+          priority: The priority of the rule, used to define which Page Rule is processed over
+              another. A higher number indicates a higher priority. For example, if you have a
+              catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
+              take precedence (rule B: `/images/special/*`), specify a higher priority for
+              rule B so it overrides rule A.
+
+          status: The status of the Page Rule.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/pagerules",
+            body=maybe_transform(
+                {
+                    "actions": actions,
+                    "targets": targets,
+                    "priority": priority,
+                    "status": status,
+                },
+                page_rule_create_params.PageRuleCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PageRule]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PageRule]], ResultWrapper[PageRule]),
+        )
+
+    def update(
+        self,
+        pagerule_id: str,
+        *,
+        zone_id: str,
+        actions: Iterable[page_rule_update_params.Action],
+        targets: Iterable[TargetParam],
+        priority: int | Omit = omit,
+        status: Literal["active", "disabled"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PageRule]:
+        """Replaces the configuration of an existing Page Rule.
+
+        The configuration of the
+        updated Page Rule will exactly match the data passed in the API request.
+
+        Args:
+          zone_id: Identifier.
+
+          pagerule_id: Identifier.
+
+          actions: The set of actions to perform if the targets of this rule match the request.
+              Actions can redirect to another URL or override settings, but not both.
+
+          targets: The rule targets to evaluate on each request.
+
+          priority: The priority of the rule, used to define which Page Rule is processed over
+              another. A higher number indicates a higher priority. For example, if you have a
+              catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
+              take precedence (rule B: `/images/special/*`), specify a higher priority for
+              rule B so it overrides rule A.
+
+          status: The status of the Page Rule.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not pagerule_id:
+            raise ValueError(f"Expected a non-empty value for `pagerule_id` but received {pagerule_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/pagerules/{pagerule_id}",
+            body=maybe_transform(
+                {
+                    "actions": actions,
+                    "targets": targets,
+                    "priority": priority,
+                    "status": status,
+                },
+                page_rule_update_params.PageRuleUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PageRule]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PageRule]], ResultWrapper[PageRule]),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        match: Literal["any", "all"] | Omit = omit,
+        order: Literal["status", "priority"] | Omit = omit,
+        status: Literal["active", "disabled"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PageRuleListResponse]:
+        """
+        Fetches Page Rules in a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          direction: The direction used to sort returned Page Rules.
+
+          match: When set to `all`, all the search requirements must match. When set to `any`,
+              only one of the search requirements has to match.
+
+          order: The field used to sort returned Page Rules.
+
+          status: The status of the Page Rule.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/pagerules",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "match": match,
+                        "order": order,
+                        "status": status,
+                    },
+                    page_rule_list_params.PageRuleListParams,
+                ),
+                post_parser=ResultWrapper[Optional[PageRuleListResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PageRuleListResponse]], ResultWrapper[PageRuleListResponse]),
+        )
+
+    def delete(
+        self,
+        pagerule_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PageRuleDeleteResponse]:
+        """
+        Deletes an existing Page Rule.
+
+        Args:
+          zone_id: Identifier.
+
+          pagerule_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not pagerule_id:
+            raise ValueError(f"Expected a non-empty value for `pagerule_id` but received {pagerule_id!r}")
+        return self._delete(
+            f"/zones/{zone_id}/pagerules/{pagerule_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PageRuleDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PageRuleDeleteResponse]], ResultWrapper[PageRuleDeleteResponse]),
+        )
+
+    def edit(
+        self,
+        pagerule_id: str,
+        *,
+        zone_id: str,
+        actions: Iterable[page_rule_edit_params.Action] | Omit = omit,
+        priority: int | Omit = omit,
+        status: Literal["active", "disabled"] | Omit = omit,
+        targets: Iterable[TargetParam] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PageRule]:
+        """
+        Updates one or more fields of an existing Page Rule.
+
+        Args:
+          zone_id: Identifier.
+
+          pagerule_id: Identifier.
+
+          actions: The set of actions to perform if the targets of this rule match the request.
+              Actions can redirect to another URL or override settings, but not both.
+
+          priority: The priority of the rule, used to define which Page Rule is processed over
+              another. A higher number indicates a higher priority. For example, if you have a
+              catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
+              take precedence (rule B: `/images/special/*`), specify a higher priority for
+              rule B so it overrides rule A.
+
+          status: The status of the Page Rule.
+
+          targets: The rule targets to evaluate on each request.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not pagerule_id:
+            raise ValueError(f"Expected a non-empty value for `pagerule_id` but received {pagerule_id!r}")
+        return self._patch(
+            f"/zones/{zone_id}/pagerules/{pagerule_id}",
+            body=maybe_transform(
+                {
+                    "actions": actions,
+                    "priority": priority,
+                    "status": status,
+                    "targets": targets,
+                },
+                page_rule_edit_params.PageRuleEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PageRule]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PageRule]], ResultWrapper[PageRule]),
+        )
+
+    def get(
+        self,
+        pagerule_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PageRule]:
+        """
+        Fetches the details of a Page Rule.
+
+        Args:
+          zone_id: Identifier.
+
+          pagerule_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not pagerule_id:
+            raise ValueError(f"Expected a non-empty value for `pagerule_id` but received {pagerule_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/pagerules/{pagerule_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PageRule]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PageRule]], ResultWrapper[PageRule]),
+        )
+
+
+class AsyncPageRulesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncPageRulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncPageRulesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncPageRulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncPageRulesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        actions: Iterable[page_rule_create_params.Action],
+        targets: Iterable[TargetParam],
+        priority: int | Omit = omit,
+        status: Literal["active", "disabled"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PageRule]:
+        """
+        Creates a new Page Rule.
+
+        Args:
+          zone_id: Identifier.
+
+          actions: The set of actions to perform if the targets of this rule match the request.
+              Actions can redirect to another URL or override settings, but not both.
+
+          targets: The rule targets to evaluate on each request.
+
+          priority: The priority of the rule, used to define which Page Rule is processed over
+              another. A higher number indicates a higher priority. For example, if you have a
+              catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
+              take precedence (rule B: `/images/special/*`), specify a higher priority for
+              rule B so it overrides rule A.
+
+          status: The status of the Page Rule.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/pagerules",
+            body=await async_maybe_transform(
+                {
+                    "actions": actions,
+                    "targets": targets,
+                    "priority": priority,
+                    "status": status,
+                },
+                page_rule_create_params.PageRuleCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PageRule]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PageRule]], ResultWrapper[PageRule]),
+        )
+
+    async def update(
+        self,
+        pagerule_id: str,
+        *,
+        zone_id: str,
+        actions: Iterable[page_rule_update_params.Action],
+        targets: Iterable[TargetParam],
+        priority: int | Omit = omit,
+        status: Literal["active", "disabled"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PageRule]:
+        """Replaces the configuration of an existing Page Rule.
+
+        The configuration of the
+        updated Page Rule will exactly match the data passed in the API request.
+
+        Args:
+          zone_id: Identifier.
+
+          pagerule_id: Identifier.
+
+          actions: The set of actions to perform if the targets of this rule match the request.
+              Actions can redirect to another URL or override settings, but not both.
+
+          targets: The rule targets to evaluate on each request.
+
+          priority: The priority of the rule, used to define which Page Rule is processed over
+              another. A higher number indicates a higher priority. For example, if you have a
+              catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
+              take precedence (rule B: `/images/special/*`), specify a higher priority for
+              rule B so it overrides rule A.
+
+          status: The status of the Page Rule.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not pagerule_id:
+            raise ValueError(f"Expected a non-empty value for `pagerule_id` but received {pagerule_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/pagerules/{pagerule_id}",
+            body=await async_maybe_transform(
+                {
+                    "actions": actions,
+                    "targets": targets,
+                    "priority": priority,
+                    "status": status,
+                },
+                page_rule_update_params.PageRuleUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PageRule]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PageRule]], ResultWrapper[PageRule]),
+        )
+
+    async def list(
+        self,
+        *,
+        zone_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        match: Literal["any", "all"] | Omit = omit,
+        order: Literal["status", "priority"] | Omit = omit,
+        status: Literal["active", "disabled"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PageRuleListResponse]:
+        """
+        Fetches Page Rules in a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          direction: The direction used to sort returned Page Rules.
+
+          match: When set to `all`, all the search requirements must match. When set to `any`,
+              only one of the search requirements has to match.
+
+          order: The field used to sort returned Page Rules.
+
+          status: The status of the Page Rule.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/pagerules",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "direction": direction,
+                        "match": match,
+                        "order": order,
+                        "status": status,
+                    },
+                    page_rule_list_params.PageRuleListParams,
+                ),
+                post_parser=ResultWrapper[Optional[PageRuleListResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PageRuleListResponse]], ResultWrapper[PageRuleListResponse]),
+        )
+
+    async def delete(
+        self,
+        pagerule_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PageRuleDeleteResponse]:
+        """
+        Deletes an existing Page Rule.
+
+        Args:
+          zone_id: Identifier.
+
+          pagerule_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not pagerule_id:
+            raise ValueError(f"Expected a non-empty value for `pagerule_id` but received {pagerule_id!r}")
+        return await self._delete(
+            f"/zones/{zone_id}/pagerules/{pagerule_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PageRuleDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PageRuleDeleteResponse]], ResultWrapper[PageRuleDeleteResponse]),
+        )
+
+    async def edit(
+        self,
+        pagerule_id: str,
+        *,
+        zone_id: str,
+        actions: Iterable[page_rule_edit_params.Action] | Omit = omit,
+        priority: int | Omit = omit,
+        status: Literal["active", "disabled"] | Omit = omit,
+        targets: Iterable[TargetParam] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PageRule]:
+        """
+        Updates one or more fields of an existing Page Rule.
+
+        Args:
+          zone_id: Identifier.
+
+          pagerule_id: Identifier.
+
+          actions: The set of actions to perform if the targets of this rule match the request.
+              Actions can redirect to another URL or override settings, but not both.
+
+          priority: The priority of the rule, used to define which Page Rule is processed over
+              another. A higher number indicates a higher priority. For example, if you have a
+              catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
+              take precedence (rule B: `/images/special/*`), specify a higher priority for
+              rule B so it overrides rule A.
+
+          status: The status of the Page Rule.
+
+          targets: The rule targets to evaluate on each request.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not pagerule_id:
+            raise ValueError(f"Expected a non-empty value for `pagerule_id` but received {pagerule_id!r}")
+        return await self._patch(
+            f"/zones/{zone_id}/pagerules/{pagerule_id}",
+            body=await async_maybe_transform(
+                {
+                    "actions": actions,
+                    "priority": priority,
+                    "status": status,
+                    "targets": targets,
+                },
+                page_rule_edit_params.PageRuleEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PageRule]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PageRule]], ResultWrapper[PageRule]),
+        )
+
+    async def get(
+        self,
+        pagerule_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PageRule]:
+        """
+        Fetches the details of a Page Rule.
+
+        Args:
+          zone_id: Identifier.
+
+          pagerule_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not pagerule_id:
+            raise ValueError(f"Expected a non-empty value for `pagerule_id` but received {pagerule_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/pagerules/{pagerule_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PageRule]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PageRule]], ResultWrapper[PageRule]),
+        )
+
+
+class PageRulesResourceWithRawResponse:
+    def __init__(self, page_rules: PageRulesResource) -> None:
+        self._page_rules = page_rules
+
+        self.create = to_raw_response_wrapper(
+            page_rules.create,
+        )
+        self.update = to_raw_response_wrapper(
+            page_rules.update,
+        )
+        self.list = to_raw_response_wrapper(
+            page_rules.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            page_rules.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            page_rules.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            page_rules.get,
+        )
+
+
+class AsyncPageRulesResourceWithRawResponse:
+    def __init__(self, page_rules: AsyncPageRulesResource) -> None:
+        self._page_rules = page_rules
+
+        self.create = async_to_raw_response_wrapper(
+            page_rules.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            page_rules.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            page_rules.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            page_rules.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            page_rules.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            page_rules.get,
+        )
+
+
+class PageRulesResourceWithStreamingResponse:
+    def __init__(self, page_rules: PageRulesResource) -> None:
+        self._page_rules = page_rules
+
+        self.create = to_streamed_response_wrapper(
+            page_rules.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            page_rules.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            page_rules.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            page_rules.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            page_rules.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            page_rules.get,
+        )
+
+
+class AsyncPageRulesResourceWithStreamingResponse:
+    def __init__(self, page_rules: AsyncPageRulesResource) -> None:
+        self._page_rules = page_rules
+
+        self.create = async_to_streamed_response_wrapper(
+            page_rules.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            page_rules.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            page_rules.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            page_rules.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            page_rules.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            page_rules.get,
+        )
diff --git a/src/cloudflare/resources/page_shield/connections.py b/src/cloudflare/resources/page_shield/connections.py
index ac42a24e1f6..d04b4fdf6fe 100644
--- a/src/cloudflare/resources/page_shield/connections.py
+++ b/src/cloudflare/resources/page_shield/connections.py
@@ -7,7 +7,7 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
@@ -29,34 +29,45 @@
 class ConnectionsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ConnectionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ConnectionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ConnectionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ConnectionsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         zone_id: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        exclude_cdn_cgi: bool | NotGiven = NOT_GIVEN,
-        exclude_urls: str | NotGiven = NOT_GIVEN,
-        export: Literal["csv"] | NotGiven = NOT_GIVEN,
-        hosts: str | NotGiven = NOT_GIVEN,
-        order_by: Literal["first_seen_at", "last_seen_at"] | NotGiven = NOT_GIVEN,
-        page: str | NotGiven = NOT_GIVEN,
-        page_url: str | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        prioritize_malicious: bool | NotGiven = NOT_GIVEN,
-        status: str | NotGiven = NOT_GIVEN,
-        urls: str | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        exclude_cdn_cgi: bool | Omit = omit,
+        exclude_urls: str | Omit = omit,
+        export: Literal["csv"] | Omit = omit,
+        hosts: str | Omit = omit,
+        order_by: Literal["first_seen_at", "last_seen_at"] | Omit = omit,
+        page: str | Omit = omit,
+        page_url: str | Omit = omit,
+        per_page: float | Omit = omit,
+        prioritize_malicious: bool | Omit = omit,
+        status: str | Omit = omit,
+        urls: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Connection]:
         """
         Lists all connections detected by Page Shield.
@@ -72,8 +83,7 @@ def list(
           exclude_urls: Excludes connections whose URL contains one of the URL-encoded URLs separated by
               commas.
 
-          export: Export the list of connections as a file. Cannot be used with per_page or page
-              options.
+          export: Export the list of connections as a file, limited to 50000 entries.
 
           hosts: Includes connections that match one or more URL-encoded hostnames separated by
               commas.
@@ -87,10 +97,9 @@ def list(
           page: The current page number of the paginated results.
 
               We additionally support a special value "all". When "all" is used, the API will
-              return all the connections with the applied filters in a single page.
-              Additionally, when using this value, the API will not return the categorisation
-              data for the URL and domain of the connections. This feature is best-effort and
-              it may only work for zones with a low number of connections
+              return all the connections with the applied filters in a single page. This
+              feature is best-effort and it may only work for zones with a low number of
+              connections
 
           page_url: Includes connections that match one or more page URLs (separated by commas)
               where they were last seen
@@ -159,7 +168,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Connection]:
         """
         Fetches a connection detected by Page Shield by connection ID.
@@ -197,34 +206,45 @@ def get(
 class AsyncConnectionsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncConnectionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncConnectionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncConnectionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncConnectionsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         zone_id: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        exclude_cdn_cgi: bool | NotGiven = NOT_GIVEN,
-        exclude_urls: str | NotGiven = NOT_GIVEN,
-        export: Literal["csv"] | NotGiven = NOT_GIVEN,
-        hosts: str | NotGiven = NOT_GIVEN,
-        order_by: Literal["first_seen_at", "last_seen_at"] | NotGiven = NOT_GIVEN,
-        page: str | NotGiven = NOT_GIVEN,
-        page_url: str | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        prioritize_malicious: bool | NotGiven = NOT_GIVEN,
-        status: str | NotGiven = NOT_GIVEN,
-        urls: str | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        exclude_cdn_cgi: bool | Omit = omit,
+        exclude_urls: str | Omit = omit,
+        export: Literal["csv"] | Omit = omit,
+        hosts: str | Omit = omit,
+        order_by: Literal["first_seen_at", "last_seen_at"] | Omit = omit,
+        page: str | Omit = omit,
+        page_url: str | Omit = omit,
+        per_page: float | Omit = omit,
+        prioritize_malicious: bool | Omit = omit,
+        status: str | Omit = omit,
+        urls: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Connection, AsyncSinglePage[Connection]]:
         """
         Lists all connections detected by Page Shield.
@@ -240,8 +260,7 @@ def list(
           exclude_urls: Excludes connections whose URL contains one of the URL-encoded URLs separated by
               commas.
 
-          export: Export the list of connections as a file. Cannot be used with per_page or page
-              options.
+          export: Export the list of connections as a file, limited to 50000 entries.
 
           hosts: Includes connections that match one or more URL-encoded hostnames separated by
               commas.
@@ -255,10 +274,9 @@ def list(
           page: The current page number of the paginated results.
 
               We additionally support a special value "all". When "all" is used, the API will
-              return all the connections with the applied filters in a single page.
-              Additionally, when using this value, the API will not return the categorisation
-              data for the URL and domain of the connections. This feature is best-effort and
-              it may only work for zones with a low number of connections
+              return all the connections with the applied filters in a single page. This
+              feature is best-effort and it may only work for zones with a low number of
+              connections
 
           page_url: Includes connections that match one or more page URLs (separated by commas)
               where they were last seen
@@ -327,7 +345,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Connection]:
         """
         Fetches a connection detected by Page Shield by connection ID.
diff --git a/src/cloudflare/resources/page_shield/cookies.py b/src/cloudflare/resources/page_shield/cookies.py
index cdbc8dc6abb..cc5192361bc 100644
--- a/src/cloudflare/resources/page_shield/cookies.py
+++ b/src/cloudflare/resources/page_shield/cookies.py
@@ -7,7 +7,7 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
@@ -30,36 +30,47 @@
 class CookiesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> CookiesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CookiesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CookiesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CookiesResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         zone_id: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        domain: str | NotGiven = NOT_GIVEN,
-        export: Literal["csv"] | NotGiven = NOT_GIVEN,
-        hosts: str | NotGiven = NOT_GIVEN,
-        http_only: bool | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        order_by: Literal["first_seen_at", "last_seen_at"] | NotGiven = NOT_GIVEN,
-        page: str | NotGiven = NOT_GIVEN,
-        page_url: str | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        same_site: Literal["lax", "strict", "none"] | NotGiven = NOT_GIVEN,
-        secure: bool | NotGiven = NOT_GIVEN,
-        type: Literal["first_party", "unknown"] | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        domain: str | Omit = omit,
+        export: Literal["csv"] | Omit = omit,
+        hosts: str | Omit = omit,
+        http_only: bool | Omit = omit,
+        name: str | Omit = omit,
+        order_by: Literal["first_seen_at", "last_seen_at"] | Omit = omit,
+        page: str | Omit = omit,
+        page_url: str | Omit = omit,
+        path: str | Omit = omit,
+        per_page: float | Omit = omit,
+        same_site: Literal["lax", "strict", "none"] | Omit = omit,
+        secure: bool | Omit = omit,
+        type: Literal["first_party", "unknown"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[CookieListResponse]:
         """
         Lists all cookies collected by Page Shield.
@@ -71,8 +82,7 @@ def list(
 
           domain: Filters the returned cookies that match the specified domain attribute
 
-          export: Export the list of cookies as a file. Cannot be used with per_page or page
-              options.
+          export: Export the list of cookies as a file, limited to 50000 entries.
 
           hosts: Includes cookies that match one or more URL-encoded hostnames separated by
               commas.
@@ -91,6 +101,10 @@ def list(
 
           page: The current page number of the paginated results.
 
+              We additionally support a special value "all". When "all" is used, the API will
+              return all the cookies with the applied filters in a single page. This feature
+              is best-effort and it may only work for zones with a low number of cookies
+
           page_url: Includes connections that match one or more page URLs (separated by commas)
               where they were last seen
 
@@ -159,7 +173,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CookieGetResponse]:
         """
         Fetches a cookie collected by Page Shield by cookie ID.
@@ -197,36 +211,47 @@ def get(
 class AsyncCookiesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncCookiesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCookiesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCookiesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCookiesResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         zone_id: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        domain: str | NotGiven = NOT_GIVEN,
-        export: Literal["csv"] | NotGiven = NOT_GIVEN,
-        hosts: str | NotGiven = NOT_GIVEN,
-        http_only: bool | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        order_by: Literal["first_seen_at", "last_seen_at"] | NotGiven = NOT_GIVEN,
-        page: str | NotGiven = NOT_GIVEN,
-        page_url: str | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        same_site: Literal["lax", "strict", "none"] | NotGiven = NOT_GIVEN,
-        secure: bool | NotGiven = NOT_GIVEN,
-        type: Literal["first_party", "unknown"] | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        domain: str | Omit = omit,
+        export: Literal["csv"] | Omit = omit,
+        hosts: str | Omit = omit,
+        http_only: bool | Omit = omit,
+        name: str | Omit = omit,
+        order_by: Literal["first_seen_at", "last_seen_at"] | Omit = omit,
+        page: str | Omit = omit,
+        page_url: str | Omit = omit,
+        path: str | Omit = omit,
+        per_page: float | Omit = omit,
+        same_site: Literal["lax", "strict", "none"] | Omit = omit,
+        secure: bool | Omit = omit,
+        type: Literal["first_party", "unknown"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[CookieListResponse, AsyncSinglePage[CookieListResponse]]:
         """
         Lists all cookies collected by Page Shield.
@@ -238,8 +263,7 @@ def list(
 
           domain: Filters the returned cookies that match the specified domain attribute
 
-          export: Export the list of cookies as a file. Cannot be used with per_page or page
-              options.
+          export: Export the list of cookies as a file, limited to 50000 entries.
 
           hosts: Includes cookies that match one or more URL-encoded hostnames separated by
               commas.
@@ -258,6 +282,10 @@ def list(
 
           page: The current page number of the paginated results.
 
+              We additionally support a special value "all". When "all" is used, the API will
+              return all the cookies with the applied filters in a single page. This feature
+              is best-effort and it may only work for zones with a low number of cookies
+
           page_url: Includes connections that match one or more page URLs (separated by commas)
               where they were last seen
 
@@ -326,7 +354,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CookieGetResponse]:
         """
         Fetches a cookie collected by Page Shield by cookie ID.
diff --git a/src/cloudflare/resources/page_shield/page_shield.py b/src/cloudflare/resources/page_shield/page_shield.py
index 11f6a949378..671b12446f8 100644
--- a/src/cloudflare/resources/page_shield/page_shield.py
+++ b/src/cloudflare/resources/page_shield/page_shield.py
@@ -22,11 +22,8 @@
     ScriptsResourceWithStreamingResponse,
     AsyncScriptsResourceWithStreamingResponse,
 )
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from .policies import (
     PoliciesResource,
     AsyncPoliciesResource,
@@ -79,25 +76,36 @@ def cookies(self) -> CookiesResource:
 
     @cached_property
     def with_raw_response(self) -> PageShieldResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PageShieldResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PageShieldResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PageShieldResourceWithStreamingResponse(self)
 
     def update(
         self,
         *,
         zone_id: str,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        use_cloudflare_reporting_endpoint: bool | NotGiven = NOT_GIVEN,
-        use_connection_url_path: bool | NotGiven = NOT_GIVEN,
+        enabled: bool | Omit = omit,
+        use_cloudflare_reporting_endpoint: bool | Omit = omit,
+        use_connection_url_path: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PageShieldUpdateResponse]:
         """
         Updates Page Shield settings.
@@ -151,7 +159,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Setting]:
         """
         Fetches the Page Shield settings.
@@ -201,25 +209,36 @@ def cookies(self) -> AsyncCookiesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncPageShieldResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPageShieldResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPageShieldResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPageShieldResourceWithStreamingResponse(self)
 
     async def update(
         self,
         *,
         zone_id: str,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        use_cloudflare_reporting_endpoint: bool | NotGiven = NOT_GIVEN,
-        use_connection_url_path: bool | NotGiven = NOT_GIVEN,
+        enabled: bool | Omit = omit,
+        use_cloudflare_reporting_endpoint: bool | Omit = omit,
+        use_connection_url_path: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PageShieldUpdateResponse]:
         """
         Updates Page Shield settings.
@@ -273,7 +292,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Setting]:
         """
         Fetches the Page Shield settings.
diff --git a/src/cloudflare/resources/page_shield/policies.py b/src/cloudflare/resources/page_shield/policies.py
index 645079e3e9b..debfeeb0a6b 100644
--- a/src/cloudflare/resources/page_shield/policies.py
+++ b/src/cloudflare/resources/page_shield/policies.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -35,10 +32,21 @@
 class PoliciesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PoliciesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PoliciesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PoliciesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PoliciesResourceWithStreamingResponse(self)
 
     def create(
@@ -55,7 +63,7 @@ def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyCreateResponse]:
         """
         Create a Page Shield policy.
@@ -111,17 +119,17 @@ def update(
         policy_id: str,
         *,
         zone_id: str,
-        action: Literal["allow", "log"] | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        value: str | NotGiven = NOT_GIVEN,
+        action: Literal["allow", "log"] | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        expression: str | Omit = omit,
+        value: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyUpdateResponse]:
         """
         Update a Page Shield policy by ID.
@@ -185,7 +193,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[PolicyListResponse]:
         """
         Lists all Page Shield policies.
@@ -222,7 +230,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> None:
         """
         Delete a Page Shield policy by ID.
@@ -263,7 +271,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyGetResponse]:
         """
         Fetches a Page Shield policy by ID.
@@ -301,10 +309,21 @@ def get(
 class AsyncPoliciesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPoliciesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPoliciesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPoliciesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPoliciesResourceWithStreamingResponse(self)
 
     async def create(
@@ -321,7 +340,7 @@ async def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyCreateResponse]:
         """
         Create a Page Shield policy.
@@ -377,17 +396,17 @@ async def update(
         policy_id: str,
         *,
         zone_id: str,
-        action: Literal["allow", "log"] | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        value: str | NotGiven = NOT_GIVEN,
+        action: Literal["allow", "log"] | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        expression: str | Omit = omit,
+        value: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyUpdateResponse]:
         """
         Update a Page Shield policy by ID.
@@ -451,7 +470,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[PolicyListResponse, AsyncSinglePage[PolicyListResponse]]:
         """
         Lists all Page Shield policies.
@@ -488,7 +507,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> None:
         """
         Delete a Page Shield policy by ID.
@@ -529,7 +548,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyGetResponse]:
         """
         Fetches a Page Shield policy by ID.
diff --git a/src/cloudflare/resources/page_shield/scripts.py b/src/cloudflare/resources/page_shield/scripts.py
index 541aefbee44..08198419498 100644
--- a/src/cloudflare/resources/page_shield/scripts.py
+++ b/src/cloudflare/resources/page_shield/scripts.py
@@ -7,7 +7,7 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
@@ -30,35 +30,46 @@
 class ScriptsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ScriptsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ScriptsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ScriptsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ScriptsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         zone_id: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        exclude_cdn_cgi: bool | NotGiven = NOT_GIVEN,
-        exclude_duplicates: bool | NotGiven = NOT_GIVEN,
-        exclude_urls: str | NotGiven = NOT_GIVEN,
-        export: Literal["csv"] | NotGiven = NOT_GIVEN,
-        hosts: str | NotGiven = NOT_GIVEN,
-        order_by: Literal["first_seen_at", "last_seen_at"] | NotGiven = NOT_GIVEN,
-        page: str | NotGiven = NOT_GIVEN,
-        page_url: str | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        prioritize_malicious: bool | NotGiven = NOT_GIVEN,
-        status: str | NotGiven = NOT_GIVEN,
-        urls: str | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        exclude_cdn_cgi: bool | Omit = omit,
+        exclude_duplicates: bool | Omit = omit,
+        exclude_urls: str | Omit = omit,
+        export: Literal["csv"] | Omit = omit,
+        hosts: str | Omit = omit,
+        order_by: Literal["first_seen_at", "last_seen_at"] | Omit = omit,
+        page: str | Omit = omit,
+        page_url: str | Omit = omit,
+        per_page: float | Omit = omit,
+        prioritize_malicious: bool | Omit = omit,
+        status: str | Omit = omit,
+        urls: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Script]:
         """
         Lists all scripts detected by Page Shield.
@@ -79,8 +90,7 @@ def list(
           exclude_urls: Excludes scripts whose URL contains one of the URL-encoded URLs separated by
               commas.
 
-          export: Export the list of scripts as a file. Cannot be used with per_page or page
-              options.
+          export: Export the list of scripts as a file, limited to 50000 entries.
 
           hosts: Includes scripts that match one or more URL-encoded hostnames separated by
               commas.
@@ -94,10 +104,8 @@ def list(
           page: The current page number of the paginated results.
 
               We additionally support a special value "all". When "all" is used, the API will
-              return all the scripts with the applied filters in a single page. Additionally,
-              when using this value, the API will not return the script versions or
-              categorisation data for the URL and domain of the scripts. This feature is
-              best-effort and it may only work for zones with a low number of scripts
+              return all the scripts with the applied filters in a single page. This feature
+              is best-effort and it may only work for zones with a low number of scripts
 
           page_url: Includes scripts that match one or more page URLs (separated by commas) where
               they were last seen
@@ -167,7 +175,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ScriptGetResponse]:
         """
         Fetches a script detected by Page Shield by script ID.
@@ -205,35 +213,46 @@ def get(
 class AsyncScriptsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncScriptsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncScriptsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncScriptsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncScriptsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         zone_id: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        exclude_cdn_cgi: bool | NotGiven = NOT_GIVEN,
-        exclude_duplicates: bool | NotGiven = NOT_GIVEN,
-        exclude_urls: str | NotGiven = NOT_GIVEN,
-        export: Literal["csv"] | NotGiven = NOT_GIVEN,
-        hosts: str | NotGiven = NOT_GIVEN,
-        order_by: Literal["first_seen_at", "last_seen_at"] | NotGiven = NOT_GIVEN,
-        page: str | NotGiven = NOT_GIVEN,
-        page_url: str | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        prioritize_malicious: bool | NotGiven = NOT_GIVEN,
-        status: str | NotGiven = NOT_GIVEN,
-        urls: str | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        exclude_cdn_cgi: bool | Omit = omit,
+        exclude_duplicates: bool | Omit = omit,
+        exclude_urls: str | Omit = omit,
+        export: Literal["csv"] | Omit = omit,
+        hosts: str | Omit = omit,
+        order_by: Literal["first_seen_at", "last_seen_at"] | Omit = omit,
+        page: str | Omit = omit,
+        page_url: str | Omit = omit,
+        per_page: float | Omit = omit,
+        prioritize_malicious: bool | Omit = omit,
+        status: str | Omit = omit,
+        urls: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Script, AsyncSinglePage[Script]]:
         """
         Lists all scripts detected by Page Shield.
@@ -254,8 +273,7 @@ def list(
           exclude_urls: Excludes scripts whose URL contains one of the URL-encoded URLs separated by
               commas.
 
-          export: Export the list of scripts as a file. Cannot be used with per_page or page
-              options.
+          export: Export the list of scripts as a file, limited to 50000 entries.
 
           hosts: Includes scripts that match one or more URL-encoded hostnames separated by
               commas.
@@ -269,10 +287,8 @@ def list(
           page: The current page number of the paginated results.
 
               We additionally support a special value "all". When "all" is used, the API will
-              return all the scripts with the applied filters in a single page. Additionally,
-              when using this value, the API will not return the script versions or
-              categorisation data for the URL and domain of the scripts. This feature is
-              best-effort and it may only work for zones with a low number of scripts
+              return all the scripts with the applied filters in a single page. This feature
+              is best-effort and it may only work for zones with a low number of scripts
 
           page_url: Includes scripts that match one or more page URLs (separated by commas) where
               they were last seen
@@ -342,7 +358,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ScriptGetResponse]:
         """
         Fetches a script detected by Page Shield by script ID.
diff --git a/src/cloudflare/resources/pagerules/__init__.py b/src/cloudflare/resources/pagerules/__init__.py
deleted file mode 100644
index d1c6434816b..00000000000
--- a/src/cloudflare/resources/pagerules/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from .settings import (
-    SettingsResource,
-    AsyncSettingsResource,
-    SettingsResourceWithRawResponse,
-    AsyncSettingsResourceWithRawResponse,
-    SettingsResourceWithStreamingResponse,
-    AsyncSettingsResourceWithStreamingResponse,
-)
-from .pagerules import (
-    PagerulesResource,
-    AsyncPagerulesResource,
-    PagerulesResourceWithRawResponse,
-    AsyncPagerulesResourceWithRawResponse,
-    PagerulesResourceWithStreamingResponse,
-    AsyncPagerulesResourceWithStreamingResponse,
-)
-
-__all__ = [
-    "SettingsResource",
-    "AsyncSettingsResource",
-    "SettingsResourceWithRawResponse",
-    "AsyncSettingsResourceWithRawResponse",
-    "SettingsResourceWithStreamingResponse",
-    "AsyncSettingsResourceWithStreamingResponse",
-    "PagerulesResource",
-    "AsyncPagerulesResource",
-    "PagerulesResourceWithRawResponse",
-    "AsyncPagerulesResourceWithRawResponse",
-    "PagerulesResourceWithStreamingResponse",
-    "AsyncPagerulesResourceWithStreamingResponse",
-]
diff --git a/src/cloudflare/resources/pagerules/pagerules.py b/src/cloudflare/resources/pagerules/pagerules.py
deleted file mode 100644
index 5f251b595db..00000000000
--- a/src/cloudflare/resources/pagerules/pagerules.py
+++ /dev/null
@@ -1,1025 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import typing_extensions
-from typing import Any, Type, Iterable, Optional, cast
-from typing_extensions import Literal
-
-import httpx
-
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from .settings import (
-    SettingsResource,
-    AsyncSettingsResource,
-    SettingsResourceWithRawResponse,
-    AsyncSettingsResourceWithRawResponse,
-    SettingsResourceWithStreamingResponse,
-    AsyncSettingsResourceWithStreamingResponse,
-)
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
-from ...types.pagerules import (
-    pagerule_edit_params,
-    pagerule_list_params,
-    pagerule_create_params,
-    pagerule_update_params,
-)
-from ...types.pagerules.route_param import RouteParam
-from ...types.pagerules.target_param import TargetParam
-from ...types.pagerules.pagerule_get_response import PageruleGetResponse
-from ...types.pagerules.pagerule_edit_response import PageruleEditResponse
-from ...types.pagerules.pagerule_list_response import PageruleListResponse
-from ...types.pagerules.pagerule_create_response import PageruleCreateResponse
-from ...types.pagerules.pagerule_delete_response import PageruleDeleteResponse
-from ...types.pagerules.pagerule_update_response import PageruleUpdateResponse
-
-__all__ = ["PagerulesResource", "AsyncPagerulesResource"]
-
-
-class PagerulesResource(SyncAPIResource):
-    @cached_property
-    def settings(self) -> SettingsResource:
-        return SettingsResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> PagerulesResourceWithRawResponse:
-        return PagerulesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> PagerulesResourceWithStreamingResponse:
-        return PagerulesResourceWithStreamingResponse(self)
-
-    @typing_extensions.deprecated(
-        "The Page Rules API is deprecated in favour of the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#page-rules for full details."
-    )
-    def create(
-        self,
-        *,
-        zone_id: str,
-        actions: Iterable[RouteParam],
-        targets: Iterable[TargetParam],
-        priority: int | NotGiven = NOT_GIVEN,
-        status: Literal["active", "disabled"] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PageruleCreateResponse:
-        """
-        Creates a new Page Rule.
-
-        Args:
-          zone_id: Identifier
-
-          actions: The set of actions to perform if the targets of this rule match the request.
-              Actions can redirect to another URL or override settings, but not both.
-
-          targets: The rule targets to evaluate on each request.
-
-          priority: The priority of the rule, used to define which Page Rule is processed over
-              another. A higher number indicates a higher priority. For example, if you have a
-              catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
-              take precedence (rule B: `/images/special/*`), specify a higher priority for
-              rule B so it overrides rule A.
-
-          status: The status of the Page Rule.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            PageruleCreateResponse,
-            self._post(
-                f"/zones/{zone_id}/pagerules",
-                body=maybe_transform(
-                    {
-                        "actions": actions,
-                        "targets": targets,
-                        "priority": priority,
-                        "status": status,
-                    },
-                    pagerule_create_params.PageruleCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[PageruleCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[PageruleCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    @typing_extensions.deprecated(
-        "The Page Rules API is deprecated in favour of the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#page-rules for full details."
-    )
-    def update(
-        self,
-        pagerule_id: str,
-        *,
-        zone_id: str,
-        actions: Iterable[RouteParam],
-        targets: Iterable[TargetParam],
-        priority: int | NotGiven = NOT_GIVEN,
-        status: Literal["active", "disabled"] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PageruleUpdateResponse:
-        """Replaces the configuration of an existing Page Rule.
-
-        The configuration of the
-        updated Page Rule will exactly match the data passed in the API request.
-
-        Args:
-          zone_id: Identifier
-
-          pagerule_id: Identifier
-
-          actions: The set of actions to perform if the targets of this rule match the request.
-              Actions can redirect to another URL or override settings, but not both.
-
-          targets: The rule targets to evaluate on each request.
-
-          priority: The priority of the rule, used to define which Page Rule is processed over
-              another. A higher number indicates a higher priority. For example, if you have a
-              catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
-              take precedence (rule B: `/images/special/*`), specify a higher priority for
-              rule B so it overrides rule A.
-
-          status: The status of the Page Rule.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        if not pagerule_id:
-            raise ValueError(f"Expected a non-empty value for `pagerule_id` but received {pagerule_id!r}")
-        return cast(
-            PageruleUpdateResponse,
-            self._put(
-                f"/zones/{zone_id}/pagerules/{pagerule_id}",
-                body=maybe_transform(
-                    {
-                        "actions": actions,
-                        "targets": targets,
-                        "priority": priority,
-                        "status": status,
-                    },
-                    pagerule_update_params.PageruleUpdateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[PageruleUpdateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[PageruleUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    @typing_extensions.deprecated(
-        "The Page Rules API is deprecated in favour of the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#page-rules for full details."
-    )
-    def list(
-        self,
-        *,
-        zone_id: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        match: Literal["any", "all"] | NotGiven = NOT_GIVEN,
-        order: Literal["status", "priority"] | NotGiven = NOT_GIVEN,
-        status: Literal["active", "disabled"] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PageruleListResponse:
-        """
-        Fetches Page Rules in a zone.
-
-        Args:
-          zone_id: Identifier
-
-          direction: The direction used to sort returned Page Rules.
-
-          match: When set to `all`, all the search requirements must match. When set to `any`,
-              only one of the search requirements has to match.
-
-          order: The field used to sort returned Page Rules.
-
-          status: The status of the Page Rule.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._get(
-            f"/zones/{zone_id}/pagerules",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "direction": direction,
-                        "match": match,
-                        "order": order,
-                        "status": status,
-                    },
-                    pagerule_list_params.PageruleListParams,
-                ),
-                post_parser=ResultWrapper[PageruleListResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[PageruleListResponse], ResultWrapper[PageruleListResponse]),
-        )
-
-    @typing_extensions.deprecated(
-        "The Page Rules API is deprecated in favour of the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#page-rules for full details."
-    )
-    def delete(
-        self,
-        pagerule_id: str,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[PageruleDeleteResponse]:
-        """
-        Deletes an existing Page Rule.
-
-        Args:
-          zone_id: Identifier
-
-          pagerule_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        if not pagerule_id:
-            raise ValueError(f"Expected a non-empty value for `pagerule_id` but received {pagerule_id!r}")
-        return self._delete(
-            f"/zones/{zone_id}/pagerules/{pagerule_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[PageruleDeleteResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[PageruleDeleteResponse]], ResultWrapper[PageruleDeleteResponse]),
-        )
-
-    @typing_extensions.deprecated(
-        "The Page Rules API is deprecated in favour of the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#page-rules for full details."
-    )
-    def edit(
-        self,
-        pagerule_id: str,
-        *,
-        zone_id: str,
-        actions: Iterable[RouteParam] | NotGiven = NOT_GIVEN,
-        priority: int | NotGiven = NOT_GIVEN,
-        status: Literal["active", "disabled"] | NotGiven = NOT_GIVEN,
-        targets: Iterable[TargetParam] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PageruleEditResponse:
-        """
-        Updates one or more fields of an existing Page Rule.
-
-        Args:
-          zone_id: Identifier
-
-          pagerule_id: Identifier
-
-          actions: The set of actions to perform if the targets of this rule match the request.
-              Actions can redirect to another URL or override settings, but not both.
-
-          priority: The priority of the rule, used to define which Page Rule is processed over
-              another. A higher number indicates a higher priority. For example, if you have a
-              catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
-              take precedence (rule B: `/images/special/*`), specify a higher priority for
-              rule B so it overrides rule A.
-
-          status: The status of the Page Rule.
-
-          targets: The rule targets to evaluate on each request.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        if not pagerule_id:
-            raise ValueError(f"Expected a non-empty value for `pagerule_id` but received {pagerule_id!r}")
-        return cast(
-            PageruleEditResponse,
-            self._patch(
-                f"/zones/{zone_id}/pagerules/{pagerule_id}",
-                body=maybe_transform(
-                    {
-                        "actions": actions,
-                        "priority": priority,
-                        "status": status,
-                        "targets": targets,
-                    },
-                    pagerule_edit_params.PageruleEditParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[PageruleEditResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[PageruleEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    @typing_extensions.deprecated(
-        "The Page Rules API is deprecated in favour of the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#page-rules for full details."
-    )
-    def get(
-        self,
-        pagerule_id: str,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PageruleGetResponse:
-        """
-        Fetches the details of a Page Rule.
-
-        Args:
-          zone_id: Identifier
-
-          pagerule_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        if not pagerule_id:
-            raise ValueError(f"Expected a non-empty value for `pagerule_id` but received {pagerule_id!r}")
-        return cast(
-            PageruleGetResponse,
-            self._get(
-                f"/zones/{zone_id}/pagerules/{pagerule_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[PageruleGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[PageruleGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class AsyncPagerulesResource(AsyncAPIResource):
-    @cached_property
-    def settings(self) -> AsyncSettingsResource:
-        return AsyncSettingsResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncPagerulesResourceWithRawResponse:
-        return AsyncPagerulesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncPagerulesResourceWithStreamingResponse:
-        return AsyncPagerulesResourceWithStreamingResponse(self)
-
-    @typing_extensions.deprecated(
-        "The Page Rules API is deprecated in favour of the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#page-rules for full details."
-    )
-    async def create(
-        self,
-        *,
-        zone_id: str,
-        actions: Iterable[RouteParam],
-        targets: Iterable[TargetParam],
-        priority: int | NotGiven = NOT_GIVEN,
-        status: Literal["active", "disabled"] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PageruleCreateResponse:
-        """
-        Creates a new Page Rule.
-
-        Args:
-          zone_id: Identifier
-
-          actions: The set of actions to perform if the targets of this rule match the request.
-              Actions can redirect to another URL or override settings, but not both.
-
-          targets: The rule targets to evaluate on each request.
-
-          priority: The priority of the rule, used to define which Page Rule is processed over
-              another. A higher number indicates a higher priority. For example, if you have a
-              catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
-              take precedence (rule B: `/images/special/*`), specify a higher priority for
-              rule B so it overrides rule A.
-
-          status: The status of the Page Rule.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            PageruleCreateResponse,
-            await self._post(
-                f"/zones/{zone_id}/pagerules",
-                body=await async_maybe_transform(
-                    {
-                        "actions": actions,
-                        "targets": targets,
-                        "priority": priority,
-                        "status": status,
-                    },
-                    pagerule_create_params.PageruleCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[PageruleCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[PageruleCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    @typing_extensions.deprecated(
-        "The Page Rules API is deprecated in favour of the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#page-rules for full details."
-    )
-    async def update(
-        self,
-        pagerule_id: str,
-        *,
-        zone_id: str,
-        actions: Iterable[RouteParam],
-        targets: Iterable[TargetParam],
-        priority: int | NotGiven = NOT_GIVEN,
-        status: Literal["active", "disabled"] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PageruleUpdateResponse:
-        """Replaces the configuration of an existing Page Rule.
-
-        The configuration of the
-        updated Page Rule will exactly match the data passed in the API request.
-
-        Args:
-          zone_id: Identifier
-
-          pagerule_id: Identifier
-
-          actions: The set of actions to perform if the targets of this rule match the request.
-              Actions can redirect to another URL or override settings, but not both.
-
-          targets: The rule targets to evaluate on each request.
-
-          priority: The priority of the rule, used to define which Page Rule is processed over
-              another. A higher number indicates a higher priority. For example, if you have a
-              catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
-              take precedence (rule B: `/images/special/*`), specify a higher priority for
-              rule B so it overrides rule A.
-
-          status: The status of the Page Rule.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        if not pagerule_id:
-            raise ValueError(f"Expected a non-empty value for `pagerule_id` but received {pagerule_id!r}")
-        return cast(
-            PageruleUpdateResponse,
-            await self._put(
-                f"/zones/{zone_id}/pagerules/{pagerule_id}",
-                body=await async_maybe_transform(
-                    {
-                        "actions": actions,
-                        "targets": targets,
-                        "priority": priority,
-                        "status": status,
-                    },
-                    pagerule_update_params.PageruleUpdateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[PageruleUpdateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[PageruleUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    @typing_extensions.deprecated(
-        "The Page Rules API is deprecated in favour of the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#page-rules for full details."
-    )
-    async def list(
-        self,
-        *,
-        zone_id: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        match: Literal["any", "all"] | NotGiven = NOT_GIVEN,
-        order: Literal["status", "priority"] | NotGiven = NOT_GIVEN,
-        status: Literal["active", "disabled"] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PageruleListResponse:
-        """
-        Fetches Page Rules in a zone.
-
-        Args:
-          zone_id: Identifier
-
-          direction: The direction used to sort returned Page Rules.
-
-          match: When set to `all`, all the search requirements must match. When set to `any`,
-              only one of the search requirements has to match.
-
-          order: The field used to sort returned Page Rules.
-
-          status: The status of the Page Rule.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._get(
-            f"/zones/{zone_id}/pagerules",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=await async_maybe_transform(
-                    {
-                        "direction": direction,
-                        "match": match,
-                        "order": order,
-                        "status": status,
-                    },
-                    pagerule_list_params.PageruleListParams,
-                ),
-                post_parser=ResultWrapper[PageruleListResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[PageruleListResponse], ResultWrapper[PageruleListResponse]),
-        )
-
-    @typing_extensions.deprecated(
-        "The Page Rules API is deprecated in favour of the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#page-rules for full details."
-    )
-    async def delete(
-        self,
-        pagerule_id: str,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[PageruleDeleteResponse]:
-        """
-        Deletes an existing Page Rule.
-
-        Args:
-          zone_id: Identifier
-
-          pagerule_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        if not pagerule_id:
-            raise ValueError(f"Expected a non-empty value for `pagerule_id` but received {pagerule_id!r}")
-        return await self._delete(
-            f"/zones/{zone_id}/pagerules/{pagerule_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[PageruleDeleteResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[PageruleDeleteResponse]], ResultWrapper[PageruleDeleteResponse]),
-        )
-
-    @typing_extensions.deprecated(
-        "The Page Rules API is deprecated in favour of the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#page-rules for full details."
-    )
-    async def edit(
-        self,
-        pagerule_id: str,
-        *,
-        zone_id: str,
-        actions: Iterable[RouteParam] | NotGiven = NOT_GIVEN,
-        priority: int | NotGiven = NOT_GIVEN,
-        status: Literal["active", "disabled"] | NotGiven = NOT_GIVEN,
-        targets: Iterable[TargetParam] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PageruleEditResponse:
-        """
-        Updates one or more fields of an existing Page Rule.
-
-        Args:
-          zone_id: Identifier
-
-          pagerule_id: Identifier
-
-          actions: The set of actions to perform if the targets of this rule match the request.
-              Actions can redirect to another URL or override settings, but not both.
-
-          priority: The priority of the rule, used to define which Page Rule is processed over
-              another. A higher number indicates a higher priority. For example, if you have a
-              catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
-              take precedence (rule B: `/images/special/*`), specify a higher priority for
-              rule B so it overrides rule A.
-
-          status: The status of the Page Rule.
-
-          targets: The rule targets to evaluate on each request.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        if not pagerule_id:
-            raise ValueError(f"Expected a non-empty value for `pagerule_id` but received {pagerule_id!r}")
-        return cast(
-            PageruleEditResponse,
-            await self._patch(
-                f"/zones/{zone_id}/pagerules/{pagerule_id}",
-                body=await async_maybe_transform(
-                    {
-                        "actions": actions,
-                        "priority": priority,
-                        "status": status,
-                        "targets": targets,
-                    },
-                    pagerule_edit_params.PageruleEditParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[PageruleEditResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[PageruleEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    @typing_extensions.deprecated(
-        "The Page Rules API is deprecated in favour of the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#page-rules for full details."
-    )
-    async def get(
-        self,
-        pagerule_id: str,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PageruleGetResponse:
-        """
-        Fetches the details of a Page Rule.
-
-        Args:
-          zone_id: Identifier
-
-          pagerule_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        if not pagerule_id:
-            raise ValueError(f"Expected a non-empty value for `pagerule_id` but received {pagerule_id!r}")
-        return cast(
-            PageruleGetResponse,
-            await self._get(
-                f"/zones/{zone_id}/pagerules/{pagerule_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[PageruleGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[PageruleGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class PagerulesResourceWithRawResponse:
-    def __init__(self, pagerules: PagerulesResource) -> None:
-        self._pagerules = pagerules
-
-        self.create = (  # pyright: ignore[reportDeprecated]
-            to_raw_response_wrapper(
-                pagerules.create  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.update = (  # pyright: ignore[reportDeprecated]
-            to_raw_response_wrapper(
-                pagerules.update  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.list = (  # pyright: ignore[reportDeprecated]
-            to_raw_response_wrapper(
-                pagerules.list  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.delete = (  # pyright: ignore[reportDeprecated]
-            to_raw_response_wrapper(
-                pagerules.delete  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.edit = (  # pyright: ignore[reportDeprecated]
-            to_raw_response_wrapper(
-                pagerules.edit  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.get = (  # pyright: ignore[reportDeprecated]
-            to_raw_response_wrapper(
-                pagerules.get  # pyright: ignore[reportDeprecated],
-            )
-        )
-
-    @cached_property
-    def settings(self) -> SettingsResourceWithRawResponse:
-        return SettingsResourceWithRawResponse(self._pagerules.settings)
-
-
-class AsyncPagerulesResourceWithRawResponse:
-    def __init__(self, pagerules: AsyncPagerulesResource) -> None:
-        self._pagerules = pagerules
-
-        self.create = (  # pyright: ignore[reportDeprecated]
-            async_to_raw_response_wrapper(
-                pagerules.create  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.update = (  # pyright: ignore[reportDeprecated]
-            async_to_raw_response_wrapper(
-                pagerules.update  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.list = (  # pyright: ignore[reportDeprecated]
-            async_to_raw_response_wrapper(
-                pagerules.list  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.delete = (  # pyright: ignore[reportDeprecated]
-            async_to_raw_response_wrapper(
-                pagerules.delete  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.edit = (  # pyright: ignore[reportDeprecated]
-            async_to_raw_response_wrapper(
-                pagerules.edit  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.get = (  # pyright: ignore[reportDeprecated]
-            async_to_raw_response_wrapper(
-                pagerules.get  # pyright: ignore[reportDeprecated],
-            )
-        )
-
-    @cached_property
-    def settings(self) -> AsyncSettingsResourceWithRawResponse:
-        return AsyncSettingsResourceWithRawResponse(self._pagerules.settings)
-
-
-class PagerulesResourceWithStreamingResponse:
-    def __init__(self, pagerules: PagerulesResource) -> None:
-        self._pagerules = pagerules
-
-        self.create = (  # pyright: ignore[reportDeprecated]
-            to_streamed_response_wrapper(
-                pagerules.create  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.update = (  # pyright: ignore[reportDeprecated]
-            to_streamed_response_wrapper(
-                pagerules.update  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.list = (  # pyright: ignore[reportDeprecated]
-            to_streamed_response_wrapper(
-                pagerules.list  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.delete = (  # pyright: ignore[reportDeprecated]
-            to_streamed_response_wrapper(
-                pagerules.delete  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.edit = (  # pyright: ignore[reportDeprecated]
-            to_streamed_response_wrapper(
-                pagerules.edit  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.get = (  # pyright: ignore[reportDeprecated]
-            to_streamed_response_wrapper(
-                pagerules.get  # pyright: ignore[reportDeprecated],
-            )
-        )
-
-    @cached_property
-    def settings(self) -> SettingsResourceWithStreamingResponse:
-        return SettingsResourceWithStreamingResponse(self._pagerules.settings)
-
-
-class AsyncPagerulesResourceWithStreamingResponse:
-    def __init__(self, pagerules: AsyncPagerulesResource) -> None:
-        self._pagerules = pagerules
-
-        self.create = (  # pyright: ignore[reportDeprecated]
-            async_to_streamed_response_wrapper(
-                pagerules.create  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.update = (  # pyright: ignore[reportDeprecated]
-            async_to_streamed_response_wrapper(
-                pagerules.update  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.list = (  # pyright: ignore[reportDeprecated]
-            async_to_streamed_response_wrapper(
-                pagerules.list  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.delete = (  # pyright: ignore[reportDeprecated]
-            async_to_streamed_response_wrapper(
-                pagerules.delete  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.edit = (  # pyright: ignore[reportDeprecated]
-            async_to_streamed_response_wrapper(
-                pagerules.edit  # pyright: ignore[reportDeprecated],
-            )
-        )
-        self.get = (  # pyright: ignore[reportDeprecated]
-            async_to_streamed_response_wrapper(
-                pagerules.get  # pyright: ignore[reportDeprecated],
-            )
-        )
-
-    @cached_property
-    def settings(self) -> AsyncSettingsResourceWithStreamingResponse:
-        return AsyncSettingsResourceWithStreamingResponse(self._pagerules.settings)
diff --git a/src/cloudflare/resources/pagerules/settings.py b/src/cloudflare/resources/pagerules/settings.py
deleted file mode 100644
index 450fac94b4d..00000000000
--- a/src/cloudflare/resources/pagerules/settings.py
+++ /dev/null
@@ -1,158 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, cast
-
-import httpx
-
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
-from ...types.pagerules.setting_list_response import SettingListResponse
-
-__all__ = ["SettingsResource", "AsyncSettingsResource"]
-
-
-class SettingsResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> SettingsResourceWithRawResponse:
-        return SettingsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
-        return SettingsResourceWithStreamingResponse(self)
-
-    def list(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SettingListResponse:
-        """
-        Returns a list of settings (and their details) that Page Rules can apply to
-        matching requests.
-
-        Args:
-          zone_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._get(
-            f"/zones/{zone_id}/pagerules/settings",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[SettingListResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[SettingListResponse], ResultWrapper[SettingListResponse]),
-        )
-
-
-class AsyncSettingsResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
-        return AsyncSettingsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
-        return AsyncSettingsResourceWithStreamingResponse(self)
-
-    async def list(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SettingListResponse:
-        """
-        Returns a list of settings (and their details) that Page Rules can apply to
-        matching requests.
-
-        Args:
-          zone_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._get(
-            f"/zones/{zone_id}/pagerules/settings",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[SettingListResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[SettingListResponse], ResultWrapper[SettingListResponse]),
-        )
-
-
-class SettingsResourceWithRawResponse:
-    def __init__(self, settings: SettingsResource) -> None:
-        self._settings = settings
-
-        self.list = to_raw_response_wrapper(
-            settings.list,
-        )
-
-
-class AsyncSettingsResourceWithRawResponse:
-    def __init__(self, settings: AsyncSettingsResource) -> None:
-        self._settings = settings
-
-        self.list = async_to_raw_response_wrapper(
-            settings.list,
-        )
-
-
-class SettingsResourceWithStreamingResponse:
-    def __init__(self, settings: SettingsResource) -> None:
-        self._settings = settings
-
-        self.list = to_streamed_response_wrapper(
-            settings.list,
-        )
-
-
-class AsyncSettingsResourceWithStreamingResponse:
-    def __init__(self, settings: AsyncSettingsResource) -> None:
-        self._settings = settings
-
-        self.list = async_to_streamed_response_wrapper(
-            settings.list,
-        )
diff --git a/src/cloudflare/resources/pages/pages.py b/src/cloudflare/resources/pages/pages.py
index e0367240c49..9b22115816f 100644
--- a/src/cloudflare/resources/pages/pages.py
+++ b/src/cloudflare/resources/pages/pages.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .projects import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .projects.projects import (
     ProjectsResource,
     AsyncProjectsResource,
     ProjectsResourceWithRawResponse,
@@ -10,9 +12,6 @@
     ProjectsResourceWithStreamingResponse,
     AsyncProjectsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .projects.projects import ProjectsResource, AsyncProjectsResource
 
 __all__ = ["PagesResource", "AsyncPagesResource"]
 
@@ -24,10 +23,21 @@ def projects(self) -> ProjectsResource:
 
     @cached_property
     def with_raw_response(self) -> PagesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PagesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PagesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PagesResourceWithStreamingResponse(self)
 
 
@@ -38,10 +48,21 @@ def projects(self) -> AsyncProjectsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncPagesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPagesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPagesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPagesResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/pages/projects/deployments/deployments.py b/src/cloudflare/resources/pages/projects/deployments/deployments.py
index f2c545dc237..6f0c6a5b3e7 100644
--- a/src/cloudflare/resources/pages/projects/deployments/deployments.py
+++ b/src/cloudflare/resources/pages/projects/deployments/deployments.py
@@ -2,24 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Type, cast
+from typing import Type, Mapping, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from .history import (
-    HistoryResource,
-    AsyncHistoryResource,
-    HistoryResourceWithRawResponse,
-    AsyncHistoryResourceWithRawResponse,
-    HistoryResourceWithStreamingResponse,
-    AsyncHistoryResourceWithStreamingResponse,
-)
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, FileTypes, omit, not_given
+from ....._utils import extract_files, maybe_transform, deepcopy_minimal, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -29,15 +18,17 @@
     async_to_streamed_response_wrapper,
 )
 from ....._wrappers import ResultWrapper
-from .....pagination import SyncSinglePage, AsyncSinglePage
-from .history.history import HistoryResource, AsyncHistoryResource
-from ....._base_client import AsyncPaginator, make_request_options
-from .....types.pages.projects import (
-    deployment_list_params,
-    deployment_retry_params,
-    deployment_create_params,
-    deployment_rollback_params,
+from .....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from .history.history import (
+    HistoryResource,
+    AsyncHistoryResource,
+    HistoryResourceWithRawResponse,
+    AsyncHistoryResourceWithRawResponse,
+    HistoryResourceWithStreamingResponse,
+    AsyncHistoryResourceWithStreamingResponse,
 )
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.pages.projects import deployment_list_params, deployment_create_params
 from .....types.pages.deployment import Deployment
 
 __all__ = ["DeploymentsResource", "AsyncDeploymentsResource"]
@@ -50,10 +41,21 @@ def history(self) -> HistoryResource:
 
     @cached_property
     def with_raw_response(self) -> DeploymentsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DeploymentsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DeploymentsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DeploymentsResourceWithStreamingResponse(self)
 
     def create(
@@ -61,13 +63,25 @@ def create(
         project_name: str,
         *,
         account_id: str,
-        branch: str | NotGiven = NOT_GIVEN,
+        _headers: FileTypes | Omit = omit,
+        _redirects: FileTypes | Omit = omit,
+        _routes_json: FileTypes | Omit = omit,
+        _worker_bundle: FileTypes | Omit = omit,
+        _worker_js: FileTypes | Omit = omit,
+        branch: str | Omit = omit,
+        commit_dirty: Literal["true", "false"] | Omit = omit,
+        commit_hash: str | Omit = omit,
+        commit_message: str | Omit = omit,
+        functions_filepath_routing_config_json: FileTypes | Omit = omit,
+        manifest: str | Omit = omit,
+        pages_build_output_dir: str | Omit = omit,
+        wrangler_config_hash: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Deployment:
         """Start a new deployment from production.
 
@@ -75,13 +89,41 @@ def create(
         already been authorized on the Cloudflare Pages dashboard.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
+          _headers: Headers configuration file for the deployment.
+
+          _redirects: Redirects configuration file for the deployment.
+
+          _routes_json: Routes configuration file defining routing rules.
+
+          _worker_bundle: Worker bundle file in multipart/form-data format. Mutually exclusive with
+              `_worker.js`. Cannot specify both `_worker.js` and `_worker.bundle` in the same
+              request. Maximum size: 25 MiB.
+
+          _worker_js: Worker JavaScript file. Mutually exclusive with `_worker.bundle`. Cannot specify
+              both `_worker.js` and `_worker.bundle` in the same request.
+
           branch: The branch to build the new deployment from. The `HEAD` of the branch will be
               used. If omitted, the production branch will be used by default.
 
+          commit_dirty: Boolean string indicating if the working directory has uncommitted changes.
+
+          commit_hash: Git commit SHA associated with this deployment.
+
+          commit_message: Git commit message associated with this deployment.
+
+          functions_filepath_routing_config_json: Functions routing configuration file.
+
+          manifest: JSON string containing a manifest of files to deploy. Maps file paths to their
+              content hashes. Required for direct upload deployments. Maximum 20,000 entries.
+
+          pages_build_output_dir: The build output directory path.
+
+          wrangler_config_hash: Hash of the Wrangler configuration file used for this deployment.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -94,13 +136,42 @@ def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not project_name:
             raise ValueError(f"Expected a non-empty value for `project_name` but received {project_name!r}")
+        body = deepcopy_minimal(
+            {
+                "_headers": _headers,
+                "_redirects": _redirects,
+                "_routes_json": _routes_json,
+                "_worker_bundle": _worker_bundle,
+                "_worker_js": _worker_js,
+                "branch": branch,
+                "commit_dirty": commit_dirty,
+                "commit_hash": commit_hash,
+                "commit_message": commit_message,
+                "functions_filepath_routing_config_json": functions_filepath_routing_config_json,
+                "manifest": manifest,
+                "pages_build_output_dir": pages_build_output_dir,
+                "wrangler_config_hash": wrangler_config_hash,
+            }
+        )
+        files = extract_files(
+            cast(Mapping[str, object], body),
+            paths=[
+                ["_headers"],
+                ["_redirects"],
+                ["_routes.json"],
+                ["_worker.bundle"],
+                ["_worker.js"],
+                ["functions-filepath-routing-config.json"],
+            ],
+        )
         # It should be noted that the actual Content-Type header that will be
         # sent to the server will contain a `boundary` parameter, e.g.
         # multipart/form-data; boundary=---abc--
         extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
         return self._post(
             f"/accounts/{account_id}/pages/projects/{project_name}/deployments",
-            body=maybe_transform({"branch": branch}, deployment_create_params.DeploymentCreateParams),
+            body=maybe_transform(body, deployment_create_params.DeploymentCreateParams),
+            files=files,
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -116,24 +187,30 @@ def list(
         project_name: str,
         *,
         account_id: str,
-        env: Literal["production", "preview"] | NotGiven = NOT_GIVEN,
+        env: Literal["production", "preview"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[Deployment]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[Deployment]:
         """
         Fetch a list of project deployments.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
           env: What type of deployments to fetch.
 
+          page: Which page of deployments to fetch.
+
+          per_page: How many deployments to return per page.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -148,13 +225,20 @@ def list(
             raise ValueError(f"Expected a non-empty value for `project_name` but received {project_name!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/pages/projects/{project_name}/deployments",
-            page=SyncSinglePage[Deployment],
+            page=SyncV4PagePaginationArray[Deployment],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=maybe_transform({"env": env}, deployment_list_params.DeploymentListParams),
+                query=maybe_transform(
+                    {
+                        "env": env,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    deployment_list_params.DeploymentListParams,
+                ),
             ),
             model=Deployment,
         )
@@ -170,17 +254,17 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Delete a deployment.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
-          deployment_id: Identifier
+          deployment_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -199,9 +283,13 @@ def delete(
         return self._delete(
             f"/accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}",
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
-            cast_to=object,
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     def get(
@@ -215,17 +303,17 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Deployment:
         """
         Fetch information about a deployment.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
-          deployment_id: Identifier
+          deployment_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -259,23 +347,22 @@ def retry(
         *,
         account_id: str,
         project_name: str,
-        body: object,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Deployment:
         """
         Retry a previous deployment.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
-          deployment_id: Identifier
+          deployment_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -293,7 +380,6 @@ def retry(
             raise ValueError(f"Expected a non-empty value for `deployment_id` but received {deployment_id!r}")
         return self._post(
             f"/accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/retry",
-            body=maybe_transform(body, deployment_retry_params.DeploymentRetryParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -310,13 +396,12 @@ def rollback(
         *,
         account_id: str,
         project_name: str,
-        body: object,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Deployment:
         """Rollback the production deployment to a previous deployment.
 
@@ -324,11 +409,11 @@ def rollback(
         rollback to succesful builds on production.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
-          deployment_id: Identifier
+          deployment_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -346,7 +431,6 @@ def rollback(
             raise ValueError(f"Expected a non-empty value for `deployment_id` but received {deployment_id!r}")
         return self._post(
             f"/accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/rollback",
-            body=maybe_transform(body, deployment_rollback_params.DeploymentRollbackParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -365,10 +449,21 @@ def history(self) -> AsyncHistoryResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncDeploymentsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDeploymentsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDeploymentsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDeploymentsResourceWithStreamingResponse(self)
 
     async def create(
@@ -376,13 +471,25 @@ async def create(
         project_name: str,
         *,
         account_id: str,
-        branch: str | NotGiven = NOT_GIVEN,
+        _headers: FileTypes | Omit = omit,
+        _redirects: FileTypes | Omit = omit,
+        _routes_json: FileTypes | Omit = omit,
+        _worker_bundle: FileTypes | Omit = omit,
+        _worker_js: FileTypes | Omit = omit,
+        branch: str | Omit = omit,
+        commit_dirty: Literal["true", "false"] | Omit = omit,
+        commit_hash: str | Omit = omit,
+        commit_message: str | Omit = omit,
+        functions_filepath_routing_config_json: FileTypes | Omit = omit,
+        manifest: str | Omit = omit,
+        pages_build_output_dir: str | Omit = omit,
+        wrangler_config_hash: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Deployment:
         """Start a new deployment from production.
 
@@ -390,13 +497,41 @@ async def create(
         already been authorized on the Cloudflare Pages dashboard.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
+          _headers: Headers configuration file for the deployment.
+
+          _redirects: Redirects configuration file for the deployment.
+
+          _routes_json: Routes configuration file defining routing rules.
+
+          _worker_bundle: Worker bundle file in multipart/form-data format. Mutually exclusive with
+              `_worker.js`. Cannot specify both `_worker.js` and `_worker.bundle` in the same
+              request. Maximum size: 25 MiB.
+
+          _worker_js: Worker JavaScript file. Mutually exclusive with `_worker.bundle`. Cannot specify
+              both `_worker.js` and `_worker.bundle` in the same request.
+
           branch: The branch to build the new deployment from. The `HEAD` of the branch will be
               used. If omitted, the production branch will be used by default.
 
+          commit_dirty: Boolean string indicating if the working directory has uncommitted changes.
+
+          commit_hash: Git commit SHA associated with this deployment.
+
+          commit_message: Git commit message associated with this deployment.
+
+          functions_filepath_routing_config_json: Functions routing configuration file.
+
+          manifest: JSON string containing a manifest of files to deploy. Maps file paths to their
+              content hashes. Required for direct upload deployments. Maximum 20,000 entries.
+
+          pages_build_output_dir: The build output directory path.
+
+          wrangler_config_hash: Hash of the Wrangler configuration file used for this deployment.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -409,13 +544,42 @@ async def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not project_name:
             raise ValueError(f"Expected a non-empty value for `project_name` but received {project_name!r}")
+        body = deepcopy_minimal(
+            {
+                "_headers": _headers,
+                "_redirects": _redirects,
+                "_routes_json": _routes_json,
+                "_worker_bundle": _worker_bundle,
+                "_worker_js": _worker_js,
+                "branch": branch,
+                "commit_dirty": commit_dirty,
+                "commit_hash": commit_hash,
+                "commit_message": commit_message,
+                "functions_filepath_routing_config_json": functions_filepath_routing_config_json,
+                "manifest": manifest,
+                "pages_build_output_dir": pages_build_output_dir,
+                "wrangler_config_hash": wrangler_config_hash,
+            }
+        )
+        files = extract_files(
+            cast(Mapping[str, object], body),
+            paths=[
+                ["_headers"],
+                ["_redirects"],
+                ["_routes.json"],
+                ["_worker.bundle"],
+                ["_worker.js"],
+                ["functions-filepath-routing-config.json"],
+            ],
+        )
         # It should be noted that the actual Content-Type header that will be
         # sent to the server will contain a `boundary` parameter, e.g.
         # multipart/form-data; boundary=---abc--
         extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
         return await self._post(
             f"/accounts/{account_id}/pages/projects/{project_name}/deployments",
-            body=await async_maybe_transform({"branch": branch}, deployment_create_params.DeploymentCreateParams),
+            body=await async_maybe_transform(body, deployment_create_params.DeploymentCreateParams),
+            files=files,
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -431,24 +595,30 @@ def list(
         project_name: str,
         *,
         account_id: str,
-        env: Literal["production", "preview"] | NotGiven = NOT_GIVEN,
+        env: Literal["production", "preview"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[Deployment, AsyncSinglePage[Deployment]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Deployment, AsyncV4PagePaginationArray[Deployment]]:
         """
         Fetch a list of project deployments.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
           env: What type of deployments to fetch.
 
+          page: Which page of deployments to fetch.
+
+          per_page: How many deployments to return per page.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -463,13 +633,20 @@ def list(
             raise ValueError(f"Expected a non-empty value for `project_name` but received {project_name!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/pages/projects/{project_name}/deployments",
-            page=AsyncSinglePage[Deployment],
+            page=AsyncV4PagePaginationArray[Deployment],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=maybe_transform({"env": env}, deployment_list_params.DeploymentListParams),
+                query=maybe_transform(
+                    {
+                        "env": env,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    deployment_list_params.DeploymentListParams,
+                ),
             ),
             model=Deployment,
         )
@@ -485,17 +662,17 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Delete a deployment.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
-          deployment_id: Identifier
+          deployment_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -514,9 +691,13 @@ async def delete(
         return await self._delete(
             f"/accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}",
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
-            cast_to=object,
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     async def get(
@@ -530,17 +711,17 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Deployment:
         """
         Fetch information about a deployment.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
-          deployment_id: Identifier
+          deployment_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -574,23 +755,22 @@ async def retry(
         *,
         account_id: str,
         project_name: str,
-        body: object,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Deployment:
         """
         Retry a previous deployment.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
-          deployment_id: Identifier
+          deployment_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -608,7 +788,6 @@ async def retry(
             raise ValueError(f"Expected a non-empty value for `deployment_id` but received {deployment_id!r}")
         return await self._post(
             f"/accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/retry",
-            body=await async_maybe_transform(body, deployment_retry_params.DeploymentRetryParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -625,13 +804,12 @@ async def rollback(
         *,
         account_id: str,
         project_name: str,
-        body: object,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Deployment:
         """Rollback the production deployment to a previous deployment.
 
@@ -639,11 +817,11 @@ async def rollback(
         rollback to succesful builds on production.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
-          deployment_id: Identifier
+          deployment_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -661,7 +839,6 @@ async def rollback(
             raise ValueError(f"Expected a non-empty value for `deployment_id` but received {deployment_id!r}")
         return await self._post(
             f"/accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/rollback",
-            body=await async_maybe_transform(body, deployment_rollback_params.DeploymentRollbackParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
diff --git a/src/cloudflare/resources/pages/projects/deployments/history/history.py b/src/cloudflare/resources/pages/projects/deployments/history/history.py
index 7258c71fc9a..818a16e095d 100644
--- a/src/cloudflare/resources/pages/projects/deployments/history/history.py
+++ b/src/cloudflare/resources/pages/projects/deployments/history/history.py
@@ -23,10 +23,21 @@ def logs(self) -> LogsResource:
 
     @cached_property
     def with_raw_response(self) -> HistoryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return HistoryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> HistoryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return HistoryResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def logs(self) -> AsyncLogsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncHistoryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncHistoryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncHistoryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncHistoryResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/pages/projects/deployments/history/logs.py b/src/cloudflare/resources/pages/projects/deployments/history/logs.py
index 631dd9e7aab..4cc468de7a0 100644
--- a/src/cloudflare/resources/pages/projects/deployments/history/logs.py
+++ b/src/cloudflare/resources/pages/projects/deployments/history/logs.py
@@ -2,11 +2,11 @@
 
 from __future__ import annotations
 
-from typing import Any, cast
+from typing import Type, cast
 
 import httpx
 
-from ......_types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ......_types import Body, Query, Headers, NotGiven, not_given
 from ......_compat import cached_property
 from ......_resource import SyncAPIResource, AsyncAPIResource
 from ......_response import (
@@ -25,10 +25,21 @@
 class LogsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> LogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LogsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LogsResourceWithStreamingResponse(self)
 
     def get(
@@ -42,17 +53,17 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LogGetResponse:
         """
         Fetch deployment logs for a project.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
-          deployment_id: Identifier
+          deployment_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -68,31 +79,37 @@ def get(
             raise ValueError(f"Expected a non-empty value for `project_name` but received {project_name!r}")
         if not deployment_id:
             raise ValueError(f"Expected a non-empty value for `deployment_id` but received {deployment_id!r}")
-        return cast(
-            LogGetResponse,
-            self._get(
-                f"/accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/history/logs",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[LogGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[LogGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._get(
+            f"/accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/history/logs",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[LogGetResponse]._unwrapper,
             ),
+            cast_to=cast(Type[LogGetResponse], ResultWrapper[LogGetResponse]),
         )
 
 
 class AsyncLogsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncLogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLogsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLogsResourceWithStreamingResponse(self)
 
     async def get(
@@ -106,17 +123,17 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LogGetResponse:
         """
         Fetch deployment logs for a project.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
-          deployment_id: Identifier
+          deployment_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -132,21 +149,16 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `project_name` but received {project_name!r}")
         if not deployment_id:
             raise ValueError(f"Expected a non-empty value for `deployment_id` but received {deployment_id!r}")
-        return cast(
-            LogGetResponse,
-            await self._get(
-                f"/accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/history/logs",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[LogGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[LogGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._get(
+            f"/accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/history/logs",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[LogGetResponse]._unwrapper,
             ),
+            cast_to=cast(Type[LogGetResponse], ResultWrapper[LogGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/pages/projects/domains.py b/src/cloudflare/resources/pages/projects/domains.py
index 7e6c839a248..58f4f9317d5 100644
--- a/src/cloudflare/resources/pages/projects/domains.py
+++ b/src/cloudflare/resources/pages/projects/domains.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -22,9 +19,10 @@
 from ...._wrappers import ResultWrapper
 from ....pagination import SyncSinglePage, AsyncSinglePage
 from ...._base_client import AsyncPaginator, make_request_options
-from ....types.pages.projects import domain_edit_params, domain_create_params
+from ....types.pages.projects import domain_create_params
 from ....types.pages.projects.domain_get_response import DomainGetResponse
 from ....types.pages.projects.domain_edit_response import DomainEditResponse
+from ....types.pages.projects.domain_list_response import DomainListResponse
 from ....types.pages.projects.domain_create_response import DomainCreateResponse
 
 __all__ = ["DomainsResource", "AsyncDomainsResource"]
@@ -33,10 +31,21 @@
 class DomainsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DomainsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DomainsResourceWithStreamingResponse(self)
 
     def create(
@@ -44,22 +53,24 @@ def create(
         project_name: str,
         *,
         account_id: str,
-        body: object,
+        name: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DomainCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DomainCreateResponse:
         """
         Add a new domain for the Pages project.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
+          name: The domain name.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -72,22 +83,17 @@ def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not project_name:
             raise ValueError(f"Expected a non-empty value for `project_name` but received {project_name!r}")
-        return cast(
-            Optional[DomainCreateResponse],
-            self._post(
-                f"/accounts/{account_id}/pages/projects/{project_name}/domains",
-                body=maybe_transform(body, domain_create_params.DomainCreateParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[DomainCreateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DomainCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._post(
+            f"/accounts/{account_id}/pages/projects/{project_name}/domains",
+            body=maybe_transform({"name": name}, domain_create_params.DomainCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DomainCreateResponse]._unwrapper,
             ),
+            cast_to=cast(Type[DomainCreateResponse], ResultWrapper[DomainCreateResponse]),
         )
 
     def list(
@@ -100,13 +106,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[object]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[DomainListResponse]:
         """
         Fetch a list of all domains associated with a Pages project.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
@@ -124,11 +130,11 @@ def list(
             raise ValueError(f"Expected a non-empty value for `project_name` but received {project_name!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/pages/projects/{project_name}/domains",
-            page=SyncSinglePage[object],
+            page=SyncSinglePage[DomainListResponse],
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            model=object,
+            model=DomainListResponse,
         )
 
     def delete(
@@ -142,17 +148,17 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Delete a Pages project's domain.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
-          domain_name: Name of the domain.
+          domain_name: The domain name.
 
           extra_headers: Send extra headers
 
@@ -171,9 +177,13 @@ def delete(
         return self._delete(
             f"/accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}",
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
-            cast_to=object,
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     def edit(
@@ -182,23 +192,22 @@ def edit(
         *,
         account_id: str,
         project_name: str,
-        body: object,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DomainEditResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DomainEditResponse:
         """
         Retry the validation status of a single domain.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
-          domain_name: Name of the domain.
+          domain_name: The domain name.
 
           extra_headers: Send extra headers
 
@@ -214,22 +223,16 @@ def edit(
             raise ValueError(f"Expected a non-empty value for `project_name` but received {project_name!r}")
         if not domain_name:
             raise ValueError(f"Expected a non-empty value for `domain_name` but received {domain_name!r}")
-        return cast(
-            Optional[DomainEditResponse],
-            self._patch(
-                f"/accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}",
-                body=maybe_transform(body, domain_edit_params.DomainEditParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[DomainEditResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DomainEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._patch(
+            f"/accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DomainEditResponse]._unwrapper,
             ),
+            cast_to=cast(Type[DomainEditResponse], ResultWrapper[DomainEditResponse]),
         )
 
     def get(
@@ -243,17 +246,17 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DomainGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DomainGetResponse:
         """
         Fetch a single domain.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
-          domain_name: Name of the domain.
+          domain_name: The domain name.
 
           extra_headers: Send extra headers
 
@@ -269,31 +272,37 @@ def get(
             raise ValueError(f"Expected a non-empty value for `project_name` but received {project_name!r}")
         if not domain_name:
             raise ValueError(f"Expected a non-empty value for `domain_name` but received {domain_name!r}")
-        return cast(
-            Optional[DomainGetResponse],
-            self._get(
-                f"/accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[DomainGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DomainGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._get(
+            f"/accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DomainGetResponse]._unwrapper,
             ),
+            cast_to=cast(Type[DomainGetResponse], ResultWrapper[DomainGetResponse]),
         )
 
 
 class AsyncDomainsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDomainsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDomainsResourceWithStreamingResponse(self)
 
     async def create(
@@ -301,22 +310,24 @@ async def create(
         project_name: str,
         *,
         account_id: str,
-        body: object,
+        name: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DomainCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DomainCreateResponse:
         """
         Add a new domain for the Pages project.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
+          name: The domain name.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -329,22 +340,17 @@ async def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not project_name:
             raise ValueError(f"Expected a non-empty value for `project_name` but received {project_name!r}")
-        return cast(
-            Optional[DomainCreateResponse],
-            await self._post(
-                f"/accounts/{account_id}/pages/projects/{project_name}/domains",
-                body=await async_maybe_transform(body, domain_create_params.DomainCreateParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[DomainCreateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DomainCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._post(
+            f"/accounts/{account_id}/pages/projects/{project_name}/domains",
+            body=await async_maybe_transform({"name": name}, domain_create_params.DomainCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DomainCreateResponse]._unwrapper,
             ),
+            cast_to=cast(Type[DomainCreateResponse], ResultWrapper[DomainCreateResponse]),
         )
 
     def list(
@@ -357,13 +363,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[object, AsyncSinglePage[object]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[DomainListResponse, AsyncSinglePage[DomainListResponse]]:
         """
         Fetch a list of all domains associated with a Pages project.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
@@ -381,11 +387,11 @@ def list(
             raise ValueError(f"Expected a non-empty value for `project_name` but received {project_name!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/pages/projects/{project_name}/domains",
-            page=AsyncSinglePage[object],
+            page=AsyncSinglePage[DomainListResponse],
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            model=object,
+            model=DomainListResponse,
         )
 
     async def delete(
@@ -399,17 +405,17 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Delete a Pages project's domain.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
-          domain_name: Name of the domain.
+          domain_name: The domain name.
 
           extra_headers: Send extra headers
 
@@ -428,9 +434,13 @@ async def delete(
         return await self._delete(
             f"/accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}",
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
-            cast_to=object,
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     async def edit(
@@ -439,23 +449,22 @@ async def edit(
         *,
         account_id: str,
         project_name: str,
-        body: object,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DomainEditResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DomainEditResponse:
         """
         Retry the validation status of a single domain.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
-          domain_name: Name of the domain.
+          domain_name: The domain name.
 
           extra_headers: Send extra headers
 
@@ -471,22 +480,16 @@ async def edit(
             raise ValueError(f"Expected a non-empty value for `project_name` but received {project_name!r}")
         if not domain_name:
             raise ValueError(f"Expected a non-empty value for `domain_name` but received {domain_name!r}")
-        return cast(
-            Optional[DomainEditResponse],
-            await self._patch(
-                f"/accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}",
-                body=await async_maybe_transform(body, domain_edit_params.DomainEditParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[DomainEditResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DomainEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._patch(
+            f"/accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DomainEditResponse]._unwrapper,
             ),
+            cast_to=cast(Type[DomainEditResponse], ResultWrapper[DomainEditResponse]),
         )
 
     async def get(
@@ -500,17 +503,17 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DomainGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DomainGetResponse:
         """
         Fetch a single domain.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
-          domain_name: Name of the domain.
+          domain_name: The domain name.
 
           extra_headers: Send extra headers
 
@@ -526,21 +529,16 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `project_name` but received {project_name!r}")
         if not domain_name:
             raise ValueError(f"Expected a non-empty value for `domain_name` but received {domain_name!r}")
-        return cast(
-            Optional[DomainGetResponse],
-            await self._get(
-                f"/accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[DomainGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DomainGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._get(
+            f"/accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[DomainGetResponse]._unwrapper,
             ),
+            cast_to=cast(Type[DomainGetResponse], ResultWrapper[DomainGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/pages/projects/projects.py b/src/cloudflare/resources/pages/projects/projects.py
index ced923eda18..8fb14ca403c 100644
--- a/src/cloudflare/resources/pages/projects/projects.py
+++ b/src/cloudflare/resources/pages/projects/projects.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, cast
+from typing import Type, Optional, cast
 
 import httpx
 
@@ -14,20 +14,9 @@
     DomainsResourceWithStreamingResponse,
     AsyncDomainsResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
-from .deployments import (
-    DeploymentsResource,
-    AsyncDeploymentsResource,
-    DeploymentsResourceWithRawResponse,
-    AsyncDeploymentsResourceWithRawResponse,
-    DeploymentsResourceWithStreamingResponse,
-    AsyncDeploymentsResourceWithStreamingResponse,
-)
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
     to_raw_response_wrapper,
@@ -36,15 +25,18 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ....pagination import SyncSinglePage, AsyncSinglePage
-from ....types.pages import Deployment, project_edit_params, project_create_params
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ....types.pages import project_edit_params, project_list_params, project_create_params
 from ...._base_client import AsyncPaginator, make_request_options
 from ....types.pages.project import Project
-from .deployments.deployments import DeploymentsResource, AsyncDeploymentsResource
-from ....types.pages.deployment import Deployment
-from ....types.pages.deployment_param import DeploymentParam
-from ....types.pages.project_edit_response import ProjectEditResponse
-from ....types.pages.project_create_response import ProjectCreateResponse
+from .deployments.deployments import (
+    DeploymentsResource,
+    AsyncDeploymentsResource,
+    DeploymentsResourceWithRawResponse,
+    AsyncDeploymentsResourceWithRawResponse,
+    DeploymentsResourceWithStreamingResponse,
+    AsyncDeploymentsResourceWithStreamingResponse,
+)
 
 __all__ = ["ProjectsResource", "AsyncProjectsResource"]
 
@@ -60,42 +52,54 @@ def domains(self) -> DomainsResource:
 
     @cached_property
     def with_raw_response(self) -> ProjectsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ProjectsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ProjectsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ProjectsResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        build_config: project_create_params.BuildConfig | NotGiven = NOT_GIVEN,
-        canonical_deployment: DeploymentParam | NotGiven = NOT_GIVEN,
-        deployment_configs: project_create_params.DeploymentConfigs | NotGiven = NOT_GIVEN,
-        latest_deployment: DeploymentParam | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        production_branch: str | NotGiven = NOT_GIVEN,
+        name: str,
+        production_branch: str,
+        build_config: project_create_params.BuildConfig | Omit = omit,
+        deployment_configs: project_create_params.DeploymentConfigs | Omit = omit,
+        source: project_create_params.Source | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ProjectCreateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Project:
         """
         Create a new project.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          name: Name of the project.
+
+          production_branch: Production branch of the project. Used to identify production deployments.
 
           build_config: Configs for the project build process.
 
           deployment_configs: Configs for deployments in a project.
 
-          name: Name of the project.
-
-          production_branch: Production branch of the project. Used to identify production deployments.
+          source: Configs for the project source control.
 
           extra_headers: Send extra headers
 
@@ -107,50 +111,50 @@ def create(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            ProjectCreateResponse,
-            self._post(
-                f"/accounts/{account_id}/pages/projects",
-                body=maybe_transform(
-                    {
-                        "build_config": build_config,
-                        "canonical_deployment": canonical_deployment,
-                        "deployment_configs": deployment_configs,
-                        "latest_deployment": latest_deployment,
-                        "name": name,
-                        "production_branch": production_branch,
-                    },
-                    project_create_params.ProjectCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[ProjectCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ProjectCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._post(
+            f"/accounts/{account_id}/pages/projects",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "production_branch": production_branch,
+                    "build_config": build_config,
+                    "deployment_configs": deployment_configs,
+                    "source": source,
+                },
+                project_create_params.ProjectCreateParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Project]._unwrapper,
+            ),
+            cast_to=cast(Type[Project], ResultWrapper[Project]),
         )
 
     def list(
         self,
         *,
         account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[Deployment]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[Project]:
         """
         Fetch a list of all user projects.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          page: Which page of projects to fetch.
+
+          per_page: How many projects to return per page.
 
           extra_headers: Send extra headers
 
@@ -164,11 +168,21 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/pages/projects",
-            page=SyncSinglePage[Deployment],
+            page=SyncV4PagePaginationArray[Project],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    project_list_params.ProjectListParams,
+                ),
             ),
-            model=Deployment,
+            model=Project,
         )
 
     def delete(
@@ -181,13 +195,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Delete a project by name.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
@@ -206,9 +220,13 @@ def delete(
         return self._delete(
             f"/accounts/{account_id}/pages/projects/{project_name}",
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
-            cast_to=object,
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     def edit(
@@ -216,24 +234,38 @@ def edit(
         project_name: str,
         *,
         account_id: str,
-        body: object,
+        build_config: project_edit_params.BuildConfig | Omit = omit,
+        deployment_configs: project_edit_params.DeploymentConfigs | Omit = omit,
+        name: str | Omit = omit,
+        production_branch: str | Omit = omit,
+        source: project_edit_params.Source | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ProjectEditResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Project:
         """Set new attributes for an existing project.
 
         Modify environment variables. To
         delete an environment variable, set the key to null.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
+          build_config: Configs for the project build process.
+
+          deployment_configs: Configs for deployments in a project.
+
+          name: Name of the project.
+
+          production_branch: Production branch of the project. Used to identify production deployments.
+
+          source: Configs for the project source control.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -246,22 +278,26 @@ def edit(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not project_name:
             raise ValueError(f"Expected a non-empty value for `project_name` but received {project_name!r}")
-        return cast(
-            ProjectEditResponse,
-            self._patch(
-                f"/accounts/{account_id}/pages/projects/{project_name}",
-                body=maybe_transform(body, project_edit_params.ProjectEditParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[ProjectEditResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ProjectEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._patch(
+            f"/accounts/{account_id}/pages/projects/{project_name}",
+            body=maybe_transform(
+                {
+                    "build_config": build_config,
+                    "deployment_configs": deployment_configs,
+                    "name": name,
+                    "production_branch": production_branch,
+                    "source": source,
+                },
+                project_edit_params.ProjectEditParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Project]._unwrapper,
+            ),
+            cast_to=cast(Type[Project], ResultWrapper[Project]),
         )
 
     def get(
@@ -274,13 +310,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Project:
         """
         Fetch a project by name.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
@@ -318,13 +354,13 @@ def purge_build_cache(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Purge all cached build artifacts for a Pages project
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
@@ -343,9 +379,13 @@ def purge_build_cache(
         return self._post(
             f"/accounts/{account_id}/pages/projects/{project_name}/purge_build_cache",
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
-            cast_to=object,
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
 
@@ -360,42 +400,54 @@ def domains(self) -> AsyncDomainsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncProjectsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncProjectsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncProjectsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncProjectsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        build_config: project_create_params.BuildConfig | NotGiven = NOT_GIVEN,
-        canonical_deployment: DeploymentParam | NotGiven = NOT_GIVEN,
-        deployment_configs: project_create_params.DeploymentConfigs | NotGiven = NOT_GIVEN,
-        latest_deployment: DeploymentParam | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        production_branch: str | NotGiven = NOT_GIVEN,
+        name: str,
+        production_branch: str,
+        build_config: project_create_params.BuildConfig | Omit = omit,
+        deployment_configs: project_create_params.DeploymentConfigs | Omit = omit,
+        source: project_create_params.Source | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ProjectCreateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Project:
         """
         Create a new project.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          name: Name of the project.
+
+          production_branch: Production branch of the project. Used to identify production deployments.
 
           build_config: Configs for the project build process.
 
           deployment_configs: Configs for deployments in a project.
 
-          name: Name of the project.
-
-          production_branch: Production branch of the project. Used to identify production deployments.
+          source: Configs for the project source control.
 
           extra_headers: Send extra headers
 
@@ -407,50 +459,50 @@ async def create(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            ProjectCreateResponse,
-            await self._post(
-                f"/accounts/{account_id}/pages/projects",
-                body=await async_maybe_transform(
-                    {
-                        "build_config": build_config,
-                        "canonical_deployment": canonical_deployment,
-                        "deployment_configs": deployment_configs,
-                        "latest_deployment": latest_deployment,
-                        "name": name,
-                        "production_branch": production_branch,
-                    },
-                    project_create_params.ProjectCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[ProjectCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ProjectCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._post(
+            f"/accounts/{account_id}/pages/projects",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "production_branch": production_branch,
+                    "build_config": build_config,
+                    "deployment_configs": deployment_configs,
+                    "source": source,
+                },
+                project_create_params.ProjectCreateParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Project]._unwrapper,
+            ),
+            cast_to=cast(Type[Project], ResultWrapper[Project]),
         )
 
     def list(
         self,
         *,
         account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[Deployment, AsyncSinglePage[Deployment]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Project, AsyncV4PagePaginationArray[Project]]:
         """
         Fetch a list of all user projects.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          page: Which page of projects to fetch.
+
+          per_page: How many projects to return per page.
 
           extra_headers: Send extra headers
 
@@ -464,11 +516,21 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/pages/projects",
-            page=AsyncSinglePage[Deployment],
+            page=AsyncV4PagePaginationArray[Project],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    project_list_params.ProjectListParams,
+                ),
             ),
-            model=Deployment,
+            model=Project,
         )
 
     async def delete(
@@ -481,13 +543,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Delete a project by name.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
@@ -506,9 +568,13 @@ async def delete(
         return await self._delete(
             f"/accounts/{account_id}/pages/projects/{project_name}",
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
-            cast_to=object,
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     async def edit(
@@ -516,24 +582,38 @@ async def edit(
         project_name: str,
         *,
         account_id: str,
-        body: object,
+        build_config: project_edit_params.BuildConfig | Omit = omit,
+        deployment_configs: project_edit_params.DeploymentConfigs | Omit = omit,
+        name: str | Omit = omit,
+        production_branch: str | Omit = omit,
+        source: project_edit_params.Source | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ProjectEditResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Project:
         """Set new attributes for an existing project.
 
         Modify environment variables. To
         delete an environment variable, set the key to null.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
+          build_config: Configs for the project build process.
+
+          deployment_configs: Configs for deployments in a project.
+
+          name: Name of the project.
+
+          production_branch: Production branch of the project. Used to identify production deployments.
+
+          source: Configs for the project source control.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -546,22 +626,26 @@ async def edit(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not project_name:
             raise ValueError(f"Expected a non-empty value for `project_name` but received {project_name!r}")
-        return cast(
-            ProjectEditResponse,
-            await self._patch(
-                f"/accounts/{account_id}/pages/projects/{project_name}",
-                body=await async_maybe_transform(body, project_edit_params.ProjectEditParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[ProjectEditResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ProjectEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._patch(
+            f"/accounts/{account_id}/pages/projects/{project_name}",
+            body=await async_maybe_transform(
+                {
+                    "build_config": build_config,
+                    "deployment_configs": deployment_configs,
+                    "name": name,
+                    "production_branch": production_branch,
+                    "source": source,
+                },
+                project_edit_params.ProjectEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Project]._unwrapper,
             ),
+            cast_to=cast(Type[Project], ResultWrapper[Project]),
         )
 
     async def get(
@@ -574,13 +658,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Project:
         """
         Fetch a project by name.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
@@ -618,13 +702,13 @@ async def purge_build_cache(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Purge all cached build artifacts for a Pages project
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           project_name: Name of the project.
 
@@ -643,9 +727,13 @@ async def purge_build_cache(
         return await self._post(
             f"/accounts/{account_id}/pages/projects/{project_name}/purge_build_cache",
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
-            cast_to=object,
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
 
diff --git a/src/cloudflare/resources/pcaps/ownership.py b/src/cloudflare/resources/pcaps/ownership.py
deleted file mode 100644
index fb7229716c9..00000000000
--- a/src/cloudflare/resources/pcaps/ownership.py
+++ /dev/null
@@ -1,472 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Optional, cast
-
-import httpx
-
-from ..._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ..._wrappers import ResultWrapper
-from ...types.pcaps import ownership_create_params, ownership_validate_params
-from ..._base_client import make_request_options
-from ...types.pcaps.ownership import Ownership
-from ...types.pcaps.ownership_get_response import OwnershipGetResponse
-
-__all__ = ["OwnershipResource", "AsyncOwnershipResource"]
-
-
-class OwnershipResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> OwnershipResourceWithRawResponse:
-        return OwnershipResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> OwnershipResourceWithStreamingResponse:
-        return OwnershipResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        *,
-        account_id: str,
-        destination_conf: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Ownership:
-        """
-        Adds an AWS or GCP bucket to use with full packet captures.
-
-        Args:
-          account_id: Identifier
-
-          destination_conf: The full URI for the bucket. This field only applies to `full` packet captures.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._post(
-            f"/accounts/{account_id}/pcaps/ownership",
-            body=maybe_transform({"destination_conf": destination_conf}, ownership_create_params.OwnershipCreateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Ownership]._unwrapper,
-            ),
-            cast_to=cast(Type[Ownership], ResultWrapper[Ownership]),
-        )
-
-    def delete(
-        self,
-        ownership_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> None:
-        """
-        Deletes buckets added to the packet captures API.
-
-        Args:
-          account_id: Identifier
-
-          ownership_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not ownership_id:
-            raise ValueError(f"Expected a non-empty value for `ownership_id` but received {ownership_id!r}")
-        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
-        return self._delete(
-            f"/accounts/{account_id}/pcaps/ownership/{ownership_id}",
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=NoneType,
-        )
-
-    def get(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OwnershipGetResponse]:
-        """
-        List all buckets configured for use with PCAPs API.
-
-        Args:
-          account_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/pcaps/ownership",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[OwnershipGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[OwnershipGetResponse]], ResultWrapper[OwnershipGetResponse]),
-        )
-
-    def validate(
-        self,
-        *,
-        account_id: str,
-        destination_conf: str,
-        ownership_challenge: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Ownership:
-        """
-        Validates buckets added to the packet captures API.
-
-        Args:
-          account_id: Identifier
-
-          destination_conf: The full URI for the bucket. This field only applies to `full` packet captures.
-
-          ownership_challenge: The ownership challenge filename stored in the bucket.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._post(
-            f"/accounts/{account_id}/pcaps/ownership/validate",
-            body=maybe_transform(
-                {
-                    "destination_conf": destination_conf,
-                    "ownership_challenge": ownership_challenge,
-                },
-                ownership_validate_params.OwnershipValidateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Ownership]._unwrapper,
-            ),
-            cast_to=cast(Type[Ownership], ResultWrapper[Ownership]),
-        )
-
-
-class AsyncOwnershipResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncOwnershipResourceWithRawResponse:
-        return AsyncOwnershipResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncOwnershipResourceWithStreamingResponse:
-        return AsyncOwnershipResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        *,
-        account_id: str,
-        destination_conf: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Ownership:
-        """
-        Adds an AWS or GCP bucket to use with full packet captures.
-
-        Args:
-          account_id: Identifier
-
-          destination_conf: The full URI for the bucket. This field only applies to `full` packet captures.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._post(
-            f"/accounts/{account_id}/pcaps/ownership",
-            body=await async_maybe_transform(
-                {"destination_conf": destination_conf}, ownership_create_params.OwnershipCreateParams
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Ownership]._unwrapper,
-            ),
-            cast_to=cast(Type[Ownership], ResultWrapper[Ownership]),
-        )
-
-    async def delete(
-        self,
-        ownership_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> None:
-        """
-        Deletes buckets added to the packet captures API.
-
-        Args:
-          account_id: Identifier
-
-          ownership_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not ownership_id:
-            raise ValueError(f"Expected a non-empty value for `ownership_id` but received {ownership_id!r}")
-        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
-        return await self._delete(
-            f"/accounts/{account_id}/pcaps/ownership/{ownership_id}",
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=NoneType,
-        )
-
-    async def get(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OwnershipGetResponse]:
-        """
-        List all buckets configured for use with PCAPs API.
-
-        Args:
-          account_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/pcaps/ownership",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[OwnershipGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[OwnershipGetResponse]], ResultWrapper[OwnershipGetResponse]),
-        )
-
-    async def validate(
-        self,
-        *,
-        account_id: str,
-        destination_conf: str,
-        ownership_challenge: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Ownership:
-        """
-        Validates buckets added to the packet captures API.
-
-        Args:
-          account_id: Identifier
-
-          destination_conf: The full URI for the bucket. This field only applies to `full` packet captures.
-
-          ownership_challenge: The ownership challenge filename stored in the bucket.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._post(
-            f"/accounts/{account_id}/pcaps/ownership/validate",
-            body=await async_maybe_transform(
-                {
-                    "destination_conf": destination_conf,
-                    "ownership_challenge": ownership_challenge,
-                },
-                ownership_validate_params.OwnershipValidateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Ownership]._unwrapper,
-            ),
-            cast_to=cast(Type[Ownership], ResultWrapper[Ownership]),
-        )
-
-
-class OwnershipResourceWithRawResponse:
-    def __init__(self, ownership: OwnershipResource) -> None:
-        self._ownership = ownership
-
-        self.create = to_raw_response_wrapper(
-            ownership.create,
-        )
-        self.delete = to_raw_response_wrapper(
-            ownership.delete,
-        )
-        self.get = to_raw_response_wrapper(
-            ownership.get,
-        )
-        self.validate = to_raw_response_wrapper(
-            ownership.validate,
-        )
-
-
-class AsyncOwnershipResourceWithRawResponse:
-    def __init__(self, ownership: AsyncOwnershipResource) -> None:
-        self._ownership = ownership
-
-        self.create = async_to_raw_response_wrapper(
-            ownership.create,
-        )
-        self.delete = async_to_raw_response_wrapper(
-            ownership.delete,
-        )
-        self.get = async_to_raw_response_wrapper(
-            ownership.get,
-        )
-        self.validate = async_to_raw_response_wrapper(
-            ownership.validate,
-        )
-
-
-class OwnershipResourceWithStreamingResponse:
-    def __init__(self, ownership: OwnershipResource) -> None:
-        self._ownership = ownership
-
-        self.create = to_streamed_response_wrapper(
-            ownership.create,
-        )
-        self.delete = to_streamed_response_wrapper(
-            ownership.delete,
-        )
-        self.get = to_streamed_response_wrapper(
-            ownership.get,
-        )
-        self.validate = to_streamed_response_wrapper(
-            ownership.validate,
-        )
-
-
-class AsyncOwnershipResourceWithStreamingResponse:
-    def __init__(self, ownership: AsyncOwnershipResource) -> None:
-        self._ownership = ownership
-
-        self.create = async_to_streamed_response_wrapper(
-            ownership.create,
-        )
-        self.delete = async_to_streamed_response_wrapper(
-            ownership.delete,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            ownership.get,
-        )
-        self.validate = async_to_streamed_response_wrapper(
-            ownership.validate,
-        )
diff --git a/src/cloudflare/resources/pcaps/pcaps.py b/src/cloudflare/resources/pcaps/pcaps.py
deleted file mode 100644
index 88b6a85dc45..00000000000
--- a/src/cloudflare/resources/pcaps/pcaps.py
+++ /dev/null
@@ -1,657 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Any, cast, overload
-from typing_extensions import Literal
-
-import httpx
-
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    required_args,
-    maybe_transform,
-    async_maybe_transform,
-)
-from .download import (
-    DownloadResource,
-    AsyncDownloadResource,
-    DownloadResourceWithRawResponse,
-    AsyncDownloadResourceWithRawResponse,
-    DownloadResourceWithStreamingResponse,
-    AsyncDownloadResourceWithStreamingResponse,
-)
-from ..._compat import cached_property
-from .ownership import (
-    OwnershipResource,
-    AsyncOwnershipResource,
-    OwnershipResourceWithRawResponse,
-    AsyncOwnershipResourceWithRawResponse,
-    OwnershipResourceWithStreamingResponse,
-    AsyncOwnershipResourceWithStreamingResponse,
-)
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ..._wrappers import ResultWrapper
-from ...pagination import SyncSinglePage, AsyncSinglePage
-from ...types.pcaps import pcap_create_params
-from ..._base_client import AsyncPaginator, make_request_options
-from ...types.pcaps.pcap_filter_param import PCAPFilterParam
-from ...types.pcaps.pcap_get_response import PCAPGetResponse
-from ...types.pcaps.pcap_list_response import PCAPListResponse
-from ...types.pcaps.pcap_create_response import PCAPCreateResponse
-
-__all__ = ["PCAPsResource", "AsyncPCAPsResource"]
-
-
-class PCAPsResource(SyncAPIResource):
-    @cached_property
-    def ownership(self) -> OwnershipResource:
-        return OwnershipResource(self._client)
-
-    @cached_property
-    def download(self) -> DownloadResource:
-        return DownloadResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> PCAPsResourceWithRawResponse:
-        return PCAPsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> PCAPsResourceWithStreamingResponse:
-        return PCAPsResourceWithStreamingResponse(self)
-
-    @overload
-    def create(
-        self,
-        *,
-        account_id: str,
-        packet_limit: float,
-        system: Literal["magic-transit"],
-        time_limit: float,
-        type: Literal["simple", "full"],
-        filter_v1: PCAPFilterParam | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PCAPCreateResponse:
-        """
-        Create new PCAP request for account.
-
-        Args:
-          account_id: Identifier
-
-          packet_limit: The limit of packets contained in a packet capture.
-
-          system: The system used to collect packet captures.
-
-          time_limit: The packet capture duration in seconds.
-
-          type: The type of packet capture. `Simple` captures sampled packets, and `full`
-              captures entire payloads and non-sampled packets.
-
-          filter_v1: The packet capture filter. When this field is empty, all packets are captured.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def create(
-        self,
-        *,
-        account_id: str,
-        colo_name: str,
-        destination_conf: str,
-        system: Literal["magic-transit"],
-        time_limit: float,
-        type: Literal["simple", "full"],
-        byte_limit: float | NotGiven = NOT_GIVEN,
-        filter_v1: PCAPFilterParam | NotGiven = NOT_GIVEN,
-        packet_limit: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PCAPCreateResponse:
-        """
-        Create new PCAP request for account.
-
-        Args:
-          account_id: Identifier
-
-          colo_name: The name of the data center used for the packet capture. This can be a specific
-              colo (ord02) or a multi-colo name (ORD). This field only applies to `full`
-              packet captures.
-
-          destination_conf: The full URI for the bucket. This field only applies to `full` packet captures.
-
-          system: The system used to collect packet captures.
-
-          time_limit: The packet capture duration in seconds.
-
-          type: The type of packet capture. `Simple` captures sampled packets, and `full`
-              captures entire payloads and non-sampled packets.
-
-          byte_limit: The maximum number of bytes to capture. This field only applies to `full` packet
-              captures.
-
-          filter_v1: The packet capture filter. When this field is empty, all packets are captured.
-
-          packet_limit: The limit of packets contained in a packet capture.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @required_args(
-        ["account_id", "packet_limit", "system", "time_limit", "type"],
-        ["account_id", "colo_name", "destination_conf", "system", "time_limit", "type"],
-    )
-    def create(
-        self,
-        *,
-        account_id: str,
-        packet_limit: float | NotGiven = NOT_GIVEN,
-        system: Literal["magic-transit"],
-        time_limit: float,
-        type: Literal["simple", "full"],
-        filter_v1: PCAPFilterParam | NotGiven = NOT_GIVEN,
-        colo_name: str | NotGiven = NOT_GIVEN,
-        destination_conf: str | NotGiven = NOT_GIVEN,
-        byte_limit: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PCAPCreateResponse:
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            PCAPCreateResponse,
-            self._post(
-                f"/accounts/{account_id}/pcaps",
-                body=maybe_transform(
-                    {
-                        "packet_limit": packet_limit,
-                        "system": system,
-                        "time_limit": time_limit,
-                        "type": type,
-                        "filter_v1": filter_v1,
-                        "colo_name": colo_name,
-                        "destination_conf": destination_conf,
-                        "byte_limit": byte_limit,
-                    },
-                    pcap_create_params.PCAPCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[PCAPCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[PCAPCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[PCAPListResponse]:
-        """
-        Lists all packet capture requests for an account.
-
-        Args:
-          account_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/pcaps",
-            page=SyncSinglePage[PCAPListResponse],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=cast(Any, PCAPListResponse),  # Union types cannot be passed in as arguments in the type system
-        )
-
-    def get(
-        self,
-        pcap_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PCAPGetResponse:
-        """
-        Get information for a PCAP request by id.
-
-        Args:
-          account_id: Identifier
-
-          pcap_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not pcap_id:
-            raise ValueError(f"Expected a non-empty value for `pcap_id` but received {pcap_id!r}")
-        return cast(
-            PCAPGetResponse,
-            self._get(
-                f"/accounts/{account_id}/pcaps/{pcap_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[PCAPGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[PCAPGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class AsyncPCAPsResource(AsyncAPIResource):
-    @cached_property
-    def ownership(self) -> AsyncOwnershipResource:
-        return AsyncOwnershipResource(self._client)
-
-    @cached_property
-    def download(self) -> AsyncDownloadResource:
-        return AsyncDownloadResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncPCAPsResourceWithRawResponse:
-        return AsyncPCAPsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncPCAPsResourceWithStreamingResponse:
-        return AsyncPCAPsResourceWithStreamingResponse(self)
-
-    @overload
-    async def create(
-        self,
-        *,
-        account_id: str,
-        packet_limit: float,
-        system: Literal["magic-transit"],
-        time_limit: float,
-        type: Literal["simple", "full"],
-        filter_v1: PCAPFilterParam | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PCAPCreateResponse:
-        """
-        Create new PCAP request for account.
-
-        Args:
-          account_id: Identifier
-
-          packet_limit: The limit of packets contained in a packet capture.
-
-          system: The system used to collect packet captures.
-
-          time_limit: The packet capture duration in seconds.
-
-          type: The type of packet capture. `Simple` captures sampled packets, and `full`
-              captures entire payloads and non-sampled packets.
-
-          filter_v1: The packet capture filter. When this field is empty, all packets are captured.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def create(
-        self,
-        *,
-        account_id: str,
-        colo_name: str,
-        destination_conf: str,
-        system: Literal["magic-transit"],
-        time_limit: float,
-        type: Literal["simple", "full"],
-        byte_limit: float | NotGiven = NOT_GIVEN,
-        filter_v1: PCAPFilterParam | NotGiven = NOT_GIVEN,
-        packet_limit: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PCAPCreateResponse:
-        """
-        Create new PCAP request for account.
-
-        Args:
-          account_id: Identifier
-
-          colo_name: The name of the data center used for the packet capture. This can be a specific
-              colo (ord02) or a multi-colo name (ORD). This field only applies to `full`
-              packet captures.
-
-          destination_conf: The full URI for the bucket. This field only applies to `full` packet captures.
-
-          system: The system used to collect packet captures.
-
-          time_limit: The packet capture duration in seconds.
-
-          type: The type of packet capture. `Simple` captures sampled packets, and `full`
-              captures entire payloads and non-sampled packets.
-
-          byte_limit: The maximum number of bytes to capture. This field only applies to `full` packet
-              captures.
-
-          filter_v1: The packet capture filter. When this field is empty, all packets are captured.
-
-          packet_limit: The limit of packets contained in a packet capture.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @required_args(
-        ["account_id", "packet_limit", "system", "time_limit", "type"],
-        ["account_id", "colo_name", "destination_conf", "system", "time_limit", "type"],
-    )
-    async def create(
-        self,
-        *,
-        account_id: str,
-        packet_limit: float | NotGiven = NOT_GIVEN,
-        system: Literal["magic-transit"],
-        time_limit: float,
-        type: Literal["simple", "full"],
-        filter_v1: PCAPFilterParam | NotGiven = NOT_GIVEN,
-        colo_name: str | NotGiven = NOT_GIVEN,
-        destination_conf: str | NotGiven = NOT_GIVEN,
-        byte_limit: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PCAPCreateResponse:
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            PCAPCreateResponse,
-            await self._post(
-                f"/accounts/{account_id}/pcaps",
-                body=await async_maybe_transform(
-                    {
-                        "packet_limit": packet_limit,
-                        "system": system,
-                        "time_limit": time_limit,
-                        "type": type,
-                        "filter_v1": filter_v1,
-                        "colo_name": colo_name,
-                        "destination_conf": destination_conf,
-                        "byte_limit": byte_limit,
-                    },
-                    pcap_create_params.PCAPCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[PCAPCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[PCAPCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[PCAPListResponse, AsyncSinglePage[PCAPListResponse]]:
-        """
-        Lists all packet capture requests for an account.
-
-        Args:
-          account_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/pcaps",
-            page=AsyncSinglePage[PCAPListResponse],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=cast(Any, PCAPListResponse),  # Union types cannot be passed in as arguments in the type system
-        )
-
-    async def get(
-        self,
-        pcap_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PCAPGetResponse:
-        """
-        Get information for a PCAP request by id.
-
-        Args:
-          account_id: Identifier
-
-          pcap_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not pcap_id:
-            raise ValueError(f"Expected a non-empty value for `pcap_id` but received {pcap_id!r}")
-        return cast(
-            PCAPGetResponse,
-            await self._get(
-                f"/accounts/{account_id}/pcaps/{pcap_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[PCAPGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[PCAPGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class PCAPsResourceWithRawResponse:
-    def __init__(self, pcaps: PCAPsResource) -> None:
-        self._pcaps = pcaps
-
-        self.create = to_raw_response_wrapper(
-            pcaps.create,
-        )
-        self.list = to_raw_response_wrapper(
-            pcaps.list,
-        )
-        self.get = to_raw_response_wrapper(
-            pcaps.get,
-        )
-
-    @cached_property
-    def ownership(self) -> OwnershipResourceWithRawResponse:
-        return OwnershipResourceWithRawResponse(self._pcaps.ownership)
-
-    @cached_property
-    def download(self) -> DownloadResourceWithRawResponse:
-        return DownloadResourceWithRawResponse(self._pcaps.download)
-
-
-class AsyncPCAPsResourceWithRawResponse:
-    def __init__(self, pcaps: AsyncPCAPsResource) -> None:
-        self._pcaps = pcaps
-
-        self.create = async_to_raw_response_wrapper(
-            pcaps.create,
-        )
-        self.list = async_to_raw_response_wrapper(
-            pcaps.list,
-        )
-        self.get = async_to_raw_response_wrapper(
-            pcaps.get,
-        )
-
-    @cached_property
-    def ownership(self) -> AsyncOwnershipResourceWithRawResponse:
-        return AsyncOwnershipResourceWithRawResponse(self._pcaps.ownership)
-
-    @cached_property
-    def download(self) -> AsyncDownloadResourceWithRawResponse:
-        return AsyncDownloadResourceWithRawResponse(self._pcaps.download)
-
-
-class PCAPsResourceWithStreamingResponse:
-    def __init__(self, pcaps: PCAPsResource) -> None:
-        self._pcaps = pcaps
-
-        self.create = to_streamed_response_wrapper(
-            pcaps.create,
-        )
-        self.list = to_streamed_response_wrapper(
-            pcaps.list,
-        )
-        self.get = to_streamed_response_wrapper(
-            pcaps.get,
-        )
-
-    @cached_property
-    def ownership(self) -> OwnershipResourceWithStreamingResponse:
-        return OwnershipResourceWithStreamingResponse(self._pcaps.ownership)
-
-    @cached_property
-    def download(self) -> DownloadResourceWithStreamingResponse:
-        return DownloadResourceWithStreamingResponse(self._pcaps.download)
-
-
-class AsyncPCAPsResourceWithStreamingResponse:
-    def __init__(self, pcaps: AsyncPCAPsResource) -> None:
-        self._pcaps = pcaps
-
-        self.create = async_to_streamed_response_wrapper(
-            pcaps.create,
-        )
-        self.list = async_to_streamed_response_wrapper(
-            pcaps.list,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            pcaps.get,
-        )
-
-    @cached_property
-    def ownership(self) -> AsyncOwnershipResourceWithStreamingResponse:
-        return AsyncOwnershipResourceWithStreamingResponse(self._pcaps.ownership)
-
-    @cached_property
-    def download(self) -> AsyncDownloadResourceWithStreamingResponse:
-        return AsyncDownloadResourceWithStreamingResponse(self._pcaps.download)
diff --git a/src/cloudflare/resources/pipelines/__init__.py b/src/cloudflare/resources/pipelines/__init__.py
new file mode 100644
index 00000000000..7b0aaa55bde
--- /dev/null
+++ b/src/cloudflare/resources/pipelines/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .sinks import (
+    SinksResource,
+    AsyncSinksResource,
+    SinksResourceWithRawResponse,
+    AsyncSinksResourceWithRawResponse,
+    SinksResourceWithStreamingResponse,
+    AsyncSinksResourceWithStreamingResponse,
+)
+from .streams import (
+    StreamsResource,
+    AsyncStreamsResource,
+    StreamsResourceWithRawResponse,
+    AsyncStreamsResourceWithRawResponse,
+    StreamsResourceWithStreamingResponse,
+    AsyncStreamsResourceWithStreamingResponse,
+)
+from .pipelines import (
+    PipelinesResource,
+    AsyncPipelinesResource,
+    PipelinesResourceWithRawResponse,
+    AsyncPipelinesResourceWithRawResponse,
+    PipelinesResourceWithStreamingResponse,
+    AsyncPipelinesResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "SinksResource",
+    "AsyncSinksResource",
+    "SinksResourceWithRawResponse",
+    "AsyncSinksResourceWithRawResponse",
+    "SinksResourceWithStreamingResponse",
+    "AsyncSinksResourceWithStreamingResponse",
+    "StreamsResource",
+    "AsyncStreamsResource",
+    "StreamsResourceWithRawResponse",
+    "AsyncStreamsResourceWithRawResponse",
+    "StreamsResourceWithStreamingResponse",
+    "AsyncStreamsResourceWithStreamingResponse",
+    "PipelinesResource",
+    "AsyncPipelinesResource",
+    "PipelinesResourceWithRawResponse",
+    "AsyncPipelinesResourceWithRawResponse",
+    "PipelinesResourceWithStreamingResponse",
+    "AsyncPipelinesResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/pipelines/pipelines.py b/src/cloudflare/resources/pipelines/pipelines.py
new file mode 100644
index 00000000000..50d51e2a09d
--- /dev/null
+++ b/src/cloudflare/resources/pipelines/pipelines.py
@@ -0,0 +1,1314 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import typing_extensions
+from typing import Type, Iterable, cast
+
+import httpx
+
+from .sinks import (
+    SinksResource,
+    AsyncSinksResource,
+    SinksResourceWithRawResponse,
+    AsyncSinksResourceWithRawResponse,
+    SinksResourceWithStreamingResponse,
+    AsyncSinksResourceWithStreamingResponse,
+)
+from .streams import (
+    StreamsResource,
+    AsyncStreamsResource,
+    StreamsResourceWithRawResponse,
+    AsyncStreamsResourceWithRawResponse,
+    StreamsResourceWithStreamingResponse,
+    AsyncStreamsResourceWithStreamingResponse,
+)
+from ..._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.pipelines import (
+    pipeline_list_params,
+    pipeline_create_params,
+    pipeline_update_params,
+    pipeline_list_v1_params,
+    pipeline_create_v1_params,
+    pipeline_validate_sql_params,
+)
+from ...types.pipelines.pipeline_get_response import PipelineGetResponse
+from ...types.pipelines.pipeline_list_response import PipelineListResponse
+from ...types.pipelines.pipeline_create_response import PipelineCreateResponse
+from ...types.pipelines.pipeline_get_v1_response import PipelineGetV1Response
+from ...types.pipelines.pipeline_update_response import PipelineUpdateResponse
+from ...types.pipelines.pipeline_list_v1_response import PipelineListV1Response
+from ...types.pipelines.pipeline_create_v1_response import PipelineCreateV1Response
+from ...types.pipelines.pipeline_validate_sql_response import PipelineValidateSqlResponse
+
+__all__ = ["PipelinesResource", "AsyncPipelinesResource"]
+
+
+class PipelinesResource(SyncAPIResource):
+    @cached_property
+    def sinks(self) -> SinksResource:
+        return SinksResource(self._client)
+
+    @cached_property
+    def streams(self) -> StreamsResource:
+        return StreamsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> PipelinesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return PipelinesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> PipelinesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return PipelinesResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated("Use create_v1 instead. This endpoint will be removed in the future.")
+    def create(
+        self,
+        *,
+        account_id: str,
+        destination: pipeline_create_params.Destination,
+        name: str,
+        source: Iterable[pipeline_create_params.Source],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PipelineCreateResponse:
+        """[DEPRECATED] Create a new pipeline.
+
+        Use the new /pipelines/v1/pipelines endpoint
+        instead.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          name: Defines the name of the pipeline.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/pipelines",
+            body=maybe_transform(
+                {
+                    "destination": destination,
+                    "name": name,
+                    "source": source,
+                },
+                pipeline_create_params.PipelineCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PipelineCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PipelineCreateResponse], ResultWrapper[PipelineCreateResponse]),
+        )
+
+    @typing_extensions.deprecated("The v1 API does not support updates. This endpoint will be removed in the future.")
+    def update(
+        self,
+        pipeline_name: str,
+        *,
+        account_id: str,
+        destination: pipeline_update_params.Destination,
+        name: str,
+        source: Iterable[pipeline_update_params.Source],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PipelineUpdateResponse:
+        """[DEPRECATED] Update an existing pipeline.
+
+        Use the new /pipelines/v1/pipelines
+        endpoint instead.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          pipeline_name: Defines the name of the pipeline.
+
+          name: Defines the name of the pipeline.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not pipeline_name:
+            raise ValueError(f"Expected a non-empty value for `pipeline_name` but received {pipeline_name!r}")
+        return self._put(
+            f"/accounts/{account_id}/pipelines/{pipeline_name}",
+            body=maybe_transform(
+                {
+                    "destination": destination,
+                    "name": name,
+                    "source": source,
+                },
+                pipeline_update_params.PipelineUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PipelineUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PipelineUpdateResponse], ResultWrapper[PipelineUpdateResponse]),
+        )
+
+    @typing_extensions.deprecated("Use list_v1 instead. This endpoint will be removed in the future.")
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: str | Omit = omit,
+        per_page: str | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PipelineListResponse:
+        """[DEPRECATED] List, filter, and paginate pipelines in an account.
+
+        Use the new
+        /pipelines/v1/pipelines endpoint instead.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          page: Specifies which page to retrieve.
+
+          per_page: Specifies the number of pipelines per page.
+
+          search: Specifies the prefix of pipeline name to search.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/pipelines",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    pipeline_list_params.PipelineListParams,
+                ),
+            ),
+            cast_to=PipelineListResponse,
+        )
+
+    @typing_extensions.deprecated("Use delete_v1 instead. This endpoint will be removed in the future.")
+    def delete(
+        self,
+        pipeline_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """[DEPRECATED] Delete a pipeline.
+
+        Use the new /pipelines/v1/pipelines endpoint
+        instead.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          pipeline_name: Defines the name of the pipeline.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not pipeline_name:
+            raise ValueError(f"Expected a non-empty value for `pipeline_name` but received {pipeline_name!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._delete(
+            f"/accounts/{account_id}/pipelines/{pipeline_name}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    def create_v1(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        sql: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PipelineCreateV1Response:
+        """
+        Create a new Pipeline.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          name: Specifies the name of the Pipeline.
+
+          sql: Specifies SQL for the Pipeline processing flow.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/pipelines/v1/pipelines",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "sql": sql,
+                },
+                pipeline_create_v1_params.PipelineCreateV1Params,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PipelineCreateV1Response]._unwrapper,
+            ),
+            cast_to=cast(Type[PipelineCreateV1Response], ResultWrapper[PipelineCreateV1Response]),
+        )
+
+    def delete_v1(
+        self,
+        pipeline_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Delete Pipeline in Account.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          pipeline_id: Specifies the public ID of the pipeline.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not pipeline_id:
+            raise ValueError(f"Expected a non-empty value for `pipeline_id` but received {pipeline_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._delete(
+            f"/accounts/{account_id}/pipelines/v1/pipelines/{pipeline_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    @typing_extensions.deprecated("Use get_v1 instead. This endpoint will be removed in the future.")
+    def get(
+        self,
+        pipeline_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PipelineGetResponse:
+        """[DEPRECATED] Get configuration of a pipeline.
+
+        Use the new
+        /pipelines/v1/pipelines endpoint instead.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          pipeline_name: Defines the name of the pipeline.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not pipeline_name:
+            raise ValueError(f"Expected a non-empty value for `pipeline_name` but received {pipeline_name!r}")
+        return self._get(
+            f"/accounts/{account_id}/pipelines/{pipeline_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PipelineGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PipelineGetResponse], ResultWrapper[PipelineGetResponse]),
+        )
+
+    def get_v1(
+        self,
+        pipeline_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PipelineGetV1Response:
+        """
+        Get Pipelines Details.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          pipeline_id: Specifies the public ID of the pipeline.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not pipeline_id:
+            raise ValueError(f"Expected a non-empty value for `pipeline_id` but received {pipeline_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/pipelines/v1/pipelines/{pipeline_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PipelineGetV1Response]._unwrapper,
+            ),
+            cast_to=cast(Type[PipelineGetV1Response], ResultWrapper[PipelineGetV1Response]),
+        )
+
+    def list_v1(
+        self,
+        *,
+        account_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[PipelineListV1Response]:
+        """
+        List/Filter Pipelines in Account.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/pipelines/v1/pipelines",
+            page=SyncV4PagePaginationArray[PipelineListV1Response],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    pipeline_list_v1_params.PipelineListV1Params,
+                ),
+            ),
+            model=PipelineListV1Response,
+        )
+
+    def validate_sql(
+        self,
+        *,
+        account_id: str,
+        sql: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PipelineValidateSqlResponse:
+        """
+        Validate Arroyo SQL.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          sql: Specifies SQL to validate.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/pipelines/v1/validate_sql",
+            body=maybe_transform({"sql": sql}, pipeline_validate_sql_params.PipelineValidateSqlParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PipelineValidateSqlResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PipelineValidateSqlResponse], ResultWrapper[PipelineValidateSqlResponse]),
+        )
+
+
+class AsyncPipelinesResource(AsyncAPIResource):
+    @cached_property
+    def sinks(self) -> AsyncSinksResource:
+        return AsyncSinksResource(self._client)
+
+    @cached_property
+    def streams(self) -> AsyncStreamsResource:
+        return AsyncStreamsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncPipelinesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncPipelinesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncPipelinesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncPipelinesResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated("Use create_v1 instead. This endpoint will be removed in the future.")
+    async def create(
+        self,
+        *,
+        account_id: str,
+        destination: pipeline_create_params.Destination,
+        name: str,
+        source: Iterable[pipeline_create_params.Source],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PipelineCreateResponse:
+        """[DEPRECATED] Create a new pipeline.
+
+        Use the new /pipelines/v1/pipelines endpoint
+        instead.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          name: Defines the name of the pipeline.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/pipelines",
+            body=await async_maybe_transform(
+                {
+                    "destination": destination,
+                    "name": name,
+                    "source": source,
+                },
+                pipeline_create_params.PipelineCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PipelineCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PipelineCreateResponse], ResultWrapper[PipelineCreateResponse]),
+        )
+
+    @typing_extensions.deprecated("The v1 API does not support updates. This endpoint will be removed in the future.")
+    async def update(
+        self,
+        pipeline_name: str,
+        *,
+        account_id: str,
+        destination: pipeline_update_params.Destination,
+        name: str,
+        source: Iterable[pipeline_update_params.Source],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PipelineUpdateResponse:
+        """[DEPRECATED] Update an existing pipeline.
+
+        Use the new /pipelines/v1/pipelines
+        endpoint instead.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          pipeline_name: Defines the name of the pipeline.
+
+          name: Defines the name of the pipeline.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not pipeline_name:
+            raise ValueError(f"Expected a non-empty value for `pipeline_name` but received {pipeline_name!r}")
+        return await self._put(
+            f"/accounts/{account_id}/pipelines/{pipeline_name}",
+            body=await async_maybe_transform(
+                {
+                    "destination": destination,
+                    "name": name,
+                    "source": source,
+                },
+                pipeline_update_params.PipelineUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PipelineUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PipelineUpdateResponse], ResultWrapper[PipelineUpdateResponse]),
+        )
+
+    @typing_extensions.deprecated("Use list_v1 instead. This endpoint will be removed in the future.")
+    async def list(
+        self,
+        *,
+        account_id: str,
+        page: str | Omit = omit,
+        per_page: str | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PipelineListResponse:
+        """[DEPRECATED] List, filter, and paginate pipelines in an account.
+
+        Use the new
+        /pipelines/v1/pipelines endpoint instead.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          page: Specifies which page to retrieve.
+
+          per_page: Specifies the number of pipelines per page.
+
+          search: Specifies the prefix of pipeline name to search.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/pipelines",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    pipeline_list_params.PipelineListParams,
+                ),
+            ),
+            cast_to=PipelineListResponse,
+        )
+
+    @typing_extensions.deprecated("Use delete_v1 instead. This endpoint will be removed in the future.")
+    async def delete(
+        self,
+        pipeline_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """[DEPRECATED] Delete a pipeline.
+
+        Use the new /pipelines/v1/pipelines endpoint
+        instead.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          pipeline_name: Defines the name of the pipeline.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not pipeline_name:
+            raise ValueError(f"Expected a non-empty value for `pipeline_name` but received {pipeline_name!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._delete(
+            f"/accounts/{account_id}/pipelines/{pipeline_name}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    async def create_v1(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        sql: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PipelineCreateV1Response:
+        """
+        Create a new Pipeline.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          name: Specifies the name of the Pipeline.
+
+          sql: Specifies SQL for the Pipeline processing flow.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/pipelines/v1/pipelines",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "sql": sql,
+                },
+                pipeline_create_v1_params.PipelineCreateV1Params,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PipelineCreateV1Response]._unwrapper,
+            ),
+            cast_to=cast(Type[PipelineCreateV1Response], ResultWrapper[PipelineCreateV1Response]),
+        )
+
+    async def delete_v1(
+        self,
+        pipeline_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Delete Pipeline in Account.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          pipeline_id: Specifies the public ID of the pipeline.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not pipeline_id:
+            raise ValueError(f"Expected a non-empty value for `pipeline_id` but received {pipeline_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._delete(
+            f"/accounts/{account_id}/pipelines/v1/pipelines/{pipeline_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    @typing_extensions.deprecated("Use get_v1 instead. This endpoint will be removed in the future.")
+    async def get(
+        self,
+        pipeline_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PipelineGetResponse:
+        """[DEPRECATED] Get configuration of a pipeline.
+
+        Use the new
+        /pipelines/v1/pipelines endpoint instead.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          pipeline_name: Defines the name of the pipeline.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not pipeline_name:
+            raise ValueError(f"Expected a non-empty value for `pipeline_name` but received {pipeline_name!r}")
+        return await self._get(
+            f"/accounts/{account_id}/pipelines/{pipeline_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PipelineGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PipelineGetResponse], ResultWrapper[PipelineGetResponse]),
+        )
+
+    async def get_v1(
+        self,
+        pipeline_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PipelineGetV1Response:
+        """
+        Get Pipelines Details.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          pipeline_id: Specifies the public ID of the pipeline.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not pipeline_id:
+            raise ValueError(f"Expected a non-empty value for `pipeline_id` but received {pipeline_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/pipelines/v1/pipelines/{pipeline_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PipelineGetV1Response]._unwrapper,
+            ),
+            cast_to=cast(Type[PipelineGetV1Response], ResultWrapper[PipelineGetV1Response]),
+        )
+
+    def list_v1(
+        self,
+        *,
+        account_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[PipelineListV1Response, AsyncV4PagePaginationArray[PipelineListV1Response]]:
+        """
+        List/Filter Pipelines in Account.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/pipelines/v1/pipelines",
+            page=AsyncV4PagePaginationArray[PipelineListV1Response],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    pipeline_list_v1_params.PipelineListV1Params,
+                ),
+            ),
+            model=PipelineListV1Response,
+        )
+
+    async def validate_sql(
+        self,
+        *,
+        account_id: str,
+        sql: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PipelineValidateSqlResponse:
+        """
+        Validate Arroyo SQL.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          sql: Specifies SQL to validate.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/pipelines/v1/validate_sql",
+            body=await async_maybe_transform({"sql": sql}, pipeline_validate_sql_params.PipelineValidateSqlParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PipelineValidateSqlResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PipelineValidateSqlResponse], ResultWrapper[PipelineValidateSqlResponse]),
+        )
+
+
+class PipelinesResourceWithRawResponse:
+    def __init__(self, pipelines: PipelinesResource) -> None:
+        self._pipelines = pipelines
+
+        self.create = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                pipelines.create,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.update = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                pipelines.update,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                pipelines.list,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                pipelines.delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.create_v1 = to_raw_response_wrapper(
+            pipelines.create_v1,
+        )
+        self.delete_v1 = to_raw_response_wrapper(
+            pipelines.delete_v1,
+        )
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                pipelines.get,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.get_v1 = to_raw_response_wrapper(
+            pipelines.get_v1,
+        )
+        self.list_v1 = to_raw_response_wrapper(
+            pipelines.list_v1,
+        )
+        self.validate_sql = to_raw_response_wrapper(
+            pipelines.validate_sql,
+        )
+
+    @cached_property
+    def sinks(self) -> SinksResourceWithRawResponse:
+        return SinksResourceWithRawResponse(self._pipelines.sinks)
+
+    @cached_property
+    def streams(self) -> StreamsResourceWithRawResponse:
+        return StreamsResourceWithRawResponse(self._pipelines.streams)
+
+
+class AsyncPipelinesResourceWithRawResponse:
+    def __init__(self, pipelines: AsyncPipelinesResource) -> None:
+        self._pipelines = pipelines
+
+        self.create = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                pipelines.create,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.update = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                pipelines.update,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                pipelines.list,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                pipelines.delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.create_v1 = async_to_raw_response_wrapper(
+            pipelines.create_v1,
+        )
+        self.delete_v1 = async_to_raw_response_wrapper(
+            pipelines.delete_v1,
+        )
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                pipelines.get,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.get_v1 = async_to_raw_response_wrapper(
+            pipelines.get_v1,
+        )
+        self.list_v1 = async_to_raw_response_wrapper(
+            pipelines.list_v1,
+        )
+        self.validate_sql = async_to_raw_response_wrapper(
+            pipelines.validate_sql,
+        )
+
+    @cached_property
+    def sinks(self) -> AsyncSinksResourceWithRawResponse:
+        return AsyncSinksResourceWithRawResponse(self._pipelines.sinks)
+
+    @cached_property
+    def streams(self) -> AsyncStreamsResourceWithRawResponse:
+        return AsyncStreamsResourceWithRawResponse(self._pipelines.streams)
+
+
+class PipelinesResourceWithStreamingResponse:
+    def __init__(self, pipelines: PipelinesResource) -> None:
+        self._pipelines = pipelines
+
+        self.create = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                pipelines.create,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.update = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                pipelines.update,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                pipelines.list,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                pipelines.delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.create_v1 = to_streamed_response_wrapper(
+            pipelines.create_v1,
+        )
+        self.delete_v1 = to_streamed_response_wrapper(
+            pipelines.delete_v1,
+        )
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                pipelines.get,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.get_v1 = to_streamed_response_wrapper(
+            pipelines.get_v1,
+        )
+        self.list_v1 = to_streamed_response_wrapper(
+            pipelines.list_v1,
+        )
+        self.validate_sql = to_streamed_response_wrapper(
+            pipelines.validate_sql,
+        )
+
+    @cached_property
+    def sinks(self) -> SinksResourceWithStreamingResponse:
+        return SinksResourceWithStreamingResponse(self._pipelines.sinks)
+
+    @cached_property
+    def streams(self) -> StreamsResourceWithStreamingResponse:
+        return StreamsResourceWithStreamingResponse(self._pipelines.streams)
+
+
+class AsyncPipelinesResourceWithStreamingResponse:
+    def __init__(self, pipelines: AsyncPipelinesResource) -> None:
+        self._pipelines = pipelines
+
+        self.create = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                pipelines.create,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.update = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                pipelines.update,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                pipelines.list,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                pipelines.delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.create_v1 = async_to_streamed_response_wrapper(
+            pipelines.create_v1,
+        )
+        self.delete_v1 = async_to_streamed_response_wrapper(
+            pipelines.delete_v1,
+        )
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                pipelines.get,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.get_v1 = async_to_streamed_response_wrapper(
+            pipelines.get_v1,
+        )
+        self.list_v1 = async_to_streamed_response_wrapper(
+            pipelines.list_v1,
+        )
+        self.validate_sql = async_to_streamed_response_wrapper(
+            pipelines.validate_sql,
+        )
+
+    @cached_property
+    def sinks(self) -> AsyncSinksResourceWithStreamingResponse:
+        return AsyncSinksResourceWithStreamingResponse(self._pipelines.sinks)
+
+    @cached_property
+    def streams(self) -> AsyncStreamsResourceWithStreamingResponse:
+        return AsyncStreamsResourceWithStreamingResponse(self._pipelines.streams)
diff --git a/src/cloudflare/resources/pipelines/sinks.py b/src/cloudflare/resources/pipelines/sinks.py
new file mode 100644
index 00000000000..6838c0429f6
--- /dev/null
+++ b/src/cloudflare/resources/pipelines/sinks.py
@@ -0,0 +1,546 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.pipelines import sink_list_params, sink_create_params, sink_delete_params
+from ...types.pipelines.sink_get_response import SinkGetResponse
+from ...types.pipelines.sink_list_response import SinkListResponse
+from ...types.pipelines.sink_create_response import SinkCreateResponse
+
+__all__ = ["SinksResource", "AsyncSinksResource"]
+
+
+class SinksResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SinksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SinksResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SinksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SinksResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        type: Literal["r2", "r2_data_catalog"],
+        config: sink_create_params.Config | Omit = omit,
+        format: sink_create_params.Format | Omit = omit,
+        schema: sink_create_params.Schema | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SinkCreateResponse:
+        """
+        Create a new Sink.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          name: Defines the name of the Sink.
+
+          type: Specifies the type of sink.
+
+          config: Defines the configuration of the R2 Sink.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/pipelines/v1/sinks",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "type": type,
+                    "config": config,
+                    "format": format,
+                    "schema": schema,
+                },
+                sink_create_params.SinkCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SinkCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SinkCreateResponse], ResultWrapper[SinkCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        pipeline_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[SinkListResponse]:
+        """
+        List/Filter Sinks in Account.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/pipelines/v1/sinks",
+            page=SyncV4PagePaginationArray[SinkListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "pipeline_id": pipeline_id,
+                    },
+                    sink_list_params.SinkListParams,
+                ),
+            ),
+            model=SinkListResponse,
+        )
+
+    def delete(
+        self,
+        sink_id: str,
+        *,
+        account_id: str,
+        force: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Delete Pipeline in Account.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          sink_id: Specifies the publid ID of the sink.
+
+          force: Delete sink forcefully, including deleting any dependent pipelines.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sink_id:
+            raise ValueError(f"Expected a non-empty value for `sink_id` but received {sink_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._delete(
+            f"/accounts/{account_id}/pipelines/v1/sinks/{sink_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"force": force}, sink_delete_params.SinkDeleteParams),
+            ),
+            cast_to=NoneType,
+        )
+
+    def get(
+        self,
+        sink_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SinkGetResponse:
+        """
+        Get Sink Details.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          sink_id: Specifies the publid ID of the sink.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sink_id:
+            raise ValueError(f"Expected a non-empty value for `sink_id` but received {sink_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/pipelines/v1/sinks/{sink_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SinkGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SinkGetResponse], ResultWrapper[SinkGetResponse]),
+        )
+
+
+class AsyncSinksResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSinksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSinksResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSinksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSinksResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        type: Literal["r2", "r2_data_catalog"],
+        config: sink_create_params.Config | Omit = omit,
+        format: sink_create_params.Format | Omit = omit,
+        schema: sink_create_params.Schema | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SinkCreateResponse:
+        """
+        Create a new Sink.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          name: Defines the name of the Sink.
+
+          type: Specifies the type of sink.
+
+          config: Defines the configuration of the R2 Sink.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/pipelines/v1/sinks",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "type": type,
+                    "config": config,
+                    "format": format,
+                    "schema": schema,
+                },
+                sink_create_params.SinkCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SinkCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SinkCreateResponse], ResultWrapper[SinkCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        pipeline_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SinkListResponse, AsyncV4PagePaginationArray[SinkListResponse]]:
+        """
+        List/Filter Sinks in Account.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/pipelines/v1/sinks",
+            page=AsyncV4PagePaginationArray[SinkListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "pipeline_id": pipeline_id,
+                    },
+                    sink_list_params.SinkListParams,
+                ),
+            ),
+            model=SinkListResponse,
+        )
+
+    async def delete(
+        self,
+        sink_id: str,
+        *,
+        account_id: str,
+        force: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Delete Pipeline in Account.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          sink_id: Specifies the publid ID of the sink.
+
+          force: Delete sink forcefully, including deleting any dependent pipelines.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sink_id:
+            raise ValueError(f"Expected a non-empty value for `sink_id` but received {sink_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._delete(
+            f"/accounts/{account_id}/pipelines/v1/sinks/{sink_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"force": force}, sink_delete_params.SinkDeleteParams),
+            ),
+            cast_to=NoneType,
+        )
+
+    async def get(
+        self,
+        sink_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SinkGetResponse:
+        """
+        Get Sink Details.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          sink_id: Specifies the publid ID of the sink.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not sink_id:
+            raise ValueError(f"Expected a non-empty value for `sink_id` but received {sink_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/pipelines/v1/sinks/{sink_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SinkGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SinkGetResponse], ResultWrapper[SinkGetResponse]),
+        )
+
+
+class SinksResourceWithRawResponse:
+    def __init__(self, sinks: SinksResource) -> None:
+        self._sinks = sinks
+
+        self.create = to_raw_response_wrapper(
+            sinks.create,
+        )
+        self.list = to_raw_response_wrapper(
+            sinks.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            sinks.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            sinks.get,
+        )
+
+
+class AsyncSinksResourceWithRawResponse:
+    def __init__(self, sinks: AsyncSinksResource) -> None:
+        self._sinks = sinks
+
+        self.create = async_to_raw_response_wrapper(
+            sinks.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            sinks.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            sinks.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            sinks.get,
+        )
+
+
+class SinksResourceWithStreamingResponse:
+    def __init__(self, sinks: SinksResource) -> None:
+        self._sinks = sinks
+
+        self.create = to_streamed_response_wrapper(
+            sinks.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            sinks.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            sinks.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            sinks.get,
+        )
+
+
+class AsyncSinksResourceWithStreamingResponse:
+    def __init__(self, sinks: AsyncSinksResource) -> None:
+        self._sinks = sinks
+
+        self.create = async_to_streamed_response_wrapper(
+            sinks.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            sinks.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            sinks.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            sinks.get,
+        )
diff --git a/src/cloudflare/resources/pipelines/streams.py b/src/cloudflare/resources/pipelines/streams.py
new file mode 100644
index 00000000000..a92ffc2563f
--- /dev/null
+++ b/src/cloudflare/resources/pipelines/streams.py
@@ -0,0 +1,660 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.pipelines import stream_list_params, stream_create_params, stream_delete_params, stream_update_params
+from ...types.pipelines.stream_get_response import StreamGetResponse
+from ...types.pipelines.stream_list_response import StreamListResponse
+from ...types.pipelines.stream_create_response import StreamCreateResponse
+from ...types.pipelines.stream_update_response import StreamUpdateResponse
+
+__all__ = ["StreamsResource", "AsyncStreamsResource"]
+
+
+class StreamsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> StreamsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return StreamsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> StreamsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return StreamsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        format: stream_create_params.Format | Omit = omit,
+        http: stream_create_params.HTTP | Omit = omit,
+        schema: stream_create_params.Schema | Omit = omit,
+        worker_binding: stream_create_params.WorkerBinding | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> StreamCreateResponse:
+        """
+        Create a new Stream.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          name: Specifies the name of the Stream.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/pipelines/v1/streams",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "format": format,
+                    "http": http,
+                    "schema": schema,
+                    "worker_binding": worker_binding,
+                },
+                stream_create_params.StreamCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[StreamCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[StreamCreateResponse], ResultWrapper[StreamCreateResponse]),
+        )
+
+    def update(
+        self,
+        stream_id: str,
+        *,
+        account_id: str,
+        http: stream_update_params.HTTP | Omit = omit,
+        worker_binding: stream_update_params.WorkerBinding | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> StreamUpdateResponse:
+        """
+        Update a Stream.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          stream_id: Specifies the public ID of the stream.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not stream_id:
+            raise ValueError(f"Expected a non-empty value for `stream_id` but received {stream_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/pipelines/v1/streams/{stream_id}",
+            body=maybe_transform(
+                {
+                    "http": http,
+                    "worker_binding": worker_binding,
+                },
+                stream_update_params.StreamUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[StreamUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[StreamUpdateResponse], ResultWrapper[StreamUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        pipeline_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[StreamListResponse]:
+        """
+        List/Filter Streams in Account.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          pipeline_id: Specifies the public ID of the pipeline.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/pipelines/v1/streams",
+            page=SyncV4PagePaginationArray[StreamListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "pipeline_id": pipeline_id,
+                    },
+                    stream_list_params.StreamListParams,
+                ),
+            ),
+            model=StreamListResponse,
+        )
+
+    def delete(
+        self,
+        stream_id: str,
+        *,
+        account_id: str,
+        force: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Delete Stream in Account.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          stream_id: Specifies the public ID of the stream.
+
+          force: Delete stream forcefully, including deleting any dependent pipelines.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not stream_id:
+            raise ValueError(f"Expected a non-empty value for `stream_id` but received {stream_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._delete(
+            f"/accounts/{account_id}/pipelines/v1/streams/{stream_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"force": force}, stream_delete_params.StreamDeleteParams),
+            ),
+            cast_to=NoneType,
+        )
+
+    def get(
+        self,
+        stream_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> StreamGetResponse:
+        """
+        Get Stream Details.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          stream_id: Specifies the public ID of the stream.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not stream_id:
+            raise ValueError(f"Expected a non-empty value for `stream_id` but received {stream_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/pipelines/v1/streams/{stream_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[StreamGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[StreamGetResponse], ResultWrapper[StreamGetResponse]),
+        )
+
+
+class AsyncStreamsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncStreamsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncStreamsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncStreamsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncStreamsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        format: stream_create_params.Format | Omit = omit,
+        http: stream_create_params.HTTP | Omit = omit,
+        schema: stream_create_params.Schema | Omit = omit,
+        worker_binding: stream_create_params.WorkerBinding | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> StreamCreateResponse:
+        """
+        Create a new Stream.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          name: Specifies the name of the Stream.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/pipelines/v1/streams",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "format": format,
+                    "http": http,
+                    "schema": schema,
+                    "worker_binding": worker_binding,
+                },
+                stream_create_params.StreamCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[StreamCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[StreamCreateResponse], ResultWrapper[StreamCreateResponse]),
+        )
+
+    async def update(
+        self,
+        stream_id: str,
+        *,
+        account_id: str,
+        http: stream_update_params.HTTP | Omit = omit,
+        worker_binding: stream_update_params.WorkerBinding | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> StreamUpdateResponse:
+        """
+        Update a Stream.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          stream_id: Specifies the public ID of the stream.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not stream_id:
+            raise ValueError(f"Expected a non-empty value for `stream_id` but received {stream_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/pipelines/v1/streams/{stream_id}",
+            body=await async_maybe_transform(
+                {
+                    "http": http,
+                    "worker_binding": worker_binding,
+                },
+                stream_update_params.StreamUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[StreamUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[StreamUpdateResponse], ResultWrapper[StreamUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        pipeline_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[StreamListResponse, AsyncV4PagePaginationArray[StreamListResponse]]:
+        """
+        List/Filter Streams in Account.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          pipeline_id: Specifies the public ID of the pipeline.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/pipelines/v1/streams",
+            page=AsyncV4PagePaginationArray[StreamListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "pipeline_id": pipeline_id,
+                    },
+                    stream_list_params.StreamListParams,
+                ),
+            ),
+            model=StreamListResponse,
+        )
+
+    async def delete(
+        self,
+        stream_id: str,
+        *,
+        account_id: str,
+        force: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Delete Stream in Account.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          stream_id: Specifies the public ID of the stream.
+
+          force: Delete stream forcefully, including deleting any dependent pipelines.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not stream_id:
+            raise ValueError(f"Expected a non-empty value for `stream_id` but received {stream_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._delete(
+            f"/accounts/{account_id}/pipelines/v1/streams/{stream_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"force": force}, stream_delete_params.StreamDeleteParams),
+            ),
+            cast_to=NoneType,
+        )
+
+    async def get(
+        self,
+        stream_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> StreamGetResponse:
+        """
+        Get Stream Details.
+
+        Args:
+          account_id: Specifies the public ID of the account.
+
+          stream_id: Specifies the public ID of the stream.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not stream_id:
+            raise ValueError(f"Expected a non-empty value for `stream_id` but received {stream_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/pipelines/v1/streams/{stream_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[StreamGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[StreamGetResponse], ResultWrapper[StreamGetResponse]),
+        )
+
+
+class StreamsResourceWithRawResponse:
+    def __init__(self, streams: StreamsResource) -> None:
+        self._streams = streams
+
+        self.create = to_raw_response_wrapper(
+            streams.create,
+        )
+        self.update = to_raw_response_wrapper(
+            streams.update,
+        )
+        self.list = to_raw_response_wrapper(
+            streams.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            streams.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            streams.get,
+        )
+
+
+class AsyncStreamsResourceWithRawResponse:
+    def __init__(self, streams: AsyncStreamsResource) -> None:
+        self._streams = streams
+
+        self.create = async_to_raw_response_wrapper(
+            streams.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            streams.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            streams.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            streams.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            streams.get,
+        )
+
+
+class StreamsResourceWithStreamingResponse:
+    def __init__(self, streams: StreamsResource) -> None:
+        self._streams = streams
+
+        self.create = to_streamed_response_wrapper(
+            streams.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            streams.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            streams.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            streams.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            streams.get,
+        )
+
+
+class AsyncStreamsResourceWithStreamingResponse:
+    def __init__(self, streams: AsyncStreamsResource) -> None:
+        self._streams = streams
+
+        self.create = async_to_streamed_response_wrapper(
+            streams.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            streams.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            streams.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            streams.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            streams.get,
+        )
diff --git a/src/cloudflare/resources/queues/__init__.py b/src/cloudflare/resources/queues/__init__.py
index 27d187759fa..145d49439c4 100644
--- a/src/cloudflare/resources/queues/__init__.py
+++ b/src/cloudflare/resources/queues/__init__.py
@@ -1,5 +1,13 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from .purge import (
+    PurgeResource,
+    AsyncPurgeResource,
+    PurgeResourceWithRawResponse,
+    AsyncPurgeResourceWithRawResponse,
+    PurgeResourceWithStreamingResponse,
+    AsyncPurgeResourceWithStreamingResponse,
+)
 from .queues import (
     QueuesResource,
     AsyncQueuesResource,
@@ -24,20 +32,40 @@
     ConsumersResourceWithStreamingResponse,
     AsyncConsumersResourceWithStreamingResponse,
 )
+from .subscriptions import (
+    SubscriptionsResource,
+    AsyncSubscriptionsResource,
+    SubscriptionsResourceWithRawResponse,
+    AsyncSubscriptionsResourceWithRawResponse,
+    SubscriptionsResourceWithStreamingResponse,
+    AsyncSubscriptionsResourceWithStreamingResponse,
+)
 
 __all__ = [
-    "ConsumersResource",
-    "AsyncConsumersResource",
-    "ConsumersResourceWithRawResponse",
-    "AsyncConsumersResourceWithRawResponse",
-    "ConsumersResourceWithStreamingResponse",
-    "AsyncConsumersResourceWithStreamingResponse",
     "MessagesResource",
     "AsyncMessagesResource",
     "MessagesResourceWithRawResponse",
     "AsyncMessagesResourceWithRawResponse",
     "MessagesResourceWithStreamingResponse",
     "AsyncMessagesResourceWithStreamingResponse",
+    "PurgeResource",
+    "AsyncPurgeResource",
+    "PurgeResourceWithRawResponse",
+    "AsyncPurgeResourceWithRawResponse",
+    "PurgeResourceWithStreamingResponse",
+    "AsyncPurgeResourceWithStreamingResponse",
+    "ConsumersResource",
+    "AsyncConsumersResource",
+    "ConsumersResourceWithRawResponse",
+    "AsyncConsumersResourceWithRawResponse",
+    "ConsumersResourceWithStreamingResponse",
+    "AsyncConsumersResourceWithStreamingResponse",
+    "SubscriptionsResource",
+    "AsyncSubscriptionsResource",
+    "SubscriptionsResourceWithRawResponse",
+    "AsyncSubscriptionsResourceWithRawResponse",
+    "SubscriptionsResourceWithStreamingResponse",
+    "AsyncSubscriptionsResourceWithStreamingResponse",
     "QueuesResource",
     "AsyncQueuesResource",
     "QueuesResourceWithRawResponse",
diff --git a/src/cloudflare/resources/queues/consumers.py b/src/cloudflare/resources/queues/consumers.py
index 62500828562..3d1a696af75 100644
--- a/src/cloudflare/resources/queues/consumers.py
+++ b/src/cloudflare/resources/queues/consumers.py
@@ -2,15 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Optional, cast
+from typing import Any, Optional, cast
+from typing_extensions import Literal, overload
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -20,12 +18,11 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
 from ...types.queues import consumer_create_params, consumer_update_params
-from ...types.queues.consumer_get_response import ConsumerGetResponse
-from ...types.queues.consumer_create_response import ConsumerCreateResponse
+from ...types.queues.consumer import Consumer
 from ...types.queues.consumer_delete_response import ConsumerDeleteResponse
-from ...types.queues.consumer_update_response import ConsumerUpdateResponse
 
 __all__ = ["ConsumersResource", "AsyncConsumersResource"]
 
@@ -33,32 +30,83 @@
 class ConsumersResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ConsumersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ConsumersResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ConsumersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ConsumersResourceWithStreamingResponse(self)
 
+    @overload
+    def create(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        dead_letter_queue: str | Omit = omit,
+        script_name: str | Omit = omit,
+        settings: consumer_create_params.MqWorkerConsumerSettings | Omit = omit,
+        type: Literal["worker"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Consumer]:
+        """
+        Creates a new consumer for a Queue
+
+        Args:
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
+
+          script_name: Name of a Worker
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
     def create(
         self,
         queue_id: str,
         *,
         account_id: str,
-        body: object,
+        dead_letter_queue: str | Omit = omit,
+        settings: consumer_create_params.MqHTTPConsumerSettings | Omit = omit,
+        type: Literal["http_pull"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ConsumerCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Consumer]:
         """
-        Creates a new consumer for a queue.
+        Creates a new consumer for a Queue
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
-          queue_id: Identifier
+          queue_id: A Resource identifier.
 
           extra_headers: Send extra headers
 
@@ -68,46 +116,86 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        ...
+
+    @required_args(["account_id"])
+    def create(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        dead_letter_queue: str | Omit = omit,
+        script_name: str | Omit = omit,
+        settings: consumer_create_params.MqWorkerConsumerSettings
+        | consumer_create_params.MqHTTPConsumerSettings
+        | Omit = omit,
+        type: Literal["worker"] | Literal["http_pull"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Consumer]:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not queue_id:
             raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
-        return self._post(
-            f"/accounts/{account_id}/queues/{queue_id}/consumers",
-            body=maybe_transform(body, consumer_create_params.ConsumerCreateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ConsumerCreateResponse]]._unwrapper,
+        return cast(
+            Optional[Consumer],
+            self._post(
+                f"/accounts/{account_id}/queues/{queue_id}/consumers",
+                body=maybe_transform(
+                    {
+                        "dead_letter_queue": dead_letter_queue,
+                        "script_name": script_name,
+                        "settings": settings,
+                        "type": type,
+                    },
+                    consumer_create_params.ConsumerCreateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[Consumer]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[Consumer]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[ConsumerCreateResponse]], ResultWrapper[ConsumerCreateResponse]),
         )
 
+    @overload
     def update(
         self,
         consumer_id: str,
         *,
         account_id: str,
         queue_id: str,
-        body: object,
+        dead_letter_queue: str | Omit = omit,
+        script_name: str | Omit = omit,
+        settings: consumer_update_params.MqWorkerConsumerSettings | Omit = omit,
+        type: Literal["worker"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ConsumerUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Consumer]:
         """
         Updates the consumer for a queue, or creates one if it does not exist.
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
 
-          queue_id: Identifier
+          consumer_id: A Resource identifier.
 
-          consumer_id: Identifier
+          script_name: Name of a Worker
 
           extra_headers: Send extra headers
 
@@ -117,47 +205,34 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not queue_id:
-            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
-        if not consumer_id:
-            raise ValueError(f"Expected a non-empty value for `consumer_id` but received {consumer_id!r}")
-        return self._put(
-            f"/accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}",
-            body=maybe_transform(body, consumer_update_params.ConsumerUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ConsumerUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ConsumerUpdateResponse]], ResultWrapper[ConsumerUpdateResponse]),
-        )
+        ...
 
-    def delete(
+    @overload
+    def update(
         self,
         consumer_id: str,
         *,
         account_id: str,
         queue_id: str,
+        dead_letter_queue: str | Omit = omit,
+        settings: consumer_update_params.MqHTTPConsumerSettings | Omit = omit,
+        type: Literal["http_pull"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ConsumerDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Consumer]:
         """
-        Deletes the consumer for a queue.
+        Updates the consumer for a queue, or creates one if it does not exist.
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
-          queue_id: Identifier
+          queue_id: A Resource identifier.
 
-          consumer_id: Identifier
+          consumer_id: A Resource identifier.
 
           extra_headers: Send extra headers
 
@@ -167,6 +242,28 @@ def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        ...
+
+    @required_args(["account_id", "queue_id"])
+    def update(
+        self,
+        consumer_id: str,
+        *,
+        account_id: str,
+        queue_id: str,
+        dead_letter_queue: str | Omit = omit,
+        script_name: str | Omit = omit,
+        settings: consumer_update_params.MqWorkerConsumerSettings
+        | consumer_update_params.MqHTTPConsumerSettings
+        | Omit = omit,
+        type: Literal["worker"] | Literal["http_pull"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Consumer]:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not queue_id:
@@ -174,23 +271,32 @@ def delete(
         if not consumer_id:
             raise ValueError(f"Expected a non-empty value for `consumer_id` but received {consumer_id!r}")
         return cast(
-            Optional[ConsumerDeleteResponse],
-            self._delete(
+            Optional[Consumer],
+            self._put(
                 f"/accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}",
+                body=maybe_transform(
+                    {
+                        "dead_letter_queue": dead_letter_queue,
+                        "script_name": script_name,
+                        "settings": settings,
+                        "type": type,
+                    },
+                    consumer_update_params.ConsumerUpdateParams,
+                ),
                 options=make_request_options(
                     extra_headers=extra_headers,
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[Optional[ConsumerDeleteResponse]]._unwrapper,
+                    post_parser=ResultWrapper[Optional[Consumer]]._unwrapper,
                 ),
                 cast_to=cast(
-                    Any, ResultWrapper[ConsumerDeleteResponse]
+                    Any, ResultWrapper[Consumer]
                 ),  # Union types cannot be passed in as arguments in the type system
             ),
         )
 
-    def get(
+    def list(
         self,
         queue_id: str,
         *,
@@ -200,15 +306,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ConsumerGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[Consumer]:
         """
-        Returns the consumers for a queue.
+        Returns the consumers for a Queue
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
-          queue_id: Identifier
+          queue_id: A Resource identifier.
 
           extra_headers: Send extra headers
 
@@ -222,48 +328,195 @@ def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not queue_id:
             raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/queues/{queue_id}/consumers",
+            page=SyncSinglePage[Consumer],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ConsumerGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, Consumer),  # Union types cannot be passed in as arguments in the type system
+        )
+
+    def delete(
+        self,
+        consumer_id: str,
+        *,
+        account_id: str,
+        queue_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ConsumerDeleteResponse:
+        """
+        Deletes the consumer for a queue.
+
+        Args:
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
+
+          consumer_id: A Resource identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        if not consumer_id:
+            raise ValueError(f"Expected a non-empty value for `consumer_id` but received {consumer_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ConsumerDeleteResponse,
+        )
+
+    def get(
+        self,
+        consumer_id: str,
+        *,
+        account_id: str,
+        queue_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Consumer]:
+        """
+        Fetches the consumer for a queue by consumer id
+
+        Args:
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
+
+          consumer_id: A Resource identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        if not consumer_id:
+            raise ValueError(f"Expected a non-empty value for `consumer_id` but received {consumer_id!r}")
+        return cast(
+            Optional[Consumer],
+            self._get(
+                f"/accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[Consumer]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[Consumer]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[ConsumerGetResponse]], ResultWrapper[ConsumerGetResponse]),
         )
 
 
 class AsyncConsumersResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncConsumersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncConsumersResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncConsumersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncConsumersResourceWithStreamingResponse(self)
 
+    @overload
+    async def create(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        dead_letter_queue: str | Omit = omit,
+        script_name: str | Omit = omit,
+        settings: consumer_create_params.MqWorkerConsumerSettings | Omit = omit,
+        type: Literal["worker"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Consumer]:
+        """
+        Creates a new consumer for a Queue
+
+        Args:
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
+
+          script_name: Name of a Worker
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
     async def create(
         self,
         queue_id: str,
         *,
         account_id: str,
-        body: object,
+        dead_letter_queue: str | Omit = omit,
+        settings: consumer_create_params.MqHTTPConsumerSettings | Omit = omit,
+        type: Literal["http_pull"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ConsumerCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Consumer]:
         """
-        Creates a new consumer for a queue.
+        Creates a new consumer for a Queue
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
-          queue_id: Identifier
+          queue_id: A Resource identifier.
 
           extra_headers: Send extra headers
 
@@ -273,46 +526,86 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        ...
+
+    @required_args(["account_id"])
+    async def create(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        dead_letter_queue: str | Omit = omit,
+        script_name: str | Omit = omit,
+        settings: consumer_create_params.MqWorkerConsumerSettings
+        | consumer_create_params.MqHTTPConsumerSettings
+        | Omit = omit,
+        type: Literal["worker"] | Literal["http_pull"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Consumer]:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not queue_id:
             raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
-        return await self._post(
-            f"/accounts/{account_id}/queues/{queue_id}/consumers",
-            body=await async_maybe_transform(body, consumer_create_params.ConsumerCreateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ConsumerCreateResponse]]._unwrapper,
+        return cast(
+            Optional[Consumer],
+            await self._post(
+                f"/accounts/{account_id}/queues/{queue_id}/consumers",
+                body=await async_maybe_transform(
+                    {
+                        "dead_letter_queue": dead_letter_queue,
+                        "script_name": script_name,
+                        "settings": settings,
+                        "type": type,
+                    },
+                    consumer_create_params.ConsumerCreateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[Consumer]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[Consumer]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[ConsumerCreateResponse]], ResultWrapper[ConsumerCreateResponse]),
         )
 
+    @overload
     async def update(
         self,
         consumer_id: str,
         *,
         account_id: str,
         queue_id: str,
-        body: object,
+        dead_letter_queue: str | Omit = omit,
+        script_name: str | Omit = omit,
+        settings: consumer_update_params.MqWorkerConsumerSettings | Omit = omit,
+        type: Literal["worker"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ConsumerUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Consumer]:
         """
         Updates the consumer for a queue, or creates one if it does not exist.
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
 
-          queue_id: Identifier
+          consumer_id: A Resource identifier.
 
-          consumer_id: Identifier
+          script_name: Name of a Worker
 
           extra_headers: Send extra headers
 
@@ -322,47 +615,34 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not queue_id:
-            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
-        if not consumer_id:
-            raise ValueError(f"Expected a non-empty value for `consumer_id` but received {consumer_id!r}")
-        return await self._put(
-            f"/accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}",
-            body=await async_maybe_transform(body, consumer_update_params.ConsumerUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ConsumerUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ConsumerUpdateResponse]], ResultWrapper[ConsumerUpdateResponse]),
-        )
+        ...
 
-    async def delete(
+    @overload
+    async def update(
         self,
         consumer_id: str,
         *,
         account_id: str,
         queue_id: str,
+        dead_letter_queue: str | Omit = omit,
+        settings: consumer_update_params.MqHTTPConsumerSettings | Omit = omit,
+        type: Literal["http_pull"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ConsumerDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Consumer]:
         """
-        Deletes the consumer for a queue.
+        Updates the consumer for a queue, or creates one if it does not exist.
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
-          queue_id: Identifier
+          queue_id: A Resource identifier.
 
-          consumer_id: Identifier
+          consumer_id: A Resource identifier.
 
           extra_headers: Send extra headers
 
@@ -372,6 +652,28 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        ...
+
+    @required_args(["account_id", "queue_id"])
+    async def update(
+        self,
+        consumer_id: str,
+        *,
+        account_id: str,
+        queue_id: str,
+        dead_letter_queue: str | Omit = omit,
+        script_name: str | Omit = omit,
+        settings: consumer_update_params.MqWorkerConsumerSettings
+        | consumer_update_params.MqHTTPConsumerSettings
+        | Omit = omit,
+        type: Literal["worker"] | Literal["http_pull"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Consumer]:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not queue_id:
@@ -379,23 +681,32 @@ async def delete(
         if not consumer_id:
             raise ValueError(f"Expected a non-empty value for `consumer_id` but received {consumer_id!r}")
         return cast(
-            Optional[ConsumerDeleteResponse],
-            await self._delete(
+            Optional[Consumer],
+            await self._put(
                 f"/accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}",
+                body=await async_maybe_transform(
+                    {
+                        "dead_letter_queue": dead_letter_queue,
+                        "script_name": script_name,
+                        "settings": settings,
+                        "type": type,
+                    },
+                    consumer_update_params.ConsumerUpdateParams,
+                ),
                 options=make_request_options(
                     extra_headers=extra_headers,
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[Optional[ConsumerDeleteResponse]]._unwrapper,
+                    post_parser=ResultWrapper[Optional[Consumer]]._unwrapper,
                 ),
                 cast_to=cast(
-                    Any, ResultWrapper[ConsumerDeleteResponse]
+                    Any, ResultWrapper[Consumer]
                 ),  # Union types cannot be passed in as arguments in the type system
             ),
         )
 
-    async def get(
+    def list(
         self,
         queue_id: str,
         *,
@@ -405,15 +716,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ConsumerGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Consumer, AsyncSinglePage[Consumer]]:
         """
-        Returns the consumers for a queue.
+        Returns the consumers for a Queue
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
-          queue_id: Identifier
+          queue_id: A Resource identifier.
 
           extra_headers: Send extra headers
 
@@ -427,16 +738,112 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not queue_id:
             raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/queues/{queue_id}/consumers",
+            page=AsyncSinglePage[Consumer],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, Consumer),  # Union types cannot be passed in as arguments in the type system
+        )
+
+    async def delete(
+        self,
+        consumer_id: str,
+        *,
+        account_id: str,
+        queue_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ConsumerDeleteResponse:
+        """
+        Deletes the consumer for a queue.
+
+        Args:
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
+
+          consumer_id: A Resource identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        if not consumer_id:
+            raise ValueError(f"Expected a non-empty value for `consumer_id` but received {consumer_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ConsumerGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ConsumerDeleteResponse,
+        )
+
+    async def get(
+        self,
+        consumer_id: str,
+        *,
+        account_id: str,
+        queue_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Consumer]:
+        """
+        Fetches the consumer for a queue by consumer id
+
+        Args:
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
+
+          consumer_id: A Resource identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        if not consumer_id:
+            raise ValueError(f"Expected a non-empty value for `consumer_id` but received {consumer_id!r}")
+        return cast(
+            Optional[Consumer],
+            await self._get(
+                f"/accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[Consumer]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[Consumer]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[ConsumerGetResponse]], ResultWrapper[ConsumerGetResponse]),
         )
 
 
@@ -450,6 +857,9 @@ def __init__(self, consumers: ConsumersResource) -> None:
         self.update = to_raw_response_wrapper(
             consumers.update,
         )
+        self.list = to_raw_response_wrapper(
+            consumers.list,
+        )
         self.delete = to_raw_response_wrapper(
             consumers.delete,
         )
@@ -468,6 +878,9 @@ def __init__(self, consumers: AsyncConsumersResource) -> None:
         self.update = async_to_raw_response_wrapper(
             consumers.update,
         )
+        self.list = async_to_raw_response_wrapper(
+            consumers.list,
+        )
         self.delete = async_to_raw_response_wrapper(
             consumers.delete,
         )
@@ -486,6 +899,9 @@ def __init__(self, consumers: ConsumersResource) -> None:
         self.update = to_streamed_response_wrapper(
             consumers.update,
         )
+        self.list = to_streamed_response_wrapper(
+            consumers.list,
+        )
         self.delete = to_streamed_response_wrapper(
             consumers.delete,
         )
@@ -504,6 +920,9 @@ def __init__(self, consumers: AsyncConsumersResource) -> None:
         self.update = async_to_streamed_response_wrapper(
             consumers.update,
         )
+        self.list = async_to_streamed_response_wrapper(
+            consumers.list,
+        )
         self.delete = async_to_streamed_response_wrapper(
             consumers.delete,
         )
diff --git a/src/cloudflare/resources/queues/messages.py b/src/cloudflare/resources/queues/messages.py
index 61a6e360ed3..9148e296028 100644
--- a/src/cloudflare/resources/queues/messages.py
+++ b/src/cloudflare/resources/queues/messages.py
@@ -3,14 +3,12 @@
 from __future__ import annotations
 
 from typing import Type, Iterable, Optional, cast
+from typing_extensions import Literal, overload
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -21,9 +19,11 @@
 )
 from ..._wrappers import ResultWrapper
 from ..._base_client import make_request_options
-from ...types.queues import message_ack_params, message_pull_params
+from ...types.queues import message_ack_params, message_pull_params, message_push_params, message_bulk_push_params
 from ...types.queues.message_ack_response import MessageAckResponse
 from ...types.queues.message_pull_response import MessagePullResponse
+from ...types.queues.message_push_response import MessagePushResponse
+from ...types.queues.message_bulk_push_response import MessageBulkPushResponse
 
 __all__ = ["MessagesResource", "AsyncMessagesResource"]
 
@@ -31,10 +31,21 @@
 class MessagesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> MessagesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return MessagesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> MessagesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return MessagesResourceWithStreamingResponse(self)
 
     def ack(
@@ -42,22 +53,22 @@ def ack(
         queue_id: str,
         *,
         account_id: str,
-        acks: Iterable[message_ack_params.Ack] | NotGiven = NOT_GIVEN,
-        retries: Iterable[message_ack_params.Retry] | NotGiven = NOT_GIVEN,
+        acks: Iterable[message_ack_params.Ack] | Omit = omit,
+        retries: Iterable[message_ack_params.Retry] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MessageAckResponse]:
         """
-        Acknowledge + Retry messages from a Queue.
+        Acknowledge + Retry messages from a Queue
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
-          queue_id: Identifier
+          queue_id: A Resource identifier.
 
           extra_headers: Send extra headers
 
@@ -90,29 +101,80 @@ def ack(
             cast_to=cast(Type[Optional[MessageAckResponse]], ResultWrapper[MessageAckResponse]),
         )
 
+    def bulk_push(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        delay_seconds: float | Omit = omit,
+        messages: Iterable[message_bulk_push_params.Message] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MessageBulkPushResponse:
+        """
+        Push a batch of message to a Queue
+
+        Args:
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
+
+          delay_seconds: The number of seconds to wait for attempting to deliver this batch to consumers
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/queues/{queue_id}/messages/batch",
+            body=maybe_transform(
+                {
+                    "delay_seconds": delay_seconds,
+                    "messages": messages,
+                },
+                message_bulk_push_params.MessageBulkPushParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MessageBulkPushResponse,
+        )
+
     def pull(
         self,
         queue_id: str,
         *,
         account_id: str,
-        batch_size: float | NotGiven = NOT_GIVEN,
-        visibility_timeout_ms: float | NotGiven = NOT_GIVEN,
+        batch_size: float | Omit = omit,
+        visibility_timeout_ms: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MessagePullResponse]:
         """
-        Pull a batch of messages from a Queue.
+        Pull a batch of messages from a Queue
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
-          queue_id: Identifier
+          queue_id: A Resource identifier.
 
-          batch_size: The maximum number of messages to include in a batch
+          batch_size: The maximum number of messages to include in a batch.
 
           visibility_timeout_ms: The number of milliseconds that a message is exclusively leased. After the
               timeout, the message becomes available for another attempt.
@@ -148,14 +210,135 @@ def pull(
             cast_to=cast(Type[Optional[MessagePullResponse]], ResultWrapper[MessagePullResponse]),
         )
 
+    @overload
+    def push(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        body: str | Omit = omit,
+        content_type: Literal["text"] | Omit = omit,
+        delay_seconds: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MessagePushResponse:
+        """
+        Push a message to a Queue
+
+        Args:
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
+
+          delay_seconds: The number of seconds to wait for attempting to deliver this message to
+              consumers
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def push(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        body: object | Omit = omit,
+        content_type: Literal["json"] | Omit = omit,
+        delay_seconds: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MessagePushResponse:
+        """
+        Push a message to a Queue
+
+        Args:
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
+
+          delay_seconds: The number of seconds to wait for attempting to deliver this message to
+              consumers
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id"])
+    def push(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        body: str | object | Omit = omit,
+        content_type: Literal["text"] | Literal["json"] | Omit = omit,
+        delay_seconds: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MessagePushResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/queues/{queue_id}/messages",
+            body=maybe_transform(
+                {
+                    "body": body,
+                    "content_type": content_type,
+                    "delay_seconds": delay_seconds,
+                },
+                message_push_params.MessagePushParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MessagePushResponse,
+        )
+
 
 class AsyncMessagesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncMessagesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncMessagesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncMessagesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncMessagesResourceWithStreamingResponse(self)
 
     async def ack(
@@ -163,22 +346,22 @@ async def ack(
         queue_id: str,
         *,
         account_id: str,
-        acks: Iterable[message_ack_params.Ack] | NotGiven = NOT_GIVEN,
-        retries: Iterable[message_ack_params.Retry] | NotGiven = NOT_GIVEN,
+        acks: Iterable[message_ack_params.Ack] | Omit = omit,
+        retries: Iterable[message_ack_params.Retry] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MessageAckResponse]:
         """
-        Acknowledge + Retry messages from a Queue.
+        Acknowledge + Retry messages from a Queue
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
-          queue_id: Identifier
+          queue_id: A Resource identifier.
 
           extra_headers: Send extra headers
 
@@ -211,29 +394,80 @@ async def ack(
             cast_to=cast(Type[Optional[MessageAckResponse]], ResultWrapper[MessageAckResponse]),
         )
 
+    async def bulk_push(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        delay_seconds: float | Omit = omit,
+        messages: Iterable[message_bulk_push_params.Message] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MessageBulkPushResponse:
+        """
+        Push a batch of message to a Queue
+
+        Args:
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
+
+          delay_seconds: The number of seconds to wait for attempting to deliver this batch to consumers
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/queues/{queue_id}/messages/batch",
+            body=await async_maybe_transform(
+                {
+                    "delay_seconds": delay_seconds,
+                    "messages": messages,
+                },
+                message_bulk_push_params.MessageBulkPushParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MessageBulkPushResponse,
+        )
+
     async def pull(
         self,
         queue_id: str,
         *,
         account_id: str,
-        batch_size: float | NotGiven = NOT_GIVEN,
-        visibility_timeout_ms: float | NotGiven = NOT_GIVEN,
+        batch_size: float | Omit = omit,
+        visibility_timeout_ms: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[MessagePullResponse]:
         """
-        Pull a batch of messages from a Queue.
+        Pull a batch of messages from a Queue
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
-          queue_id: Identifier
+          queue_id: A Resource identifier.
 
-          batch_size: The maximum number of messages to include in a batch
+          batch_size: The maximum number of messages to include in a batch.
 
           visibility_timeout_ms: The number of milliseconds that a message is exclusively leased. After the
               timeout, the message becomes available for another attempt.
@@ -269,6 +503,116 @@ async def pull(
             cast_to=cast(Type[Optional[MessagePullResponse]], ResultWrapper[MessagePullResponse]),
         )
 
+    @overload
+    async def push(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        body: str | Omit = omit,
+        content_type: Literal["text"] | Omit = omit,
+        delay_seconds: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MessagePushResponse:
+        """
+        Push a message to a Queue
+
+        Args:
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
+
+          delay_seconds: The number of seconds to wait for attempting to deliver this message to
+              consumers
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def push(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        body: object | Omit = omit,
+        content_type: Literal["json"] | Omit = omit,
+        delay_seconds: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MessagePushResponse:
+        """
+        Push a message to a Queue
+
+        Args:
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
+
+          delay_seconds: The number of seconds to wait for attempting to deliver this message to
+              consumers
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id"])
+    async def push(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        body: str | object | Omit = omit,
+        content_type: Literal["text"] | Literal["json"] | Omit = omit,
+        delay_seconds: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MessagePushResponse:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/queues/{queue_id}/messages",
+            body=await async_maybe_transform(
+                {
+                    "body": body,
+                    "content_type": content_type,
+                    "delay_seconds": delay_seconds,
+                },
+                message_push_params.MessagePushParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MessagePushResponse,
+        )
+
 
 class MessagesResourceWithRawResponse:
     def __init__(self, messages: MessagesResource) -> None:
@@ -277,9 +621,15 @@ def __init__(self, messages: MessagesResource) -> None:
         self.ack = to_raw_response_wrapper(
             messages.ack,
         )
+        self.bulk_push = to_raw_response_wrapper(
+            messages.bulk_push,
+        )
         self.pull = to_raw_response_wrapper(
             messages.pull,
         )
+        self.push = to_raw_response_wrapper(
+            messages.push,
+        )
 
 
 class AsyncMessagesResourceWithRawResponse:
@@ -289,9 +639,15 @@ def __init__(self, messages: AsyncMessagesResource) -> None:
         self.ack = async_to_raw_response_wrapper(
             messages.ack,
         )
+        self.bulk_push = async_to_raw_response_wrapper(
+            messages.bulk_push,
+        )
         self.pull = async_to_raw_response_wrapper(
             messages.pull,
         )
+        self.push = async_to_raw_response_wrapper(
+            messages.push,
+        )
 
 
 class MessagesResourceWithStreamingResponse:
@@ -301,9 +657,15 @@ def __init__(self, messages: MessagesResource) -> None:
         self.ack = to_streamed_response_wrapper(
             messages.ack,
         )
+        self.bulk_push = to_streamed_response_wrapper(
+            messages.bulk_push,
+        )
         self.pull = to_streamed_response_wrapper(
             messages.pull,
         )
+        self.push = to_streamed_response_wrapper(
+            messages.push,
+        )
 
 
 class AsyncMessagesResourceWithStreamingResponse:
@@ -313,6 +675,12 @@ def __init__(self, messages: AsyncMessagesResource) -> None:
         self.ack = async_to_streamed_response_wrapper(
             messages.ack,
         )
+        self.bulk_push = async_to_streamed_response_wrapper(
+            messages.bulk_push,
+        )
         self.pull = async_to_streamed_response_wrapper(
             messages.pull,
         )
+        self.push = async_to_streamed_response_wrapper(
+            messages.push,
+        )
diff --git a/src/cloudflare/resources/queues/purge.py b/src/cloudflare/resources/queues/purge.py
new file mode 100644
index 00000000000..01b13589546
--- /dev/null
+++ b/src/cloudflare/resources/queues/purge.py
@@ -0,0 +1,303 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.queues import purge_start_params
+from ...types.queues.queue import Queue
+from ...types.queues.purge_status_response import PurgeStatusResponse
+
+__all__ = ["PurgeResource", "AsyncPurgeResource"]
+
+
+class PurgeResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> PurgeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return PurgeResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> PurgeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return PurgeResourceWithStreamingResponse(self)
+
+    def start(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        delete_messages_permanently: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Queue]:
+        """
+        Deletes all messages from the Queue.
+
+        Args:
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
+
+          delete_messages_permanently: Confimation that all messages will be deleted permanently.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/queues/{queue_id}/purge",
+            body=maybe_transform(
+                {"delete_messages_permanently": delete_messages_permanently}, purge_start_params.PurgeStartParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Queue]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Queue]], ResultWrapper[Queue]),
+        )
+
+    def status(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PurgeStatusResponse]:
+        """
+        Get details about a Queue's purge status.
+
+        Args:
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/queues/{queue_id}/purge",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PurgeStatusResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PurgeStatusResponse]], ResultWrapper[PurgeStatusResponse]),
+        )
+
+
+class AsyncPurgeResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncPurgeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncPurgeResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncPurgeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncPurgeResourceWithStreamingResponse(self)
+
+    async def start(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        delete_messages_permanently: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Queue]:
+        """
+        Deletes all messages from the Queue.
+
+        Args:
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
+
+          delete_messages_permanently: Confimation that all messages will be deleted permanently.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/queues/{queue_id}/purge",
+            body=await async_maybe_transform(
+                {"delete_messages_permanently": delete_messages_permanently}, purge_start_params.PurgeStartParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Queue]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Queue]], ResultWrapper[Queue]),
+        )
+
+    async def status(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PurgeStatusResponse]:
+        """
+        Get details about a Queue's purge status.
+
+        Args:
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/queues/{queue_id}/purge",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PurgeStatusResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PurgeStatusResponse]], ResultWrapper[PurgeStatusResponse]),
+        )
+
+
+class PurgeResourceWithRawResponse:
+    def __init__(self, purge: PurgeResource) -> None:
+        self._purge = purge
+
+        self.start = to_raw_response_wrapper(
+            purge.start,
+        )
+        self.status = to_raw_response_wrapper(
+            purge.status,
+        )
+
+
+class AsyncPurgeResourceWithRawResponse:
+    def __init__(self, purge: AsyncPurgeResource) -> None:
+        self._purge = purge
+
+        self.start = async_to_raw_response_wrapper(
+            purge.start,
+        )
+        self.status = async_to_raw_response_wrapper(
+            purge.status,
+        )
+
+
+class PurgeResourceWithStreamingResponse:
+    def __init__(self, purge: PurgeResource) -> None:
+        self._purge = purge
+
+        self.start = to_streamed_response_wrapper(
+            purge.start,
+        )
+        self.status = to_streamed_response_wrapper(
+            purge.status,
+        )
+
+
+class AsyncPurgeResourceWithStreamingResponse:
+    def __init__(self, purge: AsyncPurgeResource) -> None:
+        self._purge = purge
+
+        self.start = async_to_streamed_response_wrapper(
+            purge.start,
+        )
+        self.status = async_to_streamed_response_wrapper(
+            purge.status,
+        )
diff --git a/src/cloudflare/resources/queues/queues.py b/src/cloudflare/resources/queues/queues.py
index f3995757a32..3e5d9cc27c0 100644
--- a/src/cloudflare/resources/queues/queues.py
+++ b/src/cloudflare/resources/queues/queues.py
@@ -2,15 +2,20 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
+from .purge import (
+    PurgeResource,
+    AsyncPurgeResource,
+    PurgeResourceWithRawResponse,
+    AsyncPurgeResourceWithRawResponse,
+    PurgeResourceWithStreamingResponse,
+    AsyncPurgeResourceWithStreamingResponse,
 )
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from .messages import (
     MessagesResource,
     AsyncMessagesResource,
@@ -37,50 +42,75 @@
 )
 from ..._wrappers import ResultWrapper
 from ...pagination import SyncSinglePage, AsyncSinglePage
+from .subscriptions import (
+    SubscriptionsResource,
+    AsyncSubscriptionsResource,
+    SubscriptionsResourceWithRawResponse,
+    AsyncSubscriptionsResourceWithRawResponse,
+    SubscriptionsResourceWithStreamingResponse,
+    AsyncSubscriptionsResourceWithStreamingResponse,
+)
 from ..._base_client import AsyncPaginator, make_request_options
-from ...types.queues import queue_create_params, queue_update_params
+from ...types.queues import queue_edit_params, queue_create_params, queue_update_params
 from ...types.queues.queue import Queue
-from ...types.queues.queue_created import QueueCreated
-from ...types.queues.queue_updated import QueueUpdated
 from ...types.queues.queue_delete_response import QueueDeleteResponse
 
 __all__ = ["QueuesResource", "AsyncQueuesResource"]
 
 
 class QueuesResource(SyncAPIResource):
+    @cached_property
+    def messages(self) -> MessagesResource:
+        return MessagesResource(self._client)
+
+    @cached_property
+    def purge(self) -> PurgeResource:
+        return PurgeResource(self._client)
+
     @cached_property
     def consumers(self) -> ConsumersResource:
         return ConsumersResource(self._client)
 
     @cached_property
-    def messages(self) -> MessagesResource:
-        return MessagesResource(self._client)
+    def subscriptions(self) -> SubscriptionsResource:
+        return SubscriptionsResource(self._client)
 
     @cached_property
     def with_raw_response(self) -> QueuesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return QueuesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> QueuesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return QueuesResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        body: object,
+        queue_name: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[QueueCreated]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Queue]:
         """
-        Creates a new queue.
+        Create a new queue
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
           extra_headers: Send extra headers
 
@@ -94,15 +124,15 @@ def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._post(
             f"/accounts/{account_id}/queues",
-            body=maybe_transform(body, queue_create_params.QueueCreateParams),
+            body=maybe_transform({"queue_name": queue_name}, queue_create_params.QueueCreateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[QueueCreated]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Queue]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[QueueCreated]], ResultWrapper[QueueCreated]),
+            cast_to=cast(Type[Optional[Queue]], ResultWrapper[Queue]),
         )
 
     def update(
@@ -110,21 +140,25 @@ def update(
         queue_id: str,
         *,
         account_id: str,
-        body: object,
+        queue_name: str | Omit = omit,
+        settings: queue_update_params.Settings | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[QueueUpdated]:
-        """
-        Updates a queue.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Queue]:
+        """Updates a Queue.
+
+        Note that this endpoint does not support partial updates. If
+        successful, the Queue's configuration is overwritten with the supplied
+        configuration.
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
-          queue_id: Identifier
+          queue_id: A Resource identifier.
 
           extra_headers: Send extra headers
 
@@ -140,15 +174,21 @@ def update(
             raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
         return self._put(
             f"/accounts/{account_id}/queues/{queue_id}",
-            body=maybe_transform(body, queue_update_params.QueueUpdateParams),
+            body=maybe_transform(
+                {
+                    "queue_name": queue_name,
+                    "settings": settings,
+                },
+                queue_update_params.QueueUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[QueueUpdated]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Queue]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[QueueUpdated]], ResultWrapper[QueueUpdated]),
+            cast_to=cast(Type[Optional[Queue]], ResultWrapper[Queue]),
         )
 
     def list(
@@ -160,13 +200,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Queue]:
         """
         Returns the queues owned by an account.
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
           extra_headers: Send extra headers
 
@@ -197,15 +237,57 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[QueueDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> QueueDeleteResponse:
+        """
+        Deletes a queue
+
+        Args:
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/queues/{queue_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=QueueDeleteResponse,
+        )
+
+    def edit(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        queue_name: str | Omit = omit,
+        settings: queue_edit_params.Settings | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Queue]:
         """
-        Deletes a queue.
+        Updates a Queue.
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
-          queue_id: Identifier
+          queue_id: A Resource identifier.
 
           extra_headers: Send extra headers
 
@@ -219,21 +301,23 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not queue_id:
             raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
-        return cast(
-            Optional[QueueDeleteResponse],
-            self._delete(
-                f"/accounts/{account_id}/queues/{queue_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[QueueDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[QueueDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._patch(
+            f"/accounts/{account_id}/queues/{queue_id}",
+            body=maybe_transform(
+                {
+                    "queue_name": queue_name,
+                    "settings": settings,
+                },
+                queue_edit_params.QueueEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Queue]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[Queue]], ResultWrapper[Queue]),
         )
 
     def get(
@@ -246,15 +330,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Queue]:
         """
-        Get information about a specific queue.
+        Get details about a specific queue.
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
-          queue_id: Identifier
+          queue_id: A Resource identifier.
 
           extra_headers: Send extra headers
 
@@ -282,39 +366,58 @@ def get(
 
 
 class AsyncQueuesResource(AsyncAPIResource):
+    @cached_property
+    def messages(self) -> AsyncMessagesResource:
+        return AsyncMessagesResource(self._client)
+
+    @cached_property
+    def purge(self) -> AsyncPurgeResource:
+        return AsyncPurgeResource(self._client)
+
     @cached_property
     def consumers(self) -> AsyncConsumersResource:
         return AsyncConsumersResource(self._client)
 
     @cached_property
-    def messages(self) -> AsyncMessagesResource:
-        return AsyncMessagesResource(self._client)
+    def subscriptions(self) -> AsyncSubscriptionsResource:
+        return AsyncSubscriptionsResource(self._client)
 
     @cached_property
     def with_raw_response(self) -> AsyncQueuesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncQueuesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncQueuesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncQueuesResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        body: object,
+        queue_name: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[QueueCreated]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Queue]:
         """
-        Creates a new queue.
+        Create a new queue
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
           extra_headers: Send extra headers
 
@@ -328,15 +431,15 @@ async def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._post(
             f"/accounts/{account_id}/queues",
-            body=await async_maybe_transform(body, queue_create_params.QueueCreateParams),
+            body=await async_maybe_transform({"queue_name": queue_name}, queue_create_params.QueueCreateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[QueueCreated]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Queue]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[QueueCreated]], ResultWrapper[QueueCreated]),
+            cast_to=cast(Type[Optional[Queue]], ResultWrapper[Queue]),
         )
 
     async def update(
@@ -344,21 +447,25 @@ async def update(
         queue_id: str,
         *,
         account_id: str,
-        body: object,
+        queue_name: str | Omit = omit,
+        settings: queue_update_params.Settings | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[QueueUpdated]:
-        """
-        Updates a queue.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Queue]:
+        """Updates a Queue.
+
+        Note that this endpoint does not support partial updates. If
+        successful, the Queue's configuration is overwritten with the supplied
+        configuration.
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
-          queue_id: Identifier
+          queue_id: A Resource identifier.
 
           extra_headers: Send extra headers
 
@@ -374,15 +481,21 @@ async def update(
             raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
         return await self._put(
             f"/accounts/{account_id}/queues/{queue_id}",
-            body=await async_maybe_transform(body, queue_update_params.QueueUpdateParams),
+            body=await async_maybe_transform(
+                {
+                    "queue_name": queue_name,
+                    "settings": settings,
+                },
+                queue_update_params.QueueUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[QueueUpdated]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Queue]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[QueueUpdated]], ResultWrapper[QueueUpdated]),
+            cast_to=cast(Type[Optional[Queue]], ResultWrapper[Queue]),
         )
 
     def list(
@@ -394,13 +507,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Queue, AsyncSinglePage[Queue]]:
         """
         Returns the queues owned by an account.
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
           extra_headers: Send extra headers
 
@@ -431,15 +544,15 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[QueueDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> QueueDeleteResponse:
         """
-        Deletes a queue.
+        Deletes a queue
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
-          queue_id: Identifier
+          queue_id: A Resource identifier.
 
           extra_headers: Send extra headers
 
@@ -453,21 +566,65 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not queue_id:
             raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
-        return cast(
-            Optional[QueueDeleteResponse],
-            await self._delete(
-                f"/accounts/{account_id}/queues/{queue_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[QueueDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[QueueDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._delete(
+            f"/accounts/{account_id}/queues/{queue_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
+            cast_to=QueueDeleteResponse,
+        )
+
+    async def edit(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        queue_name: str | Omit = omit,
+        settings: queue_edit_params.Settings | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Queue]:
+        """
+        Updates a Queue.
+
+        Args:
+          account_id: A Resource identifier.
+
+          queue_id: A Resource identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/queues/{queue_id}",
+            body=await async_maybe_transform(
+                {
+                    "queue_name": queue_name,
+                    "settings": settings,
+                },
+                queue_edit_params.QueueEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Queue]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Queue]], ResultWrapper[Queue]),
         )
 
     async def get(
@@ -480,15 +637,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Queue]:
         """
-        Get information about a specific queue.
+        Get details about a specific queue.
 
         Args:
-          account_id: Identifier
+          account_id: A Resource identifier.
 
-          queue_id: Identifier
+          queue_id: A Resource identifier.
 
           extra_headers: Send extra headers
 
@@ -531,17 +688,28 @@ def __init__(self, queues: QueuesResource) -> None:
         self.delete = to_raw_response_wrapper(
             queues.delete,
         )
+        self.edit = to_raw_response_wrapper(
+            queues.edit,
+        )
         self.get = to_raw_response_wrapper(
             queues.get,
         )
 
+    @cached_property
+    def messages(self) -> MessagesResourceWithRawResponse:
+        return MessagesResourceWithRawResponse(self._queues.messages)
+
+    @cached_property
+    def purge(self) -> PurgeResourceWithRawResponse:
+        return PurgeResourceWithRawResponse(self._queues.purge)
+
     @cached_property
     def consumers(self) -> ConsumersResourceWithRawResponse:
         return ConsumersResourceWithRawResponse(self._queues.consumers)
 
     @cached_property
-    def messages(self) -> MessagesResourceWithRawResponse:
-        return MessagesResourceWithRawResponse(self._queues.messages)
+    def subscriptions(self) -> SubscriptionsResourceWithRawResponse:
+        return SubscriptionsResourceWithRawResponse(self._queues.subscriptions)
 
 
 class AsyncQueuesResourceWithRawResponse:
@@ -560,17 +728,28 @@ def __init__(self, queues: AsyncQueuesResource) -> None:
         self.delete = async_to_raw_response_wrapper(
             queues.delete,
         )
+        self.edit = async_to_raw_response_wrapper(
+            queues.edit,
+        )
         self.get = async_to_raw_response_wrapper(
             queues.get,
         )
 
+    @cached_property
+    def messages(self) -> AsyncMessagesResourceWithRawResponse:
+        return AsyncMessagesResourceWithRawResponse(self._queues.messages)
+
+    @cached_property
+    def purge(self) -> AsyncPurgeResourceWithRawResponse:
+        return AsyncPurgeResourceWithRawResponse(self._queues.purge)
+
     @cached_property
     def consumers(self) -> AsyncConsumersResourceWithRawResponse:
         return AsyncConsumersResourceWithRawResponse(self._queues.consumers)
 
     @cached_property
-    def messages(self) -> AsyncMessagesResourceWithRawResponse:
-        return AsyncMessagesResourceWithRawResponse(self._queues.messages)
+    def subscriptions(self) -> AsyncSubscriptionsResourceWithRawResponse:
+        return AsyncSubscriptionsResourceWithRawResponse(self._queues.subscriptions)
 
 
 class QueuesResourceWithStreamingResponse:
@@ -589,17 +768,28 @@ def __init__(self, queues: QueuesResource) -> None:
         self.delete = to_streamed_response_wrapper(
             queues.delete,
         )
+        self.edit = to_streamed_response_wrapper(
+            queues.edit,
+        )
         self.get = to_streamed_response_wrapper(
             queues.get,
         )
 
+    @cached_property
+    def messages(self) -> MessagesResourceWithStreamingResponse:
+        return MessagesResourceWithStreamingResponse(self._queues.messages)
+
+    @cached_property
+    def purge(self) -> PurgeResourceWithStreamingResponse:
+        return PurgeResourceWithStreamingResponse(self._queues.purge)
+
     @cached_property
     def consumers(self) -> ConsumersResourceWithStreamingResponse:
         return ConsumersResourceWithStreamingResponse(self._queues.consumers)
 
     @cached_property
-    def messages(self) -> MessagesResourceWithStreamingResponse:
-        return MessagesResourceWithStreamingResponse(self._queues.messages)
+    def subscriptions(self) -> SubscriptionsResourceWithStreamingResponse:
+        return SubscriptionsResourceWithStreamingResponse(self._queues.subscriptions)
 
 
 class AsyncQueuesResourceWithStreamingResponse:
@@ -618,14 +808,25 @@ def __init__(self, queues: AsyncQueuesResource) -> None:
         self.delete = async_to_streamed_response_wrapper(
             queues.delete,
         )
+        self.edit = async_to_streamed_response_wrapper(
+            queues.edit,
+        )
         self.get = async_to_streamed_response_wrapper(
             queues.get,
         )
 
+    @cached_property
+    def messages(self) -> AsyncMessagesResourceWithStreamingResponse:
+        return AsyncMessagesResourceWithStreamingResponse(self._queues.messages)
+
+    @cached_property
+    def purge(self) -> AsyncPurgeResourceWithStreamingResponse:
+        return AsyncPurgeResourceWithStreamingResponse(self._queues.purge)
+
     @cached_property
     def consumers(self) -> AsyncConsumersResourceWithStreamingResponse:
         return AsyncConsumersResourceWithStreamingResponse(self._queues.consumers)
 
     @cached_property
-    def messages(self) -> AsyncMessagesResourceWithStreamingResponse:
-        return AsyncMessagesResourceWithStreamingResponse(self._queues.messages)
+    def subscriptions(self) -> AsyncSubscriptionsResourceWithStreamingResponse:
+        return AsyncSubscriptionsResourceWithStreamingResponse(self._queues.subscriptions)
diff --git a/src/cloudflare/resources/queues/subscriptions.py b/src/cloudflare/resources/queues/subscriptions.py
new file mode 100644
index 00000000000..14ec39cc5ce
--- /dev/null
+++ b/src/cloudflare/resources/queues/subscriptions.py
@@ -0,0 +1,710 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.queues import subscription_list_params, subscription_create_params, subscription_update_params
+from ...types.queues.subscription_get_response import SubscriptionGetResponse
+from ...types.queues.subscription_list_response import SubscriptionListResponse
+from ...types.queues.subscription_create_response import SubscriptionCreateResponse
+from ...types.queues.subscription_delete_response import SubscriptionDeleteResponse
+from ...types.queues.subscription_update_response import SubscriptionUpdateResponse
+
+__all__ = ["SubscriptionsResource", "AsyncSubscriptionsResource"]
+
+
+class SubscriptionsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SubscriptionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SubscriptionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SubscriptionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SubscriptionsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        destination: subscription_create_params.Destination | Omit = omit,
+        enabled: bool | Omit = omit,
+        events: SequenceNotStr[str] | Omit = omit,
+        name: str | Omit = omit,
+        source: subscription_create_params.Source | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SubscriptionCreateResponse]:
+        """
+        Create a new event subscription for a queue
+
+        Args:
+          account_id: A Resource identifier.
+
+          destination: Destination configuration for the subscription
+
+          enabled: Whether the subscription is active
+
+          events: List of event types this subscription handles
+
+          name: Name of the subscription
+
+          source: Source configuration for the subscription
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/event_subscriptions/subscriptions",
+            body=maybe_transform(
+                {
+                    "destination": destination,
+                    "enabled": enabled,
+                    "events": events,
+                    "name": name,
+                    "source": source,
+                },
+                subscription_create_params.SubscriptionCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SubscriptionCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SubscriptionCreateResponse]], ResultWrapper[SubscriptionCreateResponse]),
+        )
+
+    def update(
+        self,
+        subscription_id: str,
+        *,
+        account_id: str,
+        destination: subscription_update_params.Destination | Omit = omit,
+        enabled: bool | Omit = omit,
+        events: SequenceNotStr[str] | Omit = omit,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SubscriptionUpdateResponse]:
+        """
+        Update an existing event subscription
+
+        Args:
+          account_id: A Resource identifier.
+
+          subscription_id: A Resource identifier.
+
+          destination: Destination configuration for the subscription
+
+          enabled: Whether the subscription is active
+
+          events: List of event types this subscription handles
+
+          name: Name of the subscription
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not subscription_id:
+            raise ValueError(f"Expected a non-empty value for `subscription_id` but received {subscription_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/event_subscriptions/subscriptions/{subscription_id}",
+            body=maybe_transform(
+                {
+                    "destination": destination,
+                    "enabled": enabled,
+                    "events": events,
+                    "name": name,
+                },
+                subscription_update_params.SubscriptionUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SubscriptionUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SubscriptionUpdateResponse]], ResultWrapper[SubscriptionUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        order: Literal["created_at", "name", "enabled", "source"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[SubscriptionListResponse]:
+        """
+        Get a paginated list of event subscriptions with optional sorting and filtering
+
+        Args:
+          account_id: A Resource identifier.
+
+          direction: Sort direction
+
+          order: Field to sort by
+
+          page: Page number for pagination
+
+          per_page: Number of items per page
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/event_subscriptions/subscriptions",
+            page=SyncV4PagePaginationArray[SubscriptionListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "order": order,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    subscription_list_params.SubscriptionListParams,
+                ),
+            ),
+            model=SubscriptionListResponse,
+        )
+
+    def delete(
+        self,
+        subscription_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SubscriptionDeleteResponse]:
+        """
+        Delete an existing event subscription
+
+        Args:
+          account_id: A Resource identifier.
+
+          subscription_id: A Resource identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not subscription_id:
+            raise ValueError(f"Expected a non-empty value for `subscription_id` but received {subscription_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/event_subscriptions/subscriptions/{subscription_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SubscriptionDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SubscriptionDeleteResponse]], ResultWrapper[SubscriptionDeleteResponse]),
+        )
+
+    def get(
+        self,
+        subscription_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SubscriptionGetResponse]:
+        """
+        Get details about an existing event subscription
+
+        Args:
+          account_id: A Resource identifier.
+
+          subscription_id: A Resource identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not subscription_id:
+            raise ValueError(f"Expected a non-empty value for `subscription_id` but received {subscription_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/event_subscriptions/subscriptions/{subscription_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SubscriptionGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SubscriptionGetResponse]], ResultWrapper[SubscriptionGetResponse]),
+        )
+
+
+class AsyncSubscriptionsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSubscriptionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSubscriptionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSubscriptionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSubscriptionsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        destination: subscription_create_params.Destination | Omit = omit,
+        enabled: bool | Omit = omit,
+        events: SequenceNotStr[str] | Omit = omit,
+        name: str | Omit = omit,
+        source: subscription_create_params.Source | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SubscriptionCreateResponse]:
+        """
+        Create a new event subscription for a queue
+
+        Args:
+          account_id: A Resource identifier.
+
+          destination: Destination configuration for the subscription
+
+          enabled: Whether the subscription is active
+
+          events: List of event types this subscription handles
+
+          name: Name of the subscription
+
+          source: Source configuration for the subscription
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/event_subscriptions/subscriptions",
+            body=await async_maybe_transform(
+                {
+                    "destination": destination,
+                    "enabled": enabled,
+                    "events": events,
+                    "name": name,
+                    "source": source,
+                },
+                subscription_create_params.SubscriptionCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SubscriptionCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SubscriptionCreateResponse]], ResultWrapper[SubscriptionCreateResponse]),
+        )
+
+    async def update(
+        self,
+        subscription_id: str,
+        *,
+        account_id: str,
+        destination: subscription_update_params.Destination | Omit = omit,
+        enabled: bool | Omit = omit,
+        events: SequenceNotStr[str] | Omit = omit,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SubscriptionUpdateResponse]:
+        """
+        Update an existing event subscription
+
+        Args:
+          account_id: A Resource identifier.
+
+          subscription_id: A Resource identifier.
+
+          destination: Destination configuration for the subscription
+
+          enabled: Whether the subscription is active
+
+          events: List of event types this subscription handles
+
+          name: Name of the subscription
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not subscription_id:
+            raise ValueError(f"Expected a non-empty value for `subscription_id` but received {subscription_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/event_subscriptions/subscriptions/{subscription_id}",
+            body=await async_maybe_transform(
+                {
+                    "destination": destination,
+                    "enabled": enabled,
+                    "events": events,
+                    "name": name,
+                },
+                subscription_update_params.SubscriptionUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SubscriptionUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SubscriptionUpdateResponse]], ResultWrapper[SubscriptionUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        order: Literal["created_at", "name", "enabled", "source"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SubscriptionListResponse, AsyncV4PagePaginationArray[SubscriptionListResponse]]:
+        """
+        Get a paginated list of event subscriptions with optional sorting and filtering
+
+        Args:
+          account_id: A Resource identifier.
+
+          direction: Sort direction
+
+          order: Field to sort by
+
+          page: Page number for pagination
+
+          per_page: Number of items per page
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/event_subscriptions/subscriptions",
+            page=AsyncV4PagePaginationArray[SubscriptionListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "order": order,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    subscription_list_params.SubscriptionListParams,
+                ),
+            ),
+            model=SubscriptionListResponse,
+        )
+
+    async def delete(
+        self,
+        subscription_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SubscriptionDeleteResponse]:
+        """
+        Delete an existing event subscription
+
+        Args:
+          account_id: A Resource identifier.
+
+          subscription_id: A Resource identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not subscription_id:
+            raise ValueError(f"Expected a non-empty value for `subscription_id` but received {subscription_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/event_subscriptions/subscriptions/{subscription_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SubscriptionDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SubscriptionDeleteResponse]], ResultWrapper[SubscriptionDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        subscription_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SubscriptionGetResponse]:
+        """
+        Get details about an existing event subscription
+
+        Args:
+          account_id: A Resource identifier.
+
+          subscription_id: A Resource identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not subscription_id:
+            raise ValueError(f"Expected a non-empty value for `subscription_id` but received {subscription_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/event_subscriptions/subscriptions/{subscription_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SubscriptionGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SubscriptionGetResponse]], ResultWrapper[SubscriptionGetResponse]),
+        )
+
+
+class SubscriptionsResourceWithRawResponse:
+    def __init__(self, subscriptions: SubscriptionsResource) -> None:
+        self._subscriptions = subscriptions
+
+        self.create = to_raw_response_wrapper(
+            subscriptions.create,
+        )
+        self.update = to_raw_response_wrapper(
+            subscriptions.update,
+        )
+        self.list = to_raw_response_wrapper(
+            subscriptions.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            subscriptions.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            subscriptions.get,
+        )
+
+
+class AsyncSubscriptionsResourceWithRawResponse:
+    def __init__(self, subscriptions: AsyncSubscriptionsResource) -> None:
+        self._subscriptions = subscriptions
+
+        self.create = async_to_raw_response_wrapper(
+            subscriptions.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            subscriptions.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            subscriptions.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            subscriptions.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            subscriptions.get,
+        )
+
+
+class SubscriptionsResourceWithStreamingResponse:
+    def __init__(self, subscriptions: SubscriptionsResource) -> None:
+        self._subscriptions = subscriptions
+
+        self.create = to_streamed_response_wrapper(
+            subscriptions.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            subscriptions.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            subscriptions.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            subscriptions.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            subscriptions.get,
+        )
+
+
+class AsyncSubscriptionsResourceWithStreamingResponse:
+    def __init__(self, subscriptions: AsyncSubscriptionsResource) -> None:
+        self._subscriptions = subscriptions
+
+        self.create = async_to_streamed_response_wrapper(
+            subscriptions.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            subscriptions.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            subscriptions.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            subscriptions.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            subscriptions.get,
+        )
diff --git a/src/cloudflare/resources/r2/__init__.py b/src/cloudflare/resources/r2/__init__.py
index be9a0113617..113a102740f 100644
--- a/src/cloudflare/resources/r2/__init__.py
+++ b/src/cloudflare/resources/r2/__init__.py
@@ -8,14 +8,6 @@
     R2ResourceWithStreamingResponse,
     AsyncR2ResourceWithStreamingResponse,
 )
-from .sippy import (
-    SippyResource,
-    AsyncSippyResource,
-    SippyResourceWithRawResponse,
-    AsyncSippyResourceWithRawResponse,
-    SippyResourceWithStreamingResponse,
-    AsyncSippyResourceWithStreamingResponse,
-)
 from .buckets import (
     BucketsResource,
     AsyncBucketsResource,
@@ -24,6 +16,14 @@
     BucketsResourceWithStreamingResponse,
     AsyncBucketsResourceWithStreamingResponse,
 )
+from .super_slurper import (
+    SuperSlurperResource,
+    AsyncSuperSlurperResource,
+    SuperSlurperResourceWithRawResponse,
+    AsyncSuperSlurperResourceWithRawResponse,
+    SuperSlurperResourceWithStreamingResponse,
+    AsyncSuperSlurperResourceWithStreamingResponse,
+)
 from .temporary_credentials import (
     TemporaryCredentialsResource,
     AsyncTemporaryCredentialsResource,
@@ -40,18 +40,18 @@
     "AsyncBucketsResourceWithRawResponse",
     "BucketsResourceWithStreamingResponse",
     "AsyncBucketsResourceWithStreamingResponse",
-    "SippyResource",
-    "AsyncSippyResource",
-    "SippyResourceWithRawResponse",
-    "AsyncSippyResourceWithRawResponse",
-    "SippyResourceWithStreamingResponse",
-    "AsyncSippyResourceWithStreamingResponse",
     "TemporaryCredentialsResource",
     "AsyncTemporaryCredentialsResource",
     "TemporaryCredentialsResourceWithRawResponse",
     "AsyncTemporaryCredentialsResourceWithRawResponse",
     "TemporaryCredentialsResourceWithStreamingResponse",
     "AsyncTemporaryCredentialsResourceWithStreamingResponse",
+    "SuperSlurperResource",
+    "AsyncSuperSlurperResource",
+    "SuperSlurperResourceWithRawResponse",
+    "AsyncSuperSlurperResourceWithRawResponse",
+    "SuperSlurperResourceWithStreamingResponse",
+    "AsyncSuperSlurperResourceWithStreamingResponse",
     "R2Resource",
     "AsyncR2Resource",
     "R2ResourceWithRawResponse",
diff --git a/src/cloudflare/resources/r2/buckets.py b/src/cloudflare/resources/r2/buckets.py
deleted file mode 100644
index bde62555b2f..00000000000
--- a/src/cloudflare/resources/r2/buckets.py
+++ /dev/null
@@ -1,549 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, cast
-from typing_extensions import Literal
-
-import httpx
-
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ..._compat import cached_property
-from ...types.r2 import bucket_list_params, bucket_create_params
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ..._wrappers import ResultWrapper
-from ...pagination import SyncCursorPagination, AsyncCursorPagination
-from ..._base_client import AsyncPaginator, make_request_options
-from ...types.r2.bucket import Bucket
-
-__all__ = ["BucketsResource", "AsyncBucketsResource"]
-
-
-class BucketsResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> BucketsResourceWithRawResponse:
-        return BucketsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> BucketsResourceWithStreamingResponse:
-        return BucketsResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        *,
-        account_id: str,
-        name: str,
-        location_hint: Literal["apac", "eeur", "enam", "weur", "wnam"] | NotGiven = NOT_GIVEN,
-        storage_class: Literal["Standard", "InfrequentAccess"] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Bucket:
-        """
-        Creates a new R2 bucket.
-
-        Args:
-          account_id: Account ID
-
-          name: Name of the bucket
-
-          location_hint: Location of the bucket
-
-          storage_class: Storage class for newly uploaded objects, unless specified otherwise.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._post(
-            f"/accounts/{account_id}/r2/buckets",
-            body=maybe_transform(
-                {
-                    "name": name,
-                    "location_hint": location_hint,
-                    "storage_class": storage_class,
-                },
-                bucket_create_params.BucketCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Bucket]._unwrapper,
-            ),
-            cast_to=cast(Type[Bucket], ResultWrapper[Bucket]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        cursor: str | NotGiven = NOT_GIVEN,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        name_contains: str | NotGiven = NOT_GIVEN,
-        order: Literal["name"] | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        start_after: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncCursorPagination[Bucket]:
-        """
-        Lists all R2 buckets on your account
-
-        Args:
-          account_id: Account ID
-
-          cursor: Pagination cursor received during the last List Buckets call. R2 buckets are
-              paginated using cursors instead of page numbers.
-
-          direction: Direction to order buckets
-
-          name_contains: Bucket names to filter by. Only buckets with this phrase in their name will be
-              returned.
-
-          order: Field to order buckets by
-
-          per_page: Maximum number of buckets to return in a single call
-
-          start_after: Bucket name to start searching after. Buckets are ordered lexicographically.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/r2/buckets",
-            page=SyncCursorPagination[Bucket],
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "cursor": cursor,
-                        "direction": direction,
-                        "name_contains": name_contains,
-                        "order": order,
-                        "per_page": per_page,
-                        "start_after": start_after,
-                    },
-                    bucket_list_params.BucketListParams,
-                ),
-            ),
-            model=Bucket,
-        )
-
-    def delete(
-        self,
-        bucket_name: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
-        """
-        Deletes an existing R2 bucket.
-
-        Args:
-          account_id: Account ID
-
-          bucket_name: Name of the bucket
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not bucket_name:
-            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
-        return self._delete(
-            f"/accounts/{account_id}/r2/buckets/{bucket_name}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[object]._unwrapper,
-            ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
-        )
-
-    def get(
-        self,
-        bucket_name: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Bucket:
-        """
-        Gets metadata for an existing R2 bucket.
-
-        Args:
-          account_id: Account ID
-
-          bucket_name: Name of the bucket
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not bucket_name:
-            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
-        return self._get(
-            f"/accounts/{account_id}/r2/buckets/{bucket_name}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Bucket]._unwrapper,
-            ),
-            cast_to=cast(Type[Bucket], ResultWrapper[Bucket]),
-        )
-
-
-class AsyncBucketsResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncBucketsResourceWithRawResponse:
-        return AsyncBucketsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncBucketsResourceWithStreamingResponse:
-        return AsyncBucketsResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        *,
-        account_id: str,
-        name: str,
-        location_hint: Literal["apac", "eeur", "enam", "weur", "wnam"] | NotGiven = NOT_GIVEN,
-        storage_class: Literal["Standard", "InfrequentAccess"] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Bucket:
-        """
-        Creates a new R2 bucket.
-
-        Args:
-          account_id: Account ID
-
-          name: Name of the bucket
-
-          location_hint: Location of the bucket
-
-          storage_class: Storage class for newly uploaded objects, unless specified otherwise.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._post(
-            f"/accounts/{account_id}/r2/buckets",
-            body=await async_maybe_transform(
-                {
-                    "name": name,
-                    "location_hint": location_hint,
-                    "storage_class": storage_class,
-                },
-                bucket_create_params.BucketCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Bucket]._unwrapper,
-            ),
-            cast_to=cast(Type[Bucket], ResultWrapper[Bucket]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        cursor: str | NotGiven = NOT_GIVEN,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        name_contains: str | NotGiven = NOT_GIVEN,
-        order: Literal["name"] | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        start_after: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[Bucket, AsyncCursorPagination[Bucket]]:
-        """
-        Lists all R2 buckets on your account
-
-        Args:
-          account_id: Account ID
-
-          cursor: Pagination cursor received during the last List Buckets call. R2 buckets are
-              paginated using cursors instead of page numbers.
-
-          direction: Direction to order buckets
-
-          name_contains: Bucket names to filter by. Only buckets with this phrase in their name will be
-              returned.
-
-          order: Field to order buckets by
-
-          per_page: Maximum number of buckets to return in a single call
-
-          start_after: Bucket name to start searching after. Buckets are ordered lexicographically.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/r2/buckets",
-            page=AsyncCursorPagination[Bucket],
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "cursor": cursor,
-                        "direction": direction,
-                        "name_contains": name_contains,
-                        "order": order,
-                        "per_page": per_page,
-                        "start_after": start_after,
-                    },
-                    bucket_list_params.BucketListParams,
-                ),
-            ),
-            model=Bucket,
-        )
-
-    async def delete(
-        self,
-        bucket_name: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
-        """
-        Deletes an existing R2 bucket.
-
-        Args:
-          account_id: Account ID
-
-          bucket_name: Name of the bucket
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not bucket_name:
-            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
-        return await self._delete(
-            f"/accounts/{account_id}/r2/buckets/{bucket_name}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[object]._unwrapper,
-            ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
-        )
-
-    async def get(
-        self,
-        bucket_name: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Bucket:
-        """
-        Gets metadata for an existing R2 bucket.
-
-        Args:
-          account_id: Account ID
-
-          bucket_name: Name of the bucket
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not bucket_name:
-            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
-        return await self._get(
-            f"/accounts/{account_id}/r2/buckets/{bucket_name}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Bucket]._unwrapper,
-            ),
-            cast_to=cast(Type[Bucket], ResultWrapper[Bucket]),
-        )
-
-
-class BucketsResourceWithRawResponse:
-    def __init__(self, buckets: BucketsResource) -> None:
-        self._buckets = buckets
-
-        self.create = to_raw_response_wrapper(
-            buckets.create,
-        )
-        self.list = to_raw_response_wrapper(
-            buckets.list,
-        )
-        self.delete = to_raw_response_wrapper(
-            buckets.delete,
-        )
-        self.get = to_raw_response_wrapper(
-            buckets.get,
-        )
-
-
-class AsyncBucketsResourceWithRawResponse:
-    def __init__(self, buckets: AsyncBucketsResource) -> None:
-        self._buckets = buckets
-
-        self.create = async_to_raw_response_wrapper(
-            buckets.create,
-        )
-        self.list = async_to_raw_response_wrapper(
-            buckets.list,
-        )
-        self.delete = async_to_raw_response_wrapper(
-            buckets.delete,
-        )
-        self.get = async_to_raw_response_wrapper(
-            buckets.get,
-        )
-
-
-class BucketsResourceWithStreamingResponse:
-    def __init__(self, buckets: BucketsResource) -> None:
-        self._buckets = buckets
-
-        self.create = to_streamed_response_wrapper(
-            buckets.create,
-        )
-        self.list = to_streamed_response_wrapper(
-            buckets.list,
-        )
-        self.delete = to_streamed_response_wrapper(
-            buckets.delete,
-        )
-        self.get = to_streamed_response_wrapper(
-            buckets.get,
-        )
-
-
-class AsyncBucketsResourceWithStreamingResponse:
-    def __init__(self, buckets: AsyncBucketsResource) -> None:
-        self._buckets = buckets
-
-        self.create = async_to_streamed_response_wrapper(
-            buckets.create,
-        )
-        self.list = async_to_streamed_response_wrapper(
-            buckets.list,
-        )
-        self.delete = async_to_streamed_response_wrapper(
-            buckets.delete,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            buckets.get,
-        )
diff --git a/src/cloudflare/resources/r2/buckets/__init__.py b/src/cloudflare/resources/r2/buckets/__init__.py
new file mode 100644
index 00000000000..b5a72bc24b9
--- /dev/null
+++ b/src/cloudflare/resources/r2/buckets/__init__.py
@@ -0,0 +1,117 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .cors import (
+    CORSResource,
+    AsyncCORSResource,
+    CORSResourceWithRawResponse,
+    AsyncCORSResourceWithRawResponse,
+    CORSResourceWithStreamingResponse,
+    AsyncCORSResourceWithStreamingResponse,
+)
+from .locks import (
+    LocksResource,
+    AsyncLocksResource,
+    LocksResourceWithRawResponse,
+    AsyncLocksResourceWithRawResponse,
+    LocksResourceWithStreamingResponse,
+    AsyncLocksResourceWithStreamingResponse,
+)
+from .sippy import (
+    SippyResource,
+    AsyncSippyResource,
+    SippyResourceWithRawResponse,
+    AsyncSippyResourceWithRawResponse,
+    SippyResourceWithStreamingResponse,
+    AsyncSippyResourceWithStreamingResponse,
+)
+from .buckets import (
+    BucketsResource,
+    AsyncBucketsResource,
+    BucketsResourceWithRawResponse,
+    AsyncBucketsResourceWithRawResponse,
+    BucketsResourceWithStreamingResponse,
+    AsyncBucketsResourceWithStreamingResponse,
+)
+from .domains import (
+    DomainsResource,
+    AsyncDomainsResource,
+    DomainsResourceWithRawResponse,
+    AsyncDomainsResourceWithRawResponse,
+    DomainsResourceWithStreamingResponse,
+    AsyncDomainsResourceWithStreamingResponse,
+)
+from .metrics import (
+    MetricsResource,
+    AsyncMetricsResource,
+    MetricsResourceWithRawResponse,
+    AsyncMetricsResourceWithRawResponse,
+    MetricsResourceWithStreamingResponse,
+    AsyncMetricsResourceWithStreamingResponse,
+)
+from .lifecycle import (
+    LifecycleResource,
+    AsyncLifecycleResource,
+    LifecycleResourceWithRawResponse,
+    AsyncLifecycleResourceWithRawResponse,
+    LifecycleResourceWithStreamingResponse,
+    AsyncLifecycleResourceWithStreamingResponse,
+)
+from .event_notifications import (
+    EventNotificationsResource,
+    AsyncEventNotificationsResource,
+    EventNotificationsResourceWithRawResponse,
+    AsyncEventNotificationsResourceWithRawResponse,
+    EventNotificationsResourceWithStreamingResponse,
+    AsyncEventNotificationsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "LifecycleResource",
+    "AsyncLifecycleResource",
+    "LifecycleResourceWithRawResponse",
+    "AsyncLifecycleResourceWithRawResponse",
+    "LifecycleResourceWithStreamingResponse",
+    "AsyncLifecycleResourceWithStreamingResponse",
+    "CORSResource",
+    "AsyncCORSResource",
+    "CORSResourceWithRawResponse",
+    "AsyncCORSResourceWithRawResponse",
+    "CORSResourceWithStreamingResponse",
+    "AsyncCORSResourceWithStreamingResponse",
+    "DomainsResource",
+    "AsyncDomainsResource",
+    "DomainsResourceWithRawResponse",
+    "AsyncDomainsResourceWithRawResponse",
+    "DomainsResourceWithStreamingResponse",
+    "AsyncDomainsResourceWithStreamingResponse",
+    "EventNotificationsResource",
+    "AsyncEventNotificationsResource",
+    "EventNotificationsResourceWithRawResponse",
+    "AsyncEventNotificationsResourceWithRawResponse",
+    "EventNotificationsResourceWithStreamingResponse",
+    "AsyncEventNotificationsResourceWithStreamingResponse",
+    "LocksResource",
+    "AsyncLocksResource",
+    "LocksResourceWithRawResponse",
+    "AsyncLocksResourceWithRawResponse",
+    "LocksResourceWithStreamingResponse",
+    "AsyncLocksResourceWithStreamingResponse",
+    "MetricsResource",
+    "AsyncMetricsResource",
+    "MetricsResourceWithRawResponse",
+    "AsyncMetricsResourceWithRawResponse",
+    "MetricsResourceWithStreamingResponse",
+    "AsyncMetricsResourceWithStreamingResponse",
+    "SippyResource",
+    "AsyncSippyResource",
+    "SippyResourceWithRawResponse",
+    "AsyncSippyResourceWithRawResponse",
+    "SippyResourceWithStreamingResponse",
+    "AsyncSippyResourceWithStreamingResponse",
+    "BucketsResource",
+    "AsyncBucketsResource",
+    "BucketsResourceWithRawResponse",
+    "AsyncBucketsResourceWithRawResponse",
+    "BucketsResourceWithStreamingResponse",
+    "AsyncBucketsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/r2/buckets/buckets.py b/src/cloudflare/resources/r2/buckets/buckets.py
new file mode 100644
index 00000000000..5f7f5e1885d
--- /dev/null
+++ b/src/cloudflare/resources/r2/buckets/buckets.py
@@ -0,0 +1,978 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from .cors import (
+    CORSResource,
+    AsyncCORSResource,
+    CORSResourceWithRawResponse,
+    AsyncCORSResourceWithRawResponse,
+    CORSResourceWithStreamingResponse,
+    AsyncCORSResourceWithStreamingResponse,
+)
+from .locks import (
+    LocksResource,
+    AsyncLocksResource,
+    LocksResourceWithRawResponse,
+    AsyncLocksResourceWithRawResponse,
+    LocksResourceWithStreamingResponse,
+    AsyncLocksResourceWithStreamingResponse,
+)
+from .sippy import (
+    SippyResource,
+    AsyncSippyResource,
+    SippyResourceWithRawResponse,
+    AsyncSippyResourceWithRawResponse,
+    SippyResourceWithStreamingResponse,
+    AsyncSippyResourceWithStreamingResponse,
+)
+from .metrics import (
+    MetricsResource,
+    AsyncMetricsResource,
+    MetricsResourceWithRawResponse,
+    AsyncMetricsResourceWithRawResponse,
+    MetricsResourceWithStreamingResponse,
+    AsyncMetricsResourceWithStreamingResponse,
+)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import is_given, maybe_transform, strip_not_given, async_maybe_transform
+from .lifecycle import (
+    LifecycleResource,
+    AsyncLifecycleResource,
+    LifecycleResourceWithRawResponse,
+    AsyncLifecycleResourceWithRawResponse,
+    LifecycleResourceWithStreamingResponse,
+    AsyncLifecycleResourceWithStreamingResponse,
+)
+from ...._compat import cached_property
+from ....types.r2 import bucket_list_params, bucket_create_params
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from .domains.domains import (
+    DomainsResource,
+    AsyncDomainsResource,
+    DomainsResourceWithRawResponse,
+    AsyncDomainsResourceWithRawResponse,
+    DomainsResourceWithStreamingResponse,
+    AsyncDomainsResourceWithStreamingResponse,
+)
+from ....types.r2.bucket import Bucket
+from .event_notifications import (
+    EventNotificationsResource,
+    AsyncEventNotificationsResource,
+    EventNotificationsResourceWithRawResponse,
+    AsyncEventNotificationsResourceWithRawResponse,
+    EventNotificationsResourceWithStreamingResponse,
+    AsyncEventNotificationsResourceWithStreamingResponse,
+)
+from ....types.r2.bucket_list_response import BucketListResponse
+
+__all__ = ["BucketsResource", "AsyncBucketsResource"]
+
+
+class BucketsResource(SyncAPIResource):
+    @cached_property
+    def lifecycle(self) -> LifecycleResource:
+        return LifecycleResource(self._client)
+
+    @cached_property
+    def cors(self) -> CORSResource:
+        return CORSResource(self._client)
+
+    @cached_property
+    def domains(self) -> DomainsResource:
+        return DomainsResource(self._client)
+
+    @cached_property
+    def event_notifications(self) -> EventNotificationsResource:
+        return EventNotificationsResource(self._client)
+
+    @cached_property
+    def locks(self) -> LocksResource:
+        return LocksResource(self._client)
+
+    @cached_property
+    def metrics(self) -> MetricsResource:
+        return MetricsResource(self._client)
+
+    @cached_property
+    def sippy(self) -> SippyResource:
+        return SippyResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> BucketsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return BucketsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> BucketsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return BucketsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        location_hint: Literal["apac", "eeur", "enam", "weur", "wnam", "oc"] | Omit = omit,
+        storage_class: Literal["Standard", "InfrequentAccess"] | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Bucket:
+        """
+        Creates a new R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          name: Name of the bucket.
+
+          location_hint: Location of the bucket.
+
+          storage_class: Storage class for newly uploaded objects, unless specified otherwise.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._post(
+            f"/accounts/{account_id}/r2/buckets",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "location_hint": location_hint,
+                    "storage_class": storage_class,
+                },
+                bucket_create_params.BucketCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Bucket]._unwrapper,
+            ),
+            cast_to=cast(Type[Bucket], ResultWrapper[Bucket]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        cursor: str | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        name_contains: str | Omit = omit,
+        order: Literal["name"] | Omit = omit,
+        per_page: float | Omit = omit,
+        start_after: str | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BucketListResponse:
+        """
+        Lists all R2 buckets on your account.
+
+        Args:
+          account_id: Account ID.
+
+          cursor: Pagination cursor received during the last List Buckets call. R2 buckets are
+              paginated using cursors instead of page numbers.
+
+          direction: Direction to order buckets.
+
+          name_contains: Bucket names to filter by. Only buckets with this phrase in their name will be
+              returned.
+
+          order: Field to order buckets by.
+
+          per_page: Maximum number of buckets to return in a single call.
+
+          start_after: Bucket name to start searching after. Buckets are ordered lexicographically.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._get(
+            f"/accounts/{account_id}/r2/buckets",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "cursor": cursor,
+                        "direction": direction,
+                        "name_contains": name_contains,
+                        "order": order,
+                        "per_page": per_page,
+                        "start_after": start_after,
+                    },
+                    bucket_list_params.BucketListParams,
+                ),
+                post_parser=ResultWrapper[BucketListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BucketListResponse], ResultWrapper[BucketListResponse]),
+        )
+
+    def delete(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Deletes an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._delete(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def edit(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        storage_class: Literal["Standard", "InfrequentAccess"],
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Bucket:
+        """
+        Updates properties of an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          storage_class: Storage class for newly uploaded objects, unless specified otherwise.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "cf-r2-storage-class": str(storage_class),
+                    "cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given,
+                }
+            ),
+            **(extra_headers or {}),
+        }
+        return self._patch(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Bucket]._unwrapper,
+            ),
+            cast_to=cast(Type[Bucket], ResultWrapper[Bucket]),
+        )
+
+    def get(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Bucket:
+        """
+        Gets properties of an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._get(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Bucket]._unwrapper,
+            ),
+            cast_to=cast(Type[Bucket], ResultWrapper[Bucket]),
+        )
+
+
+class AsyncBucketsResource(AsyncAPIResource):
+    @cached_property
+    def lifecycle(self) -> AsyncLifecycleResource:
+        return AsyncLifecycleResource(self._client)
+
+    @cached_property
+    def cors(self) -> AsyncCORSResource:
+        return AsyncCORSResource(self._client)
+
+    @cached_property
+    def domains(self) -> AsyncDomainsResource:
+        return AsyncDomainsResource(self._client)
+
+    @cached_property
+    def event_notifications(self) -> AsyncEventNotificationsResource:
+        return AsyncEventNotificationsResource(self._client)
+
+    @cached_property
+    def locks(self) -> AsyncLocksResource:
+        return AsyncLocksResource(self._client)
+
+    @cached_property
+    def metrics(self) -> AsyncMetricsResource:
+        return AsyncMetricsResource(self._client)
+
+    @cached_property
+    def sippy(self) -> AsyncSippyResource:
+        return AsyncSippyResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncBucketsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncBucketsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncBucketsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncBucketsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        location_hint: Literal["apac", "eeur", "enam", "weur", "wnam", "oc"] | Omit = omit,
+        storage_class: Literal["Standard", "InfrequentAccess"] | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Bucket:
+        """
+        Creates a new R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          name: Name of the bucket.
+
+          location_hint: Location of the bucket.
+
+          storage_class: Storage class for newly uploaded objects, unless specified otherwise.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._post(
+            f"/accounts/{account_id}/r2/buckets",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "location_hint": location_hint,
+                    "storage_class": storage_class,
+                },
+                bucket_create_params.BucketCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Bucket]._unwrapper,
+            ),
+            cast_to=cast(Type[Bucket], ResultWrapper[Bucket]),
+        )
+
+    async def list(
+        self,
+        *,
+        account_id: str,
+        cursor: str | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        name_contains: str | Omit = omit,
+        order: Literal["name"] | Omit = omit,
+        per_page: float | Omit = omit,
+        start_after: str | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BucketListResponse:
+        """
+        Lists all R2 buckets on your account.
+
+        Args:
+          account_id: Account ID.
+
+          cursor: Pagination cursor received during the last List Buckets call. R2 buckets are
+              paginated using cursors instead of page numbers.
+
+          direction: Direction to order buckets.
+
+          name_contains: Bucket names to filter by. Only buckets with this phrase in their name will be
+              returned.
+
+          order: Field to order buckets by.
+
+          per_page: Maximum number of buckets to return in a single call.
+
+          start_after: Bucket name to start searching after. Buckets are ordered lexicographically.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._get(
+            f"/accounts/{account_id}/r2/buckets",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "cursor": cursor,
+                        "direction": direction,
+                        "name_contains": name_contains,
+                        "order": order,
+                        "per_page": per_page,
+                        "start_after": start_after,
+                    },
+                    bucket_list_params.BucketListParams,
+                ),
+                post_parser=ResultWrapper[BucketListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BucketListResponse], ResultWrapper[BucketListResponse]),
+        )
+
+    async def delete(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Deletes an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._delete(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def edit(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        storage_class: Literal["Standard", "InfrequentAccess"],
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Bucket:
+        """
+        Updates properties of an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          storage_class: Storage class for newly uploaded objects, unless specified otherwise.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given(
+                {
+                    "cf-r2-storage-class": str(storage_class),
+                    "cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given,
+                }
+            ),
+            **(extra_headers or {}),
+        }
+        return await self._patch(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Bucket]._unwrapper,
+            ),
+            cast_to=cast(Type[Bucket], ResultWrapper[Bucket]),
+        )
+
+    async def get(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Bucket:
+        """
+        Gets properties of an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._get(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Bucket]._unwrapper,
+            ),
+            cast_to=cast(Type[Bucket], ResultWrapper[Bucket]),
+        )
+
+
+class BucketsResourceWithRawResponse:
+    def __init__(self, buckets: BucketsResource) -> None:
+        self._buckets = buckets
+
+        self.create = to_raw_response_wrapper(
+            buckets.create,
+        )
+        self.list = to_raw_response_wrapper(
+            buckets.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            buckets.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            buckets.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            buckets.get,
+        )
+
+    @cached_property
+    def lifecycle(self) -> LifecycleResourceWithRawResponse:
+        return LifecycleResourceWithRawResponse(self._buckets.lifecycle)
+
+    @cached_property
+    def cors(self) -> CORSResourceWithRawResponse:
+        return CORSResourceWithRawResponse(self._buckets.cors)
+
+    @cached_property
+    def domains(self) -> DomainsResourceWithRawResponse:
+        return DomainsResourceWithRawResponse(self._buckets.domains)
+
+    @cached_property
+    def event_notifications(self) -> EventNotificationsResourceWithRawResponse:
+        return EventNotificationsResourceWithRawResponse(self._buckets.event_notifications)
+
+    @cached_property
+    def locks(self) -> LocksResourceWithRawResponse:
+        return LocksResourceWithRawResponse(self._buckets.locks)
+
+    @cached_property
+    def metrics(self) -> MetricsResourceWithRawResponse:
+        return MetricsResourceWithRawResponse(self._buckets.metrics)
+
+    @cached_property
+    def sippy(self) -> SippyResourceWithRawResponse:
+        return SippyResourceWithRawResponse(self._buckets.sippy)
+
+
+class AsyncBucketsResourceWithRawResponse:
+    def __init__(self, buckets: AsyncBucketsResource) -> None:
+        self._buckets = buckets
+
+        self.create = async_to_raw_response_wrapper(
+            buckets.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            buckets.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            buckets.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            buckets.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            buckets.get,
+        )
+
+    @cached_property
+    def lifecycle(self) -> AsyncLifecycleResourceWithRawResponse:
+        return AsyncLifecycleResourceWithRawResponse(self._buckets.lifecycle)
+
+    @cached_property
+    def cors(self) -> AsyncCORSResourceWithRawResponse:
+        return AsyncCORSResourceWithRawResponse(self._buckets.cors)
+
+    @cached_property
+    def domains(self) -> AsyncDomainsResourceWithRawResponse:
+        return AsyncDomainsResourceWithRawResponse(self._buckets.domains)
+
+    @cached_property
+    def event_notifications(self) -> AsyncEventNotificationsResourceWithRawResponse:
+        return AsyncEventNotificationsResourceWithRawResponse(self._buckets.event_notifications)
+
+    @cached_property
+    def locks(self) -> AsyncLocksResourceWithRawResponse:
+        return AsyncLocksResourceWithRawResponse(self._buckets.locks)
+
+    @cached_property
+    def metrics(self) -> AsyncMetricsResourceWithRawResponse:
+        return AsyncMetricsResourceWithRawResponse(self._buckets.metrics)
+
+    @cached_property
+    def sippy(self) -> AsyncSippyResourceWithRawResponse:
+        return AsyncSippyResourceWithRawResponse(self._buckets.sippy)
+
+
+class BucketsResourceWithStreamingResponse:
+    def __init__(self, buckets: BucketsResource) -> None:
+        self._buckets = buckets
+
+        self.create = to_streamed_response_wrapper(
+            buckets.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            buckets.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            buckets.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            buckets.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            buckets.get,
+        )
+
+    @cached_property
+    def lifecycle(self) -> LifecycleResourceWithStreamingResponse:
+        return LifecycleResourceWithStreamingResponse(self._buckets.lifecycle)
+
+    @cached_property
+    def cors(self) -> CORSResourceWithStreamingResponse:
+        return CORSResourceWithStreamingResponse(self._buckets.cors)
+
+    @cached_property
+    def domains(self) -> DomainsResourceWithStreamingResponse:
+        return DomainsResourceWithStreamingResponse(self._buckets.domains)
+
+    @cached_property
+    def event_notifications(self) -> EventNotificationsResourceWithStreamingResponse:
+        return EventNotificationsResourceWithStreamingResponse(self._buckets.event_notifications)
+
+    @cached_property
+    def locks(self) -> LocksResourceWithStreamingResponse:
+        return LocksResourceWithStreamingResponse(self._buckets.locks)
+
+    @cached_property
+    def metrics(self) -> MetricsResourceWithStreamingResponse:
+        return MetricsResourceWithStreamingResponse(self._buckets.metrics)
+
+    @cached_property
+    def sippy(self) -> SippyResourceWithStreamingResponse:
+        return SippyResourceWithStreamingResponse(self._buckets.sippy)
+
+
+class AsyncBucketsResourceWithStreamingResponse:
+    def __init__(self, buckets: AsyncBucketsResource) -> None:
+        self._buckets = buckets
+
+        self.create = async_to_streamed_response_wrapper(
+            buckets.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            buckets.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            buckets.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            buckets.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            buckets.get,
+        )
+
+    @cached_property
+    def lifecycle(self) -> AsyncLifecycleResourceWithStreamingResponse:
+        return AsyncLifecycleResourceWithStreamingResponse(self._buckets.lifecycle)
+
+    @cached_property
+    def cors(self) -> AsyncCORSResourceWithStreamingResponse:
+        return AsyncCORSResourceWithStreamingResponse(self._buckets.cors)
+
+    @cached_property
+    def domains(self) -> AsyncDomainsResourceWithStreamingResponse:
+        return AsyncDomainsResourceWithStreamingResponse(self._buckets.domains)
+
+    @cached_property
+    def event_notifications(self) -> AsyncEventNotificationsResourceWithStreamingResponse:
+        return AsyncEventNotificationsResourceWithStreamingResponse(self._buckets.event_notifications)
+
+    @cached_property
+    def locks(self) -> AsyncLocksResourceWithStreamingResponse:
+        return AsyncLocksResourceWithStreamingResponse(self._buckets.locks)
+
+    @cached_property
+    def metrics(self) -> AsyncMetricsResourceWithStreamingResponse:
+        return AsyncMetricsResourceWithStreamingResponse(self._buckets.metrics)
+
+    @cached_property
+    def sippy(self) -> AsyncSippyResourceWithStreamingResponse:
+        return AsyncSippyResourceWithStreamingResponse(self._buckets.sippy)
diff --git a/src/cloudflare/resources/r2/buckets/cors.py b/src/cloudflare/resources/r2/buckets/cors.py
new file mode 100644
index 00000000000..7868e6da1ce
--- /dev/null
+++ b/src/cloudflare/resources/r2/buckets/cors.py
@@ -0,0 +1,437 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import is_given, maybe_transform, strip_not_given, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.r2.buckets import cors_update_params
+from ....types.r2.buckets.cors_get_response import CORSGetResponse
+
+__all__ = ["CORSResource", "AsyncCORSResource"]
+
+
+class CORSResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> CORSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CORSResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CORSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CORSResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        rules: Iterable[cors_update_params.Rule] | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Set the CORS policy for a bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._put(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/cors",
+            body=maybe_transform({"rules": rules}, cors_update_params.CORSUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def delete(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Delete the CORS policy for a bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._delete(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/cors",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def get(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CORSGetResponse:
+        """
+        Get the CORS policy for a bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._get(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/cors",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CORSGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CORSGetResponse], ResultWrapper[CORSGetResponse]),
+        )
+
+
+class AsyncCORSResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncCORSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCORSResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCORSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCORSResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        rules: Iterable[cors_update_params.Rule] | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Set the CORS policy for a bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._put(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/cors",
+            body=await async_maybe_transform({"rules": rules}, cors_update_params.CORSUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def delete(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Delete the CORS policy for a bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._delete(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/cors",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def get(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CORSGetResponse:
+        """
+        Get the CORS policy for a bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._get(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/cors",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CORSGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CORSGetResponse], ResultWrapper[CORSGetResponse]),
+        )
+
+
+class CORSResourceWithRawResponse:
+    def __init__(self, cors: CORSResource) -> None:
+        self._cors = cors
+
+        self.update = to_raw_response_wrapper(
+            cors.update,
+        )
+        self.delete = to_raw_response_wrapper(
+            cors.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            cors.get,
+        )
+
+
+class AsyncCORSResourceWithRawResponse:
+    def __init__(self, cors: AsyncCORSResource) -> None:
+        self._cors = cors
+
+        self.update = async_to_raw_response_wrapper(
+            cors.update,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            cors.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            cors.get,
+        )
+
+
+class CORSResourceWithStreamingResponse:
+    def __init__(self, cors: CORSResource) -> None:
+        self._cors = cors
+
+        self.update = to_streamed_response_wrapper(
+            cors.update,
+        )
+        self.delete = to_streamed_response_wrapper(
+            cors.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            cors.get,
+        )
+
+
+class AsyncCORSResourceWithStreamingResponse:
+    def __init__(self, cors: AsyncCORSResource) -> None:
+        self._cors = cors
+
+        self.update = async_to_streamed_response_wrapper(
+            cors.update,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            cors.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            cors.get,
+        )
diff --git a/src/cloudflare/resources/r2/buckets/domains/__init__.py b/src/cloudflare/resources/r2/buckets/domains/__init__.py
new file mode 100644
index 00000000000..bb2fbc2eea2
--- /dev/null
+++ b/src/cloudflare/resources/r2/buckets/domains/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .custom import (
+    CustomResource,
+    AsyncCustomResource,
+    CustomResourceWithRawResponse,
+    AsyncCustomResourceWithRawResponse,
+    CustomResourceWithStreamingResponse,
+    AsyncCustomResourceWithStreamingResponse,
+)
+from .domains import (
+    DomainsResource,
+    AsyncDomainsResource,
+    DomainsResourceWithRawResponse,
+    AsyncDomainsResourceWithRawResponse,
+    DomainsResourceWithStreamingResponse,
+    AsyncDomainsResourceWithStreamingResponse,
+)
+from .managed import (
+    ManagedResource,
+    AsyncManagedResource,
+    ManagedResourceWithRawResponse,
+    AsyncManagedResourceWithRawResponse,
+    ManagedResourceWithStreamingResponse,
+    AsyncManagedResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "CustomResource",
+    "AsyncCustomResource",
+    "CustomResourceWithRawResponse",
+    "AsyncCustomResourceWithRawResponse",
+    "CustomResourceWithStreamingResponse",
+    "AsyncCustomResourceWithStreamingResponse",
+    "ManagedResource",
+    "AsyncManagedResource",
+    "ManagedResourceWithRawResponse",
+    "AsyncManagedResourceWithRawResponse",
+    "ManagedResourceWithStreamingResponse",
+    "AsyncManagedResourceWithStreamingResponse",
+    "DomainsResource",
+    "AsyncDomainsResource",
+    "DomainsResourceWithRawResponse",
+    "AsyncDomainsResourceWithRawResponse",
+    "DomainsResourceWithStreamingResponse",
+    "AsyncDomainsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/r2/buckets/domains/custom.py b/src/cloudflare/resources/r2/buckets/domains/custom.py
new file mode 100644
index 00000000000..800a8520141
--- /dev/null
+++ b/src/cloudflare/resources/r2/buckets/domains/custom.py
@@ -0,0 +1,789 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import is_given, maybe_transform, strip_not_given, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.r2.buckets.domains import custom_create_params, custom_update_params
+from .....types.r2.buckets.domains.custom_get_response import CustomGetResponse
+from .....types.r2.buckets.domains.custom_list_response import CustomListResponse
+from .....types.r2.buckets.domains.custom_create_response import CustomCreateResponse
+from .....types.r2.buckets.domains.custom_delete_response import CustomDeleteResponse
+from .....types.r2.buckets.domains.custom_update_response import CustomUpdateResponse
+
+__all__ = ["CustomResource", "AsyncCustomResource"]
+
+
+class CustomResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> CustomResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CustomResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CustomResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CustomResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        domain: str,
+        enabled: bool,
+        zone_id: str,
+        ciphers: SequenceNotStr[str] | Omit = omit,
+        min_tls: Literal["1.0", "1.1", "1.2", "1.3"] | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CustomCreateResponse:
+        """
+        Register a new custom domain for an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          domain: Name of the custom domain to be added.
+
+          enabled: Whether to enable public bucket access at the custom domain. If undefined, the
+              domain will be enabled.
+
+          zone_id: Zone ID of the custom domain.
+
+          ciphers: An allowlist of ciphers for TLS termination. These ciphers must be in the
+              BoringSSL format.
+
+          min_tls: Minimum TLS Version the custom domain will accept for incoming connections. If
+              not set, defaults to 1.0.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._post(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom",
+            body=maybe_transform(
+                {
+                    "domain": domain,
+                    "enabled": enabled,
+                    "zone_id": zone_id,
+                    "ciphers": ciphers,
+                    "min_tls": min_tls,
+                },
+                custom_create_params.CustomCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CustomCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CustomCreateResponse], ResultWrapper[CustomCreateResponse]),
+        )
+
+    def update(
+        self,
+        domain: str,
+        *,
+        account_id: str,
+        bucket_name: str,
+        ciphers: SequenceNotStr[str] | Omit = omit,
+        enabled: bool | Omit = omit,
+        min_tls: Literal["1.0", "1.1", "1.2", "1.3"] | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CustomUpdateResponse:
+        """
+        Edit the configuration for a custom domain on an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          domain: Name of the custom domain.
+
+          ciphers: An allowlist of ciphers for TLS termination. These ciphers must be in the
+              BoringSSL format.
+
+          enabled: Whether to enable public bucket access at the specified custom domain.
+
+          min_tls: Minimum TLS Version the custom domain will accept for incoming connections. If
+              not set, defaults to previous value.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        if not domain:
+            raise ValueError(f"Expected a non-empty value for `domain` but received {domain!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._put(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom/{domain}",
+            body=maybe_transform(
+                {
+                    "ciphers": ciphers,
+                    "enabled": enabled,
+                    "min_tls": min_tls,
+                },
+                custom_update_params.CustomUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CustomUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CustomUpdateResponse], ResultWrapper[CustomUpdateResponse]),
+        )
+
+    def list(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CustomListResponse:
+        """
+        Gets a list of all custom domains registered with an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._get(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CustomListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CustomListResponse], ResultWrapper[CustomListResponse]),
+        )
+
+    def delete(
+        self,
+        domain: str,
+        *,
+        account_id: str,
+        bucket_name: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CustomDeleteResponse:
+        """
+        Remove custom domain registration from an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          domain: Name of the custom domain.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        if not domain:
+            raise ValueError(f"Expected a non-empty value for `domain` but received {domain!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._delete(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom/{domain}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CustomDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CustomDeleteResponse], ResultWrapper[CustomDeleteResponse]),
+        )
+
+    def get(
+        self,
+        domain: str,
+        *,
+        account_id: str,
+        bucket_name: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CustomGetResponse:
+        """
+        Get the configuration for a custom domain on an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          domain: Name of the custom domain.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        if not domain:
+            raise ValueError(f"Expected a non-empty value for `domain` but received {domain!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._get(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom/{domain}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CustomGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CustomGetResponse], ResultWrapper[CustomGetResponse]),
+        )
+
+
+class AsyncCustomResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncCustomResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCustomResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCustomResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCustomResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        domain: str,
+        enabled: bool,
+        zone_id: str,
+        ciphers: SequenceNotStr[str] | Omit = omit,
+        min_tls: Literal["1.0", "1.1", "1.2", "1.3"] | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CustomCreateResponse:
+        """
+        Register a new custom domain for an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          domain: Name of the custom domain to be added.
+
+          enabled: Whether to enable public bucket access at the custom domain. If undefined, the
+              domain will be enabled.
+
+          zone_id: Zone ID of the custom domain.
+
+          ciphers: An allowlist of ciphers for TLS termination. These ciphers must be in the
+              BoringSSL format.
+
+          min_tls: Minimum TLS Version the custom domain will accept for incoming connections. If
+              not set, defaults to 1.0.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._post(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom",
+            body=await async_maybe_transform(
+                {
+                    "domain": domain,
+                    "enabled": enabled,
+                    "zone_id": zone_id,
+                    "ciphers": ciphers,
+                    "min_tls": min_tls,
+                },
+                custom_create_params.CustomCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CustomCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CustomCreateResponse], ResultWrapper[CustomCreateResponse]),
+        )
+
+    async def update(
+        self,
+        domain: str,
+        *,
+        account_id: str,
+        bucket_name: str,
+        ciphers: SequenceNotStr[str] | Omit = omit,
+        enabled: bool | Omit = omit,
+        min_tls: Literal["1.0", "1.1", "1.2", "1.3"] | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CustomUpdateResponse:
+        """
+        Edit the configuration for a custom domain on an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          domain: Name of the custom domain.
+
+          ciphers: An allowlist of ciphers for TLS termination. These ciphers must be in the
+              BoringSSL format.
+
+          enabled: Whether to enable public bucket access at the specified custom domain.
+
+          min_tls: Minimum TLS Version the custom domain will accept for incoming connections. If
+              not set, defaults to previous value.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        if not domain:
+            raise ValueError(f"Expected a non-empty value for `domain` but received {domain!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._put(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom/{domain}",
+            body=await async_maybe_transform(
+                {
+                    "ciphers": ciphers,
+                    "enabled": enabled,
+                    "min_tls": min_tls,
+                },
+                custom_update_params.CustomUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CustomUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CustomUpdateResponse], ResultWrapper[CustomUpdateResponse]),
+        )
+
+    async def list(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CustomListResponse:
+        """
+        Gets a list of all custom domains registered with an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._get(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CustomListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CustomListResponse], ResultWrapper[CustomListResponse]),
+        )
+
+    async def delete(
+        self,
+        domain: str,
+        *,
+        account_id: str,
+        bucket_name: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CustomDeleteResponse:
+        """
+        Remove custom domain registration from an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          domain: Name of the custom domain.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        if not domain:
+            raise ValueError(f"Expected a non-empty value for `domain` but received {domain!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._delete(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom/{domain}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CustomDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CustomDeleteResponse], ResultWrapper[CustomDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        domain: str,
+        *,
+        account_id: str,
+        bucket_name: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CustomGetResponse:
+        """
+        Get the configuration for a custom domain on an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          domain: Name of the custom domain.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        if not domain:
+            raise ValueError(f"Expected a non-empty value for `domain` but received {domain!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._get(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom/{domain}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CustomGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CustomGetResponse], ResultWrapper[CustomGetResponse]),
+        )
+
+
+class CustomResourceWithRawResponse:
+    def __init__(self, custom: CustomResource) -> None:
+        self._custom = custom
+
+        self.create = to_raw_response_wrapper(
+            custom.create,
+        )
+        self.update = to_raw_response_wrapper(
+            custom.update,
+        )
+        self.list = to_raw_response_wrapper(
+            custom.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            custom.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            custom.get,
+        )
+
+
+class AsyncCustomResourceWithRawResponse:
+    def __init__(self, custom: AsyncCustomResource) -> None:
+        self._custom = custom
+
+        self.create = async_to_raw_response_wrapper(
+            custom.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            custom.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            custom.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            custom.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            custom.get,
+        )
+
+
+class CustomResourceWithStreamingResponse:
+    def __init__(self, custom: CustomResource) -> None:
+        self._custom = custom
+
+        self.create = to_streamed_response_wrapper(
+            custom.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            custom.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            custom.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            custom.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            custom.get,
+        )
+
+
+class AsyncCustomResourceWithStreamingResponse:
+    def __init__(self, custom: AsyncCustomResource) -> None:
+        self._custom = custom
+
+        self.create = async_to_streamed_response_wrapper(
+            custom.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            custom.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            custom.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            custom.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            custom.get,
+        )
diff --git a/src/cloudflare/resources/r2/buckets/domains/domains.py b/src/cloudflare/resources/r2/buckets/domains/domains.py
new file mode 100644
index 00000000000..f7f4be6c72f
--- /dev/null
+++ b/src/cloudflare/resources/r2/buckets/domains/domains.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .custom import (
+    CustomResource,
+    AsyncCustomResource,
+    CustomResourceWithRawResponse,
+    AsyncCustomResourceWithRawResponse,
+    CustomResourceWithStreamingResponse,
+    AsyncCustomResourceWithStreamingResponse,
+)
+from .managed import (
+    ManagedResource,
+    AsyncManagedResource,
+    ManagedResourceWithRawResponse,
+    AsyncManagedResourceWithRawResponse,
+    ManagedResourceWithStreamingResponse,
+    AsyncManagedResourceWithStreamingResponse,
+)
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["DomainsResource", "AsyncDomainsResource"]
+
+
+class DomainsResource(SyncAPIResource):
+    @cached_property
+    def custom(self) -> CustomResource:
+        return CustomResource(self._client)
+
+    @cached_property
+    def managed(self) -> ManagedResource:
+        return ManagedResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> DomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return DomainsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> DomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return DomainsResourceWithStreamingResponse(self)
+
+
+class AsyncDomainsResource(AsyncAPIResource):
+    @cached_property
+    def custom(self) -> AsyncCustomResource:
+        return AsyncCustomResource(self._client)
+
+    @cached_property
+    def managed(self) -> AsyncManagedResource:
+        return AsyncManagedResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncDomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncDomainsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncDomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncDomainsResourceWithStreamingResponse(self)
+
+
+class DomainsResourceWithRawResponse:
+    def __init__(self, domains: DomainsResource) -> None:
+        self._domains = domains
+
+    @cached_property
+    def custom(self) -> CustomResourceWithRawResponse:
+        return CustomResourceWithRawResponse(self._domains.custom)
+
+    @cached_property
+    def managed(self) -> ManagedResourceWithRawResponse:
+        return ManagedResourceWithRawResponse(self._domains.managed)
+
+
+class AsyncDomainsResourceWithRawResponse:
+    def __init__(self, domains: AsyncDomainsResource) -> None:
+        self._domains = domains
+
+    @cached_property
+    def custom(self) -> AsyncCustomResourceWithRawResponse:
+        return AsyncCustomResourceWithRawResponse(self._domains.custom)
+
+    @cached_property
+    def managed(self) -> AsyncManagedResourceWithRawResponse:
+        return AsyncManagedResourceWithRawResponse(self._domains.managed)
+
+
+class DomainsResourceWithStreamingResponse:
+    def __init__(self, domains: DomainsResource) -> None:
+        self._domains = domains
+
+    @cached_property
+    def custom(self) -> CustomResourceWithStreamingResponse:
+        return CustomResourceWithStreamingResponse(self._domains.custom)
+
+    @cached_property
+    def managed(self) -> ManagedResourceWithStreamingResponse:
+        return ManagedResourceWithStreamingResponse(self._domains.managed)
+
+
+class AsyncDomainsResourceWithStreamingResponse:
+    def __init__(self, domains: AsyncDomainsResource) -> None:
+        self._domains = domains
+
+    @cached_property
+    def custom(self) -> AsyncCustomResourceWithStreamingResponse:
+        return AsyncCustomResourceWithStreamingResponse(self._domains.custom)
+
+    @cached_property
+    def managed(self) -> AsyncManagedResourceWithStreamingResponse:
+        return AsyncManagedResourceWithStreamingResponse(self._domains.managed)
diff --git a/src/cloudflare/resources/r2/buckets/domains/managed.py b/src/cloudflare/resources/r2/buckets/domains/managed.py
new file mode 100644
index 00000000000..393631a44fa
--- /dev/null
+++ b/src/cloudflare/resources/r2/buckets/domains/managed.py
@@ -0,0 +1,328 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import is_given, maybe_transform, strip_not_given, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.r2.buckets.domains import managed_update_params
+from .....types.r2.buckets.domains.managed_list_response import ManagedListResponse
+from .....types.r2.buckets.domains.managed_update_response import ManagedUpdateResponse
+
+__all__ = ["ManagedResource", "AsyncManagedResource"]
+
+
+class ManagedResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ManagedResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ManagedResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ManagedResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ManagedResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        enabled: bool,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ManagedUpdateResponse:
+        """
+        Updates state of public access over the bucket's R2-managed (r2.dev) domain.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          enabled: Whether to enable public bucket access at the r2.dev domain.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._put(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/domains/managed",
+            body=maybe_transform({"enabled": enabled}, managed_update_params.ManagedUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ManagedUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ManagedUpdateResponse], ResultWrapper[ManagedUpdateResponse]),
+        )
+
+    def list(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ManagedListResponse:
+        """
+        Gets state of public access over the bucket's R2-managed (r2.dev) domain.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._get(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/domains/managed",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ManagedListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ManagedListResponse], ResultWrapper[ManagedListResponse]),
+        )
+
+
+class AsyncManagedResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncManagedResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncManagedResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncManagedResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncManagedResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        enabled: bool,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ManagedUpdateResponse:
+        """
+        Updates state of public access over the bucket's R2-managed (r2.dev) domain.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          enabled: Whether to enable public bucket access at the r2.dev domain.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._put(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/domains/managed",
+            body=await async_maybe_transform({"enabled": enabled}, managed_update_params.ManagedUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ManagedUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ManagedUpdateResponse], ResultWrapper[ManagedUpdateResponse]),
+        )
+
+    async def list(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ManagedListResponse:
+        """
+        Gets state of public access over the bucket's R2-managed (r2.dev) domain.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._get(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/domains/managed",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ManagedListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ManagedListResponse], ResultWrapper[ManagedListResponse]),
+        )
+
+
+class ManagedResourceWithRawResponse:
+    def __init__(self, managed: ManagedResource) -> None:
+        self._managed = managed
+
+        self.update = to_raw_response_wrapper(
+            managed.update,
+        )
+        self.list = to_raw_response_wrapper(
+            managed.list,
+        )
+
+
+class AsyncManagedResourceWithRawResponse:
+    def __init__(self, managed: AsyncManagedResource) -> None:
+        self._managed = managed
+
+        self.update = async_to_raw_response_wrapper(
+            managed.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            managed.list,
+        )
+
+
+class ManagedResourceWithStreamingResponse:
+    def __init__(self, managed: ManagedResource) -> None:
+        self._managed = managed
+
+        self.update = to_streamed_response_wrapper(
+            managed.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            managed.list,
+        )
+
+
+class AsyncManagedResourceWithStreamingResponse:
+    def __init__(self, managed: AsyncManagedResource) -> None:
+        self._managed = managed
+
+        self.update = async_to_streamed_response_wrapper(
+            managed.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            managed.list,
+        )
diff --git a/src/cloudflare/resources/r2/buckets/event_notifications.py b/src/cloudflare/resources/r2/buckets/event_notifications.py
new file mode 100644
index 00000000000..dae2a99ed1a
--- /dev/null
+++ b/src/cloudflare/resources/r2/buckets/event_notifications.py
@@ -0,0 +1,592 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import is_given, maybe_transform, strip_not_given, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.r2.buckets import event_notification_update_params
+from ....types.r2.buckets.event_notification_get_response import EventNotificationGetResponse
+from ....types.r2.buckets.event_notification_list_response import EventNotificationListResponse
+
+__all__ = ["EventNotificationsResource", "AsyncEventNotificationsResource"]
+
+
+class EventNotificationsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> EventNotificationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return EventNotificationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> EventNotificationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return EventNotificationsResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        bucket_name: str,
+        rules: Iterable[event_notification_update_params.Rule],
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Create event notification rule.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          queue_id: Queue ID.
+
+          rules: Array of rules to drive notifications.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._put(
+            f"/accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}",
+            body=maybe_transform({"rules": rules}, event_notification_update_params.EventNotificationUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def list(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EventNotificationListResponse:
+        """
+        List all event notification rules for a bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._get(
+            f"/accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[EventNotificationListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[EventNotificationListResponse], ResultWrapper[EventNotificationListResponse]),
+        )
+
+    def delete(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        bucket_name: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """Delete an event notification rule.
+
+        **If no body is provided, all rules for
+        specified queue will be deleted**.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          queue_id: Queue ID.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._delete(
+            f"/accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def get(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        bucket_name: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EventNotificationGetResponse:
+        """
+        Get a single event notification rule.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          queue_id: Queue ID.
+
+          jurisdiction: The bucket jurisdiction.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._get(
+            f"/accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[EventNotificationGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[EventNotificationGetResponse], ResultWrapper[EventNotificationGetResponse]),
+        )
+
+
+class AsyncEventNotificationsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncEventNotificationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncEventNotificationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncEventNotificationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncEventNotificationsResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        bucket_name: str,
+        rules: Iterable[event_notification_update_params.Rule],
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Create event notification rule.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          queue_id: Queue ID.
+
+          rules: Array of rules to drive notifications.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._put(
+            f"/accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}",
+            body=await async_maybe_transform(
+                {"rules": rules}, event_notification_update_params.EventNotificationUpdateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def list(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EventNotificationListResponse:
+        """
+        List all event notification rules for a bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._get(
+            f"/accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[EventNotificationListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[EventNotificationListResponse], ResultWrapper[EventNotificationListResponse]),
+        )
+
+    async def delete(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        bucket_name: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """Delete an event notification rule.
+
+        **If no body is provided, all rules for
+        specified queue will be deleted**.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          queue_id: Queue ID.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._delete(
+            f"/accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def get(
+        self,
+        queue_id: str,
+        *,
+        account_id: str,
+        bucket_name: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> EventNotificationGetResponse:
+        """
+        Get a single event notification rule.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          queue_id: Queue ID.
+
+          jurisdiction: The bucket jurisdiction.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        if not queue_id:
+            raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._get(
+            f"/accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[EventNotificationGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[EventNotificationGetResponse], ResultWrapper[EventNotificationGetResponse]),
+        )
+
+
+class EventNotificationsResourceWithRawResponse:
+    def __init__(self, event_notifications: EventNotificationsResource) -> None:
+        self._event_notifications = event_notifications
+
+        self.update = to_raw_response_wrapper(
+            event_notifications.update,
+        )
+        self.list = to_raw_response_wrapper(
+            event_notifications.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            event_notifications.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            event_notifications.get,
+        )
+
+
+class AsyncEventNotificationsResourceWithRawResponse:
+    def __init__(self, event_notifications: AsyncEventNotificationsResource) -> None:
+        self._event_notifications = event_notifications
+
+        self.update = async_to_raw_response_wrapper(
+            event_notifications.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            event_notifications.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            event_notifications.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            event_notifications.get,
+        )
+
+
+class EventNotificationsResourceWithStreamingResponse:
+    def __init__(self, event_notifications: EventNotificationsResource) -> None:
+        self._event_notifications = event_notifications
+
+        self.update = to_streamed_response_wrapper(
+            event_notifications.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            event_notifications.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            event_notifications.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            event_notifications.get,
+        )
+
+
+class AsyncEventNotificationsResourceWithStreamingResponse:
+    def __init__(self, event_notifications: AsyncEventNotificationsResource) -> None:
+        self._event_notifications = event_notifications
+
+        self.update = async_to_streamed_response_wrapper(
+            event_notifications.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            event_notifications.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            event_notifications.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            event_notifications.get,
+        )
diff --git a/src/cloudflare/resources/r2/buckets/lifecycle.py b/src/cloudflare/resources/r2/buckets/lifecycle.py
new file mode 100644
index 00000000000..03ec914c78c
--- /dev/null
+++ b/src/cloudflare/resources/r2/buckets/lifecycle.py
@@ -0,0 +1,323 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import is_given, maybe_transform, strip_not_given, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.r2.buckets import lifecycle_update_params
+from ....types.r2.buckets.lifecycle_get_response import LifecycleGetResponse
+
+__all__ = ["LifecycleResource", "AsyncLifecycleResource"]
+
+
+class LifecycleResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> LifecycleResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return LifecycleResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> LifecycleResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return LifecycleResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        rules: Iterable[lifecycle_update_params.Rule] | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Set the object lifecycle rules for a bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._put(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/lifecycle",
+            body=maybe_transform({"rules": rules}, lifecycle_update_params.LifecycleUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def get(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LifecycleGetResponse:
+        """
+        Get object lifecycle rules for a bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._get(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/lifecycle",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[LifecycleGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LifecycleGetResponse], ResultWrapper[LifecycleGetResponse]),
+        )
+
+
+class AsyncLifecycleResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncLifecycleResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncLifecycleResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncLifecycleResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncLifecycleResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        rules: Iterable[lifecycle_update_params.Rule] | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Set the object lifecycle rules for a bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._put(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/lifecycle",
+            body=await async_maybe_transform({"rules": rules}, lifecycle_update_params.LifecycleUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def get(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LifecycleGetResponse:
+        """
+        Get object lifecycle rules for a bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._get(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/lifecycle",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[LifecycleGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LifecycleGetResponse], ResultWrapper[LifecycleGetResponse]),
+        )
+
+
+class LifecycleResourceWithRawResponse:
+    def __init__(self, lifecycle: LifecycleResource) -> None:
+        self._lifecycle = lifecycle
+
+        self.update = to_raw_response_wrapper(
+            lifecycle.update,
+        )
+        self.get = to_raw_response_wrapper(
+            lifecycle.get,
+        )
+
+
+class AsyncLifecycleResourceWithRawResponse:
+    def __init__(self, lifecycle: AsyncLifecycleResource) -> None:
+        self._lifecycle = lifecycle
+
+        self.update = async_to_raw_response_wrapper(
+            lifecycle.update,
+        )
+        self.get = async_to_raw_response_wrapper(
+            lifecycle.get,
+        )
+
+
+class LifecycleResourceWithStreamingResponse:
+    def __init__(self, lifecycle: LifecycleResource) -> None:
+        self._lifecycle = lifecycle
+
+        self.update = to_streamed_response_wrapper(
+            lifecycle.update,
+        )
+        self.get = to_streamed_response_wrapper(
+            lifecycle.get,
+        )
+
+
+class AsyncLifecycleResourceWithStreamingResponse:
+    def __init__(self, lifecycle: AsyncLifecycleResource) -> None:
+        self._lifecycle = lifecycle
+
+        self.update = async_to_streamed_response_wrapper(
+            lifecycle.update,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            lifecycle.get,
+        )
diff --git a/src/cloudflare/resources/r2/buckets/locks.py b/src/cloudflare/resources/r2/buckets/locks.py
new file mode 100644
index 00000000000..27ddaf78b47
--- /dev/null
+++ b/src/cloudflare/resources/r2/buckets/locks.py
@@ -0,0 +1,323 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import is_given, maybe_transform, strip_not_given, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.r2.buckets import lock_update_params
+from ....types.r2.buckets.lock_get_response import LockGetResponse
+
+__all__ = ["LocksResource", "AsyncLocksResource"]
+
+
+class LocksResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> LocksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return LocksResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> LocksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return LocksResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        rules: Iterable[lock_update_params.Rule] | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Set lock rules for a bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._put(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/lock",
+            body=maybe_transform({"rules": rules}, lock_update_params.LockUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def get(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LockGetResponse:
+        """
+        Get lock rules for a bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._get(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/lock",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[LockGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LockGetResponse], ResultWrapper[LockGetResponse]),
+        )
+
+
+class AsyncLocksResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncLocksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncLocksResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncLocksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncLocksResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        rules: Iterable[lock_update_params.Rule] | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Set lock rules for a bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._put(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/lock",
+            body=await async_maybe_transform({"rules": rules}, lock_update_params.LockUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def get(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LockGetResponse:
+        """
+        Get lock rules for a bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._get(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/lock",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[LockGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LockGetResponse], ResultWrapper[LockGetResponse]),
+        )
+
+
+class LocksResourceWithRawResponse:
+    def __init__(self, locks: LocksResource) -> None:
+        self._locks = locks
+
+        self.update = to_raw_response_wrapper(
+            locks.update,
+        )
+        self.get = to_raw_response_wrapper(
+            locks.get,
+        )
+
+
+class AsyncLocksResourceWithRawResponse:
+    def __init__(self, locks: AsyncLocksResource) -> None:
+        self._locks = locks
+
+        self.update = async_to_raw_response_wrapper(
+            locks.update,
+        )
+        self.get = async_to_raw_response_wrapper(
+            locks.get,
+        )
+
+
+class LocksResourceWithStreamingResponse:
+    def __init__(self, locks: LocksResource) -> None:
+        self._locks = locks
+
+        self.update = to_streamed_response_wrapper(
+            locks.update,
+        )
+        self.get = to_streamed_response_wrapper(
+            locks.get,
+        )
+
+
+class AsyncLocksResourceWithStreamingResponse:
+    def __init__(self, locks: AsyncLocksResource) -> None:
+        self._locks = locks
+
+        self.update = async_to_streamed_response_wrapper(
+            locks.update,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            locks.get,
+        )
diff --git a/src/cloudflare/resources/r2/buckets/metrics.py b/src/cloudflare/resources/r2/buckets/metrics.py
new file mode 100644
index 00000000000..3be10e1dea6
--- /dev/null
+++ b/src/cloudflare/resources/r2/buckets/metrics.py
@@ -0,0 +1,182 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.r2.buckets.metric_list_response import MetricListResponse
+
+__all__ = ["MetricsResource", "AsyncMetricsResource"]
+
+
+class MetricsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> MetricsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return MetricsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> MetricsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return MetricsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MetricListResponse:
+        """Get Storage/Object Count Metrics across all buckets in your account.
+
+        Note that
+        Account-Level Metrics may not immediately reflect the latest data.
+
+        Args:
+          account_id: Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/r2/metrics",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[MetricListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[MetricListResponse], ResultWrapper[MetricListResponse]),
+        )
+
+
+class AsyncMetricsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncMetricsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncMetricsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncMetricsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncMetricsResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MetricListResponse:
+        """Get Storage/Object Count Metrics across all buckets in your account.
+
+        Note that
+        Account-Level Metrics may not immediately reflect the latest data.
+
+        Args:
+          account_id: Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/r2/metrics",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[MetricListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[MetricListResponse], ResultWrapper[MetricListResponse]),
+        )
+
+
+class MetricsResourceWithRawResponse:
+    def __init__(self, metrics: MetricsResource) -> None:
+        self._metrics = metrics
+
+        self.list = to_raw_response_wrapper(
+            metrics.list,
+        )
+
+
+class AsyncMetricsResourceWithRawResponse:
+    def __init__(self, metrics: AsyncMetricsResource) -> None:
+        self._metrics = metrics
+
+        self.list = async_to_raw_response_wrapper(
+            metrics.list,
+        )
+
+
+class MetricsResourceWithStreamingResponse:
+    def __init__(self, metrics: MetricsResource) -> None:
+        self._metrics = metrics
+
+        self.list = to_streamed_response_wrapper(
+            metrics.list,
+        )
+
+
+class AsyncMetricsResourceWithStreamingResponse:
+    def __init__(self, metrics: AsyncMetricsResource) -> None:
+        self._metrics = metrics
+
+        self.list = async_to_streamed_response_wrapper(
+            metrics.list,
+        )
diff --git a/src/cloudflare/resources/r2/buckets/sippy.py b/src/cloudflare/resources/r2/buckets/sippy.py
new file mode 100644
index 00000000000..af73499657f
--- /dev/null
+++ b/src/cloudflare/resources/r2/buckets/sippy.py
@@ -0,0 +1,670 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal, overload
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import is_given, required_args, maybe_transform, strip_not_given, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.r2.buckets import sippy_update_params
+from ....types.r2.buckets.sippy import Sippy
+from ....types.r2.buckets.sippy_delete_response import SippyDeleteResponse
+
+__all__ = ["SippyResource", "AsyncSippyResource"]
+
+
+class SippyResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SippyResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SippyResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SippyResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SippyResourceWithStreamingResponse(self)
+
+    @overload
+    def update(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        destination: sippy_update_params.R2EnableSippyAwsDestination | Omit = omit,
+        source: sippy_update_params.R2EnableSippyAwsSource | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Sippy:
+        """
+        Sets configuration for Sippy for an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          destination: R2 bucket to copy objects to.
+
+          source: AWS S3 bucket to copy objects from.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def update(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        destination: sippy_update_params.R2EnableSippyGcsDestination | Omit = omit,
+        source: sippy_update_params.R2EnableSippyGcsSource | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Sippy:
+        """
+        Sets configuration for Sippy for an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          destination: R2 bucket to copy objects to.
+
+          source: GCS bucket to copy objects from.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def update(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        destination: sippy_update_params.R2EnableSippyS3Destination | Omit = omit,
+        source: sippy_update_params.R2EnableSippyS3Source | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Sippy:
+        """
+        Sets configuration for Sippy for an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          destination: R2 bucket to copy objects to.
+
+          source: General S3-compatible provider to copy objects from.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id"])
+    def update(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        destination: sippy_update_params.R2EnableSippyAwsDestination
+        | sippy_update_params.R2EnableSippyGcsDestination
+        | sippy_update_params.R2EnableSippyS3Destination
+        | Omit = omit,
+        source: sippy_update_params.R2EnableSippyAwsSource
+        | sippy_update_params.R2EnableSippyGcsSource
+        | sippy_update_params.R2EnableSippyS3Source
+        | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Sippy:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._put(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/sippy",
+            body=maybe_transform(
+                {
+                    "destination": destination,
+                    "source": source,
+                },
+                sippy_update_params.SippyUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Sippy]._unwrapper,
+            ),
+            cast_to=cast(Type[Sippy], ResultWrapper[Sippy]),
+        )
+
+    def delete(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SippyDeleteResponse:
+        """
+        Disables Sippy on this bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._delete(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/sippy",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SippyDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SippyDeleteResponse], ResultWrapper[SippyDeleteResponse]),
+        )
+
+    def get(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Sippy:
+        """
+        Gets configuration for Sippy for an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return self._get(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/sippy",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Sippy]._unwrapper,
+            ),
+            cast_to=cast(Type[Sippy], ResultWrapper[Sippy]),
+        )
+
+
+class AsyncSippyResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSippyResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSippyResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSippyResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSippyResourceWithStreamingResponse(self)
+
+    @overload
+    async def update(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        destination: sippy_update_params.R2EnableSippyAwsDestination | Omit = omit,
+        source: sippy_update_params.R2EnableSippyAwsSource | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Sippy:
+        """
+        Sets configuration for Sippy for an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          destination: R2 bucket to copy objects to.
+
+          source: AWS S3 bucket to copy objects from.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def update(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        destination: sippy_update_params.R2EnableSippyGcsDestination | Omit = omit,
+        source: sippy_update_params.R2EnableSippyGcsSource | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Sippy:
+        """
+        Sets configuration for Sippy for an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          destination: R2 bucket to copy objects to.
+
+          source: GCS bucket to copy objects from.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def update(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        destination: sippy_update_params.R2EnableSippyS3Destination | Omit = omit,
+        source: sippy_update_params.R2EnableSippyS3Source | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Sippy:
+        """
+        Sets configuration for Sippy for an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          destination: R2 bucket to copy objects to.
+
+          source: General S3-compatible provider to copy objects from.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id"])
+    async def update(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        destination: sippy_update_params.R2EnableSippyAwsDestination
+        | sippy_update_params.R2EnableSippyGcsDestination
+        | sippy_update_params.R2EnableSippyS3Destination
+        | Omit = omit,
+        source: sippy_update_params.R2EnableSippyAwsSource
+        | sippy_update_params.R2EnableSippyGcsSource
+        | sippy_update_params.R2EnableSippyS3Source
+        | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Sippy:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._put(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/sippy",
+            body=await async_maybe_transform(
+                {
+                    "destination": destination,
+                    "source": source,
+                },
+                sippy_update_params.SippyUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Sippy]._unwrapper,
+            ),
+            cast_to=cast(Type[Sippy], ResultWrapper[Sippy]),
+        )
+
+    async def delete(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SippyDeleteResponse:
+        """
+        Disables Sippy on this bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._delete(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/sippy",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SippyDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SippyDeleteResponse], ResultWrapper[SippyDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Sippy:
+        """
+        Gets configuration for Sippy for an existing R2 bucket.
+
+        Args:
+          account_id: Account ID.
+
+          bucket_name: Name of the bucket.
+
+          jurisdiction: Jurisdiction where objects in this bucket are guaranteed to be stored.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {
+            **strip_not_given({"cf-r2-jurisdiction": str(jurisdiction) if is_given(jurisdiction) else not_given}),
+            **(extra_headers or {}),
+        }
+        return await self._get(
+            f"/accounts/{account_id}/r2/buckets/{bucket_name}/sippy",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Sippy]._unwrapper,
+            ),
+            cast_to=cast(Type[Sippy], ResultWrapper[Sippy]),
+        )
+
+
+class SippyResourceWithRawResponse:
+    def __init__(self, sippy: SippyResource) -> None:
+        self._sippy = sippy
+
+        self.update = to_raw_response_wrapper(
+            sippy.update,
+        )
+        self.delete = to_raw_response_wrapper(
+            sippy.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            sippy.get,
+        )
+
+
+class AsyncSippyResourceWithRawResponse:
+    def __init__(self, sippy: AsyncSippyResource) -> None:
+        self._sippy = sippy
+
+        self.update = async_to_raw_response_wrapper(
+            sippy.update,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            sippy.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            sippy.get,
+        )
+
+
+class SippyResourceWithStreamingResponse:
+    def __init__(self, sippy: SippyResource) -> None:
+        self._sippy = sippy
+
+        self.update = to_streamed_response_wrapper(
+            sippy.update,
+        )
+        self.delete = to_streamed_response_wrapper(
+            sippy.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            sippy.get,
+        )
+
+
+class AsyncSippyResourceWithStreamingResponse:
+    def __init__(self, sippy: AsyncSippyResource) -> None:
+        self._sippy = sippy
+
+        self.update = async_to_streamed_response_wrapper(
+            sippy.update,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            sippy.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            sippy.get,
+        )
diff --git a/src/cloudflare/resources/r2/r2.py b/src/cloudflare/resources/r2/r2.py
index a9999cd369a..cf0e49106d0 100644
--- a/src/cloudflare/resources/r2/r2.py
+++ b/src/cloudflare/resources/r2/r2.py
@@ -2,15 +2,9 @@
 
 from __future__ import annotations
 
-from .sippy import (
-    SippyResource,
-    AsyncSippyResource,
-    SippyResourceWithRawResponse,
-    AsyncSippyResourceWithRawResponse,
-    SippyResourceWithStreamingResponse,
-    AsyncSippyResourceWithStreamingResponse,
-)
-from .buckets import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .buckets.buckets import (
     BucketsResource,
     AsyncBucketsResource,
     BucketsResourceWithRawResponse,
@@ -18,8 +12,6 @@
     BucketsResourceWithStreamingResponse,
     AsyncBucketsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
 from .temporary_credentials import (
     TemporaryCredentialsResource,
     AsyncTemporaryCredentialsResource,
@@ -28,6 +20,14 @@
     TemporaryCredentialsResourceWithStreamingResponse,
     AsyncTemporaryCredentialsResourceWithStreamingResponse,
 )
+from .super_slurper.super_slurper import (
+    SuperSlurperResource,
+    AsyncSuperSlurperResource,
+    SuperSlurperResourceWithRawResponse,
+    AsyncSuperSlurperResourceWithRawResponse,
+    SuperSlurperResourceWithStreamingResponse,
+    AsyncSuperSlurperResourceWithStreamingResponse,
+)
 
 __all__ = ["R2Resource", "AsyncR2Resource"]
 
@@ -37,20 +37,31 @@ class R2Resource(SyncAPIResource):
     def buckets(self) -> BucketsResource:
         return BucketsResource(self._client)
 
-    @cached_property
-    def sippy(self) -> SippyResource:
-        return SippyResource(self._client)
-
     @cached_property
     def temporary_credentials(self) -> TemporaryCredentialsResource:
         return TemporaryCredentialsResource(self._client)
 
+    @cached_property
+    def super_slurper(self) -> SuperSlurperResource:
+        return SuperSlurperResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> R2ResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return R2ResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> R2ResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return R2ResourceWithStreamingResponse(self)
 
 
@@ -59,20 +70,31 @@ class AsyncR2Resource(AsyncAPIResource):
     def buckets(self) -> AsyncBucketsResource:
         return AsyncBucketsResource(self._client)
 
-    @cached_property
-    def sippy(self) -> AsyncSippyResource:
-        return AsyncSippyResource(self._client)
-
     @cached_property
     def temporary_credentials(self) -> AsyncTemporaryCredentialsResource:
         return AsyncTemporaryCredentialsResource(self._client)
 
+    @cached_property
+    def super_slurper(self) -> AsyncSuperSlurperResource:
+        return AsyncSuperSlurperResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncR2ResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncR2ResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncR2ResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncR2ResourceWithStreamingResponse(self)
 
 
@@ -84,14 +106,14 @@ def __init__(self, r2: R2Resource) -> None:
     def buckets(self) -> BucketsResourceWithRawResponse:
         return BucketsResourceWithRawResponse(self._r2.buckets)
 
-    @cached_property
-    def sippy(self) -> SippyResourceWithRawResponse:
-        return SippyResourceWithRawResponse(self._r2.sippy)
-
     @cached_property
     def temporary_credentials(self) -> TemporaryCredentialsResourceWithRawResponse:
         return TemporaryCredentialsResourceWithRawResponse(self._r2.temporary_credentials)
 
+    @cached_property
+    def super_slurper(self) -> SuperSlurperResourceWithRawResponse:
+        return SuperSlurperResourceWithRawResponse(self._r2.super_slurper)
+
 
 class AsyncR2ResourceWithRawResponse:
     def __init__(self, r2: AsyncR2Resource) -> None:
@@ -101,14 +123,14 @@ def __init__(self, r2: AsyncR2Resource) -> None:
     def buckets(self) -> AsyncBucketsResourceWithRawResponse:
         return AsyncBucketsResourceWithRawResponse(self._r2.buckets)
 
-    @cached_property
-    def sippy(self) -> AsyncSippyResourceWithRawResponse:
-        return AsyncSippyResourceWithRawResponse(self._r2.sippy)
-
     @cached_property
     def temporary_credentials(self) -> AsyncTemporaryCredentialsResourceWithRawResponse:
         return AsyncTemporaryCredentialsResourceWithRawResponse(self._r2.temporary_credentials)
 
+    @cached_property
+    def super_slurper(self) -> AsyncSuperSlurperResourceWithRawResponse:
+        return AsyncSuperSlurperResourceWithRawResponse(self._r2.super_slurper)
+
 
 class R2ResourceWithStreamingResponse:
     def __init__(self, r2: R2Resource) -> None:
@@ -118,14 +140,14 @@ def __init__(self, r2: R2Resource) -> None:
     def buckets(self) -> BucketsResourceWithStreamingResponse:
         return BucketsResourceWithStreamingResponse(self._r2.buckets)
 
-    @cached_property
-    def sippy(self) -> SippyResourceWithStreamingResponse:
-        return SippyResourceWithStreamingResponse(self._r2.sippy)
-
     @cached_property
     def temporary_credentials(self) -> TemporaryCredentialsResourceWithStreamingResponse:
         return TemporaryCredentialsResourceWithStreamingResponse(self._r2.temporary_credentials)
 
+    @cached_property
+    def super_slurper(self) -> SuperSlurperResourceWithStreamingResponse:
+        return SuperSlurperResourceWithStreamingResponse(self._r2.super_slurper)
+
 
 class AsyncR2ResourceWithStreamingResponse:
     def __init__(self, r2: AsyncR2Resource) -> None:
@@ -135,10 +157,10 @@ def __init__(self, r2: AsyncR2Resource) -> None:
     def buckets(self) -> AsyncBucketsResourceWithStreamingResponse:
         return AsyncBucketsResourceWithStreamingResponse(self._r2.buckets)
 
-    @cached_property
-    def sippy(self) -> AsyncSippyResourceWithStreamingResponse:
-        return AsyncSippyResourceWithStreamingResponse(self._r2.sippy)
-
     @cached_property
     def temporary_credentials(self) -> AsyncTemporaryCredentialsResourceWithStreamingResponse:
         return AsyncTemporaryCredentialsResourceWithStreamingResponse(self._r2.temporary_credentials)
+
+    @cached_property
+    def super_slurper(self) -> AsyncSuperSlurperResourceWithStreamingResponse:
+        return AsyncSuperSlurperResourceWithStreamingResponse(self._r2.super_slurper)
diff --git a/src/cloudflare/resources/r2/sippy.py b/src/cloudflare/resources/r2/sippy.py
deleted file mode 100644
index 178f4279f44..00000000000
--- a/src/cloudflare/resources/r2/sippy.py
+++ /dev/null
@@ -1,513 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, cast, overload
-
-import httpx
-
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    required_args,
-    maybe_transform,
-    async_maybe_transform,
-)
-from ..._compat import cached_property
-from ...types.r2 import sippy_update_params
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
-from ...types.r2.sippy import Sippy
-from ...types.r2.sippy_delete_response import SippyDeleteResponse
-
-__all__ = ["SippyResource", "AsyncSippyResource"]
-
-
-class SippyResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> SippyResourceWithRawResponse:
-        return SippyResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> SippyResourceWithStreamingResponse:
-        return SippyResourceWithStreamingResponse(self)
-
-    @overload
-    def update(
-        self,
-        bucket_name: str,
-        *,
-        account_id: str,
-        destination: sippy_update_params.R2EnableSippyAwsDestination | NotGiven = NOT_GIVEN,
-        source: sippy_update_params.R2EnableSippyAwsSource | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Sippy:
-        """
-        Sets configuration for Sippy for an existing R2 bucket.
-
-        Args:
-          account_id: Account ID
-
-          bucket_name: Name of the bucket
-
-          destination: R2 bucket to copy objects to
-
-          source: AWS S3 bucket to copy objects from
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def update(
-        self,
-        bucket_name: str,
-        *,
-        account_id: str,
-        destination: sippy_update_params.R2EnableSippyGcsDestination | NotGiven = NOT_GIVEN,
-        source: sippy_update_params.R2EnableSippyGcsSource | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Sippy:
-        """
-        Sets configuration for Sippy for an existing R2 bucket.
-
-        Args:
-          account_id: Account ID
-
-          bucket_name: Name of the bucket
-
-          destination: R2 bucket to copy objects to
-
-          source: GCS bucket to copy objects from
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @required_args(["account_id"])
-    def update(
-        self,
-        bucket_name: str,
-        *,
-        account_id: str,
-        destination: sippy_update_params.R2EnableSippyAwsDestination | NotGiven = NOT_GIVEN,
-        source: sippy_update_params.R2EnableSippyAwsSource
-        | sippy_update_params.R2EnableSippyGcsSource
-        | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Sippy:
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not bucket_name:
-            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
-        return self._put(
-            f"/accounts/{account_id}/r2/buckets/{bucket_name}/sippy",
-            body=maybe_transform(
-                {
-                    "destination": destination,
-                    "source": source,
-                },
-                sippy_update_params.SippyUpdateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Sippy]._unwrapper,
-            ),
-            cast_to=cast(Type[Sippy], ResultWrapper[Sippy]),
-        )
-
-    def delete(
-        self,
-        bucket_name: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SippyDeleteResponse:
-        """
-        Disables Sippy on this bucket
-
-        Args:
-          account_id: Account ID
-
-          bucket_name: Name of the bucket
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not bucket_name:
-            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
-        return self._delete(
-            f"/accounts/{account_id}/r2/buckets/{bucket_name}/sippy",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[SippyDeleteResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[SippyDeleteResponse], ResultWrapper[SippyDeleteResponse]),
-        )
-
-    def get(
-        self,
-        bucket_name: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Sippy:
-        """
-        Gets configuration for Sippy for an existing R2 bucket.
-
-        Args:
-          account_id: Account ID
-
-          bucket_name: Name of the bucket
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not bucket_name:
-            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
-        return self._get(
-            f"/accounts/{account_id}/r2/buckets/{bucket_name}/sippy",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Sippy]._unwrapper,
-            ),
-            cast_to=cast(Type[Sippy], ResultWrapper[Sippy]),
-        )
-
-
-class AsyncSippyResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncSippyResourceWithRawResponse:
-        return AsyncSippyResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncSippyResourceWithStreamingResponse:
-        return AsyncSippyResourceWithStreamingResponse(self)
-
-    @overload
-    async def update(
-        self,
-        bucket_name: str,
-        *,
-        account_id: str,
-        destination: sippy_update_params.R2EnableSippyAwsDestination | NotGiven = NOT_GIVEN,
-        source: sippy_update_params.R2EnableSippyAwsSource | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Sippy:
-        """
-        Sets configuration for Sippy for an existing R2 bucket.
-
-        Args:
-          account_id: Account ID
-
-          bucket_name: Name of the bucket
-
-          destination: R2 bucket to copy objects to
-
-          source: AWS S3 bucket to copy objects from
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def update(
-        self,
-        bucket_name: str,
-        *,
-        account_id: str,
-        destination: sippy_update_params.R2EnableSippyGcsDestination | NotGiven = NOT_GIVEN,
-        source: sippy_update_params.R2EnableSippyGcsSource | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Sippy:
-        """
-        Sets configuration for Sippy for an existing R2 bucket.
-
-        Args:
-          account_id: Account ID
-
-          bucket_name: Name of the bucket
-
-          destination: R2 bucket to copy objects to
-
-          source: GCS bucket to copy objects from
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @required_args(["account_id"])
-    async def update(
-        self,
-        bucket_name: str,
-        *,
-        account_id: str,
-        destination: sippy_update_params.R2EnableSippyAwsDestination | NotGiven = NOT_GIVEN,
-        source: sippy_update_params.R2EnableSippyAwsSource
-        | sippy_update_params.R2EnableSippyGcsSource
-        | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Sippy:
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not bucket_name:
-            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
-        return await self._put(
-            f"/accounts/{account_id}/r2/buckets/{bucket_name}/sippy",
-            body=await async_maybe_transform(
-                {
-                    "destination": destination,
-                    "source": source,
-                },
-                sippy_update_params.SippyUpdateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Sippy]._unwrapper,
-            ),
-            cast_to=cast(Type[Sippy], ResultWrapper[Sippy]),
-        )
-
-    async def delete(
-        self,
-        bucket_name: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SippyDeleteResponse:
-        """
-        Disables Sippy on this bucket
-
-        Args:
-          account_id: Account ID
-
-          bucket_name: Name of the bucket
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not bucket_name:
-            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
-        return await self._delete(
-            f"/accounts/{account_id}/r2/buckets/{bucket_name}/sippy",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[SippyDeleteResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[SippyDeleteResponse], ResultWrapper[SippyDeleteResponse]),
-        )
-
-    async def get(
-        self,
-        bucket_name: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Sippy:
-        """
-        Gets configuration for Sippy for an existing R2 bucket.
-
-        Args:
-          account_id: Account ID
-
-          bucket_name: Name of the bucket
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not bucket_name:
-            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
-        return await self._get(
-            f"/accounts/{account_id}/r2/buckets/{bucket_name}/sippy",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Sippy]._unwrapper,
-            ),
-            cast_to=cast(Type[Sippy], ResultWrapper[Sippy]),
-        )
-
-
-class SippyResourceWithRawResponse:
-    def __init__(self, sippy: SippyResource) -> None:
-        self._sippy = sippy
-
-        self.update = to_raw_response_wrapper(
-            sippy.update,
-        )
-        self.delete = to_raw_response_wrapper(
-            sippy.delete,
-        )
-        self.get = to_raw_response_wrapper(
-            sippy.get,
-        )
-
-
-class AsyncSippyResourceWithRawResponse:
-    def __init__(self, sippy: AsyncSippyResource) -> None:
-        self._sippy = sippy
-
-        self.update = async_to_raw_response_wrapper(
-            sippy.update,
-        )
-        self.delete = async_to_raw_response_wrapper(
-            sippy.delete,
-        )
-        self.get = async_to_raw_response_wrapper(
-            sippy.get,
-        )
-
-
-class SippyResourceWithStreamingResponse:
-    def __init__(self, sippy: SippyResource) -> None:
-        self._sippy = sippy
-
-        self.update = to_streamed_response_wrapper(
-            sippy.update,
-        )
-        self.delete = to_streamed_response_wrapper(
-            sippy.delete,
-        )
-        self.get = to_streamed_response_wrapper(
-            sippy.get,
-        )
-
-
-class AsyncSippyResourceWithStreamingResponse:
-    def __init__(self, sippy: AsyncSippyResource) -> None:
-        self._sippy = sippy
-
-        self.update = async_to_streamed_response_wrapper(
-            sippy.update,
-        )
-        self.delete = async_to_streamed_response_wrapper(
-            sippy.delete,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            sippy.get,
-        )
diff --git a/src/cloudflare/resources/r2/super_slurper/__init__.py b/src/cloudflare/resources/r2/super_slurper/__init__.py
new file mode 100644
index 00000000000..42bcb91e3ea
--- /dev/null
+++ b/src/cloudflare/resources/r2/super_slurper/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .jobs import (
+    JobsResource,
+    AsyncJobsResource,
+    JobsResourceWithRawResponse,
+    AsyncJobsResourceWithRawResponse,
+    JobsResourceWithStreamingResponse,
+    AsyncJobsResourceWithStreamingResponse,
+)
+from .super_slurper import (
+    SuperSlurperResource,
+    AsyncSuperSlurperResource,
+    SuperSlurperResourceWithRawResponse,
+    AsyncSuperSlurperResourceWithRawResponse,
+    SuperSlurperResourceWithStreamingResponse,
+    AsyncSuperSlurperResourceWithStreamingResponse,
+)
+from .connectivity_precheck import (
+    ConnectivityPrecheckResource,
+    AsyncConnectivityPrecheckResource,
+    ConnectivityPrecheckResourceWithRawResponse,
+    AsyncConnectivityPrecheckResourceWithRawResponse,
+    ConnectivityPrecheckResourceWithStreamingResponse,
+    AsyncConnectivityPrecheckResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "JobsResource",
+    "AsyncJobsResource",
+    "JobsResourceWithRawResponse",
+    "AsyncJobsResourceWithRawResponse",
+    "JobsResourceWithStreamingResponse",
+    "AsyncJobsResourceWithStreamingResponse",
+    "ConnectivityPrecheckResource",
+    "AsyncConnectivityPrecheckResource",
+    "ConnectivityPrecheckResourceWithRawResponse",
+    "AsyncConnectivityPrecheckResourceWithRawResponse",
+    "ConnectivityPrecheckResourceWithStreamingResponse",
+    "AsyncConnectivityPrecheckResourceWithStreamingResponse",
+    "SuperSlurperResource",
+    "AsyncSuperSlurperResource",
+    "SuperSlurperResourceWithRawResponse",
+    "AsyncSuperSlurperResourceWithRawResponse",
+    "SuperSlurperResourceWithStreamingResponse",
+    "AsyncSuperSlurperResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/r2/super_slurper/connectivity_precheck.py b/src/cloudflare/resources/r2/super_slurper/connectivity_precheck.py
new file mode 100644
index 00000000000..2ea1083ea6f
--- /dev/null
+++ b/src/cloudflare/resources/r2/super_slurper/connectivity_precheck.py
@@ -0,0 +1,506 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal, overload
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import required_args, maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.r2.buckets import Provider
+from ....types.r2.super_slurper import connectivity_precheck_source_params, connectivity_precheck_target_params
+from ....types.r2.buckets.provider import Provider
+from ....types.r2.super_slurper.connectivity_precheck_source_response import ConnectivityPrecheckSourceResponse
+from ....types.r2.super_slurper.connectivity_precheck_target_response import ConnectivityPrecheckTargetResponse
+
+__all__ = ["ConnectivityPrecheckResource", "AsyncConnectivityPrecheckResource"]
+
+
+class ConnectivityPrecheckResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ConnectivityPrecheckResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ConnectivityPrecheckResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ConnectivityPrecheckResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ConnectivityPrecheckResourceWithStreamingResponse(self)
+
+    @overload
+    def source(
+        self,
+        *,
+        account_id: str,
+        bucket: str,
+        secret: connectivity_precheck_source_params.R2SlurperS3SourceSchemaSecret,
+        vendor: Literal["s3"],
+        endpoint: Optional[str] | Omit = omit,
+        path_prefix: Optional[str] | Omit = omit,
+        region: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConnectivityPrecheckSourceResponse]:
+        """
+        Check whether tokens are valid against the source bucket
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def source(
+        self,
+        *,
+        account_id: str,
+        bucket: str,
+        secret: connectivity_precheck_source_params.R2SlurperGcsSourceSchemaSecret,
+        vendor: Literal["gcs"],
+        path_prefix: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConnectivityPrecheckSourceResponse]:
+        """
+        Check whether tokens are valid against the source bucket
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def source(
+        self,
+        *,
+        account_id: str,
+        bucket: str,
+        secret: connectivity_precheck_source_params.R2SlurperR2SourceSchemaSecret,
+        vendor: Provider,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        path_prefix: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConnectivityPrecheckSourceResponse]:
+        """
+        Check whether tokens are valid against the source bucket
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "bucket", "secret", "vendor"])
+    def source(
+        self,
+        *,
+        account_id: str,
+        bucket: str,
+        secret: connectivity_precheck_source_params.R2SlurperS3SourceSchemaSecret
+        | connectivity_precheck_source_params.R2SlurperGcsSourceSchemaSecret
+        | connectivity_precheck_source_params.R2SlurperR2SourceSchemaSecret,
+        vendor: Literal["s3"] | Literal["gcs"] | Provider,
+        endpoint: Optional[str] | Omit = omit,
+        path_prefix: Optional[str] | Omit = omit,
+        region: Optional[str] | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConnectivityPrecheckSourceResponse]:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/slurper/source/connectivity-precheck",
+            body=maybe_transform(
+                {
+                    "bucket": bucket,
+                    "secret": secret,
+                    "vendor": vendor,
+                    "endpoint": endpoint,
+                    "path_prefix": path_prefix,
+                    "region": region,
+                    "jurisdiction": jurisdiction,
+                },
+                connectivity_precheck_source_params.ConnectivityPrecheckSourceParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ConnectivityPrecheckSourceResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[ConnectivityPrecheckSourceResponse]], ResultWrapper[ConnectivityPrecheckSourceResponse]
+            ),
+        )
+
+    def target(
+        self,
+        *,
+        account_id: str,
+        bucket: str,
+        secret: connectivity_precheck_target_params.Secret,
+        vendor: Provider,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConnectivityPrecheckTargetResponse]:
+        """
+        Check whether tokens are valid against the target bucket
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/slurper/target/connectivity-precheck",
+            body=maybe_transform(
+                {
+                    "bucket": bucket,
+                    "secret": secret,
+                    "vendor": vendor,
+                    "jurisdiction": jurisdiction,
+                },
+                connectivity_precheck_target_params.ConnectivityPrecheckTargetParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ConnectivityPrecheckTargetResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[ConnectivityPrecheckTargetResponse]], ResultWrapper[ConnectivityPrecheckTargetResponse]
+            ),
+        )
+
+
+class AsyncConnectivityPrecheckResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncConnectivityPrecheckResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncConnectivityPrecheckResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncConnectivityPrecheckResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncConnectivityPrecheckResourceWithStreamingResponse(self)
+
+    @overload
+    async def source(
+        self,
+        *,
+        account_id: str,
+        bucket: str,
+        secret: connectivity_precheck_source_params.R2SlurperS3SourceSchemaSecret,
+        vendor: Literal["s3"],
+        endpoint: Optional[str] | Omit = omit,
+        path_prefix: Optional[str] | Omit = omit,
+        region: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConnectivityPrecheckSourceResponse]:
+        """
+        Check whether tokens are valid against the source bucket
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def source(
+        self,
+        *,
+        account_id: str,
+        bucket: str,
+        secret: connectivity_precheck_source_params.R2SlurperGcsSourceSchemaSecret,
+        vendor: Literal["gcs"],
+        path_prefix: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConnectivityPrecheckSourceResponse]:
+        """
+        Check whether tokens are valid against the source bucket
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def source(
+        self,
+        *,
+        account_id: str,
+        bucket: str,
+        secret: connectivity_precheck_source_params.R2SlurperR2SourceSchemaSecret,
+        vendor: Provider,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        path_prefix: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConnectivityPrecheckSourceResponse]:
+        """
+        Check whether tokens are valid against the source bucket
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "bucket", "secret", "vendor"])
+    async def source(
+        self,
+        *,
+        account_id: str,
+        bucket: str,
+        secret: connectivity_precheck_source_params.R2SlurperS3SourceSchemaSecret
+        | connectivity_precheck_source_params.R2SlurperGcsSourceSchemaSecret
+        | connectivity_precheck_source_params.R2SlurperR2SourceSchemaSecret,
+        vendor: Literal["s3"] | Literal["gcs"] | Provider,
+        endpoint: Optional[str] | Omit = omit,
+        path_prefix: Optional[str] | Omit = omit,
+        region: Optional[str] | Omit = omit,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConnectivityPrecheckSourceResponse]:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/slurper/source/connectivity-precheck",
+            body=await async_maybe_transform(
+                {
+                    "bucket": bucket,
+                    "secret": secret,
+                    "vendor": vendor,
+                    "endpoint": endpoint,
+                    "path_prefix": path_prefix,
+                    "region": region,
+                    "jurisdiction": jurisdiction,
+                },
+                connectivity_precheck_source_params.ConnectivityPrecheckSourceParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ConnectivityPrecheckSourceResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[ConnectivityPrecheckSourceResponse]], ResultWrapper[ConnectivityPrecheckSourceResponse]
+            ),
+        )
+
+    async def target(
+        self,
+        *,
+        account_id: str,
+        bucket: str,
+        secret: connectivity_precheck_target_params.Secret,
+        vendor: Provider,
+        jurisdiction: Literal["default", "eu", "fedramp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConnectivityPrecheckTargetResponse]:
+        """
+        Check whether tokens are valid against the target bucket
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/slurper/target/connectivity-precheck",
+            body=await async_maybe_transform(
+                {
+                    "bucket": bucket,
+                    "secret": secret,
+                    "vendor": vendor,
+                    "jurisdiction": jurisdiction,
+                },
+                connectivity_precheck_target_params.ConnectivityPrecheckTargetParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ConnectivityPrecheckTargetResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[ConnectivityPrecheckTargetResponse]], ResultWrapper[ConnectivityPrecheckTargetResponse]
+            ),
+        )
+
+
+class ConnectivityPrecheckResourceWithRawResponse:
+    def __init__(self, connectivity_precheck: ConnectivityPrecheckResource) -> None:
+        self._connectivity_precheck = connectivity_precheck
+
+        self.source = to_raw_response_wrapper(
+            connectivity_precheck.source,
+        )
+        self.target = to_raw_response_wrapper(
+            connectivity_precheck.target,
+        )
+
+
+class AsyncConnectivityPrecheckResourceWithRawResponse:
+    def __init__(self, connectivity_precheck: AsyncConnectivityPrecheckResource) -> None:
+        self._connectivity_precheck = connectivity_precheck
+
+        self.source = async_to_raw_response_wrapper(
+            connectivity_precheck.source,
+        )
+        self.target = async_to_raw_response_wrapper(
+            connectivity_precheck.target,
+        )
+
+
+class ConnectivityPrecheckResourceWithStreamingResponse:
+    def __init__(self, connectivity_precheck: ConnectivityPrecheckResource) -> None:
+        self._connectivity_precheck = connectivity_precheck
+
+        self.source = to_streamed_response_wrapper(
+            connectivity_precheck.source,
+        )
+        self.target = to_streamed_response_wrapper(
+            connectivity_precheck.target,
+        )
+
+
+class AsyncConnectivityPrecheckResourceWithStreamingResponse:
+    def __init__(self, connectivity_precheck: AsyncConnectivityPrecheckResource) -> None:
+        self._connectivity_precheck = connectivity_precheck
+
+        self.source = async_to_streamed_response_wrapper(
+            connectivity_precheck.source,
+        )
+        self.target = async_to_streamed_response_wrapper(
+            connectivity_precheck.target,
+        )
diff --git a/src/cloudflare/resources/r2/super_slurper/jobs/__init__.py b/src/cloudflare/resources/r2/super_slurper/jobs/__init__.py
new file mode 100644
index 00000000000..067feb63fab
--- /dev/null
+++ b/src/cloudflare/resources/r2/super_slurper/jobs/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .jobs import (
+    JobsResource,
+    AsyncJobsResource,
+    JobsResourceWithRawResponse,
+    AsyncJobsResourceWithRawResponse,
+    JobsResourceWithStreamingResponse,
+    AsyncJobsResourceWithStreamingResponse,
+)
+from .logs import (
+    LogsResource,
+    AsyncLogsResource,
+    LogsResourceWithRawResponse,
+    AsyncLogsResourceWithRawResponse,
+    LogsResourceWithStreamingResponse,
+    AsyncLogsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "LogsResource",
+    "AsyncLogsResource",
+    "LogsResourceWithRawResponse",
+    "AsyncLogsResourceWithRawResponse",
+    "LogsResourceWithStreamingResponse",
+    "AsyncLogsResourceWithStreamingResponse",
+    "JobsResource",
+    "AsyncJobsResource",
+    "JobsResourceWithRawResponse",
+    "AsyncJobsResourceWithRawResponse",
+    "JobsResourceWithStreamingResponse",
+    "AsyncJobsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/r2/super_slurper/jobs/jobs.py b/src/cloudflare/resources/r2/super_slurper/jobs/jobs.py
new file mode 100644
index 00000000000..f4911bfb249
--- /dev/null
+++ b/src/cloudflare/resources/r2/super_slurper/jobs/jobs.py
@@ -0,0 +1,888 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from .logs import (
+    LogsResource,
+    AsyncLogsResource,
+    LogsResourceWithRawResponse,
+    AsyncLogsResourceWithRawResponse,
+    LogsResourceWithStreamingResponse,
+    AsyncLogsResourceWithStreamingResponse,
+)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from .....pagination import SyncSinglePage, AsyncSinglePage
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.r2.super_slurper import job_list_params, job_create_params
+from .....types.r2.super_slurper.job_get_response import JobGetResponse
+from .....types.r2.super_slurper.job_list_response import JobListResponse
+from .....types.r2.super_slurper.job_abort_response import JobAbortResponse
+from .....types.r2.super_slurper.job_pause_response import JobPauseResponse
+from .....types.r2.super_slurper.job_create_response import JobCreateResponse
+from .....types.r2.super_slurper.job_resume_response import JobResumeResponse
+from .....types.r2.super_slurper.job_progress_response import JobProgressResponse
+from .....types.r2.super_slurper.job_abort_all_response import JobAbortAllResponse
+
+__all__ = ["JobsResource", "AsyncJobsResource"]
+
+
+class JobsResource(SyncAPIResource):
+    @cached_property
+    def logs(self) -> LogsResource:
+        return LogsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> JobsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return JobsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> JobsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return JobsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        overwrite: bool | Omit = omit,
+        source: job_create_params.Source | Omit = omit,
+        target: job_create_params.Target | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[JobCreateResponse]:
+        """
+        Create a job
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/slurper/jobs",
+            body=maybe_transform(
+                {
+                    "overwrite": overwrite,
+                    "source": source,
+                    "target": target,
+                },
+                job_create_params.JobCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[JobCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[JobCreateResponse]], ResultWrapper[JobCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[JobListResponse]:
+        """
+        List jobs
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/slurper/jobs",
+            page=SyncSinglePage[JobListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "limit": limit,
+                        "offset": offset,
+                    },
+                    job_list_params.JobListParams,
+                ),
+            ),
+            model=JobListResponse,
+        )
+
+    def abort(
+        self,
+        job_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Abort a job
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not job_id:
+            raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/slurper/jobs/{job_id}/abort",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[JobAbortResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+    def abort_all(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Abort all jobs
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/slurper/jobs/abortAll",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[JobAbortAllResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+    def get(
+        self,
+        job_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[JobGetResponse]:
+        """
+        Get job details
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not job_id:
+            raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/slurper/jobs/{job_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[JobGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[JobGetResponse]], ResultWrapper[JobGetResponse]),
+        )
+
+    def pause(
+        self,
+        job_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Pause a job
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not job_id:
+            raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/slurper/jobs/{job_id}/pause",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[JobPauseResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+    def progress(
+        self,
+        job_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[JobProgressResponse]:
+        """
+        Get job progress
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not job_id:
+            raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/slurper/jobs/{job_id}/progress",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[JobProgressResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[JobProgressResponse]], ResultWrapper[JobProgressResponse]),
+        )
+
+    def resume(
+        self,
+        job_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Resume a job
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not job_id:
+            raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/slurper/jobs/{job_id}/resume",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[JobResumeResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class AsyncJobsResource(AsyncAPIResource):
+    @cached_property
+    def logs(self) -> AsyncLogsResource:
+        return AsyncLogsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncJobsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncJobsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncJobsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncJobsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        overwrite: bool | Omit = omit,
+        source: job_create_params.Source | Omit = omit,
+        target: job_create_params.Target | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[JobCreateResponse]:
+        """
+        Create a job
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/slurper/jobs",
+            body=await async_maybe_transform(
+                {
+                    "overwrite": overwrite,
+                    "source": source,
+                    "target": target,
+                },
+                job_create_params.JobCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[JobCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[JobCreateResponse]], ResultWrapper[JobCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[JobListResponse, AsyncSinglePage[JobListResponse]]:
+        """
+        List jobs
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/slurper/jobs",
+            page=AsyncSinglePage[JobListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "limit": limit,
+                        "offset": offset,
+                    },
+                    job_list_params.JobListParams,
+                ),
+            ),
+            model=JobListResponse,
+        )
+
+    async def abort(
+        self,
+        job_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Abort a job
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not job_id:
+            raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/slurper/jobs/{job_id}/abort",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[JobAbortResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+    async def abort_all(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Abort all jobs
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/slurper/jobs/abortAll",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[JobAbortAllResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+    async def get(
+        self,
+        job_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[JobGetResponse]:
+        """
+        Get job details
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not job_id:
+            raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/slurper/jobs/{job_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[JobGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[JobGetResponse]], ResultWrapper[JobGetResponse]),
+        )
+
+    async def pause(
+        self,
+        job_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Pause a job
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not job_id:
+            raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/slurper/jobs/{job_id}/pause",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[JobPauseResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+    async def progress(
+        self,
+        job_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[JobProgressResponse]:
+        """
+        Get job progress
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not job_id:
+            raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/slurper/jobs/{job_id}/progress",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[JobProgressResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[JobProgressResponse]], ResultWrapper[JobProgressResponse]),
+        )
+
+    async def resume(
+        self,
+        job_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Resume a job
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not job_id:
+            raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/slurper/jobs/{job_id}/resume",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[JobResumeResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class JobsResourceWithRawResponse:
+    def __init__(self, jobs: JobsResource) -> None:
+        self._jobs = jobs
+
+        self.create = to_raw_response_wrapper(
+            jobs.create,
+        )
+        self.list = to_raw_response_wrapper(
+            jobs.list,
+        )
+        self.abort = to_raw_response_wrapper(
+            jobs.abort,
+        )
+        self.abort_all = to_raw_response_wrapper(
+            jobs.abort_all,
+        )
+        self.get = to_raw_response_wrapper(
+            jobs.get,
+        )
+        self.pause = to_raw_response_wrapper(
+            jobs.pause,
+        )
+        self.progress = to_raw_response_wrapper(
+            jobs.progress,
+        )
+        self.resume = to_raw_response_wrapper(
+            jobs.resume,
+        )
+
+    @cached_property
+    def logs(self) -> LogsResourceWithRawResponse:
+        return LogsResourceWithRawResponse(self._jobs.logs)
+
+
+class AsyncJobsResourceWithRawResponse:
+    def __init__(self, jobs: AsyncJobsResource) -> None:
+        self._jobs = jobs
+
+        self.create = async_to_raw_response_wrapper(
+            jobs.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            jobs.list,
+        )
+        self.abort = async_to_raw_response_wrapper(
+            jobs.abort,
+        )
+        self.abort_all = async_to_raw_response_wrapper(
+            jobs.abort_all,
+        )
+        self.get = async_to_raw_response_wrapper(
+            jobs.get,
+        )
+        self.pause = async_to_raw_response_wrapper(
+            jobs.pause,
+        )
+        self.progress = async_to_raw_response_wrapper(
+            jobs.progress,
+        )
+        self.resume = async_to_raw_response_wrapper(
+            jobs.resume,
+        )
+
+    @cached_property
+    def logs(self) -> AsyncLogsResourceWithRawResponse:
+        return AsyncLogsResourceWithRawResponse(self._jobs.logs)
+
+
+class JobsResourceWithStreamingResponse:
+    def __init__(self, jobs: JobsResource) -> None:
+        self._jobs = jobs
+
+        self.create = to_streamed_response_wrapper(
+            jobs.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            jobs.list,
+        )
+        self.abort = to_streamed_response_wrapper(
+            jobs.abort,
+        )
+        self.abort_all = to_streamed_response_wrapper(
+            jobs.abort_all,
+        )
+        self.get = to_streamed_response_wrapper(
+            jobs.get,
+        )
+        self.pause = to_streamed_response_wrapper(
+            jobs.pause,
+        )
+        self.progress = to_streamed_response_wrapper(
+            jobs.progress,
+        )
+        self.resume = to_streamed_response_wrapper(
+            jobs.resume,
+        )
+
+    @cached_property
+    def logs(self) -> LogsResourceWithStreamingResponse:
+        return LogsResourceWithStreamingResponse(self._jobs.logs)
+
+
+class AsyncJobsResourceWithStreamingResponse:
+    def __init__(self, jobs: AsyncJobsResource) -> None:
+        self._jobs = jobs
+
+        self.create = async_to_streamed_response_wrapper(
+            jobs.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            jobs.list,
+        )
+        self.abort = async_to_streamed_response_wrapper(
+            jobs.abort,
+        )
+        self.abort_all = async_to_streamed_response_wrapper(
+            jobs.abort_all,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            jobs.get,
+        )
+        self.pause = async_to_streamed_response_wrapper(
+            jobs.pause,
+        )
+        self.progress = async_to_streamed_response_wrapper(
+            jobs.progress,
+        )
+        self.resume = async_to_streamed_response_wrapper(
+            jobs.resume,
+        )
+
+    @cached_property
+    def logs(self) -> AsyncLogsResourceWithStreamingResponse:
+        return AsyncLogsResourceWithStreamingResponse(self._jobs.logs)
diff --git a/src/cloudflare/resources/r2/super_slurper/jobs/logs.py b/src/cloudflare/resources/r2/super_slurper/jobs/logs.py
new file mode 100644
index 00000000000..8204cbf5ab7
--- /dev/null
+++ b/src/cloudflare/resources/r2/super_slurper/jobs/logs.py
@@ -0,0 +1,198 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from .....pagination import SyncSinglePage, AsyncSinglePage
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.r2.super_slurper.jobs import log_list_params
+from .....types.r2.super_slurper.jobs.log_list_response import LogListResponse
+
+__all__ = ["LogsResource", "AsyncLogsResource"]
+
+
+class LogsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> LogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return LogsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> LogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return LogsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        job_id: str,
+        *,
+        account_id: str,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[LogListResponse]:
+        """
+        Get job logs
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not job_id:
+            raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/slurper/jobs/{job_id}/logs",
+            page=SyncSinglePage[LogListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "limit": limit,
+                        "offset": offset,
+                    },
+                    log_list_params.LogListParams,
+                ),
+            ),
+            model=LogListResponse,
+        )
+
+
+class AsyncLogsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncLogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncLogsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncLogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncLogsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        job_id: str,
+        *,
+        account_id: str,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[LogListResponse, AsyncSinglePage[LogListResponse]]:
+        """
+        Get job logs
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not job_id:
+            raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/slurper/jobs/{job_id}/logs",
+            page=AsyncSinglePage[LogListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "limit": limit,
+                        "offset": offset,
+                    },
+                    log_list_params.LogListParams,
+                ),
+            ),
+            model=LogListResponse,
+        )
+
+
+class LogsResourceWithRawResponse:
+    def __init__(self, logs: LogsResource) -> None:
+        self._logs = logs
+
+        self.list = to_raw_response_wrapper(
+            logs.list,
+        )
+
+
+class AsyncLogsResourceWithRawResponse:
+    def __init__(self, logs: AsyncLogsResource) -> None:
+        self._logs = logs
+
+        self.list = async_to_raw_response_wrapper(
+            logs.list,
+        )
+
+
+class LogsResourceWithStreamingResponse:
+    def __init__(self, logs: LogsResource) -> None:
+        self._logs = logs
+
+        self.list = to_streamed_response_wrapper(
+            logs.list,
+        )
+
+
+class AsyncLogsResourceWithStreamingResponse:
+    def __init__(self, logs: AsyncLogsResource) -> None:
+        self._logs = logs
+
+        self.list = async_to_streamed_response_wrapper(
+            logs.list,
+        )
diff --git a/src/cloudflare/resources/r2/super_slurper/super_slurper.py b/src/cloudflare/resources/r2/super_slurper/super_slurper.py
new file mode 100644
index 00000000000..3e4820a8dbc
--- /dev/null
+++ b/src/cloudflare/resources/r2/super_slurper/super_slurper.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .jobs.jobs import (
+    JobsResource,
+    AsyncJobsResource,
+    JobsResourceWithRawResponse,
+    AsyncJobsResourceWithRawResponse,
+    JobsResourceWithStreamingResponse,
+    AsyncJobsResourceWithStreamingResponse,
+)
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .connectivity_precheck import (
+    ConnectivityPrecheckResource,
+    AsyncConnectivityPrecheckResource,
+    ConnectivityPrecheckResourceWithRawResponse,
+    AsyncConnectivityPrecheckResourceWithRawResponse,
+    ConnectivityPrecheckResourceWithStreamingResponse,
+    AsyncConnectivityPrecheckResourceWithStreamingResponse,
+)
+
+__all__ = ["SuperSlurperResource", "AsyncSuperSlurperResource"]
+
+
+class SuperSlurperResource(SyncAPIResource):
+    @cached_property
+    def jobs(self) -> JobsResource:
+        return JobsResource(self._client)
+
+    @cached_property
+    def connectivity_precheck(self) -> ConnectivityPrecheckResource:
+        return ConnectivityPrecheckResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> SuperSlurperResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SuperSlurperResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SuperSlurperResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SuperSlurperResourceWithStreamingResponse(self)
+
+
+class AsyncSuperSlurperResource(AsyncAPIResource):
+    @cached_property
+    def jobs(self) -> AsyncJobsResource:
+        return AsyncJobsResource(self._client)
+
+    @cached_property
+    def connectivity_precheck(self) -> AsyncConnectivityPrecheckResource:
+        return AsyncConnectivityPrecheckResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncSuperSlurperResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSuperSlurperResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSuperSlurperResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSuperSlurperResourceWithStreamingResponse(self)
+
+
+class SuperSlurperResourceWithRawResponse:
+    def __init__(self, super_slurper: SuperSlurperResource) -> None:
+        self._super_slurper = super_slurper
+
+    @cached_property
+    def jobs(self) -> JobsResourceWithRawResponse:
+        return JobsResourceWithRawResponse(self._super_slurper.jobs)
+
+    @cached_property
+    def connectivity_precheck(self) -> ConnectivityPrecheckResourceWithRawResponse:
+        return ConnectivityPrecheckResourceWithRawResponse(self._super_slurper.connectivity_precheck)
+
+
+class AsyncSuperSlurperResourceWithRawResponse:
+    def __init__(self, super_slurper: AsyncSuperSlurperResource) -> None:
+        self._super_slurper = super_slurper
+
+    @cached_property
+    def jobs(self) -> AsyncJobsResourceWithRawResponse:
+        return AsyncJobsResourceWithRawResponse(self._super_slurper.jobs)
+
+    @cached_property
+    def connectivity_precheck(self) -> AsyncConnectivityPrecheckResourceWithRawResponse:
+        return AsyncConnectivityPrecheckResourceWithRawResponse(self._super_slurper.connectivity_precheck)
+
+
+class SuperSlurperResourceWithStreamingResponse:
+    def __init__(self, super_slurper: SuperSlurperResource) -> None:
+        self._super_slurper = super_slurper
+
+    @cached_property
+    def jobs(self) -> JobsResourceWithStreamingResponse:
+        return JobsResourceWithStreamingResponse(self._super_slurper.jobs)
+
+    @cached_property
+    def connectivity_precheck(self) -> ConnectivityPrecheckResourceWithStreamingResponse:
+        return ConnectivityPrecheckResourceWithStreamingResponse(self._super_slurper.connectivity_precheck)
+
+
+class AsyncSuperSlurperResourceWithStreamingResponse:
+    def __init__(self, super_slurper: AsyncSuperSlurperResource) -> None:
+        self._super_slurper = super_slurper
+
+    @cached_property
+    def jobs(self) -> AsyncJobsResourceWithStreamingResponse:
+        return AsyncJobsResourceWithStreamingResponse(self._super_slurper.jobs)
+
+    @cached_property
+    def connectivity_precheck(self) -> AsyncConnectivityPrecheckResourceWithStreamingResponse:
+        return AsyncConnectivityPrecheckResourceWithStreamingResponse(self._super_slurper.connectivity_precheck)
diff --git a/src/cloudflare/resources/r2/temporary_credentials.py b/src/cloudflare/resources/r2/temporary_credentials.py
index 9715a6feadd..da82f727df8 100644
--- a/src/cloudflare/resources/r2/temporary_credentials.py
+++ b/src/cloudflare/resources/r2/temporary_credentials.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import List, Type, cast
+from typing import Type, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ...types.r2 import temporary_credential_create_params
 from ..._resource import SyncAPIResource, AsyncAPIResource
@@ -31,10 +28,21 @@
 class TemporaryCredentialsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TemporaryCredentialsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TemporaryCredentialsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TemporaryCredentialsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TemporaryCredentialsResourceWithStreamingResponse(self)
 
     def create(
@@ -45,33 +53,33 @@ def create(
         parent_access_key_id: str,
         permission: Literal["admin-read-write", "admin-read-only", "object-read-write", "object-read-only"],
         ttl_seconds: float,
-        objects: List[str] | NotGiven = NOT_GIVEN,
-        prefixes: List[str] | NotGiven = NOT_GIVEN,
+        objects: SequenceNotStr[str] | Omit = omit,
+        prefixes: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TemporaryCredentialCreateResponse:
         """
         Creates temporary access credentials on a bucket that can be optionally scoped
         to prefixes or objects.
 
         Args:
-          account_id: Account ID
+          account_id: Account ID.
 
-          bucket: Name of the R2 bucket
+          bucket: Name of the R2 bucket.
 
-          parent_access_key_id: The parent access key id to use for signing
+          parent_access_key_id: The parent access key id to use for signing.
 
-          permission: Permissions allowed on the credentials
+          permission: Permissions allowed on the credentials.
 
-          ttl_seconds: How long the credentials will live for in seconds
+          ttl_seconds: How long the credentials will live for in seconds.
 
-          objects: Optional object paths to scope the credentials to
+          objects: Optional object paths to scope the credentials to.
 
-          prefixes: Optional prefix paths to scope the credentials to
+          prefixes: Optional prefix paths to scope the credentials to.
 
           extra_headers: Send extra headers
 
@@ -110,10 +118,21 @@ def create(
 class AsyncTemporaryCredentialsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTemporaryCredentialsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTemporaryCredentialsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTemporaryCredentialsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTemporaryCredentialsResourceWithStreamingResponse(self)
 
     async def create(
@@ -124,33 +143,33 @@ async def create(
         parent_access_key_id: str,
         permission: Literal["admin-read-write", "admin-read-only", "object-read-write", "object-read-only"],
         ttl_seconds: float,
-        objects: List[str] | NotGiven = NOT_GIVEN,
-        prefixes: List[str] | NotGiven = NOT_GIVEN,
+        objects: SequenceNotStr[str] | Omit = omit,
+        prefixes: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TemporaryCredentialCreateResponse:
         """
         Creates temporary access credentials on a bucket that can be optionally scoped
         to prefixes or objects.
 
         Args:
-          account_id: Account ID
+          account_id: Account ID.
 
-          bucket: Name of the R2 bucket
+          bucket: Name of the R2 bucket.
 
-          parent_access_key_id: The parent access key id to use for signing
+          parent_access_key_id: The parent access key id to use for signing.
 
-          permission: Permissions allowed on the credentials
+          permission: Permissions allowed on the credentials.
 
-          ttl_seconds: How long the credentials will live for in seconds
+          ttl_seconds: How long the credentials will live for in seconds.
 
-          objects: Optional object paths to scope the credentials to
+          objects: Optional object paths to scope the credentials to.
 
-          prefixes: Optional prefix paths to scope the credentials to
+          prefixes: Optional prefix paths to scope the credentials to.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/r2_data_catalog/__init__.py b/src/cloudflare/resources/r2_data_catalog/__init__.py
new file mode 100644
index 00000000000..830179b359a
--- /dev/null
+++ b/src/cloudflare/resources/r2_data_catalog/__init__.py
@@ -0,0 +1,61 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .namespaces import (
+    NamespacesResource,
+    AsyncNamespacesResource,
+    NamespacesResourceWithRawResponse,
+    AsyncNamespacesResourceWithRawResponse,
+    NamespacesResourceWithStreamingResponse,
+    AsyncNamespacesResourceWithStreamingResponse,
+)
+from .credentials import (
+    CredentialsResource,
+    AsyncCredentialsResource,
+    CredentialsResourceWithRawResponse,
+    AsyncCredentialsResourceWithRawResponse,
+    CredentialsResourceWithStreamingResponse,
+    AsyncCredentialsResourceWithStreamingResponse,
+)
+from .r2_data_catalog import (
+    R2DataCatalogResource,
+    AsyncR2DataCatalogResource,
+    R2DataCatalogResourceWithRawResponse,
+    AsyncR2DataCatalogResourceWithRawResponse,
+    R2DataCatalogResourceWithStreamingResponse,
+    AsyncR2DataCatalogResourceWithStreamingResponse,
+)
+from .maintenance_configs import (
+    MaintenanceConfigsResource,
+    AsyncMaintenanceConfigsResource,
+    MaintenanceConfigsResourceWithRawResponse,
+    AsyncMaintenanceConfigsResourceWithRawResponse,
+    MaintenanceConfigsResourceWithStreamingResponse,
+    AsyncMaintenanceConfigsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "MaintenanceConfigsResource",
+    "AsyncMaintenanceConfigsResource",
+    "MaintenanceConfigsResourceWithRawResponse",
+    "AsyncMaintenanceConfigsResourceWithRawResponse",
+    "MaintenanceConfigsResourceWithStreamingResponse",
+    "AsyncMaintenanceConfigsResourceWithStreamingResponse",
+    "CredentialsResource",
+    "AsyncCredentialsResource",
+    "CredentialsResourceWithRawResponse",
+    "AsyncCredentialsResourceWithRawResponse",
+    "CredentialsResourceWithStreamingResponse",
+    "AsyncCredentialsResourceWithStreamingResponse",
+    "NamespacesResource",
+    "AsyncNamespacesResource",
+    "NamespacesResourceWithRawResponse",
+    "AsyncNamespacesResourceWithRawResponse",
+    "NamespacesResourceWithStreamingResponse",
+    "AsyncNamespacesResourceWithStreamingResponse",
+    "R2DataCatalogResource",
+    "AsyncR2DataCatalogResource",
+    "R2DataCatalogResourceWithRawResponse",
+    "AsyncR2DataCatalogResourceWithRawResponse",
+    "R2DataCatalogResourceWithStreamingResponse",
+    "AsyncR2DataCatalogResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/r2_data_catalog/credentials.py b/src/cloudflare/resources/r2_data_catalog/credentials.py
new file mode 100644
index 00000000000..90e2aded873
--- /dev/null
+++ b/src/cloudflare/resources/r2_data_catalog/credentials.py
@@ -0,0 +1,201 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.r2_data_catalog import credential_create_params
+
+__all__ = ["CredentialsResource", "AsyncCredentialsResource"]
+
+
+class CredentialsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> CredentialsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CredentialsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CredentialsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CredentialsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        token: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """Store authentication credentials for a catalog.
+
+        These credentials are used to
+        authenticate with R2 storage when performing catalog operations.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          token: Provides the Cloudflare API token for accessing R2.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        return self._post(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}/credential",
+            body=maybe_transform({"token": token}, credential_create_params.CredentialCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+
+class AsyncCredentialsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncCredentialsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCredentialsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCredentialsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCredentialsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        token: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """Store authentication credentials for a catalog.
+
+        These credentials are used to
+        authenticate with R2 storage when performing catalog operations.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          token: Provides the Cloudflare API token for accessing R2.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        return await self._post(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}/credential",
+            body=await async_maybe_transform({"token": token}, credential_create_params.CredentialCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+
+class CredentialsResourceWithRawResponse:
+    def __init__(self, credentials: CredentialsResource) -> None:
+        self._credentials = credentials
+
+        self.create = to_raw_response_wrapper(
+            credentials.create,
+        )
+
+
+class AsyncCredentialsResourceWithRawResponse:
+    def __init__(self, credentials: AsyncCredentialsResource) -> None:
+        self._credentials = credentials
+
+        self.create = async_to_raw_response_wrapper(
+            credentials.create,
+        )
+
+
+class CredentialsResourceWithStreamingResponse:
+    def __init__(self, credentials: CredentialsResource) -> None:
+        self._credentials = credentials
+
+        self.create = to_streamed_response_wrapper(
+            credentials.create,
+        )
+
+
+class AsyncCredentialsResourceWithStreamingResponse:
+    def __init__(self, credentials: AsyncCredentialsResource) -> None:
+        self._credentials = credentials
+
+        self.create = async_to_streamed_response_wrapper(
+            credentials.create,
+        )
diff --git a/src/cloudflare/resources/r2_data_catalog/maintenance_configs.py b/src/cloudflare/resources/r2_data_catalog/maintenance_configs.py
new file mode 100644
index 00000000000..a5c71ba3736
--- /dev/null
+++ b/src/cloudflare/resources/r2_data_catalog/maintenance_configs.py
@@ -0,0 +1,327 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.r2_data_catalog import maintenance_config_update_params
+from ...types.r2_data_catalog.maintenance_config_get_response import MaintenanceConfigGetResponse
+from ...types.r2_data_catalog.maintenance_config_update_response import MaintenanceConfigUpdateResponse
+
+__all__ = ["MaintenanceConfigsResource", "AsyncMaintenanceConfigsResource"]
+
+
+class MaintenanceConfigsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> MaintenanceConfigsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return MaintenanceConfigsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> MaintenanceConfigsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return MaintenanceConfigsResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        compaction: maintenance_config_update_params.Compaction | Omit = omit,
+        snapshot_expiration: maintenance_config_update_params.SnapshotExpiration | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[MaintenanceConfigUpdateResponse]:
+        """Update the maintenance configuration for a catalog.
+
+        This allows you to enable or
+        disable compaction and adjust target file sizes for optimization.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          compaction: Updates compaction configuration (all fields optional).
+
+          snapshot_expiration: Updates snapshot expiration configuration (all fields optional).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        return self._post(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}/maintenance-configs",
+            body=maybe_transform(
+                {
+                    "compaction": compaction,
+                    "snapshot_expiration": snapshot_expiration,
+                },
+                maintenance_config_update_params.MaintenanceConfigUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[MaintenanceConfigUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[MaintenanceConfigUpdateResponse]], ResultWrapper[MaintenanceConfigUpdateResponse]
+            ),
+        )
+
+    def get(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[MaintenanceConfigGetResponse]:
+        """
+        Retrieve the maintenance configuration for a specific catalog, including
+        compaction settings and credential status.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        return self._get(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}/maintenance-configs",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[MaintenanceConfigGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[MaintenanceConfigGetResponse]], ResultWrapper[MaintenanceConfigGetResponse]),
+        )
+
+
+class AsyncMaintenanceConfigsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncMaintenanceConfigsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncMaintenanceConfigsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncMaintenanceConfigsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncMaintenanceConfigsResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        compaction: maintenance_config_update_params.Compaction | Omit = omit,
+        snapshot_expiration: maintenance_config_update_params.SnapshotExpiration | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[MaintenanceConfigUpdateResponse]:
+        """Update the maintenance configuration for a catalog.
+
+        This allows you to enable or
+        disable compaction and adjust target file sizes for optimization.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          compaction: Updates compaction configuration (all fields optional).
+
+          snapshot_expiration: Updates snapshot expiration configuration (all fields optional).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        return await self._post(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}/maintenance-configs",
+            body=await async_maybe_transform(
+                {
+                    "compaction": compaction,
+                    "snapshot_expiration": snapshot_expiration,
+                },
+                maintenance_config_update_params.MaintenanceConfigUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[MaintenanceConfigUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[MaintenanceConfigUpdateResponse]], ResultWrapper[MaintenanceConfigUpdateResponse]
+            ),
+        )
+
+    async def get(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[MaintenanceConfigGetResponse]:
+        """
+        Retrieve the maintenance configuration for a specific catalog, including
+        compaction settings and credential status.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        return await self._get(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}/maintenance-configs",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[MaintenanceConfigGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[MaintenanceConfigGetResponse]], ResultWrapper[MaintenanceConfigGetResponse]),
+        )
+
+
+class MaintenanceConfigsResourceWithRawResponse:
+    def __init__(self, maintenance_configs: MaintenanceConfigsResource) -> None:
+        self._maintenance_configs = maintenance_configs
+
+        self.update = to_raw_response_wrapper(
+            maintenance_configs.update,
+        )
+        self.get = to_raw_response_wrapper(
+            maintenance_configs.get,
+        )
+
+
+class AsyncMaintenanceConfigsResourceWithRawResponse:
+    def __init__(self, maintenance_configs: AsyncMaintenanceConfigsResource) -> None:
+        self._maintenance_configs = maintenance_configs
+
+        self.update = async_to_raw_response_wrapper(
+            maintenance_configs.update,
+        )
+        self.get = async_to_raw_response_wrapper(
+            maintenance_configs.get,
+        )
+
+
+class MaintenanceConfigsResourceWithStreamingResponse:
+    def __init__(self, maintenance_configs: MaintenanceConfigsResource) -> None:
+        self._maintenance_configs = maintenance_configs
+
+        self.update = to_streamed_response_wrapper(
+            maintenance_configs.update,
+        )
+        self.get = to_streamed_response_wrapper(
+            maintenance_configs.get,
+        )
+
+
+class AsyncMaintenanceConfigsResourceWithStreamingResponse:
+    def __init__(self, maintenance_configs: AsyncMaintenanceConfigsResource) -> None:
+        self._maintenance_configs = maintenance_configs
+
+        self.update = async_to_streamed_response_wrapper(
+            maintenance_configs.update,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            maintenance_configs.get,
+        )
diff --git a/src/cloudflare/resources/r2_data_catalog/namespaces/__init__.py b/src/cloudflare/resources/r2_data_catalog/namespaces/__init__.py
new file mode 100644
index 00000000000..8b756c79828
--- /dev/null
+++ b/src/cloudflare/resources/r2_data_catalog/namespaces/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .tables import (
+    TablesResource,
+    AsyncTablesResource,
+    TablesResourceWithRawResponse,
+    AsyncTablesResourceWithRawResponse,
+    TablesResourceWithStreamingResponse,
+    AsyncTablesResourceWithStreamingResponse,
+)
+from .namespaces import (
+    NamespacesResource,
+    AsyncNamespacesResource,
+    NamespacesResourceWithRawResponse,
+    AsyncNamespacesResourceWithRawResponse,
+    NamespacesResourceWithStreamingResponse,
+    AsyncNamespacesResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "TablesResource",
+    "AsyncTablesResource",
+    "TablesResourceWithRawResponse",
+    "AsyncTablesResourceWithRawResponse",
+    "TablesResourceWithStreamingResponse",
+    "AsyncTablesResourceWithStreamingResponse",
+    "NamespacesResource",
+    "AsyncNamespacesResource",
+    "NamespacesResourceWithRawResponse",
+    "AsyncNamespacesResourceWithRawResponse",
+    "NamespacesResourceWithStreamingResponse",
+    "AsyncNamespacesResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/r2_data_catalog/namespaces/namespaces.py b/src/cloudflare/resources/r2_data_catalog/namespaces/namespaces.py
new file mode 100644
index 00000000000..5aeb314566b
--- /dev/null
+++ b/src/cloudflare/resources/r2_data_catalog/namespaces/namespaces.py
@@ -0,0 +1,286 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from .tables.tables import (
+    TablesResource,
+    AsyncTablesResource,
+    TablesResourceWithRawResponse,
+    AsyncTablesResourceWithRawResponse,
+    TablesResourceWithStreamingResponse,
+    AsyncTablesResourceWithStreamingResponse,
+)
+from ...._base_client import make_request_options
+from ....types.r2_data_catalog import namespace_list_params
+from ....types.r2_data_catalog.namespace_list_response import NamespaceListResponse
+
+__all__ = ["NamespacesResource", "AsyncNamespacesResource"]
+
+
+class NamespacesResource(SyncAPIResource):
+    @cached_property
+    def tables(self) -> TablesResource:
+        return TablesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> NamespacesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return NamespacesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> NamespacesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return NamespacesResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        page_size: int | Omit = omit,
+        page_token: str | Omit = omit,
+        parent: str | Omit = omit,
+        return_details: bool | Omit = omit,
+        return_uuids: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[NamespaceListResponse]:
+        """Returns a list of namespaces in the specified R2 catalog.
+
+        Supports hierarchical
+        filtering and pagination for efficient traversal of large namespace hierarchies.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          page_size: Maximum number of namespaces to return per page. Defaults to 100, maximum 1000.
+
+          page_token: Opaque pagination token from a previous response. Use this to fetch the next
+              page of results.
+
+          parent: Parent namespace to filter by. Only returns direct children of this namespace.
+              For nested namespaces, use %1F as separator (e.g., "bronze%1Fanalytics"). Omit
+              this parameter to list top-level namespaces.
+
+          return_details: Whether to include additional metadata (timestamps). When true, response
+              includes created_at and updated_at arrays.
+
+          return_uuids: Whether to include namespace UUIDs in the response. Set to true to receive the
+              namespace_uuids array.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        return self._get(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}/namespaces",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page_size": page_size,
+                        "page_token": page_token,
+                        "parent": parent,
+                        "return_details": return_details,
+                        "return_uuids": return_uuids,
+                    },
+                    namespace_list_params.NamespaceListParams,
+                ),
+                post_parser=ResultWrapper[Optional[NamespaceListResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[NamespaceListResponse]], ResultWrapper[NamespaceListResponse]),
+        )
+
+
+class AsyncNamespacesResource(AsyncAPIResource):
+    @cached_property
+    def tables(self) -> AsyncTablesResource:
+        return AsyncTablesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncNamespacesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncNamespacesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncNamespacesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncNamespacesResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        page_size: int | Omit = omit,
+        page_token: str | Omit = omit,
+        parent: str | Omit = omit,
+        return_details: bool | Omit = omit,
+        return_uuids: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[NamespaceListResponse]:
+        """Returns a list of namespaces in the specified R2 catalog.
+
+        Supports hierarchical
+        filtering and pagination for efficient traversal of large namespace hierarchies.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          page_size: Maximum number of namespaces to return per page. Defaults to 100, maximum 1000.
+
+          page_token: Opaque pagination token from a previous response. Use this to fetch the next
+              page of results.
+
+          parent: Parent namespace to filter by. Only returns direct children of this namespace.
+              For nested namespaces, use %1F as separator (e.g., "bronze%1Fanalytics"). Omit
+              this parameter to list top-level namespaces.
+
+          return_details: Whether to include additional metadata (timestamps). When true, response
+              includes created_at and updated_at arrays.
+
+          return_uuids: Whether to include namespace UUIDs in the response. Set to true to receive the
+              namespace_uuids array.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        return await self._get(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}/namespaces",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "page_size": page_size,
+                        "page_token": page_token,
+                        "parent": parent,
+                        "return_details": return_details,
+                        "return_uuids": return_uuids,
+                    },
+                    namespace_list_params.NamespaceListParams,
+                ),
+                post_parser=ResultWrapper[Optional[NamespaceListResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[NamespaceListResponse]], ResultWrapper[NamespaceListResponse]),
+        )
+
+
+class NamespacesResourceWithRawResponse:
+    def __init__(self, namespaces: NamespacesResource) -> None:
+        self._namespaces = namespaces
+
+        self.list = to_raw_response_wrapper(
+            namespaces.list,
+        )
+
+    @cached_property
+    def tables(self) -> TablesResourceWithRawResponse:
+        return TablesResourceWithRawResponse(self._namespaces.tables)
+
+
+class AsyncNamespacesResourceWithRawResponse:
+    def __init__(self, namespaces: AsyncNamespacesResource) -> None:
+        self._namespaces = namespaces
+
+        self.list = async_to_raw_response_wrapper(
+            namespaces.list,
+        )
+
+    @cached_property
+    def tables(self) -> AsyncTablesResourceWithRawResponse:
+        return AsyncTablesResourceWithRawResponse(self._namespaces.tables)
+
+
+class NamespacesResourceWithStreamingResponse:
+    def __init__(self, namespaces: NamespacesResource) -> None:
+        self._namespaces = namespaces
+
+        self.list = to_streamed_response_wrapper(
+            namespaces.list,
+        )
+
+    @cached_property
+    def tables(self) -> TablesResourceWithStreamingResponse:
+        return TablesResourceWithStreamingResponse(self._namespaces.tables)
+
+
+class AsyncNamespacesResourceWithStreamingResponse:
+    def __init__(self, namespaces: AsyncNamespacesResource) -> None:
+        self._namespaces = namespaces
+
+        self.list = async_to_streamed_response_wrapper(
+            namespaces.list,
+        )
+
+    @cached_property
+    def tables(self) -> AsyncTablesResourceWithStreamingResponse:
+        return AsyncTablesResourceWithStreamingResponse(self._namespaces.tables)
diff --git a/src/cloudflare/resources/r2_data_catalog/namespaces/tables/__init__.py b/src/cloudflare/resources/r2_data_catalog/namespaces/tables/__init__.py
new file mode 100644
index 00000000000..17ed726f674
--- /dev/null
+++ b/src/cloudflare/resources/r2_data_catalog/namespaces/tables/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .tables import (
+    TablesResource,
+    AsyncTablesResource,
+    TablesResourceWithRawResponse,
+    AsyncTablesResourceWithRawResponse,
+    TablesResourceWithStreamingResponse,
+    AsyncTablesResourceWithStreamingResponse,
+)
+from .maintenance_configs import (
+    MaintenanceConfigsResource,
+    AsyncMaintenanceConfigsResource,
+    MaintenanceConfigsResourceWithRawResponse,
+    AsyncMaintenanceConfigsResourceWithRawResponse,
+    MaintenanceConfigsResourceWithStreamingResponse,
+    AsyncMaintenanceConfigsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "MaintenanceConfigsResource",
+    "AsyncMaintenanceConfigsResource",
+    "MaintenanceConfigsResourceWithRawResponse",
+    "AsyncMaintenanceConfigsResourceWithRawResponse",
+    "MaintenanceConfigsResourceWithStreamingResponse",
+    "AsyncMaintenanceConfigsResourceWithStreamingResponse",
+    "TablesResource",
+    "AsyncTablesResource",
+    "TablesResourceWithRawResponse",
+    "AsyncTablesResourceWithRawResponse",
+    "TablesResourceWithStreamingResponse",
+    "AsyncTablesResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/r2_data_catalog/namespaces/tables/maintenance_configs.py b/src/cloudflare/resources/r2_data_catalog/namespaces/tables/maintenance_configs.py
new file mode 100644
index 00000000000..ee8859bf3cb
--- /dev/null
+++ b/src/cloudflare/resources/r2_data_catalog/namespaces/tables/maintenance_configs.py
@@ -0,0 +1,353 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.r2_data_catalog.namespaces.tables import maintenance_config_update_params
+from .....types.r2_data_catalog.namespaces.tables.maintenance_config_get_response import MaintenanceConfigGetResponse
+from .....types.r2_data_catalog.namespaces.tables.maintenance_config_update_response import (
+    MaintenanceConfigUpdateResponse,
+)
+
+__all__ = ["MaintenanceConfigsResource", "AsyncMaintenanceConfigsResource"]
+
+
+class MaintenanceConfigsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> MaintenanceConfigsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return MaintenanceConfigsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> MaintenanceConfigsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return MaintenanceConfigsResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        table_name: str,
+        *,
+        account_id: str,
+        bucket_name: str,
+        namespace: str,
+        compaction: maintenance_config_update_params.Compaction | Omit = omit,
+        snapshot_expiration: maintenance_config_update_params.SnapshotExpiration | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[MaintenanceConfigUpdateResponse]:
+        """Update the maintenance configuration for a specific table.
+
+        This allows you to
+        enable or disable compaction and adjust target file sizes for optimization.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          compaction: Updates compaction configuration (all fields optional).
+
+          snapshot_expiration: Updates snapshot expiration configuration (all fields optional).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        if not namespace:
+            raise ValueError(f"Expected a non-empty value for `namespace` but received {namespace!r}")
+        if not table_name:
+            raise ValueError(f"Expected a non-empty value for `table_name` but received {table_name!r}")
+        return self._post(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}/namespaces/{namespace}/tables/{table_name}/maintenance-configs",
+            body=maybe_transform(
+                {
+                    "compaction": compaction,
+                    "snapshot_expiration": snapshot_expiration,
+                },
+                maintenance_config_update_params.MaintenanceConfigUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[MaintenanceConfigUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[MaintenanceConfigUpdateResponse]], ResultWrapper[MaintenanceConfigUpdateResponse]
+            ),
+        )
+
+    def get(
+        self,
+        table_name: str,
+        *,
+        account_id: str,
+        bucket_name: str,
+        namespace: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[MaintenanceConfigGetResponse]:
+        """
+        Retrieve the maintenance configuration for a specific table, including
+        compaction settings.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        if not namespace:
+            raise ValueError(f"Expected a non-empty value for `namespace` but received {namespace!r}")
+        if not table_name:
+            raise ValueError(f"Expected a non-empty value for `table_name` but received {table_name!r}")
+        return self._get(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}/namespaces/{namespace}/tables/{table_name}/maintenance-configs",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[MaintenanceConfigGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[MaintenanceConfigGetResponse]], ResultWrapper[MaintenanceConfigGetResponse]),
+        )
+
+
+class AsyncMaintenanceConfigsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncMaintenanceConfigsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncMaintenanceConfigsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncMaintenanceConfigsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncMaintenanceConfigsResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        table_name: str,
+        *,
+        account_id: str,
+        bucket_name: str,
+        namespace: str,
+        compaction: maintenance_config_update_params.Compaction | Omit = omit,
+        snapshot_expiration: maintenance_config_update_params.SnapshotExpiration | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[MaintenanceConfigUpdateResponse]:
+        """Update the maintenance configuration for a specific table.
+
+        This allows you to
+        enable or disable compaction and adjust target file sizes for optimization.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          compaction: Updates compaction configuration (all fields optional).
+
+          snapshot_expiration: Updates snapshot expiration configuration (all fields optional).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        if not namespace:
+            raise ValueError(f"Expected a non-empty value for `namespace` but received {namespace!r}")
+        if not table_name:
+            raise ValueError(f"Expected a non-empty value for `table_name` but received {table_name!r}")
+        return await self._post(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}/namespaces/{namespace}/tables/{table_name}/maintenance-configs",
+            body=await async_maybe_transform(
+                {
+                    "compaction": compaction,
+                    "snapshot_expiration": snapshot_expiration,
+                },
+                maintenance_config_update_params.MaintenanceConfigUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[MaintenanceConfigUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[MaintenanceConfigUpdateResponse]], ResultWrapper[MaintenanceConfigUpdateResponse]
+            ),
+        )
+
+    async def get(
+        self,
+        table_name: str,
+        *,
+        account_id: str,
+        bucket_name: str,
+        namespace: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[MaintenanceConfigGetResponse]:
+        """
+        Retrieve the maintenance configuration for a specific table, including
+        compaction settings.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        if not namespace:
+            raise ValueError(f"Expected a non-empty value for `namespace` but received {namespace!r}")
+        if not table_name:
+            raise ValueError(f"Expected a non-empty value for `table_name` but received {table_name!r}")
+        return await self._get(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}/namespaces/{namespace}/tables/{table_name}/maintenance-configs",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[MaintenanceConfigGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[MaintenanceConfigGetResponse]], ResultWrapper[MaintenanceConfigGetResponse]),
+        )
+
+
+class MaintenanceConfigsResourceWithRawResponse:
+    def __init__(self, maintenance_configs: MaintenanceConfigsResource) -> None:
+        self._maintenance_configs = maintenance_configs
+
+        self.update = to_raw_response_wrapper(
+            maintenance_configs.update,
+        )
+        self.get = to_raw_response_wrapper(
+            maintenance_configs.get,
+        )
+
+
+class AsyncMaintenanceConfigsResourceWithRawResponse:
+    def __init__(self, maintenance_configs: AsyncMaintenanceConfigsResource) -> None:
+        self._maintenance_configs = maintenance_configs
+
+        self.update = async_to_raw_response_wrapper(
+            maintenance_configs.update,
+        )
+        self.get = async_to_raw_response_wrapper(
+            maintenance_configs.get,
+        )
+
+
+class MaintenanceConfigsResourceWithStreamingResponse:
+    def __init__(self, maintenance_configs: MaintenanceConfigsResource) -> None:
+        self._maintenance_configs = maintenance_configs
+
+        self.update = to_streamed_response_wrapper(
+            maintenance_configs.update,
+        )
+        self.get = to_streamed_response_wrapper(
+            maintenance_configs.get,
+        )
+
+
+class AsyncMaintenanceConfigsResourceWithStreamingResponse:
+    def __init__(self, maintenance_configs: AsyncMaintenanceConfigsResource) -> None:
+        self._maintenance_configs = maintenance_configs
+
+        self.update = async_to_streamed_response_wrapper(
+            maintenance_configs.update,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            maintenance_configs.get,
+        )
diff --git a/src/cloudflare/resources/r2_data_catalog/namespaces/tables/tables.py b/src/cloudflare/resources/r2_data_catalog/namespaces/tables/tables.py
new file mode 100644
index 00000000000..6ebef6aa50d
--- /dev/null
+++ b/src/cloudflare/resources/r2_data_catalog/namespaces/tables/tables.py
@@ -0,0 +1,280 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .maintenance_configs import (
+    MaintenanceConfigsResource,
+    AsyncMaintenanceConfigsResource,
+    MaintenanceConfigsResourceWithRawResponse,
+    AsyncMaintenanceConfigsResourceWithRawResponse,
+    MaintenanceConfigsResourceWithStreamingResponse,
+    AsyncMaintenanceConfigsResourceWithStreamingResponse,
+)
+from .....types.r2_data_catalog.namespaces import table_list_params
+from .....types.r2_data_catalog.namespaces.table_list_response import TableListResponse
+
+__all__ = ["TablesResource", "AsyncTablesResource"]
+
+
+class TablesResource(SyncAPIResource):
+    @cached_property
+    def maintenance_configs(self) -> MaintenanceConfigsResource:
+        return MaintenanceConfigsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> TablesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TablesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TablesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TablesResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        namespace: str,
+        *,
+        account_id: str,
+        bucket_name: str,
+        page_size: int | Omit = omit,
+        page_token: str | Omit = omit,
+        return_details: bool | Omit = omit,
+        return_uuids: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TableListResponse]:
+        """
+        Returns a list of tables in the specified namespace within an R2 catalog.
+        Supports pagination for efficient traversal of large table collections.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          page_size: Maximum number of tables to return per page. Defaults to 100, maximum 1000.
+
+          page_token: Opaque pagination token from a previous response. Use this to fetch the next
+              page of results.
+
+          return_details: Whether to include additional metadata (timestamps, locations). When true,
+              response includes created_at, updated_at, metadata_locations, and locations
+              arrays.
+
+          return_uuids: Whether to include table UUIDs in the response. Set to true to receive the
+              table_uuids array.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        if not namespace:
+            raise ValueError(f"Expected a non-empty value for `namespace` but received {namespace!r}")
+        return self._get(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}/namespaces/{namespace}/tables",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page_size": page_size,
+                        "page_token": page_token,
+                        "return_details": return_details,
+                        "return_uuids": return_uuids,
+                    },
+                    table_list_params.TableListParams,
+                ),
+                post_parser=ResultWrapper[Optional[TableListResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TableListResponse]], ResultWrapper[TableListResponse]),
+        )
+
+
+class AsyncTablesResource(AsyncAPIResource):
+    @cached_property
+    def maintenance_configs(self) -> AsyncMaintenanceConfigsResource:
+        return AsyncMaintenanceConfigsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncTablesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTablesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTablesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTablesResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        namespace: str,
+        *,
+        account_id: str,
+        bucket_name: str,
+        page_size: int | Omit = omit,
+        page_token: str | Omit = omit,
+        return_details: bool | Omit = omit,
+        return_uuids: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TableListResponse]:
+        """
+        Returns a list of tables in the specified namespace within an R2 catalog.
+        Supports pagination for efficient traversal of large table collections.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          page_size: Maximum number of tables to return per page. Defaults to 100, maximum 1000.
+
+          page_token: Opaque pagination token from a previous response. Use this to fetch the next
+              page of results.
+
+          return_details: Whether to include additional metadata (timestamps, locations). When true,
+              response includes created_at, updated_at, metadata_locations, and locations
+              arrays.
+
+          return_uuids: Whether to include table UUIDs in the response. Set to true to receive the
+              table_uuids array.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        if not namespace:
+            raise ValueError(f"Expected a non-empty value for `namespace` but received {namespace!r}")
+        return await self._get(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}/namespaces/{namespace}/tables",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "page_size": page_size,
+                        "page_token": page_token,
+                        "return_details": return_details,
+                        "return_uuids": return_uuids,
+                    },
+                    table_list_params.TableListParams,
+                ),
+                post_parser=ResultWrapper[Optional[TableListResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TableListResponse]], ResultWrapper[TableListResponse]),
+        )
+
+
+class TablesResourceWithRawResponse:
+    def __init__(self, tables: TablesResource) -> None:
+        self._tables = tables
+
+        self.list = to_raw_response_wrapper(
+            tables.list,
+        )
+
+    @cached_property
+    def maintenance_configs(self) -> MaintenanceConfigsResourceWithRawResponse:
+        return MaintenanceConfigsResourceWithRawResponse(self._tables.maintenance_configs)
+
+
+class AsyncTablesResourceWithRawResponse:
+    def __init__(self, tables: AsyncTablesResource) -> None:
+        self._tables = tables
+
+        self.list = async_to_raw_response_wrapper(
+            tables.list,
+        )
+
+    @cached_property
+    def maintenance_configs(self) -> AsyncMaintenanceConfigsResourceWithRawResponse:
+        return AsyncMaintenanceConfigsResourceWithRawResponse(self._tables.maintenance_configs)
+
+
+class TablesResourceWithStreamingResponse:
+    def __init__(self, tables: TablesResource) -> None:
+        self._tables = tables
+
+        self.list = to_streamed_response_wrapper(
+            tables.list,
+        )
+
+    @cached_property
+    def maintenance_configs(self) -> MaintenanceConfigsResourceWithStreamingResponse:
+        return MaintenanceConfigsResourceWithStreamingResponse(self._tables.maintenance_configs)
+
+
+class AsyncTablesResourceWithStreamingResponse:
+    def __init__(self, tables: AsyncTablesResource) -> None:
+        self._tables = tables
+
+        self.list = async_to_streamed_response_wrapper(
+            tables.list,
+        )
+
+    @cached_property
+    def maintenance_configs(self) -> AsyncMaintenanceConfigsResourceWithStreamingResponse:
+        return AsyncMaintenanceConfigsResourceWithStreamingResponse(self._tables.maintenance_configs)
diff --git a/src/cloudflare/resources/r2_data_catalog/r2_data_catalog.py b/src/cloudflare/resources/r2_data_catalog/r2_data_catalog.py
new file mode 100644
index 00000000000..58d3948f248
--- /dev/null
+++ b/src/cloudflare/resources/r2_data_catalog/r2_data_catalog.py
@@ -0,0 +1,586 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ..._types import Body, Query, Headers, NoneType, NotGiven, not_given
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from .credentials import (
+    CredentialsResource,
+    AsyncCredentialsResource,
+    CredentialsResourceWithRawResponse,
+    AsyncCredentialsResourceWithRawResponse,
+    CredentialsResourceWithStreamingResponse,
+    AsyncCredentialsResourceWithStreamingResponse,
+)
+from ..._base_client import make_request_options
+from .maintenance_configs import (
+    MaintenanceConfigsResource,
+    AsyncMaintenanceConfigsResource,
+    MaintenanceConfigsResourceWithRawResponse,
+    AsyncMaintenanceConfigsResourceWithRawResponse,
+    MaintenanceConfigsResourceWithStreamingResponse,
+    AsyncMaintenanceConfigsResourceWithStreamingResponse,
+)
+from .namespaces.namespaces import (
+    NamespacesResource,
+    AsyncNamespacesResource,
+    NamespacesResourceWithRawResponse,
+    AsyncNamespacesResourceWithRawResponse,
+    NamespacesResourceWithStreamingResponse,
+    AsyncNamespacesResourceWithStreamingResponse,
+)
+from ...types.r2_data_catalog.r2_data_catalog_get_response import R2DataCatalogGetResponse
+from ...types.r2_data_catalog.r2_data_catalog_list_response import R2DataCatalogListResponse
+from ...types.r2_data_catalog.r2_data_catalog_enable_response import R2DataCatalogEnableResponse
+
+__all__ = ["R2DataCatalogResource", "AsyncR2DataCatalogResource"]
+
+
+class R2DataCatalogResource(SyncAPIResource):
+    @cached_property
+    def maintenance_configs(self) -> MaintenanceConfigsResource:
+        return MaintenanceConfigsResource(self._client)
+
+    @cached_property
+    def credentials(self) -> CredentialsResource:
+        return CredentialsResource(self._client)
+
+    @cached_property
+    def namespaces(self) -> NamespacesResource:
+        return NamespacesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> R2DataCatalogResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return R2DataCatalogResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> R2DataCatalogResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return R2DataCatalogResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[R2DataCatalogListResponse]:
+        """
+        Returns a list of R2 buckets that have been enabled as Apache Iceberg catalogs
+        for the specified account. Each catalog represents an R2 bucket configured to
+        store Iceberg metadata and data files.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/r2-catalog",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[R2DataCatalogListResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[R2DataCatalogListResponse]], ResultWrapper[R2DataCatalogListResponse]),
+        )
+
+    def disable(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """Disable an R2 bucket as a catalog.
+
+        This operation deactivates the catalog but
+        preserves existing metadata and data files. The catalog can be re-enabled later.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._post(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}/disable",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    def enable(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[R2DataCatalogEnableResponse]:
+        """Enable an R2 bucket as an Apache Iceberg catalog.
+
+        This operation creates the
+        necessary catalog infrastructure and activates the bucket for storing Iceberg
+        metadata and data files.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        return self._post(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}/enable",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[R2DataCatalogEnableResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[R2DataCatalogEnableResponse]], ResultWrapper[R2DataCatalogEnableResponse]),
+        )
+
+    def get(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[R2DataCatalogGetResponse]:
+        """
+        Retrieve detailed information about a specific R2 catalog by bucket name.
+        Returns catalog status, maintenance configuration, and credential status.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        return self._get(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[R2DataCatalogGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[R2DataCatalogGetResponse]], ResultWrapper[R2DataCatalogGetResponse]),
+        )
+
+
+class AsyncR2DataCatalogResource(AsyncAPIResource):
+    @cached_property
+    def maintenance_configs(self) -> AsyncMaintenanceConfigsResource:
+        return AsyncMaintenanceConfigsResource(self._client)
+
+    @cached_property
+    def credentials(self) -> AsyncCredentialsResource:
+        return AsyncCredentialsResource(self._client)
+
+    @cached_property
+    def namespaces(self) -> AsyncNamespacesResource:
+        return AsyncNamespacesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncR2DataCatalogResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncR2DataCatalogResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncR2DataCatalogResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncR2DataCatalogResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[R2DataCatalogListResponse]:
+        """
+        Returns a list of R2 buckets that have been enabled as Apache Iceberg catalogs
+        for the specified account. Each catalog represents an R2 bucket configured to
+        store Iceberg metadata and data files.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/r2-catalog",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[R2DataCatalogListResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[R2DataCatalogListResponse]], ResultWrapper[R2DataCatalogListResponse]),
+        )
+
+    async def disable(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """Disable an R2 bucket as a catalog.
+
+        This operation deactivates the catalog but
+        preserves existing metadata and data files. The catalog can be re-enabled later.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._post(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}/disable",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    async def enable(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[R2DataCatalogEnableResponse]:
+        """Enable an R2 bucket as an Apache Iceberg catalog.
+
+        This operation creates the
+        necessary catalog infrastructure and activates the bucket for storing Iceberg
+        metadata and data files.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        return await self._post(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}/enable",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[R2DataCatalogEnableResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[R2DataCatalogEnableResponse]], ResultWrapper[R2DataCatalogEnableResponse]),
+        )
+
+    async def get(
+        self,
+        bucket_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[R2DataCatalogGetResponse]:
+        """
+        Retrieve detailed information about a specific R2 catalog by bucket name.
+        Returns catalog status, maintenance configuration, and credential status.
+
+        Args:
+          account_id: Use this to identify the account.
+
+          bucket_name: Specifies the R2 bucket name.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not bucket_name:
+            raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}")
+        return await self._get(
+            f"/accounts/{account_id}/r2-catalog/{bucket_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[R2DataCatalogGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[R2DataCatalogGetResponse]], ResultWrapper[R2DataCatalogGetResponse]),
+        )
+
+
+class R2DataCatalogResourceWithRawResponse:
+    def __init__(self, r2_data_catalog: R2DataCatalogResource) -> None:
+        self._r2_data_catalog = r2_data_catalog
+
+        self.list = to_raw_response_wrapper(
+            r2_data_catalog.list,
+        )
+        self.disable = to_raw_response_wrapper(
+            r2_data_catalog.disable,
+        )
+        self.enable = to_raw_response_wrapper(
+            r2_data_catalog.enable,
+        )
+        self.get = to_raw_response_wrapper(
+            r2_data_catalog.get,
+        )
+
+    @cached_property
+    def maintenance_configs(self) -> MaintenanceConfigsResourceWithRawResponse:
+        return MaintenanceConfigsResourceWithRawResponse(self._r2_data_catalog.maintenance_configs)
+
+    @cached_property
+    def credentials(self) -> CredentialsResourceWithRawResponse:
+        return CredentialsResourceWithRawResponse(self._r2_data_catalog.credentials)
+
+    @cached_property
+    def namespaces(self) -> NamespacesResourceWithRawResponse:
+        return NamespacesResourceWithRawResponse(self._r2_data_catalog.namespaces)
+
+
+class AsyncR2DataCatalogResourceWithRawResponse:
+    def __init__(self, r2_data_catalog: AsyncR2DataCatalogResource) -> None:
+        self._r2_data_catalog = r2_data_catalog
+
+        self.list = async_to_raw_response_wrapper(
+            r2_data_catalog.list,
+        )
+        self.disable = async_to_raw_response_wrapper(
+            r2_data_catalog.disable,
+        )
+        self.enable = async_to_raw_response_wrapper(
+            r2_data_catalog.enable,
+        )
+        self.get = async_to_raw_response_wrapper(
+            r2_data_catalog.get,
+        )
+
+    @cached_property
+    def maintenance_configs(self) -> AsyncMaintenanceConfigsResourceWithRawResponse:
+        return AsyncMaintenanceConfigsResourceWithRawResponse(self._r2_data_catalog.maintenance_configs)
+
+    @cached_property
+    def credentials(self) -> AsyncCredentialsResourceWithRawResponse:
+        return AsyncCredentialsResourceWithRawResponse(self._r2_data_catalog.credentials)
+
+    @cached_property
+    def namespaces(self) -> AsyncNamespacesResourceWithRawResponse:
+        return AsyncNamespacesResourceWithRawResponse(self._r2_data_catalog.namespaces)
+
+
+class R2DataCatalogResourceWithStreamingResponse:
+    def __init__(self, r2_data_catalog: R2DataCatalogResource) -> None:
+        self._r2_data_catalog = r2_data_catalog
+
+        self.list = to_streamed_response_wrapper(
+            r2_data_catalog.list,
+        )
+        self.disable = to_streamed_response_wrapper(
+            r2_data_catalog.disable,
+        )
+        self.enable = to_streamed_response_wrapper(
+            r2_data_catalog.enable,
+        )
+        self.get = to_streamed_response_wrapper(
+            r2_data_catalog.get,
+        )
+
+    @cached_property
+    def maintenance_configs(self) -> MaintenanceConfigsResourceWithStreamingResponse:
+        return MaintenanceConfigsResourceWithStreamingResponse(self._r2_data_catalog.maintenance_configs)
+
+    @cached_property
+    def credentials(self) -> CredentialsResourceWithStreamingResponse:
+        return CredentialsResourceWithStreamingResponse(self._r2_data_catalog.credentials)
+
+    @cached_property
+    def namespaces(self) -> NamespacesResourceWithStreamingResponse:
+        return NamespacesResourceWithStreamingResponse(self._r2_data_catalog.namespaces)
+
+
+class AsyncR2DataCatalogResourceWithStreamingResponse:
+    def __init__(self, r2_data_catalog: AsyncR2DataCatalogResource) -> None:
+        self._r2_data_catalog = r2_data_catalog
+
+        self.list = async_to_streamed_response_wrapper(
+            r2_data_catalog.list,
+        )
+        self.disable = async_to_streamed_response_wrapper(
+            r2_data_catalog.disable,
+        )
+        self.enable = async_to_streamed_response_wrapper(
+            r2_data_catalog.enable,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            r2_data_catalog.get,
+        )
+
+    @cached_property
+    def maintenance_configs(self) -> AsyncMaintenanceConfigsResourceWithStreamingResponse:
+        return AsyncMaintenanceConfigsResourceWithStreamingResponse(self._r2_data_catalog.maintenance_configs)
+
+    @cached_property
+    def credentials(self) -> AsyncCredentialsResourceWithStreamingResponse:
+        return AsyncCredentialsResourceWithStreamingResponse(self._r2_data_catalog.credentials)
+
+    @cached_property
+    def namespaces(self) -> AsyncNamespacesResourceWithStreamingResponse:
+        return AsyncNamespacesResourceWithStreamingResponse(self._r2_data_catalog.namespaces)
diff --git a/src/cloudflare/resources/radar/__init__.py b/src/cloudflare/resources/radar/__init__.py
index 5ea83f8d764..b4245d8dc48 100644
--- a/src/cloudflare/resources/radar/__init__.py
+++ b/src/cloudflare/resources/radar/__init__.py
@@ -1,5 +1,21 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from .ai import (
+    AIResource,
+    AsyncAIResource,
+    AIResourceWithRawResponse,
+    AsyncAIResourceWithRawResponse,
+    AIResourceWithStreamingResponse,
+    AsyncAIResourceWithStreamingResponse,
+)
+from .ct import (
+    CTResource,
+    AsyncCTResource,
+    CTResourceWithRawResponse,
+    AsyncCTResourceWithRawResponse,
+    CTResourceWithStreamingResponse,
+    AsyncCTResourceWithStreamingResponse,
+)
 from .bgp import (
     BGPResource,
     AsyncBGPResource,
@@ -16,6 +32,14 @@
     DNSResourceWithStreamingResponse,
     AsyncDNSResourceWithStreamingResponse,
 )
+from .bots import (
+    BotsResource,
+    AsyncBotsResource,
+    BotsResourceWithRawResponse,
+    AsyncBotsResourceWithRawResponse,
+    BotsResourceWithStreamingResponse,
+    AsyncBotsResourceWithStreamingResponse,
+)
 from .http import (
     HTTPResource,
     AsyncHTTPResource,
@@ -97,12 +121,20 @@
     AsyncEntitiesResourceWithStreamingResponse,
 )
 from .netflows import (
-    NetflowsResource,
-    AsyncNetflowsResource,
-    NetflowsResourceWithRawResponse,
-    AsyncNetflowsResourceWithRawResponse,
-    NetflowsResourceWithStreamingResponse,
-    AsyncNetflowsResourceWithStreamingResponse,
+    NetFlowsResource,
+    AsyncNetFlowsResource,
+    NetFlowsResourceWithRawResponse,
+    AsyncNetFlowsResourceWithRawResponse,
+    NetFlowsResourceWithStreamingResponse,
+    AsyncNetFlowsResourceWithStreamingResponse,
+)
+from .robots_txt import (
+    RobotsTXTResource,
+    AsyncRobotsTXTResource,
+    RobotsTXTResourceWithRawResponse,
+    AsyncRobotsTXTResourceWithRawResponse,
+    RobotsTXTResourceWithStreamingResponse,
+    AsyncRobotsTXTResourceWithStreamingResponse,
 )
 from .annotations import (
     AnnotationsResource,
@@ -112,6 +144,14 @@
     AnnotationsResourceWithStreamingResponse,
     AsyncAnnotationsResourceWithStreamingResponse,
 )
+from .geolocations import (
+    GeolocationsResource,
+    AsyncGeolocationsResource,
+    GeolocationsResourceWithRawResponse,
+    AsyncGeolocationsResourceWithRawResponse,
+    GeolocationsResourceWithStreamingResponse,
+    AsyncGeolocationsResourceWithStreamingResponse,
+)
 from .verified_bots import (
     VerifiedBotsResource,
     AsyncVerifiedBotsResource,
@@ -128,6 +168,14 @@
     TrafficAnomaliesResourceWithStreamingResponse,
     AsyncTrafficAnomaliesResourceWithStreamingResponse,
 )
+from .leaked_credentials import (
+    LeakedCredentialsResource,
+    AsyncLeakedCredentialsResource,
+    LeakedCredentialsResourceWithRawResponse,
+    AsyncLeakedCredentialsResourceWithRawResponse,
+    LeakedCredentialsResourceWithStreamingResponse,
+    AsyncLeakedCredentialsResourceWithStreamingResponse,
+)
 from .tcp_resets_timeouts import (
     TCPResetsTimeoutsResource,
     AsyncTCPResetsTimeoutsResource,
@@ -138,6 +186,18 @@
 )
 
 __all__ = [
+    "AIResource",
+    "AsyncAIResource",
+    "AIResourceWithRawResponse",
+    "AsyncAIResourceWithRawResponse",
+    "AIResourceWithStreamingResponse",
+    "AsyncAIResourceWithStreamingResponse",
+    "CTResource",
+    "AsyncCTResource",
+    "CTResourceWithRawResponse",
+    "AsyncCTResourceWithRawResponse",
+    "CTResourceWithStreamingResponse",
+    "AsyncCTResourceWithStreamingResponse",
     "AnnotationsResource",
     "AsyncAnnotationsResource",
     "AnnotationsResourceWithRawResponse",
@@ -150,6 +210,12 @@
     "AsyncBGPResourceWithRawResponse",
     "BGPResourceWithStreamingResponse",
     "AsyncBGPResourceWithStreamingResponse",
+    "BotsResource",
+    "AsyncBotsResource",
+    "BotsResourceWithRawResponse",
+    "AsyncBotsResourceWithRawResponse",
+    "BotsResourceWithStreamingResponse",
+    "AsyncBotsResourceWithStreamingResponse",
     "DatasetsResource",
     "AsyncDatasetsResource",
     "DatasetsResourceWithRawResponse",
@@ -162,12 +228,12 @@
     "AsyncDNSResourceWithRawResponse",
     "DNSResourceWithStreamingResponse",
     "AsyncDNSResourceWithStreamingResponse",
-    "NetflowsResource",
-    "AsyncNetflowsResource",
-    "NetflowsResourceWithRawResponse",
-    "AsyncNetflowsResourceWithRawResponse",
-    "NetflowsResourceWithStreamingResponse",
-    "AsyncNetflowsResourceWithStreamingResponse",
+    "NetFlowsResource",
+    "AsyncNetFlowsResource",
+    "NetFlowsResourceWithRawResponse",
+    "AsyncNetFlowsResourceWithRawResponse",
+    "NetFlowsResourceWithStreamingResponse",
+    "AsyncNetFlowsResourceWithStreamingResponse",
     "SearchResource",
     "AsyncSearchResource",
     "SearchResourceWithRawResponse",
@@ -204,6 +270,12 @@
     "AsyncEntitiesResourceWithRawResponse",
     "EntitiesResourceWithStreamingResponse",
     "AsyncEntitiesResourceWithStreamingResponse",
+    "GeolocationsResource",
+    "AsyncGeolocationsResource",
+    "GeolocationsResourceWithRawResponse",
+    "AsyncGeolocationsResourceWithRawResponse",
+    "GeolocationsResourceWithStreamingResponse",
+    "AsyncGeolocationsResourceWithStreamingResponse",
     "HTTPResource",
     "AsyncHTTPResource",
     "HTTPResourceWithRawResponse",
@@ -234,6 +306,18 @@
     "AsyncTCPResetsTimeoutsResourceWithRawResponse",
     "TCPResetsTimeoutsResourceWithStreamingResponse",
     "AsyncTCPResetsTimeoutsResourceWithStreamingResponse",
+    "RobotsTXTResource",
+    "AsyncRobotsTXTResource",
+    "RobotsTXTResourceWithRawResponse",
+    "AsyncRobotsTXTResourceWithRawResponse",
+    "RobotsTXTResourceWithStreamingResponse",
+    "AsyncRobotsTXTResourceWithStreamingResponse",
+    "LeakedCredentialsResource",
+    "AsyncLeakedCredentialsResource",
+    "LeakedCredentialsResourceWithRawResponse",
+    "AsyncLeakedCredentialsResourceWithRawResponse",
+    "LeakedCredentialsResourceWithStreamingResponse",
+    "AsyncLeakedCredentialsResourceWithStreamingResponse",
     "RadarResource",
     "AsyncRadarResource",
     "RadarResourceWithRawResponse",
diff --git a/src/cloudflare/resources/radar/ai/__init__.py b/src/cloudflare/resources/radar/ai/__init__.py
new file mode 100644
index 00000000000..5b5048adbe1
--- /dev/null
+++ b/src/cloudflare/resources/radar/ai/__init__.py
@@ -0,0 +1,75 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .ai import (
+    AIResource,
+    AsyncAIResource,
+    AIResourceWithRawResponse,
+    AsyncAIResourceWithRawResponse,
+    AIResourceWithStreamingResponse,
+    AsyncAIResourceWithStreamingResponse,
+)
+from .bots import (
+    BotsResource,
+    AsyncBotsResource,
+    BotsResourceWithRawResponse,
+    AsyncBotsResourceWithRawResponse,
+    BotsResourceWithStreamingResponse,
+    AsyncBotsResourceWithStreamingResponse,
+)
+from .inference import (
+    InferenceResource,
+    AsyncInferenceResource,
+    InferenceResourceWithRawResponse,
+    AsyncInferenceResourceWithRawResponse,
+    InferenceResourceWithStreamingResponse,
+    AsyncInferenceResourceWithStreamingResponse,
+)
+from .to_markdown import (
+    ToMarkdownResource,
+    AsyncToMarkdownResource,
+    ToMarkdownResourceWithRawResponse,
+    AsyncToMarkdownResourceWithRawResponse,
+    ToMarkdownResourceWithStreamingResponse,
+    AsyncToMarkdownResourceWithStreamingResponse,
+)
+from .timeseries_groups import (
+    TimeseriesGroupsResource,
+    AsyncTimeseriesGroupsResource,
+    TimeseriesGroupsResourceWithRawResponse,
+    AsyncTimeseriesGroupsResourceWithRawResponse,
+    TimeseriesGroupsResourceWithStreamingResponse,
+    AsyncTimeseriesGroupsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ToMarkdownResource",
+    "AsyncToMarkdownResource",
+    "ToMarkdownResourceWithRawResponse",
+    "AsyncToMarkdownResourceWithRawResponse",
+    "ToMarkdownResourceWithStreamingResponse",
+    "AsyncToMarkdownResourceWithStreamingResponse",
+    "InferenceResource",
+    "AsyncInferenceResource",
+    "InferenceResourceWithRawResponse",
+    "AsyncInferenceResourceWithRawResponse",
+    "InferenceResourceWithStreamingResponse",
+    "AsyncInferenceResourceWithStreamingResponse",
+    "BotsResource",
+    "AsyncBotsResource",
+    "BotsResourceWithRawResponse",
+    "AsyncBotsResourceWithRawResponse",
+    "BotsResourceWithStreamingResponse",
+    "AsyncBotsResourceWithStreamingResponse",
+    "TimeseriesGroupsResource",
+    "AsyncTimeseriesGroupsResource",
+    "TimeseriesGroupsResourceWithRawResponse",
+    "AsyncTimeseriesGroupsResourceWithRawResponse",
+    "TimeseriesGroupsResourceWithStreamingResponse",
+    "AsyncTimeseriesGroupsResourceWithStreamingResponse",
+    "AIResource",
+    "AsyncAIResource",
+    "AIResourceWithRawResponse",
+    "AsyncAIResourceWithRawResponse",
+    "AIResourceWithStreamingResponse",
+    "AsyncAIResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/radar/ai/ai.py b/src/cloudflare/resources/radar/ai/ai.py
new file mode 100644
index 00000000000..a0b5b483650
--- /dev/null
+++ b/src/cloudflare/resources/radar/ai/ai.py
@@ -0,0 +1,198 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .bots.bots import (
+    BotsResource,
+    AsyncBotsResource,
+    BotsResourceWithRawResponse,
+    AsyncBotsResourceWithRawResponse,
+    BotsResourceWithStreamingResponse,
+    AsyncBotsResourceWithStreamingResponse,
+)
+from ...._compat import cached_property
+from .to_markdown import (
+    ToMarkdownResource,
+    AsyncToMarkdownResource,
+    ToMarkdownResourceWithRawResponse,
+    AsyncToMarkdownResourceWithRawResponse,
+    ToMarkdownResourceWithStreamingResponse,
+    AsyncToMarkdownResourceWithStreamingResponse,
+)
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .timeseries_groups import (
+    TimeseriesGroupsResource,
+    AsyncTimeseriesGroupsResource,
+    TimeseriesGroupsResourceWithRawResponse,
+    AsyncTimeseriesGroupsResourceWithRawResponse,
+    TimeseriesGroupsResourceWithStreamingResponse,
+    AsyncTimeseriesGroupsResourceWithStreamingResponse,
+)
+from .inference.inference import (
+    InferenceResource,
+    AsyncInferenceResource,
+    InferenceResourceWithRawResponse,
+    AsyncInferenceResourceWithRawResponse,
+    InferenceResourceWithStreamingResponse,
+    AsyncInferenceResourceWithStreamingResponse,
+)
+
+__all__ = ["AIResource", "AsyncAIResource"]
+
+
+class AIResource(SyncAPIResource):
+    @cached_property
+    def to_markdown(self) -> ToMarkdownResource:
+        return ToMarkdownResource(self._client)
+
+    @cached_property
+    def inference(self) -> InferenceResource:
+        return InferenceResource(self._client)
+
+    @cached_property
+    def bots(self) -> BotsResource:
+        return BotsResource(self._client)
+
+    @cached_property
+    def timeseries_groups(self) -> TimeseriesGroupsResource:
+        return TimeseriesGroupsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AIResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AIResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AIResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AIResourceWithStreamingResponse(self)
+
+
+class AsyncAIResource(AsyncAPIResource):
+    @cached_property
+    def to_markdown(self) -> AsyncToMarkdownResource:
+        return AsyncToMarkdownResource(self._client)
+
+    @cached_property
+    def inference(self) -> AsyncInferenceResource:
+        return AsyncInferenceResource(self._client)
+
+    @cached_property
+    def bots(self) -> AsyncBotsResource:
+        return AsyncBotsResource(self._client)
+
+    @cached_property
+    def timeseries_groups(self) -> AsyncTimeseriesGroupsResource:
+        return AsyncTimeseriesGroupsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncAIResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAIResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAIResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAIResourceWithStreamingResponse(self)
+
+
+class AIResourceWithRawResponse:
+    def __init__(self, ai: AIResource) -> None:
+        self._ai = ai
+
+    @cached_property
+    def to_markdown(self) -> ToMarkdownResourceWithRawResponse:
+        return ToMarkdownResourceWithRawResponse(self._ai.to_markdown)
+
+    @cached_property
+    def inference(self) -> InferenceResourceWithRawResponse:
+        return InferenceResourceWithRawResponse(self._ai.inference)
+
+    @cached_property
+    def bots(self) -> BotsResourceWithRawResponse:
+        return BotsResourceWithRawResponse(self._ai.bots)
+
+    @cached_property
+    def timeseries_groups(self) -> TimeseriesGroupsResourceWithRawResponse:
+        return TimeseriesGroupsResourceWithRawResponse(self._ai.timeseries_groups)
+
+
+class AsyncAIResourceWithRawResponse:
+    def __init__(self, ai: AsyncAIResource) -> None:
+        self._ai = ai
+
+    @cached_property
+    def to_markdown(self) -> AsyncToMarkdownResourceWithRawResponse:
+        return AsyncToMarkdownResourceWithRawResponse(self._ai.to_markdown)
+
+    @cached_property
+    def inference(self) -> AsyncInferenceResourceWithRawResponse:
+        return AsyncInferenceResourceWithRawResponse(self._ai.inference)
+
+    @cached_property
+    def bots(self) -> AsyncBotsResourceWithRawResponse:
+        return AsyncBotsResourceWithRawResponse(self._ai.bots)
+
+    @cached_property
+    def timeseries_groups(self) -> AsyncTimeseriesGroupsResourceWithRawResponse:
+        return AsyncTimeseriesGroupsResourceWithRawResponse(self._ai.timeseries_groups)
+
+
+class AIResourceWithStreamingResponse:
+    def __init__(self, ai: AIResource) -> None:
+        self._ai = ai
+
+    @cached_property
+    def to_markdown(self) -> ToMarkdownResourceWithStreamingResponse:
+        return ToMarkdownResourceWithStreamingResponse(self._ai.to_markdown)
+
+    @cached_property
+    def inference(self) -> InferenceResourceWithStreamingResponse:
+        return InferenceResourceWithStreamingResponse(self._ai.inference)
+
+    @cached_property
+    def bots(self) -> BotsResourceWithStreamingResponse:
+        return BotsResourceWithStreamingResponse(self._ai.bots)
+
+    @cached_property
+    def timeseries_groups(self) -> TimeseriesGroupsResourceWithStreamingResponse:
+        return TimeseriesGroupsResourceWithStreamingResponse(self._ai.timeseries_groups)
+
+
+class AsyncAIResourceWithStreamingResponse:
+    def __init__(self, ai: AsyncAIResource) -> None:
+        self._ai = ai
+
+    @cached_property
+    def to_markdown(self) -> AsyncToMarkdownResourceWithStreamingResponse:
+        return AsyncToMarkdownResourceWithStreamingResponse(self._ai.to_markdown)
+
+    @cached_property
+    def inference(self) -> AsyncInferenceResourceWithStreamingResponse:
+        return AsyncInferenceResourceWithStreamingResponse(self._ai.inference)
+
+    @cached_property
+    def bots(self) -> AsyncBotsResourceWithStreamingResponse:
+        return AsyncBotsResourceWithStreamingResponse(self._ai.bots)
+
+    @cached_property
+    def timeseries_groups(self) -> AsyncTimeseriesGroupsResourceWithStreamingResponse:
+        return AsyncTimeseriesGroupsResourceWithStreamingResponse(self._ai.timeseries_groups)
diff --git a/src/cloudflare/resources/radar/ai/bots/__init__.py b/src/cloudflare/resources/radar/ai/bots/__init__.py
new file mode 100644
index 00000000000..53724a17401
--- /dev/null
+++ b/src/cloudflare/resources/radar/ai/bots/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .bots import (
+    BotsResource,
+    AsyncBotsResource,
+    BotsResourceWithRawResponse,
+    AsyncBotsResourceWithRawResponse,
+    BotsResourceWithStreamingResponse,
+    AsyncBotsResourceWithStreamingResponse,
+)
+from .summary import (
+    SummaryResource,
+    AsyncSummaryResource,
+    SummaryResourceWithRawResponse,
+    AsyncSummaryResourceWithRawResponse,
+    SummaryResourceWithStreamingResponse,
+    AsyncSummaryResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "SummaryResource",
+    "AsyncSummaryResource",
+    "SummaryResourceWithRawResponse",
+    "AsyncSummaryResourceWithRawResponse",
+    "SummaryResourceWithStreamingResponse",
+    "AsyncSummaryResourceWithStreamingResponse",
+    "BotsResource",
+    "AsyncBotsResource",
+    "BotsResourceWithRawResponse",
+    "AsyncBotsResourceWithRawResponse",
+    "BotsResourceWithStreamingResponse",
+    "AsyncBotsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/radar/ai/bots/bots.py b/src/cloudflare/resources/radar/ai/bots/bots.py
new file mode 100644
index 00000000000..71be23206f2
--- /dev/null
+++ b/src/cloudflare/resources/radar/ai/bots/bots.py
@@ -0,0 +1,816 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Union, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from .summary import (
+    SummaryResource,
+    AsyncSummaryResource,
+    SummaryResourceWithRawResponse,
+    AsyncSummaryResourceWithRawResponse,
+    SummaryResourceWithStreamingResponse,
+    AsyncSummaryResourceWithStreamingResponse,
+)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.radar.ai import bot_summary_v2_params, bot_timeseries_params, bot_timeseries_groups_params
+from .....types.radar.ai.bot_summary_v2_response import BotSummaryV2Response
+from .....types.radar.ai.bot_timeseries_response import BotTimeseriesResponse
+from .....types.radar.ai.bot_timeseries_groups_response import BotTimeseriesGroupsResponse
+
+__all__ = ["BotsResource", "AsyncBotsResource"]
+
+
+class BotsResource(SyncAPIResource):
+    @cached_property
+    def summary(self) -> SummaryResource:
+        return SummaryResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> BotsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return BotsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> BotsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return BotsResourceWithStreamingResponse(self)
+
+    def summary_v2(
+        self,
+        dimension: Literal["USER_AGENT", "CRAWL_PURPOSE", "INDUSTRY", "VERTICAL"],
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        crawl_purpose: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        industry: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        vertical: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BotSummaryV2Response:
+        """
+        Retrieves an aggregated summary of AI bots HTTP requests grouped by the
+        specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          crawl_purpose: Filters results by bot crawl purpose.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          industry: Filters results by industry.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          vertical: Filters results by vertical.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/ai/bots/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "crawl_purpose": crawl_purpose,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "industry": industry,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "vertical": vertical,
+                    },
+                    bot_summary_v2_params.BotSummaryV2Params,
+                ),
+                post_parser=ResultWrapper[BotSummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[BotSummaryV2Response], ResultWrapper[BotSummaryV2Response]),
+        )
+
+    def timeseries(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        crawl_purpose: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        industry: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        user_agent: SequenceNotStr[str] | Omit = omit,
+        vertical: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BotTimeseriesResponse:
+        """
+        Retrieves AI bots HTTP request volume over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          crawl_purpose: Filters results by bot crawl purpose.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          industry: Filters results by industry.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          user_agent: Filters results by user agent.
+
+          vertical: Filters results by vertical.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/ai/bots/timeseries",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "crawl_purpose": crawl_purpose,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "industry": industry,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "user_agent": user_agent,
+                        "vertical": vertical,
+                    },
+                    bot_timeseries_params.BotTimeseriesParams,
+                ),
+                post_parser=ResultWrapper[BotTimeseriesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BotTimeseriesResponse], ResultWrapper[BotTimeseriesResponse]),
+        )
+
+    def timeseries_groups(
+        self,
+        dimension: Literal["USER_AGENT", "CRAWL_PURPOSE", "INDUSTRY", "VERTICAL"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        crawl_purpose: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        industry: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | Omit = omit,
+        vertical: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BotTimeseriesGroupsResponse:
+        """
+        Retrieves the distribution of HTTP requests from AI bots, grouped by chosen the
+        specified dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          crawl_purpose: Filters results by bot crawl purpose.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          industry: Filters results by industry.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          vertical: Filters results by vertical.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/ai/bots/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "crawl_purpose": crawl_purpose,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "industry": industry,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "normalization": normalization,
+                        "vertical": vertical,
+                    },
+                    bot_timeseries_groups_params.BotTimeseriesGroupsParams,
+                ),
+                post_parser=ResultWrapper[BotTimeseriesGroupsResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BotTimeseriesGroupsResponse], ResultWrapper[BotTimeseriesGroupsResponse]),
+        )
+
+
+class AsyncBotsResource(AsyncAPIResource):
+    @cached_property
+    def summary(self) -> AsyncSummaryResource:
+        return AsyncSummaryResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncBotsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncBotsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncBotsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncBotsResourceWithStreamingResponse(self)
+
+    async def summary_v2(
+        self,
+        dimension: Literal["USER_AGENT", "CRAWL_PURPOSE", "INDUSTRY", "VERTICAL"],
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        crawl_purpose: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        industry: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        vertical: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BotSummaryV2Response:
+        """
+        Retrieves an aggregated summary of AI bots HTTP requests grouped by the
+        specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          crawl_purpose: Filters results by bot crawl purpose.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          industry: Filters results by industry.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          vertical: Filters results by vertical.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/ai/bots/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "crawl_purpose": crawl_purpose,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "industry": industry,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "vertical": vertical,
+                    },
+                    bot_summary_v2_params.BotSummaryV2Params,
+                ),
+                post_parser=ResultWrapper[BotSummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[BotSummaryV2Response], ResultWrapper[BotSummaryV2Response]),
+        )
+
+    async def timeseries(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        crawl_purpose: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        industry: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        user_agent: SequenceNotStr[str] | Omit = omit,
+        vertical: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BotTimeseriesResponse:
+        """
+        Retrieves AI bots HTTP request volume over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          crawl_purpose: Filters results by bot crawl purpose.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          industry: Filters results by industry.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          user_agent: Filters results by user agent.
+
+          vertical: Filters results by vertical.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/ai/bots/timeseries",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "crawl_purpose": crawl_purpose,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "industry": industry,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "user_agent": user_agent,
+                        "vertical": vertical,
+                    },
+                    bot_timeseries_params.BotTimeseriesParams,
+                ),
+                post_parser=ResultWrapper[BotTimeseriesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BotTimeseriesResponse], ResultWrapper[BotTimeseriesResponse]),
+        )
+
+    async def timeseries_groups(
+        self,
+        dimension: Literal["USER_AGENT", "CRAWL_PURPOSE", "INDUSTRY", "VERTICAL"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        crawl_purpose: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        industry: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | Omit = omit,
+        vertical: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BotTimeseriesGroupsResponse:
+        """
+        Retrieves the distribution of HTTP requests from AI bots, grouped by chosen the
+        specified dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          crawl_purpose: Filters results by bot crawl purpose.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          industry: Filters results by industry.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          vertical: Filters results by vertical.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/ai/bots/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "crawl_purpose": crawl_purpose,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "industry": industry,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "normalization": normalization,
+                        "vertical": vertical,
+                    },
+                    bot_timeseries_groups_params.BotTimeseriesGroupsParams,
+                ),
+                post_parser=ResultWrapper[BotTimeseriesGroupsResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BotTimeseriesGroupsResponse], ResultWrapper[BotTimeseriesGroupsResponse]),
+        )
+
+
+class BotsResourceWithRawResponse:
+    def __init__(self, bots: BotsResource) -> None:
+        self._bots = bots
+
+        self.summary_v2 = to_raw_response_wrapper(
+            bots.summary_v2,
+        )
+        self.timeseries = to_raw_response_wrapper(
+            bots.timeseries,
+        )
+        self.timeseries_groups = to_raw_response_wrapper(
+            bots.timeseries_groups,
+        )
+
+    @cached_property
+    def summary(self) -> SummaryResourceWithRawResponse:
+        return SummaryResourceWithRawResponse(self._bots.summary)
+
+
+class AsyncBotsResourceWithRawResponse:
+    def __init__(self, bots: AsyncBotsResource) -> None:
+        self._bots = bots
+
+        self.summary_v2 = async_to_raw_response_wrapper(
+            bots.summary_v2,
+        )
+        self.timeseries = async_to_raw_response_wrapper(
+            bots.timeseries,
+        )
+        self.timeseries_groups = async_to_raw_response_wrapper(
+            bots.timeseries_groups,
+        )
+
+    @cached_property
+    def summary(self) -> AsyncSummaryResourceWithRawResponse:
+        return AsyncSummaryResourceWithRawResponse(self._bots.summary)
+
+
+class BotsResourceWithStreamingResponse:
+    def __init__(self, bots: BotsResource) -> None:
+        self._bots = bots
+
+        self.summary_v2 = to_streamed_response_wrapper(
+            bots.summary_v2,
+        )
+        self.timeseries = to_streamed_response_wrapper(
+            bots.timeseries,
+        )
+        self.timeseries_groups = to_streamed_response_wrapper(
+            bots.timeseries_groups,
+        )
+
+    @cached_property
+    def summary(self) -> SummaryResourceWithStreamingResponse:
+        return SummaryResourceWithStreamingResponse(self._bots.summary)
+
+
+class AsyncBotsResourceWithStreamingResponse:
+    def __init__(self, bots: AsyncBotsResource) -> None:
+        self._bots = bots
+
+        self.summary_v2 = async_to_streamed_response_wrapper(
+            bots.summary_v2,
+        )
+        self.timeseries = async_to_streamed_response_wrapper(
+            bots.timeseries,
+        )
+        self.timeseries_groups = async_to_streamed_response_wrapper(
+            bots.timeseries_groups,
+        )
+
+    @cached_property
+    def summary(self) -> AsyncSummaryResourceWithStreamingResponse:
+        return AsyncSummaryResourceWithStreamingResponse(self._bots.summary)
diff --git a/src/cloudflare/resources/radar/ai/bots/summary.py b/src/cloudflare/resources/radar/ai/bots/summary.py
new file mode 100644
index 00000000000..42de5e2d929
--- /dev/null
+++ b/src/cloudflare/resources/radar/ai/bots/summary.py
@@ -0,0 +1,291 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import typing_extensions
+from typing import Type, Union, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.radar.ai.bots import summary_user_agent_params
+from .....types.radar.ai.bots.summary_user_agent_response import SummaryUserAgentResponse
+
+__all__ = ["SummaryResource", "AsyncSummaryResource"]
+
+
+class SummaryResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SummaryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SummaryResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Radar AI Bots Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/ai/subresources/bots/methods/summary_v2/) instead."
+    )
+    def user_agent(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryUserAgentResponse:
+        """
+        Retrieves the distribution of traffic by AI user agent.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/ai/bots/summary/user_agent",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                    },
+                    summary_user_agent_params.SummaryUserAgentParams,
+                ),
+                post_parser=ResultWrapper[SummaryUserAgentResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryUserAgentResponse], ResultWrapper[SummaryUserAgentResponse]),
+        )
+
+
+class AsyncSummaryResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSummaryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSummaryResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Radar AI Bots Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/ai/subresources/bots/methods/summary_v2/) instead."
+    )
+    async def user_agent(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryUserAgentResponse:
+        """
+        Retrieves the distribution of traffic by AI user agent.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/ai/bots/summary/user_agent",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                    },
+                    summary_user_agent_params.SummaryUserAgentParams,
+                ),
+                post_parser=ResultWrapper[SummaryUserAgentResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryUserAgentResponse], ResultWrapper[SummaryUserAgentResponse]),
+        )
+
+
+class SummaryResourceWithRawResponse:
+    def __init__(self, summary: SummaryResource) -> None:
+        self._summary = summary
+
+        self.user_agent = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.user_agent,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncSummaryResourceWithRawResponse:
+    def __init__(self, summary: AsyncSummaryResource) -> None:
+        self._summary = summary
+
+        self.user_agent = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.user_agent,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class SummaryResourceWithStreamingResponse:
+    def __init__(self, summary: SummaryResource) -> None:
+        self._summary = summary
+
+        self.user_agent = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.user_agent,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncSummaryResourceWithStreamingResponse:
+    def __init__(self, summary: AsyncSummaryResource) -> None:
+        self._summary = summary
+
+        self.user_agent = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.user_agent,  # pyright: ignore[reportDeprecated],
+            )
+        )
diff --git a/src/cloudflare/resources/radar/ai/inference/__init__.py b/src/cloudflare/resources/radar/ai/inference/__init__.py
new file mode 100644
index 00000000000..e8ccfb2aff9
--- /dev/null
+++ b/src/cloudflare/resources/radar/ai/inference/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .summary import (
+    SummaryResource,
+    AsyncSummaryResource,
+    SummaryResourceWithRawResponse,
+    AsyncSummaryResourceWithRawResponse,
+    SummaryResourceWithStreamingResponse,
+    AsyncSummaryResourceWithStreamingResponse,
+)
+from .inference import (
+    InferenceResource,
+    AsyncInferenceResource,
+    InferenceResourceWithRawResponse,
+    AsyncInferenceResourceWithRawResponse,
+    InferenceResourceWithStreamingResponse,
+    AsyncInferenceResourceWithStreamingResponse,
+)
+from .timeseries_groups import (
+    TimeseriesGroupsResource,
+    AsyncTimeseriesGroupsResource,
+    TimeseriesGroupsResourceWithRawResponse,
+    AsyncTimeseriesGroupsResourceWithRawResponse,
+    TimeseriesGroupsResourceWithStreamingResponse,
+    AsyncTimeseriesGroupsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "SummaryResource",
+    "AsyncSummaryResource",
+    "SummaryResourceWithRawResponse",
+    "AsyncSummaryResourceWithRawResponse",
+    "SummaryResourceWithStreamingResponse",
+    "AsyncSummaryResourceWithStreamingResponse",
+    "TimeseriesGroupsResource",
+    "AsyncTimeseriesGroupsResource",
+    "TimeseriesGroupsResourceWithRawResponse",
+    "AsyncTimeseriesGroupsResourceWithRawResponse",
+    "TimeseriesGroupsResourceWithStreamingResponse",
+    "AsyncTimeseriesGroupsResourceWithStreamingResponse",
+    "InferenceResource",
+    "AsyncInferenceResource",
+    "InferenceResourceWithRawResponse",
+    "AsyncInferenceResourceWithRawResponse",
+    "InferenceResourceWithStreamingResponse",
+    "AsyncInferenceResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/radar/ai/inference/inference.py b/src/cloudflare/resources/radar/ai/inference/inference.py
new file mode 100644
index 00000000000..8a3e3da863e
--- /dev/null
+++ b/src/cloudflare/resources/radar/ai/inference/inference.py
@@ -0,0 +1,571 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Union, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from .summary import (
+    SummaryResource,
+    AsyncSummaryResource,
+    SummaryResourceWithRawResponse,
+    AsyncSummaryResourceWithRawResponse,
+    SummaryResourceWithStreamingResponse,
+    AsyncSummaryResourceWithStreamingResponse,
+)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.radar.ai import inference_summary_v2_params, inference_timeseries_groups_v2_params
+from .timeseries_groups.timeseries_groups import (
+    TimeseriesGroupsResource,
+    AsyncTimeseriesGroupsResource,
+    TimeseriesGroupsResourceWithRawResponse,
+    AsyncTimeseriesGroupsResourceWithRawResponse,
+    TimeseriesGroupsResourceWithStreamingResponse,
+    AsyncTimeseriesGroupsResourceWithStreamingResponse,
+)
+from .....types.radar.ai.inference_summary_v2_response import InferenceSummaryV2Response
+from .....types.radar.ai.inference_timeseries_groups_v2_response import InferenceTimeseriesGroupsV2Response
+
+__all__ = ["InferenceResource", "AsyncInferenceResource"]
+
+
+class InferenceResource(SyncAPIResource):
+    @cached_property
+    def summary(self) -> SummaryResource:
+        return SummaryResource(self._client)
+
+    @cached_property
+    def timeseries_groups(self) -> TimeseriesGroupsResource:
+        return TimeseriesGroupsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> InferenceResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return InferenceResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> InferenceResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return InferenceResourceWithStreamingResponse(self)
+
+    def summary_v2(
+        self,
+        dimension: Literal["MODEL", "TASK"],
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InferenceSummaryV2Response:
+        """
+        Retrieves an aggregated summary of unique accounts using Workers AI inference
+        grouped by the specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/ai/inference/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                    },
+                    inference_summary_v2_params.InferenceSummaryV2Params,
+                ),
+                post_parser=ResultWrapper[InferenceSummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[InferenceSummaryV2Response], ResultWrapper[InferenceSummaryV2Response]),
+        )
+
+    def timeseries_groups_v2(
+        self,
+        dimension: Literal["MODEL", "TASK"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InferenceTimeseriesGroupsV2Response:
+        """
+        Retrieves the distribution of unique accounts using Workers AI inference,
+        grouped by the specified dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/ai/inference/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "normalization": normalization,
+                    },
+                    inference_timeseries_groups_v2_params.InferenceTimeseriesGroupsV2Params,
+                ),
+                post_parser=ResultWrapper[InferenceTimeseriesGroupsV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[InferenceTimeseriesGroupsV2Response], ResultWrapper[InferenceTimeseriesGroupsV2Response]),
+        )
+
+
+class AsyncInferenceResource(AsyncAPIResource):
+    @cached_property
+    def summary(self) -> AsyncSummaryResource:
+        return AsyncSummaryResource(self._client)
+
+    @cached_property
+    def timeseries_groups(self) -> AsyncTimeseriesGroupsResource:
+        return AsyncTimeseriesGroupsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncInferenceResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncInferenceResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncInferenceResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncInferenceResourceWithStreamingResponse(self)
+
+    async def summary_v2(
+        self,
+        dimension: Literal["MODEL", "TASK"],
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InferenceSummaryV2Response:
+        """
+        Retrieves an aggregated summary of unique accounts using Workers AI inference
+        grouped by the specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/ai/inference/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                    },
+                    inference_summary_v2_params.InferenceSummaryV2Params,
+                ),
+                post_parser=ResultWrapper[InferenceSummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[InferenceSummaryV2Response], ResultWrapper[InferenceSummaryV2Response]),
+        )
+
+    async def timeseries_groups_v2(
+        self,
+        dimension: Literal["MODEL", "TASK"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InferenceTimeseriesGroupsV2Response:
+        """
+        Retrieves the distribution of unique accounts using Workers AI inference,
+        grouped by the specified dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/ai/inference/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "normalization": normalization,
+                    },
+                    inference_timeseries_groups_v2_params.InferenceTimeseriesGroupsV2Params,
+                ),
+                post_parser=ResultWrapper[InferenceTimeseriesGroupsV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[InferenceTimeseriesGroupsV2Response], ResultWrapper[InferenceTimeseriesGroupsV2Response]),
+        )
+
+
+class InferenceResourceWithRawResponse:
+    def __init__(self, inference: InferenceResource) -> None:
+        self._inference = inference
+
+        self.summary_v2 = to_raw_response_wrapper(
+            inference.summary_v2,
+        )
+        self.timeseries_groups_v2 = to_raw_response_wrapper(
+            inference.timeseries_groups_v2,
+        )
+
+    @cached_property
+    def summary(self) -> SummaryResourceWithRawResponse:
+        return SummaryResourceWithRawResponse(self._inference.summary)
+
+    @cached_property
+    def timeseries_groups(self) -> TimeseriesGroupsResourceWithRawResponse:
+        return TimeseriesGroupsResourceWithRawResponse(self._inference.timeseries_groups)
+
+
+class AsyncInferenceResourceWithRawResponse:
+    def __init__(self, inference: AsyncInferenceResource) -> None:
+        self._inference = inference
+
+        self.summary_v2 = async_to_raw_response_wrapper(
+            inference.summary_v2,
+        )
+        self.timeseries_groups_v2 = async_to_raw_response_wrapper(
+            inference.timeseries_groups_v2,
+        )
+
+    @cached_property
+    def summary(self) -> AsyncSummaryResourceWithRawResponse:
+        return AsyncSummaryResourceWithRawResponse(self._inference.summary)
+
+    @cached_property
+    def timeseries_groups(self) -> AsyncTimeseriesGroupsResourceWithRawResponse:
+        return AsyncTimeseriesGroupsResourceWithRawResponse(self._inference.timeseries_groups)
+
+
+class InferenceResourceWithStreamingResponse:
+    def __init__(self, inference: InferenceResource) -> None:
+        self._inference = inference
+
+        self.summary_v2 = to_streamed_response_wrapper(
+            inference.summary_v2,
+        )
+        self.timeseries_groups_v2 = to_streamed_response_wrapper(
+            inference.timeseries_groups_v2,
+        )
+
+    @cached_property
+    def summary(self) -> SummaryResourceWithStreamingResponse:
+        return SummaryResourceWithStreamingResponse(self._inference.summary)
+
+    @cached_property
+    def timeseries_groups(self) -> TimeseriesGroupsResourceWithStreamingResponse:
+        return TimeseriesGroupsResourceWithStreamingResponse(self._inference.timeseries_groups)
+
+
+class AsyncInferenceResourceWithStreamingResponse:
+    def __init__(self, inference: AsyncInferenceResource) -> None:
+        self._inference = inference
+
+        self.summary_v2 = async_to_streamed_response_wrapper(
+            inference.summary_v2,
+        )
+        self.timeseries_groups_v2 = async_to_streamed_response_wrapper(
+            inference.timeseries_groups_v2,
+        )
+
+    @cached_property
+    def summary(self) -> AsyncSummaryResourceWithStreamingResponse:
+        return AsyncSummaryResourceWithStreamingResponse(self._inference.summary)
+
+    @cached_property
+    def timeseries_groups(self) -> AsyncTimeseriesGroupsResourceWithStreamingResponse:
+        return AsyncTimeseriesGroupsResourceWithStreamingResponse(self._inference.timeseries_groups)
diff --git a/src/cloudflare/resources/radar/ai/inference/summary.py b/src/cloudflare/resources/radar/ai/inference/summary.py
new file mode 100644
index 00000000000..713876a908e
--- /dev/null
+++ b/src/cloudflare/resources/radar/ai/inference/summary.py
@@ -0,0 +1,414 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import typing_extensions
+from typing import Type, Union, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.radar.ai.inference import summary_task_params, summary_model_params
+from .....types.radar.ai.inference.summary_task_response import SummaryTaskResponse
+from .....types.radar.ai.inference.summary_model_response import SummaryModelResponse
+
+__all__ = ["SummaryResource", "AsyncSummaryResource"]
+
+
+class SummaryResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SummaryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SummaryResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Radar AI Inference Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/ai/subresources/inference/methods/summary_v2/) instead."
+    )
+    def model(
+        self,
+        *,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryModelResponse:
+        """
+        Retrieves the distribution of unique accounts by model.
+
+        Args:
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/ai/inference/summary/model",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                    },
+                    summary_model_params.SummaryModelParams,
+                ),
+                post_parser=ResultWrapper[SummaryModelResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryModelResponse], ResultWrapper[SummaryModelResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar AI Inference Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/ai/subresources/inference/methods/summary_v2/) instead."
+    )
+    def task(
+        self,
+        *,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryTaskResponse:
+        """
+        Retrieves the distribution of unique accounts by task.
+
+        Args:
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/ai/inference/summary/task",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                    },
+                    summary_task_params.SummaryTaskParams,
+                ),
+                post_parser=ResultWrapper[SummaryTaskResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryTaskResponse], ResultWrapper[SummaryTaskResponse]),
+        )
+
+
+class AsyncSummaryResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSummaryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSummaryResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Radar AI Inference Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/ai/subresources/inference/methods/summary_v2/) instead."
+    )
+    async def model(
+        self,
+        *,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryModelResponse:
+        """
+        Retrieves the distribution of unique accounts by model.
+
+        Args:
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/ai/inference/summary/model",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                    },
+                    summary_model_params.SummaryModelParams,
+                ),
+                post_parser=ResultWrapper[SummaryModelResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryModelResponse], ResultWrapper[SummaryModelResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar AI Inference Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/ai/subresources/inference/methods/summary_v2/) instead."
+    )
+    async def task(
+        self,
+        *,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryTaskResponse:
+        """
+        Retrieves the distribution of unique accounts by task.
+
+        Args:
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/ai/inference/summary/task",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                    },
+                    summary_task_params.SummaryTaskParams,
+                ),
+                post_parser=ResultWrapper[SummaryTaskResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryTaskResponse], ResultWrapper[SummaryTaskResponse]),
+        )
+
+
+class SummaryResourceWithRawResponse:
+    def __init__(self, summary: SummaryResource) -> None:
+        self._summary = summary
+
+        self.model = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.model,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.task = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.task,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncSummaryResourceWithRawResponse:
+    def __init__(self, summary: AsyncSummaryResource) -> None:
+        self._summary = summary
+
+        self.model = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.model,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.task = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.task,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class SummaryResourceWithStreamingResponse:
+    def __init__(self, summary: SummaryResource) -> None:
+        self._summary = summary
+
+        self.model = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.model,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.task = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.task,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncSummaryResourceWithStreamingResponse:
+    def __init__(self, summary: AsyncSummaryResource) -> None:
+        self._summary = summary
+
+        self.model = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.model,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.task = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.task,  # pyright: ignore[reportDeprecated],
+            )
+        )
diff --git a/src/cloudflare/resources/radar/ai/inference/timeseries_groups/__init__.py b/src/cloudflare/resources/radar/ai/inference/timeseries_groups/__init__.py
new file mode 100644
index 00000000000..3e42daf06bb
--- /dev/null
+++ b/src/cloudflare/resources/radar/ai/inference/timeseries_groups/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .summary import (
+    SummaryResource,
+    AsyncSummaryResource,
+    SummaryResourceWithRawResponse,
+    AsyncSummaryResourceWithRawResponse,
+    SummaryResourceWithStreamingResponse,
+    AsyncSummaryResourceWithStreamingResponse,
+)
+from .timeseries_groups import (
+    TimeseriesGroupsResource,
+    AsyncTimeseriesGroupsResource,
+    TimeseriesGroupsResourceWithRawResponse,
+    AsyncTimeseriesGroupsResourceWithRawResponse,
+    TimeseriesGroupsResourceWithStreamingResponse,
+    AsyncTimeseriesGroupsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "SummaryResource",
+    "AsyncSummaryResource",
+    "SummaryResourceWithRawResponse",
+    "AsyncSummaryResourceWithRawResponse",
+    "SummaryResourceWithStreamingResponse",
+    "AsyncSummaryResourceWithStreamingResponse",
+    "TimeseriesGroupsResource",
+    "AsyncTimeseriesGroupsResource",
+    "TimeseriesGroupsResourceWithRawResponse",
+    "AsyncTimeseriesGroupsResourceWithRawResponse",
+    "TimeseriesGroupsResourceWithStreamingResponse",
+    "AsyncTimeseriesGroupsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/radar/ai/inference/timeseries_groups/summary.py b/src/cloudflare/resources/radar/ai/inference/timeseries_groups/summary.py
new file mode 100644
index 00000000000..3b660d9edb4
--- /dev/null
+++ b/src/cloudflare/resources/radar/ai/inference/timeseries_groups/summary.py
@@ -0,0 +1,438 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import typing_extensions
+from typing import Type, Union, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ......_types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ......_utils import maybe_transform, async_maybe_transform
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+from ......_response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ......_wrappers import ResultWrapper
+from ......_base_client import make_request_options
+from ......types.radar.ai.inference.timeseries_groups import summary_task_params, summary_model_params
+from ......types.radar.ai.inference.timeseries_groups.summary_task_response import SummaryTaskResponse
+from ......types.radar.ai.inference.timeseries_groups.summary_model_response import SummaryModelResponse
+
+__all__ = ["SummaryResource", "AsyncSummaryResource"]
+
+
+class SummaryResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SummaryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SummaryResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Radar AI Inference Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/ai/subresources/inference/methods/timeseries_groups_v2/) instead."
+    )
+    def model(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryModelResponse:
+        """
+        Retrieves the distribution of unique accounts by model over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/ai/inference/timeseries_groups/model",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                    },
+                    summary_model_params.SummaryModelParams,
+                ),
+                post_parser=ResultWrapper[SummaryModelResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryModelResponse], ResultWrapper[SummaryModelResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar AI Inference Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/ai/subresources/inference/methods/timeseries_groups_v2/) instead."
+    )
+    def task(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryTaskResponse:
+        """
+        Retrieves the distribution of unique accounts by task over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/ai/inference/timeseries_groups/task",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                    },
+                    summary_task_params.SummaryTaskParams,
+                ),
+                post_parser=ResultWrapper[SummaryTaskResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryTaskResponse], ResultWrapper[SummaryTaskResponse]),
+        )
+
+
+class AsyncSummaryResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSummaryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSummaryResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Radar AI Inference Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/ai/subresources/inference/methods/timeseries_groups_v2/) instead."
+    )
+    async def model(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryModelResponse:
+        """
+        Retrieves the distribution of unique accounts by model over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/ai/inference/timeseries_groups/model",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                    },
+                    summary_model_params.SummaryModelParams,
+                ),
+                post_parser=ResultWrapper[SummaryModelResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryModelResponse], ResultWrapper[SummaryModelResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar AI Inference Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/ai/subresources/inference/methods/timeseries_groups_v2/) instead."
+    )
+    async def task(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryTaskResponse:
+        """
+        Retrieves the distribution of unique accounts by task over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/ai/inference/timeseries_groups/task",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                    },
+                    summary_task_params.SummaryTaskParams,
+                ),
+                post_parser=ResultWrapper[SummaryTaskResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryTaskResponse], ResultWrapper[SummaryTaskResponse]),
+        )
+
+
+class SummaryResourceWithRawResponse:
+    def __init__(self, summary: SummaryResource) -> None:
+        self._summary = summary
+
+        self.model = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.model,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.task = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.task,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncSummaryResourceWithRawResponse:
+    def __init__(self, summary: AsyncSummaryResource) -> None:
+        self._summary = summary
+
+        self.model = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.model,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.task = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.task,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class SummaryResourceWithStreamingResponse:
+    def __init__(self, summary: SummaryResource) -> None:
+        self._summary = summary
+
+        self.model = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.model,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.task = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.task,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncSummaryResourceWithStreamingResponse:
+    def __init__(self, summary: AsyncSummaryResource) -> None:
+        self._summary = summary
+
+        self.model = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.model,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.task = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.task,  # pyright: ignore[reportDeprecated],
+            )
+        )
diff --git a/src/cloudflare/resources/radar/ai/inference/timeseries_groups/timeseries_groups.py b/src/cloudflare/resources/radar/ai/inference/timeseries_groups/timeseries_groups.py
new file mode 100644
index 00000000000..98c4e8984af
--- /dev/null
+++ b/src/cloudflare/resources/radar/ai/inference/timeseries_groups/timeseries_groups.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .summary import (
+    SummaryResource,
+    AsyncSummaryResource,
+    SummaryResourceWithRawResponse,
+    AsyncSummaryResourceWithRawResponse,
+    SummaryResourceWithStreamingResponse,
+    AsyncSummaryResourceWithStreamingResponse,
+)
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["TimeseriesGroupsResource", "AsyncTimeseriesGroupsResource"]
+
+
+class TimeseriesGroupsResource(SyncAPIResource):
+    @cached_property
+    def summary(self) -> SummaryResource:
+        return SummaryResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> TimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TimeseriesGroupsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TimeseriesGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TimeseriesGroupsResourceWithStreamingResponse(self)
+
+
+class AsyncTimeseriesGroupsResource(AsyncAPIResource):
+    @cached_property
+    def summary(self) -> AsyncSummaryResource:
+        return AsyncSummaryResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncTimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTimeseriesGroupsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTimeseriesGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTimeseriesGroupsResourceWithStreamingResponse(self)
+
+
+class TimeseriesGroupsResourceWithRawResponse:
+    def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
+        self._timeseries_groups = timeseries_groups
+
+    @cached_property
+    def summary(self) -> SummaryResourceWithRawResponse:
+        return SummaryResourceWithRawResponse(self._timeseries_groups.summary)
+
+
+class AsyncTimeseriesGroupsResourceWithRawResponse:
+    def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
+        self._timeseries_groups = timeseries_groups
+
+    @cached_property
+    def summary(self) -> AsyncSummaryResourceWithRawResponse:
+        return AsyncSummaryResourceWithRawResponse(self._timeseries_groups.summary)
+
+
+class TimeseriesGroupsResourceWithStreamingResponse:
+    def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
+        self._timeseries_groups = timeseries_groups
+
+    @cached_property
+    def summary(self) -> SummaryResourceWithStreamingResponse:
+        return SummaryResourceWithStreamingResponse(self._timeseries_groups.summary)
+
+
+class AsyncTimeseriesGroupsResourceWithStreamingResponse:
+    def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
+        self._timeseries_groups = timeseries_groups
+
+    @cached_property
+    def summary(self) -> AsyncSummaryResourceWithStreamingResponse:
+        return AsyncSummaryResourceWithStreamingResponse(self._timeseries_groups.summary)
diff --git a/src/cloudflare/resources/radar/ai/timeseries_groups.py b/src/cloudflare/resources/radar/ai/timeseries_groups.py
new file mode 100644
index 00000000000..b956cf33749
--- /dev/null
+++ b/src/cloudflare/resources/radar/ai/timeseries_groups.py
@@ -0,0 +1,1047 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import typing_extensions
+from typing import Type, Union, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.radar.ai import (
+    timeseries_group_summary_params,
+    timeseries_group_timeseries_params,
+    timeseries_group_user_agent_params,
+    timeseries_group_timeseries_groups_params,
+)
+from ....types.radar.ai.timeseries_group_summary_response import TimeseriesGroupSummaryResponse
+from ....types.radar.ai.timeseries_group_timeseries_response import TimeseriesGroupTimeseriesResponse
+from ....types.radar.ai.timeseries_group_user_agent_response import TimeseriesGroupUserAgentResponse
+from ....types.radar.ai.timeseries_group_timeseries_groups_response import TimeseriesGroupTimeseriesGroupsResponse
+
+__all__ = ["TimeseriesGroupsResource", "AsyncTimeseriesGroupsResource"]
+
+
+class TimeseriesGroupsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> TimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TimeseriesGroupsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TimeseriesGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TimeseriesGroupsResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Radar > AI > Bots > Summary](https://developers.cloudflare.com/api/resources/radar/subresources/ai/subresources/bots/methods/summary_v2/) instead."
+    )
+    def summary(
+        self,
+        dimension: Literal["USER_AGENT", "CRAWL_PURPOSE", "INDUSTRY", "VERTICAL"],
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        crawl_purpose: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        industry: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        vertical: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupSummaryResponse:
+        """
+        Retrieves an aggregated summary of AI bots HTTP requests grouped by the
+        specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          crawl_purpose: Filters results by bot crawl purpose.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          industry: Filters results by industry.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          vertical: Filters results by vertical.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/ai/bots/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "crawl_purpose": crawl_purpose,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "industry": industry,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "vertical": vertical,
+                    },
+                    timeseries_group_summary_params.TimeseriesGroupSummaryParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupSummaryResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupSummaryResponse], ResultWrapper[TimeseriesGroupSummaryResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar > AI > Bots > Timeseries](https://developers.cloudflare.com/api/resources/radar/subresources/ai/subresources/bots/methods/timeseries/) instead."
+    )
+    def timeseries(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        crawl_purpose: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        industry: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        user_agent: SequenceNotStr[str] | Omit = omit,
+        vertical: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupTimeseriesResponse:
+        """
+        Retrieves AI bots HTTP request volume over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          crawl_purpose: Filters results by bot crawl purpose.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          industry: Filters results by industry.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          user_agent: Filters results by user agent.
+
+          vertical: Filters results by vertical.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/ai/bots/timeseries",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "crawl_purpose": crawl_purpose,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "industry": industry,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "user_agent": user_agent,
+                        "vertical": vertical,
+                    },
+                    timeseries_group_timeseries_params.TimeseriesGroupTimeseriesParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupTimeseriesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupTimeseriesResponse], ResultWrapper[TimeseriesGroupTimeseriesResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar > AI > Bots > Timeseries Groups](https://developers.cloudflare.com/api/resources/radar/subresources/ai/subresources/bots/methods/timeseries_groups/) instead."
+    )
+    def timeseries_groups(
+        self,
+        dimension: Literal["USER_AGENT", "CRAWL_PURPOSE", "INDUSTRY", "VERTICAL"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        crawl_purpose: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        industry: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | Omit = omit,
+        vertical: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupTimeseriesGroupsResponse:
+        """
+        Retrieves the distribution of HTTP requests from AI bots, grouped by chosen the
+        specified dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          crawl_purpose: Filters results by bot crawl purpose.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          industry: Filters results by industry.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          vertical: Filters results by vertical.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/ai/bots/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "crawl_purpose": crawl_purpose,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "industry": industry,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "normalization": normalization,
+                        "vertical": vertical,
+                    },
+                    timeseries_group_timeseries_groups_params.TimeseriesGroupTimeseriesGroupsParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupTimeseriesGroupsResponse]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[TimeseriesGroupTimeseriesGroupsResponse], ResultWrapper[TimeseriesGroupTimeseriesGroupsResponse]
+            ),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar AI Bots Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/ai/subresources/bots/methods/timeseries_groups/) instead."
+    )
+    def user_agent(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupUserAgentResponse:
+        """
+        Retrieves the distribution of traffic by AI user agent over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/ai/bots/timeseries_groups/user_agent",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                    },
+                    timeseries_group_user_agent_params.TimeseriesGroupUserAgentParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupUserAgentResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupUserAgentResponse], ResultWrapper[TimeseriesGroupUserAgentResponse]),
+        )
+
+
+class AsyncTimeseriesGroupsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncTimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTimeseriesGroupsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTimeseriesGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTimeseriesGroupsResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Radar > AI > Bots > Summary](https://developers.cloudflare.com/api/resources/radar/subresources/ai/subresources/bots/methods/summary_v2/) instead."
+    )
+    async def summary(
+        self,
+        dimension: Literal["USER_AGENT", "CRAWL_PURPOSE", "INDUSTRY", "VERTICAL"],
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        crawl_purpose: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        industry: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        vertical: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupSummaryResponse:
+        """
+        Retrieves an aggregated summary of AI bots HTTP requests grouped by the
+        specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          crawl_purpose: Filters results by bot crawl purpose.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          industry: Filters results by industry.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          vertical: Filters results by vertical.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/ai/bots/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "crawl_purpose": crawl_purpose,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "industry": industry,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "vertical": vertical,
+                    },
+                    timeseries_group_summary_params.TimeseriesGroupSummaryParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupSummaryResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupSummaryResponse], ResultWrapper[TimeseriesGroupSummaryResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar > AI > Bots > Timeseries](https://developers.cloudflare.com/api/resources/radar/subresources/ai/subresources/bots/methods/timeseries/) instead."
+    )
+    async def timeseries(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        crawl_purpose: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        industry: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        user_agent: SequenceNotStr[str] | Omit = omit,
+        vertical: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupTimeseriesResponse:
+        """
+        Retrieves AI bots HTTP request volume over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          crawl_purpose: Filters results by bot crawl purpose.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          industry: Filters results by industry.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          user_agent: Filters results by user agent.
+
+          vertical: Filters results by vertical.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/ai/bots/timeseries",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "crawl_purpose": crawl_purpose,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "industry": industry,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "user_agent": user_agent,
+                        "vertical": vertical,
+                    },
+                    timeseries_group_timeseries_params.TimeseriesGroupTimeseriesParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupTimeseriesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupTimeseriesResponse], ResultWrapper[TimeseriesGroupTimeseriesResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar > AI > Bots > Timeseries Groups](https://developers.cloudflare.com/api/resources/radar/subresources/ai/subresources/bots/methods/timeseries_groups/) instead."
+    )
+    async def timeseries_groups(
+        self,
+        dimension: Literal["USER_AGENT", "CRAWL_PURPOSE", "INDUSTRY", "VERTICAL"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        crawl_purpose: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        industry: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | Omit = omit,
+        vertical: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupTimeseriesGroupsResponse:
+        """
+        Retrieves the distribution of HTTP requests from AI bots, grouped by chosen the
+        specified dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          crawl_purpose: Filters results by bot crawl purpose.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          industry: Filters results by industry.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          vertical: Filters results by vertical.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/ai/bots/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "crawl_purpose": crawl_purpose,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "industry": industry,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "normalization": normalization,
+                        "vertical": vertical,
+                    },
+                    timeseries_group_timeseries_groups_params.TimeseriesGroupTimeseriesGroupsParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupTimeseriesGroupsResponse]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[TimeseriesGroupTimeseriesGroupsResponse], ResultWrapper[TimeseriesGroupTimeseriesGroupsResponse]
+            ),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar AI Bots Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/ai/subresources/bots/methods/timeseries_groups/) instead."
+    )
+    async def user_agent(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupUserAgentResponse:
+        """
+        Retrieves the distribution of traffic by AI user agent over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/ai/bots/timeseries_groups/user_agent",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                    },
+                    timeseries_group_user_agent_params.TimeseriesGroupUserAgentParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupUserAgentResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupUserAgentResponse], ResultWrapper[TimeseriesGroupUserAgentResponse]),
+        )
+
+
+class TimeseriesGroupsResourceWithRawResponse:
+    def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
+        self._timeseries_groups = timeseries_groups
+
+        self.summary = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.summary,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.timeseries = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.timeseries,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.timeseries_groups = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.timeseries_groups,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.user_agent = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.user_agent,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncTimeseriesGroupsResourceWithRawResponse:
+    def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
+        self._timeseries_groups = timeseries_groups
+
+        self.summary = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.summary,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.timeseries = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.timeseries,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.timeseries_groups = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.timeseries_groups,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.user_agent = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.user_agent,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class TimeseriesGroupsResourceWithStreamingResponse:
+    def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
+        self._timeseries_groups = timeseries_groups
+
+        self.summary = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.summary,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.timeseries = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.timeseries,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.timeseries_groups = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.timeseries_groups,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.user_agent = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.user_agent,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncTimeseriesGroupsResourceWithStreamingResponse:
+    def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
+        self._timeseries_groups = timeseries_groups
+
+        self.summary = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.summary,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.timeseries = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.timeseries,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.timeseries_groups = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.timeseries_groups,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.user_agent = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.user_agent,  # pyright: ignore[reportDeprecated],
+            )
+        )
diff --git a/src/cloudflare/resources/radar/ai/to_markdown.py b/src/cloudflare/resources/radar/ai/to_markdown.py
new file mode 100644
index 00000000000..8c4db60fd81
--- /dev/null
+++ b/src/cloudflare/resources/radar/ai/to_markdown.py
@@ -0,0 +1,213 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import typing_extensions
+from typing import Mapping, cast
+
+import httpx
+
+from ...._types import (
+    Body,
+    Query,
+    Headers,
+    NotGiven,
+    FileTypes,
+    SequenceNotStr,
+    not_given,
+)
+from ...._utils import extract_files, maybe_transform, deepcopy_minimal
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.radar.ai import to_markdown_create_params
+from ....types.radar.ai.to_markdown_create_response import ToMarkdownCreateResponse
+
+__all__ = ["ToMarkdownResource", "AsyncToMarkdownResource"]
+
+
+class ToMarkdownResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ToMarkdownResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ToMarkdownResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ToMarkdownResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ToMarkdownResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [AI > To Markdown](https://developers.cloudflare.com/api/resources/ai/subresources/to_markdown/) instead."
+    )
+    def create(
+        self,
+        *,
+        account_id: str,
+        files: SequenceNotStr[FileTypes],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[ToMarkdownCreateResponse]:
+        """
+        Convert Files into Markdown
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        body = deepcopy_minimal({"files": files})
+        extracted_files = extract_files(cast(Mapping[str, object], body), paths=[["files", "<array>"]])
+        # It should be noted that the actual Content-Type header that will be
+        # sent to the server will contain a `boundary` parameter, e.g.
+        # multipart/form-data; boundary=---abc--
+        extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
+        return self._get_api_list(  # type: ignore[call-arg]  # pyright: ignore[reportUnknownVariableType, reportCallIssue]
+            f"/accounts/{account_id}/ai/tomarkdown",
+            page=SyncSinglePage[ToMarkdownCreateResponse],
+            body=maybe_transform(body, to_markdown_create_params.ToMarkdownCreateParams),
+            files=extracted_files,  # pyright: ignore[reportCallIssue]  # type: ignore[call-arg]
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=ToMarkdownCreateResponse,
+            method="post",
+        )
+
+
+class AsyncToMarkdownResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncToMarkdownResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncToMarkdownResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncToMarkdownResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncToMarkdownResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [AI > To Markdown](https://developers.cloudflare.com/api/resources/ai/subresources/to_markdown/) instead."
+    )
+    def create(
+        self,
+        *,
+        account_id: str,
+        files: SequenceNotStr[FileTypes],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ToMarkdownCreateResponse, AsyncSinglePage[ToMarkdownCreateResponse]]:
+        """
+        Convert Files into Markdown
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        body = deepcopy_minimal({"files": files})
+        extracted_files = extract_files(cast(Mapping[str, object], body), paths=[["files", "<array>"]])
+        # It should be noted that the actual Content-Type header that will be
+        # sent to the server will contain a `boundary` parameter, e.g.
+        # multipart/form-data; boundary=---abc--
+        extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
+        return self._get_api_list(  # type: ignore[call-arg]  # pyright: ignore[reportUnknownVariableType, reportCallIssue]
+            f"/accounts/{account_id}/ai/tomarkdown",
+            page=AsyncSinglePage[ToMarkdownCreateResponse],
+            body=maybe_transform(body, to_markdown_create_params.ToMarkdownCreateParams),
+            files=extracted_files,  # pyright: ignore[reportCallIssue]  # type: ignore[call-arg]
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=ToMarkdownCreateResponse,
+            method="post",
+        )
+
+
+class ToMarkdownResourceWithRawResponse:
+    def __init__(self, to_markdown: ToMarkdownResource) -> None:
+        self._to_markdown = to_markdown
+
+        self.create = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                to_markdown.create,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncToMarkdownResourceWithRawResponse:
+    def __init__(self, to_markdown: AsyncToMarkdownResource) -> None:
+        self._to_markdown = to_markdown
+
+        self.create = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                to_markdown.create,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class ToMarkdownResourceWithStreamingResponse:
+    def __init__(self, to_markdown: ToMarkdownResource) -> None:
+        self._to_markdown = to_markdown
+
+        self.create = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                to_markdown.create,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncToMarkdownResourceWithStreamingResponse:
+    def __init__(self, to_markdown: AsyncToMarkdownResource) -> None:
+        self._to_markdown = to_markdown
+
+        self.create = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                to_markdown.create,  # pyright: ignore[reportDeprecated],
+            )
+        )
diff --git a/src/cloudflare/resources/radar/annotations/annotations.py b/src/cloudflare/resources/radar/annotations/annotations.py
index b30195f71b2..ef7591b8d7d 100644
--- a/src/cloudflare/resources/radar/annotations/annotations.py
+++ b/src/cloudflare/resources/radar/annotations/annotations.py
@@ -2,6 +2,12 @@
 
 from __future__ import annotations
 
+from typing import Type, Union, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
 from .outages import (
     OutagesResource,
     AsyncOutagesResource,
@@ -10,8 +16,20 @@
     OutagesResourceWithStreamingResponse,
     AsyncOutagesResourceWithStreamingResponse,
 )
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....types.radar import annotation_list_params
+from ...._base_client import make_request_options
+from ....types.radar.annotation_list_response import AnnotationListResponse
 
 __all__ = ["AnnotationsResource", "AsyncAnnotationsResource"]
 
@@ -23,12 +41,135 @@ def outages(self) -> OutagesResource:
 
     @cached_property
     def with_raw_response(self) -> AnnotationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AnnotationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AnnotationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AnnotationsResourceWithStreamingResponse(self)
 
+    def list(
+        self,
+        *,
+        asn: int | Omit = omit,
+        data_source: Literal[
+            "ALL",
+            "AI_BOTS",
+            "AI_GATEWAY",
+            "BGP",
+            "BOTS",
+            "CONNECTION_ANOMALY",
+            "CT",
+            "DNS",
+            "DNS_MAGNITUDE",
+            "DNS_AS112",
+            "DOS",
+            "EMAIL_ROUTING",
+            "EMAIL_SECURITY",
+            "FW",
+            "FW_PG",
+            "HTTP",
+            "HTTP_CONTROL",
+            "HTTP_CRAWLER_REFERER",
+            "HTTP_ORIGINS",
+            "IQI",
+            "LEAKED_CREDENTIALS",
+            "NET",
+            "ROBOTS_TXT",
+            "SPEED",
+            "WORKERS_AI",
+        ]
+        | Omit = omit,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_range: str | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"]
+        | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: str | Omit = omit,
+        offset: int | Omit = omit,
+        origin: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AnnotationListResponse:
+        """
+        Retrieves the latest annotations.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify a single Autonomous System Number
+              (ASN) as integer.
+
+          data_source: Filters results by data source.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range.
+
+          date_start: Start of the date range (inclusive).
+
+          event_type: Filters results by event type.
+
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
+
+          location: Filters results by location. Specify an alpha-2 location code.
+
+          offset: Skips the specified number of objects before fetching the results.
+
+          origin: Filters results by origin.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/annotations",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "data_source": data_source,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "event_type": event_type,
+                        "format": format,
+                        "limit": limit,
+                        "location": location,
+                        "offset": offset,
+                        "origin": origin,
+                    },
+                    annotation_list_params.AnnotationListParams,
+                ),
+                post_parser=ResultWrapper[AnnotationListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AnnotationListResponse], ResultWrapper[AnnotationListResponse]),
+        )
+
 
 class AsyncAnnotationsResource(AsyncAPIResource):
     @cached_property
@@ -37,17 +178,144 @@ def outages(self) -> AsyncOutagesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncAnnotationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAnnotationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAnnotationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAnnotationsResourceWithStreamingResponse(self)
 
+    async def list(
+        self,
+        *,
+        asn: int | Omit = omit,
+        data_source: Literal[
+            "ALL",
+            "AI_BOTS",
+            "AI_GATEWAY",
+            "BGP",
+            "BOTS",
+            "CONNECTION_ANOMALY",
+            "CT",
+            "DNS",
+            "DNS_MAGNITUDE",
+            "DNS_AS112",
+            "DOS",
+            "EMAIL_ROUTING",
+            "EMAIL_SECURITY",
+            "FW",
+            "FW_PG",
+            "HTTP",
+            "HTTP_CONTROL",
+            "HTTP_CRAWLER_REFERER",
+            "HTTP_ORIGINS",
+            "IQI",
+            "LEAKED_CREDENTIALS",
+            "NET",
+            "ROBOTS_TXT",
+            "SPEED",
+            "WORKERS_AI",
+        ]
+        | Omit = omit,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_range: str | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"]
+        | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: str | Omit = omit,
+        offset: int | Omit = omit,
+        origin: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AnnotationListResponse:
+        """
+        Retrieves the latest annotations.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify a single Autonomous System Number
+              (ASN) as integer.
+
+          data_source: Filters results by data source.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range.
+
+          date_start: Start of the date range (inclusive).
+
+          event_type: Filters results by event type.
+
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
+
+          location: Filters results by location. Specify an alpha-2 location code.
+
+          offset: Skips the specified number of objects before fetching the results.
+
+          origin: Filters results by origin.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/annotations",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "data_source": data_source,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "event_type": event_type,
+                        "format": format,
+                        "limit": limit,
+                        "location": location,
+                        "offset": offset,
+                        "origin": origin,
+                    },
+                    annotation_list_params.AnnotationListParams,
+                ),
+                post_parser=ResultWrapper[AnnotationListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AnnotationListResponse], ResultWrapper[AnnotationListResponse]),
+        )
+
 
 class AnnotationsResourceWithRawResponse:
     def __init__(self, annotations: AnnotationsResource) -> None:
         self._annotations = annotations
 
+        self.list = to_raw_response_wrapper(
+            annotations.list,
+        )
+
     @cached_property
     def outages(self) -> OutagesResourceWithRawResponse:
         return OutagesResourceWithRawResponse(self._annotations.outages)
@@ -57,6 +325,10 @@ class AsyncAnnotationsResourceWithRawResponse:
     def __init__(self, annotations: AsyncAnnotationsResource) -> None:
         self._annotations = annotations
 
+        self.list = async_to_raw_response_wrapper(
+            annotations.list,
+        )
+
     @cached_property
     def outages(self) -> AsyncOutagesResourceWithRawResponse:
         return AsyncOutagesResourceWithRawResponse(self._annotations.outages)
@@ -66,6 +338,10 @@ class AnnotationsResourceWithStreamingResponse:
     def __init__(self, annotations: AnnotationsResource) -> None:
         self._annotations = annotations
 
+        self.list = to_streamed_response_wrapper(
+            annotations.list,
+        )
+
     @cached_property
     def outages(self) -> OutagesResourceWithStreamingResponse:
         return OutagesResourceWithStreamingResponse(self._annotations.outages)
@@ -75,6 +351,10 @@ class AsyncAnnotationsResourceWithStreamingResponse:
     def __init__(self, annotations: AsyncAnnotationsResource) -> None:
         self._annotations = annotations
 
+        self.list = async_to_streamed_response_wrapper(
+            annotations.list,
+        )
+
     @cached_property
     def outages(self) -> AsyncOutagesResourceWithStreamingResponse:
         return AsyncOutagesResourceWithStreamingResponse(self._annotations.outages)
diff --git a/src/cloudflare/resources/radar/annotations/outages.py b/src/cloudflare/resources/radar/annotations/outages.py
index 12344d7d80e..d9b7d55665e 100644
--- a/src/cloudflare/resources/radar/annotations/outages.py
+++ b/src/cloudflare/resources/radar/annotations/outages.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -33,50 +30,64 @@
 class OutagesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> OutagesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return OutagesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> OutagesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return OutagesResourceWithStreamingResponse(self)
 
     def get(
         self,
         *,
-        asn: int | NotGiven = NOT_GIVEN,
-        date_end: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        date_range: str | NotGiven = NOT_GIVEN,
-        date_start: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: str | NotGiven = NOT_GIVEN,
-        offset: int | NotGiven = NOT_GIVEN,
+        asn: int | Omit = omit,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_range: str | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: str | Omit = omit,
+        offset: int | Omit = omit,
+        origin: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> OutageGetResponse:
         """
-        Get latest Internet outages and anomalies.
+        Retrieves the latest Internet outages and anomalies.
 
         Args:
-          asn: Single ASN as integer.
+          asn: Filters results by Autonomous System. Specify a single Autonomous System Number
+              (ASN) as integer.
 
           date_end: End of the date range (inclusive).
 
-          date_range: Shorthand date ranges for the last X days - use when you don't need specific
-              start and end dates.
+          date_range: Filters results by date range.
 
           date_start: Start of the date range (inclusive).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
 
-          limit: Limit the number of objects in the response.
+          location: Filters results by location. Specify an alpha-2 location code.
 
-          location: Location Alpha2 code.
+          offset: Skips the specified number of objects before fetching the results.
 
-          offset: Number of objects to skip before grabbing results.
+          origin: Filters results by origin.
 
           extra_headers: Send extra headers
 
@@ -103,6 +114,7 @@ def get(
                         "limit": limit,
                         "location": location,
                         "offset": offset,
+                        "origin": origin,
                     },
                     outage_get_params.OutageGetParams,
                 ),
@@ -114,32 +126,31 @@ def get(
     def locations(
         self,
         *,
-        date_end: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        date_range: str | NotGiven = NOT_GIVEN,
-        date_start: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_range: str | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> OutageLocationsResponse:
         """
-        Get the number of outages for locations.
+        Retrieves the number of outages by location.
 
         Args:
           date_end: End of the date range (inclusive).
 
-          date_range: Shorthand date ranges for the last X days - use when you don't need specific
-              start and end dates.
+          date_range: Filters results by date range.
 
           date_start: Start of the date range (inclusive).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
           extra_headers: Send extra headers
 
@@ -175,50 +186,64 @@ def locations(
 class AsyncOutagesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncOutagesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncOutagesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncOutagesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncOutagesResourceWithStreamingResponse(self)
 
     async def get(
         self,
         *,
-        asn: int | NotGiven = NOT_GIVEN,
-        date_end: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        date_range: str | NotGiven = NOT_GIVEN,
-        date_start: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: str | NotGiven = NOT_GIVEN,
-        offset: int | NotGiven = NOT_GIVEN,
+        asn: int | Omit = omit,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_range: str | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: str | Omit = omit,
+        offset: int | Omit = omit,
+        origin: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> OutageGetResponse:
         """
-        Get latest Internet outages and anomalies.
+        Retrieves the latest Internet outages and anomalies.
 
         Args:
-          asn: Single ASN as integer.
+          asn: Filters results by Autonomous System. Specify a single Autonomous System Number
+              (ASN) as integer.
 
           date_end: End of the date range (inclusive).
 
-          date_range: Shorthand date ranges for the last X days - use when you don't need specific
-              start and end dates.
+          date_range: Filters results by date range.
 
           date_start: Start of the date range (inclusive).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
 
-          limit: Limit the number of objects in the response.
+          location: Filters results by location. Specify an alpha-2 location code.
 
-          location: Location Alpha2 code.
+          offset: Skips the specified number of objects before fetching the results.
 
-          offset: Number of objects to skip before grabbing results.
+          origin: Filters results by origin.
 
           extra_headers: Send extra headers
 
@@ -245,6 +270,7 @@ async def get(
                         "limit": limit,
                         "location": location,
                         "offset": offset,
+                        "origin": origin,
                     },
                     outage_get_params.OutageGetParams,
                 ),
@@ -256,32 +282,31 @@ async def get(
     async def locations(
         self,
         *,
-        date_end: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        date_range: str | NotGiven = NOT_GIVEN,
-        date_start: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_range: str | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> OutageLocationsResponse:
         """
-        Get the number of outages for locations.
+        Retrieves the number of outages by location.
 
         Args:
           date_end: End of the date range (inclusive).
 
-          date_range: Shorthand date ranges for the last X days - use when you don't need specific
-              start and end dates.
+          date_range: Filters results by date range.
 
           date_start: Start of the date range (inclusive).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/as112/as112.py b/src/cloudflare/resources/radar/as112/as112.py
index bdd295c2412..da7fbe2bcca 100644
--- a/src/cloudflare/resources/radar/as112/as112.py
+++ b/src/cloudflare/resources/radar/as112/as112.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Union, cast
+from typing import List, Type, Union, Optional, cast
 from datetime import datetime
 from typing_extensions import Literal
 
@@ -24,11 +24,8 @@
     SummaryResourceWithStreamingResponse,
     AsyncSummaryResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -38,7 +35,7 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ....types.radar import as112_timeseries_params
+from ....types.radar import as112_summary_v2_params, as112_timeseries_params, as112_timeseries_groups_v2_params
 from ...._base_client import make_request_options
 from .timeseries_groups import (
     TimeseriesGroupsResource,
@@ -48,7 +45,9 @@
     TimeseriesGroupsResourceWithStreamingResponse,
     AsyncTimeseriesGroupsResourceWithStreamingResponse,
 )
+from ....types.radar.as112_summary_v2_response import AS112SummaryV2Response
 from ....types.radar.as112_timeseries_response import AS112TimeseriesResponse
+from ....types.radar.as112_timeseries_groups_v2_response import AS112TimeseriesGroupsV2Response
 
 __all__ = ["AS112Resource", "AsyncAS112Resource"]
 
@@ -68,62 +67,407 @@ def top(self) -> TopResource:
 
     @cached_property
     def with_raw_response(self) -> AS112ResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AS112ResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AS112ResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AS112ResourceWithStreamingResponse(self)
 
+    def summary_v2(
+        self,
+        dimension: Literal["DNSSEC", "EDNS", "IP_VERSION", "PROTOCOL", "QUERY_TYPE", "RESPONSE_CODE"],
+        *,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AS112SummaryV2Response:
+        """
+        Retrieves the distribution of AS112 queries by the specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/as112/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                    },
+                    as112_summary_v2_params.AS112SummaryV2Params,
+                ),
+                post_parser=ResultWrapper[AS112SummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[AS112SummaryV2Response], ResultWrapper[AS112SummaryV2Response]),
+        )
+
     def timeseries(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AS112TimeseriesResponse:
         """
-        Get AS112 queries change over time.
+        Retrieves the AS112 DNS queries over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          name: Array of names used to label the series in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -143,7 +487,6 @@ def timeseries(
                 query=maybe_transform(
                     {
                         "agg_interval": agg_interval,
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -151,6 +494,9 @@ def timeseries(
                         "format": format,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
                     },
                     as112_timeseries_params.AS112TimeseriesParams,
                 ),
@@ -159,6 +505,225 @@ def timeseries(
             cast_to=cast(Type[AS112TimeseriesResponse], ResultWrapper[AS112TimeseriesResponse]),
         )
 
+    def timeseries_groups_v2(
+        self,
+        dimension: Literal["DNSSEC", "EDNS", "IP_VERSION", "PROTOCOL", "QUERY_TYPE", "RESPONSE_CODE"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AS112TimeseriesGroupsV2Response:
+        """
+        Retrieves the distribution of AS112 queries grouped by dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/as112/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                    },
+                    as112_timeseries_groups_v2_params.AS112TimeseriesGroupsV2Params,
+                ),
+                post_parser=ResultWrapper[AS112TimeseriesGroupsV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[AS112TimeseriesGroupsV2Response], ResultWrapper[AS112TimeseriesGroupsV2Response]),
+        )
+
 
 class AsyncAS112Resource(AsyncAPIResource):
     @cached_property
@@ -175,62 +740,407 @@ def top(self) -> AsyncTopResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncAS112ResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAS112ResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAS112ResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAS112ResourceWithStreamingResponse(self)
 
+    async def summary_v2(
+        self,
+        dimension: Literal["DNSSEC", "EDNS", "IP_VERSION", "PROTOCOL", "QUERY_TYPE", "RESPONSE_CODE"],
+        *,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AS112SummaryV2Response:
+        """
+        Retrieves the distribution of AS112 queries by the specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/as112/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                    },
+                    as112_summary_v2_params.AS112SummaryV2Params,
+                ),
+                post_parser=ResultWrapper[AS112SummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[AS112SummaryV2Response], ResultWrapper[AS112SummaryV2Response]),
+        )
+
     async def timeseries(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AS112TimeseriesResponse:
         """
-        Get AS112 queries change over time.
+        Retrieves the AS112 DNS queries over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          date_start: Array of datetimes to filter the start of a series.
+          name: Array of names used to label the series in the response.
 
-          format: Format results are returned in.
+          protocol: Filters results by DNS transport protocol.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          query_type: Filters results by DNS query type.
 
-          name: Array of names that will be used to name the series in responses.
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -250,7 +1160,6 @@ async def timeseries(
                 query=await async_maybe_transform(
                     {
                         "agg_interval": agg_interval,
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -258,6 +1167,9 @@ async def timeseries(
                         "format": format,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
                     },
                     as112_timeseries_params.AS112TimeseriesParams,
                 ),
@@ -266,14 +1178,239 @@ async def timeseries(
             cast_to=cast(Type[AS112TimeseriesResponse], ResultWrapper[AS112TimeseriesResponse]),
         )
 
+    async def timeseries_groups_v2(
+        self,
+        dimension: Literal["DNSSEC", "EDNS", "IP_VERSION", "PROTOCOL", "QUERY_TYPE", "RESPONSE_CODE"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AS112TimeseriesGroupsV2Response:
+        """
+        Retrieves the distribution of AS112 queries grouped by dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/as112/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                    },
+                    as112_timeseries_groups_v2_params.AS112TimeseriesGroupsV2Params,
+                ),
+                post_parser=ResultWrapper[AS112TimeseriesGroupsV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[AS112TimeseriesGroupsV2Response], ResultWrapper[AS112TimeseriesGroupsV2Response]),
+        )
+
 
 class AS112ResourceWithRawResponse:
     def __init__(self, as112: AS112Resource) -> None:
         self._as112 = as112
 
+        self.summary_v2 = to_raw_response_wrapper(
+            as112.summary_v2,
+        )
         self.timeseries = to_raw_response_wrapper(
             as112.timeseries,
         )
+        self.timeseries_groups_v2 = to_raw_response_wrapper(
+            as112.timeseries_groups_v2,
+        )
 
     @cached_property
     def summary(self) -> SummaryResourceWithRawResponse:
@@ -292,9 +1429,15 @@ class AsyncAS112ResourceWithRawResponse:
     def __init__(self, as112: AsyncAS112Resource) -> None:
         self._as112 = as112
 
+        self.summary_v2 = async_to_raw_response_wrapper(
+            as112.summary_v2,
+        )
         self.timeseries = async_to_raw_response_wrapper(
             as112.timeseries,
         )
+        self.timeseries_groups_v2 = async_to_raw_response_wrapper(
+            as112.timeseries_groups_v2,
+        )
 
     @cached_property
     def summary(self) -> AsyncSummaryResourceWithRawResponse:
@@ -313,9 +1456,15 @@ class AS112ResourceWithStreamingResponse:
     def __init__(self, as112: AS112Resource) -> None:
         self._as112 = as112
 
+        self.summary_v2 = to_streamed_response_wrapper(
+            as112.summary_v2,
+        )
         self.timeseries = to_streamed_response_wrapper(
             as112.timeseries,
         )
+        self.timeseries_groups_v2 = to_streamed_response_wrapper(
+            as112.timeseries_groups_v2,
+        )
 
     @cached_property
     def summary(self) -> SummaryResourceWithStreamingResponse:
@@ -334,9 +1483,15 @@ class AsyncAS112ResourceWithStreamingResponse:
     def __init__(self, as112: AsyncAS112Resource) -> None:
         self._as112 = as112
 
+        self.summary_v2 = async_to_streamed_response_wrapper(
+            as112.summary_v2,
+        )
         self.timeseries = async_to_streamed_response_wrapper(
             as112.timeseries,
         )
+        self.timeseries_groups_v2 = async_to_streamed_response_wrapper(
+            as112.timeseries_groups_v2,
+        )
 
     @cached_property
     def summary(self) -> AsyncSummaryResourceWithStreamingResponse:
diff --git a/src/cloudflare/resources/radar/as112/summary.py b/src/cloudflare/resources/radar/as112/summary.py
index 2e695cbfd97..9443de89c6b 100644
--- a/src/cloudflare/resources/radar/as112/summary.py
+++ b/src/cloudflare/resources/radar/as112/summary.py
@@ -2,17 +2,15 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Union, cast
+import typing_extensions
+from typing import List, Type, Union, Optional, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -44,57 +42,193 @@
 class SummaryResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SummaryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SummaryResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/summary_v2/) instead."
+    )
     def dnssec(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryDNSSECResponse:
         """
-        Percentage distribution of DNS queries to AS112 by DNSSEC support.
+        Retrieves the distribution of DNS queries to AS112 by DNSSEC (DNS Security
+        Extensions) support.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -113,7 +247,6 @@ def dnssec(
                 timeout=timeout,
                 query=maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -121,6 +254,9 @@ def dnssec(
                         "format": format,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
                     },
                     summary_dnssec_params.SummaryDNSSECParams,
                 ),
@@ -129,51 +265,176 @@ def dnssec(
             cast_to=cast(Type[SummaryDNSSECResponse], ResultWrapper[SummaryDNSSECResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/summary_v2/) instead."
+    )
     def edns(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryEdnsResponse:
         """
-        Percentage distribution of DNS queries, to AS112, by EDNS support.
+        Retrieves the distribution of DNS queries to AS112 by EDNS (Extension Mechanisms
+        for DNS) support.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          date_start: Array of datetimes to filter the start of a series.
+          name: Array of names used to label the series in the response.
 
-          format: Format results are returned in.
+          protocol: Filters results by DNS transport protocol.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          query_type: Filters results by DNS query type.
 
-          name: Array of names that will be used to name the series in responses.
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -192,7 +453,6 @@ def edns(
                 timeout=timeout,
                 query=maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -200,6 +460,9 @@ def edns(
                         "format": format,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
                     },
                     summary_edns_params.SummaryEdnsParams,
                 ),
@@ -208,51 +471,175 @@ def edns(
             cast_to=cast(Type[SummaryEdnsResponse], ResultWrapper[SummaryEdnsResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/summary_v2/) instead."
+    )
     def ip_version(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryIPVersionResponse:
         """
-        Percentage distribution of DNS queries to AS112 per IP Version.
+        Retrieves the distribution of DNS queries to AS112 by IP version.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          date_start: Array of datetimes to filter the start of a series.
+          name: Array of names used to label the series in the response.
 
-          format: Format results are returned in.
+          protocol: Filters results by DNS transport protocol.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          query_type: Filters results by DNS query type.
 
-          name: Array of names that will be used to name the series in responses.
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -271,7 +658,6 @@ def ip_version(
                 timeout=timeout,
                 query=maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -279,6 +665,9 @@ def ip_version(
                         "format": format,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
                     },
                     summary_ip_version_params.SummaryIPVersionParams,
                 ),
@@ -287,51 +676,172 @@ def ip_version(
             cast_to=cast(Type[SummaryIPVersionResponse], ResultWrapper[SummaryIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/summary_v2/) instead."
+    )
     def protocol(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryProtocolResponse:
         """
-        Percentage distribution of DNS queries to AS112 per protocol.
+        Retrieves the distribution of DNS queries to AS112 by protocol.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          name: Array of names used to label the series in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -350,7 +860,6 @@ def protocol(
                 timeout=timeout,
                 query=maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -358,6 +867,8 @@ def protocol(
                         "format": format,
                         "location": location,
                         "name": name,
+                        "query_type": query_type,
+                        "response_code": response_code,
                     },
                     summary_protocol_params.SummaryProtocolParams,
                 ),
@@ -366,51 +877,83 @@ def protocol(
             cast_to=cast(Type[SummaryProtocolResponse], ResultWrapper[SummaryProtocolResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/summary_v2/) instead."
+    )
     def query_type(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryQueryTypeResponse:
         """
-        Percentage distribution of DNS queries to AS112 by Query Type.
+        Retrieves the distribution of DNS queries to AS112 by type.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters results by DNS transport protocol.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -429,14 +972,16 @@ def query_type(
                 timeout=timeout,
                 query=maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "response_code": response_code,
                     },
                     summary_query_type_params.SummaryQueryTypeParams,
                 ),
@@ -445,51 +990,154 @@ def query_type(
             cast_to=cast(Type[SummaryQueryTypeResponse], ResultWrapper[SummaryQueryTypeResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/summary_v2/) instead."
+    )
     def response_codes(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryResponseCodesResponse:
         """
-        Percentage distribution of AS112 dns requests classified per Response Codes.
+        Retrieves the distribution of AS112 DNS requests classified by response code.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          date_start: Array of datetimes to filter the start of a series.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          format: Format results are returned in.
+          name: Array of names used to label the series in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          protocol: Filters results by DNS transport protocol.
 
-          name: Array of names that will be used to name the series in responses.
+          query_type: Filters results by DNS query type.
 
           extra_headers: Send extra headers
 
@@ -508,14 +1156,16 @@ def response_codes(
                 timeout=timeout,
                 query=maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
                     },
                     summary_response_codes_params.SummaryResponseCodesParams,
                 ),
@@ -528,57 +1178,193 @@ def response_codes(
 class AsyncSummaryResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSummaryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSummaryResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/summary_v2/) instead."
+    )
     async def dnssec(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryDNSSECResponse:
         """
-        Percentage distribution of DNS queries to AS112 by DNSSEC support.
+        Retrieves the distribution of DNS queries to AS112 by DNSSEC (DNS Security
+        Extensions) support.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          name: Array of names used to label the series in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -597,7 +1383,6 @@ async def dnssec(
                 timeout=timeout,
                 query=await async_maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -605,6 +1390,9 @@ async def dnssec(
                         "format": format,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
                     },
                     summary_dnssec_params.SummaryDNSSECParams,
                 ),
@@ -613,51 +1401,176 @@ async def dnssec(
             cast_to=cast(Type[SummaryDNSSECResponse], ResultWrapper[SummaryDNSSECResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/summary_v2/) instead."
+    )
     async def edns(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryEdnsResponse:
         """
-        Percentage distribution of DNS queries, to AS112, by EDNS support.
+        Retrieves the distribution of DNS queries to AS112 by EDNS (Extension Mechanisms
+        for DNS) support.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          name: Array of names used to label the series in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -676,7 +1589,6 @@ async def edns(
                 timeout=timeout,
                 query=await async_maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -684,6 +1596,9 @@ async def edns(
                         "format": format,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
                     },
                     summary_edns_params.SummaryEdnsParams,
                 ),
@@ -692,51 +1607,175 @@ async def edns(
             cast_to=cast(Type[SummaryEdnsResponse], ResultWrapper[SummaryEdnsResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/summary_v2/) instead."
+    )
     async def ip_version(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryIPVersionResponse:
         """
-        Percentage distribution of DNS queries to AS112 per IP Version.
+        Retrieves the distribution of DNS queries to AS112 by IP version.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -755,7 +1794,6 @@ async def ip_version(
                 timeout=timeout,
                 query=await async_maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -763,6 +1801,9 @@ async def ip_version(
                         "format": format,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
                     },
                     summary_ip_version_params.SummaryIPVersionParams,
                 ),
@@ -771,51 +1812,172 @@ async def ip_version(
             cast_to=cast(Type[SummaryIPVersionResponse], ResultWrapper[SummaryIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/summary_v2/) instead."
+    )
     async def protocol(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryProtocolResponse:
         """
-        Percentage distribution of DNS queries to AS112 per protocol.
+        Retrieves the distribution of DNS queries to AS112 by protocol.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -834,7 +1996,6 @@ async def protocol(
                 timeout=timeout,
                 query=await async_maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -842,6 +2003,8 @@ async def protocol(
                         "format": format,
                         "location": location,
                         "name": name,
+                        "query_type": query_type,
+                        "response_code": response_code,
                     },
                     summary_protocol_params.SummaryProtocolParams,
                 ),
@@ -850,51 +2013,83 @@ async def protocol(
             cast_to=cast(Type[SummaryProtocolResponse], ResultWrapper[SummaryProtocolResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/summary_v2/) instead."
+    )
     async def query_type(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryQueryTypeResponse:
         """
-        Percentage distribution of DNS queries to AS112 by Query Type.
+        Retrieves the distribution of DNS queries to AS112 by type.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters results by DNS transport protocol.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -913,14 +2108,16 @@ async def query_type(
                 timeout=timeout,
                 query=await async_maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "response_code": response_code,
                     },
                     summary_query_type_params.SummaryQueryTypeParams,
                 ),
@@ -929,51 +2126,154 @@ async def query_type(
             cast_to=cast(Type[SummaryQueryTypeResponse], ResultWrapper[SummaryQueryTypeResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/summary_v2/) instead."
+    )
     async def response_codes(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryResponseCodesResponse:
         """
-        Percentage distribution of AS112 dns requests classified per Response Codes.
+        Retrieves the distribution of AS112 DNS requests classified by response code.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          date_start: Array of datetimes to filter the start of a series.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          format: Format results are returned in.
+          name: Array of names used to label the series in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          protocol: Filters results by DNS transport protocol.
 
-          name: Array of names that will be used to name the series in responses.
+          query_type: Filters results by DNS query type.
 
           extra_headers: Send extra headers
 
@@ -992,14 +2292,16 @@ async def response_codes(
                 timeout=timeout,
                 query=await async_maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
                     },
                     summary_response_codes_params.SummaryResponseCodesParams,
                 ),
@@ -1013,23 +2315,35 @@ class SummaryResourceWithRawResponse:
     def __init__(self, summary: SummaryResource) -> None:
         self._summary = summary
 
-        self.dnssec = to_raw_response_wrapper(
-            summary.dnssec,
+        self.dnssec = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.dnssec,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edns = to_raw_response_wrapper(
-            summary.edns,
+        self.edns = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.edns,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_raw_response_wrapper(
-            summary.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.protocol = to_raw_response_wrapper(
-            summary.protocol,
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.query_type = to_raw_response_wrapper(
-            summary.query_type,
+        self.query_type = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.query_type,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.response_codes = to_raw_response_wrapper(
-            summary.response_codes,
+        self.response_codes = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.response_codes,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1037,23 +2351,35 @@ class AsyncSummaryResourceWithRawResponse:
     def __init__(self, summary: AsyncSummaryResource) -> None:
         self._summary = summary
 
-        self.dnssec = async_to_raw_response_wrapper(
-            summary.dnssec,
+        self.dnssec = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.dnssec,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edns = async_to_raw_response_wrapper(
-            summary.edns,
+        self.edns = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.edns,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_raw_response_wrapper(
-            summary.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.protocol = async_to_raw_response_wrapper(
-            summary.protocol,
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.query_type = async_to_raw_response_wrapper(
-            summary.query_type,
+        self.query_type = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.query_type,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.response_codes = async_to_raw_response_wrapper(
-            summary.response_codes,
+        self.response_codes = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.response_codes,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1061,23 +2387,35 @@ class SummaryResourceWithStreamingResponse:
     def __init__(self, summary: SummaryResource) -> None:
         self._summary = summary
 
-        self.dnssec = to_streamed_response_wrapper(
-            summary.dnssec,
+        self.dnssec = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.dnssec,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edns = to_streamed_response_wrapper(
-            summary.edns,
+        self.edns = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.edns,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_streamed_response_wrapper(
-            summary.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.protocol = to_streamed_response_wrapper(
-            summary.protocol,
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.query_type = to_streamed_response_wrapper(
-            summary.query_type,
+        self.query_type = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.query_type,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.response_codes = to_streamed_response_wrapper(
-            summary.response_codes,
+        self.response_codes = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.response_codes,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1085,21 +2423,33 @@ class AsyncSummaryResourceWithStreamingResponse:
     def __init__(self, summary: AsyncSummaryResource) -> None:
         self._summary = summary
 
-        self.dnssec = async_to_streamed_response_wrapper(
-            summary.dnssec,
+        self.dnssec = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.dnssec,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edns = async_to_streamed_response_wrapper(
-            summary.edns,
+        self.edns = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.edns,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_streamed_response_wrapper(
-            summary.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.protocol = async_to_streamed_response_wrapper(
-            summary.protocol,
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.query_type = async_to_streamed_response_wrapper(
-            summary.query_type,
+        self.query_type = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.query_type,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.response_codes = async_to_streamed_response_wrapper(
-            summary.response_codes,
+        self.response_codes = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.response_codes,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/radar/as112/timeseries_groups.py b/src/cloudflare/resources/radar/as112/timeseries_groups.py
index 2b654a4a755..1f1ae528474 100644
--- a/src/cloudflare/resources/radar/as112/timeseries_groups.py
+++ b/src/cloudflare/resources/radar/as112/timeseries_groups.py
@@ -2,17 +2,15 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Union, cast
+import typing_extensions
+from typing import List, Type, Union, Optional, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -44,62 +42,198 @@
 class TimeseriesGroupsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TimeseriesGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TimeseriesGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TimeseriesGroupsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/timeseries_groups_v2/) instead."
+    )
     def dnssec(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupDNSSECResponse:
         """
-        Percentage distribution of DNS AS112 queries by DNSSEC support over time.
+        Retrieves the distribution of AS112 DNS queries by DNSSEC (DNS Security
+        Extensions) support over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -119,7 +253,6 @@ def dnssec(
                 query=maybe_transform(
                     {
                         "agg_interval": agg_interval,
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -127,6 +260,9 @@ def dnssec(
                         "format": format,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
                     },
                     timeseries_group_dnssec_params.TimeseriesGroupDNSSECParams,
                 ),
@@ -135,56 +271,181 @@ def dnssec(
             cast_to=cast(Type[TimeseriesGroupDNSSECResponse], ResultWrapper[TimeseriesGroupDNSSECResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/timeseries_groups_v2/) instead."
+    )
     def edns(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupEdnsResponse:
         """
-        Percentage distribution of AS112 DNS queries by EDNS support over time.
+        Retrieves the distribution of AS112 DNS queries by EDNS (Extension Mechanisms
+        for DNS) support over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -204,7 +465,6 @@ def edns(
                 query=maybe_transform(
                     {
                         "agg_interval": agg_interval,
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -212,6 +472,9 @@ def edns(
                         "format": format,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
                     },
                     timeseries_group_edns_params.TimeseriesGroupEdnsParams,
                 ),
@@ -220,56 +483,180 @@ def edns(
             cast_to=cast(Type[TimeseriesGroupEdnsResponse], ResultWrapper[TimeseriesGroupEdnsResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/timeseries_groups_v2/) instead."
+    )
     def ip_version(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupIPVersionResponse:
         """
-        Percentage distribution of AS112 DNS queries by IP Version over time.
+        Retrieves the distribution of AS112 DNS queries by IP version over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -289,7 +676,6 @@ def ip_version(
                 query=maybe_transform(
                     {
                         "agg_interval": agg_interval,
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -297,6 +683,9 @@ def ip_version(
                         "format": format,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
                     },
                     timeseries_group_ip_version_params.TimeseriesGroupIPVersionParams,
                 ),
@@ -305,56 +694,178 @@ def ip_version(
             cast_to=cast(Type[TimeseriesGroupIPVersionResponse], ResultWrapper[TimeseriesGroupIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/timeseries_groups_v2/) instead."
+    )
     def protocol(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupProtocolResponse:
         """
-        Percentage distribution of AS112 dns requests classified per Protocol over time.
+        Retrieves the distribution of AS112 DNS requests classified by protocol over
+        time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          name: Array of names used to label the series in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -374,7 +885,6 @@ def protocol(
                 query=maybe_transform(
                     {
                         "agg_interval": agg_interval,
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -382,6 +892,8 @@ def protocol(
                         "format": format,
                         "location": location,
                         "name": name,
+                        "query_type": query_type,
+                        "response_code": response_code,
                     },
                     timeseries_group_protocol_params.TimeseriesGroupProtocolParams,
                 ),
@@ -390,56 +902,88 @@ def protocol(
             cast_to=cast(Type[TimeseriesGroupProtocolResponse], ResultWrapper[TimeseriesGroupProtocolResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/timeseries_groups_v2/) instead."
+    )
     def query_type(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupQueryTypeResponse:
         """
-        Percentage distribution of AS112 DNS queries by Query Type over time.
+        Retrieves the distribution of AS112 DNS queries by type over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters results by DNS transport protocol.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -459,14 +1003,16 @@ def query_type(
                 query=maybe_transform(
                     {
                         "agg_interval": agg_interval,
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "response_code": response_code,
                     },
                     timeseries_group_query_type_params.TimeseriesGroupQueryTypeParams,
                 ),
@@ -475,57 +1021,160 @@ def query_type(
             cast_to=cast(Type[TimeseriesGroupQueryTypeResponse], ResultWrapper[TimeseriesGroupQueryTypeResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/timeseries_groups_v2/) instead."
+    )
     def response_codes(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupResponseCodesResponse:
         """
-        Percentage distribution of AS112 dns requests classified per Response Codes over
-        time.
+        Retrieves the distribution of AS112 DNS requests classified by response code
+        over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          date_start: Array of datetimes to filter the start of a series.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          format: Format results are returned in.
+          name: Array of names used to label the series in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          protocol: Filters results by DNS transport protocol.
 
-          name: Array of names that will be used to name the series in responses.
+          query_type: Filters results by DNS query type.
 
           extra_headers: Send extra headers
 
@@ -545,14 +1194,16 @@ def response_codes(
                 query=maybe_transform(
                     {
                         "agg_interval": agg_interval,
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
                     },
                     timeseries_group_response_codes_params.TimeseriesGroupResponseCodesParams,
                 ),
@@ -567,62 +1218,198 @@ def response_codes(
 class AsyncTimeseriesGroupsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTimeseriesGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTimeseriesGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTimeseriesGroupsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/timeseries_groups_v2/) instead."
+    )
     async def dnssec(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupDNSSECResponse:
         """
-        Percentage distribution of DNS AS112 queries by DNSSEC support over time.
+        Retrieves the distribution of AS112 DNS queries by DNSSEC (DNS Security
+        Extensions) support over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          name: Array of names used to label the series in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -642,7 +1429,6 @@ async def dnssec(
                 query=await async_maybe_transform(
                     {
                         "agg_interval": agg_interval,
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -650,6 +1436,9 @@ async def dnssec(
                         "format": format,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
                     },
                     timeseries_group_dnssec_params.TimeseriesGroupDNSSECParams,
                 ),
@@ -658,56 +1447,181 @@ async def dnssec(
             cast_to=cast(Type[TimeseriesGroupDNSSECResponse], ResultWrapper[TimeseriesGroupDNSSECResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/timeseries_groups_v2/) instead."
+    )
     async def edns(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupEdnsResponse:
         """
-        Percentage distribution of AS112 DNS queries by EDNS support over time.
+        Retrieves the distribution of AS112 DNS queries by EDNS (Extension Mechanisms
+        for DNS) support over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          name: Array of names used to label the series in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -727,7 +1641,6 @@ async def edns(
                 query=await async_maybe_transform(
                     {
                         "agg_interval": agg_interval,
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -735,6 +1648,9 @@ async def edns(
                         "format": format,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
                     },
                     timeseries_group_edns_params.TimeseriesGroupEdnsParams,
                 ),
@@ -743,56 +1659,180 @@ async def edns(
             cast_to=cast(Type[TimeseriesGroupEdnsResponse], ResultWrapper[TimeseriesGroupEdnsResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/timeseries_groups_v2/) instead."
+    )
     async def ip_version(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupIPVersionResponse:
         """
-        Percentage distribution of AS112 DNS queries by IP Version over time.
+        Retrieves the distribution of AS112 DNS queries by IP version over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          name: Array of names used to label the series in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -812,7 +1852,6 @@ async def ip_version(
                 query=await async_maybe_transform(
                     {
                         "agg_interval": agg_interval,
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -820,6 +1859,9 @@ async def ip_version(
                         "format": format,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
                     },
                     timeseries_group_ip_version_params.TimeseriesGroupIPVersionParams,
                 ),
@@ -828,56 +1870,178 @@ async def ip_version(
             cast_to=cast(Type[TimeseriesGroupIPVersionResponse], ResultWrapper[TimeseriesGroupIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/timeseries_groups_v2/) instead."
+    )
     async def protocol(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupProtocolResponse:
         """
-        Percentage distribution of AS112 dns requests classified per Protocol over time.
+        Retrieves the distribution of AS112 DNS requests classified by protocol over
+        time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -897,7 +2061,6 @@ async def protocol(
                 query=await async_maybe_transform(
                     {
                         "agg_interval": agg_interval,
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -905,6 +2068,8 @@ async def protocol(
                         "format": format,
                         "location": location,
                         "name": name,
+                        "query_type": query_type,
+                        "response_code": response_code,
                     },
                     timeseries_group_protocol_params.TimeseriesGroupProtocolParams,
                 ),
@@ -913,56 +2078,88 @@ async def protocol(
             cast_to=cast(Type[TimeseriesGroupProtocolResponse], ResultWrapper[TimeseriesGroupProtocolResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/timeseries_groups_v2/) instead."
+    )
     async def query_type(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupQueryTypeResponse:
         """
-        Percentage distribution of AS112 DNS queries by Query Type over time.
+        Retrieves the distribution of AS112 DNS queries by type over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters results by DNS transport protocol.
+
+          response_code: Filters results by DNS response code.
 
           extra_headers: Send extra headers
 
@@ -982,14 +2179,16 @@ async def query_type(
                 query=await async_maybe_transform(
                     {
                         "agg_interval": agg_interval,
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "response_code": response_code,
                     },
                     timeseries_group_query_type_params.TimeseriesGroupQueryTypeParams,
                 ),
@@ -998,57 +2197,160 @@ async def query_type(
             cast_to=cast(Type[TimeseriesGroupQueryTypeResponse], ResultWrapper[TimeseriesGroupQueryTypeResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar AS112 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/as112/methods/timeseries_groups_v2/) instead."
+    )
     async def response_codes(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupResponseCodesResponse:
         """
-        Percentage distribution of AS112 dns requests classified per Response Codes over
-        time.
+        Retrieves the distribution of AS112 DNS requests classified by response code
+        over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          date_start: Array of datetimes to filter the start of a series.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          format: Format results are returned in.
+          name: Array of names used to label the series in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          protocol: Filters results by DNS transport protocol.
 
-          name: Array of names that will be used to name the series in responses.
+          query_type: Filters results by DNS query type.
 
           extra_headers: Send extra headers
 
@@ -1068,14 +2370,16 @@ async def response_codes(
                 query=await async_maybe_transform(
                     {
                         "agg_interval": agg_interval,
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
+                        "query_type": query_type,
                     },
                     timeseries_group_response_codes_params.TimeseriesGroupResponseCodesParams,
                 ),
@@ -1091,23 +2395,35 @@ class TimeseriesGroupsResourceWithRawResponse:
     def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.dnssec = to_raw_response_wrapper(
-            timeseries_groups.dnssec,
+        self.dnssec = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.dnssec,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edns = to_raw_response_wrapper(
-            timeseries_groups.edns,
+        self.edns = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.edns,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_raw_response_wrapper(
-            timeseries_groups.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.protocol = to_raw_response_wrapper(
-            timeseries_groups.protocol,
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.query_type = to_raw_response_wrapper(
-            timeseries_groups.query_type,
+        self.query_type = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.query_type,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.response_codes = to_raw_response_wrapper(
-            timeseries_groups.response_codes,
+        self.response_codes = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.response_codes,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1115,23 +2431,35 @@ class AsyncTimeseriesGroupsResourceWithRawResponse:
     def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.dnssec = async_to_raw_response_wrapper(
-            timeseries_groups.dnssec,
+        self.dnssec = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.dnssec,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edns = async_to_raw_response_wrapper(
-            timeseries_groups.edns,
+        self.edns = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.edns,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_raw_response_wrapper(
-            timeseries_groups.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.protocol = async_to_raw_response_wrapper(
-            timeseries_groups.protocol,
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.query_type = async_to_raw_response_wrapper(
-            timeseries_groups.query_type,
+        self.query_type = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.query_type,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.response_codes = async_to_raw_response_wrapper(
-            timeseries_groups.response_codes,
+        self.response_codes = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.response_codes,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1139,23 +2467,35 @@ class TimeseriesGroupsResourceWithStreamingResponse:
     def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.dnssec = to_streamed_response_wrapper(
-            timeseries_groups.dnssec,
+        self.dnssec = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.dnssec,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edns = to_streamed_response_wrapper(
-            timeseries_groups.edns,
+        self.edns = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.edns,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_streamed_response_wrapper(
-            timeseries_groups.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.protocol = to_streamed_response_wrapper(
-            timeseries_groups.protocol,
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.query_type = to_streamed_response_wrapper(
-            timeseries_groups.query_type,
+        self.query_type = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.query_type,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.response_codes = to_streamed_response_wrapper(
-            timeseries_groups.response_codes,
+        self.response_codes = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.response_codes,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1163,21 +2503,33 @@ class AsyncTimeseriesGroupsResourceWithStreamingResponse:
     def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.dnssec = async_to_streamed_response_wrapper(
-            timeseries_groups.dnssec,
+        self.dnssec = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.dnssec,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edns = async_to_streamed_response_wrapper(
-            timeseries_groups.edns,
+        self.edns = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.edns,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_streamed_response_wrapper(
-            timeseries_groups.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.protocol = async_to_streamed_response_wrapper(
-            timeseries_groups.protocol,
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.query_type = async_to_streamed_response_wrapper(
-            timeseries_groups.query_type,
+        self.query_type = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.query_type,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.response_codes = async_to_streamed_response_wrapper(
-            timeseries_groups.response_codes,
+        self.response_codes = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.response_codes,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/radar/as112/top.py b/src/cloudflare/resources/radar/as112/top.py
index 85152434160..2d22f91c78e 100644
--- a/src/cloudflare/resources/radar/as112/top.py
+++ b/src/cloudflare/resources/radar/as112/top.py
@@ -2,17 +2,14 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Union, cast
+from typing import Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -35,63 +32,70 @@
 class TopResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TopResourceWithStreamingResponse(self)
 
     def dnssec(
         self,
         dnssec: Literal["SUPPORTED", "NOT_SUPPORTED"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopDNSSECResponse:
         """
-        Get the top locations by DNS queries DNSSEC support to AS112.
+        Retrieves the top locations of DNS queries to AS112 with DNSSEC (DNS Security
+        Extensions) support.
 
         Args:
-          dnssec: DNSSEC.
+          dnssec: DNSSEC (DNS Security Extensions) status.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -112,7 +116,6 @@ def dnssec(
                 timeout=timeout,
                 query=maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -133,53 +136,49 @@ def edns(
         self,
         edns: Literal["SUPPORTED", "NOT_SUPPORTED"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopEdnsResponse:
         """
-        Get the top locations, by DNS queries EDNS support to AS112.
+        Retrieves the top locations of DNS queries to AS112 with EDNS (Extension
+        Mechanisms for DNS) support.
 
         Args:
-          edns: EDNS.
-
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          edns: EDNS (Extension Mechanisms for DNS) status.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -200,7 +199,6 @@ def edns(
                 timeout=timeout,
                 query=maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -221,53 +219,48 @@ def ip_version(
         self,
         ip_version: Literal["IPv4", "IPv6"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopIPVersionResponse:
         """
-        Get the top locations by DNS queries IP version to AS112.
+        Retrieves the top locations of DNS queries to AS112 for an IP version.
 
         Args:
-          ip_version: IP Version.
-
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          ip_version: IP version.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -288,7 +281,6 @@ def ip_version(
                 timeout=timeout,
                 query=maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -308,53 +300,46 @@ def ip_version(
     def locations(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopLocationsResponse:
-        """Get the top locations by AS112 DNS queries.
-
-        Values are a percentage out of the
-        total queries.
+        """
+        Retrieves the top locations by AS112 DNS queries.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -373,7 +358,6 @@ def locations(
                 timeout=timeout,
                 query=maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -394,63 +378,70 @@ def locations(
 class AsyncTopResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTopResourceWithStreamingResponse(self)
 
     async def dnssec(
         self,
         dnssec: Literal["SUPPORTED", "NOT_SUPPORTED"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopDNSSECResponse:
         """
-        Get the top locations by DNS queries DNSSEC support to AS112.
+        Retrieves the top locations of DNS queries to AS112 with DNSSEC (DNS Security
+        Extensions) support.
 
         Args:
-          dnssec: DNSSEC.
+          dnssec: DNSSEC (DNS Security Extensions) status.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -471,7 +462,6 @@ async def dnssec(
                 timeout=timeout,
                 query=await async_maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -492,53 +482,49 @@ async def edns(
         self,
         edns: Literal["SUPPORTED", "NOT_SUPPORTED"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopEdnsResponse:
         """
-        Get the top locations, by DNS queries EDNS support to AS112.
+        Retrieves the top locations of DNS queries to AS112 with EDNS (Extension
+        Mechanisms for DNS) support.
 
         Args:
-          edns: EDNS.
-
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          edns: EDNS (Extension Mechanisms for DNS) status.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -559,7 +545,6 @@ async def edns(
                 timeout=timeout,
                 query=await async_maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -580,53 +565,48 @@ async def ip_version(
         self,
         ip_version: Literal["IPv4", "IPv6"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopIPVersionResponse:
         """
-        Get the top locations by DNS queries IP version to AS112.
+        Retrieves the top locations of DNS queries to AS112 for an IP version.
 
         Args:
-          ip_version: IP Version.
-
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          ip_version: IP version.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -647,7 +627,6 @@ async def ip_version(
                 timeout=timeout,
                 query=await async_maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -667,53 +646,46 @@ async def ip_version(
     async def locations(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopLocationsResponse:
-        """Get the top locations by AS112 DNS queries.
-
-        Values are a percentage out of the
-        total queries.
+        """
+        Retrieves the top locations by AS112 DNS queries.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -732,7 +704,6 @@ async def locations(
                 timeout=timeout,
                 query=await async_maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
diff --git a/src/cloudflare/resources/radar/attacks/attacks.py b/src/cloudflare/resources/radar/attacks/attacks.py
index 7e3c8daa7cf..823eafcf5b8 100644
--- a/src/cloudflare/resources/radar/attacks/attacks.py
+++ b/src/cloudflare/resources/radar/attacks/attacks.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .layer3 import (
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .layer3.layer3 import (
     Layer3Resource,
     AsyncLayer3Resource,
     Layer3ResourceWithRawResponse,
@@ -10,7 +12,7 @@
     Layer3ResourceWithStreamingResponse,
     AsyncLayer3ResourceWithStreamingResponse,
 )
-from .layer7 import (
+from .layer7.layer7 import (
     Layer7Resource,
     AsyncLayer7Resource,
     Layer7ResourceWithRawResponse,
@@ -18,10 +20,6 @@
     Layer7ResourceWithStreamingResponse,
     AsyncLayer7ResourceWithStreamingResponse,
 )
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from .layer3.layer3 import Layer3Resource, AsyncLayer3Resource
-from .layer7.layer7 import Layer7Resource, AsyncLayer7Resource
 
 __all__ = ["AttacksResource", "AsyncAttacksResource"]
 
@@ -37,10 +35,21 @@ def layer7(self) -> Layer7Resource:
 
     @cached_property
     def with_raw_response(self) -> AttacksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AttacksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AttacksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AttacksResourceWithStreamingResponse(self)
 
 
@@ -55,10 +64,21 @@ def layer7(self) -> AsyncLayer7Resource:
 
     @cached_property
     def with_raw_response(self) -> AsyncAttacksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAttacksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAttacksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAttacksResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/radar/attacks/layer3/layer3.py b/src/cloudflare/resources/radar/attacks/layer3/layer3.py
index 40608aa9246..54e7fdffaef 100644
--- a/src/cloudflare/resources/radar/attacks/layer3/layer3.py
+++ b/src/cloudflare/resources/radar/attacks/layer3/layer3.py
@@ -8,14 +8,6 @@
 
 import httpx
 
-from .top import (
-    TopResource,
-    AsyncTopResource,
-    TopResourceWithRawResponse,
-    AsyncTopResourceWithRawResponse,
-    TopResourceWithStreamingResponse,
-    AsyncTopResourceWithStreamingResponse,
-)
 from .summary import (
     SummaryResource,
     AsyncSummaryResource,
@@ -24,12 +16,16 @@
     SummaryResourceWithStreamingResponse,
     AsyncSummaryResourceWithStreamingResponse,
 )
-from .top.top import TopResource, AsyncTopResource
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
+from .top.top import (
+    TopResource,
+    AsyncTopResource,
+    TopResourceWithRawResponse,
+    AsyncTopResourceWithRawResponse,
+    TopResourceWithStreamingResponse,
+    AsyncTopResourceWithStreamingResponse,
 )
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -48,8 +44,14 @@
     TimeseriesGroupsResourceWithStreamingResponse,
     AsyncTimeseriesGroupsResourceWithStreamingResponse,
 )
-from .....types.radar.attacks import layer3_timeseries_params
+from .....types.radar.attacks import (
+    layer3_summary_v2_params,
+    layer3_timeseries_params,
+    layer3_timeseries_groups_v2_params,
+)
+from .....types.radar.attacks.layer3_summary_v2_response import Layer3SummaryV2Response
 from .....types.radar.attacks.layer3_timeseries_response import Layer3TimeseriesResponse
+from .....types.radar.attacks.layer3_timeseries_groups_v2_response import Layer3TimeseriesGroupsV2Response
 
 __all__ = ["Layer3Resource", "AsyncLayer3Resource"]
 
@@ -69,79 +71,188 @@ def top(self) -> TopResource:
 
     @cached_property
     def with_raw_response(self) -> Layer3ResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return Layer3ResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> Layer3ResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return Layer3ResourceWithStreamingResponse(self)
 
+    def summary_v2(
+        self,
+        dimension: Literal["PROTOCOL", "IP_VERSION", "VECTOR", "DURATION", "BITRATE", "VERTICAL", "INDUSTRY"],
+        *,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Layer3SummaryV2Response:
+        """
+        Retrieves the distribution of layer 3 attacks by the specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters the results by layer 3/4 protocol.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/attacks/layer3/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "direction": direction,
+                        "format": format,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "protocol": protocol,
+                    },
+                    layer3_summary_v2_params.Layer3SummaryV2Params,
+                ),
+                post_parser=ResultWrapper[Layer3SummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[Layer3SummaryV2Response], ResultWrapper[Layer3SummaryV2Response]),
+        )
+
     def timeseries(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        metric: Literal["BYTES", "BYTES_OLD"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        metric: Literal["BYTES", "BYTES_OLD"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Layer3TimeseriesResponse:
         """
-        Get attacks change over time by bytes.
+        Retrieves layer 3 attacks over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
           metric: Measurement units, eg. bytes.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -182,6 +293,114 @@ def timeseries(
             cast_to=cast(Type[Layer3TimeseriesResponse], ResultWrapper[Layer3TimeseriesResponse]),
         )
 
+    def timeseries_groups_v2(
+        self,
+        dimension: Literal["PROTOCOL", "IP_VERSION", "VECTOR", "DURATION", "BITRATE", "VERTICAL", "INDUSTRY"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Layer3TimeseriesGroupsV2Response:
+        """
+        Retrieves the distribution of layer 3 attacks grouped by dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          protocol: Filters the results by layer 3/4 protocol.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/attacks/layer3/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "direction": direction,
+                        "format": format,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "normalization": normalization,
+                        "protocol": protocol,
+                    },
+                    layer3_timeseries_groups_v2_params.Layer3TimeseriesGroupsV2Params,
+                ),
+                post_parser=ResultWrapper[Layer3TimeseriesGroupsV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[Layer3TimeseriesGroupsV2Response], ResultWrapper[Layer3TimeseriesGroupsV2Response]),
+        )
+
 
 class AsyncLayer3Resource(AsyncAPIResource):
     @cached_property
@@ -198,79 +417,188 @@ def top(self) -> AsyncTopResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncLayer3ResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLayer3ResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLayer3ResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLayer3ResourceWithStreamingResponse(self)
 
+    async def summary_v2(
+        self,
+        dimension: Literal["PROTOCOL", "IP_VERSION", "VECTOR", "DURATION", "BITRATE", "VERTICAL", "INDUSTRY"],
+        *,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Layer3SummaryV2Response:
+        """
+        Retrieves the distribution of layer 3 attacks by the specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters the results by layer 3/4 protocol.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/attacks/layer3/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "direction": direction,
+                        "format": format,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "protocol": protocol,
+                    },
+                    layer3_summary_v2_params.Layer3SummaryV2Params,
+                ),
+                post_parser=ResultWrapper[Layer3SummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[Layer3SummaryV2Response], ResultWrapper[Layer3SummaryV2Response]),
+        )
+
     async def timeseries(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        metric: Literal["BYTES", "BYTES_OLD"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        metric: Literal["BYTES", "BYTES_OLD"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Layer3TimeseriesResponse:
         """
-        Get attacks change over time by bytes.
+        Retrieves layer 3 attacks over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
           metric: Measurement units, eg. bytes.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -311,14 +639,128 @@ async def timeseries(
             cast_to=cast(Type[Layer3TimeseriesResponse], ResultWrapper[Layer3TimeseriesResponse]),
         )
 
+    async def timeseries_groups_v2(
+        self,
+        dimension: Literal["PROTOCOL", "IP_VERSION", "VECTOR", "DURATION", "BITRATE", "VERTICAL", "INDUSTRY"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Layer3TimeseriesGroupsV2Response:
+        """
+        Retrieves the distribution of layer 3 attacks grouped by dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          protocol: Filters the results by layer 3/4 protocol.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/attacks/layer3/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "direction": direction,
+                        "format": format,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "normalization": normalization,
+                        "protocol": protocol,
+                    },
+                    layer3_timeseries_groups_v2_params.Layer3TimeseriesGroupsV2Params,
+                ),
+                post_parser=ResultWrapper[Layer3TimeseriesGroupsV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[Layer3TimeseriesGroupsV2Response], ResultWrapper[Layer3TimeseriesGroupsV2Response]),
+        )
+
 
 class Layer3ResourceWithRawResponse:
     def __init__(self, layer3: Layer3Resource) -> None:
         self._layer3 = layer3
 
+        self.summary_v2 = to_raw_response_wrapper(
+            layer3.summary_v2,
+        )
         self.timeseries = to_raw_response_wrapper(
             layer3.timeseries,
         )
+        self.timeseries_groups_v2 = to_raw_response_wrapper(
+            layer3.timeseries_groups_v2,
+        )
 
     @cached_property
     def summary(self) -> SummaryResourceWithRawResponse:
@@ -337,9 +779,15 @@ class AsyncLayer3ResourceWithRawResponse:
     def __init__(self, layer3: AsyncLayer3Resource) -> None:
         self._layer3 = layer3
 
+        self.summary_v2 = async_to_raw_response_wrapper(
+            layer3.summary_v2,
+        )
         self.timeseries = async_to_raw_response_wrapper(
             layer3.timeseries,
         )
+        self.timeseries_groups_v2 = async_to_raw_response_wrapper(
+            layer3.timeseries_groups_v2,
+        )
 
     @cached_property
     def summary(self) -> AsyncSummaryResourceWithRawResponse:
@@ -358,9 +806,15 @@ class Layer3ResourceWithStreamingResponse:
     def __init__(self, layer3: Layer3Resource) -> None:
         self._layer3 = layer3
 
+        self.summary_v2 = to_streamed_response_wrapper(
+            layer3.summary_v2,
+        )
         self.timeseries = to_streamed_response_wrapper(
             layer3.timeseries,
         )
+        self.timeseries_groups_v2 = to_streamed_response_wrapper(
+            layer3.timeseries_groups_v2,
+        )
 
     @cached_property
     def summary(self) -> SummaryResourceWithStreamingResponse:
@@ -379,9 +833,15 @@ class AsyncLayer3ResourceWithStreamingResponse:
     def __init__(self, layer3: AsyncLayer3Resource) -> None:
         self._layer3 = layer3
 
+        self.summary_v2 = async_to_streamed_response_wrapper(
+            layer3.summary_v2,
+        )
         self.timeseries = async_to_streamed_response_wrapper(
             layer3.timeseries,
         )
+        self.timeseries_groups_v2 = async_to_streamed_response_wrapper(
+            layer3.timeseries_groups_v2,
+        )
 
     @cached_property
     def summary(self) -> AsyncSummaryResourceWithStreamingResponse:
diff --git a/src/cloudflare/resources/radar/attacks/layer3/summary.py b/src/cloudflare/resources/radar/attacks/layer3/summary.py
index 9f83b0a9198..ef233d11a7a 100644
--- a/src/cloudflare/resources/radar/attacks/layer3/summary.py
+++ b/src/cloudflare/resources/radar/attacks/layer3/summary.py
@@ -2,17 +2,15 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import List, Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -24,18 +22,20 @@
 from ....._wrappers import ResultWrapper
 from ....._base_client import make_request_options
 from .....types.radar.attacks.layer3 import (
-    summary_get_params,
     summary_vector_params,
     summary_bitrate_params,
     summary_duration_params,
+    summary_industry_params,
     summary_protocol_params,
+    summary_vertical_params,
     summary_ip_version_params,
 )
-from .....types.radar.attacks.layer3.summary_get_response import SummaryGetResponse
 from .....types.radar.attacks.layer3.summary_vector_response import SummaryVectorResponse
 from .....types.radar.attacks.layer3.summary_bitrate_response import SummaryBitrateResponse
 from .....types.radar.attacks.layer3.summary_duration_response import SummaryDurationResponse
+from .....types.radar.attacks.layer3.summary_industry_response import SummaryIndustryResponse
 from .....types.radar.attacks.layer3.summary_protocol_response import SummaryProtocolResponse
+from .....types.radar.attacks.layer3.summary_vertical_response import SummaryVerticalResponse
 from .....types.radar.attacks.layer3.summary_ip_version_response import SummaryIPVersionResponse
 
 __all__ = ["SummaryResource", "AsyncSummaryResource"]
@@ -44,62 +44,76 @@
 class SummaryResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SummaryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SummaryResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/summary_v2/) instead."
+    )
     def bitrate(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryBitrateResponse:
         """
-        Percentage distribution of attacks by bitrate.
+        Retrieves the distribution of layer 3 attacks by bitrate.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -136,56 +150,59 @@ def bitrate(
             cast_to=cast(Type[SummaryBitrateResponse], ResultWrapper[SummaryBitrateResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/summary_v2/) instead."
+    )
     def duration(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryDurationResponse:
         """
-        Percentage distribution of attacks by duration.
+        Retrieves the distribution of layer 3 attacks by duration.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -222,52 +239,64 @@ def duration(
             cast_to=cast(Type[SummaryDurationResponse], ResultWrapper[SummaryDurationResponse]),
         )
 
-    def get(
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/summary_v2/) instead."
+    )
+    def industry(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SummaryGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryIndustryResponse:
         """
-        Percentage distribution of network protocols in layer 3/4 attacks over a given
-        time period.
+        Retrieves the distribution of layer 3 attacks by targeted industry.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -278,7 +307,7 @@ def get(
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get(
-            "/radar/attacks/layer3/summary",
+            "/radar/attacks/layer3/summary/industry",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -286,69 +315,75 @@ def get(
                 timeout=timeout,
                 query=maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
+                        "direction": direction,
                         "format": format,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
                     },
-                    summary_get_params.SummaryGetParams,
+                    summary_industry_params.SummaryIndustryParams,
                 ),
-                post_parser=ResultWrapper[SummaryGetResponse]._unwrapper,
+                post_parser=ResultWrapper[SummaryIndustryResponse]._unwrapper,
             ),
-            cast_to=cast(Type[SummaryGetResponse], ResultWrapper[SummaryGetResponse]),
+            cast_to=cast(Type[SummaryIndustryResponse], ResultWrapper[SummaryIndustryResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/summary_v2/) instead."
+    )
     def ip_version(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryIPVersionResponse:
         """
-        Percentage distribution of attacks by ip version used.
+        Retrieves the distribution of layer 3 attacks by IP version.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -384,53 +419,56 @@ def ip_version(
             cast_to=cast(Type[SummaryIPVersionResponse], ResultWrapper[SummaryIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/summary_v2/) instead."
+    )
     def protocol(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryProtocolResponse:
         """
-        Percentage distribution of attacks by protocol used.
+        Retrieves the distribution of layer 3 attacks by protocol.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -466,56 +504,64 @@ def protocol(
             cast_to=cast(Type[SummaryProtocolResponse], ResultWrapper[SummaryProtocolResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/summary_v2/) instead."
+    )
     def vector(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryVectorResponse:
         """
-        Percentage distribution of attacks by vector.
+        Retrieves the distribution of layer 3 attacks by vector.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          ip_version: Filter for ip version.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -541,6 +587,7 @@ def vector(
                         "direction": direction,
                         "format": format,
                         "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
                         "protocol": protocol,
@@ -552,66 +599,175 @@ def vector(
             cast_to=cast(Type[SummaryVectorResponse], ResultWrapper[SummaryVectorResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/summary_v2/) instead."
+    )
+    def vertical(
+        self,
+        *,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryVerticalResponse:
+        """
+        Retrieves the distribution of layer 3 attacks by targeted vertical.
+
+        Args:
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters the results by layer 3/4 protocol.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/attacks/layer3/summary/vertical",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "direction": direction,
+                        "format": format,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "protocol": protocol,
+                    },
+                    summary_vertical_params.SummaryVerticalParams,
+                ),
+                post_parser=ResultWrapper[SummaryVerticalResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryVerticalResponse], ResultWrapper[SummaryVerticalResponse]),
+        )
+
 
 class AsyncSummaryResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSummaryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSummaryResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/summary_v2/) instead."
+    )
     async def bitrate(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryBitrateResponse:
         """
-        Percentage distribution of attacks by bitrate.
+        Retrieves the distribution of layer 3 attacks by bitrate.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -648,56 +804,59 @@ async def bitrate(
             cast_to=cast(Type[SummaryBitrateResponse], ResultWrapper[SummaryBitrateResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/summary_v2/) instead."
+    )
     async def duration(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryDurationResponse:
         """
-        Percentage distribution of attacks by duration.
+        Retrieves the distribution of layer 3 attacks by duration.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -734,52 +893,64 @@ async def duration(
             cast_to=cast(Type[SummaryDurationResponse], ResultWrapper[SummaryDurationResponse]),
         )
 
-    async def get(
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/summary_v2/) instead."
+    )
+    async def industry(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SummaryGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryIndustryResponse:
         """
-        Percentage distribution of network protocols in layer 3/4 attacks over a given
-        time period.
+        Retrieves the distribution of layer 3 attacks by targeted industry.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          date_start: Array of datetimes to filter the start of a series.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          format: Format results are returned in.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          name: Array of names used to label the series in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -790,7 +961,7 @@ async def get(
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._get(
-            "/radar/attacks/layer3/summary",
+            "/radar/attacks/layer3/summary/industry",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -798,69 +969,75 @@ async def get(
                 timeout=timeout,
                 query=await async_maybe_transform(
                     {
-                        "asn": asn,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
+                        "direction": direction,
                         "format": format,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
+                        "protocol": protocol,
                     },
-                    summary_get_params.SummaryGetParams,
+                    summary_industry_params.SummaryIndustryParams,
                 ),
-                post_parser=ResultWrapper[SummaryGetResponse]._unwrapper,
+                post_parser=ResultWrapper[SummaryIndustryResponse]._unwrapper,
             ),
-            cast_to=cast(Type[SummaryGetResponse], ResultWrapper[SummaryGetResponse]),
+            cast_to=cast(Type[SummaryIndustryResponse], ResultWrapper[SummaryIndustryResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/summary_v2/) instead."
+    )
     async def ip_version(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryIPVersionResponse:
         """
-        Percentage distribution of attacks by ip version used.
+        Retrieves the distribution of layer 3 attacks by IP version.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -896,53 +1073,56 @@ async def ip_version(
             cast_to=cast(Type[SummaryIPVersionResponse], ResultWrapper[SummaryIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/summary_v2/) instead."
+    )
     async def protocol(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryProtocolResponse:
         """
-        Percentage distribution of attacks by protocol used.
+        Retrieves the distribution of layer 3 attacks by protocol.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -978,56 +1158,64 @@ async def protocol(
             cast_to=cast(Type[SummaryProtocolResponse], ResultWrapper[SummaryProtocolResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/summary_v2/) instead."
+    )
     async def vector(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryVectorResponse:
         """
-        Percentage distribution of attacks by vector.
+        Retrieves the distribution of layer 3 attacks by vector.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          protocol: Array of L3/4 attack types.
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -1053,6 +1241,7 @@ async def vector(
                         "direction": direction,
                         "format": format,
                         "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
                         "protocol": protocol,
@@ -1064,28 +1253,140 @@ async def vector(
             cast_to=cast(Type[SummaryVectorResponse], ResultWrapper[SummaryVectorResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/summary_v2/) instead."
+    )
+    async def vertical(
+        self,
+        *,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryVerticalResponse:
+        """
+        Retrieves the distribution of layer 3 attacks by targeted vertical.
+
+        Args:
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          protocol: Filters the results by layer 3/4 protocol.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/attacks/layer3/summary/vertical",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "direction": direction,
+                        "format": format,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "protocol": protocol,
+                    },
+                    summary_vertical_params.SummaryVerticalParams,
+                ),
+                post_parser=ResultWrapper[SummaryVerticalResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryVerticalResponse], ResultWrapper[SummaryVerticalResponse]),
+        )
+
 
 class SummaryResourceWithRawResponse:
     def __init__(self, summary: SummaryResource) -> None:
         self._summary = summary
 
-        self.bitrate = to_raw_response_wrapper(
-            summary.bitrate,
+        self.bitrate = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.bitrate,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.duration = to_raw_response_wrapper(
-            summary.duration,
+        self.duration = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.duration,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_raw_response_wrapper(
-            summary.get,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_raw_response_wrapper(
-            summary.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.protocol = to_raw_response_wrapper(
-            summary.protocol,
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vector = to_raw_response_wrapper(
-            summary.vector,
+        self.vector = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.vector,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1093,23 +1394,40 @@ class AsyncSummaryResourceWithRawResponse:
     def __init__(self, summary: AsyncSummaryResource) -> None:
         self._summary = summary
 
-        self.bitrate = async_to_raw_response_wrapper(
-            summary.bitrate,
+        self.bitrate = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.bitrate,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.duration = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.duration,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.duration = async_to_raw_response_wrapper(
-            summary.duration,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_raw_response_wrapper(
-            summary.get,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_raw_response_wrapper(
-            summary.ip_version,
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.protocol = async_to_raw_response_wrapper(
-            summary.protocol,
+        self.vector = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.vector,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vector = async_to_raw_response_wrapper(
-            summary.vector,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1117,23 +1435,40 @@ class SummaryResourceWithStreamingResponse:
     def __init__(self, summary: SummaryResource) -> None:
         self._summary = summary
 
-        self.bitrate = to_streamed_response_wrapper(
-            summary.bitrate,
+        self.bitrate = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.bitrate,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.duration = to_streamed_response_wrapper(
-            summary.duration,
+        self.duration = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.duration,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_streamed_response_wrapper(
-            summary.get,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_streamed_response_wrapper(
-            summary.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.protocol = to_streamed_response_wrapper(
-            summary.protocol,
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vector = to_streamed_response_wrapper(
-            summary.vector,
+        self.vector = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.vector,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1141,21 +1476,38 @@ class AsyncSummaryResourceWithStreamingResponse:
     def __init__(self, summary: AsyncSummaryResource) -> None:
         self._summary = summary
 
-        self.bitrate = async_to_streamed_response_wrapper(
-            summary.bitrate,
+        self.bitrate = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.bitrate,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.duration = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.duration,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.duration = async_to_streamed_response_wrapper(
-            summary.duration,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_streamed_response_wrapper(
-            summary.get,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_streamed_response_wrapper(
-            summary.ip_version,
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.protocol = async_to_streamed_response_wrapper(
-            summary.protocol,
+        self.vector = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.vector,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vector = async_to_streamed_response_wrapper(
-            summary.vector,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py b/src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py
index 353c8457d47..67b4cfd8914 100644
--- a/src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py
+++ b/src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py
@@ -2,17 +2,15 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import List, Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -24,7 +22,6 @@
 from ....._wrappers import ResultWrapper
 from ....._base_client import make_request_options
 from .....types.radar.attacks.layer3 import (
-    timeseries_group_get_params,
     timeseries_group_vector_params,
     timeseries_group_bitrate_params,
     timeseries_group_duration_params,
@@ -33,7 +30,6 @@
     timeseries_group_vertical_params,
     timeseries_group_ip_version_params,
 )
-from .....types.radar.attacks.layer3.timeseries_group_get_response import TimeseriesGroupGetResponse
 from .....types.radar.attacks.layer3.timeseries_group_vector_response import TimeseriesGroupVectorResponse
 from .....types.radar.attacks.layer3.timeseries_group_bitrate_response import TimeseriesGroupBitrateResponse
 from .....types.radar.attacks.layer3.timeseries_group_duration_response import TimeseriesGroupDurationResponse
@@ -48,71 +44,85 @@
 class TimeseriesGroupsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TimeseriesGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TimeseriesGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TimeseriesGroupsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/timeseries_groups_v2/) instead."
+    )
     def bitrate(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupBitrateResponse:
         """
-        Percentage distribution of attacks by bitrate over time.
+        Retrieves the distribution of layer 3 attacks by bitrate over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -151,65 +161,68 @@ def bitrate(
             cast_to=cast(Type[TimeseriesGroupBitrateResponse], ResultWrapper[TimeseriesGroupBitrateResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/timeseries_groups_v2/) instead."
+    )
     def duration(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupDurationResponse:
         """
-        Percentage distribution of attacks by duration over time.
+        Retrieves the distribution of layer 3 attacks by duration over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -248,155 +261,73 @@ def duration(
             cast_to=cast(Type[TimeseriesGroupDurationResponse], ResultWrapper[TimeseriesGroupDurationResponse]),
         )
 
-    def get(
-        self,
-        *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TimeseriesGroupGetResponse:
-        """
-        Get a timeseries of the percentage distribution of network protocols in Layer
-        3/4 attacks.
-
-        Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
-              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
-
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
-
-          date_end: End of the date range (inclusive).
-
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
-
-          date_start: Array of datetimes to filter the start of a series.
-
-          format: Format results are returned in.
-
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
-
-          name: Array of names that will be used to name the series in responses.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        return self._get(
-            "/radar/attacks/layer3/timeseries_groups",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "agg_interval": agg_interval,
-                        "asn": asn,
-                        "continent": continent,
-                        "date_end": date_end,
-                        "date_range": date_range,
-                        "date_start": date_start,
-                        "format": format,
-                        "location": location,
-                        "name": name,
-                    },
-                    timeseries_group_get_params.TimeseriesGroupGetParams,
-                ),
-                post_parser=ResultWrapper[TimeseriesGroupGetResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[TimeseriesGroupGetResponse], ResultWrapper[TimeseriesGroupGetResponse]),
-        )
-
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/timeseries_groups_v2/) instead."
+    )
     def industry(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit_per_group: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupIndustryResponse:
         """
-        Percentage distribution of attacks by industry used over time.
+        Retrieves the distribution of layer 3 attacks by targeted industry over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit_per_group: Limit the number of objects (eg browsers, verticals, etc) to the top items over
-              the time range.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -436,62 +367,65 @@ def industry(
             cast_to=cast(Type[TimeseriesGroupIndustryResponse], ResultWrapper[TimeseriesGroupIndustryResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/timeseries_groups_v2/) instead."
+    )
     def ip_version(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupIPVersionResponse:
         """
-        Percentage distribution of attacks by ip version used over time.
+        Retrieves the distribution of layer 3 attacks by IP version over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -529,61 +463,64 @@ def ip_version(
             cast_to=cast(Type[TimeseriesGroupIPVersionResponse], ResultWrapper[TimeseriesGroupIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/timeseries_groups_v2/) instead."
+    )
     def protocol(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupProtocolResponse:
         """
-        Percentage distribution of attacks by protocol used over time.
+        Retrieves the distribution of layer 3 attacks by protocol over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -622,69 +559,73 @@ def protocol(
             cast_to=cast(Type[TimeseriesGroupProtocolResponse], ResultWrapper[TimeseriesGroupProtocolResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/timeseries_groups_v2/) instead."
+    )
     def vector(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit_per_group: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupVectorResponse:
         """
-        Percentage distribution of attacks by vector used over time.
+        Retrieves the distribution of layer 3 attacks by vector over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit_per_group: Limit the number of objects (eg browsers, verticals, etc) to the top items over
-              the time range.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -724,69 +665,73 @@ def vector(
             cast_to=cast(Type[TimeseriesGroupVectorResponse], ResultWrapper[TimeseriesGroupVectorResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/timeseries_groups_v2/) instead."
+    )
     def vertical(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit_per_group: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupVerticalResponse:
         """
-        Percentage distribution of attacks by vertical used over time.
+        Retrieves the distribution of layer 3 attacks by targeted vertical over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit_per_group: Limit the number of objects (eg browsers, verticals, etc) to the top items over
-              the time range.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -830,71 +775,85 @@ def vertical(
 class AsyncTimeseriesGroupsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTimeseriesGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTimeseriesGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTimeseriesGroupsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/timeseries_groups_v2/) instead."
+    )
     async def bitrate(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupBitrateResponse:
         """
-        Percentage distribution of attacks by bitrate over time.
+        Retrieves the distribution of layer 3 attacks by bitrate over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -933,65 +892,68 @@ async def bitrate(
             cast_to=cast(Type[TimeseriesGroupBitrateResponse], ResultWrapper[TimeseriesGroupBitrateResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/timeseries_groups_v2/) instead."
+    )
     async def duration(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupDurationResponse:
         """
-        Percentage distribution of attacks by duration over time.
+        Retrieves the distribution of layer 3 attacks by duration over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -1030,155 +992,73 @@ async def duration(
             cast_to=cast(Type[TimeseriesGroupDurationResponse], ResultWrapper[TimeseriesGroupDurationResponse]),
         )
 
-    async def get(
-        self,
-        *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TimeseriesGroupGetResponse:
-        """
-        Get a timeseries of the percentage distribution of network protocols in Layer
-        3/4 attacks.
-
-        Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
-              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
-
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
-
-          date_end: End of the date range (inclusive).
-
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
-
-          date_start: Array of datetimes to filter the start of a series.
-
-          format: Format results are returned in.
-
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
-
-          name: Array of names that will be used to name the series in responses.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        return await self._get(
-            "/radar/attacks/layer3/timeseries_groups",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=await async_maybe_transform(
-                    {
-                        "agg_interval": agg_interval,
-                        "asn": asn,
-                        "continent": continent,
-                        "date_end": date_end,
-                        "date_range": date_range,
-                        "date_start": date_start,
-                        "format": format,
-                        "location": location,
-                        "name": name,
-                    },
-                    timeseries_group_get_params.TimeseriesGroupGetParams,
-                ),
-                post_parser=ResultWrapper[TimeseriesGroupGetResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[TimeseriesGroupGetResponse], ResultWrapper[TimeseriesGroupGetResponse]),
-        )
-
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/timeseries_groups_v2/) instead."
+    )
     async def industry(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit_per_group: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupIndustryResponse:
         """
-        Percentage distribution of attacks by industry used over time.
+        Retrieves the distribution of layer 3 attacks by targeted industry over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit_per_group: Limit the number of objects (eg browsers, verticals, etc) to the top items over
-              the time range.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -1218,62 +1098,65 @@ async def industry(
             cast_to=cast(Type[TimeseriesGroupIndustryResponse], ResultWrapper[TimeseriesGroupIndustryResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/timeseries_groups_v2/) instead."
+    )
     async def ip_version(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupIPVersionResponse:
         """
-        Percentage distribution of attacks by ip version used over time.
+        Retrieves the distribution of layer 3 attacks by IP version over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -1311,61 +1194,64 @@ async def ip_version(
             cast_to=cast(Type[TimeseriesGroupIPVersionResponse], ResultWrapper[TimeseriesGroupIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/timeseries_groups_v2/) instead."
+    )
     async def protocol(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupProtocolResponse:
         """
-        Percentage distribution of attacks by protocol used over time.
+        Retrieves the distribution of layer 3 attacks by protocol over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -1404,69 +1290,73 @@ async def protocol(
             cast_to=cast(Type[TimeseriesGroupProtocolResponse], ResultWrapper[TimeseriesGroupProtocolResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/timeseries_groups_v2/) instead."
+    )
     async def vector(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit_per_group: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupVectorResponse:
         """
-        Percentage distribution of attacks by vector used over time.
+        Retrieves the distribution of layer 3 attacks by vector over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit_per_group: Limit the number of objects (eg browsers, verticals, etc) to the top items over
-              the time range.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -1506,69 +1396,73 @@ async def vector(
             cast_to=cast(Type[TimeseriesGroupVectorResponse], ResultWrapper[TimeseriesGroupVectorResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/timeseries_groups_v2/) instead."
+    )
     async def vertical(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit_per_group: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupVerticalResponse:
         """
-        Percentage distribution of attacks by vertical used over time.
+        Retrieves the distribution of layer 3 attacks by targeted vertical over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          direction: Together with the `location` parameter, will apply the filter to origin or
-              target location.
+          direction: Specifies whether the `location` filter applies to the source or target
+              location.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit_per_group: Limit the number of objects (eg browsers, verticals, etc) to the top items over
-              the time range.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -1613,29 +1507,40 @@ class TimeseriesGroupsResourceWithRawResponse:
     def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.bitrate = to_raw_response_wrapper(
-            timeseries_groups.bitrate,
-        )
-        self.duration = to_raw_response_wrapper(
-            timeseries_groups.duration,
+        self.bitrate = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.bitrate,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_raw_response_wrapper(
-            timeseries_groups.get,
+        self.duration = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.duration,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.industry = to_raw_response_wrapper(
-            timeseries_groups.industry,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_raw_response_wrapper(
-            timeseries_groups.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.protocol = to_raw_response_wrapper(
-            timeseries_groups.protocol,
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vector = to_raw_response_wrapper(
-            timeseries_groups.vector,
+        self.vector = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.vector,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vertical = to_raw_response_wrapper(
-            timeseries_groups.vertical,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1643,29 +1548,40 @@ class AsyncTimeseriesGroupsResourceWithRawResponse:
     def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.bitrate = async_to_raw_response_wrapper(
-            timeseries_groups.bitrate,
+        self.bitrate = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.bitrate,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.duration = async_to_raw_response_wrapper(
-            timeseries_groups.duration,
+        self.duration = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.duration,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_raw_response_wrapper(
-            timeseries_groups.get,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.industry = async_to_raw_response_wrapper(
-            timeseries_groups.industry,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_raw_response_wrapper(
-            timeseries_groups.ip_version,
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.protocol = async_to_raw_response_wrapper(
-            timeseries_groups.protocol,
+        self.vector = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.vector,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vector = async_to_raw_response_wrapper(
-            timeseries_groups.vector,
-        )
-        self.vertical = async_to_raw_response_wrapper(
-            timeseries_groups.vertical,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1673,29 +1589,40 @@ class TimeseriesGroupsResourceWithStreamingResponse:
     def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.bitrate = to_streamed_response_wrapper(
-            timeseries_groups.bitrate,
-        )
-        self.duration = to_streamed_response_wrapper(
-            timeseries_groups.duration,
+        self.bitrate = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.bitrate,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_streamed_response_wrapper(
-            timeseries_groups.get,
+        self.duration = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.duration,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.industry = to_streamed_response_wrapper(
-            timeseries_groups.industry,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_streamed_response_wrapper(
-            timeseries_groups.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.protocol = to_streamed_response_wrapper(
-            timeseries_groups.protocol,
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vector = to_streamed_response_wrapper(
-            timeseries_groups.vector,
+        self.vector = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.vector,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vertical = to_streamed_response_wrapper(
-            timeseries_groups.vertical,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1703,27 +1630,38 @@ class AsyncTimeseriesGroupsResourceWithStreamingResponse:
     def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.bitrate = async_to_streamed_response_wrapper(
-            timeseries_groups.bitrate,
-        )
-        self.duration = async_to_streamed_response_wrapper(
-            timeseries_groups.duration,
+        self.bitrate = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.bitrate,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_streamed_response_wrapper(
-            timeseries_groups.get,
+        self.duration = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.duration,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.industry = async_to_streamed_response_wrapper(
-            timeseries_groups.industry,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_streamed_response_wrapper(
-            timeseries_groups.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.protocol = async_to_streamed_response_wrapper(
-            timeseries_groups.protocol,
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vector = async_to_streamed_response_wrapper(
-            timeseries_groups.vector,
+        self.vector = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.vector,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vertical = async_to_streamed_response_wrapper(
-            timeseries_groups.vertical,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/radar/attacks/layer3/top/locations.py b/src/cloudflare/resources/radar/attacks/layer3/top/locations.py
index fb70d8bcbd7..09853414110 100644
--- a/src/cloudflare/resources/radar/attacks/layer3/top/locations.py
+++ b/src/cloudflare/resources/radar/attacks/layer3/top/locations.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ......_types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ......_utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ......_types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ......_utils import maybe_transform, async_maybe_transform
 from ......_compat import cached_property
 from ......_resource import SyncAPIResource, AsyncAPIResource
 from ......_response import (
@@ -33,61 +30,72 @@
 class LocationsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> LocationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LocationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LocationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LocationsResourceWithStreamingResponse(self)
 
     def origin(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LocationOriginResponse:
         """
-        Get the origin locations of attacks.
+        Retrieves the origin locations of layer 3 attacks.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -127,52 +135,52 @@ def origin(
     def target(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LocationTargetResponse:
         """
-        Get the target locations of attacks.
+        Retrieves the target locations of layer 3 attacks.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -213,61 +221,72 @@ def target(
 class AsyncLocationsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncLocationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLocationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLocationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLocationsResourceWithStreamingResponse(self)
 
     async def origin(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LocationOriginResponse:
         """
-        Get the origin locations of attacks.
+        Retrieves the origin locations of layer 3 attacks.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -307,52 +326,52 @@ async def origin(
     async def target(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LocationTargetResponse:
         """
-        Get the target locations of attacks.
+        Retrieves the target locations of layer 3 attacks.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/attacks/layer3/top/top.py b/src/cloudflare/resources/radar/attacks/layer3/top/top.py
index 3e6817465e2..6b72beabd4e 100644
--- a/src/cloudflare/resources/radar/attacks/layer3/top/top.py
+++ b/src/cloudflare/resources/radar/attacks/layer3/top/top.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import List, Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
@@ -16,11 +17,8 @@
     LocationsResourceWithStreamingResponse,
     AsyncLocationsResourceWithStreamingResponse,
 )
-from ......_types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ......_utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ......_types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ......_utils import maybe_transform, async_maybe_transform
 from ......_compat import cached_property
 from ......_resource import SyncAPIResource, AsyncAPIResource
 from ......_response import (
@@ -46,78 +44,92 @@ def locations(self) -> LocationsResource:
 
     @cached_property
     def with_raw_response(self) -> TopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TopResourceWithStreamingResponse(self)
 
     def attacks(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        limit_direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        limit_per_location: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN_MAX"] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        limit_direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        limit_per_location: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        magnitude: Literal["MITIGATED_BYTES", "MITIGATED_ATTACKS"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopAttacksResponse:
-        """Get the top attacks from origin to target location.
+        """Retrieves the top layer 3 attacks from origin to target location.
 
-        Values are a percentage out
-        of the total layer 3 attacks (with billing country). You can optionally limit
-        the number of attacks per origin/target location (useful if all the top attacks
-        are from or to the same location).
+        Values are a
+        percentage out of the total layer 3 attacks (with billing country). You can
+        optionally limit the number of attacks by origin/target location (useful if all
+        the top attacks are from or to the same location).
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          limit_direction: Array of attack origin/target location attack limits. Together with
-              `limitPerLocation`, limits how many objects will be fetched per origin/target
+          limit_direction: Specifies whether the `limitPerLocation` applies to the source or target
               location.
 
-          limit_per_location: Limit the number of attacks per origin/target (refer to `limitDirection`
+          limit_per_location: Limits the number of attacks per origin/target (refer to `limitDirection`
               parameter) location.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          magnitude: Orders results based on attack magnitude, defined by total mitigated bytes or
+              total mitigated attacks.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -146,6 +158,7 @@ def attacks(
                         "limit_direction": limit_direction,
                         "limit_per_location": limit_per_location,
                         "location": location,
+                        "magnitude": magnitude,
                         "name": name,
                         "normalization": normalization,
                         "protocol": protocol,
@@ -157,55 +170,60 @@ def attacks(
             cast_to=cast(Type[TopAttacksResponse], ResultWrapper[TopAttacksResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/summary_v2/) instead."
+    )
     def industry(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopIndustryResponse:
-        """
-        Get the Industry of attacks.
+        """This endpoint is deprecated.
+
+        To continue getting this data, switch to the
+        summary by industry endpoint.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -242,55 +260,60 @@ def industry(
             cast_to=cast(Type[TopIndustryResponse], ResultWrapper[TopIndustryResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/summary_v2/) instead."
+    )
     def vertical(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopVerticalResponse:
-        """
-        Get the Verticals of attacks.
+        """This endpoint is deprecated.
+
+        To continue getting this data, switch to the
+        summary by vertical endpoint.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -335,78 +358,92 @@ def locations(self) -> AsyncLocationsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncTopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTopResourceWithStreamingResponse(self)
 
     async def attacks(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        limit_direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        limit_per_location: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN_MAX"] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        limit_direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        limit_per_location: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        magnitude: Literal["MITIGATED_BYTES", "MITIGATED_ATTACKS"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopAttacksResponse:
-        """Get the top attacks from origin to target location.
+        """Retrieves the top layer 3 attacks from origin to target location.
 
-        Values are a percentage out
-        of the total layer 3 attacks (with billing country). You can optionally limit
-        the number of attacks per origin/target location (useful if all the top attacks
-        are from or to the same location).
+        Values are a
+        percentage out of the total layer 3 attacks (with billing country). You can
+        optionally limit the number of attacks by origin/target location (useful if all
+        the top attacks are from or to the same location).
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          limit_direction: Array of attack origin/target location attack limits. Together with
-              `limitPerLocation`, limits how many objects will be fetched per origin/target
+          limit_direction: Specifies whether the `limitPerLocation` applies to the source or target
               location.
 
-          limit_per_location: Limit the number of attacks per origin/target (refer to `limitDirection`
+          limit_per_location: Limits the number of attacks per origin/target (refer to `limitDirection`
               parameter) location.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          magnitude: Orders results based on attack magnitude, defined by total mitigated bytes or
+              total mitigated attacks.
 
-          normalization: Normalization method applied. Refer to
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -435,6 +472,7 @@ async def attacks(
                         "limit_direction": limit_direction,
                         "limit_per_location": limit_per_location,
                         "location": location,
+                        "magnitude": magnitude,
                         "name": name,
                         "normalization": normalization,
                         "protocol": protocol,
@@ -446,55 +484,60 @@ async def attacks(
             cast_to=cast(Type[TopAttacksResponse], ResultWrapper[TopAttacksResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/summary_v2/) instead."
+    )
     async def industry(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopIndustryResponse:
-        """
-        Get the Industry of attacks.
+        """This endpoint is deprecated.
+
+        To continue getting this data, switch to the
+        summary by industry endpoint.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -531,55 +574,60 @@ async def industry(
             cast_to=cast(Type[TopIndustryResponse], ResultWrapper[TopIndustryResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 3 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer3/methods/summary_v2/) instead."
+    )
     async def vertical(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopVerticalResponse:
-        """
-        Get the Verticals of attacks.
+        """This endpoint is deprecated.
+
+        To continue getting this data, switch to the
+        summary by vertical endpoint.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          protocol: Array of L3/4 attack types.
+          protocol: Filters the results by layer 3/4 protocol.
 
           extra_headers: Send extra headers
 
@@ -624,11 +672,15 @@ def __init__(self, top: TopResource) -> None:
         self.attacks = to_raw_response_wrapper(
             top.attacks,
         )
-        self.industry = to_raw_response_wrapper(
-            top.industry,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                top.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vertical = to_raw_response_wrapper(
-            top.vertical,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                top.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
     @cached_property
@@ -643,11 +695,15 @@ def __init__(self, top: AsyncTopResource) -> None:
         self.attacks = async_to_raw_response_wrapper(
             top.attacks,
         )
-        self.industry = async_to_raw_response_wrapper(
-            top.industry,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                top.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vertical = async_to_raw_response_wrapper(
-            top.vertical,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                top.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
     @cached_property
@@ -662,11 +718,15 @@ def __init__(self, top: TopResource) -> None:
         self.attacks = to_streamed_response_wrapper(
             top.attacks,
         )
-        self.industry = to_streamed_response_wrapper(
-            top.industry,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                top.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vertical = to_streamed_response_wrapper(
-            top.vertical,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                top.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
     @cached_property
@@ -681,11 +741,15 @@ def __init__(self, top: AsyncTopResource) -> None:
         self.attacks = async_to_streamed_response_wrapper(
             top.attacks,
         )
-        self.industry = async_to_streamed_response_wrapper(
-            top.industry,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                top.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vertical = async_to_streamed_response_wrapper(
-            top.vertical,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                top.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
     @cached_property
diff --git a/src/cloudflare/resources/radar/attacks/layer7/layer7.py b/src/cloudflare/resources/radar/attacks/layer7/layer7.py
index 3677d19f359..675d45fe24b 100644
--- a/src/cloudflare/resources/radar/attacks/layer7/layer7.py
+++ b/src/cloudflare/resources/radar/attacks/layer7/layer7.py
@@ -8,14 +8,6 @@
 
 import httpx
 
-from .top import (
-    TopResource,
-    AsyncTopResource,
-    TopResourceWithRawResponse,
-    AsyncTopResourceWithRawResponse,
-    TopResourceWithStreamingResponse,
-    AsyncTopResourceWithStreamingResponse,
-)
 from .summary import (
     SummaryResource,
     AsyncSummaryResource,
@@ -24,12 +16,16 @@
     SummaryResourceWithStreamingResponse,
     AsyncSummaryResourceWithStreamingResponse,
 )
-from .top.top import TopResource, AsyncTopResource
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
+from .top.top import (
+    TopResource,
+    AsyncTopResource,
+    TopResourceWithRawResponse,
+    AsyncTopResourceWithRawResponse,
+    TopResourceWithStreamingResponse,
+    AsyncTopResourceWithStreamingResponse,
 )
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -48,8 +44,14 @@
     TimeseriesGroupsResourceWithStreamingResponse,
     AsyncTimeseriesGroupsResourceWithStreamingResponse,
 )
-from .....types.radar.attacks import layer7_timeseries_params
+from .....types.radar.attacks import (
+    layer7_summary_v2_params,
+    layer7_timeseries_params,
+    layer7_timeseries_groups_v2_params,
+)
+from .....types.radar.attacks.layer7_summary_v2_response import Layer7SummaryV2Response
 from .....types.radar.attacks.layer7_timeseries_response import Layer7TimeseriesResponse
+from .....types.radar.attacks.layer7_timeseries_groups_v2_response import Layer7TimeseriesGroupsV2Response
 
 __all__ = ["Layer7Resource", "AsyncLayer7Resource"]
 
@@ -69,28 +71,197 @@ def top(self) -> TopResource:
 
     @cached_property
     def with_raw_response(self) -> Layer7ResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return Layer7ResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> Layer7ResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return Layer7ResourceWithStreamingResponse(self)
 
-    def timeseries(
+    def summary_v2(
         self,
+        dimension: Literal[
+            "HTTP_METHOD", "HTTP_VERSION", "IP_VERSION", "MANAGED_RULES", "MITIGATION_PRODUCT", "VERTICAL", "INDUSTRY"
+        ],
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        attack: List[
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        http_method: List[
+            Literal[
+                "GET",
+                "POST",
+                "DELETE",
+                "PUT",
+                "HEAD",
+                "PURGE",
+                "OPTIONS",
+                "PROPFIND",
+                "MKCOL",
+                "PATCH",
+                "ACL",
+                "BCOPY",
+                "BDELETE",
+                "BMOVE",
+                "BPROPFIND",
+                "BPROPPATCH",
+                "CHECKIN",
+                "CHECKOUT",
+                "CONNECT",
+                "COPY",
+                "LABEL",
+                "LOCK",
+                "MERGE",
+                "MKACTIVITY",
+                "MKWORKSPACE",
+                "MOVE",
+                "NOTIFY",
+                "ORDERPATCH",
+                "POLL",
+                "PROPPATCH",
+                "REPORT",
+                "SEARCH",
+                "SUBSCRIBE",
+                "TRACE",
+                "UNCHECKOUT",
+                "UNLOCK",
+                "UNSUBSCRIBE",
+                "UPDATE",
+                "VERSIONCONTROL",
+                "BASELINECONTROL",
+                "XMSENUMATTS",
+                "RPC_OUT_DATA",
+                "RPC_IN_DATA",
+                "JSON",
+                "COOK",
+                "TRACK",
+            ]
+        ]
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Layer7SummaryV2Response:
+        """
+        Retrieves the distribution of layer 7 attacks by the specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          http_method: Filters results by HTTP method.
+
+          http_version: Filters results by HTTP version.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          mitigation_product: Filters the results by layer 7 mitigation product.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/attacks/layer7/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "http_method": http_method,
+                        "http_version": http_version,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "mitigation_product": mitigation_product,
+                        "name": name,
+                    },
+                    layer7_summary_v2_params.Layer7SummaryV2Params,
+                ),
+                post_parser=ResultWrapper[Layer7SummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[Layer7SummaryV2Response], ResultWrapper[Layer7SummaryV2Response]),
+        )
+
+    def timeseries(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -141,70 +312,67 @@ def timeseries(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Layer7TimeseriesResponse:
-        """Get a timeseries of Layer 7 attacks.
-
-        Values represent HTTP requests and are
-        normalized using min-max by default.
+        """
+        Retrieves layer 7 attacks over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          attack: This field is deprecated, please use the new `mitigationProduct`.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -226,7 +394,6 @@ def timeseries(
                     {
                         "agg_interval": agg_interval,
                         "asn": asn,
-                        "attack": attack,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -247,6 +414,181 @@ def timeseries(
             cast_to=cast(Type[Layer7TimeseriesResponse], ResultWrapper[Layer7TimeseriesResponse]),
         )
 
+    def timeseries_groups_v2(
+        self,
+        dimension: Literal[
+            "HTTP_METHOD", "HTTP_VERSION", "IP_VERSION", "MANAGED_RULES", "MITIGATION_PRODUCT", "VERTICAL", "INDUSTRY"
+        ],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        http_method: List[
+            Literal[
+                "GET",
+                "POST",
+                "DELETE",
+                "PUT",
+                "HEAD",
+                "PURGE",
+                "OPTIONS",
+                "PROPFIND",
+                "MKCOL",
+                "PATCH",
+                "ACL",
+                "BCOPY",
+                "BDELETE",
+                "BMOVE",
+                "BPROPFIND",
+                "BPROPPATCH",
+                "CHECKIN",
+                "CHECKOUT",
+                "CONNECT",
+                "COPY",
+                "LABEL",
+                "LOCK",
+                "MERGE",
+                "MKACTIVITY",
+                "MKWORKSPACE",
+                "MOVE",
+                "NOTIFY",
+                "ORDERPATCH",
+                "POLL",
+                "PROPPATCH",
+                "REPORT",
+                "SEARCH",
+                "SUBSCRIBE",
+                "TRACE",
+                "UNCHECKOUT",
+                "UNLOCK",
+                "UNSUBSCRIBE",
+                "UPDATE",
+                "VERSIONCONTROL",
+                "BASELINECONTROL",
+                "XMSENUMATTS",
+                "RPC_OUT_DATA",
+                "RPC_IN_DATA",
+                "JSON",
+                "COOK",
+                "TRACK",
+            ]
+        ]
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        mitigation_product: List[
+            Literal[
+                "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
+            ]
+        ]
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Layer7TimeseriesGroupsV2Response:
+        """
+        Retrieves the distribution of layer 7 attacks grouped by dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          http_method: Filters results by HTTP method.
+
+          http_version: Filters results by HTTP version.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          mitigation_product: Filters the results by layer 7 mitigation product.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/attacks/layer7/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "http_method": http_method,
+                        "http_version": http_version,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "mitigation_product": mitigation_product,
+                        "name": name,
+                        "normalization": normalization,
+                    },
+                    layer7_timeseries_groups_v2_params.Layer7TimeseriesGroupsV2Params,
+                ),
+                post_parser=ResultWrapper[Layer7TimeseriesGroupsV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[Layer7TimeseriesGroupsV2Response], ResultWrapper[Layer7TimeseriesGroupsV2Response]),
+        )
+
 
 class AsyncLayer7Resource(AsyncAPIResource):
     @cached_property
@@ -263,28 +605,197 @@ def top(self) -> AsyncTopResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncLayer7ResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLayer7ResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLayer7ResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLayer7ResourceWithStreamingResponse(self)
 
-    async def timeseries(
+    async def summary_v2(
         self,
+        dimension: Literal[
+            "HTTP_METHOD", "HTTP_VERSION", "IP_VERSION", "MANAGED_RULES", "MITIGATION_PRODUCT", "VERTICAL", "INDUSTRY"
+        ],
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        attack: List[
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        http_method: List[
+            Literal[
+                "GET",
+                "POST",
+                "DELETE",
+                "PUT",
+                "HEAD",
+                "PURGE",
+                "OPTIONS",
+                "PROPFIND",
+                "MKCOL",
+                "PATCH",
+                "ACL",
+                "BCOPY",
+                "BDELETE",
+                "BMOVE",
+                "BPROPFIND",
+                "BPROPPATCH",
+                "CHECKIN",
+                "CHECKOUT",
+                "CONNECT",
+                "COPY",
+                "LABEL",
+                "LOCK",
+                "MERGE",
+                "MKACTIVITY",
+                "MKWORKSPACE",
+                "MOVE",
+                "NOTIFY",
+                "ORDERPATCH",
+                "POLL",
+                "PROPPATCH",
+                "REPORT",
+                "SEARCH",
+                "SUBSCRIBE",
+                "TRACE",
+                "UNCHECKOUT",
+                "UNLOCK",
+                "UNSUBSCRIBE",
+                "UPDATE",
+                "VERSIONCONTROL",
+                "BASELINECONTROL",
+                "XMSENUMATTS",
+                "RPC_OUT_DATA",
+                "RPC_IN_DATA",
+                "JSON",
+                "COOK",
+                "TRACK",
+            ]
+        ]
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Layer7SummaryV2Response:
+        """
+        Retrieves the distribution of layer 7 attacks by the specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          http_method: Filters results by HTTP method.
+
+          http_version: Filters results by HTTP version.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          mitigation_product: Filters the results by layer 7 mitigation product.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/attacks/layer7/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "http_method": http_method,
+                        "http_version": http_version,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "mitigation_product": mitigation_product,
+                        "name": name,
+                    },
+                    layer7_summary_v2_params.Layer7SummaryV2Params,
+                ),
+                post_parser=ResultWrapper[Layer7SummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[Layer7SummaryV2Response], ResultWrapper[Layer7SummaryV2Response]),
+        )
+
+    async def timeseries(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -335,70 +846,67 @@ async def timeseries(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Layer7TimeseriesResponse:
-        """Get a timeseries of Layer 7 attacks.
-
-        Values represent HTTP requests and are
-        normalized using min-max by default.
+        """
+        Retrieves layer 7 attacks over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          attack: This field is deprecated, please use the new `mitigationProduct`.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -420,7 +928,6 @@ async def timeseries(
                     {
                         "agg_interval": agg_interval,
                         "asn": asn,
-                        "attack": attack,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
@@ -441,14 +948,195 @@ async def timeseries(
             cast_to=cast(Type[Layer7TimeseriesResponse], ResultWrapper[Layer7TimeseriesResponse]),
         )
 
+    async def timeseries_groups_v2(
+        self,
+        dimension: Literal[
+            "HTTP_METHOD", "HTTP_VERSION", "IP_VERSION", "MANAGED_RULES", "MITIGATION_PRODUCT", "VERTICAL", "INDUSTRY"
+        ],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        http_method: List[
+            Literal[
+                "GET",
+                "POST",
+                "DELETE",
+                "PUT",
+                "HEAD",
+                "PURGE",
+                "OPTIONS",
+                "PROPFIND",
+                "MKCOL",
+                "PATCH",
+                "ACL",
+                "BCOPY",
+                "BDELETE",
+                "BMOVE",
+                "BPROPFIND",
+                "BPROPPATCH",
+                "CHECKIN",
+                "CHECKOUT",
+                "CONNECT",
+                "COPY",
+                "LABEL",
+                "LOCK",
+                "MERGE",
+                "MKACTIVITY",
+                "MKWORKSPACE",
+                "MOVE",
+                "NOTIFY",
+                "ORDERPATCH",
+                "POLL",
+                "PROPPATCH",
+                "REPORT",
+                "SEARCH",
+                "SUBSCRIBE",
+                "TRACE",
+                "UNCHECKOUT",
+                "UNLOCK",
+                "UNSUBSCRIBE",
+                "UPDATE",
+                "VERSIONCONTROL",
+                "BASELINECONTROL",
+                "XMSENUMATTS",
+                "RPC_OUT_DATA",
+                "RPC_IN_DATA",
+                "JSON",
+                "COOK",
+                "TRACK",
+            ]
+        ]
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        mitigation_product: List[
+            Literal[
+                "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
+            ]
+        ]
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Layer7TimeseriesGroupsV2Response:
+        """
+        Retrieves the distribution of layer 7 attacks grouped by dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          http_method: Filters results by HTTP method.
+
+          http_version: Filters results by HTTP version.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          mitigation_product: Filters the results by layer 7 mitigation product.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/attacks/layer7/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "http_method": http_method,
+                        "http_version": http_version,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "mitigation_product": mitigation_product,
+                        "name": name,
+                        "normalization": normalization,
+                    },
+                    layer7_timeseries_groups_v2_params.Layer7TimeseriesGroupsV2Params,
+                ),
+                post_parser=ResultWrapper[Layer7TimeseriesGroupsV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[Layer7TimeseriesGroupsV2Response], ResultWrapper[Layer7TimeseriesGroupsV2Response]),
+        )
+
 
 class Layer7ResourceWithRawResponse:
     def __init__(self, layer7: Layer7Resource) -> None:
         self._layer7 = layer7
 
+        self.summary_v2 = to_raw_response_wrapper(
+            layer7.summary_v2,
+        )
         self.timeseries = to_raw_response_wrapper(
             layer7.timeseries,
         )
+        self.timeseries_groups_v2 = to_raw_response_wrapper(
+            layer7.timeseries_groups_v2,
+        )
 
     @cached_property
     def summary(self) -> SummaryResourceWithRawResponse:
@@ -467,9 +1155,15 @@ class AsyncLayer7ResourceWithRawResponse:
     def __init__(self, layer7: AsyncLayer7Resource) -> None:
         self._layer7 = layer7
 
+        self.summary_v2 = async_to_raw_response_wrapper(
+            layer7.summary_v2,
+        )
         self.timeseries = async_to_raw_response_wrapper(
             layer7.timeseries,
         )
+        self.timeseries_groups_v2 = async_to_raw_response_wrapper(
+            layer7.timeseries_groups_v2,
+        )
 
     @cached_property
     def summary(self) -> AsyncSummaryResourceWithRawResponse:
@@ -488,9 +1182,15 @@ class Layer7ResourceWithStreamingResponse:
     def __init__(self, layer7: Layer7Resource) -> None:
         self._layer7 = layer7
 
+        self.summary_v2 = to_streamed_response_wrapper(
+            layer7.summary_v2,
+        )
         self.timeseries = to_streamed_response_wrapper(
             layer7.timeseries,
         )
+        self.timeseries_groups_v2 = to_streamed_response_wrapper(
+            layer7.timeseries_groups_v2,
+        )
 
     @cached_property
     def summary(self) -> SummaryResourceWithStreamingResponse:
@@ -509,9 +1209,15 @@ class AsyncLayer7ResourceWithStreamingResponse:
     def __init__(self, layer7: AsyncLayer7Resource) -> None:
         self._layer7 = layer7
 
+        self.summary_v2 = async_to_streamed_response_wrapper(
+            layer7.summary_v2,
+        )
         self.timeseries = async_to_streamed_response_wrapper(
             layer7.timeseries,
         )
+        self.timeseries_groups_v2 = async_to_streamed_response_wrapper(
+            layer7.timeseries_groups_v2,
+        )
 
     @cached_property
     def summary(self) -> AsyncSummaryResourceWithStreamingResponse:
diff --git a/src/cloudflare/resources/radar/attacks/layer7/summary.py b/src/cloudflare/resources/radar/attacks/layer7/summary.py
index 8eaccf847dd..d3215e11321 100644
--- a/src/cloudflare/resources/radar/attacks/layer7/summary.py
+++ b/src/cloudflare/resources/radar/attacks/layer7/summary.py
@@ -2,17 +2,15 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import List, Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -24,14 +22,16 @@
 from ....._wrappers import ResultWrapper
 from ....._base_client import make_request_options
 from .....types.radar.attacks.layer7 import (
-    summary_get_params,
+    summary_industry_params,
+    summary_vertical_params,
     summary_ip_version_params,
     summary_http_method_params,
     summary_http_version_params,
     summary_managed_rules_params,
     summary_mitigation_product_params,
 )
-from .....types.radar.attacks.layer7.summary_get_response import SummaryGetResponse
+from .....types.radar.attacks.layer7.summary_industry_response import SummaryIndustryResponse
+from .....types.radar.attacks.layer7.summary_vertical_response import SummaryVerticalResponse
 from .....types.radar.attacks.layer7.summary_ip_version_response import SummaryIPVersionResponse
 from .....types.radar.attacks.layer7.summary_http_method_response import SummaryHTTPMethodResponse
 from .....types.radar.attacks.layer7.summary_http_version_response import SummaryHTTPVersionResponse
@@ -44,57 +44,91 @@
 class SummaryResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SummaryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SummaryResourceWithStreamingResponse(self)
 
-    def get(
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/summary_v2/) instead."
+    )
+    def http_method(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        mitigation_product: List[
+            Literal[
+                "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
+            ]
+        ]
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SummaryGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryHTTPMethodResponse:
         """
-        Percentage distribution of mitigation techniques in Layer 7 attacks.
+        Retrieves the distribution of layer 7 attacks by HTTP method.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          http_version: Filters results by HTTP version.
 
-          name: Array of names that will be used to name the series in responses.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          mitigation_product: Filters the results by layer 7 mitigation product.
+
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -105,7 +139,7 @@ def get(
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get(
-            "/radar/attacks/layer7/summary",
+            "/radar/attacks/layer7/summary/http_method",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -119,75 +153,133 @@ def get(
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "http_version": http_version,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
+                        "mitigation_product": mitigation_product,
                         "name": name,
                     },
-                    summary_get_params.SummaryGetParams,
+                    summary_http_method_params.SummaryHTTPMethodParams,
                 ),
-                post_parser=ResultWrapper[SummaryGetResponse]._unwrapper,
+                post_parser=ResultWrapper[SummaryHTTPMethodResponse]._unwrapper,
             ),
-            cast_to=cast(Type[SummaryGetResponse], ResultWrapper[SummaryGetResponse]),
+            cast_to=cast(Type[SummaryHTTPMethodResponse], ResultWrapper[SummaryHTTPMethodResponse]),
         )
 
-    def http_method(
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/summary_v2/) instead."
+    )
+    def http_version(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        http_method: List[
+            Literal[
+                "GET",
+                "POST",
+                "DELETE",
+                "PUT",
+                "HEAD",
+                "PURGE",
+                "OPTIONS",
+                "PROPFIND",
+                "MKCOL",
+                "PATCH",
+                "ACL",
+                "BCOPY",
+                "BDELETE",
+                "BMOVE",
+                "BPROPFIND",
+                "BPROPPATCH",
+                "CHECKIN",
+                "CHECKOUT",
+                "CONNECT",
+                "COPY",
+                "LABEL",
+                "LOCK",
+                "MERGE",
+                "MKACTIVITY",
+                "MKWORKSPACE",
+                "MOVE",
+                "NOTIFY",
+                "ORDERPATCH",
+                "POLL",
+                "PROPPATCH",
+                "REPORT",
+                "SEARCH",
+                "SUBSCRIBE",
+                "TRACE",
+                "UNCHECKOUT",
+                "UNLOCK",
+                "UNSUBSCRIBE",
+                "UPDATE",
+                "VERSIONCONTROL",
+                "BASELINECONTROL",
+                "XMSENUMATTS",
+                "RPC_OUT_DATA",
+                "RPC_IN_DATA",
+                "JSON",
+                "COOK",
+                "TRACK",
+            ]
+        ]
+        | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SummaryHTTPMethodResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryHTTPVersionResponse:
         """
-        Percentage distribution of attacks by http method used.
+        Retrieves the distribution of layer 7 attacks by HTTP version.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_version: Filter for http version.
+          http_method: Filters results by HTTP method.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -198,7 +290,7 @@ def http_method(
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get(
-            "/radar/attacks/layer7/summary/http_method",
+            "/radar/attacks/layer7/summary/http_version",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -212,28 +304,31 @@ def http_method(
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
-                        "http_version": http_version,
+                        "http_method": http_method,
                         "ip_version": ip_version,
                         "location": location,
                         "mitigation_product": mitigation_product,
                         "name": name,
                     },
-                    summary_http_method_params.SummaryHTTPMethodParams,
+                    summary_http_version_params.SummaryHTTPVersionParams,
                 ),
-                post_parser=ResultWrapper[SummaryHTTPMethodResponse]._unwrapper,
+                post_parser=ResultWrapper[SummaryHTTPVersionResponse]._unwrapper,
             ),
-            cast_to=cast(Type[SummaryHTTPMethodResponse], ResultWrapper[SummaryHTTPMethodResponse]),
+            cast_to=cast(Type[SummaryHTTPVersionResponse], ResultWrapper[SummaryHTTPVersionResponse]),
         )
 
-    def http_version(
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/summary_v2/) instead."
+    )
+    def industry(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -284,56 +379,65 @@ def http_version(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SummaryHTTPVersionResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryIndustryResponse:
         """
-        Percentage distribution of attacks by http version used.
+        Retrieves the distribution of layer 7 attacks by targeted industry.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          ip_version: Filter for ip version.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          mitigation_product: Array of L7 mitigation products.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          mitigation_product: Filters the results by layer 7 mitigation product.
+
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -344,7 +448,7 @@ def http_version(
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get(
-            "/radar/attacks/layer7/summary/http_version",
+            "/radar/attacks/layer7/summary/industry",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -359,27 +463,32 @@ def http_version(
                         "date_start": date_start,
                         "format": format,
                         "http_method": http_method,
+                        "http_version": http_version,
                         "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "mitigation_product": mitigation_product,
                         "name": name,
                     },
-                    summary_http_version_params.SummaryHTTPVersionParams,
+                    summary_industry_params.SummaryIndustryParams,
                 ),
-                post_parser=ResultWrapper[SummaryHTTPVersionResponse]._unwrapper,
+                post_parser=ResultWrapper[SummaryIndustryResponse]._unwrapper,
             ),
-            cast_to=cast(Type[SummaryHTTPVersionResponse], ResultWrapper[SummaryHTTPVersionResponse]),
+            cast_to=cast(Type[SummaryIndustryResponse], ResultWrapper[SummaryIndustryResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/summary_v2/) instead."
+    )
     def ip_version(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -430,56 +539,57 @@ def ip_version(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryIPVersionResponse:
         """
-        Percentage distribution of attacks by ip version used.
+        Retrieves the distribution of layer 7 attacks by IP version.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -517,15 +627,18 @@ def ip_version(
             cast_to=cast(Type[SummaryIPVersionResponse], ResultWrapper[SummaryIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/summary_v2/) instead."
+    )
     def managed_rules(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -576,59 +689,65 @@ def managed_rules(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryManagedRulesResponse:
         """
-        Percentage distribution of attacks by managed rules used.
+        Retrieves the distribution of layer 7 attacks by managed rules.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          mitigation_product: Array of L7 mitigation products.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          mitigation_product: Filters the results by layer 7 mitigation product.
+
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -656,6 +775,7 @@ def managed_rules(
                         "http_method": http_method,
                         "http_version": http_version,
                         "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "mitigation_product": mitigation_product,
                         "name": name,
@@ -667,15 +787,18 @@ def managed_rules(
             cast_to=cast(Type[SummaryManagedRulesResponse], ResultWrapper[SummaryManagedRulesResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/summary_v2/) instead."
+    )
     def mitigation_product(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -726,51 +849,57 @@ def mitigation_product(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryMitigationProductResponse:
         """
-        Percentage distribution of attacks by mitigation product used.
+        Retrieves the distribution of layer 7 attacks by mitigation product.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          http_method: Filters results by HTTP method.
 
-          http_method: Filter for http method.
+          http_version: Filters results by HTTP version.
 
-          http_version: Filter for http version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          ip_version: Filter for ip version.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -798,6 +927,7 @@ def mitigation_product(
                         "http_method": http_method,
                         "http_version": http_version,
                         "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
                     },
@@ -808,61 +938,127 @@ def mitigation_product(
             cast_to=cast(Type[SummaryMitigationProductResponse], ResultWrapper[SummaryMitigationProductResponse]),
         )
 
-
-class AsyncSummaryResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncSummaryResourceWithRawResponse:
-        return AsyncSummaryResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncSummaryResourceWithStreamingResponse:
-        return AsyncSummaryResourceWithStreamingResponse(self)
-
-    async def get(
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/summary_v2/) instead."
+    )
+    def vertical(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        http_method: List[
+            Literal[
+                "GET",
+                "POST",
+                "DELETE",
+                "PUT",
+                "HEAD",
+                "PURGE",
+                "OPTIONS",
+                "PROPFIND",
+                "MKCOL",
+                "PATCH",
+                "ACL",
+                "BCOPY",
+                "BDELETE",
+                "BMOVE",
+                "BPROPFIND",
+                "BPROPPATCH",
+                "CHECKIN",
+                "CHECKOUT",
+                "CONNECT",
+                "COPY",
+                "LABEL",
+                "LOCK",
+                "MERGE",
+                "MKACTIVITY",
+                "MKWORKSPACE",
+                "MOVE",
+                "NOTIFY",
+                "ORDERPATCH",
+                "POLL",
+                "PROPPATCH",
+                "REPORT",
+                "SEARCH",
+                "SUBSCRIBE",
+                "TRACE",
+                "UNCHECKOUT",
+                "UNLOCK",
+                "UNSUBSCRIBE",
+                "UPDATE",
+                "VERSIONCONTROL",
+                "BASELINECONTROL",
+                "XMSENUMATTS",
+                "RPC_OUT_DATA",
+                "RPC_IN_DATA",
+                "JSON",
+                "COOK",
+                "TRACK",
+            ]
+        ]
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        mitigation_product: List[
+            Literal[
+                "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
+            ]
+        ]
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SummaryGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryVerticalResponse:
         """
-        Percentage distribution of mitigation techniques in Layer 7 attacks.
+        Retrieves the distribution of layer 7 attacks by targeted vertical.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
 
-          date_start: Array of datetimes to filter the start of a series.
+          http_method: Filters results by HTTP method.
 
-          format: Format results are returned in.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          mitigation_product: Filters the results by layer 7 mitigation product.
+
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -872,14 +1068,14 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return await self._get(
-            "/radar/attacks/layer7/summary",
+        return self._get(
+            "/radar/attacks/layer7/summary/vertical",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=await async_maybe_transform(
+                query=maybe_transform(
                     {
                         "asn": asn,
                         "continent": continent,
@@ -887,75 +1083,110 @@ async def get(
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "http_method": http_method,
+                        "http_version": http_version,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
+                        "mitigation_product": mitigation_product,
                         "name": name,
                     },
-                    summary_get_params.SummaryGetParams,
+                    summary_vertical_params.SummaryVerticalParams,
                 ),
-                post_parser=ResultWrapper[SummaryGetResponse]._unwrapper,
+                post_parser=ResultWrapper[SummaryVerticalResponse]._unwrapper,
             ),
-            cast_to=cast(Type[SummaryGetResponse], ResultWrapper[SummaryGetResponse]),
+            cast_to=cast(Type[SummaryVerticalResponse], ResultWrapper[SummaryVerticalResponse]),
         )
 
+
+class AsyncSummaryResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSummaryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSummaryResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/summary_v2/) instead."
+    )
     async def http_method(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryHTTPMethodResponse:
         """
-        Percentage distribution of attacks by http method used.
+        Retrieves the distribution of layer 7 attacks by HTTP method.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          mitigation_product: Array of L7 mitigation products.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          mitigation_product: Filters the results by layer 7 mitigation product.
+
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -982,6 +1213,7 @@ async def http_method(
                         "format": format,
                         "http_version": http_version,
                         "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "mitigation_product": mitigation_product,
                         "name": name,
@@ -993,15 +1225,18 @@ async def http_method(
             cast_to=cast(Type[SummaryHTTPMethodResponse], ResultWrapper[SummaryHTTPMethodResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/summary_v2/) instead."
+    )
     async def http_version(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -1052,56 +1287,57 @@ async def http_version(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryHTTPVersionResponse:
         """
-        Percentage distribution of attacks by http version used.
+        Retrieves the distribution of layer 7 attacks by HTTP version.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -1139,15 +1375,178 @@ async def http_version(
             cast_to=cast(Type[SummaryHTTPVersionResponse], ResultWrapper[SummaryHTTPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/summary_v2/) instead."
+    )
+    async def industry(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        http_method: List[
+            Literal[
+                "GET",
+                "POST",
+                "DELETE",
+                "PUT",
+                "HEAD",
+                "PURGE",
+                "OPTIONS",
+                "PROPFIND",
+                "MKCOL",
+                "PATCH",
+                "ACL",
+                "BCOPY",
+                "BDELETE",
+                "BMOVE",
+                "BPROPFIND",
+                "BPROPPATCH",
+                "CHECKIN",
+                "CHECKOUT",
+                "CONNECT",
+                "COPY",
+                "LABEL",
+                "LOCK",
+                "MERGE",
+                "MKACTIVITY",
+                "MKWORKSPACE",
+                "MOVE",
+                "NOTIFY",
+                "ORDERPATCH",
+                "POLL",
+                "PROPPATCH",
+                "REPORT",
+                "SEARCH",
+                "SUBSCRIBE",
+                "TRACE",
+                "UNCHECKOUT",
+                "UNLOCK",
+                "UNSUBSCRIBE",
+                "UPDATE",
+                "VERSIONCONTROL",
+                "BASELINECONTROL",
+                "XMSENUMATTS",
+                "RPC_OUT_DATA",
+                "RPC_IN_DATA",
+                "JSON",
+                "COOK",
+                "TRACK",
+            ]
+        ]
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        mitigation_product: List[
+            Literal[
+                "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
+            ]
+        ]
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryIndustryResponse:
+        """
+        Retrieves the distribution of layer 7 attacks by targeted industry.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          http_method: Filters results by HTTP method.
+
+          http_version: Filters results by HTTP version.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          mitigation_product: Filters the results by layer 7 mitigation product.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/attacks/layer7/summary/industry",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "http_method": http_method,
+                        "http_version": http_version,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "mitigation_product": mitigation_product,
+                        "name": name,
+                    },
+                    summary_industry_params.SummaryIndustryParams,
+                ),
+                post_parser=ResultWrapper[SummaryIndustryResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryIndustryResponse], ResultWrapper[SummaryIndustryResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/summary_v2/) instead."
+    )
     async def ip_version(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -1198,56 +1597,57 @@ async def ip_version(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryIPVersionResponse:
         """
-        Percentage distribution of attacks by ip version used.
+        Retrieves the distribution of layer 7 attacks by IP version.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -1285,15 +1685,18 @@ async def ip_version(
             cast_to=cast(Type[SummaryIPVersionResponse], ResultWrapper[SummaryIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/summary_v2/) instead."
+    )
     async def managed_rules(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -1344,59 +1747,65 @@ async def managed_rules(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryManagedRulesResponse:
         """
-        Percentage distribution of attacks by managed rules used.
+        Retrieves the distribution of layer 7 attacks by managed rules.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          http_method: Filters results by HTTP method.
 
-          http_method: Filter for http method.
+          http_version: Filters results by HTTP version.
 
-          http_version: Filter for http version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          ip_version: Filter for ip version.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -1424,6 +1833,7 @@ async def managed_rules(
                         "http_method": http_method,
                         "http_version": http_version,
                         "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "mitigation_product": mitigation_product,
                         "name": name,
@@ -1435,15 +1845,18 @@ async def managed_rules(
             cast_to=cast(Type[SummaryManagedRulesResponse], ResultWrapper[SummaryManagedRulesResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/summary_v2/) instead."
+    )
     async def mitigation_product(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -1494,51 +1907,57 @@ async def mitigation_product(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryMitigationProductResponse:
         """
-        Percentage distribution of attacks by mitigation product used.
+        Retrieves the distribution of layer 7 attacks by mitigation product.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -1566,6 +1985,7 @@ async def mitigation_product(
                         "http_method": http_method,
                         "http_version": http_version,
                         "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
                     },
@@ -1576,28 +1996,205 @@ async def mitigation_product(
             cast_to=cast(Type[SummaryMitigationProductResponse], ResultWrapper[SummaryMitigationProductResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/summary_v2/) instead."
+    )
+    async def vertical(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        http_method: List[
+            Literal[
+                "GET",
+                "POST",
+                "DELETE",
+                "PUT",
+                "HEAD",
+                "PURGE",
+                "OPTIONS",
+                "PROPFIND",
+                "MKCOL",
+                "PATCH",
+                "ACL",
+                "BCOPY",
+                "BDELETE",
+                "BMOVE",
+                "BPROPFIND",
+                "BPROPPATCH",
+                "CHECKIN",
+                "CHECKOUT",
+                "CONNECT",
+                "COPY",
+                "LABEL",
+                "LOCK",
+                "MERGE",
+                "MKACTIVITY",
+                "MKWORKSPACE",
+                "MOVE",
+                "NOTIFY",
+                "ORDERPATCH",
+                "POLL",
+                "PROPPATCH",
+                "REPORT",
+                "SEARCH",
+                "SUBSCRIBE",
+                "TRACE",
+                "UNCHECKOUT",
+                "UNLOCK",
+                "UNSUBSCRIBE",
+                "UPDATE",
+                "VERSIONCONTROL",
+                "BASELINECONTROL",
+                "XMSENUMATTS",
+                "RPC_OUT_DATA",
+                "RPC_IN_DATA",
+                "JSON",
+                "COOK",
+                "TRACK",
+            ]
+        ]
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        mitigation_product: List[
+            Literal[
+                "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
+            ]
+        ]
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryVerticalResponse:
+        """
+        Retrieves the distribution of layer 7 attacks by targeted vertical.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          http_method: Filters results by HTTP method.
+
+          http_version: Filters results by HTTP version.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          mitigation_product: Filters the results by layer 7 mitigation product.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/attacks/layer7/summary/vertical",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "http_method": http_method,
+                        "http_version": http_version,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "mitigation_product": mitigation_product,
+                        "name": name,
+                    },
+                    summary_vertical_params.SummaryVerticalParams,
+                ),
+                post_parser=ResultWrapper[SummaryVerticalResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryVerticalResponse], ResultWrapper[SummaryVerticalResponse]),
+        )
+
 
 class SummaryResourceWithRawResponse:
     def __init__(self, summary: SummaryResource) -> None:
         self._summary = summary
 
-        self.get = to_raw_response_wrapper(
-            summary.get,
+        self.http_method = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.http_method,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.http_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.http_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_method = to_raw_response_wrapper(
-            summary.http_method,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_version = to_raw_response_wrapper(
-            summary.http_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_raw_response_wrapper(
-            summary.ip_version,
+        self.managed_rules = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.managed_rules,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.managed_rules = to_raw_response_wrapper(
-            summary.managed_rules,
+        self.mitigation_product = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.mitigation_product,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.mitigation_product = to_raw_response_wrapper(
-            summary.mitigation_product,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1605,23 +2202,40 @@ class AsyncSummaryResourceWithRawResponse:
     def __init__(self, summary: AsyncSummaryResource) -> None:
         self._summary = summary
 
-        self.get = async_to_raw_response_wrapper(
-            summary.get,
+        self.http_method = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.http_method,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_method = async_to_raw_response_wrapper(
-            summary.http_method,
+        self.http_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.http_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_version = async_to_raw_response_wrapper(
-            summary.http_version,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_raw_response_wrapper(
-            summary.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.managed_rules = async_to_raw_response_wrapper(
-            summary.managed_rules,
+        self.managed_rules = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.managed_rules,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.mitigation_product = async_to_raw_response_wrapper(
-            summary.mitigation_product,
+        self.mitigation_product = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.mitigation_product,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1629,23 +2243,40 @@ class SummaryResourceWithStreamingResponse:
     def __init__(self, summary: SummaryResource) -> None:
         self._summary = summary
 
-        self.get = to_streamed_response_wrapper(
-            summary.get,
+        self.http_method = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.http_method,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.http_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.http_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_method = to_streamed_response_wrapper(
-            summary.http_method,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_version = to_streamed_response_wrapper(
-            summary.http_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_streamed_response_wrapper(
-            summary.ip_version,
+        self.managed_rules = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.managed_rules,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.managed_rules = to_streamed_response_wrapper(
-            summary.managed_rules,
+        self.mitigation_product = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.mitigation_product,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.mitigation_product = to_streamed_response_wrapper(
-            summary.mitigation_product,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1653,21 +2284,38 @@ class AsyncSummaryResourceWithStreamingResponse:
     def __init__(self, summary: AsyncSummaryResource) -> None:
         self._summary = summary
 
-        self.get = async_to_streamed_response_wrapper(
-            summary.get,
+        self.http_method = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.http_method,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.http_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.http_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_method = async_to_streamed_response_wrapper(
-            summary.http_method,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_version = async_to_streamed_response_wrapper(
-            summary.http_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_streamed_response_wrapper(
-            summary.ip_version,
+        self.managed_rules = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.managed_rules,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.managed_rules = async_to_streamed_response_wrapper(
-            summary.managed_rules,
+        self.mitigation_product = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.mitigation_product,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.mitigation_product = async_to_streamed_response_wrapper(
-            summary.mitigation_product,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py b/src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py
index 47260ea2ee2..0928b6cb194 100644
--- a/src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py
+++ b/src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py
@@ -2,17 +2,15 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import List, Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -24,7 +22,6 @@
 from ....._wrappers import ResultWrapper
 from ....._base_client import make_request_options
 from .....types.radar.attacks.layer7 import (
-    timeseries_group_get_params,
     timeseries_group_industry_params,
     timeseries_group_vertical_params,
     timeseries_group_ip_version_params,
@@ -33,7 +30,6 @@
     timeseries_group_managed_rules_params,
     timeseries_group_mitigation_product_params,
 )
-from .....types.radar.attacks.layer7.timeseries_group_get_response import TimeseriesGroupGetResponse
 from .....types.radar.attacks.layer7.timeseries_group_industry_response import TimeseriesGroupIndustryResponse
 from .....types.radar.attacks.layer7.timeseries_group_vertical_response import TimeseriesGroupVerticalResponse
 from .....types.radar.attacks.layer7.timeseries_group_ip_version_response import TimeseriesGroupIPVersionResponse
@@ -50,165 +46,99 @@
 class TimeseriesGroupsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TimeseriesGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TimeseriesGroupsResourceWithStreamingResponse:
-        return TimeseriesGroupsResourceWithStreamingResponse(self)
-
-    def get(
-        self,
-        *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TimeseriesGroupGetResponse:
         """
-        Get a time series of the percentual distribution of mitigation techniques, over
-        time.
-
-        Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
-              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
-
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
-
-          date_end: End of the date range (inclusive).
-
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
-
-          date_start: Array of datetimes to filter the start of a series.
-
-          format: Format results are returned in.
-
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
-
-          name: Array of names that will be used to name the series in responses.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
         """
-        return self._get(
-            "/radar/attacks/layer7/timeseries_groups",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "agg_interval": agg_interval,
-                        "asn": asn,
-                        "continent": continent,
-                        "date_end": date_end,
-                        "date_range": date_range,
-                        "date_start": date_start,
-                        "format": format,
-                        "location": location,
-                        "name": name,
-                    },
-                    timeseries_group_get_params.TimeseriesGroupGetParams,
-                ),
-                post_parser=ResultWrapper[TimeseriesGroupGetResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[TimeseriesGroupGetResponse], ResultWrapper[TimeseriesGroupGetResponse]),
-        )
+        return TimeseriesGroupsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/timeseries_groups_v2/) instead."
+    )
     def http_method(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupHTTPMethodResponse:
         """
-        Percentage distribution of attacks by http method used over time.
+        Retrieves the distribution of layer 7 attacks by HTTP method over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          http_version: Filters results by HTTP version.
 
-          http_version: Filter for http version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          ip_version: Filter for ip version.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -237,6 +167,7 @@ def http_method(
                         "format": format,
                         "http_version": http_version,
                         "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "mitigation_product": mitigation_product,
                         "name": name,
@@ -249,16 +180,19 @@ def http_method(
             cast_to=cast(Type[TimeseriesGroupHTTPMethodResponse], ResultWrapper[TimeseriesGroupHTTPMethodResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/timeseries_groups_v2/) instead."
+    )
     def http_version(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -309,63 +243,64 @@ def http_version(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupHTTPVersionResponse:
         """
-        Percentage distribution of attacks by http version used over time.
+        Retrieves the distribution of layer 7 attacks by HTTP version over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -406,16 +341,19 @@ def http_version(
             cast_to=cast(Type[TimeseriesGroupHTTPVersionResponse], ResultWrapper[TimeseriesGroupHTTPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/timeseries_groups_v2/) instead."
+    )
     def industry(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -466,70 +404,72 @@ def industry(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit_per_group: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupIndustryResponse:
         """
-        Percentage distribution of attacks by industry used over time.
+        Retrieves the distribution of layer 7 attacks by targeted industry over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit_per_group: Limit the number of objects (eg browsers, verticals, etc) to the top items over
-              the time range.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -572,16 +512,19 @@ def industry(
             cast_to=cast(Type[TimeseriesGroupIndustryResponse], ResultWrapper[TimeseriesGroupIndustryResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/timeseries_groups_v2/) instead."
+    )
     def ip_version(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -632,63 +575,64 @@ def ip_version(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupIPVersionResponse:
         """
-        Percentage distribution of attacks by ip version used over time.
+        Retrieves the distribution of layer 7 attacks by IP version used over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -729,16 +673,19 @@ def ip_version(
             cast_to=cast(Type[TimeseriesGroupIPVersionResponse], ResultWrapper[TimeseriesGroupIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/timeseries_groups_v2/) instead."
+    )
     def managed_rules(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -789,66 +736,72 @@ def managed_rules(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupManagedRulesResponse:
         """
-        Percentage distribution of attacks by managed rules used over time.
+        Retrieves the distribution of layer 7 attacks by managed rules over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          http_method: Filters results by HTTP method.
 
-          http_method: Filter for http method.
+          http_version: Filters results by HTTP version.
 
-          http_version: Filter for http version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          ip_version: Filter for ip version.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -878,6 +831,7 @@ def managed_rules(
                         "http_method": http_method,
                         "http_version": http_version,
                         "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "mitigation_product": mitigation_product,
                         "name": name,
@@ -890,16 +844,19 @@ def managed_rules(
             cast_to=cast(Type[TimeseriesGroupManagedRulesResponse], ResultWrapper[TimeseriesGroupManagedRulesResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/timeseries_groups_v2/) instead."
+    )
     def mitigation_product(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -950,58 +907,64 @@ def mitigation_product(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupMitigationProductResponse:
         """
-        Percentage distribution of attacks by mitigation product used over time.
+        Retrieves the distribution of layer 7 attacks by mitigation product over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          http_method: Filters results by HTTP method.
 
-          http_method: Filter for http method.
+          http_version: Filters results by HTTP version.
 
-          http_version: Filter for http version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          ip_version: Filter for ip version.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -1031,6 +994,7 @@ def mitigation_product(
                         "http_method": http_method,
                         "http_version": http_version,
                         "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
                         "normalization": normalization,
@@ -1044,16 +1008,19 @@ def mitigation_product(
             ),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/timeseries_groups_v2/) instead."
+    )
     def vertical(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -1104,70 +1071,72 @@ def vertical(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit_per_group: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupVerticalResponse:
         """
-        Percentage distribution of attacks by vertical used over time.
+        Retrieves the distribution of layer 7 attacks by targeted vertical over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit_per_group: Limit the number of objects (eg browsers, verticals, etc) to the top items over
-              the time range.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -1214,165 +1183,99 @@ def vertical(
 class AsyncTimeseriesGroupsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTimeseriesGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTimeseriesGroupsResourceWithStreamingResponse:
-        return AsyncTimeseriesGroupsResourceWithStreamingResponse(self)
-
-    async def get(
-        self,
-        *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TimeseriesGroupGetResponse:
         """
-        Get a time series of the percentual distribution of mitigation techniques, over
-        time.
-
-        Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
-              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
-
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
-
-          date_end: End of the date range (inclusive).
-
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
-
-          date_start: Array of datetimes to filter the start of a series.
-
-          format: Format results are returned in.
-
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
-
-          name: Array of names that will be used to name the series in responses.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
         """
-        return await self._get(
-            "/radar/attacks/layer7/timeseries_groups",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=await async_maybe_transform(
-                    {
-                        "agg_interval": agg_interval,
-                        "asn": asn,
-                        "continent": continent,
-                        "date_end": date_end,
-                        "date_range": date_range,
-                        "date_start": date_start,
-                        "format": format,
-                        "location": location,
-                        "name": name,
-                    },
-                    timeseries_group_get_params.TimeseriesGroupGetParams,
-                ),
-                post_parser=ResultWrapper[TimeseriesGroupGetResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[TimeseriesGroupGetResponse], ResultWrapper[TimeseriesGroupGetResponse]),
-        )
+        return AsyncTimeseriesGroupsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/timeseries_groups_v2/) instead."
+    )
     async def http_method(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupHTTPMethodResponse:
         """
-        Percentage distribution of attacks by http method used over time.
+        Retrieves the distribution of layer 7 attacks by HTTP method over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          http_version: Filters results by HTTP version.
 
-          http_version: Filter for http version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          ip_version: Filter for ip version.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -1401,6 +1304,7 @@ async def http_method(
                         "format": format,
                         "http_version": http_version,
                         "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "mitigation_product": mitigation_product,
                         "name": name,
@@ -1413,16 +1317,19 @@ async def http_method(
             cast_to=cast(Type[TimeseriesGroupHTTPMethodResponse], ResultWrapper[TimeseriesGroupHTTPMethodResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/timeseries_groups_v2/) instead."
+    )
     async def http_version(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -1473,63 +1380,64 @@ async def http_version(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupHTTPVersionResponse:
         """
-        Percentage distribution of attacks by http version used over time.
+        Retrieves the distribution of layer 7 attacks by HTTP version over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -1570,16 +1478,19 @@ async def http_version(
             cast_to=cast(Type[TimeseriesGroupHTTPVersionResponse], ResultWrapper[TimeseriesGroupHTTPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/timeseries_groups_v2/) instead."
+    )
     async def industry(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -1630,70 +1541,72 @@ async def industry(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit_per_group: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupIndustryResponse:
         """
-        Percentage distribution of attacks by industry used over time.
+        Retrieves the distribution of layer 7 attacks by targeted industry over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit_per_group: Limit the number of objects (eg browsers, verticals, etc) to the top items over
-              the time range.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -1736,16 +1649,19 @@ async def industry(
             cast_to=cast(Type[TimeseriesGroupIndustryResponse], ResultWrapper[TimeseriesGroupIndustryResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/timeseries_groups_v2/) instead."
+    )
     async def ip_version(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -1796,63 +1712,64 @@ async def ip_version(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupIPVersionResponse:
         """
-        Percentage distribution of attacks by ip version used over time.
+        Retrieves the distribution of layer 7 attacks by IP version used over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -1893,16 +1810,19 @@ async def ip_version(
             cast_to=cast(Type[TimeseriesGroupIPVersionResponse], ResultWrapper[TimeseriesGroupIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/timeseries_groups_v2/) instead."
+    )
     async def managed_rules(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -1953,66 +1873,72 @@ async def managed_rules(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupManagedRulesResponse:
         """
-        Percentage distribution of attacks by managed rules used over time.
+        Retrieves the distribution of layer 7 attacks by managed rules over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          http_method: Filters results by HTTP method.
 
-          http_method: Filter for http method.
+          http_version: Filters results by HTTP version.
 
-          http_version: Filter for http version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          ip_version: Filter for ip version.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -2042,6 +1968,7 @@ async def managed_rules(
                         "http_method": http_method,
                         "http_version": http_version,
                         "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "mitigation_product": mitigation_product,
                         "name": name,
@@ -2054,16 +1981,19 @@ async def managed_rules(
             cast_to=cast(Type[TimeseriesGroupManagedRulesResponse], ResultWrapper[TimeseriesGroupManagedRulesResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/timeseries_groups_v2/) instead."
+    )
     async def mitigation_product(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -2114,58 +2044,64 @@ async def mitigation_product(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupMitigationProductResponse:
         """
-        Percentage distribution of attacks by mitigation product used over time.
+        Retrieves the distribution of layer 7 attacks by mitigation product over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          http_method: Filters results by HTTP method.
 
-          http_method: Filter for http method.
+          http_version: Filters results by HTTP version.
 
-          http_version: Filter for http version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          ip_version: Filter for ip version.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -2195,6 +2131,7 @@ async def mitigation_product(
                         "http_method": http_method,
                         "http_version": http_version,
                         "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
                         "normalization": normalization,
@@ -2208,16 +2145,19 @@ async def mitigation_product(
             ),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/timeseries_groups_v2/) instead."
+    )
     async def vertical(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -2268,70 +2208,72 @@ async def vertical(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit_per_group: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupVerticalResponse:
         """
-        Percentage distribution of attacks by vertical used over time.
+        Retrieves the distribution of layer 7 attacks by targeted vertical over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit_per_group: Limit the number of objects (eg browsers, verticals, etc) to the top items over
-              the time range.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -2379,29 +2321,40 @@ class TimeseriesGroupsResourceWithRawResponse:
     def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.get = to_raw_response_wrapper(
-            timeseries_groups.get,
-        )
-        self.http_method = to_raw_response_wrapper(
-            timeseries_groups.http_method,
+        self.http_method = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.http_method,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_version = to_raw_response_wrapper(
-            timeseries_groups.http_version,
+        self.http_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.http_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.industry = to_raw_response_wrapper(
-            timeseries_groups.industry,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_raw_response_wrapper(
-            timeseries_groups.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.managed_rules = to_raw_response_wrapper(
-            timeseries_groups.managed_rules,
+        self.managed_rules = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.managed_rules,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.mitigation_product = to_raw_response_wrapper(
-            timeseries_groups.mitigation_product,
+        self.mitigation_product = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.mitigation_product,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vertical = to_raw_response_wrapper(
-            timeseries_groups.vertical,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -2409,29 +2362,40 @@ class AsyncTimeseriesGroupsResourceWithRawResponse:
     def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.get = async_to_raw_response_wrapper(
-            timeseries_groups.get,
+        self.http_method = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.http_method,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_method = async_to_raw_response_wrapper(
-            timeseries_groups.http_method,
+        self.http_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.http_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_version = async_to_raw_response_wrapper(
-            timeseries_groups.http_version,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.industry = async_to_raw_response_wrapper(
-            timeseries_groups.industry,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_raw_response_wrapper(
-            timeseries_groups.ip_version,
+        self.managed_rules = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.managed_rules,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.managed_rules = async_to_raw_response_wrapper(
-            timeseries_groups.managed_rules,
+        self.mitigation_product = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.mitigation_product,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.mitigation_product = async_to_raw_response_wrapper(
-            timeseries_groups.mitigation_product,
-        )
-        self.vertical = async_to_raw_response_wrapper(
-            timeseries_groups.vertical,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -2439,29 +2403,40 @@ class TimeseriesGroupsResourceWithStreamingResponse:
     def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.get = to_streamed_response_wrapper(
-            timeseries_groups.get,
-        )
-        self.http_method = to_streamed_response_wrapper(
-            timeseries_groups.http_method,
+        self.http_method = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.http_method,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_version = to_streamed_response_wrapper(
-            timeseries_groups.http_version,
+        self.http_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.http_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.industry = to_streamed_response_wrapper(
-            timeseries_groups.industry,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_streamed_response_wrapper(
-            timeseries_groups.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.managed_rules = to_streamed_response_wrapper(
-            timeseries_groups.managed_rules,
+        self.managed_rules = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.managed_rules,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.mitigation_product = to_streamed_response_wrapper(
-            timeseries_groups.mitigation_product,
+        self.mitigation_product = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.mitigation_product,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vertical = to_streamed_response_wrapper(
-            timeseries_groups.vertical,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -2469,27 +2444,38 @@ class AsyncTimeseriesGroupsResourceWithStreamingResponse:
     def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.get = async_to_streamed_response_wrapper(
-            timeseries_groups.get,
-        )
-        self.http_method = async_to_streamed_response_wrapper(
-            timeseries_groups.http_method,
+        self.http_method = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.http_method,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_version = async_to_streamed_response_wrapper(
-            timeseries_groups.http_version,
+        self.http_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.http_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.industry = async_to_streamed_response_wrapper(
-            timeseries_groups.industry,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_streamed_response_wrapper(
-            timeseries_groups.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.managed_rules = async_to_streamed_response_wrapper(
-            timeseries_groups.managed_rules,
+        self.managed_rules = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.managed_rules,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.mitigation_product = async_to_streamed_response_wrapper(
-            timeseries_groups.mitigation_product,
+        self.mitigation_product = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.mitigation_product,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vertical = async_to_streamed_response_wrapper(
-            timeseries_groups.vertical,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/radar/attacks/layer7/top/ases.py b/src/cloudflare/resources/radar/attacks/layer7/top/ases.py
index f43f40bd92f..bc61c790e0c 100644
--- a/src/cloudflare/resources/radar/attacks/layer7/top/ases.py
+++ b/src/cloudflare/resources/radar/attacks/layer7/top/ases.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ......_types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ......_utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ......_types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ......_utils import maybe_transform, async_maybe_transform
 from ......_compat import cached_property
 from ......_resource import SyncAPIResource, AsyncAPIResource
 from ......_response import (
@@ -32,20 +29,31 @@
 class AsesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsesResourceWithStreamingResponse(self)
 
     def origin(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -96,61 +104,61 @@ def origin(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AseOriginResponse:
-        """Get the top origin Autonomous Systems of and by layer 7 attacks.
+        """Retrieves the top origin autonomous systems of layer 7 attacks.
 
-        Values are a
-        percentage out of the total layer 7 attacks. The origin Autonomous Systems is
-        determined by the client IP.
+        Values are
+        percentages of the total layer 7 attacks, with the origin autonomous systems
+        determined by the client IP address.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -193,20 +201,31 @@ def origin(
 class AsyncAsesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncAsesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAsesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAsesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAsesResourceWithStreamingResponse(self)
 
     async def origin(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -257,61 +276,61 @@ async def origin(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AseOriginResponse:
-        """Get the top origin Autonomous Systems of and by layer 7 attacks.
+        """Retrieves the top origin autonomous systems of layer 7 attacks.
 
-        Values are a
-        percentage out of the total layer 7 attacks. The origin Autonomous Systems is
-        determined by the client IP.
+        Values are
+        percentages of the total layer 7 attacks, with the origin autonomous systems
+        determined by the client IP address.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/attacks/layer7/top/locations.py b/src/cloudflare/resources/radar/attacks/layer7/top/locations.py
index 7a7f9f867c7..80bdf41d29a 100644
--- a/src/cloudflare/resources/radar/attacks/layer7/top/locations.py
+++ b/src/cloudflare/resources/radar/attacks/layer7/top/locations.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ......_types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ......_utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ......_types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ......_utils import maybe_transform, async_maybe_transform
 from ......_compat import cached_property
 from ......_resource import SyncAPIResource, AsyncAPIResource
 from ......_response import (
@@ -33,21 +30,32 @@
 class LocationsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> LocationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LocationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LocationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LocationsResourceWithStreamingResponse(self)
 
     def origin(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -98,60 +106,61 @@ def origin(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LocationOriginResponse:
-        """Get the top origin locations of and by layer 7 attacks.
+        """Retrieves the top origin locations of layer 7 attacks.
 
-        Values are a percentage
-        out of the total layer 7 attacks. The origin location is determined by the
-        client IP.
+        Values are percentages of
+        the total layer 7 attacks, with the origin location determined by the client IP
+        address.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -193,111 +202,52 @@ def origin(
     def target(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_method: List[
-            Literal[
-                "GET",
-                "POST",
-                "DELETE",
-                "PUT",
-                "HEAD",
-                "PURGE",
-                "OPTIONS",
-                "PROPFIND",
-                "MKCOL",
-                "PATCH",
-                "ACL",
-                "BCOPY",
-                "BDELETE",
-                "BMOVE",
-                "BPROPFIND",
-                "BPROPPATCH",
-                "CHECKIN",
-                "CHECKOUT",
-                "CONNECT",
-                "COPY",
-                "LABEL",
-                "LOCK",
-                "MERGE",
-                "MKACTIVITY",
-                "MKWORKSPACE",
-                "MOVE",
-                "NOTIFY",
-                "ORDERPATCH",
-                "POLL",
-                "PROPPATCH",
-                "REPORT",
-                "SEARCH",
-                "SUBSCRIBE",
-                "TRACE",
-                "UNCHECKOUT",
-                "UNLOCK",
-                "UNSUBSCRIBE",
-                "UPDATE",
-                "VERSIONCONTROL",
-                "BASELINECONTROL",
-                "XMSENUMATTS",
-                "RPC_OUT_DATA",
-                "RPC_IN_DATA",
-                "JSON",
-                "COOK",
-                "TRACK",
-            ]
-        ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LocationTargetResponse:
-        """Get the top target locations of and by layer 7 attacks.
+        """Retrieves the top target locations of and by layer 7 attacks.
 
-        Values are a percentage
-        out of the total layer 7 attacks. The target location is determined by the
-        attacked zone's billing country, when available.
+        Values are a
+        percentage out of the total layer 7 attacks. The target location is determined
+        by the attacked zone's billing country, when available.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
-
-          date_start: Array of datetimes to filter the start of a series.
-
-          format: Format results are returned in.
-
-          http_method: Filter for http method.
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          http_version: Filter for http version.
+          date_start: Start of the date range.
 
-          ip_version: Filter for ip version.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -321,9 +271,6 @@ def target(
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
-                        "http_method": http_method,
-                        "http_version": http_version,
-                        "ip_version": ip_version,
                         "limit": limit,
                         "mitigation_product": mitigation_product,
                         "name": name,
@@ -339,21 +286,32 @@ def target(
 class AsyncLocationsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncLocationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLocationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLocationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLocationsResourceWithStreamingResponse(self)
 
     async def origin(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -404,60 +362,61 @@ async def origin(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LocationOriginResponse:
-        """Get the top origin locations of and by layer 7 attacks.
+        """Retrieves the top origin locations of layer 7 attacks.
 
-        Values are a percentage
-        out of the total layer 7 attacks. The origin location is determined by the
-        client IP.
+        Values are percentages of
+        the total layer 7 attacks, with the origin location determined by the client IP
+        address.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -499,111 +458,52 @@ async def origin(
     async def target(
         self,
         *,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_method: List[
-            Literal[
-                "GET",
-                "POST",
-                "DELETE",
-                "PUT",
-                "HEAD",
-                "PURGE",
-                "OPTIONS",
-                "PROPFIND",
-                "MKCOL",
-                "PATCH",
-                "ACL",
-                "BCOPY",
-                "BDELETE",
-                "BMOVE",
-                "BPROPFIND",
-                "BPROPPATCH",
-                "CHECKIN",
-                "CHECKOUT",
-                "CONNECT",
-                "COPY",
-                "LABEL",
-                "LOCK",
-                "MERGE",
-                "MKACTIVITY",
-                "MKWORKSPACE",
-                "MOVE",
-                "NOTIFY",
-                "ORDERPATCH",
-                "POLL",
-                "PROPPATCH",
-                "REPORT",
-                "SEARCH",
-                "SUBSCRIBE",
-                "TRACE",
-                "UNCHECKOUT",
-                "UNLOCK",
-                "UNSUBSCRIBE",
-                "UPDATE",
-                "VERSIONCONTROL",
-                "BASELINECONTROL",
-                "XMSENUMATTS",
-                "RPC_OUT_DATA",
-                "RPC_IN_DATA",
-                "JSON",
-                "COOK",
-                "TRACK",
-            ]
-        ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LocationTargetResponse:
-        """Get the top target locations of and by layer 7 attacks.
+        """Retrieves the top target locations of and by layer 7 attacks.
 
-        Values are a percentage
-        out of the total layer 7 attacks. The target location is determined by the
-        attacked zone's billing country, when available.
+        Values are a
+        percentage out of the total layer 7 attacks. The target location is determined
+        by the attacked zone's billing country, when available.
 
         Args:
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
-
-          date_start: Array of datetimes to filter the start of a series.
-
-          format: Format results are returned in.
-
-          http_method: Filter for http method.
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          http_version: Filter for http version.
+          date_start: Start of the date range.
 
-          ip_version: Filter for ip version.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -627,9 +527,6 @@ async def target(
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
-                        "http_method": http_method,
-                        "http_version": http_version,
-                        "ip_version": ip_version,
                         "limit": limit,
                         "mitigation_product": mitigation_product,
                         "name": name,
diff --git a/src/cloudflare/resources/radar/attacks/layer7/top/top.py b/src/cloudflare/resources/radar/attacks/layer7/top/top.py
index 685caa45d7b..1425265b1a5 100644
--- a/src/cloudflare/resources/radar/attacks/layer7/top/top.py
+++ b/src/cloudflare/resources/radar/attacks/layer7/top/top.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import List, Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
@@ -24,11 +25,8 @@
     LocationsResourceWithStreamingResponse,
     AsyncLocationsResourceWithStreamingResponse,
 )
-from ......_types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ......_utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ......_types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ......_utils import maybe_transform, async_maybe_transform
 from ......_compat import cached_property
 from ......_resource import SyncAPIResource, AsyncAPIResource
 from ......_response import (
@@ -58,148 +56,96 @@ def ases(self) -> AsesResource:
 
     @cached_property
     def with_raw_response(self) -> TopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TopResourceWithStreamingResponse(self)
 
     def attacks(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_method: List[
-            Literal[
-                "GET",
-                "POST",
-                "DELETE",
-                "PUT",
-                "HEAD",
-                "PURGE",
-                "OPTIONS",
-                "PROPFIND",
-                "MKCOL",
-                "PATCH",
-                "ACL",
-                "BCOPY",
-                "BDELETE",
-                "BMOVE",
-                "BPROPFIND",
-                "BPROPPATCH",
-                "CHECKIN",
-                "CHECKOUT",
-                "CONNECT",
-                "COPY",
-                "LABEL",
-                "LOCK",
-                "MERGE",
-                "MKACTIVITY",
-                "MKWORKSPACE",
-                "MOVE",
-                "NOTIFY",
-                "ORDERPATCH",
-                "POLL",
-                "PROPPATCH",
-                "REPORT",
-                "SEARCH",
-                "SUBSCRIBE",
-                "TRACE",
-                "UNCHECKOUT",
-                "UNLOCK",
-                "UNSUBSCRIBE",
-                "UPDATE",
-                "VERSIONCONTROL",
-                "BASELINECONTROL",
-                "XMSENUMATTS",
-                "RPC_OUT_DATA",
-                "RPC_IN_DATA",
-                "JSON",
-                "COOK",
-                "TRACK",
-            ]
-        ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        limit_direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        limit_per_location: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        magnitude: Literal["AFFECTED_ZONES", "MITIGATED_REQUESTS"] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        limit_direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        limit_per_location: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN_MAX"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopAttacksResponse:
-        """Get the top attacks from origin to target location.
+        """Retrieves the top attacks from origin to target location.
 
-        Values are a percentage out
+        Values are percentages
         of the total layer 7 attacks (with billing country). The attack magnitude can be
         defined by the number of mitigated requests or by the number of zones affected.
-        You can optionally limit the number of attacks per origin/target location
-        (useful if all the top attacks are from or to the same location).
+        You can optionally limit the number of attacks by origin/target location (useful
+        if all the top attacks are from or to the same location).
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
-
-          date_start: Array of datetimes to filter the start of a series.
-
-          format: Format results are returned in.
-
-          http_method: Filter for http method.
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          http_version: Filter for http version.
+          date_start: Start of the date range.
 
-          ip_version: Filter for ip version.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          limit_direction: Array of attack origin/target location attack limits. Together with
-              `limitPerLocation`, limits how many objects will be fetched per origin/target
+          limit_direction: Specifies whether the `limitPerLocation` applies to the source or target
               location.
 
-          limit_per_location: Limit the number of attacks per origin/target (refer to `limitDirection`
+          limit_per_location: Limits the number of attacks per origin/target (refer to `limitDirection`
               parameter) location.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          magnitude: Attack magnitude can be defined by total requests mitigated or by total zones
-              attacked.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          mitigation_product: Array of L7 mitigation products.
+          name: Array of names used to label the series in the response.
 
-          name: Array of names that will be used to name the series in responses.
-
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -225,14 +171,10 @@ def attacks(
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
-                        "http_method": http_method,
-                        "http_version": http_version,
-                        "ip_version": ip_version,
                         "limit": limit,
                         "limit_direction": limit_direction,
                         "limit_per_location": limit_per_location,
                         "location": location,
-                        "magnitude": magnitude,
                         "mitigation_product": mitigation_product,
                         "name": name,
                         "normalization": normalization,
@@ -244,15 +186,18 @@ def attacks(
             cast_to=cast(Type[TopAttacksResponse], ResultWrapper[TopAttacksResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/summary_v2/) instead."
+    )
     def industry(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -303,62 +248,65 @@ def industry(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopIndustryResponse:
-        """
-        Get the Industry of attacks.
+        """This endpoint is deprecated.
+
+        To continue getting this data, switch to the
+        summary by industry endpoint.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -398,15 +346,18 @@ def industry(
             cast_to=cast(Type[TopIndustryResponse], ResultWrapper[TopIndustryResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/summary_v2/) instead."
+    )
     def vertical(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -457,62 +408,65 @@ def vertical(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopVerticalResponse:
-        """
-        Get the Verticals of attacks.
+        """This endpoint is deprecated.
+
+        To continue getting this data, switch to the
+        summary by vertical endpoint.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -564,148 +518,96 @@ def ases(self) -> AsyncAsesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncTopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTopResourceWithStreamingResponse(self)
 
     async def attacks(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_method: List[
-            Literal[
-                "GET",
-                "POST",
-                "DELETE",
-                "PUT",
-                "HEAD",
-                "PURGE",
-                "OPTIONS",
-                "PROPFIND",
-                "MKCOL",
-                "PATCH",
-                "ACL",
-                "BCOPY",
-                "BDELETE",
-                "BMOVE",
-                "BPROPFIND",
-                "BPROPPATCH",
-                "CHECKIN",
-                "CHECKOUT",
-                "CONNECT",
-                "COPY",
-                "LABEL",
-                "LOCK",
-                "MERGE",
-                "MKACTIVITY",
-                "MKWORKSPACE",
-                "MOVE",
-                "NOTIFY",
-                "ORDERPATCH",
-                "POLL",
-                "PROPPATCH",
-                "REPORT",
-                "SEARCH",
-                "SUBSCRIBE",
-                "TRACE",
-                "UNCHECKOUT",
-                "UNLOCK",
-                "UNSUBSCRIBE",
-                "UPDATE",
-                "VERSIONCONTROL",
-                "BASELINECONTROL",
-                "XMSENUMATTS",
-                "RPC_OUT_DATA",
-                "RPC_IN_DATA",
-                "JSON",
-                "COOK",
-                "TRACK",
-            ]
-        ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        limit_direction: Literal["ORIGIN", "TARGET"] | NotGiven = NOT_GIVEN,
-        limit_per_location: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        magnitude: Literal["AFFECTED_ZONES", "MITIGATED_REQUESTS"] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        limit_direction: Literal["ORIGIN", "TARGET"] | Omit = omit,
+        limit_per_location: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE", "MIN_MAX"] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN_MAX"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopAttacksResponse:
-        """Get the top attacks from origin to target location.
+        """Retrieves the top attacks from origin to target location.
 
-        Values are a percentage out
+        Values are percentages
         of the total layer 7 attacks (with billing country). The attack magnitude can be
         defined by the number of mitigated requests or by the number of zones affected.
-        You can optionally limit the number of attacks per origin/target location
-        (useful if all the top attacks are from or to the same location).
+        You can optionally limit the number of attacks by origin/target location (useful
+        if all the top attacks are from or to the same location).
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
-
-          date_start: Array of datetimes to filter the start of a series.
-
-          format: Format results are returned in.
-
-          http_method: Filter for http method.
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          http_version: Filter for http version.
+          date_start: Start of the date range.
 
-          ip_version: Filter for ip version.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          limit_direction: Array of attack origin/target location attack limits. Together with
-              `limitPerLocation`, limits how many objects will be fetched per origin/target
+          limit_direction: Specifies whether the `limitPerLocation` applies to the source or target
               location.
 
-          limit_per_location: Limit the number of attacks per origin/target (refer to `limitDirection`
+          limit_per_location: Limits the number of attacks per origin/target (refer to `limitDirection`
               parameter) location.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          magnitude: Attack magnitude can be defined by total requests mitigated or by total zones
-              attacked.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          mitigation_product: Array of L7 mitigation products.
+          name: Array of names used to label the series in the response.
 
-          name: Array of names that will be used to name the series in responses.
-
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
           extra_headers: Send extra headers
@@ -731,14 +633,10 @@ async def attacks(
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
-                        "http_method": http_method,
-                        "http_version": http_version,
-                        "ip_version": ip_version,
                         "limit": limit,
                         "limit_direction": limit_direction,
                         "limit_per_location": limit_per_location,
                         "location": location,
-                        "magnitude": magnitude,
                         "mitigation_product": mitigation_product,
                         "name": name,
                         "normalization": normalization,
@@ -750,15 +648,18 @@ async def attacks(
             cast_to=cast(Type[TopAttacksResponse], ResultWrapper[TopAttacksResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/summary_v2/) instead."
+    )
     async def industry(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -809,62 +710,65 @@ async def industry(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopIndustryResponse:
-        """
-        Get the Industry of attacks.
+        """This endpoint is deprecated.
+
+        To continue getting this data, switch to the
+        summary by industry endpoint.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -904,15 +808,18 @@ async def industry(
             cast_to=cast(Type[TopIndustryResponse], ResultWrapper[TopIndustryResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Attacks Layer 7 Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/attacks/subresources/layer7/methods/summary_v2/) instead."
+    )
     async def vertical(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         http_method: List[
             Literal[
                 "GET",
@@ -963,62 +870,65 @@ async def vertical(
                 "TRACK",
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
         mitigation_product: List[
             Literal[
                 "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopVerticalResponse:
-        """
-        Get the Verticals of attacks.
+        """This endpoint is deprecated.
+
+        To continue getting this data, switch to the
+        summary by vertical endpoint.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_method: Filter for http method.
+          http_method: Filters results by HTTP method.
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          mitigation_product: Array of L7 mitigation products.
+          mitigation_product: Filters the results by layer 7 mitigation product.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -1066,11 +976,15 @@ def __init__(self, top: TopResource) -> None:
         self.attacks = to_raw_response_wrapper(
             top.attacks,
         )
-        self.industry = to_raw_response_wrapper(
-            top.industry,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                top.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vertical = to_raw_response_wrapper(
-            top.vertical,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                top.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
     @cached_property
@@ -1089,11 +1003,15 @@ def __init__(self, top: AsyncTopResource) -> None:
         self.attacks = async_to_raw_response_wrapper(
             top.attacks,
         )
-        self.industry = async_to_raw_response_wrapper(
-            top.industry,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                top.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vertical = async_to_raw_response_wrapper(
-            top.vertical,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                top.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
     @cached_property
@@ -1112,11 +1030,15 @@ def __init__(self, top: TopResource) -> None:
         self.attacks = to_streamed_response_wrapper(
             top.attacks,
         )
-        self.industry = to_streamed_response_wrapper(
-            top.industry,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                top.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vertical = to_streamed_response_wrapper(
-            top.vertical,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                top.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
     @cached_property
@@ -1135,11 +1057,15 @@ def __init__(self, top: AsyncTopResource) -> None:
         self.attacks = async_to_streamed_response_wrapper(
             top.attacks,
         )
-        self.industry = async_to_streamed_response_wrapper(
-            top.industry,
+        self.industry = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                top.industry,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.vertical = async_to_streamed_response_wrapper(
-            top.vertical,
+        self.vertical = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                top.vertical,  # pyright: ignore[reportDeprecated],
+            )
         )
 
     @cached_property
diff --git a/src/cloudflare/resources/radar/bgp/__init__.py b/src/cloudflare/resources/radar/bgp/__init__.py
index 1e54970bfb0..a451a9738e1 100644
--- a/src/cloudflare/resources/radar/bgp/__init__.py
+++ b/src/cloudflare/resources/radar/bgp/__init__.py
@@ -24,6 +24,14 @@
     TopResourceWithStreamingResponse,
     AsyncTopResourceWithStreamingResponse,
 )
+from .rpki import (
+    RPKIResource,
+    AsyncRPKIResource,
+    RPKIResourceWithRawResponse,
+    AsyncRPKIResourceWithRawResponse,
+    RPKIResourceWithStreamingResponse,
+    AsyncRPKIResourceWithStreamingResponse,
+)
 from .leaks import (
     LeaksResource,
     AsyncLeaksResource,
@@ -80,6 +88,12 @@
     "AsyncIPsResourceWithRawResponse",
     "IPsResourceWithStreamingResponse",
     "AsyncIPsResourceWithStreamingResponse",
+    "RPKIResource",
+    "AsyncRPKIResource",
+    "RPKIResourceWithRawResponse",
+    "AsyncRPKIResourceWithRawResponse",
+    "RPKIResourceWithStreamingResponse",
+    "AsyncRPKIResourceWithStreamingResponse",
     "BGPResource",
     "AsyncBGPResource",
     "BGPResourceWithRawResponse",
diff --git a/src/cloudflare/resources/radar/bgp/bgp.py b/src/cloudflare/resources/radar/bgp/bgp.py
index b02292f89e7..d4d93f61538 100644
--- a/src/cloudflare/resources/radar/bgp/bgp.py
+++ b/src/cloudflare/resources/radar/bgp/bgp.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Union, Iterable, cast
+from typing import List, Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
@@ -16,7 +16,15 @@
     IPsResourceWithStreamingResponse,
     AsyncIPsResourceWithStreamingResponse,
 )
-from .top import (
+from .routes import (
+    RoutesResource,
+    AsyncRoutesResource,
+    RoutesResourceWithRawResponse,
+    AsyncRoutesResourceWithRawResponse,
+    RoutesResourceWithStreamingResponse,
+    AsyncRoutesResourceWithStreamingResponse,
+)
+from .top.top import (
     TopResource,
     AsyncTopResource,
     TopResourceWithRawResponse,
@@ -24,7 +32,18 @@
     TopResourceWithStreamingResponse,
     AsyncTopResourceWithStreamingResponse,
 )
-from .leaks import (
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from .rpki.rpki import (
+    RPKIResource,
+    AsyncRPKIResource,
+    RPKIResourceWithRawResponse,
+    AsyncRPKIResourceWithRawResponse,
+    RPKIResourceWithStreamingResponse,
+    AsyncRPKIResourceWithStreamingResponse,
+)
+from ...._compat import cached_property
+from .leaks.leaks import (
     LeaksResource,
     AsyncLeaksResource,
     LeaksResourceWithRawResponse,
@@ -32,30 +51,6 @@
     LeaksResourceWithStreamingResponse,
     AsyncLeaksResourceWithStreamingResponse,
 )
-from .routes import (
-    RoutesResource,
-    AsyncRoutesResource,
-    RoutesResourceWithRawResponse,
-    AsyncRoutesResourceWithRawResponse,
-    RoutesResourceWithStreamingResponse,
-    AsyncRoutesResourceWithStreamingResponse,
-)
-from .hijacks import (
-    HijacksResource,
-    AsyncHijacksResource,
-    HijacksResourceWithRawResponse,
-    AsyncHijacksResourceWithRawResponse,
-    HijacksResourceWithStreamingResponse,
-    AsyncHijacksResourceWithStreamingResponse,
-)
-from .top.top import TopResource, AsyncTopResource
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ...._compat import cached_property
-from .leaks.leaks import LeaksResource, AsyncLeaksResource
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
     to_raw_response_wrapper,
@@ -66,7 +61,14 @@
 from ...._wrappers import ResultWrapper
 from ....types.radar import bgp_timeseries_params
 from ...._base_client import make_request_options
-from .hijacks.hijacks import HijacksResource, AsyncHijacksResource
+from .hijacks.hijacks import (
+    HijacksResource,
+    AsyncHijacksResource,
+    HijacksResourceWithRawResponse,
+    AsyncHijacksResourceWithRawResponse,
+    HijacksResourceWithStreamingResponse,
+    AsyncHijacksResourceWithStreamingResponse,
+)
 from ....types.radar.bgp_timeseries_response import BGPTimeseriesResponse
 
 __all__ = ["BGPResource", "AsyncBGPResource"]
@@ -93,63 +95,78 @@ def routes(self) -> RoutesResource:
     def ips(self) -> IPsResource:
         return IPsResource(self._client)
 
+    @cached_property
+    def rpki(self) -> RPKIResource:
+        return RPKIResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> BGPResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return BGPResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> BGPResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return BGPResourceWithStreamingResponse(self)
 
     def timeseries(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        prefix: Iterable[bgp_timeseries_params.Prefix] | NotGiven = NOT_GIVEN,
-        update_type: List[Literal["ANNOUNCEMENT", "WITHDRAWAL"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        prefix: SequenceNotStr[str] | Omit = omit,
+        update_type: List[Literal["ANNOUNCEMENT", "WITHDRAWAL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> BGPTimeseriesResponse:
-        """Gets BGP updates change over time.
+        """Retrieves BGP updates over time.
 
-        Raw values are returned. When requesting
-        updates of an autonomous system (AS), only BGP updates of type announcement are
-        returned.
+        When requesting updates for an autonomous
+        system, only BGP updates of type announcement are returned.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          prefix: Array of BGP network prefixes.
+          prefix: Filters results by BGP network prefix.
 
-          update_type: Array of BGP update types.
+          update_type: Filters results by BGP update type.
 
           extra_headers: Send extra headers
 
@@ -207,63 +224,78 @@ def routes(self) -> AsyncRoutesResource:
     def ips(self) -> AsyncIPsResource:
         return AsyncIPsResource(self._client)
 
+    @cached_property
+    def rpki(self) -> AsyncRPKIResource:
+        return AsyncRPKIResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncBGPResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncBGPResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncBGPResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncBGPResourceWithStreamingResponse(self)
 
     async def timeseries(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        prefix: Iterable[bgp_timeseries_params.Prefix] | NotGiven = NOT_GIVEN,
-        update_type: List[Literal["ANNOUNCEMENT", "WITHDRAWAL"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        prefix: SequenceNotStr[str] | Omit = omit,
+        update_type: List[Literal["ANNOUNCEMENT", "WITHDRAWAL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> BGPTimeseriesResponse:
-        """Gets BGP updates change over time.
+        """Retrieves BGP updates over time.
 
-        Raw values are returned. When requesting
-        updates of an autonomous system (AS), only BGP updates of type announcement are
-        returned.
+        When requesting updates for an autonomous
+        system, only BGP updates of type announcement are returned.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          prefix: Array of BGP network prefixes.
+          prefix: Filters results by BGP network prefix.
 
-          update_type: Array of BGP update types.
+          update_type: Filters results by BGP update type.
 
           extra_headers: Send extra headers
 
@@ -328,6 +360,10 @@ def routes(self) -> RoutesResourceWithRawResponse:
     def ips(self) -> IPsResourceWithRawResponse:
         return IPsResourceWithRawResponse(self._bgp.ips)
 
+    @cached_property
+    def rpki(self) -> RPKIResourceWithRawResponse:
+        return RPKIResourceWithRawResponse(self._bgp.rpki)
+
 
 class AsyncBGPResourceWithRawResponse:
     def __init__(self, bgp: AsyncBGPResource) -> None:
@@ -357,6 +393,10 @@ def routes(self) -> AsyncRoutesResourceWithRawResponse:
     def ips(self) -> AsyncIPsResourceWithRawResponse:
         return AsyncIPsResourceWithRawResponse(self._bgp.ips)
 
+    @cached_property
+    def rpki(self) -> AsyncRPKIResourceWithRawResponse:
+        return AsyncRPKIResourceWithRawResponse(self._bgp.rpki)
+
 
 class BGPResourceWithStreamingResponse:
     def __init__(self, bgp: BGPResource) -> None:
@@ -386,6 +426,10 @@ def routes(self) -> RoutesResourceWithStreamingResponse:
     def ips(self) -> IPsResourceWithStreamingResponse:
         return IPsResourceWithStreamingResponse(self._bgp.ips)
 
+    @cached_property
+    def rpki(self) -> RPKIResourceWithStreamingResponse:
+        return RPKIResourceWithStreamingResponse(self._bgp.rpki)
+
 
 class AsyncBGPResourceWithStreamingResponse:
     def __init__(self, bgp: AsyncBGPResource) -> None:
@@ -414,3 +458,7 @@ def routes(self) -> AsyncRoutesResourceWithStreamingResponse:
     @cached_property
     def ips(self) -> AsyncIPsResourceWithStreamingResponse:
         return AsyncIPsResourceWithStreamingResponse(self._bgp.ips)
+
+    @cached_property
+    def rpki(self) -> AsyncRPKIResourceWithStreamingResponse:
+        return AsyncRPKIResourceWithStreamingResponse(self._bgp.rpki)
diff --git a/src/cloudflare/resources/radar/bgp/hijacks/events.py b/src/cloudflare/resources/radar/bgp/hijacks/events.py
index 14867a2ca72..b30b75068e1 100644
--- a/src/cloudflare/resources/radar/bgp/hijacks/events.py
+++ b/src/cloudflare/resources/radar/bgp/hijacks/events.py
@@ -8,7 +8,7 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ....._utils import maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
@@ -29,75 +29,82 @@
 class EventsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> EventsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return EventsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> EventsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return EventsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
-        date_end: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        date_range: str | NotGiven = NOT_GIVEN,
-        date_start: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        event_id: int | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        hijacker_asn: int | NotGiven = NOT_GIVEN,
-        involved_asn: int | NotGiven = NOT_GIVEN,
-        involved_country: str | NotGiven = NOT_GIVEN,
-        max_confidence: int | NotGiven = NOT_GIVEN,
-        min_confidence: int | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
-        prefix: str | NotGiven = NOT_GIVEN,
-        sort_by: Literal["ID", "TIME", "CONFIDENCE"] | NotGiven = NOT_GIVEN,
-        sort_order: Literal["ASC", "DESC"] | NotGiven = NOT_GIVEN,
-        victim_asn: int | NotGiven = NOT_GIVEN,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_range: str | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        event_id: int | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        hijacker_asn: int | Omit = omit,
+        involved_asn: int | Omit = omit,
+        involved_country: str | Omit = omit,
+        max_confidence: int | Omit = omit,
+        min_confidence: int | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        prefix: str | Omit = omit,
+        sort_by: Literal["ID", "TIME", "CONFIDENCE"] | Omit = omit,
+        sort_order: Literal["ASC", "DESC"] | Omit = omit,
+        victim_asn: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePagination[EventListResponse]:
-        """Get the BGP hijack events.
-
-        (Beta)
+        """
+        Retrieves the BGP hijack events.
 
         Args:
           date_end: End of the date range (inclusive).
 
-          date_range: Shorthand date ranges for the last X days - use when you don't need specific
-              start and end dates.
+          date_range: Filters results by date range.
 
           date_start: Start of the date range (inclusive).
 
-          event_id: The unique identifier of a event
-
-          format: Format results are returned in.
+          event_id: The unique identifier of a event.
 
-          hijacker_asn: The potential hijacker AS of a BGP hijack event
+          format: Format in which results will be returned.
 
-          involved_asn: The potential hijacker or victim AS of a BGP hijack event
+          hijacker_asn: The potential hijacker AS of a BGP hijack event.
 
-          involved_country: The country code of the potential hijacker or victim AS of a BGP hijack event
+          involved_asn: The potential hijacker or victim AS of a BGP hijack event.
 
-          max_confidence: The maximum confidence score to filter events (1-4 low, 5-7 mid, 8+ high)
+          involved_country: The country code of the potential hijacker or victim AS of a BGP hijack event.
 
-          min_confidence: The minimum confidence score to filter events (1-4 low, 5-7 mid, 8+ high)
+          max_confidence: Filters events by maximum confidence score (1-4 low, 5-7 mid, 8+ high).
 
-          page: Current page number, starting from 1
+          min_confidence: Filters events by minimum confidence score (1-4 low, 5-7 mid, 8+ high).
 
-          per_page: Number of entries per page
+          page: Current page number, starting from 1.
 
-          prefix: Network prefix, IPv4 or IPv6.
+          per_page: Number of entries per page.
 
-          sort_by: Sort events by field
+          sort_by: Sorts results by the specified field.
 
-          sort_order: Sort order
+          sort_order: Sort order.
 
-          victim_asn: The potential victim AS of a BGP hijack event
+          victim_asn: The potential victim AS of a BGP hijack event.
 
           extra_headers: Send extra headers
 
@@ -144,75 +151,82 @@ def list(
 class AsyncEventsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncEventsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncEventsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncEventsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncEventsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
-        date_end: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        date_range: str | NotGiven = NOT_GIVEN,
-        date_start: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        event_id: int | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        hijacker_asn: int | NotGiven = NOT_GIVEN,
-        involved_asn: int | NotGiven = NOT_GIVEN,
-        involved_country: str | NotGiven = NOT_GIVEN,
-        max_confidence: int | NotGiven = NOT_GIVEN,
-        min_confidence: int | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
-        prefix: str | NotGiven = NOT_GIVEN,
-        sort_by: Literal["ID", "TIME", "CONFIDENCE"] | NotGiven = NOT_GIVEN,
-        sort_order: Literal["ASC", "DESC"] | NotGiven = NOT_GIVEN,
-        victim_asn: int | NotGiven = NOT_GIVEN,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_range: str | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        event_id: int | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        hijacker_asn: int | Omit = omit,
+        involved_asn: int | Omit = omit,
+        involved_country: str | Omit = omit,
+        max_confidence: int | Omit = omit,
+        min_confidence: int | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        prefix: str | Omit = omit,
+        sort_by: Literal["ID", "TIME", "CONFIDENCE"] | Omit = omit,
+        sort_order: Literal["ASC", "DESC"] | Omit = omit,
+        victim_asn: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[EventListResponse, AsyncV4PagePagination[EventListResponse]]:
-        """Get the BGP hijack events.
-
-        (Beta)
+        """
+        Retrieves the BGP hijack events.
 
         Args:
           date_end: End of the date range (inclusive).
 
-          date_range: Shorthand date ranges for the last X days - use when you don't need specific
-              start and end dates.
+          date_range: Filters results by date range.
 
           date_start: Start of the date range (inclusive).
 
-          event_id: The unique identifier of a event
-
-          format: Format results are returned in.
+          event_id: The unique identifier of a event.
 
-          hijacker_asn: The potential hijacker AS of a BGP hijack event
+          format: Format in which results will be returned.
 
-          involved_asn: The potential hijacker or victim AS of a BGP hijack event
+          hijacker_asn: The potential hijacker AS of a BGP hijack event.
 
-          involved_country: The country code of the potential hijacker or victim AS of a BGP hijack event
+          involved_asn: The potential hijacker or victim AS of a BGP hijack event.
 
-          max_confidence: The maximum confidence score to filter events (1-4 low, 5-7 mid, 8+ high)
+          involved_country: The country code of the potential hijacker or victim AS of a BGP hijack event.
 
-          min_confidence: The minimum confidence score to filter events (1-4 low, 5-7 mid, 8+ high)
+          max_confidence: Filters events by maximum confidence score (1-4 low, 5-7 mid, 8+ high).
 
-          page: Current page number, starting from 1
+          min_confidence: Filters events by minimum confidence score (1-4 low, 5-7 mid, 8+ high).
 
-          per_page: Number of entries per page
+          page: Current page number, starting from 1.
 
-          prefix: Network prefix, IPv4 or IPv6.
+          per_page: Number of entries per page.
 
-          sort_by: Sort events by field
+          sort_by: Sorts results by the specified field.
 
-          sort_order: Sort order
+          sort_order: Sort order.
 
-          victim_asn: The potential victim AS of a BGP hijack event
+          victim_asn: The potential victim AS of a BGP hijack event.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/bgp/hijacks/hijacks.py b/src/cloudflare/resources/radar/bgp/hijacks/hijacks.py
index 70e14049da9..fcd07088df1 100644
--- a/src/cloudflare/resources/radar/bgp/hijacks/hijacks.py
+++ b/src/cloudflare/resources/radar/bgp/hijacks/hijacks.py
@@ -23,10 +23,21 @@ def events(self) -> EventsResource:
 
     @cached_property
     def with_raw_response(self) -> HijacksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return HijacksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> HijacksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return HijacksResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def events(self) -> AsyncEventsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncHijacksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncHijacksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncHijacksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncHijacksResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/radar/bgp/ips.py b/src/cloudflare/resources/radar/bgp/ips.py
index 8ea07a04ee7..ed5d5aa4891 100644
--- a/src/cloudflare/resources/radar/bgp/ips.py
+++ b/src/cloudflare/resources/radar/bgp/ips.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -32,51 +29,70 @@
 class IPsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> IPsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return IPsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> IPsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return IPsResourceWithStreamingResponse(self)
 
     def timeseries(
         self,
         *,
-        asn: str | NotGiven = NOT_GIVEN,
-        date_end: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        date_range: str | NotGiven = NOT_GIVEN,
-        date_start: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        include_delay: bool | NotGiven = NOT_GIVEN,
-        location: str | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        include_delay: bool | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPTimeseriesResponse:
         """
-        Gets time-series data for the announced IP space count, represented as the
+        Retrieves time series data for the announced IP space count, represented as the
         number of IPv4 /24s and IPv6 /48s, for a given ASN.
 
         Args:
-          asn: Comma separated list of ASNs.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
           date_end: End of the date range (inclusive).
 
-          date_range: Shorthand date ranges for the last X days - use when you don't need specific
-              start and end dates.
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Start of the date range (inclusive).
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          include_delay: Includes data delay meta information.
 
-          include_delay: Include data delay meta information
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Comma separated list of locations.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 location
+              codes.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -101,6 +117,7 @@ def timeseries(
                         "date_start": date_start,
                         "format": format,
                         "include_delay": include_delay,
+                        "ip_version": ip_version,
                         "location": location,
                         "name": name,
                     },
@@ -115,51 +132,70 @@ def timeseries(
 class AsyncIPsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncIPsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncIPsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncIPsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncIPsResourceWithStreamingResponse(self)
 
     async def timeseries(
         self,
         *,
-        asn: str | NotGiven = NOT_GIVEN,
-        date_end: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        date_range: str | NotGiven = NOT_GIVEN,
-        date_start: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        include_delay: bool | NotGiven = NOT_GIVEN,
-        location: str | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        include_delay: bool | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPTimeseriesResponse:
         """
-        Gets time-series data for the announced IP space count, represented as the
+        Retrieves time series data for the announced IP space count, represented as the
         number of IPv4 /24s and IPv6 /48s, for a given ASN.
 
         Args:
-          asn: Comma separated list of ASNs.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
           date_end: End of the date range (inclusive).
 
-          date_range: Shorthand date ranges for the last X days - use when you don't need specific
-              start and end dates.
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Start of the date range (inclusive).
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          include_delay: Includes data delay meta information.
 
-          include_delay: Include data delay meta information
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Comma separated list of locations.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 location
+              codes.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -184,6 +220,7 @@ async def timeseries(
                         "date_start": date_start,
                         "format": format,
                         "include_delay": include_delay,
+                        "ip_version": ip_version,
                         "location": location,
                         "name": name,
                     },
diff --git a/src/cloudflare/resources/radar/bgp/leaks/events.py b/src/cloudflare/resources/radar/bgp/leaks/events.py
index 61b19dfeb74..7805f10972f 100644
--- a/src/cloudflare/resources/radar/bgp/leaks/events.py
+++ b/src/cloudflare/resources/radar/bgp/leaks/events.py
@@ -8,7 +8,7 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ....._utils import maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
@@ -29,62 +29,72 @@
 class EventsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> EventsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return EventsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> EventsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return EventsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
-        date_end: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        date_range: str | NotGiven = NOT_GIVEN,
-        date_start: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        event_id: int | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        involved_asn: int | NotGiven = NOT_GIVEN,
-        involved_country: str | NotGiven = NOT_GIVEN,
-        leak_asn: int | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
-        sort_by: Literal["ID", "LEAKS", "PEERS", "PREFIXES", "ORIGINS", "TIME"] | NotGiven = NOT_GIVEN,
-        sort_order: Literal["ASC", "DESC"] | NotGiven = NOT_GIVEN,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_range: str | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        event_id: int | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        involved_asn: int | Omit = omit,
+        involved_country: str | Omit = omit,
+        leak_asn: int | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        sort_by: Literal["ID", "LEAKS", "PEERS", "PREFIXES", "ORIGINS", "TIME"] | Omit = omit,
+        sort_order: Literal["ASC", "DESC"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePagination[EventListResponse]:
         """
-        Get the BGP route leak events (Beta).
+        Retrieves the BGP route leak events.
 
         Args:
           date_end: End of the date range (inclusive).
 
-          date_range: Shorthand date ranges for the last X days - use when you don't need specific
-              start and end dates.
+          date_range: Filters results by date range.
 
           date_start: Start of the date range (inclusive).
 
-          event_id: The unique identifier of a event
+          event_id: The unique identifier of a event.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          involved_asn: ASN that is causing or affected by a route leak event
+          involved_asn: ASN that is causing or affected by a route leak event.
 
-          involved_country: Country code of a involved ASN in a route leak event
+          involved_country: Country code of a involved ASN in a route leak event.
 
-          leak_asn: The leaking AS of a route leak event
+          leak_asn: The leaking AS of a route leak event.
 
-          page: Current page number, starting from 1
+          page: Current page number, starting from 1.
 
-          per_page: Number of entries per page
+          per_page: Number of entries per page.
 
-          sort_by: Sort events by field
+          sort_by: Sorts results by the specified field.
 
-          sort_order: Sort order
+          sort_order: Sort order.
 
           extra_headers: Send extra headers
 
@@ -127,62 +137,72 @@ def list(
 class AsyncEventsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncEventsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncEventsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncEventsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncEventsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
-        date_end: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        date_range: str | NotGiven = NOT_GIVEN,
-        date_start: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        event_id: int | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        involved_asn: int | NotGiven = NOT_GIVEN,
-        involved_country: str | NotGiven = NOT_GIVEN,
-        leak_asn: int | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
-        sort_by: Literal["ID", "LEAKS", "PEERS", "PREFIXES", "ORIGINS", "TIME"] | NotGiven = NOT_GIVEN,
-        sort_order: Literal["ASC", "DESC"] | NotGiven = NOT_GIVEN,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_range: str | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        event_id: int | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        involved_asn: int | Omit = omit,
+        involved_country: str | Omit = omit,
+        leak_asn: int | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        sort_by: Literal["ID", "LEAKS", "PEERS", "PREFIXES", "ORIGINS", "TIME"] | Omit = omit,
+        sort_order: Literal["ASC", "DESC"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[EventListResponse, AsyncV4PagePagination[EventListResponse]]:
         """
-        Get the BGP route leak events (Beta).
+        Retrieves the BGP route leak events.
 
         Args:
           date_end: End of the date range (inclusive).
 
-          date_range: Shorthand date ranges for the last X days - use when you don't need specific
-              start and end dates.
+          date_range: Filters results by date range.
 
           date_start: Start of the date range (inclusive).
 
-          event_id: The unique identifier of a event
+          event_id: The unique identifier of a event.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          involved_asn: ASN that is causing or affected by a route leak event
+          involved_asn: ASN that is causing or affected by a route leak event.
 
-          involved_country: Country code of a involved ASN in a route leak event
+          involved_country: Country code of a involved ASN in a route leak event.
 
-          leak_asn: The leaking AS of a route leak event
+          leak_asn: The leaking AS of a route leak event.
 
-          page: Current page number, starting from 1
+          page: Current page number, starting from 1.
 
-          per_page: Number of entries per page
+          per_page: Number of entries per page.
 
-          sort_by: Sort events by field
+          sort_by: Sorts results by the specified field.
 
-          sort_order: Sort order
+          sort_order: Sort order.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/bgp/leaks/leaks.py b/src/cloudflare/resources/radar/bgp/leaks/leaks.py
index 6a0f9382b18..c59e22b325b 100644
--- a/src/cloudflare/resources/radar/bgp/leaks/leaks.py
+++ b/src/cloudflare/resources/radar/bgp/leaks/leaks.py
@@ -23,10 +23,21 @@ def events(self) -> EventsResource:
 
     @cached_property
     def with_raw_response(self) -> LeaksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LeaksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LeaksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LeaksResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def events(self) -> AsyncEventsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncLeaksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLeaksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLeaksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLeaksResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/radar/bgp/routes.py b/src/cloudflare/resources/radar/bgp/routes.py
index 7f16e51043e..3c608077ec5 100644
--- a/src/cloudflare/resources/radar/bgp/routes.py
+++ b/src/cloudflare/resources/radar/bgp/routes.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -22,11 +19,18 @@
 )
 from ...._wrappers import ResultWrapper
 from ...._base_client import make_request_options
-from ....types.radar.bgp import route_ases_params, route_moas_params, route_stats_params, route_pfx2as_params
+from ....types.radar.bgp import (
+    route_ases_params,
+    route_moas_params,
+    route_stats_params,
+    route_pfx2as_params,
+    route_realtime_params,
+)
 from ....types.radar.bgp.route_ases_response import RouteAsesResponse
 from ....types.radar.bgp.route_moas_response import RouteMoasResponse
 from ....types.radar.bgp.route_stats_response import RouteStatsResponse
 from ....types.radar.bgp.route_pfx2as_response import RoutePfx2asResponse
+from ....types.radar.bgp.route_realtime_response import RouteRealtimeResponse
 
 __all__ = ["RoutesResource", "AsyncRoutesResource"]
 
@@ -34,41 +38,51 @@
 class RoutesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RoutesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RoutesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RoutesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RoutesResourceWithStreamingResponse(self)
 
     def ases(
         self,
         *,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: str | NotGiven = NOT_GIVEN,
-        sort_by: Literal["cone", "pfxs", "ipv4", "ipv6", "rpki_valid", "rpki_invalid", "rpki_unknown"]
-        | NotGiven = NOT_GIVEN,
-        sort_order: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: str | Omit = omit,
+        sort_by: Literal["cone", "pfxs", "ipv4", "ipv6", "rpki_valid", "rpki_invalid", "rpki_unknown"] | Omit = omit,
+        sort_order: Literal["ASC", "DESC"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RouteAsesResponse:
         """
-        List all ASes on current global routing tables with routing statistics
+        Retrieves all ASes in the current global routing tables with routing statistics.
 
         Args:
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Location Alpha2 code.
+          location: Filters results by location. Specify an alpha-2 location code.
 
-          sort_by: Return order results by given type
+          sort_by: Sorts results by the specified field.
 
-          sort_order: Sort by value ascending or descending
+          sort_order: Sort order.
 
           extra_headers: Send extra headers
 
@@ -103,28 +117,26 @@ def ases(
     def moas(
         self,
         *,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        invalid_only: bool | NotGiven = NOT_GIVEN,
-        origin: int | NotGiven = NOT_GIVEN,
-        prefix: str | NotGiven = NOT_GIVEN,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        invalid_only: bool | Omit = omit,
+        origin: int | Omit = omit,
+        prefix: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RouteMoasResponse:
         """
-        List all Multi-origin AS (MOAS) prefixes on the global routing tables.
+        Retrieves all Multi-Origin AS (MOAS) prefixes in the global routing tables.
 
         Args:
-          format: Format results are returned in.
-
-          invalid_only: Lookup only RPKI invalid MOASes
+          format: Format in which results will be returned.
 
-          origin: Lookup MOASes originated by the given ASN
+          invalid_only: Lookup only RPKI invalid MOASes.
 
-          prefix: Network prefix, IPv4 or IPv6.
+          origin: Lookup MOASes originated by the given ASN.
 
           extra_headers: Send extra headers
 
@@ -158,32 +170,30 @@ def moas(
     def pfx2as(
         self,
         *,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        longest_prefix_match: bool | NotGiven = NOT_GIVEN,
-        origin: int | NotGiven = NOT_GIVEN,
-        prefix: str | NotGiven = NOT_GIVEN,
-        rpki_status: Literal["VALID", "INVALID", "UNKNOWN"] | NotGiven = NOT_GIVEN,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        longest_prefix_match: bool | Omit = omit,
+        origin: int | Omit = omit,
+        prefix: str | Omit = omit,
+        rpki_status: Literal["VALID", "INVALID", "UNKNOWN"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RoutePfx2asResponse:
         """
-        Lookup prefix-to-ASN mapping on global routing tables.
+        Retrieves the prefix-to-ASN mapping from global routing tables.
 
         Args:
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
           longest_prefix_match: Return only results with the longest prefix match for the given prefix. For
               example, specify a /32 prefix to lookup the origin ASN for an IPv4 address.
 
-          origin: Lookup prefixes originated by the given ASN
+          origin: Lookup prefixes originated by the given ASN.
 
-          prefix: Network prefix, IPv4 or IPv6.
-
-          rpki_status: Return only results with matching rpki status: valid, invalid or unknown
+          rpki_status: Return only results with matching rpki status: valid, invalid or unknown.
 
           extra_headers: Send extra headers
 
@@ -215,28 +225,75 @@ def pfx2as(
             cast_to=cast(Type[RoutePfx2asResponse], ResultWrapper[RoutePfx2asResponse]),
         )
 
+    def realtime(
+        self,
+        *,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        prefix: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RouteRealtimeResponse:
+        """
+        Retrieves real-time BGP routes for a prefix, using public real-time data
+        collectors (RouteViews and RIPE RIS).
+
+        Args:
+          format: Format in which results will be returned.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/bgp/routes/realtime",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "format": format,
+                        "prefix": prefix,
+                    },
+                    route_realtime_params.RouteRealtimeParams,
+                ),
+                post_parser=ResultWrapper[RouteRealtimeResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[RouteRealtimeResponse], ResultWrapper[RouteRealtimeResponse]),
+        )
+
     def stats(
         self,
         *,
-        asn: int | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: str | NotGiven = NOT_GIVEN,
+        asn: int | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RouteStatsResponse:
         """
-        Get the BGP routing table stats (Beta).
+        Retrieves the BGP routing table stats.
 
         Args:
-          asn: Single ASN as integer.
+          asn: Filters results by Autonomous System. Specify a single Autonomous System Number
+              (ASN) as integer.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Location Alpha2 code.
+          location: Filters results by location. Specify an alpha-2 location code.
 
           extra_headers: Send extra headers
 
@@ -270,41 +327,51 @@ def stats(
 class AsyncRoutesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRoutesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRoutesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRoutesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRoutesResourceWithStreamingResponse(self)
 
     async def ases(
         self,
         *,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: str | NotGiven = NOT_GIVEN,
-        sort_by: Literal["cone", "pfxs", "ipv4", "ipv6", "rpki_valid", "rpki_invalid", "rpki_unknown"]
-        | NotGiven = NOT_GIVEN,
-        sort_order: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: str | Omit = omit,
+        sort_by: Literal["cone", "pfxs", "ipv4", "ipv6", "rpki_valid", "rpki_invalid", "rpki_unknown"] | Omit = omit,
+        sort_order: Literal["ASC", "DESC"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RouteAsesResponse:
         """
-        List all ASes on current global routing tables with routing statistics
+        Retrieves all ASes in the current global routing tables with routing statistics.
 
         Args:
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Location Alpha2 code.
+          location: Filters results by location. Specify an alpha-2 location code.
 
-          sort_by: Return order results by given type
+          sort_by: Sorts results by the specified field.
 
-          sort_order: Sort by value ascending or descending
+          sort_order: Sort order.
 
           extra_headers: Send extra headers
 
@@ -339,28 +406,26 @@ async def ases(
     async def moas(
         self,
         *,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        invalid_only: bool | NotGiven = NOT_GIVEN,
-        origin: int | NotGiven = NOT_GIVEN,
-        prefix: str | NotGiven = NOT_GIVEN,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        invalid_only: bool | Omit = omit,
+        origin: int | Omit = omit,
+        prefix: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RouteMoasResponse:
         """
-        List all Multi-origin AS (MOAS) prefixes on the global routing tables.
+        Retrieves all Multi-Origin AS (MOAS) prefixes in the global routing tables.
 
         Args:
-          format: Format results are returned in.
-
-          invalid_only: Lookup only RPKI invalid MOASes
+          format: Format in which results will be returned.
 
-          origin: Lookup MOASes originated by the given ASN
+          invalid_only: Lookup only RPKI invalid MOASes.
 
-          prefix: Network prefix, IPv4 or IPv6.
+          origin: Lookup MOASes originated by the given ASN.
 
           extra_headers: Send extra headers
 
@@ -394,32 +459,30 @@ async def moas(
     async def pfx2as(
         self,
         *,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        longest_prefix_match: bool | NotGiven = NOT_GIVEN,
-        origin: int | NotGiven = NOT_GIVEN,
-        prefix: str | NotGiven = NOT_GIVEN,
-        rpki_status: Literal["VALID", "INVALID", "UNKNOWN"] | NotGiven = NOT_GIVEN,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        longest_prefix_match: bool | Omit = omit,
+        origin: int | Omit = omit,
+        prefix: str | Omit = omit,
+        rpki_status: Literal["VALID", "INVALID", "UNKNOWN"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RoutePfx2asResponse:
         """
-        Lookup prefix-to-ASN mapping on global routing tables.
+        Retrieves the prefix-to-ASN mapping from global routing tables.
 
         Args:
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
           longest_prefix_match: Return only results with the longest prefix match for the given prefix. For
               example, specify a /32 prefix to lookup the origin ASN for an IPv4 address.
 
-          origin: Lookup prefixes originated by the given ASN
+          origin: Lookup prefixes originated by the given ASN.
 
-          prefix: Network prefix, IPv4 or IPv6.
-
-          rpki_status: Return only results with matching rpki status: valid, invalid or unknown
+          rpki_status: Return only results with matching rpki status: valid, invalid or unknown.
 
           extra_headers: Send extra headers
 
@@ -451,28 +514,75 @@ async def pfx2as(
             cast_to=cast(Type[RoutePfx2asResponse], ResultWrapper[RoutePfx2asResponse]),
         )
 
+    async def realtime(
+        self,
+        *,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        prefix: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RouteRealtimeResponse:
+        """
+        Retrieves real-time BGP routes for a prefix, using public real-time data
+        collectors (RouteViews and RIPE RIS).
+
+        Args:
+          format: Format in which results will be returned.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/bgp/routes/realtime",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "format": format,
+                        "prefix": prefix,
+                    },
+                    route_realtime_params.RouteRealtimeParams,
+                ),
+                post_parser=ResultWrapper[RouteRealtimeResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[RouteRealtimeResponse], ResultWrapper[RouteRealtimeResponse]),
+        )
+
     async def stats(
         self,
         *,
-        asn: int | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: str | NotGiven = NOT_GIVEN,
+        asn: int | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RouteStatsResponse:
         """
-        Get the BGP routing table stats (Beta).
+        Retrieves the BGP routing table stats.
 
         Args:
-          asn: Single ASN as integer.
+          asn: Filters results by Autonomous System. Specify a single Autonomous System Number
+              (ASN) as integer.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Location Alpha2 code.
+          location: Filters results by location. Specify an alpha-2 location code.
 
           extra_headers: Send extra headers
 
@@ -516,6 +626,9 @@ def __init__(self, routes: RoutesResource) -> None:
         self.pfx2as = to_raw_response_wrapper(
             routes.pfx2as,
         )
+        self.realtime = to_raw_response_wrapper(
+            routes.realtime,
+        )
         self.stats = to_raw_response_wrapper(
             routes.stats,
         )
@@ -534,6 +647,9 @@ def __init__(self, routes: AsyncRoutesResource) -> None:
         self.pfx2as = async_to_raw_response_wrapper(
             routes.pfx2as,
         )
+        self.realtime = async_to_raw_response_wrapper(
+            routes.realtime,
+        )
         self.stats = async_to_raw_response_wrapper(
             routes.stats,
         )
@@ -552,6 +668,9 @@ def __init__(self, routes: RoutesResource) -> None:
         self.pfx2as = to_streamed_response_wrapper(
             routes.pfx2as,
         )
+        self.realtime = to_streamed_response_wrapper(
+            routes.realtime,
+        )
         self.stats = to_streamed_response_wrapper(
             routes.stats,
         )
@@ -570,6 +689,9 @@ def __init__(self, routes: AsyncRoutesResource) -> None:
         self.pfx2as = async_to_streamed_response_wrapper(
             routes.pfx2as,
         )
+        self.realtime = async_to_streamed_response_wrapper(
+            routes.realtime,
+        )
         self.stats = async_to_streamed_response_wrapper(
             routes.stats,
         )
diff --git a/src/cloudflare/resources/radar/bgp/rpki/__init__.py b/src/cloudflare/resources/radar/bgp/rpki/__init__.py
new file mode 100644
index 00000000000..824bd86d5d1
--- /dev/null
+++ b/src/cloudflare/resources/radar/bgp/rpki/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .aspa import (
+    ASPAResource,
+    AsyncASPAResource,
+    ASPAResourceWithRawResponse,
+    AsyncASPAResourceWithRawResponse,
+    ASPAResourceWithStreamingResponse,
+    AsyncASPAResourceWithStreamingResponse,
+)
+from .rpki import (
+    RPKIResource,
+    AsyncRPKIResource,
+    RPKIResourceWithRawResponse,
+    AsyncRPKIResourceWithRawResponse,
+    RPKIResourceWithStreamingResponse,
+    AsyncRPKIResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ASPAResource",
+    "AsyncASPAResource",
+    "ASPAResourceWithRawResponse",
+    "AsyncASPAResourceWithRawResponse",
+    "ASPAResourceWithStreamingResponse",
+    "AsyncASPAResourceWithStreamingResponse",
+    "RPKIResource",
+    "AsyncRPKIResource",
+    "RPKIResourceWithRawResponse",
+    "AsyncRPKIResourceWithRawResponse",
+    "RPKIResourceWithStreamingResponse",
+    "AsyncRPKIResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/radar/bgp/rpki/aspa.py b/src/cloudflare/resources/radar/bgp/rpki/aspa.py
new file mode 100644
index 00000000000..5f18f566e7c
--- /dev/null
+++ b/src/cloudflare/resources/radar/bgp/rpki/aspa.py
@@ -0,0 +1,510 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Type, Union, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.radar.bgp.rpki import aspa_changes_params, aspa_snapshot_params, aspa_timeseries_params
+from .....types.radar.bgp.rpki.aspa_changes_response import ASPAChangesResponse
+from .....types.radar.bgp.rpki.aspa_snapshot_response import ASPASnapshotResponse
+from .....types.radar.bgp.rpki.aspa_timeseries_response import ASPATimeseriesResponse
+
+__all__ = ["ASPAResource", "AsyncASPAResource"]
+
+
+class ASPAResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ASPAResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ASPAResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ASPAResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ASPAResourceWithStreamingResponse(self)
+
+    def changes(
+        self,
+        *,
+        asn: int | Omit = omit,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        include_asn_info: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ASPAChangesResponse:
+        """
+        Retrieves ASPA (Autonomous System Provider Authorization) changes over time.
+        Returns daily aggregated changes including additions, removals, and
+        modifications of ASPA objects.
+
+        Args:
+          asn: Filter changes involving this ASN (as customer or provider).
+
+          date_end: End of the date range (inclusive).
+
+          date_start: Start of the date range (inclusive).
+
+          format: Format in which results will be returned.
+
+          include_asn_info: Include ASN metadata (name, country) in response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/bgp/rpki/aspa/changes",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "date_end": date_end,
+                        "date_start": date_start,
+                        "format": format,
+                        "include_asn_info": include_asn_info,
+                    },
+                    aspa_changes_params.ASPAChangesParams,
+                ),
+                post_parser=ResultWrapper[ASPAChangesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ASPAChangesResponse], ResultWrapper[ASPAChangesResponse]),
+        )
+
+    def snapshot(
+        self,
+        *,
+        customer_asn: int | Omit = omit,
+        date: Union[str, datetime] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        include_asn_info: bool | Omit = omit,
+        provider_asn: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ASPASnapshotResponse:
+        """
+        Retrieves current or historical ASPA (Autonomous System Provider Authorization)
+        objects. ASPA objects define which ASNs are authorized upstream providers for a
+        customer ASN.
+
+        Args:
+          customer_asn: Filter by customer ASN (the ASN publishing the ASPA object).
+
+          date: Filters results by the specified datetime (ISO 8601).
+
+          format: Format in which results will be returned.
+
+          include_asn_info: Include ASN metadata (name, country) in response.
+
+          provider_asn: Filter by provider ASN (an authorized upstream provider in ASPA objects).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/bgp/rpki/aspa/snapshot",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "customer_asn": customer_asn,
+                        "date": date,
+                        "format": format,
+                        "include_asn_info": include_asn_info,
+                        "provider_asn": provider_asn,
+                    },
+                    aspa_snapshot_params.ASPASnapshotParams,
+                ),
+                post_parser=ResultWrapper[ASPASnapshotResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ASPASnapshotResponse], ResultWrapper[ASPASnapshotResponse]),
+        )
+
+    def timeseries(
+        self,
+        *,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        rir: List[Literal["RIPE_NCC", "ARIN", "APNIC", "LACNIC", "AFRINIC"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ASPATimeseriesResponse:
+        """Retrieves ASPA (Autonomous System Provider Authorization) object count over
+        time.
+
+        Supports filtering by RIR or location (country code) to generate multiple
+        named series. If no RIR or location filter is specified, returns total count.
+
+        Args:
+          date_end: End of the date range (inclusive).
+
+          date_start: Start of the date range (inclusive).
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 location
+              codes.
+
+          name: Array of names used to label the series in the response.
+
+          rir: Filter by Regional Internet Registry (RIR). Multiple RIRs generate multiple
+              series.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/bgp/rpki/aspa/timeseries",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "date_end": date_end,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "rir": rir,
+                    },
+                    aspa_timeseries_params.ASPATimeseriesParams,
+                ),
+                post_parser=ResultWrapper[ASPATimeseriesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ASPATimeseriesResponse], ResultWrapper[ASPATimeseriesResponse]),
+        )
+
+
+class AsyncASPAResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncASPAResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncASPAResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncASPAResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncASPAResourceWithStreamingResponse(self)
+
+    async def changes(
+        self,
+        *,
+        asn: int | Omit = omit,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        include_asn_info: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ASPAChangesResponse:
+        """
+        Retrieves ASPA (Autonomous System Provider Authorization) changes over time.
+        Returns daily aggregated changes including additions, removals, and
+        modifications of ASPA objects.
+
+        Args:
+          asn: Filter changes involving this ASN (as customer or provider).
+
+          date_end: End of the date range (inclusive).
+
+          date_start: Start of the date range (inclusive).
+
+          format: Format in which results will be returned.
+
+          include_asn_info: Include ASN metadata (name, country) in response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/bgp/rpki/aspa/changes",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "date_end": date_end,
+                        "date_start": date_start,
+                        "format": format,
+                        "include_asn_info": include_asn_info,
+                    },
+                    aspa_changes_params.ASPAChangesParams,
+                ),
+                post_parser=ResultWrapper[ASPAChangesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ASPAChangesResponse], ResultWrapper[ASPAChangesResponse]),
+        )
+
+    async def snapshot(
+        self,
+        *,
+        customer_asn: int | Omit = omit,
+        date: Union[str, datetime] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        include_asn_info: bool | Omit = omit,
+        provider_asn: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ASPASnapshotResponse:
+        """
+        Retrieves current or historical ASPA (Autonomous System Provider Authorization)
+        objects. ASPA objects define which ASNs are authorized upstream providers for a
+        customer ASN.
+
+        Args:
+          customer_asn: Filter by customer ASN (the ASN publishing the ASPA object).
+
+          date: Filters results by the specified datetime (ISO 8601).
+
+          format: Format in which results will be returned.
+
+          include_asn_info: Include ASN metadata (name, country) in response.
+
+          provider_asn: Filter by provider ASN (an authorized upstream provider in ASPA objects).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/bgp/rpki/aspa/snapshot",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "customer_asn": customer_asn,
+                        "date": date,
+                        "format": format,
+                        "include_asn_info": include_asn_info,
+                        "provider_asn": provider_asn,
+                    },
+                    aspa_snapshot_params.ASPASnapshotParams,
+                ),
+                post_parser=ResultWrapper[ASPASnapshotResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ASPASnapshotResponse], ResultWrapper[ASPASnapshotResponse]),
+        )
+
+    async def timeseries(
+        self,
+        *,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        rir: List[Literal["RIPE_NCC", "ARIN", "APNIC", "LACNIC", "AFRINIC"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ASPATimeseriesResponse:
+        """Retrieves ASPA (Autonomous System Provider Authorization) object count over
+        time.
+
+        Supports filtering by RIR or location (country code) to generate multiple
+        named series. If no RIR or location filter is specified, returns total count.
+
+        Args:
+          date_end: End of the date range (inclusive).
+
+          date_start: Start of the date range (inclusive).
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 location
+              codes.
+
+          name: Array of names used to label the series in the response.
+
+          rir: Filter by Regional Internet Registry (RIR). Multiple RIRs generate multiple
+              series.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/bgp/rpki/aspa/timeseries",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "date_end": date_end,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "rir": rir,
+                    },
+                    aspa_timeseries_params.ASPATimeseriesParams,
+                ),
+                post_parser=ResultWrapper[ASPATimeseriesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ASPATimeseriesResponse], ResultWrapper[ASPATimeseriesResponse]),
+        )
+
+
+class ASPAResourceWithRawResponse:
+    def __init__(self, aspa: ASPAResource) -> None:
+        self._aspa = aspa
+
+        self.changes = to_raw_response_wrapper(
+            aspa.changes,
+        )
+        self.snapshot = to_raw_response_wrapper(
+            aspa.snapshot,
+        )
+        self.timeseries = to_raw_response_wrapper(
+            aspa.timeseries,
+        )
+
+
+class AsyncASPAResourceWithRawResponse:
+    def __init__(self, aspa: AsyncASPAResource) -> None:
+        self._aspa = aspa
+
+        self.changes = async_to_raw_response_wrapper(
+            aspa.changes,
+        )
+        self.snapshot = async_to_raw_response_wrapper(
+            aspa.snapshot,
+        )
+        self.timeseries = async_to_raw_response_wrapper(
+            aspa.timeseries,
+        )
+
+
+class ASPAResourceWithStreamingResponse:
+    def __init__(self, aspa: ASPAResource) -> None:
+        self._aspa = aspa
+
+        self.changes = to_streamed_response_wrapper(
+            aspa.changes,
+        )
+        self.snapshot = to_streamed_response_wrapper(
+            aspa.snapshot,
+        )
+        self.timeseries = to_streamed_response_wrapper(
+            aspa.timeseries,
+        )
+
+
+class AsyncASPAResourceWithStreamingResponse:
+    def __init__(self, aspa: AsyncASPAResource) -> None:
+        self._aspa = aspa
+
+        self.changes = async_to_streamed_response_wrapper(
+            aspa.changes,
+        )
+        self.snapshot = async_to_streamed_response_wrapper(
+            aspa.snapshot,
+        )
+        self.timeseries = async_to_streamed_response_wrapper(
+            aspa.timeseries,
+        )
diff --git a/src/cloudflare/resources/radar/bgp/rpki/rpki.py b/src/cloudflare/resources/radar/bgp/rpki/rpki.py
new file mode 100644
index 00000000000..9d76245de9e
--- /dev/null
+++ b/src/cloudflare/resources/radar/bgp/rpki/rpki.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .aspa import (
+    ASPAResource,
+    AsyncASPAResource,
+    ASPAResourceWithRawResponse,
+    AsyncASPAResourceWithRawResponse,
+    ASPAResourceWithStreamingResponse,
+    AsyncASPAResourceWithStreamingResponse,
+)
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["RPKIResource", "AsyncRPKIResource"]
+
+
+class RPKIResource(SyncAPIResource):
+    @cached_property
+    def aspa(self) -> ASPAResource:
+        return ASPAResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> RPKIResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return RPKIResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> RPKIResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return RPKIResourceWithStreamingResponse(self)
+
+
+class AsyncRPKIResource(AsyncAPIResource):
+    @cached_property
+    def aspa(self) -> AsyncASPAResource:
+        return AsyncASPAResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncRPKIResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncRPKIResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncRPKIResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncRPKIResourceWithStreamingResponse(self)
+
+
+class RPKIResourceWithRawResponse:
+    def __init__(self, rpki: RPKIResource) -> None:
+        self._rpki = rpki
+
+    @cached_property
+    def aspa(self) -> ASPAResourceWithRawResponse:
+        return ASPAResourceWithRawResponse(self._rpki.aspa)
+
+
+class AsyncRPKIResourceWithRawResponse:
+    def __init__(self, rpki: AsyncRPKIResource) -> None:
+        self._rpki = rpki
+
+    @cached_property
+    def aspa(self) -> AsyncASPAResourceWithRawResponse:
+        return AsyncASPAResourceWithRawResponse(self._rpki.aspa)
+
+
+class RPKIResourceWithStreamingResponse:
+    def __init__(self, rpki: RPKIResource) -> None:
+        self._rpki = rpki
+
+    @cached_property
+    def aspa(self) -> ASPAResourceWithStreamingResponse:
+        return ASPAResourceWithStreamingResponse(self._rpki.aspa)
+
+
+class AsyncRPKIResourceWithStreamingResponse:
+    def __init__(self, rpki: AsyncRPKIResource) -> None:
+        self._rpki = rpki
+
+    @cached_property
+    def aspa(self) -> AsyncASPAResourceWithStreamingResponse:
+        return AsyncASPAResourceWithStreamingResponse(self._rpki.aspa)
diff --git a/src/cloudflare/resources/radar/bgp/top/ases.py b/src/cloudflare/resources/radar/bgp/top/ases.py
index d0f5b339eed..344ead212cc 100644
--- a/src/cloudflare/resources/radar/bgp/top/ases.py
+++ b/src/cloudflare/resources/radar/bgp/top/ases.py
@@ -2,17 +2,14 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Union, Iterable, cast
+from typing import List, Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -33,58 +30,68 @@
 class AsesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsesResourceWithStreamingResponse(self)
 
     def get(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        prefix: Iterable[ase_get_params.Prefix] | NotGiven = NOT_GIVEN,
-        update_type: List[Literal["ANNOUNCEMENT", "WITHDRAWAL"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        prefix: SequenceNotStr[str] | Omit = omit,
+        update_type: List[Literal["ANNOUNCEMENT", "WITHDRAWAL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AseGetResponse:
-        """Get the top autonomous systems (AS) by BGP updates (announcements only).
-
-        Values
-        are a percentage out of the total updates.
+        """
+        Retrieves the top autonomous systems by BGP updates (announcements only).
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          prefix: Array of BGP network prefixes.
+          prefix: Filters results by BGP network prefix.
 
-          update_type: Array of BGP update types.
+          update_type: Filters results by BGP update type.
 
           extra_headers: Send extra headers
 
@@ -123,27 +130,27 @@ def get(
     def prefixes(
         self,
         *,
-        country: str | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
+        country: str | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsePrefixesResponse:
         """
-        Get the full list of autonomous systems on the global routing table ordered by
-        announced prefixes count. The data comes from public BGP MRT data archives and
-        updates every 2 hours.
+        Retrieves the full list of autonomous systems on the global routing table
+        ordered by announced prefixes count. The data comes from public BGP MRT data
+        archives and updates every 2 hours.
 
         Args:
           country: Alpha-2 country code.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Maximum number of ASes to return
+          limit: Maximum number of ASes to return.
 
           extra_headers: Send extra headers
 
@@ -177,58 +184,68 @@ def prefixes(
 class AsyncAsesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncAsesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAsesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAsesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAsesResourceWithStreamingResponse(self)
 
     async def get(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        prefix: Iterable[ase_get_params.Prefix] | NotGiven = NOT_GIVEN,
-        update_type: List[Literal["ANNOUNCEMENT", "WITHDRAWAL"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        prefix: SequenceNotStr[str] | Omit = omit,
+        update_type: List[Literal["ANNOUNCEMENT", "WITHDRAWAL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AseGetResponse:
-        """Get the top autonomous systems (AS) by BGP updates (announcements only).
-
-        Values
-        are a percentage out of the total updates.
+        """
+        Retrieves the top autonomous systems by BGP updates (announcements only).
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          prefix: Array of BGP network prefixes.
+          prefix: Filters results by BGP network prefix.
 
-          update_type: Array of BGP update types.
+          update_type: Filters results by BGP update type.
 
           extra_headers: Send extra headers
 
@@ -267,27 +284,27 @@ async def get(
     async def prefixes(
         self,
         *,
-        country: str | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
+        country: str | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsePrefixesResponse:
         """
-        Get the full list of autonomous systems on the global routing table ordered by
-        announced prefixes count. The data comes from public BGP MRT data archives and
-        updates every 2 hours.
+        Retrieves the full list of autonomous systems on the global routing table
+        ordered by announced prefixes count. The data comes from public BGP MRT data
+        archives and updates every 2 hours.
 
         Args:
           country: Alpha-2 country code.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Maximum number of ASes to return
+          limit: Maximum number of ASes to return.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/bgp/top/top.py b/src/cloudflare/resources/radar/bgp/top/top.py
index b9ab93e865d..3f811e385fe 100644
--- a/src/cloudflare/resources/radar/bgp/top/top.py
+++ b/src/cloudflare/resources/radar/bgp/top/top.py
@@ -16,11 +16,8 @@
     AsesResourceWithStreamingResponse,
     AsyncAsesResourceWithStreamingResponse,
 )
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -44,55 +41,65 @@ def ases(self) -> AsesResource:
 
     @cached_property
     def with_raw_response(self) -> TopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TopResourceWithStreamingResponse(self)
 
     def prefixes(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        update_type: List[Literal["ANNOUNCEMENT", "WITHDRAWAL"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        update_type: List[Literal["ANNOUNCEMENT", "WITHDRAWAL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopPrefixesResponse:
-        """Get the top network prefixes by BGP updates.
-
-        Values are a percentage out of the
-        total BGP updates.
+        """
+        Retrieves the top network prefixes by BGP updates.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          update_type: Array of BGP update types.
+          update_type: Filters results by BGP update type.
 
           extra_headers: Send extra headers
 
@@ -135,55 +142,65 @@ def ases(self) -> AsyncAsesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncTopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTopResourceWithStreamingResponse(self)
 
     async def prefixes(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        update_type: List[Literal["ANNOUNCEMENT", "WITHDRAWAL"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        update_type: List[Literal["ANNOUNCEMENT", "WITHDRAWAL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopPrefixesResponse:
-        """Get the top network prefixes by BGP updates.
-
-        Values are a percentage out of the
-        total BGP updates.
+        """
+        Retrieves the top network prefixes by BGP updates.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          update_type: Array of BGP update types.
+          update_type: Filters results by BGP update type.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/bots/__init__.py b/src/cloudflare/resources/radar/bots/__init__.py
new file mode 100644
index 00000000000..7d7fb66c90e
--- /dev/null
+++ b/src/cloudflare/resources/radar/bots/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .bots import (
+    BotsResource,
+    AsyncBotsResource,
+    BotsResourceWithRawResponse,
+    AsyncBotsResourceWithRawResponse,
+    BotsResourceWithStreamingResponse,
+    AsyncBotsResourceWithStreamingResponse,
+)
+from .web_crawlers import (
+    WebCrawlersResource,
+    AsyncWebCrawlersResource,
+    WebCrawlersResourceWithRawResponse,
+    AsyncWebCrawlersResourceWithRawResponse,
+    WebCrawlersResourceWithStreamingResponse,
+    AsyncWebCrawlersResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "WebCrawlersResource",
+    "AsyncWebCrawlersResource",
+    "WebCrawlersResourceWithRawResponse",
+    "AsyncWebCrawlersResourceWithRawResponse",
+    "WebCrawlersResourceWithStreamingResponse",
+    "AsyncWebCrawlersResourceWithStreamingResponse",
+    "BotsResource",
+    "AsyncBotsResource",
+    "BotsResourceWithRawResponse",
+    "AsyncBotsResourceWithRawResponse",
+    "BotsResourceWithStreamingResponse",
+    "AsyncBotsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/radar/bots/bots.py b/src/cloudflare/resources/radar/bots/bots.py
new file mode 100644
index 00000000000..3b891df90bc
--- /dev/null
+++ b/src/cloudflare/resources/radar/bots/bots.py
@@ -0,0 +1,1242 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Type, Union, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from .web_crawlers import (
+    WebCrawlersResource,
+    AsyncWebCrawlersResource,
+    WebCrawlersResourceWithRawResponse,
+    AsyncWebCrawlersResourceWithRawResponse,
+    WebCrawlersResourceWithStreamingResponse,
+    AsyncWebCrawlersResourceWithStreamingResponse,
+)
+from ....types.radar import (
+    bot_get_params,
+    bot_list_params,
+    bot_summary_params,
+    bot_timeseries_params,
+    bot_timeseries_groups_params,
+)
+from ...._base_client import make_request_options
+from ....types.radar.bot_get_response import BotGetResponse
+from ....types.radar.bot_list_response import BotListResponse
+from ....types.radar.bot_summary_response import BotSummaryResponse
+from ....types.radar.bot_timeseries_response import BotTimeseriesResponse
+from ....types.radar.bot_timeseries_groups_response import BotTimeseriesGroupsResponse
+
+__all__ = ["BotsResource", "AsyncBotsResource"]
+
+
+class BotsResource(SyncAPIResource):
+    @cached_property
+    def web_crawlers(self) -> WebCrawlersResource:
+        return WebCrawlersResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> BotsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return BotsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> BotsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return BotsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        bot_category: Literal[
+            "SEARCH_ENGINE_CRAWLER",
+            "SEARCH_ENGINE_OPTIMIZATION",
+            "MONITORING_AND_ANALYTICS",
+            "ADVERTISING_AND_MARKETING",
+            "SOCIAL_MEDIA_MARKETING",
+            "PAGE_PREVIEW",
+            "ACADEMIC_RESEARCH",
+            "SECURITY",
+            "ACCESSIBILITY",
+            "WEBHOOKS",
+            "FEED_FETCHER",
+            "AI_CRAWLER",
+            "AGGREGATOR",
+            "AI_ASSISTANT",
+            "AI_SEARCH",
+            "ARCHIVER",
+        ]
+        | Omit = omit,
+        bot_operator: str | Omit = omit,
+        bot_verification_status: Literal["VERIFIED"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        kind: Literal["AGENT", "BOT"] | Omit = omit,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BotListResponse:
+        """
+        Retrieves a list of bots.
+
+        Args:
+          bot_category: Filters results by bot category.
+
+          bot_operator: Filters results by bot operator.
+
+          bot_verification_status: Filters results by bot verification status.
+
+          format: Format in which results will be returned.
+
+          kind: Filters results by bot kind.
+
+          limit: Limits the number of objects returned in the response.
+
+          offset: Skips the specified number of objects before fetching the results.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/bots",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "bot_category": bot_category,
+                        "bot_operator": bot_operator,
+                        "bot_verification_status": bot_verification_status,
+                        "format": format,
+                        "kind": kind,
+                        "limit": limit,
+                        "offset": offset,
+                    },
+                    bot_list_params.BotListParams,
+                ),
+                post_parser=ResultWrapper[BotListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BotListResponse], ResultWrapper[BotListResponse]),
+        )
+
+    def get(
+        self,
+        bot_slug: str,
+        *,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BotGetResponse:
+        """
+        Retrieves the requested bot information.
+
+        Args:
+          bot_slug: Bot slug.
+
+          format: Format in which results will be returned.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not bot_slug:
+            raise ValueError(f"Expected a non-empty value for `bot_slug` but received {bot_slug!r}")
+        return self._get(
+            f"/radar/bots/{bot_slug}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"format": format}, bot_get_params.BotGetParams),
+                post_parser=ResultWrapper[BotGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BotGetResponse], ResultWrapper[BotGetResponse]),
+        )
+
+    def summary(
+        self,
+        dimension: Literal["BOT", "BOT_KIND", "BOT_OPERATOR", "BOT_CATEGORY"],
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot: SequenceNotStr[str] | Omit = omit,
+        bot_category: List[
+            Literal[
+                "SEARCH_ENGINE_CRAWLER",
+                "SEARCH_ENGINE_OPTIMIZATION",
+                "MONITORING_AND_ANALYTICS",
+                "ADVERTISING_AND_MARKETING",
+                "SOCIAL_MEDIA_MARKETING",
+                "PAGE_PREVIEW",
+                "ACADEMIC_RESEARCH",
+                "SECURITY",
+                "ACCESSIBILITY",
+                "WEBHOOKS",
+                "FEED_FETCHER",
+                "AI_CRAWLER",
+                "AGGREGATOR",
+                "AI_ASSISTANT",
+                "AI_SEARCH",
+                "ARCHIVER",
+            ]
+        ]
+        | Omit = omit,
+        bot_kind: List[Literal["AGENT", "BOT"]] | Omit = omit,
+        bot_operator: SequenceNotStr[str] | Omit = omit,
+        bot_verification_status: List[Literal["VERIFIED"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BotSummaryResponse:
+        """
+        Retrieves an aggregated summary of bots HTTP requests grouped by the specified
+        dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          bot: Filters results by bot name.
+
+          bot_category: Filters results by bot category.
+
+          bot_kind: Filters results by bot kind.
+
+          bot_operator: Filters results by bot operator.
+
+          bot_verification_status: Filters results by bot verification status (Verified vs. Unverified).
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/bots/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "bot": bot,
+                        "bot_category": bot_category,
+                        "bot_kind": bot_kind,
+                        "bot_operator": bot_operator,
+                        "bot_verification_status": bot_verification_status,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                    },
+                    bot_summary_params.BotSummaryParams,
+                ),
+                post_parser=ResultWrapper[BotSummaryResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BotSummaryResponse], ResultWrapper[BotSummaryResponse]),
+        )
+
+    def timeseries(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot: SequenceNotStr[str] | Omit = omit,
+        bot_category: List[
+            Literal[
+                "SEARCH_ENGINE_CRAWLER",
+                "SEARCH_ENGINE_OPTIMIZATION",
+                "MONITORING_AND_ANALYTICS",
+                "ADVERTISING_AND_MARKETING",
+                "SOCIAL_MEDIA_MARKETING",
+                "PAGE_PREVIEW",
+                "ACADEMIC_RESEARCH",
+                "SECURITY",
+                "ACCESSIBILITY",
+                "WEBHOOKS",
+                "FEED_FETCHER",
+                "AI_CRAWLER",
+                "AGGREGATOR",
+                "AI_ASSISTANT",
+                "AI_SEARCH",
+                "ARCHIVER",
+            ]
+        ]
+        | Omit = omit,
+        bot_kind: List[Literal["AGENT", "BOT"]] | Omit = omit,
+        bot_operator: SequenceNotStr[str] | Omit = omit,
+        bot_verification_status: List[Literal["VERIFIED"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BotTimeseriesResponse:
+        """
+        Retrieves bots HTTP request volume over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          bot: Filters results by bot name.
+
+          bot_category: Filters results by bot category.
+
+          bot_kind: Filters results by bot kind.
+
+          bot_operator: Filters results by bot operator.
+
+          bot_verification_status: Filters results by bot verification status (Verified vs. Unverified).
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/bots/timeseries",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "bot": bot,
+                        "bot_category": bot_category,
+                        "bot_kind": bot_kind,
+                        "bot_operator": bot_operator,
+                        "bot_verification_status": bot_verification_status,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                    },
+                    bot_timeseries_params.BotTimeseriesParams,
+                ),
+                post_parser=ResultWrapper[BotTimeseriesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BotTimeseriesResponse], ResultWrapper[BotTimeseriesResponse]),
+        )
+
+    def timeseries_groups(
+        self,
+        dimension: Literal["BOT", "BOT_KIND", "BOT_OPERATOR", "BOT_CATEGORY"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot: SequenceNotStr[str] | Omit = omit,
+        bot_category: List[
+            Literal[
+                "SEARCH_ENGINE_CRAWLER",
+                "SEARCH_ENGINE_OPTIMIZATION",
+                "MONITORING_AND_ANALYTICS",
+                "ADVERTISING_AND_MARKETING",
+                "SOCIAL_MEDIA_MARKETING",
+                "PAGE_PREVIEW",
+                "ACADEMIC_RESEARCH",
+                "SECURITY",
+                "ACCESSIBILITY",
+                "WEBHOOKS",
+                "FEED_FETCHER",
+                "AI_CRAWLER",
+                "AGGREGATOR",
+                "AI_ASSISTANT",
+                "AI_SEARCH",
+                "ARCHIVER",
+            ]
+        ]
+        | Omit = omit,
+        bot_kind: List[Literal["AGENT", "BOT"]] | Omit = omit,
+        bot_operator: SequenceNotStr[str] | Omit = omit,
+        bot_verification_status: List[Literal["VERIFIED"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BotTimeseriesGroupsResponse:
+        """
+        Retrieves the distribution of HTTP requests from bots, grouped by chosen the
+        specified dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          bot: Filters results by bot name.
+
+          bot_category: Filters results by bot category.
+
+          bot_kind: Filters results by bot kind.
+
+          bot_operator: Filters results by bot operator.
+
+          bot_verification_status: Filters results by bot verification status (Verified vs. Unverified).
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/bots/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "bot": bot,
+                        "bot_category": bot_category,
+                        "bot_kind": bot_kind,
+                        "bot_operator": bot_operator,
+                        "bot_verification_status": bot_verification_status,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                    },
+                    bot_timeseries_groups_params.BotTimeseriesGroupsParams,
+                ),
+                post_parser=ResultWrapper[BotTimeseriesGroupsResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BotTimeseriesGroupsResponse], ResultWrapper[BotTimeseriesGroupsResponse]),
+        )
+
+
+class AsyncBotsResource(AsyncAPIResource):
+    @cached_property
+    def web_crawlers(self) -> AsyncWebCrawlersResource:
+        return AsyncWebCrawlersResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncBotsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncBotsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncBotsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncBotsResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        *,
+        bot_category: Literal[
+            "SEARCH_ENGINE_CRAWLER",
+            "SEARCH_ENGINE_OPTIMIZATION",
+            "MONITORING_AND_ANALYTICS",
+            "ADVERTISING_AND_MARKETING",
+            "SOCIAL_MEDIA_MARKETING",
+            "PAGE_PREVIEW",
+            "ACADEMIC_RESEARCH",
+            "SECURITY",
+            "ACCESSIBILITY",
+            "WEBHOOKS",
+            "FEED_FETCHER",
+            "AI_CRAWLER",
+            "AGGREGATOR",
+            "AI_ASSISTANT",
+            "AI_SEARCH",
+            "ARCHIVER",
+        ]
+        | Omit = omit,
+        bot_operator: str | Omit = omit,
+        bot_verification_status: Literal["VERIFIED"] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        kind: Literal["AGENT", "BOT"] | Omit = omit,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BotListResponse:
+        """
+        Retrieves a list of bots.
+
+        Args:
+          bot_category: Filters results by bot category.
+
+          bot_operator: Filters results by bot operator.
+
+          bot_verification_status: Filters results by bot verification status.
+
+          format: Format in which results will be returned.
+
+          kind: Filters results by bot kind.
+
+          limit: Limits the number of objects returned in the response.
+
+          offset: Skips the specified number of objects before fetching the results.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/bots",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "bot_category": bot_category,
+                        "bot_operator": bot_operator,
+                        "bot_verification_status": bot_verification_status,
+                        "format": format,
+                        "kind": kind,
+                        "limit": limit,
+                        "offset": offset,
+                    },
+                    bot_list_params.BotListParams,
+                ),
+                post_parser=ResultWrapper[BotListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BotListResponse], ResultWrapper[BotListResponse]),
+        )
+
+    async def get(
+        self,
+        bot_slug: str,
+        *,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BotGetResponse:
+        """
+        Retrieves the requested bot information.
+
+        Args:
+          bot_slug: Bot slug.
+
+          format: Format in which results will be returned.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not bot_slug:
+            raise ValueError(f"Expected a non-empty value for `bot_slug` but received {bot_slug!r}")
+        return await self._get(
+            f"/radar/bots/{bot_slug}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"format": format}, bot_get_params.BotGetParams),
+                post_parser=ResultWrapper[BotGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BotGetResponse], ResultWrapper[BotGetResponse]),
+        )
+
+    async def summary(
+        self,
+        dimension: Literal["BOT", "BOT_KIND", "BOT_OPERATOR", "BOT_CATEGORY"],
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot: SequenceNotStr[str] | Omit = omit,
+        bot_category: List[
+            Literal[
+                "SEARCH_ENGINE_CRAWLER",
+                "SEARCH_ENGINE_OPTIMIZATION",
+                "MONITORING_AND_ANALYTICS",
+                "ADVERTISING_AND_MARKETING",
+                "SOCIAL_MEDIA_MARKETING",
+                "PAGE_PREVIEW",
+                "ACADEMIC_RESEARCH",
+                "SECURITY",
+                "ACCESSIBILITY",
+                "WEBHOOKS",
+                "FEED_FETCHER",
+                "AI_CRAWLER",
+                "AGGREGATOR",
+                "AI_ASSISTANT",
+                "AI_SEARCH",
+                "ARCHIVER",
+            ]
+        ]
+        | Omit = omit,
+        bot_kind: List[Literal["AGENT", "BOT"]] | Omit = omit,
+        bot_operator: SequenceNotStr[str] | Omit = omit,
+        bot_verification_status: List[Literal["VERIFIED"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BotSummaryResponse:
+        """
+        Retrieves an aggregated summary of bots HTTP requests grouped by the specified
+        dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          bot: Filters results by bot name.
+
+          bot_category: Filters results by bot category.
+
+          bot_kind: Filters results by bot kind.
+
+          bot_operator: Filters results by bot operator.
+
+          bot_verification_status: Filters results by bot verification status (Verified vs. Unverified).
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/bots/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "bot": bot,
+                        "bot_category": bot_category,
+                        "bot_kind": bot_kind,
+                        "bot_operator": bot_operator,
+                        "bot_verification_status": bot_verification_status,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                    },
+                    bot_summary_params.BotSummaryParams,
+                ),
+                post_parser=ResultWrapper[BotSummaryResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BotSummaryResponse], ResultWrapper[BotSummaryResponse]),
+        )
+
+    async def timeseries(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot: SequenceNotStr[str] | Omit = omit,
+        bot_category: List[
+            Literal[
+                "SEARCH_ENGINE_CRAWLER",
+                "SEARCH_ENGINE_OPTIMIZATION",
+                "MONITORING_AND_ANALYTICS",
+                "ADVERTISING_AND_MARKETING",
+                "SOCIAL_MEDIA_MARKETING",
+                "PAGE_PREVIEW",
+                "ACADEMIC_RESEARCH",
+                "SECURITY",
+                "ACCESSIBILITY",
+                "WEBHOOKS",
+                "FEED_FETCHER",
+                "AI_CRAWLER",
+                "AGGREGATOR",
+                "AI_ASSISTANT",
+                "AI_SEARCH",
+                "ARCHIVER",
+            ]
+        ]
+        | Omit = omit,
+        bot_kind: List[Literal["AGENT", "BOT"]] | Omit = omit,
+        bot_operator: SequenceNotStr[str] | Omit = omit,
+        bot_verification_status: List[Literal["VERIFIED"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BotTimeseriesResponse:
+        """
+        Retrieves bots HTTP request volume over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          bot: Filters results by bot name.
+
+          bot_category: Filters results by bot category.
+
+          bot_kind: Filters results by bot kind.
+
+          bot_operator: Filters results by bot operator.
+
+          bot_verification_status: Filters results by bot verification status (Verified vs. Unverified).
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/bots/timeseries",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "bot": bot,
+                        "bot_category": bot_category,
+                        "bot_kind": bot_kind,
+                        "bot_operator": bot_operator,
+                        "bot_verification_status": bot_verification_status,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                    },
+                    bot_timeseries_params.BotTimeseriesParams,
+                ),
+                post_parser=ResultWrapper[BotTimeseriesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BotTimeseriesResponse], ResultWrapper[BotTimeseriesResponse]),
+        )
+
+    async def timeseries_groups(
+        self,
+        dimension: Literal["BOT", "BOT_KIND", "BOT_OPERATOR", "BOT_CATEGORY"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot: SequenceNotStr[str] | Omit = omit,
+        bot_category: List[
+            Literal[
+                "SEARCH_ENGINE_CRAWLER",
+                "SEARCH_ENGINE_OPTIMIZATION",
+                "MONITORING_AND_ANALYTICS",
+                "ADVERTISING_AND_MARKETING",
+                "SOCIAL_MEDIA_MARKETING",
+                "PAGE_PREVIEW",
+                "ACADEMIC_RESEARCH",
+                "SECURITY",
+                "ACCESSIBILITY",
+                "WEBHOOKS",
+                "FEED_FETCHER",
+                "AI_CRAWLER",
+                "AGGREGATOR",
+                "AI_ASSISTANT",
+                "AI_SEARCH",
+                "ARCHIVER",
+            ]
+        ]
+        | Omit = omit,
+        bot_kind: List[Literal["AGENT", "BOT"]] | Omit = omit,
+        bot_operator: SequenceNotStr[str] | Omit = omit,
+        bot_verification_status: List[Literal["VERIFIED"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BotTimeseriesGroupsResponse:
+        """
+        Retrieves the distribution of HTTP requests from bots, grouped by chosen the
+        specified dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          bot: Filters results by bot name.
+
+          bot_category: Filters results by bot category.
+
+          bot_kind: Filters results by bot kind.
+
+          bot_operator: Filters results by bot operator.
+
+          bot_verification_status: Filters results by bot verification status (Verified vs. Unverified).
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/bots/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "bot": bot,
+                        "bot_category": bot_category,
+                        "bot_kind": bot_kind,
+                        "bot_operator": bot_operator,
+                        "bot_verification_status": bot_verification_status,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                    },
+                    bot_timeseries_groups_params.BotTimeseriesGroupsParams,
+                ),
+                post_parser=ResultWrapper[BotTimeseriesGroupsResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[BotTimeseriesGroupsResponse], ResultWrapper[BotTimeseriesGroupsResponse]),
+        )
+
+
+class BotsResourceWithRawResponse:
+    def __init__(self, bots: BotsResource) -> None:
+        self._bots = bots
+
+        self.list = to_raw_response_wrapper(
+            bots.list,
+        )
+        self.get = to_raw_response_wrapper(
+            bots.get,
+        )
+        self.summary = to_raw_response_wrapper(
+            bots.summary,
+        )
+        self.timeseries = to_raw_response_wrapper(
+            bots.timeseries,
+        )
+        self.timeseries_groups = to_raw_response_wrapper(
+            bots.timeseries_groups,
+        )
+
+    @cached_property
+    def web_crawlers(self) -> WebCrawlersResourceWithRawResponse:
+        return WebCrawlersResourceWithRawResponse(self._bots.web_crawlers)
+
+
+class AsyncBotsResourceWithRawResponse:
+    def __init__(self, bots: AsyncBotsResource) -> None:
+        self._bots = bots
+
+        self.list = async_to_raw_response_wrapper(
+            bots.list,
+        )
+        self.get = async_to_raw_response_wrapper(
+            bots.get,
+        )
+        self.summary = async_to_raw_response_wrapper(
+            bots.summary,
+        )
+        self.timeseries = async_to_raw_response_wrapper(
+            bots.timeseries,
+        )
+        self.timeseries_groups = async_to_raw_response_wrapper(
+            bots.timeseries_groups,
+        )
+
+    @cached_property
+    def web_crawlers(self) -> AsyncWebCrawlersResourceWithRawResponse:
+        return AsyncWebCrawlersResourceWithRawResponse(self._bots.web_crawlers)
+
+
+class BotsResourceWithStreamingResponse:
+    def __init__(self, bots: BotsResource) -> None:
+        self._bots = bots
+
+        self.list = to_streamed_response_wrapper(
+            bots.list,
+        )
+        self.get = to_streamed_response_wrapper(
+            bots.get,
+        )
+        self.summary = to_streamed_response_wrapper(
+            bots.summary,
+        )
+        self.timeseries = to_streamed_response_wrapper(
+            bots.timeseries,
+        )
+        self.timeseries_groups = to_streamed_response_wrapper(
+            bots.timeseries_groups,
+        )
+
+    @cached_property
+    def web_crawlers(self) -> WebCrawlersResourceWithStreamingResponse:
+        return WebCrawlersResourceWithStreamingResponse(self._bots.web_crawlers)
+
+
+class AsyncBotsResourceWithStreamingResponse:
+    def __init__(self, bots: AsyncBotsResource) -> None:
+        self._bots = bots
+
+        self.list = async_to_streamed_response_wrapper(
+            bots.list,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            bots.get,
+        )
+        self.summary = async_to_streamed_response_wrapper(
+            bots.summary,
+        )
+        self.timeseries = async_to_streamed_response_wrapper(
+            bots.timeseries,
+        )
+        self.timeseries_groups = async_to_streamed_response_wrapper(
+            bots.timeseries_groups,
+        )
+
+    @cached_property
+    def web_crawlers(self) -> AsyncWebCrawlersResourceWithStreamingResponse:
+        return AsyncWebCrawlersResourceWithStreamingResponse(self._bots.web_crawlers)
diff --git a/src/cloudflare/resources/radar/bots/web_crawlers.py b/src/cloudflare/resources/radar/bots/web_crawlers.py
new file mode 100644
index 00000000000..b5c0c6f0bc9
--- /dev/null
+++ b/src/cloudflare/resources/radar/bots/web_crawlers.py
@@ -0,0 +1,485 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Type, Union, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.radar.bots import web_crawler_summary_params, web_crawler_timeseries_groups_params
+from ....types.radar.bots.web_crawler_summary_response import WebCrawlerSummaryResponse
+from ....types.radar.bots.web_crawler_timeseries_groups_response import WebCrawlerTimeseriesGroupsResponse
+
+__all__ = ["WebCrawlersResource", "AsyncWebCrawlersResource"]
+
+
+class WebCrawlersResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> WebCrawlersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return WebCrawlersResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> WebCrawlersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return WebCrawlersResourceWithStreamingResponse(self)
+
+    def summary(
+        self,
+        dimension: Literal["CLIENT_TYPE", "USER_AGENT", "REFERER", "CRAWL_REFER_RATIO", "VERTICAL", "INDUSTRY"],
+        *,
+        bot_operator: SequenceNotStr[str] | Omit = omit,
+        client_type: List[Literal["HUMAN", "NON_AI_BOT", "AI_BOT", "MIXED_PURPOSE"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        industry: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        vertical: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WebCrawlerSummaryResponse:
+        """
+        Retrieves an aggregated summary of HTTP requests from crawlers, grouped by the
+        specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          bot_operator: Filters results by bot operator.
+
+          client_type: Filters results by agent type.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          industry: Filters results by industry.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          vertical: Filters results by vertical.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/bots/crawlers/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "bot_operator": bot_operator,
+                        "client_type": client_type,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "industry": industry,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                        "vertical": vertical,
+                    },
+                    web_crawler_summary_params.WebCrawlerSummaryParams,
+                ),
+                post_parser=ResultWrapper[WebCrawlerSummaryResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[WebCrawlerSummaryResponse], ResultWrapper[WebCrawlerSummaryResponse]),
+        )
+
+    def timeseries_groups(
+        self,
+        dimension: Literal["CLIENT_TYPE", "USER_AGENT", "REFERER", "CRAWL_REFER_RATIO", "VERTICAL", "INDUSTRY"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        bot_operator: SequenceNotStr[str] | Omit = omit,
+        client_type: List[Literal["HUMAN", "NON_AI_BOT", "AI_BOT", "MIXED_PURPOSE"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        industry: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        vertical: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WebCrawlerTimeseriesGroupsResponse:
+        """
+        Retrieves the distribution of HTTP requests from crawlers, grouped by chosen the
+        specified dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          bot_operator: Filters results by bot operator.
+
+          client_type: Filters results by agent type.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          industry: Filters results by industry.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          vertical: Filters results by vertical.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/bots/crawlers/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "bot_operator": bot_operator,
+                        "client_type": client_type,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "industry": industry,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                        "vertical": vertical,
+                    },
+                    web_crawler_timeseries_groups_params.WebCrawlerTimeseriesGroupsParams,
+                ),
+                post_parser=ResultWrapper[WebCrawlerTimeseriesGroupsResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[WebCrawlerTimeseriesGroupsResponse], ResultWrapper[WebCrawlerTimeseriesGroupsResponse]),
+        )
+
+
+class AsyncWebCrawlersResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncWebCrawlersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncWebCrawlersResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncWebCrawlersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncWebCrawlersResourceWithStreamingResponse(self)
+
+    async def summary(
+        self,
+        dimension: Literal["CLIENT_TYPE", "USER_AGENT", "REFERER", "CRAWL_REFER_RATIO", "VERTICAL", "INDUSTRY"],
+        *,
+        bot_operator: SequenceNotStr[str] | Omit = omit,
+        client_type: List[Literal["HUMAN", "NON_AI_BOT", "AI_BOT", "MIXED_PURPOSE"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        industry: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        vertical: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WebCrawlerSummaryResponse:
+        """
+        Retrieves an aggregated summary of HTTP requests from crawlers, grouped by the
+        specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          bot_operator: Filters results by bot operator.
+
+          client_type: Filters results by agent type.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          industry: Filters results by industry.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          vertical: Filters results by vertical.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/bots/crawlers/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "bot_operator": bot_operator,
+                        "client_type": client_type,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "industry": industry,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                        "vertical": vertical,
+                    },
+                    web_crawler_summary_params.WebCrawlerSummaryParams,
+                ),
+                post_parser=ResultWrapper[WebCrawlerSummaryResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[WebCrawlerSummaryResponse], ResultWrapper[WebCrawlerSummaryResponse]),
+        )
+
+    async def timeseries_groups(
+        self,
+        dimension: Literal["CLIENT_TYPE", "USER_AGENT", "REFERER", "CRAWL_REFER_RATIO", "VERTICAL", "INDUSTRY"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        bot_operator: SequenceNotStr[str] | Omit = omit,
+        client_type: List[Literal["HUMAN", "NON_AI_BOT", "AI_BOT", "MIXED_PURPOSE"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        industry: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        vertical: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WebCrawlerTimeseriesGroupsResponse:
+        """
+        Retrieves the distribution of HTTP requests from crawlers, grouped by chosen the
+        specified dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          bot_operator: Filters results by bot operator.
+
+          client_type: Filters results by agent type.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          industry: Filters results by industry.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          vertical: Filters results by vertical.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/bots/crawlers/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "bot_operator": bot_operator,
+                        "client_type": client_type,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "industry": industry,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                        "vertical": vertical,
+                    },
+                    web_crawler_timeseries_groups_params.WebCrawlerTimeseriesGroupsParams,
+                ),
+                post_parser=ResultWrapper[WebCrawlerTimeseriesGroupsResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[WebCrawlerTimeseriesGroupsResponse], ResultWrapper[WebCrawlerTimeseriesGroupsResponse]),
+        )
+
+
+class WebCrawlersResourceWithRawResponse:
+    def __init__(self, web_crawlers: WebCrawlersResource) -> None:
+        self._web_crawlers = web_crawlers
+
+        self.summary = to_raw_response_wrapper(
+            web_crawlers.summary,
+        )
+        self.timeseries_groups = to_raw_response_wrapper(
+            web_crawlers.timeseries_groups,
+        )
+
+
+class AsyncWebCrawlersResourceWithRawResponse:
+    def __init__(self, web_crawlers: AsyncWebCrawlersResource) -> None:
+        self._web_crawlers = web_crawlers
+
+        self.summary = async_to_raw_response_wrapper(
+            web_crawlers.summary,
+        )
+        self.timeseries_groups = async_to_raw_response_wrapper(
+            web_crawlers.timeseries_groups,
+        )
+
+
+class WebCrawlersResourceWithStreamingResponse:
+    def __init__(self, web_crawlers: WebCrawlersResource) -> None:
+        self._web_crawlers = web_crawlers
+
+        self.summary = to_streamed_response_wrapper(
+            web_crawlers.summary,
+        )
+        self.timeseries_groups = to_streamed_response_wrapper(
+            web_crawlers.timeseries_groups,
+        )
+
+
+class AsyncWebCrawlersResourceWithStreamingResponse:
+    def __init__(self, web_crawlers: AsyncWebCrawlersResource) -> None:
+        self._web_crawlers = web_crawlers
+
+        self.summary = async_to_streamed_response_wrapper(
+            web_crawlers.summary,
+        )
+        self.timeseries_groups = async_to_streamed_response_wrapper(
+            web_crawlers.timeseries_groups,
+        )
diff --git a/src/cloudflare/resources/radar/ct/__init__.py b/src/cloudflare/resources/radar/ct/__init__.py
new file mode 100644
index 00000000000..0a980c8305b
--- /dev/null
+++ b/src/cloudflare/resources/radar/ct/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .ct import (
+    CTResource,
+    AsyncCTResource,
+    CTResourceWithRawResponse,
+    AsyncCTResourceWithRawResponse,
+    CTResourceWithStreamingResponse,
+    AsyncCTResourceWithStreamingResponse,
+)
+from .logs import (
+    LogsResource,
+    AsyncLogsResource,
+    LogsResourceWithRawResponse,
+    AsyncLogsResourceWithRawResponse,
+    LogsResourceWithStreamingResponse,
+    AsyncLogsResourceWithStreamingResponse,
+)
+from .authorities import (
+    AuthoritiesResource,
+    AsyncAuthoritiesResource,
+    AuthoritiesResourceWithRawResponse,
+    AsyncAuthoritiesResourceWithRawResponse,
+    AuthoritiesResourceWithStreamingResponse,
+    AsyncAuthoritiesResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "AuthoritiesResource",
+    "AsyncAuthoritiesResource",
+    "AuthoritiesResourceWithRawResponse",
+    "AsyncAuthoritiesResourceWithRawResponse",
+    "AuthoritiesResourceWithStreamingResponse",
+    "AsyncAuthoritiesResourceWithStreamingResponse",
+    "LogsResource",
+    "AsyncLogsResource",
+    "LogsResourceWithRawResponse",
+    "AsyncLogsResourceWithRawResponse",
+    "LogsResourceWithStreamingResponse",
+    "AsyncLogsResourceWithStreamingResponse",
+    "CTResource",
+    "AsyncCTResource",
+    "CTResourceWithRawResponse",
+    "AsyncCTResourceWithRawResponse",
+    "CTResourceWithStreamingResponse",
+    "AsyncCTResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/radar/ct/authorities.py b/src/cloudflare/resources/radar/ct/authorities.py
new file mode 100644
index 00000000000..580466559d8
--- /dev/null
+++ b/src/cloudflare/resources/radar/ct/authorities.py
@@ -0,0 +1,304 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.radar.ct import authority_get_params, authority_list_params
+from ....types.radar.ct.authority_get_response import AuthorityGetResponse
+from ....types.radar.ct.authority_list_response import AuthorityListResponse
+
+__all__ = ["AuthoritiesResource", "AsyncAuthoritiesResource"]
+
+
+class AuthoritiesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AuthoritiesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AuthoritiesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AuthoritiesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AuthoritiesResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AuthorityListResponse:
+        """
+        Retrieves a list of certificate authorities.
+
+        Args:
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
+
+          offset: Skips the specified number of objects before fetching the results.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/ct/authorities",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "format": format,
+                        "limit": limit,
+                        "offset": offset,
+                    },
+                    authority_list_params.AuthorityListParams,
+                ),
+                post_parser=ResultWrapper[AuthorityListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AuthorityListResponse], ResultWrapper[AuthorityListResponse]),
+        )
+
+    def get(
+        self,
+        ca_slug: str,
+        *,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AuthorityGetResponse:
+        """
+        Retrieves the requested CA information.
+
+        Args:
+          ca_slug: Certificate authority SHA256 fingerprint.
+
+          format: Format in which results will be returned.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not ca_slug:
+            raise ValueError(f"Expected a non-empty value for `ca_slug` but received {ca_slug!r}")
+        return self._get(
+            f"/radar/ct/authorities/{ca_slug}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"format": format}, authority_get_params.AuthorityGetParams),
+                post_parser=ResultWrapper[AuthorityGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AuthorityGetResponse], ResultWrapper[AuthorityGetResponse]),
+        )
+
+
+class AsyncAuthoritiesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncAuthoritiesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAuthoritiesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAuthoritiesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAuthoritiesResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        *,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AuthorityListResponse:
+        """
+        Retrieves a list of certificate authorities.
+
+        Args:
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
+
+          offset: Skips the specified number of objects before fetching the results.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/ct/authorities",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "format": format,
+                        "limit": limit,
+                        "offset": offset,
+                    },
+                    authority_list_params.AuthorityListParams,
+                ),
+                post_parser=ResultWrapper[AuthorityListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AuthorityListResponse], ResultWrapper[AuthorityListResponse]),
+        )
+
+    async def get(
+        self,
+        ca_slug: str,
+        *,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AuthorityGetResponse:
+        """
+        Retrieves the requested CA information.
+
+        Args:
+          ca_slug: Certificate authority SHA256 fingerprint.
+
+          format: Format in which results will be returned.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not ca_slug:
+            raise ValueError(f"Expected a non-empty value for `ca_slug` but received {ca_slug!r}")
+        return await self._get(
+            f"/radar/ct/authorities/{ca_slug}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"format": format}, authority_get_params.AuthorityGetParams),
+                post_parser=ResultWrapper[AuthorityGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[AuthorityGetResponse], ResultWrapper[AuthorityGetResponse]),
+        )
+
+
+class AuthoritiesResourceWithRawResponse:
+    def __init__(self, authorities: AuthoritiesResource) -> None:
+        self._authorities = authorities
+
+        self.list = to_raw_response_wrapper(
+            authorities.list,
+        )
+        self.get = to_raw_response_wrapper(
+            authorities.get,
+        )
+
+
+class AsyncAuthoritiesResourceWithRawResponse:
+    def __init__(self, authorities: AsyncAuthoritiesResource) -> None:
+        self._authorities = authorities
+
+        self.list = async_to_raw_response_wrapper(
+            authorities.list,
+        )
+        self.get = async_to_raw_response_wrapper(
+            authorities.get,
+        )
+
+
+class AuthoritiesResourceWithStreamingResponse:
+    def __init__(self, authorities: AuthoritiesResource) -> None:
+        self._authorities = authorities
+
+        self.list = to_streamed_response_wrapper(
+            authorities.list,
+        )
+        self.get = to_streamed_response_wrapper(
+            authorities.get,
+        )
+
+
+class AsyncAuthoritiesResourceWithStreamingResponse:
+    def __init__(self, authorities: AsyncAuthoritiesResource) -> None:
+        self._authorities = authorities
+
+        self.list = async_to_streamed_response_wrapper(
+            authorities.list,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            authorities.get,
+        )
diff --git a/src/cloudflare/resources/radar/ct/ct.py b/src/cloudflare/resources/radar/ct/ct.py
new file mode 100644
index 00000000000..2c803e15a5a
--- /dev/null
+++ b/src/cloudflare/resources/radar/ct/ct.py
@@ -0,0 +1,1264 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Type, Union, Iterable, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from .logs import (
+    LogsResource,
+    AsyncLogsResource,
+    LogsResourceWithRawResponse,
+    AsyncLogsResourceWithRawResponse,
+    LogsResourceWithStreamingResponse,
+    AsyncLogsResourceWithStreamingResponse,
+)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from .authorities import (
+    AuthoritiesResource,
+    AsyncAuthoritiesResource,
+    AuthoritiesResourceWithRawResponse,
+    AsyncAuthoritiesResourceWithRawResponse,
+    AuthoritiesResourceWithStreamingResponse,
+    AsyncAuthoritiesResourceWithStreamingResponse,
+)
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....types.radar import ct_summary_params, ct_timeseries_params, ct_timeseries_groups_params
+from ...._base_client import make_request_options
+from ....types.radar.ct_summary_response import CTSummaryResponse
+from ....types.radar.ct_timeseries_response import CTTimeseriesResponse
+from ....types.radar.ct_timeseries_groups_response import CTTimeseriesGroupsResponse
+
+__all__ = ["CTResource", "AsyncCTResource"]
+
+
+class CTResource(SyncAPIResource):
+    @cached_property
+    def authorities(self) -> AuthoritiesResource:
+        return AuthoritiesResource(self._client)
+
+    @cached_property
+    def logs(self) -> LogsResource:
+        return LogsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> CTResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CTResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CTResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CTResourceWithStreamingResponse(self)
+
+    def summary(
+        self,
+        dimension: Literal[
+            "CA",
+            "CA_OWNER",
+            "DURATION",
+            "ENTRY_TYPE",
+            "EXPIRATION_STATUS",
+            "HAS_IPS",
+            "HAS_WILDCARDS",
+            "LOG",
+            "LOG_API",
+            "LOG_OPERATOR",
+            "PUBLIC_KEY_ALGORITHM",
+            "SIGNATURE_ALGORITHM",
+            "TLD",
+            "VALIDATION_LEVEL",
+        ],
+        *,
+        ca: SequenceNotStr[str] | Omit = omit,
+        ca_owner: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        duration: List[
+            Literal[
+                "LTE_3D",
+                "GT_3D_LTE_7D",
+                "GT_7D_LTE_10D",
+                "GT_10D_LTE_47D",
+                "GT_47D_LTE_100D",
+                "GT_100D_LTE_200D",
+                "GT_200D",
+            ]
+        ]
+        | Omit = omit,
+        entry_type: List[Literal["PRECERTIFICATE", "CERTIFICATE"]] | Omit = omit,
+        expiration_status: List[Literal["EXPIRED", "VALID"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        has_ips: Iterable[bool] | Omit = omit,
+        has_wildcards: Iterable[bool] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        log: SequenceNotStr[str] | Omit = omit,
+        log_api: List[Literal["RFC6962", "STATIC"]] | Omit = omit,
+        log_operator: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["RAW_VALUES", "PERCENTAGE"] | Omit = omit,
+        public_key_algorithm: List[Literal["DSA", "ECDSA", "RSA"]] | Omit = omit,
+        signature_algorithm: List[
+            Literal[
+                "DSA_SHA_1",
+                "DSA_SHA_256",
+                "ECDSA_SHA_1",
+                "ECDSA_SHA_256",
+                "ECDSA_SHA_384",
+                "ECDSA_SHA_512",
+                "PSS_SHA_256",
+                "PSS_SHA_384",
+                "PSS_SHA_512",
+                "RSA_MD2",
+                "RSA_MD5",
+                "RSA_SHA_1",
+                "RSA_SHA_256",
+                "RSA_SHA_384",
+                "RSA_SHA_512",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        unique_entries: List[Literal["true", "false"]] | Omit = omit,
+        validation_level: List[Literal["DOMAIN", "ORGANIZATION", "EXTENDED"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CTSummaryResponse:
+        """
+        Retrieves an aggregated summary of certificates grouped by the specified
+        dimension.
+
+        Args:
+          dimension: Specifies the certificate attribute by which to group the results.
+
+          ca: Filters results by certificate authority.
+
+          ca_owner: Filters results by certificate authority owner.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          duration: Filters results by certificate duration.
+
+          entry_type: Filters results by entry type (certificate vs. pre-certificate).
+
+          expiration_status: Filters results by expiration status (expired vs. valid).
+
+          format: Format in which results will be returned.
+
+          has_ips: Filters results based on whether the certificates are bound to specific IP
+              addresses.
+
+          has_wildcards: Filters results based on whether the certificates contain wildcard domains.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          log: Filters results by certificate log.
+
+          log_api: Filters results by certificate log API (RFC6962 vs. static).
+
+          log_operator: Filters results by certificate log operator.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          public_key_algorithm: Filters results by public key algorithm.
+
+          signature_algorithm: Filters results by signature algorithm.
+
+          tld: Filters results by top-level domain.
+
+          unique_entries: Specifies whether to filter out duplicate certificates and pre-certificates. Set
+              to true for unique entries only.
+
+          validation_level: Filters results by validation level.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/ct/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "ca": ca,
+                        "ca_owner": ca_owner,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "duration": duration,
+                        "entry_type": entry_type,
+                        "expiration_status": expiration_status,
+                        "format": format,
+                        "has_ips": has_ips,
+                        "has_wildcards": has_wildcards,
+                        "limit_per_group": limit_per_group,
+                        "log": log,
+                        "log_api": log_api,
+                        "log_operator": log_operator,
+                        "name": name,
+                        "normalization": normalization,
+                        "public_key_algorithm": public_key_algorithm,
+                        "signature_algorithm": signature_algorithm,
+                        "tld": tld,
+                        "unique_entries": unique_entries,
+                        "validation_level": validation_level,
+                    },
+                    ct_summary_params.CTSummaryParams,
+                ),
+                post_parser=ResultWrapper[CTSummaryResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CTSummaryResponse], ResultWrapper[CTSummaryResponse]),
+        )
+
+    def timeseries(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        ca: SequenceNotStr[str] | Omit = omit,
+        ca_owner: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        duration: List[
+            Literal[
+                "LTE_3D",
+                "GT_3D_LTE_7D",
+                "GT_7D_LTE_10D",
+                "GT_10D_LTE_47D",
+                "GT_47D_LTE_100D",
+                "GT_100D_LTE_200D",
+                "GT_200D",
+            ]
+        ]
+        | Omit = omit,
+        entry_type: List[Literal["PRECERTIFICATE", "CERTIFICATE"]] | Omit = omit,
+        expiration_status: List[Literal["EXPIRED", "VALID"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        has_ips: Iterable[bool] | Omit = omit,
+        has_wildcards: Iterable[bool] | Omit = omit,
+        log: SequenceNotStr[str] | Omit = omit,
+        log_api: List[Literal["RFC6962", "STATIC"]] | Omit = omit,
+        log_operator: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        public_key_algorithm: List[Literal["DSA", "ECDSA", "RSA"]] | Omit = omit,
+        signature_algorithm: List[
+            Literal[
+                "DSA_SHA_1",
+                "DSA_SHA_256",
+                "ECDSA_SHA_1",
+                "ECDSA_SHA_256",
+                "ECDSA_SHA_384",
+                "ECDSA_SHA_512",
+                "PSS_SHA_256",
+                "PSS_SHA_384",
+                "PSS_SHA_512",
+                "RSA_MD2",
+                "RSA_MD5",
+                "RSA_SHA_1",
+                "RSA_SHA_256",
+                "RSA_SHA_384",
+                "RSA_SHA_512",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        unique_entries: List[Literal["true", "false"]] | Omit = omit,
+        validation_level: List[Literal["DOMAIN", "ORGANIZATION", "EXTENDED"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CTTimeseriesResponse:
+        """
+        Retrieves certificate volume over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          ca: Filters results by certificate authority.
+
+          ca_owner: Filters results by certificate authority owner.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          duration: Filters results by certificate duration.
+
+          entry_type: Filters results by entry type (certificate vs. pre-certificate).
+
+          expiration_status: Filters results by expiration status (expired vs. valid).
+
+          format: Format in which results will be returned.
+
+          has_ips: Filters results based on whether the certificates are bound to specific IP
+              addresses.
+
+          has_wildcards: Filters results based on whether the certificates contain wildcard domains.
+
+          log: Filters results by certificate log.
+
+          log_api: Filters results by certificate log API (RFC6962 vs. static).
+
+          log_operator: Filters results by certificate log operator.
+
+          name: Array of names used to label the series in the response.
+
+          public_key_algorithm: Filters results by public key algorithm.
+
+          signature_algorithm: Filters results by signature algorithm.
+
+          tld: Filters results by top-level domain.
+
+          unique_entries: Specifies whether to filter out duplicate certificates and pre-certificates. Set
+              to true for unique entries only.
+
+          validation_level: Filters results by validation level.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/ct/timeseries",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "ca": ca,
+                        "ca_owner": ca_owner,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "duration": duration,
+                        "entry_type": entry_type,
+                        "expiration_status": expiration_status,
+                        "format": format,
+                        "has_ips": has_ips,
+                        "has_wildcards": has_wildcards,
+                        "log": log,
+                        "log_api": log_api,
+                        "log_operator": log_operator,
+                        "name": name,
+                        "public_key_algorithm": public_key_algorithm,
+                        "signature_algorithm": signature_algorithm,
+                        "tld": tld,
+                        "unique_entries": unique_entries,
+                        "validation_level": validation_level,
+                    },
+                    ct_timeseries_params.CTTimeseriesParams,
+                ),
+                post_parser=ResultWrapper[CTTimeseriesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CTTimeseriesResponse], ResultWrapper[CTTimeseriesResponse]),
+        )
+
+    def timeseries_groups(
+        self,
+        dimension: Literal[
+            "CA",
+            "CA_OWNER",
+            "DURATION",
+            "ENTRY_TYPE",
+            "EXPIRATION_STATUS",
+            "HAS_IPS",
+            "HAS_WILDCARDS",
+            "LOG",
+            "LOG_API",
+            "LOG_OPERATOR",
+            "PUBLIC_KEY_ALGORITHM",
+            "SIGNATURE_ALGORITHM",
+            "TLD",
+            "VALIDATION_LEVEL",
+        ],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        ca: SequenceNotStr[str] | Omit = omit,
+        ca_owner: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        duration: List[
+            Literal[
+                "LTE_3D",
+                "GT_3D_LTE_7D",
+                "GT_7D_LTE_10D",
+                "GT_10D_LTE_47D",
+                "GT_47D_LTE_100D",
+                "GT_100D_LTE_200D",
+                "GT_200D",
+            ]
+        ]
+        | Omit = omit,
+        entry_type: List[Literal["PRECERTIFICATE", "CERTIFICATE"]] | Omit = omit,
+        expiration_status: List[Literal["EXPIRED", "VALID"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        has_ips: Iterable[bool] | Omit = omit,
+        has_wildcards: Iterable[bool] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        log: SequenceNotStr[str] | Omit = omit,
+        log_api: List[Literal["RFC6962", "STATIC"]] | Omit = omit,
+        log_operator: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["RAW_VALUES", "PERCENTAGE"] | Omit = omit,
+        public_key_algorithm: List[Literal["DSA", "ECDSA", "RSA"]] | Omit = omit,
+        signature_algorithm: List[
+            Literal[
+                "DSA_SHA_1",
+                "DSA_SHA_256",
+                "ECDSA_SHA_1",
+                "ECDSA_SHA_256",
+                "ECDSA_SHA_384",
+                "ECDSA_SHA_512",
+                "PSS_SHA_256",
+                "PSS_SHA_384",
+                "PSS_SHA_512",
+                "RSA_MD2",
+                "RSA_MD5",
+                "RSA_SHA_1",
+                "RSA_SHA_256",
+                "RSA_SHA_384",
+                "RSA_SHA_512",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        unique_entries: List[Literal["true", "false"]] | Omit = omit,
+        validation_level: List[Literal["DOMAIN", "ORGANIZATION", "EXTENDED"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CTTimeseriesGroupsResponse:
+        """
+        Retrieves the distribution of certificates grouped by chosen the specified
+        dimension over time.
+
+        Args:
+          dimension: Specifies the certificate attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          ca: Filters results by certificate authority.
+
+          ca_owner: Filters results by certificate authority owner.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          duration: Filters results by certificate duration.
+
+          entry_type: Filters results by entry type (certificate vs. pre-certificate).
+
+          expiration_status: Filters results by expiration status (expired vs. valid).
+
+          format: Format in which results will be returned.
+
+          has_ips: Filters results based on whether the certificates are bound to specific IP
+              addresses.
+
+          has_wildcards: Filters results based on whether the certificates contain wildcard domains.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          log: Filters results by certificate log.
+
+          log_api: Filters results by certificate log API (RFC6962 vs. static).
+
+          log_operator: Filters results by certificate log operator.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          public_key_algorithm: Filters results by public key algorithm.
+
+          signature_algorithm: Filters results by signature algorithm.
+
+          tld: Filters results by top-level domain.
+
+          unique_entries: Specifies whether to filter out duplicate certificates and pre-certificates. Set
+              to true for unique entries only.
+
+          validation_level: Filters results by validation level.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/ct/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "ca": ca,
+                        "ca_owner": ca_owner,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "duration": duration,
+                        "entry_type": entry_type,
+                        "expiration_status": expiration_status,
+                        "format": format,
+                        "has_ips": has_ips,
+                        "has_wildcards": has_wildcards,
+                        "limit_per_group": limit_per_group,
+                        "log": log,
+                        "log_api": log_api,
+                        "log_operator": log_operator,
+                        "name": name,
+                        "normalization": normalization,
+                        "public_key_algorithm": public_key_algorithm,
+                        "signature_algorithm": signature_algorithm,
+                        "tld": tld,
+                        "unique_entries": unique_entries,
+                        "validation_level": validation_level,
+                    },
+                    ct_timeseries_groups_params.CTTimeseriesGroupsParams,
+                ),
+                post_parser=ResultWrapper[CTTimeseriesGroupsResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CTTimeseriesGroupsResponse], ResultWrapper[CTTimeseriesGroupsResponse]),
+        )
+
+
+class AsyncCTResource(AsyncAPIResource):
+    @cached_property
+    def authorities(self) -> AsyncAuthoritiesResource:
+        return AsyncAuthoritiesResource(self._client)
+
+    @cached_property
+    def logs(self) -> AsyncLogsResource:
+        return AsyncLogsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncCTResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCTResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCTResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCTResourceWithStreamingResponse(self)
+
+    async def summary(
+        self,
+        dimension: Literal[
+            "CA",
+            "CA_OWNER",
+            "DURATION",
+            "ENTRY_TYPE",
+            "EXPIRATION_STATUS",
+            "HAS_IPS",
+            "HAS_WILDCARDS",
+            "LOG",
+            "LOG_API",
+            "LOG_OPERATOR",
+            "PUBLIC_KEY_ALGORITHM",
+            "SIGNATURE_ALGORITHM",
+            "TLD",
+            "VALIDATION_LEVEL",
+        ],
+        *,
+        ca: SequenceNotStr[str] | Omit = omit,
+        ca_owner: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        duration: List[
+            Literal[
+                "LTE_3D",
+                "GT_3D_LTE_7D",
+                "GT_7D_LTE_10D",
+                "GT_10D_LTE_47D",
+                "GT_47D_LTE_100D",
+                "GT_100D_LTE_200D",
+                "GT_200D",
+            ]
+        ]
+        | Omit = omit,
+        entry_type: List[Literal["PRECERTIFICATE", "CERTIFICATE"]] | Omit = omit,
+        expiration_status: List[Literal["EXPIRED", "VALID"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        has_ips: Iterable[bool] | Omit = omit,
+        has_wildcards: Iterable[bool] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        log: SequenceNotStr[str] | Omit = omit,
+        log_api: List[Literal["RFC6962", "STATIC"]] | Omit = omit,
+        log_operator: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["RAW_VALUES", "PERCENTAGE"] | Omit = omit,
+        public_key_algorithm: List[Literal["DSA", "ECDSA", "RSA"]] | Omit = omit,
+        signature_algorithm: List[
+            Literal[
+                "DSA_SHA_1",
+                "DSA_SHA_256",
+                "ECDSA_SHA_1",
+                "ECDSA_SHA_256",
+                "ECDSA_SHA_384",
+                "ECDSA_SHA_512",
+                "PSS_SHA_256",
+                "PSS_SHA_384",
+                "PSS_SHA_512",
+                "RSA_MD2",
+                "RSA_MD5",
+                "RSA_SHA_1",
+                "RSA_SHA_256",
+                "RSA_SHA_384",
+                "RSA_SHA_512",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        unique_entries: List[Literal["true", "false"]] | Omit = omit,
+        validation_level: List[Literal["DOMAIN", "ORGANIZATION", "EXTENDED"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CTSummaryResponse:
+        """
+        Retrieves an aggregated summary of certificates grouped by the specified
+        dimension.
+
+        Args:
+          dimension: Specifies the certificate attribute by which to group the results.
+
+          ca: Filters results by certificate authority.
+
+          ca_owner: Filters results by certificate authority owner.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          duration: Filters results by certificate duration.
+
+          entry_type: Filters results by entry type (certificate vs. pre-certificate).
+
+          expiration_status: Filters results by expiration status (expired vs. valid).
+
+          format: Format in which results will be returned.
+
+          has_ips: Filters results based on whether the certificates are bound to specific IP
+              addresses.
+
+          has_wildcards: Filters results based on whether the certificates contain wildcard domains.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          log: Filters results by certificate log.
+
+          log_api: Filters results by certificate log API (RFC6962 vs. static).
+
+          log_operator: Filters results by certificate log operator.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          public_key_algorithm: Filters results by public key algorithm.
+
+          signature_algorithm: Filters results by signature algorithm.
+
+          tld: Filters results by top-level domain.
+
+          unique_entries: Specifies whether to filter out duplicate certificates and pre-certificates. Set
+              to true for unique entries only.
+
+          validation_level: Filters results by validation level.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/ct/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "ca": ca,
+                        "ca_owner": ca_owner,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "duration": duration,
+                        "entry_type": entry_type,
+                        "expiration_status": expiration_status,
+                        "format": format,
+                        "has_ips": has_ips,
+                        "has_wildcards": has_wildcards,
+                        "limit_per_group": limit_per_group,
+                        "log": log,
+                        "log_api": log_api,
+                        "log_operator": log_operator,
+                        "name": name,
+                        "normalization": normalization,
+                        "public_key_algorithm": public_key_algorithm,
+                        "signature_algorithm": signature_algorithm,
+                        "tld": tld,
+                        "unique_entries": unique_entries,
+                        "validation_level": validation_level,
+                    },
+                    ct_summary_params.CTSummaryParams,
+                ),
+                post_parser=ResultWrapper[CTSummaryResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CTSummaryResponse], ResultWrapper[CTSummaryResponse]),
+        )
+
+    async def timeseries(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        ca: SequenceNotStr[str] | Omit = omit,
+        ca_owner: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        duration: List[
+            Literal[
+                "LTE_3D",
+                "GT_3D_LTE_7D",
+                "GT_7D_LTE_10D",
+                "GT_10D_LTE_47D",
+                "GT_47D_LTE_100D",
+                "GT_100D_LTE_200D",
+                "GT_200D",
+            ]
+        ]
+        | Omit = omit,
+        entry_type: List[Literal["PRECERTIFICATE", "CERTIFICATE"]] | Omit = omit,
+        expiration_status: List[Literal["EXPIRED", "VALID"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        has_ips: Iterable[bool] | Omit = omit,
+        has_wildcards: Iterable[bool] | Omit = omit,
+        log: SequenceNotStr[str] | Omit = omit,
+        log_api: List[Literal["RFC6962", "STATIC"]] | Omit = omit,
+        log_operator: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        public_key_algorithm: List[Literal["DSA", "ECDSA", "RSA"]] | Omit = omit,
+        signature_algorithm: List[
+            Literal[
+                "DSA_SHA_1",
+                "DSA_SHA_256",
+                "ECDSA_SHA_1",
+                "ECDSA_SHA_256",
+                "ECDSA_SHA_384",
+                "ECDSA_SHA_512",
+                "PSS_SHA_256",
+                "PSS_SHA_384",
+                "PSS_SHA_512",
+                "RSA_MD2",
+                "RSA_MD5",
+                "RSA_SHA_1",
+                "RSA_SHA_256",
+                "RSA_SHA_384",
+                "RSA_SHA_512",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        unique_entries: List[Literal["true", "false"]] | Omit = omit,
+        validation_level: List[Literal["DOMAIN", "ORGANIZATION", "EXTENDED"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CTTimeseriesResponse:
+        """
+        Retrieves certificate volume over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          ca: Filters results by certificate authority.
+
+          ca_owner: Filters results by certificate authority owner.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          duration: Filters results by certificate duration.
+
+          entry_type: Filters results by entry type (certificate vs. pre-certificate).
+
+          expiration_status: Filters results by expiration status (expired vs. valid).
+
+          format: Format in which results will be returned.
+
+          has_ips: Filters results based on whether the certificates are bound to specific IP
+              addresses.
+
+          has_wildcards: Filters results based on whether the certificates contain wildcard domains.
+
+          log: Filters results by certificate log.
+
+          log_api: Filters results by certificate log API (RFC6962 vs. static).
+
+          log_operator: Filters results by certificate log operator.
+
+          name: Array of names used to label the series in the response.
+
+          public_key_algorithm: Filters results by public key algorithm.
+
+          signature_algorithm: Filters results by signature algorithm.
+
+          tld: Filters results by top-level domain.
+
+          unique_entries: Specifies whether to filter out duplicate certificates and pre-certificates. Set
+              to true for unique entries only.
+
+          validation_level: Filters results by validation level.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/ct/timeseries",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "ca": ca,
+                        "ca_owner": ca_owner,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "duration": duration,
+                        "entry_type": entry_type,
+                        "expiration_status": expiration_status,
+                        "format": format,
+                        "has_ips": has_ips,
+                        "has_wildcards": has_wildcards,
+                        "log": log,
+                        "log_api": log_api,
+                        "log_operator": log_operator,
+                        "name": name,
+                        "public_key_algorithm": public_key_algorithm,
+                        "signature_algorithm": signature_algorithm,
+                        "tld": tld,
+                        "unique_entries": unique_entries,
+                        "validation_level": validation_level,
+                    },
+                    ct_timeseries_params.CTTimeseriesParams,
+                ),
+                post_parser=ResultWrapper[CTTimeseriesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CTTimeseriesResponse], ResultWrapper[CTTimeseriesResponse]),
+        )
+
+    async def timeseries_groups(
+        self,
+        dimension: Literal[
+            "CA",
+            "CA_OWNER",
+            "DURATION",
+            "ENTRY_TYPE",
+            "EXPIRATION_STATUS",
+            "HAS_IPS",
+            "HAS_WILDCARDS",
+            "LOG",
+            "LOG_API",
+            "LOG_OPERATOR",
+            "PUBLIC_KEY_ALGORITHM",
+            "SIGNATURE_ALGORITHM",
+            "TLD",
+            "VALIDATION_LEVEL",
+        ],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        ca: SequenceNotStr[str] | Omit = omit,
+        ca_owner: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        duration: List[
+            Literal[
+                "LTE_3D",
+                "GT_3D_LTE_7D",
+                "GT_7D_LTE_10D",
+                "GT_10D_LTE_47D",
+                "GT_47D_LTE_100D",
+                "GT_100D_LTE_200D",
+                "GT_200D",
+            ]
+        ]
+        | Omit = omit,
+        entry_type: List[Literal["PRECERTIFICATE", "CERTIFICATE"]] | Omit = omit,
+        expiration_status: List[Literal["EXPIRED", "VALID"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        has_ips: Iterable[bool] | Omit = omit,
+        has_wildcards: Iterable[bool] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        log: SequenceNotStr[str] | Omit = omit,
+        log_api: List[Literal["RFC6962", "STATIC"]] | Omit = omit,
+        log_operator: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["RAW_VALUES", "PERCENTAGE"] | Omit = omit,
+        public_key_algorithm: List[Literal["DSA", "ECDSA", "RSA"]] | Omit = omit,
+        signature_algorithm: List[
+            Literal[
+                "DSA_SHA_1",
+                "DSA_SHA_256",
+                "ECDSA_SHA_1",
+                "ECDSA_SHA_256",
+                "ECDSA_SHA_384",
+                "ECDSA_SHA_512",
+                "PSS_SHA_256",
+                "PSS_SHA_384",
+                "PSS_SHA_512",
+                "RSA_MD2",
+                "RSA_MD5",
+                "RSA_SHA_1",
+                "RSA_SHA_256",
+                "RSA_SHA_384",
+                "RSA_SHA_512",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        unique_entries: List[Literal["true", "false"]] | Omit = omit,
+        validation_level: List[Literal["DOMAIN", "ORGANIZATION", "EXTENDED"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CTTimeseriesGroupsResponse:
+        """
+        Retrieves the distribution of certificates grouped by chosen the specified
+        dimension over time.
+
+        Args:
+          dimension: Specifies the certificate attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          ca: Filters results by certificate authority.
+
+          ca_owner: Filters results by certificate authority owner.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          duration: Filters results by certificate duration.
+
+          entry_type: Filters results by entry type (certificate vs. pre-certificate).
+
+          expiration_status: Filters results by expiration status (expired vs. valid).
+
+          format: Format in which results will be returned.
+
+          has_ips: Filters results based on whether the certificates are bound to specific IP
+              addresses.
+
+          has_wildcards: Filters results based on whether the certificates contain wildcard domains.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          log: Filters results by certificate log.
+
+          log_api: Filters results by certificate log API (RFC6962 vs. static).
+
+          log_operator: Filters results by certificate log operator.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          public_key_algorithm: Filters results by public key algorithm.
+
+          signature_algorithm: Filters results by signature algorithm.
+
+          tld: Filters results by top-level domain.
+
+          unique_entries: Specifies whether to filter out duplicate certificates and pre-certificates. Set
+              to true for unique entries only.
+
+          validation_level: Filters results by validation level.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/ct/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "ca": ca,
+                        "ca_owner": ca_owner,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "duration": duration,
+                        "entry_type": entry_type,
+                        "expiration_status": expiration_status,
+                        "format": format,
+                        "has_ips": has_ips,
+                        "has_wildcards": has_wildcards,
+                        "limit_per_group": limit_per_group,
+                        "log": log,
+                        "log_api": log_api,
+                        "log_operator": log_operator,
+                        "name": name,
+                        "normalization": normalization,
+                        "public_key_algorithm": public_key_algorithm,
+                        "signature_algorithm": signature_algorithm,
+                        "tld": tld,
+                        "unique_entries": unique_entries,
+                        "validation_level": validation_level,
+                    },
+                    ct_timeseries_groups_params.CTTimeseriesGroupsParams,
+                ),
+                post_parser=ResultWrapper[CTTimeseriesGroupsResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CTTimeseriesGroupsResponse], ResultWrapper[CTTimeseriesGroupsResponse]),
+        )
+
+
+class CTResourceWithRawResponse:
+    def __init__(self, ct: CTResource) -> None:
+        self._ct = ct
+
+        self.summary = to_raw_response_wrapper(
+            ct.summary,
+        )
+        self.timeseries = to_raw_response_wrapper(
+            ct.timeseries,
+        )
+        self.timeseries_groups = to_raw_response_wrapper(
+            ct.timeseries_groups,
+        )
+
+    @cached_property
+    def authorities(self) -> AuthoritiesResourceWithRawResponse:
+        return AuthoritiesResourceWithRawResponse(self._ct.authorities)
+
+    @cached_property
+    def logs(self) -> LogsResourceWithRawResponse:
+        return LogsResourceWithRawResponse(self._ct.logs)
+
+
+class AsyncCTResourceWithRawResponse:
+    def __init__(self, ct: AsyncCTResource) -> None:
+        self._ct = ct
+
+        self.summary = async_to_raw_response_wrapper(
+            ct.summary,
+        )
+        self.timeseries = async_to_raw_response_wrapper(
+            ct.timeseries,
+        )
+        self.timeseries_groups = async_to_raw_response_wrapper(
+            ct.timeseries_groups,
+        )
+
+    @cached_property
+    def authorities(self) -> AsyncAuthoritiesResourceWithRawResponse:
+        return AsyncAuthoritiesResourceWithRawResponse(self._ct.authorities)
+
+    @cached_property
+    def logs(self) -> AsyncLogsResourceWithRawResponse:
+        return AsyncLogsResourceWithRawResponse(self._ct.logs)
+
+
+class CTResourceWithStreamingResponse:
+    def __init__(self, ct: CTResource) -> None:
+        self._ct = ct
+
+        self.summary = to_streamed_response_wrapper(
+            ct.summary,
+        )
+        self.timeseries = to_streamed_response_wrapper(
+            ct.timeseries,
+        )
+        self.timeseries_groups = to_streamed_response_wrapper(
+            ct.timeseries_groups,
+        )
+
+    @cached_property
+    def authorities(self) -> AuthoritiesResourceWithStreamingResponse:
+        return AuthoritiesResourceWithStreamingResponse(self._ct.authorities)
+
+    @cached_property
+    def logs(self) -> LogsResourceWithStreamingResponse:
+        return LogsResourceWithStreamingResponse(self._ct.logs)
+
+
+class AsyncCTResourceWithStreamingResponse:
+    def __init__(self, ct: AsyncCTResource) -> None:
+        self._ct = ct
+
+        self.summary = async_to_streamed_response_wrapper(
+            ct.summary,
+        )
+        self.timeseries = async_to_streamed_response_wrapper(
+            ct.timeseries,
+        )
+        self.timeseries_groups = async_to_streamed_response_wrapper(
+            ct.timeseries_groups,
+        )
+
+    @cached_property
+    def authorities(self) -> AsyncAuthoritiesResourceWithStreamingResponse:
+        return AsyncAuthoritiesResourceWithStreamingResponse(self._ct.authorities)
+
+    @cached_property
+    def logs(self) -> AsyncLogsResourceWithStreamingResponse:
+        return AsyncLogsResourceWithStreamingResponse(self._ct.logs)
diff --git a/src/cloudflare/resources/radar/ct/logs.py b/src/cloudflare/resources/radar/ct/logs.py
new file mode 100644
index 00000000000..bbd1e8bc52e
--- /dev/null
+++ b/src/cloudflare/resources/radar/ct/logs.py
@@ -0,0 +1,304 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.radar.ct import log_get_params, log_list_params
+from ....types.radar.ct.log_get_response import LogGetResponse
+from ....types.radar.ct.log_list_response import LogListResponse
+
+__all__ = ["LogsResource", "AsyncLogsResource"]
+
+
+class LogsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> LogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return LogsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> LogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return LogsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LogListResponse:
+        """
+        Retrieves a list of certificate logs.
+
+        Args:
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
+
+          offset: Skips the specified number of objects before fetching the results.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/ct/logs",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "format": format,
+                        "limit": limit,
+                        "offset": offset,
+                    },
+                    log_list_params.LogListParams,
+                ),
+                post_parser=ResultWrapper[LogListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LogListResponse], ResultWrapper[LogListResponse]),
+        )
+
+    def get(
+        self,
+        log_slug: str,
+        *,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LogGetResponse:
+        """
+        Retrieves the requested certificate log information.
+
+        Args:
+          log_slug: Certificate log slug.
+
+          format: Format in which results will be returned.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not log_slug:
+            raise ValueError(f"Expected a non-empty value for `log_slug` but received {log_slug!r}")
+        return self._get(
+            f"/radar/ct/logs/{log_slug}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"format": format}, log_get_params.LogGetParams),
+                post_parser=ResultWrapper[LogGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LogGetResponse], ResultWrapper[LogGetResponse]),
+        )
+
+
+class AsyncLogsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncLogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncLogsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncLogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncLogsResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        *,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LogListResponse:
+        """
+        Retrieves a list of certificate logs.
+
+        Args:
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
+
+          offset: Skips the specified number of objects before fetching the results.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/ct/logs",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "format": format,
+                        "limit": limit,
+                        "offset": offset,
+                    },
+                    log_list_params.LogListParams,
+                ),
+                post_parser=ResultWrapper[LogListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LogListResponse], ResultWrapper[LogListResponse]),
+        )
+
+    async def get(
+        self,
+        log_slug: str,
+        *,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LogGetResponse:
+        """
+        Retrieves the requested certificate log information.
+
+        Args:
+          log_slug: Certificate log slug.
+
+          format: Format in which results will be returned.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not log_slug:
+            raise ValueError(f"Expected a non-empty value for `log_slug` but received {log_slug!r}")
+        return await self._get(
+            f"/radar/ct/logs/{log_slug}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"format": format}, log_get_params.LogGetParams),
+                post_parser=ResultWrapper[LogGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[LogGetResponse], ResultWrapper[LogGetResponse]),
+        )
+
+
+class LogsResourceWithRawResponse:
+    def __init__(self, logs: LogsResource) -> None:
+        self._logs = logs
+
+        self.list = to_raw_response_wrapper(
+            logs.list,
+        )
+        self.get = to_raw_response_wrapper(
+            logs.get,
+        )
+
+
+class AsyncLogsResourceWithRawResponse:
+    def __init__(self, logs: AsyncLogsResource) -> None:
+        self._logs = logs
+
+        self.list = async_to_raw_response_wrapper(
+            logs.list,
+        )
+        self.get = async_to_raw_response_wrapper(
+            logs.get,
+        )
+
+
+class LogsResourceWithStreamingResponse:
+    def __init__(self, logs: LogsResource) -> None:
+        self._logs = logs
+
+        self.list = to_streamed_response_wrapper(
+            logs.list,
+        )
+        self.get = to_streamed_response_wrapper(
+            logs.get,
+        )
+
+
+class AsyncLogsResourceWithStreamingResponse:
+    def __init__(self, logs: AsyncLogsResource) -> None:
+        self._logs = logs
+
+        self.list = async_to_streamed_response_wrapper(
+            logs.list,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            logs.get,
+        )
diff --git a/src/cloudflare/resources/radar/datasets.py b/src/cloudflare/resources/radar/datasets.py
index 632237f86d6..1b387e46fa6 100644
--- a/src/cloudflare/resources/radar/datasets.py
+++ b/src/cloudflare/resources/radar/datasets.py
@@ -2,16 +2,14 @@
 
 from __future__ import annotations
 
-from typing import Type, cast
+from typing import Type, Union, cast
+from datetime import date
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -32,37 +30,51 @@
 class DatasetsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DatasetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DatasetsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DatasetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DatasetsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
-        dataset_type: Literal["RANKING_BUCKET", "REPORT"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        offset: int | NotGiven = NOT_GIVEN,
+        dataset_type: Literal["RANKING_BUCKET", "REPORT"] | Omit = omit,
+        date: Union[str, date] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> DatasetListResponse:
         """
-        Get a list of datasets.
+        Retrieves a list of datasets.
 
         Args:
-          dataset_type: Dataset type.
+          dataset_type: Filters results by dataset type.
+
+          date: Filters results by the specified date.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          offset: Number of objects to skip before grabbing results.
+          offset: Skips the specified number of objects before fetching the results.
 
           extra_headers: Send extra headers
 
@@ -82,6 +94,7 @@ def list(
                 query=maybe_transform(
                     {
                         "dataset_type": dataset_type,
+                        "date": date,
                         "format": format,
                         "limit": limit,
                         "offset": offset,
@@ -97,19 +110,19 @@ def download(
         self,
         *,
         dataset_id: int,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> DatasetDownloadResponse:
         """
-        Get a url to download a single dataset.
+        Retrieves an URL to download a single dataset.
 
         Args:
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
           extra_headers: Send extra headers
 
@@ -142,16 +155,16 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> str:
-        """Get the csv content of a given dataset by alias or id.
+        """Retrieves the CSV content of a given dataset by alias or ID.
 
-        When getting the content
-        by alias the latest dataset is returned, optionally filtered by the latest
-        available at a given date.
+        When getting the
+        content by alias the latest dataset is returned, optionally filtered by the
+        latest available at a given date.
 
         Args:
-          alias: Dataset alias or id
+          alias: Dataset alias or ID.
 
           extra_headers: Send extra headers
 
@@ -176,37 +189,51 @@ def get(
 class AsyncDatasetsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDatasetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDatasetsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDatasetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDatasetsResourceWithStreamingResponse(self)
 
     async def list(
         self,
         *,
-        dataset_type: Literal["RANKING_BUCKET", "REPORT"] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        offset: int | NotGiven = NOT_GIVEN,
+        dataset_type: Literal["RANKING_BUCKET", "REPORT"] | Omit = omit,
+        date: Union[str, date] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> DatasetListResponse:
         """
-        Get a list of datasets.
+        Retrieves a list of datasets.
 
         Args:
-          dataset_type: Dataset type.
+          dataset_type: Filters results by dataset type.
+
+          date: Filters results by the specified date.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          offset: Number of objects to skip before grabbing results.
+          offset: Skips the specified number of objects before fetching the results.
 
           extra_headers: Send extra headers
 
@@ -226,6 +253,7 @@ async def list(
                 query=await async_maybe_transform(
                     {
                         "dataset_type": dataset_type,
+                        "date": date,
                         "format": format,
                         "limit": limit,
                         "offset": offset,
@@ -241,19 +269,19 @@ async def download(
         self,
         *,
         dataset_id: int,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> DatasetDownloadResponse:
         """
-        Get a url to download a single dataset.
+        Retrieves an URL to download a single dataset.
 
         Args:
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
           extra_headers: Send extra headers
 
@@ -286,16 +314,16 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> str:
-        """Get the csv content of a given dataset by alias or id.
+        """Retrieves the CSV content of a given dataset by alias or ID.
 
-        When getting the content
-        by alias the latest dataset is returned, optionally filtered by the latest
-        available at a given date.
+        When getting the
+        content by alias the latest dataset is returned, optionally filtered by the
+        latest available at a given date.
 
         Args:
-          alias: Dataset alias or id
+          alias: Dataset alias or ID.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/dns/__init__.py b/src/cloudflare/resources/radar/dns/__init__.py
index c6dbec78760..71c475bb3c8 100644
--- a/src/cloudflare/resources/radar/dns/__init__.py
+++ b/src/cloudflare/resources/radar/dns/__init__.py
@@ -16,6 +16,22 @@
     TopResourceWithStreamingResponse,
     AsyncTopResourceWithStreamingResponse,
 )
+from .summary import (
+    SummaryResource,
+    AsyncSummaryResource,
+    SummaryResourceWithRawResponse,
+    AsyncSummaryResourceWithRawResponse,
+    SummaryResourceWithStreamingResponse,
+    AsyncSummaryResourceWithStreamingResponse,
+)
+from .timeseries_groups import (
+    TimeseriesGroupsResource,
+    AsyncTimeseriesGroupsResource,
+    TimeseriesGroupsResourceWithRawResponse,
+    AsyncTimeseriesGroupsResourceWithRawResponse,
+    TimeseriesGroupsResourceWithStreamingResponse,
+    AsyncTimeseriesGroupsResourceWithStreamingResponse,
+)
 
 __all__ = [
     "TopResource",
@@ -24,6 +40,18 @@
     "AsyncTopResourceWithRawResponse",
     "TopResourceWithStreamingResponse",
     "AsyncTopResourceWithStreamingResponse",
+    "SummaryResource",
+    "AsyncSummaryResource",
+    "SummaryResourceWithRawResponse",
+    "AsyncSummaryResourceWithRawResponse",
+    "SummaryResourceWithStreamingResponse",
+    "AsyncSummaryResourceWithStreamingResponse",
+    "TimeseriesGroupsResource",
+    "AsyncTimeseriesGroupsResource",
+    "TimeseriesGroupsResourceWithRawResponse",
+    "AsyncTimeseriesGroupsResourceWithRawResponse",
+    "TimeseriesGroupsResourceWithStreamingResponse",
+    "AsyncTimeseriesGroupsResourceWithStreamingResponse",
     "DNSResource",
     "AsyncDNSResource",
     "DNSResourceWithRawResponse",
diff --git a/src/cloudflare/resources/radar/dns/dns.py b/src/cloudflare/resources/radar/dns/dns.py
index 539843254a8..fd383b017c0 100644
--- a/src/cloudflare/resources/radar/dns/dns.py
+++ b/src/cloudflare/resources/radar/dns/dns.py
@@ -2,6 +2,12 @@
 
 from __future__ import annotations
 
+from typing import List, Type, Union, Iterable, Optional, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
 from .top import (
     TopResource,
     AsyncTopResource,
@@ -10,8 +16,38 @@
     TopResourceWithStreamingResponse,
     AsyncTopResourceWithStreamingResponse,
 )
+from .summary import (
+    SummaryResource,
+    AsyncSummaryResource,
+    SummaryResourceWithRawResponse,
+    AsyncSummaryResourceWithRawResponse,
+    SummaryResourceWithStreamingResponse,
+    AsyncSummaryResourceWithStreamingResponse,
+)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....types.radar import dns_summary_v2_params, dns_timeseries_params, dns_timeseries_groups_v2_params
+from ...._base_client import make_request_options
+from .timeseries_groups import (
+    TimeseriesGroupsResource,
+    AsyncTimeseriesGroupsResource,
+    TimeseriesGroupsResourceWithRawResponse,
+    AsyncTimeseriesGroupsResourceWithRawResponse,
+    TimeseriesGroupsResourceWithStreamingResponse,
+    AsyncTimeseriesGroupsResourceWithStreamingResponse,
+)
+from ....types.radar.dns_summary_v2_response import DNSSummaryV2Response
+from ....types.radar.dns_timeseries_response import DNSTimeseriesResponse
+from ....types.radar.dns_timeseries_groups_v2_response import DNSTimeseriesGroupsV2Response
 
 __all__ = ["DNSResource", "AsyncDNSResource"]
 
@@ -21,60 +57,1786 @@ class DNSResource(SyncAPIResource):
     def top(self) -> TopResource:
         return TopResource(self._client)
 
+    @cached_property
+    def summary(self) -> SummaryResource:
+        return SummaryResource(self._client)
+
+    @cached_property
+    def timeseries_groups(self) -> TimeseriesGroupsResource:
+        return TimeseriesGroupsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> DNSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DNSResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DNSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DNSResourceWithStreamingResponse(self)
 
+    def summary_v2(
+        self,
+        dimension: Literal[
+            "IP_VERSION",
+            "CACHE_HIT",
+            "DNSSEC",
+            "DNSSEC_AWARE",
+            "DNSSEC_E2E",
+            "MATCHING_ANSWER",
+            "PROTOCOL",
+            "QUERY_TYPE",
+            "RESPONSE_CODE",
+            "RESPONSE_TTL",
+            "TLD",
+            "TLD_DNS_MAGNITUDE",
+        ],
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        cache_hit: Iterable[bool] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dnssec: List[Literal["INVALID", "INSECURE", "SECURE", "OTHER"]] | Omit = omit,
+        dnssec_aware: List[Literal["SUPPORTED", "NOT_SUPPORTED"]] | Omit = omit,
+        dnssec_e2e: Iterable[bool] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        matching_answer: Iterable[bool] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        response_ttl: List[
+            Literal["LTE_1M", "GT_1M_LTE_5M", "GT_5M_LTE_15M", "GT_15M_LTE_1H", "GT_1H_LTE_1D", "GT_1D_LTE_1W", "GT_1W"]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DNSSummaryV2Response:
+        """
+        Retrieves the distribution of DNS queries by the specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          cache_hit: Filters results based on cache status.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          dnssec: Filters results based on DNSSEC (DNS Security Extensions) support.
+
+          dnssec_aware: Filters results based on DNSSEC (DNS Security Extensions) client awareness.
+
+          dnssec_e2e: Filters results based on DNSSEC-validated answers by end-to-end security status.
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          matching_answer: Filters results based on whether the queries have a matching answer.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          response_ttl: Filters results by DNS response TTL.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/dns/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "cache_hit": cache_hit,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "dnssec": dnssec,
+                        "dnssec_aware": dnssec_aware,
+                        "dnssec_e2e": dnssec_e2e,
+                        "format": format,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "matching_answer": matching_answer,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "response_ttl": response_ttl,
+                        "tld": tld,
+                    },
+                    dns_summary_v2_params.DNSSummaryV2Params,
+                ),
+                post_parser=ResultWrapper[DNSSummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[DNSSummaryV2Response], ResultWrapper[DNSSummaryV2Response]),
+        )
+
+    def timeseries(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        cache_hit: Iterable[bool] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dnssec: List[Literal["INVALID", "INSECURE", "SECURE", "OTHER"]] | Omit = omit,
+        dnssec_aware: List[Literal["SUPPORTED", "NOT_SUPPORTED"]] | Omit = omit,
+        dnssec_e2e: Iterable[bool] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        matching_answer: Iterable[bool] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        response_ttl: List[
+            Literal["LTE_1M", "GT_1M_LTE_5M", "GT_5M_LTE_15M", "GT_15M_LTE_1H", "GT_1H_LTE_1D", "GT_1D_LTE_1W", "GT_1W"]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DNSTimeseriesResponse:
+        """
+        Retrieves normalized query volume to the 1.1.1.1 DNS resolver over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          cache_hit: Filters results based on cache status.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          dnssec: Filters results based on DNSSEC (DNS Security Extensions) support.
+
+          dnssec_aware: Filters results based on DNSSEC (DNS Security Extensions) client awareness.
+
+          dnssec_e2e: Filters results based on DNSSEC-validated answers by end-to-end security status.
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          matching_answer: Filters results based on whether the queries have a matching answer.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          response_ttl: Filters results by DNS response TTL.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/timeseries",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "cache_hit": cache_hit,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "dnssec": dnssec,
+                        "dnssec_aware": dnssec_aware,
+                        "dnssec_e2e": dnssec_e2e,
+                        "format": format,
+                        "ip_version": ip_version,
+                        "location": location,
+                        "matching_answer": matching_answer,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "response_ttl": response_ttl,
+                        "tld": tld,
+                    },
+                    dns_timeseries_params.DNSTimeseriesParams,
+                ),
+                post_parser=ResultWrapper[DNSTimeseriesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DNSTimeseriesResponse], ResultWrapper[DNSTimeseriesResponse]),
+        )
+
+    def timeseries_groups_v2(
+        self,
+        dimension: Literal[
+            "IP_VERSION",
+            "CACHE_HIT",
+            "DNSSEC",
+            "DNSSEC_AWARE",
+            "DNSSEC_E2E",
+            "MATCHING_ANSWER",
+            "PROTOCOL",
+            "QUERY_TYPE",
+            "RESPONSE_CODE",
+            "RESPONSE_TTL",
+            "TLD",
+        ],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        cache_hit: Iterable[bool] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dnssec: List[Literal["INVALID", "INSECURE", "SECURE", "OTHER"]] | Omit = omit,
+        dnssec_aware: List[Literal["SUPPORTED", "NOT_SUPPORTED"]] | Omit = omit,
+        dnssec_e2e: Iterable[bool] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        matching_answer: Iterable[bool] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        response_ttl: List[
+            Literal["LTE_1M", "GT_1M_LTE_5M", "GT_5M_LTE_15M", "GT_15M_LTE_1H", "GT_1H_LTE_1D", "GT_1D_LTE_1W", "GT_1W"]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DNSTimeseriesGroupsV2Response:
+        """
+        Retrieves the distribution of DNS queries grouped by dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          cache_hit: Filters results based on cache status.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          dnssec: Filters results based on DNSSEC (DNS Security Extensions) support.
+
+          dnssec_aware: Filters results based on DNSSEC (DNS Security Extensions) client awareness.
+
+          dnssec_e2e: Filters results based on DNSSEC-validated answers by end-to-end security status.
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          matching_answer: Filters results based on whether the queries have a matching answer.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          response_ttl: Filters results by DNS response TTL.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/dns/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "cache_hit": cache_hit,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "dnssec": dnssec,
+                        "dnssec_aware": dnssec_aware,
+                        "dnssec_e2e": dnssec_e2e,
+                        "format": format,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "matching_answer": matching_answer,
+                        "name": name,
+                        "nodata": nodata,
+                        "normalization": normalization,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "response_ttl": response_ttl,
+                        "tld": tld,
+                    },
+                    dns_timeseries_groups_v2_params.DNSTimeseriesGroupsV2Params,
+                ),
+                post_parser=ResultWrapper[DNSTimeseriesGroupsV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[DNSTimeseriesGroupsV2Response], ResultWrapper[DNSTimeseriesGroupsV2Response]),
+        )
+
 
 class AsyncDNSResource(AsyncAPIResource):
     @cached_property
     def top(self) -> AsyncTopResource:
         return AsyncTopResource(self._client)
 
+    @cached_property
+    def summary(self) -> AsyncSummaryResource:
+        return AsyncSummaryResource(self._client)
+
+    @cached_property
+    def timeseries_groups(self) -> AsyncTimeseriesGroupsResource:
+        return AsyncTimeseriesGroupsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncDNSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDNSResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDNSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDNSResourceWithStreamingResponse(self)
 
+    async def summary_v2(
+        self,
+        dimension: Literal[
+            "IP_VERSION",
+            "CACHE_HIT",
+            "DNSSEC",
+            "DNSSEC_AWARE",
+            "DNSSEC_E2E",
+            "MATCHING_ANSWER",
+            "PROTOCOL",
+            "QUERY_TYPE",
+            "RESPONSE_CODE",
+            "RESPONSE_TTL",
+            "TLD",
+            "TLD_DNS_MAGNITUDE",
+        ],
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        cache_hit: Iterable[bool] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dnssec: List[Literal["INVALID", "INSECURE", "SECURE", "OTHER"]] | Omit = omit,
+        dnssec_aware: List[Literal["SUPPORTED", "NOT_SUPPORTED"]] | Omit = omit,
+        dnssec_e2e: Iterable[bool] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        matching_answer: Iterable[bool] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        response_ttl: List[
+            Literal["LTE_1M", "GT_1M_LTE_5M", "GT_5M_LTE_15M", "GT_15M_LTE_1H", "GT_1H_LTE_1D", "GT_1D_LTE_1W", "GT_1W"]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DNSSummaryV2Response:
+        """
+        Retrieves the distribution of DNS queries by the specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          cache_hit: Filters results based on cache status.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          dnssec: Filters results based on DNSSEC (DNS Security Extensions) support.
+
+          dnssec_aware: Filters results based on DNSSEC (DNS Security Extensions) client awareness.
+
+          dnssec_e2e: Filters results based on DNSSEC-validated answers by end-to-end security status.
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          matching_answer: Filters results based on whether the queries have a matching answer.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          response_ttl: Filters results by DNS response TTL.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/dns/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "cache_hit": cache_hit,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "dnssec": dnssec,
+                        "dnssec_aware": dnssec_aware,
+                        "dnssec_e2e": dnssec_e2e,
+                        "format": format,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "matching_answer": matching_answer,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "response_ttl": response_ttl,
+                        "tld": tld,
+                    },
+                    dns_summary_v2_params.DNSSummaryV2Params,
+                ),
+                post_parser=ResultWrapper[DNSSummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[DNSSummaryV2Response], ResultWrapper[DNSSummaryV2Response]),
+        )
+
+    async def timeseries(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        cache_hit: Iterable[bool] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dnssec: List[Literal["INVALID", "INSECURE", "SECURE", "OTHER"]] | Omit = omit,
+        dnssec_aware: List[Literal["SUPPORTED", "NOT_SUPPORTED"]] | Omit = omit,
+        dnssec_e2e: Iterable[bool] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        matching_answer: Iterable[bool] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        response_ttl: List[
+            Literal["LTE_1M", "GT_1M_LTE_5M", "GT_5M_LTE_15M", "GT_15M_LTE_1H", "GT_1H_LTE_1D", "GT_1D_LTE_1W", "GT_1W"]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DNSTimeseriesResponse:
+        """
+        Retrieves normalized query volume to the 1.1.1.1 DNS resolver over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          cache_hit: Filters results based on cache status.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          dnssec: Filters results based on DNSSEC (DNS Security Extensions) support.
+
+          dnssec_aware: Filters results based on DNSSEC (DNS Security Extensions) client awareness.
+
+          dnssec_e2e: Filters results based on DNSSEC-validated answers by end-to-end security status.
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          matching_answer: Filters results based on whether the queries have a matching answer.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          response_ttl: Filters results by DNS response TTL.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/timeseries",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "cache_hit": cache_hit,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "dnssec": dnssec,
+                        "dnssec_aware": dnssec_aware,
+                        "dnssec_e2e": dnssec_e2e,
+                        "format": format,
+                        "ip_version": ip_version,
+                        "location": location,
+                        "matching_answer": matching_answer,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "response_ttl": response_ttl,
+                        "tld": tld,
+                    },
+                    dns_timeseries_params.DNSTimeseriesParams,
+                ),
+                post_parser=ResultWrapper[DNSTimeseriesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DNSTimeseriesResponse], ResultWrapper[DNSTimeseriesResponse]),
+        )
+
+    async def timeseries_groups_v2(
+        self,
+        dimension: Literal[
+            "IP_VERSION",
+            "CACHE_HIT",
+            "DNSSEC",
+            "DNSSEC_AWARE",
+            "DNSSEC_E2E",
+            "MATCHING_ANSWER",
+            "PROTOCOL",
+            "QUERY_TYPE",
+            "RESPONSE_CODE",
+            "RESPONSE_TTL",
+            "TLD",
+        ],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        cache_hit: Iterable[bool] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dnssec: List[Literal["INVALID", "INSECURE", "SECURE", "OTHER"]] | Omit = omit,
+        dnssec_aware: List[Literal["SUPPORTED", "NOT_SUPPORTED"]] | Omit = omit,
+        dnssec_e2e: Iterable[bool] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        matching_answer: Iterable[bool] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        response_ttl: List[
+            Literal["LTE_1M", "GT_1M_LTE_5M", "GT_5M_LTE_15M", "GT_15M_LTE_1H", "GT_1H_LTE_1D", "GT_1D_LTE_1W", "GT_1W"]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DNSTimeseriesGroupsV2Response:
+        """
+        Retrieves the distribution of DNS queries grouped by dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          cache_hit: Filters results based on cache status.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          dnssec: Filters results based on DNSSEC (DNS Security Extensions) support.
+
+          dnssec_aware: Filters results based on DNSSEC (DNS Security Extensions) client awareness.
+
+          dnssec_e2e: Filters results based on DNSSEC-validated answers by end-to-end security status.
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          matching_answer: Filters results based on whether the queries have a matching answer.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          response_ttl: Filters results by DNS response TTL.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/dns/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "cache_hit": cache_hit,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "dnssec": dnssec,
+                        "dnssec_aware": dnssec_aware,
+                        "dnssec_e2e": dnssec_e2e,
+                        "format": format,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "matching_answer": matching_answer,
+                        "name": name,
+                        "nodata": nodata,
+                        "normalization": normalization,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "response_ttl": response_ttl,
+                        "tld": tld,
+                    },
+                    dns_timeseries_groups_v2_params.DNSTimeseriesGroupsV2Params,
+                ),
+                post_parser=ResultWrapper[DNSTimeseriesGroupsV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[DNSTimeseriesGroupsV2Response], ResultWrapper[DNSTimeseriesGroupsV2Response]),
+        )
+
 
 class DNSResourceWithRawResponse:
     def __init__(self, dns: DNSResource) -> None:
         self._dns = dns
 
+        self.summary_v2 = to_raw_response_wrapper(
+            dns.summary_v2,
+        )
+        self.timeseries = to_raw_response_wrapper(
+            dns.timeseries,
+        )
+        self.timeseries_groups_v2 = to_raw_response_wrapper(
+            dns.timeseries_groups_v2,
+        )
+
     @cached_property
     def top(self) -> TopResourceWithRawResponse:
         return TopResourceWithRawResponse(self._dns.top)
 
+    @cached_property
+    def summary(self) -> SummaryResourceWithRawResponse:
+        return SummaryResourceWithRawResponse(self._dns.summary)
+
+    @cached_property
+    def timeseries_groups(self) -> TimeseriesGroupsResourceWithRawResponse:
+        return TimeseriesGroupsResourceWithRawResponse(self._dns.timeseries_groups)
+
 
 class AsyncDNSResourceWithRawResponse:
     def __init__(self, dns: AsyncDNSResource) -> None:
         self._dns = dns
 
+        self.summary_v2 = async_to_raw_response_wrapper(
+            dns.summary_v2,
+        )
+        self.timeseries = async_to_raw_response_wrapper(
+            dns.timeseries,
+        )
+        self.timeseries_groups_v2 = async_to_raw_response_wrapper(
+            dns.timeseries_groups_v2,
+        )
+
     @cached_property
     def top(self) -> AsyncTopResourceWithRawResponse:
         return AsyncTopResourceWithRawResponse(self._dns.top)
 
+    @cached_property
+    def summary(self) -> AsyncSummaryResourceWithRawResponse:
+        return AsyncSummaryResourceWithRawResponse(self._dns.summary)
+
+    @cached_property
+    def timeseries_groups(self) -> AsyncTimeseriesGroupsResourceWithRawResponse:
+        return AsyncTimeseriesGroupsResourceWithRawResponse(self._dns.timeseries_groups)
+
 
 class DNSResourceWithStreamingResponse:
     def __init__(self, dns: DNSResource) -> None:
         self._dns = dns
 
+        self.summary_v2 = to_streamed_response_wrapper(
+            dns.summary_v2,
+        )
+        self.timeseries = to_streamed_response_wrapper(
+            dns.timeseries,
+        )
+        self.timeseries_groups_v2 = to_streamed_response_wrapper(
+            dns.timeseries_groups_v2,
+        )
+
     @cached_property
     def top(self) -> TopResourceWithStreamingResponse:
         return TopResourceWithStreamingResponse(self._dns.top)
 
+    @cached_property
+    def summary(self) -> SummaryResourceWithStreamingResponse:
+        return SummaryResourceWithStreamingResponse(self._dns.summary)
+
+    @cached_property
+    def timeseries_groups(self) -> TimeseriesGroupsResourceWithStreamingResponse:
+        return TimeseriesGroupsResourceWithStreamingResponse(self._dns.timeseries_groups)
+
 
 class AsyncDNSResourceWithStreamingResponse:
     def __init__(self, dns: AsyncDNSResource) -> None:
         self._dns = dns
 
+        self.summary_v2 = async_to_streamed_response_wrapper(
+            dns.summary_v2,
+        )
+        self.timeseries = async_to_streamed_response_wrapper(
+            dns.timeseries,
+        )
+        self.timeseries_groups_v2 = async_to_streamed_response_wrapper(
+            dns.timeseries_groups_v2,
+        )
+
     @cached_property
     def top(self) -> AsyncTopResourceWithStreamingResponse:
         return AsyncTopResourceWithStreamingResponse(self._dns.top)
+
+    @cached_property
+    def summary(self) -> AsyncSummaryResourceWithStreamingResponse:
+        return AsyncSummaryResourceWithStreamingResponse(self._dns.summary)
+
+    @cached_property
+    def timeseries_groups(self) -> AsyncTimeseriesGroupsResourceWithStreamingResponse:
+        return AsyncTimeseriesGroupsResourceWithStreamingResponse(self._dns.timeseries_groups)
diff --git a/src/cloudflare/resources/radar/dns/summary.py b/src/cloudflare/resources/radar/dns/summary.py
new file mode 100644
index 00000000000..da5d0b0af8e
--- /dev/null
+++ b/src/cloudflare/resources/radar/dns/summary.py
@@ -0,0 +1,4485 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import typing_extensions
+from typing import List, Type, Union, Iterable, Optional, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.radar.dns import (
+    summary_dnssec_params,
+    summary_protocol_params,
+    summary_cache_hit_params,
+    summary_dnssec_e2e_params,
+    summary_ip_version_params,
+    summary_query_type_params,
+    summary_dnssec_aware_params,
+    summary_response_ttl_params,
+    summary_response_code_params,
+    summary_matching_answer_params,
+)
+from ....types.radar.dns.summary_dnssec_response import SummaryDNSSECResponse
+from ....types.radar.dns.summary_protocol_response import SummaryProtocolResponse
+from ....types.radar.dns.summary_cache_hit_response import SummaryCacheHitResponse
+from ....types.radar.dns.summary_dnssec_e2e_response import SummaryDNSSECE2EResponse
+from ....types.radar.dns.summary_ip_version_response import SummaryIPVersionResponse
+from ....types.radar.dns.summary_query_type_response import SummaryQueryTypeResponse
+from ....types.radar.dns.summary_dnssec_aware_response import SummaryDNSSECAwareResponse
+from ....types.radar.dns.summary_response_ttl_response import SummaryResponseTTLResponse
+from ....types.radar.dns.summary_response_code_response import SummaryResponseCodeResponse
+from ....types.radar.dns.summary_matching_answer_response import SummaryMatchingAnswerResponse
+
+__all__ = ["SummaryResource", "AsyncSummaryResource"]
+
+
+class SummaryResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SummaryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SummaryResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    def cache_hit(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryCacheHitResponse:
+        """
+        Retrieves the distribution of DNS queries by cache status.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/summary/cache_hit",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    summary_cache_hit_params.SummaryCacheHitParams,
+                ),
+                post_parser=ResultWrapper[SummaryCacheHitResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryCacheHitResponse], ResultWrapper[SummaryCacheHitResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    def dnssec(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryDNSSECResponse:
+        """
+        Retrieves the distribution of DNS responses by DNSSEC (DNS Security Extensions)
+        support.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/summary/dnssec",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    summary_dnssec_params.SummaryDNSSECParams,
+                ),
+                post_parser=ResultWrapper[SummaryDNSSECResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryDNSSECResponse], ResultWrapper[SummaryDNSSECResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    def dnssec_aware(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryDNSSECAwareResponse:
+        """
+        Retrieves the distribution of DNS queries by DNSSEC (DNS Security Extensions)
+        client awareness.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/summary/dnssec_aware",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    summary_dnssec_aware_params.SummaryDNSSECAwareParams,
+                ),
+                post_parser=ResultWrapper[SummaryDNSSECAwareResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryDNSSECAwareResponse], ResultWrapper[SummaryDNSSECAwareResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    def dnssec_e2e(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryDNSSECE2EResponse:
+        """
+        Retrieves the distribution of DNSSEC-validated answers by end-to-end security
+        status.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/summary/dnssec_e2e",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    summary_dnssec_e2e_params.SummaryDNSSECE2EParams,
+                ),
+                post_parser=ResultWrapper[SummaryDNSSECE2EResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryDNSSECE2EResponse], ResultWrapper[SummaryDNSSECE2EResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    def ip_version(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryIPVersionResponse:
+        """
+        Retrieves the distribution of DNS queries by IP version.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/summary/ip_version",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    summary_ip_version_params.SummaryIPVersionParams,
+                ),
+                post_parser=ResultWrapper[SummaryIPVersionResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryIPVersionResponse], ResultWrapper[SummaryIPVersionResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    def matching_answer(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryMatchingAnswerResponse:
+        """
+        Retrieves the distribution of DNS queries by matching answers.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/summary/matching_answer",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    summary_matching_answer_params.SummaryMatchingAnswerParams,
+                ),
+                post_parser=ResultWrapper[SummaryMatchingAnswerResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryMatchingAnswerResponse], ResultWrapper[SummaryMatchingAnswerResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    def protocol(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryProtocolResponse:
+        """
+        Retrieves the distribution of DNS queries by DNS transport protocol.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/summary/protocol",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    summary_protocol_params.SummaryProtocolParams,
+                ),
+                post_parser=ResultWrapper[SummaryProtocolResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryProtocolResponse], ResultWrapper[SummaryProtocolResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    def query_type(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryQueryTypeResponse:
+        """
+        Retrieves the distribution of DNS queries by type.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/summary/query_type",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    summary_query_type_params.SummaryQueryTypeParams,
+                ),
+                post_parser=ResultWrapper[SummaryQueryTypeResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryQueryTypeResponse], ResultWrapper[SummaryQueryTypeResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    def response_code(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryResponseCodeResponse:
+        """
+        Retrieves the distribution of DNS queries by response code.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/summary/response_code",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "tld": tld,
+                    },
+                    summary_response_code_params.SummaryResponseCodeParams,
+                ),
+                post_parser=ResultWrapper[SummaryResponseCodeResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryResponseCodeResponse], ResultWrapper[SummaryResponseCodeResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    def response_ttl(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryResponseTTLResponse:
+        """
+        Retrieves the distribution of DNS queries by minimum response TTL.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/summary/response_ttl",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    summary_response_ttl_params.SummaryResponseTTLParams,
+                ),
+                post_parser=ResultWrapper[SummaryResponseTTLResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryResponseTTLResponse], ResultWrapper[SummaryResponseTTLResponse]),
+        )
+
+
+class AsyncSummaryResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSummaryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSummaryResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    async def cache_hit(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryCacheHitResponse:
+        """
+        Retrieves the distribution of DNS queries by cache status.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/summary/cache_hit",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    summary_cache_hit_params.SummaryCacheHitParams,
+                ),
+                post_parser=ResultWrapper[SummaryCacheHitResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryCacheHitResponse], ResultWrapper[SummaryCacheHitResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    async def dnssec(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryDNSSECResponse:
+        """
+        Retrieves the distribution of DNS responses by DNSSEC (DNS Security Extensions)
+        support.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/summary/dnssec",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    summary_dnssec_params.SummaryDNSSECParams,
+                ),
+                post_parser=ResultWrapper[SummaryDNSSECResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryDNSSECResponse], ResultWrapper[SummaryDNSSECResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    async def dnssec_aware(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryDNSSECAwareResponse:
+        """
+        Retrieves the distribution of DNS queries by DNSSEC (DNS Security Extensions)
+        client awareness.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/summary/dnssec_aware",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    summary_dnssec_aware_params.SummaryDNSSECAwareParams,
+                ),
+                post_parser=ResultWrapper[SummaryDNSSECAwareResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryDNSSECAwareResponse], ResultWrapper[SummaryDNSSECAwareResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    async def dnssec_e2e(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryDNSSECE2EResponse:
+        """
+        Retrieves the distribution of DNSSEC-validated answers by end-to-end security
+        status.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/summary/dnssec_e2e",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    summary_dnssec_e2e_params.SummaryDNSSECE2EParams,
+                ),
+                post_parser=ResultWrapper[SummaryDNSSECE2EResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryDNSSECE2EResponse], ResultWrapper[SummaryDNSSECE2EResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    async def ip_version(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryIPVersionResponse:
+        """
+        Retrieves the distribution of DNS queries by IP version.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/summary/ip_version",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    summary_ip_version_params.SummaryIPVersionParams,
+                ),
+                post_parser=ResultWrapper[SummaryIPVersionResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryIPVersionResponse], ResultWrapper[SummaryIPVersionResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    async def matching_answer(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryMatchingAnswerResponse:
+        """
+        Retrieves the distribution of DNS queries by matching answers.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/summary/matching_answer",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    summary_matching_answer_params.SummaryMatchingAnswerParams,
+                ),
+                post_parser=ResultWrapper[SummaryMatchingAnswerResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryMatchingAnswerResponse], ResultWrapper[SummaryMatchingAnswerResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    async def protocol(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryProtocolResponse:
+        """
+        Retrieves the distribution of DNS queries by DNS transport protocol.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/summary/protocol",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    summary_protocol_params.SummaryProtocolParams,
+                ),
+                post_parser=ResultWrapper[SummaryProtocolResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryProtocolResponse], ResultWrapper[SummaryProtocolResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    async def query_type(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryQueryTypeResponse:
+        """
+        Retrieves the distribution of DNS queries by type.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/summary/query_type",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    summary_query_type_params.SummaryQueryTypeParams,
+                ),
+                post_parser=ResultWrapper[SummaryQueryTypeResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryQueryTypeResponse], ResultWrapper[SummaryQueryTypeResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    async def response_code(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryResponseCodeResponse:
+        """
+        Retrieves the distribution of DNS queries by response code.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/summary/response_code",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "tld": tld,
+                    },
+                    summary_response_code_params.SummaryResponseCodeParams,
+                ),
+                post_parser=ResultWrapper[SummaryResponseCodeResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryResponseCodeResponse], ResultWrapper[SummaryResponseCodeResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/summary_v2/) instead."
+    )
+    async def response_ttl(
+        self,
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryResponseTTLResponse:
+        """
+        Retrieves the distribution of DNS queries by minimum response TTL.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/summary/response_ttl",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    summary_response_ttl_params.SummaryResponseTTLParams,
+                ),
+                post_parser=ResultWrapper[SummaryResponseTTLResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryResponseTTLResponse], ResultWrapper[SummaryResponseTTLResponse]),
+        )
+
+
+class SummaryResourceWithRawResponse:
+    def __init__(self, summary: SummaryResource) -> None:
+        self._summary = summary
+
+        self.cache_hit = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.cache_hit,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.dnssec,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec_aware = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.dnssec_aware,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec_e2e = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.dnssec_e2e,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.matching_answer = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.matching_answer,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.protocol,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.query_type = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.query_type,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.response_code = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.response_code,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.response_ttl = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.response_ttl,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncSummaryResourceWithRawResponse:
+    def __init__(self, summary: AsyncSummaryResource) -> None:
+        self._summary = summary
+
+        self.cache_hit = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.cache_hit,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.dnssec,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec_aware = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.dnssec_aware,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec_e2e = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.dnssec_e2e,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.matching_answer = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.matching_answer,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.protocol,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.query_type = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.query_type,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.response_code = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.response_code,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.response_ttl = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.response_ttl,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class SummaryResourceWithStreamingResponse:
+    def __init__(self, summary: SummaryResource) -> None:
+        self._summary = summary
+
+        self.cache_hit = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.cache_hit,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.dnssec,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec_aware = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.dnssec_aware,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec_e2e = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.dnssec_e2e,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.matching_answer = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.matching_answer,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.protocol,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.query_type = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.query_type,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.response_code = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.response_code,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.response_ttl = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.response_ttl,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncSummaryResourceWithStreamingResponse:
+    def __init__(self, summary: AsyncSummaryResource) -> None:
+        self._summary = summary
+
+        self.cache_hit = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.cache_hit,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.dnssec,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec_aware = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.dnssec_aware,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec_e2e = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.dnssec_e2e,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.matching_answer = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.matching_answer,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.protocol,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.query_type = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.query_type,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.response_code = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.response_code,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.response_ttl = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.response_ttl,  # pyright: ignore[reportDeprecated],
+            )
+        )
diff --git a/src/cloudflare/resources/radar/dns/timeseries_groups.py b/src/cloudflare/resources/radar/dns/timeseries_groups.py
new file mode 100644
index 00000000000..3b7d4727287
--- /dev/null
+++ b/src/cloudflare/resources/radar/dns/timeseries_groups.py
@@ -0,0 +1,4609 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import typing_extensions
+from typing import List, Type, Union, Iterable, Optional, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.radar.dns import (
+    timeseries_group_dnssec_params,
+    timeseries_group_protocol_params,
+    timeseries_group_cache_hit_params,
+    timeseries_group_dnssec_e2e_params,
+    timeseries_group_ip_version_params,
+    timeseries_group_query_type_params,
+    timeseries_group_dnssec_aware_params,
+    timeseries_group_response_ttl_params,
+    timeseries_group_response_code_params,
+    timeseries_group_matching_answer_params,
+)
+from ....types.radar.dns.timeseries_group_dnssec_response import TimeseriesGroupDNSSECResponse
+from ....types.radar.dns.timeseries_group_protocol_response import TimeseriesGroupProtocolResponse
+from ....types.radar.dns.timeseries_group_cache_hit_response import TimeseriesGroupCacheHitResponse
+from ....types.radar.dns.timeseries_group_dnssec_e2e_response import TimeseriesGroupDNSSECE2EResponse
+from ....types.radar.dns.timeseries_group_ip_version_response import TimeseriesGroupIPVersionResponse
+from ....types.radar.dns.timeseries_group_query_type_response import TimeseriesGroupQueryTypeResponse
+from ....types.radar.dns.timeseries_group_dnssec_aware_response import TimeseriesGroupDNSSECAwareResponse
+from ....types.radar.dns.timeseries_group_response_ttl_response import TimeseriesGroupResponseTTLResponse
+from ....types.radar.dns.timeseries_group_response_code_response import TimeseriesGroupResponseCodeResponse
+from ....types.radar.dns.timeseries_group_matching_answer_response import TimeseriesGroupMatchingAnswerResponse
+
+__all__ = ["TimeseriesGroupsResource", "AsyncTimeseriesGroupsResource"]
+
+
+class TimeseriesGroupsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> TimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TimeseriesGroupsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TimeseriesGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TimeseriesGroupsResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    def cache_hit(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupCacheHitResponse:
+        """
+        Retrieves the distribution of DNS queries by cache status over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/timeseries_groups/cache_hit",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    timeseries_group_cache_hit_params.TimeseriesGroupCacheHitParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupCacheHitResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupCacheHitResponse], ResultWrapper[TimeseriesGroupCacheHitResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    def dnssec(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupDNSSECResponse:
+        """
+        Retrieves the distribution of DNS responses by DNSSEC (DNS Security Extensions)
+        support over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/timeseries_groups/dnssec",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    timeseries_group_dnssec_params.TimeseriesGroupDNSSECParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupDNSSECResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupDNSSECResponse], ResultWrapper[TimeseriesGroupDNSSECResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    def dnssec_aware(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupDNSSECAwareResponse:
+        """
+        Retrieves the distribution of DNS queries by DNSSEC (DNS Security Extensions)
+        client awareness over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/timeseries_groups/dnssec_aware",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    timeseries_group_dnssec_aware_params.TimeseriesGroupDNSSECAwareParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupDNSSECAwareResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupDNSSECAwareResponse], ResultWrapper[TimeseriesGroupDNSSECAwareResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    def dnssec_e2e(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupDNSSECE2EResponse:
+        """
+        Retrieves the distribution of DNSSEC-validated answers by end-to-end security
+        status over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/timeseries_groups/dnssec_e2e",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    timeseries_group_dnssec_e2e_params.TimeseriesGroupDNSSECE2EParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupDNSSECE2EResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupDNSSECE2EResponse], ResultWrapper[TimeseriesGroupDNSSECE2EResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    def ip_version(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupIPVersionResponse:
+        """
+        Retrieves the distribution of DNS queries by IP version over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/timeseries_groups/ip_version",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    timeseries_group_ip_version_params.TimeseriesGroupIPVersionParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupIPVersionResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupIPVersionResponse], ResultWrapper[TimeseriesGroupIPVersionResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    def matching_answer(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupMatchingAnswerResponse:
+        """
+        Retrieves the distribution of DNS queries by matching answers over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/timeseries_groups/matching_answer",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    timeseries_group_matching_answer_params.TimeseriesGroupMatchingAnswerParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupMatchingAnswerResponse]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[TimeseriesGroupMatchingAnswerResponse], ResultWrapper[TimeseriesGroupMatchingAnswerResponse]
+            ),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    def protocol(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupProtocolResponse:
+        """
+        Retrieves the distribution of DNS queries by DNS transport protocol over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/timeseries_groups/protocol",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    timeseries_group_protocol_params.TimeseriesGroupProtocolParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupProtocolResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupProtocolResponse], ResultWrapper[TimeseriesGroupProtocolResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    def query_type(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupQueryTypeResponse:
+        """
+        Retrieves the distribution of DNS queries by type over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/timeseries_groups/query_type",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    timeseries_group_query_type_params.TimeseriesGroupQueryTypeParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupQueryTypeResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupQueryTypeResponse], ResultWrapper[TimeseriesGroupQueryTypeResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    def response_code(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupResponseCodeResponse:
+        """
+        Retrieves the distribution of DNS queries by response code over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/timeseries_groups/response_code",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "tld": tld,
+                    },
+                    timeseries_group_response_code_params.TimeseriesGroupResponseCodeParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupResponseCodeResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupResponseCodeResponse], ResultWrapper[TimeseriesGroupResponseCodeResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    def response_ttl(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupResponseTTLResponse:
+        """
+        Retrieves the distribution of DNS queries by minimum answer TTL over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/dns/timeseries_groups/response_ttl",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    timeseries_group_response_ttl_params.TimeseriesGroupResponseTTLParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupResponseTTLResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupResponseTTLResponse], ResultWrapper[TimeseriesGroupResponseTTLResponse]),
+        )
+
+
+class AsyncTimeseriesGroupsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncTimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTimeseriesGroupsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTimeseriesGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTimeseriesGroupsResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    async def cache_hit(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupCacheHitResponse:
+        """
+        Retrieves the distribution of DNS queries by cache status over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/timeseries_groups/cache_hit",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    timeseries_group_cache_hit_params.TimeseriesGroupCacheHitParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupCacheHitResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupCacheHitResponse], ResultWrapper[TimeseriesGroupCacheHitResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    async def dnssec(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupDNSSECResponse:
+        """
+        Retrieves the distribution of DNS responses by DNSSEC (DNS Security Extensions)
+        support over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/timeseries_groups/dnssec",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    timeseries_group_dnssec_params.TimeseriesGroupDNSSECParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupDNSSECResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupDNSSECResponse], ResultWrapper[TimeseriesGroupDNSSECResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    async def dnssec_aware(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupDNSSECAwareResponse:
+        """
+        Retrieves the distribution of DNS queries by DNSSEC (DNS Security Extensions)
+        client awareness over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/timeseries_groups/dnssec_aware",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    timeseries_group_dnssec_aware_params.TimeseriesGroupDNSSECAwareParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupDNSSECAwareResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupDNSSECAwareResponse], ResultWrapper[TimeseriesGroupDNSSECAwareResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    async def dnssec_e2e(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupDNSSECE2EResponse:
+        """
+        Retrieves the distribution of DNSSEC-validated answers by end-to-end security
+        status over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/timeseries_groups/dnssec_e2e",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    timeseries_group_dnssec_e2e_params.TimeseriesGroupDNSSECE2EParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupDNSSECE2EResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupDNSSECE2EResponse], ResultWrapper[TimeseriesGroupDNSSECE2EResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    async def ip_version(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupIPVersionResponse:
+        """
+        Retrieves the distribution of DNS queries by IP version over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/timeseries_groups/ip_version",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    timeseries_group_ip_version_params.TimeseriesGroupIPVersionParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupIPVersionResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupIPVersionResponse], ResultWrapper[TimeseriesGroupIPVersionResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    async def matching_answer(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupMatchingAnswerResponse:
+        """
+        Retrieves the distribution of DNS queries by matching answers over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/timeseries_groups/matching_answer",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    timeseries_group_matching_answer_params.TimeseriesGroupMatchingAnswerParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupMatchingAnswerResponse]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[TimeseriesGroupMatchingAnswerResponse], ResultWrapper[TimeseriesGroupMatchingAnswerResponse]
+            ),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    async def protocol(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupProtocolResponse:
+        """
+        Retrieves the distribution of DNS queries by DNS transport protocol over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/timeseries_groups/protocol",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    timeseries_group_protocol_params.TimeseriesGroupProtocolParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupProtocolResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupProtocolResponse], ResultWrapper[TimeseriesGroupProtocolResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    async def query_type(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupQueryTypeResponse:
+        """
+        Retrieves the distribution of DNS queries by type over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/timeseries_groups/query_type",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    timeseries_group_query_type_params.TimeseriesGroupQueryTypeParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupQueryTypeResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupQueryTypeResponse], ResultWrapper[TimeseriesGroupQueryTypeResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    async def response_code(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupResponseCodeResponse:
+        """
+        Retrieves the distribution of DNS queries by response code over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/timeseries_groups/response_code",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "tld": tld,
+                    },
+                    timeseries_group_response_code_params.TimeseriesGroupResponseCodeParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupResponseCodeResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupResponseCodeResponse], ResultWrapper[TimeseriesGroupResponseCodeResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar DNS Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/dns/methods/timeseries_groups_v2/) instead."
+    )
+    async def response_ttl(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupResponseTTLResponse:
+        """
+        Retrieves the distribution of DNS queries by minimum answer TTL over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          tld: Filters results by top-level domain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/dns/timeseries_groups/response_ttl",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "location": location,
+                        "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "tld": tld,
+                    },
+                    timeseries_group_response_ttl_params.TimeseriesGroupResponseTTLParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupResponseTTLResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupResponseTTLResponse], ResultWrapper[TimeseriesGroupResponseTTLResponse]),
+        )
+
+
+class TimeseriesGroupsResourceWithRawResponse:
+    def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
+        self._timeseries_groups = timeseries_groups
+
+        self.cache_hit = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.cache_hit,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.dnssec,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec_aware = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.dnssec_aware,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec_e2e = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.dnssec_e2e,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.matching_answer = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.matching_answer,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.protocol,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.query_type = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.query_type,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.response_code = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.response_code,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.response_ttl = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.response_ttl,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncTimeseriesGroupsResourceWithRawResponse:
+    def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
+        self._timeseries_groups = timeseries_groups
+
+        self.cache_hit = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.cache_hit,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.dnssec,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec_aware = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.dnssec_aware,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec_e2e = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.dnssec_e2e,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.matching_answer = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.matching_answer,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.protocol,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.query_type = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.query_type,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.response_code = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.response_code,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.response_ttl = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.response_ttl,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class TimeseriesGroupsResourceWithStreamingResponse:
+    def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
+        self._timeseries_groups = timeseries_groups
+
+        self.cache_hit = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.cache_hit,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.dnssec,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec_aware = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.dnssec_aware,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec_e2e = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.dnssec_e2e,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.matching_answer = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.matching_answer,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.protocol,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.query_type = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.query_type,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.response_code = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.response_code,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.response_ttl = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.response_ttl,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncTimeseriesGroupsResourceWithStreamingResponse:
+    def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
+        self._timeseries_groups = timeseries_groups
+
+        self.cache_hit = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.cache_hit,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.dnssec,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec_aware = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.dnssec_aware,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.dnssec_e2e = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.dnssec_e2e,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.matching_answer = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.matching_answer,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.protocol = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.protocol,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.query_type = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.query_type,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.response_code = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.response_code,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.response_ttl = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.response_ttl,  # pyright: ignore[reportDeprecated],
+            )
+        )
diff --git a/src/cloudflare/resources/radar/dns/top.py b/src/cloudflare/resources/radar/dns/top.py
index 717d70919d0..151ffc6a10f 100644
--- a/src/cloudflare/resources/radar/dns/top.py
+++ b/src/cloudflare/resources/radar/dns/top.py
@@ -2,17 +2,14 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Union, cast
+from typing import List, Type, Union, Iterable, Optional, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -33,64 +30,229 @@
 class TopResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TopResourceWithStreamingResponse(self)
 
     def ases(
         self,
         *,
-        domain: List[str],
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        cache_hit: Iterable[bool] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dnssec: List[Literal["INVALID", "INSECURE", "SECURE", "OTHER"]] | Omit = omit,
+        dnssec_aware: List[Literal["SUPPORTED", "NOT_SUPPORTED"]] | Omit = omit,
+        dnssec_e2e: Iterable[bool] | Omit = omit,
+        domain: SequenceNotStr[str] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        matching_answer: Iterable[bool] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        response_ttl: List[
+            Literal["LTE_1M", "GT_1M_LTE_5M", "GT_5M_LTE_15M", "GT_15M_LTE_1H", "GT_1H_LTE_1D", "GT_1D_LTE_1W", "GT_1W"]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopAsesResponse:
         """
-        Get top autonomous systems by DNS queries made to Cloudflare's public DNS
+        Retrieves the top autonomous systems by DNS queries made to 1.1.1.1 DNS
         resolver.
 
         Args:
-          domain: Array of domain names.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          cache_hit: Filters results based on cache status.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          dnssec: Filters results based on DNSSEC (DNS Security Extensions) support.
+
+          dnssec_aware: Filters results based on DNSSEC (DNS Security Extensions) client awareness.
+
+          dnssec_e2e: Filters results based on DNSSEC-validated answers by end-to-end security status.
+
+          domain: Filters results by domain name.
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit: Limits the number of objects returned in the response.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          matching_answer: Filters results based on whether the queries have a matching answer.
 
-          date_start: Array of datetimes to filter the start of a series.
+          name: Array of names used to label the series in the response.
 
-          format: Format results are returned in.
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
 
-          limit: Limit the number of objects in the response.
+          protocol: Filters results by DNS transport protocol.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          query_type: Filters results by DNS query type.
 
-          name: Array of names that will be used to name the series in responses.
+          response_code: Filters results by DNS response code.
+
+          response_ttl: Filters results by DNS response TTL.
 
           extra_headers: Send extra headers
 
@@ -109,16 +271,27 @@ def ases(
                 timeout=timeout,
                 query=maybe_transform(
                     {
-                        "domain": domain,
                         "asn": asn,
+                        "cache_hit": cache_hit,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
+                        "dnssec": dnssec,
+                        "dnssec_aware": dnssec_aware,
+                        "dnssec_e2e": dnssec_e2e,
+                        "domain": domain,
                         "format": format,
+                        "ip_version": ip_version,
                         "limit": limit,
                         "location": location,
+                        "matching_answer": matching_answer,
                         "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "response_ttl": response_ttl,
                     },
                     top_ases_params.TopAsesParams,
                 ),
@@ -130,54 +303,211 @@ def ases(
     def locations(
         self,
         *,
-        domain: List[str],
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        cache_hit: Iterable[bool] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dnssec: List[Literal["INVALID", "INSECURE", "SECURE", "OTHER"]] | Omit = omit,
+        dnssec_aware: List[Literal["SUPPORTED", "NOT_SUPPORTED"]] | Omit = omit,
+        dnssec_e2e: Iterable[bool] | Omit = omit,
+        domain: SequenceNotStr[str] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        matching_answer: Iterable[bool] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        response_ttl: List[
+            Literal["LTE_1M", "GT_1M_LTE_5M", "GT_5M_LTE_15M", "GT_15M_LTE_1H", "GT_1H_LTE_1D", "GT_1D_LTE_1W", "GT_1W"]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopLocationsResponse:
         """
-        Get top locations by DNS queries made to Cloudflare's public DNS resolver.
+        Retrieves the top locations by DNS queries made to 1.1.1.1 DNS resolver.
 
         Args:
-          domain: Array of domain names.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          cache_hit: Filters results based on cache status.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          dnssec: Filters results based on DNSSEC (DNS Security Extensions) support.
+
+          dnssec_aware: Filters results based on DNSSEC (DNS Security Extensions) client awareness.
+
+          dnssec_e2e: Filters results based on DNSSEC-validated answers by end-to-end security status.
+
+          domain: Filters results by domain name.
+
+          format: Format in which results will be returned.
 
-          date_start: Array of datetimes to filter the start of a series.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          format: Format results are returned in.
+          limit: Limits the number of objects returned in the response.
 
-          limit: Limit the number of objects in the response.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          matching_answer: Filters results based on whether the queries have a matching answer.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          response_ttl: Filters results by DNS response TTL.
+
+          tld: Filters results by top-level domain.
 
           extra_headers: Send extra headers
 
@@ -196,16 +526,28 @@ def locations(
                 timeout=timeout,
                 query=maybe_transform(
                     {
-                        "domain": domain,
                         "asn": asn,
+                        "cache_hit": cache_hit,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
+                        "dnssec": dnssec,
+                        "dnssec_aware": dnssec_aware,
+                        "dnssec_e2e": dnssec_e2e,
+                        "domain": domain,
                         "format": format,
+                        "ip_version": ip_version,
                         "limit": limit,
                         "location": location,
+                        "matching_answer": matching_answer,
                         "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "response_ttl": response_ttl,
+                        "tld": tld,
                     },
                     top_locations_params.TopLocationsParams,
                 ),
@@ -218,64 +560,229 @@ def locations(
 class AsyncTopResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTopResourceWithStreamingResponse(self)
 
     async def ases(
         self,
         *,
-        domain: List[str],
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        cache_hit: Iterable[bool] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dnssec: List[Literal["INVALID", "INSECURE", "SECURE", "OTHER"]] | Omit = omit,
+        dnssec_aware: List[Literal["SUPPORTED", "NOT_SUPPORTED"]] | Omit = omit,
+        dnssec_e2e: Iterable[bool] | Omit = omit,
+        domain: SequenceNotStr[str] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        matching_answer: Iterable[bool] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        response_ttl: List[
+            Literal["LTE_1M", "GT_1M_LTE_5M", "GT_5M_LTE_15M", "GT_15M_LTE_1H", "GT_1H_LTE_1D", "GT_1D_LTE_1W", "GT_1W"]
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopAsesResponse:
         """
-        Get top autonomous systems by DNS queries made to Cloudflare's public DNS
+        Retrieves the top autonomous systems by DNS queries made to 1.1.1.1 DNS
         resolver.
 
         Args:
-          domain: Array of domain names.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          cache_hit: Filters results based on cache status.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          dnssec: Filters results based on DNSSEC (DNS Security Extensions) support.
+
+          dnssec_aware: Filters results based on DNSSEC (DNS Security Extensions) client awareness.
+
+          dnssec_e2e: Filters results based on DNSSEC-validated answers by end-to-end security status.
+
+          domain: Filters results by domain name.
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit: Limits the number of objects returned in the response.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          matching_answer: Filters results based on whether the queries have a matching answer.
+
+          name: Array of names used to label the series in the response.
 
-          date_start: Array of datetimes to filter the start of a series.
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
 
-          format: Format results are returned in.
+          protocol: Filters results by DNS transport protocol.
 
-          limit: Limit the number of objects in the response.
+          query_type: Filters results by DNS query type.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          response_code: Filters results by DNS response code.
 
-          name: Array of names that will be used to name the series in responses.
+          response_ttl: Filters results by DNS response TTL.
 
           extra_headers: Send extra headers
 
@@ -294,16 +801,27 @@ async def ases(
                 timeout=timeout,
                 query=await async_maybe_transform(
                     {
-                        "domain": domain,
                         "asn": asn,
+                        "cache_hit": cache_hit,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
+                        "dnssec": dnssec,
+                        "dnssec_aware": dnssec_aware,
+                        "dnssec_e2e": dnssec_e2e,
+                        "domain": domain,
                         "format": format,
+                        "ip_version": ip_version,
                         "limit": limit,
                         "location": location,
+                        "matching_answer": matching_answer,
                         "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "response_ttl": response_ttl,
                     },
                     top_ases_params.TopAsesParams,
                 ),
@@ -315,54 +833,211 @@ async def ases(
     async def locations(
         self,
         *,
-        domain: List[str],
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        cache_hit: Iterable[bool] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dnssec: List[Literal["INVALID", "INSECURE", "SECURE", "OTHER"]] | Omit = omit,
+        dnssec_aware: List[Literal["SUPPORTED", "NOT_SUPPORTED"]] | Omit = omit,
+        dnssec_e2e: Iterable[bool] | Omit = omit,
+        domain: SequenceNotStr[str] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        matching_answer: Iterable[bool] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        nodata: Iterable[bool] | Omit = omit,
+        protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]] | Omit = omit,
+        query_type: List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ]
+        | Omit = omit,
+        response_code: List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ]
+        | Omit = omit,
+        response_ttl: List[
+            Literal["LTE_1M", "GT_1M_LTE_5M", "GT_5M_LTE_15M", "GT_15M_LTE_1H", "GT_1H_LTE_1D", "GT_1D_LTE_1W", "GT_1W"]
+        ]
+        | Omit = omit,
+        tld: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopLocationsResponse:
         """
-        Get top locations by DNS queries made to Cloudflare's public DNS resolver.
+        Retrieves the top locations by DNS queries made to 1.1.1.1 DNS resolver.
 
         Args:
-          domain: Array of domain names.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          cache_hit: Filters results based on cache status.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          dnssec: Filters results based on DNSSEC (DNS Security Extensions) support.
+
+          dnssec_aware: Filters results based on DNSSEC (DNS Security Extensions) client awareness.
+
+          dnssec_e2e: Filters results based on DNSSEC-validated answers by end-to-end security status.
+
+          domain: Filters results by domain name.
+
+          format: Format in which results will be returned.
 
-          date_start: Array of datetimes to filter the start of a series.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          format: Format results are returned in.
+          limit: Limits the number of objects returned in the response.
 
-          limit: Limit the number of objects in the response.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          matching_answer: Filters results based on whether the queries have a matching answer.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
+
+          nodata: Specifies whether the response includes empty DNS responses (NODATA).
+
+          protocol: Filters results by DNS transport protocol.
+
+          query_type: Filters results by DNS query type.
+
+          response_code: Filters results by DNS response code.
+
+          response_ttl: Filters results by DNS response TTL.
+
+          tld: Filters results by top-level domain.
 
           extra_headers: Send extra headers
 
@@ -381,16 +1056,28 @@ async def locations(
                 timeout=timeout,
                 query=await async_maybe_transform(
                     {
-                        "domain": domain,
                         "asn": asn,
+                        "cache_hit": cache_hit,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
+                        "dnssec": dnssec,
+                        "dnssec_aware": dnssec_aware,
+                        "dnssec_e2e": dnssec_e2e,
+                        "domain": domain,
                         "format": format,
+                        "ip_version": ip_version,
                         "limit": limit,
                         "location": location,
+                        "matching_answer": matching_answer,
                         "name": name,
+                        "nodata": nodata,
+                        "protocol": protocol,
+                        "query_type": query_type,
+                        "response_code": response_code,
+                        "response_ttl": response_ttl,
+                        "tld": tld,
                     },
                     top_locations_params.TopLocationsParams,
                 ),
diff --git a/src/cloudflare/resources/radar/email/email.py b/src/cloudflare/resources/radar/email/email.py
index a609b61d3a4..8b7febae4b6 100644
--- a/src/cloudflare/resources/radar/email/email.py
+++ b/src/cloudflare/resources/radar/email/email.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .routing import (
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .routing.routing import (
     RoutingResource,
     AsyncRoutingResource,
     RoutingResourceWithRawResponse,
@@ -10,7 +12,7 @@
     RoutingResourceWithStreamingResponse,
     AsyncRoutingResourceWithStreamingResponse,
 )
-from .security import (
+from .security.security import (
     SecurityResource,
     AsyncSecurityResource,
     SecurityResourceWithRawResponse,
@@ -18,10 +20,6 @@
     SecurityResourceWithStreamingResponse,
     AsyncSecurityResourceWithStreamingResponse,
 )
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from .routing.routing import RoutingResource, AsyncRoutingResource
-from .security.security import SecurityResource, AsyncSecurityResource
 
 __all__ = ["EmailResource", "AsyncEmailResource"]
 
@@ -37,10 +35,21 @@ def security(self) -> SecurityResource:
 
     @cached_property
     def with_raw_response(self) -> EmailResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return EmailResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> EmailResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return EmailResourceWithStreamingResponse(self)
 
 
@@ -55,10 +64,21 @@ def security(self) -> AsyncSecurityResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncEmailResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncEmailResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncEmailResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncEmailResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/radar/email/routing/routing.py b/src/cloudflare/resources/radar/email/routing/routing.py
index 8904ac5ab58..7a036446f79 100644
--- a/src/cloudflare/resources/radar/email/routing/routing.py
+++ b/src/cloudflare/resources/radar/email/routing/routing.py
@@ -2,6 +2,12 @@
 
 from __future__ import annotations
 
+from typing import List, Type, Union, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
 from .summary import (
     SummaryResource,
     AsyncSummaryResource,
@@ -10,8 +16,18 @@
     SummaryResourceWithStreamingResponse,
     AsyncSummaryResourceWithStreamingResponse,
 )
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
 from .timeseries_groups import (
     TimeseriesGroupsResource,
     AsyncTimeseriesGroupsResource,
@@ -20,6 +36,9 @@
     TimeseriesGroupsResourceWithStreamingResponse,
     AsyncTimeseriesGroupsResourceWithStreamingResponse,
 )
+from .....types.radar.email import routing_summary_v2_params, routing_timeseries_groups_v2_params
+from .....types.radar.email.routing_summary_v2_response import RoutingSummaryV2Response
+from .....types.radar.email.routing_timeseries_groups_v2_response import RoutingTimeseriesGroupsV2Response
 
 __all__ = ["RoutingResource", "AsyncRoutingResource"]
 
@@ -35,12 +54,224 @@ def timeseries_groups(self) -> TimeseriesGroupsResource:
 
     @cached_property
     def with_raw_response(self) -> RoutingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RoutingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RoutingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RoutingResourceWithStreamingResponse(self)
 
+    def summary_v2(
+        self,
+        dimension: Literal["IP_VERSION", "ENCRYPTED", "ARC", "DKIM", "DMARC", "SPF"],
+        *,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RoutingSummaryV2Response:
+        """
+        Retrieves the distribution of email routing metrics by the specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
+
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
+
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/email/routing/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "arc": arc,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "dkim": dkim,
+                        "dmarc": dmarc,
+                        "encrypted": encrypted,
+                        "format": format,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                        "spf": spf,
+                    },
+                    routing_summary_v2_params.RoutingSummaryV2Params,
+                ),
+                post_parser=ResultWrapper[RoutingSummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[RoutingSummaryV2Response], ResultWrapper[RoutingSummaryV2Response]),
+        )
+
+    def timeseries_groups_v2(
+        self,
+        dimension: Literal["IP_VERSION", "ENCRYPTED", "ARC", "DKIM", "DMARC", "SPF"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RoutingTimeseriesGroupsV2Response:
+        """
+        Retrieves the distribution of email routing metrics grouped by dimension over
+        time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
+
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
+
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/email/routing/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "arc": arc,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "dkim": dkim,
+                        "dmarc": dmarc,
+                        "encrypted": encrypted,
+                        "format": format,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                        "spf": spf,
+                    },
+                    routing_timeseries_groups_v2_params.RoutingTimeseriesGroupsV2Params,
+                ),
+                post_parser=ResultWrapper[RoutingTimeseriesGroupsV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[RoutingTimeseriesGroupsV2Response], ResultWrapper[RoutingTimeseriesGroupsV2Response]),
+        )
+
 
 class AsyncRoutingResource(AsyncAPIResource):
     @cached_property
@@ -53,17 +284,236 @@ def timeseries_groups(self) -> AsyncTimeseriesGroupsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncRoutingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRoutingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRoutingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRoutingResourceWithStreamingResponse(self)
 
+    async def summary_v2(
+        self,
+        dimension: Literal["IP_VERSION", "ENCRYPTED", "ARC", "DKIM", "DMARC", "SPF"],
+        *,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RoutingSummaryV2Response:
+        """
+        Retrieves the distribution of email routing metrics by the specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
+
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
+
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/email/routing/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "arc": arc,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "dkim": dkim,
+                        "dmarc": dmarc,
+                        "encrypted": encrypted,
+                        "format": format,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                        "spf": spf,
+                    },
+                    routing_summary_v2_params.RoutingSummaryV2Params,
+                ),
+                post_parser=ResultWrapper[RoutingSummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[RoutingSummaryV2Response], ResultWrapper[RoutingSummaryV2Response]),
+        )
+
+    async def timeseries_groups_v2(
+        self,
+        dimension: Literal["IP_VERSION", "ENCRYPTED", "ARC", "DKIM", "DMARC", "SPF"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RoutingTimeseriesGroupsV2Response:
+        """
+        Retrieves the distribution of email routing metrics grouped by dimension over
+        time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
+
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
+
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
+
+          format: Format in which results will be returned.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/email/routing/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "arc": arc,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "dkim": dkim,
+                        "dmarc": dmarc,
+                        "encrypted": encrypted,
+                        "format": format,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                        "spf": spf,
+                    },
+                    routing_timeseries_groups_v2_params.RoutingTimeseriesGroupsV2Params,
+                ),
+                post_parser=ResultWrapper[RoutingTimeseriesGroupsV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[RoutingTimeseriesGroupsV2Response], ResultWrapper[RoutingTimeseriesGroupsV2Response]),
+        )
+
 
 class RoutingResourceWithRawResponse:
     def __init__(self, routing: RoutingResource) -> None:
         self._routing = routing
 
+        self.summary_v2 = to_raw_response_wrapper(
+            routing.summary_v2,
+        )
+        self.timeseries_groups_v2 = to_raw_response_wrapper(
+            routing.timeseries_groups_v2,
+        )
+
     @cached_property
     def summary(self) -> SummaryResourceWithRawResponse:
         return SummaryResourceWithRawResponse(self._routing.summary)
@@ -77,6 +527,13 @@ class AsyncRoutingResourceWithRawResponse:
     def __init__(self, routing: AsyncRoutingResource) -> None:
         self._routing = routing
 
+        self.summary_v2 = async_to_raw_response_wrapper(
+            routing.summary_v2,
+        )
+        self.timeseries_groups_v2 = async_to_raw_response_wrapper(
+            routing.timeseries_groups_v2,
+        )
+
     @cached_property
     def summary(self) -> AsyncSummaryResourceWithRawResponse:
         return AsyncSummaryResourceWithRawResponse(self._routing.summary)
@@ -90,6 +547,13 @@ class RoutingResourceWithStreamingResponse:
     def __init__(self, routing: RoutingResource) -> None:
         self._routing = routing
 
+        self.summary_v2 = to_streamed_response_wrapper(
+            routing.summary_v2,
+        )
+        self.timeseries_groups_v2 = to_streamed_response_wrapper(
+            routing.timeseries_groups_v2,
+        )
+
     @cached_property
     def summary(self) -> SummaryResourceWithStreamingResponse:
         return SummaryResourceWithStreamingResponse(self._routing.summary)
@@ -103,6 +567,13 @@ class AsyncRoutingResourceWithStreamingResponse:
     def __init__(self, routing: AsyncRoutingResource) -> None:
         self._routing = routing
 
+        self.summary_v2 = async_to_streamed_response_wrapper(
+            routing.summary_v2,
+        )
+        self.timeseries_groups_v2 = async_to_streamed_response_wrapper(
+            routing.timeseries_groups_v2,
+        )
+
     @cached_property
     def summary(self) -> AsyncSummaryResourceWithStreamingResponse:
         return AsyncSummaryResourceWithStreamingResponse(self._routing.summary)
diff --git a/src/cloudflare/resources/radar/email/routing/summary.py b/src/cloudflare/resources/radar/email/routing/summary.py
index d6574ac8585..a2c25481826 100644
--- a/src/cloudflare/resources/radar/email/routing/summary.py
+++ b/src/cloudflare/resources/radar/email/routing/summary.py
@@ -2,17 +2,15 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import List, Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -44,57 +42,73 @@
 class SummaryResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SummaryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SummaryResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/summary_v2/) instead."
+    )
     def arc(
         self,
         *,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryARCResponse:
         """
-        Percentage distribution of emails classified per ARC validation.
+        Retrieves the distribution of emails by ARC (Authenticated Received Chain)
+        validation.
 
         Args:
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -131,51 +145,56 @@ def arc(
             cast_to=cast(Type[SummaryARCResponse], ResultWrapper[SummaryARCResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/summary_v2/) instead."
+    )
     def dkim(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryDKIMResponse:
         """
-        Percentage distribution of emails classified per DKIM validation.
+        Retrieves the distribution of emails by DKIM (DomainKeys Identified Mail)
+        validation.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -212,51 +231,55 @@ def dkim(
             cast_to=cast(Type[SummaryDKIMResponse], ResultWrapper[SummaryDKIMResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/summary_v2/) instead."
+    )
     def dmarc(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryDMARCResponse:
         """
-        Percentage distribution of emails classified per DMARC validation.
+        Retrieves the distribution of emails by DMARC (Domain-based Message
+        Authentication, Reporting and Conformance) validation.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -293,51 +316,56 @@ def dmarc(
             cast_to=cast(Type[SummaryDMARCResponse], ResultWrapper[SummaryDMARCResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/summary_v2/) instead."
+    )
     def encrypted(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryEncryptedResponse:
         """
-        Percentage distribution of emails by Encrypted
+        Retrieves the distribution of emails by encryption status (encrypted vs.
+        not-encrypted).
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -374,51 +402,55 @@ def encrypted(
             cast_to=cast(Type[SummaryEncryptedResponse], ResultWrapper[SummaryEncryptedResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/summary_v2/) instead."
+    )
     def ip_version(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryIPVersionResponse:
         """
-        Percentage distribution of emails by Ip Version.
+        Retrieves the distribution of emails by IP version.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -455,51 +487,56 @@ def ip_version(
             cast_to=cast(Type[SummaryIPVersionResponse], ResultWrapper[SummaryIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/summary_v2/) instead."
+    )
     def spf(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummarySPFResponse:
         """
-        Percentage distribution of emails classified per SPF validation.
+        Retrieves the distribution of emails by SPF (Sender Policy Framework)
+        validation.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -540,57 +577,73 @@ def spf(
 class AsyncSummaryResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSummaryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSummaryResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/summary_v2/) instead."
+    )
     async def arc(
         self,
         *,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryARCResponse:
         """
-        Percentage distribution of emails classified per ARC validation.
+        Retrieves the distribution of emails by ARC (Authenticated Received Chain)
+        validation.
 
         Args:
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -627,51 +680,56 @@ async def arc(
             cast_to=cast(Type[SummaryARCResponse], ResultWrapper[SummaryARCResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/summary_v2/) instead."
+    )
     async def dkim(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryDKIMResponse:
         """
-        Percentage distribution of emails classified per DKIM validation.
+        Retrieves the distribution of emails by DKIM (DomainKeys Identified Mail)
+        validation.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -708,51 +766,55 @@ async def dkim(
             cast_to=cast(Type[SummaryDKIMResponse], ResultWrapper[SummaryDKIMResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/summary_v2/) instead."
+    )
     async def dmarc(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryDMARCResponse:
         """
-        Percentage distribution of emails classified per DMARC validation.
+        Retrieves the distribution of emails by DMARC (Domain-based Message
+        Authentication, Reporting and Conformance) validation.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -789,51 +851,56 @@ async def dmarc(
             cast_to=cast(Type[SummaryDMARCResponse], ResultWrapper[SummaryDMARCResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/summary_v2/) instead."
+    )
     async def encrypted(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryEncryptedResponse:
         """
-        Percentage distribution of emails by Encrypted
+        Retrieves the distribution of emails by encryption status (encrypted vs.
+        not-encrypted).
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -870,51 +937,55 @@ async def encrypted(
             cast_to=cast(Type[SummaryEncryptedResponse], ResultWrapper[SummaryEncryptedResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/summary_v2/) instead."
+    )
     async def ip_version(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryIPVersionResponse:
         """
-        Percentage distribution of emails by Ip Version.
+        Retrieves the distribution of emails by IP version.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -951,51 +1022,56 @@ async def ip_version(
             cast_to=cast(Type[SummaryIPVersionResponse], ResultWrapper[SummaryIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/summary_v2/) instead."
+    )
     async def spf(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummarySPFResponse:
         """
-        Percentage distribution of emails classified per SPF validation.
+        Retrieves the distribution of emails by SPF (Sender Policy Framework)
+        validation.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -1037,23 +1113,35 @@ class SummaryResourceWithRawResponse:
     def __init__(self, summary: SummaryResource) -> None:
         self._summary = summary
 
-        self.arc = to_raw_response_wrapper(
-            summary.arc,
+        self.arc = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.arc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dkim = to_raw_response_wrapper(
-            summary.dkim,
+        self.dkim = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.dkim,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dmarc = to_raw_response_wrapper(
-            summary.dmarc,
+        self.dmarc = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.dmarc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.encrypted = to_raw_response_wrapper(
-            summary.encrypted,
+        self.encrypted = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.encrypted,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_raw_response_wrapper(
-            summary.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spf = to_raw_response_wrapper(
-            summary.spf,
+        self.spf = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.spf,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1061,23 +1149,35 @@ class AsyncSummaryResourceWithRawResponse:
     def __init__(self, summary: AsyncSummaryResource) -> None:
         self._summary = summary
 
-        self.arc = async_to_raw_response_wrapper(
-            summary.arc,
+        self.arc = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.arc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dkim = async_to_raw_response_wrapper(
-            summary.dkim,
+        self.dkim = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.dkim,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dmarc = async_to_raw_response_wrapper(
-            summary.dmarc,
+        self.dmarc = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.dmarc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.encrypted = async_to_raw_response_wrapper(
-            summary.encrypted,
+        self.encrypted = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.encrypted,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_raw_response_wrapper(
-            summary.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spf = async_to_raw_response_wrapper(
-            summary.spf,
+        self.spf = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.spf,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1085,23 +1185,35 @@ class SummaryResourceWithStreamingResponse:
     def __init__(self, summary: SummaryResource) -> None:
         self._summary = summary
 
-        self.arc = to_streamed_response_wrapper(
-            summary.arc,
+        self.arc = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.arc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dkim = to_streamed_response_wrapper(
-            summary.dkim,
+        self.dkim = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.dkim,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dmarc = to_streamed_response_wrapper(
-            summary.dmarc,
+        self.dmarc = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.dmarc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.encrypted = to_streamed_response_wrapper(
-            summary.encrypted,
+        self.encrypted = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.encrypted,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_streamed_response_wrapper(
-            summary.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spf = to_streamed_response_wrapper(
-            summary.spf,
+        self.spf = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.spf,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1109,21 +1221,33 @@ class AsyncSummaryResourceWithStreamingResponse:
     def __init__(self, summary: AsyncSummaryResource) -> None:
         self._summary = summary
 
-        self.arc = async_to_streamed_response_wrapper(
-            summary.arc,
+        self.arc = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.arc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dkim = async_to_streamed_response_wrapper(
-            summary.dkim,
+        self.dkim = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.dkim,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dmarc = async_to_streamed_response_wrapper(
-            summary.dmarc,
+        self.dmarc = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.dmarc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.encrypted = async_to_streamed_response_wrapper(
-            summary.encrypted,
+        self.encrypted = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.encrypted,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_streamed_response_wrapper(
-            summary.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spf = async_to_streamed_response_wrapper(
-            summary.spf,
+        self.spf = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.spf,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/radar/email/routing/timeseries_groups.py b/src/cloudflare/resources/radar/email/routing/timeseries_groups.py
index 5a54a062f1b..4d0eabea887 100644
--- a/src/cloudflare/resources/radar/email/routing/timeseries_groups.py
+++ b/src/cloudflare/resources/radar/email/routing/timeseries_groups.py
@@ -2,17 +2,15 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import List, Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -44,62 +42,78 @@
 class TimeseriesGroupsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TimeseriesGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TimeseriesGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TimeseriesGroupsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/timeseries_groups_v2/) instead."
+    )
     def arc(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupARCResponse:
         """
-        Percentage distribution of emails classified per Arc validation over time.
+        Retrieves the distribution of emails by ARC (Authenticated Received Chain)
+        validation over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -137,56 +151,61 @@ def arc(
             cast_to=cast(Type[TimeseriesGroupARCResponse], ResultWrapper[TimeseriesGroupARCResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/timeseries_groups_v2/) instead."
+    )
     def dkim(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupDKIMResponse:
         """
-        Percentage distribution of emails classified per DKIM validation over time.
+        Retrieves the distribution of emails by DKIM (DomainKeys Identified Mail)
+        validation over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -224,56 +243,60 @@ def dkim(
             cast_to=cast(Type[TimeseriesGroupDKIMResponse], ResultWrapper[TimeseriesGroupDKIMResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/timeseries_groups_v2/) instead."
+    )
     def dmarc(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupDMARCResponse:
         """
-        Percentage distribution of emails classified per DMARC validation over time.
+        Retrieves the distribution of emails by DMARC (Domain-based Message
+        Authentication, Reporting and Conformance) validation over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -311,56 +334,61 @@ def dmarc(
             cast_to=cast(Type[TimeseriesGroupDMARCResponse], ResultWrapper[TimeseriesGroupDMARCResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/timeseries_groups_v2/) instead."
+    )
     def encrypted(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupEncryptedResponse:
         """
-        Percentage distribution of emails by Encrypted over time.
+        Retrieves the distribution of emails by encryption status (encrypted vs.
+        not-encrypted) over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -398,56 +426,60 @@ def encrypted(
             cast_to=cast(Type[TimeseriesGroupEncryptedResponse], ResultWrapper[TimeseriesGroupEncryptedResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/timeseries_groups_v2/) instead."
+    )
     def ip_version(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupIPVersionResponse:
         """
-        Percentage distribution of emails by Ip Version over time.
+        Retrieves the distribution of emails by IP version over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -485,56 +517,61 @@ def ip_version(
             cast_to=cast(Type[TimeseriesGroupIPVersionResponse], ResultWrapper[TimeseriesGroupIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/timeseries_groups_v2/) instead."
+    )
     def spf(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupSPFResponse:
         """
-        Percentage distribution of emails classified per SPF validation over time.
+        Retrieves the distribution of emails by SPF (Sender Policy Framework) validation
+        over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -576,62 +613,78 @@ def spf(
 class AsyncTimeseriesGroupsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTimeseriesGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTimeseriesGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTimeseriesGroupsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/timeseries_groups_v2/) instead."
+    )
     async def arc(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupARCResponse:
         """
-        Percentage distribution of emails classified per Arc validation over time.
+        Retrieves the distribution of emails by ARC (Authenticated Received Chain)
+        validation over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -669,56 +722,61 @@ async def arc(
             cast_to=cast(Type[TimeseriesGroupARCResponse], ResultWrapper[TimeseriesGroupARCResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/timeseries_groups_v2/) instead."
+    )
     async def dkim(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupDKIMResponse:
         """
-        Percentage distribution of emails classified per DKIM validation over time.
+        Retrieves the distribution of emails by DKIM (DomainKeys Identified Mail)
+        validation over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -756,56 +814,60 @@ async def dkim(
             cast_to=cast(Type[TimeseriesGroupDKIMResponse], ResultWrapper[TimeseriesGroupDKIMResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/timeseries_groups_v2/) instead."
+    )
     async def dmarc(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupDMARCResponse:
         """
-        Percentage distribution of emails classified per DMARC validation over time.
+        Retrieves the distribution of emails by DMARC (Domain-based Message
+        Authentication, Reporting and Conformance) validation over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -843,56 +905,61 @@ async def dmarc(
             cast_to=cast(Type[TimeseriesGroupDMARCResponse], ResultWrapper[TimeseriesGroupDMARCResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/timeseries_groups_v2/) instead."
+    )
     async def encrypted(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupEncryptedResponse:
         """
-        Percentage distribution of emails by Encrypted over time.
+        Retrieves the distribution of emails by encryption status (encrypted vs.
+        not-encrypted) over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -930,56 +997,60 @@ async def encrypted(
             cast_to=cast(Type[TimeseriesGroupEncryptedResponse], ResultWrapper[TimeseriesGroupEncryptedResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/timeseries_groups_v2/) instead."
+    )
     async def ip_version(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupIPVersionResponse:
         """
-        Percentage distribution of emails by Ip Version over time.
+        Retrieves the distribution of emails by IP version over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -1017,56 +1088,61 @@ async def ip_version(
             cast_to=cast(Type[TimeseriesGroupIPVersionResponse], ResultWrapper[TimeseriesGroupIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Routing Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/routing/methods/timeseries_groups_v2/) instead."
+    )
     async def spf(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupSPFResponse:
         """
-        Percentage distribution of emails classified per SPF validation over time.
+        Retrieves the distribution of emails by SPF (Sender Policy Framework) validation
+        over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          encrypted: Filter for encrypted emails.
+          encrypted: Filters results by encryption status (encrypted vs. not-encrypted).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -1109,23 +1185,35 @@ class TimeseriesGroupsResourceWithRawResponse:
     def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.arc = to_raw_response_wrapper(
-            timeseries_groups.arc,
+        self.arc = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.arc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dkim = to_raw_response_wrapper(
-            timeseries_groups.dkim,
+        self.dkim = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.dkim,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dmarc = to_raw_response_wrapper(
-            timeseries_groups.dmarc,
+        self.dmarc = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.dmarc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.encrypted = to_raw_response_wrapper(
-            timeseries_groups.encrypted,
+        self.encrypted = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.encrypted,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_raw_response_wrapper(
-            timeseries_groups.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spf = to_raw_response_wrapper(
-            timeseries_groups.spf,
+        self.spf = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.spf,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1133,23 +1221,35 @@ class AsyncTimeseriesGroupsResourceWithRawResponse:
     def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.arc = async_to_raw_response_wrapper(
-            timeseries_groups.arc,
+        self.arc = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.arc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dkim = async_to_raw_response_wrapper(
-            timeseries_groups.dkim,
+        self.dkim = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.dkim,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dmarc = async_to_raw_response_wrapper(
-            timeseries_groups.dmarc,
+        self.dmarc = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.dmarc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.encrypted = async_to_raw_response_wrapper(
-            timeseries_groups.encrypted,
+        self.encrypted = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.encrypted,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_raw_response_wrapper(
-            timeseries_groups.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spf = async_to_raw_response_wrapper(
-            timeseries_groups.spf,
+        self.spf = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.spf,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1157,23 +1257,35 @@ class TimeseriesGroupsResourceWithStreamingResponse:
     def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.arc = to_streamed_response_wrapper(
-            timeseries_groups.arc,
+        self.arc = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.arc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dkim = to_streamed_response_wrapper(
-            timeseries_groups.dkim,
+        self.dkim = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.dkim,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dmarc = to_streamed_response_wrapper(
-            timeseries_groups.dmarc,
+        self.dmarc = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.dmarc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.encrypted = to_streamed_response_wrapper(
-            timeseries_groups.encrypted,
+        self.encrypted = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.encrypted,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_streamed_response_wrapper(
-            timeseries_groups.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spf = to_streamed_response_wrapper(
-            timeseries_groups.spf,
+        self.spf = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.spf,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1181,21 +1293,33 @@ class AsyncTimeseriesGroupsResourceWithStreamingResponse:
     def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.arc = async_to_streamed_response_wrapper(
-            timeseries_groups.arc,
+        self.arc = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.arc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dkim = async_to_streamed_response_wrapper(
-            timeseries_groups.dkim,
+        self.dkim = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.dkim,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dmarc = async_to_streamed_response_wrapper(
-            timeseries_groups.dmarc,
+        self.dmarc = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.dmarc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.encrypted = async_to_streamed_response_wrapper(
-            timeseries_groups.encrypted,
+        self.encrypted = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.encrypted,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_streamed_response_wrapper(
-            timeseries_groups.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spf = async_to_streamed_response_wrapper(
-            timeseries_groups.spf,
+        self.spf = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.spf,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/radar/email/security/security.py b/src/cloudflare/resources/radar/email/security/security.py
index a738a646df4..a83510b60ca 100644
--- a/src/cloudflare/resources/radar/email/security/security.py
+++ b/src/cloudflare/resources/radar/email/security/security.py
@@ -2,14 +2,12 @@
 
 from __future__ import annotations
 
-from .top import (
-    TopResource,
-    AsyncTopResource,
-    TopResourceWithRawResponse,
-    AsyncTopResourceWithRawResponse,
-    TopResourceWithStreamingResponse,
-    AsyncTopResourceWithStreamingResponse,
-)
+from typing import List, Type, Union, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
 from .summary import (
     SummaryResource,
     AsyncSummaryResource,
@@ -18,9 +16,26 @@
     SummaryResourceWithStreamingResponse,
     AsyncSummaryResourceWithStreamingResponse,
 )
-from .top.top import TopResource, AsyncTopResource
+from .top.top import (
+    TopResource,
+    AsyncTopResource,
+    TopResourceWithRawResponse,
+    AsyncTopResourceWithRawResponse,
+    TopResourceWithStreamingResponse,
+    AsyncTopResourceWithStreamingResponse,
+)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
 from .timeseries_groups import (
     TimeseriesGroupsResource,
     AsyncTimeseriesGroupsResource,
@@ -29,6 +44,9 @@
     TimeseriesGroupsResourceWithStreamingResponse,
     AsyncTimeseriesGroupsResourceWithStreamingResponse,
 )
+from .....types.radar.email import security_summary_v2_params, security_timeseries_groups_v2_params
+from .....types.radar.email.security_summary_v2_response import SecuritySummaryV2Response
+from .....types.radar.email.security_timeseries_groups_v2_response import SecurityTimeseriesGroupsV2Response
 
 __all__ = ["SecurityResource", "AsyncSecurityResource"]
 
@@ -48,12 +66,220 @@ def timeseries_groups(self) -> TimeseriesGroupsResource:
 
     @cached_property
     def with_raw_response(self) -> SecurityResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SecurityResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SecurityResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SecurityResourceWithStreamingResponse(self)
 
+    def summary_v2(
+        self,
+        dimension: Literal[
+            "SPAM", "MALICIOUS", "SPOOF", "THREAT_CATEGORY", "ARC", "DKIM", "DMARC", "SPF", "TLS_VERSION"
+        ],
+        *,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SecuritySummaryV2Response:
+        """
+        Retrieves the distribution of email security metrics by the specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
+
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
+
+          tls_version: Filters results by TLS version.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/email/security/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "arc": arc,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "dkim": dkim,
+                        "dmarc": dmarc,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                        "spf": spf,
+                        "tls_version": tls_version,
+                    },
+                    security_summary_v2_params.SecuritySummaryV2Params,
+                ),
+                post_parser=ResultWrapper[SecuritySummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[SecuritySummaryV2Response], ResultWrapper[SecuritySummaryV2Response]),
+        )
+
+    def timeseries_groups_v2(
+        self,
+        dimension: Literal[
+            "SPAM", "MALICIOUS", "SPOOF", "THREAT_CATEGORY", "ARC", "DKIM", "DMARC", "SPF", "TLS_VERSION"
+        ],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SecurityTimeseriesGroupsV2Response:
+        """
+        Retrieves the distribution of email security metrics grouped by dimension over
+        time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
+
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
+
+          tls_version: Filters results by TLS version.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/email/security/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "arc": arc,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "dkim": dkim,
+                        "dmarc": dmarc,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                        "spf": spf,
+                        "tls_version": tls_version,
+                    },
+                    security_timeseries_groups_v2_params.SecurityTimeseriesGroupsV2Params,
+                ),
+                post_parser=ResultWrapper[SecurityTimeseriesGroupsV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[SecurityTimeseriesGroupsV2Response], ResultWrapper[SecurityTimeseriesGroupsV2Response]),
+        )
+
 
 class AsyncSecurityResource(AsyncAPIResource):
     @cached_property
@@ -70,17 +296,232 @@ def timeseries_groups(self) -> AsyncTimeseriesGroupsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncSecurityResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSecurityResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSecurityResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSecurityResourceWithStreamingResponse(self)
 
+    async def summary_v2(
+        self,
+        dimension: Literal[
+            "SPAM", "MALICIOUS", "SPOOF", "THREAT_CATEGORY", "ARC", "DKIM", "DMARC", "SPF", "TLS_VERSION"
+        ],
+        *,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SecuritySummaryV2Response:
+        """
+        Retrieves the distribution of email security metrics by the specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
+
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
+
+          tls_version: Filters results by TLS version.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/email/security/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "arc": arc,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "dkim": dkim,
+                        "dmarc": dmarc,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                        "spf": spf,
+                        "tls_version": tls_version,
+                    },
+                    security_summary_v2_params.SecuritySummaryV2Params,
+                ),
+                post_parser=ResultWrapper[SecuritySummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[SecuritySummaryV2Response], ResultWrapper[SecuritySummaryV2Response]),
+        )
+
+    async def timeseries_groups_v2(
+        self,
+        dimension: Literal[
+            "SPAM", "MALICIOUS", "SPOOF", "THREAT_CATEGORY", "ARC", "DKIM", "DMARC", "SPF", "TLS_VERSION"
+        ],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SecurityTimeseriesGroupsV2Response:
+        """
+        Retrieves the distribution of email security metrics grouped by dimension over
+        time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
+
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          name: Array of names used to label the series in the response.
+
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
+
+          tls_version: Filters results by TLS version.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/email/security/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "arc": arc,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "dkim": dkim,
+                        "dmarc": dmarc,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "name": name,
+                        "spf": spf,
+                        "tls_version": tls_version,
+                    },
+                    security_timeseries_groups_v2_params.SecurityTimeseriesGroupsV2Params,
+                ),
+                post_parser=ResultWrapper[SecurityTimeseriesGroupsV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[SecurityTimeseriesGroupsV2Response], ResultWrapper[SecurityTimeseriesGroupsV2Response]),
+        )
+
 
 class SecurityResourceWithRawResponse:
     def __init__(self, security: SecurityResource) -> None:
         self._security = security
 
+        self.summary_v2 = to_raw_response_wrapper(
+            security.summary_v2,
+        )
+        self.timeseries_groups_v2 = to_raw_response_wrapper(
+            security.timeseries_groups_v2,
+        )
+
     @cached_property
     def top(self) -> TopResourceWithRawResponse:
         return TopResourceWithRawResponse(self._security.top)
@@ -98,6 +539,13 @@ class AsyncSecurityResourceWithRawResponse:
     def __init__(self, security: AsyncSecurityResource) -> None:
         self._security = security
 
+        self.summary_v2 = async_to_raw_response_wrapper(
+            security.summary_v2,
+        )
+        self.timeseries_groups_v2 = async_to_raw_response_wrapper(
+            security.timeseries_groups_v2,
+        )
+
     @cached_property
     def top(self) -> AsyncTopResourceWithRawResponse:
         return AsyncTopResourceWithRawResponse(self._security.top)
@@ -115,6 +563,13 @@ class SecurityResourceWithStreamingResponse:
     def __init__(self, security: SecurityResource) -> None:
         self._security = security
 
+        self.summary_v2 = to_streamed_response_wrapper(
+            security.summary_v2,
+        )
+        self.timeseries_groups_v2 = to_streamed_response_wrapper(
+            security.timeseries_groups_v2,
+        )
+
     @cached_property
     def top(self) -> TopResourceWithStreamingResponse:
         return TopResourceWithStreamingResponse(self._security.top)
@@ -132,6 +587,13 @@ class AsyncSecurityResourceWithStreamingResponse:
     def __init__(self, security: AsyncSecurityResource) -> None:
         self._security = security
 
+        self.summary_v2 = async_to_streamed_response_wrapper(
+            security.summary_v2,
+        )
+        self.timeseries_groups_v2 = async_to_streamed_response_wrapper(
+            security.timeseries_groups_v2,
+        )
+
     @cached_property
     def top(self) -> AsyncTopResourceWithStreamingResponse:
         return AsyncTopResourceWithStreamingResponse(self._security.top)
diff --git a/src/cloudflare/resources/radar/email/security/summary.py b/src/cloudflare/resources/radar/email/security/summary.py
index a31f5660e8c..0f62202cb05 100644
--- a/src/cloudflare/resources/radar/email/security/summary.py
+++ b/src/cloudflare/resources/radar/email/security/summary.py
@@ -2,17 +2,15 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import List, Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -50,54 +48,70 @@
 class SummaryResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SummaryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SummaryResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/summary_v2/) instead."
+    )
     def arc(
         self,
         *,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryARCResponse:
         """
-        Percentage distribution of emails classified per ARC validation.
+        Retrieves the distribution of emails by ARC (Authenticated Received Chain)
+        validation.
 
         Args:
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -133,48 +147,53 @@ def arc(
             cast_to=cast(Type[SummaryARCResponse], ResultWrapper[SummaryARCResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/summary_v2/) instead."
+    )
     def dkim(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryDKIMResponse:
         """
-        Percentage distribution of emails classified per DKIM validation.
+        Retrieves the distribution of emails by DKIM (DomainKeys Identified Mail)
+        validation.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -210,48 +229,52 @@ def dkim(
             cast_to=cast(Type[SummaryDKIMResponse], ResultWrapper[SummaryDKIMResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/summary_v2/) instead."
+    )
     def dmarc(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryDMARCResponse:
         """
-        Percentage distribution of emails classified per DMARC validation.
+        Retrieves the distribution of emails by DMARC (Domain-based Message
+        Authentication, Reporting and Conformance) validation.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -287,51 +310,55 @@ def dmarc(
             cast_to=cast(Type[SummaryDMARCResponse], ResultWrapper[SummaryDMARCResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/summary_v2/) instead."
+    )
     def malicious(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryMaliciousResponse:
         """
-        Percentage distribution of emails classified as MALICIOUS.
+        Retrieves the distribution of emails by malicious classification.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -368,51 +395,56 @@ def malicious(
             cast_to=cast(Type[SummaryMaliciousResponse], ResultWrapper[SummaryMaliciousResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/summary_v2/) instead."
+    )
     def spam(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummarySpamResponse:
-        """
-        Proportion of emails categorized as either spam or legitimate (non-spam).
+        """Retrieves the proportion of emails by spam classification (spam vs.
+
+        non-spam).
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -449,48 +481,53 @@ def spam(
             cast_to=cast(Type[SummarySpamResponse], ResultWrapper[SummarySpamResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/summary_v2/) instead."
+    )
     def spf(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummarySPFResponse:
         """
-        Percentage distribution of emails classified per SPF validation.
+        Retrieves the distribution of emails by SPF (Sender Policy Framework)
+        validation.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -526,51 +563,56 @@ def spf(
             cast_to=cast(Type[SummarySPFResponse], ResultWrapper[SummarySPFResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/summary_v2/) instead."
+    )
     def spoof(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummarySpoofResponse:
         """
-        Proportion of emails categorized as either spoof or legitimate (non-spoof).
+        Retrieves the proportion of emails by spoof classification (spoof vs.
+        non-spoof).
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -607,51 +649,55 @@ def spoof(
             cast_to=cast(Type[SummarySpoofResponse], ResultWrapper[SummarySpoofResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/summary_v2/) instead."
+    )
     def threat_category(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryThreatCategoryResponse:
         """
-        Percentage distribution of emails classified in Threat Categories.
+        Retrieves the distribution of emails by threat categories.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -688,48 +734,52 @@ def threat_category(
             cast_to=cast(Type[SummaryThreatCategoryResponse], ResultWrapper[SummaryThreatCategoryResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/summary_v2/) instead."
+    )
     def tls_version(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryTLSVersionResponse:
         """
-        Percentage distribution of emails classified per TLS Version.
+        Retrieves the distribution of emails by TLS version.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -769,54 +819,70 @@ def tls_version(
 class AsyncSummaryResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSummaryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSummaryResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/summary_v2/) instead."
+    )
     async def arc(
         self,
         *,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryARCResponse:
         """
-        Percentage distribution of emails classified per ARC validation.
+        Retrieves the distribution of emails by ARC (Authenticated Received Chain)
+        validation.
 
         Args:
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -852,48 +918,53 @@ async def arc(
             cast_to=cast(Type[SummaryARCResponse], ResultWrapper[SummaryARCResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/summary_v2/) instead."
+    )
     async def dkim(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryDKIMResponse:
         """
-        Percentage distribution of emails classified per DKIM validation.
+        Retrieves the distribution of emails by DKIM (DomainKeys Identified Mail)
+        validation.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -929,48 +1000,52 @@ async def dkim(
             cast_to=cast(Type[SummaryDKIMResponse], ResultWrapper[SummaryDKIMResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/summary_v2/) instead."
+    )
     async def dmarc(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryDMARCResponse:
         """
-        Percentage distribution of emails classified per DMARC validation.
+        Retrieves the distribution of emails by DMARC (Domain-based Message
+        Authentication, Reporting and Conformance) validation.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1006,51 +1081,55 @@ async def dmarc(
             cast_to=cast(Type[SummaryDMARCResponse], ResultWrapper[SummaryDMARCResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/summary_v2/) instead."
+    )
     async def malicious(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryMaliciousResponse:
         """
-        Percentage distribution of emails classified as MALICIOUS.
+        Retrieves the distribution of emails by malicious classification.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1087,51 +1166,56 @@ async def malicious(
             cast_to=cast(Type[SummaryMaliciousResponse], ResultWrapper[SummaryMaliciousResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/summary_v2/) instead."
+    )
     async def spam(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummarySpamResponse:
-        """
-        Proportion of emails categorized as either spam or legitimate (non-spam).
+        """Retrieves the proportion of emails by spam classification (spam vs.
+
+        non-spam).
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1168,48 +1252,53 @@ async def spam(
             cast_to=cast(Type[SummarySpamResponse], ResultWrapper[SummarySpamResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/summary_v2/) instead."
+    )
     async def spf(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummarySPFResponse:
         """
-        Percentage distribution of emails classified per SPF validation.
+        Retrieves the distribution of emails by SPF (Sender Policy Framework)
+        validation.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1245,51 +1334,56 @@ async def spf(
             cast_to=cast(Type[SummarySPFResponse], ResultWrapper[SummarySPFResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/summary_v2/) instead."
+    )
     async def spoof(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummarySpoofResponse:
         """
-        Proportion of emails categorized as either spoof or legitimate (non-spoof).
+        Retrieves the proportion of emails by spoof classification (spoof vs.
+        non-spoof).
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1326,51 +1420,55 @@ async def spoof(
             cast_to=cast(Type[SummarySpoofResponse], ResultWrapper[SummarySpoofResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/summary_v2/) instead."
+    )
     async def threat_category(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryThreatCategoryResponse:
         """
-        Percentage distribution of emails classified in Threat Categories.
+        Retrieves the distribution of emails by threat categories.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1407,48 +1505,52 @@ async def threat_category(
             cast_to=cast(Type[SummaryThreatCategoryResponse], ResultWrapper[SummaryThreatCategoryResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/summary_v2/) instead."
+    )
     async def tls_version(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryTLSVersionResponse:
         """
-        Percentage distribution of emails classified per TLS Version.
+        Retrieves the distribution of emails by TLS version.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -1489,32 +1591,50 @@ class SummaryResourceWithRawResponse:
     def __init__(self, summary: SummaryResource) -> None:
         self._summary = summary
 
-        self.arc = to_raw_response_wrapper(
-            summary.arc,
+        self.arc = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.arc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dkim = to_raw_response_wrapper(
-            summary.dkim,
+        self.dkim = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.dkim,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dmarc = to_raw_response_wrapper(
-            summary.dmarc,
+        self.dmarc = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.dmarc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.malicious = to_raw_response_wrapper(
-            summary.malicious,
+        self.malicious = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.malicious,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spam = to_raw_response_wrapper(
-            summary.spam,
+        self.spam = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.spam,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spf = to_raw_response_wrapper(
-            summary.spf,
+        self.spf = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.spf,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spoof = to_raw_response_wrapper(
-            summary.spoof,
+        self.spoof = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.spoof,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.threat_category = to_raw_response_wrapper(
-            summary.threat_category,
+        self.threat_category = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.threat_category,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.tls_version = to_raw_response_wrapper(
-            summary.tls_version,
+        self.tls_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.tls_version,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1522,32 +1642,50 @@ class AsyncSummaryResourceWithRawResponse:
     def __init__(self, summary: AsyncSummaryResource) -> None:
         self._summary = summary
 
-        self.arc = async_to_raw_response_wrapper(
-            summary.arc,
+        self.arc = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.arc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dkim = async_to_raw_response_wrapper(
-            summary.dkim,
+        self.dkim = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.dkim,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dmarc = async_to_raw_response_wrapper(
-            summary.dmarc,
+        self.dmarc = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.dmarc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.malicious = async_to_raw_response_wrapper(
-            summary.malicious,
+        self.malicious = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.malicious,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spam = async_to_raw_response_wrapper(
-            summary.spam,
+        self.spam = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.spam,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spf = async_to_raw_response_wrapper(
-            summary.spf,
+        self.spf = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.spf,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spoof = async_to_raw_response_wrapper(
-            summary.spoof,
+        self.spoof = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.spoof,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.threat_category = async_to_raw_response_wrapper(
-            summary.threat_category,
+        self.threat_category = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.threat_category,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.tls_version = async_to_raw_response_wrapper(
-            summary.tls_version,
+        self.tls_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.tls_version,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1555,32 +1693,50 @@ class SummaryResourceWithStreamingResponse:
     def __init__(self, summary: SummaryResource) -> None:
         self._summary = summary
 
-        self.arc = to_streamed_response_wrapper(
-            summary.arc,
+        self.arc = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.arc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dkim = to_streamed_response_wrapper(
-            summary.dkim,
+        self.dkim = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.dkim,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dmarc = to_streamed_response_wrapper(
-            summary.dmarc,
+        self.dmarc = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.dmarc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.malicious = to_streamed_response_wrapper(
-            summary.malicious,
+        self.malicious = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.malicious,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spam = to_streamed_response_wrapper(
-            summary.spam,
+        self.spam = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.spam,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spf = to_streamed_response_wrapper(
-            summary.spf,
+        self.spf = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.spf,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spoof = to_streamed_response_wrapper(
-            summary.spoof,
+        self.spoof = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.spoof,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.threat_category = to_streamed_response_wrapper(
-            summary.threat_category,
+        self.threat_category = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.threat_category,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.tls_version = to_streamed_response_wrapper(
-            summary.tls_version,
+        self.tls_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.tls_version,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1588,30 +1744,48 @@ class AsyncSummaryResourceWithStreamingResponse:
     def __init__(self, summary: AsyncSummaryResource) -> None:
         self._summary = summary
 
-        self.arc = async_to_streamed_response_wrapper(
-            summary.arc,
+        self.arc = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.arc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dkim = async_to_streamed_response_wrapper(
-            summary.dkim,
+        self.dkim = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.dkim,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dmarc = async_to_streamed_response_wrapper(
-            summary.dmarc,
+        self.dmarc = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.dmarc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.malicious = async_to_streamed_response_wrapper(
-            summary.malicious,
+        self.malicious = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.malicious,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spam = async_to_streamed_response_wrapper(
-            summary.spam,
+        self.spam = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.spam,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spf = async_to_streamed_response_wrapper(
-            summary.spf,
+        self.spf = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.spf,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spoof = async_to_streamed_response_wrapper(
-            summary.spoof,
+        self.spoof = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.spoof,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.threat_category = async_to_streamed_response_wrapper(
-            summary.threat_category,
+        self.threat_category = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.threat_category,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.tls_version = async_to_streamed_response_wrapper(
-            summary.tls_version,
+        self.tls_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.tls_version,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/radar/email/security/timeseries_groups.py b/src/cloudflare/resources/radar/email/security/timeseries_groups.py
index c957c81c55b..955c4e89342 100644
--- a/src/cloudflare/resources/radar/email/security/timeseries_groups.py
+++ b/src/cloudflare/resources/radar/email/security/timeseries_groups.py
@@ -2,17 +2,15 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import List, Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -52,59 +50,75 @@
 class TimeseriesGroupsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TimeseriesGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TimeseriesGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TimeseriesGroupsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/timeseries_groups_v2/) instead."
+    )
     def arc(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupARCResponse:
         """
-        Percentage distribution of emails classified per Arc validation over time.
+        Retrieves the distribution of emails by ARC (Authenticated Received Chain)
+        validation over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -141,53 +155,58 @@ def arc(
             cast_to=cast(Type[TimeseriesGroupARCResponse], ResultWrapper[TimeseriesGroupARCResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/timeseries_groups_v2/) instead."
+    )
     def dkim(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupDKIMResponse:
         """
-        Percentage distribution of emails classified per DKIM validation over time.
+        Retrieves the distribution of emails by DKIM (DomainKeys Identified Mail)
+        validation over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -224,53 +243,57 @@ def dkim(
             cast_to=cast(Type[TimeseriesGroupDKIMResponse], ResultWrapper[TimeseriesGroupDKIMResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/timeseries_groups_v2/) instead."
+    )
     def dmarc(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupDMARCResponse:
         """
-        Percentage distribution of emails classified per DMARC validation over time.
+        Retrieves the distribution of emails by DMARC (Domain-based Message
+        Authentication, Reporting and Conformance) validation over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -307,56 +330,60 @@ def dmarc(
             cast_to=cast(Type[TimeseriesGroupDMARCResponse], ResultWrapper[TimeseriesGroupDMARCResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/timeseries_groups_v2/) instead."
+    )
     def malicious(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupMaliciousResponse:
         """
-        Percentage distribution of emails classified as MALICIOUS over time.
+        Retrieves the distribution of emails by malicious classification over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -394,56 +421,62 @@ def malicious(
             cast_to=cast(Type[TimeseriesGroupMaliciousResponse], ResultWrapper[TimeseriesGroupMaliciousResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/timeseries_groups_v2/) instead."
+    )
     def spam(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupSpamResponse:
-        """
-        Percentage distribution of emails classified as SPAM over time.
+        """Retrieves the distribution of emails by spam classification (spam vs.
+
+        non-spam)
+        over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -481,53 +514,58 @@ def spam(
             cast_to=cast(Type[TimeseriesGroupSpamResponse], ResultWrapper[TimeseriesGroupSpamResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/timeseries_groups_v2/) instead."
+    )
     def spf(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupSPFResponse:
         """
-        Percentage distribution of emails classified per SPF validation over time.
+        Retrieves the distribution of emails by SPF (Sender Policy Framework) validation
+        over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -564,56 +602,61 @@ def spf(
             cast_to=cast(Type[TimeseriesGroupSPFResponse], ResultWrapper[TimeseriesGroupSPFResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/timeseries_groups_v2/) instead."
+    )
     def spoof(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupSpoofResponse:
         """
-        Percentage distribution of emails classified as SPOOF over time.
+        Retrieves the distribution of emails by spoof classification (spoof vs.
+        non-spoof) over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -651,56 +694,60 @@ def spoof(
             cast_to=cast(Type[TimeseriesGroupSpoofResponse], ResultWrapper[TimeseriesGroupSpoofResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/timeseries_groups_v2/) instead."
+    )
     def threat_category(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupThreatCategoryResponse:
         """
-        Percentage distribution of emails classified in Threat Categories over time.
+        Retrieves the distribution of emails by threat category over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -740,53 +787,57 @@ def threat_category(
             ),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/timeseries_groups_v2/) instead."
+    )
     def tls_version(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupTLSVersionResponse:
         """
-        Percentage distribution of emails classified per TLS Version over time.
+        Retrieves the distribution of emails by TLS version over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -827,59 +878,75 @@ def tls_version(
 class AsyncTimeseriesGroupsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTimeseriesGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTimeseriesGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTimeseriesGroupsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/timeseries_groups_v2/) instead."
+    )
     async def arc(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupARCResponse:
         """
-        Percentage distribution of emails classified per Arc validation over time.
+        Retrieves the distribution of emails by ARC (Authenticated Received Chain)
+        validation over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -916,53 +983,58 @@ async def arc(
             cast_to=cast(Type[TimeseriesGroupARCResponse], ResultWrapper[TimeseriesGroupARCResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/timeseries_groups_v2/) instead."
+    )
     async def dkim(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupDKIMResponse:
         """
-        Percentage distribution of emails classified per DKIM validation over time.
+        Retrieves the distribution of emails by DKIM (DomainKeys Identified Mail)
+        validation over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -999,53 +1071,57 @@ async def dkim(
             cast_to=cast(Type[TimeseriesGroupDKIMResponse], ResultWrapper[TimeseriesGroupDKIMResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/timeseries_groups_v2/) instead."
+    )
     async def dmarc(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupDMARCResponse:
         """
-        Percentage distribution of emails classified per DMARC validation over time.
+        Retrieves the distribution of emails by DMARC (Domain-based Message
+        Authentication, Reporting and Conformance) validation over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1082,56 +1158,60 @@ async def dmarc(
             cast_to=cast(Type[TimeseriesGroupDMARCResponse], ResultWrapper[TimeseriesGroupDMARCResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/timeseries_groups_v2/) instead."
+    )
     async def malicious(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupMaliciousResponse:
         """
-        Percentage distribution of emails classified as MALICIOUS over time.
+        Retrieves the distribution of emails by malicious classification over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1169,56 +1249,62 @@ async def malicious(
             cast_to=cast(Type[TimeseriesGroupMaliciousResponse], ResultWrapper[TimeseriesGroupMaliciousResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/timeseries_groups_v2/) instead."
+    )
     async def spam(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupSpamResponse:
-        """
-        Percentage distribution of emails classified as SPAM over time.
+        """Retrieves the distribution of emails by spam classification (spam vs.
+
+        non-spam)
+        over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1256,53 +1342,58 @@ async def spam(
             cast_to=cast(Type[TimeseriesGroupSpamResponse], ResultWrapper[TimeseriesGroupSpamResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/timeseries_groups_v2/) instead."
+    )
     async def spf(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupSPFResponse:
         """
-        Percentage distribution of emails classified per SPF validation over time.
+        Retrieves the distribution of emails by SPF (Sender Policy Framework) validation
+        over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1339,56 +1430,61 @@ async def spf(
             cast_to=cast(Type[TimeseriesGroupSPFResponse], ResultWrapper[TimeseriesGroupSPFResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/timeseries_groups_v2/) instead."
+    )
     async def spoof(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupSpoofResponse:
         """
-        Percentage distribution of emails classified as SPOOF over time.
+        Retrieves the distribution of emails by spoof classification (spoof vs.
+        non-spoof) over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1426,56 +1522,60 @@ async def spoof(
             cast_to=cast(Type[TimeseriesGroupSpoofResponse], ResultWrapper[TimeseriesGroupSpoofResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/timeseries_groups_v2/) instead."
+    )
     async def threat_category(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupThreatCategoryResponse:
         """
-        Percentage distribution of emails classified in Threat Categories over time.
+        Retrieves the distribution of emails by threat category over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1515,53 +1615,57 @@ async def threat_category(
             ),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Email Security Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/email/subresources/security/methods/timeseries_groups_v2/) instead."
+    )
     async def tls_version(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupTLSVersionResponse:
         """
-        Percentage distribution of emails classified per TLS Version over time.
+        Retrieves the distribution of emails by TLS version over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
           extra_headers: Send extra headers
 
@@ -1603,32 +1707,50 @@ class TimeseriesGroupsResourceWithRawResponse:
     def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.arc = to_raw_response_wrapper(
-            timeseries_groups.arc,
+        self.arc = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.arc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dkim = to_raw_response_wrapper(
-            timeseries_groups.dkim,
+        self.dkim = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.dkim,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dmarc = to_raw_response_wrapper(
-            timeseries_groups.dmarc,
+        self.dmarc = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.dmarc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.malicious = to_raw_response_wrapper(
-            timeseries_groups.malicious,
+        self.malicious = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.malicious,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spam = to_raw_response_wrapper(
-            timeseries_groups.spam,
+        self.spam = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.spam,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spf = to_raw_response_wrapper(
-            timeseries_groups.spf,
+        self.spf = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.spf,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spoof = to_raw_response_wrapper(
-            timeseries_groups.spoof,
+        self.spoof = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.spoof,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.threat_category = to_raw_response_wrapper(
-            timeseries_groups.threat_category,
+        self.threat_category = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.threat_category,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.tls_version = to_raw_response_wrapper(
-            timeseries_groups.tls_version,
+        self.tls_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.tls_version,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1636,32 +1758,50 @@ class AsyncTimeseriesGroupsResourceWithRawResponse:
     def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.arc = async_to_raw_response_wrapper(
-            timeseries_groups.arc,
+        self.arc = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.arc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dkim = async_to_raw_response_wrapper(
-            timeseries_groups.dkim,
+        self.dkim = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.dkim,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dmarc = async_to_raw_response_wrapper(
-            timeseries_groups.dmarc,
+        self.dmarc = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.dmarc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.malicious = async_to_raw_response_wrapper(
-            timeseries_groups.malicious,
+        self.malicious = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.malicious,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spam = async_to_raw_response_wrapper(
-            timeseries_groups.spam,
+        self.spam = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.spam,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spf = async_to_raw_response_wrapper(
-            timeseries_groups.spf,
+        self.spf = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.spf,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spoof = async_to_raw_response_wrapper(
-            timeseries_groups.spoof,
+        self.spoof = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.spoof,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.threat_category = async_to_raw_response_wrapper(
-            timeseries_groups.threat_category,
+        self.threat_category = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.threat_category,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.tls_version = async_to_raw_response_wrapper(
-            timeseries_groups.tls_version,
+        self.tls_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.tls_version,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1669,32 +1809,50 @@ class TimeseriesGroupsResourceWithStreamingResponse:
     def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.arc = to_streamed_response_wrapper(
-            timeseries_groups.arc,
+        self.arc = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.arc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dkim = to_streamed_response_wrapper(
-            timeseries_groups.dkim,
+        self.dkim = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.dkim,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dmarc = to_streamed_response_wrapper(
-            timeseries_groups.dmarc,
+        self.dmarc = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.dmarc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.malicious = to_streamed_response_wrapper(
-            timeseries_groups.malicious,
+        self.malicious = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.malicious,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spam = to_streamed_response_wrapper(
-            timeseries_groups.spam,
+        self.spam = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.spam,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spf = to_streamed_response_wrapper(
-            timeseries_groups.spf,
+        self.spf = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.spf,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spoof = to_streamed_response_wrapper(
-            timeseries_groups.spoof,
+        self.spoof = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.spoof,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.threat_category = to_streamed_response_wrapper(
-            timeseries_groups.threat_category,
+        self.threat_category = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.threat_category,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.tls_version = to_streamed_response_wrapper(
-            timeseries_groups.tls_version,
+        self.tls_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.tls_version,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1702,30 +1860,48 @@ class AsyncTimeseriesGroupsResourceWithStreamingResponse:
     def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.arc = async_to_streamed_response_wrapper(
-            timeseries_groups.arc,
+        self.arc = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.arc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dkim = async_to_streamed_response_wrapper(
-            timeseries_groups.dkim,
+        self.dkim = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.dkim,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.dmarc = async_to_streamed_response_wrapper(
-            timeseries_groups.dmarc,
+        self.dmarc = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.dmarc,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.malicious = async_to_streamed_response_wrapper(
-            timeseries_groups.malicious,
+        self.malicious = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.malicious,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spam = async_to_streamed_response_wrapper(
-            timeseries_groups.spam,
+        self.spam = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.spam,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spf = async_to_streamed_response_wrapper(
-            timeseries_groups.spf,
+        self.spf = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.spf,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.spoof = async_to_streamed_response_wrapper(
-            timeseries_groups.spoof,
+        self.spoof = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.spoof,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.threat_category = async_to_streamed_response_wrapper(
-            timeseries_groups.threat_category,
+        self.threat_category = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.threat_category,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.tls_version = async_to_streamed_response_wrapper(
-            timeseries_groups.tls_version,
+        self.tls_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.tls_version,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/radar/email/security/top/__init__.py b/src/cloudflare/resources/radar/email/security/top/__init__.py
index f9133afce2a..0487b36eee8 100644
--- a/src/cloudflare/resources/radar/email/security/top/__init__.py
+++ b/src/cloudflare/resources/radar/email/security/top/__init__.py
@@ -9,21 +9,21 @@
     AsyncTopResourceWithStreamingResponse,
 )
 from .tlds import (
-    TldsResource,
-    AsyncTldsResource,
-    TldsResourceWithRawResponse,
-    AsyncTldsResourceWithRawResponse,
-    TldsResourceWithStreamingResponse,
-    AsyncTldsResourceWithStreamingResponse,
+    TLDsResource,
+    AsyncTLDsResource,
+    TLDsResourceWithRawResponse,
+    AsyncTLDsResourceWithRawResponse,
+    TLDsResourceWithStreamingResponse,
+    AsyncTLDsResourceWithStreamingResponse,
 )
 
 __all__ = [
-    "TldsResource",
-    "AsyncTldsResource",
-    "TldsResourceWithRawResponse",
-    "AsyncTldsResourceWithRawResponse",
-    "TldsResourceWithStreamingResponse",
-    "AsyncTldsResourceWithStreamingResponse",
+    "TLDsResource",
+    "AsyncTLDsResource",
+    "TLDsResourceWithRawResponse",
+    "AsyncTLDsResourceWithRawResponse",
+    "TLDsResourceWithStreamingResponse",
+    "AsyncTLDsResourceWithStreamingResponse",
     "TopResource",
     "AsyncTopResource",
     "TopResourceWithRawResponse",
diff --git a/src/cloudflare/resources/radar/email/security/top/tlds/__init__.py b/src/cloudflare/resources/radar/email/security/top/tlds/__init__.py
index 84574e9ae33..6d8f7a1c5cc 100644
--- a/src/cloudflare/resources/radar/email/security/top/tlds/__init__.py
+++ b/src/cloudflare/resources/radar/email/security/top/tlds/__init__.py
@@ -9,12 +9,12 @@
     AsyncSpamResourceWithStreamingResponse,
 )
 from .tlds import (
-    TldsResource,
-    AsyncTldsResource,
-    TldsResourceWithRawResponse,
-    AsyncTldsResourceWithRawResponse,
-    TldsResourceWithStreamingResponse,
-    AsyncTldsResourceWithStreamingResponse,
+    TLDsResource,
+    AsyncTLDsResource,
+    TLDsResourceWithRawResponse,
+    AsyncTLDsResourceWithRawResponse,
+    TLDsResourceWithStreamingResponse,
+    AsyncTLDsResourceWithStreamingResponse,
 )
 from .spoof import (
     SpoofResource,
@@ -52,10 +52,10 @@
     "AsyncSpoofResourceWithRawResponse",
     "SpoofResourceWithStreamingResponse",
     "AsyncSpoofResourceWithStreamingResponse",
-    "TldsResource",
-    "AsyncTldsResource",
-    "TldsResourceWithRawResponse",
-    "AsyncTldsResourceWithRawResponse",
-    "TldsResourceWithStreamingResponse",
-    "AsyncTldsResourceWithStreamingResponse",
+    "TLDsResource",
+    "AsyncTLDsResource",
+    "TLDsResourceWithRawResponse",
+    "AsyncTLDsResourceWithRawResponse",
+    "TLDsResourceWithStreamingResponse",
+    "AsyncTLDsResourceWithStreamingResponse",
 ]
diff --git a/src/cloudflare/resources/radar/email/security/top/tlds/malicious.py b/src/cloudflare/resources/radar/email/security/top/tlds/malicious.py
index d6877ec1080..7c5e809c1e7 100644
--- a/src/cloudflare/resources/radar/email/security/top/tlds/malicious.py
+++ b/src/cloudflare/resources/radar/email/security/top/tlds/malicious.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ......._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ......._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ......._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ......._utils import maybe_transform, async_maybe_transform
 from ......._compat import cached_property
 from ......._resource import SyncAPIResource, AsyncAPIResource
 from ......._response import (
@@ -32,66 +29,78 @@
 class MaliciousResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> MaliciousResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return MaliciousResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> MaliciousResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return MaliciousResourceWithStreamingResponse(self)
 
     def get(
         self,
         malicious: Literal["MALICIOUS", "NOT_MALICIOUS"],
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tld_category: Literal["CLASSIC", "COUNTRY"] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tld_category: Literal["CLASSIC", "COUNTRY"] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> MaliciousGetResponse:
         """
-        Get the TLDs by emails classified as malicious or not.
+        Retrieves the top TLDs by emails classified as malicious or not.
 
         Args:
-          malicious: Malicious.
+          malicious: Malicious classification.
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tld_category: Filter for TLDs by category.
+          tld_category: Filters results by TLD category.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -136,66 +145,78 @@ def get(
 class AsyncMaliciousResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncMaliciousResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncMaliciousResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncMaliciousResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncMaliciousResourceWithStreamingResponse(self)
 
     async def get(
         self,
         malicious: Literal["MALICIOUS", "NOT_MALICIOUS"],
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tld_category: Literal["CLASSIC", "COUNTRY"] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tld_category: Literal["CLASSIC", "COUNTRY"] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> MaliciousGetResponse:
         """
-        Get the TLDs by emails classified as malicious or not.
+        Retrieves the top TLDs by emails classified as malicious or not.
 
         Args:
-          malicious: Malicious.
+          malicious: Malicious classification.
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tld_category: Filter for TLDs by category.
+          tld_category: Filters results by TLD category.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/email/security/top/tlds/spam.py b/src/cloudflare/resources/radar/email/security/top/tlds/spam.py
index f97f98691f3..1c7d7ed08ec 100644
--- a/src/cloudflare/resources/radar/email/security/top/tlds/spam.py
+++ b/src/cloudflare/resources/radar/email/security/top/tlds/spam.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ......._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ......._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ......._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ......._utils import maybe_transform, async_maybe_transform
 from ......._compat import cached_property
 from ......._resource import SyncAPIResource, AsyncAPIResource
 from ......._response import (
@@ -32,66 +29,78 @@
 class SpamResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SpamResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SpamResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SpamResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SpamResourceWithStreamingResponse(self)
 
     def get(
         self,
         spam: Literal["SPAM", "NOT_SPAM"],
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tld_category: Literal["CLASSIC", "COUNTRY"] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tld_category: Literal["CLASSIC", "COUNTRY"] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SpamGetResponse:
         """
-        Get the top TLDs by emails classified as Spam or not.
+        Retrieves the top TLDs by emails classified as spam or not.
 
         Args:
-          spam: Spam.
+          spam: Spam classification.
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tld_category: Filter for TLDs by category.
+          tld_category: Filters results by TLD category.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -136,66 +145,78 @@ def get(
 class AsyncSpamResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSpamResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSpamResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSpamResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSpamResourceWithStreamingResponse(self)
 
     async def get(
         self,
         spam: Literal["SPAM", "NOT_SPAM"],
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tld_category: Literal["CLASSIC", "COUNTRY"] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tld_category: Literal["CLASSIC", "COUNTRY"] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SpamGetResponse:
         """
-        Get the top TLDs by emails classified as Spam or not.
+        Retrieves the top TLDs by emails classified as spam or not.
 
         Args:
-          spam: Spam.
+          spam: Spam classification.
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tld_category: Filter for TLDs by category.
+          tld_category: Filters results by TLD category.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/email/security/top/tlds/spoof.py b/src/cloudflare/resources/radar/email/security/top/tlds/spoof.py
index 865a62aa66b..0ff172ed740 100644
--- a/src/cloudflare/resources/radar/email/security/top/tlds/spoof.py
+++ b/src/cloudflare/resources/radar/email/security/top/tlds/spoof.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ......._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ......._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ......._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ......._utils import maybe_transform, async_maybe_transform
 from ......._compat import cached_property
 from ......._resource import SyncAPIResource, AsyncAPIResource
 from ......._response import (
@@ -32,66 +29,78 @@
 class SpoofResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SpoofResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SpoofResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SpoofResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SpoofResourceWithStreamingResponse(self)
 
     def get(
         self,
         spoof: Literal["SPOOF", "NOT_SPOOF"],
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tld_category: Literal["CLASSIC", "COUNTRY"] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tld_category: Literal["CLASSIC", "COUNTRY"] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SpoofGetResponse:
         """
-        Get the TLDs by emails classified as spoof or not.
+        Retrieves the top TLDs by emails classified as spoof or not.
 
         Args:
-          spoof: Spoof.
+          spoof: Spoof classification.
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tld_category: Filter for TLDs by category.
+          tld_category: Filters results by TLD category.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -136,66 +145,78 @@ def get(
 class AsyncSpoofResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSpoofResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSpoofResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSpoofResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSpoofResourceWithStreamingResponse(self)
 
     async def get(
         self,
         spoof: Literal["SPOOF", "NOT_SPOOF"],
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tld_category: Literal["CLASSIC", "COUNTRY"] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tld_category: Literal["CLASSIC", "COUNTRY"] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SpoofGetResponse:
         """
-        Get the TLDs by emails classified as spoof or not.
+        Retrieves the top TLDs by emails classified as spoof or not.
 
         Args:
-          spoof: Spoof.
+          spoof: Spoof classification.
 
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tld_category: Filter for TLDs by category.
+          tld_category: Filters results by TLD category.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/email/security/top/tlds/tlds.py b/src/cloudflare/resources/radar/email/security/top/tlds/tlds.py
index 23c281c9eb9..ae27cfc8445 100644
--- a/src/cloudflare/resources/radar/email/security/top/tlds/tlds.py
+++ b/src/cloudflare/resources/radar/email/security/top/tlds/tlds.py
@@ -32,11 +32,8 @@
     MaliciousResourceWithStreamingResponse,
     AsyncMaliciousResourceWithStreamingResponse,
 )
-from ......._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ......._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ......._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ......._utils import maybe_transform, async_maybe_transform
 from ......._compat import cached_property
 from ......._resource import SyncAPIResource, AsyncAPIResource
 from ......._response import (
@@ -48,12 +45,12 @@
 from ......._wrappers import ResultWrapper
 from ......._base_client import make_request_options
 from .......types.radar.email.security.top import tld_get_params
-from .......types.radar.email.security.top.tld_get_response import TldGetResponse
+from .......types.radar.email.security.top.tld_get_response import TLDGetResponse
 
-__all__ = ["TldsResource", "AsyncTldsResource"]
+__all__ = ["TLDsResource", "AsyncTLDsResource"]
 
 
-class TldsResource(SyncAPIResource):
+class TLDsResource(SyncAPIResource):
     @cached_property
     def malicious(self) -> MaliciousResource:
         return MaliciousResource(self._client)
@@ -67,66 +64,76 @@ def spoof(self) -> SpoofResource:
         return SpoofResource(self._client)
 
     @cached_property
-    def with_raw_response(self) -> TldsResourceWithRawResponse:
-        return TldsResourceWithRawResponse(self)
+    def with_raw_response(self) -> TLDsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TLDsResourceWithRawResponse(self)
 
     @cached_property
-    def with_streaming_response(self) -> TldsResourceWithStreamingResponse:
-        return TldsResourceWithStreamingResponse(self)
+    def with_streaming_response(self) -> TLDsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TLDsResourceWithStreamingResponse(self)
 
     def get(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tld_category: Literal["CLASSIC", "COUNTRY"] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tld_category: Literal["CLASSIC", "COUNTRY"] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TldGetResponse:
-        """Get the top TLDs by email messages.
-
-        Values are a percentage out of the total
-        emails.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TLDGetResponse:
+        """
+        Retrieves the top TLDs by number of email messages.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tld_category: Filter for TLDs by category.
+          tld_category: Filters results by TLD category.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -158,15 +165,15 @@ def get(
                         "tld_category": tld_category,
                         "tls_version": tls_version,
                     },
-                    tld_get_params.TldGetParams,
+                    tld_get_params.TLDGetParams,
                 ),
-                post_parser=ResultWrapper[TldGetResponse]._unwrapper,
+                post_parser=ResultWrapper[TLDGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[TldGetResponse], ResultWrapper[TldGetResponse]),
+            cast_to=cast(Type[TLDGetResponse], ResultWrapper[TLDGetResponse]),
         )
 
 
-class AsyncTldsResource(AsyncAPIResource):
+class AsyncTLDsResource(AsyncAPIResource):
     @cached_property
     def malicious(self) -> AsyncMaliciousResource:
         return AsyncMaliciousResource(self._client)
@@ -180,66 +187,76 @@ def spoof(self) -> AsyncSpoofResource:
         return AsyncSpoofResource(self._client)
 
     @cached_property
-    def with_raw_response(self) -> AsyncTldsResourceWithRawResponse:
-        return AsyncTldsResourceWithRawResponse(self)
+    def with_raw_response(self) -> AsyncTLDsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTLDsResourceWithRawResponse(self)
 
     @cached_property
-    def with_streaming_response(self) -> AsyncTldsResourceWithStreamingResponse:
-        return AsyncTldsResourceWithStreamingResponse(self)
+    def with_streaming_response(self) -> AsyncTLDsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTLDsResourceWithStreamingResponse(self)
 
     async def get(
         self,
         *,
-        arc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        dkim: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        spf: List[Literal["PASS", "NONE", "FAIL"]] | NotGiven = NOT_GIVEN,
-        tld_category: Literal["CLASSIC", "COUNTRY"] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | NotGiven = NOT_GIVEN,
+        arc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        dkim: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        dmarc: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        spf: List[Literal["PASS", "NONE", "FAIL"]] | Omit = omit,
+        tld_category: Literal["CLASSIC", "COUNTRY"] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TldGetResponse:
-        """Get the top TLDs by email messages.
-
-        Values are a percentage out of the total
-        emails.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TLDGetResponse:
+        """
+        Retrieves the top TLDs by number of email messages.
 
         Args:
-          arc: Filter for arc (Authenticated Received Chain).
+          arc: Filters results by ARC (Authenticated Received Chain) validation.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          dkim: Filter for dkim.
+          dkim: Filters results by DKIM (DomainKeys Identified Mail) validation status.
 
-          dmarc: Filter for dmarc.
+          dmarc: Filters results by DMARC (Domain-based Message Authentication, Reporting and
+              Conformance) validation status.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          spf: Filter for spf.
+          spf: Filters results by SPF (Sender Policy Framework) validation status.
 
-          tld_category: Filter for TLDs by category.
+          tld_category: Filters results by TLD category.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -271,16 +288,16 @@ async def get(
                         "tld_category": tld_category,
                         "tls_version": tls_version,
                     },
-                    tld_get_params.TldGetParams,
+                    tld_get_params.TLDGetParams,
                 ),
-                post_parser=ResultWrapper[TldGetResponse]._unwrapper,
+                post_parser=ResultWrapper[TLDGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[TldGetResponse], ResultWrapper[TldGetResponse]),
+            cast_to=cast(Type[TLDGetResponse], ResultWrapper[TLDGetResponse]),
         )
 
 
-class TldsResourceWithRawResponse:
-    def __init__(self, tlds: TldsResource) -> None:
+class TLDsResourceWithRawResponse:
+    def __init__(self, tlds: TLDsResource) -> None:
         self._tlds = tlds
 
         self.get = to_raw_response_wrapper(
@@ -300,8 +317,8 @@ def spoof(self) -> SpoofResourceWithRawResponse:
         return SpoofResourceWithRawResponse(self._tlds.spoof)
 
 
-class AsyncTldsResourceWithRawResponse:
-    def __init__(self, tlds: AsyncTldsResource) -> None:
+class AsyncTLDsResourceWithRawResponse:
+    def __init__(self, tlds: AsyncTLDsResource) -> None:
         self._tlds = tlds
 
         self.get = async_to_raw_response_wrapper(
@@ -321,8 +338,8 @@ def spoof(self) -> AsyncSpoofResourceWithRawResponse:
         return AsyncSpoofResourceWithRawResponse(self._tlds.spoof)
 
 
-class TldsResourceWithStreamingResponse:
-    def __init__(self, tlds: TldsResource) -> None:
+class TLDsResourceWithStreamingResponse:
+    def __init__(self, tlds: TLDsResource) -> None:
         self._tlds = tlds
 
         self.get = to_streamed_response_wrapper(
@@ -342,8 +359,8 @@ def spoof(self) -> SpoofResourceWithStreamingResponse:
         return SpoofResourceWithStreamingResponse(self._tlds.spoof)
 
 
-class AsyncTldsResourceWithStreamingResponse:
-    def __init__(self, tlds: AsyncTldsResource) -> None:
+class AsyncTLDsResourceWithStreamingResponse:
+    def __init__(self, tlds: AsyncTLDsResource) -> None:
         self._tlds = tlds
 
         self.get = async_to_streamed_response_wrapper(
diff --git a/src/cloudflare/resources/radar/email/security/top/top.py b/src/cloudflare/resources/radar/email/security/top/top.py
index d4f233cf497..5253082721a 100644
--- a/src/cloudflare/resources/radar/email/security/top/top.py
+++ b/src/cloudflare/resources/radar/email/security/top/top.py
@@ -2,15 +2,14 @@
 
 from __future__ import annotations
 
-from .tlds import (
-    TldsResource,
-    AsyncTldsResource,
-    TldsResourceWithRawResponse,
-    AsyncTldsResourceWithRawResponse,
-    TldsResourceWithStreamingResponse,
-    AsyncTldsResourceWithStreamingResponse,
+from .tlds.tlds import (
+    TLDsResource,
+    AsyncTLDsResource,
+    TLDsResourceWithRawResponse,
+    AsyncTLDsResourceWithRawResponse,
+    TLDsResourceWithStreamingResponse,
+    AsyncTLDsResourceWithStreamingResponse,
 )
-from .tlds.tlds import TldsResource, AsyncTldsResource
 from ......_compat import cached_property
 from ......_resource import SyncAPIResource, AsyncAPIResource
 
@@ -19,29 +18,51 @@
 
 class TopResource(SyncAPIResource):
     @cached_property
-    def tlds(self) -> TldsResource:
-        return TldsResource(self._client)
+    def tlds(self) -> TLDsResource:
+        return TLDsResource(self._client)
 
     @cached_property
     def with_raw_response(self) -> TopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TopResourceWithStreamingResponse(self)
 
 
 class AsyncTopResource(AsyncAPIResource):
     @cached_property
-    def tlds(self) -> AsyncTldsResource:
-        return AsyncTldsResource(self._client)
+    def tlds(self) -> AsyncTLDsResource:
+        return AsyncTLDsResource(self._client)
 
     @cached_property
     def with_raw_response(self) -> AsyncTopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTopResourceWithStreamingResponse(self)
 
 
@@ -50,8 +71,8 @@ def __init__(self, top: TopResource) -> None:
         self._top = top
 
     @cached_property
-    def tlds(self) -> TldsResourceWithRawResponse:
-        return TldsResourceWithRawResponse(self._top.tlds)
+    def tlds(self) -> TLDsResourceWithRawResponse:
+        return TLDsResourceWithRawResponse(self._top.tlds)
 
 
 class AsyncTopResourceWithRawResponse:
@@ -59,8 +80,8 @@ def __init__(self, top: AsyncTopResource) -> None:
         self._top = top
 
     @cached_property
-    def tlds(self) -> AsyncTldsResourceWithRawResponse:
-        return AsyncTldsResourceWithRawResponse(self._top.tlds)
+    def tlds(self) -> AsyncTLDsResourceWithRawResponse:
+        return AsyncTLDsResourceWithRawResponse(self._top.tlds)
 
 
 class TopResourceWithStreamingResponse:
@@ -68,8 +89,8 @@ def __init__(self, top: TopResource) -> None:
         self._top = top
 
     @cached_property
-    def tlds(self) -> TldsResourceWithStreamingResponse:
-        return TldsResourceWithStreamingResponse(self._top.tlds)
+    def tlds(self) -> TLDsResourceWithStreamingResponse:
+        return TLDsResourceWithStreamingResponse(self._top.tlds)
 
 
 class AsyncTopResourceWithStreamingResponse:
@@ -77,5 +98,5 @@ def __init__(self, top: AsyncTopResource) -> None:
         self._top = top
 
     @cached_property
-    def tlds(self) -> AsyncTldsResourceWithStreamingResponse:
-        return AsyncTldsResourceWithStreamingResponse(self._top.tlds)
+    def tlds(self) -> AsyncTLDsResourceWithStreamingResponse:
+        return AsyncTLDsResourceWithStreamingResponse(self._top.tlds)
diff --git a/src/cloudflare/resources/radar/entities/asns.py b/src/cloudflare/resources/radar/entities/asns.py
index 4aa81250ed1..3e20efe46e0 100644
--- a/src/cloudflare/resources/radar/entities/asns.py
+++ b/src/cloudflare/resources/radar/entities/asns.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -22,11 +19,12 @@
 )
 from ...._wrappers import ResultWrapper
 from ...._base_client import make_request_options
-from ....types.radar.entities import asn_ip_params, asn_get_params, asn_rel_params, asn_list_params
+from ....types.radar.entities import asn_ip_params, asn_get_params, asn_rel_params, asn_list_params, asn_as_set_params
 from ....types.radar.entities.asn_ip_response import ASNIPResponse
 from ....types.radar.entities.asn_get_response import ASNGetResponse
 from ....types.radar.entities.asn_rel_response import ASNRelResponse
 from ....types.radar.entities.asn_list_response import ASNListResponse
+from ....types.radar.entities.asn_as_set_response import ASNAsSetResponse
 
 __all__ = ["ASNsResource", "AsyncASNsResource"]
 
@@ -34,43 +32,55 @@
 class ASNsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ASNsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ASNsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ASNsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ASNsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
-        asn: str | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: str | NotGiven = NOT_GIVEN,
-        offset: int | NotGiven = NOT_GIVEN,
-        order_by: Literal["ASN", "POPULATION"] | NotGiven = NOT_GIVEN,
+        asn: str | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: str | Omit = omit,
+        offset: int | Omit = omit,
+        order_by: Literal["ASN", "POPULATION"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ASNListResponse:
         """
-        Gets a list of autonomous systems (AS).
+        Retrieves a list of autonomous systems.
 
         Args:
-          asn: Comma separated list of ASNs.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Location Alpha2 to filter results.
+          location: Filters results by location. Specify an alpha-2 location code.
 
-          offset: Number of objects to skip before grabbing results.
+          offset: Skips the specified number of objects before fetching the results.
 
-          order_by: Order asn list.
+          order_by: Specifies the metric to order the ASNs by.
 
           extra_headers: Send extra headers
 
@@ -103,29 +113,70 @@ def list(
             cast_to=cast(Type[ASNListResponse], ResultWrapper[ASNListResponse]),
         )
 
+    def as_set(
+        self,
+        asn: int,
+        *,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ASNAsSetResponse:
+        """
+        Retrieves Internet Routing Registry AS-SETs that an AS is a member of.
+
+        Args:
+          asn: Retrieves all AS-SETs that the given AS is a member of.
+
+          format: Format in which results will be returned.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            f"/radar/entities/asns/{asn}/as_set",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"format": format}, asn_as_set_params.ASNAsSetParams),
+                post_parser=ResultWrapper[ASNAsSetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ASNAsSetResponse], ResultWrapper[ASNAsSetResponse]),
+        )
+
     def get(
         self,
         asn: int,
         *,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ASNGetResponse:
-        """Get the requested autonomous system information.
+        """Retrieves the requested autonomous system information.
 
-        A confidence level below `5`
-        indicates a low level of confidence in the traffic data - normally this happens
-        because Cloudflare has a small amount of traffic from/to this AS). Population
-        estimates come from APNIC (refer to https://labs.apnic.net/?p=526).
+        (A confidence level below
+        `5` indicates a low level of confidence in the traffic data - normally this
+        happens because Cloudflare has a small amount of traffic from/to this AS).
+        Population estimates come from APNIC (refer to https://labs.apnic.net/?p=526).
 
         Args:
-          asn: Autonomous System Number (ASN).
+          asn: Single Autonomous System Number (ASN) as integer.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
           extra_headers: Send extra headers
 
@@ -152,23 +203,22 @@ def ip(
         self,
         *,
         ip: str,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ASNIPResponse:
-        """Get the requested autonomous system information based on IP address.
-
-        Population
-        estimates come from APNIC (refer to https://labs.apnic.net/?p=526).
+        """
+        Retrieves the requested autonomous system information based on IP address.
+        Population estimates come from APNIC (refer to https://labs.apnic.net/?p=526).
 
         Args:
           ip: IP address.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
           extra_headers: Send extra headers
 
@@ -201,24 +251,25 @@ def rel(
         self,
         asn: int,
         *,
-        asn2: int | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        asn2: int | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ASNRelResponse:
         """
-        Get AS-level relationship for given networks.
+        Retrieves AS-level relationship for given networks.
 
         Args:
-          asn: Get all ASNs with provider-customer or peering relationships with the given ASN
+          asn: Retrieves all ASNs with provider-customer or peering relationships with the
+              given ASN.
 
-          asn2: Get the AS relationship of ASN2 with respect to the given ASN
+          asn2: Retrieves the AS relationship of ASN2 with respect to the given ASN.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
           extra_headers: Send extra headers
 
@@ -251,43 +302,55 @@ def rel(
 class AsyncASNsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncASNsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncASNsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncASNsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncASNsResourceWithStreamingResponse(self)
 
     async def list(
         self,
         *,
-        asn: str | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: str | NotGiven = NOT_GIVEN,
-        offset: int | NotGiven = NOT_GIVEN,
-        order_by: Literal["ASN", "POPULATION"] | NotGiven = NOT_GIVEN,
+        asn: str | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: str | Omit = omit,
+        offset: int | Omit = omit,
+        order_by: Literal["ASN", "POPULATION"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ASNListResponse:
         """
-        Gets a list of autonomous systems (AS).
+        Retrieves a list of autonomous systems.
 
         Args:
-          asn: Comma separated list of ASNs.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Location Alpha2 to filter results.
+          location: Filters results by location. Specify an alpha-2 location code.
 
-          offset: Number of objects to skip before grabbing results.
+          offset: Skips the specified number of objects before fetching the results.
 
-          order_by: Order asn list.
+          order_by: Specifies the metric to order the ASNs by.
 
           extra_headers: Send extra headers
 
@@ -320,29 +383,70 @@ async def list(
             cast_to=cast(Type[ASNListResponse], ResultWrapper[ASNListResponse]),
         )
 
+    async def as_set(
+        self,
+        asn: int,
+        *,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ASNAsSetResponse:
+        """
+        Retrieves Internet Routing Registry AS-SETs that an AS is a member of.
+
+        Args:
+          asn: Retrieves all AS-SETs that the given AS is a member of.
+
+          format: Format in which results will be returned.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            f"/radar/entities/asns/{asn}/as_set",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"format": format}, asn_as_set_params.ASNAsSetParams),
+                post_parser=ResultWrapper[ASNAsSetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ASNAsSetResponse], ResultWrapper[ASNAsSetResponse]),
+        )
+
     async def get(
         self,
         asn: int,
         *,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ASNGetResponse:
-        """Get the requested autonomous system information.
+        """Retrieves the requested autonomous system information.
 
-        A confidence level below `5`
-        indicates a low level of confidence in the traffic data - normally this happens
-        because Cloudflare has a small amount of traffic from/to this AS). Population
-        estimates come from APNIC (refer to https://labs.apnic.net/?p=526).
+        (A confidence level below
+        `5` indicates a low level of confidence in the traffic data - normally this
+        happens because Cloudflare has a small amount of traffic from/to this AS).
+        Population estimates come from APNIC (refer to https://labs.apnic.net/?p=526).
 
         Args:
-          asn: Autonomous System Number (ASN).
+          asn: Single Autonomous System Number (ASN) as integer.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
           extra_headers: Send extra headers
 
@@ -369,23 +473,22 @@ async def ip(
         self,
         *,
         ip: str,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ASNIPResponse:
-        """Get the requested autonomous system information based on IP address.
-
-        Population
-        estimates come from APNIC (refer to https://labs.apnic.net/?p=526).
+        """
+        Retrieves the requested autonomous system information based on IP address.
+        Population estimates come from APNIC (refer to https://labs.apnic.net/?p=526).
 
         Args:
           ip: IP address.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
           extra_headers: Send extra headers
 
@@ -418,24 +521,25 @@ async def rel(
         self,
         asn: int,
         *,
-        asn2: int | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        asn2: int | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ASNRelResponse:
         """
-        Get AS-level relationship for given networks.
+        Retrieves AS-level relationship for given networks.
 
         Args:
-          asn: Get all ASNs with provider-customer or peering relationships with the given ASN
+          asn: Retrieves all ASNs with provider-customer or peering relationships with the
+              given ASN.
 
-          asn2: Get the AS relationship of ASN2 with respect to the given ASN
+          asn2: Retrieves the AS relationship of ASN2 with respect to the given ASN.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
           extra_headers: Send extra headers
 
@@ -472,6 +576,9 @@ def __init__(self, asns: ASNsResource) -> None:
         self.list = to_raw_response_wrapper(
             asns.list,
         )
+        self.as_set = to_raw_response_wrapper(
+            asns.as_set,
+        )
         self.get = to_raw_response_wrapper(
             asns.get,
         )
@@ -490,6 +597,9 @@ def __init__(self, asns: AsyncASNsResource) -> None:
         self.list = async_to_raw_response_wrapper(
             asns.list,
         )
+        self.as_set = async_to_raw_response_wrapper(
+            asns.as_set,
+        )
         self.get = async_to_raw_response_wrapper(
             asns.get,
         )
@@ -508,6 +618,9 @@ def __init__(self, asns: ASNsResource) -> None:
         self.list = to_streamed_response_wrapper(
             asns.list,
         )
+        self.as_set = to_streamed_response_wrapper(
+            asns.as_set,
+        )
         self.get = to_streamed_response_wrapper(
             asns.get,
         )
@@ -526,6 +639,9 @@ def __init__(self, asns: AsyncASNsResource) -> None:
         self.list = async_to_streamed_response_wrapper(
             asns.list,
         )
+        self.as_set = async_to_streamed_response_wrapper(
+            asns.as_set,
+        )
         self.get = async_to_streamed_response_wrapper(
             asns.get,
         )
diff --git a/src/cloudflare/resources/radar/entities/entities.py b/src/cloudflare/resources/radar/entities/entities.py
index 291834dcb5e..3a09e011fc7 100644
--- a/src/cloudflare/resources/radar/entities/entities.py
+++ b/src/cloudflare/resources/radar/entities/entities.py
@@ -15,11 +15,8 @@
     ASNsResourceWithStreamingResponse,
     AsyncASNsResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from .locations import (
     LocationsResource,
     AsyncLocationsResource,
@@ -55,31 +52,42 @@ def locations(self) -> LocationsResource:
 
     @cached_property
     def with_raw_response(self) -> EntitiesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return EntitiesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> EntitiesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return EntitiesResourceWithStreamingResponse(self)
 
     def get(
         self,
         *,
         ip: str,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> EntityGetResponse:
         """
-        Get IP address information.
+        Retrieves IP address information.
 
         Args:
           ip: IP address.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
           extra_headers: Send extra headers
 
@@ -120,31 +128,42 @@ def locations(self) -> AsyncLocationsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncEntitiesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncEntitiesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncEntitiesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncEntitiesResourceWithStreamingResponse(self)
 
     async def get(
         self,
         *,
         ip: str,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> EntityGetResponse:
         """
-        Get IP address information.
+        Retrieves IP address information.
 
         Args:
           ip: IP address.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/entities/locations.py b/src/cloudflare/resources/radar/entities/locations.py
index fb242a70bbb..594c5078309 100644
--- a/src/cloudflare/resources/radar/entities/locations.py
+++ b/src/cloudflare/resources/radar/entities/locations.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -32,37 +29,49 @@
 class LocationsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> LocationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LocationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LocationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LocationsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: str | NotGiven = NOT_GIVEN,
-        offset: int | NotGiven = NOT_GIVEN,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: str | Omit = omit,
+        offset: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LocationListResponse:
         """
-        Get a list of locations.
+        Retrieves a list of locations.
 
         Args:
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Comma separated list of locations.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 location
+              codes.
 
-          offset: Number of objects to skip before grabbing results.
+          offset: Skips the specified number of objects before fetching the results.
 
           extra_headers: Send extra headers
 
@@ -97,24 +106,24 @@ def get(
         self,
         location: str,
         *,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LocationGetResponse:
-        """Get the requested location information.
+        """Retrieves the requested location information.
 
-        A confidence level below `5` indicates a
-        low level of confidence in the traffic data - normally this happens because
-        Cloudflare has a small amount of traffic from/to this location).
+        (A confidence level below `5`
+        indicates a low level of confidence in the traffic data - normally this happens
+        because Cloudflare has a small amount of traffic from/to this location).
 
         Args:
-          location: Alpha-2 country code.
+          location: Location alpha-2 code.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
           extra_headers: Send extra headers
 
@@ -143,37 +152,49 @@ def get(
 class AsyncLocationsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncLocationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLocationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLocationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLocationsResourceWithStreamingResponse(self)
 
     async def list(
         self,
         *,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: str | NotGiven = NOT_GIVEN,
-        offset: int | NotGiven = NOT_GIVEN,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: str | Omit = omit,
+        offset: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LocationListResponse:
         """
-        Get a list of locations.
+        Retrieves a list of locations.
 
         Args:
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Comma separated list of locations.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 location
+              codes.
 
-          offset: Number of objects to skip before grabbing results.
+          offset: Skips the specified number of objects before fetching the results.
 
           extra_headers: Send extra headers
 
@@ -208,24 +229,24 @@ async def get(
         self,
         location: str,
         *,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
+        format: Literal["JSON", "CSV"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LocationGetResponse:
-        """Get the requested location information.
+        """Retrieves the requested location information.
 
-        A confidence level below `5` indicates a
-        low level of confidence in the traffic data - normally this happens because
-        Cloudflare has a small amount of traffic from/to this location).
+        (A confidence level below `5`
+        indicates a low level of confidence in the traffic data - normally this happens
+        because Cloudflare has a small amount of traffic from/to this location).
 
         Args:
-          location: Alpha-2 country code.
+          location: Location alpha-2 code.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/geolocations.py b/src/cloudflare/resources/radar/geolocations.py
new file mode 100644
index 00000000000..623748a5bb3
--- /dev/null
+++ b/src/cloudflare/resources/radar/geolocations.py
@@ -0,0 +1,326 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...types.radar import geolocation_get_params, geolocation_list_params
+from ..._base_client import make_request_options
+from ...types.radar.geolocation_get_response import GeolocationGetResponse
+from ...types.radar.geolocation_list_response import GeolocationListResponse
+
+__all__ = ["GeolocationsResource", "AsyncGeolocationsResource"]
+
+
+class GeolocationsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> GeolocationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return GeolocationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> GeolocationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return GeolocationsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: str | Omit = omit,
+        limit: int | Omit = omit,
+        location: str | Omit = omit,
+        offset: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> GeolocationListResponse:
+        """
+        Retrieves a list of geolocations.
+
+        Args:
+          format: Format in which results will be returned.
+
+          geo_id: Filters results by geolocation. Specify a comma-separated list of GeoNames IDs.
+
+          limit: Limits the number of objects returned in the response.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 location
+              codes.
+
+          offset: Skips the specified number of objects before fetching the results.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/geolocations",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "format": format,
+                        "geo_id": geo_id,
+                        "limit": limit,
+                        "location": location,
+                        "offset": offset,
+                    },
+                    geolocation_list_params.GeolocationListParams,
+                ),
+                post_parser=ResultWrapper[GeolocationListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[GeolocationListResponse], ResultWrapper[GeolocationListResponse]),
+        )
+
+    def get(
+        self,
+        geo_id: str,
+        *,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> GeolocationGetResponse:
+        """Retrieves the requested Geolocation information.
+
+        Args:
+          geo_id: Geolocation ID.
+
+        Refer to
+              [GeoNames](https://download.geonames.org/export/dump/readme.txt)
+
+          format: Format in which results will be returned.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not geo_id:
+            raise ValueError(f"Expected a non-empty value for `geo_id` but received {geo_id!r}")
+        return self._get(
+            f"/radar/geolocations/{geo_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"format": format}, geolocation_get_params.GeolocationGetParams),
+                post_parser=ResultWrapper[GeolocationGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[GeolocationGetResponse], ResultWrapper[GeolocationGetResponse]),
+        )
+
+
+class AsyncGeolocationsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncGeolocationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncGeolocationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncGeolocationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncGeolocationsResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        *,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: str | Omit = omit,
+        limit: int | Omit = omit,
+        location: str | Omit = omit,
+        offset: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> GeolocationListResponse:
+        """
+        Retrieves a list of geolocations.
+
+        Args:
+          format: Format in which results will be returned.
+
+          geo_id: Filters results by geolocation. Specify a comma-separated list of GeoNames IDs.
+
+          limit: Limits the number of objects returned in the response.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 location
+              codes.
+
+          offset: Skips the specified number of objects before fetching the results.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/geolocations",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "format": format,
+                        "geo_id": geo_id,
+                        "limit": limit,
+                        "location": location,
+                        "offset": offset,
+                    },
+                    geolocation_list_params.GeolocationListParams,
+                ),
+                post_parser=ResultWrapper[GeolocationListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[GeolocationListResponse], ResultWrapper[GeolocationListResponse]),
+        )
+
+    async def get(
+        self,
+        geo_id: str,
+        *,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> GeolocationGetResponse:
+        """Retrieves the requested Geolocation information.
+
+        Args:
+          geo_id: Geolocation ID.
+
+        Refer to
+              [GeoNames](https://download.geonames.org/export/dump/readme.txt)
+
+          format: Format in which results will be returned.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not geo_id:
+            raise ValueError(f"Expected a non-empty value for `geo_id` but received {geo_id!r}")
+        return await self._get(
+            f"/radar/geolocations/{geo_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"format": format}, geolocation_get_params.GeolocationGetParams),
+                post_parser=ResultWrapper[GeolocationGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[GeolocationGetResponse], ResultWrapper[GeolocationGetResponse]),
+        )
+
+
+class GeolocationsResourceWithRawResponse:
+    def __init__(self, geolocations: GeolocationsResource) -> None:
+        self._geolocations = geolocations
+
+        self.list = to_raw_response_wrapper(
+            geolocations.list,
+        )
+        self.get = to_raw_response_wrapper(
+            geolocations.get,
+        )
+
+
+class AsyncGeolocationsResourceWithRawResponse:
+    def __init__(self, geolocations: AsyncGeolocationsResource) -> None:
+        self._geolocations = geolocations
+
+        self.list = async_to_raw_response_wrapper(
+            geolocations.list,
+        )
+        self.get = async_to_raw_response_wrapper(
+            geolocations.get,
+        )
+
+
+class GeolocationsResourceWithStreamingResponse:
+    def __init__(self, geolocations: GeolocationsResource) -> None:
+        self._geolocations = geolocations
+
+        self.list = to_streamed_response_wrapper(
+            geolocations.list,
+        )
+        self.get = to_streamed_response_wrapper(
+            geolocations.get,
+        )
+
+
+class AsyncGeolocationsResourceWithStreamingResponse:
+    def __init__(self, geolocations: AsyncGeolocationsResource) -> None:
+        self._geolocations = geolocations
+
+        self.list = async_to_streamed_response_wrapper(
+            geolocations.list,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            geolocations.get,
+        )
diff --git a/src/cloudflare/resources/radar/http/__init__.py b/src/cloudflare/resources/radar/http/__init__.py
index 13ec57b6b10..2ef1078efae 100644
--- a/src/cloudflare/resources/radar/http/__init__.py
+++ b/src/cloudflare/resources/radar/http/__init__.py
@@ -50,12 +50,6 @@
 )
 
 __all__ = [
-    "TopResource",
-    "AsyncTopResource",
-    "TopResourceWithRawResponse",
-    "AsyncTopResourceWithRawResponse",
-    "TopResourceWithStreamingResponse",
-    "AsyncTopResourceWithStreamingResponse",
     "LocationsResource",
     "AsyncLocationsResource",
     "LocationsResourceWithRawResponse",
@@ -80,6 +74,12 @@
     "AsyncTimeseriesGroupsResourceWithRawResponse",
     "TimeseriesGroupsResourceWithStreamingResponse",
     "AsyncTimeseriesGroupsResourceWithStreamingResponse",
+    "TopResource",
+    "AsyncTopResource",
+    "TopResourceWithRawResponse",
+    "AsyncTopResourceWithRawResponse",
+    "TopResourceWithStreamingResponse",
+    "AsyncTopResourceWithStreamingResponse",
     "HTTPResource",
     "AsyncHTTPResource",
     "HTTPResourceWithRawResponse",
diff --git a/src/cloudflare/resources/radar/http/ases/ases.py b/src/cloudflare/resources/radar/http/ases/ases.py
index a275adbc00d..171dd7d8ca1 100644
--- a/src/cloudflare/resources/radar/http/ases/ases.py
+++ b/src/cloudflare/resources/radar/http/ases/ases.py
@@ -24,11 +24,8 @@
     BotClassResourceWithStreamingResponse,
     AsyncBotClassResourceWithStreamingResponse,
 )
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from .ip_version import (
     IPVersionResource,
     AsyncIPVersionResource,
@@ -128,88 +125,103 @@ def browser_family(self) -> BrowserFamilyResource:
 
     @cached_property
     def with_raw_response(self) -> AsesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsesResourceWithStreamingResponse(self)
 
     def get(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AseGetResponse:
-        """Get the top autonomous systems by HTTP traffic.
-
-        Values are a percentage out of
-        the total traffic.
+        """
+        Retrieves the top autonomous systems by HTTP requests.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -237,6 +249,7 @@ def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -289,88 +302,103 @@ def browser_family(self) -> AsyncBrowserFamilyResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncAsesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAsesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAsesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAsesResourceWithStreamingResponse(self)
 
     async def get(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AseGetResponse:
-        """Get the top autonomous systems by HTTP traffic.
-
-        Values are a percentage out of
-        the total traffic.
+        """
+        Retrieves the top autonomous systems by HTTP requests.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -398,6 +426,7 @@ async def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
diff --git a/src/cloudflare/resources/radar/http/ases/bot_class.py b/src/cloudflare/resources/radar/http/ases/bot_class.py
index 3f4493e31ea..e383e6b7f98 100644
--- a/src/cloudflare/resources/radar/http/ases/bot_class.py
+++ b/src/cloudflare/resources/radar/http/ases/bot_class.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -32,89 +29,104 @@
 class BotClassResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> BotClassResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return BotClassResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> BotClassResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return BotClassResourceWithStreamingResponse(self)
 
     def get(
         self,
         bot_class: Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> BotClassGetResponse:
-        """Get the top autonomous systems (AS), by HTTP traffic, of the requested bot
+        """
+        Retrieves the top autonomous systems, by HTTP requests, of the requested bot
         class.
 
-        These two categories use Cloudflare's bot score - refer to
-        [Bot Scores](https://developers.cloudflare.com/bots/concepts/bot-score) for more
-        information. Values are a percentage out of the total traffic.
-
         Args:
-          bot_class: Bot class.
+          bot_class: Bot class. Refer to
+              [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -143,6 +155,7 @@ def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -163,89 +176,104 @@ def get(
 class AsyncBotClassResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncBotClassResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncBotClassResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncBotClassResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncBotClassResourceWithStreamingResponse(self)
 
     async def get(
         self,
         bot_class: Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> BotClassGetResponse:
-        """Get the top autonomous systems (AS), by HTTP traffic, of the requested bot
+        """
+        Retrieves the top autonomous systems, by HTTP requests, of the requested bot
         class.
 
-        These two categories use Cloudflare's bot score - refer to
-        [Bot Scores](https://developers.cloudflare.com/bots/concepts/bot-score) for more
-        information. Values are a percentage out of the total traffic.
-
         Args:
-          bot_class: Bot class.
+          bot_class: Bot class. Refer to
+              [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -274,6 +302,7 @@ async def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
diff --git a/src/cloudflare/resources/radar/http/ases/browser_family.py b/src/cloudflare/resources/radar/http/ases/browser_family.py
index bcc9fb10647..f00473cde74 100644
--- a/src/cloudflare/resources/radar/http/ases/browser_family.py
+++ b/src/cloudflare/resources/radar/http/ases/browser_family.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -32,87 +29,104 @@
 class BrowserFamilyResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> BrowserFamilyResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return BrowserFamilyResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> BrowserFamilyResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return BrowserFamilyResourceWithStreamingResponse(self)
 
     def get(
         self,
         browser_family: Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> BrowserFamilyGetResponse:
         """
-        Get the top autonomous systems (AS), by HTTP traffic, of the requested browser
-        family. Values are a percentage out of the total traffic.
+        Retrieves the top autonomous systems, by HTTP requests, of the requested browser
+        family.
 
         Args:
           browser_family: Browser family.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -141,6 +155,7 @@ def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -161,87 +176,104 @@ def get(
 class AsyncBrowserFamilyResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncBrowserFamilyResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncBrowserFamilyResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncBrowserFamilyResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncBrowserFamilyResourceWithStreamingResponse(self)
 
     async def get(
         self,
         browser_family: Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> BrowserFamilyGetResponse:
         """
-        Get the top autonomous systems (AS), by HTTP traffic, of the requested browser
-        family. Values are a percentage out of the total traffic.
+        Retrieves the top autonomous systems, by HTTP requests, of the requested browser
+        family.
 
         Args:
           browser_family: Browser family.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -270,6 +302,7 @@ async def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
diff --git a/src/cloudflare/resources/radar/http/ases/device_type.py b/src/cloudflare/resources/radar/http/ases/device_type.py
index 13de5ce2c67..85aaf98bcae 100644
--- a/src/cloudflare/resources/radar/http/ases/device_type.py
+++ b/src/cloudflare/resources/radar/http/ases/device_type.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -32,87 +29,104 @@
 class DeviceTypeResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DeviceTypeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DeviceTypeResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DeviceTypeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DeviceTypeResourceWithStreamingResponse(self)
 
     def get(
         self,
         device_type: Literal["DESKTOP", "MOBILE", "OTHER"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> DeviceTypeGetResponse:
         """
-        Get the top autonomous systems (AS), by HTTP traffic, of the requested device
-        type. Values are a percentage out of the total traffic.
+        Retrieves the top autonomous systems, by HTTP requests, of the requested device
+        type.
 
         Args:
           device_type: Device type.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -141,6 +155,7 @@ def get(
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -161,87 +176,104 @@ def get(
 class AsyncDeviceTypeResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDeviceTypeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDeviceTypeResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDeviceTypeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDeviceTypeResourceWithStreamingResponse(self)
 
     async def get(
         self,
         device_type: Literal["DESKTOP", "MOBILE", "OTHER"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> DeviceTypeGetResponse:
         """
-        Get the top autonomous systems (AS), by HTTP traffic, of the requested device
-        type. Values are a percentage out of the total traffic.
+        Retrieves the top autonomous systems, by HTTP requests, of the requested device
+        type.
 
         Args:
           device_type: Device type.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -270,6 +302,7 @@ async def get(
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
diff --git a/src/cloudflare/resources/radar/http/ases/http_method.py b/src/cloudflare/resources/radar/http/ases/http_method.py
index 8a2527c126d..b6983067121 100644
--- a/src/cloudflare/resources/radar/http/ases/http_method.py
+++ b/src/cloudflare/resources/radar/http/ases/http_method.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -32,87 +29,104 @@
 class HTTPMethodResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> HTTPMethodResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return HTTPMethodResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> HTTPMethodResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return HTTPMethodResourceWithStreamingResponse(self)
 
     def get(
         self,
         http_version: Literal["HTTPv1", "HTTPv2", "HTTPv3"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> HTTPMethodGetResponse:
         """
-        Get the top autonomous systems (AS), by HTTP traffic, of the requested HTTP
-        protocol version. Values are a percentage out of the total traffic.
+        Retrieves the top autonomous systems, by HTTP requests, of the requested HTTP
+        version.
 
         Args:
           http_version: HTTP version.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -142,6 +156,7 @@ def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "ip_version": ip_version,
                         "limit": limit,
@@ -161,87 +176,104 @@ def get(
 class AsyncHTTPMethodResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncHTTPMethodResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncHTTPMethodResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncHTTPMethodResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncHTTPMethodResourceWithStreamingResponse(self)
 
     async def get(
         self,
         http_version: Literal["HTTPv1", "HTTPv2", "HTTPv3"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> HTTPMethodGetResponse:
         """
-        Get the top autonomous systems (AS), by HTTP traffic, of the requested HTTP
-        protocol version. Values are a percentage out of the total traffic.
+        Retrieves the top autonomous systems, by HTTP requests, of the requested HTTP
+        version.
 
         Args:
           http_version: HTTP version.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -271,6 +303,7 @@ async def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "ip_version": ip_version,
                         "limit": limit,
diff --git a/src/cloudflare/resources/radar/http/ases/http_protocol.py b/src/cloudflare/resources/radar/http/ases/http_protocol.py
index 69342c498fe..ab95425cb9d 100644
--- a/src/cloudflare/resources/radar/http/ases/http_protocol.py
+++ b/src/cloudflare/resources/radar/http/ases/http_protocol.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -32,84 +29,104 @@
 class HTTPProtocolResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> HTTPProtocolResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return HTTPProtocolResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> HTTPProtocolResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return HTTPProtocolResourceWithStreamingResponse(self)
 
     def get(
         self,
         http_protocol: Literal["HTTP", "HTTPS"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> HTTPProtocolGetResponse:
         """
-        Get the top autonomous systems (AS), by HTTP traffic, of the requested HTTP
-        protocol. Values are a percentage out of the total traffic.
+        Retrieves the top autonomous systems, by HTTP requests, of the requested HTTP
+        protocol.
 
         Args:
-          http_protocol: HTTP Protocol.
+          http_protocol: HTTP protocol (HTTP vs. HTTPS).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          device_type: Filters results by device type.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          device_type: Filter for device type.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          format: Format results are returned in.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -139,6 +156,8 @@ def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
+                        "http_version": http_version,
                         "ip_version": ip_version,
                         "limit": limit,
                         "location": location,
@@ -157,84 +176,104 @@ def get(
 class AsyncHTTPProtocolResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncHTTPProtocolResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncHTTPProtocolResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncHTTPProtocolResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncHTTPProtocolResourceWithStreamingResponse(self)
 
     async def get(
         self,
         http_protocol: Literal["HTTP", "HTTPS"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> HTTPProtocolGetResponse:
         """
-        Get the top autonomous systems (AS), by HTTP traffic, of the requested HTTP
-        protocol. Values are a percentage out of the total traffic.
+        Retrieves the top autonomous systems, by HTTP requests, of the requested HTTP
+        protocol.
 
         Args:
-          http_protocol: HTTP Protocol.
+          http_protocol: HTTP protocol (HTTP vs. HTTPS).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          device_type: Filters results by device type.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          device_type: Filter for device type.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          format: Format results are returned in.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -264,6 +303,8 @@ async def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
+                        "http_version": http_version,
                         "ip_version": ip_version,
                         "limit": limit,
                         "location": location,
diff --git a/src/cloudflare/resources/radar/http/ases/ip_version.py b/src/cloudflare/resources/radar/http/ases/ip_version.py
index 30c602493a0..f70d9e2093b 100644
--- a/src/cloudflare/resources/radar/http/ases/ip_version.py
+++ b/src/cloudflare/resources/radar/http/ases/ip_version.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -32,87 +29,104 @@
 class IPVersionResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> IPVersionResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return IPVersionResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> IPVersionResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return IPVersionResourceWithStreamingResponse(self)
 
     def get(
         self,
         ip_version: Literal["IPv4", "IPv6"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPVersionGetResponse:
         """
-        Get the top autonomous systems, by HTTP traffic, of the requested IP protocol
-        version. Values are a percentage out of the total traffic.
+        Retrieves the top autonomous systems, by HTTP requests, of the requested IP
+        version.
 
         Args:
           ip_version: IP version.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -142,6 +156,7 @@ def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "limit": limit,
@@ -161,87 +176,104 @@ def get(
 class AsyncIPVersionResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncIPVersionResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncIPVersionResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncIPVersionResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncIPVersionResourceWithStreamingResponse(self)
 
     async def get(
         self,
         ip_version: Literal["IPv4", "IPv6"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPVersionGetResponse:
         """
-        Get the top autonomous systems, by HTTP traffic, of the requested IP protocol
-        version. Values are a percentage out of the total traffic.
+        Retrieves the top autonomous systems, by HTTP requests, of the requested IP
+        version.
 
         Args:
           ip_version: IP version.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -271,6 +303,7 @@ async def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "limit": limit,
diff --git a/src/cloudflare/resources/radar/http/ases/os.py b/src/cloudflare/resources/radar/http/ases/os.py
index f394fff7819..b9404151a52 100644
--- a/src/cloudflare/resources/radar/http/ases/os.py
+++ b/src/cloudflare/resources/radar/http/ases/os.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -32,86 +29,104 @@
 class OSResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> OSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return OSResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> OSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return OSResourceWithStreamingResponse(self)
 
     def get(
         self,
         os: Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> OSGetResponse:
         """
-        Get the top autonomous systems, by HTTP traffic, of the requested operating
-        systems. Values are a percentage out of the total traffic.
+        Retrieves the top autonomous systems, by HTTP requests, of the requested
+        operating system.
 
         Args:
           os: Operating system.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -141,6 +156,7 @@ def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -160,86 +176,104 @@ def get(
 class AsyncOSResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncOSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncOSResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncOSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncOSResourceWithStreamingResponse(self)
 
     async def get(
         self,
         os: Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> OSGetResponse:
         """
-        Get the top autonomous systems, by HTTP traffic, of the requested operating
-        systems. Values are a percentage out of the total traffic.
+        Retrieves the top autonomous systems, by HTTP requests, of the requested
+        operating system.
 
         Args:
           os: Operating system.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -269,6 +303,7 @@ async def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
diff --git a/src/cloudflare/resources/radar/http/ases/tls_version.py b/src/cloudflare/resources/radar/http/ases/tls_version.py
index 22ab58f84c1..bbcb2a7e18f 100644
--- a/src/cloudflare/resources/radar/http/ases/tls_version.py
+++ b/src/cloudflare/resources/radar/http/ases/tls_version.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -32,87 +29,104 @@
 class TLSVersionResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TLSVersionResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TLSVersionResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TLSVersionResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TLSVersionResourceWithStreamingResponse(self)
 
     def get(
         self,
         tls_version: Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TLSVersionGetResponse:
         """
-        Get the top autonomous systems (AS), by HTTP traffic, of the requested TLS
-        protocol version. Values are a percentage out of the total traffic.
+        Retrieves the top autonomous systems, by HTTP requests, of the requested TLS
+        protocol version.
 
         Args:
           tls_version: TLS version.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
           extra_headers: Send extra headers
 
@@ -142,6 +156,7 @@ def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -161,87 +176,104 @@ def get(
 class AsyncTLSVersionResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTLSVersionResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTLSVersionResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTLSVersionResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTLSVersionResourceWithStreamingResponse(self)
 
     async def get(
         self,
         tls_version: Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TLSVersionGetResponse:
         """
-        Get the top autonomous systems (AS), by HTTP traffic, of the requested TLS
-        protocol version. Values are a percentage out of the total traffic.
+        Retrieves the top autonomous systems, by HTTP requests, of the requested TLS
+        protocol version.
 
         Args:
           tls_version: TLS version.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
           extra_headers: Send extra headers
 
@@ -271,6 +303,7 @@ async def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
diff --git a/src/cloudflare/resources/radar/http/http.py b/src/cloudflare/resources/radar/http/http.py
index 725429a8b08..9754cb0f2e0 100644
--- a/src/cloudflare/resources/radar/http/http.py
+++ b/src/cloudflare/resources/radar/http/http.py
@@ -16,14 +16,6 @@
     TopResourceWithStreamingResponse,
     AsyncTopResourceWithStreamingResponse,
 )
-from .ases import (
-    AsesResource,
-    AsyncAsesResource,
-    AsesResourceWithRawResponse,
-    AsyncAsesResourceWithRawResponse,
-    AsesResourceWithStreamingResponse,
-    AsyncAsesResourceWithStreamingResponse,
-)
 from .summary import (
     SummaryResource,
     AsyncSummaryResource,
@@ -32,19 +24,15 @@
     SummaryResourceWithStreamingResponse,
     AsyncSummaryResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from .ases.ases import AsesResource, AsyncAsesResource
-from .locations import (
-    LocationsResource,
-    AsyncLocationsResource,
-    LocationsResourceWithRawResponse,
-    AsyncLocationsResourceWithRawResponse,
-    LocationsResourceWithStreamingResponse,
-    AsyncLocationsResourceWithStreamingResponse,
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from .ases.ases import (
+    AsesResource,
+    AsyncAsesResource,
+    AsesResourceWithRawResponse,
+    AsyncAsesResourceWithRawResponse,
+    AsesResourceWithStreamingResponse,
+    AsyncAsesResourceWithStreamingResponse,
 )
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
@@ -55,7 +43,7 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ....types.radar import http_timeseries_params
+from ....types.radar import http_summary_v2_params, http_timeseries_params, http_timeseries_groups_v2_params
 from ...._base_client import make_request_options
 from .timeseries_groups import (
     TimeseriesGroupsResource,
@@ -65,17 +53,22 @@
     TimeseriesGroupsResourceWithStreamingResponse,
     AsyncTimeseriesGroupsResourceWithStreamingResponse,
 )
-from .locations.locations import LocationsResource, AsyncLocationsResource
+from .locations.locations import (
+    LocationsResource,
+    AsyncLocationsResource,
+    LocationsResourceWithRawResponse,
+    AsyncLocationsResourceWithRawResponse,
+    LocationsResourceWithStreamingResponse,
+    AsyncLocationsResourceWithStreamingResponse,
+)
+from ....types.radar.http_summary_v2_response import HTTPSummaryV2Response
 from ....types.radar.http_timeseries_response import HTTPTimeseriesResponse
+from ....types.radar.http_timeseries_groups_v2_response import HTTPTimeseriesGroupsV2Response
 
 __all__ = ["HTTPResource", "AsyncHTTPResource"]
 
 
 class HTTPResource(SyncAPIResource):
-    @cached_property
-    def top(self) -> TopResource:
-        return TopResource(self._client)
-
     @cached_property
     def locations(self) -> LocationsResource:
         return LocationsResource(self._client)
@@ -92,64 +85,254 @@ def summary(self) -> SummaryResource:
     def timeseries_groups(self) -> TimeseriesGroupsResource:
         return TimeseriesGroupsResource(self._client)
 
+    @cached_property
+    def top(self) -> TopResource:
+        return TopResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> HTTPResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return HTTPResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> HTTPResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return HTTPResourceWithStreamingResponse(self)
 
+    def summary_v2(
+        self,
+        dimension: Literal[
+            "ADM1",
+            "BOT_CLASS",
+            "BROWSER",
+            "BROWSER_FAMILY",
+            "DEVICE_TYPE",
+            "HTTP_PROTOCOL",
+            "HTTP_VERSION",
+            "IP_VERSION",
+            "OS",
+            "POST_QUANTUM",
+            "TLS_VERSION",
+        ],
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> HTTPSummaryV2Response:
+        """
+        Retrieves the distribution of HTTP requests by the specified dimension.
+
+        Args:
+          dimension: Specifies the HTTP attribute by which to group the results.
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          bot_class: Filters results by bot class. Refer to
+              [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          device_type: Filters results by device type.
+
+          format: Format in which results will be returned.
+
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
+
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
+
+          http_version: Filters results by HTTP version.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/http/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "bot_class": bot_class,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "device_type": device_type,
+                        "format": format,
+                        "geo_id": geo_id,
+                        "http_protocol": http_protocol,
+                        "http_version": http_version,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "os": os,
+                        "tls_version": tls_version,
+                    },
+                    http_summary_v2_params.HTTPSummaryV2Params,
+                ),
+                post_parser=ResultWrapper[HTTPSummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[HTTPSummaryV2Response], ResultWrapper[HTTPSummaryV2Response]),
+        )
+
     def timeseries(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> HTTPTimeseriesResponse:
         """
-        Get HTTP requests over time.
+        Retrieves the HTTP requests over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          bot_class: Filters results by bot class. Refer to
+              [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          device_type: Filters results by device type.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
+
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
+
+          http_version: Filters results by HTTP version.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -170,13 +353,23 @@ def timeseries(
                     {
                         "agg_interval": agg_interval,
                         "asn": asn,
+                        "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
+                        "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
+                        "http_protocol": http_protocol,
+                        "http_version": http_version,
+                        "ip_version": ip_version,
                         "location": location,
                         "name": name,
+                        "normalization": normalization,
+                        "os": os,
+                        "tls_version": tls_version,
                     },
                     http_timeseries_params.HTTPTimeseriesParams,
                 ),
@@ -185,12 +378,158 @@ def timeseries(
             cast_to=cast(Type[HTTPTimeseriesResponse], ResultWrapper[HTTPTimeseriesResponse]),
         )
 
+    def timeseries_groups_v2(
+        self,
+        dimension: Literal[
+            "ADM1",
+            "BOT_CLASS",
+            "BROWSER",
+            "BROWSER_FAMILY",
+            "DEVICE_TYPE",
+            "HTTP_PROTOCOL",
+            "HTTP_VERSION",
+            "IP_VERSION",
+            "OS",
+            "POST_QUANTUM",
+            "TLS_VERSION",
+        ],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> HTTPTimeseriesGroupsV2Response:
+        """
+        Retrieves the distribution of HTTP requests grouped by dimension.
 
-class AsyncHTTPResource(AsyncAPIResource):
-    @cached_property
-    def top(self) -> AsyncTopResource:
-        return AsyncTopResource(self._client)
+        Args:
+          dimension: Specifies the HTTP attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          bot_class: Filters results by bot class. Refer to
+              [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          device_type: Filters results by device type.
+
+          format: Format in which results will be returned.
+
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
+
+          http_version: Filters results by HTTP version.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/http/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "bot_class": bot_class,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "device_type": device_type,
+                        "format": format,
+                        "geo_id": geo_id,
+                        "http_protocol": http_protocol,
+                        "http_version": http_version,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "normalization": normalization,
+                        "os": os,
+                        "tls_version": tls_version,
+                    },
+                    http_timeseries_groups_v2_params.HTTPTimeseriesGroupsV2Params,
+                ),
+                post_parser=ResultWrapper[HTTPTimeseriesGroupsV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[HTTPTimeseriesGroupsV2Response], ResultWrapper[HTTPTimeseriesGroupsV2Response]),
+        )
+
+
+class AsyncHTTPResource(AsyncAPIResource):
     @cached_property
     def locations(self) -> AsyncLocationsResource:
         return AsyncLocationsResource(self._client)
@@ -207,64 +546,254 @@ def summary(self) -> AsyncSummaryResource:
     def timeseries_groups(self) -> AsyncTimeseriesGroupsResource:
         return AsyncTimeseriesGroupsResource(self._client)
 
+    @cached_property
+    def top(self) -> AsyncTopResource:
+        return AsyncTopResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncHTTPResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncHTTPResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncHTTPResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncHTTPResourceWithStreamingResponse(self)
 
+    async def summary_v2(
+        self,
+        dimension: Literal[
+            "ADM1",
+            "BOT_CLASS",
+            "BROWSER",
+            "BROWSER_FAMILY",
+            "DEVICE_TYPE",
+            "HTTP_PROTOCOL",
+            "HTTP_VERSION",
+            "IP_VERSION",
+            "OS",
+            "POST_QUANTUM",
+            "TLS_VERSION",
+        ],
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> HTTPSummaryV2Response:
+        """
+        Retrieves the distribution of HTTP requests by the specified dimension.
+
+        Args:
+          dimension: Specifies the HTTP attribute by which to group the results.
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          bot_class: Filters results by bot class. Refer to
+              [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          device_type: Filters results by device type.
+
+          format: Format in which results will be returned.
+
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
+
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
+
+          http_version: Filters results by HTTP version.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/http/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "bot_class": bot_class,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "device_type": device_type,
+                        "format": format,
+                        "geo_id": geo_id,
+                        "http_protocol": http_protocol,
+                        "http_version": http_version,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "os": os,
+                        "tls_version": tls_version,
+                    },
+                    http_summary_v2_params.HTTPSummaryV2Params,
+                ),
+                post_parser=ResultWrapper[HTTPSummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[HTTPSummaryV2Response], ResultWrapper[HTTPSummaryV2Response]),
+        )
+
     async def timeseries(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> HTTPTimeseriesResponse:
         """
-        Get HTTP requests over time.
+        Retrieves the HTTP requests over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          bot_class: Filters results by bot class. Refer to
+              [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          device_type: Filters results by device type.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          format: Format in which results will be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
+
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
+
+          http_version: Filters results by HTTP version.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -285,13 +814,23 @@ async def timeseries(
                     {
                         "agg_interval": agg_interval,
                         "asn": asn,
+                        "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
+                        "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
+                        "http_protocol": http_protocol,
+                        "http_version": http_version,
+                        "ip_version": ip_version,
                         "location": location,
                         "name": name,
+                        "normalization": normalization,
+                        "os": os,
+                        "tls_version": tls_version,
                     },
                     http_timeseries_params.HTTPTimeseriesParams,
                 ),
@@ -300,18 +839,170 @@ async def timeseries(
             cast_to=cast(Type[HTTPTimeseriesResponse], ResultWrapper[HTTPTimeseriesResponse]),
         )
 
+    async def timeseries_groups_v2(
+        self,
+        dimension: Literal[
+            "ADM1",
+            "BOT_CLASS",
+            "BROWSER",
+            "BROWSER_FAMILY",
+            "DEVICE_TYPE",
+            "HTTP_PROTOCOL",
+            "HTTP_VERSION",
+            "IP_VERSION",
+            "OS",
+            "POST_QUANTUM",
+            "TLS_VERSION",
+        ],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> HTTPTimeseriesGroupsV2Response:
+        """
+        Retrieves the distribution of HTTP requests grouped by dimension.
+
+        Args:
+          dimension: Specifies the HTTP attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          bot_class: Filters results by bot class. Refer to
+              [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          device_type: Filters results by device type.
+
+          format: Format in which results will be returned.
+
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
+
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
+
+          http_version: Filters results by HTTP version.
+
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/http/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "bot_class": bot_class,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "device_type": device_type,
+                        "format": format,
+                        "geo_id": geo_id,
+                        "http_protocol": http_protocol,
+                        "http_version": http_version,
+                        "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "normalization": normalization,
+                        "os": os,
+                        "tls_version": tls_version,
+                    },
+                    http_timeseries_groups_v2_params.HTTPTimeseriesGroupsV2Params,
+                ),
+                post_parser=ResultWrapper[HTTPTimeseriesGroupsV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[HTTPTimeseriesGroupsV2Response], ResultWrapper[HTTPTimeseriesGroupsV2Response]),
+        )
+
 
 class HTTPResourceWithRawResponse:
     def __init__(self, http: HTTPResource) -> None:
         self._http = http
 
+        self.summary_v2 = to_raw_response_wrapper(
+            http.summary_v2,
+        )
         self.timeseries = to_raw_response_wrapper(
             http.timeseries,
         )
-
-    @cached_property
-    def top(self) -> TopResourceWithRawResponse:
-        return TopResourceWithRawResponse(self._http.top)
+        self.timeseries_groups_v2 = to_raw_response_wrapper(
+            http.timeseries_groups_v2,
+        )
 
     @cached_property
     def locations(self) -> LocationsResourceWithRawResponse:
@@ -329,18 +1020,24 @@ def summary(self) -> SummaryResourceWithRawResponse:
     def timeseries_groups(self) -> TimeseriesGroupsResourceWithRawResponse:
         return TimeseriesGroupsResourceWithRawResponse(self._http.timeseries_groups)
 
+    @cached_property
+    def top(self) -> TopResourceWithRawResponse:
+        return TopResourceWithRawResponse(self._http.top)
+
 
 class AsyncHTTPResourceWithRawResponse:
     def __init__(self, http: AsyncHTTPResource) -> None:
         self._http = http
 
+        self.summary_v2 = async_to_raw_response_wrapper(
+            http.summary_v2,
+        )
         self.timeseries = async_to_raw_response_wrapper(
             http.timeseries,
         )
-
-    @cached_property
-    def top(self) -> AsyncTopResourceWithRawResponse:
-        return AsyncTopResourceWithRawResponse(self._http.top)
+        self.timeseries_groups_v2 = async_to_raw_response_wrapper(
+            http.timeseries_groups_v2,
+        )
 
     @cached_property
     def locations(self) -> AsyncLocationsResourceWithRawResponse:
@@ -358,18 +1055,24 @@ def summary(self) -> AsyncSummaryResourceWithRawResponse:
     def timeseries_groups(self) -> AsyncTimeseriesGroupsResourceWithRawResponse:
         return AsyncTimeseriesGroupsResourceWithRawResponse(self._http.timeseries_groups)
 
+    @cached_property
+    def top(self) -> AsyncTopResourceWithRawResponse:
+        return AsyncTopResourceWithRawResponse(self._http.top)
+
 
 class HTTPResourceWithStreamingResponse:
     def __init__(self, http: HTTPResource) -> None:
         self._http = http
 
+        self.summary_v2 = to_streamed_response_wrapper(
+            http.summary_v2,
+        )
         self.timeseries = to_streamed_response_wrapper(
             http.timeseries,
         )
-
-    @cached_property
-    def top(self) -> TopResourceWithStreamingResponse:
-        return TopResourceWithStreamingResponse(self._http.top)
+        self.timeseries_groups_v2 = to_streamed_response_wrapper(
+            http.timeseries_groups_v2,
+        )
 
     @cached_property
     def locations(self) -> LocationsResourceWithStreamingResponse:
@@ -387,18 +1090,24 @@ def summary(self) -> SummaryResourceWithStreamingResponse:
     def timeseries_groups(self) -> TimeseriesGroupsResourceWithStreamingResponse:
         return TimeseriesGroupsResourceWithStreamingResponse(self._http.timeseries_groups)
 
+    @cached_property
+    def top(self) -> TopResourceWithStreamingResponse:
+        return TopResourceWithStreamingResponse(self._http.top)
+
 
 class AsyncHTTPResourceWithStreamingResponse:
     def __init__(self, http: AsyncHTTPResource) -> None:
         self._http = http
 
+        self.summary_v2 = async_to_streamed_response_wrapper(
+            http.summary_v2,
+        )
         self.timeseries = async_to_streamed_response_wrapper(
             http.timeseries,
         )
-
-    @cached_property
-    def top(self) -> AsyncTopResourceWithStreamingResponse:
-        return AsyncTopResourceWithStreamingResponse(self._http.top)
+        self.timeseries_groups_v2 = async_to_streamed_response_wrapper(
+            http.timeseries_groups_v2,
+        )
 
     @cached_property
     def locations(self) -> AsyncLocationsResourceWithStreamingResponse:
@@ -415,3 +1124,7 @@ def summary(self) -> AsyncSummaryResourceWithStreamingResponse:
     @cached_property
     def timeseries_groups(self) -> AsyncTimeseriesGroupsResourceWithStreamingResponse:
         return AsyncTimeseriesGroupsResourceWithStreamingResponse(self._http.timeseries_groups)
+
+    @cached_property
+    def top(self) -> AsyncTopResourceWithStreamingResponse:
+        return AsyncTopResourceWithStreamingResponse(self._http.top)
diff --git a/src/cloudflare/resources/radar/http/locations/bot_class.py b/src/cloudflare/resources/radar/http/locations/bot_class.py
index 943db404c22..207ffcaa027 100644
--- a/src/cloudflare/resources/radar/http/locations/bot_class.py
+++ b/src/cloudflare/resources/radar/http/locations/bot_class.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -32,89 +29,103 @@
 class BotClassResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> BotClassResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return BotClassResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> BotClassResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return BotClassResourceWithStreamingResponse(self)
 
     def get(
         self,
         bot_class: Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> BotClassGetResponse:
-        """Get the top locations, by HTTP traffic, of the requested bot class.
-
-        These two
-        categories use Cloudflare's bot score - refer to [Bot
-        scores])https://developers.cloudflare.com/bots/concepts/bot-score). Values are a
-        percentage out of the total traffic.
+        """
+        Retrieves the top locations, by HTTP requests, of the requested bot class.
 
         Args:
-          bot_class: Bot class.
+          bot_class: Bot class. Refer to
+              [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -143,6 +154,7 @@ def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -163,89 +175,103 @@ def get(
 class AsyncBotClassResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncBotClassResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncBotClassResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncBotClassResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncBotClassResourceWithStreamingResponse(self)
 
     async def get(
         self,
         bot_class: Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> BotClassGetResponse:
-        """Get the top locations, by HTTP traffic, of the requested bot class.
-
-        These two
-        categories use Cloudflare's bot score - refer to [Bot
-        scores])https://developers.cloudflare.com/bots/concepts/bot-score). Values are a
-        percentage out of the total traffic.
+        """
+        Retrieves the top locations, by HTTP requests, of the requested bot class.
 
         Args:
-          bot_class: Bot class.
+          bot_class: Bot class. Refer to
+              [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -274,6 +300,7 @@ async def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
diff --git a/src/cloudflare/resources/radar/http/locations/browser_family.py b/src/cloudflare/resources/radar/http/locations/browser_family.py
index 3c5693a7e01..bc5a5db3ea3 100644
--- a/src/cloudflare/resources/radar/http/locations/browser_family.py
+++ b/src/cloudflare/resources/radar/http/locations/browser_family.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -32,88 +29,103 @@
 class BrowserFamilyResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> BrowserFamilyResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return BrowserFamilyResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> BrowserFamilyResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return BrowserFamilyResourceWithStreamingResponse(self)
 
     def get(
         self,
         browser_family: Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> BrowserFamilyGetResponse:
-        """Get the top locations, by HTTP traffic, of the requested browser family.
-
-        Values
-        are a percentage out of the total traffic.
+        """
+        Retrieves the top locations, by HTTP requests, of the requested browser family.
 
         Args:
           browser_family: Browser family.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -142,6 +154,7 @@ def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -162,88 +175,103 @@ def get(
 class AsyncBrowserFamilyResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncBrowserFamilyResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncBrowserFamilyResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncBrowserFamilyResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncBrowserFamilyResourceWithStreamingResponse(self)
 
     async def get(
         self,
         browser_family: Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> BrowserFamilyGetResponse:
-        """Get the top locations, by HTTP traffic, of the requested browser family.
-
-        Values
-        are a percentage out of the total traffic.
+        """
+        Retrieves the top locations, by HTTP requests, of the requested browser family.
 
         Args:
           browser_family: Browser family.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -272,6 +300,7 @@ async def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
diff --git a/src/cloudflare/resources/radar/http/locations/device_type.py b/src/cloudflare/resources/radar/http/locations/device_type.py
index 982e239c758..5300107f97d 100644
--- a/src/cloudflare/resources/radar/http/locations/device_type.py
+++ b/src/cloudflare/resources/radar/http/locations/device_type.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -32,88 +29,103 @@
 class DeviceTypeResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DeviceTypeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DeviceTypeResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DeviceTypeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DeviceTypeResourceWithStreamingResponse(self)
 
     def get(
         self,
         device_type: Literal["DESKTOP", "MOBILE", "OTHER"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> DeviceTypeGetResponse:
-        """Get the top locations, by HTTP traffic, of the requested device type.
-
-        Values are
-        a percentage out of the total traffic.
+        """
+        Retrieves the top locations, by HTTP requests, of the requested device type.
 
         Args:
           device_type: Device type.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -142,6 +154,7 @@ def get(
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -162,88 +175,103 @@ def get(
 class AsyncDeviceTypeResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDeviceTypeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDeviceTypeResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDeviceTypeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDeviceTypeResourceWithStreamingResponse(self)
 
     async def get(
         self,
         device_type: Literal["DESKTOP", "MOBILE", "OTHER"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> DeviceTypeGetResponse:
-        """Get the top locations, by HTTP traffic, of the requested device type.
-
-        Values are
-        a percentage out of the total traffic.
+        """
+        Retrieves the top locations, by HTTP requests, of the requested device type.
 
         Args:
           device_type: Device type.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -272,6 +300,7 @@ async def get(
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
diff --git a/src/cloudflare/resources/radar/http/locations/http_method.py b/src/cloudflare/resources/radar/http/locations/http_method.py
index 54df750513e..639ad34ed89 100644
--- a/src/cloudflare/resources/radar/http/locations/http_method.py
+++ b/src/cloudflare/resources/radar/http/locations/http_method.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -32,88 +29,103 @@
 class HTTPMethodResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> HTTPMethodResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return HTTPMethodResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> HTTPMethodResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return HTTPMethodResourceWithStreamingResponse(self)
 
     def get(
         self,
         http_version: Literal["HTTPv1", "HTTPv2", "HTTPv3"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> HTTPMethodGetResponse:
-        """Get the top locations, by HTTP traffic, of the requested HTTP protocol.
-
-        Values
-        are a percentage out of the total traffic.
+        """
+        Retrieves the top locations, by HTTP requests, of the requested HTTP version.
 
         Args:
           http_version: HTTP version.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -143,6 +155,7 @@ def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "ip_version": ip_version,
                         "limit": limit,
@@ -162,88 +175,103 @@ def get(
 class AsyncHTTPMethodResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncHTTPMethodResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncHTTPMethodResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncHTTPMethodResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncHTTPMethodResourceWithStreamingResponse(self)
 
     async def get(
         self,
         http_version: Literal["HTTPv1", "HTTPv2", "HTTPv3"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> HTTPMethodGetResponse:
-        """Get the top locations, by HTTP traffic, of the requested HTTP protocol.
-
-        Values
-        are a percentage out of the total traffic.
+        """
+        Retrieves the top locations, by HTTP requests, of the requested HTTP version.
 
         Args:
           http_version: HTTP version.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -273,6 +301,7 @@ async def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "ip_version": ip_version,
                         "limit": limit,
diff --git a/src/cloudflare/resources/radar/http/locations/http_protocol.py b/src/cloudflare/resources/radar/http/locations/http_protocol.py
index 5c434792c6b..a4df4deecf5 100644
--- a/src/cloudflare/resources/radar/http/locations/http_protocol.py
+++ b/src/cloudflare/resources/radar/http/locations/http_protocol.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -32,85 +29,103 @@
 class HTTPProtocolResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> HTTPProtocolResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return HTTPProtocolResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> HTTPProtocolResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return HTTPProtocolResourceWithStreamingResponse(self)
 
     def get(
         self,
         http_protocol: Literal["HTTP", "HTTPS"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> HTTPProtocolGetResponse:
-        """Get the top locations, by HTTP traffic, of the requested HTTP protocol.
-
-        Values
-        are a percentage out of the total traffic.
+        """
+        Retrieves the top locations, by HTTP requests, of the requested HTTP protocol.
 
         Args:
-          http_protocol: HTTP Protocol.
+          http_protocol: HTTP protocol (HTTP vs. HTTPS).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          device_type: Filters results by device type.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          device_type: Filter for device type.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          format: Format results are returned in.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -140,6 +155,8 @@ def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
+                        "http_version": http_version,
                         "ip_version": ip_version,
                         "limit": limit,
                         "location": location,
@@ -158,85 +175,103 @@ def get(
 class AsyncHTTPProtocolResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncHTTPProtocolResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncHTTPProtocolResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncHTTPProtocolResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncHTTPProtocolResourceWithStreamingResponse(self)
 
     async def get(
         self,
         http_protocol: Literal["HTTP", "HTTPS"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> HTTPProtocolGetResponse:
-        """Get the top locations, by HTTP traffic, of the requested HTTP protocol.
-
-        Values
-        are a percentage out of the total traffic.
+        """
+        Retrieves the top locations, by HTTP requests, of the requested HTTP protocol.
 
         Args:
-          http_protocol: HTTP Protocol.
+          http_protocol: HTTP protocol (HTTP vs. HTTPS).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          device_type: Filters results by device type.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          device_type: Filter for device type.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          format: Format results are returned in.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -266,6 +301,8 @@ async def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
+                        "http_version": http_version,
                         "ip_version": ip_version,
                         "limit": limit,
                         "location": location,
diff --git a/src/cloudflare/resources/radar/http/locations/ip_version.py b/src/cloudflare/resources/radar/http/locations/ip_version.py
index c41ee965321..c5f62f7a46e 100644
--- a/src/cloudflare/resources/radar/http/locations/ip_version.py
+++ b/src/cloudflare/resources/radar/http/locations/ip_version.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -32,87 +29,103 @@
 class IPVersionResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> IPVersionResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return IPVersionResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> IPVersionResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return IPVersionResourceWithStreamingResponse(self)
 
     def get(
         self,
         ip_version: Literal["IPv4", "IPv6"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPVersionGetResponse:
         """
-        Get the top locations, by HTTP traffic, of the requested IP protocol version.
-        Values are a percentage out of the total traffic.
+        Retrieves the top locations, by HTTP requests, of the requested IP version.
 
         Args:
           ip_version: IP version.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -142,6 +155,7 @@ def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "limit": limit,
@@ -161,87 +175,103 @@ def get(
 class AsyncIPVersionResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncIPVersionResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncIPVersionResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncIPVersionResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncIPVersionResourceWithStreamingResponse(self)
 
     async def get(
         self,
         ip_version: Literal["IPv4", "IPv6"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPVersionGetResponse:
         """
-        Get the top locations, by HTTP traffic, of the requested IP protocol version.
-        Values are a percentage out of the total traffic.
+        Retrieves the top locations, by HTTP requests, of the requested IP version.
 
         Args:
           ip_version: IP version.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -271,6 +301,7 @@ async def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "limit": limit,
diff --git a/src/cloudflare/resources/radar/http/locations/locations.py b/src/cloudflare/resources/radar/http/locations/locations.py
index 9055706a402..f35bdc497e6 100644
--- a/src/cloudflare/resources/radar/http/locations/locations.py
+++ b/src/cloudflare/resources/radar/http/locations/locations.py
@@ -24,11 +24,8 @@
     BotClassResourceWithStreamingResponse,
     AsyncBotClassResourceWithStreamingResponse,
 )
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from .ip_version import (
     IPVersionResource,
     AsyncIPVersionResource,
@@ -128,88 +125,103 @@ def browser_family(self) -> BrowserFamilyResource:
 
     @cached_property
     def with_raw_response(self) -> LocationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LocationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LocationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LocationsResourceWithStreamingResponse(self)
 
     def get(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LocationGetResponse:
-        """Get the top locations by HTTP traffic.
-
-        Values are a percentage out of the total
-        traffic.
+        """
+        Retrieves the top locations by HTTP requests.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -237,6 +249,7 @@ def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -289,88 +302,103 @@ def browser_family(self) -> AsyncBrowserFamilyResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncLocationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLocationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLocationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLocationsResourceWithStreamingResponse(self)
 
     async def get(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LocationGetResponse:
-        """Get the top locations by HTTP traffic.
-
-        Values are a percentage out of the total
-        traffic.
+        """
+        Retrieves the top locations by HTTP requests.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -398,6 +426,7 @@ async def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
diff --git a/src/cloudflare/resources/radar/http/locations/os.py b/src/cloudflare/resources/radar/http/locations/os.py
index 131769f84dc..ab46ba089cf 100644
--- a/src/cloudflare/resources/radar/http/locations/os.py
+++ b/src/cloudflare/resources/radar/http/locations/os.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -32,86 +29,104 @@
 class OSResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> OSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return OSResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> OSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return OSResourceWithStreamingResponse(self)
 
     def get(
         self,
         os: Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> OSGetResponse:
         """
-        Get the top locations, by HTTP traffic, of the requested operating systems.
-        Values are a percentage out of the total traffic.
+        Retrieves the top locations, by HTTP requests, of the requested operating
+        system.
 
         Args:
           os: Operating system.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -141,6 +156,7 @@ def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -160,86 +176,104 @@ def get(
 class AsyncOSResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncOSResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncOSResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncOSResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncOSResourceWithStreamingResponse(self)
 
     async def get(
         self,
         os: Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> OSGetResponse:
         """
-        Get the top locations, by HTTP traffic, of the requested operating systems.
-        Values are a percentage out of the total traffic.
+        Retrieves the top locations, by HTTP requests, of the requested operating
+        system.
 
         Args:
           os: Operating system.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -269,6 +303,7 @@ async def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
diff --git a/src/cloudflare/resources/radar/http/locations/tls_version.py b/src/cloudflare/resources/radar/http/locations/tls_version.py
index 0ece72750aa..d53cd40360c 100644
--- a/src/cloudflare/resources/radar/http/locations/tls_version.py
+++ b/src/cloudflare/resources/radar/http/locations/tls_version.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -32,87 +29,104 @@
 class TLSVersionResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TLSVersionResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TLSVersionResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TLSVersionResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TLSVersionResourceWithStreamingResponse(self)
 
     def get(
         self,
         tls_version: Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TLSVersionGetResponse:
         """
-        Get the top locations, by HTTP traffic, of the requested TLS protocol version.
-        Values are a percentage out of the total traffic.
+        Retrieves the top locations, by HTTP requests, of the requested TLS protocol
+        version.
 
         Args:
           tls_version: TLS version.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
           extra_headers: Send extra headers
 
@@ -142,6 +156,7 @@ def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -161,87 +176,104 @@ def get(
 class AsyncTLSVersionResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTLSVersionResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTLSVersionResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTLSVersionResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTLSVersionResourceWithStreamingResponse(self)
 
     async def get(
         self,
         tls_version: Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"],
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TLSVersionGetResponse:
         """
-        Get the top locations, by HTTP traffic, of the requested TLS protocol version.
-        Values are a percentage out of the total traffic.
+        Retrieves the top locations, by HTTP requests, of the requested TLS protocol
+        version.
 
         Args:
           tls_version: TLS version.
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
           extra_headers: Send extra headers
 
@@ -271,6 +303,7 @@ async def get(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
diff --git a/src/cloudflare/resources/radar/http/summary.py b/src/cloudflare/resources/radar/http/summary.py
index 59e479d8ce6..6859ec69b38 100644
--- a/src/cloudflare/resources/radar/http/summary.py
+++ b/src/cloudflare/resources/radar/http/summary.py
@@ -2,17 +2,15 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import List, Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -48,79 +46,102 @@
 class SummaryResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SummaryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SummaryResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
     def bot_class(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryBotClassResponse:
         """
-        Percentage distribution of bot-generated traffic to genuine human traffic, as
-        classified by Cloudflare. Visit
+        Retrieves the distribution of bot-generated HTTP requests to genuine human
+        traffic, as classified by Cloudflare. Visit
         https://developers.cloudflare.com/radar/concepts/bot-classes/ for more
         information.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -140,12 +161,14 @@ def bot_class(
                 query=maybe_transform(
                     {
                         "asn": asn,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -161,72 +184,84 @@ def bot_class(
             cast_to=cast(Type[SummaryBotClassResponse], ResultWrapper[SummaryBotClassResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
     def device_type(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryDeviceTypeResponse:
         """
-        Percentage of Internet traffic generated by mobile, desktop, and other types of
-        devices, over a given time period.
+        Retrieves the distribution of HTTP requests generated by mobile, desktop, and
+        other types of devices.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_protocol: Filter for http protocol.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_version: Filter for http version.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          ip_version: Filter for ip version.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          os: Filter for os name.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -247,11 +282,13 @@ def device_type(
                     {
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -267,71 +304,84 @@ def device_type(
             cast_to=cast(Type[SummaryDeviceTypeResponse], ResultWrapper[SummaryDeviceTypeResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
     def http_protocol(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryHTTPProtocolResponse:
-        """
-        Percentage distribution of traffic per HTTP protocol over a given time period.
+        """Retrieves the distribution of HTTP requests by HTTP protocol (HTTP vs.
+
+        HTTPS).
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -352,12 +402,14 @@ def http_protocol(
                     {
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_version": http_version,
                         "ip_version": ip_version,
                         "location": location,
@@ -372,72 +424,83 @@ def http_protocol(
             cast_to=cast(Type[SummaryHTTPProtocolResponse], ResultWrapper[SummaryHTTPProtocolResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
     def http_version(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryHTTPVersionResponse:
         """
-        Percentage distribution of traffic per HTTP protocol version over a given time
-        period.
+        Retrieves the distribution of HTTP requests by HTTP version.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          device_type: Filter for device type.
+          device_type: Filters results by device type.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_protocol: Filter for http protocol.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          ip_version: Filter for ip version.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          os: Filter for os name.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -458,12 +521,14 @@ def http_version(
                     {
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "ip_version": ip_version,
                         "location": location,
@@ -478,72 +543,83 @@ def http_version(
             cast_to=cast(Type[SummaryHTTPVersionResponse], ResultWrapper[SummaryHTTPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
     def ip_version(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryIPVersionResponse:
         """
-        Percentage distribution of Internet traffic based on IP protocol versions, such
-        as IPv4 and IPv6, over a given time period.
+        Retrieves the distribution of HTTP requests by IP version.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -564,12 +640,14 @@ def ip_version(
                     {
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "location": location,
@@ -584,71 +662,84 @@ def ip_version(
             cast_to=cast(Type[SummaryIPVersionResponse], ResultWrapper[SummaryIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
     def os(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryOSResponse:
         """
-        Percentage distribution of Internet traffic generated by different operating
-        systems like Windows, macOS, Android, iOS, and others, over a given time period.
+        Retrieves the distribution of HTTP requests by operating system (Windows, macOS,
+        Android, iOS, and others).
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -669,12 +760,14 @@ def os(
                     {
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -689,75 +782,86 @@ def os(
             cast_to=cast(Type[SummaryOSResponse], ResultWrapper[SummaryOSResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
     def post_quantum(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryPostQuantumResponse:
         """
-        Percentage distribution of traffic per Post Quantum support over a given time
-        period.
+        Retrieves the distribution of HTTP requests by post-quantum support.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          device_type: Filter for device type.
+          device_type: Filters results by device type.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_protocol: Filter for http protocol.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_version: Filter for http version.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          ip_version: Filter for ip version.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          os: Filter for os name.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -778,12 +882,14 @@ def post_quantum(
                     {
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -799,72 +905,83 @@ def post_quantum(
             cast_to=cast(Type[SummaryPostQuantumResponse], ResultWrapper[SummaryPostQuantumResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
     def tls_version(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryTLSVersionResponse:
         """
-        Percentage distribution of traffic per TLS protocol version, over a given time
-        period.
+        Retrieves the distribution of HTTP requests by TLS version.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
           extra_headers: Send extra headers
 
@@ -885,12 +1002,14 @@ def tls_version(
                     {
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -909,79 +1028,102 @@ def tls_version(
 class AsyncSummaryResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSummaryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSummaryResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
     async def bot_class(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryBotClassResponse:
         """
-        Percentage distribution of bot-generated traffic to genuine human traffic, as
-        classified by Cloudflare. Visit
+        Retrieves the distribution of bot-generated HTTP requests to genuine human
+        traffic, as classified by Cloudflare. Visit
         https://developers.cloudflare.com/radar/concepts/bot-classes/ for more
         information.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1001,12 +1143,14 @@ async def bot_class(
                 query=await async_maybe_transform(
                     {
                         "asn": asn,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -1022,72 +1166,84 @@ async def bot_class(
             cast_to=cast(Type[SummaryBotClassResponse], ResultWrapper[SummaryBotClassResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
     async def device_type(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryDeviceTypeResponse:
         """
-        Percentage of Internet traffic generated by mobile, desktop, and other types of
-        devices, over a given time period.
+        Retrieves the distribution of HTTP requests generated by mobile, desktop, and
+        other types of devices.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_protocol: Filter for http protocol.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_version: Filter for http version.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          ip_version: Filter for ip version.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          os: Filter for os name.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1108,11 +1264,13 @@ async def device_type(
                     {
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -1128,71 +1286,84 @@ async def device_type(
             cast_to=cast(Type[SummaryDeviceTypeResponse], ResultWrapper[SummaryDeviceTypeResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
     async def http_protocol(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryHTTPProtocolResponse:
-        """
-        Percentage distribution of traffic per HTTP protocol over a given time period.
+        """Retrieves the distribution of HTTP requests by HTTP protocol (HTTP vs.
+
+        HTTPS).
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1213,12 +1384,14 @@ async def http_protocol(
                     {
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_version": http_version,
                         "ip_version": ip_version,
                         "location": location,
@@ -1233,72 +1406,83 @@ async def http_protocol(
             cast_to=cast(Type[SummaryHTTPProtocolResponse], ResultWrapper[SummaryHTTPProtocolResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
     async def http_version(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryHTTPVersionResponse:
         """
-        Percentage distribution of traffic per HTTP protocol version over a given time
-        period.
+        Retrieves the distribution of HTTP requests by HTTP version.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          device_type: Filter for device type.
+          device_type: Filters results by device type.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_protocol: Filter for http protocol.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          ip_version: Filter for ip version.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          os: Filter for os name.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1319,12 +1503,14 @@ async def http_version(
                     {
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "ip_version": ip_version,
                         "location": location,
@@ -1339,72 +1525,83 @@ async def http_version(
             cast_to=cast(Type[SummaryHTTPVersionResponse], ResultWrapper[SummaryHTTPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
     async def ip_version(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryIPVersionResponse:
         """
-        Percentage distribution of Internet traffic based on IP protocol versions, such
-        as IPv4 and IPv6, over a given time period.
+        Retrieves the distribution of HTTP requests by IP version.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1425,12 +1622,14 @@ async def ip_version(
                     {
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "location": location,
@@ -1445,71 +1644,84 @@ async def ip_version(
             cast_to=cast(Type[SummaryIPVersionResponse], ResultWrapper[SummaryIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
     async def os(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryOSResponse:
         """
-        Percentage distribution of Internet traffic generated by different operating
-        systems like Windows, macOS, Android, iOS, and others, over a given time period.
+        Retrieves the distribution of HTTP requests by operating system (Windows, macOS,
+        Android, iOS, and others).
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1530,12 +1742,14 @@ async def os(
                     {
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -1550,75 +1764,86 @@ async def os(
             cast_to=cast(Type[SummaryOSResponse], ResultWrapper[SummaryOSResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
     async def post_quantum(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryPostQuantumResponse:
         """
-        Percentage distribution of traffic per Post Quantum support over a given time
-        period.
+        Retrieves the distribution of HTTP requests by post-quantum support.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          device_type: Filter for device type.
+          device_type: Filters results by device type.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_protocol: Filter for http protocol.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_version: Filter for http version.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          ip_version: Filter for ip version.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          os: Filter for os name.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1639,12 +1864,14 @@ async def post_quantum(
                     {
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -1660,72 +1887,83 @@ async def post_quantum(
             cast_to=cast(Type[SummaryPostQuantumResponse], ResultWrapper[SummaryPostQuantumResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
     async def tls_version(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SummaryTLSVersionResponse:
         """
-        Percentage distribution of traffic per TLS protocol version, over a given time
-        period.
+        Retrieves the distribution of HTTP requests by TLS version.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
           extra_headers: Send extra headers
 
@@ -1746,12 +1984,14 @@ async def tls_version(
                     {
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -1771,29 +2011,45 @@ class SummaryResourceWithRawResponse:
     def __init__(self, summary: SummaryResource) -> None:
         self._summary = summary
 
-        self.bot_class = to_raw_response_wrapper(
-            summary.bot_class,
+        self.bot_class = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.bot_class,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.device_type = to_raw_response_wrapper(
-            summary.device_type,
+        self.device_type = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.device_type,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_protocol = to_raw_response_wrapper(
-            summary.http_protocol,
+        self.http_protocol = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.http_protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_version = to_raw_response_wrapper(
-            summary.http_version,
+        self.http_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.http_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_raw_response_wrapper(
-            summary.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.os = to_raw_response_wrapper(
-            summary.os,
+        self.os = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.os,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.post_quantum = to_raw_response_wrapper(
-            summary.post_quantum,
+        self.post_quantum = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.post_quantum,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.tls_version = to_raw_response_wrapper(
-            summary.tls_version,
+        self.tls_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.tls_version,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1801,29 +2057,45 @@ class AsyncSummaryResourceWithRawResponse:
     def __init__(self, summary: AsyncSummaryResource) -> None:
         self._summary = summary
 
-        self.bot_class = async_to_raw_response_wrapper(
-            summary.bot_class,
+        self.bot_class = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.bot_class,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.device_type = async_to_raw_response_wrapper(
-            summary.device_type,
+        self.device_type = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.device_type,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_protocol = async_to_raw_response_wrapper(
-            summary.http_protocol,
+        self.http_protocol = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.http_protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_version = async_to_raw_response_wrapper(
-            summary.http_version,
+        self.http_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.http_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_raw_response_wrapper(
-            summary.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.os = async_to_raw_response_wrapper(
-            summary.os,
+        self.os = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.os,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.post_quantum = async_to_raw_response_wrapper(
-            summary.post_quantum,
+        self.post_quantum = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.post_quantum,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.tls_version = async_to_raw_response_wrapper(
-            summary.tls_version,
+        self.tls_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.tls_version,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1831,29 +2103,45 @@ class SummaryResourceWithStreamingResponse:
     def __init__(self, summary: SummaryResource) -> None:
         self._summary = summary
 
-        self.bot_class = to_streamed_response_wrapper(
-            summary.bot_class,
+        self.bot_class = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.bot_class,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.device_type = to_streamed_response_wrapper(
-            summary.device_type,
+        self.device_type = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.device_type,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_protocol = to_streamed_response_wrapper(
-            summary.http_protocol,
+        self.http_protocol = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.http_protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_version = to_streamed_response_wrapper(
-            summary.http_version,
+        self.http_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.http_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_streamed_response_wrapper(
-            summary.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.os = to_streamed_response_wrapper(
-            summary.os,
+        self.os = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.os,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.post_quantum = to_streamed_response_wrapper(
-            summary.post_quantum,
+        self.post_quantum = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.post_quantum,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.tls_version = to_streamed_response_wrapper(
-            summary.tls_version,
+        self.tls_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.tls_version,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -1861,27 +2149,43 @@ class AsyncSummaryResourceWithStreamingResponse:
     def __init__(self, summary: AsyncSummaryResource) -> None:
         self._summary = summary
 
-        self.bot_class = async_to_streamed_response_wrapper(
-            summary.bot_class,
+        self.bot_class = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.bot_class,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.device_type = async_to_streamed_response_wrapper(
-            summary.device_type,
+        self.device_type = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.device_type,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_protocol = async_to_streamed_response_wrapper(
-            summary.http_protocol,
+        self.http_protocol = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.http_protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_version = async_to_streamed_response_wrapper(
-            summary.http_version,
+        self.http_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.http_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_streamed_response_wrapper(
-            summary.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.os = async_to_streamed_response_wrapper(
-            summary.os,
+        self.os = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.os,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.post_quantum = async_to_streamed_response_wrapper(
-            summary.post_quantum,
+        self.post_quantum = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.post_quantum,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.tls_version = async_to_streamed_response_wrapper(
-            summary.tls_version,
+        self.tls_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.tls_version,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/radar/http/timeseries_groups.py b/src/cloudflare/resources/radar/http/timeseries_groups.py
index d1e43be8b77..1abeaa86143 100644
--- a/src/cloudflare/resources/radar/http/timeseries_groups.py
+++ b/src/cloudflare/resources/radar/http/timeseries_groups.py
@@ -2,17 +2,15 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import List, Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -52,84 +50,106 @@
 class TimeseriesGroupsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TimeseriesGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TimeseriesGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TimeseriesGroupsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     def bot_class(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupBotClassResponse:
         """
-        Get a time series of the percentage distribution of traffic classified as
-        automated or human. Visit
-        https://developers.cloudflare.com/radar/concepts/bot-classes/ for more
-        information.
+        Retrieves the distribution of HTTP requests classified as automated or human
+        over time. Visit https://developers.cloudflare.com/radar/concepts/bot-classes/
+        for more information.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          device_type: Filter for device type.
+          device_type: Filters results by device type.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_protocol: Filter for http protocol.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_version: Filter for http version.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          ip_version: Filter for ip version.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          os: Filter for os name.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -150,12 +170,14 @@ def bot_class(
                     {
                         "agg_interval": agg_interval,
                         "asn": asn,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -171,84 +193,96 @@ def bot_class(
             cast_to=cast(Type[TimeseriesGroupBotClassResponse], ResultWrapper[TimeseriesGroupBotClassResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     def browser(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit_per_group: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupBrowserResponse:
         """
-        Get a time series of the percentage distribution of traffic of the top user
-        agents.
+        Retrieves the distribution of HTTP requests by user agent over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          device_type: Filter for device type.
+          device_type: Filters results by device type.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_protocol: Filter for http protocol.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_version: Filter for http version.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          ip_version: Filter for ip version.
+          http_version: Filters results by HTTP version.
 
-          limit_per_group: Limit the number of objects (eg browsers, verticals, etc) to the top items over
-              the time range.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          os: Filter for os name.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -270,12 +304,14 @@ def browser(
                         "agg_interval": agg_interval,
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -292,80 +328,93 @@ def browser(
             cast_to=cast(Type[TimeseriesGroupBrowserResponse], ResultWrapper[TimeseriesGroupBrowserResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     def browser_family(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupBrowserFamilyResponse:
         """
-        Get a time series of the percentage distribution of traffic of the top user
-        agents aggregated in families.
+        Retrieves the distribution of HTTP requests by user agent family over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          os: Filter for os name.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -393,9 +442,11 @@ def browser_family(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
                         "os": os,
@@ -410,76 +461,88 @@ def browser_family(
             ),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     def device_type(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupDeviceTypeResponse:
         """
-        Get a time series of the percentage distribution of traffic per device type.
+        Retrieves the distribution of HTTP requests by device type over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_protocol: Filter for http protocol.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_version: Filter for http version.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          ip_version: Filter for ip version.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          os: Filter for os name.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -501,11 +564,13 @@ def device_type(
                         "agg_interval": agg_interval,
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -521,76 +586,90 @@ def device_type(
             cast_to=cast(Type[TimeseriesGroupDeviceTypeResponse], ResultWrapper[TimeseriesGroupDeviceTypeResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     def http_protocol(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupHTTPProtocolResponse:
-        """
-        Get a time series of the percentage distribution of traffic per HTTP protocol.
+        """Retrieves the distribution of HTTP requests by HTTP protocol (HTTP vs.
+
+        HTTPS)
+        over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          device_type: Filter for device type.
+          device_type: Filters results by device type.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_version: Filter for http version.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          ip_version: Filter for ip version.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          os: Filter for os name.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -612,12 +691,14 @@ def http_protocol(
                         "agg_interval": agg_interval,
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_version": http_version,
                         "ip_version": ip_version,
                         "location": location,
@@ -632,77 +713,88 @@ def http_protocol(
             cast_to=cast(Type[TimeseriesGroupHTTPProtocolResponse], ResultWrapper[TimeseriesGroupHTTPProtocolResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     def http_version(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupHTTPVersionResponse:
         """
-        Get a time series of the percentage distribution of traffic per HTTP protocol
-        version.
+        Retrieves the distribution of HTTP requests by HTTP version over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          device_type: Filter for device type.
+          device_type: Filters results by device type.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_protocol: Filter for http protocol.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          ip_version: Filter for ip version.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          os: Filter for os name.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -724,12 +816,14 @@ def http_version(
                         "agg_interval": agg_interval,
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "ip_version": ip_version,
                         "location": location,
@@ -744,77 +838,88 @@ def http_version(
             cast_to=cast(Type[TimeseriesGroupHTTPVersionResponse], ResultWrapper[TimeseriesGroupHTTPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     def ip_version(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupIPVersionResponse:
         """
-        Get a time series of the percentage distribution of traffic per IP protocol
-        version.
+        Retrieves the distribution of HTTP requests by IP version over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          device_type: Filter for device type.
+          device_type: Filters results by device type.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_protocol: Filter for http protocol.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_version: Filter for http version.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          http_version: Filters results by HTTP version.
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          os: Filter for os name.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -836,12 +941,14 @@ def ip_version(
                         "agg_interval": agg_interval,
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "location": location,
@@ -856,76 +963,88 @@ def ip_version(
             cast_to=cast(Type[TimeseriesGroupIPVersionResponse], ResultWrapper[TimeseriesGroupIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     def os(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupOSResponse:
         """
-        Get a time series of the percentage distribution of traffic of the top operating
-        systems.
+        Retrieves the distribution of HTTP requests by operating system over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          device_type: Filter for device type.
+          device_type: Filters results by device type.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_protocol: Filter for http protocol.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_version: Filter for http version.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          ip_version: Filter for ip version.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          tls_version: Filter for tls version.
+          name: Array of names used to label the series in the response.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -947,12 +1066,14 @@ def os(
                         "agg_interval": agg_interval,
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -967,80 +1088,91 @@ def os(
             cast_to=cast(Type[TimeseriesGroupOSResponse], ResultWrapper[TimeseriesGroupOSResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     def post_quantum(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupPostQuantumResponse:
         """
-        Get a time series of the percentage distribution of traffic per Post Quantum
-        suport.
+        Retrieves the distribution of HTTP requests by post-quantum support over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          device_type: Filter for device type.
+          device_type: Filters results by device type.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_protocol: Filter for http protocol.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_version: Filter for http version.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          ip_version: Filter for ip version.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          os: Filter for os name.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1062,12 +1194,14 @@ def post_quantum(
                         "agg_interval": agg_interval,
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -1083,77 +1217,88 @@ def post_quantum(
             cast_to=cast(Type[TimeseriesGroupPostQuantumResponse], ResultWrapper[TimeseriesGroupPostQuantumResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     def tls_version(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupTLSVersionResponse:
         """
-        Get a time series of the percentage distribution of traffic per TLS protocol
-        version.
+        Retrieves the distribution of HTTP requests by TLS version over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
           extra_headers: Send extra headers
 
@@ -1175,12 +1320,14 @@ def tls_version(
                         "agg_interval": agg_interval,
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -1199,84 +1346,106 @@ def tls_version(
 class AsyncTimeseriesGroupsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTimeseriesGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTimeseriesGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTimeseriesGroupsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     async def bot_class(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupBotClassResponse:
         """
-        Get a time series of the percentage distribution of traffic classified as
-        automated or human. Visit
-        https://developers.cloudflare.com/radar/concepts/bot-classes/ for more
-        information.
+        Retrieves the distribution of HTTP requests classified as automated or human
+        over time. Visit https://developers.cloudflare.com/radar/concepts/bot-classes/
+        for more information.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1297,12 +1466,14 @@ async def bot_class(
                     {
                         "agg_interval": agg_interval,
                         "asn": asn,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -1318,84 +1489,96 @@ async def bot_class(
             cast_to=cast(Type[TimeseriesGroupBotClassResponse], ResultWrapper[TimeseriesGroupBotClassResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     async def browser(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit_per_group: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupBrowserResponse:
         """
-        Get a time series of the percentage distribution of traffic of the top user
-        agents.
+        Retrieves the distribution of HTTP requests by user agent over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit_per_group: Limit the number of objects (eg browsers, verticals, etc) to the top items over
-              the time range.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1417,12 +1600,14 @@ async def browser(
                         "agg_interval": agg_interval,
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -1439,80 +1624,93 @@ async def browser(
             cast_to=cast(Type[TimeseriesGroupBrowserResponse], ResultWrapper[TimeseriesGroupBrowserResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     async def browser_family(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupBrowserFamilyResponse:
         """
-        Get a time series of the percentage distribution of traffic of the top user
-        agents aggregated in families.
+        Retrieves the distribution of HTTP requests by user agent family over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          device_type: Filters results by device type.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          device_type: Filter for device type.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          format: Format results are returned in.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_protocol: Filter for http protocol.
+          http_version: Filters results by HTTP version.
 
-          http_version: Filter for http version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          ip_version: Filter for ip version.
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1540,9 +1738,11 @@ async def browser_family(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
                         "os": os,
@@ -1557,76 +1757,88 @@ async def browser_family(
             ),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     async def device_type(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupDeviceTypeResponse:
         """
-        Get a time series of the percentage distribution of traffic per device type.
+        Retrieves the distribution of HTTP requests by device type over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1648,11 +1860,13 @@ async def device_type(
                         "agg_interval": agg_interval,
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -1668,76 +1882,90 @@ async def device_type(
             cast_to=cast(Type[TimeseriesGroupDeviceTypeResponse], ResultWrapper[TimeseriesGroupDeviceTypeResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     async def http_protocol(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupHTTPProtocolResponse:
-        """
-        Get a time series of the percentage distribution of traffic per HTTP protocol.
+        """Retrieves the distribution of HTTP requests by HTTP protocol (HTTP vs.
+
+        HTTPS)
+        over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1759,12 +1987,14 @@ async def http_protocol(
                         "agg_interval": agg_interval,
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_version": http_version,
                         "ip_version": ip_version,
                         "location": location,
@@ -1779,77 +2009,88 @@ async def http_protocol(
             cast_to=cast(Type[TimeseriesGroupHTTPProtocolResponse], ResultWrapper[TimeseriesGroupHTTPProtocolResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     async def http_version(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupHTTPVersionResponse:
         """
-        Get a time series of the percentage distribution of traffic per HTTP protocol
-        version.
+        Retrieves the distribution of HTTP requests by HTTP version over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1871,12 +2112,14 @@ async def http_version(
                         "agg_interval": agg_interval,
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "ip_version": ip_version,
                         "location": location,
@@ -1891,77 +2134,88 @@ async def http_version(
             cast_to=cast(Type[TimeseriesGroupHTTPVersionResponse], ResultWrapper[TimeseriesGroupHTTPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     async def ip_version(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupIPVersionResponse:
         """
-        Get a time series of the percentage distribution of traffic per IP protocol
-        version.
+        Retrieves the distribution of HTTP requests by IP version over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          device_type: Filter for device type.
+          device_type: Filters results by device type.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_protocol: Filter for http protocol.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_version: Filter for http version.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          http_version: Filters results by HTTP version.
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          os: Filter for os name.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -1983,12 +2237,14 @@ async def ip_version(
                         "agg_interval": agg_interval,
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "location": location,
@@ -2003,76 +2259,88 @@ async def ip_version(
             cast_to=cast(Type[TimeseriesGroupIPVersionResponse], ResultWrapper[TimeseriesGroupIPVersionResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     async def os(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupOSResponse:
         """
-        Get a time series of the percentage distribution of traffic of the top operating
-        systems.
+        Retrieves the distribution of HTTP requests by operating system over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          device_type: Filter for device type.
+          device_type: Filters results by device type.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_protocol: Filter for http protocol.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_version: Filter for http version.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          ip_version: Filter for ip version.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          tls_version: Filter for tls version.
+          name: Array of names used to label the series in the response.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -2094,12 +2362,14 @@ async def os(
                         "agg_interval": agg_interval,
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -2114,80 +2384,91 @@ async def os(
             cast_to=cast(Type[TimeseriesGroupOSResponse], ResultWrapper[TimeseriesGroupOSResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     async def post_quantum(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupPostQuantumResponse:
         """
-        Get a time series of the percentage distribution of traffic per Post Quantum
-        suport.
+        Retrieves the distribution of HTTP requests by post-quantum support over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          device_type: Filter for device type.
+          device_type: Filters results by device type.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          http_protocol: Filter for http protocol.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_version: Filter for http version.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          ip_version: Filter for ip version.
+          http_version: Filters results by HTTP version.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          os: Filter for os name.
+          name: Array of names used to label the series in the response.
 
-          tls_version: Filter for tls version.
+          os: Filters results by operating system.
+
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -2209,12 +2490,14 @@ async def post_quantum(
                         "agg_interval": agg_interval,
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -2230,77 +2513,88 @@ async def post_quantum(
             cast_to=cast(Type[TimeseriesGroupPostQuantumResponse], ResultWrapper[TimeseriesGroupPostQuantumResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/timeseries_groups_v2/) instead."
+    )
     async def tls_version(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TimeseriesGroupTLSVersionResponse:
         """
-        Get a time series of the percentage distribution of traffic per TLS protocol
-        version.
+        Retrieves the distribution of HTTP requests by TLS version over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          browser_family: Filters results by browser family.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
           extra_headers: Send extra headers
 
@@ -2322,12 +2616,14 @@ async def tls_version(
                         "agg_interval": agg_interval,
                         "asn": asn,
                         "bot_class": bot_class,
+                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -2347,35 +2643,55 @@ class TimeseriesGroupsResourceWithRawResponse:
     def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.bot_class = to_raw_response_wrapper(
-            timeseries_groups.bot_class,
+        self.bot_class = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.bot_class,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.browser = to_raw_response_wrapper(
-            timeseries_groups.browser,
+        self.browser = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.browser,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.browser_family = to_raw_response_wrapper(
-            timeseries_groups.browser_family,
+        self.browser_family = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.browser_family,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.device_type = to_raw_response_wrapper(
-            timeseries_groups.device_type,
+        self.device_type = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.device_type,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_protocol = to_raw_response_wrapper(
-            timeseries_groups.http_protocol,
+        self.http_protocol = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.http_protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_version = to_raw_response_wrapper(
-            timeseries_groups.http_version,
+        self.http_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.http_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_raw_response_wrapper(
-            timeseries_groups.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.os = to_raw_response_wrapper(
-            timeseries_groups.os,
+        self.os = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.os,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.post_quantum = to_raw_response_wrapper(
-            timeseries_groups.post_quantum,
+        self.post_quantum = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.post_quantum,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.tls_version = to_raw_response_wrapper(
-            timeseries_groups.tls_version,
+        self.tls_version = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.tls_version,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -2383,35 +2699,55 @@ class AsyncTimeseriesGroupsResourceWithRawResponse:
     def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.bot_class = async_to_raw_response_wrapper(
-            timeseries_groups.bot_class,
+        self.bot_class = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.bot_class,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.browser = async_to_raw_response_wrapper(
-            timeseries_groups.browser,
+        self.browser = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.browser,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.browser_family = async_to_raw_response_wrapper(
-            timeseries_groups.browser_family,
+        self.browser_family = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.browser_family,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.device_type = async_to_raw_response_wrapper(
-            timeseries_groups.device_type,
+        self.device_type = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.device_type,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_protocol = async_to_raw_response_wrapper(
-            timeseries_groups.http_protocol,
+        self.http_protocol = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.http_protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_version = async_to_raw_response_wrapper(
-            timeseries_groups.http_version,
+        self.http_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.http_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_raw_response_wrapper(
-            timeseries_groups.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.os = async_to_raw_response_wrapper(
-            timeseries_groups.os,
+        self.os = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.os,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.post_quantum = async_to_raw_response_wrapper(
-            timeseries_groups.post_quantum,
+        self.post_quantum = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.post_quantum,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.tls_version = async_to_raw_response_wrapper(
-            timeseries_groups.tls_version,
+        self.tls_version = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.tls_version,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -2419,35 +2755,55 @@ class TimeseriesGroupsResourceWithStreamingResponse:
     def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.bot_class = to_streamed_response_wrapper(
-            timeseries_groups.bot_class,
+        self.bot_class = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.bot_class,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.browser = to_streamed_response_wrapper(
-            timeseries_groups.browser,
+        self.browser = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.browser,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.browser_family = to_streamed_response_wrapper(
-            timeseries_groups.browser_family,
+        self.browser_family = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.browser_family,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.device_type = to_streamed_response_wrapper(
-            timeseries_groups.device_type,
+        self.device_type = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.device_type,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_protocol = to_streamed_response_wrapper(
-            timeseries_groups.http_protocol,
+        self.http_protocol = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.http_protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_version = to_streamed_response_wrapper(
-            timeseries_groups.http_version,
+        self.http_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.http_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = to_streamed_response_wrapper(
-            timeseries_groups.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.os = to_streamed_response_wrapper(
-            timeseries_groups.os,
+        self.os = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.os,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.post_quantum = to_streamed_response_wrapper(
-            timeseries_groups.post_quantum,
+        self.post_quantum = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.post_quantum,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.tls_version = to_streamed_response_wrapper(
-            timeseries_groups.tls_version,
+        self.tls_version = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.tls_version,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -2455,33 +2811,53 @@ class AsyncTimeseriesGroupsResourceWithStreamingResponse:
     def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
         self._timeseries_groups = timeseries_groups
 
-        self.bot_class = async_to_streamed_response_wrapper(
-            timeseries_groups.bot_class,
+        self.bot_class = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.bot_class,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.browser = async_to_streamed_response_wrapper(
-            timeseries_groups.browser,
+        self.browser = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.browser,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.browser_family = async_to_streamed_response_wrapper(
-            timeseries_groups.browser_family,
+        self.browser_family = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.browser_family,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.device_type = async_to_streamed_response_wrapper(
-            timeseries_groups.device_type,
+        self.device_type = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.device_type,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_protocol = async_to_streamed_response_wrapper(
-            timeseries_groups.http_protocol,
+        self.http_protocol = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.http_protocol,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.http_version = async_to_streamed_response_wrapper(
-            timeseries_groups.http_version,
+        self.http_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.http_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.ip_version = async_to_streamed_response_wrapper(
-            timeseries_groups.ip_version,
+        self.ip_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.ip_version,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.os = async_to_streamed_response_wrapper(
-            timeseries_groups.os,
+        self.os = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.os,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.post_quantum = async_to_streamed_response_wrapper(
-            timeseries_groups.post_quantum,
+        self.post_quantum = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.post_quantum,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.tls_version = async_to_streamed_response_wrapper(
-            timeseries_groups.tls_version,
+        self.tls_version = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.tls_version,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/radar/http/top.py b/src/cloudflare/resources/radar/http/top.py
index 53c92195d72..93a3faa2427 100644
--- a/src/cloudflare/resources/radar/http/top.py
+++ b/src/cloudflare/resources/radar/http/top.py
@@ -2,17 +2,15 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import List, Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -23,9 +21,9 @@
 )
 from ...._wrappers import ResultWrapper
 from ...._base_client import make_request_options
-from ....types.radar.http import top_browsers_params, top_browser_families_params
-from ....types.radar.http.top_browsers_response import TopBrowsersResponse
-from ....types.radar.http.top_browser_families_response import TopBrowserFamiliesResponse
+from ....types.radar.http import top_browser_params, top_browser_family_params
+from ....types.radar.http.top_browser_response import TopBrowserResponse
+from ....types.radar.http.top_browser_family_response import TopBrowserFamilyResponse
 
 __all__ = ["TopResource", "AsyncTopResource"]
 
@@ -33,88 +31,106 @@
 class TopResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TopResourceWithStreamingResponse(self)
 
-    def browser_families(
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
+    def browser(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TopBrowserFamiliesResponse:
-        """Get the top user agents aggregated in families by HTTP traffic.
-
-        Values are a
-        percentage out of the total traffic.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TopBrowserResponse:
+        """
+        Retrieves the top user agents by HTTP requests.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -125,7 +141,7 @@ def browser_families(
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get(
-            "/radar/http/top/browser_families",
+            "/radar/http/top/browser",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -142,6 +158,7 @@ def browser_families(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -151,89 +168,93 @@ def browser_families(
                         "os": os,
                         "tls_version": tls_version,
                     },
-                    top_browser_families_params.TopBrowserFamiliesParams,
+                    top_browser_params.TopBrowserParams,
                 ),
-                post_parser=ResultWrapper[TopBrowserFamiliesResponse]._unwrapper,
+                post_parser=ResultWrapper[TopBrowserResponse]._unwrapper,
             ),
-            cast_to=cast(Type[TopBrowserFamiliesResponse], ResultWrapper[TopBrowserFamiliesResponse]),
+            cast_to=cast(Type[TopBrowserResponse], ResultWrapper[TopBrowserResponse]),
         )
 
-    def browsers(
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
+    def browser_family(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TopBrowsersResponse:
-        """Get the top user agents by HTTP traffic.
-
-        Values are a percentage out of the
-        total traffic.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TopBrowserFamilyResponse:
+        """
+        Retrieves the top user agents, aggregated in families, by HTTP requests.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -244,7 +265,7 @@ def browsers(
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get(
-            "/radar/http/top/browsers",
+            "/radar/http/top/browser_family",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -254,13 +275,13 @@ def browsers(
                     {
                         "asn": asn,
                         "bot_class": bot_class,
-                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -270,99 +291,117 @@ def browsers(
                         "os": os,
                         "tls_version": tls_version,
                     },
-                    top_browsers_params.TopBrowsersParams,
+                    top_browser_family_params.TopBrowserFamilyParams,
                 ),
-                post_parser=ResultWrapper[TopBrowsersResponse]._unwrapper,
+                post_parser=ResultWrapper[TopBrowserFamilyResponse]._unwrapper,
             ),
-            cast_to=cast(Type[TopBrowsersResponse], ResultWrapper[TopBrowsersResponse]),
+            cast_to=cast(Type[TopBrowserFamilyResponse], ResultWrapper[TopBrowserFamilyResponse]),
         )
 
 
 class AsyncTopResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTopResourceWithStreamingResponse(self)
 
-    async def browser_families(
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
+    async def browser(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TopBrowserFamiliesResponse:
-        """Get the top user agents aggregated in families by HTTP traffic.
-
-        Values are a
-        percentage out of the total traffic.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TopBrowserResponse:
+        """
+        Retrieves the top user agents by HTTP requests.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
+          browser_family: Filters results by browser family.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -373,7 +412,7 @@ async def browser_families(
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._get(
-            "/radar/http/top/browser_families",
+            "/radar/http/top/browser",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -390,6 +429,7 @@ async def browser_families(
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -399,89 +439,93 @@ async def browser_families(
                         "os": os,
                         "tls_version": tls_version,
                     },
-                    top_browser_families_params.TopBrowserFamiliesParams,
+                    top_browser_params.TopBrowserParams,
                 ),
-                post_parser=ResultWrapper[TopBrowserFamiliesResponse]._unwrapper,
+                post_parser=ResultWrapper[TopBrowserResponse]._unwrapper,
             ),
-            cast_to=cast(Type[TopBrowserFamiliesResponse], ResultWrapper[TopBrowserFamiliesResponse]),
+            cast_to=cast(Type[TopBrowserResponse], ResultWrapper[TopBrowserResponse]),
         )
 
-    async def browsers(
+    @typing_extensions.deprecated(
+        "Use [Radar HTTP Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/http/methods/summary_v2/) instead."
+    )
+    async def browser_family(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | NotGiven = NOT_GIVEN,
-        browser_family: List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        http_protocol: List[Literal["HTTP", "HTTPS"]] | NotGiven = NOT_GIVEN,
-        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | NotGiven = NOT_GIVEN,
-        ip_version: List[Literal["IPv4", "IPv6"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-        | NotGiven = NOT_GIVEN,
-        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        device_type: List[Literal["DESKTOP", "MOBILE", "OTHER"]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        http_protocol: List[Literal["HTTP", "HTTPS"]] | Omit = omit,
+        http_version: List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]] | Omit = omit,
+        ip_version: List[Literal["IPv4", "IPv6"]] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]] | Omit = omit,
+        tls_version: List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TopBrowsersResponse:
-        """Get the top user agents by HTTP traffic.
-
-        Values are a percentage out of the
-        total traffic.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TopBrowserFamilyResponse:
+        """
+        Retrieves the top user agents, aggregated in families, by HTTP requests.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bot_class: Filter for bot class. Refer to
+          bot_class: Filters results by bot class. Refer to
               [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
 
-          browser_family: Filter for browser family.
-
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          device_type: Filters results by device type.
 
-          device_type: Filter for device type.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          http_protocol: Filter for http protocol.
+          http_protocol: Filters results by HTTP protocol (HTTP vs. HTTPS).
 
-          http_version: Filter for http version.
+          http_version: Filters results by HTTP version.
 
-          ip_version: Filter for ip version.
+          ip_version: Filters results by IP version (Ipv4 vs. IPv6).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          os: Filter for os name.
+          os: Filters results by operating system.
 
-          tls_version: Filter for tls version.
+          tls_version: Filters results by TLS version.
 
           extra_headers: Send extra headers
 
@@ -492,7 +536,7 @@ async def browsers(
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._get(
-            "/radar/http/top/browsers",
+            "/radar/http/top/browser_family",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -502,13 +546,13 @@ async def browsers(
                     {
                         "asn": asn,
                         "bot_class": bot_class,
-                        "browser_family": browser_family,
                         "continent": continent,
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
                         "device_type": device_type,
                         "format": format,
+                        "geo_id": geo_id,
                         "http_protocol": http_protocol,
                         "http_version": http_version,
                         "ip_version": ip_version,
@@ -518,11 +562,11 @@ async def browsers(
                         "os": os,
                         "tls_version": tls_version,
                     },
-                    top_browsers_params.TopBrowsersParams,
+                    top_browser_family_params.TopBrowserFamilyParams,
                 ),
-                post_parser=ResultWrapper[TopBrowsersResponse]._unwrapper,
+                post_parser=ResultWrapper[TopBrowserFamilyResponse]._unwrapper,
             ),
-            cast_to=cast(Type[TopBrowsersResponse], ResultWrapper[TopBrowsersResponse]),
+            cast_to=cast(Type[TopBrowserFamilyResponse], ResultWrapper[TopBrowserFamilyResponse]),
         )
 
 
@@ -530,11 +574,15 @@ class TopResourceWithRawResponse:
     def __init__(self, top: TopResource) -> None:
         self._top = top
 
-        self.browser_families = to_raw_response_wrapper(
-            top.browser_families,
+        self.browser = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                top.browser,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.browsers = to_raw_response_wrapper(
-            top.browsers,
+        self.browser_family = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                top.browser_family,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -542,11 +590,15 @@ class AsyncTopResourceWithRawResponse:
     def __init__(self, top: AsyncTopResource) -> None:
         self._top = top
 
-        self.browser_families = async_to_raw_response_wrapper(
-            top.browser_families,
+        self.browser = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                top.browser,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.browsers = async_to_raw_response_wrapper(
-            top.browsers,
+        self.browser_family = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                top.browser_family,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -554,11 +606,15 @@ class TopResourceWithStreamingResponse:
     def __init__(self, top: TopResource) -> None:
         self._top = top
 
-        self.browser_families = to_streamed_response_wrapper(
-            top.browser_families,
+        self.browser = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                top.browser,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.browsers = to_streamed_response_wrapper(
-            top.browsers,
+        self.browser_family = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                top.browser_family,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -566,9 +622,13 @@ class AsyncTopResourceWithStreamingResponse:
     def __init__(self, top: AsyncTopResource) -> None:
         self._top = top
 
-        self.browser_families = async_to_streamed_response_wrapper(
-            top.browser_families,
+        self.browser = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                top.browser,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.browsers = async_to_streamed_response_wrapper(
-            top.browsers,
+        self.browser_family = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                top.browser_family,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/radar/leaked_credentials/__init__.py b/src/cloudflare/resources/radar/leaked_credentials/__init__.py
new file mode 100644
index 00000000000..1b45a8e619b
--- /dev/null
+++ b/src/cloudflare/resources/radar/leaked_credentials/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .summary import (
+    SummaryResource,
+    AsyncSummaryResource,
+    SummaryResourceWithRawResponse,
+    AsyncSummaryResourceWithRawResponse,
+    SummaryResourceWithStreamingResponse,
+    AsyncSummaryResourceWithStreamingResponse,
+)
+from .timeseries_groups import (
+    TimeseriesGroupsResource,
+    AsyncTimeseriesGroupsResource,
+    TimeseriesGroupsResourceWithRawResponse,
+    AsyncTimeseriesGroupsResourceWithRawResponse,
+    TimeseriesGroupsResourceWithStreamingResponse,
+    AsyncTimeseriesGroupsResourceWithStreamingResponse,
+)
+from .leaked_credentials import (
+    LeakedCredentialsResource,
+    AsyncLeakedCredentialsResource,
+    LeakedCredentialsResourceWithRawResponse,
+    AsyncLeakedCredentialsResourceWithRawResponse,
+    LeakedCredentialsResourceWithStreamingResponse,
+    AsyncLeakedCredentialsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "SummaryResource",
+    "AsyncSummaryResource",
+    "SummaryResourceWithRawResponse",
+    "AsyncSummaryResourceWithRawResponse",
+    "SummaryResourceWithStreamingResponse",
+    "AsyncSummaryResourceWithStreamingResponse",
+    "TimeseriesGroupsResource",
+    "AsyncTimeseriesGroupsResource",
+    "TimeseriesGroupsResourceWithRawResponse",
+    "AsyncTimeseriesGroupsResourceWithRawResponse",
+    "TimeseriesGroupsResourceWithStreamingResponse",
+    "AsyncTimeseriesGroupsResourceWithStreamingResponse",
+    "LeakedCredentialsResource",
+    "AsyncLeakedCredentialsResource",
+    "LeakedCredentialsResourceWithRawResponse",
+    "AsyncLeakedCredentialsResourceWithRawResponse",
+    "LeakedCredentialsResourceWithStreamingResponse",
+    "AsyncLeakedCredentialsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/radar/leaked_credentials/leaked_credentials.py b/src/cloudflare/resources/radar/leaked_credentials/leaked_credentials.py
new file mode 100644
index 00000000000..565ce6034c7
--- /dev/null
+++ b/src/cloudflare/resources/radar/leaked_credentials/leaked_credentials.py
@@ -0,0 +1,639 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Type, Union, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from .summary import (
+    SummaryResource,
+    AsyncSummaryResource,
+    SummaryResourceWithRawResponse,
+    AsyncSummaryResourceWithRawResponse,
+    SummaryResourceWithStreamingResponse,
+    AsyncSummaryResourceWithStreamingResponse,
+)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....types.radar import leaked_credential_summary_v2_params, leaked_credential_timeseries_groups_v2_params
+from ...._base_client import make_request_options
+from .timeseries_groups import (
+    TimeseriesGroupsResource,
+    AsyncTimeseriesGroupsResource,
+    TimeseriesGroupsResourceWithRawResponse,
+    AsyncTimeseriesGroupsResourceWithRawResponse,
+    TimeseriesGroupsResourceWithStreamingResponse,
+    AsyncTimeseriesGroupsResourceWithStreamingResponse,
+)
+from ....types.radar.leaked_credential_summary_v2_response import LeakedCredentialSummaryV2Response
+from ....types.radar.leaked_credential_timeseries_groups_v2_response import LeakedCredentialTimeseriesGroupsV2Response
+
+__all__ = ["LeakedCredentialsResource", "AsyncLeakedCredentialsResource"]
+
+
+class LeakedCredentialsResource(SyncAPIResource):
+    @cached_property
+    def summary(self) -> SummaryResource:
+        return SummaryResource(self._client)
+
+    @cached_property
+    def timeseries_groups(self) -> TimeseriesGroupsResource:
+        return TimeseriesGroupsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> LeakedCredentialsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return LeakedCredentialsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> LeakedCredentialsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return LeakedCredentialsResourceWithStreamingResponse(self)
+
+    def summary_v2(
+        self,
+        dimension: Literal["COMPROMISED", "BOT_CLASS"],
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        compromised: List[Literal["CLEAN", "COMPROMISED"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LeakedCredentialSummaryV2Response:
+        """
+        Retrieves an aggregated summary of HTTP authentication requests grouped by the
+        specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          bot_class: Filters results by bot class. Refer to
+              [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+
+          compromised: Filters results by compromised credential status (clean vs. compromised).
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/leaked_credential_checks/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "bot_class": bot_class,
+                        "compromised": compromised,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                    },
+                    leaked_credential_summary_v2_params.LeakedCredentialSummaryV2Params,
+                ),
+                post_parser=ResultWrapper[LeakedCredentialSummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[LeakedCredentialSummaryV2Response], ResultWrapper[LeakedCredentialSummaryV2Response]),
+        )
+
+    def timeseries_groups_v2(
+        self,
+        dimension: Literal["COMPROMISED", "BOT_CLASS"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        check_result: List[
+            Literal[
+                "CLEAN",
+                "USERNAME_LEAKED",
+                "USERNAME_PASSWORD_SIMILAR",
+                "USERNAME_AND_PASSWORD_LEAKED",
+                "PASSWORD_LEAKED",
+            ]
+        ]
+        | Omit = omit,
+        compromised: List[Literal["CLEAN", "COMPROMISED"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LeakedCredentialTimeseriesGroupsV2Response:
+        """
+        Retrieves the distribution of HTTP authentication requests, grouped by the
+        specified dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          bot_class: Filters results by bot class. Refer to
+              [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+
+          check_result: Filters results by leaked credential check result.
+
+          compromised: Filters results by compromised credential status (clean vs. compromised).
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/leaked_credential_checks/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "bot_class": bot_class,
+                        "check_result": check_result,
+                        "compromised": compromised,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "normalization": normalization,
+                    },
+                    leaked_credential_timeseries_groups_v2_params.LeakedCredentialTimeseriesGroupsV2Params,
+                ),
+                post_parser=ResultWrapper[LeakedCredentialTimeseriesGroupsV2Response]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[LeakedCredentialTimeseriesGroupsV2Response],
+                ResultWrapper[LeakedCredentialTimeseriesGroupsV2Response],
+            ),
+        )
+
+
+class AsyncLeakedCredentialsResource(AsyncAPIResource):
+    @cached_property
+    def summary(self) -> AsyncSummaryResource:
+        return AsyncSummaryResource(self._client)
+
+    @cached_property
+    def timeseries_groups(self) -> AsyncTimeseriesGroupsResource:
+        return AsyncTimeseriesGroupsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncLeakedCredentialsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncLeakedCredentialsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncLeakedCredentialsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncLeakedCredentialsResourceWithStreamingResponse(self)
+
+    async def summary_v2(
+        self,
+        dimension: Literal["COMPROMISED", "BOT_CLASS"],
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        compromised: List[Literal["CLEAN", "COMPROMISED"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LeakedCredentialSummaryV2Response:
+        """
+        Retrieves an aggregated summary of HTTP authentication requests grouped by the
+        specified dimension.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          bot_class: Filters results by bot class. Refer to
+              [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+
+          compromised: Filters results by compromised credential status (clean vs. compromised).
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/leaked_credential_checks/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "bot_class": bot_class,
+                        "compromised": compromised,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                    },
+                    leaked_credential_summary_v2_params.LeakedCredentialSummaryV2Params,
+                ),
+                post_parser=ResultWrapper[LeakedCredentialSummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[LeakedCredentialSummaryV2Response], ResultWrapper[LeakedCredentialSummaryV2Response]),
+        )
+
+    async def timeseries_groups_v2(
+        self,
+        dimension: Literal["COMPROMISED", "BOT_CLASS"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        check_result: List[
+            Literal[
+                "CLEAN",
+                "USERNAME_LEAKED",
+                "USERNAME_PASSWORD_SIMILAR",
+                "USERNAME_AND_PASSWORD_LEAKED",
+                "PASSWORD_LEAKED",
+            ]
+        ]
+        | Omit = omit,
+        compromised: List[Literal["CLEAN", "COMPROMISED"]] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LeakedCredentialTimeseriesGroupsV2Response:
+        """
+        Retrieves the distribution of HTTP authentication requests, grouped by the
+        specified dimension over time.
+
+        Args:
+          dimension: Specifies the attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          bot_class: Filters results by bot class. Refer to
+              [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+
+          check_result: Filters results by leaked credential check result.
+
+          compromised: Filters results by compromised credential status (clean vs. compromised).
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/leaked_credential_checks/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "bot_class": bot_class,
+                        "check_result": check_result,
+                        "compromised": compromised,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "normalization": normalization,
+                    },
+                    leaked_credential_timeseries_groups_v2_params.LeakedCredentialTimeseriesGroupsV2Params,
+                ),
+                post_parser=ResultWrapper[LeakedCredentialTimeseriesGroupsV2Response]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[LeakedCredentialTimeseriesGroupsV2Response],
+                ResultWrapper[LeakedCredentialTimeseriesGroupsV2Response],
+            ),
+        )
+
+
+class LeakedCredentialsResourceWithRawResponse:
+    def __init__(self, leaked_credentials: LeakedCredentialsResource) -> None:
+        self._leaked_credentials = leaked_credentials
+
+        self.summary_v2 = to_raw_response_wrapper(
+            leaked_credentials.summary_v2,
+        )
+        self.timeseries_groups_v2 = to_raw_response_wrapper(
+            leaked_credentials.timeseries_groups_v2,
+        )
+
+    @cached_property
+    def summary(self) -> SummaryResourceWithRawResponse:
+        return SummaryResourceWithRawResponse(self._leaked_credentials.summary)
+
+    @cached_property
+    def timeseries_groups(self) -> TimeseriesGroupsResourceWithRawResponse:
+        return TimeseriesGroupsResourceWithRawResponse(self._leaked_credentials.timeseries_groups)
+
+
+class AsyncLeakedCredentialsResourceWithRawResponse:
+    def __init__(self, leaked_credentials: AsyncLeakedCredentialsResource) -> None:
+        self._leaked_credentials = leaked_credentials
+
+        self.summary_v2 = async_to_raw_response_wrapper(
+            leaked_credentials.summary_v2,
+        )
+        self.timeseries_groups_v2 = async_to_raw_response_wrapper(
+            leaked_credentials.timeseries_groups_v2,
+        )
+
+    @cached_property
+    def summary(self) -> AsyncSummaryResourceWithRawResponse:
+        return AsyncSummaryResourceWithRawResponse(self._leaked_credentials.summary)
+
+    @cached_property
+    def timeseries_groups(self) -> AsyncTimeseriesGroupsResourceWithRawResponse:
+        return AsyncTimeseriesGroupsResourceWithRawResponse(self._leaked_credentials.timeseries_groups)
+
+
+class LeakedCredentialsResourceWithStreamingResponse:
+    def __init__(self, leaked_credentials: LeakedCredentialsResource) -> None:
+        self._leaked_credentials = leaked_credentials
+
+        self.summary_v2 = to_streamed_response_wrapper(
+            leaked_credentials.summary_v2,
+        )
+        self.timeseries_groups_v2 = to_streamed_response_wrapper(
+            leaked_credentials.timeseries_groups_v2,
+        )
+
+    @cached_property
+    def summary(self) -> SummaryResourceWithStreamingResponse:
+        return SummaryResourceWithStreamingResponse(self._leaked_credentials.summary)
+
+    @cached_property
+    def timeseries_groups(self) -> TimeseriesGroupsResourceWithStreamingResponse:
+        return TimeseriesGroupsResourceWithStreamingResponse(self._leaked_credentials.timeseries_groups)
+
+
+class AsyncLeakedCredentialsResourceWithStreamingResponse:
+    def __init__(self, leaked_credentials: AsyncLeakedCredentialsResource) -> None:
+        self._leaked_credentials = leaked_credentials
+
+        self.summary_v2 = async_to_streamed_response_wrapper(
+            leaked_credentials.summary_v2,
+        )
+        self.timeseries_groups_v2 = async_to_streamed_response_wrapper(
+            leaked_credentials.timeseries_groups_v2,
+        )
+
+    @cached_property
+    def summary(self) -> AsyncSummaryResourceWithStreamingResponse:
+        return AsyncSummaryResourceWithStreamingResponse(self._leaked_credentials.summary)
+
+    @cached_property
+    def timeseries_groups(self) -> AsyncTimeseriesGroupsResourceWithStreamingResponse:
+        return AsyncTimeseriesGroupsResourceWithStreamingResponse(self._leaked_credentials.timeseries_groups)
diff --git a/src/cloudflare/resources/radar/leaked_credentials/summary.py b/src/cloudflare/resources/radar/leaked_credentials/summary.py
new file mode 100644
index 00000000000..bba1af6177a
--- /dev/null
+++ b/src/cloudflare/resources/radar/leaked_credentials/summary.py
@@ -0,0 +1,410 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import typing_extensions
+from typing import List, Type, Union, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.radar.leaked_credentials import summary_bot_class_params, summary_compromised_params
+from ....types.radar.leaked_credentials.summary_bot_class_response import SummaryBotClassResponse
+from ....types.radar.leaked_credentials.summary_compromised_response import SummaryCompromisedResponse
+
+__all__ = ["SummaryResource", "AsyncSummaryResource"]
+
+
+class SummaryResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SummaryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SummaryResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Radar Leaked Credentials Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/leaked_credentials/methods/summary_v2/) instead."
+    )
+    def bot_class(
+        self,
+        *,
+        compromised: List[Literal["CLEAN", "COMPROMISED"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryBotClassResponse:
+        """
+        Retrieves the distribution of HTTP authentication requests by bot class.
+
+        Args:
+          compromised: Filters results by compromised credential status (clean vs. compromised).
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/leaked_credential_checks/summary/bot_class",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "compromised": compromised,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "name": name,
+                    },
+                    summary_bot_class_params.SummaryBotClassParams,
+                ),
+                post_parser=ResultWrapper[SummaryBotClassResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryBotClassResponse], ResultWrapper[SummaryBotClassResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar Leaked Credentials Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/leaked_credentials/methods/summary_v2/) instead."
+    )
+    def compromised(
+        self,
+        *,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryCompromisedResponse:
+        """
+        Retrieves the distribution of HTTP authentication requests by compromised
+        credential status.
+
+        Args:
+          bot_class: Filters results by bot class. Refer to
+              [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/leaked_credential_checks/summary/compromised",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "bot_class": bot_class,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "name": name,
+                    },
+                    summary_compromised_params.SummaryCompromisedParams,
+                ),
+                post_parser=ResultWrapper[SummaryCompromisedResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryCompromisedResponse], ResultWrapper[SummaryCompromisedResponse]),
+        )
+
+
+class AsyncSummaryResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSummaryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSummaryResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Radar Leaked Credentials Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/leaked_credentials/methods/summary_v2/) instead."
+    )
+    async def bot_class(
+        self,
+        *,
+        compromised: List[Literal["CLEAN", "COMPROMISED"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryBotClassResponse:
+        """
+        Retrieves the distribution of HTTP authentication requests by bot class.
+
+        Args:
+          compromised: Filters results by compromised credential status (clean vs. compromised).
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/leaked_credential_checks/summary/bot_class",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "compromised": compromised,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "name": name,
+                    },
+                    summary_bot_class_params.SummaryBotClassParams,
+                ),
+                post_parser=ResultWrapper[SummaryBotClassResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryBotClassResponse], ResultWrapper[SummaryBotClassResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar Leaked Credentials Summary By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/leaked_credentials/methods/summary_v2/) instead."
+    )
+    async def compromised(
+        self,
+        *,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SummaryCompromisedResponse:
+        """
+        Retrieves the distribution of HTTP authentication requests by compromised
+        credential status.
+
+        Args:
+          bot_class: Filters results by bot class. Refer to
+              [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/leaked_credential_checks/summary/compromised",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "bot_class": bot_class,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "name": name,
+                    },
+                    summary_compromised_params.SummaryCompromisedParams,
+                ),
+                post_parser=ResultWrapper[SummaryCompromisedResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SummaryCompromisedResponse], ResultWrapper[SummaryCompromisedResponse]),
+        )
+
+
+class SummaryResourceWithRawResponse:
+    def __init__(self, summary: SummaryResource) -> None:
+        self._summary = summary
+
+        self.bot_class = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.bot_class,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.compromised = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                summary.compromised,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncSummaryResourceWithRawResponse:
+    def __init__(self, summary: AsyncSummaryResource) -> None:
+        self._summary = summary
+
+        self.bot_class = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.bot_class,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.compromised = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                summary.compromised,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class SummaryResourceWithStreamingResponse:
+    def __init__(self, summary: SummaryResource) -> None:
+        self._summary = summary
+
+        self.bot_class = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.bot_class,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.compromised = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                summary.compromised,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncSummaryResourceWithStreamingResponse:
+    def __init__(self, summary: AsyncSummaryResource) -> None:
+        self._summary = summary
+
+        self.bot_class = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.bot_class,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.compromised = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                summary.compromised,  # pyright: ignore[reportDeprecated],
+            )
+        )
diff --git a/src/cloudflare/resources/radar/leaked_credentials/timeseries_groups.py b/src/cloudflare/resources/radar/leaked_credentials/timeseries_groups.py
new file mode 100644
index 00000000000..efc2df0c83f
--- /dev/null
+++ b/src/cloudflare/resources/radar/leaked_credentials/timeseries_groups.py
@@ -0,0 +1,436 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import typing_extensions
+from typing import List, Type, Union, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.radar.leaked_credentials import timeseries_group_bot_class_params, timeseries_group_compromised_params
+from ....types.radar.leaked_credentials.timeseries_group_bot_class_response import TimeseriesGroupBotClassResponse
+from ....types.radar.leaked_credentials.timeseries_group_compromised_response import TimeseriesGroupCompromisedResponse
+
+__all__ = ["TimeseriesGroupsResource", "AsyncTimeseriesGroupsResource"]
+
+
+class TimeseriesGroupsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> TimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TimeseriesGroupsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TimeseriesGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TimeseriesGroupsResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Radar Leaked Credentials Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/leaked_credentials/methods/timeseries_groups_v2/) instead."
+    )
+    def bot_class(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        compromised: List[Literal["CLEAN", "COMPROMISED"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupBotClassResponse:
+        """
+        Retrieves the distribution of HTTP authentication requests by bot class over
+        time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          compromised: Filters results by compromised credential status (clean vs. compromised).
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/leaked_credential_checks/timeseries_groups/bot_class",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "compromised": compromised,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "name": name,
+                    },
+                    timeseries_group_bot_class_params.TimeseriesGroupBotClassParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupBotClassResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupBotClassResponse], ResultWrapper[TimeseriesGroupBotClassResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar Leaked Credentials Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/leaked_credentials/methods/timeseries_groups_v2/) instead."
+    )
+    def compromised(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupCompromisedResponse:
+        """
+        Retrieves the distribution of HTTP authentication requests by compromised
+        credential status over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          bot_class: Filters results by bot class. Refer to
+              [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/leaked_credential_checks/timeseries_groups/compromised",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "bot_class": bot_class,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "name": name,
+                    },
+                    timeseries_group_compromised_params.TimeseriesGroupCompromisedParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupCompromisedResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupCompromisedResponse], ResultWrapper[TimeseriesGroupCompromisedResponse]),
+        )
+
+
+class AsyncTimeseriesGroupsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncTimeseriesGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTimeseriesGroupsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTimeseriesGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTimeseriesGroupsResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Radar Leaked Credentials Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/leaked_credentials/methods/timeseries_groups_v2/) instead."
+    )
+    async def bot_class(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        compromised: List[Literal["CLEAN", "COMPROMISED"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupBotClassResponse:
+        """
+        Retrieves the distribution of HTTP authentication requests by bot class over
+        time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          compromised: Filters results by compromised credential status (clean vs. compromised).
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/leaked_credential_checks/timeseries_groups/bot_class",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "compromised": compromised,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "name": name,
+                    },
+                    timeseries_group_bot_class_params.TimeseriesGroupBotClassParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupBotClassResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupBotClassResponse], ResultWrapper[TimeseriesGroupBotClassResponse]),
+        )
+
+    @typing_extensions.deprecated(
+        "Use [Radar Leaked Credentials Timeseries Groups By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/leaked_credentials/methods/timeseries_groups_v2/) instead."
+    )
+    async def compromised(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        bot_class: List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TimeseriesGroupCompromisedResponse:
+        """
+        Retrieves the distribution of HTTP authentication requests by compromised
+        credential status over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          bot_class: Filters results by bot class. Refer to
+              [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/leaked_credential_checks/timeseries_groups/compromised",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "bot_class": bot_class,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "name": name,
+                    },
+                    timeseries_group_compromised_params.TimeseriesGroupCompromisedParams,
+                ),
+                post_parser=ResultWrapper[TimeseriesGroupCompromisedResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TimeseriesGroupCompromisedResponse], ResultWrapper[TimeseriesGroupCompromisedResponse]),
+        )
+
+
+class TimeseriesGroupsResourceWithRawResponse:
+    def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
+        self._timeseries_groups = timeseries_groups
+
+        self.bot_class = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.bot_class,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.compromised = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                timeseries_groups.compromised,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncTimeseriesGroupsResourceWithRawResponse:
+    def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
+        self._timeseries_groups = timeseries_groups
+
+        self.bot_class = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.bot_class,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.compromised = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                timeseries_groups.compromised,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class TimeseriesGroupsResourceWithStreamingResponse:
+    def __init__(self, timeseries_groups: TimeseriesGroupsResource) -> None:
+        self._timeseries_groups = timeseries_groups
+
+        self.bot_class = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.bot_class,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.compromised = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                timeseries_groups.compromised,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncTimeseriesGroupsResourceWithStreamingResponse:
+    def __init__(self, timeseries_groups: AsyncTimeseriesGroupsResource) -> None:
+        self._timeseries_groups = timeseries_groups
+
+        self.bot_class = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.bot_class,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.compromised = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                timeseries_groups.compromised,  # pyright: ignore[reportDeprecated],
+            )
+        )
diff --git a/src/cloudflare/resources/radar/netflows/__init__.py b/src/cloudflare/resources/radar/netflows/__init__.py
index a98978678b8..99b7f7c474e 100644
--- a/src/cloudflare/resources/radar/netflows/__init__.py
+++ b/src/cloudflare/resources/radar/netflows/__init__.py
@@ -9,12 +9,12 @@
     AsyncTopResourceWithStreamingResponse,
 )
 from .netflows import (
-    NetflowsResource,
-    AsyncNetflowsResource,
-    NetflowsResourceWithRawResponse,
-    AsyncNetflowsResourceWithRawResponse,
-    NetflowsResourceWithStreamingResponse,
-    AsyncNetflowsResourceWithStreamingResponse,
+    NetFlowsResource,
+    AsyncNetFlowsResource,
+    NetFlowsResourceWithRawResponse,
+    AsyncNetFlowsResourceWithRawResponse,
+    NetFlowsResourceWithStreamingResponse,
+    AsyncNetFlowsResourceWithStreamingResponse,
 )
 
 __all__ = [
@@ -24,10 +24,10 @@
     "AsyncTopResourceWithRawResponse",
     "TopResourceWithStreamingResponse",
     "AsyncTopResourceWithStreamingResponse",
-    "NetflowsResource",
-    "AsyncNetflowsResource",
-    "NetflowsResourceWithRawResponse",
-    "AsyncNetflowsResourceWithRawResponse",
-    "NetflowsResourceWithStreamingResponse",
-    "AsyncNetflowsResourceWithStreamingResponse",
+    "NetFlowsResource",
+    "AsyncNetFlowsResource",
+    "NetFlowsResourceWithRawResponse",
+    "AsyncNetFlowsResourceWithRawResponse",
+    "NetFlowsResourceWithStreamingResponse",
+    "AsyncNetFlowsResourceWithStreamingResponse",
 ]
diff --git a/src/cloudflare/resources/radar/netflows/netflows.py b/src/cloudflare/resources/radar/netflows/netflows.py
index c40b62990df..863ad0a5911 100644
--- a/src/cloudflare/resources/radar/netflows/netflows.py
+++ b/src/cloudflare/resources/radar/netflows/netflows.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import List, Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
@@ -16,11 +17,8 @@
     TopResourceWithStreamingResponse,
     AsyncTopResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -30,85 +28,303 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ....types.radar import netflow_timeseries_params
+from ....types.radar import (
+    netflows_summary_params,
+    netflows_summary_v2_params,
+    netflows_timeseries_params,
+    netflows_timeseries_groups_params,
+)
 from ...._base_client import make_request_options
-from ....types.radar.netflow_timeseries_response import NetflowTimeseriesResponse
+from ....types.radar.netflows_summary_response import NetFlowsSummaryResponse
+from ....types.radar.netflows_summary_v2_response import NetFlowsSummaryV2Response
+from ....types.radar.netflows_timeseries_response import NetFlowsTimeseriesResponse
+from ....types.radar.netflows_timeseries_groups_response import NetFlowsTimeseriesGroupsResponse
 
-__all__ = ["NetflowsResource", "AsyncNetflowsResource"]
+__all__ = ["NetFlowsResource", "AsyncNetFlowsResource"]
 
 
-class NetflowsResource(SyncAPIResource):
+class NetFlowsResource(SyncAPIResource):
     @cached_property
     def top(self) -> TopResource:
         return TopResource(self._client)
 
     @cached_property
-    def with_raw_response(self) -> NetflowsResourceWithRawResponse:
-        return NetflowsResourceWithRawResponse(self)
+    def with_raw_response(self) -> NetFlowsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return NetFlowsResourceWithRawResponse(self)
 
     @cached_property
-    def with_streaming_response(self) -> NetflowsResourceWithStreamingResponse:
-        return NetflowsResourceWithStreamingResponse(self)
+    def with_streaming_response(self) -> NetFlowsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-    def timeseries(
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return NetFlowsResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Get Network Traffic Distribution By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/netflows/methods/summary_v2/) instead."
+    )
+    def summary(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
-        product: List[Literal["HTTP", "ALL"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> NetflowTimeseriesResponse:
-        """Get network traffic change over time.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> NetFlowsSummaryResponse:
+        """
+        Retrieves the distribution of network traffic (NetFlows) by HTTP vs other
+        protocols.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-        Visit
-        https://en.wikipedia.org/wiki/NetFlow for more information on NetFlows.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/netflows/summary",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "geo_id": geo_id,
+                        "location": location,
+                        "name": name,
+                    },
+                    netflows_summary_params.NetFlowsSummaryParams,
+                ),
+                post_parser=ResultWrapper[NetFlowsSummaryResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[NetFlowsSummaryResponse], ResultWrapper[NetFlowsSummaryResponse]),
+        )
+
+    def summary_v2(
+        self,
+        dimension: Literal["ADM1", "PRODUCT"],
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        product: List[Literal["HTTP", "ALL"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> NetFlowsSummaryV2Response:
+        """
+        Retrieves the distribution of network traffic (NetFlows) by the specified
+        dimension.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          dimension: Specifies the NetFlows attribute by which to group the results.
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          product: Filters the results by network traffic product types.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/netflows/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "geo_id": geo_id,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "product": product,
+                    },
+                    netflows_summary_v2_params.NetFlowsSummaryV2Params,
+                ),
+                post_parser=ResultWrapper[NetFlowsSummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[NetFlowsSummaryV2Response], ResultWrapper[NetFlowsSummaryV2Response]),
+        )
+
+    def timeseries(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | Omit = omit,
+        product: List[Literal["HTTP", "ALL"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> NetFlowsTimeseriesResponse:
+        """
+        Retrieves network traffic (NetFlows) over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
-          product: Array of network traffic product types.
+          product: Filters the results by network traffic product types.
 
           extra_headers: Send extra headers
 
@@ -134,91 +350,416 @@ def timeseries(
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "geo_id": geo_id,
+                        "location": location,
+                        "name": name,
+                        "normalization": normalization,
+                        "product": product,
+                    },
+                    netflows_timeseries_params.NetFlowsTimeseriesParams,
+                ),
+                post_parser=ResultWrapper[NetFlowsTimeseriesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[NetFlowsTimeseriesResponse], ResultWrapper[NetFlowsTimeseriesResponse]),
+        )
+
+    def timeseries_groups(
+        self,
+        dimension: Literal["ADM1", "PRODUCT"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        product: List[Literal["HTTP", "ALL"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> NetFlowsTimeseriesGroupsResponse:
+        """
+        Retrieves the distribution of NetFlows traffic, grouped by chosen the specified
+        dimension over time.
+
+        Args:
+          dimension: Specifies the NetFlows attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          product: Filters the results by network traffic product types.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return self._get(
+            f"/radar/netflows/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "geo_id": geo_id,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
                         "normalization": normalization,
                         "product": product,
                     },
-                    netflow_timeseries_params.NetflowTimeseriesParams,
+                    netflows_timeseries_groups_params.NetFlowsTimeseriesGroupsParams,
                 ),
-                post_parser=ResultWrapper[NetflowTimeseriesResponse]._unwrapper,
+                post_parser=ResultWrapper[NetFlowsTimeseriesGroupsResponse]._unwrapper,
             ),
-            cast_to=cast(Type[NetflowTimeseriesResponse], ResultWrapper[NetflowTimeseriesResponse]),
+            cast_to=cast(Type[NetFlowsTimeseriesGroupsResponse], ResultWrapper[NetFlowsTimeseriesGroupsResponse]),
         )
 
 
-class AsyncNetflowsResource(AsyncAPIResource):
+class AsyncNetFlowsResource(AsyncAPIResource):
     @cached_property
     def top(self) -> AsyncTopResource:
         return AsyncTopResource(self._client)
 
     @cached_property
-    def with_raw_response(self) -> AsyncNetflowsResourceWithRawResponse:
-        return AsyncNetflowsResourceWithRawResponse(self)
+    def with_raw_response(self) -> AsyncNetFlowsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncNetFlowsResourceWithRawResponse(self)
 
     @cached_property
-    def with_streaming_response(self) -> AsyncNetflowsResourceWithStreamingResponse:
-        return AsyncNetflowsResourceWithStreamingResponse(self)
+    def with_streaming_response(self) -> AsyncNetFlowsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-    async def timeseries(
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncNetFlowsResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated(
+        "Use [Get Network Traffic Distribution By Dimension](https://developers.cloudflare.com/api/resources/radar/subresources/netflows/methods/summary_v2/) instead."
+    )
+    async def summary(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | NotGiven = NOT_GIVEN,
-        product: List[Literal["HTTP", "ALL"]] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> NetflowTimeseriesResponse:
-        """Get network traffic change over time.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> NetFlowsSummaryResponse:
+        """
+        Retrieves the distribution of network traffic (NetFlows) by HTTP vs other
+        protocols.
+
+        Args:
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-        Visit
-        https://en.wikipedia.org/wiki/NetFlow for more information on NetFlows.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/netflows/summary",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "geo_id": geo_id,
+                        "location": location,
+                        "name": name,
+                    },
+                    netflows_summary_params.NetFlowsSummaryParams,
+                ),
+                post_parser=ResultWrapper[NetFlowsSummaryResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[NetFlowsSummaryResponse], ResultWrapper[NetFlowsSummaryResponse]),
+        )
+
+    async def summary_v2(
+        self,
+        dimension: Literal["ADM1", "PRODUCT"],
+        *,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        product: List[Literal["HTTP", "ALL"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> NetFlowsSummaryV2Response:
+        """
+        Retrieves the distribution of network traffic (NetFlows) by the specified
+        dimension.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          dimension: Specifies the NetFlows attribute by which to group the results.
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          product: Filters the results by network traffic product types.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/netflows/summary/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "geo_id": geo_id,
+                        "limit_per_group": limit_per_group,
+                        "location": location,
+                        "name": name,
+                        "product": product,
+                    },
+                    netflows_summary_v2_params.NetFlowsSummaryV2Params,
+                ),
+                post_parser=ResultWrapper[NetFlowsSummaryV2Response]._unwrapper,
+            ),
+            cast_to=cast(Type[NetFlowsSummaryV2Response], ResultWrapper[NetFlowsSummaryV2Response]),
+        )
+
+    async def timeseries(
+        self,
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"] | Omit = omit,
+        product: List[Literal["HTTP", "ALL"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> NetFlowsTimeseriesResponse:
+        """
+        Retrieves network traffic (NetFlows) over time.
+
+        Args:
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          normalization: Normalization method applied. Refer to
+          normalization: Normalization method applied to the results. Refer to
               [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
 
-          product: Array of network traffic product types.
+          product: Filters the results by network traffic product types.
 
           extra_headers: Send extra headers
 
@@ -244,65 +785,224 @@ async def timeseries(
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "geo_id": geo_id,
+                        "location": location,
+                        "name": name,
+                        "normalization": normalization,
+                        "product": product,
+                    },
+                    netflows_timeseries_params.NetFlowsTimeseriesParams,
+                ),
+                post_parser=ResultWrapper[NetFlowsTimeseriesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[NetFlowsTimeseriesResponse], ResultWrapper[NetFlowsTimeseriesResponse]),
+        )
+
+    async def timeseries_groups(
+        self,
+        dimension: Literal["ADM1", "PRODUCT"],
+        *,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        limit_per_group: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        normalization: Literal["PERCENTAGE", "MIN0_MAX"] | Omit = omit,
+        product: List[Literal["HTTP", "ALL"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> NetFlowsTimeseriesGroupsResponse:
+        """
+        Retrieves the distribution of NetFlows traffic, grouped by chosen the specified
+        dimension over time.
+
+        Args:
+          dimension: Specifies the NetFlows attribute by which to group the results.
+
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
+              [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
+
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
+
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
+
+          limit_per_group: Limits the number of objects per group to the top items within the specified
+              time range. When item count exceeds the limit, extra items appear grouped under
+              an "other" category.
+
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
+
+          normalization: Normalization method applied to the results. Refer to
+              [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+
+          product: Filters the results by network traffic product types.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not dimension:
+            raise ValueError(f"Expected a non-empty value for `dimension` but received {dimension!r}")
+        return await self._get(
+            f"/radar/netflows/timeseries_groups/{dimension}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "agg_interval": agg_interval,
+                        "asn": asn,
+                        "continent": continent,
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "geo_id": geo_id,
+                        "limit_per_group": limit_per_group,
                         "location": location,
                         "name": name,
                         "normalization": normalization,
                         "product": product,
                     },
-                    netflow_timeseries_params.NetflowTimeseriesParams,
+                    netflows_timeseries_groups_params.NetFlowsTimeseriesGroupsParams,
                 ),
-                post_parser=ResultWrapper[NetflowTimeseriesResponse]._unwrapper,
+                post_parser=ResultWrapper[NetFlowsTimeseriesGroupsResponse]._unwrapper,
             ),
-            cast_to=cast(Type[NetflowTimeseriesResponse], ResultWrapper[NetflowTimeseriesResponse]),
+            cast_to=cast(Type[NetFlowsTimeseriesGroupsResponse], ResultWrapper[NetFlowsTimeseriesGroupsResponse]),
         )
 
 
-class NetflowsResourceWithRawResponse:
-    def __init__(self, netflows: NetflowsResource) -> None:
+class NetFlowsResourceWithRawResponse:
+    def __init__(self, netflows: NetFlowsResource) -> None:
         self._netflows = netflows
 
+        self.summary = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                netflows.summary,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.summary_v2 = to_raw_response_wrapper(
+            netflows.summary_v2,
+        )
         self.timeseries = to_raw_response_wrapper(
             netflows.timeseries,
         )
+        self.timeseries_groups = to_raw_response_wrapper(
+            netflows.timeseries_groups,
+        )
 
     @cached_property
     def top(self) -> TopResourceWithRawResponse:
         return TopResourceWithRawResponse(self._netflows.top)
 
 
-class AsyncNetflowsResourceWithRawResponse:
-    def __init__(self, netflows: AsyncNetflowsResource) -> None:
+class AsyncNetFlowsResourceWithRawResponse:
+    def __init__(self, netflows: AsyncNetFlowsResource) -> None:
         self._netflows = netflows
 
+        self.summary = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                netflows.summary,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.summary_v2 = async_to_raw_response_wrapper(
+            netflows.summary_v2,
+        )
         self.timeseries = async_to_raw_response_wrapper(
             netflows.timeseries,
         )
+        self.timeseries_groups = async_to_raw_response_wrapper(
+            netflows.timeseries_groups,
+        )
 
     @cached_property
     def top(self) -> AsyncTopResourceWithRawResponse:
         return AsyncTopResourceWithRawResponse(self._netflows.top)
 
 
-class NetflowsResourceWithStreamingResponse:
-    def __init__(self, netflows: NetflowsResource) -> None:
+class NetFlowsResourceWithStreamingResponse:
+    def __init__(self, netflows: NetFlowsResource) -> None:
         self._netflows = netflows
 
+        self.summary = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                netflows.summary,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.summary_v2 = to_streamed_response_wrapper(
+            netflows.summary_v2,
+        )
         self.timeseries = to_streamed_response_wrapper(
             netflows.timeseries,
         )
+        self.timeseries_groups = to_streamed_response_wrapper(
+            netflows.timeseries_groups,
+        )
 
     @cached_property
     def top(self) -> TopResourceWithStreamingResponse:
         return TopResourceWithStreamingResponse(self._netflows.top)
 
 
-class AsyncNetflowsResourceWithStreamingResponse:
-    def __init__(self, netflows: AsyncNetflowsResource) -> None:
+class AsyncNetFlowsResourceWithStreamingResponse:
+    def __init__(self, netflows: AsyncNetFlowsResource) -> None:
         self._netflows = netflows
 
+        self.summary = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                netflows.summary,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.summary_v2 = async_to_streamed_response_wrapper(
+            netflows.summary_v2,
+        )
         self.timeseries = async_to_streamed_response_wrapper(
             netflows.timeseries,
         )
+        self.timeseries_groups = async_to_streamed_response_wrapper(
+            netflows.timeseries_groups,
+        )
 
     @cached_property
     def top(self) -> AsyncTopResourceWithStreamingResponse:
diff --git a/src/cloudflare/resources/radar/netflows/top.py b/src/cloudflare/resources/radar/netflows/top.py
index a16cb4ef770..467898134c8 100644
--- a/src/cloudflare/resources/radar/netflows/top.py
+++ b/src/cloudflare/resources/radar/netflows/top.py
@@ -2,17 +2,14 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Union, cast
+from typing import Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -33,61 +30,78 @@
 class TopResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TopResourceWithStreamingResponse(self)
 
     def ases(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopAsesResponse:
         """
-        Get the top autonomous systems (AS) by network traffic (NetFlows) over a given
-        time period. Visit https://en.wikipedia.org/wiki/NetFlow for more information.
+        Retrieves the top autonomous systems by network traffic (NetFlows).
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          limit: Limits the number of objects returned in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -112,6 +126,7 @@ def ases(
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "geo_id": geo_id,
                         "limit": limit,
                         "location": location,
                         "name": name,
@@ -126,52 +141,58 @@ def ases(
     def locations(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopLocationsResponse:
         """
-        Get the top locations by network traffic (NetFlows) over a given time period.
-        Visit https://en.wikipedia.org/wiki/NetFlow for more information.
+        Retrieves the top locations by network traffic (NetFlows).
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -196,6 +217,7 @@ def locations(
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "geo_id": geo_id,
                         "limit": limit,
                         "location": location,
                         "name": name,
@@ -211,61 +233,78 @@ def locations(
 class AsyncTopResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTopResourceWithStreamingResponse(self)
 
     async def ases(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopAsesResponse:
         """
-        Get the top autonomous systems (AS) by network traffic (NetFlows) over a given
-        time period. Visit https://en.wikipedia.org/wiki/NetFlow for more information.
+        Retrieves the top autonomous systems by network traffic (NetFlows).
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          limit: Limits the number of objects returned in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
+
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -290,6 +329,7 @@ async def ases(
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "geo_id": geo_id,
                         "limit": limit,
                         "location": location,
                         "name": name,
@@ -304,52 +344,58 @@ async def ases(
     async def locations(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        geo_id: SequenceNotStr[str] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopLocationsResponse:
         """
-        Get the top locations by network traffic (NetFlows) over a given time period.
-        Visit https://en.wikipedia.org/wiki/NetFlow for more information.
+        Retrieves the top locations by network traffic (NetFlows).
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          geo_id: Filters results by Geolocation. Specify a comma-separated list of GeoNames IDs.
+              Prefix with `-` to exclude geoIds from results. For example, `-2267056,360689`
+              excludes results from the 2267056 (Lisbon), but includes results from 5128638
+              (New York).
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -374,6 +420,7 @@ async def locations(
                         "date_range": date_range,
                         "date_start": date_start,
                         "format": format,
+                        "geo_id": geo_id,
                         "limit": limit,
                         "location": location,
                         "name": name,
diff --git a/src/cloudflare/resources/radar/quality/iqi.py b/src/cloudflare/resources/radar/quality/iqi.py
index ceb5522fc2c..c5a89636de4 100644
--- a/src/cloudflare/resources/radar/quality/iqi.py
+++ b/src/cloudflare/resources/radar/quality/iqi.py
@@ -2,17 +2,14 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Union, cast
+from typing import Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -33,61 +30,73 @@
 class IQIResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> IQIResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return IQIResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> IQIResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return IQIResourceWithStreamingResponse(self)
 
     def summary(
         self,
         *,
         metric: Literal["BANDWIDTH", "DNS", "LATENCY"],
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IQISummaryResponse:
         """
-        Get a summary (percentiles) of bandwidth, latency or DNS response time from the
-        Radar Internet Quality Index (IQI).
+        Retrieves a summary (percentiles) of bandwidth, latency, or DNS response time
+        from the Radar Internet Quality Index (IQI).
 
         Args:
-          metric: Which metric to return: bandwidth, latency or DNS response time.
+          metric: Defines which metric to return (bandwidth, latency, or DNS response time).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -127,59 +136,60 @@ def timeseries_groups(
         self,
         *,
         metric: Literal["BANDWIDTH", "DNS", "LATENCY"],
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        interpolation: bool | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        interpolation: bool | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IQITimeseriesGroupsResponse:
         """
-        Get a time series (percentiles) of bandwidth, latency or DNS response time from
-        the Radar Internet Quality Index (IQI).
+        Retrieves a time series (percentiles) of bandwidth, latency, or DNS response
+        time from the Radar Internet Quality Index (IQI).
 
         Args:
-          metric: Which metric to return: bandwidth, latency or DNS response time.
+          metric: Defines which metric to return (bandwidth, latency, or DNS response time).
 
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          interpolation: Enable interpolation for all series (using the average).
+          interpolation: Enables interpolation for all series (using the average).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -221,61 +231,73 @@ def timeseries_groups(
 class AsyncIQIResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncIQIResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncIQIResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncIQIResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncIQIResourceWithStreamingResponse(self)
 
     async def summary(
         self,
         *,
         metric: Literal["BANDWIDTH", "DNS", "LATENCY"],
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IQISummaryResponse:
         """
-        Get a summary (percentiles) of bandwidth, latency or DNS response time from the
-        Radar Internet Quality Index (IQI).
+        Retrieves a summary (percentiles) of bandwidth, latency, or DNS response time
+        from the Radar Internet Quality Index (IQI).
 
         Args:
-          metric: Which metric to return: bandwidth, latency or DNS response time.
+          metric: Defines which metric to return (bandwidth, latency, or DNS response time).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -315,59 +337,60 @@ async def timeseries_groups(
         self,
         *,
         metric: Literal["BANDWIDTH", "DNS", "LATENCY"],
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        interpolation: bool | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        interpolation: bool | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IQITimeseriesGroupsResponse:
         """
-        Get a time series (percentiles) of bandwidth, latency or DNS response time from
-        the Radar Internet Quality Index (IQI).
+        Retrieves a time series (percentiles) of bandwidth, latency, or DNS response
+        time from the Radar Internet Quality Index (IQI).
 
         Args:
-          metric: Which metric to return: bandwidth, latency or DNS response time.
+          metric: Defines which metric to return (bandwidth, latency, or DNS response time).
 
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          interpolation: Enable interpolation for all series (using the average).
+          interpolation: Enables interpolation for all series (using the average).
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/quality/quality.py b/src/cloudflare/resources/radar/quality/quality.py
index a5fb5b19f3c..e7cff1eac89 100644
--- a/src/cloudflare/resources/radar/quality/quality.py
+++ b/src/cloudflare/resources/radar/quality/quality.py
@@ -10,7 +10,8 @@
     IQIResourceWithStreamingResponse,
     AsyncIQIResourceWithStreamingResponse,
 )
-from .speed import (
+from ...._compat import cached_property
+from .speed.speed import (
     SpeedResource,
     AsyncSpeedResource,
     SpeedResourceWithRawResponse,
@@ -18,8 +19,6 @@
     SpeedResourceWithStreamingResponse,
     AsyncSpeedResourceWithStreamingResponse,
 )
-from ...._compat import cached_property
-from .speed.speed import SpeedResource, AsyncSpeedResource
 from ...._resource import SyncAPIResource, AsyncAPIResource
 
 __all__ = ["QualityResource", "AsyncQualityResource"]
@@ -36,10 +35,21 @@ def speed(self) -> SpeedResource:
 
     @cached_property
     def with_raw_response(self) -> QualityResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return QualityResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> QualityResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return QualityResourceWithStreamingResponse(self)
 
 
@@ -54,10 +64,21 @@ def speed(self) -> AsyncSpeedResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncQualityResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncQualityResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncQualityResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncQualityResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/radar/quality/speed/speed.py b/src/cloudflare/resources/radar/quality/speed/speed.py
index 58823322df2..e3b27dfbb45 100644
--- a/src/cloudflare/resources/radar/quality/speed/speed.py
+++ b/src/cloudflare/resources/radar/quality/speed/speed.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Union, cast
+from typing import Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
@@ -16,11 +16,8 @@
     TopResourceWithStreamingResponse,
     AsyncTopResourceWithStreamingResponse,
 )
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -45,56 +42,68 @@ def top(self) -> TopResource:
 
     @cached_property
     def with_raw_response(self) -> SpeedResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SpeedResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SpeedResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SpeedResourceWithStreamingResponse(self)
 
     def histogram(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bucket_size: int | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        metric_group: Literal["BANDWIDTH", "LATENCY", "JITTER"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bucket_size: int | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        metric_group: Literal["BANDWIDTH", "LATENCY", "JITTER"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SpeedHistogramResponse:
         """
-        Get an histogram from the previous 90 days of Cloudflare Speed Test data, split
-        into fixed bandwidth (Mbps), latency (ms) or jitter (ms) buckets.
+        Retrieves a histogram from the previous 90 days of Cloudflare Speed Test data,
+        split into fixed bandwidth (Mbps), latency (ms), or jitter (ms) buckets.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bucket_size: The width for every bucket in the histogram.
+          bucket_size: Specifies the width for every bucket in the histogram.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
           metric_group: Metrics to be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -132,41 +141,42 @@ def histogram(
     def summary(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SpeedSummaryResponse:
         """
-        Get a summary of bandwidth, latency, jitter and packet loss, from the previous
-        90 days of Cloudflare Speed Test data.
+        Retrieves a summary of bandwidth, latency, jitter, and packet loss, from the
+        previous 90 days of Cloudflare Speed Test data.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -207,56 +217,68 @@ def top(self) -> AsyncTopResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncSpeedResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSpeedResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSpeedResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSpeedResourceWithStreamingResponse(self)
 
     async def histogram(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        bucket_size: int | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        metric_group: Literal["BANDWIDTH", "LATENCY", "JITTER"] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        bucket_size: int | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        metric_group: Literal["BANDWIDTH", "LATENCY", "JITTER"] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SpeedHistogramResponse:
         """
-        Get an histogram from the previous 90 days of Cloudflare Speed Test data, split
-        into fixed bandwidth (Mbps), latency (ms) or jitter (ms) buckets.
+        Retrieves a histogram from the previous 90 days of Cloudflare Speed Test data,
+        split into fixed bandwidth (Mbps), latency (ms), or jitter (ms) buckets.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          bucket_size: The width for every bucket in the histogram.
+          bucket_size: Specifies the width for every bucket in the histogram.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
           metric_group: Metrics to be returned.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -294,41 +316,42 @@ async def histogram(
     async def summary(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SpeedSummaryResponse:
         """
-        Get a summary of bandwidth, latency, jitter and packet loss, from the previous
-        90 days of Cloudflare Speed Test data.
+        Retrieves a summary of bandwidth, latency, jitter, and packet loss, from the
+        previous 90 days of Cloudflare Speed Test data.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/quality/speed/top.py b/src/cloudflare/resources/radar/quality/speed/top.py
index 966bcea0eb9..6827dc62b1f 100644
--- a/src/cloudflare/resources/radar/quality/speed/top.py
+++ b/src/cloudflare/resources/radar/quality/speed/top.py
@@ -2,17 +2,14 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Union, cast
+from typing import Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -33,62 +30,74 @@
 class TopResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TopResourceWithStreamingResponse(self)
 
     def ases(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         order_by: Literal[
             "BANDWIDTH_DOWNLOAD", "BANDWIDTH_UPLOAD", "LATENCY_IDLE", "LATENCY_LOADED", "JITTER_IDLE", "JITTER_LOADED"
         ]
-        | NotGiven = NOT_GIVEN,
-        reverse: bool | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        reverse: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopAsesResponse:
         """
-        Get the top autonomous systems by bandwidth, latency, jitter or packet loss,
-        from the previous 90 days of Cloudflare Speed Test data.
+        Retrieves the top autonomous systems by bandwidth, latency, jitter, or packet
+        loss, from the previous 90 days of Cloudflare Speed Test data.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          order_by: Metric to order the results by.
+          order_by: Specifies the metric to order the results by.
 
-          reverse: Reverse the order of results.
+          reverse: Reverses the order of results.
 
           extra_headers: Send extra headers
 
@@ -127,53 +136,54 @@ def ases(
     def locations(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         order_by: Literal[
             "BANDWIDTH_DOWNLOAD", "BANDWIDTH_UPLOAD", "LATENCY_IDLE", "LATENCY_LOADED", "JITTER_IDLE", "JITTER_LOADED"
         ]
-        | NotGiven = NOT_GIVEN,
-        reverse: bool | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        reverse: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopLocationsResponse:
         """
-        Get the top locations by bandwidth, latency, jitter or packet loss, from the
-        previous 90 days of Cloudflare Speed Test data.
+        Retrieves the top locations by bandwidth, latency, jitter, or packet loss, from
+        the previous 90 days of Cloudflare Speed Test data.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          order_by: Metric to order the results by.
+          order_by: Specifies the metric to order the results by.
 
-          reverse: Reverse the order of results.
+          reverse: Reverses the order of results.
 
           extra_headers: Send extra headers
 
@@ -213,62 +223,74 @@ def locations(
 class AsyncTopResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTopResourceWithStreamingResponse(self)
 
     async def ases(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         order_by: Literal[
             "BANDWIDTH_DOWNLOAD", "BANDWIDTH_UPLOAD", "LATENCY_IDLE", "LATENCY_LOADED", "JITTER_IDLE", "JITTER_LOADED"
         ]
-        | NotGiven = NOT_GIVEN,
-        reverse: bool | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        reverse: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopAsesResponse:
         """
-        Get the top autonomous systems by bandwidth, latency, jitter or packet loss,
-        from the previous 90 days of Cloudflare Speed Test data.
+        Retrieves the top autonomous systems by bandwidth, latency, jitter, or packet
+        loss, from the previous 90 days of Cloudflare Speed Test data.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          order_by: Metric to order the results by.
+          order_by: Specifies the metric to order the results by.
 
-          reverse: Reverse the order of results.
+          reverse: Reverses the order of results.
 
           extra_headers: Send extra headers
 
@@ -307,53 +329,54 @@ async def ases(
     async def locations(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         order_by: Literal[
             "BANDWIDTH_DOWNLOAD", "BANDWIDTH_UPLOAD", "LATENCY_IDLE", "LATENCY_LOADED", "JITTER_IDLE", "JITTER_LOADED"
         ]
-        | NotGiven = NOT_GIVEN,
-        reverse: bool | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        reverse: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopLocationsResponse:
         """
-        Get the top locations by bandwidth, latency, jitter or packet loss, from the
-        previous 90 days of Cloudflare Speed Test data.
+        Retrieves the top locations by bandwidth, latency, jitter, or packet loss, from
+        the previous 90 days of Cloudflare Speed Test data.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
-          order_by: Metric to order the results by.
+          order_by: Specifies the metric to order the results by.
 
-          reverse: Reverse the order of results.
+          reverse: Reverses the order of results.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/radar.py b/src/cloudflare/resources/radar/radar.py
index 555d88e7bf5..8cc06d6d13d 100644
--- a/src/cloudflare/resources/radar/radar.py
+++ b/src/cloudflare/resources/radar/radar.py
@@ -2,7 +2,31 @@
 
 from __future__ import annotations
 
-from .bgp import (
+from .ai.ai import (
+    AIResource,
+    AsyncAIResource,
+    AIResourceWithRawResponse,
+    AsyncAIResourceWithRawResponse,
+    AIResourceWithStreamingResponse,
+    AsyncAIResourceWithStreamingResponse,
+)
+from .ct.ct import (
+    CTResource,
+    AsyncCTResource,
+    CTResourceWithRawResponse,
+    AsyncCTResourceWithRawResponse,
+    CTResourceWithStreamingResponse,
+    AsyncCTResourceWithStreamingResponse,
+)
+from .search import (
+    SearchResource,
+    AsyncSearchResource,
+    SearchResourceWithRawResponse,
+    AsyncSearchResourceWithRawResponse,
+    SearchResourceWithStreamingResponse,
+    AsyncSearchResourceWithStreamingResponse,
+)
+from .bgp.bgp import (
     BGPResource,
     AsyncBGPResource,
     BGPResourceWithRawResponse,
@@ -10,7 +34,7 @@
     BGPResourceWithStreamingResponse,
     AsyncBGPResourceWithStreamingResponse,
 )
-from .dns import (
+from .dns.dns import (
     DNSResource,
     AsyncDNSResource,
     DNSResourceWithRawResponse,
@@ -18,7 +42,24 @@
     DNSResourceWithStreamingResponse,
     AsyncDNSResourceWithStreamingResponse,
 )
-from .http import (
+from .datasets import (
+    DatasetsResource,
+    AsyncDatasetsResource,
+    DatasetsResourceWithRawResponse,
+    AsyncDatasetsResourceWithRawResponse,
+    DatasetsResourceWithStreamingResponse,
+    AsyncDatasetsResourceWithStreamingResponse,
+)
+from ..._compat import cached_property
+from .bots.bots import (
+    BotsResource,
+    AsyncBotsResource,
+    BotsResourceWithRawResponse,
+    AsyncBotsResourceWithRawResponse,
+    BotsResourceWithStreamingResponse,
+    AsyncBotsResourceWithStreamingResponse,
+)
+from .http.http import (
     HTTPResource,
     AsyncHTTPResource,
     HTTPResourceWithRawResponse,
@@ -26,7 +67,8 @@
     HTTPResourceWithStreamingResponse,
     AsyncHTTPResourceWithStreamingResponse,
 )
-from .as112 import (
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .as112.as112 import (
     AS112Resource,
     AsyncAS112Resource,
     AS112ResourceWithRawResponse,
@@ -34,7 +76,7 @@
     AS112ResourceWithStreamingResponse,
     AsyncAS112ResourceWithStreamingResponse,
 )
-from .email import (
+from .email.email import (
     EmailResource,
     AsyncEmailResource,
     EmailResourceWithRawResponse,
@@ -42,15 +84,15 @@
     EmailResourceWithStreamingResponse,
     AsyncEmailResourceWithStreamingResponse,
 )
-from .search import (
-    SearchResource,
-    AsyncSearchResource,
-    SearchResourceWithRawResponse,
-    AsyncSearchResourceWithRawResponse,
-    SearchResourceWithStreamingResponse,
-    AsyncSearchResourceWithStreamingResponse,
+from .geolocations import (
+    GeolocationsResource,
+    AsyncGeolocationsResource,
+    GeolocationsResourceWithRawResponse,
+    AsyncGeolocationsResourceWithRawResponse,
+    GeolocationsResourceWithStreamingResponse,
+    AsyncGeolocationsResourceWithStreamingResponse,
 )
-from .attacks import (
+from .attacks.attacks import (
     AttacksResource,
     AsyncAttacksResource,
     AttacksResourceWithRawResponse,
@@ -58,9 +100,7 @@
     AttacksResourceWithStreamingResponse,
     AsyncAttacksResourceWithStreamingResponse,
 )
-from .bgp.bgp import BGPResource, AsyncBGPResource
-from .dns.dns import DNSResource, AsyncDNSResource
-from .quality import (
+from .quality.quality import (
     QualityResource,
     AsyncQualityResource,
     QualityResourceWithRawResponse,
@@ -68,7 +108,7 @@
     QualityResourceWithStreamingResponse,
     AsyncQualityResourceWithStreamingResponse,
 )
-from .ranking import (
+from .ranking.ranking import (
     RankingResource,
     AsyncRankingResource,
     RankingResourceWithRawResponse,
@@ -76,15 +116,7 @@
     RankingResourceWithStreamingResponse,
     AsyncRankingResourceWithStreamingResponse,
 )
-from .datasets import (
-    DatasetsResource,
-    AsyncDatasetsResource,
-    DatasetsResourceWithRawResponse,
-    AsyncDatasetsResourceWithRawResponse,
-    DatasetsResourceWithStreamingResponse,
-    AsyncDatasetsResourceWithStreamingResponse,
-)
-from .entities import (
+from .entities.entities import (
     EntitiesResource,
     AsyncEntitiesResource,
     EntitiesResourceWithRawResponse,
@@ -92,18 +124,31 @@
     EntitiesResourceWithStreamingResponse,
     AsyncEntitiesResourceWithStreamingResponse,
 )
-from .netflows import (
-    NetflowsResource,
-    AsyncNetflowsResource,
-    NetflowsResourceWithRawResponse,
-    AsyncNetflowsResourceWithRawResponse,
-    NetflowsResourceWithStreamingResponse,
-    AsyncNetflowsResourceWithStreamingResponse,
+from .netflows.netflows import (
+    NetFlowsResource,
+    AsyncNetFlowsResource,
+    NetFlowsResourceWithRawResponse,
+    AsyncNetFlowsResourceWithRawResponse,
+    NetFlowsResourceWithStreamingResponse,
+    AsyncNetFlowsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from .http.http import HTTPResource, AsyncHTTPResource
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .annotations import (
+from .tcp_resets_timeouts import (
+    TCPResetsTimeoutsResource,
+    AsyncTCPResetsTimeoutsResource,
+    TCPResetsTimeoutsResourceWithRawResponse,
+    AsyncTCPResetsTimeoutsResourceWithRawResponse,
+    TCPResetsTimeoutsResourceWithStreamingResponse,
+    AsyncTCPResetsTimeoutsResourceWithStreamingResponse,
+)
+from .robots_txt.robots_txt import (
+    RobotsTXTResource,
+    AsyncRobotsTXTResource,
+    RobotsTXTResourceWithRawResponse,
+    AsyncRobotsTXTResourceWithRawResponse,
+    RobotsTXTResourceWithStreamingResponse,
+    AsyncRobotsTXTResourceWithStreamingResponse,
+)
+from .annotations.annotations import (
     AnnotationsResource,
     AsyncAnnotationsResource,
     AnnotationsResourceWithRawResponse,
@@ -111,9 +156,7 @@
     AnnotationsResourceWithStreamingResponse,
     AsyncAnnotationsResourceWithStreamingResponse,
 )
-from .as112.as112 import AS112Resource, AsyncAS112Resource
-from .email.email import EmailResource, AsyncEmailResource
-from .verified_bots import (
+from .verified_bots.verified_bots import (
     VerifiedBotsResource,
     AsyncVerifiedBotsResource,
     VerifiedBotsResourceWithRawResponse,
@@ -121,12 +164,7 @@
     VerifiedBotsResourceWithStreamingResponse,
     AsyncVerifiedBotsResourceWithStreamingResponse,
 )
-from .attacks.attacks import AttacksResource, AsyncAttacksResource
-from .quality.quality import QualityResource, AsyncQualityResource
-from .ranking.ranking import RankingResource, AsyncRankingResource
-from .entities.entities import EntitiesResource, AsyncEntitiesResource
-from .netflows.netflows import NetflowsResource, AsyncNetflowsResource
-from .traffic_anomalies import (
+from .traffic_anomalies.traffic_anomalies import (
     TrafficAnomaliesResource,
     AsyncTrafficAnomaliesResource,
     TrafficAnomaliesResourceWithRawResponse,
@@ -134,22 +172,27 @@
     TrafficAnomaliesResourceWithStreamingResponse,
     AsyncTrafficAnomaliesResourceWithStreamingResponse,
 )
-from .tcp_resets_timeouts import (
-    TCPResetsTimeoutsResource,
-    AsyncTCPResetsTimeoutsResource,
-    TCPResetsTimeoutsResourceWithRawResponse,
-    AsyncTCPResetsTimeoutsResourceWithRawResponse,
-    TCPResetsTimeoutsResourceWithStreamingResponse,
-    AsyncTCPResetsTimeoutsResourceWithStreamingResponse,
+from .leaked_credentials.leaked_credentials import (
+    LeakedCredentialsResource,
+    AsyncLeakedCredentialsResource,
+    LeakedCredentialsResourceWithRawResponse,
+    AsyncLeakedCredentialsResourceWithRawResponse,
+    LeakedCredentialsResourceWithStreamingResponse,
+    AsyncLeakedCredentialsResourceWithStreamingResponse,
 )
-from .annotations.annotations import AnnotationsResource, AsyncAnnotationsResource
-from .verified_bots.verified_bots import VerifiedBotsResource, AsyncVerifiedBotsResource
-from .traffic_anomalies.traffic_anomalies import TrafficAnomaliesResource, AsyncTrafficAnomaliesResource
 
 __all__ = ["RadarResource", "AsyncRadarResource"]
 
 
 class RadarResource(SyncAPIResource):
+    @cached_property
+    def ai(self) -> AIResource:
+        return AIResource(self._client)
+
+    @cached_property
+    def ct(self) -> CTResource:
+        return CTResource(self._client)
+
     @cached_property
     def annotations(self) -> AnnotationsResource:
         return AnnotationsResource(self._client)
@@ -158,6 +201,10 @@ def annotations(self) -> AnnotationsResource:
     def bgp(self) -> BGPResource:
         return BGPResource(self._client)
 
+    @cached_property
+    def bots(self) -> BotsResource:
+        return BotsResource(self._client)
+
     @cached_property
     def datasets(self) -> DatasetsResource:
         return DatasetsResource(self._client)
@@ -167,8 +214,8 @@ def dns(self) -> DNSResource:
         return DNSResource(self._client)
 
     @cached_property
-    def netflows(self) -> NetflowsResource:
-        return NetflowsResource(self._client)
+    def netflows(self) -> NetFlowsResource:
+        return NetFlowsResource(self._client)
 
     @cached_property
     def search(self) -> SearchResource:
@@ -194,6 +241,10 @@ def attacks(self) -> AttacksResource:
     def entities(self) -> EntitiesResource:
         return EntitiesResource(self._client)
 
+    @cached_property
+    def geolocations(self) -> GeolocationsResource:
+        return GeolocationsResource(self._client)
+
     @cached_property
     def http(self) -> HTTPResource:
         return HTTPResource(self._client)
@@ -214,16 +265,43 @@ def traffic_anomalies(self) -> TrafficAnomaliesResource:
     def tcp_resets_timeouts(self) -> TCPResetsTimeoutsResource:
         return TCPResetsTimeoutsResource(self._client)
 
+    @cached_property
+    def robots_txt(self) -> RobotsTXTResource:
+        return RobotsTXTResource(self._client)
+
+    @cached_property
+    def leaked_credentials(self) -> LeakedCredentialsResource:
+        return LeakedCredentialsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> RadarResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RadarResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RadarResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RadarResourceWithStreamingResponse(self)
 
 
 class AsyncRadarResource(AsyncAPIResource):
+    @cached_property
+    def ai(self) -> AsyncAIResource:
+        return AsyncAIResource(self._client)
+
+    @cached_property
+    def ct(self) -> AsyncCTResource:
+        return AsyncCTResource(self._client)
+
     @cached_property
     def annotations(self) -> AsyncAnnotationsResource:
         return AsyncAnnotationsResource(self._client)
@@ -232,6 +310,10 @@ def annotations(self) -> AsyncAnnotationsResource:
     def bgp(self) -> AsyncBGPResource:
         return AsyncBGPResource(self._client)
 
+    @cached_property
+    def bots(self) -> AsyncBotsResource:
+        return AsyncBotsResource(self._client)
+
     @cached_property
     def datasets(self) -> AsyncDatasetsResource:
         return AsyncDatasetsResource(self._client)
@@ -241,8 +323,8 @@ def dns(self) -> AsyncDNSResource:
         return AsyncDNSResource(self._client)
 
     @cached_property
-    def netflows(self) -> AsyncNetflowsResource:
-        return AsyncNetflowsResource(self._client)
+    def netflows(self) -> AsyncNetFlowsResource:
+        return AsyncNetFlowsResource(self._client)
 
     @cached_property
     def search(self) -> AsyncSearchResource:
@@ -268,6 +350,10 @@ def attacks(self) -> AsyncAttacksResource:
     def entities(self) -> AsyncEntitiesResource:
         return AsyncEntitiesResource(self._client)
 
+    @cached_property
+    def geolocations(self) -> AsyncGeolocationsResource:
+        return AsyncGeolocationsResource(self._client)
+
     @cached_property
     def http(self) -> AsyncHTTPResource:
         return AsyncHTTPResource(self._client)
@@ -288,12 +374,31 @@ def traffic_anomalies(self) -> AsyncTrafficAnomaliesResource:
     def tcp_resets_timeouts(self) -> AsyncTCPResetsTimeoutsResource:
         return AsyncTCPResetsTimeoutsResource(self._client)
 
+    @cached_property
+    def robots_txt(self) -> AsyncRobotsTXTResource:
+        return AsyncRobotsTXTResource(self._client)
+
+    @cached_property
+    def leaked_credentials(self) -> AsyncLeakedCredentialsResource:
+        return AsyncLeakedCredentialsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncRadarResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRadarResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRadarResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRadarResourceWithStreamingResponse(self)
 
 
@@ -301,6 +406,14 @@ class RadarResourceWithRawResponse:
     def __init__(self, radar: RadarResource) -> None:
         self._radar = radar
 
+    @cached_property
+    def ai(self) -> AIResourceWithRawResponse:
+        return AIResourceWithRawResponse(self._radar.ai)
+
+    @cached_property
+    def ct(self) -> CTResourceWithRawResponse:
+        return CTResourceWithRawResponse(self._radar.ct)
+
     @cached_property
     def annotations(self) -> AnnotationsResourceWithRawResponse:
         return AnnotationsResourceWithRawResponse(self._radar.annotations)
@@ -309,6 +422,10 @@ def annotations(self) -> AnnotationsResourceWithRawResponse:
     def bgp(self) -> BGPResourceWithRawResponse:
         return BGPResourceWithRawResponse(self._radar.bgp)
 
+    @cached_property
+    def bots(self) -> BotsResourceWithRawResponse:
+        return BotsResourceWithRawResponse(self._radar.bots)
+
     @cached_property
     def datasets(self) -> DatasetsResourceWithRawResponse:
         return DatasetsResourceWithRawResponse(self._radar.datasets)
@@ -318,8 +435,8 @@ def dns(self) -> DNSResourceWithRawResponse:
         return DNSResourceWithRawResponse(self._radar.dns)
 
     @cached_property
-    def netflows(self) -> NetflowsResourceWithRawResponse:
-        return NetflowsResourceWithRawResponse(self._radar.netflows)
+    def netflows(self) -> NetFlowsResourceWithRawResponse:
+        return NetFlowsResourceWithRawResponse(self._radar.netflows)
 
     @cached_property
     def search(self) -> SearchResourceWithRawResponse:
@@ -345,6 +462,10 @@ def attacks(self) -> AttacksResourceWithRawResponse:
     def entities(self) -> EntitiesResourceWithRawResponse:
         return EntitiesResourceWithRawResponse(self._radar.entities)
 
+    @cached_property
+    def geolocations(self) -> GeolocationsResourceWithRawResponse:
+        return GeolocationsResourceWithRawResponse(self._radar.geolocations)
+
     @cached_property
     def http(self) -> HTTPResourceWithRawResponse:
         return HTTPResourceWithRawResponse(self._radar.http)
@@ -365,11 +486,27 @@ def traffic_anomalies(self) -> TrafficAnomaliesResourceWithRawResponse:
     def tcp_resets_timeouts(self) -> TCPResetsTimeoutsResourceWithRawResponse:
         return TCPResetsTimeoutsResourceWithRawResponse(self._radar.tcp_resets_timeouts)
 
+    @cached_property
+    def robots_txt(self) -> RobotsTXTResourceWithRawResponse:
+        return RobotsTXTResourceWithRawResponse(self._radar.robots_txt)
+
+    @cached_property
+    def leaked_credentials(self) -> LeakedCredentialsResourceWithRawResponse:
+        return LeakedCredentialsResourceWithRawResponse(self._radar.leaked_credentials)
+
 
 class AsyncRadarResourceWithRawResponse:
     def __init__(self, radar: AsyncRadarResource) -> None:
         self._radar = radar
 
+    @cached_property
+    def ai(self) -> AsyncAIResourceWithRawResponse:
+        return AsyncAIResourceWithRawResponse(self._radar.ai)
+
+    @cached_property
+    def ct(self) -> AsyncCTResourceWithRawResponse:
+        return AsyncCTResourceWithRawResponse(self._radar.ct)
+
     @cached_property
     def annotations(self) -> AsyncAnnotationsResourceWithRawResponse:
         return AsyncAnnotationsResourceWithRawResponse(self._radar.annotations)
@@ -378,6 +515,10 @@ def annotations(self) -> AsyncAnnotationsResourceWithRawResponse:
     def bgp(self) -> AsyncBGPResourceWithRawResponse:
         return AsyncBGPResourceWithRawResponse(self._radar.bgp)
 
+    @cached_property
+    def bots(self) -> AsyncBotsResourceWithRawResponse:
+        return AsyncBotsResourceWithRawResponse(self._radar.bots)
+
     @cached_property
     def datasets(self) -> AsyncDatasetsResourceWithRawResponse:
         return AsyncDatasetsResourceWithRawResponse(self._radar.datasets)
@@ -387,8 +528,8 @@ def dns(self) -> AsyncDNSResourceWithRawResponse:
         return AsyncDNSResourceWithRawResponse(self._radar.dns)
 
     @cached_property
-    def netflows(self) -> AsyncNetflowsResourceWithRawResponse:
-        return AsyncNetflowsResourceWithRawResponse(self._radar.netflows)
+    def netflows(self) -> AsyncNetFlowsResourceWithRawResponse:
+        return AsyncNetFlowsResourceWithRawResponse(self._radar.netflows)
 
     @cached_property
     def search(self) -> AsyncSearchResourceWithRawResponse:
@@ -414,6 +555,10 @@ def attacks(self) -> AsyncAttacksResourceWithRawResponse:
     def entities(self) -> AsyncEntitiesResourceWithRawResponse:
         return AsyncEntitiesResourceWithRawResponse(self._radar.entities)
 
+    @cached_property
+    def geolocations(self) -> AsyncGeolocationsResourceWithRawResponse:
+        return AsyncGeolocationsResourceWithRawResponse(self._radar.geolocations)
+
     @cached_property
     def http(self) -> AsyncHTTPResourceWithRawResponse:
         return AsyncHTTPResourceWithRawResponse(self._radar.http)
@@ -434,11 +579,27 @@ def traffic_anomalies(self) -> AsyncTrafficAnomaliesResourceWithRawResponse:
     def tcp_resets_timeouts(self) -> AsyncTCPResetsTimeoutsResourceWithRawResponse:
         return AsyncTCPResetsTimeoutsResourceWithRawResponse(self._radar.tcp_resets_timeouts)
 
+    @cached_property
+    def robots_txt(self) -> AsyncRobotsTXTResourceWithRawResponse:
+        return AsyncRobotsTXTResourceWithRawResponse(self._radar.robots_txt)
+
+    @cached_property
+    def leaked_credentials(self) -> AsyncLeakedCredentialsResourceWithRawResponse:
+        return AsyncLeakedCredentialsResourceWithRawResponse(self._radar.leaked_credentials)
+
 
 class RadarResourceWithStreamingResponse:
     def __init__(self, radar: RadarResource) -> None:
         self._radar = radar
 
+    @cached_property
+    def ai(self) -> AIResourceWithStreamingResponse:
+        return AIResourceWithStreamingResponse(self._radar.ai)
+
+    @cached_property
+    def ct(self) -> CTResourceWithStreamingResponse:
+        return CTResourceWithStreamingResponse(self._radar.ct)
+
     @cached_property
     def annotations(self) -> AnnotationsResourceWithStreamingResponse:
         return AnnotationsResourceWithStreamingResponse(self._radar.annotations)
@@ -447,6 +608,10 @@ def annotations(self) -> AnnotationsResourceWithStreamingResponse:
     def bgp(self) -> BGPResourceWithStreamingResponse:
         return BGPResourceWithStreamingResponse(self._radar.bgp)
 
+    @cached_property
+    def bots(self) -> BotsResourceWithStreamingResponse:
+        return BotsResourceWithStreamingResponse(self._radar.bots)
+
     @cached_property
     def datasets(self) -> DatasetsResourceWithStreamingResponse:
         return DatasetsResourceWithStreamingResponse(self._radar.datasets)
@@ -456,8 +621,8 @@ def dns(self) -> DNSResourceWithStreamingResponse:
         return DNSResourceWithStreamingResponse(self._radar.dns)
 
     @cached_property
-    def netflows(self) -> NetflowsResourceWithStreamingResponse:
-        return NetflowsResourceWithStreamingResponse(self._radar.netflows)
+    def netflows(self) -> NetFlowsResourceWithStreamingResponse:
+        return NetFlowsResourceWithStreamingResponse(self._radar.netflows)
 
     @cached_property
     def search(self) -> SearchResourceWithStreamingResponse:
@@ -483,6 +648,10 @@ def attacks(self) -> AttacksResourceWithStreamingResponse:
     def entities(self) -> EntitiesResourceWithStreamingResponse:
         return EntitiesResourceWithStreamingResponse(self._radar.entities)
 
+    @cached_property
+    def geolocations(self) -> GeolocationsResourceWithStreamingResponse:
+        return GeolocationsResourceWithStreamingResponse(self._radar.geolocations)
+
     @cached_property
     def http(self) -> HTTPResourceWithStreamingResponse:
         return HTTPResourceWithStreamingResponse(self._radar.http)
@@ -503,11 +672,27 @@ def traffic_anomalies(self) -> TrafficAnomaliesResourceWithStreamingResponse:
     def tcp_resets_timeouts(self) -> TCPResetsTimeoutsResourceWithStreamingResponse:
         return TCPResetsTimeoutsResourceWithStreamingResponse(self._radar.tcp_resets_timeouts)
 
+    @cached_property
+    def robots_txt(self) -> RobotsTXTResourceWithStreamingResponse:
+        return RobotsTXTResourceWithStreamingResponse(self._radar.robots_txt)
+
+    @cached_property
+    def leaked_credentials(self) -> LeakedCredentialsResourceWithStreamingResponse:
+        return LeakedCredentialsResourceWithStreamingResponse(self._radar.leaked_credentials)
+
 
 class AsyncRadarResourceWithStreamingResponse:
     def __init__(self, radar: AsyncRadarResource) -> None:
         self._radar = radar
 
+    @cached_property
+    def ai(self) -> AsyncAIResourceWithStreamingResponse:
+        return AsyncAIResourceWithStreamingResponse(self._radar.ai)
+
+    @cached_property
+    def ct(self) -> AsyncCTResourceWithStreamingResponse:
+        return AsyncCTResourceWithStreamingResponse(self._radar.ct)
+
     @cached_property
     def annotations(self) -> AsyncAnnotationsResourceWithStreamingResponse:
         return AsyncAnnotationsResourceWithStreamingResponse(self._radar.annotations)
@@ -516,6 +701,10 @@ def annotations(self) -> AsyncAnnotationsResourceWithStreamingResponse:
     def bgp(self) -> AsyncBGPResourceWithStreamingResponse:
         return AsyncBGPResourceWithStreamingResponse(self._radar.bgp)
 
+    @cached_property
+    def bots(self) -> AsyncBotsResourceWithStreamingResponse:
+        return AsyncBotsResourceWithStreamingResponse(self._radar.bots)
+
     @cached_property
     def datasets(self) -> AsyncDatasetsResourceWithStreamingResponse:
         return AsyncDatasetsResourceWithStreamingResponse(self._radar.datasets)
@@ -525,8 +714,8 @@ def dns(self) -> AsyncDNSResourceWithStreamingResponse:
         return AsyncDNSResourceWithStreamingResponse(self._radar.dns)
 
     @cached_property
-    def netflows(self) -> AsyncNetflowsResourceWithStreamingResponse:
-        return AsyncNetflowsResourceWithStreamingResponse(self._radar.netflows)
+    def netflows(self) -> AsyncNetFlowsResourceWithStreamingResponse:
+        return AsyncNetFlowsResourceWithStreamingResponse(self._radar.netflows)
 
     @cached_property
     def search(self) -> AsyncSearchResourceWithStreamingResponse:
@@ -552,6 +741,10 @@ def attacks(self) -> AsyncAttacksResourceWithStreamingResponse:
     def entities(self) -> AsyncEntitiesResourceWithStreamingResponse:
         return AsyncEntitiesResourceWithStreamingResponse(self._radar.entities)
 
+    @cached_property
+    def geolocations(self) -> AsyncGeolocationsResourceWithStreamingResponse:
+        return AsyncGeolocationsResourceWithStreamingResponse(self._radar.geolocations)
+
     @cached_property
     def http(self) -> AsyncHTTPResourceWithStreamingResponse:
         return AsyncHTTPResourceWithStreamingResponse(self._radar.http)
@@ -571,3 +764,11 @@ def traffic_anomalies(self) -> AsyncTrafficAnomaliesResourceWithStreamingRespons
     @cached_property
     def tcp_resets_timeouts(self) -> AsyncTCPResetsTimeoutsResourceWithStreamingResponse:
         return AsyncTCPResetsTimeoutsResourceWithStreamingResponse(self._radar.tcp_resets_timeouts)
+
+    @cached_property
+    def robots_txt(self) -> AsyncRobotsTXTResourceWithStreamingResponse:
+        return AsyncRobotsTXTResourceWithStreamingResponse(self._radar.robots_txt)
+
+    @cached_property
+    def leaked_credentials(self) -> AsyncLeakedCredentialsResourceWithStreamingResponse:
+        return AsyncLeakedCredentialsResourceWithStreamingResponse(self._radar.leaked_credentials)
diff --git a/src/cloudflare/resources/radar/ranking/__init__.py b/src/cloudflare/resources/radar/ranking/__init__.py
index cbb9e681fe6..9e972186dc5 100644
--- a/src/cloudflare/resources/radar/ranking/__init__.py
+++ b/src/cloudflare/resources/radar/ranking/__init__.py
@@ -16,6 +16,14 @@
     RankingResourceWithStreamingResponse,
     AsyncRankingResourceWithStreamingResponse,
 )
+from .internet_services import (
+    InternetServicesResource,
+    AsyncInternetServicesResource,
+    InternetServicesResourceWithRawResponse,
+    AsyncInternetServicesResourceWithRawResponse,
+    InternetServicesResourceWithStreamingResponse,
+    AsyncInternetServicesResourceWithStreamingResponse,
+)
 
 __all__ = [
     "DomainResource",
@@ -24,6 +32,12 @@
     "AsyncDomainResourceWithRawResponse",
     "DomainResourceWithStreamingResponse",
     "AsyncDomainResourceWithStreamingResponse",
+    "InternetServicesResource",
+    "AsyncInternetServicesResource",
+    "InternetServicesResourceWithRawResponse",
+    "AsyncInternetServicesResourceWithRawResponse",
+    "InternetServicesResourceWithStreamingResponse",
+    "AsyncInternetServicesResourceWithStreamingResponse",
     "RankingResource",
     "AsyncRankingResource",
     "RankingResourceWithRawResponse",
diff --git a/src/cloudflare/resources/radar/ranking/domain.py b/src/cloudflare/resources/radar/ranking/domain.py
index c44caa95006..7ec008fe5ec 100644
--- a/src/cloudflare/resources/radar/ranking/domain.py
+++ b/src/cloudflare/resources/radar/ranking/domain.py
@@ -2,16 +2,14 @@
 
 from __future__ import annotations
 
-from typing import List, Type, cast
+from typing import Type, Union, cast
+from datetime import date
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -31,43 +29,59 @@
 class DomainResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DomainResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DomainResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DomainResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DomainResourceWithStreamingResponse(self)
 
     def get(
         self,
         domain: str,
         *,
-        date: List[str] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        ranking_type: Literal["POPULAR", "TRENDING_RISE", "TRENDING_STEADY"] | NotGiven = NOT_GIVEN,
+        date: SequenceNotStr[Union[str, date]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        include_top_locations: bool | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        ranking_type: Literal["POPULAR", "TRENDING_RISE", "TRENDING_STEADY"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> DomainGetResponse:
-        """Gets Domains Rank details.
+        """Retrieves domain rank details.
 
-        Cloudflare provides an ordered rank for the top 100
-        domains, but for the remainder it only provides ranking buckets like top 200
+        Cloudflare provides an ordered rank for the top
+        100 domains, but for the remainder it only provides ranking buckets like top 200
         thousand, top one million, etc.. These are available through Radar datasets
         endpoints.
 
         Args:
-          date: Array of dates to filter the ranking.
+          domain: Domain name.
+
+          date: Filters results by the specified array of dates.
+
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          include_top_locations: Includes top locations in the response.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           ranking_type: The ranking type.
 
@@ -92,6 +106,7 @@ def get(
                     {
                         "date": date,
                         "format": format,
+                        "include_top_locations": include_top_locations,
                         "limit": limit,
                         "name": name,
                         "ranking_type": ranking_type,
@@ -107,43 +122,59 @@ def get(
 class AsyncDomainResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDomainResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDomainResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDomainResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDomainResourceWithStreamingResponse(self)
 
     async def get(
         self,
         domain: str,
         *,
-        date: List[str] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        ranking_type: Literal["POPULAR", "TRENDING_RISE", "TRENDING_STEADY"] | NotGiven = NOT_GIVEN,
+        date: SequenceNotStr[Union[str, date]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        include_top_locations: bool | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        ranking_type: Literal["POPULAR", "TRENDING_RISE", "TRENDING_STEADY"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> DomainGetResponse:
-        """Gets Domains Rank details.
+        """Retrieves domain rank details.
 
-        Cloudflare provides an ordered rank for the top 100
-        domains, but for the remainder it only provides ranking buckets like top 200
+        Cloudflare provides an ordered rank for the top
+        100 domains, but for the remainder it only provides ranking buckets like top 200
         thousand, top one million, etc.. These are available through Radar datasets
         endpoints.
 
         Args:
-          date: Array of dates to filter the ranking.
+          domain: Domain name.
+
+          date: Filters results by the specified array of dates.
+
+          format: Format in which results will be returned.
 
-          format: Format results are returned in.
+          include_top_locations: Includes top locations in the response.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           ranking_type: The ranking type.
 
@@ -168,6 +199,7 @@ async def get(
                     {
                         "date": date,
                         "format": format,
+                        "include_top_locations": include_top_locations,
                         "limit": limit,
                         "name": name,
                         "ranking_type": ranking_type,
diff --git a/src/cloudflare/resources/radar/ranking/internet_services.py b/src/cloudflare/resources/radar/ranking/internet_services.py
new file mode 100644
index 00000000000..577ff274502
--- /dev/null
+++ b/src/cloudflare/resources/radar/ranking/internet_services.py
@@ -0,0 +1,504 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Union, cast
+from datetime import date, datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.radar.ranking import (
+    internet_service_top_params,
+    internet_service_categories_params,
+    internet_service_timeseries_groups_params,
+)
+from ....types.radar.ranking.internet_service_top_response import InternetServiceTopResponse
+from ....types.radar.ranking.internet_service_categories_response import InternetServiceCategoriesResponse
+from ....types.radar.ranking.internet_service_timeseries_groups_response import InternetServiceTimeseriesGroupsResponse
+
+__all__ = ["InternetServicesResource", "AsyncInternetServicesResource"]
+
+
+class InternetServicesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> InternetServicesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return InternetServicesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> InternetServicesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return InternetServicesResourceWithStreamingResponse(self)
+
+    def categories(
+        self,
+        *,
+        date: SequenceNotStr[Union[str, date]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InternetServiceCategoriesResponse:
+        """
+        Retrieves the list of Internet services categories.
+
+        Args:
+          date: Filters results by the specified array of dates.
+
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/ranking/internet_services/categories",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "date": date,
+                        "format": format,
+                        "limit": limit,
+                        "name": name,
+                    },
+                    internet_service_categories_params.InternetServiceCategoriesParams,
+                ),
+                post_parser=ResultWrapper[InternetServiceCategoriesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InternetServiceCategoriesResponse], ResultWrapper[InternetServiceCategoriesResponse]),
+        )
+
+    def timeseries_groups(
+        self,
+        *,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        service_category: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InternetServiceTimeseriesGroupsResponse:
+        """
+        Retrieves Internet Services rank update changes over time.
+
+        Args:
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
+
+          name: Array of names used to label the series in the response.
+
+          service_category: Filters results by Internet service category.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/ranking/internet_services/timeseries_groups",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit": limit,
+                        "name": name,
+                        "service_category": service_category,
+                    },
+                    internet_service_timeseries_groups_params.InternetServiceTimeseriesGroupsParams,
+                ),
+                post_parser=ResultWrapper[InternetServiceTimeseriesGroupsResponse]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[InternetServiceTimeseriesGroupsResponse], ResultWrapper[InternetServiceTimeseriesGroupsResponse]
+            ),
+        )
+
+    def top(
+        self,
+        *,
+        date: SequenceNotStr[Union[str, date]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        service_category: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InternetServiceTopResponse:
+        """
+        Retrieves top Internet services based on their rank.
+
+        Args:
+          date: Filters results by the specified array of dates.
+
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
+
+          name: Array of names used to label the series in the response.
+
+          service_category: Filters results by Internet service category.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/ranking/internet_services/top",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "date": date,
+                        "format": format,
+                        "limit": limit,
+                        "name": name,
+                        "service_category": service_category,
+                    },
+                    internet_service_top_params.InternetServiceTopParams,
+                ),
+                post_parser=ResultWrapper[InternetServiceTopResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InternetServiceTopResponse], ResultWrapper[InternetServiceTopResponse]),
+        )
+
+
+class AsyncInternetServicesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncInternetServicesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncInternetServicesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncInternetServicesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncInternetServicesResourceWithStreamingResponse(self)
+
+    async def categories(
+        self,
+        *,
+        date: SequenceNotStr[Union[str, date]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InternetServiceCategoriesResponse:
+        """
+        Retrieves the list of Internet services categories.
+
+        Args:
+          date: Filters results by the specified array of dates.
+
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
+
+          name: Array of names used to label the series in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/ranking/internet_services/categories",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "date": date,
+                        "format": format,
+                        "limit": limit,
+                        "name": name,
+                    },
+                    internet_service_categories_params.InternetServiceCategoriesParams,
+                ),
+                post_parser=ResultWrapper[InternetServiceCategoriesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InternetServiceCategoriesResponse], ResultWrapper[InternetServiceCategoriesResponse]),
+        )
+
+    async def timeseries_groups(
+        self,
+        *,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        service_category: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InternetServiceTimeseriesGroupsResponse:
+        """
+        Retrieves Internet Services rank update changes over time.
+
+        Args:
+          date_end: End of the date range (inclusive).
+
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
+
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
+
+          name: Array of names used to label the series in the response.
+
+          service_category: Filters results by Internet service category.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/ranking/internet_services/timeseries_groups",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "date_end": date_end,
+                        "date_range": date_range,
+                        "date_start": date_start,
+                        "format": format,
+                        "limit": limit,
+                        "name": name,
+                        "service_category": service_category,
+                    },
+                    internet_service_timeseries_groups_params.InternetServiceTimeseriesGroupsParams,
+                ),
+                post_parser=ResultWrapper[InternetServiceTimeseriesGroupsResponse]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[InternetServiceTimeseriesGroupsResponse], ResultWrapper[InternetServiceTimeseriesGroupsResponse]
+            ),
+        )
+
+    async def top(
+        self,
+        *,
+        date: SequenceNotStr[Union[str, date]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        service_category: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InternetServiceTopResponse:
+        """
+        Retrieves top Internet services based on their rank.
+
+        Args:
+          date: Filters results by the specified array of dates.
+
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
+
+          name: Array of names used to label the series in the response.
+
+          service_category: Filters results by Internet service category.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/ranking/internet_services/top",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "date": date,
+                        "format": format,
+                        "limit": limit,
+                        "name": name,
+                        "service_category": service_category,
+                    },
+                    internet_service_top_params.InternetServiceTopParams,
+                ),
+                post_parser=ResultWrapper[InternetServiceTopResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InternetServiceTopResponse], ResultWrapper[InternetServiceTopResponse]),
+        )
+
+
+class InternetServicesResourceWithRawResponse:
+    def __init__(self, internet_services: InternetServicesResource) -> None:
+        self._internet_services = internet_services
+
+        self.categories = to_raw_response_wrapper(
+            internet_services.categories,
+        )
+        self.timeseries_groups = to_raw_response_wrapper(
+            internet_services.timeseries_groups,
+        )
+        self.top = to_raw_response_wrapper(
+            internet_services.top,
+        )
+
+
+class AsyncInternetServicesResourceWithRawResponse:
+    def __init__(self, internet_services: AsyncInternetServicesResource) -> None:
+        self._internet_services = internet_services
+
+        self.categories = async_to_raw_response_wrapper(
+            internet_services.categories,
+        )
+        self.timeseries_groups = async_to_raw_response_wrapper(
+            internet_services.timeseries_groups,
+        )
+        self.top = async_to_raw_response_wrapper(
+            internet_services.top,
+        )
+
+
+class InternetServicesResourceWithStreamingResponse:
+    def __init__(self, internet_services: InternetServicesResource) -> None:
+        self._internet_services = internet_services
+
+        self.categories = to_streamed_response_wrapper(
+            internet_services.categories,
+        )
+        self.timeseries_groups = to_streamed_response_wrapper(
+            internet_services.timeseries_groups,
+        )
+        self.top = to_streamed_response_wrapper(
+            internet_services.top,
+        )
+
+
+class AsyncInternetServicesResourceWithStreamingResponse:
+    def __init__(self, internet_services: AsyncInternetServicesResource) -> None:
+        self._internet_services = internet_services
+
+        self.categories = async_to_streamed_response_wrapper(
+            internet_services.categories,
+        )
+        self.timeseries_groups = async_to_streamed_response_wrapper(
+            internet_services.timeseries_groups,
+        )
+        self.top = async_to_streamed_response_wrapper(
+            internet_services.top,
+        )
diff --git a/src/cloudflare/resources/radar/ranking/ranking.py b/src/cloudflare/resources/radar/ranking/ranking.py
index 0bfe61b8dc0..2ff2768f9f7 100644
--- a/src/cloudflare/resources/radar/ranking/ranking.py
+++ b/src/cloudflare/resources/radar/ranking/ranking.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Union, cast
-from datetime import datetime
+from typing import Type, Union, cast
+from datetime import date, datetime
 from typing_extensions import Literal
 
 import httpx
@@ -16,11 +16,8 @@
     DomainResourceWithStreamingResponse,
     AsyncDomainResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -32,6 +29,14 @@
 from ...._wrappers import ResultWrapper
 from ....types.radar import ranking_top_params, ranking_timeseries_groups_params
 from ...._base_client import make_request_options
+from .internet_services import (
+    InternetServicesResource,
+    AsyncInternetServicesResource,
+    InternetServicesResourceWithRawResponse,
+    AsyncInternetServicesResourceWithRawResponse,
+    InternetServicesResourceWithStreamingResponse,
+    AsyncInternetServicesResourceWithStreamingResponse,
+)
 from ....types.radar.ranking_top_response import RankingTopResponse
 from ....types.radar.ranking_timeseries_groups_response import RankingTimeseriesGroupsResponse
 
@@ -43,55 +48,73 @@ class RankingResource(SyncAPIResource):
     def domain(self) -> DomainResource:
         return DomainResource(self._client)
 
+    @cached_property
+    def internet_services(self) -> InternetServicesResource:
+        return InternetServicesResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> RankingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RankingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RankingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RankingResourceWithStreamingResponse(self)
 
     def timeseries_groups(
         self,
         *,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        domains: List[str] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        ranking_type: Literal["POPULAR", "TRENDING_RISE", "TRENDING_STEADY"] | NotGiven = NOT_GIVEN,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        domain_category: SequenceNotStr[str] | Omit = omit,
+        domains: SequenceNotStr[str] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        ranking_type: Literal["POPULAR", "TRENDING_RISE", "TRENDING_STEADY"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RankingTimeseriesGroupsResponse:
-        """Gets Domains Rank updates change over time.
-
-        Raw values are returned.
+        """
+        Retrieves domains rank over time.
 
         Args:
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
+
+          date_start: Start of the date range.
 
-          date_start: Array of datetimes to filter the start of a series.
+          domain_category: Filters results by domain category.
 
-          domains: Array of comma separated list of domains names.
+          domains: Filters results by domain name. Specify a comma-separated list of domain names.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of locations (alpha-2 country codes).
+          location: Filters results by location. Specify a comma-separated list of alpha-2 location
+              codes.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           ranking_type: The ranking type.
 
@@ -115,6 +138,7 @@ def timeseries_groups(
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
+                        "domain_category": domain_category,
                         "domains": domains,
                         "format": format,
                         "limit": limit,
@@ -132,36 +156,40 @@ def timeseries_groups(
     def top(
         self,
         *,
-        date: List[str] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        ranking_type: Literal["POPULAR", "TRENDING_RISE", "TRENDING_STEADY"] | NotGiven = NOT_GIVEN,
+        date: SequenceNotStr[Union[str, date]] | Omit = omit,
+        domain_category: SequenceNotStr[str] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        ranking_type: Literal["POPULAR", "TRENDING_RISE", "TRENDING_STEADY"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RankingTopResponse:
-        """Get top or trending domains based on their rank.
+        """Retrieves the top or trending domains based on their rank.
 
-        Popular domains are domains of
-        broad appeal based on how people use the Internet. Trending domains are domains
-        that are generating a surge in interest. For more information on top domains,
-        see https://blog.cloudflare.com/radar-domain-rankings/.
+        Popular domains are
+        domains of broad appeal based on how people use the Internet. Trending domains
+        are domains that are generating a surge in interest. For more information on top
+        domains, see https://blog.cloudflare.com/radar-domain-rankings/.
 
         Args:
-          date: Array of dates to filter the ranking.
+          date: Filters results by the specified array of dates.
 
-          format: Format results are returned in.
+          domain_category: Filters results by domain category.
 
-          limit: Limit the number of objects in the response.
+          format: Format in which results will be returned.
 
-          location: Array of locations (alpha-2 country codes).
+          limit: Limits the number of objects returned in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 location
+              codes.
+
+          name: Array of names used to label the series in the response.
 
           ranking_type: The ranking type.
 
@@ -183,6 +211,7 @@ def top(
                 query=maybe_transform(
                     {
                         "date": date,
+                        "domain_category": domain_category,
                         "format": format,
                         "limit": limit,
                         "location": location,
@@ -202,55 +231,73 @@ class AsyncRankingResource(AsyncAPIResource):
     def domain(self) -> AsyncDomainResource:
         return AsyncDomainResource(self._client)
 
+    @cached_property
+    def internet_services(self) -> AsyncInternetServicesResource:
+        return AsyncInternetServicesResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncRankingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRankingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRankingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRankingResourceWithStreamingResponse(self)
 
     async def timeseries_groups(
         self,
         *,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        domains: List[str] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        ranking_type: Literal["POPULAR", "TRENDING_RISE", "TRENDING_STEADY"] | NotGiven = NOT_GIVEN,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        domain_category: SequenceNotStr[str] | Omit = omit,
+        domains: SequenceNotStr[str] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        ranking_type: Literal["POPULAR", "TRENDING_RISE", "TRENDING_STEADY"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RankingTimeseriesGroupsResponse:
-        """Gets Domains Rank updates change over time.
-
-        Raw values are returned.
+        """
+        Retrieves domains rank over time.
 
         Args:
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          domains: Array of comma separated list of domains names.
+          domain_category: Filters results by domain category.
 
-          format: Format results are returned in.
+          domains: Filters results by domain name. Specify a comma-separated list of domain names.
 
-          limit: Limit the number of objects in the response.
+          format: Format in which results will be returned.
 
-          location: Array of locations (alpha-2 country codes).
+          limit: Limits the number of objects returned in the response.
 
-          name: Array of names that will be used to name the series in responses.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 location
+              codes.
+
+          name: Array of names used to label the series in the response.
 
           ranking_type: The ranking type.
 
@@ -274,6 +321,7 @@ async def timeseries_groups(
                         "date_end": date_end,
                         "date_range": date_range,
                         "date_start": date_start,
+                        "domain_category": domain_category,
                         "domains": domains,
                         "format": format,
                         "limit": limit,
@@ -291,36 +339,40 @@ async def timeseries_groups(
     async def top(
         self,
         *,
-        date: List[str] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
-        ranking_type: Literal["POPULAR", "TRENDING_RISE", "TRENDING_STEADY"] | NotGiven = NOT_GIVEN,
+        date: SequenceNotStr[Union[str, date]] | Omit = omit,
+        domain_category: SequenceNotStr[str] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        ranking_type: Literal["POPULAR", "TRENDING_RISE", "TRENDING_STEADY"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RankingTopResponse:
-        """Get top or trending domains based on their rank.
+        """Retrieves the top or trending domains based on their rank.
 
-        Popular domains are domains of
-        broad appeal based on how people use the Internet. Trending domains are domains
-        that are generating a surge in interest. For more information on top domains,
-        see https://blog.cloudflare.com/radar-domain-rankings/.
+        Popular domains are
+        domains of broad appeal based on how people use the Internet. Trending domains
+        are domains that are generating a surge in interest. For more information on top
+        domains, see https://blog.cloudflare.com/radar-domain-rankings/.
 
         Args:
-          date: Array of dates to filter the ranking.
+          date: Filters results by the specified array of dates.
+
+          domain_category: Filters results by domain category.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of locations (alpha-2 country codes).
+          location: Filters results by location. Specify a comma-separated list of alpha-2 location
+              codes.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           ranking_type: The ranking type.
 
@@ -342,6 +394,7 @@ async def top(
                 query=await async_maybe_transform(
                     {
                         "date": date,
+                        "domain_category": domain_category,
                         "format": format,
                         "limit": limit,
                         "location": location,
@@ -371,6 +424,10 @@ def __init__(self, ranking: RankingResource) -> None:
     def domain(self) -> DomainResourceWithRawResponse:
         return DomainResourceWithRawResponse(self._ranking.domain)
 
+    @cached_property
+    def internet_services(self) -> InternetServicesResourceWithRawResponse:
+        return InternetServicesResourceWithRawResponse(self._ranking.internet_services)
+
 
 class AsyncRankingResourceWithRawResponse:
     def __init__(self, ranking: AsyncRankingResource) -> None:
@@ -387,6 +444,10 @@ def __init__(self, ranking: AsyncRankingResource) -> None:
     def domain(self) -> AsyncDomainResourceWithRawResponse:
         return AsyncDomainResourceWithRawResponse(self._ranking.domain)
 
+    @cached_property
+    def internet_services(self) -> AsyncInternetServicesResourceWithRawResponse:
+        return AsyncInternetServicesResourceWithRawResponse(self._ranking.internet_services)
+
 
 class RankingResourceWithStreamingResponse:
     def __init__(self, ranking: RankingResource) -> None:
@@ -403,6 +464,10 @@ def __init__(self, ranking: RankingResource) -> None:
     def domain(self) -> DomainResourceWithStreamingResponse:
         return DomainResourceWithStreamingResponse(self._ranking.domain)
 
+    @cached_property
+    def internet_services(self) -> InternetServicesResourceWithStreamingResponse:
+        return InternetServicesResourceWithStreamingResponse(self._ranking.internet_services)
+
 
 class AsyncRankingResourceWithStreamingResponse:
     def __init__(self, ranking: AsyncRankingResource) -> None:
@@ -418,3 +483,7 @@ def __init__(self, ranking: AsyncRankingResource) -> None:
     @cached_property
     def domain(self) -> AsyncDomainResourceWithStreamingResponse:
         return AsyncDomainResourceWithStreamingResponse(self._ranking.domain)
+
+    @cached_property
+    def internet_services(self) -> AsyncInternetServicesResourceWithStreamingResponse:
+        return AsyncInternetServicesResourceWithStreamingResponse(self._ranking.internet_services)
diff --git a/src/cloudflare/resources/radar/robots_txt/__init__.py b/src/cloudflare/resources/radar/robots_txt/__init__.py
new file mode 100644
index 00000000000..936f33b5d65
--- /dev/null
+++ b/src/cloudflare/resources/radar/robots_txt/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .top import (
+    TopResource,
+    AsyncTopResource,
+    TopResourceWithRawResponse,
+    AsyncTopResourceWithRawResponse,
+    TopResourceWithStreamingResponse,
+    AsyncTopResourceWithStreamingResponse,
+)
+from .robots_txt import (
+    RobotsTXTResource,
+    AsyncRobotsTXTResource,
+    RobotsTXTResourceWithRawResponse,
+    AsyncRobotsTXTResourceWithRawResponse,
+    RobotsTXTResourceWithStreamingResponse,
+    AsyncRobotsTXTResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "TopResource",
+    "AsyncTopResource",
+    "TopResourceWithRawResponse",
+    "AsyncTopResourceWithRawResponse",
+    "TopResourceWithStreamingResponse",
+    "AsyncTopResourceWithStreamingResponse",
+    "RobotsTXTResource",
+    "AsyncRobotsTXTResource",
+    "RobotsTXTResourceWithRawResponse",
+    "AsyncRobotsTXTResourceWithRawResponse",
+    "RobotsTXTResourceWithStreamingResponse",
+    "AsyncRobotsTXTResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/radar/robots_txt/robots_txt.py b/src/cloudflare/resources/radar/robots_txt/robots_txt.py
new file mode 100644
index 00000000000..24d416eb7fb
--- /dev/null
+++ b/src/cloudflare/resources/radar/robots_txt/robots_txt.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .top.top import (
+    TopResource,
+    AsyncTopResource,
+    TopResourceWithRawResponse,
+    AsyncTopResourceWithRawResponse,
+    TopResourceWithStreamingResponse,
+    AsyncTopResourceWithStreamingResponse,
+)
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["RobotsTXTResource", "AsyncRobotsTXTResource"]
+
+
+class RobotsTXTResource(SyncAPIResource):
+    @cached_property
+    def top(self) -> TopResource:
+        return TopResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> RobotsTXTResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return RobotsTXTResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> RobotsTXTResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return RobotsTXTResourceWithStreamingResponse(self)
+
+
+class AsyncRobotsTXTResource(AsyncAPIResource):
+    @cached_property
+    def top(self) -> AsyncTopResource:
+        return AsyncTopResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncRobotsTXTResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncRobotsTXTResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncRobotsTXTResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncRobotsTXTResourceWithStreamingResponse(self)
+
+
+class RobotsTXTResourceWithRawResponse:
+    def __init__(self, robots_txt: RobotsTXTResource) -> None:
+        self._robots_txt = robots_txt
+
+    @cached_property
+    def top(self) -> TopResourceWithRawResponse:
+        return TopResourceWithRawResponse(self._robots_txt.top)
+
+
+class AsyncRobotsTXTResourceWithRawResponse:
+    def __init__(self, robots_txt: AsyncRobotsTXTResource) -> None:
+        self._robots_txt = robots_txt
+
+    @cached_property
+    def top(self) -> AsyncTopResourceWithRawResponse:
+        return AsyncTopResourceWithRawResponse(self._robots_txt.top)
+
+
+class RobotsTXTResourceWithStreamingResponse:
+    def __init__(self, robots_txt: RobotsTXTResource) -> None:
+        self._robots_txt = robots_txt
+
+    @cached_property
+    def top(self) -> TopResourceWithStreamingResponse:
+        return TopResourceWithStreamingResponse(self._robots_txt.top)
+
+
+class AsyncRobotsTXTResourceWithStreamingResponse:
+    def __init__(self, robots_txt: AsyncRobotsTXTResource) -> None:
+        self._robots_txt = robots_txt
+
+    @cached_property
+    def top(self) -> AsyncTopResourceWithStreamingResponse:
+        return AsyncTopResourceWithStreamingResponse(self._robots_txt.top)
diff --git a/src/cloudflare/resources/radar/robots_txt/top/__init__.py b/src/cloudflare/resources/radar/robots_txt/top/__init__.py
new file mode 100644
index 00000000000..7fac3be2bc7
--- /dev/null
+++ b/src/cloudflare/resources/radar/robots_txt/top/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .top import (
+    TopResource,
+    AsyncTopResource,
+    TopResourceWithRawResponse,
+    AsyncTopResourceWithRawResponse,
+    TopResourceWithStreamingResponse,
+    AsyncTopResourceWithStreamingResponse,
+)
+from .user_agents import (
+    UserAgentsResource,
+    AsyncUserAgentsResource,
+    UserAgentsResourceWithRawResponse,
+    AsyncUserAgentsResourceWithRawResponse,
+    UserAgentsResourceWithStreamingResponse,
+    AsyncUserAgentsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "UserAgentsResource",
+    "AsyncUserAgentsResource",
+    "UserAgentsResourceWithRawResponse",
+    "AsyncUserAgentsResourceWithRawResponse",
+    "UserAgentsResourceWithStreamingResponse",
+    "AsyncUserAgentsResourceWithStreamingResponse",
+    "TopResource",
+    "AsyncTopResource",
+    "TopResourceWithRawResponse",
+    "AsyncTopResourceWithRawResponse",
+    "TopResourceWithStreamingResponse",
+    "AsyncTopResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/radar/robots_txt/top/top.py b/src/cloudflare/resources/radar/robots_txt/top/top.py
new file mode 100644
index 00000000000..d8aeb803a8d
--- /dev/null
+++ b/src/cloudflare/resources/radar/robots_txt/top/top.py
@@ -0,0 +1,254 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Union, cast
+from datetime import date
+from typing_extensions import Literal
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from .user_agents import (
+    UserAgentsResource,
+    AsyncUserAgentsResource,
+    UserAgentsResourceWithRawResponse,
+    AsyncUserAgentsResourceWithRawResponse,
+    UserAgentsResourceWithStreamingResponse,
+    AsyncUserAgentsResourceWithStreamingResponse,
+)
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.radar.robots_txt import top_domain_categories_params
+from .....types.radar.robots_txt.top_domain_categories_response import TopDomainCategoriesResponse
+
+__all__ = ["TopResource", "AsyncTopResource"]
+
+
+class TopResource(SyncAPIResource):
+    @cached_property
+    def user_agents(self) -> UserAgentsResource:
+        return UserAgentsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> TopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TopResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TopResourceWithStreamingResponse(self)
+
+    def domain_categories(
+        self,
+        *,
+        date: SequenceNotStr[Union[str, date]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        user_agent_category: Literal["AI"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TopDomainCategoriesResponse:
+        """
+        Retrieves the top domain categories by the number of robots.txt files parsed.
+
+        Args:
+          date: Filters results by the specified array of dates.
+
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
+
+          name: Array of names used to label the series in the response.
+
+          user_agent_category: Filters results by user agent category.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/robots_txt/top/domain_categories",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "date": date,
+                        "format": format,
+                        "limit": limit,
+                        "name": name,
+                        "user_agent_category": user_agent_category,
+                    },
+                    top_domain_categories_params.TopDomainCategoriesParams,
+                ),
+                post_parser=ResultWrapper[TopDomainCategoriesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TopDomainCategoriesResponse], ResultWrapper[TopDomainCategoriesResponse]),
+        )
+
+
+class AsyncTopResource(AsyncAPIResource):
+    @cached_property
+    def user_agents(self) -> AsyncUserAgentsResource:
+        return AsyncUserAgentsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncTopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTopResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTopResourceWithStreamingResponse(self)
+
+    async def domain_categories(
+        self,
+        *,
+        date: SequenceNotStr[Union[str, date]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        user_agent_category: Literal["AI"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TopDomainCategoriesResponse:
+        """
+        Retrieves the top domain categories by the number of robots.txt files parsed.
+
+        Args:
+          date: Filters results by the specified array of dates.
+
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
+
+          name: Array of names used to label the series in the response.
+
+          user_agent_category: Filters results by user agent category.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/robots_txt/top/domain_categories",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "date": date,
+                        "format": format,
+                        "limit": limit,
+                        "name": name,
+                        "user_agent_category": user_agent_category,
+                    },
+                    top_domain_categories_params.TopDomainCategoriesParams,
+                ),
+                post_parser=ResultWrapper[TopDomainCategoriesResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TopDomainCategoriesResponse], ResultWrapper[TopDomainCategoriesResponse]),
+        )
+
+
+class TopResourceWithRawResponse:
+    def __init__(self, top: TopResource) -> None:
+        self._top = top
+
+        self.domain_categories = to_raw_response_wrapper(
+            top.domain_categories,
+        )
+
+    @cached_property
+    def user_agents(self) -> UserAgentsResourceWithRawResponse:
+        return UserAgentsResourceWithRawResponse(self._top.user_agents)
+
+
+class AsyncTopResourceWithRawResponse:
+    def __init__(self, top: AsyncTopResource) -> None:
+        self._top = top
+
+        self.domain_categories = async_to_raw_response_wrapper(
+            top.domain_categories,
+        )
+
+    @cached_property
+    def user_agents(self) -> AsyncUserAgentsResourceWithRawResponse:
+        return AsyncUserAgentsResourceWithRawResponse(self._top.user_agents)
+
+
+class TopResourceWithStreamingResponse:
+    def __init__(self, top: TopResource) -> None:
+        self._top = top
+
+        self.domain_categories = to_streamed_response_wrapper(
+            top.domain_categories,
+        )
+
+    @cached_property
+    def user_agents(self) -> UserAgentsResourceWithStreamingResponse:
+        return UserAgentsResourceWithStreamingResponse(self._top.user_agents)
+
+
+class AsyncTopResourceWithStreamingResponse:
+    def __init__(self, top: AsyncTopResource) -> None:
+        self._top = top
+
+        self.domain_categories = async_to_streamed_response_wrapper(
+            top.domain_categories,
+        )
+
+    @cached_property
+    def user_agents(self) -> AsyncUserAgentsResourceWithStreamingResponse:
+        return AsyncUserAgentsResourceWithStreamingResponse(self._top.user_agents)
diff --git a/src/cloudflare/resources/radar/robots_txt/top/user_agents.py b/src/cloudflare/resources/radar/robots_txt/top/user_agents.py
new file mode 100644
index 00000000000..aa7b368669b
--- /dev/null
+++ b/src/cloudflare/resources/radar/robots_txt/top/user_agents.py
@@ -0,0 +1,238 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Union, cast
+from datetime import date
+from typing_extensions import Literal
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.radar.robots_txt.top import user_agent_directive_params
+from .....types.radar.robots_txt.top.user_agent_directive_response import UserAgentDirectiveResponse
+
+__all__ = ["UserAgentsResource", "AsyncUserAgentsResource"]
+
+
+class UserAgentsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> UserAgentsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return UserAgentsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> UserAgentsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return UserAgentsResourceWithStreamingResponse(self)
+
+    def directive(
+        self,
+        *,
+        date: SequenceNotStr[Union[str, date]] | Omit = omit,
+        directive: Literal["ALLOW", "DISALLOW"] | Omit = omit,
+        domain_category: SequenceNotStr[str] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        user_agent_category: Literal["AI"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> UserAgentDirectiveResponse:
+        """
+        Retrieves the top user agents on robots.txt files.
+
+        Args:
+          date: Filters results by the specified array of dates.
+
+          directive: Filters results by robots.txt directive.
+
+          domain_category: Filters results by domain category.
+
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
+
+          name: Array of names used to label the series in the response.
+
+          user_agent_category: Filters results by user agent category.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._get(
+            "/radar/robots_txt/top/user_agents/directive",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "date": date,
+                        "directive": directive,
+                        "domain_category": domain_category,
+                        "format": format,
+                        "limit": limit,
+                        "name": name,
+                        "user_agent_category": user_agent_category,
+                    },
+                    user_agent_directive_params.UserAgentDirectiveParams,
+                ),
+                post_parser=ResultWrapper[UserAgentDirectiveResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[UserAgentDirectiveResponse], ResultWrapper[UserAgentDirectiveResponse]),
+        )
+
+
+class AsyncUserAgentsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncUserAgentsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncUserAgentsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncUserAgentsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncUserAgentsResourceWithStreamingResponse(self)
+
+    async def directive(
+        self,
+        *,
+        date: SequenceNotStr[Union[str, date]] | Omit = omit,
+        directive: Literal["ALLOW", "DISALLOW"] | Omit = omit,
+        domain_category: SequenceNotStr[str] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
+        user_agent_category: Literal["AI"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> UserAgentDirectiveResponse:
+        """
+        Retrieves the top user agents on robots.txt files.
+
+        Args:
+          date: Filters results by the specified array of dates.
+
+          directive: Filters results by robots.txt directive.
+
+          domain_category: Filters results by domain category.
+
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
+
+          name: Array of names used to label the series in the response.
+
+          user_agent_category: Filters results by user agent category.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._get(
+            "/radar/robots_txt/top/user_agents/directive",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "date": date,
+                        "directive": directive,
+                        "domain_category": domain_category,
+                        "format": format,
+                        "limit": limit,
+                        "name": name,
+                        "user_agent_category": user_agent_category,
+                    },
+                    user_agent_directive_params.UserAgentDirectiveParams,
+                ),
+                post_parser=ResultWrapper[UserAgentDirectiveResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[UserAgentDirectiveResponse], ResultWrapper[UserAgentDirectiveResponse]),
+        )
+
+
+class UserAgentsResourceWithRawResponse:
+    def __init__(self, user_agents: UserAgentsResource) -> None:
+        self._user_agents = user_agents
+
+        self.directive = to_raw_response_wrapper(
+            user_agents.directive,
+        )
+
+
+class AsyncUserAgentsResourceWithRawResponse:
+    def __init__(self, user_agents: AsyncUserAgentsResource) -> None:
+        self._user_agents = user_agents
+
+        self.directive = async_to_raw_response_wrapper(
+            user_agents.directive,
+        )
+
+
+class UserAgentsResourceWithStreamingResponse:
+    def __init__(self, user_agents: UserAgentsResource) -> None:
+        self._user_agents = user_agents
+
+        self.directive = to_streamed_response_wrapper(
+            user_agents.directive,
+        )
+
+
+class AsyncUserAgentsResourceWithStreamingResponse:
+    def __init__(self, user_agents: AsyncUserAgentsResource) -> None:
+        self._user_agents = user_agents
+
+        self.directive = async_to_streamed_response_wrapper(
+            user_agents.directive,
+        )
diff --git a/src/cloudflare/resources/radar/search.py b/src/cloudflare/resources/radar/search.py
index 18cb4de529c..04dac89375e 100644
--- a/src/cloudflare/resources/radar/search.py
+++ b/src/cloudflare/resources/radar/search.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -31,43 +28,87 @@
 class SearchResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SearchResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SearchResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SearchResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SearchResourceWithStreamingResponse(self)
 
     def global_(
         self,
         *,
         query: str,
-        exclude: List[Literal["SPECIAL_EVENTS", "NOTEBOOKS", "LOCATIONS", "ASNS"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        include: List[Literal["SPECIAL_EVENTS", "NOTEBOOKS", "LOCATIONS", "ASNS"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        limit_per_group: float | NotGiven = NOT_GIVEN,
+        exclude: List[
+            Literal[
+                "ADM1S",
+                "ASNS",
+                "BOTS",
+                "CERTIFICATE_AUTHORITIES",
+                "CERTIFICATE_LOGS",
+                "ORIGINS",
+                "ORIGIN_REGIONS",
+                "INDUSTRIES",
+                "LOCATIONS",
+                "NOTEBOOKS",
+                "TLDS",
+                "VERTICALS",
+            ]
+        ]
+        | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        include: List[
+            Literal[
+                "ADM1S",
+                "ASNS",
+                "BOTS",
+                "CERTIFICATE_AUTHORITIES",
+                "CERTIFICATE_LOGS",
+                "ORIGINS",
+                "ORIGIN_REGIONS",
+                "INDUSTRIES",
+                "LOCATIONS",
+                "NOTEBOOKS",
+                "TLDS",
+                "VERTICALS",
+            ]
+        ]
+        | Omit = omit,
+        limit: int | Omit = omit,
+        limit_per_group: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SearchGlobalResponse:
         """
-        Lets you search for locations, autonomous systems (AS) and reports.
+        Searches for locations, autonomous systems, reports, bots, certificate logs,
+        certificate authorities, industries and verticals
 
         Args:
-          query: Search for locations, AS and reports.
+          query: String used to perform the search operation.
 
-          exclude: Search types to be excluded from results.
+          exclude: Search types excluded from results.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          include: Search types to be included in results.
+          include: Search types included in results.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          limit_per_group: Limit the number of objects per search category.
+          limit_per_group: Limits the number of objects per search category.
 
           extra_headers: Send extra headers
 
@@ -104,43 +145,87 @@ def global_(
 class AsyncSearchResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSearchResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSearchResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSearchResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSearchResourceWithStreamingResponse(self)
 
     async def global_(
         self,
         *,
         query: str,
-        exclude: List[Literal["SPECIAL_EVENTS", "NOTEBOOKS", "LOCATIONS", "ASNS"]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        include: List[Literal["SPECIAL_EVENTS", "NOTEBOOKS", "LOCATIONS", "ASNS"]] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        limit_per_group: float | NotGiven = NOT_GIVEN,
+        exclude: List[
+            Literal[
+                "ADM1S",
+                "ASNS",
+                "BOTS",
+                "CERTIFICATE_AUTHORITIES",
+                "CERTIFICATE_LOGS",
+                "ORIGINS",
+                "ORIGIN_REGIONS",
+                "INDUSTRIES",
+                "LOCATIONS",
+                "NOTEBOOKS",
+                "TLDS",
+                "VERTICALS",
+            ]
+        ]
+        | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        include: List[
+            Literal[
+                "ADM1S",
+                "ASNS",
+                "BOTS",
+                "CERTIFICATE_AUTHORITIES",
+                "CERTIFICATE_LOGS",
+                "ORIGINS",
+                "ORIGIN_REGIONS",
+                "INDUSTRIES",
+                "LOCATIONS",
+                "NOTEBOOKS",
+                "TLDS",
+                "VERTICALS",
+            ]
+        ]
+        | Omit = omit,
+        limit: int | Omit = omit,
+        limit_per_group: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SearchGlobalResponse:
         """
-        Lets you search for locations, autonomous systems (AS) and reports.
+        Searches for locations, autonomous systems, reports, bots, certificate logs,
+        certificate authorities, industries and verticals
 
         Args:
-          query: Search for locations, AS and reports.
+          query: String used to perform the search operation.
 
-          exclude: Search types to be excluded from results.
+          exclude: Search types excluded from results.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          include: Search types to be included in results.
+          include: Search types included in results.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          limit_per_group: Limit the number of objects per search category.
+          limit_per_group: Limits the number of objects per search category.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/tcp_resets_timeouts.py b/src/cloudflare/resources/radar/tcp_resets_timeouts.py
index 1a87837a3af..9dd77daf74b 100644
--- a/src/cloudflare/resources/radar/tcp_resets_timeouts.py
+++ b/src/cloudflare/resources/radar/tcp_resets_timeouts.py
@@ -2,17 +2,14 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Union, cast
+from typing import Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -33,58 +30,70 @@
 class TCPResetsTimeoutsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TCPResetsTimeoutsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TCPResetsTimeoutsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TCPResetsTimeoutsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TCPResetsTimeoutsResourceWithStreamingResponse(self)
 
     def summary(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TCPResetsTimeoutSummaryResponse:
         """
-        Percentage distribution by connection stage of TCP connections terminated within
-        the first 10 packets by a reset or timeout, for a given time period.
+        Retrieves the distribution of connection stage by TCP connections terminated
+        within the first 10 packets by a reset or timeout.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -122,54 +131,55 @@ def summary(
     def timeseries_groups(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TCPResetsTimeoutTimeseriesGroupsResponse:
         """
-        Percentage distribution by connection stage of TCP connections terminated within
-        the first 10 packets by a reset or timeout, over time.
+        Retrieves the distribution of connection stage by TCP connections terminated
+        within the first 10 packets by a reset or timeout over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -211,58 +221,70 @@ def timeseries_groups(
 class AsyncTCPResetsTimeoutsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTCPResetsTimeoutsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTCPResetsTimeoutsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTCPResetsTimeoutsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTCPResetsTimeoutsResourceWithStreamingResponse(self)
 
     async def summary(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TCPResetsTimeoutSummaryResponse:
         """
-        Percentage distribution by connection stage of TCP connections terminated within
-        the first 10 packets by a reset or timeout, for a given time period.
+        Retrieves the distribution of connection stage by TCP connections terminated
+        within the first 10 packets by a reset or timeout.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -300,54 +322,55 @@ async def summary(
     async def timeseries_groups(
         self,
         *,
-        agg_interval: Literal["15m", "1h", "1d", "1w"] | NotGiven = NOT_GIVEN,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        agg_interval: Literal["15m", "1h", "1d", "1w"] | Omit = omit,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TCPResetsTimeoutTimeseriesGroupsResponse:
         """
-        Percentage distribution by connection stage of TCP connections terminated within
-        the first 10 packets by a reset or timeout, over time.
+        Retrieves the distribution of connection stage by TCP connections terminated
+        within the first 10 packets by a reset or timeout over time.
 
         Args:
-          agg_interval: Aggregation interval results should be returned in (for example, in 15 minutes
-              or 1 hour intervals). Refer to
+          agg_interval: Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+              Refer to
               [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
 
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/traffic_anomalies/locations.py b/src/cloudflare/resources/radar/traffic_anomalies/locations.py
index 9acfecc4ed8..737d8fe8d60 100644
--- a/src/cloudflare/resources/radar/traffic_anomalies/locations.py
+++ b/src/cloudflare/resources/radar/traffic_anomalies/locations.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -32,44 +29,55 @@
 class LocationsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> LocationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LocationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LocationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LocationsResourceWithStreamingResponse(self)
 
     def get(
         self,
         *,
-        date_end: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        date_range: str | NotGiven = NOT_GIVEN,
-        date_start: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        status: Literal["VERIFIED", "UNVERIFIED"] | NotGiven = NOT_GIVEN,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_range: str | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        status: Literal["VERIFIED", "UNVERIFIED"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LocationGetResponse:
-        """
-        Internet traffic anomalies are signals that might point to an outage, These
-        alerts are automatically detected by Radar and then manually verified by our
-        team. This endpoint returns the sum of alerts grouped by location.
+        """Retrieves the sum of Internet traffic anomalies, grouped by location.
+
+        These
+        anomalies are signals that might indicate an outage, automatically detected by
+        Radar and manually verified by our team.
 
         Args:
           date_end: End of the date range (inclusive).
 
-          date_range: Shorthand date ranges for the last X days - use when you don't need specific
-              start and end dates.
+          date_range: Filters results by date range.
 
           date_start: Start of the date range (inclusive).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
           extra_headers: Send extra headers
 
@@ -106,44 +114,55 @@ def get(
 class AsyncLocationsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncLocationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLocationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLocationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLocationsResourceWithStreamingResponse(self)
 
     async def get(
         self,
         *,
-        date_end: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        date_range: str | NotGiven = NOT_GIVEN,
-        date_start: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        status: Literal["VERIFIED", "UNVERIFIED"] | NotGiven = NOT_GIVEN,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_range: str | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        status: Literal["VERIFIED", "UNVERIFIED"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> LocationGetResponse:
-        """
-        Internet traffic anomalies are signals that might point to an outage, These
-        alerts are automatically detected by Radar and then manually verified by our
-        team. This endpoint returns the sum of alerts grouped by location.
+        """Retrieves the sum of Internet traffic anomalies, grouped by location.
+
+        These
+        anomalies are signals that might indicate an outage, automatically detected by
+        Radar and manually verified by our team.
 
         Args:
           date_end: End of the date range (inclusive).
 
-          date_range: Shorthand date ranges for the last X days - use when you don't need specific
-              start and end dates.
+          date_range: Filters results by date range.
 
           date_start: Start of the date range (inclusive).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/radar/traffic_anomalies/traffic_anomalies.py b/src/cloudflare/resources/radar/traffic_anomalies/traffic_anomalies.py
index 3060a34f7ec..ff2f0d4371c 100644
--- a/src/cloudflare/resources/radar/traffic_anomalies/traffic_anomalies.py
+++ b/src/cloudflare/resources/radar/traffic_anomalies/traffic_anomalies.py
@@ -2,17 +2,14 @@
 
 from __future__ import annotations
 
-from typing import Type, Union, cast
+from typing import List, Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from .locations import (
     LocationsResource,
     AsyncLocationsResource,
@@ -44,53 +41,70 @@ def locations(self) -> LocationsResource:
 
     @cached_property
     def with_raw_response(self) -> TrafficAnomaliesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TrafficAnomaliesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TrafficAnomaliesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TrafficAnomaliesResourceWithStreamingResponse(self)
 
     def get(
         self,
         *,
-        asn: int | NotGiven = NOT_GIVEN,
-        date_end: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        date_range: str | NotGiven = NOT_GIVEN,
-        date_start: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: str | NotGiven = NOT_GIVEN,
-        offset: int | NotGiven = NOT_GIVEN,
-        status: Literal["VERIFIED", "UNVERIFIED"] | NotGiven = NOT_GIVEN,
+        asn: int | Omit = omit,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_range: str | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: str | Omit = omit,
+        offset: int | Omit = omit,
+        origin: str | Omit = omit,
+        status: Literal["VERIFIED", "UNVERIFIED"] | Omit = omit,
+        type: List[Literal["LOCATION", "AS", "ORIGIN"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TrafficAnomalyGetResponse:
         """
-        Internet traffic anomalies are signals that might point to an outage, These
-        alerts are automatically detected by Radar and then manually verified by our
-        team. This endpoint returns the latest alerts.
+        Retrieves the latest Internet traffic anomalies, which are signals that might
+        indicate an outage. These alerts are automatically detected by Radar and
+        manually verified by our team.
 
         Args:
-          asn: Single ASN as integer.
+          asn: Filters results by Autonomous System. Specify a single Autonomous System Number
+              (ASN) as integer.
 
           date_end: End of the date range (inclusive).
 
-          date_range: Shorthand date ranges for the last X days - use when you don't need specific
-              start and end dates.
+          date_range: Filters results by date range.
 
           date_start: Start of the date range (inclusive).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
+
+          location: Filters results by location. Specify an alpha-2 location code.
 
-          limit: Limit the number of objects in the response.
+          offset: Skips the specified number of objects before fetching the results.
 
-          location: Location Alpha2 code.
+          origin: Filters results by origin.
 
-          offset: Number of objects to skip before grabbing results.
+          type: Filters results by entity type (LOCATION, AS, or ORIGIN).
 
           extra_headers: Send extra headers
 
@@ -117,7 +131,9 @@ def get(
                         "limit": limit,
                         "location": location,
                         "offset": offset,
+                        "origin": origin,
                         "status": status,
+                        "type": type,
                     },
                     traffic_anomaly_get_params.TrafficAnomalyGetParams,
                 ),
@@ -134,53 +150,70 @@ def locations(self) -> AsyncLocationsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncTrafficAnomaliesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTrafficAnomaliesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTrafficAnomaliesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTrafficAnomaliesResourceWithStreamingResponse(self)
 
     async def get(
         self,
         *,
-        asn: int | NotGiven = NOT_GIVEN,
-        date_end: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        date_range: str | NotGiven = NOT_GIVEN,
-        date_start: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: str | NotGiven = NOT_GIVEN,
-        offset: int | NotGiven = NOT_GIVEN,
-        status: Literal["VERIFIED", "UNVERIFIED"] | NotGiven = NOT_GIVEN,
+        asn: int | Omit = omit,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_range: str | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: str | Omit = omit,
+        offset: int | Omit = omit,
+        origin: str | Omit = omit,
+        status: Literal["VERIFIED", "UNVERIFIED"] | Omit = omit,
+        type: List[Literal["LOCATION", "AS", "ORIGIN"]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TrafficAnomalyGetResponse:
         """
-        Internet traffic anomalies are signals that might point to an outage, These
-        alerts are automatically detected by Radar and then manually verified by our
-        team. This endpoint returns the latest alerts.
+        Retrieves the latest Internet traffic anomalies, which are signals that might
+        indicate an outage. These alerts are automatically detected by Radar and
+        manually verified by our team.
 
         Args:
-          asn: Single ASN as integer.
+          asn: Filters results by Autonomous System. Specify a single Autonomous System Number
+              (ASN) as integer.
 
           date_end: End of the date range (inclusive).
 
-          date_range: Shorthand date ranges for the last X days - use when you don't need specific
-              start and end dates.
+          date_range: Filters results by date range.
 
           date_start: Start of the date range (inclusive).
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
+
+          limit: Limits the number of objects returned in the response.
+
+          location: Filters results by location. Specify an alpha-2 location code.
 
-          limit: Limit the number of objects in the response.
+          offset: Skips the specified number of objects before fetching the results.
 
-          location: Location Alpha2 code.
+          origin: Filters results by origin.
 
-          offset: Number of objects to skip before grabbing results.
+          type: Filters results by entity type (LOCATION, AS, or ORIGIN).
 
           extra_headers: Send extra headers
 
@@ -207,7 +240,9 @@ async def get(
                         "limit": limit,
                         "location": location,
                         "offset": offset,
+                        "origin": origin,
                         "status": status,
+                        "type": type,
                     },
                     traffic_anomaly_get_params.TrafficAnomalyGetParams,
                 ),
diff --git a/src/cloudflare/resources/radar/verified_bots/top.py b/src/cloudflare/resources/radar/verified_bots/top.py
index 86e94bb809e..8e3fb21aca5 100644
--- a/src/cloudflare/resources/radar/verified_bots/top.py
+++ b/src/cloudflare/resources/radar/verified_bots/top.py
@@ -2,17 +2,15 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Union, cast
+import typing_extensions
+from typing import Type, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -33,60 +31,75 @@
 class TopResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TopResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar Bots API](https://developers.cloudflare.com/api/resources/radar/subresources/bots/) instead."
+    )
     def bots(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopBotsResponse:
         """
-        Get top verified bots by HTTP requests, with owner and category.
+        Retrieves the top verified bots by HTTP requests, with owner and category.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -122,55 +135,59 @@ def bots(
             cast_to=cast(Type[TopBotsResponse], ResultWrapper[TopBotsResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Bots API](https://developers.cloudflare.com/api/resources/radar/subresources/bots/) instead."
+    )
     def categories(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopCategoriesResponse:
         """
-        Get top verified bot categories by HTTP requests, along with their corresponding
-        percentage, over the total verified bot HTTP requests.
+        Retrieves the top verified bot categories by HTTP requests, along with their
+        corresponding percentage, over the total verified bot HTTP requests.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -210,60 +227,75 @@ def categories(
 class AsyncTopResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTopResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTopResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTopResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTopResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [Radar Bots API](https://developers.cloudflare.com/api/resources/radar/subresources/bots/) instead."
+    )
     async def bots(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopBotsResponse:
         """
-        Get top verified bots by HTTP requests, with owner and category.
+        Retrieves the top verified bots by HTTP requests, with owner and category.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -299,55 +331,59 @@ async def bots(
             cast_to=cast(Type[TopBotsResponse], ResultWrapper[TopBotsResponse]),
         )
 
+    @typing_extensions.deprecated(
+        "Use [Radar Bots API](https://developers.cloudflare.com/api/resources/radar/subresources/bots/) instead."
+    )
     async def categories(
         self,
         *,
-        asn: List[str] | NotGiven = NOT_GIVEN,
-        continent: List[str] | NotGiven = NOT_GIVEN,
-        date_end: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        date_range: List[str] | NotGiven = NOT_GIVEN,
-        date_start: List[Union[str, datetime]] | NotGiven = NOT_GIVEN,
-        format: Literal["JSON", "CSV"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        location: List[str] | NotGiven = NOT_GIVEN,
-        name: List[str] | NotGiven = NOT_GIVEN,
+        asn: SequenceNotStr[str] | Omit = omit,
+        continent: SequenceNotStr[str] | Omit = omit,
+        date_end: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        date_range: SequenceNotStr[str] | Omit = omit,
+        date_start: SequenceNotStr[Union[str, datetime]] | Omit = omit,
+        format: Literal["JSON", "CSV"] | Omit = omit,
+        limit: int | Omit = omit,
+        location: SequenceNotStr[str] | Omit = omit,
+        name: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TopCategoriesResponse:
         """
-        Get top verified bot categories by HTTP requests, along with their corresponding
-        percentage, over the total verified bot HTTP requests.
+        Retrieves the top verified bot categories by HTTP requests, along with their
+        corresponding percentage, over the total verified bot HTTP requests.
 
         Args:
-          asn: Array of comma separated list of ASNs, start with `-` to exclude from results.
-              For example, `-174, 3356` excludes results from AS174, but includes results from
-              AS3356.
+          asn: Filters results by Autonomous System. Specify one or more Autonomous System
+              Numbers (ASNs) as a comma-separated list. Prefix with `-` to exclude ASNs from
+              results. For example, `-174, 3356` excludes results from AS174, but includes
+              results from AS3356.
 
-          continent: Array of comma separated list of continents (alpha-2 continent codes). Start
-              with `-` to exclude from results. For example, `-EU,NA` excludes results from
-              Europe, but includes results from North America.
+          continent: Filters results by continent. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude continents from results. For example, `-EU,NA`
+              excludes results from EU, but includes results from NA.
 
           date_end: End of the date range (inclusive).
 
-          date_range: For example, use `7d` and `7dControl` to compare this week with the previous
-              week. Use this parameter or set specific start and end dates (`dateStart` and
-              `dateEnd` parameters).
+          date_range: Filters results by date range. For example, use `7d` and `7dcontrol` to compare
+              this week with the previous week. Use this parameter or set specific start and
+              end dates (`dateStart` and `dateEnd` parameters).
 
-          date_start: Array of datetimes to filter the start of a series.
+          date_start: Start of the date range.
 
-          format: Format results are returned in.
+          format: Format in which results will be returned.
 
-          limit: Limit the number of objects in the response.
+          limit: Limits the number of objects returned in the response.
 
-          location: Array of comma separated list of locations (alpha-2 country codes). Start with
-              `-` to exclude from results. For example, `-US,PT` excludes results from the US,
-              but includes results from PT.
+          location: Filters results by location. Specify a comma-separated list of alpha-2 codes.
+              Prefix with `-` to exclude locations from results. For example, `-US,PT`
+              excludes results from the US, but includes results from PT.
 
-          name: Array of names that will be used to name the series in responses.
+          name: Array of names used to label the series in the response.
 
           extra_headers: Send extra headers
 
@@ -388,11 +424,15 @@ class TopResourceWithRawResponse:
     def __init__(self, top: TopResource) -> None:
         self._top = top
 
-        self.bots = to_raw_response_wrapper(
-            top.bots,
+        self.bots = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                top.bots,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.categories = to_raw_response_wrapper(
-            top.categories,
+        self.categories = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                top.categories,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -400,11 +440,15 @@ class AsyncTopResourceWithRawResponse:
     def __init__(self, top: AsyncTopResource) -> None:
         self._top = top
 
-        self.bots = async_to_raw_response_wrapper(
-            top.bots,
+        self.bots = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                top.bots,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.categories = async_to_raw_response_wrapper(
-            top.categories,
+        self.categories = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                top.categories,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -412,11 +456,15 @@ class TopResourceWithStreamingResponse:
     def __init__(self, top: TopResource) -> None:
         self._top = top
 
-        self.bots = to_streamed_response_wrapper(
-            top.bots,
+        self.bots = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                top.bots,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.categories = to_streamed_response_wrapper(
-            top.categories,
+        self.categories = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                top.categories,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -424,9 +472,13 @@ class AsyncTopResourceWithStreamingResponse:
     def __init__(self, top: AsyncTopResource) -> None:
         self._top = top
 
-        self.bots = async_to_streamed_response_wrapper(
-            top.bots,
+        self.bots = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                top.bots,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.categories = async_to_streamed_response_wrapper(
-            top.categories,
+        self.categories = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                top.categories,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/radar/verified_bots/verified_bots.py b/src/cloudflare/resources/radar/verified_bots/verified_bots.py
index d2563c2d472..81deddd4897 100644
--- a/src/cloudflare/resources/radar/verified_bots/verified_bots.py
+++ b/src/cloudflare/resources/radar/verified_bots/verified_bots.py
@@ -23,10 +23,21 @@ def top(self) -> TopResource:
 
     @cached_property
     def with_raw_response(self) -> VerifiedBotsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return VerifiedBotsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> VerifiedBotsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return VerifiedBotsResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def top(self) -> AsyncTopResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncVerifiedBotsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncVerifiedBotsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncVerifiedBotsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncVerifiedBotsResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/rate_limits.py b/src/cloudflare/resources/rate_limits.py
index f7808df1006..31110953cfa 100644
--- a/src/cloudflare/resources/rate_limits.py
+++ b/src/cloudflare/resources/rate_limits.py
@@ -3,15 +3,12 @@
 from __future__ import annotations
 
 import typing_extensions
-from typing import Any, Type, cast
+from typing import Type, cast
 
 import httpx
 
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from .._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from .._utils import maybe_transform, async_maybe_transform
 from .._compat import cached_property
 from .._resource import SyncAPIResource, AsyncAPIResource
 from .._response import (
@@ -25,9 +22,6 @@
 from .._base_client import AsyncPaginator, make_request_options
 from ..types.rate_limits import rate_limit_edit_params, rate_limit_list_params, rate_limit_create_params
 from ..types.rate_limits.rate_limit import RateLimit
-from ..types.rate_limits.rate_limit_get_response import RateLimitGetResponse
-from ..types.rate_limits.rate_limit_edit_response import RateLimitEditResponse
-from ..types.rate_limits.rate_limit_create_response import RateLimitCreateResponse
 from ..types.rate_limits.rate_limit_delete_response import RateLimitDeleteResponse
 
 __all__ = ["RateLimitsResource", "AsyncRateLimitsResource"]
@@ -36,10 +30,21 @@
 class RateLimitsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RateLimitsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RateLimitsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RateLimitsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RateLimitsResourceWithStreamingResponse(self)
 
     @typing_extensions.deprecated(
@@ -47,23 +52,38 @@ def with_streaming_response(self) -> RateLimitsResourceWithStreamingResponse:
     )
     def create(
         self,
-        zone_identifier: str,
         *,
-        body: object,
+        zone_id: str,
+        action: rate_limit_create_params.Action,
+        match: rate_limit_create_params.Match,
+        period: float,
+        threshold: float,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RateLimitCreateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RateLimit:
         """Creates a new rate limit for a zone.
 
         Refer to the object definition for a list
         of required attributes.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
+
+          action: The action to perform when the threshold of matched traffic within the
+              configured period is exceeded.
+
+          match: Determines which traffic the rate limit counts towards the threshold.
+
+          period: The time in seconds (an integer value) to count matching traffic. If the count
+              exceeds the configured threshold within this period, Cloudflare will perform the
+              configured action.
+
+          threshold: The threshold that will trigger the configured mitigation action. Configure this
+              value along with the `period` property to establish a threshold per period.
 
           extra_headers: Send extra headers
 
@@ -73,24 +93,27 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        return cast(
-            RateLimitCreateResponse,
-            self._post(
-                f"/zones/{zone_identifier}/rate_limits",
-                body=maybe_transform(body, rate_limit_create_params.RateLimitCreateParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[RateLimitCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[RateLimitCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/rate_limits",
+            body=maybe_transform(
+                {
+                    "action": action,
+                    "match": match,
+                    "period": period,
+                    "threshold": threshold,
+                },
+                rate_limit_create_params.RateLimitCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RateLimit]._unwrapper,
             ),
+            cast_to=cast(Type[RateLimit], ResultWrapper[RateLimit]),
         )
 
     @typing_extensions.deprecated(
@@ -98,27 +121,27 @@ def create(
     )
     def list(
         self,
-        zone_identifier: str,
         *,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[RateLimit]:
         """
         Fetches the rate limits for a zone.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          page: The page number of paginated results.
+          page: Defines the page number of paginated results.
 
-          per_page: The maximum number of results per page. You can only set the value to `1` or to
-              a multiple of 5 such as `5`, `10`, `15`, or `20`.
+          per_page: Defines the maximum number of results per page. You can only set the value to
+              `1` or to a multiple of 5 such as `5`, `10`, `15`, or `20`.
 
           extra_headers: Send extra headers
 
@@ -128,10 +151,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/rate_limits",
+            f"/zones/{zone_id}/rate_limits",
             page=SyncV4PagePaginationArray[RateLimit],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -154,23 +177,23 @@ def list(
     )
     def delete(
         self,
-        id: str,
+        rate_limit_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RateLimitDeleteResponse:
         """
         Deletes an existing rate limit.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the rate limit.
+          rate_limit_id: Defines the unique identifier of the rate limit.
 
           extra_headers: Send extra headers
 
@@ -180,12 +203,12 @@ def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rate_limit_id:
+            raise ValueError(f"Expected a non-empty value for `rate_limit_id` but received {rate_limit_id!r}")
         return self._delete(
-            f"/zones/{zone_identifier}/rate_limits/{id}",
+            f"/zones/{zone_id}/rate_limits/{rate_limit_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -201,24 +224,39 @@ def delete(
     )
     def edit(
         self,
-        id: str,
+        rate_limit_id: str,
         *,
-        zone_identifier: str,
-        body: object,
+        zone_id: str,
+        action: rate_limit_edit_params.Action,
+        match: rate_limit_edit_params.Match,
+        period: float,
+        threshold: float,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RateLimitEditResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RateLimit:
         """
         Updates an existing rate limit.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the rate limit.
+          rate_limit_id: Defines the unique identifier of the rate limit.
+
+          action: The action to perform when the threshold of matched traffic within the
+              configured period is exceeded.
+
+          match: Determines which traffic the rate limit counts towards the threshold.
+
+          period: The time in seconds (an integer value) to count matching traffic. If the count
+              exceeds the configured threshold within this period, Cloudflare will perform the
+              configured action.
+
+          threshold: The threshold that will trigger the configured mitigation action. Configure this
+              value along with the `period` property to establish a threshold per period.
 
           extra_headers: Send extra headers
 
@@ -228,26 +266,29 @@ def edit(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
-        return cast(
-            RateLimitEditResponse,
-            self._put(
-                f"/zones/{zone_identifier}/rate_limits/{id}",
-                body=maybe_transform(body, rate_limit_edit_params.RateLimitEditParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[RateLimitEditResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[RateLimitEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rate_limit_id:
+            raise ValueError(f"Expected a non-empty value for `rate_limit_id` but received {rate_limit_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/rate_limits/{rate_limit_id}",
+            body=maybe_transform(
+                {
+                    "action": action,
+                    "match": match,
+                    "period": period,
+                    "threshold": threshold,
+                },
+                rate_limit_edit_params.RateLimitEditParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RateLimit]._unwrapper,
+            ),
+            cast_to=cast(Type[RateLimit], ResultWrapper[RateLimit]),
         )
 
     @typing_extensions.deprecated(
@@ -255,23 +296,23 @@ def edit(
     )
     def get(
         self,
-        id: str,
+        rate_limit_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RateLimitGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RateLimit:
         """
         Fetches the details of a rate limit.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the rate limit.
+          rate_limit_id: Defines the unique identifier of the rate limit.
 
           extra_headers: Send extra headers
 
@@ -281,35 +322,41 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
-        return cast(
-            RateLimitGetResponse,
-            self._get(
-                f"/zones/{zone_identifier}/rate_limits/{id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[RateLimitGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[RateLimitGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rate_limit_id:
+            raise ValueError(f"Expected a non-empty value for `rate_limit_id` but received {rate_limit_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/rate_limits/{rate_limit_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RateLimit]._unwrapper,
             ),
+            cast_to=cast(Type[RateLimit], ResultWrapper[RateLimit]),
         )
 
 
 class AsyncRateLimitsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRateLimitsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRateLimitsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRateLimitsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRateLimitsResourceWithStreamingResponse(self)
 
     @typing_extensions.deprecated(
@@ -317,23 +364,38 @@ def with_streaming_response(self) -> AsyncRateLimitsResourceWithStreamingRespons
     )
     async def create(
         self,
-        zone_identifier: str,
         *,
-        body: object,
+        zone_id: str,
+        action: rate_limit_create_params.Action,
+        match: rate_limit_create_params.Match,
+        period: float,
+        threshold: float,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RateLimitCreateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RateLimit:
         """Creates a new rate limit for a zone.
 
         Refer to the object definition for a list
         of required attributes.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
+
+          action: The action to perform when the threshold of matched traffic within the
+              configured period is exceeded.
+
+          match: Determines which traffic the rate limit counts towards the threshold.
+
+          period: The time in seconds (an integer value) to count matching traffic. If the count
+              exceeds the configured threshold within this period, Cloudflare will perform the
+              configured action.
+
+          threshold: The threshold that will trigger the configured mitigation action. Configure this
+              value along with the `period` property to establish a threshold per period.
 
           extra_headers: Send extra headers
 
@@ -343,24 +405,27 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        return cast(
-            RateLimitCreateResponse,
-            await self._post(
-                f"/zones/{zone_identifier}/rate_limits",
-                body=await async_maybe_transform(body, rate_limit_create_params.RateLimitCreateParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[RateLimitCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[RateLimitCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/rate_limits",
+            body=await async_maybe_transform(
+                {
+                    "action": action,
+                    "match": match,
+                    "period": period,
+                    "threshold": threshold,
+                },
+                rate_limit_create_params.RateLimitCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RateLimit]._unwrapper,
             ),
+            cast_to=cast(Type[RateLimit], ResultWrapper[RateLimit]),
         )
 
     @typing_extensions.deprecated(
@@ -368,27 +433,27 @@ async def create(
     )
     def list(
         self,
-        zone_identifier: str,
         *,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[RateLimit, AsyncV4PagePaginationArray[RateLimit]]:
         """
         Fetches the rate limits for a zone.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          page: The page number of paginated results.
+          page: Defines the page number of paginated results.
 
-          per_page: The maximum number of results per page. You can only set the value to `1` or to
-              a multiple of 5 such as `5`, `10`, `15`, or `20`.
+          per_page: Defines the maximum number of results per page. You can only set the value to
+              `1` or to a multiple of 5 such as `5`, `10`, `15`, or `20`.
 
           extra_headers: Send extra headers
 
@@ -398,10 +463,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/rate_limits",
+            f"/zones/{zone_id}/rate_limits",
             page=AsyncV4PagePaginationArray[RateLimit],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -424,23 +489,23 @@ def list(
     )
     async def delete(
         self,
-        id: str,
+        rate_limit_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RateLimitDeleteResponse:
         """
         Deletes an existing rate limit.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the rate limit.
+          rate_limit_id: Defines the unique identifier of the rate limit.
 
           extra_headers: Send extra headers
 
@@ -450,12 +515,12 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rate_limit_id:
+            raise ValueError(f"Expected a non-empty value for `rate_limit_id` but received {rate_limit_id!r}")
         return await self._delete(
-            f"/zones/{zone_identifier}/rate_limits/{id}",
+            f"/zones/{zone_id}/rate_limits/{rate_limit_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -471,24 +536,39 @@ async def delete(
     )
     async def edit(
         self,
-        id: str,
+        rate_limit_id: str,
         *,
-        zone_identifier: str,
-        body: object,
+        zone_id: str,
+        action: rate_limit_edit_params.Action,
+        match: rate_limit_edit_params.Match,
+        period: float,
+        threshold: float,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RateLimitEditResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RateLimit:
         """
         Updates an existing rate limit.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the rate limit.
+          rate_limit_id: Defines the unique identifier of the rate limit.
+
+          action: The action to perform when the threshold of matched traffic within the
+              configured period is exceeded.
+
+          match: Determines which traffic the rate limit counts towards the threshold.
+
+          period: The time in seconds (an integer value) to count matching traffic. If the count
+              exceeds the configured threshold within this period, Cloudflare will perform the
+              configured action.
+
+          threshold: The threshold that will trigger the configured mitigation action. Configure this
+              value along with the `period` property to establish a threshold per period.
 
           extra_headers: Send extra headers
 
@@ -498,26 +578,29 @@ async def edit(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
-        return cast(
-            RateLimitEditResponse,
-            await self._put(
-                f"/zones/{zone_identifier}/rate_limits/{id}",
-                body=await async_maybe_transform(body, rate_limit_edit_params.RateLimitEditParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[RateLimitEditResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[RateLimitEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rate_limit_id:
+            raise ValueError(f"Expected a non-empty value for `rate_limit_id` but received {rate_limit_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/rate_limits/{rate_limit_id}",
+            body=await async_maybe_transform(
+                {
+                    "action": action,
+                    "match": match,
+                    "period": period,
+                    "threshold": threshold,
+                },
+                rate_limit_edit_params.RateLimitEditParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RateLimit]._unwrapper,
+            ),
+            cast_to=cast(Type[RateLimit], ResultWrapper[RateLimit]),
         )
 
     @typing_extensions.deprecated(
@@ -525,23 +608,23 @@ async def edit(
     )
     async def get(
         self,
-        id: str,
+        rate_limit_id: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RateLimitGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RateLimit:
         """
         Fetches the details of a rate limit.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Defines an identifier.
 
-          id: The unique identifier of the rate limit.
+          rate_limit_id: Defines the unique identifier of the rate limit.
 
           extra_headers: Send extra headers
 
@@ -551,25 +634,20 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        if not id:
-            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
-        return cast(
-            RateLimitGetResponse,
-            await self._get(
-                f"/zones/{zone_identifier}/rate_limits/{id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[RateLimitGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[RateLimitGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rate_limit_id:
+            raise ValueError(f"Expected a non-empty value for `rate_limit_id` but received {rate_limit_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/rate_limits/{rate_limit_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RateLimit]._unwrapper,
             ),
+            cast_to=cast(Type[RateLimit], ResultWrapper[RateLimit]),
         )
 
 
@@ -579,27 +657,27 @@ def __init__(self, rate_limits: RateLimitsResource) -> None:
 
         self.create = (  # pyright: ignore[reportDeprecated]
             to_raw_response_wrapper(
-                rate_limits.create  # pyright: ignore[reportDeprecated],
+                rate_limits.create,  # pyright: ignore[reportDeprecated],
             )
         )
         self.list = (  # pyright: ignore[reportDeprecated]
             to_raw_response_wrapper(
-                rate_limits.list  # pyright: ignore[reportDeprecated],
+                rate_limits.list,  # pyright: ignore[reportDeprecated],
             )
         )
         self.delete = (  # pyright: ignore[reportDeprecated]
             to_raw_response_wrapper(
-                rate_limits.delete  # pyright: ignore[reportDeprecated],
+                rate_limits.delete,  # pyright: ignore[reportDeprecated],
             )
         )
         self.edit = (  # pyright: ignore[reportDeprecated]
             to_raw_response_wrapper(
-                rate_limits.edit  # pyright: ignore[reportDeprecated],
+                rate_limits.edit,  # pyright: ignore[reportDeprecated],
             )
         )
         self.get = (  # pyright: ignore[reportDeprecated]
             to_raw_response_wrapper(
-                rate_limits.get  # pyright: ignore[reportDeprecated],
+                rate_limits.get,  # pyright: ignore[reportDeprecated],
             )
         )
 
@@ -610,27 +688,27 @@ def __init__(self, rate_limits: AsyncRateLimitsResource) -> None:
 
         self.create = (  # pyright: ignore[reportDeprecated]
             async_to_raw_response_wrapper(
-                rate_limits.create  # pyright: ignore[reportDeprecated],
+                rate_limits.create,  # pyright: ignore[reportDeprecated],
             )
         )
         self.list = (  # pyright: ignore[reportDeprecated]
             async_to_raw_response_wrapper(
-                rate_limits.list  # pyright: ignore[reportDeprecated],
+                rate_limits.list,  # pyright: ignore[reportDeprecated],
             )
         )
         self.delete = (  # pyright: ignore[reportDeprecated]
             async_to_raw_response_wrapper(
-                rate_limits.delete  # pyright: ignore[reportDeprecated],
+                rate_limits.delete,  # pyright: ignore[reportDeprecated],
             )
         )
         self.edit = (  # pyright: ignore[reportDeprecated]
             async_to_raw_response_wrapper(
-                rate_limits.edit  # pyright: ignore[reportDeprecated],
+                rate_limits.edit,  # pyright: ignore[reportDeprecated],
             )
         )
         self.get = (  # pyright: ignore[reportDeprecated]
             async_to_raw_response_wrapper(
-                rate_limits.get  # pyright: ignore[reportDeprecated],
+                rate_limits.get,  # pyright: ignore[reportDeprecated],
             )
         )
 
@@ -641,27 +719,27 @@ def __init__(self, rate_limits: RateLimitsResource) -> None:
 
         self.create = (  # pyright: ignore[reportDeprecated]
             to_streamed_response_wrapper(
-                rate_limits.create  # pyright: ignore[reportDeprecated],
+                rate_limits.create,  # pyright: ignore[reportDeprecated],
             )
         )
         self.list = (  # pyright: ignore[reportDeprecated]
             to_streamed_response_wrapper(
-                rate_limits.list  # pyright: ignore[reportDeprecated],
+                rate_limits.list,  # pyright: ignore[reportDeprecated],
             )
         )
         self.delete = (  # pyright: ignore[reportDeprecated]
             to_streamed_response_wrapper(
-                rate_limits.delete  # pyright: ignore[reportDeprecated],
+                rate_limits.delete,  # pyright: ignore[reportDeprecated],
             )
         )
         self.edit = (  # pyright: ignore[reportDeprecated]
             to_streamed_response_wrapper(
-                rate_limits.edit  # pyright: ignore[reportDeprecated],
+                rate_limits.edit,  # pyright: ignore[reportDeprecated],
             )
         )
         self.get = (  # pyright: ignore[reportDeprecated]
             to_streamed_response_wrapper(
-                rate_limits.get  # pyright: ignore[reportDeprecated],
+                rate_limits.get,  # pyright: ignore[reportDeprecated],
             )
         )
 
@@ -672,26 +750,26 @@ def __init__(self, rate_limits: AsyncRateLimitsResource) -> None:
 
         self.create = (  # pyright: ignore[reportDeprecated]
             async_to_streamed_response_wrapper(
-                rate_limits.create  # pyright: ignore[reportDeprecated],
+                rate_limits.create,  # pyright: ignore[reportDeprecated],
             )
         )
         self.list = (  # pyright: ignore[reportDeprecated]
             async_to_streamed_response_wrapper(
-                rate_limits.list  # pyright: ignore[reportDeprecated],
+                rate_limits.list,  # pyright: ignore[reportDeprecated],
             )
         )
         self.delete = (  # pyright: ignore[reportDeprecated]
             async_to_streamed_response_wrapper(
-                rate_limits.delete  # pyright: ignore[reportDeprecated],
+                rate_limits.delete,  # pyright: ignore[reportDeprecated],
             )
         )
         self.edit = (  # pyright: ignore[reportDeprecated]
             async_to_streamed_response_wrapper(
-                rate_limits.edit  # pyright: ignore[reportDeprecated],
+                rate_limits.edit,  # pyright: ignore[reportDeprecated],
             )
         )
         self.get = (  # pyright: ignore[reportDeprecated]
             async_to_streamed_response_wrapper(
-                rate_limits.get  # pyright: ignore[reportDeprecated],
+                rate_limits.get,  # pyright: ignore[reportDeprecated],
             )
         )
diff --git a/src/cloudflare/resources/rate_plans.py b/src/cloudflare/resources/rate_plans.py
deleted file mode 100644
index 76a97e6d87e..00000000000
--- a/src/cloudflare/resources/rate_plans.py
+++ /dev/null
@@ -1,156 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Optional, cast
-
-import httpx
-
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._compat import cached_property
-from .._resource import SyncAPIResource, AsyncAPIResource
-from .._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from .._wrappers import ResultWrapper
-from .._base_client import make_request_options
-from ..types.rate_plans.rate_plan_get_response import RatePlanGetResponse
-
-__all__ = ["RatePlansResource", "AsyncRatePlansResource"]
-
-
-class RatePlansResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> RatePlansResourceWithRawResponse:
-        return RatePlansResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> RatePlansResourceWithStreamingResponse:
-        return RatePlansResourceWithStreamingResponse(self)
-
-    def get(
-        self,
-        zone_identifier: str,
-        *,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RatePlanGetResponse]:
-        """
-        Lists all rate plans the zone can subscribe to.
-
-        Args:
-          zone_identifier: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        return self._get(
-            f"/zones/{zone_identifier}/available_rate_plans",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RatePlanGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[RatePlanGetResponse]], ResultWrapper[RatePlanGetResponse]),
-        )
-
-
-class AsyncRatePlansResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncRatePlansResourceWithRawResponse:
-        return AsyncRatePlansResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncRatePlansResourceWithStreamingResponse:
-        return AsyncRatePlansResourceWithStreamingResponse(self)
-
-    async def get(
-        self,
-        zone_identifier: str,
-        *,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RatePlanGetResponse]:
-        """
-        Lists all rate plans the zone can subscribe to.
-
-        Args:
-          zone_identifier: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
-        return await self._get(
-            f"/zones/{zone_identifier}/available_rate_plans",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RatePlanGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[RatePlanGetResponse]], ResultWrapper[RatePlanGetResponse]),
-        )
-
-
-class RatePlansResourceWithRawResponse:
-    def __init__(self, rate_plans: RatePlansResource) -> None:
-        self._rate_plans = rate_plans
-
-        self.get = to_raw_response_wrapper(
-            rate_plans.get,
-        )
-
-
-class AsyncRatePlansResourceWithRawResponse:
-    def __init__(self, rate_plans: AsyncRatePlansResource) -> None:
-        self._rate_plans = rate_plans
-
-        self.get = async_to_raw_response_wrapper(
-            rate_plans.get,
-        )
-
-
-class RatePlansResourceWithStreamingResponse:
-    def __init__(self, rate_plans: RatePlansResource) -> None:
-        self._rate_plans = rate_plans
-
-        self.get = to_streamed_response_wrapper(
-            rate_plans.get,
-        )
-
-
-class AsyncRatePlansResourceWithStreamingResponse:
-    def __init__(self, rate_plans: AsyncRatePlansResource) -> None:
-        self._rate_plans = rate_plans
-
-        self.get = async_to_streamed_response_wrapper(
-            rate_plans.get,
-        )
diff --git a/src/cloudflare/resources/realtime_kit/__init__.py b/src/cloudflare/resources/realtime_kit/__init__.py
new file mode 100644
index 00000000000..27bc24f0c63
--- /dev/null
+++ b/src/cloudflare/resources/realtime_kit/__init__.py
@@ -0,0 +1,145 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .apps import (
+    AppsResource,
+    AsyncAppsResource,
+    AppsResourceWithRawResponse,
+    AsyncAppsResourceWithRawResponse,
+    AppsResourceWithStreamingResponse,
+    AsyncAppsResourceWithStreamingResponse,
+)
+from .presets import (
+    PresetsResource,
+    AsyncPresetsResource,
+    PresetsResourceWithRawResponse,
+    AsyncPresetsResourceWithRawResponse,
+    PresetsResourceWithStreamingResponse,
+    AsyncPresetsResourceWithStreamingResponse,
+)
+from .meetings import (
+    MeetingsResource,
+    AsyncMeetingsResource,
+    MeetingsResourceWithRawResponse,
+    AsyncMeetingsResourceWithRawResponse,
+    MeetingsResourceWithStreamingResponse,
+    AsyncMeetingsResourceWithStreamingResponse,
+)
+from .sessions import (
+    SessionsResource,
+    AsyncSessionsResource,
+    SessionsResourceWithRawResponse,
+    AsyncSessionsResourceWithRawResponse,
+    SessionsResourceWithStreamingResponse,
+    AsyncSessionsResourceWithStreamingResponse,
+)
+from .webhooks import (
+    WebhooksResource,
+    AsyncWebhooksResource,
+    WebhooksResourceWithRawResponse,
+    AsyncWebhooksResourceWithRawResponse,
+    WebhooksResourceWithStreamingResponse,
+    AsyncWebhooksResourceWithStreamingResponse,
+)
+from .analytics import (
+    AnalyticsResource,
+    AsyncAnalyticsResource,
+    AnalyticsResourceWithRawResponse,
+    AsyncAnalyticsResourceWithRawResponse,
+    AnalyticsResourceWithStreamingResponse,
+    AsyncAnalyticsResourceWithStreamingResponse,
+)
+from .recordings import (
+    RecordingsResource,
+    AsyncRecordingsResource,
+    RecordingsResourceWithRawResponse,
+    AsyncRecordingsResourceWithRawResponse,
+    RecordingsResourceWithStreamingResponse,
+    AsyncRecordingsResourceWithStreamingResponse,
+)
+from .livestreams import (
+    LivestreamsResource,
+    AsyncLivestreamsResource,
+    LivestreamsResourceWithRawResponse,
+    AsyncLivestreamsResourceWithRawResponse,
+    LivestreamsResourceWithStreamingResponse,
+    AsyncLivestreamsResourceWithStreamingResponse,
+)
+from .realtime_kit import (
+    RealtimeKitResource,
+    AsyncRealtimeKitResource,
+    RealtimeKitResourceWithRawResponse,
+    AsyncRealtimeKitResourceWithRawResponse,
+    RealtimeKitResourceWithStreamingResponse,
+    AsyncRealtimeKitResourceWithStreamingResponse,
+)
+from .active_session import (
+    ActiveSessionResource,
+    AsyncActiveSessionResource,
+    ActiveSessionResourceWithRawResponse,
+    AsyncActiveSessionResourceWithRawResponse,
+    ActiveSessionResourceWithStreamingResponse,
+    AsyncActiveSessionResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "AppsResource",
+    "AsyncAppsResource",
+    "AppsResourceWithRawResponse",
+    "AsyncAppsResourceWithRawResponse",
+    "AppsResourceWithStreamingResponse",
+    "AsyncAppsResourceWithStreamingResponse",
+    "MeetingsResource",
+    "AsyncMeetingsResource",
+    "MeetingsResourceWithRawResponse",
+    "AsyncMeetingsResourceWithRawResponse",
+    "MeetingsResourceWithStreamingResponse",
+    "AsyncMeetingsResourceWithStreamingResponse",
+    "PresetsResource",
+    "AsyncPresetsResource",
+    "PresetsResourceWithRawResponse",
+    "AsyncPresetsResourceWithRawResponse",
+    "PresetsResourceWithStreamingResponse",
+    "AsyncPresetsResourceWithStreamingResponse",
+    "SessionsResource",
+    "AsyncSessionsResource",
+    "SessionsResourceWithRawResponse",
+    "AsyncSessionsResourceWithRawResponse",
+    "SessionsResourceWithStreamingResponse",
+    "AsyncSessionsResourceWithStreamingResponse",
+    "RecordingsResource",
+    "AsyncRecordingsResource",
+    "RecordingsResourceWithRawResponse",
+    "AsyncRecordingsResourceWithRawResponse",
+    "RecordingsResourceWithStreamingResponse",
+    "AsyncRecordingsResourceWithStreamingResponse",
+    "WebhooksResource",
+    "AsyncWebhooksResource",
+    "WebhooksResourceWithRawResponse",
+    "AsyncWebhooksResourceWithRawResponse",
+    "WebhooksResourceWithStreamingResponse",
+    "AsyncWebhooksResourceWithStreamingResponse",
+    "ActiveSessionResource",
+    "AsyncActiveSessionResource",
+    "ActiveSessionResourceWithRawResponse",
+    "AsyncActiveSessionResourceWithRawResponse",
+    "ActiveSessionResourceWithStreamingResponse",
+    "AsyncActiveSessionResourceWithStreamingResponse",
+    "LivestreamsResource",
+    "AsyncLivestreamsResource",
+    "LivestreamsResourceWithRawResponse",
+    "AsyncLivestreamsResourceWithRawResponse",
+    "LivestreamsResourceWithStreamingResponse",
+    "AsyncLivestreamsResourceWithStreamingResponse",
+    "AnalyticsResource",
+    "AsyncAnalyticsResource",
+    "AnalyticsResourceWithRawResponse",
+    "AsyncAnalyticsResourceWithRawResponse",
+    "AnalyticsResourceWithStreamingResponse",
+    "AsyncAnalyticsResourceWithStreamingResponse",
+    "RealtimeKitResource",
+    "AsyncRealtimeKitResource",
+    "RealtimeKitResourceWithRawResponse",
+    "AsyncRealtimeKitResourceWithRawResponse",
+    "RealtimeKitResourceWithStreamingResponse",
+    "AsyncRealtimeKitResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/realtime_kit/active_session.py b/src/cloudflare/resources/realtime_kit/active_session.py
new file mode 100644
index 00000000000..e209bbf510e
--- /dev/null
+++ b/src/cloudflare/resources/realtime_kit/active_session.py
@@ -0,0 +1,544 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.realtime_kit import active_session_create_poll_params, active_session_kick_participants_params
+from ...types.realtime_kit.active_session_create_poll_response import ActiveSessionCreatePollResponse
+from ...types.realtime_kit.active_session_kick_participants_response import ActiveSessionKickParticipantsResponse
+from ...types.realtime_kit.active_session_get_active_session_response import ActiveSessionGetActiveSessionResponse
+from ...types.realtime_kit.active_session_kick_all_participants_response import ActiveSessionKickAllParticipantsResponse
+
+__all__ = ["ActiveSessionResource", "AsyncActiveSessionResource"]
+
+
+class ActiveSessionResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ActiveSessionResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ActiveSessionResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ActiveSessionResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ActiveSessionResourceWithStreamingResponse(self)
+
+    def create_poll(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        options: SequenceNotStr[str],
+        question: str,
+        anonymous: bool | Omit = omit,
+        hide_votes: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ActiveSessionCreatePollResponse:
+        """
+        Creates a new poll in an active session for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          options: Different options for the question
+
+          question: Question of the poll
+
+          anonymous: if voters on a poll are anonymous
+
+          hide_votes: if votes on an option are visible before a person votes
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-session/poll",
+            body=maybe_transform(
+                {
+                    "options": options,
+                    "question": question,
+                    "anonymous": anonymous,
+                    "hide_votes": hide_votes,
+                },
+                active_session_create_poll_params.ActiveSessionCreatePollParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ActiveSessionCreatePollResponse,
+        )
+
+    def get_active_session(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ActiveSessionGetActiveSessionResponse:
+        """
+        Returns details of an ongoing active session for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-session",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ActiveSessionGetActiveSessionResponse,
+        )
+
+    def kick_all_participants(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ActiveSessionKickAllParticipantsResponse:
+        """
+        Kicks all participants from an active session for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-session/kick-all",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ActiveSessionKickAllParticipantsResponse,
+        )
+
+    def kick_participants(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        custom_participant_ids: SequenceNotStr[str],
+        participant_ids: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ActiveSessionKickParticipantsResponse:
+        """
+        Kicks one or more participants from an active session using user ID or custom
+        participant ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-session/kick",
+            body=maybe_transform(
+                {
+                    "custom_participant_ids": custom_participant_ids,
+                    "participant_ids": participant_ids,
+                },
+                active_session_kick_participants_params.ActiveSessionKickParticipantsParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ActiveSessionKickParticipantsResponse,
+        )
+
+
+class AsyncActiveSessionResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncActiveSessionResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncActiveSessionResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncActiveSessionResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncActiveSessionResourceWithStreamingResponse(self)
+
+    async def create_poll(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        options: SequenceNotStr[str],
+        question: str,
+        anonymous: bool | Omit = omit,
+        hide_votes: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ActiveSessionCreatePollResponse:
+        """
+        Creates a new poll in an active session for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          options: Different options for the question
+
+          question: Question of the poll
+
+          anonymous: if voters on a poll are anonymous
+
+          hide_votes: if votes on an option are visible before a person votes
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-session/poll",
+            body=await async_maybe_transform(
+                {
+                    "options": options,
+                    "question": question,
+                    "anonymous": anonymous,
+                    "hide_votes": hide_votes,
+                },
+                active_session_create_poll_params.ActiveSessionCreatePollParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ActiveSessionCreatePollResponse,
+        )
+
+    async def get_active_session(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ActiveSessionGetActiveSessionResponse:
+        """
+        Returns details of an ongoing active session for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-session",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ActiveSessionGetActiveSessionResponse,
+        )
+
+    async def kick_all_participants(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ActiveSessionKickAllParticipantsResponse:
+        """
+        Kicks all participants from an active session for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-session/kick-all",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ActiveSessionKickAllParticipantsResponse,
+        )
+
+    async def kick_participants(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        custom_participant_ids: SequenceNotStr[str],
+        participant_ids: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ActiveSessionKickParticipantsResponse:
+        """
+        Kicks one or more participants from an active session using user ID or custom
+        participant ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-session/kick",
+            body=await async_maybe_transform(
+                {
+                    "custom_participant_ids": custom_participant_ids,
+                    "participant_ids": participant_ids,
+                },
+                active_session_kick_participants_params.ActiveSessionKickParticipantsParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ActiveSessionKickParticipantsResponse,
+        )
+
+
+class ActiveSessionResourceWithRawResponse:
+    def __init__(self, active_session: ActiveSessionResource) -> None:
+        self._active_session = active_session
+
+        self.create_poll = to_raw_response_wrapper(
+            active_session.create_poll,
+        )
+        self.get_active_session = to_raw_response_wrapper(
+            active_session.get_active_session,
+        )
+        self.kick_all_participants = to_raw_response_wrapper(
+            active_session.kick_all_participants,
+        )
+        self.kick_participants = to_raw_response_wrapper(
+            active_session.kick_participants,
+        )
+
+
+class AsyncActiveSessionResourceWithRawResponse:
+    def __init__(self, active_session: AsyncActiveSessionResource) -> None:
+        self._active_session = active_session
+
+        self.create_poll = async_to_raw_response_wrapper(
+            active_session.create_poll,
+        )
+        self.get_active_session = async_to_raw_response_wrapper(
+            active_session.get_active_session,
+        )
+        self.kick_all_participants = async_to_raw_response_wrapper(
+            active_session.kick_all_participants,
+        )
+        self.kick_participants = async_to_raw_response_wrapper(
+            active_session.kick_participants,
+        )
+
+
+class ActiveSessionResourceWithStreamingResponse:
+    def __init__(self, active_session: ActiveSessionResource) -> None:
+        self._active_session = active_session
+
+        self.create_poll = to_streamed_response_wrapper(
+            active_session.create_poll,
+        )
+        self.get_active_session = to_streamed_response_wrapper(
+            active_session.get_active_session,
+        )
+        self.kick_all_participants = to_streamed_response_wrapper(
+            active_session.kick_all_participants,
+        )
+        self.kick_participants = to_streamed_response_wrapper(
+            active_session.kick_participants,
+        )
+
+
+class AsyncActiveSessionResourceWithStreamingResponse:
+    def __init__(self, active_session: AsyncActiveSessionResource) -> None:
+        self._active_session = active_session
+
+        self.create_poll = async_to_streamed_response_wrapper(
+            active_session.create_poll,
+        )
+        self.get_active_session = async_to_streamed_response_wrapper(
+            active_session.get_active_session,
+        )
+        self.kick_all_participants = async_to_streamed_response_wrapper(
+            active_session.kick_all_participants,
+        )
+        self.kick_participants = async_to_streamed_response_wrapper(
+            active_session.kick_participants,
+        )
diff --git a/src/cloudflare/resources/realtime_kit/analytics.py b/src/cloudflare/resources/realtime_kit/analytics.py
new file mode 100644
index 00000000000..7ddd06c737c
--- /dev/null
+++ b/src/cloudflare/resources/realtime_kit/analytics.py
@@ -0,0 +1,215 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.realtime_kit import analytics_get_org_analytics_params
+from ...types.realtime_kit.analytics_get_org_analytics_response import AnalyticsGetOrgAnalyticsResponse
+
+__all__ = ["AnalyticsResource", "AsyncAnalyticsResource"]
+
+
+class AnalyticsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AnalyticsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AnalyticsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AnalyticsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AnalyticsResourceWithStreamingResponse(self)
+
+    def get_org_analytics(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        end_date: str | Omit = omit,
+        start_date: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AnalyticsGetOrgAnalyticsResponse:
+        """
+        Returns day-wise session and recording analytics data of an App for the
+        specified time range start_date to end_date. If start_date and end_date are not
+        provided, the default time range is set from 30 days ago to the current date.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          end_date: end date in YYYY-MM-DD format
+
+          start_date: start date in YYYY-MM-DD format
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/analytics/daywise",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "end_date": end_date,
+                        "start_date": start_date,
+                    },
+                    analytics_get_org_analytics_params.AnalyticsGetOrgAnalyticsParams,
+                ),
+            ),
+            cast_to=AnalyticsGetOrgAnalyticsResponse,
+        )
+
+
+class AsyncAnalyticsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncAnalyticsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAnalyticsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAnalyticsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAnalyticsResourceWithStreamingResponse(self)
+
+    async def get_org_analytics(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        end_date: str | Omit = omit,
+        start_date: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AnalyticsGetOrgAnalyticsResponse:
+        """
+        Returns day-wise session and recording analytics data of an App for the
+        specified time range start_date to end_date. If start_date and end_date are not
+        provided, the default time range is set from 30 days ago to the current date.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          end_date: end date in YYYY-MM-DD format
+
+          start_date: start date in YYYY-MM-DD format
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/analytics/daywise",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "end_date": end_date,
+                        "start_date": start_date,
+                    },
+                    analytics_get_org_analytics_params.AnalyticsGetOrgAnalyticsParams,
+                ),
+            ),
+            cast_to=AnalyticsGetOrgAnalyticsResponse,
+        )
+
+
+class AnalyticsResourceWithRawResponse:
+    def __init__(self, analytics: AnalyticsResource) -> None:
+        self._analytics = analytics
+
+        self.get_org_analytics = to_raw_response_wrapper(
+            analytics.get_org_analytics,
+        )
+
+
+class AsyncAnalyticsResourceWithRawResponse:
+    def __init__(self, analytics: AsyncAnalyticsResource) -> None:
+        self._analytics = analytics
+
+        self.get_org_analytics = async_to_raw_response_wrapper(
+            analytics.get_org_analytics,
+        )
+
+
+class AnalyticsResourceWithStreamingResponse:
+    def __init__(self, analytics: AnalyticsResource) -> None:
+        self._analytics = analytics
+
+        self.get_org_analytics = to_streamed_response_wrapper(
+            analytics.get_org_analytics,
+        )
+
+
+class AsyncAnalyticsResourceWithStreamingResponse:
+    def __init__(self, analytics: AsyncAnalyticsResource) -> None:
+        self._analytics = analytics
+
+        self.get_org_analytics = async_to_streamed_response_wrapper(
+            analytics.get_org_analytics,
+        )
diff --git a/src/cloudflare/resources/realtime_kit/apps.py b/src/cloudflare/resources/realtime_kit/apps.py
new file mode 100644
index 00000000000..c172fa1992c
--- /dev/null
+++ b/src/cloudflare/resources/realtime_kit/apps.py
@@ -0,0 +1,252 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.realtime_kit import app_post_params
+from ...types.realtime_kit.app_get_response import AppGetResponse
+from ...types.realtime_kit.app_post_response import AppPostResponse
+
+__all__ = ["AppsResource", "AsyncAppsResource"]
+
+
+class AppsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AppsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AppsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AppsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AppsResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AppGetResponse:
+        """
+        Fetch all apps for your account
+
+        Args:
+          account_id: The account identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/apps",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=AppGetResponse,
+        )
+
+    def post(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AppPostResponse:
+        """
+        Create new app for your account
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/realtime/kit/apps",
+            body=maybe_transform({"name": name}, app_post_params.AppPostParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=AppPostResponse,
+        )
+
+
+class AsyncAppsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncAppsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAppsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAppsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAppsResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AppGetResponse:
+        """
+        Fetch all apps for your account
+
+        Args:
+          account_id: The account identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/apps",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=AppGetResponse,
+        )
+
+    async def post(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AppPostResponse:
+        """
+        Create new app for your account
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/realtime/kit/apps",
+            body=await async_maybe_transform({"name": name}, app_post_params.AppPostParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=AppPostResponse,
+        )
+
+
+class AppsResourceWithRawResponse:
+    def __init__(self, apps: AppsResource) -> None:
+        self._apps = apps
+
+        self.get = to_raw_response_wrapper(
+            apps.get,
+        )
+        self.post = to_raw_response_wrapper(
+            apps.post,
+        )
+
+
+class AsyncAppsResourceWithRawResponse:
+    def __init__(self, apps: AsyncAppsResource) -> None:
+        self._apps = apps
+
+        self.get = async_to_raw_response_wrapper(
+            apps.get,
+        )
+        self.post = async_to_raw_response_wrapper(
+            apps.post,
+        )
+
+
+class AppsResourceWithStreamingResponse:
+    def __init__(self, apps: AppsResource) -> None:
+        self._apps = apps
+
+        self.get = to_streamed_response_wrapper(
+            apps.get,
+        )
+        self.post = to_streamed_response_wrapper(
+            apps.post,
+        )
+
+
+class AsyncAppsResourceWithStreamingResponse:
+    def __init__(self, apps: AsyncAppsResource) -> None:
+        self._apps = apps
+
+        self.get = async_to_streamed_response_wrapper(
+            apps.get,
+        )
+        self.post = async_to_streamed_response_wrapper(
+            apps.post,
+        )
diff --git a/src/cloudflare/resources/realtime_kit/livestreams.py b/src/cloudflare/resources/realtime_kit/livestreams.py
new file mode 100644
index 00000000000..4f1958cff4c
--- /dev/null
+++ b/src/cloudflare/resources/realtime_kit/livestreams.py
@@ -0,0 +1,1319 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.realtime_kit import (
+    livestream_get_org_analytics_params,
+    livestream_get_all_livestreams_params,
+    livestream_create_independent_livestream_params,
+    livestream_start_livestreaming_a_meeting_params,
+    livestream_get_livestream_analytics_complete_params,
+    livestream_get_livestream_session_for_livestream_id_params,
+)
+from ...types.realtime_kit.livestream_get_org_analytics_response import LivestreamGetOrgAnalyticsResponse
+from ...types.realtime_kit.livestream_get_all_livestreams_response import LivestreamGetAllLivestreamsResponse
+from ...types.realtime_kit.livestream_stop_livestreaming_a_meeting_response import (
+    LivestreamStopLivestreamingAMeetingResponse,
+)
+from ...types.realtime_kit.livestream_create_independent_livestream_response import (
+    LivestreamCreateIndependentLivestreamResponse,
+)
+from ...types.realtime_kit.livestream_start_livestreaming_a_meeting_response import (
+    LivestreamStartLivestreamingAMeetingResponse,
+)
+from ...types.realtime_kit.livestream_get_meeting_active_livestreams_response import (
+    LivestreamGetMeetingActiveLivestreamsResponse,
+)
+from ...types.realtime_kit.livestream_get_livestream_analytics_complete_response import (
+    LivestreamGetLivestreamAnalyticsCompleteResponse,
+)
+from ...types.realtime_kit.livestream_get_active_livestreams_for_livestream_id_response import (
+    LivestreamGetActiveLivestreamsForLivestreamIDResponse,
+)
+from ...types.realtime_kit.livestream_get_livestream_session_for_livestream_id_response import (
+    LivestreamGetLivestreamSessionForLivestreamIDResponse,
+)
+from ...types.realtime_kit.livestream_get_livestream_session_details_for_session_id_response import (
+    LivestreamGetLivestreamSessionDetailsForSessionIDResponse,
+)
+
+__all__ = ["LivestreamsResource", "AsyncLivestreamsResource"]
+
+
+class LivestreamsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> LivestreamsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return LivestreamsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> LivestreamsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return LivestreamsResourceWithStreamingResponse(self)
+
+    def create_independent_livestream(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        name: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamCreateIndependentLivestreamResponse:
+        """
+        Creates a livestream for the given App ID and returns ingest server, stream key,
+        and playback URL. You can pass custom input to the ingest server and stream key,
+        and freely distribute the content using the playback URL on any player that
+        supports HLS/LHLS.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          name: Name of the livestream
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/livestreams",
+            body=maybe_transform(
+                {"name": name},
+                livestream_create_independent_livestream_params.LivestreamCreateIndependentLivestreamParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=LivestreamCreateIndependentLivestreamResponse,
+        )
+
+    def get_active_livestreams_for_livestream_id(
+        self,
+        livestream_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamGetActiveLivestreamsForLivestreamIDResponse:
+        """Returns details of all active livestreams for the given livestream ID.
+
+        Retreive
+        the livestream ID using the `Start livestreaming a meeting` API.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not livestream_id:
+            raise ValueError(f"Expected a non-empty value for `livestream_id` but received {livestream_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/livestreams/{livestream_id}/active-livestream-session",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=LivestreamGetActiveLivestreamsForLivestreamIDResponse,
+        )
+
+    def get_all_livestreams(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        end_time: Union[str, datetime] | Omit = omit,
+        exclude_meetings: bool | Omit = omit,
+        page_no: int | Omit = omit,
+        per_page: int | Omit = omit,
+        sort_order: Literal["ASC", "DSC"] | Omit = omit,
+        start_time: Union[str, datetime] | Omit = omit,
+        status: Literal["LIVE", "IDLE", "ERRORED", "INVOKED"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamGetAllLivestreamsResponse:
+        """Returns details of livestreams associated with the given App ID.
+
+        It includes
+        livestreams created by your App and RealtimeKit meetings that are livestreamed
+        by your App. If you only want details of livestreams created by your App and not
+        RealtimeKit meetings, you can use the `exclude_meetings` query parameter.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          end_time: Specify the end time range in ISO format to access the live stream.
+
+          exclude_meetings: Exclude the RealtimeKit meetings that are livestreamed.
+
+          page_no: The page number from which you want your page search results to be displayed.
+
+          per_page: Number of results per page.
+
+          sort_order: Specifies the sorting order for the results.
+
+          start_time: Specify the start time range in ISO format to access the live stream.
+
+          status: Specifies the status of the operation.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/livestreams",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "end_time": end_time,
+                        "exclude_meetings": exclude_meetings,
+                        "page_no": page_no,
+                        "per_page": per_page,
+                        "sort_order": sort_order,
+                        "start_time": start_time,
+                        "status": status,
+                    },
+                    livestream_get_all_livestreams_params.LivestreamGetAllLivestreamsParams,
+                ),
+            ),
+            cast_to=LivestreamGetAllLivestreamsResponse,
+        )
+
+    def get_livestream_analytics_complete(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        end_time: Union[str, datetime] | Omit = omit,
+        start_time: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamGetLivestreamAnalyticsCompleteResponse:
+        """
+        Returns livestream analytics for the specified time range.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          end_time: Specify the end time range in ISO format to access the livestream analytics.
+
+          start_time: Specify the start time range in ISO format to access the livestream analytics.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/analytics/livestreams/overall",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "end_time": end_time,
+                        "start_time": start_time,
+                    },
+                    livestream_get_livestream_analytics_complete_params.LivestreamGetLivestreamAnalyticsCompleteParams,
+                ),
+            ),
+            cast_to=LivestreamGetLivestreamAnalyticsCompleteResponse,
+        )
+
+    def get_livestream_session_details_for_session_id(
+        self,
+        livestream_session_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamGetLivestreamSessionDetailsForSessionIDResponse:
+        """Returns livestream session details for the given livestream session ID.
+
+        Retrieve
+        the `livestream_session_id`using the
+        `Fetch livestream session details using a session ID` API.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not livestream_session_id:
+            raise ValueError(
+                f"Expected a non-empty value for `livestream_session_id` but received {livestream_session_id!r}"
+            )
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/livestreams/sessions/{livestream_session_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=LivestreamGetLivestreamSessionDetailsForSessionIDResponse,
+        )
+
+    def get_livestream_session_for_livestream_id(
+        self,
+        livestream_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        page_no: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamGetLivestreamSessionForLivestreamIDResponse:
+        """
+        Returns details of a livestream with sessions for the given livestream ID.
+        Retreive the livestream ID using the `Start livestreaming a meeting` API.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          page_no: The page number from which you want your page search results to be displayed.
+
+          per_page: Number of results per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not livestream_id:
+            raise ValueError(f"Expected a non-empty value for `livestream_id` but received {livestream_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/livestreams/{livestream_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page_no": page_no,
+                        "per_page": per_page,
+                    },
+                    livestream_get_livestream_session_for_livestream_id_params.LivestreamGetLivestreamSessionForLivestreamIDParams,
+                ),
+            ),
+            cast_to=LivestreamGetLivestreamSessionForLivestreamIDResponse,
+        )
+
+    def get_meeting_active_livestreams(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamGetMeetingActiveLivestreamsResponse:
+        """
+        Returns details of all active livestreams for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-livestream",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=LivestreamGetMeetingActiveLivestreamsResponse,
+        )
+
+    def get_org_analytics(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        end_date: str | Omit = omit,
+        start_date: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamGetOrgAnalyticsResponse:
+        """
+        Returns day-wise session and recording analytics data of an App for the
+        specified time range start_date to end_date. If start_date and end_date are not
+        provided, the default time range is set from 30 days ago to the current date.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          end_date: end date in YYYY-MM-DD format
+
+          start_date: start date in YYYY-MM-DD format
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/analytics/daywise",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "end_date": end_date,
+                        "start_date": start_date,
+                    },
+                    livestream_get_org_analytics_params.LivestreamGetOrgAnalyticsParams,
+                ),
+            ),
+            cast_to=LivestreamGetOrgAnalyticsResponse,
+        )
+
+    def start_livestreaming_a_meeting(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        name: Optional[str] | Omit = omit,
+        video_config: livestream_start_livestreaming_a_meeting_params.VideoConfig | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamStartLivestreamingAMeetingResponse:
+        """Starts livestream of a meeting associated with the given meeting ID.
+
+        Retreive
+        the meeting ID using the `Create a meeting` API.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/livestreams",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "video_config": video_config,
+                },
+                livestream_start_livestreaming_a_meeting_params.LivestreamStartLivestreamingAMeetingParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=LivestreamStartLivestreamingAMeetingResponse,
+        )
+
+    def stop_livestreaming_a_meeting(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamStopLivestreamingAMeetingResponse:
+        """
+        Stops the active livestream of a meeting associated with the given meeting ID.
+        Retreive the meeting ID using the `Create a meeting` API.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-livestream/stop",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=LivestreamStopLivestreamingAMeetingResponse,
+        )
+
+
+class AsyncLivestreamsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncLivestreamsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncLivestreamsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncLivestreamsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncLivestreamsResourceWithStreamingResponse(self)
+
+    async def create_independent_livestream(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        name: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamCreateIndependentLivestreamResponse:
+        """
+        Creates a livestream for the given App ID and returns ingest server, stream key,
+        and playback URL. You can pass custom input to the ingest server and stream key,
+        and freely distribute the content using the playback URL on any player that
+        supports HLS/LHLS.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          name: Name of the livestream
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/livestreams",
+            body=await async_maybe_transform(
+                {"name": name},
+                livestream_create_independent_livestream_params.LivestreamCreateIndependentLivestreamParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=LivestreamCreateIndependentLivestreamResponse,
+        )
+
+    async def get_active_livestreams_for_livestream_id(
+        self,
+        livestream_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamGetActiveLivestreamsForLivestreamIDResponse:
+        """Returns details of all active livestreams for the given livestream ID.
+
+        Retreive
+        the livestream ID using the `Start livestreaming a meeting` API.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not livestream_id:
+            raise ValueError(f"Expected a non-empty value for `livestream_id` but received {livestream_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/livestreams/{livestream_id}/active-livestream-session",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=LivestreamGetActiveLivestreamsForLivestreamIDResponse,
+        )
+
+    async def get_all_livestreams(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        end_time: Union[str, datetime] | Omit = omit,
+        exclude_meetings: bool | Omit = omit,
+        page_no: int | Omit = omit,
+        per_page: int | Omit = omit,
+        sort_order: Literal["ASC", "DSC"] | Omit = omit,
+        start_time: Union[str, datetime] | Omit = omit,
+        status: Literal["LIVE", "IDLE", "ERRORED", "INVOKED"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamGetAllLivestreamsResponse:
+        """Returns details of livestreams associated with the given App ID.
+
+        It includes
+        livestreams created by your App and RealtimeKit meetings that are livestreamed
+        by your App. If you only want details of livestreams created by your App and not
+        RealtimeKit meetings, you can use the `exclude_meetings` query parameter.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          end_time: Specify the end time range in ISO format to access the live stream.
+
+          exclude_meetings: Exclude the RealtimeKit meetings that are livestreamed.
+
+          page_no: The page number from which you want your page search results to be displayed.
+
+          per_page: Number of results per page.
+
+          sort_order: Specifies the sorting order for the results.
+
+          start_time: Specify the start time range in ISO format to access the live stream.
+
+          status: Specifies the status of the operation.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/livestreams",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "end_time": end_time,
+                        "exclude_meetings": exclude_meetings,
+                        "page_no": page_no,
+                        "per_page": per_page,
+                        "sort_order": sort_order,
+                        "start_time": start_time,
+                        "status": status,
+                    },
+                    livestream_get_all_livestreams_params.LivestreamGetAllLivestreamsParams,
+                ),
+            ),
+            cast_to=LivestreamGetAllLivestreamsResponse,
+        )
+
+    async def get_livestream_analytics_complete(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        end_time: Union[str, datetime] | Omit = omit,
+        start_time: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamGetLivestreamAnalyticsCompleteResponse:
+        """
+        Returns livestream analytics for the specified time range.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          end_time: Specify the end time range in ISO format to access the livestream analytics.
+
+          start_time: Specify the start time range in ISO format to access the livestream analytics.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/analytics/livestreams/overall",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "end_time": end_time,
+                        "start_time": start_time,
+                    },
+                    livestream_get_livestream_analytics_complete_params.LivestreamGetLivestreamAnalyticsCompleteParams,
+                ),
+            ),
+            cast_to=LivestreamGetLivestreamAnalyticsCompleteResponse,
+        )
+
+    async def get_livestream_session_details_for_session_id(
+        self,
+        livestream_session_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamGetLivestreamSessionDetailsForSessionIDResponse:
+        """Returns livestream session details for the given livestream session ID.
+
+        Retrieve
+        the `livestream_session_id`using the
+        `Fetch livestream session details using a session ID` API.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not livestream_session_id:
+            raise ValueError(
+                f"Expected a non-empty value for `livestream_session_id` but received {livestream_session_id!r}"
+            )
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/livestreams/sessions/{livestream_session_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=LivestreamGetLivestreamSessionDetailsForSessionIDResponse,
+        )
+
+    async def get_livestream_session_for_livestream_id(
+        self,
+        livestream_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        page_no: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamGetLivestreamSessionForLivestreamIDResponse:
+        """
+        Returns details of a livestream with sessions for the given livestream ID.
+        Retreive the livestream ID using the `Start livestreaming a meeting` API.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          page_no: The page number from which you want your page search results to be displayed.
+
+          per_page: Number of results per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not livestream_id:
+            raise ValueError(f"Expected a non-empty value for `livestream_id` but received {livestream_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/livestreams/{livestream_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "page_no": page_no,
+                        "per_page": per_page,
+                    },
+                    livestream_get_livestream_session_for_livestream_id_params.LivestreamGetLivestreamSessionForLivestreamIDParams,
+                ),
+            ),
+            cast_to=LivestreamGetLivestreamSessionForLivestreamIDResponse,
+        )
+
+    async def get_meeting_active_livestreams(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamGetMeetingActiveLivestreamsResponse:
+        """
+        Returns details of all active livestreams for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-livestream",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=LivestreamGetMeetingActiveLivestreamsResponse,
+        )
+
+    async def get_org_analytics(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        end_date: str | Omit = omit,
+        start_date: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamGetOrgAnalyticsResponse:
+        """
+        Returns day-wise session and recording analytics data of an App for the
+        specified time range start_date to end_date. If start_date and end_date are not
+        provided, the default time range is set from 30 days ago to the current date.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          end_date: end date in YYYY-MM-DD format
+
+          start_date: start date in YYYY-MM-DD format
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/analytics/daywise",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "end_date": end_date,
+                        "start_date": start_date,
+                    },
+                    livestream_get_org_analytics_params.LivestreamGetOrgAnalyticsParams,
+                ),
+            ),
+            cast_to=LivestreamGetOrgAnalyticsResponse,
+        )
+
+    async def start_livestreaming_a_meeting(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        name: Optional[str] | Omit = omit,
+        video_config: livestream_start_livestreaming_a_meeting_params.VideoConfig | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamStartLivestreamingAMeetingResponse:
+        """Starts livestream of a meeting associated with the given meeting ID.
+
+        Retreive
+        the meeting ID using the `Create a meeting` API.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/livestreams",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "video_config": video_config,
+                },
+                livestream_start_livestreaming_a_meeting_params.LivestreamStartLivestreamingAMeetingParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=LivestreamStartLivestreamingAMeetingResponse,
+        )
+
+    async def stop_livestreaming_a_meeting(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> LivestreamStopLivestreamingAMeetingResponse:
+        """
+        Stops the active livestream of a meeting associated with the given meeting ID.
+        Retreive the meeting ID using the `Create a meeting` API.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/active-livestream/stop",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=LivestreamStopLivestreamingAMeetingResponse,
+        )
+
+
+class LivestreamsResourceWithRawResponse:
+    def __init__(self, livestreams: LivestreamsResource) -> None:
+        self._livestreams = livestreams
+
+        self.create_independent_livestream = to_raw_response_wrapper(
+            livestreams.create_independent_livestream,
+        )
+        self.get_active_livestreams_for_livestream_id = to_raw_response_wrapper(
+            livestreams.get_active_livestreams_for_livestream_id,
+        )
+        self.get_all_livestreams = to_raw_response_wrapper(
+            livestreams.get_all_livestreams,
+        )
+        self.get_livestream_analytics_complete = to_raw_response_wrapper(
+            livestreams.get_livestream_analytics_complete,
+        )
+        self.get_livestream_session_details_for_session_id = to_raw_response_wrapper(
+            livestreams.get_livestream_session_details_for_session_id,
+        )
+        self.get_livestream_session_for_livestream_id = to_raw_response_wrapper(
+            livestreams.get_livestream_session_for_livestream_id,
+        )
+        self.get_meeting_active_livestreams = to_raw_response_wrapper(
+            livestreams.get_meeting_active_livestreams,
+        )
+        self.get_org_analytics = to_raw_response_wrapper(
+            livestreams.get_org_analytics,
+        )
+        self.start_livestreaming_a_meeting = to_raw_response_wrapper(
+            livestreams.start_livestreaming_a_meeting,
+        )
+        self.stop_livestreaming_a_meeting = to_raw_response_wrapper(
+            livestreams.stop_livestreaming_a_meeting,
+        )
+
+
+class AsyncLivestreamsResourceWithRawResponse:
+    def __init__(self, livestreams: AsyncLivestreamsResource) -> None:
+        self._livestreams = livestreams
+
+        self.create_independent_livestream = async_to_raw_response_wrapper(
+            livestreams.create_independent_livestream,
+        )
+        self.get_active_livestreams_for_livestream_id = async_to_raw_response_wrapper(
+            livestreams.get_active_livestreams_for_livestream_id,
+        )
+        self.get_all_livestreams = async_to_raw_response_wrapper(
+            livestreams.get_all_livestreams,
+        )
+        self.get_livestream_analytics_complete = async_to_raw_response_wrapper(
+            livestreams.get_livestream_analytics_complete,
+        )
+        self.get_livestream_session_details_for_session_id = async_to_raw_response_wrapper(
+            livestreams.get_livestream_session_details_for_session_id,
+        )
+        self.get_livestream_session_for_livestream_id = async_to_raw_response_wrapper(
+            livestreams.get_livestream_session_for_livestream_id,
+        )
+        self.get_meeting_active_livestreams = async_to_raw_response_wrapper(
+            livestreams.get_meeting_active_livestreams,
+        )
+        self.get_org_analytics = async_to_raw_response_wrapper(
+            livestreams.get_org_analytics,
+        )
+        self.start_livestreaming_a_meeting = async_to_raw_response_wrapper(
+            livestreams.start_livestreaming_a_meeting,
+        )
+        self.stop_livestreaming_a_meeting = async_to_raw_response_wrapper(
+            livestreams.stop_livestreaming_a_meeting,
+        )
+
+
+class LivestreamsResourceWithStreamingResponse:
+    def __init__(self, livestreams: LivestreamsResource) -> None:
+        self._livestreams = livestreams
+
+        self.create_independent_livestream = to_streamed_response_wrapper(
+            livestreams.create_independent_livestream,
+        )
+        self.get_active_livestreams_for_livestream_id = to_streamed_response_wrapper(
+            livestreams.get_active_livestreams_for_livestream_id,
+        )
+        self.get_all_livestreams = to_streamed_response_wrapper(
+            livestreams.get_all_livestreams,
+        )
+        self.get_livestream_analytics_complete = to_streamed_response_wrapper(
+            livestreams.get_livestream_analytics_complete,
+        )
+        self.get_livestream_session_details_for_session_id = to_streamed_response_wrapper(
+            livestreams.get_livestream_session_details_for_session_id,
+        )
+        self.get_livestream_session_for_livestream_id = to_streamed_response_wrapper(
+            livestreams.get_livestream_session_for_livestream_id,
+        )
+        self.get_meeting_active_livestreams = to_streamed_response_wrapper(
+            livestreams.get_meeting_active_livestreams,
+        )
+        self.get_org_analytics = to_streamed_response_wrapper(
+            livestreams.get_org_analytics,
+        )
+        self.start_livestreaming_a_meeting = to_streamed_response_wrapper(
+            livestreams.start_livestreaming_a_meeting,
+        )
+        self.stop_livestreaming_a_meeting = to_streamed_response_wrapper(
+            livestreams.stop_livestreaming_a_meeting,
+        )
+
+
+class AsyncLivestreamsResourceWithStreamingResponse:
+    def __init__(self, livestreams: AsyncLivestreamsResource) -> None:
+        self._livestreams = livestreams
+
+        self.create_independent_livestream = async_to_streamed_response_wrapper(
+            livestreams.create_independent_livestream,
+        )
+        self.get_active_livestreams_for_livestream_id = async_to_streamed_response_wrapper(
+            livestreams.get_active_livestreams_for_livestream_id,
+        )
+        self.get_all_livestreams = async_to_streamed_response_wrapper(
+            livestreams.get_all_livestreams,
+        )
+        self.get_livestream_analytics_complete = async_to_streamed_response_wrapper(
+            livestreams.get_livestream_analytics_complete,
+        )
+        self.get_livestream_session_details_for_session_id = async_to_streamed_response_wrapper(
+            livestreams.get_livestream_session_details_for_session_id,
+        )
+        self.get_livestream_session_for_livestream_id = async_to_streamed_response_wrapper(
+            livestreams.get_livestream_session_for_livestream_id,
+        )
+        self.get_meeting_active_livestreams = async_to_streamed_response_wrapper(
+            livestreams.get_meeting_active_livestreams,
+        )
+        self.get_org_analytics = async_to_streamed_response_wrapper(
+            livestreams.get_org_analytics,
+        )
+        self.start_livestreaming_a_meeting = async_to_streamed_response_wrapper(
+            livestreams.start_livestreaming_a_meeting,
+        )
+        self.stop_livestreaming_a_meeting = async_to_streamed_response_wrapper(
+            livestreams.stop_livestreaming_a_meeting,
+        )
diff --git a/src/cloudflare/resources/realtime_kit/meetings.py b/src/cloudflare/resources/realtime_kit/meetings.py
new file mode 100644
index 00000000000..9e6724443b9
--- /dev/null
+++ b/src/cloudflare/resources/realtime_kit/meetings.py
@@ -0,0 +1,1646 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.realtime_kit import (
+    meeting_get_params,
+    meeting_create_params,
+    meeting_add_participant_params,
+    meeting_edit_participant_params,
+    meeting_get_meeting_by_id_params,
+    meeting_update_meeting_by_id_params,
+    meeting_replace_meeting_by_id_params,
+    meeting_get_meeting_participants_params,
+)
+from ...types.realtime_kit.meeting_get_response import MeetingGetResponse
+from ...types.realtime_kit.meeting_create_response import MeetingCreateResponse
+from ...types.realtime_kit.meeting_add_participant_response import MeetingAddParticipantResponse
+from ...types.realtime_kit.meeting_edit_participant_response import MeetingEditParticipantResponse
+from ...types.realtime_kit.meeting_get_meeting_by_id_response import MeetingGetMeetingByIDResponse
+from ...types.realtime_kit.meeting_update_meeting_by_id_response import MeetingUpdateMeetingByIDResponse
+from ...types.realtime_kit.meeting_replace_meeting_by_id_response import MeetingReplaceMeetingByIDResponse
+from ...types.realtime_kit.meeting_get_meeting_participant_response import MeetingGetMeetingParticipantResponse
+from ...types.realtime_kit.meeting_get_meeting_participants_response import MeetingGetMeetingParticipantsResponse
+from ...types.realtime_kit.meeting_refresh_participant_token_response import MeetingRefreshParticipantTokenResponse
+from ...types.realtime_kit.meeting_delete_meeting_participant_response import MeetingDeleteMeetingParticipantResponse
+
+__all__ = ["MeetingsResource", "AsyncMeetingsResource"]
+
+
+class MeetingsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> MeetingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return MeetingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> MeetingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return MeetingsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        ai_config: meeting_create_params.AIConfig | Omit = omit,
+        live_stream_on_start: Optional[bool] | Omit = omit,
+        persist_chat: bool | Omit = omit,
+        record_on_start: Optional[bool] | Omit = omit,
+        recording_config: meeting_create_params.RecordingConfig | Omit = omit,
+        session_keep_alive_time_in_secs: float | Omit = omit,
+        summarize_on_end: bool | Omit = omit,
+        title: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingCreateResponse:
+        """
+        Create a meeting for the given App ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          ai_config: The AI Config allows you to customize the behavior of meeting transcriptions and
+              summaries
+
+          live_stream_on_start: Specifies if the meeting should start getting livestreamed on start.
+
+          persist_chat: If a meeting is set to persist_chat, meeting chat would remain for a week within
+              the meeting space.
+
+          record_on_start: Specifies if the meeting should start getting recorded as soon as someone joins
+              the meeting.
+
+          recording_config: Recording Configurations to be used for this meeting. This level of configs
+              takes higher preference over App level configs on the RealtimeKit developer
+              portal.
+
+          session_keep_alive_time_in_secs: Time in seconds, for which a session remains active, after the last participant
+              has left the meeting.
+
+          summarize_on_end: Automatically generate summary of meetings using transcripts. Requires
+              Transcriptions to be enabled, and can be retrieved via Webhooks or summary API.
+
+          title: Title of the meeting
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings",
+            body=maybe_transform(
+                {
+                    "ai_config": ai_config,
+                    "live_stream_on_start": live_stream_on_start,
+                    "persist_chat": persist_chat,
+                    "record_on_start": record_on_start,
+                    "recording_config": recording_config,
+                    "session_keep_alive_time_in_secs": session_keep_alive_time_in_secs,
+                    "summarize_on_end": summarize_on_end,
+                    "title": title,
+                },
+                meeting_create_params.MeetingCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MeetingCreateResponse,
+        )
+
+    def add_participant(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        custom_participant_id: str,
+        preset_name: str,
+        name: Optional[str] | Omit = omit,
+        picture: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingAddParticipantResponse:
+        """
+        Adds a participant to the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          custom_participant_id: A unique participant ID. You must specify a unique ID for the participant, for
+              example, UUID, email address, and so on.
+
+          preset_name: Name of the preset to apply to this participant.
+
+          name: (Optional) Name of the participant.
+
+          picture: (Optional) A URL to a picture to be used for the participant.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants",
+            body=maybe_transform(
+                {
+                    "custom_participant_id": custom_participant_id,
+                    "preset_name": preset_name,
+                    "name": name,
+                    "picture": picture,
+                },
+                meeting_add_participant_params.MeetingAddParticipantParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MeetingAddParticipantResponse,
+        )
+
+    def delete_meeting_participant(
+        self,
+        participant_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        meeting_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingDeleteMeetingParticipantResponse:
+        """
+        Deletes a participant for the given meeting and participant ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        if not participant_id:
+            raise ValueError(f"Expected a non-empty value for `participant_id` but received {participant_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants/{participant_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MeetingDeleteMeetingParticipantResponse,
+        )
+
+    def edit_participant(
+        self,
+        participant_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        meeting_id: str,
+        name: Optional[str] | Omit = omit,
+        picture: Optional[str] | Omit = omit,
+        preset_name: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingEditParticipantResponse:
+        """
+        Updates a participant's details for the given meeting and participant ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          name: (Optional) Name of the participant.
+
+          picture: (Optional) A URL to a picture to be used for the participant.
+
+          preset_name: (Optional) Name of the preset to apply to this participant.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        if not participant_id:
+            raise ValueError(f"Expected a non-empty value for `participant_id` but received {participant_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants/{participant_id}",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "picture": picture,
+                    "preset_name": preset_name,
+                },
+                meeting_edit_participant_params.MeetingEditParticipantParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MeetingEditParticipantResponse,
+        )
+
+    def get(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        end_time: Union[str, datetime] | Omit = omit,
+        page_no: float | Omit = omit,
+        per_page: float | Omit = omit,
+        search: str | Omit = omit,
+        start_time: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingGetResponse:
+        """
+        Returns all meetings for the given App ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          end_time: The end time range for which you want to retrieve the meetings. The time must be
+              specified in ISO format.
+
+          page_no: The page number from which you want your page search results to be displayed.
+
+          per_page: Number of results per page
+
+          search: The search query string. You can search using the meeting ID or title.
+
+          start_time: The start time range for which you want to retrieve the meetings. The time must
+              be specified in ISO format.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "end_time": end_time,
+                        "page_no": page_no,
+                        "per_page": per_page,
+                        "search": search,
+                        "start_time": start_time,
+                    },
+                    meeting_get_params.MeetingGetParams,
+                ),
+            ),
+            cast_to=MeetingGetResponse,
+        )
+
+    def get_meeting_by_id(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingGetMeetingByIDResponse:
+        """
+        Returns a meeting details in an App for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"name": name}, meeting_get_meeting_by_id_params.MeetingGetMeetingByIDParams),
+            ),
+            cast_to=MeetingGetMeetingByIDResponse,
+        )
+
+    def get_meeting_participant(
+        self,
+        participant_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        meeting_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingGetMeetingParticipantResponse:
+        """
+        Returns a participant details for the given meeting and participant ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        if not participant_id:
+            raise ValueError(f"Expected a non-empty value for `participant_id` but received {participant_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants/{participant_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MeetingGetMeetingParticipantResponse,
+        )
+
+    def get_meeting_participants(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        page_no: float | Omit = omit,
+        per_page: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingGetMeetingParticipantsResponse:
+        """
+        Returns all participants detail for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          page_no: The page number from which you want your page search results to be displayed.
+
+          per_page: Number of results per page
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page_no": page_no,
+                        "per_page": per_page,
+                    },
+                    meeting_get_meeting_participants_params.MeetingGetMeetingParticipantsParams,
+                ),
+            ),
+            cast_to=MeetingGetMeetingParticipantsResponse,
+        )
+
+    def refresh_participant_token(
+        self,
+        participant_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        meeting_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingRefreshParticipantTokenResponse:
+        """
+        Regenerates participant's authentication token for the given meeting and
+        participant ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        if not participant_id:
+            raise ValueError(f"Expected a non-empty value for `participant_id` but received {participant_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants/{participant_id}/token",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MeetingRefreshParticipantTokenResponse,
+        )
+
+    def replace_meeting_by_id(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        ai_config: meeting_replace_meeting_by_id_params.AIConfig | Omit = omit,
+        live_stream_on_start: Optional[bool] | Omit = omit,
+        persist_chat: bool | Omit = omit,
+        record_on_start: Optional[bool] | Omit = omit,
+        recording_config: meeting_replace_meeting_by_id_params.RecordingConfig | Omit = omit,
+        session_keep_alive_time_in_secs: float | Omit = omit,
+        summarize_on_end: bool | Omit = omit,
+        title: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingReplaceMeetingByIDResponse:
+        """
+        Replaces all the details for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          ai_config: The AI Config allows you to customize the behavior of meeting transcriptions and
+              summaries
+
+          live_stream_on_start: Specifies if the meeting should start getting livestreamed on start.
+
+          persist_chat: If a meeting is set to persist_chat, meeting chat would remain for a week within
+              the meeting space.
+
+          record_on_start: Specifies if the meeting should start getting recorded as soon as someone joins
+              the meeting.
+
+          recording_config: Recording Configurations to be used for this meeting. This level of configs
+              takes higher preference over App level configs on the RealtimeKit developer
+              portal.
+
+          session_keep_alive_time_in_secs: Time in seconds, for which a session remains active, after the last participant
+              has left the meeting.
+
+          summarize_on_end: Automatically generate summary of meetings using transcripts. Requires
+              Transcriptions to be enabled, and can be retrieved via Webhooks or summary API.
+
+          title: Title of the meeting
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}",
+            body=maybe_transform(
+                {
+                    "ai_config": ai_config,
+                    "live_stream_on_start": live_stream_on_start,
+                    "persist_chat": persist_chat,
+                    "record_on_start": record_on_start,
+                    "recording_config": recording_config,
+                    "session_keep_alive_time_in_secs": session_keep_alive_time_in_secs,
+                    "summarize_on_end": summarize_on_end,
+                    "title": title,
+                },
+                meeting_replace_meeting_by_id_params.MeetingReplaceMeetingByIDParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MeetingReplaceMeetingByIDResponse,
+        )
+
+    def update_meeting_by_id(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        ai_config: meeting_update_meeting_by_id_params.AIConfig | Omit = omit,
+        live_stream_on_start: bool | Omit = omit,
+        persist_chat: bool | Omit = omit,
+        record_on_start: bool | Omit = omit,
+        session_keep_alive_time_in_secs: float | Omit = omit,
+        status: Literal["ACTIVE", "INACTIVE"] | Omit = omit,
+        summarize_on_end: bool | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingUpdateMeetingByIDResponse:
+        """
+        Updates a meeting in an App for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          ai_config: The AI Config allows you to customize the behavior of meeting transcriptions and
+              summaries
+
+          live_stream_on_start: Specifies if the meeting should start getting livestreamed on start.
+
+          persist_chat: If a meeting is updated to persist_chat, meeting chat would remain for a week
+              within the meeting space.
+
+          record_on_start: Specifies if the meeting should start getting recorded as soon as someone joins
+              the meeting.
+
+          session_keep_alive_time_in_secs: Time in seconds, for which a session remains active, after the last participant
+              has left the meeting.
+
+          status: Whether the meeting is `ACTIVE` or `INACTIVE`. Users will not be able to join an
+              `INACTIVE` meeting.
+
+          summarize_on_end: Automatically generate summary of meetings using transcripts. Requires
+              Transcriptions to be enabled, and can be retrieved via Webhooks or summary API.
+
+          title: Title of the meeting
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}",
+            body=maybe_transform(
+                {
+                    "ai_config": ai_config,
+                    "live_stream_on_start": live_stream_on_start,
+                    "persist_chat": persist_chat,
+                    "record_on_start": record_on_start,
+                    "session_keep_alive_time_in_secs": session_keep_alive_time_in_secs,
+                    "status": status,
+                    "summarize_on_end": summarize_on_end,
+                    "title": title,
+                },
+                meeting_update_meeting_by_id_params.MeetingUpdateMeetingByIDParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MeetingUpdateMeetingByIDResponse,
+        )
+
+
+class AsyncMeetingsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncMeetingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncMeetingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncMeetingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncMeetingsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        ai_config: meeting_create_params.AIConfig | Omit = omit,
+        live_stream_on_start: Optional[bool] | Omit = omit,
+        persist_chat: bool | Omit = omit,
+        record_on_start: Optional[bool] | Omit = omit,
+        recording_config: meeting_create_params.RecordingConfig | Omit = omit,
+        session_keep_alive_time_in_secs: float | Omit = omit,
+        summarize_on_end: bool | Omit = omit,
+        title: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingCreateResponse:
+        """
+        Create a meeting for the given App ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          ai_config: The AI Config allows you to customize the behavior of meeting transcriptions and
+              summaries
+
+          live_stream_on_start: Specifies if the meeting should start getting livestreamed on start.
+
+          persist_chat: If a meeting is set to persist_chat, meeting chat would remain for a week within
+              the meeting space.
+
+          record_on_start: Specifies if the meeting should start getting recorded as soon as someone joins
+              the meeting.
+
+          recording_config: Recording Configurations to be used for this meeting. This level of configs
+              takes higher preference over App level configs on the RealtimeKit developer
+              portal.
+
+          session_keep_alive_time_in_secs: Time in seconds, for which a session remains active, after the last participant
+              has left the meeting.
+
+          summarize_on_end: Automatically generate summary of meetings using transcripts. Requires
+              Transcriptions to be enabled, and can be retrieved via Webhooks or summary API.
+
+          title: Title of the meeting
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings",
+            body=await async_maybe_transform(
+                {
+                    "ai_config": ai_config,
+                    "live_stream_on_start": live_stream_on_start,
+                    "persist_chat": persist_chat,
+                    "record_on_start": record_on_start,
+                    "recording_config": recording_config,
+                    "session_keep_alive_time_in_secs": session_keep_alive_time_in_secs,
+                    "summarize_on_end": summarize_on_end,
+                    "title": title,
+                },
+                meeting_create_params.MeetingCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MeetingCreateResponse,
+        )
+
+    async def add_participant(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        custom_participant_id: str,
+        preset_name: str,
+        name: Optional[str] | Omit = omit,
+        picture: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingAddParticipantResponse:
+        """
+        Adds a participant to the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          custom_participant_id: A unique participant ID. You must specify a unique ID for the participant, for
+              example, UUID, email address, and so on.
+
+          preset_name: Name of the preset to apply to this participant.
+
+          name: (Optional) Name of the participant.
+
+          picture: (Optional) A URL to a picture to be used for the participant.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants",
+            body=await async_maybe_transform(
+                {
+                    "custom_participant_id": custom_participant_id,
+                    "preset_name": preset_name,
+                    "name": name,
+                    "picture": picture,
+                },
+                meeting_add_participant_params.MeetingAddParticipantParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MeetingAddParticipantResponse,
+        )
+
+    async def delete_meeting_participant(
+        self,
+        participant_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        meeting_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingDeleteMeetingParticipantResponse:
+        """
+        Deletes a participant for the given meeting and participant ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        if not participant_id:
+            raise ValueError(f"Expected a non-empty value for `participant_id` but received {participant_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants/{participant_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MeetingDeleteMeetingParticipantResponse,
+        )
+
+    async def edit_participant(
+        self,
+        participant_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        meeting_id: str,
+        name: Optional[str] | Omit = omit,
+        picture: Optional[str] | Omit = omit,
+        preset_name: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingEditParticipantResponse:
+        """
+        Updates a participant's details for the given meeting and participant ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          name: (Optional) Name of the participant.
+
+          picture: (Optional) A URL to a picture to be used for the participant.
+
+          preset_name: (Optional) Name of the preset to apply to this participant.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        if not participant_id:
+            raise ValueError(f"Expected a non-empty value for `participant_id` but received {participant_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants/{participant_id}",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "picture": picture,
+                    "preset_name": preset_name,
+                },
+                meeting_edit_participant_params.MeetingEditParticipantParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MeetingEditParticipantResponse,
+        )
+
+    async def get(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        end_time: Union[str, datetime] | Omit = omit,
+        page_no: float | Omit = omit,
+        per_page: float | Omit = omit,
+        search: str | Omit = omit,
+        start_time: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingGetResponse:
+        """
+        Returns all meetings for the given App ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          end_time: The end time range for which you want to retrieve the meetings. The time must be
+              specified in ISO format.
+
+          page_no: The page number from which you want your page search results to be displayed.
+
+          per_page: Number of results per page
+
+          search: The search query string. You can search using the meeting ID or title.
+
+          start_time: The start time range for which you want to retrieve the meetings. The time must
+              be specified in ISO format.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "end_time": end_time,
+                        "page_no": page_no,
+                        "per_page": per_page,
+                        "search": search,
+                        "start_time": start_time,
+                    },
+                    meeting_get_params.MeetingGetParams,
+                ),
+            ),
+            cast_to=MeetingGetResponse,
+        )
+
+    async def get_meeting_by_id(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingGetMeetingByIDResponse:
+        """
+        Returns a meeting details in an App for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"name": name}, meeting_get_meeting_by_id_params.MeetingGetMeetingByIDParams
+                ),
+            ),
+            cast_to=MeetingGetMeetingByIDResponse,
+        )
+
+    async def get_meeting_participant(
+        self,
+        participant_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        meeting_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingGetMeetingParticipantResponse:
+        """
+        Returns a participant details for the given meeting and participant ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        if not participant_id:
+            raise ValueError(f"Expected a non-empty value for `participant_id` but received {participant_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants/{participant_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MeetingGetMeetingParticipantResponse,
+        )
+
+    async def get_meeting_participants(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        page_no: float | Omit = omit,
+        per_page: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingGetMeetingParticipantsResponse:
+        """
+        Returns all participants detail for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          page_no: The page number from which you want your page search results to be displayed.
+
+          per_page: Number of results per page
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "page_no": page_no,
+                        "per_page": per_page,
+                    },
+                    meeting_get_meeting_participants_params.MeetingGetMeetingParticipantsParams,
+                ),
+            ),
+            cast_to=MeetingGetMeetingParticipantsResponse,
+        )
+
+    async def refresh_participant_token(
+        self,
+        participant_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        meeting_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingRefreshParticipantTokenResponse:
+        """
+        Regenerates participant's authentication token for the given meeting and
+        participant ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        if not participant_id:
+            raise ValueError(f"Expected a non-empty value for `participant_id` but received {participant_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}/participants/{participant_id}/token",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MeetingRefreshParticipantTokenResponse,
+        )
+
+    async def replace_meeting_by_id(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        ai_config: meeting_replace_meeting_by_id_params.AIConfig | Omit = omit,
+        live_stream_on_start: Optional[bool] | Omit = omit,
+        persist_chat: bool | Omit = omit,
+        record_on_start: Optional[bool] | Omit = omit,
+        recording_config: meeting_replace_meeting_by_id_params.RecordingConfig | Omit = omit,
+        session_keep_alive_time_in_secs: float | Omit = omit,
+        summarize_on_end: bool | Omit = omit,
+        title: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingReplaceMeetingByIDResponse:
+        """
+        Replaces all the details for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          ai_config: The AI Config allows you to customize the behavior of meeting transcriptions and
+              summaries
+
+          live_stream_on_start: Specifies if the meeting should start getting livestreamed on start.
+
+          persist_chat: If a meeting is set to persist_chat, meeting chat would remain for a week within
+              the meeting space.
+
+          record_on_start: Specifies if the meeting should start getting recorded as soon as someone joins
+              the meeting.
+
+          recording_config: Recording Configurations to be used for this meeting. This level of configs
+              takes higher preference over App level configs on the RealtimeKit developer
+              portal.
+
+          session_keep_alive_time_in_secs: Time in seconds, for which a session remains active, after the last participant
+              has left the meeting.
+
+          summarize_on_end: Automatically generate summary of meetings using transcripts. Requires
+              Transcriptions to be enabled, and can be retrieved via Webhooks or summary API.
+
+          title: Title of the meeting
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}",
+            body=await async_maybe_transform(
+                {
+                    "ai_config": ai_config,
+                    "live_stream_on_start": live_stream_on_start,
+                    "persist_chat": persist_chat,
+                    "record_on_start": record_on_start,
+                    "recording_config": recording_config,
+                    "session_keep_alive_time_in_secs": session_keep_alive_time_in_secs,
+                    "summarize_on_end": summarize_on_end,
+                    "title": title,
+                },
+                meeting_replace_meeting_by_id_params.MeetingReplaceMeetingByIDParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MeetingReplaceMeetingByIDResponse,
+        )
+
+    async def update_meeting_by_id(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        ai_config: meeting_update_meeting_by_id_params.AIConfig | Omit = omit,
+        live_stream_on_start: bool | Omit = omit,
+        persist_chat: bool | Omit = omit,
+        record_on_start: bool | Omit = omit,
+        session_keep_alive_time_in_secs: float | Omit = omit,
+        status: Literal["ACTIVE", "INACTIVE"] | Omit = omit,
+        summarize_on_end: bool | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> MeetingUpdateMeetingByIDResponse:
+        """
+        Updates a meeting in an App for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          ai_config: The AI Config allows you to customize the behavior of meeting transcriptions and
+              summaries
+
+          live_stream_on_start: Specifies if the meeting should start getting livestreamed on start.
+
+          persist_chat: If a meeting is updated to persist_chat, meeting chat would remain for a week
+              within the meeting space.
+
+          record_on_start: Specifies if the meeting should start getting recorded as soon as someone joins
+              the meeting.
+
+          session_keep_alive_time_in_secs: Time in seconds, for which a session remains active, after the last participant
+              has left the meeting.
+
+          status: Whether the meeting is `ACTIVE` or `INACTIVE`. Users will not be able to join an
+              `INACTIVE` meeting.
+
+          summarize_on_end: Automatically generate summary of meetings using transcripts. Requires
+              Transcriptions to be enabled, and can be retrieved via Webhooks or summary API.
+
+          title: Title of the meeting
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/meetings/{meeting_id}",
+            body=await async_maybe_transform(
+                {
+                    "ai_config": ai_config,
+                    "live_stream_on_start": live_stream_on_start,
+                    "persist_chat": persist_chat,
+                    "record_on_start": record_on_start,
+                    "session_keep_alive_time_in_secs": session_keep_alive_time_in_secs,
+                    "status": status,
+                    "summarize_on_end": summarize_on_end,
+                    "title": title,
+                },
+                meeting_update_meeting_by_id_params.MeetingUpdateMeetingByIDParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=MeetingUpdateMeetingByIDResponse,
+        )
+
+
+class MeetingsResourceWithRawResponse:
+    def __init__(self, meetings: MeetingsResource) -> None:
+        self._meetings = meetings
+
+        self.create = to_raw_response_wrapper(
+            meetings.create,
+        )
+        self.add_participant = to_raw_response_wrapper(
+            meetings.add_participant,
+        )
+        self.delete_meeting_participant = to_raw_response_wrapper(
+            meetings.delete_meeting_participant,
+        )
+        self.edit_participant = to_raw_response_wrapper(
+            meetings.edit_participant,
+        )
+        self.get = to_raw_response_wrapper(
+            meetings.get,
+        )
+        self.get_meeting_by_id = to_raw_response_wrapper(
+            meetings.get_meeting_by_id,
+        )
+        self.get_meeting_participant = to_raw_response_wrapper(
+            meetings.get_meeting_participant,
+        )
+        self.get_meeting_participants = to_raw_response_wrapper(
+            meetings.get_meeting_participants,
+        )
+        self.refresh_participant_token = to_raw_response_wrapper(
+            meetings.refresh_participant_token,
+        )
+        self.replace_meeting_by_id = to_raw_response_wrapper(
+            meetings.replace_meeting_by_id,
+        )
+        self.update_meeting_by_id = to_raw_response_wrapper(
+            meetings.update_meeting_by_id,
+        )
+
+
+class AsyncMeetingsResourceWithRawResponse:
+    def __init__(self, meetings: AsyncMeetingsResource) -> None:
+        self._meetings = meetings
+
+        self.create = async_to_raw_response_wrapper(
+            meetings.create,
+        )
+        self.add_participant = async_to_raw_response_wrapper(
+            meetings.add_participant,
+        )
+        self.delete_meeting_participant = async_to_raw_response_wrapper(
+            meetings.delete_meeting_participant,
+        )
+        self.edit_participant = async_to_raw_response_wrapper(
+            meetings.edit_participant,
+        )
+        self.get = async_to_raw_response_wrapper(
+            meetings.get,
+        )
+        self.get_meeting_by_id = async_to_raw_response_wrapper(
+            meetings.get_meeting_by_id,
+        )
+        self.get_meeting_participant = async_to_raw_response_wrapper(
+            meetings.get_meeting_participant,
+        )
+        self.get_meeting_participants = async_to_raw_response_wrapper(
+            meetings.get_meeting_participants,
+        )
+        self.refresh_participant_token = async_to_raw_response_wrapper(
+            meetings.refresh_participant_token,
+        )
+        self.replace_meeting_by_id = async_to_raw_response_wrapper(
+            meetings.replace_meeting_by_id,
+        )
+        self.update_meeting_by_id = async_to_raw_response_wrapper(
+            meetings.update_meeting_by_id,
+        )
+
+
+class MeetingsResourceWithStreamingResponse:
+    def __init__(self, meetings: MeetingsResource) -> None:
+        self._meetings = meetings
+
+        self.create = to_streamed_response_wrapper(
+            meetings.create,
+        )
+        self.add_participant = to_streamed_response_wrapper(
+            meetings.add_participant,
+        )
+        self.delete_meeting_participant = to_streamed_response_wrapper(
+            meetings.delete_meeting_participant,
+        )
+        self.edit_participant = to_streamed_response_wrapper(
+            meetings.edit_participant,
+        )
+        self.get = to_streamed_response_wrapper(
+            meetings.get,
+        )
+        self.get_meeting_by_id = to_streamed_response_wrapper(
+            meetings.get_meeting_by_id,
+        )
+        self.get_meeting_participant = to_streamed_response_wrapper(
+            meetings.get_meeting_participant,
+        )
+        self.get_meeting_participants = to_streamed_response_wrapper(
+            meetings.get_meeting_participants,
+        )
+        self.refresh_participant_token = to_streamed_response_wrapper(
+            meetings.refresh_participant_token,
+        )
+        self.replace_meeting_by_id = to_streamed_response_wrapper(
+            meetings.replace_meeting_by_id,
+        )
+        self.update_meeting_by_id = to_streamed_response_wrapper(
+            meetings.update_meeting_by_id,
+        )
+
+
+class AsyncMeetingsResourceWithStreamingResponse:
+    def __init__(self, meetings: AsyncMeetingsResource) -> None:
+        self._meetings = meetings
+
+        self.create = async_to_streamed_response_wrapper(
+            meetings.create,
+        )
+        self.add_participant = async_to_streamed_response_wrapper(
+            meetings.add_participant,
+        )
+        self.delete_meeting_participant = async_to_streamed_response_wrapper(
+            meetings.delete_meeting_participant,
+        )
+        self.edit_participant = async_to_streamed_response_wrapper(
+            meetings.edit_participant,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            meetings.get,
+        )
+        self.get_meeting_by_id = async_to_streamed_response_wrapper(
+            meetings.get_meeting_by_id,
+        )
+        self.get_meeting_participant = async_to_streamed_response_wrapper(
+            meetings.get_meeting_participant,
+        )
+        self.get_meeting_participants = async_to_streamed_response_wrapper(
+            meetings.get_meeting_participants,
+        )
+        self.refresh_participant_token = async_to_streamed_response_wrapper(
+            meetings.refresh_participant_token,
+        )
+        self.replace_meeting_by_id = async_to_streamed_response_wrapper(
+            meetings.replace_meeting_by_id,
+        )
+        self.update_meeting_by_id = async_to_streamed_response_wrapper(
+            meetings.update_meeting_by_id,
+        )
diff --git a/src/cloudflare/resources/realtime_kit/presets.py b/src/cloudflare/resources/realtime_kit/presets.py
new file mode 100644
index 00000000000..53937c2e4e9
--- /dev/null
+++ b/src/cloudflare/resources/realtime_kit/presets.py
@@ -0,0 +1,661 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.realtime_kit import preset_get_params, preset_create_params, preset_update_params
+from ...types.realtime_kit.preset_get_response import PresetGetResponse
+from ...types.realtime_kit.preset_create_response import PresetCreateResponse
+from ...types.realtime_kit.preset_delete_response import PresetDeleteResponse
+from ...types.realtime_kit.preset_update_response import PresetUpdateResponse
+from ...types.realtime_kit.preset_get_preset_by_id_response import PresetGetPresetByIDResponse
+
+__all__ = ["PresetsResource", "AsyncPresetsResource"]
+
+
+class PresetsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> PresetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return PresetsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> PresetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return PresetsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        config: preset_create_params.Config,
+        name: str,
+        ui: preset_create_params.UI,
+        permissions: preset_create_params.Permissions | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PresetCreateResponse:
+        """
+        Creates a preset belonging to the current App
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          name: Name of the preset
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/presets",
+            body=maybe_transform(
+                {
+                    "config": config,
+                    "name": name,
+                    "ui": ui,
+                    "permissions": permissions,
+                },
+                preset_create_params.PresetCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=PresetCreateResponse,
+        )
+
+    def update(
+        self,
+        preset_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        config: preset_update_params.Config | Omit = omit,
+        name: str | Omit = omit,
+        permissions: preset_update_params.Permissions | Omit = omit,
+        ui: preset_update_params.UI | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PresetUpdateResponse:
+        """
+        Update a preset by the provided preset ID
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          name: Name of the preset
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not preset_id:
+            raise ValueError(f"Expected a non-empty value for `preset_id` but received {preset_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/presets/{preset_id}",
+            body=maybe_transform(
+                {
+                    "config": config,
+                    "name": name,
+                    "permissions": permissions,
+                    "ui": ui,
+                },
+                preset_update_params.PresetUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=PresetUpdateResponse,
+        )
+
+    def delete(
+        self,
+        preset_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PresetDeleteResponse:
+        """
+        Deletes a preset using the provided preset ID
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not preset_id:
+            raise ValueError(f"Expected a non-empty value for `preset_id` but received {preset_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/presets/{preset_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=PresetDeleteResponse,
+        )
+
+    def get(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        page_no: float | Omit = omit,
+        per_page: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PresetGetResponse:
+        """
+        Fetches all the presets belonging to an App.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          page_no: The page number from which you want your page search results to be displayed.
+
+          per_page: Number of results per page
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/presets",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page_no": page_no,
+                        "per_page": per_page,
+                    },
+                    preset_get_params.PresetGetParams,
+                ),
+            ),
+            cast_to=PresetGetResponse,
+        )
+
+    def get_preset_by_id(
+        self,
+        preset_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PresetGetPresetByIDResponse:
+        """
+        Fetches details of a preset using the provided preset ID
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not preset_id:
+            raise ValueError(f"Expected a non-empty value for `preset_id` but received {preset_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/presets/{preset_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=PresetGetPresetByIDResponse,
+        )
+
+
+class AsyncPresetsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncPresetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncPresetsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncPresetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncPresetsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        config: preset_create_params.Config,
+        name: str,
+        ui: preset_create_params.UI,
+        permissions: preset_create_params.Permissions | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PresetCreateResponse:
+        """
+        Creates a preset belonging to the current App
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          name: Name of the preset
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/presets",
+            body=await async_maybe_transform(
+                {
+                    "config": config,
+                    "name": name,
+                    "ui": ui,
+                    "permissions": permissions,
+                },
+                preset_create_params.PresetCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=PresetCreateResponse,
+        )
+
+    async def update(
+        self,
+        preset_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        config: preset_update_params.Config | Omit = omit,
+        name: str | Omit = omit,
+        permissions: preset_update_params.Permissions | Omit = omit,
+        ui: preset_update_params.UI | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PresetUpdateResponse:
+        """
+        Update a preset by the provided preset ID
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          name: Name of the preset
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not preset_id:
+            raise ValueError(f"Expected a non-empty value for `preset_id` but received {preset_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/presets/{preset_id}",
+            body=await async_maybe_transform(
+                {
+                    "config": config,
+                    "name": name,
+                    "permissions": permissions,
+                    "ui": ui,
+                },
+                preset_update_params.PresetUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=PresetUpdateResponse,
+        )
+
+    async def delete(
+        self,
+        preset_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PresetDeleteResponse:
+        """
+        Deletes a preset using the provided preset ID
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not preset_id:
+            raise ValueError(f"Expected a non-empty value for `preset_id` but received {preset_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/presets/{preset_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=PresetDeleteResponse,
+        )
+
+    async def get(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        page_no: float | Omit = omit,
+        per_page: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PresetGetResponse:
+        """
+        Fetches all the presets belonging to an App.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          page_no: The page number from which you want your page search results to be displayed.
+
+          per_page: Number of results per page
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/presets",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "page_no": page_no,
+                        "per_page": per_page,
+                    },
+                    preset_get_params.PresetGetParams,
+                ),
+            ),
+            cast_to=PresetGetResponse,
+        )
+
+    async def get_preset_by_id(
+        self,
+        preset_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PresetGetPresetByIDResponse:
+        """
+        Fetches details of a preset using the provided preset ID
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not preset_id:
+            raise ValueError(f"Expected a non-empty value for `preset_id` but received {preset_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/presets/{preset_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=PresetGetPresetByIDResponse,
+        )
+
+
+class PresetsResourceWithRawResponse:
+    def __init__(self, presets: PresetsResource) -> None:
+        self._presets = presets
+
+        self.create = to_raw_response_wrapper(
+            presets.create,
+        )
+        self.update = to_raw_response_wrapper(
+            presets.update,
+        )
+        self.delete = to_raw_response_wrapper(
+            presets.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            presets.get,
+        )
+        self.get_preset_by_id = to_raw_response_wrapper(
+            presets.get_preset_by_id,
+        )
+
+
+class AsyncPresetsResourceWithRawResponse:
+    def __init__(self, presets: AsyncPresetsResource) -> None:
+        self._presets = presets
+
+        self.create = async_to_raw_response_wrapper(
+            presets.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            presets.update,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            presets.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            presets.get,
+        )
+        self.get_preset_by_id = async_to_raw_response_wrapper(
+            presets.get_preset_by_id,
+        )
+
+
+class PresetsResourceWithStreamingResponse:
+    def __init__(self, presets: PresetsResource) -> None:
+        self._presets = presets
+
+        self.create = to_streamed_response_wrapper(
+            presets.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            presets.update,
+        )
+        self.delete = to_streamed_response_wrapper(
+            presets.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            presets.get,
+        )
+        self.get_preset_by_id = to_streamed_response_wrapper(
+            presets.get_preset_by_id,
+        )
+
+
+class AsyncPresetsResourceWithStreamingResponse:
+    def __init__(self, presets: AsyncPresetsResource) -> None:
+        self._presets = presets
+
+        self.create = async_to_streamed_response_wrapper(
+            presets.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            presets.update,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            presets.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            presets.get,
+        )
+        self.get_preset_by_id = async_to_streamed_response_wrapper(
+            presets.get_preset_by_id,
+        )
diff --git a/src/cloudflare/resources/realtime_kit/realtime_kit.py b/src/cloudflare/resources/realtime_kit/realtime_kit.py
new file mode 100644
index 00000000000..445bf22ce08
--- /dev/null
+++ b/src/cloudflare/resources/realtime_kit/realtime_kit.py
@@ -0,0 +1,358 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .apps import (
+    AppsResource,
+    AsyncAppsResource,
+    AppsResourceWithRawResponse,
+    AsyncAppsResourceWithRawResponse,
+    AppsResourceWithStreamingResponse,
+    AsyncAppsResourceWithStreamingResponse,
+)
+from .presets import (
+    PresetsResource,
+    AsyncPresetsResource,
+    PresetsResourceWithRawResponse,
+    AsyncPresetsResourceWithRawResponse,
+    PresetsResourceWithStreamingResponse,
+    AsyncPresetsResourceWithStreamingResponse,
+)
+from .meetings import (
+    MeetingsResource,
+    AsyncMeetingsResource,
+    MeetingsResourceWithRawResponse,
+    AsyncMeetingsResourceWithRawResponse,
+    MeetingsResourceWithStreamingResponse,
+    AsyncMeetingsResourceWithStreamingResponse,
+)
+from .sessions import (
+    SessionsResource,
+    AsyncSessionsResource,
+    SessionsResourceWithRawResponse,
+    AsyncSessionsResourceWithRawResponse,
+    SessionsResourceWithStreamingResponse,
+    AsyncSessionsResourceWithStreamingResponse,
+)
+from .webhooks import (
+    WebhooksResource,
+    AsyncWebhooksResource,
+    WebhooksResourceWithRawResponse,
+    AsyncWebhooksResourceWithRawResponse,
+    WebhooksResourceWithStreamingResponse,
+    AsyncWebhooksResourceWithStreamingResponse,
+)
+from ..._compat import cached_property
+from .analytics import (
+    AnalyticsResource,
+    AsyncAnalyticsResource,
+    AnalyticsResourceWithRawResponse,
+    AsyncAnalyticsResourceWithRawResponse,
+    AnalyticsResourceWithStreamingResponse,
+    AsyncAnalyticsResourceWithStreamingResponse,
+)
+from .recordings import (
+    RecordingsResource,
+    AsyncRecordingsResource,
+    RecordingsResourceWithRawResponse,
+    AsyncRecordingsResourceWithRawResponse,
+    RecordingsResourceWithStreamingResponse,
+    AsyncRecordingsResourceWithStreamingResponse,
+)
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .livestreams import (
+    LivestreamsResource,
+    AsyncLivestreamsResource,
+    LivestreamsResourceWithRawResponse,
+    AsyncLivestreamsResourceWithRawResponse,
+    LivestreamsResourceWithStreamingResponse,
+    AsyncLivestreamsResourceWithStreamingResponse,
+)
+from .active_session import (
+    ActiveSessionResource,
+    AsyncActiveSessionResource,
+    ActiveSessionResourceWithRawResponse,
+    AsyncActiveSessionResourceWithRawResponse,
+    ActiveSessionResourceWithStreamingResponse,
+    AsyncActiveSessionResourceWithStreamingResponse,
+)
+
+__all__ = ["RealtimeKitResource", "AsyncRealtimeKitResource"]
+
+
+class RealtimeKitResource(SyncAPIResource):
+    @cached_property
+    def apps(self) -> AppsResource:
+        return AppsResource(self._client)
+
+    @cached_property
+    def meetings(self) -> MeetingsResource:
+        return MeetingsResource(self._client)
+
+    @cached_property
+    def presets(self) -> PresetsResource:
+        return PresetsResource(self._client)
+
+    @cached_property
+    def sessions(self) -> SessionsResource:
+        return SessionsResource(self._client)
+
+    @cached_property
+    def recordings(self) -> RecordingsResource:
+        return RecordingsResource(self._client)
+
+    @cached_property
+    def webhooks(self) -> WebhooksResource:
+        return WebhooksResource(self._client)
+
+    @cached_property
+    def active_session(self) -> ActiveSessionResource:
+        return ActiveSessionResource(self._client)
+
+    @cached_property
+    def livestreams(self) -> LivestreamsResource:
+        return LivestreamsResource(self._client)
+
+    @cached_property
+    def analytics(self) -> AnalyticsResource:
+        return AnalyticsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> RealtimeKitResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return RealtimeKitResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> RealtimeKitResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return RealtimeKitResourceWithStreamingResponse(self)
+
+
+class AsyncRealtimeKitResource(AsyncAPIResource):
+    @cached_property
+    def apps(self) -> AsyncAppsResource:
+        return AsyncAppsResource(self._client)
+
+    @cached_property
+    def meetings(self) -> AsyncMeetingsResource:
+        return AsyncMeetingsResource(self._client)
+
+    @cached_property
+    def presets(self) -> AsyncPresetsResource:
+        return AsyncPresetsResource(self._client)
+
+    @cached_property
+    def sessions(self) -> AsyncSessionsResource:
+        return AsyncSessionsResource(self._client)
+
+    @cached_property
+    def recordings(self) -> AsyncRecordingsResource:
+        return AsyncRecordingsResource(self._client)
+
+    @cached_property
+    def webhooks(self) -> AsyncWebhooksResource:
+        return AsyncWebhooksResource(self._client)
+
+    @cached_property
+    def active_session(self) -> AsyncActiveSessionResource:
+        return AsyncActiveSessionResource(self._client)
+
+    @cached_property
+    def livestreams(self) -> AsyncLivestreamsResource:
+        return AsyncLivestreamsResource(self._client)
+
+    @cached_property
+    def analytics(self) -> AsyncAnalyticsResource:
+        return AsyncAnalyticsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncRealtimeKitResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncRealtimeKitResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncRealtimeKitResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncRealtimeKitResourceWithStreamingResponse(self)
+
+
+class RealtimeKitResourceWithRawResponse:
+    def __init__(self, realtime_kit: RealtimeKitResource) -> None:
+        self._realtime_kit = realtime_kit
+
+    @cached_property
+    def apps(self) -> AppsResourceWithRawResponse:
+        return AppsResourceWithRawResponse(self._realtime_kit.apps)
+
+    @cached_property
+    def meetings(self) -> MeetingsResourceWithRawResponse:
+        return MeetingsResourceWithRawResponse(self._realtime_kit.meetings)
+
+    @cached_property
+    def presets(self) -> PresetsResourceWithRawResponse:
+        return PresetsResourceWithRawResponse(self._realtime_kit.presets)
+
+    @cached_property
+    def sessions(self) -> SessionsResourceWithRawResponse:
+        return SessionsResourceWithRawResponse(self._realtime_kit.sessions)
+
+    @cached_property
+    def recordings(self) -> RecordingsResourceWithRawResponse:
+        return RecordingsResourceWithRawResponse(self._realtime_kit.recordings)
+
+    @cached_property
+    def webhooks(self) -> WebhooksResourceWithRawResponse:
+        return WebhooksResourceWithRawResponse(self._realtime_kit.webhooks)
+
+    @cached_property
+    def active_session(self) -> ActiveSessionResourceWithRawResponse:
+        return ActiveSessionResourceWithRawResponse(self._realtime_kit.active_session)
+
+    @cached_property
+    def livestreams(self) -> LivestreamsResourceWithRawResponse:
+        return LivestreamsResourceWithRawResponse(self._realtime_kit.livestreams)
+
+    @cached_property
+    def analytics(self) -> AnalyticsResourceWithRawResponse:
+        return AnalyticsResourceWithRawResponse(self._realtime_kit.analytics)
+
+
+class AsyncRealtimeKitResourceWithRawResponse:
+    def __init__(self, realtime_kit: AsyncRealtimeKitResource) -> None:
+        self._realtime_kit = realtime_kit
+
+    @cached_property
+    def apps(self) -> AsyncAppsResourceWithRawResponse:
+        return AsyncAppsResourceWithRawResponse(self._realtime_kit.apps)
+
+    @cached_property
+    def meetings(self) -> AsyncMeetingsResourceWithRawResponse:
+        return AsyncMeetingsResourceWithRawResponse(self._realtime_kit.meetings)
+
+    @cached_property
+    def presets(self) -> AsyncPresetsResourceWithRawResponse:
+        return AsyncPresetsResourceWithRawResponse(self._realtime_kit.presets)
+
+    @cached_property
+    def sessions(self) -> AsyncSessionsResourceWithRawResponse:
+        return AsyncSessionsResourceWithRawResponse(self._realtime_kit.sessions)
+
+    @cached_property
+    def recordings(self) -> AsyncRecordingsResourceWithRawResponse:
+        return AsyncRecordingsResourceWithRawResponse(self._realtime_kit.recordings)
+
+    @cached_property
+    def webhooks(self) -> AsyncWebhooksResourceWithRawResponse:
+        return AsyncWebhooksResourceWithRawResponse(self._realtime_kit.webhooks)
+
+    @cached_property
+    def active_session(self) -> AsyncActiveSessionResourceWithRawResponse:
+        return AsyncActiveSessionResourceWithRawResponse(self._realtime_kit.active_session)
+
+    @cached_property
+    def livestreams(self) -> AsyncLivestreamsResourceWithRawResponse:
+        return AsyncLivestreamsResourceWithRawResponse(self._realtime_kit.livestreams)
+
+    @cached_property
+    def analytics(self) -> AsyncAnalyticsResourceWithRawResponse:
+        return AsyncAnalyticsResourceWithRawResponse(self._realtime_kit.analytics)
+
+
+class RealtimeKitResourceWithStreamingResponse:
+    def __init__(self, realtime_kit: RealtimeKitResource) -> None:
+        self._realtime_kit = realtime_kit
+
+    @cached_property
+    def apps(self) -> AppsResourceWithStreamingResponse:
+        return AppsResourceWithStreamingResponse(self._realtime_kit.apps)
+
+    @cached_property
+    def meetings(self) -> MeetingsResourceWithStreamingResponse:
+        return MeetingsResourceWithStreamingResponse(self._realtime_kit.meetings)
+
+    @cached_property
+    def presets(self) -> PresetsResourceWithStreamingResponse:
+        return PresetsResourceWithStreamingResponse(self._realtime_kit.presets)
+
+    @cached_property
+    def sessions(self) -> SessionsResourceWithStreamingResponse:
+        return SessionsResourceWithStreamingResponse(self._realtime_kit.sessions)
+
+    @cached_property
+    def recordings(self) -> RecordingsResourceWithStreamingResponse:
+        return RecordingsResourceWithStreamingResponse(self._realtime_kit.recordings)
+
+    @cached_property
+    def webhooks(self) -> WebhooksResourceWithStreamingResponse:
+        return WebhooksResourceWithStreamingResponse(self._realtime_kit.webhooks)
+
+    @cached_property
+    def active_session(self) -> ActiveSessionResourceWithStreamingResponse:
+        return ActiveSessionResourceWithStreamingResponse(self._realtime_kit.active_session)
+
+    @cached_property
+    def livestreams(self) -> LivestreamsResourceWithStreamingResponse:
+        return LivestreamsResourceWithStreamingResponse(self._realtime_kit.livestreams)
+
+    @cached_property
+    def analytics(self) -> AnalyticsResourceWithStreamingResponse:
+        return AnalyticsResourceWithStreamingResponse(self._realtime_kit.analytics)
+
+
+class AsyncRealtimeKitResourceWithStreamingResponse:
+    def __init__(self, realtime_kit: AsyncRealtimeKitResource) -> None:
+        self._realtime_kit = realtime_kit
+
+    @cached_property
+    def apps(self) -> AsyncAppsResourceWithStreamingResponse:
+        return AsyncAppsResourceWithStreamingResponse(self._realtime_kit.apps)
+
+    @cached_property
+    def meetings(self) -> AsyncMeetingsResourceWithStreamingResponse:
+        return AsyncMeetingsResourceWithStreamingResponse(self._realtime_kit.meetings)
+
+    @cached_property
+    def presets(self) -> AsyncPresetsResourceWithStreamingResponse:
+        return AsyncPresetsResourceWithStreamingResponse(self._realtime_kit.presets)
+
+    @cached_property
+    def sessions(self) -> AsyncSessionsResourceWithStreamingResponse:
+        return AsyncSessionsResourceWithStreamingResponse(self._realtime_kit.sessions)
+
+    @cached_property
+    def recordings(self) -> AsyncRecordingsResourceWithStreamingResponse:
+        return AsyncRecordingsResourceWithStreamingResponse(self._realtime_kit.recordings)
+
+    @cached_property
+    def webhooks(self) -> AsyncWebhooksResourceWithStreamingResponse:
+        return AsyncWebhooksResourceWithStreamingResponse(self._realtime_kit.webhooks)
+
+    @cached_property
+    def active_session(self) -> AsyncActiveSessionResourceWithStreamingResponse:
+        return AsyncActiveSessionResourceWithStreamingResponse(self._realtime_kit.active_session)
+
+    @cached_property
+    def livestreams(self) -> AsyncLivestreamsResourceWithStreamingResponse:
+        return AsyncLivestreamsResourceWithStreamingResponse(self._realtime_kit.livestreams)
+
+    @cached_property
+    def analytics(self) -> AsyncAnalyticsResourceWithStreamingResponse:
+        return AsyncAnalyticsResourceWithStreamingResponse(self._realtime_kit.analytics)
diff --git a/src/cloudflare/resources/realtime_kit/recordings.py b/src/cloudflare/resources/realtime_kit/recordings.py
new file mode 100644
index 00000000000..cb8f877b439
--- /dev/null
+++ b/src/cloudflare/resources/realtime_kit/recordings.py
@@ -0,0 +1,918 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.realtime_kit import (
+    recording_get_recordings_params,
+    recording_start_recordings_params,
+    recording_start_track_recording_params,
+    recording_pause_resume_stop_recording_params,
+)
+from ...types.realtime_kit.recording_get_recordings_response import RecordingGetRecordingsResponse
+from ...types.realtime_kit.recording_start_recordings_response import RecordingStartRecordingsResponse
+from ...types.realtime_kit.recording_get_one_recording_response import RecordingGetOneRecordingResponse
+from ...types.realtime_kit.recording_get_active_recordings_response import RecordingGetActiveRecordingsResponse
+from ...types.realtime_kit.recording_pause_resume_stop_recording_response import (
+    RecordingPauseResumeStopRecordingResponse,
+)
+
+__all__ = ["RecordingsResource", "AsyncRecordingsResource"]
+
+
+class RecordingsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> RecordingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return RecordingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> RecordingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return RecordingsResourceWithStreamingResponse(self)
+
+    def get_active_recordings(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RecordingGetActiveRecordingsResponse:
+        """
+        Returns the active recording details for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/recordings/active-recording/{meeting_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=RecordingGetActiveRecordingsResponse,
+        )
+
+    def get_one_recording(
+        self,
+        recording_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RecordingGetOneRecordingResponse:
+        """
+        Returns details of a recording for the given recording ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not recording_id:
+            raise ValueError(f"Expected a non-empty value for `recording_id` but received {recording_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/recordings/{recording_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=RecordingGetOneRecordingResponse,
+        )
+
+    def get_recordings(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        end_time: Union[str, datetime] | Omit = omit,
+        expired: bool | Omit = omit,
+        meeting_id: str | Omit = omit,
+        page_no: float | Omit = omit,
+        per_page: float | Omit = omit,
+        search: str | Omit = omit,
+        sort_by: Literal["invokedTime"] | Omit = omit,
+        sort_order: Literal["ASC", "DESC"] | Omit = omit,
+        start_time: Union[str, datetime] | Omit = omit,
+        status: List[Literal["INVOKED", "RECORDING", "UPLOADING", "UPLOADED"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RecordingGetRecordingsResponse:
+        """Returns all recordings for an App.
+
+        If the `meeting_id` parameter is passed,
+        returns all recordings for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          end_time: The end time range for which you want to retrieve the meetings. The time must be
+              specified in ISO format.
+
+          expired: If passed, only shows expired/non-expired recordings on RealtimeKit's bucket
+
+          meeting_id: ID of a meeting. Optional. Will limit results to only this meeting if passed.
+
+          page_no: The page number from which you want your page search results to be displayed.
+
+          per_page: Number of results per page
+
+          search: The search query string. You can search using the meeting ID or title.
+
+          start_time: The start time range for which you want to retrieve the meetings. The time must
+              be specified in ISO format.
+
+          status: Filter by one or more recording status
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/recordings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "end_time": end_time,
+                        "expired": expired,
+                        "meeting_id": meeting_id,
+                        "page_no": page_no,
+                        "per_page": per_page,
+                        "search": search,
+                        "sort_by": sort_by,
+                        "sort_order": sort_order,
+                        "start_time": start_time,
+                        "status": status,
+                    },
+                    recording_get_recordings_params.RecordingGetRecordingsParams,
+                ),
+            ),
+            cast_to=RecordingGetRecordingsResponse,
+        )
+
+    def pause_resume_stop_recording(
+        self,
+        recording_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        action: Literal["stop", "pause", "resume"],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RecordingPauseResumeStopRecordingResponse:
+        """
+        Pause/Resume/Stop a given recording ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not recording_id:
+            raise ValueError(f"Expected a non-empty value for `recording_id` but received {recording_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/recordings/{recording_id}",
+            body=maybe_transform(
+                {"action": action}, recording_pause_resume_stop_recording_params.RecordingPauseResumeStopRecordingParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=RecordingPauseResumeStopRecordingResponse,
+        )
+
+    def start_recordings(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        allow_multiple_recordings: bool | Omit = omit,
+        audio_config: recording_start_recordings_params.AudioConfig | Omit = omit,
+        file_name_prefix: str | Omit = omit,
+        interactive_config: recording_start_recordings_params.InteractiveConfig | Omit = omit,
+        max_seconds: int | Omit = omit,
+        meeting_id: str | Omit = omit,
+        realtimekit_bucket_config: recording_start_recordings_params.RealtimekitBucketConfig | Omit = omit,
+        rtmp_out_config: recording_start_recordings_params.RtmpOutConfig | Omit = omit,
+        storage_config: Optional[recording_start_recordings_params.StorageConfig] | Omit = omit,
+        url: str | Omit = omit,
+        video_config: recording_start_recordings_params.VideoConfig | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RecordingStartRecordingsResponse:
+        """Starts recording a meeting.
+
+        The meeting can be started by an App admin directly,
+        or a participant with permissions to start a recording, based on the type of
+        authorization used.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          allow_multiple_recordings: By default, a meeting allows only one recording to run at a time. Enabling the
+              `allow_multiple_recordings` parameter to true allows you to initiate multiple
+              recordings concurrently in the same meeting. This allows you to record separate
+              videos of the same meeting with different configurations, such as portrait mode
+              or landscape mode.
+
+          audio_config: Object containing configuration regarding the audio that is being recorded.
+
+          file_name_prefix: Update the recording file name.
+
+          interactive_config: Allows you to add timed metadata to your recordings, which are digital markers
+              inserted into a video file to provide contextual information at specific points
+              in the content range. The ID3 tags containing this information are available to
+              clients on the playback timeline in HLS format. The output files are generated
+              in a compressed .tar format.
+
+          max_seconds: Specifies the maximum duration for recording in seconds, ranging from a minimum
+              of 60 seconds to a maximum of 24 hours.
+
+          meeting_id: ID of the meeting to record.
+
+          url: Pass a custom url to record arbitary screen
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/recordings",
+            body=maybe_transform(
+                {
+                    "allow_multiple_recordings": allow_multiple_recordings,
+                    "audio_config": audio_config,
+                    "file_name_prefix": file_name_prefix,
+                    "interactive_config": interactive_config,
+                    "max_seconds": max_seconds,
+                    "meeting_id": meeting_id,
+                    "realtimekit_bucket_config": realtimekit_bucket_config,
+                    "rtmp_out_config": rtmp_out_config,
+                    "storage_config": storage_config,
+                    "url": url,
+                    "video_config": video_config,
+                },
+                recording_start_recordings_params.RecordingStartRecordingsParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=RecordingStartRecordingsResponse,
+        )
+
+    def start_track_recording(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        layers: Dict[str, recording_start_track_recording_params.Layers],
+        meeting_id: str,
+        max_seconds: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """Starts a track recording in a meeting.
+
+        Track recordings consist of "layers".
+        Layers are used to map audio/video tracks in a meeting to output destinations.
+        More information about track recordings is available in the
+        [Track Recordings Guide Page](https://docs.realtime.cloudflare.com/guides/capabilities/recording/recording-overview).
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          meeting_id: ID of the meeting to record.
+
+          max_seconds: Maximum seconds this recording should be active for (beta)
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/recordings/track",
+            body=maybe_transform(
+                {
+                    "layers": layers,
+                    "meeting_id": meeting_id,
+                    "max_seconds": max_seconds,
+                },
+                recording_start_track_recording_params.RecordingStartTrackRecordingParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+
+class AsyncRecordingsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncRecordingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncRecordingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncRecordingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncRecordingsResourceWithStreamingResponse(self)
+
+    async def get_active_recordings(
+        self,
+        meeting_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RecordingGetActiveRecordingsResponse:
+        """
+        Returns the active recording details for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not meeting_id:
+            raise ValueError(f"Expected a non-empty value for `meeting_id` but received {meeting_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/recordings/active-recording/{meeting_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=RecordingGetActiveRecordingsResponse,
+        )
+
+    async def get_one_recording(
+        self,
+        recording_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RecordingGetOneRecordingResponse:
+        """
+        Returns details of a recording for the given recording ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not recording_id:
+            raise ValueError(f"Expected a non-empty value for `recording_id` but received {recording_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/recordings/{recording_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=RecordingGetOneRecordingResponse,
+        )
+
+    async def get_recordings(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        end_time: Union[str, datetime] | Omit = omit,
+        expired: bool | Omit = omit,
+        meeting_id: str | Omit = omit,
+        page_no: float | Omit = omit,
+        per_page: float | Omit = omit,
+        search: str | Omit = omit,
+        sort_by: Literal["invokedTime"] | Omit = omit,
+        sort_order: Literal["ASC", "DESC"] | Omit = omit,
+        start_time: Union[str, datetime] | Omit = omit,
+        status: List[Literal["INVOKED", "RECORDING", "UPLOADING", "UPLOADED"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RecordingGetRecordingsResponse:
+        """Returns all recordings for an App.
+
+        If the `meeting_id` parameter is passed,
+        returns all recordings for the given meeting ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          end_time: The end time range for which you want to retrieve the meetings. The time must be
+              specified in ISO format.
+
+          expired: If passed, only shows expired/non-expired recordings on RealtimeKit's bucket
+
+          meeting_id: ID of a meeting. Optional. Will limit results to only this meeting if passed.
+
+          page_no: The page number from which you want your page search results to be displayed.
+
+          per_page: Number of results per page
+
+          search: The search query string. You can search using the meeting ID or title.
+
+          start_time: The start time range for which you want to retrieve the meetings. The time must
+              be specified in ISO format.
+
+          status: Filter by one or more recording status
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/recordings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "end_time": end_time,
+                        "expired": expired,
+                        "meeting_id": meeting_id,
+                        "page_no": page_no,
+                        "per_page": per_page,
+                        "search": search,
+                        "sort_by": sort_by,
+                        "sort_order": sort_order,
+                        "start_time": start_time,
+                        "status": status,
+                    },
+                    recording_get_recordings_params.RecordingGetRecordingsParams,
+                ),
+            ),
+            cast_to=RecordingGetRecordingsResponse,
+        )
+
+    async def pause_resume_stop_recording(
+        self,
+        recording_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        action: Literal["stop", "pause", "resume"],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RecordingPauseResumeStopRecordingResponse:
+        """
+        Pause/Resume/Stop a given recording ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not recording_id:
+            raise ValueError(f"Expected a non-empty value for `recording_id` but received {recording_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/recordings/{recording_id}",
+            body=await async_maybe_transform(
+                {"action": action}, recording_pause_resume_stop_recording_params.RecordingPauseResumeStopRecordingParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=RecordingPauseResumeStopRecordingResponse,
+        )
+
+    async def start_recordings(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        allow_multiple_recordings: bool | Omit = omit,
+        audio_config: recording_start_recordings_params.AudioConfig | Omit = omit,
+        file_name_prefix: str | Omit = omit,
+        interactive_config: recording_start_recordings_params.InteractiveConfig | Omit = omit,
+        max_seconds: int | Omit = omit,
+        meeting_id: str | Omit = omit,
+        realtimekit_bucket_config: recording_start_recordings_params.RealtimekitBucketConfig | Omit = omit,
+        rtmp_out_config: recording_start_recordings_params.RtmpOutConfig | Omit = omit,
+        storage_config: Optional[recording_start_recordings_params.StorageConfig] | Omit = omit,
+        url: str | Omit = omit,
+        video_config: recording_start_recordings_params.VideoConfig | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RecordingStartRecordingsResponse:
+        """Starts recording a meeting.
+
+        The meeting can be started by an App admin directly,
+        or a participant with permissions to start a recording, based on the type of
+        authorization used.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          allow_multiple_recordings: By default, a meeting allows only one recording to run at a time. Enabling the
+              `allow_multiple_recordings` parameter to true allows you to initiate multiple
+              recordings concurrently in the same meeting. This allows you to record separate
+              videos of the same meeting with different configurations, such as portrait mode
+              or landscape mode.
+
+          audio_config: Object containing configuration regarding the audio that is being recorded.
+
+          file_name_prefix: Update the recording file name.
+
+          interactive_config: Allows you to add timed metadata to your recordings, which are digital markers
+              inserted into a video file to provide contextual information at specific points
+              in the content range. The ID3 tags containing this information are available to
+              clients on the playback timeline in HLS format. The output files are generated
+              in a compressed .tar format.
+
+          max_seconds: Specifies the maximum duration for recording in seconds, ranging from a minimum
+              of 60 seconds to a maximum of 24 hours.
+
+          meeting_id: ID of the meeting to record.
+
+          url: Pass a custom url to record arbitary screen
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/recordings",
+            body=await async_maybe_transform(
+                {
+                    "allow_multiple_recordings": allow_multiple_recordings,
+                    "audio_config": audio_config,
+                    "file_name_prefix": file_name_prefix,
+                    "interactive_config": interactive_config,
+                    "max_seconds": max_seconds,
+                    "meeting_id": meeting_id,
+                    "realtimekit_bucket_config": realtimekit_bucket_config,
+                    "rtmp_out_config": rtmp_out_config,
+                    "storage_config": storage_config,
+                    "url": url,
+                    "video_config": video_config,
+                },
+                recording_start_recordings_params.RecordingStartRecordingsParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=RecordingStartRecordingsResponse,
+        )
+
+    async def start_track_recording(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        layers: Dict[str, recording_start_track_recording_params.Layers],
+        meeting_id: str,
+        max_seconds: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """Starts a track recording in a meeting.
+
+        Track recordings consist of "layers".
+        Layers are used to map audio/video tracks in a meeting to output destinations.
+        More information about track recordings is available in the
+        [Track Recordings Guide Page](https://docs.realtime.cloudflare.com/guides/capabilities/recording/recording-overview).
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          meeting_id: ID of the meeting to record.
+
+          max_seconds: Maximum seconds this recording should be active for (beta)
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/recordings/track",
+            body=await async_maybe_transform(
+                {
+                    "layers": layers,
+                    "meeting_id": meeting_id,
+                    "max_seconds": max_seconds,
+                },
+                recording_start_track_recording_params.RecordingStartTrackRecordingParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+
+class RecordingsResourceWithRawResponse:
+    def __init__(self, recordings: RecordingsResource) -> None:
+        self._recordings = recordings
+
+        self.get_active_recordings = to_raw_response_wrapper(
+            recordings.get_active_recordings,
+        )
+        self.get_one_recording = to_raw_response_wrapper(
+            recordings.get_one_recording,
+        )
+        self.get_recordings = to_raw_response_wrapper(
+            recordings.get_recordings,
+        )
+        self.pause_resume_stop_recording = to_raw_response_wrapper(
+            recordings.pause_resume_stop_recording,
+        )
+        self.start_recordings = to_raw_response_wrapper(
+            recordings.start_recordings,
+        )
+        self.start_track_recording = to_raw_response_wrapper(
+            recordings.start_track_recording,
+        )
+
+
+class AsyncRecordingsResourceWithRawResponse:
+    def __init__(self, recordings: AsyncRecordingsResource) -> None:
+        self._recordings = recordings
+
+        self.get_active_recordings = async_to_raw_response_wrapper(
+            recordings.get_active_recordings,
+        )
+        self.get_one_recording = async_to_raw_response_wrapper(
+            recordings.get_one_recording,
+        )
+        self.get_recordings = async_to_raw_response_wrapper(
+            recordings.get_recordings,
+        )
+        self.pause_resume_stop_recording = async_to_raw_response_wrapper(
+            recordings.pause_resume_stop_recording,
+        )
+        self.start_recordings = async_to_raw_response_wrapper(
+            recordings.start_recordings,
+        )
+        self.start_track_recording = async_to_raw_response_wrapper(
+            recordings.start_track_recording,
+        )
+
+
+class RecordingsResourceWithStreamingResponse:
+    def __init__(self, recordings: RecordingsResource) -> None:
+        self._recordings = recordings
+
+        self.get_active_recordings = to_streamed_response_wrapper(
+            recordings.get_active_recordings,
+        )
+        self.get_one_recording = to_streamed_response_wrapper(
+            recordings.get_one_recording,
+        )
+        self.get_recordings = to_streamed_response_wrapper(
+            recordings.get_recordings,
+        )
+        self.pause_resume_stop_recording = to_streamed_response_wrapper(
+            recordings.pause_resume_stop_recording,
+        )
+        self.start_recordings = to_streamed_response_wrapper(
+            recordings.start_recordings,
+        )
+        self.start_track_recording = to_streamed_response_wrapper(
+            recordings.start_track_recording,
+        )
+
+
+class AsyncRecordingsResourceWithStreamingResponse:
+    def __init__(self, recordings: AsyncRecordingsResource) -> None:
+        self._recordings = recordings
+
+        self.get_active_recordings = async_to_streamed_response_wrapper(
+            recordings.get_active_recordings,
+        )
+        self.get_one_recording = async_to_streamed_response_wrapper(
+            recordings.get_one_recording,
+        )
+        self.get_recordings = async_to_streamed_response_wrapper(
+            recordings.get_recordings,
+        )
+        self.pause_resume_stop_recording = async_to_streamed_response_wrapper(
+            recordings.pause_resume_stop_recording,
+        )
+        self.start_recordings = async_to_streamed_response_wrapper(
+            recordings.start_recordings,
+        )
+        self.start_track_recording = async_to_streamed_response_wrapper(
+            recordings.start_track_recording,
+        )
diff --git a/src/cloudflare/resources/realtime_kit/sessions.py b/src/cloudflare/resources/realtime_kit/sessions.py
new file mode 100644
index 00000000000..7f5aa6da4f7
--- /dev/null
+++ b/src/cloudflare/resources/realtime_kit/sessions.py
@@ -0,0 +1,1232 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.realtime_kit import (
+    session_get_sessions_params,
+    session_get_session_details_params,
+    session_get_session_participants_params,
+    session_get_session_participant_details_params,
+    session_get_participant_data_from_peer_id_params,
+)
+from ...types.realtime_kit.session_get_sessions_response import SessionGetSessionsResponse
+from ...types.realtime_kit.session_get_session_chat_response import SessionGetSessionChatResponse
+from ...types.realtime_kit.session_get_session_details_response import SessionGetSessionDetailsResponse
+from ...types.realtime_kit.session_get_session_summary_response import SessionGetSessionSummaryResponse
+from ...types.realtime_kit.session_get_session_transcripts_response import SessionGetSessionTranscriptsResponse
+from ...types.realtime_kit.session_get_session_participants_response import SessionGetSessionParticipantsResponse
+from ...types.realtime_kit.session_get_session_participant_details_response import (
+    SessionGetSessionParticipantDetailsResponse,
+)
+from ...types.realtime_kit.session_get_participant_data_from_peer_id_response import (
+    SessionGetParticipantDataFromPeerIDResponse,
+)
+
+__all__ = ["SessionsResource", "AsyncSessionsResource"]
+
+
+class SessionsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SessionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SessionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SessionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SessionsResourceWithStreamingResponse(self)
+
+    def generate_summary_of_transcripts(
+        self,
+        session_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Trigger Summary generation of Transcripts for the session ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not session_id:
+            raise ValueError(f"Expected a non-empty value for `session_id` but received {session_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/summary",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    def get_participant_data_from_peer_id(
+        self,
+        peer_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        filters: Literal["device_info", "ip_information", "precall_network_information", "events", "quality_stats"]
+        | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SessionGetParticipantDataFromPeerIDResponse:
+        """
+        Returns details of the given peer ID along with call statistics for the given
+        session ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          filters: Comma separated list of filters to apply. Note that there must be no spaces
+              between the filters.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not peer_id:
+            raise ValueError(f"Expected a non-empty value for `peer_id` but received {peer_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/sessions/peer-report/{peer_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {"filters": filters},
+                    session_get_participant_data_from_peer_id_params.SessionGetParticipantDataFromPeerIDParams,
+                ),
+            ),
+            cast_to=SessionGetParticipantDataFromPeerIDResponse,
+        )
+
+    def get_session_chat(
+        self,
+        session_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SessionGetSessionChatResponse:
+        """
+        Returns a URL to download all chat messages of the session ID in CSV format.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not session_id:
+            raise ValueError(f"Expected a non-empty value for `session_id` but received {session_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/chat",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SessionGetSessionChatResponse,
+        )
+
+    def get_session_details(
+        self,
+        session_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        include_breakout_rooms: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SessionGetSessionDetailsResponse:
+        """
+        Returns data of the given session ID including recording details.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          include_breakout_rooms: List all breakout rooms
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not session_id:
+            raise ValueError(f"Expected a non-empty value for `session_id` but received {session_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {"include_breakout_rooms": include_breakout_rooms},
+                    session_get_session_details_params.SessionGetSessionDetailsParams,
+                ),
+            ),
+            cast_to=SessionGetSessionDetailsResponse,
+        )
+
+    def get_session_participant_details(
+        self,
+        participant_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        session_id: str,
+        filters: Literal["device_info", "ip_information", "precall_network_information", "events", "quality_stats"]
+        | Omit = omit,
+        include_peer_events: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SessionGetSessionParticipantDetailsResponse:
+        """
+        Returns details of the given participant ID along with call statistics for the
+        given session ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          filters: Comma separated list of filters to apply. Note that there must be no spaces
+              between the filters.
+
+          include_peer_events: if true, response includes all the peer events of participant.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not session_id:
+            raise ValueError(f"Expected a non-empty value for `session_id` but received {session_id!r}")
+        if not participant_id:
+            raise ValueError(f"Expected a non-empty value for `participant_id` but received {participant_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/participants/{participant_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "filters": filters,
+                        "include_peer_events": include_peer_events,
+                    },
+                    session_get_session_participant_details_params.SessionGetSessionParticipantDetailsParams,
+                ),
+            ),
+            cast_to=SessionGetSessionParticipantDetailsResponse,
+        )
+
+    def get_session_participants(
+        self,
+        session_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        include_peer_events: bool | Omit = omit,
+        page_no: float | Omit = omit,
+        per_page: float | Omit = omit,
+        search: str | Omit = omit,
+        sort_by: Literal["joinedAt", "duration"] | Omit = omit,
+        sort_order: Literal["ASC", "DESC"] | Omit = omit,
+        view: Literal["raw", "consolidated"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SessionGetSessionParticipantsResponse:
+        """
+        Returns a list of participants for the given session ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          include_peer_events: if true, response includes all the peer events of participants.
+
+          page_no: The page number from which you want your page search results to be displayed.
+
+          per_page: Number of results per page
+
+          search: The search query string. You can search using the meeting ID or title.
+
+          view: In breakout room sessions, the view parameter can be set to `raw` for session
+              specific duration for participants or `consolidated` to accumulate breakout room
+              durations.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not session_id:
+            raise ValueError(f"Expected a non-empty value for `session_id` but received {session_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/participants",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "include_peer_events": include_peer_events,
+                        "page_no": page_no,
+                        "per_page": per_page,
+                        "search": search,
+                        "sort_by": sort_by,
+                        "sort_order": sort_order,
+                        "view": view,
+                    },
+                    session_get_session_participants_params.SessionGetSessionParticipantsParams,
+                ),
+            ),
+            cast_to=SessionGetSessionParticipantsResponse,
+        )
+
+    def get_session_summary(
+        self,
+        session_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SessionGetSessionSummaryResponse:
+        """
+        Returns a Summary URL to download the Summary of Transcripts for the session ID
+        as plain text.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not session_id:
+            raise ValueError(f"Expected a non-empty value for `session_id` but received {session_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/summary",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SessionGetSessionSummaryResponse,
+        )
+
+    def get_session_transcripts(
+        self,
+        session_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SessionGetSessionTranscriptsResponse:
+        """
+        Returns a URL to download the transcript for the session ID in CSV format.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not session_id:
+            raise ValueError(f"Expected a non-empty value for `session_id` but received {session_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/transcript",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SessionGetSessionTranscriptsResponse,
+        )
+
+    def get_sessions(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        associated_id: str | Omit = omit,
+        end_time: Union[str, datetime] | Omit = omit,
+        page_no: float | Omit = omit,
+        participants: str | Omit = omit,
+        per_page: float | Omit = omit,
+        search: str | Omit = omit,
+        sort_by: Literal["minutesConsumed", "createdAt"] | Omit = omit,
+        sort_order: Literal["ASC", "DESC"] | Omit = omit,
+        start_time: Union[str, datetime] | Omit = omit,
+        status: Literal["LIVE", "ENDED"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SessionGetSessionsResponse:
+        """
+        Returns details of all sessions of an App.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          associated_id: ID of the meeting that sessions should be associated with
+
+          end_time: The end time range for which you want to retrieve the meetings. The time must be
+              specified in ISO format.
+
+          page_no: The page number from which you want your page search results to be displayed.
+
+          per_page: Number of results per page
+
+          search: Search string that matches sessions based on meeting title, meeting ID, and
+              session ID
+
+          start_time: The start time range for which you want to retrieve the meetings. The time must
+              be specified in ISO format.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/sessions",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "associated_id": associated_id,
+                        "end_time": end_time,
+                        "page_no": page_no,
+                        "participants": participants,
+                        "per_page": per_page,
+                        "search": search,
+                        "sort_by": sort_by,
+                        "sort_order": sort_order,
+                        "start_time": start_time,
+                        "status": status,
+                    },
+                    session_get_sessions_params.SessionGetSessionsParams,
+                ),
+            ),
+            cast_to=SessionGetSessionsResponse,
+        )
+
+
+class AsyncSessionsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSessionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSessionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSessionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSessionsResourceWithStreamingResponse(self)
+
+    async def generate_summary_of_transcripts(
+        self,
+        session_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Trigger Summary generation of Transcripts for the session ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not session_id:
+            raise ValueError(f"Expected a non-empty value for `session_id` but received {session_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/summary",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    async def get_participant_data_from_peer_id(
+        self,
+        peer_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        filters: Literal["device_info", "ip_information", "precall_network_information", "events", "quality_stats"]
+        | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SessionGetParticipantDataFromPeerIDResponse:
+        """
+        Returns details of the given peer ID along with call statistics for the given
+        session ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          filters: Comma separated list of filters to apply. Note that there must be no spaces
+              between the filters.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not peer_id:
+            raise ValueError(f"Expected a non-empty value for `peer_id` but received {peer_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/sessions/peer-report/{peer_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"filters": filters},
+                    session_get_participant_data_from_peer_id_params.SessionGetParticipantDataFromPeerIDParams,
+                ),
+            ),
+            cast_to=SessionGetParticipantDataFromPeerIDResponse,
+        )
+
+    async def get_session_chat(
+        self,
+        session_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SessionGetSessionChatResponse:
+        """
+        Returns a URL to download all chat messages of the session ID in CSV format.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not session_id:
+            raise ValueError(f"Expected a non-empty value for `session_id` but received {session_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/chat",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SessionGetSessionChatResponse,
+        )
+
+    async def get_session_details(
+        self,
+        session_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        include_breakout_rooms: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SessionGetSessionDetailsResponse:
+        """
+        Returns data of the given session ID including recording details.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          include_breakout_rooms: List all breakout rooms
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not session_id:
+            raise ValueError(f"Expected a non-empty value for `session_id` but received {session_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"include_breakout_rooms": include_breakout_rooms},
+                    session_get_session_details_params.SessionGetSessionDetailsParams,
+                ),
+            ),
+            cast_to=SessionGetSessionDetailsResponse,
+        )
+
+    async def get_session_participant_details(
+        self,
+        participant_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        session_id: str,
+        filters: Literal["device_info", "ip_information", "precall_network_information", "events", "quality_stats"]
+        | Omit = omit,
+        include_peer_events: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SessionGetSessionParticipantDetailsResponse:
+        """
+        Returns details of the given participant ID along with call statistics for the
+        given session ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          filters: Comma separated list of filters to apply. Note that there must be no spaces
+              between the filters.
+
+          include_peer_events: if true, response includes all the peer events of participant.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not session_id:
+            raise ValueError(f"Expected a non-empty value for `session_id` but received {session_id!r}")
+        if not participant_id:
+            raise ValueError(f"Expected a non-empty value for `participant_id` but received {participant_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/participants/{participant_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "filters": filters,
+                        "include_peer_events": include_peer_events,
+                    },
+                    session_get_session_participant_details_params.SessionGetSessionParticipantDetailsParams,
+                ),
+            ),
+            cast_to=SessionGetSessionParticipantDetailsResponse,
+        )
+
+    async def get_session_participants(
+        self,
+        session_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        include_peer_events: bool | Omit = omit,
+        page_no: float | Omit = omit,
+        per_page: float | Omit = omit,
+        search: str | Omit = omit,
+        sort_by: Literal["joinedAt", "duration"] | Omit = omit,
+        sort_order: Literal["ASC", "DESC"] | Omit = omit,
+        view: Literal["raw", "consolidated"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SessionGetSessionParticipantsResponse:
+        """
+        Returns a list of participants for the given session ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          include_peer_events: if true, response includes all the peer events of participants.
+
+          page_no: The page number from which you want your page search results to be displayed.
+
+          per_page: Number of results per page
+
+          search: The search query string. You can search using the meeting ID or title.
+
+          view: In breakout room sessions, the view parameter can be set to `raw` for session
+              specific duration for participants or `consolidated` to accumulate breakout room
+              durations.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not session_id:
+            raise ValueError(f"Expected a non-empty value for `session_id` but received {session_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/participants",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "include_peer_events": include_peer_events,
+                        "page_no": page_no,
+                        "per_page": per_page,
+                        "search": search,
+                        "sort_by": sort_by,
+                        "sort_order": sort_order,
+                        "view": view,
+                    },
+                    session_get_session_participants_params.SessionGetSessionParticipantsParams,
+                ),
+            ),
+            cast_to=SessionGetSessionParticipantsResponse,
+        )
+
+    async def get_session_summary(
+        self,
+        session_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SessionGetSessionSummaryResponse:
+        """
+        Returns a Summary URL to download the Summary of Transcripts for the session ID
+        as plain text.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not session_id:
+            raise ValueError(f"Expected a non-empty value for `session_id` but received {session_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/summary",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SessionGetSessionSummaryResponse,
+        )
+
+    async def get_session_transcripts(
+        self,
+        session_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SessionGetSessionTranscriptsResponse:
+        """
+        Returns a URL to download the transcript for the session ID in CSV format.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not session_id:
+            raise ValueError(f"Expected a non-empty value for `session_id` but received {session_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/sessions/{session_id}/transcript",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SessionGetSessionTranscriptsResponse,
+        )
+
+    async def get_sessions(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        associated_id: str | Omit = omit,
+        end_time: Union[str, datetime] | Omit = omit,
+        page_no: float | Omit = omit,
+        participants: str | Omit = omit,
+        per_page: float | Omit = omit,
+        search: str | Omit = omit,
+        sort_by: Literal["minutesConsumed", "createdAt"] | Omit = omit,
+        sort_order: Literal["ASC", "DESC"] | Omit = omit,
+        start_time: Union[str, datetime] | Omit = omit,
+        status: Literal["LIVE", "ENDED"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SessionGetSessionsResponse:
+        """
+        Returns details of all sessions of an App.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          associated_id: ID of the meeting that sessions should be associated with
+
+          end_time: The end time range for which you want to retrieve the meetings. The time must be
+              specified in ISO format.
+
+          page_no: The page number from which you want your page search results to be displayed.
+
+          per_page: Number of results per page
+
+          search: Search string that matches sessions based on meeting title, meeting ID, and
+              session ID
+
+          start_time: The start time range for which you want to retrieve the meetings. The time must
+              be specified in ISO format.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/sessions",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "associated_id": associated_id,
+                        "end_time": end_time,
+                        "page_no": page_no,
+                        "participants": participants,
+                        "per_page": per_page,
+                        "search": search,
+                        "sort_by": sort_by,
+                        "sort_order": sort_order,
+                        "start_time": start_time,
+                        "status": status,
+                    },
+                    session_get_sessions_params.SessionGetSessionsParams,
+                ),
+            ),
+            cast_to=SessionGetSessionsResponse,
+        )
+
+
+class SessionsResourceWithRawResponse:
+    def __init__(self, sessions: SessionsResource) -> None:
+        self._sessions = sessions
+
+        self.generate_summary_of_transcripts = to_raw_response_wrapper(
+            sessions.generate_summary_of_transcripts,
+        )
+        self.get_participant_data_from_peer_id = to_raw_response_wrapper(
+            sessions.get_participant_data_from_peer_id,
+        )
+        self.get_session_chat = to_raw_response_wrapper(
+            sessions.get_session_chat,
+        )
+        self.get_session_details = to_raw_response_wrapper(
+            sessions.get_session_details,
+        )
+        self.get_session_participant_details = to_raw_response_wrapper(
+            sessions.get_session_participant_details,
+        )
+        self.get_session_participants = to_raw_response_wrapper(
+            sessions.get_session_participants,
+        )
+        self.get_session_summary = to_raw_response_wrapper(
+            sessions.get_session_summary,
+        )
+        self.get_session_transcripts = to_raw_response_wrapper(
+            sessions.get_session_transcripts,
+        )
+        self.get_sessions = to_raw_response_wrapper(
+            sessions.get_sessions,
+        )
+
+
+class AsyncSessionsResourceWithRawResponse:
+    def __init__(self, sessions: AsyncSessionsResource) -> None:
+        self._sessions = sessions
+
+        self.generate_summary_of_transcripts = async_to_raw_response_wrapper(
+            sessions.generate_summary_of_transcripts,
+        )
+        self.get_participant_data_from_peer_id = async_to_raw_response_wrapper(
+            sessions.get_participant_data_from_peer_id,
+        )
+        self.get_session_chat = async_to_raw_response_wrapper(
+            sessions.get_session_chat,
+        )
+        self.get_session_details = async_to_raw_response_wrapper(
+            sessions.get_session_details,
+        )
+        self.get_session_participant_details = async_to_raw_response_wrapper(
+            sessions.get_session_participant_details,
+        )
+        self.get_session_participants = async_to_raw_response_wrapper(
+            sessions.get_session_participants,
+        )
+        self.get_session_summary = async_to_raw_response_wrapper(
+            sessions.get_session_summary,
+        )
+        self.get_session_transcripts = async_to_raw_response_wrapper(
+            sessions.get_session_transcripts,
+        )
+        self.get_sessions = async_to_raw_response_wrapper(
+            sessions.get_sessions,
+        )
+
+
+class SessionsResourceWithStreamingResponse:
+    def __init__(self, sessions: SessionsResource) -> None:
+        self._sessions = sessions
+
+        self.generate_summary_of_transcripts = to_streamed_response_wrapper(
+            sessions.generate_summary_of_transcripts,
+        )
+        self.get_participant_data_from_peer_id = to_streamed_response_wrapper(
+            sessions.get_participant_data_from_peer_id,
+        )
+        self.get_session_chat = to_streamed_response_wrapper(
+            sessions.get_session_chat,
+        )
+        self.get_session_details = to_streamed_response_wrapper(
+            sessions.get_session_details,
+        )
+        self.get_session_participant_details = to_streamed_response_wrapper(
+            sessions.get_session_participant_details,
+        )
+        self.get_session_participants = to_streamed_response_wrapper(
+            sessions.get_session_participants,
+        )
+        self.get_session_summary = to_streamed_response_wrapper(
+            sessions.get_session_summary,
+        )
+        self.get_session_transcripts = to_streamed_response_wrapper(
+            sessions.get_session_transcripts,
+        )
+        self.get_sessions = to_streamed_response_wrapper(
+            sessions.get_sessions,
+        )
+
+
+class AsyncSessionsResourceWithStreamingResponse:
+    def __init__(self, sessions: AsyncSessionsResource) -> None:
+        self._sessions = sessions
+
+        self.generate_summary_of_transcripts = async_to_streamed_response_wrapper(
+            sessions.generate_summary_of_transcripts,
+        )
+        self.get_participant_data_from_peer_id = async_to_streamed_response_wrapper(
+            sessions.get_participant_data_from_peer_id,
+        )
+        self.get_session_chat = async_to_streamed_response_wrapper(
+            sessions.get_session_chat,
+        )
+        self.get_session_details = async_to_streamed_response_wrapper(
+            sessions.get_session_details,
+        )
+        self.get_session_participant_details = async_to_streamed_response_wrapper(
+            sessions.get_session_participant_details,
+        )
+        self.get_session_participants = async_to_streamed_response_wrapper(
+            sessions.get_session_participants,
+        )
+        self.get_session_summary = async_to_streamed_response_wrapper(
+            sessions.get_session_summary,
+        )
+        self.get_session_transcripts = async_to_streamed_response_wrapper(
+            sessions.get_session_transcripts,
+        )
+        self.get_sessions = async_to_streamed_response_wrapper(
+            sessions.get_sessions,
+        )
diff --git a/src/cloudflare/resources/realtime_kit/webhooks.py b/src/cloudflare/resources/realtime_kit/webhooks.py
new file mode 100644
index 00000000000..c085c1e97b1
--- /dev/null
+++ b/src/cloudflare/resources/realtime_kit/webhooks.py
@@ -0,0 +1,871 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.realtime_kit import (
+    webhook_edit_webhook_params,
+    webhook_create_webhook_params,
+    webhook_replace_webhook_params,
+)
+from ...types.realtime_kit.webhook_edit_webhook_response import WebhookEditWebhookResponse
+from ...types.realtime_kit.webhook_get_webhooks_response import WebhookGetWebhooksResponse
+from ...types.realtime_kit.webhook_create_webhook_response import WebhookCreateWebhookResponse
+from ...types.realtime_kit.webhook_delete_webhook_response import WebhookDeleteWebhookResponse
+from ...types.realtime_kit.webhook_replace_webhook_response import WebhookReplaceWebhookResponse
+from ...types.realtime_kit.webhook_get_webhook_by_id_response import WebhookGetWebhookByIDResponse
+
+__all__ = ["WebhooksResource", "AsyncWebhooksResource"]
+
+
+class WebhooksResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> WebhooksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return WebhooksResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> WebhooksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return WebhooksResourceWithStreamingResponse(self)
+
+    def create_webhook(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        events: List[
+            Literal[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ]
+        ],
+        name: str,
+        url: str,
+        enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WebhookCreateWebhookResponse:
+        """
+        Adds a new webhook to an App.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          events: Events that this webhook will get triggered by
+
+          name: Name of the webhook
+
+          url: URL this webhook will send events to
+
+          enabled: Set whether or not the webhook should be active when created
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/webhooks",
+            body=maybe_transform(
+                {
+                    "events": events,
+                    "name": name,
+                    "url": url,
+                    "enabled": enabled,
+                },
+                webhook_create_webhook_params.WebhookCreateWebhookParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=WebhookCreateWebhookResponse,
+        )
+
+    def delete_webhook(
+        self,
+        webhook_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WebhookDeleteWebhookResponse:
+        """
+        Removes a webhook for the given webhook ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not webhook_id:
+            raise ValueError(f"Expected a non-empty value for `webhook_id` but received {webhook_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/webhooks/{webhook_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=WebhookDeleteWebhookResponse,
+        )
+
+    def edit_webhook(
+        self,
+        webhook_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        enabled: bool | Omit = omit,
+        events: List[
+            Literal[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.chatSynced",
+                "meeting.transcript",
+                "meeting.summary",
+            ]
+        ]
+        | Omit = omit,
+        name: str | Omit = omit,
+        url: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WebhookEditWebhookResponse:
+        """
+        Edits the webhook details for the given webhook ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          events: Events that the webhook will get triggered by
+
+          name: Name of the webhook
+
+          url: URL the webhook will send events to
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not webhook_id:
+            raise ValueError(f"Expected a non-empty value for `webhook_id` but received {webhook_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/webhooks/{webhook_id}",
+            body=maybe_transform(
+                {
+                    "enabled": enabled,
+                    "events": events,
+                    "name": name,
+                    "url": url,
+                },
+                webhook_edit_webhook_params.WebhookEditWebhookParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=WebhookEditWebhookResponse,
+        )
+
+    def get_webhook_by_id(
+        self,
+        webhook_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WebhookGetWebhookByIDResponse:
+        """
+        Returns webhook details for the given webhook ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not webhook_id:
+            raise ValueError(f"Expected a non-empty value for `webhook_id` but received {webhook_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/webhooks/{webhook_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=WebhookGetWebhookByIDResponse,
+        )
+
+    def get_webhooks(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WebhookGetWebhooksResponse:
+        """
+        Returns details of all webhooks for an App.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/webhooks",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=WebhookGetWebhooksResponse,
+        )
+
+    def replace_webhook(
+        self,
+        webhook_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        events: List[
+            Literal[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ]
+        ],
+        name: str,
+        url: str,
+        enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WebhookReplaceWebhookResponse:
+        """
+        Replace all details for the given webhook ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          events: Events that this webhook will get triggered by
+
+          name: Name of the webhook
+
+          url: URL this webhook will send events to
+
+          enabled: Set whether or not the webhook should be active when created
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not webhook_id:
+            raise ValueError(f"Expected a non-empty value for `webhook_id` but received {webhook_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/webhooks/{webhook_id}",
+            body=maybe_transform(
+                {
+                    "events": events,
+                    "name": name,
+                    "url": url,
+                    "enabled": enabled,
+                },
+                webhook_replace_webhook_params.WebhookReplaceWebhookParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=WebhookReplaceWebhookResponse,
+        )
+
+
+class AsyncWebhooksResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncWebhooksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncWebhooksResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncWebhooksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncWebhooksResourceWithStreamingResponse(self)
+
+    async def create_webhook(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        events: List[
+            Literal[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ]
+        ],
+        name: str,
+        url: str,
+        enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WebhookCreateWebhookResponse:
+        """
+        Adds a new webhook to an App.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          events: Events that this webhook will get triggered by
+
+          name: Name of the webhook
+
+          url: URL this webhook will send events to
+
+          enabled: Set whether or not the webhook should be active when created
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/webhooks",
+            body=await async_maybe_transform(
+                {
+                    "events": events,
+                    "name": name,
+                    "url": url,
+                    "enabled": enabled,
+                },
+                webhook_create_webhook_params.WebhookCreateWebhookParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=WebhookCreateWebhookResponse,
+        )
+
+    async def delete_webhook(
+        self,
+        webhook_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WebhookDeleteWebhookResponse:
+        """
+        Removes a webhook for the given webhook ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not webhook_id:
+            raise ValueError(f"Expected a non-empty value for `webhook_id` but received {webhook_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/webhooks/{webhook_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=WebhookDeleteWebhookResponse,
+        )
+
+    async def edit_webhook(
+        self,
+        webhook_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        enabled: bool | Omit = omit,
+        events: List[
+            Literal[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.chatSynced",
+                "meeting.transcript",
+                "meeting.summary",
+            ]
+        ]
+        | Omit = omit,
+        name: str | Omit = omit,
+        url: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WebhookEditWebhookResponse:
+        """
+        Edits the webhook details for the given webhook ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          events: Events that the webhook will get triggered by
+
+          name: Name of the webhook
+
+          url: URL the webhook will send events to
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not webhook_id:
+            raise ValueError(f"Expected a non-empty value for `webhook_id` but received {webhook_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/webhooks/{webhook_id}",
+            body=await async_maybe_transform(
+                {
+                    "enabled": enabled,
+                    "events": events,
+                    "name": name,
+                    "url": url,
+                },
+                webhook_edit_webhook_params.WebhookEditWebhookParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=WebhookEditWebhookResponse,
+        )
+
+    async def get_webhook_by_id(
+        self,
+        webhook_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WebhookGetWebhookByIDResponse:
+        """
+        Returns webhook details for the given webhook ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not webhook_id:
+            raise ValueError(f"Expected a non-empty value for `webhook_id` but received {webhook_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/webhooks/{webhook_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=WebhookGetWebhookByIDResponse,
+        )
+
+    async def get_webhooks(
+        self,
+        app_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WebhookGetWebhooksResponse:
+        """
+        Returns details of all webhooks for an App.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/webhooks",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=WebhookGetWebhooksResponse,
+        )
+
+    async def replace_webhook(
+        self,
+        webhook_id: str,
+        *,
+        account_id: str,
+        app_id: str,
+        events: List[
+            Literal[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ]
+        ],
+        name: str,
+        url: str,
+        enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WebhookReplaceWebhookResponse:
+        """
+        Replace all details for the given webhook ID.
+
+        Args:
+          account_id: The account identifier tag.
+
+          app_id: The app identifier tag.
+
+          events: Events that this webhook will get triggered by
+
+          name: Name of the webhook
+
+          url: URL this webhook will send events to
+
+          enabled: Set whether or not the webhook should be active when created
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if not webhook_id:
+            raise ValueError(f"Expected a non-empty value for `webhook_id` but received {webhook_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/realtime/kit/{app_id}/webhooks/{webhook_id}",
+            body=await async_maybe_transform(
+                {
+                    "events": events,
+                    "name": name,
+                    "url": url,
+                    "enabled": enabled,
+                },
+                webhook_replace_webhook_params.WebhookReplaceWebhookParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=WebhookReplaceWebhookResponse,
+        )
+
+
+class WebhooksResourceWithRawResponse:
+    def __init__(self, webhooks: WebhooksResource) -> None:
+        self._webhooks = webhooks
+
+        self.create_webhook = to_raw_response_wrapper(
+            webhooks.create_webhook,
+        )
+        self.delete_webhook = to_raw_response_wrapper(
+            webhooks.delete_webhook,
+        )
+        self.edit_webhook = to_raw_response_wrapper(
+            webhooks.edit_webhook,
+        )
+        self.get_webhook_by_id = to_raw_response_wrapper(
+            webhooks.get_webhook_by_id,
+        )
+        self.get_webhooks = to_raw_response_wrapper(
+            webhooks.get_webhooks,
+        )
+        self.replace_webhook = to_raw_response_wrapper(
+            webhooks.replace_webhook,
+        )
+
+
+class AsyncWebhooksResourceWithRawResponse:
+    def __init__(self, webhooks: AsyncWebhooksResource) -> None:
+        self._webhooks = webhooks
+
+        self.create_webhook = async_to_raw_response_wrapper(
+            webhooks.create_webhook,
+        )
+        self.delete_webhook = async_to_raw_response_wrapper(
+            webhooks.delete_webhook,
+        )
+        self.edit_webhook = async_to_raw_response_wrapper(
+            webhooks.edit_webhook,
+        )
+        self.get_webhook_by_id = async_to_raw_response_wrapper(
+            webhooks.get_webhook_by_id,
+        )
+        self.get_webhooks = async_to_raw_response_wrapper(
+            webhooks.get_webhooks,
+        )
+        self.replace_webhook = async_to_raw_response_wrapper(
+            webhooks.replace_webhook,
+        )
+
+
+class WebhooksResourceWithStreamingResponse:
+    def __init__(self, webhooks: WebhooksResource) -> None:
+        self._webhooks = webhooks
+
+        self.create_webhook = to_streamed_response_wrapper(
+            webhooks.create_webhook,
+        )
+        self.delete_webhook = to_streamed_response_wrapper(
+            webhooks.delete_webhook,
+        )
+        self.edit_webhook = to_streamed_response_wrapper(
+            webhooks.edit_webhook,
+        )
+        self.get_webhook_by_id = to_streamed_response_wrapper(
+            webhooks.get_webhook_by_id,
+        )
+        self.get_webhooks = to_streamed_response_wrapper(
+            webhooks.get_webhooks,
+        )
+        self.replace_webhook = to_streamed_response_wrapper(
+            webhooks.replace_webhook,
+        )
+
+
+class AsyncWebhooksResourceWithStreamingResponse:
+    def __init__(self, webhooks: AsyncWebhooksResource) -> None:
+        self._webhooks = webhooks
+
+        self.create_webhook = async_to_streamed_response_wrapper(
+            webhooks.create_webhook,
+        )
+        self.delete_webhook = async_to_streamed_response_wrapper(
+            webhooks.delete_webhook,
+        )
+        self.edit_webhook = async_to_streamed_response_wrapper(
+            webhooks.edit_webhook,
+        )
+        self.get_webhook_by_id = async_to_streamed_response_wrapper(
+            webhooks.get_webhook_by_id,
+        )
+        self.get_webhooks = async_to_streamed_response_wrapper(
+            webhooks.get_webhooks,
+        )
+        self.replace_webhook = async_to_streamed_response_wrapper(
+            webhooks.replace_webhook,
+        )
diff --git a/src/cloudflare/resources/registrar/domains.py b/src/cloudflare/resources/registrar/domains.py
index b75018f5fd2..714f6fc047f 100644
--- a/src/cloudflare/resources/registrar/domains.py
+++ b/src/cloudflare/resources/registrar/domains.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -24,8 +21,6 @@
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.registrar import domain_update_params
 from ...types.registrar.domain import Domain
-from ...types.registrar.domain_get_response import DomainGetResponse
-from ...types.registrar.domain_update_response import DomainUpdateResponse
 
 __all__ = ["DomainsResource", "AsyncDomainsResource"]
 
@@ -33,10 +28,21 @@
 class DomainsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DomainsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DomainsResourceWithStreamingResponse(self)
 
     def update(
@@ -44,16 +50,16 @@ def update(
         domain_name: str,
         *,
         account_id: str,
-        auto_renew: bool | NotGiven = NOT_GIVEN,
-        locked: bool | NotGiven = NOT_GIVEN,
-        privacy: bool | NotGiven = NOT_GIVEN,
+        auto_renew: bool | Omit = omit,
+        locked: bool | Omit = omit,
+        privacy: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DomainUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
         Update individual domain.
 
@@ -81,29 +87,24 @@ def update(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not domain_name:
             raise ValueError(f"Expected a non-empty value for `domain_name` but received {domain_name!r}")
-        return cast(
-            Optional[DomainUpdateResponse],
-            self._put(
-                f"/accounts/{account_id}/registrar/domains/{domain_name}",
-                body=maybe_transform(
-                    {
-                        "auto_renew": auto_renew,
-                        "locked": locked,
-                        "privacy": privacy,
-                    },
-                    domain_update_params.DomainUpdateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[DomainUpdateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DomainUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._put(
+            f"/accounts/{account_id}/registrar/domains/{domain_name}",
+            body=maybe_transform(
+                {
+                    "auto_renew": auto_renew,
+                    "locked": locked,
+                    "privacy": privacy,
+                },
+                domain_update_params.DomainUpdateParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     def list(
@@ -115,7 +116,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Domain]:
         """
         List domains handled by Registrar.
@@ -152,8 +153,8 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DomainGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
         Show individual domain.
 
@@ -174,31 +175,37 @@ def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not domain_name:
             raise ValueError(f"Expected a non-empty value for `domain_name` but received {domain_name!r}")
-        return cast(
-            Optional[DomainGetResponse],
-            self._get(
-                f"/accounts/{account_id}/registrar/domains/{domain_name}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[DomainGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DomainGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._get(
+            f"/accounts/{account_id}/registrar/domains/{domain_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
 
 class AsyncDomainsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDomainsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDomainsResourceWithStreamingResponse(self)
 
     async def update(
@@ -206,16 +213,16 @@ async def update(
         domain_name: str,
         *,
         account_id: str,
-        auto_renew: bool | NotGiven = NOT_GIVEN,
-        locked: bool | NotGiven = NOT_GIVEN,
-        privacy: bool | NotGiven = NOT_GIVEN,
+        auto_renew: bool | Omit = omit,
+        locked: bool | Omit = omit,
+        privacy: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DomainUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
         Update individual domain.
 
@@ -243,29 +250,24 @@ async def update(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not domain_name:
             raise ValueError(f"Expected a non-empty value for `domain_name` but received {domain_name!r}")
-        return cast(
-            Optional[DomainUpdateResponse],
-            await self._put(
-                f"/accounts/{account_id}/registrar/domains/{domain_name}",
-                body=await async_maybe_transform(
-                    {
-                        "auto_renew": auto_renew,
-                        "locked": locked,
-                        "privacy": privacy,
-                    },
-                    domain_update_params.DomainUpdateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[DomainUpdateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DomainUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._put(
+            f"/accounts/{account_id}/registrar/domains/{domain_name}",
+            body=await async_maybe_transform(
+                {
+                    "auto_renew": auto_renew,
+                    "locked": locked,
+                    "privacy": privacy,
+                },
+                domain_update_params.DomainUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     def list(
@@ -277,7 +279,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Domain, AsyncSinglePage[Domain]]:
         """
         List domains handled by Registrar.
@@ -314,8 +316,8 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DomainGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
         Show individual domain.
 
@@ -336,21 +338,16 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not domain_name:
             raise ValueError(f"Expected a non-empty value for `domain_name` but received {domain_name!r}")
-        return cast(
-            Optional[DomainGetResponse],
-            await self._get(
-                f"/accounts/{account_id}/registrar/domains/{domain_name}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[DomainGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DomainGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._get(
+            f"/accounts/{account_id}/registrar/domains/{domain_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
 
diff --git a/src/cloudflare/resources/registrar/registrar.py b/src/cloudflare/resources/registrar/registrar.py
index aef3e690b16..56d801b3e83 100644
--- a/src/cloudflare/resources/registrar/registrar.py
+++ b/src/cloudflare/resources/registrar/registrar.py
@@ -23,10 +23,21 @@ def domains(self) -> DomainsResource:
 
     @cached_property
     def with_raw_response(self) -> RegistrarResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RegistrarResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RegistrarResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RegistrarResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def domains(self) -> AsyncDomainsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncRegistrarResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRegistrarResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRegistrarResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRegistrarResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/request_tracers/request_tracers.py b/src/cloudflare/resources/request_tracers/request_tracers.py
index df986b01321..c95232ff3e2 100644
--- a/src/cloudflare/resources/request_tracers/request_tracers.py
+++ b/src/cloudflare/resources/request_tracers/request_tracers.py
@@ -23,10 +23,21 @@ def traces(self) -> TracesResource:
 
     @cached_property
     def with_raw_response(self) -> RequestTracersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RequestTracersResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RequestTracersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RequestTracersResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def traces(self) -> AsyncTracesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncRequestTracersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRequestTracersResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRequestTracersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRequestTracersResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/request_tracers/traces.py b/src/cloudflare/resources/request_tracers/traces.py
index 9934896d0a6..cd05eafcac4 100644
--- a/src/cloudflare/resources/request_tracers/traces.py
+++ b/src/cloudflare/resources/request_tracers/traces.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -30,10 +27,21 @@
 class TracesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TracesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TracesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TracesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TracesResourceWithStreamingResponse(self)
 
     def create(
@@ -42,24 +50,24 @@ def create(
         account_id: str,
         method: str,
         url: str,
-        body: trace_create_params.Body | NotGiven = NOT_GIVEN,
-        context: trace_create_params.Context | NotGiven = NOT_GIVEN,
-        cookies: Dict[str, str] | NotGiven = NOT_GIVEN,
-        headers: Dict[str, str] | NotGiven = NOT_GIVEN,
-        protocol: str | NotGiven = NOT_GIVEN,
-        skip_response: bool | NotGiven = NOT_GIVEN,
+        body: trace_create_params.Body | Omit = omit,
+        context: trace_create_params.Context | Omit = omit,
+        cookies: Dict[str, str] | Omit = omit,
+        headers: Dict[str, str] | Omit = omit,
+        protocol: str | Omit = omit,
+        skip_response: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TraceCreateResponse]:
         """
         Request Trace
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           method: HTTP Method of tracing request
 
@@ -114,10 +122,21 @@ def create(
 class AsyncTracesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTracesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTracesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTracesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTracesResourceWithStreamingResponse(self)
 
     async def create(
@@ -126,24 +145,24 @@ async def create(
         account_id: str,
         method: str,
         url: str,
-        body: trace_create_params.Body | NotGiven = NOT_GIVEN,
-        context: trace_create_params.Context | NotGiven = NOT_GIVEN,
-        cookies: Dict[str, str] | NotGiven = NOT_GIVEN,
-        headers: Dict[str, str] | NotGiven = NOT_GIVEN,
-        protocol: str | NotGiven = NOT_GIVEN,
-        skip_response: bool | NotGiven = NOT_GIVEN,
+        body: trace_create_params.Body | Omit = omit,
+        context: trace_create_params.Context | Omit = omit,
+        cookies: Dict[str, str] | Omit = omit,
+        headers: Dict[str, str] | Omit = omit,
+        protocol: str | Omit = omit,
+        skip_response: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TraceCreateResponse]:
         """
         Request Trace
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           method: HTTP Method of tracing request
 
diff --git a/src/cloudflare/resources/resource_sharing/__init__.py b/src/cloudflare/resources/resource_sharing/__init__.py
new file mode 100644
index 00000000000..3f72b0bc713
--- /dev/null
+++ b/src/cloudflare/resources/resource_sharing/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .resources import (
+    ResourcesResource,
+    AsyncResourcesResource,
+    ResourcesResourceWithRawResponse,
+    AsyncResourcesResourceWithRawResponse,
+    ResourcesResourceWithStreamingResponse,
+    AsyncResourcesResourceWithStreamingResponse,
+)
+from .recipients import (
+    RecipientsResource,
+    AsyncRecipientsResource,
+    RecipientsResourceWithRawResponse,
+    AsyncRecipientsResourceWithRawResponse,
+    RecipientsResourceWithStreamingResponse,
+    AsyncRecipientsResourceWithStreamingResponse,
+)
+from .resource_sharing import (
+    ResourceSharingResource,
+    AsyncResourceSharingResource,
+    ResourceSharingResourceWithRawResponse,
+    AsyncResourceSharingResourceWithRawResponse,
+    ResourceSharingResourceWithStreamingResponse,
+    AsyncResourceSharingResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "RecipientsResource",
+    "AsyncRecipientsResource",
+    "RecipientsResourceWithRawResponse",
+    "AsyncRecipientsResourceWithRawResponse",
+    "RecipientsResourceWithStreamingResponse",
+    "AsyncRecipientsResourceWithStreamingResponse",
+    "ResourcesResource",
+    "AsyncResourcesResource",
+    "ResourcesResourceWithRawResponse",
+    "AsyncResourcesResourceWithRawResponse",
+    "ResourcesResourceWithStreamingResponse",
+    "AsyncResourcesResourceWithStreamingResponse",
+    "ResourceSharingResource",
+    "AsyncResourceSharingResource",
+    "ResourceSharingResourceWithRawResponse",
+    "AsyncResourceSharingResourceWithRawResponse",
+    "ResourceSharingResourceWithStreamingResponse",
+    "AsyncResourceSharingResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/resource_sharing/recipients.py b/src/cloudflare/resources/resource_sharing/recipients.py
new file mode 100644
index 00000000000..317084c89ac
--- /dev/null
+++ b/src/cloudflare/resources/resource_sharing/recipients.py
@@ -0,0 +1,588 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.resource_sharing import recipient_get_params, recipient_list_params, recipient_create_params
+from ...types.resource_sharing.recipient_get_response import RecipientGetResponse
+from ...types.resource_sharing.recipient_list_response import RecipientListResponse
+from ...types.resource_sharing.recipient_create_response import RecipientCreateResponse
+from ...types.resource_sharing.recipient_delete_response import RecipientDeleteResponse
+
+__all__ = ["RecipientsResource", "AsyncRecipientsResource"]
+
+
+class RecipientsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> RecipientsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return RecipientsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> RecipientsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return RecipientsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        share_id: str,
+        *,
+        path_account_id: str,
+        body_account_id: str | Omit = omit,
+        organization_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecipientCreateResponse]:
+        """
+        Create a new share recipient
+
+        Args:
+          path_account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          body_account_id: Account identifier.
+
+          organization_id: Organization identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not path_account_id:
+            raise ValueError(f"Expected a non-empty value for `path_account_id` but received {path_account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        return self._post(
+            f"/accounts/{path_account_id}/shares/{share_id}/recipients",
+            body=maybe_transform(
+                {
+                    "body_account_id": body_account_id,
+                    "organization_id": organization_id,
+                },
+                recipient_create_params.RecipientCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RecipientCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RecipientCreateResponse]], ResultWrapper[RecipientCreateResponse]),
+        )
+
+    def list(
+        self,
+        share_id: str,
+        *,
+        account_id: str,
+        include_resources: bool | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[RecipientListResponse]:
+        """
+        List share recipients by share ID.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          include_resources: Include resources in the response.
+
+          page: Page number.
+
+          per_page: Number of objects to return per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/shares/{share_id}/recipients",
+            page=SyncV4PagePaginationArray[RecipientListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "include_resources": include_resources,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    recipient_list_params.RecipientListParams,
+                ),
+            ),
+            model=RecipientListResponse,
+        )
+
+    def delete(
+        self,
+        recipient_id: str,
+        *,
+        account_id: str,
+        share_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecipientDeleteResponse]:
+        """
+        Deletion is not immediate, an updated share recipient object with a new status
+        will be returned.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          recipient_id: Share Recipient identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        if not recipient_id:
+            raise ValueError(f"Expected a non-empty value for `recipient_id` but received {recipient_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/shares/{share_id}/recipients/{recipient_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RecipientDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RecipientDeleteResponse]], ResultWrapper[RecipientDeleteResponse]),
+        )
+
+    def get(
+        self,
+        recipient_id: str,
+        *,
+        account_id: str,
+        share_id: str,
+        include_resources: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecipientGetResponse]:
+        """
+        Get share recipient by ID.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          recipient_id: Share Recipient identifier tag.
+
+          include_resources: Include resources in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        if not recipient_id:
+            raise ValueError(f"Expected a non-empty value for `recipient_id` but received {recipient_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/shares/{share_id}/recipients/{recipient_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {"include_resources": include_resources}, recipient_get_params.RecipientGetParams
+                ),
+                post_parser=ResultWrapper[Optional[RecipientGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RecipientGetResponse]], ResultWrapper[RecipientGetResponse]),
+        )
+
+
+class AsyncRecipientsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncRecipientsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncRecipientsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncRecipientsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncRecipientsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        share_id: str,
+        *,
+        path_account_id: str,
+        body_account_id: str | Omit = omit,
+        organization_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecipientCreateResponse]:
+        """
+        Create a new share recipient
+
+        Args:
+          path_account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          body_account_id: Account identifier.
+
+          organization_id: Organization identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not path_account_id:
+            raise ValueError(f"Expected a non-empty value for `path_account_id` but received {path_account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        return await self._post(
+            f"/accounts/{path_account_id}/shares/{share_id}/recipients",
+            body=await async_maybe_transform(
+                {
+                    "body_account_id": body_account_id,
+                    "organization_id": organization_id,
+                },
+                recipient_create_params.RecipientCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RecipientCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RecipientCreateResponse]], ResultWrapper[RecipientCreateResponse]),
+        )
+
+    def list(
+        self,
+        share_id: str,
+        *,
+        account_id: str,
+        include_resources: bool | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[RecipientListResponse, AsyncV4PagePaginationArray[RecipientListResponse]]:
+        """
+        List share recipients by share ID.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          include_resources: Include resources in the response.
+
+          page: Page number.
+
+          per_page: Number of objects to return per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/shares/{share_id}/recipients",
+            page=AsyncV4PagePaginationArray[RecipientListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "include_resources": include_resources,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    recipient_list_params.RecipientListParams,
+                ),
+            ),
+            model=RecipientListResponse,
+        )
+
+    async def delete(
+        self,
+        recipient_id: str,
+        *,
+        account_id: str,
+        share_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecipientDeleteResponse]:
+        """
+        Deletion is not immediate, an updated share recipient object with a new status
+        will be returned.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          recipient_id: Share Recipient identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        if not recipient_id:
+            raise ValueError(f"Expected a non-empty value for `recipient_id` but received {recipient_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/shares/{share_id}/recipients/{recipient_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RecipientDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RecipientDeleteResponse]], ResultWrapper[RecipientDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        recipient_id: str,
+        *,
+        account_id: str,
+        share_id: str,
+        include_resources: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RecipientGetResponse]:
+        """
+        Get share recipient by ID.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          recipient_id: Share Recipient identifier tag.
+
+          include_resources: Include resources in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        if not recipient_id:
+            raise ValueError(f"Expected a non-empty value for `recipient_id` but received {recipient_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/shares/{share_id}/recipients/{recipient_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"include_resources": include_resources}, recipient_get_params.RecipientGetParams
+                ),
+                post_parser=ResultWrapper[Optional[RecipientGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RecipientGetResponse]], ResultWrapper[RecipientGetResponse]),
+        )
+
+
+class RecipientsResourceWithRawResponse:
+    def __init__(self, recipients: RecipientsResource) -> None:
+        self._recipients = recipients
+
+        self.create = to_raw_response_wrapper(
+            recipients.create,
+        )
+        self.list = to_raw_response_wrapper(
+            recipients.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            recipients.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            recipients.get,
+        )
+
+
+class AsyncRecipientsResourceWithRawResponse:
+    def __init__(self, recipients: AsyncRecipientsResource) -> None:
+        self._recipients = recipients
+
+        self.create = async_to_raw_response_wrapper(
+            recipients.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            recipients.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            recipients.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            recipients.get,
+        )
+
+
+class RecipientsResourceWithStreamingResponse:
+    def __init__(self, recipients: RecipientsResource) -> None:
+        self._recipients = recipients
+
+        self.create = to_streamed_response_wrapper(
+            recipients.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            recipients.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            recipients.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            recipients.get,
+        )
+
+
+class AsyncRecipientsResourceWithStreamingResponse:
+    def __init__(self, recipients: AsyncRecipientsResource) -> None:
+        self._recipients = recipients
+
+        self.create = async_to_streamed_response_wrapper(
+            recipients.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            recipients.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            recipients.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            recipients.get,
+        )
diff --git a/src/cloudflare/resources/resource_sharing/resource_sharing.py b/src/cloudflare/resources/resource_sharing/resource_sharing.py
new file mode 100644
index 00000000000..88d07b557b1
--- /dev/null
+++ b/src/cloudflare/resources/resource_sharing/resource_sharing.py
@@ -0,0 +1,821 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Type, Iterable, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from .resources import (
+    ResourcesResource,
+    AsyncResourcesResource,
+    ResourcesResourceWithRawResponse,
+    AsyncResourcesResourceWithRawResponse,
+    ResourcesResourceWithStreamingResponse,
+    AsyncResourcesResourceWithStreamingResponse,
+)
+from .recipients import (
+    RecipientsResource,
+    AsyncRecipientsResource,
+    RecipientsResourceWithRawResponse,
+    AsyncRecipientsResourceWithRawResponse,
+    RecipientsResourceWithStreamingResponse,
+    AsyncRecipientsResourceWithStreamingResponse,
+)
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.resource_sharing import (
+    resource_sharing_get_params,
+    resource_sharing_list_params,
+    resource_sharing_create_params,
+    resource_sharing_update_params,
+)
+from ...types.resource_sharing.resource_sharing_get_response import ResourceSharingGetResponse
+from ...types.resource_sharing.resource_sharing_list_response import ResourceSharingListResponse
+from ...types.resource_sharing.resource_sharing_create_response import ResourceSharingCreateResponse
+from ...types.resource_sharing.resource_sharing_delete_response import ResourceSharingDeleteResponse
+from ...types.resource_sharing.resource_sharing_update_response import ResourceSharingUpdateResponse
+
+__all__ = ["ResourceSharingResource", "AsyncResourceSharingResource"]
+
+
+class ResourceSharingResource(SyncAPIResource):
+    @cached_property
+    def recipients(self) -> RecipientsResource:
+        return RecipientsResource(self._client)
+
+    @cached_property
+    def resources(self) -> ResourcesResource:
+        return ResourcesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> ResourceSharingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ResourceSharingResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ResourceSharingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ResourceSharingResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        recipients: Iterable[resource_sharing_create_params.Recipient],
+        resources: Iterable[resource_sharing_create_params.Resource],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceSharingCreateResponse]:
+        """
+        Create a new share
+
+        Args:
+          account_id: Account identifier.
+
+          name: The name of the share.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/shares",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "recipients": recipients,
+                    "resources": resources,
+                },
+                resource_sharing_create_params.ResourceSharingCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceSharingCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ResourceSharingCreateResponse]], ResultWrapper[ResourceSharingCreateResponse]),
+        )
+
+    def update(
+        self,
+        share_id: str,
+        *,
+        account_id: str,
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceSharingUpdateResponse]:
+        """
+        Updating is not immediate, an updated share object with a new status will be
+        returned.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          name: The name of the share.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/shares/{share_id}",
+            body=maybe_transform({"name": name}, resource_sharing_update_params.ResourceSharingUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceSharingUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ResourceSharingUpdateResponse]], ResultWrapper[ResourceSharingUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        include_recipient_counts: bool | Omit = omit,
+        include_resources: bool | Omit = omit,
+        kind: Literal["sent", "received"] | Omit = omit,
+        order: Literal["name", "created"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        resource_types: List[
+            Literal[
+                "custom-ruleset",
+                "widget",
+                "gateway-policy",
+                "gateway-destination-ip",
+                "gateway-block-page-settings",
+                "gateway-extended-email-matching",
+            ]
+        ]
+        | Omit = omit,
+        status: Literal["active", "deleting", "deleted"] | Omit = omit,
+        target_type: Literal["account", "organization"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[ResourceSharingListResponse]:
+        """
+        Lists all account shares.
+
+        Args:
+          account_id: Account identifier.
+
+          direction: Direction to sort objects.
+
+          include_recipient_counts: Include recipient counts in the response.
+
+          include_resources: Include resources in the response.
+
+          kind: Filter shares by kind.
+
+          order: Order shares by values in the given field.
+
+          page: Page number.
+
+          per_page: Number of objects to return per page.
+
+          resource_types: Filter share resources by resource_types.
+
+          status: Filter shares by status.
+
+          target_type: Filter shares by target_type.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/shares",
+            page=SyncV4PagePaginationArray[ResourceSharingListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "include_recipient_counts": include_recipient_counts,
+                        "include_resources": include_resources,
+                        "kind": kind,
+                        "order": order,
+                        "page": page,
+                        "per_page": per_page,
+                        "resource_types": resource_types,
+                        "status": status,
+                        "target_type": target_type,
+                    },
+                    resource_sharing_list_params.ResourceSharingListParams,
+                ),
+            ),
+            model=ResourceSharingListResponse,
+        )
+
+    def delete(
+        self,
+        share_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceSharingDeleteResponse]:
+        """
+        Deletion is not immediate, an updated share object with a new status will be
+        returned.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/shares/{share_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceSharingDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ResourceSharingDeleteResponse]], ResultWrapper[ResourceSharingDeleteResponse]),
+        )
+
+    def get(
+        self,
+        share_id: str,
+        *,
+        account_id: str,
+        include_recipient_counts: bool | Omit = omit,
+        include_resources: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceSharingGetResponse]:
+        """
+        Fetches share by ID.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          include_recipient_counts: Include recipient counts in the response.
+
+          include_resources: Include resources in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/shares/{share_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "include_recipient_counts": include_recipient_counts,
+                        "include_resources": include_resources,
+                    },
+                    resource_sharing_get_params.ResourceSharingGetParams,
+                ),
+                post_parser=ResultWrapper[Optional[ResourceSharingGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ResourceSharingGetResponse]], ResultWrapper[ResourceSharingGetResponse]),
+        )
+
+
+class AsyncResourceSharingResource(AsyncAPIResource):
+    @cached_property
+    def recipients(self) -> AsyncRecipientsResource:
+        return AsyncRecipientsResource(self._client)
+
+    @cached_property
+    def resources(self) -> AsyncResourcesResource:
+        return AsyncResourcesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncResourceSharingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncResourceSharingResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncResourceSharingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncResourceSharingResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        recipients: Iterable[resource_sharing_create_params.Recipient],
+        resources: Iterable[resource_sharing_create_params.Resource],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceSharingCreateResponse]:
+        """
+        Create a new share
+
+        Args:
+          account_id: Account identifier.
+
+          name: The name of the share.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/shares",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "recipients": recipients,
+                    "resources": resources,
+                },
+                resource_sharing_create_params.ResourceSharingCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceSharingCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ResourceSharingCreateResponse]], ResultWrapper[ResourceSharingCreateResponse]),
+        )
+
+    async def update(
+        self,
+        share_id: str,
+        *,
+        account_id: str,
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceSharingUpdateResponse]:
+        """
+        Updating is not immediate, an updated share object with a new status will be
+        returned.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          name: The name of the share.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/shares/{share_id}",
+            body=await async_maybe_transform(
+                {"name": name}, resource_sharing_update_params.ResourceSharingUpdateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceSharingUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ResourceSharingUpdateResponse]], ResultWrapper[ResourceSharingUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        include_recipient_counts: bool | Omit = omit,
+        include_resources: bool | Omit = omit,
+        kind: Literal["sent", "received"] | Omit = omit,
+        order: Literal["name", "created"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        resource_types: List[
+            Literal[
+                "custom-ruleset",
+                "widget",
+                "gateway-policy",
+                "gateway-destination-ip",
+                "gateway-block-page-settings",
+                "gateway-extended-email-matching",
+            ]
+        ]
+        | Omit = omit,
+        status: Literal["active", "deleting", "deleted"] | Omit = omit,
+        target_type: Literal["account", "organization"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ResourceSharingListResponse, AsyncV4PagePaginationArray[ResourceSharingListResponse]]:
+        """
+        Lists all account shares.
+
+        Args:
+          account_id: Account identifier.
+
+          direction: Direction to sort objects.
+
+          include_recipient_counts: Include recipient counts in the response.
+
+          include_resources: Include resources in the response.
+
+          kind: Filter shares by kind.
+
+          order: Order shares by values in the given field.
+
+          page: Page number.
+
+          per_page: Number of objects to return per page.
+
+          resource_types: Filter share resources by resource_types.
+
+          status: Filter shares by status.
+
+          target_type: Filter shares by target_type.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/shares",
+            page=AsyncV4PagePaginationArray[ResourceSharingListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "include_recipient_counts": include_recipient_counts,
+                        "include_resources": include_resources,
+                        "kind": kind,
+                        "order": order,
+                        "page": page,
+                        "per_page": per_page,
+                        "resource_types": resource_types,
+                        "status": status,
+                        "target_type": target_type,
+                    },
+                    resource_sharing_list_params.ResourceSharingListParams,
+                ),
+            ),
+            model=ResourceSharingListResponse,
+        )
+
+    async def delete(
+        self,
+        share_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceSharingDeleteResponse]:
+        """
+        Deletion is not immediate, an updated share object with a new status will be
+        returned.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/shares/{share_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceSharingDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ResourceSharingDeleteResponse]], ResultWrapper[ResourceSharingDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        share_id: str,
+        *,
+        account_id: str,
+        include_recipient_counts: bool | Omit = omit,
+        include_resources: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceSharingGetResponse]:
+        """
+        Fetches share by ID.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          include_recipient_counts: Include recipient counts in the response.
+
+          include_resources: Include resources in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/shares/{share_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "include_recipient_counts": include_recipient_counts,
+                        "include_resources": include_resources,
+                    },
+                    resource_sharing_get_params.ResourceSharingGetParams,
+                ),
+                post_parser=ResultWrapper[Optional[ResourceSharingGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ResourceSharingGetResponse]], ResultWrapper[ResourceSharingGetResponse]),
+        )
+
+
+class ResourceSharingResourceWithRawResponse:
+    def __init__(self, resource_sharing: ResourceSharingResource) -> None:
+        self._resource_sharing = resource_sharing
+
+        self.create = to_raw_response_wrapper(
+            resource_sharing.create,
+        )
+        self.update = to_raw_response_wrapper(
+            resource_sharing.update,
+        )
+        self.list = to_raw_response_wrapper(
+            resource_sharing.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            resource_sharing.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            resource_sharing.get,
+        )
+
+    @cached_property
+    def recipients(self) -> RecipientsResourceWithRawResponse:
+        return RecipientsResourceWithRawResponse(self._resource_sharing.recipients)
+
+    @cached_property
+    def resources(self) -> ResourcesResourceWithRawResponse:
+        return ResourcesResourceWithRawResponse(self._resource_sharing.resources)
+
+
+class AsyncResourceSharingResourceWithRawResponse:
+    def __init__(self, resource_sharing: AsyncResourceSharingResource) -> None:
+        self._resource_sharing = resource_sharing
+
+        self.create = async_to_raw_response_wrapper(
+            resource_sharing.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            resource_sharing.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            resource_sharing.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            resource_sharing.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            resource_sharing.get,
+        )
+
+    @cached_property
+    def recipients(self) -> AsyncRecipientsResourceWithRawResponse:
+        return AsyncRecipientsResourceWithRawResponse(self._resource_sharing.recipients)
+
+    @cached_property
+    def resources(self) -> AsyncResourcesResourceWithRawResponse:
+        return AsyncResourcesResourceWithRawResponse(self._resource_sharing.resources)
+
+
+class ResourceSharingResourceWithStreamingResponse:
+    def __init__(self, resource_sharing: ResourceSharingResource) -> None:
+        self._resource_sharing = resource_sharing
+
+        self.create = to_streamed_response_wrapper(
+            resource_sharing.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            resource_sharing.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            resource_sharing.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            resource_sharing.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            resource_sharing.get,
+        )
+
+    @cached_property
+    def recipients(self) -> RecipientsResourceWithStreamingResponse:
+        return RecipientsResourceWithStreamingResponse(self._resource_sharing.recipients)
+
+    @cached_property
+    def resources(self) -> ResourcesResourceWithStreamingResponse:
+        return ResourcesResourceWithStreamingResponse(self._resource_sharing.resources)
+
+
+class AsyncResourceSharingResourceWithStreamingResponse:
+    def __init__(self, resource_sharing: AsyncResourceSharingResource) -> None:
+        self._resource_sharing = resource_sharing
+
+        self.create = async_to_streamed_response_wrapper(
+            resource_sharing.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            resource_sharing.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            resource_sharing.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            resource_sharing.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            resource_sharing.get,
+        )
+
+    @cached_property
+    def recipients(self) -> AsyncRecipientsResourceWithStreamingResponse:
+        return AsyncRecipientsResourceWithStreamingResponse(self._resource_sharing.recipients)
+
+    @cached_property
+    def resources(self) -> AsyncResourcesResourceWithStreamingResponse:
+        return AsyncResourcesResourceWithStreamingResponse(self._resource_sharing.resources)
diff --git a/src/cloudflare/resources/resource_sharing/resources.py b/src/cloudflare/resources/resource_sharing/resources.py
new file mode 100644
index 00000000000..ec35ed84afd
--- /dev/null
+++ b/src/cloudflare/resources/resource_sharing/resources.py
@@ -0,0 +1,752 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.resource_sharing import resource_list_params, resource_create_params, resource_update_params
+from ...types.resource_sharing.resource_get_response import ResourceGetResponse
+from ...types.resource_sharing.resource_list_response import ResourceListResponse
+from ...types.resource_sharing.resource_create_response import ResourceCreateResponse
+from ...types.resource_sharing.resource_delete_response import ResourceDeleteResponse
+from ...types.resource_sharing.resource_update_response import ResourceUpdateResponse
+
+__all__ = ["ResourcesResource", "AsyncResourcesResource"]
+
+
+class ResourcesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ResourcesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ResourcesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ResourcesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ResourcesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        share_id: str,
+        *,
+        account_id: str,
+        meta: object,
+        resource_account_id: str,
+        resource_id: str,
+        resource_type: Literal[
+            "custom-ruleset",
+            "widget",
+            "gateway-policy",
+            "gateway-destination-ip",
+            "gateway-block-page-settings",
+            "gateway-extended-email-matching",
+        ],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceCreateResponse]:
+        """
+        Create a new share resource
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          meta: Resource Metadata.
+
+          resource_account_id: Account identifier.
+
+          resource_id: Share Resource identifier.
+
+          resource_type: Resource Type.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/shares/{share_id}/resources",
+            body=maybe_transform(
+                {
+                    "meta": meta,
+                    "resource_account_id": resource_account_id,
+                    "resource_id": resource_id,
+                    "resource_type": resource_type,
+                },
+                resource_create_params.ResourceCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ResourceCreateResponse]], ResultWrapper[ResourceCreateResponse]),
+        )
+
+    def update(
+        self,
+        resource_id: str,
+        *,
+        account_id: str,
+        share_id: str,
+        meta: object,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceUpdateResponse]:
+        """
+        Update is not immediate, an updated share resource object with a new status will
+        be returned.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          resource_id: Share Resource identifier.
+
+          meta: Resource Metadata.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        if not resource_id:
+            raise ValueError(f"Expected a non-empty value for `resource_id` but received {resource_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/shares/{share_id}/resources/{resource_id}",
+            body=maybe_transform({"meta": meta}, resource_update_params.ResourceUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ResourceUpdateResponse]], ResultWrapper[ResourceUpdateResponse]),
+        )
+
+    def list(
+        self,
+        share_id: str,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        resource_type: Literal[
+            "custom-ruleset",
+            "widget",
+            "gateway-policy",
+            "gateway-destination-ip",
+            "gateway-block-page-settings",
+            "gateway-extended-email-matching",
+        ]
+        | Omit = omit,
+        status: Literal["active", "deleting", "deleted"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[ResourceListResponse]:
+        """
+        List share resources by share ID.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          page: Page number.
+
+          per_page: Number of objects to return per page.
+
+          resource_type: Filter share resources by resource_type.
+
+          status: Filter share resources by status.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/shares/{share_id}/resources",
+            page=SyncV4PagePaginationArray[ResourceListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "resource_type": resource_type,
+                        "status": status,
+                    },
+                    resource_list_params.ResourceListParams,
+                ),
+            ),
+            model=ResourceListResponse,
+        )
+
+    def delete(
+        self,
+        resource_id: str,
+        *,
+        account_id: str,
+        share_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceDeleteResponse]:
+        """
+        Deletion is not immediate, an updated share resource object with a new status
+        will be returned.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          resource_id: Share Resource identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        if not resource_id:
+            raise ValueError(f"Expected a non-empty value for `resource_id` but received {resource_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/shares/{share_id}/resources/{resource_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ResourceDeleteResponse]], ResultWrapper[ResourceDeleteResponse]),
+        )
+
+    def get(
+        self,
+        resource_id: str,
+        *,
+        account_id: str,
+        share_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceGetResponse]:
+        """
+        Get share resource by ID.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          resource_id: Share Resource identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        if not resource_id:
+            raise ValueError(f"Expected a non-empty value for `resource_id` but received {resource_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/shares/{share_id}/resources/{resource_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ResourceGetResponse]], ResultWrapper[ResourceGetResponse]),
+        )
+
+
+class AsyncResourcesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncResourcesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncResourcesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncResourcesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncResourcesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        share_id: str,
+        *,
+        account_id: str,
+        meta: object,
+        resource_account_id: str,
+        resource_id: str,
+        resource_type: Literal[
+            "custom-ruleset",
+            "widget",
+            "gateway-policy",
+            "gateway-destination-ip",
+            "gateway-block-page-settings",
+            "gateway-extended-email-matching",
+        ],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceCreateResponse]:
+        """
+        Create a new share resource
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          meta: Resource Metadata.
+
+          resource_account_id: Account identifier.
+
+          resource_id: Share Resource identifier.
+
+          resource_type: Resource Type.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/shares/{share_id}/resources",
+            body=await async_maybe_transform(
+                {
+                    "meta": meta,
+                    "resource_account_id": resource_account_id,
+                    "resource_id": resource_id,
+                    "resource_type": resource_type,
+                },
+                resource_create_params.ResourceCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ResourceCreateResponse]], ResultWrapper[ResourceCreateResponse]),
+        )
+
+    async def update(
+        self,
+        resource_id: str,
+        *,
+        account_id: str,
+        share_id: str,
+        meta: object,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceUpdateResponse]:
+        """
+        Update is not immediate, an updated share resource object with a new status will
+        be returned.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          resource_id: Share Resource identifier.
+
+          meta: Resource Metadata.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        if not resource_id:
+            raise ValueError(f"Expected a non-empty value for `resource_id` but received {resource_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/shares/{share_id}/resources/{resource_id}",
+            body=await async_maybe_transform({"meta": meta}, resource_update_params.ResourceUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ResourceUpdateResponse]], ResultWrapper[ResourceUpdateResponse]),
+        )
+
+    def list(
+        self,
+        share_id: str,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        resource_type: Literal[
+            "custom-ruleset",
+            "widget",
+            "gateway-policy",
+            "gateway-destination-ip",
+            "gateway-block-page-settings",
+            "gateway-extended-email-matching",
+        ]
+        | Omit = omit,
+        status: Literal["active", "deleting", "deleted"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ResourceListResponse, AsyncV4PagePaginationArray[ResourceListResponse]]:
+        """
+        List share resources by share ID.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          page: Page number.
+
+          per_page: Number of objects to return per page.
+
+          resource_type: Filter share resources by resource_type.
+
+          status: Filter share resources by status.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/shares/{share_id}/resources",
+            page=AsyncV4PagePaginationArray[ResourceListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "resource_type": resource_type,
+                        "status": status,
+                    },
+                    resource_list_params.ResourceListParams,
+                ),
+            ),
+            model=ResourceListResponse,
+        )
+
+    async def delete(
+        self,
+        resource_id: str,
+        *,
+        account_id: str,
+        share_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceDeleteResponse]:
+        """
+        Deletion is not immediate, an updated share resource object with a new status
+        will be returned.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          resource_id: Share Resource identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        if not resource_id:
+            raise ValueError(f"Expected a non-empty value for `resource_id` but received {resource_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/shares/{share_id}/resources/{resource_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ResourceDeleteResponse]], ResultWrapper[ResourceDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        resource_id: str,
+        *,
+        account_id: str,
+        share_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ResourceGetResponse]:
+        """
+        Get share resource by ID.
+
+        Args:
+          account_id: Account identifier.
+
+          share_id: Share identifier tag.
+
+          resource_id: Share Resource identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not share_id:
+            raise ValueError(f"Expected a non-empty value for `share_id` but received {share_id!r}")
+        if not resource_id:
+            raise ValueError(f"Expected a non-empty value for `resource_id` but received {resource_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/shares/{share_id}/resources/{resource_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ResourceGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ResourceGetResponse]], ResultWrapper[ResourceGetResponse]),
+        )
+
+
+class ResourcesResourceWithRawResponse:
+    def __init__(self, resources: ResourcesResource) -> None:
+        self._resources = resources
+
+        self.create = to_raw_response_wrapper(
+            resources.create,
+        )
+        self.update = to_raw_response_wrapper(
+            resources.update,
+        )
+        self.list = to_raw_response_wrapper(
+            resources.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            resources.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            resources.get,
+        )
+
+
+class AsyncResourcesResourceWithRawResponse:
+    def __init__(self, resources: AsyncResourcesResource) -> None:
+        self._resources = resources
+
+        self.create = async_to_raw_response_wrapper(
+            resources.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            resources.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            resources.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            resources.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            resources.get,
+        )
+
+
+class ResourcesResourceWithStreamingResponse:
+    def __init__(self, resources: ResourcesResource) -> None:
+        self._resources = resources
+
+        self.create = to_streamed_response_wrapper(
+            resources.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            resources.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            resources.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            resources.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            resources.get,
+        )
+
+
+class AsyncResourcesResourceWithStreamingResponse:
+    def __init__(self, resources: AsyncResourcesResource) -> None:
+        self._resources = resources
+
+        self.create = async_to_streamed_response_wrapper(
+            resources.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            resources.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            resources.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            resources.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            resources.get,
+        )
diff --git a/src/cloudflare/resources/rules/lists/bulk_operations.py b/src/cloudflare/resources/rules/lists/bulk_operations.py
index 2eb9982373c..57edc28f206 100644
--- a/src/cloudflare/resources/rules/lists/bulk_operations.py
+++ b/src/cloudflare/resources/rules/lists/bulk_operations.py
@@ -2,11 +2,11 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Any, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -25,24 +25,35 @@
 class BulkOperationsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> BulkOperationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return BulkOperationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> BulkOperationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return BulkOperationsResourceWithStreamingResponse(self)
 
     def get(
         self,
         operation_id: str,
         *,
-        account_identifier: str,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[BulkOperationGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BulkOperationGetResponse:
         """
         Gets the current status of an asynchronous operation on a list.
 
@@ -51,7 +62,7 @@ def get(
         property will contain a message describing the error.
 
         Args:
-          account_identifier: Identifier
+          account_id: The Account ID for this resource.
 
           operation_id: The unique operation ID of the asynchronous action.
 
@@ -63,44 +74,60 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not operation_id:
             raise ValueError(f"Expected a non-empty value for `operation_id` but received {operation_id!r}")
-        return self._get(
-            f"/accounts/{account_identifier}/rules/lists/bulk_operations/{operation_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[BulkOperationGetResponse]]._unwrapper,
+        return cast(
+            BulkOperationGetResponse,
+            self._get(
+                f"/accounts/{account_id}/rules/lists/bulk_operations/{operation_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[BulkOperationGetResponse]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[BulkOperationGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[BulkOperationGetResponse]], ResultWrapper[BulkOperationGetResponse]),
         )
 
 
 class AsyncBulkOperationsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncBulkOperationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncBulkOperationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncBulkOperationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncBulkOperationsResourceWithStreamingResponse(self)
 
     async def get(
         self,
         operation_id: str,
         *,
-        account_identifier: str,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[BulkOperationGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BulkOperationGetResponse:
         """
         Gets the current status of an asynchronous operation on a list.
 
@@ -109,7 +136,7 @@ async def get(
         property will contain a message describing the error.
 
         Args:
-          account_identifier: Identifier
+          account_id: The Account ID for this resource.
 
           operation_id: The unique operation ID of the asynchronous action.
 
@@ -121,20 +148,25 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not operation_id:
             raise ValueError(f"Expected a non-empty value for `operation_id` but received {operation_id!r}")
-        return await self._get(
-            f"/accounts/{account_identifier}/rules/lists/bulk_operations/{operation_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[BulkOperationGetResponse]]._unwrapper,
+        return cast(
+            BulkOperationGetResponse,
+            await self._get(
+                f"/accounts/{account_id}/rules/lists/bulk_operations/{operation_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[BulkOperationGetResponse]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[BulkOperationGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[BulkOperationGetResponse]], ResultWrapper[BulkOperationGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/rules/lists/items.py b/src/cloudflare/resources/rules/lists/items.py
index ffa94113ad1..c25f615936c 100644
--- a/src/cloudflare/resources/rules/lists/items.py
+++ b/src/cloudflare/resources/rules/lists/items.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Iterable, Optional, cast
+from typing import Any, Type, Iterable, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -20,10 +17,11 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ....pagination import SyncCursorPagination, AsyncCursorPagination
+from ....pagination import SyncCursorPaginationAfter, AsyncCursorPaginationAfter
 from ...._base_client import AsyncPaginator, make_request_options
-from ....types.rules.lists import item_list_params, item_create_params, item_update_params
+from ....types.rules.lists import item_list_params, item_create_params, item_delete_params, item_update_params
 from ....types.rules.lists.item_get_response import ItemGetResponse
+from ....types.rules.lists.item_list_response import ItemListResponse
 from ....types.rules.lists.item_create_response import ItemCreateResponse
 from ....types.rules.lists.item_delete_response import ItemDeleteResponse
 from ....types.rules.lists.item_update_response import ItemUpdateResponse
@@ -34,10 +32,21 @@
 class ItemsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ItemsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ItemsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ItemsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ItemsResourceWithStreamingResponse(self)
 
     def create(
@@ -51,18 +60,20 @@ def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ItemCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ItemCreateResponse:
         """Appends new items to the list.
 
         This operation is asynchronous.
 
         To get current the operation status, invoke the
-        [Get bulk operation status](/operations/lists-get-bulk-operation-status)
-        endpoint with the returned `operation_id`.
+        `Get bulk operation status` endpoint with the returned `operation_id`.
+
+        There is a limit of 1 pending bulk operation per account. If an outstanding bulk
+        operation is in progress, the request will be rejected.
 
         Args:
-          account_id: Identifier
+          account_id: The Account ID for this resource.
 
           list_id: The unique ID of the list.
 
@@ -80,15 +91,15 @@ def create(
             raise ValueError(f"Expected a non-empty value for `list_id` but received {list_id!r}")
         return self._post(
             f"/accounts/{account_id}/rules/lists/{list_id}/items",
-            body=maybe_transform(body, item_create_params.ItemCreateParams),
+            body=maybe_transform(body, Iterable[item_create_params.Body]),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ItemCreateResponse]]._unwrapper,
+                post_parser=ResultWrapper[ItemCreateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ItemCreateResponse]], ResultWrapper[ItemCreateResponse]),
+            cast_to=cast(Type[ItemCreateResponse], ResultWrapper[ItemCreateResponse]),
         )
 
     def update(
@@ -102,18 +113,20 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ItemUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ItemUpdateResponse:
         """
         Removes all existing items from the list and adds the provided items to the
         list.
 
         This operation is asynchronous. To get current the operation status, invoke the
-        [Get bulk operation status](/operations/lists-get-bulk-operation-status)
-        endpoint with the returned `operation_id`.
+        `Get bulk operation status` endpoint with the returned `operation_id`.
+
+        There is a limit of 1 pending bulk operation per account. If an outstanding bulk
+        operation is in progress, the request will be rejected.
 
         Args:
-          account_id: Identifier
+          account_id: The Account ID for this resource.
 
           list_id: The unique ID of the list.
 
@@ -131,15 +144,15 @@ def update(
             raise ValueError(f"Expected a non-empty value for `list_id` but received {list_id!r}")
         return self._put(
             f"/accounts/{account_id}/rules/lists/{list_id}/items",
-            body=maybe_transform(body, item_update_params.ItemUpdateParams),
+            body=maybe_transform(body, Iterable[item_update_params.Body]),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ItemUpdateResponse]]._unwrapper,
+                post_parser=ResultWrapper[ItemUpdateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ItemUpdateResponse]], ResultWrapper[ItemUpdateResponse]),
+            cast_to=cast(Type[ItemUpdateResponse], ResultWrapper[ItemUpdateResponse]),
         )
 
     def list(
@@ -147,21 +160,21 @@ def list(
         list_id: str,
         *,
         account_id: str,
-        cursor: str | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
-        search: str | NotGiven = NOT_GIVEN,
+        cursor: str | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncCursorPagination[object]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncCursorPaginationAfter[ItemListResponse]:
         """
         Fetches all the items in the list.
 
         Args:
-          account_id: Identifier
+          account_id: The Account ID for this resource.
 
           list_id: The unique ID of the list.
 
@@ -192,7 +205,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `list_id` but received {list_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/rules/lists/{list_id}/items",
-            page=SyncCursorPagination[object],
+            page=SyncCursorPaginationAfter[ItemListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -207,7 +220,7 @@ def list(
                     item_list_params.ItemListParams,
                 ),
             ),
-            model=object,
+            model=cast(Any, ItemListResponse),  # Union types cannot be passed in as arguments in the type system
         )
 
     def delete(
@@ -215,23 +228,26 @@ def delete(
         list_id: str,
         *,
         account_id: str,
+        items: Iterable[item_delete_params.Item] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ItemDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ItemDeleteResponse:
         """Removes one or more items from a list.
 
         This operation is asynchronous.
 
         To get current the operation status, invoke the
-        [Get bulk operation status](/operations/lists-get-bulk-operation-status)
-        endpoint with the returned `operation_id`.
+        `Get bulk operation status` endpoint with the returned `operation_id`.
+
+        There is a limit of 1 pending bulk operation per account. If an outstanding bulk
+        operation is in progress, the request will be rejected.
 
         Args:
-          account_id: Identifier
+          account_id: The Account ID for this resource.
 
           list_id: The unique ID of the list.
 
@@ -249,38 +265,39 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `list_id` but received {list_id!r}")
         return self._delete(
             f"/accounts/{account_id}/rules/lists/{list_id}/items",
+            body=maybe_transform({"items": items}, item_delete_params.ItemDeleteParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ItemDeleteResponse]]._unwrapper,
+                post_parser=ResultWrapper[ItemDeleteResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ItemDeleteResponse]], ResultWrapper[ItemDeleteResponse]),
+            cast_to=cast(Type[ItemDeleteResponse], ResultWrapper[ItemDeleteResponse]),
         )
 
     def get(
         self,
         item_id: str,
         *,
-        account_identifier: str,
+        account_id: str,
         list_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ItemGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ItemGetResponse:
         """
         Fetches a list item in the list.
 
         Args:
-          account_identifier: Identifier
+          account_id: The Account ID for this resource.
 
           list_id: The unique ID of the list.
 
-          item_id: The unique ID of the item in the List.
+          item_id: Defines the unique ID of the item in the List.
 
           extra_headers: Send extra headers
 
@@ -290,22 +307,22 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not list_id:
             raise ValueError(f"Expected a non-empty value for `list_id` but received {list_id!r}")
         if not item_id:
             raise ValueError(f"Expected a non-empty value for `item_id` but received {item_id!r}")
         return cast(
-            Optional[ItemGetResponse],
+            ItemGetResponse,
             self._get(
-                f"/accounts/{account_identifier}/rules/lists/{list_id}/items/{item_id}",
+                f"/accounts/{account_id}/rules/lists/{list_id}/items/{item_id}",
                 options=make_request_options(
                     extra_headers=extra_headers,
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[Optional[ItemGetResponse]]._unwrapper,
+                    post_parser=ResultWrapper[ItemGetResponse]._unwrapper,
                 ),
                 cast_to=cast(
                     Any, ResultWrapper[ItemGetResponse]
@@ -317,10 +334,21 @@ def get(
 class AsyncItemsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncItemsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncItemsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncItemsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncItemsResourceWithStreamingResponse(self)
 
     async def create(
@@ -334,18 +362,20 @@ async def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ItemCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ItemCreateResponse:
         """Appends new items to the list.
 
         This operation is asynchronous.
 
         To get current the operation status, invoke the
-        [Get bulk operation status](/operations/lists-get-bulk-operation-status)
-        endpoint with the returned `operation_id`.
+        `Get bulk operation status` endpoint with the returned `operation_id`.
+
+        There is a limit of 1 pending bulk operation per account. If an outstanding bulk
+        operation is in progress, the request will be rejected.
 
         Args:
-          account_id: Identifier
+          account_id: The Account ID for this resource.
 
           list_id: The unique ID of the list.
 
@@ -363,15 +393,15 @@ async def create(
             raise ValueError(f"Expected a non-empty value for `list_id` but received {list_id!r}")
         return await self._post(
             f"/accounts/{account_id}/rules/lists/{list_id}/items",
-            body=await async_maybe_transform(body, item_create_params.ItemCreateParams),
+            body=await async_maybe_transform(body, Iterable[item_create_params.Body]),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ItemCreateResponse]]._unwrapper,
+                post_parser=ResultWrapper[ItemCreateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ItemCreateResponse]], ResultWrapper[ItemCreateResponse]),
+            cast_to=cast(Type[ItemCreateResponse], ResultWrapper[ItemCreateResponse]),
         )
 
     async def update(
@@ -385,18 +415,20 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ItemUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ItemUpdateResponse:
         """
         Removes all existing items from the list and adds the provided items to the
         list.
 
         This operation is asynchronous. To get current the operation status, invoke the
-        [Get bulk operation status](/operations/lists-get-bulk-operation-status)
-        endpoint with the returned `operation_id`.
+        `Get bulk operation status` endpoint with the returned `operation_id`.
+
+        There is a limit of 1 pending bulk operation per account. If an outstanding bulk
+        operation is in progress, the request will be rejected.
 
         Args:
-          account_id: Identifier
+          account_id: The Account ID for this resource.
 
           list_id: The unique ID of the list.
 
@@ -414,15 +446,15 @@ async def update(
             raise ValueError(f"Expected a non-empty value for `list_id` but received {list_id!r}")
         return await self._put(
             f"/accounts/{account_id}/rules/lists/{list_id}/items",
-            body=await async_maybe_transform(body, item_update_params.ItemUpdateParams),
+            body=await async_maybe_transform(body, Iterable[item_update_params.Body]),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ItemUpdateResponse]]._unwrapper,
+                post_parser=ResultWrapper[ItemUpdateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ItemUpdateResponse]], ResultWrapper[ItemUpdateResponse]),
+            cast_to=cast(Type[ItemUpdateResponse], ResultWrapper[ItemUpdateResponse]),
         )
 
     def list(
@@ -430,21 +462,21 @@ def list(
         list_id: str,
         *,
         account_id: str,
-        cursor: str | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
-        search: str | NotGiven = NOT_GIVEN,
+        cursor: str | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[object, AsyncCursorPagination[object]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ItemListResponse, AsyncCursorPaginationAfter[ItemListResponse]]:
         """
         Fetches all the items in the list.
 
         Args:
-          account_id: Identifier
+          account_id: The Account ID for this resource.
 
           list_id: The unique ID of the list.
 
@@ -475,7 +507,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `list_id` but received {list_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/rules/lists/{list_id}/items",
-            page=AsyncCursorPagination[object],
+            page=AsyncCursorPaginationAfter[ItemListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -490,7 +522,7 @@ def list(
                     item_list_params.ItemListParams,
                 ),
             ),
-            model=object,
+            model=cast(Any, ItemListResponse),  # Union types cannot be passed in as arguments in the type system
         )
 
     async def delete(
@@ -498,23 +530,26 @@ async def delete(
         list_id: str,
         *,
         account_id: str,
+        items: Iterable[item_delete_params.Item] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ItemDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ItemDeleteResponse:
         """Removes one or more items from a list.
 
         This operation is asynchronous.
 
         To get current the operation status, invoke the
-        [Get bulk operation status](/operations/lists-get-bulk-operation-status)
-        endpoint with the returned `operation_id`.
+        `Get bulk operation status` endpoint with the returned `operation_id`.
+
+        There is a limit of 1 pending bulk operation per account. If an outstanding bulk
+        operation is in progress, the request will be rejected.
 
         Args:
-          account_id: Identifier
+          account_id: The Account ID for this resource.
 
           list_id: The unique ID of the list.
 
@@ -532,38 +567,39 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `list_id` but received {list_id!r}")
         return await self._delete(
             f"/accounts/{account_id}/rules/lists/{list_id}/items",
+            body=await async_maybe_transform({"items": items}, item_delete_params.ItemDeleteParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ItemDeleteResponse]]._unwrapper,
+                post_parser=ResultWrapper[ItemDeleteResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ItemDeleteResponse]], ResultWrapper[ItemDeleteResponse]),
+            cast_to=cast(Type[ItemDeleteResponse], ResultWrapper[ItemDeleteResponse]),
         )
 
     async def get(
         self,
         item_id: str,
         *,
-        account_identifier: str,
+        account_id: str,
         list_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ItemGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ItemGetResponse:
         """
         Fetches a list item in the list.
 
         Args:
-          account_identifier: Identifier
+          account_id: The Account ID for this resource.
 
           list_id: The unique ID of the list.
 
-          item_id: The unique ID of the item in the List.
+          item_id: Defines the unique ID of the item in the List.
 
           extra_headers: Send extra headers
 
@@ -573,22 +609,22 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not list_id:
             raise ValueError(f"Expected a non-empty value for `list_id` but received {list_id!r}")
         if not item_id:
             raise ValueError(f"Expected a non-empty value for `item_id` but received {item_id!r}")
         return cast(
-            Optional[ItemGetResponse],
+            ItemGetResponse,
             await self._get(
-                f"/accounts/{account_identifier}/rules/lists/{list_id}/items/{item_id}",
+                f"/accounts/{account_id}/rules/lists/{list_id}/items/{item_id}",
                 options=make_request_options(
                     extra_headers=extra_headers,
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[Optional[ItemGetResponse]]._unwrapper,
+                    post_parser=ResultWrapper[ItemGetResponse]._unwrapper,
                 ),
                 cast_to=cast(
                     Any, ResultWrapper[ItemGetResponse]
diff --git a/src/cloudflare/resources/rules/lists/lists.py b/src/cloudflare/resources/rules/lists/lists.py
index 6b5bf038661..a9acf30d14d 100644
--- a/src/cloudflare/resources/rules/lists/lists.py
+++ b/src/cloudflare/resources/rules/lists/lists.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Type, cast
 from typing_extensions import Literal
 
 import httpx
@@ -15,11 +15,8 @@
     ItemsResourceWithStreamingResponse,
     AsyncItemsResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -41,7 +38,10 @@
     AsyncBulkOperationsResourceWithStreamingResponse,
 )
 from ....types.rules.lists_list import ListsList
+from ....types.rules.list_get_response import ListGetResponse
+from ....types.rules.list_create_response import ListCreateResponse
 from ....types.rules.list_delete_response import ListDeleteResponse
+from ....types.rules.list_update_response import ListUpdateResponse
 
 __all__ = ["ListsResource", "AsyncListsResource"]
 
@@ -57,10 +57,21 @@ def items(self) -> ItemsResource:
 
     @cached_property
     def with_raw_response(self) -> ListsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ListsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ListsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ListsResourceWithStreamingResponse(self)
 
     def create(
@@ -69,19 +80,19 @@ def create(
         account_id: str,
         kind: Literal["ip", "redirect", "hostname", "asn"],
         name: str,
-        description: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ListsList]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ListCreateResponse:
         """
-        Creates a new list of the specified type.
+        Creates a new list of the specified kind.
 
         Args:
-          account_id: Identifier
+          account_id: The Account ID for this resource.
 
           kind: The type of the list. Each type supports specific list items (IP addresses,
               ASNs, hostnames or redirects).
@@ -115,9 +126,9 @@ def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ListsList]]._unwrapper,
+                post_parser=ResultWrapper[ListCreateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ListsList]], ResultWrapper[ListsList]),
+            cast_to=cast(Type[ListCreateResponse], ResultWrapper[ListCreateResponse]),
         )
 
     def update(
@@ -125,19 +136,19 @@ def update(
         list_id: str,
         *,
         account_id: str,
-        description: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ListsList]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ListUpdateResponse:
         """
         Updates the description of a list.
 
         Args:
-          account_id: Identifier
+          account_id: The Account ID for this resource.
 
           list_id: The unique ID of the list.
 
@@ -163,9 +174,9 @@ def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ListsList]]._unwrapper,
+                post_parser=ResultWrapper[ListUpdateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ListsList]], ResultWrapper[ListsList]),
+            cast_to=cast(Type[ListUpdateResponse], ResultWrapper[ListUpdateResponse]),
         )
 
     def list(
@@ -177,13 +188,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[ListsList]:
         """
         Fetches all lists in the account.
 
         Args:
-          account_id: Identifier
+          account_id: The Account ID for this resource.
 
           extra_headers: Send extra headers
 
@@ -214,13 +225,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ListDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ListDeleteResponse:
         """
         Deletes a specific list and all its items.
 
         Args:
-          account_id: Identifier
+          account_id: The Account ID for this resource.
 
           list_id: The unique ID of the list.
 
@@ -243,9 +254,9 @@ def delete(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ListDeleteResponse]]._unwrapper,
+                post_parser=ResultWrapper[ListDeleteResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ListDeleteResponse]], ResultWrapper[ListDeleteResponse]),
+            cast_to=cast(Type[ListDeleteResponse], ResultWrapper[ListDeleteResponse]),
         )
 
     def get(
@@ -258,13 +269,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ListsList]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ListGetResponse:
         """
         Fetches the details of a list.
 
         Args:
-          account_id: Identifier
+          account_id: The Account ID for this resource.
 
           list_id: The unique ID of the list.
 
@@ -287,9 +298,9 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ListsList]]._unwrapper,
+                post_parser=ResultWrapper[ListGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ListsList]], ResultWrapper[ListsList]),
+            cast_to=cast(Type[ListGetResponse], ResultWrapper[ListGetResponse]),
         )
 
 
@@ -304,10 +315,21 @@ def items(self) -> AsyncItemsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncListsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncListsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncListsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncListsResourceWithStreamingResponse(self)
 
     async def create(
@@ -316,19 +338,19 @@ async def create(
         account_id: str,
         kind: Literal["ip", "redirect", "hostname", "asn"],
         name: str,
-        description: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ListsList]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ListCreateResponse:
         """
-        Creates a new list of the specified type.
+        Creates a new list of the specified kind.
 
         Args:
-          account_id: Identifier
+          account_id: The Account ID for this resource.
 
           kind: The type of the list. Each type supports specific list items (IP addresses,
               ASNs, hostnames or redirects).
@@ -362,9 +384,9 @@ async def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ListsList]]._unwrapper,
+                post_parser=ResultWrapper[ListCreateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ListsList]], ResultWrapper[ListsList]),
+            cast_to=cast(Type[ListCreateResponse], ResultWrapper[ListCreateResponse]),
         )
 
     async def update(
@@ -372,19 +394,19 @@ async def update(
         list_id: str,
         *,
         account_id: str,
-        description: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ListsList]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ListUpdateResponse:
         """
         Updates the description of a list.
 
         Args:
-          account_id: Identifier
+          account_id: The Account ID for this resource.
 
           list_id: The unique ID of the list.
 
@@ -410,9 +432,9 @@ async def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ListsList]]._unwrapper,
+                post_parser=ResultWrapper[ListUpdateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ListsList]], ResultWrapper[ListsList]),
+            cast_to=cast(Type[ListUpdateResponse], ResultWrapper[ListUpdateResponse]),
         )
 
     def list(
@@ -424,13 +446,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[ListsList, AsyncSinglePage[ListsList]]:
         """
         Fetches all lists in the account.
 
         Args:
-          account_id: Identifier
+          account_id: The Account ID for this resource.
 
           extra_headers: Send extra headers
 
@@ -461,13 +483,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ListDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ListDeleteResponse:
         """
         Deletes a specific list and all its items.
 
         Args:
-          account_id: Identifier
+          account_id: The Account ID for this resource.
 
           list_id: The unique ID of the list.
 
@@ -490,9 +512,9 @@ async def delete(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ListDeleteResponse]]._unwrapper,
+                post_parser=ResultWrapper[ListDeleteResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ListDeleteResponse]], ResultWrapper[ListDeleteResponse]),
+            cast_to=cast(Type[ListDeleteResponse], ResultWrapper[ListDeleteResponse]),
         )
 
     async def get(
@@ -505,13 +527,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ListsList]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ListGetResponse:
         """
         Fetches the details of a list.
 
         Args:
-          account_id: Identifier
+          account_id: The Account ID for this resource.
 
           list_id: The unique ID of the list.
 
@@ -534,9 +556,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ListsList]]._unwrapper,
+                post_parser=ResultWrapper[ListGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ListsList]], ResultWrapper[ListsList]),
+            cast_to=cast(Type[ListGetResponse], ResultWrapper[ListGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/rules/rules.py b/src/cloudflare/resources/rules/rules.py
index e4ebeb782bf..e3d938e4206 100644
--- a/src/cloudflare/resources/rules/rules.py
+++ b/src/cloudflare/resources/rules/rules.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .lists import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .lists.lists import (
     ListsResource,
     AsyncListsResource,
     ListsResourceWithRawResponse,
@@ -10,9 +12,6 @@
     ListsResourceWithStreamingResponse,
     AsyncListsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .lists.lists import ListsResource, AsyncListsResource
 
 __all__ = ["RulesResource", "AsyncRulesResource"]
 
@@ -24,10 +23,21 @@ def lists(self) -> ListsResource:
 
     @cached_property
     def with_raw_response(self) -> RulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RulesResourceWithStreamingResponse(self)
 
 
@@ -38,10 +48,21 @@ def lists(self) -> AsyncListsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncRulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRulesResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/rulesets/phases/phases.py b/src/cloudflare/resources/rulesets/phases/phases.py
index 8522d55dc66..15c937b14bc 100644
--- a/src/cloudflare/resources/rulesets/phases/phases.py
+++ b/src/cloudflare/resources/rulesets/phases/phases.py
@@ -14,11 +14,8 @@
     VersionsResourceWithStreamingResponse,
     AsyncVersionsResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -44,27 +41,38 @@ def versions(self) -> VersionsResource:
 
     @cached_property
     def with_raw_response(self) -> PhasesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PhasesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PhasesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PhasesResourceWithStreamingResponse(self)
 
     def update(
         self,
         ruleset_phase: Phase,
         *,
-        rules: Iterable[phase_update_params.Rule],
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        description: str | Omit = omit,
+        name: str | Omit = omit,
+        rules: Iterable[phase_update_params.Rule] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PhaseUpdateResponse:
         """
         Updates an account or zone entry point ruleset, creating a new version.
@@ -72,8 +80,6 @@ def update(
         Args:
           ruleset_phase: The phase of the ruleset.
 
-          rules: The list of rules in the ruleset.
-
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
@@ -82,6 +88,8 @@ def update(
 
           name: The human-readable name of the ruleset.
 
+          rules: The list of rules in the ruleset.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -108,9 +116,9 @@ def update(
             f"/{account_or_zone}/{account_or_zone_id}/rulesets/phases/{ruleset_phase}/entrypoint",
             body=maybe_transform(
                 {
-                    "rules": rules,
                     "description": description,
                     "name": name,
+                    "rules": rules,
                 },
                 phase_update_params.PhaseUpdateParams,
             ),
@@ -128,14 +136,14 @@ def get(
         self,
         ruleset_phase: Phase,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PhaseGetResponse:
         """
         Fetches the latest version of the account or zone entry point ruleset for a
@@ -190,27 +198,38 @@ def versions(self) -> AsyncVersionsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncPhasesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPhasesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPhasesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPhasesResourceWithStreamingResponse(self)
 
     async def update(
         self,
         ruleset_phase: Phase,
         *,
-        rules: Iterable[phase_update_params.Rule],
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        description: str | Omit = omit,
+        name: str | Omit = omit,
+        rules: Iterable[phase_update_params.Rule] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PhaseUpdateResponse:
         """
         Updates an account or zone entry point ruleset, creating a new version.
@@ -218,8 +237,6 @@ async def update(
         Args:
           ruleset_phase: The phase of the ruleset.
 
-          rules: The list of rules in the ruleset.
-
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
@@ -228,6 +245,8 @@ async def update(
 
           name: The human-readable name of the ruleset.
 
+          rules: The list of rules in the ruleset.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -254,9 +273,9 @@ async def update(
             f"/{account_or_zone}/{account_or_zone_id}/rulesets/phases/{ruleset_phase}/entrypoint",
             body=await async_maybe_transform(
                 {
-                    "rules": rules,
                     "description": description,
                     "name": name,
+                    "rules": rules,
                 },
                 phase_update_params.PhaseUpdateParams,
             ),
@@ -274,14 +293,14 @@ async def get(
         self,
         ruleset_phase: Phase,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PhaseGetResponse:
         """
         Fetches the latest version of the account or zone entry point ruleset for a
diff --git a/src/cloudflare/resources/rulesets/phases/versions.py b/src/cloudflare/resources/rulesets/phases/versions.py
index 77ac256caa0..4a05765f784 100644
--- a/src/cloudflare/resources/rulesets/phases/versions.py
+++ b/src/cloudflare/resources/rulesets/phases/versions.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -29,24 +29,35 @@
 class VersionsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> VersionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return VersionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> VersionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return VersionsResourceWithStreamingResponse(self)
 
     def list(
         self,
         ruleset_phase: Phase,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[VersionListResponse]:
         """
         Fetches the versions of an account or zone entry point ruleset.
@@ -94,14 +105,14 @@ def get(
         ruleset_version: str,
         *,
         ruleset_phase: Phase,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> VersionGetResponse:
         """
         Fetches a specific version of an account or zone entry point ruleset.
@@ -155,24 +166,35 @@ def get(
 class AsyncVersionsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncVersionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncVersionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncVersionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncVersionsResourceWithStreamingResponse(self)
 
     def list(
         self,
         ruleset_phase: Phase,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[VersionListResponse, AsyncSinglePage[VersionListResponse]]:
         """
         Fetches the versions of an account or zone entry point ruleset.
@@ -220,14 +242,14 @@ async def get(
         ruleset_version: str,
         *,
         ruleset_phase: Phase,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> VersionGetResponse:
         """
         Fetches a specific version of an account or zone entry point ruleset.
diff --git a/src/cloudflare/resources/rulesets/rules.py b/src/cloudflare/resources/rulesets/rules.py
index 866e2ec673f..e1f991a9e29 100644
--- a/src/cloudflare/resources/rulesets/rules.py
+++ b/src/cloudflare/resources/rulesets/rules.py
@@ -2,17 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Type, cast, overload
-from typing_extensions import Literal
+from typing import Type, cast
+from typing_extensions import Literal, overload
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    required_args,
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -35,10 +31,21 @@
 class RulesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RulesResourceWithStreamingResponse(self)
 
     @overload
@@ -46,22 +53,25 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["block"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.BlockRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["block"] | Omit = omit,
+        action_parameters: rule_create_params.BlockRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.BlockRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.BlockRulePosition | Omit = omit,
+        ratelimit: rule_create_params.BlockRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -85,11 +95,17 @@ def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -106,22 +122,25 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["challenge"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["challenge"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.ChallengeRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.ChallengeRulePosition | Omit = omit,
+        ratelimit: rule_create_params.ChallengeRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -145,11 +164,17 @@ def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -166,22 +191,25 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["compress_response"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.CompressResponseRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["compress_response"] | Omit = omit,
+        action_parameters: rule_create_params.ResponseCompressionRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.ResponseCompressionRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.ResponseCompressionRulePosition | Omit = omit,
+        ratelimit: rule_create_params.ResponseCompressionRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -205,11 +233,17 @@ def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -226,22 +260,25 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["execute"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.ExecuteRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["ddos_dynamic"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.DDoSDynamicRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.DDoSDynamicRulePosition | Omit = omit,
+        ratelimit: rule_create_params.DDoSDynamicRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -265,11 +302,17 @@ def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -286,22 +329,25 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["js_challenge"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["execute"] | Omit = omit,
+        action_parameters: rule_create_params.ExecuteRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.ExecuteRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.ExecuteRulePosition | Omit = omit,
+        ratelimit: rule_create_params.ExecuteRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -325,11 +371,17 @@ def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -346,22 +398,25 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["log"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["force_connection_close"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.ForceConnectionCloseRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.ForceConnectionCloseRulePosition | Omit = omit,
+        ratelimit: rule_create_params.ForceConnectionCloseRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -385,11 +440,17 @@ def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -406,22 +467,25 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["managed_challenge"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["js_challenge"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.JavaScriptChallengeRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.JavaScriptChallengeRulePosition | Omit = omit,
+        ratelimit: rule_create_params.JavaScriptChallengeRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -445,11 +509,17 @@ def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -466,22 +536,25 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["redirect"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.RedirectRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["log"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.LogRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.LogRulePosition | Omit = omit,
+        ratelimit: rule_create_params.LogRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -505,11 +578,17 @@ def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -526,22 +605,25 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["rewrite"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.RewriteRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["log_custom_field"] | Omit = omit,
+        action_parameters: rule_create_params.LogCustomFieldRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.LogCustomFieldRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.LogCustomFieldRulePosition | Omit = omit,
+        ratelimit: rule_create_params.LogCustomFieldRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -565,11 +647,17 @@ def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -586,22 +674,25 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["route"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.RouteRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["managed_challenge"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.ManagedChallengeRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.ManagedChallengeRulePosition | Omit = omit,
+        ratelimit: rule_create_params.ManagedChallengeRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -625,11 +716,17 @@ def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -646,22 +743,25 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["score"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.ScoreRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["redirect"] | Omit = omit,
+        action_parameters: rule_create_params.RedirectRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.RedirectRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.RedirectRulePosition | Omit = omit,
+        ratelimit: rule_create_params.RedirectRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -685,11 +785,17 @@ def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -706,22 +812,25 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["serve_error"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.ServeErrorRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["rewrite"] | Omit = omit,
+        action_parameters: rule_create_params.RewriteRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.RewriteRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.RewriteRulePosition | Omit = omit,
+        ratelimit: rule_create_params.RewriteRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -745,11 +854,17 @@ def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -766,22 +881,25 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["set_config"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.SetConfigRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["route"] | Omit = omit,
+        action_parameters: rule_create_params.RouteRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.RouteRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.RouteRulePosition | Omit = omit,
+        ratelimit: rule_create_params.RouteRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -805,11 +923,17 @@ def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -826,22 +950,25 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["skip"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.SkipRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["score"] | Omit = omit,
+        action_parameters: rule_create_params.ScoreRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.ScoreRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.ScoreRulePosition | Omit = omit,
+        ratelimit: rule_create_params.ScoreRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -865,11 +992,17 @@ def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -886,22 +1019,25 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["set_cache_settings"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.SetCacheSettingsRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["serve_error"] | Omit = omit,
+        action_parameters: rule_create_params.ServeErrorRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.ServeErrorRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.ServeErrorRulePosition | Omit = omit,
+        ratelimit: rule_create_params.ServeErrorRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -925,11 +1061,17 @@ def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -946,22 +1088,25 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["log_custom_field"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.RulesetsLogCustomFieldRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["set_cache_settings"] | Omit = omit,
+        action_parameters: rule_create_params.SetCacheSettingsRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.SetCacheSettingsRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.SetCacheSettingsRulePosition | Omit = omit,
+        ratelimit: rule_create_params.SetCacheSettingsRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -985,11 +1130,17 @@ def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -1006,22 +1157,25 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["ddos_dynamic"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["set_config"] | Omit = omit,
+        action_parameters: rule_create_params.SetConfigurationRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.SetConfigurationRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.SetConfigurationRulePosition | Omit = omit,
+        ratelimit: rule_create_params.SetConfigurationRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -1045,11 +1199,17 @@ def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -1066,22 +1226,25 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["force_connection_close"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["skip"] | Omit = omit,
+        action_parameters: rule_create_params.SkipRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.SkipRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.SkipRulePosition | Omit = omit,
+        ratelimit: rule_create_params.SkipRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -1105,11 +1268,17 @@ def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -1125,53 +1294,110 @@ def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
         action: Literal["block"]
         | Literal["challenge"]
         | Literal["compress_response"]
+        | Literal["ddos_dynamic"]
         | Literal["execute"]
+        | Literal["force_connection_close"]
         | Literal["js_challenge"]
         | Literal["log"]
+        | Literal["log_custom_field"]
         | Literal["managed_challenge"]
         | Literal["redirect"]
         | Literal["rewrite"]
         | Literal["route"]
         | Literal["score"]
         | Literal["serve_error"]
+        | Literal["set_cache_settings"]
         | Literal["set_config"]
         | Literal["skip"]
-        | Literal["set_cache_settings"]
-        | Literal["log_custom_field"]
-        | Literal["ddos_dynamic"]
-        | Literal["force_connection_close"]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         action_parameters: rule_create_params.BlockRuleActionParameters
         | object
-        | rule_create_params.CompressResponseRuleActionParameters
+        | rule_create_params.ResponseCompressionRuleActionParameters
         | rule_create_params.ExecuteRuleActionParameters
+        | rule_create_params.LogCustomFieldRuleActionParameters
         | rule_create_params.RedirectRuleActionParameters
         | rule_create_params.RewriteRuleActionParameters
         | rule_create_params.RouteRuleActionParameters
         | rule_create_params.ScoreRuleActionParameters
         | rule_create_params.ServeErrorRuleActionParameters
-        | rule_create_params.SetConfigRuleActionParameters
-        | rule_create_params.SkipRuleActionParameters
         | rule_create_params.SetCacheSettingsRuleActionParameters
-        | rule_create_params.RulesetsLogCustomFieldRuleActionParameters
-        | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        | rule_create_params.SetConfigurationRuleActionParameters
+        | rule_create_params.SkipRuleActionParameters
+        | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.BlockRuleExposedCredentialCheck
+        | rule_create_params.ChallengeRuleExposedCredentialCheck
+        | rule_create_params.ResponseCompressionRuleExposedCredentialCheck
+        | rule_create_params.DDoSDynamicRuleExposedCredentialCheck
+        | rule_create_params.ExecuteRuleExposedCredentialCheck
+        | rule_create_params.ForceConnectionCloseRuleExposedCredentialCheck
+        | rule_create_params.JavaScriptChallengeRuleExposedCredentialCheck
+        | rule_create_params.LogRuleExposedCredentialCheck
+        | rule_create_params.LogCustomFieldRuleExposedCredentialCheck
+        | rule_create_params.ManagedChallengeRuleExposedCredentialCheck
+        | rule_create_params.RedirectRuleExposedCredentialCheck
+        | rule_create_params.RewriteRuleExposedCredentialCheck
+        | rule_create_params.RouteRuleExposedCredentialCheck
+        | rule_create_params.ScoreRuleExposedCredentialCheck
+        | rule_create_params.ServeErrorRuleExposedCredentialCheck
+        | rule_create_params.SetCacheSettingsRuleExposedCredentialCheck
+        | rule_create_params.SetConfigurationRuleExposedCredentialCheck
+        | rule_create_params.SkipRuleExposedCredentialCheck
+        | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.BlockRulePosition
+        | rule_create_params.ChallengeRulePosition
+        | rule_create_params.ResponseCompressionRulePosition
+        | rule_create_params.DDoSDynamicRulePosition
+        | rule_create_params.ExecuteRulePosition
+        | rule_create_params.ForceConnectionCloseRulePosition
+        | rule_create_params.JavaScriptChallengeRulePosition
+        | rule_create_params.LogRulePosition
+        | rule_create_params.LogCustomFieldRulePosition
+        | rule_create_params.ManagedChallengeRulePosition
+        | rule_create_params.RedirectRulePosition
+        | rule_create_params.RewriteRulePosition
+        | rule_create_params.RouteRulePosition
+        | rule_create_params.ScoreRulePosition
+        | rule_create_params.ServeErrorRulePosition
+        | rule_create_params.SetCacheSettingsRulePosition
+        | rule_create_params.SetConfigurationRulePosition
+        | rule_create_params.SkipRulePosition
+        | Omit = omit,
+        ratelimit: rule_create_params.BlockRuleRatelimit
+        | rule_create_params.ChallengeRuleRatelimit
+        | rule_create_params.ResponseCompressionRuleRatelimit
+        | rule_create_params.DDoSDynamicRuleRatelimit
+        | rule_create_params.ExecuteRuleRatelimit
+        | rule_create_params.ForceConnectionCloseRuleRatelimit
+        | rule_create_params.JavaScriptChallengeRuleRatelimit
+        | rule_create_params.LogRuleRatelimit
+        | rule_create_params.LogCustomFieldRuleRatelimit
+        | rule_create_params.ManagedChallengeRuleRatelimit
+        | rule_create_params.RedirectRuleRatelimit
+        | rule_create_params.RewriteRuleRatelimit
+        | rule_create_params.RouteRuleRatelimit
+        | rule_create_params.ScoreRuleRatelimit
+        | rule_create_params.ServeErrorRuleRatelimit
+        | rule_create_params.SetCacheSettingsRuleRatelimit
+        | rule_create_params.SetConfigurationRuleRatelimit
+        | rule_create_params.SkipRuleRatelimit
+        | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         if not ruleset_id:
             raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
@@ -1196,8 +1422,11 @@ def create(
                     "action_parameters": action_parameters,
                     "description": description,
                     "enabled": enabled,
+                    "exposed_credential_check": exposed_credential_check,
                     "expression": expression,
                     "logging": logging,
+                    "position": position,
+                    "ratelimit": ratelimit,
                     "ref": ref,
                 },
                 rule_create_params.RuleCreateParams,
@@ -1217,14 +1446,14 @@ def delete(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleDeleteResponse:
         """
         Deletes an existing rule from an account or zone ruleset.
@@ -1280,22 +1509,25 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["block"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.BlockRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["block"] | Omit = omit,
+        action_parameters: rule_edit_params.BlockRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.BlockRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.BlockRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.BlockRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -1319,11 +1551,17 @@ def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -1341,22 +1579,25 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["challenge"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["challenge"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.ChallengeRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.ChallengeRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.ChallengeRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -1380,11 +1621,17 @@ def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -1402,22 +1649,25 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["compress_response"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.CompressResponseRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["compress_response"] | Omit = omit,
+        action_parameters: rule_edit_params.ResponseCompressionRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.ResponseCompressionRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.ResponseCompressionRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.ResponseCompressionRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -1441,11 +1691,17 @@ def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -1463,22 +1719,25 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["execute"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.ExecuteRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["ddos_dynamic"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.DDoSDynamicRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.DDoSDynamicRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.DDoSDynamicRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -1502,11 +1761,17 @@ def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -1524,22 +1789,25 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["js_challenge"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["execute"] | Omit = omit,
+        action_parameters: rule_edit_params.ExecuteRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.ExecuteRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.ExecuteRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.ExecuteRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -1563,11 +1831,17 @@ def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -1585,22 +1859,25 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["log"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["force_connection_close"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.ForceConnectionCloseRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.ForceConnectionCloseRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.ForceConnectionCloseRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -1624,11 +1901,17 @@ def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -1646,22 +1929,25 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["managed_challenge"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["js_challenge"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.JavaScriptChallengeRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.JavaScriptChallengeRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.JavaScriptChallengeRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -1685,11 +1971,17 @@ def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -1707,22 +1999,25 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["redirect"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.RedirectRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["log"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.LogRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.LogRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.LogRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -1746,11 +2041,17 @@ def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -1768,22 +2069,25 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["rewrite"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.RewriteRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["log_custom_field"] | Omit = omit,
+        action_parameters: rule_edit_params.LogCustomFieldRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.LogCustomFieldRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.LogCustomFieldRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.LogCustomFieldRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -1807,11 +2111,17 @@ def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -1829,22 +2139,25 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["route"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.RouteRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["managed_challenge"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.ManagedChallengeRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.ManagedChallengeRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.ManagedChallengeRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -1868,11 +2181,17 @@ def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -1890,22 +2209,25 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["score"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.ScoreRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["redirect"] | Omit = omit,
+        action_parameters: rule_edit_params.RedirectRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.RedirectRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.RedirectRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.RedirectRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -1929,11 +2251,17 @@ def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -1951,22 +2279,25 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["serve_error"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.ServeErrorRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["rewrite"] | Omit = omit,
+        action_parameters: rule_edit_params.RewriteRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.RewriteRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.RewriteRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.RewriteRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -1990,11 +2321,17 @@ def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -2012,22 +2349,25 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["set_config"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.SetConfigRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["route"] | Omit = omit,
+        action_parameters: rule_edit_params.RouteRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.RouteRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.RouteRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.RouteRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -2051,11 +2391,17 @@ def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -2073,22 +2419,25 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["skip"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.SkipRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["score"] | Omit = omit,
+        action_parameters: rule_edit_params.ScoreRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.ScoreRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.ScoreRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.ScoreRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -2112,11 +2461,17 @@ def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -2134,22 +2489,25 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["set_cache_settings"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.SetCacheSettingsRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["serve_error"] | Omit = omit,
+        action_parameters: rule_edit_params.ServeErrorRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.ServeErrorRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.ServeErrorRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.ServeErrorRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -2173,11 +2531,17 @@ def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -2195,22 +2559,25 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["log_custom_field"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.RulesetsLogCustomFieldRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["set_cache_settings"] | Omit = omit,
+        action_parameters: rule_edit_params.SetCacheSettingsRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.SetCacheSettingsRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.SetCacheSettingsRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.SetCacheSettingsRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -2234,11 +2601,17 @@ def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -2256,22 +2629,25 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["ddos_dynamic"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["set_config"] | Omit = omit,
+        action_parameters: rule_edit_params.SetConfigurationRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.SetConfigurationRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.SetConfigurationRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.SetConfigurationRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -2295,11 +2671,17 @@ def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -2317,22 +2699,25 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["force_connection_close"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["skip"] | Omit = omit,
+        action_parameters: rule_edit_params.SkipRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.SkipRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.SkipRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.SkipRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -2356,11 +2741,17 @@ def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -2378,53 +2769,110 @@ def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
         action: Literal["block"]
         | Literal["challenge"]
         | Literal["compress_response"]
+        | Literal["ddos_dynamic"]
         | Literal["execute"]
+        | Literal["force_connection_close"]
         | Literal["js_challenge"]
         | Literal["log"]
+        | Literal["log_custom_field"]
         | Literal["managed_challenge"]
         | Literal["redirect"]
         | Literal["rewrite"]
         | Literal["route"]
         | Literal["score"]
         | Literal["serve_error"]
+        | Literal["set_cache_settings"]
         | Literal["set_config"]
         | Literal["skip"]
-        | Literal["set_cache_settings"]
-        | Literal["log_custom_field"]
-        | Literal["ddos_dynamic"]
-        | Literal["force_connection_close"]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         action_parameters: rule_edit_params.BlockRuleActionParameters
         | object
-        | rule_edit_params.CompressResponseRuleActionParameters
+        | rule_edit_params.ResponseCompressionRuleActionParameters
         | rule_edit_params.ExecuteRuleActionParameters
+        | rule_edit_params.LogCustomFieldRuleActionParameters
         | rule_edit_params.RedirectRuleActionParameters
         | rule_edit_params.RewriteRuleActionParameters
         | rule_edit_params.RouteRuleActionParameters
         | rule_edit_params.ScoreRuleActionParameters
         | rule_edit_params.ServeErrorRuleActionParameters
-        | rule_edit_params.SetConfigRuleActionParameters
-        | rule_edit_params.SkipRuleActionParameters
         | rule_edit_params.SetCacheSettingsRuleActionParameters
-        | rule_edit_params.RulesetsLogCustomFieldRuleActionParameters
-        | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        | rule_edit_params.SetConfigurationRuleActionParameters
+        | rule_edit_params.SkipRuleActionParameters
+        | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.BlockRuleExposedCredentialCheck
+        | rule_edit_params.ChallengeRuleExposedCredentialCheck
+        | rule_edit_params.ResponseCompressionRuleExposedCredentialCheck
+        | rule_edit_params.DDoSDynamicRuleExposedCredentialCheck
+        | rule_edit_params.ExecuteRuleExposedCredentialCheck
+        | rule_edit_params.ForceConnectionCloseRuleExposedCredentialCheck
+        | rule_edit_params.JavaScriptChallengeRuleExposedCredentialCheck
+        | rule_edit_params.LogRuleExposedCredentialCheck
+        | rule_edit_params.LogCustomFieldRuleExposedCredentialCheck
+        | rule_edit_params.ManagedChallengeRuleExposedCredentialCheck
+        | rule_edit_params.RedirectRuleExposedCredentialCheck
+        | rule_edit_params.RewriteRuleExposedCredentialCheck
+        | rule_edit_params.RouteRuleExposedCredentialCheck
+        | rule_edit_params.ScoreRuleExposedCredentialCheck
+        | rule_edit_params.ServeErrorRuleExposedCredentialCheck
+        | rule_edit_params.SetCacheSettingsRuleExposedCredentialCheck
+        | rule_edit_params.SetConfigurationRuleExposedCredentialCheck
+        | rule_edit_params.SkipRuleExposedCredentialCheck
+        | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.BlockRulePosition
+        | rule_edit_params.ChallengeRulePosition
+        | rule_edit_params.ResponseCompressionRulePosition
+        | rule_edit_params.DDoSDynamicRulePosition
+        | rule_edit_params.ExecuteRulePosition
+        | rule_edit_params.ForceConnectionCloseRulePosition
+        | rule_edit_params.JavaScriptChallengeRulePosition
+        | rule_edit_params.LogRulePosition
+        | rule_edit_params.LogCustomFieldRulePosition
+        | rule_edit_params.ManagedChallengeRulePosition
+        | rule_edit_params.RedirectRulePosition
+        | rule_edit_params.RewriteRulePosition
+        | rule_edit_params.RouteRulePosition
+        | rule_edit_params.ScoreRulePosition
+        | rule_edit_params.ServeErrorRulePosition
+        | rule_edit_params.SetCacheSettingsRulePosition
+        | rule_edit_params.SetConfigurationRulePosition
+        | rule_edit_params.SkipRulePosition
+        | Omit = omit,
+        ratelimit: rule_edit_params.BlockRuleRatelimit
+        | rule_edit_params.ChallengeRuleRatelimit
+        | rule_edit_params.ResponseCompressionRuleRatelimit
+        | rule_edit_params.DDoSDynamicRuleRatelimit
+        | rule_edit_params.ExecuteRuleRatelimit
+        | rule_edit_params.ForceConnectionCloseRuleRatelimit
+        | rule_edit_params.JavaScriptChallengeRuleRatelimit
+        | rule_edit_params.LogRuleRatelimit
+        | rule_edit_params.LogCustomFieldRuleRatelimit
+        | rule_edit_params.ManagedChallengeRuleRatelimit
+        | rule_edit_params.RedirectRuleRatelimit
+        | rule_edit_params.RewriteRuleRatelimit
+        | rule_edit_params.RouteRuleRatelimit
+        | rule_edit_params.ScoreRuleRatelimit
+        | rule_edit_params.ServeErrorRuleRatelimit
+        | rule_edit_params.SetCacheSettingsRuleRatelimit
+        | rule_edit_params.SetConfigurationRuleRatelimit
+        | rule_edit_params.SkipRuleRatelimit
+        | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         if not ruleset_id:
             raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
@@ -2451,8 +2899,11 @@ def edit(
                     "action_parameters": action_parameters,
                     "description": description,
                     "enabled": enabled,
+                    "exposed_credential_check": exposed_credential_check,
                     "expression": expression,
                     "logging": logging,
+                    "position": position,
+                    "ratelimit": ratelimit,
                     "ref": ref,
                 },
                 rule_edit_params.RuleEditParams,
@@ -2471,10 +2922,21 @@ def edit(
 class AsyncRulesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRulesResourceWithStreamingResponse(self)
 
     @overload
@@ -2482,22 +2944,25 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["block"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.BlockRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["block"] | Omit = omit,
+        action_parameters: rule_create_params.BlockRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.BlockRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.BlockRulePosition | Omit = omit,
+        ratelimit: rule_create_params.BlockRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -2521,11 +2986,17 @@ async def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -2542,22 +3013,25 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["challenge"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["challenge"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.ChallengeRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.ChallengeRulePosition | Omit = omit,
+        ratelimit: rule_create_params.ChallengeRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -2581,11 +3055,17 @@ async def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -2602,22 +3082,25 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["compress_response"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.CompressResponseRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["compress_response"] | Omit = omit,
+        action_parameters: rule_create_params.ResponseCompressionRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.ResponseCompressionRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.ResponseCompressionRulePosition | Omit = omit,
+        ratelimit: rule_create_params.ResponseCompressionRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -2641,11 +3124,17 @@ async def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -2662,22 +3151,25 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["execute"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.ExecuteRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["ddos_dynamic"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.DDoSDynamicRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.DDoSDynamicRulePosition | Omit = omit,
+        ratelimit: rule_create_params.DDoSDynamicRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -2701,11 +3193,17 @@ async def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -2722,22 +3220,25 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["js_challenge"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["execute"] | Omit = omit,
+        action_parameters: rule_create_params.ExecuteRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.ExecuteRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.ExecuteRulePosition | Omit = omit,
+        ratelimit: rule_create_params.ExecuteRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -2761,11 +3262,17 @@ async def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -2782,22 +3289,25 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["log"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["force_connection_close"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.ForceConnectionCloseRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.ForceConnectionCloseRulePosition | Omit = omit,
+        ratelimit: rule_create_params.ForceConnectionCloseRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -2821,11 +3331,17 @@ async def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -2842,22 +3358,25 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["managed_challenge"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["js_challenge"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.JavaScriptChallengeRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.JavaScriptChallengeRulePosition | Omit = omit,
+        ratelimit: rule_create_params.JavaScriptChallengeRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -2881,11 +3400,17 @@ async def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -2902,22 +3427,25 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["redirect"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.RedirectRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["log"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.LogRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.LogRulePosition | Omit = omit,
+        ratelimit: rule_create_params.LogRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -2941,11 +3469,17 @@ async def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -2962,22 +3496,25 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["rewrite"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.RewriteRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["log_custom_field"] | Omit = omit,
+        action_parameters: rule_create_params.LogCustomFieldRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.LogCustomFieldRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.LogCustomFieldRulePosition | Omit = omit,
+        ratelimit: rule_create_params.LogCustomFieldRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -3001,11 +3538,17 @@ async def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -3022,22 +3565,25 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["route"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.RouteRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["managed_challenge"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.ManagedChallengeRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.ManagedChallengeRulePosition | Omit = omit,
+        ratelimit: rule_create_params.ManagedChallengeRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -3061,11 +3607,17 @@ async def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -3082,22 +3634,25 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["score"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.ScoreRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["redirect"] | Omit = omit,
+        action_parameters: rule_create_params.RedirectRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.RedirectRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.RedirectRulePosition | Omit = omit,
+        ratelimit: rule_create_params.RedirectRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -3121,11 +3676,17 @@ async def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -3142,22 +3703,25 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["serve_error"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.ServeErrorRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["rewrite"] | Omit = omit,
+        action_parameters: rule_create_params.RewriteRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.RewriteRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.RewriteRulePosition | Omit = omit,
+        ratelimit: rule_create_params.RewriteRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -3181,11 +3745,17 @@ async def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -3202,22 +3772,25 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["set_config"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.SetConfigRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["route"] | Omit = omit,
+        action_parameters: rule_create_params.RouteRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.RouteRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.RouteRulePosition | Omit = omit,
+        ratelimit: rule_create_params.RouteRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -3241,11 +3814,17 @@ async def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -3262,22 +3841,25 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["skip"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.SkipRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["score"] | Omit = omit,
+        action_parameters: rule_create_params.ScoreRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.ScoreRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.ScoreRulePosition | Omit = omit,
+        ratelimit: rule_create_params.ScoreRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -3301,11 +3883,17 @@ async def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -3322,22 +3910,25 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["set_cache_settings"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.SetCacheSettingsRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["serve_error"] | Omit = omit,
+        action_parameters: rule_create_params.ServeErrorRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.ServeErrorRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.ServeErrorRulePosition | Omit = omit,
+        ratelimit: rule_create_params.ServeErrorRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -3361,11 +3952,17 @@ async def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -3382,22 +3979,25 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["log_custom_field"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_create_params.RulesetsLogCustomFieldRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["set_cache_settings"] | Omit = omit,
+        action_parameters: rule_create_params.SetCacheSettingsRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.SetCacheSettingsRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.SetCacheSettingsRulePosition | Omit = omit,
+        ratelimit: rule_create_params.SetCacheSettingsRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -3421,11 +4021,17 @@ async def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -3442,22 +4048,25 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["ddos_dynamic"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["set_config"] | Omit = omit,
+        action_parameters: rule_create_params.SetConfigurationRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.SetConfigurationRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.SetConfigurationRulePosition | Omit = omit,
+        ratelimit: rule_create_params.SetConfigurationRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -3481,11 +4090,17 @@ async def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -3502,22 +4117,25 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["force_connection_close"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["skip"] | Omit = omit,
+        action_parameters: rule_create_params.SkipRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.SkipRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.SkipRulePosition | Omit = omit,
+        ratelimit: rule_create_params.SkipRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         """Adds a new rule to an account or zone ruleset.
 
@@ -3541,11 +4159,17 @@ async def create(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -3561,53 +4185,110 @@ async def create(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
         action: Literal["block"]
         | Literal["challenge"]
         | Literal["compress_response"]
+        | Literal["ddos_dynamic"]
         | Literal["execute"]
+        | Literal["force_connection_close"]
         | Literal["js_challenge"]
         | Literal["log"]
+        | Literal["log_custom_field"]
         | Literal["managed_challenge"]
         | Literal["redirect"]
         | Literal["rewrite"]
         | Literal["route"]
         | Literal["score"]
         | Literal["serve_error"]
+        | Literal["set_cache_settings"]
         | Literal["set_config"]
         | Literal["skip"]
-        | Literal["set_cache_settings"]
-        | Literal["log_custom_field"]
-        | Literal["ddos_dynamic"]
-        | Literal["force_connection_close"]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         action_parameters: rule_create_params.BlockRuleActionParameters
         | object
-        | rule_create_params.CompressResponseRuleActionParameters
+        | rule_create_params.ResponseCompressionRuleActionParameters
         | rule_create_params.ExecuteRuleActionParameters
+        | rule_create_params.LogCustomFieldRuleActionParameters
         | rule_create_params.RedirectRuleActionParameters
         | rule_create_params.RewriteRuleActionParameters
         | rule_create_params.RouteRuleActionParameters
         | rule_create_params.ScoreRuleActionParameters
         | rule_create_params.ServeErrorRuleActionParameters
-        | rule_create_params.SetConfigRuleActionParameters
-        | rule_create_params.SkipRuleActionParameters
         | rule_create_params.SetCacheSettingsRuleActionParameters
-        | rule_create_params.RulesetsLogCustomFieldRuleActionParameters
-        | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        | rule_create_params.SetConfigurationRuleActionParameters
+        | rule_create_params.SkipRuleActionParameters
+        | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_create_params.BlockRuleExposedCredentialCheck
+        | rule_create_params.ChallengeRuleExposedCredentialCheck
+        | rule_create_params.ResponseCompressionRuleExposedCredentialCheck
+        | rule_create_params.DDoSDynamicRuleExposedCredentialCheck
+        | rule_create_params.ExecuteRuleExposedCredentialCheck
+        | rule_create_params.ForceConnectionCloseRuleExposedCredentialCheck
+        | rule_create_params.JavaScriptChallengeRuleExposedCredentialCheck
+        | rule_create_params.LogRuleExposedCredentialCheck
+        | rule_create_params.LogCustomFieldRuleExposedCredentialCheck
+        | rule_create_params.ManagedChallengeRuleExposedCredentialCheck
+        | rule_create_params.RedirectRuleExposedCredentialCheck
+        | rule_create_params.RewriteRuleExposedCredentialCheck
+        | rule_create_params.RouteRuleExposedCredentialCheck
+        | rule_create_params.ScoreRuleExposedCredentialCheck
+        | rule_create_params.ServeErrorRuleExposedCredentialCheck
+        | rule_create_params.SetCacheSettingsRuleExposedCredentialCheck
+        | rule_create_params.SetConfigurationRuleExposedCredentialCheck
+        | rule_create_params.SkipRuleExposedCredentialCheck
+        | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_create_params.BlockRulePosition
+        | rule_create_params.ChallengeRulePosition
+        | rule_create_params.ResponseCompressionRulePosition
+        | rule_create_params.DDoSDynamicRulePosition
+        | rule_create_params.ExecuteRulePosition
+        | rule_create_params.ForceConnectionCloseRulePosition
+        | rule_create_params.JavaScriptChallengeRulePosition
+        | rule_create_params.LogRulePosition
+        | rule_create_params.LogCustomFieldRulePosition
+        | rule_create_params.ManagedChallengeRulePosition
+        | rule_create_params.RedirectRulePosition
+        | rule_create_params.RewriteRulePosition
+        | rule_create_params.RouteRulePosition
+        | rule_create_params.ScoreRulePosition
+        | rule_create_params.ServeErrorRulePosition
+        | rule_create_params.SetCacheSettingsRulePosition
+        | rule_create_params.SetConfigurationRulePosition
+        | rule_create_params.SkipRulePosition
+        | Omit = omit,
+        ratelimit: rule_create_params.BlockRuleRatelimit
+        | rule_create_params.ChallengeRuleRatelimit
+        | rule_create_params.ResponseCompressionRuleRatelimit
+        | rule_create_params.DDoSDynamicRuleRatelimit
+        | rule_create_params.ExecuteRuleRatelimit
+        | rule_create_params.ForceConnectionCloseRuleRatelimit
+        | rule_create_params.JavaScriptChallengeRuleRatelimit
+        | rule_create_params.LogRuleRatelimit
+        | rule_create_params.LogCustomFieldRuleRatelimit
+        | rule_create_params.ManagedChallengeRuleRatelimit
+        | rule_create_params.RedirectRuleRatelimit
+        | rule_create_params.RewriteRuleRatelimit
+        | rule_create_params.RouteRuleRatelimit
+        | rule_create_params.ScoreRuleRatelimit
+        | rule_create_params.ServeErrorRuleRatelimit
+        | rule_create_params.SetCacheSettingsRuleRatelimit
+        | rule_create_params.SetConfigurationRuleRatelimit
+        | rule_create_params.SkipRuleRatelimit
+        | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleCreateResponse:
         if not ruleset_id:
             raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
@@ -3632,8 +4313,11 @@ async def create(
                     "action_parameters": action_parameters,
                     "description": description,
                     "enabled": enabled,
+                    "exposed_credential_check": exposed_credential_check,
                     "expression": expression,
                     "logging": logging,
+                    "position": position,
+                    "ratelimit": ratelimit,
                     "ref": ref,
                 },
                 rule_create_params.RuleCreateParams,
@@ -3653,14 +4337,14 @@ async def delete(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleDeleteResponse:
         """
         Deletes an existing rule from an account or zone ruleset.
@@ -3716,22 +4400,25 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["block"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.BlockRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["block"] | Omit = omit,
+        action_parameters: rule_edit_params.BlockRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.BlockRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.BlockRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.BlockRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -3755,11 +4442,17 @@ async def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -3777,22 +4470,25 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["challenge"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["challenge"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.ChallengeRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.ChallengeRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.ChallengeRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -3816,11 +4512,17 @@ async def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -3838,22 +4540,25 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["compress_response"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.CompressResponseRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["compress_response"] | Omit = omit,
+        action_parameters: rule_edit_params.ResponseCompressionRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.ResponseCompressionRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.ResponseCompressionRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.ResponseCompressionRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -3877,11 +4582,17 @@ async def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -3899,22 +4610,25 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["execute"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.ExecuteRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["ddos_dynamic"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.DDoSDynamicRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.DDoSDynamicRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.DDoSDynamicRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -3938,11 +4652,17 @@ async def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -3960,22 +4680,25 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["js_challenge"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["execute"] | Omit = omit,
+        action_parameters: rule_edit_params.ExecuteRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.ExecuteRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.ExecuteRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.ExecuteRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -3999,11 +4722,17 @@ async def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -4021,22 +4750,25 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["log"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["force_connection_close"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.ForceConnectionCloseRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.ForceConnectionCloseRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.ForceConnectionCloseRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -4060,11 +4792,17 @@ async def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -4082,22 +4820,25 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["managed_challenge"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["js_challenge"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.JavaScriptChallengeRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.JavaScriptChallengeRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.JavaScriptChallengeRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -4121,11 +4862,17 @@ async def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -4143,22 +4890,25 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["redirect"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.RedirectRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["log"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.LogRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.LogRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.LogRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -4182,11 +4932,17 @@ async def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -4204,22 +4960,25 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["rewrite"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.RewriteRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["log_custom_field"] | Omit = omit,
+        action_parameters: rule_edit_params.LogCustomFieldRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.LogCustomFieldRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.LogCustomFieldRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.LogCustomFieldRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -4243,11 +5002,17 @@ async def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -4265,22 +5030,25 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["route"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.RouteRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["managed_challenge"] | Omit = omit,
+        action_parameters: object | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.ManagedChallengeRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.ManagedChallengeRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.ManagedChallengeRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -4304,11 +5072,17 @@ async def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -4326,22 +5100,25 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["score"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.ScoreRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["redirect"] | Omit = omit,
+        action_parameters: rule_edit_params.RedirectRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.RedirectRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.RedirectRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.RedirectRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -4365,11 +5142,17 @@ async def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -4387,22 +5170,25 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["serve_error"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.ServeErrorRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["rewrite"] | Omit = omit,
+        action_parameters: rule_edit_params.RewriteRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.RewriteRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.RewriteRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.RewriteRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -4426,11 +5212,17 @@ async def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -4448,22 +5240,25 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["set_config"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.SetConfigRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["route"] | Omit = omit,
+        action_parameters: rule_edit_params.RouteRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.RouteRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.RouteRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.RouteRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -4487,11 +5282,17 @@ async def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -4509,22 +5310,25 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["skip"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.SkipRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["score"] | Omit = omit,
+        action_parameters: rule_edit_params.ScoreRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.ScoreRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.ScoreRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.ScoreRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -4548,11 +5352,17 @@ async def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -4570,22 +5380,25 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["set_cache_settings"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.SetCacheSettingsRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["serve_error"] | Omit = omit,
+        action_parameters: rule_edit_params.ServeErrorRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.ServeErrorRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.ServeErrorRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.ServeErrorRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -4609,11 +5422,17 @@ async def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -4631,22 +5450,25 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["log_custom_field"] | NotGiven = NOT_GIVEN,
-        action_parameters: rule_edit_params.RulesetsLogCustomFieldRuleActionParameters | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["set_cache_settings"] | Omit = omit,
+        action_parameters: rule_edit_params.SetCacheSettingsRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.SetCacheSettingsRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.SetCacheSettingsRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.SetCacheSettingsRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -4670,11 +5492,17 @@ async def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -4692,22 +5520,25 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["ddos_dynamic"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["set_config"] | Omit = omit,
+        action_parameters: rule_edit_params.SetConfigurationRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.SetConfigurationRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.SetConfigurationRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.SetConfigurationRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -4731,11 +5562,17 @@ async def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -4753,22 +5590,25 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        action: Literal["force_connection_close"] | NotGiven = NOT_GIVEN,
-        action_parameters: object | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
+        action: Literal["skip"] | Omit = omit,
+        action_parameters: rule_edit_params.SkipRuleActionParameters | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.SkipRuleExposedCredentialCheck | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.SkipRulePosition | Omit = omit,
+        ratelimit: rule_edit_params.SkipRuleRatelimit | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         """
         Updates an existing rule in an account or zone ruleset.
@@ -4792,11 +5632,17 @@ async def edit(
 
           enabled: Whether the rule should be executed.
 
+          exposed_credential_check: Configuration for exposed credential checking.
+
           expression: The expression defining which traffic will match the rule.
 
           logging: An object configuring the rule's logging behavior.
 
-          ref: The reference of the rule (the rule ID by default).
+          position: An object configuring where the rule will be placed.
+
+          ratelimit: An object configuring the rule's rate limit behavior.
+
+          ref: The reference of the rule (the rule's ID by default).
 
           extra_headers: Send extra headers
 
@@ -4814,53 +5660,110 @@ async def edit(
         rule_id: str,
         *,
         ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        id: str | Omit = omit,
         action: Literal["block"]
         | Literal["challenge"]
         | Literal["compress_response"]
+        | Literal["ddos_dynamic"]
         | Literal["execute"]
+        | Literal["force_connection_close"]
         | Literal["js_challenge"]
         | Literal["log"]
+        | Literal["log_custom_field"]
         | Literal["managed_challenge"]
         | Literal["redirect"]
         | Literal["rewrite"]
         | Literal["route"]
         | Literal["score"]
         | Literal["serve_error"]
+        | Literal["set_cache_settings"]
         | Literal["set_config"]
         | Literal["skip"]
-        | Literal["set_cache_settings"]
-        | Literal["log_custom_field"]
-        | Literal["ddos_dynamic"]
-        | Literal["force_connection_close"]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         action_parameters: rule_edit_params.BlockRuleActionParameters
         | object
-        | rule_edit_params.CompressResponseRuleActionParameters
+        | rule_edit_params.ResponseCompressionRuleActionParameters
         | rule_edit_params.ExecuteRuleActionParameters
+        | rule_edit_params.LogCustomFieldRuleActionParameters
         | rule_edit_params.RedirectRuleActionParameters
         | rule_edit_params.RewriteRuleActionParameters
         | rule_edit_params.RouteRuleActionParameters
         | rule_edit_params.ScoreRuleActionParameters
         | rule_edit_params.ServeErrorRuleActionParameters
-        | rule_edit_params.SetConfigRuleActionParameters
-        | rule_edit_params.SkipRuleActionParameters
         | rule_edit_params.SetCacheSettingsRuleActionParameters
-        | rule_edit_params.RulesetsLogCustomFieldRuleActionParameters
-        | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        expression: str | NotGiven = NOT_GIVEN,
-        logging: LoggingParam | NotGiven = NOT_GIVEN,
-        ref: str | NotGiven = NOT_GIVEN,
+        | rule_edit_params.SetConfigurationRuleActionParameters
+        | rule_edit_params.SkipRuleActionParameters
+        | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        exposed_credential_check: rule_edit_params.BlockRuleExposedCredentialCheck
+        | rule_edit_params.ChallengeRuleExposedCredentialCheck
+        | rule_edit_params.ResponseCompressionRuleExposedCredentialCheck
+        | rule_edit_params.DDoSDynamicRuleExposedCredentialCheck
+        | rule_edit_params.ExecuteRuleExposedCredentialCheck
+        | rule_edit_params.ForceConnectionCloseRuleExposedCredentialCheck
+        | rule_edit_params.JavaScriptChallengeRuleExposedCredentialCheck
+        | rule_edit_params.LogRuleExposedCredentialCheck
+        | rule_edit_params.LogCustomFieldRuleExposedCredentialCheck
+        | rule_edit_params.ManagedChallengeRuleExposedCredentialCheck
+        | rule_edit_params.RedirectRuleExposedCredentialCheck
+        | rule_edit_params.RewriteRuleExposedCredentialCheck
+        | rule_edit_params.RouteRuleExposedCredentialCheck
+        | rule_edit_params.ScoreRuleExposedCredentialCheck
+        | rule_edit_params.ServeErrorRuleExposedCredentialCheck
+        | rule_edit_params.SetCacheSettingsRuleExposedCredentialCheck
+        | rule_edit_params.SetConfigurationRuleExposedCredentialCheck
+        | rule_edit_params.SkipRuleExposedCredentialCheck
+        | Omit = omit,
+        expression: str | Omit = omit,
+        logging: LoggingParam | Omit = omit,
+        position: rule_edit_params.BlockRulePosition
+        | rule_edit_params.ChallengeRulePosition
+        | rule_edit_params.ResponseCompressionRulePosition
+        | rule_edit_params.DDoSDynamicRulePosition
+        | rule_edit_params.ExecuteRulePosition
+        | rule_edit_params.ForceConnectionCloseRulePosition
+        | rule_edit_params.JavaScriptChallengeRulePosition
+        | rule_edit_params.LogRulePosition
+        | rule_edit_params.LogCustomFieldRulePosition
+        | rule_edit_params.ManagedChallengeRulePosition
+        | rule_edit_params.RedirectRulePosition
+        | rule_edit_params.RewriteRulePosition
+        | rule_edit_params.RouteRulePosition
+        | rule_edit_params.ScoreRulePosition
+        | rule_edit_params.ServeErrorRulePosition
+        | rule_edit_params.SetCacheSettingsRulePosition
+        | rule_edit_params.SetConfigurationRulePosition
+        | rule_edit_params.SkipRulePosition
+        | Omit = omit,
+        ratelimit: rule_edit_params.BlockRuleRatelimit
+        | rule_edit_params.ChallengeRuleRatelimit
+        | rule_edit_params.ResponseCompressionRuleRatelimit
+        | rule_edit_params.DDoSDynamicRuleRatelimit
+        | rule_edit_params.ExecuteRuleRatelimit
+        | rule_edit_params.ForceConnectionCloseRuleRatelimit
+        | rule_edit_params.JavaScriptChallengeRuleRatelimit
+        | rule_edit_params.LogRuleRatelimit
+        | rule_edit_params.LogCustomFieldRuleRatelimit
+        | rule_edit_params.ManagedChallengeRuleRatelimit
+        | rule_edit_params.RedirectRuleRatelimit
+        | rule_edit_params.RewriteRuleRatelimit
+        | rule_edit_params.RouteRuleRatelimit
+        | rule_edit_params.ScoreRuleRatelimit
+        | rule_edit_params.ServeErrorRuleRatelimit
+        | rule_edit_params.SetCacheSettingsRuleRatelimit
+        | rule_edit_params.SetConfigurationRuleRatelimit
+        | rule_edit_params.SkipRuleRatelimit
+        | Omit = omit,
+        ref: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RuleEditResponse:
         if not ruleset_id:
             raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
@@ -4887,8 +5790,11 @@ async def edit(
                     "action_parameters": action_parameters,
                     "description": description,
                     "enabled": enabled,
+                    "exposed_credential_check": exposed_credential_check,
                     "expression": expression,
                     "logging": logging,
+                    "position": position,
+                    "ratelimit": ratelimit,
                     "ref": ref,
                 },
                 rule_edit_params.RuleEditParams,
diff --git a/src/cloudflare/resources/rulesets/rulesets.py b/src/cloudflare/resources/rulesets/rulesets.py
index 243a61e9e6b..04dcee7244a 100644
--- a/src/cloudflare/resources/rulesets/rulesets.py
+++ b/src/cloudflare/resources/rulesets/rulesets.py
@@ -14,19 +14,8 @@
     RulesResourceWithStreamingResponse,
     AsyncRulesResourceWithStreamingResponse,
 )
-from .phases import (
-    PhasesResource,
-    AsyncPhasesResource,
-    PhasesResourceWithRawResponse,
-    AsyncPhasesResourceWithRawResponse,
-    PhasesResourceWithStreamingResponse,
-    AsyncPhasesResourceWithStreamingResponse,
-)
-from ..._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from .versions import (
     VersionsResource,
     AsyncVersionsResource,
@@ -44,11 +33,17 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from ...pagination import SyncSinglePage, AsyncSinglePage
-from .phases.phases import PhasesResource, AsyncPhasesResource
+from ...pagination import SyncCursorPagination, AsyncCursorPagination
+from .phases.phases import (
+    PhasesResource,
+    AsyncPhasesResource,
+    PhasesResourceWithRawResponse,
+    AsyncPhasesResourceWithRawResponse,
+    PhasesResourceWithStreamingResponse,
+    AsyncPhasesResourceWithStreamingResponse,
+)
 from ..._base_client import AsyncPaginator, make_request_options
-from ...types.rulesets import Kind, Phase, ruleset_create_params, ruleset_update_params
-from .versions.versions import VersionsResource, AsyncVersionsResource
+from ...types.rulesets import Kind, Phase, ruleset_list_params, ruleset_create_params, ruleset_update_params
 from ...types.rulesets.kind import Kind
 from ...types.rulesets.phase import Phase
 from ...types.rulesets.ruleset_get_response import RulesetGetResponse
@@ -74,10 +69,21 @@ def versions(self) -> VersionsResource:
 
     @cached_property
     def with_raw_response(self) -> RulesetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RulesetsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RulesetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RulesetsResourceWithStreamingResponse(self)
 
     def create(
@@ -86,16 +92,16 @@ def create(
         kind: Kind,
         name: str,
         phase: Phase,
-        rules: Iterable[ruleset_create_params.Rule],
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        description: str | Omit = omit,
+        rules: Iterable[ruleset_create_params.Rule] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RulesetCreateResponse:
         """
         Creates a ruleset.
@@ -107,14 +113,14 @@ def create(
 
           phase: The phase of the ruleset.
 
-          rules: The list of rules in the ruleset.
-
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
           description: An informative description of the ruleset.
 
+          rules: The list of rules in the ruleset.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -142,8 +148,8 @@ def create(
                     "kind": kind,
                     "name": name,
                     "phase": phase,
-                    "rules": rules,
                     "description": description,
+                    "rules": rules,
                 },
                 ruleset_create_params.RulesetCreateParams,
             ),
@@ -161,19 +167,19 @@ def update(
         self,
         ruleset_id: str,
         *,
-        rules: Iterable[ruleset_update_params.Rule],
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        kind: Kind | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        phase: Phase | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        description: str | Omit = omit,
+        kind: Kind | Omit = omit,
+        name: str | Omit = omit,
+        phase: Phase | Omit = omit,
+        rules: Iterable[ruleset_update_params.Rule] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RulesetUpdateResponse:
         """
         Updates an account or zone ruleset, creating a new version.
@@ -181,8 +187,6 @@ def update(
         Args:
           ruleset_id: The unique ID of the ruleset.
 
-          rules: The list of rules in the ruleset.
-
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
@@ -195,6 +199,8 @@ def update(
 
           phase: The phase of the ruleset.
 
+          rules: The list of rules in the ruleset.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -221,11 +227,11 @@ def update(
             f"/{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}",
             body=maybe_transform(
                 {
-                    "rules": rules,
                     "description": description,
                     "kind": kind,
                     "name": name,
                     "phase": phase,
+                    "rules": rules,
                 },
                 ruleset_update_params.RulesetUpdateParams,
             ),
@@ -242,15 +248,17 @@ def update(
     def list(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        cursor: str | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[RulesetListResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncCursorPagination[RulesetListResponse]:
         """
         Fetches all rulesets.
 
@@ -259,6 +267,10 @@ def list(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          cursor: The cursor to use for the next page.
+
+          per_page: The number of rulesets to return per page.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -281,9 +293,19 @@ def list(
             account_or_zone_id = zone_id
         return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/rulesets",
-            page=SyncSinglePage[RulesetListResponse],
+            page=SyncCursorPagination[RulesetListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "cursor": cursor,
+                        "per_page": per_page,
+                    },
+                    ruleset_list_params.RulesetListParams,
+                ),
             ),
             model=RulesetListResponse,
         )
@@ -292,14 +314,14 @@ def delete(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> None:
         """
         Deletes all versions of an existing account or zone ruleset.
@@ -346,14 +368,14 @@ def get(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RulesetGetResponse:
         """
         Fetches the latest version of an account or zone ruleset.
@@ -415,10 +437,21 @@ def versions(self) -> AsyncVersionsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncRulesetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRulesetsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRulesetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRulesetsResourceWithStreamingResponse(self)
 
     async def create(
@@ -427,16 +460,16 @@ async def create(
         kind: Kind,
         name: str,
         phase: Phase,
-        rules: Iterable[ruleset_create_params.Rule],
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        description: str | Omit = omit,
+        rules: Iterable[ruleset_create_params.Rule] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RulesetCreateResponse:
         """
         Creates a ruleset.
@@ -448,14 +481,14 @@ async def create(
 
           phase: The phase of the ruleset.
 
-          rules: The list of rules in the ruleset.
-
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
           description: An informative description of the ruleset.
 
+          rules: The list of rules in the ruleset.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -483,8 +516,8 @@ async def create(
                     "kind": kind,
                     "name": name,
                     "phase": phase,
-                    "rules": rules,
                     "description": description,
+                    "rules": rules,
                 },
                 ruleset_create_params.RulesetCreateParams,
             ),
@@ -502,19 +535,19 @@ async def update(
         self,
         ruleset_id: str,
         *,
-        rules: Iterable[ruleset_update_params.Rule],
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        kind: Kind | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        phase: Phase | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        description: str | Omit = omit,
+        kind: Kind | Omit = omit,
+        name: str | Omit = omit,
+        phase: Phase | Omit = omit,
+        rules: Iterable[ruleset_update_params.Rule] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RulesetUpdateResponse:
         """
         Updates an account or zone ruleset, creating a new version.
@@ -522,8 +555,6 @@ async def update(
         Args:
           ruleset_id: The unique ID of the ruleset.
 
-          rules: The list of rules in the ruleset.
-
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
@@ -536,6 +567,8 @@ async def update(
 
           phase: The phase of the ruleset.
 
+          rules: The list of rules in the ruleset.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -562,11 +595,11 @@ async def update(
             f"/{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}",
             body=await async_maybe_transform(
                 {
-                    "rules": rules,
                     "description": description,
                     "kind": kind,
                     "name": name,
                     "phase": phase,
+                    "rules": rules,
                 },
                 ruleset_update_params.RulesetUpdateParams,
             ),
@@ -583,15 +616,17 @@ async def update(
     def list(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        cursor: str | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[RulesetListResponse, AsyncSinglePage[RulesetListResponse]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[RulesetListResponse, AsyncCursorPagination[RulesetListResponse]]:
         """
         Fetches all rulesets.
 
@@ -600,6 +635,10 @@ def list(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          cursor: The cursor to use for the next page.
+
+          per_page: The number of rulesets to return per page.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -622,9 +661,19 @@ def list(
             account_or_zone_id = zone_id
         return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/rulesets",
-            page=AsyncSinglePage[RulesetListResponse],
+            page=AsyncCursorPagination[RulesetListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "cursor": cursor,
+                        "per_page": per_page,
+                    },
+                    ruleset_list_params.RulesetListParams,
+                ),
             ),
             model=RulesetListResponse,
         )
@@ -633,14 +682,14 @@ async def delete(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> None:
         """
         Deletes all versions of an existing account or zone ruleset.
@@ -687,14 +736,14 @@ async def get(
         self,
         ruleset_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> RulesetGetResponse:
         """
         Fetches the latest version of an account or zone ruleset.
diff --git a/src/cloudflare/resources/rulesets/versions.py b/src/cloudflare/resources/rulesets/versions.py
new file mode 100644
index 00000000000..3635e9594ce
--- /dev/null
+++ b/src/cloudflare/resources/rulesets/versions.py
@@ -0,0 +1,476 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.rulesets.version_get_response import VersionGetResponse
+from ...types.rulesets.version_list_response import VersionListResponse
+
+__all__ = ["VersionsResource", "AsyncVersionsResource"]
+
+
+class VersionsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> VersionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return VersionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> VersionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return VersionsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        ruleset_id: str,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[VersionListResponse]:
+        """
+        Fetches the versions of an account or zone ruleset.
+
+        Args:
+          ruleset_id: The unique ID of the ruleset.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not ruleset_id:
+            raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._get_api_list(
+            f"/{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions",
+            page=SyncSinglePage[VersionListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=VersionListResponse,
+        )
+
+    def delete(
+        self,
+        ruleset_version: str,
+        *,
+        ruleset_id: str,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Deletes an existing version of an account or zone ruleset.
+
+        Args:
+          ruleset_id: The unique ID of the ruleset.
+
+          ruleset_version: The version of the ruleset.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not ruleset_id:
+            raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
+        if not ruleset_version:
+            raise ValueError(f"Expected a non-empty value for `ruleset_version` but received {ruleset_version!r}")
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._delete(
+            f"/{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions/{ruleset_version}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    def get(
+        self,
+        ruleset_version: str,
+        *,
+        ruleset_id: str,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> VersionGetResponse:
+        """
+        Fetches a specific version of an account or zone ruleset.
+
+        Args:
+          ruleset_id: The unique ID of the ruleset.
+
+          ruleset_version: The version of the ruleset.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not ruleset_id:
+            raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
+        if not ruleset_version:
+            raise ValueError(f"Expected a non-empty value for `ruleset_version` but received {ruleset_version!r}")
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._get(
+            f"/{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions/{ruleset_version}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[VersionGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[VersionGetResponse], ResultWrapper[VersionGetResponse]),
+        )
+
+
+class AsyncVersionsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncVersionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncVersionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncVersionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncVersionsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        ruleset_id: str,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[VersionListResponse, AsyncSinglePage[VersionListResponse]]:
+        """
+        Fetches the versions of an account or zone ruleset.
+
+        Args:
+          ruleset_id: The unique ID of the ruleset.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not ruleset_id:
+            raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._get_api_list(
+            f"/{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions",
+            page=AsyncSinglePage[VersionListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=VersionListResponse,
+        )
+
+    async def delete(
+        self,
+        ruleset_version: str,
+        *,
+        ruleset_id: str,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Deletes an existing version of an account or zone ruleset.
+
+        Args:
+          ruleset_id: The unique ID of the ruleset.
+
+          ruleset_version: The version of the ruleset.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not ruleset_id:
+            raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
+        if not ruleset_version:
+            raise ValueError(f"Expected a non-empty value for `ruleset_version` but received {ruleset_version!r}")
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._delete(
+            f"/{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions/{ruleset_version}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    async def get(
+        self,
+        ruleset_version: str,
+        *,
+        ruleset_id: str,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> VersionGetResponse:
+        """
+        Fetches a specific version of an account or zone ruleset.
+
+        Args:
+          ruleset_id: The unique ID of the ruleset.
+
+          ruleset_version: The version of the ruleset.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not ruleset_id:
+            raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
+        if not ruleset_version:
+            raise ValueError(f"Expected a non-empty value for `ruleset_version` but received {ruleset_version!r}")
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return await self._get(
+            f"/{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions/{ruleset_version}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[VersionGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[VersionGetResponse], ResultWrapper[VersionGetResponse]),
+        )
+
+
+class VersionsResourceWithRawResponse:
+    def __init__(self, versions: VersionsResource) -> None:
+        self._versions = versions
+
+        self.list = to_raw_response_wrapper(
+            versions.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            versions.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            versions.get,
+        )
+
+
+class AsyncVersionsResourceWithRawResponse:
+    def __init__(self, versions: AsyncVersionsResource) -> None:
+        self._versions = versions
+
+        self.list = async_to_raw_response_wrapper(
+            versions.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            versions.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            versions.get,
+        )
+
+
+class VersionsResourceWithStreamingResponse:
+    def __init__(self, versions: VersionsResource) -> None:
+        self._versions = versions
+
+        self.list = to_streamed_response_wrapper(
+            versions.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            versions.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            versions.get,
+        )
+
+
+class AsyncVersionsResourceWithStreamingResponse:
+    def __init__(self, versions: AsyncVersionsResource) -> None:
+        self._versions = versions
+
+        self.list = async_to_streamed_response_wrapper(
+            versions.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            versions.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            versions.get,
+        )
diff --git a/src/cloudflare/resources/rulesets/versions/__init__.py b/src/cloudflare/resources/rulesets/versions/__init__.py
deleted file mode 100644
index 8064a2e609c..00000000000
--- a/src/cloudflare/resources/rulesets/versions/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from .by_tag import (
-    ByTagResource,
-    AsyncByTagResource,
-    ByTagResourceWithRawResponse,
-    AsyncByTagResourceWithRawResponse,
-    ByTagResourceWithStreamingResponse,
-    AsyncByTagResourceWithStreamingResponse,
-)
-from .versions import (
-    VersionsResource,
-    AsyncVersionsResource,
-    VersionsResourceWithRawResponse,
-    AsyncVersionsResourceWithRawResponse,
-    VersionsResourceWithStreamingResponse,
-    AsyncVersionsResourceWithStreamingResponse,
-)
-
-__all__ = [
-    "ByTagResource",
-    "AsyncByTagResource",
-    "ByTagResourceWithRawResponse",
-    "AsyncByTagResourceWithRawResponse",
-    "ByTagResourceWithStreamingResponse",
-    "AsyncByTagResourceWithStreamingResponse",
-    "VersionsResource",
-    "AsyncVersionsResource",
-    "VersionsResourceWithRawResponse",
-    "AsyncVersionsResourceWithRawResponse",
-    "VersionsResourceWithStreamingResponse",
-    "AsyncVersionsResourceWithStreamingResponse",
-]
diff --git a/src/cloudflare/resources/rulesets/versions/by_tag.py b/src/cloudflare/resources/rulesets/versions/by_tag.py
deleted file mode 100644
index b08564f4b33..00000000000
--- a/src/cloudflare/resources/rulesets/versions/by_tag.py
+++ /dev/null
@@ -1,186 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, cast
-
-import httpx
-
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
-from ....types.rulesets.versions.by_tag_get_response import ByTagGetResponse
-
-__all__ = ["ByTagResource", "AsyncByTagResource"]
-
-
-class ByTagResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> ByTagResourceWithRawResponse:
-        return ByTagResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> ByTagResourceWithStreamingResponse:
-        return ByTagResourceWithStreamingResponse(self)
-
-    def get(
-        self,
-        rule_tag: str,
-        *,
-        account_id: str,
-        ruleset_id: str,
-        ruleset_version: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ByTagGetResponse:
-        """
-        Fetches the rules of a managed account ruleset version for a given tag.
-
-        Args:
-          account_id: The unique ID of the account.
-
-          ruleset_id: The unique ID of the ruleset.
-
-          ruleset_version: The version of the ruleset.
-
-          rule_tag: A category of the rule.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not ruleset_id:
-            raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
-        if not ruleset_version:
-            raise ValueError(f"Expected a non-empty value for `ruleset_version` but received {ruleset_version!r}")
-        if not rule_tag:
-            raise ValueError(f"Expected a non-empty value for `rule_tag` but received {rule_tag!r}")
-        return self._get(
-            f"/accounts/{account_id}/rulesets/{ruleset_id}/versions/{ruleset_version}/by_tag/{rule_tag}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[ByTagGetResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[ByTagGetResponse], ResultWrapper[ByTagGetResponse]),
-        )
-
-
-class AsyncByTagResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncByTagResourceWithRawResponse:
-        return AsyncByTagResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncByTagResourceWithStreamingResponse:
-        return AsyncByTagResourceWithStreamingResponse(self)
-
-    async def get(
-        self,
-        rule_tag: str,
-        *,
-        account_id: str,
-        ruleset_id: str,
-        ruleset_version: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ByTagGetResponse:
-        """
-        Fetches the rules of a managed account ruleset version for a given tag.
-
-        Args:
-          account_id: The unique ID of the account.
-
-          ruleset_id: The unique ID of the ruleset.
-
-          ruleset_version: The version of the ruleset.
-
-          rule_tag: A category of the rule.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not ruleset_id:
-            raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
-        if not ruleset_version:
-            raise ValueError(f"Expected a non-empty value for `ruleset_version` but received {ruleset_version!r}")
-        if not rule_tag:
-            raise ValueError(f"Expected a non-empty value for `rule_tag` but received {rule_tag!r}")
-        return await self._get(
-            f"/accounts/{account_id}/rulesets/{ruleset_id}/versions/{ruleset_version}/by_tag/{rule_tag}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[ByTagGetResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[ByTagGetResponse], ResultWrapper[ByTagGetResponse]),
-        )
-
-
-class ByTagResourceWithRawResponse:
-    def __init__(self, by_tag: ByTagResource) -> None:
-        self._by_tag = by_tag
-
-        self.get = to_raw_response_wrapper(
-            by_tag.get,
-        )
-
-
-class AsyncByTagResourceWithRawResponse:
-    def __init__(self, by_tag: AsyncByTagResource) -> None:
-        self._by_tag = by_tag
-
-        self.get = async_to_raw_response_wrapper(
-            by_tag.get,
-        )
-
-
-class ByTagResourceWithStreamingResponse:
-    def __init__(self, by_tag: ByTagResource) -> None:
-        self._by_tag = by_tag
-
-        self.get = to_streamed_response_wrapper(
-            by_tag.get,
-        )
-
-
-class AsyncByTagResourceWithStreamingResponse:
-    def __init__(self, by_tag: AsyncByTagResource) -> None:
-        self._by_tag = by_tag
-
-        self.get = async_to_streamed_response_wrapper(
-            by_tag.get,
-        )
diff --git a/src/cloudflare/resources/rulesets/versions/versions.py b/src/cloudflare/resources/rulesets/versions/versions.py
deleted file mode 100644
index 408cc80d4aa..00000000000
--- a/src/cloudflare/resources/rulesets/versions/versions.py
+++ /dev/null
@@ -1,486 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, cast
-
-import httpx
-
-from .by_tag import (
-    ByTagResource,
-    AsyncByTagResource,
-    ByTagResourceWithRawResponse,
-    AsyncByTagResourceWithRawResponse,
-    ByTagResourceWithStreamingResponse,
-    AsyncByTagResourceWithStreamingResponse,
-)
-from ...._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ...._wrappers import ResultWrapper
-from ....pagination import SyncSinglePage, AsyncSinglePage
-from ...._base_client import AsyncPaginator, make_request_options
-from ....types.rulesets.version_get_response import VersionGetResponse
-from ....types.rulesets.version_list_response import VersionListResponse
-
-__all__ = ["VersionsResource", "AsyncVersionsResource"]
-
-
-class VersionsResource(SyncAPIResource):
-    @cached_property
-    def by_tag(self) -> ByTagResource:
-        return ByTagResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> VersionsResourceWithRawResponse:
-        return VersionsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> VersionsResourceWithStreamingResponse:
-        return VersionsResourceWithStreamingResponse(self)
-
-    def list(
-        self,
-        ruleset_id: str,
-        *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[VersionListResponse]:
-        """
-        Fetches the versions of an account or zone ruleset.
-
-        Args:
-          ruleset_id: The unique ID of the ruleset.
-
-          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-
-          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not ruleset_id:
-            raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
-        if account_id and zone_id:
-            raise ValueError("You cannot provide both account_id and zone_id")
-
-        if account_id:
-            account_or_zone = "accounts"
-            account_or_zone_id = account_id
-        else:
-            if not zone_id:
-                raise ValueError("You must provide either account_id or zone_id")
-
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return self._get_api_list(
-            f"/{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions",
-            page=SyncSinglePage[VersionListResponse],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=VersionListResponse,
-        )
-
-    def delete(
-        self,
-        ruleset_version: str,
-        *,
-        ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> None:
-        """
-        Deletes an existing version of an account or zone ruleset.
-
-        Args:
-          ruleset_id: The unique ID of the ruleset.
-
-          ruleset_version: The version of the ruleset.
-
-          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-
-          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not ruleset_id:
-            raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
-        if not ruleset_version:
-            raise ValueError(f"Expected a non-empty value for `ruleset_version` but received {ruleset_version!r}")
-        if account_id and zone_id:
-            raise ValueError("You cannot provide both account_id and zone_id")
-
-        if account_id:
-            account_or_zone = "accounts"
-            account_or_zone_id = account_id
-        else:
-            if not zone_id:
-                raise ValueError("You must provide either account_id or zone_id")
-
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
-        return self._delete(
-            f"/{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions/{ruleset_version}",
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=NoneType,
-        )
-
-    def get(
-        self,
-        ruleset_version: str,
-        *,
-        ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> VersionGetResponse:
-        """
-        Fetches a specific version of an account or zone ruleset.
-
-        Args:
-          ruleset_id: The unique ID of the ruleset.
-
-          ruleset_version: The version of the ruleset.
-
-          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-
-          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not ruleset_id:
-            raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
-        if not ruleset_version:
-            raise ValueError(f"Expected a non-empty value for `ruleset_version` but received {ruleset_version!r}")
-        if account_id and zone_id:
-            raise ValueError("You cannot provide both account_id and zone_id")
-
-        if account_id:
-            account_or_zone = "accounts"
-            account_or_zone_id = account_id
-        else:
-            if not zone_id:
-                raise ValueError("You must provide either account_id or zone_id")
-
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return self._get(
-            f"/{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions/{ruleset_version}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[VersionGetResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[VersionGetResponse], ResultWrapper[VersionGetResponse]),
-        )
-
-
-class AsyncVersionsResource(AsyncAPIResource):
-    @cached_property
-    def by_tag(self) -> AsyncByTagResource:
-        return AsyncByTagResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncVersionsResourceWithRawResponse:
-        return AsyncVersionsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncVersionsResourceWithStreamingResponse:
-        return AsyncVersionsResourceWithStreamingResponse(self)
-
-    def list(
-        self,
-        ruleset_id: str,
-        *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[VersionListResponse, AsyncSinglePage[VersionListResponse]]:
-        """
-        Fetches the versions of an account or zone ruleset.
-
-        Args:
-          ruleset_id: The unique ID of the ruleset.
-
-          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-
-          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not ruleset_id:
-            raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
-        if account_id and zone_id:
-            raise ValueError("You cannot provide both account_id and zone_id")
-
-        if account_id:
-            account_or_zone = "accounts"
-            account_or_zone_id = account_id
-        else:
-            if not zone_id:
-                raise ValueError("You must provide either account_id or zone_id")
-
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return self._get_api_list(
-            f"/{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions",
-            page=AsyncSinglePage[VersionListResponse],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=VersionListResponse,
-        )
-
-    async def delete(
-        self,
-        ruleset_version: str,
-        *,
-        ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> None:
-        """
-        Deletes an existing version of an account or zone ruleset.
-
-        Args:
-          ruleset_id: The unique ID of the ruleset.
-
-          ruleset_version: The version of the ruleset.
-
-          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-
-          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not ruleset_id:
-            raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
-        if not ruleset_version:
-            raise ValueError(f"Expected a non-empty value for `ruleset_version` but received {ruleset_version!r}")
-        if account_id and zone_id:
-            raise ValueError("You cannot provide both account_id and zone_id")
-
-        if account_id:
-            account_or_zone = "accounts"
-            account_or_zone_id = account_id
-        else:
-            if not zone_id:
-                raise ValueError("You must provide either account_id or zone_id")
-
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
-        return await self._delete(
-            f"/{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions/{ruleset_version}",
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=NoneType,
-        )
-
-    async def get(
-        self,
-        ruleset_version: str,
-        *,
-        ruleset_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> VersionGetResponse:
-        """
-        Fetches a specific version of an account or zone ruleset.
-
-        Args:
-          ruleset_id: The unique ID of the ruleset.
-
-          ruleset_version: The version of the ruleset.
-
-          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-
-          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not ruleset_id:
-            raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
-        if not ruleset_version:
-            raise ValueError(f"Expected a non-empty value for `ruleset_version` but received {ruleset_version!r}")
-        if account_id and zone_id:
-            raise ValueError("You cannot provide both account_id and zone_id")
-
-        if account_id:
-            account_or_zone = "accounts"
-            account_or_zone_id = account_id
-        else:
-            if not zone_id:
-                raise ValueError("You must provide either account_id or zone_id")
-
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return await self._get(
-            f"/{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions/{ruleset_version}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[VersionGetResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[VersionGetResponse], ResultWrapper[VersionGetResponse]),
-        )
-
-
-class VersionsResourceWithRawResponse:
-    def __init__(self, versions: VersionsResource) -> None:
-        self._versions = versions
-
-        self.list = to_raw_response_wrapper(
-            versions.list,
-        )
-        self.delete = to_raw_response_wrapper(
-            versions.delete,
-        )
-        self.get = to_raw_response_wrapper(
-            versions.get,
-        )
-
-    @cached_property
-    def by_tag(self) -> ByTagResourceWithRawResponse:
-        return ByTagResourceWithRawResponse(self._versions.by_tag)
-
-
-class AsyncVersionsResourceWithRawResponse:
-    def __init__(self, versions: AsyncVersionsResource) -> None:
-        self._versions = versions
-
-        self.list = async_to_raw_response_wrapper(
-            versions.list,
-        )
-        self.delete = async_to_raw_response_wrapper(
-            versions.delete,
-        )
-        self.get = async_to_raw_response_wrapper(
-            versions.get,
-        )
-
-    @cached_property
-    def by_tag(self) -> AsyncByTagResourceWithRawResponse:
-        return AsyncByTagResourceWithRawResponse(self._versions.by_tag)
-
-
-class VersionsResourceWithStreamingResponse:
-    def __init__(self, versions: VersionsResource) -> None:
-        self._versions = versions
-
-        self.list = to_streamed_response_wrapper(
-            versions.list,
-        )
-        self.delete = to_streamed_response_wrapper(
-            versions.delete,
-        )
-        self.get = to_streamed_response_wrapper(
-            versions.get,
-        )
-
-    @cached_property
-    def by_tag(self) -> ByTagResourceWithStreamingResponse:
-        return ByTagResourceWithStreamingResponse(self._versions.by_tag)
-
-
-class AsyncVersionsResourceWithStreamingResponse:
-    def __init__(self, versions: AsyncVersionsResource) -> None:
-        self._versions = versions
-
-        self.list = async_to_streamed_response_wrapper(
-            versions.list,
-        )
-        self.delete = async_to_streamed_response_wrapper(
-            versions.delete,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            versions.get,
-        )
-
-    @cached_property
-    def by_tag(self) -> AsyncByTagResourceWithStreamingResponse:
-        return AsyncByTagResourceWithStreamingResponse(self._versions.by_tag)
diff --git a/src/cloudflare/resources/rum/rules.py b/src/cloudflare/resources/rum/rules.py
index 799901afab6..d46b2bf9f63 100644
--- a/src/cloudflare/resources/rum/rules.py
+++ b/src/cloudflare/resources/rum/rules.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Optional, cast
+from typing import Type, Iterable, Optional, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -20,11 +17,12 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from ...types.rum import rule_create_params, rule_update_params
+from ...types.rum import rule_create_params, rule_update_params, rule_bulk_create_params
 from ..._base_client import make_request_options
 from ...types.rum.rum_rule import RUMRule
 from ...types.rum.rule_list_response import RuleListResponse
 from ...types.rum.rule_delete_response import RuleDeleteResponse
+from ...types.rum.rule_bulk_create_response import RuleBulkCreateResponse
 
 __all__ = ["RulesResource", "AsyncRulesResource"]
 
@@ -32,10 +30,21 @@
 class RulesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RulesResourceWithStreamingResponse(self)
 
     def create(
@@ -43,22 +52,22 @@ def create(
         ruleset_id: str,
         *,
         account_id: str,
-        host: str | NotGiven = NOT_GIVEN,
-        inclusive: bool | NotGiven = NOT_GIVEN,
-        is_paused: bool | NotGiven = NOT_GIVEN,
-        paths: List[str] | NotGiven = NOT_GIVEN,
+        host: str | Omit = omit,
+        inclusive: bool | Omit = omit,
+        is_paused: bool | Omit = omit,
+        paths: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RUMRule]:
         """
         Creates a new rule in a Web Analytics ruleset.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           ruleset_id: The Web Analytics ruleset identifier.
 
@@ -105,22 +114,22 @@ def update(
         *,
         account_id: str,
         ruleset_id: str,
-        host: str | NotGiven = NOT_GIVEN,
-        inclusive: bool | NotGiven = NOT_GIVEN,
-        is_paused: bool | NotGiven = NOT_GIVEN,
-        paths: List[str] | NotGiven = NOT_GIVEN,
+        host: str | Omit = omit,
+        inclusive: bool | Omit = omit,
+        is_paused: bool | Omit = omit,
+        paths: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RUMRule]:
         """
         Updates a rule in a Web Analytics ruleset.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           ruleset_id: The Web Analytics ruleset identifier.
 
@@ -175,13 +184,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RuleListResponse]:
         """
         Lists all the rules in a Web Analytics ruleset.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           ruleset_id: The Web Analytics ruleset identifier.
 
@@ -220,13 +229,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RuleDeleteResponse]:
         """
         Deletes an existing rule from a Web Analytics ruleset.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           ruleset_id: The Web Analytics ruleset identifier.
 
@@ -258,14 +267,82 @@ def delete(
             cast_to=cast(Type[Optional[RuleDeleteResponse]], ResultWrapper[RuleDeleteResponse]),
         )
 
+    def bulk_create(
+        self,
+        ruleset_id: str,
+        *,
+        account_id: str,
+        delete_rules: SequenceNotStr[str] | Omit = omit,
+        rules: Iterable[rule_bulk_create_params.Rule] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RuleBulkCreateResponse]:
+        """
+        Modifies one or more rules in a Web Analytics ruleset with a single request.
+
+        Args:
+          account_id: Identifier.
+
+          ruleset_id: The Web Analytics ruleset identifier.
+
+          delete_rules: A list of rule identifiers to delete.
+
+          rules: A list of rules to create or update.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not ruleset_id:
+            raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/rum/v2/{ruleset_id}/rules",
+            body=maybe_transform(
+                {
+                    "delete_rules": delete_rules,
+                    "rules": rules,
+                },
+                rule_bulk_create_params.RuleBulkCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RuleBulkCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RuleBulkCreateResponse]], ResultWrapper[RuleBulkCreateResponse]),
+        )
+
 
 class AsyncRulesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRulesResourceWithStreamingResponse(self)
 
     async def create(
@@ -273,22 +350,22 @@ async def create(
         ruleset_id: str,
         *,
         account_id: str,
-        host: str | NotGiven = NOT_GIVEN,
-        inclusive: bool | NotGiven = NOT_GIVEN,
-        is_paused: bool | NotGiven = NOT_GIVEN,
-        paths: List[str] | NotGiven = NOT_GIVEN,
+        host: str | Omit = omit,
+        inclusive: bool | Omit = omit,
+        is_paused: bool | Omit = omit,
+        paths: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RUMRule]:
         """
         Creates a new rule in a Web Analytics ruleset.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           ruleset_id: The Web Analytics ruleset identifier.
 
@@ -335,22 +412,22 @@ async def update(
         *,
         account_id: str,
         ruleset_id: str,
-        host: str | NotGiven = NOT_GIVEN,
-        inclusive: bool | NotGiven = NOT_GIVEN,
-        is_paused: bool | NotGiven = NOT_GIVEN,
-        paths: List[str] | NotGiven = NOT_GIVEN,
+        host: str | Omit = omit,
+        inclusive: bool | Omit = omit,
+        is_paused: bool | Omit = omit,
+        paths: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RUMRule]:
         """
         Updates a rule in a Web Analytics ruleset.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           ruleset_id: The Web Analytics ruleset identifier.
 
@@ -405,13 +482,13 @@ async def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RuleListResponse]:
         """
         Lists all the rules in a Web Analytics ruleset.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           ruleset_id: The Web Analytics ruleset identifier.
 
@@ -450,13 +527,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[RuleDeleteResponse]:
         """
         Deletes an existing rule from a Web Analytics ruleset.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           ruleset_id: The Web Analytics ruleset identifier.
 
@@ -488,6 +565,63 @@ async def delete(
             cast_to=cast(Type[Optional[RuleDeleteResponse]], ResultWrapper[RuleDeleteResponse]),
         )
 
+    async def bulk_create(
+        self,
+        ruleset_id: str,
+        *,
+        account_id: str,
+        delete_rules: SequenceNotStr[str] | Omit = omit,
+        rules: Iterable[rule_bulk_create_params.Rule] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RuleBulkCreateResponse]:
+        """
+        Modifies one or more rules in a Web Analytics ruleset with a single request.
+
+        Args:
+          account_id: Identifier.
+
+          ruleset_id: The Web Analytics ruleset identifier.
+
+          delete_rules: A list of rule identifiers to delete.
+
+          rules: A list of rules to create or update.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not ruleset_id:
+            raise ValueError(f"Expected a non-empty value for `ruleset_id` but received {ruleset_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/rum/v2/{ruleset_id}/rules",
+            body=await async_maybe_transform(
+                {
+                    "delete_rules": delete_rules,
+                    "rules": rules,
+                },
+                rule_bulk_create_params.RuleBulkCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RuleBulkCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RuleBulkCreateResponse]], ResultWrapper[RuleBulkCreateResponse]),
+        )
+
 
 class RulesResourceWithRawResponse:
     def __init__(self, rules: RulesResource) -> None:
@@ -505,6 +639,9 @@ def __init__(self, rules: RulesResource) -> None:
         self.delete = to_raw_response_wrapper(
             rules.delete,
         )
+        self.bulk_create = to_raw_response_wrapper(
+            rules.bulk_create,
+        )
 
 
 class AsyncRulesResourceWithRawResponse:
@@ -523,6 +660,9 @@ def __init__(self, rules: AsyncRulesResource) -> None:
         self.delete = async_to_raw_response_wrapper(
             rules.delete,
         )
+        self.bulk_create = async_to_raw_response_wrapper(
+            rules.bulk_create,
+        )
 
 
 class RulesResourceWithStreamingResponse:
@@ -541,6 +681,9 @@ def __init__(self, rules: RulesResource) -> None:
         self.delete = to_streamed_response_wrapper(
             rules.delete,
         )
+        self.bulk_create = to_streamed_response_wrapper(
+            rules.bulk_create,
+        )
 
 
 class AsyncRulesResourceWithStreamingResponse:
@@ -559,3 +702,6 @@ def __init__(self, rules: AsyncRulesResource) -> None:
         self.delete = async_to_streamed_response_wrapper(
             rules.delete,
         )
+        self.bulk_create = async_to_streamed_response_wrapper(
+            rules.bulk_create,
+        )
diff --git a/src/cloudflare/resources/rum/rum.py b/src/cloudflare/resources/rum/rum.py
index 038a15f3ac0..db3568fd766 100644
--- a/src/cloudflare/resources/rum/rum.py
+++ b/src/cloudflare/resources/rum/rum.py
@@ -35,10 +35,21 @@ def rules(self) -> RulesResource:
 
     @cached_property
     def with_raw_response(self) -> RUMResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RUMResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RUMResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RUMResourceWithStreamingResponse(self)
 
 
@@ -53,10 +64,21 @@ def rules(self) -> AsyncRulesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncRUMResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRUMResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRUMResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRUMResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/rum/site_info.py b/src/cloudflare/resources/rum/site_info.py
index 51c5e276022..0f4ca671a88 100644
--- a/src/cloudflare/resources/rum/site_info.py
+++ b/src/cloudflare/resources/rum/site_info.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -33,31 +30,42 @@
 class SiteInfoResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SiteInfoResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SiteInfoResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SiteInfoResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SiteInfoResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        auto_install: bool | NotGiven = NOT_GIVEN,
-        host: str | NotGiven = NOT_GIVEN,
-        zone_tag: str | NotGiven = NOT_GIVEN,
+        auto_install: bool | Omit = omit,
+        host: str | Omit = omit,
+        zone_tag: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Site]:
         """
         Creates a new Web Analytics site.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           auto_install: If enabled, the JavaScript snippet is automatically injected for orange-clouded
               sites.
@@ -101,29 +109,37 @@ def update(
         site_id: str,
         *,
         account_id: str,
-        auto_install: bool | NotGiven = NOT_GIVEN,
-        host: str | NotGiven = NOT_GIVEN,
-        zone_tag: str | NotGiven = NOT_GIVEN,
+        auto_install: bool | Omit = omit,
+        enabled: bool | Omit = omit,
+        host: str | Omit = omit,
+        lite: bool | Omit = omit,
+        zone_tag: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Site]:
         """
         Updates an existing Web Analytics site.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          site_id: Identifier
+          site_id: Identifier.
 
           auto_install: If enabled, the JavaScript snippet is automatically injected for orange-clouded
               sites.
 
+          enabled: Enables or disables RUM. This option can be used only when auto_install is set
+              to true.
+
           host: The hostname to use for gray-clouded sites.
 
+          lite: If enabled, the JavaScript snippet will not be injected for visitors from the
+              EU.
+
           zone_tag: The zone identifier.
 
           extra_headers: Send extra headers
@@ -143,7 +159,9 @@ def update(
             body=maybe_transform(
                 {
                     "auto_install": auto_install,
+                    "enabled": enabled,
                     "host": host,
+                    "lite": lite,
                     "zone_tag": zone_tag,
                 },
                 site_info_update_params.SiteInfoUpdateParams,
@@ -162,21 +180,21 @@ def list(
         self,
         *,
         account_id: str,
-        order_by: Literal["host", "created"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        order_by: Literal["host", "created"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[Site]:
         """
         Lists all Web Analytics sites of an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           order_by: The property used to sort the list of results.
 
@@ -224,15 +242,15 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SiteInfoDeleteResponse]:
         """
         Deletes an existing Web Analytics site.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          site_id: Identifier
+          site_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -268,15 +286,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Site]:
         """
         Retrieves a Web Analytics site.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          site_id: Identifier
+          site_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -306,31 +324,42 @@ def get(
 class AsyncSiteInfoResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSiteInfoResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSiteInfoResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSiteInfoResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSiteInfoResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        auto_install: bool | NotGiven = NOT_GIVEN,
-        host: str | NotGiven = NOT_GIVEN,
-        zone_tag: str | NotGiven = NOT_GIVEN,
+        auto_install: bool | Omit = omit,
+        host: str | Omit = omit,
+        zone_tag: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Site]:
         """
         Creates a new Web Analytics site.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           auto_install: If enabled, the JavaScript snippet is automatically injected for orange-clouded
               sites.
@@ -374,29 +403,37 @@ async def update(
         site_id: str,
         *,
         account_id: str,
-        auto_install: bool | NotGiven = NOT_GIVEN,
-        host: str | NotGiven = NOT_GIVEN,
-        zone_tag: str | NotGiven = NOT_GIVEN,
+        auto_install: bool | Omit = omit,
+        enabled: bool | Omit = omit,
+        host: str | Omit = omit,
+        lite: bool | Omit = omit,
+        zone_tag: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Site]:
         """
         Updates an existing Web Analytics site.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          site_id: Identifier
+          site_id: Identifier.
 
           auto_install: If enabled, the JavaScript snippet is automatically injected for orange-clouded
               sites.
 
+          enabled: Enables or disables RUM. This option can be used only when auto_install is set
+              to true.
+
           host: The hostname to use for gray-clouded sites.
 
+          lite: If enabled, the JavaScript snippet will not be injected for visitors from the
+              EU.
+
           zone_tag: The zone identifier.
 
           extra_headers: Send extra headers
@@ -416,7 +453,9 @@ async def update(
             body=await async_maybe_transform(
                 {
                     "auto_install": auto_install,
+                    "enabled": enabled,
                     "host": host,
+                    "lite": lite,
                     "zone_tag": zone_tag,
                 },
                 site_info_update_params.SiteInfoUpdateParams,
@@ -435,21 +474,21 @@ def list(
         self,
         *,
         account_id: str,
-        order_by: Literal["host", "created"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        order_by: Literal["host", "created"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Site, AsyncV4PagePaginationArray[Site]]:
         """
         Lists all Web Analytics sites of an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           order_by: The property used to sort the list of results.
 
@@ -497,15 +536,15 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SiteInfoDeleteResponse]:
         """
         Deletes an existing Web Analytics site.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          site_id: Identifier
+          site_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -541,15 +580,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Site]:
         """
         Retrieves a Web Analytics site.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          site_id: Identifier
+          site_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/schema_validation/__init__.py b/src/cloudflare/resources/schema_validation/__init__.py
new file mode 100644
index 00000000000..5c348bd893b
--- /dev/null
+++ b/src/cloudflare/resources/schema_validation/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .schemas import (
+    SchemasResource,
+    AsyncSchemasResource,
+    SchemasResourceWithRawResponse,
+    AsyncSchemasResourceWithRawResponse,
+    SchemasResourceWithStreamingResponse,
+    AsyncSchemasResourceWithStreamingResponse,
+)
+from .settings import (
+    SettingsResource,
+    AsyncSettingsResource,
+    SettingsResourceWithRawResponse,
+    AsyncSettingsResourceWithRawResponse,
+    SettingsResourceWithStreamingResponse,
+    AsyncSettingsResourceWithStreamingResponse,
+)
+from .schema_validation import (
+    SchemaValidationResource,
+    AsyncSchemaValidationResource,
+    SchemaValidationResourceWithRawResponse,
+    AsyncSchemaValidationResourceWithRawResponse,
+    SchemaValidationResourceWithStreamingResponse,
+    AsyncSchemaValidationResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "SchemasResource",
+    "AsyncSchemasResource",
+    "SchemasResourceWithRawResponse",
+    "AsyncSchemasResourceWithRawResponse",
+    "SchemasResourceWithStreamingResponse",
+    "AsyncSchemasResourceWithStreamingResponse",
+    "SettingsResource",
+    "AsyncSettingsResource",
+    "SettingsResourceWithRawResponse",
+    "AsyncSettingsResourceWithRawResponse",
+    "SettingsResourceWithStreamingResponse",
+    "AsyncSettingsResourceWithStreamingResponse",
+    "SchemaValidationResource",
+    "AsyncSchemaValidationResource",
+    "SchemaValidationResourceWithRawResponse",
+    "AsyncSchemaValidationResourceWithRawResponse",
+    "SchemaValidationResourceWithStreamingResponse",
+    "AsyncSchemaValidationResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/schema_validation/schema_validation.py b/src/cloudflare/resources/schema_validation/schema_validation.py
new file mode 100644
index 00000000000..9921a02978c
--- /dev/null
+++ b/src/cloudflare/resources/schema_validation/schema_validation.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .schemas import (
+    SchemasResource,
+    AsyncSchemasResource,
+    SchemasResourceWithRawResponse,
+    AsyncSchemasResourceWithRawResponse,
+    SchemasResourceWithStreamingResponse,
+    AsyncSchemasResourceWithStreamingResponse,
+)
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .settings.settings import (
+    SettingsResource,
+    AsyncSettingsResource,
+    SettingsResourceWithRawResponse,
+    AsyncSettingsResourceWithRawResponse,
+    SettingsResourceWithStreamingResponse,
+    AsyncSettingsResourceWithStreamingResponse,
+)
+
+__all__ = ["SchemaValidationResource", "AsyncSchemaValidationResource"]
+
+
+class SchemaValidationResource(SyncAPIResource):
+    @cached_property
+    def schemas(self) -> SchemasResource:
+        return SchemasResource(self._client)
+
+    @cached_property
+    def settings(self) -> SettingsResource:
+        return SettingsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> SchemaValidationResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SchemaValidationResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SchemaValidationResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SchemaValidationResourceWithStreamingResponse(self)
+
+
+class AsyncSchemaValidationResource(AsyncAPIResource):
+    @cached_property
+    def schemas(self) -> AsyncSchemasResource:
+        return AsyncSchemasResource(self._client)
+
+    @cached_property
+    def settings(self) -> AsyncSettingsResource:
+        return AsyncSettingsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncSchemaValidationResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSchemaValidationResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSchemaValidationResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSchemaValidationResourceWithStreamingResponse(self)
+
+
+class SchemaValidationResourceWithRawResponse:
+    def __init__(self, schema_validation: SchemaValidationResource) -> None:
+        self._schema_validation = schema_validation
+
+    @cached_property
+    def schemas(self) -> SchemasResourceWithRawResponse:
+        return SchemasResourceWithRawResponse(self._schema_validation.schemas)
+
+    @cached_property
+    def settings(self) -> SettingsResourceWithRawResponse:
+        return SettingsResourceWithRawResponse(self._schema_validation.settings)
+
+
+class AsyncSchemaValidationResourceWithRawResponse:
+    def __init__(self, schema_validation: AsyncSchemaValidationResource) -> None:
+        self._schema_validation = schema_validation
+
+    @cached_property
+    def schemas(self) -> AsyncSchemasResourceWithRawResponse:
+        return AsyncSchemasResourceWithRawResponse(self._schema_validation.schemas)
+
+    @cached_property
+    def settings(self) -> AsyncSettingsResourceWithRawResponse:
+        return AsyncSettingsResourceWithRawResponse(self._schema_validation.settings)
+
+
+class SchemaValidationResourceWithStreamingResponse:
+    def __init__(self, schema_validation: SchemaValidationResource) -> None:
+        self._schema_validation = schema_validation
+
+    @cached_property
+    def schemas(self) -> SchemasResourceWithStreamingResponse:
+        return SchemasResourceWithStreamingResponse(self._schema_validation.schemas)
+
+    @cached_property
+    def settings(self) -> SettingsResourceWithStreamingResponse:
+        return SettingsResourceWithStreamingResponse(self._schema_validation.settings)
+
+
+class AsyncSchemaValidationResourceWithStreamingResponse:
+    def __init__(self, schema_validation: AsyncSchemaValidationResource) -> None:
+        self._schema_validation = schema_validation
+
+    @cached_property
+    def schemas(self) -> AsyncSchemasResourceWithStreamingResponse:
+        return AsyncSchemasResourceWithStreamingResponse(self._schema_validation.schemas)
+
+    @cached_property
+    def settings(self) -> AsyncSettingsResourceWithStreamingResponse:
+        return AsyncSettingsResourceWithStreamingResponse(self._schema_validation.settings)
diff --git a/src/cloudflare/resources/schema_validation/schemas.py b/src/cloudflare/resources/schema_validation/schemas.py
new file mode 100644
index 00000000000..cd6e4a9fb30
--- /dev/null
+++ b/src/cloudflare/resources/schema_validation/schemas.py
@@ -0,0 +1,675 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.schema_validation import schema_get_params, schema_edit_params, schema_list_params, schema_create_params
+from ...types.schema_validation.public_schema import PublicSchema
+from ...types.schema_validation.schema_delete_response import SchemaDeleteResponse
+
+__all__ = ["SchemasResource", "AsyncSchemasResource"]
+
+
+class SchemasResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SchemasResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SchemasResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SchemasResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SchemasResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        zone_id: str,
+        kind: Literal["openapi_v3"],
+        name: str,
+        source: str,
+        validation_enabled: bool,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PublicSchema:
+        """
+        Upload a schema
+
+        Args:
+          zone_id: Identifier.
+
+          kind: The kind of the schema
+
+          name: A human-readable name for the schema
+
+          source: The raw schema, e.g., the OpenAPI schema, either as JSON or YAML
+
+          validation_enabled: An indicator if this schema is enabled
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/schema_validation/schemas",
+            body=maybe_transform(
+                {
+                    "kind": kind,
+                    "name": name,
+                    "source": source,
+                    "validation_enabled": validation_enabled,
+                },
+                schema_create_params.SchemaCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PublicSchema]._unwrapper,
+            ),
+            cast_to=cast(Type[PublicSchema], ResultWrapper[PublicSchema]),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        omit_source: bool | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        validation_enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[PublicSchema]:
+        """
+        List all uploaded schemas
+
+        Args:
+          zone_id: Identifier.
+
+          omit_source: Omit the source-files of schemas and only retrieve their meta-data.
+
+          page: Page number of paginated results.
+
+          per_page: Maximum number of results per page.
+
+          validation_enabled: Filter for enabled schemas
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/schema_validation/schemas",
+            page=SyncV4PagePaginationArray[PublicSchema],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "omit_source": omit_source,
+                        "page": page,
+                        "per_page": per_page,
+                        "validation_enabled": validation_enabled,
+                    },
+                    schema_list_params.SchemaListParams,
+                ),
+            ),
+            model=PublicSchema,
+        )
+
+    def delete(
+        self,
+        schema_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SchemaDeleteResponse:
+        """
+        Delete a schema
+
+        Args:
+          zone_id: Identifier.
+
+          schema_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not schema_id:
+            raise ValueError(f"Expected a non-empty value for `schema_id` but received {schema_id!r}")
+        return self._delete(
+            f"/zones/{zone_id}/schema_validation/schemas/{schema_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SchemaDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SchemaDeleteResponse], ResultWrapper[SchemaDeleteResponse]),
+        )
+
+    def edit(
+        self,
+        schema_id: str,
+        *,
+        zone_id: str,
+        validation_enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PublicSchema:
+        """
+        Edit details of a schema to enable validation
+
+        Args:
+          zone_id: Identifier.
+
+          schema_id: UUID.
+
+          validation_enabled: Flag whether schema is enabled for validation.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not schema_id:
+            raise ValueError(f"Expected a non-empty value for `schema_id` but received {schema_id!r}")
+        return self._patch(
+            f"/zones/{zone_id}/schema_validation/schemas/{schema_id}",
+            body=maybe_transform({"validation_enabled": validation_enabled}, schema_edit_params.SchemaEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PublicSchema]._unwrapper,
+            ),
+            cast_to=cast(Type[PublicSchema], ResultWrapper[PublicSchema]),
+        )
+
+    def get(
+        self,
+        schema_id: str,
+        *,
+        zone_id: str,
+        omit_source: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PublicSchema:
+        """
+        Get details of a schema
+
+        Args:
+          zone_id: Identifier.
+
+          schema_id: UUID.
+
+          omit_source: Omit the source-files of schemas and only retrieve their meta-data.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not schema_id:
+            raise ValueError(f"Expected a non-empty value for `schema_id` but received {schema_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/schema_validation/schemas/{schema_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"omit_source": omit_source}, schema_get_params.SchemaGetParams),
+                post_parser=ResultWrapper[PublicSchema]._unwrapper,
+            ),
+            cast_to=cast(Type[PublicSchema], ResultWrapper[PublicSchema]),
+        )
+
+
+class AsyncSchemasResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSchemasResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSchemasResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSchemasResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSchemasResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        kind: Literal["openapi_v3"],
+        name: str,
+        source: str,
+        validation_enabled: bool,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PublicSchema:
+        """
+        Upload a schema
+
+        Args:
+          zone_id: Identifier.
+
+          kind: The kind of the schema
+
+          name: A human-readable name for the schema
+
+          source: The raw schema, e.g., the OpenAPI schema, either as JSON or YAML
+
+          validation_enabled: An indicator if this schema is enabled
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/schema_validation/schemas",
+            body=await async_maybe_transform(
+                {
+                    "kind": kind,
+                    "name": name,
+                    "source": source,
+                    "validation_enabled": validation_enabled,
+                },
+                schema_create_params.SchemaCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PublicSchema]._unwrapper,
+            ),
+            cast_to=cast(Type[PublicSchema], ResultWrapper[PublicSchema]),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        omit_source: bool | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        validation_enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[PublicSchema, AsyncV4PagePaginationArray[PublicSchema]]:
+        """
+        List all uploaded schemas
+
+        Args:
+          zone_id: Identifier.
+
+          omit_source: Omit the source-files of schemas and only retrieve their meta-data.
+
+          page: Page number of paginated results.
+
+          per_page: Maximum number of results per page.
+
+          validation_enabled: Filter for enabled schemas
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/schema_validation/schemas",
+            page=AsyncV4PagePaginationArray[PublicSchema],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "omit_source": omit_source,
+                        "page": page,
+                        "per_page": per_page,
+                        "validation_enabled": validation_enabled,
+                    },
+                    schema_list_params.SchemaListParams,
+                ),
+            ),
+            model=PublicSchema,
+        )
+
+    async def delete(
+        self,
+        schema_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SchemaDeleteResponse:
+        """
+        Delete a schema
+
+        Args:
+          zone_id: Identifier.
+
+          schema_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not schema_id:
+            raise ValueError(f"Expected a non-empty value for `schema_id` but received {schema_id!r}")
+        return await self._delete(
+            f"/zones/{zone_id}/schema_validation/schemas/{schema_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SchemaDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SchemaDeleteResponse], ResultWrapper[SchemaDeleteResponse]),
+        )
+
+    async def edit(
+        self,
+        schema_id: str,
+        *,
+        zone_id: str,
+        validation_enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PublicSchema:
+        """
+        Edit details of a schema to enable validation
+
+        Args:
+          zone_id: Identifier.
+
+          schema_id: UUID.
+
+          validation_enabled: Flag whether schema is enabled for validation.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not schema_id:
+            raise ValueError(f"Expected a non-empty value for `schema_id` but received {schema_id!r}")
+        return await self._patch(
+            f"/zones/{zone_id}/schema_validation/schemas/{schema_id}",
+            body=await async_maybe_transform(
+                {"validation_enabled": validation_enabled}, schema_edit_params.SchemaEditParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PublicSchema]._unwrapper,
+            ),
+            cast_to=cast(Type[PublicSchema], ResultWrapper[PublicSchema]),
+        )
+
+    async def get(
+        self,
+        schema_id: str,
+        *,
+        zone_id: str,
+        omit_source: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PublicSchema:
+        """
+        Get details of a schema
+
+        Args:
+          zone_id: Identifier.
+
+          schema_id: UUID.
+
+          omit_source: Omit the source-files of schemas and only retrieve their meta-data.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not schema_id:
+            raise ValueError(f"Expected a non-empty value for `schema_id` but received {schema_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/schema_validation/schemas/{schema_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"omit_source": omit_source}, schema_get_params.SchemaGetParams),
+                post_parser=ResultWrapper[PublicSchema]._unwrapper,
+            ),
+            cast_to=cast(Type[PublicSchema], ResultWrapper[PublicSchema]),
+        )
+
+
+class SchemasResourceWithRawResponse:
+    def __init__(self, schemas: SchemasResource) -> None:
+        self._schemas = schemas
+
+        self.create = to_raw_response_wrapper(
+            schemas.create,
+        )
+        self.list = to_raw_response_wrapper(
+            schemas.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            schemas.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            schemas.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            schemas.get,
+        )
+
+
+class AsyncSchemasResourceWithRawResponse:
+    def __init__(self, schemas: AsyncSchemasResource) -> None:
+        self._schemas = schemas
+
+        self.create = async_to_raw_response_wrapper(
+            schemas.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            schemas.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            schemas.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            schemas.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            schemas.get,
+        )
+
+
+class SchemasResourceWithStreamingResponse:
+    def __init__(self, schemas: SchemasResource) -> None:
+        self._schemas = schemas
+
+        self.create = to_streamed_response_wrapper(
+            schemas.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            schemas.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            schemas.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            schemas.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            schemas.get,
+        )
+
+
+class AsyncSchemasResourceWithStreamingResponse:
+    def __init__(self, schemas: AsyncSchemasResource) -> None:
+        self._schemas = schemas
+
+        self.create = async_to_streamed_response_wrapper(
+            schemas.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            schemas.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            schemas.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            schemas.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            schemas.get,
+        )
diff --git a/src/cloudflare/resources/schema_validation/settings/__init__.py b/src/cloudflare/resources/schema_validation/settings/__init__.py
new file mode 100644
index 00000000000..320dcdd67e2
--- /dev/null
+++ b/src/cloudflare/resources/schema_validation/settings/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .settings import (
+    SettingsResource,
+    AsyncSettingsResource,
+    SettingsResourceWithRawResponse,
+    AsyncSettingsResourceWithRawResponse,
+    SettingsResourceWithStreamingResponse,
+    AsyncSettingsResourceWithStreamingResponse,
+)
+from .operations import (
+    OperationsResource,
+    AsyncOperationsResource,
+    OperationsResourceWithRawResponse,
+    AsyncOperationsResourceWithRawResponse,
+    OperationsResourceWithStreamingResponse,
+    AsyncOperationsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "OperationsResource",
+    "AsyncOperationsResource",
+    "OperationsResourceWithRawResponse",
+    "AsyncOperationsResourceWithRawResponse",
+    "OperationsResourceWithStreamingResponse",
+    "AsyncOperationsResourceWithStreamingResponse",
+    "SettingsResource",
+    "AsyncSettingsResource",
+    "SettingsResourceWithRawResponse",
+    "AsyncSettingsResourceWithRawResponse",
+    "SettingsResourceWithStreamingResponse",
+    "AsyncSettingsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/schema_validation/settings/operations.py b/src/cloudflare/resources/schema_validation/settings/operations.py
new file mode 100644
index 00000000000..1212c275f42
--- /dev/null
+++ b/src/cloudflare/resources/schema_validation/settings/operations.py
@@ -0,0 +1,636 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.schema_validation.settings import (
+    operation_list_params,
+    operation_update_params,
+    operation_bulk_edit_params,
+)
+from ....types.schema_validation.settings.operation_get_response import OperationGetResponse
+from ....types.schema_validation.settings.operation_list_response import OperationListResponse
+from ....types.schema_validation.settings.operation_delete_response import OperationDeleteResponse
+from ....types.schema_validation.settings.operation_update_response import OperationUpdateResponse
+from ....types.schema_validation.settings.operation_bulk_edit_response import OperationBulkEditResponse
+
+__all__ = ["OperationsResource", "AsyncOperationsResource"]
+
+
+class OperationsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> OperationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return OperationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> OperationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return OperationsResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        operation_id: str,
+        *,
+        zone_id: str,
+        mitigation_action: Optional[Literal["log", "block", "none"]],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OperationUpdateResponse:
+        """
+        Update per-operation schema validation setting
+
+        Args:
+          zone_id: Identifier.
+
+          operation_id: UUID.
+
+          mitigation_action: When set, this applies a mitigation action to this operation
+
+              - `"log"` - log request when request does not conform to schema for this
+                operation
+              - `"block"` - deny access to the site when request does not conform to schema
+                for this operation
+              - `"none"` - will skip mitigation for this operation
+              - `null` - clears any mitigation action
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not operation_id:
+            raise ValueError(f"Expected a non-empty value for `operation_id` but received {operation_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/schema_validation/settings/operations/{operation_id}",
+            body=maybe_transform(
+                {"mitigation_action": mitigation_action}, operation_update_params.OperationUpdateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[OperationUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OperationUpdateResponse], ResultWrapper[OperationUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[OperationListResponse]:
+        """
+        List per-operation schema validation settings
+
+        Args:
+          zone_id: Identifier.
+
+          page: Page number of paginated results.
+
+          per_page: Maximum number of results per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/schema_validation/settings/operations",
+            page=SyncV4PagePaginationArray[OperationListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    operation_list_params.OperationListParams,
+                ),
+            ),
+            model=OperationListResponse,
+        )
+
+    def delete(
+        self,
+        operation_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OperationDeleteResponse:
+        """
+        Delete per-operation schema validation setting
+
+        Args:
+          zone_id: Identifier.
+
+          operation_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not operation_id:
+            raise ValueError(f"Expected a non-empty value for `operation_id` but received {operation_id!r}")
+        return self._delete(
+            f"/zones/{zone_id}/schema_validation/settings/operations/{operation_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[OperationDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OperationDeleteResponse], ResultWrapper[OperationDeleteResponse]),
+        )
+
+    def bulk_edit(
+        self,
+        *,
+        zone_id: str,
+        body: Dict[str, operation_bulk_edit_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OperationBulkEditResponse:
+        """
+        Bulk edit per-operation schema validation settings
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._patch(
+            f"/zones/{zone_id}/schema_validation/settings/operations",
+            body=maybe_transform(body, operation_bulk_edit_params.OperationBulkEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[OperationBulkEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OperationBulkEditResponse], ResultWrapper[OperationBulkEditResponse]),
+        )
+
+    def get(
+        self,
+        operation_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OperationGetResponse:
+        """
+        Get per-operation schema validation setting
+
+        Args:
+          zone_id: Identifier.
+
+          operation_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not operation_id:
+            raise ValueError(f"Expected a non-empty value for `operation_id` but received {operation_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/schema_validation/settings/operations/{operation_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[OperationGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OperationGetResponse], ResultWrapper[OperationGetResponse]),
+        )
+
+
+class AsyncOperationsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncOperationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncOperationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncOperationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncOperationsResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        operation_id: str,
+        *,
+        zone_id: str,
+        mitigation_action: Optional[Literal["log", "block", "none"]],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OperationUpdateResponse:
+        """
+        Update per-operation schema validation setting
+
+        Args:
+          zone_id: Identifier.
+
+          operation_id: UUID.
+
+          mitigation_action: When set, this applies a mitigation action to this operation
+
+              - `"log"` - log request when request does not conform to schema for this
+                operation
+              - `"block"` - deny access to the site when request does not conform to schema
+                for this operation
+              - `"none"` - will skip mitigation for this operation
+              - `null` - clears any mitigation action
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not operation_id:
+            raise ValueError(f"Expected a non-empty value for `operation_id` but received {operation_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/schema_validation/settings/operations/{operation_id}",
+            body=await async_maybe_transform(
+                {"mitigation_action": mitigation_action}, operation_update_params.OperationUpdateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[OperationUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OperationUpdateResponse], ResultWrapper[OperationUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[OperationListResponse, AsyncV4PagePaginationArray[OperationListResponse]]:
+        """
+        List per-operation schema validation settings
+
+        Args:
+          zone_id: Identifier.
+
+          page: Page number of paginated results.
+
+          per_page: Maximum number of results per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/schema_validation/settings/operations",
+            page=AsyncV4PagePaginationArray[OperationListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    operation_list_params.OperationListParams,
+                ),
+            ),
+            model=OperationListResponse,
+        )
+
+    async def delete(
+        self,
+        operation_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OperationDeleteResponse:
+        """
+        Delete per-operation schema validation setting
+
+        Args:
+          zone_id: Identifier.
+
+          operation_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not operation_id:
+            raise ValueError(f"Expected a non-empty value for `operation_id` but received {operation_id!r}")
+        return await self._delete(
+            f"/zones/{zone_id}/schema_validation/settings/operations/{operation_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[OperationDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OperationDeleteResponse], ResultWrapper[OperationDeleteResponse]),
+        )
+
+    async def bulk_edit(
+        self,
+        *,
+        zone_id: str,
+        body: Dict[str, operation_bulk_edit_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OperationBulkEditResponse:
+        """
+        Bulk edit per-operation schema validation settings
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._patch(
+            f"/zones/{zone_id}/schema_validation/settings/operations",
+            body=await async_maybe_transform(body, operation_bulk_edit_params.OperationBulkEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[OperationBulkEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OperationBulkEditResponse], ResultWrapper[OperationBulkEditResponse]),
+        )
+
+    async def get(
+        self,
+        operation_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OperationGetResponse:
+        """
+        Get per-operation schema validation setting
+
+        Args:
+          zone_id: Identifier.
+
+          operation_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not operation_id:
+            raise ValueError(f"Expected a non-empty value for `operation_id` but received {operation_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/schema_validation/settings/operations/{operation_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[OperationGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[OperationGetResponse], ResultWrapper[OperationGetResponse]),
+        )
+
+
+class OperationsResourceWithRawResponse:
+    def __init__(self, operations: OperationsResource) -> None:
+        self._operations = operations
+
+        self.update = to_raw_response_wrapper(
+            operations.update,
+        )
+        self.list = to_raw_response_wrapper(
+            operations.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            operations.delete,
+        )
+        self.bulk_edit = to_raw_response_wrapper(
+            operations.bulk_edit,
+        )
+        self.get = to_raw_response_wrapper(
+            operations.get,
+        )
+
+
+class AsyncOperationsResourceWithRawResponse:
+    def __init__(self, operations: AsyncOperationsResource) -> None:
+        self._operations = operations
+
+        self.update = async_to_raw_response_wrapper(
+            operations.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            operations.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            operations.delete,
+        )
+        self.bulk_edit = async_to_raw_response_wrapper(
+            operations.bulk_edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            operations.get,
+        )
+
+
+class OperationsResourceWithStreamingResponse:
+    def __init__(self, operations: OperationsResource) -> None:
+        self._operations = operations
+
+        self.update = to_streamed_response_wrapper(
+            operations.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            operations.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            operations.delete,
+        )
+        self.bulk_edit = to_streamed_response_wrapper(
+            operations.bulk_edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            operations.get,
+        )
+
+
+class AsyncOperationsResourceWithStreamingResponse:
+    def __init__(self, operations: AsyncOperationsResource) -> None:
+        self._operations = operations
+
+        self.update = async_to_streamed_response_wrapper(
+            operations.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            operations.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            operations.delete,
+        )
+        self.bulk_edit = async_to_streamed_response_wrapper(
+            operations.bulk_edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            operations.get,
+        )
diff --git a/src/cloudflare/resources/schema_validation/settings/settings.py b/src/cloudflare/resources/schema_validation/settings/settings.py
new file mode 100644
index 00000000000..82b061c1624
--- /dev/null
+++ b/src/cloudflare/resources/schema_validation/settings/settings.py
@@ -0,0 +1,479 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from .operations import (
+    OperationsResource,
+    AsyncOperationsResource,
+    OperationsResourceWithRawResponse,
+    AsyncOperationsResourceWithRawResponse,
+    OperationsResourceWithStreamingResponse,
+    AsyncOperationsResourceWithStreamingResponse,
+)
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.schema_validation import setting_edit_params, setting_update_params
+from ....types.schema_validation.setting_get_response import SettingGetResponse
+from ....types.schema_validation.setting_edit_response import SettingEditResponse
+from ....types.schema_validation.setting_update_response import SettingUpdateResponse
+
+__all__ = ["SettingsResource", "AsyncSettingsResource"]
+
+
+class SettingsResource(SyncAPIResource):
+    @cached_property
+    def operations(self) -> OperationsResource:
+        return OperationsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> SettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SettingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SettingsResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        *,
+        zone_id: str,
+        validation_default_mitigation_action: Literal["none", "log", "block"],
+        validation_override_mitigation_action: Optional[Literal["none"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SettingUpdateResponse:
+        """
+        Update global schema validation settings
+
+        Args:
+          zone_id: Identifier.
+
+          validation_default_mitigation_action:
+              The default mitigation action used Mitigation actions are as follows:
+
+              - `"log"` - log request when request does not conform to schema
+              - `"block"` - deny access to the site when request does not conform to schema
+              - `"none"` - skip running schema validation
+
+          validation_override_mitigation_action: When set, this overrides both zone level and operation level mitigation actions.
+
+              - `"none"` - skip running schema validation entirely for the request
+              - `null` - clears any existing override
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/schema_validation/settings",
+            body=maybe_transform(
+                {
+                    "validation_default_mitigation_action": validation_default_mitigation_action,
+                    "validation_override_mitigation_action": validation_override_mitigation_action,
+                },
+                setting_update_params.SettingUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SettingUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SettingUpdateResponse], ResultWrapper[SettingUpdateResponse]),
+        )
+
+    def edit(
+        self,
+        *,
+        zone_id: str,
+        validation_default_mitigation_action: Literal["none", "log", "block"] | Omit = omit,
+        validation_override_mitigation_action: Optional[Literal["none"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SettingEditResponse:
+        """
+        Edit global schema validation settings
+
+        Args:
+          zone_id: Identifier.
+
+          validation_default_mitigation_action:
+              The default mitigation action used Mitigation actions are as follows:
+
+              - `"log"` - log request when request does not conform to schema
+              - `"block"` - deny access to the site when request does not conform to schema
+              - `"none"` - skip running schema validation
+
+          validation_override_mitigation_action: When set, this overrides both zone level and operation level mitigation actions.
+
+              - `"none"` - skip running schema validation entirely for the request
+              - `null` - clears any existing override
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._patch(
+            f"/zones/{zone_id}/schema_validation/settings",
+            body=maybe_transform(
+                {
+                    "validation_default_mitigation_action": validation_default_mitigation_action,
+                    "validation_override_mitigation_action": validation_override_mitigation_action,
+                },
+                setting_edit_params.SettingEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SettingEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SettingEditResponse], ResultWrapper[SettingEditResponse]),
+        )
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SettingGetResponse:
+        """
+        Get global schema validation settings
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/schema_validation/settings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SettingGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SettingGetResponse], ResultWrapper[SettingGetResponse]),
+        )
+
+
+class AsyncSettingsResource(AsyncAPIResource):
+    @cached_property
+    def operations(self) -> AsyncOperationsResource:
+        return AsyncOperationsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSettingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSettingsResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        *,
+        zone_id: str,
+        validation_default_mitigation_action: Literal["none", "log", "block"],
+        validation_override_mitigation_action: Optional[Literal["none"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SettingUpdateResponse:
+        """
+        Update global schema validation settings
+
+        Args:
+          zone_id: Identifier.
+
+          validation_default_mitigation_action:
+              The default mitigation action used Mitigation actions are as follows:
+
+              - `"log"` - log request when request does not conform to schema
+              - `"block"` - deny access to the site when request does not conform to schema
+              - `"none"` - skip running schema validation
+
+          validation_override_mitigation_action: When set, this overrides both zone level and operation level mitigation actions.
+
+              - `"none"` - skip running schema validation entirely for the request
+              - `null` - clears any existing override
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/schema_validation/settings",
+            body=await async_maybe_transform(
+                {
+                    "validation_default_mitigation_action": validation_default_mitigation_action,
+                    "validation_override_mitigation_action": validation_override_mitigation_action,
+                },
+                setting_update_params.SettingUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SettingUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SettingUpdateResponse], ResultWrapper[SettingUpdateResponse]),
+        )
+
+    async def edit(
+        self,
+        *,
+        zone_id: str,
+        validation_default_mitigation_action: Literal["none", "log", "block"] | Omit = omit,
+        validation_override_mitigation_action: Optional[Literal["none"]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SettingEditResponse:
+        """
+        Edit global schema validation settings
+
+        Args:
+          zone_id: Identifier.
+
+          validation_default_mitigation_action:
+              The default mitigation action used Mitigation actions are as follows:
+
+              - `"log"` - log request when request does not conform to schema
+              - `"block"` - deny access to the site when request does not conform to schema
+              - `"none"` - skip running schema validation
+
+          validation_override_mitigation_action: When set, this overrides both zone level and operation level mitigation actions.
+
+              - `"none"` - skip running schema validation entirely for the request
+              - `null` - clears any existing override
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._patch(
+            f"/zones/{zone_id}/schema_validation/settings",
+            body=await async_maybe_transform(
+                {
+                    "validation_default_mitigation_action": validation_default_mitigation_action,
+                    "validation_override_mitigation_action": validation_override_mitigation_action,
+                },
+                setting_edit_params.SettingEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SettingEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SettingEditResponse], ResultWrapper[SettingEditResponse]),
+        )
+
+    async def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SettingGetResponse:
+        """
+        Get global schema validation settings
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/schema_validation/settings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SettingGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SettingGetResponse], ResultWrapper[SettingGetResponse]),
+        )
+
+
+class SettingsResourceWithRawResponse:
+    def __init__(self, settings: SettingsResource) -> None:
+        self._settings = settings
+
+        self.update = to_raw_response_wrapper(
+            settings.update,
+        )
+        self.edit = to_raw_response_wrapper(
+            settings.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            settings.get,
+        )
+
+    @cached_property
+    def operations(self) -> OperationsResourceWithRawResponse:
+        return OperationsResourceWithRawResponse(self._settings.operations)
+
+
+class AsyncSettingsResourceWithRawResponse:
+    def __init__(self, settings: AsyncSettingsResource) -> None:
+        self._settings = settings
+
+        self.update = async_to_raw_response_wrapper(
+            settings.update,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            settings.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            settings.get,
+        )
+
+    @cached_property
+    def operations(self) -> AsyncOperationsResourceWithRawResponse:
+        return AsyncOperationsResourceWithRawResponse(self._settings.operations)
+
+
+class SettingsResourceWithStreamingResponse:
+    def __init__(self, settings: SettingsResource) -> None:
+        self._settings = settings
+
+        self.update = to_streamed_response_wrapper(
+            settings.update,
+        )
+        self.edit = to_streamed_response_wrapper(
+            settings.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            settings.get,
+        )
+
+    @cached_property
+    def operations(self) -> OperationsResourceWithStreamingResponse:
+        return OperationsResourceWithStreamingResponse(self._settings.operations)
+
+
+class AsyncSettingsResourceWithStreamingResponse:
+    def __init__(self, settings: AsyncSettingsResource) -> None:
+        self._settings = settings
+
+        self.update = async_to_streamed_response_wrapper(
+            settings.update,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            settings.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            settings.get,
+        )
+
+    @cached_property
+    def operations(self) -> AsyncOperationsResourceWithStreamingResponse:
+        return AsyncOperationsResourceWithStreamingResponse(self._settings.operations)
diff --git a/src/cloudflare/resources/secondary_dns/__init__.py b/src/cloudflare/resources/secondary_dns/__init__.py
deleted file mode 100644
index 3f502a9da2f..00000000000
--- a/src/cloudflare/resources/secondary_dns/__init__.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from .acls import (
-    ACLsResource,
-    AsyncACLsResource,
-    ACLsResourceWithRawResponse,
-    AsyncACLsResourceWithRawResponse,
-    ACLsResourceWithStreamingResponse,
-    AsyncACLsResourceWithStreamingResponse,
-)
-from .peers import (
-    PeersResource,
-    AsyncPeersResource,
-    PeersResourceWithRawResponse,
-    AsyncPeersResourceWithRawResponse,
-    PeersResourceWithStreamingResponse,
-    AsyncPeersResourceWithStreamingResponse,
-)
-from .tsigs import (
-    TSIGsResource,
-    AsyncTSIGsResource,
-    TSIGsResourceWithRawResponse,
-    AsyncTSIGsResourceWithRawResponse,
-    TSIGsResourceWithStreamingResponse,
-    AsyncTSIGsResourceWithStreamingResponse,
-)
-from .incoming import (
-    IncomingResource,
-    AsyncIncomingResource,
-    IncomingResourceWithRawResponse,
-    AsyncIncomingResourceWithRawResponse,
-    IncomingResourceWithStreamingResponse,
-    AsyncIncomingResourceWithStreamingResponse,
-)
-from .outgoing import (
-    OutgoingResource,
-    AsyncOutgoingResource,
-    OutgoingResourceWithRawResponse,
-    AsyncOutgoingResourceWithRawResponse,
-    OutgoingResourceWithStreamingResponse,
-    AsyncOutgoingResourceWithStreamingResponse,
-)
-from .force_axfr import (
-    ForceAXFRResource,
-    AsyncForceAXFRResource,
-    ForceAXFRResourceWithRawResponse,
-    AsyncForceAXFRResourceWithRawResponse,
-    ForceAXFRResourceWithStreamingResponse,
-    AsyncForceAXFRResourceWithStreamingResponse,
-)
-from .secondary_dns import (
-    SecondaryDNSResource,
-    AsyncSecondaryDNSResource,
-    SecondaryDNSResourceWithRawResponse,
-    AsyncSecondaryDNSResourceWithRawResponse,
-    SecondaryDNSResourceWithStreamingResponse,
-    AsyncSecondaryDNSResourceWithStreamingResponse,
-)
-
-__all__ = [
-    "ForceAXFRResource",
-    "AsyncForceAXFRResource",
-    "ForceAXFRResourceWithRawResponse",
-    "AsyncForceAXFRResourceWithRawResponse",
-    "ForceAXFRResourceWithStreamingResponse",
-    "AsyncForceAXFRResourceWithStreamingResponse",
-    "IncomingResource",
-    "AsyncIncomingResource",
-    "IncomingResourceWithRawResponse",
-    "AsyncIncomingResourceWithRawResponse",
-    "IncomingResourceWithStreamingResponse",
-    "AsyncIncomingResourceWithStreamingResponse",
-    "OutgoingResource",
-    "AsyncOutgoingResource",
-    "OutgoingResourceWithRawResponse",
-    "AsyncOutgoingResourceWithRawResponse",
-    "OutgoingResourceWithStreamingResponse",
-    "AsyncOutgoingResourceWithStreamingResponse",
-    "ACLsResource",
-    "AsyncACLsResource",
-    "ACLsResourceWithRawResponse",
-    "AsyncACLsResourceWithRawResponse",
-    "ACLsResourceWithStreamingResponse",
-    "AsyncACLsResourceWithStreamingResponse",
-    "PeersResource",
-    "AsyncPeersResource",
-    "PeersResourceWithRawResponse",
-    "AsyncPeersResourceWithRawResponse",
-    "PeersResourceWithStreamingResponse",
-    "AsyncPeersResourceWithStreamingResponse",
-    "TSIGsResource",
-    "AsyncTSIGsResource",
-    "TSIGsResourceWithRawResponse",
-    "AsyncTSIGsResourceWithRawResponse",
-    "TSIGsResourceWithStreamingResponse",
-    "AsyncTSIGsResourceWithStreamingResponse",
-    "SecondaryDNSResource",
-    "AsyncSecondaryDNSResource",
-    "SecondaryDNSResourceWithRawResponse",
-    "AsyncSecondaryDNSResourceWithRawResponse",
-    "SecondaryDNSResourceWithStreamingResponse",
-    "AsyncSecondaryDNSResourceWithStreamingResponse",
-]
diff --git a/src/cloudflare/resources/secondary_dns/force_axfr.py b/src/cloudflare/resources/secondary_dns/force_axfr.py
deleted file mode 100644
index a2fb2cc46dd..00000000000
--- a/src/cloudflare/resources/secondary_dns/force_axfr.py
+++ /dev/null
@@ -1,161 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Optional, cast
-
-import httpx
-
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
-from ...types.secondary_dns import force_axfr_create_params
-from ...types.secondary_dns.force_axfr import ForceAXFR
-
-__all__ = ["ForceAXFRResource", "AsyncForceAXFRResource"]
-
-
-class ForceAXFRResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> ForceAXFRResourceWithRawResponse:
-        return ForceAXFRResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> ForceAXFRResourceWithStreamingResponse:
-        return ForceAXFRResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        *,
-        zone_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> str:
-        """
-        Sends AXFR zone transfer request to primary nameserver(s).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._post(
-            f"/zones/{zone_id}/secondary_dns/force_axfr",
-            body=maybe_transform(body, force_axfr_create_params.ForceAXFRCreateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ForceAXFR]]._unwrapper,
-            ),
-            cast_to=cast(Type[str], ResultWrapper[str]),
-        )
-
-
-class AsyncForceAXFRResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncForceAXFRResourceWithRawResponse:
-        return AsyncForceAXFRResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncForceAXFRResourceWithStreamingResponse:
-        return AsyncForceAXFRResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        *,
-        zone_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> str:
-        """
-        Sends AXFR zone transfer request to primary nameserver(s).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._post(
-            f"/zones/{zone_id}/secondary_dns/force_axfr",
-            body=await async_maybe_transform(body, force_axfr_create_params.ForceAXFRCreateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ForceAXFR]]._unwrapper,
-            ),
-            cast_to=cast(Type[str], ResultWrapper[str]),
-        )
-
-
-class ForceAXFRResourceWithRawResponse:
-    def __init__(self, force_axfr: ForceAXFRResource) -> None:
-        self._force_axfr = force_axfr
-
-        self.create = to_raw_response_wrapper(
-            force_axfr.create,
-        )
-
-
-class AsyncForceAXFRResourceWithRawResponse:
-    def __init__(self, force_axfr: AsyncForceAXFRResource) -> None:
-        self._force_axfr = force_axfr
-
-        self.create = async_to_raw_response_wrapper(
-            force_axfr.create,
-        )
-
-
-class ForceAXFRResourceWithStreamingResponse:
-    def __init__(self, force_axfr: ForceAXFRResource) -> None:
-        self._force_axfr = force_axfr
-
-        self.create = to_streamed_response_wrapper(
-            force_axfr.create,
-        )
-
-
-class AsyncForceAXFRResourceWithStreamingResponse:
-    def __init__(self, force_axfr: AsyncForceAXFRResource) -> None:
-        self._force_axfr = force_axfr
-
-        self.create = async_to_streamed_response_wrapper(
-            force_axfr.create,
-        )
diff --git a/src/cloudflare/resources/secondary_dns/incoming.py b/src/cloudflare/resources/secondary_dns/incoming.py
deleted file mode 100644
index ac41746a731..00000000000
--- a/src/cloudflare/resources/secondary_dns/incoming.py
+++ /dev/null
@@ -1,490 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Iterable, Optional, cast
-
-import httpx
-
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
-from ...types.secondary_dns import incoming_create_params, incoming_update_params
-from ...types.secondary_dns.incoming_get_response import IncomingGetResponse
-from ...types.secondary_dns.incoming_create_response import IncomingCreateResponse
-from ...types.secondary_dns.incoming_delete_response import IncomingDeleteResponse
-from ...types.secondary_dns.incoming_update_response import IncomingUpdateResponse
-
-__all__ = ["IncomingResource", "AsyncIncomingResource"]
-
-
-class IncomingResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> IncomingResourceWithRawResponse:
-        return IncomingResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> IncomingResourceWithStreamingResponse:
-        return IncomingResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        *,
-        zone_id: str,
-        auto_refresh_seconds: float,
-        name: str,
-        peers: Iterable[object],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IncomingCreateResponse]:
-        """
-        Create secondary zone configuration for incoming zone transfers.
-
-        Args:
-          auto_refresh_seconds: How often should a secondary zone auto refresh regardless of DNS NOTIFY. Not
-              applicable for primary zones.
-
-          name: Zone name.
-
-          peers: A list of peer tags.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._post(
-            f"/zones/{zone_id}/secondary_dns/incoming",
-            body=maybe_transform(
-                {
-                    "auto_refresh_seconds": auto_refresh_seconds,
-                    "name": name,
-                    "peers": peers,
-                },
-                incoming_create_params.IncomingCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IncomingCreateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IncomingCreateResponse]], ResultWrapper[IncomingCreateResponse]),
-        )
-
-    def update(
-        self,
-        *,
-        zone_id: str,
-        auto_refresh_seconds: float,
-        name: str,
-        peers: Iterable[object],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IncomingUpdateResponse]:
-        """
-        Update secondary zone configuration for incoming zone transfers.
-
-        Args:
-          auto_refresh_seconds: How often should a secondary zone auto refresh regardless of DNS NOTIFY. Not
-              applicable for primary zones.
-
-          name: Zone name.
-
-          peers: A list of peer tags.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._put(
-            f"/zones/{zone_id}/secondary_dns/incoming",
-            body=maybe_transform(
-                {
-                    "auto_refresh_seconds": auto_refresh_seconds,
-                    "name": name,
-                    "peers": peers,
-                },
-                incoming_update_params.IncomingUpdateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IncomingUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IncomingUpdateResponse]], ResultWrapper[IncomingUpdateResponse]),
-        )
-
-    def delete(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IncomingDeleteResponse]:
-        """
-        Delete secondary zone configuration for incoming zone transfers.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._delete(
-            f"/zones/{zone_id}/secondary_dns/incoming",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IncomingDeleteResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IncomingDeleteResponse]], ResultWrapper[IncomingDeleteResponse]),
-        )
-
-    def get(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IncomingGetResponse]:
-        """
-        Get secondary zone configuration for incoming zone transfers.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._get(
-            f"/zones/{zone_id}/secondary_dns/incoming",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IncomingGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IncomingGetResponse]], ResultWrapper[IncomingGetResponse]),
-        )
-
-
-class AsyncIncomingResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncIncomingResourceWithRawResponse:
-        return AsyncIncomingResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncIncomingResourceWithStreamingResponse:
-        return AsyncIncomingResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        *,
-        zone_id: str,
-        auto_refresh_seconds: float,
-        name: str,
-        peers: Iterable[object],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IncomingCreateResponse]:
-        """
-        Create secondary zone configuration for incoming zone transfers.
-
-        Args:
-          auto_refresh_seconds: How often should a secondary zone auto refresh regardless of DNS NOTIFY. Not
-              applicable for primary zones.
-
-          name: Zone name.
-
-          peers: A list of peer tags.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._post(
-            f"/zones/{zone_id}/secondary_dns/incoming",
-            body=await async_maybe_transform(
-                {
-                    "auto_refresh_seconds": auto_refresh_seconds,
-                    "name": name,
-                    "peers": peers,
-                },
-                incoming_create_params.IncomingCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IncomingCreateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IncomingCreateResponse]], ResultWrapper[IncomingCreateResponse]),
-        )
-
-    async def update(
-        self,
-        *,
-        zone_id: str,
-        auto_refresh_seconds: float,
-        name: str,
-        peers: Iterable[object],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IncomingUpdateResponse]:
-        """
-        Update secondary zone configuration for incoming zone transfers.
-
-        Args:
-          auto_refresh_seconds: How often should a secondary zone auto refresh regardless of DNS NOTIFY. Not
-              applicable for primary zones.
-
-          name: Zone name.
-
-          peers: A list of peer tags.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._put(
-            f"/zones/{zone_id}/secondary_dns/incoming",
-            body=await async_maybe_transform(
-                {
-                    "auto_refresh_seconds": auto_refresh_seconds,
-                    "name": name,
-                    "peers": peers,
-                },
-                incoming_update_params.IncomingUpdateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IncomingUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IncomingUpdateResponse]], ResultWrapper[IncomingUpdateResponse]),
-        )
-
-    async def delete(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IncomingDeleteResponse]:
-        """
-        Delete secondary zone configuration for incoming zone transfers.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._delete(
-            f"/zones/{zone_id}/secondary_dns/incoming",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IncomingDeleteResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IncomingDeleteResponse]], ResultWrapper[IncomingDeleteResponse]),
-        )
-
-    async def get(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IncomingGetResponse]:
-        """
-        Get secondary zone configuration for incoming zone transfers.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._get(
-            f"/zones/{zone_id}/secondary_dns/incoming",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IncomingGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IncomingGetResponse]], ResultWrapper[IncomingGetResponse]),
-        )
-
-
-class IncomingResourceWithRawResponse:
-    def __init__(self, incoming: IncomingResource) -> None:
-        self._incoming = incoming
-
-        self.create = to_raw_response_wrapper(
-            incoming.create,
-        )
-        self.update = to_raw_response_wrapper(
-            incoming.update,
-        )
-        self.delete = to_raw_response_wrapper(
-            incoming.delete,
-        )
-        self.get = to_raw_response_wrapper(
-            incoming.get,
-        )
-
-
-class AsyncIncomingResourceWithRawResponse:
-    def __init__(self, incoming: AsyncIncomingResource) -> None:
-        self._incoming = incoming
-
-        self.create = async_to_raw_response_wrapper(
-            incoming.create,
-        )
-        self.update = async_to_raw_response_wrapper(
-            incoming.update,
-        )
-        self.delete = async_to_raw_response_wrapper(
-            incoming.delete,
-        )
-        self.get = async_to_raw_response_wrapper(
-            incoming.get,
-        )
-
-
-class IncomingResourceWithStreamingResponse:
-    def __init__(self, incoming: IncomingResource) -> None:
-        self._incoming = incoming
-
-        self.create = to_streamed_response_wrapper(
-            incoming.create,
-        )
-        self.update = to_streamed_response_wrapper(
-            incoming.update,
-        )
-        self.delete = to_streamed_response_wrapper(
-            incoming.delete,
-        )
-        self.get = to_streamed_response_wrapper(
-            incoming.get,
-        )
-
-
-class AsyncIncomingResourceWithStreamingResponse:
-    def __init__(self, incoming: AsyncIncomingResource) -> None:
-        self._incoming = incoming
-
-        self.create = async_to_streamed_response_wrapper(
-            incoming.create,
-        )
-        self.update = async_to_streamed_response_wrapper(
-            incoming.update,
-        )
-        self.delete = async_to_streamed_response_wrapper(
-            incoming.delete,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            incoming.get,
-        )
diff --git a/src/cloudflare/resources/secondary_dns/outgoing/outgoing.py b/src/cloudflare/resources/secondary_dns/outgoing/outgoing.py
deleted file mode 100644
index 8ad56fddf4e..00000000000
--- a/src/cloudflare/resources/secondary_dns/outgoing/outgoing.py
+++ /dev/null
@@ -1,783 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Iterable, Optional, cast
-
-import httpx
-
-from .status import (
-    StatusResource,
-    AsyncStatusResource,
-    StatusResourceWithRawResponse,
-    AsyncStatusResourceWithRawResponse,
-    StatusResourceWithStreamingResponse,
-    AsyncStatusResourceWithStreamingResponse,
-)
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
-from ....types.secondary_dns import (
-    outgoing_create_params,
-    outgoing_enable_params,
-    outgoing_update_params,
-    outgoing_disable_params,
-    outgoing_force_notify_params,
-)
-from ....types.secondary_dns.enable_transfer import EnableTransfer
-from ....types.secondary_dns.disable_transfer import DisableTransfer
-from ....types.secondary_dns.outgoing_get_response import OutgoingGetResponse
-from ....types.secondary_dns.outgoing_create_response import OutgoingCreateResponse
-from ....types.secondary_dns.outgoing_delete_response import OutgoingDeleteResponse
-from ....types.secondary_dns.outgoing_update_response import OutgoingUpdateResponse
-from ....types.secondary_dns.outgoing_force_notify_response import OutgoingForceNotifyResponse
-
-__all__ = ["OutgoingResource", "AsyncOutgoingResource"]
-
-
-class OutgoingResource(SyncAPIResource):
-    @cached_property
-    def status(self) -> StatusResource:
-        return StatusResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> OutgoingResourceWithRawResponse:
-        return OutgoingResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> OutgoingResourceWithStreamingResponse:
-        return OutgoingResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        *,
-        zone_id: str,
-        name: str,
-        peers: Iterable[object],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OutgoingCreateResponse]:
-        """
-        Create primary zone configuration for outgoing zone transfers.
-
-        Args:
-          name: Zone name.
-
-          peers: A list of peer tags.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._post(
-            f"/zones/{zone_id}/secondary_dns/outgoing",
-            body=maybe_transform(
-                {
-                    "name": name,
-                    "peers": peers,
-                },
-                outgoing_create_params.OutgoingCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[OutgoingCreateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[OutgoingCreateResponse]], ResultWrapper[OutgoingCreateResponse]),
-        )
-
-    def update(
-        self,
-        *,
-        zone_id: str,
-        name: str,
-        peers: Iterable[object],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OutgoingUpdateResponse]:
-        """
-        Update primary zone configuration for outgoing zone transfers.
-
-        Args:
-          name: Zone name.
-
-          peers: A list of peer tags.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._put(
-            f"/zones/{zone_id}/secondary_dns/outgoing",
-            body=maybe_transform(
-                {
-                    "name": name,
-                    "peers": peers,
-                },
-                outgoing_update_params.OutgoingUpdateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[OutgoingUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[OutgoingUpdateResponse]], ResultWrapper[OutgoingUpdateResponse]),
-        )
-
-    def delete(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OutgoingDeleteResponse]:
-        """
-        Delete primary zone configuration for outgoing zone transfers.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._delete(
-            f"/zones/{zone_id}/secondary_dns/outgoing",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[OutgoingDeleteResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[OutgoingDeleteResponse]], ResultWrapper[OutgoingDeleteResponse]),
-        )
-
-    def disable(
-        self,
-        *,
-        zone_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> str:
-        """
-        Disable outgoing zone transfers for primary zone and clears IXFR backlog of
-        primary zone.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._post(
-            f"/zones/{zone_id}/secondary_dns/outgoing/disable",
-            body=maybe_transform(body, outgoing_disable_params.OutgoingDisableParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[DisableTransfer]]._unwrapper,
-            ),
-            cast_to=cast(Type[str], ResultWrapper[str]),
-        )
-
-    def enable(
-        self,
-        *,
-        zone_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> str:
-        """
-        Enable outgoing zone transfers for primary zone.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._post(
-            f"/zones/{zone_id}/secondary_dns/outgoing/enable",
-            body=maybe_transform(body, outgoing_enable_params.OutgoingEnableParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[EnableTransfer]]._unwrapper,
-            ),
-            cast_to=cast(Type[str], ResultWrapper[str]),
-        )
-
-    def force_notify(
-        self,
-        *,
-        zone_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> str:
-        """
-        Notifies the secondary nameserver(s) and clears IXFR backlog of primary zone.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._post(
-            f"/zones/{zone_id}/secondary_dns/outgoing/force_notify",
-            body=maybe_transform(body, outgoing_force_notify_params.OutgoingForceNotifyParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[OutgoingForceNotifyResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[str], ResultWrapper[str]),
-        )
-
-    def get(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OutgoingGetResponse]:
-        """
-        Get primary zone configuration for outgoing zone transfers.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._get(
-            f"/zones/{zone_id}/secondary_dns/outgoing",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[OutgoingGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[OutgoingGetResponse]], ResultWrapper[OutgoingGetResponse]),
-        )
-
-
-class AsyncOutgoingResource(AsyncAPIResource):
-    @cached_property
-    def status(self) -> AsyncStatusResource:
-        return AsyncStatusResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncOutgoingResourceWithRawResponse:
-        return AsyncOutgoingResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncOutgoingResourceWithStreamingResponse:
-        return AsyncOutgoingResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        *,
-        zone_id: str,
-        name: str,
-        peers: Iterable[object],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OutgoingCreateResponse]:
-        """
-        Create primary zone configuration for outgoing zone transfers.
-
-        Args:
-          name: Zone name.
-
-          peers: A list of peer tags.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._post(
-            f"/zones/{zone_id}/secondary_dns/outgoing",
-            body=await async_maybe_transform(
-                {
-                    "name": name,
-                    "peers": peers,
-                },
-                outgoing_create_params.OutgoingCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[OutgoingCreateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[OutgoingCreateResponse]], ResultWrapper[OutgoingCreateResponse]),
-        )
-
-    async def update(
-        self,
-        *,
-        zone_id: str,
-        name: str,
-        peers: Iterable[object],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OutgoingUpdateResponse]:
-        """
-        Update primary zone configuration for outgoing zone transfers.
-
-        Args:
-          name: Zone name.
-
-          peers: A list of peer tags.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._put(
-            f"/zones/{zone_id}/secondary_dns/outgoing",
-            body=await async_maybe_transform(
-                {
-                    "name": name,
-                    "peers": peers,
-                },
-                outgoing_update_params.OutgoingUpdateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[OutgoingUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[OutgoingUpdateResponse]], ResultWrapper[OutgoingUpdateResponse]),
-        )
-
-    async def delete(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OutgoingDeleteResponse]:
-        """
-        Delete primary zone configuration for outgoing zone transfers.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._delete(
-            f"/zones/{zone_id}/secondary_dns/outgoing",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[OutgoingDeleteResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[OutgoingDeleteResponse]], ResultWrapper[OutgoingDeleteResponse]),
-        )
-
-    async def disable(
-        self,
-        *,
-        zone_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> str:
-        """
-        Disable outgoing zone transfers for primary zone and clears IXFR backlog of
-        primary zone.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._post(
-            f"/zones/{zone_id}/secondary_dns/outgoing/disable",
-            body=await async_maybe_transform(body, outgoing_disable_params.OutgoingDisableParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[DisableTransfer]]._unwrapper,
-            ),
-            cast_to=cast(Type[str], ResultWrapper[str]),
-        )
-
-    async def enable(
-        self,
-        *,
-        zone_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> str:
-        """
-        Enable outgoing zone transfers for primary zone.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._post(
-            f"/zones/{zone_id}/secondary_dns/outgoing/enable",
-            body=await async_maybe_transform(body, outgoing_enable_params.OutgoingEnableParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[EnableTransfer]]._unwrapper,
-            ),
-            cast_to=cast(Type[str], ResultWrapper[str]),
-        )
-
-    async def force_notify(
-        self,
-        *,
-        zone_id: str,
-        body: object,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> str:
-        """
-        Notifies the secondary nameserver(s) and clears IXFR backlog of primary zone.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._post(
-            f"/zones/{zone_id}/secondary_dns/outgoing/force_notify",
-            body=await async_maybe_transform(body, outgoing_force_notify_params.OutgoingForceNotifyParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[OutgoingForceNotifyResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[str], ResultWrapper[str]),
-        )
-
-    async def get(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OutgoingGetResponse]:
-        """
-        Get primary zone configuration for outgoing zone transfers.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._get(
-            f"/zones/{zone_id}/secondary_dns/outgoing",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[OutgoingGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[OutgoingGetResponse]], ResultWrapper[OutgoingGetResponse]),
-        )
-
-
-class OutgoingResourceWithRawResponse:
-    def __init__(self, outgoing: OutgoingResource) -> None:
-        self._outgoing = outgoing
-
-        self.create = to_raw_response_wrapper(
-            outgoing.create,
-        )
-        self.update = to_raw_response_wrapper(
-            outgoing.update,
-        )
-        self.delete = to_raw_response_wrapper(
-            outgoing.delete,
-        )
-        self.disable = to_raw_response_wrapper(
-            outgoing.disable,
-        )
-        self.enable = to_raw_response_wrapper(
-            outgoing.enable,
-        )
-        self.force_notify = to_raw_response_wrapper(
-            outgoing.force_notify,
-        )
-        self.get = to_raw_response_wrapper(
-            outgoing.get,
-        )
-
-    @cached_property
-    def status(self) -> StatusResourceWithRawResponse:
-        return StatusResourceWithRawResponse(self._outgoing.status)
-
-
-class AsyncOutgoingResourceWithRawResponse:
-    def __init__(self, outgoing: AsyncOutgoingResource) -> None:
-        self._outgoing = outgoing
-
-        self.create = async_to_raw_response_wrapper(
-            outgoing.create,
-        )
-        self.update = async_to_raw_response_wrapper(
-            outgoing.update,
-        )
-        self.delete = async_to_raw_response_wrapper(
-            outgoing.delete,
-        )
-        self.disable = async_to_raw_response_wrapper(
-            outgoing.disable,
-        )
-        self.enable = async_to_raw_response_wrapper(
-            outgoing.enable,
-        )
-        self.force_notify = async_to_raw_response_wrapper(
-            outgoing.force_notify,
-        )
-        self.get = async_to_raw_response_wrapper(
-            outgoing.get,
-        )
-
-    @cached_property
-    def status(self) -> AsyncStatusResourceWithRawResponse:
-        return AsyncStatusResourceWithRawResponse(self._outgoing.status)
-
-
-class OutgoingResourceWithStreamingResponse:
-    def __init__(self, outgoing: OutgoingResource) -> None:
-        self._outgoing = outgoing
-
-        self.create = to_streamed_response_wrapper(
-            outgoing.create,
-        )
-        self.update = to_streamed_response_wrapper(
-            outgoing.update,
-        )
-        self.delete = to_streamed_response_wrapper(
-            outgoing.delete,
-        )
-        self.disable = to_streamed_response_wrapper(
-            outgoing.disable,
-        )
-        self.enable = to_streamed_response_wrapper(
-            outgoing.enable,
-        )
-        self.force_notify = to_streamed_response_wrapper(
-            outgoing.force_notify,
-        )
-        self.get = to_streamed_response_wrapper(
-            outgoing.get,
-        )
-
-    @cached_property
-    def status(self) -> StatusResourceWithStreamingResponse:
-        return StatusResourceWithStreamingResponse(self._outgoing.status)
-
-
-class AsyncOutgoingResourceWithStreamingResponse:
-    def __init__(self, outgoing: AsyncOutgoingResource) -> None:
-        self._outgoing = outgoing
-
-        self.create = async_to_streamed_response_wrapper(
-            outgoing.create,
-        )
-        self.update = async_to_streamed_response_wrapper(
-            outgoing.update,
-        )
-        self.delete = async_to_streamed_response_wrapper(
-            outgoing.delete,
-        )
-        self.disable = async_to_streamed_response_wrapper(
-            outgoing.disable,
-        )
-        self.enable = async_to_streamed_response_wrapper(
-            outgoing.enable,
-        )
-        self.force_notify = async_to_streamed_response_wrapper(
-            outgoing.force_notify,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            outgoing.get,
-        )
-
-    @cached_property
-    def status(self) -> AsyncStatusResourceWithStreamingResponse:
-        return AsyncStatusResourceWithStreamingResponse(self._outgoing.status)
diff --git a/src/cloudflare/resources/secondary_dns/outgoing/status.py b/src/cloudflare/resources/secondary_dns/outgoing/status.py
deleted file mode 100644
index da0505a75ac..00000000000
--- a/src/cloudflare/resources/secondary_dns/outgoing/status.py
+++ /dev/null
@@ -1,152 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Optional, cast
-
-import httpx
-
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
-from ....types.secondary_dns.enable_transfer import EnableTransfer
-
-__all__ = ["StatusResource", "AsyncStatusResource"]
-
-
-class StatusResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> StatusResourceWithRawResponse:
-        return StatusResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> StatusResourceWithStreamingResponse:
-        return StatusResourceWithStreamingResponse(self)
-
-    def get(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> str:
-        """
-        Get primary zone transfer status.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._get(
-            f"/zones/{zone_id}/secondary_dns/outgoing/status",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[EnableTransfer]]._unwrapper,
-            ),
-            cast_to=cast(Type[str], ResultWrapper[str]),
-        )
-
-
-class AsyncStatusResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncStatusResourceWithRawResponse:
-        return AsyncStatusResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncStatusResourceWithStreamingResponse:
-        return AsyncStatusResourceWithStreamingResponse(self)
-
-    async def get(
-        self,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> str:
-        """
-        Get primary zone transfer status.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._get(
-            f"/zones/{zone_id}/secondary_dns/outgoing/status",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[EnableTransfer]]._unwrapper,
-            ),
-            cast_to=cast(Type[str], ResultWrapper[str]),
-        )
-
-
-class StatusResourceWithRawResponse:
-    def __init__(self, status: StatusResource) -> None:
-        self._status = status
-
-        self.get = to_raw_response_wrapper(
-            status.get,
-        )
-
-
-class AsyncStatusResourceWithRawResponse:
-    def __init__(self, status: AsyncStatusResource) -> None:
-        self._status = status
-
-        self.get = async_to_raw_response_wrapper(
-            status.get,
-        )
-
-
-class StatusResourceWithStreamingResponse:
-    def __init__(self, status: StatusResource) -> None:
-        self._status = status
-
-        self.get = to_streamed_response_wrapper(
-            status.get,
-        )
-
-
-class AsyncStatusResourceWithStreamingResponse:
-    def __init__(self, status: AsyncStatusResource) -> None:
-        self._status = status
-
-        self.get = async_to_streamed_response_wrapper(
-            status.get,
-        )
diff --git a/src/cloudflare/resources/secondary_dns/secondary_dns.py b/src/cloudflare/resources/secondary_dns/secondary_dns.py
deleted file mode 100644
index de66545fd83..00000000000
--- a/src/cloudflare/resources/secondary_dns/secondary_dns.py
+++ /dev/null
@@ -1,241 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from .acls import (
-    ACLsResource,
-    AsyncACLsResource,
-    ACLsResourceWithRawResponse,
-    AsyncACLsResourceWithRawResponse,
-    ACLsResourceWithStreamingResponse,
-    AsyncACLsResourceWithStreamingResponse,
-)
-from .peers import (
-    PeersResource,
-    AsyncPeersResource,
-    PeersResourceWithRawResponse,
-    AsyncPeersResourceWithRawResponse,
-    PeersResourceWithStreamingResponse,
-    AsyncPeersResourceWithStreamingResponse,
-)
-from .tsigs import (
-    TSIGsResource,
-    AsyncTSIGsResource,
-    TSIGsResourceWithRawResponse,
-    AsyncTSIGsResourceWithRawResponse,
-    TSIGsResourceWithStreamingResponse,
-    AsyncTSIGsResourceWithStreamingResponse,
-)
-from .incoming import (
-    IncomingResource,
-    AsyncIncomingResource,
-    IncomingResourceWithRawResponse,
-    AsyncIncomingResourceWithRawResponse,
-    IncomingResourceWithStreamingResponse,
-    AsyncIncomingResourceWithStreamingResponse,
-)
-from .outgoing import (
-    OutgoingResource,
-    AsyncOutgoingResource,
-    OutgoingResourceWithRawResponse,
-    AsyncOutgoingResourceWithRawResponse,
-    OutgoingResourceWithStreamingResponse,
-    AsyncOutgoingResourceWithStreamingResponse,
-)
-from ..._compat import cached_property
-from .force_axfr import (
-    ForceAXFRResource,
-    AsyncForceAXFRResource,
-    ForceAXFRResourceWithRawResponse,
-    AsyncForceAXFRResourceWithRawResponse,
-    ForceAXFRResourceWithStreamingResponse,
-    AsyncForceAXFRResourceWithStreamingResponse,
-)
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .outgoing.outgoing import OutgoingResource, AsyncOutgoingResource
-
-__all__ = ["SecondaryDNSResource", "AsyncSecondaryDNSResource"]
-
-
-class SecondaryDNSResource(SyncAPIResource):
-    @cached_property
-    def force_axfr(self) -> ForceAXFRResource:
-        return ForceAXFRResource(self._client)
-
-    @cached_property
-    def incoming(self) -> IncomingResource:
-        return IncomingResource(self._client)
-
-    @cached_property
-    def outgoing(self) -> OutgoingResource:
-        return OutgoingResource(self._client)
-
-    @cached_property
-    def acls(self) -> ACLsResource:
-        return ACLsResource(self._client)
-
-    @cached_property
-    def peers(self) -> PeersResource:
-        return PeersResource(self._client)
-
-    @cached_property
-    def tsigs(self) -> TSIGsResource:
-        return TSIGsResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> SecondaryDNSResourceWithRawResponse:
-        return SecondaryDNSResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> SecondaryDNSResourceWithStreamingResponse:
-        return SecondaryDNSResourceWithStreamingResponse(self)
-
-
-class AsyncSecondaryDNSResource(AsyncAPIResource):
-    @cached_property
-    def force_axfr(self) -> AsyncForceAXFRResource:
-        return AsyncForceAXFRResource(self._client)
-
-    @cached_property
-    def incoming(self) -> AsyncIncomingResource:
-        return AsyncIncomingResource(self._client)
-
-    @cached_property
-    def outgoing(self) -> AsyncOutgoingResource:
-        return AsyncOutgoingResource(self._client)
-
-    @cached_property
-    def acls(self) -> AsyncACLsResource:
-        return AsyncACLsResource(self._client)
-
-    @cached_property
-    def peers(self) -> AsyncPeersResource:
-        return AsyncPeersResource(self._client)
-
-    @cached_property
-    def tsigs(self) -> AsyncTSIGsResource:
-        return AsyncTSIGsResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncSecondaryDNSResourceWithRawResponse:
-        return AsyncSecondaryDNSResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncSecondaryDNSResourceWithStreamingResponse:
-        return AsyncSecondaryDNSResourceWithStreamingResponse(self)
-
-
-class SecondaryDNSResourceWithRawResponse:
-    def __init__(self, secondary_dns: SecondaryDNSResource) -> None:
-        self._secondary_dns = secondary_dns
-
-    @cached_property
-    def force_axfr(self) -> ForceAXFRResourceWithRawResponse:
-        return ForceAXFRResourceWithRawResponse(self._secondary_dns.force_axfr)
-
-    @cached_property
-    def incoming(self) -> IncomingResourceWithRawResponse:
-        return IncomingResourceWithRawResponse(self._secondary_dns.incoming)
-
-    @cached_property
-    def outgoing(self) -> OutgoingResourceWithRawResponse:
-        return OutgoingResourceWithRawResponse(self._secondary_dns.outgoing)
-
-    @cached_property
-    def acls(self) -> ACLsResourceWithRawResponse:
-        return ACLsResourceWithRawResponse(self._secondary_dns.acls)
-
-    @cached_property
-    def peers(self) -> PeersResourceWithRawResponse:
-        return PeersResourceWithRawResponse(self._secondary_dns.peers)
-
-    @cached_property
-    def tsigs(self) -> TSIGsResourceWithRawResponse:
-        return TSIGsResourceWithRawResponse(self._secondary_dns.tsigs)
-
-
-class AsyncSecondaryDNSResourceWithRawResponse:
-    def __init__(self, secondary_dns: AsyncSecondaryDNSResource) -> None:
-        self._secondary_dns = secondary_dns
-
-    @cached_property
-    def force_axfr(self) -> AsyncForceAXFRResourceWithRawResponse:
-        return AsyncForceAXFRResourceWithRawResponse(self._secondary_dns.force_axfr)
-
-    @cached_property
-    def incoming(self) -> AsyncIncomingResourceWithRawResponse:
-        return AsyncIncomingResourceWithRawResponse(self._secondary_dns.incoming)
-
-    @cached_property
-    def outgoing(self) -> AsyncOutgoingResourceWithRawResponse:
-        return AsyncOutgoingResourceWithRawResponse(self._secondary_dns.outgoing)
-
-    @cached_property
-    def acls(self) -> AsyncACLsResourceWithRawResponse:
-        return AsyncACLsResourceWithRawResponse(self._secondary_dns.acls)
-
-    @cached_property
-    def peers(self) -> AsyncPeersResourceWithRawResponse:
-        return AsyncPeersResourceWithRawResponse(self._secondary_dns.peers)
-
-    @cached_property
-    def tsigs(self) -> AsyncTSIGsResourceWithRawResponse:
-        return AsyncTSIGsResourceWithRawResponse(self._secondary_dns.tsigs)
-
-
-class SecondaryDNSResourceWithStreamingResponse:
-    def __init__(self, secondary_dns: SecondaryDNSResource) -> None:
-        self._secondary_dns = secondary_dns
-
-    @cached_property
-    def force_axfr(self) -> ForceAXFRResourceWithStreamingResponse:
-        return ForceAXFRResourceWithStreamingResponse(self._secondary_dns.force_axfr)
-
-    @cached_property
-    def incoming(self) -> IncomingResourceWithStreamingResponse:
-        return IncomingResourceWithStreamingResponse(self._secondary_dns.incoming)
-
-    @cached_property
-    def outgoing(self) -> OutgoingResourceWithStreamingResponse:
-        return OutgoingResourceWithStreamingResponse(self._secondary_dns.outgoing)
-
-    @cached_property
-    def acls(self) -> ACLsResourceWithStreamingResponse:
-        return ACLsResourceWithStreamingResponse(self._secondary_dns.acls)
-
-    @cached_property
-    def peers(self) -> PeersResourceWithStreamingResponse:
-        return PeersResourceWithStreamingResponse(self._secondary_dns.peers)
-
-    @cached_property
-    def tsigs(self) -> TSIGsResourceWithStreamingResponse:
-        return TSIGsResourceWithStreamingResponse(self._secondary_dns.tsigs)
-
-
-class AsyncSecondaryDNSResourceWithStreamingResponse:
-    def __init__(self, secondary_dns: AsyncSecondaryDNSResource) -> None:
-        self._secondary_dns = secondary_dns
-
-    @cached_property
-    def force_axfr(self) -> AsyncForceAXFRResourceWithStreamingResponse:
-        return AsyncForceAXFRResourceWithStreamingResponse(self._secondary_dns.force_axfr)
-
-    @cached_property
-    def incoming(self) -> AsyncIncomingResourceWithStreamingResponse:
-        return AsyncIncomingResourceWithStreamingResponse(self._secondary_dns.incoming)
-
-    @cached_property
-    def outgoing(self) -> AsyncOutgoingResourceWithStreamingResponse:
-        return AsyncOutgoingResourceWithStreamingResponse(self._secondary_dns.outgoing)
-
-    @cached_property
-    def acls(self) -> AsyncACLsResourceWithStreamingResponse:
-        return AsyncACLsResourceWithStreamingResponse(self._secondary_dns.acls)
-
-    @cached_property
-    def peers(self) -> AsyncPeersResourceWithStreamingResponse:
-        return AsyncPeersResourceWithStreamingResponse(self._secondary_dns.peers)
-
-    @cached_property
-    def tsigs(self) -> AsyncTSIGsResourceWithStreamingResponse:
-        return AsyncTSIGsResourceWithStreamingResponse(self._secondary_dns.tsigs)
diff --git a/src/cloudflare/resources/secrets_store/__init__.py b/src/cloudflare/resources/secrets_store/__init__.py
new file mode 100644
index 00000000000..38790260886
--- /dev/null
+++ b/src/cloudflare/resources/secrets_store/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .quota import (
+    QuotaResource,
+    AsyncQuotaResource,
+    QuotaResourceWithRawResponse,
+    AsyncQuotaResourceWithRawResponse,
+    QuotaResourceWithStreamingResponse,
+    AsyncQuotaResourceWithStreamingResponse,
+)
+from .stores import (
+    StoresResource,
+    AsyncStoresResource,
+    StoresResourceWithRawResponse,
+    AsyncStoresResourceWithRawResponse,
+    StoresResourceWithStreamingResponse,
+    AsyncStoresResourceWithStreamingResponse,
+)
+from .secrets_store import (
+    SecretsStoreResource,
+    AsyncSecretsStoreResource,
+    SecretsStoreResourceWithRawResponse,
+    AsyncSecretsStoreResourceWithRawResponse,
+    SecretsStoreResourceWithStreamingResponse,
+    AsyncSecretsStoreResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "StoresResource",
+    "AsyncStoresResource",
+    "StoresResourceWithRawResponse",
+    "AsyncStoresResourceWithRawResponse",
+    "StoresResourceWithStreamingResponse",
+    "AsyncStoresResourceWithStreamingResponse",
+    "QuotaResource",
+    "AsyncQuotaResource",
+    "QuotaResourceWithRawResponse",
+    "AsyncQuotaResourceWithRawResponse",
+    "QuotaResourceWithStreamingResponse",
+    "AsyncQuotaResourceWithStreamingResponse",
+    "SecretsStoreResource",
+    "AsyncSecretsStoreResource",
+    "SecretsStoreResourceWithRawResponse",
+    "AsyncSecretsStoreResourceWithRawResponse",
+    "SecretsStoreResourceWithStreamingResponse",
+    "AsyncSecretsStoreResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/secrets_store/quota.py b/src/cloudflare/resources/secrets_store/quota.py
new file mode 100644
index 00000000000..65a7a0eff5a
--- /dev/null
+++ b/src/cloudflare/resources/secrets_store/quota.py
@@ -0,0 +1,178 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.secrets_store.quota_get_response import QuotaGetResponse
+
+__all__ = ["QuotaResource", "AsyncQuotaResource"]
+
+
+class QuotaResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> QuotaResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return QuotaResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> QuotaResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return QuotaResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[QuotaGetResponse]:
+        """
+        Lists the number of secrets used in the account.
+
+        Args:
+          account_id: Account Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/secrets_store/quota",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[QuotaGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[QuotaGetResponse]], ResultWrapper[QuotaGetResponse]),
+        )
+
+
+class AsyncQuotaResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncQuotaResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncQuotaResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncQuotaResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncQuotaResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[QuotaGetResponse]:
+        """
+        Lists the number of secrets used in the account.
+
+        Args:
+          account_id: Account Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/secrets_store/quota",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[QuotaGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[QuotaGetResponse]], ResultWrapper[QuotaGetResponse]),
+        )
+
+
+class QuotaResourceWithRawResponse:
+    def __init__(self, quota: QuotaResource) -> None:
+        self._quota = quota
+
+        self.get = to_raw_response_wrapper(
+            quota.get,
+        )
+
+
+class AsyncQuotaResourceWithRawResponse:
+    def __init__(self, quota: AsyncQuotaResource) -> None:
+        self._quota = quota
+
+        self.get = async_to_raw_response_wrapper(
+            quota.get,
+        )
+
+
+class QuotaResourceWithStreamingResponse:
+    def __init__(self, quota: QuotaResource) -> None:
+        self._quota = quota
+
+        self.get = to_streamed_response_wrapper(
+            quota.get,
+        )
+
+
+class AsyncQuotaResourceWithStreamingResponse:
+    def __init__(self, quota: AsyncQuotaResource) -> None:
+        self._quota = quota
+
+        self.get = async_to_streamed_response_wrapper(
+            quota.get,
+        )
diff --git a/src/cloudflare/resources/secrets_store/secrets_store.py b/src/cloudflare/resources/secrets_store/secrets_store.py
new file mode 100644
index 00000000000..e72b518ce7f
--- /dev/null
+++ b/src/cloudflare/resources/secrets_store/secrets_store.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .quota import (
+    QuotaResource,
+    AsyncQuotaResource,
+    QuotaResourceWithRawResponse,
+    AsyncQuotaResourceWithRawResponse,
+    QuotaResourceWithStreamingResponse,
+    AsyncQuotaResourceWithStreamingResponse,
+)
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .stores.stores import (
+    StoresResource,
+    AsyncStoresResource,
+    StoresResourceWithRawResponse,
+    AsyncStoresResourceWithRawResponse,
+    StoresResourceWithStreamingResponse,
+    AsyncStoresResourceWithStreamingResponse,
+)
+
+__all__ = ["SecretsStoreResource", "AsyncSecretsStoreResource"]
+
+
+class SecretsStoreResource(SyncAPIResource):
+    @cached_property
+    def stores(self) -> StoresResource:
+        return StoresResource(self._client)
+
+    @cached_property
+    def quota(self) -> QuotaResource:
+        return QuotaResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> SecretsStoreResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SecretsStoreResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SecretsStoreResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SecretsStoreResourceWithStreamingResponse(self)
+
+
+class AsyncSecretsStoreResource(AsyncAPIResource):
+    @cached_property
+    def stores(self) -> AsyncStoresResource:
+        return AsyncStoresResource(self._client)
+
+    @cached_property
+    def quota(self) -> AsyncQuotaResource:
+        return AsyncQuotaResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncSecretsStoreResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSecretsStoreResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSecretsStoreResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSecretsStoreResourceWithStreamingResponse(self)
+
+
+class SecretsStoreResourceWithRawResponse:
+    def __init__(self, secrets_store: SecretsStoreResource) -> None:
+        self._secrets_store = secrets_store
+
+    @cached_property
+    def stores(self) -> StoresResourceWithRawResponse:
+        return StoresResourceWithRawResponse(self._secrets_store.stores)
+
+    @cached_property
+    def quota(self) -> QuotaResourceWithRawResponse:
+        return QuotaResourceWithRawResponse(self._secrets_store.quota)
+
+
+class AsyncSecretsStoreResourceWithRawResponse:
+    def __init__(self, secrets_store: AsyncSecretsStoreResource) -> None:
+        self._secrets_store = secrets_store
+
+    @cached_property
+    def stores(self) -> AsyncStoresResourceWithRawResponse:
+        return AsyncStoresResourceWithRawResponse(self._secrets_store.stores)
+
+    @cached_property
+    def quota(self) -> AsyncQuotaResourceWithRawResponse:
+        return AsyncQuotaResourceWithRawResponse(self._secrets_store.quota)
+
+
+class SecretsStoreResourceWithStreamingResponse:
+    def __init__(self, secrets_store: SecretsStoreResource) -> None:
+        self._secrets_store = secrets_store
+
+    @cached_property
+    def stores(self) -> StoresResourceWithStreamingResponse:
+        return StoresResourceWithStreamingResponse(self._secrets_store.stores)
+
+    @cached_property
+    def quota(self) -> QuotaResourceWithStreamingResponse:
+        return QuotaResourceWithStreamingResponse(self._secrets_store.quota)
+
+
+class AsyncSecretsStoreResourceWithStreamingResponse:
+    def __init__(self, secrets_store: AsyncSecretsStoreResource) -> None:
+        self._secrets_store = secrets_store
+
+    @cached_property
+    def stores(self) -> AsyncStoresResourceWithStreamingResponse:
+        return AsyncStoresResourceWithStreamingResponse(self._secrets_store.stores)
+
+    @cached_property
+    def quota(self) -> AsyncQuotaResourceWithStreamingResponse:
+        return AsyncQuotaResourceWithStreamingResponse(self._secrets_store.quota)
diff --git a/src/cloudflare/resources/secrets_store/stores/__init__.py b/src/cloudflare/resources/secrets_store/stores/__init__.py
new file mode 100644
index 00000000000..f971efb2afe
--- /dev/null
+++ b/src/cloudflare/resources/secrets_store/stores/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .stores import (
+    StoresResource,
+    AsyncStoresResource,
+    StoresResourceWithRawResponse,
+    AsyncStoresResourceWithRawResponse,
+    StoresResourceWithStreamingResponse,
+    AsyncStoresResourceWithStreamingResponse,
+)
+from .secrets import (
+    SecretsResource,
+    AsyncSecretsResource,
+    SecretsResourceWithRawResponse,
+    AsyncSecretsResourceWithRawResponse,
+    SecretsResourceWithStreamingResponse,
+    AsyncSecretsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "SecretsResource",
+    "AsyncSecretsResource",
+    "SecretsResourceWithRawResponse",
+    "AsyncSecretsResourceWithRawResponse",
+    "SecretsResourceWithStreamingResponse",
+    "AsyncSecretsResourceWithStreamingResponse",
+    "StoresResource",
+    "AsyncStoresResource",
+    "StoresResourceWithRawResponse",
+    "AsyncStoresResourceWithRawResponse",
+    "StoresResourceWithStreamingResponse",
+    "AsyncStoresResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/secrets_store/stores/secrets.py b/src/cloudflare/resources/secrets_store/stores/secrets.py
new file mode 100644
index 00000000000..11d2698f1ce
--- /dev/null
+++ b/src/cloudflare/resources/secrets_store/stores/secrets.py
@@ -0,0 +1,957 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.secrets_store.stores import (
+    secret_edit_params,
+    secret_list_params,
+    secret_create_params,
+    secret_duplicate_params,
+)
+from ....types.secrets_store.stores.secret_get_response import SecretGetResponse
+from ....types.secrets_store.stores.secret_edit_response import SecretEditResponse
+from ....types.secrets_store.stores.secret_list_response import SecretListResponse
+from ....types.secrets_store.stores.secret_create_response import SecretCreateResponse
+from ....types.secrets_store.stores.secret_delete_response import SecretDeleteResponse
+from ....types.secrets_store.stores.secret_duplicate_response import SecretDuplicateResponse
+from ....types.secrets_store.stores.secret_bulk_delete_response import SecretBulkDeleteResponse
+
+__all__ = ["SecretsResource", "AsyncSecretsResource"]
+
+
+class SecretsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SecretsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SecretsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SecretsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SecretsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        store_id: str,
+        *,
+        account_id: str,
+        body: Iterable[secret_create_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[SecretCreateResponse]:
+        """
+        Creates a secret in the account
+
+        Args:
+          account_id: Account Identifier
+
+          store_id: Store Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not store_id:
+            raise ValueError(f"Expected a non-empty value for `store_id` but received {store_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/secrets_store/stores/{store_id}/secrets",
+            page=SyncSinglePage[SecretCreateResponse],
+            body=maybe_transform(body, Iterable[secret_create_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=SecretCreateResponse,
+            method="post",
+        )
+
+    def list(
+        self,
+        store_id: str,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        order: Literal["name", "comment", "created", "modified", "status"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        scopes: Iterable[SequenceNotStr[str]] | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[SecretListResponse]:
+        """
+        Lists all store secrets
+
+        Args:
+          account_id: Account Identifier
+
+          store_id: Store Identifier
+
+          direction: Direction to sort objects
+
+          order: Order secrets by values in the given field
+
+          page: Page number
+
+          per_page: Number of objects to return per page
+
+          scopes: Only secrets with the given scopes will be returned
+
+          search: Search secrets using a filter string, filtering across name and comment
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not store_id:
+            raise ValueError(f"Expected a non-empty value for `store_id` but received {store_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/secrets_store/stores/{store_id}/secrets",
+            page=SyncV4PagePaginationArray[SecretListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "order": order,
+                        "page": page,
+                        "per_page": per_page,
+                        "scopes": scopes,
+                        "search": search,
+                    },
+                    secret_list_params.SecretListParams,
+                ),
+            ),
+            model=SecretListResponse,
+        )
+
+    def delete(
+        self,
+        secret_id: str,
+        *,
+        account_id: str,
+        store_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SecretDeleteResponse]:
+        """
+        Deletes a single secret
+
+        Args:
+          account_id: Account Identifier
+
+          store_id: Store Identifier
+
+          secret_id: Secret identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not store_id:
+            raise ValueError(f"Expected a non-empty value for `store_id` but received {store_id!r}")
+        if not secret_id:
+            raise ValueError(f"Expected a non-empty value for `secret_id` but received {secret_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/secrets_store/stores/{store_id}/secrets/{secret_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SecretDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SecretDeleteResponse]], ResultWrapper[SecretDeleteResponse]),
+        )
+
+    def bulk_delete(
+        self,
+        store_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[SecretBulkDeleteResponse]:
+        """
+        Deletes one or more secrets
+
+        Args:
+          account_id: Account Identifier
+
+          store_id: Store Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not store_id:
+            raise ValueError(f"Expected a non-empty value for `store_id` but received {store_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/secrets_store/stores/{store_id}/secrets",
+            page=SyncSinglePage[SecretBulkDeleteResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=SecretBulkDeleteResponse,
+            method="delete",
+        )
+
+    def duplicate(
+        self,
+        secret_id: str,
+        *,
+        account_id: str,
+        store_id: str,
+        name: str,
+        scopes: SequenceNotStr[str],
+        comment: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SecretDuplicateResponse]:
+        """
+        Duplicates the secret, keeping the value
+
+        Args:
+          account_id: Account Identifier
+
+          store_id: Store Identifier
+
+          secret_id: Secret identifier tag.
+
+          name: The name of the secret
+
+          scopes: The list of services that can use this secret.
+
+          comment: Freeform text describing the secret
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not store_id:
+            raise ValueError(f"Expected a non-empty value for `store_id` but received {store_id!r}")
+        if not secret_id:
+            raise ValueError(f"Expected a non-empty value for `secret_id` but received {secret_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/secrets_store/stores/{store_id}/secrets/{secret_id}/duplicate",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "scopes": scopes,
+                    "comment": comment,
+                },
+                secret_duplicate_params.SecretDuplicateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SecretDuplicateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SecretDuplicateResponse]], ResultWrapper[SecretDuplicateResponse]),
+        )
+
+    def edit(
+        self,
+        secret_id: str,
+        *,
+        account_id: str,
+        store_id: str,
+        comment: str | Omit = omit,
+        scopes: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SecretEditResponse]:
+        """
+        Updates a single secret
+
+        Args:
+          account_id: Account Identifier
+
+          store_id: Store Identifier
+
+          secret_id: Secret identifier tag.
+
+          comment: Freeform text describing the secret
+
+          scopes: The list of services that can use this secret.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not store_id:
+            raise ValueError(f"Expected a non-empty value for `store_id` but received {store_id!r}")
+        if not secret_id:
+            raise ValueError(f"Expected a non-empty value for `secret_id` but received {secret_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/secrets_store/stores/{store_id}/secrets/{secret_id}",
+            body=maybe_transform(
+                {
+                    "comment": comment,
+                    "scopes": scopes,
+                },
+                secret_edit_params.SecretEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SecretEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SecretEditResponse]], ResultWrapper[SecretEditResponse]),
+        )
+
+    def get(
+        self,
+        secret_id: str,
+        *,
+        account_id: str,
+        store_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SecretGetResponse]:
+        """
+        Returns details of a single secret
+
+        Args:
+          account_id: Account Identifier
+
+          store_id: Store Identifier
+
+          secret_id: Secret identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not store_id:
+            raise ValueError(f"Expected a non-empty value for `store_id` but received {store_id!r}")
+        if not secret_id:
+            raise ValueError(f"Expected a non-empty value for `secret_id` but received {secret_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/secrets_store/stores/{store_id}/secrets/{secret_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SecretGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SecretGetResponse]], ResultWrapper[SecretGetResponse]),
+        )
+
+
+class AsyncSecretsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSecretsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSecretsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSecretsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSecretsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        store_id: str,
+        *,
+        account_id: str,
+        body: Iterable[secret_create_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SecretCreateResponse, AsyncSinglePage[SecretCreateResponse]]:
+        """
+        Creates a secret in the account
+
+        Args:
+          account_id: Account Identifier
+
+          store_id: Store Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not store_id:
+            raise ValueError(f"Expected a non-empty value for `store_id` but received {store_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/secrets_store/stores/{store_id}/secrets",
+            page=AsyncSinglePage[SecretCreateResponse],
+            body=maybe_transform(body, Iterable[secret_create_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=SecretCreateResponse,
+            method="post",
+        )
+
+    def list(
+        self,
+        store_id: str,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        order: Literal["name", "comment", "created", "modified", "status"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        scopes: Iterable[SequenceNotStr[str]] | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SecretListResponse, AsyncV4PagePaginationArray[SecretListResponse]]:
+        """
+        Lists all store secrets
+
+        Args:
+          account_id: Account Identifier
+
+          store_id: Store Identifier
+
+          direction: Direction to sort objects
+
+          order: Order secrets by values in the given field
+
+          page: Page number
+
+          per_page: Number of objects to return per page
+
+          scopes: Only secrets with the given scopes will be returned
+
+          search: Search secrets using a filter string, filtering across name and comment
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not store_id:
+            raise ValueError(f"Expected a non-empty value for `store_id` but received {store_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/secrets_store/stores/{store_id}/secrets",
+            page=AsyncV4PagePaginationArray[SecretListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "order": order,
+                        "page": page,
+                        "per_page": per_page,
+                        "scopes": scopes,
+                        "search": search,
+                    },
+                    secret_list_params.SecretListParams,
+                ),
+            ),
+            model=SecretListResponse,
+        )
+
+    async def delete(
+        self,
+        secret_id: str,
+        *,
+        account_id: str,
+        store_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SecretDeleteResponse]:
+        """
+        Deletes a single secret
+
+        Args:
+          account_id: Account Identifier
+
+          store_id: Store Identifier
+
+          secret_id: Secret identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not store_id:
+            raise ValueError(f"Expected a non-empty value for `store_id` but received {store_id!r}")
+        if not secret_id:
+            raise ValueError(f"Expected a non-empty value for `secret_id` but received {secret_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/secrets_store/stores/{store_id}/secrets/{secret_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SecretDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SecretDeleteResponse]], ResultWrapper[SecretDeleteResponse]),
+        )
+
+    def bulk_delete(
+        self,
+        store_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SecretBulkDeleteResponse, AsyncSinglePage[SecretBulkDeleteResponse]]:
+        """
+        Deletes one or more secrets
+
+        Args:
+          account_id: Account Identifier
+
+          store_id: Store Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not store_id:
+            raise ValueError(f"Expected a non-empty value for `store_id` but received {store_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/secrets_store/stores/{store_id}/secrets",
+            page=AsyncSinglePage[SecretBulkDeleteResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=SecretBulkDeleteResponse,
+            method="delete",
+        )
+
+    async def duplicate(
+        self,
+        secret_id: str,
+        *,
+        account_id: str,
+        store_id: str,
+        name: str,
+        scopes: SequenceNotStr[str],
+        comment: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SecretDuplicateResponse]:
+        """
+        Duplicates the secret, keeping the value
+
+        Args:
+          account_id: Account Identifier
+
+          store_id: Store Identifier
+
+          secret_id: Secret identifier tag.
+
+          name: The name of the secret
+
+          scopes: The list of services that can use this secret.
+
+          comment: Freeform text describing the secret
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not store_id:
+            raise ValueError(f"Expected a non-empty value for `store_id` but received {store_id!r}")
+        if not secret_id:
+            raise ValueError(f"Expected a non-empty value for `secret_id` but received {secret_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/secrets_store/stores/{store_id}/secrets/{secret_id}/duplicate",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "scopes": scopes,
+                    "comment": comment,
+                },
+                secret_duplicate_params.SecretDuplicateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SecretDuplicateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SecretDuplicateResponse]], ResultWrapper[SecretDuplicateResponse]),
+        )
+
+    async def edit(
+        self,
+        secret_id: str,
+        *,
+        account_id: str,
+        store_id: str,
+        comment: str | Omit = omit,
+        scopes: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SecretEditResponse]:
+        """
+        Updates a single secret
+
+        Args:
+          account_id: Account Identifier
+
+          store_id: Store Identifier
+
+          secret_id: Secret identifier tag.
+
+          comment: Freeform text describing the secret
+
+          scopes: The list of services that can use this secret.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not store_id:
+            raise ValueError(f"Expected a non-empty value for `store_id` but received {store_id!r}")
+        if not secret_id:
+            raise ValueError(f"Expected a non-empty value for `secret_id` but received {secret_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/secrets_store/stores/{store_id}/secrets/{secret_id}",
+            body=await async_maybe_transform(
+                {
+                    "comment": comment,
+                    "scopes": scopes,
+                },
+                secret_edit_params.SecretEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SecretEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SecretEditResponse]], ResultWrapper[SecretEditResponse]),
+        )
+
+    async def get(
+        self,
+        secret_id: str,
+        *,
+        account_id: str,
+        store_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SecretGetResponse]:
+        """
+        Returns details of a single secret
+
+        Args:
+          account_id: Account Identifier
+
+          store_id: Store Identifier
+
+          secret_id: Secret identifier tag.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not store_id:
+            raise ValueError(f"Expected a non-empty value for `store_id` but received {store_id!r}")
+        if not secret_id:
+            raise ValueError(f"Expected a non-empty value for `secret_id` but received {secret_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/secrets_store/stores/{store_id}/secrets/{secret_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SecretGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SecretGetResponse]], ResultWrapper[SecretGetResponse]),
+        )
+
+
+class SecretsResourceWithRawResponse:
+    def __init__(self, secrets: SecretsResource) -> None:
+        self._secrets = secrets
+
+        self.create = to_raw_response_wrapper(
+            secrets.create,
+        )
+        self.list = to_raw_response_wrapper(
+            secrets.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            secrets.delete,
+        )
+        self.bulk_delete = to_raw_response_wrapper(
+            secrets.bulk_delete,
+        )
+        self.duplicate = to_raw_response_wrapper(
+            secrets.duplicate,
+        )
+        self.edit = to_raw_response_wrapper(
+            secrets.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            secrets.get,
+        )
+
+
+class AsyncSecretsResourceWithRawResponse:
+    def __init__(self, secrets: AsyncSecretsResource) -> None:
+        self._secrets = secrets
+
+        self.create = async_to_raw_response_wrapper(
+            secrets.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            secrets.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            secrets.delete,
+        )
+        self.bulk_delete = async_to_raw_response_wrapper(
+            secrets.bulk_delete,
+        )
+        self.duplicate = async_to_raw_response_wrapper(
+            secrets.duplicate,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            secrets.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            secrets.get,
+        )
+
+
+class SecretsResourceWithStreamingResponse:
+    def __init__(self, secrets: SecretsResource) -> None:
+        self._secrets = secrets
+
+        self.create = to_streamed_response_wrapper(
+            secrets.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            secrets.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            secrets.delete,
+        )
+        self.bulk_delete = to_streamed_response_wrapper(
+            secrets.bulk_delete,
+        )
+        self.duplicate = to_streamed_response_wrapper(
+            secrets.duplicate,
+        )
+        self.edit = to_streamed_response_wrapper(
+            secrets.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            secrets.get,
+        )
+
+
+class AsyncSecretsResourceWithStreamingResponse:
+    def __init__(self, secrets: AsyncSecretsResource) -> None:
+        self._secrets = secrets
+
+        self.create = async_to_streamed_response_wrapper(
+            secrets.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            secrets.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            secrets.delete,
+        )
+        self.bulk_delete = async_to_streamed_response_wrapper(
+            secrets.bulk_delete,
+        )
+        self.duplicate = async_to_streamed_response_wrapper(
+            secrets.duplicate,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            secrets.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            secrets.get,
+        )
diff --git a/src/cloudflare/resources/secrets_store/stores/stores.py b/src/cloudflare/resources/secrets_store/stores/stores.py
new file mode 100644
index 00000000000..73e3af0171f
--- /dev/null
+++ b/src/cloudflare/resources/secrets_store/stores/stores.py
@@ -0,0 +1,448 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from .secrets import (
+    SecretsResource,
+    AsyncSecretsResource,
+    SecretsResourceWithRawResponse,
+    AsyncSecretsResourceWithRawResponse,
+    SecretsResourceWithStreamingResponse,
+    AsyncSecretsResourceWithStreamingResponse,
+)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.secrets_store import store_list_params, store_create_params
+from ....types.secrets_store.store_list_response import StoreListResponse
+from ....types.secrets_store.store_create_response import StoreCreateResponse
+from ....types.secrets_store.store_delete_response import StoreDeleteResponse
+
+__all__ = ["StoresResource", "AsyncStoresResource"]
+
+
+class StoresResource(SyncAPIResource):
+    @cached_property
+    def secrets(self) -> SecretsResource:
+        return SecretsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> StoresResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return StoresResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> StoresResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return StoresResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        body: Iterable[store_create_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[StoreCreateResponse]:
+        """
+        Creates a store in the account
+
+        Args:
+          account_id: Account Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/secrets_store/stores",
+            page=SyncSinglePage[StoreCreateResponse],
+            body=maybe_transform(body, Iterable[store_create_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=StoreCreateResponse,
+            method="post",
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        order: Literal["name", "comment", "created", "modified", "status"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[StoreListResponse]:
+        """
+        Lists all the stores in an account
+
+        Args:
+          account_id: Account Identifier
+
+          direction: Direction to sort objects
+
+          order: Order secrets by values in the given field
+
+          page: Page number
+
+          per_page: Number of objects to return per page
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/secrets_store/stores",
+            page=SyncV4PagePaginationArray[StoreListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "order": order,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    store_list_params.StoreListParams,
+                ),
+            ),
+            model=StoreListResponse,
+        )
+
+    def delete(
+        self,
+        store_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[StoreDeleteResponse]:
+        """
+        Deletes a single store
+
+        Args:
+          account_id: Account Identifier
+
+          store_id: Store Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not store_id:
+            raise ValueError(f"Expected a non-empty value for `store_id` but received {store_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/secrets_store/stores/{store_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[StoreDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[StoreDeleteResponse]], ResultWrapper[StoreDeleteResponse]),
+        )
+
+
+class AsyncStoresResource(AsyncAPIResource):
+    @cached_property
+    def secrets(self) -> AsyncSecretsResource:
+        return AsyncSecretsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncStoresResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncStoresResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncStoresResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncStoresResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        body: Iterable[store_create_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[StoreCreateResponse, AsyncSinglePage[StoreCreateResponse]]:
+        """
+        Creates a store in the account
+
+        Args:
+          account_id: Account Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/secrets_store/stores",
+            page=AsyncSinglePage[StoreCreateResponse],
+            body=maybe_transform(body, Iterable[store_create_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=StoreCreateResponse,
+            method="post",
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        order: Literal["name", "comment", "created", "modified", "status"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[StoreListResponse, AsyncV4PagePaginationArray[StoreListResponse]]:
+        """
+        Lists all the stores in an account
+
+        Args:
+          account_id: Account Identifier
+
+          direction: Direction to sort objects
+
+          order: Order secrets by values in the given field
+
+          page: Page number
+
+          per_page: Number of objects to return per page
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/secrets_store/stores",
+            page=AsyncV4PagePaginationArray[StoreListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "direction": direction,
+                        "order": order,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    store_list_params.StoreListParams,
+                ),
+            ),
+            model=StoreListResponse,
+        )
+
+    async def delete(
+        self,
+        store_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[StoreDeleteResponse]:
+        """
+        Deletes a single store
+
+        Args:
+          account_id: Account Identifier
+
+          store_id: Store Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not store_id:
+            raise ValueError(f"Expected a non-empty value for `store_id` but received {store_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/secrets_store/stores/{store_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[StoreDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[StoreDeleteResponse]], ResultWrapper[StoreDeleteResponse]),
+        )
+
+
+class StoresResourceWithRawResponse:
+    def __init__(self, stores: StoresResource) -> None:
+        self._stores = stores
+
+        self.create = to_raw_response_wrapper(
+            stores.create,
+        )
+        self.list = to_raw_response_wrapper(
+            stores.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            stores.delete,
+        )
+
+    @cached_property
+    def secrets(self) -> SecretsResourceWithRawResponse:
+        return SecretsResourceWithRawResponse(self._stores.secrets)
+
+
+class AsyncStoresResourceWithRawResponse:
+    def __init__(self, stores: AsyncStoresResource) -> None:
+        self._stores = stores
+
+        self.create = async_to_raw_response_wrapper(
+            stores.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            stores.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            stores.delete,
+        )
+
+    @cached_property
+    def secrets(self) -> AsyncSecretsResourceWithRawResponse:
+        return AsyncSecretsResourceWithRawResponse(self._stores.secrets)
+
+
+class StoresResourceWithStreamingResponse:
+    def __init__(self, stores: StoresResource) -> None:
+        self._stores = stores
+
+        self.create = to_streamed_response_wrapper(
+            stores.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            stores.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            stores.delete,
+        )
+
+    @cached_property
+    def secrets(self) -> SecretsResourceWithStreamingResponse:
+        return SecretsResourceWithStreamingResponse(self._stores.secrets)
+
+
+class AsyncStoresResourceWithStreamingResponse:
+    def __init__(self, stores: AsyncStoresResource) -> None:
+        self._stores = stores
+
+        self.create = async_to_streamed_response_wrapper(
+            stores.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            stores.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            stores.delete,
+        )
+
+    @cached_property
+    def secrets(self) -> AsyncSecretsResourceWithStreamingResponse:
+        return AsyncSecretsResourceWithStreamingResponse(self._stores.secrets)
diff --git a/src/cloudflare/resources/security_center/__init__.py b/src/cloudflare/resources/security_center/__init__.py
new file mode 100644
index 00000000000..aced2f74c07
--- /dev/null
+++ b/src/cloudflare/resources/security_center/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .insights import (
+    InsightsResource,
+    AsyncInsightsResource,
+    InsightsResourceWithRawResponse,
+    AsyncInsightsResourceWithRawResponse,
+    InsightsResourceWithStreamingResponse,
+    AsyncInsightsResourceWithStreamingResponse,
+)
+from .security_center import (
+    SecurityCenterResource,
+    AsyncSecurityCenterResource,
+    SecurityCenterResourceWithRawResponse,
+    AsyncSecurityCenterResourceWithRawResponse,
+    SecurityCenterResourceWithStreamingResponse,
+    AsyncSecurityCenterResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "InsightsResource",
+    "AsyncInsightsResource",
+    "InsightsResourceWithRawResponse",
+    "AsyncInsightsResourceWithRawResponse",
+    "InsightsResourceWithStreamingResponse",
+    "AsyncInsightsResourceWithStreamingResponse",
+    "SecurityCenterResource",
+    "AsyncSecurityCenterResource",
+    "SecurityCenterResourceWithRawResponse",
+    "AsyncSecurityCenterResourceWithRawResponse",
+    "SecurityCenterResourceWithStreamingResponse",
+    "AsyncSecurityCenterResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/security_center/insights/__init__.py b/src/cloudflare/resources/security_center/insights/__init__.py
new file mode 100644
index 00000000000..5818ca6cde6
--- /dev/null
+++ b/src/cloudflare/resources/security_center/insights/__init__.py
@@ -0,0 +1,61 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .type import (
+    TypeResource,
+    AsyncTypeResource,
+    TypeResourceWithRawResponse,
+    AsyncTypeResourceWithRawResponse,
+    TypeResourceWithStreamingResponse,
+    AsyncTypeResourceWithStreamingResponse,
+)
+from .class_ import (
+    ClassResource,
+    AsyncClassResource,
+    ClassResourceWithRawResponse,
+    AsyncClassResourceWithRawResponse,
+    ClassResourceWithStreamingResponse,
+    AsyncClassResourceWithStreamingResponse,
+)
+from .insights import (
+    InsightsResource,
+    AsyncInsightsResource,
+    InsightsResourceWithRawResponse,
+    AsyncInsightsResourceWithRawResponse,
+    InsightsResourceWithStreamingResponse,
+    AsyncInsightsResourceWithStreamingResponse,
+)
+from .severity import (
+    SeverityResource,
+    AsyncSeverityResource,
+    SeverityResourceWithRawResponse,
+    AsyncSeverityResourceWithRawResponse,
+    SeverityResourceWithStreamingResponse,
+    AsyncSeverityResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ClassResource",
+    "AsyncClassResource",
+    "ClassResourceWithRawResponse",
+    "AsyncClassResourceWithRawResponse",
+    "ClassResourceWithStreamingResponse",
+    "AsyncClassResourceWithStreamingResponse",
+    "SeverityResource",
+    "AsyncSeverityResource",
+    "SeverityResourceWithRawResponse",
+    "AsyncSeverityResourceWithRawResponse",
+    "SeverityResourceWithStreamingResponse",
+    "AsyncSeverityResourceWithStreamingResponse",
+    "TypeResource",
+    "AsyncTypeResource",
+    "TypeResourceWithRawResponse",
+    "AsyncTypeResourceWithRawResponse",
+    "TypeResourceWithStreamingResponse",
+    "AsyncTypeResourceWithStreamingResponse",
+    "InsightsResource",
+    "AsyncInsightsResource",
+    "InsightsResourceWithRawResponse",
+    "AsyncInsightsResourceWithRawResponse",
+    "InsightsResourceWithStreamingResponse",
+    "AsyncInsightsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/security_center/insights/class_.py b/src/cloudflare/resources/security_center/insights/class_.py
new file mode 100644
index 00000000000..f4997c03e5a
--- /dev/null
+++ b/src/cloudflare/resources/security_center/insights/class_.py
@@ -0,0 +1,262 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.security_center.insights import class_get_params
+from ....types.intel.attack_surface_report.issue_type import IssueType
+from ....types.security_center.insights.class_get_response import ClassGetResponse
+from ....types.intel.attack_surface_report.severity_query_param import SeverityQueryParam
+
+__all__ = ["ClassResource", "AsyncClassResource"]
+
+
+class ClassResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ClassResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ClassResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ClassResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ClassResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        dismissed: bool | Omit = omit,
+        issue_class: SequenceNotStr[str] | Omit = omit,
+        issue_class_neq: SequenceNotStr[str] | Omit = omit,
+        issue_type: List[IssueType] | Omit = omit,
+        issue_type_neq: List[IssueType] | Omit = omit,
+        product: SequenceNotStr[str] | Omit = omit,
+        product_neq: SequenceNotStr[str] | Omit = omit,
+        severity: List[SeverityQueryParam] | Omit = omit,
+        severity_neq: List[SeverityQueryParam] | Omit = omit,
+        subject: SequenceNotStr[str] | Omit = omit,
+        subject_neq: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ClassGetResponse]:
+        """
+        Retrieves Security Center Insight Counts by Class
+
+        Args:
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._get(
+            f"/{account_or_zone}/{account_or_zone_id}/security-center/insights/class",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "dismissed": dismissed,
+                        "issue_class": issue_class,
+                        "issue_class_neq": issue_class_neq,
+                        "issue_type": issue_type,
+                        "issue_type_neq": issue_type_neq,
+                        "product": product,
+                        "product_neq": product_neq,
+                        "severity": severity,
+                        "severity_neq": severity_neq,
+                        "subject": subject,
+                        "subject_neq": subject_neq,
+                    },
+                    class_get_params.ClassGetParams,
+                ),
+                post_parser=ResultWrapper[Optional[ClassGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ClassGetResponse]], ResultWrapper[ClassGetResponse]),
+        )
+
+
+class AsyncClassResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncClassResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncClassResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncClassResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncClassResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        dismissed: bool | Omit = omit,
+        issue_class: SequenceNotStr[str] | Omit = omit,
+        issue_class_neq: SequenceNotStr[str] | Omit = omit,
+        issue_type: List[IssueType] | Omit = omit,
+        issue_type_neq: List[IssueType] | Omit = omit,
+        product: SequenceNotStr[str] | Omit = omit,
+        product_neq: SequenceNotStr[str] | Omit = omit,
+        severity: List[SeverityQueryParam] | Omit = omit,
+        severity_neq: List[SeverityQueryParam] | Omit = omit,
+        subject: SequenceNotStr[str] | Omit = omit,
+        subject_neq: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ClassGetResponse]:
+        """
+        Retrieves Security Center Insight Counts by Class
+
+        Args:
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return await self._get(
+            f"/{account_or_zone}/{account_or_zone_id}/security-center/insights/class",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "dismissed": dismissed,
+                        "issue_class": issue_class,
+                        "issue_class_neq": issue_class_neq,
+                        "issue_type": issue_type,
+                        "issue_type_neq": issue_type_neq,
+                        "product": product,
+                        "product_neq": product_neq,
+                        "severity": severity,
+                        "severity_neq": severity_neq,
+                        "subject": subject,
+                        "subject_neq": subject_neq,
+                    },
+                    class_get_params.ClassGetParams,
+                ),
+                post_parser=ResultWrapper[Optional[ClassGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ClassGetResponse]], ResultWrapper[ClassGetResponse]),
+        )
+
+
+class ClassResourceWithRawResponse:
+    def __init__(self, class_: ClassResource) -> None:
+        self._class_ = class_
+
+        self.get = to_raw_response_wrapper(
+            class_.get,
+        )
+
+
+class AsyncClassResourceWithRawResponse:
+    def __init__(self, class_: AsyncClassResource) -> None:
+        self._class_ = class_
+
+        self.get = async_to_raw_response_wrapper(
+            class_.get,
+        )
+
+
+class ClassResourceWithStreamingResponse:
+    def __init__(self, class_: ClassResource) -> None:
+        self._class_ = class_
+
+        self.get = to_streamed_response_wrapper(
+            class_.get,
+        )
+
+
+class AsyncClassResourceWithStreamingResponse:
+    def __init__(self, class_: AsyncClassResource) -> None:
+        self._class_ = class_
+
+        self.get = async_to_streamed_response_wrapper(
+            class_.get,
+        )
diff --git a/src/cloudflare/resources/security_center/insights/insights.py b/src/cloudflare/resources/security_center/insights/insights.py
new file mode 100644
index 00000000000..7a2103184b4
--- /dev/null
+++ b/src/cloudflare/resources/security_center/insights/insights.py
@@ -0,0 +1,493 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Optional
+
+import httpx
+
+from .type import (
+    TypeResource,
+    AsyncTypeResource,
+    TypeResourceWithRawResponse,
+    AsyncTypeResourceWithRawResponse,
+    TypeResourceWithStreamingResponse,
+    AsyncTypeResourceWithStreamingResponse,
+)
+from .class_ import (
+    ClassResource,
+    AsyncClassResource,
+    ClassResourceWithRawResponse,
+    AsyncClassResourceWithRawResponse,
+    ClassResourceWithStreamingResponse,
+    AsyncClassResourceWithStreamingResponse,
+)
+from .severity import (
+    SeverityResource,
+    AsyncSeverityResource,
+    SeverityResourceWithRawResponse,
+    AsyncSeverityResourceWithRawResponse,
+    SeverityResourceWithStreamingResponse,
+    AsyncSeverityResourceWithStreamingResponse,
+)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....pagination import SyncV4PagePagination, AsyncV4PagePagination
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.security_center import insight_list_params, insight_dismiss_params
+from ....types.security_center.insight_list_response import InsightListResponse
+from ....types.intel.attack_surface_report.issue_type import IssueType
+from ....types.security_center.insight_dismiss_response import InsightDismissResponse
+from ....types.intel.attack_surface_report.severity_query_param import SeverityQueryParam
+
+__all__ = ["InsightsResource", "AsyncInsightsResource"]
+
+
+class InsightsResource(SyncAPIResource):
+    @cached_property
+    def class_(self) -> ClassResource:
+        return ClassResource(self._client)
+
+    @cached_property
+    def severity(self) -> SeverityResource:
+        return SeverityResource(self._client)
+
+    @cached_property
+    def type(self) -> TypeResource:
+        return TypeResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> InsightsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return InsightsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> InsightsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return InsightsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        dismissed: bool | Omit = omit,
+        issue_class: SequenceNotStr[str] | Omit = omit,
+        issue_class_neq: SequenceNotStr[str] | Omit = omit,
+        issue_type: List[IssueType] | Omit = omit,
+        issue_type_neq: List[IssueType] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        product: SequenceNotStr[str] | Omit = omit,
+        product_neq: SequenceNotStr[str] | Omit = omit,
+        severity: List[SeverityQueryParam] | Omit = omit,
+        severity_neq: List[SeverityQueryParam] | Omit = omit,
+        subject: SequenceNotStr[str] | Omit = omit,
+        subject_neq: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePagination[Optional[InsightListResponse]]:
+        """
+        Retrieves Security Center Insights
+
+        Args:
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          page: Specifies the current page within paginated list of results.
+
+          per_page: Sets the number of results per page of results.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._get_api_list(
+            f"/{account_or_zone}/{account_or_zone_id}/security-center/insights",
+            page=SyncV4PagePagination[Optional[InsightListResponse]],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "dismissed": dismissed,
+                        "issue_class": issue_class,
+                        "issue_class_neq": issue_class_neq,
+                        "issue_type": issue_type,
+                        "issue_type_neq": issue_type_neq,
+                        "page": page,
+                        "per_page": per_page,
+                        "product": product,
+                        "product_neq": product_neq,
+                        "severity": severity,
+                        "severity_neq": severity_neq,
+                        "subject": subject,
+                        "subject_neq": subject_neq,
+                    },
+                    insight_list_params.InsightListParams,
+                ),
+            ),
+            model=InsightListResponse,
+        )
+
+    def dismiss(
+        self,
+        issue_id: str,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        dismiss: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InsightDismissResponse:
+        """
+        Archives Security Center Insight
+
+        Args:
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not issue_id:
+            raise ValueError(f"Expected a non-empty value for `issue_id` but received {issue_id!r}")
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._put(
+            f"/{account_or_zone}/{account_or_zone_id}/security-center/insights/{issue_id}/dismiss",
+            body=maybe_transform({"dismiss": dismiss}, insight_dismiss_params.InsightDismissParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=InsightDismissResponse,
+        )
+
+
+class AsyncInsightsResource(AsyncAPIResource):
+    @cached_property
+    def class_(self) -> AsyncClassResource:
+        return AsyncClassResource(self._client)
+
+    @cached_property
+    def severity(self) -> AsyncSeverityResource:
+        return AsyncSeverityResource(self._client)
+
+    @cached_property
+    def type(self) -> AsyncTypeResource:
+        return AsyncTypeResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncInsightsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncInsightsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncInsightsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncInsightsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        dismissed: bool | Omit = omit,
+        issue_class: SequenceNotStr[str] | Omit = omit,
+        issue_class_neq: SequenceNotStr[str] | Omit = omit,
+        issue_type: List[IssueType] | Omit = omit,
+        issue_type_neq: List[IssueType] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        product: SequenceNotStr[str] | Omit = omit,
+        product_neq: SequenceNotStr[str] | Omit = omit,
+        severity: List[SeverityQueryParam] | Omit = omit,
+        severity_neq: List[SeverityQueryParam] | Omit = omit,
+        subject: SequenceNotStr[str] | Omit = omit,
+        subject_neq: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Optional[InsightListResponse], AsyncV4PagePagination[Optional[InsightListResponse]]]:
+        """
+        Retrieves Security Center Insights
+
+        Args:
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          page: Specifies the current page within paginated list of results.
+
+          per_page: Sets the number of results per page of results.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._get_api_list(
+            f"/{account_or_zone}/{account_or_zone_id}/security-center/insights",
+            page=AsyncV4PagePagination[Optional[InsightListResponse]],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "dismissed": dismissed,
+                        "issue_class": issue_class,
+                        "issue_class_neq": issue_class_neq,
+                        "issue_type": issue_type,
+                        "issue_type_neq": issue_type_neq,
+                        "page": page,
+                        "per_page": per_page,
+                        "product": product,
+                        "product_neq": product_neq,
+                        "severity": severity,
+                        "severity_neq": severity_neq,
+                        "subject": subject,
+                        "subject_neq": subject_neq,
+                    },
+                    insight_list_params.InsightListParams,
+                ),
+            ),
+            model=InsightListResponse,
+        )
+
+    async def dismiss(
+        self,
+        issue_id: str,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        dismiss: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InsightDismissResponse:
+        """
+        Archives Security Center Insight
+
+        Args:
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not issue_id:
+            raise ValueError(f"Expected a non-empty value for `issue_id` but received {issue_id!r}")
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return await self._put(
+            f"/{account_or_zone}/{account_or_zone_id}/security-center/insights/{issue_id}/dismiss",
+            body=await async_maybe_transform({"dismiss": dismiss}, insight_dismiss_params.InsightDismissParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=InsightDismissResponse,
+        )
+
+
+class InsightsResourceWithRawResponse:
+    def __init__(self, insights: InsightsResource) -> None:
+        self._insights = insights
+
+        self.list = to_raw_response_wrapper(
+            insights.list,
+        )
+        self.dismiss = to_raw_response_wrapper(
+            insights.dismiss,
+        )
+
+    @cached_property
+    def class_(self) -> ClassResourceWithRawResponse:
+        return ClassResourceWithRawResponse(self._insights.class_)
+
+    @cached_property
+    def severity(self) -> SeverityResourceWithRawResponse:
+        return SeverityResourceWithRawResponse(self._insights.severity)
+
+    @cached_property
+    def type(self) -> TypeResourceWithRawResponse:
+        return TypeResourceWithRawResponse(self._insights.type)
+
+
+class AsyncInsightsResourceWithRawResponse:
+    def __init__(self, insights: AsyncInsightsResource) -> None:
+        self._insights = insights
+
+        self.list = async_to_raw_response_wrapper(
+            insights.list,
+        )
+        self.dismiss = async_to_raw_response_wrapper(
+            insights.dismiss,
+        )
+
+    @cached_property
+    def class_(self) -> AsyncClassResourceWithRawResponse:
+        return AsyncClassResourceWithRawResponse(self._insights.class_)
+
+    @cached_property
+    def severity(self) -> AsyncSeverityResourceWithRawResponse:
+        return AsyncSeverityResourceWithRawResponse(self._insights.severity)
+
+    @cached_property
+    def type(self) -> AsyncTypeResourceWithRawResponse:
+        return AsyncTypeResourceWithRawResponse(self._insights.type)
+
+
+class InsightsResourceWithStreamingResponse:
+    def __init__(self, insights: InsightsResource) -> None:
+        self._insights = insights
+
+        self.list = to_streamed_response_wrapper(
+            insights.list,
+        )
+        self.dismiss = to_streamed_response_wrapper(
+            insights.dismiss,
+        )
+
+    @cached_property
+    def class_(self) -> ClassResourceWithStreamingResponse:
+        return ClassResourceWithStreamingResponse(self._insights.class_)
+
+    @cached_property
+    def severity(self) -> SeverityResourceWithStreamingResponse:
+        return SeverityResourceWithStreamingResponse(self._insights.severity)
+
+    @cached_property
+    def type(self) -> TypeResourceWithStreamingResponse:
+        return TypeResourceWithStreamingResponse(self._insights.type)
+
+
+class AsyncInsightsResourceWithStreamingResponse:
+    def __init__(self, insights: AsyncInsightsResource) -> None:
+        self._insights = insights
+
+        self.list = async_to_streamed_response_wrapper(
+            insights.list,
+        )
+        self.dismiss = async_to_streamed_response_wrapper(
+            insights.dismiss,
+        )
+
+    @cached_property
+    def class_(self) -> AsyncClassResourceWithStreamingResponse:
+        return AsyncClassResourceWithStreamingResponse(self._insights.class_)
+
+    @cached_property
+    def severity(self) -> AsyncSeverityResourceWithStreamingResponse:
+        return AsyncSeverityResourceWithStreamingResponse(self._insights.severity)
+
+    @cached_property
+    def type(self) -> AsyncTypeResourceWithStreamingResponse:
+        return AsyncTypeResourceWithStreamingResponse(self._insights.type)
diff --git a/src/cloudflare/resources/security_center/insights/severity.py b/src/cloudflare/resources/security_center/insights/severity.py
new file mode 100644
index 00000000000..81d546d4a51
--- /dev/null
+++ b/src/cloudflare/resources/security_center/insights/severity.py
@@ -0,0 +1,262 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.security_center.insights import severity_get_params
+from ....types.intel.attack_surface_report.issue_type import IssueType
+from ....types.security_center.insights.severity_get_response import SeverityGetResponse
+from ....types.intel.attack_surface_report.severity_query_param import SeverityQueryParam
+
+__all__ = ["SeverityResource", "AsyncSeverityResource"]
+
+
+class SeverityResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SeverityResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SeverityResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SeverityResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SeverityResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        dismissed: bool | Omit = omit,
+        issue_class: SequenceNotStr[str] | Omit = omit,
+        issue_class_neq: SequenceNotStr[str] | Omit = omit,
+        issue_type: List[IssueType] | Omit = omit,
+        issue_type_neq: List[IssueType] | Omit = omit,
+        product: SequenceNotStr[str] | Omit = omit,
+        product_neq: SequenceNotStr[str] | Omit = omit,
+        severity: List[SeverityQueryParam] | Omit = omit,
+        severity_neq: List[SeverityQueryParam] | Omit = omit,
+        subject: SequenceNotStr[str] | Omit = omit,
+        subject_neq: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SeverityGetResponse]:
+        """
+        Retrieves Security Center Insight Counts by Severity
+
+        Args:
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._get(
+            f"/{account_or_zone}/{account_or_zone_id}/security-center/insights/severity",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "dismissed": dismissed,
+                        "issue_class": issue_class,
+                        "issue_class_neq": issue_class_neq,
+                        "issue_type": issue_type,
+                        "issue_type_neq": issue_type_neq,
+                        "product": product,
+                        "product_neq": product_neq,
+                        "severity": severity,
+                        "severity_neq": severity_neq,
+                        "subject": subject,
+                        "subject_neq": subject_neq,
+                    },
+                    severity_get_params.SeverityGetParams,
+                ),
+                post_parser=ResultWrapper[Optional[SeverityGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SeverityGetResponse]], ResultWrapper[SeverityGetResponse]),
+        )
+
+
+class AsyncSeverityResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSeverityResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSeverityResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSeverityResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSeverityResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        dismissed: bool | Omit = omit,
+        issue_class: SequenceNotStr[str] | Omit = omit,
+        issue_class_neq: SequenceNotStr[str] | Omit = omit,
+        issue_type: List[IssueType] | Omit = omit,
+        issue_type_neq: List[IssueType] | Omit = omit,
+        product: SequenceNotStr[str] | Omit = omit,
+        product_neq: SequenceNotStr[str] | Omit = omit,
+        severity: List[SeverityQueryParam] | Omit = omit,
+        severity_neq: List[SeverityQueryParam] | Omit = omit,
+        subject: SequenceNotStr[str] | Omit = omit,
+        subject_neq: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SeverityGetResponse]:
+        """
+        Retrieves Security Center Insight Counts by Severity
+
+        Args:
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return await self._get(
+            f"/{account_or_zone}/{account_or_zone_id}/security-center/insights/severity",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "dismissed": dismissed,
+                        "issue_class": issue_class,
+                        "issue_class_neq": issue_class_neq,
+                        "issue_type": issue_type,
+                        "issue_type_neq": issue_type_neq,
+                        "product": product,
+                        "product_neq": product_neq,
+                        "severity": severity,
+                        "severity_neq": severity_neq,
+                        "subject": subject,
+                        "subject_neq": subject_neq,
+                    },
+                    severity_get_params.SeverityGetParams,
+                ),
+                post_parser=ResultWrapper[Optional[SeverityGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SeverityGetResponse]], ResultWrapper[SeverityGetResponse]),
+        )
+
+
+class SeverityResourceWithRawResponse:
+    def __init__(self, severity: SeverityResource) -> None:
+        self._severity = severity
+
+        self.get = to_raw_response_wrapper(
+            severity.get,
+        )
+
+
+class AsyncSeverityResourceWithRawResponse:
+    def __init__(self, severity: AsyncSeverityResource) -> None:
+        self._severity = severity
+
+        self.get = async_to_raw_response_wrapper(
+            severity.get,
+        )
+
+
+class SeverityResourceWithStreamingResponse:
+    def __init__(self, severity: SeverityResource) -> None:
+        self._severity = severity
+
+        self.get = to_streamed_response_wrapper(
+            severity.get,
+        )
+
+
+class AsyncSeverityResourceWithStreamingResponse:
+    def __init__(self, severity: AsyncSeverityResource) -> None:
+        self._severity = severity
+
+        self.get = async_to_streamed_response_wrapper(
+            severity.get,
+        )
diff --git a/src/cloudflare/resources/security_center/insights/type.py b/src/cloudflare/resources/security_center/insights/type.py
new file mode 100644
index 00000000000..40b8016d197
--- /dev/null
+++ b/src/cloudflare/resources/security_center/insights/type.py
@@ -0,0 +1,262 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.security_center.insights import type_get_params
+from ....types.intel.attack_surface_report.issue_type import IssueType
+from ....types.security_center.insights.type_get_response import TypeGetResponse
+from ....types.intel.attack_surface_report.severity_query_param import SeverityQueryParam
+
+__all__ = ["TypeResource", "AsyncTypeResource"]
+
+
+class TypeResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> TypeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TypeResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TypeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TypeResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        dismissed: bool | Omit = omit,
+        issue_class: SequenceNotStr[str] | Omit = omit,
+        issue_class_neq: SequenceNotStr[str] | Omit = omit,
+        issue_type: List[IssueType] | Omit = omit,
+        issue_type_neq: List[IssueType] | Omit = omit,
+        product: SequenceNotStr[str] | Omit = omit,
+        product_neq: SequenceNotStr[str] | Omit = omit,
+        severity: List[SeverityQueryParam] | Omit = omit,
+        severity_neq: List[SeverityQueryParam] | Omit = omit,
+        subject: SequenceNotStr[str] | Omit = omit,
+        subject_neq: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TypeGetResponse]:
+        """
+        Retrieves Security Center Insight Counts by Type
+
+        Args:
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._get(
+            f"/{account_or_zone}/{account_or_zone_id}/security-center/insights/type",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "dismissed": dismissed,
+                        "issue_class": issue_class,
+                        "issue_class_neq": issue_class_neq,
+                        "issue_type": issue_type,
+                        "issue_type_neq": issue_type_neq,
+                        "product": product,
+                        "product_neq": product_neq,
+                        "severity": severity,
+                        "severity_neq": severity_neq,
+                        "subject": subject,
+                        "subject_neq": subject_neq,
+                    },
+                    type_get_params.TypeGetParams,
+                ),
+                post_parser=ResultWrapper[Optional[TypeGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TypeGetResponse]], ResultWrapper[TypeGetResponse]),
+        )
+
+
+class AsyncTypeResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncTypeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTypeResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTypeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTypeResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        dismissed: bool | Omit = omit,
+        issue_class: SequenceNotStr[str] | Omit = omit,
+        issue_class_neq: SequenceNotStr[str] | Omit = omit,
+        issue_type: List[IssueType] | Omit = omit,
+        issue_type_neq: List[IssueType] | Omit = omit,
+        product: SequenceNotStr[str] | Omit = omit,
+        product_neq: SequenceNotStr[str] | Omit = omit,
+        severity: List[SeverityQueryParam] | Omit = omit,
+        severity_neq: List[SeverityQueryParam] | Omit = omit,
+        subject: SequenceNotStr[str] | Omit = omit,
+        subject_neq: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TypeGetResponse]:
+        """
+        Retrieves Security Center Insight Counts by Type
+
+        Args:
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return await self._get(
+            f"/{account_or_zone}/{account_or_zone_id}/security-center/insights/type",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "dismissed": dismissed,
+                        "issue_class": issue_class,
+                        "issue_class_neq": issue_class_neq,
+                        "issue_type": issue_type,
+                        "issue_type_neq": issue_type_neq,
+                        "product": product,
+                        "product_neq": product_neq,
+                        "severity": severity,
+                        "severity_neq": severity_neq,
+                        "subject": subject,
+                        "subject_neq": subject_neq,
+                    },
+                    type_get_params.TypeGetParams,
+                ),
+                post_parser=ResultWrapper[Optional[TypeGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TypeGetResponse]], ResultWrapper[TypeGetResponse]),
+        )
+
+
+class TypeResourceWithRawResponse:
+    def __init__(self, type: TypeResource) -> None:
+        self._type = type
+
+        self.get = to_raw_response_wrapper(
+            type.get,
+        )
+
+
+class AsyncTypeResourceWithRawResponse:
+    def __init__(self, type: AsyncTypeResource) -> None:
+        self._type = type
+
+        self.get = async_to_raw_response_wrapper(
+            type.get,
+        )
+
+
+class TypeResourceWithStreamingResponse:
+    def __init__(self, type: TypeResource) -> None:
+        self._type = type
+
+        self.get = to_streamed_response_wrapper(
+            type.get,
+        )
+
+
+class AsyncTypeResourceWithStreamingResponse:
+    def __init__(self, type: AsyncTypeResource) -> None:
+        self._type = type
+
+        self.get = async_to_streamed_response_wrapper(
+            type.get,
+        )
diff --git a/src/cloudflare/resources/security_center/security_center.py b/src/cloudflare/resources/security_center/security_center.py
new file mode 100644
index 00000000000..8c377cc50c2
--- /dev/null
+++ b/src/cloudflare/resources/security_center/security_center.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .insights.insights import (
+    InsightsResource,
+    AsyncInsightsResource,
+    InsightsResourceWithRawResponse,
+    AsyncInsightsResourceWithRawResponse,
+    InsightsResourceWithStreamingResponse,
+    AsyncInsightsResourceWithStreamingResponse,
+)
+
+__all__ = ["SecurityCenterResource", "AsyncSecurityCenterResource"]
+
+
+class SecurityCenterResource(SyncAPIResource):
+    @cached_property
+    def insights(self) -> InsightsResource:
+        return InsightsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> SecurityCenterResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SecurityCenterResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SecurityCenterResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SecurityCenterResourceWithStreamingResponse(self)
+
+
+class AsyncSecurityCenterResource(AsyncAPIResource):
+    @cached_property
+    def insights(self) -> AsyncInsightsResource:
+        return AsyncInsightsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncSecurityCenterResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSecurityCenterResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSecurityCenterResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSecurityCenterResourceWithStreamingResponse(self)
+
+
+class SecurityCenterResourceWithRawResponse:
+    def __init__(self, security_center: SecurityCenterResource) -> None:
+        self._security_center = security_center
+
+    @cached_property
+    def insights(self) -> InsightsResourceWithRawResponse:
+        return InsightsResourceWithRawResponse(self._security_center.insights)
+
+
+class AsyncSecurityCenterResourceWithRawResponse:
+    def __init__(self, security_center: AsyncSecurityCenterResource) -> None:
+        self._security_center = security_center
+
+    @cached_property
+    def insights(self) -> AsyncInsightsResourceWithRawResponse:
+        return AsyncInsightsResourceWithRawResponse(self._security_center.insights)
+
+
+class SecurityCenterResourceWithStreamingResponse:
+    def __init__(self, security_center: SecurityCenterResource) -> None:
+        self._security_center = security_center
+
+    @cached_property
+    def insights(self) -> InsightsResourceWithStreamingResponse:
+        return InsightsResourceWithStreamingResponse(self._security_center.insights)
+
+
+class AsyncSecurityCenterResourceWithStreamingResponse:
+    def __init__(self, security_center: AsyncSecurityCenterResource) -> None:
+        self._security_center = security_center
+
+    @cached_property
+    def insights(self) -> AsyncInsightsResourceWithStreamingResponse:
+        return AsyncInsightsResourceWithStreamingResponse(self._security_center.insights)
diff --git a/src/cloudflare/resources/security_txt.py b/src/cloudflare/resources/security_txt.py
new file mode 100644
index 00000000000..d2416aa23dd
--- /dev/null
+++ b/src/cloudflare/resources/security_txt.py
@@ -0,0 +1,393 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Union, Optional, cast
+from datetime import datetime
+
+import httpx
+
+from .._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from .._utils import maybe_transform, async_maybe_transform
+from .._compat import cached_property
+from .._resource import SyncAPIResource, AsyncAPIResource
+from .._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from .._wrappers import ResultWrapper
+from .._base_client import make_request_options
+from ..types.security_txt import security_txt_update_params
+from ..types.security_txt.security_txt_get_response import SecurityTXTGetResponse
+from ..types.security_txt.security_txt_delete_response import SecurityTXTDeleteResponse
+from ..types.security_txt.security_txt_update_response import SecurityTXTUpdateResponse
+
+__all__ = ["SecurityTXTResource", "AsyncSecurityTXTResource"]
+
+
+class SecurityTXTResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SecurityTXTResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SecurityTXTResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SecurityTXTResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SecurityTXTResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        *,
+        zone_id: str,
+        acknowledgments: SequenceNotStr[str] | Omit = omit,
+        canonical: SequenceNotStr[str] | Omit = omit,
+        contact: SequenceNotStr[str] | Omit = omit,
+        enabled: bool | Omit = omit,
+        encryption: SequenceNotStr[str] | Omit = omit,
+        expires: Union[str, datetime] | Omit = omit,
+        hiring: SequenceNotStr[str] | Omit = omit,
+        policy: SequenceNotStr[str] | Omit = omit,
+        preferred_languages: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SecurityTXTUpdateResponse:
+        """
+        Updates security.txt
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/security-center/securitytxt",
+            body=maybe_transform(
+                {
+                    "acknowledgments": acknowledgments,
+                    "canonical": canonical,
+                    "contact": contact,
+                    "enabled": enabled,
+                    "encryption": encryption,
+                    "expires": expires,
+                    "hiring": hiring,
+                    "policy": policy,
+                    "preferred_languages": preferred_languages,
+                },
+                security_txt_update_params.SecurityTXTUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SecurityTXTUpdateResponse,
+        )
+
+    def delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SecurityTXTDeleteResponse:
+        """
+        Deletes security.txt
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._delete(
+            f"/zones/{zone_id}/security-center/securitytxt",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SecurityTXTDeleteResponse,
+        )
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SecurityTXTGetResponse]:
+        """
+        Retrieves security.txt
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/security-center/securitytxt",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SecurityTXTGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SecurityTXTGetResponse]], ResultWrapper[SecurityTXTGetResponse]),
+        )
+
+
+class AsyncSecurityTXTResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSecurityTXTResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSecurityTXTResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSecurityTXTResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSecurityTXTResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        *,
+        zone_id: str,
+        acknowledgments: SequenceNotStr[str] | Omit = omit,
+        canonical: SequenceNotStr[str] | Omit = omit,
+        contact: SequenceNotStr[str] | Omit = omit,
+        enabled: bool | Omit = omit,
+        encryption: SequenceNotStr[str] | Omit = omit,
+        expires: Union[str, datetime] | Omit = omit,
+        hiring: SequenceNotStr[str] | Omit = omit,
+        policy: SequenceNotStr[str] | Omit = omit,
+        preferred_languages: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SecurityTXTUpdateResponse:
+        """
+        Updates security.txt
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/security-center/securitytxt",
+            body=await async_maybe_transform(
+                {
+                    "acknowledgments": acknowledgments,
+                    "canonical": canonical,
+                    "contact": contact,
+                    "enabled": enabled,
+                    "encryption": encryption,
+                    "expires": expires,
+                    "hiring": hiring,
+                    "policy": policy,
+                    "preferred_languages": preferred_languages,
+                },
+                security_txt_update_params.SecurityTXTUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SecurityTXTUpdateResponse,
+        )
+
+    async def delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SecurityTXTDeleteResponse:
+        """
+        Deletes security.txt
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._delete(
+            f"/zones/{zone_id}/security-center/securitytxt",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SecurityTXTDeleteResponse,
+        )
+
+    async def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SecurityTXTGetResponse]:
+        """
+        Retrieves security.txt
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/security-center/securitytxt",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SecurityTXTGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SecurityTXTGetResponse]], ResultWrapper[SecurityTXTGetResponse]),
+        )
+
+
+class SecurityTXTResourceWithRawResponse:
+    def __init__(self, security_txt: SecurityTXTResource) -> None:
+        self._security_txt = security_txt
+
+        self.update = to_raw_response_wrapper(
+            security_txt.update,
+        )
+        self.delete = to_raw_response_wrapper(
+            security_txt.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            security_txt.get,
+        )
+
+
+class AsyncSecurityTXTResourceWithRawResponse:
+    def __init__(self, security_txt: AsyncSecurityTXTResource) -> None:
+        self._security_txt = security_txt
+
+        self.update = async_to_raw_response_wrapper(
+            security_txt.update,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            security_txt.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            security_txt.get,
+        )
+
+
+class SecurityTXTResourceWithStreamingResponse:
+    def __init__(self, security_txt: SecurityTXTResource) -> None:
+        self._security_txt = security_txt
+
+        self.update = to_streamed_response_wrapper(
+            security_txt.update,
+        )
+        self.delete = to_streamed_response_wrapper(
+            security_txt.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            security_txt.get,
+        )
+
+
+class AsyncSecurityTXTResourceWithStreamingResponse:
+    def __init__(self, security_txt: AsyncSecurityTXTResource) -> None:
+        self._security_txt = security_txt
+
+        self.update = async_to_streamed_response_wrapper(
+            security_txt.update,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            security_txt.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            security_txt.get,
+        )
diff --git a/src/cloudflare/resources/snippets/content.py b/src/cloudflare/resources/snippets/content.py
index 562ba2647bd..be4473336d9 100644
--- a/src/cloudflare/resources/snippets/content.py
+++ b/src/cloudflare/resources/snippets/content.py
@@ -4,7 +4,7 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Query, Headers, NotGiven, not_given
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -25,10 +25,21 @@
 class ContentResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ContentResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ContentResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ContentResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ContentResourceWithStreamingResponse(self)
 
     def get(
@@ -41,15 +52,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> BinaryAPIResponse:
         """
-        Snippet Content
+        Fetches the content of a snippet belonging to the zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: The unique ID of the zone.
 
-          snippet_name: Snippet identifying name
+          snippet_name: The identifying name of the snippet.
 
           extra_headers: Send extra headers
 
@@ -76,10 +87,21 @@ def get(
 class AsyncContentResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncContentResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncContentResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncContentResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncContentResourceWithStreamingResponse(self)
 
     async def get(
@@ -92,15 +114,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncBinaryAPIResponse:
         """
-        Snippet Content
+        Fetches the content of a snippet belonging to the zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: The unique ID of the zone.
 
-          snippet_name: Snippet identifying name
+          snippet_name: The identifying name of the snippet.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/snippets/rules.py b/src/cloudflare/resources/snippets/rules.py
index 71d202e94fd..60f627b1c83 100644
--- a/src/cloudflare/resources/snippets/rules.py
+++ b/src/cloudflare/resources/snippets/rules.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Iterable, Optional, cast
+from typing import Iterable
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -19,11 +16,11 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._wrappers import ResultWrapper
 from ...pagination import SyncSinglePage, AsyncSinglePage
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.snippets import rule_update_params
 from ...types.snippets.rule_list_response import RuleListResponse
+from ...types.snippets.rule_delete_response import RuleDeleteResponse
 from ...types.snippets.rule_update_response import RuleUpdateResponse
 
 __all__ = ["RulesResource", "AsyncRulesResource"]
@@ -32,31 +29,42 @@
 class RulesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RulesResourceWithStreamingResponse(self)
 
     def update(
         self,
         *,
         zone_id: str,
-        rules: Iterable[rule_update_params.Rule] | NotGiven = NOT_GIVEN,
+        rules: Iterable[rule_update_params.Rule],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RuleUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[RuleUpdateResponse]:
         """
-        Put Rules
+        Updates all snippet rules belonging to the zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: The unique ID of the zone.
 
-          rules: List of snippet rules
+          rules: A list of snippet rules.
 
           extra_headers: Send extra headers
 
@@ -68,17 +76,15 @@ def update(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._put(
+        return self._get_api_list(
             f"/zones/{zone_id}/snippets/snippet_rules",
+            page=SyncSinglePage[RuleUpdateResponse],
             body=maybe_transform({"rules": rules}, rule_update_params.RuleUpdateParams),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RuleUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RuleUpdateResponse]], ResultWrapper[RuleUpdateResponse]),
+            model=RuleUpdateResponse,
+            method="put",
         )
 
     def list(
@@ -90,13 +96,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[RuleListResponse]:
         """
-        Rules
+        Fetches all snippet rules belonging to the zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: The unique ID of the zone.
 
           extra_headers: Send extra headers
 
@@ -117,35 +123,83 @@ def list(
             model=RuleListResponse,
         )
 
+    def delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[RuleDeleteResponse]:
+        """
+        Deletes all snippet rules belonging to the zone.
+
+        Args:
+          zone_id: The unique ID of the zone.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/snippets/snippet_rules",
+            page=SyncSinglePage[RuleDeleteResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=RuleDeleteResponse,
+            method="delete",
+        )
+
 
 class AsyncRulesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRulesResourceWithStreamingResponse(self)
 
-    async def update(
+    def update(
         self,
         *,
         zone_id: str,
-        rules: Iterable[rule_update_params.Rule] | NotGiven = NOT_GIVEN,
+        rules: Iterable[rule_update_params.Rule],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RuleUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[RuleUpdateResponse, AsyncSinglePage[RuleUpdateResponse]]:
         """
-        Put Rules
+        Updates all snippet rules belonging to the zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: The unique ID of the zone.
 
-          rules: List of snippet rules
+          rules: A list of snippet rules.
 
           extra_headers: Send extra headers
 
@@ -157,17 +211,15 @@ async def update(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._put(
+        return self._get_api_list(
             f"/zones/{zone_id}/snippets/snippet_rules",
-            body=await async_maybe_transform({"rules": rules}, rule_update_params.RuleUpdateParams),
+            page=AsyncSinglePage[RuleUpdateResponse],
+            body=maybe_transform({"rules": rules}, rule_update_params.RuleUpdateParams),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RuleUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RuleUpdateResponse]], ResultWrapper[RuleUpdateResponse]),
+            model=RuleUpdateResponse,
+            method="put",
         )
 
     def list(
@@ -179,13 +231,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[RuleListResponse, AsyncSinglePage[RuleListResponse]]:
         """
-        Rules
+        Fetches all snippet rules belonging to the zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: The unique ID of the zone.
 
           extra_headers: Send extra headers
 
@@ -206,6 +258,43 @@ def list(
             model=RuleListResponse,
         )
 
+    def delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[RuleDeleteResponse, AsyncSinglePage[RuleDeleteResponse]]:
+        """
+        Deletes all snippet rules belonging to the zone.
+
+        Args:
+          zone_id: The unique ID of the zone.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/snippets/snippet_rules",
+            page=AsyncSinglePage[RuleDeleteResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=RuleDeleteResponse,
+            method="delete",
+        )
+
 
 class RulesResourceWithRawResponse:
     def __init__(self, rules: RulesResource) -> None:
@@ -217,6 +306,9 @@ def __init__(self, rules: RulesResource) -> None:
         self.list = to_raw_response_wrapper(
             rules.list,
         )
+        self.delete = to_raw_response_wrapper(
+            rules.delete,
+        )
 
 
 class AsyncRulesResourceWithRawResponse:
@@ -229,6 +321,9 @@ def __init__(self, rules: AsyncRulesResource) -> None:
         self.list = async_to_raw_response_wrapper(
             rules.list,
         )
+        self.delete = async_to_raw_response_wrapper(
+            rules.delete,
+        )
 
 
 class RulesResourceWithStreamingResponse:
@@ -241,6 +336,9 @@ def __init__(self, rules: RulesResource) -> None:
         self.list = to_streamed_response_wrapper(
             rules.list,
         )
+        self.delete = to_streamed_response_wrapper(
+            rules.delete,
+        )
 
 
 class AsyncRulesResourceWithStreamingResponse:
@@ -253,3 +351,6 @@ def __init__(self, rules: AsyncRulesResource) -> None:
         self.list = async_to_streamed_response_wrapper(
             rules.list,
         )
+        self.delete = async_to_streamed_response_wrapper(
+            rules.delete,
+        )
diff --git a/src/cloudflare/resources/snippets/snippets.py b/src/cloudflare/resources/snippets/snippets.py
index b1633698058..aa40465dcb3 100644
--- a/src/cloudflare/resources/snippets/snippets.py
+++ b/src/cloudflare/resources/snippets/snippets.py
@@ -22,11 +22,8 @@
     ContentResourceWithStreamingResponse,
     AsyncContentResourceWithStreamingResponse,
 )
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -36,11 +33,13 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from ...pagination import SyncSinglePage, AsyncSinglePage
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ..._base_client import AsyncPaginator, make_request_options
-from ...types.snippets import snippet_update_params
-from ...types.snippets.snippet import Snippet
+from ...types.snippets import snippet_list_params, snippet_update_params
+from ...types.snippets.snippet_get_response import SnippetGetResponse
+from ...types.snippets.snippet_list_response import SnippetListResponse
 from ...types.snippets.snippet_delete_response import SnippetDeleteResponse
+from ...types.snippets.snippet_update_response import SnippetUpdateResponse
 
 __all__ = ["SnippetsResource", "AsyncSnippetsResource"]
 
@@ -56,10 +55,21 @@ def rules(self) -> RulesResource:
 
     @cached_property
     def with_raw_response(self) -> SnippetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SnippetsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SnippetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SnippetsResourceWithStreamingResponse(self)
 
     def update(
@@ -67,24 +77,23 @@ def update(
         snippet_name: str,
         *,
         zone_id: str,
-        files: str | NotGiven = NOT_GIVEN,
-        metadata: snippet_update_params.Metadata | NotGiven = NOT_GIVEN,
+        metadata: snippet_update_params.Metadata,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Snippet]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SnippetUpdateResponse:
         """
-        Put Snippet
+        Creates or updates a snippet belonging to the zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: The unique ID of the zone.
 
-          snippet_name: Snippet identifying name
+          snippet_name: The identifying name of the snippet.
 
-          files: Content files of uploaded snippet
+          metadata: Metadata about the snippet.
 
           extra_headers: Send extra headers
 
@@ -104,39 +113,40 @@ def update(
         extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
         return self._put(
             f"/zones/{zone_id}/snippets/{snippet_name}",
-            body=maybe_transform(
-                {
-                    "files": files,
-                    "metadata": metadata,
-                },
-                snippet_update_params.SnippetUpdateParams,
-            ),
+            body=maybe_transform({"metadata": metadata}, snippet_update_params.SnippetUpdateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Snippet]]._unwrapper,
+                multipart_syntax="json",
+                post_parser=ResultWrapper[SnippetUpdateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Snippet]], ResultWrapper[Snippet]),
+            cast_to=cast(Type[SnippetUpdateResponse], ResultWrapper[SnippetUpdateResponse]),
         )
 
     def list(
         self,
         *,
         zone_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[Snippet]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[SnippetListResponse]:
         """
-        All Snippets
+        Fetches all snippets belonging to the zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: The unique ID of the zone.
+
+          page: The current page number.
+
+          per_page: The number of results to return per page.
 
           extra_headers: Send extra headers
 
@@ -150,11 +160,21 @@ def list(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
             f"/zones/{zone_id}/snippets",
-            page=SyncSinglePage[Snippet],
+            page=SyncV4PagePaginationArray[SnippetListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    snippet_list_params.SnippetListParams,
+                ),
             ),
-            model=Snippet,
+            model=SnippetListResponse,
         )
 
     def delete(
@@ -167,15 +187,15 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SnippetDeleteResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
         """
-        Delete Snippet
+        Deletes a snippet belonging to the zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: The unique ID of the zone.
 
-          snippet_name: Snippet identifying name
+          snippet_name: The identifying name of the snippet.
 
           extra_headers: Send extra headers
 
@@ -192,9 +212,13 @@ def delete(
         return self._delete(
             f"/zones/{zone_id}/snippets/{snippet_name}",
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SnippetDeleteResponse]]._unwrapper,
             ),
-            cast_to=SnippetDeleteResponse,
+            cast_to=cast(Type[str], ResultWrapper[str]),
         )
 
     def get(
@@ -207,15 +231,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Snippet]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SnippetGetResponse:
         """
-        Snippet
+        Fetches a snippet belonging to the zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: The unique ID of the zone.
 
-          snippet_name: Snippet identifying name
+          snippet_name: The identifying name of the snippet.
 
           extra_headers: Send extra headers
 
@@ -236,9 +260,9 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Snippet]]._unwrapper,
+                post_parser=ResultWrapper[SnippetGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Snippet]], ResultWrapper[Snippet]),
+            cast_to=cast(Type[SnippetGetResponse], ResultWrapper[SnippetGetResponse]),
         )
 
 
@@ -253,10 +277,21 @@ def rules(self) -> AsyncRulesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncSnippetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSnippetsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSnippetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSnippetsResourceWithStreamingResponse(self)
 
     async def update(
@@ -264,24 +299,23 @@ async def update(
         snippet_name: str,
         *,
         zone_id: str,
-        files: str | NotGiven = NOT_GIVEN,
-        metadata: snippet_update_params.Metadata | NotGiven = NOT_GIVEN,
+        metadata: snippet_update_params.Metadata,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Snippet]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SnippetUpdateResponse:
         """
-        Put Snippet
+        Creates or updates a snippet belonging to the zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: The unique ID of the zone.
 
-          snippet_name: Snippet identifying name
+          snippet_name: The identifying name of the snippet.
 
-          files: Content files of uploaded snippet
+          metadata: Metadata about the snippet.
 
           extra_headers: Send extra headers
 
@@ -301,39 +335,40 @@ async def update(
         extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
         return await self._put(
             f"/zones/{zone_id}/snippets/{snippet_name}",
-            body=await async_maybe_transform(
-                {
-                    "files": files,
-                    "metadata": metadata,
-                },
-                snippet_update_params.SnippetUpdateParams,
-            ),
+            body=await async_maybe_transform({"metadata": metadata}, snippet_update_params.SnippetUpdateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Snippet]]._unwrapper,
+                multipart_syntax="json",
+                post_parser=ResultWrapper[SnippetUpdateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Snippet]], ResultWrapper[Snippet]),
+            cast_to=cast(Type[SnippetUpdateResponse], ResultWrapper[SnippetUpdateResponse]),
         )
 
     def list(
         self,
         *,
         zone_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[Snippet, AsyncSinglePage[Snippet]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SnippetListResponse, AsyncV4PagePaginationArray[SnippetListResponse]]:
         """
-        All Snippets
+        Fetches all snippets belonging to the zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: The unique ID of the zone.
+
+          page: The current page number.
+
+          per_page: The number of results to return per page.
 
           extra_headers: Send extra headers
 
@@ -347,11 +382,21 @@ def list(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
             f"/zones/{zone_id}/snippets",
-            page=AsyncSinglePage[Snippet],
+            page=AsyncV4PagePaginationArray[SnippetListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    snippet_list_params.SnippetListParams,
+                ),
             ),
-            model=Snippet,
+            model=SnippetListResponse,
         )
 
     async def delete(
@@ -364,15 +409,15 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SnippetDeleteResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
         """
-        Delete Snippet
+        Deletes a snippet belonging to the zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: The unique ID of the zone.
 
-          snippet_name: Snippet identifying name
+          snippet_name: The identifying name of the snippet.
 
           extra_headers: Send extra headers
 
@@ -389,9 +434,13 @@ async def delete(
         return await self._delete(
             f"/zones/{zone_id}/snippets/{snippet_name}",
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SnippetDeleteResponse]]._unwrapper,
             ),
-            cast_to=SnippetDeleteResponse,
+            cast_to=cast(Type[str], ResultWrapper[str]),
         )
 
     async def get(
@@ -404,15 +453,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Snippet]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SnippetGetResponse:
         """
-        Snippet
+        Fetches a snippet belonging to the zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: The unique ID of the zone.
 
-          snippet_name: Snippet identifying name
+          snippet_name: The identifying name of the snippet.
 
           extra_headers: Send extra headers
 
@@ -433,9 +482,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Snippet]]._unwrapper,
+                post_parser=ResultWrapper[SnippetGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Snippet]], ResultWrapper[Snippet]),
+            cast_to=cast(Type[SnippetGetResponse], ResultWrapper[SnippetGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/spectrum/analytics/aggregates/aggregates.py b/src/cloudflare/resources/spectrum/analytics/aggregates/aggregates.py
index 706b9766900..53919fb521e 100644
--- a/src/cloudflare/resources/spectrum/analytics/aggregates/aggregates.py
+++ b/src/cloudflare/resources/spectrum/analytics/aggregates/aggregates.py
@@ -23,10 +23,21 @@ def currents(self) -> CurrentsResource:
 
     @cached_property
     def with_raw_response(self) -> AggregatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AggregatesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AggregatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AggregatesResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def currents(self) -> AsyncCurrentsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncAggregatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAggregatesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAggregatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAggregatesResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/spectrum/analytics/aggregates/currents.py b/src/cloudflare/resources/spectrum/analytics/aggregates/currents.py
index 2829e3ac981..6d4e68dec73 100644
--- a/src/cloudflare/resources/spectrum/analytics/aggregates/currents.py
+++ b/src/cloudflare/resources/spectrum/analytics/aggregates/currents.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -30,35 +27,42 @@
 class CurrentsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> CurrentsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CurrentsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CurrentsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CurrentsResourceWithStreamingResponse(self)
 
     def get(
         self,
-        zone: str,
         *,
-        app_id_param: str | NotGiven = NOT_GIVEN,
-        app_id: str | NotGiven = NOT_GIVEN,
-        colo_name: str | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        app_id: str | Omit = omit,
+        colo_name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> CurrentGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CurrentGetResponse]:
         """
         Retrieves analytics aggregated from the last minute of usage on Spectrum
         applications underneath a given zone.
 
         Args:
-          zone: Identifier
-
-          app_id_param: Comma-delimited list of Spectrum Application Id(s). If provided, the response
-              will be limited to Spectrum Application Id(s) that match.
+          zone_id: Identifier.
 
           app_id: Comma-delimited list of Spectrum Application Id(s). If provided, the response
               will be limited to Spectrum Application Id(s) that match.
@@ -73,10 +77,10 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone:
-            raise ValueError(f"Expected a non-empty value for `zone` but received {zone!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get(
-            f"/zones/{zone}/spectrum/analytics/aggregate/current",
+            f"/zones/{zone_id}/spectrum/analytics/aggregate/current",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -84,50 +88,56 @@ def get(
                 timeout=timeout,
                 query=maybe_transform(
                     {
-                        "app_id_param": app_id_param,
                         "app_id": app_id,
                         "colo_name": colo_name,
                     },
                     current_get_params.CurrentGetParams,
                 ),
-                post_parser=ResultWrapper[CurrentGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[CurrentGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[CurrentGetResponse], ResultWrapper[CurrentGetResponse]),
+            cast_to=cast(Type[Optional[CurrentGetResponse]], ResultWrapper[CurrentGetResponse]),
         )
 
 
 class AsyncCurrentsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncCurrentsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCurrentsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCurrentsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCurrentsResourceWithStreamingResponse(self)
 
     async def get(
         self,
-        zone: str,
         *,
-        app_id_param: str | NotGiven = NOT_GIVEN,
-        app_id: str | NotGiven = NOT_GIVEN,
-        colo_name: str | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        app_id: str | Omit = omit,
+        colo_name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> CurrentGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CurrentGetResponse]:
         """
         Retrieves analytics aggregated from the last minute of usage on Spectrum
         applications underneath a given zone.
 
         Args:
-          zone: Identifier
-
-          app_id_param: Comma-delimited list of Spectrum Application Id(s). If provided, the response
-              will be limited to Spectrum Application Id(s) that match.
+          zone_id: Identifier.
 
           app_id: Comma-delimited list of Spectrum Application Id(s). If provided, the response
               will be limited to Spectrum Application Id(s) that match.
@@ -142,10 +152,10 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone:
-            raise ValueError(f"Expected a non-empty value for `zone` but received {zone!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return await self._get(
-            f"/zones/{zone}/spectrum/analytics/aggregate/current",
+            f"/zones/{zone_id}/spectrum/analytics/aggregate/current",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -153,15 +163,14 @@ async def get(
                 timeout=timeout,
                 query=await async_maybe_transform(
                     {
-                        "app_id_param": app_id_param,
                         "app_id": app_id,
                         "colo_name": colo_name,
                     },
                     current_get_params.CurrentGetParams,
                 ),
-                post_parser=ResultWrapper[CurrentGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[CurrentGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[CurrentGetResponse], ResultWrapper[CurrentGetResponse]),
+            cast_to=cast(Type[Optional[CurrentGetResponse]], ResultWrapper[CurrentGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/spectrum/analytics/analytics.py b/src/cloudflare/resources/spectrum/analytics/analytics.py
index 57e52bea702..c9dbd33f6b7 100644
--- a/src/cloudflare/resources/spectrum/analytics/analytics.py
+++ b/src/cloudflare/resources/spectrum/analytics/analytics.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .events import (
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .events.events import (
     EventsResource,
     AsyncEventsResource,
     EventsResourceWithRawResponse,
@@ -10,8 +12,7 @@
     EventsResourceWithStreamingResponse,
     AsyncEventsResourceWithStreamingResponse,
 )
-from ...._compat import cached_property
-from .aggregates import (
+from .aggregates.aggregates import (
     AggregatesResource,
     AsyncAggregatesResource,
     AggregatesResourceWithRawResponse,
@@ -19,9 +20,6 @@
     AggregatesResourceWithStreamingResponse,
     AsyncAggregatesResourceWithStreamingResponse,
 )
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from .events.events import EventsResource, AsyncEventsResource
-from .aggregates.aggregates import AggregatesResource, AsyncAggregatesResource
 
 __all__ = ["AnalyticsResource", "AsyncAnalyticsResource"]
 
@@ -37,10 +35,21 @@ def events(self) -> EventsResource:
 
     @cached_property
     def with_raw_response(self) -> AnalyticsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AnalyticsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AnalyticsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AnalyticsResourceWithStreamingResponse(self)
 
 
@@ -55,10 +64,21 @@ def events(self) -> AsyncEventsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncAnalyticsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAnalyticsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAnalyticsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAnalyticsResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/spectrum/analytics/events/bytimes.py b/src/cloudflare/resources/spectrum/analytics/events/bytimes.py
index 19ab3a93512..4eed5839911 100644
--- a/src/cloudflare/resources/spectrum/analytics/events/bytimes.py
+++ b/src/cloudflare/resources/spectrum/analytics/events/bytimes.py
@@ -2,17 +2,14 @@
 
 from __future__ import annotations
 
-from typing import Any, List, Union, Iterable, Optional, cast
+from typing import List, Type, Union, Optional, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -33,41 +30,53 @@
 class BytimesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> BytimesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return BytimesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> BytimesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return BytimesResourceWithStreamingResponse(self)
 
     def get(
         self,
-        zone: str,
         *,
-        dimensions: List[Dimension] | NotGiven = NOT_GIVEN,
-        filters: str | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        time_delta: Literal["year", "quarter", "month", "week", "day", "hour", "dekaminute", "minute"],
+        dimensions: List[Dimension] | Omit = omit,
+        filters: str | Omit = omit,
         metrics: List[
             Literal[
                 "count", "bytesIngress", "bytesEgress", "durationAvg", "durationMedian", "duration90th", "duration99th"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        sort: Iterable[object] | NotGiven = NOT_GIVEN,
-        time_delta: Literal["year", "quarter", "month", "week", "day", "hour", "dekaminute", "minute"]
-        | NotGiven = NOT_GIVEN,
-        until: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        since: Union[str, datetime] | Omit = omit,
+        sort: SequenceNotStr[str] | Omit = omit,
+        until: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[BytimeGetResponse]:
         """
         Retrieves a list of aggregate metrics grouped by time interval.
 
         Args:
-          zone: Identifier
+          zone_id: Identifier.
+
+          time_delta: Used to select time series resolution.
 
           dimensions:
               Can be used to break down the data by given attributes. Options are:
@@ -90,10 +99,10 @@ def get(
               | -------- | ------------------------ | ----------- |
               | ==       | Equals                   | %3D%3D      |
               | !=       | Does not equals          | !%3D        |
-              | >        | Greater Than             | %3E         |
-              | <        | Less Than                | %3C         |
-              | >=       | Greater than or equal to | %3E%3D      |
-              | <=       | Less than or equal to    | %3C%3D .    |
+              | \\>>       | Greater Than             | %3E         |
+              | \\<<       | Less Than                | %3C         |
+              | \\>>=      | Greater than or equal to | %3E%3D      |
+              | \\<<=      | Less than or equal to    | %3C%3D      |
 
           metrics:
               One or more metrics to compute. Options are:
@@ -114,8 +123,6 @@ def get(
           sort: The sort order for the result set; sort fields must be included in `metrics` or
               `dimensions`.
 
-          time_delta: Used to select time series resolution.
-
           until: End of time interval to query, defaults to current time. Timestamp must be in
               RFC3339 format and uses UTC unless otherwise specified.
 
@@ -127,76 +134,83 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone:
-            raise ValueError(f"Expected a non-empty value for `zone` but received {zone!r}")
-        return cast(
-            Optional[BytimeGetResponse],
-            self._get(
-                f"/zones/{zone}/spectrum/analytics/events/bytime",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    query=maybe_transform(
-                        {
-                            "dimensions": dimensions,
-                            "filters": filters,
-                            "metrics": metrics,
-                            "since": since,
-                            "sort": sort,
-                            "time_delta": time_delta,
-                            "until": until,
-                        },
-                        bytime_get_params.BytimeGetParams,
-                    ),
-                    post_parser=ResultWrapper[Optional[BytimeGetResponse]]._unwrapper,
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/spectrum/analytics/events/bytime",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "time_delta": time_delta,
+                        "dimensions": dimensions,
+                        "filters": filters,
+                        "metrics": metrics,
+                        "since": since,
+                        "sort": sort,
+                        "until": until,
+                    },
+                    bytime_get_params.BytimeGetParams,
                 ),
-                cast_to=cast(
-                    Any, ResultWrapper[BytimeGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+                post_parser=ResultWrapper[Optional[BytimeGetResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[BytimeGetResponse]], ResultWrapper[BytimeGetResponse]),
         )
 
 
 class AsyncBytimesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncBytimesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncBytimesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncBytimesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncBytimesResourceWithStreamingResponse(self)
 
     async def get(
         self,
-        zone: str,
         *,
-        dimensions: List[Dimension] | NotGiven = NOT_GIVEN,
-        filters: str | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        time_delta: Literal["year", "quarter", "month", "week", "day", "hour", "dekaminute", "minute"],
+        dimensions: List[Dimension] | Omit = omit,
+        filters: str | Omit = omit,
         metrics: List[
             Literal[
                 "count", "bytesIngress", "bytesEgress", "durationAvg", "durationMedian", "duration90th", "duration99th"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        sort: Iterable[object] | NotGiven = NOT_GIVEN,
-        time_delta: Literal["year", "quarter", "month", "week", "day", "hour", "dekaminute", "minute"]
-        | NotGiven = NOT_GIVEN,
-        until: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        since: Union[str, datetime] | Omit = omit,
+        sort: SequenceNotStr[str] | Omit = omit,
+        until: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[BytimeGetResponse]:
         """
         Retrieves a list of aggregate metrics grouped by time interval.
 
         Args:
-          zone: Identifier
+          zone_id: Identifier.
+
+          time_delta: Used to select time series resolution.
 
           dimensions:
               Can be used to break down the data by given attributes. Options are:
@@ -219,10 +233,10 @@ async def get(
               | -------- | ------------------------ | ----------- |
               | ==       | Equals                   | %3D%3D      |
               | !=       | Does not equals          | !%3D        |
-              | >        | Greater Than             | %3E         |
-              | <        | Less Than                | %3C         |
-              | >=       | Greater than or equal to | %3E%3D      |
-              | <=       | Less than or equal to    | %3C%3D .    |
+              | \\>>       | Greater Than             | %3E         |
+              | \\<<       | Less Than                | %3C         |
+              | \\>>=      | Greater than or equal to | %3E%3D      |
+              | \\<<=      | Less than or equal to    | %3C%3D      |
 
           metrics:
               One or more metrics to compute. Options are:
@@ -243,8 +257,6 @@ async def get(
           sort: The sort order for the result set; sort fields must be included in `metrics` or
               `dimensions`.
 
-          time_delta: Used to select time series resolution.
-
           until: End of time interval to query, defaults to current time. Timestamp must be in
               RFC3339 format and uses UTC unless otherwise specified.
 
@@ -256,35 +268,30 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone:
-            raise ValueError(f"Expected a non-empty value for `zone` but received {zone!r}")
-        return cast(
-            Optional[BytimeGetResponse],
-            await self._get(
-                f"/zones/{zone}/spectrum/analytics/events/bytime",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    query=await async_maybe_transform(
-                        {
-                            "dimensions": dimensions,
-                            "filters": filters,
-                            "metrics": metrics,
-                            "since": since,
-                            "sort": sort,
-                            "time_delta": time_delta,
-                            "until": until,
-                        },
-                        bytime_get_params.BytimeGetParams,
-                    ),
-                    post_parser=ResultWrapper[Optional[BytimeGetResponse]]._unwrapper,
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/spectrum/analytics/events/bytime",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "time_delta": time_delta,
+                        "dimensions": dimensions,
+                        "filters": filters,
+                        "metrics": metrics,
+                        "since": since,
+                        "sort": sort,
+                        "until": until,
+                    },
+                    bytime_get_params.BytimeGetParams,
                 ),
-                cast_to=cast(
-                    Any, ResultWrapper[BytimeGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+                post_parser=ResultWrapper[Optional[BytimeGetResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[BytimeGetResponse]], ResultWrapper[BytimeGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/spectrum/analytics/events/events.py b/src/cloudflare/resources/spectrum/analytics/events/events.py
index de874362abb..e0a692e82f7 100644
--- a/src/cloudflare/resources/spectrum/analytics/events/events.py
+++ b/src/cloudflare/resources/spectrum/analytics/events/events.py
@@ -35,10 +35,21 @@ def summaries(self) -> SummariesResource:
 
     @cached_property
     def with_raw_response(self) -> EventsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return EventsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> EventsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return EventsResourceWithStreamingResponse(self)
 
 
@@ -53,10 +64,21 @@ def summaries(self) -> AsyncSummariesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncEventsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncEventsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncEventsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncEventsResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/spectrum/analytics/events/summaries.py b/src/cloudflare/resources/spectrum/analytics/events/summaries.py
index 1b11361a151..8c66f98dad7 100644
--- a/src/cloudflare/resources/spectrum/analytics/events/summaries.py
+++ b/src/cloudflare/resources/spectrum/analytics/events/summaries.py
@@ -2,17 +2,14 @@
 
 from __future__ import annotations
 
-from typing import Any, List, Union, Iterable, Optional, cast
+from typing import List, Type, Union, Optional, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -33,39 +30,50 @@
 class SummariesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SummariesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SummariesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SummariesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SummariesResourceWithStreamingResponse(self)
 
     def get(
         self,
-        zone: str,
         *,
-        dimensions: List[Dimension] | NotGiven = NOT_GIVEN,
-        filters: str | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        dimensions: List[Dimension] | Omit = omit,
+        filters: str | Omit = omit,
         metrics: List[
             Literal[
                 "count", "bytesIngress", "bytesEgress", "durationAvg", "durationMedian", "duration90th", "duration99th"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        sort: Iterable[object] | NotGiven = NOT_GIVEN,
-        until: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        since: Union[str, datetime] | Omit = omit,
+        sort: SequenceNotStr[str] | Omit = omit,
+        until: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SummaryGetResponse]:
         """
         Retrieves a list of summarised aggregate metrics over a given time period.
 
         Args:
-          zone: Identifier
+          zone_id: Identifier.
 
           dimensions:
               Can be used to break down the data by given attributes. Options are:
@@ -88,10 +96,10 @@ def get(
               | -------- | ------------------------ | ----------- |
               | ==       | Equals                   | %3D%3D      |
               | !=       | Does not equals          | !%3D        |
-              | >        | Greater Than             | %3E         |
-              | <        | Less Than                | %3C         |
-              | >=       | Greater than or equal to | %3E%3D      |
-              | <=       | Less than or equal to    | %3C%3D .    |
+              | \\>>       | Greater Than             | %3E         |
+              | \\<<       | Less Than                | %3C         |
+              | \\>>=      | Greater than or equal to | %3E%3D      |
+              | \\<<=      | Less than or equal to    | %3C%3D      |
 
           metrics:
               One or more metrics to compute. Options are:
@@ -123,73 +131,79 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone:
-            raise ValueError(f"Expected a non-empty value for `zone` but received {zone!r}")
-        return cast(
-            Optional[SummaryGetResponse],
-            self._get(
-                f"/zones/{zone}/spectrum/analytics/events/summary",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    query=maybe_transform(
-                        {
-                            "dimensions": dimensions,
-                            "filters": filters,
-                            "metrics": metrics,
-                            "since": since,
-                            "sort": sort,
-                            "until": until,
-                        },
-                        summary_get_params.SummaryGetParams,
-                    ),
-                    post_parser=ResultWrapper[Optional[SummaryGetResponse]]._unwrapper,
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/spectrum/analytics/events/summary",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "dimensions": dimensions,
+                        "filters": filters,
+                        "metrics": metrics,
+                        "since": since,
+                        "sort": sort,
+                        "until": until,
+                    },
+                    summary_get_params.SummaryGetParams,
                 ),
-                cast_to=cast(
-                    Any, ResultWrapper[SummaryGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+                post_parser=ResultWrapper[Optional[SummaryGetResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[SummaryGetResponse]], ResultWrapper[SummaryGetResponse]),
         )
 
 
 class AsyncSummariesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSummariesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSummariesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSummariesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSummariesResourceWithStreamingResponse(self)
 
     async def get(
         self,
-        zone: str,
         *,
-        dimensions: List[Dimension] | NotGiven = NOT_GIVEN,
-        filters: str | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        dimensions: List[Dimension] | Omit = omit,
+        filters: str | Omit = omit,
         metrics: List[
             Literal[
                 "count", "bytesIngress", "bytesEgress", "durationAvg", "durationMedian", "duration90th", "duration99th"
             ]
         ]
-        | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        sort: Iterable[object] | NotGiven = NOT_GIVEN,
-        until: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        since: Union[str, datetime] | Omit = omit,
+        sort: SequenceNotStr[str] | Omit = omit,
+        until: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SummaryGetResponse]:
         """
         Retrieves a list of summarised aggregate metrics over a given time period.
 
         Args:
-          zone: Identifier
+          zone_id: Identifier.
 
           dimensions:
               Can be used to break down the data by given attributes. Options are:
@@ -212,10 +226,10 @@ async def get(
               | -------- | ------------------------ | ----------- |
               | ==       | Equals                   | %3D%3D      |
               | !=       | Does not equals          | !%3D        |
-              | >        | Greater Than             | %3E         |
-              | <        | Less Than                | %3C         |
-              | >=       | Greater than or equal to | %3E%3D      |
-              | <=       | Less than or equal to    | %3C%3D .    |
+              | \\>>       | Greater Than             | %3E         |
+              | \\<<       | Less Than                | %3C         |
+              | \\>>=      | Greater than or equal to | %3E%3D      |
+              | \\<<=      | Less than or equal to    | %3C%3D      |
 
           metrics:
               One or more metrics to compute. Options are:
@@ -247,34 +261,29 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone:
-            raise ValueError(f"Expected a non-empty value for `zone` but received {zone!r}")
-        return cast(
-            Optional[SummaryGetResponse],
-            await self._get(
-                f"/zones/{zone}/spectrum/analytics/events/summary",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    query=await async_maybe_transform(
-                        {
-                            "dimensions": dimensions,
-                            "filters": filters,
-                            "metrics": metrics,
-                            "since": since,
-                            "sort": sort,
-                            "until": until,
-                        },
-                        summary_get_params.SummaryGetParams,
-                    ),
-                    post_parser=ResultWrapper[Optional[SummaryGetResponse]]._unwrapper,
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/spectrum/analytics/events/summary",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "dimensions": dimensions,
+                        "filters": filters,
+                        "metrics": metrics,
+                        "since": since,
+                        "sort": sort,
+                        "until": until,
+                    },
+                    summary_get_params.SummaryGetParams,
                 ),
-                cast_to=cast(
-                    Any, ResultWrapper[SummaryGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+                post_parser=ResultWrapper[Optional[SummaryGetResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[SummaryGetResponse]], ResultWrapper[SummaryGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/spectrum/apps.py b/src/cloudflare/resources/spectrum/apps.py
index d27fa0e0774..9929256776c 100644
--- a/src/cloudflare/resources/spectrum/apps.py
+++ b/src/cloudflare/resources/spectrum/apps.py
@@ -3,15 +3,12 @@
 from __future__ import annotations
 
 from typing import Any, Type, Optional, cast
-from typing_extensions import Literal
+from typing_extensions import Literal, overload
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -28,6 +25,7 @@
 from ...types.spectrum.edge_ips_param import EdgeIPsParam
 from ...types.spectrum.app_get_response import AppGetResponse
 from ...types.spectrum.origin_dns_param import OriginDNSParam
+from ...types.spectrum.app_list_response import AppListResponse
 from ...types.spectrum.origin_port_param import OriginPortParam
 from ...types.spectrum.app_create_response import AppCreateResponse
 from ...types.spectrum.app_delete_response import AppDeleteResponse
@@ -39,53 +37,64 @@
 class AppsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AppsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AppsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AppsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AppsResourceWithStreamingResponse(self)
 
+    @overload
     def create(
         self,
-        zone: str,
         *,
+        zone_id: str,
         dns: DNSParam,
-        origin_dns: OriginDNSParam,
-        origin_port: OriginPortParam,
         protocol: str,
-        argo_smart_routing: bool | NotGiven = NOT_GIVEN,
-        edge_ips: EdgeIPsParam | NotGiven = NOT_GIVEN,
-        ip_firewall: bool | NotGiven = NOT_GIVEN,
-        proxy_protocol: Literal["off", "v1", "v2", "simple"] | NotGiven = NOT_GIVEN,
-        tls: Literal["off", "flexible", "full", "strict"] | NotGiven = NOT_GIVEN,
-        traffic_type: Literal["direct", "http", "https"] | NotGiven = NOT_GIVEN,
+        traffic_type: Literal["direct", "http", "https"],
+        argo_smart_routing: bool | Omit = omit,
+        edge_ips: EdgeIPsParam | Omit = omit,
+        ip_firewall: bool | Omit = omit,
+        origin_direct: SequenceNotStr[str] | Omit = omit,
+        origin_dns: OriginDNSParam | Omit = omit,
+        origin_port: OriginPortParam | Omit = omit,
+        proxy_protocol: Literal["off", "v1", "v2", "simple"] | Omit = omit,
+        tls: Literal["off", "flexible", "full", "strict"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AppCreateResponse]:
         """
         Creates a new Spectrum application from a configuration using a name for the
         origin.
 
         Args:
-          zone: Identifier
+          zone_id: Zone identifier.
 
           dns: The name and type of DNS record for the Spectrum application.
 
-          origin_dns: The name and type of DNS record for the Spectrum application.
-
-          origin_port: The destination port at the origin. Only specified in conjunction with
-              origin_dns. May use an integer to specify a single origin port, for example
-              `1000`, or a string to specify a range of origin ports, for example
-              `"1000-2000"`. Notes: If specifying a port range, the number of ports in the
-              range must match the number of ports specified in the "protocol" field.
-
-          protocol: The port configuration at Cloudflare’s edge. May specify a single port, for
+          protocol: The port configuration at Cloudflare's edge. May specify a single port, for
               example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
 
+          traffic_type: Determines how data travels from the edge to your origin. When set to "direct",
+              Spectrum will send traffic directly to your origin, and the application's type
+              is derived from the `protocol`. When set to "http" or "https", Spectrum will
+              apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and
+              the application type matches this property exactly.
+
           argo_smart_routing: Enables Argo Smart Routing for this application. Notes: Only available for TCP
               applications with traffic_type set to "direct".
 
@@ -94,6 +103,17 @@ def create(
           ip_firewall: Enables IP Access Rules for this application. Notes: Only available for TCP
               applications.
 
+          origin_direct: List of origin IP addresses. Array may contain multiple IP addresses for load
+              balancing.
+
+          origin_dns: The name and type of DNS record for the Spectrum application.
+
+          origin_port: The destination port at the origin. Only specified in conjunction with
+              origin_dns. May use an integer to specify a single origin port, for example
+              `1000`, or a string to specify a range of origin ports, for example
+              `"1000-2000"`. Notes: If specifying a port range, the number of ports in the
+              range must match the number of ports specified in the "protocol" field.
+
           proxy_protocol: Enables Proxy Protocol to the origin. Refer to
               [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/)
               for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple
@@ -101,11 +121,45 @@ def create(
 
           tls: The type of TLS termination associated with the application.
 
-          traffic_type: Determines how data travels from the edge to your origin. When set to "direct",
-              Spectrum will send traffic directly to your origin, and the application's type
-              is derived from the `protocol`. When set to "http" or "https", Spectrum will
-              apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and
-              the application type matches this property exactly.
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        *,
+        zone_id: str,
+        dns: DNSParam,
+        protocol: str,
+        origin_direct: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AppCreateResponse]:
+        """
+        Creates a new Spectrum application from a configuration using a name for the
+        origin.
+
+        Args:
+          zone_id: Zone identifier.
+
+          dns: The name and type of DNS record for the Spectrum application.
+
+          protocol: The port configuration at Cloudflare's edge. May specify a single port, for
+              example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
+
+          origin_direct: List of origin IP addresses. Array may contain multiple IP addresses for load
+              balancing.
 
           extra_headers: Send extra headers
 
@@ -115,79 +169,110 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone:
-            raise ValueError(f"Expected a non-empty value for `zone` but received {zone!r}")
-        return self._post(
-            f"/zones/{zone}/spectrum/apps",
-            body=maybe_transform(
-                {
-                    "dns": dns,
-                    "origin_dns": origin_dns,
-                    "origin_port": origin_port,
-                    "protocol": protocol,
-                    "argo_smart_routing": argo_smart_routing,
-                    "edge_ips": edge_ips,
-                    "ip_firewall": ip_firewall,
-                    "proxy_protocol": proxy_protocol,
-                    "tls": tls,
-                    "traffic_type": traffic_type,
-                },
-                app_create_params.AppCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[AppCreateResponse]]._unwrapper,
+        ...
+
+    @required_args(["zone_id", "dns", "protocol", "traffic_type"], ["zone_id", "dns", "protocol"])
+    def create(
+        self,
+        *,
+        zone_id: str,
+        dns: DNSParam,
+        protocol: str,
+        traffic_type: Literal["direct", "http", "https"] | Omit = omit,
+        argo_smart_routing: bool | Omit = omit,
+        edge_ips: EdgeIPsParam | Omit = omit,
+        ip_firewall: bool | Omit = omit,
+        origin_direct: SequenceNotStr[str] | Omit = omit,
+        origin_dns: OriginDNSParam | Omit = omit,
+        origin_port: OriginPortParam | Omit = omit,
+        proxy_protocol: Literal["off", "v1", "v2", "simple"] | Omit = omit,
+        tls: Literal["off", "flexible", "full", "strict"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AppCreateResponse]:
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return cast(
+            Optional[AppCreateResponse],
+            self._post(
+                f"/zones/{zone_id}/spectrum/apps",
+                body=maybe_transform(
+                    {
+                        "dns": dns,
+                        "protocol": protocol,
+                        "traffic_type": traffic_type,
+                        "argo_smart_routing": argo_smart_routing,
+                        "edge_ips": edge_ips,
+                        "ip_firewall": ip_firewall,
+                        "origin_direct": origin_direct,
+                        "origin_dns": origin_dns,
+                        "origin_port": origin_port,
+                        "proxy_protocol": proxy_protocol,
+                        "tls": tls,
+                    },
+                    app_create_params.AppCreateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[AppCreateResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[AppCreateResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[AppCreateResponse]], ResultWrapper[AppCreateResponse]),
         )
 
+    @overload
     def update(
         self,
         app_id: str,
         *,
-        zone: str,
+        zone_id: str,
         dns: DNSParam,
-        origin_dns: OriginDNSParam,
-        origin_port: OriginPortParam,
         protocol: str,
-        argo_smart_routing: bool | NotGiven = NOT_GIVEN,
-        edge_ips: EdgeIPsParam | NotGiven = NOT_GIVEN,
-        ip_firewall: bool | NotGiven = NOT_GIVEN,
-        proxy_protocol: Literal["off", "v1", "v2", "simple"] | NotGiven = NOT_GIVEN,
-        tls: Literal["off", "flexible", "full", "strict"] | NotGiven = NOT_GIVEN,
-        traffic_type: Literal["direct", "http", "https"] | NotGiven = NOT_GIVEN,
+        traffic_type: Literal["direct", "http", "https"],
+        argo_smart_routing: bool | Omit = omit,
+        edge_ips: EdgeIPsParam | Omit = omit,
+        ip_firewall: bool | Omit = omit,
+        origin_direct: SequenceNotStr[str] | Omit = omit,
+        origin_dns: OriginDNSParam | Omit = omit,
+        origin_port: OriginPortParam | Omit = omit,
+        proxy_protocol: Literal["off", "v1", "v2", "simple"] | Omit = omit,
+        tls: Literal["off", "flexible", "full", "strict"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AppUpdateResponse]:
         """
         Updates a previously existing application's configuration that uses a name for
         the origin.
 
         Args:
-          zone: Identifier
+          zone_id: Zone identifier.
 
-          app_id: Application identifier.
+          app_id: App identifier.
 
           dns: The name and type of DNS record for the Spectrum application.
 
-          origin_dns: The name and type of DNS record for the Spectrum application.
-
-          origin_port: The destination port at the origin. Only specified in conjunction with
-              origin_dns. May use an integer to specify a single origin port, for example
-              `1000`, or a string to specify a range of origin ports, for example
-              `"1000-2000"`. Notes: If specifying a port range, the number of ports in the
-              range must match the number of ports specified in the "protocol" field.
-
-          protocol: The port configuration at Cloudflare’s edge. May specify a single port, for
+          protocol: The port configuration at Cloudflare's edge. May specify a single port, for
               example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
 
+          traffic_type: Determines how data travels from the edge to your origin. When set to "direct",
+              Spectrum will send traffic directly to your origin, and the application's type
+              is derived from the `protocol`. When set to "http" or "https", Spectrum will
+              apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and
+              the application type matches this property exactly.
+
           argo_smart_routing: Enables Argo Smart Routing for this application. Notes: Only available for TCP
               applications with traffic_type set to "direct".
 
@@ -196,6 +281,17 @@ def update(
           ip_firewall: Enables IP Access Rules for this application. Notes: Only available for TCP
               applications.
 
+          origin_direct: List of origin IP addresses. Array may contain multiple IP addresses for load
+              balancing.
+
+          origin_dns: The name and type of DNS record for the Spectrum application.
+
+          origin_port: The destination port at the origin. Only specified in conjunction with
+              origin_dns. May use an integer to specify a single origin port, for example
+              `1000`, or a string to specify a range of origin ports, for example
+              `"1000-2000"`. Notes: If specifying a port range, the number of ports in the
+              range must match the number of ports specified in the "protocol" field.
+
           proxy_protocol: Enables Proxy Protocol to the origin. Refer to
               [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/)
               for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple
@@ -203,11 +299,48 @@ def update(
 
           tls: The type of TLS termination associated with the application.
 
-          traffic_type: Determines how data travels from the edge to your origin. When set to "direct",
-              Spectrum will send traffic directly to your origin, and the application's type
-              is derived from the `protocol`. When set to "http" or "https", Spectrum will
-              apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and
-              the application type matches this property exactly.
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def update(
+        self,
+        app_id: str,
+        *,
+        zone_id: str,
+        dns: DNSParam,
+        protocol: str,
+        origin_direct: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AppUpdateResponse]:
+        """
+        Updates a previously existing application's configuration that uses a name for
+        the origin.
+
+        Args:
+          zone_id: Zone identifier.
+
+          app_id: App identifier.
+
+          dns: The name and type of DNS record for the Spectrum application.
+
+          protocol: The port configuration at Cloudflare's edge. May specify a single port, for
+              example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
+
+          origin_direct: List of origin IP addresses. Array may contain multiple IP addresses for load
+              balancing.
 
           extra_headers: Send extra headers
 
@@ -217,57 +350,89 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone:
-            raise ValueError(f"Expected a non-empty value for `zone` but received {zone!r}")
+        ...
+
+    @required_args(["zone_id", "dns", "protocol", "traffic_type"], ["zone_id", "dns", "protocol"])
+    def update(
+        self,
+        app_id: str,
+        *,
+        zone_id: str,
+        dns: DNSParam,
+        protocol: str,
+        traffic_type: Literal["direct", "http", "https"] | Omit = omit,
+        argo_smart_routing: bool | Omit = omit,
+        edge_ips: EdgeIPsParam | Omit = omit,
+        ip_firewall: bool | Omit = omit,
+        origin_direct: SequenceNotStr[str] | Omit = omit,
+        origin_dns: OriginDNSParam | Omit = omit,
+        origin_port: OriginPortParam | Omit = omit,
+        proxy_protocol: Literal["off", "v1", "v2", "simple"] | Omit = omit,
+        tls: Literal["off", "flexible", "full", "strict"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AppUpdateResponse]:
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not app_id:
             raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
-        return self._put(
-            f"/zones/{zone}/spectrum/apps/{app_id}",
-            body=maybe_transform(
-                {
-                    "dns": dns,
-                    "origin_dns": origin_dns,
-                    "origin_port": origin_port,
-                    "protocol": protocol,
-                    "argo_smart_routing": argo_smart_routing,
-                    "edge_ips": edge_ips,
-                    "ip_firewall": ip_firewall,
-                    "proxy_protocol": proxy_protocol,
-                    "tls": tls,
-                    "traffic_type": traffic_type,
-                },
-                app_update_params.AppUpdateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[AppUpdateResponse]]._unwrapper,
+        return cast(
+            Optional[AppUpdateResponse],
+            self._put(
+                f"/zones/{zone_id}/spectrum/apps/{app_id}",
+                body=maybe_transform(
+                    {
+                        "dns": dns,
+                        "protocol": protocol,
+                        "traffic_type": traffic_type,
+                        "argo_smart_routing": argo_smart_routing,
+                        "edge_ips": edge_ips,
+                        "ip_firewall": ip_firewall,
+                        "origin_direct": origin_direct,
+                        "origin_dns": origin_dns,
+                        "origin_port": origin_port,
+                        "proxy_protocol": proxy_protocol,
+                        "tls": tls,
+                    },
+                    app_update_params.AppUpdateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[AppUpdateResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[AppUpdateResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[AppUpdateResponse]], ResultWrapper[AppUpdateResponse]),
         )
 
     def list(
         self,
-        zone: str,
         *,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        order: Literal["protocol", "app_id", "created_on", "modified_on", "dns"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        order: Literal["protocol", "app_id", "created_on", "modified_on", "dns"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePaginationArray[object]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[AppListResponse]:
         """
         Retrieves a list of currently existing Spectrum applications inside a zone.
 
         Args:
-          zone: Identifier
+          zone_id: Zone identifier.
 
           direction: Sets the direction by which results are ordered.
 
@@ -287,11 +452,11 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone:
-            raise ValueError(f"Expected a non-empty value for `zone` but received {zone!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone}/spectrum/apps",
-            page=SyncV4PagePaginationArray[object],
+            f"/zones/{zone_id}/spectrum/apps",
+            page=SyncV4PagePaginationArray[AppListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -307,28 +472,28 @@ def list(
                     app_list_params.AppListParams,
                 ),
             ),
-            model=object,
+            model=cast(Any, AppListResponse),  # Union types cannot be passed in as arguments in the type system
         )
 
     def delete(
         self,
         app_id: str,
         *,
-        zone: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AppDeleteResponse]:
         """
         Deletes a previously existing application.
 
         Args:
-          zone: Identifier
+          zone_id: Zone identifier.
 
-          app_id: Application identifier.
+          app_id: App identifier.
 
           extra_headers: Send extra headers
 
@@ -338,12 +503,12 @@ def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone:
-            raise ValueError(f"Expected a non-empty value for `zone` but received {zone!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not app_id:
             raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
         return self._delete(
-            f"/zones/{zone}/spectrum/apps/{app_id}",
+            f"/zones/{zone_id}/spectrum/apps/{app_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -358,21 +523,21 @@ def get(
         self,
         app_id: str,
         *,
-        zone: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AppGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AppGetResponse]:
         """
         Gets the application configuration of a specific application inside a zone.
 
         Args:
-          zone: Identifier
+          zone_id: Zone identifier.
 
-          app_id: Application identifier.
+          app_id: App identifier.
 
           extra_headers: Send extra headers
 
@@ -382,20 +547,20 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone:
-            raise ValueError(f"Expected a non-empty value for `zone` but received {zone!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not app_id:
             raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
         return cast(
-            AppGetResponse,
+            Optional[AppGetResponse],
             self._get(
-                f"/zones/{zone}/spectrum/apps/{app_id}",
+                f"/zones/{zone_id}/spectrum/apps/{app_id}",
                 options=make_request_options(
                     extra_headers=extra_headers,
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[AppGetResponse]._unwrapper,
+                    post_parser=ResultWrapper[Optional[AppGetResponse]]._unwrapper,
                 ),
                 cast_to=cast(
                     Any, ResultWrapper[AppGetResponse]
@@ -407,53 +572,64 @@ def get(
 class AsyncAppsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncAppsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAppsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAppsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAppsResourceWithStreamingResponse(self)
 
+    @overload
     async def create(
         self,
-        zone: str,
         *,
+        zone_id: str,
         dns: DNSParam,
-        origin_dns: OriginDNSParam,
-        origin_port: OriginPortParam,
         protocol: str,
-        argo_smart_routing: bool | NotGiven = NOT_GIVEN,
-        edge_ips: EdgeIPsParam | NotGiven = NOT_GIVEN,
-        ip_firewall: bool | NotGiven = NOT_GIVEN,
-        proxy_protocol: Literal["off", "v1", "v2", "simple"] | NotGiven = NOT_GIVEN,
-        tls: Literal["off", "flexible", "full", "strict"] | NotGiven = NOT_GIVEN,
-        traffic_type: Literal["direct", "http", "https"] | NotGiven = NOT_GIVEN,
+        traffic_type: Literal["direct", "http", "https"],
+        argo_smart_routing: bool | Omit = omit,
+        edge_ips: EdgeIPsParam | Omit = omit,
+        ip_firewall: bool | Omit = omit,
+        origin_direct: SequenceNotStr[str] | Omit = omit,
+        origin_dns: OriginDNSParam | Omit = omit,
+        origin_port: OriginPortParam | Omit = omit,
+        proxy_protocol: Literal["off", "v1", "v2", "simple"] | Omit = omit,
+        tls: Literal["off", "flexible", "full", "strict"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AppCreateResponse]:
         """
         Creates a new Spectrum application from a configuration using a name for the
         origin.
 
         Args:
-          zone: Identifier
+          zone_id: Zone identifier.
 
           dns: The name and type of DNS record for the Spectrum application.
 
-          origin_dns: The name and type of DNS record for the Spectrum application.
-
-          origin_port: The destination port at the origin. Only specified in conjunction with
-              origin_dns. May use an integer to specify a single origin port, for example
-              `1000`, or a string to specify a range of origin ports, for example
-              `"1000-2000"`. Notes: If specifying a port range, the number of ports in the
-              range must match the number of ports specified in the "protocol" field.
-
-          protocol: The port configuration at Cloudflare’s edge. May specify a single port, for
+          protocol: The port configuration at Cloudflare's edge. May specify a single port, for
               example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
 
+          traffic_type: Determines how data travels from the edge to your origin. When set to "direct",
+              Spectrum will send traffic directly to your origin, and the application's type
+              is derived from the `protocol`. When set to "http" or "https", Spectrum will
+              apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and
+              the application type matches this property exactly.
+
           argo_smart_routing: Enables Argo Smart Routing for this application. Notes: Only available for TCP
               applications with traffic_type set to "direct".
 
@@ -462,6 +638,17 @@ async def create(
           ip_firewall: Enables IP Access Rules for this application. Notes: Only available for TCP
               applications.
 
+          origin_direct: List of origin IP addresses. Array may contain multiple IP addresses for load
+              balancing.
+
+          origin_dns: The name and type of DNS record for the Spectrum application.
+
+          origin_port: The destination port at the origin. Only specified in conjunction with
+              origin_dns. May use an integer to specify a single origin port, for example
+              `1000`, or a string to specify a range of origin ports, for example
+              `"1000-2000"`. Notes: If specifying a port range, the number of ports in the
+              range must match the number of ports specified in the "protocol" field.
+
           proxy_protocol: Enables Proxy Protocol to the origin. Refer to
               [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/)
               for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple
@@ -469,11 +656,45 @@ async def create(
 
           tls: The type of TLS termination associated with the application.
 
-          traffic_type: Determines how data travels from the edge to your origin. When set to "direct",
-              Spectrum will send traffic directly to your origin, and the application's type
-              is derived from the `protocol`. When set to "http" or "https", Spectrum will
-              apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and
-              the application type matches this property exactly.
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        dns: DNSParam,
+        protocol: str,
+        origin_direct: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AppCreateResponse]:
+        """
+        Creates a new Spectrum application from a configuration using a name for the
+        origin.
+
+        Args:
+          zone_id: Zone identifier.
+
+          dns: The name and type of DNS record for the Spectrum application.
+
+          protocol: The port configuration at Cloudflare's edge. May specify a single port, for
+              example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
+
+          origin_direct: List of origin IP addresses. Array may contain multiple IP addresses for load
+              balancing.
 
           extra_headers: Send extra headers
 
@@ -483,79 +704,110 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone:
-            raise ValueError(f"Expected a non-empty value for `zone` but received {zone!r}")
-        return await self._post(
-            f"/zones/{zone}/spectrum/apps",
-            body=await async_maybe_transform(
-                {
-                    "dns": dns,
-                    "origin_dns": origin_dns,
-                    "origin_port": origin_port,
-                    "protocol": protocol,
-                    "argo_smart_routing": argo_smart_routing,
-                    "edge_ips": edge_ips,
-                    "ip_firewall": ip_firewall,
-                    "proxy_protocol": proxy_protocol,
-                    "tls": tls,
-                    "traffic_type": traffic_type,
-                },
-                app_create_params.AppCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[AppCreateResponse]]._unwrapper,
+        ...
+
+    @required_args(["zone_id", "dns", "protocol", "traffic_type"], ["zone_id", "dns", "protocol"])
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        dns: DNSParam,
+        protocol: str,
+        traffic_type: Literal["direct", "http", "https"] | Omit = omit,
+        argo_smart_routing: bool | Omit = omit,
+        edge_ips: EdgeIPsParam | Omit = omit,
+        ip_firewall: bool | Omit = omit,
+        origin_direct: SequenceNotStr[str] | Omit = omit,
+        origin_dns: OriginDNSParam | Omit = omit,
+        origin_port: OriginPortParam | Omit = omit,
+        proxy_protocol: Literal["off", "v1", "v2", "simple"] | Omit = omit,
+        tls: Literal["off", "flexible", "full", "strict"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AppCreateResponse]:
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return cast(
+            Optional[AppCreateResponse],
+            await self._post(
+                f"/zones/{zone_id}/spectrum/apps",
+                body=await async_maybe_transform(
+                    {
+                        "dns": dns,
+                        "protocol": protocol,
+                        "traffic_type": traffic_type,
+                        "argo_smart_routing": argo_smart_routing,
+                        "edge_ips": edge_ips,
+                        "ip_firewall": ip_firewall,
+                        "origin_direct": origin_direct,
+                        "origin_dns": origin_dns,
+                        "origin_port": origin_port,
+                        "proxy_protocol": proxy_protocol,
+                        "tls": tls,
+                    },
+                    app_create_params.AppCreateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[AppCreateResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[AppCreateResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[AppCreateResponse]], ResultWrapper[AppCreateResponse]),
         )
 
+    @overload
     async def update(
         self,
         app_id: str,
         *,
-        zone: str,
+        zone_id: str,
         dns: DNSParam,
-        origin_dns: OriginDNSParam,
-        origin_port: OriginPortParam,
         protocol: str,
-        argo_smart_routing: bool | NotGiven = NOT_GIVEN,
-        edge_ips: EdgeIPsParam | NotGiven = NOT_GIVEN,
-        ip_firewall: bool | NotGiven = NOT_GIVEN,
-        proxy_protocol: Literal["off", "v1", "v2", "simple"] | NotGiven = NOT_GIVEN,
-        tls: Literal["off", "flexible", "full", "strict"] | NotGiven = NOT_GIVEN,
-        traffic_type: Literal["direct", "http", "https"] | NotGiven = NOT_GIVEN,
+        traffic_type: Literal["direct", "http", "https"],
+        argo_smart_routing: bool | Omit = omit,
+        edge_ips: EdgeIPsParam | Omit = omit,
+        ip_firewall: bool | Omit = omit,
+        origin_direct: SequenceNotStr[str] | Omit = omit,
+        origin_dns: OriginDNSParam | Omit = omit,
+        origin_port: OriginPortParam | Omit = omit,
+        proxy_protocol: Literal["off", "v1", "v2", "simple"] | Omit = omit,
+        tls: Literal["off", "flexible", "full", "strict"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AppUpdateResponse]:
         """
         Updates a previously existing application's configuration that uses a name for
         the origin.
 
         Args:
-          zone: Identifier
+          zone_id: Zone identifier.
 
-          app_id: Application identifier.
+          app_id: App identifier.
 
           dns: The name and type of DNS record for the Spectrum application.
 
-          origin_dns: The name and type of DNS record for the Spectrum application.
-
-          origin_port: The destination port at the origin. Only specified in conjunction with
-              origin_dns. May use an integer to specify a single origin port, for example
-              `1000`, or a string to specify a range of origin ports, for example
-              `"1000-2000"`. Notes: If specifying a port range, the number of ports in the
-              range must match the number of ports specified in the "protocol" field.
-
-          protocol: The port configuration at Cloudflare’s edge. May specify a single port, for
+          protocol: The port configuration at Cloudflare's edge. May specify a single port, for
               example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
 
+          traffic_type: Determines how data travels from the edge to your origin. When set to "direct",
+              Spectrum will send traffic directly to your origin, and the application's type
+              is derived from the `protocol`. When set to "http" or "https", Spectrum will
+              apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and
+              the application type matches this property exactly.
+
           argo_smart_routing: Enables Argo Smart Routing for this application. Notes: Only available for TCP
               applications with traffic_type set to "direct".
 
@@ -564,6 +816,17 @@ async def update(
           ip_firewall: Enables IP Access Rules for this application. Notes: Only available for TCP
               applications.
 
+          origin_direct: List of origin IP addresses. Array may contain multiple IP addresses for load
+              balancing.
+
+          origin_dns: The name and type of DNS record for the Spectrum application.
+
+          origin_port: The destination port at the origin. Only specified in conjunction with
+              origin_dns. May use an integer to specify a single origin port, for example
+              `1000`, or a string to specify a range of origin ports, for example
+              `"1000-2000"`. Notes: If specifying a port range, the number of ports in the
+              range must match the number of ports specified in the "protocol" field.
+
           proxy_protocol: Enables Proxy Protocol to the origin. Refer to
               [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/)
               for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple
@@ -571,11 +834,48 @@ async def update(
 
           tls: The type of TLS termination associated with the application.
 
-          traffic_type: Determines how data travels from the edge to your origin. When set to "direct",
-              Spectrum will send traffic directly to your origin, and the application's type
-              is derived from the `protocol`. When set to "http" or "https", Spectrum will
-              apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and
-              the application type matches this property exactly.
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def update(
+        self,
+        app_id: str,
+        *,
+        zone_id: str,
+        dns: DNSParam,
+        protocol: str,
+        origin_direct: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AppUpdateResponse]:
+        """
+        Updates a previously existing application's configuration that uses a name for
+        the origin.
+
+        Args:
+          zone_id: Zone identifier.
+
+          app_id: App identifier.
+
+          dns: The name and type of DNS record for the Spectrum application.
+
+          protocol: The port configuration at Cloudflare's edge. May specify a single port, for
+              example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
+
+          origin_direct: List of origin IP addresses. Array may contain multiple IP addresses for load
+              balancing.
 
           extra_headers: Send extra headers
 
@@ -585,57 +885,89 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone:
-            raise ValueError(f"Expected a non-empty value for `zone` but received {zone!r}")
+        ...
+
+    @required_args(["zone_id", "dns", "protocol", "traffic_type"], ["zone_id", "dns", "protocol"])
+    async def update(
+        self,
+        app_id: str,
+        *,
+        zone_id: str,
+        dns: DNSParam,
+        protocol: str,
+        traffic_type: Literal["direct", "http", "https"] | Omit = omit,
+        argo_smart_routing: bool | Omit = omit,
+        edge_ips: EdgeIPsParam | Omit = omit,
+        ip_firewall: bool | Omit = omit,
+        origin_direct: SequenceNotStr[str] | Omit = omit,
+        origin_dns: OriginDNSParam | Omit = omit,
+        origin_port: OriginPortParam | Omit = omit,
+        proxy_protocol: Literal["off", "v1", "v2", "simple"] | Omit = omit,
+        tls: Literal["off", "flexible", "full", "strict"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AppUpdateResponse]:
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not app_id:
             raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
-        return await self._put(
-            f"/zones/{zone}/spectrum/apps/{app_id}",
-            body=await async_maybe_transform(
-                {
-                    "dns": dns,
-                    "origin_dns": origin_dns,
-                    "origin_port": origin_port,
-                    "protocol": protocol,
-                    "argo_smart_routing": argo_smart_routing,
-                    "edge_ips": edge_ips,
-                    "ip_firewall": ip_firewall,
-                    "proxy_protocol": proxy_protocol,
-                    "tls": tls,
-                    "traffic_type": traffic_type,
-                },
-                app_update_params.AppUpdateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[AppUpdateResponse]]._unwrapper,
+        return cast(
+            Optional[AppUpdateResponse],
+            await self._put(
+                f"/zones/{zone_id}/spectrum/apps/{app_id}",
+                body=await async_maybe_transform(
+                    {
+                        "dns": dns,
+                        "protocol": protocol,
+                        "traffic_type": traffic_type,
+                        "argo_smart_routing": argo_smart_routing,
+                        "edge_ips": edge_ips,
+                        "ip_firewall": ip_firewall,
+                        "origin_direct": origin_direct,
+                        "origin_dns": origin_dns,
+                        "origin_port": origin_port,
+                        "proxy_protocol": proxy_protocol,
+                        "tls": tls,
+                    },
+                    app_update_params.AppUpdateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[AppUpdateResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[AppUpdateResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[AppUpdateResponse]], ResultWrapper[AppUpdateResponse]),
         )
 
     def list(
         self,
-        zone: str,
         *,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        order: Literal["protocol", "app_id", "created_on", "modified_on", "dns"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        order: Literal["protocol", "app_id", "created_on", "modified_on", "dns"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[object, AsyncV4PagePaginationArray[object]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[AppListResponse, AsyncV4PagePaginationArray[AppListResponse]]:
         """
         Retrieves a list of currently existing Spectrum applications inside a zone.
 
         Args:
-          zone: Identifier
+          zone_id: Zone identifier.
 
           direction: Sets the direction by which results are ordered.
 
@@ -655,11 +987,11 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone:
-            raise ValueError(f"Expected a non-empty value for `zone` but received {zone!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone}/spectrum/apps",
-            page=AsyncV4PagePaginationArray[object],
+            f"/zones/{zone_id}/spectrum/apps",
+            page=AsyncV4PagePaginationArray[AppListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -675,28 +1007,28 @@ def list(
                     app_list_params.AppListParams,
                 ),
             ),
-            model=object,
+            model=cast(Any, AppListResponse),  # Union types cannot be passed in as arguments in the type system
         )
 
     async def delete(
         self,
         app_id: str,
         *,
-        zone: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AppDeleteResponse]:
         """
         Deletes a previously existing application.
 
         Args:
-          zone: Identifier
+          zone_id: Zone identifier.
 
-          app_id: Application identifier.
+          app_id: App identifier.
 
           extra_headers: Send extra headers
 
@@ -706,12 +1038,12 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone:
-            raise ValueError(f"Expected a non-empty value for `zone` but received {zone!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not app_id:
             raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
         return await self._delete(
-            f"/zones/{zone}/spectrum/apps/{app_id}",
+            f"/zones/{zone_id}/spectrum/apps/{app_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -726,21 +1058,21 @@ async def get(
         self,
         app_id: str,
         *,
-        zone: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AppGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AppGetResponse]:
         """
         Gets the application configuration of a specific application inside a zone.
 
         Args:
-          zone: Identifier
+          zone_id: Zone identifier.
 
-          app_id: Application identifier.
+          app_id: App identifier.
 
           extra_headers: Send extra headers
 
@@ -750,20 +1082,20 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone:
-            raise ValueError(f"Expected a non-empty value for `zone` but received {zone!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not app_id:
             raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
         return cast(
-            AppGetResponse,
+            Optional[AppGetResponse],
             await self._get(
-                f"/zones/{zone}/spectrum/apps/{app_id}",
+                f"/zones/{zone_id}/spectrum/apps/{app_id}",
                 options=make_request_options(
                     extra_headers=extra_headers,
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[AppGetResponse]._unwrapper,
+                    post_parser=ResultWrapper[Optional[AppGetResponse]]._unwrapper,
                 ),
                 cast_to=cast(
                     Any, ResultWrapper[AppGetResponse]
diff --git a/src/cloudflare/resources/spectrum/spectrum.py b/src/cloudflare/resources/spectrum/spectrum.py
index 78a76587802..60e77960d81 100644
--- a/src/cloudflare/resources/spectrum/spectrum.py
+++ b/src/cloudflare/resources/spectrum/spectrum.py
@@ -11,7 +11,8 @@
     AsyncAppsResourceWithStreamingResponse,
 )
 from ..._compat import cached_property
-from .analytics import (
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .analytics.analytics import (
     AnalyticsResource,
     AsyncAnalyticsResource,
     AnalyticsResourceWithRawResponse,
@@ -19,8 +20,6 @@
     AnalyticsResourceWithStreamingResponse,
     AsyncAnalyticsResourceWithStreamingResponse,
 )
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .analytics.analytics import AnalyticsResource, AsyncAnalyticsResource
 
 __all__ = ["SpectrumResource", "AsyncSpectrumResource"]
 
@@ -36,10 +35,21 @@ def apps(self) -> AppsResource:
 
     @cached_property
     def with_raw_response(self) -> SpectrumResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SpectrumResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SpectrumResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SpectrumResourceWithStreamingResponse(self)
 
 
@@ -54,10 +64,21 @@ def apps(self) -> AsyncAppsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncSpectrumResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSpectrumResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSpectrumResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSpectrumResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/speed/availabilities.py b/src/cloudflare/resources/speed/availabilities.py
index 91aff6050d5..2f7f75fd060 100644
--- a/src/cloudflare/resources/speed/availabilities.py
+++ b/src/cloudflare/resources/speed/availabilities.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Query, Headers, NotGiven, not_given
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -25,10 +25,21 @@
 class AvailabilitiesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AvailabilitiesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AvailabilitiesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AvailabilitiesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AvailabilitiesResourceWithStreamingResponse(self)
 
     def list(
@@ -40,13 +51,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Availability]:
         """
         Retrieves quota for all plans, as well as the current zone quota.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -74,10 +85,21 @@ def list(
 class AsyncAvailabilitiesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncAvailabilitiesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAvailabilitiesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAvailabilitiesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAvailabilitiesResourceWithStreamingResponse(self)
 
     async def list(
@@ -89,13 +111,13 @@ async def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Availability]:
         """
         Retrieves quota for all plans, as well as the current zone quota.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/speed/pages/pages.py b/src/cloudflare/resources/speed/pages/pages.py
index 26f747222f6..145cb4a88a9 100644
--- a/src/cloudflare/resources/speed/pages/pages.py
+++ b/src/cloudflare/resources/speed/pages/pages.py
@@ -16,11 +16,8 @@
     TestsResourceWithStreamingResponse,
     AsyncTestsResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -46,10 +43,21 @@ def tests(self) -> TestsResource:
 
     @cached_property
     def with_raw_response(self) -> PagesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PagesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PagesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PagesResourceWithStreamingResponse(self)
 
     def list(
@@ -61,13 +69,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[PageListResponse]:
         """
         Lists all webpages which have been tested.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -120,19 +128,19 @@ def trend(
         ],
         start: Union[str, datetime],
         tz: str,
-        end: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        end: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Trend]:
         """
         Lists the core web vital metrics trend over time for a specific page.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           url: A URL.
 
@@ -187,10 +195,21 @@ def tests(self) -> AsyncTestsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncPagesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPagesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPagesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPagesResourceWithStreamingResponse(self)
 
     def list(
@@ -202,13 +221,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[PageListResponse, AsyncSinglePage[PageListResponse]]:
         """
         Lists all webpages which have been tested.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -261,19 +280,19 @@ async def trend(
         ],
         start: Union[str, datetime],
         tz: str,
-        end: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        end: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Trend]:
         """
         Lists the core web vital metrics trend over time for a specific page.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           url: A URL.
 
diff --git a/src/cloudflare/resources/speed/pages/tests.py b/src/cloudflare/resources/speed/pages/tests.py
index d8d7c846c1b..bc17097085f 100644
--- a/src/cloudflare/resources/speed/pages/tests.py
+++ b/src/cloudflare/resources/speed/pages/tests.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -21,10 +18,10 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
 from ....types.speed.pages import test_list_params, test_create_params, test_delete_params
 from ....types.speed.pages.test import Test
-from ....types.speed.pages.test_list_response import TestListResponse
 from ....types.speed.pages.test_delete_response import TestDeleteResponse
 
 __all__ = ["TestsResource", "AsyncTestsResource"]
@@ -35,10 +32,21 @@ class TestsResource(SyncAPIResource):
 
     @cached_property
     def with_raw_response(self) -> TestsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TestsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TestsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TestsResourceWithStreamingResponse(self)
 
     def create(
@@ -69,19 +77,19 @@ def create(
             "us-south1",
             "us-west1",
         ]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Test]:
         """
         Starts a test for a specific webpage, in a specific region.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           url: A URL.
 
@@ -117,8 +125,8 @@ def list(
         url: str,
         *,
         zone_id: str,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         region: Literal[
             "asia-east1",
             "asia-northeast1",
@@ -142,19 +150,19 @@ def list(
             "us-south1",
             "us-west1",
         ]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TestListResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[Test]:
         """
         Test history (list of tests) for a specific webpage.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           url: A URL.
 
@@ -172,8 +180,9 @@ def list(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not url:
             raise ValueError(f"Expected a non-empty value for `url` but received {url!r}")
-        return self._get(
+        return self._get_api_list(
             f"/zones/{zone_id}/speed_api/pages/{url}/tests",
+            page=SyncV4PagePaginationArray[Test],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -188,7 +197,7 @@ def list(
                     test_list_params.TestListParams,
                 ),
             ),
-            cast_to=TestListResponse,
+            model=Test,
         )
 
     def delete(
@@ -219,13 +228,13 @@ def delete(
             "us-south1",
             "us-west1",
         ]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TestDeleteResponse]:
         """Deletes all tests for a specific webpage from a specific region.
 
@@ -233,7 +242,7 @@ def delete(
         are still counted as part of the quota.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           url: A URL.
 
@@ -275,13 +284,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Test]:
         """
         Retrieves the result of a specific test.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           url: A URL.
 
@@ -315,10 +324,21 @@ def get(
 class AsyncTestsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTestsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTestsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTestsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTestsResourceWithStreamingResponse(self)
 
     async def create(
@@ -349,19 +369,19 @@ async def create(
             "us-south1",
             "us-west1",
         ]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Test]:
         """
         Starts a test for a specific webpage, in a specific region.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           url: A URL.
 
@@ -392,13 +412,13 @@ async def create(
             cast_to=cast(Type[Optional[Test]], ResultWrapper[Test]),
         )
 
-    async def list(
+    def list(
         self,
         url: str,
         *,
         zone_id: str,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         region: Literal[
             "asia-east1",
             "asia-northeast1",
@@ -422,19 +442,19 @@ async def list(
             "us-south1",
             "us-west1",
         ]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TestListResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Test, AsyncV4PagePaginationArray[Test]]:
         """
         Test history (list of tests) for a specific webpage.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           url: A URL.
 
@@ -452,14 +472,15 @@ async def list(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not url:
             raise ValueError(f"Expected a non-empty value for `url` but received {url!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/zones/{zone_id}/speed_api/pages/{url}/tests",
+            page=AsyncV4PagePaginationArray[Test],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=await async_maybe_transform(
+                query=maybe_transform(
                     {
                         "page": page,
                         "per_page": per_page,
@@ -468,7 +489,7 @@ async def list(
                     test_list_params.TestListParams,
                 ),
             ),
-            cast_to=TestListResponse,
+            model=Test,
         )
 
     async def delete(
@@ -499,13 +520,13 @@ async def delete(
             "us-south1",
             "us-west1",
         ]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TestDeleteResponse]:
         """Deletes all tests for a specific webpage from a specific region.
 
@@ -513,7 +534,7 @@ async def delete(
         are still counted as part of the quota.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           url: A URL.
 
@@ -555,13 +576,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Test]:
         """
         Retrieves the result of a specific test.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           url: A URL.
 
diff --git a/src/cloudflare/resources/speed/schedule.py b/src/cloudflare/resources/speed/schedule.py
index 55c89ed3389..6c822983901 100644
--- a/src/cloudflare/resources/speed/schedule.py
+++ b/src/cloudflare/resources/speed/schedule.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -33,10 +30,21 @@
 class ScheduleResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ScheduleResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ScheduleResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ScheduleResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ScheduleResourceWithStreamingResponse(self)
 
     def create(
@@ -67,19 +75,19 @@ def create(
             "us-south1",
             "us-west1",
         ]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ScheduleCreateResponse]:
         """
         Creates a scheduled test for a page.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           url: A URL.
 
@@ -138,19 +146,19 @@ def delete(
             "us-south1",
             "us-west1",
         ]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ScheduleDeleteResponse]:
         """
         Deletes a scheduled test for a page.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           url: A URL.
 
@@ -209,19 +217,19 @@ def get(
             "us-south1",
             "us-west1",
         ]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Schedule]:
         """
         Retrieves the test schedule for a page in a specific region.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           url: A URL.
 
@@ -256,10 +264,21 @@ def get(
 class AsyncScheduleResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncScheduleResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncScheduleResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncScheduleResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncScheduleResourceWithStreamingResponse(self)
 
     async def create(
@@ -290,19 +309,19 @@ async def create(
             "us-south1",
             "us-west1",
         ]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ScheduleCreateResponse]:
         """
         Creates a scheduled test for a page.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           url: A URL.
 
@@ -361,19 +380,19 @@ async def delete(
             "us-south1",
             "us-west1",
         ]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ScheduleDeleteResponse]:
         """
         Deletes a scheduled test for a page.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           url: A URL.
 
@@ -432,19 +451,19 @@ async def get(
             "us-south1",
             "us-west1",
         ]
-        | NotGiven = NOT_GIVEN,
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Schedule]:
         """
         Retrieves the test schedule for a page in a specific region.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           url: A URL.
 
diff --git a/src/cloudflare/resources/speed/speed.py b/src/cloudflare/resources/speed/speed.py
index 83abbebfa82..ce385565aa6 100644
--- a/src/cloudflare/resources/speed/speed.py
+++ b/src/cloudflare/resources/speed/speed.py
@@ -2,14 +2,6 @@
 
 from __future__ import annotations
 
-from .pages import (
-    PagesResource,
-    AsyncPagesResource,
-    PagesResourceWithRawResponse,
-    AsyncPagesResourceWithRawResponse,
-    PagesResourceWithStreamingResponse,
-    AsyncPagesResourceWithStreamingResponse,
-)
 from .schedule import (
     ScheduleResource,
     AsyncScheduleResource,
@@ -20,7 +12,14 @@
 )
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
-from .pages.pages import PagesResource, AsyncPagesResource
+from .pages.pages import (
+    PagesResource,
+    AsyncPagesResource,
+    PagesResourceWithRawResponse,
+    AsyncPagesResourceWithRawResponse,
+    PagesResourceWithStreamingResponse,
+    AsyncPagesResourceWithStreamingResponse,
+)
 from .availabilities import (
     AvailabilitiesResource,
     AsyncAvailabilitiesResource,
@@ -48,10 +47,21 @@ def pages(self) -> PagesResource:
 
     @cached_property
     def with_raw_response(self) -> SpeedResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SpeedResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SpeedResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SpeedResourceWithStreamingResponse(self)
 
 
@@ -70,10 +80,21 @@ def pages(self) -> AsyncPagesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncSpeedResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSpeedResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSpeedResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSpeedResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/ssl/analyze.py b/src/cloudflare/resources/ssl/analyze.py
index 2396db10045..4d979fdab27 100644
--- a/src/cloudflare/resources/ssl/analyze.py
+++ b/src/cloudflare/resources/ssl/analyze.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -23,7 +20,6 @@
 from ...types.ssl import analyze_create_params
 from ..._base_client import make_request_options
 from ...types.custom_hostnames import BundleMethod
-from ...types.ssl.analyze_create_response import AnalyzeCreateResponse
 from ...types.custom_hostnames.bundle_method import BundleMethod
 
 __all__ = ["AnalyzeResource", "AsyncAnalyzeResource"]
@@ -32,31 +28,42 @@
 class AnalyzeResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AnalyzeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AnalyzeResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AnalyzeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AnalyzeResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         zone_id: str,
-        bundle_method: BundleMethod | NotGiven = NOT_GIVEN,
-        certificate: str | NotGiven = NOT_GIVEN,
+        bundle_method: BundleMethod | Omit = omit,
+        certificate: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AnalyzeCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
         Returns the set of hostnames, the signature algorithm, and the expiration date
         of the certificate.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           bundle_method: A ubiquitous bundle has the highest probability of being verified everywhere,
               even by clients using outdated or unusual trust stores. An optimal bundle uses
@@ -75,59 +82,65 @@ def create(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            Optional[AnalyzeCreateResponse],
-            self._post(
-                f"/zones/{zone_id}/ssl/analyze",
-                body=maybe_transform(
-                    {
-                        "bundle_method": bundle_method,
-                        "certificate": certificate,
-                    },
-                    analyze_create_params.AnalyzeCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[AnalyzeCreateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AnalyzeCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._post(
+            f"/zones/{zone_id}/ssl/analyze",
+            body=maybe_transform(
+                {
+                    "bundle_method": bundle_method,
+                    "certificate": certificate,
+                },
+                analyze_create_params.AnalyzeCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
 
 class AsyncAnalyzeResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncAnalyzeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAnalyzeResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAnalyzeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAnalyzeResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         zone_id: str,
-        bundle_method: BundleMethod | NotGiven = NOT_GIVEN,
-        certificate: str | NotGiven = NOT_GIVEN,
+        bundle_method: BundleMethod | Omit = omit,
+        certificate: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AnalyzeCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
         Returns the set of hostnames, the signature algorithm, and the expiration date
         of the certificate.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           bundle_method: A ubiquitous bundle has the highest probability of being verified everywhere,
               even by clients using outdated or unusual trust stores. An optimal bundle uses
@@ -146,28 +159,23 @@ async def create(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return cast(
-            Optional[AnalyzeCreateResponse],
-            await self._post(
-                f"/zones/{zone_id}/ssl/analyze",
-                body=await async_maybe_transform(
-                    {
-                        "bundle_method": bundle_method,
-                        "certificate": certificate,
-                    },
-                    analyze_create_params.AnalyzeCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[AnalyzeCreateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AnalyzeCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._post(
+            f"/zones/{zone_id}/ssl/analyze",
+            body=await async_maybe_transform(
+                {
+                    "bundle_method": bundle_method,
+                    "certificate": certificate,
+                },
+                analyze_create_params.AnalyzeCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
 
diff --git a/src/cloudflare/resources/ssl/certificate_packs/__init__.py b/src/cloudflare/resources/ssl/certificate_packs/__init__.py
index ebed46ba670..3b4088429da 100644
--- a/src/cloudflare/resources/ssl/certificate_packs/__init__.py
+++ b/src/cloudflare/resources/ssl/certificate_packs/__init__.py
@@ -1,13 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from .order import (
-    OrderResource,
-    AsyncOrderResource,
-    OrderResourceWithRawResponse,
-    AsyncOrderResourceWithRawResponse,
-    OrderResourceWithStreamingResponse,
-    AsyncOrderResourceWithStreamingResponse,
-)
 from .quota import (
     QuotaResource,
     AsyncQuotaResource,
@@ -26,12 +18,6 @@
 )
 
 __all__ = [
-    "OrderResource",
-    "AsyncOrderResource",
-    "OrderResourceWithRawResponse",
-    "AsyncOrderResourceWithRawResponse",
-    "OrderResourceWithStreamingResponse",
-    "AsyncOrderResourceWithStreamingResponse",
     "QuotaResource",
     "AsyncQuotaResource",
     "QuotaResourceWithRawResponse",
diff --git a/src/cloudflare/resources/ssl/certificate_packs/certificate_packs.py b/src/cloudflare/resources/ssl/certificate_packs/certificate_packs.py
index af6eb2e0c63..2dc361a85e7 100644
--- a/src/cloudflare/resources/ssl/certificate_packs/certificate_packs.py
+++ b/src/cloudflare/resources/ssl/certificate_packs/certificate_packs.py
@@ -2,19 +2,11 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Optional, cast
+from typing import Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from .order import (
-    OrderResource,
-    AsyncOrderResource,
-    OrderResourceWithRawResponse,
-    AsyncOrderResourceWithRawResponse,
-    OrderResourceWithStreamingResponse,
-    AsyncOrderResourceWithStreamingResponse,
-)
 from .quota import (
     QuotaResource,
     AsyncQuotaResource,
@@ -23,11 +15,8 @@
     QuotaResourceWithStreamingResponse,
     AsyncQuotaResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -37,50 +26,132 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ....types.ssl import certificate_pack_edit_params, certificate_pack_list_params
+from ....types.ssl import certificate_pack_edit_params, certificate_pack_list_params, certificate_pack_create_params
 from ....pagination import SyncSinglePage, AsyncSinglePage
 from ...._base_client import AsyncPaginator, make_request_options
+from ....types.ssl.host import Host
 from ....types.ssl.certificate_pack_get_response import CertificatePackGetResponse
 from ....types.ssl.certificate_pack_edit_response import CertificatePackEditResponse
+from ....types.ssl.certificate_pack_list_response import CertificatePackListResponse
+from ....types.ssl.certificate_pack_create_response import CertificatePackCreateResponse
 from ....types.ssl.certificate_pack_delete_response import CertificatePackDeleteResponse
 
 __all__ = ["CertificatePacksResource", "AsyncCertificatePacksResource"]
 
 
 class CertificatePacksResource(SyncAPIResource):
-    @cached_property
-    def order(self) -> OrderResource:
-        return OrderResource(self._client)
-
     @cached_property
     def quota(self) -> QuotaResource:
         return QuotaResource(self._client)
 
     @cached_property
     def with_raw_response(self) -> CertificatePacksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CertificatePacksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CertificatePacksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CertificatePacksResourceWithStreamingResponse(self)
 
+    def create(
+        self,
+        *,
+        zone_id: str,
+        certificate_authority: Literal["google", "lets_encrypt", "ssl_com"],
+        hosts: SequenceNotStr[Host],
+        type: Literal["advanced"],
+        validation_method: Literal["txt", "http", "email"],
+        validity_days: Literal[14, 30, 90, 365],
+        cloudflare_branding: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CertificatePackCreateResponse]:
+        """
+        For a given zone, order an advanced certificate pack.
+
+        Args:
+          zone_id: Identifier.
+
+          certificate_authority: Certificate Authority selected for the order. For information on any certificate
+              authority specific details or restrictions
+              [see this page for more details.](https://developers.cloudflare.com/ssl/reference/certificate-authorities)
+
+          hosts: Comma separated list of valid host names for the certificate packs. Must contain
+              the zone apex, may not contain more than 50 hosts, and may not be empty.
+
+          type: Type of certificate pack.
+
+          validation_method: Validation Method selected for the order.
+
+          validity_days: Validity Days selected for the order.
+
+          cloudflare_branding: Whether or not to add Cloudflare Branding for the order. This will add a
+              subdomain of sni.cloudflaressl.com as the Common Name if set to true.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/ssl/certificate_packs/order",
+            body=maybe_transform(
+                {
+                    "certificate_authority": certificate_authority,
+                    "hosts": hosts,
+                    "type": type,
+                    "validation_method": validation_method,
+                    "validity_days": validity_days,
+                    "cloudflare_branding": cloudflare_branding,
+                },
+                certificate_pack_create_params.CertificatePackCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CertificatePackCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CertificatePackCreateResponse]], ResultWrapper[CertificatePackCreateResponse]),
+        )
+
     def list(
         self,
         *,
         zone_id: str,
-        status: Literal["all"] | NotGiven = NOT_GIVEN,
+        status: Literal["all"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[object]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[CertificatePackListResponse]:
         """
         For a given zone, list all active certificate packs.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           status: Include Certificate Packs of all statuses, not just active ones.
 
@@ -96,7 +167,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
             f"/zones/{zone_id}/ssl/certificate_packs",
-            page=SyncSinglePage[object],
+            page=SyncSinglePage[CertificatePackListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -104,7 +175,7 @@ def list(
                 timeout=timeout,
                 query=maybe_transform({"status": status}, certificate_pack_list_params.CertificatePackListParams),
             ),
-            model=object,
+            model=CertificatePackListResponse,
         )
 
     def delete(
@@ -117,15 +188,15 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CertificatePackDeleteResponse]:
         """
         For a given zone, delete an advanced certificate pack.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          certificate_pack_id: Identifier
+          certificate_pack_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -158,24 +229,26 @@ def edit(
         certificate_pack_id: str,
         *,
         zone_id: str,
-        body: object,
+        cloudflare_branding: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CertificatePackEditResponse]:
-        """For a given zone, restart validation for an advanced certificate pack.
-
-        This is
-        only a validation operation for a Certificate Pack in a validation_timed_out
-        status.
+        """
+        For a given zone, restart validation or add cloudflare branding for an advanced
+        certificate pack. The former is only a validation operation for a Certificate
+        Pack in a validation_timed_out status.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          certificate_pack_id: Identifier
+          certificate_pack_id: Identifier.
+
+          cloudflare_branding: Whether or not to add Cloudflare Branding for the order. This will add a
+              subdomain of sni.cloudflaressl.com as the Common Name if set to true.
 
           extra_headers: Send extra headers
 
@@ -193,7 +266,9 @@ def edit(
             )
         return self._patch(
             f"/zones/{zone_id}/ssl/certificate_packs/{certificate_pack_id}",
-            body=maybe_transform(body, certificate_pack_edit_params.CertificatePackEditParams),
+            body=maybe_transform(
+                {"cloudflare_branding": cloudflare_branding}, certificate_pack_edit_params.CertificatePackEditParams
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -214,15 +289,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CertificatePackGetResponse]:
         """
         For a given zone, get a certificate pack.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          certificate_pack_id: Identifier
+          certificate_pack_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -238,58 +313,132 @@ def get(
             raise ValueError(
                 f"Expected a non-empty value for `certificate_pack_id` but received {certificate_pack_id!r}"
             )
-        return cast(
-            Optional[CertificatePackGetResponse],
-            self._get(
-                f"/zones/{zone_id}/ssl/certificate_packs/{certificate_pack_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[CertificatePackGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[CertificatePackGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._get(
+            f"/zones/{zone_id}/ssl/certificate_packs/{certificate_pack_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CertificatePackGetResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[CertificatePackGetResponse]], ResultWrapper[CertificatePackGetResponse]),
         )
 
 
 class AsyncCertificatePacksResource(AsyncAPIResource):
-    @cached_property
-    def order(self) -> AsyncOrderResource:
-        return AsyncOrderResource(self._client)
-
     @cached_property
     def quota(self) -> AsyncQuotaResource:
         return AsyncQuotaResource(self._client)
 
     @cached_property
     def with_raw_response(self) -> AsyncCertificatePacksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCertificatePacksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCertificatePacksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCertificatePacksResourceWithStreamingResponse(self)
 
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        certificate_authority: Literal["google", "lets_encrypt", "ssl_com"],
+        hosts: SequenceNotStr[Host],
+        type: Literal["advanced"],
+        validation_method: Literal["txt", "http", "email"],
+        validity_days: Literal[14, 30, 90, 365],
+        cloudflare_branding: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CertificatePackCreateResponse]:
+        """
+        For a given zone, order an advanced certificate pack.
+
+        Args:
+          zone_id: Identifier.
+
+          certificate_authority: Certificate Authority selected for the order. For information on any certificate
+              authority specific details or restrictions
+              [see this page for more details.](https://developers.cloudflare.com/ssl/reference/certificate-authorities)
+
+          hosts: Comma separated list of valid host names for the certificate packs. Must contain
+              the zone apex, may not contain more than 50 hosts, and may not be empty.
+
+          type: Type of certificate pack.
+
+          validation_method: Validation Method selected for the order.
+
+          validity_days: Validity Days selected for the order.
+
+          cloudflare_branding: Whether or not to add Cloudflare Branding for the order. This will add a
+              subdomain of sni.cloudflaressl.com as the Common Name if set to true.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/ssl/certificate_packs/order",
+            body=await async_maybe_transform(
+                {
+                    "certificate_authority": certificate_authority,
+                    "hosts": hosts,
+                    "type": type,
+                    "validation_method": validation_method,
+                    "validity_days": validity_days,
+                    "cloudflare_branding": cloudflare_branding,
+                },
+                certificate_pack_create_params.CertificatePackCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CertificatePackCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CertificatePackCreateResponse]], ResultWrapper[CertificatePackCreateResponse]),
+        )
+
     def list(
         self,
         *,
         zone_id: str,
-        status: Literal["all"] | NotGiven = NOT_GIVEN,
+        status: Literal["all"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[object, AsyncSinglePage[object]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[CertificatePackListResponse, AsyncSinglePage[CertificatePackListResponse]]:
         """
         For a given zone, list all active certificate packs.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           status: Include Certificate Packs of all statuses, not just active ones.
 
@@ -305,7 +454,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
             f"/zones/{zone_id}/ssl/certificate_packs",
-            page=AsyncSinglePage[object],
+            page=AsyncSinglePage[CertificatePackListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -313,7 +462,7 @@ def list(
                 timeout=timeout,
                 query=maybe_transform({"status": status}, certificate_pack_list_params.CertificatePackListParams),
             ),
-            model=object,
+            model=CertificatePackListResponse,
         )
 
     async def delete(
@@ -326,15 +475,15 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CertificatePackDeleteResponse]:
         """
         For a given zone, delete an advanced certificate pack.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          certificate_pack_id: Identifier
+          certificate_pack_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -367,24 +516,26 @@ async def edit(
         certificate_pack_id: str,
         *,
         zone_id: str,
-        body: object,
+        cloudflare_branding: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CertificatePackEditResponse]:
-        """For a given zone, restart validation for an advanced certificate pack.
-
-        This is
-        only a validation operation for a Certificate Pack in a validation_timed_out
-        status.
+        """
+        For a given zone, restart validation or add cloudflare branding for an advanced
+        certificate pack. The former is only a validation operation for a Certificate
+        Pack in a validation_timed_out status.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
+
+          certificate_pack_id: Identifier.
 
-          certificate_pack_id: Identifier
+          cloudflare_branding: Whether or not to add Cloudflare Branding for the order. This will add a
+              subdomain of sni.cloudflaressl.com as the Common Name if set to true.
 
           extra_headers: Send extra headers
 
@@ -402,7 +553,9 @@ async def edit(
             )
         return await self._patch(
             f"/zones/{zone_id}/ssl/certificate_packs/{certificate_pack_id}",
-            body=await async_maybe_transform(body, certificate_pack_edit_params.CertificatePackEditParams),
+            body=await async_maybe_transform(
+                {"cloudflare_branding": cloudflare_branding}, certificate_pack_edit_params.CertificatePackEditParams
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -423,15 +576,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CertificatePackGetResponse]:
         """
         For a given zone, get a certificate pack.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
-          certificate_pack_id: Identifier
+          certificate_pack_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -447,21 +600,16 @@ async def get(
             raise ValueError(
                 f"Expected a non-empty value for `certificate_pack_id` but received {certificate_pack_id!r}"
             )
-        return cast(
-            Optional[CertificatePackGetResponse],
-            await self._get(
-                f"/zones/{zone_id}/ssl/certificate_packs/{certificate_pack_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[CertificatePackGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[CertificatePackGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._get(
+            f"/zones/{zone_id}/ssl/certificate_packs/{certificate_pack_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CertificatePackGetResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[CertificatePackGetResponse]], ResultWrapper[CertificatePackGetResponse]),
         )
 
 
@@ -469,6 +617,9 @@ class CertificatePacksResourceWithRawResponse:
     def __init__(self, certificate_packs: CertificatePacksResource) -> None:
         self._certificate_packs = certificate_packs
 
+        self.create = to_raw_response_wrapper(
+            certificate_packs.create,
+        )
         self.list = to_raw_response_wrapper(
             certificate_packs.list,
         )
@@ -482,10 +633,6 @@ def __init__(self, certificate_packs: CertificatePacksResource) -> None:
             certificate_packs.get,
         )
 
-    @cached_property
-    def order(self) -> OrderResourceWithRawResponse:
-        return OrderResourceWithRawResponse(self._certificate_packs.order)
-
     @cached_property
     def quota(self) -> QuotaResourceWithRawResponse:
         return QuotaResourceWithRawResponse(self._certificate_packs.quota)
@@ -495,6 +642,9 @@ class AsyncCertificatePacksResourceWithRawResponse:
     def __init__(self, certificate_packs: AsyncCertificatePacksResource) -> None:
         self._certificate_packs = certificate_packs
 
+        self.create = async_to_raw_response_wrapper(
+            certificate_packs.create,
+        )
         self.list = async_to_raw_response_wrapper(
             certificate_packs.list,
         )
@@ -508,10 +658,6 @@ def __init__(self, certificate_packs: AsyncCertificatePacksResource) -> None:
             certificate_packs.get,
         )
 
-    @cached_property
-    def order(self) -> AsyncOrderResourceWithRawResponse:
-        return AsyncOrderResourceWithRawResponse(self._certificate_packs.order)
-
     @cached_property
     def quota(self) -> AsyncQuotaResourceWithRawResponse:
         return AsyncQuotaResourceWithRawResponse(self._certificate_packs.quota)
@@ -521,6 +667,9 @@ class CertificatePacksResourceWithStreamingResponse:
     def __init__(self, certificate_packs: CertificatePacksResource) -> None:
         self._certificate_packs = certificate_packs
 
+        self.create = to_streamed_response_wrapper(
+            certificate_packs.create,
+        )
         self.list = to_streamed_response_wrapper(
             certificate_packs.list,
         )
@@ -534,10 +683,6 @@ def __init__(self, certificate_packs: CertificatePacksResource) -> None:
             certificate_packs.get,
         )
 
-    @cached_property
-    def order(self) -> OrderResourceWithStreamingResponse:
-        return OrderResourceWithStreamingResponse(self._certificate_packs.order)
-
     @cached_property
     def quota(self) -> QuotaResourceWithStreamingResponse:
         return QuotaResourceWithStreamingResponse(self._certificate_packs.quota)
@@ -547,6 +692,9 @@ class AsyncCertificatePacksResourceWithStreamingResponse:
     def __init__(self, certificate_packs: AsyncCertificatePacksResource) -> None:
         self._certificate_packs = certificate_packs
 
+        self.create = async_to_streamed_response_wrapper(
+            certificate_packs.create,
+        )
         self.list = async_to_streamed_response_wrapper(
             certificate_packs.list,
         )
@@ -560,10 +708,6 @@ def __init__(self, certificate_packs: AsyncCertificatePacksResource) -> None:
             certificate_packs.get,
         )
 
-    @cached_property
-    def order(self) -> AsyncOrderResourceWithStreamingResponse:
-        return AsyncOrderResourceWithStreamingResponse(self._certificate_packs.order)
-
     @cached_property
     def quota(self) -> AsyncQuotaResourceWithStreamingResponse:
         return AsyncQuotaResourceWithStreamingResponse(self._certificate_packs.quota)
diff --git a/src/cloudflare/resources/ssl/certificate_packs/order.py b/src/cloudflare/resources/ssl/certificate_packs/order.py
deleted file mode 100644
index 9c9079cf17d..00000000000
--- a/src/cloudflare/resources/ssl/certificate_packs/order.py
+++ /dev/null
@@ -1,229 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List, Type, Optional, cast
-from typing_extensions import Literal
-
-import httpx
-
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
-from ....types.ssl.host import Host
-from ....types.ssl.certificate_packs import order_create_params
-from ....types.ssl.certificate_packs.order_create_response import OrderCreateResponse
-
-__all__ = ["OrderResource", "AsyncOrderResource"]
-
-
-class OrderResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> OrderResourceWithRawResponse:
-        return OrderResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> OrderResourceWithStreamingResponse:
-        return OrderResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        *,
-        zone_id: str,
-        certificate_authority: Literal["google", "lets_encrypt"],
-        hosts: List[Host],
-        type: Literal["advanced"],
-        validation_method: Literal["txt", "http", "email"],
-        validity_days: Literal[14, 30, 90, 365],
-        cloudflare_branding: bool | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OrderCreateResponse]:
-        """
-        For a given zone, order an advanced certificate pack.
-
-        Args:
-          zone_id: Identifier
-
-          certificate_authority: Certificate Authority selected for the order. For information on any certificate
-              authority specific details or restrictions
-              [see this page for more details.](https://developers.cloudflare.com/ssl/reference/certificate-authorities)
-
-          hosts: Comma separated list of valid host names for the certificate packs. Must contain
-              the zone apex, may not contain more than 50 hosts, and may not be empty.
-
-          type: Type of certificate pack.
-
-          validation_method: Validation Method selected for the order.
-
-          validity_days: Validity Days selected for the order.
-
-          cloudflare_branding: Whether or not to add Cloudflare Branding for the order. This will add
-              sni.cloudflaressl.com as the Common Name if set true.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._post(
-            f"/zones/{zone_id}/ssl/certificate_packs/order",
-            body=maybe_transform(
-                {
-                    "certificate_authority": certificate_authority,
-                    "hosts": hosts,
-                    "type": type,
-                    "validation_method": validation_method,
-                    "validity_days": validity_days,
-                    "cloudflare_branding": cloudflare_branding,
-                },
-                order_create_params.OrderCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[OrderCreateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[OrderCreateResponse]], ResultWrapper[OrderCreateResponse]),
-        )
-
-
-class AsyncOrderResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncOrderResourceWithRawResponse:
-        return AsyncOrderResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncOrderResourceWithStreamingResponse:
-        return AsyncOrderResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        *,
-        zone_id: str,
-        certificate_authority: Literal["google", "lets_encrypt"],
-        hosts: List[Host],
-        type: Literal["advanced"],
-        validation_method: Literal["txt", "http", "email"],
-        validity_days: Literal[14, 30, 90, 365],
-        cloudflare_branding: bool | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OrderCreateResponse]:
-        """
-        For a given zone, order an advanced certificate pack.
-
-        Args:
-          zone_id: Identifier
-
-          certificate_authority: Certificate Authority selected for the order. For information on any certificate
-              authority specific details or restrictions
-              [see this page for more details.](https://developers.cloudflare.com/ssl/reference/certificate-authorities)
-
-          hosts: Comma separated list of valid host names for the certificate packs. Must contain
-              the zone apex, may not contain more than 50 hosts, and may not be empty.
-
-          type: Type of certificate pack.
-
-          validation_method: Validation Method selected for the order.
-
-          validity_days: Validity Days selected for the order.
-
-          cloudflare_branding: Whether or not to add Cloudflare Branding for the order. This will add
-              sni.cloudflaressl.com as the Common Name if set true.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._post(
-            f"/zones/{zone_id}/ssl/certificate_packs/order",
-            body=await async_maybe_transform(
-                {
-                    "certificate_authority": certificate_authority,
-                    "hosts": hosts,
-                    "type": type,
-                    "validation_method": validation_method,
-                    "validity_days": validity_days,
-                    "cloudflare_branding": cloudflare_branding,
-                },
-                order_create_params.OrderCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[OrderCreateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[OrderCreateResponse]], ResultWrapper[OrderCreateResponse]),
-        )
-
-
-class OrderResourceWithRawResponse:
-    def __init__(self, order: OrderResource) -> None:
-        self._order = order
-
-        self.create = to_raw_response_wrapper(
-            order.create,
-        )
-
-
-class AsyncOrderResourceWithRawResponse:
-    def __init__(self, order: AsyncOrderResource) -> None:
-        self._order = order
-
-        self.create = async_to_raw_response_wrapper(
-            order.create,
-        )
-
-
-class OrderResourceWithStreamingResponse:
-    def __init__(self, order: OrderResource) -> None:
-        self._order = order
-
-        self.create = to_streamed_response_wrapper(
-            order.create,
-        )
-
-
-class AsyncOrderResourceWithStreamingResponse:
-    def __init__(self, order: AsyncOrderResource) -> None:
-        self._order = order
-
-        self.create = async_to_streamed_response_wrapper(
-            order.create,
-        )
diff --git a/src/cloudflare/resources/ssl/certificate_packs/quota.py b/src/cloudflare/resources/ssl/certificate_packs/quota.py
index c9a985900f6..9dc81bd7913 100644
--- a/src/cloudflare/resources/ssl/certificate_packs/quota.py
+++ b/src/cloudflare/resources/ssl/certificate_packs/quota.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -25,10 +25,21 @@
 class QuotaResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> QuotaResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return QuotaResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> QuotaResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return QuotaResourceWithStreamingResponse(self)
 
     def get(
@@ -40,13 +51,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[QuotaGetResponse]:
         """
         For a given zone, list certificate pack quotas.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -74,10 +85,21 @@ def get(
 class AsyncQuotaResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncQuotaResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncQuotaResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncQuotaResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncQuotaResourceWithStreamingResponse(self)
 
     async def get(
@@ -89,13 +111,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[QuotaGetResponse]:
         """
         For a given zone, list certificate pack quotas.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/ssl/recommendations.py b/src/cloudflare/resources/ssl/recommendations.py
index b66214bd700..c9d81d87c87 100644
--- a/src/cloudflare/resources/ssl/recommendations.py
+++ b/src/cloudflare/resources/ssl/recommendations.py
@@ -2,11 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+import typing_extensions
+from typing import Type, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Query, Headers, NotGiven, not_given
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -25,29 +26,39 @@
 class RecommendationsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RecommendationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RecommendationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RecommendationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RecommendationsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("SSL/TLS Recommender has been decommissioned in favor of Automatic SSL/TLS")
     def get(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RecommendationGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RecommendationGetResponse:
         """
         Retrieve the SSL/TLS Recommender's recommendation for a zone.
 
         Args:
-          zone_identifier: Identifier
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -56,47 +67,57 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get(
-            f"/zones/{zone_identifier}/ssl/recommendation",
+            f"/zones/{zone_id}/ssl/recommendation",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[RecommendationGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[RecommendationGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[RecommendationGetResponse]], ResultWrapper[RecommendationGetResponse]),
+            cast_to=cast(Type[RecommendationGetResponse], ResultWrapper[RecommendationGetResponse]),
         )
 
 
 class AsyncRecommendationsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRecommendationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRecommendationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRecommendationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRecommendationsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("SSL/TLS Recommender has been decommissioned in favor of Automatic SSL/TLS")
     async def get(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RecommendationGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RecommendationGetResponse:
         """
         Retrieve the SSL/TLS Recommender's recommendation for a zone.
 
         Args:
-          zone_identifier: Identifier
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -105,18 +126,18 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return await self._get(
-            f"/zones/{zone_identifier}/ssl/recommendation",
+            f"/zones/{zone_id}/ssl/recommendation",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[RecommendationGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[RecommendationGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[RecommendationGetResponse]], ResultWrapper[RecommendationGetResponse]),
+            cast_to=cast(Type[RecommendationGetResponse], ResultWrapper[RecommendationGetResponse]),
         )
 
 
@@ -124,8 +145,10 @@ class RecommendationsResourceWithRawResponse:
     def __init__(self, recommendations: RecommendationsResource) -> None:
         self._recommendations = recommendations
 
-        self.get = to_raw_response_wrapper(
-            recommendations.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                recommendations.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -133,8 +156,10 @@ class AsyncRecommendationsResourceWithRawResponse:
     def __init__(self, recommendations: AsyncRecommendationsResource) -> None:
         self._recommendations = recommendations
 
-        self.get = async_to_raw_response_wrapper(
-            recommendations.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                recommendations.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -142,8 +167,10 @@ class RecommendationsResourceWithStreamingResponse:
     def __init__(self, recommendations: RecommendationsResource) -> None:
         self._recommendations = recommendations
 
-        self.get = to_streamed_response_wrapper(
-            recommendations.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                recommendations.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -151,6 +178,8 @@ class AsyncRecommendationsResourceWithStreamingResponse:
     def __init__(self, recommendations: AsyncRecommendationsResource) -> None:
         self._recommendations = recommendations
 
-        self.get = async_to_streamed_response_wrapper(
-            recommendations.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                recommendations.get,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/ssl/ssl.py b/src/cloudflare/resources/ssl/ssl.py
index 45302ec7bf7..c46c403db8b 100644
--- a/src/cloudflare/resources/ssl/ssl.py
+++ b/src/cloudflare/resources/ssl/ssl.py
@@ -11,14 +11,6 @@
     AsyncAnalyzeResourceWithStreamingResponse,
 )
 from ..._compat import cached_property
-from .universal import (
-    UniversalResource,
-    AsyncUniversalResource,
-    UniversalResourceWithRawResponse,
-    AsyncUniversalResourceWithRawResponse,
-    UniversalResourceWithStreamingResponse,
-    AsyncUniversalResourceWithStreamingResponse,
-)
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from .verification import (
     VerificationResource,
@@ -36,7 +28,15 @@
     RecommendationsResourceWithStreamingResponse,
     AsyncRecommendationsResourceWithStreamingResponse,
 )
-from .certificate_packs import (
+from .universal.universal import (
+    UniversalResource,
+    AsyncUniversalResource,
+    UniversalResourceWithRawResponse,
+    AsyncUniversalResourceWithRawResponse,
+    UniversalResourceWithStreamingResponse,
+    AsyncUniversalResourceWithStreamingResponse,
+)
+from .certificate_packs.certificate_packs import (
     CertificatePacksResource,
     AsyncCertificatePacksResource,
     CertificatePacksResourceWithRawResponse,
@@ -44,8 +44,6 @@
     CertificatePacksResourceWithStreamingResponse,
     AsyncCertificatePacksResourceWithStreamingResponse,
 )
-from .universal.universal import UniversalResource, AsyncUniversalResource
-from .certificate_packs.certificate_packs import CertificatePacksResource, AsyncCertificatePacksResource
 
 __all__ = ["SSLResource", "AsyncSSLResource"]
 
@@ -73,10 +71,21 @@ def verification(self) -> VerificationResource:
 
     @cached_property
     def with_raw_response(self) -> SSLResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SSLResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SSLResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SSLResourceWithStreamingResponse(self)
 
 
@@ -103,10 +112,21 @@ def verification(self) -> AsyncVerificationResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncSSLResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSSLResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSSLResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSSLResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/ssl/universal/settings.py b/src/cloudflare/resources/ssl/universal/settings.py
index a595d0c0d46..a16e956a36f 100644
--- a/src/cloudflare/resources/ssl/universal/settings.py
+++ b/src/cloudflare/resources/ssl/universal/settings.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -30,29 +27,40 @@
 class SettingsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SettingsResourceWithStreamingResponse(self)
 
     def edit(
         self,
         *,
         zone_id: str,
-        enabled: bool | NotGiven = NOT_GIVEN,
+        enabled: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[UniversalSSLSettings]:
         """
         Patch Universal SSL Settings for a Zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           enabled: Disabling Universal SSL removes any currently active Universal SSL certificates
               for your zone from the edge and prevents any future Universal SSL certificates
@@ -112,13 +120,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[UniversalSSLSettings]:
         """
         Get Universal SSL Settings for a Zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -146,29 +154,40 @@ def get(
 class AsyncSettingsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSettingsResourceWithStreamingResponse(self)
 
     async def edit(
         self,
         *,
         zone_id: str,
-        enabled: bool | NotGiven = NOT_GIVEN,
+        enabled: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[UniversalSSLSettings]:
         """
         Patch Universal SSL Settings for a Zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           enabled: Disabling Universal SSL removes any currently active Universal SSL certificates
               for your zone from the edge and prevents any future Universal SSL certificates
@@ -228,13 +247,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[UniversalSSLSettings]:
         """
         Get Universal SSL Settings for a Zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/ssl/universal/universal.py b/src/cloudflare/resources/ssl/universal/universal.py
index 7f89451e1d5..8b2a4868f8d 100644
--- a/src/cloudflare/resources/ssl/universal/universal.py
+++ b/src/cloudflare/resources/ssl/universal/universal.py
@@ -23,10 +23,21 @@ def settings(self) -> SettingsResource:
 
     @cached_property
     def with_raw_response(self) -> UniversalResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return UniversalResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> UniversalResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return UniversalResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def settings(self) -> AsyncSettingsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncUniversalResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncUniversalResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncUniversalResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncUniversalResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/ssl/verification.py b/src/cloudflare/resources/ssl/verification.py
index 6c5f9e0da7a..7262218e55a 100644
--- a/src/cloudflare/resources/ssl/verification.py
+++ b/src/cloudflare/resources/ssl/verification.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -32,10 +29,21 @@
 class VerificationResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> VerificationResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return VerificationResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> VerificationResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return VerificationResourceWithStreamingResponse(self)
 
     def edit(
@@ -49,7 +57,7 @@ def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[VerificationEditResponse]:
         """Edit SSL validation method for a certificate pack.
 
@@ -59,7 +67,7 @@ def edit(
         using that method.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           certificate_pack_id: Certificate Pack UUID.
 
@@ -98,19 +106,19 @@ def get(
         self,
         *,
         zone_id: str,
-        retry: Literal[True] | NotGiven = NOT_GIVEN,
+        retry: Literal[True] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[VerificationGetResponse]:
         """
         Get SSL Verification Info for a Zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           retry: Immediately retry SSL Verification.
 
@@ -141,10 +149,21 @@ def get(
 class AsyncVerificationResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncVerificationResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncVerificationResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncVerificationResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncVerificationResourceWithStreamingResponse(self)
 
     async def edit(
@@ -158,7 +177,7 @@ async def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[VerificationEditResponse]:
         """Edit SSL validation method for a certificate pack.
 
@@ -168,7 +187,7 @@ async def edit(
         using that method.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           certificate_pack_id: Certificate Pack UUID.
 
@@ -207,19 +226,19 @@ async def get(
         self,
         *,
         zone_id: str,
-        retry: Literal[True] | NotGiven = NOT_GIVEN,
+        retry: Literal[True] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[VerificationGetResponse]:
         """
         Get SSL Verification Info for a Zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           retry: Immediately retry SSL Verification.
 
diff --git a/src/cloudflare/resources/storage/__init__.py b/src/cloudflare/resources/storage/__init__.py
deleted file mode 100644
index 9c22eb0dc9e..00000000000
--- a/src/cloudflare/resources/storage/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from .storage import (
-    StorageResource,
-    AsyncStorageResource,
-    StorageResourceWithRawResponse,
-    AsyncStorageResourceWithRawResponse,
-    StorageResourceWithStreamingResponse,
-    AsyncStorageResourceWithStreamingResponse,
-)
-from .analytics import (
-    AnalyticsResource,
-    AsyncAnalyticsResource,
-    AnalyticsResourceWithRawResponse,
-    AsyncAnalyticsResourceWithRawResponse,
-    AnalyticsResourceWithStreamingResponse,
-    AsyncAnalyticsResourceWithStreamingResponse,
-)
-
-__all__ = [
-    "AnalyticsResource",
-    "AsyncAnalyticsResource",
-    "AnalyticsResourceWithRawResponse",
-    "AsyncAnalyticsResourceWithRawResponse",
-    "AnalyticsResourceWithStreamingResponse",
-    "AsyncAnalyticsResourceWithStreamingResponse",
-    "StorageResource",
-    "AsyncStorageResource",
-    "StorageResourceWithRawResponse",
-    "AsyncStorageResourceWithRawResponse",
-    "StorageResourceWithStreamingResponse",
-    "AsyncStorageResourceWithStreamingResponse",
-]
diff --git a/src/cloudflare/resources/storage/analytics.py b/src/cloudflare/resources/storage/analytics.py
deleted file mode 100644
index fa6849c8620..00000000000
--- a/src/cloudflare/resources/storage/analytics.py
+++ /dev/null
@@ -1,268 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Optional, cast
-
-import httpx
-
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
-from ...types.storage import analytics_list_params, analytics_stored_params
-from ...types.storage.schema import Schema
-from ...types.storage.components import Components
-
-__all__ = ["AnalyticsResource", "AsyncAnalyticsResource"]
-
-
-class AnalyticsResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AnalyticsResourceWithRawResponse:
-        return AnalyticsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AnalyticsResourceWithStreamingResponse:
-        return AnalyticsResourceWithStreamingResponse(self)
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        query: analytics_list_params.Query | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Schema]:
-        """
-        Retrieves Workers KV request metrics for the given account.
-
-        Args:
-          account_id: Identifier
-
-          query: For specifying result metrics.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/storage/analytics",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform({"query": query}, analytics_list_params.AnalyticsListParams),
-                post_parser=ResultWrapper[Optional[Schema]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Schema]], ResultWrapper[Schema]),
-        )
-
-    def stored(
-        self,
-        *,
-        account_id: str,
-        query: analytics_stored_params.Query | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Components]:
-        """
-        Retrieves Workers KV stored data metrics for the given account.
-
-        Args:
-          account_id: Identifier
-
-          query: For specifying result metrics.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/storage/analytics/stored",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform({"query": query}, analytics_stored_params.AnalyticsStoredParams),
-                post_parser=ResultWrapper[Optional[Components]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Components]], ResultWrapper[Components]),
-        )
-
-
-class AsyncAnalyticsResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncAnalyticsResourceWithRawResponse:
-        return AsyncAnalyticsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncAnalyticsResourceWithStreamingResponse:
-        return AsyncAnalyticsResourceWithStreamingResponse(self)
-
-    async def list(
-        self,
-        *,
-        account_id: str,
-        query: analytics_list_params.Query | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Schema]:
-        """
-        Retrieves Workers KV request metrics for the given account.
-
-        Args:
-          account_id: Identifier
-
-          query: For specifying result metrics.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/storage/analytics",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=await async_maybe_transform({"query": query}, analytics_list_params.AnalyticsListParams),
-                post_parser=ResultWrapper[Optional[Schema]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Schema]], ResultWrapper[Schema]),
-        )
-
-    async def stored(
-        self,
-        *,
-        account_id: str,
-        query: analytics_stored_params.Query | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Components]:
-        """
-        Retrieves Workers KV stored data metrics for the given account.
-
-        Args:
-          account_id: Identifier
-
-          query: For specifying result metrics.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/storage/analytics/stored",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=await async_maybe_transform({"query": query}, analytics_stored_params.AnalyticsStoredParams),
-                post_parser=ResultWrapper[Optional[Components]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Components]], ResultWrapper[Components]),
-        )
-
-
-class AnalyticsResourceWithRawResponse:
-    def __init__(self, analytics: AnalyticsResource) -> None:
-        self._analytics = analytics
-
-        self.list = to_raw_response_wrapper(
-            analytics.list,
-        )
-        self.stored = to_raw_response_wrapper(
-            analytics.stored,
-        )
-
-
-class AsyncAnalyticsResourceWithRawResponse:
-    def __init__(self, analytics: AsyncAnalyticsResource) -> None:
-        self._analytics = analytics
-
-        self.list = async_to_raw_response_wrapper(
-            analytics.list,
-        )
-        self.stored = async_to_raw_response_wrapper(
-            analytics.stored,
-        )
-
-
-class AnalyticsResourceWithStreamingResponse:
-    def __init__(self, analytics: AnalyticsResource) -> None:
-        self._analytics = analytics
-
-        self.list = to_streamed_response_wrapper(
-            analytics.list,
-        )
-        self.stored = to_streamed_response_wrapper(
-            analytics.stored,
-        )
-
-
-class AsyncAnalyticsResourceWithStreamingResponse:
-    def __init__(self, analytics: AsyncAnalyticsResource) -> None:
-        self._analytics = analytics
-
-        self.list = async_to_streamed_response_wrapper(
-            analytics.list,
-        )
-        self.stored = async_to_streamed_response_wrapper(
-            analytics.stored,
-        )
diff --git a/src/cloudflare/resources/storage/storage.py b/src/cloudflare/resources/storage/storage.py
deleted file mode 100644
index 29fac0d0f7a..00000000000
--- a/src/cloudflare/resources/storage/storage.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from ..._compat import cached_property
-from .analytics import (
-    AnalyticsResource,
-    AsyncAnalyticsResource,
-    AnalyticsResourceWithRawResponse,
-    AsyncAnalyticsResourceWithRawResponse,
-    AnalyticsResourceWithStreamingResponse,
-    AsyncAnalyticsResourceWithStreamingResponse,
-)
-from ..._resource import SyncAPIResource, AsyncAPIResource
-
-__all__ = ["StorageResource", "AsyncStorageResource"]
-
-
-class StorageResource(SyncAPIResource):
-    @cached_property
-    def analytics(self) -> AnalyticsResource:
-        return AnalyticsResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> StorageResourceWithRawResponse:
-        return StorageResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> StorageResourceWithStreamingResponse:
-        return StorageResourceWithStreamingResponse(self)
-
-
-class AsyncStorageResource(AsyncAPIResource):
-    @cached_property
-    def analytics(self) -> AsyncAnalyticsResource:
-        return AsyncAnalyticsResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncStorageResourceWithRawResponse:
-        return AsyncStorageResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncStorageResourceWithStreamingResponse:
-        return AsyncStorageResourceWithStreamingResponse(self)
-
-
-class StorageResourceWithRawResponse:
-    def __init__(self, storage: StorageResource) -> None:
-        self._storage = storage
-
-    @cached_property
-    def analytics(self) -> AnalyticsResourceWithRawResponse:
-        return AnalyticsResourceWithRawResponse(self._storage.analytics)
-
-
-class AsyncStorageResourceWithRawResponse:
-    def __init__(self, storage: AsyncStorageResource) -> None:
-        self._storage = storage
-
-    @cached_property
-    def analytics(self) -> AsyncAnalyticsResourceWithRawResponse:
-        return AsyncAnalyticsResourceWithRawResponse(self._storage.analytics)
-
-
-class StorageResourceWithStreamingResponse:
-    def __init__(self, storage: StorageResource) -> None:
-        self._storage = storage
-
-    @cached_property
-    def analytics(self) -> AnalyticsResourceWithStreamingResponse:
-        return AnalyticsResourceWithStreamingResponse(self._storage.analytics)
-
-
-class AsyncStorageResourceWithStreamingResponse:
-    def __init__(self, storage: AsyncStorageResource) -> None:
-        self._storage = storage
-
-    @cached_property
-    def analytics(self) -> AsyncAnalyticsResourceWithStreamingResponse:
-        return AsyncAnalyticsResourceWithStreamingResponse(self._storage.analytics)
diff --git a/src/cloudflare/resources/stream/audio_tracks.py b/src/cloudflare/resources/stream/audio_tracks.py
index 9f62246419c..ddb3e34af20 100644
--- a/src/cloudflare/resources/stream/audio_tracks.py
+++ b/src/cloudflare/resources/stream/audio_tracks.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -20,10 +17,10 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
 from ...types.stream import audio_track_copy_params, audio_track_edit_params
 from ...types.stream.audio import Audio
-from ...types.stream.audio_track_get_response import AudioTrackGetResponse
 from ...types.stream.audio_track_delete_response import AudioTrackDeleteResponse
 
 __all__ = ["AudioTracksResource", "AsyncAudioTracksResource"]
@@ -32,10 +29,21 @@
 class AudioTracksResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AudioTracksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AudioTracksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AudioTracksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AudioTracksResourceWithStreamingResponse(self)
 
     def delete(
@@ -49,8 +57,8 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AudioTrackDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
         """Deletes additional audio tracks on a video.
 
         Deleting a default audio track is
@@ -77,21 +85,16 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         if not audio_identifier:
             raise ValueError(f"Expected a non-empty value for `audio_identifier` but received {audio_identifier!r}")
-        return cast(
-            Optional[AudioTrackDeleteResponse],
-            self._delete(
-                f"/accounts/{account_id}/stream/{identifier}/audio/{audio_identifier}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[AudioTrackDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AudioTrackDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._delete(
+            f"/accounts/{account_id}/stream/{identifier}/audio/{audio_identifier}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AudioTrackDeleteResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
         )
 
     def copy(
@@ -100,13 +103,13 @@ def copy(
         *,
         account_id: str,
         label: str,
-        url: str | NotGiven = NOT_GIVEN,
+        url: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Audio]:
         """
         Adds an additional audio track to a video using the provided audio track URL.
@@ -160,14 +163,14 @@ def edit(
         *,
         account_id: str,
         identifier: str,
-        default: bool | NotGiven = NOT_GIVEN,
-        label: str | NotGiven = NOT_GIVEN,
+        default: bool | Omit = omit,
+        label: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Audio]:
         """Edits additional audio tracks on a video.
 
@@ -230,8 +233,8 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AudioTrackGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[Audio]:
         """Lists additional audio tracks on a video.
 
         Note this API will not return
@@ -254,26 +257,34 @@ def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/stream/{identifier}/audio",
+            page=SyncSinglePage[Audio],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[AudioTrackGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[AudioTrackGetResponse]], ResultWrapper[AudioTrackGetResponse]),
+            model=Audio,
         )
 
 
 class AsyncAudioTracksResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncAudioTracksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAudioTracksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAudioTracksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAudioTracksResourceWithStreamingResponse(self)
 
     async def delete(
@@ -287,8 +298,8 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AudioTrackDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
         """Deletes additional audio tracks on a video.
 
         Deleting a default audio track is
@@ -315,21 +326,16 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         if not audio_identifier:
             raise ValueError(f"Expected a non-empty value for `audio_identifier` but received {audio_identifier!r}")
-        return cast(
-            Optional[AudioTrackDeleteResponse],
-            await self._delete(
-                f"/accounts/{account_id}/stream/{identifier}/audio/{audio_identifier}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[AudioTrackDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AudioTrackDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._delete(
+            f"/accounts/{account_id}/stream/{identifier}/audio/{audio_identifier}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AudioTrackDeleteResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
         )
 
     async def copy(
@@ -338,13 +344,13 @@ async def copy(
         *,
         account_id: str,
         label: str,
-        url: str | NotGiven = NOT_GIVEN,
+        url: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Audio]:
         """
         Adds an additional audio track to a video using the provided audio track URL.
@@ -398,14 +404,14 @@ async def edit(
         *,
         account_id: str,
         identifier: str,
-        default: bool | NotGiven = NOT_GIVEN,
-        label: str | NotGiven = NOT_GIVEN,
+        default: bool | Omit = omit,
+        label: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Audio]:
         """Edits additional audio tracks on a video.
 
@@ -458,7 +464,7 @@ async def edit(
             cast_to=cast(Type[Optional[Audio]], ResultWrapper[Audio]),
         )
 
-    async def get(
+    def get(
         self,
         identifier: str,
         *,
@@ -468,8 +474,8 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AudioTrackGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Audio, AsyncSinglePage[Audio]]:
         """Lists additional audio tracks on a video.
 
         Note this API will not return
@@ -492,16 +498,13 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/stream/{identifier}/audio",
+            page=AsyncSinglePage[Audio],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[AudioTrackGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[AudioTrackGetResponse]], ResultWrapper[AudioTrackGetResponse]),
+            model=Audio,
         )
 
 
diff --git a/src/cloudflare/resources/stream/captions/captions.py b/src/cloudflare/resources/stream/captions/captions.py
index c677efa56fd..18ee4b239ee 100644
--- a/src/cloudflare/resources/stream/captions/captions.py
+++ b/src/cloudflare/resources/stream/captions/captions.py
@@ -2,19 +2,9 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
-
 import httpx
 
-from .language import (
-    LanguageResource,
-    AsyncLanguageResource,
-    LanguageResourceWithRawResponse,
-    AsyncLanguageResourceWithRawResponse,
-    LanguageResourceWithStreamingResponse,
-    AsyncLanguageResourceWithStreamingResponse,
-)
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -23,10 +13,17 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
-from .language.language import LanguageResource, AsyncLanguageResource
-from ....types.stream.caption_get_response import CaptionGetResponse
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from .language.language import (
+    LanguageResource,
+    AsyncLanguageResource,
+    LanguageResourceWithRawResponse,
+    AsyncLanguageResourceWithRawResponse,
+    LanguageResourceWithStreamingResponse,
+    AsyncLanguageResourceWithStreamingResponse,
+)
+from ....types.stream.caption import Caption
 
 __all__ = ["CaptionsResource", "AsyncCaptionsResource"]
 
@@ -38,10 +35,21 @@ def language(self) -> LanguageResource:
 
     @cached_property
     def with_raw_response(self) -> CaptionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CaptionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CaptionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CaptionsResourceWithStreamingResponse(self)
 
     def get(
@@ -54,13 +62,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CaptionGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[Caption]:
         """
         Lists the available captions or subtitles for a specific video.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           identifier: A Cloudflare-generated unique identifier for a media item.
 
@@ -76,16 +84,13 @@ def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/stream/{identifier}/captions",
+            page=SyncSinglePage[Caption],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CaptionGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[CaptionGetResponse]], ResultWrapper[CaptionGetResponse]),
+            model=Caption,
         )
 
 
@@ -96,13 +101,24 @@ def language(self) -> AsyncLanguageResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncCaptionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCaptionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCaptionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCaptionsResourceWithStreamingResponse(self)
 
-    async def get(
+    def get(
         self,
         identifier: str,
         *,
@@ -112,13 +128,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CaptionGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Caption, AsyncSinglePage[Caption]]:
         """
         Lists the available captions or subtitles for a specific video.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           identifier: A Cloudflare-generated unique identifier for a media item.
 
@@ -134,16 +150,13 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/stream/{identifier}/captions",
+            page=AsyncSinglePage[Caption],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CaptionGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[CaptionGetResponse]], ResultWrapper[CaptionGetResponse]),
+            model=Caption,
         )
 
 
diff --git a/src/cloudflare/resources/stream/captions/language/language.py b/src/cloudflare/resources/stream/captions/language/language.py
index d14623d3ff0..c93200cc835 100644
--- a/src/cloudflare/resources/stream/captions/language/language.py
+++ b/src/cloudflare/resources/stream/captions/language/language.py
@@ -14,11 +14,8 @@
     VttResourceWithStreamingResponse,
     AsyncVttResourceWithStreamingResponse,
 )
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Query, Headers, NotGiven, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -43,10 +40,21 @@ def vtt(self) -> VttResource:
 
     @cached_property
     def with_raw_response(self) -> LanguageResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LanguageResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LanguageResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LanguageResourceWithStreamingResponse(self)
 
     def create(
@@ -60,13 +68,13 @@ def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Caption]:
         """
         Generate captions or subtitles for provided language via AI.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           identifier: A Cloudflare-generated unique identifier for a media item.
 
@@ -110,14 +118,14 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Caption]:
         """
         Uploads the caption or subtitle file to the endpoint for a specific BCP47
         language. One caption or subtitle file per language is allowed.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           identifier: A Cloudflare-generated unique identifier for a media item.
 
@@ -167,13 +175,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> str:
         """
         Removes the captions or subtitles from a video.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           identifier: A Cloudflare-generated unique identifier for a media item.
 
@@ -216,13 +224,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Caption]:
         """
         Lists the captions or subtitles for provided language.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           identifier: A Cloudflare-generated unique identifier for a media item.
 
@@ -262,10 +270,21 @@ def vtt(self) -> AsyncVttResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncLanguageResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLanguageResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLanguageResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLanguageResourceWithStreamingResponse(self)
 
     async def create(
@@ -279,13 +298,13 @@ async def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Caption]:
         """
         Generate captions or subtitles for provided language via AI.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           identifier: A Cloudflare-generated unique identifier for a media item.
 
@@ -329,14 +348,14 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Caption]:
         """
         Uploads the caption or subtitle file to the endpoint for a specific BCP47
         language. One caption or subtitle file per language is allowed.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           identifier: A Cloudflare-generated unique identifier for a media item.
 
@@ -386,13 +405,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> str:
         """
         Removes the captions or subtitles from a video.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           identifier: A Cloudflare-generated unique identifier for a media item.
 
@@ -435,13 +454,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Caption]:
         """
         Lists the captions or subtitles for provided language.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           identifier: A Cloudflare-generated unique identifier for a media item.
 
diff --git a/src/cloudflare/resources/stream/captions/language/vtt.py b/src/cloudflare/resources/stream/captions/language/vtt.py
index 2d9bc01af2a..40884504871 100644
--- a/src/cloudflare/resources/stream/captions/language/vtt.py
+++ b/src/cloudflare/resources/stream/captions/language/vtt.py
@@ -4,7 +4,7 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ....._types import Body, Query, Headers, NotGiven, not_given
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -21,10 +21,21 @@
 class VttResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> VttResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return VttResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> VttResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return VttResourceWithStreamingResponse(self)
 
     def get(
@@ -38,13 +49,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> str:
         """
         Return WebVTT captions for a provided language.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           identifier: A Cloudflare-generated unique identifier for a media item.
 
@@ -77,10 +88,21 @@ def get(
 class AsyncVttResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncVttResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncVttResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncVttResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncVttResourceWithStreamingResponse(self)
 
     async def get(
@@ -94,13 +116,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> str:
         """
         Return WebVTT captions for a provided language.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           identifier: A Cloudflare-generated unique identifier for a media item.
 
diff --git a/src/cloudflare/resources/stream/clip.py b/src/cloudflare/resources/stream/clip.py
index f7cfef075ae..d9c8a4c6560 100644
--- a/src/cloudflare/resources/stream/clip.py
+++ b/src/cloudflare/resources/stream/clip.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -31,10 +28,21 @@
 class ClipResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ClipResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ClipResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ClipResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ClipResourceWithStreamingResponse(self)
 
     def create(
@@ -44,18 +52,18 @@ def create(
         clipped_from_video_uid: str,
         end_time_seconds: int,
         start_time_seconds: int,
-        allowed_origins: List[AllowedOrigins] | NotGiven = NOT_GIVEN,
-        creator: str | NotGiven = NOT_GIVEN,
-        max_duration_seconds: int | NotGiven = NOT_GIVEN,
-        require_signed_urls: bool | NotGiven = NOT_GIVEN,
-        thumbnail_timestamp_pct: float | NotGiven = NOT_GIVEN,
-        watermark: clip_create_params.Watermark | NotGiven = NOT_GIVEN,
+        allowed_origins: SequenceNotStr[AllowedOrigins] | Omit = omit,
+        creator: str | Omit = omit,
+        max_duration_seconds: int | Omit = omit,
+        require_signed_urls: bool | Omit = omit,
+        thumbnail_timestamp_pct: float | Omit = omit,
+        watermark: clip_create_params.Watermark | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Clip]:
         """
         Clips a video based on the specified start and end times provided in seconds.
@@ -128,10 +136,21 @@ def create(
 class AsyncClipResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncClipResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncClipResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncClipResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncClipResourceWithStreamingResponse(self)
 
     async def create(
@@ -141,18 +160,18 @@ async def create(
         clipped_from_video_uid: str,
         end_time_seconds: int,
         start_time_seconds: int,
-        allowed_origins: List[AllowedOrigins] | NotGiven = NOT_GIVEN,
-        creator: str | NotGiven = NOT_GIVEN,
-        max_duration_seconds: int | NotGiven = NOT_GIVEN,
-        require_signed_urls: bool | NotGiven = NOT_GIVEN,
-        thumbnail_timestamp_pct: float | NotGiven = NOT_GIVEN,
-        watermark: clip_create_params.Watermark | NotGiven = NOT_GIVEN,
+        allowed_origins: SequenceNotStr[AllowedOrigins] | Omit = omit,
+        creator: str | Omit = omit,
+        max_duration_seconds: int | Omit = omit,
+        require_signed_urls: bool | Omit = omit,
+        thumbnail_timestamp_pct: float | Omit = omit,
+        watermark: clip_create_params.Watermark | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Clip]:
         """
         Clips a video based on the specified start and end times provided in seconds.
diff --git a/src/cloudflare/resources/stream/copy.py b/src/cloudflare/resources/stream/copy.py
index ba3e519005d..d41f535afec 100644
--- a/src/cloudflare/resources/stream/copy.py
+++ b/src/cloudflare/resources/stream/copy.py
@@ -2,17 +2,13 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Union, Optional, cast
+from typing import Type, Union, Optional, cast
 from datetime import datetime
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    strip_not_given,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, strip_not_given, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -33,10 +29,21 @@
 class CopyResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> CopyResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CopyResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CopyResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CopyResourceWithStreamingResponse(self)
 
     def create(
@@ -44,21 +51,20 @@ def create(
         *,
         account_id: str,
         url: str,
-        allowed_origins: List[AllowedOrigins] | NotGiven = NOT_GIVEN,
-        creator: str | NotGiven = NOT_GIVEN,
-        meta: object | NotGiven = NOT_GIVEN,
-        require_signed_urls: bool | NotGiven = NOT_GIVEN,
-        scheduled_deletion: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        thumbnail_timestamp_pct: float | NotGiven = NOT_GIVEN,
-        watermark: copy_create_params.Watermark | NotGiven = NOT_GIVEN,
-        upload_creator: str | NotGiven = NOT_GIVEN,
-        upload_metadata: str | NotGiven = NOT_GIVEN,
+        allowed_origins: SequenceNotStr[AllowedOrigins] | Omit = omit,
+        creator: str | Omit = omit,
+        meta: object | Omit = omit,
+        require_signed_urls: bool | Omit = omit,
+        scheduled_deletion: Union[str, datetime] | Omit = omit,
+        thumbnail_timestamp_pct: float | Omit = omit,
+        watermark: copy_create_params.Watermark | Omit = omit,
+        upload_creator: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Video]:
         """
         Uploads a video to Stream from a provided URL.
@@ -93,10 +99,6 @@ def create(
 
           upload_creator: A user-defined identifier for the media creator.
 
-          upload_metadata: Comma-separated key-value pairs following the TUS protocol specification. Values
-              are Base-64 encoded. Supported keys: `name`, `requiresignedurls`,
-              `allowedorigins`, `thumbnailtimestamppct`, `watermark`, `scheduleddeletion`.
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -107,15 +109,7 @@ def create(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        extra_headers = {
-            **strip_not_given(
-                {
-                    "Upload-Creator": upload_creator,
-                    "Upload-Metadata": upload_metadata,
-                }
-            ),
-            **(extra_headers or {}),
-        }
+        extra_headers = {**strip_not_given({"Upload-Creator": upload_creator}), **(extra_headers or {})}
         return self._post(
             f"/accounts/{account_id}/stream/copy",
             body=maybe_transform(
@@ -145,10 +139,21 @@ def create(
 class AsyncCopyResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncCopyResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCopyResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCopyResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCopyResourceWithStreamingResponse(self)
 
     async def create(
@@ -156,21 +161,20 @@ async def create(
         *,
         account_id: str,
         url: str,
-        allowed_origins: List[AllowedOrigins] | NotGiven = NOT_GIVEN,
-        creator: str | NotGiven = NOT_GIVEN,
-        meta: object | NotGiven = NOT_GIVEN,
-        require_signed_urls: bool | NotGiven = NOT_GIVEN,
-        scheduled_deletion: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        thumbnail_timestamp_pct: float | NotGiven = NOT_GIVEN,
-        watermark: copy_create_params.Watermark | NotGiven = NOT_GIVEN,
-        upload_creator: str | NotGiven = NOT_GIVEN,
-        upload_metadata: str | NotGiven = NOT_GIVEN,
+        allowed_origins: SequenceNotStr[AllowedOrigins] | Omit = omit,
+        creator: str | Omit = omit,
+        meta: object | Omit = omit,
+        require_signed_urls: bool | Omit = omit,
+        scheduled_deletion: Union[str, datetime] | Omit = omit,
+        thumbnail_timestamp_pct: float | Omit = omit,
+        watermark: copy_create_params.Watermark | Omit = omit,
+        upload_creator: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Video]:
         """
         Uploads a video to Stream from a provided URL.
@@ -205,10 +209,6 @@ async def create(
 
           upload_creator: A user-defined identifier for the media creator.
 
-          upload_metadata: Comma-separated key-value pairs following the TUS protocol specification. Values
-              are Base-64 encoded. Supported keys: `name`, `requiresignedurls`,
-              `allowedorigins`, `thumbnailtimestamppct`, `watermark`, `scheduleddeletion`.
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -219,15 +219,7 @@ async def create(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        extra_headers = {
-            **strip_not_given(
-                {
-                    "Upload-Creator": upload_creator,
-                    "Upload-Metadata": upload_metadata,
-                }
-            ),
-            **(extra_headers or {}),
-        }
+        extra_headers = {**strip_not_given({"Upload-Creator": upload_creator}), **(extra_headers or {})}
         return await self._post(
             f"/accounts/{account_id}/stream/copy",
             body=await async_maybe_transform(
diff --git a/src/cloudflare/resources/stream/direct_upload.py b/src/cloudflare/resources/stream/direct_upload.py
index 774c9b4ce11..e1bcd10bfe5 100644
--- a/src/cloudflare/resources/stream/direct_upload.py
+++ b/src/cloudflare/resources/stream/direct_upload.py
@@ -2,17 +2,13 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Union, Optional, cast
+from typing import Type, Union, Optional, cast
 from datetime import datetime
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    strip_not_given,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, strip_not_given, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -33,10 +29,21 @@
 class DirectUploadResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DirectUploadResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DirectUploadResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DirectUploadResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DirectUploadResourceWithStreamingResponse(self)
 
     def create(
@@ -44,21 +51,21 @@ def create(
         *,
         account_id: str,
         max_duration_seconds: int,
-        allowed_origins: List[AllowedOrigins] | NotGiven = NOT_GIVEN,
-        creator: str | NotGiven = NOT_GIVEN,
-        expiry: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        meta: object | NotGiven = NOT_GIVEN,
-        require_signed_urls: bool | NotGiven = NOT_GIVEN,
-        scheduled_deletion: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        thumbnail_timestamp_pct: float | NotGiven = NOT_GIVEN,
-        watermark: direct_upload_create_params.Watermark | NotGiven = NOT_GIVEN,
-        upload_creator: str | NotGiven = NOT_GIVEN,
+        allowed_origins: SequenceNotStr[AllowedOrigins] | Omit = omit,
+        creator: str | Omit = omit,
+        expiry: Union[str, datetime] | Omit = omit,
+        meta: object | Omit = omit,
+        require_signed_urls: bool | Omit = omit,
+        scheduled_deletion: Union[str, datetime] | Omit = omit,
+        thumbnail_timestamp_pct: float | Omit = omit,
+        watermark: direct_upload_create_params.Watermark | Omit = omit,
+        upload_creator: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DirectUploadCreateResponse]:
         """
         Creates a direct upload that allows video uploads without an API key.
@@ -137,10 +144,21 @@ def create(
 class AsyncDirectUploadResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDirectUploadResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDirectUploadResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDirectUploadResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDirectUploadResourceWithStreamingResponse(self)
 
     async def create(
@@ -148,21 +166,21 @@ async def create(
         *,
         account_id: str,
         max_duration_seconds: int,
-        allowed_origins: List[AllowedOrigins] | NotGiven = NOT_GIVEN,
-        creator: str | NotGiven = NOT_GIVEN,
-        expiry: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        meta: object | NotGiven = NOT_GIVEN,
-        require_signed_urls: bool | NotGiven = NOT_GIVEN,
-        scheduled_deletion: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        thumbnail_timestamp_pct: float | NotGiven = NOT_GIVEN,
-        watermark: direct_upload_create_params.Watermark | NotGiven = NOT_GIVEN,
-        upload_creator: str | NotGiven = NOT_GIVEN,
+        allowed_origins: SequenceNotStr[AllowedOrigins] | Omit = omit,
+        creator: str | Omit = omit,
+        expiry: Union[str, datetime] | Omit = omit,
+        meta: object | Omit = omit,
+        require_signed_urls: bool | Omit = omit,
+        scheduled_deletion: Union[str, datetime] | Omit = omit,
+        thumbnail_timestamp_pct: float | Omit = omit,
+        watermark: direct_upload_create_params.Watermark | Omit = omit,
+        upload_creator: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DirectUploadCreateResponse]:
         """
         Creates a direct upload that allows video uploads without an API key.
diff --git a/src/cloudflare/resources/stream/downloads.py b/src/cloudflare/resources/stream/downloads.py
index 77a98568ce5..e9d3a298875 100644
--- a/src/cloudflare/resources/stream/downloads.py
+++ b/src/cloudflare/resources/stream/downloads.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -32,10 +29,21 @@
 class DownloadsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DownloadsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DownloadsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DownloadsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DownloadsResourceWithStreamingResponse(self)
 
     def create(
@@ -49,13 +57,16 @@ def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DownloadCreateResponse]:
-        """
-        Creates a download for a video when a video is ready to view.
+        """Creates a download for a video when a video is ready to view.
+
+        Use
+        `/downloads/{download_type}` instead for type-specific downloads. Available
+        types are `default` and `audio`.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           identifier: A Cloudflare-generated unique identifier for a media item.
 
@@ -71,22 +82,17 @@ def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            Optional[DownloadCreateResponse],
-            self._post(
-                f"/accounts/{account_id}/stream/{identifier}/downloads",
-                body=maybe_transform(body, download_create_params.DownloadCreateParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[DownloadCreateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DownloadCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._post(
+            f"/accounts/{account_id}/stream/{identifier}/downloads",
+            body=maybe_transform(body, download_create_params.DownloadCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DownloadCreateResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[DownloadCreateResponse]], ResultWrapper[DownloadCreateResponse]),
         )
 
     def delete(
@@ -99,13 +105,15 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DownloadDeleteResponse]:
-        """
-        Delete the downloads for a video.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """Delete the downloads for a video.
+
+        Use `/downloads/{download_type}` instead for
+        type-specific downloads. Available types are `default` and `audio`.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           identifier: A Cloudflare-generated unique identifier for a media item.
 
@@ -121,21 +129,16 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            Optional[DownloadDeleteResponse],
-            self._delete(
-                f"/accounts/{account_id}/stream/{identifier}/downloads",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[DownloadDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DownloadDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._delete(
+            f"/accounts/{account_id}/stream/{identifier}/downloads",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DownloadDeleteResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
         )
 
     def get(
@@ -148,13 +151,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DownloadGetResponse]:
         """
         Lists the downloads created for a video.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           identifier: A Cloudflare-generated unique identifier for a media item.
 
@@ -170,31 +173,37 @@ def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            Optional[DownloadGetResponse],
-            self._get(
-                f"/accounts/{account_id}/stream/{identifier}/downloads",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[DownloadGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DownloadGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._get(
+            f"/accounts/{account_id}/stream/{identifier}/downloads",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DownloadGetResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[DownloadGetResponse]], ResultWrapper[DownloadGetResponse]),
         )
 
 
 class AsyncDownloadsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDownloadsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDownloadsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDownloadsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDownloadsResourceWithStreamingResponse(self)
 
     async def create(
@@ -208,13 +217,16 @@ async def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DownloadCreateResponse]:
-        """
-        Creates a download for a video when a video is ready to view.
+        """Creates a download for a video when a video is ready to view.
+
+        Use
+        `/downloads/{download_type}` instead for type-specific downloads. Available
+        types are `default` and `audio`.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           identifier: A Cloudflare-generated unique identifier for a media item.
 
@@ -230,22 +242,17 @@ async def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            Optional[DownloadCreateResponse],
-            await self._post(
-                f"/accounts/{account_id}/stream/{identifier}/downloads",
-                body=await async_maybe_transform(body, download_create_params.DownloadCreateParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[DownloadCreateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DownloadCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._post(
+            f"/accounts/{account_id}/stream/{identifier}/downloads",
+            body=await async_maybe_transform(body, download_create_params.DownloadCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DownloadCreateResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[DownloadCreateResponse]], ResultWrapper[DownloadCreateResponse]),
         )
 
     async def delete(
@@ -258,13 +265,15 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DownloadDeleteResponse]:
-        """
-        Delete the downloads for a video.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """Delete the downloads for a video.
+
+        Use `/downloads/{download_type}` instead for
+        type-specific downloads. Available types are `default` and `audio`.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           identifier: A Cloudflare-generated unique identifier for a media item.
 
@@ -280,21 +289,16 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            Optional[DownloadDeleteResponse],
-            await self._delete(
-                f"/accounts/{account_id}/stream/{identifier}/downloads",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[DownloadDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DownloadDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._delete(
+            f"/accounts/{account_id}/stream/{identifier}/downloads",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DownloadDeleteResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
         )
 
     async def get(
@@ -307,13 +311,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DownloadGetResponse]:
         """
         Lists the downloads created for a video.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           identifier: A Cloudflare-generated unique identifier for a media item.
 
@@ -329,21 +333,16 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            Optional[DownloadGetResponse],
-            await self._get(
-                f"/accounts/{account_id}/stream/{identifier}/downloads",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[DownloadGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DownloadGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._get(
+            f"/accounts/{account_id}/stream/{identifier}/downloads",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DownloadGetResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[DownloadGetResponse]], ResultWrapper[DownloadGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/stream/embed.py b/src/cloudflare/resources/stream/embed.py
index f63b5db6f43..ab5d6ec594b 100644
--- a/src/cloudflare/resources/stream/embed.py
+++ b/src/cloudflare/resources/stream/embed.py
@@ -4,7 +4,7 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Query, Headers, NotGiven, not_given
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -21,10 +21,21 @@
 class EmbedResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> EmbedResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return EmbedResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> EmbedResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return EmbedResourceWithStreamingResponse(self)
 
     def get(
@@ -37,7 +48,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> str:
         """
         Fetches an HTML code snippet to embed a video in a web page delivered through
@@ -73,10 +84,21 @@ def get(
 class AsyncEmbedResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncEmbedResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncEmbedResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncEmbedResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncEmbedResourceWithStreamingResponse(self)
 
     async def get(
@@ -89,7 +111,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> str:
         """
         Fetches an HTML code snippet to embed a video in a web page delivered through
diff --git a/src/cloudflare/resources/stream/keys.py b/src/cloudflare/resources/stream/keys.py
index 2c915fc8e2f..3b0f5dbac2f 100644
--- a/src/cloudflare/resources/stream/keys.py
+++ b/src/cloudflare/resources/stream/keys.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -20,7 +17,8 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
 from ...types.stream import key_create_params
 from ...types.stream.keys import Keys
 from ...types.stream.key_get_response import KeyGetResponse
@@ -32,10 +30,21 @@
 class KeysResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> KeysResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return KeysResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> KeysResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return KeysResourceWithStreamingResponse(self)
 
     def create(
@@ -48,7 +57,7 @@ def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Keys]:
         """Creates an RSA private key in PEM and JWK formats.
 
@@ -57,7 +66,7 @@ def create(
         videos, and every key can sign any video.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -92,15 +101,15 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[KeyDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
         """
         Deletes signing keys and revokes all signed URLs generated with the key.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          identifier: Identifier
+          identifier: Identifier.
 
           extra_headers: Send extra headers
 
@@ -114,21 +123,16 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            Optional[KeyDeleteResponse],
-            self._delete(
-                f"/accounts/{account_id}/stream/keys/{identifier}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[KeyDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[KeyDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._delete(
+            f"/accounts/{account_id}/stream/keys/{identifier}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[KeyDeleteResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
         )
 
     def get(
@@ -140,13 +144,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[KeyGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[KeyGetResponse]:
         """
         Lists the video ID and creation date and time when a signing key was created.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -158,26 +162,34 @@ def get(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/stream/keys",
+            page=SyncSinglePage[KeyGetResponse],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[KeyGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[KeyGetResponse]], ResultWrapper[KeyGetResponse]),
+            model=KeyGetResponse,
         )
 
 
 class AsyncKeysResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncKeysResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncKeysResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncKeysResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncKeysResourceWithStreamingResponse(self)
 
     async def create(
@@ -190,7 +202,7 @@ async def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Keys]:
         """Creates an RSA private key in PEM and JWK formats.
 
@@ -199,7 +211,7 @@ async def create(
         videos, and every key can sign any video.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -234,15 +246,15 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[KeyDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
         """
         Deletes signing keys and revokes all signed URLs generated with the key.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          identifier: Identifier
+          identifier: Identifier.
 
           extra_headers: Send extra headers
 
@@ -256,24 +268,19 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            Optional[KeyDeleteResponse],
-            await self._delete(
-                f"/accounts/{account_id}/stream/keys/{identifier}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[KeyDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[KeyDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._delete(
+            f"/accounts/{account_id}/stream/keys/{identifier}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[KeyDeleteResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
         )
 
-    async def get(
+    def get(
         self,
         *,
         account_id: str,
@@ -282,13 +289,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[KeyGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[KeyGetResponse, AsyncSinglePage[KeyGetResponse]]:
         """
         Lists the video ID and creation date and time when a signing key was created.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -300,16 +307,13 @@ async def get(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/stream/keys",
+            page=AsyncSinglePage[KeyGetResponse],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[KeyGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[KeyGetResponse]], ResultWrapper[KeyGetResponse]),
+            model=KeyGetResponse,
         )
 
 
diff --git a/src/cloudflare/resources/stream/live_inputs/live_inputs.py b/src/cloudflare/resources/stream/live_inputs/live_inputs.py
index 1bf4fe3446d..25a527c5b09 100644
--- a/src/cloudflare/resources/stream/live_inputs/live_inputs.py
+++ b/src/cloudflare/resources/stream/live_inputs/live_inputs.py
@@ -14,11 +14,8 @@
     OutputsResourceWithStreamingResponse,
     AsyncOutputsResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -43,33 +40,44 @@ def outputs(self) -> OutputsResource:
 
     @cached_property
     def with_raw_response(self) -> LiveInputsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LiveInputsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LiveInputsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LiveInputsResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        default_creator: str | NotGiven = NOT_GIVEN,
-        delete_recording_after_days: float | NotGiven = NOT_GIVEN,
-        meta: object | NotGiven = NOT_GIVEN,
-        recording: live_input_create_params.Recording | NotGiven = NOT_GIVEN,
+        default_creator: str | Omit = omit,
+        delete_recording_after_days: float | Omit = omit,
+        meta: object | Omit = omit,
+        recording: live_input_create_params.Recording | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LiveInput]:
         """
         Creates a live input, and returns credentials that you or your users can use to
         stream live video to Cloudflare Stream.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           default_creator: Sets the creator ID asssociated with this live input.
 
@@ -122,22 +130,22 @@ def update(
         live_input_identifier: str,
         *,
         account_id: str,
-        default_creator: str | NotGiven = NOT_GIVEN,
-        delete_recording_after_days: float | NotGiven = NOT_GIVEN,
-        meta: object | NotGiven = NOT_GIVEN,
-        recording: live_input_update_params.Recording | NotGiven = NOT_GIVEN,
+        default_creator: str | Omit = omit,
+        delete_recording_after_days: float | Omit = omit,
+        meta: object | Omit = omit,
+        recording: live_input_update_params.Recording | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LiveInput]:
         """
         Updates a specified live input.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           live_input_identifier: A unique identifier for a live input.
 
@@ -195,13 +203,13 @@ def list(
         self,
         *,
         account_id: str,
-        include_counts: bool | NotGiven = NOT_GIVEN,
+        include_counts: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LiveInputListResponse]:
         """Lists the live inputs created for an account.
 
@@ -209,7 +217,7 @@ def list(
         stream to a specific live input, request a single live input.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           include_counts: Includes the total number of videos associated with the submitted query
               parameters.
@@ -247,14 +255,14 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> None:
         """
         Prevents a live input from being streamed to and makes the live input
         inaccessible to any future API calls.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           live_input_identifier: A unique identifier for a live input.
 
@@ -291,13 +299,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LiveInput]:
         """
         Retrieves details of an existing live input.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           live_input_identifier: A unique identifier for a live input.
 
@@ -335,33 +343,44 @@ def outputs(self) -> AsyncOutputsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncLiveInputsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLiveInputsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLiveInputsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLiveInputsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        default_creator: str | NotGiven = NOT_GIVEN,
-        delete_recording_after_days: float | NotGiven = NOT_GIVEN,
-        meta: object | NotGiven = NOT_GIVEN,
-        recording: live_input_create_params.Recording | NotGiven = NOT_GIVEN,
+        default_creator: str | Omit = omit,
+        delete_recording_after_days: float | Omit = omit,
+        meta: object | Omit = omit,
+        recording: live_input_create_params.Recording | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LiveInput]:
         """
         Creates a live input, and returns credentials that you or your users can use to
         stream live video to Cloudflare Stream.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           default_creator: Sets the creator ID asssociated with this live input.
 
@@ -414,22 +433,22 @@ async def update(
         live_input_identifier: str,
         *,
         account_id: str,
-        default_creator: str | NotGiven = NOT_GIVEN,
-        delete_recording_after_days: float | NotGiven = NOT_GIVEN,
-        meta: object | NotGiven = NOT_GIVEN,
-        recording: live_input_update_params.Recording | NotGiven = NOT_GIVEN,
+        default_creator: str | Omit = omit,
+        delete_recording_after_days: float | Omit = omit,
+        meta: object | Omit = omit,
+        recording: live_input_update_params.Recording | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LiveInput]:
         """
         Updates a specified live input.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           live_input_identifier: A unique identifier for a live input.
 
@@ -487,13 +506,13 @@ async def list(
         self,
         *,
         account_id: str,
-        include_counts: bool | NotGiven = NOT_GIVEN,
+        include_counts: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LiveInputListResponse]:
         """Lists the live inputs created for an account.
 
@@ -501,7 +520,7 @@ async def list(
         stream to a specific live input, request a single live input.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           include_counts: Includes the total number of videos associated with the submitted query
               parameters.
@@ -541,14 +560,14 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> None:
         """
         Prevents a live input from being streamed to and makes the live input
         inaccessible to any future API calls.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           live_input_identifier: A unique identifier for a live input.
 
@@ -585,13 +604,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LiveInput]:
         """
         Retrieves details of an existing live input.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           live_input_identifier: A unique identifier for a live input.
 
diff --git a/src/cloudflare/resources/stream/live_inputs/outputs.py b/src/cloudflare/resources/stream/live_inputs/outputs.py
index ef72ec551ff..ee3ab054e87 100644
--- a/src/cloudflare/resources/stream/live_inputs/outputs.py
+++ b/src/cloudflare/resources/stream/live_inputs/outputs.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -31,10 +28,21 @@
 class OutputsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> OutputsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return OutputsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> OutputsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return OutputsResourceWithStreamingResponse(self)
 
     def create(
@@ -44,13 +52,13 @@ def create(
         account_id: str,
         stream_key: str,
         url: str,
-        enabled: bool | NotGiven = NOT_GIVEN,
+        enabled: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Output]:
         """
         Creates a new output that can be used to simulcast or restream live video to
@@ -58,7 +66,7 @@ def create(
         input — one live input can have many outputs.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           live_input_identifier: A unique identifier for a live input.
 
@@ -118,13 +126,13 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Output]:
         """
         Updates the state of an output.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           live_input_identifier: A unique identifier for a live input.
 
@@ -175,13 +183,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Output]:
         """
         Retrieves all outputs associated with a specified live input.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           live_input_identifier: A unique identifier for a live input.
 
@@ -219,13 +227,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> None:
         """
         Deletes an output and removes it from the associated live input.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           live_input_identifier: A unique identifier for a live input.
 
@@ -260,10 +268,21 @@ def delete(
 class AsyncOutputsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncOutputsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncOutputsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncOutputsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncOutputsResourceWithStreamingResponse(self)
 
     async def create(
@@ -273,13 +292,13 @@ async def create(
         account_id: str,
         stream_key: str,
         url: str,
-        enabled: bool | NotGiven = NOT_GIVEN,
+        enabled: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Output]:
         """
         Creates a new output that can be used to simulcast or restream live video to
@@ -287,7 +306,7 @@ async def create(
         input — one live input can have many outputs.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           live_input_identifier: A unique identifier for a live input.
 
@@ -347,13 +366,13 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Output]:
         """
         Updates the state of an output.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           live_input_identifier: A unique identifier for a live input.
 
@@ -404,13 +423,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Output, AsyncSinglePage[Output]]:
         """
         Retrieves all outputs associated with a specified live input.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           live_input_identifier: A unique identifier for a live input.
 
@@ -448,13 +467,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> None:
         """
         Deletes an output and removes it from the associated live input.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           live_input_identifier: A unique identifier for a live input.
 
diff --git a/src/cloudflare/resources/stream/stream.py b/src/cloudflare/resources/stream/stream.py
index ce47eef83bc..354a05c45fc 100644
--- a/src/cloudflare/resources/stream/stream.py
+++ b/src/cloudflare/resources/stream/stream.py
@@ -56,20 +56,8 @@
     VideosResourceWithStreamingResponse,
     AsyncVideosResourceWithStreamingResponse,
 )
-from ..._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven
-from ..._utils import (
-    maybe_transform,
-    strip_not_given,
-    async_maybe_transform,
-)
-from .captions import (
-    CaptionsResource,
-    AsyncCaptionsResource,
-    CaptionsResourceWithRawResponse,
-    AsyncCaptionsResourceWithRawResponse,
-    CaptionsResourceWithStreamingResponse,
-    AsyncCaptionsResourceWithStreamingResponse,
-)
+from ..._types import Body, Omit, Query, Headers, NoneType, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, strip_not_given, async_maybe_transform
 from .webhooks import (
     WebhooksResource,
     AsyncWebhooksResource,
@@ -103,14 +91,6 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from .live_inputs import (
-    LiveInputsResource,
-    AsyncLiveInputsResource,
-    LiveInputsResourceWithRawResponse,
-    AsyncLiveInputsResourceWithRawResponse,
-    LiveInputsResourceWithStreamingResponse,
-    AsyncLiveInputsResourceWithStreamingResponse,
-)
 from ...pagination import SyncSinglePage, AsyncSinglePage
 from .audio_tracks import (
     AudioTracksResource,
@@ -129,10 +109,25 @@
     AsyncDirectUploadResourceWithStreamingResponse,
 )
 from ..._base_client import AsyncPaginator, make_request_options
-from ...types.stream import stream_list_params, stream_create_params
-from .captions.captions import CaptionsResource, AsyncCaptionsResource
+from ...types.stream import stream_edit_params, stream_list_params, stream_create_params
+from .captions.captions import (
+    CaptionsResource,
+    AsyncCaptionsResource,
+    CaptionsResourceWithRawResponse,
+    AsyncCaptionsResourceWithRawResponse,
+    CaptionsResourceWithStreamingResponse,
+    AsyncCaptionsResourceWithStreamingResponse,
+)
 from ...types.stream.video import Video
-from .live_inputs.live_inputs import LiveInputsResource, AsyncLiveInputsResource
+from .live_inputs.live_inputs import (
+    LiveInputsResource,
+    AsyncLiveInputsResource,
+    LiveInputsResourceWithRawResponse,
+    AsyncLiveInputsResourceWithRawResponse,
+    LiveInputsResourceWithStreamingResponse,
+    AsyncLiveInputsResourceWithStreamingResponse,
+)
+from ...types.stream.allowed_origins import AllowedOrigins
 
 __all__ = ["StreamResource", "AsyncStreamResource"]
 
@@ -192,10 +187,21 @@ def token(self) -> TokenResource:
 
     @cached_property
     def with_raw_response(self) -> StreamResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return StreamResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> StreamResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return StreamResourceWithStreamingResponse(self)
 
     def create(
@@ -205,14 +211,15 @@ def create(
         body: object,
         tus_resumable: Literal["1.0.0"],
         upload_length: int,
-        upload_creator: str | NotGiven = NOT_GIVEN,
-        upload_metadata: str | NotGiven = NOT_GIVEN,
+        direct_user: bool | Omit = omit,
+        upload_creator: str | Omit = omit,
+        upload_metadata: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> None:
         """Initiates a video upload using the TUS protocol.
 
@@ -230,11 +237,15 @@ def create(
           upload_length: Indicates the size of the entire upload in bytes. The value must be a
               non-negative integer.
 
+          direct_user: Provisions a URL to let your end users upload videos directly to Cloudflare
+              Stream without exposing your API token to clients.
+
           upload_creator: A user-defined identifier for the media creator.
 
           upload_metadata: Comma-separated key-value pairs following the TUS protocol specification. Values
               are Base-64 encoded. Supported keys: `name`, `requiresignedurls`,
-              `allowedorigins`, `thumbnailtimestamppct`, `watermark`, `scheduleddeletion`.
+              `allowedorigins`, `thumbnailtimestamppct`, `watermark`, `scheduleddeletion`,
+              `maxdurationseconds`.
 
           extra_headers: Send extra headers
 
@@ -262,7 +273,11 @@ def create(
             f"/accounts/{account_id}/stream",
             body=maybe_transform(body, stream_create_params.StreamCreateParams),
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"direct_user": direct_user}, stream_create_params.StreamCreateParams),
             ),
             cast_to=NoneType,
         )
@@ -271,21 +286,22 @@ def list(
         self,
         *,
         account_id: str,
-        asc: bool | NotGiven = NOT_GIVEN,
-        creator: str | NotGiven = NOT_GIVEN,
-        end: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        include_counts: bool | NotGiven = NOT_GIVEN,
-        search: str | NotGiven = NOT_GIVEN,
-        start: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        status: Literal["pendingupload", "downloading", "queued", "inprogress", "ready", "error"]
-        | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        asc: bool | Omit = omit,
+        creator: str | Omit = omit,
+        end: Union[str, datetime] | Omit = omit,
+        include_counts: bool | Omit = omit,
+        search: str | Omit = omit,
+        start: Union[str, datetime] | Omit = omit,
+        status: Literal["pendingupload", "downloading", "queued", "inprogress", "ready", "error", "live-inprogress"]
+        | Omit = omit,
+        type: str | Omit = omit,
+        video_name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Video]:
         """Lists up to 1000 videos from a single request.
 
@@ -304,8 +320,8 @@ def list(
           include_counts: Includes the total number of videos associated with the submitted query
               parameters.
 
-          search: Searches over the `name` key in the `meta` field. This field can be set with or
-              after the upload request.
+          search: Provides a partial word match of the `name` key in the `meta` field. Slow for
+              medium to large video libraries. May be unavailable for very large libraries.
 
           start: Lists videos created after the specified date.
 
@@ -313,6 +329,8 @@ def list(
 
           type: Specifies whether the video is `vod` or `live`.
 
+          video_name: Provides a fast, exact string match on the `name` key in the `meta` field.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -341,6 +359,7 @@ def list(
                         "start": start,
                         "status": status,
                         "type": type,
+                        "video_name": video_name,
                     },
                     stream_list_params.StreamListParams,
                 ),
@@ -358,7 +377,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> None:
         """
         Deletes a video and its copies from Cloudflare Stream.
@@ -389,6 +408,100 @@ def delete(
             cast_to=NoneType,
         )
 
+    def edit(
+        self,
+        identifier: str,
+        *,
+        account_id: str,
+        allowed_origins: SequenceNotStr[AllowedOrigins] | Omit = omit,
+        creator: str | Omit = omit,
+        max_duration_seconds: int | Omit = omit,
+        meta: object | Omit = omit,
+        require_signed_urls: bool | Omit = omit,
+        scheduled_deletion: Union[str, datetime] | Omit = omit,
+        thumbnail_timestamp_pct: float | Omit = omit,
+        upload_expiry: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Video]:
+        """
+        Edit details for a single video.
+
+        Args:
+          account_id: The account identifier tag.
+
+          identifier: A Cloudflare-generated unique identifier for a media item.
+
+          allowed_origins: Lists the origins allowed to display the video. Enter allowed origin domains in
+              an array and use `*` for wildcard subdomains. Empty arrays allow the video to be
+              viewed on any origin.
+
+          creator: A user-defined identifier for the media creator.
+
+          max_duration_seconds: The maximum duration in seconds for a video upload. Can be set for a video that
+              is not yet uploaded to limit its duration. Uploads that exceed the specified
+              duration will fail during processing. A value of `-1` means the value is
+              unknown.
+
+          meta: A user modifiable key-value store used to reference other systems of record for
+              managing videos.
+
+          require_signed_urls: Indicates whether the video can be a accessed using the UID. When set to `true`,
+              a signed token must be generated with a signing key to view the video.
+
+          scheduled_deletion: Indicates the date and time at which the video will be deleted. Omit the field
+              to indicate no change, or include with a `null` value to remove an existing
+              scheduled deletion. If specified, must be at least 30 days from upload time.
+
+          thumbnail_timestamp_pct: The timestamp for a thumbnail image calculated as a percentage value of the
+              video's duration. To convert from a second-wise timestamp to a percentage,
+              divide the desired timestamp by the total duration of the video. If this value
+              is not set, the default thumbnail image is taken from 0s of the video.
+
+          upload_expiry: The date and time when the video upload URL is no longer valid for direct user
+              uploads.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not identifier:
+            raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
+        return self._post(
+            f"/accounts/{account_id}/stream/{identifier}",
+            body=maybe_transform(
+                {
+                    "allowed_origins": allowed_origins,
+                    "creator": creator,
+                    "max_duration_seconds": max_duration_seconds,
+                    "meta": meta,
+                    "require_signed_urls": require_signed_urls,
+                    "scheduled_deletion": scheduled_deletion,
+                    "thumbnail_timestamp_pct": thumbnail_timestamp_pct,
+                    "upload_expiry": upload_expiry,
+                },
+                stream_edit_params.StreamEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Video]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Video]], ResultWrapper[Video]),
+        )
+
     def get(
         self,
         identifier: str,
@@ -399,7 +512,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Video]:
         """
         Fetches details for a single video.
@@ -489,10 +602,21 @@ def token(self) -> AsyncTokenResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncStreamResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncStreamResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncStreamResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncStreamResourceWithStreamingResponse(self)
 
     async def create(
@@ -502,14 +626,15 @@ async def create(
         body: object,
         tus_resumable: Literal["1.0.0"],
         upload_length: int,
-        upload_creator: str | NotGiven = NOT_GIVEN,
-        upload_metadata: str | NotGiven = NOT_GIVEN,
+        direct_user: bool | Omit = omit,
+        upload_creator: str | Omit = omit,
+        upload_metadata: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> None:
         """Initiates a video upload using the TUS protocol.
 
@@ -527,11 +652,15 @@ async def create(
           upload_length: Indicates the size of the entire upload in bytes. The value must be a
               non-negative integer.
 
+          direct_user: Provisions a URL to let your end users upload videos directly to Cloudflare
+              Stream without exposing your API token to clients.
+
           upload_creator: A user-defined identifier for the media creator.
 
           upload_metadata: Comma-separated key-value pairs following the TUS protocol specification. Values
               are Base-64 encoded. Supported keys: `name`, `requiresignedurls`,
-              `allowedorigins`, `thumbnailtimestamppct`, `watermark`, `scheduleddeletion`.
+              `allowedorigins`, `thumbnailtimestamppct`, `watermark`, `scheduleddeletion`,
+              `maxdurationseconds`.
 
           extra_headers: Send extra headers
 
@@ -559,7 +688,13 @@ async def create(
             f"/accounts/{account_id}/stream",
             body=await async_maybe_transform(body, stream_create_params.StreamCreateParams),
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"direct_user": direct_user}, stream_create_params.StreamCreateParams
+                ),
             ),
             cast_to=NoneType,
         )
@@ -568,21 +703,22 @@ def list(
         self,
         *,
         account_id: str,
-        asc: bool | NotGiven = NOT_GIVEN,
-        creator: str | NotGiven = NOT_GIVEN,
-        end: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        include_counts: bool | NotGiven = NOT_GIVEN,
-        search: str | NotGiven = NOT_GIVEN,
-        start: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        status: Literal["pendingupload", "downloading", "queued", "inprogress", "ready", "error"]
-        | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        asc: bool | Omit = omit,
+        creator: str | Omit = omit,
+        end: Union[str, datetime] | Omit = omit,
+        include_counts: bool | Omit = omit,
+        search: str | Omit = omit,
+        start: Union[str, datetime] | Omit = omit,
+        status: Literal["pendingupload", "downloading", "queued", "inprogress", "ready", "error", "live-inprogress"]
+        | Omit = omit,
+        type: str | Omit = omit,
+        video_name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Video, AsyncSinglePage[Video]]:
         """Lists up to 1000 videos from a single request.
 
@@ -601,8 +737,8 @@ def list(
           include_counts: Includes the total number of videos associated with the submitted query
               parameters.
 
-          search: Searches over the `name` key in the `meta` field. This field can be set with or
-              after the upload request.
+          search: Provides a partial word match of the `name` key in the `meta` field. Slow for
+              medium to large video libraries. May be unavailable for very large libraries.
 
           start: Lists videos created after the specified date.
 
@@ -610,6 +746,8 @@ def list(
 
           type: Specifies whether the video is `vod` or `live`.
 
+          video_name: Provides a fast, exact string match on the `name` key in the `meta` field.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -638,6 +776,7 @@ def list(
                         "start": start,
                         "status": status,
                         "type": type,
+                        "video_name": video_name,
                     },
                     stream_list_params.StreamListParams,
                 ),
@@ -655,7 +794,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> None:
         """
         Deletes a video and its copies from Cloudflare Stream.
@@ -686,6 +825,100 @@ async def delete(
             cast_to=NoneType,
         )
 
+    async def edit(
+        self,
+        identifier: str,
+        *,
+        account_id: str,
+        allowed_origins: SequenceNotStr[AllowedOrigins] | Omit = omit,
+        creator: str | Omit = omit,
+        max_duration_seconds: int | Omit = omit,
+        meta: object | Omit = omit,
+        require_signed_urls: bool | Omit = omit,
+        scheduled_deletion: Union[str, datetime] | Omit = omit,
+        thumbnail_timestamp_pct: float | Omit = omit,
+        upload_expiry: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Video]:
+        """
+        Edit details for a single video.
+
+        Args:
+          account_id: The account identifier tag.
+
+          identifier: A Cloudflare-generated unique identifier for a media item.
+
+          allowed_origins: Lists the origins allowed to display the video. Enter allowed origin domains in
+              an array and use `*` for wildcard subdomains. Empty arrays allow the video to be
+              viewed on any origin.
+
+          creator: A user-defined identifier for the media creator.
+
+          max_duration_seconds: The maximum duration in seconds for a video upload. Can be set for a video that
+              is not yet uploaded to limit its duration. Uploads that exceed the specified
+              duration will fail during processing. A value of `-1` means the value is
+              unknown.
+
+          meta: A user modifiable key-value store used to reference other systems of record for
+              managing videos.
+
+          require_signed_urls: Indicates whether the video can be a accessed using the UID. When set to `true`,
+              a signed token must be generated with a signing key to view the video.
+
+          scheduled_deletion: Indicates the date and time at which the video will be deleted. Omit the field
+              to indicate no change, or include with a `null` value to remove an existing
+              scheduled deletion. If specified, must be at least 30 days from upload time.
+
+          thumbnail_timestamp_pct: The timestamp for a thumbnail image calculated as a percentage value of the
+              video's duration. To convert from a second-wise timestamp to a percentage,
+              divide the desired timestamp by the total duration of the video. If this value
+              is not set, the default thumbnail image is taken from 0s of the video.
+
+          upload_expiry: The date and time when the video upload URL is no longer valid for direct user
+              uploads.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not identifier:
+            raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
+        return await self._post(
+            f"/accounts/{account_id}/stream/{identifier}",
+            body=await async_maybe_transform(
+                {
+                    "allowed_origins": allowed_origins,
+                    "creator": creator,
+                    "max_duration_seconds": max_duration_seconds,
+                    "meta": meta,
+                    "require_signed_urls": require_signed_urls,
+                    "scheduled_deletion": scheduled_deletion,
+                    "thumbnail_timestamp_pct": thumbnail_timestamp_pct,
+                    "upload_expiry": upload_expiry,
+                },
+                stream_edit_params.StreamEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Video]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Video]], ResultWrapper[Video]),
+        )
+
     async def get(
         self,
         identifier: str,
@@ -696,7 +929,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Video]:
         """
         Fetches details for a single video.
@@ -744,6 +977,9 @@ def __init__(self, stream: StreamResource) -> None:
         self.delete = to_raw_response_wrapper(
             stream.delete,
         )
+        self.edit = to_raw_response_wrapper(
+            stream.edit,
+        )
         self.get = to_raw_response_wrapper(
             stream.get,
         )
@@ -814,6 +1050,9 @@ def __init__(self, stream: AsyncStreamResource) -> None:
         self.delete = async_to_raw_response_wrapper(
             stream.delete,
         )
+        self.edit = async_to_raw_response_wrapper(
+            stream.edit,
+        )
         self.get = async_to_raw_response_wrapper(
             stream.get,
         )
@@ -884,6 +1123,9 @@ def __init__(self, stream: StreamResource) -> None:
         self.delete = to_streamed_response_wrapper(
             stream.delete,
         )
+        self.edit = to_streamed_response_wrapper(
+            stream.edit,
+        )
         self.get = to_streamed_response_wrapper(
             stream.get,
         )
@@ -954,6 +1196,9 @@ def __init__(self, stream: AsyncStreamResource) -> None:
         self.delete = async_to_streamed_response_wrapper(
             stream.delete,
         )
+        self.edit = async_to_streamed_response_wrapper(
+            stream.edit,
+        )
         self.get = async_to_streamed_response_wrapper(
             stream.get,
         )
diff --git a/src/cloudflare/resources/stream/token.py b/src/cloudflare/resources/stream/token.py
index 1a4d637d5ea..dd45a718d9c 100644
--- a/src/cloudflare/resources/stream/token.py
+++ b/src/cloudflare/resources/stream/token.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -30,10 +27,21 @@
 class TokenResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TokenResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TokenResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TokenResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TokenResourceWithStreamingResponse(self)
 
     def create(
@@ -41,18 +49,18 @@ def create(
         identifier: str,
         *,
         account_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        access_rules: Iterable[token_create_params.AccessRule] | NotGiven = NOT_GIVEN,
-        downloadable: bool | NotGiven = NOT_GIVEN,
-        exp: int | NotGiven = NOT_GIVEN,
-        nbf: int | NotGiven = NOT_GIVEN,
-        pem: str | NotGiven = NOT_GIVEN,
+        id: str | Omit = omit,
+        access_rules: Iterable[token_create_params.AccessRule] | Omit = omit,
+        downloadable: bool | Omit = omit,
+        exp: int | Omit = omit,
+        nbf: int | Omit = omit,
+        pem: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TokenCreateResponse]:
         """Creates a signed URL token for a video.
 
@@ -124,10 +132,21 @@ def create(
 class AsyncTokenResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTokenResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTokenResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTokenResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTokenResourceWithStreamingResponse(self)
 
     async def create(
@@ -135,18 +154,18 @@ async def create(
         identifier: str,
         *,
         account_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        access_rules: Iterable[token_create_params.AccessRule] | NotGiven = NOT_GIVEN,
-        downloadable: bool | NotGiven = NOT_GIVEN,
-        exp: int | NotGiven = NOT_GIVEN,
-        nbf: int | NotGiven = NOT_GIVEN,
-        pem: str | NotGiven = NOT_GIVEN,
+        id: str | Omit = omit,
+        access_rules: Iterable[token_create_params.AccessRule] | Omit = omit,
+        downloadable: bool | Omit = omit,
+        exp: int | Omit = omit,
+        nbf: int | Omit = omit,
+        pem: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TokenCreateResponse]:
         """Creates a signed URL token for a video.
 
diff --git a/src/cloudflare/resources/stream/videos.py b/src/cloudflare/resources/stream/videos.py
index a1dcd2db874..2d8d2355ff1 100644
--- a/src/cloudflare/resources/stream/videos.py
+++ b/src/cloudflare/resources/stream/videos.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -30,23 +27,34 @@
 class VideosResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> VideosResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return VideosResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> VideosResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return VideosResourceWithStreamingResponse(self)
 
     def storage_usage(
         self,
         *,
         account_id: str,
-        creator: str | NotGiven = NOT_GIVEN,
+        creator: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[VideoStorageUsageResponse]:
         """
         Returns information about an account's storage use.
@@ -83,23 +91,34 @@ def storage_usage(
 class AsyncVideosResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncVideosResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncVideosResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncVideosResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncVideosResourceWithStreamingResponse(self)
 
     async def storage_usage(
         self,
         *,
         account_id: str,
-        creator: str | NotGiven = NOT_GIVEN,
+        creator: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[VideoStorageUsageResponse]:
         """
         Returns information about an account's storage use.
diff --git a/src/cloudflare/resources/stream/watermarks.py b/src/cloudflare/resources/stream/watermarks.py
index 73ff089d577..75f58cd1441 100644
--- a/src/cloudflare/resources/stream/watermarks.py
+++ b/src/cloudflare/resources/stream/watermarks.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -32,10 +29,21 @@
 class WatermarksResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> WatermarksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return WatermarksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> WatermarksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return WatermarksResourceWithStreamingResponse(self)
 
     def create(
@@ -43,17 +51,17 @@ def create(
         *,
         account_id: str,
         file: str,
-        name: str | NotGiven = NOT_GIVEN,
-        opacity: float | NotGiven = NOT_GIVEN,
-        padding: float | NotGiven = NOT_GIVEN,
-        position: str | NotGiven = NOT_GIVEN,
-        scale: float | NotGiven = NOT_GIVEN,
+        name: str | Omit = omit,
+        opacity: float | Omit = omit,
+        padding: float | Omit = omit,
+        position: str | Omit = omit,
+        scale: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Watermark]:
         """
         Creates watermark profiles using a single `HTTP POST multipart/form-data`
@@ -129,7 +137,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Watermark]:
         """
         Lists all watermark profiles for an account.
@@ -166,8 +174,8 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[WatermarkDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
         """
         Deletes a watermark profile.
 
@@ -188,21 +196,16 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            Optional[WatermarkDeleteResponse],
-            self._delete(
-                f"/accounts/{account_id}/stream/watermarks/{identifier}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[WatermarkDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[WatermarkDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._delete(
+            f"/accounts/{account_id}/stream/watermarks/{identifier}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[WatermarkDeleteResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
         )
 
     def get(
@@ -215,7 +218,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Watermark]:
         """
         Retrieves details for a single watermark profile.
@@ -253,10 +256,21 @@ def get(
 class AsyncWatermarksResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncWatermarksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncWatermarksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncWatermarksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncWatermarksResourceWithStreamingResponse(self)
 
     async def create(
@@ -264,17 +278,17 @@ async def create(
         *,
         account_id: str,
         file: str,
-        name: str | NotGiven = NOT_GIVEN,
-        opacity: float | NotGiven = NOT_GIVEN,
-        padding: float | NotGiven = NOT_GIVEN,
-        position: str | NotGiven = NOT_GIVEN,
-        scale: float | NotGiven = NOT_GIVEN,
+        name: str | Omit = omit,
+        opacity: float | Omit = omit,
+        padding: float | Omit = omit,
+        position: str | Omit = omit,
+        scale: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Watermark]:
         """
         Creates watermark profiles using a single `HTTP POST multipart/form-data`
@@ -350,7 +364,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Watermark, AsyncSinglePage[Watermark]]:
         """
         Lists all watermark profiles for an account.
@@ -387,8 +401,8 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[WatermarkDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
         """
         Deletes a watermark profile.
 
@@ -409,21 +423,16 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            Optional[WatermarkDeleteResponse],
-            await self._delete(
-                f"/accounts/{account_id}/stream/watermarks/{identifier}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[WatermarkDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[WatermarkDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._delete(
+            f"/accounts/{account_id}/stream/watermarks/{identifier}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[WatermarkDeleteResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
         )
 
     async def get(
@@ -436,7 +445,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Watermark]:
         """
         Retrieves details for a single watermark profile.
diff --git a/src/cloudflare/resources/stream/webhooks.py b/src/cloudflare/resources/stream/webhooks.py
index 174fdbe1f2f..3ff062d0e0e 100644
--- a/src/cloudflare/resources/stream/webhooks.py
+++ b/src/cloudflare/resources/stream/webhooks.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -22,9 +19,7 @@
 from ..._wrappers import ResultWrapper
 from ..._base_client import make_request_options
 from ...types.stream import webhook_update_params
-from ...types.stream.webhook_get_response import WebhookGetResponse
 from ...types.stream.webhook_delete_response import WebhookDeleteResponse
-from ...types.stream.webhook_update_response import WebhookUpdateResponse
 
 __all__ = ["WebhooksResource", "AsyncWebhooksResource"]
 
@@ -32,10 +27,21 @@
 class WebhooksResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> WebhooksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return WebhooksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> WebhooksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return WebhooksResourceWithStreamingResponse(self)
 
     def update(
@@ -48,8 +54,8 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[WebhookUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
         Creates a webhook notification.
 
@@ -68,22 +74,17 @@ def update(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            Optional[WebhookUpdateResponse],
-            self._put(
-                f"/accounts/{account_id}/stream/webhook",
-                body=maybe_transform({"notification_url": notification_url}, webhook_update_params.WebhookUpdateParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[WebhookUpdateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[WebhookUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._put(
+            f"/accounts/{account_id}/stream/webhook",
+            body=maybe_transform({"notification_url": notification_url}, webhook_update_params.WebhookUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     def delete(
@@ -95,8 +96,8 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[WebhookDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
         """
         Deletes a webhook.
 
@@ -113,21 +114,16 @@ def delete(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            Optional[WebhookDeleteResponse],
-            self._delete(
-                f"/accounts/{account_id}/stream/webhook",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[WebhookDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[WebhookDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._delete(
+            f"/accounts/{account_id}/stream/webhook",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[WebhookDeleteResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
         )
 
     def get(
@@ -139,8 +135,8 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[WebhookGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
         Retrieves a list of webhooks.
 
@@ -157,31 +153,37 @@ def get(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            Optional[WebhookGetResponse],
-            self._get(
-                f"/accounts/{account_id}/stream/webhook",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[WebhookGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[WebhookGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._get(
+            f"/accounts/{account_id}/stream/webhook",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
 
 class AsyncWebhooksResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncWebhooksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncWebhooksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncWebhooksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncWebhooksResourceWithStreamingResponse(self)
 
     async def update(
@@ -194,8 +196,8 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[WebhookUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
         Creates a webhook notification.
 
@@ -214,24 +216,19 @@ async def update(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            Optional[WebhookUpdateResponse],
-            await self._put(
-                f"/accounts/{account_id}/stream/webhook",
-                body=await async_maybe_transform(
-                    {"notification_url": notification_url}, webhook_update_params.WebhookUpdateParams
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[WebhookUpdateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[WebhookUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._put(
+            f"/accounts/{account_id}/stream/webhook",
+            body=await async_maybe_transform(
+                {"notification_url": notification_url}, webhook_update_params.WebhookUpdateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     async def delete(
@@ -243,8 +240,8 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[WebhookDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
         """
         Deletes a webhook.
 
@@ -261,21 +258,16 @@ async def delete(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            Optional[WebhookDeleteResponse],
-            await self._delete(
-                f"/accounts/{account_id}/stream/webhook",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[WebhookDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[WebhookDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._delete(
+            f"/accounts/{account_id}/stream/webhook",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[WebhookDeleteResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
         )
 
     async def get(
@@ -287,8 +279,8 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[WebhookGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
         Retrieves a list of webhooks.
 
@@ -305,21 +297,16 @@ async def get(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            Optional[WebhookGetResponse],
-            await self._get(
-                f"/accounts/{account_id}/stream/webhook",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[WebhookGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[WebhookGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._get(
+            f"/accounts/{account_id}/stream/webhook",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
 
diff --git a/src/cloudflare/resources/subscriptions.py b/src/cloudflare/resources/subscriptions.py
deleted file mode 100644
index 7bde4c878d3..00000000000
--- a/src/cloudflare/resources/subscriptions.py
+++ /dev/null
@@ -1,674 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Any, Type, Iterable, cast
-from typing_extensions import Literal
-
-import httpx
-
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from .._compat import cached_property
-from .._resource import SyncAPIResource, AsyncAPIResource
-from .._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from .._wrappers import ResultWrapper
-from ..pagination import SyncSinglePage, AsyncSinglePage
-from .._base_client import AsyncPaginator, make_request_options
-from ..types.subscriptions import subscription_create_params, subscription_update_params
-from ..types.user.subscription import Subscription
-from ..types.user.rate_plan_param import RatePlanParam
-from ..types.user.subscription_zone_param import SubscriptionZoneParam
-from ..types.user.subscription_component_param import SubscriptionComponentParam
-from ..types.subscriptions.subscription_get_response import SubscriptionGetResponse
-from ..types.subscriptions.subscription_create_response import SubscriptionCreateResponse
-from ..types.subscriptions.subscription_delete_response import SubscriptionDeleteResponse
-from ..types.subscriptions.subscription_update_response import SubscriptionUpdateResponse
-
-__all__ = ["SubscriptionsResource", "AsyncSubscriptionsResource"]
-
-
-class SubscriptionsResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> SubscriptionsResourceWithRawResponse:
-        return SubscriptionsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> SubscriptionsResourceWithStreamingResponse:
-        return SubscriptionsResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        identifier: str,
-        *,
-        app: subscription_create_params.App | NotGiven = NOT_GIVEN,
-        component_values: Iterable[SubscriptionComponentParam] | NotGiven = NOT_GIVEN,
-        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | NotGiven = NOT_GIVEN,
-        rate_plan: RatePlanParam | NotGiven = NOT_GIVEN,
-        zone: SubscriptionZoneParam | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SubscriptionCreateResponse:
-        """
-        Create a zone subscription, either plan or add-ons.
-
-        Args:
-          identifier: Subscription identifier tag.
-
-          component_values: The list of add-ons subscribed to.
-
-          frequency: How often the subscription is renewed automatically.
-
-          rate_plan: The rate plan applied to the subscription.
-
-          zone: A simple zone object. May have null properties if not a zone subscription.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not identifier:
-            raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            SubscriptionCreateResponse,
-            self._post(
-                f"/zones/{identifier}/subscription",
-                body=maybe_transform(
-                    {
-                        "app": app,
-                        "component_values": component_values,
-                        "frequency": frequency,
-                        "rate_plan": rate_plan,
-                        "zone": zone,
-                    },
-                    subscription_create_params.SubscriptionCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[SubscriptionCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[SubscriptionCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    def update(
-        self,
-        subscription_identifier: str,
-        *,
-        account_identifier: str,
-        app: subscription_update_params.App | NotGiven = NOT_GIVEN,
-        component_values: Iterable[SubscriptionComponentParam] | NotGiven = NOT_GIVEN,
-        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | NotGiven = NOT_GIVEN,
-        rate_plan: RatePlanParam | NotGiven = NOT_GIVEN,
-        zone: SubscriptionZoneParam | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SubscriptionUpdateResponse:
-        """
-        Updates an account subscription.
-
-        Args:
-          account_identifier: Identifier
-
-          subscription_identifier: Subscription identifier tag.
-
-          component_values: The list of add-ons subscribed to.
-
-          frequency: How often the subscription is renewed automatically.
-
-          rate_plan: The rate plan applied to the subscription.
-
-          zone: A simple zone object. May have null properties if not a zone subscription.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not subscription_identifier:
-            raise ValueError(
-                f"Expected a non-empty value for `subscription_identifier` but received {subscription_identifier!r}"
-            )
-        return cast(
-            SubscriptionUpdateResponse,
-            self._put(
-                f"/accounts/{account_identifier}/subscriptions/{subscription_identifier}",
-                body=maybe_transform(
-                    {
-                        "app": app,
-                        "component_values": component_values,
-                        "frequency": frequency,
-                        "rate_plan": rate_plan,
-                        "zone": zone,
-                    },
-                    subscription_update_params.SubscriptionUpdateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[SubscriptionUpdateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[SubscriptionUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    def list(
-        self,
-        account_identifier: str,
-        *,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[Subscription]:
-        """
-        Lists all of an account's subscriptions.
-
-        Args:
-          account_identifier: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        return self._get_api_list(
-            f"/accounts/{account_identifier}/subscriptions",
-            page=SyncSinglePage[Subscription],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=Subscription,
-        )
-
-    def delete(
-        self,
-        subscription_identifier: str,
-        *,
-        account_identifier: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SubscriptionDeleteResponse:
-        """
-        Deletes an account's subscription.
-
-        Args:
-          account_identifier: Identifier
-
-          subscription_identifier: Subscription identifier tag.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not subscription_identifier:
-            raise ValueError(
-                f"Expected a non-empty value for `subscription_identifier` but received {subscription_identifier!r}"
-            )
-        return self._delete(
-            f"/accounts/{account_identifier}/subscriptions/{subscription_identifier}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[SubscriptionDeleteResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[SubscriptionDeleteResponse], ResultWrapper[SubscriptionDeleteResponse]),
-        )
-
-    def get(
-        self,
-        identifier: str,
-        *,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SubscriptionGetResponse:
-        """
-        Lists zone subscription details.
-
-        Args:
-          identifier: Subscription identifier tag.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not identifier:
-            raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            SubscriptionGetResponse,
-            self._get(
-                f"/zones/{identifier}/subscription",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[SubscriptionGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[SubscriptionGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class AsyncSubscriptionsResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncSubscriptionsResourceWithRawResponse:
-        return AsyncSubscriptionsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncSubscriptionsResourceWithStreamingResponse:
-        return AsyncSubscriptionsResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        identifier: str,
-        *,
-        app: subscription_create_params.App | NotGiven = NOT_GIVEN,
-        component_values: Iterable[SubscriptionComponentParam] | NotGiven = NOT_GIVEN,
-        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | NotGiven = NOT_GIVEN,
-        rate_plan: RatePlanParam | NotGiven = NOT_GIVEN,
-        zone: SubscriptionZoneParam | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SubscriptionCreateResponse:
-        """
-        Create a zone subscription, either plan or add-ons.
-
-        Args:
-          identifier: Subscription identifier tag.
-
-          component_values: The list of add-ons subscribed to.
-
-          frequency: How often the subscription is renewed automatically.
-
-          rate_plan: The rate plan applied to the subscription.
-
-          zone: A simple zone object. May have null properties if not a zone subscription.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not identifier:
-            raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            SubscriptionCreateResponse,
-            await self._post(
-                f"/zones/{identifier}/subscription",
-                body=await async_maybe_transform(
-                    {
-                        "app": app,
-                        "component_values": component_values,
-                        "frequency": frequency,
-                        "rate_plan": rate_plan,
-                        "zone": zone,
-                    },
-                    subscription_create_params.SubscriptionCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[SubscriptionCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[SubscriptionCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    async def update(
-        self,
-        subscription_identifier: str,
-        *,
-        account_identifier: str,
-        app: subscription_update_params.App | NotGiven = NOT_GIVEN,
-        component_values: Iterable[SubscriptionComponentParam] | NotGiven = NOT_GIVEN,
-        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | NotGiven = NOT_GIVEN,
-        rate_plan: RatePlanParam | NotGiven = NOT_GIVEN,
-        zone: SubscriptionZoneParam | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SubscriptionUpdateResponse:
-        """
-        Updates an account subscription.
-
-        Args:
-          account_identifier: Identifier
-
-          subscription_identifier: Subscription identifier tag.
-
-          component_values: The list of add-ons subscribed to.
-
-          frequency: How often the subscription is renewed automatically.
-
-          rate_plan: The rate plan applied to the subscription.
-
-          zone: A simple zone object. May have null properties if not a zone subscription.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not subscription_identifier:
-            raise ValueError(
-                f"Expected a non-empty value for `subscription_identifier` but received {subscription_identifier!r}"
-            )
-        return cast(
-            SubscriptionUpdateResponse,
-            await self._put(
-                f"/accounts/{account_identifier}/subscriptions/{subscription_identifier}",
-                body=await async_maybe_transform(
-                    {
-                        "app": app,
-                        "component_values": component_values,
-                        "frequency": frequency,
-                        "rate_plan": rate_plan,
-                        "zone": zone,
-                    },
-                    subscription_update_params.SubscriptionUpdateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[SubscriptionUpdateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[SubscriptionUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    def list(
-        self,
-        account_identifier: str,
-        *,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[Subscription, AsyncSinglePage[Subscription]]:
-        """
-        Lists all of an account's subscriptions.
-
-        Args:
-          account_identifier: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        return self._get_api_list(
-            f"/accounts/{account_identifier}/subscriptions",
-            page=AsyncSinglePage[Subscription],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=Subscription,
-        )
-
-    async def delete(
-        self,
-        subscription_identifier: str,
-        *,
-        account_identifier: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SubscriptionDeleteResponse:
-        """
-        Deletes an account's subscription.
-
-        Args:
-          account_identifier: Identifier
-
-          subscription_identifier: Subscription identifier tag.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        if not subscription_identifier:
-            raise ValueError(
-                f"Expected a non-empty value for `subscription_identifier` but received {subscription_identifier!r}"
-            )
-        return await self._delete(
-            f"/accounts/{account_identifier}/subscriptions/{subscription_identifier}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[SubscriptionDeleteResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[SubscriptionDeleteResponse], ResultWrapper[SubscriptionDeleteResponse]),
-        )
-
-    async def get(
-        self,
-        identifier: str,
-        *,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SubscriptionGetResponse:
-        """
-        Lists zone subscription details.
-
-        Args:
-          identifier: Subscription identifier tag.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not identifier:
-            raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            SubscriptionGetResponse,
-            await self._get(
-                f"/zones/{identifier}/subscription",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[SubscriptionGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[SubscriptionGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class SubscriptionsResourceWithRawResponse:
-    def __init__(self, subscriptions: SubscriptionsResource) -> None:
-        self._subscriptions = subscriptions
-
-        self.create = to_raw_response_wrapper(
-            subscriptions.create,
-        )
-        self.update = to_raw_response_wrapper(
-            subscriptions.update,
-        )
-        self.list = to_raw_response_wrapper(
-            subscriptions.list,
-        )
-        self.delete = to_raw_response_wrapper(
-            subscriptions.delete,
-        )
-        self.get = to_raw_response_wrapper(
-            subscriptions.get,
-        )
-
-
-class AsyncSubscriptionsResourceWithRawResponse:
-    def __init__(self, subscriptions: AsyncSubscriptionsResource) -> None:
-        self._subscriptions = subscriptions
-
-        self.create = async_to_raw_response_wrapper(
-            subscriptions.create,
-        )
-        self.update = async_to_raw_response_wrapper(
-            subscriptions.update,
-        )
-        self.list = async_to_raw_response_wrapper(
-            subscriptions.list,
-        )
-        self.delete = async_to_raw_response_wrapper(
-            subscriptions.delete,
-        )
-        self.get = async_to_raw_response_wrapper(
-            subscriptions.get,
-        )
-
-
-class SubscriptionsResourceWithStreamingResponse:
-    def __init__(self, subscriptions: SubscriptionsResource) -> None:
-        self._subscriptions = subscriptions
-
-        self.create = to_streamed_response_wrapper(
-            subscriptions.create,
-        )
-        self.update = to_streamed_response_wrapper(
-            subscriptions.update,
-        )
-        self.list = to_streamed_response_wrapper(
-            subscriptions.list,
-        )
-        self.delete = to_streamed_response_wrapper(
-            subscriptions.delete,
-        )
-        self.get = to_streamed_response_wrapper(
-            subscriptions.get,
-        )
-
-
-class AsyncSubscriptionsResourceWithStreamingResponse:
-    def __init__(self, subscriptions: AsyncSubscriptionsResource) -> None:
-        self._subscriptions = subscriptions
-
-        self.create = async_to_streamed_response_wrapper(
-            subscriptions.create,
-        )
-        self.update = async_to_streamed_response_wrapper(
-            subscriptions.update,
-        )
-        self.list = async_to_streamed_response_wrapper(
-            subscriptions.list,
-        )
-        self.delete = async_to_streamed_response_wrapper(
-            subscriptions.delete,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            subscriptions.get,
-        )
diff --git a/src/cloudflare/resources/token_validation/__init__.py b/src/cloudflare/resources/token_validation/__init__.py
new file mode 100644
index 00000000000..bb223a4705a
--- /dev/null
+++ b/src/cloudflare/resources/token_validation/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .rules import (
+    RulesResource,
+    AsyncRulesResource,
+    RulesResourceWithRawResponse,
+    AsyncRulesResourceWithRawResponse,
+    RulesResourceWithStreamingResponse,
+    AsyncRulesResourceWithStreamingResponse,
+)
+from .configuration import (
+    ConfigurationResource,
+    AsyncConfigurationResource,
+    ConfigurationResourceWithRawResponse,
+    AsyncConfigurationResourceWithRawResponse,
+    ConfigurationResourceWithStreamingResponse,
+    AsyncConfigurationResourceWithStreamingResponse,
+)
+from .token_validation import (
+    TokenValidationResource,
+    AsyncTokenValidationResource,
+    TokenValidationResourceWithRawResponse,
+    AsyncTokenValidationResourceWithRawResponse,
+    TokenValidationResourceWithStreamingResponse,
+    AsyncTokenValidationResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ConfigurationResource",
+    "AsyncConfigurationResource",
+    "ConfigurationResourceWithRawResponse",
+    "AsyncConfigurationResourceWithRawResponse",
+    "ConfigurationResourceWithStreamingResponse",
+    "AsyncConfigurationResourceWithStreamingResponse",
+    "RulesResource",
+    "AsyncRulesResource",
+    "RulesResourceWithRawResponse",
+    "AsyncRulesResourceWithRawResponse",
+    "RulesResourceWithStreamingResponse",
+    "AsyncRulesResourceWithStreamingResponse",
+    "TokenValidationResource",
+    "AsyncTokenValidationResource",
+    "TokenValidationResourceWithRawResponse",
+    "AsyncTokenValidationResourceWithRawResponse",
+    "TokenValidationResourceWithStreamingResponse",
+    "AsyncTokenValidationResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/token_validation/configuration/__init__.py b/src/cloudflare/resources/token_validation/configuration/__init__.py
new file mode 100644
index 00000000000..c4fac1ba667
--- /dev/null
+++ b/src/cloudflare/resources/token_validation/configuration/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .credentials import (
+    CredentialsResource,
+    AsyncCredentialsResource,
+    CredentialsResourceWithRawResponse,
+    AsyncCredentialsResourceWithRawResponse,
+    CredentialsResourceWithStreamingResponse,
+    AsyncCredentialsResourceWithStreamingResponse,
+)
+from .configuration import (
+    ConfigurationResource,
+    AsyncConfigurationResource,
+    ConfigurationResourceWithRawResponse,
+    AsyncConfigurationResourceWithRawResponse,
+    ConfigurationResourceWithStreamingResponse,
+    AsyncConfigurationResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "CredentialsResource",
+    "AsyncCredentialsResource",
+    "CredentialsResourceWithRawResponse",
+    "AsyncCredentialsResourceWithRawResponse",
+    "CredentialsResourceWithStreamingResponse",
+    "AsyncCredentialsResourceWithStreamingResponse",
+    "ConfigurationResource",
+    "AsyncConfigurationResource",
+    "ConfigurationResourceWithRawResponse",
+    "AsyncConfigurationResourceWithRawResponse",
+    "ConfigurationResourceWithStreamingResponse",
+    "AsyncConfigurationResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/token_validation/configuration/configuration.py b/src/cloudflare/resources/token_validation/configuration/configuration.py
new file mode 100644
index 00000000000..b151f82ff13
--- /dev/null
+++ b/src/cloudflare/resources/token_validation/configuration/configuration.py
@@ -0,0 +1,684 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from .credentials import (
+    CredentialsResource,
+    AsyncCredentialsResource,
+    CredentialsResourceWithRawResponse,
+    AsyncCredentialsResourceWithRawResponse,
+    CredentialsResourceWithStreamingResponse,
+    AsyncCredentialsResourceWithStreamingResponse,
+)
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.token_validation import configuration_edit_params, configuration_list_params, configuration_create_params
+from ....types.token_validation.token_config import TokenConfig
+from ....types.token_validation.configuration_edit_response import ConfigurationEditResponse
+from ....types.token_validation.configuration_delete_response import ConfigurationDeleteResponse
+
+__all__ = ["ConfigurationResource", "AsyncConfigurationResource"]
+
+
+class ConfigurationResource(SyncAPIResource):
+    @cached_property
+    def credentials(self) -> CredentialsResource:
+        return CredentialsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> ConfigurationResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ConfigurationResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ConfigurationResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ConfigurationResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        zone_id: str,
+        credentials: configuration_create_params.Credentials,
+        description: str,
+        title: str,
+        token_sources: SequenceNotStr[str],
+        token_type: Literal["JWT"],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TokenConfig:
+        """
+        Create a new Token Validation configuration
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/token_validation/config",
+            body=maybe_transform(
+                {
+                    "credentials": credentials,
+                    "description": description,
+                    "title": title,
+                    "token_sources": token_sources,
+                    "token_type": token_type,
+                },
+                configuration_create_params.ConfigurationCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenConfig]._unwrapper,
+            ),
+            cast_to=cast(Type[TokenConfig], ResultWrapper[TokenConfig]),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[TokenConfig]:
+        """
+        Lists all token validation configurations for this zone
+
+        Args:
+          zone_id: Identifier.
+
+          page: Page number of paginated results.
+
+          per_page: Maximum number of results per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/token_validation/config",
+            page=SyncV4PagePaginationArray[TokenConfig],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    configuration_list_params.ConfigurationListParams,
+                ),
+            ),
+            model=TokenConfig,
+        )
+
+    def delete(
+        self,
+        config_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ConfigurationDeleteResponse:
+        """
+        Delete Token Configuration
+
+        Args:
+          zone_id: Identifier.
+
+          config_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not config_id:
+            raise ValueError(f"Expected a non-empty value for `config_id` but received {config_id!r}")
+        return self._delete(
+            f"/zones/{zone_id}/token_validation/config/{config_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ConfigurationDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ConfigurationDeleteResponse], ResultWrapper[ConfigurationDeleteResponse]),
+        )
+
+    def edit(
+        self,
+        config_id: str,
+        *,
+        zone_id: str,
+        description: str | Omit = omit,
+        title: str | Omit = omit,
+        token_sources: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ConfigurationEditResponse:
+        """
+        Edit fields of an existing Token Configuration
+
+        Args:
+          zone_id: Identifier.
+
+          config_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not config_id:
+            raise ValueError(f"Expected a non-empty value for `config_id` but received {config_id!r}")
+        return self._patch(
+            f"/zones/{zone_id}/token_validation/config/{config_id}",
+            body=maybe_transform(
+                {
+                    "description": description,
+                    "title": title,
+                    "token_sources": token_sources,
+                },
+                configuration_edit_params.ConfigurationEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ConfigurationEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ConfigurationEditResponse], ResultWrapper[ConfigurationEditResponse]),
+        )
+
+    def get(
+        self,
+        config_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TokenConfig:
+        """
+        Get a single Token Configuration
+
+        Args:
+          zone_id: Identifier.
+
+          config_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not config_id:
+            raise ValueError(f"Expected a non-empty value for `config_id` but received {config_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/token_validation/config/{config_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenConfig]._unwrapper,
+            ),
+            cast_to=cast(Type[TokenConfig], ResultWrapper[TokenConfig]),
+        )
+
+
+class AsyncConfigurationResource(AsyncAPIResource):
+    @cached_property
+    def credentials(self) -> AsyncCredentialsResource:
+        return AsyncCredentialsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncConfigurationResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncConfigurationResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncConfigurationResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncConfigurationResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        credentials: configuration_create_params.Credentials,
+        description: str,
+        title: str,
+        token_sources: SequenceNotStr[str],
+        token_type: Literal["JWT"],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TokenConfig:
+        """
+        Create a new Token Validation configuration
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/token_validation/config",
+            body=await async_maybe_transform(
+                {
+                    "credentials": credentials,
+                    "description": description,
+                    "title": title,
+                    "token_sources": token_sources,
+                    "token_type": token_type,
+                },
+                configuration_create_params.ConfigurationCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenConfig]._unwrapper,
+            ),
+            cast_to=cast(Type[TokenConfig], ResultWrapper[TokenConfig]),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[TokenConfig, AsyncV4PagePaginationArray[TokenConfig]]:
+        """
+        Lists all token validation configurations for this zone
+
+        Args:
+          zone_id: Identifier.
+
+          page: Page number of paginated results.
+
+          per_page: Maximum number of results per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/token_validation/config",
+            page=AsyncV4PagePaginationArray[TokenConfig],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    configuration_list_params.ConfigurationListParams,
+                ),
+            ),
+            model=TokenConfig,
+        )
+
+    async def delete(
+        self,
+        config_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ConfigurationDeleteResponse:
+        """
+        Delete Token Configuration
+
+        Args:
+          zone_id: Identifier.
+
+          config_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not config_id:
+            raise ValueError(f"Expected a non-empty value for `config_id` but received {config_id!r}")
+        return await self._delete(
+            f"/zones/{zone_id}/token_validation/config/{config_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ConfigurationDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ConfigurationDeleteResponse], ResultWrapper[ConfigurationDeleteResponse]),
+        )
+
+    async def edit(
+        self,
+        config_id: str,
+        *,
+        zone_id: str,
+        description: str | Omit = omit,
+        title: str | Omit = omit,
+        token_sources: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ConfigurationEditResponse:
+        """
+        Edit fields of an existing Token Configuration
+
+        Args:
+          zone_id: Identifier.
+
+          config_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not config_id:
+            raise ValueError(f"Expected a non-empty value for `config_id` but received {config_id!r}")
+        return await self._patch(
+            f"/zones/{zone_id}/token_validation/config/{config_id}",
+            body=await async_maybe_transform(
+                {
+                    "description": description,
+                    "title": title,
+                    "token_sources": token_sources,
+                },
+                configuration_edit_params.ConfigurationEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ConfigurationEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ConfigurationEditResponse], ResultWrapper[ConfigurationEditResponse]),
+        )
+
+    async def get(
+        self,
+        config_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TokenConfig:
+        """
+        Get a single Token Configuration
+
+        Args:
+          zone_id: Identifier.
+
+          config_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not config_id:
+            raise ValueError(f"Expected a non-empty value for `config_id` but received {config_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/token_validation/config/{config_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenConfig]._unwrapper,
+            ),
+            cast_to=cast(Type[TokenConfig], ResultWrapper[TokenConfig]),
+        )
+
+
+class ConfigurationResourceWithRawResponse:
+    def __init__(self, configuration: ConfigurationResource) -> None:
+        self._configuration = configuration
+
+        self.create = to_raw_response_wrapper(
+            configuration.create,
+        )
+        self.list = to_raw_response_wrapper(
+            configuration.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            configuration.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            configuration.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            configuration.get,
+        )
+
+    @cached_property
+    def credentials(self) -> CredentialsResourceWithRawResponse:
+        return CredentialsResourceWithRawResponse(self._configuration.credentials)
+
+
+class AsyncConfigurationResourceWithRawResponse:
+    def __init__(self, configuration: AsyncConfigurationResource) -> None:
+        self._configuration = configuration
+
+        self.create = async_to_raw_response_wrapper(
+            configuration.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            configuration.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            configuration.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            configuration.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            configuration.get,
+        )
+
+    @cached_property
+    def credentials(self) -> AsyncCredentialsResourceWithRawResponse:
+        return AsyncCredentialsResourceWithRawResponse(self._configuration.credentials)
+
+
+class ConfigurationResourceWithStreamingResponse:
+    def __init__(self, configuration: ConfigurationResource) -> None:
+        self._configuration = configuration
+
+        self.create = to_streamed_response_wrapper(
+            configuration.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            configuration.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            configuration.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            configuration.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            configuration.get,
+        )
+
+    @cached_property
+    def credentials(self) -> CredentialsResourceWithStreamingResponse:
+        return CredentialsResourceWithStreamingResponse(self._configuration.credentials)
+
+
+class AsyncConfigurationResourceWithStreamingResponse:
+    def __init__(self, configuration: AsyncConfigurationResource) -> None:
+        self._configuration = configuration
+
+        self.create = async_to_streamed_response_wrapper(
+            configuration.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            configuration.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            configuration.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            configuration.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            configuration.get,
+        )
+
+    @cached_property
+    def credentials(self) -> AsyncCredentialsResourceWithStreamingResponse:
+        return AsyncCredentialsResourceWithStreamingResponse(self._configuration.credentials)
diff --git a/src/cloudflare/resources/token_validation/configuration/credentials.py b/src/cloudflare/resources/token_validation/configuration/credentials.py
new file mode 100644
index 00000000000..1214a8f8ac0
--- /dev/null
+++ b/src/cloudflare/resources/token_validation/configuration/credentials.py
@@ -0,0 +1,185 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._base_client import make_request_options
+from ....types.token_validation.configuration import credential_update_params
+from ....types.token_validation.configuration.credential_update_response import CredentialUpdateResponse
+
+__all__ = ["CredentialsResource", "AsyncCredentialsResource"]
+
+
+class CredentialsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> CredentialsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CredentialsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CredentialsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CredentialsResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        config_id: str,
+        *,
+        zone_id: str,
+        keys: Iterable[credential_update_params.Key],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CredentialUpdateResponse:
+        """
+        Update Token Configuration credentials
+
+        Args:
+          zone_id: Identifier.
+
+          config_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not config_id:
+            raise ValueError(f"Expected a non-empty value for `config_id` but received {config_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/token_validation/config/{config_id}/credentials",
+            body=maybe_transform({"keys": keys}, credential_update_params.CredentialUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CredentialUpdateResponse,
+        )
+
+
+class AsyncCredentialsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncCredentialsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCredentialsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCredentialsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCredentialsResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        config_id: str,
+        *,
+        zone_id: str,
+        keys: Iterable[credential_update_params.Key],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CredentialUpdateResponse:
+        """
+        Update Token Configuration credentials
+
+        Args:
+          zone_id: Identifier.
+
+          config_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not config_id:
+            raise ValueError(f"Expected a non-empty value for `config_id` but received {config_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/token_validation/config/{config_id}/credentials",
+            body=await async_maybe_transform({"keys": keys}, credential_update_params.CredentialUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CredentialUpdateResponse,
+        )
+
+
+class CredentialsResourceWithRawResponse:
+    def __init__(self, credentials: CredentialsResource) -> None:
+        self._credentials = credentials
+
+        self.update = to_raw_response_wrapper(
+            credentials.update,
+        )
+
+
+class AsyncCredentialsResourceWithRawResponse:
+    def __init__(self, credentials: AsyncCredentialsResource) -> None:
+        self._credentials = credentials
+
+        self.update = async_to_raw_response_wrapper(
+            credentials.update,
+        )
+
+
+class CredentialsResourceWithStreamingResponse:
+    def __init__(self, credentials: CredentialsResource) -> None:
+        self._credentials = credentials
+
+        self.update = to_streamed_response_wrapper(
+            credentials.update,
+        )
+
+
+class AsyncCredentialsResourceWithStreamingResponse:
+    def __init__(self, credentials: AsyncCredentialsResource) -> None:
+        self._credentials = credentials
+
+        self.update = async_to_streamed_response_wrapper(
+            credentials.update,
+        )
diff --git a/src/cloudflare/resources/token_validation/rules.py b/src/cloudflare/resources/token_validation/rules.py
new file mode 100644
index 00000000000..e16f28f343d
--- /dev/null
+++ b/src/cloudflare/resources/token_validation/rules.py
@@ -0,0 +1,1014 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.token_validation import (
+    rule_edit_params,
+    rule_list_params,
+    rule_create_params,
+    rule_bulk_edit_params,
+    rule_bulk_create_params,
+)
+from ...types.token_validation.token_validation_rule import TokenValidationRule
+
+__all__ = ["RulesResource", "AsyncRulesResource"]
+
+
+class RulesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> RulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return RulesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> RulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return RulesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        zone_id: str,
+        action: Literal["log", "block"],
+        description: str,
+        enabled: bool,
+        expression: str,
+        selector: rule_create_params.Selector,
+        title: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TokenValidationRule:
+        """
+        Create a token validation rule.
+
+        Args:
+          zone_id: Identifier.
+
+          action: Action to take on requests that match operations included in `selector` and fail
+              `expression`.
+
+          description: A human-readable description that gives more details than `title`.
+
+          enabled: Toggle rule on or off.
+
+          expression: Rule expression. Requests that fail to match this expression will be subject to
+              `action`.
+
+              For details on expressions, see the
+              [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+
+          selector: Select operations covered by this rule.
+
+              For details on selectors, see the
+              [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+
+          title: A human-readable name for the rule.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/token_validation/rules",
+            body=maybe_transform(
+                {
+                    "action": action,
+                    "description": description,
+                    "enabled": enabled,
+                    "expression": expression,
+                    "selector": selector,
+                    "title": title,
+                },
+                rule_create_params.RuleCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenValidationRule]._unwrapper,
+            ),
+            cast_to=cast(Type[TokenValidationRule], ResultWrapper[TokenValidationRule]),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        id: str | Omit = omit,
+        action: Literal["log", "block"] | Omit = omit,
+        enabled: bool | Omit = omit,
+        host: str | Omit = omit,
+        hostname: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        rule_id: str | Omit = omit,
+        token_configuration: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[TokenValidationRule]:
+        """
+        List token validation rules
+
+        Args:
+          zone_id: Identifier.
+
+          id: Select rules with these IDs.
+
+          action: Action to take on requests that match operations included in `selector` and fail
+              `expression`.
+
+          enabled: Toggle rule on or off.
+
+          host: Select rules with this host in `include`.
+
+          hostname: Select rules with this host in `include`.
+
+          page: Page number of paginated results.
+
+          per_page: Maximum number of results per page.
+
+          rule_id: Select rules with these IDs.
+
+          token_configuration: Select rules using any of these token configurations.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/token_validation/rules",
+            page=SyncV4PagePaginationArray[TokenValidationRule],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "id": id,
+                        "action": action,
+                        "enabled": enabled,
+                        "host": host,
+                        "hostname": hostname,
+                        "page": page,
+                        "per_page": per_page,
+                        "rule_id": rule_id,
+                        "token_configuration": token_configuration,
+                    },
+                    rule_list_params.RuleListParams,
+                ),
+            ),
+            model=TokenValidationRule,
+        )
+
+    def delete(
+        self,
+        rule_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Delete a zone token validation rule.
+
+        Args:
+          zone_id: Identifier.
+
+          rule_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
+        return self._delete(
+            f"/zones/{zone_id}/token_validation/rules/{rule_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def bulk_create(
+        self,
+        *,
+        zone_id: str,
+        body: Iterable[rule_bulk_create_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[TokenValidationRule]:
+        """
+        Create zone token validation rules.
+
+        A request can create multiple Token Validation Rules.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/token_validation/rules/bulk",
+            page=SyncSinglePage[TokenValidationRule],
+            body=maybe_transform(body, Iterable[rule_bulk_create_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=TokenValidationRule,
+            method="post",
+        )
+
+    def bulk_edit(
+        self,
+        *,
+        zone_id: str,
+        body: Iterable[rule_bulk_edit_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[TokenValidationRule]:
+        """
+        Edit token validation rules.
+
+        A request can update multiple Token Validation Rules.
+
+        Rules can be re-ordered using the `position` field.
+
+        Returns all updated rules.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/token_validation/rules/bulk",
+            page=SyncSinglePage[TokenValidationRule],
+            body=maybe_transform(body, Iterable[rule_bulk_edit_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=TokenValidationRule,
+            method="patch",
+        )
+
+    def edit(
+        self,
+        rule_id: str,
+        *,
+        zone_id: str,
+        action: Literal["log", "block"] | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        expression: str | Omit = omit,
+        position: rule_edit_params.Position | Omit = omit,
+        selector: rule_edit_params.Selector | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TokenValidationRule:
+        """
+        Edit a zone token validation rule.
+
+        Args:
+          zone_id: Identifier.
+
+          rule_id: UUID.
+
+          action: Action to take on requests that match operations included in `selector` and fail
+              `expression`.
+
+          description: A human-readable description that gives more details than `title`.
+
+          enabled: Toggle rule on or off.
+
+          expression: Rule expression. Requests that fail to match this expression will be subject to
+              `action`.
+
+              For details on expressions, see the
+              [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+
+          position: Update rule order among zone rules.
+
+          selector: Select operations covered by this rule.
+
+              For details on selectors, see the
+              [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+
+          title: A human-readable name for the rule.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
+        return self._patch(
+            f"/zones/{zone_id}/token_validation/rules/{rule_id}",
+            body=maybe_transform(
+                {
+                    "action": action,
+                    "description": description,
+                    "enabled": enabled,
+                    "expression": expression,
+                    "position": position,
+                    "selector": selector,
+                    "title": title,
+                },
+                rule_edit_params.RuleEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenValidationRule]._unwrapper,
+            ),
+            cast_to=cast(Type[TokenValidationRule], ResultWrapper[TokenValidationRule]),
+        )
+
+    def get(
+        self,
+        rule_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TokenValidationRule:
+        """
+        Get a zone token validation rule.
+
+        Args:
+          zone_id: Identifier.
+
+          rule_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/token_validation/rules/{rule_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenValidationRule]._unwrapper,
+            ),
+            cast_to=cast(Type[TokenValidationRule], ResultWrapper[TokenValidationRule]),
+        )
+
+
+class AsyncRulesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncRulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncRulesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncRulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncRulesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        action: Literal["log", "block"],
+        description: str,
+        enabled: bool,
+        expression: str,
+        selector: rule_create_params.Selector,
+        title: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TokenValidationRule:
+        """
+        Create a token validation rule.
+
+        Args:
+          zone_id: Identifier.
+
+          action: Action to take on requests that match operations included in `selector` and fail
+              `expression`.
+
+          description: A human-readable description that gives more details than `title`.
+
+          enabled: Toggle rule on or off.
+
+          expression: Rule expression. Requests that fail to match this expression will be subject to
+              `action`.
+
+              For details on expressions, see the
+              [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+
+          selector: Select operations covered by this rule.
+
+              For details on selectors, see the
+              [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+
+          title: A human-readable name for the rule.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/token_validation/rules",
+            body=await async_maybe_transform(
+                {
+                    "action": action,
+                    "description": description,
+                    "enabled": enabled,
+                    "expression": expression,
+                    "selector": selector,
+                    "title": title,
+                },
+                rule_create_params.RuleCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenValidationRule]._unwrapper,
+            ),
+            cast_to=cast(Type[TokenValidationRule], ResultWrapper[TokenValidationRule]),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        id: str | Omit = omit,
+        action: Literal["log", "block"] | Omit = omit,
+        enabled: bool | Omit = omit,
+        host: str | Omit = omit,
+        hostname: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        rule_id: str | Omit = omit,
+        token_configuration: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[TokenValidationRule, AsyncV4PagePaginationArray[TokenValidationRule]]:
+        """
+        List token validation rules
+
+        Args:
+          zone_id: Identifier.
+
+          id: Select rules with these IDs.
+
+          action: Action to take on requests that match operations included in `selector` and fail
+              `expression`.
+
+          enabled: Toggle rule on or off.
+
+          host: Select rules with this host in `include`.
+
+          hostname: Select rules with this host in `include`.
+
+          page: Page number of paginated results.
+
+          per_page: Maximum number of results per page.
+
+          rule_id: Select rules with these IDs.
+
+          token_configuration: Select rules using any of these token configurations.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/token_validation/rules",
+            page=AsyncV4PagePaginationArray[TokenValidationRule],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "id": id,
+                        "action": action,
+                        "enabled": enabled,
+                        "host": host,
+                        "hostname": hostname,
+                        "page": page,
+                        "per_page": per_page,
+                        "rule_id": rule_id,
+                        "token_configuration": token_configuration,
+                    },
+                    rule_list_params.RuleListParams,
+                ),
+            ),
+            model=TokenValidationRule,
+        )
+
+    async def delete(
+        self,
+        rule_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Delete a zone token validation rule.
+
+        Args:
+          zone_id: Identifier.
+
+          rule_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
+        return await self._delete(
+            f"/zones/{zone_id}/token_validation/rules/{rule_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def bulk_create(
+        self,
+        *,
+        zone_id: str,
+        body: Iterable[rule_bulk_create_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[TokenValidationRule, AsyncSinglePage[TokenValidationRule]]:
+        """
+        Create zone token validation rules.
+
+        A request can create multiple Token Validation Rules.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/token_validation/rules/bulk",
+            page=AsyncSinglePage[TokenValidationRule],
+            body=maybe_transform(body, Iterable[rule_bulk_create_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=TokenValidationRule,
+            method="post",
+        )
+
+    def bulk_edit(
+        self,
+        *,
+        zone_id: str,
+        body: Iterable[rule_bulk_edit_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[TokenValidationRule, AsyncSinglePage[TokenValidationRule]]:
+        """
+        Edit token validation rules.
+
+        A request can update multiple Token Validation Rules.
+
+        Rules can be re-ordered using the `position` field.
+
+        Returns all updated rules.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/token_validation/rules/bulk",
+            page=AsyncSinglePage[TokenValidationRule],
+            body=maybe_transform(body, Iterable[rule_bulk_edit_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=TokenValidationRule,
+            method="patch",
+        )
+
+    async def edit(
+        self,
+        rule_id: str,
+        *,
+        zone_id: str,
+        action: Literal["log", "block"] | Omit = omit,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        expression: str | Omit = omit,
+        position: rule_edit_params.Position | Omit = omit,
+        selector: rule_edit_params.Selector | Omit = omit,
+        title: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TokenValidationRule:
+        """
+        Edit a zone token validation rule.
+
+        Args:
+          zone_id: Identifier.
+
+          rule_id: UUID.
+
+          action: Action to take on requests that match operations included in `selector` and fail
+              `expression`.
+
+          description: A human-readable description that gives more details than `title`.
+
+          enabled: Toggle rule on or off.
+
+          expression: Rule expression. Requests that fail to match this expression will be subject to
+              `action`.
+
+              For details on expressions, see the
+              [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+
+          position: Update rule order among zone rules.
+
+          selector: Select operations covered by this rule.
+
+              For details on selectors, see the
+              [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+
+          title: A human-readable name for the rule.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
+        return await self._patch(
+            f"/zones/{zone_id}/token_validation/rules/{rule_id}",
+            body=await async_maybe_transform(
+                {
+                    "action": action,
+                    "description": description,
+                    "enabled": enabled,
+                    "expression": expression,
+                    "position": position,
+                    "selector": selector,
+                    "title": title,
+                },
+                rule_edit_params.RuleEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenValidationRule]._unwrapper,
+            ),
+            cast_to=cast(Type[TokenValidationRule], ResultWrapper[TokenValidationRule]),
+        )
+
+    async def get(
+        self,
+        rule_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TokenValidationRule:
+        """
+        Get a zone token validation rule.
+
+        Args:
+          zone_id: Identifier.
+
+          rule_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/token_validation/rules/{rule_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenValidationRule]._unwrapper,
+            ),
+            cast_to=cast(Type[TokenValidationRule], ResultWrapper[TokenValidationRule]),
+        )
+
+
+class RulesResourceWithRawResponse:
+    def __init__(self, rules: RulesResource) -> None:
+        self._rules = rules
+
+        self.create = to_raw_response_wrapper(
+            rules.create,
+        )
+        self.list = to_raw_response_wrapper(
+            rules.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            rules.delete,
+        )
+        self.bulk_create = to_raw_response_wrapper(
+            rules.bulk_create,
+        )
+        self.bulk_edit = to_raw_response_wrapper(
+            rules.bulk_edit,
+        )
+        self.edit = to_raw_response_wrapper(
+            rules.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            rules.get,
+        )
+
+
+class AsyncRulesResourceWithRawResponse:
+    def __init__(self, rules: AsyncRulesResource) -> None:
+        self._rules = rules
+
+        self.create = async_to_raw_response_wrapper(
+            rules.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            rules.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            rules.delete,
+        )
+        self.bulk_create = async_to_raw_response_wrapper(
+            rules.bulk_create,
+        )
+        self.bulk_edit = async_to_raw_response_wrapper(
+            rules.bulk_edit,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            rules.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            rules.get,
+        )
+
+
+class RulesResourceWithStreamingResponse:
+    def __init__(self, rules: RulesResource) -> None:
+        self._rules = rules
+
+        self.create = to_streamed_response_wrapper(
+            rules.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            rules.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            rules.delete,
+        )
+        self.bulk_create = to_streamed_response_wrapper(
+            rules.bulk_create,
+        )
+        self.bulk_edit = to_streamed_response_wrapper(
+            rules.bulk_edit,
+        )
+        self.edit = to_streamed_response_wrapper(
+            rules.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            rules.get,
+        )
+
+
+class AsyncRulesResourceWithStreamingResponse:
+    def __init__(self, rules: AsyncRulesResource) -> None:
+        self._rules = rules
+
+        self.create = async_to_streamed_response_wrapper(
+            rules.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            rules.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            rules.delete,
+        )
+        self.bulk_create = async_to_streamed_response_wrapper(
+            rules.bulk_create,
+        )
+        self.bulk_edit = async_to_streamed_response_wrapper(
+            rules.bulk_edit,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            rules.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            rules.get,
+        )
diff --git a/src/cloudflare/resources/token_validation/token_validation.py b/src/cloudflare/resources/token_validation/token_validation.py
new file mode 100644
index 00000000000..f9b181cc805
--- /dev/null
+++ b/src/cloudflare/resources/token_validation/token_validation.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .rules import (
+    RulesResource,
+    AsyncRulesResource,
+    RulesResourceWithRawResponse,
+    AsyncRulesResourceWithRawResponse,
+    RulesResourceWithStreamingResponse,
+    AsyncRulesResourceWithStreamingResponse,
+)
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .configuration.configuration import (
+    ConfigurationResource,
+    AsyncConfigurationResource,
+    ConfigurationResourceWithRawResponse,
+    AsyncConfigurationResourceWithRawResponse,
+    ConfigurationResourceWithStreamingResponse,
+    AsyncConfigurationResourceWithStreamingResponse,
+)
+
+__all__ = ["TokenValidationResource", "AsyncTokenValidationResource"]
+
+
+class TokenValidationResource(SyncAPIResource):
+    @cached_property
+    def configuration(self) -> ConfigurationResource:
+        return ConfigurationResource(self._client)
+
+    @cached_property
+    def rules(self) -> RulesResource:
+        return RulesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> TokenValidationResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TokenValidationResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TokenValidationResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TokenValidationResourceWithStreamingResponse(self)
+
+
+class AsyncTokenValidationResource(AsyncAPIResource):
+    @cached_property
+    def configuration(self) -> AsyncConfigurationResource:
+        return AsyncConfigurationResource(self._client)
+
+    @cached_property
+    def rules(self) -> AsyncRulesResource:
+        return AsyncRulesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncTokenValidationResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTokenValidationResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTokenValidationResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTokenValidationResourceWithStreamingResponse(self)
+
+
+class TokenValidationResourceWithRawResponse:
+    def __init__(self, token_validation: TokenValidationResource) -> None:
+        self._token_validation = token_validation
+
+    @cached_property
+    def configuration(self) -> ConfigurationResourceWithRawResponse:
+        return ConfigurationResourceWithRawResponse(self._token_validation.configuration)
+
+    @cached_property
+    def rules(self) -> RulesResourceWithRawResponse:
+        return RulesResourceWithRawResponse(self._token_validation.rules)
+
+
+class AsyncTokenValidationResourceWithRawResponse:
+    def __init__(self, token_validation: AsyncTokenValidationResource) -> None:
+        self._token_validation = token_validation
+
+    @cached_property
+    def configuration(self) -> AsyncConfigurationResourceWithRawResponse:
+        return AsyncConfigurationResourceWithRawResponse(self._token_validation.configuration)
+
+    @cached_property
+    def rules(self) -> AsyncRulesResourceWithRawResponse:
+        return AsyncRulesResourceWithRawResponse(self._token_validation.rules)
+
+
+class TokenValidationResourceWithStreamingResponse:
+    def __init__(self, token_validation: TokenValidationResource) -> None:
+        self._token_validation = token_validation
+
+    @cached_property
+    def configuration(self) -> ConfigurationResourceWithStreamingResponse:
+        return ConfigurationResourceWithStreamingResponse(self._token_validation.configuration)
+
+    @cached_property
+    def rules(self) -> RulesResourceWithStreamingResponse:
+        return RulesResourceWithStreamingResponse(self._token_validation.rules)
+
+
+class AsyncTokenValidationResourceWithStreamingResponse:
+    def __init__(self, token_validation: AsyncTokenValidationResource) -> None:
+        self._token_validation = token_validation
+
+    @cached_property
+    def configuration(self) -> AsyncConfigurationResourceWithStreamingResponse:
+        return AsyncConfigurationResourceWithStreamingResponse(self._token_validation.configuration)
+
+    @cached_property
+    def rules(self) -> AsyncRulesResourceWithStreamingResponse:
+        return AsyncRulesResourceWithStreamingResponse(self._token_validation.rules)
diff --git a/src/cloudflare/resources/turnstile/__init__.py b/src/cloudflare/resources/turnstile/__init__.py
new file mode 100644
index 00000000000..6f1b39e9afb
--- /dev/null
+++ b/src/cloudflare/resources/turnstile/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .widgets import (
+    WidgetsResource,
+    AsyncWidgetsResource,
+    WidgetsResourceWithRawResponse,
+    AsyncWidgetsResourceWithRawResponse,
+    WidgetsResourceWithStreamingResponse,
+    AsyncWidgetsResourceWithStreamingResponse,
+)
+from .turnstile import (
+    TurnstileResource,
+    AsyncTurnstileResource,
+    TurnstileResourceWithRawResponse,
+    AsyncTurnstileResourceWithRawResponse,
+    TurnstileResourceWithStreamingResponse,
+    AsyncTurnstileResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "WidgetsResource",
+    "AsyncWidgetsResource",
+    "WidgetsResourceWithRawResponse",
+    "AsyncWidgetsResourceWithRawResponse",
+    "WidgetsResourceWithStreamingResponse",
+    "AsyncWidgetsResourceWithStreamingResponse",
+    "TurnstileResource",
+    "AsyncTurnstileResource",
+    "TurnstileResourceWithRawResponse",
+    "AsyncTurnstileResourceWithRawResponse",
+    "TurnstileResourceWithStreamingResponse",
+    "AsyncTurnstileResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/turnstile/turnstile.py b/src/cloudflare/resources/turnstile/turnstile.py
new file mode 100644
index 00000000000..46dea4d7e61
--- /dev/null
+++ b/src/cloudflare/resources/turnstile/turnstile.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .widgets import (
+    WidgetsResource,
+    AsyncWidgetsResource,
+    WidgetsResourceWithRawResponse,
+    AsyncWidgetsResourceWithRawResponse,
+    WidgetsResourceWithStreamingResponse,
+    AsyncWidgetsResourceWithStreamingResponse,
+)
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["TurnstileResource", "AsyncTurnstileResource"]
+
+
+class TurnstileResource(SyncAPIResource):
+    @cached_property
+    def widgets(self) -> WidgetsResource:
+        return WidgetsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> TurnstileResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TurnstileResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TurnstileResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TurnstileResourceWithStreamingResponse(self)
+
+
+class AsyncTurnstileResource(AsyncAPIResource):
+    @cached_property
+    def widgets(self) -> AsyncWidgetsResource:
+        return AsyncWidgetsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncTurnstileResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTurnstileResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTurnstileResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTurnstileResourceWithStreamingResponse(self)
+
+
+class TurnstileResourceWithRawResponse:
+    def __init__(self, turnstile: TurnstileResource) -> None:
+        self._turnstile = turnstile
+
+    @cached_property
+    def widgets(self) -> WidgetsResourceWithRawResponse:
+        return WidgetsResourceWithRawResponse(self._turnstile.widgets)
+
+
+class AsyncTurnstileResourceWithRawResponse:
+    def __init__(self, turnstile: AsyncTurnstileResource) -> None:
+        self._turnstile = turnstile
+
+    @cached_property
+    def widgets(self) -> AsyncWidgetsResourceWithRawResponse:
+        return AsyncWidgetsResourceWithRawResponse(self._turnstile.widgets)
+
+
+class TurnstileResourceWithStreamingResponse:
+    def __init__(self, turnstile: TurnstileResource) -> None:
+        self._turnstile = turnstile
+
+    @cached_property
+    def widgets(self) -> WidgetsResourceWithStreamingResponse:
+        return WidgetsResourceWithStreamingResponse(self._turnstile.widgets)
+
+
+class AsyncTurnstileResourceWithStreamingResponse:
+    def __init__(self, turnstile: AsyncTurnstileResource) -> None:
+        self._turnstile = turnstile
+
+    @cached_property
+    def widgets(self) -> AsyncWidgetsResourceWithStreamingResponse:
+        return AsyncWidgetsResourceWithStreamingResponse(self._turnstile.widgets)
diff --git a/src/cloudflare/resources/challenges/widgets.py b/src/cloudflare/resources/turnstile/widgets.py
similarity index 81%
rename from src/cloudflare/resources/challenges/widgets.py
rename to src/cloudflare/resources/turnstile/widgets.py
index 95cf49944dc..54071126a02 100644
--- a/src/cloudflare/resources/challenges/widgets.py
+++ b/src/cloudflare/resources/turnstile/widgets.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Optional, cast
+from typing import Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -23,15 +20,15 @@
 from ..._wrappers import ResultWrapper
 from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ..._base_client import AsyncPaginator, make_request_options
-from ...types.challenges import (
+from ...types.turnstile import (
     widget_list_params,
     widget_create_params,
     widget_update_params,
     widget_rotate_secret_params,
 )
-from ...types.challenges.widget import Widget
-from ...types.challenges.widget_domain import WidgetDomain
-from ...types.challenges.widget_list_response import WidgetListResponse
+from ...types.turnstile.widget import Widget
+from ...types.turnstile.widget_domain import WidgetDomain
+from ...types.turnstile.widget_list_response import WidgetListResponse
 
 __all__ = ["WidgetsResource", "AsyncWidgetsResource"]
 
@@ -39,33 +36,46 @@
 class WidgetsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> WidgetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return WidgetsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> WidgetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return WidgetsResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        domains: List[WidgetDomain],
+        domains: SequenceNotStr[WidgetDomain],
         mode: Literal["non-interactive", "invisible", "managed"],
         name: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        order: Literal["id", "sitekey", "name", "created_on", "modified_on"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        bot_fight_mode: bool | NotGiven = NOT_GIVEN,
-        clearance_level: Literal["no_clearance", "jschallenge", "managed", "interactive"] | NotGiven = NOT_GIVEN,
-        offlabel: bool | NotGiven = NOT_GIVEN,
-        region: Literal["world"] | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        filter: str | Omit = omit,
+        order: Literal["id", "sitekey", "name", "created_on", "modified_on"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        bot_fight_mode: bool | Omit = omit,
+        clearance_level: Literal["no_clearance", "jschallenge", "managed", "interactive"] | Omit = omit,
+        ephemeral_id: bool | Omit = omit,
+        offlabel: bool | Omit = omit,
+        region: Literal["world", "china"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Widget]:
         """
         Lists challenge widgets.
@@ -81,6 +91,18 @@ def create(
 
           direction: Direction to order widgets.
 
+          filter:
+              Filter widgets by field using case-insensitive substring matching. Format:
+              `field:value`
+
+              Supported fields:
+
+              - `name` - Filter by widget name (e.g., `filter=name:login-form`)
+              - `sitekey` - Filter by sitekey (e.g., `filter=sitekey:0x4AAA`)
+
+              Returns 400 Bad Request if the field is unsupported or format is invalid. An
+              empty filter value returns all results.
+
           order: Field to order widgets by.
 
           page: Page number of paginated results.
@@ -93,9 +115,11 @@ def create(
           clearance_level: If Turnstile is embedded on a Cloudflare site and the widget should grant
               challenge clearance, this setting can determine the clearance level to be set
 
+          ephemeral_id: Return the Ephemeral ID in /siteverify (ENT only).
+
           offlabel: Do not show any Cloudflare branding on the widget (ENT only).
 
-          region: Region where this widget can be used.
+          region: Region where this widget can be used. This cannot be changed after creation.
 
           extra_headers: Send extra headers
 
@@ -116,6 +140,7 @@ def create(
                     "name": name,
                     "bot_fight_mode": bot_fight_mode,
                     "clearance_level": clearance_level,
+                    "ephemeral_id": ephemeral_id,
                     "offlabel": offlabel,
                     "region": region,
                 },
@@ -129,6 +154,7 @@ def create(
                 query=maybe_transform(
                     {
                         "direction": direction,
+                        "filter": filter,
                         "order": order,
                         "page": page,
                         "per_page": per_page,
@@ -145,18 +171,20 @@ def update(
         sitekey: str,
         *,
         account_id: str,
-        domains: List[WidgetDomain],
+        domains: SequenceNotStr[WidgetDomain],
         mode: Literal["non-interactive", "invisible", "managed"],
         name: str,
-        bot_fight_mode: bool | NotGiven = NOT_GIVEN,
-        clearance_level: Literal["no_clearance", "jschallenge", "managed", "interactive"] | NotGiven = NOT_GIVEN,
-        offlabel: bool | NotGiven = NOT_GIVEN,
+        bot_fight_mode: bool | Omit = omit,
+        clearance_level: Literal["no_clearance", "jschallenge", "managed", "interactive"] | Omit = omit,
+        ephemeral_id: bool | Omit = omit,
+        offlabel: bool | Omit = omit,
+        region: Literal["world", "china"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Widget]:
         """
         Update the configuration of a widget.
@@ -178,8 +206,12 @@ def update(
           clearance_level: If Turnstile is embedded on a Cloudflare site and the widget should grant
               challenge clearance, this setting can determine the clearance level to be set
 
+          ephemeral_id: Return the Ephemeral ID in /siteverify (ENT only).
+
           offlabel: Do not show any Cloudflare branding on the widget (ENT only).
 
+          region: Region where this widget can be used. This cannot be changed after creation.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -201,7 +233,9 @@ def update(
                     "name": name,
                     "bot_fight_mode": bot_fight_mode,
                     "clearance_level": clearance_level,
+                    "ephemeral_id": ephemeral_id,
                     "offlabel": offlabel,
+                    "region": region,
                 },
                 widget_update_params.WidgetUpdateParams,
             ),
@@ -219,16 +253,17 @@ def list(
         self,
         *,
         account_id: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        order: Literal["id", "sitekey", "name", "created_on", "modified_on"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        filter: str | Omit = omit,
+        order: Literal["id", "sitekey", "name", "created_on", "modified_on"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[WidgetListResponse]:
         """
         Lists all turnstile widgets of an account.
@@ -238,6 +273,18 @@ def list(
 
           direction: Direction to order widgets.
 
+          filter:
+              Filter widgets by field using case-insensitive substring matching. Format:
+              `field:value`
+
+              Supported fields:
+
+              - `name` - Filter by widget name (e.g., `filter=name:login-form`)
+              - `sitekey` - Filter by sitekey (e.g., `filter=sitekey:0x4AAA`)
+
+              Returns 400 Bad Request if the field is unsupported or format is invalid. An
+              empty filter value returns all results.
+
           order: Field to order widgets by.
 
           page: Page number of paginated results.
@@ -265,6 +312,7 @@ def list(
                 query=maybe_transform(
                     {
                         "direction": direction,
+                        "filter": filter,
                         "order": order,
                         "page": page,
                         "per_page": per_page,
@@ -285,7 +333,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Widget]:
         """
         Destroy a Turnstile Widget.
@@ -329,7 +377,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Widget]:
         """
         Show a single challenge widget configuration.
@@ -368,13 +416,13 @@ def rotate_secret(
         sitekey: str,
         *,
         account_id: str,
-        invalidate_immediately: bool | NotGiven = NOT_GIVEN,
+        invalidate_immediately: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Widget]:
         """Generate a new secret key for this widget.
 
@@ -423,33 +471,46 @@ def rotate_secret(
 class AsyncWidgetsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncWidgetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncWidgetsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncWidgetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncWidgetsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        domains: List[WidgetDomain],
+        domains: SequenceNotStr[WidgetDomain],
         mode: Literal["non-interactive", "invisible", "managed"],
         name: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        order: Literal["id", "sitekey", "name", "created_on", "modified_on"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        bot_fight_mode: bool | NotGiven = NOT_GIVEN,
-        clearance_level: Literal["no_clearance", "jschallenge", "managed", "interactive"] | NotGiven = NOT_GIVEN,
-        offlabel: bool | NotGiven = NOT_GIVEN,
-        region: Literal["world"] | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        filter: str | Omit = omit,
+        order: Literal["id", "sitekey", "name", "created_on", "modified_on"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        bot_fight_mode: bool | Omit = omit,
+        clearance_level: Literal["no_clearance", "jschallenge", "managed", "interactive"] | Omit = omit,
+        ephemeral_id: bool | Omit = omit,
+        offlabel: bool | Omit = omit,
+        region: Literal["world", "china"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Widget]:
         """
         Lists challenge widgets.
@@ -465,6 +526,18 @@ async def create(
 
           direction: Direction to order widgets.
 
+          filter:
+              Filter widgets by field using case-insensitive substring matching. Format:
+              `field:value`
+
+              Supported fields:
+
+              - `name` - Filter by widget name (e.g., `filter=name:login-form`)
+              - `sitekey` - Filter by sitekey (e.g., `filter=sitekey:0x4AAA`)
+
+              Returns 400 Bad Request if the field is unsupported or format is invalid. An
+              empty filter value returns all results.
+
           order: Field to order widgets by.
 
           page: Page number of paginated results.
@@ -477,9 +550,11 @@ async def create(
           clearance_level: If Turnstile is embedded on a Cloudflare site and the widget should grant
               challenge clearance, this setting can determine the clearance level to be set
 
+          ephemeral_id: Return the Ephemeral ID in /siteverify (ENT only).
+
           offlabel: Do not show any Cloudflare branding on the widget (ENT only).
 
-          region: Region where this widget can be used.
+          region: Region where this widget can be used. This cannot be changed after creation.
 
           extra_headers: Send extra headers
 
@@ -500,6 +575,7 @@ async def create(
                     "name": name,
                     "bot_fight_mode": bot_fight_mode,
                     "clearance_level": clearance_level,
+                    "ephemeral_id": ephemeral_id,
                     "offlabel": offlabel,
                     "region": region,
                 },
@@ -513,6 +589,7 @@ async def create(
                 query=await async_maybe_transform(
                     {
                         "direction": direction,
+                        "filter": filter,
                         "order": order,
                         "page": page,
                         "per_page": per_page,
@@ -529,18 +606,20 @@ async def update(
         sitekey: str,
         *,
         account_id: str,
-        domains: List[WidgetDomain],
+        domains: SequenceNotStr[WidgetDomain],
         mode: Literal["non-interactive", "invisible", "managed"],
         name: str,
-        bot_fight_mode: bool | NotGiven = NOT_GIVEN,
-        clearance_level: Literal["no_clearance", "jschallenge", "managed", "interactive"] | NotGiven = NOT_GIVEN,
-        offlabel: bool | NotGiven = NOT_GIVEN,
+        bot_fight_mode: bool | Omit = omit,
+        clearance_level: Literal["no_clearance", "jschallenge", "managed", "interactive"] | Omit = omit,
+        ephemeral_id: bool | Omit = omit,
+        offlabel: bool | Omit = omit,
+        region: Literal["world", "china"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Widget]:
         """
         Update the configuration of a widget.
@@ -562,8 +641,12 @@ async def update(
           clearance_level: If Turnstile is embedded on a Cloudflare site and the widget should grant
               challenge clearance, this setting can determine the clearance level to be set
 
+          ephemeral_id: Return the Ephemeral ID in /siteverify (ENT only).
+
           offlabel: Do not show any Cloudflare branding on the widget (ENT only).
 
+          region: Region where this widget can be used. This cannot be changed after creation.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -585,7 +668,9 @@ async def update(
                     "name": name,
                     "bot_fight_mode": bot_fight_mode,
                     "clearance_level": clearance_level,
+                    "ephemeral_id": ephemeral_id,
                     "offlabel": offlabel,
+                    "region": region,
                 },
                 widget_update_params.WidgetUpdateParams,
             ),
@@ -603,16 +688,17 @@ def list(
         self,
         *,
         account_id: str,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        order: Literal["id", "sitekey", "name", "created_on", "modified_on"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        filter: str | Omit = omit,
+        order: Literal["id", "sitekey", "name", "created_on", "modified_on"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[WidgetListResponse, AsyncV4PagePaginationArray[WidgetListResponse]]:
         """
         Lists all turnstile widgets of an account.
@@ -622,6 +708,18 @@ def list(
 
           direction: Direction to order widgets.
 
+          filter:
+              Filter widgets by field using case-insensitive substring matching. Format:
+              `field:value`
+
+              Supported fields:
+
+              - `name` - Filter by widget name (e.g., `filter=name:login-form`)
+              - `sitekey` - Filter by sitekey (e.g., `filter=sitekey:0x4AAA`)
+
+              Returns 400 Bad Request if the field is unsupported or format is invalid. An
+              empty filter value returns all results.
+
           order: Field to order widgets by.
 
           page: Page number of paginated results.
@@ -649,6 +747,7 @@ def list(
                 query=maybe_transform(
                     {
                         "direction": direction,
+                        "filter": filter,
                         "order": order,
                         "page": page,
                         "per_page": per_page,
@@ -669,7 +768,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Widget]:
         """
         Destroy a Turnstile Widget.
@@ -713,7 +812,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Widget]:
         """
         Show a single challenge widget configuration.
@@ -752,13 +851,13 @@ async def rotate_secret(
         sitekey: str,
         *,
         account_id: str,
-        invalidate_immediately: bool | NotGiven = NOT_GIVEN,
+        invalidate_immediately: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Widget]:
         """Generate a new secret key for this widget.
 
diff --git a/src/cloudflare/resources/url_normalization.py b/src/cloudflare/resources/url_normalization.py
index 6fc393df1ae..2d69292f055 100644
--- a/src/cloudflare/resources/url_normalization.py
+++ b/src/cloudflare/resources/url_normalization.py
@@ -2,13 +2,13 @@
 
 from __future__ import annotations
 
+from typing import Type, cast
+from typing_extensions import Literal
+
 import httpx
 
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from .._types import Body, Query, Headers, NoneType, NotGiven, not_given
+from .._utils import maybe_transform, async_maybe_transform
 from .._compat import cached_property
 from .._resource import SyncAPIResource, AsyncAPIResource
 from .._response import (
@@ -17,6 +17,7 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
+from .._wrappers import ResultWrapper
 from .._base_client import make_request_options
 from ..types.url_normalization import url_normalization_update_params
 from ..types.url_normalization.url_normalization_get_response import URLNormalizationGetResponse
@@ -28,30 +29,41 @@
 class URLNormalizationResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> URLNormalizationResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return URLNormalizationResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> URLNormalizationResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return URLNormalizationResourceWithStreamingResponse(self)
 
     def update(
         self,
         *,
         zone_id: str,
-        scope: str | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        scope: Literal["incoming", "both", "none"],
+        type: Literal["cloudflare", "rfc3986"],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> URLNormalizationUpdateResponse:
         """
-        Updates the URL normalization settings.
+        Updates the URL Normalization settings.
 
         Args:
-          zone_id: Identifier
+          zone_id: The unique ID of the zone.
 
           scope: The scope of the URL normalization.
 
@@ -76,10 +88,50 @@ def update(
                 },
                 url_normalization_update_params.URLNormalizationUpdateParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[URLNormalizationUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[URLNormalizationUpdateResponse], ResultWrapper[URLNormalizationUpdateResponse]),
+        )
+
+    def delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Deletes the URL Normalization settings.
+
+        Args:
+          zone_id: The unique ID of the zone.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._delete(
+            f"/zones/{zone_id}/url_normalization",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=URLNormalizationUpdateResponse,
+            cast_to=NoneType,
         )
 
     def get(
@@ -91,13 +143,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> URLNormalizationGetResponse:
         """
-        Fetches the current URL normalization settings.
+        Fetches the current URL Normalization settings.
 
         Args:
-          zone_id: Identifier
+          zone_id: The unique ID of the zone.
 
           extra_headers: Send extra headers
 
@@ -112,39 +164,54 @@ def get(
         return self._get(
             f"/zones/{zone_id}/url_normalization",
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[URLNormalizationGetResponse]._unwrapper,
             ),
-            cast_to=URLNormalizationGetResponse,
+            cast_to=cast(Type[URLNormalizationGetResponse], ResultWrapper[URLNormalizationGetResponse]),
         )
 
 
 class AsyncURLNormalizationResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncURLNormalizationResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncURLNormalizationResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncURLNormalizationResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncURLNormalizationResourceWithStreamingResponse(self)
 
     async def update(
         self,
         *,
         zone_id: str,
-        scope: str | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        scope: Literal["incoming", "both", "none"],
+        type: Literal["cloudflare", "rfc3986"],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> URLNormalizationUpdateResponse:
         """
-        Updates the URL normalization settings.
+        Updates the URL Normalization settings.
 
         Args:
-          zone_id: Identifier
+          zone_id: The unique ID of the zone.
 
           scope: The scope of the URL normalization.
 
@@ -169,10 +236,50 @@ async def update(
                 },
                 url_normalization_update_params.URLNormalizationUpdateParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[URLNormalizationUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[URLNormalizationUpdateResponse], ResultWrapper[URLNormalizationUpdateResponse]),
+        )
+
+    async def delete(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Deletes the URL Normalization settings.
+
+        Args:
+          zone_id: The unique ID of the zone.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._delete(
+            f"/zones/{zone_id}/url_normalization",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=URLNormalizationUpdateResponse,
+            cast_to=NoneType,
         )
 
     async def get(
@@ -184,13 +291,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> URLNormalizationGetResponse:
         """
-        Fetches the current URL normalization settings.
+        Fetches the current URL Normalization settings.
 
         Args:
-          zone_id: Identifier
+          zone_id: The unique ID of the zone.
 
           extra_headers: Send extra headers
 
@@ -205,9 +312,13 @@ async def get(
         return await self._get(
             f"/zones/{zone_id}/url_normalization",
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[URLNormalizationGetResponse]._unwrapper,
             ),
-            cast_to=URLNormalizationGetResponse,
+            cast_to=cast(Type[URLNormalizationGetResponse], ResultWrapper[URLNormalizationGetResponse]),
         )
 
 
@@ -218,6 +329,9 @@ def __init__(self, url_normalization: URLNormalizationResource) -> None:
         self.update = to_raw_response_wrapper(
             url_normalization.update,
         )
+        self.delete = to_raw_response_wrapper(
+            url_normalization.delete,
+        )
         self.get = to_raw_response_wrapper(
             url_normalization.get,
         )
@@ -230,6 +344,9 @@ def __init__(self, url_normalization: AsyncURLNormalizationResource) -> None:
         self.update = async_to_raw_response_wrapper(
             url_normalization.update,
         )
+        self.delete = async_to_raw_response_wrapper(
+            url_normalization.delete,
+        )
         self.get = async_to_raw_response_wrapper(
             url_normalization.get,
         )
@@ -242,6 +359,9 @@ def __init__(self, url_normalization: URLNormalizationResource) -> None:
         self.update = to_streamed_response_wrapper(
             url_normalization.update,
         )
+        self.delete = to_streamed_response_wrapper(
+            url_normalization.delete,
+        )
         self.get = to_streamed_response_wrapper(
             url_normalization.get,
         )
@@ -254,6 +374,9 @@ def __init__(self, url_normalization: AsyncURLNormalizationResource) -> None:
         self.update = async_to_streamed_response_wrapper(
             url_normalization.update,
         )
+        self.delete = async_to_streamed_response_wrapper(
+            url_normalization.delete,
+        )
         self.get = async_to_streamed_response_wrapper(
             url_normalization.get,
         )
diff --git a/src/cloudflare/resources/url_scanner/__init__.py b/src/cloudflare/resources/url_scanner/__init__.py
index 711e0a9410a..047e0b9adea 100644
--- a/src/cloudflare/resources/url_scanner/__init__.py
+++ b/src/cloudflare/resources/url_scanner/__init__.py
@@ -8,6 +8,14 @@
     ScansResourceWithStreamingResponse,
     AsyncScansResourceWithStreamingResponse,
 )
+from .responses import (
+    ResponsesResource,
+    AsyncResponsesResource,
+    ResponsesResourceWithRawResponse,
+    AsyncResponsesResourceWithRawResponse,
+    ResponsesResourceWithStreamingResponse,
+    AsyncResponsesResourceWithStreamingResponse,
+)
 from .url_scanner import (
     URLScannerResource,
     AsyncURLScannerResource,
@@ -18,6 +26,12 @@
 )
 
 __all__ = [
+    "ResponsesResource",
+    "AsyncResponsesResource",
+    "ResponsesResourceWithRawResponse",
+    "AsyncResponsesResourceWithRawResponse",
+    "ResponsesResourceWithStreamingResponse",
+    "AsyncResponsesResourceWithStreamingResponse",
     "ScansResource",
     "AsyncScansResource",
     "ScansResourceWithRawResponse",
diff --git a/src/cloudflare/resources/url_scanner/responses.py b/src/cloudflare/resources/url_scanner/responses.py
new file mode 100644
index 00000000000..d7380f1688f
--- /dev/null
+++ b/src/cloudflare/resources/url_scanner/responses.py
@@ -0,0 +1,182 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+
+__all__ = ["ResponsesResource", "AsyncResponsesResource"]
+
+
+class ResponsesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ResponsesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ResponsesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ResponsesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ResponsesResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        response_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """Returns the raw response of the network request.
+
+        Find the `response_id` in the
+        `data.requests.response.hash`.
+
+        Args:
+          account_id: Account ID.
+
+          response_id: Response hash.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not response_id:
+            raise ValueError(f"Expected a non-empty value for `response_id` but received {response_id!r}")
+        extra_headers = {"Accept": "text/plain", **(extra_headers or {})}
+        return self._get(
+            f"/accounts/{account_id}/urlscanner/v2/responses/{response_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=str,
+        )
+
+
+class AsyncResponsesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncResponsesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncResponsesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncResponsesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncResponsesResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        response_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """Returns the raw response of the network request.
+
+        Find the `response_id` in the
+        `data.requests.response.hash`.
+
+        Args:
+          account_id: Account ID.
+
+          response_id: Response hash.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not response_id:
+            raise ValueError(f"Expected a non-empty value for `response_id` but received {response_id!r}")
+        extra_headers = {"Accept": "text/plain", **(extra_headers or {})}
+        return await self._get(
+            f"/accounts/{account_id}/urlscanner/v2/responses/{response_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=str,
+        )
+
+
+class ResponsesResourceWithRawResponse:
+    def __init__(self, responses: ResponsesResource) -> None:
+        self._responses = responses
+
+        self.get = to_raw_response_wrapper(
+            responses.get,
+        )
+
+
+class AsyncResponsesResourceWithRawResponse:
+    def __init__(self, responses: AsyncResponsesResource) -> None:
+        self._responses = responses
+
+        self.get = async_to_raw_response_wrapper(
+            responses.get,
+        )
+
+
+class ResponsesResourceWithStreamingResponse:
+    def __init__(self, responses: ResponsesResource) -> None:
+        self._responses = responses
+
+        self.get = to_streamed_response_wrapper(
+            responses.get,
+        )
+
+
+class AsyncResponsesResourceWithStreamingResponse:
+    def __init__(self, responses: AsyncResponsesResource) -> None:
+        self._responses = responses
+
+        self.get = async_to_streamed_response_wrapper(
+            responses.get,
+        )
diff --git a/src/cloudflare/resources/url_scanner/scans.py b/src/cloudflare/resources/url_scanner/scans.py
index 36fe07465c1..b1fad6e2dfa 100644
--- a/src/cloudflare/resources/url_scanner/scans.py
+++ b/src/cloudflare/resources/url_scanner/scans.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Dict, List, Type, cast
+from typing import Dict, List, Iterable
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -28,12 +25,13 @@
     async_to_custom_raw_response_wrapper,
     async_to_custom_streamed_response_wrapper,
 )
-from ..._wrappers import ResultWrapper
 from ..._base_client import make_request_options
-from ...types.url_scanner import scan_get_params, scan_create_params, scan_screenshot_params
+from ...types.url_scanner import scan_list_params, scan_create_params, scan_screenshot_params, scan_bulk_create_params
 from ...types.url_scanner.scan_get_response import ScanGetResponse
-from ...types.url_scanner.scan_har_response import ScanHarResponse
+from ...types.url_scanner.scan_har_response import ScanHARResponse
+from ...types.url_scanner.scan_list_response import ScanListResponse
 from ...types.url_scanner.scan_create_response import ScanCreateResponse
+from ...types.url_scanner.scan_bulk_create_response import ScanBulkCreateResponse
 
 __all__ = ["ScansResource", "AsyncScansResource"]
 
@@ -41,39 +39,251 @@
 class ScansResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ScansResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ScansResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ScansResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ScansResourceWithStreamingResponse(self)
 
     def create(
         self,
-        account_id: str,
         *,
+        account_id: str,
         url: str,
-        custom_headers: Dict[str, str] | NotGiven = NOT_GIVEN,
-        screenshots_resolutions: List[Literal["desktop", "mobile", "tablet"]] | NotGiven = NOT_GIVEN,
-        visibility: Literal["Public", "Unlisted"] | NotGiven = NOT_GIVEN,
+        country: Literal[
+            "AF",
+            "AL",
+            "DZ",
+            "AD",
+            "AO",
+            "AG",
+            "AR",
+            "AM",
+            "AU",
+            "AT",
+            "AZ",
+            "BH",
+            "BD",
+            "BB",
+            "BY",
+            "BE",
+            "BZ",
+            "BJ",
+            "BM",
+            "BT",
+            "BO",
+            "BA",
+            "BW",
+            "BR",
+            "BN",
+            "BG",
+            "BF",
+            "BI",
+            "KH",
+            "CM",
+            "CA",
+            "CV",
+            "KY",
+            "CF",
+            "TD",
+            "CL",
+            "CN",
+            "CO",
+            "KM",
+            "CG",
+            "CR",
+            "CI",
+            "HR",
+            "CU",
+            "CY",
+            "CZ",
+            "CD",
+            "DK",
+            "DJ",
+            "DM",
+            "DO",
+            "EC",
+            "EG",
+            "SV",
+            "GQ",
+            "ER",
+            "EE",
+            "SZ",
+            "ET",
+            "FJ",
+            "FI",
+            "FR",
+            "GA",
+            "GE",
+            "DE",
+            "GH",
+            "GR",
+            "GL",
+            "GD",
+            "GT",
+            "GN",
+            "GW",
+            "GY",
+            "HT",
+            "HN",
+            "HU",
+            "IS",
+            "IN",
+            "ID",
+            "IR",
+            "IQ",
+            "IE",
+            "IL",
+            "IT",
+            "JM",
+            "JP",
+            "JO",
+            "KZ",
+            "KE",
+            "KI",
+            "KW",
+            "KG",
+            "LA",
+            "LV",
+            "LB",
+            "LS",
+            "LR",
+            "LY",
+            "LI",
+            "LT",
+            "LU",
+            "MO",
+            "MG",
+            "MW",
+            "MY",
+            "MV",
+            "ML",
+            "MR",
+            "MU",
+            "MX",
+            "FM",
+            "MD",
+            "MC",
+            "MN",
+            "MS",
+            "MA",
+            "MZ",
+            "MM",
+            "NA",
+            "NR",
+            "NP",
+            "NL",
+            "NZ",
+            "NI",
+            "NE",
+            "NG",
+            "KP",
+            "MK",
+            "NO",
+            "OM",
+            "PK",
+            "PS",
+            "PA",
+            "PG",
+            "PY",
+            "PE",
+            "PH",
+            "PL",
+            "PT",
+            "QA",
+            "RO",
+            "RU",
+            "RW",
+            "SH",
+            "KN",
+            "LC",
+            "VC",
+            "WS",
+            "SM",
+            "ST",
+            "SA",
+            "SN",
+            "RS",
+            "SC",
+            "SL",
+            "SK",
+            "SI",
+            "SB",
+            "SO",
+            "ZA",
+            "KR",
+            "SS",
+            "ES",
+            "LK",
+            "SD",
+            "SR",
+            "SE",
+            "CH",
+            "SY",
+            "TW",
+            "TJ",
+            "TZ",
+            "TH",
+            "BS",
+            "GM",
+            "TL",
+            "TG",
+            "TO",
+            "TT",
+            "TN",
+            "TR",
+            "TM",
+            "UG",
+            "UA",
+            "AE",
+            "GB",
+            "US",
+            "UY",
+            "UZ",
+            "VU",
+            "VE",
+            "VN",
+            "YE",
+            "ZM",
+            "ZW",
+        ]
+        | Omit = omit,
+        customagent: str | Omit = omit,
+        custom_headers: Dict[str, str] | Omit = omit,
+        referer: str | Omit = omit,
+        screenshots_resolutions: List[Literal["desktop", "mobile", "tablet"]] | Omit = omit,
+        visibility: Literal["Public", "Unlisted"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ScanCreateResponse:
         """Submit a URL to scan.
 
-        You can also set some options, like the visibility level
-        and custom headers. Accounts are limited to 1 new scan every 10 seconds and 8000
-        per month. If you need more, please reach out.
+        Check limits at
+        https://developers.cloudflare.com/security-center/investigate/scan-limits/.
 
         Args:
-          account_id: Account Id
+          account_id: Account ID.
+
+          country: Country to geo egress from
 
-          custom_headers: Set custom headers
+          custom_headers: Set custom headers.
 
-          screenshots_resolutions: Take multiple screenshots targeting different device types
+          screenshots_resolutions: Take multiple screenshots targeting different device types.
 
           visibility: The option `Public` means it will be included in listings like recent scans and
               search results. `Unlisted` means it will not be included in the aforementioned
@@ -92,24 +302,167 @@ def create(
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._post(
-            f"/accounts/{account_id}/urlscanner/scan",
+            f"/accounts/{account_id}/urlscanner/v2/scan",
             body=maybe_transform(
                 {
                     "url": url,
+                    "country": country,
+                    "customagent": customagent,
                     "custom_headers": custom_headers,
+                    "referer": referer,
                     "screenshots_resolutions": screenshots_resolutions,
                     "visibility": visibility,
                 },
                 scan_create_params.ScanCreateParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ScanCreateResponse,
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        q: str | Omit = omit,
+        size: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScanListResponse:
+        """Use a subset of ElasticSearch Query syntax to filter scans.
+
+        Some example
+        queries:<br/> <br/>- 'path:"/bundles/jquery.js"': Searches for scans who
+        requested resources with the given path.<br/>- 'page.asn:AS24940 AND hash:xxx':
+        Websites hosted in AS24940 where a resource with the given hash was
+        downloaded.<br/>- 'page.domain:microsoft\\** AND verdicts.malicious:true AND NOT
+        page.domain:microsoft.com': malicious scans whose hostname starts with
+        "microsoft".<br/>- 'apikey:me AND date:[2025-01 TO 2025-02]': my scans from 2025
+        January to 2025 February.
+
+        Args:
+          account_id: Account ID.
+
+          q: Filter scans
+
+          size: Limit the number of objects in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/urlscanner/v2/search",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[ScanCreateResponse]._unwrapper,
+                query=maybe_transform(
+                    {
+                        "q": q,
+                        "size": size,
+                    },
+                    scan_list_params.ScanListParams,
+                ),
             ),
-            cast_to=cast(Type[ScanCreateResponse], ResultWrapper[ScanCreateResponse]),
+            cast_to=ScanListResponse,
+        )
+
+    def bulk_create(
+        self,
+        *,
+        account_id: str,
+        body: Iterable[scan_bulk_create_params.Body] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScanBulkCreateResponse:
+        """Submit URLs to scan.
+
+        Check limits at
+        https://developers.cloudflare.com/security-center/investigate/scan-limits/ and
+        take into account scans submitted in bulk have lower priority and may take
+        longer to finish.
+
+        Args:
+          account_id: Account ID.
+
+          body: List of urls to scan (up to a 100).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/urlscanner/v2/bulk",
+            body=maybe_transform(body, Iterable[scan_bulk_create_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ScanBulkCreateResponse,
+        )
+
+    def dom(
+        self,
+        scan_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Returns a plain text response, with the scan's DOM content as rendered by
+        Chrome.
+
+        Args:
+          account_id: Account ID.
+
+          scan_id: Scan UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not scan_id:
+            raise ValueError(f"Expected a non-empty value for `scan_id` but received {scan_id!r}")
+        extra_headers = {"Accept": "text/plain", **(extra_headers or {})}
+        return self._get(
+            f"/accounts/{account_id}/urlscanner/v2/dom/{scan_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=str,
         )
 
     def get(
@@ -117,23 +470,20 @@ def get(
         scan_id: str,
         *,
         account_id: str,
-        full: bool | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ScanGetResponse:
         """
         Get URL scan by uuid
 
         Args:
-          account_id: Account Id
-
-          scan_id: Scan uuid
+          account_id: Account ID.
 
-          full: Whether to return full report (scan summary and network log).
+          scan_id: Scan UUID.
 
           extra_headers: Send extra headers
 
@@ -148,16 +498,11 @@ def get(
         if not scan_id:
             raise ValueError(f"Expected a non-empty value for `scan_id` but received {scan_id!r}")
         return self._get(
-            f"/accounts/{account_id}/urlscanner/scan/{scan_id}",
+            f"/accounts/{account_id}/urlscanner/v2/result/{scan_id}",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform({"full": full}, scan_get_params.ScanGetParams),
-                post_parser=ResultWrapper[ScanGetResponse]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[ScanGetResponse], ResultWrapper[ScanGetResponse]),
+            cast_to=ScanGetResponse,
         )
 
     def har(
@@ -170,17 +515,17 @@ def har(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ScanHarResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScanHARResponse:
         """Get a URL scan's HAR file.
 
         See HAR spec at
         http://www.softwareishard.com/blog/har-12-spec/.
 
         Args:
-          account_id: Account Id
+          account_id: Account ID.
 
-          scan_id: Scan uuid
+          scan_id: Scan UUID.
 
           extra_headers: Send extra headers
 
@@ -195,15 +540,11 @@ def har(
         if not scan_id:
             raise ValueError(f"Expected a non-empty value for `scan_id` but received {scan_id!r}")
         return self._get(
-            f"/accounts/{account_id}/urlscanner/scan/{scan_id}/har",
+            f"/accounts/{account_id}/urlscanner/v2/har/{scan_id}",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[ScanHarResponse]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[ScanHarResponse], ResultWrapper[ScanHarResponse]),
+            cast_to=ScanHARResponse,
         )
 
     def screenshot(
@@ -211,23 +552,23 @@ def screenshot(
         scan_id: str,
         *,
         account_id: str,
-        resolution: Literal["desktop", "mobile", "tablet"] | NotGiven = NOT_GIVEN,
+        resolution: Literal["desktop", "mobile", "tablet"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> BinaryAPIResponse:
         """
         Get scan's screenshot by resolution (desktop/mobile/tablet).
 
         Args:
-          account_id: Account Id
+          account_id: Account ID.
 
-          scan_id: Scan uuid
+          scan_id: Scan UUID.
 
-          resolution: Target device type
+          resolution: Target device type.
 
           extra_headers: Send extra headers
 
@@ -243,7 +584,7 @@ def screenshot(
             raise ValueError(f"Expected a non-empty value for `scan_id` but received {scan_id!r}")
         extra_headers = {"Accept": "image/png", **(extra_headers or {})}
         return self._get(
-            f"/accounts/{account_id}/urlscanner/scan/{scan_id}/screenshot",
+            f"/accounts/{account_id}/urlscanner/v2/screenshots/{scan_id}.png",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -258,39 +599,251 @@ def screenshot(
 class AsyncScansResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncScansResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncScansResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncScansResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncScansResourceWithStreamingResponse(self)
 
     async def create(
         self,
-        account_id: str,
         *,
+        account_id: str,
         url: str,
-        custom_headers: Dict[str, str] | NotGiven = NOT_GIVEN,
-        screenshots_resolutions: List[Literal["desktop", "mobile", "tablet"]] | NotGiven = NOT_GIVEN,
-        visibility: Literal["Public", "Unlisted"] | NotGiven = NOT_GIVEN,
+        country: Literal[
+            "AF",
+            "AL",
+            "DZ",
+            "AD",
+            "AO",
+            "AG",
+            "AR",
+            "AM",
+            "AU",
+            "AT",
+            "AZ",
+            "BH",
+            "BD",
+            "BB",
+            "BY",
+            "BE",
+            "BZ",
+            "BJ",
+            "BM",
+            "BT",
+            "BO",
+            "BA",
+            "BW",
+            "BR",
+            "BN",
+            "BG",
+            "BF",
+            "BI",
+            "KH",
+            "CM",
+            "CA",
+            "CV",
+            "KY",
+            "CF",
+            "TD",
+            "CL",
+            "CN",
+            "CO",
+            "KM",
+            "CG",
+            "CR",
+            "CI",
+            "HR",
+            "CU",
+            "CY",
+            "CZ",
+            "CD",
+            "DK",
+            "DJ",
+            "DM",
+            "DO",
+            "EC",
+            "EG",
+            "SV",
+            "GQ",
+            "ER",
+            "EE",
+            "SZ",
+            "ET",
+            "FJ",
+            "FI",
+            "FR",
+            "GA",
+            "GE",
+            "DE",
+            "GH",
+            "GR",
+            "GL",
+            "GD",
+            "GT",
+            "GN",
+            "GW",
+            "GY",
+            "HT",
+            "HN",
+            "HU",
+            "IS",
+            "IN",
+            "ID",
+            "IR",
+            "IQ",
+            "IE",
+            "IL",
+            "IT",
+            "JM",
+            "JP",
+            "JO",
+            "KZ",
+            "KE",
+            "KI",
+            "KW",
+            "KG",
+            "LA",
+            "LV",
+            "LB",
+            "LS",
+            "LR",
+            "LY",
+            "LI",
+            "LT",
+            "LU",
+            "MO",
+            "MG",
+            "MW",
+            "MY",
+            "MV",
+            "ML",
+            "MR",
+            "MU",
+            "MX",
+            "FM",
+            "MD",
+            "MC",
+            "MN",
+            "MS",
+            "MA",
+            "MZ",
+            "MM",
+            "NA",
+            "NR",
+            "NP",
+            "NL",
+            "NZ",
+            "NI",
+            "NE",
+            "NG",
+            "KP",
+            "MK",
+            "NO",
+            "OM",
+            "PK",
+            "PS",
+            "PA",
+            "PG",
+            "PY",
+            "PE",
+            "PH",
+            "PL",
+            "PT",
+            "QA",
+            "RO",
+            "RU",
+            "RW",
+            "SH",
+            "KN",
+            "LC",
+            "VC",
+            "WS",
+            "SM",
+            "ST",
+            "SA",
+            "SN",
+            "RS",
+            "SC",
+            "SL",
+            "SK",
+            "SI",
+            "SB",
+            "SO",
+            "ZA",
+            "KR",
+            "SS",
+            "ES",
+            "LK",
+            "SD",
+            "SR",
+            "SE",
+            "CH",
+            "SY",
+            "TW",
+            "TJ",
+            "TZ",
+            "TH",
+            "BS",
+            "GM",
+            "TL",
+            "TG",
+            "TO",
+            "TT",
+            "TN",
+            "TR",
+            "TM",
+            "UG",
+            "UA",
+            "AE",
+            "GB",
+            "US",
+            "UY",
+            "UZ",
+            "VU",
+            "VE",
+            "VN",
+            "YE",
+            "ZM",
+            "ZW",
+        ]
+        | Omit = omit,
+        customagent: str | Omit = omit,
+        custom_headers: Dict[str, str] | Omit = omit,
+        referer: str | Omit = omit,
+        screenshots_resolutions: List[Literal["desktop", "mobile", "tablet"]] | Omit = omit,
+        visibility: Literal["Public", "Unlisted"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ScanCreateResponse:
         """Submit a URL to scan.
 
-        You can also set some options, like the visibility level
-        and custom headers. Accounts are limited to 1 new scan every 10 seconds and 8000
-        per month. If you need more, please reach out.
+        Check limits at
+        https://developers.cloudflare.com/security-center/investigate/scan-limits/.
 
         Args:
-          account_id: Account Id
+          account_id: Account ID.
 
-          custom_headers: Set custom headers
+          country: Country to geo egress from
 
-          screenshots_resolutions: Take multiple screenshots targeting different device types
+          custom_headers: Set custom headers.
+
+          screenshots_resolutions: Take multiple screenshots targeting different device types.
 
           visibility: The option `Public` means it will be included in listings like recent scans and
               search results. `Unlisted` means it will not be included in the aforementioned
@@ -309,24 +862,167 @@ async def create(
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._post(
-            f"/accounts/{account_id}/urlscanner/scan",
+            f"/accounts/{account_id}/urlscanner/v2/scan",
             body=await async_maybe_transform(
                 {
                     "url": url,
+                    "country": country,
+                    "customagent": customagent,
                     "custom_headers": custom_headers,
+                    "referer": referer,
                     "screenshots_resolutions": screenshots_resolutions,
                     "visibility": visibility,
                 },
                 scan_create_params.ScanCreateParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ScanCreateResponse,
+        )
+
+    async def list(
+        self,
+        *,
+        account_id: str,
+        q: str | Omit = omit,
+        size: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScanListResponse:
+        """Use a subset of ElasticSearch Query syntax to filter scans.
+
+        Some example
+        queries:<br/> <br/>- 'path:"/bundles/jquery.js"': Searches for scans who
+        requested resources with the given path.<br/>- 'page.asn:AS24940 AND hash:xxx':
+        Websites hosted in AS24940 where a resource with the given hash was
+        downloaded.<br/>- 'page.domain:microsoft\\** AND verdicts.malicious:true AND NOT
+        page.domain:microsoft.com': malicious scans whose hostname starts with
+        "microsoft".<br/>- 'apikey:me AND date:[2025-01 TO 2025-02]': my scans from 2025
+        January to 2025 February.
+
+        Args:
+          account_id: Account ID.
+
+          q: Filter scans
+
+          size: Limit the number of objects in the response.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/urlscanner/v2/search",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[ScanCreateResponse]._unwrapper,
+                query=await async_maybe_transform(
+                    {
+                        "q": q,
+                        "size": size,
+                    },
+                    scan_list_params.ScanListParams,
+                ),
             ),
-            cast_to=cast(Type[ScanCreateResponse], ResultWrapper[ScanCreateResponse]),
+            cast_to=ScanListResponse,
+        )
+
+    async def bulk_create(
+        self,
+        *,
+        account_id: str,
+        body: Iterable[scan_bulk_create_params.Body] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScanBulkCreateResponse:
+        """Submit URLs to scan.
+
+        Check limits at
+        https://developers.cloudflare.com/security-center/investigate/scan-limits/ and
+        take into account scans submitted in bulk have lower priority and may take
+        longer to finish.
+
+        Args:
+          account_id: Account ID.
+
+          body: List of urls to scan (up to a 100).
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/urlscanner/v2/bulk",
+            body=await async_maybe_transform(body, Iterable[scan_bulk_create_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ScanBulkCreateResponse,
+        )
+
+    async def dom(
+        self,
+        scan_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Returns a plain text response, with the scan's DOM content as rendered by
+        Chrome.
+
+        Args:
+          account_id: Account ID.
+
+          scan_id: Scan UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not scan_id:
+            raise ValueError(f"Expected a non-empty value for `scan_id` but received {scan_id!r}")
+        extra_headers = {"Accept": "text/plain", **(extra_headers or {})}
+        return await self._get(
+            f"/accounts/{account_id}/urlscanner/v2/dom/{scan_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=str,
         )
 
     async def get(
@@ -334,23 +1030,20 @@ async def get(
         scan_id: str,
         *,
         account_id: str,
-        full: bool | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ScanGetResponse:
         """
         Get URL scan by uuid
 
         Args:
-          account_id: Account Id
+          account_id: Account ID.
 
-          scan_id: Scan uuid
-
-          full: Whether to return full report (scan summary and network log).
+          scan_id: Scan UUID.
 
           extra_headers: Send extra headers
 
@@ -365,16 +1058,11 @@ async def get(
         if not scan_id:
             raise ValueError(f"Expected a non-empty value for `scan_id` but received {scan_id!r}")
         return await self._get(
-            f"/accounts/{account_id}/urlscanner/scan/{scan_id}",
+            f"/accounts/{account_id}/urlscanner/v2/result/{scan_id}",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=await async_maybe_transform({"full": full}, scan_get_params.ScanGetParams),
-                post_parser=ResultWrapper[ScanGetResponse]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[ScanGetResponse], ResultWrapper[ScanGetResponse]),
+            cast_to=ScanGetResponse,
         )
 
     async def har(
@@ -387,17 +1075,17 @@ async def har(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ScanHarResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScanHARResponse:
         """Get a URL scan's HAR file.
 
         See HAR spec at
         http://www.softwareishard.com/blog/har-12-spec/.
 
         Args:
-          account_id: Account Id
+          account_id: Account ID.
 
-          scan_id: Scan uuid
+          scan_id: Scan UUID.
 
           extra_headers: Send extra headers
 
@@ -412,15 +1100,11 @@ async def har(
         if not scan_id:
             raise ValueError(f"Expected a non-empty value for `scan_id` but received {scan_id!r}")
         return await self._get(
-            f"/accounts/{account_id}/urlscanner/scan/{scan_id}/har",
+            f"/accounts/{account_id}/urlscanner/v2/har/{scan_id}",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[ScanHarResponse]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[ScanHarResponse], ResultWrapper[ScanHarResponse]),
+            cast_to=ScanHARResponse,
         )
 
     async def screenshot(
@@ -428,23 +1112,23 @@ async def screenshot(
         scan_id: str,
         *,
         account_id: str,
-        resolution: Literal["desktop", "mobile", "tablet"] | NotGiven = NOT_GIVEN,
+        resolution: Literal["desktop", "mobile", "tablet"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncBinaryAPIResponse:
         """
         Get scan's screenshot by resolution (desktop/mobile/tablet).
 
         Args:
-          account_id: Account Id
+          account_id: Account ID.
 
-          scan_id: Scan uuid
+          scan_id: Scan UUID.
 
-          resolution: Target device type
+          resolution: Target device type.
 
           extra_headers: Send extra headers
 
@@ -460,7 +1144,7 @@ async def screenshot(
             raise ValueError(f"Expected a non-empty value for `scan_id` but received {scan_id!r}")
         extra_headers = {"Accept": "image/png", **(extra_headers or {})}
         return await self._get(
-            f"/accounts/{account_id}/urlscanner/scan/{scan_id}/screenshot",
+            f"/accounts/{account_id}/urlscanner/v2/screenshots/{scan_id}.png",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -481,6 +1165,15 @@ def __init__(self, scans: ScansResource) -> None:
         self.create = to_raw_response_wrapper(
             scans.create,
         )
+        self.list = to_raw_response_wrapper(
+            scans.list,
+        )
+        self.bulk_create = to_raw_response_wrapper(
+            scans.bulk_create,
+        )
+        self.dom = to_raw_response_wrapper(
+            scans.dom,
+        )
         self.get = to_raw_response_wrapper(
             scans.get,
         )
@@ -500,6 +1193,15 @@ def __init__(self, scans: AsyncScansResource) -> None:
         self.create = async_to_raw_response_wrapper(
             scans.create,
         )
+        self.list = async_to_raw_response_wrapper(
+            scans.list,
+        )
+        self.bulk_create = async_to_raw_response_wrapper(
+            scans.bulk_create,
+        )
+        self.dom = async_to_raw_response_wrapper(
+            scans.dom,
+        )
         self.get = async_to_raw_response_wrapper(
             scans.get,
         )
@@ -519,6 +1221,15 @@ def __init__(self, scans: ScansResource) -> None:
         self.create = to_streamed_response_wrapper(
             scans.create,
         )
+        self.list = to_streamed_response_wrapper(
+            scans.list,
+        )
+        self.bulk_create = to_streamed_response_wrapper(
+            scans.bulk_create,
+        )
+        self.dom = to_streamed_response_wrapper(
+            scans.dom,
+        )
         self.get = to_streamed_response_wrapper(
             scans.get,
         )
@@ -538,6 +1249,15 @@ def __init__(self, scans: AsyncScansResource) -> None:
         self.create = async_to_streamed_response_wrapper(
             scans.create,
         )
+        self.list = async_to_streamed_response_wrapper(
+            scans.list,
+        )
+        self.bulk_create = async_to_streamed_response_wrapper(
+            scans.bulk_create,
+        )
+        self.dom = async_to_streamed_response_wrapper(
+            scans.dom,
+        )
         self.get = async_to_streamed_response_wrapper(
             scans.get,
         )
diff --git a/src/cloudflare/resources/url_scanner/url_scanner.py b/src/cloudflare/resources/url_scanner/url_scanner.py
index 4c7bf2e1059..707140787c7 100644
--- a/src/cloudflare/resources/url_scanner/url_scanner.py
+++ b/src/cloudflare/resources/url_scanner/url_scanner.py
@@ -2,11 +2,6 @@
 
 from __future__ import annotations
 
-from typing import Type, Union, cast
-from datetime import datetime
-
-import httpx
-
 from .scans import (
     ScansResource,
     AsyncScansResource,
@@ -15,306 +10,85 @@
     ScansResourceWithStreamingResponse,
     AsyncScansResourceWithStreamingResponse,
 )
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
 from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
+from .responses import (
+    ResponsesResource,
+    AsyncResponsesResource,
+    ResponsesResourceWithRawResponse,
+    AsyncResponsesResourceWithRawResponse,
+    ResponsesResourceWithStreamingResponse,
+    AsyncResponsesResourceWithStreamingResponse,
 )
-from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
-from ...types.url_scanner import url_scanner_scan_params
-from ...types.url_scanner.url_scanner_scan_response import URLScannerScanResponse
+from ..._resource import SyncAPIResource, AsyncAPIResource
 
 __all__ = ["URLScannerResource", "AsyncURLScannerResource"]
 
 
 class URLScannerResource(SyncAPIResource):
+    @cached_property
+    def responses(self) -> ResponsesResource:
+        return ResponsesResource(self._client)
+
     @cached_property
     def scans(self) -> ScansResource:
         return ScansResource(self._client)
 
     @cached_property
     def with_raw_response(self) -> URLScannerResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return URLScannerResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> URLScannerResourceWithStreamingResponse:
-        return URLScannerResourceWithStreamingResponse(self)
-
-    def scan(
-        self,
-        account_id: str,
-        *,
-        account_scans: bool | NotGiven = NOT_GIVEN,
-        asn: str | NotGiven = NOT_GIVEN,
-        date_end: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        date_start: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        hash: str | NotGiven = NOT_GIVEN,
-        hostname: str | NotGiven = NOT_GIVEN,
-        ip: str | NotGiven = NOT_GIVEN,
-        is_malicious: bool | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        next_cursor: str | NotGiven = NOT_GIVEN,
-        page_asn: str | NotGiven = NOT_GIVEN,
-        page_hostname: str | NotGiven = NOT_GIVEN,
-        page_ip: str | NotGiven = NOT_GIVEN,
-        page_path: str | NotGiven = NOT_GIVEN,
-        page_url: str | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        scan_id: str | NotGiven = NOT_GIVEN,
-        url: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> URLScannerScanResponse:
         """
-        Search scans by date and webpages' requests, including full URL (after
-        redirects), hostname, and path. <br/> A successful scan will appear in search
-        results a few minutes after finishing but may take much longer if the system in
-        under load. By default, only successfully completed scans will appear in search
-        results, unless searching by `scanId`. Please take into account that older scans
-        may be removed from the search index at an unspecified time.
-
-        Args:
-          account_id: Account Id
-
-          account_scans: Return only scans created by account.
-
-          asn: Filter scans by Autonomous System Number (ASN) of _any_ request made by the
-              webpage.
-
-          date_end: Filter scans requested before date (inclusive).
-
-          date_start: Filter scans requested after date (inclusive).
-
-          hash: Filter scans by hash of any html/js/css request made by the webpage.
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-          hostname: Filter scans by hostname of _any_ request made by the webpage.
-
-          ip: Filter scans by IP address (IPv4 or IPv6) of _any_ request made by the webpage.
-
-          is_malicious: Filter scans by malicious verdict.
-
-          limit: Limit the number of objects in the response.
-
-          next_cursor: Pagination cursor to get the next set of results.
-
-          page_asn: Filter scans by main page Autonomous System Number (ASN).
-
-          page_hostname: Filter scans by main page hostname (domain of effective URL).
-
-          page_ip: Filter scans by main page IP address (IPv4 or IPv6).
-
-          page_path: Filter scans by exact match of effective URL path (also supports suffix search).
-
-          page_url: Filter scans by submitted or scanned URL
-
-          path: Filter scans by url path of _any_ request made by the webpage.
-
-          scan_id: Scan uuid
-
-          url: Filter scans by URL of _any_ request made by the webpage
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
         """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/urlscanner/scan",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "account_scans": account_scans,
-                        "asn": asn,
-                        "date_end": date_end,
-                        "date_start": date_start,
-                        "hash": hash,
-                        "hostname": hostname,
-                        "ip": ip,
-                        "is_malicious": is_malicious,
-                        "limit": limit,
-                        "next_cursor": next_cursor,
-                        "page_asn": page_asn,
-                        "page_hostname": page_hostname,
-                        "page_ip": page_ip,
-                        "page_path": page_path,
-                        "page_url": page_url,
-                        "path": path,
-                        "scan_id": scan_id,
-                        "url": url,
-                    },
-                    url_scanner_scan_params.URLScannerScanParams,
-                ),
-                post_parser=ResultWrapper[URLScannerScanResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[URLScannerScanResponse], ResultWrapper[URLScannerScanResponse]),
-        )
+        return URLScannerResourceWithStreamingResponse(self)
 
 
 class AsyncURLScannerResource(AsyncAPIResource):
+    @cached_property
+    def responses(self) -> AsyncResponsesResource:
+        return AsyncResponsesResource(self._client)
+
     @cached_property
     def scans(self) -> AsyncScansResource:
         return AsyncScansResource(self._client)
 
     @cached_property
     def with_raw_response(self) -> AsyncURLScannerResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncURLScannerResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncURLScannerResourceWithStreamingResponse:
-        return AsyncURLScannerResourceWithStreamingResponse(self)
-
-    async def scan(
-        self,
-        account_id: str,
-        *,
-        account_scans: bool | NotGiven = NOT_GIVEN,
-        asn: str | NotGiven = NOT_GIVEN,
-        date_end: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        date_start: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        hash: str | NotGiven = NOT_GIVEN,
-        hostname: str | NotGiven = NOT_GIVEN,
-        ip: str | NotGiven = NOT_GIVEN,
-        is_malicious: bool | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        next_cursor: str | NotGiven = NOT_GIVEN,
-        page_asn: str | NotGiven = NOT_GIVEN,
-        page_hostname: str | NotGiven = NOT_GIVEN,
-        page_ip: str | NotGiven = NOT_GIVEN,
-        page_path: str | NotGiven = NOT_GIVEN,
-        page_url: str | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        scan_id: str | NotGiven = NOT_GIVEN,
-        url: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> URLScannerScanResponse:
         """
-        Search scans by date and webpages' requests, including full URL (after
-        redirects), hostname, and path. <br/> A successful scan will appear in search
-        results a few minutes after finishing but may take much longer if the system in
-        under load. By default, only successfully completed scans will appear in search
-        results, unless searching by `scanId`. Please take into account that older scans
-        may be removed from the search index at an unspecified time.
-
-        Args:
-          account_id: Account Id
-
-          account_scans: Return only scans created by account.
-
-          asn: Filter scans by Autonomous System Number (ASN) of _any_ request made by the
-              webpage.
-
-          date_end: Filter scans requested before date (inclusive).
-
-          date_start: Filter scans requested after date (inclusive).
-
-          hash: Filter scans by hash of any html/js/css request made by the webpage.
-
-          hostname: Filter scans by hostname of _any_ request made by the webpage.
-
-          ip: Filter scans by IP address (IPv4 or IPv6) of _any_ request made by the webpage.
-
-          is_malicious: Filter scans by malicious verdict.
-
-          limit: Limit the number of objects in the response.
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-          next_cursor: Pagination cursor to get the next set of results.
-
-          page_asn: Filter scans by main page Autonomous System Number (ASN).
-
-          page_hostname: Filter scans by main page hostname (domain of effective URL).
-
-          page_ip: Filter scans by main page IP address (IPv4 or IPv6).
-
-          page_path: Filter scans by exact match of effective URL path (also supports suffix search).
-
-          page_url: Filter scans by submitted or scanned URL
-
-          path: Filter scans by url path of _any_ request made by the webpage.
-
-          scan_id: Scan uuid
-
-          url: Filter scans by URL of _any_ request made by the webpage
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
         """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/urlscanner/scan",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=await async_maybe_transform(
-                    {
-                        "account_scans": account_scans,
-                        "asn": asn,
-                        "date_end": date_end,
-                        "date_start": date_start,
-                        "hash": hash,
-                        "hostname": hostname,
-                        "ip": ip,
-                        "is_malicious": is_malicious,
-                        "limit": limit,
-                        "next_cursor": next_cursor,
-                        "page_asn": page_asn,
-                        "page_hostname": page_hostname,
-                        "page_ip": page_ip,
-                        "page_path": page_path,
-                        "page_url": page_url,
-                        "path": path,
-                        "scan_id": scan_id,
-                        "url": url,
-                    },
-                    url_scanner_scan_params.URLScannerScanParams,
-                ),
-                post_parser=ResultWrapper[URLScannerScanResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[URLScannerScanResponse], ResultWrapper[URLScannerScanResponse]),
-        )
+        return AsyncURLScannerResourceWithStreamingResponse(self)
 
 
 class URLScannerResourceWithRawResponse:
     def __init__(self, url_scanner: URLScannerResource) -> None:
         self._url_scanner = url_scanner
 
-        self.scan = to_raw_response_wrapper(
-            url_scanner.scan,
-        )
+    @cached_property
+    def responses(self) -> ResponsesResourceWithRawResponse:
+        return ResponsesResourceWithRawResponse(self._url_scanner.responses)
 
     @cached_property
     def scans(self) -> ScansResourceWithRawResponse:
@@ -325,9 +99,9 @@ class AsyncURLScannerResourceWithRawResponse:
     def __init__(self, url_scanner: AsyncURLScannerResource) -> None:
         self._url_scanner = url_scanner
 
-        self.scan = async_to_raw_response_wrapper(
-            url_scanner.scan,
-        )
+    @cached_property
+    def responses(self) -> AsyncResponsesResourceWithRawResponse:
+        return AsyncResponsesResourceWithRawResponse(self._url_scanner.responses)
 
     @cached_property
     def scans(self) -> AsyncScansResourceWithRawResponse:
@@ -338,9 +112,9 @@ class URLScannerResourceWithStreamingResponse:
     def __init__(self, url_scanner: URLScannerResource) -> None:
         self._url_scanner = url_scanner
 
-        self.scan = to_streamed_response_wrapper(
-            url_scanner.scan,
-        )
+    @cached_property
+    def responses(self) -> ResponsesResourceWithStreamingResponse:
+        return ResponsesResourceWithStreamingResponse(self._url_scanner.responses)
 
     @cached_property
     def scans(self) -> ScansResourceWithStreamingResponse:
@@ -351,9 +125,9 @@ class AsyncURLScannerResourceWithStreamingResponse:
     def __init__(self, url_scanner: AsyncURLScannerResource) -> None:
         self._url_scanner = url_scanner
 
-        self.scan = async_to_streamed_response_wrapper(
-            url_scanner.scan,
-        )
+    @cached_property
+    def responses(self) -> AsyncResponsesResourceWithStreamingResponse:
+        return AsyncResponsesResourceWithStreamingResponse(self._url_scanner.responses)
 
     @cached_property
     def scans(self) -> AsyncScansResourceWithStreamingResponse:
diff --git a/src/cloudflare/resources/user/audit_logs.py b/src/cloudflare/resources/user/audit_logs.py
index 6c01a9f3612..20c235345c0 100644
--- a/src/cloudflare/resources/user/audit_logs.py
+++ b/src/cloudflare/resources/user/audit_logs.py
@@ -3,12 +3,12 @@
 from __future__ import annotations
 
 from typing import Union
-from datetime import datetime
+from datetime import date, datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
@@ -29,32 +29,43 @@
 class AuditLogsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AuditLogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AuditLogsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AuditLogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AuditLogsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
-        id: str | NotGiven = NOT_GIVEN,
-        action: audit_log_list_params.Action | NotGiven = NOT_GIVEN,
-        actor: audit_log_list_params.Actor | NotGiven = NOT_GIVEN,
-        before: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        direction: Literal["desc", "asc"] | NotGiven = NOT_GIVEN,
-        export: bool | NotGiven = NOT_GIVEN,
-        hide_user_logs: bool | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        zone: audit_log_list_params.Zone | NotGiven = NOT_GIVEN,
+        id: str | Omit = omit,
+        action: audit_log_list_params.Action | Omit = omit,
+        actor: audit_log_list_params.Actor | Omit = omit,
+        before: Union[Union[str, date], Union[str, datetime]] | Omit = omit,
+        direction: Literal["desc", "asc"] | Omit = omit,
+        export: bool | Omit = omit,
+        hide_user_logs: bool | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        since: Union[Union[str, date], Union[str, datetime]] | Omit = omit,
+        zone: audit_log_list_params.Zone | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[AuditLog]:
         """Gets a list of audit logs for a user account.
 
@@ -64,8 +75,8 @@ def list(
         Args:
           id: Finds a specific log by its ID.
 
-          before: Limits the returned results to logs older than the specified date. This can be a
-              date string `2019-04-30` or an absolute timestamp that conforms to RFC3339.
+          before: Limits the returned results to logs older than the specified date. A `full-date`
+              that conforms to RFC3339.
 
           direction: Changes the direction of the chronological sorting.
 
@@ -77,8 +88,8 @@ def list(
 
           per_page: Sets the number of results to return per page.
 
-          since: Limits the returned results to logs newer than the specified date. This can be a
-              date string `2019-04-30` or an absolute timestamp that conforms to RFC3339.
+          since: Limits the returned results to logs newer than the specified date. A `full-date`
+              that conforms to RFC3339.
 
           extra_headers: Send extra headers
 
@@ -120,32 +131,43 @@ def list(
 class AsyncAuditLogsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncAuditLogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAuditLogsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAuditLogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAuditLogsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
-        id: str | NotGiven = NOT_GIVEN,
-        action: audit_log_list_params.Action | NotGiven = NOT_GIVEN,
-        actor: audit_log_list_params.Actor | NotGiven = NOT_GIVEN,
-        before: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        direction: Literal["desc", "asc"] | NotGiven = NOT_GIVEN,
-        export: bool | NotGiven = NOT_GIVEN,
-        hide_user_logs: bool | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        zone: audit_log_list_params.Zone | NotGiven = NOT_GIVEN,
+        id: str | Omit = omit,
+        action: audit_log_list_params.Action | Omit = omit,
+        actor: audit_log_list_params.Actor | Omit = omit,
+        before: Union[Union[str, date], Union[str, datetime]] | Omit = omit,
+        direction: Literal["desc", "asc"] | Omit = omit,
+        export: bool | Omit = omit,
+        hide_user_logs: bool | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        since: Union[Union[str, date], Union[str, datetime]] | Omit = omit,
+        zone: audit_log_list_params.Zone | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[AuditLog, AsyncV4PagePaginationArray[AuditLog]]:
         """Gets a list of audit logs for a user account.
 
@@ -155,8 +177,8 @@ def list(
         Args:
           id: Finds a specific log by its ID.
 
-          before: Limits the returned results to logs older than the specified date. This can be a
-              date string `2019-04-30` or an absolute timestamp that conforms to RFC3339.
+          before: Limits the returned results to logs older than the specified date. A `full-date`
+              that conforms to RFC3339.
 
           direction: Changes the direction of the chronological sorting.
 
@@ -168,8 +190,8 @@ def list(
 
           per_page: Sets the number of results to return per page.
 
-          since: Limits the returned results to logs newer than the specified date. This can be a
-              date string `2019-04-30` or an absolute timestamp that conforms to RFC3339.
+          since: Limits the returned results to logs newer than the specified date. A `full-date`
+              that conforms to RFC3339.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/user/billing/billing.py b/src/cloudflare/resources/user/billing/billing.py
index ceb48cdb474..3a8ae89257f 100644
--- a/src/cloudflare/resources/user/billing/billing.py
+++ b/src/cloudflare/resources/user/billing/billing.py
@@ -35,10 +35,21 @@ def profile(self) -> ProfileResource:
 
     @cached_property
     def with_raw_response(self) -> BillingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return BillingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> BillingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return BillingResourceWithStreamingResponse(self)
 
 
@@ -53,10 +64,21 @@ def profile(self) -> AsyncProfileResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncBillingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncBillingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncBillingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncBillingResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/user/billing/history.py b/src/cloudflare/resources/user/billing/history.py
index 7f102ac237e..870295b9764 100644
--- a/src/cloudflare/resources/user/billing/history.py
+++ b/src/cloudflare/resources/user/billing/history.py
@@ -2,13 +2,14 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import Union
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ...._utils import maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
@@ -29,28 +30,39 @@
 class HistoryResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> HistoryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return HistoryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> HistoryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return HistoryResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
         *,
-        action: str | NotGiven = NOT_GIVEN,
-        occured_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        occurred_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        order: Literal["type", "occured_at", "action"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        action: str | Omit = omit,
+        occurred_at: Union[str, datetime] | Omit = omit,
+        order: Literal["type", "occurred_at", "action"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        type: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[BillingHistory]:
         """
         Accesses your billing history object.
@@ -58,8 +70,6 @@ def list(
         Args:
           action: The billing item action.
 
-          occured_at: When the billing item was created.
-
           occurred_at: When the billing item was created.
 
           order: Field to order billing history by.
@@ -89,7 +99,6 @@ def list(
                 query=maybe_transform(
                     {
                         "action": action,
-                        "occured_at": occured_at,
                         "occurred_at": occurred_at,
                         "order": order,
                         "page": page,
@@ -106,28 +115,39 @@ def list(
 class AsyncHistoryResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncHistoryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncHistoryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncHistoryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncHistoryResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
         *,
-        action: str | NotGiven = NOT_GIVEN,
-        occured_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        occurred_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        order: Literal["type", "occured_at", "action"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        action: str | Omit = omit,
+        occurred_at: Union[str, datetime] | Omit = omit,
+        order: Literal["type", "occurred_at", "action"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        type: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[BillingHistory, AsyncV4PagePaginationArray[BillingHistory]]:
         """
         Accesses your billing history object.
@@ -135,8 +155,6 @@ def list(
         Args:
           action: The billing item action.
 
-          occured_at: When the billing item was created.
-
           occurred_at: When the billing item was created.
 
           order: Field to order billing history by.
@@ -166,7 +184,6 @@ def list(
                 query=maybe_transform(
                     {
                         "action": action,
-                        "occured_at": occured_at,
                         "occurred_at": occurred_at,
                         "order": order,
                         "page": page,
@@ -184,8 +201,10 @@ class HistoryResourceWithRawResponse:
     def __init__(self, history: HistoryResource) -> None:
         self._history = history
 
-        self.list = to_raw_response_wrapper(
-            history.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                history.list,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -193,8 +212,10 @@ class AsyncHistoryResourceWithRawResponse:
     def __init__(self, history: AsyncHistoryResource) -> None:
         self._history = history
 
-        self.list = async_to_raw_response_wrapper(
-            history.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                history.list,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -202,8 +223,10 @@ class HistoryResourceWithStreamingResponse:
     def __init__(self, history: HistoryResource) -> None:
         self._history = history
 
-        self.list = to_streamed_response_wrapper(
-            history.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                history.list,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -211,6 +234,8 @@ class AsyncHistoryResourceWithStreamingResponse:
     def __init__(self, history: AsyncHistoryResource) -> None:
         self._history = history
 
-        self.list = async_to_streamed_response_wrapper(
-            history.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                history.list,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/user/billing/profile.py b/src/cloudflare/resources/user/billing/profile.py
index 3956a2cb1e0..93456e90682 100644
--- a/src/cloudflare/resources/user/billing/profile.py
+++ b/src/cloudflare/resources/user/billing/profile.py
@@ -2,11 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, cast
+import typing_extensions
+from typing import Type, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -25,12 +26,24 @@
 class ProfileResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ProfileResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ProfileResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ProfileResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ProfileResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def get(
         self,
         *,
@@ -39,36 +52,43 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ProfileGetResponse:
         """Accesses your billing profile object."""
-        return cast(
-            ProfileGetResponse,
-            self._get(
-                "/user/billing/profile",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[ProfileGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ProfileGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._get(
+            "/user/billing/profile",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ProfileGetResponse]._unwrapper,
             ),
+            cast_to=cast(Type[ProfileGetResponse], ResultWrapper[ProfileGetResponse]),
         )
 
 
 class AsyncProfileResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncProfileResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncProfileResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncProfileResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncProfileResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     async def get(
         self,
         *,
@@ -77,24 +97,19 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ProfileGetResponse:
         """Accesses your billing profile object."""
-        return cast(
-            ProfileGetResponse,
-            await self._get(
-                "/user/billing/profile",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[ProfileGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ProfileGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._get(
+            "/user/billing/profile",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ProfileGetResponse]._unwrapper,
             ),
+            cast_to=cast(Type[ProfileGetResponse], ResultWrapper[ProfileGetResponse]),
         )
 
 
@@ -102,8 +117,10 @@ class ProfileResourceWithRawResponse:
     def __init__(self, profile: ProfileResource) -> None:
         self._profile = profile
 
-        self.get = to_raw_response_wrapper(
-            profile.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                profile.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -111,8 +128,10 @@ class AsyncProfileResourceWithRawResponse:
     def __init__(self, profile: AsyncProfileResource) -> None:
         self._profile = profile
 
-        self.get = async_to_raw_response_wrapper(
-            profile.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                profile.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -120,8 +139,10 @@ class ProfileResourceWithStreamingResponse:
     def __init__(self, profile: ProfileResource) -> None:
         self._profile = profile
 
-        self.get = to_streamed_response_wrapper(
-            profile.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                profile.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -129,6 +150,8 @@ class AsyncProfileResourceWithStreamingResponse:
     def __init__(self, profile: AsyncProfileResource) -> None:
         self._profile = profile
 
-        self.get = async_to_streamed_response_wrapper(
-            profile.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                profile.get,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/user/invites.py b/src/cloudflare/resources/user/invites.py
index 51522de111d..6bfa26e944a 100644
--- a/src/cloudflare/resources/user/invites.py
+++ b/src/cloudflare/resources/user/invites.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -32,10 +29,21 @@
 class InvitesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> InvitesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return InvitesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> InvitesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return InvitesResourceWithStreamingResponse(self)
 
     def list(
@@ -46,7 +54,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Invite]:
         """Lists all invitations associated with my user."""
         return self._get_api_list(
@@ -68,8 +76,8 @@ def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Invite]:
         """
         Responds to an invitation.
 
@@ -96,9 +104,9 @@ def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Invite]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[Invite]], ResultWrapper[Invite]),
         )
 
     def get(
@@ -110,8 +118,8 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Invite]:
         """
         Gets the details of an invitation.
 
@@ -135,19 +143,30 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Invite]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[Invite]], ResultWrapper[Invite]),
         )
 
 
 class AsyncInvitesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncInvitesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncInvitesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncInvitesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncInvitesResourceWithStreamingResponse(self)
 
     def list(
@@ -158,7 +177,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Invite, AsyncSinglePage[Invite]]:
         """Lists all invitations associated with my user."""
         return self._get_api_list(
@@ -180,8 +199,8 @@ async def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Invite]:
         """
         Responds to an invitation.
 
@@ -208,9 +227,9 @@ async def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Invite]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[Invite]], ResultWrapper[Invite]),
         )
 
     async def get(
@@ -222,8 +241,8 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Invite]:
         """
         Gets the details of an invitation.
 
@@ -247,9 +266,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Invite]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[Invite]], ResultWrapper[Invite]),
         )
 
 
diff --git a/src/cloudflare/resources/user/organizations.py b/src/cloudflare/resources/user/organizations.py
index 6024fd116ec..dd4099e4097 100644
--- a/src/cloudflare/resources/user/organizations.py
+++ b/src/cloudflare/resources/user/organizations.py
@@ -2,12 +2,13 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
@@ -30,28 +31,40 @@
 class OrganizationsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> OrganizationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return OrganizationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> OrganizationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return OrganizationsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
         *,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        match: Literal["any", "all"] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        order: Literal["id", "name", "status"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        status: Literal["member", "invited"] | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        match: Literal["any", "all"] | Omit = omit,
+        name: str | Omit = omit,
+        order: Literal["id", "name", "status"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal["member", "invited"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[Organization]:
         """
         Lists organizations the user is associated with.
@@ -103,6 +116,7 @@ def list(
             model=Organization,
         )
 
+    @typing_extensions.deprecated("deprecated")
     def delete(
         self,
         organization_id: str,
@@ -112,7 +126,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> OrganizationDeleteResponse:
         """
         Removes association to an organization.
@@ -138,6 +152,7 @@ def delete(
             cast_to=OrganizationDeleteResponse,
         )
 
+    @typing_extensions.deprecated("deprecated")
     def get(
         self,
         organization_id: str,
@@ -147,7 +162,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Gets a specific organization the user is associated with.
@@ -181,28 +196,40 @@ def get(
 class AsyncOrganizationsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncOrganizationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncOrganizationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncOrganizationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncOrganizationsResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
         *,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        match: Literal["any", "all"] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        order: Literal["id", "name", "status"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        status: Literal["member", "invited"] | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        match: Literal["any", "all"] | Omit = omit,
+        name: str | Omit = omit,
+        order: Literal["id", "name", "status"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal["member", "invited"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Organization, AsyncV4PagePaginationArray[Organization]]:
         """
         Lists organizations the user is associated with.
@@ -254,6 +281,7 @@ def list(
             model=Organization,
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def delete(
         self,
         organization_id: str,
@@ -263,7 +291,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> OrganizationDeleteResponse:
         """
         Removes association to an organization.
@@ -289,6 +317,7 @@ async def delete(
             cast_to=OrganizationDeleteResponse,
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def get(
         self,
         organization_id: str,
@@ -298,7 +327,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Gets a specific organization the user is associated with.
@@ -333,14 +362,20 @@ class OrganizationsResourceWithRawResponse:
     def __init__(self, organizations: OrganizationsResource) -> None:
         self._organizations = organizations
 
-        self.list = to_raw_response_wrapper(
-            organizations.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                organizations.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = to_raw_response_wrapper(
-            organizations.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                organizations.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_raw_response_wrapper(
-            organizations.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                organizations.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -348,14 +383,20 @@ class AsyncOrganizationsResourceWithRawResponse:
     def __init__(self, organizations: AsyncOrganizationsResource) -> None:
         self._organizations = organizations
 
-        self.list = async_to_raw_response_wrapper(
-            organizations.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                organizations.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = async_to_raw_response_wrapper(
-            organizations.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                organizations.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_raw_response_wrapper(
-            organizations.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                organizations.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -363,14 +404,20 @@ class OrganizationsResourceWithStreamingResponse:
     def __init__(self, organizations: OrganizationsResource) -> None:
         self._organizations = organizations
 
-        self.list = to_streamed_response_wrapper(
-            organizations.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                organizations.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = to_streamed_response_wrapper(
-            organizations.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                organizations.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_streamed_response_wrapper(
-            organizations.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                organizations.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -378,12 +425,18 @@ class AsyncOrganizationsResourceWithStreamingResponse:
     def __init__(self, organizations: AsyncOrganizationsResource) -> None:
         self._organizations = organizations
 
-        self.list = async_to_streamed_response_wrapper(
-            organizations.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                organizations.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = async_to_streamed_response_wrapper(
-            organizations.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                organizations.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_streamed_response_wrapper(
-            organizations.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                organizations.get,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/user/subscriptions.py b/src/cloudflare/resources/user/subscriptions.py
index 11657a0b01e..7b5684234d6 100644
--- a/src/cloudflare/resources/user/subscriptions.py
+++ b/src/cloudflare/resources/user/subscriptions.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Iterable, Optional, cast
+from typing import Any, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -21,13 +18,11 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from ...types.user import subscription_edit_params, subscription_update_params
-from ..._base_client import make_request_options
-from ...types.user.rate_plan_param import RatePlanParam
-from ...types.user.subscription_zone_param import SubscriptionZoneParam
-from ...types.user.subscription_get_response import SubscriptionGetResponse
-from ...types.user.subscription_edit_response import SubscriptionEditResponse
-from ...types.user.subscription_component_param import SubscriptionComponentParam
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ...types.user import subscription_update_params
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.shared.subscription import Subscription
+from ...types.shared_params.rate_plan import RatePlan
 from ...types.user.subscription_delete_response import SubscriptionDeleteResponse
 from ...types.user.subscription_update_response import SubscriptionUpdateResponse
 
@@ -37,27 +32,35 @@
 class SubscriptionsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SubscriptionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SubscriptionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SubscriptionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SubscriptionsResourceWithStreamingResponse(self)
 
     def update(
         self,
         identifier: str,
         *,
-        app: subscription_update_params.App | NotGiven = NOT_GIVEN,
-        component_values: Iterable[SubscriptionComponentParam] | NotGiven = NOT_GIVEN,
-        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | NotGiven = NOT_GIVEN,
-        rate_plan: RatePlanParam | NotGiven = NOT_GIVEN,
-        zone: SubscriptionZoneParam | NotGiven = NOT_GIVEN,
+        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | Omit = omit,
+        rate_plan: RatePlan | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SubscriptionUpdateResponse:
         """
         Updates a user's subscriptions.
@@ -65,14 +68,10 @@ def update(
         Args:
           identifier: Subscription identifier tag.
 
-          component_values: The list of add-ons subscribed to.
-
           frequency: How often the subscription is renewed automatically.
 
           rate_plan: The rate plan applied to the subscription.
 
-          zone: A simple zone object. May have null properties if not a zone subscription.
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -89,11 +88,8 @@ def update(
                 f"/user/subscriptions/{identifier}",
                 body=maybe_transform(
                     {
-                        "app": app,
-                        "component_values": component_values,
                         "frequency": frequency,
                         "rate_plan": rate_plan,
-                        "zone": zone,
                     },
                     subscription_update_params.SubscriptionUpdateParams,
                 ),
@@ -119,7 +115,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SubscriptionDeleteResponse:
         """
         Deletes a user's subscription.
@@ -145,73 +141,6 @@ def delete(
             cast_to=SubscriptionDeleteResponse,
         )
 
-    def edit(
-        self,
-        identifier: str,
-        *,
-        app: subscription_edit_params.App | NotGiven = NOT_GIVEN,
-        component_values: Iterable[SubscriptionComponentParam] | NotGiven = NOT_GIVEN,
-        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | NotGiven = NOT_GIVEN,
-        rate_plan: RatePlanParam | NotGiven = NOT_GIVEN,
-        zone: SubscriptionZoneParam | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SubscriptionEditResponse:
-        """
-        Updates zone subscriptions, either plan or add-ons.
-
-        Args:
-          identifier: Subscription identifier tag.
-
-          component_values: The list of add-ons subscribed to.
-
-          frequency: How often the subscription is renewed automatically.
-
-          rate_plan: The rate plan applied to the subscription.
-
-          zone: A simple zone object. May have null properties if not a zone subscription.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not identifier:
-            raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            SubscriptionEditResponse,
-            self._put(
-                f"/zones/{identifier}/subscription",
-                body=maybe_transform(
-                    {
-                        "app": app,
-                        "component_values": component_values,
-                        "frequency": frequency,
-                        "rate_plan": rate_plan,
-                        "zone": zone,
-                    },
-                    subscription_edit_params.SubscriptionEditParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[SubscriptionEditResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[SubscriptionEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
     def get(
         self,
         *,
@@ -220,46 +149,51 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SubscriptionGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[Subscription]:
         """Lists all of a user's subscriptions."""
-        return self._get(
+        return self._get_api_list(
             "/user/subscriptions",
+            page=SyncSinglePage[Subscription],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SubscriptionGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[SubscriptionGetResponse]], ResultWrapper[SubscriptionGetResponse]),
+            model=Subscription,
         )
 
 
 class AsyncSubscriptionsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSubscriptionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSubscriptionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSubscriptionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSubscriptionsResourceWithStreamingResponse(self)
 
     async def update(
         self,
         identifier: str,
         *,
-        app: subscription_update_params.App | NotGiven = NOT_GIVEN,
-        component_values: Iterable[SubscriptionComponentParam] | NotGiven = NOT_GIVEN,
-        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | NotGiven = NOT_GIVEN,
-        rate_plan: RatePlanParam | NotGiven = NOT_GIVEN,
-        zone: SubscriptionZoneParam | NotGiven = NOT_GIVEN,
+        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | Omit = omit,
+        rate_plan: RatePlan | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SubscriptionUpdateResponse:
         """
         Updates a user's subscriptions.
@@ -267,14 +201,10 @@ async def update(
         Args:
           identifier: Subscription identifier tag.
 
-          component_values: The list of add-ons subscribed to.
-
           frequency: How often the subscription is renewed automatically.
 
           rate_plan: The rate plan applied to the subscription.
 
-          zone: A simple zone object. May have null properties if not a zone subscription.
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -291,11 +221,8 @@ async def update(
                 f"/user/subscriptions/{identifier}",
                 body=await async_maybe_transform(
                     {
-                        "app": app,
-                        "component_values": component_values,
                         "frequency": frequency,
                         "rate_plan": rate_plan,
-                        "zone": zone,
                     },
                     subscription_update_params.SubscriptionUpdateParams,
                 ),
@@ -321,7 +248,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SubscriptionDeleteResponse:
         """
         Deletes a user's subscription.
@@ -347,74 +274,7 @@ async def delete(
             cast_to=SubscriptionDeleteResponse,
         )
 
-    async def edit(
-        self,
-        identifier: str,
-        *,
-        app: subscription_edit_params.App | NotGiven = NOT_GIVEN,
-        component_values: Iterable[SubscriptionComponentParam] | NotGiven = NOT_GIVEN,
-        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | NotGiven = NOT_GIVEN,
-        rate_plan: RatePlanParam | NotGiven = NOT_GIVEN,
-        zone: SubscriptionZoneParam | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SubscriptionEditResponse:
-        """
-        Updates zone subscriptions, either plan or add-ons.
-
-        Args:
-          identifier: Subscription identifier tag.
-
-          component_values: The list of add-ons subscribed to.
-
-          frequency: How often the subscription is renewed automatically.
-
-          rate_plan: The rate plan applied to the subscription.
-
-          zone: A simple zone object. May have null properties if not a zone subscription.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not identifier:
-            raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            SubscriptionEditResponse,
-            await self._put(
-                f"/zones/{identifier}/subscription",
-                body=await async_maybe_transform(
-                    {
-                        "app": app,
-                        "component_values": component_values,
-                        "frequency": frequency,
-                        "rate_plan": rate_plan,
-                        "zone": zone,
-                    },
-                    subscription_edit_params.SubscriptionEditParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[SubscriptionEditResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[SubscriptionEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    async def get(
+    def get(
         self,
         *,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@@ -422,19 +282,16 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SubscriptionGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Subscription, AsyncSinglePage[Subscription]]:
         """Lists all of a user's subscriptions."""
-        return await self._get(
+        return self._get_api_list(
             "/user/subscriptions",
+            page=AsyncSinglePage[Subscription],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SubscriptionGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[SubscriptionGetResponse]], ResultWrapper[SubscriptionGetResponse]),
+            model=Subscription,
         )
 
 
@@ -448,9 +305,6 @@ def __init__(self, subscriptions: SubscriptionsResource) -> None:
         self.delete = to_raw_response_wrapper(
             subscriptions.delete,
         )
-        self.edit = to_raw_response_wrapper(
-            subscriptions.edit,
-        )
         self.get = to_raw_response_wrapper(
             subscriptions.get,
         )
@@ -466,9 +320,6 @@ def __init__(self, subscriptions: AsyncSubscriptionsResource) -> None:
         self.delete = async_to_raw_response_wrapper(
             subscriptions.delete,
         )
-        self.edit = async_to_raw_response_wrapper(
-            subscriptions.edit,
-        )
         self.get = async_to_raw_response_wrapper(
             subscriptions.get,
         )
@@ -484,9 +335,6 @@ def __init__(self, subscriptions: SubscriptionsResource) -> None:
         self.delete = to_streamed_response_wrapper(
             subscriptions.delete,
         )
-        self.edit = to_streamed_response_wrapper(
-            subscriptions.edit,
-        )
         self.get = to_streamed_response_wrapper(
             subscriptions.get,
         )
@@ -502,9 +350,6 @@ def __init__(self, subscriptions: AsyncSubscriptionsResource) -> None:
         self.delete = async_to_streamed_response_wrapper(
             subscriptions.delete,
         )
-        self.edit = async_to_streamed_response_wrapper(
-            subscriptions.edit,
-        )
         self.get = async_to_streamed_response_wrapper(
             subscriptions.get,
         )
diff --git a/src/cloudflare/resources/user/tokens/permission_groups.py b/src/cloudflare/resources/user/tokens/permission_groups.py
index 2a9cc0d5fda..a1bdcdc2e1a 100644
--- a/src/cloudflare/resources/user/tokens/permission_groups.py
+++ b/src/cloudflare/resources/user/tokens/permission_groups.py
@@ -4,7 +4,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -15,6 +16,8 @@
 )
 from ....pagination import SyncSinglePage, AsyncSinglePage
 from ...._base_client import AsyncPaginator, make_request_options
+from ....types.user.tokens import permission_group_list_params
+from ....types.user.tokens.permission_group_list_response import PermissionGroupListResponse
 
 __all__ = ["PermissionGroupsResource", "AsyncPermissionGroupsResource"]
 
@@ -22,60 +25,136 @@
 class PermissionGroupsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PermissionGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PermissionGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PermissionGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PermissionGroupsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
+        name: str | Omit = omit,
+        scope: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[object]:
-        """Find all available permission groups for API Tokens"""
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[PermissionGroupListResponse]:
+        """
+        Find all available permission groups for API Tokens
+
+        Args:
+          name: Filter by the name of the permission group. The value must be URL-encoded.
+
+          scope: Filter by the scope of the permission group. The value must be URL-encoded.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
         return self._get_api_list(
             "/user/tokens/permission_groups",
-            page=SyncSinglePage[object],
+            page=SyncSinglePage[PermissionGroupListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "name": name,
+                        "scope": scope,
+                    },
+                    permission_group_list_params.PermissionGroupListParams,
+                ),
             ),
-            model=object,
+            model=PermissionGroupListResponse,
         )
 
 
 class AsyncPermissionGroupsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPermissionGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPermissionGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPermissionGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPermissionGroupsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
+        name: str | Omit = omit,
+        scope: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[object, AsyncSinglePage[object]]:
-        """Find all available permission groups for API Tokens"""
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[PermissionGroupListResponse, AsyncSinglePage[PermissionGroupListResponse]]:
+        """
+        Find all available permission groups for API Tokens
+
+        Args:
+          name: Filter by the name of the permission group. The value must be URL-encoded.
+
+          scope: Filter by the scope of the permission group. The value must be URL-encoded.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
         return self._get_api_list(
             "/user/tokens/permission_groups",
-            page=AsyncSinglePage[object],
+            page=AsyncSinglePage[PermissionGroupListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "name": name,
+                        "scope": scope,
+                    },
+                    permission_group_list_params.PermissionGroupListParams,
+                ),
             ),
-            model=object,
+            model=PermissionGroupListResponse,
         )
 
 
diff --git a/src/cloudflare/resources/user/tokens/tokens.py b/src/cloudflare/resources/user/tokens/tokens.py
index 16c141b6a72..01277f2610d 100644
--- a/src/cloudflare/resources/user/tokens/tokens.py
+++ b/src/cloudflare/resources/user/tokens/tokens.py
@@ -16,11 +16,8 @@
     ValueResourceWithStreamingResponse,
     AsyncValueResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -41,7 +38,8 @@
     PermissionGroupsResourceWithStreamingResponse,
     AsyncPermissionGroupsResourceWithStreamingResponse,
 )
-from ....types.user.policy_param import PolicyParam
+from ....types.shared.token import Token
+from ....types.shared_params.token_policy import TokenPolicy
 from ....types.user.token_create_response import TokenCreateResponse
 from ....types.user.token_delete_response import TokenDeleteResponse
 from ....types.user.token_verify_response import TokenVerifyResponse
@@ -60,26 +58,37 @@ def value(self) -> ValueResource:
 
     @cached_property
     def with_raw_response(self) -> TokensResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TokensResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TokensResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TokensResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         name: str,
-        policies: Iterable[PolicyParam],
-        condition: token_create_params.Condition | NotGiven = NOT_GIVEN,
-        expires_on: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        not_before: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        policies: Iterable[TokenPolicy],
+        condition: token_create_params.Condition | Omit = omit,
+        expires_on: Union[str, datetime] | Omit = omit,
+        not_before: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TokenCreateResponse]:
         """
         Create a new access token.
@@ -126,36 +135,38 @@ def create(
 
     def update(
         self,
-        token_id: object,
+        token_id: str,
         *,
         name: str,
-        policies: Iterable[PolicyParam],
-        status: Literal["active", "disabled", "expired"],
-        condition: token_update_params.Condition | NotGiven = NOT_GIVEN,
-        expires_on: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        not_before: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        policies: Iterable[TokenPolicy],
+        condition: token_update_params.Condition | Omit = omit,
+        expires_on: Union[str, datetime] | Omit = omit,
+        not_before: Union[str, datetime] | Omit = omit,
+        status: Literal["active", "disabled", "expired"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Token]:
         """
         Update an existing token.
 
         Args:
+          token_id: Token identifier tag.
+
           name: Token name.
 
           policies: List of access policies assigned to the token.
 
-          status: Status of the token.
-
           expires_on: The expiration time on or after which the JWT MUST NOT be accepted for
               processing.
 
           not_before: The time before which the token MUST NOT be accepted for processing.
 
+          status: Status of the token.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -164,16 +175,18 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not token_id:
+            raise ValueError(f"Expected a non-empty value for `token_id` but received {token_id!r}")
         return self._put(
             f"/user/tokens/{token_id}",
             body=maybe_transform(
                 {
                     "name": name,
                     "policies": policies,
-                    "status": status,
                     "condition": condition,
                     "expires_on": expires_on,
                     "not_before": not_before,
+                    "status": status,
                 },
                 token_update_params.TokenUpdateParams,
             ),
@@ -182,24 +195,24 @@ def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Token]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
         )
 
     def list(
         self,
         *,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePaginationArray[object]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[Token]:
         """
         List all access tokens you created.
 
@@ -220,7 +233,7 @@ def list(
         """
         return self._get_api_list(
             "/user/tokens",
-            page=SyncV4PagePaginationArray[object],
+            page=SyncV4PagePaginationArray[Token],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -235,24 +248,26 @@ def list(
                     token_list_params.TokenListParams,
                 ),
             ),
-            model=object,
+            model=Token,
         )
 
     def delete(
         self,
-        token_id: object,
+        token_id: str,
         *,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TokenDeleteResponse]:
         """
         Destroy a token.
 
         Args:
+          token_id: Token identifier tag.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -261,6 +276,8 @@ def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not token_id:
+            raise ValueError(f"Expected a non-empty value for `token_id` but received {token_id!r}")
         return self._delete(
             f"/user/tokens/{token_id}",
             options=make_request_options(
@@ -275,19 +292,21 @@ def delete(
 
     def get(
         self,
-        token_id: object,
+        token_id: str,
         *,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Token]:
         """
         Get information about a specific token.
 
         Args:
+          token_id: Token identifier tag.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -296,6 +315,8 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not token_id:
+            raise ValueError(f"Expected a non-empty value for `token_id` but received {token_id!r}")
         return self._get(
             f"/user/tokens/{token_id}",
             options=make_request_options(
@@ -303,9 +324,9 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Token]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
         )
 
     def verify(
@@ -316,7 +337,7 @@ def verify(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TokenVerifyResponse]:
         """Test whether a token works."""
         return self._get(
@@ -343,26 +364,37 @@ def value(self) -> AsyncValueResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncTokensResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTokensResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTokensResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTokensResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         name: str,
-        policies: Iterable[PolicyParam],
-        condition: token_create_params.Condition | NotGiven = NOT_GIVEN,
-        expires_on: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        not_before: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        policies: Iterable[TokenPolicy],
+        condition: token_create_params.Condition | Omit = omit,
+        expires_on: Union[str, datetime] | Omit = omit,
+        not_before: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TokenCreateResponse]:
         """
         Create a new access token.
@@ -409,36 +441,38 @@ async def create(
 
     async def update(
         self,
-        token_id: object,
+        token_id: str,
         *,
         name: str,
-        policies: Iterable[PolicyParam],
-        status: Literal["active", "disabled", "expired"],
-        condition: token_update_params.Condition | NotGiven = NOT_GIVEN,
-        expires_on: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        not_before: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        policies: Iterable[TokenPolicy],
+        condition: token_update_params.Condition | Omit = omit,
+        expires_on: Union[str, datetime] | Omit = omit,
+        not_before: Union[str, datetime] | Omit = omit,
+        status: Literal["active", "disabled", "expired"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Token]:
         """
         Update an existing token.
 
         Args:
+          token_id: Token identifier tag.
+
           name: Token name.
 
           policies: List of access policies assigned to the token.
 
-          status: Status of the token.
-
           expires_on: The expiration time on or after which the JWT MUST NOT be accepted for
               processing.
 
           not_before: The time before which the token MUST NOT be accepted for processing.
 
+          status: Status of the token.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -447,16 +481,18 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not token_id:
+            raise ValueError(f"Expected a non-empty value for `token_id` but received {token_id!r}")
         return await self._put(
             f"/user/tokens/{token_id}",
             body=await async_maybe_transform(
                 {
                     "name": name,
                     "policies": policies,
-                    "status": status,
                     "condition": condition,
                     "expires_on": expires_on,
                     "not_before": not_before,
+                    "status": status,
                 },
                 token_update_params.TokenUpdateParams,
             ),
@@ -465,24 +501,24 @@ async def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Token]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
         )
 
     def list(
         self,
         *,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[object, AsyncV4PagePaginationArray[object]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Token, AsyncV4PagePaginationArray[Token]]:
         """
         List all access tokens you created.
 
@@ -503,7 +539,7 @@ def list(
         """
         return self._get_api_list(
             "/user/tokens",
-            page=AsyncV4PagePaginationArray[object],
+            page=AsyncV4PagePaginationArray[Token],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -518,24 +554,26 @@ def list(
                     token_list_params.TokenListParams,
                 ),
             ),
-            model=object,
+            model=Token,
         )
 
     async def delete(
         self,
-        token_id: object,
+        token_id: str,
         *,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TokenDeleteResponse]:
         """
         Destroy a token.
 
         Args:
+          token_id: Token identifier tag.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -544,6 +582,8 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not token_id:
+            raise ValueError(f"Expected a non-empty value for `token_id` but received {token_id!r}")
         return await self._delete(
             f"/user/tokens/{token_id}",
             options=make_request_options(
@@ -558,19 +598,21 @@ async def delete(
 
     async def get(
         self,
-        token_id: object,
+        token_id: str,
         *,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Token]:
         """
         Get information about a specific token.
 
         Args:
+          token_id: Token identifier tag.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -579,6 +621,8 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not token_id:
+            raise ValueError(f"Expected a non-empty value for `token_id` but received {token_id!r}")
         return await self._get(
             f"/user/tokens/{token_id}",
             options=make_request_options(
@@ -586,9 +630,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Token]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
         )
 
     async def verify(
@@ -599,7 +643,7 @@ async def verify(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TokenVerifyResponse]:
         """Test whether a token works."""
         return await self._get(
diff --git a/src/cloudflare/resources/user/tokens/value.py b/src/cloudflare/resources/user/tokens/value.py
index 7f2c8244596..063d76b1e91 100644
--- a/src/cloudflare/resources/user/tokens/value.py
+++ b/src/cloudflare/resources/user/tokens/value.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -22,7 +19,7 @@
 from ...._wrappers import ResultWrapper
 from ...._base_client import make_request_options
 from ....types.user.tokens import value_update_params
-from ....types.user.tokens.value import Value
+from ....types.shared.token_value import TokenValue
 
 __all__ = ["ValueResource", "AsyncValueResource"]
 
@@ -30,15 +27,26 @@
 class ValueResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ValueResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ValueResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ValueResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ValueResourceWithStreamingResponse(self)
 
     def update(
         self,
-        token_id: object,
+        token_id: str,
         *,
         body: object,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@@ -46,12 +54,14 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> str:
         """
         Roll the token secret.
 
         Args:
+          token_id: Token identifier tag.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -60,6 +70,8 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not token_id:
+            raise ValueError(f"Expected a non-empty value for `token_id` but received {token_id!r}")
         return self._put(
             f"/user/tokens/{token_id}/value",
             body=maybe_transform(body, value_update_params.ValueUpdateParams),
@@ -68,7 +80,7 @@ def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Value]]._unwrapper,
+                post_parser=ResultWrapper[Optional[TokenValue]]._unwrapper,
             ),
             cast_to=cast(Type[str], ResultWrapper[str]),
         )
@@ -77,15 +89,26 @@ def update(
 class AsyncValueResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncValueResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncValueResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncValueResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncValueResourceWithStreamingResponse(self)
 
     async def update(
         self,
-        token_id: object,
+        token_id: str,
         *,
         body: object,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@@ -93,12 +116,14 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> str:
         """
         Roll the token secret.
 
         Args:
+          token_id: Token identifier tag.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -107,6 +132,8 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not token_id:
+            raise ValueError(f"Expected a non-empty value for `token_id` but received {token_id!r}")
         return await self._put(
             f"/user/tokens/{token_id}/value",
             body=await async_maybe_transform(body, value_update_params.ValueUpdateParams),
@@ -115,7 +142,7 @@ async def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Value]]._unwrapper,
+                post_parser=ResultWrapper[Optional[TokenValue]]._unwrapper,
             ),
             cast_to=cast(Type[str], ResultWrapper[str]),
         )
diff --git a/src/cloudflare/resources/user/user.py b/src/cloudflare/resources/user/user.py
index cd85bfe6a6e..da999f1c09e 100644
--- a/src/cloudflare/resources/user/user.py
+++ b/src/cloudflare/resources/user/user.py
@@ -6,22 +6,6 @@
 
 import httpx
 
-from .tokens import (
-    TokensResource,
-    AsyncTokensResource,
-    TokensResourceWithRawResponse,
-    AsyncTokensResourceWithRawResponse,
-    TokensResourceWithStreamingResponse,
-    AsyncTokensResourceWithStreamingResponse,
-)
-from .billing import (
-    BillingResource,
-    AsyncBillingResource,
-    BillingResourceWithRawResponse,
-    AsyncBillingResourceWithRawResponse,
-    BillingResourceWithStreamingResponse,
-    AsyncBillingResourceWithStreamingResponse,
-)
 from .invites import (
     InvitesResource,
     AsyncInvitesResource,
@@ -30,11 +14,8 @@
     InvitesResourceWithStreamingResponse,
     AsyncInvitesResourceWithStreamingResponse,
 )
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from .audit_logs import (
     AuditLogsResource,
@@ -69,9 +50,25 @@
     SubscriptionsResourceWithStreamingResponse,
     AsyncSubscriptionsResourceWithStreamingResponse,
 )
-from .tokens.tokens import TokensResource, AsyncTokensResource
+from .tokens.tokens import (
+    TokensResource,
+    AsyncTokensResource,
+    TokensResourceWithRawResponse,
+    AsyncTokensResourceWithRawResponse,
+    TokensResourceWithStreamingResponse,
+    AsyncTokensResourceWithStreamingResponse,
+)
 from ..._base_client import make_request_options
-from .billing.billing import BillingResource, AsyncBillingResource
+from .billing.billing import (
+    BillingResource,
+    AsyncBillingResource,
+    BillingResourceWithRawResponse,
+    AsyncBillingResourceWithRawResponse,
+    BillingResourceWithStreamingResponse,
+    AsyncBillingResourceWithStreamingResponse,
+)
+from ...types.user.user_get_response import UserGetResponse
+from ...types.user.user_edit_response import UserEditResponse
 
 __all__ = ["UserResource", "AsyncUserResource"]
 
@@ -103,27 +100,38 @@ def tokens(self) -> TokensResource:
 
     @cached_property
     def with_raw_response(self) -> UserResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return UserResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> UserResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return UserResourceWithStreamingResponse(self)
 
     def edit(
         self,
         *,
-        country: Optional[str] | NotGiven = NOT_GIVEN,
-        first_name: Optional[str] | NotGiven = NOT_GIVEN,
-        last_name: Optional[str] | NotGiven = NOT_GIVEN,
-        telephone: Optional[str] | NotGiven = NOT_GIVEN,
-        zipcode: Optional[str] | NotGiven = NOT_GIVEN,
+        country: Optional[str] | Omit = omit,
+        first_name: Optional[str] | Omit = omit,
+        last_name: Optional[str] | Omit = omit,
+        telephone: Optional[str] | Omit = omit,
+        zipcode: Optional[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UserEditResponse]:
         """
         Edit part of your user details.
 
@@ -163,9 +171,9 @@ def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[UserEditResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[UserEditResponse]], ResultWrapper[UserEditResponse]),
         )
 
     def get(
@@ -176,8 +184,8 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UserGetResponse]:
         """User Details"""
         return self._get(
             "/user",
@@ -186,9 +194,9 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[UserGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[UserGetResponse]], ResultWrapper[UserGetResponse]),
         )
 
 
@@ -219,27 +227,38 @@ def tokens(self) -> AsyncTokensResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncUserResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncUserResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncUserResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncUserResourceWithStreamingResponse(self)
 
     async def edit(
         self,
         *,
-        country: Optional[str] | NotGiven = NOT_GIVEN,
-        first_name: Optional[str] | NotGiven = NOT_GIVEN,
-        last_name: Optional[str] | NotGiven = NOT_GIVEN,
-        telephone: Optional[str] | NotGiven = NOT_GIVEN,
-        zipcode: Optional[str] | NotGiven = NOT_GIVEN,
+        country: Optional[str] | Omit = omit,
+        first_name: Optional[str] | Omit = omit,
+        last_name: Optional[str] | Omit = omit,
+        telephone: Optional[str] | Omit = omit,
+        zipcode: Optional[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UserEditResponse]:
         """
         Edit part of your user details.
 
@@ -279,9 +298,9 @@ async def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[UserEditResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[UserEditResponse]], ResultWrapper[UserEditResponse]),
         )
 
     async def get(
@@ -292,8 +311,8 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UserGetResponse]:
         """User Details"""
         return await self._get(
             "/user",
@@ -302,9 +321,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+                post_parser=ResultWrapper[Optional[UserGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
+            cast_to=cast(Type[Optional[UserGetResponse]], ResultWrapper[UserGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/vectorize/indexes.py b/src/cloudflare/resources/vectorize/indexes.py
deleted file mode 100644
index 4f1775fdb3e..00000000000
--- a/src/cloudflare/resources/vectorize/indexes.py
+++ /dev/null
@@ -1,1161 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Any, List, Type, Iterable, Optional, cast
-
-import httpx
-
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven, FileTypes
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ..._wrappers import ResultWrapper
-from ...pagination import SyncSinglePage, AsyncSinglePage
-from ..._base_client import AsyncPaginator, make_request_options
-from ...types.vectorize import (
-    index_query_params,
-    index_create_params,
-    index_insert_params,
-    index_update_params,
-    index_upsert_params,
-    index_get_by_ids_params,
-    index_delete_by_ids_params,
-)
-from ...types.vectorize.index_query import IndexQuery
-from ...types.vectorize.create_index import CreateIndex
-from ...types.vectorize.index_insert import IndexInsert
-from ...types.vectorize.index_upsert import IndexUpsert
-from ...types.vectorize.index_delete_response import IndexDeleteResponse
-from ...types.vectorize.index_delete_vectors_by_id import IndexDeleteVectorsByID
-
-__all__ = ["IndexesResource", "AsyncIndexesResource"]
-
-
-class IndexesResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> IndexesResourceWithRawResponse:
-        return IndexesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> IndexesResourceWithStreamingResponse:
-        return IndexesResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        *,
-        account_id: str,
-        config: index_create_params.Config,
-        name: str,
-        description: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CreateIndex]:
-        """
-        Creates and returns a new Vectorize Index.
-
-        Args:
-          account_id: Identifier
-
-          config: Specifies the type of configuration to use for the index.
-
-          description: Specifies the description of the index.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._post(
-            f"/accounts/{account_id}/vectorize/indexes",
-            body=maybe_transform(
-                {
-                    "config": config,
-                    "name": name,
-                    "description": description,
-                },
-                index_create_params.IndexCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CreateIndex]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CreateIndex]], ResultWrapper[CreateIndex]),
-        )
-
-    def update(
-        self,
-        index_name: str,
-        *,
-        account_id: str,
-        description: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CreateIndex]:
-        """
-        Updates and returns the specified Vectorize Index.
-
-        Args:
-          account_id: Identifier
-
-          description: Specifies the description of the index.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not index_name:
-            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
-        return self._put(
-            f"/accounts/{account_id}/vectorize/indexes/{index_name}",
-            body=maybe_transform({"description": description}, index_update_params.IndexUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CreateIndex]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CreateIndex]], ResultWrapper[CreateIndex]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[CreateIndex]:
-        """
-        Returns a list of Vectorize Indexes
-
-        Args:
-          account_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/vectorize/indexes",
-            page=SyncSinglePage[CreateIndex],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=CreateIndex,
-        )
-
-    def delete(
-        self,
-        index_name: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> IndexDeleteResponse:
-        """
-        Deletes the specified Vectorize Index.
-
-        Args:
-          account_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not index_name:
-            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
-        return cast(
-            IndexDeleteResponse,
-            self._delete(
-                f"/accounts/{account_id}/vectorize/indexes/{index_name}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[IndexDeleteResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[IndexDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    def delete_by_ids(
-        self,
-        index_name: str,
-        *,
-        account_id: str,
-        ids: List[str] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IndexDeleteVectorsByID]:
-        """
-        Delete a set of vectors from an index by their vector identifiers.
-
-        Args:
-          account_id: Identifier
-
-          ids: A list of vector identifiers to delete from the index indicated by the path.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not index_name:
-            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
-        return self._post(
-            f"/accounts/{account_id}/vectorize/indexes/{index_name}/delete-by-ids",
-            body=maybe_transform({"ids": ids}, index_delete_by_ids_params.IndexDeleteByIDsParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IndexDeleteVectorsByID]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IndexDeleteVectorsByID]], ResultWrapper[IndexDeleteVectorsByID]),
-        )
-
-    def get(
-        self,
-        index_name: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CreateIndex]:
-        """
-        Returns the specified Vectorize Index.
-
-        Args:
-          account_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not index_name:
-            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
-        return self._get(
-            f"/accounts/{account_id}/vectorize/indexes/{index_name}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CreateIndex]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CreateIndex]], ResultWrapper[CreateIndex]),
-        )
-
-    def get_by_ids(
-        self,
-        index_name: str,
-        *,
-        account_id: str,
-        ids: List[str] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
-        """
-        Get a set of vectors from an index by their vector identifiers.
-
-        Args:
-          account_id: Identifier
-
-          ids: A list of vector identifiers to retrieve from the index indicated by the path.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not index_name:
-            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
-        return self._post(
-            f"/accounts/{account_id}/vectorize/indexes/{index_name}/get-by-ids",
-            body=maybe_transform({"ids": ids}, index_get_by_ids_params.IndexGetByIDsParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
-            ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
-        )
-
-    def insert(
-        self,
-        index_name: str,
-        *,
-        account_id: str,
-        body: FileTypes,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IndexInsert]:
-        """
-        Inserts vectors into the specified index and returns the count of the vectors
-        successfully inserted.
-
-        Args:
-          account_id: Identifier
-
-          body: ndjson file containing vectors to insert.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not index_name:
-            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
-        return self._post(
-            f"/accounts/{account_id}/vectorize/indexes/{index_name}/insert",
-            body=maybe_transform(body, index_insert_params.IndexInsertParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IndexInsert]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IndexInsert]], ResultWrapper[IndexInsert]),
-        )
-
-    def query(
-        self,
-        index_name: str,
-        *,
-        account_id: str,
-        vector: Iterable[float],
-        filter: object | NotGiven = NOT_GIVEN,
-        return_metadata: bool | NotGiven = NOT_GIVEN,
-        return_values: bool | NotGiven = NOT_GIVEN,
-        top_k: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IndexQuery]:
-        """
-        Finds vectors closest to a given vector in an index.
-
-        Args:
-          account_id: Identifier
-
-          vector: The search vector that will be used to find the nearest neighbors.
-
-          filter: A metadata filter expression used to limit nearest neighbor results.
-
-          return_metadata: Whether to return the metadata associated with the closest vectors.
-
-          return_values: Whether to return the values associated with the closest vectors.
-
-          top_k: The number of nearest neighbors to find.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not index_name:
-            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
-        return self._post(
-            f"/accounts/{account_id}/vectorize/indexes/{index_name}/query",
-            body=maybe_transform(
-                {
-                    "vector": vector,
-                    "filter": filter,
-                    "return_metadata": return_metadata,
-                    "return_values": return_values,
-                    "top_k": top_k,
-                },
-                index_query_params.IndexQueryParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IndexQuery]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IndexQuery]], ResultWrapper[IndexQuery]),
-        )
-
-    def upsert(
-        self,
-        index_name: str,
-        *,
-        account_id: str,
-        body: FileTypes,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IndexUpsert]:
-        """
-        Upserts vectors into the specified index, creating them if they do not exist and
-        returns the count of values and ids successfully inserted.
-
-        Args:
-          account_id: Identifier
-
-          body: ndjson file containing vectors to upsert.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not index_name:
-            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
-        return self._post(
-            f"/accounts/{account_id}/vectorize/indexes/{index_name}/upsert",
-            body=maybe_transform(body, index_upsert_params.IndexUpsertParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IndexUpsert]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IndexUpsert]], ResultWrapper[IndexUpsert]),
-        )
-
-
-class AsyncIndexesResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncIndexesResourceWithRawResponse:
-        return AsyncIndexesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncIndexesResourceWithStreamingResponse:
-        return AsyncIndexesResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        *,
-        account_id: str,
-        config: index_create_params.Config,
-        name: str,
-        description: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CreateIndex]:
-        """
-        Creates and returns a new Vectorize Index.
-
-        Args:
-          account_id: Identifier
-
-          config: Specifies the type of configuration to use for the index.
-
-          description: Specifies the description of the index.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._post(
-            f"/accounts/{account_id}/vectorize/indexes",
-            body=await async_maybe_transform(
-                {
-                    "config": config,
-                    "name": name,
-                    "description": description,
-                },
-                index_create_params.IndexCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CreateIndex]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CreateIndex]], ResultWrapper[CreateIndex]),
-        )
-
-    async def update(
-        self,
-        index_name: str,
-        *,
-        account_id: str,
-        description: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CreateIndex]:
-        """
-        Updates and returns the specified Vectorize Index.
-
-        Args:
-          account_id: Identifier
-
-          description: Specifies the description of the index.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not index_name:
-            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
-        return await self._put(
-            f"/accounts/{account_id}/vectorize/indexes/{index_name}",
-            body=await async_maybe_transform({"description": description}, index_update_params.IndexUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CreateIndex]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CreateIndex]], ResultWrapper[CreateIndex]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[CreateIndex, AsyncSinglePage[CreateIndex]]:
-        """
-        Returns a list of Vectorize Indexes
-
-        Args:
-          account_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/vectorize/indexes",
-            page=AsyncSinglePage[CreateIndex],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=CreateIndex,
-        )
-
-    async def delete(
-        self,
-        index_name: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> IndexDeleteResponse:
-        """
-        Deletes the specified Vectorize Index.
-
-        Args:
-          account_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not index_name:
-            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
-        return cast(
-            IndexDeleteResponse,
-            await self._delete(
-                f"/accounts/{account_id}/vectorize/indexes/{index_name}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[IndexDeleteResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[IndexDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    async def delete_by_ids(
-        self,
-        index_name: str,
-        *,
-        account_id: str,
-        ids: List[str] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IndexDeleteVectorsByID]:
-        """
-        Delete a set of vectors from an index by their vector identifiers.
-
-        Args:
-          account_id: Identifier
-
-          ids: A list of vector identifiers to delete from the index indicated by the path.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not index_name:
-            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
-        return await self._post(
-            f"/accounts/{account_id}/vectorize/indexes/{index_name}/delete-by-ids",
-            body=await async_maybe_transform({"ids": ids}, index_delete_by_ids_params.IndexDeleteByIDsParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IndexDeleteVectorsByID]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IndexDeleteVectorsByID]], ResultWrapper[IndexDeleteVectorsByID]),
-        )
-
-    async def get(
-        self,
-        index_name: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CreateIndex]:
-        """
-        Returns the specified Vectorize Index.
-
-        Args:
-          account_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not index_name:
-            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
-        return await self._get(
-            f"/accounts/{account_id}/vectorize/indexes/{index_name}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CreateIndex]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[CreateIndex]], ResultWrapper[CreateIndex]),
-        )
-
-    async def get_by_ids(
-        self,
-        index_name: str,
-        *,
-        account_id: str,
-        ids: List[str] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
-        """
-        Get a set of vectors from an index by their vector identifiers.
-
-        Args:
-          account_id: Identifier
-
-          ids: A list of vector identifiers to retrieve from the index indicated by the path.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not index_name:
-            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
-        return await self._post(
-            f"/accounts/{account_id}/vectorize/indexes/{index_name}/get-by-ids",
-            body=await async_maybe_transform({"ids": ids}, index_get_by_ids_params.IndexGetByIDsParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[object]]._unwrapper,
-            ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
-        )
-
-    async def insert(
-        self,
-        index_name: str,
-        *,
-        account_id: str,
-        body: FileTypes,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IndexInsert]:
-        """
-        Inserts vectors into the specified index and returns the count of the vectors
-        successfully inserted.
-
-        Args:
-          account_id: Identifier
-
-          body: ndjson file containing vectors to insert.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not index_name:
-            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
-        return await self._post(
-            f"/accounts/{account_id}/vectorize/indexes/{index_name}/insert",
-            body=await async_maybe_transform(body, index_insert_params.IndexInsertParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IndexInsert]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IndexInsert]], ResultWrapper[IndexInsert]),
-        )
-
-    async def query(
-        self,
-        index_name: str,
-        *,
-        account_id: str,
-        vector: Iterable[float],
-        filter: object | NotGiven = NOT_GIVEN,
-        return_metadata: bool | NotGiven = NOT_GIVEN,
-        return_values: bool | NotGiven = NOT_GIVEN,
-        top_k: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IndexQuery]:
-        """
-        Finds vectors closest to a given vector in an index.
-
-        Args:
-          account_id: Identifier
-
-          vector: The search vector that will be used to find the nearest neighbors.
-
-          filter: A metadata filter expression used to limit nearest neighbor results.
-
-          return_metadata: Whether to return the metadata associated with the closest vectors.
-
-          return_values: Whether to return the values associated with the closest vectors.
-
-          top_k: The number of nearest neighbors to find.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not index_name:
-            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
-        return await self._post(
-            f"/accounts/{account_id}/vectorize/indexes/{index_name}/query",
-            body=await async_maybe_transform(
-                {
-                    "vector": vector,
-                    "filter": filter,
-                    "return_metadata": return_metadata,
-                    "return_values": return_values,
-                    "top_k": top_k,
-                },
-                index_query_params.IndexQueryParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IndexQuery]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IndexQuery]], ResultWrapper[IndexQuery]),
-        )
-
-    async def upsert(
-        self,
-        index_name: str,
-        *,
-        account_id: str,
-        body: FileTypes,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IndexUpsert]:
-        """
-        Upserts vectors into the specified index, creating them if they do not exist and
-        returns the count of values and ids successfully inserted.
-
-        Args:
-          account_id: Identifier
-
-          body: ndjson file containing vectors to upsert.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not index_name:
-            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
-        return await self._post(
-            f"/accounts/{account_id}/vectorize/indexes/{index_name}/upsert",
-            body=await async_maybe_transform(body, index_upsert_params.IndexUpsertParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IndexUpsert]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IndexUpsert]], ResultWrapper[IndexUpsert]),
-        )
-
-
-class IndexesResourceWithRawResponse:
-    def __init__(self, indexes: IndexesResource) -> None:
-        self._indexes = indexes
-
-        self.create = to_raw_response_wrapper(
-            indexes.create,
-        )
-        self.update = to_raw_response_wrapper(
-            indexes.update,
-        )
-        self.list = to_raw_response_wrapper(
-            indexes.list,
-        )
-        self.delete = to_raw_response_wrapper(
-            indexes.delete,
-        )
-        self.delete_by_ids = to_raw_response_wrapper(
-            indexes.delete_by_ids,
-        )
-        self.get = to_raw_response_wrapper(
-            indexes.get,
-        )
-        self.get_by_ids = to_raw_response_wrapper(
-            indexes.get_by_ids,
-        )
-        self.insert = to_raw_response_wrapper(
-            indexes.insert,
-        )
-        self.query = to_raw_response_wrapper(
-            indexes.query,
-        )
-        self.upsert = to_raw_response_wrapper(
-            indexes.upsert,
-        )
-
-
-class AsyncIndexesResourceWithRawResponse:
-    def __init__(self, indexes: AsyncIndexesResource) -> None:
-        self._indexes = indexes
-
-        self.create = async_to_raw_response_wrapper(
-            indexes.create,
-        )
-        self.update = async_to_raw_response_wrapper(
-            indexes.update,
-        )
-        self.list = async_to_raw_response_wrapper(
-            indexes.list,
-        )
-        self.delete = async_to_raw_response_wrapper(
-            indexes.delete,
-        )
-        self.delete_by_ids = async_to_raw_response_wrapper(
-            indexes.delete_by_ids,
-        )
-        self.get = async_to_raw_response_wrapper(
-            indexes.get,
-        )
-        self.get_by_ids = async_to_raw_response_wrapper(
-            indexes.get_by_ids,
-        )
-        self.insert = async_to_raw_response_wrapper(
-            indexes.insert,
-        )
-        self.query = async_to_raw_response_wrapper(
-            indexes.query,
-        )
-        self.upsert = async_to_raw_response_wrapper(
-            indexes.upsert,
-        )
-
-
-class IndexesResourceWithStreamingResponse:
-    def __init__(self, indexes: IndexesResource) -> None:
-        self._indexes = indexes
-
-        self.create = to_streamed_response_wrapper(
-            indexes.create,
-        )
-        self.update = to_streamed_response_wrapper(
-            indexes.update,
-        )
-        self.list = to_streamed_response_wrapper(
-            indexes.list,
-        )
-        self.delete = to_streamed_response_wrapper(
-            indexes.delete,
-        )
-        self.delete_by_ids = to_streamed_response_wrapper(
-            indexes.delete_by_ids,
-        )
-        self.get = to_streamed_response_wrapper(
-            indexes.get,
-        )
-        self.get_by_ids = to_streamed_response_wrapper(
-            indexes.get_by_ids,
-        )
-        self.insert = to_streamed_response_wrapper(
-            indexes.insert,
-        )
-        self.query = to_streamed_response_wrapper(
-            indexes.query,
-        )
-        self.upsert = to_streamed_response_wrapper(
-            indexes.upsert,
-        )
-
-
-class AsyncIndexesResourceWithStreamingResponse:
-    def __init__(self, indexes: AsyncIndexesResource) -> None:
-        self._indexes = indexes
-
-        self.create = async_to_streamed_response_wrapper(
-            indexes.create,
-        )
-        self.update = async_to_streamed_response_wrapper(
-            indexes.update,
-        )
-        self.list = async_to_streamed_response_wrapper(
-            indexes.list,
-        )
-        self.delete = async_to_streamed_response_wrapper(
-            indexes.delete,
-        )
-        self.delete_by_ids = async_to_streamed_response_wrapper(
-            indexes.delete_by_ids,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            indexes.get,
-        )
-        self.get_by_ids = async_to_streamed_response_wrapper(
-            indexes.get_by_ids,
-        )
-        self.insert = async_to_streamed_response_wrapper(
-            indexes.insert,
-        )
-        self.query = async_to_streamed_response_wrapper(
-            indexes.query,
-        )
-        self.upsert = async_to_streamed_response_wrapper(
-            indexes.upsert,
-        )
diff --git a/src/cloudflare/resources/vectorize/indexes/__init__.py b/src/cloudflare/resources/vectorize/indexes/__init__.py
new file mode 100644
index 00000000000..6a04dcdc42d
--- /dev/null
+++ b/src/cloudflare/resources/vectorize/indexes/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .indexes import (
+    IndexesResource,
+    AsyncIndexesResource,
+    IndexesResourceWithRawResponse,
+    AsyncIndexesResourceWithRawResponse,
+    IndexesResourceWithStreamingResponse,
+    AsyncIndexesResourceWithStreamingResponse,
+)
+from .metadata_index import (
+    MetadataIndexResource,
+    AsyncMetadataIndexResource,
+    MetadataIndexResourceWithRawResponse,
+    AsyncMetadataIndexResourceWithRawResponse,
+    MetadataIndexResourceWithStreamingResponse,
+    AsyncMetadataIndexResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "MetadataIndexResource",
+    "AsyncMetadataIndexResource",
+    "MetadataIndexResourceWithRawResponse",
+    "AsyncMetadataIndexResourceWithRawResponse",
+    "MetadataIndexResourceWithStreamingResponse",
+    "AsyncMetadataIndexResourceWithStreamingResponse",
+    "IndexesResource",
+    "AsyncIndexesResource",
+    "IndexesResourceWithRawResponse",
+    "AsyncIndexesResourceWithRawResponse",
+    "IndexesResourceWithStreamingResponse",
+    "AsyncIndexesResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/vectorize/indexes/indexes.py b/src/cloudflare/resources/vectorize/indexes/indexes.py
new file mode 100644
index 00000000000..a001e62b7fb
--- /dev/null
+++ b/src/cloudflare/resources/vectorize/indexes/indexes.py
@@ -0,0 +1,1365 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Any, Type, Iterable, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import (
+    Body,
+    Omit,
+    Query,
+    Headers,
+    NotGiven,
+    FileTypes,
+    SequenceNotStr,
+    omit,
+    not_given,
+)
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from .metadata_index import (
+    MetadataIndexResource,
+    AsyncMetadataIndexResource,
+    MetadataIndexResourceWithRawResponse,
+    AsyncMetadataIndexResourceWithRawResponse,
+    MetadataIndexResourceWithStreamingResponse,
+    AsyncMetadataIndexResourceWithStreamingResponse,
+)
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.vectorize import (
+    index_query_params,
+    index_create_params,
+    index_insert_params,
+    index_upsert_params,
+    index_get_by_ids_params,
+    index_list_vectors_params,
+    index_delete_by_ids_params,
+)
+from ....types.vectorize.create_index import CreateIndex
+from ....types.vectorize.index_info_response import IndexInfoResponse
+from ....types.vectorize.index_query_response import IndexQueryResponse
+from ....types.vectorize.index_delete_response import IndexDeleteResponse
+from ....types.vectorize.index_insert_response import IndexInsertResponse
+from ....types.vectorize.index_upsert_response import IndexUpsertResponse
+from ....types.vectorize.index_list_vectors_response import IndexListVectorsResponse
+from ....types.vectorize.index_delete_by_ids_response import IndexDeleteByIDsResponse
+
+__all__ = ["IndexesResource", "AsyncIndexesResource"]
+
+
+class IndexesResource(SyncAPIResource):
+    @cached_property
+    def metadata_index(self) -> MetadataIndexResource:
+        return MetadataIndexResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> IndexesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return IndexesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> IndexesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return IndexesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        config: index_create_params.Config,
+        name: str,
+        description: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CreateIndex]:
+        """
+        Creates and returns a new Vectorize Index.
+
+        Args:
+          account_id: Identifier
+
+          config: Specifies the type of configuration to use for the index.
+
+          description: Specifies the description of the index.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/vectorize/v2/indexes",
+            body=maybe_transform(
+                {
+                    "config": config,
+                    "name": name,
+                    "description": description,
+                },
+                index_create_params.IndexCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CreateIndex]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CreateIndex]], ResultWrapper[CreateIndex]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[CreateIndex]:
+        """
+        Returns a list of Vectorize Indexes
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/vectorize/v2/indexes",
+            page=SyncSinglePage[CreateIndex],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=CreateIndex,
+        )
+
+    def delete(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IndexDeleteResponse]:
+        """
+        Deletes the specified Vectorize Index.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return cast(
+            Optional[IndexDeleteResponse],
+            self._delete(
+                f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[IndexDeleteResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[IndexDeleteResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    def delete_by_ids(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        ids: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IndexDeleteByIDsResponse]:
+        """
+        Delete a set of vectors from an index by their vector identifiers.
+
+        Args:
+          account_id: Identifier
+
+          ids: A list of vector identifiers to delete from the index indicated by the path.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return self._post(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/delete_by_ids",
+            body=maybe_transform({"ids": ids}, index_delete_by_ids_params.IndexDeleteByIDsParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[IndexDeleteByIDsResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IndexDeleteByIDsResponse]], ResultWrapper[IndexDeleteByIDsResponse]),
+        )
+
+    def get(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CreateIndex]:
+        """
+        Returns the specified Vectorize Index.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return self._get(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CreateIndex]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CreateIndex]], ResultWrapper[CreateIndex]),
+        )
+
+    def get_by_ids(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        ids: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Get a set of vectors from an index by their vector identifiers.
+
+        Args:
+          account_id: Identifier
+
+          ids: A list of vector identifiers to retrieve from the index indicated by the path.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return self._post(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/get_by_ids",
+            body=maybe_transform({"ids": ids}, index_get_by_ids_params.IndexGetByIDsParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def info(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IndexInfoResponse]:
+        """
+        Get information about a vectorize index.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return self._get(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/info",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[IndexInfoResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IndexInfoResponse]], ResultWrapper[IndexInfoResponse]),
+        )
+
+    def insert(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        body: FileTypes,
+        unparsable_behavior: Literal["error", "discard"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IndexInsertResponse]:
+        """
+        Inserts vectors into the specified index and returns a mutation id corresponding
+        to the vectors enqueued for insertion.
+
+        Args:
+          account_id: Identifier
+
+          body: ndjson file containing vectors to insert.
+
+          unparsable_behavior: Behavior for ndjson parse failures.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return self._post(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/insert",
+            body=maybe_transform(body, index_insert_params.IndexInsertParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {"unparsable_behavior": unparsable_behavior}, index_insert_params.IndexInsertParams
+                ),
+                post_parser=ResultWrapper[Optional[IndexInsertResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IndexInsertResponse]], ResultWrapper[IndexInsertResponse]),
+        )
+
+    def list_vectors(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        count: int | Omit = omit,
+        cursor: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IndexListVectorsResponse]:
+        """
+        Returns a paginated list of vector identifiers from the specified index.
+
+        Args:
+          account_id: Identifier
+
+          count: Maximum number of vectors to return
+
+          cursor: Cursor for pagination to get the next page of results
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return self._get(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/list",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "count": count,
+                        "cursor": cursor,
+                    },
+                    index_list_vectors_params.IndexListVectorsParams,
+                ),
+                post_parser=ResultWrapper[Optional[IndexListVectorsResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IndexListVectorsResponse]], ResultWrapper[IndexListVectorsResponse]),
+        )
+
+    def query(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        vector: Iterable[float],
+        filter: object | Omit = omit,
+        return_metadata: Literal["none", "indexed", "all"] | Omit = omit,
+        return_values: bool | Omit = omit,
+        top_k: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IndexQueryResponse]:
+        """
+        Finds vectors closest to a given vector in an index.
+
+        Args:
+          account_id: Identifier
+
+          vector: The search vector that will be used to find the nearest neighbors.
+
+          filter: A metadata filter expression used to limit nearest neighbor results.
+
+          return_metadata: Whether to return no metadata, indexed metadata or all metadata associated with
+              the closest vectors.
+
+          return_values: Whether to return the values associated with the closest vectors.
+
+          top_k: The number of nearest neighbors to find.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return self._post(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/query",
+            body=maybe_transform(
+                {
+                    "vector": vector,
+                    "filter": filter,
+                    "return_metadata": return_metadata,
+                    "return_values": return_values,
+                    "top_k": top_k,
+                },
+                index_query_params.IndexQueryParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[IndexQueryResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IndexQueryResponse]], ResultWrapper[IndexQueryResponse]),
+        )
+
+    def upsert(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        body: FileTypes,
+        unparsable_behavior: Literal["error", "discard"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IndexUpsertResponse]:
+        """
+        Upserts vectors into the specified index, creating them if they do not exist and
+        returns a mutation id corresponding to the vectors enqueued for upsertion.
+
+        Args:
+          account_id: Identifier
+
+          body: ndjson file containing vectors to upsert.
+
+          unparsable_behavior: Behavior for ndjson parse failures.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return self._post(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/upsert",
+            body=maybe_transform(body, index_upsert_params.IndexUpsertParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {"unparsable_behavior": unparsable_behavior}, index_upsert_params.IndexUpsertParams
+                ),
+                post_parser=ResultWrapper[Optional[IndexUpsertResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IndexUpsertResponse]], ResultWrapper[IndexUpsertResponse]),
+        )
+
+
+class AsyncIndexesResource(AsyncAPIResource):
+    @cached_property
+    def metadata_index(self) -> AsyncMetadataIndexResource:
+        return AsyncMetadataIndexResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncIndexesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncIndexesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncIndexesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncIndexesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        config: index_create_params.Config,
+        name: str,
+        description: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CreateIndex]:
+        """
+        Creates and returns a new Vectorize Index.
+
+        Args:
+          account_id: Identifier
+
+          config: Specifies the type of configuration to use for the index.
+
+          description: Specifies the description of the index.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/vectorize/v2/indexes",
+            body=await async_maybe_transform(
+                {
+                    "config": config,
+                    "name": name,
+                    "description": description,
+                },
+                index_create_params.IndexCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CreateIndex]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CreateIndex]], ResultWrapper[CreateIndex]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[CreateIndex, AsyncSinglePage[CreateIndex]]:
+        """
+        Returns a list of Vectorize Indexes
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/vectorize/v2/indexes",
+            page=AsyncSinglePage[CreateIndex],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=CreateIndex,
+        )
+
+    async def delete(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IndexDeleteResponse]:
+        """
+        Deletes the specified Vectorize Index.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return cast(
+            Optional[IndexDeleteResponse],
+            await self._delete(
+                f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[IndexDeleteResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[IndexDeleteResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    async def delete_by_ids(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        ids: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IndexDeleteByIDsResponse]:
+        """
+        Delete a set of vectors from an index by their vector identifiers.
+
+        Args:
+          account_id: Identifier
+
+          ids: A list of vector identifiers to delete from the index indicated by the path.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return await self._post(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/delete_by_ids",
+            body=await async_maybe_transform({"ids": ids}, index_delete_by_ids_params.IndexDeleteByIDsParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[IndexDeleteByIDsResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IndexDeleteByIDsResponse]], ResultWrapper[IndexDeleteByIDsResponse]),
+        )
+
+    async def get(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CreateIndex]:
+        """
+        Returns the specified Vectorize Index.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return await self._get(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CreateIndex]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CreateIndex]], ResultWrapper[CreateIndex]),
+        )
+
+    async def get_by_ids(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        ids: SequenceNotStr[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Get a set of vectors from an index by their vector identifiers.
+
+        Args:
+          account_id: Identifier
+
+          ids: A list of vector identifiers to retrieve from the index indicated by the path.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return await self._post(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/get_by_ids",
+            body=await async_maybe_transform({"ids": ids}, index_get_by_ids_params.IndexGetByIDsParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def info(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IndexInfoResponse]:
+        """
+        Get information about a vectorize index.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return await self._get(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/info",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[IndexInfoResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IndexInfoResponse]], ResultWrapper[IndexInfoResponse]),
+        )
+
+    async def insert(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        body: FileTypes,
+        unparsable_behavior: Literal["error", "discard"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IndexInsertResponse]:
+        """
+        Inserts vectors into the specified index and returns a mutation id corresponding
+        to the vectors enqueued for insertion.
+
+        Args:
+          account_id: Identifier
+
+          body: ndjson file containing vectors to insert.
+
+          unparsable_behavior: Behavior for ndjson parse failures.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return await self._post(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/insert",
+            body=await async_maybe_transform(body, index_insert_params.IndexInsertParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"unparsable_behavior": unparsable_behavior}, index_insert_params.IndexInsertParams
+                ),
+                post_parser=ResultWrapper[Optional[IndexInsertResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IndexInsertResponse]], ResultWrapper[IndexInsertResponse]),
+        )
+
+    async def list_vectors(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        count: int | Omit = omit,
+        cursor: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IndexListVectorsResponse]:
+        """
+        Returns a paginated list of vector identifiers from the specified index.
+
+        Args:
+          account_id: Identifier
+
+          count: Maximum number of vectors to return
+
+          cursor: Cursor for pagination to get the next page of results
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return await self._get(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/list",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "count": count,
+                        "cursor": cursor,
+                    },
+                    index_list_vectors_params.IndexListVectorsParams,
+                ),
+                post_parser=ResultWrapper[Optional[IndexListVectorsResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IndexListVectorsResponse]], ResultWrapper[IndexListVectorsResponse]),
+        )
+
+    async def query(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        vector: Iterable[float],
+        filter: object | Omit = omit,
+        return_metadata: Literal["none", "indexed", "all"] | Omit = omit,
+        return_values: bool | Omit = omit,
+        top_k: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IndexQueryResponse]:
+        """
+        Finds vectors closest to a given vector in an index.
+
+        Args:
+          account_id: Identifier
+
+          vector: The search vector that will be used to find the nearest neighbors.
+
+          filter: A metadata filter expression used to limit nearest neighbor results.
+
+          return_metadata: Whether to return no metadata, indexed metadata or all metadata associated with
+              the closest vectors.
+
+          return_values: Whether to return the values associated with the closest vectors.
+
+          top_k: The number of nearest neighbors to find.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return await self._post(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/query",
+            body=await async_maybe_transform(
+                {
+                    "vector": vector,
+                    "filter": filter,
+                    "return_metadata": return_metadata,
+                    "return_values": return_values,
+                    "top_k": top_k,
+                },
+                index_query_params.IndexQueryParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[IndexQueryResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IndexQueryResponse]], ResultWrapper[IndexQueryResponse]),
+        )
+
+    async def upsert(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        body: FileTypes,
+        unparsable_behavior: Literal["error", "discard"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IndexUpsertResponse]:
+        """
+        Upserts vectors into the specified index, creating them if they do not exist and
+        returns a mutation id corresponding to the vectors enqueued for upsertion.
+
+        Args:
+          account_id: Identifier
+
+          body: ndjson file containing vectors to upsert.
+
+          unparsable_behavior: Behavior for ndjson parse failures.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return await self._post(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/upsert",
+            body=await async_maybe_transform(body, index_upsert_params.IndexUpsertParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"unparsable_behavior": unparsable_behavior}, index_upsert_params.IndexUpsertParams
+                ),
+                post_parser=ResultWrapper[Optional[IndexUpsertResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IndexUpsertResponse]], ResultWrapper[IndexUpsertResponse]),
+        )
+
+
+class IndexesResourceWithRawResponse:
+    def __init__(self, indexes: IndexesResource) -> None:
+        self._indexes = indexes
+
+        self.create = to_raw_response_wrapper(
+            indexes.create,
+        )
+        self.list = to_raw_response_wrapper(
+            indexes.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            indexes.delete,
+        )
+        self.delete_by_ids = to_raw_response_wrapper(
+            indexes.delete_by_ids,
+        )
+        self.get = to_raw_response_wrapper(
+            indexes.get,
+        )
+        self.get_by_ids = to_raw_response_wrapper(
+            indexes.get_by_ids,
+        )
+        self.info = to_raw_response_wrapper(
+            indexes.info,
+        )
+        self.insert = to_raw_response_wrapper(
+            indexes.insert,
+        )
+        self.list_vectors = to_raw_response_wrapper(
+            indexes.list_vectors,
+        )
+        self.query = to_raw_response_wrapper(
+            indexes.query,
+        )
+        self.upsert = to_raw_response_wrapper(
+            indexes.upsert,
+        )
+
+    @cached_property
+    def metadata_index(self) -> MetadataIndexResourceWithRawResponse:
+        return MetadataIndexResourceWithRawResponse(self._indexes.metadata_index)
+
+
+class AsyncIndexesResourceWithRawResponse:
+    def __init__(self, indexes: AsyncIndexesResource) -> None:
+        self._indexes = indexes
+
+        self.create = async_to_raw_response_wrapper(
+            indexes.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            indexes.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            indexes.delete,
+        )
+        self.delete_by_ids = async_to_raw_response_wrapper(
+            indexes.delete_by_ids,
+        )
+        self.get = async_to_raw_response_wrapper(
+            indexes.get,
+        )
+        self.get_by_ids = async_to_raw_response_wrapper(
+            indexes.get_by_ids,
+        )
+        self.info = async_to_raw_response_wrapper(
+            indexes.info,
+        )
+        self.insert = async_to_raw_response_wrapper(
+            indexes.insert,
+        )
+        self.list_vectors = async_to_raw_response_wrapper(
+            indexes.list_vectors,
+        )
+        self.query = async_to_raw_response_wrapper(
+            indexes.query,
+        )
+        self.upsert = async_to_raw_response_wrapper(
+            indexes.upsert,
+        )
+
+    @cached_property
+    def metadata_index(self) -> AsyncMetadataIndexResourceWithRawResponse:
+        return AsyncMetadataIndexResourceWithRawResponse(self._indexes.metadata_index)
+
+
+class IndexesResourceWithStreamingResponse:
+    def __init__(self, indexes: IndexesResource) -> None:
+        self._indexes = indexes
+
+        self.create = to_streamed_response_wrapper(
+            indexes.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            indexes.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            indexes.delete,
+        )
+        self.delete_by_ids = to_streamed_response_wrapper(
+            indexes.delete_by_ids,
+        )
+        self.get = to_streamed_response_wrapper(
+            indexes.get,
+        )
+        self.get_by_ids = to_streamed_response_wrapper(
+            indexes.get_by_ids,
+        )
+        self.info = to_streamed_response_wrapper(
+            indexes.info,
+        )
+        self.insert = to_streamed_response_wrapper(
+            indexes.insert,
+        )
+        self.list_vectors = to_streamed_response_wrapper(
+            indexes.list_vectors,
+        )
+        self.query = to_streamed_response_wrapper(
+            indexes.query,
+        )
+        self.upsert = to_streamed_response_wrapper(
+            indexes.upsert,
+        )
+
+    @cached_property
+    def metadata_index(self) -> MetadataIndexResourceWithStreamingResponse:
+        return MetadataIndexResourceWithStreamingResponse(self._indexes.metadata_index)
+
+
+class AsyncIndexesResourceWithStreamingResponse:
+    def __init__(self, indexes: AsyncIndexesResource) -> None:
+        self._indexes = indexes
+
+        self.create = async_to_streamed_response_wrapper(
+            indexes.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            indexes.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            indexes.delete,
+        )
+        self.delete_by_ids = async_to_streamed_response_wrapper(
+            indexes.delete_by_ids,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            indexes.get,
+        )
+        self.get_by_ids = async_to_streamed_response_wrapper(
+            indexes.get_by_ids,
+        )
+        self.info = async_to_streamed_response_wrapper(
+            indexes.info,
+        )
+        self.insert = async_to_streamed_response_wrapper(
+            indexes.insert,
+        )
+        self.list_vectors = async_to_streamed_response_wrapper(
+            indexes.list_vectors,
+        )
+        self.query = async_to_streamed_response_wrapper(
+            indexes.query,
+        )
+        self.upsert = async_to_streamed_response_wrapper(
+            indexes.upsert,
+        )
+
+    @cached_property
+    def metadata_index(self) -> AsyncMetadataIndexResourceWithStreamingResponse:
+        return AsyncMetadataIndexResourceWithStreamingResponse(self._indexes.metadata_index)
diff --git a/src/cloudflare/resources/vectorize/indexes/metadata_index.py b/src/cloudflare/resources/vectorize/indexes/metadata_index.py
new file mode 100644
index 00000000000..36b3d445971
--- /dev/null
+++ b/src/cloudflare/resources/vectorize/indexes/metadata_index.py
@@ -0,0 +1,421 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.vectorize.indexes import metadata_index_create_params, metadata_index_delete_params
+from ....types.vectorize.indexes.metadata_index_list_response import MetadataIndexListResponse
+from ....types.vectorize.indexes.metadata_index_create_response import MetadataIndexCreateResponse
+from ....types.vectorize.indexes.metadata_index_delete_response import MetadataIndexDeleteResponse
+
+__all__ = ["MetadataIndexResource", "AsyncMetadataIndexResource"]
+
+
+class MetadataIndexResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> MetadataIndexResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return MetadataIndexResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> MetadataIndexResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return MetadataIndexResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        index_type: Literal["string", "number", "boolean"],
+        property_name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[MetadataIndexCreateResponse]:
+        """Enable metadata filtering based on metadata property.
+
+        Limited to 10 properties.
+
+        Args:
+          account_id: Identifier
+
+          index_type: Specifies the type of metadata property to index.
+
+          property_name: Specifies the metadata property to index.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return self._post(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/metadata_index/create",
+            body=maybe_transform(
+                {
+                    "index_type": index_type,
+                    "property_name": property_name,
+                },
+                metadata_index_create_params.MetadataIndexCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[MetadataIndexCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[MetadataIndexCreateResponse]], ResultWrapper[MetadataIndexCreateResponse]),
+        )
+
+    def list(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[MetadataIndexListResponse]:
+        """
+        List Metadata Indexes for the specified Vectorize Index.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return self._get(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/metadata_index/list",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[MetadataIndexListResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[MetadataIndexListResponse]], ResultWrapper[MetadataIndexListResponse]),
+        )
+
+    def delete(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        property_name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[MetadataIndexDeleteResponse]:
+        """
+        Allow Vectorize to delete the specified metadata index.
+
+        Args:
+          account_id: Identifier
+
+          property_name: Specifies the metadata property for which the index must be deleted.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return self._post(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/metadata_index/delete",
+            body=maybe_transform(
+                {"property_name": property_name}, metadata_index_delete_params.MetadataIndexDeleteParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[MetadataIndexDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[MetadataIndexDeleteResponse]], ResultWrapper[MetadataIndexDeleteResponse]),
+        )
+
+
+class AsyncMetadataIndexResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncMetadataIndexResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncMetadataIndexResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncMetadataIndexResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncMetadataIndexResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        index_type: Literal["string", "number", "boolean"],
+        property_name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[MetadataIndexCreateResponse]:
+        """Enable metadata filtering based on metadata property.
+
+        Limited to 10 properties.
+
+        Args:
+          account_id: Identifier
+
+          index_type: Specifies the type of metadata property to index.
+
+          property_name: Specifies the metadata property to index.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return await self._post(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/metadata_index/create",
+            body=await async_maybe_transform(
+                {
+                    "index_type": index_type,
+                    "property_name": property_name,
+                },
+                metadata_index_create_params.MetadataIndexCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[MetadataIndexCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[MetadataIndexCreateResponse]], ResultWrapper[MetadataIndexCreateResponse]),
+        )
+
+    async def list(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[MetadataIndexListResponse]:
+        """
+        List Metadata Indexes for the specified Vectorize Index.
+
+        Args:
+          account_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return await self._get(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/metadata_index/list",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[MetadataIndexListResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[MetadataIndexListResponse]], ResultWrapper[MetadataIndexListResponse]),
+        )
+
+    async def delete(
+        self,
+        index_name: str,
+        *,
+        account_id: str,
+        property_name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[MetadataIndexDeleteResponse]:
+        """
+        Allow Vectorize to delete the specified metadata index.
+
+        Args:
+          account_id: Identifier
+
+          property_name: Specifies the metadata property for which the index must be deleted.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not index_name:
+            raise ValueError(f"Expected a non-empty value for `index_name` but received {index_name!r}")
+        return await self._post(
+            f"/accounts/{account_id}/vectorize/v2/indexes/{index_name}/metadata_index/delete",
+            body=await async_maybe_transform(
+                {"property_name": property_name}, metadata_index_delete_params.MetadataIndexDeleteParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[MetadataIndexDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[MetadataIndexDeleteResponse]], ResultWrapper[MetadataIndexDeleteResponse]),
+        )
+
+
+class MetadataIndexResourceWithRawResponse:
+    def __init__(self, metadata_index: MetadataIndexResource) -> None:
+        self._metadata_index = metadata_index
+
+        self.create = to_raw_response_wrapper(
+            metadata_index.create,
+        )
+        self.list = to_raw_response_wrapper(
+            metadata_index.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            metadata_index.delete,
+        )
+
+
+class AsyncMetadataIndexResourceWithRawResponse:
+    def __init__(self, metadata_index: AsyncMetadataIndexResource) -> None:
+        self._metadata_index = metadata_index
+
+        self.create = async_to_raw_response_wrapper(
+            metadata_index.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            metadata_index.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            metadata_index.delete,
+        )
+
+
+class MetadataIndexResourceWithStreamingResponse:
+    def __init__(self, metadata_index: MetadataIndexResource) -> None:
+        self._metadata_index = metadata_index
+
+        self.create = to_streamed_response_wrapper(
+            metadata_index.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            metadata_index.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            metadata_index.delete,
+        )
+
+
+class AsyncMetadataIndexResourceWithStreamingResponse:
+    def __init__(self, metadata_index: AsyncMetadataIndexResource) -> None:
+        self._metadata_index = metadata_index
+
+        self.create = async_to_streamed_response_wrapper(
+            metadata_index.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            metadata_index.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            metadata_index.delete,
+        )
diff --git a/src/cloudflare/resources/vectorize/vectorize.py b/src/cloudflare/resources/vectorize/vectorize.py
index 189d1279ebc..e0dc5e6e4d2 100644
--- a/src/cloudflare/resources/vectorize/vectorize.py
+++ b/src/cloudflare/resources/vectorize/vectorize.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .indexes import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .indexes.indexes import (
     IndexesResource,
     AsyncIndexesResource,
     IndexesResourceWithRawResponse,
@@ -10,8 +12,6 @@
     IndexesResourceWithStreamingResponse,
     AsyncIndexesResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
 
 __all__ = ["VectorizeResource", "AsyncVectorizeResource"]
 
@@ -23,10 +23,21 @@ def indexes(self) -> IndexesResource:
 
     @cached_property
     def with_raw_response(self) -> VectorizeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return VectorizeResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> VectorizeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return VectorizeResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def indexes(self) -> AsyncIndexesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncVectorizeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncVectorizeResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncVectorizeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncVectorizeResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/waiting_rooms/events/details.py b/src/cloudflare/resources/waiting_rooms/events/details.py
index 4496d35d42f..0d73f1971a2 100644
--- a/src/cloudflare/resources/waiting_rooms/events/details.py
+++ b/src/cloudflare/resources/waiting_rooms/events/details.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -25,10 +25,21 @@
 class DetailsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DetailsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DetailsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DetailsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DetailsResourceWithStreamingResponse(self)
 
     def get(
@@ -42,7 +53,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> DetailGetResponse:
         """Previews an event's configuration as if it was active.
 
@@ -50,7 +61,7 @@ def get(
         waiting room will be displayed with their current values.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -82,10 +93,21 @@ def get(
 class AsyncDetailsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDetailsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDetailsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDetailsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDetailsResourceWithStreamingResponse(self)
 
     async def get(
@@ -99,7 +121,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> DetailGetResponse:
         """Previews an event's configuration as if it was active.
 
@@ -107,7 +129,7 @@ async def get(
         waiting room will be displayed with their current values.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/waiting_rooms/events/events.py b/src/cloudflare/resources/waiting_rooms/events/events.py
index f070f985934..8acaec8e460 100644
--- a/src/cloudflare/resources/waiting_rooms/events/events.py
+++ b/src/cloudflare/resources/waiting_rooms/events/events.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from typing import Type, Optional, cast
+from typing_extensions import Literal
 
 import httpx
 
@@ -14,11 +15,8 @@
     DetailsResourceWithStreamingResponse,
     AsyncDetailsResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -28,7 +26,7 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ....pagination import SyncSinglePage, AsyncSinglePage
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ...._base_client import AsyncPaginator, make_request_options
 from ....types.waiting_rooms import event_edit_params, event_list_params, event_create_params, event_update_params
 from ....types.waiting_rooms.event import Event
@@ -44,10 +42,21 @@ def details(self) -> DetailsResource:
 
     @cached_property
     def with_raw_response(self) -> EventsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return EventsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> EventsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return EventsResourceWithStreamingResponse(self)
 
     def create(
@@ -58,22 +67,25 @@ def create(
         event_end_time: str,
         event_start_time: str,
         name: str,
-        custom_page_html: Optional[str] | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        disable_session_renewal: Optional[bool] | NotGiven = NOT_GIVEN,
-        new_users_per_minute: Optional[int] | NotGiven = NOT_GIVEN,
-        prequeue_start_time: Optional[str] | NotGiven = NOT_GIVEN,
-        queueing_method: Optional[str] | NotGiven = NOT_GIVEN,
-        session_duration: Optional[int] | NotGiven = NOT_GIVEN,
-        shuffle_at_event_start: bool | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
-        total_active_users: Optional[int] | NotGiven = NOT_GIVEN,
+        custom_page_html: Optional[str] | Omit = omit,
+        description: str | Omit = omit,
+        disable_session_renewal: Optional[bool] | Omit = omit,
+        new_users_per_minute: Optional[int] | Omit = omit,
+        prequeue_start_time: Optional[str] | Omit = omit,
+        queueing_method: Optional[str] | Omit = omit,
+        session_duration: Optional[int] | Omit = omit,
+        shuffle_at_event_start: bool | Omit = omit,
+        suspended: bool | Omit = omit,
+        total_active_users: Optional[int] | Omit = omit,
+        turnstile_action: Optional[Literal["log", "infinite_queue"]] | Omit = omit,
+        turnstile_mode: Optional[Literal["off", "invisible", "visible_non_interactive", "visible_managed"]]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Event:
         """Only available for the Waiting Room Advanced subscription.
 
@@ -85,7 +97,7 @@ def create(
         with each other, so only one event can be active at a time.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           event_end_time: An ISO 8601 timestamp that marks the end of the event.
 
@@ -132,6 +144,12 @@ def create(
               while it is active. If null, the event will inherit it. This can only be set if
               the event's `new_users_per_minute` property is also set.
 
+          turnstile_action: If set, the event will override the waiting room's `turnstile_action` property
+              while it is active. If null, the event will inherit it.
+
+          turnstile_mode: If set, the event will override the waiting room's `turnstile_mode` property
+              while it is active. If null, the event will inherit it.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -161,6 +179,8 @@ def create(
                     "shuffle_at_event_start": shuffle_at_event_start,
                     "suspended": suspended,
                     "total_active_users": total_active_users,
+                    "turnstile_action": turnstile_action,
+                    "turnstile_mode": turnstile_mode,
                 },
                 event_create_params.EventCreateParams,
             ),
@@ -183,28 +203,31 @@ def update(
         event_end_time: str,
         event_start_time: str,
         name: str,
-        custom_page_html: Optional[str] | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        disable_session_renewal: Optional[bool] | NotGiven = NOT_GIVEN,
-        new_users_per_minute: Optional[int] | NotGiven = NOT_GIVEN,
-        prequeue_start_time: Optional[str] | NotGiven = NOT_GIVEN,
-        queueing_method: Optional[str] | NotGiven = NOT_GIVEN,
-        session_duration: Optional[int] | NotGiven = NOT_GIVEN,
-        shuffle_at_event_start: bool | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
-        total_active_users: Optional[int] | NotGiven = NOT_GIVEN,
+        custom_page_html: Optional[str] | Omit = omit,
+        description: str | Omit = omit,
+        disable_session_renewal: Optional[bool] | Omit = omit,
+        new_users_per_minute: Optional[int] | Omit = omit,
+        prequeue_start_time: Optional[str] | Omit = omit,
+        queueing_method: Optional[str] | Omit = omit,
+        session_duration: Optional[int] | Omit = omit,
+        shuffle_at_event_start: bool | Omit = omit,
+        suspended: bool | Omit = omit,
+        total_active_users: Optional[int] | Omit = omit,
+        turnstile_action: Optional[Literal["log", "infinite_queue"]] | Omit = omit,
+        turnstile_mode: Optional[Literal["off", "invisible", "visible_non_interactive", "visible_managed"]]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Event:
         """
         Updates a configured event for a waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           event_end_time: An ISO 8601 timestamp that marks the end of the event.
 
@@ -251,6 +274,12 @@ def update(
               while it is active. If null, the event will inherit it. This can only be set if
               the event's `new_users_per_minute` property is also set.
 
+          turnstile_action: If set, the event will override the waiting room's `turnstile_action` property
+              while it is active. If null, the event will inherit it.
+
+          turnstile_mode: If set, the event will override the waiting room's `turnstile_mode` property
+              while it is active. If null, the event will inherit it.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -282,6 +311,8 @@ def update(
                     "shuffle_at_event_start": shuffle_at_event_start,
                     "suspended": suspended,
                     "total_active_users": total_active_users,
+                    "turnstile_action": turnstile_action,
+                    "turnstile_mode": turnstile_mode,
                 },
                 event_update_params.EventUpdateParams,
             ),
@@ -300,20 +331,20 @@ def list(
         waiting_room_id: str,
         *,
         zone_id: str,
-        page: object | NotGiven = NOT_GIVEN,
-        per_page: object | NotGiven = NOT_GIVEN,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[Event]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[Event]:
         """
         Lists events for a waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           page: Page number of paginated results.
 
@@ -333,7 +364,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `waiting_room_id` but received {waiting_room_id!r}")
         return self._get_api_list(
             f"/zones/{zone_id}/waiting_rooms/{waiting_room_id}/events",
-            page=SyncSinglePage[Event],
+            page=SyncV4PagePaginationArray[Event],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -361,13 +392,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> EventDeleteResponse:
         """
         Deletes an event for a waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -404,28 +435,31 @@ def edit(
         event_end_time: str,
         event_start_time: str,
         name: str,
-        custom_page_html: Optional[str] | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        disable_session_renewal: Optional[bool] | NotGiven = NOT_GIVEN,
-        new_users_per_minute: Optional[int] | NotGiven = NOT_GIVEN,
-        prequeue_start_time: Optional[str] | NotGiven = NOT_GIVEN,
-        queueing_method: Optional[str] | NotGiven = NOT_GIVEN,
-        session_duration: Optional[int] | NotGiven = NOT_GIVEN,
-        shuffle_at_event_start: bool | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
-        total_active_users: Optional[int] | NotGiven = NOT_GIVEN,
+        custom_page_html: Optional[str] | Omit = omit,
+        description: str | Omit = omit,
+        disable_session_renewal: Optional[bool] | Omit = omit,
+        new_users_per_minute: Optional[int] | Omit = omit,
+        prequeue_start_time: Optional[str] | Omit = omit,
+        queueing_method: Optional[str] | Omit = omit,
+        session_duration: Optional[int] | Omit = omit,
+        shuffle_at_event_start: bool | Omit = omit,
+        suspended: bool | Omit = omit,
+        total_active_users: Optional[int] | Omit = omit,
+        turnstile_action: Optional[Literal["log", "infinite_queue"]] | Omit = omit,
+        turnstile_mode: Optional[Literal["off", "invisible", "visible_non_interactive", "visible_managed"]]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Event:
         """
         Patches a configured event for a waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           event_end_time: An ISO 8601 timestamp that marks the end of the event.
 
@@ -472,6 +506,12 @@ def edit(
               while it is active. If null, the event will inherit it. This can only be set if
               the event's `new_users_per_minute` property is also set.
 
+          turnstile_action: If set, the event will override the waiting room's `turnstile_action` property
+              while it is active. If null, the event will inherit it.
+
+          turnstile_mode: If set, the event will override the waiting room's `turnstile_mode` property
+              while it is active. If null, the event will inherit it.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -503,6 +543,8 @@ def edit(
                     "shuffle_at_event_start": shuffle_at_event_start,
                     "suspended": suspended,
                     "total_active_users": total_active_users,
+                    "turnstile_action": turnstile_action,
+                    "turnstile_mode": turnstile_mode,
                 },
                 event_edit_params.EventEditParams,
             ),
@@ -527,13 +569,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Event:
         """
         Fetches a single configured event for a waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -569,10 +611,21 @@ def details(self) -> AsyncDetailsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncEventsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncEventsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncEventsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncEventsResourceWithStreamingResponse(self)
 
     async def create(
@@ -583,22 +636,25 @@ async def create(
         event_end_time: str,
         event_start_time: str,
         name: str,
-        custom_page_html: Optional[str] | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        disable_session_renewal: Optional[bool] | NotGiven = NOT_GIVEN,
-        new_users_per_minute: Optional[int] | NotGiven = NOT_GIVEN,
-        prequeue_start_time: Optional[str] | NotGiven = NOT_GIVEN,
-        queueing_method: Optional[str] | NotGiven = NOT_GIVEN,
-        session_duration: Optional[int] | NotGiven = NOT_GIVEN,
-        shuffle_at_event_start: bool | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
-        total_active_users: Optional[int] | NotGiven = NOT_GIVEN,
+        custom_page_html: Optional[str] | Omit = omit,
+        description: str | Omit = omit,
+        disable_session_renewal: Optional[bool] | Omit = omit,
+        new_users_per_minute: Optional[int] | Omit = omit,
+        prequeue_start_time: Optional[str] | Omit = omit,
+        queueing_method: Optional[str] | Omit = omit,
+        session_duration: Optional[int] | Omit = omit,
+        shuffle_at_event_start: bool | Omit = omit,
+        suspended: bool | Omit = omit,
+        total_active_users: Optional[int] | Omit = omit,
+        turnstile_action: Optional[Literal["log", "infinite_queue"]] | Omit = omit,
+        turnstile_mode: Optional[Literal["off", "invisible", "visible_non_interactive", "visible_managed"]]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Event:
         """Only available for the Waiting Room Advanced subscription.
 
@@ -610,7 +666,7 @@ async def create(
         with each other, so only one event can be active at a time.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           event_end_time: An ISO 8601 timestamp that marks the end of the event.
 
@@ -657,6 +713,12 @@ async def create(
               while it is active. If null, the event will inherit it. This can only be set if
               the event's `new_users_per_minute` property is also set.
 
+          turnstile_action: If set, the event will override the waiting room's `turnstile_action` property
+              while it is active. If null, the event will inherit it.
+
+          turnstile_mode: If set, the event will override the waiting room's `turnstile_mode` property
+              while it is active. If null, the event will inherit it.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -686,6 +748,8 @@ async def create(
                     "shuffle_at_event_start": shuffle_at_event_start,
                     "suspended": suspended,
                     "total_active_users": total_active_users,
+                    "turnstile_action": turnstile_action,
+                    "turnstile_mode": turnstile_mode,
                 },
                 event_create_params.EventCreateParams,
             ),
@@ -708,28 +772,31 @@ async def update(
         event_end_time: str,
         event_start_time: str,
         name: str,
-        custom_page_html: Optional[str] | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        disable_session_renewal: Optional[bool] | NotGiven = NOT_GIVEN,
-        new_users_per_minute: Optional[int] | NotGiven = NOT_GIVEN,
-        prequeue_start_time: Optional[str] | NotGiven = NOT_GIVEN,
-        queueing_method: Optional[str] | NotGiven = NOT_GIVEN,
-        session_duration: Optional[int] | NotGiven = NOT_GIVEN,
-        shuffle_at_event_start: bool | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
-        total_active_users: Optional[int] | NotGiven = NOT_GIVEN,
+        custom_page_html: Optional[str] | Omit = omit,
+        description: str | Omit = omit,
+        disable_session_renewal: Optional[bool] | Omit = omit,
+        new_users_per_minute: Optional[int] | Omit = omit,
+        prequeue_start_time: Optional[str] | Omit = omit,
+        queueing_method: Optional[str] | Omit = omit,
+        session_duration: Optional[int] | Omit = omit,
+        shuffle_at_event_start: bool | Omit = omit,
+        suspended: bool | Omit = omit,
+        total_active_users: Optional[int] | Omit = omit,
+        turnstile_action: Optional[Literal["log", "infinite_queue"]] | Omit = omit,
+        turnstile_mode: Optional[Literal["off", "invisible", "visible_non_interactive", "visible_managed"]]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Event:
         """
         Updates a configured event for a waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           event_end_time: An ISO 8601 timestamp that marks the end of the event.
 
@@ -776,6 +843,12 @@ async def update(
               while it is active. If null, the event will inherit it. This can only be set if
               the event's `new_users_per_minute` property is also set.
 
+          turnstile_action: If set, the event will override the waiting room's `turnstile_action` property
+              while it is active. If null, the event will inherit it.
+
+          turnstile_mode: If set, the event will override the waiting room's `turnstile_mode` property
+              while it is active. If null, the event will inherit it.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -807,6 +880,8 @@ async def update(
                     "shuffle_at_event_start": shuffle_at_event_start,
                     "suspended": suspended,
                     "total_active_users": total_active_users,
+                    "turnstile_action": turnstile_action,
+                    "turnstile_mode": turnstile_mode,
                 },
                 event_update_params.EventUpdateParams,
             ),
@@ -825,20 +900,20 @@ def list(
         waiting_room_id: str,
         *,
         zone_id: str,
-        page: object | NotGiven = NOT_GIVEN,
-        per_page: object | NotGiven = NOT_GIVEN,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[Event, AsyncSinglePage[Event]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Event, AsyncV4PagePaginationArray[Event]]:
         """
         Lists events for a waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           page: Page number of paginated results.
 
@@ -858,7 +933,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `waiting_room_id` but received {waiting_room_id!r}")
         return self._get_api_list(
             f"/zones/{zone_id}/waiting_rooms/{waiting_room_id}/events",
-            page=AsyncSinglePage[Event],
+            page=AsyncV4PagePaginationArray[Event],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -886,13 +961,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> EventDeleteResponse:
         """
         Deletes an event for a waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -929,28 +1004,31 @@ async def edit(
         event_end_time: str,
         event_start_time: str,
         name: str,
-        custom_page_html: Optional[str] | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        disable_session_renewal: Optional[bool] | NotGiven = NOT_GIVEN,
-        new_users_per_minute: Optional[int] | NotGiven = NOT_GIVEN,
-        prequeue_start_time: Optional[str] | NotGiven = NOT_GIVEN,
-        queueing_method: Optional[str] | NotGiven = NOT_GIVEN,
-        session_duration: Optional[int] | NotGiven = NOT_GIVEN,
-        shuffle_at_event_start: bool | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
-        total_active_users: Optional[int] | NotGiven = NOT_GIVEN,
+        custom_page_html: Optional[str] | Omit = omit,
+        description: str | Omit = omit,
+        disable_session_renewal: Optional[bool] | Omit = omit,
+        new_users_per_minute: Optional[int] | Omit = omit,
+        prequeue_start_time: Optional[str] | Omit = omit,
+        queueing_method: Optional[str] | Omit = omit,
+        session_duration: Optional[int] | Omit = omit,
+        shuffle_at_event_start: bool | Omit = omit,
+        suspended: bool | Omit = omit,
+        total_active_users: Optional[int] | Omit = omit,
+        turnstile_action: Optional[Literal["log", "infinite_queue"]] | Omit = omit,
+        turnstile_mode: Optional[Literal["off", "invisible", "visible_non_interactive", "visible_managed"]]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Event:
         """
         Patches a configured event for a waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           event_end_time: An ISO 8601 timestamp that marks the end of the event.
 
@@ -997,6 +1075,12 @@ async def edit(
               while it is active. If null, the event will inherit it. This can only be set if
               the event's `new_users_per_minute` property is also set.
 
+          turnstile_action: If set, the event will override the waiting room's `turnstile_action` property
+              while it is active. If null, the event will inherit it.
+
+          turnstile_mode: If set, the event will override the waiting room's `turnstile_mode` property
+              while it is active. If null, the event will inherit it.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -1028,6 +1112,8 @@ async def edit(
                     "shuffle_at_event_start": shuffle_at_event_start,
                     "suspended": suspended,
                     "total_active_users": total_active_users,
+                    "turnstile_action": turnstile_action,
+                    "turnstile_mode": turnstile_mode,
                 },
                 event_edit_params.EventEditParams,
             ),
@@ -1052,13 +1138,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Event:
         """
         Fetches a single configured event for a waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/waiting_rooms/page.py b/src/cloudflare/resources/waiting_rooms/page.py
index e77b2a77148..feb0406b555 100644
--- a/src/cloudflare/resources/waiting_rooms/page.py
+++ b/src/cloudflare/resources/waiting_rooms/page.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -30,10 +27,21 @@
 class PageResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PageResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PageResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PageResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PageResourceWithStreamingResponse(self)
 
     def preview(
@@ -46,7 +54,7 @@ def preview(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PagePreviewResponse:
         """Creates a waiting room page preview.
 
@@ -66,7 +74,7 @@ def preview(
              waiting room page will only be displayed if `force_queue=true` or
              `event=prequeueing` — for other cases the request will pass through to the
              origin. For our preview, this will be a fake origin website returning
-             "Welcome".
+             \"Welcome\".
            - **reject** indicates a Reject queue.
         4. `event`: Used to preview a waiting room event.
            - **none** indicates no event is occurring.
@@ -88,7 +96,7 @@ def preview(
         wait time as 50 minutes.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           custom_html: Only available for the Waiting Room Advanced subscription. This is a template
               html file that will be rendered at the edge. If no custom_page_html is provided,
@@ -139,10 +147,21 @@ def preview(
 class AsyncPageResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPageResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPageResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPageResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPageResourceWithStreamingResponse(self)
 
     async def preview(
@@ -155,7 +174,7 @@ async def preview(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> PagePreviewResponse:
         """Creates a waiting room page preview.
 
@@ -175,7 +194,7 @@ async def preview(
              waiting room page will only be displayed if `force_queue=true` or
              `event=prequeueing` — for other cases the request will pass through to the
              origin. For our preview, this will be a fake origin website returning
-             "Welcome".
+             \"Welcome\".
            - **reject** indicates a Reject queue.
         4. `event`: Used to preview a waiting room event.
            - **none** indicates no event is occurring.
@@ -197,7 +216,7 @@ async def preview(
         wait time as 50 minutes.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           custom_html: Only available for the Waiting Room Advanced subscription. This is a template
               html file that will be rendered at the edge. If no custom_page_html is provided,
diff --git a/src/cloudflare/resources/waiting_rooms/rules.py b/src/cloudflare/resources/waiting_rooms/rules.py
index 03de4d31c7c..7bf2947760f 100644
--- a/src/cloudflare/resources/waiting_rooms/rules.py
+++ b/src/cloudflare/resources/waiting_rooms/rules.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Type, Iterable, Optional, cast
+from typing import Iterable
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -20,15 +17,10 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._wrappers import ResultWrapper
 from ...pagination import SyncSinglePage, AsyncSinglePage
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.waiting_rooms import rule_edit_params, rule_create_params, rule_update_params
 from ...types.waiting_rooms.waiting_room_rule import WaitingRoomRule
-from ...types.waiting_rooms.rule_edit_response import RuleEditResponse
-from ...types.waiting_rooms.rule_create_response import RuleCreateResponse
-from ...types.waiting_rooms.rule_delete_response import RuleDeleteResponse
-from ...types.waiting_rooms.rule_update_response import RuleUpdateResponse
 
 __all__ = ["RulesResource", "AsyncRulesResource"]
 
@@ -36,10 +28,21 @@
 class RulesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RulesResourceWithStreamingResponse(self)
 
     def create(
@@ -47,32 +50,21 @@ def create(
         waiting_room_id: str,
         *,
         zone_id: str,
-        action: Literal["bypass_waiting_room"],
-        expression: str,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
+        rules: rule_create_params.Rules,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RuleCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[WaitingRoomRule]:
         """Only available for the Waiting Room Advanced subscription.
 
         Creates a rule for a
         waiting room.
 
         Args:
-          zone_id: Identifier
-
-          action: The action to take when the expression matches.
-
-          expression: Criteria defining when there is a match for the current rule.
-
-          description: The description of the rule.
-
-          enabled: When set to true, the rule is enabled.
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -86,25 +78,15 @@ def create(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not waiting_room_id:
             raise ValueError(f"Expected a non-empty value for `waiting_room_id` but received {waiting_room_id!r}")
-        return self._post(
+        return self._get_api_list(
             f"/zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules",
-            body=maybe_transform(
-                {
-                    "action": action,
-                    "expression": expression,
-                    "description": description,
-                    "enabled": enabled,
-                },
-                rule_create_params.RuleCreateParams,
-            ),
+            page=SyncSinglePage[WaitingRoomRule],
+            body=maybe_transform(rules, rule_create_params.RuleCreateParams),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RuleCreateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RuleCreateResponse]], ResultWrapper[RuleCreateResponse]),
+            model=WaitingRoomRule,
+            method="post",
         )
 
     def update(
@@ -112,64 +94,21 @@ def update(
         waiting_room_id: str,
         *,
         zone_id: str,
-        body: Iterable[rule_update_params.Body],
+        rules: Iterable[rule_update_params.Rule],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RuleUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[WaitingRoomRule]:
         """Only available for the Waiting Room Advanced subscription.
 
         Replaces all rules
         for a waiting room.
 
         Args:
-          zone_id: Identifier
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        if not waiting_room_id:
-            raise ValueError(f"Expected a non-empty value for `waiting_room_id` but received {waiting_room_id!r}")
-        return self._put(
-            f"/zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules",
-            body=maybe_transform(body, rule_update_params.RuleUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RuleUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[RuleUpdateResponse]], ResultWrapper[RuleUpdateResponse]),
-        )
-
-    def list(
-        self,
-        waiting_room_id: str,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[WaitingRoomRule]:
-        """
-        Lists rules for a waiting room.
-
-        Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -186,10 +125,12 @@ def list(
         return self._get_api_list(
             f"/zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules",
             page=SyncSinglePage[WaitingRoomRule],
+            body=maybe_transform(rules, Iterable[rule_update_params.Rule]),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
             model=WaitingRoomRule,
+            method="put",
         )
 
     def delete(
@@ -203,13 +144,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RuleDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[WaitingRoomRule]:
         """
         Deletes a rule for a waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           rule_id: The ID of the rule.
 
@@ -227,16 +168,14 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `waiting_room_id` but received {waiting_room_id!r}")
         if not rule_id:
             raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
-        return self._delete(
+        return self._get_api_list(
             f"/zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules/{rule_id}",
+            page=SyncSinglePage[WaitingRoomRule],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RuleDeleteResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RuleDeleteResponse]], ResultWrapper[RuleDeleteResponse]),
+            model=WaitingRoomRule,
+            method="delete",
         )
 
     def edit(
@@ -247,21 +186,21 @@ def edit(
         waiting_room_id: str,
         action: Literal["bypass_waiting_room"],
         expression: str,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        position: rule_edit_params.Position | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        position: rule_edit_params.Position | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RuleEditResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[WaitingRoomRule]:
         """
         Patches a rule for a waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           rule_id: The ID of the rule.
 
@@ -289,8 +228,9 @@ def edit(
             raise ValueError(f"Expected a non-empty value for `waiting_room_id` but received {waiting_room_id!r}")
         if not rule_id:
             raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
-        return self._patch(
+        return self._get_api_list(
             f"/zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules/{rule_id}",
+            page=SyncSinglePage[WaitingRoomRule],
             body=maybe_transform(
                 {
                     "action": action,
@@ -302,56 +242,29 @@ def edit(
                 rule_edit_params.RuleEditParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RuleEditResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RuleEditResponse]], ResultWrapper[RuleEditResponse]),
+            model=WaitingRoomRule,
+            method="patch",
         )
 
-
-class AsyncRulesResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncRulesResourceWithRawResponse:
-        return AsyncRulesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncRulesResourceWithStreamingResponse:
-        return AsyncRulesResourceWithStreamingResponse(self)
-
-    async def create(
+    def get(
         self,
         waiting_room_id: str,
         *,
         zone_id: str,
-        action: Literal["bypass_waiting_room"],
-        expression: str,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RuleCreateResponse]:
-        """Only available for the Waiting Room Advanced subscription.
-
-        Creates a rule for a
-        waiting room.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[WaitingRoomRule]:
+        """
+        Lists rules for a waiting room.
 
         Args:
-          zone_id: Identifier
-
-          action: The action to take when the expression matches.
-
-          expression: Criteria defining when there is a match for the current rule.
-
-          description: The description of the rule.
-
-          enabled: When set to true, the rule is enabled.
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -365,47 +278,56 @@ async def create(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not waiting_room_id:
             raise ValueError(f"Expected a non-empty value for `waiting_room_id` but received {waiting_room_id!r}")
-        return await self._post(
+        return self._get_api_list(
             f"/zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules",
-            body=await async_maybe_transform(
-                {
-                    "action": action,
-                    "expression": expression,
-                    "description": description,
-                    "enabled": enabled,
-                },
-                rule_create_params.RuleCreateParams,
-            ),
+            page=SyncSinglePage[WaitingRoomRule],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RuleCreateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RuleCreateResponse]], ResultWrapper[RuleCreateResponse]),
+            model=WaitingRoomRule,
         )
 
-    async def update(
+
+class AsyncRulesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncRulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncRulesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncRulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncRulesResourceWithStreamingResponse(self)
+
+    def create(
         self,
         waiting_room_id: str,
         *,
         zone_id: str,
-        body: Iterable[rule_update_params.Body],
+        rules: rule_create_params.Rules,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RuleUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[WaitingRoomRule, AsyncSinglePage[WaitingRoomRule]]:
         """Only available for the Waiting Room Advanced subscription.
 
-        Replaces all rules
-        for a waiting room.
+        Creates a rule for a
+        waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -419,36 +341,37 @@ async def update(
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not waiting_room_id:
             raise ValueError(f"Expected a non-empty value for `waiting_room_id` but received {waiting_room_id!r}")
-        return await self._put(
+        return self._get_api_list(
             f"/zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules",
-            body=await async_maybe_transform(body, rule_update_params.RuleUpdateParams),
+            page=AsyncSinglePage[WaitingRoomRule],
+            body=maybe_transform(rules, rule_create_params.RuleCreateParams),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RuleUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RuleUpdateResponse]], ResultWrapper[RuleUpdateResponse]),
+            model=WaitingRoomRule,
+            method="post",
         )
 
-    def list(
+    def update(
         self,
         waiting_room_id: str,
         *,
         zone_id: str,
+        rules: Iterable[rule_update_params.Rule],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[WaitingRoomRule, AsyncSinglePage[WaitingRoomRule]]:
-        """
-        Lists rules for a waiting room.
+        """Only available for the Waiting Room Advanced subscription.
+
+        Replaces all rules
+        for a waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -465,13 +388,15 @@ def list(
         return self._get_api_list(
             f"/zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules",
             page=AsyncSinglePage[WaitingRoomRule],
+            body=maybe_transform(rules, Iterable[rule_update_params.Rule]),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
             model=WaitingRoomRule,
+            method="put",
         )
 
-    async def delete(
+    def delete(
         self,
         rule_id: str,
         *,
@@ -482,13 +407,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RuleDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[WaitingRoomRule, AsyncSinglePage[WaitingRoomRule]]:
         """
         Deletes a rule for a waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           rule_id: The ID of the rule.
 
@@ -506,19 +431,17 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `waiting_room_id` but received {waiting_room_id!r}")
         if not rule_id:
             raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
-        return await self._delete(
+        return self._get_api_list(
             f"/zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules/{rule_id}",
+            page=AsyncSinglePage[WaitingRoomRule],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RuleDeleteResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RuleDeleteResponse]], ResultWrapper[RuleDeleteResponse]),
+            model=WaitingRoomRule,
+            method="delete",
         )
 
-    async def edit(
+    def edit(
         self,
         rule_id: str,
         *,
@@ -526,21 +449,21 @@ async def edit(
         waiting_room_id: str,
         action: Literal["bypass_waiting_room"],
         expression: str,
-        description: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        position: rule_edit_params.Position | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        position: rule_edit_params.Position | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RuleEditResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[WaitingRoomRule, AsyncSinglePage[WaitingRoomRule]]:
         """
         Patches a rule for a waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           rule_id: The ID of the rule.
 
@@ -568,9 +491,10 @@ async def edit(
             raise ValueError(f"Expected a non-empty value for `waiting_room_id` but received {waiting_room_id!r}")
         if not rule_id:
             raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
-        return await self._patch(
+        return self._get_api_list(
             f"/zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules/{rule_id}",
-            body=await async_maybe_transform(
+            page=AsyncSinglePage[WaitingRoomRule],
+            body=maybe_transform(
                 {
                     "action": action,
                     "expression": expression,
@@ -581,13 +505,49 @@ async def edit(
                 rule_edit_params.RuleEditParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[RuleEditResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=WaitingRoomRule,
+            method="patch",
+        )
+
+    def get(
+        self,
+        waiting_room_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[WaitingRoomRule, AsyncSinglePage[WaitingRoomRule]]:
+        """
+        Lists rules for a waiting room.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not waiting_room_id:
+            raise ValueError(f"Expected a non-empty value for `waiting_room_id` but received {waiting_room_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules",
+            page=AsyncSinglePage[WaitingRoomRule],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RuleEditResponse]], ResultWrapper[RuleEditResponse]),
+            model=WaitingRoomRule,
         )
 
 
@@ -601,15 +561,15 @@ def __init__(self, rules: RulesResource) -> None:
         self.update = to_raw_response_wrapper(
             rules.update,
         )
-        self.list = to_raw_response_wrapper(
-            rules.list,
-        )
         self.delete = to_raw_response_wrapper(
             rules.delete,
         )
         self.edit = to_raw_response_wrapper(
             rules.edit,
         )
+        self.get = to_raw_response_wrapper(
+            rules.get,
+        )
 
 
 class AsyncRulesResourceWithRawResponse:
@@ -622,15 +582,15 @@ def __init__(self, rules: AsyncRulesResource) -> None:
         self.update = async_to_raw_response_wrapper(
             rules.update,
         )
-        self.list = async_to_raw_response_wrapper(
-            rules.list,
-        )
         self.delete = async_to_raw_response_wrapper(
             rules.delete,
         )
         self.edit = async_to_raw_response_wrapper(
             rules.edit,
         )
+        self.get = async_to_raw_response_wrapper(
+            rules.get,
+        )
 
 
 class RulesResourceWithStreamingResponse:
@@ -643,15 +603,15 @@ def __init__(self, rules: RulesResource) -> None:
         self.update = to_streamed_response_wrapper(
             rules.update,
         )
-        self.list = to_streamed_response_wrapper(
-            rules.list,
-        )
         self.delete = to_streamed_response_wrapper(
             rules.delete,
         )
         self.edit = to_streamed_response_wrapper(
             rules.edit,
         )
+        self.get = to_streamed_response_wrapper(
+            rules.get,
+        )
 
 
 class AsyncRulesResourceWithStreamingResponse:
@@ -664,12 +624,12 @@ def __init__(self, rules: AsyncRulesResource) -> None:
         self.update = async_to_streamed_response_wrapper(
             rules.update,
         )
-        self.list = async_to_streamed_response_wrapper(
-            rules.list,
-        )
         self.delete = async_to_streamed_response_wrapper(
             rules.delete,
         )
         self.edit = async_to_streamed_response_wrapper(
             rules.edit,
         )
+        self.get = async_to_streamed_response_wrapper(
+            rules.get,
+        )
diff --git a/src/cloudflare/resources/waiting_rooms/settings.py b/src/cloudflare/resources/waiting_rooms/settings.py
index b3cc49bc001..0b4b94ed3d3 100644
--- a/src/cloudflare/resources/waiting_rooms/settings.py
+++ b/src/cloudflare/resources/waiting_rooms/settings.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -32,29 +29,40 @@
 class SettingsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SettingsResourceWithStreamingResponse(self)
 
     def update(
         self,
         *,
         zone_id: str,
-        search_engine_crawler_bypass: bool | NotGiven = NOT_GIVEN,
+        search_engine_crawler_bypass: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SettingUpdateResponse:
         """
         Update zone-level Waiting Room settings
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           search_engine_crawler_bypass: Whether to allow verified search engine crawlers to bypass all waiting rooms on
               this zone. Verified search engine crawlers will not be tracked or counted by the
@@ -90,19 +98,19 @@ def edit(
         self,
         *,
         zone_id: str,
-        search_engine_crawler_bypass: bool | NotGiven = NOT_GIVEN,
+        search_engine_crawler_bypass: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SettingEditResponse:
         """
         Patch zone-level Waiting Room settings
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           search_engine_crawler_bypass: Whether to allow verified search engine crawlers to bypass all waiting rooms on
               this zone. Verified search engine crawlers will not be tracked or counted by the
@@ -142,13 +150,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SettingGetResponse:
         """
         Get zone-level Waiting Room settings
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -176,29 +184,40 @@ def get(
 class AsyncSettingsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSettingsResourceWithStreamingResponse(self)
 
     async def update(
         self,
         *,
         zone_id: str,
-        search_engine_crawler_bypass: bool | NotGiven = NOT_GIVEN,
+        search_engine_crawler_bypass: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SettingUpdateResponse:
         """
         Update zone-level Waiting Room settings
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           search_engine_crawler_bypass: Whether to allow verified search engine crawlers to bypass all waiting rooms on
               this zone. Verified search engine crawlers will not be tracked or counted by the
@@ -234,19 +253,19 @@ async def edit(
         self,
         *,
         zone_id: str,
-        search_engine_crawler_bypass: bool | NotGiven = NOT_GIVEN,
+        search_engine_crawler_bypass: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SettingEditResponse:
         """
         Patch zone-level Waiting Room settings
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           search_engine_crawler_bypass: Whether to allow verified search engine crawlers to bypass all waiting rooms on
               this zone. Verified search engine crawlers will not be tracked or counted by the
@@ -286,13 +305,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SettingGetResponse:
         """
         Get zone-level Waiting Room settings
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/waiting_rooms/statuses.py b/src/cloudflare/resources/waiting_rooms/statuses.py
index c09b4a8e29b..9be4bcdf91a 100644
--- a/src/cloudflare/resources/waiting_rooms/statuses.py
+++ b/src/cloudflare/resources/waiting_rooms/statuses.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Query, Headers, NotGiven, not_given
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -25,10 +25,21 @@
 class StatusesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> StatusesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return StatusesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> StatusesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return StatusesResourceWithStreamingResponse(self)
 
     def get(
@@ -41,7 +52,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> StatusGetResponse:
         """Fetches the status of a configured waiting room.
 
@@ -55,6 +66,7 @@ def get(
              held in the waiting room.
            - **event_prequeueing** indicates that an event is active and is currently
              prequeueing users before it starts.
+           - **suspended** indicates that the room is suspended.
         2. `event_id`: String of the current event's `id` if an event is active,
            otherwise an empty string.
         3. `estimated_queued_users`: Integer of the estimated number of users currently
@@ -65,7 +77,7 @@ def get(
            presented to the users.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -95,10 +107,21 @@ def get(
 class AsyncStatusesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncStatusesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncStatusesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncStatusesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncStatusesResourceWithStreamingResponse(self)
 
     async def get(
@@ -111,7 +134,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> StatusGetResponse:
         """Fetches the status of a configured waiting room.
 
@@ -125,6 +148,7 @@ async def get(
              held in the waiting room.
            - **event_prequeueing** indicates that an event is active and is currently
              prequeueing users before it starts.
+           - **suspended** indicates that the room is suspended.
         2. `event_id`: String of the current event's `id` if an event is active,
            otherwise an empty string.
         3. `estimated_queued_users`: Integer of the estimated number of users currently
@@ -135,7 +159,7 @@ async def get(
            presented to the users.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/waiting_rooms/waiting_rooms.py b/src/cloudflare/resources/waiting_rooms/waiting_rooms.py
index d2913dc2f93..7ec32316f2e 100644
--- a/src/cloudflare/resources/waiting_rooms/waiting_rooms.py
+++ b/src/cloudflare/resources/waiting_rooms/waiting_rooms.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Type, Iterable, cast
+from typing import List, Type, Iterable, cast
 from typing_extensions import Literal
 
 import httpx
@@ -23,19 +23,8 @@
     RulesResourceWithStreamingResponse,
     AsyncRulesResourceWithStreamingResponse,
 )
-from .events import (
-    EventsResource,
-    AsyncEventsResource,
-    EventsResourceWithRawResponse,
-    AsyncEventsResourceWithRawResponse,
-    EventsResourceWithStreamingResponse,
-    AsyncEventsResourceWithStreamingResponse,
-)
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from .settings import (
     SettingsResource,
     AsyncSettingsResource,
@@ -61,8 +50,15 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from ...pagination import SyncSinglePage, AsyncSinglePage
-from .events.events import EventsResource, AsyncEventsResource
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from .events.events import (
+    EventsResource,
+    AsyncEventsResource,
+    EventsResourceWithRawResponse,
+    AsyncEventsResourceWithRawResponse,
+    EventsResourceWithStreamingResponse,
+    AsyncEventsResourceWithStreamingResponse,
+)
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.waiting_rooms import (
     waiting_room_edit_params,
@@ -101,10 +97,21 @@ def settings(self) -> SettingsResource:
 
     @cached_property
     def with_raw_response(self) -> WaitingRoomsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return WaitingRoomsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> WaitingRoomsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return WaitingRoomsResourceWithStreamingResponse(self)
 
     def create(
@@ -115,10 +122,10 @@ def create(
         name: str,
         new_users_per_minute: int,
         total_active_users: int,
-        additional_routes: Iterable[AdditionalRoutesParam] | NotGiven = NOT_GIVEN,
-        cookie_attributes: CookieAttributesParam | NotGiven = NOT_GIVEN,
-        cookie_suffix: str | NotGiven = NOT_GIVEN,
-        custom_page_html: str | NotGiven = NOT_GIVEN,
+        additional_routes: Iterable[AdditionalRoutesParam] | Omit = omit,
+        cookie_attributes: CookieAttributesParam | Omit = omit,
+        cookie_suffix: str | Omit = omit,
+        custom_page_html: str | Omit = omit,
         default_template_language: Literal[
             "en-US",
             "es-ES",
@@ -137,29 +144,53 @@ def create(
             "ar-EG",
             "ru-RU",
             "fa-IR",
+            "bg-BG",
+            "hr-HR",
+            "cs-CZ",
+            "da-DK",
+            "fi-FI",
+            "lt-LT",
+            "ms-MY",
+            "nb-NO",
+            "ro-RO",
+            "el-GR",
+            "he-IL",
+            "hi-IN",
+            "hu-HU",
+            "sr-BA",
+            "sk-SK",
+            "sl-SI",
+            "sv-SE",
+            "tl-PH",
+            "th-TH",
+            "uk-UA",
+            "vi-VN",
         ]
-        | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        disable_session_renewal: bool | NotGiven = NOT_GIVEN,
-        json_response_enabled: bool | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        queue_all: bool | NotGiven = NOT_GIVEN,
-        queueing_method: Literal["fifo", "random", "passthrough", "reject"] | NotGiven = NOT_GIVEN,
-        queueing_status_code: Literal[200, 202, 429] | NotGiven = NOT_GIVEN,
-        session_duration: int | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        description: str | Omit = omit,
+        disable_session_renewal: bool | Omit = omit,
+        enabled_origin_commands: List[Literal["revoke"]] | Omit = omit,
+        json_response_enabled: bool | Omit = omit,
+        path: str | Omit = omit,
+        queue_all: bool | Omit = omit,
+        queueing_method: Literal["fifo", "random", "passthrough", "reject"] | Omit = omit,
+        queueing_status_code: Literal[200, 202, 429] | Omit = omit,
+        session_duration: int | Omit = omit,
+        suspended: bool | Omit = omit,
+        turnstile_action: Literal["log", "infinite_queue"] | Omit = omit,
+        turnstile_mode: Literal["off", "invisible", "visible_non_interactive", "visible_managed"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WaitingRoom:
         """
         Creates a new waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           host: The host name to which the waiting room will be applied (no wildcards). Please
               do not include the scheme (http:// or https://). The host and path combination
@@ -225,6 +256,8 @@ def create(
               through the waiting room again. If `false`, a user's session cookie will be
               automatically renewed on every request.
 
+          enabled_origin_commands: A list of enabled origin commands.
+
           json_response_enabled: Only available for the Waiting Room Advanced subscription. If `true`, requests
               to the waiting room with the header `Accept: application/json` will receive a
               JSON response object with information on the user's status in the waiting room
@@ -265,7 +298,7 @@ def create(
               11. `refreshIntervalSeconds`: Integer indicating the number of seconds after
                   `lastUpdated` until the user is able to make another attempt to leave the
                   waiting room and be let into the origin website. When the `queueingMethod`
-                  is `reject`, there is no specified refresh time — it will always be
+                  is `reject`, there is no specified refresh time —\\__it will always be
                   **zero**.
               12. `queueingMethod`: The queueing method currently used by the waiting room. It
                   is either **fifo**, **random**, **passthrough**, or **reject**.
@@ -301,6 +334,11 @@ def create(
               23. `shuffleAtEventStart`: Valid only when `isEventActive` is **true**. Boolean
                   indicating if the users in the prequeue are shuffled randomly when the event
                   starts.
+              24. `turnstile`: Empty when turnstile isn't enabled. String displaying an html
+                  tag to display the Turnstile widget. Please add the `{{{turnstile}}}` tag to
+                  the `custom_html` template to ensure the Turnstile widget appears.
+              25. `infiniteQueue`: Boolean indicating whether the response is for a user in
+                  the infinite queue.
 
               An example cURL to a waiting room could be:
 
@@ -369,7 +407,7 @@ def create(
                   		"timeUntilEventEndFormatted": "15 minutes",
                   		"shuffleAtEventStart": true
                   	}
-                  }.
+                  }
 
           path: Sets the path within the host to enable the waiting room on. The waiting room
               will be enabled for all subpaths as well. If there are two waiting rooms on the
@@ -417,6 +455,18 @@ def create(
           suspended: Suspends or allows traffic going to the waiting room. If set to `true`, the
               traffic will not go to the waiting room.
 
+          turnstile_action: Which action to take when a bot is detected using Turnstile. `log` will have no
+              impact on queueing behavior, simply keeping track of how many bots are detected
+              in Waiting Room Analytics. `infinite_queue` will send bots to a false queueing
+              state, where they will never reach your origin. `infinite_queue` requires
+              Advanced Waiting Room.
+
+          turnstile_mode: Which Turnstile widget type to use for detecting bot traffic. See
+              [the Turnstile documentation](https://developers.cloudflare.com/turnstile/concepts/widget/#widget-types)
+              for the definitions of these widget types. Set to `off` to disable the Turnstile
+              integration entirely. Setting this to anything other than `off` or `invisible`
+              requires Advanced Waiting Room.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -442,6 +492,7 @@ def create(
                     "default_template_language": default_template_language,
                     "description": description,
                     "disable_session_renewal": disable_session_renewal,
+                    "enabled_origin_commands": enabled_origin_commands,
                     "json_response_enabled": json_response_enabled,
                     "path": path,
                     "queue_all": queue_all,
@@ -449,6 +500,8 @@ def create(
                     "queueing_status_code": queueing_status_code,
                     "session_duration": session_duration,
                     "suspended": suspended,
+                    "turnstile_action": turnstile_action,
+                    "turnstile_mode": turnstile_mode,
                 },
                 waiting_room_create_params.WaitingRoomCreateParams,
             ),
@@ -471,10 +524,10 @@ def update(
         name: str,
         new_users_per_minute: int,
         total_active_users: int,
-        additional_routes: Iterable[AdditionalRoutesParam] | NotGiven = NOT_GIVEN,
-        cookie_attributes: CookieAttributesParam | NotGiven = NOT_GIVEN,
-        cookie_suffix: str | NotGiven = NOT_GIVEN,
-        custom_page_html: str | NotGiven = NOT_GIVEN,
+        additional_routes: Iterable[AdditionalRoutesParam] | Omit = omit,
+        cookie_attributes: CookieAttributesParam | Omit = omit,
+        cookie_suffix: str | Omit = omit,
+        custom_page_html: str | Omit = omit,
         default_template_language: Literal[
             "en-US",
             "es-ES",
@@ -493,29 +546,53 @@ def update(
             "ar-EG",
             "ru-RU",
             "fa-IR",
+            "bg-BG",
+            "hr-HR",
+            "cs-CZ",
+            "da-DK",
+            "fi-FI",
+            "lt-LT",
+            "ms-MY",
+            "nb-NO",
+            "ro-RO",
+            "el-GR",
+            "he-IL",
+            "hi-IN",
+            "hu-HU",
+            "sr-BA",
+            "sk-SK",
+            "sl-SI",
+            "sv-SE",
+            "tl-PH",
+            "th-TH",
+            "uk-UA",
+            "vi-VN",
         ]
-        | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        disable_session_renewal: bool | NotGiven = NOT_GIVEN,
-        json_response_enabled: bool | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        queue_all: bool | NotGiven = NOT_GIVEN,
-        queueing_method: Literal["fifo", "random", "passthrough", "reject"] | NotGiven = NOT_GIVEN,
-        queueing_status_code: Literal[200, 202, 429] | NotGiven = NOT_GIVEN,
-        session_duration: int | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        description: str | Omit = omit,
+        disable_session_renewal: bool | Omit = omit,
+        enabled_origin_commands: List[Literal["revoke"]] | Omit = omit,
+        json_response_enabled: bool | Omit = omit,
+        path: str | Omit = omit,
+        queue_all: bool | Omit = omit,
+        queueing_method: Literal["fifo", "random", "passthrough", "reject"] | Omit = omit,
+        queueing_status_code: Literal[200, 202, 429] | Omit = omit,
+        session_duration: int | Omit = omit,
+        suspended: bool | Omit = omit,
+        turnstile_action: Literal["log", "infinite_queue"] | Omit = omit,
+        turnstile_mode: Literal["off", "invisible", "visible_non_interactive", "visible_managed"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WaitingRoom:
         """
         Updates a configured waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           host: The host name to which the waiting room will be applied (no wildcards). Please
               do not include the scheme (http:// or https://). The host and path combination
@@ -581,6 +658,8 @@ def update(
               through the waiting room again. If `false`, a user's session cookie will be
               automatically renewed on every request.
 
+          enabled_origin_commands: A list of enabled origin commands.
+
           json_response_enabled: Only available for the Waiting Room Advanced subscription. If `true`, requests
               to the waiting room with the header `Accept: application/json` will receive a
               JSON response object with information on the user's status in the waiting room
@@ -621,7 +700,7 @@ def update(
               11. `refreshIntervalSeconds`: Integer indicating the number of seconds after
                   `lastUpdated` until the user is able to make another attempt to leave the
                   waiting room and be let into the origin website. When the `queueingMethod`
-                  is `reject`, there is no specified refresh time — it will always be
+                  is `reject`, there is no specified refresh time —\\__it will always be
                   **zero**.
               12. `queueingMethod`: The queueing method currently used by the waiting room. It
                   is either **fifo**, **random**, **passthrough**, or **reject**.
@@ -657,6 +736,11 @@ def update(
               23. `shuffleAtEventStart`: Valid only when `isEventActive` is **true**. Boolean
                   indicating if the users in the prequeue are shuffled randomly when the event
                   starts.
+              24. `turnstile`: Empty when turnstile isn't enabled. String displaying an html
+                  tag to display the Turnstile widget. Please add the `{{{turnstile}}}` tag to
+                  the `custom_html` template to ensure the Turnstile widget appears.
+              25. `infiniteQueue`: Boolean indicating whether the response is for a user in
+                  the infinite queue.
 
               An example cURL to a waiting room could be:
 
@@ -725,7 +809,7 @@ def update(
                   		"timeUntilEventEndFormatted": "15 minutes",
                   		"shuffleAtEventStart": true
                   	}
-                  }.
+                  }
 
           path: Sets the path within the host to enable the waiting room on. The waiting room
               will be enabled for all subpaths as well. If there are two waiting rooms on the
@@ -773,6 +857,18 @@ def update(
           suspended: Suspends or allows traffic going to the waiting room. If set to `true`, the
               traffic will not go to the waiting room.
 
+          turnstile_action: Which action to take when a bot is detected using Turnstile. `log` will have no
+              impact on queueing behavior, simply keeping track of how many bots are detected
+              in Waiting Room Analytics. `infinite_queue` will send bots to a false queueing
+              state, where they will never reach your origin. `infinite_queue` requires
+              Advanced Waiting Room.
+
+          turnstile_mode: Which Turnstile widget type to use for detecting bot traffic. See
+              [the Turnstile documentation](https://developers.cloudflare.com/turnstile/concepts/widget/#widget-types)
+              for the definitions of these widget types. Set to `off` to disable the Turnstile
+              integration entirely. Setting this to anything other than `off` or `invisible`
+              requires Advanced Waiting Room.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -800,6 +896,7 @@ def update(
                     "default_template_language": default_template_language,
                     "description": description,
                     "disable_session_renewal": disable_session_renewal,
+                    "enabled_origin_commands": enabled_origin_commands,
                     "json_response_enabled": json_response_enabled,
                     "path": path,
                     "queue_all": queue_all,
@@ -807,6 +904,8 @@ def update(
                     "queueing_status_code": queueing_status_code,
                     "session_duration": session_duration,
                     "suspended": suspended,
+                    "turnstile_action": turnstile_action,
+                    "turnstile_mode": turnstile_mode,
                 },
                 waiting_room_update_params.WaitingRoomUpdateParams,
             ),
@@ -823,21 +922,24 @@ def update(
     def list(
         self,
         *,
-        zone_id: str,
-        page: object | NotGiven = NOT_GIVEN,
-        per_page: object | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[WaitingRoom]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[WaitingRoom]:
         """
-        Lists waiting rooms.
+        Lists waiting rooms for account or zone.
 
         Args:
-          zone_id: Identifier
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
           page: Page number of paginated results.
 
@@ -851,11 +953,21 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
         return self._get_api_list(
-            f"/zones/{zone_id}/waiting_rooms",
-            page=SyncSinglePage[WaitingRoom],
+            f"/{account_or_zone}/{account_or_zone_id}/waiting_rooms",
+            page=SyncV4PagePaginationArray[WaitingRoom],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -882,13 +994,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WaitingRoomDeleteResponse:
         """
         Deletes a waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -923,10 +1035,10 @@ def edit(
         name: str,
         new_users_per_minute: int,
         total_active_users: int,
-        additional_routes: Iterable[AdditionalRoutesParam] | NotGiven = NOT_GIVEN,
-        cookie_attributes: CookieAttributesParam | NotGiven = NOT_GIVEN,
-        cookie_suffix: str | NotGiven = NOT_GIVEN,
-        custom_page_html: str | NotGiven = NOT_GIVEN,
+        additional_routes: Iterable[AdditionalRoutesParam] | Omit = omit,
+        cookie_attributes: CookieAttributesParam | Omit = omit,
+        cookie_suffix: str | Omit = omit,
+        custom_page_html: str | Omit = omit,
         default_template_language: Literal[
             "en-US",
             "es-ES",
@@ -945,29 +1057,53 @@ def edit(
             "ar-EG",
             "ru-RU",
             "fa-IR",
+            "bg-BG",
+            "hr-HR",
+            "cs-CZ",
+            "da-DK",
+            "fi-FI",
+            "lt-LT",
+            "ms-MY",
+            "nb-NO",
+            "ro-RO",
+            "el-GR",
+            "he-IL",
+            "hi-IN",
+            "hu-HU",
+            "sr-BA",
+            "sk-SK",
+            "sl-SI",
+            "sv-SE",
+            "tl-PH",
+            "th-TH",
+            "uk-UA",
+            "vi-VN",
         ]
-        | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        disable_session_renewal: bool | NotGiven = NOT_GIVEN,
-        json_response_enabled: bool | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        queue_all: bool | NotGiven = NOT_GIVEN,
-        queueing_method: Literal["fifo", "random", "passthrough", "reject"] | NotGiven = NOT_GIVEN,
-        queueing_status_code: Literal[200, 202, 429] | NotGiven = NOT_GIVEN,
-        session_duration: int | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        description: str | Omit = omit,
+        disable_session_renewal: bool | Omit = omit,
+        enabled_origin_commands: List[Literal["revoke"]] | Omit = omit,
+        json_response_enabled: bool | Omit = omit,
+        path: str | Omit = omit,
+        queue_all: bool | Omit = omit,
+        queueing_method: Literal["fifo", "random", "passthrough", "reject"] | Omit = omit,
+        queueing_status_code: Literal[200, 202, 429] | Omit = omit,
+        session_duration: int | Omit = omit,
+        suspended: bool | Omit = omit,
+        turnstile_action: Literal["log", "infinite_queue"] | Omit = omit,
+        turnstile_mode: Literal["off", "invisible", "visible_non_interactive", "visible_managed"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WaitingRoom:
         """
         Patches a configured waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           host: The host name to which the waiting room will be applied (no wildcards). Please
               do not include the scheme (http:// or https://). The host and path combination
@@ -1033,6 +1169,8 @@ def edit(
               through the waiting room again. If `false`, a user's session cookie will be
               automatically renewed on every request.
 
+          enabled_origin_commands: A list of enabled origin commands.
+
           json_response_enabled: Only available for the Waiting Room Advanced subscription. If `true`, requests
               to the waiting room with the header `Accept: application/json` will receive a
               JSON response object with information on the user's status in the waiting room
@@ -1073,7 +1211,7 @@ def edit(
               11. `refreshIntervalSeconds`: Integer indicating the number of seconds after
                   `lastUpdated` until the user is able to make another attempt to leave the
                   waiting room and be let into the origin website. When the `queueingMethod`
-                  is `reject`, there is no specified refresh time — it will always be
+                  is `reject`, there is no specified refresh time —\\__it will always be
                   **zero**.
               12. `queueingMethod`: The queueing method currently used by the waiting room. It
                   is either **fifo**, **random**, **passthrough**, or **reject**.
@@ -1109,6 +1247,11 @@ def edit(
               23. `shuffleAtEventStart`: Valid only when `isEventActive` is **true**. Boolean
                   indicating if the users in the prequeue are shuffled randomly when the event
                   starts.
+              24. `turnstile`: Empty when turnstile isn't enabled. String displaying an html
+                  tag to display the Turnstile widget. Please add the `{{{turnstile}}}` tag to
+                  the `custom_html` template to ensure the Turnstile widget appears.
+              25. `infiniteQueue`: Boolean indicating whether the response is for a user in
+                  the infinite queue.
 
               An example cURL to a waiting room could be:
 
@@ -1177,7 +1320,7 @@ def edit(
                   		"timeUntilEventEndFormatted": "15 minutes",
                   		"shuffleAtEventStart": true
                   	}
-                  }.
+                  }
 
           path: Sets the path within the host to enable the waiting room on. The waiting room
               will be enabled for all subpaths as well. If there are two waiting rooms on the
@@ -1225,6 +1368,18 @@ def edit(
           suspended: Suspends or allows traffic going to the waiting room. If set to `true`, the
               traffic will not go to the waiting room.
 
+          turnstile_action: Which action to take when a bot is detected using Turnstile. `log` will have no
+              impact on queueing behavior, simply keeping track of how many bots are detected
+              in Waiting Room Analytics. `infinite_queue` will send bots to a false queueing
+              state, where they will never reach your origin. `infinite_queue` requires
+              Advanced Waiting Room.
+
+          turnstile_mode: Which Turnstile widget type to use for detecting bot traffic. See
+              [the Turnstile documentation](https://developers.cloudflare.com/turnstile/concepts/widget/#widget-types)
+              for the definitions of these widget types. Set to `off` to disable the Turnstile
+              integration entirely. Setting this to anything other than `off` or `invisible`
+              requires Advanced Waiting Room.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -1252,6 +1407,7 @@ def edit(
                     "default_template_language": default_template_language,
                     "description": description,
                     "disable_session_renewal": disable_session_renewal,
+                    "enabled_origin_commands": enabled_origin_commands,
                     "json_response_enabled": json_response_enabled,
                     "path": path,
                     "queue_all": queue_all,
@@ -1259,6 +1415,8 @@ def edit(
                     "queueing_status_code": queueing_status_code,
                     "session_duration": session_duration,
                     "suspended": suspended,
+                    "turnstile_action": turnstile_action,
+                    "turnstile_mode": turnstile_mode,
                 },
                 waiting_room_edit_params.WaitingRoomEditParams,
             ),
@@ -1282,13 +1440,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WaitingRoom:
         """
         Fetches a single configured waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -1338,10 +1496,21 @@ def settings(self) -> AsyncSettingsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncWaitingRoomsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncWaitingRoomsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncWaitingRoomsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncWaitingRoomsResourceWithStreamingResponse(self)
 
     async def create(
@@ -1352,10 +1521,10 @@ async def create(
         name: str,
         new_users_per_minute: int,
         total_active_users: int,
-        additional_routes: Iterable[AdditionalRoutesParam] | NotGiven = NOT_GIVEN,
-        cookie_attributes: CookieAttributesParam | NotGiven = NOT_GIVEN,
-        cookie_suffix: str | NotGiven = NOT_GIVEN,
-        custom_page_html: str | NotGiven = NOT_GIVEN,
+        additional_routes: Iterable[AdditionalRoutesParam] | Omit = omit,
+        cookie_attributes: CookieAttributesParam | Omit = omit,
+        cookie_suffix: str | Omit = omit,
+        custom_page_html: str | Omit = omit,
         default_template_language: Literal[
             "en-US",
             "es-ES",
@@ -1374,29 +1543,53 @@ async def create(
             "ar-EG",
             "ru-RU",
             "fa-IR",
+            "bg-BG",
+            "hr-HR",
+            "cs-CZ",
+            "da-DK",
+            "fi-FI",
+            "lt-LT",
+            "ms-MY",
+            "nb-NO",
+            "ro-RO",
+            "el-GR",
+            "he-IL",
+            "hi-IN",
+            "hu-HU",
+            "sr-BA",
+            "sk-SK",
+            "sl-SI",
+            "sv-SE",
+            "tl-PH",
+            "th-TH",
+            "uk-UA",
+            "vi-VN",
         ]
-        | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        disable_session_renewal: bool | NotGiven = NOT_GIVEN,
-        json_response_enabled: bool | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        queue_all: bool | NotGiven = NOT_GIVEN,
-        queueing_method: Literal["fifo", "random", "passthrough", "reject"] | NotGiven = NOT_GIVEN,
-        queueing_status_code: Literal[200, 202, 429] | NotGiven = NOT_GIVEN,
-        session_duration: int | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        description: str | Omit = omit,
+        disable_session_renewal: bool | Omit = omit,
+        enabled_origin_commands: List[Literal["revoke"]] | Omit = omit,
+        json_response_enabled: bool | Omit = omit,
+        path: str | Omit = omit,
+        queue_all: bool | Omit = omit,
+        queueing_method: Literal["fifo", "random", "passthrough", "reject"] | Omit = omit,
+        queueing_status_code: Literal[200, 202, 429] | Omit = omit,
+        session_duration: int | Omit = omit,
+        suspended: bool | Omit = omit,
+        turnstile_action: Literal["log", "infinite_queue"] | Omit = omit,
+        turnstile_mode: Literal["off", "invisible", "visible_non_interactive", "visible_managed"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WaitingRoom:
         """
         Creates a new waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           host: The host name to which the waiting room will be applied (no wildcards). Please
               do not include the scheme (http:// or https://). The host and path combination
@@ -1462,6 +1655,8 @@ async def create(
               through the waiting room again. If `false`, a user's session cookie will be
               automatically renewed on every request.
 
+          enabled_origin_commands: A list of enabled origin commands.
+
           json_response_enabled: Only available for the Waiting Room Advanced subscription. If `true`, requests
               to the waiting room with the header `Accept: application/json` will receive a
               JSON response object with information on the user's status in the waiting room
@@ -1502,7 +1697,7 @@ async def create(
               11. `refreshIntervalSeconds`: Integer indicating the number of seconds after
                   `lastUpdated` until the user is able to make another attempt to leave the
                   waiting room and be let into the origin website. When the `queueingMethod`
-                  is `reject`, there is no specified refresh time — it will always be
+                  is `reject`, there is no specified refresh time —\\__it will always be
                   **zero**.
               12. `queueingMethod`: The queueing method currently used by the waiting room. It
                   is either **fifo**, **random**, **passthrough**, or **reject**.
@@ -1538,6 +1733,11 @@ async def create(
               23. `shuffleAtEventStart`: Valid only when `isEventActive` is **true**. Boolean
                   indicating if the users in the prequeue are shuffled randomly when the event
                   starts.
+              24. `turnstile`: Empty when turnstile isn't enabled. String displaying an html
+                  tag to display the Turnstile widget. Please add the `{{{turnstile}}}` tag to
+                  the `custom_html` template to ensure the Turnstile widget appears.
+              25. `infiniteQueue`: Boolean indicating whether the response is for a user in
+                  the infinite queue.
 
               An example cURL to a waiting room could be:
 
@@ -1606,7 +1806,7 @@ async def create(
                   		"timeUntilEventEndFormatted": "15 minutes",
                   		"shuffleAtEventStart": true
                   	}
-                  }.
+                  }
 
           path: Sets the path within the host to enable the waiting room on. The waiting room
               will be enabled for all subpaths as well. If there are two waiting rooms on the
@@ -1654,6 +1854,18 @@ async def create(
           suspended: Suspends or allows traffic going to the waiting room. If set to `true`, the
               traffic will not go to the waiting room.
 
+          turnstile_action: Which action to take when a bot is detected using Turnstile. `log` will have no
+              impact on queueing behavior, simply keeping track of how many bots are detected
+              in Waiting Room Analytics. `infinite_queue` will send bots to a false queueing
+              state, where they will never reach your origin. `infinite_queue` requires
+              Advanced Waiting Room.
+
+          turnstile_mode: Which Turnstile widget type to use for detecting bot traffic. See
+              [the Turnstile documentation](https://developers.cloudflare.com/turnstile/concepts/widget/#widget-types)
+              for the definitions of these widget types. Set to `off` to disable the Turnstile
+              integration entirely. Setting this to anything other than `off` or `invisible`
+              requires Advanced Waiting Room.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -1679,6 +1891,7 @@ async def create(
                     "default_template_language": default_template_language,
                     "description": description,
                     "disable_session_renewal": disable_session_renewal,
+                    "enabled_origin_commands": enabled_origin_commands,
                     "json_response_enabled": json_response_enabled,
                     "path": path,
                     "queue_all": queue_all,
@@ -1686,6 +1899,8 @@ async def create(
                     "queueing_status_code": queueing_status_code,
                     "session_duration": session_duration,
                     "suspended": suspended,
+                    "turnstile_action": turnstile_action,
+                    "turnstile_mode": turnstile_mode,
                 },
                 waiting_room_create_params.WaitingRoomCreateParams,
             ),
@@ -1708,10 +1923,10 @@ async def update(
         name: str,
         new_users_per_minute: int,
         total_active_users: int,
-        additional_routes: Iterable[AdditionalRoutesParam] | NotGiven = NOT_GIVEN,
-        cookie_attributes: CookieAttributesParam | NotGiven = NOT_GIVEN,
-        cookie_suffix: str | NotGiven = NOT_GIVEN,
-        custom_page_html: str | NotGiven = NOT_GIVEN,
+        additional_routes: Iterable[AdditionalRoutesParam] | Omit = omit,
+        cookie_attributes: CookieAttributesParam | Omit = omit,
+        cookie_suffix: str | Omit = omit,
+        custom_page_html: str | Omit = omit,
         default_template_language: Literal[
             "en-US",
             "es-ES",
@@ -1730,29 +1945,53 @@ async def update(
             "ar-EG",
             "ru-RU",
             "fa-IR",
+            "bg-BG",
+            "hr-HR",
+            "cs-CZ",
+            "da-DK",
+            "fi-FI",
+            "lt-LT",
+            "ms-MY",
+            "nb-NO",
+            "ro-RO",
+            "el-GR",
+            "he-IL",
+            "hi-IN",
+            "hu-HU",
+            "sr-BA",
+            "sk-SK",
+            "sl-SI",
+            "sv-SE",
+            "tl-PH",
+            "th-TH",
+            "uk-UA",
+            "vi-VN",
         ]
-        | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        disable_session_renewal: bool | NotGiven = NOT_GIVEN,
-        json_response_enabled: bool | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        queue_all: bool | NotGiven = NOT_GIVEN,
-        queueing_method: Literal["fifo", "random", "passthrough", "reject"] | NotGiven = NOT_GIVEN,
-        queueing_status_code: Literal[200, 202, 429] | NotGiven = NOT_GIVEN,
-        session_duration: int | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        description: str | Omit = omit,
+        disable_session_renewal: bool | Omit = omit,
+        enabled_origin_commands: List[Literal["revoke"]] | Omit = omit,
+        json_response_enabled: bool | Omit = omit,
+        path: str | Omit = omit,
+        queue_all: bool | Omit = omit,
+        queueing_method: Literal["fifo", "random", "passthrough", "reject"] | Omit = omit,
+        queueing_status_code: Literal[200, 202, 429] | Omit = omit,
+        session_duration: int | Omit = omit,
+        suspended: bool | Omit = omit,
+        turnstile_action: Literal["log", "infinite_queue"] | Omit = omit,
+        turnstile_mode: Literal["off", "invisible", "visible_non_interactive", "visible_managed"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WaitingRoom:
         """
         Updates a configured waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           host: The host name to which the waiting room will be applied (no wildcards). Please
               do not include the scheme (http:// or https://). The host and path combination
@@ -1818,6 +2057,8 @@ async def update(
               through the waiting room again. If `false`, a user's session cookie will be
               automatically renewed on every request.
 
+          enabled_origin_commands: A list of enabled origin commands.
+
           json_response_enabled: Only available for the Waiting Room Advanced subscription. If `true`, requests
               to the waiting room with the header `Accept: application/json` will receive a
               JSON response object with information on the user's status in the waiting room
@@ -1858,7 +2099,7 @@ async def update(
               11. `refreshIntervalSeconds`: Integer indicating the number of seconds after
                   `lastUpdated` until the user is able to make another attempt to leave the
                   waiting room and be let into the origin website. When the `queueingMethod`
-                  is `reject`, there is no specified refresh time — it will always be
+                  is `reject`, there is no specified refresh time —\\__it will always be
                   **zero**.
               12. `queueingMethod`: The queueing method currently used by the waiting room. It
                   is either **fifo**, **random**, **passthrough**, or **reject**.
@@ -1894,6 +2135,11 @@ async def update(
               23. `shuffleAtEventStart`: Valid only when `isEventActive` is **true**. Boolean
                   indicating if the users in the prequeue are shuffled randomly when the event
                   starts.
+              24. `turnstile`: Empty when turnstile isn't enabled. String displaying an html
+                  tag to display the Turnstile widget. Please add the `{{{turnstile}}}` tag to
+                  the `custom_html` template to ensure the Turnstile widget appears.
+              25. `infiniteQueue`: Boolean indicating whether the response is for a user in
+                  the infinite queue.
 
               An example cURL to a waiting room could be:
 
@@ -1962,7 +2208,7 @@ async def update(
                   		"timeUntilEventEndFormatted": "15 minutes",
                   		"shuffleAtEventStart": true
                   	}
-                  }.
+                  }
 
           path: Sets the path within the host to enable the waiting room on. The waiting room
               will be enabled for all subpaths as well. If there are two waiting rooms on the
@@ -2010,6 +2256,18 @@ async def update(
           suspended: Suspends or allows traffic going to the waiting room. If set to `true`, the
               traffic will not go to the waiting room.
 
+          turnstile_action: Which action to take when a bot is detected using Turnstile. `log` will have no
+              impact on queueing behavior, simply keeping track of how many bots are detected
+              in Waiting Room Analytics. `infinite_queue` will send bots to a false queueing
+              state, where they will never reach your origin. `infinite_queue` requires
+              Advanced Waiting Room.
+
+          turnstile_mode: Which Turnstile widget type to use for detecting bot traffic. See
+              [the Turnstile documentation](https://developers.cloudflare.com/turnstile/concepts/widget/#widget-types)
+              for the definitions of these widget types. Set to `off` to disable the Turnstile
+              integration entirely. Setting this to anything other than `off` or `invisible`
+              requires Advanced Waiting Room.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -2037,6 +2295,7 @@ async def update(
                     "default_template_language": default_template_language,
                     "description": description,
                     "disable_session_renewal": disable_session_renewal,
+                    "enabled_origin_commands": enabled_origin_commands,
                     "json_response_enabled": json_response_enabled,
                     "path": path,
                     "queue_all": queue_all,
@@ -2044,6 +2303,8 @@ async def update(
                     "queueing_status_code": queueing_status_code,
                     "session_duration": session_duration,
                     "suspended": suspended,
+                    "turnstile_action": turnstile_action,
+                    "turnstile_mode": turnstile_mode,
                 },
                 waiting_room_update_params.WaitingRoomUpdateParams,
             ),
@@ -2060,21 +2321,24 @@ async def update(
     def list(
         self,
         *,
-        zone_id: str,
-        page: object | NotGiven = NOT_GIVEN,
-        per_page: object | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[WaitingRoom, AsyncSinglePage[WaitingRoom]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[WaitingRoom, AsyncV4PagePaginationArray[WaitingRoom]]:
         """
-        Lists waiting rooms.
+        Lists waiting rooms for account or zone.
 
         Args:
-          zone_id: Identifier
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
           page: Page number of paginated results.
 
@@ -2088,11 +2352,21 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
         return self._get_api_list(
-            f"/zones/{zone_id}/waiting_rooms",
-            page=AsyncSinglePage[WaitingRoom],
+            f"/{account_or_zone}/{account_or_zone_id}/waiting_rooms",
+            page=AsyncV4PagePaginationArray[WaitingRoom],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -2119,13 +2393,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WaitingRoomDeleteResponse:
         """
         Deletes a waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -2160,10 +2434,10 @@ async def edit(
         name: str,
         new_users_per_minute: int,
         total_active_users: int,
-        additional_routes: Iterable[AdditionalRoutesParam] | NotGiven = NOT_GIVEN,
-        cookie_attributes: CookieAttributesParam | NotGiven = NOT_GIVEN,
-        cookie_suffix: str | NotGiven = NOT_GIVEN,
-        custom_page_html: str | NotGiven = NOT_GIVEN,
+        additional_routes: Iterable[AdditionalRoutesParam] | Omit = omit,
+        cookie_attributes: CookieAttributesParam | Omit = omit,
+        cookie_suffix: str | Omit = omit,
+        custom_page_html: str | Omit = omit,
         default_template_language: Literal[
             "en-US",
             "es-ES",
@@ -2182,29 +2456,53 @@ async def edit(
             "ar-EG",
             "ru-RU",
             "fa-IR",
+            "bg-BG",
+            "hr-HR",
+            "cs-CZ",
+            "da-DK",
+            "fi-FI",
+            "lt-LT",
+            "ms-MY",
+            "nb-NO",
+            "ro-RO",
+            "el-GR",
+            "he-IL",
+            "hi-IN",
+            "hu-HU",
+            "sr-BA",
+            "sk-SK",
+            "sl-SI",
+            "sv-SE",
+            "tl-PH",
+            "th-TH",
+            "uk-UA",
+            "vi-VN",
         ]
-        | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        disable_session_renewal: bool | NotGiven = NOT_GIVEN,
-        json_response_enabled: bool | NotGiven = NOT_GIVEN,
-        path: str | NotGiven = NOT_GIVEN,
-        queue_all: bool | NotGiven = NOT_GIVEN,
-        queueing_method: Literal["fifo", "random", "passthrough", "reject"] | NotGiven = NOT_GIVEN,
-        queueing_status_code: Literal[200, 202, 429] | NotGiven = NOT_GIVEN,
-        session_duration: int | NotGiven = NOT_GIVEN,
-        suspended: bool | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        description: str | Omit = omit,
+        disable_session_renewal: bool | Omit = omit,
+        enabled_origin_commands: List[Literal["revoke"]] | Omit = omit,
+        json_response_enabled: bool | Omit = omit,
+        path: str | Omit = omit,
+        queue_all: bool | Omit = omit,
+        queueing_method: Literal["fifo", "random", "passthrough", "reject"] | Omit = omit,
+        queueing_status_code: Literal[200, 202, 429] | Omit = omit,
+        session_duration: int | Omit = omit,
+        suspended: bool | Omit = omit,
+        turnstile_action: Literal["log", "infinite_queue"] | Omit = omit,
+        turnstile_mode: Literal["off", "invisible", "visible_non_interactive", "visible_managed"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WaitingRoom:
         """
         Patches a configured waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           host: The host name to which the waiting room will be applied (no wildcards). Please
               do not include the scheme (http:// or https://). The host and path combination
@@ -2270,6 +2568,8 @@ async def edit(
               through the waiting room again. If `false`, a user's session cookie will be
               automatically renewed on every request.
 
+          enabled_origin_commands: A list of enabled origin commands.
+
           json_response_enabled: Only available for the Waiting Room Advanced subscription. If `true`, requests
               to the waiting room with the header `Accept: application/json` will receive a
               JSON response object with information on the user's status in the waiting room
@@ -2310,7 +2610,7 @@ async def edit(
               11. `refreshIntervalSeconds`: Integer indicating the number of seconds after
                   `lastUpdated` until the user is able to make another attempt to leave the
                   waiting room and be let into the origin website. When the `queueingMethod`
-                  is `reject`, there is no specified refresh time — it will always be
+                  is `reject`, there is no specified refresh time —\\__it will always be
                   **zero**.
               12. `queueingMethod`: The queueing method currently used by the waiting room. It
                   is either **fifo**, **random**, **passthrough**, or **reject**.
@@ -2346,6 +2646,11 @@ async def edit(
               23. `shuffleAtEventStart`: Valid only when `isEventActive` is **true**. Boolean
                   indicating if the users in the prequeue are shuffled randomly when the event
                   starts.
+              24. `turnstile`: Empty when turnstile isn't enabled. String displaying an html
+                  tag to display the Turnstile widget. Please add the `{{{turnstile}}}` tag to
+                  the `custom_html` template to ensure the Turnstile widget appears.
+              25. `infiniteQueue`: Boolean indicating whether the response is for a user in
+                  the infinite queue.
 
               An example cURL to a waiting room could be:
 
@@ -2414,7 +2719,7 @@ async def edit(
                   		"timeUntilEventEndFormatted": "15 minutes",
                   		"shuffleAtEventStart": true
                   	}
-                  }.
+                  }
 
           path: Sets the path within the host to enable the waiting room on. The waiting room
               will be enabled for all subpaths as well. If there are two waiting rooms on the
@@ -2462,6 +2767,18 @@ async def edit(
           suspended: Suspends or allows traffic going to the waiting room. If set to `true`, the
               traffic will not go to the waiting room.
 
+          turnstile_action: Which action to take when a bot is detected using Turnstile. `log` will have no
+              impact on queueing behavior, simply keeping track of how many bots are detected
+              in Waiting Room Analytics. `infinite_queue` will send bots to a false queueing
+              state, where they will never reach your origin. `infinite_queue` requires
+              Advanced Waiting Room.
+
+          turnstile_mode: Which Turnstile widget type to use for detecting bot traffic. See
+              [the Turnstile documentation](https://developers.cloudflare.com/turnstile/concepts/widget/#widget-types)
+              for the definitions of these widget types. Set to `off` to disable the Turnstile
+              integration entirely. Setting this to anything other than `off` or `invisible`
+              requires Advanced Waiting Room.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -2489,6 +2806,7 @@ async def edit(
                     "default_template_language": default_template_language,
                     "description": description,
                     "disable_session_renewal": disable_session_renewal,
+                    "enabled_origin_commands": enabled_origin_commands,
                     "json_response_enabled": json_response_enabled,
                     "path": path,
                     "queue_all": queue_all,
@@ -2496,6 +2814,8 @@ async def edit(
                     "queueing_status_code": queueing_status_code,
                     "session_duration": session_duration,
                     "suspended": suspended,
+                    "turnstile_action": turnstile_action,
+                    "turnstile_mode": turnstile_mode,
                 },
                 waiting_room_edit_params.WaitingRoomEditParams,
             ),
@@ -2519,13 +2839,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WaitingRoom:
         """
         Fetches a single configured waiting room.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/warp_connector.py b/src/cloudflare/resources/warp_connector.py
deleted file mode 100644
index 0e97bf21e8f..00000000000
--- a/src/cloudflare/resources/warp_connector.py
+++ /dev/null
@@ -1,845 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Any, Union, cast
-from datetime import datetime
-from typing_extensions import Literal
-
-import httpx
-
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from .._compat import cached_property
-from .._resource import SyncAPIResource, AsyncAPIResource
-from .._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from .._wrappers import ResultWrapper
-from ..pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
-from .._base_client import AsyncPaginator, make_request_options
-from ..types.warp_connector import warp_connector_edit_params, warp_connector_list_params, warp_connector_create_params
-from ..types.warp_connector.warp_connector_get_response import WARPConnectorGetResponse
-from ..types.warp_connector.warp_connector_edit_response import WARPConnectorEditResponse
-from ..types.warp_connector.warp_connector_list_response import WARPConnectorListResponse
-from ..types.warp_connector.warp_connector_token_response import WARPConnectorTokenResponse
-from ..types.warp_connector.warp_connector_create_response import WARPConnectorCreateResponse
-from ..types.warp_connector.warp_connector_delete_response import WARPConnectorDeleteResponse
-
-__all__ = ["WARPConnectorResource", "AsyncWARPConnectorResource"]
-
-
-class WARPConnectorResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> WARPConnectorResourceWithRawResponse:
-        return WARPConnectorResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> WARPConnectorResourceWithStreamingResponse:
-        return WARPConnectorResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        *,
-        account_id: str,
-        name: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> WARPConnectorCreateResponse:
-        """
-        Creates a new Warp Connector Tunnel in an account.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          name: A user-friendly name for a tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            WARPConnectorCreateResponse,
-            self._post(
-                f"/accounts/{account_id}/warp_connector",
-                body=maybe_transform({"name": name}, warp_connector_create_params.WARPConnectorCreateParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[WARPConnectorCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[WARPConnectorCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        exclude_prefix: str | NotGiven = NOT_GIVEN,
-        existed_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        include_prefix: str | NotGiven = NOT_GIVEN,
-        is_deleted: bool | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        status: Literal["inactive", "degraded", "healthy", "down"] | NotGiven = NOT_GIVEN,
-        uuid: str | NotGiven = NOT_GIVEN,
-        was_active_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        was_inactive_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePaginationArray[WARPConnectorListResponse]:
-        """
-        Lists and filters Warp Connector Tunnels in an account.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          existed_at: If provided, include only tunnels that were created (and not deleted) before
-              this time.
-
-          is_deleted: If `true`, only include deleted tunnels. If `false`, exclude deleted tunnels. If
-              empty, all tunnels will be included.
-
-          name: A user-friendly name for the tunnel.
-
-          page: Page number of paginated results.
-
-          per_page: Number of results to display.
-
-          status: The status of the tunnel. Valid values are `inactive` (tunnel has never been
-              run), `degraded` (tunnel is active and able to serve traffic but in an unhealthy
-              state), `healthy` (tunnel is active and able to serve traffic), or `down`
-              (tunnel can not serve traffic as it has no connections to the Cloudflare Edge).
-
-          uuid: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/warp_connector",
-            page=SyncV4PagePaginationArray[WARPConnectorListResponse],
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "exclude_prefix": exclude_prefix,
-                        "existed_at": existed_at,
-                        "include_prefix": include_prefix,
-                        "is_deleted": is_deleted,
-                        "name": name,
-                        "page": page,
-                        "per_page": per_page,
-                        "status": status,
-                        "uuid": uuid,
-                        "was_active_at": was_active_at,
-                        "was_inactive_at": was_inactive_at,
-                    },
-                    warp_connector_list_params.WARPConnectorListParams,
-                ),
-            ),
-            model=cast(
-                Any, WARPConnectorListResponse
-            ),  # Union types cannot be passed in as arguments in the type system
-        )
-
-    def delete(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> WARPConnectorDeleteResponse:
-        """
-        Deletes a Warp Connector Tunnel from an account.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            WARPConnectorDeleteResponse,
-            self._delete(
-                f"/accounts/{account_id}/warp_connector/{tunnel_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[WARPConnectorDeleteResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[WARPConnectorDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    def edit(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        tunnel_secret: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> WARPConnectorEditResponse:
-        """
-        Updates an existing Warp Connector Tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          name: A user-friendly name for a tunnel.
-
-          tunnel_secret: Sets the password required to run a locally-managed tunnel. Must be at least 32
-              bytes and encoded as a base64 string.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            WARPConnectorEditResponse,
-            self._patch(
-                f"/accounts/{account_id}/warp_connector/{tunnel_id}",
-                body=maybe_transform(
-                    {
-                        "name": name,
-                        "tunnel_secret": tunnel_secret,
-                    },
-                    warp_connector_edit_params.WARPConnectorEditParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[WARPConnectorEditResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[WARPConnectorEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    def get(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> WARPConnectorGetResponse:
-        """
-        Fetches a single Warp Connector Tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            WARPConnectorGetResponse,
-            self._get(
-                f"/accounts/{account_id}/warp_connector/{tunnel_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[WARPConnectorGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[WARPConnectorGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    def token(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> WARPConnectorTokenResponse:
-        """
-        Gets the token used to associate warp device with a specific Warp Connector
-        tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            WARPConnectorTokenResponse,
-            self._get(
-                f"/accounts/{account_id}/warp_connector/{tunnel_id}/token",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[WARPConnectorTokenResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[WARPConnectorTokenResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class AsyncWARPConnectorResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncWARPConnectorResourceWithRawResponse:
-        return AsyncWARPConnectorResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncWARPConnectorResourceWithStreamingResponse:
-        return AsyncWARPConnectorResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        *,
-        account_id: str,
-        name: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> WARPConnectorCreateResponse:
-        """
-        Creates a new Warp Connector Tunnel in an account.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          name: A user-friendly name for a tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            WARPConnectorCreateResponse,
-            await self._post(
-                f"/accounts/{account_id}/warp_connector",
-                body=await async_maybe_transform(
-                    {"name": name}, warp_connector_create_params.WARPConnectorCreateParams
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[WARPConnectorCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[WARPConnectorCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        exclude_prefix: str | NotGiven = NOT_GIVEN,
-        existed_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        include_prefix: str | NotGiven = NOT_GIVEN,
-        is_deleted: bool | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        status: Literal["inactive", "degraded", "healthy", "down"] | NotGiven = NOT_GIVEN,
-        uuid: str | NotGiven = NOT_GIVEN,
-        was_active_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        was_inactive_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[WARPConnectorListResponse, AsyncV4PagePaginationArray[WARPConnectorListResponse]]:
-        """
-        Lists and filters Warp Connector Tunnels in an account.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          existed_at: If provided, include only tunnels that were created (and not deleted) before
-              this time.
-
-          is_deleted: If `true`, only include deleted tunnels. If `false`, exclude deleted tunnels. If
-              empty, all tunnels will be included.
-
-          name: A user-friendly name for the tunnel.
-
-          page: Page number of paginated results.
-
-          per_page: Number of results to display.
-
-          status: The status of the tunnel. Valid values are `inactive` (tunnel has never been
-              run), `degraded` (tunnel is active and able to serve traffic but in an unhealthy
-              state), `healthy` (tunnel is active and able to serve traffic), or `down`
-              (tunnel can not serve traffic as it has no connections to the Cloudflare Edge).
-
-          uuid: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/warp_connector",
-            page=AsyncV4PagePaginationArray[WARPConnectorListResponse],
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "exclude_prefix": exclude_prefix,
-                        "existed_at": existed_at,
-                        "include_prefix": include_prefix,
-                        "is_deleted": is_deleted,
-                        "name": name,
-                        "page": page,
-                        "per_page": per_page,
-                        "status": status,
-                        "uuid": uuid,
-                        "was_active_at": was_active_at,
-                        "was_inactive_at": was_inactive_at,
-                    },
-                    warp_connector_list_params.WARPConnectorListParams,
-                ),
-            ),
-            model=cast(
-                Any, WARPConnectorListResponse
-            ),  # Union types cannot be passed in as arguments in the type system
-        )
-
-    async def delete(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> WARPConnectorDeleteResponse:
-        """
-        Deletes a Warp Connector Tunnel from an account.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            WARPConnectorDeleteResponse,
-            await self._delete(
-                f"/accounts/{account_id}/warp_connector/{tunnel_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[WARPConnectorDeleteResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[WARPConnectorDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    async def edit(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        tunnel_secret: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> WARPConnectorEditResponse:
-        """
-        Updates an existing Warp Connector Tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          name: A user-friendly name for a tunnel.
-
-          tunnel_secret: Sets the password required to run a locally-managed tunnel. Must be at least 32
-              bytes and encoded as a base64 string.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            WARPConnectorEditResponse,
-            await self._patch(
-                f"/accounts/{account_id}/warp_connector/{tunnel_id}",
-                body=await async_maybe_transform(
-                    {
-                        "name": name,
-                        "tunnel_secret": tunnel_secret,
-                    },
-                    warp_connector_edit_params.WARPConnectorEditParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[WARPConnectorEditResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[WARPConnectorEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    async def get(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> WARPConnectorGetResponse:
-        """
-        Fetches a single Warp Connector Tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            WARPConnectorGetResponse,
-            await self._get(
-                f"/accounts/{account_id}/warp_connector/{tunnel_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[WARPConnectorGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[WARPConnectorGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    async def token(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> WARPConnectorTokenResponse:
-        """
-        Gets the token used to associate warp device with a specific Warp Connector
-        tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            WARPConnectorTokenResponse,
-            await self._get(
-                f"/accounts/{account_id}/warp_connector/{tunnel_id}/token",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[WARPConnectorTokenResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[WARPConnectorTokenResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class WARPConnectorResourceWithRawResponse:
-    def __init__(self, warp_connector: WARPConnectorResource) -> None:
-        self._warp_connector = warp_connector
-
-        self.create = to_raw_response_wrapper(
-            warp_connector.create,
-        )
-        self.list = to_raw_response_wrapper(
-            warp_connector.list,
-        )
-        self.delete = to_raw_response_wrapper(
-            warp_connector.delete,
-        )
-        self.edit = to_raw_response_wrapper(
-            warp_connector.edit,
-        )
-        self.get = to_raw_response_wrapper(
-            warp_connector.get,
-        )
-        self.token = to_raw_response_wrapper(
-            warp_connector.token,
-        )
-
-
-class AsyncWARPConnectorResourceWithRawResponse:
-    def __init__(self, warp_connector: AsyncWARPConnectorResource) -> None:
-        self._warp_connector = warp_connector
-
-        self.create = async_to_raw_response_wrapper(
-            warp_connector.create,
-        )
-        self.list = async_to_raw_response_wrapper(
-            warp_connector.list,
-        )
-        self.delete = async_to_raw_response_wrapper(
-            warp_connector.delete,
-        )
-        self.edit = async_to_raw_response_wrapper(
-            warp_connector.edit,
-        )
-        self.get = async_to_raw_response_wrapper(
-            warp_connector.get,
-        )
-        self.token = async_to_raw_response_wrapper(
-            warp_connector.token,
-        )
-
-
-class WARPConnectorResourceWithStreamingResponse:
-    def __init__(self, warp_connector: WARPConnectorResource) -> None:
-        self._warp_connector = warp_connector
-
-        self.create = to_streamed_response_wrapper(
-            warp_connector.create,
-        )
-        self.list = to_streamed_response_wrapper(
-            warp_connector.list,
-        )
-        self.delete = to_streamed_response_wrapper(
-            warp_connector.delete,
-        )
-        self.edit = to_streamed_response_wrapper(
-            warp_connector.edit,
-        )
-        self.get = to_streamed_response_wrapper(
-            warp_connector.get,
-        )
-        self.token = to_streamed_response_wrapper(
-            warp_connector.token,
-        )
-
-
-class AsyncWARPConnectorResourceWithStreamingResponse:
-    def __init__(self, warp_connector: AsyncWARPConnectorResource) -> None:
-        self._warp_connector = warp_connector
-
-        self.create = async_to_streamed_response_wrapper(
-            warp_connector.create,
-        )
-        self.list = async_to_streamed_response_wrapper(
-            warp_connector.list,
-        )
-        self.delete = async_to_streamed_response_wrapper(
-            warp_connector.delete,
-        )
-        self.edit = async_to_streamed_response_wrapper(
-            warp_connector.edit,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            warp_connector.get,
-        )
-        self.token = async_to_streamed_response_wrapper(
-            warp_connector.token,
-        )
diff --git a/src/cloudflare/resources/web3/hostnames/hostnames.py b/src/cloudflare/resources/web3/hostnames/hostnames.py
index f0d2e53f58a..e10e570a89d 100644
--- a/src/cloudflare/resources/web3/hostnames/hostnames.py
+++ b/src/cloudflare/resources/web3/hostnames/hostnames.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -24,7 +21,9 @@
 from ....pagination import SyncSinglePage, AsyncSinglePage
 from ....types.web3 import hostname_edit_params, hostname_create_params
 from ...._base_client import AsyncPaginator, make_request_options
-from .ipfs_universal_paths import (
+from ....types.web3.hostname import Hostname
+from ....types.web3.hostname_delete_response import HostnameDeleteResponse
+from .ipfs_universal_paths.ipfs_universal_paths import (
     IPFSUniversalPathsResource,
     AsyncIPFSUniversalPathsResource,
     IPFSUniversalPathsResourceWithRawResponse,
@@ -32,9 +31,6 @@
     IPFSUniversalPathsResourceWithStreamingResponse,
     AsyncIPFSUniversalPathsResourceWithStreamingResponse,
 )
-from ....types.web3.hostname import Hostname
-from ....types.web3.hostname_delete_response import HostnameDeleteResponse
-from .ipfs_universal_paths.ipfs_universal_paths import IPFSUniversalPathsResource, AsyncIPFSUniversalPathsResource
 
 __all__ = ["HostnamesResource", "AsyncHostnamesResource"]
 
@@ -46,37 +42,51 @@ def ipfs_universal_paths(self) -> IPFSUniversalPathsResource:
 
     @cached_property
     def with_raw_response(self) -> HostnamesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return HostnamesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> HostnamesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return HostnamesResourceWithStreamingResponse(self)
 
     def create(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
+        name: str,
         target: Literal["ethereum", "ipfs", "ipfs_universal_path"],
-        description: str | NotGiven = NOT_GIVEN,
-        dnslink: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        dnslink: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Hostname:
         """
         Create Web3 Hostname
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
+
+          name: Specify the hostname that points to the target gateway via CNAME.
 
-          target: Target gateway of the hostname.
+          target: Specify the target gateway of the hostname.
 
-          description: An optional description of the hostname.
+          description: Specify an optional description of the hostname.
 
-          dnslink: DNSLink value used if the target is ipfs.
+          dnslink: Specify the DNSLink value used if the target is ipfs.
 
           extra_headers: Send extra headers
 
@@ -86,12 +96,13 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._post(
-            f"/zones/{zone_identifier}/web3/hostnames",
+            f"/zones/{zone_id}/web3/hostnames",
             body=maybe_transform(
                 {
+                    "name": name,
                     "target": target,
                     "description": description,
                     "dnslink": dnslink,
@@ -110,20 +121,20 @@ def create(
 
     def list(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Hostname]:
         """
         List Web3 Hostnames
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
           extra_headers: Send extra headers
 
@@ -133,10 +144,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/web3/hostnames",
+            f"/zones/{zone_id}/web3/hostnames",
             page=SyncSinglePage[Hostname],
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
@@ -148,21 +159,21 @@ def delete(
         self,
         identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[HostnameDeleteResponse]:
         """
         Delete Web3 Hostname
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
           extra_headers: Send extra headers
 
@@ -172,12 +183,12 @@ def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         return self._delete(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -192,27 +203,27 @@ def edit(
         self,
         identifier: str,
         *,
-        zone_identifier: str,
-        description: str | NotGiven = NOT_GIVEN,
-        dnslink: str | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        description: str | Omit = omit,
+        dnslink: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Hostname:
         """
         Edit Web3 Hostname
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
-          description: An optional description of the hostname.
+          description: Specify an optional description of the hostname.
 
-          dnslink: DNSLink value used if the target is ipfs.
+          dnslink: Specify the DNSLink value used if the target is ipfs.
 
           extra_headers: Send extra headers
 
@@ -222,12 +233,12 @@ def edit(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         return self._patch(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}",
             body=maybe_transform(
                 {
                     "description": description,
@@ -249,21 +260,21 @@ def get(
         self,
         identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Hostname:
         """
         Web3 Hostname Details
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
           extra_headers: Send extra headers
 
@@ -273,12 +284,12 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         return self._get(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -297,37 +308,51 @@ def ipfs_universal_paths(self) -> AsyncIPFSUniversalPathsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncHostnamesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncHostnamesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncHostnamesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncHostnamesResourceWithStreamingResponse(self)
 
     async def create(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
+        name: str,
         target: Literal["ethereum", "ipfs", "ipfs_universal_path"],
-        description: str | NotGiven = NOT_GIVEN,
-        dnslink: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        dnslink: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Hostname:
         """
         Create Web3 Hostname
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
+
+          name: Specify the hostname that points to the target gateway via CNAME.
 
-          target: Target gateway of the hostname.
+          target: Specify the target gateway of the hostname.
 
-          description: An optional description of the hostname.
+          description: Specify an optional description of the hostname.
 
-          dnslink: DNSLink value used if the target is ipfs.
+          dnslink: Specify the DNSLink value used if the target is ipfs.
 
           extra_headers: Send extra headers
 
@@ -337,12 +362,13 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return await self._post(
-            f"/zones/{zone_identifier}/web3/hostnames",
+            f"/zones/{zone_id}/web3/hostnames",
             body=await async_maybe_transform(
                 {
+                    "name": name,
                     "target": target,
                     "description": description,
                     "dnslink": dnslink,
@@ -361,20 +387,20 @@ async def create(
 
     def list(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Hostname, AsyncSinglePage[Hostname]]:
         """
         List Web3 Hostnames
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
           extra_headers: Send extra headers
 
@@ -384,10 +410,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/web3/hostnames",
+            f"/zones/{zone_id}/web3/hostnames",
             page=AsyncSinglePage[Hostname],
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
@@ -399,21 +425,21 @@ async def delete(
         self,
         identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[HostnameDeleteResponse]:
         """
         Delete Web3 Hostname
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
           extra_headers: Send extra headers
 
@@ -423,12 +449,12 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         return await self._delete(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -443,27 +469,27 @@ async def edit(
         self,
         identifier: str,
         *,
-        zone_identifier: str,
-        description: str | NotGiven = NOT_GIVEN,
-        dnslink: str | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        description: str | Omit = omit,
+        dnslink: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Hostname:
         """
         Edit Web3 Hostname
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
-          description: An optional description of the hostname.
+          description: Specify an optional description of the hostname.
 
-          dnslink: DNSLink value used if the target is ipfs.
+          dnslink: Specify the DNSLink value used if the target is ipfs.
 
           extra_headers: Send extra headers
 
@@ -473,12 +499,12 @@ async def edit(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         return await self._patch(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}",
             body=await async_maybe_transform(
                 {
                     "description": description,
@@ -500,21 +526,21 @@ async def get(
         self,
         identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Hostname:
         """
         Web3 Hostname Details
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
           extra_headers: Send extra headers
 
@@ -524,12 +550,12 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         return await self._get(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
diff --git a/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/content_lists.py b/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/content_lists.py
index 3230e01fe76..609d79b3ba8 100644
--- a/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/content_lists.py
+++ b/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/content_lists.py
@@ -15,11 +15,8 @@
     EntriesResourceWithStreamingResponse,
     AsyncEntriesResourceWithStreamingResponse,
 )
-from ......_types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ......_utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ......_types import Body, Query, Headers, NotGiven, not_given
+from ......_utils import maybe_transform, async_maybe_transform
 from ......_compat import cached_property
 from ......_resource import SyncAPIResource, AsyncAPIResource
 from ......_response import (
@@ -43,17 +40,28 @@ def entries(self) -> EntriesResource:
 
     @cached_property
     def with_raw_response(self) -> ContentListsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ContentListsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ContentListsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ContentListsResourceWithStreamingResponse(self)
 
     def update(
         self,
         identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         action: Literal["block"],
         entries: Iterable[content_list_update_params.Entry],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@@ -61,19 +69,19 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ContentList:
         """
         Update IPFS Universal Path Gateway Content List
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
           action: Behavior of the content list.
 
-          entries: Content list entries.
+          entries: Provides content list entries.
 
           extra_headers: Send extra headers
 
@@ -83,12 +91,12 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         return self._put(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list",
             body=maybe_transform(
                 {
                     "action": action,
@@ -110,21 +118,21 @@ def get(
         self,
         identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ContentList:
         """
         IPFS Universal Path Gateway Content List Details
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
           extra_headers: Send extra headers
 
@@ -134,12 +142,12 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         return self._get(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -158,17 +166,28 @@ def entries(self) -> AsyncEntriesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncContentListsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncContentListsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncContentListsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncContentListsResourceWithStreamingResponse(self)
 
     async def update(
         self,
         identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         action: Literal["block"],
         entries: Iterable[content_list_update_params.Entry],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@@ -176,19 +195,19 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ContentList:
         """
         Update IPFS Universal Path Gateway Content List
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
           action: Behavior of the content list.
 
-          entries: Content list entries.
+          entries: Provides content list entries.
 
           extra_headers: Send extra headers
 
@@ -198,12 +217,12 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         return await self._put(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list",
             body=await async_maybe_transform(
                 {
                     "action": action,
@@ -225,21 +244,21 @@ async def get(
         self,
         identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ContentList:
         """
         IPFS Universal Path Gateway Content List Details
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
           extra_headers: Send extra headers
 
@@ -249,12 +268,12 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         return await self._get(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
diff --git a/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py b/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py
index 488eaacca22..4e784613f55 100644
--- a/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py
+++ b/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ......_types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ......_utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ......_types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ......_utils import maybe_transform, async_maybe_transform
 from ......_compat import cached_property
 from ......_resource import SyncAPIResource, AsyncAPIResource
 from ......_response import (
@@ -35,40 +32,51 @@
 class EntriesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> EntriesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return EntriesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> EntriesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return EntriesResourceWithStreamingResponse(self)
 
     def create(
         self,
         identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         content: str,
         type: Literal["cid", "content_path"],
-        description: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> EntryCreateResponse:
         """
         Create IPFS Universal Path Gateway Content List Entry
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
-          content: CID or content path of content to block.
+          content: Specify the CID or content path of content to block.
 
-          type: Type of content list entry to block.
+          type: Specify the type of content list entry to block.
 
-          description: An optional description of the content list entry.
+          description: Specify an optional description of the content list entry.
 
           extra_headers: Send extra headers
 
@@ -78,12 +86,12 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         return self._post(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries",
             body=maybe_transform(
                 {
                     "content": content,
@@ -106,33 +114,33 @@ def update(
         self,
         content_list_entry_identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         identifier: str,
         content: str,
         type: Literal["cid", "content_path"],
-        description: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> EntryUpdateResponse:
         """
         Edit IPFS Universal Path Gateway Content List Entry
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
-          content_list_entry_identifier: Identifier
+          content_list_entry_identifier: Specify the identifier of the hostname.
 
-          content: CID or content path of content to block.
+          content: Specify the CID or content path of content to block.
 
-          type: Type of content list entry to block.
+          type: Specify the type of content list entry to block.
 
-          description: An optional description of the content list entry.
+          description: Specify an optional description of the content list entry.
 
           extra_headers: Send extra headers
 
@@ -142,8 +150,8 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         if not content_list_entry_identifier:
@@ -151,7 +159,7 @@ def update(
                 f"Expected a non-empty value for `content_list_entry_identifier` but received {content_list_entry_identifier!r}"
             )
         return self._put(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}",
             body=maybe_transform(
                 {
                     "content": content,
@@ -174,21 +182,21 @@ def list(
         self,
         identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[EntryListResponse]:
         """
         List IPFS Universal Path Gateway Content List Entries
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
           extra_headers: Send extra headers
 
@@ -198,12 +206,12 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         return self._get(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -218,24 +226,24 @@ def delete(
         self,
         content_list_entry_identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         identifier: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[EntryDeleteResponse]:
         """
         Delete IPFS Universal Path Gateway Content List Entry
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
-          content_list_entry_identifier: Identifier
+          content_list_entry_identifier: Specify the identifier of the hostname.
 
           extra_headers: Send extra headers
 
@@ -245,8 +253,8 @@ def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         if not content_list_entry_identifier:
@@ -254,7 +262,7 @@ def delete(
                 f"Expected a non-empty value for `content_list_entry_identifier` but received {content_list_entry_identifier!r}"
             )
         return self._delete(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -269,24 +277,24 @@ def get(
         self,
         content_list_entry_identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         identifier: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> EntryGetResponse:
         """
         IPFS Universal Path Gateway Content List Entry Details
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
-          content_list_entry_identifier: Identifier
+          content_list_entry_identifier: Specify the identifier of the hostname.
 
           extra_headers: Send extra headers
 
@@ -296,8 +304,8 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         if not content_list_entry_identifier:
@@ -305,7 +313,7 @@ def get(
                 f"Expected a non-empty value for `content_list_entry_identifier` but received {content_list_entry_identifier!r}"
             )
         return self._get(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -320,40 +328,51 @@ def get(
 class AsyncEntriesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncEntriesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncEntriesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncEntriesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncEntriesResourceWithStreamingResponse(self)
 
     async def create(
         self,
         identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         content: str,
         type: Literal["cid", "content_path"],
-        description: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> EntryCreateResponse:
         """
         Create IPFS Universal Path Gateway Content List Entry
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
-          content: CID or content path of content to block.
+          content: Specify the CID or content path of content to block.
 
-          type: Type of content list entry to block.
+          type: Specify the type of content list entry to block.
 
-          description: An optional description of the content list entry.
+          description: Specify an optional description of the content list entry.
 
           extra_headers: Send extra headers
 
@@ -363,12 +382,12 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         return await self._post(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries",
             body=await async_maybe_transform(
                 {
                     "content": content,
@@ -391,33 +410,33 @@ async def update(
         self,
         content_list_entry_identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         identifier: str,
         content: str,
         type: Literal["cid", "content_path"],
-        description: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> EntryUpdateResponse:
         """
         Edit IPFS Universal Path Gateway Content List Entry
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
-          content_list_entry_identifier: Identifier
+          content_list_entry_identifier: Specify the identifier of the hostname.
 
-          content: CID or content path of content to block.
+          content: Specify the CID or content path of content to block.
 
-          type: Type of content list entry to block.
+          type: Specify the type of content list entry to block.
 
-          description: An optional description of the content list entry.
+          description: Specify an optional description of the content list entry.
 
           extra_headers: Send extra headers
 
@@ -427,8 +446,8 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         if not content_list_entry_identifier:
@@ -436,7 +455,7 @@ async def update(
                 f"Expected a non-empty value for `content_list_entry_identifier` but received {content_list_entry_identifier!r}"
             )
         return await self._put(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}",
             body=await async_maybe_transform(
                 {
                     "content": content,
@@ -459,21 +478,21 @@ async def list(
         self,
         identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[EntryListResponse]:
         """
         List IPFS Universal Path Gateway Content List Entries
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
           extra_headers: Send extra headers
 
@@ -483,12 +502,12 @@ async def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         return await self._get(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -503,24 +522,24 @@ async def delete(
         self,
         content_list_entry_identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         identifier: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[EntryDeleteResponse]:
         """
         Delete IPFS Universal Path Gateway Content List Entry
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
-          content_list_entry_identifier: Identifier
+          content_list_entry_identifier: Specify the identifier of the hostname.
 
           extra_headers: Send extra headers
 
@@ -530,8 +549,8 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         if not content_list_entry_identifier:
@@ -539,7 +558,7 @@ async def delete(
                 f"Expected a non-empty value for `content_list_entry_identifier` but received {content_list_entry_identifier!r}"
             )
         return await self._delete(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -554,24 +573,24 @@ async def get(
         self,
         content_list_entry_identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         identifier: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> EntryGetResponse:
         """
         IPFS Universal Path Gateway Content List Entry Details
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Specify the identifier of the hostname.
 
-          identifier: Identifier
+          identifier: Specify the identifier of the hostname.
 
-          content_list_entry_identifier: Identifier
+          content_list_entry_identifier: Specify the identifier of the hostname.
 
           extra_headers: Send extra headers
 
@@ -581,8 +600,8 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not identifier:
             raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
         if not content_list_entry_identifier:
@@ -590,7 +609,7 @@ async def get(
                 f"Expected a non-empty value for `content_list_entry_identifier` but received {content_list_entry_identifier!r}"
             )
         return await self._get(
-            f"/zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}",
+            f"/zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
diff --git a/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/ipfs_universal_paths.py b/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/ipfs_universal_paths.py
index d47da398b84..87b695bacc2 100644
--- a/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/ipfs_universal_paths.py
+++ b/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/ipfs_universal_paths.py
@@ -4,7 +4,7 @@
 
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
-from .content_lists import (
+from .content_lists.content_lists import (
     ContentListsResource,
     AsyncContentListsResource,
     ContentListsResourceWithRawResponse,
@@ -12,7 +12,6 @@
     ContentListsResourceWithStreamingResponse,
     AsyncContentListsResourceWithStreamingResponse,
 )
-from .content_lists.content_lists import ContentListsResource, AsyncContentListsResource
 
 __all__ = ["IPFSUniversalPathsResource", "AsyncIPFSUniversalPathsResource"]
 
@@ -24,10 +23,21 @@ def content_lists(self) -> ContentListsResource:
 
     @cached_property
     def with_raw_response(self) -> IPFSUniversalPathsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return IPFSUniversalPathsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> IPFSUniversalPathsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return IPFSUniversalPathsResourceWithStreamingResponse(self)
 
 
@@ -38,10 +48,21 @@ def content_lists(self) -> AsyncContentListsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncIPFSUniversalPathsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncIPFSUniversalPathsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncIPFSUniversalPathsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncIPFSUniversalPathsResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/web3/web3.py b/src/cloudflare/resources/web3/web3.py
index 642a8781cd1..da328969054 100644
--- a/src/cloudflare/resources/web3/web3.py
+++ b/src/cloudflare/resources/web3/web3.py
@@ -3,7 +3,8 @@
 from __future__ import annotations
 
 from ..._compat import cached_property
-from .hostnames import (
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .hostnames.hostnames import (
     HostnamesResource,
     AsyncHostnamesResource,
     HostnamesResourceWithRawResponse,
@@ -11,8 +12,6 @@
     HostnamesResourceWithStreamingResponse,
     AsyncHostnamesResourceWithStreamingResponse,
 )
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .hostnames.hostnames import HostnamesResource, AsyncHostnamesResource
 
 __all__ = ["Web3Resource", "AsyncWeb3Resource"]
 
@@ -24,10 +23,21 @@ def hostnames(self) -> HostnamesResource:
 
     @cached_property
     def with_raw_response(self) -> Web3ResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return Web3ResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> Web3ResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return Web3ResourceWithStreamingResponse(self)
 
 
@@ -38,10 +48,21 @@ def hostnames(self) -> AsyncHostnamesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncWeb3ResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncWeb3ResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncWeb3ResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncWeb3ResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/workers/__init__.py b/src/cloudflare/resources/workers/__init__.py
index fd4a31df9d7..67e210847ab 100644
--- a/src/cloudflare/resources/workers/__init__.py
+++ b/src/cloudflare/resources/workers/__init__.py
@@ -1,12 +1,28 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from .ai import (
-    AIResource,
-    AsyncAIResource,
-    AIResourceWithRawResponse,
-    AsyncAIResourceWithRawResponse,
-    AIResourceWithStreamingResponse,
-    AsyncAIResourceWithStreamingResponse,
+from .beta import (
+    BetaResource,
+    AsyncBetaResource,
+    BetaResourceWithRawResponse,
+    AsyncBetaResourceWithRawResponse,
+    BetaResourceWithStreamingResponse,
+    AsyncBetaResourceWithStreamingResponse,
+)
+from .assets import (
+    AssetsResource,
+    AsyncAssetsResource,
+    AssetsResourceWithRawResponse,
+    AsyncAssetsResourceWithRawResponse,
+    AssetsResourceWithStreamingResponse,
+    AsyncAssetsResourceWithStreamingResponse,
+)
+from .routes import (
+    RoutesResource,
+    AsyncRoutesResource,
+    RoutesResourceWithRawResponse,
+    AsyncRoutesResourceWithRawResponse,
+    RoutesResourceWithStreamingResponse,
+    AsyncRoutesResourceWithStreamingResponse,
 )
 from .domains import (
     DomainsResource,
@@ -40,6 +56,14 @@
     SubdomainsResourceWithStreamingResponse,
     AsyncSubdomainsResourceWithStreamingResponse,
 )
+from .observability import (
+    ObservabilityResource,
+    AsyncObservabilityResource,
+    ObservabilityResourceWithRawResponse,
+    AsyncObservabilityResourceWithRawResponse,
+    ObservabilityResourceWithStreamingResponse,
+    AsyncObservabilityResourceWithStreamingResponse,
+)
 from .account_settings import (
     AccountSettingsResource,
     AsyncAccountSettingsResource,
@@ -50,12 +74,24 @@
 )
 
 __all__ = [
-    "AIResource",
-    "AsyncAIResource",
-    "AIResourceWithRawResponse",
-    "AsyncAIResourceWithRawResponse",
-    "AIResourceWithStreamingResponse",
-    "AsyncAIResourceWithStreamingResponse",
+    "BetaResource",
+    "AsyncBetaResource",
+    "BetaResourceWithRawResponse",
+    "AsyncBetaResourceWithRawResponse",
+    "BetaResourceWithStreamingResponse",
+    "AsyncBetaResourceWithStreamingResponse",
+    "RoutesResource",
+    "AsyncRoutesResource",
+    "RoutesResourceWithRawResponse",
+    "AsyncRoutesResourceWithRawResponse",
+    "RoutesResourceWithStreamingResponse",
+    "AsyncRoutesResourceWithStreamingResponse",
+    "AssetsResource",
+    "AsyncAssetsResource",
+    "AssetsResourceWithRawResponse",
+    "AsyncAssetsResourceWithRawResponse",
+    "AssetsResourceWithStreamingResponse",
+    "AsyncAssetsResourceWithStreamingResponse",
     "ScriptsResource",
     "AsyncScriptsResource",
     "ScriptsResourceWithRawResponse",
@@ -80,6 +116,12 @@
     "AsyncSubdomainsResourceWithRawResponse",
     "SubdomainsResourceWithStreamingResponse",
     "AsyncSubdomainsResourceWithStreamingResponse",
+    "ObservabilityResource",
+    "AsyncObservabilityResource",
+    "ObservabilityResourceWithRawResponse",
+    "AsyncObservabilityResourceWithRawResponse",
+    "ObservabilityResourceWithStreamingResponse",
+    "AsyncObservabilityResourceWithStreamingResponse",
     "WorkersResource",
     "AsyncWorkersResource",
     "WorkersResourceWithRawResponse",
diff --git a/src/cloudflare/resources/workers/account_settings.py b/src/cloudflare/resources/workers/account_settings.py
index eb77cdd8b01..ad45917e32d 100644
--- a/src/cloudflare/resources/workers/account_settings.py
+++ b/src/cloudflare/resources/workers/account_settings.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Type, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -31,29 +28,41 @@
 class AccountSettingsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AccountSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AccountSettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AccountSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AccountSettingsResourceWithStreamingResponse(self)
 
     def update(
         self,
         *,
         account_id: str,
-        body: str,
+        default_usage_model: str | Omit = omit,
+        green_compute: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AccountSettingUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AccountSettingUpdateResponse:
         """
         Creates Worker account settings for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -67,15 +76,21 @@ def update(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._put(
             f"/accounts/{account_id}/workers/account-settings",
-            body=maybe_transform(body, account_setting_update_params.AccountSettingUpdateParams),
+            body=maybe_transform(
+                {
+                    "default_usage_model": default_usage_model,
+                    "green_compute": green_compute,
+                },
+                account_setting_update_params.AccountSettingUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[AccountSettingUpdateResponse]]._unwrapper,
+                post_parser=ResultWrapper[AccountSettingUpdateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[AccountSettingUpdateResponse]], ResultWrapper[AccountSettingUpdateResponse]),
+            cast_to=cast(Type[AccountSettingUpdateResponse], ResultWrapper[AccountSettingUpdateResponse]),
         )
 
     def get(
@@ -87,13 +102,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AccountSettingGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AccountSettingGetResponse:
         """
         Fetches Worker account settings for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -112,38 +127,50 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[AccountSettingGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[AccountSettingGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[AccountSettingGetResponse]], ResultWrapper[AccountSettingGetResponse]),
+            cast_to=cast(Type[AccountSettingGetResponse], ResultWrapper[AccountSettingGetResponse]),
         )
 
 
 class AsyncAccountSettingsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncAccountSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAccountSettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAccountSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAccountSettingsResourceWithStreamingResponse(self)
 
     async def update(
         self,
         *,
         account_id: str,
-        body: str,
+        default_usage_model: str | Omit = omit,
+        green_compute: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AccountSettingUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AccountSettingUpdateResponse:
         """
         Creates Worker account settings for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -157,15 +184,21 @@ async def update(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._put(
             f"/accounts/{account_id}/workers/account-settings",
-            body=await async_maybe_transform(body, account_setting_update_params.AccountSettingUpdateParams),
+            body=await async_maybe_transform(
+                {
+                    "default_usage_model": default_usage_model,
+                    "green_compute": green_compute,
+                },
+                account_setting_update_params.AccountSettingUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[AccountSettingUpdateResponse]]._unwrapper,
+                post_parser=ResultWrapper[AccountSettingUpdateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[AccountSettingUpdateResponse]], ResultWrapper[AccountSettingUpdateResponse]),
+            cast_to=cast(Type[AccountSettingUpdateResponse], ResultWrapper[AccountSettingUpdateResponse]),
         )
 
     async def get(
@@ -177,13 +210,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AccountSettingGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AccountSettingGetResponse:
         """
         Fetches Worker account settings for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -202,9 +235,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[AccountSettingGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[AccountSettingGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[AccountSettingGetResponse]], ResultWrapper[AccountSettingGetResponse]),
+            cast_to=cast(Type[AccountSettingGetResponse], ResultWrapper[AccountSettingGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/workers/ai/__init__.py b/src/cloudflare/resources/workers/ai/__init__.py
deleted file mode 100644
index 4921cf245a4..00000000000
--- a/src/cloudflare/resources/workers/ai/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from .ai import (
-    AIResource,
-    AsyncAIResource,
-    AIResourceWithRawResponse,
-    AsyncAIResourceWithRawResponse,
-    AIResourceWithStreamingResponse,
-    AsyncAIResourceWithStreamingResponse,
-)
-from .models import (
-    ModelsResource,
-    AsyncModelsResource,
-    ModelsResourceWithRawResponse,
-    AsyncModelsResourceWithRawResponse,
-    ModelsResourceWithStreamingResponse,
-    AsyncModelsResourceWithStreamingResponse,
-)
-
-__all__ = [
-    "ModelsResource",
-    "AsyncModelsResource",
-    "ModelsResourceWithRawResponse",
-    "AsyncModelsResourceWithRawResponse",
-    "ModelsResourceWithStreamingResponse",
-    "AsyncModelsResourceWithStreamingResponse",
-    "AIResource",
-    "AsyncAIResource",
-    "AIResourceWithRawResponse",
-    "AsyncAIResourceWithRawResponse",
-    "AIResourceWithStreamingResponse",
-    "AsyncAIResourceWithStreamingResponse",
-]
diff --git a/src/cloudflare/resources/workers/ai/ai.py b/src/cloudflare/resources/workers/ai/ai.py
deleted file mode 100644
index 673262c5fed..00000000000
--- a/src/cloudflare/resources/workers/ai/ai.py
+++ /dev/null
@@ -1,1211 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Any, List, Union, Iterable, Optional, cast, overload
-
-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,
-    maybe_transform,
-    async_maybe_transform,
-)
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ...._wrappers import ResultWrapper
-from .models.models import ModelsResource, AsyncModelsResource
-from ...._base_client import make_request_options
-from ....types.workers import ai_run_params
-from ....types.workers.ai_run_response import AIRunResponse
-
-__all__ = ["AIResource", "AsyncAIResource"]
-
-
-class AIResource(SyncAPIResource):
-    @cached_property
-    def models(self) -> ModelsResource:
-        return ModelsResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AIResourceWithRawResponse:
-        return AIResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AIResourceWithStreamingResponse:
-        return AIResourceWithStreamingResponse(self)
-
-    @overload
-    def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        text: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        prompt: str,
-        guidance: float | NotGiven = NOT_GIVEN,
-        height: int | NotGiven = NOT_GIVEN,
-        image: Iterable[float] | NotGiven = NOT_GIVEN,
-        image_b64: str | NotGiven = NOT_GIVEN,
-        lora_weights: Iterable[float] | NotGiven = NOT_GIVEN,
-        loras: List[str] | NotGiven = NOT_GIVEN,
-        mask: Iterable[float] | NotGiven = NOT_GIVEN,
-        negative_prompt: str | NotGiven = NOT_GIVEN,
-        num_steps: int | NotGiven = NOT_GIVEN,
-        seed: int | NotGiven = NOT_GIVEN,
-        strength: float | NotGiven = NOT_GIVEN,
-        width: int | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        text: Union[str, List[str]],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        audio: Iterable[float],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        image: Iterable[float],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        image: Iterable[float] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        prompt: str,
-        frequency_penalty: float | NotGiven = NOT_GIVEN,
-        lora: str | NotGiven = NOT_GIVEN,
-        max_tokens: int | NotGiven = NOT_GIVEN,
-        presence_penalty: float | NotGiven = NOT_GIVEN,
-        raw: bool | NotGiven = NOT_GIVEN,
-        repetition_penalty: float | NotGiven = NOT_GIVEN,
-        seed: int | NotGiven = NOT_GIVEN,
-        stream: bool | NotGiven = NOT_GIVEN,
-        temperature: float | NotGiven = NOT_GIVEN,
-        top_k: int | NotGiven = NOT_GIVEN,
-        top_p: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        messages: Iterable[ai_run_params.Variant7Message],
-        frequency_penalty: float | NotGiven = NOT_GIVEN,
-        max_tokens: int | NotGiven = NOT_GIVEN,
-        presence_penalty: float | NotGiven = NOT_GIVEN,
-        repetition_penalty: float | NotGiven = NOT_GIVEN,
-        seed: int | NotGiven = NOT_GIVEN,
-        stream: bool | NotGiven = NOT_GIVEN,
-        temperature: float | NotGiven = NOT_GIVEN,
-        tools: Iterable[ai_run_params.Variant7Tool] | NotGiven = NOT_GIVEN,
-        top_k: int | NotGiven = NOT_GIVEN,
-        top_p: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        target_lang: str,
-        text: str,
-        source_lang: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        input_text: str,
-        max_length: int | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        image: Iterable[float],
-        max_tokens: int | NotGiven = NOT_GIVEN,
-        messages: Iterable[ai_run_params.ImageToTextMessage] | NotGiven = NOT_GIVEN,
-        prompt: str | NotGiven = NOT_GIVEN,
-        raw: bool | NotGiven = NOT_GIVEN,
-        temperature: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @required_args(
-        ["account_id", "text"],
-        ["account_id", "prompt"],
-        ["account_id", "audio"],
-        ["account_id", "image"],
-        ["account_id"],
-        ["account_id", "messages"],
-        ["account_id", "target_lang", "text"],
-        ["account_id", "input_text"],
-    )
-    def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        text: str | Union[str, List[str]] | NotGiven = NOT_GIVEN,
-        prompt: str | NotGiven = NOT_GIVEN,
-        guidance: float | NotGiven = NOT_GIVEN,
-        height: int | NotGiven = NOT_GIVEN,
-        image: Iterable[float] | NotGiven = NOT_GIVEN,
-        image_b64: str | NotGiven = NOT_GIVEN,
-        lora_weights: Iterable[float] | NotGiven = NOT_GIVEN,
-        loras: List[str] | NotGiven = NOT_GIVEN,
-        mask: Iterable[float] | NotGiven = NOT_GIVEN,
-        negative_prompt: str | NotGiven = NOT_GIVEN,
-        num_steps: int | NotGiven = NOT_GIVEN,
-        seed: int | NotGiven = NOT_GIVEN,
-        strength: float | NotGiven = NOT_GIVEN,
-        width: int | NotGiven = NOT_GIVEN,
-        audio: Iterable[float] | NotGiven = NOT_GIVEN,
-        frequency_penalty: float | NotGiven = NOT_GIVEN,
-        lora: str | NotGiven = NOT_GIVEN,
-        max_tokens: int | NotGiven = NOT_GIVEN,
-        presence_penalty: float | NotGiven = NOT_GIVEN,
-        raw: bool | NotGiven = NOT_GIVEN,
-        repetition_penalty: float | NotGiven = NOT_GIVEN,
-        stream: bool | NotGiven = NOT_GIVEN,
-        temperature: float | NotGiven = NOT_GIVEN,
-        top_k: int | NotGiven = NOT_GIVEN,
-        top_p: float | NotGiven = NOT_GIVEN,
-        messages: Iterable[ai_run_params.Variant7Message] | NotGiven = NOT_GIVEN,
-        tools: Iterable[ai_run_params.Variant7Tool] | NotGiven = NOT_GIVEN,
-        target_lang: str | NotGiven = NOT_GIVEN,
-        source_lang: str | NotGiven = NOT_GIVEN,
-        input_text: str | NotGiven = NOT_GIVEN,
-        max_length: int | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not model_name:
-            raise ValueError(f"Expected a non-empty value for `model_name` but received {model_name!r}")
-        return cast(
-            Optional[AIRunResponse],
-            self._post(
-                f"/accounts/{account_id}/ai/run/{model_name}",
-                body=maybe_transform(
-                    {
-                        "text": text,
-                        "prompt": prompt,
-                        "guidance": guidance,
-                        "height": height,
-                        "image": image,
-                        "image_b64": image_b64,
-                        "lora_weights": lora_weights,
-                        "loras": loras,
-                        "mask": mask,
-                        "negative_prompt": negative_prompt,
-                        "num_steps": num_steps,
-                        "seed": seed,
-                        "strength": strength,
-                        "width": width,
-                        "audio": audio,
-                        "frequency_penalty": frequency_penalty,
-                        "lora": lora,
-                        "max_tokens": max_tokens,
-                        "presence_penalty": presence_penalty,
-                        "raw": raw,
-                        "repetition_penalty": repetition_penalty,
-                        "stream": stream,
-                        "temperature": temperature,
-                        "top_k": top_k,
-                        "top_p": top_p,
-                        "messages": messages,
-                        "tools": tools,
-                        "target_lang": target_lang,
-                        "source_lang": source_lang,
-                        "input_text": input_text,
-                        "max_length": max_length,
-                    },
-                    ai_run_params.AIRunParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[AIRunResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AIRunResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class AsyncAIResource(AsyncAPIResource):
-    @cached_property
-    def models(self) -> AsyncModelsResource:
-        return AsyncModelsResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncAIResourceWithRawResponse:
-        return AsyncAIResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncAIResourceWithStreamingResponse:
-        return AsyncAIResourceWithStreamingResponse(self)
-
-    @overload
-    async def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        text: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        prompt: str,
-        guidance: float | NotGiven = NOT_GIVEN,
-        height: int | NotGiven = NOT_GIVEN,
-        image: Iterable[float] | NotGiven = NOT_GIVEN,
-        image_b64: str | NotGiven = NOT_GIVEN,
-        lora_weights: Iterable[float] | NotGiven = NOT_GIVEN,
-        loras: List[str] | NotGiven = NOT_GIVEN,
-        mask: Iterable[float] | NotGiven = NOT_GIVEN,
-        negative_prompt: str | NotGiven = NOT_GIVEN,
-        num_steps: int | NotGiven = NOT_GIVEN,
-        seed: int | NotGiven = NOT_GIVEN,
-        strength: float | NotGiven = NOT_GIVEN,
-        width: int | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        text: Union[str, List[str]],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        audio: Iterable[float],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        image: Iterable[float],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        image: Iterable[float] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        prompt: str,
-        frequency_penalty: float | NotGiven = NOT_GIVEN,
-        lora: str | NotGiven = NOT_GIVEN,
-        max_tokens: int | NotGiven = NOT_GIVEN,
-        presence_penalty: float | NotGiven = NOT_GIVEN,
-        raw: bool | NotGiven = NOT_GIVEN,
-        repetition_penalty: float | NotGiven = NOT_GIVEN,
-        seed: int | NotGiven = NOT_GIVEN,
-        stream: bool | NotGiven = NOT_GIVEN,
-        temperature: float | NotGiven = NOT_GIVEN,
-        top_k: int | NotGiven = NOT_GIVEN,
-        top_p: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        messages: Iterable[ai_run_params.Variant7Message],
-        frequency_penalty: float | NotGiven = NOT_GIVEN,
-        max_tokens: int | NotGiven = NOT_GIVEN,
-        presence_penalty: float | NotGiven = NOT_GIVEN,
-        repetition_penalty: float | NotGiven = NOT_GIVEN,
-        seed: int | NotGiven = NOT_GIVEN,
-        stream: bool | NotGiven = NOT_GIVEN,
-        temperature: float | NotGiven = NOT_GIVEN,
-        tools: Iterable[ai_run_params.Variant7Tool] | NotGiven = NOT_GIVEN,
-        top_k: int | NotGiven = NOT_GIVEN,
-        top_p: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        target_lang: str,
-        text: str,
-        source_lang: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        input_text: str,
-        max_length: int | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        image: Iterable[float],
-        max_tokens: int | NotGiven = NOT_GIVEN,
-        messages: Iterable[ai_run_params.ImageToTextMessage] | NotGiven = NOT_GIVEN,
-        prompt: str | NotGiven = NOT_GIVEN,
-        raw: bool | NotGiven = NOT_GIVEN,
-        temperature: float | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        """
-        This endpoint provides users with the capability to run specific AI models
-        on-demand.
-
-        By submitting the required input data, users can receive real-time predictions
-        or results generated by the chosen AI model. The endpoint supports various AI
-        model types, ensuring flexibility and adaptability for diverse use cases.
-
-        Model specific inputs available in
-        [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @required_args(
-        ["account_id", "text"],
-        ["account_id", "prompt"],
-        ["account_id", "audio"],
-        ["account_id", "image"],
-        ["account_id"],
-        ["account_id", "messages"],
-        ["account_id", "target_lang", "text"],
-        ["account_id", "input_text"],
-    )
-    async def run(
-        self,
-        model_name: str,
-        *,
-        account_id: str,
-        text: str | Union[str, List[str]] | NotGiven = NOT_GIVEN,
-        prompt: str | NotGiven = NOT_GIVEN,
-        guidance: float | NotGiven = NOT_GIVEN,
-        height: int | NotGiven = NOT_GIVEN,
-        image: Iterable[float] | NotGiven = NOT_GIVEN,
-        image_b64: str | NotGiven = NOT_GIVEN,
-        lora_weights: Iterable[float] | NotGiven = NOT_GIVEN,
-        loras: List[str] | NotGiven = NOT_GIVEN,
-        mask: Iterable[float] | NotGiven = NOT_GIVEN,
-        negative_prompt: str | NotGiven = NOT_GIVEN,
-        num_steps: int | NotGiven = NOT_GIVEN,
-        seed: int | NotGiven = NOT_GIVEN,
-        strength: float | NotGiven = NOT_GIVEN,
-        width: int | NotGiven = NOT_GIVEN,
-        audio: Iterable[float] | NotGiven = NOT_GIVEN,
-        frequency_penalty: float | NotGiven = NOT_GIVEN,
-        lora: str | NotGiven = NOT_GIVEN,
-        max_tokens: int | NotGiven = NOT_GIVEN,
-        presence_penalty: float | NotGiven = NOT_GIVEN,
-        raw: bool | NotGiven = NOT_GIVEN,
-        repetition_penalty: float | NotGiven = NOT_GIVEN,
-        stream: bool | NotGiven = NOT_GIVEN,
-        temperature: float | NotGiven = NOT_GIVEN,
-        top_k: int | NotGiven = NOT_GIVEN,
-        top_p: float | NotGiven = NOT_GIVEN,
-        messages: Iterable[ai_run_params.Variant7Message] | NotGiven = NOT_GIVEN,
-        tools: Iterable[ai_run_params.Variant7Tool] | NotGiven = NOT_GIVEN,
-        target_lang: str | NotGiven = NOT_GIVEN,
-        source_lang: str | NotGiven = NOT_GIVEN,
-        input_text: str | NotGiven = NOT_GIVEN,
-        max_length: int | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AIRunResponse]:
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not model_name:
-            raise ValueError(f"Expected a non-empty value for `model_name` but received {model_name!r}")
-        return cast(
-            Optional[AIRunResponse],
-            await self._post(
-                f"/accounts/{account_id}/ai/run/{model_name}",
-                body=await async_maybe_transform(
-                    {
-                        "text": text,
-                        "prompt": prompt,
-                        "guidance": guidance,
-                        "height": height,
-                        "image": image,
-                        "image_b64": image_b64,
-                        "lora_weights": lora_weights,
-                        "loras": loras,
-                        "mask": mask,
-                        "negative_prompt": negative_prompt,
-                        "num_steps": num_steps,
-                        "seed": seed,
-                        "strength": strength,
-                        "width": width,
-                        "audio": audio,
-                        "frequency_penalty": frequency_penalty,
-                        "lora": lora,
-                        "max_tokens": max_tokens,
-                        "presence_penalty": presence_penalty,
-                        "raw": raw,
-                        "repetition_penalty": repetition_penalty,
-                        "stream": stream,
-                        "temperature": temperature,
-                        "top_k": top_k,
-                        "top_p": top_p,
-                        "messages": messages,
-                        "tools": tools,
-                        "target_lang": target_lang,
-                        "source_lang": source_lang,
-                        "input_text": input_text,
-                        "max_length": max_length,
-                    },
-                    ai_run_params.AIRunParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[AIRunResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AIRunResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class AIResourceWithRawResponse:
-    def __init__(self, ai: AIResource) -> None:
-        self._ai = ai
-
-        self.run = to_raw_response_wrapper(
-            ai.run,
-        )
-
-    @cached_property
-    def models(self) -> ModelsResourceWithRawResponse:
-        return ModelsResourceWithRawResponse(self._ai.models)
-
-
-class AsyncAIResourceWithRawResponse:
-    def __init__(self, ai: AsyncAIResource) -> None:
-        self._ai = ai
-
-        self.run = async_to_raw_response_wrapper(
-            ai.run,
-        )
-
-    @cached_property
-    def models(self) -> AsyncModelsResourceWithRawResponse:
-        return AsyncModelsResourceWithRawResponse(self._ai.models)
-
-
-class AIResourceWithStreamingResponse:
-    def __init__(self, ai: AIResource) -> None:
-        self._ai = ai
-
-        self.run = to_streamed_response_wrapper(
-            ai.run,
-        )
-
-    @cached_property
-    def models(self) -> ModelsResourceWithStreamingResponse:
-        return ModelsResourceWithStreamingResponse(self._ai.models)
-
-
-class AsyncAIResourceWithStreamingResponse:
-    def __init__(self, ai: AsyncAIResource) -> None:
-        self._ai = ai
-
-        self.run = async_to_streamed_response_wrapper(
-            ai.run,
-        )
-
-    @cached_property
-    def models(self) -> AsyncModelsResourceWithStreamingResponse:
-        return AsyncModelsResourceWithStreamingResponse(self._ai.models)
diff --git a/src/cloudflare/resources/workers/ai/models/models.py b/src/cloudflare/resources/workers/ai/models/models.py
deleted file mode 100644
index 8f90eb7304d..00000000000
--- a/src/cloudflare/resources/workers/ai/models/models.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from .schema import (
-    SchemaResource,
-    AsyncSchemaResource,
-    SchemaResourceWithRawResponse,
-    AsyncSchemaResourceWithRawResponse,
-    SchemaResourceWithStreamingResponse,
-    AsyncSchemaResourceWithStreamingResponse,
-)
-from ....._compat import cached_property
-from ....._resource import SyncAPIResource, AsyncAPIResource
-
-__all__ = ["ModelsResource", "AsyncModelsResource"]
-
-
-class ModelsResource(SyncAPIResource):
-    @cached_property
-    def schema(self) -> SchemaResource:
-        return SchemaResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> ModelsResourceWithRawResponse:
-        return ModelsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> ModelsResourceWithStreamingResponse:
-        return ModelsResourceWithStreamingResponse(self)
-
-
-class AsyncModelsResource(AsyncAPIResource):
-    @cached_property
-    def schema(self) -> AsyncSchemaResource:
-        return AsyncSchemaResource(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncModelsResourceWithRawResponse:
-        return AsyncModelsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncModelsResourceWithStreamingResponse:
-        return AsyncModelsResourceWithStreamingResponse(self)
-
-
-class ModelsResourceWithRawResponse:
-    def __init__(self, models: ModelsResource) -> None:
-        self._models = models
-
-    @cached_property
-    def schema(self) -> SchemaResourceWithRawResponse:
-        return SchemaResourceWithRawResponse(self._models.schema)
-
-
-class AsyncModelsResourceWithRawResponse:
-    def __init__(self, models: AsyncModelsResource) -> None:
-        self._models = models
-
-    @cached_property
-    def schema(self) -> AsyncSchemaResourceWithRawResponse:
-        return AsyncSchemaResourceWithRawResponse(self._models.schema)
-
-
-class ModelsResourceWithStreamingResponse:
-    def __init__(self, models: ModelsResource) -> None:
-        self._models = models
-
-    @cached_property
-    def schema(self) -> SchemaResourceWithStreamingResponse:
-        return SchemaResourceWithStreamingResponse(self._models.schema)
-
-
-class AsyncModelsResourceWithStreamingResponse:
-    def __init__(self, models: AsyncModelsResource) -> None:
-        self._models = models
-
-    @cached_property
-    def schema(self) -> AsyncSchemaResourceWithStreamingResponse:
-        return AsyncSchemaResourceWithStreamingResponse(self._models.schema)
diff --git a/src/cloudflare/resources/workers/ai/models/schema.py b/src/cloudflare/resources/workers/ai/models/schema.py
deleted file mode 100644
index 7d5d6c3157c..00000000000
--- a/src/cloudflare/resources/workers/ai/models/schema.py
+++ /dev/null
@@ -1,164 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, cast
-
-import httpx
-
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ....._compat import cached_property
-from ....._resource import SyncAPIResource, AsyncAPIResource
-from ....._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ....._wrappers import ResultWrapper
-from ....._base_client import make_request_options
-from .....types.workers.ai.models import schema_get_params
-
-__all__ = ["SchemaResource", "AsyncSchemaResource"]
-
-
-class SchemaResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> SchemaResourceWithRawResponse:
-        return SchemaResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> SchemaResourceWithStreamingResponse:
-        return SchemaResourceWithStreamingResponse(self)
-
-    def get(
-        self,
-        *,
-        account_id: str,
-        model: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
-        """
-        Get Model Schema
-
-        Args:
-          model: Model Name
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/ai/models/schema",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform({"model": model}, schema_get_params.SchemaGetParams),
-                post_parser=ResultWrapper[object]._unwrapper,
-            ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
-        )
-
-
-class AsyncSchemaResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncSchemaResourceWithRawResponse:
-        return AsyncSchemaResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncSchemaResourceWithStreamingResponse:
-        return AsyncSchemaResourceWithStreamingResponse(self)
-
-    async def get(
-        self,
-        *,
-        account_id: str,
-        model: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> object:
-        """
-        Get Model Schema
-
-        Args:
-          model: Model Name
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/ai/models/schema",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=await async_maybe_transform({"model": model}, schema_get_params.SchemaGetParams),
-                post_parser=ResultWrapper[object]._unwrapper,
-            ),
-            cast_to=cast(Type[object], ResultWrapper[object]),
-        )
-
-
-class SchemaResourceWithRawResponse:
-    def __init__(self, schema: SchemaResource) -> None:
-        self._schema = schema
-
-        self.get = to_raw_response_wrapper(
-            schema.get,
-        )
-
-
-class AsyncSchemaResourceWithRawResponse:
-    def __init__(self, schema: AsyncSchemaResource) -> None:
-        self._schema = schema
-
-        self.get = async_to_raw_response_wrapper(
-            schema.get,
-        )
-
-
-class SchemaResourceWithStreamingResponse:
-    def __init__(self, schema: SchemaResource) -> None:
-        self._schema = schema
-
-        self.get = to_streamed_response_wrapper(
-            schema.get,
-        )
-
-
-class AsyncSchemaResourceWithStreamingResponse:
-    def __init__(self, schema: AsyncSchemaResource) -> None:
-        self._schema = schema
-
-        self.get = async_to_streamed_response_wrapper(
-            schema.get,
-        )
diff --git a/src/cloudflare/resources/workers/assets/__init__.py b/src/cloudflare/resources/workers/assets/__init__.py
new file mode 100644
index 00000000000..3769f94bf1e
--- /dev/null
+++ b/src/cloudflare/resources/workers/assets/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .assets import (
+    AssetsResource,
+    AsyncAssetsResource,
+    AssetsResourceWithRawResponse,
+    AsyncAssetsResourceWithRawResponse,
+    AssetsResourceWithStreamingResponse,
+    AsyncAssetsResourceWithStreamingResponse,
+)
+from .upload import (
+    UploadResource,
+    AsyncUploadResource,
+    UploadResourceWithRawResponse,
+    AsyncUploadResourceWithRawResponse,
+    UploadResourceWithStreamingResponse,
+    AsyncUploadResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "UploadResource",
+    "AsyncUploadResource",
+    "UploadResourceWithRawResponse",
+    "AsyncUploadResourceWithRawResponse",
+    "UploadResourceWithStreamingResponse",
+    "AsyncUploadResourceWithStreamingResponse",
+    "AssetsResource",
+    "AsyncAssetsResource",
+    "AssetsResourceWithRawResponse",
+    "AsyncAssetsResourceWithRawResponse",
+    "AssetsResourceWithStreamingResponse",
+    "AsyncAssetsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/workers/assets/assets.py b/src/cloudflare/resources/workers/assets/assets.py
new file mode 100644
index 00000000000..f26c89d58d3
--- /dev/null
+++ b/src/cloudflare/resources/workers/assets/assets.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .upload import (
+    UploadResource,
+    AsyncUploadResource,
+    UploadResourceWithRawResponse,
+    AsyncUploadResourceWithRawResponse,
+    UploadResourceWithStreamingResponse,
+    AsyncUploadResourceWithStreamingResponse,
+)
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["AssetsResource", "AsyncAssetsResource"]
+
+
+class AssetsResource(SyncAPIResource):
+    @cached_property
+    def upload(self) -> UploadResource:
+        return UploadResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AssetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AssetsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AssetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AssetsResourceWithStreamingResponse(self)
+
+
+class AsyncAssetsResource(AsyncAPIResource):
+    @cached_property
+    def upload(self) -> AsyncUploadResource:
+        return AsyncUploadResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncAssetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAssetsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAssetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAssetsResourceWithStreamingResponse(self)
+
+
+class AssetsResourceWithRawResponse:
+    def __init__(self, assets: AssetsResource) -> None:
+        self._assets = assets
+
+    @cached_property
+    def upload(self) -> UploadResourceWithRawResponse:
+        return UploadResourceWithRawResponse(self._assets.upload)
+
+
+class AsyncAssetsResourceWithRawResponse:
+    def __init__(self, assets: AsyncAssetsResource) -> None:
+        self._assets = assets
+
+    @cached_property
+    def upload(self) -> AsyncUploadResourceWithRawResponse:
+        return AsyncUploadResourceWithRawResponse(self._assets.upload)
+
+
+class AssetsResourceWithStreamingResponse:
+    def __init__(self, assets: AssetsResource) -> None:
+        self._assets = assets
+
+    @cached_property
+    def upload(self) -> UploadResourceWithStreamingResponse:
+        return UploadResourceWithStreamingResponse(self._assets.upload)
+
+
+class AsyncAssetsResourceWithStreamingResponse:
+    def __init__(self, assets: AsyncAssetsResource) -> None:
+        self._assets = assets
+
+    @cached_property
+    def upload(self) -> AsyncUploadResourceWithStreamingResponse:
+        return AsyncUploadResourceWithStreamingResponse(self._assets.upload)
diff --git a/src/cloudflare/resources/workers/assets/upload.py b/src/cloudflare/resources/workers/assets/upload.py
new file mode 100644
index 00000000000..4ece6d4d094
--- /dev/null
+++ b/src/cloudflare/resources/workers/assets/upload.py
@@ -0,0 +1,207 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.workers.assets import upload_create_params
+from ....types.workers.assets.upload_create_response import UploadCreateResponse
+
+__all__ = ["UploadResource", "AsyncUploadResource"]
+
+
+class UploadResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> UploadResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return UploadResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> UploadResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return UploadResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        base64: Literal[True],
+        body: Dict[str, str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UploadCreateResponse]:
+        """Upload assets ahead of creating a Worker version.
+
+        To learn more about the direct
+        uploads of assets, see
+        https://developers.cloudflare.com/workers/static-assets/direct-upload/.
+
+        Args:
+          account_id: Identifier.
+
+          base64: Whether the file contents are base64-encoded. Must be `true`.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        # It should be noted that the actual Content-Type header that will be
+        # sent to the server will contain a `boundary` parameter, e.g.
+        # multipart/form-data; boundary=---abc--
+        extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
+        return self._post(
+            f"/accounts/{account_id}/workers/assets/upload",
+            body=maybe_transform(body, upload_create_params.UploadCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"base64": base64}, upload_create_params.UploadCreateParams),
+                post_parser=ResultWrapper[Optional[UploadCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[UploadCreateResponse]], ResultWrapper[UploadCreateResponse]),
+        )
+
+
+class AsyncUploadResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncUploadResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncUploadResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncUploadResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncUploadResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        base64: Literal[True],
+        body: Dict[str, str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UploadCreateResponse]:
+        """Upload assets ahead of creating a Worker version.
+
+        To learn more about the direct
+        uploads of assets, see
+        https://developers.cloudflare.com/workers/static-assets/direct-upload/.
+
+        Args:
+          account_id: Identifier.
+
+          base64: Whether the file contents are base64-encoded. Must be `true`.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        # It should be noted that the actual Content-Type header that will be
+        # sent to the server will contain a `boundary` parameter, e.g.
+        # multipart/form-data; boundary=---abc--
+        extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
+        return await self._post(
+            f"/accounts/{account_id}/workers/assets/upload",
+            body=await async_maybe_transform(body, upload_create_params.UploadCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"base64": base64}, upload_create_params.UploadCreateParams),
+                post_parser=ResultWrapper[Optional[UploadCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[UploadCreateResponse]], ResultWrapper[UploadCreateResponse]),
+        )
+
+
+class UploadResourceWithRawResponse:
+    def __init__(self, upload: UploadResource) -> None:
+        self._upload = upload
+
+        self.create = to_raw_response_wrapper(
+            upload.create,
+        )
+
+
+class AsyncUploadResourceWithRawResponse:
+    def __init__(self, upload: AsyncUploadResource) -> None:
+        self._upload = upload
+
+        self.create = async_to_raw_response_wrapper(
+            upload.create,
+        )
+
+
+class UploadResourceWithStreamingResponse:
+    def __init__(self, upload: UploadResource) -> None:
+        self._upload = upload
+
+        self.create = to_streamed_response_wrapper(
+            upload.create,
+        )
+
+
+class AsyncUploadResourceWithStreamingResponse:
+    def __init__(self, upload: AsyncUploadResource) -> None:
+        self._upload = upload
+
+        self.create = async_to_streamed_response_wrapper(
+            upload.create,
+        )
diff --git a/src/cloudflare/resources/workers/beta/__init__.py b/src/cloudflare/resources/workers/beta/__init__.py
new file mode 100644
index 00000000000..ed725555fd9
--- /dev/null
+++ b/src/cloudflare/resources/workers/beta/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .beta import (
+    BetaResource,
+    AsyncBetaResource,
+    BetaResourceWithRawResponse,
+    AsyncBetaResourceWithRawResponse,
+    BetaResourceWithStreamingResponse,
+    AsyncBetaResourceWithStreamingResponse,
+)
+from .workers import (
+    WorkersResource,
+    AsyncWorkersResource,
+    WorkersResourceWithRawResponse,
+    AsyncWorkersResourceWithRawResponse,
+    WorkersResourceWithStreamingResponse,
+    AsyncWorkersResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "WorkersResource",
+    "AsyncWorkersResource",
+    "WorkersResourceWithRawResponse",
+    "AsyncWorkersResourceWithRawResponse",
+    "WorkersResourceWithStreamingResponse",
+    "AsyncWorkersResourceWithStreamingResponse",
+    "BetaResource",
+    "AsyncBetaResource",
+    "BetaResourceWithRawResponse",
+    "AsyncBetaResourceWithRawResponse",
+    "BetaResourceWithStreamingResponse",
+    "AsyncBetaResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/workers/beta/beta.py b/src/cloudflare/resources/workers/beta/beta.py
new file mode 100644
index 00000000000..66891810c8c
--- /dev/null
+++ b/src/cloudflare/resources/workers/beta/beta.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .workers.workers import (
+    WorkersResource,
+    AsyncWorkersResource,
+    WorkersResourceWithRawResponse,
+    AsyncWorkersResourceWithRawResponse,
+    WorkersResourceWithStreamingResponse,
+    AsyncWorkersResourceWithStreamingResponse,
+)
+
+__all__ = ["BetaResource", "AsyncBetaResource"]
+
+
+class BetaResource(SyncAPIResource):
+    @cached_property
+    def workers(self) -> WorkersResource:
+        return WorkersResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> BetaResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return BetaResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> BetaResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return BetaResourceWithStreamingResponse(self)
+
+
+class AsyncBetaResource(AsyncAPIResource):
+    @cached_property
+    def workers(self) -> AsyncWorkersResource:
+        return AsyncWorkersResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncBetaResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncBetaResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncBetaResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncBetaResourceWithStreamingResponse(self)
+
+
+class BetaResourceWithRawResponse:
+    def __init__(self, beta: BetaResource) -> None:
+        self._beta = beta
+
+    @cached_property
+    def workers(self) -> WorkersResourceWithRawResponse:
+        return WorkersResourceWithRawResponse(self._beta.workers)
+
+
+class AsyncBetaResourceWithRawResponse:
+    def __init__(self, beta: AsyncBetaResource) -> None:
+        self._beta = beta
+
+    @cached_property
+    def workers(self) -> AsyncWorkersResourceWithRawResponse:
+        return AsyncWorkersResourceWithRawResponse(self._beta.workers)
+
+
+class BetaResourceWithStreamingResponse:
+    def __init__(self, beta: BetaResource) -> None:
+        self._beta = beta
+
+    @cached_property
+    def workers(self) -> WorkersResourceWithStreamingResponse:
+        return WorkersResourceWithStreamingResponse(self._beta.workers)
+
+
+class AsyncBetaResourceWithStreamingResponse:
+    def __init__(self, beta: AsyncBetaResource) -> None:
+        self._beta = beta
+
+    @cached_property
+    def workers(self) -> AsyncWorkersResourceWithStreamingResponse:
+        return AsyncWorkersResourceWithStreamingResponse(self._beta.workers)
diff --git a/src/cloudflare/resources/workers/beta/workers/__init__.py b/src/cloudflare/resources/workers/beta/workers/__init__.py
new file mode 100644
index 00000000000..eb251551f61
--- /dev/null
+++ b/src/cloudflare/resources/workers/beta/workers/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .workers import (
+    WorkersResource,
+    AsyncWorkersResource,
+    WorkersResourceWithRawResponse,
+    AsyncWorkersResourceWithRawResponse,
+    WorkersResourceWithStreamingResponse,
+    AsyncWorkersResourceWithStreamingResponse,
+)
+from .versions import (
+    VersionsResource,
+    AsyncVersionsResource,
+    VersionsResourceWithRawResponse,
+    AsyncVersionsResourceWithRawResponse,
+    VersionsResourceWithStreamingResponse,
+    AsyncVersionsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "VersionsResource",
+    "AsyncVersionsResource",
+    "VersionsResourceWithRawResponse",
+    "AsyncVersionsResourceWithRawResponse",
+    "VersionsResourceWithStreamingResponse",
+    "AsyncVersionsResourceWithStreamingResponse",
+    "WorkersResource",
+    "AsyncWorkersResource",
+    "WorkersResourceWithRawResponse",
+    "AsyncWorkersResourceWithRawResponse",
+    "WorkersResourceWithStreamingResponse",
+    "AsyncWorkersResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/workers/beta/workers/versions.py b/src/cloudflare/resources/workers/beta/workers/versions.py
new file mode 100644
index 00000000000..9cdceef8780
--- /dev/null
+++ b/src/cloudflare/resources/workers/beta/workers/versions.py
@@ -0,0 +1,703 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from .....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.workers.beta.workers import version_get_params, version_list_params, version_create_params
+from .....types.workers.beta.workers.version import Version
+from .....types.workers.beta.workers.version_delete_response import VersionDeleteResponse
+
+__all__ = ["VersionsResource", "AsyncVersionsResource"]
+
+
+class VersionsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> VersionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return VersionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> VersionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return VersionsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        worker_id: str,
+        *,
+        account_id: str,
+        deploy: bool | Omit = omit,
+        annotations: version_create_params.Annotations | Omit = omit,
+        assets: version_create_params.Assets | Omit = omit,
+        bindings: Iterable[version_create_params.Binding] | Omit = omit,
+        compatibility_date: str | Omit = omit,
+        compatibility_flags: SequenceNotStr[str] | Omit = omit,
+        limits: version_create_params.Limits | Omit = omit,
+        main_module: str | Omit = omit,
+        migrations: version_create_params.Migrations | Omit = omit,
+        modules: Iterable[version_create_params.Module] | Omit = omit,
+        placement: version_create_params.Placement | Omit = omit,
+        usage_model: Literal["standard", "bundled", "unbound"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Version:
+        """
+        Create a new version.
+
+        Args:
+          account_id: Identifier.
+
+          worker_id: Identifier for the Worker, which can be ID or name.
+
+          deploy: If true, a deployment will be created that sends 100% of traffic to the new
+              version.
+
+          annotations: Metadata about the version.
+
+          assets: Configuration for assets within a Worker.
+
+              [`_headers`](https://developers.cloudflare.com/workers/static-assets/headers/#custom-headers)
+              and
+              [`_redirects`](https://developers.cloudflare.com/workers/static-assets/redirects/)
+              files should be included as modules named `_headers` and `_redirects` with
+              content type `text/plain`.
+
+          bindings: List of bindings attached to a Worker. You can find more about bindings on our
+              docs:
+              https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
+
+          compatibility_date: Date indicating targeted support in the Workers runtime. Backwards incompatible
+              fixes to the runtime following this date will not affect this Worker.
+
+          compatibility_flags: Flags that enable or disable certain features in the Workers runtime. Used to
+              enable upcoming features or opt in or out of specific changes not included in a
+              `compatibility_date`.
+
+          limits: Resource limits enforced at runtime.
+
+          main_module: The name of the main module in the `modules` array (e.g. the name of the module
+              that exports a `fetch` handler).
+
+          migrations: Migrations for Durable Objects associated with the version. Migrations are
+              applied when the version is deployed.
+
+          modules: Code, sourcemaps, and other content used at runtime.
+
+              This includes
+              [`_headers`](https://developers.cloudflare.com/workers/static-assets/headers/#custom-headers)
+              and
+              [`_redirects`](https://developers.cloudflare.com/workers/static-assets/redirects/)
+              files used to configure
+              [Static Assets](https://developers.cloudflare.com/workers/static-assets/).
+              `_headers` and `_redirects` files should be included as modules named `_headers`
+              and `_redirects` with content type `text/plain`.
+
+          placement: Configuration for
+              [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+              Specify mode='smart' for Smart Placement, or one of region/hostname/host.
+
+          usage_model: Usage model for the version.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not worker_id:
+            raise ValueError(f"Expected a non-empty value for `worker_id` but received {worker_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/workers/workers/{worker_id}/versions",
+            body=maybe_transform(
+                {
+                    "annotations": annotations,
+                    "assets": assets,
+                    "bindings": bindings,
+                    "compatibility_date": compatibility_date,
+                    "compatibility_flags": compatibility_flags,
+                    "limits": limits,
+                    "main_module": main_module,
+                    "migrations": migrations,
+                    "modules": modules,
+                    "placement": placement,
+                    "usage_model": usage_model,
+                },
+                version_create_params.VersionCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"deploy": deploy}, version_create_params.VersionCreateParams),
+                post_parser=ResultWrapper[Version]._unwrapper,
+            ),
+            cast_to=cast(Type[Version], ResultWrapper[Version]),
+        )
+
+    def list(
+        self,
+        worker_id: str,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[Version]:
+        """
+        List all versions for a Worker.
+
+        Args:
+          account_id: Identifier.
+
+          worker_id: Identifier for the Worker, which can be ID or name.
+
+          page: Current page.
+
+          per_page: Items per-page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not worker_id:
+            raise ValueError(f"Expected a non-empty value for `worker_id` but received {worker_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/workers/workers/{worker_id}/versions",
+            page=SyncV4PagePaginationArray[Version],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    version_list_params.VersionListParams,
+                ),
+            ),
+            model=Version,
+        )
+
+    def delete(
+        self,
+        version_id: str,
+        *,
+        account_id: str,
+        worker_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> VersionDeleteResponse:
+        """
+        Delete a version.
+
+        Args:
+          account_id: Identifier.
+
+          worker_id: Identifier for the Worker, which can be ID or name.
+
+          version_id: Identifier for the version, which can be ID or the literal "latest" to operate
+              on the most recently created version.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not worker_id:
+            raise ValueError(f"Expected a non-empty value for `worker_id` but received {worker_id!r}")
+        if not version_id:
+            raise ValueError(f"Expected a non-empty value for `version_id` but received {version_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/workers/workers/{worker_id}/versions/{version_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=VersionDeleteResponse,
+        )
+
+    def get(
+        self,
+        version_id: str,
+        *,
+        account_id: str,
+        worker_id: str,
+        include: Literal["modules"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Version:
+        """
+        Get details about a specific version.
+
+        Args:
+          account_id: Identifier.
+
+          worker_id: Identifier for the Worker, which can be ID or name.
+
+          version_id: Identifier for the version, which can be ID or the literal "latest" to operate
+              on the most recently created version.
+
+          include: Whether to include the `modules` property of the version in the response, which
+              contains code and sourcemap content and may add several megabytes to the
+              response size.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not worker_id:
+            raise ValueError(f"Expected a non-empty value for `worker_id` but received {worker_id!r}")
+        if not version_id:
+            raise ValueError(f"Expected a non-empty value for `version_id` but received {version_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/workers/workers/{worker_id}/versions/{version_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"include": include}, version_get_params.VersionGetParams),
+                post_parser=ResultWrapper[Version]._unwrapper,
+            ),
+            cast_to=cast(Type[Version], ResultWrapper[Version]),
+        )
+
+
+class AsyncVersionsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncVersionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncVersionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncVersionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncVersionsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        worker_id: str,
+        *,
+        account_id: str,
+        deploy: bool | Omit = omit,
+        annotations: version_create_params.Annotations | Omit = omit,
+        assets: version_create_params.Assets | Omit = omit,
+        bindings: Iterable[version_create_params.Binding] | Omit = omit,
+        compatibility_date: str | Omit = omit,
+        compatibility_flags: SequenceNotStr[str] | Omit = omit,
+        limits: version_create_params.Limits | Omit = omit,
+        main_module: str | Omit = omit,
+        migrations: version_create_params.Migrations | Omit = omit,
+        modules: Iterable[version_create_params.Module] | Omit = omit,
+        placement: version_create_params.Placement | Omit = omit,
+        usage_model: Literal["standard", "bundled", "unbound"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Version:
+        """
+        Create a new version.
+
+        Args:
+          account_id: Identifier.
+
+          worker_id: Identifier for the Worker, which can be ID or name.
+
+          deploy: If true, a deployment will be created that sends 100% of traffic to the new
+              version.
+
+          annotations: Metadata about the version.
+
+          assets: Configuration for assets within a Worker.
+
+              [`_headers`](https://developers.cloudflare.com/workers/static-assets/headers/#custom-headers)
+              and
+              [`_redirects`](https://developers.cloudflare.com/workers/static-assets/redirects/)
+              files should be included as modules named `_headers` and `_redirects` with
+              content type `text/plain`.
+
+          bindings: List of bindings attached to a Worker. You can find more about bindings on our
+              docs:
+              https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
+
+          compatibility_date: Date indicating targeted support in the Workers runtime. Backwards incompatible
+              fixes to the runtime following this date will not affect this Worker.
+
+          compatibility_flags: Flags that enable or disable certain features in the Workers runtime. Used to
+              enable upcoming features or opt in or out of specific changes not included in a
+              `compatibility_date`.
+
+          limits: Resource limits enforced at runtime.
+
+          main_module: The name of the main module in the `modules` array (e.g. the name of the module
+              that exports a `fetch` handler).
+
+          migrations: Migrations for Durable Objects associated with the version. Migrations are
+              applied when the version is deployed.
+
+          modules: Code, sourcemaps, and other content used at runtime.
+
+              This includes
+              [`_headers`](https://developers.cloudflare.com/workers/static-assets/headers/#custom-headers)
+              and
+              [`_redirects`](https://developers.cloudflare.com/workers/static-assets/redirects/)
+              files used to configure
+              [Static Assets](https://developers.cloudflare.com/workers/static-assets/).
+              `_headers` and `_redirects` files should be included as modules named `_headers`
+              and `_redirects` with content type `text/plain`.
+
+          placement: Configuration for
+              [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+              Specify mode='smart' for Smart Placement, or one of region/hostname/host.
+
+          usage_model: Usage model for the version.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not worker_id:
+            raise ValueError(f"Expected a non-empty value for `worker_id` but received {worker_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/workers/workers/{worker_id}/versions",
+            body=await async_maybe_transform(
+                {
+                    "annotations": annotations,
+                    "assets": assets,
+                    "bindings": bindings,
+                    "compatibility_date": compatibility_date,
+                    "compatibility_flags": compatibility_flags,
+                    "limits": limits,
+                    "main_module": main_module,
+                    "migrations": migrations,
+                    "modules": modules,
+                    "placement": placement,
+                    "usage_model": usage_model,
+                },
+                version_create_params.VersionCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"deploy": deploy}, version_create_params.VersionCreateParams),
+                post_parser=ResultWrapper[Version]._unwrapper,
+            ),
+            cast_to=cast(Type[Version], ResultWrapper[Version]),
+        )
+
+    def list(
+        self,
+        worker_id: str,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Version, AsyncV4PagePaginationArray[Version]]:
+        """
+        List all versions for a Worker.
+
+        Args:
+          account_id: Identifier.
+
+          worker_id: Identifier for the Worker, which can be ID or name.
+
+          page: Current page.
+
+          per_page: Items per-page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not worker_id:
+            raise ValueError(f"Expected a non-empty value for `worker_id` but received {worker_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/workers/workers/{worker_id}/versions",
+            page=AsyncV4PagePaginationArray[Version],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    version_list_params.VersionListParams,
+                ),
+            ),
+            model=Version,
+        )
+
+    async def delete(
+        self,
+        version_id: str,
+        *,
+        account_id: str,
+        worker_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> VersionDeleteResponse:
+        """
+        Delete a version.
+
+        Args:
+          account_id: Identifier.
+
+          worker_id: Identifier for the Worker, which can be ID or name.
+
+          version_id: Identifier for the version, which can be ID or the literal "latest" to operate
+              on the most recently created version.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not worker_id:
+            raise ValueError(f"Expected a non-empty value for `worker_id` but received {worker_id!r}")
+        if not version_id:
+            raise ValueError(f"Expected a non-empty value for `version_id` but received {version_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/workers/workers/{worker_id}/versions/{version_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=VersionDeleteResponse,
+        )
+
+    async def get(
+        self,
+        version_id: str,
+        *,
+        account_id: str,
+        worker_id: str,
+        include: Literal["modules"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Version:
+        """
+        Get details about a specific version.
+
+        Args:
+          account_id: Identifier.
+
+          worker_id: Identifier for the Worker, which can be ID or name.
+
+          version_id: Identifier for the version, which can be ID or the literal "latest" to operate
+              on the most recently created version.
+
+          include: Whether to include the `modules` property of the version in the response, which
+              contains code and sourcemap content and may add several megabytes to the
+              response size.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not worker_id:
+            raise ValueError(f"Expected a non-empty value for `worker_id` but received {worker_id!r}")
+        if not version_id:
+            raise ValueError(f"Expected a non-empty value for `version_id` but received {version_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/workers/workers/{worker_id}/versions/{version_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"include": include}, version_get_params.VersionGetParams),
+                post_parser=ResultWrapper[Version]._unwrapper,
+            ),
+            cast_to=cast(Type[Version], ResultWrapper[Version]),
+        )
+
+
+class VersionsResourceWithRawResponse:
+    def __init__(self, versions: VersionsResource) -> None:
+        self._versions = versions
+
+        self.create = to_raw_response_wrapper(
+            versions.create,
+        )
+        self.list = to_raw_response_wrapper(
+            versions.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            versions.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            versions.get,
+        )
+
+
+class AsyncVersionsResourceWithRawResponse:
+    def __init__(self, versions: AsyncVersionsResource) -> None:
+        self._versions = versions
+
+        self.create = async_to_raw_response_wrapper(
+            versions.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            versions.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            versions.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            versions.get,
+        )
+
+
+class VersionsResourceWithStreamingResponse:
+    def __init__(self, versions: VersionsResource) -> None:
+        self._versions = versions
+
+        self.create = to_streamed_response_wrapper(
+            versions.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            versions.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            versions.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            versions.get,
+        )
+
+
+class AsyncVersionsResourceWithStreamingResponse:
+    def __init__(self, versions: AsyncVersionsResource) -> None:
+        self._versions = versions
+
+        self.create = async_to_streamed_response_wrapper(
+            versions.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            versions.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            versions.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            versions.get,
+        )
diff --git a/src/cloudflare/resources/workers/beta/workers/workers.py b/src/cloudflare/resources/workers/beta/workers/workers.py
new file mode 100644
index 00000000000..fcaed3d877d
--- /dev/null
+++ b/src/cloudflare/resources/workers/beta/workers/workers.py
@@ -0,0 +1,904 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, cast
+
+import httpx
+
+from .versions import (
+    VersionsResource,
+    AsyncVersionsResource,
+    VersionsResourceWithRawResponse,
+    AsyncVersionsResourceWithRawResponse,
+    VersionsResourceWithStreamingResponse,
+    AsyncVersionsResourceWithStreamingResponse,
+)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from .....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.workers.beta import worker_edit_params, worker_list_params, worker_create_params, worker_update_params
+from .....types.workers.beta.worker import Worker
+from .....types.workers.beta.worker_delete_response import WorkerDeleteResponse
+
+__all__ = ["WorkersResource", "AsyncWorkersResource"]
+
+
+class WorkersResource(SyncAPIResource):
+    @cached_property
+    def versions(self) -> VersionsResource:
+        return VersionsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> WorkersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return WorkersResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> WorkersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return WorkersResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        logpush: bool | Omit = omit,
+        observability: worker_create_params.Observability | Omit = omit,
+        subdomain: worker_create_params.Subdomain | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        tail_consumers: Iterable[worker_create_params.TailConsumer] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Worker:
+        """
+        Create a new Worker.
+
+        Args:
+          account_id: Identifier.
+
+          name: Name of the Worker.
+
+          logpush: Whether logpush is enabled for the Worker.
+
+          observability: Observability settings for the Worker.
+
+          subdomain: Subdomain settings for the Worker.
+
+          tags: Tags associated with the Worker.
+
+          tail_consumers: Other Workers that should consume logs from the Worker.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/workers/workers",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "logpush": logpush,
+                    "observability": observability,
+                    "subdomain": subdomain,
+                    "tags": tags,
+                    "tail_consumers": tail_consumers,
+                },
+                worker_create_params.WorkerCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Worker]._unwrapper,
+            ),
+            cast_to=cast(Type[Worker], ResultWrapper[Worker]),
+        )
+
+    def update(
+        self,
+        worker_id: str,
+        *,
+        account_id: str,
+        name: str,
+        logpush: bool | Omit = omit,
+        observability: worker_update_params.Observability | Omit = omit,
+        subdomain: worker_update_params.Subdomain | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        tail_consumers: Iterable[worker_update_params.TailConsumer] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Worker:
+        """
+        Perform a complete replacement of a Worker, where omitted properties are set to
+        their default values. This is the exact same as the Create Worker endpoint, but
+        operates on an existing Worker. To perform a partial update instead, use the
+        Edit Worker endpoint.
+
+        Args:
+          account_id: Identifier.
+
+          worker_id: Identifier for the Worker, which can be ID or name.
+
+          name: Name of the Worker.
+
+          logpush: Whether logpush is enabled for the Worker.
+
+          observability: Observability settings for the Worker.
+
+          subdomain: Subdomain settings for the Worker.
+
+          tags: Tags associated with the Worker.
+
+          tail_consumers: Other Workers that should consume logs from the Worker.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not worker_id:
+            raise ValueError(f"Expected a non-empty value for `worker_id` but received {worker_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/workers/workers/{worker_id}",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "logpush": logpush,
+                    "observability": observability,
+                    "subdomain": subdomain,
+                    "tags": tags,
+                    "tail_consumers": tail_consumers,
+                },
+                worker_update_params.WorkerUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Worker]._unwrapper,
+            ),
+            cast_to=cast(Type[Worker], ResultWrapper[Worker]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[Worker]:
+        """
+        List all Workers for an account.
+
+        Args:
+          account_id: Identifier.
+
+          page: Current page.
+
+          per_page: Items per-page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/workers/workers",
+            page=SyncV4PagePaginationArray[Worker],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    worker_list_params.WorkerListParams,
+                ),
+            ),
+            model=Worker,
+        )
+
+    def delete(
+        self,
+        worker_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WorkerDeleteResponse:
+        """
+        Delete a Worker and all its associated resources (versions, deployments, etc.).
+
+        Args:
+          account_id: Identifier.
+
+          worker_id: Identifier for the Worker, which can be ID or name.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not worker_id:
+            raise ValueError(f"Expected a non-empty value for `worker_id` but received {worker_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/workers/workers/{worker_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=WorkerDeleteResponse,
+        )
+
+    def edit(
+        self,
+        worker_id: str,
+        *,
+        account_id: str,
+        logpush: bool,
+        name: str,
+        observability: worker_edit_params.Observability,
+        subdomain: worker_edit_params.Subdomain,
+        tags: SequenceNotStr[str],
+        tail_consumers: Iterable[worker_edit_params.TailConsumer],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Worker:
+        """
+        Perform a partial update on a Worker, where omitted properties are left
+        unchanged from their current values.
+
+        Args:
+          account_id: Identifier.
+
+          worker_id: Identifier for the Worker, which can be ID or name.
+
+          logpush: Whether logpush is enabled for the Worker.
+
+          name: Name of the Worker.
+
+          observability: Observability settings for the Worker.
+
+          subdomain: Subdomain settings for the Worker.
+
+          tags: Tags associated with the Worker.
+
+          tail_consumers: Other Workers that should consume logs from the Worker.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not worker_id:
+            raise ValueError(f"Expected a non-empty value for `worker_id` but received {worker_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/workers/workers/{worker_id}",
+            body=maybe_transform(
+                {
+                    "logpush": logpush,
+                    "name": name,
+                    "observability": observability,
+                    "subdomain": subdomain,
+                    "tags": tags,
+                    "tail_consumers": tail_consumers,
+                },
+                worker_edit_params.WorkerEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Worker]._unwrapper,
+            ),
+            cast_to=cast(Type[Worker], ResultWrapper[Worker]),
+        )
+
+    def get(
+        self,
+        worker_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Worker:
+        """
+        Get details about a specific Worker.
+
+        Args:
+          account_id: Identifier.
+
+          worker_id: Identifier for the Worker, which can be ID or name.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not worker_id:
+            raise ValueError(f"Expected a non-empty value for `worker_id` but received {worker_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/workers/workers/{worker_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Worker]._unwrapper,
+            ),
+            cast_to=cast(Type[Worker], ResultWrapper[Worker]),
+        )
+
+
+class AsyncWorkersResource(AsyncAPIResource):
+    @cached_property
+    def versions(self) -> AsyncVersionsResource:
+        return AsyncVersionsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncWorkersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncWorkersResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncWorkersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncWorkersResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        logpush: bool | Omit = omit,
+        observability: worker_create_params.Observability | Omit = omit,
+        subdomain: worker_create_params.Subdomain | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        tail_consumers: Iterable[worker_create_params.TailConsumer] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Worker:
+        """
+        Create a new Worker.
+
+        Args:
+          account_id: Identifier.
+
+          name: Name of the Worker.
+
+          logpush: Whether logpush is enabled for the Worker.
+
+          observability: Observability settings for the Worker.
+
+          subdomain: Subdomain settings for the Worker.
+
+          tags: Tags associated with the Worker.
+
+          tail_consumers: Other Workers that should consume logs from the Worker.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/workers/workers",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "logpush": logpush,
+                    "observability": observability,
+                    "subdomain": subdomain,
+                    "tags": tags,
+                    "tail_consumers": tail_consumers,
+                },
+                worker_create_params.WorkerCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Worker]._unwrapper,
+            ),
+            cast_to=cast(Type[Worker], ResultWrapper[Worker]),
+        )
+
+    async def update(
+        self,
+        worker_id: str,
+        *,
+        account_id: str,
+        name: str,
+        logpush: bool | Omit = omit,
+        observability: worker_update_params.Observability | Omit = omit,
+        subdomain: worker_update_params.Subdomain | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        tail_consumers: Iterable[worker_update_params.TailConsumer] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Worker:
+        """
+        Perform a complete replacement of a Worker, where omitted properties are set to
+        their default values. This is the exact same as the Create Worker endpoint, but
+        operates on an existing Worker. To perform a partial update instead, use the
+        Edit Worker endpoint.
+
+        Args:
+          account_id: Identifier.
+
+          worker_id: Identifier for the Worker, which can be ID or name.
+
+          name: Name of the Worker.
+
+          logpush: Whether logpush is enabled for the Worker.
+
+          observability: Observability settings for the Worker.
+
+          subdomain: Subdomain settings for the Worker.
+
+          tags: Tags associated with the Worker.
+
+          tail_consumers: Other Workers that should consume logs from the Worker.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not worker_id:
+            raise ValueError(f"Expected a non-empty value for `worker_id` but received {worker_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/workers/workers/{worker_id}",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "logpush": logpush,
+                    "observability": observability,
+                    "subdomain": subdomain,
+                    "tags": tags,
+                    "tail_consumers": tail_consumers,
+                },
+                worker_update_params.WorkerUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Worker]._unwrapper,
+            ),
+            cast_to=cast(Type[Worker], ResultWrapper[Worker]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Worker, AsyncV4PagePaginationArray[Worker]]:
+        """
+        List all Workers for an account.
+
+        Args:
+          account_id: Identifier.
+
+          page: Current page.
+
+          per_page: Items per-page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/workers/workers",
+            page=AsyncV4PagePaginationArray[Worker],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    worker_list_params.WorkerListParams,
+                ),
+            ),
+            model=Worker,
+        )
+
+    async def delete(
+        self,
+        worker_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WorkerDeleteResponse:
+        """
+        Delete a Worker and all its associated resources (versions, deployments, etc.).
+
+        Args:
+          account_id: Identifier.
+
+          worker_id: Identifier for the Worker, which can be ID or name.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not worker_id:
+            raise ValueError(f"Expected a non-empty value for `worker_id` but received {worker_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/workers/workers/{worker_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=WorkerDeleteResponse,
+        )
+
+    async def edit(
+        self,
+        worker_id: str,
+        *,
+        account_id: str,
+        logpush: bool,
+        name: str,
+        observability: worker_edit_params.Observability,
+        subdomain: worker_edit_params.Subdomain,
+        tags: SequenceNotStr[str],
+        tail_consumers: Iterable[worker_edit_params.TailConsumer],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Worker:
+        """
+        Perform a partial update on a Worker, where omitted properties are left
+        unchanged from their current values.
+
+        Args:
+          account_id: Identifier.
+
+          worker_id: Identifier for the Worker, which can be ID or name.
+
+          logpush: Whether logpush is enabled for the Worker.
+
+          name: Name of the Worker.
+
+          observability: Observability settings for the Worker.
+
+          subdomain: Subdomain settings for the Worker.
+
+          tags: Tags associated with the Worker.
+
+          tail_consumers: Other Workers that should consume logs from the Worker.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not worker_id:
+            raise ValueError(f"Expected a non-empty value for `worker_id` but received {worker_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/workers/workers/{worker_id}",
+            body=await async_maybe_transform(
+                {
+                    "logpush": logpush,
+                    "name": name,
+                    "observability": observability,
+                    "subdomain": subdomain,
+                    "tags": tags,
+                    "tail_consumers": tail_consumers,
+                },
+                worker_edit_params.WorkerEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Worker]._unwrapper,
+            ),
+            cast_to=cast(Type[Worker], ResultWrapper[Worker]),
+        )
+
+    async def get(
+        self,
+        worker_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Worker:
+        """
+        Get details about a specific Worker.
+
+        Args:
+          account_id: Identifier.
+
+          worker_id: Identifier for the Worker, which can be ID or name.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not worker_id:
+            raise ValueError(f"Expected a non-empty value for `worker_id` but received {worker_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/workers/workers/{worker_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Worker]._unwrapper,
+            ),
+            cast_to=cast(Type[Worker], ResultWrapper[Worker]),
+        )
+
+
+class WorkersResourceWithRawResponse:
+    def __init__(self, workers: WorkersResource) -> None:
+        self._workers = workers
+
+        self.create = to_raw_response_wrapper(
+            workers.create,
+        )
+        self.update = to_raw_response_wrapper(
+            workers.update,
+        )
+        self.list = to_raw_response_wrapper(
+            workers.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            workers.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            workers.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            workers.get,
+        )
+
+    @cached_property
+    def versions(self) -> VersionsResourceWithRawResponse:
+        return VersionsResourceWithRawResponse(self._workers.versions)
+
+
+class AsyncWorkersResourceWithRawResponse:
+    def __init__(self, workers: AsyncWorkersResource) -> None:
+        self._workers = workers
+
+        self.create = async_to_raw_response_wrapper(
+            workers.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            workers.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            workers.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            workers.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            workers.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            workers.get,
+        )
+
+    @cached_property
+    def versions(self) -> AsyncVersionsResourceWithRawResponse:
+        return AsyncVersionsResourceWithRawResponse(self._workers.versions)
+
+
+class WorkersResourceWithStreamingResponse:
+    def __init__(self, workers: WorkersResource) -> None:
+        self._workers = workers
+
+        self.create = to_streamed_response_wrapper(
+            workers.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            workers.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            workers.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            workers.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            workers.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            workers.get,
+        )
+
+    @cached_property
+    def versions(self) -> VersionsResourceWithStreamingResponse:
+        return VersionsResourceWithStreamingResponse(self._workers.versions)
+
+
+class AsyncWorkersResourceWithStreamingResponse:
+    def __init__(self, workers: AsyncWorkersResource) -> None:
+        self._workers = workers
+
+        self.create = async_to_streamed_response_wrapper(
+            workers.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            workers.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            workers.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            workers.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            workers.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            workers.get,
+        )
+
+    @cached_property
+    def versions(self) -> AsyncVersionsResourceWithStreamingResponse:
+        return AsyncVersionsResourceWithStreamingResponse(self._workers.versions)
diff --git a/src/cloudflare/resources/workers/domains.py b/src/cloudflare/resources/workers/domains.py
index 94a2b626e43..632725ae32a 100644
--- a/src/cloudflare/resources/workers/domains.py
+++ b/src/cloudflare/resources/workers/domains.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -31,32 +28,43 @@
 class DomainsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DomainsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DomainsResourceWithStreamingResponse(self)
 
     def update(
         self,
         *,
         account_id: str,
-        environment: str,
         hostname: str,
         service: str,
         zone_id: str,
+        environment: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Domain]:
         """
         Attaches a Worker to a zone and hostname.
 
         Args:
-          environment: Worker environment associated with the zone and hostname.
+          account_id: Identifer of the account.
 
           hostname: Hostname of the Worker Domain.
 
@@ -64,6 +72,8 @@ def update(
 
           zone_id: Identifier of the zone.
 
+          environment: Worker environment associated with the zone and hostname.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -78,10 +88,10 @@ def update(
             f"/accounts/{account_id}/workers/domains",
             body=maybe_transform(
                 {
-                    "environment": environment,
                     "hostname": hostname,
                     "service": service,
                     "zone_id": zone_id,
+                    "environment": environment,
                 },
                 domain_update_params.DomainUpdateParams,
             ),
@@ -99,22 +109,24 @@ def list(
         self,
         *,
         account_id: str,
-        environment: str | NotGiven = NOT_GIVEN,
-        hostname: str | NotGiven = NOT_GIVEN,
-        service: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        zone_name: str | NotGiven = NOT_GIVEN,
+        environment: str | Omit = omit,
+        hostname: str | Omit = omit,
+        service: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        zone_name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Domain]:
         """
         Lists all Worker Domains for an account.
 
         Args:
+          account_id: Identifer of the account.
+
           environment: Worker environment associated with the zone and hostname.
 
           hostname: Hostname of the Worker Domain.
@@ -167,12 +179,14 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> None:
         """
         Detaches a Worker from a zone and hostname.
 
         Args:
+          account_id: Identifer of the account.
+
           domain_id: Identifer of the Worker Domain.
 
           extra_headers: Send extra headers
@@ -206,12 +220,14 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Domain]:
         """
         Gets a Worker domain.
 
         Args:
+          account_id: Identifer of the account.
+
           domain_id: Identifer of the Worker Domain.
 
           extra_headers: Send extra headers
@@ -242,32 +258,43 @@ def get(
 class AsyncDomainsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDomainsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDomainsResourceWithStreamingResponse(self)
 
     async def update(
         self,
         *,
         account_id: str,
-        environment: str,
         hostname: str,
         service: str,
         zone_id: str,
+        environment: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Domain]:
         """
         Attaches a Worker to a zone and hostname.
 
         Args:
-          environment: Worker environment associated with the zone and hostname.
+          account_id: Identifer of the account.
 
           hostname: Hostname of the Worker Domain.
 
@@ -275,6 +302,8 @@ async def update(
 
           zone_id: Identifier of the zone.
 
+          environment: Worker environment associated with the zone and hostname.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -289,10 +318,10 @@ async def update(
             f"/accounts/{account_id}/workers/domains",
             body=await async_maybe_transform(
                 {
-                    "environment": environment,
                     "hostname": hostname,
                     "service": service,
                     "zone_id": zone_id,
+                    "environment": environment,
                 },
                 domain_update_params.DomainUpdateParams,
             ),
@@ -310,22 +339,24 @@ def list(
         self,
         *,
         account_id: str,
-        environment: str | NotGiven = NOT_GIVEN,
-        hostname: str | NotGiven = NOT_GIVEN,
-        service: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        zone_name: str | NotGiven = NOT_GIVEN,
+        environment: str | Omit = omit,
+        hostname: str | Omit = omit,
+        service: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        zone_name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Domain, AsyncSinglePage[Domain]]:
         """
         Lists all Worker Domains for an account.
 
         Args:
+          account_id: Identifer of the account.
+
           environment: Worker environment associated with the zone and hostname.
 
           hostname: Hostname of the Worker Domain.
@@ -378,12 +409,14 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> None:
         """
         Detaches a Worker from a zone and hostname.
 
         Args:
+          account_id: Identifer of the account.
+
           domain_id: Identifer of the Worker Domain.
 
           extra_headers: Send extra headers
@@ -417,12 +450,14 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Domain]:
         """
         Gets a Worker domain.
 
         Args:
+          account_id: Identifer of the account.
+
           domain_id: Identifer of the Worker Domain.
 
           extra_headers: Send extra headers
diff --git a/src/cloudflare/resources/workers/observability/__init__.py b/src/cloudflare/resources/workers/observability/__init__.py
new file mode 100644
index 00000000000..aa9190629cd
--- /dev/null
+++ b/src/cloudflare/resources/workers/observability/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .telemetry import (
+    TelemetryResource,
+    AsyncTelemetryResource,
+    TelemetryResourceWithRawResponse,
+    AsyncTelemetryResourceWithRawResponse,
+    TelemetryResourceWithStreamingResponse,
+    AsyncTelemetryResourceWithStreamingResponse,
+)
+from .observability import (
+    ObservabilityResource,
+    AsyncObservabilityResource,
+    ObservabilityResourceWithRawResponse,
+    AsyncObservabilityResourceWithRawResponse,
+    ObservabilityResourceWithStreamingResponse,
+    AsyncObservabilityResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "TelemetryResource",
+    "AsyncTelemetryResource",
+    "TelemetryResourceWithRawResponse",
+    "AsyncTelemetryResourceWithRawResponse",
+    "TelemetryResourceWithStreamingResponse",
+    "AsyncTelemetryResourceWithStreamingResponse",
+    "ObservabilityResource",
+    "AsyncObservabilityResource",
+    "ObservabilityResourceWithRawResponse",
+    "AsyncObservabilityResourceWithRawResponse",
+    "ObservabilityResourceWithStreamingResponse",
+    "AsyncObservabilityResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/workers/observability/observability.py b/src/cloudflare/resources/workers/observability/observability.py
new file mode 100644
index 00000000000..7e09842a71a
--- /dev/null
+++ b/src/cloudflare/resources/workers/observability/observability.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .telemetry import (
+    TelemetryResource,
+    AsyncTelemetryResource,
+    TelemetryResourceWithRawResponse,
+    AsyncTelemetryResourceWithRawResponse,
+    TelemetryResourceWithStreamingResponse,
+    AsyncTelemetryResourceWithStreamingResponse,
+)
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["ObservabilityResource", "AsyncObservabilityResource"]
+
+
+class ObservabilityResource(SyncAPIResource):
+    @cached_property
+    def telemetry(self) -> TelemetryResource:
+        return TelemetryResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> ObservabilityResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ObservabilityResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ObservabilityResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ObservabilityResourceWithStreamingResponse(self)
+
+
+class AsyncObservabilityResource(AsyncAPIResource):
+    @cached_property
+    def telemetry(self) -> AsyncTelemetryResource:
+        return AsyncTelemetryResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncObservabilityResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncObservabilityResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncObservabilityResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncObservabilityResourceWithStreamingResponse(self)
+
+
+class ObservabilityResourceWithRawResponse:
+    def __init__(self, observability: ObservabilityResource) -> None:
+        self._observability = observability
+
+    @cached_property
+    def telemetry(self) -> TelemetryResourceWithRawResponse:
+        return TelemetryResourceWithRawResponse(self._observability.telemetry)
+
+
+class AsyncObservabilityResourceWithRawResponse:
+    def __init__(self, observability: AsyncObservabilityResource) -> None:
+        self._observability = observability
+
+    @cached_property
+    def telemetry(self) -> AsyncTelemetryResourceWithRawResponse:
+        return AsyncTelemetryResourceWithRawResponse(self._observability.telemetry)
+
+
+class ObservabilityResourceWithStreamingResponse:
+    def __init__(self, observability: ObservabilityResource) -> None:
+        self._observability = observability
+
+    @cached_property
+    def telemetry(self) -> TelemetryResourceWithStreamingResponse:
+        return TelemetryResourceWithStreamingResponse(self._observability.telemetry)
+
+
+class AsyncObservabilityResourceWithStreamingResponse:
+    def __init__(self, observability: AsyncObservabilityResource) -> None:
+        self._observability = observability
+
+    @cached_property
+    def telemetry(self) -> AsyncTelemetryResourceWithStreamingResponse:
+        return AsyncTelemetryResourceWithStreamingResponse(self._observability.telemetry)
diff --git a/src/cloudflare/resources/workers/observability/telemetry.py b/src/cloudflare/resources/workers/observability/telemetry.py
new file mode 100644
index 00000000000..4970c5c4fac
--- /dev/null
+++ b/src/cloudflare/resources/workers/observability/telemetry.py
@@ -0,0 +1,560 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.workers.observability import telemetry_keys_params, telemetry_query_params, telemetry_values_params
+from ....types.workers.observability.telemetry_keys_response import TelemetryKeysResponse
+from ....types.workers.observability.telemetry_query_response import TelemetryQueryResponse
+from ....types.workers.observability.telemetry_values_response import TelemetryValuesResponse
+
+__all__ = ["TelemetryResource", "AsyncTelemetryResource"]
+
+
+class TelemetryResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> TelemetryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TelemetryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TelemetryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TelemetryResourceWithStreamingResponse(self)
+
+    def keys(
+        self,
+        *,
+        account_id: str,
+        datasets: SequenceNotStr[str] | Omit = omit,
+        filters: Iterable[telemetry_keys_params.Filter] | Omit = omit,
+        from_: float | Omit = omit,
+        key_needle: telemetry_keys_params.KeyNeedle | Omit = omit,
+        limit: float | Omit = omit,
+        needle: telemetry_keys_params.Needle | Omit = omit,
+        to: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[TelemetryKeysResponse]:
+        """
+        List all the keys in your telemetry events.
+
+        Args:
+          key_needle: Search for a specific substring in the keys.
+
+          needle: Search for a specific substring in any of the events
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/workers/observability/telemetry/keys",
+            page=SyncSinglePage[TelemetryKeysResponse],
+            body=maybe_transform(
+                {
+                    "datasets": datasets,
+                    "filters": filters,
+                    "from_": from_,
+                    "key_needle": key_needle,
+                    "limit": limit,
+                    "needle": needle,
+                    "to": to,
+                },
+                telemetry_keys_params.TelemetryKeysParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=TelemetryKeysResponse,
+            method="post",
+        )
+
+    def query(
+        self,
+        *,
+        account_id: str,
+        query_id: str,
+        timeframe: telemetry_query_params.Timeframe,
+        chart: bool | Omit = omit,
+        compare: bool | Omit = omit,
+        dry: bool | Omit = omit,
+        granularity: float | Omit = omit,
+        ignore_series: bool | Omit = omit,
+        limit: float | Omit = omit,
+        offset: str | Omit = omit,
+        offset_by: float | Omit = omit,
+        offset_direction: str | Omit = omit,
+        parameters: telemetry_query_params.Parameters | Omit = omit,
+        pattern_type: Literal["message", "error"] | Omit = omit,
+        view: Literal["traces", "events", "calculations", "invocations", "requests", "patterns"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TelemetryQueryResponse:
+        """
+        Runs a temporary or saved query
+
+        Args:
+          query_id: Unique identifier for the query to execute
+
+          timeframe: Time range for the query execution
+
+          chart: Whether to include timeseties data in the response
+
+          compare: Whether to include comparison data with previous time periods
+
+          dry: Whether to perform a dry run without saving the results of the query. Useful for
+              validation
+
+          granularity: Time granularity for aggregating results (in milliseconds). Controls the
+              bucketing of time-series data
+
+          ignore_series: Whether to ignore time-series data in the results and return only aggregated
+              values
+
+          limit: Maximum number of events to return.
+
+          offset: Cursor for pagination to retrieve the next set of results
+
+          offset_by: Number of events to skip for pagination. Used in conjunction with offset
+
+          offset_direction: Direction for offset-based pagination (e.g., 'next', 'prev')
+
+          parameters: Optional parameters to pass to the query execution
+
+          pattern_type: Type of pattern to search for when using pattern-based views
+
+          view: View type for presenting the query results.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/workers/observability/telemetry/query",
+            body=maybe_transform(
+                {
+                    "query_id": query_id,
+                    "timeframe": timeframe,
+                    "chart": chart,
+                    "compare": compare,
+                    "dry": dry,
+                    "granularity": granularity,
+                    "ignore_series": ignore_series,
+                    "limit": limit,
+                    "offset": offset,
+                    "offset_by": offset_by,
+                    "offset_direction": offset_direction,
+                    "parameters": parameters,
+                    "pattern_type": pattern_type,
+                    "view": view,
+                },
+                telemetry_query_params.TelemetryQueryParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TelemetryQueryResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TelemetryQueryResponse], ResultWrapper[TelemetryQueryResponse]),
+        )
+
+    def values(
+        self,
+        *,
+        account_id: str,
+        datasets: SequenceNotStr[str],
+        key: str,
+        timeframe: telemetry_values_params.Timeframe,
+        type: Literal["string", "boolean", "number"],
+        filters: Iterable[telemetry_values_params.Filter] | Omit = omit,
+        limit: float | Omit = omit,
+        needle: telemetry_values_params.Needle | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[TelemetryValuesResponse]:
+        """
+        List unique values found in your events
+
+        Args:
+          needle: Search for a specific substring in the event.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/workers/observability/telemetry/values",
+            page=SyncSinglePage[TelemetryValuesResponse],
+            body=maybe_transform(
+                {
+                    "datasets": datasets,
+                    "key": key,
+                    "timeframe": timeframe,
+                    "type": type,
+                    "filters": filters,
+                    "limit": limit,
+                    "needle": needle,
+                },
+                telemetry_values_params.TelemetryValuesParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=TelemetryValuesResponse,
+            method="post",
+        )
+
+
+class AsyncTelemetryResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncTelemetryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTelemetryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTelemetryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTelemetryResourceWithStreamingResponse(self)
+
+    def keys(
+        self,
+        *,
+        account_id: str,
+        datasets: SequenceNotStr[str] | Omit = omit,
+        filters: Iterable[telemetry_keys_params.Filter] | Omit = omit,
+        from_: float | Omit = omit,
+        key_needle: telemetry_keys_params.KeyNeedle | Omit = omit,
+        limit: float | Omit = omit,
+        needle: telemetry_keys_params.Needle | Omit = omit,
+        to: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[TelemetryKeysResponse, AsyncSinglePage[TelemetryKeysResponse]]:
+        """
+        List all the keys in your telemetry events.
+
+        Args:
+          key_needle: Search for a specific substring in the keys.
+
+          needle: Search for a specific substring in any of the events
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/workers/observability/telemetry/keys",
+            page=AsyncSinglePage[TelemetryKeysResponse],
+            body=maybe_transform(
+                {
+                    "datasets": datasets,
+                    "filters": filters,
+                    "from_": from_,
+                    "key_needle": key_needle,
+                    "limit": limit,
+                    "needle": needle,
+                    "to": to,
+                },
+                telemetry_keys_params.TelemetryKeysParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=TelemetryKeysResponse,
+            method="post",
+        )
+
+    async def query(
+        self,
+        *,
+        account_id: str,
+        query_id: str,
+        timeframe: telemetry_query_params.Timeframe,
+        chart: bool | Omit = omit,
+        compare: bool | Omit = omit,
+        dry: bool | Omit = omit,
+        granularity: float | Omit = omit,
+        ignore_series: bool | Omit = omit,
+        limit: float | Omit = omit,
+        offset: str | Omit = omit,
+        offset_by: float | Omit = omit,
+        offset_direction: str | Omit = omit,
+        parameters: telemetry_query_params.Parameters | Omit = omit,
+        pattern_type: Literal["message", "error"] | Omit = omit,
+        view: Literal["traces", "events", "calculations", "invocations", "requests", "patterns"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TelemetryQueryResponse:
+        """
+        Runs a temporary or saved query
+
+        Args:
+          query_id: Unique identifier for the query to execute
+
+          timeframe: Time range for the query execution
+
+          chart: Whether to include timeseties data in the response
+
+          compare: Whether to include comparison data with previous time periods
+
+          dry: Whether to perform a dry run without saving the results of the query. Useful for
+              validation
+
+          granularity: Time granularity for aggregating results (in milliseconds). Controls the
+              bucketing of time-series data
+
+          ignore_series: Whether to ignore time-series data in the results and return only aggregated
+              values
+
+          limit: Maximum number of events to return.
+
+          offset: Cursor for pagination to retrieve the next set of results
+
+          offset_by: Number of events to skip for pagination. Used in conjunction with offset
+
+          offset_direction: Direction for offset-based pagination (e.g., 'next', 'prev')
+
+          parameters: Optional parameters to pass to the query execution
+
+          pattern_type: Type of pattern to search for when using pattern-based views
+
+          view: View type for presenting the query results.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/workers/observability/telemetry/query",
+            body=await async_maybe_transform(
+                {
+                    "query_id": query_id,
+                    "timeframe": timeframe,
+                    "chart": chart,
+                    "compare": compare,
+                    "dry": dry,
+                    "granularity": granularity,
+                    "ignore_series": ignore_series,
+                    "limit": limit,
+                    "offset": offset,
+                    "offset_by": offset_by,
+                    "offset_direction": offset_direction,
+                    "parameters": parameters,
+                    "pattern_type": pattern_type,
+                    "view": view,
+                },
+                telemetry_query_params.TelemetryQueryParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TelemetryQueryResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[TelemetryQueryResponse], ResultWrapper[TelemetryQueryResponse]),
+        )
+
+    def values(
+        self,
+        *,
+        account_id: str,
+        datasets: SequenceNotStr[str],
+        key: str,
+        timeframe: telemetry_values_params.Timeframe,
+        type: Literal["string", "boolean", "number"],
+        filters: Iterable[telemetry_values_params.Filter] | Omit = omit,
+        limit: float | Omit = omit,
+        needle: telemetry_values_params.Needle | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[TelemetryValuesResponse, AsyncSinglePage[TelemetryValuesResponse]]:
+        """
+        List unique values found in your events
+
+        Args:
+          needle: Search for a specific substring in the event.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/workers/observability/telemetry/values",
+            page=AsyncSinglePage[TelemetryValuesResponse],
+            body=maybe_transform(
+                {
+                    "datasets": datasets,
+                    "key": key,
+                    "timeframe": timeframe,
+                    "type": type,
+                    "filters": filters,
+                    "limit": limit,
+                    "needle": needle,
+                },
+                telemetry_values_params.TelemetryValuesParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=TelemetryValuesResponse,
+            method="post",
+        )
+
+
+class TelemetryResourceWithRawResponse:
+    def __init__(self, telemetry: TelemetryResource) -> None:
+        self._telemetry = telemetry
+
+        self.keys = to_raw_response_wrapper(
+            telemetry.keys,
+        )
+        self.query = to_raw_response_wrapper(
+            telemetry.query,
+        )
+        self.values = to_raw_response_wrapper(
+            telemetry.values,
+        )
+
+
+class AsyncTelemetryResourceWithRawResponse:
+    def __init__(self, telemetry: AsyncTelemetryResource) -> None:
+        self._telemetry = telemetry
+
+        self.keys = async_to_raw_response_wrapper(
+            telemetry.keys,
+        )
+        self.query = async_to_raw_response_wrapper(
+            telemetry.query,
+        )
+        self.values = async_to_raw_response_wrapper(
+            telemetry.values,
+        )
+
+
+class TelemetryResourceWithStreamingResponse:
+    def __init__(self, telemetry: TelemetryResource) -> None:
+        self._telemetry = telemetry
+
+        self.keys = to_streamed_response_wrapper(
+            telemetry.keys,
+        )
+        self.query = to_streamed_response_wrapper(
+            telemetry.query,
+        )
+        self.values = to_streamed_response_wrapper(
+            telemetry.values,
+        )
+
+
+class AsyncTelemetryResourceWithStreamingResponse:
+    def __init__(self, telemetry: AsyncTelemetryResource) -> None:
+        self._telemetry = telemetry
+
+        self.keys = async_to_streamed_response_wrapper(
+            telemetry.keys,
+        )
+        self.query = async_to_streamed_response_wrapper(
+            telemetry.query,
+        )
+        self.values = async_to_streamed_response_wrapper(
+            telemetry.values,
+        )
diff --git a/src/cloudflare/resources/workers/routes.py b/src/cloudflare/resources/workers/routes.py
new file mode 100644
index 00000000000..68304d512b8
--- /dev/null
+++ b/src/cloudflare/resources/workers/routes.py
@@ -0,0 +1,625 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.workers import route_create_params, route_update_params
+from ...types.workers.route_get_response import RouteGetResponse
+from ...types.workers.route_list_response import RouteListResponse
+from ...types.workers.route_create_response import RouteCreateResponse
+from ...types.workers.route_delete_response import RouteDeleteResponse
+from ...types.workers.route_update_response import RouteUpdateResponse
+
+__all__ = ["RoutesResource", "AsyncRoutesResource"]
+
+
+class RoutesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> RoutesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return RoutesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> RoutesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return RoutesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        zone_id: str,
+        pattern: str,
+        script: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RouteCreateResponse:
+        """
+        Creates a route that maps a URL pattern to a Worker.
+
+        Args:
+          zone_id: Identifier.
+
+          pattern: Pattern to match incoming requests against.
+              [Learn more](https://developers.cloudflare.com/workers/configuration/routing/routes/#matching-behavior).
+
+          script: Name of the script to run if the route matches.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/workers/routes",
+            body=maybe_transform(
+                {
+                    "pattern": pattern,
+                    "script": script,
+                },
+                route_create_params.RouteCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RouteCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[RouteCreateResponse], ResultWrapper[RouteCreateResponse]),
+        )
+
+    def update(
+        self,
+        route_id: str,
+        *,
+        zone_id: str,
+        pattern: str,
+        script: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RouteUpdateResponse:
+        """
+        Updates the URL pattern or Worker associated with a route.
+
+        Args:
+          zone_id: Identifier.
+
+          route_id: Identifier.
+
+          pattern: Pattern to match incoming requests against.
+              [Learn more](https://developers.cloudflare.com/workers/configuration/routing/routes/#matching-behavior).
+
+          script: Name of the script to run if the route matches.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not route_id:
+            raise ValueError(f"Expected a non-empty value for `route_id` but received {route_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/workers/routes/{route_id}",
+            body=maybe_transform(
+                {
+                    "pattern": pattern,
+                    "script": script,
+                },
+                route_update_params.RouteUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RouteUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[RouteUpdateResponse], ResultWrapper[RouteUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[RouteListResponse]:
+        """
+        Returns routes for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/workers/routes",
+            page=SyncSinglePage[RouteListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=RouteListResponse,
+        )
+
+    def delete(
+        self,
+        route_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RouteDeleteResponse:
+        """
+        Deletes a route.
+
+        Args:
+          zone_id: Identifier.
+
+          route_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not route_id:
+            raise ValueError(f"Expected a non-empty value for `route_id` but received {route_id!r}")
+        return self._delete(
+            f"/zones/{zone_id}/workers/routes/{route_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RouteDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[RouteDeleteResponse], ResultWrapper[RouteDeleteResponse]),
+        )
+
+    def get(
+        self,
+        route_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RouteGetResponse:
+        """
+        Returns information about a route, including URL pattern and Worker.
+
+        Args:
+          zone_id: Identifier.
+
+          route_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not route_id:
+            raise ValueError(f"Expected a non-empty value for `route_id` but received {route_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/workers/routes/{route_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RouteGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[RouteGetResponse], ResultWrapper[RouteGetResponse]),
+        )
+
+
+class AsyncRoutesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncRoutesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncRoutesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncRoutesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncRoutesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        pattern: str,
+        script: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RouteCreateResponse:
+        """
+        Creates a route that maps a URL pattern to a Worker.
+
+        Args:
+          zone_id: Identifier.
+
+          pattern: Pattern to match incoming requests against.
+              [Learn more](https://developers.cloudflare.com/workers/configuration/routing/routes/#matching-behavior).
+
+          script: Name of the script to run if the route matches.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/workers/routes",
+            body=await async_maybe_transform(
+                {
+                    "pattern": pattern,
+                    "script": script,
+                },
+                route_create_params.RouteCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RouteCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[RouteCreateResponse], ResultWrapper[RouteCreateResponse]),
+        )
+
+    async def update(
+        self,
+        route_id: str,
+        *,
+        zone_id: str,
+        pattern: str,
+        script: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RouteUpdateResponse:
+        """
+        Updates the URL pattern or Worker associated with a route.
+
+        Args:
+          zone_id: Identifier.
+
+          route_id: Identifier.
+
+          pattern: Pattern to match incoming requests against.
+              [Learn more](https://developers.cloudflare.com/workers/configuration/routing/routes/#matching-behavior).
+
+          script: Name of the script to run if the route matches.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not route_id:
+            raise ValueError(f"Expected a non-empty value for `route_id` but received {route_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/workers/routes/{route_id}",
+            body=await async_maybe_transform(
+                {
+                    "pattern": pattern,
+                    "script": script,
+                },
+                route_update_params.RouteUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RouteUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[RouteUpdateResponse], ResultWrapper[RouteUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[RouteListResponse, AsyncSinglePage[RouteListResponse]]:
+        """
+        Returns routes for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/workers/routes",
+            page=AsyncSinglePage[RouteListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=RouteListResponse,
+        )
+
+    async def delete(
+        self,
+        route_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RouteDeleteResponse:
+        """
+        Deletes a route.
+
+        Args:
+          zone_id: Identifier.
+
+          route_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not route_id:
+            raise ValueError(f"Expected a non-empty value for `route_id` but received {route_id!r}")
+        return await self._delete(
+            f"/zones/{zone_id}/workers/routes/{route_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RouteDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[RouteDeleteResponse], ResultWrapper[RouteDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        route_id: str,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RouteGetResponse:
+        """
+        Returns information about a route, including URL pattern and Worker.
+
+        Args:
+          zone_id: Identifier.
+
+          route_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not route_id:
+            raise ValueError(f"Expected a non-empty value for `route_id` but received {route_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/workers/routes/{route_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[RouteGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[RouteGetResponse], ResultWrapper[RouteGetResponse]),
+        )
+
+
+class RoutesResourceWithRawResponse:
+    def __init__(self, routes: RoutesResource) -> None:
+        self._routes = routes
+
+        self.create = to_raw_response_wrapper(
+            routes.create,
+        )
+        self.update = to_raw_response_wrapper(
+            routes.update,
+        )
+        self.list = to_raw_response_wrapper(
+            routes.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            routes.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            routes.get,
+        )
+
+
+class AsyncRoutesResourceWithRawResponse:
+    def __init__(self, routes: AsyncRoutesResource) -> None:
+        self._routes = routes
+
+        self.create = async_to_raw_response_wrapper(
+            routes.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            routes.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            routes.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            routes.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            routes.get,
+        )
+
+
+class RoutesResourceWithStreamingResponse:
+    def __init__(self, routes: RoutesResource) -> None:
+        self._routes = routes
+
+        self.create = to_streamed_response_wrapper(
+            routes.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            routes.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            routes.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            routes.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            routes.get,
+        )
+
+
+class AsyncRoutesResourceWithStreamingResponse:
+    def __init__(self, routes: AsyncRoutesResource) -> None:
+        self._routes = routes
+
+        self.create = async_to_streamed_response_wrapper(
+            routes.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            routes.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            routes.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            routes.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            routes.get,
+        )
diff --git a/src/cloudflare/resources/workers/scripts/__init__.py b/src/cloudflare/resources/workers/scripts/__init__.py
index 8ddeb820ca6..ccec9c813e4 100644
--- a/src/cloudflare/resources/workers/scripts/__init__.py
+++ b/src/cloudflare/resources/workers/scripts/__init__.py
@@ -8,6 +8,14 @@
     TailResourceWithStreamingResponse,
     AsyncTailResourceWithStreamingResponse,
 )
+from .assets import (
+    AssetsResource,
+    AsyncAssetsResource,
+    AssetsResourceWithRawResponse,
+    AsyncAssetsResourceWithRawResponse,
+    AssetsResourceWithStreamingResponse,
+    AsyncAssetsResourceWithStreamingResponse,
+)
 from .content import (
     ContentResource,
     AsyncContentResource,
@@ -24,6 +32,14 @@
     ScriptsResourceWithStreamingResponse,
     AsyncScriptsResourceWithStreamingResponse,
 )
+from .secrets import (
+    SecretsResource,
+    AsyncSecretsResource,
+    SecretsResourceWithRawResponse,
+    AsyncSecretsResourceWithRawResponse,
+    SecretsResourceWithStreamingResponse,
+    AsyncSecretsResourceWithStreamingResponse,
+)
 from .settings import (
     SettingsResource,
     AsyncSettingsResource,
@@ -48,6 +64,14 @@
     SchedulesResourceWithStreamingResponse,
     AsyncSchedulesResourceWithStreamingResponse,
 )
+from .subdomain import (
+    SubdomainResource,
+    AsyncSubdomainResource,
+    SubdomainResourceWithRawResponse,
+    AsyncSubdomainResourceWithRawResponse,
+    SubdomainResourceWithStreamingResponse,
+    AsyncSubdomainResourceWithStreamingResponse,
+)
 from .deployments import (
     DeploymentsResource,
     AsyncDeploymentsResource,
@@ -56,8 +80,28 @@
     DeploymentsResourceWithStreamingResponse,
     AsyncDeploymentsResourceWithStreamingResponse,
 )
+from .script_and_version_settings import (
+    ScriptAndVersionSettingsResource,
+    AsyncScriptAndVersionSettingsResource,
+    ScriptAndVersionSettingsResourceWithRawResponse,
+    AsyncScriptAndVersionSettingsResourceWithRawResponse,
+    ScriptAndVersionSettingsResourceWithStreamingResponse,
+    AsyncScriptAndVersionSettingsResourceWithStreamingResponse,
+)
 
 __all__ = [
+    "AssetsResource",
+    "AsyncAssetsResource",
+    "AssetsResourceWithRawResponse",
+    "AsyncAssetsResourceWithRawResponse",
+    "AssetsResourceWithStreamingResponse",
+    "AsyncAssetsResourceWithStreamingResponse",
+    "SubdomainResource",
+    "AsyncSubdomainResource",
+    "SubdomainResourceWithRawResponse",
+    "AsyncSubdomainResourceWithRawResponse",
+    "SubdomainResourceWithStreamingResponse",
+    "AsyncSubdomainResourceWithStreamingResponse",
     "SchedulesResource",
     "AsyncSchedulesResource",
     "SchedulesResourceWithRawResponse",
@@ -94,6 +138,18 @@
     "AsyncVersionsResourceWithRawResponse",
     "VersionsResourceWithStreamingResponse",
     "AsyncVersionsResourceWithStreamingResponse",
+    "SecretsResource",
+    "AsyncSecretsResource",
+    "SecretsResourceWithRawResponse",
+    "AsyncSecretsResourceWithRawResponse",
+    "SecretsResourceWithStreamingResponse",
+    "AsyncSecretsResourceWithStreamingResponse",
+    "ScriptAndVersionSettingsResource",
+    "AsyncScriptAndVersionSettingsResource",
+    "ScriptAndVersionSettingsResourceWithRawResponse",
+    "AsyncScriptAndVersionSettingsResourceWithRawResponse",
+    "ScriptAndVersionSettingsResourceWithStreamingResponse",
+    "AsyncScriptAndVersionSettingsResourceWithStreamingResponse",
     "ScriptsResource",
     "AsyncScriptsResource",
     "ScriptsResourceWithRawResponse",
diff --git a/src/cloudflare/resources/workers/scripts/assets/__init__.py b/src/cloudflare/resources/workers/scripts/assets/__init__.py
new file mode 100644
index 00000000000..3769f94bf1e
--- /dev/null
+++ b/src/cloudflare/resources/workers/scripts/assets/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .assets import (
+    AssetsResource,
+    AsyncAssetsResource,
+    AssetsResourceWithRawResponse,
+    AsyncAssetsResourceWithRawResponse,
+    AssetsResourceWithStreamingResponse,
+    AsyncAssetsResourceWithStreamingResponse,
+)
+from .upload import (
+    UploadResource,
+    AsyncUploadResource,
+    UploadResourceWithRawResponse,
+    AsyncUploadResourceWithRawResponse,
+    UploadResourceWithStreamingResponse,
+    AsyncUploadResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "UploadResource",
+    "AsyncUploadResource",
+    "UploadResourceWithRawResponse",
+    "AsyncUploadResourceWithRawResponse",
+    "UploadResourceWithStreamingResponse",
+    "AsyncUploadResourceWithStreamingResponse",
+    "AssetsResource",
+    "AsyncAssetsResource",
+    "AssetsResourceWithRawResponse",
+    "AsyncAssetsResourceWithRawResponse",
+    "AssetsResourceWithStreamingResponse",
+    "AsyncAssetsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/workers/scripts/assets/assets.py b/src/cloudflare/resources/workers/scripts/assets/assets.py
new file mode 100644
index 00000000000..a6f7ceb3d1b
--- /dev/null
+++ b/src/cloudflare/resources/workers/scripts/assets/assets.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .upload import (
+    UploadResource,
+    AsyncUploadResource,
+    UploadResourceWithRawResponse,
+    AsyncUploadResourceWithRawResponse,
+    UploadResourceWithStreamingResponse,
+    AsyncUploadResourceWithStreamingResponse,
+)
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["AssetsResource", "AsyncAssetsResource"]
+
+
+class AssetsResource(SyncAPIResource):
+    @cached_property
+    def upload(self) -> UploadResource:
+        return UploadResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AssetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AssetsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AssetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AssetsResourceWithStreamingResponse(self)
+
+
+class AsyncAssetsResource(AsyncAPIResource):
+    @cached_property
+    def upload(self) -> AsyncUploadResource:
+        return AsyncUploadResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncAssetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAssetsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAssetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAssetsResourceWithStreamingResponse(self)
+
+
+class AssetsResourceWithRawResponse:
+    def __init__(self, assets: AssetsResource) -> None:
+        self._assets = assets
+
+    @cached_property
+    def upload(self) -> UploadResourceWithRawResponse:
+        return UploadResourceWithRawResponse(self._assets.upload)
+
+
+class AsyncAssetsResourceWithRawResponse:
+    def __init__(self, assets: AsyncAssetsResource) -> None:
+        self._assets = assets
+
+    @cached_property
+    def upload(self) -> AsyncUploadResourceWithRawResponse:
+        return AsyncUploadResourceWithRawResponse(self._assets.upload)
+
+
+class AssetsResourceWithStreamingResponse:
+    def __init__(self, assets: AssetsResource) -> None:
+        self._assets = assets
+
+    @cached_property
+    def upload(self) -> UploadResourceWithStreamingResponse:
+        return UploadResourceWithStreamingResponse(self._assets.upload)
+
+
+class AsyncAssetsResourceWithStreamingResponse:
+    def __init__(self, assets: AsyncAssetsResource) -> None:
+        self._assets = assets
+
+    @cached_property
+    def upload(self) -> AsyncUploadResourceWithStreamingResponse:
+        return AsyncUploadResourceWithStreamingResponse(self._assets.upload)
diff --git a/src/cloudflare/resources/workers/scripts/assets/upload.py b/src/cloudflare/resources/workers/scripts/assets/upload.py
new file mode 100644
index 00000000000..a4680e0f1d8
--- /dev/null
+++ b/src/cloudflare/resources/workers/scripts/assets/upload.py
@@ -0,0 +1,206 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Type, Optional, cast
+
+import httpx
+
+from ....._types import Body, Query, Headers, NotGiven, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.workers.scripts.assets import upload_create_params
+from .....types.workers.scripts.assets.upload_create_response import UploadCreateResponse
+
+__all__ = ["UploadResource", "AsyncUploadResource"]
+
+
+class UploadResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> UploadResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return UploadResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> UploadResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return UploadResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        manifest: Dict[str, upload_create_params.Manifest],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UploadCreateResponse]:
+        """Start uploading a collection of assets for use in a Worker version.
+
+        To learn
+        more about the direct uploads of assets, see
+        https://developers.cloudflare.com/workers/static-assets/direct-upload/.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          manifest: A manifest ([path]: {hash, size}) map of files to upload. As an example,
+              `/blog/hello-world.html` would be a valid path key.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        return self._post(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/assets-upload-session",
+            body=maybe_transform({"manifest": manifest}, upload_create_params.UploadCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[UploadCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[UploadCreateResponse]], ResultWrapper[UploadCreateResponse]),
+        )
+
+
+class AsyncUploadResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncUploadResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncUploadResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncUploadResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncUploadResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        manifest: Dict[str, upload_create_params.Manifest],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UploadCreateResponse]:
+        """Start uploading a collection of assets for use in a Worker version.
+
+        To learn
+        more about the direct uploads of assets, see
+        https://developers.cloudflare.com/workers/static-assets/direct-upload/.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          manifest: A manifest ([path]: {hash, size}) map of files to upload. As an example,
+              `/blog/hello-world.html` would be a valid path key.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        return await self._post(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/assets-upload-session",
+            body=await async_maybe_transform({"manifest": manifest}, upload_create_params.UploadCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[UploadCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[UploadCreateResponse]], ResultWrapper[UploadCreateResponse]),
+        )
+
+
+class UploadResourceWithRawResponse:
+    def __init__(self, upload: UploadResource) -> None:
+        self._upload = upload
+
+        self.create = to_raw_response_wrapper(
+            upload.create,
+        )
+
+
+class AsyncUploadResourceWithRawResponse:
+    def __init__(self, upload: AsyncUploadResource) -> None:
+        self._upload = upload
+
+        self.create = async_to_raw_response_wrapper(
+            upload.create,
+        )
+
+
+class UploadResourceWithStreamingResponse:
+    def __init__(self, upload: UploadResource) -> None:
+        self._upload = upload
+
+        self.create = to_streamed_response_wrapper(
+            upload.create,
+        )
+
+
+class AsyncUploadResourceWithStreamingResponse:
+    def __init__(self, upload: AsyncUploadResource) -> None:
+        self._upload = upload
+
+        self.create = async_to_streamed_response_wrapper(
+            upload.create,
+        )
diff --git a/src/cloudflare/resources/workers/scripts/content.py b/src/cloudflare/resources/workers/scripts/content.py
index b57cdfddbf3..166a0085820 100644
--- a/src/cloudflare/resources/workers/scripts/content.py
+++ b/src/cloudflare/resources/workers/scripts/content.py
@@ -2,11 +2,21 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Mapping, Optional, cast
+from typing import Type, Mapping, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven, FileTypes
+from ...._types import (
+    Body,
+    Omit,
+    Query,
+    Headers,
+    NotGiven,
+    FileTypes,
+    SequenceNotStr,
+    omit,
+    not_given,
+)
 from ...._utils import (
     extract_files,
     maybe_transform,
@@ -34,7 +44,6 @@
 from ...._base_client import make_request_options
 from ....types.workers.script import Script
 from ....types.workers.scripts import content_update_params
-from ....types.workers.worker_metadata_param import WorkerMetadataParam
 
 __all__ = ["ContentResource", "AsyncContentResource"]
 
@@ -42,10 +51,21 @@
 class ContentResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ContentResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ContentResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ContentResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ContentResourceWithStreamingResponse(self)
 
     def update(
@@ -53,33 +73,34 @@ def update(
         script_name: str,
         *,
         account_id: str,
-        any_part_name: List[FileTypes] | NotGiven = NOT_GIVEN,
-        metadata: WorkerMetadataParam | NotGiven = NOT_GIVEN,
-        cf_worker_body_part: str | NotGiven = NOT_GIVEN,
-        cf_worker_main_module_part: str | NotGiven = NOT_GIVEN,
+        metadata: content_update_params.Metadata,
+        files: SequenceNotStr[FileTypes] | Omit = omit,
+        cf_worker_body_part: str | Omit = omit,
+        cf_worker_main_module_part: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Script]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Script:
         """
-        Put script content without touching config or metadata
+        Put script content without touching config or metadata.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
-          any_part_name: A module comprising a Worker script, often a javascript file. Multiple modules
-              may be provided as separate named parts, but at least one module must be
-              present. This should be referenced either in the metadata as `main_module`
-              (esm)/`body_part` (service worker) or as a header `CF-WORKER-MAIN-MODULE-PART`
-              (esm) /`CF-WORKER-BODY-PART` (service worker) by part name. Source maps may also
-              be included using the `application/source-map` content type.
+          metadata: JSON-encoded metadata about the uploaded parts and Worker configuration.
 
-          metadata: JSON encoded metadata about the uploaded parts and Worker configuration.
+          files: An array of modules (often JavaScript files) comprising a Worker script. At
+              least one module must be present and referenced in the metadata as `main_module`
+              or `body_part` by filename.<br/>Possible Content-Type(s) are:
+              `application/javascript+module`, `text/javascript+module`,
+              `application/javascript`, `text/javascript`, `text/x-python`,
+              `text/x-python-requirement`, `application/wasm`, `text/plain`,
+              `application/octet-stream`, `application/source-map`.
 
           extra_headers: Send extra headers
 
@@ -104,11 +125,11 @@ def update(
         }
         body = deepcopy_minimal(
             {
-                "any_part_name": any_part_name,
                 "metadata": metadata,
+                "files": files,
             }
         )
-        files = extract_files(cast(Mapping[str, object], body), paths=[["<any part name>", "<array>"]])
+        extracted_files = extract_files(cast(Mapping[str, object], body), paths=[["files", "<array>"]])
         # It should be noted that the actual Content-Type header that will be
         # sent to the server will contain a `boundary` parameter, e.g.
         # multipart/form-data; boundary=---abc--
@@ -116,15 +137,16 @@ def update(
         return self._put(
             f"/accounts/{account_id}/workers/scripts/{script_name}/content",
             body=maybe_transform(body, content_update_params.ContentUpdateParams),
-            files=files,
+            files=extracted_files,
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Script]]._unwrapper,
+                multipart_syntax="json",
+                post_parser=ResultWrapper[Script]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Script]], ResultWrapper[Script]),
+            cast_to=cast(Type[Script], ResultWrapper[Script]),
         )
 
     def get(
@@ -137,13 +159,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> BinaryAPIResponse:
         """
-        Fetch script content only
+        Fetch script content only.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
@@ -172,10 +194,21 @@ def get(
 class AsyncContentResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncContentResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncContentResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncContentResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncContentResourceWithStreamingResponse(self)
 
     async def update(
@@ -183,33 +216,34 @@ async def update(
         script_name: str,
         *,
         account_id: str,
-        any_part_name: List[FileTypes] | NotGiven = NOT_GIVEN,
-        metadata: WorkerMetadataParam | NotGiven = NOT_GIVEN,
-        cf_worker_body_part: str | NotGiven = NOT_GIVEN,
-        cf_worker_main_module_part: str | NotGiven = NOT_GIVEN,
+        metadata: content_update_params.Metadata,
+        files: SequenceNotStr[FileTypes] | Omit = omit,
+        cf_worker_body_part: str | Omit = omit,
+        cf_worker_main_module_part: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Script]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Script:
         """
-        Put script content without touching config or metadata
+        Put script content without touching config or metadata.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
-          any_part_name: A module comprising a Worker script, often a javascript file. Multiple modules
-              may be provided as separate named parts, but at least one module must be
-              present. This should be referenced either in the metadata as `main_module`
-              (esm)/`body_part` (service worker) or as a header `CF-WORKER-MAIN-MODULE-PART`
-              (esm) /`CF-WORKER-BODY-PART` (service worker) by part name. Source maps may also
-              be included using the `application/source-map` content type.
+          metadata: JSON-encoded metadata about the uploaded parts and Worker configuration.
 
-          metadata: JSON encoded metadata about the uploaded parts and Worker configuration.
+          files: An array of modules (often JavaScript files) comprising a Worker script. At
+              least one module must be present and referenced in the metadata as `main_module`
+              or `body_part` by filename.<br/>Possible Content-Type(s) are:
+              `application/javascript+module`, `text/javascript+module`,
+              `application/javascript`, `text/javascript`, `text/x-python`,
+              `text/x-python-requirement`, `application/wasm`, `text/plain`,
+              `application/octet-stream`, `application/source-map`.
 
           extra_headers: Send extra headers
 
@@ -234,11 +268,11 @@ async def update(
         }
         body = deepcopy_minimal(
             {
-                "any_part_name": any_part_name,
                 "metadata": metadata,
+                "files": files,
             }
         )
-        files = extract_files(cast(Mapping[str, object], body), paths=[["<any part name>", "<array>"]])
+        extracted_files = extract_files(cast(Mapping[str, object], body), paths=[["files", "<array>"]])
         # It should be noted that the actual Content-Type header that will be
         # sent to the server will contain a `boundary` parameter, e.g.
         # multipart/form-data; boundary=---abc--
@@ -246,15 +280,16 @@ async def update(
         return await self._put(
             f"/accounts/{account_id}/workers/scripts/{script_name}/content",
             body=await async_maybe_transform(body, content_update_params.ContentUpdateParams),
-            files=files,
+            files=extracted_files,
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Script]]._unwrapper,
+                multipart_syntax="json",
+                post_parser=ResultWrapper[Script]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Script]], ResultWrapper[Script]),
+            cast_to=cast(Type[Script], ResultWrapper[Script]),
         )
 
     async def get(
@@ -267,13 +302,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncBinaryAPIResponse:
         """
-        Fetch script content only
+        Fetch script content only.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
diff --git a/src/cloudflare/resources/workers/scripts/deployments.py b/src/cloudflare/resources/workers/scripts/deployments.py
index 9361380834f..16ea873159f 100644
--- a/src/cloudflare/resources/workers/scripts/deployments.py
+++ b/src/cloudflare/resources/workers/scripts/deployments.py
@@ -2,15 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Type, Iterable, cast
+from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -22,9 +20,9 @@
 from ...._wrappers import ResultWrapper
 from ...._base_client import make_request_options
 from ....types.workers.scripts import deployment_create_params
-from ....types.workers.scripts.deployment_param import DeploymentParam
-from ....types.workers.scripts.deployment_get_response import DeploymentGetResponse
-from ....types.workers.scripts.deployment_create_response import DeploymentCreateResponse
+from ....types.workers.scripts.deployment import Deployment
+from ....types.workers.scripts.deployment_list_response import DeploymentListResponse
+from ....types.workers.scripts.deployment_delete_response import DeploymentDeleteResponse
 
 __all__ = ["DeploymentsResource", "AsyncDeploymentsResource"]
 
@@ -32,10 +30,21 @@
 class DeploymentsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DeploymentsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DeploymentsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DeploymentsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DeploymentsResourceWithStreamingResponse(self)
 
     def create(
@@ -43,15 +52,17 @@ def create(
         script_name: str,
         *,
         account_id: str,
-        annotations: DeploymentParam | NotGiven = NOT_GIVEN,
-        strategy: str | NotGiven = NOT_GIVEN,
+        strategy: Literal["percentage"],
+        versions: Iterable[deployment_create_params.Version],
+        force: bool | Omit = omit,
+        annotations: deployment_create_params.Annotations | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DeploymentCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Deployment:
         """
         Deployments configure how
         [Worker Versions](https://developers.cloudflare.com/api/operations/worker-versions-list-versions)
@@ -59,9 +70,12 @@ def create(
         Worker.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
 
-          script_name: Name of the script.
+          force: If set to true, the deployment will be created even if normally blocked by
+              something such rolling back to an older version when a secret has changed.
 
           extra_headers: Send extra headers
 
@@ -79,8 +93,9 @@ def create(
             f"/accounts/{account_id}/workers/scripts/{script_name}/deployments",
             body=maybe_transform(
                 {
-                    "annotations": annotations,
                     "strategy": strategy,
+                    "versions": versions,
+                    "annotations": annotations,
                 },
                 deployment_create_params.DeploymentCreateParams,
             ),
@@ -89,12 +104,13 @@ def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[DeploymentCreateResponse]]._unwrapper,
+                query=maybe_transform({"force": force}, deployment_create_params.DeploymentCreateParams),
+                post_parser=ResultWrapper[Deployment]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[DeploymentCreateResponse]], ResultWrapper[DeploymentCreateResponse]),
+            cast_to=cast(Type[Deployment], ResultWrapper[Deployment]),
         )
 
-    def get(
+    def list(
         self,
         script_name: str,
         *,
@@ -104,17 +120,17 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DeploymentGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DeploymentListResponse:
         """List of Worker Deployments.
 
         The first deployment in the list is the latest
         deployment actively serving traffic.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          script_name: Name of the script.
+          script_name: Name of the script, used in URLs and route configuration.
 
           extra_headers: Send extra headers
 
@@ -135,19 +151,122 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[DeploymentGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[DeploymentListResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[DeploymentGetResponse]], ResultWrapper[DeploymentGetResponse]),
+            cast_to=cast(Type[DeploymentListResponse], ResultWrapper[DeploymentListResponse]),
+        )
+
+    def delete(
+        self,
+        deployment_id: str,
+        *,
+        account_id: str,
+        script_name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DeploymentDeleteResponse:
+        """Delete a Worker Deployment.
+
+        The latest deployment, which is actively serving
+        traffic, cannot be deleted. All other deployments can be deleted.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        if not deployment_id:
+            raise ValueError(f"Expected a non-empty value for `deployment_id` but received {deployment_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/deployments/{deployment_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DeploymentDeleteResponse,
+        )
+
+    def get(
+        self,
+        deployment_id: str,
+        *,
+        account_id: str,
+        script_name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Deployment:
+        """
+        Get information about a Worker Deployment.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        if not deployment_id:
+            raise ValueError(f"Expected a non-empty value for `deployment_id` but received {deployment_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/deployments/{deployment_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Deployment]._unwrapper,
+            ),
+            cast_to=cast(Type[Deployment], ResultWrapper[Deployment]),
         )
 
 
 class AsyncDeploymentsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDeploymentsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDeploymentsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDeploymentsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDeploymentsResourceWithStreamingResponse(self)
 
     async def create(
@@ -155,15 +274,17 @@ async def create(
         script_name: str,
         *,
         account_id: str,
-        annotations: DeploymentParam | NotGiven = NOT_GIVEN,
-        strategy: str | NotGiven = NOT_GIVEN,
+        strategy: Literal["percentage"],
+        versions: Iterable[deployment_create_params.Version],
+        force: bool | Omit = omit,
+        annotations: deployment_create_params.Annotations | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DeploymentCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Deployment:
         """
         Deployments configure how
         [Worker Versions](https://developers.cloudflare.com/api/operations/worker-versions-list-versions)
@@ -171,9 +292,12 @@ async def create(
         Worker.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
 
-          script_name: Name of the script.
+          force: If set to true, the deployment will be created even if normally blocked by
+              something such rolling back to an older version when a secret has changed.
 
           extra_headers: Send extra headers
 
@@ -191,8 +315,9 @@ async def create(
             f"/accounts/{account_id}/workers/scripts/{script_name}/deployments",
             body=await async_maybe_transform(
                 {
-                    "annotations": annotations,
                     "strategy": strategy,
+                    "versions": versions,
+                    "annotations": annotations,
                 },
                 deployment_create_params.DeploymentCreateParams,
             ),
@@ -201,12 +326,13 @@ async def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[DeploymentCreateResponse]]._unwrapper,
+                query=await async_maybe_transform({"force": force}, deployment_create_params.DeploymentCreateParams),
+                post_parser=ResultWrapper[Deployment]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[DeploymentCreateResponse]], ResultWrapper[DeploymentCreateResponse]),
+            cast_to=cast(Type[Deployment], ResultWrapper[Deployment]),
         )
 
-    async def get(
+    async def list(
         self,
         script_name: str,
         *,
@@ -216,17 +342,17 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DeploymentGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DeploymentListResponse:
         """List of Worker Deployments.
 
         The first deployment in the list is the latest
         deployment actively serving traffic.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          script_name: Name of the script.
+          script_name: Name of the script, used in URLs and route configuration.
 
           extra_headers: Send extra headers
 
@@ -247,9 +373,101 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[DeploymentGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[DeploymentListResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DeploymentListResponse], ResultWrapper[DeploymentListResponse]),
+        )
+
+    async def delete(
+        self,
+        deployment_id: str,
+        *,
+        account_id: str,
+        script_name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DeploymentDeleteResponse:
+        """Delete a Worker Deployment.
+
+        The latest deployment, which is actively serving
+        traffic, cannot be deleted. All other deployments can be deleted.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        if not deployment_id:
+            raise ValueError(f"Expected a non-empty value for `deployment_id` but received {deployment_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/deployments/{deployment_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=DeploymentDeleteResponse,
+        )
+
+    async def get(
+        self,
+        deployment_id: str,
+        *,
+        account_id: str,
+        script_name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Deployment:
+        """
+        Get information about a Worker Deployment.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        if not deployment_id:
+            raise ValueError(f"Expected a non-empty value for `deployment_id` but received {deployment_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/deployments/{deployment_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Deployment]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[DeploymentGetResponse]], ResultWrapper[DeploymentGetResponse]),
+            cast_to=cast(Type[Deployment], ResultWrapper[Deployment]),
         )
 
 
@@ -260,6 +478,12 @@ def __init__(self, deployments: DeploymentsResource) -> None:
         self.create = to_raw_response_wrapper(
             deployments.create,
         )
+        self.list = to_raw_response_wrapper(
+            deployments.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            deployments.delete,
+        )
         self.get = to_raw_response_wrapper(
             deployments.get,
         )
@@ -272,6 +496,12 @@ def __init__(self, deployments: AsyncDeploymentsResource) -> None:
         self.create = async_to_raw_response_wrapper(
             deployments.create,
         )
+        self.list = async_to_raw_response_wrapper(
+            deployments.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            deployments.delete,
+        )
         self.get = async_to_raw_response_wrapper(
             deployments.get,
         )
@@ -284,6 +514,12 @@ def __init__(self, deployments: DeploymentsResource) -> None:
         self.create = to_streamed_response_wrapper(
             deployments.create,
         )
+        self.list = to_streamed_response_wrapper(
+            deployments.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            deployments.delete,
+        )
         self.get = to_streamed_response_wrapper(
             deployments.get,
         )
@@ -296,6 +532,12 @@ def __init__(self, deployments: AsyncDeploymentsResource) -> None:
         self.create = async_to_streamed_response_wrapper(
             deployments.create,
         )
+        self.list = async_to_streamed_response_wrapper(
+            deployments.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            deployments.delete,
+        )
         self.get = async_to_streamed_response_wrapper(
             deployments.get,
         )
diff --git a/src/cloudflare/resources/workers/scripts/schedules.py b/src/cloudflare/resources/workers/scripts/schedules.py
index 467ff03361c..07db257b926 100644
--- a/src/cloudflare/resources/workers/scripts/schedules.py
+++ b/src/cloudflare/resources/workers/scripts/schedules.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Type, Iterable, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -31,10 +28,21 @@
 class SchedulesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SchedulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SchedulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SchedulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SchedulesResourceWithStreamingResponse(self)
 
     def update(
@@ -42,19 +50,19 @@ def update(
         script_name: str,
         *,
         account_id: str,
-        body: str,
+        body: Iterable[schedule_update_params.Body],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ScheduleUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScheduleUpdateResponse:
         """
         Updates Cron Triggers for a Worker.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
@@ -72,15 +80,15 @@ def update(
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
         return self._put(
             f"/accounts/{account_id}/workers/scripts/{script_name}/schedules",
-            body=maybe_transform(body, schedule_update_params.ScheduleUpdateParams),
+            body=maybe_transform(body, Iterable[schedule_update_params.Body]),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ScheduleUpdateResponse]]._unwrapper,
+                post_parser=ResultWrapper[ScheduleUpdateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ScheduleUpdateResponse]], ResultWrapper[ScheduleUpdateResponse]),
+            cast_to=cast(Type[ScheduleUpdateResponse], ResultWrapper[ScheduleUpdateResponse]),
         )
 
     def get(
@@ -93,13 +101,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ScheduleGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScheduleGetResponse:
         """
         Fetches Cron Triggers for a Worker.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
@@ -122,19 +130,30 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ScheduleGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[ScheduleGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ScheduleGetResponse]], ResultWrapper[ScheduleGetResponse]),
+            cast_to=cast(Type[ScheduleGetResponse], ResultWrapper[ScheduleGetResponse]),
         )
 
 
 class AsyncSchedulesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSchedulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSchedulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSchedulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSchedulesResourceWithStreamingResponse(self)
 
     async def update(
@@ -142,19 +161,19 @@ async def update(
         script_name: str,
         *,
         account_id: str,
-        body: str,
+        body: Iterable[schedule_update_params.Body],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ScheduleUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScheduleUpdateResponse:
         """
         Updates Cron Triggers for a Worker.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
@@ -172,15 +191,15 @@ async def update(
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
         return await self._put(
             f"/accounts/{account_id}/workers/scripts/{script_name}/schedules",
-            body=await async_maybe_transform(body, schedule_update_params.ScheduleUpdateParams),
+            body=await async_maybe_transform(body, Iterable[schedule_update_params.Body]),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ScheduleUpdateResponse]]._unwrapper,
+                post_parser=ResultWrapper[ScheduleUpdateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ScheduleUpdateResponse]], ResultWrapper[ScheduleUpdateResponse]),
+            cast_to=cast(Type[ScheduleUpdateResponse], ResultWrapper[ScheduleUpdateResponse]),
         )
 
     async def get(
@@ -193,13 +212,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ScheduleGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScheduleGetResponse:
         """
         Fetches Cron Triggers for a Worker.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
@@ -222,9 +241,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ScheduleGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[ScheduleGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ScheduleGetResponse]], ResultWrapper[ScheduleGetResponse]),
+            cast_to=cast(Type[ScheduleGetResponse], ResultWrapper[ScheduleGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/workers/scripts/script_and_version_settings.py b/src/cloudflare/resources/workers/scripts/script_and_version_settings.py
new file mode 100644
index 00000000000..1d863218932
--- /dev/null
+++ b/src/cloudflare/resources/workers/scripts/script_and_version_settings.py
@@ -0,0 +1,309 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.workers.scripts import script_and_version_setting_edit_params
+from ....types.workers.scripts.script_and_version_setting_get_response import ScriptAndVersionSettingGetResponse
+from ....types.workers.scripts.script_and_version_setting_edit_response import ScriptAndVersionSettingEditResponse
+
+__all__ = ["ScriptAndVersionSettingsResource", "AsyncScriptAndVersionSettingsResource"]
+
+
+class ScriptAndVersionSettingsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ScriptAndVersionSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ScriptAndVersionSettingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ScriptAndVersionSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ScriptAndVersionSettingsResourceWithStreamingResponse(self)
+
+    def edit(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        settings: script_and_version_setting_edit_params.Settings | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScriptAndVersionSettingEditResponse:
+        """
+        Patch metadata or config, such as bindings or usage model.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        # It should be noted that the actual Content-Type header that will be
+        # sent to the server will contain a `boundary` parameter, e.g.
+        # multipart/form-data; boundary=---abc--
+        extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
+        return self._patch(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/settings",
+            body=maybe_transform(
+                {"settings": settings}, script_and_version_setting_edit_params.ScriptAndVersionSettingEditParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                multipart_syntax="json",
+                post_parser=ResultWrapper[ScriptAndVersionSettingEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ScriptAndVersionSettingEditResponse], ResultWrapper[ScriptAndVersionSettingEditResponse]),
+        )
+
+    def get(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScriptAndVersionSettingGetResponse:
+        """
+        Get metadata and config, such as bindings or usage model.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        return self._get(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/settings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ScriptAndVersionSettingGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ScriptAndVersionSettingGetResponse], ResultWrapper[ScriptAndVersionSettingGetResponse]),
+        )
+
+
+class AsyncScriptAndVersionSettingsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncScriptAndVersionSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncScriptAndVersionSettingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncScriptAndVersionSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncScriptAndVersionSettingsResourceWithStreamingResponse(self)
+
+    async def edit(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        settings: script_and_version_setting_edit_params.Settings | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScriptAndVersionSettingEditResponse:
+        """
+        Patch metadata or config, such as bindings or usage model.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        # It should be noted that the actual Content-Type header that will be
+        # sent to the server will contain a `boundary` parameter, e.g.
+        # multipart/form-data; boundary=---abc--
+        extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
+        return await self._patch(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/settings",
+            body=await async_maybe_transform(
+                {"settings": settings}, script_and_version_setting_edit_params.ScriptAndVersionSettingEditParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                multipart_syntax="json",
+                post_parser=ResultWrapper[ScriptAndVersionSettingEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ScriptAndVersionSettingEditResponse], ResultWrapper[ScriptAndVersionSettingEditResponse]),
+        )
+
+    async def get(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScriptAndVersionSettingGetResponse:
+        """
+        Get metadata and config, such as bindings or usage model.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        return await self._get(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/settings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ScriptAndVersionSettingGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ScriptAndVersionSettingGetResponse], ResultWrapper[ScriptAndVersionSettingGetResponse]),
+        )
+
+
+class ScriptAndVersionSettingsResourceWithRawResponse:
+    def __init__(self, script_and_version_settings: ScriptAndVersionSettingsResource) -> None:
+        self._script_and_version_settings = script_and_version_settings
+
+        self.edit = to_raw_response_wrapper(
+            script_and_version_settings.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            script_and_version_settings.get,
+        )
+
+
+class AsyncScriptAndVersionSettingsResourceWithRawResponse:
+    def __init__(self, script_and_version_settings: AsyncScriptAndVersionSettingsResource) -> None:
+        self._script_and_version_settings = script_and_version_settings
+
+        self.edit = async_to_raw_response_wrapper(
+            script_and_version_settings.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            script_and_version_settings.get,
+        )
+
+
+class ScriptAndVersionSettingsResourceWithStreamingResponse:
+    def __init__(self, script_and_version_settings: ScriptAndVersionSettingsResource) -> None:
+        self._script_and_version_settings = script_and_version_settings
+
+        self.edit = to_streamed_response_wrapper(
+            script_and_version_settings.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            script_and_version_settings.get,
+        )
+
+
+class AsyncScriptAndVersionSettingsResourceWithStreamingResponse:
+    def __init__(self, script_and_version_settings: AsyncScriptAndVersionSettingsResource) -> None:
+        self._script_and_version_settings = script_and_version_settings
+
+        self.edit = async_to_streamed_response_wrapper(
+            script_and_version_settings.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            script_and_version_settings.get,
+        )
diff --git a/src/cloudflare/resources/workers/scripts/scripts.py b/src/cloudflare/resources/workers/scripts/scripts.py
index 5acec054d32..8b39ff1240d 100644
--- a/src/cloudflare/resources/workers/scripts/scripts.py
+++ b/src/cloudflare/resources/workers/scripts/scripts.py
@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Optional, cast, overload
+from typing import Type, Optional, cast
+from typing_extensions import Literal
 
 import httpx
 
@@ -22,6 +23,14 @@
     ContentResourceWithStreamingResponse,
     AsyncContentResourceWithStreamingResponse,
 )
+from .secrets import (
+    SecretsResource,
+    AsyncSecretsResource,
+    SecretsResourceWithRawResponse,
+    AsyncSecretsResourceWithRawResponse,
+    SecretsResourceWithStreamingResponse,
+    AsyncSecretsResourceWithStreamingResponse,
+)
 from .settings import (
     SettingsResource,
     AsyncSettingsResource,
@@ -38,12 +47,18 @@
     VersionsResourceWithStreamingResponse,
     AsyncVersionsResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven, FileTypes
-from ...._utils import (
-    required_args,
-    maybe_transform,
-    async_maybe_transform,
+from ...._types import (
+    Body,
+    Omit,
+    Query,
+    Headers,
+    NotGiven,
+    FileTypes,
+    SequenceNotStr,
+    omit,
+    not_given,
 )
+from ...._utils import is_given, maybe_transform, deepcopy_minimal, async_maybe_transform
 from .schedules import (
     SchedulesResource,
     AsyncSchedulesResource,
@@ -52,6 +67,14 @@
     SchedulesResourceWithStreamingResponse,
     AsyncSchedulesResourceWithStreamingResponse,
 )
+from .subdomain import (
+    SubdomainResource,
+    AsyncSubdomainResource,
+    SubdomainResourceWithRawResponse,
+    AsyncSubdomainResourceWithRawResponse,
+    SubdomainResourceWithStreamingResponse,
+    AsyncSubdomainResourceWithStreamingResponse,
+)
 from ...._compat import cached_property
 from .deployments import (
     DeploymentsResource,
@@ -63,29 +86,47 @@
 )
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
-    BinaryAPIResponse,
-    AsyncBinaryAPIResponse,
-    StreamedBinaryAPIResponse,
-    AsyncStreamedBinaryAPIResponse,
     to_raw_response_wrapper,
     to_streamed_response_wrapper,
     async_to_raw_response_wrapper,
-    to_custom_raw_response_wrapper,
     async_to_streamed_response_wrapper,
-    to_custom_streamed_response_wrapper,
-    async_to_custom_raw_response_wrapper,
-    async_to_custom_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
 from ....pagination import SyncSinglePage, AsyncSinglePage
+from .assets.assets import (
+    AssetsResource,
+    AsyncAssetsResource,
+    AssetsResourceWithRawResponse,
+    AsyncAssetsResourceWithRawResponse,
+    AssetsResourceWithStreamingResponse,
+    AsyncAssetsResourceWithStreamingResponse,
+)
 from ...._base_client import AsyncPaginator, make_request_options
-from ....types.workers import script_delete_params, script_update_params
-from ....types.workers.script import Script
+from ....types.workers import script_list_params, script_delete_params, script_search_params, script_update_params
+from .script_and_version_settings import (
+    ScriptAndVersionSettingsResource,
+    AsyncScriptAndVersionSettingsResource,
+    ScriptAndVersionSettingsResourceWithRawResponse,
+    AsyncScriptAndVersionSettingsResourceWithRawResponse,
+    ScriptAndVersionSettingsResourceWithStreamingResponse,
+    AsyncScriptAndVersionSettingsResourceWithStreamingResponse,
+)
+from ....types.workers.script_list_response import ScriptListResponse
+from ....types.workers.script_search_response import ScriptSearchResponse
+from ....types.workers.script_update_response import ScriptUpdateResponse
 
 __all__ = ["ScriptsResource", "AsyncScriptsResource"]
 
 
 class ScriptsResource(SyncAPIResource):
+    @cached_property
+    def assets(self) -> AssetsResource:
+        return AssetsResource(self._client)
+
+    @cached_property
+    def subdomain(self) -> SubdomainResource:
+        return SubdomainResource(self._client)
+
     @cached_property
     def schedules(self) -> SchedulesResource:
         return SchedulesResource(self._client)
@@ -111,88 +152,66 @@ def versions(self) -> VersionsResource:
         return VersionsResource(self._client)
 
     @cached_property
-    def with_raw_response(self) -> ScriptsResourceWithRawResponse:
-        return ScriptsResourceWithRawResponse(self)
+    def secrets(self) -> SecretsResource:
+        return SecretsResource(self._client)
 
     @cached_property
-    def with_streaming_response(self) -> ScriptsResourceWithStreamingResponse:
-        return ScriptsResourceWithStreamingResponse(self)
+    def script_and_version_settings(self) -> ScriptAndVersionSettingsResource:
+        return ScriptAndVersionSettingsResource(self._client)
 
-    @overload
-    def update(
-        self,
-        script_name: str,
-        *,
-        account_id: str,
-        rollback_to: str | NotGiven = NOT_GIVEN,
-        any_part_name: List[FileTypes] | NotGiven = NOT_GIVEN,
-        metadata: script_update_params.Variant0Metadata | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Script]:
+    @cached_property
+    def with_raw_response(self) -> ScriptsResourceWithRawResponse:
         """
-        Upload a worker module.
-
-        Args:
-          account_id: Identifier
-
-          script_name: Name of the script, used in URLs and route configuration.
-
-          rollback_to: Rollback to provided deployment based on deployment ID. Request body will only
-              parse a "message" part. You can learn more about deployments
-              [here](https://developers.cloudflare.com/workers/platform/deployments/).
-
-          any_part_name: A module comprising a Worker script, often a javascript file. Multiple modules
-              may be provided as separate named parts, but at least one module must be present
-              and referenced in the metadata as `main_module` or `body_part` by part name.
-              Source maps may also be included using the `application/source-map` content
-              type.
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
 
-          metadata: JSON encoded metadata about the uploaded parts and Worker configuration.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ScriptsResourceWithRawResponse(self)
 
-          extra_body: Add additional JSON properties to the request
+    @cached_property
+    def with_streaming_response(self) -> ScriptsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
         """
-        ...
+        return ScriptsResourceWithStreamingResponse(self)
 
-    @overload
     def update(
         self,
         script_name: str,
         *,
         account_id: str,
-        rollback_to: str | NotGiven = NOT_GIVEN,
-        message: str | NotGiven = NOT_GIVEN,
+        metadata: script_update_params.Metadata,
+        files: SequenceNotStr[FileTypes] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Script]:
-        """
-        Upload a worker module.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScriptUpdateResponse:
+        """Upload a worker module.
+
+        You can find more about the multipart metadata on our
+        docs:
+        https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
-          rollback_to: Rollback to provided deployment based on deployment ID. Request body will only
-              parse a "message" part. You can learn more about deployments
-              [here](https://developers.cloudflare.com/workers/platform/deployments/).
+          metadata: JSON-encoded metadata about the uploaded parts and Worker configuration.
 
-          message: Rollback message to be associated with this deployment. Only parsed when query
-              param `"rollback_to"` is present.
+          files: An array of modules (often JavaScript files) comprising a Worker script. At
+              least one module must be present and referenced in the metadata as `main_module`
+              or `body_part` by filename.<br/>Possible Content-Type(s) are:
+              `application/javascript+module`, `text/javascript+module`,
+              `application/javascript`, `text/javascript`, `text/x-python`,
+              `text/x-python-requirement`, `application/wasm`, `text/plain`,
+              `application/octet-stream`, `application/source-map`.
 
           extra_headers: Send extra headers
 
@@ -202,66 +221,56 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        ...
-
-    @required_args(["account_id"])
-    def update(
-        self,
-        script_name: str,
-        *,
-        account_id: str,
-        rollback_to: str | NotGiven = NOT_GIVEN,
-        any_part_name: List[FileTypes] | NotGiven = NOT_GIVEN,
-        metadata: script_update_params.Variant0Metadata | NotGiven = NOT_GIVEN,
-        message: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Script]:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not script_name:
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        body = deepcopy_minimal(
+            {
+                "metadata": metadata,
+            }
+        )
+        extracted_files = [("files", file) for file in files] if is_given(files) else []
+        if extracted_files:
+            # It should be noted that the actual Content-Type header that will be
+            # sent to the server will contain a `boundary` parameter, e.g.
+            # multipart/form-data; boundary=---abc--
+            extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
         return self._put(
             f"/accounts/{account_id}/workers/scripts/{script_name}",
-            body=maybe_transform(
-                {
-                    "any_part_name": any_part_name,
-                    "metadata": metadata,
-                    "message": message,
-                },
-                script_update_params.ScriptUpdateParams,
-            ),
+            body=maybe_transform(body, script_update_params.ScriptUpdateParams),
+            files=extracted_files,
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=maybe_transform({"rollback_to": rollback_to}, script_update_params.ScriptUpdateParams),
-                post_parser=ResultWrapper[Optional[Script]]._unwrapper,
+                multipart_syntax="json",
+                post_parser=ResultWrapper[ScriptUpdateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Script]], ResultWrapper[Script]),
+            cast_to=cast(Type[ScriptUpdateResponse], ResultWrapper[ScriptUpdateResponse]),
         )
 
     def list(
         self,
         *,
         account_id: str,
+        tags: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[Script]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[ScriptListResponse]:
         """
         Fetch a list of uploaded workers.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          tags: Filter scripts by tags. Format: comma-separated list of tag:allowed pairs where
+              allowed is 'yes' or 'no'.
 
           extra_headers: Send extra headers
 
@@ -275,11 +284,15 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/workers/scripts",
-            page=SyncSinglePage[Script],
+            page=SyncSinglePage[ScriptListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"tags": tags}, script_list_params.ScriptListParams),
             ),
-            model=Script,
+            model=ScriptListResponse,
         )
 
     def delete(
@@ -287,20 +300,20 @@ def delete(
         script_name: str,
         *,
         account_id: str,
-        force: bool | NotGiven = NOT_GIVEN,
+        force: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> None:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """Delete your worker.
 
         This call has no response body on a successful delete.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
@@ -320,7 +333,6 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not script_name:
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
-        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
         return self._delete(
             f"/accounts/{account_id}/workers/scripts/{script_name}",
             options=make_request_options(
@@ -329,8 +341,9 @@ def delete(
                 extra_body=extra_body,
                 timeout=timeout,
                 query=maybe_transform({"force": force}, script_delete_params.ScriptDeleteParams),
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
-            cast_to=NoneType,
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     def get(
@@ -343,15 +356,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> BinaryAPIResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
         """Fetch raw script content for your worker.
 
         Note this is the original script
         content, not JSON encoded.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
@@ -367,17 +380,89 @@ def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not script_name:
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
-        extra_headers = {"Accept": "undefined", **(extra_headers or {})}
+        extra_headers = {"Accept": "application/javascript", **(extra_headers or {})}
         return self._get(
             f"/accounts/{account_id}/workers/scripts/{script_name}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=BinaryAPIResponse,
+            cast_to=str,
+        )
+
+    def search(
+        self,
+        *,
+        account_id: str,
+        id: str | Omit = omit,
+        name: str | Omit = omit,
+        order_by: Literal["created_on", "modified_on", "name"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScriptSearchResponse:
+        """
+        Search for Workers in an account.
+
+        Args:
+          account_id: Identifier.
+
+          id: Worker ID (also called tag) to search for. Only exact matches are returned.
+
+          name: Worker name to search for. Both exact and partial matches are returned.
+
+          order_by: Property to sort results by. Results are sorted in ascending order.
+
+          page: Current page.
+
+          per_page: Items per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/workers/scripts-search",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "id": id,
+                        "name": name,
+                        "order_by": order_by,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    script_search_params.ScriptSearchParams,
+                ),
+                post_parser=ResultWrapper[ScriptSearchResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ScriptSearchResponse], ResultWrapper[ScriptSearchResponse]),
         )
 
 
 class AsyncScriptsResource(AsyncAPIResource):
+    @cached_property
+    def assets(self) -> AsyncAssetsResource:
+        return AsyncAssetsResource(self._client)
+
+    @cached_property
+    def subdomain(self) -> AsyncSubdomainResource:
+        return AsyncSubdomainResource(self._client)
+
     @cached_property
     def schedules(self) -> AsyncSchedulesResource:
         return AsyncSchedulesResource(self._client)
@@ -403,88 +488,66 @@ def versions(self) -> AsyncVersionsResource:
         return AsyncVersionsResource(self._client)
 
     @cached_property
-    def with_raw_response(self) -> AsyncScriptsResourceWithRawResponse:
-        return AsyncScriptsResourceWithRawResponse(self)
+    def secrets(self) -> AsyncSecretsResource:
+        return AsyncSecretsResource(self._client)
 
     @cached_property
-    def with_streaming_response(self) -> AsyncScriptsResourceWithStreamingResponse:
-        return AsyncScriptsResourceWithStreamingResponse(self)
+    def script_and_version_settings(self) -> AsyncScriptAndVersionSettingsResource:
+        return AsyncScriptAndVersionSettingsResource(self._client)
 
-    @overload
-    async def update(
-        self,
-        script_name: str,
-        *,
-        account_id: str,
-        rollback_to: str | NotGiven = NOT_GIVEN,
-        any_part_name: List[FileTypes] | NotGiven = NOT_GIVEN,
-        metadata: script_update_params.Variant0Metadata | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Script]:
+    @cached_property
+    def with_raw_response(self) -> AsyncScriptsResourceWithRawResponse:
         """
-        Upload a worker module.
-
-        Args:
-          account_id: Identifier
-
-          script_name: Name of the script, used in URLs and route configuration.
-
-          rollback_to: Rollback to provided deployment based on deployment ID. Request body will only
-              parse a "message" part. You can learn more about deployments
-              [here](https://developers.cloudflare.com/workers/platform/deployments/).
-
-          any_part_name: A module comprising a Worker script, often a javascript file. Multiple modules
-              may be provided as separate named parts, but at least one module must be present
-              and referenced in the metadata as `main_module` or `body_part` by part name.
-              Source maps may also be included using the `application/source-map` content
-              type.
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
 
-          metadata: JSON encoded metadata about the uploaded parts and Worker configuration.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncScriptsResourceWithRawResponse(self)
 
-          extra_body: Add additional JSON properties to the request
+    @cached_property
+    def with_streaming_response(self) -> AsyncScriptsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
         """
-        ...
+        return AsyncScriptsResourceWithStreamingResponse(self)
 
-    @overload
     async def update(
         self,
         script_name: str,
         *,
         account_id: str,
-        rollback_to: str | NotGiven = NOT_GIVEN,
-        message: str | NotGiven = NOT_GIVEN,
+        metadata: script_update_params.Metadata,
+        files: SequenceNotStr[FileTypes] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Script]:
-        """
-        Upload a worker module.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScriptUpdateResponse:
+        """Upload a worker module.
+
+        You can find more about the multipart metadata on our
+        docs:
+        https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
-          rollback_to: Rollback to provided deployment based on deployment ID. Request body will only
-              parse a "message" part. You can learn more about deployments
-              [here](https://developers.cloudflare.com/workers/platform/deployments/).
+          metadata: JSON-encoded metadata about the uploaded parts and Worker configuration.
 
-          message: Rollback message to be associated with this deployment. Only parsed when query
-              param `"rollback_to"` is present.
+          files: An array of modules (often JavaScript files) comprising a Worker script. At
+              least one module must be present and referenced in the metadata as `main_module`
+              or `body_part` by filename.<br/>Possible Content-Type(s) are:
+              `application/javascript+module`, `text/javascript+module`,
+              `application/javascript`, `text/javascript`, `text/x-python`,
+              `text/x-python-requirement`, `application/wasm`, `text/plain`,
+              `application/octet-stream`, `application/source-map`.
 
           extra_headers: Send extra headers
 
@@ -494,68 +557,56 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        ...
-
-    @required_args(["account_id"])
-    async def update(
-        self,
-        script_name: str,
-        *,
-        account_id: str,
-        rollback_to: str | NotGiven = NOT_GIVEN,
-        any_part_name: List[FileTypes] | NotGiven = NOT_GIVEN,
-        metadata: script_update_params.Variant0Metadata | NotGiven = NOT_GIVEN,
-        message: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Script]:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not script_name:
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        body = deepcopy_minimal(
+            {
+                "metadata": metadata,
+            }
+        )
+        extracted_files = [("files", file) for file in files] if is_given(files) else []
+        if extracted_files:
+            # It should be noted that the actual Content-Type header that will be
+            # sent to the server will contain a `boundary` parameter, e.g.
+            # multipart/form-data; boundary=---abc--
+            extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
         return await self._put(
             f"/accounts/{account_id}/workers/scripts/{script_name}",
-            body=await async_maybe_transform(
-                {
-                    "any_part_name": any_part_name,
-                    "metadata": metadata,
-                    "message": message,
-                },
-                script_update_params.ScriptUpdateParams,
-            ),
+            body=await async_maybe_transform(body, script_update_params.ScriptUpdateParams),
+            files=extracted_files,
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=await async_maybe_transform(
-                    {"rollback_to": rollback_to}, script_update_params.ScriptUpdateParams
-                ),
-                post_parser=ResultWrapper[Optional[Script]]._unwrapper,
+                multipart_syntax="json",
+                post_parser=ResultWrapper[ScriptUpdateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Script]], ResultWrapper[Script]),
+            cast_to=cast(Type[ScriptUpdateResponse], ResultWrapper[ScriptUpdateResponse]),
         )
 
     def list(
         self,
         *,
         account_id: str,
+        tags: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[Script, AsyncSinglePage[Script]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ScriptListResponse, AsyncSinglePage[ScriptListResponse]]:
         """
         Fetch a list of uploaded workers.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          tags: Filter scripts by tags. Format: comma-separated list of tag:allowed pairs where
+              allowed is 'yes' or 'no'.
 
           extra_headers: Send extra headers
 
@@ -569,11 +620,15 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/workers/scripts",
-            page=AsyncSinglePage[Script],
+            page=AsyncSinglePage[ScriptListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"tags": tags}, script_list_params.ScriptListParams),
             ),
-            model=Script,
+            model=ScriptListResponse,
         )
 
     async def delete(
@@ -581,20 +636,20 @@ async def delete(
         script_name: str,
         *,
         account_id: str,
-        force: bool | NotGiven = NOT_GIVEN,
+        force: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> None:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """Delete your worker.
 
         This call has no response body on a successful delete.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
@@ -614,7 +669,6 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not script_name:
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
-        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
         return await self._delete(
             f"/accounts/{account_id}/workers/scripts/{script_name}",
             options=make_request_options(
@@ -623,8 +677,9 @@ async def delete(
                 extra_body=extra_body,
                 timeout=timeout,
                 query=await async_maybe_transform({"force": force}, script_delete_params.ScriptDeleteParams),
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
-            cast_to=NoneType,
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     async def get(
@@ -637,15 +692,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncBinaryAPIResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
         """Fetch raw script content for your worker.
 
         Note this is the original script
         content, not JSON encoded.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
@@ -661,13 +716,77 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not script_name:
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
-        extra_headers = {"Accept": "undefined", **(extra_headers or {})}
+        extra_headers = {"Accept": "application/javascript", **(extra_headers or {})}
         return await self._get(
             f"/accounts/{account_id}/workers/scripts/{script_name}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=AsyncBinaryAPIResponse,
+            cast_to=str,
+        )
+
+    async def search(
+        self,
+        *,
+        account_id: str,
+        id: str | Omit = omit,
+        name: str | Omit = omit,
+        order_by: Literal["created_on", "modified_on", "name"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScriptSearchResponse:
+        """
+        Search for Workers in an account.
+
+        Args:
+          account_id: Identifier.
+
+          id: Worker ID (also called tag) to search for. Only exact matches are returned.
+
+          name: Worker name to search for. Both exact and partial matches are returned.
+
+          order_by: Property to sort results by. Results are sorted in ascending order.
+
+          page: Current page.
+
+          per_page: Items per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/workers/scripts-search",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "id": id,
+                        "name": name,
+                        "order_by": order_by,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    script_search_params.ScriptSearchParams,
+                ),
+                post_parser=ResultWrapper[ScriptSearchResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ScriptSearchResponse], ResultWrapper[ScriptSearchResponse]),
         )
 
 
@@ -684,10 +803,20 @@ def __init__(self, scripts: ScriptsResource) -> None:
         self.delete = to_raw_response_wrapper(
             scripts.delete,
         )
-        self.get = to_custom_raw_response_wrapper(
+        self.get = to_raw_response_wrapper(
             scripts.get,
-            BinaryAPIResponse,
         )
+        self.search = to_raw_response_wrapper(
+            scripts.search,
+        )
+
+    @cached_property
+    def assets(self) -> AssetsResourceWithRawResponse:
+        return AssetsResourceWithRawResponse(self._scripts.assets)
+
+    @cached_property
+    def subdomain(self) -> SubdomainResourceWithRawResponse:
+        return SubdomainResourceWithRawResponse(self._scripts.subdomain)
 
     @cached_property
     def schedules(self) -> SchedulesResourceWithRawResponse:
@@ -713,6 +842,14 @@ def deployments(self) -> DeploymentsResourceWithRawResponse:
     def versions(self) -> VersionsResourceWithRawResponse:
         return VersionsResourceWithRawResponse(self._scripts.versions)
 
+    @cached_property
+    def secrets(self) -> SecretsResourceWithRawResponse:
+        return SecretsResourceWithRawResponse(self._scripts.secrets)
+
+    @cached_property
+    def script_and_version_settings(self) -> ScriptAndVersionSettingsResourceWithRawResponse:
+        return ScriptAndVersionSettingsResourceWithRawResponse(self._scripts.script_and_version_settings)
+
 
 class AsyncScriptsResourceWithRawResponse:
     def __init__(self, scripts: AsyncScriptsResource) -> None:
@@ -727,10 +864,20 @@ def __init__(self, scripts: AsyncScriptsResource) -> None:
         self.delete = async_to_raw_response_wrapper(
             scripts.delete,
         )
-        self.get = async_to_custom_raw_response_wrapper(
+        self.get = async_to_raw_response_wrapper(
             scripts.get,
-            AsyncBinaryAPIResponse,
         )
+        self.search = async_to_raw_response_wrapper(
+            scripts.search,
+        )
+
+    @cached_property
+    def assets(self) -> AsyncAssetsResourceWithRawResponse:
+        return AsyncAssetsResourceWithRawResponse(self._scripts.assets)
+
+    @cached_property
+    def subdomain(self) -> AsyncSubdomainResourceWithRawResponse:
+        return AsyncSubdomainResourceWithRawResponse(self._scripts.subdomain)
 
     @cached_property
     def schedules(self) -> AsyncSchedulesResourceWithRawResponse:
@@ -756,6 +903,14 @@ def deployments(self) -> AsyncDeploymentsResourceWithRawResponse:
     def versions(self) -> AsyncVersionsResourceWithRawResponse:
         return AsyncVersionsResourceWithRawResponse(self._scripts.versions)
 
+    @cached_property
+    def secrets(self) -> AsyncSecretsResourceWithRawResponse:
+        return AsyncSecretsResourceWithRawResponse(self._scripts.secrets)
+
+    @cached_property
+    def script_and_version_settings(self) -> AsyncScriptAndVersionSettingsResourceWithRawResponse:
+        return AsyncScriptAndVersionSettingsResourceWithRawResponse(self._scripts.script_and_version_settings)
+
 
 class ScriptsResourceWithStreamingResponse:
     def __init__(self, scripts: ScriptsResource) -> None:
@@ -770,11 +925,21 @@ def __init__(self, scripts: ScriptsResource) -> None:
         self.delete = to_streamed_response_wrapper(
             scripts.delete,
         )
-        self.get = to_custom_streamed_response_wrapper(
+        self.get = to_streamed_response_wrapper(
             scripts.get,
-            StreamedBinaryAPIResponse,
+        )
+        self.search = to_streamed_response_wrapper(
+            scripts.search,
         )
 
+    @cached_property
+    def assets(self) -> AssetsResourceWithStreamingResponse:
+        return AssetsResourceWithStreamingResponse(self._scripts.assets)
+
+    @cached_property
+    def subdomain(self) -> SubdomainResourceWithStreamingResponse:
+        return SubdomainResourceWithStreamingResponse(self._scripts.subdomain)
+
     @cached_property
     def schedules(self) -> SchedulesResourceWithStreamingResponse:
         return SchedulesResourceWithStreamingResponse(self._scripts.schedules)
@@ -799,6 +964,14 @@ def deployments(self) -> DeploymentsResourceWithStreamingResponse:
     def versions(self) -> VersionsResourceWithStreamingResponse:
         return VersionsResourceWithStreamingResponse(self._scripts.versions)
 
+    @cached_property
+    def secrets(self) -> SecretsResourceWithStreamingResponse:
+        return SecretsResourceWithStreamingResponse(self._scripts.secrets)
+
+    @cached_property
+    def script_and_version_settings(self) -> ScriptAndVersionSettingsResourceWithStreamingResponse:
+        return ScriptAndVersionSettingsResourceWithStreamingResponse(self._scripts.script_and_version_settings)
+
 
 class AsyncScriptsResourceWithStreamingResponse:
     def __init__(self, scripts: AsyncScriptsResource) -> None:
@@ -813,10 +986,20 @@ def __init__(self, scripts: AsyncScriptsResource) -> None:
         self.delete = async_to_streamed_response_wrapper(
             scripts.delete,
         )
-        self.get = async_to_custom_streamed_response_wrapper(
+        self.get = async_to_streamed_response_wrapper(
             scripts.get,
-            AsyncStreamedBinaryAPIResponse,
         )
+        self.search = async_to_streamed_response_wrapper(
+            scripts.search,
+        )
+
+    @cached_property
+    def assets(self) -> AsyncAssetsResourceWithStreamingResponse:
+        return AsyncAssetsResourceWithStreamingResponse(self._scripts.assets)
+
+    @cached_property
+    def subdomain(self) -> AsyncSubdomainResourceWithStreamingResponse:
+        return AsyncSubdomainResourceWithStreamingResponse(self._scripts.subdomain)
 
     @cached_property
     def schedules(self) -> AsyncSchedulesResourceWithStreamingResponse:
@@ -841,3 +1024,11 @@ def deployments(self) -> AsyncDeploymentsResourceWithStreamingResponse:
     @cached_property
     def versions(self) -> AsyncVersionsResourceWithStreamingResponse:
         return AsyncVersionsResourceWithStreamingResponse(self._scripts.versions)
+
+    @cached_property
+    def secrets(self) -> AsyncSecretsResourceWithStreamingResponse:
+        return AsyncSecretsResourceWithStreamingResponse(self._scripts.secrets)
+
+    @cached_property
+    def script_and_version_settings(self) -> AsyncScriptAndVersionSettingsResourceWithStreamingResponse:
+        return AsyncScriptAndVersionSettingsResourceWithStreamingResponse(self._scripts.script_and_version_settings)
diff --git a/src/cloudflare/resources/workers/scripts/secrets.py b/src/cloudflare/resources/workers/scripts/secrets.py
new file mode 100644
index 00000000000..de30c08f9da
--- /dev/null
+++ b/src/cloudflare/resources/workers/scripts/secrets.py
@@ -0,0 +1,762 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Any, List, Type, Optional, cast
+from typing_extensions import Literal, overload
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import required_args, maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.workers.scripts import secret_get_params, secret_delete_params, secret_update_params
+from ....types.workers.scripts.secret_get_response import SecretGetResponse
+from ....types.workers.scripts.secret_list_response import SecretListResponse
+from ....types.workers.scripts.secret_update_response import SecretUpdateResponse
+
+__all__ = ["SecretsResource", "AsyncSecretsResource"]
+
+
+class SecretsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SecretsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SecretsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SecretsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SecretsResourceWithStreamingResponse(self)
+
+    @overload
+    def update(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        name: str,
+        text: str,
+        type: Literal["secret_text"],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SecretUpdateResponse]:
+        """
+        Add a secret to a script.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          name: A JavaScript variable name for the binding.
+
+          text: The secret value to use.
+
+          type: The kind of resource that the binding provides.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def update(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        algorithm: object,
+        format: Literal["raw", "pkcs8", "spki", "jwk"],
+        name: str,
+        type: Literal["secret_key"],
+        usages: List[
+            Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]
+        ],
+        key_base64: str | Omit = omit,
+        key_jwk: object | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SecretUpdateResponse]:
+        """
+        Add a secret to a script.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          algorithm: Algorithm-specific key parameters.
+              [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+
+          format: Data format of the key.
+              [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+
+          name: A JavaScript variable name for the binding.
+
+          type: The kind of resource that the binding provides.
+
+          usages: Allowed operations with the key.
+              [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+
+          key_base64: Base64-encoded key data. Required if `format` is "raw", "pkcs8", or "spki".
+
+          key_jwk: Key data in
+              [JSON Web Key](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#json_web_key)
+              format. Required if `format` is "jwk".
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(
+        ["account_id", "name", "text", "type"], ["account_id", "algorithm", "format", "name", "type", "usages"]
+    )
+    def update(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        name: str,
+        text: str | Omit = omit,
+        type: Literal["secret_text"] | Literal["secret_key"],
+        algorithm: object | Omit = omit,
+        format: Literal["raw", "pkcs8", "spki", "jwk"] | Omit = omit,
+        usages: List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+        | Omit = omit,
+        key_base64: str | Omit = omit,
+        key_jwk: object | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SecretUpdateResponse]:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        return cast(
+            Optional[SecretUpdateResponse],
+            self._put(
+                f"/accounts/{account_id}/workers/scripts/{script_name}/secrets",
+                body=maybe_transform(
+                    {
+                        "name": name,
+                        "text": text,
+                        "type": type,
+                        "algorithm": algorithm,
+                        "format": format,
+                        "usages": usages,
+                        "key_base64": key_base64,
+                        "key_jwk": key_jwk,
+                    },
+                    secret_update_params.SecretUpdateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[SecretUpdateResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[SecretUpdateResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    def list(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[SecretListResponse]:
+        """
+        List secrets bound to a script.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/secrets",
+            page=SyncSinglePage[SecretListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, SecretListResponse),  # Union types cannot be passed in as arguments in the type system
+        )
+
+    def delete(
+        self,
+        secret_name: str,
+        *,
+        account_id: str,
+        script_name: str,
+        url_encoded: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Remove a secret from a script.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          secret_name: A JavaScript variable name for the secret binding.
+
+          url_encoded: Flag that indicates whether the secret name is URL encoded.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        if not secret_name:
+            raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}")
+        return self._delete(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/secrets/{secret_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"url_encoded": url_encoded}, secret_delete_params.SecretDeleteParams),
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def get(
+        self,
+        secret_name: str,
+        *,
+        account_id: str,
+        script_name: str,
+        url_encoded: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SecretGetResponse]:
+        """
+        Get a given secret binding (value omitted) on a script.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          secret_name: A JavaScript variable name for the secret binding.
+
+          url_encoded: Flag that indicates whether the secret name is URL encoded.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        if not secret_name:
+            raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}")
+        return cast(
+            Optional[SecretGetResponse],
+            self._get(
+                f"/accounts/{account_id}/workers/scripts/{script_name}/secrets/{secret_name}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    query=maybe_transform({"url_encoded": url_encoded}, secret_get_params.SecretGetParams),
+                    post_parser=ResultWrapper[Optional[SecretGetResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[SecretGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+
+class AsyncSecretsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSecretsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSecretsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSecretsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSecretsResourceWithStreamingResponse(self)
+
+    @overload
+    async def update(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        name: str,
+        text: str,
+        type: Literal["secret_text"],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SecretUpdateResponse]:
+        """
+        Add a secret to a script.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          name: A JavaScript variable name for the binding.
+
+          text: The secret value to use.
+
+          type: The kind of resource that the binding provides.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def update(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        algorithm: object,
+        format: Literal["raw", "pkcs8", "spki", "jwk"],
+        name: str,
+        type: Literal["secret_key"],
+        usages: List[
+            Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]
+        ],
+        key_base64: str | Omit = omit,
+        key_jwk: object | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SecretUpdateResponse]:
+        """
+        Add a secret to a script.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          algorithm: Algorithm-specific key parameters.
+              [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+
+          format: Data format of the key.
+              [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+
+          name: A JavaScript variable name for the binding.
+
+          type: The kind of resource that the binding provides.
+
+          usages: Allowed operations with the key.
+              [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+
+          key_base64: Base64-encoded key data. Required if `format` is "raw", "pkcs8", or "spki".
+
+          key_jwk: Key data in
+              [JSON Web Key](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#json_web_key)
+              format. Required if `format` is "jwk".
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(
+        ["account_id", "name", "text", "type"], ["account_id", "algorithm", "format", "name", "type", "usages"]
+    )
+    async def update(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        name: str,
+        text: str | Omit = omit,
+        type: Literal["secret_text"] | Literal["secret_key"],
+        algorithm: object | Omit = omit,
+        format: Literal["raw", "pkcs8", "spki", "jwk"] | Omit = omit,
+        usages: List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+        | Omit = omit,
+        key_base64: str | Omit = omit,
+        key_jwk: object | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SecretUpdateResponse]:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        return cast(
+            Optional[SecretUpdateResponse],
+            await self._put(
+                f"/accounts/{account_id}/workers/scripts/{script_name}/secrets",
+                body=await async_maybe_transform(
+                    {
+                        "name": name,
+                        "text": text,
+                        "type": type,
+                        "algorithm": algorithm,
+                        "format": format,
+                        "usages": usages,
+                        "key_base64": key_base64,
+                        "key_jwk": key_jwk,
+                    },
+                    secret_update_params.SecretUpdateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[SecretUpdateResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[SecretUpdateResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    def list(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SecretListResponse, AsyncSinglePage[SecretListResponse]]:
+        """
+        List secrets bound to a script.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/secrets",
+            page=AsyncSinglePage[SecretListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, SecretListResponse),  # Union types cannot be passed in as arguments in the type system
+        )
+
+    async def delete(
+        self,
+        secret_name: str,
+        *,
+        account_id: str,
+        script_name: str,
+        url_encoded: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Remove a secret from a script.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          secret_name: A JavaScript variable name for the secret binding.
+
+          url_encoded: Flag that indicates whether the secret name is URL encoded.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        if not secret_name:
+            raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/secrets/{secret_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"url_encoded": url_encoded}, secret_delete_params.SecretDeleteParams
+                ),
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def get(
+        self,
+        secret_name: str,
+        *,
+        account_id: str,
+        script_name: str,
+        url_encoded: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SecretGetResponse]:
+        """
+        Get a given secret binding (value omitted) on a script.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          secret_name: A JavaScript variable name for the secret binding.
+
+          url_encoded: Flag that indicates whether the secret name is URL encoded.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        if not secret_name:
+            raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}")
+        return cast(
+            Optional[SecretGetResponse],
+            await self._get(
+                f"/accounts/{account_id}/workers/scripts/{script_name}/secrets/{secret_name}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    query=await async_maybe_transform({"url_encoded": url_encoded}, secret_get_params.SecretGetParams),
+                    post_parser=ResultWrapper[Optional[SecretGetResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[SecretGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+
+class SecretsResourceWithRawResponse:
+    def __init__(self, secrets: SecretsResource) -> None:
+        self._secrets = secrets
+
+        self.update = to_raw_response_wrapper(
+            secrets.update,
+        )
+        self.list = to_raw_response_wrapper(
+            secrets.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            secrets.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            secrets.get,
+        )
+
+
+class AsyncSecretsResourceWithRawResponse:
+    def __init__(self, secrets: AsyncSecretsResource) -> None:
+        self._secrets = secrets
+
+        self.update = async_to_raw_response_wrapper(
+            secrets.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            secrets.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            secrets.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            secrets.get,
+        )
+
+
+class SecretsResourceWithStreamingResponse:
+    def __init__(self, secrets: SecretsResource) -> None:
+        self._secrets = secrets
+
+        self.update = to_streamed_response_wrapper(
+            secrets.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            secrets.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            secrets.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            secrets.get,
+        )
+
+
+class AsyncSecretsResourceWithStreamingResponse:
+    def __init__(self, secrets: AsyncSecretsResource) -> None:
+        self._secrets = secrets
+
+        self.update = async_to_streamed_response_wrapper(
+            secrets.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            secrets.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            secrets.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            secrets.get,
+        )
diff --git a/src/cloudflare/resources/workers/scripts/settings.py b/src/cloudflare/resources/workers/scripts/settings.py
index 94c27d833b8..01e5d5600d8 100644
--- a/src/cloudflare/resources/workers/scripts/settings.py
+++ b/src/cloudflare/resources/workers/scripts/settings.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -31,10 +28,21 @@
 class SettingsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SettingsResourceWithStreamingResponse(self)
 
     def edit(
@@ -42,27 +50,33 @@ def edit(
         script_name: str,
         *,
         account_id: str,
-        logpush: bool | NotGiven = NOT_GIVEN,
-        tail_consumers: Iterable[ConsumerScriptParam] | NotGiven = NOT_GIVEN,
+        logpush: bool | Omit = omit,
+        observability: Optional[setting_edit_params.Observability] | Omit = omit,
+        tags: Optional[SequenceNotStr[str]] | Omit = omit,
+        tail_consumers: Optional[Iterable[ConsumerScriptParam]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ScriptSetting]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScriptSetting:
         """
         Patch script-level settings when using
         [Worker Versions](https://developers.cloudflare.com/api/operations/worker-versions-list-versions).
-        Includes Logpush and Tail Consumers.
+        Including but not limited to Logpush and Tail Consumers.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
           logpush: Whether Logpush is turned on for the Worker.
 
+          observability: Observability settings for the Worker.
+
+          tags: Tags associated with the Worker.
+
           tail_consumers: List of Workers that will consume logs from the attached Worker.
 
           extra_headers: Send extra headers
@@ -82,6 +96,8 @@ def edit(
             body=maybe_transform(
                 {
                     "logpush": logpush,
+                    "observability": observability,
+                    "tags": tags,
                     "tail_consumers": tail_consumers,
                 },
                 setting_edit_params.SettingEditParams,
@@ -91,9 +107,9 @@ def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ScriptSetting]]._unwrapper,
+                post_parser=ResultWrapper[ScriptSetting]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ScriptSetting]], ResultWrapper[ScriptSetting]),
+            cast_to=cast(Type[ScriptSetting], ResultWrapper[ScriptSetting]),
         )
 
     def get(
@@ -106,15 +122,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ScriptSetting]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScriptSetting:
         """
         Get script-level settings when using
         [Worker Versions](https://developers.cloudflare.com/api/operations/worker-versions-list-versions).
         Includes Logpush and Tail Consumers.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
@@ -137,19 +153,30 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ScriptSetting]]._unwrapper,
+                post_parser=ResultWrapper[ScriptSetting]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ScriptSetting]], ResultWrapper[ScriptSetting]),
+            cast_to=cast(Type[ScriptSetting], ResultWrapper[ScriptSetting]),
         )
 
 
 class AsyncSettingsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSettingsResourceWithStreamingResponse(self)
 
     async def edit(
@@ -157,27 +184,33 @@ async def edit(
         script_name: str,
         *,
         account_id: str,
-        logpush: bool | NotGiven = NOT_GIVEN,
-        tail_consumers: Iterable[ConsumerScriptParam] | NotGiven = NOT_GIVEN,
+        logpush: bool | Omit = omit,
+        observability: Optional[setting_edit_params.Observability] | Omit = omit,
+        tags: Optional[SequenceNotStr[str]] | Omit = omit,
+        tail_consumers: Optional[Iterable[ConsumerScriptParam]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ScriptSetting]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScriptSetting:
         """
         Patch script-level settings when using
         [Worker Versions](https://developers.cloudflare.com/api/operations/worker-versions-list-versions).
-        Includes Logpush and Tail Consumers.
+        Including but not limited to Logpush and Tail Consumers.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
           logpush: Whether Logpush is turned on for the Worker.
 
+          observability: Observability settings for the Worker.
+
+          tags: Tags associated with the Worker.
+
           tail_consumers: List of Workers that will consume logs from the attached Worker.
 
           extra_headers: Send extra headers
@@ -197,6 +230,8 @@ async def edit(
             body=await async_maybe_transform(
                 {
                     "logpush": logpush,
+                    "observability": observability,
+                    "tags": tags,
                     "tail_consumers": tail_consumers,
                 },
                 setting_edit_params.SettingEditParams,
@@ -206,9 +241,9 @@ async def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ScriptSetting]]._unwrapper,
+                post_parser=ResultWrapper[ScriptSetting]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ScriptSetting]], ResultWrapper[ScriptSetting]),
+            cast_to=cast(Type[ScriptSetting], ResultWrapper[ScriptSetting]),
         )
 
     async def get(
@@ -221,15 +256,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ScriptSetting]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScriptSetting:
         """
         Get script-level settings when using
         [Worker Versions](https://developers.cloudflare.com/api/operations/worker-versions-list-versions).
         Includes Logpush and Tail Consumers.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
@@ -252,9 +287,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ScriptSetting]]._unwrapper,
+                post_parser=ResultWrapper[ScriptSetting]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ScriptSetting]], ResultWrapper[ScriptSetting]),
+            cast_to=cast(Type[ScriptSetting], ResultWrapper[ScriptSetting]),
         )
 
 
diff --git a/src/cloudflare/resources/workers/scripts/subdomain.py b/src/cloudflare/resources/workers/scripts/subdomain.py
new file mode 100644
index 00000000000..ee6e690dabd
--- /dev/null
+++ b/src/cloudflare/resources/workers/scripts/subdomain.py
@@ -0,0 +1,420 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.workers.scripts import subdomain_create_params
+from ....types.workers.scripts.subdomain_get_response import SubdomainGetResponse
+from ....types.workers.scripts.subdomain_create_response import SubdomainCreateResponse
+from ....types.workers.scripts.subdomain_delete_response import SubdomainDeleteResponse
+
+__all__ = ["SubdomainResource", "AsyncSubdomainResource"]
+
+
+class SubdomainResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SubdomainResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SubdomainResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SubdomainResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SubdomainResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        enabled: bool,
+        previews_enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SubdomainCreateResponse:
+        """
+        Enable or disable the Worker on the workers.dev subdomain.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          enabled: Whether the Worker should be available on the workers.dev subdomain.
+
+          previews_enabled: Whether the Worker's Preview URLs should be available on the workers.dev
+              subdomain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        return self._post(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/subdomain",
+            body=maybe_transform(
+                {
+                    "enabled": enabled,
+                    "previews_enabled": previews_enabled,
+                },
+                subdomain_create_params.SubdomainCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SubdomainCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SubdomainCreateResponse], ResultWrapper[SubdomainCreateResponse]),
+        )
+
+    def delete(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SubdomainDeleteResponse:
+        """
+        Disable all workers.dev subdomains for a Worker.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        return self._delete(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/subdomain",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SubdomainDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SubdomainDeleteResponse], ResultWrapper[SubdomainDeleteResponse]),
+        )
+
+    def get(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SubdomainGetResponse:
+        """
+        Get if the Worker is available on the workers.dev subdomain.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        return self._get(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/subdomain",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SubdomainGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SubdomainGetResponse], ResultWrapper[SubdomainGetResponse]),
+        )
+
+
+class AsyncSubdomainResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSubdomainResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSubdomainResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSubdomainResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSubdomainResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        enabled: bool,
+        previews_enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SubdomainCreateResponse:
+        """
+        Enable or disable the Worker on the workers.dev subdomain.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          enabled: Whether the Worker should be available on the workers.dev subdomain.
+
+          previews_enabled: Whether the Worker's Preview URLs should be available on the workers.dev
+              subdomain.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        return await self._post(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/subdomain",
+            body=await async_maybe_transform(
+                {
+                    "enabled": enabled,
+                    "previews_enabled": previews_enabled,
+                },
+                subdomain_create_params.SubdomainCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SubdomainCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SubdomainCreateResponse], ResultWrapper[SubdomainCreateResponse]),
+        )
+
+    async def delete(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SubdomainDeleteResponse:
+        """
+        Disable all workers.dev subdomains for a Worker.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/subdomain",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SubdomainDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SubdomainDeleteResponse], ResultWrapper[SubdomainDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SubdomainGetResponse:
+        """
+        Get if the Worker is available on the workers.dev subdomain.
+
+        Args:
+          account_id: Identifier.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        return await self._get(
+            f"/accounts/{account_id}/workers/scripts/{script_name}/subdomain",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SubdomainGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SubdomainGetResponse], ResultWrapper[SubdomainGetResponse]),
+        )
+
+
+class SubdomainResourceWithRawResponse:
+    def __init__(self, subdomain: SubdomainResource) -> None:
+        self._subdomain = subdomain
+
+        self.create = to_raw_response_wrapper(
+            subdomain.create,
+        )
+        self.delete = to_raw_response_wrapper(
+            subdomain.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            subdomain.get,
+        )
+
+
+class AsyncSubdomainResourceWithRawResponse:
+    def __init__(self, subdomain: AsyncSubdomainResource) -> None:
+        self._subdomain = subdomain
+
+        self.create = async_to_raw_response_wrapper(
+            subdomain.create,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            subdomain.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            subdomain.get,
+        )
+
+
+class SubdomainResourceWithStreamingResponse:
+    def __init__(self, subdomain: SubdomainResource) -> None:
+        self._subdomain = subdomain
+
+        self.create = to_streamed_response_wrapper(
+            subdomain.create,
+        )
+        self.delete = to_streamed_response_wrapper(
+            subdomain.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            subdomain.get,
+        )
+
+
+class AsyncSubdomainResourceWithStreamingResponse:
+    def __init__(self, subdomain: AsyncSubdomainResource) -> None:
+        self._subdomain = subdomain
+
+        self.create = async_to_streamed_response_wrapper(
+            subdomain.create,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            subdomain.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            subdomain.get,
+        )
diff --git a/src/cloudflare/resources/workers/scripts/tail.py b/src/cloudflare/resources/workers/scripts/tail.py
index 54e69baa851..50f03689386 100644
--- a/src/cloudflare/resources/workers/scripts/tail.py
+++ b/src/cloudflare/resources/workers/scripts/tail.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Type, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -32,10 +29,21 @@
 class TailResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TailResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TailResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TailResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TailResourceWithStreamingResponse(self)
 
     def create(
@@ -49,13 +57,13 @@ def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TailCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TailCreateResponse:
         """
         Starts a tail that receives logs and exception from a Worker.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
@@ -79,9 +87,9 @@ def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[TailCreateResponse]]._unwrapper,
+                post_parser=ResultWrapper[TailCreateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[TailCreateResponse]], ResultWrapper[TailCreateResponse]),
+            cast_to=cast(Type[TailCreateResponse], ResultWrapper[TailCreateResponse]),
         )
 
     def delete(
@@ -95,17 +103,17 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TailDeleteResponse:
         """
         Deletes a tail from a Worker.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
-          id: Identifier for the tail.
+          id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -139,13 +147,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TailGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TailGetResponse:
         """
         Get list of tails currently deployed on a Worker.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
@@ -168,19 +176,30 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[TailGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[TailGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[TailGetResponse]], ResultWrapper[TailGetResponse]),
+            cast_to=cast(Type[TailGetResponse], ResultWrapper[TailGetResponse]),
         )
 
 
 class AsyncTailResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTailResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTailResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTailResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTailResourceWithStreamingResponse(self)
 
     async def create(
@@ -194,13 +213,13 @@ async def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TailCreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TailCreateResponse:
         """
         Starts a tail that receives logs and exception from a Worker.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
@@ -224,9 +243,9 @@ async def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[TailCreateResponse]]._unwrapper,
+                post_parser=ResultWrapper[TailCreateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[TailCreateResponse]], ResultWrapper[TailCreateResponse]),
+            cast_to=cast(Type[TailCreateResponse], ResultWrapper[TailCreateResponse]),
         )
 
     async def delete(
@@ -240,17 +259,17 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> TailDeleteResponse:
         """
         Deletes a tail from a Worker.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
-          id: Identifier for the tail.
+          id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -284,13 +303,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TailGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> TailGetResponse:
         """
         Get list of tails currently deployed on a Worker.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script, used in URLs and route configuration.
 
@@ -313,9 +332,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[TailGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[TailGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[TailGetResponse]], ResultWrapper[TailGetResponse]),
+            cast_to=cast(Type[TailGetResponse], ResultWrapper[TailGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/workers/scripts/versions.py b/src/cloudflare/resources/workers/scripts/versions.py
index 1009f860beb..503c9871299 100644
--- a/src/cloudflare/resources/workers/scripts/versions.py
+++ b/src/cloudflare/resources/workers/scripts/versions.py
@@ -2,17 +2,22 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Mapping, Optional, cast
+from typing import Type, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven, FileTypes
-from ...._utils import (
-    extract_files,
-    maybe_transform,
-    deepcopy_minimal,
-    async_maybe_transform,
+from ...._types import (
+    Body,
+    Omit,
+    Query,
+    Headers,
+    NotGiven,
+    FileTypes,
+    SequenceNotStr,
+    omit,
+    not_given,
 )
+from ...._utils import is_given, maybe_transform, deepcopy_minimal, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -35,10 +40,21 @@
 class VersionsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> VersionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return VersionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> VersionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return VersionsResourceWithStreamingResponse(self)
 
     def create(
@@ -46,28 +62,35 @@ def create(
         script_name: str,
         *,
         account_id: str,
-        any_part_name: List[FileTypes] | NotGiven = NOT_GIVEN,
-        metadata: version_create_params.Metadata | NotGiven = NOT_GIVEN,
+        metadata: version_create_params.Metadata,
+        files: SequenceNotStr[FileTypes] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[VersionCreateResponse]:
-        """
-        Upload a Worker Version without deploying to Cloudflare's network.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> VersionCreateResponse:
+        """Upload a Worker Version without deploying to Cloudflare's network.
+
+        You can find
+        more about the multipart metadata on our docs:
+        https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script.
 
-          any_part_name: A module comprising a Worker script, often a javascript file. Multiple modules
-              may be provided as separate named parts, but at least one module must be present
-              and referenced in the metadata as `main_module`.
+          metadata: JSON-encoded metadata about the uploaded parts and Worker configuration.
 
-          metadata: JSON encoded metadata about the uploaded parts and Worker configuration.
+          files: An array of modules (often JavaScript files) comprising a Worker script. At
+              least one module must be present and referenced in the metadata as `main_module`
+              or `body_part` by filename.<br/>Possible Content-Type(s) are:
+              `application/javascript+module`, `text/javascript+module`,
+              `application/javascript`, `text/javascript`, `text/x-python`,
+              `text/x-python-requirement`, `application/wasm`, `text/plain`,
+              `application/octet-stream`, `application/source-map`.
 
           extra_headers: Send extra headers
 
@@ -83,11 +106,11 @@ def create(
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
         body = deepcopy_minimal(
             {
-                "any_part_name": any_part_name,
                 "metadata": metadata,
             }
         )
-        files = extract_files(cast(Mapping[str, object], body), paths=[["<any part name>", "<array>"]])
+        extracted_files = [("files", file) for file in files] if is_given(files) else []
+
         # It should be noted that the actual Content-Type header that will be
         # sent to the server will contain a `boundary` parameter, e.g.
         # multipart/form-data; boundary=---abc--
@@ -95,15 +118,16 @@ def create(
         return self._post(
             f"/accounts/{account_id}/workers/scripts/{script_name}/versions",
             body=maybe_transform(body, version_create_params.VersionCreateParams),
-            files=files,
+            files=extracted_files,
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[VersionCreateResponse]]._unwrapper,
+                multipart_syntax="json",
+                post_parser=ResultWrapper[VersionCreateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[VersionCreateResponse]], ResultWrapper[VersionCreateResponse]),
+            cast_to=cast(Type[VersionCreateResponse], ResultWrapper[VersionCreateResponse]),
         )
 
     def list(
@@ -111,22 +135,22 @@ def list(
         script_name: str,
         *,
         account_id: str,
-        deployable: bool | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
+        deployable: bool | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePagination[VersionListResponse]:
         """List of Worker Versions.
 
         The first version in the list is the latest version.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script.
 
@@ -179,13 +203,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[VersionGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> VersionGetResponse:
         """
         Get Version Detail
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script.
 
@@ -210,19 +234,30 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[VersionGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[VersionGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[VersionGetResponse]], ResultWrapper[VersionGetResponse]),
+            cast_to=cast(Type[VersionGetResponse], ResultWrapper[VersionGetResponse]),
         )
 
 
 class AsyncVersionsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncVersionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncVersionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncVersionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncVersionsResourceWithStreamingResponse(self)
 
     async def create(
@@ -230,28 +265,35 @@ async def create(
         script_name: str,
         *,
         account_id: str,
-        any_part_name: List[FileTypes] | NotGiven = NOT_GIVEN,
-        metadata: version_create_params.Metadata | NotGiven = NOT_GIVEN,
+        metadata: version_create_params.Metadata,
+        files: SequenceNotStr[FileTypes] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[VersionCreateResponse]:
-        """
-        Upload a Worker Version without deploying to Cloudflare's network.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> VersionCreateResponse:
+        """Upload a Worker Version without deploying to Cloudflare's network.
+
+        You can find
+        more about the multipart metadata on our docs:
+        https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script.
 
-          any_part_name: A module comprising a Worker script, often a javascript file. Multiple modules
-              may be provided as separate named parts, but at least one module must be present
-              and referenced in the metadata as `main_module`.
+          metadata: JSON-encoded metadata about the uploaded parts and Worker configuration.
 
-          metadata: JSON encoded metadata about the uploaded parts and Worker configuration.
+          files: An array of modules (often JavaScript files) comprising a Worker script. At
+              least one module must be present and referenced in the metadata as `main_module`
+              or `body_part` by filename.<br/>Possible Content-Type(s) are:
+              `application/javascript+module`, `text/javascript+module`,
+              `application/javascript`, `text/javascript`, `text/x-python`,
+              `text/x-python-requirement`, `application/wasm`, `text/plain`,
+              `application/octet-stream`, `application/source-map`.
 
           extra_headers: Send extra headers
 
@@ -267,11 +309,10 @@ async def create(
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
         body = deepcopy_minimal(
             {
-                "any_part_name": any_part_name,
                 "metadata": metadata,
             }
         )
-        files = extract_files(cast(Mapping[str, object], body), paths=[["<any part name>", "<array>"]])
+        extracted_files = [("files", file) for file in files] if is_given(files) else []
         # It should be noted that the actual Content-Type header that will be
         # sent to the server will contain a `boundary` parameter, e.g.
         # multipart/form-data; boundary=---abc--
@@ -279,15 +320,16 @@ async def create(
         return await self._post(
             f"/accounts/{account_id}/workers/scripts/{script_name}/versions",
             body=await async_maybe_transform(body, version_create_params.VersionCreateParams),
-            files=files,
+            files=extracted_files,
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[VersionCreateResponse]]._unwrapper,
+                multipart_syntax="json",
+                post_parser=ResultWrapper[VersionCreateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[VersionCreateResponse]], ResultWrapper[VersionCreateResponse]),
+            cast_to=cast(Type[VersionCreateResponse], ResultWrapper[VersionCreateResponse]),
         )
 
     def list(
@@ -295,22 +337,22 @@ def list(
         script_name: str,
         *,
         account_id: str,
-        deployable: bool | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
+        deployable: bool | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[VersionListResponse, AsyncV4PagePagination[VersionListResponse]]:
         """List of Worker Versions.
 
         The first version in the list is the latest version.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script.
 
@@ -363,13 +405,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[VersionGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> VersionGetResponse:
         """
         Get Version Detail
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           script_name: Name of the script.
 
@@ -394,9 +436,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[VersionGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[VersionGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[VersionGetResponse]], ResultWrapper[VersionGetResponse]),
+            cast_to=cast(Type[VersionGetResponse], ResultWrapper[VersionGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/workers/subdomains.py b/src/cloudflare/resources/workers/subdomains.py
index 8f12044d729..9e20a222431 100644
--- a/src/cloudflare/resources/workers/subdomains.py
+++ b/src/cloudflare/resources/workers/subdomains.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Type, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NoneType, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -31,29 +28,40 @@
 class SubdomainsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SubdomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SubdomainsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SubdomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SubdomainsResourceWithStreamingResponse(self)
 
     def update(
         self,
         *,
         account_id: str,
-        body: str,
+        subdomain: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SubdomainUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SubdomainUpdateResponse:
         """
         Creates a Workers subdomain for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -67,15 +75,51 @@ def update(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._put(
             f"/accounts/{account_id}/workers/subdomain",
-            body=maybe_transform(body, subdomain_update_params.SubdomainUpdateParams),
+            body=maybe_transform({"subdomain": subdomain}, subdomain_update_params.SubdomainUpdateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[SubdomainUpdateResponse]]._unwrapper,
+                post_parser=ResultWrapper[SubdomainUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SubdomainUpdateResponse], ResultWrapper[SubdomainUpdateResponse]),
+        )
+
+    def delete(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Deletes a Workers subdomain for an account.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._delete(
+            f"/accounts/{account_id}/workers/subdomain",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[SubdomainUpdateResponse]], ResultWrapper[SubdomainUpdateResponse]),
+            cast_to=NoneType,
         )
 
     def get(
@@ -87,13 +131,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SubdomainGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SubdomainGetResponse:
         """
         Returns a Workers subdomain for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -112,38 +156,49 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[SubdomainGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[SubdomainGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[SubdomainGetResponse]], ResultWrapper[SubdomainGetResponse]),
+            cast_to=cast(Type[SubdomainGetResponse], ResultWrapper[SubdomainGetResponse]),
         )
 
 
 class AsyncSubdomainsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSubdomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSubdomainsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSubdomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSubdomainsResourceWithStreamingResponse(self)
 
     async def update(
         self,
         *,
         account_id: str,
-        body: str,
+        subdomain: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SubdomainUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SubdomainUpdateResponse:
         """
         Creates a Workers subdomain for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -157,15 +212,51 @@ async def update(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._put(
             f"/accounts/{account_id}/workers/subdomain",
-            body=await async_maybe_transform(body, subdomain_update_params.SubdomainUpdateParams),
+            body=await async_maybe_transform({"subdomain": subdomain}, subdomain_update_params.SubdomainUpdateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[SubdomainUpdateResponse]]._unwrapper,
+                post_parser=ResultWrapper[SubdomainUpdateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[SubdomainUpdateResponse]], ResultWrapper[SubdomainUpdateResponse]),
+            cast_to=cast(Type[SubdomainUpdateResponse], ResultWrapper[SubdomainUpdateResponse]),
+        )
+
+    async def delete(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Deletes a Workers subdomain for an account.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._delete(
+            f"/accounts/{account_id}/workers/subdomain",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
         )
 
     async def get(
@@ -177,13 +268,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SubdomainGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SubdomainGetResponse:
         """
         Returns a Workers subdomain for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -202,9 +293,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[SubdomainGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[SubdomainGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[SubdomainGetResponse]], ResultWrapper[SubdomainGetResponse]),
+            cast_to=cast(Type[SubdomainGetResponse], ResultWrapper[SubdomainGetResponse]),
         )
 
 
@@ -215,6 +306,9 @@ def __init__(self, subdomains: SubdomainsResource) -> None:
         self.update = to_raw_response_wrapper(
             subdomains.update,
         )
+        self.delete = to_raw_response_wrapper(
+            subdomains.delete,
+        )
         self.get = to_raw_response_wrapper(
             subdomains.get,
         )
@@ -227,6 +321,9 @@ def __init__(self, subdomains: AsyncSubdomainsResource) -> None:
         self.update = async_to_raw_response_wrapper(
             subdomains.update,
         )
+        self.delete = async_to_raw_response_wrapper(
+            subdomains.delete,
+        )
         self.get = async_to_raw_response_wrapper(
             subdomains.get,
         )
@@ -239,6 +336,9 @@ def __init__(self, subdomains: SubdomainsResource) -> None:
         self.update = to_streamed_response_wrapper(
             subdomains.update,
         )
+        self.delete = to_streamed_response_wrapper(
+            subdomains.delete,
+        )
         self.get = to_streamed_response_wrapper(
             subdomains.get,
         )
@@ -251,6 +351,9 @@ def __init__(self, subdomains: AsyncSubdomainsResource) -> None:
         self.update = async_to_streamed_response_wrapper(
             subdomains.update,
         )
+        self.delete = async_to_streamed_response_wrapper(
+            subdomains.delete,
+        )
         self.get = async_to_streamed_response_wrapper(
             subdomains.get,
         )
diff --git a/src/cloudflare/resources/workers/workers.py b/src/cloudflare/resources/workers/workers.py
index 55326950c01..971c066d436 100644
--- a/src/cloudflare/resources/workers/workers.py
+++ b/src/cloudflare/resources/workers/workers.py
@@ -2,15 +2,14 @@
 
 from __future__ import annotations
 
-from .ai import (
-    AIResource,
-    AsyncAIResource,
-    AIResourceWithRawResponse,
-    AsyncAIResourceWithRawResponse,
-    AIResourceWithStreamingResponse,
-    AsyncAIResourceWithStreamingResponse,
+from .routes import (
+    RoutesResource,
+    AsyncRoutesResource,
+    RoutesResourceWithRawResponse,
+    AsyncRoutesResourceWithRawResponse,
+    RoutesResourceWithStreamingResponse,
+    AsyncRoutesResourceWithStreamingResponse,
 )
-from .ai.ai import AIResource, AsyncAIResource
 from .domains import (
     DomainsResource,
     AsyncDomainsResource,
@@ -19,15 +18,15 @@
     DomainsResourceWithStreamingResponse,
     AsyncDomainsResourceWithStreamingResponse,
 )
-from .scripts import (
-    ScriptsResource,
-    AsyncScriptsResource,
-    ScriptsResourceWithRawResponse,
-    AsyncScriptsResourceWithRawResponse,
-    ScriptsResourceWithStreamingResponse,
-    AsyncScriptsResourceWithStreamingResponse,
-)
 from ..._compat import cached_property
+from .beta.beta import (
+    BetaResource,
+    AsyncBetaResource,
+    BetaResourceWithRawResponse,
+    AsyncBetaResourceWithRawResponse,
+    BetaResourceWithStreamingResponse,
+    AsyncBetaResourceWithStreamingResponse,
+)
 from .subdomains import (
     SubdomainsResource,
     AsyncSubdomainsResource,
@@ -37,7 +36,22 @@
     AsyncSubdomainsResourceWithStreamingResponse,
 )
 from ..._resource import SyncAPIResource, AsyncAPIResource
-from .scripts.scripts import ScriptsResource, AsyncScriptsResource
+from .assets.assets import (
+    AssetsResource,
+    AsyncAssetsResource,
+    AssetsResourceWithRawResponse,
+    AsyncAssetsResourceWithRawResponse,
+    AssetsResourceWithStreamingResponse,
+    AsyncAssetsResourceWithStreamingResponse,
+)
+from .scripts.scripts import (
+    ScriptsResource,
+    AsyncScriptsResource,
+    ScriptsResourceWithRawResponse,
+    AsyncScriptsResourceWithRawResponse,
+    ScriptsResourceWithStreamingResponse,
+    AsyncScriptsResourceWithStreamingResponse,
+)
 from .account_settings import (
     AccountSettingsResource,
     AsyncAccountSettingsResource,
@@ -46,14 +60,30 @@
     AccountSettingsResourceWithStreamingResponse,
     AsyncAccountSettingsResourceWithStreamingResponse,
 )
+from .observability.observability import (
+    ObservabilityResource,
+    AsyncObservabilityResource,
+    ObservabilityResourceWithRawResponse,
+    AsyncObservabilityResourceWithRawResponse,
+    ObservabilityResourceWithStreamingResponse,
+    AsyncObservabilityResourceWithStreamingResponse,
+)
 
 __all__ = ["WorkersResource", "AsyncWorkersResource"]
 
 
 class WorkersResource(SyncAPIResource):
     @cached_property
-    def ai(self) -> AIResource:
-        return AIResource(self._client)
+    def beta(self) -> BetaResource:
+        return BetaResource(self._client)
+
+    @cached_property
+    def routes(self) -> RoutesResource:
+        return RoutesResource(self._client)
+
+    @cached_property
+    def assets(self) -> AssetsResource:
+        return AssetsResource(self._client)
 
     @cached_property
     def scripts(self) -> ScriptsResource:
@@ -71,19 +101,42 @@ def domains(self) -> DomainsResource:
     def subdomains(self) -> SubdomainsResource:
         return SubdomainsResource(self._client)
 
+    @cached_property
+    def observability(self) -> ObservabilityResource:
+        return ObservabilityResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> WorkersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return WorkersResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> WorkersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return WorkersResourceWithStreamingResponse(self)
 
 
 class AsyncWorkersResource(AsyncAPIResource):
     @cached_property
-    def ai(self) -> AsyncAIResource:
-        return AsyncAIResource(self._client)
+    def beta(self) -> AsyncBetaResource:
+        return AsyncBetaResource(self._client)
+
+    @cached_property
+    def routes(self) -> AsyncRoutesResource:
+        return AsyncRoutesResource(self._client)
+
+    @cached_property
+    def assets(self) -> AsyncAssetsResource:
+        return AsyncAssetsResource(self._client)
 
     @cached_property
     def scripts(self) -> AsyncScriptsResource:
@@ -101,12 +154,27 @@ def domains(self) -> AsyncDomainsResource:
     def subdomains(self) -> AsyncSubdomainsResource:
         return AsyncSubdomainsResource(self._client)
 
+    @cached_property
+    def observability(self) -> AsyncObservabilityResource:
+        return AsyncObservabilityResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncWorkersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncWorkersResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncWorkersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncWorkersResourceWithStreamingResponse(self)
 
 
@@ -115,8 +183,16 @@ def __init__(self, workers: WorkersResource) -> None:
         self._workers = workers
 
     @cached_property
-    def ai(self) -> AIResourceWithRawResponse:
-        return AIResourceWithRawResponse(self._workers.ai)
+    def beta(self) -> BetaResourceWithRawResponse:
+        return BetaResourceWithRawResponse(self._workers.beta)
+
+    @cached_property
+    def routes(self) -> RoutesResourceWithRawResponse:
+        return RoutesResourceWithRawResponse(self._workers.routes)
+
+    @cached_property
+    def assets(self) -> AssetsResourceWithRawResponse:
+        return AssetsResourceWithRawResponse(self._workers.assets)
 
     @cached_property
     def scripts(self) -> ScriptsResourceWithRawResponse:
@@ -134,14 +210,26 @@ def domains(self) -> DomainsResourceWithRawResponse:
     def subdomains(self) -> SubdomainsResourceWithRawResponse:
         return SubdomainsResourceWithRawResponse(self._workers.subdomains)
 
+    @cached_property
+    def observability(self) -> ObservabilityResourceWithRawResponse:
+        return ObservabilityResourceWithRawResponse(self._workers.observability)
+
 
 class AsyncWorkersResourceWithRawResponse:
     def __init__(self, workers: AsyncWorkersResource) -> None:
         self._workers = workers
 
     @cached_property
-    def ai(self) -> AsyncAIResourceWithRawResponse:
-        return AsyncAIResourceWithRawResponse(self._workers.ai)
+    def beta(self) -> AsyncBetaResourceWithRawResponse:
+        return AsyncBetaResourceWithRawResponse(self._workers.beta)
+
+    @cached_property
+    def routes(self) -> AsyncRoutesResourceWithRawResponse:
+        return AsyncRoutesResourceWithRawResponse(self._workers.routes)
+
+    @cached_property
+    def assets(self) -> AsyncAssetsResourceWithRawResponse:
+        return AsyncAssetsResourceWithRawResponse(self._workers.assets)
 
     @cached_property
     def scripts(self) -> AsyncScriptsResourceWithRawResponse:
@@ -159,14 +247,26 @@ def domains(self) -> AsyncDomainsResourceWithRawResponse:
     def subdomains(self) -> AsyncSubdomainsResourceWithRawResponse:
         return AsyncSubdomainsResourceWithRawResponse(self._workers.subdomains)
 
+    @cached_property
+    def observability(self) -> AsyncObservabilityResourceWithRawResponse:
+        return AsyncObservabilityResourceWithRawResponse(self._workers.observability)
+
 
 class WorkersResourceWithStreamingResponse:
     def __init__(self, workers: WorkersResource) -> None:
         self._workers = workers
 
     @cached_property
-    def ai(self) -> AIResourceWithStreamingResponse:
-        return AIResourceWithStreamingResponse(self._workers.ai)
+    def beta(self) -> BetaResourceWithStreamingResponse:
+        return BetaResourceWithStreamingResponse(self._workers.beta)
+
+    @cached_property
+    def routes(self) -> RoutesResourceWithStreamingResponse:
+        return RoutesResourceWithStreamingResponse(self._workers.routes)
+
+    @cached_property
+    def assets(self) -> AssetsResourceWithStreamingResponse:
+        return AssetsResourceWithStreamingResponse(self._workers.assets)
 
     @cached_property
     def scripts(self) -> ScriptsResourceWithStreamingResponse:
@@ -184,14 +284,26 @@ def domains(self) -> DomainsResourceWithStreamingResponse:
     def subdomains(self) -> SubdomainsResourceWithStreamingResponse:
         return SubdomainsResourceWithStreamingResponse(self._workers.subdomains)
 
+    @cached_property
+    def observability(self) -> ObservabilityResourceWithStreamingResponse:
+        return ObservabilityResourceWithStreamingResponse(self._workers.observability)
+
 
 class AsyncWorkersResourceWithStreamingResponse:
     def __init__(self, workers: AsyncWorkersResource) -> None:
         self._workers = workers
 
     @cached_property
-    def ai(self) -> AsyncAIResourceWithStreamingResponse:
-        return AsyncAIResourceWithStreamingResponse(self._workers.ai)
+    def beta(self) -> AsyncBetaResourceWithStreamingResponse:
+        return AsyncBetaResourceWithStreamingResponse(self._workers.beta)
+
+    @cached_property
+    def routes(self) -> AsyncRoutesResourceWithStreamingResponse:
+        return AsyncRoutesResourceWithStreamingResponse(self._workers.routes)
+
+    @cached_property
+    def assets(self) -> AsyncAssetsResourceWithStreamingResponse:
+        return AsyncAssetsResourceWithStreamingResponse(self._workers.assets)
 
     @cached_property
     def scripts(self) -> AsyncScriptsResourceWithStreamingResponse:
@@ -208,3 +320,7 @@ def domains(self) -> AsyncDomainsResourceWithStreamingResponse:
     @cached_property
     def subdomains(self) -> AsyncSubdomainsResourceWithStreamingResponse:
         return AsyncSubdomainsResourceWithStreamingResponse(self._workers.subdomains)
+
+    @cached_property
+    def observability(self) -> AsyncObservabilityResourceWithStreamingResponse:
+        return AsyncObservabilityResourceWithStreamingResponse(self._workers.observability)
diff --git a/src/cloudflare/resources/workers_for_platforms/dispatch/dispatch.py b/src/cloudflare/resources/workers_for_platforms/dispatch/dispatch.py
index dd56b95c0d8..675f72c8787 100644
--- a/src/cloudflare/resources/workers_for_platforms/dispatch/dispatch.py
+++ b/src/cloudflare/resources/workers_for_platforms/dispatch/dispatch.py
@@ -3,7 +3,8 @@
 from __future__ import annotations
 
 from ...._compat import cached_property
-from .namespaces import (
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .namespaces.namespaces import (
     NamespacesResource,
     AsyncNamespacesResource,
     NamespacesResourceWithRawResponse,
@@ -11,8 +12,6 @@
     NamespacesResourceWithStreamingResponse,
     AsyncNamespacesResourceWithStreamingResponse,
 )
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from .namespaces.namespaces import NamespacesResource, AsyncNamespacesResource
 
 __all__ = ["DispatchResource", "AsyncDispatchResource"]
 
@@ -24,10 +23,21 @@ def namespaces(self) -> NamespacesResource:
 
     @cached_property
     def with_raw_response(self) -> DispatchResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DispatchResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DispatchResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DispatchResourceWithStreamingResponse(self)
 
 
@@ -38,10 +48,21 @@ def namespaces(self) -> AsyncNamespacesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncDispatchResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDispatchResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDispatchResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDispatchResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py
index efde6e33c5e..eb1514caadc 100644
--- a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py
+++ b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py
@@ -6,19 +6,8 @@
 
 import httpx
 
-from .scripts import (
-    ScriptsResource,
-    AsyncScriptsResource,
-    ScriptsResourceWithRawResponse,
-    AsyncScriptsResourceWithRawResponse,
-    ScriptsResourceWithStreamingResponse,
-    AsyncScriptsResourceWithStreamingResponse,
-)
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -29,7 +18,14 @@
 )
 from ....._wrappers import ResultWrapper
 from .....pagination import SyncSinglePage, AsyncSinglePage
-from .scripts.scripts import ScriptsResource, AsyncScriptsResource
+from .scripts.scripts import (
+    ScriptsResource,
+    AsyncScriptsResource,
+    ScriptsResourceWithRawResponse,
+    AsyncScriptsResourceWithRawResponse,
+    ScriptsResourceWithStreamingResponse,
+    AsyncScriptsResourceWithStreamingResponse,
+)
 from ....._base_client import AsyncPaginator, make_request_options
 from .....types.workers_for_platforms.dispatch import namespace_create_params
 from .....types.workers_for_platforms.dispatch.namespace_get_response import NamespaceGetResponse
@@ -46,31 +42,42 @@ def scripts(self) -> ScriptsResource:
 
     @cached_property
     def with_raw_response(self) -> NamespacesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return NamespacesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> NamespacesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return NamespacesResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        name: str | NotGiven = NOT_GIVEN,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[NamespaceCreateResponse]:
         """
         Create a new Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          name: The name of the dispatch namespace
+          name: The name of the dispatch namespace.
 
           extra_headers: Send extra headers
 
@@ -104,13 +111,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[NamespaceListResponse]:
         """
         Fetch a list of Workers for Platforms namespaces.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -141,13 +148,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Delete a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
@@ -185,13 +192,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[NamespaceGetResponse]:
         """
         Get a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
@@ -227,31 +234,42 @@ def scripts(self) -> AsyncScriptsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncNamespacesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncNamespacesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncNamespacesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncNamespacesResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        name: str | NotGiven = NOT_GIVEN,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[NamespaceCreateResponse]:
         """
         Create a new Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          name: The name of the dispatch namespace
+          name: The name of the dispatch namespace.
 
           extra_headers: Send extra headers
 
@@ -285,13 +303,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[NamespaceListResponse, AsyncSinglePage[NamespaceListResponse]]:
         """
         Fetch a list of Workers for Platforms namespaces.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -322,13 +340,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Delete a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
@@ -366,13 +384,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[NamespaceGetResponse]:
         """
         Get a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
diff --git a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/__init__.py b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/__init__.py
index fd5a962f515..668f9921146 100644
--- a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/__init__.py
+++ b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/__init__.py
@@ -48,8 +48,22 @@
     SettingsResourceWithStreamingResponse,
     AsyncSettingsResourceWithStreamingResponse,
 )
+from .asset_upload import (
+    AssetUploadResource,
+    AsyncAssetUploadResource,
+    AssetUploadResourceWithRawResponse,
+    AsyncAssetUploadResourceWithRawResponse,
+    AssetUploadResourceWithStreamingResponse,
+    AsyncAssetUploadResourceWithStreamingResponse,
+)
 
 __all__ = [
+    "AssetUploadResource",
+    "AsyncAssetUploadResource",
+    "AssetUploadResourceWithRawResponse",
+    "AsyncAssetUploadResourceWithRawResponse",
+    "AssetUploadResourceWithStreamingResponse",
+    "AsyncAssetUploadResourceWithStreamingResponse",
     "ContentResource",
     "AsyncContentResource",
     "ContentResourceWithRawResponse",
diff --git a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/asset_upload.py b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/asset_upload.py
new file mode 100644
index 00000000000..9d608c0e070
--- /dev/null
+++ b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/asset_upload.py
@@ -0,0 +1,220 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Type, Optional, cast
+
+import httpx
+
+from ......_types import Body, Query, Headers, NotGiven, not_given
+from ......_utils import maybe_transform, async_maybe_transform
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+from ......_response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ......_wrappers import ResultWrapper
+from ......_base_client import make_request_options
+from ......types.workers_for_platforms.dispatch.namespaces.scripts import asset_upload_create_params
+from ......types.workers_for_platforms.dispatch.namespaces.scripts.asset_upload_create_response import (
+    AssetUploadCreateResponse,
+)
+
+__all__ = ["AssetUploadResource", "AsyncAssetUploadResource"]
+
+
+class AssetUploadResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AssetUploadResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AssetUploadResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AssetUploadResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AssetUploadResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        dispatch_namespace: str,
+        manifest: Dict[str, asset_upload_create_params.Manifest],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AssetUploadCreateResponse]:
+        """Start uploading a collection of assets for use in a Worker version.
+
+        To learn
+        more about the direct uploads of assets, see
+        https://developers.cloudflare.com/workers/static-assets/direct-upload/.
+
+        Args:
+          account_id: Identifier.
+
+          dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          manifest: A manifest ([path]: {hash, size}) map of files to upload. As an example,
+              `/blog/hello-world.html` would be a valid path key.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dispatch_namespace:
+            raise ValueError(f"Expected a non-empty value for `dispatch_namespace` but received {dispatch_namespace!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        return self._post(
+            f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/assets-upload-session",
+            body=maybe_transform({"manifest": manifest}, asset_upload_create_params.AssetUploadCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AssetUploadCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AssetUploadCreateResponse]], ResultWrapper[AssetUploadCreateResponse]),
+        )
+
+
+class AsyncAssetUploadResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncAssetUploadResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAssetUploadResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAssetUploadResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAssetUploadResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        dispatch_namespace: str,
+        manifest: Dict[str, asset_upload_create_params.Manifest],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AssetUploadCreateResponse]:
+        """Start uploading a collection of assets for use in a Worker version.
+
+        To learn
+        more about the direct uploads of assets, see
+        https://developers.cloudflare.com/workers/static-assets/direct-upload/.
+
+        Args:
+          account_id: Identifier.
+
+          dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          manifest: A manifest ([path]: {hash, size}) map of files to upload. As an example,
+              `/blog/hello-world.html` would be a valid path key.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dispatch_namespace:
+            raise ValueError(f"Expected a non-empty value for `dispatch_namespace` but received {dispatch_namespace!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        return await self._post(
+            f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/assets-upload-session",
+            body=await async_maybe_transform(
+                {"manifest": manifest}, asset_upload_create_params.AssetUploadCreateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AssetUploadCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AssetUploadCreateResponse]], ResultWrapper[AssetUploadCreateResponse]),
+        )
+
+
+class AssetUploadResourceWithRawResponse:
+    def __init__(self, asset_upload: AssetUploadResource) -> None:
+        self._asset_upload = asset_upload
+
+        self.create = to_raw_response_wrapper(
+            asset_upload.create,
+        )
+
+
+class AsyncAssetUploadResourceWithRawResponse:
+    def __init__(self, asset_upload: AsyncAssetUploadResource) -> None:
+        self._asset_upload = asset_upload
+
+        self.create = async_to_raw_response_wrapper(
+            asset_upload.create,
+        )
+
+
+class AssetUploadResourceWithStreamingResponse:
+    def __init__(self, asset_upload: AssetUploadResource) -> None:
+        self._asset_upload = asset_upload
+
+        self.create = to_streamed_response_wrapper(
+            asset_upload.create,
+        )
+
+
+class AsyncAssetUploadResourceWithStreamingResponse:
+    def __init__(self, asset_upload: AsyncAssetUploadResource) -> None:
+        self._asset_upload = asset_upload
+
+        self.create = async_to_streamed_response_wrapper(
+            asset_upload.create,
+        )
diff --git a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/bindings.py b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/bindings.py
index ae29996783a..1771a7f7946 100644
--- a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/bindings.py
+++ b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/bindings.py
@@ -2,11 +2,11 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Any, cast
 
 import httpx
 
-from ......_types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ......_types import Body, Query, Headers, NotGiven, not_given
 from ......_compat import cached_property
 from ......_resource import SyncAPIResource, AsyncAPIResource
 from ......_response import (
@@ -15,8 +15,8 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ......_wrappers import ResultWrapper
-from ......_base_client import make_request_options
+from ......pagination import SyncSinglePage, AsyncSinglePage
+from ......_base_client import AsyncPaginator, make_request_options
 from ......types.workers_for_platforms.dispatch.namespaces.scripts.binding_get_response import BindingGetResponse
 
 __all__ = ["BindingsResource", "AsyncBindingsResource"]
@@ -25,10 +25,21 @@
 class BindingsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> BindingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return BindingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> BindingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return BindingsResourceWithStreamingResponse(self)
 
     def get(
@@ -42,14 +53,14 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[BindingGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[BindingGetResponse]:
         """
         Fetch script bindings from a script uploaded to a Workers for Platforms
         namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
@@ -69,29 +80,37 @@ def get(
             raise ValueError(f"Expected a non-empty value for `dispatch_namespace` but received {dispatch_namespace!r}")
         if not script_name:
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/bindings",
+            page=SyncSinglePage[BindingGetResponse],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[BindingGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[BindingGetResponse]], ResultWrapper[BindingGetResponse]),
+            model=cast(Any, BindingGetResponse),  # Union types cannot be passed in as arguments in the type system
         )
 
 
 class AsyncBindingsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncBindingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncBindingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncBindingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncBindingsResourceWithStreamingResponse(self)
 
-    async def get(
+    def get(
         self,
         script_name: str,
         *,
@@ -102,14 +121,14 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[BindingGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[BindingGetResponse, AsyncSinglePage[BindingGetResponse]]:
         """
         Fetch script bindings from a script uploaded to a Workers for Platforms
         namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
@@ -129,16 +148,13 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `dispatch_namespace` but received {dispatch_namespace!r}")
         if not script_name:
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/bindings",
+            page=AsyncSinglePage[BindingGetResponse],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[BindingGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[BindingGetResponse]], ResultWrapper[BindingGetResponse]),
+            model=cast(Any, BindingGetResponse),  # Union types cannot be passed in as arguments in the type system
         )
 
 
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 c5159e84730..d1934684156 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
@@ -2,11 +2,21 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Mapping, Optional, cast
+from typing import Type, Mapping, cast
 
 import httpx
 
-from ......_types import NOT_GIVEN, Body, Query, Headers, NotGiven, FileTypes
+from ......_types import (
+    Body,
+    Omit,
+    Query,
+    Headers,
+    NotGiven,
+    FileTypes,
+    SequenceNotStr,
+    omit,
+    not_given,
+)
 from ......_utils import (
     extract_files,
     maybe_transform,
@@ -42,10 +52,21 @@
 class ContentResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ContentResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ContentResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ContentResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ContentResourceWithStreamingResponse(self)
 
     def update(
@@ -54,35 +75,36 @@ def update(
         *,
         account_id: str,
         dispatch_namespace: str,
-        any_part_name: List[FileTypes] | NotGiven = NOT_GIVEN,
-        metadata: WorkerMetadataParam | NotGiven = NOT_GIVEN,
-        cf_worker_body_part: str | NotGiven = NOT_GIVEN,
-        cf_worker_main_module_part: str | NotGiven = NOT_GIVEN,
+        metadata: WorkerMetadataParam,
+        files: SequenceNotStr[FileTypes] | Omit = omit,
+        cf_worker_body_part: str | Omit = omit,
+        cf_worker_main_module_part: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Script]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Script:
         """
         Put script content for a script uploaded to a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
           script_name: Name of the script, used in URLs and route configuration.
 
-          any_part_name: A module comprising a Worker script, often a javascript file. Multiple modules
-              may be provided as separate named parts, but at least one module must be
-              present. This should be referenced either in the metadata as `main_module`
-              (esm)/`body_part` (service worker) or as a header `CF-WORKER-MAIN-MODULE-PART`
-              (esm) /`CF-WORKER-BODY-PART` (service worker) by part name. Source maps may also
-              be included using the `application/source-map` content type.
+          metadata: JSON-encoded metadata about the uploaded parts and Worker configuration.
 
-          metadata: JSON encoded metadata about the uploaded parts and Worker configuration.
+          files: An array of modules (often JavaScript files) comprising a Worker script. At
+              least one module must be present and referenced in the metadata as `main_module`
+              or `body_part` by filename.<br/>Possible Content-Type(s) are:
+              `application/javascript+module`, `text/javascript+module`,
+              `application/javascript`, `text/javascript`, `text/x-python`,
+              `text/x-python-requirement`, `application/wasm`, `text/plain`,
+              `application/octet-stream`, `application/source-map`.
 
           extra_headers: Send extra headers
 
@@ -109,11 +131,11 @@ def update(
         }
         body = deepcopy_minimal(
             {
-                "any_part_name": any_part_name,
                 "metadata": metadata,
+                "files": files,
             }
         )
-        files = extract_files(cast(Mapping[str, object], body), paths=[["<any part name>", "<array>"]])
+        extracted_files = extract_files(cast(Mapping[str, object], body), paths=[["files", "<array>"]])
         # It should be noted that the actual Content-Type header that will be
         # sent to the server will contain a `boundary` parameter, e.g.
         # multipart/form-data; boundary=---abc--
@@ -121,15 +143,16 @@ def update(
         return self._put(
             f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/content",
             body=maybe_transform(body, content_update_params.ContentUpdateParams),
-            files=files,
+            files=extracted_files,
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Script]]._unwrapper,
+                multipart_syntax="json",
+                post_parser=ResultWrapper[Script]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Script]], ResultWrapper[Script]),
+            cast_to=cast(Type[Script], ResultWrapper[Script]),
         )
 
     def get(
@@ -143,14 +166,14 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> BinaryAPIResponse:
         """
         Fetch script content from a script uploaded to a Workers for Platforms
         namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
@@ -183,10 +206,21 @@ def get(
 class AsyncContentResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncContentResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncContentResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncContentResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncContentResourceWithStreamingResponse(self)
 
     async def update(
@@ -195,35 +229,36 @@ async def update(
         *,
         account_id: str,
         dispatch_namespace: str,
-        any_part_name: List[FileTypes] | NotGiven = NOT_GIVEN,
-        metadata: WorkerMetadataParam | NotGiven = NOT_GIVEN,
-        cf_worker_body_part: str | NotGiven = NOT_GIVEN,
-        cf_worker_main_module_part: str | NotGiven = NOT_GIVEN,
+        metadata: WorkerMetadataParam,
+        files: SequenceNotStr[FileTypes] | Omit = omit,
+        cf_worker_body_part: str | Omit = omit,
+        cf_worker_main_module_part: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Script]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Script:
         """
         Put script content for a script uploaded to a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
           script_name: Name of the script, used in URLs and route configuration.
 
-          any_part_name: A module comprising a Worker script, often a javascript file. Multiple modules
-              may be provided as separate named parts, but at least one module must be
-              present. This should be referenced either in the metadata as `main_module`
-              (esm)/`body_part` (service worker) or as a header `CF-WORKER-MAIN-MODULE-PART`
-              (esm) /`CF-WORKER-BODY-PART` (service worker) by part name. Source maps may also
-              be included using the `application/source-map` content type.
+          metadata: JSON-encoded metadata about the uploaded parts and Worker configuration.
 
-          metadata: JSON encoded metadata about the uploaded parts and Worker configuration.
+          files: An array of modules (often JavaScript files) comprising a Worker script. At
+              least one module must be present and referenced in the metadata as `main_module`
+              or `body_part` by filename.<br/>Possible Content-Type(s) are:
+              `application/javascript+module`, `text/javascript+module`,
+              `application/javascript`, `text/javascript`, `text/x-python`,
+              `text/x-python-requirement`, `application/wasm`, `text/plain`,
+              `application/octet-stream`, `application/source-map`.
 
           extra_headers: Send extra headers
 
@@ -250,11 +285,11 @@ async def update(
         }
         body = deepcopy_minimal(
             {
-                "any_part_name": any_part_name,
                 "metadata": metadata,
+                "files": files,
             }
         )
-        files = extract_files(cast(Mapping[str, object], body), paths=[["<any part name>", "<array>"]])
+        extracted_files = extract_files(cast(Mapping[str, object], body), paths=[["files", "<array>"]])
         # It should be noted that the actual Content-Type header that will be
         # sent to the server will contain a `boundary` parameter, e.g.
         # multipart/form-data; boundary=---abc--
@@ -262,15 +297,16 @@ async def update(
         return await self._put(
             f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/content",
             body=await async_maybe_transform(body, content_update_params.ContentUpdateParams),
-            files=files,
+            files=extracted_files,
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Script]]._unwrapper,
+                multipart_syntax="json",
+                post_parser=ResultWrapper[Script]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Script]], ResultWrapper[Script]),
+            cast_to=cast(Type[Script], ResultWrapper[Script]),
         )
 
     async def get(
@@ -284,14 +320,14 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncBinaryAPIResponse:
         """
         Fetch script content from a script uploaded to a Workers for Platforms
         namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
diff --git a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/scripts.py b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/scripts.py
index 9adb223b2c7..04c42ec677a 100644
--- a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/scripts.py
+++ b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/scripts.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Optional, cast, overload
+from typing import Type, Optional, cast
 
 import httpx
 
@@ -46,13 +46,27 @@
     SettingsResourceWithStreamingResponse,
     AsyncSettingsResourceWithStreamingResponse,
 )
-from ......_types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven, FileTypes
-from ......_utils import (
-    required_args,
-    maybe_transform,
-    async_maybe_transform,
+from ......_types import (
+    Body,
+    Omit,
+    Query,
+    Headers,
+    NotGiven,
+    FileTypes,
+    SequenceNotStr,
+    omit,
+    not_given,
 )
+from ......_utils import is_given, maybe_transform, deepcopy_minimal, async_maybe_transform
 from ......_compat import cached_property
+from .asset_upload import (
+    AssetUploadResource,
+    AsyncAssetUploadResource,
+    AssetUploadResourceWithRawResponse,
+    AsyncAssetUploadResourceWithRawResponse,
+    AssetUploadResourceWithStreamingResponse,
+    AsyncAssetUploadResourceWithStreamingResponse,
+)
 from ......_resource import SyncAPIResource, AsyncAPIResource
 from ......_response import (
     to_raw_response_wrapper,
@@ -62,14 +76,18 @@
 )
 from ......_wrappers import ResultWrapper
 from ......_base_client import make_request_options
-from ......types.workers.script import Script as WorkersScript
 from ......types.workers_for_platforms.dispatch.namespaces import script_delete_params, script_update_params
-from ......types.workers_for_platforms.dispatch.namespaces.script import Script as NamespacesScript
+from ......types.workers_for_platforms.dispatch.namespaces.script import Script
+from ......types.workers_for_platforms.dispatch.namespaces.script_update_response import ScriptUpdateResponse
 
 __all__ = ["ScriptsResource", "AsyncScriptsResource"]
 
 
 class ScriptsResource(SyncAPIResource):
+    @cached_property
+    def asset_upload(self) -> AssetUploadResource:
+        return AssetUploadResource(self._client)
+
     @cached_property
     def content(self) -> ContentResource:
         return ContentResource(self._client)
@@ -92,89 +110,60 @@ def tags(self) -> TagsResource:
 
     @cached_property
     def with_raw_response(self) -> ScriptsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ScriptsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ScriptsResourceWithStreamingResponse:
-        return ScriptsResourceWithStreamingResponse(self)
-
-    @overload
-    def update(
-        self,
-        script_name: str,
-        *,
-        account_id: str,
-        dispatch_namespace: str,
-        any_part_name: List[FileTypes] | NotGiven = NOT_GIVEN,
-        metadata: script_update_params.Variant0Metadata | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[WorkersScript]:
-        """Upload a worker module to a Workers for Platforms namespace.
-
-        You can find an
-        example of the metadata on our docs:
-        https://developers.cloudflare.com/cloudflare-for-platforms/workers-for-platforms/reference/metadata/
-
-        Args:
-          account_id: Identifier
-
-          dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
-
-          script_name: Name of the script, used in URLs and route configuration.
-
-          any_part_name: A module comprising a Worker script, often a javascript file. Multiple modules
-              may be provided as separate named parts, but at least one module must be present
-              and referenced in the metadata as `main_module` or `body_part` by part name.
-              Source maps may also be included using the `application/source-map` content
-              type.
-
-          metadata: JSON encoded metadata about the uploaded parts and Worker configuration.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
         """
-        ...
+        return ScriptsResourceWithStreamingResponse(self)
 
-    @overload
     def update(
         self,
         script_name: str,
         *,
         account_id: str,
         dispatch_namespace: str,
-        message: str | NotGiven = NOT_GIVEN,
+        metadata: script_update_params.Metadata,
+        files: SequenceNotStr[FileTypes] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[WorkersScript]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScriptUpdateResponse:
         """Upload a worker module to a Workers for Platforms namespace.
 
-        You can find an
-        example of the metadata on our docs:
-        https://developers.cloudflare.com/cloudflare-for-platforms/workers-for-platforms/reference/metadata/
+        You can find more
+        about the multipart metadata on our docs:
+        https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
           script_name: Name of the script, used in URLs and route configuration.
 
-          message: Rollback message to be associated with this deployment. Only parsed when query
-              param `"rollback_to"` is present.
+          metadata: JSON-encoded metadata about the uploaded parts and Worker configuration.
+
+          files: An array of modules (often JavaScript files) comprising a Worker script. At
+              least one module must be present and referenced in the metadata as `main_module`
+              or `body_part` by filename.<br/>Possible Content-Type(s) are:
+              `application/javascript+module`, `text/javascript+module`,
+              `application/javascript`, `text/javascript`, `text/x-python`,
+              `text/x-python-requirement`, `application/wasm`, `text/plain`,
+              `application/octet-stream`, `application/source-map`.
 
           extra_headers: Send extra headers
 
@@ -184,49 +173,36 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        ...
-
-    @required_args(["account_id", "dispatch_namespace"])
-    def update(
-        self,
-        script_name: str,
-        *,
-        account_id: str,
-        dispatch_namespace: str,
-        any_part_name: List[FileTypes] | NotGiven = NOT_GIVEN,
-        metadata: script_update_params.Variant0Metadata | NotGiven = NOT_GIVEN,
-        message: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[WorkersScript]:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not dispatch_namespace:
             raise ValueError(f"Expected a non-empty value for `dispatch_namespace` but received {dispatch_namespace!r}")
         if not script_name:
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        body = deepcopy_minimal(
+            {
+                "metadata": metadata,
+            }
+        )
+        extracted_files = [("files", file) for file in files] if is_given(files) else []
+        if extracted_files:
+            # It should be noted that the actual Content-Type header that will be
+            # sent to the server will contain a `boundary` parameter, e.g.
+            # multipart/form-data; boundary=---abc--
+            extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
         return self._put(
             f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}",
-            body=maybe_transform(
-                {
-                    "any_part_name": any_part_name,
-                    "metadata": metadata,
-                    "message": message,
-                },
-                script_update_params.ScriptUpdateParams,
-            ),
+            body=maybe_transform(body, script_update_params.ScriptUpdateParams),
+            files=extracted_files,
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[WorkersScript]]._unwrapper,
+                multipart_syntax="json",
+                post_parser=ResultWrapper[ScriptUpdateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[WorkersScript]], ResultWrapper[WorkersScript]),
+            cast_to=cast(Type[ScriptUpdateResponse], ResultWrapper[ScriptUpdateResponse]),
         )
 
     def delete(
@@ -235,21 +211,21 @@ def delete(
         *,
         account_id: str,
         dispatch_namespace: str,
-        force: bool | NotGiven = NOT_GIVEN,
+        force: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> None:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """Delete a worker from a Workers for Platforms namespace.
 
         This call has no
         response body on a successful delete.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
@@ -273,7 +249,6 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `dispatch_namespace` but received {dispatch_namespace!r}")
         if not script_name:
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
-        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
         return self._delete(
             f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}",
             options=make_request_options(
@@ -282,8 +257,9 @@ def delete(
                 extra_body=extra_body,
                 timeout=timeout,
                 query=maybe_transform({"force": force}, script_delete_params.ScriptDeleteParams),
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
-            cast_to=NoneType,
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     def get(
@@ -297,13 +273,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[NamespacesScript]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Script:
         """
         Fetch information about a script uploaded to a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
@@ -330,13 +306,17 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[NamespacesScript]]._unwrapper,
+                post_parser=ResultWrapper[Script]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[NamespacesScript]], ResultWrapper[NamespacesScript]),
+            cast_to=cast(Type[Script], ResultWrapper[Script]),
         )
 
 
 class AsyncScriptsResource(AsyncAPIResource):
+    @cached_property
+    def asset_upload(self) -> AsyncAssetUploadResource:
+        return AsyncAssetUploadResource(self._client)
+
     @cached_property
     def content(self) -> AsyncContentResource:
         return AsyncContentResource(self._client)
@@ -359,89 +339,60 @@ def tags(self) -> AsyncTagsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncScriptsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncScriptsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncScriptsResourceWithStreamingResponse:
-        return AsyncScriptsResourceWithStreamingResponse(self)
-
-    @overload
-    async def update(
-        self,
-        script_name: str,
-        *,
-        account_id: str,
-        dispatch_namespace: str,
-        any_part_name: List[FileTypes] | NotGiven = NOT_GIVEN,
-        metadata: script_update_params.Variant0Metadata | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[WorkersScript]:
-        """Upload a worker module to a Workers for Platforms namespace.
-
-        You can find an
-        example of the metadata on our docs:
-        https://developers.cloudflare.com/cloudflare-for-platforms/workers-for-platforms/reference/metadata/
-
-        Args:
-          account_id: Identifier
-
-          dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
-
-          script_name: Name of the script, used in URLs and route configuration.
-
-          any_part_name: A module comprising a Worker script, often a javascript file. Multiple modules
-              may be provided as separate named parts, but at least one module must be present
-              and referenced in the metadata as `main_module` or `body_part` by part name.
-              Source maps may also be included using the `application/source-map` content
-              type.
-
-          metadata: JSON encoded metadata about the uploaded parts and Worker configuration.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
         """
-        ...
+        return AsyncScriptsResourceWithStreamingResponse(self)
 
-    @overload
     async def update(
         self,
         script_name: str,
         *,
         account_id: str,
         dispatch_namespace: str,
-        message: str | NotGiven = NOT_GIVEN,
+        metadata: script_update_params.Metadata,
+        files: SequenceNotStr[FileTypes] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[WorkersScript]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ScriptUpdateResponse:
         """Upload a worker module to a Workers for Platforms namespace.
 
-        You can find an
-        example of the metadata on our docs:
-        https://developers.cloudflare.com/cloudflare-for-platforms/workers-for-platforms/reference/metadata/
+        You can find more
+        about the multipart metadata on our docs:
+        https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
           script_name: Name of the script, used in URLs and route configuration.
 
-          message: Rollback message to be associated with this deployment. Only parsed when query
-              param `"rollback_to"` is present.
+          metadata: JSON-encoded metadata about the uploaded parts and Worker configuration.
+
+          files: An array of modules (often JavaScript files) comprising a Worker script. At
+              least one module must be present and referenced in the metadata as `main_module`
+              or `body_part` by filename.<br/>Possible Content-Type(s) are:
+              `application/javascript+module`, `text/javascript+module`,
+              `application/javascript`, `text/javascript`, `text/x-python`,
+              `text/x-python-requirement`, `application/wasm`, `text/plain`,
+              `application/octet-stream`, `application/source-map`.
 
           extra_headers: Send extra headers
 
@@ -451,49 +402,36 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        ...
-
-    @required_args(["account_id", "dispatch_namespace"])
-    async def update(
-        self,
-        script_name: str,
-        *,
-        account_id: str,
-        dispatch_namespace: str,
-        any_part_name: List[FileTypes] | NotGiven = NOT_GIVEN,
-        metadata: script_update_params.Variant0Metadata | NotGiven = NOT_GIVEN,
-        message: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[WorkersScript]:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not dispatch_namespace:
             raise ValueError(f"Expected a non-empty value for `dispatch_namespace` but received {dispatch_namespace!r}")
         if not script_name:
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        body = deepcopy_minimal(
+            {
+                "metadata": metadata,
+            }
+        )
+        extracted_files = [("files", file) for file in files] if is_given(files) else []
+        if extracted_files:
+            # It should be noted that the actual Content-Type header that will be
+            # sent to the server will contain a `boundary` parameter, e.g.
+            # multipart/form-data; boundary=---abc--
+            extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
         return await self._put(
             f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}",
-            body=await async_maybe_transform(
-                {
-                    "any_part_name": any_part_name,
-                    "metadata": metadata,
-                    "message": message,
-                },
-                script_update_params.ScriptUpdateParams,
-            ),
+            body=await async_maybe_transform(body, script_update_params.ScriptUpdateParams),
+            files=extracted_files,
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[WorkersScript]]._unwrapper,
+                multipart_syntax="json",
+                post_parser=ResultWrapper[ScriptUpdateResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[WorkersScript]], ResultWrapper[WorkersScript]),
+            cast_to=cast(Type[ScriptUpdateResponse], ResultWrapper[ScriptUpdateResponse]),
         )
 
     async def delete(
@@ -502,21 +440,21 @@ async def delete(
         *,
         account_id: str,
         dispatch_namespace: str,
-        force: bool | NotGiven = NOT_GIVEN,
+        force: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> None:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """Delete a worker from a Workers for Platforms namespace.
 
         This call has no
         response body on a successful delete.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
@@ -540,7 +478,6 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `dispatch_namespace` but received {dispatch_namespace!r}")
         if not script_name:
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
-        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
         return await self._delete(
             f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}",
             options=make_request_options(
@@ -549,8 +486,9 @@ async def delete(
                 extra_body=extra_body,
                 timeout=timeout,
                 query=await async_maybe_transform({"force": force}, script_delete_params.ScriptDeleteParams),
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
-            cast_to=NoneType,
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     async def get(
@@ -564,13 +502,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[NamespacesScript]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Script:
         """
         Fetch information about a script uploaded to a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
@@ -597,9 +535,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[NamespacesScript]]._unwrapper,
+                post_parser=ResultWrapper[Script]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[NamespacesScript]], ResultWrapper[NamespacesScript]),
+            cast_to=cast(Type[Script], ResultWrapper[Script]),
         )
 
 
@@ -617,6 +555,10 @@ def __init__(self, scripts: ScriptsResource) -> None:
             scripts.get,
         )
 
+    @cached_property
+    def asset_upload(self) -> AssetUploadResourceWithRawResponse:
+        return AssetUploadResourceWithRawResponse(self._scripts.asset_upload)
+
     @cached_property
     def content(self) -> ContentResourceWithRawResponse:
         return ContentResourceWithRawResponse(self._scripts.content)
@@ -652,6 +594,10 @@ def __init__(self, scripts: AsyncScriptsResource) -> None:
             scripts.get,
         )
 
+    @cached_property
+    def asset_upload(self) -> AsyncAssetUploadResourceWithRawResponse:
+        return AsyncAssetUploadResourceWithRawResponse(self._scripts.asset_upload)
+
     @cached_property
     def content(self) -> AsyncContentResourceWithRawResponse:
         return AsyncContentResourceWithRawResponse(self._scripts.content)
@@ -687,6 +633,10 @@ def __init__(self, scripts: ScriptsResource) -> None:
             scripts.get,
         )
 
+    @cached_property
+    def asset_upload(self) -> AssetUploadResourceWithStreamingResponse:
+        return AssetUploadResourceWithStreamingResponse(self._scripts.asset_upload)
+
     @cached_property
     def content(self) -> ContentResourceWithStreamingResponse:
         return ContentResourceWithStreamingResponse(self._scripts.content)
@@ -722,6 +672,10 @@ def __init__(self, scripts: AsyncScriptsResource) -> None:
             scripts.get,
         )
 
+    @cached_property
+    def asset_upload(self) -> AsyncAssetUploadResourceWithStreamingResponse:
+        return AsyncAssetUploadResourceWithStreamingResponse(self._scripts.asset_upload)
+
     @cached_property
     def content(self) -> AsyncContentResourceWithStreamingResponse:
         return AsyncContentResourceWithStreamingResponse(self._scripts.content)
diff --git a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/secrets.py b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/secrets.py
index 4cb8f6ce11e..bd34213ac7d 100644
--- a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/secrets.py
+++ b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/secrets.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
-from typing_extensions import Literal
+from typing import Any, List, Type, Optional, cast
+from typing_extensions import Literal, overload
 
 import httpx
 
-from ......_types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ......_utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ......_types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ......_utils import required_args, maybe_transform, async_maybe_transform
 from ......_compat import cached_property
 from ......_resource import SyncAPIResource, AsyncAPIResource
 from ......_response import (
@@ -23,7 +20,12 @@
 from ......_wrappers import ResultWrapper
 from ......pagination import SyncSinglePage, AsyncSinglePage
 from ......_base_client import AsyncPaginator, make_request_options
-from ......types.workers_for_platforms.dispatch.namespaces.scripts import secret_update_params
+from ......types.workers_for_platforms.dispatch.namespaces.scripts import (
+    secret_get_params,
+    secret_delete_params,
+    secret_update_params,
+)
+from ......types.workers_for_platforms.dispatch.namespaces.scripts.secret_get_response import SecretGetResponse
 from ......types.workers_for_platforms.dispatch.namespaces.scripts.secret_list_response import SecretListResponse
 from ......types.workers_for_platforms.dispatch.namespaces.scripts.secret_update_response import SecretUpdateResponse
 
@@ -33,43 +35,117 @@
 class SecretsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SecretsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SecretsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SecretsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SecretsResourceWithStreamingResponse(self)
 
+    @overload
+    def update(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        dispatch_namespace: str,
+        name: str,
+        text: str,
+        type: Literal["secret_text"],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SecretUpdateResponse:
+        """
+        Add a secret to a script uploaded to a Workers for Platforms namespace.
+
+        Args:
+          account_id: Identifier.
+
+          dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          name: A JavaScript variable name for the binding.
+
+          text: The secret value to use.
+
+          type: The kind of resource that the binding provides.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
     def update(
         self,
         script_name: str,
         *,
         account_id: str,
         dispatch_namespace: str,
-        name: str | NotGiven = NOT_GIVEN,
-        text: str | NotGiven = NOT_GIVEN,
-        type: Literal["secret_text"] | NotGiven = NOT_GIVEN,
+        algorithm: object,
+        format: Literal["raw", "pkcs8", "spki", "jwk"],
+        name: str,
+        type: Literal["secret_key"],
+        usages: List[
+            Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]
+        ],
+        key_base64: str | Omit = omit,
+        key_jwk: object | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SecretUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SecretUpdateResponse:
         """
-        Put secrets to a script uploaded to a Workers for Platforms namespace.
+        Add a secret to a script uploaded to a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
           script_name: Name of the script, used in URLs and route configuration.
 
-          name: The name of this secret, this is what will be to access it inside the Worker.
+          algorithm: Algorithm-specific key parameters.
+              [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+
+          format: Data format of the key.
+              [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+
+          name: A JavaScript variable name for the binding.
 
-          text: The value of the secret.
+          type: The kind of resource that the binding provides.
 
-          type: The type of secret to put.
+          usages: Allowed operations with the key.
+              [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+
+          key_base64: Base64-encoded key data. Required if `format` is "raw", "pkcs8", or "spki".
+
+          key_jwk: Key data in
+              [JSON Web Key](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#json_web_key)
+              format. Required if `format` is "jwk".
 
           extra_headers: Send extra headers
 
@@ -79,30 +155,68 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        ...
+
+    @required_args(
+        ["account_id", "dispatch_namespace", "name", "text", "type"],
+        ["account_id", "dispatch_namespace", "algorithm", "format", "name", "type", "usages"],
+    )
+    def update(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        dispatch_namespace: str,
+        name: str,
+        text: str | Omit = omit,
+        type: Literal["secret_text"] | Literal["secret_key"],
+        algorithm: object | Omit = omit,
+        format: Literal["raw", "pkcs8", "spki", "jwk"] | Omit = omit,
+        usages: List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+        | Omit = omit,
+        key_base64: str | Omit = omit,
+        key_jwk: object | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SecretUpdateResponse:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not dispatch_namespace:
             raise ValueError(f"Expected a non-empty value for `dispatch_namespace` but received {dispatch_namespace!r}")
         if not script_name:
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
-        return self._put(
-            f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets",
-            body=maybe_transform(
-                {
-                    "name": name,
-                    "text": text,
-                    "type": type,
-                },
-                secret_update_params.SecretUpdateParams,
+        return cast(
+            SecretUpdateResponse,
+            self._put(
+                f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets",
+                body=maybe_transform(
+                    {
+                        "name": name,
+                        "text": text,
+                        "type": type,
+                        "algorithm": algorithm,
+                        "format": format,
+                        "usages": usages,
+                        "key_base64": key_base64,
+                        "key_jwk": key_jwk,
+                    },
+                    secret_update_params.SecretUpdateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[SecretUpdateResponse]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[SecretUpdateResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SecretUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[SecretUpdateResponse]], ResultWrapper[SecretUpdateResponse]),
         )
 
     def list(
@@ -116,13 +230,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[SecretListResponse]:
         """
-        Fetch secrets from a script uploaded to a Workers for Platforms namespace.
+        List secrets bound to a script uploaded to a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
@@ -148,50 +262,246 @@ def list(
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            model=SecretListResponse,
+            model=cast(Any, SecretListResponse),  # Union types cannot be passed in as arguments in the type system
+        )
+
+    def delete(
+        self,
+        secret_name: str,
+        *,
+        account_id: str,
+        dispatch_namespace: str,
+        script_name: str,
+        url_encoded: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Remove a secret from a script uploaded to a Workers for Platforms namespace.
+
+        Args:
+          account_id: Identifier.
+
+          dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          secret_name: A JavaScript variable name for the secret binding.
+
+          url_encoded: Flag that indicates whether the secret name is URL encoded.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dispatch_namespace:
+            raise ValueError(f"Expected a non-empty value for `dispatch_namespace` but received {dispatch_namespace!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        if not secret_name:
+            raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}")
+        return self._delete(
+            f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets/{secret_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"url_encoded": url_encoded}, secret_delete_params.SecretDeleteParams),
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def get(
+        self,
+        secret_name: str,
+        *,
+        account_id: str,
+        dispatch_namespace: str,
+        script_name: str,
+        url_encoded: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SecretGetResponse:
+        """
+        Get a given secret binding (value omitted) on a script uploaded to a Workers for
+        Platforms namespace.
+
+        Args:
+          account_id: Identifier.
+
+          dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          secret_name: A JavaScript variable name for the secret binding.
+
+          url_encoded: Flag that indicates whether the secret name is URL encoded.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dispatch_namespace:
+            raise ValueError(f"Expected a non-empty value for `dispatch_namespace` but received {dispatch_namespace!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        if not secret_name:
+            raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}")
+        return cast(
+            SecretGetResponse,
+            self._get(
+                f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets/{secret_name}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    query=maybe_transform({"url_encoded": url_encoded}, secret_get_params.SecretGetParams),
+                    post_parser=ResultWrapper[SecretGetResponse]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[SecretGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
         )
 
 
 class AsyncSecretsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSecretsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSecretsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSecretsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSecretsResourceWithStreamingResponse(self)
 
+    @overload
+    async def update(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        dispatch_namespace: str,
+        name: str,
+        text: str,
+        type: Literal["secret_text"],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SecretUpdateResponse:
+        """
+        Add a secret to a script uploaded to a Workers for Platforms namespace.
+
+        Args:
+          account_id: Identifier.
+
+          dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          name: A JavaScript variable name for the binding.
+
+          text: The secret value to use.
+
+          type: The kind of resource that the binding provides.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
     async def update(
         self,
         script_name: str,
         *,
         account_id: str,
         dispatch_namespace: str,
-        name: str | NotGiven = NOT_GIVEN,
-        text: str | NotGiven = NOT_GIVEN,
-        type: Literal["secret_text"] | NotGiven = NOT_GIVEN,
+        algorithm: object,
+        format: Literal["raw", "pkcs8", "spki", "jwk"],
+        name: str,
+        type: Literal["secret_key"],
+        usages: List[
+            Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]
+        ],
+        key_base64: str | Omit = omit,
+        key_jwk: object | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SecretUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SecretUpdateResponse:
         """
-        Put secrets to a script uploaded to a Workers for Platforms namespace.
+        Add a secret to a script uploaded to a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
           script_name: Name of the script, used in URLs and route configuration.
 
-          name: The name of this secret, this is what will be to access it inside the Worker.
+          algorithm: Algorithm-specific key parameters.
+              [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+
+          format: Data format of the key.
+              [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+
+          name: A JavaScript variable name for the binding.
 
-          text: The value of the secret.
+          type: The kind of resource that the binding provides.
 
-          type: The type of secret to put.
+          usages: Allowed operations with the key.
+              [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+
+          key_base64: Base64-encoded key data. Required if `format` is "raw", "pkcs8", or "spki".
+
+          key_jwk: Key data in
+              [JSON Web Key](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#json_web_key)
+              format. Required if `format` is "jwk".
 
           extra_headers: Send extra headers
 
@@ -201,30 +511,68 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        ...
+
+    @required_args(
+        ["account_id", "dispatch_namespace", "name", "text", "type"],
+        ["account_id", "dispatch_namespace", "algorithm", "format", "name", "type", "usages"],
+    )
+    async def update(
+        self,
+        script_name: str,
+        *,
+        account_id: str,
+        dispatch_namespace: str,
+        name: str,
+        text: str | Omit = omit,
+        type: Literal["secret_text"] | Literal["secret_key"],
+        algorithm: object | Omit = omit,
+        format: Literal["raw", "pkcs8", "spki", "jwk"] | Omit = omit,
+        usages: List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+        | Omit = omit,
+        key_base64: str | Omit = omit,
+        key_jwk: object | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SecretUpdateResponse:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not dispatch_namespace:
             raise ValueError(f"Expected a non-empty value for `dispatch_namespace` but received {dispatch_namespace!r}")
         if not script_name:
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
-        return await self._put(
-            f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets",
-            body=await async_maybe_transform(
-                {
-                    "name": name,
-                    "text": text,
-                    "type": type,
-                },
-                secret_update_params.SecretUpdateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SecretUpdateResponse]]._unwrapper,
+        return cast(
+            SecretUpdateResponse,
+            await self._put(
+                f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets",
+                body=await async_maybe_transform(
+                    {
+                        "name": name,
+                        "text": text,
+                        "type": type,
+                        "algorithm": algorithm,
+                        "format": format,
+                        "usages": usages,
+                        "key_base64": key_base64,
+                        "key_jwk": key_jwk,
+                    },
+                    secret_update_params.SecretUpdateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[SecretUpdateResponse]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[SecretUpdateResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[SecretUpdateResponse]], ResultWrapper[SecretUpdateResponse]),
         )
 
     def list(
@@ -238,13 +586,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[SecretListResponse, AsyncSinglePage[SecretListResponse]]:
         """
-        Fetch secrets from a script uploaded to a Workers for Platforms namespace.
+        List secrets bound to a script uploaded to a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
@@ -270,7 +618,131 @@ def list(
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            model=SecretListResponse,
+            model=cast(Any, SecretListResponse),  # Union types cannot be passed in as arguments in the type system
+        )
+
+    async def delete(
+        self,
+        secret_name: str,
+        *,
+        account_id: str,
+        dispatch_namespace: str,
+        script_name: str,
+        url_encoded: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Remove a secret from a script uploaded to a Workers for Platforms namespace.
+
+        Args:
+          account_id: Identifier.
+
+          dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          secret_name: A JavaScript variable name for the secret binding.
+
+          url_encoded: Flag that indicates whether the secret name is URL encoded.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dispatch_namespace:
+            raise ValueError(f"Expected a non-empty value for `dispatch_namespace` but received {dispatch_namespace!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        if not secret_name:
+            raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets/{secret_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"url_encoded": url_encoded}, secret_delete_params.SecretDeleteParams
+                ),
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def get(
+        self,
+        secret_name: str,
+        *,
+        account_id: str,
+        dispatch_namespace: str,
+        script_name: str,
+        url_encoded: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SecretGetResponse:
+        """
+        Get a given secret binding (value omitted) on a script uploaded to a Workers for
+        Platforms namespace.
+
+        Args:
+          account_id: Identifier.
+
+          dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
+
+          script_name: Name of the script, used in URLs and route configuration.
+
+          secret_name: A JavaScript variable name for the secret binding.
+
+          url_encoded: Flag that indicates whether the secret name is URL encoded.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dispatch_namespace:
+            raise ValueError(f"Expected a non-empty value for `dispatch_namespace` but received {dispatch_namespace!r}")
+        if not script_name:
+            raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
+        if not secret_name:
+            raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}")
+        return cast(
+            SecretGetResponse,
+            await self._get(
+                f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets/{secret_name}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    query=await async_maybe_transform({"url_encoded": url_encoded}, secret_get_params.SecretGetParams),
+                    post_parser=ResultWrapper[SecretGetResponse]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[SecretGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
         )
 
 
@@ -284,6 +756,12 @@ def __init__(self, secrets: SecretsResource) -> None:
         self.list = to_raw_response_wrapper(
             secrets.list,
         )
+        self.delete = to_raw_response_wrapper(
+            secrets.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            secrets.get,
+        )
 
 
 class AsyncSecretsResourceWithRawResponse:
@@ -296,6 +774,12 @@ def __init__(self, secrets: AsyncSecretsResource) -> None:
         self.list = async_to_raw_response_wrapper(
             secrets.list,
         )
+        self.delete = async_to_raw_response_wrapper(
+            secrets.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            secrets.get,
+        )
 
 
 class SecretsResourceWithStreamingResponse:
@@ -308,6 +792,12 @@ def __init__(self, secrets: SecretsResource) -> None:
         self.list = to_streamed_response_wrapper(
             secrets.list,
         )
+        self.delete = to_streamed_response_wrapper(
+            secrets.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            secrets.get,
+        )
 
 
 class AsyncSecretsResourceWithStreamingResponse:
@@ -320,3 +810,9 @@ def __init__(self, secrets: AsyncSecretsResource) -> None:
         self.list = async_to_streamed_response_wrapper(
             secrets.list,
         )
+        self.delete = async_to_streamed_response_wrapper(
+            secrets.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            secrets.get,
+        )
diff --git a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/settings.py b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/settings.py
index 58e4b3105eb..ef6da967284 100644
--- a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/settings.py
+++ b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/settings.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ......_types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ......_utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ......_types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ......_utils import maybe_transform, async_maybe_transform
 from ......_compat import cached_property
 from ......_resource import SyncAPIResource, AsyncAPIResource
 from ......_response import (
@@ -31,10 +28,21 @@
 class SettingsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SettingsResourceWithStreamingResponse(self)
 
     def edit(
@@ -43,19 +51,19 @@ def edit(
         *,
         account_id: str,
         dispatch_namespace: str,
-        settings: setting_edit_params.Settings | NotGiven = NOT_GIVEN,
+        settings: setting_edit_params.Settings | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SettingEditResponse]:
         """
-        Patch script metadata, such as bindings
+        Patch script metadata, such as bindings.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
@@ -87,6 +95,7 @@ def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
+                multipart_syntax="json",
                 post_parser=ResultWrapper[Optional[SettingEditResponse]]._unwrapper,
             ),
             cast_to=cast(Type[Optional[SettingEditResponse]], ResultWrapper[SettingEditResponse]),
@@ -103,13 +112,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SettingGetResponse]:
         """
         Get script settings from a script uploaded to a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
@@ -145,10 +154,21 @@ def get(
 class AsyncSettingsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSettingsResourceWithStreamingResponse(self)
 
     async def edit(
@@ -157,19 +177,19 @@ async def edit(
         *,
         account_id: str,
         dispatch_namespace: str,
-        settings: setting_edit_params.Settings | NotGiven = NOT_GIVEN,
+        settings: setting_edit_params.Settings | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SettingEditResponse]:
         """
-        Patch script metadata, such as bindings
+        Patch script metadata, such as bindings.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
@@ -201,6 +221,7 @@ async def edit(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
+                multipart_syntax="json",
                 post_parser=ResultWrapper[Optional[SettingEditResponse]]._unwrapper,
             ),
             cast_to=cast(Type[Optional[SettingEditResponse]], ResultWrapper[SettingEditResponse]),
@@ -217,13 +238,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SettingGetResponse]:
         """
         Get script settings from a script uploaded to a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
diff --git a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/tags.py b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/tags.py
index f96b9d6e7a4..6c802370411 100644
--- a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/tags.py
+++ b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/tags.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ......_types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ......_utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ......_types import Body, Query, Headers, NotGiven, SequenceNotStr, not_given
+from ......_utils import maybe_transform
 from ......_compat import cached_property
 from ......_resource import SyncAPIResource, AsyncAPIResource
 from ......_response import (
@@ -22,7 +19,6 @@
 from ......_wrappers import ResultWrapper
 from ......pagination import SyncSinglePage, AsyncSinglePage
 from ......_base_client import AsyncPaginator, make_request_options
-from ......types.workers_for_platforms.dispatch.namespaces.scripts import tag_update_params
 from ......types.workers_for_platforms.dispatch.namespaces.scripts.tag_list_response import TagListResponse
 from ......types.workers_for_platforms.dispatch.namespaces.scripts.tag_update_response import TagUpdateResponse
 
@@ -32,10 +28,21 @@
 class TagsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TagsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TagsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TagsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TagsResourceWithStreamingResponse(self)
 
     def update(
@@ -44,25 +51,25 @@ def update(
         *,
         account_id: str,
         dispatch_namespace: str,
-        body: List[str],
+        body: Optional[SequenceNotStr[str]],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TagUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[TagUpdateResponse]:
         """
         Put script tags for a script uploaded to a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
           script_name: Name of the script, used in URLs and route configuration.
 
-          body: Tags to help you manage your Workers
+          body: Tags associated with the Worker.
 
           extra_headers: Send extra headers
 
@@ -78,17 +85,15 @@ def update(
             raise ValueError(f"Expected a non-empty value for `dispatch_namespace` but received {dispatch_namespace!r}")
         if not script_name:
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
-        return self._put(
+        return self._get_api_list(
             f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/tags",
-            body=maybe_transform(body, tag_update_params.TagUpdateParams),
+            page=SyncSinglePage[TagUpdateResponse],
+            body=maybe_transform(body, Optional[SequenceNotStr[str]]),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[TagUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[TagUpdateResponse]], ResultWrapper[TagUpdateResponse]),
+            model=str,
+            method="put",
         )
 
     def list(
@@ -102,13 +107,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[TagListResponse]:
         """
         Fetch tags from a script uploaded to a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
@@ -149,20 +154,18 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Delete script tag for a script uploaded to a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
           script_name: Name of the script, used in URLs and route configuration.
 
-          tag: Tag to help you manage your Worker
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -195,37 +198,48 @@ def delete(
 class AsyncTagsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTagsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTagsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTagsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTagsResourceWithStreamingResponse(self)
 
-    async def update(
+    def update(
         self,
         script_name: str,
         *,
         account_id: str,
         dispatch_namespace: str,
-        body: List[str],
+        body: Optional[SequenceNotStr[str]],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TagUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[TagUpdateResponse, AsyncSinglePage[TagUpdateResponse]]:
         """
         Put script tags for a script uploaded to a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
           script_name: Name of the script, used in URLs and route configuration.
 
-          body: Tags to help you manage your Workers
+          body: Tags associated with the Worker.
 
           extra_headers: Send extra headers
 
@@ -241,17 +255,15 @@ async def update(
             raise ValueError(f"Expected a non-empty value for `dispatch_namespace` but received {dispatch_namespace!r}")
         if not script_name:
             raise ValueError(f"Expected a non-empty value for `script_name` but received {script_name!r}")
-        return await self._put(
+        return self._get_api_list(
             f"/accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/tags",
-            body=await async_maybe_transform(body, tag_update_params.TagUpdateParams),
+            page=AsyncSinglePage[TagUpdateResponse],
+            body=maybe_transform(body, Optional[SequenceNotStr[str]]),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[TagUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[TagUpdateResponse]], ResultWrapper[TagUpdateResponse]),
+            model=str,
+            method="put",
         )
 
     def list(
@@ -265,13 +277,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[TagListResponse, AsyncSinglePage[TagListResponse]]:
         """
         Fetch tags from a script uploaded to a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
@@ -312,20 +324,18 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Delete script tag for a script uploaded to a Workers for Platforms namespace.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           dispatch_namespace: Name of the Workers for Platforms dispatch namespace.
 
           script_name: Name of the script, used in URLs and route configuration.
 
-          tag: Tag to help you manage your Worker
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
diff --git a/src/cloudflare/resources/workers_for_platforms/workers_for_platforms.py b/src/cloudflare/resources/workers_for_platforms/workers_for_platforms.py
index 9506783f096..b986656be32 100644
--- a/src/cloudflare/resources/workers_for_platforms/workers_for_platforms.py
+++ b/src/cloudflare/resources/workers_for_platforms/workers_for_platforms.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .dispatch import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .dispatch.dispatch import (
     DispatchResource,
     AsyncDispatchResource,
     DispatchResourceWithRawResponse,
@@ -10,9 +12,6 @@
     DispatchResourceWithStreamingResponse,
     AsyncDispatchResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .dispatch.dispatch import DispatchResource, AsyncDispatchResource
 
 __all__ = ["WorkersForPlatformsResource", "AsyncWorkersForPlatformsResource"]
 
@@ -24,10 +23,21 @@ def dispatch(self) -> DispatchResource:
 
     @cached_property
     def with_raw_response(self) -> WorkersForPlatformsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return WorkersForPlatformsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> WorkersForPlatformsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return WorkersForPlatformsResourceWithStreamingResponse(self)
 
 
@@ -38,10 +48,21 @@ def dispatch(self) -> AsyncDispatchResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncWorkersForPlatformsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncWorkersForPlatformsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncWorkersForPlatformsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncWorkersForPlatformsResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/workflows/__init__.py b/src/cloudflare/resources/workflows/__init__.py
new file mode 100644
index 00000000000..26d888e5e94
--- /dev/null
+++ b/src/cloudflare/resources/workflows/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .versions import (
+    VersionsResource,
+    AsyncVersionsResource,
+    VersionsResourceWithRawResponse,
+    AsyncVersionsResourceWithRawResponse,
+    VersionsResourceWithStreamingResponse,
+    AsyncVersionsResourceWithStreamingResponse,
+)
+from .instances import (
+    InstancesResource,
+    AsyncInstancesResource,
+    InstancesResourceWithRawResponse,
+    AsyncInstancesResourceWithRawResponse,
+    InstancesResourceWithStreamingResponse,
+    AsyncInstancesResourceWithStreamingResponse,
+)
+from .workflows import (
+    WorkflowsResource,
+    AsyncWorkflowsResource,
+    WorkflowsResourceWithRawResponse,
+    AsyncWorkflowsResourceWithRawResponse,
+    WorkflowsResourceWithStreamingResponse,
+    AsyncWorkflowsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "InstancesResource",
+    "AsyncInstancesResource",
+    "InstancesResourceWithRawResponse",
+    "AsyncInstancesResourceWithRawResponse",
+    "InstancesResourceWithStreamingResponse",
+    "AsyncInstancesResourceWithStreamingResponse",
+    "VersionsResource",
+    "AsyncVersionsResource",
+    "VersionsResourceWithRawResponse",
+    "AsyncVersionsResourceWithRawResponse",
+    "VersionsResourceWithStreamingResponse",
+    "AsyncVersionsResourceWithStreamingResponse",
+    "WorkflowsResource",
+    "AsyncWorkflowsResource",
+    "WorkflowsResourceWithRawResponse",
+    "AsyncWorkflowsResourceWithRawResponse",
+    "WorkflowsResourceWithStreamingResponse",
+    "AsyncWorkflowsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/workflows/instances/__init__.py b/src/cloudflare/resources/workflows/instances/__init__.py
new file mode 100644
index 00000000000..eaef3efe5f5
--- /dev/null
+++ b/src/cloudflare/resources/workflows/instances/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .events import (
+    EventsResource,
+    AsyncEventsResource,
+    EventsResourceWithRawResponse,
+    AsyncEventsResourceWithRawResponse,
+    EventsResourceWithStreamingResponse,
+    AsyncEventsResourceWithStreamingResponse,
+)
+from .status import (
+    StatusResource,
+    AsyncStatusResource,
+    StatusResourceWithRawResponse,
+    AsyncStatusResourceWithRawResponse,
+    StatusResourceWithStreamingResponse,
+    AsyncStatusResourceWithStreamingResponse,
+)
+from .instances import (
+    InstancesResource,
+    AsyncInstancesResource,
+    InstancesResourceWithRawResponse,
+    AsyncInstancesResourceWithRawResponse,
+    InstancesResourceWithStreamingResponse,
+    AsyncInstancesResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "StatusResource",
+    "AsyncStatusResource",
+    "StatusResourceWithRawResponse",
+    "AsyncStatusResourceWithRawResponse",
+    "StatusResourceWithStreamingResponse",
+    "AsyncStatusResourceWithStreamingResponse",
+    "EventsResource",
+    "AsyncEventsResource",
+    "EventsResourceWithRawResponse",
+    "AsyncEventsResourceWithRawResponse",
+    "EventsResourceWithStreamingResponse",
+    "AsyncEventsResourceWithStreamingResponse",
+    "InstancesResource",
+    "AsyncInstancesResource",
+    "InstancesResourceWithRawResponse",
+    "AsyncInstancesResourceWithRawResponse",
+    "InstancesResourceWithStreamingResponse",
+    "AsyncInstancesResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/workflows/instances/events.py b/src/cloudflare/resources/workflows/instances/events.py
new file mode 100644
index 00000000000..6c8885c538a
--- /dev/null
+++ b/src/cloudflare/resources/workflows/instances/events.py
@@ -0,0 +1,197 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.workflows.instances import event_create_params
+
+__all__ = ["EventsResource", "AsyncEventsResource"]
+
+
+class EventsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> EventsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return EventsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> EventsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return EventsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        event_type: str,
+        *,
+        account_id: str,
+        workflow_name: str,
+        instance_id: str,
+        body: object | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Send event to instance
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        if not instance_id:
+            raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}")
+        if not event_type:
+            raise ValueError(f"Expected a non-empty value for `event_type` but received {event_type!r}")
+        return self._post(
+            f"/accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}/events/{event_type}",
+            body=maybe_transform(body, event_create_params.EventCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+
+class AsyncEventsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncEventsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncEventsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncEventsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncEventsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        event_type: str,
+        *,
+        account_id: str,
+        workflow_name: str,
+        instance_id: str,
+        body: object | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Send event to instance
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        if not instance_id:
+            raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}")
+        if not event_type:
+            raise ValueError(f"Expected a non-empty value for `event_type` but received {event_type!r}")
+        return await self._post(
+            f"/accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}/events/{event_type}",
+            body=await async_maybe_transform(body, event_create_params.EventCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+
+class EventsResourceWithRawResponse:
+    def __init__(self, events: EventsResource) -> None:
+        self._events = events
+
+        self.create = to_raw_response_wrapper(
+            events.create,
+        )
+
+
+class AsyncEventsResourceWithRawResponse:
+    def __init__(self, events: AsyncEventsResource) -> None:
+        self._events = events
+
+        self.create = async_to_raw_response_wrapper(
+            events.create,
+        )
+
+
+class EventsResourceWithStreamingResponse:
+    def __init__(self, events: EventsResource) -> None:
+        self._events = events
+
+        self.create = to_streamed_response_wrapper(
+            events.create,
+        )
+
+
+class AsyncEventsResourceWithStreamingResponse:
+    def __init__(self, events: AsyncEventsResource) -> None:
+        self._events = events
+
+        self.create = async_to_streamed_response_wrapper(
+            events.create,
+        )
diff --git a/src/cloudflare/resources/workflows/instances/instances.py b/src/cloudflare/resources/workflows/instances/instances.py
new file mode 100644
index 00000000000..7ce3dfdeb52
--- /dev/null
+++ b/src/cloudflare/resources/workflows/instances/instances.py
@@ -0,0 +1,622 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Union, Iterable, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from .events import (
+    EventsResource,
+    AsyncEventsResource,
+    EventsResourceWithRawResponse,
+    AsyncEventsResourceWithRawResponse,
+    EventsResourceWithStreamingResponse,
+    AsyncEventsResourceWithStreamingResponse,
+)
+from .status import (
+    StatusResource,
+    AsyncStatusResource,
+    StatusResourceWithRawResponse,
+    AsyncStatusResourceWithRawResponse,
+    StatusResourceWithStreamingResponse,
+    AsyncStatusResourceWithStreamingResponse,
+)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.workflows import instance_bulk_params, instance_list_params, instance_create_params
+from ....types.workflows.instance_get_response import InstanceGetResponse
+from ....types.workflows.instance_bulk_response import InstanceBulkResponse
+from ....types.workflows.instance_list_response import InstanceListResponse
+from ....types.workflows.instance_create_response import InstanceCreateResponse
+
+__all__ = ["InstancesResource", "AsyncInstancesResource"]
+
+
+class InstancesResource(SyncAPIResource):
+    @cached_property
+    def status(self) -> StatusResource:
+        return StatusResource(self._client)
+
+    @cached_property
+    def events(self) -> EventsResource:
+        return EventsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> InstancesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return InstancesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> InstancesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return InstancesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        workflow_name: str,
+        *,
+        account_id: str,
+        instance_id: str | Omit = omit,
+        instance_retention: instance_create_params.InstanceRetention | Omit = omit,
+        params: object | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InstanceCreateResponse:
+        """
+        Create a new workflow instance
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        return self._post(
+            f"/accounts/{account_id}/workflows/{workflow_name}/instances",
+            body=maybe_transform(
+                {
+                    "instance_id": instance_id,
+                    "instance_retention": instance_retention,
+                    "params": params,
+                },
+                instance_create_params.InstanceCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[InstanceCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InstanceCreateResponse], ResultWrapper[InstanceCreateResponse]),
+        )
+
+    def list(
+        self,
+        workflow_name: str,
+        *,
+        account_id: str,
+        cursor: str | Omit = omit,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal[
+            "queued", "running", "paused", "errored", "terminated", "complete", "waitingForPause", "waiting"
+        ]
+        | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[InstanceListResponse]:
+        """
+        List of workflow instances
+
+        Args:
+          cursor: `page` and `cursor` are mutually exclusive, use one or the other.
+
+          date_end: Accepts ISO 8601 with no timezone offsets and in UTC.
+
+          date_start: Accepts ISO 8601 with no timezone offsets and in UTC.
+
+          direction: should only be used when `cursor` is used, defines a new direction for the
+              cursor
+
+          page: `page` and `cursor` are mutually exclusive, use one or the other.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/workflows/{workflow_name}/instances",
+            page=SyncV4PagePaginationArray[InstanceListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "cursor": cursor,
+                        "date_end": date_end,
+                        "date_start": date_start,
+                        "direction": direction,
+                        "page": page,
+                        "per_page": per_page,
+                        "status": status,
+                    },
+                    instance_list_params.InstanceListParams,
+                ),
+            ),
+            model=InstanceListResponse,
+        )
+
+    def bulk(
+        self,
+        workflow_name: str,
+        *,
+        account_id: str,
+        body: Iterable[instance_bulk_params.Body] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[InstanceBulkResponse]:
+        """
+        Batch create new Workflow instances
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/workflows/{workflow_name}/instances/batch",
+            page=SyncSinglePage[InstanceBulkResponse],
+            body=maybe_transform(body, Iterable[instance_bulk_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=InstanceBulkResponse,
+            method="post",
+        )
+
+    def get(
+        self,
+        instance_id: str,
+        *,
+        account_id: str,
+        workflow_name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InstanceGetResponse:
+        """
+        Get logs and status from instance
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        if not instance_id:
+            raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[InstanceGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InstanceGetResponse], ResultWrapper[InstanceGetResponse]),
+        )
+
+
+class AsyncInstancesResource(AsyncAPIResource):
+    @cached_property
+    def status(self) -> AsyncStatusResource:
+        return AsyncStatusResource(self._client)
+
+    @cached_property
+    def events(self) -> AsyncEventsResource:
+        return AsyncEventsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncInstancesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncInstancesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncInstancesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncInstancesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        workflow_name: str,
+        *,
+        account_id: str,
+        instance_id: str | Omit = omit,
+        instance_retention: instance_create_params.InstanceRetention | Omit = omit,
+        params: object | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InstanceCreateResponse:
+        """
+        Create a new workflow instance
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        return await self._post(
+            f"/accounts/{account_id}/workflows/{workflow_name}/instances",
+            body=await async_maybe_transform(
+                {
+                    "instance_id": instance_id,
+                    "instance_retention": instance_retention,
+                    "params": params,
+                },
+                instance_create_params.InstanceCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[InstanceCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InstanceCreateResponse], ResultWrapper[InstanceCreateResponse]),
+        )
+
+    def list(
+        self,
+        workflow_name: str,
+        *,
+        account_id: str,
+        cursor: str | Omit = omit,
+        date_end: Union[str, datetime] | Omit = omit,
+        date_start: Union[str, datetime] | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal[
+            "queued", "running", "paused", "errored", "terminated", "complete", "waitingForPause", "waiting"
+        ]
+        | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[InstanceListResponse, AsyncV4PagePaginationArray[InstanceListResponse]]:
+        """
+        List of workflow instances
+
+        Args:
+          cursor: `page` and `cursor` are mutually exclusive, use one or the other.
+
+          date_end: Accepts ISO 8601 with no timezone offsets and in UTC.
+
+          date_start: Accepts ISO 8601 with no timezone offsets and in UTC.
+
+          direction: should only be used when `cursor` is used, defines a new direction for the
+              cursor
+
+          page: `page` and `cursor` are mutually exclusive, use one or the other.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/workflows/{workflow_name}/instances",
+            page=AsyncV4PagePaginationArray[InstanceListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "cursor": cursor,
+                        "date_end": date_end,
+                        "date_start": date_start,
+                        "direction": direction,
+                        "page": page,
+                        "per_page": per_page,
+                        "status": status,
+                    },
+                    instance_list_params.InstanceListParams,
+                ),
+            ),
+            model=InstanceListResponse,
+        )
+
+    def bulk(
+        self,
+        workflow_name: str,
+        *,
+        account_id: str,
+        body: Iterable[instance_bulk_params.Body] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[InstanceBulkResponse, AsyncSinglePage[InstanceBulkResponse]]:
+        """
+        Batch create new Workflow instances
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/workflows/{workflow_name}/instances/batch",
+            page=AsyncSinglePage[InstanceBulkResponse],
+            body=maybe_transform(body, Iterable[instance_bulk_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=InstanceBulkResponse,
+            method="post",
+        )
+
+    async def get(
+        self,
+        instance_id: str,
+        *,
+        account_id: str,
+        workflow_name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> InstanceGetResponse:
+        """
+        Get logs and status from instance
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        if not instance_id:
+            raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[InstanceGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[InstanceGetResponse], ResultWrapper[InstanceGetResponse]),
+        )
+
+
+class InstancesResourceWithRawResponse:
+    def __init__(self, instances: InstancesResource) -> None:
+        self._instances = instances
+
+        self.create = to_raw_response_wrapper(
+            instances.create,
+        )
+        self.list = to_raw_response_wrapper(
+            instances.list,
+        )
+        self.bulk = to_raw_response_wrapper(
+            instances.bulk,
+        )
+        self.get = to_raw_response_wrapper(
+            instances.get,
+        )
+
+    @cached_property
+    def status(self) -> StatusResourceWithRawResponse:
+        return StatusResourceWithRawResponse(self._instances.status)
+
+    @cached_property
+    def events(self) -> EventsResourceWithRawResponse:
+        return EventsResourceWithRawResponse(self._instances.events)
+
+
+class AsyncInstancesResourceWithRawResponse:
+    def __init__(self, instances: AsyncInstancesResource) -> None:
+        self._instances = instances
+
+        self.create = async_to_raw_response_wrapper(
+            instances.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            instances.list,
+        )
+        self.bulk = async_to_raw_response_wrapper(
+            instances.bulk,
+        )
+        self.get = async_to_raw_response_wrapper(
+            instances.get,
+        )
+
+    @cached_property
+    def status(self) -> AsyncStatusResourceWithRawResponse:
+        return AsyncStatusResourceWithRawResponse(self._instances.status)
+
+    @cached_property
+    def events(self) -> AsyncEventsResourceWithRawResponse:
+        return AsyncEventsResourceWithRawResponse(self._instances.events)
+
+
+class InstancesResourceWithStreamingResponse:
+    def __init__(self, instances: InstancesResource) -> None:
+        self._instances = instances
+
+        self.create = to_streamed_response_wrapper(
+            instances.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            instances.list,
+        )
+        self.bulk = to_streamed_response_wrapper(
+            instances.bulk,
+        )
+        self.get = to_streamed_response_wrapper(
+            instances.get,
+        )
+
+    @cached_property
+    def status(self) -> StatusResourceWithStreamingResponse:
+        return StatusResourceWithStreamingResponse(self._instances.status)
+
+    @cached_property
+    def events(self) -> EventsResourceWithStreamingResponse:
+        return EventsResourceWithStreamingResponse(self._instances.events)
+
+
+class AsyncInstancesResourceWithStreamingResponse:
+    def __init__(self, instances: AsyncInstancesResource) -> None:
+        self._instances = instances
+
+        self.create = async_to_streamed_response_wrapper(
+            instances.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            instances.list,
+        )
+        self.bulk = async_to_streamed_response_wrapper(
+            instances.bulk,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            instances.get,
+        )
+
+    @cached_property
+    def status(self) -> AsyncStatusResourceWithStreamingResponse:
+        return AsyncStatusResourceWithStreamingResponse(self._instances.status)
+
+    @cached_property
+    def events(self) -> AsyncEventsResourceWithStreamingResponse:
+        return AsyncEventsResourceWithStreamingResponse(self._instances.events)
diff --git a/src/cloudflare/resources/workflows/instances/status.py b/src/cloudflare/resources/workflows/instances/status.py
new file mode 100644
index 00000000000..462b4c4be21
--- /dev/null
+++ b/src/cloudflare/resources/workflows/instances/status.py
@@ -0,0 +1,197 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.workflows.instances import status_edit_params
+from ....types.workflows.instances.status_edit_response import StatusEditResponse
+
+__all__ = ["StatusResource", "AsyncStatusResource"]
+
+
+class StatusResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> StatusResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return StatusResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> StatusResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return StatusResourceWithStreamingResponse(self)
+
+    def edit(
+        self,
+        instance_id: str,
+        *,
+        account_id: str,
+        workflow_name: str,
+        status: Literal["resume", "pause", "terminate", "restart"],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> StatusEditResponse:
+        """
+        Change status of instance
+
+        Args:
+          status: Apply action to instance.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        if not instance_id:
+            raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}/status",
+            body=maybe_transform({"status": status}, status_edit_params.StatusEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[StatusEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[StatusEditResponse], ResultWrapper[StatusEditResponse]),
+        )
+
+
+class AsyncStatusResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncStatusResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncStatusResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncStatusResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncStatusResourceWithStreamingResponse(self)
+
+    async def edit(
+        self,
+        instance_id: str,
+        *,
+        account_id: str,
+        workflow_name: str,
+        status: Literal["resume", "pause", "terminate", "restart"],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> StatusEditResponse:
+        """
+        Change status of instance
+
+        Args:
+          status: Apply action to instance.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        if not instance_id:
+            raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}/status",
+            body=await async_maybe_transform({"status": status}, status_edit_params.StatusEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[StatusEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[StatusEditResponse], ResultWrapper[StatusEditResponse]),
+        )
+
+
+class StatusResourceWithRawResponse:
+    def __init__(self, status: StatusResource) -> None:
+        self._status = status
+
+        self.edit = to_raw_response_wrapper(
+            status.edit,
+        )
+
+
+class AsyncStatusResourceWithRawResponse:
+    def __init__(self, status: AsyncStatusResource) -> None:
+        self._status = status
+
+        self.edit = async_to_raw_response_wrapper(
+            status.edit,
+        )
+
+
+class StatusResourceWithStreamingResponse:
+    def __init__(self, status: StatusResource) -> None:
+        self._status = status
+
+        self.edit = to_streamed_response_wrapper(
+            status.edit,
+        )
+
+
+class AsyncStatusResourceWithStreamingResponse:
+    def __init__(self, status: AsyncStatusResource) -> None:
+        self._status = status
+
+        self.edit = async_to_streamed_response_wrapper(
+            status.edit,
+        )
diff --git a/src/cloudflare/resources/workflows/versions.py b/src/cloudflare/resources/workflows/versions.py
new file mode 100644
index 00000000000..6a965a68a7e
--- /dev/null
+++ b/src/cloudflare/resources/workflows/versions.py
@@ -0,0 +1,300 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.workflows import version_list_params
+from ...types.workflows.version_get_response import VersionGetResponse
+from ...types.workflows.version_list_response import VersionListResponse
+
+__all__ = ["VersionsResource", "AsyncVersionsResource"]
+
+
+class VersionsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> VersionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return VersionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> VersionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return VersionsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        workflow_name: str,
+        *,
+        account_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[VersionListResponse]:
+        """
+        List deployed Workflow versions
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/workflows/{workflow_name}/versions",
+            page=SyncV4PagePaginationArray[VersionListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    version_list_params.VersionListParams,
+                ),
+            ),
+            model=VersionListResponse,
+        )
+
+    def get(
+        self,
+        version_id: str,
+        *,
+        account_id: str,
+        workflow_name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> VersionGetResponse:
+        """
+        Get Workflow version details
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        if not version_id:
+            raise ValueError(f"Expected a non-empty value for `version_id` but received {version_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/workflows/{workflow_name}/versions/{version_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[VersionGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[VersionGetResponse], ResultWrapper[VersionGetResponse]),
+        )
+
+
+class AsyncVersionsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncVersionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncVersionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncVersionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncVersionsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        workflow_name: str,
+        *,
+        account_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[VersionListResponse, AsyncV4PagePaginationArray[VersionListResponse]]:
+        """
+        List deployed Workflow versions
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/workflows/{workflow_name}/versions",
+            page=AsyncV4PagePaginationArray[VersionListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    version_list_params.VersionListParams,
+                ),
+            ),
+            model=VersionListResponse,
+        )
+
+    async def get(
+        self,
+        version_id: str,
+        *,
+        account_id: str,
+        workflow_name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> VersionGetResponse:
+        """
+        Get Workflow version details
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        if not version_id:
+            raise ValueError(f"Expected a non-empty value for `version_id` but received {version_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/workflows/{workflow_name}/versions/{version_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[VersionGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[VersionGetResponse], ResultWrapper[VersionGetResponse]),
+        )
+
+
+class VersionsResourceWithRawResponse:
+    def __init__(self, versions: VersionsResource) -> None:
+        self._versions = versions
+
+        self.list = to_raw_response_wrapper(
+            versions.list,
+        )
+        self.get = to_raw_response_wrapper(
+            versions.get,
+        )
+
+
+class AsyncVersionsResourceWithRawResponse:
+    def __init__(self, versions: AsyncVersionsResource) -> None:
+        self._versions = versions
+
+        self.list = async_to_raw_response_wrapper(
+            versions.list,
+        )
+        self.get = async_to_raw_response_wrapper(
+            versions.get,
+        )
+
+
+class VersionsResourceWithStreamingResponse:
+    def __init__(self, versions: VersionsResource) -> None:
+        self._versions = versions
+
+        self.list = to_streamed_response_wrapper(
+            versions.list,
+        )
+        self.get = to_streamed_response_wrapper(
+            versions.get,
+        )
+
+
+class AsyncVersionsResourceWithStreamingResponse:
+    def __init__(self, versions: AsyncVersionsResource) -> None:
+        self._versions = versions
+
+        self.list = async_to_streamed_response_wrapper(
+            versions.list,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            versions.get,
+        )
diff --git a/src/cloudflare/resources/workflows/workflows.py b/src/cloudflare/resources/workflows/workflows.py
new file mode 100644
index 00000000000..8d7d5fba510
--- /dev/null
+++ b/src/cloudflare/resources/workflows/workflows.py
@@ -0,0 +1,568 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from .versions import (
+    VersionsResource,
+    AsyncVersionsResource,
+    VersionsResourceWithRawResponse,
+    AsyncVersionsResourceWithRawResponse,
+    VersionsResourceWithStreamingResponse,
+    AsyncVersionsResourceWithStreamingResponse,
+)
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.workflows import workflow_list_params, workflow_update_params
+from .instances.instances import (
+    InstancesResource,
+    AsyncInstancesResource,
+    InstancesResourceWithRawResponse,
+    AsyncInstancesResourceWithRawResponse,
+    InstancesResourceWithStreamingResponse,
+    AsyncInstancesResourceWithStreamingResponse,
+)
+from ...types.workflows.workflow_get_response import WorkflowGetResponse
+from ...types.workflows.workflow_list_response import WorkflowListResponse
+from ...types.workflows.workflow_delete_response import WorkflowDeleteResponse
+from ...types.workflows.workflow_update_response import WorkflowUpdateResponse
+
+__all__ = ["WorkflowsResource", "AsyncWorkflowsResource"]
+
+
+class WorkflowsResource(SyncAPIResource):
+    @cached_property
+    def instances(self) -> InstancesResource:
+        return InstancesResource(self._client)
+
+    @cached_property
+    def versions(self) -> VersionsResource:
+        return VersionsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> WorkflowsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return WorkflowsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> WorkflowsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return WorkflowsResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        workflow_name: str,
+        *,
+        account_id: str,
+        class_name: str,
+        script_name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WorkflowUpdateResponse:
+        """
+        Create/modify Workflow
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        return self._put(
+            f"/accounts/{account_id}/workflows/{workflow_name}",
+            body=maybe_transform(
+                {
+                    "class_name": class_name,
+                    "script_name": script_name,
+                },
+                workflow_update_params.WorkflowUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[WorkflowUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[WorkflowUpdateResponse], ResultWrapper[WorkflowUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[WorkflowListResponse]:
+        """
+        List all Workflows
+
+        Args:
+          search: Allows filtering workflows` name.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/workflows",
+            page=SyncV4PagePaginationArray[WorkflowListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    workflow_list_params.WorkflowListParams,
+                ),
+            ),
+            model=WorkflowListResponse,
+        )
+
+    def delete(
+        self,
+        workflow_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WorkflowDeleteResponse:
+        """Deletes a Workflow.
+
+        This only deletes the Workflow and does not delete or modify
+        any Worker associated to this Workflow or bounded to it.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        return self._delete(
+            f"/accounts/{account_id}/workflows/{workflow_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[WorkflowDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[WorkflowDeleteResponse], ResultWrapper[WorkflowDeleteResponse]),
+        )
+
+    def get(
+        self,
+        workflow_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WorkflowGetResponse:
+        """
+        Get Workflow details
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        return self._get(
+            f"/accounts/{account_id}/workflows/{workflow_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[WorkflowGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[WorkflowGetResponse], ResultWrapper[WorkflowGetResponse]),
+        )
+
+
+class AsyncWorkflowsResource(AsyncAPIResource):
+    @cached_property
+    def instances(self) -> AsyncInstancesResource:
+        return AsyncInstancesResource(self._client)
+
+    @cached_property
+    def versions(self) -> AsyncVersionsResource:
+        return AsyncVersionsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncWorkflowsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncWorkflowsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncWorkflowsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncWorkflowsResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        workflow_name: str,
+        *,
+        account_id: str,
+        class_name: str,
+        script_name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WorkflowUpdateResponse:
+        """
+        Create/modify Workflow
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        return await self._put(
+            f"/accounts/{account_id}/workflows/{workflow_name}",
+            body=await async_maybe_transform(
+                {
+                    "class_name": class_name,
+                    "script_name": script_name,
+                },
+                workflow_update_params.WorkflowUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[WorkflowUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[WorkflowUpdateResponse], ResultWrapper[WorkflowUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[WorkflowListResponse, AsyncV4PagePaginationArray[WorkflowListResponse]]:
+        """
+        List all Workflows
+
+        Args:
+          search: Allows filtering workflows` name.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/workflows",
+            page=AsyncV4PagePaginationArray[WorkflowListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    workflow_list_params.WorkflowListParams,
+                ),
+            ),
+            model=WorkflowListResponse,
+        )
+
+    async def delete(
+        self,
+        workflow_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WorkflowDeleteResponse:
+        """Deletes a Workflow.
+
+        This only deletes the Workflow and does not delete or modify
+        any Worker associated to this Workflow or bounded to it.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/workflows/{workflow_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[WorkflowDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[WorkflowDeleteResponse], ResultWrapper[WorkflowDeleteResponse]),
+        )
+
+    async def get(
+        self,
+        workflow_name: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WorkflowGetResponse:
+        """
+        Get Workflow details
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not workflow_name:
+            raise ValueError(f"Expected a non-empty value for `workflow_name` but received {workflow_name!r}")
+        return await self._get(
+            f"/accounts/{account_id}/workflows/{workflow_name}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[WorkflowGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[WorkflowGetResponse], ResultWrapper[WorkflowGetResponse]),
+        )
+
+
+class WorkflowsResourceWithRawResponse:
+    def __init__(self, workflows: WorkflowsResource) -> None:
+        self._workflows = workflows
+
+        self.update = to_raw_response_wrapper(
+            workflows.update,
+        )
+        self.list = to_raw_response_wrapper(
+            workflows.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            workflows.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            workflows.get,
+        )
+
+    @cached_property
+    def instances(self) -> InstancesResourceWithRawResponse:
+        return InstancesResourceWithRawResponse(self._workflows.instances)
+
+    @cached_property
+    def versions(self) -> VersionsResourceWithRawResponse:
+        return VersionsResourceWithRawResponse(self._workflows.versions)
+
+
+class AsyncWorkflowsResourceWithRawResponse:
+    def __init__(self, workflows: AsyncWorkflowsResource) -> None:
+        self._workflows = workflows
+
+        self.update = async_to_raw_response_wrapper(
+            workflows.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            workflows.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            workflows.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            workflows.get,
+        )
+
+    @cached_property
+    def instances(self) -> AsyncInstancesResourceWithRawResponse:
+        return AsyncInstancesResourceWithRawResponse(self._workflows.instances)
+
+    @cached_property
+    def versions(self) -> AsyncVersionsResourceWithRawResponse:
+        return AsyncVersionsResourceWithRawResponse(self._workflows.versions)
+
+
+class WorkflowsResourceWithStreamingResponse:
+    def __init__(self, workflows: WorkflowsResource) -> None:
+        self._workflows = workflows
+
+        self.update = to_streamed_response_wrapper(
+            workflows.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            workflows.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            workflows.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            workflows.get,
+        )
+
+    @cached_property
+    def instances(self) -> InstancesResourceWithStreamingResponse:
+        return InstancesResourceWithStreamingResponse(self._workflows.instances)
+
+    @cached_property
+    def versions(self) -> VersionsResourceWithStreamingResponse:
+        return VersionsResourceWithStreamingResponse(self._workflows.versions)
+
+
+class AsyncWorkflowsResourceWithStreamingResponse:
+    def __init__(self, workflows: AsyncWorkflowsResource) -> None:
+        self._workflows = workflows
+
+        self.update = async_to_streamed_response_wrapper(
+            workflows.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            workflows.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            workflows.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            workflows.get,
+        )
+
+    @cached_property
+    def instances(self) -> AsyncInstancesResourceWithStreamingResponse:
+        return AsyncInstancesResourceWithStreamingResponse(self._workflows.instances)
+
+    @cached_property
+    def versions(self) -> AsyncVersionsResourceWithStreamingResponse:
+        return AsyncVersionsResourceWithStreamingResponse(self._workflows.versions)
diff --git a/src/cloudflare/resources/zaraz/__init__.py b/src/cloudflare/resources/zaraz/__init__.py
new file mode 100644
index 00000000000..d8a2722e12c
--- /dev/null
+++ b/src/cloudflare/resources/zaraz/__init__.py
@@ -0,0 +1,103 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .zaraz import (
+    ZarazResource,
+    AsyncZarazResource,
+    ZarazResourceWithRawResponse,
+    AsyncZarazResourceWithRawResponse,
+    ZarazResourceWithStreamingResponse,
+    AsyncZarazResourceWithStreamingResponse,
+)
+from .config import (
+    ConfigResource,
+    AsyncConfigResource,
+    ConfigResourceWithRawResponse,
+    AsyncConfigResourceWithRawResponse,
+    ConfigResourceWithStreamingResponse,
+    AsyncConfigResourceWithStreamingResponse,
+)
+from .export import (
+    ExportResource,
+    AsyncExportResource,
+    ExportResourceWithRawResponse,
+    AsyncExportResourceWithRawResponse,
+    ExportResourceWithStreamingResponse,
+    AsyncExportResourceWithStreamingResponse,
+)
+from .default import (
+    DefaultResource,
+    AsyncDefaultResource,
+    DefaultResourceWithRawResponse,
+    AsyncDefaultResourceWithRawResponse,
+    DefaultResourceWithStreamingResponse,
+    AsyncDefaultResourceWithStreamingResponse,
+)
+from .history import (
+    HistoryResource,
+    AsyncHistoryResource,
+    HistoryResourceWithRawResponse,
+    AsyncHistoryResourceWithRawResponse,
+    HistoryResourceWithStreamingResponse,
+    AsyncHistoryResourceWithStreamingResponse,
+)
+from .publish import (
+    PublishResource,
+    AsyncPublishResource,
+    PublishResourceWithRawResponse,
+    AsyncPublishResourceWithRawResponse,
+    PublishResourceWithStreamingResponse,
+    AsyncPublishResourceWithStreamingResponse,
+)
+from .workflow import (
+    WorkflowResource,
+    AsyncWorkflowResource,
+    WorkflowResourceWithRawResponse,
+    AsyncWorkflowResourceWithRawResponse,
+    WorkflowResourceWithStreamingResponse,
+    AsyncWorkflowResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ConfigResource",
+    "AsyncConfigResource",
+    "ConfigResourceWithRawResponse",
+    "AsyncConfigResourceWithRawResponse",
+    "ConfigResourceWithStreamingResponse",
+    "AsyncConfigResourceWithStreamingResponse",
+    "DefaultResource",
+    "AsyncDefaultResource",
+    "DefaultResourceWithRawResponse",
+    "AsyncDefaultResourceWithRawResponse",
+    "DefaultResourceWithStreamingResponse",
+    "AsyncDefaultResourceWithStreamingResponse",
+    "ExportResource",
+    "AsyncExportResource",
+    "ExportResourceWithRawResponse",
+    "AsyncExportResourceWithRawResponse",
+    "ExportResourceWithStreamingResponse",
+    "AsyncExportResourceWithStreamingResponse",
+    "HistoryResource",
+    "AsyncHistoryResource",
+    "HistoryResourceWithRawResponse",
+    "AsyncHistoryResourceWithRawResponse",
+    "HistoryResourceWithStreamingResponse",
+    "AsyncHistoryResourceWithStreamingResponse",
+    "PublishResource",
+    "AsyncPublishResource",
+    "PublishResourceWithRawResponse",
+    "AsyncPublishResourceWithRawResponse",
+    "PublishResourceWithStreamingResponse",
+    "AsyncPublishResourceWithStreamingResponse",
+    "WorkflowResource",
+    "AsyncWorkflowResource",
+    "WorkflowResourceWithRawResponse",
+    "AsyncWorkflowResourceWithRawResponse",
+    "WorkflowResourceWithStreamingResponse",
+    "AsyncWorkflowResourceWithStreamingResponse",
+    "ZarazResource",
+    "AsyncZarazResource",
+    "ZarazResourceWithRawResponse",
+    "AsyncZarazResourceWithRawResponse",
+    "ZarazResourceWithStreamingResponse",
+    "AsyncZarazResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zaraz/config.py b/src/cloudflare/resources/zaraz/config.py
new file mode 100644
index 00000000000..5d1b304df81
--- /dev/null
+++ b/src/cloudflare/resources/zaraz/config.py
@@ -0,0 +1,374 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Type, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...types.zaraz import config_update_params
+from ..._base_client import make_request_options
+from ...types.zaraz.configuration import Configuration
+
+__all__ = ["ConfigResource", "AsyncConfigResource"]
+
+
+class ConfigResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ConfigResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ConfigResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ConfigResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ConfigResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        *,
+        zone_id: str,
+        data_layer: bool,
+        debug_key: str,
+        settings: config_update_params.Settings,
+        tools: Dict[str, config_update_params.Tools],
+        triggers: Dict[str, config_update_params.Triggers],
+        variables: Dict[str, config_update_params.Variables],
+        zaraz_version: int,
+        analytics: config_update_params.Analytics | Omit = omit,
+        consent: config_update_params.Consent | Omit = omit,
+        history_change: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Configuration:
+        """
+        Updates Zaraz configuration for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          data_layer: Data layer compatibility mode enabled.
+
+          debug_key: The key for Zaraz debug mode.
+
+          settings: General Zaraz settings.
+
+          tools: Tools set up under Zaraz configuration, where key is the alpha-numeric tool ID
+              and value is the tool configuration object.
+
+          triggers: Triggers set up under Zaraz configuration, where key is the trigger
+              alpha-numeric ID and value is the trigger configuration.
+
+          variables: Variables set up under Zaraz configuration, where key is the variable
+              alpha-numeric ID and value is the variable configuration. Values of variables of
+              type secret are not included.
+
+          zaraz_version: Zaraz internal version of the config.
+
+          analytics: Cloudflare Monitoring settings.
+
+          consent: Consent management configuration.
+
+          history_change: Single Page Application support enabled.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/settings/zaraz/config",
+            body=maybe_transform(
+                {
+                    "data_layer": data_layer,
+                    "debug_key": debug_key,
+                    "settings": settings,
+                    "tools": tools,
+                    "triggers": triggers,
+                    "variables": variables,
+                    "zaraz_version": zaraz_version,
+                    "analytics": analytics,
+                    "consent": consent,
+                    "history_change": history_change,
+                },
+                config_update_params.ConfigUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Configuration]._unwrapper,
+            ),
+            cast_to=cast(Type[Configuration], ResultWrapper[Configuration]),
+        )
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Configuration:
+        """Gets latest Zaraz configuration for a zone.
+
+        It can be preview or published
+        configuration, whichever was the last updated. Secret variables values will not
+        be included.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/settings/zaraz/config",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Configuration]._unwrapper,
+            ),
+            cast_to=cast(Type[Configuration], ResultWrapper[Configuration]),
+        )
+
+
+class AsyncConfigResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncConfigResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncConfigResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncConfigResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncConfigResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        *,
+        zone_id: str,
+        data_layer: bool,
+        debug_key: str,
+        settings: config_update_params.Settings,
+        tools: Dict[str, config_update_params.Tools],
+        triggers: Dict[str, config_update_params.Triggers],
+        variables: Dict[str, config_update_params.Variables],
+        zaraz_version: int,
+        analytics: config_update_params.Analytics | Omit = omit,
+        consent: config_update_params.Consent | Omit = omit,
+        history_change: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Configuration:
+        """
+        Updates Zaraz configuration for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          data_layer: Data layer compatibility mode enabled.
+
+          debug_key: The key for Zaraz debug mode.
+
+          settings: General Zaraz settings.
+
+          tools: Tools set up under Zaraz configuration, where key is the alpha-numeric tool ID
+              and value is the tool configuration object.
+
+          triggers: Triggers set up under Zaraz configuration, where key is the trigger
+              alpha-numeric ID and value is the trigger configuration.
+
+          variables: Variables set up under Zaraz configuration, where key is the variable
+              alpha-numeric ID and value is the variable configuration. Values of variables of
+              type secret are not included.
+
+          zaraz_version: Zaraz internal version of the config.
+
+          analytics: Cloudflare Monitoring settings.
+
+          consent: Consent management configuration.
+
+          history_change: Single Page Application support enabled.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/settings/zaraz/config",
+            body=await async_maybe_transform(
+                {
+                    "data_layer": data_layer,
+                    "debug_key": debug_key,
+                    "settings": settings,
+                    "tools": tools,
+                    "triggers": triggers,
+                    "variables": variables,
+                    "zaraz_version": zaraz_version,
+                    "analytics": analytics,
+                    "consent": consent,
+                    "history_change": history_change,
+                },
+                config_update_params.ConfigUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Configuration]._unwrapper,
+            ),
+            cast_to=cast(Type[Configuration], ResultWrapper[Configuration]),
+        )
+
+    async def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Configuration:
+        """Gets latest Zaraz configuration for a zone.
+
+        It can be preview or published
+        configuration, whichever was the last updated. Secret variables values will not
+        be included.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/settings/zaraz/config",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Configuration]._unwrapper,
+            ),
+            cast_to=cast(Type[Configuration], ResultWrapper[Configuration]),
+        )
+
+
+class ConfigResourceWithRawResponse:
+    def __init__(self, config: ConfigResource) -> None:
+        self._config = config
+
+        self.update = to_raw_response_wrapper(
+            config.update,
+        )
+        self.get = to_raw_response_wrapper(
+            config.get,
+        )
+
+
+class AsyncConfigResourceWithRawResponse:
+    def __init__(self, config: AsyncConfigResource) -> None:
+        self._config = config
+
+        self.update = async_to_raw_response_wrapper(
+            config.update,
+        )
+        self.get = async_to_raw_response_wrapper(
+            config.get,
+        )
+
+
+class ConfigResourceWithStreamingResponse:
+    def __init__(self, config: ConfigResource) -> None:
+        self._config = config
+
+        self.update = to_streamed_response_wrapper(
+            config.update,
+        )
+        self.get = to_streamed_response_wrapper(
+            config.get,
+        )
+
+
+class AsyncConfigResourceWithStreamingResponse:
+    def __init__(self, config: AsyncConfigResource) -> None:
+        self._config = config
+
+        self.update = async_to_streamed_response_wrapper(
+            config.update,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            config.get,
+        )
diff --git a/src/cloudflare/resources/zaraz/default.py b/src/cloudflare/resources/zaraz/default.py
new file mode 100644
index 00000000000..3e800d50847
--- /dev/null
+++ b/src/cloudflare/resources/zaraz/default.py
@@ -0,0 +1,178 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.zaraz.configuration import Configuration
+
+__all__ = ["DefaultResource", "AsyncDefaultResource"]
+
+
+class DefaultResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> DefaultResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return DefaultResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> DefaultResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return DefaultResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Configuration:
+        """
+        Gets default Zaraz configuration for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/settings/zaraz/default",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Configuration]._unwrapper,
+            ),
+            cast_to=cast(Type[Configuration], ResultWrapper[Configuration]),
+        )
+
+
+class AsyncDefaultResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncDefaultResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncDefaultResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncDefaultResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncDefaultResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Configuration:
+        """
+        Gets default Zaraz configuration for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/settings/zaraz/default",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Configuration]._unwrapper,
+            ),
+            cast_to=cast(Type[Configuration], ResultWrapper[Configuration]),
+        )
+
+
+class DefaultResourceWithRawResponse:
+    def __init__(self, default: DefaultResource) -> None:
+        self._default = default
+
+        self.get = to_raw_response_wrapper(
+            default.get,
+        )
+
+
+class AsyncDefaultResourceWithRawResponse:
+    def __init__(self, default: AsyncDefaultResource) -> None:
+        self._default = default
+
+        self.get = async_to_raw_response_wrapper(
+            default.get,
+        )
+
+
+class DefaultResourceWithStreamingResponse:
+    def __init__(self, default: DefaultResource) -> None:
+        self._default = default
+
+        self.get = to_streamed_response_wrapper(
+            default.get,
+        )
+
+
+class AsyncDefaultResourceWithStreamingResponse:
+    def __init__(self, default: AsyncDefaultResource) -> None:
+        self._default = default
+
+        self.get = async_to_streamed_response_wrapper(
+            default.get,
+        )
diff --git a/src/cloudflare/resources/zaraz/export.py b/src/cloudflare/resources/zaraz/export.py
new file mode 100644
index 00000000000..22ecf15a791
--- /dev/null
+++ b/src/cloudflare/resources/zaraz/export.py
@@ -0,0 +1,169 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._base_client import make_request_options
+from ...types.zaraz.configuration import Configuration
+
+__all__ = ["ExportResource", "AsyncExportResource"]
+
+
+class ExportResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ExportResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ExportResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ExportResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ExportResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Configuration:
+        """
+        Exports full current published Zaraz configuration for a zone, secret variables
+        included.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/settings/zaraz/export",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=Configuration,
+        )
+
+
+class AsyncExportResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncExportResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncExportResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncExportResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncExportResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Configuration:
+        """
+        Exports full current published Zaraz configuration for a zone, secret variables
+        included.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/settings/zaraz/export",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=Configuration,
+        )
+
+
+class ExportResourceWithRawResponse:
+    def __init__(self, export: ExportResource) -> None:
+        self._export = export
+
+        self.get = to_raw_response_wrapper(
+            export.get,
+        )
+
+
+class AsyncExportResourceWithRawResponse:
+    def __init__(self, export: AsyncExportResource) -> None:
+        self._export = export
+
+        self.get = async_to_raw_response_wrapper(
+            export.get,
+        )
+
+
+class ExportResourceWithStreamingResponse:
+    def __init__(self, export: ExportResource) -> None:
+        self._export = export
+
+        self.get = to_streamed_response_wrapper(
+            export.get,
+        )
+
+
+class AsyncExportResourceWithStreamingResponse:
+    def __init__(self, export: AsyncExportResource) -> None:
+        self._export = export
+
+        self.get = async_to_streamed_response_wrapper(
+            export.get,
+        )
diff --git a/src/cloudflare/resources/zaraz/history/__init__.py b/src/cloudflare/resources/zaraz/history/__init__.py
new file mode 100644
index 00000000000..c1bebe0f4b5
--- /dev/null
+++ b/src/cloudflare/resources/zaraz/history/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .configs import (
+    ConfigsResource,
+    AsyncConfigsResource,
+    ConfigsResourceWithRawResponse,
+    AsyncConfigsResourceWithRawResponse,
+    ConfigsResourceWithStreamingResponse,
+    AsyncConfigsResourceWithStreamingResponse,
+)
+from .history import (
+    HistoryResource,
+    AsyncHistoryResource,
+    HistoryResourceWithRawResponse,
+    AsyncHistoryResourceWithRawResponse,
+    HistoryResourceWithStreamingResponse,
+    AsyncHistoryResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ConfigsResource",
+    "AsyncConfigsResource",
+    "ConfigsResourceWithRawResponse",
+    "AsyncConfigsResourceWithRawResponse",
+    "ConfigsResourceWithStreamingResponse",
+    "AsyncConfigsResourceWithStreamingResponse",
+    "HistoryResource",
+    "AsyncHistoryResource",
+    "HistoryResourceWithRawResponse",
+    "AsyncHistoryResourceWithRawResponse",
+    "HistoryResourceWithStreamingResponse",
+    "AsyncHistoryResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zaraz/history/configs.py b/src/cloudflare/resources/zaraz/history/configs.py
new file mode 100644
index 00000000000..665467abb7f
--- /dev/null
+++ b/src/cloudflare/resources/zaraz/history/configs.py
@@ -0,0 +1,188 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.zaraz.history import config_get_params
+from ....types.zaraz.history.config_get_response import ConfigGetResponse
+
+__all__ = ["ConfigsResource", "AsyncConfigsResource"]
+
+
+class ConfigsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ConfigsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ConfigsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ConfigsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ConfigsResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        ids: Iterable[int],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ConfigGetResponse:
+        """
+        Gets a history of published Zaraz configurations by ID(s) for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          ids: Comma separated list of Zaraz configuration IDs
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/settings/zaraz/history/configs",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"ids": ids}, config_get_params.ConfigGetParams),
+                post_parser=ResultWrapper[ConfigGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ConfigGetResponse], ResultWrapper[ConfigGetResponse]),
+        )
+
+
+class AsyncConfigsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncConfigsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncConfigsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncConfigsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncConfigsResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        *,
+        zone_id: str,
+        ids: Iterable[int],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ConfigGetResponse:
+        """
+        Gets a history of published Zaraz configurations by ID(s) for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          ids: Comma separated list of Zaraz configuration IDs
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/settings/zaraz/history/configs",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"ids": ids}, config_get_params.ConfigGetParams),
+                post_parser=ResultWrapper[ConfigGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ConfigGetResponse], ResultWrapper[ConfigGetResponse]),
+        )
+
+
+class ConfigsResourceWithRawResponse:
+    def __init__(self, configs: ConfigsResource) -> None:
+        self._configs = configs
+
+        self.get = to_raw_response_wrapper(
+            configs.get,
+        )
+
+
+class AsyncConfigsResourceWithRawResponse:
+    def __init__(self, configs: AsyncConfigsResource) -> None:
+        self._configs = configs
+
+        self.get = async_to_raw_response_wrapper(
+            configs.get,
+        )
+
+
+class ConfigsResourceWithStreamingResponse:
+    def __init__(self, configs: ConfigsResource) -> None:
+        self._configs = configs
+
+        self.get = to_streamed_response_wrapper(
+            configs.get,
+        )
+
+
+class AsyncConfigsResourceWithStreamingResponse:
+    def __init__(self, configs: AsyncConfigsResource) -> None:
+        self._configs = configs
+
+        self.get = async_to_streamed_response_wrapper(
+            configs.get,
+        )
diff --git a/src/cloudflare/resources/zaraz/history/history.py b/src/cloudflare/resources/zaraz/history/history.py
new file mode 100644
index 00000000000..3e92f22636b
--- /dev/null
+++ b/src/cloudflare/resources/zaraz/history/history.py
@@ -0,0 +1,355 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from .configs import (
+    ConfigsResource,
+    AsyncConfigsResource,
+    ConfigsResourceWithRawResponse,
+    AsyncConfigsResourceWithRawResponse,
+    ConfigsResourceWithStreamingResponse,
+    AsyncConfigsResourceWithStreamingResponse,
+)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ....types.zaraz import history_list_params, history_update_params
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.zaraz.configuration import Configuration
+from ....types.zaraz.history_list_response import HistoryListResponse
+
+__all__ = ["HistoryResource", "AsyncHistoryResource"]
+
+
+class HistoryResource(SyncAPIResource):
+    @cached_property
+    def configs(self) -> ConfigsResource:
+        return ConfigsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> HistoryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return HistoryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> HistoryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return HistoryResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        *,
+        zone_id: str,
+        body: int,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Configuration:
+        """
+        Restores a historical published Zaraz configuration by ID for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          body: ID of the Zaraz configuration to restore.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/settings/zaraz/history",
+            body=maybe_transform(body, history_update_params.HistoryUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Configuration]._unwrapper,
+            ),
+            cast_to=cast(Type[Configuration], ResultWrapper[Configuration]),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        sort_field: Literal["id", "user_id", "description", "created_at", "updated_at"] | Omit = omit,
+        sort_order: Literal["DESC", "ASC"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[HistoryListResponse]:
+        """
+        Lists a history of published Zaraz configuration records for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          limit: Maximum amount of results to list. Default value is 10.
+
+          offset: Ordinal number to start listing the results with. Default value is 0.
+
+          sort_field: The field to sort by. Default is updated_at.
+
+          sort_order: Sorting order. Default is DESC.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/settings/zaraz/history",
+            page=SyncSinglePage[HistoryListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "limit": limit,
+                        "offset": offset,
+                        "sort_field": sort_field,
+                        "sort_order": sort_order,
+                    },
+                    history_list_params.HistoryListParams,
+                ),
+            ),
+            model=HistoryListResponse,
+        )
+
+
+class AsyncHistoryResource(AsyncAPIResource):
+    @cached_property
+    def configs(self) -> AsyncConfigsResource:
+        return AsyncConfigsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncHistoryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncHistoryResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncHistoryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncHistoryResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        *,
+        zone_id: str,
+        body: int,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Configuration:
+        """
+        Restores a historical published Zaraz configuration by ID for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          body: ID of the Zaraz configuration to restore.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/settings/zaraz/history",
+            body=await async_maybe_transform(body, history_update_params.HistoryUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Configuration]._unwrapper,
+            ),
+            cast_to=cast(Type[Configuration], ResultWrapper[Configuration]),
+        )
+
+    def list(
+        self,
+        *,
+        zone_id: str,
+        limit: int | Omit = omit,
+        offset: int | Omit = omit,
+        sort_field: Literal["id", "user_id", "description", "created_at", "updated_at"] | Omit = omit,
+        sort_order: Literal["DESC", "ASC"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[HistoryListResponse, AsyncSinglePage[HistoryListResponse]]:
+        """
+        Lists a history of published Zaraz configuration records for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          limit: Maximum amount of results to list. Default value is 10.
+
+          offset: Ordinal number to start listing the results with. Default value is 0.
+
+          sort_field: The field to sort by. Default is updated_at.
+
+          sort_order: Sorting order. Default is DESC.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/settings/zaraz/history",
+            page=AsyncSinglePage[HistoryListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "limit": limit,
+                        "offset": offset,
+                        "sort_field": sort_field,
+                        "sort_order": sort_order,
+                    },
+                    history_list_params.HistoryListParams,
+                ),
+            ),
+            model=HistoryListResponse,
+        )
+
+
+class HistoryResourceWithRawResponse:
+    def __init__(self, history: HistoryResource) -> None:
+        self._history = history
+
+        self.update = to_raw_response_wrapper(
+            history.update,
+        )
+        self.list = to_raw_response_wrapper(
+            history.list,
+        )
+
+    @cached_property
+    def configs(self) -> ConfigsResourceWithRawResponse:
+        return ConfigsResourceWithRawResponse(self._history.configs)
+
+
+class AsyncHistoryResourceWithRawResponse:
+    def __init__(self, history: AsyncHistoryResource) -> None:
+        self._history = history
+
+        self.update = async_to_raw_response_wrapper(
+            history.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            history.list,
+        )
+
+    @cached_property
+    def configs(self) -> AsyncConfigsResourceWithRawResponse:
+        return AsyncConfigsResourceWithRawResponse(self._history.configs)
+
+
+class HistoryResourceWithStreamingResponse:
+    def __init__(self, history: HistoryResource) -> None:
+        self._history = history
+
+        self.update = to_streamed_response_wrapper(
+            history.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            history.list,
+        )
+
+    @cached_property
+    def configs(self) -> ConfigsResourceWithStreamingResponse:
+        return ConfigsResourceWithStreamingResponse(self._history.configs)
+
+
+class AsyncHistoryResourceWithStreamingResponse:
+    def __init__(self, history: AsyncHistoryResource) -> None:
+        self._history = history
+
+        self.update = async_to_streamed_response_wrapper(
+            history.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            history.list,
+        )
+
+    @cached_property
+    def configs(self) -> AsyncConfigsResourceWithStreamingResponse:
+        return AsyncConfigsResourceWithStreamingResponse(self._history.configs)
diff --git a/src/cloudflare/resources/zaraz/publish.py b/src/cloudflare/resources/zaraz/publish.py
new file mode 100644
index 00000000000..5c3e4db9d5f
--- /dev/null
+++ b/src/cloudflare/resources/zaraz/publish.py
@@ -0,0 +1,188 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...types.zaraz import publish_create_params
+from ..._base_client import make_request_options
+from ...types.zaraz.publish_create_response import PublishCreateResponse
+
+__all__ = ["PublishResource", "AsyncPublishResource"]
+
+
+class PublishResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> PublishResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return PublishResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> PublishResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return PublishResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        zone_id: str,
+        body: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Publish current Zaraz preview configuration for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          body: Zaraz configuration description.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/settings/zaraz/publish",
+            body=maybe_transform(body, publish_create_params.PublishCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PublishCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class AsyncPublishResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncPublishResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncPublishResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncPublishResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncPublishResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        zone_id: str,
+        body: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Publish current Zaraz preview configuration for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          body: Zaraz configuration description.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/settings/zaraz/publish",
+            body=await async_maybe_transform(body, publish_create_params.PublishCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PublishCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class PublishResourceWithRawResponse:
+    def __init__(self, publish: PublishResource) -> None:
+        self._publish = publish
+
+        self.create = to_raw_response_wrapper(
+            publish.create,
+        )
+
+
+class AsyncPublishResourceWithRawResponse:
+    def __init__(self, publish: AsyncPublishResource) -> None:
+        self._publish = publish
+
+        self.create = async_to_raw_response_wrapper(
+            publish.create,
+        )
+
+
+class PublishResourceWithStreamingResponse:
+    def __init__(self, publish: PublishResource) -> None:
+        self._publish = publish
+
+        self.create = to_streamed_response_wrapper(
+            publish.create,
+        )
+
+
+class AsyncPublishResourceWithStreamingResponse:
+    def __init__(self, publish: AsyncPublishResource) -> None:
+        self._publish = publish
+
+        self.create = async_to_streamed_response_wrapper(
+            publish.create,
+        )
diff --git a/src/cloudflare/resources/zaraz/workflow.py b/src/cloudflare/resources/zaraz/workflow.py
new file mode 100644
index 00000000000..0497a24bea6
--- /dev/null
+++ b/src/cloudflare/resources/zaraz/workflow.py
@@ -0,0 +1,182 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Any, cast
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ..._base_client import make_request_options
+from ...types.zaraz.workflow import Workflow
+
+__all__ = ["WorkflowResource", "AsyncWorkflowResource"]
+
+
+class WorkflowResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> WorkflowResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return WorkflowResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> WorkflowResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return WorkflowResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Workflow:
+        """
+        Gets Zaraz workflow for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/settings/zaraz/workflow",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Workflow]._unwrapper,
+            ),
+            cast_to=cast(
+                Any, ResultWrapper[Workflow]
+            ),  # Enum types cannot be passed in as arguments in the type system
+        )
+
+
+class AsyncWorkflowResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncWorkflowResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncWorkflowResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncWorkflowResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncWorkflowResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Workflow:
+        """
+        Gets Zaraz workflow for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/settings/zaraz/workflow",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Workflow]._unwrapper,
+            ),
+            cast_to=cast(
+                Any, ResultWrapper[Workflow]
+            ),  # Enum types cannot be passed in as arguments in the type system
+        )
+
+
+class WorkflowResourceWithRawResponse:
+    def __init__(self, workflow: WorkflowResource) -> None:
+        self._workflow = workflow
+
+        self.get = to_raw_response_wrapper(
+            workflow.get,
+        )
+
+
+class AsyncWorkflowResourceWithRawResponse:
+    def __init__(self, workflow: AsyncWorkflowResource) -> None:
+        self._workflow = workflow
+
+        self.get = async_to_raw_response_wrapper(
+            workflow.get,
+        )
+
+
+class WorkflowResourceWithStreamingResponse:
+    def __init__(self, workflow: WorkflowResource) -> None:
+        self._workflow = workflow
+
+        self.get = to_streamed_response_wrapper(
+            workflow.get,
+        )
+
+
+class AsyncWorkflowResourceWithStreamingResponse:
+    def __init__(self, workflow: AsyncWorkflowResource) -> None:
+        self._workflow = workflow
+
+        self.get = async_to_streamed_response_wrapper(
+            workflow.get,
+        )
diff --git a/src/cloudflare/resources/zaraz/zaraz.py b/src/cloudflare/resources/zaraz/zaraz.py
new file mode 100644
index 00000000000..c49c4e4c179
--- /dev/null
+++ b/src/cloudflare/resources/zaraz/zaraz.py
@@ -0,0 +1,384 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Any, cast
+
+import httpx
+
+from .config import (
+    ConfigResource,
+    AsyncConfigResource,
+    ConfigResourceWithRawResponse,
+    AsyncConfigResourceWithRawResponse,
+    ConfigResourceWithStreamingResponse,
+    AsyncConfigResourceWithStreamingResponse,
+)
+from .export import (
+    ExportResource,
+    AsyncExportResource,
+    ExportResourceWithRawResponse,
+    AsyncExportResourceWithRawResponse,
+    ExportResourceWithStreamingResponse,
+    AsyncExportResourceWithStreamingResponse,
+)
+from .default import (
+    DefaultResource,
+    AsyncDefaultResource,
+    DefaultResourceWithRawResponse,
+    AsyncDefaultResourceWithRawResponse,
+    DefaultResourceWithStreamingResponse,
+    AsyncDefaultResourceWithStreamingResponse,
+)
+from .publish import (
+    PublishResource,
+    AsyncPublishResource,
+    PublishResourceWithRawResponse,
+    AsyncPublishResourceWithRawResponse,
+    PublishResourceWithStreamingResponse,
+    AsyncPublishResourceWithStreamingResponse,
+)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform, async_maybe_transform
+from .workflow import (
+    WorkflowResource,
+    AsyncWorkflowResource,
+    WorkflowResourceWithRawResponse,
+    AsyncWorkflowResourceWithRawResponse,
+    WorkflowResourceWithStreamingResponse,
+    AsyncWorkflowResourceWithStreamingResponse,
+)
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ..._wrappers import ResultWrapper
+from ...types.zaraz import Workflow, zaraz_update_params
+from ..._base_client import make_request_options
+from .history.history import (
+    HistoryResource,
+    AsyncHistoryResource,
+    HistoryResourceWithRawResponse,
+    AsyncHistoryResourceWithRawResponse,
+    HistoryResourceWithStreamingResponse,
+    AsyncHistoryResourceWithStreamingResponse,
+)
+from ...types.zaraz.workflow import Workflow
+
+__all__ = ["ZarazResource", "AsyncZarazResource"]
+
+
+class ZarazResource(SyncAPIResource):
+    @cached_property
+    def config(self) -> ConfigResource:
+        return ConfigResource(self._client)
+
+    @cached_property
+    def default(self) -> DefaultResource:
+        return DefaultResource(self._client)
+
+    @cached_property
+    def export(self) -> ExportResource:
+        return ExportResource(self._client)
+
+    @cached_property
+    def history(self) -> HistoryResource:
+        return HistoryResource(self._client)
+
+    @cached_property
+    def publish(self) -> PublishResource:
+        return PublishResource(self._client)
+
+    @cached_property
+    def workflow(self) -> WorkflowResource:
+        return WorkflowResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> ZarazResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ZarazResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ZarazResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ZarazResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        *,
+        zone_id: str,
+        workflow: Workflow,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Workflow:
+        """
+        Updates Zaraz workflow for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          workflow: Zaraz workflow
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/settings/zaraz/workflow",
+            body=maybe_transform(workflow, zaraz_update_params.ZarazUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Workflow]._unwrapper,
+            ),
+            cast_to=cast(
+                Any, ResultWrapper[Workflow]
+            ),  # Enum types cannot be passed in as arguments in the type system
+        )
+
+
+class AsyncZarazResource(AsyncAPIResource):
+    @cached_property
+    def config(self) -> AsyncConfigResource:
+        return AsyncConfigResource(self._client)
+
+    @cached_property
+    def default(self) -> AsyncDefaultResource:
+        return AsyncDefaultResource(self._client)
+
+    @cached_property
+    def export(self) -> AsyncExportResource:
+        return AsyncExportResource(self._client)
+
+    @cached_property
+    def history(self) -> AsyncHistoryResource:
+        return AsyncHistoryResource(self._client)
+
+    @cached_property
+    def publish(self) -> AsyncPublishResource:
+        return AsyncPublishResource(self._client)
+
+    @cached_property
+    def workflow(self) -> AsyncWorkflowResource:
+        return AsyncWorkflowResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncZarazResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncZarazResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncZarazResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncZarazResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        *,
+        zone_id: str,
+        workflow: Workflow,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Workflow:
+        """
+        Updates Zaraz workflow for a zone.
+
+        Args:
+          zone_id: Identifier.
+
+          workflow: Zaraz workflow
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/settings/zaraz/workflow",
+            body=await async_maybe_transform(workflow, zaraz_update_params.ZarazUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Workflow]._unwrapper,
+            ),
+            cast_to=cast(
+                Any, ResultWrapper[Workflow]
+            ),  # Enum types cannot be passed in as arguments in the type system
+        )
+
+
+class ZarazResourceWithRawResponse:
+    def __init__(self, zaraz: ZarazResource) -> None:
+        self._zaraz = zaraz
+
+        self.update = to_raw_response_wrapper(
+            zaraz.update,
+        )
+
+    @cached_property
+    def config(self) -> ConfigResourceWithRawResponse:
+        return ConfigResourceWithRawResponse(self._zaraz.config)
+
+    @cached_property
+    def default(self) -> DefaultResourceWithRawResponse:
+        return DefaultResourceWithRawResponse(self._zaraz.default)
+
+    @cached_property
+    def export(self) -> ExportResourceWithRawResponse:
+        return ExportResourceWithRawResponse(self._zaraz.export)
+
+    @cached_property
+    def history(self) -> HistoryResourceWithRawResponse:
+        return HistoryResourceWithRawResponse(self._zaraz.history)
+
+    @cached_property
+    def publish(self) -> PublishResourceWithRawResponse:
+        return PublishResourceWithRawResponse(self._zaraz.publish)
+
+    @cached_property
+    def workflow(self) -> WorkflowResourceWithRawResponse:
+        return WorkflowResourceWithRawResponse(self._zaraz.workflow)
+
+
+class AsyncZarazResourceWithRawResponse:
+    def __init__(self, zaraz: AsyncZarazResource) -> None:
+        self._zaraz = zaraz
+
+        self.update = async_to_raw_response_wrapper(
+            zaraz.update,
+        )
+
+    @cached_property
+    def config(self) -> AsyncConfigResourceWithRawResponse:
+        return AsyncConfigResourceWithRawResponse(self._zaraz.config)
+
+    @cached_property
+    def default(self) -> AsyncDefaultResourceWithRawResponse:
+        return AsyncDefaultResourceWithRawResponse(self._zaraz.default)
+
+    @cached_property
+    def export(self) -> AsyncExportResourceWithRawResponse:
+        return AsyncExportResourceWithRawResponse(self._zaraz.export)
+
+    @cached_property
+    def history(self) -> AsyncHistoryResourceWithRawResponse:
+        return AsyncHistoryResourceWithRawResponse(self._zaraz.history)
+
+    @cached_property
+    def publish(self) -> AsyncPublishResourceWithRawResponse:
+        return AsyncPublishResourceWithRawResponse(self._zaraz.publish)
+
+    @cached_property
+    def workflow(self) -> AsyncWorkflowResourceWithRawResponse:
+        return AsyncWorkflowResourceWithRawResponse(self._zaraz.workflow)
+
+
+class ZarazResourceWithStreamingResponse:
+    def __init__(self, zaraz: ZarazResource) -> None:
+        self._zaraz = zaraz
+
+        self.update = to_streamed_response_wrapper(
+            zaraz.update,
+        )
+
+    @cached_property
+    def config(self) -> ConfigResourceWithStreamingResponse:
+        return ConfigResourceWithStreamingResponse(self._zaraz.config)
+
+    @cached_property
+    def default(self) -> DefaultResourceWithStreamingResponse:
+        return DefaultResourceWithStreamingResponse(self._zaraz.default)
+
+    @cached_property
+    def export(self) -> ExportResourceWithStreamingResponse:
+        return ExportResourceWithStreamingResponse(self._zaraz.export)
+
+    @cached_property
+    def history(self) -> HistoryResourceWithStreamingResponse:
+        return HistoryResourceWithStreamingResponse(self._zaraz.history)
+
+    @cached_property
+    def publish(self) -> PublishResourceWithStreamingResponse:
+        return PublishResourceWithStreamingResponse(self._zaraz.publish)
+
+    @cached_property
+    def workflow(self) -> WorkflowResourceWithStreamingResponse:
+        return WorkflowResourceWithStreamingResponse(self._zaraz.workflow)
+
+
+class AsyncZarazResourceWithStreamingResponse:
+    def __init__(self, zaraz: AsyncZarazResource) -> None:
+        self._zaraz = zaraz
+
+        self.update = async_to_streamed_response_wrapper(
+            zaraz.update,
+        )
+
+    @cached_property
+    def config(self) -> AsyncConfigResourceWithStreamingResponse:
+        return AsyncConfigResourceWithStreamingResponse(self._zaraz.config)
+
+    @cached_property
+    def default(self) -> AsyncDefaultResourceWithStreamingResponse:
+        return AsyncDefaultResourceWithStreamingResponse(self._zaraz.default)
+
+    @cached_property
+    def export(self) -> AsyncExportResourceWithStreamingResponse:
+        return AsyncExportResourceWithStreamingResponse(self._zaraz.export)
+
+    @cached_property
+    def history(self) -> AsyncHistoryResourceWithStreamingResponse:
+        return AsyncHistoryResourceWithStreamingResponse(self._zaraz.history)
+
+    @cached_property
+    def publish(self) -> AsyncPublishResourceWithStreamingResponse:
+        return AsyncPublishResourceWithStreamingResponse(self._zaraz.publish)
+
+    @cached_property
+    def workflow(self) -> AsyncWorkflowResourceWithStreamingResponse:
+        return AsyncWorkflowResourceWithStreamingResponse(self._zaraz.workflow)
diff --git a/src/cloudflare/resources/zero_trust/access/__init__.py b/src/cloudflare/resources/zero_trust/access/__init__.py
index d3fe1996f9d..12741a78e84 100644
--- a/src/cloudflare/resources/zero_trust/access/__init__.py
+++ b/src/cloudflare/resources/zero_trust/access/__init__.py
@@ -64,6 +64,22 @@
     BookmarksResourceWithStreamingResponse,
     AsyncBookmarksResourceWithStreamingResponse,
 )
+from .gateway_ca import (
+    GatewayCAResource,
+    AsyncGatewayCAResource,
+    GatewayCAResourceWithRawResponse,
+    AsyncGatewayCAResourceWithRawResponse,
+    GatewayCAResourceWithStreamingResponse,
+    AsyncGatewayCAResourceWithStreamingResponse,
+)
+from .ai_controls import (
+    AIControlsResource,
+    AsyncAIControlsResource,
+    AIControlsResourceWithRawResponse,
+    AsyncAIControlsResourceWithRawResponse,
+    AIControlsResourceWithStreamingResponse,
+    AsyncAIControlsResourceWithStreamingResponse,
+)
 from .applications import (
     ApplicationsResource,
     AsyncApplicationsResource,
@@ -88,6 +104,14 @@
     CustomPagesResourceWithStreamingResponse,
     AsyncCustomPagesResourceWithStreamingResponse,
 )
+from .infrastructure import (
+    InfrastructureResource,
+    AsyncInfrastructureResource,
+    InfrastructureResourceWithRawResponse,
+    AsyncInfrastructureResourceWithRawResponse,
+    InfrastructureResourceWithStreamingResponse,
+    AsyncInfrastructureResourceWithStreamingResponse,
+)
 from .service_tokens import (
     ServiceTokensResource,
     AsyncServiceTokensResource,
@@ -98,6 +122,24 @@
 )
 
 __all__ = [
+    "AIControlsResource",
+    "AsyncAIControlsResource",
+    "AIControlsResourceWithRawResponse",
+    "AsyncAIControlsResourceWithRawResponse",
+    "AIControlsResourceWithStreamingResponse",
+    "AsyncAIControlsResourceWithStreamingResponse",
+    "GatewayCAResource",
+    "AsyncGatewayCAResource",
+    "GatewayCAResourceWithRawResponse",
+    "AsyncGatewayCAResourceWithRawResponse",
+    "GatewayCAResourceWithStreamingResponse",
+    "AsyncGatewayCAResourceWithStreamingResponse",
+    "InfrastructureResource",
+    "AsyncInfrastructureResource",
+    "InfrastructureResourceWithRawResponse",
+    "AsyncInfrastructureResourceWithRawResponse",
+    "InfrastructureResourceWithStreamingResponse",
+    "AsyncInfrastructureResourceWithStreamingResponse",
     "ApplicationsResource",
     "AsyncApplicationsResource",
     "ApplicationsResourceWithRawResponse",
diff --git a/src/cloudflare/resources/zero_trust/access/access.py b/src/cloudflare/resources/zero_trust/access/access.py
index b0be13c5cb8..360e52852e5 100644
--- a/src/cloudflare/resources/zero_trust/access/access.py
+++ b/src/cloudflare/resources/zero_trust/access/access.py
@@ -10,14 +10,6 @@
     KeysResourceWithStreamingResponse,
     AsyncKeysResourceWithStreamingResponse,
 )
-from .logs import (
-    LogsResource,
-    AsyncLogsResource,
-    LogsResourceWithRawResponse,
-    AsyncLogsResourceWithRawResponse,
-    LogsResourceWithStreamingResponse,
-    AsyncLogsResourceWithStreamingResponse,
-)
 from .tags import (
     TagsResource,
     AsyncTagsResource,
@@ -26,14 +18,6 @@
     TagsResourceWithStreamingResponse,
     AsyncTagsResourceWithStreamingResponse,
 )
-from .users import (
-    UsersResource,
-    AsyncUsersResource,
-    UsersResourceWithRawResponse,
-    AsyncUsersResourceWithRawResponse,
-    UsersResourceWithStreamingResponse,
-    AsyncUsersResourceWithStreamingResponse,
-)
 from .groups import (
     GroupsResource,
     AsyncGroupsResource,
@@ -58,26 +42,32 @@
     BookmarksResourceWithStreamingResponse,
     AsyncBookmarksResourceWithStreamingResponse,
 )
-from .logs.logs import LogsResource, AsyncLogsResource
+from .logs.logs import (
+    LogsResource,
+    AsyncLogsResource,
+    LogsResourceWithRawResponse,
+    AsyncLogsResourceWithRawResponse,
+    LogsResourceWithStreamingResponse,
+    AsyncLogsResourceWithStreamingResponse,
+)
 from ...._compat import cached_property
-from .users.users import UsersResource, AsyncUsersResource
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from .applications import (
-    ApplicationsResource,
-    AsyncApplicationsResource,
-    ApplicationsResourceWithRawResponse,
-    AsyncApplicationsResourceWithRawResponse,
-    ApplicationsResourceWithStreamingResponse,
-    AsyncApplicationsResourceWithStreamingResponse,
+from .gateway_ca import (
+    GatewayCAResource,
+    AsyncGatewayCAResource,
+    GatewayCAResourceWithRawResponse,
+    AsyncGatewayCAResourceWithRawResponse,
+    GatewayCAResourceWithStreamingResponse,
+    AsyncGatewayCAResourceWithStreamingResponse,
 )
-from .certificates import (
-    CertificatesResource,
-    AsyncCertificatesResource,
-    CertificatesResourceWithRawResponse,
-    AsyncCertificatesResourceWithRawResponse,
-    CertificatesResourceWithStreamingResponse,
-    AsyncCertificatesResourceWithStreamingResponse,
+from .users.users import (
+    UsersResource,
+    AsyncUsersResource,
+    UsersResourceWithRawResponse,
+    AsyncUsersResourceWithRawResponse,
+    UsersResourceWithStreamingResponse,
+    AsyncUsersResourceWithStreamingResponse,
 )
+from ...._resource import SyncAPIResource, AsyncAPIResource
 from .custom_pages import (
     CustomPagesResource,
     AsyncCustomPagesResource,
@@ -94,13 +84,55 @@
     ServiceTokensResourceWithStreamingResponse,
     AsyncServiceTokensResourceWithStreamingResponse,
 )
-from .applications.applications import ApplicationsResource, AsyncApplicationsResource
-from .certificates.certificates import CertificatesResource, AsyncCertificatesResource
+from .ai_controls.ai_controls import (
+    AIControlsResource,
+    AsyncAIControlsResource,
+    AIControlsResourceWithRawResponse,
+    AsyncAIControlsResourceWithRawResponse,
+    AIControlsResourceWithStreamingResponse,
+    AsyncAIControlsResourceWithStreamingResponse,
+)
+from .applications.applications import (
+    ApplicationsResource,
+    AsyncApplicationsResource,
+    ApplicationsResourceWithRawResponse,
+    AsyncApplicationsResourceWithRawResponse,
+    ApplicationsResourceWithStreamingResponse,
+    AsyncApplicationsResourceWithStreamingResponse,
+)
+from .certificates.certificates import (
+    CertificatesResource,
+    AsyncCertificatesResource,
+    CertificatesResourceWithRawResponse,
+    AsyncCertificatesResourceWithRawResponse,
+    CertificatesResourceWithStreamingResponse,
+    AsyncCertificatesResourceWithStreamingResponse,
+)
+from .infrastructure.infrastructure import (
+    InfrastructureResource,
+    AsyncInfrastructureResource,
+    InfrastructureResourceWithRawResponse,
+    AsyncInfrastructureResourceWithRawResponse,
+    InfrastructureResourceWithStreamingResponse,
+    AsyncInfrastructureResourceWithStreamingResponse,
+)
 
 __all__ = ["AccessResource", "AsyncAccessResource"]
 
 
 class AccessResource(SyncAPIResource):
+    @cached_property
+    def ai_controls(self) -> AIControlsResource:
+        return AIControlsResource(self._client)
+
+    @cached_property
+    def gateway_ca(self) -> GatewayCAResource:
+        return GatewayCAResource(self._client)
+
+    @cached_property
+    def infrastructure(self) -> InfrastructureResource:
+        return InfrastructureResource(self._client)
+
     @cached_property
     def applications(self) -> ApplicationsResource:
         return ApplicationsResource(self._client)
@@ -147,14 +179,37 @@ def policies(self) -> PoliciesResource:
 
     @cached_property
     def with_raw_response(self) -> AccessResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AccessResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AccessResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AccessResourceWithStreamingResponse(self)
 
 
 class AsyncAccessResource(AsyncAPIResource):
+    @cached_property
+    def ai_controls(self) -> AsyncAIControlsResource:
+        return AsyncAIControlsResource(self._client)
+
+    @cached_property
+    def gateway_ca(self) -> AsyncGatewayCAResource:
+        return AsyncGatewayCAResource(self._client)
+
+    @cached_property
+    def infrastructure(self) -> AsyncInfrastructureResource:
+        return AsyncInfrastructureResource(self._client)
+
     @cached_property
     def applications(self) -> AsyncApplicationsResource:
         return AsyncApplicationsResource(self._client)
@@ -201,10 +256,21 @@ def policies(self) -> AsyncPoliciesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncAccessResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAccessResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAccessResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAccessResourceWithStreamingResponse(self)
 
 
@@ -212,6 +278,18 @@ class AccessResourceWithRawResponse:
     def __init__(self, access: AccessResource) -> None:
         self._access = access
 
+    @cached_property
+    def ai_controls(self) -> AIControlsResourceWithRawResponse:
+        return AIControlsResourceWithRawResponse(self._access.ai_controls)
+
+    @cached_property
+    def gateway_ca(self) -> GatewayCAResourceWithRawResponse:
+        return GatewayCAResourceWithRawResponse(self._access.gateway_ca)
+
+    @cached_property
+    def infrastructure(self) -> InfrastructureResourceWithRawResponse:
+        return InfrastructureResourceWithRawResponse(self._access.infrastructure)
+
     @cached_property
     def applications(self) -> ApplicationsResourceWithRawResponse:
         return ApplicationsResourceWithRawResponse(self._access.applications)
@@ -261,6 +339,18 @@ class AsyncAccessResourceWithRawResponse:
     def __init__(self, access: AsyncAccessResource) -> None:
         self._access = access
 
+    @cached_property
+    def ai_controls(self) -> AsyncAIControlsResourceWithRawResponse:
+        return AsyncAIControlsResourceWithRawResponse(self._access.ai_controls)
+
+    @cached_property
+    def gateway_ca(self) -> AsyncGatewayCAResourceWithRawResponse:
+        return AsyncGatewayCAResourceWithRawResponse(self._access.gateway_ca)
+
+    @cached_property
+    def infrastructure(self) -> AsyncInfrastructureResourceWithRawResponse:
+        return AsyncInfrastructureResourceWithRawResponse(self._access.infrastructure)
+
     @cached_property
     def applications(self) -> AsyncApplicationsResourceWithRawResponse:
         return AsyncApplicationsResourceWithRawResponse(self._access.applications)
@@ -310,6 +400,18 @@ class AccessResourceWithStreamingResponse:
     def __init__(self, access: AccessResource) -> None:
         self._access = access
 
+    @cached_property
+    def ai_controls(self) -> AIControlsResourceWithStreamingResponse:
+        return AIControlsResourceWithStreamingResponse(self._access.ai_controls)
+
+    @cached_property
+    def gateway_ca(self) -> GatewayCAResourceWithStreamingResponse:
+        return GatewayCAResourceWithStreamingResponse(self._access.gateway_ca)
+
+    @cached_property
+    def infrastructure(self) -> InfrastructureResourceWithStreamingResponse:
+        return InfrastructureResourceWithStreamingResponse(self._access.infrastructure)
+
     @cached_property
     def applications(self) -> ApplicationsResourceWithStreamingResponse:
         return ApplicationsResourceWithStreamingResponse(self._access.applications)
@@ -359,6 +461,18 @@ class AsyncAccessResourceWithStreamingResponse:
     def __init__(self, access: AsyncAccessResource) -> None:
         self._access = access
 
+    @cached_property
+    def ai_controls(self) -> AsyncAIControlsResourceWithStreamingResponse:
+        return AsyncAIControlsResourceWithStreamingResponse(self._access.ai_controls)
+
+    @cached_property
+    def gateway_ca(self) -> AsyncGatewayCAResourceWithStreamingResponse:
+        return AsyncGatewayCAResourceWithStreamingResponse(self._access.gateway_ca)
+
+    @cached_property
+    def infrastructure(self) -> AsyncInfrastructureResourceWithStreamingResponse:
+        return AsyncInfrastructureResourceWithStreamingResponse(self._access.infrastructure)
+
     @cached_property
     def applications(self) -> AsyncApplicationsResourceWithStreamingResponse:
         return AsyncApplicationsResourceWithStreamingResponse(self._access.applications)
diff --git a/src/cloudflare/resources/zero_trust/access/ai_controls/__init__.py b/src/cloudflare/resources/zero_trust/access/ai_controls/__init__.py
new file mode 100644
index 00000000000..0d80fd6feea
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/access/ai_controls/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .mcp import (
+    McpResource,
+    AsyncMcpResource,
+    McpResourceWithRawResponse,
+    AsyncMcpResourceWithRawResponse,
+    McpResourceWithStreamingResponse,
+    AsyncMcpResourceWithStreamingResponse,
+)
+from .ai_controls import (
+    AIControlsResource,
+    AsyncAIControlsResource,
+    AIControlsResourceWithRawResponse,
+    AsyncAIControlsResourceWithRawResponse,
+    AIControlsResourceWithStreamingResponse,
+    AsyncAIControlsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "McpResource",
+    "AsyncMcpResource",
+    "McpResourceWithRawResponse",
+    "AsyncMcpResourceWithRawResponse",
+    "McpResourceWithStreamingResponse",
+    "AsyncMcpResourceWithStreamingResponse",
+    "AIControlsResource",
+    "AsyncAIControlsResource",
+    "AIControlsResourceWithRawResponse",
+    "AsyncAIControlsResourceWithRawResponse",
+    "AIControlsResourceWithStreamingResponse",
+    "AsyncAIControlsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/access/ai_controls/ai_controls.py b/src/cloudflare/resources/zero_trust/access/ai_controls/ai_controls.py
new file mode 100644
index 00000000000..02ece7bf240
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/access/ai_controls/ai_controls.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .mcp.mcp import (
+    McpResource,
+    AsyncMcpResource,
+    McpResourceWithRawResponse,
+    AsyncMcpResourceWithRawResponse,
+    McpResourceWithStreamingResponse,
+    AsyncMcpResourceWithStreamingResponse,
+)
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["AIControlsResource", "AsyncAIControlsResource"]
+
+
+class AIControlsResource(SyncAPIResource):
+    @cached_property
+    def mcp(self) -> McpResource:
+        return McpResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AIControlsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AIControlsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AIControlsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AIControlsResourceWithStreamingResponse(self)
+
+
+class AsyncAIControlsResource(AsyncAPIResource):
+    @cached_property
+    def mcp(self) -> AsyncMcpResource:
+        return AsyncMcpResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncAIControlsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAIControlsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAIControlsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAIControlsResourceWithStreamingResponse(self)
+
+
+class AIControlsResourceWithRawResponse:
+    def __init__(self, ai_controls: AIControlsResource) -> None:
+        self._ai_controls = ai_controls
+
+    @cached_property
+    def mcp(self) -> McpResourceWithRawResponse:
+        return McpResourceWithRawResponse(self._ai_controls.mcp)
+
+
+class AsyncAIControlsResourceWithRawResponse:
+    def __init__(self, ai_controls: AsyncAIControlsResource) -> None:
+        self._ai_controls = ai_controls
+
+    @cached_property
+    def mcp(self) -> AsyncMcpResourceWithRawResponse:
+        return AsyncMcpResourceWithRawResponse(self._ai_controls.mcp)
+
+
+class AIControlsResourceWithStreamingResponse:
+    def __init__(self, ai_controls: AIControlsResource) -> None:
+        self._ai_controls = ai_controls
+
+    @cached_property
+    def mcp(self) -> McpResourceWithStreamingResponse:
+        return McpResourceWithStreamingResponse(self._ai_controls.mcp)
+
+
+class AsyncAIControlsResourceWithStreamingResponse:
+    def __init__(self, ai_controls: AsyncAIControlsResource) -> None:
+        self._ai_controls = ai_controls
+
+    @cached_property
+    def mcp(self) -> AsyncMcpResourceWithStreamingResponse:
+        return AsyncMcpResourceWithStreamingResponse(self._ai_controls.mcp)
diff --git a/src/cloudflare/resources/zero_trust/access/ai_controls/mcp/__init__.py b/src/cloudflare/resources/zero_trust/access/ai_controls/mcp/__init__.py
new file mode 100644
index 00000000000..0c363a1f1be
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/access/ai_controls/mcp/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .mcp import (
+    McpResource,
+    AsyncMcpResource,
+    McpResourceWithRawResponse,
+    AsyncMcpResourceWithRawResponse,
+    McpResourceWithStreamingResponse,
+    AsyncMcpResourceWithStreamingResponse,
+)
+from .portals import (
+    PortalsResource,
+    AsyncPortalsResource,
+    PortalsResourceWithRawResponse,
+    AsyncPortalsResourceWithRawResponse,
+    PortalsResourceWithStreamingResponse,
+    AsyncPortalsResourceWithStreamingResponse,
+)
+from .servers import (
+    ServersResource,
+    AsyncServersResource,
+    ServersResourceWithRawResponse,
+    AsyncServersResourceWithRawResponse,
+    ServersResourceWithStreamingResponse,
+    AsyncServersResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "PortalsResource",
+    "AsyncPortalsResource",
+    "PortalsResourceWithRawResponse",
+    "AsyncPortalsResourceWithRawResponse",
+    "PortalsResourceWithStreamingResponse",
+    "AsyncPortalsResourceWithStreamingResponse",
+    "ServersResource",
+    "AsyncServersResource",
+    "ServersResourceWithRawResponse",
+    "AsyncServersResourceWithRawResponse",
+    "ServersResourceWithStreamingResponse",
+    "AsyncServersResourceWithStreamingResponse",
+    "McpResource",
+    "AsyncMcpResource",
+    "McpResourceWithRawResponse",
+    "AsyncMcpResourceWithRawResponse",
+    "McpResourceWithStreamingResponse",
+    "AsyncMcpResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/access/ai_controls/mcp/mcp.py b/src/cloudflare/resources/zero_trust/access/ai_controls/mcp/mcp.py
new file mode 100644
index 00000000000..d5996fa82c1
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/access/ai_controls/mcp/mcp.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .portals import (
+    PortalsResource,
+    AsyncPortalsResource,
+    PortalsResourceWithRawResponse,
+    AsyncPortalsResourceWithRawResponse,
+    PortalsResourceWithStreamingResponse,
+    AsyncPortalsResourceWithStreamingResponse,
+)
+from .servers import (
+    ServersResource,
+    AsyncServersResource,
+    ServersResourceWithRawResponse,
+    AsyncServersResourceWithRawResponse,
+    ServersResourceWithStreamingResponse,
+    AsyncServersResourceWithStreamingResponse,
+)
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["McpResource", "AsyncMcpResource"]
+
+
+class McpResource(SyncAPIResource):
+    @cached_property
+    def portals(self) -> PortalsResource:
+        return PortalsResource(self._client)
+
+    @cached_property
+    def servers(self) -> ServersResource:
+        return ServersResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> McpResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return McpResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> McpResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return McpResourceWithStreamingResponse(self)
+
+
+class AsyncMcpResource(AsyncAPIResource):
+    @cached_property
+    def portals(self) -> AsyncPortalsResource:
+        return AsyncPortalsResource(self._client)
+
+    @cached_property
+    def servers(self) -> AsyncServersResource:
+        return AsyncServersResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncMcpResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncMcpResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncMcpResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncMcpResourceWithStreamingResponse(self)
+
+
+class McpResourceWithRawResponse:
+    def __init__(self, mcp: McpResource) -> None:
+        self._mcp = mcp
+
+    @cached_property
+    def portals(self) -> PortalsResourceWithRawResponse:
+        return PortalsResourceWithRawResponse(self._mcp.portals)
+
+    @cached_property
+    def servers(self) -> ServersResourceWithRawResponse:
+        return ServersResourceWithRawResponse(self._mcp.servers)
+
+
+class AsyncMcpResourceWithRawResponse:
+    def __init__(self, mcp: AsyncMcpResource) -> None:
+        self._mcp = mcp
+
+    @cached_property
+    def portals(self) -> AsyncPortalsResourceWithRawResponse:
+        return AsyncPortalsResourceWithRawResponse(self._mcp.portals)
+
+    @cached_property
+    def servers(self) -> AsyncServersResourceWithRawResponse:
+        return AsyncServersResourceWithRawResponse(self._mcp.servers)
+
+
+class McpResourceWithStreamingResponse:
+    def __init__(self, mcp: McpResource) -> None:
+        self._mcp = mcp
+
+    @cached_property
+    def portals(self) -> PortalsResourceWithStreamingResponse:
+        return PortalsResourceWithStreamingResponse(self._mcp.portals)
+
+    @cached_property
+    def servers(self) -> ServersResourceWithStreamingResponse:
+        return ServersResourceWithStreamingResponse(self._mcp.servers)
+
+
+class AsyncMcpResourceWithStreamingResponse:
+    def __init__(self, mcp: AsyncMcpResource) -> None:
+        self._mcp = mcp
+
+    @cached_property
+    def portals(self) -> AsyncPortalsResourceWithStreamingResponse:
+        return AsyncPortalsResourceWithStreamingResponse(self._mcp.portals)
+
+    @cached_property
+    def servers(self) -> AsyncServersResourceWithStreamingResponse:
+        return AsyncServersResourceWithStreamingResponse(self._mcp.servers)
diff --git a/src/cloudflare/resources/zero_trust/access/ai_controls/mcp/portals.py b/src/cloudflare/resources/zero_trust/access/ai_controls/mcp/portals.py
new file mode 100644
index 00000000000..5e4f79dce93
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/access/ai_controls/mcp/portals.py
@@ -0,0 +1,657 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, cast
+
+import httpx
+
+from ......_types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ......_utils import maybe_transform, async_maybe_transform
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+from ......_response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ......_wrappers import ResultWrapper
+from ......pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ......_base_client import AsyncPaginator, make_request_options
+from ......types.zero_trust.access.ai_controls.mcp import portal_list_params, portal_create_params, portal_update_params
+from ......types.zero_trust.access.ai_controls.mcp.portal_list_response import PortalListResponse
+from ......types.zero_trust.access.ai_controls.mcp.portal_read_response import PortalReadResponse
+from ......types.zero_trust.access.ai_controls.mcp.portal_create_response import PortalCreateResponse
+from ......types.zero_trust.access.ai_controls.mcp.portal_delete_response import PortalDeleteResponse
+from ......types.zero_trust.access.ai_controls.mcp.portal_update_response import PortalUpdateResponse
+
+__all__ = ["PortalsResource", "AsyncPortalsResource"]
+
+
+class PortalsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> PortalsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return PortalsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> PortalsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return PortalsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        id: str,
+        hostname: str,
+        name: str,
+        description: str | Omit = omit,
+        secure_web_gateway: bool | Omit = omit,
+        servers: Iterable[portal_create_params.Server] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PortalCreateResponse:
+        """
+        Create a new MCP Portal
+
+        Args:
+          id: portal id
+
+          secure_web_gateway: Route outbound MCP traffic through Zero Trust Secure Web Gateway
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/access/ai-controls/mcp/portals",
+            body=maybe_transform(
+                {
+                    "id": id,
+                    "hostname": hostname,
+                    "name": name,
+                    "description": description,
+                    "secure_web_gateway": secure_web_gateway,
+                    "servers": servers,
+                },
+                portal_create_params.PortalCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PortalCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PortalCreateResponse], ResultWrapper[PortalCreateResponse]),
+        )
+
+    def update(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        description: str | Omit = omit,
+        hostname: str | Omit = omit,
+        name: str | Omit = omit,
+        secure_web_gateway: bool | Omit = omit,
+        servers: Iterable[portal_update_params.Server] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PortalUpdateResponse:
+        """
+        Update a MCP Portal
+
+        Args:
+          id: portal id
+
+          secure_web_gateway: Route outbound MCP traffic through Zero Trust Secure Web Gateway
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._put(
+            f"/accounts/{account_id}/access/ai-controls/mcp/portals/{id}",
+            body=maybe_transform(
+                {
+                    "description": description,
+                    "hostname": hostname,
+                    "name": name,
+                    "secure_web_gateway": secure_web_gateway,
+                    "servers": servers,
+                },
+                portal_update_params.PortalUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PortalUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PortalUpdateResponse], ResultWrapper[PortalUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[PortalListResponse]:
+        """
+        List MCP Portals
+
+        Args:
+          search: Search by id, name, hostname
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/access/ai-controls/mcp/portals",
+            page=SyncV4PagePaginationArray[PortalListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    portal_list_params.PortalListParams,
+                ),
+            ),
+            model=PortalListResponse,
+        )
+
+    def delete(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PortalDeleteResponse:
+        """
+        Delete a MCP Portal
+
+        Args:
+          id: portal id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/access/ai-controls/mcp/portals/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PortalDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PortalDeleteResponse], ResultWrapper[PortalDeleteResponse]),
+        )
+
+    def read(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PortalReadResponse:
+        """
+        Read details of an MCP Portal
+
+        Args:
+          id: portal id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._get(
+            f"/accounts/{account_id}/access/ai-controls/mcp/portals/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PortalReadResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PortalReadResponse], ResultWrapper[PortalReadResponse]),
+        )
+
+
+class AsyncPortalsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncPortalsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncPortalsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncPortalsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncPortalsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        id: str,
+        hostname: str,
+        name: str,
+        description: str | Omit = omit,
+        secure_web_gateway: bool | Omit = omit,
+        servers: Iterable[portal_create_params.Server] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PortalCreateResponse:
+        """
+        Create a new MCP Portal
+
+        Args:
+          id: portal id
+
+          secure_web_gateway: Route outbound MCP traffic through Zero Trust Secure Web Gateway
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/access/ai-controls/mcp/portals",
+            body=await async_maybe_transform(
+                {
+                    "id": id,
+                    "hostname": hostname,
+                    "name": name,
+                    "description": description,
+                    "secure_web_gateway": secure_web_gateway,
+                    "servers": servers,
+                },
+                portal_create_params.PortalCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PortalCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PortalCreateResponse], ResultWrapper[PortalCreateResponse]),
+        )
+
+    async def update(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        description: str | Omit = omit,
+        hostname: str | Omit = omit,
+        name: str | Omit = omit,
+        secure_web_gateway: bool | Omit = omit,
+        servers: Iterable[portal_update_params.Server] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PortalUpdateResponse:
+        """
+        Update a MCP Portal
+
+        Args:
+          id: portal id
+
+          secure_web_gateway: Route outbound MCP traffic through Zero Trust Secure Web Gateway
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/access/ai-controls/mcp/portals/{id}",
+            body=await async_maybe_transform(
+                {
+                    "description": description,
+                    "hostname": hostname,
+                    "name": name,
+                    "secure_web_gateway": secure_web_gateway,
+                    "servers": servers,
+                },
+                portal_update_params.PortalUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PortalUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PortalUpdateResponse], ResultWrapper[PortalUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[PortalListResponse, AsyncV4PagePaginationArray[PortalListResponse]]:
+        """
+        List MCP Portals
+
+        Args:
+          search: Search by id, name, hostname
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/access/ai-controls/mcp/portals",
+            page=AsyncV4PagePaginationArray[PortalListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    portal_list_params.PortalListParams,
+                ),
+            ),
+            model=PortalListResponse,
+        )
+
+    async def delete(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PortalDeleteResponse:
+        """
+        Delete a MCP Portal
+
+        Args:
+          id: portal id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/access/ai-controls/mcp/portals/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PortalDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PortalDeleteResponse], ResultWrapper[PortalDeleteResponse]),
+        )
+
+    async def read(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> PortalReadResponse:
+        """
+        Read details of an MCP Portal
+
+        Args:
+          id: portal id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/access/ai-controls/mcp/portals/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[PortalReadResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[PortalReadResponse], ResultWrapper[PortalReadResponse]),
+        )
+
+
+class PortalsResourceWithRawResponse:
+    def __init__(self, portals: PortalsResource) -> None:
+        self._portals = portals
+
+        self.create = to_raw_response_wrapper(
+            portals.create,
+        )
+        self.update = to_raw_response_wrapper(
+            portals.update,
+        )
+        self.list = to_raw_response_wrapper(
+            portals.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            portals.delete,
+        )
+        self.read = to_raw_response_wrapper(
+            portals.read,
+        )
+
+
+class AsyncPortalsResourceWithRawResponse:
+    def __init__(self, portals: AsyncPortalsResource) -> None:
+        self._portals = portals
+
+        self.create = async_to_raw_response_wrapper(
+            portals.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            portals.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            portals.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            portals.delete,
+        )
+        self.read = async_to_raw_response_wrapper(
+            portals.read,
+        )
+
+
+class PortalsResourceWithStreamingResponse:
+    def __init__(self, portals: PortalsResource) -> None:
+        self._portals = portals
+
+        self.create = to_streamed_response_wrapper(
+            portals.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            portals.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            portals.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            portals.delete,
+        )
+        self.read = to_streamed_response_wrapper(
+            portals.read,
+        )
+
+
+class AsyncPortalsResourceWithStreamingResponse:
+    def __init__(self, portals: AsyncPortalsResource) -> None:
+        self._portals = portals
+
+        self.create = async_to_streamed_response_wrapper(
+            portals.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            portals.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            portals.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            portals.delete,
+        )
+        self.read = async_to_streamed_response_wrapper(
+            portals.read,
+        )
diff --git a/src/cloudflare/resources/zero_trust/access/ai_controls/mcp/servers.py b/src/cloudflare/resources/zero_trust/access/ai_controls/mcp/servers.py
new file mode 100644
index 00000000000..f90282358a0
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/access/ai_controls/mcp/servers.py
@@ -0,0 +1,738 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ......_types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ......_utils import maybe_transform, async_maybe_transform
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+from ......_response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ......_wrappers import ResultWrapper
+from ......pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ......_base_client import AsyncPaginator, make_request_options
+from ......types.zero_trust.access.ai_controls.mcp import server_list_params, server_create_params, server_update_params
+from ......types.zero_trust.access.ai_controls.mcp.server_list_response import ServerListResponse
+from ......types.zero_trust.access.ai_controls.mcp.server_read_response import ServerReadResponse
+from ......types.zero_trust.access.ai_controls.mcp.server_create_response import ServerCreateResponse
+from ......types.zero_trust.access.ai_controls.mcp.server_delete_response import ServerDeleteResponse
+from ......types.zero_trust.access.ai_controls.mcp.server_update_response import ServerUpdateResponse
+
+__all__ = ["ServersResource", "AsyncServersResource"]
+
+
+class ServersResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ServersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ServersResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ServersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ServersResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        id: str,
+        auth_type: Literal["oauth", "bearer", "unauthenticated"],
+        hostname: str,
+        name: str,
+        auth_credentials: str | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ServerCreateResponse:
+        """
+        Create a new MCP Server
+
+        Args:
+          id: server id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/access/ai-controls/mcp/servers",
+            body=maybe_transform(
+                {
+                    "id": id,
+                    "auth_type": auth_type,
+                    "hostname": hostname,
+                    "name": name,
+                    "auth_credentials": auth_credentials,
+                    "description": description,
+                },
+                server_create_params.ServerCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ServerCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ServerCreateResponse], ResultWrapper[ServerCreateResponse]),
+        )
+
+    def update(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        auth_credentials: str | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ServerUpdateResponse:
+        """
+        Update a MCP Server
+
+        Args:
+          id: server id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._put(
+            f"/accounts/{account_id}/access/ai-controls/mcp/servers/{id}",
+            body=maybe_transform(
+                {
+                    "auth_credentials": auth_credentials,
+                    "description": description,
+                    "name": name,
+                },
+                server_update_params.ServerUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ServerUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ServerUpdateResponse], ResultWrapper[ServerUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[ServerListResponse]:
+        """
+        List MCP Servers
+
+        Args:
+          search: Search by id, name
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/access/ai-controls/mcp/servers",
+            page=SyncV4PagePaginationArray[ServerListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    server_list_params.ServerListParams,
+                ),
+            ),
+            model=ServerListResponse,
+        )
+
+    def delete(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ServerDeleteResponse:
+        """
+        Delete a MCP Server
+
+        Args:
+          id: server id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/access/ai-controls/mcp/servers/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ServerDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ServerDeleteResponse], ResultWrapper[ServerDeleteResponse]),
+        )
+
+    def read(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ServerReadResponse:
+        """
+        Read the details of a MCP Server
+
+        Args:
+          id: server id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._get(
+            f"/accounts/{account_id}/access/ai-controls/mcp/servers/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ServerReadResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ServerReadResponse], ResultWrapper[ServerReadResponse]),
+        )
+
+    def sync(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Sync MCP Server Capabilities
+
+        Args:
+          id: portal id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return self._post(
+            f"/accounts/{account_id}/access/ai-controls/mcp/servers/{id}/sync",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+
+class AsyncServersResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncServersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncServersResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncServersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncServersResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        id: str,
+        auth_type: Literal["oauth", "bearer", "unauthenticated"],
+        hostname: str,
+        name: str,
+        auth_credentials: str | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ServerCreateResponse:
+        """
+        Create a new MCP Server
+
+        Args:
+          id: server id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/access/ai-controls/mcp/servers",
+            body=await async_maybe_transform(
+                {
+                    "id": id,
+                    "auth_type": auth_type,
+                    "hostname": hostname,
+                    "name": name,
+                    "auth_credentials": auth_credentials,
+                    "description": description,
+                },
+                server_create_params.ServerCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ServerCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ServerCreateResponse], ResultWrapper[ServerCreateResponse]),
+        )
+
+    async def update(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        auth_credentials: str | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        name: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ServerUpdateResponse:
+        """
+        Update a MCP Server
+
+        Args:
+          id: server id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/access/ai-controls/mcp/servers/{id}",
+            body=await async_maybe_transform(
+                {
+                    "auth_credentials": auth_credentials,
+                    "description": description,
+                    "name": name,
+                },
+                server_update_params.ServerUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ServerUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ServerUpdateResponse], ResultWrapper[ServerUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ServerListResponse, AsyncV4PagePaginationArray[ServerListResponse]]:
+        """
+        List MCP Servers
+
+        Args:
+          search: Search by id, name
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/access/ai-controls/mcp/servers",
+            page=AsyncV4PagePaginationArray[ServerListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    server_list_params.ServerListParams,
+                ),
+            ),
+            model=ServerListResponse,
+        )
+
+    async def delete(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ServerDeleteResponse:
+        """
+        Delete a MCP Server
+
+        Args:
+          id: server id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/access/ai-controls/mcp/servers/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ServerDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ServerDeleteResponse], ResultWrapper[ServerDeleteResponse]),
+        )
+
+    async def read(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ServerReadResponse:
+        """
+        Read the details of a MCP Server
+
+        Args:
+          id: server id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/access/ai-controls/mcp/servers/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ServerReadResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[ServerReadResponse], ResultWrapper[ServerReadResponse]),
+        )
+
+    async def sync(
+        self,
+        id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Sync MCP Server Capabilities
+
+        Args:
+          id: portal id
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/access/ai-controls/mcp/servers/{id}/sync",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[object]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+
+class ServersResourceWithRawResponse:
+    def __init__(self, servers: ServersResource) -> None:
+        self._servers = servers
+
+        self.create = to_raw_response_wrapper(
+            servers.create,
+        )
+        self.update = to_raw_response_wrapper(
+            servers.update,
+        )
+        self.list = to_raw_response_wrapper(
+            servers.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            servers.delete,
+        )
+        self.read = to_raw_response_wrapper(
+            servers.read,
+        )
+        self.sync = to_raw_response_wrapper(
+            servers.sync,
+        )
+
+
+class AsyncServersResourceWithRawResponse:
+    def __init__(self, servers: AsyncServersResource) -> None:
+        self._servers = servers
+
+        self.create = async_to_raw_response_wrapper(
+            servers.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            servers.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            servers.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            servers.delete,
+        )
+        self.read = async_to_raw_response_wrapper(
+            servers.read,
+        )
+        self.sync = async_to_raw_response_wrapper(
+            servers.sync,
+        )
+
+
+class ServersResourceWithStreamingResponse:
+    def __init__(self, servers: ServersResource) -> None:
+        self._servers = servers
+
+        self.create = to_streamed_response_wrapper(
+            servers.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            servers.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            servers.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            servers.delete,
+        )
+        self.read = to_streamed_response_wrapper(
+            servers.read,
+        )
+        self.sync = to_streamed_response_wrapper(
+            servers.sync,
+        )
+
+
+class AsyncServersResourceWithStreamingResponse:
+    def __init__(self, servers: AsyncServersResource) -> None:
+        self._servers = servers
+
+        self.create = async_to_streamed_response_wrapper(
+            servers.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            servers.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            servers.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            servers.delete,
+        )
+        self.read = async_to_streamed_response_wrapper(
+            servers.read,
+        )
+        self.sync = async_to_streamed_response_wrapper(
+            servers.sync,
+        )
diff --git a/src/cloudflare/resources/zero_trust/access/applications/__init__.py b/src/cloudflare/resources/zero_trust/access/applications/__init__.py
index 8b6f39c4dd8..b9173edc404 100644
--- a/src/cloudflare/resources/zero_trust/access/applications/__init__.py
+++ b/src/cloudflare/resources/zero_trust/access/applications/__init__.py
@@ -16,6 +16,14 @@
     PoliciesResourceWithStreamingResponse,
     AsyncPoliciesResourceWithStreamingResponse,
 )
+from .settings import (
+    SettingsResource,
+    AsyncSettingsResource,
+    SettingsResourceWithRawResponse,
+    AsyncSettingsResourceWithRawResponse,
+    SettingsResourceWithStreamingResponse,
+    AsyncSettingsResourceWithStreamingResponse,
+)
 from .applications import (
     ApplicationsResource,
     AsyncApplicationsResource,
@@ -24,6 +32,14 @@
     ApplicationsResourceWithStreamingResponse,
     AsyncApplicationsResourceWithStreamingResponse,
 )
+from .policy_tests import (
+    PolicyTestsResource,
+    AsyncPolicyTestsResource,
+    PolicyTestsResourceWithRawResponse,
+    AsyncPolicyTestsResourceWithRawResponse,
+    PolicyTestsResourceWithStreamingResponse,
+    AsyncPolicyTestsResourceWithStreamingResponse,
+)
 from .user_policy_checks import (
     UserPolicyChecksResource,
     AsyncUserPolicyChecksResource,
@@ -52,6 +68,18 @@
     "AsyncPoliciesResourceWithRawResponse",
     "PoliciesResourceWithStreamingResponse",
     "AsyncPoliciesResourceWithStreamingResponse",
+    "PolicyTestsResource",
+    "AsyncPolicyTestsResource",
+    "PolicyTestsResourceWithRawResponse",
+    "AsyncPolicyTestsResourceWithRawResponse",
+    "PolicyTestsResourceWithStreamingResponse",
+    "AsyncPolicyTestsResourceWithStreamingResponse",
+    "SettingsResource",
+    "AsyncSettingsResource",
+    "SettingsResourceWithRawResponse",
+    "AsyncSettingsResourceWithRawResponse",
+    "SettingsResourceWithStreamingResponse",
+    "AsyncSettingsResourceWithStreamingResponse",
     "ApplicationsResource",
     "AsyncApplicationsResource",
     "ApplicationsResourceWithRawResponse",
diff --git a/src/cloudflare/resources/zero_trust/access/applications/applications.py b/src/cloudflare/resources/zero_trust/access/applications/applications.py
index 15bc2e142ae..e34872af219 100644
--- a/src/cloudflare/resources/zero_trust/access/applications/applications.py
+++ b/src/cloudflare/resources/zero_trust/access/applications/applications.py
@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 
-from typing import Any, List, Type, Optional, cast, overload
+from typing import Any, Type, Iterable, Optional, cast
+from typing_extensions import Literal, overload
 
 import httpx
 
@@ -22,11 +23,16 @@
     PoliciesResourceWithStreamingResponse,
     AsyncPoliciesResourceWithStreamingResponse,
 )
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
+from .settings import (
+    SettingsResource,
+    AsyncSettingsResource,
+    SettingsResourceWithRawResponse,
+    AsyncSettingsResourceWithRawResponse,
+    SettingsResourceWithStreamingResponse,
+    AsyncSettingsResourceWithStreamingResponse,
 )
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -36,7 +42,7 @@
     async_to_streamed_response_wrapper,
 )
 from ....._wrappers import ResultWrapper
-from .....pagination import SyncSinglePage, AsyncSinglePage
+from .....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ....._base_client import AsyncPaginator, make_request_options
 from .user_policy_checks import (
     UserPolicyChecksResource,
@@ -46,13 +52,23 @@
     UserPolicyChecksResourceWithStreamingResponse,
     AsyncUserPolicyChecksResourceWithStreamingResponse,
 )
+from .policy_tests.policy_tests import (
+    PolicyTestsResource,
+    AsyncPolicyTestsResource,
+    PolicyTestsResourceWithRawResponse,
+    AsyncPolicyTestsResourceWithRawResponse,
+    PolicyTestsResourceWithStreamingResponse,
+    AsyncPolicyTestsResourceWithStreamingResponse,
+)
 from .....types.zero_trust.access import (
+    AppID,
     ApplicationType,
+    application_list_params,
     application_create_params,
     application_update_params,
 )
+from .....types.zero_trust.access.app_id import AppID
 from .....types.zero_trust.access.allowed_idps import AllowedIdPs
-from .....types.zero_trust.access.app_id_param import AppIDParam
 from .....types.zero_trust.access.application_type import ApplicationType
 from .....types.zero_trust.access.cors_headers_param import CORSHeadersParam
 from .....types.zero_trust.access.self_hosted_domains import SelfHostedDomains
@@ -78,12 +94,31 @@ def user_policy_checks(self) -> UserPolicyChecksResource:
     def policies(self) -> PoliciesResource:
         return PoliciesResource(self._client)
 
+    @cached_property
+    def policy_tests(self) -> PolicyTestsResource:
+        return PolicyTestsResource(self._client)
+
+    @cached_property
+    def settings(self) -> SettingsResource:
+        return SettingsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> ApplicationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ApplicationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ApplicationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ApplicationsResourceWithStreamingResponse(self)
 
     @overload
@@ -91,45 +126,49 @@ def create(
         self,
         *,
         domain: str,
-        type: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        cors_headers: CORSHeadersParam | NotGiven = NOT_GIVEN,
-        custom_deny_message: str | NotGiven = NOT_GIVEN,
-        custom_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_non_identity_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        enable_binding_cookie: bool | NotGiven = NOT_GIVEN,
-        http_only_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        options_preflight_bypass: bool | NotGiven = NOT_GIVEN,
-        path_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_create_params.SelfHostedApplicationPolicy] | NotGiven = NOT_GIVEN,
-        same_site_cookie_attribute: str | NotGiven = NOT_GIVEN,
-        scim_config: application_create_params.SelfHostedApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        self_hosted_domains: List[SelfHostedDomains] | NotGiven = NOT_GIVEN,
-        service_auth_401_redirect: bool | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        skip_interstitial: bool | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
+        type: ApplicationType,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_create_params.SelfHostedApplicationDestination] | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_create_params.SelfHostedApplicationPolicy] | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_create_params.SelfHostedApplicationSCIMConfig | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationCreateResponse]:
         """
         Adds a new application to Access.
 
         Args:
-          domain: The primary hostname and path that Access will secure. If the app is visible in
-              the App Launcher dashboard, this is the domain that will be displayed.
+          domain: The primary hostname and path secured by Access. This domain will be displayed
+              if the app is visible in the App Launcher.
 
           type: The application type.
 
@@ -142,6 +181,8 @@ def create(
               authentication. This setting always overrides the organization setting for WARP
               authentication.
 
+          allow_iframe: Enables loading application content in an iFrame.
+
           allowed_idps: The identity providers your users can select when connecting to this
               application. Defaults to all IdPs configured in your account.
 
@@ -161,6 +202,10 @@ def create(
 
           custom_pages: The custom pages that will be displayed when applicable for this application
 
+          destinations: List of destinations secured by Access. This supersedes `self_hosted_domains` to
+              allow for more flexibility in defining different types of domains. If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
           enable_binding_cookie: Enables the binding cookie, which increases security against compromised
               authorization tokens and CSRF attacks.
 
@@ -177,29 +222,44 @@ def create(
           path_cookie_attribute: Enables cookie paths to scope an application's JWT to the application path. If
               disabled, the JWT will scope to the hostname by default
 
-          policies: The policies that will apply to the application, in ascending order of
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
+          read_service_tokens_from_header: Allows matching Access Service Tokens passed HTTP in a single header with this
+              name. This works as an alternative to the (CF-Access-Client-Id,
+              CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+              as a json object similar to: { "cf-access-client-id":
+              "88bf3b6d86161464f6509f7219099e57.access.example.com",
+              "cf-access-client-secret":
+              "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+
           same_site_cookie_attribute: Sets the SameSite cookie setting, which provides increased security against CSRF
               attacks.
 
           scim_config: Configuration for provisioning to this application via SCIM. This is currently
               in closed beta.
 
-          self_hosted_domains: List of domains that Access will secure.
+          self_hosted_domains: List of public domains that Access will secure. This field is deprecated in
+              favor of `destinations` and will be supported until **November 21, 2025.** If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
 
           service_auth_401_redirect: Returns a 401 status code when the request is blocked by a Service Auth policy.
 
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           skip_interstitial: Enables automatic authentication through cloudflared.
 
           tags: The tags you want assigned to an application. Tags are used to filter
               applications in the App Launcher dashboard.
 
+          use_clientless_isolation_app_launcher_url: Determines if users can access this application via a clientless browser
+              isolation URL. This allows users to access private domains without connecting to
+              Gateway. The option requires Clientless Browser Isolation to be set up with
+              policies that allow users of this application.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -214,25 +274,25 @@ def create(
     def create(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        policies: List[application_create_params.SaaSApplicationPolicy] | NotGiven = NOT_GIVEN,
-        saas_app: application_create_params.SaaSApplicationSaaSApp | NotGiven = NOT_GIVEN,
-        scim_config: application_create_params.SaaSApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        policies: SequenceNotStr[application_create_params.SaaSApplicationPolicy] | Omit = omit,
+        saas_app: application_create_params.SaaSApplicationSaaSApp | Omit = omit,
+        scim_config: application_create_params.SaaSApplicationSCIMConfig | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        type: ApplicationType | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationCreateResponse]:
         """
         Adds a new application to Access.
@@ -256,7 +316,7 @@ def create(
 
           name: The name of the application.
 
-          policies: The policies that will apply to the application, in ascending order of
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
@@ -283,45 +343,64 @@ def create(
         self,
         *,
         domain: str,
-        type: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        cors_headers: CORSHeadersParam | NotGiven = NOT_GIVEN,
-        custom_deny_message: str | NotGiven = NOT_GIVEN,
-        custom_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_non_identity_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        enable_binding_cookie: bool | NotGiven = NOT_GIVEN,
-        http_only_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        options_preflight_bypass: bool | NotGiven = NOT_GIVEN,
-        path_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_create_params.BrowserSSHApplicationPolicy] | NotGiven = NOT_GIVEN,
-        same_site_cookie_attribute: str | NotGiven = NOT_GIVEN,
-        scim_config: application_create_params.BrowserSSHApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        self_hosted_domains: List[SelfHostedDomains] | NotGiven = NOT_GIVEN,
-        service_auth_401_redirect: bool | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        skip_interstitial: bool | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
+        type: Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ],
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_create_params.BrowserSSHApplicationDestination] | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_create_params.BrowserSSHApplicationPolicy] | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_create_params.BrowserSSHApplicationSCIMConfig | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationCreateResponse]:
         """
         Adds a new application to Access.
 
         Args:
-          domain: The primary hostname and path that Access will secure. If the app is visible in
-              the App Launcher dashboard, this is the domain that will be displayed.
+          domain: The primary hostname and path secured by Access. This domain will be displayed
+              if the app is visible in the App Launcher.
 
           type: The application type.
 
@@ -334,6 +413,8 @@ def create(
               authentication. This setting always overrides the organization setting for WARP
               authentication.
 
+          allow_iframe: Enables loading application content in an iFrame.
+
           allowed_idps: The identity providers your users can select when connecting to this
               application. Defaults to all IdPs configured in your account.
 
@@ -353,6 +434,10 @@ def create(
 
           custom_pages: The custom pages that will be displayed when applicable for this application
 
+          destinations: List of destinations secured by Access. This supersedes `self_hosted_domains` to
+              allow for more flexibility in defining different types of domains. If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
           enable_binding_cookie: Enables the binding cookie, which increases security against compromised
               authorization tokens and CSRF attacks.
 
@@ -369,29 +454,44 @@ def create(
           path_cookie_attribute: Enables cookie paths to scope an application's JWT to the application path. If
               disabled, the JWT will scope to the hostname by default
 
-          policies: The policies that will apply to the application, in ascending order of
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
+          read_service_tokens_from_header: Allows matching Access Service Tokens passed HTTP in a single header with this
+              name. This works as an alternative to the (CF-Access-Client-Id,
+              CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+              as a json object similar to: { "cf-access-client-id":
+              "88bf3b6d86161464f6509f7219099e57.access.example.com",
+              "cf-access-client-secret":
+              "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+
           same_site_cookie_attribute: Sets the SameSite cookie setting, which provides increased security against CSRF
               attacks.
 
           scim_config: Configuration for provisioning to this application via SCIM. This is currently
               in closed beta.
 
-          self_hosted_domains: List of domains that Access will secure.
+          self_hosted_domains: List of public domains that Access will secure. This field is deprecated in
+              favor of `destinations` and will be supported until **November 21, 2025.** If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
 
           service_auth_401_redirect: Returns a 401 status code when the request is blocked by a Service Auth policy.
 
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           skip_interstitial: Enables automatic authentication through cloudflared.
 
           tags: The tags you want assigned to an application. Tags are used to filter
               applications in the App Launcher dashboard.
 
+          use_clientless_isolation_app_launcher_url: Determines if users can access this application via a clientless browser
+              isolation URL. This allows users to access private domains without connecting to
+              Gateway. The option requires Clientless Browser Isolation to be set up with
+              policies that allow users of this application.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -407,45 +507,64 @@ def create(
         self,
         *,
         domain: str,
-        type: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        cors_headers: CORSHeadersParam | NotGiven = NOT_GIVEN,
-        custom_deny_message: str | NotGiven = NOT_GIVEN,
-        custom_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_non_identity_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        enable_binding_cookie: bool | NotGiven = NOT_GIVEN,
-        http_only_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        options_preflight_bypass: bool | NotGiven = NOT_GIVEN,
-        path_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_create_params.BrowserVncApplicationPolicy] | NotGiven = NOT_GIVEN,
-        same_site_cookie_attribute: str | NotGiven = NOT_GIVEN,
-        scim_config: application_create_params.BrowserVncApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        self_hosted_domains: List[SelfHostedDomains] | NotGiven = NOT_GIVEN,
-        service_auth_401_redirect: bool | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        skip_interstitial: bool | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
+        type: Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ],
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_create_params.BrowserVNCApplicationDestination] | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_create_params.BrowserVNCApplicationPolicy] | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_create_params.BrowserVNCApplicationSCIMConfig | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationCreateResponse]:
         """
         Adds a new application to Access.
 
         Args:
-          domain: The primary hostname and path that Access will secure. If the app is visible in
-              the App Launcher dashboard, this is the domain that will be displayed.
+          domain: The primary hostname and path secured by Access. This domain will be displayed
+              if the app is visible in the App Launcher.
 
           type: The application type.
 
@@ -458,6 +577,8 @@ def create(
               authentication. This setting always overrides the organization setting for WARP
               authentication.
 
+          allow_iframe: Enables loading application content in an iFrame.
+
           allowed_idps: The identity providers your users can select when connecting to this
               application. Defaults to all IdPs configured in your account.
 
@@ -477,6 +598,10 @@ def create(
 
           custom_pages: The custom pages that will be displayed when applicable for this application
 
+          destinations: List of destinations secured by Access. This supersedes `self_hosted_domains` to
+              allow for more flexibility in defining different types of domains. If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
           enable_binding_cookie: Enables the binding cookie, which increases security against compromised
               authorization tokens and CSRF attacks.
 
@@ -493,29 +618,44 @@ def create(
           path_cookie_attribute: Enables cookie paths to scope an application's JWT to the application path. If
               disabled, the JWT will scope to the hostname by default
 
-          policies: The policies that will apply to the application, in ascending order of
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
+          read_service_tokens_from_header: Allows matching Access Service Tokens passed HTTP in a single header with this
+              name. This works as an alternative to the (CF-Access-Client-Id,
+              CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+              as a json object similar to: { "cf-access-client-id":
+              "88bf3b6d86161464f6509f7219099e57.access.example.com",
+              "cf-access-client-secret":
+              "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+
           same_site_cookie_attribute: Sets the SameSite cookie setting, which provides increased security against CSRF
               attacks.
 
           scim_config: Configuration for provisioning to this application via SCIM. This is currently
               in closed beta.
 
-          self_hosted_domains: List of domains that Access will secure.
+          self_hosted_domains: List of public domains that Access will secure. This field is deprecated in
+              favor of `destinations` and will be supported until **November 21, 2025.** If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
 
           service_auth_401_redirect: Returns a 401 status code when the request is blocked by a Service Auth policy.
 
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           skip_interstitial: Enables automatic authentication through cloudflared.
 
           tags: The tags you want assigned to an application. Tags are used to filter
               applications in the App Launcher dashboard.
 
+          use_clientless_isolation_app_launcher_url: Determines if users can access this application via a clientless browser
+              isolation URL. This allows users to access private domains without connecting to
+              Gateway. The option requires Clientless Browser Isolation to be set up with
+              policies that allow users of this application.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -530,20 +670,43 @@ def create(
     def create(
         self,
         *,
-        type: ApplicationType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_create_params.AppLauncherApplicationPolicy] | NotGiven = NOT_GIVEN,
-        scim_config: application_create_params.AppLauncherApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        type: Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ],
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_logo_url: str | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        bg_color: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        footer_links: Iterable[application_create_params.AppLauncherApplicationFooterLink] | Omit = omit,
+        header_bg_color: str | Omit = omit,
+        landing_page_design: application_create_params.AppLauncherApplicationLandingPageDesign | Omit = omit,
+        policies: SequenceNotStr[application_create_params.AppLauncherApplicationPolicy] | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_app_launcher_login_page: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationCreateResponse]:
         """
         Adds a new application to Access.
@@ -558,19 +721,36 @@ def create(
           allowed_idps: The identity providers your users can select when connecting to this
               application. Defaults to all IdPs configured in your account.
 
+          app_launcher_logo_url: The image URL of the logo shown in the App Launcher header.
+
           auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
               login. You must specify only one identity provider in allowed_idps.
 
-          policies: The policies that will apply to the application, in ascending order of
+          bg_color: The background color of the App Launcher page.
+
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          footer_links: The links in the App Launcher footer.
+
+          header_bg_color: The background color of the App Launcher header.
+
+          landing_page_design: The design of the App Launcher landing page shown to users when they log in.
+
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
-          scim_config: Configuration for provisioning to this application via SCIM. This is currently
-              in closed beta.
-
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
+
+          skip_app_launcher_login_page: Determines when to skip the App Launcher landing page.
 
           extra_headers: Send extra headers
 
@@ -587,19 +767,21 @@ def create(
         self,
         *,
         type: ApplicationType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_create_params.DeviceEnrollmentPermissionsApplicationPolicy] | NotGiven = NOT_GIVEN,
-        scim_config: application_create_params.DeviceEnrollmentPermissionsApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        policies: SequenceNotStr[application_create_params.DeviceEnrollmentPermissionsApplicationPolicy] | Omit = omit,
+        session_duration: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationCreateResponse]:
         """
         Adds a new application to Access.
@@ -617,16 +799,21 @@ def create(
           auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
               login. You must specify only one identity provider in allowed_idps.
 
-          policies: The policies that will apply to the application, in ascending order of
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
-          scim_config: Configuration for provisioning to this application via SCIM. This is currently
-              in closed beta.
-
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           extra_headers: Send extra headers
 
@@ -643,19 +830,21 @@ def create(
         self,
         *,
         type: ApplicationType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_create_params.BrowserIsolationPermissionsApplicationPolicy] | NotGiven = NOT_GIVEN,
-        scim_config: application_create_params.BrowserIsolationPermissionsApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        policies: SequenceNotStr[application_create_params.BrowserIsolationPermissionsApplicationPolicy] | Omit = omit,
+        session_duration: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationCreateResponse]:
         """
         Adds a new application to Access.
@@ -673,16 +862,91 @@ def create(
           auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
               login. You must specify only one identity provider in allowed_idps.
 
-          policies: The policies that will apply to the application, in ascending order of
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
-          scim_config: Configuration for provisioning to this application via SCIM. This is currently
-              in closed beta.
+          session_duration: The amount of time that tokens issued for this application will be valid. Must
+              be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
+              s, m, h. Note: unsupported for infrastructure type applications.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        *,
+        type: ApplicationType,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        domain: str | Omit = omit,
+        name: str | Omit = omit,
+        policies: SequenceNotStr[application_create_params.GatewayIdentityProxyEndpointApplicationPolicy] | Omit = omit,
+        session_duration: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ApplicationCreateResponse]:
+        """
+        Adds a new application to Access.
+
+        Args:
+          type: The application type.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          allowed_idps: The identity providers your users can select when connecting to this
+              application. Defaults to all IdPs configured in your account.
+
+          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
+              login. You must specify only one identity provider in allowed_idps.
+
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          domain: The proxy endpoint domain in the format: 10 alphanumeric characters followed by
+              .proxy.cloudflare-gateway.com
+
+          name: The name of the application.
+
+          policies: The policies that Access applies to the application, in ascending order of
+              precedence. Items can reference existing policies or create new policies
+              exclusive to the application.
 
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           extra_headers: Send extra headers
 
@@ -698,21 +962,21 @@ def create(
     def create(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        domain: str | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        scim_config: application_create_params.BookmarkApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        domain: str | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        policies: SequenceNotStr[application_create_params.BookmarkApplicationPolicy] | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        type: ApplicationType | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationCreateResponse]:
         """
         Adds a new application to Access.
@@ -730,13 +994,205 @@ def create(
 
           name: The name of the application.
 
+          policies: The policies that Access applies to the application, in ascending order of
+              precedence. Items can reference existing policies or create new policies
+              exclusive to the application.
+
+          tags: The tags you want assigned to an application. Tags are used to filter
+              applications in the App Launcher dashboard.
+
+          type: The application type.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        *,
+        target_criteria: Iterable[application_create_params.InfrastructureApplicationTargetCriterion],
+        type: ApplicationType,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        name: str | Omit = omit,
+        policies: Iterable[application_create_params.InfrastructureApplicationPolicy] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ApplicationCreateResponse]:
+        """
+        Adds a new application to Access.
+
+        Args:
+          type: The application type.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          name: The name of the application.
+
+          policies: The policies that Access applies to the application.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def create(
+        self,
+        *,
+        domain: str,
+        target_criteria: Iterable[application_create_params.BrowserRdpApplicationTargetCriterion],
+        type: ApplicationType,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_create_params.BrowserRdpApplicationDestination] | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_create_params.BrowserRdpApplicationPolicy] | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_create_params.BrowserRdpApplicationSCIMConfig | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ApplicationCreateResponse]:
+        """
+        Adds a new application to Access.
+
+        Args:
+          domain: The primary hostname and path secured by Access. This domain will be displayed
+              if the app is visible in the App Launcher.
+
+          type: The application type.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          allow_authenticate_via_warp: When set to true, users can authenticate to this application using their WARP
+              session. When set to false this application will always require direct IdP
+              authentication. This setting always overrides the organization setting for WARP
+              authentication.
+
+          allow_iframe: Enables loading application content in an iFrame.
+
+          allowed_idps: The identity providers your users can select when connecting to this
+              application. Defaults to all IdPs configured in your account.
+
+          app_launcher_visible: Displays the application in the App Launcher.
+
+          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
+              login. You must specify only one identity provider in allowed_idps.
+
+          custom_deny_message: The custom error message shown to a user when they are denied access to the
+              application.
+
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          destinations: List of destinations secured by Access. This supersedes `self_hosted_domains` to
+              allow for more flexibility in defining different types of domains. If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
+          enable_binding_cookie: Enables the binding cookie, which increases security against compromised
+              authorization tokens and CSRF attacks.
+
+          http_only_cookie_attribute: Enables the HttpOnly cookie attribute, which increases security against XSS
+              attacks.
+
+          logo_url: The image URL for the logo shown in the App Launcher dashboard.
+
+          name: The name of the application.
+
+          options_preflight_bypass: Allows options preflight requests to bypass Access authentication and go
+              directly to the origin. Cannot turn on if cors_headers is set.
+
+          path_cookie_attribute: Enables cookie paths to scope an application's JWT to the application path. If
+              disabled, the JWT will scope to the hostname by default
+
+          policies: The policies that Access applies to the application, in ascending order of
+              precedence. Items can reference existing policies or create new policies
+              exclusive to the application.
+
+          read_service_tokens_from_header: Allows matching Access Service Tokens passed HTTP in a single header with this
+              name. This works as an alternative to the (CF-Access-Client-Id,
+              CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+              as a json object similar to: { "cf-access-client-id":
+              "88bf3b6d86161464f6509f7219099e57.access.example.com",
+              "cf-access-client-secret":
+              "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+
+          same_site_cookie_attribute: Sets the SameSite cookie setting, which provides increased security against CSRF
+              attacks.
+
           scim_config: Configuration for provisioning to this application via SCIM. This is currently
               in closed beta.
 
+          self_hosted_domains: List of public domains that Access will secure. This field is deprecated in
+              favor of `destinations` and will be supported until **November 21, 2025.** If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
+          service_auth_401_redirect: Returns a 401 status code when the request is blocked by a Service Auth policy.
+
+          session_duration: The amount of time that tokens issued for this application will be valid. Must
+              be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
+              s, m, h. Note: unsupported for infrastructure type applications.
+
+          skip_interstitial: Enables automatic authentication through cloudflared.
+
           tags: The tags you want assigned to an application. Tags are used to filter
               applications in the App Launcher dashboard.
 
-          type: The application type.
+          use_clientless_isolation_app_launcher_url: Determines if users can access this application via a clientless browser
+              isolation URL. This allows users to access private domains without connecting to
+              Gateway. The option requires Clientless Browser Isolation to be set up with
+              policies that allow users of this application.
 
           extra_headers: Send extra headers
 
@@ -751,40 +1207,90 @@ def create(
     def create(
         self,
         *,
-        domain: str | NotGiven = NOT_GIVEN,
-        type: str | ApplicationType | NotGiven = NOT_GIVEN,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        cors_headers: CORSHeadersParam | NotGiven = NOT_GIVEN,
-        custom_deny_message: str | NotGiven = NOT_GIVEN,
-        custom_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_non_identity_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        enable_binding_cookie: bool | NotGiven = NOT_GIVEN,
-        http_only_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        options_preflight_bypass: bool | NotGiven = NOT_GIVEN,
-        path_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_create_params.SelfHostedApplicationPolicy] | NotGiven = NOT_GIVEN,
-        same_site_cookie_attribute: str | NotGiven = NOT_GIVEN,
-        scim_config: application_create_params.SelfHostedApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        self_hosted_domains: List[SelfHostedDomains] | NotGiven = NOT_GIVEN,
-        service_auth_401_redirect: bool | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        skip_interstitial: bool | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
-        saas_app: application_create_params.SaaSApplicationSaaSApp | NotGiven = NOT_GIVEN,
+        domain: str | Omit = omit,
+        type: ApplicationType
+        | Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ]
+        | Omit = omit,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_create_params.SelfHostedApplicationDestination]
+        | Iterable[application_create_params.BrowserSSHApplicationDestination]
+        | Iterable[application_create_params.BrowserVNCApplicationDestination]
+        | Iterable[application_create_params.BrowserRdpApplicationDestination]
+        | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_create_params.SelfHostedApplicationPolicy]
+        | SequenceNotStr[application_create_params.SaaSApplicationPolicy]
+        | SequenceNotStr[application_create_params.BrowserSSHApplicationPolicy]
+        | SequenceNotStr[application_create_params.BrowserVNCApplicationPolicy]
+        | SequenceNotStr[application_create_params.AppLauncherApplicationPolicy]
+        | SequenceNotStr[application_create_params.DeviceEnrollmentPermissionsApplicationPolicy]
+        | SequenceNotStr[application_create_params.BrowserIsolationPermissionsApplicationPolicy]
+        | SequenceNotStr[application_create_params.GatewayIdentityProxyEndpointApplicationPolicy]
+        | SequenceNotStr[application_create_params.BookmarkApplicationPolicy]
+        | Iterable[application_create_params.InfrastructureApplicationPolicy]
+        | SequenceNotStr[application_create_params.BrowserRdpApplicationPolicy]
+        | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_create_params.SelfHostedApplicationSCIMConfig
+        | application_create_params.SaaSApplicationSCIMConfig
+        | application_create_params.BrowserSSHApplicationSCIMConfig
+        | application_create_params.BrowserVNCApplicationSCIMConfig
+        | application_create_params.BrowserRdpApplicationSCIMConfig
+        | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
+        saas_app: application_create_params.SaaSApplicationSaaSApp | Omit = omit,
+        app_launcher_logo_url: str | Omit = omit,
+        bg_color: str | Omit = omit,
+        footer_links: Iterable[application_create_params.AppLauncherApplicationFooterLink] | Omit = omit,
+        header_bg_color: str | Omit = omit,
+        landing_page_design: application_create_params.AppLauncherApplicationLandingPageDesign | Omit = omit,
+        skip_app_launcher_login_page: bool | Omit = omit,
+        target_criteria: Iterable[application_create_params.InfrastructureApplicationTargetCriterion]
+        | Iterable[application_create_params.BrowserRdpApplicationTargetCriterion]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationCreateResponse]:
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
@@ -807,6 +1313,7 @@ def create(
                         "domain": domain,
                         "type": type,
                         "allow_authenticate_via_warp": allow_authenticate_via_warp,
+                        "allow_iframe": allow_iframe,
                         "allowed_idps": allowed_idps,
                         "app_launcher_visible": app_launcher_visible,
                         "auto_redirect_to_identity": auto_redirect_to_identity,
@@ -815,6 +1322,7 @@ def create(
                         "custom_deny_url": custom_deny_url,
                         "custom_non_identity_deny_url": custom_non_identity_deny_url,
                         "custom_pages": custom_pages,
+                        "destinations": destinations,
                         "enable_binding_cookie": enable_binding_cookie,
                         "http_only_cookie_attribute": http_only_cookie_attribute,
                         "logo_url": logo_url,
@@ -822,6 +1330,7 @@ def create(
                         "options_preflight_bypass": options_preflight_bypass,
                         "path_cookie_attribute": path_cookie_attribute,
                         "policies": policies,
+                        "read_service_tokens_from_header": read_service_tokens_from_header,
                         "same_site_cookie_attribute": same_site_cookie_attribute,
                         "scim_config": scim_config,
                         "self_hosted_domains": self_hosted_domains,
@@ -829,7 +1338,15 @@ def create(
                         "session_duration": session_duration,
                         "skip_interstitial": skip_interstitial,
                         "tags": tags,
+                        "use_clientless_isolation_app_launcher_url": use_clientless_isolation_app_launcher_url,
                         "saas_app": saas_app,
+                        "app_launcher_logo_url": app_launcher_logo_url,
+                        "bg_color": bg_color,
+                        "footer_links": footer_links,
+                        "header_bg_color": header_bg_color,
+                        "landing_page_design": landing_page_design,
+                        "skip_app_launcher_login_page": skip_app_launcher_login_page,
+                        "target_criteria": target_criteria,
                     },
                     application_create_params.ApplicationCreateParams,
                 ),
@@ -849,50 +1366,54 @@ def create(
     @overload
     def update(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
         domain: str,
-        type: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        cors_headers: CORSHeadersParam | NotGiven = NOT_GIVEN,
-        custom_deny_message: str | NotGiven = NOT_GIVEN,
-        custom_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_non_identity_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        enable_binding_cookie: bool | NotGiven = NOT_GIVEN,
-        http_only_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        options_preflight_bypass: bool | NotGiven = NOT_GIVEN,
-        path_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_update_params.SelfHostedApplicationPolicy] | NotGiven = NOT_GIVEN,
-        same_site_cookie_attribute: str | NotGiven = NOT_GIVEN,
-        scim_config: application_update_params.SelfHostedApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        self_hosted_domains: List[SelfHostedDomains] | NotGiven = NOT_GIVEN,
-        service_auth_401_redirect: bool | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        skip_interstitial: bool | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
+        type: ApplicationType,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_update_params.SelfHostedApplicationDestination] | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_update_params.SelfHostedApplicationPolicy] | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_update_params.SelfHostedApplicationSCIMConfig | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationUpdateResponse]:
         """
         Updates an Access application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
-          domain: The primary hostname and path that Access will secure. If the app is visible in
-              the App Launcher dashboard, this is the domain that will be displayed.
+          domain: The primary hostname and path secured by Access. This domain will be displayed
+              if the app is visible in the App Launcher.
 
           type: The application type.
 
@@ -905,6 +1426,8 @@ def update(
               authentication. This setting always overrides the organization setting for WARP
               authentication.
 
+          allow_iframe: Enables loading application content in an iFrame.
+
           allowed_idps: The identity providers your users can select when connecting to this
               application. Defaults to all IdPs configured in your account.
 
@@ -924,6 +1447,10 @@ def update(
 
           custom_pages: The custom pages that will be displayed when applicable for this application
 
+          destinations: List of destinations secured by Access. This supersedes `self_hosted_domains` to
+              allow for more flexibility in defining different types of domains. If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
           enable_binding_cookie: Enables the binding cookie, which increases security against compromised
               authorization tokens and CSRF attacks.
 
@@ -940,29 +1467,44 @@ def update(
           path_cookie_attribute: Enables cookie paths to scope an application's JWT to the application path. If
               disabled, the JWT will scope to the hostname by default
 
-          policies: The policies that will apply to the application, in ascending order of
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
+          read_service_tokens_from_header: Allows matching Access Service Tokens passed HTTP in a single header with this
+              name. This works as an alternative to the (CF-Access-Client-Id,
+              CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+              as a json object similar to: { "cf-access-client-id":
+              "88bf3b6d86161464f6509f7219099e57.access.example.com",
+              "cf-access-client-secret":
+              "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+
           same_site_cookie_attribute: Sets the SameSite cookie setting, which provides increased security against CSRF
               attacks.
 
           scim_config: Configuration for provisioning to this application via SCIM. This is currently
               in closed beta.
 
-          self_hosted_domains: List of domains that Access will secure.
+          self_hosted_domains: List of public domains that Access will secure. This field is deprecated in
+              favor of `destinations` and will be supported until **November 21, 2025.** If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
 
           service_auth_401_redirect: Returns a 401 status code when the request is blocked by a Service Auth policy.
 
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           skip_interstitial: Enables automatic authentication through cloudflared.
 
           tags: The tags you want assigned to an application. Tags are used to filter
               applications in the App Launcher dashboard.
 
+          use_clientless_isolation_app_launcher_url: Determines if users can access this application via a clientless browser
+              isolation URL. This allows users to access private domains without connecting to
+              Gateway. The option requires Clientless Browser Isolation to be set up with
+              policies that allow users of this application.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -976,33 +1518,33 @@ def update(
     @overload
     def update(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        policies: List[application_update_params.SaaSApplicationPolicy] | NotGiven = NOT_GIVEN,
-        saas_app: application_update_params.SaaSApplicationSaaSApp | NotGiven = NOT_GIVEN,
-        scim_config: application_update_params.SaaSApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        policies: SequenceNotStr[application_update_params.SaaSApplicationPolicy] | Omit = omit,
+        saas_app: application_update_params.SaaSApplicationSaaSApp | Omit = omit,
+        scim_config: application_update_params.SaaSApplicationSCIMConfig | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        type: ApplicationType | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationUpdateResponse]:
         """
         Updates an Access application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -1022,7 +1564,7 @@ def update(
 
           name: The name of the application.
 
-          policies: The policies that will apply to the application, in ascending order of
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
@@ -1047,50 +1589,69 @@ def update(
     @overload
     def update(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
         domain: str,
-        type: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        cors_headers: CORSHeadersParam | NotGiven = NOT_GIVEN,
-        custom_deny_message: str | NotGiven = NOT_GIVEN,
-        custom_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_non_identity_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        enable_binding_cookie: bool | NotGiven = NOT_GIVEN,
-        http_only_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        options_preflight_bypass: bool | NotGiven = NOT_GIVEN,
-        path_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_update_params.BrowserSSHApplicationPolicy] | NotGiven = NOT_GIVEN,
-        same_site_cookie_attribute: str | NotGiven = NOT_GIVEN,
-        scim_config: application_update_params.BrowserSSHApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        self_hosted_domains: List[SelfHostedDomains] | NotGiven = NOT_GIVEN,
-        service_auth_401_redirect: bool | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        skip_interstitial: bool | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
+        type: Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ],
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_update_params.BrowserSSHApplicationDestination] | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_update_params.BrowserSSHApplicationPolicy] | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_update_params.BrowserSSHApplicationSCIMConfig | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationUpdateResponse]:
         """
         Updates an Access application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
-          domain: The primary hostname and path that Access will secure. If the app is visible in
-              the App Launcher dashboard, this is the domain that will be displayed.
+          domain: The primary hostname and path secured by Access. This domain will be displayed
+              if the app is visible in the App Launcher.
 
           type: The application type.
 
@@ -1103,6 +1664,8 @@ def update(
               authentication. This setting always overrides the organization setting for WARP
               authentication.
 
+          allow_iframe: Enables loading application content in an iFrame.
+
           allowed_idps: The identity providers your users can select when connecting to this
               application. Defaults to all IdPs configured in your account.
 
@@ -1122,6 +1685,10 @@ def update(
 
           custom_pages: The custom pages that will be displayed when applicable for this application
 
+          destinations: List of destinations secured by Access. This supersedes `self_hosted_domains` to
+              allow for more flexibility in defining different types of domains. If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
           enable_binding_cookie: Enables the binding cookie, which increases security against compromised
               authorization tokens and CSRF attacks.
 
@@ -1138,29 +1705,44 @@ def update(
           path_cookie_attribute: Enables cookie paths to scope an application's JWT to the application path. If
               disabled, the JWT will scope to the hostname by default
 
-          policies: The policies that will apply to the application, in ascending order of
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
+          read_service_tokens_from_header: Allows matching Access Service Tokens passed HTTP in a single header with this
+              name. This works as an alternative to the (CF-Access-Client-Id,
+              CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+              as a json object similar to: { "cf-access-client-id":
+              "88bf3b6d86161464f6509f7219099e57.access.example.com",
+              "cf-access-client-secret":
+              "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+
           same_site_cookie_attribute: Sets the SameSite cookie setting, which provides increased security against CSRF
               attacks.
 
           scim_config: Configuration for provisioning to this application via SCIM. This is currently
               in closed beta.
 
-          self_hosted_domains: List of domains that Access will secure.
+          self_hosted_domains: List of public domains that Access will secure. This field is deprecated in
+              favor of `destinations` and will be supported until **November 21, 2025.** If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
 
           service_auth_401_redirect: Returns a 401 status code when the request is blocked by a Service Auth policy.
 
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           skip_interstitial: Enables automatic authentication through cloudflared.
 
           tags: The tags you want assigned to an application. Tags are used to filter
               applications in the App Launcher dashboard.
 
+          use_clientless_isolation_app_launcher_url: Determines if users can access this application via a clientless browser
+              isolation URL. This allows users to access private domains without connecting to
+              Gateway. The option requires Clientless Browser Isolation to be set up with
+              policies that allow users of this application.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -1174,50 +1756,69 @@ def update(
     @overload
     def update(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
         domain: str,
-        type: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        cors_headers: CORSHeadersParam | NotGiven = NOT_GIVEN,
-        custom_deny_message: str | NotGiven = NOT_GIVEN,
-        custom_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_non_identity_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        enable_binding_cookie: bool | NotGiven = NOT_GIVEN,
-        http_only_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        options_preflight_bypass: bool | NotGiven = NOT_GIVEN,
-        path_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_update_params.BrowserVncApplicationPolicy] | NotGiven = NOT_GIVEN,
-        same_site_cookie_attribute: str | NotGiven = NOT_GIVEN,
-        scim_config: application_update_params.BrowserVncApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        self_hosted_domains: List[SelfHostedDomains] | NotGiven = NOT_GIVEN,
-        service_auth_401_redirect: bool | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        skip_interstitial: bool | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
+        type: Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ],
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_update_params.BrowserVNCApplicationDestination] | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_update_params.BrowserVNCApplicationPolicy] | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_update_params.BrowserVNCApplicationSCIMConfig | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationUpdateResponse]:
         """
         Updates an Access application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
-          domain: The primary hostname and path that Access will secure. If the app is visible in
-              the App Launcher dashboard, this is the domain that will be displayed.
+          domain: The primary hostname and path secured by Access. This domain will be displayed
+              if the app is visible in the App Launcher.
 
           type: The application type.
 
@@ -1230,6 +1831,8 @@ def update(
               authentication. This setting always overrides the organization setting for WARP
               authentication.
 
+          allow_iframe: Enables loading application content in an iFrame.
+
           allowed_idps: The identity providers your users can select when connecting to this
               application. Defaults to all IdPs configured in your account.
 
@@ -1249,6 +1852,10 @@ def update(
 
           custom_pages: The custom pages that will be displayed when applicable for this application
 
+          destinations: List of destinations secured by Access. This supersedes `self_hosted_domains` to
+              allow for more flexibility in defining different types of domains. If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
           enable_binding_cookie: Enables the binding cookie, which increases security against compromised
               authorization tokens and CSRF attacks.
 
@@ -1265,29 +1872,44 @@ def update(
           path_cookie_attribute: Enables cookie paths to scope an application's JWT to the application path. If
               disabled, the JWT will scope to the hostname by default
 
-          policies: The policies that will apply to the application, in ascending order of
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
+          read_service_tokens_from_header: Allows matching Access Service Tokens passed HTTP in a single header with this
+              name. This works as an alternative to the (CF-Access-Client-Id,
+              CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+              as a json object similar to: { "cf-access-client-id":
+              "88bf3b6d86161464f6509f7219099e57.access.example.com",
+              "cf-access-client-secret":
+              "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+
           same_site_cookie_attribute: Sets the SameSite cookie setting, which provides increased security against CSRF
               attacks.
 
           scim_config: Configuration for provisioning to this application via SCIM. This is currently
               in closed beta.
 
-          self_hosted_domains: List of domains that Access will secure.
+          self_hosted_domains: List of public domains that Access will secure. This field is deprecated in
+              favor of `destinations` and will be supported until **November 21, 2025.** If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
 
           service_auth_401_redirect: Returns a 401 status code when the request is blocked by a Service Auth policy.
 
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           skip_interstitial: Enables automatic authentication through cloudflared.
 
           tags: The tags you want assigned to an application. Tags are used to filter
               applications in the App Launcher dashboard.
 
+          use_clientless_isolation_app_launcher_url: Determines if users can access this application via a clientless browser
+              isolation URL. This allows users to access private domains without connecting to
+              Gateway. The option requires Clientless Browser Isolation to be set up with
+              policies that allow users of this application.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -1301,28 +1923,51 @@ def update(
     @overload
     def update(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
-        type: ApplicationType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_update_params.AppLauncherApplicationPolicy] | NotGiven = NOT_GIVEN,
-        scim_config: application_update_params.AppLauncherApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        type: Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ],
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_logo_url: str | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        bg_color: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        footer_links: Iterable[application_update_params.AppLauncherApplicationFooterLink] | Omit = omit,
+        header_bg_color: str | Omit = omit,
+        landing_page_design: application_update_params.AppLauncherApplicationLandingPageDesign | Omit = omit,
+        policies: SequenceNotStr[application_update_params.AppLauncherApplicationPolicy] | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_app_launcher_login_page: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationUpdateResponse]:
         """
         Updates an Access application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
           type: The application type.
 
@@ -1333,19 +1978,36 @@ def update(
           allowed_idps: The identity providers your users can select when connecting to this
               application. Defaults to all IdPs configured in your account.
 
+          app_launcher_logo_url: The image URL of the logo shown in the App Launcher header.
+
           auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
               login. You must specify only one identity provider in allowed_idps.
 
-          policies: The policies that will apply to the application, in ascending order of
+          bg_color: The background color of the App Launcher page.
+
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          footer_links: The links in the App Launcher footer.
+
+          header_bg_color: The background color of the App Launcher header.
+
+          landing_page_design: The design of the App Launcher landing page shown to users when they log in.
+
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
-          scim_config: Configuration for provisioning to this application via SCIM. This is currently
-              in closed beta.
-
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
+
+          skip_app_launcher_login_page: Determines when to skip the App Launcher landing page.
 
           extra_headers: Send extra headers
 
@@ -1360,28 +2022,30 @@ def update(
     @overload
     def update(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
         type: ApplicationType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_update_params.DeviceEnrollmentPermissionsApplicationPolicy] | NotGiven = NOT_GIVEN,
-        scim_config: application_update_params.DeviceEnrollmentPermissionsApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        policies: SequenceNotStr[application_update_params.DeviceEnrollmentPermissionsApplicationPolicy] | Omit = omit,
+        session_duration: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationUpdateResponse]:
         """
         Updates an Access application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
           type: The application type.
 
@@ -1395,16 +2059,21 @@ def update(
           auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
               login. You must specify only one identity provider in allowed_idps.
 
-          policies: The policies that will apply to the application, in ascending order of
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
-          scim_config: Configuration for provisioning to this application via SCIM. This is currently
-              in closed beta.
-
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           extra_headers: Send extra headers
 
@@ -1419,28 +2088,30 @@ def update(
     @overload
     def update(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
         type: ApplicationType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_update_params.BrowserIsolationPermissionsApplicationPolicy] | NotGiven = NOT_GIVEN,
-        scim_config: application_update_params.BrowserIsolationPermissionsApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        policies: SequenceNotStr[application_update_params.BrowserIsolationPermissionsApplicationPolicy] | Omit = omit,
+        session_duration: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationUpdateResponse]:
         """
         Updates an Access application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
           type: The application type.
 
@@ -1454,16 +2125,94 @@ def update(
           auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
               login. You must specify only one identity provider in allowed_idps.
 
-          policies: The policies that will apply to the application, in ascending order of
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
-          scim_config: Configuration for provisioning to this application via SCIM. This is currently
-              in closed beta.
+          session_duration: The amount of time that tokens issued for this application will be valid. Must
+              be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
+              s, m, h. Note: unsupported for infrastructure type applications.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def update(
+        self,
+        app_id: AppID,
+        *,
+        type: ApplicationType,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        domain: str | Omit = omit,
+        name: str | Omit = omit,
+        policies: SequenceNotStr[application_update_params.GatewayIdentityProxyEndpointApplicationPolicy] | Omit = omit,
+        session_duration: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ApplicationUpdateResponse]:
+        """
+        Updates an Access application.
+
+        Args:
+          app_id: Identifier.
+
+          type: The application type.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          allowed_idps: The identity providers your users can select when connecting to this
+              application. Defaults to all IdPs configured in your account.
+
+          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
+              login. You must specify only one identity provider in allowed_idps.
+
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          domain: The proxy endpoint domain in the format: 10 alphanumeric characters followed by
+              .proxy.cloudflare-gateway.com
+
+          name: The name of the application.
+
+          policies: The policies that Access applies to the application, in ascending order of
+              precedence. Items can reference existing policies or create new policies
+              exclusive to the application.
 
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           extra_headers: Send extra headers
 
@@ -1478,29 +2227,29 @@ def update(
     @overload
     def update(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        domain: str | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        scim_config: application_update_params.BookmarkApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        domain: str | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        policies: SequenceNotStr[application_update_params.BookmarkApplicationPolicy] | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        type: ApplicationType | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationUpdateResponse]:
         """
         Updates an Access application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -1514,13 +2263,211 @@ def update(
 
           name: The name of the application.
 
+          policies: The policies that Access applies to the application, in ascending order of
+              precedence. Items can reference existing policies or create new policies
+              exclusive to the application.
+
+          tags: The tags you want assigned to an application. Tags are used to filter
+              applications in the App Launcher dashboard.
+
+          type: The application type.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def update(
+        self,
+        app_id: AppID,
+        *,
+        target_criteria: Iterable[application_update_params.InfrastructureApplicationTargetCriterion],
+        type: ApplicationType,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        name: str | Omit = omit,
+        policies: Iterable[application_update_params.InfrastructureApplicationPolicy] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ApplicationUpdateResponse]:
+        """
+        Updates an Access application.
+
+        Args:
+          app_id: Identifier.
+
+          type: The application type.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          name: The name of the application.
+
+          policies: The policies that Access applies to the application.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def update(
+        self,
+        app_id: AppID,
+        *,
+        domain: str,
+        target_criteria: Iterable[application_update_params.BrowserRdpApplicationTargetCriterion],
+        type: ApplicationType,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_update_params.BrowserRdpApplicationDestination] | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_update_params.BrowserRdpApplicationPolicy] | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_update_params.BrowserRdpApplicationSCIMConfig | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ApplicationUpdateResponse]:
+        """
+        Updates an Access application.
+
+        Args:
+          app_id: Identifier.
+
+          domain: The primary hostname and path secured by Access. This domain will be displayed
+              if the app is visible in the App Launcher.
+
+          type: The application type.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          allow_authenticate_via_warp: When set to true, users can authenticate to this application using their WARP
+              session. When set to false this application will always require direct IdP
+              authentication. This setting always overrides the organization setting for WARP
+              authentication.
+
+          allow_iframe: Enables loading application content in an iFrame.
+
+          allowed_idps: The identity providers your users can select when connecting to this
+              application. Defaults to all IdPs configured in your account.
+
+          app_launcher_visible: Displays the application in the App Launcher.
+
+          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
+              login. You must specify only one identity provider in allowed_idps.
+
+          custom_deny_message: The custom error message shown to a user when they are denied access to the
+              application.
+
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          destinations: List of destinations secured by Access. This supersedes `self_hosted_domains` to
+              allow for more flexibility in defining different types of domains. If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
+          enable_binding_cookie: Enables the binding cookie, which increases security against compromised
+              authorization tokens and CSRF attacks.
+
+          http_only_cookie_attribute: Enables the HttpOnly cookie attribute, which increases security against XSS
+              attacks.
+
+          logo_url: The image URL for the logo shown in the App Launcher dashboard.
+
+          name: The name of the application.
+
+          options_preflight_bypass: Allows options preflight requests to bypass Access authentication and go
+              directly to the origin. Cannot turn on if cors_headers is set.
+
+          path_cookie_attribute: Enables cookie paths to scope an application's JWT to the application path. If
+              disabled, the JWT will scope to the hostname by default
+
+          policies: The policies that Access applies to the application, in ascending order of
+              precedence. Items can reference existing policies or create new policies
+              exclusive to the application.
+
+          read_service_tokens_from_header: Allows matching Access Service Tokens passed HTTP in a single header with this
+              name. This works as an alternative to the (CF-Access-Client-Id,
+              CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+              as a json object similar to: { "cf-access-client-id":
+              "88bf3b6d86161464f6509f7219099e57.access.example.com",
+              "cf-access-client-secret":
+              "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+
+          same_site_cookie_attribute: Sets the SameSite cookie setting, which provides increased security against CSRF
+              attacks.
+
           scim_config: Configuration for provisioning to this application via SCIM. This is currently
               in closed beta.
 
+          self_hosted_domains: List of public domains that Access will secure. This field is deprecated in
+              favor of `destinations` and will be supported until **November 21, 2025.** If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
+          service_auth_401_redirect: Returns a 401 status code when the request is blocked by a Service Auth policy.
+
+          session_duration: The amount of time that tokens issued for this application will be valid. Must
+              be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
+              s, m, h. Note: unsupported for infrastructure type applications.
+
+          skip_interstitial: Enables automatic authentication through cloudflared.
+
           tags: The tags you want assigned to an application. Tags are used to filter
               applications in the App Launcher dashboard.
 
-          type: The application type.
+          use_clientless_isolation_app_launcher_url: Determines if users can access this application via a clientless browser
+              isolation URL. This allows users to access private domains without connecting to
+              Gateway. The option requires Clientless Browser Isolation to be set up with
+              policies that allow users of this application.
 
           extra_headers: Send extra headers
 
@@ -1534,43 +2481,95 @@ def update(
 
     def update(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
-        domain: str | NotGiven = NOT_GIVEN,
-        type: str | ApplicationType | NotGiven = NOT_GIVEN,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        cors_headers: CORSHeadersParam | NotGiven = NOT_GIVEN,
-        custom_deny_message: str | NotGiven = NOT_GIVEN,
-        custom_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_non_identity_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        enable_binding_cookie: bool | NotGiven = NOT_GIVEN,
-        http_only_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        options_preflight_bypass: bool | NotGiven = NOT_GIVEN,
-        path_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_update_params.SelfHostedApplicationPolicy] | NotGiven = NOT_GIVEN,
-        same_site_cookie_attribute: str | NotGiven = NOT_GIVEN,
-        scim_config: application_update_params.SelfHostedApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        self_hosted_domains: List[SelfHostedDomains] | NotGiven = NOT_GIVEN,
-        service_auth_401_redirect: bool | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        skip_interstitial: bool | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
-        saas_app: application_update_params.SaaSApplicationSaaSApp | NotGiven = NOT_GIVEN,
+        domain: str | Omit = omit,
+        type: ApplicationType
+        | Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ]
+        | Omit = omit,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_update_params.SelfHostedApplicationDestination]
+        | Iterable[application_update_params.BrowserSSHApplicationDestination]
+        | Iterable[application_update_params.BrowserVNCApplicationDestination]
+        | Iterable[application_update_params.BrowserRdpApplicationDestination]
+        | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_update_params.SelfHostedApplicationPolicy]
+        | SequenceNotStr[application_update_params.SaaSApplicationPolicy]
+        | SequenceNotStr[application_update_params.BrowserSSHApplicationPolicy]
+        | SequenceNotStr[application_update_params.BrowserVNCApplicationPolicy]
+        | SequenceNotStr[application_update_params.AppLauncherApplicationPolicy]
+        | SequenceNotStr[application_update_params.DeviceEnrollmentPermissionsApplicationPolicy]
+        | SequenceNotStr[application_update_params.BrowserIsolationPermissionsApplicationPolicy]
+        | SequenceNotStr[application_update_params.GatewayIdentityProxyEndpointApplicationPolicy]
+        | SequenceNotStr[application_update_params.BookmarkApplicationPolicy]
+        | Iterable[application_update_params.InfrastructureApplicationPolicy]
+        | SequenceNotStr[application_update_params.BrowserRdpApplicationPolicy]
+        | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_update_params.SelfHostedApplicationSCIMConfig
+        | application_update_params.SaaSApplicationSCIMConfig
+        | application_update_params.BrowserSSHApplicationSCIMConfig
+        | application_update_params.BrowserVNCApplicationSCIMConfig
+        | application_update_params.BrowserRdpApplicationSCIMConfig
+        | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
+        saas_app: application_update_params.SaaSApplicationSaaSApp | Omit = omit,
+        app_launcher_logo_url: str | Omit = omit,
+        bg_color: str | Omit = omit,
+        footer_links: Iterable[application_update_params.AppLauncherApplicationFooterLink] | Omit = omit,
+        header_bg_color: str | Omit = omit,
+        landing_page_design: application_update_params.AppLauncherApplicationLandingPageDesign | Omit = omit,
+        skip_app_launcher_login_page: bool | Omit = omit,
+        target_criteria: Iterable[application_update_params.InfrastructureApplicationTargetCriterion]
+        | Iterable[application_update_params.BrowserRdpApplicationTargetCriterion]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationUpdateResponse]:
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
 
@@ -1592,6 +2591,7 @@ def update(
                         "domain": domain,
                         "type": type,
                         "allow_authenticate_via_warp": allow_authenticate_via_warp,
+                        "allow_iframe": allow_iframe,
                         "allowed_idps": allowed_idps,
                         "app_launcher_visible": app_launcher_visible,
                         "auto_redirect_to_identity": auto_redirect_to_identity,
@@ -1600,6 +2600,7 @@ def update(
                         "custom_deny_url": custom_deny_url,
                         "custom_non_identity_deny_url": custom_non_identity_deny_url,
                         "custom_pages": custom_pages,
+                        "destinations": destinations,
                         "enable_binding_cookie": enable_binding_cookie,
                         "http_only_cookie_attribute": http_only_cookie_attribute,
                         "logo_url": logo_url,
@@ -1607,6 +2608,7 @@ def update(
                         "options_preflight_bypass": options_preflight_bypass,
                         "path_cookie_attribute": path_cookie_attribute,
                         "policies": policies,
+                        "read_service_tokens_from_header": read_service_tokens_from_header,
                         "same_site_cookie_attribute": same_site_cookie_attribute,
                         "scim_config": scim_config,
                         "self_hosted_domains": self_hosted_domains,
@@ -1614,7 +2616,15 @@ def update(
                         "session_duration": session_duration,
                         "skip_interstitial": skip_interstitial,
                         "tags": tags,
+                        "use_clientless_isolation_app_launcher_url": use_clientless_isolation_app_launcher_url,
                         "saas_app": saas_app,
+                        "app_launcher_logo_url": app_launcher_logo_url,
+                        "bg_color": bg_color,
+                        "footer_links": footer_links,
+                        "header_bg_color": header_bg_color,
+                        "landing_page_design": landing_page_design,
+                        "skip_app_launcher_login_page": skip_app_launcher_login_page,
+                        "target_criteria": target_criteria,
                     },
                     application_update_params.ApplicationUpdateParams,
                 ),
@@ -1634,15 +2644,23 @@ def update(
     def list(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        aud: str | Omit = omit,
+        domain: str | Omit = omit,
+        exact: bool | Omit = omit,
+        name: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        target_attributes: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[ApplicationListResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[ApplicationListResponse]:
         """
         Lists all Access applications in an account or zone.
 
@@ -1651,6 +2669,22 @@ def list(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          aud: The aud of the app.
+
+          domain: The domain of the app.
+
+          exact: True for only exact string matches against passed name/domain query parameters.
+
+          name: The name of the app.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
+          search: Search for apps by other listed query parameters.
+
+          target_attributes: Target Criteria attributes in key=value format.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -1673,31 +2707,47 @@ def list(
             account_or_zone_id = zone_id
         return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/access/apps",
-            page=SyncSinglePage[ApplicationListResponse],
+            page=SyncV4PagePaginationArray[ApplicationListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "aud": aud,
+                        "domain": domain,
+                        "exact": exact,
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                        "target_attributes": target_attributes,
+                    },
+                    application_list_params.ApplicationListParams,
+                ),
             ),
             model=cast(Any, ApplicationListResponse),  # Union types cannot be passed in as arguments in the type system
         )
 
     def delete(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationDeleteResponse]:
         """
         Deletes an application from Access.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -1711,6 +2761,8 @@ def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
 
@@ -1737,22 +2789,22 @@ def delete(
 
     def get(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationGetResponse]:
         """
         Fetches information about an Access application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -1766,6 +2818,8 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
 
@@ -1797,22 +2851,22 @@ def get(
 
     def revoke_tokens(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Revokes all tokens issued for an application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -1826,6 +2880,8 @@ def revoke_tokens(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
 
@@ -1865,57 +2921,80 @@ def policies(self) -> AsyncPoliciesResource:
         return AsyncPoliciesResource(self._client)
 
     @cached_property
-    def with_raw_response(self) -> AsyncApplicationsResourceWithRawResponse:
-        return AsyncApplicationsResourceWithRawResponse(self)
+    def policy_tests(self) -> AsyncPolicyTestsResource:
+        return AsyncPolicyTestsResource(self._client)
 
     @cached_property
-    def with_streaming_response(self) -> AsyncApplicationsResourceWithStreamingResponse:
-        return AsyncApplicationsResourceWithStreamingResponse(self)
+    def settings(self) -> AsyncSettingsResource:
+        return AsyncSettingsResource(self._client)
 
-    @overload
+    @cached_property
+    def with_raw_response(self) -> AsyncApplicationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncApplicationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncApplicationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncApplicationsResourceWithStreamingResponse(self)
+
+    @overload
     async def create(
         self,
         *,
         domain: str,
-        type: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        cors_headers: CORSHeadersParam | NotGiven = NOT_GIVEN,
-        custom_deny_message: str | NotGiven = NOT_GIVEN,
-        custom_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_non_identity_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        enable_binding_cookie: bool | NotGiven = NOT_GIVEN,
-        http_only_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        options_preflight_bypass: bool | NotGiven = NOT_GIVEN,
-        path_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_create_params.SelfHostedApplicationPolicy] | NotGiven = NOT_GIVEN,
-        same_site_cookie_attribute: str | NotGiven = NOT_GIVEN,
-        scim_config: application_create_params.SelfHostedApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        self_hosted_domains: List[SelfHostedDomains] | NotGiven = NOT_GIVEN,
-        service_auth_401_redirect: bool | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        skip_interstitial: bool | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
+        type: ApplicationType,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_create_params.SelfHostedApplicationDestination] | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_create_params.SelfHostedApplicationPolicy] | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_create_params.SelfHostedApplicationSCIMConfig | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationCreateResponse]:
         """
         Adds a new application to Access.
 
         Args:
-          domain: The primary hostname and path that Access will secure. If the app is visible in
-              the App Launcher dashboard, this is the domain that will be displayed.
+          domain: The primary hostname and path secured by Access. This domain will be displayed
+              if the app is visible in the App Launcher.
 
           type: The application type.
 
@@ -1928,6 +3007,8 @@ async def create(
               authentication. This setting always overrides the organization setting for WARP
               authentication.
 
+          allow_iframe: Enables loading application content in an iFrame.
+
           allowed_idps: The identity providers your users can select when connecting to this
               application. Defaults to all IdPs configured in your account.
 
@@ -1947,6 +3028,10 @@ async def create(
 
           custom_pages: The custom pages that will be displayed when applicable for this application
 
+          destinations: List of destinations secured by Access. This supersedes `self_hosted_domains` to
+              allow for more flexibility in defining different types of domains. If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
           enable_binding_cookie: Enables the binding cookie, which increases security against compromised
               authorization tokens and CSRF attacks.
 
@@ -1963,29 +3048,44 @@ async def create(
           path_cookie_attribute: Enables cookie paths to scope an application's JWT to the application path. If
               disabled, the JWT will scope to the hostname by default
 
-          policies: The policies that will apply to the application, in ascending order of
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
+          read_service_tokens_from_header: Allows matching Access Service Tokens passed HTTP in a single header with this
+              name. This works as an alternative to the (CF-Access-Client-Id,
+              CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+              as a json object similar to: { "cf-access-client-id":
+              "88bf3b6d86161464f6509f7219099e57.access.example.com",
+              "cf-access-client-secret":
+              "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+
           same_site_cookie_attribute: Sets the SameSite cookie setting, which provides increased security against CSRF
               attacks.
 
           scim_config: Configuration for provisioning to this application via SCIM. This is currently
               in closed beta.
 
-          self_hosted_domains: List of domains that Access will secure.
+          self_hosted_domains: List of public domains that Access will secure. This field is deprecated in
+              favor of `destinations` and will be supported until **November 21, 2025.** If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
 
           service_auth_401_redirect: Returns a 401 status code when the request is blocked by a Service Auth policy.
 
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           skip_interstitial: Enables automatic authentication through cloudflared.
 
           tags: The tags you want assigned to an application. Tags are used to filter
               applications in the App Launcher dashboard.
 
+          use_clientless_isolation_app_launcher_url: Determines if users can access this application via a clientless browser
+              isolation URL. This allows users to access private domains without connecting to
+              Gateway. The option requires Clientless Browser Isolation to be set up with
+              policies that allow users of this application.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -2000,25 +3100,25 @@ async def create(
     async def create(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        policies: List[application_create_params.SaaSApplicationPolicy] | NotGiven = NOT_GIVEN,
-        saas_app: application_create_params.SaaSApplicationSaaSApp | NotGiven = NOT_GIVEN,
-        scim_config: application_create_params.SaaSApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        policies: SequenceNotStr[application_create_params.SaaSApplicationPolicy] | Omit = omit,
+        saas_app: application_create_params.SaaSApplicationSaaSApp | Omit = omit,
+        scim_config: application_create_params.SaaSApplicationSCIMConfig | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        type: ApplicationType | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationCreateResponse]:
         """
         Adds a new application to Access.
@@ -2042,7 +3142,7 @@ async def create(
 
           name: The name of the application.
 
-          policies: The policies that will apply to the application, in ascending order of
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
@@ -2069,45 +3169,64 @@ async def create(
         self,
         *,
         domain: str,
-        type: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        cors_headers: CORSHeadersParam | NotGiven = NOT_GIVEN,
-        custom_deny_message: str | NotGiven = NOT_GIVEN,
-        custom_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_non_identity_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        enable_binding_cookie: bool | NotGiven = NOT_GIVEN,
-        http_only_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        options_preflight_bypass: bool | NotGiven = NOT_GIVEN,
-        path_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_create_params.BrowserSSHApplicationPolicy] | NotGiven = NOT_GIVEN,
-        same_site_cookie_attribute: str | NotGiven = NOT_GIVEN,
-        scim_config: application_create_params.BrowserSSHApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        self_hosted_domains: List[SelfHostedDomains] | NotGiven = NOT_GIVEN,
-        service_auth_401_redirect: bool | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        skip_interstitial: bool | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
+        type: Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ],
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_create_params.BrowserSSHApplicationDestination] | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_create_params.BrowserSSHApplicationPolicy] | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_create_params.BrowserSSHApplicationSCIMConfig | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationCreateResponse]:
         """
         Adds a new application to Access.
 
         Args:
-          domain: The primary hostname and path that Access will secure. If the app is visible in
-              the App Launcher dashboard, this is the domain that will be displayed.
+          domain: The primary hostname and path secured by Access. This domain will be displayed
+              if the app is visible in the App Launcher.
 
           type: The application type.
 
@@ -2120,6 +3239,8 @@ async def create(
               authentication. This setting always overrides the organization setting for WARP
               authentication.
 
+          allow_iframe: Enables loading application content in an iFrame.
+
           allowed_idps: The identity providers your users can select when connecting to this
               application. Defaults to all IdPs configured in your account.
 
@@ -2139,6 +3260,10 @@ async def create(
 
           custom_pages: The custom pages that will be displayed when applicable for this application
 
+          destinations: List of destinations secured by Access. This supersedes `self_hosted_domains` to
+              allow for more flexibility in defining different types of domains. If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
           enable_binding_cookie: Enables the binding cookie, which increases security against compromised
               authorization tokens and CSRF attacks.
 
@@ -2155,29 +3280,44 @@ async def create(
           path_cookie_attribute: Enables cookie paths to scope an application's JWT to the application path. If
               disabled, the JWT will scope to the hostname by default
 
-          policies: The policies that will apply to the application, in ascending order of
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
+          read_service_tokens_from_header: Allows matching Access Service Tokens passed HTTP in a single header with this
+              name. This works as an alternative to the (CF-Access-Client-Id,
+              CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+              as a json object similar to: { "cf-access-client-id":
+              "88bf3b6d86161464f6509f7219099e57.access.example.com",
+              "cf-access-client-secret":
+              "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+
           same_site_cookie_attribute: Sets the SameSite cookie setting, which provides increased security against CSRF
               attacks.
 
           scim_config: Configuration for provisioning to this application via SCIM. This is currently
               in closed beta.
 
-          self_hosted_domains: List of domains that Access will secure.
+          self_hosted_domains: List of public domains that Access will secure. This field is deprecated in
+              favor of `destinations` and will be supported until **November 21, 2025.** If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
 
           service_auth_401_redirect: Returns a 401 status code when the request is blocked by a Service Auth policy.
 
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           skip_interstitial: Enables automatic authentication through cloudflared.
 
           tags: The tags you want assigned to an application. Tags are used to filter
               applications in the App Launcher dashboard.
 
+          use_clientless_isolation_app_launcher_url: Determines if users can access this application via a clientless browser
+              isolation URL. This allows users to access private domains without connecting to
+              Gateway. The option requires Clientless Browser Isolation to be set up with
+              policies that allow users of this application.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -2193,45 +3333,64 @@ async def create(
         self,
         *,
         domain: str,
-        type: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        cors_headers: CORSHeadersParam | NotGiven = NOT_GIVEN,
-        custom_deny_message: str | NotGiven = NOT_GIVEN,
-        custom_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_non_identity_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        enable_binding_cookie: bool | NotGiven = NOT_GIVEN,
-        http_only_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        options_preflight_bypass: bool | NotGiven = NOT_GIVEN,
-        path_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_create_params.BrowserVncApplicationPolicy] | NotGiven = NOT_GIVEN,
-        same_site_cookie_attribute: str | NotGiven = NOT_GIVEN,
-        scim_config: application_create_params.BrowserVncApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        self_hosted_domains: List[SelfHostedDomains] | NotGiven = NOT_GIVEN,
-        service_auth_401_redirect: bool | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        skip_interstitial: bool | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
+        type: Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ],
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_create_params.BrowserVNCApplicationDestination] | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_create_params.BrowserVNCApplicationPolicy] | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_create_params.BrowserVNCApplicationSCIMConfig | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationCreateResponse]:
         """
         Adds a new application to Access.
 
         Args:
-          domain: The primary hostname and path that Access will secure. If the app is visible in
-              the App Launcher dashboard, this is the domain that will be displayed.
+          domain: The primary hostname and path secured by Access. This domain will be displayed
+              if the app is visible in the App Launcher.
 
           type: The application type.
 
@@ -2244,6 +3403,8 @@ async def create(
               authentication. This setting always overrides the organization setting for WARP
               authentication.
 
+          allow_iframe: Enables loading application content in an iFrame.
+
           allowed_idps: The identity providers your users can select when connecting to this
               application. Defaults to all IdPs configured in your account.
 
@@ -2263,6 +3424,10 @@ async def create(
 
           custom_pages: The custom pages that will be displayed when applicable for this application
 
+          destinations: List of destinations secured by Access. This supersedes `self_hosted_domains` to
+              allow for more flexibility in defining different types of domains. If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
           enable_binding_cookie: Enables the binding cookie, which increases security against compromised
               authorization tokens and CSRF attacks.
 
@@ -2279,29 +3444,44 @@ async def create(
           path_cookie_attribute: Enables cookie paths to scope an application's JWT to the application path. If
               disabled, the JWT will scope to the hostname by default
 
-          policies: The policies that will apply to the application, in ascending order of
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
+          read_service_tokens_from_header: Allows matching Access Service Tokens passed HTTP in a single header with this
+              name. This works as an alternative to the (CF-Access-Client-Id,
+              CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+              as a json object similar to: { "cf-access-client-id":
+              "88bf3b6d86161464f6509f7219099e57.access.example.com",
+              "cf-access-client-secret":
+              "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+
           same_site_cookie_attribute: Sets the SameSite cookie setting, which provides increased security against CSRF
               attacks.
 
           scim_config: Configuration for provisioning to this application via SCIM. This is currently
               in closed beta.
 
-          self_hosted_domains: List of domains that Access will secure.
+          self_hosted_domains: List of public domains that Access will secure. This field is deprecated in
+              favor of `destinations` and will be supported until **November 21, 2025.** If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
 
           service_auth_401_redirect: Returns a 401 status code when the request is blocked by a Service Auth policy.
 
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           skip_interstitial: Enables automatic authentication through cloudflared.
 
           tags: The tags you want assigned to an application. Tags are used to filter
               applications in the App Launcher dashboard.
 
+          use_clientless_isolation_app_launcher_url: Determines if users can access this application via a clientless browser
+              isolation URL. This allows users to access private domains without connecting to
+              Gateway. The option requires Clientless Browser Isolation to be set up with
+              policies that allow users of this application.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -2316,20 +3496,43 @@ async def create(
     async def create(
         self,
         *,
-        type: ApplicationType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_create_params.AppLauncherApplicationPolicy] | NotGiven = NOT_GIVEN,
-        scim_config: application_create_params.AppLauncherApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        type: Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ],
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_logo_url: str | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        bg_color: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        footer_links: Iterable[application_create_params.AppLauncherApplicationFooterLink] | Omit = omit,
+        header_bg_color: str | Omit = omit,
+        landing_page_design: application_create_params.AppLauncherApplicationLandingPageDesign | Omit = omit,
+        policies: SequenceNotStr[application_create_params.AppLauncherApplicationPolicy] | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_app_launcher_login_page: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationCreateResponse]:
         """
         Adds a new application to Access.
@@ -2344,19 +3547,36 @@ async def create(
           allowed_idps: The identity providers your users can select when connecting to this
               application. Defaults to all IdPs configured in your account.
 
+          app_launcher_logo_url: The image URL of the logo shown in the App Launcher header.
+
           auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
               login. You must specify only one identity provider in allowed_idps.
 
-          policies: The policies that will apply to the application, in ascending order of
+          bg_color: The background color of the App Launcher page.
+
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          footer_links: The links in the App Launcher footer.
+
+          header_bg_color: The background color of the App Launcher header.
+
+          landing_page_design: The design of the App Launcher landing page shown to users when they log in.
+
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
-          scim_config: Configuration for provisioning to this application via SCIM. This is currently
-              in closed beta.
-
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
+
+          skip_app_launcher_login_page: Determines when to skip the App Launcher landing page.
 
           extra_headers: Send extra headers
 
@@ -2373,19 +3593,21 @@ async def create(
         self,
         *,
         type: ApplicationType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_create_params.DeviceEnrollmentPermissionsApplicationPolicy] | NotGiven = NOT_GIVEN,
-        scim_config: application_create_params.DeviceEnrollmentPermissionsApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        policies: SequenceNotStr[application_create_params.DeviceEnrollmentPermissionsApplicationPolicy] | Omit = omit,
+        session_duration: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationCreateResponse]:
         """
         Adds a new application to Access.
@@ -2403,16 +3625,21 @@ async def create(
           auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
               login. You must specify only one identity provider in allowed_idps.
 
-          policies: The policies that will apply to the application, in ascending order of
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
-          scim_config: Configuration for provisioning to this application via SCIM. This is currently
-              in closed beta.
-
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           extra_headers: Send extra headers
 
@@ -2429,19 +3656,21 @@ async def create(
         self,
         *,
         type: ApplicationType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_create_params.BrowserIsolationPermissionsApplicationPolicy] | NotGiven = NOT_GIVEN,
-        scim_config: application_create_params.BrowserIsolationPermissionsApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        policies: SequenceNotStr[application_create_params.BrowserIsolationPermissionsApplicationPolicy] | Omit = omit,
+        session_duration: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationCreateResponse]:
         """
         Adds a new application to Access.
@@ -2459,16 +3688,91 @@ async def create(
           auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
               login. You must specify only one identity provider in allowed_idps.
 
-          policies: The policies that will apply to the application, in ascending order of
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
-          scim_config: Configuration for provisioning to this application via SCIM. This is currently
-              in closed beta.
+          session_duration: The amount of time that tokens issued for this application will be valid. Must
+              be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
+              s, m, h. Note: unsupported for infrastructure type applications.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        *,
+        type: ApplicationType,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        domain: str | Omit = omit,
+        name: str | Omit = omit,
+        policies: SequenceNotStr[application_create_params.GatewayIdentityProxyEndpointApplicationPolicy] | Omit = omit,
+        session_duration: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ApplicationCreateResponse]:
+        """
+        Adds a new application to Access.
+
+        Args:
+          type: The application type.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          allowed_idps: The identity providers your users can select when connecting to this
+              application. Defaults to all IdPs configured in your account.
+
+          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
+              login. You must specify only one identity provider in allowed_idps.
+
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          domain: The proxy endpoint domain in the format: 10 alphanumeric characters followed by
+              .proxy.cloudflare-gateway.com
+
+          name: The name of the application.
+
+          policies: The policies that Access applies to the application, in ascending order of
+              precedence. Items can reference existing policies or create new policies
+              exclusive to the application.
 
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           extra_headers: Send extra headers
 
@@ -2484,21 +3788,21 @@ async def create(
     async def create(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        domain: str | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        scim_config: application_create_params.BookmarkApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        domain: str | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        policies: SequenceNotStr[application_create_params.BookmarkApplicationPolicy] | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        type: ApplicationType | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationCreateResponse]:
         """
         Adds a new application to Access.
@@ -2516,13 +3820,205 @@ async def create(
 
           name: The name of the application.
 
+          policies: The policies that Access applies to the application, in ascending order of
+              precedence. Items can reference existing policies or create new policies
+              exclusive to the application.
+
+          tags: The tags you want assigned to an application. Tags are used to filter
+              applications in the App Launcher dashboard.
+
+          type: The application type.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        *,
+        target_criteria: Iterable[application_create_params.InfrastructureApplicationTargetCriterion],
+        type: ApplicationType,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        name: str | Omit = omit,
+        policies: Iterable[application_create_params.InfrastructureApplicationPolicy] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ApplicationCreateResponse]:
+        """
+        Adds a new application to Access.
+
+        Args:
+          type: The application type.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          name: The name of the application.
+
+          policies: The policies that Access applies to the application.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def create(
+        self,
+        *,
+        domain: str,
+        target_criteria: Iterable[application_create_params.BrowserRdpApplicationTargetCriterion],
+        type: ApplicationType,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_create_params.BrowserRdpApplicationDestination] | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_create_params.BrowserRdpApplicationPolicy] | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_create_params.BrowserRdpApplicationSCIMConfig | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ApplicationCreateResponse]:
+        """
+        Adds a new application to Access.
+
+        Args:
+          domain: The primary hostname and path secured by Access. This domain will be displayed
+              if the app is visible in the App Launcher.
+
+          type: The application type.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          allow_authenticate_via_warp: When set to true, users can authenticate to this application using their WARP
+              session. When set to false this application will always require direct IdP
+              authentication. This setting always overrides the organization setting for WARP
+              authentication.
+
+          allow_iframe: Enables loading application content in an iFrame.
+
+          allowed_idps: The identity providers your users can select when connecting to this
+              application. Defaults to all IdPs configured in your account.
+
+          app_launcher_visible: Displays the application in the App Launcher.
+
+          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
+              login. You must specify only one identity provider in allowed_idps.
+
+          custom_deny_message: The custom error message shown to a user when they are denied access to the
+              application.
+
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          destinations: List of destinations secured by Access. This supersedes `self_hosted_domains` to
+              allow for more flexibility in defining different types of domains. If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
+          enable_binding_cookie: Enables the binding cookie, which increases security against compromised
+              authorization tokens and CSRF attacks.
+
+          http_only_cookie_attribute: Enables the HttpOnly cookie attribute, which increases security against XSS
+              attacks.
+
+          logo_url: The image URL for the logo shown in the App Launcher dashboard.
+
+          name: The name of the application.
+
+          options_preflight_bypass: Allows options preflight requests to bypass Access authentication and go
+              directly to the origin. Cannot turn on if cors_headers is set.
+
+          path_cookie_attribute: Enables cookie paths to scope an application's JWT to the application path. If
+              disabled, the JWT will scope to the hostname by default
+
+          policies: The policies that Access applies to the application, in ascending order of
+              precedence. Items can reference existing policies or create new policies
+              exclusive to the application.
+
+          read_service_tokens_from_header: Allows matching Access Service Tokens passed HTTP in a single header with this
+              name. This works as an alternative to the (CF-Access-Client-Id,
+              CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+              as a json object similar to: { "cf-access-client-id":
+              "88bf3b6d86161464f6509f7219099e57.access.example.com",
+              "cf-access-client-secret":
+              "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+
+          same_site_cookie_attribute: Sets the SameSite cookie setting, which provides increased security against CSRF
+              attacks.
+
           scim_config: Configuration for provisioning to this application via SCIM. This is currently
               in closed beta.
 
+          self_hosted_domains: List of public domains that Access will secure. This field is deprecated in
+              favor of `destinations` and will be supported until **November 21, 2025.** If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
+          service_auth_401_redirect: Returns a 401 status code when the request is blocked by a Service Auth policy.
+
+          session_duration: The amount of time that tokens issued for this application will be valid. Must
+              be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
+              s, m, h. Note: unsupported for infrastructure type applications.
+
+          skip_interstitial: Enables automatic authentication through cloudflared.
+
           tags: The tags you want assigned to an application. Tags are used to filter
               applications in the App Launcher dashboard.
 
-          type: The application type.
+          use_clientless_isolation_app_launcher_url: Determines if users can access this application via a clientless browser
+              isolation URL. This allows users to access private domains without connecting to
+              Gateway. The option requires Clientless Browser Isolation to be set up with
+              policies that allow users of this application.
 
           extra_headers: Send extra headers
 
@@ -2537,40 +4033,90 @@ async def create(
     async def create(
         self,
         *,
-        domain: str | NotGiven = NOT_GIVEN,
-        type: str | ApplicationType | NotGiven = NOT_GIVEN,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        cors_headers: CORSHeadersParam | NotGiven = NOT_GIVEN,
-        custom_deny_message: str | NotGiven = NOT_GIVEN,
-        custom_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_non_identity_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        enable_binding_cookie: bool | NotGiven = NOT_GIVEN,
-        http_only_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        options_preflight_bypass: bool | NotGiven = NOT_GIVEN,
-        path_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_create_params.SelfHostedApplicationPolicy] | NotGiven = NOT_GIVEN,
-        same_site_cookie_attribute: str | NotGiven = NOT_GIVEN,
-        scim_config: application_create_params.SelfHostedApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        self_hosted_domains: List[SelfHostedDomains] | NotGiven = NOT_GIVEN,
-        service_auth_401_redirect: bool | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        skip_interstitial: bool | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
-        saas_app: application_create_params.SaaSApplicationSaaSApp | NotGiven = NOT_GIVEN,
+        domain: str | Omit = omit,
+        type: ApplicationType
+        | Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ]
+        | Omit = omit,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_create_params.SelfHostedApplicationDestination]
+        | Iterable[application_create_params.BrowserSSHApplicationDestination]
+        | Iterable[application_create_params.BrowserVNCApplicationDestination]
+        | Iterable[application_create_params.BrowserRdpApplicationDestination]
+        | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_create_params.SelfHostedApplicationPolicy]
+        | SequenceNotStr[application_create_params.SaaSApplicationPolicy]
+        | SequenceNotStr[application_create_params.BrowserSSHApplicationPolicy]
+        | SequenceNotStr[application_create_params.BrowserVNCApplicationPolicy]
+        | SequenceNotStr[application_create_params.AppLauncherApplicationPolicy]
+        | SequenceNotStr[application_create_params.DeviceEnrollmentPermissionsApplicationPolicy]
+        | SequenceNotStr[application_create_params.BrowserIsolationPermissionsApplicationPolicy]
+        | SequenceNotStr[application_create_params.GatewayIdentityProxyEndpointApplicationPolicy]
+        | SequenceNotStr[application_create_params.BookmarkApplicationPolicy]
+        | Iterable[application_create_params.InfrastructureApplicationPolicy]
+        | SequenceNotStr[application_create_params.BrowserRdpApplicationPolicy]
+        | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_create_params.SelfHostedApplicationSCIMConfig
+        | application_create_params.SaaSApplicationSCIMConfig
+        | application_create_params.BrowserSSHApplicationSCIMConfig
+        | application_create_params.BrowserVNCApplicationSCIMConfig
+        | application_create_params.BrowserRdpApplicationSCIMConfig
+        | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
+        saas_app: application_create_params.SaaSApplicationSaaSApp | Omit = omit,
+        app_launcher_logo_url: str | Omit = omit,
+        bg_color: str | Omit = omit,
+        footer_links: Iterable[application_create_params.AppLauncherApplicationFooterLink] | Omit = omit,
+        header_bg_color: str | Omit = omit,
+        landing_page_design: application_create_params.AppLauncherApplicationLandingPageDesign | Omit = omit,
+        skip_app_launcher_login_page: bool | Omit = omit,
+        target_criteria: Iterable[application_create_params.InfrastructureApplicationTargetCriterion]
+        | Iterable[application_create_params.BrowserRdpApplicationTargetCriterion]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationCreateResponse]:
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
@@ -2593,6 +4139,7 @@ async def create(
                         "domain": domain,
                         "type": type,
                         "allow_authenticate_via_warp": allow_authenticate_via_warp,
+                        "allow_iframe": allow_iframe,
                         "allowed_idps": allowed_idps,
                         "app_launcher_visible": app_launcher_visible,
                         "auto_redirect_to_identity": auto_redirect_to_identity,
@@ -2601,6 +4148,7 @@ async def create(
                         "custom_deny_url": custom_deny_url,
                         "custom_non_identity_deny_url": custom_non_identity_deny_url,
                         "custom_pages": custom_pages,
+                        "destinations": destinations,
                         "enable_binding_cookie": enable_binding_cookie,
                         "http_only_cookie_attribute": http_only_cookie_attribute,
                         "logo_url": logo_url,
@@ -2608,6 +4156,7 @@ async def create(
                         "options_preflight_bypass": options_preflight_bypass,
                         "path_cookie_attribute": path_cookie_attribute,
                         "policies": policies,
+                        "read_service_tokens_from_header": read_service_tokens_from_header,
                         "same_site_cookie_attribute": same_site_cookie_attribute,
                         "scim_config": scim_config,
                         "self_hosted_domains": self_hosted_domains,
@@ -2615,7 +4164,15 @@ async def create(
                         "session_duration": session_duration,
                         "skip_interstitial": skip_interstitial,
                         "tags": tags,
+                        "use_clientless_isolation_app_launcher_url": use_clientless_isolation_app_launcher_url,
                         "saas_app": saas_app,
+                        "app_launcher_logo_url": app_launcher_logo_url,
+                        "bg_color": bg_color,
+                        "footer_links": footer_links,
+                        "header_bg_color": header_bg_color,
+                        "landing_page_design": landing_page_design,
+                        "skip_app_launcher_login_page": skip_app_launcher_login_page,
+                        "target_criteria": target_criteria,
                     },
                     application_create_params.ApplicationCreateParams,
                 ),
@@ -2635,50 +4192,459 @@ async def create(
     @overload
     async def update(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
+        *,
+        domain: str,
+        type: ApplicationType,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_update_params.SelfHostedApplicationDestination] | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_update_params.SelfHostedApplicationPolicy] | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_update_params.SelfHostedApplicationSCIMConfig | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ApplicationUpdateResponse]:
+        """
+        Updates an Access application.
+
+        Args:
+          app_id: Identifier.
+
+          domain: The primary hostname and path secured by Access. This domain will be displayed
+              if the app is visible in the App Launcher.
+
+          type: The application type.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          allow_authenticate_via_warp: When set to true, users can authenticate to this application using their WARP
+              session. When set to false this application will always require direct IdP
+              authentication. This setting always overrides the organization setting for WARP
+              authentication.
+
+          allow_iframe: Enables loading application content in an iFrame.
+
+          allowed_idps: The identity providers your users can select when connecting to this
+              application. Defaults to all IdPs configured in your account.
+
+          app_launcher_visible: Displays the application in the App Launcher.
+
+          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
+              login. You must specify only one identity provider in allowed_idps.
+
+          custom_deny_message: The custom error message shown to a user when they are denied access to the
+              application.
+
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          destinations: List of destinations secured by Access. This supersedes `self_hosted_domains` to
+              allow for more flexibility in defining different types of domains. If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
+          enable_binding_cookie: Enables the binding cookie, which increases security against compromised
+              authorization tokens and CSRF attacks.
+
+          http_only_cookie_attribute: Enables the HttpOnly cookie attribute, which increases security against XSS
+              attacks.
+
+          logo_url: The image URL for the logo shown in the App Launcher dashboard.
+
+          name: The name of the application.
+
+          options_preflight_bypass: Allows options preflight requests to bypass Access authentication and go
+              directly to the origin. Cannot turn on if cors_headers is set.
+
+          path_cookie_attribute: Enables cookie paths to scope an application's JWT to the application path. If
+              disabled, the JWT will scope to the hostname by default
+
+          policies: The policies that Access applies to the application, in ascending order of
+              precedence. Items can reference existing policies or create new policies
+              exclusive to the application.
+
+          read_service_tokens_from_header: Allows matching Access Service Tokens passed HTTP in a single header with this
+              name. This works as an alternative to the (CF-Access-Client-Id,
+              CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+              as a json object similar to: { "cf-access-client-id":
+              "88bf3b6d86161464f6509f7219099e57.access.example.com",
+              "cf-access-client-secret":
+              "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+
+          same_site_cookie_attribute: Sets the SameSite cookie setting, which provides increased security against CSRF
+              attacks.
+
+          scim_config: Configuration for provisioning to this application via SCIM. This is currently
+              in closed beta.
+
+          self_hosted_domains: List of public domains that Access will secure. This field is deprecated in
+              favor of `destinations` and will be supported until **November 21, 2025.** If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
+          service_auth_401_redirect: Returns a 401 status code when the request is blocked by a Service Auth policy.
+
+          session_duration: The amount of time that tokens issued for this application will be valid. Must
+              be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
+              s, m, h. Note: unsupported for infrastructure type applications.
+
+          skip_interstitial: Enables automatic authentication through cloudflared.
+
+          tags: The tags you want assigned to an application. Tags are used to filter
+              applications in the App Launcher dashboard.
+
+          use_clientless_isolation_app_launcher_url: Determines if users can access this application via a clientless browser
+              isolation URL. This allows users to access private domains without connecting to
+              Gateway. The option requires Clientless Browser Isolation to be set up with
+              policies that allow users of this application.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def update(
+        self,
+        app_id: AppID,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        policies: SequenceNotStr[application_update_params.SaaSApplicationPolicy] | Omit = omit,
+        saas_app: application_update_params.SaaSApplicationSaaSApp | Omit = omit,
+        scim_config: application_update_params.SaaSApplicationSCIMConfig | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        type: ApplicationType | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ApplicationUpdateResponse]:
+        """
+        Updates an Access application.
+
+        Args:
+          app_id: Identifier.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          allowed_idps: The identity providers your users can select when connecting to this
+              application. Defaults to all IdPs configured in your account.
+
+          app_launcher_visible: Displays the application in the App Launcher.
+
+          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
+              login. You must specify only one identity provider in allowed_idps.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          logo_url: The image URL for the logo shown in the App Launcher dashboard.
+
+          name: The name of the application.
+
+          policies: The policies that Access applies to the application, in ascending order of
+              precedence. Items can reference existing policies or create new policies
+              exclusive to the application.
+
+          scim_config: Configuration for provisioning to this application via SCIM. This is currently
+              in closed beta.
+
+          tags: The tags you want assigned to an application. Tags are used to filter
+              applications in the App Launcher dashboard.
+
+          type: The application type.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def update(
+        self,
+        app_id: AppID,
+        *,
+        domain: str,
+        type: Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ],
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_update_params.BrowserSSHApplicationDestination] | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_update_params.BrowserSSHApplicationPolicy] | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_update_params.BrowserSSHApplicationSCIMConfig | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ApplicationUpdateResponse]:
+        """
+        Updates an Access application.
+
+        Args:
+          app_id: Identifier.
+
+          domain: The primary hostname and path secured by Access. This domain will be displayed
+              if the app is visible in the App Launcher.
+
+          type: The application type.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          allow_authenticate_via_warp: When set to true, users can authenticate to this application using their WARP
+              session. When set to false this application will always require direct IdP
+              authentication. This setting always overrides the organization setting for WARP
+              authentication.
+
+          allow_iframe: Enables loading application content in an iFrame.
+
+          allowed_idps: The identity providers your users can select when connecting to this
+              application. Defaults to all IdPs configured in your account.
+
+          app_launcher_visible: Displays the application in the App Launcher.
+
+          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
+              login. You must specify only one identity provider in allowed_idps.
+
+          custom_deny_message: The custom error message shown to a user when they are denied access to the
+              application.
+
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          destinations: List of destinations secured by Access. This supersedes `self_hosted_domains` to
+              allow for more flexibility in defining different types of domains. If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
+          enable_binding_cookie: Enables the binding cookie, which increases security against compromised
+              authorization tokens and CSRF attacks.
+
+          http_only_cookie_attribute: Enables the HttpOnly cookie attribute, which increases security against XSS
+              attacks.
+
+          logo_url: The image URL for the logo shown in the App Launcher dashboard.
+
+          name: The name of the application.
+
+          options_preflight_bypass: Allows options preflight requests to bypass Access authentication and go
+              directly to the origin. Cannot turn on if cors_headers is set.
+
+          path_cookie_attribute: Enables cookie paths to scope an application's JWT to the application path. If
+              disabled, the JWT will scope to the hostname by default
+
+          policies: The policies that Access applies to the application, in ascending order of
+              precedence. Items can reference existing policies or create new policies
+              exclusive to the application.
+
+          read_service_tokens_from_header: Allows matching Access Service Tokens passed HTTP in a single header with this
+              name. This works as an alternative to the (CF-Access-Client-Id,
+              CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+              as a json object similar to: { "cf-access-client-id":
+              "88bf3b6d86161464f6509f7219099e57.access.example.com",
+              "cf-access-client-secret":
+              "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+
+          same_site_cookie_attribute: Sets the SameSite cookie setting, which provides increased security against CSRF
+              attacks.
+
+          scim_config: Configuration for provisioning to this application via SCIM. This is currently
+              in closed beta.
+
+          self_hosted_domains: List of public domains that Access will secure. This field is deprecated in
+              favor of `destinations` and will be supported until **November 21, 2025.** If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
+          service_auth_401_redirect: Returns a 401 status code when the request is blocked by a Service Auth policy.
+
+          session_duration: The amount of time that tokens issued for this application will be valid. Must
+              be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
+              s, m, h. Note: unsupported for infrastructure type applications.
+
+          skip_interstitial: Enables automatic authentication through cloudflared.
+
+          tags: The tags you want assigned to an application. Tags are used to filter
+              applications in the App Launcher dashboard.
+
+          use_clientless_isolation_app_launcher_url: Determines if users can access this application via a clientless browser
+              isolation URL. This allows users to access private domains without connecting to
+              Gateway. The option requires Clientless Browser Isolation to be set up with
+              policies that allow users of this application.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def update(
+        self,
+        app_id: AppID,
         *,
         domain: str,
-        type: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        cors_headers: CORSHeadersParam | NotGiven = NOT_GIVEN,
-        custom_deny_message: str | NotGiven = NOT_GIVEN,
-        custom_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_non_identity_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        enable_binding_cookie: bool | NotGiven = NOT_GIVEN,
-        http_only_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        options_preflight_bypass: bool | NotGiven = NOT_GIVEN,
-        path_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_update_params.SelfHostedApplicationPolicy] | NotGiven = NOT_GIVEN,
-        same_site_cookie_attribute: str | NotGiven = NOT_GIVEN,
-        scim_config: application_update_params.SelfHostedApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        self_hosted_domains: List[SelfHostedDomains] | NotGiven = NOT_GIVEN,
-        service_auth_401_redirect: bool | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        skip_interstitial: bool | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
+        type: Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ],
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_update_params.BrowserVNCApplicationDestination] | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_update_params.BrowserVNCApplicationPolicy] | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_update_params.BrowserVNCApplicationSCIMConfig | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationUpdateResponse]:
         """
         Updates an Access application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
-          domain: The primary hostname and path that Access will secure. If the app is visible in
-              the App Launcher dashboard, this is the domain that will be displayed.
+          domain: The primary hostname and path secured by Access. This domain will be displayed
+              if the app is visible in the App Launcher.
 
           type: The application type.
 
@@ -2691,6 +4657,8 @@ async def update(
               authentication. This setting always overrides the organization setting for WARP
               authentication.
 
+          allow_iframe: Enables loading application content in an iFrame.
+
           allowed_idps: The identity providers your users can select when connecting to this
               application. Defaults to all IdPs configured in your account.
 
@@ -2710,6 +4678,10 @@ async def update(
 
           custom_pages: The custom pages that will be displayed when applicable for this application
 
+          destinations: List of destinations secured by Access. This supersedes `self_hosted_domains` to
+              allow for more flexibility in defining different types of domains. If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
           enable_binding_cookie: Enables the binding cookie, which increases security against compromised
               authorization tokens and CSRF attacks.
 
@@ -2726,29 +4698,44 @@ async def update(
           path_cookie_attribute: Enables cookie paths to scope an application's JWT to the application path. If
               disabled, the JWT will scope to the hostname by default
 
-          policies: The policies that will apply to the application, in ascending order of
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
+          read_service_tokens_from_header: Allows matching Access Service Tokens passed HTTP in a single header with this
+              name. This works as an alternative to the (CF-Access-Client-Id,
+              CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+              as a json object similar to: { "cf-access-client-id":
+              "88bf3b6d86161464f6509f7219099e57.access.example.com",
+              "cf-access-client-secret":
+              "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+
           same_site_cookie_attribute: Sets the SameSite cookie setting, which provides increased security against CSRF
               attacks.
 
           scim_config: Configuration for provisioning to this application via SCIM. This is currently
               in closed beta.
 
-          self_hosted_domains: List of domains that Access will secure.
+          self_hosted_domains: List of public domains that Access will secure. This field is deprecated in
+              favor of `destinations` and will be supported until **November 21, 2025.** If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
 
           service_auth_401_redirect: Returns a 401 status code when the request is blocked by a Service Auth policy.
 
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           skip_interstitial: Enables automatic authentication through cloudflared.
 
           tags: The tags you want assigned to an application. Tags are used to filter
               applications in the App Launcher dashboard.
 
+          use_clientless_isolation_app_launcher_url: Determines if users can access this application via a clientless browser
+              isolation URL. This allows users to access private domains without connecting to
+              Gateway. The option requires Clientless Browser Isolation to be set up with
+              policies that allow users of this application.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -2762,33 +4749,53 @@ async def update(
     @overload
     async def update(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        policies: List[application_update_params.SaaSApplicationPolicy] | NotGiven = NOT_GIVEN,
-        saas_app: application_update_params.SaaSApplicationSaaSApp | NotGiven = NOT_GIVEN,
-        scim_config: application_update_params.SaaSApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        type: Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ],
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_logo_url: str | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        bg_color: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        footer_links: Iterable[application_update_params.AppLauncherApplicationFooterLink] | Omit = omit,
+        header_bg_color: str | Omit = omit,
+        landing_page_design: application_update_params.AppLauncherApplicationLandingPageDesign | Omit = omit,
+        policies: SequenceNotStr[application_update_params.AppLauncherApplicationPolicy] | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_app_launcher_login_page: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationUpdateResponse]:
         """
         Updates an Access application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
+
+          type: The application type.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -2797,28 +4804,36 @@ async def update(
           allowed_idps: The identity providers your users can select when connecting to this
               application. Defaults to all IdPs configured in your account.
 
-          app_launcher_visible: Displays the application in the App Launcher.
+          app_launcher_logo_url: The image URL of the logo shown in the App Launcher header.
 
           auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
               login. You must specify only one identity provider in allowed_idps.
 
+          bg_color: The background color of the App Launcher page.
+
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
           custom_pages: The custom pages that will be displayed when applicable for this application
 
-          logo_url: The image URL for the logo shown in the App Launcher dashboard.
+          footer_links: The links in the App Launcher footer.
 
-          name: The name of the application.
+          header_bg_color: The background color of the App Launcher header.
+
+          landing_page_design: The design of the App Launcher landing page shown to users when they log in.
 
-          policies: The policies that will apply to the application, in ascending order of
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
-          scim_config: Configuration for provisioning to this application via SCIM. This is currently
-              in closed beta.
-
-          tags: The tags you want assigned to an application. Tags are used to filter
-              applications in the App Launcher dashboard.
+          session_duration: The amount of time that tokens issued for this application will be valid. Must
+              be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
+              s, m, h. Note: unsupported for infrastructure type applications.
 
-          type: The application type.
+          skip_app_launcher_login_page: Determines when to skip the App Launcher landing page.
 
           extra_headers: Send extra headers
 
@@ -2833,50 +4848,30 @@ async def update(
     @overload
     async def update(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
-        domain: str,
-        type: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        cors_headers: CORSHeadersParam | NotGiven = NOT_GIVEN,
-        custom_deny_message: str | NotGiven = NOT_GIVEN,
-        custom_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_non_identity_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        enable_binding_cookie: bool | NotGiven = NOT_GIVEN,
-        http_only_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        options_preflight_bypass: bool | NotGiven = NOT_GIVEN,
-        path_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_update_params.BrowserSSHApplicationPolicy] | NotGiven = NOT_GIVEN,
-        same_site_cookie_attribute: str | NotGiven = NOT_GIVEN,
-        scim_config: application_update_params.BrowserSSHApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        self_hosted_domains: List[SelfHostedDomains] | NotGiven = NOT_GIVEN,
-        service_auth_401_redirect: bool | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        skip_interstitial: bool | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
+        type: ApplicationType,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        policies: SequenceNotStr[application_update_params.DeviceEnrollmentPermissionsApplicationPolicy] | Omit = omit,
+        session_duration: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationUpdateResponse]:
         """
         Updates an Access application.
 
         Args:
-          app_id: Identifier
-
-          domain: The primary hostname and path that Access will secure. If the app is visible in
-              the App Launcher dashboard, this is the domain that will be displayed.
+          app_id: Identifier.
 
           type: The application type.
 
@@ -2884,22 +4879,12 @@ async def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          allow_authenticate_via_warp: When set to true, users can authenticate to this application using their WARP
-              session. When set to false this application will always require direct IdP
-              authentication. This setting always overrides the organization setting for WARP
-              authentication.
-
           allowed_idps: The identity providers your users can select when connecting to this
               application. Defaults to all IdPs configured in your account.
 
-          app_launcher_visible: Displays the application in the App Launcher.
-
           auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
               login. You must specify only one identity provider in allowed_idps.
 
-          custom_deny_message: The custom error message shown to a user when they are denied access to the
-              application.
-
           custom_deny_url: The custom URL a user is redirected to when they are denied access to the
               application when failing identity-based rules.
 
@@ -2908,44 +4893,13 @@ async def update(
 
           custom_pages: The custom pages that will be displayed when applicable for this application
 
-          enable_binding_cookie: Enables the binding cookie, which increases security against compromised
-              authorization tokens and CSRF attacks.
-
-          http_only_cookie_attribute: Enables the HttpOnly cookie attribute, which increases security against XSS
-              attacks.
-
-          logo_url: The image URL for the logo shown in the App Launcher dashboard.
-
-          name: The name of the application.
-
-          options_preflight_bypass: Allows options preflight requests to bypass Access authentication and go
-              directly to the origin. Cannot turn on if cors_headers is set.
-
-          path_cookie_attribute: Enables cookie paths to scope an application's JWT to the application path. If
-              disabled, the JWT will scope to the hostname by default
-
-          policies: The policies that will apply to the application, in ascending order of
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
-          same_site_cookie_attribute: Sets the SameSite cookie setting, which provides increased security against CSRF
-              attacks.
-
-          scim_config: Configuration for provisioning to this application via SCIM. This is currently
-              in closed beta.
-
-          self_hosted_domains: List of domains that Access will secure.
-
-          service_auth_401_redirect: Returns a 401 status code when the request is blocked by a Service Auth policy.
-
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
-
-          skip_interstitial: Enables automatic authentication through cloudflared.
-
-          tags: The tags you want assigned to an application. Tags are used to filter
-              applications in the App Launcher dashboard.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           extra_headers: Send extra headers
 
@@ -2960,50 +4914,30 @@ async def update(
     @overload
     async def update(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
-        domain: str,
-        type: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        cors_headers: CORSHeadersParam | NotGiven = NOT_GIVEN,
-        custom_deny_message: str | NotGiven = NOT_GIVEN,
-        custom_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_non_identity_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        enable_binding_cookie: bool | NotGiven = NOT_GIVEN,
-        http_only_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        options_preflight_bypass: bool | NotGiven = NOT_GIVEN,
-        path_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_update_params.BrowserVncApplicationPolicy] | NotGiven = NOT_GIVEN,
-        same_site_cookie_attribute: str | NotGiven = NOT_GIVEN,
-        scim_config: application_update_params.BrowserVncApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        self_hosted_domains: List[SelfHostedDomains] | NotGiven = NOT_GIVEN,
-        service_auth_401_redirect: bool | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        skip_interstitial: bool | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
+        type: ApplicationType,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        policies: SequenceNotStr[application_update_params.BrowserIsolationPermissionsApplicationPolicy] | Omit = omit,
+        session_duration: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationUpdateResponse]:
         """
         Updates an Access application.
 
         Args:
-          app_id: Identifier
-
-          domain: The primary hostname and path that Access will secure. If the app is visible in
-              the App Launcher dashboard, this is the domain that will be displayed.
+          app_id: Identifier.
 
           type: The application type.
 
@@ -3011,22 +4945,12 @@ async def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          allow_authenticate_via_warp: When set to true, users can authenticate to this application using their WARP
-              session. When set to false this application will always require direct IdP
-              authentication. This setting always overrides the organization setting for WARP
-              authentication.
-
           allowed_idps: The identity providers your users can select when connecting to this
               application. Defaults to all IdPs configured in your account.
 
-          app_launcher_visible: Displays the application in the App Launcher.
-
           auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
               login. You must specify only one identity provider in allowed_idps.
 
-          custom_deny_message: The custom error message shown to a user when they are denied access to the
-              application.
-
           custom_deny_url: The custom URL a user is redirected to when they are denied access to the
               application when failing identity-based rules.
 
@@ -3035,44 +4959,13 @@ async def update(
 
           custom_pages: The custom pages that will be displayed when applicable for this application
 
-          enable_binding_cookie: Enables the binding cookie, which increases security against compromised
-              authorization tokens and CSRF attacks.
-
-          http_only_cookie_attribute: Enables the HttpOnly cookie attribute, which increases security against XSS
-              attacks.
-
-          logo_url: The image URL for the logo shown in the App Launcher dashboard.
-
-          name: The name of the application.
-
-          options_preflight_bypass: Allows options preflight requests to bypass Access authentication and go
-              directly to the origin. Cannot turn on if cors_headers is set.
-
-          path_cookie_attribute: Enables cookie paths to scope an application's JWT to the application path. If
-              disabled, the JWT will scope to the hostname by default
-
-          policies: The policies that will apply to the application, in ascending order of
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
-          same_site_cookie_attribute: Sets the SameSite cookie setting, which provides increased security against CSRF
-              attacks.
-
-          scim_config: Configuration for provisioning to this application via SCIM. This is currently
-              in closed beta.
-
-          self_hosted_domains: List of domains that Access will secure.
-
-          service_auth_401_redirect: Returns a 401 status code when the request is blocked by a Service Auth policy.
-
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
-
-          skip_interstitial: Enables automatic authentication through cloudflared.
-
-          tags: The tags you want assigned to an application. Tags are used to filter
-              applications in the App Launcher dashboard.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           extra_headers: Send extra headers
 
@@ -3087,28 +4980,32 @@ async def update(
     @overload
     async def update(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
         type: ApplicationType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_update_params.AppLauncherApplicationPolicy] | NotGiven = NOT_GIVEN,
-        scim_config: application_update_params.AppLauncherApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        domain: str | Omit = omit,
+        name: str | Omit = omit,
+        policies: SequenceNotStr[application_update_params.GatewayIdentityProxyEndpointApplicationPolicy] | Omit = omit,
+        session_duration: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationUpdateResponse]:
         """
         Updates an Access application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
           type: The application type.
 
@@ -3122,16 +5019,26 @@ async def update(
           auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
               login. You must specify only one identity provider in allowed_idps.
 
-          policies: The policies that will apply to the application, in ascending order of
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          domain: The proxy endpoint domain in the format: 10 alphanumeric characters followed by
+              .proxy.cloudflare-gateway.com
+
+          name: The name of the application.
+
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
-          scim_config: Configuration for provisioning to this application via SCIM. This is currently
-              in closed beta.
-
           session_duration: The amount of time that tokens issued for this application will be valid. Must
               be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+              s, m, h. Note: unsupported for infrastructure type applications.
 
           extra_headers: Send extra headers
 
@@ -3146,51 +5053,50 @@ async def update(
     @overload
     async def update(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
-        type: ApplicationType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_update_params.DeviceEnrollmentPermissionsApplicationPolicy] | NotGiven = NOT_GIVEN,
-        scim_config: application_update_params.DeviceEnrollmentPermissionsApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        domain: str | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        policies: SequenceNotStr[application_update_params.BookmarkApplicationPolicy] | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        type: ApplicationType | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationUpdateResponse]:
         """
         Updates an Access application.
 
         Args:
-          app_id: Identifier
-
-          type: The application type.
+          app_id: Identifier.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          allowed_idps: The identity providers your users can select when connecting to this
-              application. Defaults to all IdPs configured in your account.
+          app_launcher_visible: Displays the application in the App Launcher.
 
-          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
-              login. You must specify only one identity provider in allowed_idps.
+          domain: The URL or domain of the bookmark.
+
+          logo_url: The image URL for the logo shown in the App Launcher dashboard.
+
+          name: The name of the application.
 
-          policies: The policies that will apply to the application, in ascending order of
+          policies: The policies that Access applies to the application, in ascending order of
               precedence. Items can reference existing policies or create new policies
               exclusive to the application.
 
-          scim_config: Configuration for provisioning to this application via SCIM. This is currently
-              in closed beta.
+          tags: The tags you want assigned to an application. Tags are used to filter
+              applications in the App Launcher dashboard.
 
-          session_duration: The amount of time that tokens issued for this application will be valid. Must
-              be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+          type: The application type.
 
           extra_headers: Send extra headers
 
@@ -3205,28 +5111,26 @@ async def update(
     @overload
     async def update(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
+        target_criteria: Iterable[application_update_params.InfrastructureApplicationTargetCriterion],
         type: ApplicationType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_update_params.BrowserIsolationPermissionsApplicationPolicy] | NotGiven = NOT_GIVEN,
-        scim_config: application_update_params.BrowserIsolationPermissionsApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        name: str | Omit = omit,
+        policies: Iterable[application_update_params.InfrastructureApplicationPolicy] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationUpdateResponse]:
         """
         Updates an Access application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
           type: The application type.
 
@@ -3234,22 +5138,9 @@ async def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          allowed_idps: The identity providers your users can select when connecting to this
-              application. Defaults to all IdPs configured in your account.
-
-          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
-              login. You must specify only one identity provider in allowed_idps.
-
-          policies: The policies that will apply to the application, in ascending order of
-              precedence. Items can reference existing policies or create new policies
-              exclusive to the application.
-
-          scim_config: Configuration for provisioning to this application via SCIM. This is currently
-              in closed beta.
+          name: The name of the application.
 
-          session_duration: The amount of time that tokens issued for this application will be valid. Must
-              be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-              s, m, h.
+          policies: The policies that Access applies to the application.
 
           extra_headers: Send extra headers
 
@@ -3264,49 +5155,145 @@ async def update(
     @overload
     async def update(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        domain: str | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        scim_config: application_update_params.BookmarkApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
-        type: str | NotGiven = NOT_GIVEN,
+        domain: str,
+        target_criteria: Iterable[application_update_params.BrowserRdpApplicationTargetCriterion],
+        type: ApplicationType,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_update_params.BrowserRdpApplicationDestination] | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_update_params.BrowserRdpApplicationPolicy] | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_update_params.BrowserRdpApplicationSCIMConfig | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationUpdateResponse]:
         """
         Updates an Access application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
+
+          domain: The primary hostname and path secured by Access. This domain will be displayed
+              if the app is visible in the App Launcher.
+
+          type: The application type.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          allow_authenticate_via_warp: When set to true, users can authenticate to this application using their WARP
+              session. When set to false this application will always require direct IdP
+              authentication. This setting always overrides the organization setting for WARP
+              authentication.
+
+          allow_iframe: Enables loading application content in an iFrame.
+
+          allowed_idps: The identity providers your users can select when connecting to this
+              application. Defaults to all IdPs configured in your account.
+
           app_launcher_visible: Displays the application in the App Launcher.
 
-          domain: The URL or domain of the bookmark.
+          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
+              login. You must specify only one identity provider in allowed_idps.
+
+          custom_deny_message: The custom error message shown to a user when they are denied access to the
+              application.
+
+          custom_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing identity-based rules.
+
+          custom_non_identity_deny_url: The custom URL a user is redirected to when they are denied access to the
+              application when failing non-identity rules.
+
+          custom_pages: The custom pages that will be displayed when applicable for this application
+
+          destinations: List of destinations secured by Access. This supersedes `self_hosted_domains` to
+              allow for more flexibility in defining different types of domains. If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
+          enable_binding_cookie: Enables the binding cookie, which increases security against compromised
+              authorization tokens and CSRF attacks.
+
+          http_only_cookie_attribute: Enables the HttpOnly cookie attribute, which increases security against XSS
+              attacks.
 
           logo_url: The image URL for the logo shown in the App Launcher dashboard.
 
           name: The name of the application.
 
+          options_preflight_bypass: Allows options preflight requests to bypass Access authentication and go
+              directly to the origin. Cannot turn on if cors_headers is set.
+
+          path_cookie_attribute: Enables cookie paths to scope an application's JWT to the application path. If
+              disabled, the JWT will scope to the hostname by default
+
+          policies: The policies that Access applies to the application, in ascending order of
+              precedence. Items can reference existing policies or create new policies
+              exclusive to the application.
+
+          read_service_tokens_from_header: Allows matching Access Service Tokens passed HTTP in a single header with this
+              name. This works as an alternative to the (CF-Access-Client-Id,
+              CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+              as a json object similar to: { "cf-access-client-id":
+              "88bf3b6d86161464f6509f7219099e57.access.example.com",
+              "cf-access-client-secret":
+              "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+
+          same_site_cookie_attribute: Sets the SameSite cookie setting, which provides increased security against CSRF
+              attacks.
+
           scim_config: Configuration for provisioning to this application via SCIM. This is currently
               in closed beta.
 
+          self_hosted_domains: List of public domains that Access will secure. This field is deprecated in
+              favor of `destinations` and will be supported until **November 21, 2025.** If
+              `destinations` are provided, then `self_hosted_domains` will be ignored.
+
+          service_auth_401_redirect: Returns a 401 status code when the request is blocked by a Service Auth policy.
+
+          session_duration: The amount of time that tokens issued for this application will be valid. Must
+              be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
+              s, m, h. Note: unsupported for infrastructure type applications.
+
+          skip_interstitial: Enables automatic authentication through cloudflared.
+
           tags: The tags you want assigned to an application. Tags are used to filter
               applications in the App Launcher dashboard.
 
-          type: The application type.
+          use_clientless_isolation_app_launcher_url: Determines if users can access this application via a clientless browser
+              isolation URL. This allows users to access private domains without connecting to
+              Gateway. The option requires Clientless Browser Isolation to be set up with
+              policies that allow users of this application.
 
           extra_headers: Send extra headers
 
@@ -3320,43 +5307,95 @@ async def update(
 
     async def update(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
-        domain: str | NotGiven = NOT_GIVEN,
-        type: str | ApplicationType | NotGiven = NOT_GIVEN,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        allowed_idps: List[AllowedIdPs] | NotGiven = NOT_GIVEN,
-        app_launcher_visible: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        cors_headers: CORSHeadersParam | NotGiven = NOT_GIVEN,
-        custom_deny_message: str | NotGiven = NOT_GIVEN,
-        custom_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_non_identity_deny_url: str | NotGiven = NOT_GIVEN,
-        custom_pages: List[str] | NotGiven = NOT_GIVEN,
-        enable_binding_cookie: bool | NotGiven = NOT_GIVEN,
-        http_only_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        logo_url: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        options_preflight_bypass: bool | NotGiven = NOT_GIVEN,
-        path_cookie_attribute: bool | NotGiven = NOT_GIVEN,
-        policies: List[application_update_params.SelfHostedApplicationPolicy] | NotGiven = NOT_GIVEN,
-        same_site_cookie_attribute: str | NotGiven = NOT_GIVEN,
-        scim_config: application_update_params.SelfHostedApplicationSCIMConfig | NotGiven = NOT_GIVEN,
-        self_hosted_domains: List[SelfHostedDomains] | NotGiven = NOT_GIVEN,
-        service_auth_401_redirect: bool | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        skip_interstitial: bool | NotGiven = NOT_GIVEN,
-        tags: List[str] | NotGiven = NOT_GIVEN,
-        saas_app: application_update_params.SaaSApplicationSaaSApp | NotGiven = NOT_GIVEN,
+        domain: str | Omit = omit,
+        type: ApplicationType
+        | Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ]
+        | Omit = omit,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        allowed_idps: SequenceNotStr[AllowedIdPs] | Omit = omit,
+        app_launcher_visible: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        cors_headers: CORSHeadersParam | Omit = omit,
+        custom_deny_message: str | Omit = omit,
+        custom_deny_url: str | Omit = omit,
+        custom_non_identity_deny_url: str | Omit = omit,
+        custom_pages: SequenceNotStr[str] | Omit = omit,
+        destinations: Iterable[application_update_params.SelfHostedApplicationDestination]
+        | Iterable[application_update_params.BrowserSSHApplicationDestination]
+        | Iterable[application_update_params.BrowserVNCApplicationDestination]
+        | Iterable[application_update_params.BrowserRdpApplicationDestination]
+        | Omit = omit,
+        enable_binding_cookie: bool | Omit = omit,
+        http_only_cookie_attribute: bool | Omit = omit,
+        logo_url: str | Omit = omit,
+        name: str | Omit = omit,
+        options_preflight_bypass: bool | Omit = omit,
+        path_cookie_attribute: bool | Omit = omit,
+        policies: SequenceNotStr[application_update_params.SelfHostedApplicationPolicy]
+        | SequenceNotStr[application_update_params.SaaSApplicationPolicy]
+        | SequenceNotStr[application_update_params.BrowserSSHApplicationPolicy]
+        | SequenceNotStr[application_update_params.BrowserVNCApplicationPolicy]
+        | SequenceNotStr[application_update_params.AppLauncherApplicationPolicy]
+        | SequenceNotStr[application_update_params.DeviceEnrollmentPermissionsApplicationPolicy]
+        | SequenceNotStr[application_update_params.BrowserIsolationPermissionsApplicationPolicy]
+        | SequenceNotStr[application_update_params.GatewayIdentityProxyEndpointApplicationPolicy]
+        | SequenceNotStr[application_update_params.BookmarkApplicationPolicy]
+        | Iterable[application_update_params.InfrastructureApplicationPolicy]
+        | SequenceNotStr[application_update_params.BrowserRdpApplicationPolicy]
+        | Omit = omit,
+        read_service_tokens_from_header: str | Omit = omit,
+        same_site_cookie_attribute: str | Omit = omit,
+        scim_config: application_update_params.SelfHostedApplicationSCIMConfig
+        | application_update_params.SaaSApplicationSCIMConfig
+        | application_update_params.BrowserSSHApplicationSCIMConfig
+        | application_update_params.BrowserVNCApplicationSCIMConfig
+        | application_update_params.BrowserRdpApplicationSCIMConfig
+        | Omit = omit,
+        self_hosted_domains: SequenceNotStr[SelfHostedDomains] | Omit = omit,
+        service_auth_401_redirect: bool | Omit = omit,
+        session_duration: str | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        tags: SequenceNotStr[str] | Omit = omit,
+        use_clientless_isolation_app_launcher_url: bool | Omit = omit,
+        saas_app: application_update_params.SaaSApplicationSaaSApp | Omit = omit,
+        app_launcher_logo_url: str | Omit = omit,
+        bg_color: str | Omit = omit,
+        footer_links: Iterable[application_update_params.AppLauncherApplicationFooterLink] | Omit = omit,
+        header_bg_color: str | Omit = omit,
+        landing_page_design: application_update_params.AppLauncherApplicationLandingPageDesign | Omit = omit,
+        skip_app_launcher_login_page: bool | Omit = omit,
+        target_criteria: Iterable[application_update_params.InfrastructureApplicationTargetCriterion]
+        | Iterable[application_update_params.BrowserRdpApplicationTargetCriterion]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationUpdateResponse]:
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
 
@@ -3378,6 +5417,7 @@ async def update(
                         "domain": domain,
                         "type": type,
                         "allow_authenticate_via_warp": allow_authenticate_via_warp,
+                        "allow_iframe": allow_iframe,
                         "allowed_idps": allowed_idps,
                         "app_launcher_visible": app_launcher_visible,
                         "auto_redirect_to_identity": auto_redirect_to_identity,
@@ -3386,6 +5426,7 @@ async def update(
                         "custom_deny_url": custom_deny_url,
                         "custom_non_identity_deny_url": custom_non_identity_deny_url,
                         "custom_pages": custom_pages,
+                        "destinations": destinations,
                         "enable_binding_cookie": enable_binding_cookie,
                         "http_only_cookie_attribute": http_only_cookie_attribute,
                         "logo_url": logo_url,
@@ -3393,6 +5434,7 @@ async def update(
                         "options_preflight_bypass": options_preflight_bypass,
                         "path_cookie_attribute": path_cookie_attribute,
                         "policies": policies,
+                        "read_service_tokens_from_header": read_service_tokens_from_header,
                         "same_site_cookie_attribute": same_site_cookie_attribute,
                         "scim_config": scim_config,
                         "self_hosted_domains": self_hosted_domains,
@@ -3400,7 +5442,15 @@ async def update(
                         "session_duration": session_duration,
                         "skip_interstitial": skip_interstitial,
                         "tags": tags,
+                        "use_clientless_isolation_app_launcher_url": use_clientless_isolation_app_launcher_url,
                         "saas_app": saas_app,
+                        "app_launcher_logo_url": app_launcher_logo_url,
+                        "bg_color": bg_color,
+                        "footer_links": footer_links,
+                        "header_bg_color": header_bg_color,
+                        "landing_page_design": landing_page_design,
+                        "skip_app_launcher_login_page": skip_app_launcher_login_page,
+                        "target_criteria": target_criteria,
                     },
                     application_update_params.ApplicationUpdateParams,
                 ),
@@ -3420,15 +5470,23 @@ async def update(
     def list(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        aud: str | Omit = omit,
+        domain: str | Omit = omit,
+        exact: bool | Omit = omit,
+        name: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        target_attributes: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[ApplicationListResponse, AsyncSinglePage[ApplicationListResponse]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ApplicationListResponse, AsyncV4PagePaginationArray[ApplicationListResponse]]:
         """
         Lists all Access applications in an account or zone.
 
@@ -3437,6 +5495,22 @@ def list(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          aud: The aud of the app.
+
+          domain: The domain of the app.
+
+          exact: True for only exact string matches against passed name/domain query parameters.
+
+          name: The name of the app.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
+          search: Search for apps by other listed query parameters.
+
+          target_attributes: Target Criteria attributes in key=value format.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -3459,31 +5533,47 @@ def list(
             account_or_zone_id = zone_id
         return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/access/apps",
-            page=AsyncSinglePage[ApplicationListResponse],
+            page=AsyncV4PagePaginationArray[ApplicationListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "aud": aud,
+                        "domain": domain,
+                        "exact": exact,
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                        "target_attributes": target_attributes,
+                    },
+                    application_list_params.ApplicationListParams,
+                ),
             ),
             model=cast(Any, ApplicationListResponse),  # Union types cannot be passed in as arguments in the type system
         )
 
     async def delete(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationDeleteResponse]:
         """
         Deletes an application from Access.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -3497,6 +5587,8 @@ async def delete(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
 
@@ -3523,22 +5615,22 @@ async def delete(
 
     async def get(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ApplicationGetResponse]:
         """
         Fetches information about an Access application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -3552,6 +5644,8 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
 
@@ -3583,22 +5677,22 @@ async def get(
 
     async def revoke_tokens(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Revokes all tokens issued for an application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -3612,6 +5706,8 @@ async def revoke_tokens(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
 
@@ -3672,6 +5768,14 @@ def user_policy_checks(self) -> UserPolicyChecksResourceWithRawResponse:
     def policies(self) -> PoliciesResourceWithRawResponse:
         return PoliciesResourceWithRawResponse(self._applications.policies)
 
+    @cached_property
+    def policy_tests(self) -> PolicyTestsResourceWithRawResponse:
+        return PolicyTestsResourceWithRawResponse(self._applications.policy_tests)
+
+    @cached_property
+    def settings(self) -> SettingsResourceWithRawResponse:
+        return SettingsResourceWithRawResponse(self._applications.settings)
+
 
 class AsyncApplicationsResourceWithRawResponse:
     def __init__(self, applications: AsyncApplicationsResource) -> None:
@@ -3708,6 +5812,14 @@ def user_policy_checks(self) -> AsyncUserPolicyChecksResourceWithRawResponse:
     def policies(self) -> AsyncPoliciesResourceWithRawResponse:
         return AsyncPoliciesResourceWithRawResponse(self._applications.policies)
 
+    @cached_property
+    def policy_tests(self) -> AsyncPolicyTestsResourceWithRawResponse:
+        return AsyncPolicyTestsResourceWithRawResponse(self._applications.policy_tests)
+
+    @cached_property
+    def settings(self) -> AsyncSettingsResourceWithRawResponse:
+        return AsyncSettingsResourceWithRawResponse(self._applications.settings)
+
 
 class ApplicationsResourceWithStreamingResponse:
     def __init__(self, applications: ApplicationsResource) -> None:
@@ -3744,6 +5856,14 @@ def user_policy_checks(self) -> UserPolicyChecksResourceWithStreamingResponse:
     def policies(self) -> PoliciesResourceWithStreamingResponse:
         return PoliciesResourceWithStreamingResponse(self._applications.policies)
 
+    @cached_property
+    def policy_tests(self) -> PolicyTestsResourceWithStreamingResponse:
+        return PolicyTestsResourceWithStreamingResponse(self._applications.policy_tests)
+
+    @cached_property
+    def settings(self) -> SettingsResourceWithStreamingResponse:
+        return SettingsResourceWithStreamingResponse(self._applications.settings)
+
 
 class AsyncApplicationsResourceWithStreamingResponse:
     def __init__(self, applications: AsyncApplicationsResource) -> None:
@@ -3779,3 +5899,11 @@ def user_policy_checks(self) -> AsyncUserPolicyChecksResourceWithStreamingRespon
     @cached_property
     def policies(self) -> AsyncPoliciesResourceWithStreamingResponse:
         return AsyncPoliciesResourceWithStreamingResponse(self._applications.policies)
+
+    @cached_property
+    def policy_tests(self) -> AsyncPolicyTestsResourceWithStreamingResponse:
+        return AsyncPolicyTestsResourceWithStreamingResponse(self._applications.policy_tests)
+
+    @cached_property
+    def settings(self) -> AsyncSettingsResourceWithStreamingResponse:
+        return AsyncSettingsResourceWithStreamingResponse(self._applications.settings)
diff --git a/src/cloudflare/resources/zero_trust/access/applications/cas.py b/src/cloudflare/resources/zero_trust/access/applications/cas.py
index e11b49474cd..503adeb3150 100644
--- a/src/cloudflare/resources/zero_trust/access/applications/cas.py
+++ b/src/cloudflare/resources/zero_trust/access/applications/cas.py
@@ -2,11 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -16,11 +17,10 @@
     async_to_streamed_response_wrapper,
 )
 from ....._wrappers import ResultWrapper
-from .....pagination import SyncSinglePage, AsyncSinglePage
+from .....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ....._base_client import AsyncPaginator, make_request_options
+from .....types.zero_trust.access.applications import ca_list_params
 from .....types.zero_trust.access.applications.ca import CA
-from .....types.zero_trust.access.applications.ca_get_response import CAGetResponse
-from .....types.zero_trust.access.applications.ca_create_response import CACreateResponse
 from .....types.zero_trust.access.applications.ca_delete_response import CADeleteResponse
 
 __all__ = ["CAsResource", "AsyncCAsResource"]
@@ -29,30 +29,41 @@
 class CAsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> CAsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CAsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CAsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CAsResourceWithStreamingResponse(self)
 
     def create(
         self,
         app_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CACreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CA]:
         """
         Generates a new short-lived certificate CA and public key.
 
         Args:
-          app_id: UUID
+          app_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -80,35 +91,32 @@ def create(
 
             account_or_zone = "zones"
             account_or_zone_id = zone_id
-        return cast(
-            Optional[CACreateResponse],
-            self._post(
-                f"/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[CACreateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[CACreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._post(
+            f"/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CA]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[CA]], ResultWrapper[CA]),
         )
 
     def list(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[CA]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[CA]:
         """
         Lists short-lived certificate CAs and their public keys.
 
@@ -117,6 +125,10 @@ def list(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -139,9 +151,19 @@ def list(
             account_or_zone_id = zone_id
         return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/access/apps/ca",
-            page=SyncSinglePage[CA],
+            page=SyncV4PagePaginationArray[CA],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    ca_list_params.CAListParams,
+                ),
             ),
             model=CA,
         )
@@ -150,20 +172,20 @@ def delete(
         self,
         app_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CADeleteResponse]:
         """
         Deletes a short-lived certificate CA.
 
         Args:
-          app_id: UUID
+          app_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -207,20 +229,20 @@ def get(
         self,
         app_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CAGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CA]:
         """
         Fetches a short-lived certificate CA and its public key.
 
         Args:
-          app_id: UUID
+          app_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -248,51 +270,57 @@ def get(
 
             account_or_zone = "zones"
             account_or_zone_id = zone_id
-        return cast(
-            Optional[CAGetResponse],
-            self._get(
-                f"/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[CAGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[CAGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._get(
+            f"/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CA]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[CA]], ResultWrapper[CA]),
         )
 
 
 class AsyncCAsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncCAsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCAsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCAsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCAsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         app_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CACreateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CA]:
         """
         Generates a new short-lived certificate CA and public key.
 
         Args:
-          app_id: UUID
+          app_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -320,35 +348,32 @@ async def create(
 
             account_or_zone = "zones"
             account_or_zone_id = zone_id
-        return cast(
-            Optional[CACreateResponse],
-            await self._post(
-                f"/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[CACreateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[CACreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._post(
+            f"/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CA]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[CA]], ResultWrapper[CA]),
         )
 
     def list(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[CA, AsyncSinglePage[CA]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[CA, AsyncV4PagePaginationArray[CA]]:
         """
         Lists short-lived certificate CAs and their public keys.
 
@@ -357,6 +382,10 @@ def list(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -379,9 +408,19 @@ def list(
             account_or_zone_id = zone_id
         return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/access/apps/ca",
-            page=AsyncSinglePage[CA],
+            page=AsyncV4PagePaginationArray[CA],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    ca_list_params.CAListParams,
+                ),
             ),
             model=CA,
         )
@@ -390,20 +429,20 @@ async def delete(
         self,
         app_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CADeleteResponse]:
         """
         Deletes a short-lived certificate CA.
 
         Args:
-          app_id: UUID
+          app_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -447,20 +486,20 @@ async def get(
         self,
         app_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CAGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CA]:
         """
         Fetches a short-lived certificate CA and its public key.
 
         Args:
-          app_id: UUID
+          app_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -488,21 +527,16 @@ async def get(
 
             account_or_zone = "zones"
             account_or_zone_id = zone_id
-        return cast(
-            Optional[CAGetResponse],
-            await self._get(
-                f"/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[CAGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[CAGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._get(
+            f"/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CA]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[CA]], ResultWrapper[CA]),
         )
 
 
diff --git a/src/cloudflare/resources/zero_trust/access/applications/policies.py b/src/cloudflare/resources/zero_trust/access/applications/policies.py
index cdc9b72fdf1..3d403b9ca6c 100644
--- a/src/cloudflare/resources/zero_trust/access/applications/policies.py
+++ b/src/cloudflare/resources/zero_trust/access/applications/policies.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -20,14 +17,11 @@
     async_to_streamed_response_wrapper,
 )
 from ....._wrappers import ResultWrapper
-from .....pagination import SyncSinglePage, AsyncSinglePage
+from .....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ....._base_client import AsyncPaginator, make_request_options
-from .....types.zero_trust.access import Decision
-from .....types.zero_trust.access.decision import Decision
-from .....types.zero_trust.access_rule_param import AccessRuleParam
-from .....types.zero_trust.access.applications import policy_create_params, policy_update_params
+from .....types.zero_trust.access.applications import policy_list_params, policy_create_params, policy_update_params
+from .....types.zero_trust.access.approval_group_param import ApprovalGroupParam
 from .....types.zero_trust.access.applications.policy_get_response import PolicyGetResponse
-from .....types.zero_trust.access.applications.approval_group_param import ApprovalGroupParam
 from .....types.zero_trust.access.applications.policy_list_response import PolicyListResponse
 from .....types.zero_trust.access.applications.policy_create_response import PolicyCreateResponse
 from .....types.zero_trust.access.applications.policy_delete_response import PolicyDeleteResponse
@@ -39,36 +33,42 @@
 class PoliciesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PoliciesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PoliciesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PoliciesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PoliciesResourceWithStreamingResponse(self)
 
     def create(
         self,
         app_id: str,
         *,
-        decision: Decision,
-        include: Iterable[AccessRuleParam],
-        name: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        approval_groups: Iterable[ApprovalGroupParam] | NotGiven = NOT_GIVEN,
-        approval_required: bool | NotGiven = NOT_GIVEN,
-        exclude: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        isolation_required: bool | NotGiven = NOT_GIVEN,
-        precedence: int | NotGiven = NOT_GIVEN,
-        purpose_justification_prompt: str | NotGiven = NOT_GIVEN,
-        purpose_justification_required: bool | NotGiven = NOT_GIVEN,
-        require: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        approval_groups: Iterable[ApprovalGroupParam] | Omit = omit,
+        approval_required: bool | Omit = omit,
+        isolation_required: bool | Omit = omit,
+        precedence: int | Omit = omit,
+        purpose_justification_prompt: str | Omit = omit,
+        purpose_justification_required: bool | Omit = omit,
+        session_duration: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyCreateResponse]:
         """
         Creates a policy applying exclusive to a single application that defines the
@@ -77,14 +77,7 @@ def create(
         array.
 
         Args:
-          app_id: UUID
-
-          decision: The action Access will take if a user matches this policy.
-
-          include: Rules evaluated with an OR logical operator. A user needs to meet only one of
-              the Include rules.
-
-          name: The name of the Access policy.
+          app_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -95,9 +88,6 @@ def create(
           approval_required: Requires the user to request access from an administrator at the start of each
               session.
 
-          exclude: Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-              meet any of the Exclude rules.
-
           isolation_required: Require this application to be served in an isolated browser for users matching
               this policy. 'Client Web Isolation' must be on for the account in order to use
               this feature.
@@ -109,9 +99,6 @@ def create(
 
           purpose_justification_required: Require users to enter a justification when they log in to the application.
 
-          require: Rules evaluated with an AND logical operator. To match the policy, a user must
-              meet all of the Require rules.
-
           session_duration: The amount of time that tokens issued for the application will be valid. Must be
               in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
               m, h.
@@ -142,17 +129,12 @@ def create(
             f"/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/policies",
             body=maybe_transform(
                 {
-                    "decision": decision,
-                    "include": include,
-                    "name": name,
                     "approval_groups": approval_groups,
                     "approval_required": approval_required,
-                    "exclude": exclude,
                     "isolation_required": isolation_required,
                     "precedence": precedence,
                     "purpose_justification_prompt": purpose_justification_prompt,
                     "purpose_justification_required": purpose_justification_required,
-                    "require": require,
                     "session_duration": session_duration,
                 },
                 policy_create_params.PolicyCreateParams,
@@ -172,26 +154,21 @@ def update(
         policy_id: str,
         *,
         app_id: str,
-        decision: Decision,
-        include: Iterable[AccessRuleParam],
-        name: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        approval_groups: Iterable[ApprovalGroupParam] | NotGiven = NOT_GIVEN,
-        approval_required: bool | NotGiven = NOT_GIVEN,
-        exclude: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        isolation_required: bool | NotGiven = NOT_GIVEN,
-        precedence: int | NotGiven = NOT_GIVEN,
-        purpose_justification_prompt: str | NotGiven = NOT_GIVEN,
-        purpose_justification_required: bool | NotGiven = NOT_GIVEN,
-        require: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        approval_groups: Iterable[ApprovalGroupParam] | Omit = omit,
+        approval_required: bool | Omit = omit,
+        isolation_required: bool | Omit = omit,
+        precedence: int | Omit = omit,
+        purpose_justification_prompt: str | Omit = omit,
+        purpose_justification_required: bool | Omit = omit,
+        session_duration: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyUpdateResponse]:
         """Updates an Access policy specific to an application.
 
@@ -199,16 +176,9 @@ def update(
         policy, use the /account or zones/{account or zone_id}/policies/{uid} endpoint.
 
         Args:
-          app_id: UUID
+          app_id: UUID.
 
-          policy_id: UUID
-
-          decision: The action Access will take if a user matches this policy.
-
-          include: Rules evaluated with an OR logical operator. A user needs to meet only one of
-              the Include rules.
-
-          name: The name of the Access policy.
+          policy_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -219,9 +189,6 @@ def update(
           approval_required: Requires the user to request access from an administrator at the start of each
               session.
 
-          exclude: Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-              meet any of the Exclude rules.
-
           isolation_required: Require this application to be served in an isolated browser for users matching
               this policy. 'Client Web Isolation' must be on for the account in order to use
               this feature.
@@ -233,9 +200,6 @@ def update(
 
           purpose_justification_required: Require users to enter a justification when they log in to the application.
 
-          require: Rules evaluated with an AND logical operator. To match the policy, a user must
-              meet all of the Require rules.
-
           session_duration: The amount of time that tokens issued for the application will be valid. Must be
               in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
               m, h.
@@ -268,17 +232,12 @@ def update(
             f"/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/policies/{policy_id}",
             body=maybe_transform(
                 {
-                    "decision": decision,
-                    "include": include,
-                    "name": name,
                     "approval_groups": approval_groups,
                     "approval_required": approval_required,
-                    "exclude": exclude,
                     "isolation_required": isolation_required,
                     "precedence": precedence,
                     "purpose_justification_prompt": purpose_justification_prompt,
                     "purpose_justification_required": purpose_justification_required,
-                    "require": require,
                     "session_duration": session_duration,
                 },
                 policy_update_params.PolicyUpdateParams,
@@ -297,27 +256,33 @@ def list(
         self,
         app_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[PolicyListResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[PolicyListResponse]:
         """Lists Access policies configured for an application.
 
         Returns both exclusively
         scoped and reusable policies used by the application.
 
         Args:
-          app_id: UUID
+          app_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -342,9 +307,19 @@ def list(
             account_or_zone_id = zone_id
         return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/policies",
-            page=SyncSinglePage[PolicyListResponse],
+            page=SyncV4PagePaginationArray[PolicyListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    policy_list_params.PolicyListParams,
+                ),
             ),
             model=PolicyListResponse,
         )
@@ -354,14 +329,14 @@ def delete(
         policy_id: str,
         *,
         app_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyDeleteResponse]:
         """Deletes an Access policy specific to an application.
 
@@ -369,9 +344,9 @@ def delete(
         policy, use the /account or zones/{account or zone_id}/policies/{uid} endpoint.
 
         Args:
-          app_id: UUID
+          app_id: UUID.
 
-          policy_id: UUID
+          policy_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -418,14 +393,14 @@ def get(
         policy_id: str,
         *,
         app_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyGetResponse]:
         """Fetches a single Access policy configured for an application.
 
@@ -433,9 +408,9 @@ def get(
         exclusively owned and reusable policies used by the application.
 
         Args:
-          app_id: UUID
+          app_id: UUID.
 
-          policy_id: UUID
+          policy_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -481,36 +456,42 @@ def get(
 class AsyncPoliciesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPoliciesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPoliciesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPoliciesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPoliciesResourceWithStreamingResponse(self)
 
     async def create(
         self,
         app_id: str,
         *,
-        decision: Decision,
-        include: Iterable[AccessRuleParam],
-        name: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        approval_groups: Iterable[ApprovalGroupParam] | NotGiven = NOT_GIVEN,
-        approval_required: bool | NotGiven = NOT_GIVEN,
-        exclude: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        isolation_required: bool | NotGiven = NOT_GIVEN,
-        precedence: int | NotGiven = NOT_GIVEN,
-        purpose_justification_prompt: str | NotGiven = NOT_GIVEN,
-        purpose_justification_required: bool | NotGiven = NOT_GIVEN,
-        require: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        approval_groups: Iterable[ApprovalGroupParam] | Omit = omit,
+        approval_required: bool | Omit = omit,
+        isolation_required: bool | Omit = omit,
+        precedence: int | Omit = omit,
+        purpose_justification_prompt: str | Omit = omit,
+        purpose_justification_required: bool | Omit = omit,
+        session_duration: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyCreateResponse]:
         """
         Creates a policy applying exclusive to a single application that defines the
@@ -519,14 +500,7 @@ async def create(
         array.
 
         Args:
-          app_id: UUID
-
-          decision: The action Access will take if a user matches this policy.
-
-          include: Rules evaluated with an OR logical operator. A user needs to meet only one of
-              the Include rules.
-
-          name: The name of the Access policy.
+          app_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -537,9 +511,6 @@ async def create(
           approval_required: Requires the user to request access from an administrator at the start of each
               session.
 
-          exclude: Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-              meet any of the Exclude rules.
-
           isolation_required: Require this application to be served in an isolated browser for users matching
               this policy. 'Client Web Isolation' must be on for the account in order to use
               this feature.
@@ -551,9 +522,6 @@ async def create(
 
           purpose_justification_required: Require users to enter a justification when they log in to the application.
 
-          require: Rules evaluated with an AND logical operator. To match the policy, a user must
-              meet all of the Require rules.
-
           session_duration: The amount of time that tokens issued for the application will be valid. Must be
               in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
               m, h.
@@ -584,17 +552,12 @@ async def create(
             f"/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/policies",
             body=await async_maybe_transform(
                 {
-                    "decision": decision,
-                    "include": include,
-                    "name": name,
                     "approval_groups": approval_groups,
                     "approval_required": approval_required,
-                    "exclude": exclude,
                     "isolation_required": isolation_required,
                     "precedence": precedence,
                     "purpose_justification_prompt": purpose_justification_prompt,
                     "purpose_justification_required": purpose_justification_required,
-                    "require": require,
                     "session_duration": session_duration,
                 },
                 policy_create_params.PolicyCreateParams,
@@ -614,26 +577,21 @@ async def update(
         policy_id: str,
         *,
         app_id: str,
-        decision: Decision,
-        include: Iterable[AccessRuleParam],
-        name: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        approval_groups: Iterable[ApprovalGroupParam] | NotGiven = NOT_GIVEN,
-        approval_required: bool | NotGiven = NOT_GIVEN,
-        exclude: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        isolation_required: bool | NotGiven = NOT_GIVEN,
-        precedence: int | NotGiven = NOT_GIVEN,
-        purpose_justification_prompt: str | NotGiven = NOT_GIVEN,
-        purpose_justification_required: bool | NotGiven = NOT_GIVEN,
-        require: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        approval_groups: Iterable[ApprovalGroupParam] | Omit = omit,
+        approval_required: bool | Omit = omit,
+        isolation_required: bool | Omit = omit,
+        precedence: int | Omit = omit,
+        purpose_justification_prompt: str | Omit = omit,
+        purpose_justification_required: bool | Omit = omit,
+        session_duration: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyUpdateResponse]:
         """Updates an Access policy specific to an application.
 
@@ -641,16 +599,9 @@ async def update(
         policy, use the /account or zones/{account or zone_id}/policies/{uid} endpoint.
 
         Args:
-          app_id: UUID
+          app_id: UUID.
 
-          policy_id: UUID
-
-          decision: The action Access will take if a user matches this policy.
-
-          include: Rules evaluated with an OR logical operator. A user needs to meet only one of
-              the Include rules.
-
-          name: The name of the Access policy.
+          policy_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -661,9 +612,6 @@ async def update(
           approval_required: Requires the user to request access from an administrator at the start of each
               session.
 
-          exclude: Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-              meet any of the Exclude rules.
-
           isolation_required: Require this application to be served in an isolated browser for users matching
               this policy. 'Client Web Isolation' must be on for the account in order to use
               this feature.
@@ -675,9 +623,6 @@ async def update(
 
           purpose_justification_required: Require users to enter a justification when they log in to the application.
 
-          require: Rules evaluated with an AND logical operator. To match the policy, a user must
-              meet all of the Require rules.
-
           session_duration: The amount of time that tokens issued for the application will be valid. Must be
               in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
               m, h.
@@ -710,17 +655,12 @@ async def update(
             f"/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/policies/{policy_id}",
             body=await async_maybe_transform(
                 {
-                    "decision": decision,
-                    "include": include,
-                    "name": name,
                     "approval_groups": approval_groups,
                     "approval_required": approval_required,
-                    "exclude": exclude,
                     "isolation_required": isolation_required,
                     "precedence": precedence,
                     "purpose_justification_prompt": purpose_justification_prompt,
                     "purpose_justification_required": purpose_justification_required,
-                    "require": require,
                     "session_duration": session_duration,
                 },
                 policy_update_params.PolicyUpdateParams,
@@ -739,27 +679,33 @@ def list(
         self,
         app_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[PolicyListResponse, AsyncSinglePage[PolicyListResponse]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[PolicyListResponse, AsyncV4PagePaginationArray[PolicyListResponse]]:
         """Lists Access policies configured for an application.
 
         Returns both exclusively
         scoped and reusable policies used by the application.
 
         Args:
-          app_id: UUID
+          app_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -784,9 +730,19 @@ def list(
             account_or_zone_id = zone_id
         return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/policies",
-            page=AsyncSinglePage[PolicyListResponse],
+            page=AsyncV4PagePaginationArray[PolicyListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    policy_list_params.PolicyListParams,
+                ),
             ),
             model=PolicyListResponse,
         )
@@ -796,14 +752,14 @@ async def delete(
         policy_id: str,
         *,
         app_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyDeleteResponse]:
         """Deletes an Access policy specific to an application.
 
@@ -811,9 +767,9 @@ async def delete(
         policy, use the /account or zones/{account or zone_id}/policies/{uid} endpoint.
 
         Args:
-          app_id: UUID
+          app_id: UUID.
 
-          policy_id: UUID
+          policy_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -860,14 +816,14 @@ async def get(
         policy_id: str,
         *,
         app_id: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyGetResponse]:
         """Fetches a single Access policy configured for an application.
 
@@ -875,9 +831,9 @@ async def get(
         exclusively owned and reusable policies used by the application.
 
         Args:
-          app_id: UUID
+          app_id: UUID.
 
-          policy_id: UUID
+          policy_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
diff --git a/src/cloudflare/resources/zero_trust/access/applications/policy_tests/__init__.py b/src/cloudflare/resources/zero_trust/access/applications/policy_tests/__init__.py
new file mode 100755
index 00000000000..4be05f55f69
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/access/applications/policy_tests/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .users import (
+    UsersResource,
+    AsyncUsersResource,
+    UsersResourceWithRawResponse,
+    AsyncUsersResourceWithRawResponse,
+    UsersResourceWithStreamingResponse,
+    AsyncUsersResourceWithStreamingResponse,
+)
+from .policy_tests import (
+    PolicyTestsResource,
+    AsyncPolicyTestsResource,
+    PolicyTestsResourceWithRawResponse,
+    AsyncPolicyTestsResourceWithRawResponse,
+    PolicyTestsResourceWithStreamingResponse,
+    AsyncPolicyTestsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "UsersResource",
+    "AsyncUsersResource",
+    "UsersResourceWithRawResponse",
+    "AsyncUsersResourceWithRawResponse",
+    "UsersResourceWithStreamingResponse",
+    "AsyncUsersResourceWithStreamingResponse",
+    "PolicyTestsResource",
+    "AsyncPolicyTestsResource",
+    "PolicyTestsResourceWithRawResponse",
+    "AsyncPolicyTestsResourceWithRawResponse",
+    "PolicyTestsResourceWithStreamingResponse",
+    "AsyncPolicyTestsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/access/applications/policy_tests/policy_tests.py b/src/cloudflare/resources/zero_trust/access/applications/policy_tests/policy_tests.py
new file mode 100755
index 00000000000..570d37005f9
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/access/applications/policy_tests/policy_tests.py
@@ -0,0 +1,317 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from .users import (
+    UsersResource,
+    AsyncUsersResource,
+    UsersResourceWithRawResponse,
+    AsyncUsersResourceWithRawResponse,
+    UsersResourceWithStreamingResponse,
+    AsyncUsersResourceWithStreamingResponse,
+)
+from ......_types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ......_utils import maybe_transform, async_maybe_transform
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+from ......_response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ......_wrappers import ResultWrapper
+from ......_base_client import make_request_options
+from ......types.zero_trust.access.applications import policy_test_create_params
+from ......types.zero_trust.access.applications.policy_test_get_response import PolicyTestGetResponse
+from ......types.zero_trust.access.applications.policy_test_create_response import PolicyTestCreateResponse
+
+__all__ = ["PolicyTestsResource", "AsyncPolicyTestsResource"]
+
+
+class PolicyTestsResource(SyncAPIResource):
+    @cached_property
+    def users(self) -> UsersResource:
+        return UsersResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> PolicyTestsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return PolicyTestsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> PolicyTestsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return PolicyTestsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        policies: SequenceNotStr[policy_test_create_params.Policy] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PolicyTestCreateResponse]:
+        """
+        Starts an Access policy test.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/access/policy-tests",
+            body=maybe_transform({"policies": policies}, policy_test_create_params.PolicyTestCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PolicyTestCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PolicyTestCreateResponse]], ResultWrapper[PolicyTestCreateResponse]),
+        )
+
+    def get(
+        self,
+        policy_test_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PolicyTestGetResponse]:
+        """
+        Fetches the current status of a given Access policy test.
+
+        Args:
+          account_id: Identifier.
+
+          policy_test_id: The UUID of the policy test.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_test_id:
+            raise ValueError(f"Expected a non-empty value for `policy_test_id` but received {policy_test_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/access/policy-tests/{policy_test_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PolicyTestGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PolicyTestGetResponse]], ResultWrapper[PolicyTestGetResponse]),
+        )
+
+
+class AsyncPolicyTestsResource(AsyncAPIResource):
+    @cached_property
+    def users(self) -> AsyncUsersResource:
+        return AsyncUsersResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncPolicyTestsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncPolicyTestsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncPolicyTestsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncPolicyTestsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        policies: SequenceNotStr[policy_test_create_params.Policy] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PolicyTestCreateResponse]:
+        """
+        Starts an Access policy test.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/access/policy-tests",
+            body=await async_maybe_transform({"policies": policies}, policy_test_create_params.PolicyTestCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PolicyTestCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PolicyTestCreateResponse]], ResultWrapper[PolicyTestCreateResponse]),
+        )
+
+    async def get(
+        self,
+        policy_test_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PolicyTestGetResponse]:
+        """
+        Fetches the current status of a given Access policy test.
+
+        Args:
+          account_id: Identifier.
+
+          policy_test_id: The UUID of the policy test.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_test_id:
+            raise ValueError(f"Expected a non-empty value for `policy_test_id` but received {policy_test_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/access/policy-tests/{policy_test_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PolicyTestGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PolicyTestGetResponse]], ResultWrapper[PolicyTestGetResponse]),
+        )
+
+
+class PolicyTestsResourceWithRawResponse:
+    def __init__(self, policy_tests: PolicyTestsResource) -> None:
+        self._policy_tests = policy_tests
+
+        self.create = to_raw_response_wrapper(
+            policy_tests.create,
+        )
+        self.get = to_raw_response_wrapper(
+            policy_tests.get,
+        )
+
+    @cached_property
+    def users(self) -> UsersResourceWithRawResponse:
+        return UsersResourceWithRawResponse(self._policy_tests.users)
+
+
+class AsyncPolicyTestsResourceWithRawResponse:
+    def __init__(self, policy_tests: AsyncPolicyTestsResource) -> None:
+        self._policy_tests = policy_tests
+
+        self.create = async_to_raw_response_wrapper(
+            policy_tests.create,
+        )
+        self.get = async_to_raw_response_wrapper(
+            policy_tests.get,
+        )
+
+    @cached_property
+    def users(self) -> AsyncUsersResourceWithRawResponse:
+        return AsyncUsersResourceWithRawResponse(self._policy_tests.users)
+
+
+class PolicyTestsResourceWithStreamingResponse:
+    def __init__(self, policy_tests: PolicyTestsResource) -> None:
+        self._policy_tests = policy_tests
+
+        self.create = to_streamed_response_wrapper(
+            policy_tests.create,
+        )
+        self.get = to_streamed_response_wrapper(
+            policy_tests.get,
+        )
+
+    @cached_property
+    def users(self) -> UsersResourceWithStreamingResponse:
+        return UsersResourceWithStreamingResponse(self._policy_tests.users)
+
+
+class AsyncPolicyTestsResourceWithStreamingResponse:
+    def __init__(self, policy_tests: AsyncPolicyTestsResource) -> None:
+        self._policy_tests = policy_tests
+
+        self.create = async_to_streamed_response_wrapper(
+            policy_tests.create,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            policy_tests.get,
+        )
+
+    @cached_property
+    def users(self) -> AsyncUsersResourceWithStreamingResponse:
+        return AsyncUsersResourceWithStreamingResponse(self._policy_tests.users)
diff --git a/src/cloudflare/resources/zero_trust/access/applications/policy_tests/users.py b/src/cloudflare/resources/zero_trust/access/applications/policy_tests/users.py
new file mode 100755
index 00000000000..cc6cc310771
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/access/applications/policy_tests/users.py
@@ -0,0 +1,220 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal
+
+import httpx
+
+from ......_types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ......_utils import maybe_transform
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+from ......_response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ......pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ......_base_client import AsyncPaginator, make_request_options
+from ......types.zero_trust.access.applications.policy_tests import user_list_params
+from ......types.zero_trust.access.applications.policy_tests.user_list_response import UserListResponse
+
+__all__ = ["UsersResource", "AsyncUsersResource"]
+
+
+class UsersResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> UsersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return UsersResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> UsersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return UsersResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        policy_test_id: str,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        status: Literal["success", "fail", "error"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[UserListResponse]:
+        """
+        Fetches a single page of user results from an Access policy test.
+
+        Args:
+          account_id: Identifier.
+
+          policy_test_id: The UUID of the policy test.
+
+          page: Page number of results.
+
+          status: Filter users by their policy evaluation status.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_test_id:
+            raise ValueError(f"Expected a non-empty value for `policy_test_id` but received {policy_test_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/access/policy-tests/{policy_test_id}/users",
+            page=SyncV4PagePaginationArray[UserListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "status": status,
+                    },
+                    user_list_params.UserListParams,
+                ),
+            ),
+            model=UserListResponse,
+        )
+
+
+class AsyncUsersResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncUsersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncUsersResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncUsersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncUsersResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        policy_test_id: str,
+        *,
+        account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        status: Literal["success", "fail", "error"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[UserListResponse, AsyncV4PagePaginationArray[UserListResponse]]:
+        """
+        Fetches a single page of user results from an Access policy test.
+
+        Args:
+          account_id: Identifier.
+
+          policy_test_id: The UUID of the policy test.
+
+          page: Page number of results.
+
+          status: Filter users by their policy evaluation status.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_test_id:
+            raise ValueError(f"Expected a non-empty value for `policy_test_id` but received {policy_test_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/access/policy-tests/{policy_test_id}/users",
+            page=AsyncV4PagePaginationArray[UserListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "status": status,
+                    },
+                    user_list_params.UserListParams,
+                ),
+            ),
+            model=UserListResponse,
+        )
+
+
+class UsersResourceWithRawResponse:
+    def __init__(self, users: UsersResource) -> None:
+        self._users = users
+
+        self.list = to_raw_response_wrapper(
+            users.list,
+        )
+
+
+class AsyncUsersResourceWithRawResponse:
+    def __init__(self, users: AsyncUsersResource) -> None:
+        self._users = users
+
+        self.list = async_to_raw_response_wrapper(
+            users.list,
+        )
+
+
+class UsersResourceWithStreamingResponse:
+    def __init__(self, users: UsersResource) -> None:
+        self._users = users
+
+        self.list = to_streamed_response_wrapper(
+            users.list,
+        )
+
+
+class AsyncUsersResourceWithStreamingResponse:
+    def __init__(self, users: AsyncUsersResource) -> None:
+        self._users = users
+
+        self.list = async_to_streamed_response_wrapper(
+            users.list,
+        )
diff --git a/src/cloudflare/resources/zero_trust/access/applications/settings.py b/src/cloudflare/resources/zero_trust/access/applications/settings.py
new file mode 100644
index 00000000000..d9e2f34f63d
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/access/applications/settings.py
@@ -0,0 +1,397 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.zero_trust.access import AppID
+from .....types.zero_trust.access.app_id import AppID
+from .....types.zero_trust.access.applications import setting_edit_params, setting_update_params
+from .....types.zero_trust.access.applications.setting_edit_response import SettingEditResponse
+from .....types.zero_trust.access.applications.setting_update_response import SettingUpdateResponse
+
+__all__ = ["SettingsResource", "AsyncSettingsResource"]
+
+
+class SettingsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> SettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SettingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SettingsResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        app_id: AppID,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SettingUpdateResponse]:
+        """
+        Updates Access application settings.
+
+        Args:
+          app_id: Identifier.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          allow_iframe: Enables loading application content in an iFrame.
+
+          skip_interstitial: Enables automatic authentication through cloudflared.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._put(
+            f"/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/settings",
+            body=maybe_transform(
+                {
+                    "allow_iframe": allow_iframe,
+                    "skip_interstitial": skip_interstitial,
+                },
+                setting_update_params.SettingUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SettingUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SettingUpdateResponse]], ResultWrapper[SettingUpdateResponse]),
+        )
+
+    def edit(
+        self,
+        app_id: AppID,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SettingEditResponse]:
+        """
+        Updates Access application settings.
+
+        Args:
+          app_id: Identifier.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          allow_iframe: Enables loading application content in an iFrame.
+
+          skip_interstitial: Enables automatic authentication through cloudflared.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._patch(
+            f"/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/settings",
+            body=maybe_transform(
+                {
+                    "allow_iframe": allow_iframe,
+                    "skip_interstitial": skip_interstitial,
+                },
+                setting_edit_params.SettingEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SettingEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SettingEditResponse]], ResultWrapper[SettingEditResponse]),
+        )
+
+
+class AsyncSettingsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSettingsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSettingsResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        app_id: AppID,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SettingUpdateResponse]:
+        """
+        Updates Access application settings.
+
+        Args:
+          app_id: Identifier.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          allow_iframe: Enables loading application content in an iFrame.
+
+          skip_interstitial: Enables automatic authentication through cloudflared.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return await self._put(
+            f"/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/settings",
+            body=await async_maybe_transform(
+                {
+                    "allow_iframe": allow_iframe,
+                    "skip_interstitial": skip_interstitial,
+                },
+                setting_update_params.SettingUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SettingUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SettingUpdateResponse]], ResultWrapper[SettingUpdateResponse]),
+        )
+
+    async def edit(
+        self,
+        app_id: AppID,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_iframe: bool | Omit = omit,
+        skip_interstitial: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SettingEditResponse]:
+        """
+        Updates Access application settings.
+
+        Args:
+          app_id: Identifier.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          allow_iframe: Enables loading application content in an iFrame.
+
+          skip_interstitial: Enables automatic authentication through cloudflared.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return await self._patch(
+            f"/{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/settings",
+            body=await async_maybe_transform(
+                {
+                    "allow_iframe": allow_iframe,
+                    "skip_interstitial": skip_interstitial,
+                },
+                setting_edit_params.SettingEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SettingEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SettingEditResponse]], ResultWrapper[SettingEditResponse]),
+        )
+
+
+class SettingsResourceWithRawResponse:
+    def __init__(self, settings: SettingsResource) -> None:
+        self._settings = settings
+
+        self.update = to_raw_response_wrapper(
+            settings.update,
+        )
+        self.edit = to_raw_response_wrapper(
+            settings.edit,
+        )
+
+
+class AsyncSettingsResourceWithRawResponse:
+    def __init__(self, settings: AsyncSettingsResource) -> None:
+        self._settings = settings
+
+        self.update = async_to_raw_response_wrapper(
+            settings.update,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            settings.edit,
+        )
+
+
+class SettingsResourceWithStreamingResponse:
+    def __init__(self, settings: SettingsResource) -> None:
+        self._settings = settings
+
+        self.update = to_streamed_response_wrapper(
+            settings.update,
+        )
+        self.edit = to_streamed_response_wrapper(
+            settings.edit,
+        )
+
+
+class AsyncSettingsResourceWithStreamingResponse:
+    def __init__(self, settings: AsyncSettingsResource) -> None:
+        self._settings = settings
+
+        self.update = async_to_streamed_response_wrapper(
+            settings.update,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            settings.edit,
+        )
diff --git a/src/cloudflare/resources/zero_trust/access/applications/user_policy_checks.py b/src/cloudflare/resources/zero_trust/access/applications/user_policy_checks.py
index bcc4fa31662..ae499ccaa5a 100644
--- a/src/cloudflare/resources/zero_trust/access/applications/user_policy_checks.py
+++ b/src/cloudflare/resources/zero_trust/access/applications/user_policy_checks.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -17,7 +17,8 @@
 )
 from ....._wrappers import ResultWrapper
 from ....._base_client import make_request_options
-from .....types.zero_trust.access.app_id_param import AppIDParam
+from .....types.zero_trust.access import AppID
+from .....types.zero_trust.access.app_id import AppID
 from .....types.zero_trust.access.applications.user_policy_check_list_response import UserPolicyCheckListResponse
 
 __all__ = ["UserPolicyChecksResource", "AsyncUserPolicyChecksResource"]
@@ -26,30 +27,41 @@
 class UserPolicyChecksResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> UserPolicyChecksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return UserPolicyChecksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> UserPolicyChecksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return UserPolicyChecksResourceWithStreamingResponse(self)
 
     def list(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[UserPolicyCheckListResponse]:
         """
         Tests if a specific user has permission to access an application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -63,6 +75,8 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
 
@@ -91,30 +105,41 @@ def list(
 class AsyncUserPolicyChecksResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncUserPolicyChecksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncUserPolicyChecksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncUserPolicyChecksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncUserPolicyChecksResourceWithStreamingResponse(self)
 
     async def list(
         self,
-        app_id: AppIDParam,
+        app_id: AppID,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[UserPolicyCheckListResponse]:
         """
         Tests if a specific user has permission to access an application.
 
         Args:
-          app_id: Identifier
+          app_id: Identifier.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -128,6 +153,8 @@ async def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not app_id:
+            raise ValueError(f"Expected a non-empty value for `app_id` but received {app_id!r}")
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
 
diff --git a/src/cloudflare/resources/zero_trust/access/bookmarks.py b/src/cloudflare/resources/zero_trust/access/bookmarks.py
index 38b1802f3d6..003b54c7fdb 100644
--- a/src/cloudflare/resources/zero_trust/access/bookmarks.py
+++ b/src/cloudflare/resources/zero_trust/access/bookmarks.py
@@ -2,15 +2,13 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import Type, Optional, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -32,12 +30,24 @@
 class BookmarksResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> BookmarksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return BookmarksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> BookmarksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return BookmarksResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def create(
         self,
         bookmark_id: str,
@@ -49,13 +59,13 @@ def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Bookmark]:
         """
         Create a new Bookmark application.
 
         Args:
-          bookmark_id: UUID
+          bookmark_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -82,6 +92,7 @@ def create(
             cast_to=cast(Type[Optional[Bookmark]], ResultWrapper[Bookmark]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     def update(
         self,
         bookmark_id: str,
@@ -93,13 +104,13 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Bookmark]:
         """
         Updates a configured Bookmark application.
 
         Args:
-          bookmark_id: UUID
+          bookmark_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -126,6 +137,7 @@ def update(
             cast_to=cast(Type[Optional[Bookmark]], ResultWrapper[Bookmark]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
         *,
@@ -135,7 +147,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Bookmark]:
         """
         Lists Bookmark applications.
@@ -160,6 +172,7 @@ def list(
             model=Bookmark,
         )
 
+    @typing_extensions.deprecated("deprecated")
     def delete(
         self,
         bookmark_id: str,
@@ -170,13 +183,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[BookmarkDeleteResponse]:
         """
         Deletes a Bookmark application.
 
         Args:
-          bookmark_id: UUID
+          bookmark_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -202,6 +215,7 @@ def delete(
             cast_to=cast(Type[Optional[BookmarkDeleteResponse]], ResultWrapper[BookmarkDeleteResponse]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     def get(
         self,
         bookmark_id: str,
@@ -212,13 +226,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Bookmark]:
         """
         Fetches a single Bookmark application.
 
         Args:
-          bookmark_id: UUID
+          bookmark_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -248,12 +262,24 @@ def get(
 class AsyncBookmarksResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncBookmarksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncBookmarksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncBookmarksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncBookmarksResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     async def create(
         self,
         bookmark_id: str,
@@ -265,13 +291,13 @@ async def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Bookmark]:
         """
         Create a new Bookmark application.
 
         Args:
-          bookmark_id: UUID
+          bookmark_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -298,6 +324,7 @@ async def create(
             cast_to=cast(Type[Optional[Bookmark]], ResultWrapper[Bookmark]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def update(
         self,
         bookmark_id: str,
@@ -309,13 +336,13 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Bookmark]:
         """
         Updates a configured Bookmark application.
 
         Args:
-          bookmark_id: UUID
+          bookmark_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -342,6 +369,7 @@ async def update(
             cast_to=cast(Type[Optional[Bookmark]], ResultWrapper[Bookmark]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
         *,
@@ -351,7 +379,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Bookmark, AsyncSinglePage[Bookmark]]:
         """
         Lists Bookmark applications.
@@ -376,6 +404,7 @@ def list(
             model=Bookmark,
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def delete(
         self,
         bookmark_id: str,
@@ -386,13 +415,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[BookmarkDeleteResponse]:
         """
         Deletes a Bookmark application.
 
         Args:
-          bookmark_id: UUID
+          bookmark_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -418,6 +447,7 @@ async def delete(
             cast_to=cast(Type[Optional[BookmarkDeleteResponse]], ResultWrapper[BookmarkDeleteResponse]),
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def get(
         self,
         bookmark_id: str,
@@ -428,13 +458,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Bookmark]:
         """
         Fetches a single Bookmark application.
 
         Args:
-          bookmark_id: UUID
+          bookmark_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -465,20 +495,30 @@ class BookmarksResourceWithRawResponse:
     def __init__(self, bookmarks: BookmarksResource) -> None:
         self._bookmarks = bookmarks
 
-        self.create = to_raw_response_wrapper(
-            bookmarks.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                bookmarks.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.update = to_raw_response_wrapper(
-            bookmarks.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                bookmarks.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.list = to_raw_response_wrapper(
-            bookmarks.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                bookmarks.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = to_raw_response_wrapper(
-            bookmarks.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                bookmarks.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_raw_response_wrapper(
-            bookmarks.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                bookmarks.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -486,20 +526,30 @@ class AsyncBookmarksResourceWithRawResponse:
     def __init__(self, bookmarks: AsyncBookmarksResource) -> None:
         self._bookmarks = bookmarks
 
-        self.create = async_to_raw_response_wrapper(
-            bookmarks.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                bookmarks.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.update = async_to_raw_response_wrapper(
-            bookmarks.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                bookmarks.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.list = async_to_raw_response_wrapper(
-            bookmarks.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                bookmarks.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = async_to_raw_response_wrapper(
-            bookmarks.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                bookmarks.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_raw_response_wrapper(
-            bookmarks.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                bookmarks.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -507,20 +557,30 @@ class BookmarksResourceWithStreamingResponse:
     def __init__(self, bookmarks: BookmarksResource) -> None:
         self._bookmarks = bookmarks
 
-        self.create = to_streamed_response_wrapper(
-            bookmarks.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                bookmarks.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.update = to_streamed_response_wrapper(
-            bookmarks.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                bookmarks.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.list = to_streamed_response_wrapper(
-            bookmarks.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                bookmarks.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = to_streamed_response_wrapper(
-            bookmarks.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                bookmarks.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_streamed_response_wrapper(
-            bookmarks.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                bookmarks.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -528,18 +588,28 @@ class AsyncBookmarksResourceWithStreamingResponse:
     def __init__(self, bookmarks: AsyncBookmarksResource) -> None:
         self._bookmarks = bookmarks
 
-        self.create = async_to_streamed_response_wrapper(
-            bookmarks.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                bookmarks.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.update = async_to_streamed_response_wrapper(
-            bookmarks.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                bookmarks.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.list = async_to_streamed_response_wrapper(
-            bookmarks.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                bookmarks.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = async_to_streamed_response_wrapper(
-            bookmarks.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                bookmarks.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_streamed_response_wrapper(
-            bookmarks.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                bookmarks.get,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/zero_trust/access/certificates/certificates.py b/src/cloudflare/resources/zero_trust/access/certificates/certificates.py
index 6584f895e79..7a366046139 100644
--- a/src/cloudflare/resources/zero_trust/access/certificates/certificates.py
+++ b/src/cloudflare/resources/zero_trust/access/certificates/certificates.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
@@ -14,11 +14,8 @@
     SettingsResourceWithStreamingResponse,
     AsyncSettingsResourceWithStreamingResponse,
 )
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -28,9 +25,9 @@
     async_to_streamed_response_wrapper,
 )
 from ....._wrappers import ResultWrapper
-from .....pagination import SyncSinglePage, AsyncSinglePage
+from .....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ....._base_client import AsyncPaginator, make_request_options
-from .....types.zero_trust.access import certificate_create_params, certificate_update_params
+from .....types.zero_trust.access import certificate_list_params, certificate_create_params, certificate_update_params
 from .....types.zero_trust.access.certificate import Certificate
 from .....types.zero_trust.access.associated_hostnames import AssociatedHostnames
 from .....types.zero_trust.access.certificate_delete_response import CertificateDeleteResponse
@@ -45,10 +42,21 @@ def settings(self) -> SettingsResource:
 
     @cached_property
     def with_raw_response(self) -> CertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CertificatesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CertificatesResourceWithStreamingResponse(self)
 
     def create(
@@ -56,15 +64,15 @@ def create(
         *,
         certificate: str,
         name: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        associated_hostnames: List[AssociatedHostnames] | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        associated_hostnames: SequenceNotStr[AssociatedHostnames] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Certificate]:
         """
         Adds a new mTLS root certificate to Access.
@@ -124,22 +132,22 @@ def update(
         self,
         certificate_id: str,
         *,
-        associated_hostnames: List[AssociatedHostnames],
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        associated_hostnames: SequenceNotStr[AssociatedHostnames],
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Certificate]:
         """
         Updates a configured mTLS certificate.
 
         Args:
-          certificate_id: UUID
+          certificate_id: UUID.
 
           associated_hostnames: The hostnames of the applications that will use this certificate.
 
@@ -193,15 +201,17 @@ def update(
     def list(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[Certificate]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[Certificate]:
         """
         Lists all mTLS root certificates.
 
@@ -210,6 +220,10 @@ def list(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -232,9 +246,19 @@ def list(
             account_or_zone_id = zone_id
         return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/access/certificates",
-            page=SyncSinglePage[Certificate],
+            page=SyncV4PagePaginationArray[Certificate],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    certificate_list_params.CertificateListParams,
+                ),
             ),
             model=Certificate,
         )
@@ -243,20 +267,20 @@ def delete(
         self,
         certificate_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CertificateDeleteResponse]:
         """
         Deletes an mTLS certificate.
 
         Args:
-          certificate_id: UUID
+          certificate_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -300,20 +324,20 @@ def get(
         self,
         certificate_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Certificate]:
         """
         Fetches a single mTLS certificate.
 
         Args:
-          certificate_id: UUID
+          certificate_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -361,10 +385,21 @@ def settings(self) -> AsyncSettingsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncCertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCertificatesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCertificatesResourceWithStreamingResponse(self)
 
     async def create(
@@ -372,15 +407,15 @@ async def create(
         *,
         certificate: str,
         name: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        associated_hostnames: List[AssociatedHostnames] | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        associated_hostnames: SequenceNotStr[AssociatedHostnames] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Certificate]:
         """
         Adds a new mTLS root certificate to Access.
@@ -440,22 +475,22 @@ async def update(
         self,
         certificate_id: str,
         *,
-        associated_hostnames: List[AssociatedHostnames],
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        associated_hostnames: SequenceNotStr[AssociatedHostnames],
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Certificate]:
         """
         Updates a configured mTLS certificate.
 
         Args:
-          certificate_id: UUID
+          certificate_id: UUID.
 
           associated_hostnames: The hostnames of the applications that will use this certificate.
 
@@ -509,15 +544,17 @@ async def update(
     def list(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[Certificate, AsyncSinglePage[Certificate]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Certificate, AsyncV4PagePaginationArray[Certificate]]:
         """
         Lists all mTLS root certificates.
 
@@ -526,6 +563,10 @@ def list(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -548,9 +589,19 @@ def list(
             account_or_zone_id = zone_id
         return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/access/certificates",
-            page=AsyncSinglePage[Certificate],
+            page=AsyncV4PagePaginationArray[Certificate],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    certificate_list_params.CertificateListParams,
+                ),
             ),
             model=Certificate,
         )
@@ -559,20 +610,20 @@ async def delete(
         self,
         certificate_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CertificateDeleteResponse]:
         """
         Deletes an mTLS certificate.
 
         Args:
-          certificate_id: UUID
+          certificate_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -616,20 +667,20 @@ async def get(
         self,
         certificate_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Certificate]:
         """
         Fetches a single mTLS certificate.
 
         Args:
-          certificate_id: UUID
+          certificate_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
diff --git a/src/cloudflare/resources/zero_trust/access/certificates/settings.py b/src/cloudflare/resources/zero_trust/access/certificates/settings.py
index 597647546b3..6279f4cf55f 100644
--- a/src/cloudflare/resources/zero_trust/access/certificates/settings.py
+++ b/src/cloudflare/resources/zero_trust/access/certificates/settings.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Iterable, Optional, cast
+from typing import Iterable
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -19,11 +16,10 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ....._wrappers import ResultWrapper
-from ....._base_client import make_request_options
+from .....pagination import SyncSinglePage, AsyncSinglePage
+from ....._base_client import AsyncPaginator, make_request_options
 from .....types.zero_trust.access.certificates import setting_update_params
-from .....types.zero_trust.access.certificates.setting_get_response import SettingGetResponse
-from .....types.zero_trust.access.certificates.setting_update_response import SettingUpdateResponse
+from .....types.zero_trust.access.certificates.certificate_settings import CertificateSettings
 from .....types.zero_trust.access.certificates.certificate_settings_param import CertificateSettingsParam
 
 __all__ = ["SettingsResource", "AsyncSettingsResource"]
@@ -32,25 +28,36 @@
 class SettingsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SettingsResourceWithStreamingResponse(self)
 
     def update(
         self,
         *,
         settings: Iterable[CertificateSettingsParam],
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[CertificateSettings]:
         """
         Updates an mTLS certificate's hostname settings.
 
@@ -79,31 +86,29 @@ def update(
 
             account_or_zone = "zones"
             account_or_zone_id = zone_id
-        return self._put(
+        return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/access/certificates/settings",
+            page=SyncSinglePage[CertificateSettings],
             body=maybe_transform({"settings": settings}, setting_update_params.SettingUpdateParams),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SettingUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[SettingUpdateResponse]], ResultWrapper[SettingUpdateResponse]),
+            model=CertificateSettings,
+            method="put",
         )
 
     def get(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[CertificateSettings]:
         """
         List all mTLS hostname settings for this account or zone.
 
@@ -132,41 +137,49 @@ def get(
 
             account_or_zone = "zones"
             account_or_zone_id = zone_id
-        return self._get(
+        return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/access/certificates/settings",
+            page=SyncSinglePage[CertificateSettings],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SettingGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[SettingGetResponse]], ResultWrapper[SettingGetResponse]),
+            model=CertificateSettings,
         )
 
 
 class AsyncSettingsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSettingsResourceWithStreamingResponse(self)
 
-    async def update(
+    def update(
         self,
         *,
         settings: Iterable[CertificateSettingsParam],
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[CertificateSettings, AsyncSinglePage[CertificateSettings]]:
         """
         Updates an mTLS certificate's hostname settings.
 
@@ -195,31 +208,29 @@ async def update(
 
             account_or_zone = "zones"
             account_or_zone_id = zone_id
-        return await self._put(
+        return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/access/certificates/settings",
-            body=await async_maybe_transform({"settings": settings}, setting_update_params.SettingUpdateParams),
+            page=AsyncSinglePage[CertificateSettings],
+            body=maybe_transform({"settings": settings}, setting_update_params.SettingUpdateParams),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SettingUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[SettingUpdateResponse]], ResultWrapper[SettingUpdateResponse]),
+            model=CertificateSettings,
+            method="put",
         )
 
-    async def get(
+    def get(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[CertificateSettings, AsyncSinglePage[CertificateSettings]]:
         """
         List all mTLS hostname settings for this account or zone.
 
@@ -248,16 +259,13 @@ async def get(
 
             account_or_zone = "zones"
             account_or_zone_id = zone_id
-        return await self._get(
+        return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/access/certificates/settings",
+            page=AsyncSinglePage[CertificateSettings],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SettingGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[SettingGetResponse]], ResultWrapper[SettingGetResponse]),
+            model=CertificateSettings,
         )
 
 
diff --git a/src/cloudflare/resources/zero_trust/access/custom_pages.py b/src/cloudflare/resources/zero_trust/access/custom_pages.py
index b164838d9a2..a0221d88a29 100644
--- a/src/cloudflare/resources/zero_trust/access/custom_pages.py
+++ b/src/cloudflare/resources/zero_trust/access/custom_pages.py
@@ -2,17 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Type, Union, Optional, cast
-from datetime import datetime
+from typing import Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -22,9 +18,9 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ....pagination import SyncSinglePage, AsyncSinglePage
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ...._base_client import AsyncPaginator, make_request_options
-from ....types.zero_trust.access import custom_page_create_params, custom_page_update_params
+from ....types.zero_trust.access import custom_page_list_params, custom_page_create_params, custom_page_update_params
 from ....types.zero_trust.access.custom_page import CustomPage
 from ....types.zero_trust.access.custom_page_without_html import CustomPageWithoutHTML
 from ....types.zero_trust.access.custom_page_delete_response import CustomPageDeleteResponse
@@ -35,10 +31,21 @@
 class CustomPagesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> CustomPagesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CustomPagesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CustomPagesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CustomPagesResourceWithStreamingResponse(self)
 
     def create(
@@ -48,22 +55,18 @@ def create(
         custom_html: str,
         name: str,
         type: Literal["identity_denied", "forbidden"],
-        app_count: int | NotGiven = NOT_GIVEN,
-        created_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        uid: str | NotGiven = NOT_GIVEN,
-        updated_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomPageWithoutHTML]:
         """
         Create a custom page
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           custom_html: Custom page HTML.
 
@@ -71,10 +74,6 @@ def create(
 
           type: Custom page type.
 
-          app_count: Number of apps the custom page is assigned to.
-
-          uid: UUID
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -92,10 +91,6 @@ def create(
                     "custom_html": custom_html,
                     "name": name,
                     "type": type,
-                    "app_count": app_count,
-                    "created_at": created_at,
-                    "uid": uid,
-                    "updated_at": updated_at,
                 },
                 custom_page_create_params.CustomPageCreateParams,
             ),
@@ -117,24 +112,20 @@ def update(
         custom_html: str,
         name: str,
         type: Literal["identity_denied", "forbidden"],
-        app_count: int | NotGiven = NOT_GIVEN,
-        created_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        uid: str | NotGiven = NOT_GIVEN,
-        updated_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomPageWithoutHTML]:
         """
         Update a custom page
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          custom_page_id: UUID
+          custom_page_id: UUID.
 
           custom_html: Custom page HTML.
 
@@ -142,10 +133,6 @@ def update(
 
           type: Custom page type.
 
-          app_count: Number of apps the custom page is assigned to.
-
-          uid: UUID
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -165,10 +152,6 @@ def update(
                     "custom_html": custom_html,
                     "name": name,
                     "type": type,
-                    "app_count": app_count,
-                    "created_at": created_at,
-                    "uid": uid,
-                    "updated_at": updated_at,
                 },
                 custom_page_update_params.CustomPageUpdateParams,
             ),
@@ -186,18 +169,24 @@ def list(
         self,
         *,
         account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[CustomPageWithoutHTML]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[CustomPageWithoutHTML]:
         """
         List custom pages
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
 
           extra_headers: Send extra headers
 
@@ -211,9 +200,19 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/access/custom_pages",
-            page=SyncSinglePage[CustomPageWithoutHTML],
+            page=SyncV4PagePaginationArray[CustomPageWithoutHTML],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    custom_page_list_params.CustomPageListParams,
+                ),
             ),
             model=CustomPageWithoutHTML,
         )
@@ -228,15 +227,15 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomPageDeleteResponse]:
         """
         Delete a custom page
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          custom_page_id: UUID
+          custom_page_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -272,15 +271,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomPage]:
         """
         Fetches a custom page and also returns its HTML.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          custom_page_id: UUID
+          custom_page_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -310,10 +309,21 @@ def get(
 class AsyncCustomPagesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncCustomPagesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCustomPagesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCustomPagesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCustomPagesResourceWithStreamingResponse(self)
 
     async def create(
@@ -323,22 +333,18 @@ async def create(
         custom_html: str,
         name: str,
         type: Literal["identity_denied", "forbidden"],
-        app_count: int | NotGiven = NOT_GIVEN,
-        created_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        uid: str | NotGiven = NOT_GIVEN,
-        updated_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomPageWithoutHTML]:
         """
         Create a custom page
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           custom_html: Custom page HTML.
 
@@ -346,10 +352,6 @@ async def create(
 
           type: Custom page type.
 
-          app_count: Number of apps the custom page is assigned to.
-
-          uid: UUID
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -367,10 +369,6 @@ async def create(
                     "custom_html": custom_html,
                     "name": name,
                     "type": type,
-                    "app_count": app_count,
-                    "created_at": created_at,
-                    "uid": uid,
-                    "updated_at": updated_at,
                 },
                 custom_page_create_params.CustomPageCreateParams,
             ),
@@ -392,24 +390,20 @@ async def update(
         custom_html: str,
         name: str,
         type: Literal["identity_denied", "forbidden"],
-        app_count: int | NotGiven = NOT_GIVEN,
-        created_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        uid: str | NotGiven = NOT_GIVEN,
-        updated_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomPageWithoutHTML]:
         """
         Update a custom page
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          custom_page_id: UUID
+          custom_page_id: UUID.
 
           custom_html: Custom page HTML.
 
@@ -417,10 +411,6 @@ async def update(
 
           type: Custom page type.
 
-          app_count: Number of apps the custom page is assigned to.
-
-          uid: UUID
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -440,10 +430,6 @@ async def update(
                     "custom_html": custom_html,
                     "name": name,
                     "type": type,
-                    "app_count": app_count,
-                    "created_at": created_at,
-                    "uid": uid,
-                    "updated_at": updated_at,
                 },
                 custom_page_update_params.CustomPageUpdateParams,
             ),
@@ -461,18 +447,24 @@ def list(
         self,
         *,
         account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[CustomPageWithoutHTML, AsyncSinglePage[CustomPageWithoutHTML]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[CustomPageWithoutHTML, AsyncV4PagePaginationArray[CustomPageWithoutHTML]]:
         """
         List custom pages
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
 
           extra_headers: Send extra headers
 
@@ -486,9 +478,19 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/access/custom_pages",
-            page=AsyncSinglePage[CustomPageWithoutHTML],
+            page=AsyncV4PagePaginationArray[CustomPageWithoutHTML],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    custom_page_list_params.CustomPageListParams,
+                ),
             ),
             model=CustomPageWithoutHTML,
         )
@@ -503,15 +505,15 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomPageDeleteResponse]:
         """
         Delete a custom page
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          custom_page_id: UUID
+          custom_page_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -547,15 +549,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomPage]:
         """
         Fetches a custom page and also returns its HTML.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          custom_page_id: UUID
+          custom_page_id: UUID.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/zero_trust/access/gateway_ca.py b/src/cloudflare/resources/zero_trust/access/gateway_ca.py
new file mode 100644
index 00000000000..ed2e6346595
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/access/gateway_ca.py
@@ -0,0 +1,365 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.zero_trust.access.gateway_ca_list_response import GatewayCAListResponse
+from ....types.zero_trust.access.gateway_ca_create_response import GatewayCACreateResponse
+from ....types.zero_trust.access.gateway_ca_delete_response import GatewayCADeleteResponse
+
+__all__ = ["GatewayCAResource", "AsyncGatewayCAResource"]
+
+
+class GatewayCAResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> GatewayCAResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return GatewayCAResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> GatewayCAResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return GatewayCAResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[GatewayCACreateResponse]:
+        """
+        Adds a new SSH Certificate Authority (CA).
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/access/gateway_ca",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[GatewayCACreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[GatewayCACreateResponse]], ResultWrapper[GatewayCACreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[GatewayCAListResponse]:
+        """
+        Lists SSH Certificate Authorities (CA).
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/access/gateway_ca",
+            page=SyncSinglePage[GatewayCAListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=GatewayCAListResponse,
+        )
+
+    def delete(
+        self,
+        certificate_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[GatewayCADeleteResponse]:
+        """
+        Deletes an SSH Certificate Authority.
+
+        Args:
+          account_id: Identifier.
+
+          certificate_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not certificate_id:
+            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/access/gateway_ca/{certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[GatewayCADeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[GatewayCADeleteResponse]], ResultWrapper[GatewayCADeleteResponse]),
+        )
+
+
+class AsyncGatewayCAResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncGatewayCAResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncGatewayCAResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncGatewayCAResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncGatewayCAResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[GatewayCACreateResponse]:
+        """
+        Adds a new SSH Certificate Authority (CA).
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/access/gateway_ca",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[GatewayCACreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[GatewayCACreateResponse]], ResultWrapper[GatewayCACreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[GatewayCAListResponse, AsyncSinglePage[GatewayCAListResponse]]:
+        """
+        Lists SSH Certificate Authorities (CA).
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/access/gateway_ca",
+            page=AsyncSinglePage[GatewayCAListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=GatewayCAListResponse,
+        )
+
+    async def delete(
+        self,
+        certificate_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[GatewayCADeleteResponse]:
+        """
+        Deletes an SSH Certificate Authority.
+
+        Args:
+          account_id: Identifier.
+
+          certificate_id: UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not certificate_id:
+            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/access/gateway_ca/{certificate_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[GatewayCADeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[GatewayCADeleteResponse]], ResultWrapper[GatewayCADeleteResponse]),
+        )
+
+
+class GatewayCAResourceWithRawResponse:
+    def __init__(self, gateway_ca: GatewayCAResource) -> None:
+        self._gateway_ca = gateway_ca
+
+        self.create = to_raw_response_wrapper(
+            gateway_ca.create,
+        )
+        self.list = to_raw_response_wrapper(
+            gateway_ca.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            gateway_ca.delete,
+        )
+
+
+class AsyncGatewayCAResourceWithRawResponse:
+    def __init__(self, gateway_ca: AsyncGatewayCAResource) -> None:
+        self._gateway_ca = gateway_ca
+
+        self.create = async_to_raw_response_wrapper(
+            gateway_ca.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            gateway_ca.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            gateway_ca.delete,
+        )
+
+
+class GatewayCAResourceWithStreamingResponse:
+    def __init__(self, gateway_ca: GatewayCAResource) -> None:
+        self._gateway_ca = gateway_ca
+
+        self.create = to_streamed_response_wrapper(
+            gateway_ca.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            gateway_ca.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            gateway_ca.delete,
+        )
+
+
+class AsyncGatewayCAResourceWithStreamingResponse:
+    def __init__(self, gateway_ca: AsyncGatewayCAResource) -> None:
+        self._gateway_ca = gateway_ca
+
+        self.create = async_to_streamed_response_wrapper(
+            gateway_ca.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            gateway_ca.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            gateway_ca.delete,
+        )
diff --git a/src/cloudflare/resources/zero_trust/access/groups.py b/src/cloudflare/resources/zero_trust/access/groups.py
index bb9002a0430..c27dba939fb 100644
--- a/src/cloudflare/resources/zero_trust/access/groups.py
+++ b/src/cloudflare/resources/zero_trust/access/groups.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -20,12 +17,15 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ....pagination import SyncSinglePage, AsyncSinglePage
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ...._base_client import AsyncPaginator, make_request_options
-from ....types.zero_trust.access import group_create_params, group_update_params
-from ....types.zero_trust.access_rule_param import AccessRuleParam
-from ....types.zero_trust.access.zero_trust_group import ZeroTrustGroup
+from ....types.zero_trust.access import group_list_params, group_create_params, group_update_params
+from ....types.zero_trust.access.group_get_response import GroupGetResponse
+from ....types.zero_trust.access.group_list_response import GroupListResponse
+from ....types.zero_trust.access.group_create_response import GroupCreateResponse
 from ....types.zero_trust.access.group_delete_response import GroupDeleteResponse
+from ....types.zero_trust.access.group_update_response import GroupUpdateResponse
+from ....types.zero_trust.access.applications.access_rule_param import AccessRuleParam
 
 __all__ = ["GroupsResource", "AsyncGroupsResource"]
 
@@ -33,10 +33,21 @@
 class GroupsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> GroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return GroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> GroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return GroupsResourceWithStreamingResponse(self)
 
     def create(
@@ -44,18 +55,18 @@ def create(
         *,
         include: Iterable[AccessRuleParam],
         name: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        exclude: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        is_default: bool | NotGiven = NOT_GIVEN,
-        require: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        exclude: Iterable[AccessRuleParam] | Omit = omit,
+        is_default: bool | Omit = omit,
+        require: Iterable[AccessRuleParam] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ZeroTrustGroup]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[GroupCreateResponse]:
         """
         Creates a new Access group.
 
@@ -114,9 +125,9 @@ def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ZeroTrustGroup]]._unwrapper,
+                post_parser=ResultWrapper[Optional[GroupCreateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ZeroTrustGroup]], ResultWrapper[ZeroTrustGroup]),
+            cast_to=cast(Type[Optional[GroupCreateResponse]], ResultWrapper[GroupCreateResponse]),
         )
 
     def update(
@@ -125,23 +136,23 @@ def update(
         *,
         include: Iterable[AccessRuleParam],
         name: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        exclude: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        is_default: bool | NotGiven = NOT_GIVEN,
-        require: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        exclude: Iterable[AccessRuleParam] | Omit = omit,
+        is_default: bool | Omit = omit,
+        require: Iterable[AccessRuleParam] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ZeroTrustGroup]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[GroupUpdateResponse]:
         """
         Updates a configured Access group.
 
         Args:
-          group_id: UUID
+          group_id: UUID.
 
           include: Rules evaluated with an OR logical operator. A user needs to meet only one of
               the Include rules.
@@ -199,23 +210,27 @@ def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ZeroTrustGroup]]._unwrapper,
+                post_parser=ResultWrapper[Optional[GroupUpdateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ZeroTrustGroup]], ResultWrapper[ZeroTrustGroup]),
+            cast_to=cast(Type[Optional[GroupUpdateResponse]], ResultWrapper[GroupUpdateResponse]),
         )
 
     def list(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        name: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[ZeroTrustGroup]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[GroupListResponse]:
         """
         Lists all Access groups.
 
@@ -224,6 +239,14 @@ def list(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          name: The name of the group.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
+          search: Search for groups by other listed query parameters.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -246,31 +269,43 @@ def list(
             account_or_zone_id = zone_id
         return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/access/groups",
-            page=SyncSinglePage[ZeroTrustGroup],
+            page=SyncV4PagePaginationArray[GroupListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    group_list_params.GroupListParams,
+                ),
             ),
-            model=ZeroTrustGroup,
+            model=GroupListResponse,
         )
 
     def delete(
         self,
         group_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GroupDeleteResponse]:
         """
         Deletes an Access group.
 
         Args:
-          group_id: UUID
+          group_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -314,20 +349,20 @@ def get(
         self,
         group_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ZeroTrustGroup]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[GroupGetResponse]:
         """
         Fetches a single Access group.
 
         Args:
-          group_id: UUID
+          group_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -362,19 +397,30 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ZeroTrustGroup]]._unwrapper,
+                post_parser=ResultWrapper[Optional[GroupGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ZeroTrustGroup]], ResultWrapper[ZeroTrustGroup]),
+            cast_to=cast(Type[Optional[GroupGetResponse]], ResultWrapper[GroupGetResponse]),
         )
 
 
 class AsyncGroupsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncGroupsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncGroupsResourceWithStreamingResponse(self)
 
     async def create(
@@ -382,18 +428,18 @@ async def create(
         *,
         include: Iterable[AccessRuleParam],
         name: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        exclude: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        is_default: bool | NotGiven = NOT_GIVEN,
-        require: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        exclude: Iterable[AccessRuleParam] | Omit = omit,
+        is_default: bool | Omit = omit,
+        require: Iterable[AccessRuleParam] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ZeroTrustGroup]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[GroupCreateResponse]:
         """
         Creates a new Access group.
 
@@ -452,9 +498,9 @@ async def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ZeroTrustGroup]]._unwrapper,
+                post_parser=ResultWrapper[Optional[GroupCreateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ZeroTrustGroup]], ResultWrapper[ZeroTrustGroup]),
+            cast_to=cast(Type[Optional[GroupCreateResponse]], ResultWrapper[GroupCreateResponse]),
         )
 
     async def update(
@@ -463,23 +509,23 @@ async def update(
         *,
         include: Iterable[AccessRuleParam],
         name: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        exclude: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        is_default: bool | NotGiven = NOT_GIVEN,
-        require: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        exclude: Iterable[AccessRuleParam] | Omit = omit,
+        is_default: bool | Omit = omit,
+        require: Iterable[AccessRuleParam] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ZeroTrustGroup]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[GroupUpdateResponse]:
         """
         Updates a configured Access group.
 
         Args:
-          group_id: UUID
+          group_id: UUID.
 
           include: Rules evaluated with an OR logical operator. A user needs to meet only one of
               the Include rules.
@@ -537,23 +583,27 @@ async def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ZeroTrustGroup]]._unwrapper,
+                post_parser=ResultWrapper[Optional[GroupUpdateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ZeroTrustGroup]], ResultWrapper[ZeroTrustGroup]),
+            cast_to=cast(Type[Optional[GroupUpdateResponse]], ResultWrapper[GroupUpdateResponse]),
         )
 
     def list(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        name: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[ZeroTrustGroup, AsyncSinglePage[ZeroTrustGroup]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[GroupListResponse, AsyncV4PagePaginationArray[GroupListResponse]]:
         """
         Lists all Access groups.
 
@@ -562,6 +612,14 @@ def list(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          name: The name of the group.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
+          search: Search for groups by other listed query parameters.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -584,31 +642,43 @@ def list(
             account_or_zone_id = zone_id
         return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/access/groups",
-            page=AsyncSinglePage[ZeroTrustGroup],
+            page=AsyncV4PagePaginationArray[GroupListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    group_list_params.GroupListParams,
+                ),
             ),
-            model=ZeroTrustGroup,
+            model=GroupListResponse,
         )
 
     async def delete(
         self,
         group_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GroupDeleteResponse]:
         """
         Deletes an Access group.
 
         Args:
-          group_id: UUID
+          group_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -652,20 +722,20 @@ async def get(
         self,
         group_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ZeroTrustGroup]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[GroupGetResponse]:
         """
         Fetches a single Access group.
 
         Args:
-          group_id: UUID
+          group_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -700,9 +770,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[ZeroTrustGroup]]._unwrapper,
+                post_parser=ResultWrapper[Optional[GroupGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ZeroTrustGroup]], ResultWrapper[ZeroTrustGroup]),
+            cast_to=cast(Type[Optional[GroupGetResponse]], ResultWrapper[GroupGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/zero_trust/access/infrastructure/__init__.py b/src/cloudflare/resources/zero_trust/access/infrastructure/__init__.py
new file mode 100644
index 00000000000..5fbcb3c066a
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/access/infrastructure/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .targets import (
+    TargetsResource,
+    AsyncTargetsResource,
+    TargetsResourceWithRawResponse,
+    AsyncTargetsResourceWithRawResponse,
+    TargetsResourceWithStreamingResponse,
+    AsyncTargetsResourceWithStreamingResponse,
+)
+from .infrastructure import (
+    InfrastructureResource,
+    AsyncInfrastructureResource,
+    InfrastructureResourceWithRawResponse,
+    AsyncInfrastructureResourceWithRawResponse,
+    InfrastructureResourceWithStreamingResponse,
+    AsyncInfrastructureResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "TargetsResource",
+    "AsyncTargetsResource",
+    "TargetsResourceWithRawResponse",
+    "AsyncTargetsResourceWithRawResponse",
+    "TargetsResourceWithStreamingResponse",
+    "AsyncTargetsResourceWithStreamingResponse",
+    "InfrastructureResource",
+    "AsyncInfrastructureResource",
+    "InfrastructureResourceWithRawResponse",
+    "AsyncInfrastructureResourceWithRawResponse",
+    "InfrastructureResourceWithStreamingResponse",
+    "AsyncInfrastructureResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/access/infrastructure/infrastructure.py b/src/cloudflare/resources/zero_trust/access/infrastructure/infrastructure.py
new file mode 100644
index 00000000000..4bc51c39829
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/access/infrastructure/infrastructure.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .targets import (
+    TargetsResource,
+    AsyncTargetsResource,
+    TargetsResourceWithRawResponse,
+    AsyncTargetsResourceWithRawResponse,
+    TargetsResourceWithStreamingResponse,
+    AsyncTargetsResourceWithStreamingResponse,
+)
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["InfrastructureResource", "AsyncInfrastructureResource"]
+
+
+class InfrastructureResource(SyncAPIResource):
+    @cached_property
+    def targets(self) -> TargetsResource:
+        return TargetsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> InfrastructureResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return InfrastructureResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> InfrastructureResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return InfrastructureResourceWithStreamingResponse(self)
+
+
+class AsyncInfrastructureResource(AsyncAPIResource):
+    @cached_property
+    def targets(self) -> AsyncTargetsResource:
+        return AsyncTargetsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncInfrastructureResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncInfrastructureResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncInfrastructureResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncInfrastructureResourceWithStreamingResponse(self)
+
+
+class InfrastructureResourceWithRawResponse:
+    def __init__(self, infrastructure: InfrastructureResource) -> None:
+        self._infrastructure = infrastructure
+
+    @cached_property
+    def targets(self) -> TargetsResourceWithRawResponse:
+        return TargetsResourceWithRawResponse(self._infrastructure.targets)
+
+
+class AsyncInfrastructureResourceWithRawResponse:
+    def __init__(self, infrastructure: AsyncInfrastructureResource) -> None:
+        self._infrastructure = infrastructure
+
+    @cached_property
+    def targets(self) -> AsyncTargetsResourceWithRawResponse:
+        return AsyncTargetsResourceWithRawResponse(self._infrastructure.targets)
+
+
+class InfrastructureResourceWithStreamingResponse:
+    def __init__(self, infrastructure: InfrastructureResource) -> None:
+        self._infrastructure = infrastructure
+
+    @cached_property
+    def targets(self) -> TargetsResourceWithStreamingResponse:
+        return TargetsResourceWithStreamingResponse(self._infrastructure.targets)
+
+
+class AsyncInfrastructureResourceWithStreamingResponse:
+    def __init__(self, infrastructure: AsyncInfrastructureResource) -> None:
+        self._infrastructure = infrastructure
+
+    @cached_property
+    def targets(self) -> AsyncTargetsResourceWithStreamingResponse:
+        return AsyncTargetsResourceWithStreamingResponse(self._infrastructure.targets)
diff --git a/src/cloudflare/resources/zero_trust/access/infrastructure/targets.py b/src/cloudflare/resources/zero_trust/access/infrastructure/targets.py
new file mode 100644
index 00000000000..79543f77c2f
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/access/infrastructure/targets.py
@@ -0,0 +1,1104 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import typing_extensions
+from typing import Type, Union, Iterable, Optional, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NoneType, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from .....pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.zero_trust.access.infrastructure import (
+    target_list_params,
+    target_create_params,
+    target_update_params,
+    target_bulk_update_params,
+    target_bulk_delete_v2_params,
+)
+from .....types.zero_trust.access.infrastructure.target_get_response import TargetGetResponse
+from .....types.zero_trust.access.infrastructure.target_list_response import TargetListResponse
+from .....types.zero_trust.access.infrastructure.target_create_response import TargetCreateResponse
+from .....types.zero_trust.access.infrastructure.target_update_response import TargetUpdateResponse
+from .....types.zero_trust.access.infrastructure.target_bulk_update_response import TargetBulkUpdateResponse
+
+__all__ = ["TargetsResource", "AsyncTargetsResource"]
+
+
+class TargetsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> TargetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TargetsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TargetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TargetsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        hostname: str,
+        ip: target_create_params.IP,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TargetCreateResponse]:
+        """
+        Create new target
+
+        Args:
+          account_id: Account identifier
+
+          hostname: A non-unique field that refers to a target. Case insensitive, maximum length of
+              255 characters, supports the use of special characters dash and period, does not
+              support spaces, and must start and end with an alphanumeric character.
+
+          ip: The IPv4/IPv6 address that identifies where to reach a target
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/infrastructure/targets",
+            body=maybe_transform(
+                {
+                    "hostname": hostname,
+                    "ip": ip,
+                },
+                target_create_params.TargetCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TargetCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TargetCreateResponse]], ResultWrapper[TargetCreateResponse]),
+        )
+
+    def update(
+        self,
+        target_id: str,
+        *,
+        account_id: str,
+        hostname: str,
+        ip: target_update_params.IP,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TargetUpdateResponse]:
+        """
+        Update target
+
+        Args:
+          account_id: Account identifier
+
+          target_id: Target identifier
+
+          hostname: A non-unique field that refers to a target. Case insensitive, maximum length of
+              255 characters, supports the use of special characters dash and period, does not
+              support spaces, and must start and end with an alphanumeric character.
+
+          ip: The IPv4/IPv6 address that identifies where to reach a target
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not target_id:
+            raise ValueError(f"Expected a non-empty value for `target_id` but received {target_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/infrastructure/targets/{target_id}",
+            body=maybe_transform(
+                {
+                    "hostname": hostname,
+                    "ip": ip,
+                },
+                target_update_params.TargetUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TargetUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TargetUpdateResponse]], ResultWrapper[TargetUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        created_after: Union[str, datetime, None] | Omit = omit,
+        created_before: Union[str, datetime, None] | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        hostname: Optional[str] | Omit = omit,
+        hostname_contains: Optional[str] | Omit = omit,
+        ip_like: Optional[str] | Omit = omit,
+        ip_v4: Optional[str] | Omit = omit,
+        ip_v6: Optional[str] | Omit = omit,
+        ips: SequenceNotStr[str] | Omit = omit,
+        ipv4_end: Optional[str] | Omit = omit,
+        ipv4_start: Optional[str] | Omit = omit,
+        ipv6_end: Optional[str] | Omit = omit,
+        ipv6_start: Optional[str] | Omit = omit,
+        modified_after: Union[str, datetime, None] | Omit = omit,
+        modified_before: Union[str, datetime, None] | Omit = omit,
+        order: Literal["hostname", "created_at"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        target_ids: SequenceNotStr[str] | Omit = omit,
+        virtual_network_id: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[TargetListResponse]:
+        """Lists and sorts an account’s targets.
+
+        Filters are optional and are ANDed
+        together.
+
+        Args:
+          account_id: Account identifier
+
+          created_after: Date and time at which the target was created after (inclusive)
+
+          created_before: Date and time at which the target was created before (inclusive)
+
+          direction: The sorting direction.
+
+          hostname: Hostname of a target
+
+          hostname_contains: Partial match to the hostname of a target
+
+          ip_like: Filters for targets whose IP addresses look like the specified string. Supports
+              `*` as a wildcard character
+
+          ip_v4: IPv4 address of the target
+
+          ip_v6: IPv6 address of the target
+
+          ips: Filters for targets that have any of the following IP addresses. Specify `ips`
+              multiple times in query parameter to build list of candidates.
+
+          ipv4_end: Defines an IPv4 filter range's ending value (inclusive). Requires `ipv4_start`
+              to be specified as well.
+
+          ipv4_start: Defines an IPv4 filter range's starting value (inclusive). Requires `ipv4_end`
+              to be specified as well.
+
+          ipv6_end: Defines an IPv6 filter range's ending value (inclusive). Requires `ipv6_start`
+              to be specified as well.
+
+          ipv6_start: Defines an IPv6 filter range's starting value (inclusive). Requires `ipv6_end`
+              to be specified as well.
+
+          modified_after: Date and time at which the target was modified after (inclusive)
+
+          modified_before: Date and time at which the target was modified before (inclusive)
+
+          order: The field to sort by.
+
+          page: Current page in the response
+
+          per_page: Max amount of entries returned per page
+
+          target_ids: Filters for targets that have any of the following UUIDs. Specify `target_ids`
+              multiple times in query parameter to build list of candidates.
+
+          virtual_network_id: Private virtual network identifier of the target
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/infrastructure/targets",
+            page=SyncV4PagePaginationArray[TargetListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "created_after": created_after,
+                        "created_before": created_before,
+                        "direction": direction,
+                        "hostname": hostname,
+                        "hostname_contains": hostname_contains,
+                        "ip_like": ip_like,
+                        "ip_v4": ip_v4,
+                        "ip_v6": ip_v6,
+                        "ips": ips,
+                        "ipv4_end": ipv4_end,
+                        "ipv4_start": ipv4_start,
+                        "ipv6_end": ipv6_end,
+                        "ipv6_start": ipv6_start,
+                        "modified_after": modified_after,
+                        "modified_before": modified_before,
+                        "order": order,
+                        "page": page,
+                        "per_page": per_page,
+                        "target_ids": target_ids,
+                        "virtual_network_id": virtual_network_id,
+                    },
+                    target_list_params.TargetListParams,
+                ),
+            ),
+            model=TargetListResponse,
+        )
+
+    def delete(
+        self,
+        target_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Delete target
+
+        Args:
+          account_id: Account identifier
+
+          target_id: Target identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not target_id:
+            raise ValueError(f"Expected a non-empty value for `target_id` but received {target_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._delete(
+            f"/accounts/{account_id}/infrastructure/targets/{target_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    @typing_extensions.deprecated("deprecated")
+    def bulk_delete(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Removes one or more targets.
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._delete(
+            f"/accounts/{account_id}/infrastructure/targets/batch",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    def bulk_delete_v2(
+        self,
+        *,
+        account_id: str,
+        target_ids: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Removes one or more targets.
+
+        Args:
+          account_id: Account identifier
+
+          target_ids: List of target IDs to bulk delete
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._post(
+            f"/accounts/{account_id}/infrastructure/targets/batch_delete",
+            body=maybe_transform({"target_ids": target_ids}, target_bulk_delete_v2_params.TargetBulkDeleteV2Params),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    def bulk_update(
+        self,
+        *,
+        account_id: str,
+        body: Iterable[target_bulk_update_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[TargetBulkUpdateResponse]:
+        """
+        Adds one or more targets.
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/infrastructure/targets/batch",
+            page=SyncSinglePage[TargetBulkUpdateResponse],
+            body=maybe_transform(body, Iterable[target_bulk_update_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=TargetBulkUpdateResponse,
+            method="put",
+        )
+
+    def get(
+        self,
+        target_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TargetGetResponse]:
+        """
+        Get target
+
+        Args:
+          account_id: Account identifier
+
+          target_id: Target identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not target_id:
+            raise ValueError(f"Expected a non-empty value for `target_id` but received {target_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/infrastructure/targets/{target_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TargetGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TargetGetResponse]], ResultWrapper[TargetGetResponse]),
+        )
+
+
+class AsyncTargetsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncTargetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTargetsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTargetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTargetsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        hostname: str,
+        ip: target_create_params.IP,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TargetCreateResponse]:
+        """
+        Create new target
+
+        Args:
+          account_id: Account identifier
+
+          hostname: A non-unique field that refers to a target. Case insensitive, maximum length of
+              255 characters, supports the use of special characters dash and period, does not
+              support spaces, and must start and end with an alphanumeric character.
+
+          ip: The IPv4/IPv6 address that identifies where to reach a target
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/infrastructure/targets",
+            body=await async_maybe_transform(
+                {
+                    "hostname": hostname,
+                    "ip": ip,
+                },
+                target_create_params.TargetCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TargetCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TargetCreateResponse]], ResultWrapper[TargetCreateResponse]),
+        )
+
+    async def update(
+        self,
+        target_id: str,
+        *,
+        account_id: str,
+        hostname: str,
+        ip: target_update_params.IP,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TargetUpdateResponse]:
+        """
+        Update target
+
+        Args:
+          account_id: Account identifier
+
+          target_id: Target identifier
+
+          hostname: A non-unique field that refers to a target. Case insensitive, maximum length of
+              255 characters, supports the use of special characters dash and period, does not
+              support spaces, and must start and end with an alphanumeric character.
+
+          ip: The IPv4/IPv6 address that identifies where to reach a target
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not target_id:
+            raise ValueError(f"Expected a non-empty value for `target_id` but received {target_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/infrastructure/targets/{target_id}",
+            body=await async_maybe_transform(
+                {
+                    "hostname": hostname,
+                    "ip": ip,
+                },
+                target_update_params.TargetUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TargetUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TargetUpdateResponse]], ResultWrapper[TargetUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        created_after: Union[str, datetime, None] | Omit = omit,
+        created_before: Union[str, datetime, None] | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        hostname: Optional[str] | Omit = omit,
+        hostname_contains: Optional[str] | Omit = omit,
+        ip_like: Optional[str] | Omit = omit,
+        ip_v4: Optional[str] | Omit = omit,
+        ip_v6: Optional[str] | Omit = omit,
+        ips: SequenceNotStr[str] | Omit = omit,
+        ipv4_end: Optional[str] | Omit = omit,
+        ipv4_start: Optional[str] | Omit = omit,
+        ipv6_end: Optional[str] | Omit = omit,
+        ipv6_start: Optional[str] | Omit = omit,
+        modified_after: Union[str, datetime, None] | Omit = omit,
+        modified_before: Union[str, datetime, None] | Omit = omit,
+        order: Literal["hostname", "created_at"] | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        target_ids: SequenceNotStr[str] | Omit = omit,
+        virtual_network_id: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[TargetListResponse, AsyncV4PagePaginationArray[TargetListResponse]]:
+        """Lists and sorts an account’s targets.
+
+        Filters are optional and are ANDed
+        together.
+
+        Args:
+          account_id: Account identifier
+
+          created_after: Date and time at which the target was created after (inclusive)
+
+          created_before: Date and time at which the target was created before (inclusive)
+
+          direction: The sorting direction.
+
+          hostname: Hostname of a target
+
+          hostname_contains: Partial match to the hostname of a target
+
+          ip_like: Filters for targets whose IP addresses look like the specified string. Supports
+              `*` as a wildcard character
+
+          ip_v4: IPv4 address of the target
+
+          ip_v6: IPv6 address of the target
+
+          ips: Filters for targets that have any of the following IP addresses. Specify `ips`
+              multiple times in query parameter to build list of candidates.
+
+          ipv4_end: Defines an IPv4 filter range's ending value (inclusive). Requires `ipv4_start`
+              to be specified as well.
+
+          ipv4_start: Defines an IPv4 filter range's starting value (inclusive). Requires `ipv4_end`
+              to be specified as well.
+
+          ipv6_end: Defines an IPv6 filter range's ending value (inclusive). Requires `ipv6_start`
+              to be specified as well.
+
+          ipv6_start: Defines an IPv6 filter range's starting value (inclusive). Requires `ipv6_end`
+              to be specified as well.
+
+          modified_after: Date and time at which the target was modified after (inclusive)
+
+          modified_before: Date and time at which the target was modified before (inclusive)
+
+          order: The field to sort by.
+
+          page: Current page in the response
+
+          per_page: Max amount of entries returned per page
+
+          target_ids: Filters for targets that have any of the following UUIDs. Specify `target_ids`
+              multiple times in query parameter to build list of candidates.
+
+          virtual_network_id: Private virtual network identifier of the target
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/infrastructure/targets",
+            page=AsyncV4PagePaginationArray[TargetListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "created_after": created_after,
+                        "created_before": created_before,
+                        "direction": direction,
+                        "hostname": hostname,
+                        "hostname_contains": hostname_contains,
+                        "ip_like": ip_like,
+                        "ip_v4": ip_v4,
+                        "ip_v6": ip_v6,
+                        "ips": ips,
+                        "ipv4_end": ipv4_end,
+                        "ipv4_start": ipv4_start,
+                        "ipv6_end": ipv6_end,
+                        "ipv6_start": ipv6_start,
+                        "modified_after": modified_after,
+                        "modified_before": modified_before,
+                        "order": order,
+                        "page": page,
+                        "per_page": per_page,
+                        "target_ids": target_ids,
+                        "virtual_network_id": virtual_network_id,
+                    },
+                    target_list_params.TargetListParams,
+                ),
+            ),
+            model=TargetListResponse,
+        )
+
+    async def delete(
+        self,
+        target_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Delete target
+
+        Args:
+          account_id: Account identifier
+
+          target_id: Target identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not target_id:
+            raise ValueError(f"Expected a non-empty value for `target_id` but received {target_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._delete(
+            f"/accounts/{account_id}/infrastructure/targets/{target_id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    @typing_extensions.deprecated("deprecated")
+    async def bulk_delete(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Removes one or more targets.
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._delete(
+            f"/accounts/{account_id}/infrastructure/targets/batch",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    async def bulk_delete_v2(
+        self,
+        *,
+        account_id: str,
+        target_ids: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> None:
+        """
+        Removes one or more targets.
+
+        Args:
+          account_id: Account identifier
+
+          target_ids: List of target IDs to bulk delete
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._post(
+            f"/accounts/{account_id}/infrastructure/targets/batch_delete",
+            body=await async_maybe_transform(
+                {"target_ids": target_ids}, target_bulk_delete_v2_params.TargetBulkDeleteV2Params
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
+    def bulk_update(
+        self,
+        *,
+        account_id: str,
+        body: Iterable[target_bulk_update_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[TargetBulkUpdateResponse, AsyncSinglePage[TargetBulkUpdateResponse]]:
+        """
+        Adds one or more targets.
+
+        Args:
+          account_id: Account identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/infrastructure/targets/batch",
+            page=AsyncSinglePage[TargetBulkUpdateResponse],
+            body=maybe_transform(body, Iterable[target_bulk_update_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=TargetBulkUpdateResponse,
+            method="put",
+        )
+
+    async def get(
+        self,
+        target_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[TargetGetResponse]:
+        """
+        Get target
+
+        Args:
+          account_id: Account identifier
+
+          target_id: Target identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not target_id:
+            raise ValueError(f"Expected a non-empty value for `target_id` but received {target_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/infrastructure/targets/{target_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[TargetGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[TargetGetResponse]], ResultWrapper[TargetGetResponse]),
+        )
+
+
+class TargetsResourceWithRawResponse:
+    def __init__(self, targets: TargetsResource) -> None:
+        self._targets = targets
+
+        self.create = to_raw_response_wrapper(
+            targets.create,
+        )
+        self.update = to_raw_response_wrapper(
+            targets.update,
+        )
+        self.list = to_raw_response_wrapper(
+            targets.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            targets.delete,
+        )
+        self.bulk_delete = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                targets.bulk_delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_delete_v2 = to_raw_response_wrapper(
+            targets.bulk_delete_v2,
+        )
+        self.bulk_update = to_raw_response_wrapper(
+            targets.bulk_update,
+        )
+        self.get = to_raw_response_wrapper(
+            targets.get,
+        )
+
+
+class AsyncTargetsResourceWithRawResponse:
+    def __init__(self, targets: AsyncTargetsResource) -> None:
+        self._targets = targets
+
+        self.create = async_to_raw_response_wrapper(
+            targets.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            targets.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            targets.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            targets.delete,
+        )
+        self.bulk_delete = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                targets.bulk_delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_delete_v2 = async_to_raw_response_wrapper(
+            targets.bulk_delete_v2,
+        )
+        self.bulk_update = async_to_raw_response_wrapper(
+            targets.bulk_update,
+        )
+        self.get = async_to_raw_response_wrapper(
+            targets.get,
+        )
+
+
+class TargetsResourceWithStreamingResponse:
+    def __init__(self, targets: TargetsResource) -> None:
+        self._targets = targets
+
+        self.create = to_streamed_response_wrapper(
+            targets.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            targets.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            targets.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            targets.delete,
+        )
+        self.bulk_delete = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                targets.bulk_delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_delete_v2 = to_streamed_response_wrapper(
+            targets.bulk_delete_v2,
+        )
+        self.bulk_update = to_streamed_response_wrapper(
+            targets.bulk_update,
+        )
+        self.get = to_streamed_response_wrapper(
+            targets.get,
+        )
+
+
+class AsyncTargetsResourceWithStreamingResponse:
+    def __init__(self, targets: AsyncTargetsResource) -> None:
+        self._targets = targets
+
+        self.create = async_to_streamed_response_wrapper(
+            targets.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            targets.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            targets.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            targets.delete,
+        )
+        self.bulk_delete = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                targets.bulk_delete,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.bulk_delete_v2 = async_to_streamed_response_wrapper(
+            targets.bulk_delete_v2,
+        )
+        self.bulk_update = async_to_streamed_response_wrapper(
+            targets.bulk_update,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            targets.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/access/keys.py b/src/cloudflare/resources/zero_trust/access/keys.py
index 16b975ff161..075fc667f34 100644
--- a/src/cloudflare/resources/zero_trust/access/keys.py
+++ b/src/cloudflare/resources/zero_trust/access/keys.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -32,10 +29,21 @@
 class KeysResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> KeysResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return KeysResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> KeysResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return KeysResourceWithStreamingResponse(self)
 
     def update(
@@ -48,13 +56,13 @@ def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[KeyUpdateResponse]:
         """
         Updates the Access key rotation settings for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           key_rotation_interval_days: The number of days between key rotations.
 
@@ -68,24 +76,19 @@ def update(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            Optional[KeyUpdateResponse],
-            self._put(
-                f"/accounts/{account_id}/access/keys",
-                body=maybe_transform(
-                    {"key_rotation_interval_days": key_rotation_interval_days}, key_update_params.KeyUpdateParams
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[KeyUpdateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[KeyUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._put(
+            f"/accounts/{account_id}/access/keys",
+            body=maybe_transform(
+                {"key_rotation_interval_days": key_rotation_interval_days}, key_update_params.KeyUpdateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[KeyUpdateResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[KeyUpdateResponse]], ResultWrapper[KeyUpdateResponse]),
         )
 
     def get(
@@ -97,13 +100,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[KeyGetResponse]:
         """
         Gets the Access key rotation settings for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -115,21 +118,16 @@ def get(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            Optional[KeyGetResponse],
-            self._get(
-                f"/accounts/{account_id}/access/keys",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[KeyGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[KeyGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._get(
+            f"/accounts/{account_id}/access/keys",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[KeyGetResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[KeyGetResponse]], ResultWrapper[KeyGetResponse]),
         )
 
     def rotate(
@@ -141,13 +139,13 @@ def rotate(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[KeyRotateResponse]:
         """
         Perfoms a key rotation for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -159,31 +157,37 @@ def rotate(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            Optional[KeyRotateResponse],
-            self._post(
-                f"/accounts/{account_id}/access/keys/rotate",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[KeyRotateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[KeyRotateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._post(
+            f"/accounts/{account_id}/access/keys/rotate",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[KeyRotateResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[KeyRotateResponse]], ResultWrapper[KeyRotateResponse]),
         )
 
 
 class AsyncKeysResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncKeysResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncKeysResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncKeysResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncKeysResourceWithStreamingResponse(self)
 
     async def update(
@@ -196,13 +200,13 @@ async def update(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[KeyUpdateResponse]:
         """
         Updates the Access key rotation settings for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           key_rotation_interval_days: The number of days between key rotations.
 
@@ -216,24 +220,19 @@ async def update(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            Optional[KeyUpdateResponse],
-            await self._put(
-                f"/accounts/{account_id}/access/keys",
-                body=await async_maybe_transform(
-                    {"key_rotation_interval_days": key_rotation_interval_days}, key_update_params.KeyUpdateParams
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[KeyUpdateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[KeyUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._put(
+            f"/accounts/{account_id}/access/keys",
+            body=await async_maybe_transform(
+                {"key_rotation_interval_days": key_rotation_interval_days}, key_update_params.KeyUpdateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[KeyUpdateResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[KeyUpdateResponse]], ResultWrapper[KeyUpdateResponse]),
         )
 
     async def get(
@@ -245,13 +244,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[KeyGetResponse]:
         """
         Gets the Access key rotation settings for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -263,21 +262,16 @@ async def get(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            Optional[KeyGetResponse],
-            await self._get(
-                f"/accounts/{account_id}/access/keys",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[KeyGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[KeyGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._get(
+            f"/accounts/{account_id}/access/keys",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[KeyGetResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[KeyGetResponse]], ResultWrapper[KeyGetResponse]),
         )
 
     async def rotate(
@@ -289,13 +283,13 @@ async def rotate(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[KeyRotateResponse]:
         """
         Perfoms a key rotation for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -307,21 +301,16 @@ async def rotate(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            Optional[KeyRotateResponse],
-            await self._post(
-                f"/accounts/{account_id}/access/keys/rotate",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[KeyRotateResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[KeyRotateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._post(
+            f"/accounts/{account_id}/access/keys/rotate",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[KeyRotateResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[KeyRotateResponse]], ResultWrapper[KeyRotateResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/zero_trust/access/logs/__init__.py b/src/cloudflare/resources/zero_trust/access/logs/__init__.py
index 7479c1fbef8..3897e836cf7 100644
--- a/src/cloudflare/resources/zero_trust/access/logs/__init__.py
+++ b/src/cloudflare/resources/zero_trust/access/logs/__init__.py
@@ -8,6 +8,14 @@
     LogsResourceWithStreamingResponse,
     AsyncLogsResourceWithStreamingResponse,
 )
+from .scim import (
+    SCIMResource,
+    AsyncSCIMResource,
+    SCIMResourceWithRawResponse,
+    AsyncSCIMResourceWithRawResponse,
+    SCIMResourceWithStreamingResponse,
+    AsyncSCIMResourceWithStreamingResponse,
+)
 from .access_requests import (
     AccessRequestsResource,
     AsyncAccessRequestsResource,
@@ -24,6 +32,12 @@
     "AsyncAccessRequestsResourceWithRawResponse",
     "AccessRequestsResourceWithStreamingResponse",
     "AsyncAccessRequestsResourceWithStreamingResponse",
+    "SCIMResource",
+    "AsyncSCIMResource",
+    "SCIMResourceWithRawResponse",
+    "AsyncSCIMResourceWithRawResponse",
+    "SCIMResourceWithStreamingResponse",
+    "AsyncSCIMResourceWithStreamingResponse",
     "LogsResource",
     "AsyncLogsResource",
     "LogsResourceWithRawResponse",
diff --git a/src/cloudflare/resources/zero_trust/access/logs/access_requests.py b/src/cloudflare/resources/zero_trust/access/logs/access_requests.py
index 8e31f904de6..ef42ea8f447 100644
--- a/src/cloudflare/resources/zero_trust/access/logs/access_requests.py
+++ b/src/cloudflare/resources/zero_trust/access/logs/access_requests.py
@@ -8,11 +8,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -32,41 +29,70 @@
 class AccessRequestsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AccessRequestsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AccessRequestsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AccessRequestsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AccessRequestsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
-        direction: Literal["desc", "asc"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        until: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        direction: Literal["desc", "asc"] | Omit = omit,
+        email: str | Omit = omit,
+        email_exact: bool | Omit = omit,
+        limit: int | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        since: Union[str, datetime] | Omit = omit,
+        until: Union[str, datetime] | Omit = omit,
+        user_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AccessRequestListResponse]:
         """
         Gets a list of Access authentication audit logs for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           direction: The chronological sorting order for the logs.
 
+          email: Filter by user email. Defaults to substring matching. To force exact matching,
+              set `email_exact=true`. Example (default): `email=@example.com` returns all
+              events with that domain. Example (exact):
+              `email=user@example.com&email_exact=true` returns only that user.
+
+          email_exact: When true, `email` is matched exactly instead of substring matching.
+
           limit: The maximum number of log entries to retrieve.
 
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
           since: The earliest event timestamp to query.
 
           until: The latest event timestamp to query.
 
+          user_id: Filter by user UUID.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -87,9 +113,14 @@ def list(
                 query=maybe_transform(
                     {
                         "direction": direction,
+                        "email": email,
+                        "email_exact": email_exact,
                         "limit": limit,
+                        "page": page,
+                        "per_page": per_page,
                         "since": since,
                         "until": until,
+                        "user_id": user_id,
                     },
                     access_request_list_params.AccessRequestListParams,
                 ),
@@ -102,41 +133,70 @@ def list(
 class AsyncAccessRequestsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncAccessRequestsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAccessRequestsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAccessRequestsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAccessRequestsResourceWithStreamingResponse(self)
 
     async def list(
         self,
         *,
         account_id: str,
-        direction: Literal["desc", "asc"] | NotGiven = NOT_GIVEN,
-        limit: int | NotGiven = NOT_GIVEN,
-        since: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        until: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        direction: Literal["desc", "asc"] | Omit = omit,
+        email: str | Omit = omit,
+        email_exact: bool | Omit = omit,
+        limit: int | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        since: Union[str, datetime] | Omit = omit,
+        until: Union[str, datetime] | Omit = omit,
+        user_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[AccessRequestListResponse]:
         """
         Gets a list of Access authentication audit logs for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           direction: The chronological sorting order for the logs.
 
+          email: Filter by user email. Defaults to substring matching. To force exact matching,
+              set `email_exact=true`. Example (default): `email=@example.com` returns all
+              events with that domain. Example (exact):
+              `email=user@example.com&email_exact=true` returns only that user.
+
+          email_exact: When true, `email` is matched exactly instead of substring matching.
+
           limit: The maximum number of log entries to retrieve.
 
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
           since: The earliest event timestamp to query.
 
           until: The latest event timestamp to query.
 
+          user_id: Filter by user UUID.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -157,9 +217,14 @@ async def list(
                 query=await async_maybe_transform(
                     {
                         "direction": direction,
+                        "email": email,
+                        "email_exact": email_exact,
                         "limit": limit,
+                        "page": page,
+                        "per_page": per_page,
                         "since": since,
                         "until": until,
+                        "user_id": user_id,
                     },
                     access_request_list_params.AccessRequestListParams,
                 ),
diff --git a/src/cloudflare/resources/zero_trust/access/logs/logs.py b/src/cloudflare/resources/zero_trust/access/logs/logs.py
index 39226d42917..5b42a260539 100644
--- a/src/cloudflare/resources/zero_trust/access/logs/logs.py
+++ b/src/cloudflare/resources/zero_trust/access/logs/logs.py
@@ -2,6 +2,14 @@
 
 from __future__ import annotations
 
+from .scim.scim import (
+    SCIMResource,
+    AsyncSCIMResource,
+    SCIMResourceWithRawResponse,
+    AsyncSCIMResourceWithRawResponse,
+    SCIMResourceWithStreamingResponse,
+    AsyncSCIMResourceWithStreamingResponse,
+)
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from .access_requests import (
@@ -21,12 +29,27 @@ class LogsResource(SyncAPIResource):
     def access_requests(self) -> AccessRequestsResource:
         return AccessRequestsResource(self._client)
 
+    @cached_property
+    def scim(self) -> SCIMResource:
+        return SCIMResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> LogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LogsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LogsResourceWithStreamingResponse(self)
 
 
@@ -35,12 +58,27 @@ class AsyncLogsResource(AsyncAPIResource):
     def access_requests(self) -> AsyncAccessRequestsResource:
         return AsyncAccessRequestsResource(self._client)
 
+    @cached_property
+    def scim(self) -> AsyncSCIMResource:
+        return AsyncSCIMResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncLogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLogsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLogsResourceWithStreamingResponse(self)
 
 
@@ -52,6 +90,10 @@ def __init__(self, logs: LogsResource) -> None:
     def access_requests(self) -> AccessRequestsResourceWithRawResponse:
         return AccessRequestsResourceWithRawResponse(self._logs.access_requests)
 
+    @cached_property
+    def scim(self) -> SCIMResourceWithRawResponse:
+        return SCIMResourceWithRawResponse(self._logs.scim)
+
 
 class AsyncLogsResourceWithRawResponse:
     def __init__(self, logs: AsyncLogsResource) -> None:
@@ -61,6 +103,10 @@ def __init__(self, logs: AsyncLogsResource) -> None:
     def access_requests(self) -> AsyncAccessRequestsResourceWithRawResponse:
         return AsyncAccessRequestsResourceWithRawResponse(self._logs.access_requests)
 
+    @cached_property
+    def scim(self) -> AsyncSCIMResourceWithRawResponse:
+        return AsyncSCIMResourceWithRawResponse(self._logs.scim)
+
 
 class LogsResourceWithStreamingResponse:
     def __init__(self, logs: LogsResource) -> None:
@@ -70,6 +116,10 @@ def __init__(self, logs: LogsResource) -> None:
     def access_requests(self) -> AccessRequestsResourceWithStreamingResponse:
         return AccessRequestsResourceWithStreamingResponse(self._logs.access_requests)
 
+    @cached_property
+    def scim(self) -> SCIMResourceWithStreamingResponse:
+        return SCIMResourceWithStreamingResponse(self._logs.scim)
+
 
 class AsyncLogsResourceWithStreamingResponse:
     def __init__(self, logs: AsyncLogsResource) -> None:
@@ -78,3 +128,7 @@ def __init__(self, logs: AsyncLogsResource) -> None:
     @cached_property
     def access_requests(self) -> AsyncAccessRequestsResourceWithStreamingResponse:
         return AsyncAccessRequestsResourceWithStreamingResponse(self._logs.access_requests)
+
+    @cached_property
+    def scim(self) -> AsyncSCIMResourceWithStreamingResponse:
+        return AsyncSCIMResourceWithStreamingResponse(self._logs.scim)
diff --git a/src/cloudflare/resources/zero_trust/access/logs/scim/__init__.py b/src/cloudflare/resources/zero_trust/access/logs/scim/__init__.py
new file mode 100644
index 00000000000..3c3bf38c7a3
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/access/logs/scim/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .scim import (
+    SCIMResource,
+    AsyncSCIMResource,
+    SCIMResourceWithRawResponse,
+    AsyncSCIMResourceWithRawResponse,
+    SCIMResourceWithStreamingResponse,
+    AsyncSCIMResourceWithStreamingResponse,
+)
+from .updates import (
+    UpdatesResource,
+    AsyncUpdatesResource,
+    UpdatesResourceWithRawResponse,
+    AsyncUpdatesResourceWithRawResponse,
+    UpdatesResourceWithStreamingResponse,
+    AsyncUpdatesResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "UpdatesResource",
+    "AsyncUpdatesResource",
+    "UpdatesResourceWithRawResponse",
+    "AsyncUpdatesResourceWithRawResponse",
+    "UpdatesResourceWithStreamingResponse",
+    "AsyncUpdatesResourceWithStreamingResponse",
+    "SCIMResource",
+    "AsyncSCIMResource",
+    "SCIMResourceWithRawResponse",
+    "AsyncSCIMResourceWithRawResponse",
+    "SCIMResourceWithStreamingResponse",
+    "AsyncSCIMResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/access/logs/scim/scim.py b/src/cloudflare/resources/zero_trust/access/logs/scim/scim.py
new file mode 100644
index 00000000000..b181c120202
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/access/logs/scim/scim.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .updates import (
+    UpdatesResource,
+    AsyncUpdatesResource,
+    UpdatesResourceWithRawResponse,
+    AsyncUpdatesResourceWithRawResponse,
+    UpdatesResourceWithStreamingResponse,
+    AsyncUpdatesResourceWithStreamingResponse,
+)
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["SCIMResource", "AsyncSCIMResource"]
+
+
+class SCIMResource(SyncAPIResource):
+    @cached_property
+    def updates(self) -> UpdatesResource:
+        return UpdatesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> SCIMResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SCIMResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SCIMResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SCIMResourceWithStreamingResponse(self)
+
+
+class AsyncSCIMResource(AsyncAPIResource):
+    @cached_property
+    def updates(self) -> AsyncUpdatesResource:
+        return AsyncUpdatesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncSCIMResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSCIMResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSCIMResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSCIMResourceWithStreamingResponse(self)
+
+
+class SCIMResourceWithRawResponse:
+    def __init__(self, scim: SCIMResource) -> None:
+        self._scim = scim
+
+    @cached_property
+    def updates(self) -> UpdatesResourceWithRawResponse:
+        return UpdatesResourceWithRawResponse(self._scim.updates)
+
+
+class AsyncSCIMResourceWithRawResponse:
+    def __init__(self, scim: AsyncSCIMResource) -> None:
+        self._scim = scim
+
+    @cached_property
+    def updates(self) -> AsyncUpdatesResourceWithRawResponse:
+        return AsyncUpdatesResourceWithRawResponse(self._scim.updates)
+
+
+class SCIMResourceWithStreamingResponse:
+    def __init__(self, scim: SCIMResource) -> None:
+        self._scim = scim
+
+    @cached_property
+    def updates(self) -> UpdatesResourceWithStreamingResponse:
+        return UpdatesResourceWithStreamingResponse(self._scim.updates)
+
+
+class AsyncSCIMResourceWithStreamingResponse:
+    def __init__(self, scim: AsyncSCIMResource) -> None:
+        self._scim = scim
+
+    @cached_property
+    def updates(self) -> AsyncUpdatesResourceWithStreamingResponse:
+        return AsyncUpdatesResourceWithStreamingResponse(self._scim.updates)
diff --git a/src/cloudflare/resources/zero_trust/access/logs/scim/updates.py b/src/cloudflare/resources/zero_trust/access/logs/scim/updates.py
new file mode 100644
index 00000000000..73ae5fcc87f
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/access/logs/scim/updates.py
@@ -0,0 +1,308 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from ......_types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ......_utils import maybe_transform
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+from ......_response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ......pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ......_base_client import AsyncPaginator, make_request_options
+from ......types.zero_trust.access.logs.scim import update_list_params
+from ......types.zero_trust.access.logs.scim.update_list_response import UpdateListResponse
+
+__all__ = ["UpdatesResource", "AsyncUpdatesResource"]
+
+
+class UpdatesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> UpdatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return UpdatesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> UpdatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return UpdatesResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        idp_id: SequenceNotStr[str],
+        cf_resource_id: str | Omit = omit,
+        direction: Literal["desc", "asc"] | Omit = omit,
+        idp_resource_id: str | Omit = omit,
+        limit: int | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        request_method: List[Literal["DELETE", "PATCH", "POST", "PUT"]] | Omit = omit,
+        resource_group_name: str | Omit = omit,
+        resource_type: List[Literal["USER", "GROUP"]] | Omit = omit,
+        resource_user_email: str | Omit = omit,
+        since: Union[str, datetime] | Omit = omit,
+        status: List[Literal["FAILURE", "SUCCESS"]] | Omit = omit,
+        until: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[UpdateListResponse]:
+        """
+        Lists Access SCIM update logs that maintain a record of updates made to User and
+        Group resources synced to Cloudflare via the System for Cross-domain Identity
+        Management (SCIM).
+
+        Args:
+          account_id: Identifier.
+
+          idp_id: The unique Id of the IdP that has SCIM enabled.
+
+          cf_resource_id: The unique Cloudflare-generated Id of the SCIM resource.
+
+          direction: The chronological order used to sort the logs.
+
+          idp_resource_id: The IdP-generated Id of the SCIM resource.
+
+          limit: The maximum number of update logs to retrieve.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
+          request_method: The request method of the SCIM request.
+
+          resource_group_name: The display name of the SCIM Group resource.
+
+          resource_type: The resource type of the SCIM request.
+
+          resource_user_email: The email address of the SCIM User resource.
+
+          since: the timestamp of the earliest update log.
+
+          status: The status of the SCIM request.
+
+          until: the timestamp of the most-recent update log.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/access/logs/scim/updates",
+            page=SyncV4PagePaginationArray[UpdateListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "idp_id": idp_id,
+                        "cf_resource_id": cf_resource_id,
+                        "direction": direction,
+                        "idp_resource_id": idp_resource_id,
+                        "limit": limit,
+                        "page": page,
+                        "per_page": per_page,
+                        "request_method": request_method,
+                        "resource_group_name": resource_group_name,
+                        "resource_type": resource_type,
+                        "resource_user_email": resource_user_email,
+                        "since": since,
+                        "status": status,
+                        "until": until,
+                    },
+                    update_list_params.UpdateListParams,
+                ),
+            ),
+            model=UpdateListResponse,
+        )
+
+
+class AsyncUpdatesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncUpdatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncUpdatesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncUpdatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncUpdatesResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        idp_id: SequenceNotStr[str],
+        cf_resource_id: str | Omit = omit,
+        direction: Literal["desc", "asc"] | Omit = omit,
+        idp_resource_id: str | Omit = omit,
+        limit: int | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        request_method: List[Literal["DELETE", "PATCH", "POST", "PUT"]] | Omit = omit,
+        resource_group_name: str | Omit = omit,
+        resource_type: List[Literal["USER", "GROUP"]] | Omit = omit,
+        resource_user_email: str | Omit = omit,
+        since: Union[str, datetime] | Omit = omit,
+        status: List[Literal["FAILURE", "SUCCESS"]] | Omit = omit,
+        until: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[UpdateListResponse, AsyncV4PagePaginationArray[UpdateListResponse]]:
+        """
+        Lists Access SCIM update logs that maintain a record of updates made to User and
+        Group resources synced to Cloudflare via the System for Cross-domain Identity
+        Management (SCIM).
+
+        Args:
+          account_id: Identifier.
+
+          idp_id: The unique Id of the IdP that has SCIM enabled.
+
+          cf_resource_id: The unique Cloudflare-generated Id of the SCIM resource.
+
+          direction: The chronological order used to sort the logs.
+
+          idp_resource_id: The IdP-generated Id of the SCIM resource.
+
+          limit: The maximum number of update logs to retrieve.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
+          request_method: The request method of the SCIM request.
+
+          resource_group_name: The display name of the SCIM Group resource.
+
+          resource_type: The resource type of the SCIM request.
+
+          resource_user_email: The email address of the SCIM User resource.
+
+          since: the timestamp of the earliest update log.
+
+          status: The status of the SCIM request.
+
+          until: the timestamp of the most-recent update log.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/access/logs/scim/updates",
+            page=AsyncV4PagePaginationArray[UpdateListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "idp_id": idp_id,
+                        "cf_resource_id": cf_resource_id,
+                        "direction": direction,
+                        "idp_resource_id": idp_resource_id,
+                        "limit": limit,
+                        "page": page,
+                        "per_page": per_page,
+                        "request_method": request_method,
+                        "resource_group_name": resource_group_name,
+                        "resource_type": resource_type,
+                        "resource_user_email": resource_user_email,
+                        "since": since,
+                        "status": status,
+                        "until": until,
+                    },
+                    update_list_params.UpdateListParams,
+                ),
+            ),
+            model=UpdateListResponse,
+        )
+
+
+class UpdatesResourceWithRawResponse:
+    def __init__(self, updates: UpdatesResource) -> None:
+        self._updates = updates
+
+        self.list = to_raw_response_wrapper(
+            updates.list,
+        )
+
+
+class AsyncUpdatesResourceWithRawResponse:
+    def __init__(self, updates: AsyncUpdatesResource) -> None:
+        self._updates = updates
+
+        self.list = async_to_raw_response_wrapper(
+            updates.list,
+        )
+
+
+class UpdatesResourceWithStreamingResponse:
+    def __init__(self, updates: UpdatesResource) -> None:
+        self._updates = updates
+
+        self.list = to_streamed_response_wrapper(
+            updates.list,
+        )
+
+
+class AsyncUpdatesResourceWithStreamingResponse:
+    def __init__(self, updates: AsyncUpdatesResource) -> None:
+        self._updates = updates
+
+        self.list = async_to_streamed_response_wrapper(
+            updates.list,
+        )
diff --git a/src/cloudflare/resources/zero_trust/access/policies.py b/src/cloudflare/resources/zero_trust/access/policies.py
index a18331e7aaf..8e80d9f3b1d 100644
--- a/src/cloudflare/resources/zero_trust/access/policies.py
+++ b/src/cloudflare/resources/zero_trust/access/policies.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -20,17 +17,17 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ....pagination import SyncSinglePage, AsyncSinglePage
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ...._base_client import AsyncPaginator, make_request_options
-from ....types.zero_trust.access import Decision, policy_create_params, policy_update_params
+from ....types.zero_trust.access import Decision, policy_list_params, policy_create_params, policy_update_params
 from ....types.zero_trust.access.decision import Decision
-from ....types.zero_trust.access_rule_param import AccessRuleParam
 from ....types.zero_trust.access.policy_get_response import PolicyGetResponse
+from ....types.zero_trust.access.approval_group_param import ApprovalGroupParam
 from ....types.zero_trust.access.policy_list_response import PolicyListResponse
 from ....types.zero_trust.access.policy_create_response import PolicyCreateResponse
 from ....types.zero_trust.access.policy_delete_response import PolicyDeleteResponse
 from ....types.zero_trust.access.policy_update_response import PolicyUpdateResponse
-from ....types.zero_trust.access.applications.approval_group_param import ApprovalGroupParam
+from ....types.zero_trust.access.applications.access_rule_param import AccessRuleParam
 
 __all__ = ["PoliciesResource", "AsyncPoliciesResource"]
 
@@ -38,10 +35,21 @@
 class PoliciesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PoliciesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PoliciesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PoliciesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PoliciesResourceWithStreamingResponse(self)
 
     def create(
@@ -51,28 +59,29 @@ def create(
         decision: Decision,
         include: Iterable[AccessRuleParam],
         name: str,
-        approval_groups: Iterable[ApprovalGroupParam] | NotGiven = NOT_GIVEN,
-        approval_required: bool | NotGiven = NOT_GIVEN,
-        exclude: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        isolation_required: bool | NotGiven = NOT_GIVEN,
-        purpose_justification_prompt: str | NotGiven = NOT_GIVEN,
-        purpose_justification_required: bool | NotGiven = NOT_GIVEN,
-        require: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        approval_groups: Iterable[ApprovalGroupParam] | Omit = omit,
+        approval_required: bool | Omit = omit,
+        exclude: Iterable[AccessRuleParam] | Omit = omit,
+        isolation_required: bool | Omit = omit,
+        purpose_justification_prompt: str | Omit = omit,
+        purpose_justification_required: bool | Omit = omit,
+        require: Iterable[AccessRuleParam] | Omit = omit,
+        session_duration: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyCreateResponse]:
         """
         Creates a new Access reusable policy.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          decision: The action Access will take if a user matches this policy.
+          decision: The action Access will take if a user matches this policy. Infrastructure
+              application policies can only use the Allow action.
 
           include: Rules evaluated with an OR logical operator. A user needs to meet only one of
               the Include rules.
@@ -148,30 +157,31 @@ def update(
         decision: Decision,
         include: Iterable[AccessRuleParam],
         name: str,
-        approval_groups: Iterable[ApprovalGroupParam] | NotGiven = NOT_GIVEN,
-        approval_required: bool | NotGiven = NOT_GIVEN,
-        exclude: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        isolation_required: bool | NotGiven = NOT_GIVEN,
-        purpose_justification_prompt: str | NotGiven = NOT_GIVEN,
-        purpose_justification_required: bool | NotGiven = NOT_GIVEN,
-        require: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        approval_groups: Iterable[ApprovalGroupParam] | Omit = omit,
+        approval_required: bool | Omit = omit,
+        exclude: Iterable[AccessRuleParam] | Omit = omit,
+        isolation_required: bool | Omit = omit,
+        purpose_justification_prompt: str | Omit = omit,
+        purpose_justification_required: bool | Omit = omit,
+        require: Iterable[AccessRuleParam] | Omit = omit,
+        session_duration: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyUpdateResponse]:
         """
         Updates a Access reusable policy.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           policy_id: The UUID of the policy
 
-          decision: The action Access will take if a user matches this policy.
+          decision: The action Access will take if a user matches this policy. Infrastructure
+              application policies can only use the Allow action.
 
           include: Rules evaluated with an OR logical operator. A user needs to meet only one of
               the Include rules.
@@ -245,18 +255,24 @@ def list(
         self,
         *,
         account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[PolicyListResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[PolicyListResponse]:
         """
         Lists Access reusable policies.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
 
           extra_headers: Send extra headers
 
@@ -270,9 +286,19 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/access/policies",
-            page=SyncSinglePage[PolicyListResponse],
+            page=SyncV4PagePaginationArray[PolicyListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    policy_list_params.PolicyListParams,
+                ),
             ),
             model=PolicyListResponse,
         )
@@ -287,13 +313,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyDeleteResponse]:
         """
         Deletes an Access reusable policy.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           policy_id: The UUID of the policy
 
@@ -331,13 +357,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyGetResponse]:
         """
         Fetches a single Access reusable policy.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           policy_id: The UUID of the policy
 
@@ -369,10 +395,21 @@ def get(
 class AsyncPoliciesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPoliciesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPoliciesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPoliciesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPoliciesResourceWithStreamingResponse(self)
 
     async def create(
@@ -382,28 +419,29 @@ async def create(
         decision: Decision,
         include: Iterable[AccessRuleParam],
         name: str,
-        approval_groups: Iterable[ApprovalGroupParam] | NotGiven = NOT_GIVEN,
-        approval_required: bool | NotGiven = NOT_GIVEN,
-        exclude: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        isolation_required: bool | NotGiven = NOT_GIVEN,
-        purpose_justification_prompt: str | NotGiven = NOT_GIVEN,
-        purpose_justification_required: bool | NotGiven = NOT_GIVEN,
-        require: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        approval_groups: Iterable[ApprovalGroupParam] | Omit = omit,
+        approval_required: bool | Omit = omit,
+        exclude: Iterable[AccessRuleParam] | Omit = omit,
+        isolation_required: bool | Omit = omit,
+        purpose_justification_prompt: str | Omit = omit,
+        purpose_justification_required: bool | Omit = omit,
+        require: Iterable[AccessRuleParam] | Omit = omit,
+        session_duration: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyCreateResponse]:
         """
         Creates a new Access reusable policy.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          decision: The action Access will take if a user matches this policy.
+          decision: The action Access will take if a user matches this policy. Infrastructure
+              application policies can only use the Allow action.
 
           include: Rules evaluated with an OR logical operator. A user needs to meet only one of
               the Include rules.
@@ -479,30 +517,31 @@ async def update(
         decision: Decision,
         include: Iterable[AccessRuleParam],
         name: str,
-        approval_groups: Iterable[ApprovalGroupParam] | NotGiven = NOT_GIVEN,
-        approval_required: bool | NotGiven = NOT_GIVEN,
-        exclude: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        isolation_required: bool | NotGiven = NOT_GIVEN,
-        purpose_justification_prompt: str | NotGiven = NOT_GIVEN,
-        purpose_justification_required: bool | NotGiven = NOT_GIVEN,
-        require: Iterable[AccessRuleParam] | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
+        approval_groups: Iterable[ApprovalGroupParam] | Omit = omit,
+        approval_required: bool | Omit = omit,
+        exclude: Iterable[AccessRuleParam] | Omit = omit,
+        isolation_required: bool | Omit = omit,
+        purpose_justification_prompt: str | Omit = omit,
+        purpose_justification_required: bool | Omit = omit,
+        require: Iterable[AccessRuleParam] | Omit = omit,
+        session_duration: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyUpdateResponse]:
         """
         Updates a Access reusable policy.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           policy_id: The UUID of the policy
 
-          decision: The action Access will take if a user matches this policy.
+          decision: The action Access will take if a user matches this policy. Infrastructure
+              application policies can only use the Allow action.
 
           include: Rules evaluated with an OR logical operator. A user needs to meet only one of
               the Include rules.
@@ -576,18 +615,24 @@ def list(
         self,
         *,
         account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[PolicyListResponse, AsyncSinglePage[PolicyListResponse]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[PolicyListResponse, AsyncV4PagePaginationArray[PolicyListResponse]]:
         """
         Lists Access reusable policies.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
 
           extra_headers: Send extra headers
 
@@ -601,9 +646,19 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/access/policies",
-            page=AsyncSinglePage[PolicyListResponse],
+            page=AsyncV4PagePaginationArray[PolicyListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    policy_list_params.PolicyListParams,
+                ),
             ),
             model=PolicyListResponse,
         )
@@ -618,13 +673,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyDeleteResponse]:
         """
         Deletes an Access reusable policy.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           policy_id: The UUID of the policy
 
@@ -662,13 +717,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PolicyGetResponse]:
         """
         Fetches a single Access reusable policy.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           policy_id: The UUID of the policy
 
diff --git a/src/cloudflare/resources/zero_trust/access/service_tokens.py b/src/cloudflare/resources/zero_trust/access/service_tokens.py
index 85d275e4b17..c08436ab5ab 100644
--- a/src/cloudflare/resources/zero_trust/access/service_tokens.py
+++ b/src/cloudflare/resources/zero_trust/access/service_tokens.py
@@ -2,15 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Type, Union, Optional, cast
+from datetime import datetime
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -20,9 +18,14 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ....pagination import SyncSinglePage, AsyncSinglePage
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ...._base_client import AsyncPaginator, make_request_options
-from ....types.zero_trust.access import service_token_create_params, service_token_update_params
+from ....types.zero_trust.access import (
+    service_token_list_params,
+    service_token_create_params,
+    service_token_rotate_params,
+    service_token_update_params,
+)
 from ....types.zero_trust.access.service_token import ServiceToken
 from ....types.zero_trust.access.service_token_create_response import ServiceTokenCreateResponse
 from ....types.zero_trust.access.service_token_rotate_response import ServiceTokenRotateResponse
@@ -33,25 +36,38 @@
 class ServiceTokensResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ServiceTokensResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ServiceTokensResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ServiceTokensResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ServiceTokensResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         name: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        duration: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        client_secret_version: float | Omit = omit,
+        duration: str | Omit = omit,
+        previous_client_secret_expires_at: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ServiceTokenCreateResponse]:
         """Generates a new service token.
 
@@ -66,10 +82,20 @@ def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          client_secret_version: A version number identifying the current `client_secret` associated with the
+              service token. Incrementing it triggers a rotation; the previous secret will
+              still be accepted until the time indicated by
+              `previous_client_secret_expires_at`.
+
           duration: The duration for how long the service token will be valid. Must be in the format
               `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h. The
               default is 1 year in hours (8760h).
 
+          previous_client_secret_expires_at: The expiration of the previous `client_secret`. This can be modified at any
+              point after a rotation. For example, you may extend it further into the future
+              if you need more time to update services with the new secret; or move it into
+              the past to immediately invalidate the previous token in case of compromise.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -95,7 +121,9 @@ def create(
             body=maybe_transform(
                 {
                     "name": name,
+                    "client_secret_version": client_secret_version,
                     "duration": duration,
+                    "previous_client_secret_expires_at": previous_client_secret_expires_at,
                 },
                 service_token_create_params.ServiceTokenCreateParams,
             ),
@@ -113,33 +141,45 @@ def update(
         self,
         service_token_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        duration: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        client_secret_version: float | Omit = omit,
+        duration: str | Omit = omit,
+        name: str | Omit = omit,
+        previous_client_secret_expires_at: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ServiceToken]:
         """
         Updates a configured service token.
 
         Args:
-          service_token_id: UUID
+          service_token_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          client_secret_version: A version number identifying the current `client_secret` associated with the
+              service token. Incrementing it triggers a rotation; the previous secret will
+              still be accepted until the time indicated by
+              `previous_client_secret_expires_at`.
+
           duration: The duration for how long the service token will be valid. Must be in the format
               `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h. The
               default is 1 year in hours (8760h).
 
           name: The name of the service token.
 
+          previous_client_secret_expires_at: The expiration of the previous `client_secret`. This can be modified at any
+              point after a rotation. For example, you may extend it further into the future
+              if you need more time to update services with the new secret; or move it into
+              the past to immediately invalidate the previous token in case of compromise.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -166,8 +206,10 @@ def update(
             f"/{account_or_zone}/{account_or_zone_id}/access/service_tokens/{service_token_id}",
             body=maybe_transform(
                 {
+                    "client_secret_version": client_secret_version,
                     "duration": duration,
                     "name": name,
+                    "previous_client_secret_expires_at": previous_client_secret_expires_at,
                 },
                 service_token_update_params.ServiceTokenUpdateParams,
             ),
@@ -184,15 +226,19 @@ def update(
     def list(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        name: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[ServiceToken]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[ServiceToken]:
         """
         Lists all service tokens.
 
@@ -201,6 +247,14 @@ def list(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          name: The name of the service token.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
+          search: Search for service tokens by other listed query parameters.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -223,9 +277,21 @@ def list(
             account_or_zone_id = zone_id
         return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/access/service_tokens",
-            page=SyncSinglePage[ServiceToken],
+            page=SyncV4PagePaginationArray[ServiceToken],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    service_token_list_params.ServiceTokenListParams,
+                ),
             ),
             model=ServiceToken,
         )
@@ -234,20 +300,20 @@ def delete(
         self,
         service_token_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ServiceToken]:
         """
         Deletes a service token.
 
         Args:
-          service_token_id: UUID
+          service_token_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -291,20 +357,20 @@ def get(
         self,
         service_token_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ServiceToken]:
         """
         Fetches a single service token.
 
         Args:
-          service_token_id: UUID
+          service_token_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -354,15 +420,15 @@ def refresh(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ServiceToken]:
         """
         Refreshes the expiration of a service token.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          service_token_id: UUID
+          service_token_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -393,20 +459,24 @@ def rotate(
         service_token_id: str,
         *,
         account_id: str,
+        previous_client_secret_expires_at: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ServiceTokenRotateResponse]:
         """
         Generates a new Client Secret for a service token and revokes the old one.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          service_token_id: UUID
+          service_token_id: UUID.
+
+          previous_client_secret_expires_at: The expiration of the previous `client_secret`. If not provided, it defaults to
+              the current timestamp in order to immediately expire the previous secret.
 
           extra_headers: Send extra headers
 
@@ -422,6 +492,10 @@ def rotate(
             raise ValueError(f"Expected a non-empty value for `service_token_id` but received {service_token_id!r}")
         return self._post(
             f"/accounts/{account_id}/access/service_tokens/{service_token_id}/rotate",
+            body=maybe_transform(
+                {"previous_client_secret_expires_at": previous_client_secret_expires_at},
+                service_token_rotate_params.ServiceTokenRotateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -436,25 +510,38 @@ def rotate(
 class AsyncServiceTokensResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncServiceTokensResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncServiceTokensResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncServiceTokensResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncServiceTokensResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         name: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        duration: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        client_secret_version: float | Omit = omit,
+        duration: str | Omit = omit,
+        previous_client_secret_expires_at: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ServiceTokenCreateResponse]:
         """Generates a new service token.
 
@@ -469,10 +556,20 @@ async def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          client_secret_version: A version number identifying the current `client_secret` associated with the
+              service token. Incrementing it triggers a rotation; the previous secret will
+              still be accepted until the time indicated by
+              `previous_client_secret_expires_at`.
+
           duration: The duration for how long the service token will be valid. Must be in the format
               `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h. The
               default is 1 year in hours (8760h).
 
+          previous_client_secret_expires_at: The expiration of the previous `client_secret`. This can be modified at any
+              point after a rotation. For example, you may extend it further into the future
+              if you need more time to update services with the new secret; or move it into
+              the past to immediately invalidate the previous token in case of compromise.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -498,7 +595,9 @@ async def create(
             body=await async_maybe_transform(
                 {
                     "name": name,
+                    "client_secret_version": client_secret_version,
                     "duration": duration,
+                    "previous_client_secret_expires_at": previous_client_secret_expires_at,
                 },
                 service_token_create_params.ServiceTokenCreateParams,
             ),
@@ -516,33 +615,45 @@ async def update(
         self,
         service_token_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        duration: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        client_secret_version: float | Omit = omit,
+        duration: str | Omit = omit,
+        name: str | Omit = omit,
+        previous_client_secret_expires_at: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ServiceToken]:
         """
         Updates a configured service token.
 
         Args:
-          service_token_id: UUID
+          service_token_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          client_secret_version: A version number identifying the current `client_secret` associated with the
+              service token. Incrementing it triggers a rotation; the previous secret will
+              still be accepted until the time indicated by
+              `previous_client_secret_expires_at`.
+
           duration: The duration for how long the service token will be valid. Must be in the format
               `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h. The
               default is 1 year in hours (8760h).
 
           name: The name of the service token.
 
+          previous_client_secret_expires_at: The expiration of the previous `client_secret`. This can be modified at any
+              point after a rotation. For example, you may extend it further into the future
+              if you need more time to update services with the new secret; or move it into
+              the past to immediately invalidate the previous token in case of compromise.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -569,8 +680,10 @@ async def update(
             f"/{account_or_zone}/{account_or_zone_id}/access/service_tokens/{service_token_id}",
             body=await async_maybe_transform(
                 {
+                    "client_secret_version": client_secret_version,
                     "duration": duration,
                     "name": name,
+                    "previous_client_secret_expires_at": previous_client_secret_expires_at,
                 },
                 service_token_update_params.ServiceTokenUpdateParams,
             ),
@@ -587,15 +700,19 @@ async def update(
     def list(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        name: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[ServiceToken, AsyncSinglePage[ServiceToken]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ServiceToken, AsyncV4PagePaginationArray[ServiceToken]]:
         """
         Lists all service tokens.
 
@@ -604,6 +721,14 @@ def list(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          name: The name of the service token.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
+          search: Search for service tokens by other listed query parameters.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -626,9 +751,21 @@ def list(
             account_or_zone_id = zone_id
         return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/access/service_tokens",
-            page=AsyncSinglePage[ServiceToken],
+            page=AsyncV4PagePaginationArray[ServiceToken],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    service_token_list_params.ServiceTokenListParams,
+                ),
             ),
             model=ServiceToken,
         )
@@ -637,20 +774,20 @@ async def delete(
         self,
         service_token_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ServiceToken]:
         """
         Deletes a service token.
 
         Args:
-          service_token_id: UUID
+          service_token_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -694,20 +831,20 @@ async def get(
         self,
         service_token_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ServiceToken]:
         """
         Fetches a single service token.
 
         Args:
-          service_token_id: UUID
+          service_token_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -757,15 +894,15 @@ async def refresh(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ServiceToken]:
         """
         Refreshes the expiration of a service token.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          service_token_id: UUID
+          service_token_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -796,20 +933,24 @@ async def rotate(
         service_token_id: str,
         *,
         account_id: str,
+        previous_client_secret_expires_at: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ServiceTokenRotateResponse]:
         """
         Generates a new Client Secret for a service token and revokes the old one.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          service_token_id: UUID.
 
-          service_token_id: UUID
+          previous_client_secret_expires_at: The expiration of the previous `client_secret`. If not provided, it defaults to
+              the current timestamp in order to immediately expire the previous secret.
 
           extra_headers: Send extra headers
 
@@ -825,6 +966,10 @@ async def rotate(
             raise ValueError(f"Expected a non-empty value for `service_token_id` but received {service_token_id!r}")
         return await self._post(
             f"/accounts/{account_id}/access/service_tokens/{service_token_id}/rotate",
+            body=await async_maybe_transform(
+                {"previous_client_secret_expires_at": previous_client_secret_expires_at},
+                service_token_rotate_params.ServiceTokenRotateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
diff --git a/src/cloudflare/resources/zero_trust/access/tags.py b/src/cloudflare/resources/zero_trust/access/tags.py
index 62e48d2029f..869d3e13bff 100644
--- a/src/cloudflare/resources/zero_trust/access/tags.py
+++ b/src/cloudflare/resources/zero_trust/access/tags.py
@@ -2,16 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Union, Optional, cast
-from datetime import datetime
+from typing import Type, Optional, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -21,9 +17,9 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ....pagination import SyncSinglePage, AsyncSinglePage
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ...._base_client import AsyncPaginator, make_request_options
-from ....types.zero_trust.access import tag_create_params, tag_update_params
+from ....types.zero_trust.access import tag_list_params, tag_create_params, tag_update_params
 from ....types.zero_trust.access.tag import Tag
 from ....types.zero_trust.access.tag_delete_response import TagDeleteResponse
 
@@ -33,31 +29,40 @@
 class TagsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TagsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TagsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TagsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TagsResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        name: str,
-        created_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        updated_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Tag]:
         """
         Create a tag
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           name: The name of the tag
 
@@ -73,14 +78,7 @@ def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._post(
             f"/accounts/{account_id}/access/tags",
-            body=maybe_transform(
-                {
-                    "name": name,
-                    "created_at": created_at,
-                    "updated_at": updated_at,
-                },
-                tag_create_params.TagCreateParams,
-            ),
+            body=maybe_transform({"name": name}, tag_create_params.TagCreateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -97,20 +95,18 @@ def update(
         *,
         account_id: str,
         name: str,
-        created_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        updated_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Tag]:
         """
         Update a tag
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           tag_name: The name of the tag
 
@@ -130,14 +126,7 @@ def update(
             raise ValueError(f"Expected a non-empty value for `tag_name` but received {tag_name!r}")
         return self._put(
             f"/accounts/{account_id}/access/tags/{tag_name}",
-            body=maybe_transform(
-                {
-                    "name": name,
-                    "created_at": created_at,
-                    "updated_at": updated_at,
-                },
-                tag_update_params.TagUpdateParams,
-            ),
+            body=maybe_transform({"name": name}, tag_update_params.TagUpdateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -152,18 +141,24 @@ def list(
         self,
         *,
         account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[Tag]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[Tag]:
         """
         List tags
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
 
           extra_headers: Send extra headers
 
@@ -177,9 +172,19 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/access/tags",
-            page=SyncSinglePage[Tag],
+            page=SyncV4PagePaginationArray[Tag],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    tag_list_params.TagListParams,
+                ),
             ),
             model=Tag,
         )
@@ -194,13 +199,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TagDeleteResponse]:
         """
         Delete a tag
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           tag_name: The name of the tag
 
@@ -238,13 +243,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Tag]:
         """
         Get a tag
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           tag_name: The name of the tag
 
@@ -276,31 +281,40 @@ def get(
 class AsyncTagsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTagsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTagsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTagsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTagsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        name: str,
-        created_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        updated_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Tag]:
         """
         Create a tag
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           name: The name of the tag
 
@@ -316,14 +330,7 @@ async def create(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._post(
             f"/accounts/{account_id}/access/tags",
-            body=await async_maybe_transform(
-                {
-                    "name": name,
-                    "created_at": created_at,
-                    "updated_at": updated_at,
-                },
-                tag_create_params.TagCreateParams,
-            ),
+            body=await async_maybe_transform({"name": name}, tag_create_params.TagCreateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -340,20 +347,18 @@ async def update(
         *,
         account_id: str,
         name: str,
-        created_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        updated_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Tag]:
         """
         Update a tag
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           tag_name: The name of the tag
 
@@ -373,14 +378,7 @@ async def update(
             raise ValueError(f"Expected a non-empty value for `tag_name` but received {tag_name!r}")
         return await self._put(
             f"/accounts/{account_id}/access/tags/{tag_name}",
-            body=await async_maybe_transform(
-                {
-                    "name": name,
-                    "created_at": created_at,
-                    "updated_at": updated_at,
-                },
-                tag_update_params.TagUpdateParams,
-            ),
+            body=await async_maybe_transform({"name": name}, tag_update_params.TagUpdateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -395,18 +393,24 @@ def list(
         self,
         *,
         account_id: str,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[Tag, AsyncSinglePage[Tag]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Tag, AsyncV4PagePaginationArray[Tag]]:
         """
         List tags
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
 
           extra_headers: Send extra headers
 
@@ -420,9 +424,19 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/access/tags",
-            page=AsyncSinglePage[Tag],
+            page=AsyncV4PagePaginationArray[Tag],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    tag_list_params.TagListParams,
+                ),
             ),
             model=Tag,
         )
@@ -437,13 +451,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TagDeleteResponse]:
         """
         Delete a tag
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           tag_name: The name of the tag
 
@@ -481,13 +495,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Tag]:
         """
         Get a tag
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           tag_name: The name of the tag
 
diff --git a/src/cloudflare/resources/zero_trust/access/users/active_sessions.py b/src/cloudflare/resources/zero_trust/access/users/active_sessions.py
index a3105005535..fba9194b251 100644
--- a/src/cloudflare/resources/zero_trust/access/users/active_sessions.py
+++ b/src/cloudflare/resources/zero_trust/access/users/active_sessions.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ....._types import Body, Query, Headers, NotGiven, not_given
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -27,10 +27,21 @@
 class ActiveSessionsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ActiveSessionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ActiveSessionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ActiveSessionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ActiveSessionsResourceWithStreamingResponse(self)
 
     def list(
@@ -43,15 +54,15 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[ActiveSessionListResponse]:
         """
         Get active sessions for a single user.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          user_id: UUID
+          user_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -85,15 +96,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ActiveSessionGetResponse]:
         """
         Get an active session for a single user.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          user_id: UUID
+          user_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -125,10 +136,21 @@ def get(
 class AsyncActiveSessionsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncActiveSessionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncActiveSessionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncActiveSessionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncActiveSessionsResourceWithStreamingResponse(self)
 
     def list(
@@ -141,15 +163,15 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[ActiveSessionListResponse, AsyncSinglePage[ActiveSessionListResponse]]:
         """
         Get active sessions for a single user.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          user_id: UUID
+          user_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -183,15 +205,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ActiveSessionGetResponse]:
         """
         Get an active session for a single user.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          user_id: UUID
+          user_id: UUID.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/zero_trust/access/users/failed_logins.py b/src/cloudflare/resources/zero_trust/access/users/failed_logins.py
index bf60de4dcf3..34131b36ae4 100644
--- a/src/cloudflare/resources/zero_trust/access/users/failed_logins.py
+++ b/src/cloudflare/resources/zero_trust/access/users/failed_logins.py
@@ -4,7 +4,7 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ....._types import Body, Query, Headers, NotGiven, not_given
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -23,10 +23,21 @@
 class FailedLoginsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> FailedLoginsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return FailedLoginsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> FailedLoginsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return FailedLoginsResourceWithStreamingResponse(self)
 
     def list(
@@ -39,15 +50,15 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[FailedLoginListResponse]:
         """
         Get all failed login attempts for a single user.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          user_id: UUID
+          user_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -74,10 +85,21 @@ def list(
 class AsyncFailedLoginsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncFailedLoginsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncFailedLoginsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncFailedLoginsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncFailedLoginsResourceWithStreamingResponse(self)
 
     def list(
@@ -90,15 +112,15 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[FailedLoginListResponse, AsyncSinglePage[FailedLoginListResponse]]:
         """
         Get all failed login attempts for a single user.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          user_id: UUID
+          user_id: UUID.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/zero_trust/access/users/last_seen_identity.py b/src/cloudflare/resources/zero_trust/access/users/last_seen_identity.py
index 9a01ce91203..8ed147fdd5d 100644
--- a/src/cloudflare/resources/zero_trust/access/users/last_seen_identity.py
+++ b/src/cloudflare/resources/zero_trust/access/users/last_seen_identity.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ....._types import Body, Query, Headers, NotGiven, not_given
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -25,10 +25,21 @@
 class LastSeenIdentityResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> LastSeenIdentityResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LastSeenIdentityResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LastSeenIdentityResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LastSeenIdentityResourceWithStreamingResponse(self)
 
     def get(
@@ -41,15 +52,15 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Identity]:
         """
         Get last seen identity for a single user.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          user_id: UUID
+          user_id: UUID.
 
           extra_headers: Send extra headers
 
@@ -79,10 +90,21 @@ def get(
 class AsyncLastSeenIdentityResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncLastSeenIdentityResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLastSeenIdentityResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLastSeenIdentityResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLastSeenIdentityResourceWithStreamingResponse(self)
 
     async def get(
@@ -95,15 +117,15 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Identity]:
         """
         Get last seen identity for a single user.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
-          user_id: UUID
+          user_id: UUID.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/zero_trust/access/users/users.py b/src/cloudflare/resources/zero_trust/access/users/users.py
index dd6d43cbe3b..515fed442eb 100644
--- a/src/cloudflare/resources/zero_trust/access/users/users.py
+++ b/src/cloudflare/resources/zero_trust/access/users/users.py
@@ -4,7 +4,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -21,7 +22,7 @@
     FailedLoginsResourceWithStreamingResponse,
     AsyncFailedLoginsResourceWithStreamingResponse,
 )
-from .....pagination import SyncSinglePage, AsyncSinglePage
+from .....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from .active_sessions import (
     ActiveSessionsResource,
     AsyncActiveSessionsResource,
@@ -39,7 +40,8 @@
     LastSeenIdentityResourceWithStreamingResponse,
     AsyncLastSeenIdentityResourceWithStreamingResponse,
 )
-from .....types.zero_trust.access.access_user import AccessUser
+from .....types.zero_trust.access import user_list_params
+from .....types.zero_trust.access.user_list_response import UserListResponse
 
 __all__ = ["UsersResource", "AsyncUsersResource"]
 
@@ -59,28 +61,54 @@ def failed_logins(self) -> FailedLoginsResource:
 
     @cached_property
     def with_raw_response(self) -> UsersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return UsersResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> UsersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return UsersResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
+        email: str | Omit = omit,
+        name: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[AccessUser]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[UserListResponse]:
         """
         Gets a list of users for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          email: The email of the user.
+
+          name: The name of the user.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
+          search: Search for users by other listed query parameters.
 
           extra_headers: Send extra headers
 
@@ -94,11 +122,24 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/access/users",
-            page=SyncSinglePage[AccessUser],
+            page=SyncV4PagePaginationArray[UserListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "email": email,
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    user_list_params.UserListParams,
+                ),
             ),
-            model=AccessUser,
+            model=UserListResponse,
         )
 
 
@@ -117,28 +158,54 @@ def failed_logins(self) -> AsyncFailedLoginsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncUsersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncUsersResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncUsersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncUsersResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
+        email: str | Omit = omit,
+        name: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[AccessUser, AsyncSinglePage[AccessUser]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[UserListResponse, AsyncV4PagePaginationArray[UserListResponse]]:
         """
         Gets a list of users for an account.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
+
+          email: The email of the user.
+
+          name: The name of the user.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
+          search: Search for users by other listed query parameters.
 
           extra_headers: Send extra headers
 
@@ -152,11 +219,24 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/access/users",
-            page=AsyncSinglePage[AccessUser],
+            page=AsyncV4PagePaginationArray[UserListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "email": email,
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    user_list_params.UserListParams,
+                ),
             ),
-            model=AccessUser,
+            model=UserListResponse,
         )
 
 
diff --git a/src/cloudflare/resources/zero_trust/connectivity_settings.py b/src/cloudflare/resources/zero_trust/connectivity_settings.py
index 615f43e2d75..5e91980161b 100644
--- a/src/cloudflare/resources/zero_trust/connectivity_settings.py
+++ b/src/cloudflare/resources/zero_trust/connectivity_settings.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -31,24 +28,35 @@
 class ConnectivitySettingsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ConnectivitySettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ConnectivitySettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ConnectivitySettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ConnectivitySettingsResourceWithStreamingResponse(self)
 
     def edit(
         self,
         *,
         account_id: str,
-        icmp_proxy_enabled: bool | NotGiven = NOT_GIVEN,
-        offramp_warp_enabled: bool | NotGiven = NOT_GIVEN,
+        icmp_proxy_enabled: bool | Omit = omit,
+        offramp_warp_enabled: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ConnectivitySettingEditResponse:
         """
         Updates the Zero Trust Connectivity Settings for the given account.
@@ -98,7 +106,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ConnectivitySettingGetResponse:
         """
         Gets the Zero Trust Connectivity Settings for the given account.
@@ -132,24 +140,35 @@ def get(
 class AsyncConnectivitySettingsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncConnectivitySettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncConnectivitySettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncConnectivitySettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncConnectivitySettingsResourceWithStreamingResponse(self)
 
     async def edit(
         self,
         *,
         account_id: str,
-        icmp_proxy_enabled: bool | NotGiven = NOT_GIVEN,
-        offramp_warp_enabled: bool | NotGiven = NOT_GIVEN,
+        icmp_proxy_enabled: bool | Omit = omit,
+        offramp_warp_enabled: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ConnectivitySettingEditResponse:
         """
         Updates the Zero Trust Connectivity Settings for the given account.
@@ -199,7 +218,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ConnectivitySettingGetResponse:
         """
         Gets the Zero Trust Connectivity Settings for the given account.
diff --git a/src/cloudflare/resources/zero_trust/devices/__init__.py b/src/cloudflare/resources/zero_trust/devices/__init__.py
index 3002bba6155..b3bd5980ce4 100644
--- a/src/cloudflare/resources/zero_trust/devices/__init__.py
+++ b/src/cloudflare/resources/zero_trust/devices/__init__.py
@@ -64,6 +64,30 @@
     DEXTestsResourceWithStreamingResponse,
     AsyncDEXTestsResourceWithStreamingResponse,
 )
+from .resilience import (
+    ResilienceResource,
+    AsyncResilienceResource,
+    ResilienceResourceWithRawResponse,
+    AsyncResilienceResourceWithRawResponse,
+    ResilienceResourceWithStreamingResponse,
+    AsyncResilienceResourceWithStreamingResponse,
+)
+from .fleet_status import (
+    FleetStatusResource,
+    AsyncFleetStatusResource,
+    FleetStatusResourceWithRawResponse,
+    AsyncFleetStatusResourceWithRawResponse,
+    FleetStatusResourceWithStreamingResponse,
+    AsyncFleetStatusResourceWithStreamingResponse,
+)
+from .registrations import (
+    RegistrationsResource,
+    AsyncRegistrationsResource,
+    RegistrationsResourceWithRawResponse,
+    AsyncRegistrationsResourceWithRawResponse,
+    RegistrationsResourceWithStreamingResponse,
+    AsyncRegistrationsResourceWithStreamingResponse,
+)
 from .override_codes import (
     OverrideCodesResource,
     AsyncOverrideCodesResource,
@@ -74,6 +98,18 @@
 )
 
 __all__ = [
+    "ResilienceResource",
+    "AsyncResilienceResource",
+    "ResilienceResourceWithRawResponse",
+    "AsyncResilienceResourceWithRawResponse",
+    "ResilienceResourceWithStreamingResponse",
+    "AsyncResilienceResourceWithStreamingResponse",
+    "RegistrationsResource",
+    "AsyncRegistrationsResource",
+    "RegistrationsResourceWithRawResponse",
+    "AsyncRegistrationsResourceWithRawResponse",
+    "RegistrationsResourceWithStreamingResponse",
+    "AsyncRegistrationsResourceWithStreamingResponse",
     "DEXTestsResource",
     "AsyncDEXTestsResource",
     "DEXTestsResourceWithRawResponse",
@@ -86,6 +122,12 @@
     "AsyncNetworksResourceWithRawResponse",
     "NetworksResourceWithStreamingResponse",
     "AsyncNetworksResourceWithStreamingResponse",
+    "FleetStatusResource",
+    "AsyncFleetStatusResource",
+    "FleetStatusResourceWithRawResponse",
+    "AsyncFleetStatusResourceWithRawResponse",
+    "FleetStatusResourceWithStreamingResponse",
+    "AsyncFleetStatusResourceWithStreamingResponse",
     "PoliciesResource",
     "AsyncPoliciesResource",
     "PoliciesResourceWithRawResponse",
diff --git a/src/cloudflare/resources/zero_trust/devices/devices.py b/src/cloudflare/resources/zero_trust/devices/devices.py
index abe17124baa..ce53ece99fb 100644
--- a/src/cloudflare/resources/zero_trust/devices/devices.py
+++ b/src/cloudflare/resources/zero_trust/devices/devices.py
@@ -2,10 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, cast
+import typing_extensions
+from typing import Type, Optional, cast
 
 import httpx
 
+from . import devices_ as devices
 from .revoke import (
     RevokeResource,
     AsyncRevokeResource,
@@ -14,14 +16,6 @@
     RevokeResourceWithStreamingResponse,
     AsyncRevokeResourceWithStreamingResponse,
 )
-from .posture import (
-    PostureResource,
-    AsyncPostureResource,
-    PostureResourceWithRawResponse,
-    AsyncPostureResourceWithRawResponse,
-    PostureResourceWithStreamingResponse,
-    AsyncPostureResourceWithStreamingResponse,
-)
 from .networks import (
     NetworksResource,
     AsyncNetworksResource,
@@ -30,14 +24,6 @@
     NetworksResourceWithStreamingResponse,
     AsyncNetworksResourceWithStreamingResponse,
 )
-from .policies import (
-    PoliciesResource,
-    AsyncPoliciesResource,
-    PoliciesResourceWithRawResponse,
-    AsyncPoliciesResourceWithRawResponse,
-    PoliciesResourceWithStreamingResponse,
-    AsyncPoliciesResourceWithStreamingResponse,
-)
 from .settings import (
     SettingsResource,
     AsyncSettingsResource,
@@ -54,7 +40,7 @@
     UnrevokeResourceWithStreamingResponse,
     AsyncUnrevokeResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from .dex_tests import (
     DEXTestsResource,
     AsyncDEXTestsResource,
@@ -72,7 +58,23 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
+from .fleet_status import (
+    FleetStatusResource,
+    AsyncFleetStatusResource,
+    FleetStatusResourceWithRawResponse,
+    AsyncFleetStatusResourceWithRawResponse,
+    FleetStatusResourceWithStreamingResponse,
+    AsyncFleetStatusResourceWithStreamingResponse,
+)
 from ....pagination import SyncSinglePage, AsyncSinglePage
+from .registrations import (
+    RegistrationsResource,
+    AsyncRegistrationsResource,
+    RegistrationsResourceWithRawResponse,
+    AsyncRegistrationsResourceWithRawResponse,
+    RegistrationsResourceWithStreamingResponse,
+    AsyncRegistrationsResourceWithStreamingResponse,
+)
 from .override_codes import (
     OverrideCodesResource,
     AsyncOverrideCodesResource,
@@ -82,8 +84,30 @@
     AsyncOverrideCodesResourceWithStreamingResponse,
 )
 from ...._base_client import AsyncPaginator, make_request_options
-from .posture.posture import PostureResource, AsyncPostureResource
-from .policies.policies import PoliciesResource, AsyncPoliciesResource
+from .posture.posture import (
+    PostureResource,
+    AsyncPostureResource,
+    PostureResourceWithRawResponse,
+    AsyncPostureResourceWithRawResponse,
+    PostureResourceWithStreamingResponse,
+    AsyncPostureResourceWithStreamingResponse,
+)
+from .policies.policies import (
+    PoliciesResource,
+    AsyncPoliciesResource,
+    PoliciesResourceWithRawResponse,
+    AsyncPoliciesResourceWithRawResponse,
+    PoliciesResourceWithStreamingResponse,
+    AsyncPoliciesResourceWithStreamingResponse,
+)
+from .resilience.resilience import (
+    ResilienceResource,
+    AsyncResilienceResource,
+    ResilienceResourceWithRawResponse,
+    AsyncResilienceResourceWithRawResponse,
+    ResilienceResourceWithStreamingResponse,
+    AsyncResilienceResourceWithStreamingResponse,
+)
 from ....types.zero_trust.device import Device
 from ....types.zero_trust.device_get_response import DeviceGetResponse
 
@@ -91,6 +115,18 @@
 
 
 class DevicesResource(SyncAPIResource):
+    @cached_property
+    def devices(self) -> devices.DevicesResource:
+        return devices.DevicesResource(self._client)
+
+    @cached_property
+    def resilience(self) -> ResilienceResource:
+        return ResilienceResource(self._client)
+
+    @cached_property
+    def registrations(self) -> RegistrationsResource:
+        return RegistrationsResource(self._client)
+
     @cached_property
     def dex_tests(self) -> DEXTestsResource:
         return DEXTestsResource(self._client)
@@ -99,6 +135,10 @@ def dex_tests(self) -> DEXTestsResource:
     def networks(self) -> NetworksResource:
         return NetworksResource(self._client)
 
+    @cached_property
+    def fleet_status(self) -> FleetStatusResource:
+        return FleetStatusResource(self._client)
+
     @cached_property
     def policies(self) -> PoliciesResource:
         return PoliciesResource(self._client)
@@ -125,12 +165,24 @@ def override_codes(self) -> OverrideCodesResource:
 
     @cached_property
     def with_raw_response(self) -> DevicesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DevicesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DevicesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DevicesResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
         *,
@@ -140,10 +192,18 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Device]:
-        """
-        Fetches a list of enrolled devices.
+        """List WARP devices.
+
+        Not supported when
+        [multi-user mode](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-multiuser/)
+        is enabled for the account.
+
+        **Deprecated**: please use one of the following endpoints instead:
+
+        - GET /accounts/{account_id}/devices/physical-devices
+        - GET /accounts/{account_id}/devices/registrations
 
         Args:
           extra_headers: Send extra headers
@@ -165,6 +225,7 @@ def list(
             model=Device,
         )
 
+    @typing_extensions.deprecated("deprecated")
     def get(
         self,
         device_id: str,
@@ -175,13 +236,22 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> DeviceGetResponse:
-        """
-        Fetches details for a single device.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DeviceGetResponse]:
+        """Fetches a single WARP device.
+
+        Not supported when
+        [multi-user mode](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-multiuser/)
+        is enabled for the account.
+
+        **Deprecated**: please use one of the following endpoints instead:
+
+        - GET /accounts/{account_id}/devices/physical-devices/{device_id}
+        - GET /accounts/{account_id}/devices/registrations/{registration_id}
 
         Args:
-          device_id: Device ID.
+          device_id: Registration ID. Equal to Device ID except for accounts which enabled
+              [multi-user mode](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-multiuser/).
 
           extra_headers: Send extra headers
 
@@ -195,25 +265,32 @@ def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not device_id:
             raise ValueError(f"Expected a non-empty value for `device_id` but received {device_id!r}")
-        return cast(
-            DeviceGetResponse,
-            self._get(
-                f"/accounts/{account_id}/devices/{device_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[DeviceGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DeviceGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._get(
+            f"/accounts/{account_id}/devices/{device_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DeviceGetResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[DeviceGetResponse]], ResultWrapper[DeviceGetResponse]),
         )
 
 
 class AsyncDevicesResource(AsyncAPIResource):
+    @cached_property
+    def devices(self) -> devices.AsyncDevicesResource:
+        return devices.AsyncDevicesResource(self._client)
+
+    @cached_property
+    def resilience(self) -> AsyncResilienceResource:
+        return AsyncResilienceResource(self._client)
+
+    @cached_property
+    def registrations(self) -> AsyncRegistrationsResource:
+        return AsyncRegistrationsResource(self._client)
+
     @cached_property
     def dex_tests(self) -> AsyncDEXTestsResource:
         return AsyncDEXTestsResource(self._client)
@@ -222,6 +299,10 @@ def dex_tests(self) -> AsyncDEXTestsResource:
     def networks(self) -> AsyncNetworksResource:
         return AsyncNetworksResource(self._client)
 
+    @cached_property
+    def fleet_status(self) -> AsyncFleetStatusResource:
+        return AsyncFleetStatusResource(self._client)
+
     @cached_property
     def policies(self) -> AsyncPoliciesResource:
         return AsyncPoliciesResource(self._client)
@@ -248,12 +329,24 @@ def override_codes(self) -> AsyncOverrideCodesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncDevicesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDevicesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDevicesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDevicesResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
         *,
@@ -263,10 +356,18 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Device, AsyncSinglePage[Device]]:
-        """
-        Fetches a list of enrolled devices.
+        """List WARP devices.
+
+        Not supported when
+        [multi-user mode](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-multiuser/)
+        is enabled for the account.
+
+        **Deprecated**: please use one of the following endpoints instead:
+
+        - GET /accounts/{account_id}/devices/physical-devices
+        - GET /accounts/{account_id}/devices/registrations
 
         Args:
           extra_headers: Send extra headers
@@ -288,6 +389,7 @@ def list(
             model=Device,
         )
 
+    @typing_extensions.deprecated("deprecated")
     async def get(
         self,
         device_id: str,
@@ -298,13 +400,22 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> DeviceGetResponse:
-        """
-        Fetches details for a single device.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DeviceGetResponse]:
+        """Fetches a single WARP device.
+
+        Not supported when
+        [multi-user mode](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-multiuser/)
+        is enabled for the account.
+
+        **Deprecated**: please use one of the following endpoints instead:
+
+        - GET /accounts/{account_id}/devices/physical-devices/{device_id}
+        - GET /accounts/{account_id}/devices/registrations/{registration_id}
 
         Args:
-          device_id: Device ID.
+          device_id: Registration ID. Equal to Device ID except for accounts which enabled
+              [multi-user mode](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-multiuser/).
 
           extra_headers: Send extra headers
 
@@ -318,21 +429,16 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not device_id:
             raise ValueError(f"Expected a non-empty value for `device_id` but received {device_id!r}")
-        return cast(
-            DeviceGetResponse,
-            await self._get(
-                f"/accounts/{account_id}/devices/{device_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[DeviceGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[DeviceGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._get(
+            f"/accounts/{account_id}/devices/{device_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DeviceGetResponse]]._unwrapper,
             ),
+            cast_to=cast(Type[Optional[DeviceGetResponse]], ResultWrapper[DeviceGetResponse]),
         )
 
 
@@ -340,13 +446,29 @@ class DevicesResourceWithRawResponse:
     def __init__(self, devices: DevicesResource) -> None:
         self._devices = devices
 
-        self.list = to_raw_response_wrapper(
-            devices.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                devices.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_raw_response_wrapper(
-            devices.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                devices.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
+    @cached_property
+    def devices(self) -> devices.DevicesResourceWithRawResponse:
+        return devices.DevicesResourceWithRawResponse(self._devices.devices)
+
+    @cached_property
+    def resilience(self) -> ResilienceResourceWithRawResponse:
+        return ResilienceResourceWithRawResponse(self._devices.resilience)
+
+    @cached_property
+    def registrations(self) -> RegistrationsResourceWithRawResponse:
+        return RegistrationsResourceWithRawResponse(self._devices.registrations)
+
     @cached_property
     def dex_tests(self) -> DEXTestsResourceWithRawResponse:
         return DEXTestsResourceWithRawResponse(self._devices.dex_tests)
@@ -355,6 +477,10 @@ def dex_tests(self) -> DEXTestsResourceWithRawResponse:
     def networks(self) -> NetworksResourceWithRawResponse:
         return NetworksResourceWithRawResponse(self._devices.networks)
 
+    @cached_property
+    def fleet_status(self) -> FleetStatusResourceWithRawResponse:
+        return FleetStatusResourceWithRawResponse(self._devices.fleet_status)
+
     @cached_property
     def policies(self) -> PoliciesResourceWithRawResponse:
         return PoliciesResourceWithRawResponse(self._devices.policies)
@@ -384,13 +510,29 @@ class AsyncDevicesResourceWithRawResponse:
     def __init__(self, devices: AsyncDevicesResource) -> None:
         self._devices = devices
 
-        self.list = async_to_raw_response_wrapper(
-            devices.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                devices.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_raw_response_wrapper(
-            devices.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                devices.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
+    @cached_property
+    def devices(self) -> devices.AsyncDevicesResourceWithRawResponse:
+        return devices.AsyncDevicesResourceWithRawResponse(self._devices.devices)
+
+    @cached_property
+    def resilience(self) -> AsyncResilienceResourceWithRawResponse:
+        return AsyncResilienceResourceWithRawResponse(self._devices.resilience)
+
+    @cached_property
+    def registrations(self) -> AsyncRegistrationsResourceWithRawResponse:
+        return AsyncRegistrationsResourceWithRawResponse(self._devices.registrations)
+
     @cached_property
     def dex_tests(self) -> AsyncDEXTestsResourceWithRawResponse:
         return AsyncDEXTestsResourceWithRawResponse(self._devices.dex_tests)
@@ -399,6 +541,10 @@ def dex_tests(self) -> AsyncDEXTestsResourceWithRawResponse:
     def networks(self) -> AsyncNetworksResourceWithRawResponse:
         return AsyncNetworksResourceWithRawResponse(self._devices.networks)
 
+    @cached_property
+    def fleet_status(self) -> AsyncFleetStatusResourceWithRawResponse:
+        return AsyncFleetStatusResourceWithRawResponse(self._devices.fleet_status)
+
     @cached_property
     def policies(self) -> AsyncPoliciesResourceWithRawResponse:
         return AsyncPoliciesResourceWithRawResponse(self._devices.policies)
@@ -428,13 +574,29 @@ class DevicesResourceWithStreamingResponse:
     def __init__(self, devices: DevicesResource) -> None:
         self._devices = devices
 
-        self.list = to_streamed_response_wrapper(
-            devices.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                devices.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_streamed_response_wrapper(
-            devices.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                devices.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
+    @cached_property
+    def devices(self) -> devices.DevicesResourceWithStreamingResponse:
+        return devices.DevicesResourceWithStreamingResponse(self._devices.devices)
+
+    @cached_property
+    def resilience(self) -> ResilienceResourceWithStreamingResponse:
+        return ResilienceResourceWithStreamingResponse(self._devices.resilience)
+
+    @cached_property
+    def registrations(self) -> RegistrationsResourceWithStreamingResponse:
+        return RegistrationsResourceWithStreamingResponse(self._devices.registrations)
+
     @cached_property
     def dex_tests(self) -> DEXTestsResourceWithStreamingResponse:
         return DEXTestsResourceWithStreamingResponse(self._devices.dex_tests)
@@ -443,6 +605,10 @@ def dex_tests(self) -> DEXTestsResourceWithStreamingResponse:
     def networks(self) -> NetworksResourceWithStreamingResponse:
         return NetworksResourceWithStreamingResponse(self._devices.networks)
 
+    @cached_property
+    def fleet_status(self) -> FleetStatusResourceWithStreamingResponse:
+        return FleetStatusResourceWithStreamingResponse(self._devices.fleet_status)
+
     @cached_property
     def policies(self) -> PoliciesResourceWithStreamingResponse:
         return PoliciesResourceWithStreamingResponse(self._devices.policies)
@@ -472,13 +638,29 @@ class AsyncDevicesResourceWithStreamingResponse:
     def __init__(self, devices: AsyncDevicesResource) -> None:
         self._devices = devices
 
-        self.list = async_to_streamed_response_wrapper(
-            devices.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                devices.list,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_streamed_response_wrapper(
-            devices.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                devices.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
+    @cached_property
+    def devices(self) -> devices.AsyncDevicesResourceWithStreamingResponse:
+        return devices.AsyncDevicesResourceWithStreamingResponse(self._devices.devices)
+
+    @cached_property
+    def resilience(self) -> AsyncResilienceResourceWithStreamingResponse:
+        return AsyncResilienceResourceWithStreamingResponse(self._devices.resilience)
+
+    @cached_property
+    def registrations(self) -> AsyncRegistrationsResourceWithStreamingResponse:
+        return AsyncRegistrationsResourceWithStreamingResponse(self._devices.registrations)
+
     @cached_property
     def dex_tests(self) -> AsyncDEXTestsResourceWithStreamingResponse:
         return AsyncDEXTestsResourceWithStreamingResponse(self._devices.dex_tests)
@@ -487,6 +669,10 @@ def dex_tests(self) -> AsyncDEXTestsResourceWithStreamingResponse:
     def networks(self) -> AsyncNetworksResourceWithStreamingResponse:
         return AsyncNetworksResourceWithStreamingResponse(self._devices.networks)
 
+    @cached_property
+    def fleet_status(self) -> AsyncFleetStatusResourceWithStreamingResponse:
+        return AsyncFleetStatusResourceWithStreamingResponse(self._devices.fleet_status)
+
     @cached_property
     def policies(self) -> AsyncPoliciesResourceWithStreamingResponse:
         return AsyncPoliciesResourceWithStreamingResponse(self._devices.policies)
diff --git a/src/cloudflare/resources/zero_trust/devices/devices_.py b/src/cloudflare/resources/zero_trust/devices/devices_.py
new file mode 100644
index 00000000000..68ceefcdf58
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/devices/devices_.py
@@ -0,0 +1,577 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncCursorPagination, AsyncCursorPagination
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.zero_trust.devices import device_get_params, device_list_params
+from ....types.zero_trust.devices.device_get_response import DeviceGetResponse
+from ....types.zero_trust.devices.device_list_response import DeviceListResponse
+
+__all__ = ["DevicesResource", "AsyncDevicesResource"]
+
+
+class DevicesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> DevicesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return DevicesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> DevicesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return DevicesResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        id: SequenceNotStr[str] | Omit = omit,
+        active_registrations: Literal["include", "only", "exclude"] | Omit = omit,
+        cursor: str | Omit = omit,
+        include: str | Omit = omit,
+        last_seen_user: device_list_params.LastSeenUser | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        seen_after: str | Omit = omit,
+        seen_before: str | Omit = omit,
+        sort_by: Literal[
+            "name", "id", "client_version", "last_seen_user.email", "last_seen_at", "active_registrations", "created_at"
+        ]
+        | Omit = omit,
+        sort_order: Literal["asc", "desc"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncCursorPagination[DeviceListResponse]:
+        """
+        Lists WARP devices.
+
+        Args:
+          id: Filter by a one or more device IDs.
+
+          active_registrations: Include or exclude devices with active registrations. The default is "only" -
+              return only devices with active registrations.
+
+          cursor: Opaque token indicating the starting position when requesting the next set of
+              records. A cursor value can be obtained from the result_info.cursor field in the
+              response.
+
+          include: Comma-separated list of additional information that should be included in the
+              device response. Supported values are: "last_seen_registration.policy".
+
+          per_page: The maximum number of devices to return in a single response.
+
+          search: Search by device details.
+
+          seen_after: Filter by the last_seen timestamp - returns only devices last seen after this
+              timestamp.
+
+          seen_before: Filter by the last_seen timestamp - returns only devices last seen before this
+              timestamp.
+
+          sort_by: The device field to order results by.
+
+          sort_order: Sort direction.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/physical-devices",
+            page=SyncCursorPagination[DeviceListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "id": id,
+                        "active_registrations": active_registrations,
+                        "cursor": cursor,
+                        "include": include,
+                        "last_seen_user": last_seen_user,
+                        "per_page": per_page,
+                        "search": search,
+                        "seen_after": seen_after,
+                        "seen_before": seen_before,
+                        "sort_by": sort_by,
+                        "sort_order": sort_order,
+                    },
+                    device_list_params.DeviceListParams,
+                ),
+            ),
+            model=DeviceListResponse,
+        )
+
+    def delete(
+        self,
+        device_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Deletes a WARP device.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not device_id:
+            raise ValueError(f"Expected a non-empty value for `device_id` but received {device_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/devices/physical-devices/{device_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def get(
+        self,
+        device_id: str,
+        *,
+        account_id: str,
+        include: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DeviceGetResponse:
+        """
+        Fetches a single WARP device.
+
+        Args:
+          include: Comma-separated list of additional information that should be included in the
+              device response. Supported values are: "last_seen_registration.policy".
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not device_id:
+            raise ValueError(f"Expected a non-empty value for `device_id` but received {device_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/devices/physical-devices/{device_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"include": include}, device_get_params.DeviceGetParams),
+                post_parser=ResultWrapper[DeviceGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DeviceGetResponse], ResultWrapper[DeviceGetResponse]),
+        )
+
+    def revoke(
+        self,
+        device_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Revokes all WARP registrations associated with the specified device.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not device_id:
+            raise ValueError(f"Expected a non-empty value for `device_id` but received {device_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/devices/physical-devices/{device_id}/revoke",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+
+class AsyncDevicesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncDevicesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncDevicesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncDevicesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncDevicesResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        id: SequenceNotStr[str] | Omit = omit,
+        active_registrations: Literal["include", "only", "exclude"] | Omit = omit,
+        cursor: str | Omit = omit,
+        include: str | Omit = omit,
+        last_seen_user: device_list_params.LastSeenUser | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        seen_after: str | Omit = omit,
+        seen_before: str | Omit = omit,
+        sort_by: Literal[
+            "name", "id", "client_version", "last_seen_user.email", "last_seen_at", "active_registrations", "created_at"
+        ]
+        | Omit = omit,
+        sort_order: Literal["asc", "desc"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[DeviceListResponse, AsyncCursorPagination[DeviceListResponse]]:
+        """
+        Lists WARP devices.
+
+        Args:
+          id: Filter by a one or more device IDs.
+
+          active_registrations: Include or exclude devices with active registrations. The default is "only" -
+              return only devices with active registrations.
+
+          cursor: Opaque token indicating the starting position when requesting the next set of
+              records. A cursor value can be obtained from the result_info.cursor field in the
+              response.
+
+          include: Comma-separated list of additional information that should be included in the
+              device response. Supported values are: "last_seen_registration.policy".
+
+          per_page: The maximum number of devices to return in a single response.
+
+          search: Search by device details.
+
+          seen_after: Filter by the last_seen timestamp - returns only devices last seen after this
+              timestamp.
+
+          seen_before: Filter by the last_seen timestamp - returns only devices last seen before this
+              timestamp.
+
+          sort_by: The device field to order results by.
+
+          sort_order: Sort direction.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/physical-devices",
+            page=AsyncCursorPagination[DeviceListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "id": id,
+                        "active_registrations": active_registrations,
+                        "cursor": cursor,
+                        "include": include,
+                        "last_seen_user": last_seen_user,
+                        "per_page": per_page,
+                        "search": search,
+                        "seen_after": seen_after,
+                        "seen_before": seen_before,
+                        "sort_by": sort_by,
+                        "sort_order": sort_order,
+                    },
+                    device_list_params.DeviceListParams,
+                ),
+            ),
+            model=DeviceListResponse,
+        )
+
+    async def delete(
+        self,
+        device_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Deletes a WARP device.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not device_id:
+            raise ValueError(f"Expected a non-empty value for `device_id` but received {device_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/devices/physical-devices/{device_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def get(
+        self,
+        device_id: str,
+        *,
+        account_id: str,
+        include: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> DeviceGetResponse:
+        """
+        Fetches a single WARP device.
+
+        Args:
+          include: Comma-separated list of additional information that should be included in the
+              device response. Supported values are: "last_seen_registration.policy".
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not device_id:
+            raise ValueError(f"Expected a non-empty value for `device_id` but received {device_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/devices/physical-devices/{device_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"include": include}, device_get_params.DeviceGetParams),
+                post_parser=ResultWrapper[DeviceGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[DeviceGetResponse], ResultWrapper[DeviceGetResponse]),
+        )
+
+    async def revoke(
+        self,
+        device_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Revokes all WARP registrations associated with the specified device.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not device_id:
+            raise ValueError(f"Expected a non-empty value for `device_id` but received {device_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/devices/physical-devices/{device_id}/revoke",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+
+class DevicesResourceWithRawResponse:
+    def __init__(self, devices: DevicesResource) -> None:
+        self._devices = devices
+
+        self.list = to_raw_response_wrapper(
+            devices.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            devices.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            devices.get,
+        )
+        self.revoke = to_raw_response_wrapper(
+            devices.revoke,
+        )
+
+
+class AsyncDevicesResourceWithRawResponse:
+    def __init__(self, devices: AsyncDevicesResource) -> None:
+        self._devices = devices
+
+        self.list = async_to_raw_response_wrapper(
+            devices.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            devices.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            devices.get,
+        )
+        self.revoke = async_to_raw_response_wrapper(
+            devices.revoke,
+        )
+
+
+class DevicesResourceWithStreamingResponse:
+    def __init__(self, devices: DevicesResource) -> None:
+        self._devices = devices
+
+        self.list = to_streamed_response_wrapper(
+            devices.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            devices.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            devices.get,
+        )
+        self.revoke = to_streamed_response_wrapper(
+            devices.revoke,
+        )
+
+
+class AsyncDevicesResourceWithStreamingResponse:
+    def __init__(self, devices: AsyncDevicesResource) -> None:
+        self._devices = devices
+
+        self.list = async_to_streamed_response_wrapper(
+            devices.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            devices.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            devices.get,
+        )
+        self.revoke = async_to_streamed_response_wrapper(
+            devices.revoke,
+        )
diff --git a/src/cloudflare/resources/zero_trust/devices/dex_tests.py b/src/cloudflare/resources/zero_trust/devices/dex_tests.py
index 26c2c033002..a2d657bcbcb 100644
--- a/src/cloudflare/resources/zero_trust/devices/dex_tests.py
+++ b/src/cloudflare/resources/zero_trust/devices/dex_tests.py
@@ -3,14 +3,12 @@
 from __future__ import annotations
 
 from typing import Type, Iterable, Optional, cast
+from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -20,12 +18,14 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ....pagination import SyncSinglePage, AsyncSinglePage
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ...._base_client import AsyncPaginator, make_request_options
-from ....types.zero_trust.devices import dex_test_create_params, dex_test_update_params
-from ....types.zero_trust.devices.schema_http import SchemaHTTP
-from ....types.zero_trust.devices.schema_data_param import SchemaDataParam
+from ....types.zero_trust.devices import dex_test_list_params, dex_test_create_params, dex_test_update_params
+from ....types.zero_trust.devices.dex_test_get_response import DEXTestGetResponse
+from ....types.zero_trust.devices.dex_test_list_response import DEXTestListResponse
+from ....types.zero_trust.devices.dex_test_create_response import DEXTestCreateResponse
 from ....types.zero_trust.devices.dex_test_delete_response import DEXTestDeleteResponse
+from ....types.zero_trust.devices.dex_test_update_response import DEXTestUpdateResponse
 
 __all__ = ["DEXTestsResource", "AsyncDEXTestsResource"]
 
@@ -33,30 +33,41 @@
 class DEXTestsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DEXTestsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DEXTestsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DEXTestsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DEXTestsResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        data: SchemaDataParam,
+        data: dex_test_create_params.Data,
         enabled: bool,
         interval: str,
         name: str,
-        description: str | NotGiven = NOT_GIVEN,
-        target_policies: Iterable[dex_test_create_params.TargetPolicy] | NotGiven = NOT_GIVEN,
-        targeted: bool | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        target_policies: Iterable[dex_test_create_params.TargetPolicy] | Omit = omit,
+        targeted: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SchemaHTTP]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DEXTestCreateResponse]:
         """
         Create a DEX test.
 
@@ -72,7 +83,7 @@ def create(
 
           description: Additional details about the test.
 
-          target_policies: Device settings profiles targeted by this test
+          target_policies: DEX rules targeted by this test
 
           extra_headers: Send extra headers
 
@@ -85,7 +96,7 @@ def create(
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._post(
-            f"/accounts/{account_id}/devices/dex_tests",
+            f"/accounts/{account_id}/dex/devices/dex_tests",
             body=maybe_transform(
                 {
                     "data": data,
@@ -103,9 +114,9 @@ def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[SchemaHTTP]]._unwrapper,
+                post_parser=ResultWrapper[Optional[DEXTestCreateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[SchemaHTTP]], ResultWrapper[SchemaHTTP]),
+            cast_to=cast(Type[Optional[DEXTestCreateResponse]], ResultWrapper[DEXTestCreateResponse]),
         )
 
     def update(
@@ -113,25 +124,25 @@ def update(
         dex_test_id: str,
         *,
         account_id: str,
-        data: SchemaDataParam,
+        data: dex_test_update_params.Data,
         enabled: bool,
         interval: str,
         name: str,
-        description: str | NotGiven = NOT_GIVEN,
-        target_policies: Iterable[dex_test_update_params.TargetPolicy] | NotGiven = NOT_GIVEN,
-        targeted: bool | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        target_policies: Iterable[dex_test_update_params.TargetPolicy] | Omit = omit,
+        targeted: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SchemaHTTP]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DEXTestUpdateResponse]:
         """
         Update a DEX test.
 
         Args:
-          dex_test_id: API UUID.
+          dex_test_id: API Resource UUID tag.
 
           data: The configuration object which contains the details for the WARP client to
               conduct the test.
@@ -144,7 +155,7 @@ def update(
 
           description: Additional details about the test.
 
-          target_policies: Device settings profiles targeted by this test
+          target_policies: DEX rules targeted by this test
 
           extra_headers: Send extra headers
 
@@ -159,7 +170,7 @@ def update(
         if not dex_test_id:
             raise ValueError(f"Expected a non-empty value for `dex_test_id` but received {dex_test_id!r}")
         return self._put(
-            f"/accounts/{account_id}/devices/dex_tests/{dex_test_id}",
+            f"/accounts/{account_id}/dex/devices/dex_tests/{dex_test_id}",
             body=maybe_transform(
                 {
                     "data": data,
@@ -177,26 +188,38 @@ def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[SchemaHTTP]]._unwrapper,
+                post_parser=ResultWrapper[Optional[DEXTestUpdateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[SchemaHTTP]], ResultWrapper[SchemaHTTP]),
+            cast_to=cast(Type[Optional[DEXTestUpdateResponse]], ResultWrapper[DEXTestUpdateResponse]),
         )
 
     def list(
         self,
         *,
         account_id: str,
+        kind: Literal["http", "traceroute"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        test_name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[SchemaHTTP]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[DEXTestListResponse]:
         """
-        Fetch all DEX tests.
+        Fetch all DEX tests
 
         Args:
+          kind: Filter by test type
+
+          page: Page number of paginated results
+
+          per_page: Number of items per page
+
+          test_name: Filter by test name
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -208,12 +231,24 @@ def list(
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
-            f"/accounts/{account_id}/devices/dex_tests",
-            page=SyncSinglePage[SchemaHTTP],
+            f"/accounts/{account_id}/dex/devices/dex_tests",
+            page=SyncV4PagePaginationArray[DEXTestListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "kind": kind,
+                        "page": page,
+                        "per_page": per_page,
+                        "test_name": test_name,
+                    },
+                    dex_test_list_params.DEXTestListParams,
+                ),
             ),
-            model=SchemaHTTP,
+            model=DEXTestListResponse,
         )
 
     def delete(
@@ -226,7 +261,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DEXTestDeleteResponse]:
         """Delete a Device DEX test.
 
@@ -234,7 +269,7 @@ def delete(
         account.
 
         Args:
-          dex_test_id: API UUID.
+          dex_test_id: API Resource UUID tag.
 
           extra_headers: Send extra headers
 
@@ -249,7 +284,7 @@ def delete(
         if not dex_test_id:
             raise ValueError(f"Expected a non-empty value for `dex_test_id` but received {dex_test_id!r}")
         return self._delete(
-            f"/accounts/{account_id}/devices/dex_tests/{dex_test_id}",
+            f"/accounts/{account_id}/dex/devices/dex_tests/{dex_test_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -270,13 +305,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SchemaHTTP]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DEXTestGetResponse]:
         """
         Fetch a single DEX test.
 
         Args:
-          dex_test_id: API UUID.
+          dex_test_id: The unique identifier for the test.
 
           extra_headers: Send extra headers
 
@@ -291,45 +326,56 @@ def get(
         if not dex_test_id:
             raise ValueError(f"Expected a non-empty value for `dex_test_id` but received {dex_test_id!r}")
         return self._get(
-            f"/accounts/{account_id}/devices/dex_tests/{dex_test_id}",
+            f"/accounts/{account_id}/dex/devices/dex_tests/{dex_test_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[SchemaHTTP]]._unwrapper,
+                post_parser=ResultWrapper[Optional[DEXTestGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[SchemaHTTP]], ResultWrapper[SchemaHTTP]),
+            cast_to=cast(Type[Optional[DEXTestGetResponse]], ResultWrapper[DEXTestGetResponse]),
         )
 
 
 class AsyncDEXTestsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDEXTestsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDEXTestsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDEXTestsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDEXTestsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        data: SchemaDataParam,
+        data: dex_test_create_params.Data,
         enabled: bool,
         interval: str,
         name: str,
-        description: str | NotGiven = NOT_GIVEN,
-        target_policies: Iterable[dex_test_create_params.TargetPolicy] | NotGiven = NOT_GIVEN,
-        targeted: bool | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        target_policies: Iterable[dex_test_create_params.TargetPolicy] | Omit = omit,
+        targeted: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SchemaHTTP]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DEXTestCreateResponse]:
         """
         Create a DEX test.
 
@@ -345,7 +391,7 @@ async def create(
 
           description: Additional details about the test.
 
-          target_policies: Device settings profiles targeted by this test
+          target_policies: DEX rules targeted by this test
 
           extra_headers: Send extra headers
 
@@ -358,7 +404,7 @@ async def create(
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._post(
-            f"/accounts/{account_id}/devices/dex_tests",
+            f"/accounts/{account_id}/dex/devices/dex_tests",
             body=await async_maybe_transform(
                 {
                     "data": data,
@@ -376,9 +422,9 @@ async def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[SchemaHTTP]]._unwrapper,
+                post_parser=ResultWrapper[Optional[DEXTestCreateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[SchemaHTTP]], ResultWrapper[SchemaHTTP]),
+            cast_to=cast(Type[Optional[DEXTestCreateResponse]], ResultWrapper[DEXTestCreateResponse]),
         )
 
     async def update(
@@ -386,25 +432,25 @@ async def update(
         dex_test_id: str,
         *,
         account_id: str,
-        data: SchemaDataParam,
+        data: dex_test_update_params.Data,
         enabled: bool,
         interval: str,
         name: str,
-        description: str | NotGiven = NOT_GIVEN,
-        target_policies: Iterable[dex_test_update_params.TargetPolicy] | NotGiven = NOT_GIVEN,
-        targeted: bool | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        target_policies: Iterable[dex_test_update_params.TargetPolicy] | Omit = omit,
+        targeted: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SchemaHTTP]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DEXTestUpdateResponse]:
         """
         Update a DEX test.
 
         Args:
-          dex_test_id: API UUID.
+          dex_test_id: API Resource UUID tag.
 
           data: The configuration object which contains the details for the WARP client to
               conduct the test.
@@ -417,7 +463,7 @@ async def update(
 
           description: Additional details about the test.
 
-          target_policies: Device settings profiles targeted by this test
+          target_policies: DEX rules targeted by this test
 
           extra_headers: Send extra headers
 
@@ -432,7 +478,7 @@ async def update(
         if not dex_test_id:
             raise ValueError(f"Expected a non-empty value for `dex_test_id` but received {dex_test_id!r}")
         return await self._put(
-            f"/accounts/{account_id}/devices/dex_tests/{dex_test_id}",
+            f"/accounts/{account_id}/dex/devices/dex_tests/{dex_test_id}",
             body=await async_maybe_transform(
                 {
                     "data": data,
@@ -450,26 +496,38 @@ async def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[SchemaHTTP]]._unwrapper,
+                post_parser=ResultWrapper[Optional[DEXTestUpdateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[SchemaHTTP]], ResultWrapper[SchemaHTTP]),
+            cast_to=cast(Type[Optional[DEXTestUpdateResponse]], ResultWrapper[DEXTestUpdateResponse]),
         )
 
     def list(
         self,
         *,
         account_id: str,
+        kind: Literal["http", "traceroute"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        test_name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[SchemaHTTP, AsyncSinglePage[SchemaHTTP]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[DEXTestListResponse, AsyncV4PagePaginationArray[DEXTestListResponse]]:
         """
-        Fetch all DEX tests.
+        Fetch all DEX tests
 
         Args:
+          kind: Filter by test type
+
+          page: Page number of paginated results
+
+          per_page: Number of items per page
+
+          test_name: Filter by test name
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -481,12 +539,24 @@ def list(
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
-            f"/accounts/{account_id}/devices/dex_tests",
-            page=AsyncSinglePage[SchemaHTTP],
+            f"/accounts/{account_id}/dex/devices/dex_tests",
+            page=AsyncV4PagePaginationArray[DEXTestListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "kind": kind,
+                        "page": page,
+                        "per_page": per_page,
+                        "test_name": test_name,
+                    },
+                    dex_test_list_params.DEXTestListParams,
+                ),
             ),
-            model=SchemaHTTP,
+            model=DEXTestListResponse,
         )
 
     async def delete(
@@ -499,7 +569,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DEXTestDeleteResponse]:
         """Delete a Device DEX test.
 
@@ -507,7 +577,7 @@ async def delete(
         account.
 
         Args:
-          dex_test_id: API UUID.
+          dex_test_id: API Resource UUID tag.
 
           extra_headers: Send extra headers
 
@@ -522,7 +592,7 @@ async def delete(
         if not dex_test_id:
             raise ValueError(f"Expected a non-empty value for `dex_test_id` but received {dex_test_id!r}")
         return await self._delete(
-            f"/accounts/{account_id}/devices/dex_tests/{dex_test_id}",
+            f"/accounts/{account_id}/dex/devices/dex_tests/{dex_test_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -543,13 +613,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SchemaHTTP]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DEXTestGetResponse]:
         """
         Fetch a single DEX test.
 
         Args:
-          dex_test_id: API UUID.
+          dex_test_id: The unique identifier for the test.
 
           extra_headers: Send extra headers
 
@@ -564,15 +634,15 @@ async def get(
         if not dex_test_id:
             raise ValueError(f"Expected a non-empty value for `dex_test_id` but received {dex_test_id!r}")
         return await self._get(
-            f"/accounts/{account_id}/devices/dex_tests/{dex_test_id}",
+            f"/accounts/{account_id}/dex/devices/dex_tests/{dex_test_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[SchemaHTTP]]._unwrapper,
+                post_parser=ResultWrapper[Optional[DEXTestGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[SchemaHTTP]], ResultWrapper[SchemaHTTP]),
+            cast_to=cast(Type[Optional[DEXTestGetResponse]], ResultWrapper[DEXTestGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/zero_trust/devices/fleet_status.py b/src/cloudflare/resources/zero_trust/devices/fleet_status.py
new file mode 100644
index 00000000000..993e9e1cb1b
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/devices/fleet_status.py
@@ -0,0 +1,217 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._base_client import make_request_options
+from ....types.zero_trust.devices import fleet_status_get_params
+from ....types.zero_trust.devices.fleet_status_get_response import FleetStatusGetResponse
+
+__all__ = ["FleetStatusResource", "AsyncFleetStatusResource"]
+
+
+class FleetStatusResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> FleetStatusResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return FleetStatusResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> FleetStatusResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return FleetStatusResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        device_id: str,
+        *,
+        account_id: str,
+        since_minutes: float,
+        colo: str | Omit = omit,
+        time_now: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> FleetStatusGetResponse:
+        """
+        Get the live status of a latest device given device_id from the device_state
+        table
+
+        Args:
+          device_id: Device-specific ID, given as UUID v4
+
+          since_minutes: Number of minutes before current time
+
+          colo: List of data centers to filter results
+
+          time_now: Number of minutes before current time
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not device_id:
+            raise ValueError(f"Expected a non-empty value for `device_id` but received {device_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/dex/devices/{device_id}/fleet-status/live",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "since_minutes": since_minutes,
+                        "colo": colo,
+                        "time_now": time_now,
+                    },
+                    fleet_status_get_params.FleetStatusGetParams,
+                ),
+            ),
+            cast_to=FleetStatusGetResponse,
+        )
+
+
+class AsyncFleetStatusResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncFleetStatusResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncFleetStatusResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncFleetStatusResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncFleetStatusResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        device_id: str,
+        *,
+        account_id: str,
+        since_minutes: float,
+        colo: str | Omit = omit,
+        time_now: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> FleetStatusGetResponse:
+        """
+        Get the live status of a latest device given device_id from the device_state
+        table
+
+        Args:
+          device_id: Device-specific ID, given as UUID v4
+
+          since_minutes: Number of minutes before current time
+
+          colo: List of data centers to filter results
+
+          time_now: Number of minutes before current time
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not device_id:
+            raise ValueError(f"Expected a non-empty value for `device_id` but received {device_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/dex/devices/{device_id}/fleet-status/live",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "since_minutes": since_minutes,
+                        "colo": colo,
+                        "time_now": time_now,
+                    },
+                    fleet_status_get_params.FleetStatusGetParams,
+                ),
+            ),
+            cast_to=FleetStatusGetResponse,
+        )
+
+
+class FleetStatusResourceWithRawResponse:
+    def __init__(self, fleet_status: FleetStatusResource) -> None:
+        self._fleet_status = fleet_status
+
+        self.get = to_raw_response_wrapper(
+            fleet_status.get,
+        )
+
+
+class AsyncFleetStatusResourceWithRawResponse:
+    def __init__(self, fleet_status: AsyncFleetStatusResource) -> None:
+        self._fleet_status = fleet_status
+
+        self.get = async_to_raw_response_wrapper(
+            fleet_status.get,
+        )
+
+
+class FleetStatusResourceWithStreamingResponse:
+    def __init__(self, fleet_status: FleetStatusResource) -> None:
+        self._fleet_status = fleet_status
+
+        self.get = to_streamed_response_wrapper(
+            fleet_status.get,
+        )
+
+
+class AsyncFleetStatusResourceWithStreamingResponse:
+    def __init__(self, fleet_status: AsyncFleetStatusResource) -> None:
+        self._fleet_status = fleet_status
+
+        self.get = async_to_streamed_response_wrapper(
+            fleet_status.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/devices/networks.py b/src/cloudflare/resources/zero_trust/devices/networks.py
index c8940c45e89..51be71ecb74 100644
--- a/src/cloudflare/resources/zero_trust/devices/networks.py
+++ b/src/cloudflare/resources/zero_trust/devices/networks.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -25,7 +22,6 @@
 from ...._base_client import AsyncPaginator, make_request_options
 from ....types.zero_trust.devices import network_create_params, network_update_params
 from ....types.zero_trust.devices.device_network import DeviceNetwork
-from ....types.zero_trust.devices.network_delete_response import NetworkDeleteResponse
 
 __all__ = ["NetworksResource", "AsyncNetworksResource"]
 
@@ -33,10 +29,21 @@
 class NetworksResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> NetworksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return NetworksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> NetworksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return NetworksResourceWithStreamingResponse(self)
 
     def create(
@@ -51,7 +58,7 @@ def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DeviceNetwork]:
         """
         Creates a new device managed network.
@@ -99,15 +106,15 @@ def update(
         network_id: str,
         *,
         account_id: str,
-        config: network_update_params.Config | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        type: Literal["tls"] | NotGiven = NOT_GIVEN,
+        config: network_update_params.Config | Omit = omit,
+        name: str | Omit = omit,
+        type: Literal["tls"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DeviceNetwork]:
         """
         Updates a configured device managed network.
@@ -163,7 +170,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[DeviceNetwork]:
         """
         Fetches a list of managed networks for an account.
@@ -198,8 +205,8 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[NetworkDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[DeviceNetwork]:
         """
         Deletes a device managed network and fetches a list of the remaining device
         managed networks for an account.
@@ -219,16 +226,14 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not network_id:
             raise ValueError(f"Expected a non-empty value for `network_id` but received {network_id!r}")
-        return self._delete(
+        return self._get_api_list(
             f"/accounts/{account_id}/devices/networks/{network_id}",
+            page=SyncSinglePage[DeviceNetwork],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[NetworkDeleteResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[NetworkDeleteResponse]], ResultWrapper[NetworkDeleteResponse]),
+            model=DeviceNetwork,
+            method="delete",
         )
 
     def get(
@@ -241,7 +246,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DeviceNetwork]:
         """
         Fetches details for a single managed network.
@@ -277,10 +282,21 @@ def get(
 class AsyncNetworksResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncNetworksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncNetworksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncNetworksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncNetworksResourceWithStreamingResponse(self)
 
     async def create(
@@ -295,7 +311,7 @@ async def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DeviceNetwork]:
         """
         Creates a new device managed network.
@@ -343,15 +359,15 @@ async def update(
         network_id: str,
         *,
         account_id: str,
-        config: network_update_params.Config | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        type: Literal["tls"] | NotGiven = NOT_GIVEN,
+        config: network_update_params.Config | Omit = omit,
+        name: str | Omit = omit,
+        type: Literal["tls"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DeviceNetwork]:
         """
         Updates a configured device managed network.
@@ -407,7 +423,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[DeviceNetwork, AsyncSinglePage[DeviceNetwork]]:
         """
         Fetches a list of managed networks for an account.
@@ -432,7 +448,7 @@ def list(
             model=DeviceNetwork,
         )
 
-    async def delete(
+    def delete(
         self,
         network_id: str,
         *,
@@ -442,8 +458,8 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[NetworkDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[DeviceNetwork, AsyncSinglePage[DeviceNetwork]]:
         """
         Deletes a device managed network and fetches a list of the remaining device
         managed networks for an account.
@@ -463,16 +479,14 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not network_id:
             raise ValueError(f"Expected a non-empty value for `network_id` but received {network_id!r}")
-        return await self._delete(
+        return self._get_api_list(
             f"/accounts/{account_id}/devices/networks/{network_id}",
+            page=AsyncSinglePage[DeviceNetwork],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[NetworkDeleteResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[NetworkDeleteResponse]], ResultWrapper[NetworkDeleteResponse]),
+            model=DeviceNetwork,
+            method="delete",
         )
 
     async def get(
@@ -485,7 +499,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DeviceNetwork]:
         """
         Fetches details for a single managed network.
diff --git a/src/cloudflare/resources/zero_trust/devices/override_codes.py b/src/cloudflare/resources/zero_trust/devices/override_codes.py
index cad19ee9c4c..405cd081c63 100644
--- a/src/cloudflare/resources/zero_trust/devices/override_codes.py
+++ b/src/cloudflare/resources/zero_trust/devices/override_codes.py
@@ -2,11 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+import typing_extensions
+from typing import Type, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -16,8 +17,9 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
-from ....types.zero_trust.devices.override_code_list_response import OverrideCodeListResponse
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.zero_trust.devices.override_code_get_response import OverrideCodeGetResponse
 
 __all__ = ["OverrideCodesResource", "AsyncOverrideCodesResource"]
 
@@ -25,12 +27,24 @@
 class OverrideCodesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> OverrideCodesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return OverrideCodesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> OverrideCodesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return OverrideCodesResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def list(
         self,
         device_id: str,
@@ -41,15 +55,21 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OverrideCodeListResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[object]:
         """Fetches a one-time use admin override code for a device.
 
         This relies on the
-        **Admin Override** setting being enabled in your device configuration.
+        **Admin Override** setting being enabled in your device configuration. Not
+        supported when
+        [multi-user mode](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-multiuser/)
+        is enabled for the account. **Deprecated:** please use GET
+        /accounts/{account_id}/devices/registrations/{registration_id}/override_codes
+        instead.
 
         Args:
-          device_id: Device ID.
+          device_id: Registration ID. Equal to Device ID except for accounts which enabled
+              [multi-user mode](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-multiuser/).
 
           extra_headers: Send extra headers
 
@@ -63,29 +83,80 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not device_id:
             raise ValueError(f"Expected a non-empty value for `device_id` but received {device_id!r}")
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/devices/{device_id}/override_codes",
+            page=SyncSinglePage[object],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=object,
+        )
+
+    def get(
+        self,
+        registration_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OverrideCodeGetResponse:
+        """Fetches one-time use admin override codes for a registration.
+
+        This relies on the
+        **Admin Override** setting being enabled in your device configuration.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not registration_id:
+            raise ValueError(f"Expected a non-empty value for `registration_id` but received {registration_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/devices/registrations/{registration_id}/override_codes",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[OverrideCodeListResponse]]._unwrapper,
+                post_parser=ResultWrapper[OverrideCodeGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[OverrideCodeListResponse]], ResultWrapper[OverrideCodeListResponse]),
+            cast_to=cast(Type[OverrideCodeGetResponse], ResultWrapper[OverrideCodeGetResponse]),
         )
 
 
 class AsyncOverrideCodesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncOverrideCodesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncOverrideCodesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncOverrideCodesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncOverrideCodesResourceWithStreamingResponse(self)
 
-    async def list(
+    @typing_extensions.deprecated("deprecated")
+    def list(
         self,
         device_id: str,
         *,
@@ -95,15 +166,21 @@ async def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OverrideCodeListResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[object, AsyncSinglePage[object]]:
         """Fetches a one-time use admin override code for a device.
 
         This relies on the
-        **Admin Override** setting being enabled in your device configuration.
+        **Admin Override** setting being enabled in your device configuration. Not
+        supported when
+        [multi-user mode](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-multiuser/)
+        is enabled for the account. **Deprecated:** please use GET
+        /accounts/{account_id}/devices/registrations/{registration_id}/override_codes
+        instead.
 
         Args:
-          device_id: Device ID.
+          device_id: Registration ID. Equal to Device ID except for accounts which enabled
+              [multi-user mode](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-multiuser/).
 
           extra_headers: Send extra headers
 
@@ -117,16 +194,55 @@ async def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not device_id:
             raise ValueError(f"Expected a non-empty value for `device_id` but received {device_id!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/devices/{device_id}/override_codes",
+            page=AsyncSinglePage[object],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=object,
+        )
+
+    async def get(
+        self,
+        registration_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> OverrideCodeGetResponse:
+        """Fetches one-time use admin override codes for a registration.
+
+        This relies on the
+        **Admin Override** setting being enabled in your device configuration.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not registration_id:
+            raise ValueError(f"Expected a non-empty value for `registration_id` but received {registration_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/devices/registrations/{registration_id}/override_codes",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[OverrideCodeListResponse]]._unwrapper,
+                post_parser=ResultWrapper[OverrideCodeGetResponse]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[OverrideCodeListResponse]], ResultWrapper[OverrideCodeListResponse]),
+            cast_to=cast(Type[OverrideCodeGetResponse], ResultWrapper[OverrideCodeGetResponse]),
         )
 
 
@@ -134,8 +250,13 @@ class OverrideCodesResourceWithRawResponse:
     def __init__(self, override_codes: OverrideCodesResource) -> None:
         self._override_codes = override_codes
 
-        self.list = to_raw_response_wrapper(
-            override_codes.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                override_codes.list,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.get = to_raw_response_wrapper(
+            override_codes.get,
         )
 
 
@@ -143,8 +264,13 @@ class AsyncOverrideCodesResourceWithRawResponse:
     def __init__(self, override_codes: AsyncOverrideCodesResource) -> None:
         self._override_codes = override_codes
 
-        self.list = async_to_raw_response_wrapper(
-            override_codes.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                override_codes.list,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.get = async_to_raw_response_wrapper(
+            override_codes.get,
         )
 
 
@@ -152,8 +278,13 @@ class OverrideCodesResourceWithStreamingResponse:
     def __init__(self, override_codes: OverrideCodesResource) -> None:
         self._override_codes = override_codes
 
-        self.list = to_streamed_response_wrapper(
-            override_codes.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                override_codes.list,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.get = to_streamed_response_wrapper(
+            override_codes.get,
         )
 
 
@@ -161,6 +292,11 @@ class AsyncOverrideCodesResourceWithStreamingResponse:
     def __init__(self, override_codes: AsyncOverrideCodesResource) -> None:
         self._override_codes = override_codes
 
-        self.list = async_to_streamed_response_wrapper(
-            override_codes.list,
+        self.list = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                override_codes.list,  # pyright: ignore[reportDeprecated],
+            )
+        )
+        self.get = async_to_streamed_response_wrapper(
+            override_codes.get,
         )
diff --git a/src/cloudflare/resources/zero_trust/devices/policies/__init__.py b/src/cloudflare/resources/zero_trust/devices/policies/__init__.py
index 31e6fce91a4..e9b3fafb157 100644
--- a/src/cloudflare/resources/zero_trust/devices/policies/__init__.py
+++ b/src/cloudflare/resources/zero_trust/devices/policies/__init__.py
@@ -1,20 +1,20 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from .excludes import (
-    ExcludesResource,
-    AsyncExcludesResource,
-    ExcludesResourceWithRawResponse,
-    AsyncExcludesResourceWithRawResponse,
-    ExcludesResourceWithStreamingResponse,
-    AsyncExcludesResourceWithStreamingResponse,
+from .custom import (
+    CustomResource,
+    AsyncCustomResource,
+    CustomResourceWithRawResponse,
+    AsyncCustomResourceWithRawResponse,
+    CustomResourceWithStreamingResponse,
+    AsyncCustomResourceWithStreamingResponse,
 )
-from .includes import (
-    IncludesResource,
-    AsyncIncludesResource,
-    IncludesResourceWithRawResponse,
-    AsyncIncludesResourceWithRawResponse,
-    IncludesResourceWithStreamingResponse,
-    AsyncIncludesResourceWithStreamingResponse,
+from .default import (
+    DefaultResource,
+    AsyncDefaultResource,
+    DefaultResourceWithRawResponse,
+    AsyncDefaultResourceWithRawResponse,
+    DefaultResourceWithStreamingResponse,
+    AsyncDefaultResourceWithStreamingResponse,
 )
 from .policies import (
     PoliciesResource,
@@ -24,48 +24,20 @@
     PoliciesResourceWithStreamingResponse,
     AsyncPoliciesResourceWithStreamingResponse,
 )
-from .default_policy import (
-    DefaultPolicyResource,
-    AsyncDefaultPolicyResource,
-    DefaultPolicyResourceWithRawResponse,
-    AsyncDefaultPolicyResourceWithRawResponse,
-    DefaultPolicyResourceWithStreamingResponse,
-    AsyncDefaultPolicyResourceWithStreamingResponse,
-)
-from .fallback_domains import (
-    FallbackDomainsResource,
-    AsyncFallbackDomainsResource,
-    FallbackDomainsResourceWithRawResponse,
-    AsyncFallbackDomainsResourceWithRawResponse,
-    FallbackDomainsResourceWithStreamingResponse,
-    AsyncFallbackDomainsResourceWithStreamingResponse,
-)
 
 __all__ = [
-    "DefaultPolicyResource",
-    "AsyncDefaultPolicyResource",
-    "DefaultPolicyResourceWithRawResponse",
-    "AsyncDefaultPolicyResourceWithRawResponse",
-    "DefaultPolicyResourceWithStreamingResponse",
-    "AsyncDefaultPolicyResourceWithStreamingResponse",
-    "ExcludesResource",
-    "AsyncExcludesResource",
-    "ExcludesResourceWithRawResponse",
-    "AsyncExcludesResourceWithRawResponse",
-    "ExcludesResourceWithStreamingResponse",
-    "AsyncExcludesResourceWithStreamingResponse",
-    "FallbackDomainsResource",
-    "AsyncFallbackDomainsResource",
-    "FallbackDomainsResourceWithRawResponse",
-    "AsyncFallbackDomainsResourceWithRawResponse",
-    "FallbackDomainsResourceWithStreamingResponse",
-    "AsyncFallbackDomainsResourceWithStreamingResponse",
-    "IncludesResource",
-    "AsyncIncludesResource",
-    "IncludesResourceWithRawResponse",
-    "AsyncIncludesResourceWithRawResponse",
-    "IncludesResourceWithStreamingResponse",
-    "AsyncIncludesResourceWithStreamingResponse",
+    "DefaultResource",
+    "AsyncDefaultResource",
+    "DefaultResourceWithRawResponse",
+    "AsyncDefaultResourceWithRawResponse",
+    "DefaultResourceWithStreamingResponse",
+    "AsyncDefaultResourceWithStreamingResponse",
+    "CustomResource",
+    "AsyncCustomResource",
+    "CustomResourceWithRawResponse",
+    "AsyncCustomResourceWithRawResponse",
+    "CustomResourceWithStreamingResponse",
+    "AsyncCustomResourceWithStreamingResponse",
     "PoliciesResource",
     "AsyncPoliciesResource",
     "PoliciesResourceWithRawResponse",
diff --git a/src/cloudflare/resources/zero_trust/devices/policies/custom/__init__.py b/src/cloudflare/resources/zero_trust/devices/policies/custom/__init__.py
new file mode 100644
index 00000000000..34d4c820354
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/devices/policies/custom/__init__.py
@@ -0,0 +1,61 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .custom import (
+    CustomResource,
+    AsyncCustomResource,
+    CustomResourceWithRawResponse,
+    AsyncCustomResourceWithRawResponse,
+    CustomResourceWithStreamingResponse,
+    AsyncCustomResourceWithStreamingResponse,
+)
+from .excludes import (
+    ExcludesResource,
+    AsyncExcludesResource,
+    ExcludesResourceWithRawResponse,
+    AsyncExcludesResourceWithRawResponse,
+    ExcludesResourceWithStreamingResponse,
+    AsyncExcludesResourceWithStreamingResponse,
+)
+from .includes import (
+    IncludesResource,
+    AsyncIncludesResource,
+    IncludesResourceWithRawResponse,
+    AsyncIncludesResourceWithRawResponse,
+    IncludesResourceWithStreamingResponse,
+    AsyncIncludesResourceWithStreamingResponse,
+)
+from .fallback_domains import (
+    FallbackDomainsResource,
+    AsyncFallbackDomainsResource,
+    FallbackDomainsResourceWithRawResponse,
+    AsyncFallbackDomainsResourceWithRawResponse,
+    FallbackDomainsResourceWithStreamingResponse,
+    AsyncFallbackDomainsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ExcludesResource",
+    "AsyncExcludesResource",
+    "ExcludesResourceWithRawResponse",
+    "AsyncExcludesResourceWithRawResponse",
+    "ExcludesResourceWithStreamingResponse",
+    "AsyncExcludesResourceWithStreamingResponse",
+    "IncludesResource",
+    "AsyncIncludesResource",
+    "IncludesResourceWithRawResponse",
+    "AsyncIncludesResourceWithRawResponse",
+    "IncludesResourceWithStreamingResponse",
+    "AsyncIncludesResourceWithStreamingResponse",
+    "FallbackDomainsResource",
+    "AsyncFallbackDomainsResource",
+    "FallbackDomainsResourceWithRawResponse",
+    "AsyncFallbackDomainsResourceWithRawResponse",
+    "FallbackDomainsResourceWithStreamingResponse",
+    "AsyncFallbackDomainsResourceWithStreamingResponse",
+    "CustomResource",
+    "AsyncCustomResource",
+    "CustomResourceWithRawResponse",
+    "AsyncCustomResourceWithRawResponse",
+    "CustomResourceWithStreamingResponse",
+    "AsyncCustomResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/devices/policies/custom/custom.py b/src/cloudflare/resources/zero_trust/devices/policies/custom/custom.py
new file mode 100644
index 00000000000..23dcd074d92
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/devices/policies/custom/custom.py
@@ -0,0 +1,1055 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, Optional, cast
+
+import httpx
+
+from .excludes import (
+    ExcludesResource,
+    AsyncExcludesResource,
+    ExcludesResourceWithRawResponse,
+    AsyncExcludesResourceWithRawResponse,
+    ExcludesResourceWithStreamingResponse,
+    AsyncExcludesResourceWithStreamingResponse,
+)
+from .includes import (
+    IncludesResource,
+    AsyncIncludesResource,
+    IncludesResourceWithRawResponse,
+    AsyncIncludesResourceWithRawResponse,
+    IncludesResourceWithStreamingResponse,
+    AsyncIncludesResourceWithStreamingResponse,
+)
+from ......_types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ......_utils import maybe_transform, async_maybe_transform
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+from ......_response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ......_wrappers import ResultWrapper
+from ......pagination import SyncSinglePage, AsyncSinglePage
+from .fallback_domains import (
+    FallbackDomainsResource,
+    AsyncFallbackDomainsResource,
+    FallbackDomainsResourceWithRawResponse,
+    AsyncFallbackDomainsResourceWithRawResponse,
+    FallbackDomainsResourceWithStreamingResponse,
+    AsyncFallbackDomainsResourceWithStreamingResponse,
+)
+from ......_base_client import AsyncPaginator, make_request_options
+from ......types.zero_trust.devices.policies import custom_edit_params, custom_create_params
+from ......types.zero_trust.devices.settings_policy import SettingsPolicy
+from ......types.zero_trust.devices.split_tunnel_exclude_param import SplitTunnelExcludeParam
+from ......types.zero_trust.devices.split_tunnel_include_param import SplitTunnelIncludeParam
+
+__all__ = ["CustomResource", "AsyncCustomResource"]
+
+
+class CustomResource(SyncAPIResource):
+    @cached_property
+    def excludes(self) -> ExcludesResource:
+        return ExcludesResource(self._client)
+
+    @cached_property
+    def includes(self) -> IncludesResource:
+        return IncludesResource(self._client)
+
+    @cached_property
+    def fallback_domains(self) -> FallbackDomainsResource:
+        return FallbackDomainsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> CustomResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CustomResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CustomResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CustomResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        match: str,
+        name: str,
+        precedence: float,
+        allow_mode_switch: bool | Omit = omit,
+        allow_updates: bool | Omit = omit,
+        allowed_to_leave: bool | Omit = omit,
+        auto_connect: float | Omit = omit,
+        captive_portal: float | Omit = omit,
+        description: str | Omit = omit,
+        disable_auto_fallback: bool | Omit = omit,
+        enabled: bool | Omit = omit,
+        exclude: Iterable[SplitTunnelExcludeParam] | Omit = omit,
+        exclude_office_ips: bool | Omit = omit,
+        include: Iterable[SplitTunnelIncludeParam] | Omit = omit,
+        lan_allow_minutes: float | Omit = omit,
+        lan_allow_subnet_size: float | Omit = omit,
+        register_interface_ip_with_dns: bool | Omit = omit,
+        sccm_vpn_boundary_support: bool | Omit = omit,
+        service_mode_v2: custom_create_params.ServiceModeV2 | Omit = omit,
+        support_url: str | Omit = omit,
+        switch_locked: bool | Omit = omit,
+        tunnel_protocol: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SettingsPolicy]:
+        """
+        Creates a device settings profile to be applied to certain devices matching the
+        criteria.
+
+        Args:
+          match: The wirefilter expression to match devices. Available values: "identity.email",
+              "identity.groups.id", "identity.groups.name", "identity.groups.email",
+              "identity.service_token_uuid", "identity.saml_attributes", "network", "os.name",
+              "os.version".
+
+          name: The name of the device settings profile.
+
+          precedence: The precedence of the policy. Lower values indicate higher precedence. Policies
+              will be evaluated in ascending order of this field.
+
+          allow_mode_switch: Whether to allow the user to switch WARP between modes.
+
+          allow_updates: Whether to receive update notifications when a new version of the client is
+              available.
+
+          allowed_to_leave: Whether to allow devices to leave the organization.
+
+          auto_connect: The amount of time in seconds to reconnect after having been disabled.
+
+          captive_portal: Turn on the captive portal after the specified amount of time.
+
+          description: A description of the policy.
+
+          disable_auto_fallback: If the `dns_server` field of a fallback domain is not present, the client will
+              fall back to a best guess of the default/system DNS resolvers unless this policy
+              option is set to `true`.
+
+          enabled: Whether the policy will be applied to matching devices.
+
+          exclude: List of routes excluded in the WARP client's tunnel. Both 'exclude' and
+              'include' cannot be set in the same request.
+
+          exclude_office_ips: Whether to add Microsoft IPs to Split Tunnel exclusions.
+
+          include: List of routes included in the WARP client's tunnel. Both 'exclude' and
+              'include' cannot be set in the same request.
+
+          lan_allow_minutes: The amount of time in minutes a user is allowed access to their LAN. A value of
+              0 will allow LAN access until the next WARP reconnection, such as a reboot or a
+              laptop waking from sleep. Note that this field is omitted from the response if
+              null or unset.
+
+          lan_allow_subnet_size: The size of the subnet for the local access network. Note that this field is
+              omitted from the response if null or unset.
+
+          register_interface_ip_with_dns: Determines if the operating system will register WARP's local interface IP with
+              your on-premises DNS server.
+
+          sccm_vpn_boundary_support: Determines whether the WARP client indicates to SCCM that it is inside a VPN
+              boundary. (Windows only).
+
+          support_url: The URL to launch when the Send Feedback button is clicked.
+
+          switch_locked: Whether to allow the user to turn off the WARP switch and disconnect the client.
+
+          tunnel_protocol: Determines which tunnel protocol to use.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/devices/policy",
+            body=maybe_transform(
+                {
+                    "match": match,
+                    "name": name,
+                    "precedence": precedence,
+                    "allow_mode_switch": allow_mode_switch,
+                    "allow_updates": allow_updates,
+                    "allowed_to_leave": allowed_to_leave,
+                    "auto_connect": auto_connect,
+                    "captive_portal": captive_portal,
+                    "description": description,
+                    "disable_auto_fallback": disable_auto_fallback,
+                    "enabled": enabled,
+                    "exclude": exclude,
+                    "exclude_office_ips": exclude_office_ips,
+                    "include": include,
+                    "lan_allow_minutes": lan_allow_minutes,
+                    "lan_allow_subnet_size": lan_allow_subnet_size,
+                    "register_interface_ip_with_dns": register_interface_ip_with_dns,
+                    "sccm_vpn_boundary_support": sccm_vpn_boundary_support,
+                    "service_mode_v2": service_mode_v2,
+                    "support_url": support_url,
+                    "switch_locked": switch_locked,
+                    "tunnel_protocol": tunnel_protocol,
+                },
+                custom_create_params.CustomCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SettingsPolicy]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SettingsPolicy]], ResultWrapper[SettingsPolicy]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[SettingsPolicy]:
+        """
+        Fetches a list of the device settings profiles for an account.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policies",
+            page=SyncSinglePage[SettingsPolicy],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=SettingsPolicy,
+        )
+
+    def delete(
+        self,
+        policy_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[SettingsPolicy]:
+        """
+        Deletes a device settings profile and fetches a list of the remaining profiles
+        for an account.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_id:
+            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/{policy_id}",
+            page=SyncSinglePage[SettingsPolicy],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=SettingsPolicy,
+            method="delete",
+        )
+
+    def edit(
+        self,
+        policy_id: str,
+        *,
+        account_id: str,
+        allow_mode_switch: bool | Omit = omit,
+        allow_updates: bool | Omit = omit,
+        allowed_to_leave: bool | Omit = omit,
+        auto_connect: float | Omit = omit,
+        captive_portal: float | Omit = omit,
+        description: str | Omit = omit,
+        disable_auto_fallback: bool | Omit = omit,
+        enabled: bool | Omit = omit,
+        exclude: Iterable[SplitTunnelExcludeParam] | Omit = omit,
+        exclude_office_ips: bool | Omit = omit,
+        include: Iterable[SplitTunnelIncludeParam] | Omit = omit,
+        lan_allow_minutes: float | Omit = omit,
+        lan_allow_subnet_size: float | Omit = omit,
+        match: str | Omit = omit,
+        name: str | Omit = omit,
+        precedence: float | Omit = omit,
+        register_interface_ip_with_dns: bool | Omit = omit,
+        sccm_vpn_boundary_support: bool | Omit = omit,
+        service_mode_v2: custom_edit_params.ServiceModeV2 | Omit = omit,
+        support_url: str | Omit = omit,
+        switch_locked: bool | Omit = omit,
+        tunnel_protocol: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SettingsPolicy]:
+        """
+        Updates a configured device settings profile.
+
+        Args:
+          allow_mode_switch: Whether to allow the user to switch WARP between modes.
+
+          allow_updates: Whether to receive update notifications when a new version of the client is
+              available.
+
+          allowed_to_leave: Whether to allow devices to leave the organization.
+
+          auto_connect: The amount of time in seconds to reconnect after having been disabled.
+
+          captive_portal: Turn on the captive portal after the specified amount of time.
+
+          description: A description of the policy.
+
+          disable_auto_fallback: If the `dns_server` field of a fallback domain is not present, the client will
+              fall back to a best guess of the default/system DNS resolvers unless this policy
+              option is set to `true`.
+
+          enabled: Whether the policy will be applied to matching devices.
+
+          exclude: List of routes excluded in the WARP client's tunnel. Both 'exclude' and
+              'include' cannot be set in the same request.
+
+          exclude_office_ips: Whether to add Microsoft IPs to Split Tunnel exclusions.
+
+          include: List of routes included in the WARP client's tunnel. Both 'exclude' and
+              'include' cannot be set in the same request.
+
+          lan_allow_minutes: The amount of time in minutes a user is allowed access to their LAN. A value of
+              0 will allow LAN access until the next WARP reconnection, such as a reboot or a
+              laptop waking from sleep. Note that this field is omitted from the response if
+              null or unset.
+
+          lan_allow_subnet_size: The size of the subnet for the local access network. Note that this field is
+              omitted from the response if null or unset.
+
+          match: The wirefilter expression to match devices. Available values: "identity.email",
+              "identity.groups.id", "identity.groups.name", "identity.groups.email",
+              "identity.service_token_uuid", "identity.saml_attributes", "network", "os.name",
+              "os.version".
+
+          name: The name of the device settings profile.
+
+          precedence: The precedence of the policy. Lower values indicate higher precedence. Policies
+              will be evaluated in ascending order of this field.
+
+          register_interface_ip_with_dns: Determines if the operating system will register WARP's local interface IP with
+              your on-premises DNS server.
+
+          sccm_vpn_boundary_support: Determines whether the WARP client indicates to SCCM that it is inside a VPN
+              boundary. (Windows only).
+
+          support_url: The URL to launch when the Send Feedback button is clicked.
+
+          switch_locked: Whether to allow the user to turn off the WARP switch and disconnect the client.
+
+          tunnel_protocol: Determines which tunnel protocol to use.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_id:
+            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/devices/policy/{policy_id}",
+            body=maybe_transform(
+                {
+                    "allow_mode_switch": allow_mode_switch,
+                    "allow_updates": allow_updates,
+                    "allowed_to_leave": allowed_to_leave,
+                    "auto_connect": auto_connect,
+                    "captive_portal": captive_portal,
+                    "description": description,
+                    "disable_auto_fallback": disable_auto_fallback,
+                    "enabled": enabled,
+                    "exclude": exclude,
+                    "exclude_office_ips": exclude_office_ips,
+                    "include": include,
+                    "lan_allow_minutes": lan_allow_minutes,
+                    "lan_allow_subnet_size": lan_allow_subnet_size,
+                    "match": match,
+                    "name": name,
+                    "precedence": precedence,
+                    "register_interface_ip_with_dns": register_interface_ip_with_dns,
+                    "sccm_vpn_boundary_support": sccm_vpn_boundary_support,
+                    "service_mode_v2": service_mode_v2,
+                    "support_url": support_url,
+                    "switch_locked": switch_locked,
+                    "tunnel_protocol": tunnel_protocol,
+                },
+                custom_edit_params.CustomEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SettingsPolicy]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SettingsPolicy]], ResultWrapper[SettingsPolicy]),
+        )
+
+    def get(
+        self,
+        policy_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SettingsPolicy]:
+        """
+        Fetches a device settings profile by ID.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_id:
+            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/devices/policy/{policy_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SettingsPolicy]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SettingsPolicy]], ResultWrapper[SettingsPolicy]),
+        )
+
+
+class AsyncCustomResource(AsyncAPIResource):
+    @cached_property
+    def excludes(self) -> AsyncExcludesResource:
+        return AsyncExcludesResource(self._client)
+
+    @cached_property
+    def includes(self) -> AsyncIncludesResource:
+        return AsyncIncludesResource(self._client)
+
+    @cached_property
+    def fallback_domains(self) -> AsyncFallbackDomainsResource:
+        return AsyncFallbackDomainsResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncCustomResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCustomResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCustomResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCustomResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        match: str,
+        name: str,
+        precedence: float,
+        allow_mode_switch: bool | Omit = omit,
+        allow_updates: bool | Omit = omit,
+        allowed_to_leave: bool | Omit = omit,
+        auto_connect: float | Omit = omit,
+        captive_portal: float | Omit = omit,
+        description: str | Omit = omit,
+        disable_auto_fallback: bool | Omit = omit,
+        enabled: bool | Omit = omit,
+        exclude: Iterable[SplitTunnelExcludeParam] | Omit = omit,
+        exclude_office_ips: bool | Omit = omit,
+        include: Iterable[SplitTunnelIncludeParam] | Omit = omit,
+        lan_allow_minutes: float | Omit = omit,
+        lan_allow_subnet_size: float | Omit = omit,
+        register_interface_ip_with_dns: bool | Omit = omit,
+        sccm_vpn_boundary_support: bool | Omit = omit,
+        service_mode_v2: custom_create_params.ServiceModeV2 | Omit = omit,
+        support_url: str | Omit = omit,
+        switch_locked: bool | Omit = omit,
+        tunnel_protocol: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SettingsPolicy]:
+        """
+        Creates a device settings profile to be applied to certain devices matching the
+        criteria.
+
+        Args:
+          match: The wirefilter expression to match devices. Available values: "identity.email",
+              "identity.groups.id", "identity.groups.name", "identity.groups.email",
+              "identity.service_token_uuid", "identity.saml_attributes", "network", "os.name",
+              "os.version".
+
+          name: The name of the device settings profile.
+
+          precedence: The precedence of the policy. Lower values indicate higher precedence. Policies
+              will be evaluated in ascending order of this field.
+
+          allow_mode_switch: Whether to allow the user to switch WARP between modes.
+
+          allow_updates: Whether to receive update notifications when a new version of the client is
+              available.
+
+          allowed_to_leave: Whether to allow devices to leave the organization.
+
+          auto_connect: The amount of time in seconds to reconnect after having been disabled.
+
+          captive_portal: Turn on the captive portal after the specified amount of time.
+
+          description: A description of the policy.
+
+          disable_auto_fallback: If the `dns_server` field of a fallback domain is not present, the client will
+              fall back to a best guess of the default/system DNS resolvers unless this policy
+              option is set to `true`.
+
+          enabled: Whether the policy will be applied to matching devices.
+
+          exclude: List of routes excluded in the WARP client's tunnel. Both 'exclude' and
+              'include' cannot be set in the same request.
+
+          exclude_office_ips: Whether to add Microsoft IPs to Split Tunnel exclusions.
+
+          include: List of routes included in the WARP client's tunnel. Both 'exclude' and
+              'include' cannot be set in the same request.
+
+          lan_allow_minutes: The amount of time in minutes a user is allowed access to their LAN. A value of
+              0 will allow LAN access until the next WARP reconnection, such as a reboot or a
+              laptop waking from sleep. Note that this field is omitted from the response if
+              null or unset.
+
+          lan_allow_subnet_size: The size of the subnet for the local access network. Note that this field is
+              omitted from the response if null or unset.
+
+          register_interface_ip_with_dns: Determines if the operating system will register WARP's local interface IP with
+              your on-premises DNS server.
+
+          sccm_vpn_boundary_support: Determines whether the WARP client indicates to SCCM that it is inside a VPN
+              boundary. (Windows only).
+
+          support_url: The URL to launch when the Send Feedback button is clicked.
+
+          switch_locked: Whether to allow the user to turn off the WARP switch and disconnect the client.
+
+          tunnel_protocol: Determines which tunnel protocol to use.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/devices/policy",
+            body=await async_maybe_transform(
+                {
+                    "match": match,
+                    "name": name,
+                    "precedence": precedence,
+                    "allow_mode_switch": allow_mode_switch,
+                    "allow_updates": allow_updates,
+                    "allowed_to_leave": allowed_to_leave,
+                    "auto_connect": auto_connect,
+                    "captive_portal": captive_portal,
+                    "description": description,
+                    "disable_auto_fallback": disable_auto_fallback,
+                    "enabled": enabled,
+                    "exclude": exclude,
+                    "exclude_office_ips": exclude_office_ips,
+                    "include": include,
+                    "lan_allow_minutes": lan_allow_minutes,
+                    "lan_allow_subnet_size": lan_allow_subnet_size,
+                    "register_interface_ip_with_dns": register_interface_ip_with_dns,
+                    "sccm_vpn_boundary_support": sccm_vpn_boundary_support,
+                    "service_mode_v2": service_mode_v2,
+                    "support_url": support_url,
+                    "switch_locked": switch_locked,
+                    "tunnel_protocol": tunnel_protocol,
+                },
+                custom_create_params.CustomCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SettingsPolicy]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SettingsPolicy]], ResultWrapper[SettingsPolicy]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SettingsPolicy, AsyncSinglePage[SettingsPolicy]]:
+        """
+        Fetches a list of the device settings profiles for an account.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policies",
+            page=AsyncSinglePage[SettingsPolicy],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=SettingsPolicy,
+        )
+
+    def delete(
+        self,
+        policy_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SettingsPolicy, AsyncSinglePage[SettingsPolicy]]:
+        """
+        Deletes a device settings profile and fetches a list of the remaining profiles
+        for an account.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_id:
+            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/{policy_id}",
+            page=AsyncSinglePage[SettingsPolicy],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=SettingsPolicy,
+            method="delete",
+        )
+
+    async def edit(
+        self,
+        policy_id: str,
+        *,
+        account_id: str,
+        allow_mode_switch: bool | Omit = omit,
+        allow_updates: bool | Omit = omit,
+        allowed_to_leave: bool | Omit = omit,
+        auto_connect: float | Omit = omit,
+        captive_portal: float | Omit = omit,
+        description: str | Omit = omit,
+        disable_auto_fallback: bool | Omit = omit,
+        enabled: bool | Omit = omit,
+        exclude: Iterable[SplitTunnelExcludeParam] | Omit = omit,
+        exclude_office_ips: bool | Omit = omit,
+        include: Iterable[SplitTunnelIncludeParam] | Omit = omit,
+        lan_allow_minutes: float | Omit = omit,
+        lan_allow_subnet_size: float | Omit = omit,
+        match: str | Omit = omit,
+        name: str | Omit = omit,
+        precedence: float | Omit = omit,
+        register_interface_ip_with_dns: bool | Omit = omit,
+        sccm_vpn_boundary_support: bool | Omit = omit,
+        service_mode_v2: custom_edit_params.ServiceModeV2 | Omit = omit,
+        support_url: str | Omit = omit,
+        switch_locked: bool | Omit = omit,
+        tunnel_protocol: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SettingsPolicy]:
+        """
+        Updates a configured device settings profile.
+
+        Args:
+          allow_mode_switch: Whether to allow the user to switch WARP between modes.
+
+          allow_updates: Whether to receive update notifications when a new version of the client is
+              available.
+
+          allowed_to_leave: Whether to allow devices to leave the organization.
+
+          auto_connect: The amount of time in seconds to reconnect after having been disabled.
+
+          captive_portal: Turn on the captive portal after the specified amount of time.
+
+          description: A description of the policy.
+
+          disable_auto_fallback: If the `dns_server` field of a fallback domain is not present, the client will
+              fall back to a best guess of the default/system DNS resolvers unless this policy
+              option is set to `true`.
+
+          enabled: Whether the policy will be applied to matching devices.
+
+          exclude: List of routes excluded in the WARP client's tunnel. Both 'exclude' and
+              'include' cannot be set in the same request.
+
+          exclude_office_ips: Whether to add Microsoft IPs to Split Tunnel exclusions.
+
+          include: List of routes included in the WARP client's tunnel. Both 'exclude' and
+              'include' cannot be set in the same request.
+
+          lan_allow_minutes: The amount of time in minutes a user is allowed access to their LAN. A value of
+              0 will allow LAN access until the next WARP reconnection, such as a reboot or a
+              laptop waking from sleep. Note that this field is omitted from the response if
+              null or unset.
+
+          lan_allow_subnet_size: The size of the subnet for the local access network. Note that this field is
+              omitted from the response if null or unset.
+
+          match: The wirefilter expression to match devices. Available values: "identity.email",
+              "identity.groups.id", "identity.groups.name", "identity.groups.email",
+              "identity.service_token_uuid", "identity.saml_attributes", "network", "os.name",
+              "os.version".
+
+          name: The name of the device settings profile.
+
+          precedence: The precedence of the policy. Lower values indicate higher precedence. Policies
+              will be evaluated in ascending order of this field.
+
+          register_interface_ip_with_dns: Determines if the operating system will register WARP's local interface IP with
+              your on-premises DNS server.
+
+          sccm_vpn_boundary_support: Determines whether the WARP client indicates to SCCM that it is inside a VPN
+              boundary. (Windows only).
+
+          support_url: The URL to launch when the Send Feedback button is clicked.
+
+          switch_locked: Whether to allow the user to turn off the WARP switch and disconnect the client.
+
+          tunnel_protocol: Determines which tunnel protocol to use.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_id:
+            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/devices/policy/{policy_id}",
+            body=await async_maybe_transform(
+                {
+                    "allow_mode_switch": allow_mode_switch,
+                    "allow_updates": allow_updates,
+                    "allowed_to_leave": allowed_to_leave,
+                    "auto_connect": auto_connect,
+                    "captive_portal": captive_portal,
+                    "description": description,
+                    "disable_auto_fallback": disable_auto_fallback,
+                    "enabled": enabled,
+                    "exclude": exclude,
+                    "exclude_office_ips": exclude_office_ips,
+                    "include": include,
+                    "lan_allow_minutes": lan_allow_minutes,
+                    "lan_allow_subnet_size": lan_allow_subnet_size,
+                    "match": match,
+                    "name": name,
+                    "precedence": precedence,
+                    "register_interface_ip_with_dns": register_interface_ip_with_dns,
+                    "sccm_vpn_boundary_support": sccm_vpn_boundary_support,
+                    "service_mode_v2": service_mode_v2,
+                    "support_url": support_url,
+                    "switch_locked": switch_locked,
+                    "tunnel_protocol": tunnel_protocol,
+                },
+                custom_edit_params.CustomEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SettingsPolicy]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SettingsPolicy]], ResultWrapper[SettingsPolicy]),
+        )
+
+    async def get(
+        self,
+        policy_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SettingsPolicy]:
+        """
+        Fetches a device settings profile by ID.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_id:
+            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/devices/policy/{policy_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[SettingsPolicy]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[SettingsPolicy]], ResultWrapper[SettingsPolicy]),
+        )
+
+
+class CustomResourceWithRawResponse:
+    def __init__(self, custom: CustomResource) -> None:
+        self._custom = custom
+
+        self.create = to_raw_response_wrapper(
+            custom.create,
+        )
+        self.list = to_raw_response_wrapper(
+            custom.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            custom.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            custom.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            custom.get,
+        )
+
+    @cached_property
+    def excludes(self) -> ExcludesResourceWithRawResponse:
+        return ExcludesResourceWithRawResponse(self._custom.excludes)
+
+    @cached_property
+    def includes(self) -> IncludesResourceWithRawResponse:
+        return IncludesResourceWithRawResponse(self._custom.includes)
+
+    @cached_property
+    def fallback_domains(self) -> FallbackDomainsResourceWithRawResponse:
+        return FallbackDomainsResourceWithRawResponse(self._custom.fallback_domains)
+
+
+class AsyncCustomResourceWithRawResponse:
+    def __init__(self, custom: AsyncCustomResource) -> None:
+        self._custom = custom
+
+        self.create = async_to_raw_response_wrapper(
+            custom.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            custom.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            custom.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            custom.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            custom.get,
+        )
+
+    @cached_property
+    def excludes(self) -> AsyncExcludesResourceWithRawResponse:
+        return AsyncExcludesResourceWithRawResponse(self._custom.excludes)
+
+    @cached_property
+    def includes(self) -> AsyncIncludesResourceWithRawResponse:
+        return AsyncIncludesResourceWithRawResponse(self._custom.includes)
+
+    @cached_property
+    def fallback_domains(self) -> AsyncFallbackDomainsResourceWithRawResponse:
+        return AsyncFallbackDomainsResourceWithRawResponse(self._custom.fallback_domains)
+
+
+class CustomResourceWithStreamingResponse:
+    def __init__(self, custom: CustomResource) -> None:
+        self._custom = custom
+
+        self.create = to_streamed_response_wrapper(
+            custom.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            custom.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            custom.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            custom.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            custom.get,
+        )
+
+    @cached_property
+    def excludes(self) -> ExcludesResourceWithStreamingResponse:
+        return ExcludesResourceWithStreamingResponse(self._custom.excludes)
+
+    @cached_property
+    def includes(self) -> IncludesResourceWithStreamingResponse:
+        return IncludesResourceWithStreamingResponse(self._custom.includes)
+
+    @cached_property
+    def fallback_domains(self) -> FallbackDomainsResourceWithStreamingResponse:
+        return FallbackDomainsResourceWithStreamingResponse(self._custom.fallback_domains)
+
+
+class AsyncCustomResourceWithStreamingResponse:
+    def __init__(self, custom: AsyncCustomResource) -> None:
+        self._custom = custom
+
+        self.create = async_to_streamed_response_wrapper(
+            custom.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            custom.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            custom.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            custom.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            custom.get,
+        )
+
+    @cached_property
+    def excludes(self) -> AsyncExcludesResourceWithStreamingResponse:
+        return AsyncExcludesResourceWithStreamingResponse(self._custom.excludes)
+
+    @cached_property
+    def includes(self) -> AsyncIncludesResourceWithStreamingResponse:
+        return AsyncIncludesResourceWithStreamingResponse(self._custom.includes)
+
+    @cached_property
+    def fallback_domains(self) -> AsyncFallbackDomainsResourceWithStreamingResponse:
+        return AsyncFallbackDomainsResourceWithStreamingResponse(self._custom.fallback_domains)
diff --git a/src/cloudflare/resources/zero_trust/devices/policies/custom/excludes.py b/src/cloudflare/resources/zero_trust/devices/policies/custom/excludes.py
new file mode 100644
index 00000000000..d9ad788b570
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/devices/policies/custom/excludes.py
@@ -0,0 +1,272 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Any, Iterable, cast
+
+import httpx
+
+from ......_types import Body, Query, Headers, NotGiven, not_given
+from ......_utils import maybe_transform
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+from ......_response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ......pagination import SyncSinglePage, AsyncSinglePage
+from ......_base_client import AsyncPaginator, make_request_options
+from ......types.zero_trust.devices.split_tunnel_exclude import SplitTunnelExclude
+from ......types.zero_trust.devices.split_tunnel_exclude_param import SplitTunnelExcludeParam
+
+__all__ = ["ExcludesResource", "AsyncExcludesResource"]
+
+
+class ExcludesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ExcludesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ExcludesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ExcludesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ExcludesResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        policy_id: str,
+        *,
+        account_id: str,
+        body: Iterable[SplitTunnelExcludeParam],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[SplitTunnelExclude]:
+        """
+        Sets the list of routes excluded from the WARP client's tunnel for a specific
+        device settings profile.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_id:
+            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/{policy_id}/exclude",
+            page=SyncSinglePage[SplitTunnelExclude],
+            body=maybe_transform(body, Iterable[SplitTunnelExcludeParam]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, SplitTunnelExclude),  # Union types cannot be passed in as arguments in the type system
+            method="put",
+        )
+
+    def get(
+        self,
+        policy_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[SplitTunnelExclude]:
+        """
+        Fetches the list of routes excluded from the WARP client's tunnel for a specific
+        device settings profile.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_id:
+            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/{policy_id}/exclude",
+            page=SyncSinglePage[SplitTunnelExclude],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, SplitTunnelExclude),  # Union types cannot be passed in as arguments in the type system
+        )
+
+
+class AsyncExcludesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncExcludesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncExcludesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncExcludesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncExcludesResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        policy_id: str,
+        *,
+        account_id: str,
+        body: Iterable[SplitTunnelExcludeParam],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SplitTunnelExclude, AsyncSinglePage[SplitTunnelExclude]]:
+        """
+        Sets the list of routes excluded from the WARP client's tunnel for a specific
+        device settings profile.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_id:
+            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/{policy_id}/exclude",
+            page=AsyncSinglePage[SplitTunnelExclude],
+            body=maybe_transform(body, Iterable[SplitTunnelExcludeParam]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, SplitTunnelExclude),  # Union types cannot be passed in as arguments in the type system
+            method="put",
+        )
+
+    def get(
+        self,
+        policy_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SplitTunnelExclude, AsyncSinglePage[SplitTunnelExclude]]:
+        """
+        Fetches the list of routes excluded from the WARP client's tunnel for a specific
+        device settings profile.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_id:
+            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/{policy_id}/exclude",
+            page=AsyncSinglePage[SplitTunnelExclude],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, SplitTunnelExclude),  # Union types cannot be passed in as arguments in the type system
+        )
+
+
+class ExcludesResourceWithRawResponse:
+    def __init__(self, excludes: ExcludesResource) -> None:
+        self._excludes = excludes
+
+        self.update = to_raw_response_wrapper(
+            excludes.update,
+        )
+        self.get = to_raw_response_wrapper(
+            excludes.get,
+        )
+
+
+class AsyncExcludesResourceWithRawResponse:
+    def __init__(self, excludes: AsyncExcludesResource) -> None:
+        self._excludes = excludes
+
+        self.update = async_to_raw_response_wrapper(
+            excludes.update,
+        )
+        self.get = async_to_raw_response_wrapper(
+            excludes.get,
+        )
+
+
+class ExcludesResourceWithStreamingResponse:
+    def __init__(self, excludes: ExcludesResource) -> None:
+        self._excludes = excludes
+
+        self.update = to_streamed_response_wrapper(
+            excludes.update,
+        )
+        self.get = to_streamed_response_wrapper(
+            excludes.get,
+        )
+
+
+class AsyncExcludesResourceWithStreamingResponse:
+    def __init__(self, excludes: AsyncExcludesResource) -> None:
+        self._excludes = excludes
+
+        self.update = async_to_streamed_response_wrapper(
+            excludes.update,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            excludes.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/devices/policies/custom/fallback_domains.py b/src/cloudflare/resources/zero_trust/devices/policies/custom/fallback_domains.py
new file mode 100644
index 00000000000..1cde309592c
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/devices/policies/custom/fallback_domains.py
@@ -0,0 +1,278 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+
+import httpx
+
+from ......_types import Body, Query, Headers, NotGiven, not_given
+from ......_utils import maybe_transform
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+from ......_response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ......pagination import SyncSinglePage, AsyncSinglePage
+from ......_base_client import AsyncPaginator, make_request_options
+from ......types.zero_trust.devices.fallback_domain import FallbackDomain
+from ......types.zero_trust.devices.fallback_domain_param import FallbackDomainParam
+
+__all__ = ["FallbackDomainsResource", "AsyncFallbackDomainsResource"]
+
+
+class FallbackDomainsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> FallbackDomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return FallbackDomainsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> FallbackDomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return FallbackDomainsResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        policy_id: str,
+        *,
+        account_id: str,
+        domains: Iterable[FallbackDomainParam],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[FallbackDomain]:
+        """Sets the list of domains to bypass Gateway DNS resolution.
+
+        These domains will
+        use the specified local DNS resolver instead. This will only apply to the
+        specified device settings profile.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_id:
+            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/{policy_id}/fallback_domains",
+            page=SyncSinglePage[FallbackDomain],
+            body=maybe_transform(domains, Iterable[FallbackDomainParam]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=FallbackDomain,
+            method="put",
+        )
+
+    def get(
+        self,
+        policy_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[FallbackDomain]:
+        """
+        Fetches the list of domains to bypass Gateway DNS resolution from a specified
+        device settings profile. These domains will use the specified local DNS resolver
+        instead.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_id:
+            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/{policy_id}/fallback_domains",
+            page=SyncSinglePage[FallbackDomain],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=FallbackDomain,
+        )
+
+
+class AsyncFallbackDomainsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncFallbackDomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncFallbackDomainsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncFallbackDomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncFallbackDomainsResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        policy_id: str,
+        *,
+        account_id: str,
+        domains: Iterable[FallbackDomainParam],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[FallbackDomain, AsyncSinglePage[FallbackDomain]]:
+        """Sets the list of domains to bypass Gateway DNS resolution.
+
+        These domains will
+        use the specified local DNS resolver instead. This will only apply to the
+        specified device settings profile.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_id:
+            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/{policy_id}/fallback_domains",
+            page=AsyncSinglePage[FallbackDomain],
+            body=maybe_transform(domains, Iterable[FallbackDomainParam]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=FallbackDomain,
+            method="put",
+        )
+
+    def get(
+        self,
+        policy_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[FallbackDomain, AsyncSinglePage[FallbackDomain]]:
+        """
+        Fetches the list of domains to bypass Gateway DNS resolution from a specified
+        device settings profile. These domains will use the specified local DNS resolver
+        instead.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_id:
+            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/{policy_id}/fallback_domains",
+            page=AsyncSinglePage[FallbackDomain],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=FallbackDomain,
+        )
+
+
+class FallbackDomainsResourceWithRawResponse:
+    def __init__(self, fallback_domains: FallbackDomainsResource) -> None:
+        self._fallback_domains = fallback_domains
+
+        self.update = to_raw_response_wrapper(
+            fallback_domains.update,
+        )
+        self.get = to_raw_response_wrapper(
+            fallback_domains.get,
+        )
+
+
+class AsyncFallbackDomainsResourceWithRawResponse:
+    def __init__(self, fallback_domains: AsyncFallbackDomainsResource) -> None:
+        self._fallback_domains = fallback_domains
+
+        self.update = async_to_raw_response_wrapper(
+            fallback_domains.update,
+        )
+        self.get = async_to_raw_response_wrapper(
+            fallback_domains.get,
+        )
+
+
+class FallbackDomainsResourceWithStreamingResponse:
+    def __init__(self, fallback_domains: FallbackDomainsResource) -> None:
+        self._fallback_domains = fallback_domains
+
+        self.update = to_streamed_response_wrapper(
+            fallback_domains.update,
+        )
+        self.get = to_streamed_response_wrapper(
+            fallback_domains.get,
+        )
+
+
+class AsyncFallbackDomainsResourceWithStreamingResponse:
+    def __init__(self, fallback_domains: AsyncFallbackDomainsResource) -> None:
+        self._fallback_domains = fallback_domains
+
+        self.update = async_to_streamed_response_wrapper(
+            fallback_domains.update,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            fallback_domains.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/devices/policies/custom/includes.py b/src/cloudflare/resources/zero_trust/devices/policies/custom/includes.py
new file mode 100644
index 00000000000..dff40cf931c
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/devices/policies/custom/includes.py
@@ -0,0 +1,272 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Any, Iterable, cast
+
+import httpx
+
+from ......_types import Body, Query, Headers, NotGiven, not_given
+from ......_utils import maybe_transform
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+from ......_response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ......pagination import SyncSinglePage, AsyncSinglePage
+from ......_base_client import AsyncPaginator, make_request_options
+from ......types.zero_trust.devices.split_tunnel_include import SplitTunnelInclude
+from ......types.zero_trust.devices.split_tunnel_include_param import SplitTunnelIncludeParam
+
+__all__ = ["IncludesResource", "AsyncIncludesResource"]
+
+
+class IncludesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> IncludesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return IncludesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> IncludesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return IncludesResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        policy_id: str,
+        *,
+        account_id: str,
+        body: Iterable[SplitTunnelIncludeParam],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[SplitTunnelInclude]:
+        """
+        Sets the list of routes included in the WARP client's tunnel for a specific
+        device settings profile.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_id:
+            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/{policy_id}/include",
+            page=SyncSinglePage[SplitTunnelInclude],
+            body=maybe_transform(body, Iterable[SplitTunnelIncludeParam]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, SplitTunnelInclude),  # Union types cannot be passed in as arguments in the type system
+            method="put",
+        )
+
+    def get(
+        self,
+        policy_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[SplitTunnelInclude]:
+        """
+        Fetches the list of routes included in the WARP client's tunnel for a specific
+        device settings profile.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_id:
+            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/{policy_id}/include",
+            page=SyncSinglePage[SplitTunnelInclude],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, SplitTunnelInclude),  # Union types cannot be passed in as arguments in the type system
+        )
+
+
+class AsyncIncludesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncIncludesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncIncludesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncIncludesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncIncludesResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        policy_id: str,
+        *,
+        account_id: str,
+        body: Iterable[SplitTunnelIncludeParam],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SplitTunnelInclude, AsyncSinglePage[SplitTunnelInclude]]:
+        """
+        Sets the list of routes included in the WARP client's tunnel for a specific
+        device settings profile.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_id:
+            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/{policy_id}/include",
+            page=AsyncSinglePage[SplitTunnelInclude],
+            body=maybe_transform(body, Iterable[SplitTunnelIncludeParam]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, SplitTunnelInclude),  # Union types cannot be passed in as arguments in the type system
+            method="put",
+        )
+
+    def get(
+        self,
+        policy_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SplitTunnelInclude, AsyncSinglePage[SplitTunnelInclude]]:
+        """
+        Fetches the list of routes included in the WARP client's tunnel for a specific
+        device settings profile.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not policy_id:
+            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/{policy_id}/include",
+            page=AsyncSinglePage[SplitTunnelInclude],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, SplitTunnelInclude),  # Union types cannot be passed in as arguments in the type system
+        )
+
+
+class IncludesResourceWithRawResponse:
+    def __init__(self, includes: IncludesResource) -> None:
+        self._includes = includes
+
+        self.update = to_raw_response_wrapper(
+            includes.update,
+        )
+        self.get = to_raw_response_wrapper(
+            includes.get,
+        )
+
+
+class AsyncIncludesResourceWithRawResponse:
+    def __init__(self, includes: AsyncIncludesResource) -> None:
+        self._includes = includes
+
+        self.update = async_to_raw_response_wrapper(
+            includes.update,
+        )
+        self.get = async_to_raw_response_wrapper(
+            includes.get,
+        )
+
+
+class IncludesResourceWithStreamingResponse:
+    def __init__(self, includes: IncludesResource) -> None:
+        self._includes = includes
+
+        self.update = to_streamed_response_wrapper(
+            includes.update,
+        )
+        self.get = to_streamed_response_wrapper(
+            includes.get,
+        )
+
+
+class AsyncIncludesResourceWithStreamingResponse:
+    def __init__(self, includes: AsyncIncludesResource) -> None:
+        self._includes = includes
+
+        self.update = async_to_streamed_response_wrapper(
+            includes.update,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            includes.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/devices/policies/default/__init__.py b/src/cloudflare/resources/zero_trust/devices/policies/default/__init__.py
new file mode 100644
index 00000000000..c22a715e1e2
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/devices/policies/default/__init__.py
@@ -0,0 +1,75 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .default import (
+    DefaultResource,
+    AsyncDefaultResource,
+    DefaultResourceWithRawResponse,
+    AsyncDefaultResourceWithRawResponse,
+    DefaultResourceWithStreamingResponse,
+    AsyncDefaultResourceWithStreamingResponse,
+)
+from .excludes import (
+    ExcludesResource,
+    AsyncExcludesResource,
+    ExcludesResourceWithRawResponse,
+    AsyncExcludesResourceWithRawResponse,
+    ExcludesResourceWithStreamingResponse,
+    AsyncExcludesResourceWithStreamingResponse,
+)
+from .includes import (
+    IncludesResource,
+    AsyncIncludesResource,
+    IncludesResourceWithRawResponse,
+    AsyncIncludesResourceWithRawResponse,
+    IncludesResourceWithStreamingResponse,
+    AsyncIncludesResourceWithStreamingResponse,
+)
+from .certificates import (
+    CertificatesResource,
+    AsyncCertificatesResource,
+    CertificatesResourceWithRawResponse,
+    AsyncCertificatesResourceWithRawResponse,
+    CertificatesResourceWithStreamingResponse,
+    AsyncCertificatesResourceWithStreamingResponse,
+)
+from .fallback_domains import (
+    FallbackDomainsResource,
+    AsyncFallbackDomainsResource,
+    FallbackDomainsResourceWithRawResponse,
+    AsyncFallbackDomainsResourceWithRawResponse,
+    FallbackDomainsResourceWithStreamingResponse,
+    AsyncFallbackDomainsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ExcludesResource",
+    "AsyncExcludesResource",
+    "ExcludesResourceWithRawResponse",
+    "AsyncExcludesResourceWithRawResponse",
+    "ExcludesResourceWithStreamingResponse",
+    "AsyncExcludesResourceWithStreamingResponse",
+    "IncludesResource",
+    "AsyncIncludesResource",
+    "IncludesResourceWithRawResponse",
+    "AsyncIncludesResourceWithRawResponse",
+    "IncludesResourceWithStreamingResponse",
+    "AsyncIncludesResourceWithStreamingResponse",
+    "FallbackDomainsResource",
+    "AsyncFallbackDomainsResource",
+    "FallbackDomainsResourceWithRawResponse",
+    "AsyncFallbackDomainsResourceWithRawResponse",
+    "FallbackDomainsResourceWithStreamingResponse",
+    "AsyncFallbackDomainsResourceWithStreamingResponse",
+    "CertificatesResource",
+    "AsyncCertificatesResource",
+    "CertificatesResourceWithRawResponse",
+    "AsyncCertificatesResourceWithRawResponse",
+    "CertificatesResourceWithStreamingResponse",
+    "AsyncCertificatesResourceWithStreamingResponse",
+    "DefaultResource",
+    "AsyncDefaultResource",
+    "DefaultResourceWithRawResponse",
+    "AsyncDefaultResourceWithRawResponse",
+    "DefaultResourceWithStreamingResponse",
+    "AsyncDefaultResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/devices/policies/default/certificates.py b/src/cloudflare/resources/zero_trust/devices/policies/default/certificates.py
new file mode 100644
index 00000000000..1237c6a47bc
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/devices/policies/default/certificates.py
@@ -0,0 +1,276 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ......_types import Body, Query, Headers, NotGiven, not_given
+from ......_utils import maybe_transform, async_maybe_transform
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+from ......_response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ......_wrappers import ResultWrapper
+from ......_base_client import make_request_options
+from ......types.zero_trust.devices.policies.default import certificate_edit_params
+from ......types.zero_trust.devices.device_policy_certificates import DevicePolicyCertificates
+
+__all__ = ["CertificatesResource", "AsyncCertificatesResource"]
+
+
+class CertificatesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> CertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CertificatesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CertificatesResourceWithStreamingResponse(self)
+
+    def edit(
+        self,
+        *,
+        zone_id: str,
+        enabled: bool,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DevicePolicyCertificates]:
+        """
+        Enable Zero Trust Clients to provision a certificate, containing a x509 subject,
+        and referenced by Access device posture policies when the client visits MTLS
+        protected domains. This facilitates device posture without a WARP session.
+
+        Args:
+          enabled: The current status of the device policy certificate provisioning feature for
+              WARP clients.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._patch(
+            f"/zones/{zone_id}/devices/policy/certificates",
+            body=maybe_transform({"enabled": enabled}, certificate_edit_params.CertificateEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DevicePolicyCertificates]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DevicePolicyCertificates]], ResultWrapper[DevicePolicyCertificates]),
+        )
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DevicePolicyCertificates]:
+        """
+        Fetches device certificate provisioning.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/devices/policy/certificates",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DevicePolicyCertificates]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DevicePolicyCertificates]], ResultWrapper[DevicePolicyCertificates]),
+        )
+
+
+class AsyncCertificatesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncCertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCertificatesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCertificatesResourceWithStreamingResponse(self)
+
+    async def edit(
+        self,
+        *,
+        zone_id: str,
+        enabled: bool,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DevicePolicyCertificates]:
+        """
+        Enable Zero Trust Clients to provision a certificate, containing a x509 subject,
+        and referenced by Access device posture policies when the client visits MTLS
+        protected domains. This facilitates device posture without a WARP session.
+
+        Args:
+          enabled: The current status of the device policy certificate provisioning feature for
+              WARP clients.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._patch(
+            f"/zones/{zone_id}/devices/policy/certificates",
+            body=await async_maybe_transform({"enabled": enabled}, certificate_edit_params.CertificateEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DevicePolicyCertificates]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DevicePolicyCertificates]], ResultWrapper[DevicePolicyCertificates]),
+        )
+
+    async def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DevicePolicyCertificates]:
+        """
+        Fetches device certificate provisioning.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/devices/policy/certificates",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DevicePolicyCertificates]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DevicePolicyCertificates]], ResultWrapper[DevicePolicyCertificates]),
+        )
+
+
+class CertificatesResourceWithRawResponse:
+    def __init__(self, certificates: CertificatesResource) -> None:
+        self._certificates = certificates
+
+        self.edit = to_raw_response_wrapper(
+            certificates.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            certificates.get,
+        )
+
+
+class AsyncCertificatesResourceWithRawResponse:
+    def __init__(self, certificates: AsyncCertificatesResource) -> None:
+        self._certificates = certificates
+
+        self.edit = async_to_raw_response_wrapper(
+            certificates.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            certificates.get,
+        )
+
+
+class CertificatesResourceWithStreamingResponse:
+    def __init__(self, certificates: CertificatesResource) -> None:
+        self._certificates = certificates
+
+        self.edit = to_streamed_response_wrapper(
+            certificates.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            certificates.get,
+        )
+
+
+class AsyncCertificatesResourceWithStreamingResponse:
+    def __init__(self, certificates: AsyncCertificatesResource) -> None:
+        self._certificates = certificates
+
+        self.edit = async_to_streamed_response_wrapper(
+            certificates.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            certificates.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/devices/policies/default/default.py b/src/cloudflare/resources/zero_trust/devices/policies/default/default.py
new file mode 100644
index 00000000000..15d3c7fec8f
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/devices/policies/default/default.py
@@ -0,0 +1,557 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Iterable, Optional, cast
+
+import httpx
+
+from .excludes import (
+    ExcludesResource,
+    AsyncExcludesResource,
+    ExcludesResourceWithRawResponse,
+    AsyncExcludesResourceWithRawResponse,
+    ExcludesResourceWithStreamingResponse,
+    AsyncExcludesResourceWithStreamingResponse,
+)
+from .includes import (
+    IncludesResource,
+    AsyncIncludesResource,
+    IncludesResourceWithRawResponse,
+    AsyncIncludesResourceWithRawResponse,
+    IncludesResourceWithStreamingResponse,
+    AsyncIncludesResourceWithStreamingResponse,
+)
+from ......_types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ......_utils import maybe_transform, async_maybe_transform
+from ......_compat import cached_property
+from .certificates import (
+    CertificatesResource,
+    AsyncCertificatesResource,
+    CertificatesResourceWithRawResponse,
+    AsyncCertificatesResourceWithRawResponse,
+    CertificatesResourceWithStreamingResponse,
+    AsyncCertificatesResourceWithStreamingResponse,
+)
+from ......_resource import SyncAPIResource, AsyncAPIResource
+from ......_response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ......_wrappers import ResultWrapper
+from .fallback_domains import (
+    FallbackDomainsResource,
+    AsyncFallbackDomainsResource,
+    FallbackDomainsResourceWithRawResponse,
+    AsyncFallbackDomainsResourceWithRawResponse,
+    FallbackDomainsResourceWithStreamingResponse,
+    AsyncFallbackDomainsResourceWithStreamingResponse,
+)
+from ......_base_client import make_request_options
+from ......types.zero_trust.devices.policies import default_edit_params
+from ......types.zero_trust.devices.split_tunnel_exclude_param import SplitTunnelExcludeParam
+from ......types.zero_trust.devices.split_tunnel_include_param import SplitTunnelIncludeParam
+from ......types.zero_trust.devices.policies.default_get_response import DefaultGetResponse
+from ......types.zero_trust.devices.policies.default_edit_response import DefaultEditResponse
+
+__all__ = ["DefaultResource", "AsyncDefaultResource"]
+
+
+class DefaultResource(SyncAPIResource):
+    @cached_property
+    def excludes(self) -> ExcludesResource:
+        return ExcludesResource(self._client)
+
+    @cached_property
+    def includes(self) -> IncludesResource:
+        return IncludesResource(self._client)
+
+    @cached_property
+    def fallback_domains(self) -> FallbackDomainsResource:
+        return FallbackDomainsResource(self._client)
+
+    @cached_property
+    def certificates(self) -> CertificatesResource:
+        return CertificatesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> DefaultResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return DefaultResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> DefaultResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return DefaultResourceWithStreamingResponse(self)
+
+    def edit(
+        self,
+        *,
+        account_id: str,
+        allow_mode_switch: bool | Omit = omit,
+        allow_updates: bool | Omit = omit,
+        allowed_to_leave: bool | Omit = omit,
+        auto_connect: float | Omit = omit,
+        captive_portal: float | Omit = omit,
+        disable_auto_fallback: bool | Omit = omit,
+        exclude: Iterable[SplitTunnelExcludeParam] | Omit = omit,
+        exclude_office_ips: bool | Omit = omit,
+        include: Iterable[SplitTunnelIncludeParam] | Omit = omit,
+        lan_allow_minutes: float | Omit = omit,
+        lan_allow_subnet_size: float | Omit = omit,
+        register_interface_ip_with_dns: bool | Omit = omit,
+        sccm_vpn_boundary_support: bool | Omit = omit,
+        service_mode_v2: default_edit_params.ServiceModeV2 | Omit = omit,
+        support_url: str | Omit = omit,
+        switch_locked: bool | Omit = omit,
+        tunnel_protocol: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DefaultEditResponse]:
+        """
+        Updates the default device settings profile for an account.
+
+        Args:
+          allow_mode_switch: Whether to allow the user to switch WARP between modes.
+
+          allow_updates: Whether to receive update notifications when a new version of the client is
+              available.
+
+          allowed_to_leave: Whether to allow devices to leave the organization.
+
+          auto_connect: The amount of time in seconds to reconnect after having been disabled.
+
+          captive_portal: Turn on the captive portal after the specified amount of time.
+
+          disable_auto_fallback: If the `dns_server` field of a fallback domain is not present, the client will
+              fall back to a best guess of the default/system DNS resolvers unless this policy
+              option is set to `true`.
+
+          exclude: List of routes excluded in the WARP client's tunnel. Both 'exclude' and
+              'include' cannot be set in the same request.
+
+          exclude_office_ips: Whether to add Microsoft IPs to Split Tunnel exclusions.
+
+          include: List of routes included in the WARP client's tunnel. Both 'exclude' and
+              'include' cannot be set in the same request.
+
+          lan_allow_minutes: The amount of time in minutes a user is allowed access to their LAN. A value of
+              0 will allow LAN access until the next WARP reconnection, such as a reboot or a
+              laptop waking from sleep. Note that this field is omitted from the response if
+              null or unset.
+
+          lan_allow_subnet_size: The size of the subnet for the local access network. Note that this field is
+              omitted from the response if null or unset.
+
+          register_interface_ip_with_dns: Determines if the operating system will register WARP's local interface IP with
+              your on-premises DNS server.
+
+          sccm_vpn_boundary_support: Determines whether the WARP client indicates to SCCM that it is inside a VPN
+              boundary. (Windows only).
+
+          support_url: The URL to launch when the Send Feedback button is clicked.
+
+          switch_locked: Whether to allow the user to turn off the WARP switch and disconnect the client.
+
+          tunnel_protocol: Determines which tunnel protocol to use.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/devices/policy",
+            body=maybe_transform(
+                {
+                    "allow_mode_switch": allow_mode_switch,
+                    "allow_updates": allow_updates,
+                    "allowed_to_leave": allowed_to_leave,
+                    "auto_connect": auto_connect,
+                    "captive_portal": captive_portal,
+                    "disable_auto_fallback": disable_auto_fallback,
+                    "exclude": exclude,
+                    "exclude_office_ips": exclude_office_ips,
+                    "include": include,
+                    "lan_allow_minutes": lan_allow_minutes,
+                    "lan_allow_subnet_size": lan_allow_subnet_size,
+                    "register_interface_ip_with_dns": register_interface_ip_with_dns,
+                    "sccm_vpn_boundary_support": sccm_vpn_boundary_support,
+                    "service_mode_v2": service_mode_v2,
+                    "support_url": support_url,
+                    "switch_locked": switch_locked,
+                    "tunnel_protocol": tunnel_protocol,
+                },
+                default_edit_params.DefaultEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DefaultEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DefaultEditResponse]], ResultWrapper[DefaultEditResponse]),
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DefaultGetResponse]:
+        """
+        Fetches the default device settings profile for an account.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/devices/policy",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DefaultGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DefaultGetResponse]], ResultWrapper[DefaultGetResponse]),
+        )
+
+
+class AsyncDefaultResource(AsyncAPIResource):
+    @cached_property
+    def excludes(self) -> AsyncExcludesResource:
+        return AsyncExcludesResource(self._client)
+
+    @cached_property
+    def includes(self) -> AsyncIncludesResource:
+        return AsyncIncludesResource(self._client)
+
+    @cached_property
+    def fallback_domains(self) -> AsyncFallbackDomainsResource:
+        return AsyncFallbackDomainsResource(self._client)
+
+    @cached_property
+    def certificates(self) -> AsyncCertificatesResource:
+        return AsyncCertificatesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncDefaultResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncDefaultResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncDefaultResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncDefaultResourceWithStreamingResponse(self)
+
+    async def edit(
+        self,
+        *,
+        account_id: str,
+        allow_mode_switch: bool | Omit = omit,
+        allow_updates: bool | Omit = omit,
+        allowed_to_leave: bool | Omit = omit,
+        auto_connect: float | Omit = omit,
+        captive_portal: float | Omit = omit,
+        disable_auto_fallback: bool | Omit = omit,
+        exclude: Iterable[SplitTunnelExcludeParam] | Omit = omit,
+        exclude_office_ips: bool | Omit = omit,
+        include: Iterable[SplitTunnelIncludeParam] | Omit = omit,
+        lan_allow_minutes: float | Omit = omit,
+        lan_allow_subnet_size: float | Omit = omit,
+        register_interface_ip_with_dns: bool | Omit = omit,
+        sccm_vpn_boundary_support: bool | Omit = omit,
+        service_mode_v2: default_edit_params.ServiceModeV2 | Omit = omit,
+        support_url: str | Omit = omit,
+        switch_locked: bool | Omit = omit,
+        tunnel_protocol: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DefaultEditResponse]:
+        """
+        Updates the default device settings profile for an account.
+
+        Args:
+          allow_mode_switch: Whether to allow the user to switch WARP between modes.
+
+          allow_updates: Whether to receive update notifications when a new version of the client is
+              available.
+
+          allowed_to_leave: Whether to allow devices to leave the organization.
+
+          auto_connect: The amount of time in seconds to reconnect after having been disabled.
+
+          captive_portal: Turn on the captive portal after the specified amount of time.
+
+          disable_auto_fallback: If the `dns_server` field of a fallback domain is not present, the client will
+              fall back to a best guess of the default/system DNS resolvers unless this policy
+              option is set to `true`.
+
+          exclude: List of routes excluded in the WARP client's tunnel. Both 'exclude' and
+              'include' cannot be set in the same request.
+
+          exclude_office_ips: Whether to add Microsoft IPs to Split Tunnel exclusions.
+
+          include: List of routes included in the WARP client's tunnel. Both 'exclude' and
+              'include' cannot be set in the same request.
+
+          lan_allow_minutes: The amount of time in minutes a user is allowed access to their LAN. A value of
+              0 will allow LAN access until the next WARP reconnection, such as a reboot or a
+              laptop waking from sleep. Note that this field is omitted from the response if
+              null or unset.
+
+          lan_allow_subnet_size: The size of the subnet for the local access network. Note that this field is
+              omitted from the response if null or unset.
+
+          register_interface_ip_with_dns: Determines if the operating system will register WARP's local interface IP with
+              your on-premises DNS server.
+
+          sccm_vpn_boundary_support: Determines whether the WARP client indicates to SCCM that it is inside a VPN
+              boundary. (Windows only).
+
+          support_url: The URL to launch when the Send Feedback button is clicked.
+
+          switch_locked: Whether to allow the user to turn off the WARP switch and disconnect the client.
+
+          tunnel_protocol: Determines which tunnel protocol to use.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/devices/policy",
+            body=await async_maybe_transform(
+                {
+                    "allow_mode_switch": allow_mode_switch,
+                    "allow_updates": allow_updates,
+                    "allowed_to_leave": allowed_to_leave,
+                    "auto_connect": auto_connect,
+                    "captive_portal": captive_portal,
+                    "disable_auto_fallback": disable_auto_fallback,
+                    "exclude": exclude,
+                    "exclude_office_ips": exclude_office_ips,
+                    "include": include,
+                    "lan_allow_minutes": lan_allow_minutes,
+                    "lan_allow_subnet_size": lan_allow_subnet_size,
+                    "register_interface_ip_with_dns": register_interface_ip_with_dns,
+                    "sccm_vpn_boundary_support": sccm_vpn_boundary_support,
+                    "service_mode_v2": service_mode_v2,
+                    "support_url": support_url,
+                    "switch_locked": switch_locked,
+                    "tunnel_protocol": tunnel_protocol,
+                },
+                default_edit_params.DefaultEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DefaultEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DefaultEditResponse]], ResultWrapper[DefaultEditResponse]),
+        )
+
+    async def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DefaultGetResponse]:
+        """
+        Fetches the default device settings profile for an account.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/devices/policy",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DefaultGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DefaultGetResponse]], ResultWrapper[DefaultGetResponse]),
+        )
+
+
+class DefaultResourceWithRawResponse:
+    def __init__(self, default: DefaultResource) -> None:
+        self._default = default
+
+        self.edit = to_raw_response_wrapper(
+            default.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            default.get,
+        )
+
+    @cached_property
+    def excludes(self) -> ExcludesResourceWithRawResponse:
+        return ExcludesResourceWithRawResponse(self._default.excludes)
+
+    @cached_property
+    def includes(self) -> IncludesResourceWithRawResponse:
+        return IncludesResourceWithRawResponse(self._default.includes)
+
+    @cached_property
+    def fallback_domains(self) -> FallbackDomainsResourceWithRawResponse:
+        return FallbackDomainsResourceWithRawResponse(self._default.fallback_domains)
+
+    @cached_property
+    def certificates(self) -> CertificatesResourceWithRawResponse:
+        return CertificatesResourceWithRawResponse(self._default.certificates)
+
+
+class AsyncDefaultResourceWithRawResponse:
+    def __init__(self, default: AsyncDefaultResource) -> None:
+        self._default = default
+
+        self.edit = async_to_raw_response_wrapper(
+            default.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            default.get,
+        )
+
+    @cached_property
+    def excludes(self) -> AsyncExcludesResourceWithRawResponse:
+        return AsyncExcludesResourceWithRawResponse(self._default.excludes)
+
+    @cached_property
+    def includes(self) -> AsyncIncludesResourceWithRawResponse:
+        return AsyncIncludesResourceWithRawResponse(self._default.includes)
+
+    @cached_property
+    def fallback_domains(self) -> AsyncFallbackDomainsResourceWithRawResponse:
+        return AsyncFallbackDomainsResourceWithRawResponse(self._default.fallback_domains)
+
+    @cached_property
+    def certificates(self) -> AsyncCertificatesResourceWithRawResponse:
+        return AsyncCertificatesResourceWithRawResponse(self._default.certificates)
+
+
+class DefaultResourceWithStreamingResponse:
+    def __init__(self, default: DefaultResource) -> None:
+        self._default = default
+
+        self.edit = to_streamed_response_wrapper(
+            default.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            default.get,
+        )
+
+    @cached_property
+    def excludes(self) -> ExcludesResourceWithStreamingResponse:
+        return ExcludesResourceWithStreamingResponse(self._default.excludes)
+
+    @cached_property
+    def includes(self) -> IncludesResourceWithStreamingResponse:
+        return IncludesResourceWithStreamingResponse(self._default.includes)
+
+    @cached_property
+    def fallback_domains(self) -> FallbackDomainsResourceWithStreamingResponse:
+        return FallbackDomainsResourceWithStreamingResponse(self._default.fallback_domains)
+
+    @cached_property
+    def certificates(self) -> CertificatesResourceWithStreamingResponse:
+        return CertificatesResourceWithStreamingResponse(self._default.certificates)
+
+
+class AsyncDefaultResourceWithStreamingResponse:
+    def __init__(self, default: AsyncDefaultResource) -> None:
+        self._default = default
+
+        self.edit = async_to_streamed_response_wrapper(
+            default.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            default.get,
+        )
+
+    @cached_property
+    def excludes(self) -> AsyncExcludesResourceWithStreamingResponse:
+        return AsyncExcludesResourceWithStreamingResponse(self._default.excludes)
+
+    @cached_property
+    def includes(self) -> AsyncIncludesResourceWithStreamingResponse:
+        return AsyncIncludesResourceWithStreamingResponse(self._default.includes)
+
+    @cached_property
+    def fallback_domains(self) -> AsyncFallbackDomainsResourceWithStreamingResponse:
+        return AsyncFallbackDomainsResourceWithStreamingResponse(self._default.fallback_domains)
+
+    @cached_property
+    def certificates(self) -> AsyncCertificatesResourceWithStreamingResponse:
+        return AsyncCertificatesResourceWithStreamingResponse(self._default.certificates)
diff --git a/src/cloudflare/resources/zero_trust/devices/policies/default/excludes.py b/src/cloudflare/resources/zero_trust/devices/policies/default/excludes.py
new file mode 100644
index 00000000000..67461b4415a
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/devices/policies/default/excludes.py
@@ -0,0 +1,256 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Any, Iterable, cast
+
+import httpx
+
+from ......_types import Body, Query, Headers, NotGiven, not_given
+from ......_utils import maybe_transform
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+from ......_response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ......pagination import SyncSinglePage, AsyncSinglePage
+from ......_base_client import AsyncPaginator, make_request_options
+from ......types.zero_trust.devices.split_tunnel_exclude import SplitTunnelExclude
+from ......types.zero_trust.devices.split_tunnel_exclude_param import SplitTunnelExcludeParam
+
+__all__ = ["ExcludesResource", "AsyncExcludesResource"]
+
+
+class ExcludesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ExcludesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ExcludesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ExcludesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ExcludesResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        *,
+        account_id: str,
+        body: Iterable[SplitTunnelExcludeParam],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[SplitTunnelExclude]:
+        """
+        Sets the list of routes excluded from the WARP client's tunnel.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/exclude",
+            page=SyncSinglePage[SplitTunnelExclude],
+            body=maybe_transform(body, Iterable[SplitTunnelExcludeParam]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, SplitTunnelExclude),  # Union types cannot be passed in as arguments in the type system
+            method="put",
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[SplitTunnelExclude]:
+        """
+        Fetches the list of routes excluded from the WARP client's tunnel.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/exclude",
+            page=SyncSinglePage[SplitTunnelExclude],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, SplitTunnelExclude),  # Union types cannot be passed in as arguments in the type system
+        )
+
+
+class AsyncExcludesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncExcludesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncExcludesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncExcludesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncExcludesResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        *,
+        account_id: str,
+        body: Iterable[SplitTunnelExcludeParam],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SplitTunnelExclude, AsyncSinglePage[SplitTunnelExclude]]:
+        """
+        Sets the list of routes excluded from the WARP client's tunnel.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/exclude",
+            page=AsyncSinglePage[SplitTunnelExclude],
+            body=maybe_transform(body, Iterable[SplitTunnelExcludeParam]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, SplitTunnelExclude),  # Union types cannot be passed in as arguments in the type system
+            method="put",
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SplitTunnelExclude, AsyncSinglePage[SplitTunnelExclude]]:
+        """
+        Fetches the list of routes excluded from the WARP client's tunnel.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/exclude",
+            page=AsyncSinglePage[SplitTunnelExclude],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, SplitTunnelExclude),  # Union types cannot be passed in as arguments in the type system
+        )
+
+
+class ExcludesResourceWithRawResponse:
+    def __init__(self, excludes: ExcludesResource) -> None:
+        self._excludes = excludes
+
+        self.update = to_raw_response_wrapper(
+            excludes.update,
+        )
+        self.get = to_raw_response_wrapper(
+            excludes.get,
+        )
+
+
+class AsyncExcludesResourceWithRawResponse:
+    def __init__(self, excludes: AsyncExcludesResource) -> None:
+        self._excludes = excludes
+
+        self.update = async_to_raw_response_wrapper(
+            excludes.update,
+        )
+        self.get = async_to_raw_response_wrapper(
+            excludes.get,
+        )
+
+
+class ExcludesResourceWithStreamingResponse:
+    def __init__(self, excludes: ExcludesResource) -> None:
+        self._excludes = excludes
+
+        self.update = to_streamed_response_wrapper(
+            excludes.update,
+        )
+        self.get = to_streamed_response_wrapper(
+            excludes.get,
+        )
+
+
+class AsyncExcludesResourceWithStreamingResponse:
+    def __init__(self, excludes: AsyncExcludesResource) -> None:
+        self._excludes = excludes
+
+        self.update = async_to_streamed_response_wrapper(
+            excludes.update,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            excludes.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/devices/policies/default/fallback_domains.py b/src/cloudflare/resources/zero_trust/devices/policies/default/fallback_domains.py
new file mode 100644
index 00000000000..bb8d5f0c2a9
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/devices/policies/default/fallback_domains.py
@@ -0,0 +1,264 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+
+import httpx
+
+from ......_types import Body, Query, Headers, NotGiven, not_given
+from ......_utils import maybe_transform
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+from ......_response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ......pagination import SyncSinglePage, AsyncSinglePage
+from ......_base_client import AsyncPaginator, make_request_options
+from ......types.zero_trust.devices.fallback_domain import FallbackDomain
+from ......types.zero_trust.devices.fallback_domain_param import FallbackDomainParam
+
+__all__ = ["FallbackDomainsResource", "AsyncFallbackDomainsResource"]
+
+
+class FallbackDomainsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> FallbackDomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return FallbackDomainsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> FallbackDomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return FallbackDomainsResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        *,
+        account_id: str,
+        domains: Iterable[FallbackDomainParam],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[FallbackDomain]:
+        """Sets the list of domains to bypass Gateway DNS resolution.
+
+        These domains will
+        use the specified local DNS resolver instead.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/fallback_domains",
+            page=SyncSinglePage[FallbackDomain],
+            body=maybe_transform(domains, Iterable[FallbackDomainParam]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=FallbackDomain,
+            method="put",
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[FallbackDomain]:
+        """Fetches a list of domains to bypass Gateway DNS resolution.
+
+        These domains will
+        use the specified local DNS resolver instead.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/fallback_domains",
+            page=SyncSinglePage[FallbackDomain],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=FallbackDomain,
+        )
+
+
+class AsyncFallbackDomainsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncFallbackDomainsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncFallbackDomainsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncFallbackDomainsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncFallbackDomainsResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        *,
+        account_id: str,
+        domains: Iterable[FallbackDomainParam],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[FallbackDomain, AsyncSinglePage[FallbackDomain]]:
+        """Sets the list of domains to bypass Gateway DNS resolution.
+
+        These domains will
+        use the specified local DNS resolver instead.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/fallback_domains",
+            page=AsyncSinglePage[FallbackDomain],
+            body=maybe_transform(domains, Iterable[FallbackDomainParam]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=FallbackDomain,
+            method="put",
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[FallbackDomain, AsyncSinglePage[FallbackDomain]]:
+        """Fetches a list of domains to bypass Gateway DNS resolution.
+
+        These domains will
+        use the specified local DNS resolver instead.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/fallback_domains",
+            page=AsyncSinglePage[FallbackDomain],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=FallbackDomain,
+        )
+
+
+class FallbackDomainsResourceWithRawResponse:
+    def __init__(self, fallback_domains: FallbackDomainsResource) -> None:
+        self._fallback_domains = fallback_domains
+
+        self.update = to_raw_response_wrapper(
+            fallback_domains.update,
+        )
+        self.get = to_raw_response_wrapper(
+            fallback_domains.get,
+        )
+
+
+class AsyncFallbackDomainsResourceWithRawResponse:
+    def __init__(self, fallback_domains: AsyncFallbackDomainsResource) -> None:
+        self._fallback_domains = fallback_domains
+
+        self.update = async_to_raw_response_wrapper(
+            fallback_domains.update,
+        )
+        self.get = async_to_raw_response_wrapper(
+            fallback_domains.get,
+        )
+
+
+class FallbackDomainsResourceWithStreamingResponse:
+    def __init__(self, fallback_domains: FallbackDomainsResource) -> None:
+        self._fallback_domains = fallback_domains
+
+        self.update = to_streamed_response_wrapper(
+            fallback_domains.update,
+        )
+        self.get = to_streamed_response_wrapper(
+            fallback_domains.get,
+        )
+
+
+class AsyncFallbackDomainsResourceWithStreamingResponse:
+    def __init__(self, fallback_domains: AsyncFallbackDomainsResource) -> None:
+        self._fallback_domains = fallback_domains
+
+        self.update = async_to_streamed_response_wrapper(
+            fallback_domains.update,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            fallback_domains.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/devices/policies/default/includes.py b/src/cloudflare/resources/zero_trust/devices/policies/default/includes.py
new file mode 100644
index 00000000000..1e0fcd34b8a
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/devices/policies/default/includes.py
@@ -0,0 +1,256 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Any, Iterable, cast
+
+import httpx
+
+from ......_types import Body, Query, Headers, NotGiven, not_given
+from ......_utils import maybe_transform
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+from ......_response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ......pagination import SyncSinglePage, AsyncSinglePage
+from ......_base_client import AsyncPaginator, make_request_options
+from ......types.zero_trust.devices.split_tunnel_include import SplitTunnelInclude
+from ......types.zero_trust.devices.split_tunnel_include_param import SplitTunnelIncludeParam
+
+__all__ = ["IncludesResource", "AsyncIncludesResource"]
+
+
+class IncludesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> IncludesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return IncludesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> IncludesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return IncludesResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        *,
+        account_id: str,
+        body: Iterable[SplitTunnelIncludeParam],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[SplitTunnelInclude]:
+        """
+        Sets the list of routes included in the WARP client's tunnel.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/include",
+            page=SyncSinglePage[SplitTunnelInclude],
+            body=maybe_transform(body, Iterable[SplitTunnelIncludeParam]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, SplitTunnelInclude),  # Union types cannot be passed in as arguments in the type system
+            method="put",
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[SplitTunnelInclude]:
+        """
+        Fetches the list of routes included in the WARP client's tunnel.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/include",
+            page=SyncSinglePage[SplitTunnelInclude],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, SplitTunnelInclude),  # Union types cannot be passed in as arguments in the type system
+        )
+
+
+class AsyncIncludesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncIncludesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncIncludesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncIncludesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncIncludesResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        *,
+        account_id: str,
+        body: Iterable[SplitTunnelIncludeParam],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SplitTunnelInclude, AsyncSinglePage[SplitTunnelInclude]]:
+        """
+        Sets the list of routes included in the WARP client's tunnel.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/include",
+            page=AsyncSinglePage[SplitTunnelInclude],
+            body=maybe_transform(body, Iterable[SplitTunnelIncludeParam]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, SplitTunnelInclude),  # Union types cannot be passed in as arguments in the type system
+            method="put",
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SplitTunnelInclude, AsyncSinglePage[SplitTunnelInclude]]:
+        """
+        Fetches the list of routes included in the WARP client's tunnel.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/policy/include",
+            page=AsyncSinglePage[SplitTunnelInclude],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, SplitTunnelInclude),  # Union types cannot be passed in as arguments in the type system
+        )
+
+
+class IncludesResourceWithRawResponse:
+    def __init__(self, includes: IncludesResource) -> None:
+        self._includes = includes
+
+        self.update = to_raw_response_wrapper(
+            includes.update,
+        )
+        self.get = to_raw_response_wrapper(
+            includes.get,
+        )
+
+
+class AsyncIncludesResourceWithRawResponse:
+    def __init__(self, includes: AsyncIncludesResource) -> None:
+        self._includes = includes
+
+        self.update = async_to_raw_response_wrapper(
+            includes.update,
+        )
+        self.get = async_to_raw_response_wrapper(
+            includes.get,
+        )
+
+
+class IncludesResourceWithStreamingResponse:
+    def __init__(self, includes: IncludesResource) -> None:
+        self._includes = includes
+
+        self.update = to_streamed_response_wrapper(
+            includes.update,
+        )
+        self.get = to_streamed_response_wrapper(
+            includes.get,
+        )
+
+
+class AsyncIncludesResourceWithStreamingResponse:
+    def __init__(self, includes: AsyncIncludesResource) -> None:
+        self._includes = includes
+
+        self.update = async_to_streamed_response_wrapper(
+            includes.update,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            includes.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/devices/policies/default_policy.py b/src/cloudflare/resources/zero_trust/devices/policies/default_policy.py
deleted file mode 100644
index 6a19573c0a5..00000000000
--- a/src/cloudflare/resources/zero_trust/devices/policies/default_policy.py
+++ /dev/null
@@ -1,152 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Optional, cast
-
-import httpx
-
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._compat import cached_property
-from ....._resource import SyncAPIResource, AsyncAPIResource
-from ....._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ....._wrappers import ResultWrapper
-from ....._base_client import make_request_options
-from .....types.zero_trust.devices.policies.default_policy_get_response import DefaultPolicyGetResponse
-
-__all__ = ["DefaultPolicyResource", "AsyncDefaultPolicyResource"]
-
-
-class DefaultPolicyResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> DefaultPolicyResourceWithRawResponse:
-        return DefaultPolicyResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> DefaultPolicyResourceWithStreamingResponse:
-        return DefaultPolicyResourceWithStreamingResponse(self)
-
-    def get(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DefaultPolicyGetResponse]:
-        """
-        Fetches the default device settings profile for an account.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/devices/policy",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[DefaultPolicyGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[DefaultPolicyGetResponse]], ResultWrapper[DefaultPolicyGetResponse]),
-        )
-
-
-class AsyncDefaultPolicyResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncDefaultPolicyResourceWithRawResponse:
-        return AsyncDefaultPolicyResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncDefaultPolicyResourceWithStreamingResponse:
-        return AsyncDefaultPolicyResourceWithStreamingResponse(self)
-
-    async def get(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DefaultPolicyGetResponse]:
-        """
-        Fetches the default device settings profile for an account.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/devices/policy",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[DefaultPolicyGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[DefaultPolicyGetResponse]], ResultWrapper[DefaultPolicyGetResponse]),
-        )
-
-
-class DefaultPolicyResourceWithRawResponse:
-    def __init__(self, default_policy: DefaultPolicyResource) -> None:
-        self._default_policy = default_policy
-
-        self.get = to_raw_response_wrapper(
-            default_policy.get,
-        )
-
-
-class AsyncDefaultPolicyResourceWithRawResponse:
-    def __init__(self, default_policy: AsyncDefaultPolicyResource) -> None:
-        self._default_policy = default_policy
-
-        self.get = async_to_raw_response_wrapper(
-            default_policy.get,
-        )
-
-
-class DefaultPolicyResourceWithStreamingResponse:
-    def __init__(self, default_policy: DefaultPolicyResource) -> None:
-        self._default_policy = default_policy
-
-        self.get = to_streamed_response_wrapper(
-            default_policy.get,
-        )
-
-
-class AsyncDefaultPolicyResourceWithStreamingResponse:
-    def __init__(self, default_policy: AsyncDefaultPolicyResource) -> None:
-        self._default_policy = default_policy
-
-        self.get = async_to_streamed_response_wrapper(
-            default_policy.get,
-        )
diff --git a/src/cloudflare/resources/zero_trust/devices/policies/excludes.py b/src/cloudflare/resources/zero_trust/devices/policies/excludes.py
deleted file mode 100644
index 1373338441f..00000000000
--- a/src/cloudflare/resources/zero_trust/devices/policies/excludes.py
+++ /dev/null
@@ -1,343 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Iterable, Optional, cast
-
-import httpx
-
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ....._compat import cached_property
-from ....._resource import SyncAPIResource, AsyncAPIResource
-from ....._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ....._wrappers import ResultWrapper
-from .....pagination import SyncSinglePage, AsyncSinglePage
-from ....._base_client import AsyncPaginator, make_request_options
-from .....types.zero_trust.devices.policies import exclude_update_params
-from .....types.zero_trust.devices.policies.exclude_get_response import ExcludeGetResponse
-from .....types.zero_trust.devices.policies.split_tunnel_exclude import SplitTunnelExclude
-from .....types.zero_trust.devices.policies.exclude_update_response import ExcludeUpdateResponse
-from .....types.zero_trust.devices.policies.split_tunnel_exclude_param import SplitTunnelExcludeParam
-
-__all__ = ["ExcludesResource", "AsyncExcludesResource"]
-
-
-class ExcludesResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> ExcludesResourceWithRawResponse:
-        return ExcludesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> ExcludesResourceWithStreamingResponse:
-        return ExcludesResourceWithStreamingResponse(self)
-
-    def update(
-        self,
-        *,
-        account_id: str,
-        body: Iterable[SplitTunnelExcludeParam],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ExcludeUpdateResponse]:
-        """
-        Sets the list of routes excluded from the WARP client's tunnel.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._put(
-            f"/accounts/{account_id}/devices/policy/exclude",
-            body=maybe_transform(body, exclude_update_params.ExcludeUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ExcludeUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ExcludeUpdateResponse]], ResultWrapper[ExcludeUpdateResponse]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[SplitTunnelExclude]:
-        """
-        Fetches the list of routes excluded from the WARP client's tunnel.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/devices/policy/exclude",
-            page=SyncSinglePage[SplitTunnelExclude],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=SplitTunnelExclude,
-        )
-
-    def get(
-        self,
-        policy_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ExcludeGetResponse]:
-        """
-        Fetches the list of routes excluded from the WARP client's tunnel for a specific
-        device settings profile.
-
-        Args:
-          policy_id: Device ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not policy_id:
-            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/devices/policy/{policy_id}/exclude",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ExcludeGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ExcludeGetResponse]], ResultWrapper[ExcludeGetResponse]),
-        )
-
-
-class AsyncExcludesResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncExcludesResourceWithRawResponse:
-        return AsyncExcludesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncExcludesResourceWithStreamingResponse:
-        return AsyncExcludesResourceWithStreamingResponse(self)
-
-    async def update(
-        self,
-        *,
-        account_id: str,
-        body: Iterable[SplitTunnelExcludeParam],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ExcludeUpdateResponse]:
-        """
-        Sets the list of routes excluded from the WARP client's tunnel.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._put(
-            f"/accounts/{account_id}/devices/policy/exclude",
-            body=await async_maybe_transform(body, exclude_update_params.ExcludeUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ExcludeUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ExcludeUpdateResponse]], ResultWrapper[ExcludeUpdateResponse]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[SplitTunnelExclude, AsyncSinglePage[SplitTunnelExclude]]:
-        """
-        Fetches the list of routes excluded from the WARP client's tunnel.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/devices/policy/exclude",
-            page=AsyncSinglePage[SplitTunnelExclude],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=SplitTunnelExclude,
-        )
-
-    async def get(
-        self,
-        policy_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ExcludeGetResponse]:
-        """
-        Fetches the list of routes excluded from the WARP client's tunnel for a specific
-        device settings profile.
-
-        Args:
-          policy_id: Device ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not policy_id:
-            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/devices/policy/{policy_id}/exclude",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ExcludeGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ExcludeGetResponse]], ResultWrapper[ExcludeGetResponse]),
-        )
-
-
-class ExcludesResourceWithRawResponse:
-    def __init__(self, excludes: ExcludesResource) -> None:
-        self._excludes = excludes
-
-        self.update = to_raw_response_wrapper(
-            excludes.update,
-        )
-        self.list = to_raw_response_wrapper(
-            excludes.list,
-        )
-        self.get = to_raw_response_wrapper(
-            excludes.get,
-        )
-
-
-class AsyncExcludesResourceWithRawResponse:
-    def __init__(self, excludes: AsyncExcludesResource) -> None:
-        self._excludes = excludes
-
-        self.update = async_to_raw_response_wrapper(
-            excludes.update,
-        )
-        self.list = async_to_raw_response_wrapper(
-            excludes.list,
-        )
-        self.get = async_to_raw_response_wrapper(
-            excludes.get,
-        )
-
-
-class ExcludesResourceWithStreamingResponse:
-    def __init__(self, excludes: ExcludesResource) -> None:
-        self._excludes = excludes
-
-        self.update = to_streamed_response_wrapper(
-            excludes.update,
-        )
-        self.list = to_streamed_response_wrapper(
-            excludes.list,
-        )
-        self.get = to_streamed_response_wrapper(
-            excludes.get,
-        )
-
-
-class AsyncExcludesResourceWithStreamingResponse:
-    def __init__(self, excludes: AsyncExcludesResource) -> None:
-        self._excludes = excludes
-
-        self.update = async_to_streamed_response_wrapper(
-            excludes.update,
-        )
-        self.list = async_to_streamed_response_wrapper(
-            excludes.list,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            excludes.get,
-        )
diff --git a/src/cloudflare/resources/zero_trust/devices/policies/fallback_domains.py b/src/cloudflare/resources/zero_trust/devices/policies/fallback_domains.py
deleted file mode 100644
index 7e68b29b43d..00000000000
--- a/src/cloudflare/resources/zero_trust/devices/policies/fallback_domains.py
+++ /dev/null
@@ -1,365 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Iterable, Optional, cast
-
-import httpx
-
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ....._compat import cached_property
-from ....._resource import SyncAPIResource, AsyncAPIResource
-from ....._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ....._wrappers import ResultWrapper
-from .....pagination import SyncSinglePage, AsyncSinglePage
-from ....._base_client import AsyncPaginator, make_request_options
-from .....types.zero_trust.devices.policies import fallback_domain_update_params
-from .....types.zero_trust.devices.policies.fallback_domain import FallbackDomain
-from .....types.zero_trust.devices.policies.fallback_domain_param import FallbackDomainParam
-from .....types.zero_trust.devices.policies.fallback_domain_get_response import FallbackDomainGetResponse
-from .....types.zero_trust.devices.policies.fallback_domain_update_response import FallbackDomainUpdateResponse
-
-__all__ = ["FallbackDomainsResource", "AsyncFallbackDomainsResource"]
-
-
-class FallbackDomainsResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> FallbackDomainsResourceWithRawResponse:
-        return FallbackDomainsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> FallbackDomainsResourceWithStreamingResponse:
-        return FallbackDomainsResourceWithStreamingResponse(self)
-
-    def update(
-        self,
-        policy_id: str,
-        *,
-        account_id: str,
-        body: Iterable[FallbackDomainParam],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[FallbackDomainUpdateResponse]:
-        """Sets the list of domains to bypass Gateway DNS resolution.
-
-        These domains will
-        use the specified local DNS resolver instead. This will only apply to the
-        specified device settings profile.
-
-        Args:
-          policy_id: Device ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not policy_id:
-            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
-        return self._put(
-            f"/accounts/{account_id}/devices/policy/{policy_id}/fallback_domains",
-            body=maybe_transform(body, fallback_domain_update_params.FallbackDomainUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[FallbackDomainUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[FallbackDomainUpdateResponse]], ResultWrapper[FallbackDomainUpdateResponse]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[FallbackDomain]:
-        """Fetches a list of domains to bypass Gateway DNS resolution.
-
-        These domains will
-        use the specified local DNS resolver instead.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/devices/policy/fallback_domains",
-            page=SyncSinglePage[FallbackDomain],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=FallbackDomain,
-        )
-
-    def get(
-        self,
-        policy_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[FallbackDomainGetResponse]:
-        """
-        Fetches the list of domains to bypass Gateway DNS resolution from a specified
-        device settings profile. These domains will use the specified local DNS resolver
-        instead.
-
-        Args:
-          policy_id: Device ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not policy_id:
-            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/devices/policy/{policy_id}/fallback_domains",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[FallbackDomainGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[FallbackDomainGetResponse]], ResultWrapper[FallbackDomainGetResponse]),
-        )
-
-
-class AsyncFallbackDomainsResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncFallbackDomainsResourceWithRawResponse:
-        return AsyncFallbackDomainsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncFallbackDomainsResourceWithStreamingResponse:
-        return AsyncFallbackDomainsResourceWithStreamingResponse(self)
-
-    async def update(
-        self,
-        policy_id: str,
-        *,
-        account_id: str,
-        body: Iterable[FallbackDomainParam],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[FallbackDomainUpdateResponse]:
-        """Sets the list of domains to bypass Gateway DNS resolution.
-
-        These domains will
-        use the specified local DNS resolver instead. This will only apply to the
-        specified device settings profile.
-
-        Args:
-          policy_id: Device ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not policy_id:
-            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
-        return await self._put(
-            f"/accounts/{account_id}/devices/policy/{policy_id}/fallback_domains",
-            body=await async_maybe_transform(body, fallback_domain_update_params.FallbackDomainUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[FallbackDomainUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[FallbackDomainUpdateResponse]], ResultWrapper[FallbackDomainUpdateResponse]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[FallbackDomain, AsyncSinglePage[FallbackDomain]]:
-        """Fetches a list of domains to bypass Gateway DNS resolution.
-
-        These domains will
-        use the specified local DNS resolver instead.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/devices/policy/fallback_domains",
-            page=AsyncSinglePage[FallbackDomain],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=FallbackDomain,
-        )
-
-    async def get(
-        self,
-        policy_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[FallbackDomainGetResponse]:
-        """
-        Fetches the list of domains to bypass Gateway DNS resolution from a specified
-        device settings profile. These domains will use the specified local DNS resolver
-        instead.
-
-        Args:
-          policy_id: Device ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not policy_id:
-            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/devices/policy/{policy_id}/fallback_domains",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[FallbackDomainGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[FallbackDomainGetResponse]], ResultWrapper[FallbackDomainGetResponse]),
-        )
-
-
-class FallbackDomainsResourceWithRawResponse:
-    def __init__(self, fallback_domains: FallbackDomainsResource) -> None:
-        self._fallback_domains = fallback_domains
-
-        self.update = to_raw_response_wrapper(
-            fallback_domains.update,
-        )
-        self.list = to_raw_response_wrapper(
-            fallback_domains.list,
-        )
-        self.get = to_raw_response_wrapper(
-            fallback_domains.get,
-        )
-
-
-class AsyncFallbackDomainsResourceWithRawResponse:
-    def __init__(self, fallback_domains: AsyncFallbackDomainsResource) -> None:
-        self._fallback_domains = fallback_domains
-
-        self.update = async_to_raw_response_wrapper(
-            fallback_domains.update,
-        )
-        self.list = async_to_raw_response_wrapper(
-            fallback_domains.list,
-        )
-        self.get = async_to_raw_response_wrapper(
-            fallback_domains.get,
-        )
-
-
-class FallbackDomainsResourceWithStreamingResponse:
-    def __init__(self, fallback_domains: FallbackDomainsResource) -> None:
-        self._fallback_domains = fallback_domains
-
-        self.update = to_streamed_response_wrapper(
-            fallback_domains.update,
-        )
-        self.list = to_streamed_response_wrapper(
-            fallback_domains.list,
-        )
-        self.get = to_streamed_response_wrapper(
-            fallback_domains.get,
-        )
-
-
-class AsyncFallbackDomainsResourceWithStreamingResponse:
-    def __init__(self, fallback_domains: AsyncFallbackDomainsResource) -> None:
-        self._fallback_domains = fallback_domains
-
-        self.update = async_to_streamed_response_wrapper(
-            fallback_domains.update,
-        )
-        self.list = async_to_streamed_response_wrapper(
-            fallback_domains.list,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            fallback_domains.get,
-        )
diff --git a/src/cloudflare/resources/zero_trust/devices/policies/includes.py b/src/cloudflare/resources/zero_trust/devices/policies/includes.py
deleted file mode 100644
index 6c24a1b0dd4..00000000000
--- a/src/cloudflare/resources/zero_trust/devices/policies/includes.py
+++ /dev/null
@@ -1,343 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Iterable, Optional, cast
-
-import httpx
-
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ....._compat import cached_property
-from ....._resource import SyncAPIResource, AsyncAPIResource
-from ....._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ....._wrappers import ResultWrapper
-from .....pagination import SyncSinglePage, AsyncSinglePage
-from ....._base_client import AsyncPaginator, make_request_options
-from .....types.zero_trust.devices.policies import include_update_params
-from .....types.zero_trust.devices.policies.include_get_response import IncludeGetResponse
-from .....types.zero_trust.devices.policies.split_tunnel_include import SplitTunnelInclude
-from .....types.zero_trust.devices.policies.include_update_response import IncludeUpdateResponse
-from .....types.zero_trust.devices.policies.split_tunnel_include_param import SplitTunnelIncludeParam
-
-__all__ = ["IncludesResource", "AsyncIncludesResource"]
-
-
-class IncludesResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> IncludesResourceWithRawResponse:
-        return IncludesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> IncludesResourceWithStreamingResponse:
-        return IncludesResourceWithStreamingResponse(self)
-
-    def update(
-        self,
-        *,
-        account_id: str,
-        body: Iterable[SplitTunnelIncludeParam],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IncludeUpdateResponse]:
-        """
-        Sets the list of routes included in the WARP client's tunnel.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._put(
-            f"/accounts/{account_id}/devices/policy/include",
-            body=maybe_transform(body, include_update_params.IncludeUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IncludeUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IncludeUpdateResponse]], ResultWrapper[IncludeUpdateResponse]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[SplitTunnelInclude]:
-        """
-        Fetches the list of routes included in the WARP client's tunnel.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/devices/policy/include",
-            page=SyncSinglePage[SplitTunnelInclude],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=SplitTunnelInclude,
-        )
-
-    def get(
-        self,
-        policy_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IncludeGetResponse]:
-        """
-        Fetches the list of routes included in the WARP client's tunnel for a specific
-        device settings profile.
-
-        Args:
-          policy_id: Device ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not policy_id:
-            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/devices/policy/{policy_id}/include",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IncludeGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IncludeGetResponse]], ResultWrapper[IncludeGetResponse]),
-        )
-
-
-class AsyncIncludesResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncIncludesResourceWithRawResponse:
-        return AsyncIncludesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncIncludesResourceWithStreamingResponse:
-        return AsyncIncludesResourceWithStreamingResponse(self)
-
-    async def update(
-        self,
-        *,
-        account_id: str,
-        body: Iterable[SplitTunnelIncludeParam],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IncludeUpdateResponse]:
-        """
-        Sets the list of routes included in the WARP client's tunnel.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._put(
-            f"/accounts/{account_id}/devices/policy/include",
-            body=await async_maybe_transform(body, include_update_params.IncludeUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IncludeUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IncludeUpdateResponse]], ResultWrapper[IncludeUpdateResponse]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[SplitTunnelInclude, AsyncSinglePage[SplitTunnelInclude]]:
-        """
-        Fetches the list of routes included in the WARP client's tunnel.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/devices/policy/include",
-            page=AsyncSinglePage[SplitTunnelInclude],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=SplitTunnelInclude,
-        )
-
-    async def get(
-        self,
-        policy_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IncludeGetResponse]:
-        """
-        Fetches the list of routes included in the WARP client's tunnel for a specific
-        device settings profile.
-
-        Args:
-          policy_id: Device ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not policy_id:
-            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/devices/policy/{policy_id}/include",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[IncludeGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[IncludeGetResponse]], ResultWrapper[IncludeGetResponse]),
-        )
-
-
-class IncludesResourceWithRawResponse:
-    def __init__(self, includes: IncludesResource) -> None:
-        self._includes = includes
-
-        self.update = to_raw_response_wrapper(
-            includes.update,
-        )
-        self.list = to_raw_response_wrapper(
-            includes.list,
-        )
-        self.get = to_raw_response_wrapper(
-            includes.get,
-        )
-
-
-class AsyncIncludesResourceWithRawResponse:
-    def __init__(self, includes: AsyncIncludesResource) -> None:
-        self._includes = includes
-
-        self.update = async_to_raw_response_wrapper(
-            includes.update,
-        )
-        self.list = async_to_raw_response_wrapper(
-            includes.list,
-        )
-        self.get = async_to_raw_response_wrapper(
-            includes.get,
-        )
-
-
-class IncludesResourceWithStreamingResponse:
-    def __init__(self, includes: IncludesResource) -> None:
-        self._includes = includes
-
-        self.update = to_streamed_response_wrapper(
-            includes.update,
-        )
-        self.list = to_streamed_response_wrapper(
-            includes.list,
-        )
-        self.get = to_streamed_response_wrapper(
-            includes.get,
-        )
-
-
-class AsyncIncludesResourceWithStreamingResponse:
-    def __init__(self, includes: AsyncIncludesResource) -> None:
-        self._includes = includes
-
-        self.update = async_to_streamed_response_wrapper(
-            includes.update,
-        )
-        self.list = async_to_streamed_response_wrapper(
-            includes.list,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            includes.get,
-        )
diff --git a/src/cloudflare/resources/zero_trust/devices/policies/policies.py b/src/cloudflare/resources/zero_trust/devices/policies/policies.py
index 88dce419d10..6486a3daacb 100644
--- a/src/cloudflare/resources/zero_trust/devices/policies/policies.py
+++ b/src/cloudflare/resources/zero_trust/devices/policies/policies.py
@@ -2,950 +2,133 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
-
-import httpx
-
-from .excludes import (
-    ExcludesResource,
-    AsyncExcludesResource,
-    ExcludesResourceWithRawResponse,
-    AsyncExcludesResourceWithRawResponse,
-    ExcludesResourceWithStreamingResponse,
-    AsyncExcludesResourceWithStreamingResponse,
-)
-from .includes import (
-    IncludesResource,
-    AsyncIncludesResource,
-    IncludesResourceWithRawResponse,
-    AsyncIncludesResourceWithRawResponse,
-    IncludesResourceWithStreamingResponse,
-    AsyncIncludesResourceWithStreamingResponse,
-)
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
-from ....._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ....._wrappers import ResultWrapper
-from .....pagination import SyncSinglePage, AsyncSinglePage
-from .default_policy import (
-    DefaultPolicyResource,
-    AsyncDefaultPolicyResource,
-    DefaultPolicyResourceWithRawResponse,
-    AsyncDefaultPolicyResourceWithRawResponse,
-    DefaultPolicyResourceWithStreamingResponse,
-    AsyncDefaultPolicyResourceWithStreamingResponse,
+from .custom.custom import (
+    CustomResource,
+    AsyncCustomResource,
+    CustomResourceWithRawResponse,
+    AsyncCustomResourceWithRawResponse,
+    CustomResourceWithStreamingResponse,
+    AsyncCustomResourceWithStreamingResponse,
 )
-from ....._base_client import AsyncPaginator, make_request_options
-from .fallback_domains import (
-    FallbackDomainsResource,
-    AsyncFallbackDomainsResource,
-    FallbackDomainsResourceWithRawResponse,
-    AsyncFallbackDomainsResourceWithRawResponse,
-    FallbackDomainsResourceWithStreamingResponse,
-    AsyncFallbackDomainsResourceWithStreamingResponse,
+from .default.default import (
+    DefaultResource,
+    AsyncDefaultResource,
+    DefaultResourceWithRawResponse,
+    AsyncDefaultResourceWithRawResponse,
+    DefaultResourceWithStreamingResponse,
+    AsyncDefaultResourceWithStreamingResponse,
 )
-from .....types.zero_trust.devices import policy_edit_params, policy_create_params
-from .....types.zero_trust.devices.settings_policy import SettingsPolicy
-from .....types.zero_trust.devices.policy_delete_response import PolicyDeleteResponse
 
 __all__ = ["PoliciesResource", "AsyncPoliciesResource"]
 
 
 class PoliciesResource(SyncAPIResource):
     @cached_property
-    def default_policy(self) -> DefaultPolicyResource:
-        return DefaultPolicyResource(self._client)
+    def default(self) -> DefaultResource:
+        return DefaultResource(self._client)
 
     @cached_property
-    def excludes(self) -> ExcludesResource:
-        return ExcludesResource(self._client)
-
-    @cached_property
-    def fallback_domains(self) -> FallbackDomainsResource:
-        return FallbackDomainsResource(self._client)
-
-    @cached_property
-    def includes(self) -> IncludesResource:
-        return IncludesResource(self._client)
+    def custom(self) -> CustomResource:
+        return CustomResource(self._client)
 
     @cached_property
     def with_raw_response(self) -> PoliciesResourceWithRawResponse:
-        return PoliciesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> PoliciesResourceWithStreamingResponse:
-        return PoliciesResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        *,
-        account_id: str,
-        match: str,
-        name: str,
-        precedence: float,
-        allow_mode_switch: bool | NotGiven = NOT_GIVEN,
-        allow_updates: bool | NotGiven = NOT_GIVEN,
-        allowed_to_leave: bool | NotGiven = NOT_GIVEN,
-        auto_connect: float | NotGiven = NOT_GIVEN,
-        captive_portal: float | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        disable_auto_fallback: bool | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        exclude_office_ips: bool | NotGiven = NOT_GIVEN,
-        lan_allow_minutes: float | NotGiven = NOT_GIVEN,
-        lan_allow_subnet_size: float | NotGiven = NOT_GIVEN,
-        service_mode_v2: policy_create_params.ServiceModeV2 | NotGiven = NOT_GIVEN,
-        support_url: str | NotGiven = NOT_GIVEN,
-        switch_locked: bool | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingsPolicy]:
-        """
-        Creates a device settings profile to be applied to certain devices matching the
-        criteria.
-
-        Args:
-          match: The wirefilter expression to match devices.
-
-          name: The name of the device settings profile.
-
-          precedence: The precedence of the policy. Lower values indicate higher precedence. Policies
-              will be evaluated in ascending order of this field.
-
-          allow_mode_switch: Whether to allow the user to switch WARP between modes.
-
-          allow_updates: Whether to receive update notifications when a new version of the client is
-              available.
-
-          allowed_to_leave: Whether to allow devices to leave the organization.
-
-          auto_connect: The amount of time in minutes to reconnect after having been disabled.
-
-          captive_portal: Turn on the captive portal after the specified amount of time.
-
-          description: A description of the policy.
-
-          disable_auto_fallback: If the `dns_server` field of a fallback domain is not present, the client will
-              fall back to a best guess of the default/system DNS resolvers unless this policy
-              option is set to `true`.
-
-          enabled: Whether the policy will be applied to matching devices.
-
-          exclude_office_ips: Whether to add Microsoft IPs to Split Tunnel exclusions.
-
-          lan_allow_minutes: The amount of time in minutes a user is allowed access to their LAN. A value of
-              0 will allow LAN access until the next WARP reconnection, such as a reboot or a
-              laptop waking from sleep. Note that this field is omitted from the response if
-              null or unset.
-
-          lan_allow_subnet_size: The size of the subnet for the local access network. Note that this field is
-              omitted from the response if null or unset.
-
-          support_url: The URL to launch when the Send Feedback button is clicked.
-
-          switch_locked: Whether to allow the user to turn off the WARP switch and disconnect the client.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._post(
-            f"/accounts/{account_id}/devices/policy",
-            body=maybe_transform(
-                {
-                    "match": match,
-                    "name": name,
-                    "precedence": precedence,
-                    "allow_mode_switch": allow_mode_switch,
-                    "allow_updates": allow_updates,
-                    "allowed_to_leave": allowed_to_leave,
-                    "auto_connect": auto_connect,
-                    "captive_portal": captive_portal,
-                    "description": description,
-                    "disable_auto_fallback": disable_auto_fallback,
-                    "enabled": enabled,
-                    "exclude_office_ips": exclude_office_ips,
-                    "lan_allow_minutes": lan_allow_minutes,
-                    "lan_allow_subnet_size": lan_allow_subnet_size,
-                    "service_mode_v2": service_mode_v2,
-                    "support_url": support_url,
-                    "switch_locked": switch_locked,
-                },
-                policy_create_params.PolicyCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SettingsPolicy]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[SettingsPolicy]], ResultWrapper[SettingsPolicy]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[SettingsPolicy]:
-        """
-        Fetches a list of the device settings profiles for an account.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
 
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/devices/policies",
-            page=SyncSinglePage[SettingsPolicy],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=SettingsPolicy,
-        )
-
-    def delete(
-        self,
-        policy_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[PolicyDeleteResponse]:
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
         """
-        Deletes a device settings profile and fetches a list of the remaining profiles
-        for an account.
-
-        Args:
-          policy_id: Device ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not policy_id:
-            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
-        return self._delete(
-            f"/accounts/{account_id}/devices/policy/{policy_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[PolicyDeleteResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[PolicyDeleteResponse]], ResultWrapper[PolicyDeleteResponse]),
-        )
-
-    def edit(
-        self,
-        policy_id: str,
-        *,
-        account_id: str,
-        allow_mode_switch: bool | NotGiven = NOT_GIVEN,
-        allow_updates: bool | NotGiven = NOT_GIVEN,
-        allowed_to_leave: bool | NotGiven = NOT_GIVEN,
-        auto_connect: float | NotGiven = NOT_GIVEN,
-        captive_portal: float | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        disable_auto_fallback: bool | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        exclude_office_ips: bool | NotGiven = NOT_GIVEN,
-        match: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        precedence: float | NotGiven = NOT_GIVEN,
-        service_mode_v2: policy_edit_params.ServiceModeV2 | NotGiven = NOT_GIVEN,
-        support_url: str | NotGiven = NOT_GIVEN,
-        switch_locked: bool | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingsPolicy]:
-        """
-        Updates a configured device settings profile.
-
-        Args:
-          policy_id: Device ID.
-
-          allow_mode_switch: Whether to allow the user to switch WARP between modes.
-
-          allow_updates: Whether to receive update notifications when a new version of the client is
-              available.
-
-          allowed_to_leave: Whether to allow devices to leave the organization.
-
-          auto_connect: The amount of time in minutes to reconnect after having been disabled.
-
-          captive_portal: Turn on the captive portal after the specified amount of time.
-
-          description: A description of the policy.
-
-          disable_auto_fallback: If the `dns_server` field of a fallback domain is not present, the client will
-              fall back to a best guess of the default/system DNS resolvers unless this policy
-              option is set to `true`.
-
-          enabled: Whether the policy will be applied to matching devices.
-
-          exclude_office_ips: Whether to add Microsoft IPs to Split Tunnel exclusions.
-
-          match: The wirefilter expression to match devices.
-
-          name: The name of the device settings profile.
-
-          precedence: The precedence of the policy. Lower values indicate higher precedence. Policies
-              will be evaluated in ascending order of this field.
-
-          support_url: The URL to launch when the Send Feedback button is clicked.
-
-          switch_locked: Whether to allow the user to turn off the WARP switch and disconnect the client.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
+        return PoliciesResourceWithRawResponse(self)
 
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not policy_id:
-            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
-        return self._patch(
-            f"/accounts/{account_id}/devices/policy/{policy_id}",
-            body=maybe_transform(
-                {
-                    "allow_mode_switch": allow_mode_switch,
-                    "allow_updates": allow_updates,
-                    "allowed_to_leave": allowed_to_leave,
-                    "auto_connect": auto_connect,
-                    "captive_portal": captive_portal,
-                    "description": description,
-                    "disable_auto_fallback": disable_auto_fallback,
-                    "enabled": enabled,
-                    "exclude_office_ips": exclude_office_ips,
-                    "match": match,
-                    "name": name,
-                    "precedence": precedence,
-                    "service_mode_v2": service_mode_v2,
-                    "support_url": support_url,
-                    "switch_locked": switch_locked,
-                },
-                policy_edit_params.PolicyEditParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SettingsPolicy]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[SettingsPolicy]], ResultWrapper[SettingsPolicy]),
-        )
-
-    def get(
-        self,
-        policy_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingsPolicy]:
+    @cached_property
+    def with_streaming_response(self) -> PoliciesResourceWithStreamingResponse:
         """
-        Fetches a device settings profile by ID.
-
-        Args:
-          policy_id: Device ID.
-
-          extra_headers: Send extra headers
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
         """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not policy_id:
-            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/devices/policy/{policy_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SettingsPolicy]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[SettingsPolicy]], ResultWrapper[SettingsPolicy]),
-        )
+        return PoliciesResourceWithStreamingResponse(self)
 
 
 class AsyncPoliciesResource(AsyncAPIResource):
     @cached_property
-    def default_policy(self) -> AsyncDefaultPolicyResource:
-        return AsyncDefaultPolicyResource(self._client)
-
-    @cached_property
-    def excludes(self) -> AsyncExcludesResource:
-        return AsyncExcludesResource(self._client)
+    def default(self) -> AsyncDefaultResource:
+        return AsyncDefaultResource(self._client)
 
     @cached_property
-    def fallback_domains(self) -> AsyncFallbackDomainsResource:
-        return AsyncFallbackDomainsResource(self._client)
-
-    @cached_property
-    def includes(self) -> AsyncIncludesResource:
-        return AsyncIncludesResource(self._client)
+    def custom(self) -> AsyncCustomResource:
+        return AsyncCustomResource(self._client)
 
     @cached_property
     def with_raw_response(self) -> AsyncPoliciesResourceWithRawResponse:
-        return AsyncPoliciesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncPoliciesResourceWithStreamingResponse:
-        return AsyncPoliciesResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        *,
-        account_id: str,
-        match: str,
-        name: str,
-        precedence: float,
-        allow_mode_switch: bool | NotGiven = NOT_GIVEN,
-        allow_updates: bool | NotGiven = NOT_GIVEN,
-        allowed_to_leave: bool | NotGiven = NOT_GIVEN,
-        auto_connect: float | NotGiven = NOT_GIVEN,
-        captive_portal: float | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        disable_auto_fallback: bool | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        exclude_office_ips: bool | NotGiven = NOT_GIVEN,
-        lan_allow_minutes: float | NotGiven = NOT_GIVEN,
-        lan_allow_subnet_size: float | NotGiven = NOT_GIVEN,
-        service_mode_v2: policy_create_params.ServiceModeV2 | NotGiven = NOT_GIVEN,
-        support_url: str | NotGiven = NOT_GIVEN,
-        switch_locked: bool | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingsPolicy]:
-        """
-        Creates a device settings profile to be applied to certain devices matching the
-        criteria.
-
-        Args:
-          match: The wirefilter expression to match devices.
-
-          name: The name of the device settings profile.
-
-          precedence: The precedence of the policy. Lower values indicate higher precedence. Policies
-              will be evaluated in ascending order of this field.
-
-          allow_mode_switch: Whether to allow the user to switch WARP between modes.
-
-          allow_updates: Whether to receive update notifications when a new version of the client is
-              available.
-
-          allowed_to_leave: Whether to allow devices to leave the organization.
-
-          auto_connect: The amount of time in minutes to reconnect after having been disabled.
-
-          captive_portal: Turn on the captive portal after the specified amount of time.
-
-          description: A description of the policy.
-
-          disable_auto_fallback: If the `dns_server` field of a fallback domain is not present, the client will
-              fall back to a best guess of the default/system DNS resolvers unless this policy
-              option is set to `true`.
-
-          enabled: Whether the policy will be applied to matching devices.
-
-          exclude_office_ips: Whether to add Microsoft IPs to Split Tunnel exclusions.
-
-          lan_allow_minutes: The amount of time in minutes a user is allowed access to their LAN. A value of
-              0 will allow LAN access until the next WARP reconnection, such as a reboot or a
-              laptop waking from sleep. Note that this field is omitted from the response if
-              null or unset.
-
-          lan_allow_subnet_size: The size of the subnet for the local access network. Note that this field is
-              omitted from the response if null or unset.
-
-          support_url: The URL to launch when the Send Feedback button is clicked.
-
-          switch_locked: Whether to allow the user to turn off the WARP switch and disconnect the client.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._post(
-            f"/accounts/{account_id}/devices/policy",
-            body=await async_maybe_transform(
-                {
-                    "match": match,
-                    "name": name,
-                    "precedence": precedence,
-                    "allow_mode_switch": allow_mode_switch,
-                    "allow_updates": allow_updates,
-                    "allowed_to_leave": allowed_to_leave,
-                    "auto_connect": auto_connect,
-                    "captive_portal": captive_portal,
-                    "description": description,
-                    "disable_auto_fallback": disable_auto_fallback,
-                    "enabled": enabled,
-                    "exclude_office_ips": exclude_office_ips,
-                    "lan_allow_minutes": lan_allow_minutes,
-                    "lan_allow_subnet_size": lan_allow_subnet_size,
-                    "service_mode_v2": service_mode_v2,
-                    "support_url": support_url,
-                    "switch_locked": switch_locked,
-                },
-                policy_create_params.PolicyCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SettingsPolicy]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[SettingsPolicy]], ResultWrapper[SettingsPolicy]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[SettingsPolicy, AsyncSinglePage[SettingsPolicy]]:
-        """
-        Fetches a list of the device settings profiles for an account.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
 
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get_api_list(
-            f"/accounts/{account_id}/devices/policies",
-            page=AsyncSinglePage[SettingsPolicy],
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            model=SettingsPolicy,
-        )
-
-    async def delete(
-        self,
-        policy_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[PolicyDeleteResponse]:
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
         """
-        Deletes a device settings profile and fetches a list of the remaining profiles
-        for an account.
-
-        Args:
-          policy_id: Device ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not policy_id:
-            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
-        return await self._delete(
-            f"/accounts/{account_id}/devices/policy/{policy_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[PolicyDeleteResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[PolicyDeleteResponse]], ResultWrapper[PolicyDeleteResponse]),
-        )
-
-    async def edit(
-        self,
-        policy_id: str,
-        *,
-        account_id: str,
-        allow_mode_switch: bool | NotGiven = NOT_GIVEN,
-        allow_updates: bool | NotGiven = NOT_GIVEN,
-        allowed_to_leave: bool | NotGiven = NOT_GIVEN,
-        auto_connect: float | NotGiven = NOT_GIVEN,
-        captive_portal: float | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        disable_auto_fallback: bool | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        exclude_office_ips: bool | NotGiven = NOT_GIVEN,
-        match: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        precedence: float | NotGiven = NOT_GIVEN,
-        service_mode_v2: policy_edit_params.ServiceModeV2 | NotGiven = NOT_GIVEN,
-        support_url: str | NotGiven = NOT_GIVEN,
-        switch_locked: bool | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingsPolicy]:
-        """
-        Updates a configured device settings profile.
-
-        Args:
-          policy_id: Device ID.
-
-          allow_mode_switch: Whether to allow the user to switch WARP between modes.
-
-          allow_updates: Whether to receive update notifications when a new version of the client is
-              available.
-
-          allowed_to_leave: Whether to allow devices to leave the organization.
-
-          auto_connect: The amount of time in minutes to reconnect after having been disabled.
-
-          captive_portal: Turn on the captive portal after the specified amount of time.
-
-          description: A description of the policy.
-
-          disable_auto_fallback: If the `dns_server` field of a fallback domain is not present, the client will
-              fall back to a best guess of the default/system DNS resolvers unless this policy
-              option is set to `true`.
-
-          enabled: Whether the policy will be applied to matching devices.
-
-          exclude_office_ips: Whether to add Microsoft IPs to Split Tunnel exclusions.
-
-          match: The wirefilter expression to match devices.
-
-          name: The name of the device settings profile.
-
-          precedence: The precedence of the policy. Lower values indicate higher precedence. Policies
-              will be evaluated in ascending order of this field.
-
-          support_url: The URL to launch when the Send Feedback button is clicked.
-
-          switch_locked: Whether to allow the user to turn off the WARP switch and disconnect the client.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
+        return AsyncPoliciesResourceWithRawResponse(self)
 
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not policy_id:
-            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
-        return await self._patch(
-            f"/accounts/{account_id}/devices/policy/{policy_id}",
-            body=await async_maybe_transform(
-                {
-                    "allow_mode_switch": allow_mode_switch,
-                    "allow_updates": allow_updates,
-                    "allowed_to_leave": allowed_to_leave,
-                    "auto_connect": auto_connect,
-                    "captive_portal": captive_portal,
-                    "description": description,
-                    "disable_auto_fallback": disable_auto_fallback,
-                    "enabled": enabled,
-                    "exclude_office_ips": exclude_office_ips,
-                    "match": match,
-                    "name": name,
-                    "precedence": precedence,
-                    "service_mode_v2": service_mode_v2,
-                    "support_url": support_url,
-                    "switch_locked": switch_locked,
-                },
-                policy_edit_params.PolicyEditParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SettingsPolicy]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[SettingsPolicy]], ResultWrapper[SettingsPolicy]),
-        )
-
-    async def get(
-        self,
-        policy_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingsPolicy]:
+    @cached_property
+    def with_streaming_response(self) -> AsyncPoliciesResourceWithStreamingResponse:
         """
-        Fetches a device settings profile by ID.
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-        Args:
-          policy_id: Device ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
         """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not policy_id:
-            raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/devices/policy/{policy_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SettingsPolicy]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[SettingsPolicy]], ResultWrapper[SettingsPolicy]),
-        )
+        return AsyncPoliciesResourceWithStreamingResponse(self)
 
 
 class PoliciesResourceWithRawResponse:
     def __init__(self, policies: PoliciesResource) -> None:
         self._policies = policies
 
-        self.create = to_raw_response_wrapper(
-            policies.create,
-        )
-        self.list = to_raw_response_wrapper(
-            policies.list,
-        )
-        self.delete = to_raw_response_wrapper(
-            policies.delete,
-        )
-        self.edit = to_raw_response_wrapper(
-            policies.edit,
-        )
-        self.get = to_raw_response_wrapper(
-            policies.get,
-        )
-
-    @cached_property
-    def default_policy(self) -> DefaultPolicyResourceWithRawResponse:
-        return DefaultPolicyResourceWithRawResponse(self._policies.default_policy)
-
-    @cached_property
-    def excludes(self) -> ExcludesResourceWithRawResponse:
-        return ExcludesResourceWithRawResponse(self._policies.excludes)
-
     @cached_property
-    def fallback_domains(self) -> FallbackDomainsResourceWithRawResponse:
-        return FallbackDomainsResourceWithRawResponse(self._policies.fallback_domains)
+    def default(self) -> DefaultResourceWithRawResponse:
+        return DefaultResourceWithRawResponse(self._policies.default)
 
     @cached_property
-    def includes(self) -> IncludesResourceWithRawResponse:
-        return IncludesResourceWithRawResponse(self._policies.includes)
+    def custom(self) -> CustomResourceWithRawResponse:
+        return CustomResourceWithRawResponse(self._policies.custom)
 
 
 class AsyncPoliciesResourceWithRawResponse:
     def __init__(self, policies: AsyncPoliciesResource) -> None:
         self._policies = policies
 
-        self.create = async_to_raw_response_wrapper(
-            policies.create,
-        )
-        self.list = async_to_raw_response_wrapper(
-            policies.list,
-        )
-        self.delete = async_to_raw_response_wrapper(
-            policies.delete,
-        )
-        self.edit = async_to_raw_response_wrapper(
-            policies.edit,
-        )
-        self.get = async_to_raw_response_wrapper(
-            policies.get,
-        )
-
-    @cached_property
-    def default_policy(self) -> AsyncDefaultPolicyResourceWithRawResponse:
-        return AsyncDefaultPolicyResourceWithRawResponse(self._policies.default_policy)
-
-    @cached_property
-    def excludes(self) -> AsyncExcludesResourceWithRawResponse:
-        return AsyncExcludesResourceWithRawResponse(self._policies.excludes)
-
     @cached_property
-    def fallback_domains(self) -> AsyncFallbackDomainsResourceWithRawResponse:
-        return AsyncFallbackDomainsResourceWithRawResponse(self._policies.fallback_domains)
+    def default(self) -> AsyncDefaultResourceWithRawResponse:
+        return AsyncDefaultResourceWithRawResponse(self._policies.default)
 
     @cached_property
-    def includes(self) -> AsyncIncludesResourceWithRawResponse:
-        return AsyncIncludesResourceWithRawResponse(self._policies.includes)
+    def custom(self) -> AsyncCustomResourceWithRawResponse:
+        return AsyncCustomResourceWithRawResponse(self._policies.custom)
 
 
 class PoliciesResourceWithStreamingResponse:
     def __init__(self, policies: PoliciesResource) -> None:
         self._policies = policies
 
-        self.create = to_streamed_response_wrapper(
-            policies.create,
-        )
-        self.list = to_streamed_response_wrapper(
-            policies.list,
-        )
-        self.delete = to_streamed_response_wrapper(
-            policies.delete,
-        )
-        self.edit = to_streamed_response_wrapper(
-            policies.edit,
-        )
-        self.get = to_streamed_response_wrapper(
-            policies.get,
-        )
-
-    @cached_property
-    def default_policy(self) -> DefaultPolicyResourceWithStreamingResponse:
-        return DefaultPolicyResourceWithStreamingResponse(self._policies.default_policy)
-
-    @cached_property
-    def excludes(self) -> ExcludesResourceWithStreamingResponse:
-        return ExcludesResourceWithStreamingResponse(self._policies.excludes)
-
     @cached_property
-    def fallback_domains(self) -> FallbackDomainsResourceWithStreamingResponse:
-        return FallbackDomainsResourceWithStreamingResponse(self._policies.fallback_domains)
+    def default(self) -> DefaultResourceWithStreamingResponse:
+        return DefaultResourceWithStreamingResponse(self._policies.default)
 
     @cached_property
-    def includes(self) -> IncludesResourceWithStreamingResponse:
-        return IncludesResourceWithStreamingResponse(self._policies.includes)
+    def custom(self) -> CustomResourceWithStreamingResponse:
+        return CustomResourceWithStreamingResponse(self._policies.custom)
 
 
 class AsyncPoliciesResourceWithStreamingResponse:
     def __init__(self, policies: AsyncPoliciesResource) -> None:
         self._policies = policies
 
-        self.create = async_to_streamed_response_wrapper(
-            policies.create,
-        )
-        self.list = async_to_streamed_response_wrapper(
-            policies.list,
-        )
-        self.delete = async_to_streamed_response_wrapper(
-            policies.delete,
-        )
-        self.edit = async_to_streamed_response_wrapper(
-            policies.edit,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            policies.get,
-        )
-
-    @cached_property
-    def default_policy(self) -> AsyncDefaultPolicyResourceWithStreamingResponse:
-        return AsyncDefaultPolicyResourceWithStreamingResponse(self._policies.default_policy)
-
-    @cached_property
-    def excludes(self) -> AsyncExcludesResourceWithStreamingResponse:
-        return AsyncExcludesResourceWithStreamingResponse(self._policies.excludes)
-
     @cached_property
-    def fallback_domains(self) -> AsyncFallbackDomainsResourceWithStreamingResponse:
-        return AsyncFallbackDomainsResourceWithStreamingResponse(self._policies.fallback_domains)
+    def default(self) -> AsyncDefaultResourceWithStreamingResponse:
+        return AsyncDefaultResourceWithStreamingResponse(self._policies.default)
 
     @cached_property
-    def includes(self) -> AsyncIncludesResourceWithStreamingResponse:
-        return AsyncIncludesResourceWithStreamingResponse(self._policies.includes)
+    def custom(self) -> AsyncCustomResourceWithStreamingResponse:
+        return AsyncCustomResourceWithStreamingResponse(self._policies.custom)
diff --git a/src/cloudflare/resources/zero_trust/devices/posture/integrations.py b/src/cloudflare/resources/zero_trust/devices/posture/integrations.py
index 51b58c57f46..233d4828cc0 100644
--- a/src/cloudflare/resources/zero_trust/devices/posture/integrations.py
+++ b/src/cloudflare/resources/zero_trust/devices/posture/integrations.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -33,10 +30,21 @@
 class IntegrationsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> IntegrationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return IntegrationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> IntegrationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return IntegrationsResourceWithStreamingResponse(self)
 
     def create(
@@ -46,13 +54,22 @@ def create(
         config: integration_create_params.Config,
         interval: str,
         name: str,
-        type: Literal["workspace_one", "crowdstrike_s2s", "uptycs", "intune", "kolide", "tanium", "sentinelone_s2s"],
+        type: Literal[
+            "workspace_one",
+            "crowdstrike_s2s",
+            "uptycs",
+            "intune",
+            "kolide",
+            "tanium_s2s",
+            "sentinelone_s2s",
+            "custom_s2s",
+        ],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Integration]:
         """
         Create a new device posture integration.
@@ -107,7 +124,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Integration]:
         """
         Fetches the list of device posture integrations for an account.
@@ -142,8 +159,8 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> IntegrationDeleteResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IntegrationDeleteResponse]:
         """
         Delete a configured device posture integration.
 
@@ -163,7 +180,7 @@ def delete(
         if not integration_id:
             raise ValueError(f"Expected a non-empty value for `integration_id` but received {integration_id!r}")
         return cast(
-            IntegrationDeleteResponse,
+            Optional[IntegrationDeleteResponse],
             self._delete(
                 f"/accounts/{account_id}/devices/posture/integration/{integration_id}",
                 options=make_request_options(
@@ -171,7 +188,7 @@ def delete(
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[IntegrationDeleteResponse]._unwrapper,
+                    post_parser=ResultWrapper[Optional[IntegrationDeleteResponse]]._unwrapper,
                 ),
                 cast_to=cast(
                     Any, ResultWrapper[IntegrationDeleteResponse]
@@ -184,17 +201,26 @@ def edit(
         integration_id: str,
         *,
         account_id: str,
-        config: integration_edit_params.Config | NotGiven = NOT_GIVEN,
-        interval: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        type: Literal["workspace_one", "crowdstrike_s2s", "uptycs", "intune", "kolide", "tanium", "sentinelone_s2s"]
-        | NotGiven = NOT_GIVEN,
+        config: integration_edit_params.Config | Omit = omit,
+        interval: str | Omit = omit,
+        name: str | Omit = omit,
+        type: Literal[
+            "workspace_one",
+            "crowdstrike_s2s",
+            "uptycs",
+            "intune",
+            "kolide",
+            "tanium_s2s",
+            "sentinelone_s2s",
+            "custom_s2s",
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Integration]:
         """
         Updates a configured device posture integration.
@@ -254,7 +280,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Integration]:
         """
         Fetches details for a single device posture integration.
@@ -290,10 +316,21 @@ def get(
 class AsyncIntegrationsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncIntegrationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncIntegrationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncIntegrationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncIntegrationsResourceWithStreamingResponse(self)
 
     async def create(
@@ -303,13 +340,22 @@ async def create(
         config: integration_create_params.Config,
         interval: str,
         name: str,
-        type: Literal["workspace_one", "crowdstrike_s2s", "uptycs", "intune", "kolide", "tanium", "sentinelone_s2s"],
+        type: Literal[
+            "workspace_one",
+            "crowdstrike_s2s",
+            "uptycs",
+            "intune",
+            "kolide",
+            "tanium_s2s",
+            "sentinelone_s2s",
+            "custom_s2s",
+        ],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Integration]:
         """
         Create a new device posture integration.
@@ -364,7 +410,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Integration, AsyncSinglePage[Integration]]:
         """
         Fetches the list of device posture integrations for an account.
@@ -399,8 +445,8 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> IntegrationDeleteResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IntegrationDeleteResponse]:
         """
         Delete a configured device posture integration.
 
@@ -420,7 +466,7 @@ async def delete(
         if not integration_id:
             raise ValueError(f"Expected a non-empty value for `integration_id` but received {integration_id!r}")
         return cast(
-            IntegrationDeleteResponse,
+            Optional[IntegrationDeleteResponse],
             await self._delete(
                 f"/accounts/{account_id}/devices/posture/integration/{integration_id}",
                 options=make_request_options(
@@ -428,7 +474,7 @@ async def delete(
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[IntegrationDeleteResponse]._unwrapper,
+                    post_parser=ResultWrapper[Optional[IntegrationDeleteResponse]]._unwrapper,
                 ),
                 cast_to=cast(
                     Any, ResultWrapper[IntegrationDeleteResponse]
@@ -441,17 +487,26 @@ async def edit(
         integration_id: str,
         *,
         account_id: str,
-        config: integration_edit_params.Config | NotGiven = NOT_GIVEN,
-        interval: str | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        type: Literal["workspace_one", "crowdstrike_s2s", "uptycs", "intune", "kolide", "tanium", "sentinelone_s2s"]
-        | NotGiven = NOT_GIVEN,
+        config: integration_edit_params.Config | Omit = omit,
+        interval: str | Omit = omit,
+        name: str | Omit = omit,
+        type: Literal[
+            "workspace_one",
+            "crowdstrike_s2s",
+            "uptycs",
+            "intune",
+            "kolide",
+            "tanium_s2s",
+            "sentinelone_s2s",
+            "custom_s2s",
+        ]
+        | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Integration]:
         """
         Updates a configured device posture integration.
@@ -511,7 +566,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Integration]:
         """
         Fetches details for a single device posture integration.
diff --git a/src/cloudflare/resources/zero_trust/devices/posture/posture.py b/src/cloudflare/resources/zero_trust/devices/posture/posture.py
index 4dceaf7e787..4f6a0894c86 100644
--- a/src/cloudflare/resources/zero_trust/devices/posture/posture.py
+++ b/src/cloudflare/resources/zero_trust/devices/posture/posture.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from .integrations import (
     IntegrationsResource,
@@ -47,10 +44,21 @@ def integrations(self) -> IntegrationsResource:
 
     @cached_property
     def with_raw_response(self) -> PostureResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PostureResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PostureResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PostureResourceWithStreamingResponse(self)
 
     def create(
@@ -65,12 +73,15 @@ def create(
             "gateway",
             "warp",
             "disk_encryption",
+            "serial_number",
             "sentinelone",
             "carbonblack",
             "firewall",
             "os_version",
             "domain_joined",
             "client_certificate",
+            "client_certificate_v2",
+            "antivirus",
             "unique_client_id",
             "kolide",
             "tanium_s2s",
@@ -78,18 +89,19 @@ def create(
             "intune",
             "workspace_one",
             "sentinelone_s2s",
+            "custom_s2s",
         ],
-        description: str | NotGiven = NOT_GIVEN,
-        expiration: str | NotGiven = NOT_GIVEN,
-        input: DeviceInputParam | NotGiven = NOT_GIVEN,
-        match: Iterable[DeviceMatchParam] | NotGiven = NOT_GIVEN,
-        schedule: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        expiration: str | Omit = omit,
+        input: DeviceInputParam | Omit = omit,
+        match: Iterable[DeviceMatchParam] | Omit = omit,
+        schedule: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DevicePostureRule]:
         """
         Creates a new device posture rule.
@@ -158,12 +170,15 @@ def update(
             "gateway",
             "warp",
             "disk_encryption",
+            "serial_number",
             "sentinelone",
             "carbonblack",
             "firewall",
             "os_version",
             "domain_joined",
             "client_certificate",
+            "client_certificate_v2",
+            "antivirus",
             "unique_client_id",
             "kolide",
             "tanium_s2s",
@@ -171,18 +186,19 @@ def update(
             "intune",
             "workspace_one",
             "sentinelone_s2s",
+            "custom_s2s",
         ],
-        description: str | NotGiven = NOT_GIVEN,
-        expiration: str | NotGiven = NOT_GIVEN,
-        input: DeviceInputParam | NotGiven = NOT_GIVEN,
-        match: Iterable[DeviceMatchParam] | NotGiven = NOT_GIVEN,
-        schedule: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        expiration: str | Omit = omit,
+        input: DeviceInputParam | Omit = omit,
+        match: Iterable[DeviceMatchParam] | Omit = omit,
+        schedule: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DevicePostureRule]:
         """
         Updates a device posture rule.
@@ -251,7 +267,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[DevicePostureRule]:
         """
         Fetches device posture rules for a Zero Trust account.
@@ -286,7 +302,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PostureDeleteResponse]:
         """
         Deletes a device posture rule.
@@ -328,7 +344,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DevicePostureRule]:
         """
         Fetches a single device posture rule.
@@ -368,10 +384,21 @@ def integrations(self) -> AsyncIntegrationsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncPostureResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPostureResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPostureResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPostureResourceWithStreamingResponse(self)
 
     async def create(
@@ -386,12 +413,15 @@ async def create(
             "gateway",
             "warp",
             "disk_encryption",
+            "serial_number",
             "sentinelone",
             "carbonblack",
             "firewall",
             "os_version",
             "domain_joined",
             "client_certificate",
+            "client_certificate_v2",
+            "antivirus",
             "unique_client_id",
             "kolide",
             "tanium_s2s",
@@ -399,18 +429,19 @@ async def create(
             "intune",
             "workspace_one",
             "sentinelone_s2s",
+            "custom_s2s",
         ],
-        description: str | NotGiven = NOT_GIVEN,
-        expiration: str | NotGiven = NOT_GIVEN,
-        input: DeviceInputParam | NotGiven = NOT_GIVEN,
-        match: Iterable[DeviceMatchParam] | NotGiven = NOT_GIVEN,
-        schedule: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        expiration: str | Omit = omit,
+        input: DeviceInputParam | Omit = omit,
+        match: Iterable[DeviceMatchParam] | Omit = omit,
+        schedule: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DevicePostureRule]:
         """
         Creates a new device posture rule.
@@ -479,12 +510,15 @@ async def update(
             "gateway",
             "warp",
             "disk_encryption",
+            "serial_number",
             "sentinelone",
             "carbonblack",
             "firewall",
             "os_version",
             "domain_joined",
             "client_certificate",
+            "client_certificate_v2",
+            "antivirus",
             "unique_client_id",
             "kolide",
             "tanium_s2s",
@@ -492,18 +526,19 @@ async def update(
             "intune",
             "workspace_one",
             "sentinelone_s2s",
+            "custom_s2s",
         ],
-        description: str | NotGiven = NOT_GIVEN,
-        expiration: str | NotGiven = NOT_GIVEN,
-        input: DeviceInputParam | NotGiven = NOT_GIVEN,
-        match: Iterable[DeviceMatchParam] | NotGiven = NOT_GIVEN,
-        schedule: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        expiration: str | Omit = omit,
+        input: DeviceInputParam | Omit = omit,
+        match: Iterable[DeviceMatchParam] | Omit = omit,
+        schedule: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DevicePostureRule]:
         """
         Updates a device posture rule.
@@ -572,7 +607,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[DevicePostureRule, AsyncSinglePage[DevicePostureRule]]:
         """
         Fetches device posture rules for a Zero Trust account.
@@ -607,7 +642,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[PostureDeleteResponse]:
         """
         Deletes a device posture rule.
@@ -649,7 +684,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DevicePostureRule]:
         """
         Fetches a single device posture rule.
diff --git a/src/cloudflare/resources/zero_trust/devices/registrations.py b/src/cloudflare/resources/zero_trust/devices/registrations.py
new file mode 100644
index 00000000000..c1a7c477403
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/devices/registrations.py
@@ -0,0 +1,771 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncCursorPagination, AsyncCursorPagination
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.zero_trust.devices import (
+    registration_get_params,
+    registration_list_params,
+    registration_revoke_params,
+    registration_unrevoke_params,
+    registration_bulk_delete_params,
+)
+from ....types.zero_trust.devices.registration_get_response import RegistrationGetResponse
+from ....types.zero_trust.devices.registration_list_response import RegistrationListResponse
+
+__all__ = ["RegistrationsResource", "AsyncRegistrationsResource"]
+
+
+class RegistrationsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> RegistrationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return RegistrationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> RegistrationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return RegistrationsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        id: SequenceNotStr[str] | Omit = omit,
+        cursor: str | Omit = omit,
+        device: registration_list_params.Device | Omit = omit,
+        include: str | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        seen_after: str | Omit = omit,
+        seen_before: str | Omit = omit,
+        sort_by: Literal["id", "user.name", "user.email", "last_seen_at", "created_at"] | Omit = omit,
+        sort_order: Literal["asc", "desc"] | Omit = omit,
+        status: Literal["active", "all", "revoked"] | Omit = omit,
+        user: registration_list_params.User | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncCursorPagination[RegistrationListResponse]:
+        """
+        Lists WARP registrations.
+
+        Args:
+          id: Filter by registration ID.
+
+          cursor: Opaque token indicating the starting position when requesting the next set of
+              records. A cursor value can be obtained from the result_info.cursor field in the
+              response.
+
+          include: Comma-separated list of additional information that should be included in the
+              registration response. Supported values are: "policy".
+
+          per_page: The maximum number of devices to return in a single response.
+
+          search: Filter by registration details.
+
+          seen_after: Filter by the last_seen timestamp - returns only registrations last seen after
+              this timestamp.
+
+          seen_before: Filter by the last_seen timestamp - returns only registrations last seen before
+              this timestamp.
+
+          sort_by: The registration field to order results by.
+
+          sort_order: Sort direction.
+
+          status: Filter by registration status. Defaults to 'active'.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/registrations",
+            page=SyncCursorPagination[RegistrationListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "id": id,
+                        "cursor": cursor,
+                        "device": device,
+                        "include": include,
+                        "per_page": per_page,
+                        "search": search,
+                        "seen_after": seen_after,
+                        "seen_before": seen_before,
+                        "sort_by": sort_by,
+                        "sort_order": sort_order,
+                        "status": status,
+                        "user": user,
+                    },
+                    registration_list_params.RegistrationListParams,
+                ),
+            ),
+            model=RegistrationListResponse,
+        )
+
+    def delete(
+        self,
+        registration_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Deletes a WARP registration.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not registration_id:
+            raise ValueError(f"Expected a non-empty value for `registration_id` but received {registration_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/devices/registrations/{registration_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def bulk_delete(
+        self,
+        *,
+        account_id: str,
+        id: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Deletes a list of WARP registrations.
+
+        Args:
+          id: A list of registration IDs to delete.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/devices/registrations",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"id": id}, registration_bulk_delete_params.RegistrationBulkDeleteParams),
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def get(
+        self,
+        registration_id: str,
+        *,
+        account_id: str,
+        include: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RegistrationGetResponse:
+        """
+        Fetches a single WARP registration.
+
+        Args:
+          include: Comma-separated list of additional information that should be included in the
+              registration response. Supported values are: "policy".
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not registration_id:
+            raise ValueError(f"Expected a non-empty value for `registration_id` but received {registration_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/devices/registrations/{registration_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"include": include}, registration_get_params.RegistrationGetParams),
+                post_parser=ResultWrapper[RegistrationGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[RegistrationGetResponse], ResultWrapper[RegistrationGetResponse]),
+        )
+
+    def revoke(
+        self,
+        *,
+        account_id: str,
+        id: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Revokes a list of WARP registrations.
+
+        Args:
+          id: A list of registration IDs to revoke.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/devices/registrations/revoke",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"id": id}, registration_revoke_params.RegistrationRevokeParams),
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def unrevoke(
+        self,
+        *,
+        account_id: str,
+        id: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Unrevokes a list of WARP registrations.
+
+        Args:
+          id: A list of registration IDs to unrevoke.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/devices/registrations/unrevoke",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"id": id}, registration_unrevoke_params.RegistrationUnrevokeParams),
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+
+class AsyncRegistrationsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncRegistrationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncRegistrationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncRegistrationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncRegistrationsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        id: SequenceNotStr[str] | Omit = omit,
+        cursor: str | Omit = omit,
+        device: registration_list_params.Device | Omit = omit,
+        include: str | Omit = omit,
+        per_page: int | Omit = omit,
+        search: str | Omit = omit,
+        seen_after: str | Omit = omit,
+        seen_before: str | Omit = omit,
+        sort_by: Literal["id", "user.name", "user.email", "last_seen_at", "created_at"] | Omit = omit,
+        sort_order: Literal["asc", "desc"] | Omit = omit,
+        status: Literal["active", "all", "revoked"] | Omit = omit,
+        user: registration_list_params.User | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[RegistrationListResponse, AsyncCursorPagination[RegistrationListResponse]]:
+        """
+        Lists WARP registrations.
+
+        Args:
+          id: Filter by registration ID.
+
+          cursor: Opaque token indicating the starting position when requesting the next set of
+              records. A cursor value can be obtained from the result_info.cursor field in the
+              response.
+
+          include: Comma-separated list of additional information that should be included in the
+              registration response. Supported values are: "policy".
+
+          per_page: The maximum number of devices to return in a single response.
+
+          search: Filter by registration details.
+
+          seen_after: Filter by the last_seen timestamp - returns only registrations last seen after
+              this timestamp.
+
+          seen_before: Filter by the last_seen timestamp - returns only registrations last seen before
+              this timestamp.
+
+          sort_by: The registration field to order results by.
+
+          sort_order: Sort direction.
+
+          status: Filter by registration status. Defaults to 'active'.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/devices/registrations",
+            page=AsyncCursorPagination[RegistrationListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "id": id,
+                        "cursor": cursor,
+                        "device": device,
+                        "include": include,
+                        "per_page": per_page,
+                        "search": search,
+                        "seen_after": seen_after,
+                        "seen_before": seen_before,
+                        "sort_by": sort_by,
+                        "sort_order": sort_order,
+                        "status": status,
+                        "user": user,
+                    },
+                    registration_list_params.RegistrationListParams,
+                ),
+            ),
+            model=RegistrationListResponse,
+        )
+
+    async def delete(
+        self,
+        registration_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Deletes a WARP registration.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not registration_id:
+            raise ValueError(f"Expected a non-empty value for `registration_id` but received {registration_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/devices/registrations/{registration_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def bulk_delete(
+        self,
+        *,
+        account_id: str,
+        id: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Deletes a list of WARP registrations.
+
+        Args:
+          id: A list of registration IDs to delete.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/devices/registrations",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"id": id}, registration_bulk_delete_params.RegistrationBulkDeleteParams
+                ),
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def get(
+        self,
+        registration_id: str,
+        *,
+        account_id: str,
+        include: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> RegistrationGetResponse:
+        """
+        Fetches a single WARP registration.
+
+        Args:
+          include: Comma-separated list of additional information that should be included in the
+              registration response. Supported values are: "policy".
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not registration_id:
+            raise ValueError(f"Expected a non-empty value for `registration_id` but received {registration_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/devices/registrations/{registration_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"include": include}, registration_get_params.RegistrationGetParams),
+                post_parser=ResultWrapper[RegistrationGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[RegistrationGetResponse], ResultWrapper[RegistrationGetResponse]),
+        )
+
+    async def revoke(
+        self,
+        *,
+        account_id: str,
+        id: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Revokes a list of WARP registrations.
+
+        Args:
+          id: A list of registration IDs to revoke.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/devices/registrations/revoke",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"id": id}, registration_revoke_params.RegistrationRevokeParams),
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def unrevoke(
+        self,
+        *,
+        account_id: str,
+        id: SequenceNotStr[str],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Unrevokes a list of WARP registrations.
+
+        Args:
+          id: A list of registration IDs to unrevoke.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/devices/registrations/unrevoke",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform({"id": id}, registration_unrevoke_params.RegistrationUnrevokeParams),
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+
+class RegistrationsResourceWithRawResponse:
+    def __init__(self, registrations: RegistrationsResource) -> None:
+        self._registrations = registrations
+
+        self.list = to_raw_response_wrapper(
+            registrations.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            registrations.delete,
+        )
+        self.bulk_delete = to_raw_response_wrapper(
+            registrations.bulk_delete,
+        )
+        self.get = to_raw_response_wrapper(
+            registrations.get,
+        )
+        self.revoke = to_raw_response_wrapper(
+            registrations.revoke,
+        )
+        self.unrevoke = to_raw_response_wrapper(
+            registrations.unrevoke,
+        )
+
+
+class AsyncRegistrationsResourceWithRawResponse:
+    def __init__(self, registrations: AsyncRegistrationsResource) -> None:
+        self._registrations = registrations
+
+        self.list = async_to_raw_response_wrapper(
+            registrations.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            registrations.delete,
+        )
+        self.bulk_delete = async_to_raw_response_wrapper(
+            registrations.bulk_delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            registrations.get,
+        )
+        self.revoke = async_to_raw_response_wrapper(
+            registrations.revoke,
+        )
+        self.unrevoke = async_to_raw_response_wrapper(
+            registrations.unrevoke,
+        )
+
+
+class RegistrationsResourceWithStreamingResponse:
+    def __init__(self, registrations: RegistrationsResource) -> None:
+        self._registrations = registrations
+
+        self.list = to_streamed_response_wrapper(
+            registrations.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            registrations.delete,
+        )
+        self.bulk_delete = to_streamed_response_wrapper(
+            registrations.bulk_delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            registrations.get,
+        )
+        self.revoke = to_streamed_response_wrapper(
+            registrations.revoke,
+        )
+        self.unrevoke = to_streamed_response_wrapper(
+            registrations.unrevoke,
+        )
+
+
+class AsyncRegistrationsResourceWithStreamingResponse:
+    def __init__(self, registrations: AsyncRegistrationsResource) -> None:
+        self._registrations = registrations
+
+        self.list = async_to_streamed_response_wrapper(
+            registrations.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            registrations.delete,
+        )
+        self.bulk_delete = async_to_streamed_response_wrapper(
+            registrations.bulk_delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            registrations.get,
+        )
+        self.revoke = async_to_streamed_response_wrapper(
+            registrations.revoke,
+        )
+        self.unrevoke = async_to_streamed_response_wrapper(
+            registrations.unrevoke,
+        )
diff --git a/src/cloudflare/resources/zero_trust/devices/resilience/__init__.py b/src/cloudflare/resources/zero_trust/devices/resilience/__init__.py
new file mode 100644
index 00000000000..b67a3de1fd1
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/devices/resilience/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .resilience import (
+    ResilienceResource,
+    AsyncResilienceResource,
+    ResilienceResourceWithRawResponse,
+    AsyncResilienceResourceWithRawResponse,
+    ResilienceResourceWithStreamingResponse,
+    AsyncResilienceResourceWithStreamingResponse,
+)
+from .global_warp_override import (
+    GlobalWARPOverrideResource,
+    AsyncGlobalWARPOverrideResource,
+    GlobalWARPOverrideResourceWithRawResponse,
+    AsyncGlobalWARPOverrideResourceWithRawResponse,
+    GlobalWARPOverrideResourceWithStreamingResponse,
+    AsyncGlobalWARPOverrideResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "GlobalWARPOverrideResource",
+    "AsyncGlobalWARPOverrideResource",
+    "GlobalWARPOverrideResourceWithRawResponse",
+    "AsyncGlobalWARPOverrideResourceWithRawResponse",
+    "GlobalWARPOverrideResourceWithStreamingResponse",
+    "AsyncGlobalWARPOverrideResourceWithStreamingResponse",
+    "ResilienceResource",
+    "AsyncResilienceResource",
+    "ResilienceResourceWithRawResponse",
+    "AsyncResilienceResourceWithRawResponse",
+    "ResilienceResourceWithStreamingResponse",
+    "AsyncResilienceResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/devices/resilience/global_warp_override.py b/src/cloudflare/resources/zero_trust/devices/resilience/global_warp_override.py
new file mode 100644
index 00000000000..33f8cf8650e
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/devices/resilience/global_warp_override.py
@@ -0,0 +1,297 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.zero_trust.devices.resilience import global_warp_override_create_params
+from .....types.zero_trust.devices.resilience.global_warp_override_get_response import GlobalWARPOverrideGetResponse
+from .....types.zero_trust.devices.resilience.global_warp_override_create_response import (
+    GlobalWARPOverrideCreateResponse,
+)
+
+__all__ = ["GlobalWARPOverrideResource", "AsyncGlobalWARPOverrideResource"]
+
+
+class GlobalWARPOverrideResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> GlobalWARPOverrideResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return GlobalWARPOverrideResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> GlobalWARPOverrideResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return GlobalWARPOverrideResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        disconnect: bool,
+        justification: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[GlobalWARPOverrideCreateResponse]:
+        """
+        Sets the Global WARP override state.
+
+        Args:
+          disconnect: Disconnects all devices on the account using Global WARP override.
+
+          justification: Reasoning for setting the Global WARP override state. This will be surfaced in
+              the audit log.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/devices/resilience/disconnect",
+            body=maybe_transform(
+                {
+                    "disconnect": disconnect,
+                    "justification": justification,
+                },
+                global_warp_override_create_params.GlobalWARPOverrideCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[GlobalWARPOverrideCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[GlobalWARPOverrideCreateResponse]], ResultWrapper[GlobalWARPOverrideCreateResponse]
+            ),
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[GlobalWARPOverrideGetResponse]:
+        """
+        Fetch the Global WARP override state.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/devices/resilience/disconnect",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[GlobalWARPOverrideGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[GlobalWARPOverrideGetResponse]], ResultWrapper[GlobalWARPOverrideGetResponse]),
+        )
+
+
+class AsyncGlobalWARPOverrideResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncGlobalWARPOverrideResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncGlobalWARPOverrideResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncGlobalWARPOverrideResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncGlobalWARPOverrideResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        disconnect: bool,
+        justification: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[GlobalWARPOverrideCreateResponse]:
+        """
+        Sets the Global WARP override state.
+
+        Args:
+          disconnect: Disconnects all devices on the account using Global WARP override.
+
+          justification: Reasoning for setting the Global WARP override state. This will be surfaced in
+              the audit log.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/devices/resilience/disconnect",
+            body=await async_maybe_transform(
+                {
+                    "disconnect": disconnect,
+                    "justification": justification,
+                },
+                global_warp_override_create_params.GlobalWARPOverrideCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[GlobalWARPOverrideCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Type[Optional[GlobalWARPOverrideCreateResponse]], ResultWrapper[GlobalWARPOverrideCreateResponse]
+            ),
+        )
+
+    async def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[GlobalWARPOverrideGetResponse]:
+        """
+        Fetch the Global WARP override state.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/devices/resilience/disconnect",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[GlobalWARPOverrideGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[GlobalWARPOverrideGetResponse]], ResultWrapper[GlobalWARPOverrideGetResponse]),
+        )
+
+
+class GlobalWARPOverrideResourceWithRawResponse:
+    def __init__(self, global_warp_override: GlobalWARPOverrideResource) -> None:
+        self._global_warp_override = global_warp_override
+
+        self.create = to_raw_response_wrapper(
+            global_warp_override.create,
+        )
+        self.get = to_raw_response_wrapper(
+            global_warp_override.get,
+        )
+
+
+class AsyncGlobalWARPOverrideResourceWithRawResponse:
+    def __init__(self, global_warp_override: AsyncGlobalWARPOverrideResource) -> None:
+        self._global_warp_override = global_warp_override
+
+        self.create = async_to_raw_response_wrapper(
+            global_warp_override.create,
+        )
+        self.get = async_to_raw_response_wrapper(
+            global_warp_override.get,
+        )
+
+
+class GlobalWARPOverrideResourceWithStreamingResponse:
+    def __init__(self, global_warp_override: GlobalWARPOverrideResource) -> None:
+        self._global_warp_override = global_warp_override
+
+        self.create = to_streamed_response_wrapper(
+            global_warp_override.create,
+        )
+        self.get = to_streamed_response_wrapper(
+            global_warp_override.get,
+        )
+
+
+class AsyncGlobalWARPOverrideResourceWithStreamingResponse:
+    def __init__(self, global_warp_override: AsyncGlobalWARPOverrideResource) -> None:
+        self._global_warp_override = global_warp_override
+
+        self.create = async_to_streamed_response_wrapper(
+            global_warp_override.create,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            global_warp_override.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/devices/resilience/resilience.py b/src/cloudflare/resources/zero_trust/devices/resilience/resilience.py
new file mode 100644
index 00000000000..b921fb84488
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/devices/resilience/resilience.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from .global_warp_override import (
+    GlobalWARPOverrideResource,
+    AsyncGlobalWARPOverrideResource,
+    GlobalWARPOverrideResourceWithRawResponse,
+    AsyncGlobalWARPOverrideResourceWithRawResponse,
+    GlobalWARPOverrideResourceWithStreamingResponse,
+    AsyncGlobalWARPOverrideResourceWithStreamingResponse,
+)
+
+__all__ = ["ResilienceResource", "AsyncResilienceResource"]
+
+
+class ResilienceResource(SyncAPIResource):
+    @cached_property
+    def global_warp_override(self) -> GlobalWARPOverrideResource:
+        return GlobalWARPOverrideResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> ResilienceResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ResilienceResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ResilienceResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ResilienceResourceWithStreamingResponse(self)
+
+
+class AsyncResilienceResource(AsyncAPIResource):
+    @cached_property
+    def global_warp_override(self) -> AsyncGlobalWARPOverrideResource:
+        return AsyncGlobalWARPOverrideResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncResilienceResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncResilienceResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncResilienceResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncResilienceResourceWithStreamingResponse(self)
+
+
+class ResilienceResourceWithRawResponse:
+    def __init__(self, resilience: ResilienceResource) -> None:
+        self._resilience = resilience
+
+    @cached_property
+    def global_warp_override(self) -> GlobalWARPOverrideResourceWithRawResponse:
+        return GlobalWARPOverrideResourceWithRawResponse(self._resilience.global_warp_override)
+
+
+class AsyncResilienceResourceWithRawResponse:
+    def __init__(self, resilience: AsyncResilienceResource) -> None:
+        self._resilience = resilience
+
+    @cached_property
+    def global_warp_override(self) -> AsyncGlobalWARPOverrideResourceWithRawResponse:
+        return AsyncGlobalWARPOverrideResourceWithRawResponse(self._resilience.global_warp_override)
+
+
+class ResilienceResourceWithStreamingResponse:
+    def __init__(self, resilience: ResilienceResource) -> None:
+        self._resilience = resilience
+
+    @cached_property
+    def global_warp_override(self) -> GlobalWARPOverrideResourceWithStreamingResponse:
+        return GlobalWARPOverrideResourceWithStreamingResponse(self._resilience.global_warp_override)
+
+
+class AsyncResilienceResourceWithStreamingResponse:
+    def __init__(self, resilience: AsyncResilienceResource) -> None:
+        self._resilience = resilience
+
+    @cached_property
+    def global_warp_override(self) -> AsyncGlobalWARPOverrideResourceWithStreamingResponse:
+        return AsyncGlobalWARPOverrideResourceWithStreamingResponse(self._resilience.global_warp_override)
diff --git a/src/cloudflare/resources/zero_trust/devices/revoke.py b/src/cloudflare/resources/zero_trust/devices/revoke.py
index 46093fcfd0d..b1fc0267ac5 100644
--- a/src/cloudflare/resources/zero_trust/devices/revoke.py
+++ b/src/cloudflare/resources/zero_trust/devices/revoke.py
@@ -2,15 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, List, cast
+import typing_extensions
+from typing import Any, Optional, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, SequenceNotStr, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -21,7 +19,6 @@
 )
 from ...._wrappers import ResultWrapper
 from ...._base_client import make_request_options
-from ....types.zero_trust.devices import revoke_create_params
 from ....types.zero_trust.devices.revoke_create_response import RevokeCreateResponse
 
 __all__ = ["RevokeResource", "AsyncRevokeResource"]
@@ -30,29 +27,47 @@
 class RevokeResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RevokeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RevokeResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RevokeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RevokeResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def create(
         self,
         *,
         account_id: str,
-        body: List[str],
+        body: SequenceNotStr[str],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RevokeCreateResponse:
-        """
-        Revokes a list of devices.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RevokeCreateResponse]:
+        """Revokes a list of devices.
+
+        Not supported when
+        [multi-user mode](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-multiuser/)
+        is enabled.
+
+        **Deprecated**: please use POST
+        /accounts/{account_id}/devices/registrations/revoke instead.
 
         Args:
-          body: A list of device ids to revoke.
+          body: A list of Registration IDs to revoke.
 
           extra_headers: Send extra headers
 
@@ -65,16 +80,16 @@ def create(
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return cast(
-            RevokeCreateResponse,
+            Optional[RevokeCreateResponse],
             self._post(
                 f"/accounts/{account_id}/devices/revoke",
-                body=maybe_transform(body, revoke_create_params.RevokeCreateParams),
+                body=maybe_transform(body, SequenceNotStr[str]),
                 options=make_request_options(
                     extra_headers=extra_headers,
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[RevokeCreateResponse]._unwrapper,
+                    post_parser=ResultWrapper[Optional[RevokeCreateResponse]]._unwrapper,
                 ),
                 cast_to=cast(
                     Any, ResultWrapper[RevokeCreateResponse]
@@ -86,29 +101,47 @@ def create(
 class AsyncRevokeResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRevokeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRevokeResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRevokeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRevokeResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     async def create(
         self,
         *,
         account_id: str,
-        body: List[str],
+        body: SequenceNotStr[str],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RevokeCreateResponse:
-        """
-        Revokes a list of devices.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RevokeCreateResponse]:
+        """Revokes a list of devices.
+
+        Not supported when
+        [multi-user mode](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-multiuser/)
+        is enabled.
+
+        **Deprecated**: please use POST
+        /accounts/{account_id}/devices/registrations/revoke instead.
 
         Args:
-          body: A list of device ids to revoke.
+          body: A list of Registration IDs to revoke.
 
           extra_headers: Send extra headers
 
@@ -121,16 +154,16 @@ async def create(
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return cast(
-            RevokeCreateResponse,
+            Optional[RevokeCreateResponse],
             await self._post(
                 f"/accounts/{account_id}/devices/revoke",
-                body=await async_maybe_transform(body, revoke_create_params.RevokeCreateParams),
+                body=await async_maybe_transform(body, SequenceNotStr[str]),
                 options=make_request_options(
                     extra_headers=extra_headers,
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[RevokeCreateResponse]._unwrapper,
+                    post_parser=ResultWrapper[Optional[RevokeCreateResponse]]._unwrapper,
                 ),
                 cast_to=cast(
                     Any, ResultWrapper[RevokeCreateResponse]
@@ -143,8 +176,10 @@ class RevokeResourceWithRawResponse:
     def __init__(self, revoke: RevokeResource) -> None:
         self._revoke = revoke
 
-        self.create = to_raw_response_wrapper(
-            revoke.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                revoke.create,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -152,8 +187,10 @@ class AsyncRevokeResourceWithRawResponse:
     def __init__(self, revoke: AsyncRevokeResource) -> None:
         self._revoke = revoke
 
-        self.create = async_to_raw_response_wrapper(
-            revoke.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                revoke.create,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -161,8 +198,10 @@ class RevokeResourceWithStreamingResponse:
     def __init__(self, revoke: RevokeResource) -> None:
         self._revoke = revoke
 
-        self.create = to_streamed_response_wrapper(
-            revoke.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                revoke.create,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -170,6 +209,8 @@ class AsyncRevokeResourceWithStreamingResponse:
     def __init__(self, revoke: AsyncRevokeResource) -> None:
         self._revoke = revoke
 
-        self.create = async_to_streamed_response_wrapper(
-            revoke.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                revoke.create,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/zero_trust/devices/settings.py b/src/cloudflare/resources/zero_trust/devices/settings.py
index 34d455ca260..9b745ab93e6 100644
--- a/src/cloudflare/resources/zero_trust/devices/settings.py
+++ b/src/cloudflare/resources/zero_trust/devices/settings.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -21,7 +18,7 @@
 )
 from ...._wrappers import ResultWrapper
 from ...._base_client import make_request_options
-from ....types.zero_trust.devices import setting_update_params
+from ....types.zero_trust.devices import setting_edit_params, setting_update_params
 from ....types.zero_trust.devices.device_settings import DeviceSettings
 
 __all__ = ["SettingsResource", "AsyncSettingsResource"]
@@ -30,31 +27,64 @@
 class SettingsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SettingsResourceWithStreamingResponse(self)
 
     def update(
         self,
         *,
         account_id: str,
-        gateway_proxy_enabled: bool | NotGiven = NOT_GIVEN,
-        gateway_udp_proxy_enabled: bool | NotGiven = NOT_GIVEN,
-        root_certificate_installation_enabled: bool | NotGiven = NOT_GIVEN,
-        use_zt_virtual_ip: bool | NotGiven = NOT_GIVEN,
+        disable_for_time: float | Omit = omit,
+        external_emergency_signal_enabled: bool | Omit = omit,
+        external_emergency_signal_fingerprint: str | Omit = omit,
+        external_emergency_signal_interval: str | Omit = omit,
+        external_emergency_signal_url: str | Omit = omit,
+        gateway_proxy_enabled: bool | Omit = omit,
+        gateway_udp_proxy_enabled: bool | Omit = omit,
+        root_certificate_installation_enabled: bool | Omit = omit,
+        use_zt_virtual_ip: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DeviceSettings]:
         """
         Updates the current device settings for a Zero Trust account.
 
         Args:
+          disable_for_time: Sets the time limit, in seconds, that a user can use an override code to bypass
+              WARP.
+
+          external_emergency_signal_enabled: Controls whether the external emergency disconnect feature is enabled.
+
+          external_emergency_signal_fingerprint: The SHA256 fingerprint (64 hexadecimal characters) of the HTTPS server
+              certificate for the external_emergency_signal_url. If provided, the WARP client
+              will use this value to verify the server's identity. The device will ignore any
+              response if the server's certificate fingerprint does not exactly match this
+              value.
+
+          external_emergency_signal_interval: The interval at which the WARP client fetches the emergency disconnect signal,
+              formatted as a duration string (e.g., "5m", "2m30s", "1h"). Minimum 30 seconds.
+
+          external_emergency_signal_url: The HTTPS URL from which to fetch the emergency disconnect signal. Must use
+              HTTPS and have an IPv4 or IPv6 address as the host.
+
           gateway_proxy_enabled: Enable gateway proxy filtering on TCP.
 
           gateway_udp_proxy_enabled: Enable gateway proxy filtering on UDP.
@@ -77,6 +107,11 @@ def update(
             f"/accounts/{account_id}/devices/settings",
             body=maybe_transform(
                 {
+                    "disable_for_time": disable_for_time,
+                    "external_emergency_signal_enabled": external_emergency_signal_enabled,
+                    "external_emergency_signal_fingerprint": external_emergency_signal_fingerprint,
+                    "external_emergency_signal_interval": external_emergency_signal_interval,
+                    "external_emergency_signal_url": external_emergency_signal_url,
                     "gateway_proxy_enabled": gateway_proxy_enabled,
                     "gateway_udp_proxy_enabled": gateway_udp_proxy_enabled,
                     "root_certificate_installation_enabled": root_certificate_installation_enabled,
@@ -94,16 +129,138 @@ def update(
             cast_to=cast(Type[Optional[DeviceSettings]], ResultWrapper[DeviceSettings]),
         )
 
-    def list(
+    def delete(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DeviceSettings]:
+        """
+        Resets the current device settings for a Zero Trust account.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/devices/settings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DeviceSettings]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DeviceSettings]], ResultWrapper[DeviceSettings]),
+        )
+
+    def edit(
         self,
         *,
         account_id: str,
+        disable_for_time: float | Omit = omit,
+        external_emergency_signal_enabled: bool | Omit = omit,
+        external_emergency_signal_fingerprint: str | Omit = omit,
+        external_emergency_signal_interval: str | Omit = omit,
+        external_emergency_signal_url: str | Omit = omit,
+        gateway_proxy_enabled: bool | Omit = omit,
+        gateway_udp_proxy_enabled: bool | Omit = omit,
+        root_certificate_installation_enabled: bool | Omit = omit,
+        use_zt_virtual_ip: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DeviceSettings]:
+        """
+        Patches the current device settings for a Zero Trust account.
+
+        Args:
+          disable_for_time: Sets the time limit, in seconds, that a user can use an override code to bypass
+              WARP.
+
+          external_emergency_signal_enabled: Controls whether the external emergency disconnect feature is enabled.
+
+          external_emergency_signal_fingerprint: The SHA256 fingerprint (64 hexadecimal characters) of the HTTPS server
+              certificate for the external_emergency_signal_url. If provided, the WARP client
+              will use this value to verify the server's identity. The device will ignore any
+              response if the server's certificate fingerprint does not exactly match this
+              value.
+
+          external_emergency_signal_interval: The interval at which the WARP client fetches the emergency disconnect signal,
+              formatted as a duration string (e.g., "5m", "2m30s", "1h"). Minimum 30 seconds.
+
+          external_emergency_signal_url: The HTTPS URL from which to fetch the emergency disconnect signal. Must use
+              HTTPS and have an IPv4 or IPv6 address as the host.
+
+          gateway_proxy_enabled: Enable gateway proxy filtering on TCP.
+
+          gateway_udp_proxy_enabled: Enable gateway proxy filtering on UDP.
+
+          root_certificate_installation_enabled: Enable installation of cloudflare managed root certificate.
+
+          use_zt_virtual_ip: Enable using CGNAT virtual IPv4.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/devices/settings",
+            body=maybe_transform(
+                {
+                    "disable_for_time": disable_for_time,
+                    "external_emergency_signal_enabled": external_emergency_signal_enabled,
+                    "external_emergency_signal_fingerprint": external_emergency_signal_fingerprint,
+                    "external_emergency_signal_interval": external_emergency_signal_interval,
+                    "external_emergency_signal_url": external_emergency_signal_url,
+                    "gateway_proxy_enabled": gateway_proxy_enabled,
+                    "gateway_udp_proxy_enabled": gateway_udp_proxy_enabled,
+                    "root_certificate_installation_enabled": root_certificate_installation_enabled,
+                    "use_zt_virtual_ip": use_zt_virtual_ip,
+                },
+                setting_edit_params.SettingEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DeviceSettings]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DeviceSettings]], ResultWrapper[DeviceSettings]),
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DeviceSettings]:
         """
         Describes the current device settings for a Zero Trust account.
@@ -135,31 +292,64 @@ def list(
 class AsyncSettingsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSettingsResourceWithStreamingResponse(self)
 
     async def update(
         self,
         *,
         account_id: str,
-        gateway_proxy_enabled: bool | NotGiven = NOT_GIVEN,
-        gateway_udp_proxy_enabled: bool | NotGiven = NOT_GIVEN,
-        root_certificate_installation_enabled: bool | NotGiven = NOT_GIVEN,
-        use_zt_virtual_ip: bool | NotGiven = NOT_GIVEN,
+        disable_for_time: float | Omit = omit,
+        external_emergency_signal_enabled: bool | Omit = omit,
+        external_emergency_signal_fingerprint: str | Omit = omit,
+        external_emergency_signal_interval: str | Omit = omit,
+        external_emergency_signal_url: str | Omit = omit,
+        gateway_proxy_enabled: bool | Omit = omit,
+        gateway_udp_proxy_enabled: bool | Omit = omit,
+        root_certificate_installation_enabled: bool | Omit = omit,
+        use_zt_virtual_ip: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DeviceSettings]:
         """
         Updates the current device settings for a Zero Trust account.
 
         Args:
+          disable_for_time: Sets the time limit, in seconds, that a user can use an override code to bypass
+              WARP.
+
+          external_emergency_signal_enabled: Controls whether the external emergency disconnect feature is enabled.
+
+          external_emergency_signal_fingerprint: The SHA256 fingerprint (64 hexadecimal characters) of the HTTPS server
+              certificate for the external_emergency_signal_url. If provided, the WARP client
+              will use this value to verify the server's identity. The device will ignore any
+              response if the server's certificate fingerprint does not exactly match this
+              value.
+
+          external_emergency_signal_interval: The interval at which the WARP client fetches the emergency disconnect signal,
+              formatted as a duration string (e.g., "5m", "2m30s", "1h"). Minimum 30 seconds.
+
+          external_emergency_signal_url: The HTTPS URL from which to fetch the emergency disconnect signal. Must use
+              HTTPS and have an IPv4 or IPv6 address as the host.
+
           gateway_proxy_enabled: Enable gateway proxy filtering on TCP.
 
           gateway_udp_proxy_enabled: Enable gateway proxy filtering on UDP.
@@ -182,6 +372,11 @@ async def update(
             f"/accounts/{account_id}/devices/settings",
             body=await async_maybe_transform(
                 {
+                    "disable_for_time": disable_for_time,
+                    "external_emergency_signal_enabled": external_emergency_signal_enabled,
+                    "external_emergency_signal_fingerprint": external_emergency_signal_fingerprint,
+                    "external_emergency_signal_interval": external_emergency_signal_interval,
+                    "external_emergency_signal_url": external_emergency_signal_url,
                     "gateway_proxy_enabled": gateway_proxy_enabled,
                     "gateway_udp_proxy_enabled": gateway_udp_proxy_enabled,
                     "root_certificate_installation_enabled": root_certificate_installation_enabled,
@@ -199,7 +394,129 @@ async def update(
             cast_to=cast(Type[Optional[DeviceSettings]], ResultWrapper[DeviceSettings]),
         )
 
-    async def list(
+    async def delete(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DeviceSettings]:
+        """
+        Resets the current device settings for a Zero Trust account.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/devices/settings",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DeviceSettings]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DeviceSettings]], ResultWrapper[DeviceSettings]),
+        )
+
+    async def edit(
+        self,
+        *,
+        account_id: str,
+        disable_for_time: float | Omit = omit,
+        external_emergency_signal_enabled: bool | Omit = omit,
+        external_emergency_signal_fingerprint: str | Omit = omit,
+        external_emergency_signal_interval: str | Omit = omit,
+        external_emergency_signal_url: str | Omit = omit,
+        gateway_proxy_enabled: bool | Omit = omit,
+        gateway_udp_proxy_enabled: bool | Omit = omit,
+        root_certificate_installation_enabled: bool | Omit = omit,
+        use_zt_virtual_ip: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DeviceSettings]:
+        """
+        Patches the current device settings for a Zero Trust account.
+
+        Args:
+          disable_for_time: Sets the time limit, in seconds, that a user can use an override code to bypass
+              WARP.
+
+          external_emergency_signal_enabled: Controls whether the external emergency disconnect feature is enabled.
+
+          external_emergency_signal_fingerprint: The SHA256 fingerprint (64 hexadecimal characters) of the HTTPS server
+              certificate for the external_emergency_signal_url. If provided, the WARP client
+              will use this value to verify the server's identity. The device will ignore any
+              response if the server's certificate fingerprint does not exactly match this
+              value.
+
+          external_emergency_signal_interval: The interval at which the WARP client fetches the emergency disconnect signal,
+              formatted as a duration string (e.g., "5m", "2m30s", "1h"). Minimum 30 seconds.
+
+          external_emergency_signal_url: The HTTPS URL from which to fetch the emergency disconnect signal. Must use
+              HTTPS and have an IPv4 or IPv6 address as the host.
+
+          gateway_proxy_enabled: Enable gateway proxy filtering on TCP.
+
+          gateway_udp_proxy_enabled: Enable gateway proxy filtering on UDP.
+
+          root_certificate_installation_enabled: Enable installation of cloudflare managed root certificate.
+
+          use_zt_virtual_ip: Enable using CGNAT virtual IPv4.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/devices/settings",
+            body=await async_maybe_transform(
+                {
+                    "disable_for_time": disable_for_time,
+                    "external_emergency_signal_enabled": external_emergency_signal_enabled,
+                    "external_emergency_signal_fingerprint": external_emergency_signal_fingerprint,
+                    "external_emergency_signal_interval": external_emergency_signal_interval,
+                    "external_emergency_signal_url": external_emergency_signal_url,
+                    "gateway_proxy_enabled": gateway_proxy_enabled,
+                    "gateway_udp_proxy_enabled": gateway_udp_proxy_enabled,
+                    "root_certificate_installation_enabled": root_certificate_installation_enabled,
+                    "use_zt_virtual_ip": use_zt_virtual_ip,
+                },
+                setting_edit_params.SettingEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DeviceSettings]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DeviceSettings]], ResultWrapper[DeviceSettings]),
+        )
+
+    async def get(
         self,
         *,
         account_id: str,
@@ -208,7 +525,7 @@ async def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[DeviceSettings]:
         """
         Describes the current device settings for a Zero Trust account.
@@ -244,8 +561,14 @@ def __init__(self, settings: SettingsResource) -> None:
         self.update = to_raw_response_wrapper(
             settings.update,
         )
-        self.list = to_raw_response_wrapper(
-            settings.list,
+        self.delete = to_raw_response_wrapper(
+            settings.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            settings.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            settings.get,
         )
 
 
@@ -256,8 +579,14 @@ def __init__(self, settings: AsyncSettingsResource) -> None:
         self.update = async_to_raw_response_wrapper(
             settings.update,
         )
-        self.list = async_to_raw_response_wrapper(
-            settings.list,
+        self.delete = async_to_raw_response_wrapper(
+            settings.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            settings.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            settings.get,
         )
 
 
@@ -268,8 +597,14 @@ def __init__(self, settings: SettingsResource) -> None:
         self.update = to_streamed_response_wrapper(
             settings.update,
         )
-        self.list = to_streamed_response_wrapper(
-            settings.list,
+        self.delete = to_streamed_response_wrapper(
+            settings.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            settings.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            settings.get,
         )
 
 
@@ -280,6 +615,12 @@ def __init__(self, settings: AsyncSettingsResource) -> None:
         self.update = async_to_streamed_response_wrapper(
             settings.update,
         )
-        self.list = async_to_streamed_response_wrapper(
-            settings.list,
+        self.delete = async_to_streamed_response_wrapper(
+            settings.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            settings.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            settings.get,
         )
diff --git a/src/cloudflare/resources/zero_trust/devices/unrevoke.py b/src/cloudflare/resources/zero_trust/devices/unrevoke.py
index 014c732f987..c2763bff599 100644
--- a/src/cloudflare/resources/zero_trust/devices/unrevoke.py
+++ b/src/cloudflare/resources/zero_trust/devices/unrevoke.py
@@ -2,15 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, List, cast
+import typing_extensions
+from typing import Any, Optional, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, SequenceNotStr, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -21,7 +19,6 @@
 )
 from ...._wrappers import ResultWrapper
 from ...._base_client import make_request_options
-from ....types.zero_trust.devices import unrevoke_create_params
 from ....types.zero_trust.devices.unrevoke_create_response import UnrevokeCreateResponse
 
 __all__ = ["UnrevokeResource", "AsyncUnrevokeResource"]
@@ -30,29 +27,47 @@
 class UnrevokeResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> UnrevokeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return UnrevokeResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> UnrevokeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return UnrevokeResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     def create(
         self,
         *,
         account_id: str,
-        body: List[str],
+        body: SequenceNotStr[str],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> UnrevokeCreateResponse:
-        """
-        Unrevokes a list of devices.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UnrevokeCreateResponse]:
+        """Unrevokes a list of devices.
+
+        Not supported when
+        [multi-user mode](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-multiuser/)
+        is enabled.
+
+        **Deprecated**: please use POST
+        /accounts/{account_id}/devices/registrations/unrevoke instead.
 
         Args:
-          body: A list of device ids to unrevoke.
+          body: A list of Registration IDs to unrevoke.
 
           extra_headers: Send extra headers
 
@@ -65,16 +80,16 @@ def create(
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return cast(
-            UnrevokeCreateResponse,
+            Optional[UnrevokeCreateResponse],
             self._post(
                 f"/accounts/{account_id}/devices/unrevoke",
-                body=maybe_transform(body, unrevoke_create_params.UnrevokeCreateParams),
+                body=maybe_transform(body, SequenceNotStr[str]),
                 options=make_request_options(
                     extra_headers=extra_headers,
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[UnrevokeCreateResponse]._unwrapper,
+                    post_parser=ResultWrapper[Optional[UnrevokeCreateResponse]]._unwrapper,
                 ),
                 cast_to=cast(
                     Any, ResultWrapper[UnrevokeCreateResponse]
@@ -86,29 +101,47 @@ def create(
 class AsyncUnrevokeResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncUnrevokeResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncUnrevokeResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncUnrevokeResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncUnrevokeResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated("deprecated")
     async def create(
         self,
         *,
         account_id: str,
-        body: List[str],
+        body: SequenceNotStr[str],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> UnrevokeCreateResponse:
-        """
-        Unrevokes a list of devices.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UnrevokeCreateResponse]:
+        """Unrevokes a list of devices.
+
+        Not supported when
+        [multi-user mode](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-multiuser/)
+        is enabled.
+
+        **Deprecated**: please use POST
+        /accounts/{account_id}/devices/registrations/unrevoke instead.
 
         Args:
-          body: A list of device ids to unrevoke.
+          body: A list of Registration IDs to unrevoke.
 
           extra_headers: Send extra headers
 
@@ -121,16 +154,16 @@ async def create(
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return cast(
-            UnrevokeCreateResponse,
+            Optional[UnrevokeCreateResponse],
             await self._post(
                 f"/accounts/{account_id}/devices/unrevoke",
-                body=await async_maybe_transform(body, unrevoke_create_params.UnrevokeCreateParams),
+                body=await async_maybe_transform(body, SequenceNotStr[str]),
                 options=make_request_options(
                     extra_headers=extra_headers,
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[UnrevokeCreateResponse]._unwrapper,
+                    post_parser=ResultWrapper[Optional[UnrevokeCreateResponse]]._unwrapper,
                 ),
                 cast_to=cast(
                     Any, ResultWrapper[UnrevokeCreateResponse]
@@ -143,8 +176,10 @@ class UnrevokeResourceWithRawResponse:
     def __init__(self, unrevoke: UnrevokeResource) -> None:
         self._unrevoke = unrevoke
 
-        self.create = to_raw_response_wrapper(
-            unrevoke.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                unrevoke.create,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -152,8 +187,10 @@ class AsyncUnrevokeResourceWithRawResponse:
     def __init__(self, unrevoke: AsyncUnrevokeResource) -> None:
         self._unrevoke = unrevoke
 
-        self.create = async_to_raw_response_wrapper(
-            unrevoke.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                unrevoke.create,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -161,8 +198,10 @@ class UnrevokeResourceWithStreamingResponse:
     def __init__(self, unrevoke: UnrevokeResource) -> None:
         self._unrevoke = unrevoke
 
-        self.create = to_streamed_response_wrapper(
-            unrevoke.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                unrevoke.create,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -170,6 +209,8 @@ class AsyncUnrevokeResourceWithStreamingResponse:
     def __init__(self, unrevoke: AsyncUnrevokeResource) -> None:
         self._unrevoke = unrevoke
 
-        self.create = async_to_streamed_response_wrapper(
-            unrevoke.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                unrevoke.create,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/zero_trust/dex/__init__.py b/src/cloudflare/resources/zero_trust/dex/__init__.py
index b79e8e9ec69..c088f4cb408 100644
--- a/src/cloudflare/resources/zero_trust/dex/__init__.py
+++ b/src/cloudflare/resources/zero_trust/dex/__init__.py
@@ -24,6 +24,14 @@
     TestsResourceWithStreamingResponse,
     AsyncTestsResourceWithStreamingResponse,
 )
+from .commands import (
+    CommandsResource,
+    AsyncCommandsResource,
+    CommandsResourceWithRawResponse,
+    AsyncCommandsResourceWithRawResponse,
+    CommandsResourceWithStreamingResponse,
+    AsyncCommandsResourceWithStreamingResponse,
+)
 from .http_tests import (
     HTTPTestsResource,
     AsyncHTTPTestsResource,
@@ -48,6 +56,14 @@
     TracerouteTestsResourceWithStreamingResponse,
     AsyncTracerouteTestsResourceWithStreamingResponse,
 )
+from .warp_change_events import (
+    WARPChangeEventsResource,
+    AsyncWARPChangeEventsResource,
+    WARPChangeEventsResourceWithRawResponse,
+    AsyncWARPChangeEventsResourceWithRawResponse,
+    WARPChangeEventsResourceWithStreamingResponse,
+    AsyncWARPChangeEventsResourceWithStreamingResponse,
+)
 from .traceroute_test_results import (
     TracerouteTestResultsResource,
     AsyncTracerouteTestResultsResource,
@@ -58,6 +74,18 @@
 )
 
 __all__ = [
+    "WARPChangeEventsResource",
+    "AsyncWARPChangeEventsResource",
+    "WARPChangeEventsResourceWithRawResponse",
+    "AsyncWARPChangeEventsResourceWithRawResponse",
+    "WARPChangeEventsResourceWithStreamingResponse",
+    "AsyncWARPChangeEventsResourceWithStreamingResponse",
+    "CommandsResource",
+    "AsyncCommandsResource",
+    "CommandsResourceWithRawResponse",
+    "AsyncCommandsResourceWithRawResponse",
+    "CommandsResourceWithStreamingResponse",
+    "AsyncCommandsResourceWithStreamingResponse",
     "ColosResource",
     "AsyncColosResource",
     "ColosResourceWithRawResponse",
diff --git a/src/cloudflare/resources/zero_trust/dex/colos.py b/src/cloudflare/resources/zero_trust/dex/colos.py
index 3fe36f0bd12..b7040e0eabb 100644
--- a/src/cloudflare/resources/zero_trust/dex/colos.py
+++ b/src/cloudflare/resources/zero_trust/dex/colos.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ...._utils import maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
@@ -19,6 +19,7 @@
 from ....pagination import SyncSinglePage, AsyncSinglePage
 from ...._base_client import AsyncPaginator, make_request_options
 from ....types.zero_trust.dex import colo_list_params
+from ....types.zero_trust.dex.colo_list_response import ColoListResponse
 
 __all__ = ["ColosResource", "AsyncColosResource"]
 
@@ -26,10 +27,21 @@
 class ColosResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ColosResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ColosResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ColosResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ColosResourceWithStreamingResponse(self)
 
     def list(
@@ -38,23 +50,23 @@ def list(
         account_id: str,
         from_: str,
         to: str,
-        sort_by: Literal["fleet-status-usage", "application-tests-usage"] | NotGiven = NOT_GIVEN,
+        sort_by: Literal["fleet-status-usage", "application-tests-usage"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[object]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[ColoListResponse]:
         """
         List Cloudflare colos that account's devices were connected to during a time
         period, sorted by usage starting from the most used colo. Colos without traffic
         are also returned and sorted alphabetically.
 
         Args:
-          from_: Start time for connection period in RFC3339 (ISO 8601) format.
+          from_: Start time for connection period in ISO (RFC3339 - ISO 8601) format
 
-          to: End time for connection period in RFC3339 (ISO 8601) format.
+          to: End time for connection period in ISO (RFC3339 - ISO 8601) format
 
           sort_by: Type of usage that colos should be sorted by. If unspecified, returns all
               Cloudflare colos sorted alphabetically.
@@ -71,7 +83,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/dex/colos",
-            page=SyncSinglePage[object],
+            page=SyncSinglePage[ColoListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -86,17 +98,28 @@ def list(
                     colo_list_params.ColoListParams,
                 ),
             ),
-            model=object,
+            model=ColoListResponse,
         )
 
 
 class AsyncColosResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncColosResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncColosResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncColosResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncColosResourceWithStreamingResponse(self)
 
     def list(
@@ -105,23 +128,23 @@ def list(
         account_id: str,
         from_: str,
         to: str,
-        sort_by: Literal["fleet-status-usage", "application-tests-usage"] | NotGiven = NOT_GIVEN,
+        sort_by: Literal["fleet-status-usage", "application-tests-usage"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[object, AsyncSinglePage[object]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ColoListResponse, AsyncSinglePage[ColoListResponse]]:
         """
         List Cloudflare colos that account's devices were connected to during a time
         period, sorted by usage starting from the most used colo. Colos without traffic
         are also returned and sorted alphabetically.
 
         Args:
-          from_: Start time for connection period in RFC3339 (ISO 8601) format.
+          from_: Start time for connection period in ISO (RFC3339 - ISO 8601) format
 
-          to: End time for connection period in RFC3339 (ISO 8601) format.
+          to: End time for connection period in ISO (RFC3339 - ISO 8601) format
 
           sort_by: Type of usage that colos should be sorted by. If unspecified, returns all
               Cloudflare colos sorted alphabetically.
@@ -138,7 +161,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/dex/colos",
-            page=AsyncSinglePage[object],
+            page=AsyncSinglePage[ColoListResponse],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -153,7 +176,7 @@ def list(
                     colo_list_params.ColoListParams,
                 ),
             ),
-            model=object,
+            model=ColoListResponse,
         )
 
 
diff --git a/src/cloudflare/resources/zero_trust/dex/commands/__init__.py b/src/cloudflare/resources/zero_trust/dex/commands/__init__.py
new file mode 100644
index 00000000000..c144add2581
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dex/commands/__init__.py
@@ -0,0 +1,61 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .quota import (
+    QuotaResource,
+    AsyncQuotaResource,
+    QuotaResourceWithRawResponse,
+    AsyncQuotaResourceWithRawResponse,
+    QuotaResourceWithStreamingResponse,
+    AsyncQuotaResourceWithStreamingResponse,
+)
+from .devices import (
+    DevicesResource,
+    AsyncDevicesResource,
+    DevicesResourceWithRawResponse,
+    AsyncDevicesResourceWithRawResponse,
+    DevicesResourceWithStreamingResponse,
+    AsyncDevicesResourceWithStreamingResponse,
+)
+from .commands import (
+    CommandsResource,
+    AsyncCommandsResource,
+    CommandsResourceWithRawResponse,
+    AsyncCommandsResourceWithRawResponse,
+    CommandsResourceWithStreamingResponse,
+    AsyncCommandsResourceWithStreamingResponse,
+)
+from .downloads import (
+    DownloadsResource,
+    AsyncDownloadsResource,
+    DownloadsResourceWithRawResponse,
+    AsyncDownloadsResourceWithRawResponse,
+    DownloadsResourceWithStreamingResponse,
+    AsyncDownloadsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "DevicesResource",
+    "AsyncDevicesResource",
+    "DevicesResourceWithRawResponse",
+    "AsyncDevicesResourceWithRawResponse",
+    "DevicesResourceWithStreamingResponse",
+    "AsyncDevicesResourceWithStreamingResponse",
+    "DownloadsResource",
+    "AsyncDownloadsResource",
+    "DownloadsResourceWithRawResponse",
+    "AsyncDownloadsResourceWithRawResponse",
+    "DownloadsResourceWithStreamingResponse",
+    "AsyncDownloadsResourceWithStreamingResponse",
+    "QuotaResource",
+    "AsyncQuotaResource",
+    "QuotaResourceWithRawResponse",
+    "AsyncQuotaResourceWithRawResponse",
+    "QuotaResourceWithStreamingResponse",
+    "AsyncQuotaResourceWithStreamingResponse",
+    "CommandsResource",
+    "AsyncCommandsResource",
+    "CommandsResourceWithRawResponse",
+    "AsyncCommandsResourceWithRawResponse",
+    "CommandsResourceWithStreamingResponse",
+    "AsyncCommandsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/dex/commands/commands.py b/src/cloudflare/resources/zero_trust/dex/commands/commands.py
new file mode 100644
index 00000000000..67a335103cc
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dex/commands/commands.py
@@ -0,0 +1,446 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Union, Iterable, Optional, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from .quota import (
+    QuotaResource,
+    AsyncQuotaResource,
+    QuotaResourceWithRawResponse,
+    AsyncQuotaResourceWithRawResponse,
+    QuotaResourceWithStreamingResponse,
+    AsyncQuotaResourceWithStreamingResponse,
+)
+from .devices import (
+    DevicesResource,
+    AsyncDevicesResource,
+    DevicesResourceWithRawResponse,
+    AsyncDevicesResourceWithRawResponse,
+    DevicesResourceWithStreamingResponse,
+    AsyncDevicesResourceWithStreamingResponse,
+)
+from .downloads import (
+    DownloadsResource,
+    AsyncDownloadsResource,
+    DownloadsResourceWithRawResponse,
+    AsyncDownloadsResourceWithRawResponse,
+    DownloadsResourceWithStreamingResponse,
+    AsyncDownloadsResourceWithStreamingResponse,
+)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from .....pagination import SyncV4PagePagination, AsyncV4PagePagination
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.zero_trust.dex import command_list_params, command_create_params
+from .....types.zero_trust.dex.command_list_response import CommandListResponse
+from .....types.zero_trust.dex.command_create_response import CommandCreateResponse
+
+__all__ = ["CommandsResource", "AsyncCommandsResource"]
+
+
+class CommandsResource(SyncAPIResource):
+    @cached_property
+    def devices(self) -> DevicesResource:
+        return DevicesResource(self._client)
+
+    @cached_property
+    def downloads(self) -> DownloadsResource:
+        return DownloadsResource(self._client)
+
+    @cached_property
+    def quota(self) -> QuotaResource:
+        return QuotaResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> CommandsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CommandsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CommandsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CommandsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        commands: Iterable[command_create_params.Command],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CommandCreateResponse]:
+        """
+        Initiate commands for up to 10 devices per account
+
+        Args:
+          commands: List of device-level commands to execute
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/dex/commands",
+            body=maybe_transform({"commands": commands}, command_create_params.CommandCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CommandCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CommandCreateResponse]], ResultWrapper[CommandCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: float,
+        per_page: float,
+        command_type: str | Omit = omit,
+        device_id: str | Omit = omit,
+        from_: Union[str, datetime] | Omit = omit,
+        status: Literal["PENDING_EXEC", "PENDING_UPLOAD", "SUCCESS", "FAILED"] | Omit = omit,
+        to: Union[str, datetime] | Omit = omit,
+        user_email: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePagination[Optional[CommandListResponse]]:
+        """
+        Retrieves a paginated list of commands issued to devices under the specified
+        account, optionally filtered by time range, device, or other parameters
+
+        Args:
+          page: Page number for pagination
+
+          per_page: Number of results per page
+
+          command_type: Optionally filter executed commands by command type
+
+          device_id: Unique identifier for a device
+
+          from_: Start time for the query in ISO (RFC3339 - ISO 8601) format
+
+          status: Optionally filter executed commands by status
+
+          to: End time for the query in ISO (RFC3339 - ISO 8601) format
+
+          user_email: Email tied to the device
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dex/commands",
+            page=SyncV4PagePagination[Optional[CommandListResponse]],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "command_type": command_type,
+                        "device_id": device_id,
+                        "from_": from_,
+                        "status": status,
+                        "to": to,
+                        "user_email": user_email,
+                    },
+                    command_list_params.CommandListParams,
+                ),
+            ),
+            model=CommandListResponse,
+        )
+
+
+class AsyncCommandsResource(AsyncAPIResource):
+    @cached_property
+    def devices(self) -> AsyncDevicesResource:
+        return AsyncDevicesResource(self._client)
+
+    @cached_property
+    def downloads(self) -> AsyncDownloadsResource:
+        return AsyncDownloadsResource(self._client)
+
+    @cached_property
+    def quota(self) -> AsyncQuotaResource:
+        return AsyncQuotaResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncCommandsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCommandsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCommandsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCommandsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        commands: Iterable[command_create_params.Command],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CommandCreateResponse]:
+        """
+        Initiate commands for up to 10 devices per account
+
+        Args:
+          commands: List of device-level commands to execute
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/dex/commands",
+            body=await async_maybe_transform({"commands": commands}, command_create_params.CommandCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CommandCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CommandCreateResponse]], ResultWrapper[CommandCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: float,
+        per_page: float,
+        command_type: str | Omit = omit,
+        device_id: str | Omit = omit,
+        from_: Union[str, datetime] | Omit = omit,
+        status: Literal["PENDING_EXEC", "PENDING_UPLOAD", "SUCCESS", "FAILED"] | Omit = omit,
+        to: Union[str, datetime] | Omit = omit,
+        user_email: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Optional[CommandListResponse], AsyncV4PagePagination[Optional[CommandListResponse]]]:
+        """
+        Retrieves a paginated list of commands issued to devices under the specified
+        account, optionally filtered by time range, device, or other parameters
+
+        Args:
+          page: Page number for pagination
+
+          per_page: Number of results per page
+
+          command_type: Optionally filter executed commands by command type
+
+          device_id: Unique identifier for a device
+
+          from_: Start time for the query in ISO (RFC3339 - ISO 8601) format
+
+          status: Optionally filter executed commands by status
+
+          to: End time for the query in ISO (RFC3339 - ISO 8601) format
+
+          user_email: Email tied to the device
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dex/commands",
+            page=AsyncV4PagePagination[Optional[CommandListResponse]],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "command_type": command_type,
+                        "device_id": device_id,
+                        "from_": from_,
+                        "status": status,
+                        "to": to,
+                        "user_email": user_email,
+                    },
+                    command_list_params.CommandListParams,
+                ),
+            ),
+            model=CommandListResponse,
+        )
+
+
+class CommandsResourceWithRawResponse:
+    def __init__(self, commands: CommandsResource) -> None:
+        self._commands = commands
+
+        self.create = to_raw_response_wrapper(
+            commands.create,
+        )
+        self.list = to_raw_response_wrapper(
+            commands.list,
+        )
+
+    @cached_property
+    def devices(self) -> DevicesResourceWithRawResponse:
+        return DevicesResourceWithRawResponse(self._commands.devices)
+
+    @cached_property
+    def downloads(self) -> DownloadsResourceWithRawResponse:
+        return DownloadsResourceWithRawResponse(self._commands.downloads)
+
+    @cached_property
+    def quota(self) -> QuotaResourceWithRawResponse:
+        return QuotaResourceWithRawResponse(self._commands.quota)
+
+
+class AsyncCommandsResourceWithRawResponse:
+    def __init__(self, commands: AsyncCommandsResource) -> None:
+        self._commands = commands
+
+        self.create = async_to_raw_response_wrapper(
+            commands.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            commands.list,
+        )
+
+    @cached_property
+    def devices(self) -> AsyncDevicesResourceWithRawResponse:
+        return AsyncDevicesResourceWithRawResponse(self._commands.devices)
+
+    @cached_property
+    def downloads(self) -> AsyncDownloadsResourceWithRawResponse:
+        return AsyncDownloadsResourceWithRawResponse(self._commands.downloads)
+
+    @cached_property
+    def quota(self) -> AsyncQuotaResourceWithRawResponse:
+        return AsyncQuotaResourceWithRawResponse(self._commands.quota)
+
+
+class CommandsResourceWithStreamingResponse:
+    def __init__(self, commands: CommandsResource) -> None:
+        self._commands = commands
+
+        self.create = to_streamed_response_wrapper(
+            commands.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            commands.list,
+        )
+
+    @cached_property
+    def devices(self) -> DevicesResourceWithStreamingResponse:
+        return DevicesResourceWithStreamingResponse(self._commands.devices)
+
+    @cached_property
+    def downloads(self) -> DownloadsResourceWithStreamingResponse:
+        return DownloadsResourceWithStreamingResponse(self._commands.downloads)
+
+    @cached_property
+    def quota(self) -> QuotaResourceWithStreamingResponse:
+        return QuotaResourceWithStreamingResponse(self._commands.quota)
+
+
+class AsyncCommandsResourceWithStreamingResponse:
+    def __init__(self, commands: AsyncCommandsResource) -> None:
+        self._commands = commands
+
+        self.create = async_to_streamed_response_wrapper(
+            commands.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            commands.list,
+        )
+
+    @cached_property
+    def devices(self) -> AsyncDevicesResourceWithStreamingResponse:
+        return AsyncDevicesResourceWithStreamingResponse(self._commands.devices)
+
+    @cached_property
+    def downloads(self) -> AsyncDownloadsResourceWithStreamingResponse:
+        return AsyncDownloadsResourceWithStreamingResponse(self._commands.downloads)
+
+    @cached_property
+    def quota(self) -> AsyncQuotaResourceWithStreamingResponse:
+        return AsyncQuotaResourceWithStreamingResponse(self._commands.quota)
diff --git a/src/cloudflare/resources/zero_trust/dex/commands/devices.py b/src/cloudflare/resources/zero_trust/dex/commands/devices.py
new file mode 100644
index 00000000000..f48131bf7ee
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dex/commands/devices.py
@@ -0,0 +1,212 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from .....pagination import SyncV4PagePagination, AsyncV4PagePagination
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.zero_trust.dex.commands import device_list_params
+from .....types.zero_trust.dex.commands.device_list_response import DeviceListResponse
+
+__all__ = ["DevicesResource", "AsyncDevicesResource"]
+
+
+class DevicesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> DevicesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return DevicesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> DevicesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return DevicesResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: float,
+        per_page: float,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePagination[Optional[DeviceListResponse]]:
+        """
+        List devices with WARP client support for remote captures which have been
+        connected in the last 1 hour.
+
+        Args:
+          page: Page number of paginated results
+
+          per_page: Number of items per page
+
+          search: Filter devices by name or email
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dex/commands/devices",
+            page=SyncV4PagePagination[Optional[DeviceListResponse]],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    device_list_params.DeviceListParams,
+                ),
+            ),
+            model=DeviceListResponse,
+        )
+
+
+class AsyncDevicesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncDevicesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncDevicesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncDevicesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncDevicesResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        page: float,
+        per_page: float,
+        search: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Optional[DeviceListResponse], AsyncV4PagePagination[Optional[DeviceListResponse]]]:
+        """
+        List devices with WARP client support for remote captures which have been
+        connected in the last 1 hour.
+
+        Args:
+          page: Page number of paginated results
+
+          per_page: Number of items per page
+
+          search: Filter devices by name or email
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dex/commands/devices",
+            page=AsyncV4PagePagination[Optional[DeviceListResponse]],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "search": search,
+                    },
+                    device_list_params.DeviceListParams,
+                ),
+            ),
+            model=DeviceListResponse,
+        )
+
+
+class DevicesResourceWithRawResponse:
+    def __init__(self, devices: DevicesResource) -> None:
+        self._devices = devices
+
+        self.list = to_raw_response_wrapper(
+            devices.list,
+        )
+
+
+class AsyncDevicesResourceWithRawResponse:
+    def __init__(self, devices: AsyncDevicesResource) -> None:
+        self._devices = devices
+
+        self.list = async_to_raw_response_wrapper(
+            devices.list,
+        )
+
+
+class DevicesResourceWithStreamingResponse:
+    def __init__(self, devices: DevicesResource) -> None:
+        self._devices = devices
+
+        self.list = to_streamed_response_wrapper(
+            devices.list,
+        )
+
+
+class AsyncDevicesResourceWithStreamingResponse:
+    def __init__(self, devices: AsyncDevicesResource) -> None:
+        self._devices = devices
+
+        self.list = async_to_streamed_response_wrapper(
+            devices.list,
+        )
diff --git a/src/cloudflare/resources/zero_trust/dex/commands/downloads.py b/src/cloudflare/resources/zero_trust/dex/commands/downloads.py
new file mode 100644
index 00000000000..49d4323cba3
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dex/commands/downloads.py
@@ -0,0 +1,190 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ....._types import Body, Query, Headers, NotGiven, not_given
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    BinaryAPIResponse,
+    AsyncBinaryAPIResponse,
+    StreamedBinaryAPIResponse,
+    AsyncStreamedBinaryAPIResponse,
+    to_custom_raw_response_wrapper,
+    to_custom_streamed_response_wrapper,
+    async_to_custom_raw_response_wrapper,
+    async_to_custom_streamed_response_wrapper,
+)
+from ....._base_client import make_request_options
+
+__all__ = ["DownloadsResource", "AsyncDownloadsResource"]
+
+
+class DownloadsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> DownloadsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return DownloadsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> DownloadsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return DownloadsResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        filename: str,
+        *,
+        account_id: str,
+        command_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> BinaryAPIResponse:
+        """Downloads artifacts for an executed command.
+
+        Bulk downloads are not supported
+
+        Args:
+          command_id: Unique identifier for a command
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not command_id:
+            raise ValueError(f"Expected a non-empty value for `command_id` but received {command_id!r}")
+        if not filename:
+            raise ValueError(f"Expected a non-empty value for `filename` but received {filename!r}")
+        extra_headers = {"Accept": "application/zip", **(extra_headers or {})}
+        return self._get(
+            f"/accounts/{account_id}/dex/commands/{command_id}/downloads/{filename}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=BinaryAPIResponse,
+        )
+
+
+class AsyncDownloadsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncDownloadsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncDownloadsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncDownloadsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncDownloadsResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        filename: str,
+        *,
+        account_id: str,
+        command_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncBinaryAPIResponse:
+        """Downloads artifacts for an executed command.
+
+        Bulk downloads are not supported
+
+        Args:
+          command_id: Unique identifier for a command
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not command_id:
+            raise ValueError(f"Expected a non-empty value for `command_id` but received {command_id!r}")
+        if not filename:
+            raise ValueError(f"Expected a non-empty value for `filename` but received {filename!r}")
+        extra_headers = {"Accept": "application/zip", **(extra_headers or {})}
+        return await self._get(
+            f"/accounts/{account_id}/dex/commands/{command_id}/downloads/{filename}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=AsyncBinaryAPIResponse,
+        )
+
+
+class DownloadsResourceWithRawResponse:
+    def __init__(self, downloads: DownloadsResource) -> None:
+        self._downloads = downloads
+
+        self.get = to_custom_raw_response_wrapper(
+            downloads.get,
+            BinaryAPIResponse,
+        )
+
+
+class AsyncDownloadsResourceWithRawResponse:
+    def __init__(self, downloads: AsyncDownloadsResource) -> None:
+        self._downloads = downloads
+
+        self.get = async_to_custom_raw_response_wrapper(
+            downloads.get,
+            AsyncBinaryAPIResponse,
+        )
+
+
+class DownloadsResourceWithStreamingResponse:
+    def __init__(self, downloads: DownloadsResource) -> None:
+        self._downloads = downloads
+
+        self.get = to_custom_streamed_response_wrapper(
+            downloads.get,
+            StreamedBinaryAPIResponse,
+        )
+
+
+class AsyncDownloadsResourceWithStreamingResponse:
+    def __init__(self, downloads: AsyncDownloadsResource) -> None:
+        self._downloads = downloads
+
+        self.get = async_to_custom_streamed_response_wrapper(
+            downloads.get,
+            AsyncStreamedBinaryAPIResponse,
+        )
diff --git a/src/cloudflare/resources/zero_trust/dex/commands/quota.py b/src/cloudflare/resources/zero_trust/dex/commands/quota.py
new file mode 100644
index 00000000000..196340864a5
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dex/commands/quota.py
@@ -0,0 +1,176 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ....._types import Body, Query, Headers, NotGiven, not_given
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.zero_trust.dex.commands.quota_get_response import QuotaGetResponse
+
+__all__ = ["QuotaResource", "AsyncQuotaResource"]
+
+
+class QuotaResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> QuotaResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return QuotaResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> QuotaResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return QuotaResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[QuotaGetResponse]:
+        """
+        Retrieves the current quota usage and limits for device commands within a
+        specific account, including the time when the quota will reset
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/dex/commands/quota",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[QuotaGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[QuotaGetResponse]], ResultWrapper[QuotaGetResponse]),
+        )
+
+
+class AsyncQuotaResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncQuotaResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncQuotaResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncQuotaResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncQuotaResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[QuotaGetResponse]:
+        """
+        Retrieves the current quota usage and limits for device commands within a
+        specific account, including the time when the quota will reset
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/dex/commands/quota",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[QuotaGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[QuotaGetResponse]], ResultWrapper[QuotaGetResponse]),
+        )
+
+
+class QuotaResourceWithRawResponse:
+    def __init__(self, quota: QuotaResource) -> None:
+        self._quota = quota
+
+        self.get = to_raw_response_wrapper(
+            quota.get,
+        )
+
+
+class AsyncQuotaResourceWithRawResponse:
+    def __init__(self, quota: AsyncQuotaResource) -> None:
+        self._quota = quota
+
+        self.get = async_to_raw_response_wrapper(
+            quota.get,
+        )
+
+
+class QuotaResourceWithStreamingResponse:
+    def __init__(self, quota: QuotaResource) -> None:
+        self._quota = quota
+
+        self.get = to_streamed_response_wrapper(
+            quota.get,
+        )
+
+
+class AsyncQuotaResourceWithStreamingResponse:
+    def __init__(self, quota: AsyncQuotaResource) -> None:
+        self._quota = quota
+
+        self.get = async_to_streamed_response_wrapper(
+            quota.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/dex/dex.py b/src/cloudflare/resources/zero_trust/dex/dex.py
index 51c3e3dadf3..ae354ec6334 100644
--- a/src/cloudflare/resources/zero_trust/dex/dex.py
+++ b/src/cloudflare/resources/zero_trust/dex/dex.py
@@ -10,7 +10,8 @@
     ColosResourceWithStreamingResponse,
     AsyncColosResourceWithStreamingResponse,
 )
-from .tests import (
+from ...._compat import cached_property
+from .tests.tests import (
     TestsResource,
     AsyncTestsResource,
     TestsResourceWithRawResponse,
@@ -18,8 +19,32 @@
     TestsResourceWithStreamingResponse,
     AsyncTestsResourceWithStreamingResponse,
 )
-from ...._compat import cached_property
-from .http_tests import (
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .traceroute_tests import (
+    TracerouteTestsResource,
+    AsyncTracerouteTestsResource,
+    TracerouteTestsResourceWithRawResponse,
+    AsyncTracerouteTestsResourceWithRawResponse,
+    TracerouteTestsResourceWithStreamingResponse,
+    AsyncTracerouteTestsResourceWithStreamingResponse,
+)
+from .commands.commands import (
+    CommandsResource,
+    AsyncCommandsResource,
+    CommandsResourceWithRawResponse,
+    AsyncCommandsResourceWithRawResponse,
+    CommandsResourceWithStreamingResponse,
+    AsyncCommandsResourceWithStreamingResponse,
+)
+from .warp_change_events import (
+    WARPChangeEventsResource,
+    AsyncWARPChangeEventsResource,
+    WARPChangeEventsResourceWithRawResponse,
+    AsyncWARPChangeEventsResourceWithRawResponse,
+    WARPChangeEventsResourceWithStreamingResponse,
+    AsyncWARPChangeEventsResourceWithStreamingResponse,
+)
+from .http_tests.http_tests import (
     HTTPTestsResource,
     AsyncHTTPTestsResource,
     HTTPTestsResourceWithRawResponse,
@@ -27,9 +52,7 @@
     HTTPTestsResourceWithStreamingResponse,
     AsyncHTTPTestsResourceWithStreamingResponse,
 )
-from .tests.tests import TestsResource, AsyncTestsResource
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from .fleet_status import (
+from .fleet_status.fleet_status import (
     FleetStatusResource,
     AsyncFleetStatusResource,
     FleetStatusResourceWithRawResponse,
@@ -37,16 +60,7 @@
     FleetStatusResourceWithStreamingResponse,
     AsyncFleetStatusResourceWithStreamingResponse,
 )
-from .traceroute_tests import (
-    TracerouteTestsResource,
-    AsyncTracerouteTestsResource,
-    TracerouteTestsResourceWithRawResponse,
-    AsyncTracerouteTestsResourceWithRawResponse,
-    TracerouteTestsResourceWithStreamingResponse,
-    AsyncTracerouteTestsResourceWithStreamingResponse,
-)
-from .http_tests.http_tests import HTTPTestsResource, AsyncHTTPTestsResource
-from .traceroute_test_results import (
+from .traceroute_test_results.traceroute_test_results import (
     TracerouteTestResultsResource,
     AsyncTracerouteTestResultsResource,
     TracerouteTestResultsResourceWithRawResponse,
@@ -54,16 +68,19 @@
     TracerouteTestResultsResourceWithStreamingResponse,
     AsyncTracerouteTestResultsResourceWithStreamingResponse,
 )
-from .fleet_status.fleet_status import FleetStatusResource, AsyncFleetStatusResource
-from .traceroute_test_results.traceroute_test_results import (
-    TracerouteTestResultsResource,
-    AsyncTracerouteTestResultsResource,
-)
 
 __all__ = ["DEXResource", "AsyncDEXResource"]
 
 
 class DEXResource(SyncAPIResource):
+    @cached_property
+    def warp_change_events(self) -> WARPChangeEventsResource:
+        return WARPChangeEventsResource(self._client)
+
+    @cached_property
+    def commands(self) -> CommandsResource:
+        return CommandsResource(self._client)
+
     @cached_property
     def colos(self) -> ColosResource:
         return ColosResource(self._client)
@@ -90,14 +107,33 @@ def traceroute_tests(self) -> TracerouteTestsResource:
 
     @cached_property
     def with_raw_response(self) -> DEXResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DEXResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DEXResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DEXResourceWithStreamingResponse(self)
 
 
 class AsyncDEXResource(AsyncAPIResource):
+    @cached_property
+    def warp_change_events(self) -> AsyncWARPChangeEventsResource:
+        return AsyncWARPChangeEventsResource(self._client)
+
+    @cached_property
+    def commands(self) -> AsyncCommandsResource:
+        return AsyncCommandsResource(self._client)
+
     @cached_property
     def colos(self) -> AsyncColosResource:
         return AsyncColosResource(self._client)
@@ -124,10 +160,21 @@ def traceroute_tests(self) -> AsyncTracerouteTestsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncDEXResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDEXResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDEXResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDEXResourceWithStreamingResponse(self)
 
 
@@ -135,6 +182,14 @@ class DEXResourceWithRawResponse:
     def __init__(self, dex: DEXResource) -> None:
         self._dex = dex
 
+    @cached_property
+    def warp_change_events(self) -> WARPChangeEventsResourceWithRawResponse:
+        return WARPChangeEventsResourceWithRawResponse(self._dex.warp_change_events)
+
+    @cached_property
+    def commands(self) -> CommandsResourceWithRawResponse:
+        return CommandsResourceWithRawResponse(self._dex.commands)
+
     @cached_property
     def colos(self) -> ColosResourceWithRawResponse:
         return ColosResourceWithRawResponse(self._dex.colos)
@@ -164,6 +219,14 @@ class AsyncDEXResourceWithRawResponse:
     def __init__(self, dex: AsyncDEXResource) -> None:
         self._dex = dex
 
+    @cached_property
+    def warp_change_events(self) -> AsyncWARPChangeEventsResourceWithRawResponse:
+        return AsyncWARPChangeEventsResourceWithRawResponse(self._dex.warp_change_events)
+
+    @cached_property
+    def commands(self) -> AsyncCommandsResourceWithRawResponse:
+        return AsyncCommandsResourceWithRawResponse(self._dex.commands)
+
     @cached_property
     def colos(self) -> AsyncColosResourceWithRawResponse:
         return AsyncColosResourceWithRawResponse(self._dex.colos)
@@ -193,6 +256,14 @@ class DEXResourceWithStreamingResponse:
     def __init__(self, dex: DEXResource) -> None:
         self._dex = dex
 
+    @cached_property
+    def warp_change_events(self) -> WARPChangeEventsResourceWithStreamingResponse:
+        return WARPChangeEventsResourceWithStreamingResponse(self._dex.warp_change_events)
+
+    @cached_property
+    def commands(self) -> CommandsResourceWithStreamingResponse:
+        return CommandsResourceWithStreamingResponse(self._dex.commands)
+
     @cached_property
     def colos(self) -> ColosResourceWithStreamingResponse:
         return ColosResourceWithStreamingResponse(self._dex.colos)
@@ -222,6 +293,14 @@ class AsyncDEXResourceWithStreamingResponse:
     def __init__(self, dex: AsyncDEXResource) -> None:
         self._dex = dex
 
+    @cached_property
+    def warp_change_events(self) -> AsyncWARPChangeEventsResourceWithStreamingResponse:
+        return AsyncWARPChangeEventsResourceWithStreamingResponse(self._dex.warp_change_events)
+
+    @cached_property
+    def commands(self) -> AsyncCommandsResourceWithStreamingResponse:
+        return AsyncCommandsResourceWithStreamingResponse(self._dex.commands)
+
     @cached_property
     def colos(self) -> AsyncColosResourceWithStreamingResponse:
         return AsyncColosResourceWithStreamingResponse(self._dex.colos)
diff --git a/src/cloudflare/resources/zero_trust/dex/fleet_status/devices.py b/src/cloudflare/resources/zero_trust/dex/fleet_status/devices.py
index 6c09c4a5d31..21b9de0ada9 100644
--- a/src/cloudflare/resources/zero_trust/dex/fleet_status/devices.py
+++ b/src/cloudflare/resources/zero_trust/dex/fleet_status/devices.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ....._utils import maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
@@ -27,10 +27,21 @@
 class DevicesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> DevicesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DevicesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DevicesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DevicesResourceWithStreamingResponse(self)
 
     def list(
@@ -40,41 +51,33 @@ def list(
         from_: str,
         page: float,
         per_page: float,
-        source: Literal["last_seen", "hourly", "raw"],
         to: str,
-        colo: str | NotGiven = NOT_GIVEN,
-        device_id: str | NotGiven = NOT_GIVEN,
-        mode: str | NotGiven = NOT_GIVEN,
-        platform: str | NotGiven = NOT_GIVEN,
-        sort_by: Literal["colo", "device_id", "mode", "platform", "status", "timestamp", "version"]
-        | NotGiven = NOT_GIVEN,
-        status: str | NotGiven = NOT_GIVEN,
-        version: str | NotGiven = NOT_GIVEN,
+        colo: str | Omit = omit,
+        device_id: str | Omit = omit,
+        mode: str | Omit = omit,
+        platform: str | Omit = omit,
+        sort_by: Literal["colo", "device_id", "mode", "platform", "status", "timestamp", "version"] | Omit = omit,
+        source: Literal["last_seen", "hourly", "raw"] | Omit = omit,
+        status: str | Omit = omit,
+        version: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[DeviceListResponse]:
         """
         List details for devices using WARP
 
         Args:
-          from_: Timestamp in ISO format
-
-          page: Page number of paginated results
-
-          per_page: Number of items per page
+          from_: Time range beginning in ISO format
 
-          source:
-              Source:
+          page: Page number
 
-              - `hourly` - device details aggregated hourly, up to 7 days prior
-              - `last_seen` - device details, up to 24 hours prior
-              - `raw` - device details, up to 7 days prior
+          per_page: Number of results per page
 
-          to: Timestamp in ISO format
+          to: Time range end in ISO format
 
           colo: Cloudflare colo
 
@@ -86,6 +89,13 @@ def list(
 
           sort_by: Dimension to sort results by
 
+          source:
+              Source:
+
+              - `hourly` - device details aggregated hourly, up to 7 days prior
+              - `last_seen` - device details, up to 60 minutes prior
+              - `raw` - device details, up to 7 days prior
+
           status: Network status
 
           version: WARP client version
@@ -113,13 +123,13 @@ def list(
                         "from_": from_,
                         "page": page,
                         "per_page": per_page,
-                        "source": source,
                         "to": to,
                         "colo": colo,
                         "device_id": device_id,
                         "mode": mode,
                         "platform": platform,
                         "sort_by": sort_by,
+                        "source": source,
                         "status": status,
                         "version": version,
                     },
@@ -133,10 +143,21 @@ def list(
 class AsyncDevicesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncDevicesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDevicesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDevicesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDevicesResourceWithStreamingResponse(self)
 
     def list(
@@ -146,41 +167,33 @@ def list(
         from_: str,
         page: float,
         per_page: float,
-        source: Literal["last_seen", "hourly", "raw"],
         to: str,
-        colo: str | NotGiven = NOT_GIVEN,
-        device_id: str | NotGiven = NOT_GIVEN,
-        mode: str | NotGiven = NOT_GIVEN,
-        platform: str | NotGiven = NOT_GIVEN,
-        sort_by: Literal["colo", "device_id", "mode", "platform", "status", "timestamp", "version"]
-        | NotGiven = NOT_GIVEN,
-        status: str | NotGiven = NOT_GIVEN,
-        version: str | NotGiven = NOT_GIVEN,
+        colo: str | Omit = omit,
+        device_id: str | Omit = omit,
+        mode: str | Omit = omit,
+        platform: str | Omit = omit,
+        sort_by: Literal["colo", "device_id", "mode", "platform", "status", "timestamp", "version"] | Omit = omit,
+        source: Literal["last_seen", "hourly", "raw"] | Omit = omit,
+        status: str | Omit = omit,
+        version: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[DeviceListResponse, AsyncV4PagePaginationArray[DeviceListResponse]]:
         """
         List details for devices using WARP
 
         Args:
-          from_: Timestamp in ISO format
-
-          page: Page number of paginated results
-
-          per_page: Number of items per page
+          from_: Time range beginning in ISO format
 
-          source:
-              Source:
+          page: Page number
 
-              - `hourly` - device details aggregated hourly, up to 7 days prior
-              - `last_seen` - device details, up to 24 hours prior
-              - `raw` - device details, up to 7 days prior
+          per_page: Number of results per page
 
-          to: Timestamp in ISO format
+          to: Time range end in ISO format
 
           colo: Cloudflare colo
 
@@ -192,6 +205,13 @@ def list(
 
           sort_by: Dimension to sort results by
 
+          source:
+              Source:
+
+              - `hourly` - device details aggregated hourly, up to 7 days prior
+              - `last_seen` - device details, up to 60 minutes prior
+              - `raw` - device details, up to 7 days prior
+
           status: Network status
 
           version: WARP client version
@@ -219,13 +239,13 @@ def list(
                         "from_": from_,
                         "page": page,
                         "per_page": per_page,
-                        "source": source,
                         "to": to,
                         "colo": colo,
                         "device_id": device_id,
                         "mode": mode,
                         "platform": platform,
                         "sort_by": sort_by,
+                        "source": source,
                         "status": status,
                         "version": version,
                     },
diff --git a/src/cloudflare/resources/zero_trust/dex/fleet_status/fleet_status.py b/src/cloudflare/resources/zero_trust/dex/fleet_status/fleet_status.py
index 1633193de67..96010460e44 100644
--- a/src/cloudflare/resources/zero_trust/dex/fleet_status/fleet_status.py
+++ b/src/cloudflare/resources/zero_trust/dex/fleet_status/fleet_status.py
@@ -14,11 +14,8 @@
     DevicesResourceWithStreamingResponse,
     AsyncDevicesResourceWithStreamingResponse,
 )
-from ....._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -31,6 +28,7 @@
 from ....._base_client import make_request_options
 from .....types.zero_trust.dex import fleet_status_live_params, fleet_status_over_time_params
 from .....types.zero_trust.dex.fleet_status_live_response import FleetStatusLiveResponse
+from .....types.zero_trust.dex.fleet_status_over_time_response import FleetStatusOverTimeResponse
 
 __all__ = ["FleetStatusResource", "AsyncFleetStatusResource"]
 
@@ -42,10 +40,21 @@ def devices(self) -> DevicesResource:
 
     @cached_property
     def with_raw_response(self) -> FleetStatusResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return FleetStatusResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> FleetStatusResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return FleetStatusResourceWithStreamingResponse(self)
 
     def live(
@@ -58,7 +67,7 @@ def live(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[FleetStatusLiveResponse]:
         """
         List details for live (up to 60 minutes) devices using WARP
@@ -95,22 +104,22 @@ def over_time(
         account_id: str,
         from_: str,
         to: str,
-        colo: str | NotGiven = NOT_GIVEN,
-        device_id: str | NotGiven = NOT_GIVEN,
+        colo: str | Omit = omit,
+        device_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> None:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[FleetStatusOverTimeResponse]:
         """
         List details for devices using WARP, up to 7 days
 
         Args:
-          from_: Timestamp in ISO format
+          from_: Time range beginning in ISO format
 
-          to: Timestamp in ISO format
+          to: Time range end in ISO format
 
           colo: Cloudflare colo
 
@@ -126,7 +135,6 @@ def over_time(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
         return self._get(
             f"/accounts/{account_id}/dex/fleet-status/over-time",
             options=make_request_options(
@@ -143,8 +151,9 @@ def over_time(
                     },
                     fleet_status_over_time_params.FleetStatusOverTimeParams,
                 ),
+                post_parser=ResultWrapper[Optional[FleetStatusOverTimeResponse]]._unwrapper,
             ),
-            cast_to=NoneType,
+            cast_to=cast(Type[Optional[FleetStatusOverTimeResponse]], ResultWrapper[FleetStatusOverTimeResponse]),
         )
 
 
@@ -155,10 +164,21 @@ def devices(self) -> AsyncDevicesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncFleetStatusResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncFleetStatusResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncFleetStatusResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncFleetStatusResourceWithStreamingResponse(self)
 
     async def live(
@@ -171,7 +191,7 @@ async def live(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[FleetStatusLiveResponse]:
         """
         List details for live (up to 60 minutes) devices using WARP
@@ -210,22 +230,22 @@ async def over_time(
         account_id: str,
         from_: str,
         to: str,
-        colo: str | NotGiven = NOT_GIVEN,
-        device_id: str | NotGiven = NOT_GIVEN,
+        colo: str | Omit = omit,
+        device_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> None:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[FleetStatusOverTimeResponse]:
         """
         List details for devices using WARP, up to 7 days
 
         Args:
-          from_: Timestamp in ISO format
+          from_: Time range beginning in ISO format
 
-          to: Timestamp in ISO format
+          to: Time range end in ISO format
 
           colo: Cloudflare colo
 
@@ -241,7 +261,6 @@ async def over_time(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
         return await self._get(
             f"/accounts/{account_id}/dex/fleet-status/over-time",
             options=make_request_options(
@@ -258,8 +277,9 @@ async def over_time(
                     },
                     fleet_status_over_time_params.FleetStatusOverTimeParams,
                 ),
+                post_parser=ResultWrapper[Optional[FleetStatusOverTimeResponse]]._unwrapper,
             ),
-            cast_to=NoneType,
+            cast_to=cast(Type[Optional[FleetStatusOverTimeResponse]], ResultWrapper[FleetStatusOverTimeResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/zero_trust/dex/http_tests/http_tests.py b/src/cloudflare/resources/zero_trust/dex/http_tests/http_tests.py
index 4aeb2f1f978..58ce0db4487 100644
--- a/src/cloudflare/resources/zero_trust/dex/http_tests/http_tests.py
+++ b/src/cloudflare/resources/zero_trust/dex/http_tests/http_tests.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Optional, cast
+from typing import Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from .percentiles import (
     PercentilesResource,
@@ -43,10 +40,21 @@ def percentiles(self) -> PercentilesResource:
 
     @cached_property
     def with_raw_response(self) -> HTTPTestsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return HTTPTestsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> HTTPTestsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return HTTPTestsResourceWithStreamingResponse(self)
 
     def get(
@@ -57,14 +65,14 @@ def get(
         from_: str,
         interval: Literal["minute", "hour"],
         to: str,
-        colo: str | NotGiven = NOT_GIVEN,
-        device_id: List[str] | NotGiven = NOT_GIVEN,
+        colo: str | Omit = omit,
+        device_id: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[HTTPDetails]:
         """
         Get test details and aggregate performance metrics for an http test for a given
@@ -127,10 +135,21 @@ def percentiles(self) -> AsyncPercentilesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncHTTPTestsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncHTTPTestsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncHTTPTestsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncHTTPTestsResourceWithStreamingResponse(self)
 
     async def get(
@@ -141,14 +160,14 @@ async def get(
         from_: str,
         interval: Literal["minute", "hour"],
         to: str,
-        colo: str | NotGiven = NOT_GIVEN,
-        device_id: List[str] | NotGiven = NOT_GIVEN,
+        colo: str | Omit = omit,
+        device_id: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[HTTPDetails]:
         """
         Get test details and aggregate performance metrics for an http test for a given
diff --git a/src/cloudflare/resources/zero_trust/dex/http_tests/percentiles.py b/src/cloudflare/resources/zero_trust/dex/http_tests/percentiles.py
index 183aaf7958e..9416da48657 100644
--- a/src/cloudflare/resources/zero_trust/dex/http_tests/percentiles.py
+++ b/src/cloudflare/resources/zero_trust/dex/http_tests/percentiles.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -30,10 +27,21 @@
 class PercentilesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PercentilesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PercentilesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PercentilesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PercentilesResourceWithStreamingResponse(self)
 
     def get(
@@ -43,14 +51,14 @@ def get(
         account_id: str,
         from_: str,
         to: str,
-        colo: str | NotGiven = NOT_GIVEN,
-        device_id: List[str] | NotGiven = NOT_GIVEN,
+        colo: str | Omit = omit,
+        device_id: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[HTTPDetailsPercentiles]:
         """
         Get percentiles for an http test for a given time period between 1 hour and 7
@@ -59,9 +67,9 @@ def get(
         Args:
           test_id: API Resource UUID tag.
 
-          from_: Start time for aggregate metrics in ISO format
+          from_: Start time for the query in ISO (RFC3339 - ISO 8601) format
 
-          to: End time for aggregate metrics in ISO format
+          to: End time for the query in ISO (RFC3339 - ISO 8601) format
 
           colo: Optionally filter result stats to a Cloudflare colo. Cannot be used in
               combination with deviceId param.
@@ -106,10 +114,21 @@ def get(
 class AsyncPercentilesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPercentilesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPercentilesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPercentilesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPercentilesResourceWithStreamingResponse(self)
 
     async def get(
@@ -119,14 +138,14 @@ async def get(
         account_id: str,
         from_: str,
         to: str,
-        colo: str | NotGiven = NOT_GIVEN,
-        device_id: List[str] | NotGiven = NOT_GIVEN,
+        colo: str | Omit = omit,
+        device_id: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[HTTPDetailsPercentiles]:
         """
         Get percentiles for an http test for a given time period between 1 hour and 7
@@ -135,9 +154,9 @@ async def get(
         Args:
           test_id: API Resource UUID tag.
 
-          from_: Start time for aggregate metrics in ISO format
+          from_: Start time for the query in ISO (RFC3339 - ISO 8601) format
 
-          to: End time for aggregate metrics in ISO format
+          to: End time for the query in ISO (RFC3339 - ISO 8601) format
 
           colo: Optionally filter result stats to a Cloudflare colo. Cannot be used in
               combination with deviceId param.
diff --git a/src/cloudflare/resources/zero_trust/dex/tests/tests.py b/src/cloudflare/resources/zero_trust/dex/tests/tests.py
index e99c10c4809..25d4c954cdb 100644
--- a/src/cloudflare/resources/zero_trust/dex/tests/tests.py
+++ b/src/cloudflare/resources/zero_trust/dex/tests/tests.py
@@ -2,11 +2,12 @@
 
 from __future__ import annotations
 
-from typing import List
+from typing import Optional
+from typing_extensions import Literal
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
 from ....._utils import maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
@@ -27,7 +28,7 @@
 )
 from ....._base_client import AsyncPaginator, make_request_options
 from .....types.zero_trust.dex import test_list_params
-from .....types.zero_trust.dex.test_list_response import TestListResponse
+from .....types.zero_trust.dex.tests.tests import Tests
 
 __all__ = ["TestsResource", "AsyncTestsResource"]
 
@@ -41,30 +42,42 @@ def unique_devices(self) -> UniqueDevicesResource:
 
     @cached_property
     def with_raw_response(self) -> TestsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TestsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TestsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TestsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
-        colo: str | NotGiven = NOT_GIVEN,
-        device_id: List[str] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        test_name: str | NotGiven = NOT_GIVEN,
+        colo: str | Omit = omit,
+        device_id: SequenceNotStr[str] | Omit = omit,
+        kind: Literal["http", "traceroute"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        test_name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePagination[TestListResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePagination[Optional[Tests]]:
         """
-        List DEX tests
+        List DEX tests with overview metrics
 
         Args:
           colo: Optionally filter result stats to a Cloudflare colo. Cannot be used in
@@ -73,6 +86,8 @@ def list(
           device_id: Optionally filter result stats to a specific device(s). Cannot be used in
               combination with colo param.
 
+          kind: Filter by test type
+
           page: Page number of paginated results
 
           per_page: Number of items per page
@@ -90,8 +105,8 @@ def list(
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
-            f"/accounts/{account_id}/dex/tests",
-            page=SyncV4PagePagination[TestListResponse],
+            f"/accounts/{account_id}/dex/tests/overview",
+            page=SyncV4PagePagination[Optional[Tests]],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -101,6 +116,7 @@ def list(
                     {
                         "colo": colo,
                         "device_id": device_id,
+                        "kind": kind,
                         "page": page,
                         "per_page": per_page,
                         "test_name": test_name,
@@ -108,7 +124,7 @@ def list(
                     test_list_params.TestListParams,
                 ),
             ),
-            model=TestListResponse,
+            model=Tests,
         )
 
 
@@ -119,30 +135,42 @@ def unique_devices(self) -> AsyncUniqueDevicesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncTestsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTestsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTestsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTestsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
-        colo: str | NotGiven = NOT_GIVEN,
-        device_id: List[str] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        test_name: str | NotGiven = NOT_GIVEN,
+        colo: str | Omit = omit,
+        device_id: SequenceNotStr[str] | Omit = omit,
+        kind: Literal["http", "traceroute"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        test_name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[TestListResponse, AsyncV4PagePagination[TestListResponse]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Optional[Tests], AsyncV4PagePagination[Optional[Tests]]]:
         """
-        List DEX tests
+        List DEX tests with overview metrics
 
         Args:
           colo: Optionally filter result stats to a Cloudflare colo. Cannot be used in
@@ -151,6 +179,8 @@ def list(
           device_id: Optionally filter result stats to a specific device(s). Cannot be used in
               combination with colo param.
 
+          kind: Filter by test type
+
           page: Page number of paginated results
 
           per_page: Number of items per page
@@ -168,8 +198,8 @@ def list(
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
-            f"/accounts/{account_id}/dex/tests",
-            page=AsyncV4PagePagination[TestListResponse],
+            f"/accounts/{account_id}/dex/tests/overview",
+            page=AsyncV4PagePagination[Optional[Tests]],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -179,6 +209,7 @@ def list(
                     {
                         "colo": colo,
                         "device_id": device_id,
+                        "kind": kind,
                         "page": page,
                         "per_page": per_page,
                         "test_name": test_name,
@@ -186,7 +217,7 @@ def list(
                     test_list_params.TestListParams,
                 ),
             ),
-            model=TestListResponse,
+            model=Tests,
         )
 
 
diff --git a/src/cloudflare/resources/zero_trust/dex/tests/unique_devices.py b/src/cloudflare/resources/zero_trust/dex/tests/unique_devices.py
index a17988863a5..0cc5b6647ed 100644
--- a/src/cloudflare/resources/zero_trust/dex/tests/unique_devices.py
+++ b/src/cloudflare/resources/zero_trust/dex/tests/unique_devices.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -30,24 +27,35 @@
 class UniqueDevicesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> UniqueDevicesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return UniqueDevicesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> UniqueDevicesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return UniqueDevicesResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
-        device_id: List[str] | NotGiven = NOT_GIVEN,
-        test_name: str | NotGiven = NOT_GIVEN,
+        device_id: SequenceNotStr[str] | Omit = omit,
+        test_name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[UniqueDevices]:
         """
         Returns unique count of devices that have run synthetic application monitoring
@@ -92,24 +100,35 @@ def list(
 class AsyncUniqueDevicesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncUniqueDevicesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncUniqueDevicesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncUniqueDevicesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncUniqueDevicesResourceWithStreamingResponse(self)
 
     async def list(
         self,
         *,
         account_id: str,
-        device_id: List[str] | NotGiven = NOT_GIVEN,
-        test_name: str | NotGiven = NOT_GIVEN,
+        device_id: SequenceNotStr[str] | Omit = omit,
+        test_name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[UniqueDevices]:
         """
         Returns unique count of devices that have run synthetic application monitoring
diff --git a/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/network_path.py b/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/network_path.py
index 8033766601b..2d01628d26f 100644
--- a/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/network_path.py
+++ b/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/network_path.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ....._types import Body, Query, Headers, NotGiven, not_given
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -25,10 +25,21 @@
 class NetworkPathResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> NetworkPathResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return NetworkPathResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> NetworkPathResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return NetworkPathResourceWithStreamingResponse(self)
 
     def get(
@@ -41,7 +52,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[NetworkPathGetResponse]:
         """
         Get a breakdown of hops and performance metrics for a specific traceroute test
@@ -78,10 +89,21 @@ def get(
 class AsyncNetworkPathResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncNetworkPathResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncNetworkPathResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncNetworkPathResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncNetworkPathResourceWithStreamingResponse(self)
 
     async def get(
@@ -94,7 +116,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[NetworkPathGetResponse]:
         """
         Get a breakdown of hops and performance metrics for a specific traceroute test
diff --git a/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/traceroute_test_results.py b/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/traceroute_test_results.py
index abc3834ee8b..16bfe1811af 100644
--- a/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/traceroute_test_results.py
+++ b/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/traceroute_test_results.py
@@ -23,10 +23,21 @@ def network_path(self) -> NetworkPathResource:
 
     @cached_property
     def with_raw_response(self) -> TracerouteTestResultsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TracerouteTestResultsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TracerouteTestResultsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TracerouteTestResultsResourceWithStreamingResponse(self)
 
 
@@ -37,10 +48,21 @@ def network_path(self) -> AsyncNetworkPathResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncTracerouteTestResultsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTracerouteTestResultsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTracerouteTestResultsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTracerouteTestResultsResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/zero_trust/dex/traceroute_tests.py b/src/cloudflare/resources/zero_trust/dex/traceroute_tests.py
index b801c55a317..474ce3f2362 100644
--- a/src/cloudflare/resources/zero_trust/dex/traceroute_tests.py
+++ b/src/cloudflare/resources/zero_trust/dex/traceroute_tests.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Optional, cast
+from typing import Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -37,10 +34,21 @@
 class TracerouteTestsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> TracerouteTestsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TracerouteTestsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TracerouteTestsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return TracerouteTestsResourceWithStreamingResponse(self)
 
     def get(
@@ -51,14 +59,14 @@ def get(
         from_: str,
         interval: Literal["minute", "hour"],
         to: str,
-        colo: str | NotGiven = NOT_GIVEN,
-        device_id: List[str] | NotGiven = NOT_GIVEN,
+        colo: str | Omit = omit,
+        device_id: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Traceroute]:
         """
         Get test details and aggregate performance metrics for an traceroute test for a
@@ -127,7 +135,7 @@ def network_path(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[NetworkPathResponse]:
         """
         Get a breakdown of metrics by hop for individual traceroute test runs
@@ -183,14 +191,14 @@ def percentiles(
         account_id: str,
         from_: str,
         to: str,
-        colo: str | NotGiven = NOT_GIVEN,
-        device_id: List[str] | NotGiven = NOT_GIVEN,
+        colo: str | Omit = omit,
+        device_id: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TracerouteTestPercentilesResponse]:
         """
         Get percentiles for a traceroute test for a given time period between 1 hour and
@@ -199,9 +207,9 @@ def percentiles(
         Args:
           test_id: API Resource UUID tag.
 
-          from_: Start time for aggregate metrics in ISO format
+          from_: Start time for the query in ISO (RFC3339 - ISO 8601) format
 
-          to: End time for aggregate metrics in ISO format
+          to: End time for the query in ISO (RFC3339 - ISO 8601) format
 
           colo: Optionally filter result stats to a Cloudflare colo. Cannot be used in
               combination with deviceId param.
@@ -248,10 +256,21 @@ def percentiles(
 class AsyncTracerouteTestsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncTracerouteTestsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTracerouteTestsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTracerouteTestsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncTracerouteTestsResourceWithStreamingResponse(self)
 
     async def get(
@@ -262,14 +281,14 @@ async def get(
         from_: str,
         interval: Literal["minute", "hour"],
         to: str,
-        colo: str | NotGiven = NOT_GIVEN,
-        device_id: List[str] | NotGiven = NOT_GIVEN,
+        colo: str | Omit = omit,
+        device_id: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Traceroute]:
         """
         Get test details and aggregate performance metrics for an traceroute test for a
@@ -338,7 +357,7 @@ async def network_path(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[NetworkPathResponse]:
         """
         Get a breakdown of metrics by hop for individual traceroute test runs
@@ -394,14 +413,14 @@ async def percentiles(
         account_id: str,
         from_: str,
         to: str,
-        colo: str | NotGiven = NOT_GIVEN,
-        device_id: List[str] | NotGiven = NOT_GIVEN,
+        colo: str | Omit = omit,
+        device_id: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[TracerouteTestPercentilesResponse]:
         """
         Get percentiles for a traceroute test for a given time period between 1 hour and
@@ -410,9 +429,9 @@ async def percentiles(
         Args:
           test_id: API Resource UUID tag.
 
-          from_: Start time for aggregate metrics in ISO format
+          from_: Start time for the query in ISO (RFC3339 - ISO 8601) format
 
-          to: End time for aggregate metrics in ISO format
+          to: End time for the query in ISO (RFC3339 - ISO 8601) format
 
           colo: Optionally filter result stats to a Cloudflare colo. Cannot be used in
               combination with deviceId param.
diff --git a/src/cloudflare/resources/zero_trust/dex/warp_change_events.py b/src/cloudflare/resources/zero_trust/dex/warp_change_events.py
new file mode 100644
index 00000000000..0b2630a813d
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dex/warp_change_events.py
@@ -0,0 +1,261 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.zero_trust.dex import warp_change_event_get_params
+from ....types.zero_trust.dex.warp_change_event_get_response import WARPChangeEventGetResponse
+
+__all__ = ["WARPChangeEventsResource", "AsyncWARPChangeEventsResource"]
+
+
+class WARPChangeEventsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> WARPChangeEventsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return WARPChangeEventsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> WARPChangeEventsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return WARPChangeEventsResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        from_: str,
+        page: float,
+        per_page: float,
+        to: str,
+        account_name: str | Omit = omit,
+        config_name: str | Omit = omit,
+        sort_order: Literal["ASC", "DESC"] | Omit = omit,
+        toggle: Literal["on", "off"] | Omit = omit,
+        type: Literal["config", "toggle"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[WARPChangeEventGetResponse]:
+        """
+        List WARP configuration and enablement toggle change events by device.
+
+        Args:
+          from_: Start time for the query in ISO (RFC3339 - ISO 8601) format
+
+          page: Page number of paginated results
+
+          per_page: Number of items per page
+
+          to: End time for the query in ISO (RFC3339 - ISO 8601) format
+
+          account_name: Filter events by account name.
+
+          config_name: Filter events by WARP configuration name changed from or to. Applicable to
+              type='config' events only.
+
+          sort_order: Sort response by event timestamp.
+
+          toggle: Filter events by type toggle value. Applicable to type='toggle' events only.
+
+          type: Filter events by type 'config' or 'toggle'
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/dex/warp-change-events",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "from_": from_,
+                        "page": page,
+                        "per_page": per_page,
+                        "to": to,
+                        "account_name": account_name,
+                        "config_name": config_name,
+                        "sort_order": sort_order,
+                        "toggle": toggle,
+                        "type": type,
+                    },
+                    warp_change_event_get_params.WARPChangeEventGetParams,
+                ),
+                post_parser=ResultWrapper[Optional[WARPChangeEventGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[WARPChangeEventGetResponse]], ResultWrapper[WARPChangeEventGetResponse]),
+        )
+
+
+class AsyncWARPChangeEventsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncWARPChangeEventsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncWARPChangeEventsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncWARPChangeEventsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncWARPChangeEventsResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        *,
+        account_id: str,
+        from_: str,
+        page: float,
+        per_page: float,
+        to: str,
+        account_name: str | Omit = omit,
+        config_name: str | Omit = omit,
+        sort_order: Literal["ASC", "DESC"] | Omit = omit,
+        toggle: Literal["on", "off"] | Omit = omit,
+        type: Literal["config", "toggle"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[WARPChangeEventGetResponse]:
+        """
+        List WARP configuration and enablement toggle change events by device.
+
+        Args:
+          from_: Start time for the query in ISO (RFC3339 - ISO 8601) format
+
+          page: Page number of paginated results
+
+          per_page: Number of items per page
+
+          to: End time for the query in ISO (RFC3339 - ISO 8601) format
+
+          account_name: Filter events by account name.
+
+          config_name: Filter events by WARP configuration name changed from or to. Applicable to
+              type='config' events only.
+
+          sort_order: Sort response by event timestamp.
+
+          toggle: Filter events by type toggle value. Applicable to type='toggle' events only.
+
+          type: Filter events by type 'config' or 'toggle'
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/dex/warp-change-events",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {
+                        "from_": from_,
+                        "page": page,
+                        "per_page": per_page,
+                        "to": to,
+                        "account_name": account_name,
+                        "config_name": config_name,
+                        "sort_order": sort_order,
+                        "toggle": toggle,
+                        "type": type,
+                    },
+                    warp_change_event_get_params.WARPChangeEventGetParams,
+                ),
+                post_parser=ResultWrapper[Optional[WARPChangeEventGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[WARPChangeEventGetResponse]], ResultWrapper[WARPChangeEventGetResponse]),
+        )
+
+
+class WARPChangeEventsResourceWithRawResponse:
+    def __init__(self, warp_change_events: WARPChangeEventsResource) -> None:
+        self._warp_change_events = warp_change_events
+
+        self.get = to_raw_response_wrapper(
+            warp_change_events.get,
+        )
+
+
+class AsyncWARPChangeEventsResourceWithRawResponse:
+    def __init__(self, warp_change_events: AsyncWARPChangeEventsResource) -> None:
+        self._warp_change_events = warp_change_events
+
+        self.get = async_to_raw_response_wrapper(
+            warp_change_events.get,
+        )
+
+
+class WARPChangeEventsResourceWithStreamingResponse:
+    def __init__(self, warp_change_events: WARPChangeEventsResource) -> None:
+        self._warp_change_events = warp_change_events
+
+        self.get = to_streamed_response_wrapper(
+            warp_change_events.get,
+        )
+
+
+class AsyncWARPChangeEventsResourceWithStreamingResponse:
+    def __init__(self, warp_change_events: AsyncWARPChangeEventsResource) -> None:
+        self._warp_change_events = warp_change_events
+
+        self.get = async_to_streamed_response_wrapper(
+            warp_change_events.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/dlp/__init__.py b/src/cloudflare/resources/zero_trust/dlp/__init__.py
index 4a0820bb653..03f7e960404 100644
--- a/src/cloudflare/resources/zero_trust/dlp/__init__.py
+++ b/src/cloudflare/resources/zero_trust/dlp/__init__.py
@@ -8,6 +8,30 @@
     DLPResourceWithStreamingResponse,
     AsyncDLPResourceWithStreamingResponse,
 )
+from .email import (
+    EmailResource,
+    AsyncEmailResource,
+    EmailResourceWithRawResponse,
+    AsyncEmailResourceWithRawResponse,
+    EmailResourceWithStreamingResponse,
+    AsyncEmailResourceWithStreamingResponse,
+)
+from .limits import (
+    LimitsResource,
+    AsyncLimitsResource,
+    LimitsResourceWithRawResponse,
+    AsyncLimitsResourceWithRawResponse,
+    LimitsResourceWithStreamingResponse,
+    AsyncLimitsResourceWithStreamingResponse,
+)
+from .entries import (
+    EntriesResource,
+    AsyncEntriesResource,
+    EntriesResourceWithRawResponse,
+    AsyncEntriesResourceWithRawResponse,
+    EntriesResourceWithStreamingResponse,
+    AsyncEntriesResourceWithStreamingResponse,
+)
 from .datasets import (
     DatasetsResource,
     AsyncDatasetsResource,
@@ -60,12 +84,30 @@
     "AsyncPayloadLogsResourceWithRawResponse",
     "PayloadLogsResourceWithStreamingResponse",
     "AsyncPayloadLogsResourceWithStreamingResponse",
+    "EmailResource",
+    "AsyncEmailResource",
+    "EmailResourceWithRawResponse",
+    "AsyncEmailResourceWithRawResponse",
+    "EmailResourceWithStreamingResponse",
+    "AsyncEmailResourceWithStreamingResponse",
     "ProfilesResource",
     "AsyncProfilesResource",
     "ProfilesResourceWithRawResponse",
     "AsyncProfilesResourceWithRawResponse",
     "ProfilesResourceWithStreamingResponse",
     "AsyncProfilesResourceWithStreamingResponse",
+    "LimitsResource",
+    "AsyncLimitsResource",
+    "LimitsResourceWithRawResponse",
+    "AsyncLimitsResourceWithRawResponse",
+    "LimitsResourceWithStreamingResponse",
+    "AsyncLimitsResourceWithStreamingResponse",
+    "EntriesResource",
+    "AsyncEntriesResource",
+    "EntriesResourceWithRawResponse",
+    "AsyncEntriesResourceWithRawResponse",
+    "EntriesResourceWithStreamingResponse",
+    "AsyncEntriesResourceWithStreamingResponse",
     "DLPResource",
     "AsyncDLPResource",
     "DLPResourceWithRawResponse",
diff --git a/src/cloudflare/resources/zero_trust/dlp/datasets/__init__.py b/src/cloudflare/resources/zero_trust/dlp/datasets/__init__.py
index a7431639eca..9ee2063c660 100644
--- a/src/cloudflare/resources/zero_trust/dlp/datasets/__init__.py
+++ b/src/cloudflare/resources/zero_trust/dlp/datasets/__init__.py
@@ -16,6 +16,14 @@
     DatasetsResourceWithStreamingResponse,
     AsyncDatasetsResourceWithStreamingResponse,
 )
+from .versions import (
+    VersionsResource,
+    AsyncVersionsResource,
+    VersionsResourceWithRawResponse,
+    AsyncVersionsResourceWithRawResponse,
+    VersionsResourceWithStreamingResponse,
+    AsyncVersionsResourceWithStreamingResponse,
+)
 
 __all__ = [
     "UploadResource",
@@ -24,6 +32,12 @@
     "AsyncUploadResourceWithRawResponse",
     "UploadResourceWithStreamingResponse",
     "AsyncUploadResourceWithStreamingResponse",
+    "VersionsResource",
+    "AsyncVersionsResource",
+    "VersionsResourceWithRawResponse",
+    "AsyncVersionsResourceWithRawResponse",
+    "VersionsResourceWithStreamingResponse",
+    "AsyncVersionsResourceWithStreamingResponse",
     "DatasetsResource",
     "AsyncDatasetsResource",
     "DatasetsResourceWithRawResponse",
diff --git a/src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py b/src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py
index 1c9746e4f2c..7a8a7aff008 100644
--- a/src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py
+++ b/src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py
@@ -14,11 +14,8 @@
     UploadResourceWithStreamingResponse,
     AsyncUploadResourceWithStreamingResponse,
 )
-from ....._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -30,9 +27,19 @@
 from ....._wrappers import ResultWrapper
 from .....pagination import SyncSinglePage, AsyncSinglePage
 from ....._base_client import AsyncPaginator, make_request_options
+from .versions.versions import (
+    VersionsResource,
+    AsyncVersionsResource,
+    VersionsResourceWithRawResponse,
+    AsyncVersionsResourceWithRawResponse,
+    VersionsResourceWithStreamingResponse,
+    AsyncVersionsResourceWithStreamingResponse,
+)
 from .....types.zero_trust.dlp import dataset_create_params, dataset_update_params
 from .....types.zero_trust.dlp.dataset import Dataset
-from .....types.zero_trust.dlp.dataset_creation import DatasetCreation
+from .....types.zero_trust.dlp.dataset_get_response import DatasetGetResponse
+from .....types.zero_trust.dlp.dataset_create_response import DatasetCreateResponse
+from .....types.zero_trust.dlp.dataset_update_response import DatasetUpdateResponse
 
 __all__ = ["DatasetsResource", "AsyncDatasetsResource"]
 
@@ -42,12 +49,27 @@ class DatasetsResource(SyncAPIResource):
     def upload(self) -> UploadResource:
         return UploadResource(self._client)
 
+    @cached_property
+    def versions(self) -> VersionsResource:
+        return VersionsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> DatasetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DatasetsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DatasetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DatasetsResourceWithStreamingResponse(self)
 
     def create(
@@ -55,19 +77,34 @@ def create(
         *,
         account_id: str,
         name: str,
-        description: Optional[str] | NotGiven = NOT_GIVEN,
-        secret: bool | NotGiven = NOT_GIVEN,
+        case_sensitive: bool | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        encoding_version: int | Omit = omit,
+        secret: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DatasetCreation]:
-        """
-        Create a new dataset.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DatasetCreateResponse]:
+        """Create a new dataset
 
         Args:
+          case_sensitive: Only applies to custom word lists.
+
+        Determines if the words should be matched in
+              a case-sensitive manner Cannot be set to false if `secret` is true or undefined
+
+          description: The description of the dataset.
+
+          encoding_version: Dataset encoding version
+
+              Non-secret custom word lists with no header are always version 1. Secret EDM
+              lists with no header are version 1. Multicolumn CSV with headers are version 2.
+              Omitting this field provides the default value 0, which is interpreted the same
+              as 1.
+
           secret: Generate a secret dataset.
 
               If true, the response will include a secret to use with the EDM encoder. If
@@ -88,7 +125,9 @@ def create(
             body=maybe_transform(
                 {
                     "name": name,
+                    "case_sensitive": case_sensitive,
                     "description": description,
+                    "encoding_version": encoding_version,
                     "secret": secret,
                 },
                 dataset_create_params.DatasetCreateParams,
@@ -98,9 +137,9 @@ def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[DatasetCreation]]._unwrapper,
+                post_parser=ResultWrapper[Optional[DatasetCreateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[DatasetCreation]], ResultWrapper[DatasetCreation]),
+            cast_to=cast(Type[Optional[DatasetCreateResponse]], ResultWrapper[DatasetCreateResponse]),
         )
 
     def update(
@@ -108,19 +147,28 @@ def update(
         dataset_id: str,
         *,
         account_id: str,
-        description: Optional[str] | NotGiven = NOT_GIVEN,
-        name: Optional[str] | NotGiven = NOT_GIVEN,
+        case_sensitive: bool | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        name: Optional[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Dataset]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DatasetUpdateResponse]:
         """
-        Update details about a dataset.
+        Update details about a dataset
 
         Args:
+          case_sensitive: Determines if the words should be matched in a case-sensitive manner.
+
+              Only required for custom word lists.
+
+          description: The description of the dataset.
+
+          name: The name of the dataset, must be unique.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -137,6 +185,7 @@ def update(
             f"/accounts/{account_id}/dlp/datasets/{dataset_id}",
             body=maybe_transform(
                 {
+                    "case_sensitive": case_sensitive,
                     "description": description,
                     "name": name,
                 },
@@ -147,9 +196,9 @@ def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Dataset]]._unwrapper,
+                post_parser=ResultWrapper[Optional[DatasetUpdateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Dataset]], ResultWrapper[Dataset]),
+            cast_to=cast(Type[Optional[DatasetUpdateResponse]], ResultWrapper[DatasetUpdateResponse]),
         )
 
     def list(
@@ -161,10 +210,10 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Dataset]:
         """
-        Fetch all datasets with information about available versions.
+        Fetch all datasets
 
         Args:
           extra_headers: Send extra headers
@@ -196,11 +245,9 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> None:
         """
-        Delete a dataset.
-
         This deletes all versions of the dataset.
 
         Args:
@@ -235,10 +282,10 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Dataset]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DatasetGetResponse]:
         """
-        Fetch a specific dataset with information about available versions.
+        Fetch a specific dataset
 
         Args:
           extra_headers: Send extra headers
@@ -260,9 +307,9 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Dataset]]._unwrapper,
+                post_parser=ResultWrapper[Optional[DatasetGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Dataset]], ResultWrapper[Dataset]),
+            cast_to=cast(Type[Optional[DatasetGetResponse]], ResultWrapper[DatasetGetResponse]),
         )
 
 
@@ -271,12 +318,27 @@ class AsyncDatasetsResource(AsyncAPIResource):
     def upload(self) -> AsyncUploadResource:
         return AsyncUploadResource(self._client)
 
+    @cached_property
+    def versions(self) -> AsyncVersionsResource:
+        return AsyncVersionsResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncDatasetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDatasetsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDatasetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDatasetsResourceWithStreamingResponse(self)
 
     async def create(
@@ -284,19 +346,34 @@ async def create(
         *,
         account_id: str,
         name: str,
-        description: Optional[str] | NotGiven = NOT_GIVEN,
-        secret: bool | NotGiven = NOT_GIVEN,
+        case_sensitive: bool | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        encoding_version: int | Omit = omit,
+        secret: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DatasetCreation]:
-        """
-        Create a new dataset.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DatasetCreateResponse]:
+        """Create a new dataset
 
         Args:
+          case_sensitive: Only applies to custom word lists.
+
+        Determines if the words should be matched in
+              a case-sensitive manner Cannot be set to false if `secret` is true or undefined
+
+          description: The description of the dataset.
+
+          encoding_version: Dataset encoding version
+
+              Non-secret custom word lists with no header are always version 1. Secret EDM
+              lists with no header are version 1. Multicolumn CSV with headers are version 2.
+              Omitting this field provides the default value 0, which is interpreted the same
+              as 1.
+
           secret: Generate a secret dataset.
 
               If true, the response will include a secret to use with the EDM encoder. If
@@ -317,7 +394,9 @@ async def create(
             body=await async_maybe_transform(
                 {
                     "name": name,
+                    "case_sensitive": case_sensitive,
                     "description": description,
+                    "encoding_version": encoding_version,
                     "secret": secret,
                 },
                 dataset_create_params.DatasetCreateParams,
@@ -327,9 +406,9 @@ async def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[DatasetCreation]]._unwrapper,
+                post_parser=ResultWrapper[Optional[DatasetCreateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[DatasetCreation]], ResultWrapper[DatasetCreation]),
+            cast_to=cast(Type[Optional[DatasetCreateResponse]], ResultWrapper[DatasetCreateResponse]),
         )
 
     async def update(
@@ -337,19 +416,28 @@ async def update(
         dataset_id: str,
         *,
         account_id: str,
-        description: Optional[str] | NotGiven = NOT_GIVEN,
-        name: Optional[str] | NotGiven = NOT_GIVEN,
+        case_sensitive: bool | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        name: Optional[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Dataset]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DatasetUpdateResponse]:
         """
-        Update details about a dataset.
+        Update details about a dataset
 
         Args:
+          case_sensitive: Determines if the words should be matched in a case-sensitive manner.
+
+              Only required for custom word lists.
+
+          description: The description of the dataset.
+
+          name: The name of the dataset, must be unique.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -366,6 +454,7 @@ async def update(
             f"/accounts/{account_id}/dlp/datasets/{dataset_id}",
             body=await async_maybe_transform(
                 {
+                    "case_sensitive": case_sensitive,
                     "description": description,
                     "name": name,
                 },
@@ -376,9 +465,9 @@ async def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Dataset]]._unwrapper,
+                post_parser=ResultWrapper[Optional[DatasetUpdateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Dataset]], ResultWrapper[Dataset]),
+            cast_to=cast(Type[Optional[DatasetUpdateResponse]], ResultWrapper[DatasetUpdateResponse]),
         )
 
     def list(
@@ -390,10 +479,10 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Dataset, AsyncSinglePage[Dataset]]:
         """
-        Fetch all datasets with information about available versions.
+        Fetch all datasets
 
         Args:
           extra_headers: Send extra headers
@@ -425,11 +514,9 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> None:
         """
-        Delete a dataset.
-
         This deletes all versions of the dataset.
 
         Args:
@@ -464,10 +551,10 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Dataset]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DatasetGetResponse]:
         """
-        Fetch a specific dataset with information about available versions.
+        Fetch a specific dataset
 
         Args:
           extra_headers: Send extra headers
@@ -489,9 +576,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Dataset]]._unwrapper,
+                post_parser=ResultWrapper[Optional[DatasetGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Dataset]], ResultWrapper[Dataset]),
+            cast_to=cast(Type[Optional[DatasetGetResponse]], ResultWrapper[DatasetGetResponse]),
         )
 
 
@@ -519,6 +606,10 @@ def __init__(self, datasets: DatasetsResource) -> None:
     def upload(self) -> UploadResourceWithRawResponse:
         return UploadResourceWithRawResponse(self._datasets.upload)
 
+    @cached_property
+    def versions(self) -> VersionsResourceWithRawResponse:
+        return VersionsResourceWithRawResponse(self._datasets.versions)
+
 
 class AsyncDatasetsResourceWithRawResponse:
     def __init__(self, datasets: AsyncDatasetsResource) -> None:
@@ -544,6 +635,10 @@ def __init__(self, datasets: AsyncDatasetsResource) -> None:
     def upload(self) -> AsyncUploadResourceWithRawResponse:
         return AsyncUploadResourceWithRawResponse(self._datasets.upload)
 
+    @cached_property
+    def versions(self) -> AsyncVersionsResourceWithRawResponse:
+        return AsyncVersionsResourceWithRawResponse(self._datasets.versions)
+
 
 class DatasetsResourceWithStreamingResponse:
     def __init__(self, datasets: DatasetsResource) -> None:
@@ -569,6 +664,10 @@ def __init__(self, datasets: DatasetsResource) -> None:
     def upload(self) -> UploadResourceWithStreamingResponse:
         return UploadResourceWithStreamingResponse(self._datasets.upload)
 
+    @cached_property
+    def versions(self) -> VersionsResourceWithStreamingResponse:
+        return VersionsResourceWithStreamingResponse(self._datasets.versions)
+
 
 class AsyncDatasetsResourceWithStreamingResponse:
     def __init__(self, datasets: AsyncDatasetsResource) -> None:
@@ -593,3 +692,7 @@ def __init__(self, datasets: AsyncDatasetsResource) -> None:
     @cached_property
     def upload(self) -> AsyncUploadResourceWithStreamingResponse:
         return AsyncUploadResourceWithStreamingResponse(self._datasets.upload)
+
+    @cached_property
+    def versions(self) -> AsyncVersionsResourceWithStreamingResponse:
+        return AsyncVersionsResourceWithStreamingResponse(self._datasets.versions)
diff --git a/src/cloudflare/resources/zero_trust/dlp/datasets/upload.py b/src/cloudflare/resources/zero_trust/dlp/datasets/upload.py
index 5ea625471d3..12a6ca39c94 100644
--- a/src/cloudflare/resources/zero_trust/dlp/datasets/upload.py
+++ b/src/cloudflare/resources/zero_trust/dlp/datasets/upload.py
@@ -2,14 +2,21 @@
 
 from __future__ import annotations
 
+import os
 from typing import Type, Optional, cast
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
+from ....._files import read_file_content, async_read_file_content
+from ....._types import (
+    Body,
+    Query,
+    Headers,
+    NotGiven,
+    BinaryTypes,
+    FileContent,
+    AsyncBinaryTypes,
+    not_given,
 )
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
@@ -21,9 +28,8 @@
 )
 from ....._wrappers import ResultWrapper
 from ....._base_client import make_request_options
-from .....types.zero_trust.dlp.dataset import Dataset
-from .....types.zero_trust.dlp.datasets import upload_edit_params
-from .....types.zero_trust.dlp.datasets.new_version import NewVersion
+from .....types.zero_trust.dlp.datasets.upload_edit_response import UploadEditResponse
+from .....types.zero_trust.dlp.datasets.upload_create_response import UploadCreateResponse
 
 __all__ = ["UploadResource", "AsyncUploadResource"]
 
@@ -31,10 +37,21 @@
 class UploadResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> UploadResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return UploadResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> UploadResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return UploadResourceWithStreamingResponse(self)
 
     def create(
@@ -47,10 +64,10 @@ def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[NewVersion]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UploadCreateResponse]:
         """
-        Prepare to upload a new version of a dataset.
+        Prepare to upload a new version of a dataset
 
         Args:
           extra_headers: Send extra headers
@@ -72,27 +89,31 @@ def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[NewVersion]]._unwrapper,
+                post_parser=ResultWrapper[Optional[UploadCreateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[NewVersion]], ResultWrapper[NewVersion]),
+            cast_to=cast(Type[Optional[UploadCreateResponse]], ResultWrapper[UploadCreateResponse]),
         )
 
     def edit(
         self,
         version: int,
+        dataset: FileContent | BinaryTypes,
         *,
         account_id: str,
         dataset_id: str,
-        body: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Dataset]:
-        """
-        Upload a new version of a dataset.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UploadEditResponse]:
+        """This is used for single-column EDMv1 and Custom Word Lists.
+
+        The EDM format can
+        only be created in the Cloudflare dashboard. For other clients, this operation
+        can only be used for non-secret Custom Word Lists. The body must be a UTF-8
+        encoded, newline (NL or CRNL) separated list of words to be matched.
 
         Args:
           extra_headers: Send extra headers
@@ -107,27 +128,39 @@ def edit(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not dataset_id:
             raise ValueError(f"Expected a non-empty value for `dataset_id` but received {dataset_id!r}")
+        extra_headers = {"Content-Type": "application/octet-stream", **(extra_headers or {})}
         return self._post(
             f"/accounts/{account_id}/dlp/datasets/{dataset_id}/upload/{version}",
-            body=maybe_transform(body, upload_edit_params.UploadEditParams),
+            content=read_file_content(dataset) if isinstance(dataset, os.PathLike) else dataset,
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Dataset]]._unwrapper,
+                post_parser=ResultWrapper[Optional[UploadEditResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Dataset]], ResultWrapper[Dataset]),
+            cast_to=cast(Type[Optional[UploadEditResponse]], ResultWrapper[UploadEditResponse]),
         )
 
 
 class AsyncUploadResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncUploadResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncUploadResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncUploadResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncUploadResourceWithStreamingResponse(self)
 
     async def create(
@@ -140,10 +173,10 @@ async def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[NewVersion]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UploadCreateResponse]:
         """
-        Prepare to upload a new version of a dataset.
+        Prepare to upload a new version of a dataset
 
         Args:
           extra_headers: Send extra headers
@@ -165,27 +198,31 @@ async def create(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[NewVersion]]._unwrapper,
+                post_parser=ResultWrapper[Optional[UploadCreateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[NewVersion]], ResultWrapper[NewVersion]),
+            cast_to=cast(Type[Optional[UploadCreateResponse]], ResultWrapper[UploadCreateResponse]),
         )
 
     async def edit(
         self,
         version: int,
+        dataset: FileContent | AsyncBinaryTypes,
         *,
         account_id: str,
         dataset_id: str,
-        body: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Dataset]:
-        """
-        Upload a new version of a dataset.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[UploadEditResponse]:
+        """This is used for single-column EDMv1 and Custom Word Lists.
+
+        The EDM format can
+        only be created in the Cloudflare dashboard. For other clients, this operation
+        can only be used for non-secret Custom Word Lists. The body must be a UTF-8
+        encoded, newline (NL or CRNL) separated list of words to be matched.
 
         Args:
           extra_headers: Send extra headers
@@ -200,17 +237,18 @@ async def edit(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not dataset_id:
             raise ValueError(f"Expected a non-empty value for `dataset_id` but received {dataset_id!r}")
+        extra_headers = {"Content-Type": "application/octet-stream", **(extra_headers or {})}
         return await self._post(
             f"/accounts/{account_id}/dlp/datasets/{dataset_id}/upload/{version}",
-            body=await async_maybe_transform(body, upload_edit_params.UploadEditParams),
+            content=await async_read_file_content(dataset) if isinstance(dataset, os.PathLike) else dataset,
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[Dataset]]._unwrapper,
+                post_parser=ResultWrapper[Optional[UploadEditResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[Dataset]], ResultWrapper[Dataset]),
+            cast_to=cast(Type[Optional[UploadEditResponse]], ResultWrapper[UploadEditResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/zero_trust/dlp/datasets/versions/__init__.py b/src/cloudflare/resources/zero_trust/dlp/datasets/versions/__init__.py
new file mode 100755
index 00000000000..d1e2bd1be7b
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dlp/datasets/versions/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .entries import (
+    EntriesResource,
+    AsyncEntriesResource,
+    EntriesResourceWithRawResponse,
+    AsyncEntriesResourceWithRawResponse,
+    EntriesResourceWithStreamingResponse,
+    AsyncEntriesResourceWithStreamingResponse,
+)
+from .versions import (
+    VersionsResource,
+    AsyncVersionsResource,
+    VersionsResourceWithRawResponse,
+    AsyncVersionsResourceWithRawResponse,
+    VersionsResourceWithStreamingResponse,
+    AsyncVersionsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "EntriesResource",
+    "AsyncEntriesResource",
+    "EntriesResourceWithRawResponse",
+    "AsyncEntriesResourceWithRawResponse",
+    "EntriesResourceWithStreamingResponse",
+    "AsyncEntriesResourceWithStreamingResponse",
+    "VersionsResource",
+    "AsyncVersionsResource",
+    "VersionsResourceWithRawResponse",
+    "AsyncVersionsResourceWithRawResponse",
+    "VersionsResourceWithStreamingResponse",
+    "AsyncVersionsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/dlp/datasets/versions/entries.py b/src/cloudflare/resources/zero_trust/dlp/datasets/versions/entries.py
new file mode 100755
index 00000000000..46cdde41056
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dlp/datasets/versions/entries.py
@@ -0,0 +1,213 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Type, Optional, cast
+
+import httpx
+
+from ......_files import read_file_content, async_read_file_content
+from ......_types import (
+    Body,
+    Query,
+    Headers,
+    NotGiven,
+    BinaryTypes,
+    FileContent,
+    AsyncBinaryTypes,
+    not_given,
+)
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+from ......_response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ......_wrappers import ResultWrapper
+from ......_base_client import make_request_options
+from ......types.zero_trust.dlp.datasets.versions.entry_create_response import EntryCreateResponse
+
+__all__ = ["EntriesResource", "AsyncEntriesResource"]
+
+
+class EntriesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> EntriesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return EntriesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> EntriesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return EntriesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        entry_id: str,
+        dataset_version_entry: FileContent | BinaryTypes,
+        *,
+        account_id: str,
+        dataset_id: str,
+        version: int,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EntryCreateResponse]:
+        """This is used for multi-column EDMv2 datasets.
+
+        The EDMv2 format can only be
+        created in the Cloudflare dashboard.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dataset_id:
+            raise ValueError(f"Expected a non-empty value for `dataset_id` but received {dataset_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        extra_headers = {"Content-Type": "application/octet-stream", **(extra_headers or {})}
+        return self._post(
+            f"/accounts/{account_id}/dlp/datasets/{dataset_id}/versions/{version}/entries/{entry_id}",
+            content=read_file_content(dataset_version_entry)
+            if isinstance(dataset_version_entry, os.PathLike)
+            else dataset_version_entry,
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[EntryCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[EntryCreateResponse]], ResultWrapper[EntryCreateResponse]),
+        )
+
+
+class AsyncEntriesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncEntriesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncEntriesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncEntriesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncEntriesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        entry_id: str,
+        dataset_version_entry: FileContent | AsyncBinaryTypes,
+        *,
+        account_id: str,
+        dataset_id: str,
+        version: int,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EntryCreateResponse]:
+        """This is used for multi-column EDMv2 datasets.
+
+        The EDMv2 format can only be
+        created in the Cloudflare dashboard.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dataset_id:
+            raise ValueError(f"Expected a non-empty value for `dataset_id` but received {dataset_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        extra_headers = {"Content-Type": "application/octet-stream", **(extra_headers or {})}
+        return await self._post(
+            f"/accounts/{account_id}/dlp/datasets/{dataset_id}/versions/{version}/entries/{entry_id}",
+            content=await async_read_file_content(dataset_version_entry)
+            if isinstance(dataset_version_entry, os.PathLike)
+            else dataset_version_entry,
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[EntryCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[EntryCreateResponse]], ResultWrapper[EntryCreateResponse]),
+        )
+
+
+class EntriesResourceWithRawResponse:
+    def __init__(self, entries: EntriesResource) -> None:
+        self._entries = entries
+
+        self.create = to_raw_response_wrapper(
+            entries.create,
+        )
+
+
+class AsyncEntriesResourceWithRawResponse:
+    def __init__(self, entries: AsyncEntriesResource) -> None:
+        self._entries = entries
+
+        self.create = async_to_raw_response_wrapper(
+            entries.create,
+        )
+
+
+class EntriesResourceWithStreamingResponse:
+    def __init__(self, entries: EntriesResource) -> None:
+        self._entries = entries
+
+        self.create = to_streamed_response_wrapper(
+            entries.create,
+        )
+
+
+class AsyncEntriesResourceWithStreamingResponse:
+    def __init__(self, entries: AsyncEntriesResource) -> None:
+        self._entries = entries
+
+        self.create = async_to_streamed_response_wrapper(
+            entries.create,
+        )
diff --git a/src/cloudflare/resources/zero_trust/dlp/datasets/versions/versions.py b/src/cloudflare/resources/zero_trust/dlp/datasets/versions/versions.py
new file mode 100755
index 00000000000..90b562051a9
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dlp/datasets/versions/versions.py
@@ -0,0 +1,222 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+
+import httpx
+
+from .entries import (
+    EntriesResource,
+    AsyncEntriesResource,
+    EntriesResourceWithRawResponse,
+    AsyncEntriesResourceWithRawResponse,
+    EntriesResourceWithStreamingResponse,
+    AsyncEntriesResourceWithStreamingResponse,
+)
+from ......_types import Body, Query, Headers, NotGiven, not_given
+from ......_utils import maybe_transform
+from ......_compat import cached_property
+from ......_resource import SyncAPIResource, AsyncAPIResource
+from ......_response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ......pagination import SyncSinglePage, AsyncSinglePage
+from ......_base_client import AsyncPaginator, make_request_options
+from ......types.zero_trust.dlp.datasets import version_create_params
+from ......types.zero_trust.dlp.datasets.version_create_response import VersionCreateResponse
+
+__all__ = ["VersionsResource", "AsyncVersionsResource"]
+
+
+class VersionsResource(SyncAPIResource):
+    @cached_property
+    def entries(self) -> EntriesResource:
+        return EntriesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> VersionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return VersionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> VersionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return VersionsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        version: int,
+        *,
+        account_id: str,
+        dataset_id: str,
+        body: Iterable[version_create_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[VersionCreateResponse]:
+        """This is used for multi-column EDMv2 datasets.
+
+        The EDMv2 format can only be
+        created in the Cloudflare dashboard. The columns in the response appear in the
+        same order as in the request.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dataset_id:
+            raise ValueError(f"Expected a non-empty value for `dataset_id` but received {dataset_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dlp/datasets/{dataset_id}/versions/{version}",
+            page=SyncSinglePage[VersionCreateResponse],
+            body=maybe_transform(body, Iterable[version_create_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=VersionCreateResponse,
+            method="post",
+        )
+
+
+class AsyncVersionsResource(AsyncAPIResource):
+    @cached_property
+    def entries(self) -> AsyncEntriesResource:
+        return AsyncEntriesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncVersionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncVersionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncVersionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncVersionsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        version: int,
+        *,
+        account_id: str,
+        dataset_id: str,
+        body: Iterable[version_create_params.Body],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[VersionCreateResponse, AsyncSinglePage[VersionCreateResponse]]:
+        """This is used for multi-column EDMv2 datasets.
+
+        The EDMv2 format can only be
+        created in the Cloudflare dashboard. The columns in the response appear in the
+        same order as in the request.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not dataset_id:
+            raise ValueError(f"Expected a non-empty value for `dataset_id` but received {dataset_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dlp/datasets/{dataset_id}/versions/{version}",
+            page=AsyncSinglePage[VersionCreateResponse],
+            body=maybe_transform(body, Iterable[version_create_params.Body]),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=VersionCreateResponse,
+            method="post",
+        )
+
+
+class VersionsResourceWithRawResponse:
+    def __init__(self, versions: VersionsResource) -> None:
+        self._versions = versions
+
+        self.create = to_raw_response_wrapper(
+            versions.create,
+        )
+
+    @cached_property
+    def entries(self) -> EntriesResourceWithRawResponse:
+        return EntriesResourceWithRawResponse(self._versions.entries)
+
+
+class AsyncVersionsResourceWithRawResponse:
+    def __init__(self, versions: AsyncVersionsResource) -> None:
+        self._versions = versions
+
+        self.create = async_to_raw_response_wrapper(
+            versions.create,
+        )
+
+    @cached_property
+    def entries(self) -> AsyncEntriesResourceWithRawResponse:
+        return AsyncEntriesResourceWithRawResponse(self._versions.entries)
+
+
+class VersionsResourceWithStreamingResponse:
+    def __init__(self, versions: VersionsResource) -> None:
+        self._versions = versions
+
+        self.create = to_streamed_response_wrapper(
+            versions.create,
+        )
+
+    @cached_property
+    def entries(self) -> EntriesResourceWithStreamingResponse:
+        return EntriesResourceWithStreamingResponse(self._versions.entries)
+
+
+class AsyncVersionsResourceWithStreamingResponse:
+    def __init__(self, versions: AsyncVersionsResource) -> None:
+        self._versions = versions
+
+        self.create = async_to_streamed_response_wrapper(
+            versions.create,
+        )
+
+    @cached_property
+    def entries(self) -> AsyncEntriesResourceWithStreamingResponse:
+        return AsyncEntriesResourceWithStreamingResponse(self._versions.entries)
diff --git a/src/cloudflare/resources/zero_trust/dlp/dlp.py b/src/cloudflare/resources/zero_trust/dlp/dlp.py
index 324653e2509..7444c2b17de 100644
--- a/src/cloudflare/resources/zero_trust/dlp/dlp.py
+++ b/src/cloudflare/resources/zero_trust/dlp/dlp.py
@@ -2,13 +2,13 @@
 
 from __future__ import annotations
 
-from .datasets import (
-    DatasetsResource,
-    AsyncDatasetsResource,
-    DatasetsResourceWithRawResponse,
-    AsyncDatasetsResourceWithRawResponse,
-    DatasetsResourceWithStreamingResponse,
-    AsyncDatasetsResourceWithStreamingResponse,
+from .limits import (
+    LimitsResource,
+    AsyncLimitsResource,
+    LimitsResourceWithRawResponse,
+    AsyncLimitsResourceWithRawResponse,
+    LimitsResourceWithStreamingResponse,
+    AsyncLimitsResourceWithStreamingResponse,
 )
 from .patterns import (
     PatternsResource,
@@ -18,15 +18,15 @@
     PatternsResourceWithStreamingResponse,
     AsyncPatternsResourceWithStreamingResponse,
 )
-from .profiles import (
-    ProfilesResource,
-    AsyncProfilesResource,
-    ProfilesResourceWithRawResponse,
-    AsyncProfilesResourceWithRawResponse,
-    ProfilesResourceWithStreamingResponse,
-    AsyncProfilesResourceWithStreamingResponse,
-)
 from ...._compat import cached_property
+from .email.email import (
+    EmailResource,
+    AsyncEmailResource,
+    EmailResourceWithRawResponse,
+    AsyncEmailResourceWithRawResponse,
+    EmailResourceWithStreamingResponse,
+    AsyncEmailResourceWithStreamingResponse,
+)
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from .payload_logs import (
     PayloadLogsResource,
@@ -36,8 +36,30 @@
     PayloadLogsResourceWithStreamingResponse,
     AsyncPayloadLogsResourceWithStreamingResponse,
 )
-from .datasets.datasets import DatasetsResource, AsyncDatasetsResource
-from .profiles.profiles import ProfilesResource, AsyncProfilesResource
+from .entries.entries import (
+    EntriesResource,
+    AsyncEntriesResource,
+    EntriesResourceWithRawResponse,
+    AsyncEntriesResourceWithRawResponse,
+    EntriesResourceWithStreamingResponse,
+    AsyncEntriesResourceWithStreamingResponse,
+)
+from .datasets.datasets import (
+    DatasetsResource,
+    AsyncDatasetsResource,
+    DatasetsResourceWithRawResponse,
+    AsyncDatasetsResourceWithRawResponse,
+    DatasetsResourceWithStreamingResponse,
+    AsyncDatasetsResourceWithStreamingResponse,
+)
+from .profiles.profiles import (
+    ProfilesResource,
+    AsyncProfilesResource,
+    ProfilesResourceWithRawResponse,
+    AsyncProfilesResourceWithRawResponse,
+    ProfilesResourceWithStreamingResponse,
+    AsyncProfilesResourceWithStreamingResponse,
+)
 
 __all__ = ["DLPResource", "AsyncDLPResource"]
 
@@ -55,16 +77,39 @@ def patterns(self) -> PatternsResource:
     def payload_logs(self) -> PayloadLogsResource:
         return PayloadLogsResource(self._client)
 
+    @cached_property
+    def email(self) -> EmailResource:
+        return EmailResource(self._client)
+
     @cached_property
     def profiles(self) -> ProfilesResource:
         return ProfilesResource(self._client)
 
+    @cached_property
+    def limits(self) -> LimitsResource:
+        return LimitsResource(self._client)
+
+    @cached_property
+    def entries(self) -> EntriesResource:
+        return EntriesResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> DLPResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return DLPResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> DLPResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return DLPResourceWithStreamingResponse(self)
 
 
@@ -81,16 +126,39 @@ def patterns(self) -> AsyncPatternsResource:
     def payload_logs(self) -> AsyncPayloadLogsResource:
         return AsyncPayloadLogsResource(self._client)
 
+    @cached_property
+    def email(self) -> AsyncEmailResource:
+        return AsyncEmailResource(self._client)
+
     @cached_property
     def profiles(self) -> AsyncProfilesResource:
         return AsyncProfilesResource(self._client)
 
+    @cached_property
+    def limits(self) -> AsyncLimitsResource:
+        return AsyncLimitsResource(self._client)
+
+    @cached_property
+    def entries(self) -> AsyncEntriesResource:
+        return AsyncEntriesResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncDLPResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncDLPResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncDLPResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncDLPResourceWithStreamingResponse(self)
 
 
@@ -110,10 +178,22 @@ def patterns(self) -> PatternsResourceWithRawResponse:
     def payload_logs(self) -> PayloadLogsResourceWithRawResponse:
         return PayloadLogsResourceWithRawResponse(self._dlp.payload_logs)
 
+    @cached_property
+    def email(self) -> EmailResourceWithRawResponse:
+        return EmailResourceWithRawResponse(self._dlp.email)
+
     @cached_property
     def profiles(self) -> ProfilesResourceWithRawResponse:
         return ProfilesResourceWithRawResponse(self._dlp.profiles)
 
+    @cached_property
+    def limits(self) -> LimitsResourceWithRawResponse:
+        return LimitsResourceWithRawResponse(self._dlp.limits)
+
+    @cached_property
+    def entries(self) -> EntriesResourceWithRawResponse:
+        return EntriesResourceWithRawResponse(self._dlp.entries)
+
 
 class AsyncDLPResourceWithRawResponse:
     def __init__(self, dlp: AsyncDLPResource) -> None:
@@ -131,10 +211,22 @@ def patterns(self) -> AsyncPatternsResourceWithRawResponse:
     def payload_logs(self) -> AsyncPayloadLogsResourceWithRawResponse:
         return AsyncPayloadLogsResourceWithRawResponse(self._dlp.payload_logs)
 
+    @cached_property
+    def email(self) -> AsyncEmailResourceWithRawResponse:
+        return AsyncEmailResourceWithRawResponse(self._dlp.email)
+
     @cached_property
     def profiles(self) -> AsyncProfilesResourceWithRawResponse:
         return AsyncProfilesResourceWithRawResponse(self._dlp.profiles)
 
+    @cached_property
+    def limits(self) -> AsyncLimitsResourceWithRawResponse:
+        return AsyncLimitsResourceWithRawResponse(self._dlp.limits)
+
+    @cached_property
+    def entries(self) -> AsyncEntriesResourceWithRawResponse:
+        return AsyncEntriesResourceWithRawResponse(self._dlp.entries)
+
 
 class DLPResourceWithStreamingResponse:
     def __init__(self, dlp: DLPResource) -> None:
@@ -152,10 +244,22 @@ def patterns(self) -> PatternsResourceWithStreamingResponse:
     def payload_logs(self) -> PayloadLogsResourceWithStreamingResponse:
         return PayloadLogsResourceWithStreamingResponse(self._dlp.payload_logs)
 
+    @cached_property
+    def email(self) -> EmailResourceWithStreamingResponse:
+        return EmailResourceWithStreamingResponse(self._dlp.email)
+
     @cached_property
     def profiles(self) -> ProfilesResourceWithStreamingResponse:
         return ProfilesResourceWithStreamingResponse(self._dlp.profiles)
 
+    @cached_property
+    def limits(self) -> LimitsResourceWithStreamingResponse:
+        return LimitsResourceWithStreamingResponse(self._dlp.limits)
+
+    @cached_property
+    def entries(self) -> EntriesResourceWithStreamingResponse:
+        return EntriesResourceWithStreamingResponse(self._dlp.entries)
+
 
 class AsyncDLPResourceWithStreamingResponse:
     def __init__(self, dlp: AsyncDLPResource) -> None:
@@ -173,6 +277,18 @@ def patterns(self) -> AsyncPatternsResourceWithStreamingResponse:
     def payload_logs(self) -> AsyncPayloadLogsResourceWithStreamingResponse:
         return AsyncPayloadLogsResourceWithStreamingResponse(self._dlp.payload_logs)
 
+    @cached_property
+    def email(self) -> AsyncEmailResourceWithStreamingResponse:
+        return AsyncEmailResourceWithStreamingResponse(self._dlp.email)
+
     @cached_property
     def profiles(self) -> AsyncProfilesResourceWithStreamingResponse:
         return AsyncProfilesResourceWithStreamingResponse(self._dlp.profiles)
+
+    @cached_property
+    def limits(self) -> AsyncLimitsResourceWithStreamingResponse:
+        return AsyncLimitsResourceWithStreamingResponse(self._dlp.limits)
+
+    @cached_property
+    def entries(self) -> AsyncEntriesResourceWithStreamingResponse:
+        return AsyncEntriesResourceWithStreamingResponse(self._dlp.entries)
diff --git a/src/cloudflare/resources/zero_trust/dlp/email/__init__.py b/src/cloudflare/resources/zero_trust/dlp/email/__init__.py
new file mode 100644
index 00000000000..bed0373f820
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dlp/email/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .email import (
+    EmailResource,
+    AsyncEmailResource,
+    EmailResourceWithRawResponse,
+    AsyncEmailResourceWithRawResponse,
+    EmailResourceWithStreamingResponse,
+    AsyncEmailResourceWithStreamingResponse,
+)
+from .rules import (
+    RulesResource,
+    AsyncRulesResource,
+    RulesResourceWithRawResponse,
+    AsyncRulesResourceWithRawResponse,
+    RulesResourceWithStreamingResponse,
+    AsyncRulesResourceWithStreamingResponse,
+)
+from .account_mapping import (
+    AccountMappingResource,
+    AsyncAccountMappingResource,
+    AccountMappingResourceWithRawResponse,
+    AsyncAccountMappingResourceWithRawResponse,
+    AccountMappingResourceWithStreamingResponse,
+    AsyncAccountMappingResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "AccountMappingResource",
+    "AsyncAccountMappingResource",
+    "AccountMappingResourceWithRawResponse",
+    "AsyncAccountMappingResourceWithRawResponse",
+    "AccountMappingResourceWithStreamingResponse",
+    "AsyncAccountMappingResourceWithStreamingResponse",
+    "RulesResource",
+    "AsyncRulesResource",
+    "RulesResourceWithRawResponse",
+    "AsyncRulesResourceWithRawResponse",
+    "RulesResourceWithStreamingResponse",
+    "AsyncRulesResourceWithStreamingResponse",
+    "EmailResource",
+    "AsyncEmailResource",
+    "EmailResourceWithRawResponse",
+    "AsyncEmailResourceWithRawResponse",
+    "EmailResourceWithStreamingResponse",
+    "AsyncEmailResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/dlp/email/account_mapping.py b/src/cloudflare/resources/zero_trust/dlp/email/account_mapping.py
new file mode 100644
index 00000000000..41ef3fa93e8
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dlp/email/account_mapping.py
@@ -0,0 +1,271 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ....._types import Body, Query, Headers, NotGiven, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.zero_trust.dlp.email import account_mapping_create_params
+from .....types.zero_trust.dlp.email.account_mapping_get_response import AccountMappingGetResponse
+from .....types.zero_trust.dlp.email.account_mapping_create_response import AccountMappingCreateResponse
+
+__all__ = ["AccountMappingResource", "AsyncAccountMappingResource"]
+
+
+class AccountMappingResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AccountMappingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AccountMappingResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AccountMappingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AccountMappingResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        auth_requirements: account_mapping_create_params.AuthRequirements,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AccountMappingCreateResponse]:
+        """
+        Create mapping
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/dlp/email/account_mapping",
+            body=maybe_transform(
+                {"auth_requirements": auth_requirements}, account_mapping_create_params.AccountMappingCreateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AccountMappingCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AccountMappingCreateResponse]], ResultWrapper[AccountMappingCreateResponse]),
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AccountMappingGetResponse]:
+        """
+        Get mapping
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/dlp/email/account_mapping",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AccountMappingGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AccountMappingGetResponse]], ResultWrapper[AccountMappingGetResponse]),
+        )
+
+
+class AsyncAccountMappingResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncAccountMappingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncAccountMappingResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncAccountMappingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncAccountMappingResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        auth_requirements: account_mapping_create_params.AuthRequirements,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AccountMappingCreateResponse]:
+        """
+        Create mapping
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/dlp/email/account_mapping",
+            body=await async_maybe_transform(
+                {"auth_requirements": auth_requirements}, account_mapping_create_params.AccountMappingCreateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AccountMappingCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AccountMappingCreateResponse]], ResultWrapper[AccountMappingCreateResponse]),
+        )
+
+    async def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[AccountMappingGetResponse]:
+        """
+        Get mapping
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/dlp/email/account_mapping",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[AccountMappingGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[AccountMappingGetResponse]], ResultWrapper[AccountMappingGetResponse]),
+        )
+
+
+class AccountMappingResourceWithRawResponse:
+    def __init__(self, account_mapping: AccountMappingResource) -> None:
+        self._account_mapping = account_mapping
+
+        self.create = to_raw_response_wrapper(
+            account_mapping.create,
+        )
+        self.get = to_raw_response_wrapper(
+            account_mapping.get,
+        )
+
+
+class AsyncAccountMappingResourceWithRawResponse:
+    def __init__(self, account_mapping: AsyncAccountMappingResource) -> None:
+        self._account_mapping = account_mapping
+
+        self.create = async_to_raw_response_wrapper(
+            account_mapping.create,
+        )
+        self.get = async_to_raw_response_wrapper(
+            account_mapping.get,
+        )
+
+
+class AccountMappingResourceWithStreamingResponse:
+    def __init__(self, account_mapping: AccountMappingResource) -> None:
+        self._account_mapping = account_mapping
+
+        self.create = to_streamed_response_wrapper(
+            account_mapping.create,
+        )
+        self.get = to_streamed_response_wrapper(
+            account_mapping.get,
+        )
+
+
+class AsyncAccountMappingResourceWithStreamingResponse:
+    def __init__(self, account_mapping: AsyncAccountMappingResource) -> None:
+        self._account_mapping = account_mapping
+
+        self.create = async_to_streamed_response_wrapper(
+            account_mapping.create,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            account_mapping.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/dlp/email/email.py b/src/cloudflare/resources/zero_trust/dlp/email/email.py
new file mode 100644
index 00000000000..08f2c29caa8
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dlp/email/email.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .rules import (
+    RulesResource,
+    AsyncRulesResource,
+    RulesResourceWithRawResponse,
+    AsyncRulesResourceWithRawResponse,
+    RulesResourceWithStreamingResponse,
+    AsyncRulesResourceWithStreamingResponse,
+)
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from .account_mapping import (
+    AccountMappingResource,
+    AsyncAccountMappingResource,
+    AccountMappingResourceWithRawResponse,
+    AsyncAccountMappingResourceWithRawResponse,
+    AccountMappingResourceWithStreamingResponse,
+    AsyncAccountMappingResourceWithStreamingResponse,
+)
+
+__all__ = ["EmailResource", "AsyncEmailResource"]
+
+
+class EmailResource(SyncAPIResource):
+    @cached_property
+    def account_mapping(self) -> AccountMappingResource:
+        return AccountMappingResource(self._client)
+
+    @cached_property
+    def rules(self) -> RulesResource:
+        return RulesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> EmailResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return EmailResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> EmailResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return EmailResourceWithStreamingResponse(self)
+
+
+class AsyncEmailResource(AsyncAPIResource):
+    @cached_property
+    def account_mapping(self) -> AsyncAccountMappingResource:
+        return AsyncAccountMappingResource(self._client)
+
+    @cached_property
+    def rules(self) -> AsyncRulesResource:
+        return AsyncRulesResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncEmailResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncEmailResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncEmailResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncEmailResourceWithStreamingResponse(self)
+
+
+class EmailResourceWithRawResponse:
+    def __init__(self, email: EmailResource) -> None:
+        self._email = email
+
+    @cached_property
+    def account_mapping(self) -> AccountMappingResourceWithRawResponse:
+        return AccountMappingResourceWithRawResponse(self._email.account_mapping)
+
+    @cached_property
+    def rules(self) -> RulesResourceWithRawResponse:
+        return RulesResourceWithRawResponse(self._email.rules)
+
+
+class AsyncEmailResourceWithRawResponse:
+    def __init__(self, email: AsyncEmailResource) -> None:
+        self._email = email
+
+    @cached_property
+    def account_mapping(self) -> AsyncAccountMappingResourceWithRawResponse:
+        return AsyncAccountMappingResourceWithRawResponse(self._email.account_mapping)
+
+    @cached_property
+    def rules(self) -> AsyncRulesResourceWithRawResponse:
+        return AsyncRulesResourceWithRawResponse(self._email.rules)
+
+
+class EmailResourceWithStreamingResponse:
+    def __init__(self, email: EmailResource) -> None:
+        self._email = email
+
+    @cached_property
+    def account_mapping(self) -> AccountMappingResourceWithStreamingResponse:
+        return AccountMappingResourceWithStreamingResponse(self._email.account_mapping)
+
+    @cached_property
+    def rules(self) -> RulesResourceWithStreamingResponse:
+        return RulesResourceWithStreamingResponse(self._email.rules)
+
+
+class AsyncEmailResourceWithStreamingResponse:
+    def __init__(self, email: AsyncEmailResource) -> None:
+        self._email = email
+
+    @cached_property
+    def account_mapping(self) -> AsyncAccountMappingResourceWithStreamingResponse:
+        return AsyncAccountMappingResourceWithStreamingResponse(self._email.account_mapping)
+
+    @cached_property
+    def rules(self) -> AsyncRulesResourceWithStreamingResponse:
+        return AsyncRulesResourceWithStreamingResponse(self._email.rules)
diff --git a/src/cloudflare/resources/zero_trust/dlp/email/rules.py b/src/cloudflare/resources/zero_trust/dlp/email/rules.py
new file mode 100644
index 00000000000..a7519528104
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dlp/email/rules.py
@@ -0,0 +1,698 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Type, Iterable, Optional, cast
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from .....pagination import SyncSinglePage, AsyncSinglePage
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.zero_trust.dlp.email import rule_create_params, rule_update_params, rule_bulk_edit_params
+from .....types.zero_trust.dlp.email.rule_get_response import RuleGetResponse
+from .....types.zero_trust.dlp.email.rule_list_response import RuleListResponse
+from .....types.zero_trust.dlp.email.rule_create_response import RuleCreateResponse
+from .....types.zero_trust.dlp.email.rule_delete_response import RuleDeleteResponse
+from .....types.zero_trust.dlp.email.rule_update_response import RuleUpdateResponse
+from .....types.zero_trust.dlp.email.rule_bulk_edit_response import RuleBulkEditResponse
+
+__all__ = ["RulesResource", "AsyncRulesResource"]
+
+
+class RulesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> RulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return RulesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> RulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return RulesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        action: rule_create_params.Action,
+        conditions: Iterable[rule_create_params.Condition],
+        enabled: bool,
+        name: str,
+        description: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RuleCreateResponse]:
+        """
+        Create email scanner rule
+
+        Args:
+          conditions: Triggered if all conditions match.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/dlp/email/rules",
+            body=maybe_transform(
+                {
+                    "action": action,
+                    "conditions": conditions,
+                    "enabled": enabled,
+                    "name": name,
+                    "description": description,
+                },
+                rule_create_params.RuleCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RuleCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RuleCreateResponse]], ResultWrapper[RuleCreateResponse]),
+        )
+
+    def update(
+        self,
+        rule_id: str,
+        *,
+        account_id: str,
+        action: rule_update_params.Action,
+        conditions: Iterable[rule_update_params.Condition],
+        enabled: bool,
+        name: str,
+        description: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RuleUpdateResponse]:
+        """
+        Update email scanner rule
+
+        Args:
+          conditions: Triggered if all conditions match.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/dlp/email/rules/{rule_id}",
+            body=maybe_transform(
+                {
+                    "action": action,
+                    "conditions": conditions,
+                    "enabled": enabled,
+                    "name": name,
+                    "description": description,
+                },
+                rule_update_params.RuleUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RuleUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RuleUpdateResponse]], ResultWrapper[RuleUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[RuleListResponse]:
+        """
+        Lists all email scanner rules for an account.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dlp/email/rules",
+            page=SyncSinglePage[RuleListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=RuleListResponse,
+        )
+
+    def delete(
+        self,
+        rule_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RuleDeleteResponse]:
+        """
+        Delete email scanner rule
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/dlp/email/rules/{rule_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RuleDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RuleDeleteResponse]], ResultWrapper[RuleDeleteResponse]),
+        )
+
+    def bulk_edit(
+        self,
+        *,
+        account_id: str,
+        new_priorities: Dict[str, int],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RuleBulkEditResponse]:
+        """
+        Update email scanner rule priorities
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/dlp/email/rules",
+            body=maybe_transform({"new_priorities": new_priorities}, rule_bulk_edit_params.RuleBulkEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RuleBulkEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RuleBulkEditResponse]], ResultWrapper[RuleBulkEditResponse]),
+        )
+
+    def get(
+        self,
+        rule_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RuleGetResponse]:
+        """
+        Get an email scanner rule
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/dlp/email/rules/{rule_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RuleGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RuleGetResponse]], ResultWrapper[RuleGetResponse]),
+        )
+
+
+class AsyncRulesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncRulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncRulesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncRulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncRulesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        action: rule_create_params.Action,
+        conditions: Iterable[rule_create_params.Condition],
+        enabled: bool,
+        name: str,
+        description: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RuleCreateResponse]:
+        """
+        Create email scanner rule
+
+        Args:
+          conditions: Triggered if all conditions match.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/dlp/email/rules",
+            body=await async_maybe_transform(
+                {
+                    "action": action,
+                    "conditions": conditions,
+                    "enabled": enabled,
+                    "name": name,
+                    "description": description,
+                },
+                rule_create_params.RuleCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RuleCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RuleCreateResponse]], ResultWrapper[RuleCreateResponse]),
+        )
+
+    async def update(
+        self,
+        rule_id: str,
+        *,
+        account_id: str,
+        action: rule_update_params.Action,
+        conditions: Iterable[rule_update_params.Condition],
+        enabled: bool,
+        name: str,
+        description: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RuleUpdateResponse]:
+        """
+        Update email scanner rule
+
+        Args:
+          conditions: Triggered if all conditions match.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/dlp/email/rules/{rule_id}",
+            body=await async_maybe_transform(
+                {
+                    "action": action,
+                    "conditions": conditions,
+                    "enabled": enabled,
+                    "name": name,
+                    "description": description,
+                },
+                rule_update_params.RuleUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RuleUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RuleUpdateResponse]], ResultWrapper[RuleUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[RuleListResponse, AsyncSinglePage[RuleListResponse]]:
+        """
+        Lists all email scanner rules for an account.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dlp/email/rules",
+            page=AsyncSinglePage[RuleListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=RuleListResponse,
+        )
+
+    async def delete(
+        self,
+        rule_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RuleDeleteResponse]:
+        """
+        Delete email scanner rule
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/dlp/email/rules/{rule_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RuleDeleteResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RuleDeleteResponse]], ResultWrapper[RuleDeleteResponse]),
+        )
+
+    async def bulk_edit(
+        self,
+        *,
+        account_id: str,
+        new_priorities: Dict[str, int],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RuleBulkEditResponse]:
+        """
+        Update email scanner rule priorities
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/dlp/email/rules",
+            body=await async_maybe_transform(
+                {"new_priorities": new_priorities}, rule_bulk_edit_params.RuleBulkEditParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RuleBulkEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RuleBulkEditResponse]], ResultWrapper[RuleBulkEditResponse]),
+        )
+
+    async def get(
+        self,
+        rule_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RuleGetResponse]:
+        """
+        Get an email scanner rule
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/dlp/email/rules/{rule_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RuleGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RuleGetResponse]], ResultWrapper[RuleGetResponse]),
+        )
+
+
+class RulesResourceWithRawResponse:
+    def __init__(self, rules: RulesResource) -> None:
+        self._rules = rules
+
+        self.create = to_raw_response_wrapper(
+            rules.create,
+        )
+        self.update = to_raw_response_wrapper(
+            rules.update,
+        )
+        self.list = to_raw_response_wrapper(
+            rules.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            rules.delete,
+        )
+        self.bulk_edit = to_raw_response_wrapper(
+            rules.bulk_edit,
+        )
+        self.get = to_raw_response_wrapper(
+            rules.get,
+        )
+
+
+class AsyncRulesResourceWithRawResponse:
+    def __init__(self, rules: AsyncRulesResource) -> None:
+        self._rules = rules
+
+        self.create = async_to_raw_response_wrapper(
+            rules.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            rules.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            rules.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            rules.delete,
+        )
+        self.bulk_edit = async_to_raw_response_wrapper(
+            rules.bulk_edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            rules.get,
+        )
+
+
+class RulesResourceWithStreamingResponse:
+    def __init__(self, rules: RulesResource) -> None:
+        self._rules = rules
+
+        self.create = to_streamed_response_wrapper(
+            rules.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            rules.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            rules.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            rules.delete,
+        )
+        self.bulk_edit = to_streamed_response_wrapper(
+            rules.bulk_edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            rules.get,
+        )
+
+
+class AsyncRulesResourceWithStreamingResponse:
+    def __init__(self, rules: AsyncRulesResource) -> None:
+        self._rules = rules
+
+        self.create = async_to_streamed_response_wrapper(
+            rules.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            rules.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            rules.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            rules.delete,
+        )
+        self.bulk_edit = async_to_streamed_response_wrapper(
+            rules.bulk_edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            rules.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/dlp/entries/__init__.py b/src/cloudflare/resources/zero_trust/dlp/entries/__init__.py
new file mode 100644
index 00000000000..01f7546037f
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dlp/entries/__init__.py
@@ -0,0 +1,61 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .custom import (
+    CustomResource,
+    AsyncCustomResource,
+    CustomResourceWithRawResponse,
+    AsyncCustomResourceWithRawResponse,
+    CustomResourceWithStreamingResponse,
+    AsyncCustomResourceWithStreamingResponse,
+)
+from .entries import (
+    EntriesResource,
+    AsyncEntriesResource,
+    EntriesResourceWithRawResponse,
+    AsyncEntriesResourceWithRawResponse,
+    EntriesResourceWithStreamingResponse,
+    AsyncEntriesResourceWithStreamingResponse,
+)
+from .predefined import (
+    PredefinedResource,
+    AsyncPredefinedResource,
+    PredefinedResourceWithRawResponse,
+    AsyncPredefinedResourceWithRawResponse,
+    PredefinedResourceWithStreamingResponse,
+    AsyncPredefinedResourceWithStreamingResponse,
+)
+from .integration import (
+    IntegrationResource,
+    AsyncIntegrationResource,
+    IntegrationResourceWithRawResponse,
+    AsyncIntegrationResourceWithRawResponse,
+    IntegrationResourceWithStreamingResponse,
+    AsyncIntegrationResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "CustomResource",
+    "AsyncCustomResource",
+    "CustomResourceWithRawResponse",
+    "AsyncCustomResourceWithRawResponse",
+    "CustomResourceWithStreamingResponse",
+    "AsyncCustomResourceWithStreamingResponse",
+    "PredefinedResource",
+    "AsyncPredefinedResource",
+    "PredefinedResourceWithRawResponse",
+    "AsyncPredefinedResourceWithRawResponse",
+    "PredefinedResourceWithStreamingResponse",
+    "AsyncPredefinedResourceWithStreamingResponse",
+    "IntegrationResource",
+    "AsyncIntegrationResource",
+    "IntegrationResourceWithRawResponse",
+    "AsyncIntegrationResourceWithRawResponse",
+    "IntegrationResourceWithStreamingResponse",
+    "AsyncIntegrationResourceWithStreamingResponse",
+    "EntriesResource",
+    "AsyncEntriesResource",
+    "EntriesResourceWithRawResponse",
+    "AsyncEntriesResourceWithRawResponse",
+    "EntriesResourceWithStreamingResponse",
+    "AsyncEntriesResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/dlp/entries/custom.py b/src/cloudflare/resources/zero_trust/dlp/entries/custom.py
new file mode 100644
index 00000000000..ad9e74d0e47
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dlp/entries/custom.py
@@ -0,0 +1,595 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Any, Type, Optional, cast
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from .....pagination import SyncSinglePage, AsyncSinglePage
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.zero_trust.dlp.entries import custom_create_params, custom_update_params
+from .....types.zero_trust.dlp.profiles.pattern_param import PatternParam
+from .....types.zero_trust.dlp.entries.custom_get_response import CustomGetResponse
+from .....types.zero_trust.dlp.entries.custom_list_response import CustomListResponse
+from .....types.zero_trust.dlp.entries.custom_create_response import CustomCreateResponse
+from .....types.zero_trust.dlp.entries.custom_update_response import CustomUpdateResponse
+
+__all__ = ["CustomResource", "AsyncCustomResource"]
+
+
+class CustomResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> CustomResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CustomResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CustomResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CustomResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        enabled: bool,
+        name: str,
+        pattern: PatternParam,
+        profile_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomCreateResponse]:
+        """
+        Creates a DLP custom entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/dlp/entries",
+            body=maybe_transform(
+                {
+                    "enabled": enabled,
+                    "name": name,
+                    "pattern": pattern,
+                    "profile_id": profile_id,
+                },
+                custom_create_params.CustomCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CustomCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CustomCreateResponse]], ResultWrapper[CustomCreateResponse]),
+        )
+
+    def update(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        enabled: bool,
+        name: str,
+        pattern: PatternParam,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomUpdateResponse]:
+        """
+        Updates a DLP custom entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/dlp/entries/custom/{entry_id}",
+            body=maybe_transform(
+                {
+                    "enabled": enabled,
+                    "name": name,
+                    "pattern": pattern,
+                },
+                custom_update_params.CustomUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CustomUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CustomUpdateResponse]], ResultWrapper[CustomUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[CustomListResponse]:
+        """
+        Lists all DLP entries in an account.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dlp/entries",
+            page=SyncSinglePage[CustomListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, CustomListResponse),  # Union types cannot be passed in as arguments in the type system
+        )
+
+    def delete(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Deletes a DLP custom entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/dlp/entries/{entry_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def get(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomGetResponse]:
+        """
+        Fetches a DLP entry by ID.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return cast(
+            Optional[CustomGetResponse],
+            self._get(
+                f"/accounts/{account_id}/dlp/entries/{entry_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[CustomGetResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[CustomGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+
+class AsyncCustomResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncCustomResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCustomResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCustomResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCustomResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        enabled: bool,
+        name: str,
+        pattern: PatternParam,
+        profile_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomCreateResponse]:
+        """
+        Creates a DLP custom entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/dlp/entries",
+            body=await async_maybe_transform(
+                {
+                    "enabled": enabled,
+                    "name": name,
+                    "pattern": pattern,
+                    "profile_id": profile_id,
+                },
+                custom_create_params.CustomCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CustomCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CustomCreateResponse]], ResultWrapper[CustomCreateResponse]),
+        )
+
+    async def update(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        enabled: bool,
+        name: str,
+        pattern: PatternParam,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomUpdateResponse]:
+        """
+        Updates a DLP custom entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/dlp/entries/custom/{entry_id}",
+            body=await async_maybe_transform(
+                {
+                    "enabled": enabled,
+                    "name": name,
+                    "pattern": pattern,
+                },
+                custom_update_params.CustomUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CustomUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CustomUpdateResponse]], ResultWrapper[CustomUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[CustomListResponse, AsyncSinglePage[CustomListResponse]]:
+        """
+        Lists all DLP entries in an account.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dlp/entries",
+            page=AsyncSinglePage[CustomListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, CustomListResponse),  # Union types cannot be passed in as arguments in the type system
+        )
+
+    async def delete(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Deletes a DLP custom entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/dlp/entries/{entry_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def get(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomGetResponse]:
+        """
+        Fetches a DLP entry by ID.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return cast(
+            Optional[CustomGetResponse],
+            await self._get(
+                f"/accounts/{account_id}/dlp/entries/{entry_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[CustomGetResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[CustomGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+
+class CustomResourceWithRawResponse:
+    def __init__(self, custom: CustomResource) -> None:
+        self._custom = custom
+
+        self.create = to_raw_response_wrapper(
+            custom.create,
+        )
+        self.update = to_raw_response_wrapper(
+            custom.update,
+        )
+        self.list = to_raw_response_wrapper(
+            custom.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            custom.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            custom.get,
+        )
+
+
+class AsyncCustomResourceWithRawResponse:
+    def __init__(self, custom: AsyncCustomResource) -> None:
+        self._custom = custom
+
+        self.create = async_to_raw_response_wrapper(
+            custom.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            custom.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            custom.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            custom.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            custom.get,
+        )
+
+
+class CustomResourceWithStreamingResponse:
+    def __init__(self, custom: CustomResource) -> None:
+        self._custom = custom
+
+        self.create = to_streamed_response_wrapper(
+            custom.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            custom.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            custom.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            custom.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            custom.get,
+        )
+
+
+class AsyncCustomResourceWithStreamingResponse:
+    def __init__(self, custom: AsyncCustomResource) -> None:
+        self._custom = custom
+
+        self.create = async_to_streamed_response_wrapper(
+            custom.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            custom.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            custom.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            custom.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            custom.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/dlp/entries/entries.py b/src/cloudflare/resources/zero_trust/dlp/entries/entries.py
new file mode 100644
index 00000000000..a2e7b357ae1
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dlp/entries/entries.py
@@ -0,0 +1,862 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Any, Type, Optional, cast
+from typing_extensions import Literal, overload
+
+import httpx
+
+from .custom import (
+    CustomResource,
+    AsyncCustomResource,
+    CustomResourceWithRawResponse,
+    AsyncCustomResourceWithRawResponse,
+    CustomResourceWithStreamingResponse,
+    AsyncCustomResourceWithStreamingResponse,
+)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import required_args, maybe_transform, async_maybe_transform
+from .predefined import (
+    PredefinedResource,
+    AsyncPredefinedResource,
+    PredefinedResourceWithRawResponse,
+    AsyncPredefinedResourceWithRawResponse,
+    PredefinedResourceWithStreamingResponse,
+    AsyncPredefinedResourceWithStreamingResponse,
+)
+from ....._compat import cached_property
+from .integration import (
+    IntegrationResource,
+    AsyncIntegrationResource,
+    IntegrationResourceWithRawResponse,
+    AsyncIntegrationResourceWithRawResponse,
+    IntegrationResourceWithStreamingResponse,
+    AsyncIntegrationResourceWithStreamingResponse,
+)
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from .....pagination import SyncSinglePage, AsyncSinglePage
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.zero_trust.dlp import entry_create_params, entry_update_params
+from .....types.zero_trust.dlp.entry_get_response import EntryGetResponse
+from .....types.zero_trust.dlp.entry_list_response import EntryListResponse
+from .....types.zero_trust.dlp.entry_create_response import EntryCreateResponse
+from .....types.zero_trust.dlp.entry_update_response import EntryUpdateResponse
+from .....types.zero_trust.dlp.profiles.pattern_param import PatternParam
+
+__all__ = ["EntriesResource", "AsyncEntriesResource"]
+
+
+class EntriesResource(SyncAPIResource):
+    @cached_property
+    def custom(self) -> CustomResource:
+        return CustomResource(self._client)
+
+    @cached_property
+    def predefined(self) -> PredefinedResource:
+        return PredefinedResource(self._client)
+
+    @cached_property
+    def integration(self) -> IntegrationResource:
+        return IntegrationResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> EntriesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return EntriesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> EntriesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return EntriesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        enabled: bool,
+        name: str,
+        pattern: PatternParam,
+        profile_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EntryCreateResponse]:
+        """
+        Creates a DLP custom entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/dlp/entries",
+            body=maybe_transform(
+                {
+                    "enabled": enabled,
+                    "name": name,
+                    "pattern": pattern,
+                    "profile_id": profile_id,
+                },
+                entry_create_params.EntryCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[EntryCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[EntryCreateResponse]], ResultWrapper[EntryCreateResponse]),
+        )
+
+    @overload
+    def update(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        name: str,
+        pattern: PatternParam,
+        type: Literal["custom"],
+        enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EntryUpdateResponse]:
+        """
+        Updates a DLP entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def update(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        type: Literal["predefined"],
+        enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EntryUpdateResponse]:
+        """
+        Updates a DLP entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    def update(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        type: Literal["integration"],
+        enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EntryUpdateResponse]:
+        """
+        Updates a DLP entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "name", "pattern", "type"], ["account_id", "type"])
+    def update(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        pattern: PatternParam | Omit = omit,
+        type: Literal["custom"] | Literal["predefined"] | Literal["integration"],
+        enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EntryUpdateResponse]:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return cast(
+            Optional[EntryUpdateResponse],
+            self._put(
+                f"/accounts/{account_id}/dlp/entries/{entry_id}",
+                body=maybe_transform(
+                    {
+                        "name": name,
+                        "pattern": pattern,
+                        "type": type,
+                        "enabled": enabled,
+                    },
+                    entry_update_params.EntryUpdateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[EntryUpdateResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[EntryUpdateResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[EntryListResponse]:
+        """
+        Lists all DLP entries in an account.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dlp/entries",
+            page=SyncSinglePage[EntryListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, EntryListResponse),  # Union types cannot be passed in as arguments in the type system
+        )
+
+    def delete(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Deletes a DLP custom entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/dlp/entries/{entry_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def get(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EntryGetResponse]:
+        """
+        Fetches a DLP entry by ID.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return cast(
+            Optional[EntryGetResponse],
+            self._get(
+                f"/accounts/{account_id}/dlp/entries/{entry_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[EntryGetResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[EntryGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+
+class AsyncEntriesResource(AsyncAPIResource):
+    @cached_property
+    def custom(self) -> AsyncCustomResource:
+        return AsyncCustomResource(self._client)
+
+    @cached_property
+    def predefined(self) -> AsyncPredefinedResource:
+        return AsyncPredefinedResource(self._client)
+
+    @cached_property
+    def integration(self) -> AsyncIntegrationResource:
+        return AsyncIntegrationResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncEntriesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncEntriesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncEntriesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncEntriesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        enabled: bool,
+        name: str,
+        pattern: PatternParam,
+        profile_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EntryCreateResponse]:
+        """
+        Creates a DLP custom entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/dlp/entries",
+            body=await async_maybe_transform(
+                {
+                    "enabled": enabled,
+                    "name": name,
+                    "pattern": pattern,
+                    "profile_id": profile_id,
+                },
+                entry_create_params.EntryCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[EntryCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[EntryCreateResponse]], ResultWrapper[EntryCreateResponse]),
+        )
+
+    @overload
+    async def update(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        name: str,
+        pattern: PatternParam,
+        type: Literal["custom"],
+        enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EntryUpdateResponse]:
+        """
+        Updates a DLP entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def update(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        type: Literal["predefined"],
+        enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EntryUpdateResponse]:
+        """
+        Updates a DLP entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @overload
+    async def update(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        type: Literal["integration"],
+        enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EntryUpdateResponse]:
+        """
+        Updates a DLP entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "name", "pattern", "type"], ["account_id", "type"])
+    async def update(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        pattern: PatternParam | Omit = omit,
+        type: Literal["custom"] | Literal["predefined"] | Literal["integration"],
+        enabled: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EntryUpdateResponse]:
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return cast(
+            Optional[EntryUpdateResponse],
+            await self._put(
+                f"/accounts/{account_id}/dlp/entries/{entry_id}",
+                body=await async_maybe_transform(
+                    {
+                        "name": name,
+                        "pattern": pattern,
+                        "type": type,
+                        "enabled": enabled,
+                    },
+                    entry_update_params.EntryUpdateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[EntryUpdateResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[EntryUpdateResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[EntryListResponse, AsyncSinglePage[EntryListResponse]]:
+        """
+        Lists all DLP entries in an account.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dlp/entries",
+            page=AsyncSinglePage[EntryListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, EntryListResponse),  # Union types cannot be passed in as arguments in the type system
+        )
+
+    async def delete(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Deletes a DLP custom entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/dlp/entries/{entry_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def get(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[EntryGetResponse]:
+        """
+        Fetches a DLP entry by ID.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return cast(
+            Optional[EntryGetResponse],
+            await self._get(
+                f"/accounts/{account_id}/dlp/entries/{entry_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[EntryGetResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[EntryGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+
+class EntriesResourceWithRawResponse:
+    def __init__(self, entries: EntriesResource) -> None:
+        self._entries = entries
+
+        self.create = to_raw_response_wrapper(
+            entries.create,
+        )
+        self.update = to_raw_response_wrapper(
+            entries.update,
+        )
+        self.list = to_raw_response_wrapper(
+            entries.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            entries.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            entries.get,
+        )
+
+    @cached_property
+    def custom(self) -> CustomResourceWithRawResponse:
+        return CustomResourceWithRawResponse(self._entries.custom)
+
+    @cached_property
+    def predefined(self) -> PredefinedResourceWithRawResponse:
+        return PredefinedResourceWithRawResponse(self._entries.predefined)
+
+    @cached_property
+    def integration(self) -> IntegrationResourceWithRawResponse:
+        return IntegrationResourceWithRawResponse(self._entries.integration)
+
+
+class AsyncEntriesResourceWithRawResponse:
+    def __init__(self, entries: AsyncEntriesResource) -> None:
+        self._entries = entries
+
+        self.create = async_to_raw_response_wrapper(
+            entries.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            entries.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            entries.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            entries.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            entries.get,
+        )
+
+    @cached_property
+    def custom(self) -> AsyncCustomResourceWithRawResponse:
+        return AsyncCustomResourceWithRawResponse(self._entries.custom)
+
+    @cached_property
+    def predefined(self) -> AsyncPredefinedResourceWithRawResponse:
+        return AsyncPredefinedResourceWithRawResponse(self._entries.predefined)
+
+    @cached_property
+    def integration(self) -> AsyncIntegrationResourceWithRawResponse:
+        return AsyncIntegrationResourceWithRawResponse(self._entries.integration)
+
+
+class EntriesResourceWithStreamingResponse:
+    def __init__(self, entries: EntriesResource) -> None:
+        self._entries = entries
+
+        self.create = to_streamed_response_wrapper(
+            entries.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            entries.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            entries.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            entries.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            entries.get,
+        )
+
+    @cached_property
+    def custom(self) -> CustomResourceWithStreamingResponse:
+        return CustomResourceWithStreamingResponse(self._entries.custom)
+
+    @cached_property
+    def predefined(self) -> PredefinedResourceWithStreamingResponse:
+        return PredefinedResourceWithStreamingResponse(self._entries.predefined)
+
+    @cached_property
+    def integration(self) -> IntegrationResourceWithStreamingResponse:
+        return IntegrationResourceWithStreamingResponse(self._entries.integration)
+
+
+class AsyncEntriesResourceWithStreamingResponse:
+    def __init__(self, entries: AsyncEntriesResource) -> None:
+        self._entries = entries
+
+        self.create = async_to_streamed_response_wrapper(
+            entries.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            entries.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            entries.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            entries.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            entries.get,
+        )
+
+    @cached_property
+    def custom(self) -> AsyncCustomResourceWithStreamingResponse:
+        return AsyncCustomResourceWithStreamingResponse(self._entries.custom)
+
+    @cached_property
+    def predefined(self) -> AsyncPredefinedResourceWithStreamingResponse:
+        return AsyncPredefinedResourceWithStreamingResponse(self._entries.predefined)
+
+    @cached_property
+    def integration(self) -> AsyncIntegrationResourceWithStreamingResponse:
+        return AsyncIntegrationResourceWithStreamingResponse(self._entries.integration)
diff --git a/src/cloudflare/resources/zero_trust/dlp/entries/integration.py b/src/cloudflare/resources/zero_trust/dlp/entries/integration.py
new file mode 100644
index 00000000000..442bc7ed1ea
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dlp/entries/integration.py
@@ -0,0 +1,582 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Any, Type, Optional, cast
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from .....pagination import SyncSinglePage, AsyncSinglePage
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.zero_trust.dlp.entries import integration_create_params, integration_update_params
+from .....types.zero_trust.dlp.entries.integration_get_response import IntegrationGetResponse
+from .....types.zero_trust.dlp.entries.integration_list_response import IntegrationListResponse
+from .....types.zero_trust.dlp.entries.integration_create_response import IntegrationCreateResponse
+from .....types.zero_trust.dlp.entries.integration_update_response import IntegrationUpdateResponse
+
+__all__ = ["IntegrationResource", "AsyncIntegrationResource"]
+
+
+class IntegrationResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> IntegrationResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return IntegrationResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> IntegrationResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return IntegrationResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        enabled: bool,
+        entry_id: str,
+        profile_id: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IntegrationCreateResponse]:
+        """
+        Integration entries can't be created, this will update an existing integration
+        entry. This is needed for our generated terraform API.
+
+        Args:
+          profile_id: This field is not used as the owning profile. For predefined entries it is
+              already set to a predefined profile.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/dlp/entries/integration",
+            body=maybe_transform(
+                {
+                    "enabled": enabled,
+                    "entry_id": entry_id,
+                    "profile_id": profile_id,
+                },
+                integration_create_params.IntegrationCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[IntegrationCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IntegrationCreateResponse]], ResultWrapper[IntegrationCreateResponse]),
+        )
+
+    def update(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        enabled: bool,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IntegrationUpdateResponse]:
+        """
+        Updates a DLP entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/dlp/entries/integration/{entry_id}",
+            body=maybe_transform({"enabled": enabled}, integration_update_params.IntegrationUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[IntegrationUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IntegrationUpdateResponse]], ResultWrapper[IntegrationUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[IntegrationListResponse]:
+        """
+        Lists all DLP entries in an account.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dlp/entries",
+            page=SyncSinglePage[IntegrationListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, IntegrationListResponse),  # Union types cannot be passed in as arguments in the type system
+        )
+
+    def delete(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        This is a no-op as integration entires can't be deleted but is needed for our
+        generated terraform API.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/dlp/entries/integration/{entry_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def get(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IntegrationGetResponse]:
+        """
+        Fetches a DLP entry by ID.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return cast(
+            Optional[IntegrationGetResponse],
+            self._get(
+                f"/accounts/{account_id}/dlp/entries/{entry_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[IntegrationGetResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[IntegrationGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+
+class AsyncIntegrationResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncIntegrationResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncIntegrationResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncIntegrationResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncIntegrationResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        enabled: bool,
+        entry_id: str,
+        profile_id: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IntegrationCreateResponse]:
+        """
+        Integration entries can't be created, this will update an existing integration
+        entry. This is needed for our generated terraform API.
+
+        Args:
+          profile_id: This field is not used as the owning profile. For predefined entries it is
+              already set to a predefined profile.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/dlp/entries/integration",
+            body=await async_maybe_transform(
+                {
+                    "enabled": enabled,
+                    "entry_id": entry_id,
+                    "profile_id": profile_id,
+                },
+                integration_create_params.IntegrationCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[IntegrationCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IntegrationCreateResponse]], ResultWrapper[IntegrationCreateResponse]),
+        )
+
+    async def update(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        enabled: bool,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IntegrationUpdateResponse]:
+        """
+        Updates a DLP entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/dlp/entries/integration/{entry_id}",
+            body=await async_maybe_transform({"enabled": enabled}, integration_update_params.IntegrationUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[IntegrationUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[IntegrationUpdateResponse]], ResultWrapper[IntegrationUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[IntegrationListResponse, AsyncSinglePage[IntegrationListResponse]]:
+        """
+        Lists all DLP entries in an account.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dlp/entries",
+            page=AsyncSinglePage[IntegrationListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, IntegrationListResponse),  # Union types cannot be passed in as arguments in the type system
+        )
+
+    async def delete(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        This is a no-op as integration entires can't be deleted but is needed for our
+        generated terraform API.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/dlp/entries/integration/{entry_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def get(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[IntegrationGetResponse]:
+        """
+        Fetches a DLP entry by ID.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return cast(
+            Optional[IntegrationGetResponse],
+            await self._get(
+                f"/accounts/{account_id}/dlp/entries/{entry_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[IntegrationGetResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[IntegrationGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+
+class IntegrationResourceWithRawResponse:
+    def __init__(self, integration: IntegrationResource) -> None:
+        self._integration = integration
+
+        self.create = to_raw_response_wrapper(
+            integration.create,
+        )
+        self.update = to_raw_response_wrapper(
+            integration.update,
+        )
+        self.list = to_raw_response_wrapper(
+            integration.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            integration.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            integration.get,
+        )
+
+
+class AsyncIntegrationResourceWithRawResponse:
+    def __init__(self, integration: AsyncIntegrationResource) -> None:
+        self._integration = integration
+
+        self.create = async_to_raw_response_wrapper(
+            integration.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            integration.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            integration.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            integration.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            integration.get,
+        )
+
+
+class IntegrationResourceWithStreamingResponse:
+    def __init__(self, integration: IntegrationResource) -> None:
+        self._integration = integration
+
+        self.create = to_streamed_response_wrapper(
+            integration.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            integration.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            integration.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            integration.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            integration.get,
+        )
+
+
+class AsyncIntegrationResourceWithStreamingResponse:
+    def __init__(self, integration: AsyncIntegrationResource) -> None:
+        self._integration = integration
+
+        self.create = async_to_streamed_response_wrapper(
+            integration.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            integration.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            integration.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            integration.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            integration.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/dlp/entries/predefined.py b/src/cloudflare/resources/zero_trust/dlp/entries/predefined.py
new file mode 100644
index 00000000000..023948dac57
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dlp/entries/predefined.py
@@ -0,0 +1,582 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Any, Type, Optional, cast
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from .....pagination import SyncSinglePage, AsyncSinglePage
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.zero_trust.dlp.entries import predefined_create_params, predefined_update_params
+from .....types.zero_trust.dlp.entries.predefined_get_response import PredefinedGetResponse
+from .....types.zero_trust.dlp.entries.predefined_list_response import PredefinedListResponse
+from .....types.zero_trust.dlp.entries.predefined_create_response import PredefinedCreateResponse
+from .....types.zero_trust.dlp.entries.predefined_update_response import PredefinedUpdateResponse
+
+__all__ = ["PredefinedResource", "AsyncPredefinedResource"]
+
+
+class PredefinedResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> PredefinedResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return PredefinedResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> PredefinedResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return PredefinedResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        enabled: bool,
+        entry_id: str,
+        profile_id: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PredefinedCreateResponse]:
+        """
+        Predefined entries can't be created, this will update an existing predefined
+        entry. This is needed for our generated terraform API.
+
+        Args:
+          profile_id: This field is not used as the owning profile. For predefined entries it is
+              already set to a predefined profile.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/dlp/entries/predefined",
+            body=maybe_transform(
+                {
+                    "enabled": enabled,
+                    "entry_id": entry_id,
+                    "profile_id": profile_id,
+                },
+                predefined_create_params.PredefinedCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PredefinedCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PredefinedCreateResponse]], ResultWrapper[PredefinedCreateResponse]),
+        )
+
+    def update(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        enabled: bool,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PredefinedUpdateResponse]:
+        """
+        Updates a DLP entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/dlp/entries/predefined/{entry_id}",
+            body=maybe_transform({"enabled": enabled}, predefined_update_params.PredefinedUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PredefinedUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PredefinedUpdateResponse]], ResultWrapper[PredefinedUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[PredefinedListResponse]:
+        """
+        Lists all DLP entries in an account.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dlp/entries",
+            page=SyncSinglePage[PredefinedListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, PredefinedListResponse),  # Union types cannot be passed in as arguments in the type system
+        )
+
+    def delete(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        This is a no-op as predefined entires can't be deleted but is needed for our
+        generated terraform API.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/dlp/entries/predefined/{entry_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def get(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PredefinedGetResponse]:
+        """
+        Fetches a DLP entry by ID.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return cast(
+            Optional[PredefinedGetResponse],
+            self._get(
+                f"/accounts/{account_id}/dlp/entries/{entry_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[PredefinedGetResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[PredefinedGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+
+class AsyncPredefinedResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncPredefinedResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncPredefinedResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncPredefinedResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncPredefinedResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        enabled: bool,
+        entry_id: str,
+        profile_id: Optional[str] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PredefinedCreateResponse]:
+        """
+        Predefined entries can't be created, this will update an existing predefined
+        entry. This is needed for our generated terraform API.
+
+        Args:
+          profile_id: This field is not used as the owning profile. For predefined entries it is
+              already set to a predefined profile.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/dlp/entries/predefined",
+            body=await async_maybe_transform(
+                {
+                    "enabled": enabled,
+                    "entry_id": entry_id,
+                    "profile_id": profile_id,
+                },
+                predefined_create_params.PredefinedCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PredefinedCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PredefinedCreateResponse]], ResultWrapper[PredefinedCreateResponse]),
+        )
+
+    async def update(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        enabled: bool,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PredefinedUpdateResponse]:
+        """
+        Updates a DLP entry.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/dlp/entries/predefined/{entry_id}",
+            body=await async_maybe_transform({"enabled": enabled}, predefined_update_params.PredefinedUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PredefinedUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[PredefinedUpdateResponse]], ResultWrapper[PredefinedUpdateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[PredefinedListResponse, AsyncSinglePage[PredefinedListResponse]]:
+        """
+        Lists all DLP entries in an account.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/dlp/entries",
+            page=AsyncSinglePage[PredefinedListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=cast(Any, PredefinedListResponse),  # Union types cannot be passed in as arguments in the type system
+        )
+
+    async def delete(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        This is a no-op as predefined entires can't be deleted but is needed for our
+        generated terraform API.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/dlp/entries/predefined/{entry_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def get(
+        self,
+        entry_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PredefinedGetResponse]:
+        """
+        Fetches a DLP entry by ID.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not entry_id:
+            raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        return cast(
+            Optional[PredefinedGetResponse],
+            await self._get(
+                f"/accounts/{account_id}/dlp/entries/{entry_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[PredefinedGetResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[PredefinedGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
+
+class PredefinedResourceWithRawResponse:
+    def __init__(self, predefined: PredefinedResource) -> None:
+        self._predefined = predefined
+
+        self.create = to_raw_response_wrapper(
+            predefined.create,
+        )
+        self.update = to_raw_response_wrapper(
+            predefined.update,
+        )
+        self.list = to_raw_response_wrapper(
+            predefined.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            predefined.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            predefined.get,
+        )
+
+
+class AsyncPredefinedResourceWithRawResponse:
+    def __init__(self, predefined: AsyncPredefinedResource) -> None:
+        self._predefined = predefined
+
+        self.create = async_to_raw_response_wrapper(
+            predefined.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            predefined.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            predefined.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            predefined.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            predefined.get,
+        )
+
+
+class PredefinedResourceWithStreamingResponse:
+    def __init__(self, predefined: PredefinedResource) -> None:
+        self._predefined = predefined
+
+        self.create = to_streamed_response_wrapper(
+            predefined.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            predefined.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            predefined.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            predefined.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            predefined.get,
+        )
+
+
+class AsyncPredefinedResourceWithStreamingResponse:
+    def __init__(self, predefined: AsyncPredefinedResource) -> None:
+        self._predefined = predefined
+
+        self.create = async_to_streamed_response_wrapper(
+            predefined.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            predefined.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            predefined.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            predefined.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            predefined.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/dlp/limits.py b/src/cloudflare/resources/zero_trust/dlp/limits.py
new file mode 100755
index 00000000000..ea5843c492c
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/dlp/limits.py
@@ -0,0 +1,174 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.zero_trust.dlp.limit_list_response import LimitListResponse
+
+__all__ = ["LimitsResource", "AsyncLimitsResource"]
+
+
+class LimitsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> LimitsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return LimitsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> LimitsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return LimitsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[LimitListResponse]:
+        """
+        Fetch limits associated with DLP for account
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/dlp/limits",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[LimitListResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[LimitListResponse]], ResultWrapper[LimitListResponse]),
+        )
+
+
+class AsyncLimitsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncLimitsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncLimitsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncLimitsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncLimitsResourceWithStreamingResponse(self)
+
+    async def list(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[LimitListResponse]:
+        """
+        Fetch limits associated with DLP for account
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/dlp/limits",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[LimitListResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[LimitListResponse]], ResultWrapper[LimitListResponse]),
+        )
+
+
+class LimitsResourceWithRawResponse:
+    def __init__(self, limits: LimitsResource) -> None:
+        self._limits = limits
+
+        self.list = to_raw_response_wrapper(
+            limits.list,
+        )
+
+
+class AsyncLimitsResourceWithRawResponse:
+    def __init__(self, limits: AsyncLimitsResource) -> None:
+        self._limits = limits
+
+        self.list = async_to_raw_response_wrapper(
+            limits.list,
+        )
+
+
+class LimitsResourceWithStreamingResponse:
+    def __init__(self, limits: LimitsResource) -> None:
+        self._limits = limits
+
+        self.list = to_streamed_response_wrapper(
+            limits.list,
+        )
+
+
+class AsyncLimitsResourceWithStreamingResponse:
+    def __init__(self, limits: AsyncLimitsResource) -> None:
+        self._limits = limits
+
+        self.list = async_to_streamed_response_wrapper(
+            limits.list,
+        )
diff --git a/src/cloudflare/resources/zero_trust/dlp/patterns.py b/src/cloudflare/resources/zero_trust/dlp/patterns.py
index 42b0323f7aa..445c21a725f 100644
--- a/src/cloudflare/resources/zero_trust/dlp/patterns.py
+++ b/src/cloudflare/resources/zero_trust/dlp/patterns.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -22,7 +19,7 @@
 from ...._wrappers import ResultWrapper
 from ...._base_client import make_request_options
 from ....types.zero_trust.dlp import pattern_validate_params
-from ....types.logpush.ownership_validation import OwnershipValidation
+from ....types.zero_trust.dlp.pattern_validate_response import PatternValidateResponse
 
 __all__ = ["PatternsResource", "AsyncPatternsResource"]
 
@@ -30,10 +27,21 @@
 class PatternsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PatternsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PatternsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PatternsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PatternsResourceWithStreamingResponse(self)
 
     def validate(
@@ -41,24 +49,31 @@ def validate(
         *,
         account_id: str,
         regex: str,
+        max_match_bytes: Optional[int] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OwnershipValidation]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PatternValidateResponse]:
         """Validates whether this pattern is a valid regular expression.
 
         Rejects it if the
-        regular expression is too complex or can match an unbounded-length string. Your
-        regex will be rejected if it uses the Kleene Star -- be sure to bound the
-        maximum number of characters that can be matched.
+        regular expression is too complex or can match an unbounded-length string. The
+        regex will be rejected if it uses `*` or `+`. Bound the maximum number of
+        characters that can be matched using a range, e.g. `{1,100}`.
 
         Args:
-          account_id: Identifier
+          max_match_bytes: Maximum number of bytes that the regular expression can match.
 
-          regex: The regex pattern.
+              If this is `null` then there is no limit on the length. Patterns can use `*` and
+              `+`. Otherwise repeats should use a range `{m,n}` to restrict patterns to the
+              length. If this field is missing, then a default length limit is used.
+
+              Note that the length is specified in bytes. Since regular expressions use UTF-8
+              the pattern `.` can match up to 4 bytes. Hence `.{1,256}` has a maximum length
+              of 1024 bytes.
 
           extra_headers: Send extra headers
 
@@ -72,25 +87,42 @@ def validate(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._post(
             f"/accounts/{account_id}/dlp/patterns/validate",
-            body=maybe_transform({"regex": regex}, pattern_validate_params.PatternValidateParams),
+            body=maybe_transform(
+                {
+                    "regex": regex,
+                    "max_match_bytes": max_match_bytes,
+                },
+                pattern_validate_params.PatternValidateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[OwnershipValidation]]._unwrapper,
+                post_parser=ResultWrapper[Optional[PatternValidateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[OwnershipValidation]], ResultWrapper[OwnershipValidation]),
+            cast_to=cast(Type[Optional[PatternValidateResponse]], ResultWrapper[PatternValidateResponse]),
         )
 
 
 class AsyncPatternsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPatternsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPatternsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPatternsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPatternsResourceWithStreamingResponse(self)
 
     async def validate(
@@ -98,24 +130,31 @@ async def validate(
         *,
         account_id: str,
         regex: str,
+        max_match_bytes: Optional[int] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OwnershipValidation]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PatternValidateResponse]:
         """Validates whether this pattern is a valid regular expression.
 
         Rejects it if the
-        regular expression is too complex or can match an unbounded-length string. Your
-        regex will be rejected if it uses the Kleene Star -- be sure to bound the
-        maximum number of characters that can be matched.
+        regular expression is too complex or can match an unbounded-length string. The
+        regex will be rejected if it uses `*` or `+`. Bound the maximum number of
+        characters that can be matched using a range, e.g. `{1,100}`.
 
         Args:
-          account_id: Identifier
+          max_match_bytes: Maximum number of bytes that the regular expression can match.
 
-          regex: The regex pattern.
+              If this is `null` then there is no limit on the length. Patterns can use `*` and
+              `+`. Otherwise repeats should use a range `{m,n}` to restrict patterns to the
+              length. If this field is missing, then a default length limit is used.
+
+              Note that the length is specified in bytes. Since regular expressions use UTF-8
+              the pattern `.` can match up to 4 bytes. Hence `.{1,256}` has a maximum length
+              of 1024 bytes.
 
           extra_headers: Send extra headers
 
@@ -129,15 +168,21 @@ async def validate(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._post(
             f"/accounts/{account_id}/dlp/patterns/validate",
-            body=await async_maybe_transform({"regex": regex}, pattern_validate_params.PatternValidateParams),
+            body=await async_maybe_transform(
+                {
+                    "regex": regex,
+                    "max_match_bytes": max_match_bytes,
+                },
+                pattern_validate_params.PatternValidateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[OwnershipValidation]]._unwrapper,
+                post_parser=ResultWrapper[Optional[PatternValidateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[OwnershipValidation]], ResultWrapper[OwnershipValidation]),
+            cast_to=cast(Type[Optional[PatternValidateResponse]], ResultWrapper[PatternValidateResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/zero_trust/dlp/payload_logs.py b/src/cloudflare/resources/zero_trust/dlp/payload_logs.py
index 99083ab5398..99dbbf7784c 100644
--- a/src/cloudflare/resources/zero_trust/dlp/payload_logs.py
+++ b/src/cloudflare/resources/zero_trust/dlp/payload_logs.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -31,32 +28,39 @@
 class PayloadLogsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PayloadLogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PayloadLogsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PayloadLogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PayloadLogsResourceWithStreamingResponse(self)
 
     def update(
         self,
         *,
         account_id: str,
-        public_key: Optional[str],
+        public_key: Optional[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PayloadLogUpdateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PayloadLogUpdateResponse]:
         """
-        Updates the DLP payload log settings for this account.
+        Set payload log settings
 
         Args:
-          account_id: Identifier
-
-          public_key: The public key to use when encrypting extracted payloads, as a base64 string
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -75,9 +79,9 @@ def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[PayloadLogUpdateResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[PayloadLogUpdateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[PayloadLogUpdateResponse], ResultWrapper[PayloadLogUpdateResponse]),
+            cast_to=cast(Type[Optional[PayloadLogUpdateResponse]], ResultWrapper[PayloadLogUpdateResponse]),
         )
 
     def get(
@@ -89,14 +93,12 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PayloadLogGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PayloadLogGetResponse]:
         """
-        Gets the current DLP payload log settings for this account.
+        Get payload log settings
 
         Args:
-          account_id: Identifier
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -114,41 +116,48 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[PayloadLogGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[PayloadLogGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[PayloadLogGetResponse], ResultWrapper[PayloadLogGetResponse]),
+            cast_to=cast(Type[Optional[PayloadLogGetResponse]], ResultWrapper[PayloadLogGetResponse]),
         )
 
 
 class AsyncPayloadLogsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPayloadLogsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPayloadLogsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPayloadLogsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPayloadLogsResourceWithStreamingResponse(self)
 
     async def update(
         self,
         *,
         account_id: str,
-        public_key: Optional[str],
+        public_key: Optional[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PayloadLogUpdateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PayloadLogUpdateResponse]:
         """
-        Updates the DLP payload log settings for this account.
+        Set payload log settings
 
         Args:
-          account_id: Identifier
-
-          public_key: The public key to use when encrypting extracted payloads, as a base64 string
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -169,9 +178,9 @@ async def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[PayloadLogUpdateResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[PayloadLogUpdateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[PayloadLogUpdateResponse], ResultWrapper[PayloadLogUpdateResponse]),
+            cast_to=cast(Type[Optional[PayloadLogUpdateResponse]], ResultWrapper[PayloadLogUpdateResponse]),
         )
 
     async def get(
@@ -183,14 +192,12 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PayloadLogGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PayloadLogGetResponse]:
         """
-        Gets the current DLP payload log settings for this account.
+        Get payload log settings
 
         Args:
-          account_id: Identifier
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -208,9 +215,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[PayloadLogGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[PayloadLogGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[PayloadLogGetResponse], ResultWrapper[PayloadLogGetResponse]),
+            cast_to=cast(Type[Optional[PayloadLogGetResponse]], ResultWrapper[PayloadLogGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/zero_trust/dlp/profiles/custom.py b/src/cloudflare/resources/zero_trust/dlp/profiles/custom.py
index 955f5830213..4b0ee289b78 100644
--- a/src/cloudflare/resources/zero_trust/dlp/profiles/custom.py
+++ b/src/cloudflare/resources/zero_trust/dlp/profiles/custom.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -23,9 +20,9 @@
 from ....._base_client import make_request_options
 from .....types.zero_trust.dlp.profiles import custom_create_params, custom_update_params
 from .....types.zero_trust.dlp.context_awareness_param import ContextAwarenessParam
-from .....types.zero_trust.dlp.profiles.custom_profile import CustomProfile
+from .....types.zero_trust.dlp.profiles.custom_get_response import CustomGetResponse
 from .....types.zero_trust.dlp.profiles.custom_create_response import CustomCreateResponse
-from .....types.zero_trust.dlp.profiles.custom_delete_response import CustomDeleteResponse
+from .....types.zero_trust.dlp.profiles.custom_update_response import CustomUpdateResponse
 
 __all__ = ["CustomResource", "AsyncCustomResource"]
 
@@ -33,29 +30,56 @@
 class CustomResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> CustomResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CustomResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CustomResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CustomResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        profiles: Iterable[custom_create_params.Profile],
+        name: str,
+        ai_context_enabled: bool | Omit = omit,
+        allowed_match_count: int | Omit = omit,
+        confidence_threshold: Optional[str] | Omit = omit,
+        context_awareness: ContextAwarenessParam | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        entries: Iterable[custom_create_params.Entry] | Omit = omit,
+        ocr_enabled: bool | Omit = omit,
+        shared_entries: Iterable[custom_create_params.SharedEntry] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomCreateResponse]:
         """
-        Creates a set of DLP custom profiles.
+        Creates a DLP custom profile.
 
         Args:
-          account_id: Identifier
+          allowed_match_count: Related DLP policies will trigger when the match count exceeds the number set.
+
+          context_awareness: Scan the context of predefined entries to only return matches surrounded by
+              keywords.
+
+          description: The description of the profile.
+
+          shared_entries: Entries from other profiles (e.g. pre-defined Cloudflare profiles, or your
+              Microsoft Information Protection profiles).
 
           extra_headers: Send extra headers
 
@@ -67,17 +91,35 @@ def create(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._post(
-            f"/accounts/{account_id}/dlp/profiles/custom",
-            body=maybe_transform({"profiles": profiles}, custom_create_params.CustomCreateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CustomCreateResponse]]._unwrapper,
+        return cast(
+            Optional[CustomCreateResponse],
+            self._post(
+                f"/accounts/{account_id}/dlp/profiles/custom",
+                body=maybe_transform(
+                    {
+                        "name": name,
+                        "ai_context_enabled": ai_context_enabled,
+                        "allowed_match_count": allowed_match_count,
+                        "confidence_threshold": confidence_threshold,
+                        "context_awareness": context_awareness,
+                        "description": description,
+                        "entries": entries,
+                        "ocr_enabled": ocr_enabled,
+                        "shared_entries": shared_entries,
+                    },
+                    custom_create_params.CustomCreateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[CustomCreateResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[CustomCreateResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[CustomCreateResponse]], ResultWrapper[CustomCreateResponse]),
         )
 
     def update(
@@ -85,45 +127,35 @@ def update(
         profile_id: str,
         *,
         account_id: str,
-        allowed_match_count: float | NotGiven = NOT_GIVEN,
-        context_awareness: ContextAwarenessParam | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        entries: Iterable[custom_update_params.Entry] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        ocr_enabled: bool | NotGiven = NOT_GIVEN,
-        shared_entries: Iterable[custom_update_params.SharedEntry] | NotGiven = NOT_GIVEN,
+        name: str,
+        ai_context_enabled: bool | Omit = omit,
+        allowed_match_count: Optional[int] | Omit = omit,
+        confidence_threshold: Optional[str] | Omit = omit,
+        context_awareness: ContextAwarenessParam | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        entries: Optional[Iterable[custom_update_params.Entry]] | Omit = omit,
+        ocr_enabled: bool | Omit = omit,
+        shared_entries: Iterable[custom_update_params.SharedEntry] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> CustomProfile:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomUpdateResponse]:
         """
         Updates a DLP custom profile.
 
         Args:
-          account_id: Identifier
-
-          profile_id: The ID for this profile
-
-          allowed_match_count: Related DLP policies will trigger when the match count exceeds the number set.
-
           context_awareness: Scan the context of predefined entries to only return matches surrounded by
               keywords.
 
           description: The description of the profile.
 
-          entries: The custom entries for this profile. Array elements with IDs are modifying the
-              existing entry with that ID. Elements without ID will create new entries. Any
-              entry not in the list will be deleted.
-
-          name: The name of the profile.
-
-          ocr_enabled: If true, scan images via OCR to determine if any text present matches filters.
+          entries: Custom entries from this profile. If this field is omitted, entries owned by
+              this profile will not be changed.
 
-          shared_entries: Entries from other profiles (e.g. pre-defined Cloudflare profiles, or your
-              Microsoft Information Protection profiles).
+          shared_entries: Other entries, e.g. predefined or integration.
 
           extra_headers: Send extra headers
 
@@ -137,24 +169,35 @@ def update(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not profile_id:
             raise ValueError(f"Expected a non-empty value for `profile_id` but received {profile_id!r}")
-        return self._put(
-            f"/accounts/{account_id}/dlp/profiles/custom/{profile_id}",
-            body=maybe_transform(
-                {
-                    "allowed_match_count": allowed_match_count,
-                    "context_awareness": context_awareness,
-                    "description": description,
-                    "entries": entries,
-                    "name": name,
-                    "ocr_enabled": ocr_enabled,
-                    "shared_entries": shared_entries,
-                },
-                custom_update_params.CustomUpdateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+        return cast(
+            Optional[CustomUpdateResponse],
+            self._put(
+                f"/accounts/{account_id}/dlp/profiles/custom/{profile_id}",
+                body=maybe_transform(
+                    {
+                        "name": name,
+                        "ai_context_enabled": ai_context_enabled,
+                        "allowed_match_count": allowed_match_count,
+                        "confidence_threshold": confidence_threshold,
+                        "context_awareness": context_awareness,
+                        "description": description,
+                        "entries": entries,
+                        "ocr_enabled": ocr_enabled,
+                        "shared_entries": shared_entries,
+                    },
+                    custom_update_params.CustomUpdateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[CustomUpdateResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[CustomUpdateResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=CustomProfile,
         )
 
     def delete(
@@ -167,16 +210,12 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> CustomDeleteResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
         Deletes a DLP custom profile.
 
         Args:
-          account_id: Identifier
-
-          profile_id: The ID for this profile
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -189,21 +228,16 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not profile_id:
             raise ValueError(f"Expected a non-empty value for `profile_id` but received {profile_id!r}")
-        return cast(
-            CustomDeleteResponse,
-            self._delete(
-                f"/accounts/{account_id}/dlp/profiles/custom/{profile_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[CustomDeleteResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[CustomDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._delete(
+            f"/accounts/{account_id}/dlp/profiles/custom/{profile_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     def get(
@@ -216,16 +250,12 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> CustomProfile:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomGetResponse]:
         """
-        Fetches a custom DLP profile.
+        Fetches a custom DLP profile by id.
 
         Args:
-          account_id: Identifier
-
-          profile_id: The ID for this profile
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -238,45 +268,77 @@ def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not profile_id:
             raise ValueError(f"Expected a non-empty value for `profile_id` but received {profile_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/dlp/profiles/custom/{profile_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[CustomProfile]._unwrapper,
+        return cast(
+            Optional[CustomGetResponse],
+            self._get(
+                f"/accounts/{account_id}/dlp/profiles/custom/{profile_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[CustomGetResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[CustomGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[CustomProfile], ResultWrapper[CustomProfile]),
         )
 
 
 class AsyncCustomResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncCustomResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCustomResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCustomResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCustomResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        profiles: Iterable[custom_create_params.Profile],
+        name: str,
+        ai_context_enabled: bool | Omit = omit,
+        allowed_match_count: int | Omit = omit,
+        confidence_threshold: Optional[str] | Omit = omit,
+        context_awareness: ContextAwarenessParam | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        entries: Iterable[custom_create_params.Entry] | Omit = omit,
+        ocr_enabled: bool | Omit = omit,
+        shared_entries: Iterable[custom_create_params.SharedEntry] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CustomCreateResponse]:
         """
-        Creates a set of DLP custom profiles.
+        Creates a DLP custom profile.
 
         Args:
-          account_id: Identifier
+          allowed_match_count: Related DLP policies will trigger when the match count exceeds the number set.
+
+          context_awareness: Scan the context of predefined entries to only return matches surrounded by
+              keywords.
+
+          description: The description of the profile.
+
+          shared_entries: Entries from other profiles (e.g. pre-defined Cloudflare profiles, or your
+              Microsoft Information Protection profiles).
 
           extra_headers: Send extra headers
 
@@ -288,17 +350,35 @@ async def create(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._post(
-            f"/accounts/{account_id}/dlp/profiles/custom",
-            body=await async_maybe_transform({"profiles": profiles}, custom_create_params.CustomCreateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CustomCreateResponse]]._unwrapper,
+        return cast(
+            Optional[CustomCreateResponse],
+            await self._post(
+                f"/accounts/{account_id}/dlp/profiles/custom",
+                body=await async_maybe_transform(
+                    {
+                        "name": name,
+                        "ai_context_enabled": ai_context_enabled,
+                        "allowed_match_count": allowed_match_count,
+                        "confidence_threshold": confidence_threshold,
+                        "context_awareness": context_awareness,
+                        "description": description,
+                        "entries": entries,
+                        "ocr_enabled": ocr_enabled,
+                        "shared_entries": shared_entries,
+                    },
+                    custom_create_params.CustomCreateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[CustomCreateResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[CustomCreateResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[CustomCreateResponse]], ResultWrapper[CustomCreateResponse]),
         )
 
     async def update(
@@ -306,45 +386,35 @@ async def update(
         profile_id: str,
         *,
         account_id: str,
-        allowed_match_count: float | NotGiven = NOT_GIVEN,
-        context_awareness: ContextAwarenessParam | NotGiven = NOT_GIVEN,
-        description: str | NotGiven = NOT_GIVEN,
-        entries: Iterable[custom_update_params.Entry] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        ocr_enabled: bool | NotGiven = NOT_GIVEN,
-        shared_entries: Iterable[custom_update_params.SharedEntry] | NotGiven = NOT_GIVEN,
+        name: str,
+        ai_context_enabled: bool | Omit = omit,
+        allowed_match_count: Optional[int] | Omit = omit,
+        confidence_threshold: Optional[str] | Omit = omit,
+        context_awareness: ContextAwarenessParam | Omit = omit,
+        description: Optional[str] | Omit = omit,
+        entries: Optional[Iterable[custom_update_params.Entry]] | Omit = omit,
+        ocr_enabled: bool | Omit = omit,
+        shared_entries: Iterable[custom_update_params.SharedEntry] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> CustomProfile:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomUpdateResponse]:
         """
         Updates a DLP custom profile.
 
         Args:
-          account_id: Identifier
-
-          profile_id: The ID for this profile
-
-          allowed_match_count: Related DLP policies will trigger when the match count exceeds the number set.
-
           context_awareness: Scan the context of predefined entries to only return matches surrounded by
               keywords.
 
           description: The description of the profile.
 
-          entries: The custom entries for this profile. Array elements with IDs are modifying the
-              existing entry with that ID. Elements without ID will create new entries. Any
-              entry not in the list will be deleted.
-
-          name: The name of the profile.
-
-          ocr_enabled: If true, scan images via OCR to determine if any text present matches filters.
+          entries: Custom entries from this profile. If this field is omitted, entries owned by
+              this profile will not be changed.
 
-          shared_entries: Entries from other profiles (e.g. pre-defined Cloudflare profiles, or your
-              Microsoft Information Protection profiles).
+          shared_entries: Other entries, e.g. predefined or integration.
 
           extra_headers: Send extra headers
 
@@ -358,24 +428,35 @@ async def update(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not profile_id:
             raise ValueError(f"Expected a non-empty value for `profile_id` but received {profile_id!r}")
-        return await self._put(
-            f"/accounts/{account_id}/dlp/profiles/custom/{profile_id}",
-            body=await async_maybe_transform(
-                {
-                    "allowed_match_count": allowed_match_count,
-                    "context_awareness": context_awareness,
-                    "description": description,
-                    "entries": entries,
-                    "name": name,
-                    "ocr_enabled": ocr_enabled,
-                    "shared_entries": shared_entries,
-                },
-                custom_update_params.CustomUpdateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+        return cast(
+            Optional[CustomUpdateResponse],
+            await self._put(
+                f"/accounts/{account_id}/dlp/profiles/custom/{profile_id}",
+                body=await async_maybe_transform(
+                    {
+                        "name": name,
+                        "ai_context_enabled": ai_context_enabled,
+                        "allowed_match_count": allowed_match_count,
+                        "confidence_threshold": confidence_threshold,
+                        "context_awareness": context_awareness,
+                        "description": description,
+                        "entries": entries,
+                        "ocr_enabled": ocr_enabled,
+                        "shared_entries": shared_entries,
+                    },
+                    custom_update_params.CustomUpdateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[CustomUpdateResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[CustomUpdateResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=CustomProfile,
         )
 
     async def delete(
@@ -388,16 +469,12 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> CustomDeleteResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
         Deletes a DLP custom profile.
 
         Args:
-          account_id: Identifier
-
-          profile_id: The ID for this profile
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -410,21 +487,16 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not profile_id:
             raise ValueError(f"Expected a non-empty value for `profile_id` but received {profile_id!r}")
-        return cast(
-            CustomDeleteResponse,
-            await self._delete(
-                f"/accounts/{account_id}/dlp/profiles/custom/{profile_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[CustomDeleteResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[CustomDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._delete(
+            f"/accounts/{account_id}/dlp/profiles/custom/{profile_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     async def get(
@@ -437,16 +509,12 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> CustomProfile:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomGetResponse]:
         """
-        Fetches a custom DLP profile.
+        Fetches a custom DLP profile by id.
 
         Args:
-          account_id: Identifier
-
-          profile_id: The ID for this profile
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -459,16 +527,21 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not profile_id:
             raise ValueError(f"Expected a non-empty value for `profile_id` but received {profile_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/dlp/profiles/custom/{profile_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[CustomProfile]._unwrapper,
+        return cast(
+            Optional[CustomGetResponse],
+            await self._get(
+                f"/accounts/{account_id}/dlp/profiles/custom/{profile_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[CustomGetResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[CustomGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[CustomProfile], ResultWrapper[CustomProfile]),
         )
 
 
diff --git a/src/cloudflare/resources/zero_trust/dlp/profiles/predefined.py b/src/cloudflare/resources/zero_trust/dlp/profiles/predefined.py
index ff0c160ac1f..aec84a044a9 100644
--- a/src/cloudflare/resources/zero_trust/dlp/profiles/predefined.py
+++ b/src/cloudflare/resources/zero_trust/dlp/profiles/predefined.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Iterable, cast
+from typing import Type, Iterable, Optional, cast
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -22,8 +19,8 @@
 from ....._wrappers import ResultWrapper
 from ....._base_client import make_request_options
 from .....types.zero_trust.dlp.profiles import predefined_update_params
-from .....types.zero_trust.dlp.context_awareness_param import ContextAwarenessParam
-from .....types.zero_trust.dlp.profiles.predefined_profile import PredefinedProfile
+from .....types.zero_trust.dlp.profiles.predefined_get_response import PredefinedGetResponse
+from .....types.zero_trust.dlp.profiles.predefined_update_response import PredefinedUpdateResponse
 
 __all__ = ["PredefinedResource", "AsyncPredefinedResource"]
 
@@ -31,10 +28,21 @@
 class PredefinedResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PredefinedResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PredefinedResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PredefinedResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PredefinedResourceWithStreamingResponse(self)
 
     def update(
@@ -42,35 +50,26 @@ def update(
         profile_id: str,
         *,
         account_id: str,
-        allowed_match_count: float | NotGiven = NOT_GIVEN,
-        context_awareness: ContextAwarenessParam | NotGiven = NOT_GIVEN,
-        entries: Iterable[predefined_update_params.Entry] | NotGiven = NOT_GIVEN,
-        ocr_enabled: bool | NotGiven = NOT_GIVEN,
+        ai_context_enabled: bool | Omit = omit,
+        allowed_match_count: Optional[int] | Omit = omit,
+        confidence_threshold: Optional[str] | Omit = omit,
+        enabled_entries: Optional[SequenceNotStr[str]] | Omit = omit,
+        entries: Iterable[predefined_update_params.Entry] | Omit = omit,
+        ocr_enabled: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PredefinedProfile:
-        """Updates a DLP predefined profile.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PredefinedUpdateResponse]:
+        """This is similar to `update_predefined` but only returns entries that are
+        enabled.
 
+        This is needed for our terraform API Updates a DLP predefined profile.
         Only supports enabling/disabling entries.
 
         Args:
-          account_id: Identifier
-
-          profile_id: The ID for this profile
-
-          allowed_match_count: Related DLP policies will trigger when the match count exceeds the number set.
-
-          context_awareness: Scan the context of predefined entries to only return matches surrounded by
-              keywords.
-
-          entries: The entries for this profile.
-
-          ocr_enabled: If true, scan images via OCR to determine if any text present matches filters.
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -84,23 +83,29 @@ def update(
         if not profile_id:
             raise ValueError(f"Expected a non-empty value for `profile_id` but received {profile_id!r}")
         return self._put(
-            f"/accounts/{account_id}/dlp/profiles/predefined/{profile_id}",
+            f"/accounts/{account_id}/dlp/profiles/predefined/{profile_id}/config",
             body=maybe_transform(
                 {
+                    "ai_context_enabled": ai_context_enabled,
                     "allowed_match_count": allowed_match_count,
-                    "context_awareness": context_awareness,
+                    "confidence_threshold": confidence_threshold,
+                    "enabled_entries": enabled_entries,
                     "entries": entries,
                     "ocr_enabled": ocr_enabled,
                 },
                 predefined_update_params.PredefinedUpdateParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PredefinedUpdateResponse]]._unwrapper,
             ),
-            cast_to=PredefinedProfile,
+            cast_to=cast(Type[Optional[PredefinedUpdateResponse]], ResultWrapper[PredefinedUpdateResponse]),
         )
 
-    def get(
+    def delete(
         self,
         profile_id: str,
         *,
@@ -110,16 +115,54 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PredefinedProfile:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
-        Fetches a predefined DLP profile.
+        This is a no-op as predefined profiles can't be deleted but is needed for our
+        generated terraform API.
 
         Args:
-          account_id: Identifier
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not profile_id:
+            raise ValueError(f"Expected a non-empty value for `profile_id` but received {profile_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/dlp/profiles/predefined/{profile_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
 
-          profile_id: The ID for this profile
+    def get(
+        self,
+        profile_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PredefinedGetResponse]:
+        """
+        This is similar to `get_predefined` but only returns entries that are enabled.
+        This is needed for our terraform API Fetches a predefined DLP profile by id.
 
+        Args:
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -133,25 +176,36 @@ def get(
         if not profile_id:
             raise ValueError(f"Expected a non-empty value for `profile_id` but received {profile_id!r}")
         return self._get(
-            f"/accounts/{account_id}/dlp/profiles/predefined/{profile_id}",
+            f"/accounts/{account_id}/dlp/profiles/predefined/{profile_id}/config",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[PredefinedProfile]._unwrapper,
+                post_parser=ResultWrapper[Optional[PredefinedGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[PredefinedProfile], ResultWrapper[PredefinedProfile]),
+            cast_to=cast(Type[Optional[PredefinedGetResponse]], ResultWrapper[PredefinedGetResponse]),
         )
 
 
 class AsyncPredefinedResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPredefinedResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPredefinedResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPredefinedResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPredefinedResourceWithStreamingResponse(self)
 
     async def update(
@@ -159,35 +213,26 @@ async def update(
         profile_id: str,
         *,
         account_id: str,
-        allowed_match_count: float | NotGiven = NOT_GIVEN,
-        context_awareness: ContextAwarenessParam | NotGiven = NOT_GIVEN,
-        entries: Iterable[predefined_update_params.Entry] | NotGiven = NOT_GIVEN,
-        ocr_enabled: bool | NotGiven = NOT_GIVEN,
+        ai_context_enabled: bool | Omit = omit,
+        allowed_match_count: Optional[int] | Omit = omit,
+        confidence_threshold: Optional[str] | Omit = omit,
+        enabled_entries: Optional[SequenceNotStr[str]] | Omit = omit,
+        entries: Iterable[predefined_update_params.Entry] | Omit = omit,
+        ocr_enabled: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PredefinedProfile:
-        """Updates a DLP predefined profile.
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PredefinedUpdateResponse]:
+        """This is similar to `update_predefined` but only returns entries that are
+        enabled.
 
+        This is needed for our terraform API Updates a DLP predefined profile.
         Only supports enabling/disabling entries.
 
         Args:
-          account_id: Identifier
-
-          profile_id: The ID for this profile
-
-          allowed_match_count: Related DLP policies will trigger when the match count exceeds the number set.
-
-          context_awareness: Scan the context of predefined entries to only return matches surrounded by
-              keywords.
-
-          entries: The entries for this profile.
-
-          ocr_enabled: If true, scan images via OCR to determine if any text present matches filters.
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -201,23 +246,29 @@ async def update(
         if not profile_id:
             raise ValueError(f"Expected a non-empty value for `profile_id` but received {profile_id!r}")
         return await self._put(
-            f"/accounts/{account_id}/dlp/profiles/predefined/{profile_id}",
+            f"/accounts/{account_id}/dlp/profiles/predefined/{profile_id}/config",
             body=await async_maybe_transform(
                 {
+                    "ai_context_enabled": ai_context_enabled,
                     "allowed_match_count": allowed_match_count,
-                    "context_awareness": context_awareness,
+                    "confidence_threshold": confidence_threshold,
+                    "enabled_entries": enabled_entries,
                     "entries": entries,
                     "ocr_enabled": ocr_enabled,
                 },
                 predefined_update_params.PredefinedUpdateParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[PredefinedUpdateResponse]]._unwrapper,
             ),
-            cast_to=PredefinedProfile,
+            cast_to=cast(Type[Optional[PredefinedUpdateResponse]], ResultWrapper[PredefinedUpdateResponse]),
         )
 
-    async def get(
+    async def delete(
         self,
         profile_id: str,
         *,
@@ -227,16 +278,54 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> PredefinedProfile:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
-        Fetches a predefined DLP profile.
+        This is a no-op as predefined profiles can't be deleted but is needed for our
+        generated terraform API.
 
         Args:
-          account_id: Identifier
+          extra_headers: Send extra headers
 
-          profile_id: The ID for this profile
+          extra_query: Add additional query parameters to the request
 
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not profile_id:
+            raise ValueError(f"Expected a non-empty value for `profile_id` but received {profile_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/dlp/profiles/predefined/{profile_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    async def get(
+        self,
+        profile_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[PredefinedGetResponse]:
+        """
+        This is similar to `get_predefined` but only returns entries that are enabled.
+        This is needed for our terraform API Fetches a predefined DLP profile by id.
+
+        Args:
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -250,15 +339,15 @@ async def get(
         if not profile_id:
             raise ValueError(f"Expected a non-empty value for `profile_id` but received {profile_id!r}")
         return await self._get(
-            f"/accounts/{account_id}/dlp/profiles/predefined/{profile_id}",
+            f"/accounts/{account_id}/dlp/profiles/predefined/{profile_id}/config",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[PredefinedProfile]._unwrapper,
+                post_parser=ResultWrapper[Optional[PredefinedGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[PredefinedProfile], ResultWrapper[PredefinedProfile]),
+            cast_to=cast(Type[Optional[PredefinedGetResponse]], ResultWrapper[PredefinedGetResponse]),
         )
 
 
@@ -269,6 +358,9 @@ def __init__(self, predefined: PredefinedResource) -> None:
         self.update = to_raw_response_wrapper(
             predefined.update,
         )
+        self.delete = to_raw_response_wrapper(
+            predefined.delete,
+        )
         self.get = to_raw_response_wrapper(
             predefined.get,
         )
@@ -281,6 +373,9 @@ def __init__(self, predefined: AsyncPredefinedResource) -> None:
         self.update = async_to_raw_response_wrapper(
             predefined.update,
         )
+        self.delete = async_to_raw_response_wrapper(
+            predefined.delete,
+        )
         self.get = async_to_raw_response_wrapper(
             predefined.get,
         )
@@ -293,6 +388,9 @@ def __init__(self, predefined: PredefinedResource) -> None:
         self.update = to_streamed_response_wrapper(
             predefined.update,
         )
+        self.delete = to_streamed_response_wrapper(
+            predefined.delete,
+        )
         self.get = to_streamed_response_wrapper(
             predefined.get,
         )
@@ -305,6 +403,9 @@ def __init__(self, predefined: AsyncPredefinedResource) -> None:
         self.update = async_to_streamed_response_wrapper(
             predefined.update,
         )
+        self.delete = async_to_streamed_response_wrapper(
+            predefined.delete,
+        )
         self.get = async_to_streamed_response_wrapper(
             predefined.get,
         )
diff --git a/src/cloudflare/resources/zero_trust/dlp/profiles/profiles.py b/src/cloudflare/resources/zero_trust/dlp/profiles/profiles.py
index 5938b4c3b84..096173e5b54 100644
--- a/src/cloudflare/resources/zero_trust/dlp/profiles/profiles.py
+++ b/src/cloudflare/resources/zero_trust/dlp/profiles/profiles.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import httpx
 
@@ -14,7 +14,8 @@
     CustomResourceWithStreamingResponse,
     AsyncCustomResourceWithStreamingResponse,
 )
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform
 from .predefined import (
     PredefinedResource,
     AsyncPredefinedResource,
@@ -34,6 +35,7 @@
 from ....._wrappers import ResultWrapper
 from .....pagination import SyncSinglePage, AsyncSinglePage
 from ....._base_client import AsyncPaginator, make_request_options
+from .....types.zero_trust.dlp import profile_list_params
 from .....types.zero_trust.dlp.profile import Profile
 from .....types.zero_trust.dlp.profile_get_response import ProfileGetResponse
 
@@ -51,28 +53,41 @@ def predefined(self) -> PredefinedResource:
 
     @cached_property
     def with_raw_response(self) -> ProfilesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ProfilesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ProfilesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ProfilesResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
+        all: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Profile]:
         """
         Lists all DLP profiles in an account.
 
         Args:
-          account_id: Identifier
+          all: Return all profiles, including those that current account does not have access
+              to.
 
           extra_headers: Send extra headers
 
@@ -88,7 +103,11 @@ def list(
             f"/accounts/{account_id}/dlp/profiles",
             page=SyncSinglePage[Profile],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"all": all}, profile_list_params.ProfileListParams),
             ),
             model=cast(Any, Profile),  # Union types cannot be passed in as arguments in the type system
         )
@@ -103,17 +122,12 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ProfileGetResponse:
-        """Fetches a DLP profile by ID.
-
-        Supports both predefined and custom profiles
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ProfileGetResponse]:
+        """
+        Fetches a DLP profile by ID.
 
         Args:
-          account_id: Identifier
-
-          profile_id: The ID for this profile
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -127,7 +141,7 @@ def get(
         if not profile_id:
             raise ValueError(f"Expected a non-empty value for `profile_id` but received {profile_id!r}")
         return cast(
-            ProfileGetResponse,
+            Optional[ProfileGetResponse],
             self._get(
                 f"/accounts/{account_id}/dlp/profiles/{profile_id}",
                 options=make_request_options(
@@ -135,7 +149,7 @@ def get(
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[ProfileGetResponse]._unwrapper,
+                    post_parser=ResultWrapper[Optional[ProfileGetResponse]]._unwrapper,
                 ),
                 cast_to=cast(
                     Any, ResultWrapper[ProfileGetResponse]
@@ -155,28 +169,41 @@ def predefined(self) -> AsyncPredefinedResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncProfilesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncProfilesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncProfilesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncProfilesResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
+        all: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Profile, AsyncSinglePage[Profile]]:
         """
         Lists all DLP profiles in an account.
 
         Args:
-          account_id: Identifier
+          all: Return all profiles, including those that current account does not have access
+              to.
 
           extra_headers: Send extra headers
 
@@ -192,7 +219,11 @@ def list(
             f"/accounts/{account_id}/dlp/profiles",
             page=AsyncSinglePage[Profile],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"all": all}, profile_list_params.ProfileListParams),
             ),
             model=cast(Any, Profile),  # Union types cannot be passed in as arguments in the type system
         )
@@ -207,17 +238,12 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ProfileGetResponse:
-        """Fetches a DLP profile by ID.
-
-        Supports both predefined and custom profiles
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ProfileGetResponse]:
+        """
+        Fetches a DLP profile by ID.
 
         Args:
-          account_id: Identifier
-
-          profile_id: The ID for this profile
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -231,7 +257,7 @@ async def get(
         if not profile_id:
             raise ValueError(f"Expected a non-empty value for `profile_id` but received {profile_id!r}")
         return cast(
-            ProfileGetResponse,
+            Optional[ProfileGetResponse],
             await self._get(
                 f"/accounts/{account_id}/dlp/profiles/{profile_id}",
                 options=make_request_options(
@@ -239,7 +265,7 @@ async def get(
                     extra_query=extra_query,
                     extra_body=extra_body,
                     timeout=timeout,
-                    post_parser=ResultWrapper[ProfileGetResponse]._unwrapper,
+                    post_parser=ResultWrapper[Optional[ProfileGetResponse]]._unwrapper,
                 ),
                 cast_to=cast(
                     Any, ResultWrapper[ProfileGetResponse]
diff --git a/src/cloudflare/resources/zero_trust/gateway/app_types.py b/src/cloudflare/resources/zero_trust/gateway/app_types.py
index bb06a6f6f3a..231d4edb066 100644
--- a/src/cloudflare/resources/zero_trust/gateway/app_types.py
+++ b/src/cloudflare/resources/zero_trust/gateway/app_types.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -25,10 +25,21 @@
 class AppTypesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AppTypesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AppTypesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AppTypesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AppTypesResourceWithStreamingResponse(self)
 
     def list(
@@ -40,13 +51,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[AppType]:
         """
-        Fetches all application and application type mappings.
+        List all application and application type mappings.
 
         Args:
-          account_id: Identifier
+          account_id: Provide the identifier string.
 
           extra_headers: Send extra headers
 
@@ -71,10 +82,21 @@ def list(
 class AsyncAppTypesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncAppTypesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAppTypesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAppTypesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAppTypesResourceWithStreamingResponse(self)
 
     def list(
@@ -86,13 +108,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[AppType, AsyncSinglePage[AppType]]:
         """
-        Fetches all application and application type mappings.
+        List all application and application type mappings.
 
         Args:
-          account_id: Identifier
+          account_id: Provide the identifier string.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/zero_trust/gateway/audit_ssh_settings.py b/src/cloudflare/resources/zero_trust/gateway/audit_ssh_settings.py
index 44a542f7521..9a726288e7c 100644
--- a/src/cloudflare/resources/zero_trust/gateway/audit_ssh_settings.py
+++ b/src/cloudflare/resources/zero_trust/gateway/audit_ssh_settings.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -30,10 +27,21 @@
 class AuditSSHSettingsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AuditSSHSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AuditSSHSettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AuditSSHSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AuditSSHSettingsResourceWithStreamingResponse(self)
 
     def update(
@@ -41,21 +49,20 @@ def update(
         *,
         account_id: str,
         public_key: str,
-        seed_id: str | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewaySettings]:
         """
-        Updates Zero Trust Audit SSH settings.
+        Update Zero Trust Audit SSH and SSH with Access for Infrastructure settings for
+        an account.
 
         Args:
-          public_key: SSH encryption public key
-
-          seed_id: Seed ID
+          public_key: Provide the Base64-encoded HPKE public key that encrypts SSH session logs. See
+              https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/use-cases/ssh/ssh-infrastructure-access/#enable-ssh-command-logging.
 
           extra_headers: Send extra headers
 
@@ -70,11 +77,7 @@ def update(
         return self._put(
             f"/accounts/{account_id}/gateway/audit_ssh_settings",
             body=maybe_transform(
-                {
-                    "public_key": public_key,
-                    "seed_id": seed_id,
-                },
-                audit_ssh_setting_update_params.AuditSSHSettingUpdateParams,
+                {"public_key": public_key}, audit_ssh_setting_update_params.AuditSSHSettingUpdateParams
             ),
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -95,10 +98,11 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewaySettings]:
         """
-        Get all Zero Trust Audit SSH settings for an account.
+        Retrieve all Zero Trust Audit SSH and SSH with Access for Infrastructure
+        settings for an account.
 
         Args:
           extra_headers: Send extra headers
@@ -123,14 +127,63 @@ def get(
             cast_to=cast(Type[Optional[GatewaySettings]], ResultWrapper[GatewaySettings]),
         )
 
+    def rotate_seed(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[GatewaySettings]:
+        """
+        Rotate the SSH account seed that generates the host key identity when connecting
+        through the Cloudflare SSH Proxy.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/gateway/audit_ssh_settings/rotate_seed",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[GatewaySettings]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[GatewaySettings]], ResultWrapper[GatewaySettings]),
+        )
+
 
 class AsyncAuditSSHSettingsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncAuditSSHSettingsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncAuditSSHSettingsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncAuditSSHSettingsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncAuditSSHSettingsResourceWithStreamingResponse(self)
 
     async def update(
@@ -138,21 +191,20 @@ async def update(
         *,
         account_id: str,
         public_key: str,
-        seed_id: str | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewaySettings]:
         """
-        Updates Zero Trust Audit SSH settings.
+        Update Zero Trust Audit SSH and SSH with Access for Infrastructure settings for
+        an account.
 
         Args:
-          public_key: SSH encryption public key
-
-          seed_id: Seed ID
+          public_key: Provide the Base64-encoded HPKE public key that encrypts SSH session logs. See
+              https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/use-cases/ssh/ssh-infrastructure-access/#enable-ssh-command-logging.
 
           extra_headers: Send extra headers
 
@@ -167,11 +219,7 @@ async def update(
         return await self._put(
             f"/accounts/{account_id}/gateway/audit_ssh_settings",
             body=await async_maybe_transform(
-                {
-                    "public_key": public_key,
-                    "seed_id": seed_id,
-                },
-                audit_ssh_setting_update_params.AuditSSHSettingUpdateParams,
+                {"public_key": public_key}, audit_ssh_setting_update_params.AuditSSHSettingUpdateParams
             ),
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -192,10 +240,11 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewaySettings]:
         """
-        Get all Zero Trust Audit SSH settings for an account.
+        Retrieve all Zero Trust Audit SSH and SSH with Access for Infrastructure
+        settings for an account.
 
         Args:
           extra_headers: Send extra headers
@@ -220,6 +269,44 @@ async def get(
             cast_to=cast(Type[Optional[GatewaySettings]], ResultWrapper[GatewaySettings]),
         )
 
+    async def rotate_seed(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[GatewaySettings]:
+        """
+        Rotate the SSH account seed that generates the host key identity when connecting
+        through the Cloudflare SSH Proxy.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/gateway/audit_ssh_settings/rotate_seed",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[GatewaySettings]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[GatewaySettings]], ResultWrapper[GatewaySettings]),
+        )
+
 
 class AuditSSHSettingsResourceWithRawResponse:
     def __init__(self, audit_ssh_settings: AuditSSHSettingsResource) -> None:
@@ -231,6 +318,9 @@ def __init__(self, audit_ssh_settings: AuditSSHSettingsResource) -> None:
         self.get = to_raw_response_wrapper(
             audit_ssh_settings.get,
         )
+        self.rotate_seed = to_raw_response_wrapper(
+            audit_ssh_settings.rotate_seed,
+        )
 
 
 class AsyncAuditSSHSettingsResourceWithRawResponse:
@@ -243,6 +333,9 @@ def __init__(self, audit_ssh_settings: AsyncAuditSSHSettingsResource) -> None:
         self.get = async_to_raw_response_wrapper(
             audit_ssh_settings.get,
         )
+        self.rotate_seed = async_to_raw_response_wrapper(
+            audit_ssh_settings.rotate_seed,
+        )
 
 
 class AuditSSHSettingsResourceWithStreamingResponse:
@@ -255,6 +348,9 @@ def __init__(self, audit_ssh_settings: AuditSSHSettingsResource) -> None:
         self.get = to_streamed_response_wrapper(
             audit_ssh_settings.get,
         )
+        self.rotate_seed = to_streamed_response_wrapper(
+            audit_ssh_settings.rotate_seed,
+        )
 
 
 class AsyncAuditSSHSettingsResourceWithStreamingResponse:
@@ -267,3 +363,6 @@ def __init__(self, audit_ssh_settings: AsyncAuditSSHSettingsResource) -> None:
         self.get = async_to_streamed_response_wrapper(
             audit_ssh_settings.get,
         )
+        self.rotate_seed = async_to_streamed_response_wrapper(
+            audit_ssh_settings.rotate_seed,
+        )
diff --git a/src/cloudflare/resources/zero_trust/gateway/categories.py b/src/cloudflare/resources/zero_trust/gateway/categories.py
index 9b8f47fdcb0..4915deb1f2f 100644
--- a/src/cloudflare/resources/zero_trust/gateway/categories.py
+++ b/src/cloudflare/resources/zero_trust/gateway/categories.py
@@ -4,7 +4,7 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -23,10 +23,21 @@
 class CategoriesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> CategoriesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CategoriesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CategoriesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CategoriesResourceWithStreamingResponse(self)
 
     def list(
@@ -38,13 +49,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Category]:
         """
-        Fetches a list of all categories.
+        List all categories.
 
         Args:
-          account_id: Identifier
+          account_id: Provide the identifier string.
 
           extra_headers: Send extra headers
 
@@ -69,10 +80,21 @@ def list(
 class AsyncCategoriesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncCategoriesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCategoriesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCategoriesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCategoriesResourceWithStreamingResponse(self)
 
     def list(
@@ -84,13 +106,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Category, AsyncSinglePage[Category]]:
         """
-        Fetches a list of all categories.
+        List all categories.
 
         Args:
-          account_id: Identifier
+          account_id: Provide the identifier string.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/zero_trust/gateway/certificates.py b/src/cloudflare/resources/zero_trust/gateway/certificates.py
index 311cf14b57c..e89207aa93d 100644
--- a/src/cloudflare/resources/zero_trust/gateway/certificates.py
+++ b/src/cloudflare/resources/zero_trust/gateway/certificates.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -22,11 +19,17 @@
 from ...._wrappers import ResultWrapper
 from ....pagination import SyncSinglePage, AsyncSinglePage
 from ...._base_client import AsyncPaginator, make_request_options
-from ....types.zero_trust.gateway import certificate_create_params
+from ....types.zero_trust.gateway import (
+    certificate_create_params,
+    certificate_activate_params,
+    certificate_deactivate_params,
+)
 from ....types.zero_trust.gateway.certificate_get_response import CertificateGetResponse
 from ....types.zero_trust.gateway.certificate_list_response import CertificateListResponse
 from ....types.zero_trust.gateway.certificate_create_response import CertificateCreateResponse
 from ....types.zero_trust.gateway.certificate_delete_response import CertificateDeleteResponse
+from ....types.zero_trust.gateway.certificate_activate_response import CertificateActivateResponse
+from ....types.zero_trust.gateway.certificate_deactivate_response import CertificateDeactivateResponse
 
 __all__ = ["CertificatesResource", "AsyncCertificatesResource"]
 
@@ -34,30 +37,43 @@
 class CertificatesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> CertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CertificatesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CertificatesResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         account_id: str,
-        validity_period_days: int | NotGiven = NOT_GIVEN,
+        validity_period_days: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CertificateCreateResponse]:
         """
-        Creates a new Zero Trust certificate.
+        Create a new Zero Trust certificate.
 
         Args:
-          validity_period_days: Number of days the generated certificate will be valid, minimum 1 day and
-              maximum 30 years. Defaults to 5 years.
+          validity_period_days: Sets the certificate validity period in days (range: 1-10,950 days / ~30 years).
+              Defaults to 1,825 days (5 years). **Important**: This field is only settable
+              during the certificate creation. Certificates becomes immutable after creation -
+              use the `/activate` and `/deactivate` endpoints to manage certificate lifecycle.
 
           extra_headers: Send extra headers
 
@@ -93,10 +109,10 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[CertificateListResponse]:
         """
-        Fetches all Zero Trust certificates for an account.
+        List all Zero Trust certificates for an account.
 
         Args:
           extra_headers: Send extra headers
@@ -128,13 +144,15 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CertificateDeleteResponse]:
-        """
-        Deletes a gateway-managed Zero Trust certificate.
+        """Delete a gateway-managed Zero Trust certificate.
+
+        You must deactivate the
+        certificate from the edge (inactive) before deleting it.
 
         Args:
-          certificate_id: Certificate UUID tag.
+          certificate_id: Identify the certificate with a UUID.
 
           extra_headers: Send extra headers
 
@@ -160,6 +178,94 @@ def delete(
             cast_to=cast(Type[Optional[CertificateDeleteResponse]], ResultWrapper[CertificateDeleteResponse]),
         )
 
+    def activate(
+        self,
+        certificate_id: str,
+        *,
+        account_id: str,
+        body: object,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CertificateActivateResponse]:
+        """
+        Bind a single Zero Trust certificate to the edge.
+
+        Args:
+          certificate_id: Identify the certificate with a UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not certificate_id:
+            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/gateway/certificates/{certificate_id}/activate",
+            body=maybe_transform(body, certificate_activate_params.CertificateActivateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CertificateActivateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CertificateActivateResponse]], ResultWrapper[CertificateActivateResponse]),
+        )
+
+    def deactivate(
+        self,
+        certificate_id: str,
+        *,
+        account_id: str,
+        body: object,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CertificateDeactivateResponse]:
+        """
+        Unbind a single Zero Trust certificate from the edge.
+
+        Args:
+          certificate_id: Identify the certificate with a UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not certificate_id:
+            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/gateway/certificates/{certificate_id}/deactivate",
+            body=maybe_transform(body, certificate_deactivate_params.CertificateDeactivateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CertificateDeactivateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CertificateDeactivateResponse]], ResultWrapper[CertificateDeactivateResponse]),
+        )
+
     def get(
         self,
         certificate_id: str,
@@ -170,13 +276,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CertificateGetResponse]:
         """
-        Fetches a single Zero Trust certificate.
+        Get a single Zero Trust certificate.
 
         Args:
-          certificate_id: Certificate UUID tag.
+          certificate_id: Identify the certificate with a UUID.
 
           extra_headers: Send extra headers
 
@@ -206,30 +312,43 @@ def get(
 class AsyncCertificatesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncCertificatesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCertificatesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCertificatesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCertificatesResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         account_id: str,
-        validity_period_days: int | NotGiven = NOT_GIVEN,
+        validity_period_days: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CertificateCreateResponse]:
         """
-        Creates a new Zero Trust certificate.
+        Create a new Zero Trust certificate.
 
         Args:
-          validity_period_days: Number of days the generated certificate will be valid, minimum 1 day and
-              maximum 30 years. Defaults to 5 years.
+          validity_period_days: Sets the certificate validity period in days (range: 1-10,950 days / ~30 years).
+              Defaults to 1,825 days (5 years). **Important**: This field is only settable
+              during the certificate creation. Certificates becomes immutable after creation -
+              use the `/activate` and `/deactivate` endpoints to manage certificate lifecycle.
 
           extra_headers: Send extra headers
 
@@ -265,10 +384,10 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[CertificateListResponse, AsyncSinglePage[CertificateListResponse]]:
         """
-        Fetches all Zero Trust certificates for an account.
+        List all Zero Trust certificates for an account.
 
         Args:
           extra_headers: Send extra headers
@@ -300,13 +419,15 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CertificateDeleteResponse]:
-        """
-        Deletes a gateway-managed Zero Trust certificate.
+        """Delete a gateway-managed Zero Trust certificate.
+
+        You must deactivate the
+        certificate from the edge (inactive) before deleting it.
 
         Args:
-          certificate_id: Certificate UUID tag.
+          certificate_id: Identify the certificate with a UUID.
 
           extra_headers: Send extra headers
 
@@ -332,6 +453,94 @@ async def delete(
             cast_to=cast(Type[Optional[CertificateDeleteResponse]], ResultWrapper[CertificateDeleteResponse]),
         )
 
+    async def activate(
+        self,
+        certificate_id: str,
+        *,
+        account_id: str,
+        body: object,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CertificateActivateResponse]:
+        """
+        Bind a single Zero Trust certificate to the edge.
+
+        Args:
+          certificate_id: Identify the certificate with a UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not certificate_id:
+            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/gateway/certificates/{certificate_id}/activate",
+            body=await async_maybe_transform(body, certificate_activate_params.CertificateActivateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CertificateActivateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CertificateActivateResponse]], ResultWrapper[CertificateActivateResponse]),
+        )
+
+    async def deactivate(
+        self,
+        certificate_id: str,
+        *,
+        account_id: str,
+        body: object,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CertificateDeactivateResponse]:
+        """
+        Unbind a single Zero Trust certificate from the edge.
+
+        Args:
+          certificate_id: Identify the certificate with a UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not certificate_id:
+            raise ValueError(f"Expected a non-empty value for `certificate_id` but received {certificate_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/gateway/certificates/{certificate_id}/deactivate",
+            body=await async_maybe_transform(body, certificate_deactivate_params.CertificateDeactivateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[CertificateDeactivateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[CertificateDeactivateResponse]], ResultWrapper[CertificateDeactivateResponse]),
+        )
+
     async def get(
         self,
         certificate_id: str,
@@ -342,13 +551,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[CertificateGetResponse]:
         """
-        Fetches a single Zero Trust certificate.
+        Get a single Zero Trust certificate.
 
         Args:
-          certificate_id: Certificate UUID tag.
+          certificate_id: Identify the certificate with a UUID.
 
           extra_headers: Send extra headers
 
@@ -388,6 +597,12 @@ def __init__(self, certificates: CertificatesResource) -> None:
         self.delete = to_raw_response_wrapper(
             certificates.delete,
         )
+        self.activate = to_raw_response_wrapper(
+            certificates.activate,
+        )
+        self.deactivate = to_raw_response_wrapper(
+            certificates.deactivate,
+        )
         self.get = to_raw_response_wrapper(
             certificates.get,
         )
@@ -406,6 +621,12 @@ def __init__(self, certificates: AsyncCertificatesResource) -> None:
         self.delete = async_to_raw_response_wrapper(
             certificates.delete,
         )
+        self.activate = async_to_raw_response_wrapper(
+            certificates.activate,
+        )
+        self.deactivate = async_to_raw_response_wrapper(
+            certificates.deactivate,
+        )
         self.get = async_to_raw_response_wrapper(
             certificates.get,
         )
@@ -424,6 +645,12 @@ def __init__(self, certificates: CertificatesResource) -> None:
         self.delete = to_streamed_response_wrapper(
             certificates.delete,
         )
+        self.activate = to_streamed_response_wrapper(
+            certificates.activate,
+        )
+        self.deactivate = to_streamed_response_wrapper(
+            certificates.deactivate,
+        )
         self.get = to_streamed_response_wrapper(
             certificates.get,
         )
@@ -442,6 +669,12 @@ def __init__(self, certificates: AsyncCertificatesResource) -> None:
         self.delete = async_to_streamed_response_wrapper(
             certificates.delete,
         )
+        self.activate = async_to_streamed_response_wrapper(
+            certificates.activate,
+        )
+        self.deactivate = async_to_streamed_response_wrapper(
+            certificates.deactivate,
+        )
         self.get = async_to_streamed_response_wrapper(
             certificates.get,
         )
diff --git a/src/cloudflare/resources/zero_trust/gateway/configurations.py b/src/cloudflare/resources/zero_trust/gateway/configurations.py
deleted file mode 100644
index e2cff7738c0..00000000000
--- a/src/cloudflare/resources/zero_trust/gateway/configurations.py
+++ /dev/null
@@ -1,363 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Optional, cast
-
-import httpx
-
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
-from ....types.zero_trust.gateway import (
-    configuration_edit_params,
-    configuration_update_params,
-)
-from ....types.zero_trust.gateway.configuration_get_response import ConfigurationGetResponse
-from ....types.zero_trust.gateway.configuration_edit_response import ConfigurationEditResponse
-from ....types.zero_trust.gateway.configuration_update_response import ConfigurationUpdateResponse
-from ....types.zero_trust.gateway.gateway_configuration_settings_param import GatewayConfigurationSettingsParam
-
-__all__ = ["ConfigurationsResource", "AsyncConfigurationsResource"]
-
-
-class ConfigurationsResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> ConfigurationsResourceWithRawResponse:
-        return ConfigurationsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> ConfigurationsResourceWithStreamingResponse:
-        return ConfigurationsResourceWithStreamingResponse(self)
-
-    def update(
-        self,
-        *,
-        account_id: str,
-        settings: GatewayConfigurationSettingsParam | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ConfigurationUpdateResponse]:
-        """
-        Updates the current Zero Trust account configuration.
-
-        Args:
-          settings: account settings.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._put(
-            f"/accounts/{account_id}/gateway/configuration",
-            body=maybe_transform({"settings": settings}, configuration_update_params.ConfigurationUpdateParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ConfigurationUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ConfigurationUpdateResponse]], ResultWrapper[ConfigurationUpdateResponse]),
-        )
-
-    def edit(
-        self,
-        *,
-        account_id: str,
-        settings: GatewayConfigurationSettingsParam | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ConfigurationEditResponse]:
-        """Patches the current Zero Trust account configuration.
-
-        This endpoint can update a
-        single subcollection of settings such as `antivirus`, `tls_decrypt`,
-        `activity_log`, `block_page`, `browser_isolation`, `fips`, `body_scanning`, or
-        `certificate`, without updating the entire configuration object. Returns an
-        error if any collection of settings is not properly configured.
-
-        Args:
-          settings: account settings.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._patch(
-            f"/accounts/{account_id}/gateway/configuration",
-            body=maybe_transform({"settings": settings}, configuration_edit_params.ConfigurationEditParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ConfigurationEditResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ConfigurationEditResponse]], ResultWrapper[ConfigurationEditResponse]),
-        )
-
-    def get(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ConfigurationGetResponse]:
-        """
-        Fetches the current Zero Trust account configuration.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/gateway/configuration",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ConfigurationGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ConfigurationGetResponse]], ResultWrapper[ConfigurationGetResponse]),
-        )
-
-
-class AsyncConfigurationsResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncConfigurationsResourceWithRawResponse:
-        return AsyncConfigurationsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncConfigurationsResourceWithStreamingResponse:
-        return AsyncConfigurationsResourceWithStreamingResponse(self)
-
-    async def update(
-        self,
-        *,
-        account_id: str,
-        settings: GatewayConfigurationSettingsParam | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ConfigurationUpdateResponse]:
-        """
-        Updates the current Zero Trust account configuration.
-
-        Args:
-          settings: account settings.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._put(
-            f"/accounts/{account_id}/gateway/configuration",
-            body=await async_maybe_transform(
-                {"settings": settings}, configuration_update_params.ConfigurationUpdateParams
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ConfigurationUpdateResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ConfigurationUpdateResponse]], ResultWrapper[ConfigurationUpdateResponse]),
-        )
-
-    async def edit(
-        self,
-        *,
-        account_id: str,
-        settings: GatewayConfigurationSettingsParam | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ConfigurationEditResponse]:
-        """Patches the current Zero Trust account configuration.
-
-        This endpoint can update a
-        single subcollection of settings such as `antivirus`, `tls_decrypt`,
-        `activity_log`, `block_page`, `browser_isolation`, `fips`, `body_scanning`, or
-        `certificate`, without updating the entire configuration object. Returns an
-        error if any collection of settings is not properly configured.
-
-        Args:
-          settings: account settings.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._patch(
-            f"/accounts/{account_id}/gateway/configuration",
-            body=await async_maybe_transform({"settings": settings}, configuration_edit_params.ConfigurationEditParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ConfigurationEditResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ConfigurationEditResponse]], ResultWrapper[ConfigurationEditResponse]),
-        )
-
-    async def get(
-        self,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ConfigurationGetResponse]:
-        """
-        Fetches the current Zero Trust account configuration.
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/gateway/configuration",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ConfigurationGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ConfigurationGetResponse]], ResultWrapper[ConfigurationGetResponse]),
-        )
-
-
-class ConfigurationsResourceWithRawResponse:
-    def __init__(self, configurations: ConfigurationsResource) -> None:
-        self._configurations = configurations
-
-        self.update = to_raw_response_wrapper(
-            configurations.update,
-        )
-        self.edit = to_raw_response_wrapper(
-            configurations.edit,
-        )
-        self.get = to_raw_response_wrapper(
-            configurations.get,
-        )
-
-
-class AsyncConfigurationsResourceWithRawResponse:
-    def __init__(self, configurations: AsyncConfigurationsResource) -> None:
-        self._configurations = configurations
-
-        self.update = async_to_raw_response_wrapper(
-            configurations.update,
-        )
-        self.edit = async_to_raw_response_wrapper(
-            configurations.edit,
-        )
-        self.get = async_to_raw_response_wrapper(
-            configurations.get,
-        )
-
-
-class ConfigurationsResourceWithStreamingResponse:
-    def __init__(self, configurations: ConfigurationsResource) -> None:
-        self._configurations = configurations
-
-        self.update = to_streamed_response_wrapper(
-            configurations.update,
-        )
-        self.edit = to_streamed_response_wrapper(
-            configurations.edit,
-        )
-        self.get = to_streamed_response_wrapper(
-            configurations.get,
-        )
-
-
-class AsyncConfigurationsResourceWithStreamingResponse:
-    def __init__(self, configurations: AsyncConfigurationsResource) -> None:
-        self._configurations = configurations
-
-        self.update = async_to_streamed_response_wrapper(
-            configurations.update,
-        )
-        self.edit = async_to_streamed_response_wrapper(
-            configurations.edit,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            configurations.get,
-        )
diff --git a/src/cloudflare/resources/zero_trust/gateway/configurations/__init__.py b/src/cloudflare/resources/zero_trust/gateway/configurations/__init__.py
new file mode 100755
index 00000000000..7fce5672e5b
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/gateway/configurations/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .configurations import (
+    ConfigurationsResource,
+    AsyncConfigurationsResource,
+    ConfigurationsResourceWithRawResponse,
+    AsyncConfigurationsResourceWithRawResponse,
+    ConfigurationsResourceWithStreamingResponse,
+    AsyncConfigurationsResourceWithStreamingResponse,
+)
+from .custom_certificate import (
+    CustomCertificateResource,
+    AsyncCustomCertificateResource,
+    CustomCertificateResourceWithRawResponse,
+    AsyncCustomCertificateResourceWithRawResponse,
+    CustomCertificateResourceWithStreamingResponse,
+    AsyncCustomCertificateResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "CustomCertificateResource",
+    "AsyncCustomCertificateResource",
+    "CustomCertificateResourceWithRawResponse",
+    "AsyncCustomCertificateResourceWithRawResponse",
+    "CustomCertificateResourceWithStreamingResponse",
+    "AsyncCustomCertificateResourceWithStreamingResponse",
+    "ConfigurationsResource",
+    "AsyncConfigurationsResource",
+    "ConfigurationsResourceWithRawResponse",
+    "AsyncConfigurationsResourceWithRawResponse",
+    "ConfigurationsResourceWithStreamingResponse",
+    "AsyncConfigurationsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/gateway/configurations/configurations.py b/src/cloudflare/resources/zero_trust/gateway/configurations/configurations.py
new file mode 100755
index 00000000000..1a19913db64
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/gateway/configurations/configurations.py
@@ -0,0 +1,412 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .custom_certificate import (
+    CustomCertificateResource,
+    AsyncCustomCertificateResource,
+    CustomCertificateResourceWithRawResponse,
+    AsyncCustomCertificateResourceWithRawResponse,
+    CustomCertificateResourceWithStreamingResponse,
+    AsyncCustomCertificateResourceWithStreamingResponse,
+)
+from .....types.zero_trust.gateway import (
+    configuration_edit_params,
+    configuration_update_params,
+)
+from .....types.zero_trust.gateway.configuration_get_response import ConfigurationGetResponse
+from .....types.zero_trust.gateway.configuration_edit_response import ConfigurationEditResponse
+from .....types.zero_trust.gateway.configuration_update_response import ConfigurationUpdateResponse
+from .....types.zero_trust.gateway.gateway_configuration_settings_param import GatewayConfigurationSettingsParam
+
+__all__ = ["ConfigurationsResource", "AsyncConfigurationsResource"]
+
+
+class ConfigurationsResource(SyncAPIResource):
+    @cached_property
+    def custom_certificate(self) -> CustomCertificateResource:
+        return CustomCertificateResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> ConfigurationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ConfigurationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ConfigurationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ConfigurationsResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        *,
+        account_id: str,
+        settings: GatewayConfigurationSettingsParam | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConfigurationUpdateResponse]:
+        """
+        Update the current Zero Trust account configuration.
+
+        Args:
+          settings: Specify account settings.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/gateway/configuration",
+            body=maybe_transform({"settings": settings}, configuration_update_params.ConfigurationUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ConfigurationUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ConfigurationUpdateResponse]], ResultWrapper[ConfigurationUpdateResponse]),
+        )
+
+    def edit(
+        self,
+        *,
+        account_id: str,
+        settings: GatewayConfigurationSettingsParam | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConfigurationEditResponse]:
+        """
+        Update (PATCH) a single subcollection of settings such as `antivirus`,
+        `tls_decrypt`, `activity_log`, `block_page`, `browser_isolation`, `fips`,
+        `body_scanning`, or `certificate` without updating the entire configuration
+        object. This endpoint returns an error if any settings collection lacks proper
+        configuration.
+
+        Args:
+          settings: Specify account settings.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/gateway/configuration",
+            body=maybe_transform({"settings": settings}, configuration_edit_params.ConfigurationEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ConfigurationEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ConfigurationEditResponse]], ResultWrapper[ConfigurationEditResponse]),
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConfigurationGetResponse]:
+        """
+        Retrieve the current Zero Trust account configuration.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/gateway/configuration",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ConfigurationGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ConfigurationGetResponse]], ResultWrapper[ConfigurationGetResponse]),
+        )
+
+
+class AsyncConfigurationsResource(AsyncAPIResource):
+    @cached_property
+    def custom_certificate(self) -> AsyncCustomCertificateResource:
+        return AsyncCustomCertificateResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncConfigurationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncConfigurationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncConfigurationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncConfigurationsResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        *,
+        account_id: str,
+        settings: GatewayConfigurationSettingsParam | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConfigurationUpdateResponse]:
+        """
+        Update the current Zero Trust account configuration.
+
+        Args:
+          settings: Specify account settings.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/gateway/configuration",
+            body=await async_maybe_transform(
+                {"settings": settings}, configuration_update_params.ConfigurationUpdateParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ConfigurationUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ConfigurationUpdateResponse]], ResultWrapper[ConfigurationUpdateResponse]),
+        )
+
+    async def edit(
+        self,
+        *,
+        account_id: str,
+        settings: GatewayConfigurationSettingsParam | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConfigurationEditResponse]:
+        """
+        Update (PATCH) a single subcollection of settings such as `antivirus`,
+        `tls_decrypt`, `activity_log`, `block_page`, `browser_isolation`, `fips`,
+        `body_scanning`, or `certificate` without updating the entire configuration
+        object. This endpoint returns an error if any settings collection lacks proper
+        configuration.
+
+        Args:
+          settings: Specify account settings.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/gateway/configuration",
+            body=await async_maybe_transform({"settings": settings}, configuration_edit_params.ConfigurationEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ConfigurationEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ConfigurationEditResponse]], ResultWrapper[ConfigurationEditResponse]),
+        )
+
+    async def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConfigurationGetResponse]:
+        """
+        Retrieve the current Zero Trust account configuration.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/gateway/configuration",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ConfigurationGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ConfigurationGetResponse]], ResultWrapper[ConfigurationGetResponse]),
+        )
+
+
+class ConfigurationsResourceWithRawResponse:
+    def __init__(self, configurations: ConfigurationsResource) -> None:
+        self._configurations = configurations
+
+        self.update = to_raw_response_wrapper(
+            configurations.update,
+        )
+        self.edit = to_raw_response_wrapper(
+            configurations.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            configurations.get,
+        )
+
+    @cached_property
+    def custom_certificate(self) -> CustomCertificateResourceWithRawResponse:
+        return CustomCertificateResourceWithRawResponse(self._configurations.custom_certificate)
+
+
+class AsyncConfigurationsResourceWithRawResponse:
+    def __init__(self, configurations: AsyncConfigurationsResource) -> None:
+        self._configurations = configurations
+
+        self.update = async_to_raw_response_wrapper(
+            configurations.update,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            configurations.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            configurations.get,
+        )
+
+    @cached_property
+    def custom_certificate(self) -> AsyncCustomCertificateResourceWithRawResponse:
+        return AsyncCustomCertificateResourceWithRawResponse(self._configurations.custom_certificate)
+
+
+class ConfigurationsResourceWithStreamingResponse:
+    def __init__(self, configurations: ConfigurationsResource) -> None:
+        self._configurations = configurations
+
+        self.update = to_streamed_response_wrapper(
+            configurations.update,
+        )
+        self.edit = to_streamed_response_wrapper(
+            configurations.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            configurations.get,
+        )
+
+    @cached_property
+    def custom_certificate(self) -> CustomCertificateResourceWithStreamingResponse:
+        return CustomCertificateResourceWithStreamingResponse(self._configurations.custom_certificate)
+
+
+class AsyncConfigurationsResourceWithStreamingResponse:
+    def __init__(self, configurations: AsyncConfigurationsResource) -> None:
+        self._configurations = configurations
+
+        self.update = async_to_streamed_response_wrapper(
+            configurations.update,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            configurations.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            configurations.get,
+        )
+
+    @cached_property
+    def custom_certificate(self) -> AsyncCustomCertificateResourceWithStreamingResponse:
+        return AsyncCustomCertificateResourceWithStreamingResponse(self._configurations.custom_certificate)
diff --git a/src/cloudflare/resources/zero_trust/gateway/configurations/custom_certificate.py b/src/cloudflare/resources/zero_trust/gateway/configurations/custom_certificate.py
new file mode 100644
index 00000000000..3107ec2510b
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/gateway/configurations/custom_certificate.py
@@ -0,0 +1,176 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import typing_extensions
+from typing import Optional
+
+import httpx
+
+from ....._types import Body, Query, Headers, NotGiven, not_given
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._base_client import make_request_options
+from .....types.zero_trust.gateway.custom_certificate_settings import CustomCertificateSettings
+
+__all__ = ["CustomCertificateResource", "AsyncCustomCertificateResource"]
+
+
+class CustomCertificateResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> CustomCertificateResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CustomCertificateResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CustomCertificateResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CustomCertificateResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated("deprecated")
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomCertificateSettings]:
+        """
+        Retrieve the current Zero Trust certificate configuration.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/gateway/configuration/custom_certificate",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CustomCertificateSettings,
+        )
+
+
+class AsyncCustomCertificateResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncCustomCertificateResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCustomCertificateResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCustomCertificateResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCustomCertificateResourceWithStreamingResponse(self)
+
+    @typing_extensions.deprecated("deprecated")
+    async def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[CustomCertificateSettings]:
+        """
+        Retrieve the current Zero Trust certificate configuration.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/gateway/configuration/custom_certificate",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=CustomCertificateSettings,
+        )
+
+
+class CustomCertificateResourceWithRawResponse:
+    def __init__(self, custom_certificate: CustomCertificateResource) -> None:
+        self._custom_certificate = custom_certificate
+
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                custom_certificate.get,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncCustomCertificateResourceWithRawResponse:
+    def __init__(self, custom_certificate: AsyncCustomCertificateResource) -> None:
+        self._custom_certificate = custom_certificate
+
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                custom_certificate.get,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class CustomCertificateResourceWithStreamingResponse:
+    def __init__(self, custom_certificate: CustomCertificateResource) -> None:
+        self._custom_certificate = custom_certificate
+
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                custom_certificate.get,  # pyright: ignore[reportDeprecated],
+            )
+        )
+
+
+class AsyncCustomCertificateResourceWithStreamingResponse:
+    def __init__(self, custom_certificate: AsyncCustomCertificateResource) -> None:
+        self._custom_certificate = custom_certificate
+
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                custom_certificate.get,  # pyright: ignore[reportDeprecated],
+            )
+        )
diff --git a/src/cloudflare/resources/zero_trust/gateway/gateway.py b/src/cloudflare/resources/zero_trust/gateway/gateway.py
index b1fc5c79516..c012dda9b45 100644
--- a/src/cloudflare/resources/zero_trust/gateway/gateway.py
+++ b/src/cloudflare/resources/zero_trust/gateway/gateway.py
@@ -6,14 +6,6 @@
 
 import httpx
 
-from .lists import (
-    ListsResource,
-    AsyncListsResource,
-    ListsResourceWithRawResponse,
-    AsyncListsResourceWithRawResponse,
-    ListsResourceWithStreamingResponse,
-    AsyncListsResourceWithStreamingResponse,
-)
 from .rules import (
     RulesResource,
     AsyncRulesResource,
@@ -30,7 +22,7 @@
     LoggingResourceWithStreamingResponse,
     AsyncLoggingResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from .app_types import (
     AppTypesResource,
     AsyncAppTypesResource,
@@ -56,7 +48,14 @@
     CategoriesResourceWithStreamingResponse,
     AsyncCategoriesResourceWithStreamingResponse,
 )
-from .lists.lists import ListsResource, AsyncListsResource
+from .lists.lists import (
+    ListsResource,
+    AsyncListsResource,
+    ListsResourceWithRawResponse,
+    AsyncListsResourceWithRawResponse,
+    ListsResourceWithStreamingResponse,
+    AsyncListsResourceWithStreamingResponse,
+)
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
     to_raw_response_wrapper,
@@ -73,14 +72,6 @@
     CertificatesResourceWithStreamingResponse,
     AsyncCertificatesResourceWithStreamingResponse,
 )
-from .configurations import (
-    ConfigurationsResource,
-    AsyncConfigurationsResource,
-    ConfigurationsResourceWithRawResponse,
-    AsyncConfigurationsResourceWithRawResponse,
-    ConfigurationsResourceWithStreamingResponse,
-    AsyncConfigurationsResourceWithStreamingResponse,
-)
 from ...._base_client import make_request_options
 from .proxy_endpoints import (
     ProxyEndpointsResource,
@@ -98,6 +89,14 @@
     AuditSSHSettingsResourceWithStreamingResponse,
     AsyncAuditSSHSettingsResourceWithStreamingResponse,
 )
+from .configurations.configurations import (
+    ConfigurationsResource,
+    AsyncConfigurationsResource,
+    ConfigurationsResourceWithRawResponse,
+    AsyncConfigurationsResourceWithRawResponse,
+    ConfigurationsResourceWithStreamingResponse,
+    AsyncConfigurationsResourceWithStreamingResponse,
+)
 from ....types.zero_trust.gateway_list_response import GatewayListResponse
 from ....types.zero_trust.gateway_create_response import GatewayCreateResponse
 
@@ -147,10 +146,21 @@ def certificates(self) -> CertificatesResource:
 
     @cached_property
     def with_raw_response(self) -> GatewayResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return GatewayResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> GatewayResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return GatewayResourceWithStreamingResponse(self)
 
     def create(
@@ -162,10 +172,10 @@ def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewayCreateResponse]:
         """
-        Creates a Zero Trust account with an existing Cloudflare account.
+        Create a Zero Trust account for an existing Cloudflare account.
 
         Args:
           extra_headers: Send extra headers
@@ -199,10 +209,10 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewayListResponse]:
         """
-        Gets information about the current Zero Trust account.
+        Retrieve information about the current Zero Trust account.
 
         Args:
           extra_headers: Send extra headers
@@ -271,10 +281,21 @@ def certificates(self) -> AsyncCertificatesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncGatewayResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncGatewayResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncGatewayResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncGatewayResourceWithStreamingResponse(self)
 
     async def create(
@@ -286,10 +307,10 @@ async def create(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewayCreateResponse]:
         """
-        Creates a Zero Trust account with an existing Cloudflare account.
+        Create a Zero Trust account for an existing Cloudflare account.
 
         Args:
           extra_headers: Send extra headers
@@ -323,10 +344,10 @@ async def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewayListResponse]:
         """
-        Gets information about the current Zero Trust account.
+        Retrieve information about the current Zero Trust account.
 
         Args:
           extra_headers: Send extra headers
diff --git a/src/cloudflare/resources/zero_trust/gateway/lists/items.py b/src/cloudflare/resources/zero_trust/gateway/lists/items.py
index 8a43c7e6c76..8dcfa4d317d 100644
--- a/src/cloudflare/resources/zero_trust/gateway/lists/items.py
+++ b/src/cloudflare/resources/zero_trust/gateway/lists/items.py
@@ -4,7 +4,7 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ....._types import Body, Query, Headers, NotGiven, not_given
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -23,10 +23,21 @@
 class ItemsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ItemsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ItemsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ItemsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ItemsResourceWithStreamingResponse(self)
 
     def list(
@@ -39,13 +50,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[ItemListResponse]:
         """
-        Fetches all items in a single Zero Trust list.
+        Fetch all items in a single Zero Trust list.
 
         Args:
-          list_id: API Resource UUID tag.
+          list_id: Identify the API resource with a UUID.
 
           extra_headers: Send extra headers
 
@@ -72,10 +83,21 @@ def list(
 class AsyncItemsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncItemsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncItemsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncItemsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncItemsResourceWithStreamingResponse(self)
 
     def list(
@@ -88,13 +110,13 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[ItemListResponse, AsyncSinglePage[ItemListResponse]]:
         """
-        Fetches all items in a single Zero Trust list.
+        Fetch all items in a single Zero Trust list.
 
         Args:
-          list_id: API Resource UUID tag.
+          list_id: Identify the API resource with a UUID.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/zero_trust/gateway/lists/lists.py b/src/cloudflare/resources/zero_trust/gateway/lists/lists.py
index 7c484696504..014a1b838cb 100644
--- a/src/cloudflare/resources/zero_trust/gateway/lists/lists.py
+++ b/src/cloudflare/resources/zero_trust/gateway/lists/lists.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any, List, Type, Iterable, Optional, cast
+from typing import Type, Iterable, Optional, cast
 from typing_extensions import Literal
 
 import httpx
@@ -15,11 +15,8 @@
     ItemsResourceWithStreamingResponse,
     AsyncItemsResourceWithStreamingResponse,
 )
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -33,9 +30,7 @@
 from ....._base_client import AsyncPaginator, make_request_options
 from .....types.zero_trust.gateway import list_edit_params, list_list_params, list_create_params, list_update_params
 from .....types.zero_trust.gateway.gateway_list import GatewayList
-from .....types.zero_trust.gateway.gateway_item_param import GatewayItemParam
 from .....types.zero_trust.gateway.list_create_response import ListCreateResponse
-from .....types.zero_trust.gateway.list_delete_response import ListDeleteResponse
 
 __all__ = ["ListsResource", "AsyncListsResource"]
 
@@ -47,10 +42,21 @@ def items(self) -> ItemsResource:
 
     @cached_property
     def with_raw_response(self) -> ListsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ListsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ListsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ListsResourceWithStreamingResponse(self)
 
     def create(
@@ -58,27 +64,27 @@ def create(
         *,
         account_id: str,
         name: str,
-        type: Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"],
-        description: str | NotGiven = NOT_GIVEN,
-        items: Iterable[GatewayItemParam] | NotGiven = NOT_GIVEN,
+        type: Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP", "CATEGORY", "LOCATION", "DEVICE"],
+        description: str | Omit = omit,
+        items: Iterable[list_create_params.Item] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ListCreateResponse]:
         """
         Creates a new Zero Trust list.
 
         Args:
-          name: The name of the list.
+          name: Specify the list name.
 
-          type: The type of list.
+          type: Specify the list type.
 
-          description: The description of the list.
+          description: Provide the list description.
 
-          items: The items in the list.
+          items: Add items to the list.
 
           extra_headers: Send extra headers
 
@@ -117,23 +123,28 @@ def update(
         *,
         account_id: str,
         name: str,
-        description: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        items: Iterable[list_update_params.Item] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewayList]:
-        """
-        Updates a configured Zero Trust list.
+        """Updates a configured Zero Trust list.
+
+        Skips updating list items if not included
+        in the payload. A non empty list items will overwrite the existing list.
 
         Args:
-          list_id: API Resource UUID tag.
+          list_id: Identify the API resource with a UUID.
 
-          name: The name of the list.
+          name: Specify the list name.
 
-          description: The description of the list.
+          description: Provide the list description.
+
+          items: Add items to the list.
 
           extra_headers: Send extra headers
 
@@ -153,6 +164,7 @@ def update(
                 {
                     "name": name,
                     "description": description,
+                    "items": items,
                 },
                 list_update_params.ListUpdateParams,
             ),
@@ -170,19 +182,19 @@ def list(
         self,
         *,
         account_id: str,
-        type: Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"] | NotGiven = NOT_GIVEN,
+        type: Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP", "CATEGORY", "LOCATION", "DEVICE"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[GatewayList]:
         """
-        Fetches all Zero Trust lists for an account.
+        Fetch all Zero Trust lists for an account.
 
         Args:
-          type: The type of list.
+          type: Specify the list type.
 
           extra_headers: Send extra headers
 
@@ -217,13 +229,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ListDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
         Deletes a Zero Trust list.
 
         Args:
-          list_id: API Resource UUID tag.
+          list_id: Identify the API resource with a UUID.
 
           extra_headers: Send extra headers
 
@@ -237,21 +249,16 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not list_id:
             raise ValueError(f"Expected a non-empty value for `list_id` but received {list_id!r}")
-        return cast(
-            Optional[ListDeleteResponse],
-            self._delete(
-                f"/accounts/{account_id}/gateway/lists/{list_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[ListDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ListDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._delete(
+            f"/accounts/{account_id}/gateway/lists/{list_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     def edit(
@@ -259,24 +266,24 @@ def edit(
         list_id: str,
         *,
         account_id: str,
-        append: Iterable[GatewayItemParam] | NotGiven = NOT_GIVEN,
-        remove: List[str] | NotGiven = NOT_GIVEN,
+        append: Iterable[list_edit_params.Append] | Omit = omit,
+        remove: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewayList]:
         """
         Appends or removes an item from a configured Zero Trust list.
 
         Args:
-          list_id: API Resource UUID tag.
+          list_id: Identify the API resource with a UUID.
 
-          append: The items in the list.
+          append: Add items to the list.
 
-          remove: A list of the item values you want to remove.
+          remove: Lists of item values you want to remove.
 
           extra_headers: Send extra headers
 
@@ -319,13 +326,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewayList]:
         """
-        Fetches a single Zero Trust list.
+        Fetch a single Zero Trust list.
 
         Args:
-          list_id: API Resource UUID tag.
+          list_id: Identify the API resource with a UUID.
 
           extra_headers: Send extra headers
 
@@ -359,10 +366,21 @@ def items(self) -> AsyncItemsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncListsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncListsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncListsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncListsResourceWithStreamingResponse(self)
 
     async def create(
@@ -370,27 +388,27 @@ async def create(
         *,
         account_id: str,
         name: str,
-        type: Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"],
-        description: str | NotGiven = NOT_GIVEN,
-        items: Iterable[GatewayItemParam] | NotGiven = NOT_GIVEN,
+        type: Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP", "CATEGORY", "LOCATION", "DEVICE"],
+        description: str | Omit = omit,
+        items: Iterable[list_create_params.Item] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ListCreateResponse]:
         """
         Creates a new Zero Trust list.
 
         Args:
-          name: The name of the list.
+          name: Specify the list name.
 
-          type: The type of list.
+          type: Specify the list type.
 
-          description: The description of the list.
+          description: Provide the list description.
 
-          items: The items in the list.
+          items: Add items to the list.
 
           extra_headers: Send extra headers
 
@@ -429,23 +447,28 @@ async def update(
         *,
         account_id: str,
         name: str,
-        description: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        items: Iterable[list_update_params.Item] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewayList]:
-        """
-        Updates a configured Zero Trust list.
+        """Updates a configured Zero Trust list.
+
+        Skips updating list items if not included
+        in the payload. A non empty list items will overwrite the existing list.
 
         Args:
-          list_id: API Resource UUID tag.
+          list_id: Identify the API resource with a UUID.
 
-          name: The name of the list.
+          name: Specify the list name.
 
-          description: The description of the list.
+          description: Provide the list description.
+
+          items: Add items to the list.
 
           extra_headers: Send extra headers
 
@@ -465,6 +488,7 @@ async def update(
                 {
                     "name": name,
                     "description": description,
+                    "items": items,
                 },
                 list_update_params.ListUpdateParams,
             ),
@@ -482,19 +506,19 @@ def list(
         self,
         *,
         account_id: str,
-        type: Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"] | NotGiven = NOT_GIVEN,
+        type: Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP", "CATEGORY", "LOCATION", "DEVICE"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[GatewayList, AsyncSinglePage[GatewayList]]:
         """
-        Fetches all Zero Trust lists for an account.
+        Fetch all Zero Trust lists for an account.
 
         Args:
-          type: The type of list.
+          type: Specify the list type.
 
           extra_headers: Send extra headers
 
@@ -529,13 +553,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ListDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
         Deletes a Zero Trust list.
 
         Args:
-          list_id: API Resource UUID tag.
+          list_id: Identify the API resource with a UUID.
 
           extra_headers: Send extra headers
 
@@ -549,21 +573,16 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not list_id:
             raise ValueError(f"Expected a non-empty value for `list_id` but received {list_id!r}")
-        return cast(
-            Optional[ListDeleteResponse],
-            await self._delete(
-                f"/accounts/{account_id}/gateway/lists/{list_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[ListDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ListDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._delete(
+            f"/accounts/{account_id}/gateway/lists/{list_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     async def edit(
@@ -571,24 +590,24 @@ async def edit(
         list_id: str,
         *,
         account_id: str,
-        append: Iterable[GatewayItemParam] | NotGiven = NOT_GIVEN,
-        remove: List[str] | NotGiven = NOT_GIVEN,
+        append: Iterable[list_edit_params.Append] | Omit = omit,
+        remove: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewayList]:
         """
         Appends or removes an item from a configured Zero Trust list.
 
         Args:
-          list_id: API Resource UUID tag.
+          list_id: Identify the API resource with a UUID.
 
-          append: The items in the list.
+          append: Add items to the list.
 
-          remove: A list of the item values you want to remove.
+          remove: Lists of item values you want to remove.
 
           extra_headers: Send extra headers
 
@@ -631,13 +650,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewayList]:
         """
-        Fetches a single Zero Trust list.
+        Fetch a single Zero Trust list.
 
         Args:
-          list_id: API Resource UUID tag.
+          list_id: Identify the API resource with a UUID.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/zero_trust/gateway/locations.py b/src/cloudflare/resources/zero_trust/gateway/locations.py
index dfbdc58aa72..c3adeec7b63 100644
--- a/src/cloudflare/resources/zero_trust/gateway/locations.py
+++ b/src/cloudflare/resources/zero_trust/gateway/locations.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Iterable, Optional, cast
+from typing import Type, Iterable, Optional, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -24,7 +21,7 @@
 from ...._base_client import AsyncPaginator, make_request_options
 from ....types.zero_trust.gateway import location_create_params, location_update_params
 from ....types.zero_trust.gateway.location import Location
-from ....types.zero_trust.gateway.location_delete_response import LocationDeleteResponse
+from ....types.zero_trust.gateway.endpoint_param import EndpointParam
 
 __all__ = ["LocationsResource", "AsyncLocationsResource"]
 
@@ -32,10 +29,21 @@
 class LocationsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> LocationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LocationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LocationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LocationsResourceWithStreamingResponse(self)
 
     def create(
@@ -43,36 +51,39 @@ def create(
         *,
         account_id: str,
         name: str,
-        client_default: bool | NotGiven = NOT_GIVEN,
-        dns_destination_ips_id: str | NotGiven = NOT_GIVEN,
-        ecs_support: bool | NotGiven = NOT_GIVEN,
-        networks: Iterable[location_create_params.Network] | NotGiven = NOT_GIVEN,
+        client_default: bool | Omit = omit,
+        dns_destination_ips_id: str | Omit = omit,
+        ecs_support: bool | Omit = omit,
+        endpoints: Optional[EndpointParam] | Omit = omit,
+        networks: Optional[Iterable[location_create_params.Network]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Location]:
         """
-        Creates a new Zero Trust Gateway location.
+        Create a new Zero Trust Gateway location.
 
         Args:
-          name: The name of the location.
+          name: Specify the location name.
 
-          client_default: True if the location is the default location.
+          client_default: Indicate whether this location is the default location.
 
-          dns_destination_ips_id: The identifier of the pair of IPv4 addresses assigned to this location. When
-              creating a location, if this field is absent or set with null, the pair of
+          dns_destination_ips_id: Specify the identifier of the pair of IPv4 addresses assigned to this location.
+              When creating a location, if this field is absent or set to null, the pair of
               shared IPv4 addresses (0e4a32c6-6fb8-4858-9296-98f51631e8e6) is auto-assigned.
-              When updating a location, if the field is absent or set with null, the
+              When updating a location, if this field is absent or set to null, the
               pre-assigned pair remains unchanged.
 
-          ecs_support: True if the location needs to resolve EDNS queries.
+          ecs_support: Indicate whether the location must resolve EDNS queries.
+
+          endpoints: Configure the destination endpoints for this location.
 
-          networks: A list of network ranges that requests from this location would originate from.
-              A non-empty list is only effective if the ipv4 endpoint is enabled for this
-              location.
+          networks: Specify the list of network ranges from which requests at this location
+              originate. The list takes effect only if it is non-empty and the IPv4 endpoint
+              is enabled for this location.
 
           extra_headers: Send extra headers
 
@@ -92,6 +103,7 @@ def create(
                     "client_default": client_default,
                     "dns_destination_ips_id": dns_destination_ips_id,
                     "ecs_support": ecs_support,
+                    "endpoints": endpoints,
                     "networks": networks,
                 },
                 location_create_params.LocationCreateParams,
@@ -112,36 +124,39 @@ def update(
         *,
         account_id: str,
         name: str,
-        client_default: bool | NotGiven = NOT_GIVEN,
-        dns_destination_ips_id: str | NotGiven = NOT_GIVEN,
-        ecs_support: bool | NotGiven = NOT_GIVEN,
-        networks: Iterable[location_update_params.Network] | NotGiven = NOT_GIVEN,
+        client_default: bool | Omit = omit,
+        dns_destination_ips_id: str | Omit = omit,
+        ecs_support: bool | Omit = omit,
+        endpoints: Optional[EndpointParam] | Omit = omit,
+        networks: Optional[Iterable[location_update_params.Network]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Location]:
         """
-        Updates a configured Zero Trust Gateway location.
+        Update a configured Zero Trust Gateway location.
 
         Args:
-          name: The name of the location.
+          name: Specify the location name.
 
-          client_default: True if the location is the default location.
+          client_default: Indicate whether this location is the default location.
 
-          dns_destination_ips_id: The identifier of the pair of IPv4 addresses assigned to this location. When
-              creating a location, if this field is absent or set with null, the pair of
+          dns_destination_ips_id: Specify the identifier of the pair of IPv4 addresses assigned to this location.
+              When creating a location, if this field is absent or set to null, the pair of
               shared IPv4 addresses (0e4a32c6-6fb8-4858-9296-98f51631e8e6) is auto-assigned.
-              When updating a location, if the field is absent or set with null, the
+              When updating a location, if this field is absent or set to null, the
               pre-assigned pair remains unchanged.
 
-          ecs_support: True if the location needs to resolve EDNS queries.
+          ecs_support: Indicate whether the location must resolve EDNS queries.
 
-          networks: A list of network ranges that requests from this location would originate from.
-              A non-empty list is only effective if the ipv4 endpoint is enabled for this
-              location.
+          endpoints: Configure the destination endpoints for this location.
+
+          networks: Specify the list of network ranges from which requests at this location
+              originate. The list takes effect only if it is non-empty and the IPv4 endpoint
+              is enabled for this location.
 
           extra_headers: Send extra headers
 
@@ -163,6 +178,7 @@ def update(
                     "client_default": client_default,
                     "dns_destination_ips_id": dns_destination_ips_id,
                     "ecs_support": ecs_support,
+                    "endpoints": endpoints,
                     "networks": networks,
                 },
                 location_update_params.LocationUpdateParams,
@@ -186,10 +202,10 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[Location]:
         """
-        Fetches Zero Trust Gateway locations for an account.
+        List Zero Trust Gateway locations for an account.
 
         Args:
           extra_headers: Send extra headers
@@ -221,10 +237,10 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[LocationDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
-        Deletes a configured Zero Trust Gateway location.
+        Delete a configured Zero Trust Gateway location.
 
         Args:
           extra_headers: Send extra headers
@@ -239,21 +255,16 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not location_id:
             raise ValueError(f"Expected a non-empty value for `location_id` but received {location_id!r}")
-        return cast(
-            Optional[LocationDeleteResponse],
-            self._delete(
-                f"/accounts/{account_id}/gateway/locations/{location_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[LocationDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[LocationDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._delete(
+            f"/accounts/{account_id}/gateway/locations/{location_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     def get(
@@ -266,10 +277,10 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Location]:
         """
-        Fetches a single Zero Trust Gateway location.
+        Get a single Zero Trust Gateway location.
 
         Args:
           extra_headers: Send extra headers
@@ -300,10 +311,21 @@ def get(
 class AsyncLocationsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncLocationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLocationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLocationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLocationsResourceWithStreamingResponse(self)
 
     async def create(
@@ -311,36 +333,39 @@ async def create(
         *,
         account_id: str,
         name: str,
-        client_default: bool | NotGiven = NOT_GIVEN,
-        dns_destination_ips_id: str | NotGiven = NOT_GIVEN,
-        ecs_support: bool | NotGiven = NOT_GIVEN,
-        networks: Iterable[location_create_params.Network] | NotGiven = NOT_GIVEN,
+        client_default: bool | Omit = omit,
+        dns_destination_ips_id: str | Omit = omit,
+        ecs_support: bool | Omit = omit,
+        endpoints: Optional[EndpointParam] | Omit = omit,
+        networks: Optional[Iterable[location_create_params.Network]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Location]:
         """
-        Creates a new Zero Trust Gateway location.
+        Create a new Zero Trust Gateway location.
 
         Args:
-          name: The name of the location.
+          name: Specify the location name.
 
-          client_default: True if the location is the default location.
+          client_default: Indicate whether this location is the default location.
 
-          dns_destination_ips_id: The identifier of the pair of IPv4 addresses assigned to this location. When
-              creating a location, if this field is absent or set with null, the pair of
+          dns_destination_ips_id: Specify the identifier of the pair of IPv4 addresses assigned to this location.
+              When creating a location, if this field is absent or set to null, the pair of
               shared IPv4 addresses (0e4a32c6-6fb8-4858-9296-98f51631e8e6) is auto-assigned.
-              When updating a location, if the field is absent or set with null, the
+              When updating a location, if this field is absent or set to null, the
               pre-assigned pair remains unchanged.
 
-          ecs_support: True if the location needs to resolve EDNS queries.
+          ecs_support: Indicate whether the location must resolve EDNS queries.
+
+          endpoints: Configure the destination endpoints for this location.
 
-          networks: A list of network ranges that requests from this location would originate from.
-              A non-empty list is only effective if the ipv4 endpoint is enabled for this
-              location.
+          networks: Specify the list of network ranges from which requests at this location
+              originate. The list takes effect only if it is non-empty and the IPv4 endpoint
+              is enabled for this location.
 
           extra_headers: Send extra headers
 
@@ -360,6 +385,7 @@ async def create(
                     "client_default": client_default,
                     "dns_destination_ips_id": dns_destination_ips_id,
                     "ecs_support": ecs_support,
+                    "endpoints": endpoints,
                     "networks": networks,
                 },
                 location_create_params.LocationCreateParams,
@@ -380,36 +406,39 @@ async def update(
         *,
         account_id: str,
         name: str,
-        client_default: bool | NotGiven = NOT_GIVEN,
-        dns_destination_ips_id: str | NotGiven = NOT_GIVEN,
-        ecs_support: bool | NotGiven = NOT_GIVEN,
-        networks: Iterable[location_update_params.Network] | NotGiven = NOT_GIVEN,
+        client_default: bool | Omit = omit,
+        dns_destination_ips_id: str | Omit = omit,
+        ecs_support: bool | Omit = omit,
+        endpoints: Optional[EndpointParam] | Omit = omit,
+        networks: Optional[Iterable[location_update_params.Network]] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Location]:
         """
-        Updates a configured Zero Trust Gateway location.
+        Update a configured Zero Trust Gateway location.
 
         Args:
-          name: The name of the location.
+          name: Specify the location name.
 
-          client_default: True if the location is the default location.
+          client_default: Indicate whether this location is the default location.
 
-          dns_destination_ips_id: The identifier of the pair of IPv4 addresses assigned to this location. When
-              creating a location, if this field is absent or set with null, the pair of
+          dns_destination_ips_id: Specify the identifier of the pair of IPv4 addresses assigned to this location.
+              When creating a location, if this field is absent or set to null, the pair of
               shared IPv4 addresses (0e4a32c6-6fb8-4858-9296-98f51631e8e6) is auto-assigned.
-              When updating a location, if the field is absent or set with null, the
+              When updating a location, if this field is absent or set to null, the
               pre-assigned pair remains unchanged.
 
-          ecs_support: True if the location needs to resolve EDNS queries.
+          ecs_support: Indicate whether the location must resolve EDNS queries.
 
-          networks: A list of network ranges that requests from this location would originate from.
-              A non-empty list is only effective if the ipv4 endpoint is enabled for this
-              location.
+          endpoints: Configure the destination endpoints for this location.
+
+          networks: Specify the list of network ranges from which requests at this location
+              originate. The list takes effect only if it is non-empty and the IPv4 endpoint
+              is enabled for this location.
 
           extra_headers: Send extra headers
 
@@ -431,6 +460,7 @@ async def update(
                     "client_default": client_default,
                     "dns_destination_ips_id": dns_destination_ips_id,
                     "ecs_support": ecs_support,
+                    "endpoints": endpoints,
                     "networks": networks,
                 },
                 location_update_params.LocationUpdateParams,
@@ -454,10 +484,10 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Location, AsyncSinglePage[Location]]:
         """
-        Fetches Zero Trust Gateway locations for an account.
+        List Zero Trust Gateway locations for an account.
 
         Args:
           extra_headers: Send extra headers
@@ -489,10 +519,10 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[LocationDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
-        Deletes a configured Zero Trust Gateway location.
+        Delete a configured Zero Trust Gateway location.
 
         Args:
           extra_headers: Send extra headers
@@ -507,21 +537,16 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not location_id:
             raise ValueError(f"Expected a non-empty value for `location_id` but received {location_id!r}")
-        return cast(
-            Optional[LocationDeleteResponse],
-            await self._delete(
-                f"/accounts/{account_id}/gateway/locations/{location_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[LocationDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[LocationDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._delete(
+            f"/accounts/{account_id}/gateway/locations/{location_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     async def get(
@@ -534,10 +559,10 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Location]:
         """
-        Fetches a single Zero Trust Gateway location.
+        Get a single Zero Trust Gateway location.
 
         Args:
           extra_headers: Send extra headers
diff --git a/src/cloudflare/resources/zero_trust/gateway/logging.py b/src/cloudflare/resources/zero_trust/gateway/logging.py
index 64eff13efdb..f18afc08f91 100644
--- a/src/cloudflare/resources/zero_trust/gateway/logging.py
+++ b/src/cloudflare/resources/zero_trust/gateway/logging.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -30,33 +27,45 @@
 class LoggingResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> LoggingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return LoggingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> LoggingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return LoggingResourceWithStreamingResponse(self)
 
     def update(
         self,
         *,
         account_id: str,
-        redact_pii: bool | NotGiven = NOT_GIVEN,
-        settings_by_rule_type: logging_update_params.SettingsByRuleType | NotGiven = NOT_GIVEN,
+        redact_pii: bool | Omit = omit,
+        settings_by_rule_type: logging_update_params.SettingsByRuleType | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LoggingSetting]:
         """
-        Updates logging settings for the current Zero Trust account.
+        Update logging settings for the current Zero Trust account.
 
         Args:
-          redact_pii: Redact personally identifiable information from activity logging (PII fields
-              are: source IP, user email, user ID, device ID, URL, referrer, user agent).
+          redact_pii: Indicate whether to redact personally identifiable information from activity
+              logging (PII fields include source IP, user email, user ID, device ID, URL,
+              referrer, and user agent).
 
-          settings_by_rule_type: Logging settings by rule type.
+          settings_by_rule_type: Configure logging settings for each rule type.
 
           extra_headers: Send extra headers
 
@@ -96,10 +105,10 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LoggingSetting]:
         """
-        Fetches the current logging settings for Zero Trust account.
+        Retrieve the current logging settings for the Zero Trust account.
 
         Args:
           extra_headers: Send extra headers
@@ -128,33 +137,45 @@ def get(
 class AsyncLoggingResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncLoggingResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncLoggingResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncLoggingResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncLoggingResourceWithStreamingResponse(self)
 
     async def update(
         self,
         *,
         account_id: str,
-        redact_pii: bool | NotGiven = NOT_GIVEN,
-        settings_by_rule_type: logging_update_params.SettingsByRuleType | NotGiven = NOT_GIVEN,
+        redact_pii: bool | Omit = omit,
+        settings_by_rule_type: logging_update_params.SettingsByRuleType | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LoggingSetting]:
         """
-        Updates logging settings for the current Zero Trust account.
+        Update logging settings for the current Zero Trust account.
 
         Args:
-          redact_pii: Redact personally identifiable information from activity logging (PII fields
-              are: source IP, user email, user ID, device ID, URL, referrer, user agent).
+          redact_pii: Indicate whether to redact personally identifiable information from activity
+              logging (PII fields include source IP, user email, user ID, device ID, URL,
+              referrer, and user agent).
 
-          settings_by_rule_type: Logging settings by rule type.
+          settings_by_rule_type: Configure logging settings for each rule type.
 
           extra_headers: Send extra headers
 
@@ -194,10 +215,10 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[LoggingSetting]:
         """
-        Fetches the current logging settings for Zero Trust account.
+        Retrieve the current logging settings for the Zero Trust account.
 
         Args:
           extra_headers: Send extra headers
diff --git a/src/cloudflare/resources/zero_trust/gateway/proxy_endpoints.py b/src/cloudflare/resources/zero_trust/gateway/proxy_endpoints.py
index 322eae10991..895c360e0e2 100644
--- a/src/cloudflare/resources/zero_trust/gateway/proxy_endpoints.py
+++ b/src/cloudflare/resources/zero_trust/gateway/proxy_endpoints.py
@@ -2,15 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, List, Type, Optional, cast
+from typing import Any, Type, Optional, cast
+from typing_extensions import Literal, overload
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import required_args, maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -20,12 +18,11 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
 from ....types.zero_trust.gateway import proxy_endpoint_edit_params, proxy_endpoint_create_params
 from ....types.zero_trust.gateway.gateway_ips import GatewayIPs
 from ....types.zero_trust.gateway.proxy_endpoint import ProxyEndpoint
-from ....types.zero_trust.gateway.proxy_endpoint_get_response import ProxyEndpointGetResponse
-from ....types.zero_trust.gateway.proxy_endpoint_delete_response import ProxyEndpointDeleteResponse
 
 __all__ = ["ProxyEndpointsResource", "AsyncProxyEndpointsResource"]
 
@@ -33,32 +30,44 @@
 class ProxyEndpointsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ProxyEndpointsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ProxyEndpointsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ProxyEndpointsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ProxyEndpointsResourceWithStreamingResponse(self)
 
+    @overload
     def create(
         self,
         *,
         account_id: str,
-        ips: List[GatewayIPs],
         name: str,
+        kind: Literal["ip"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ProxyEndpoint]:
         """
-        Creates a new Zero Trust Gateway proxy endpoint.
+        Create a new Zero Trust Gateway proxy endpoint.
 
         Args:
-          ips: A list of CIDRs to restrict ingress connections.
+          name: Specify the name of the proxy endpoint.
 
-          name: The name of the proxy endpoint.
+          kind: The proxy endpoint kind
 
           extra_headers: Send extra headers
 
@@ -68,25 +77,78 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        ...
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        kind: Literal["identity"],
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ProxyEndpoint]:
+        """
+        Create a new Zero Trust Gateway proxy endpoint.
+
+        Args:
+          kind: The proxy endpoint kind
+
+          name: Specify the name of the proxy endpoint.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "name"], ["account_id", "kind", "name"])
+    def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        kind: Literal["ip"] | Literal["identity"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ProxyEndpoint]:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._post(
-            f"/accounts/{account_id}/gateway/proxy_endpoints",
-            body=maybe_transform(
-                {
-                    "ips": ips,
-                    "name": name,
-                },
-                proxy_endpoint_create_params.ProxyEndpointCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ProxyEndpoint]]._unwrapper,
+        return cast(
+            Optional[ProxyEndpoint],
+            self._post(
+                f"/accounts/{account_id}/gateway/proxy_endpoints",
+                body=maybe_transform(
+                    {
+                        "name": name,
+                        "kind": kind,
+                    },
+                    proxy_endpoint_create_params.ProxyEndpointCreateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[ProxyEndpoint]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[ProxyEndpoint]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[ProxyEndpoint]], ResultWrapper[ProxyEndpoint]),
         )
 
     def list(
@@ -98,10 +160,10 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ProxyEndpoint]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[ProxyEndpoint]:
         """
-        Fetches all Zero Trust Gateway proxy endpoints for an account.
+        List all Zero Trust Gateway proxy endpoints for an account.
 
         Args:
           extra_headers: Send extra headers
@@ -114,16 +176,13 @@ def list(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/gateway/proxy_endpoints",
+            page=SyncSinglePage[ProxyEndpoint],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ProxyEndpoint]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[ProxyEndpoint]], ResultWrapper[ProxyEndpoint]),
+            model=cast(Any, ProxyEndpoint),  # Union types cannot be passed in as arguments in the type system
         )
 
     def delete(
@@ -136,10 +195,10 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ProxyEndpointDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
-        Deletes a configured Zero Trust Gateway proxy endpoint.
+        Delete a configured Zero Trust Gateway proxy endpoint.
 
         Args:
           extra_headers: Send extra headers
@@ -154,21 +213,16 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not proxy_endpoint_id:
             raise ValueError(f"Expected a non-empty value for `proxy_endpoint_id` but received {proxy_endpoint_id!r}")
-        return cast(
-            Optional[ProxyEndpointDeleteResponse],
-            self._delete(
-                f"/accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[ProxyEndpointDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ProxyEndpointDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._delete(
+            f"/accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     def edit(
@@ -176,22 +230,22 @@ def edit(
         proxy_endpoint_id: str,
         *,
         account_id: str,
-        ips: List[GatewayIPs] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        ips: SequenceNotStr[GatewayIPs] | Omit = omit,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ProxyEndpoint]:
         """
-        Updates a configured Zero Trust Gateway proxy endpoint.
+        Update a configured Zero Trust Gateway proxy endpoint.
 
         Args:
-          ips: A list of CIDRs to restrict ingress connections.
+          ips: Specify the list of CIDRs to restrict ingress connections.
 
-          name: The name of the proxy endpoint.
+          name: Specify the name of the proxy endpoint.
 
           extra_headers: Send extra headers
 
@@ -205,23 +259,28 @@ def edit(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not proxy_endpoint_id:
             raise ValueError(f"Expected a non-empty value for `proxy_endpoint_id` but received {proxy_endpoint_id!r}")
-        return self._patch(
-            f"/accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}",
-            body=maybe_transform(
-                {
-                    "ips": ips,
-                    "name": name,
-                },
-                proxy_endpoint_edit_params.ProxyEndpointEditParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ProxyEndpoint]]._unwrapper,
+        return cast(
+            Optional[ProxyEndpoint],
+            self._patch(
+                f"/accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}",
+                body=maybe_transform(
+                    {
+                        "ips": ips,
+                        "name": name,
+                    },
+                    proxy_endpoint_edit_params.ProxyEndpointEditParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[ProxyEndpoint]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[ProxyEndpoint]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[ProxyEndpoint]], ResultWrapper[ProxyEndpoint]),
         )
 
     def get(
@@ -234,10 +293,10 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ProxyEndpointGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ProxyEndpoint]:
         """
-        Fetches a single Zero Trust Gateway proxy endpoint.
+        Get a single Zero Trust Gateway proxy endpoint.
 
         Args:
           extra_headers: Send extra headers
@@ -252,48 +311,65 @@ def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not proxy_endpoint_id:
             raise ValueError(f"Expected a non-empty value for `proxy_endpoint_id` but received {proxy_endpoint_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ProxyEndpointGetResponse]]._unwrapper,
+        return cast(
+            Optional[ProxyEndpoint],
+            self._get(
+                f"/accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[ProxyEndpoint]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[ProxyEndpoint]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[ProxyEndpointGetResponse]], ResultWrapper[ProxyEndpointGetResponse]),
         )
 
 
 class AsyncProxyEndpointsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncProxyEndpointsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncProxyEndpointsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncProxyEndpointsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncProxyEndpointsResourceWithStreamingResponse(self)
 
+    @overload
     async def create(
         self,
         *,
         account_id: str,
-        ips: List[GatewayIPs],
         name: str,
+        kind: Literal["ip"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ProxyEndpoint]:
         """
-        Creates a new Zero Trust Gateway proxy endpoint.
+        Create a new Zero Trust Gateway proxy endpoint.
 
         Args:
-          ips: A list of CIDRs to restrict ingress connections.
+          name: Specify the name of the proxy endpoint.
 
-          name: The name of the proxy endpoint.
+          kind: The proxy endpoint kind
 
           extra_headers: Send extra headers
 
@@ -303,28 +379,81 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        ...
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        kind: Literal["identity"],
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ProxyEndpoint]:
+        """
+        Create a new Zero Trust Gateway proxy endpoint.
+
+        Args:
+          kind: The proxy endpoint kind
+
+          name: Specify the name of the proxy endpoint.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        ...
+
+    @required_args(["account_id", "name"], ["account_id", "kind", "name"])
+    async def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        kind: Literal["ip"] | Literal["identity"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ProxyEndpoint]:
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._post(
-            f"/accounts/{account_id}/gateway/proxy_endpoints",
-            body=await async_maybe_transform(
-                {
-                    "ips": ips,
-                    "name": name,
-                },
-                proxy_endpoint_create_params.ProxyEndpointCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ProxyEndpoint]]._unwrapper,
+        return cast(
+            Optional[ProxyEndpoint],
+            await self._post(
+                f"/accounts/{account_id}/gateway/proxy_endpoints",
+                body=await async_maybe_transform(
+                    {
+                        "name": name,
+                        "kind": kind,
+                    },
+                    proxy_endpoint_create_params.ProxyEndpointCreateParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[ProxyEndpoint]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[ProxyEndpoint]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[ProxyEndpoint]], ResultWrapper[ProxyEndpoint]),
         )
 
-    async def list(
+    def list(
         self,
         *,
         account_id: str,
@@ -333,10 +462,10 @@ async def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ProxyEndpoint]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ProxyEndpoint, AsyncSinglePage[ProxyEndpoint]]:
         """
-        Fetches all Zero Trust Gateway proxy endpoints for an account.
+        List all Zero Trust Gateway proxy endpoints for an account.
 
         Args:
           extra_headers: Send extra headers
@@ -349,16 +478,13 @@ async def list(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/gateway/proxy_endpoints",
+            page=AsyncSinglePage[ProxyEndpoint],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ProxyEndpoint]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[ProxyEndpoint]], ResultWrapper[ProxyEndpoint]),
+            model=cast(Any, ProxyEndpoint),  # Union types cannot be passed in as arguments in the type system
         )
 
     async def delete(
@@ -371,10 +497,10 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ProxyEndpointDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
-        Deletes a configured Zero Trust Gateway proxy endpoint.
+        Delete a configured Zero Trust Gateway proxy endpoint.
 
         Args:
           extra_headers: Send extra headers
@@ -389,21 +515,16 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not proxy_endpoint_id:
             raise ValueError(f"Expected a non-empty value for `proxy_endpoint_id` but received {proxy_endpoint_id!r}")
-        return cast(
-            Optional[ProxyEndpointDeleteResponse],
-            await self._delete(
-                f"/accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[ProxyEndpointDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ProxyEndpointDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._delete(
+            f"/accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     async def edit(
@@ -411,22 +532,22 @@ async def edit(
         proxy_endpoint_id: str,
         *,
         account_id: str,
-        ips: List[GatewayIPs] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        ips: SequenceNotStr[GatewayIPs] | Omit = omit,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ProxyEndpoint]:
         """
-        Updates a configured Zero Trust Gateway proxy endpoint.
+        Update a configured Zero Trust Gateway proxy endpoint.
 
         Args:
-          ips: A list of CIDRs to restrict ingress connections.
+          ips: Specify the list of CIDRs to restrict ingress connections.
 
-          name: The name of the proxy endpoint.
+          name: Specify the name of the proxy endpoint.
 
           extra_headers: Send extra headers
 
@@ -440,23 +561,28 @@ async def edit(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not proxy_endpoint_id:
             raise ValueError(f"Expected a non-empty value for `proxy_endpoint_id` but received {proxy_endpoint_id!r}")
-        return await self._patch(
-            f"/accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}",
-            body=await async_maybe_transform(
-                {
-                    "ips": ips,
-                    "name": name,
-                },
-                proxy_endpoint_edit_params.ProxyEndpointEditParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ProxyEndpoint]]._unwrapper,
+        return cast(
+            Optional[ProxyEndpoint],
+            await self._patch(
+                f"/accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}",
+                body=await async_maybe_transform(
+                    {
+                        "ips": ips,
+                        "name": name,
+                    },
+                    proxy_endpoint_edit_params.ProxyEndpointEditParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[ProxyEndpoint]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[ProxyEndpoint]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[ProxyEndpoint]], ResultWrapper[ProxyEndpoint]),
         )
 
     async def get(
@@ -469,10 +595,10 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ProxyEndpointGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ProxyEndpoint]:
         """
-        Fetches a single Zero Trust Gateway proxy endpoint.
+        Get a single Zero Trust Gateway proxy endpoint.
 
         Args:
           extra_headers: Send extra headers
@@ -487,16 +613,21 @@ async def get(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not proxy_endpoint_id:
             raise ValueError(f"Expected a non-empty value for `proxy_endpoint_id` but received {proxy_endpoint_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ProxyEndpointGetResponse]]._unwrapper,
+        return cast(
+            Optional[ProxyEndpoint],
+            await self._get(
+                f"/accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[ProxyEndpoint]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[ProxyEndpoint]
+                ),  # Union types cannot be passed in as arguments in the type system
             ),
-            cast_to=cast(Type[Optional[ProxyEndpointGetResponse]], ResultWrapper[ProxyEndpointGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/zero_trust/gateway/rules.py b/src/cloudflare/resources/zero_trust/gateway/rules.py
index 16d7df08139..2ece837eae3 100644
--- a/src/cloudflare/resources/zero_trust/gateway/rules.py
+++ b/src/cloudflare/resources/zero_trust/gateway/rules.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, List, Type, Optional, cast
+from typing import List, Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -28,7 +25,6 @@
 from ....types.zero_trust.gateway.gateway_filter import GatewayFilter
 from ....types.zero_trust.gateway.schedule_param import ScheduleParam
 from ....types.zero_trust.gateway.rule_setting_param import RuleSettingParam
-from ....types.zero_trust.gateway.rule_delete_response import RuleDeleteResponse
 
 __all__ = ["RulesResource", "AsyncRulesResource"]
 
@@ -36,10 +32,21 @@
 class RulesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> RulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RulesResourceWithStreamingResponse(self)
 
     def create(
@@ -60,56 +67,76 @@ def create(
             "override",
             "l4_override",
             "egress",
-            "audit_ssh",
             "resolve",
+            "quarantine",
+            "redirect",
         ],
         name: str,
-        description: str | NotGiven = NOT_GIVEN,
-        device_posture: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        filters: List[GatewayFilter] | NotGiven = NOT_GIVEN,
-        identity: str | NotGiven = NOT_GIVEN,
-        precedence: int | NotGiven = NOT_GIVEN,
-        rule_settings: RuleSettingParam | NotGiven = NOT_GIVEN,
-        schedule: ScheduleParam | NotGiven = NOT_GIVEN,
-        traffic: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        device_posture: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        expiration: Optional[rule_create_params.Expiration] | Omit = omit,
+        filters: List[GatewayFilter] | Omit = omit,
+        identity: str | Omit = omit,
+        precedence: int | Omit = omit,
+        rule_settings: RuleSettingParam | Omit = omit,
+        schedule: Optional[ScheduleParam] | Omit = omit,
+        traffic: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewayRule]:
         """
-        Creates a new Zero Trust Gateway rule.
+        Create a new Zero Trust Gateway rule.
 
         Args:
-          action: The action to preform when the associated traffic, identity, and device posture
-              expressions are either absent or evaluate to `true`.
+          action: Specify the action to perform when the associated traffic, identity, and device
+              posture expressions either absent or evaluate to `true`.
+
+          name: Specify the rule name.
 
-          name: The name of the rule.
+          description: Specify the rule description.
 
-          description: The description of the rule.
+          device_posture: Specify the wirefilter expression used for device posture check. The API
+              automatically formats and sanitizes expressions before storing them. To prevent
+              Terraform state drift, use the formatted expression returned in the API
+              response.
 
-          device_posture: The wirefilter expression used for device posture check matching.
+          enabled: Specify whether the rule is enabled.
 
-          enabled: True if the rule is enabled.
+          expiration: Defines the expiration time stamp and default duration of a DNS policy. Takes
+              precedence over the policy's `schedule` configuration, if any. This does not
+              apply to HTTP or network policies. Settable only for `dns` rules.
 
-          filters: The protocol or layer to evaluate the traffic, identity, and device posture
-              expressions.
+          filters: Specify the protocol or layer to evaluate the traffic, identity, and device
+              posture expressions. Can only contain a single value.
 
-          identity: The wirefilter expression used for identity matching.
+          identity: Specify the wirefilter expression used for identity matching. The API
+              automatically formats and sanitizes expressions before storing them. To prevent
+              Terraform state drift, use the formatted expression returned in the API
+              response.
 
-          precedence: Precedence sets the order of your rules. Lower values indicate higher
-              precedence. At each processing phase, applicable rules are evaluated in
-              ascending order of this value.
+          precedence: Set the order of your rules. Lower values indicate higher precedence. At each
+              processing phase, evaluate applicable rules in ascending order of this value.
+              Refer to
+              [Order of enforcement](http://developers.cloudflare.com/learning-paths/secure-internet-traffic/understand-policies/order-of-enforcement/#manage-precedence-with-terraform)
+              to manage precedence via Terraform.
 
-          rule_settings: Additional settings that modify the rule's action.
+          rule_settings: Defines settings for this rule. Settings apply only to specific rule types and
+              must use compatible selectors. If Terraform detects drift, confirm the setting
+              supports your rule type and check whether the API modifies the value. Use
+              API-returned values in your configuration to prevent drift.
 
-          schedule: The schedule for activating DNS policies. This does not apply to HTTP or network
-              policies.
+          schedule: Defines the schedule for activating DNS policies. Settable only for `dns` and
+              `dns_resolver` rules.
 
-          traffic: The wirefilter expression used for traffic matching.
+          traffic: Specify the wirefilter expression used for traffic matching. The API
+              automatically formats and sanitizes expressions before storing them. To prevent
+              Terraform state drift, use the formatted expression returned in the API
+              response.
 
           extra_headers: Send extra headers
 
@@ -130,6 +157,7 @@ def create(
                     "description": description,
                     "device_posture": device_posture,
                     "enabled": enabled,
+                    "expiration": expiration,
                     "filters": filters,
                     "identity": identity,
                     "precedence": precedence,
@@ -168,58 +196,78 @@ def update(
             "override",
             "l4_override",
             "egress",
-            "audit_ssh",
             "resolve",
+            "quarantine",
+            "redirect",
         ],
         name: str,
-        description: str | NotGiven = NOT_GIVEN,
-        device_posture: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        filters: List[GatewayFilter] | NotGiven = NOT_GIVEN,
-        identity: str | NotGiven = NOT_GIVEN,
-        precedence: int | NotGiven = NOT_GIVEN,
-        rule_settings: RuleSettingParam | NotGiven = NOT_GIVEN,
-        schedule: ScheduleParam | NotGiven = NOT_GIVEN,
-        traffic: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        device_posture: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        expiration: Optional[rule_update_params.Expiration] | Omit = omit,
+        filters: List[GatewayFilter] | Omit = omit,
+        identity: str | Omit = omit,
+        precedence: int | Omit = omit,
+        rule_settings: RuleSettingParam | Omit = omit,
+        schedule: Optional[ScheduleParam] | Omit = omit,
+        traffic: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewayRule]:
         """
-        Updates a configured Zero Trust Gateway rule.
+        Update a configured Zero Trust Gateway rule.
 
         Args:
-          rule_id: The API resource UUID.
+          rule_id: Identify the API resource with a UUID.
+
+          action: Specify the action to perform when the associated traffic, identity, and device
+              posture expressions either absent or evaluate to `true`.
 
-          action: The action to preform when the associated traffic, identity, and device posture
-              expressions are either absent or evaluate to `true`.
+          name: Specify the rule name.
 
-          name: The name of the rule.
+          description: Specify the rule description.
 
-          description: The description of the rule.
+          device_posture: Specify the wirefilter expression used for device posture check. The API
+              automatically formats and sanitizes expressions before storing them. To prevent
+              Terraform state drift, use the formatted expression returned in the API
+              response.
 
-          device_posture: The wirefilter expression used for device posture check matching.
+          enabled: Specify whether the rule is enabled.
 
-          enabled: True if the rule is enabled.
+          expiration: Defines the expiration time stamp and default duration of a DNS policy. Takes
+              precedence over the policy's `schedule` configuration, if any. This does not
+              apply to HTTP or network policies. Settable only for `dns` rules.
 
-          filters: The protocol or layer to evaluate the traffic, identity, and device posture
-              expressions.
+          filters: Specify the protocol or layer to evaluate the traffic, identity, and device
+              posture expressions. Can only contain a single value.
 
-          identity: The wirefilter expression used for identity matching.
+          identity: Specify the wirefilter expression used for identity matching. The API
+              automatically formats and sanitizes expressions before storing them. To prevent
+              Terraform state drift, use the formatted expression returned in the API
+              response.
 
-          precedence: Precedence sets the order of your rules. Lower values indicate higher
-              precedence. At each processing phase, applicable rules are evaluated in
-              ascending order of this value.
+          precedence: Set the order of your rules. Lower values indicate higher precedence. At each
+              processing phase, evaluate applicable rules in ascending order of this value.
+              Refer to
+              [Order of enforcement](http://developers.cloudflare.com/learning-paths/secure-internet-traffic/understand-policies/order-of-enforcement/#manage-precedence-with-terraform)
+              to manage precedence via Terraform.
 
-          rule_settings: Additional settings that modify the rule's action.
+          rule_settings: Defines settings for this rule. Settings apply only to specific rule types and
+              must use compatible selectors. If Terraform detects drift, confirm the setting
+              supports your rule type and check whether the API modifies the value. Use
+              API-returned values in your configuration to prevent drift.
 
-          schedule: The schedule for activating DNS policies. This does not apply to HTTP or network
-              policies.
+          schedule: Defines the schedule for activating DNS policies. Settable only for `dns` and
+              `dns_resolver` rules.
 
-          traffic: The wirefilter expression used for traffic matching.
+          traffic: Specify the wirefilter expression used for traffic matching. The API
+              automatically formats and sanitizes expressions before storing them. To prevent
+              Terraform state drift, use the formatted expression returned in the API
+              response.
 
           extra_headers: Send extra headers
 
@@ -242,6 +290,7 @@ def update(
                     "description": description,
                     "device_posture": device_posture,
                     "enabled": enabled,
+                    "expiration": expiration,
                     "filters": filters,
                     "identity": identity,
                     "precedence": precedence,
@@ -270,10 +319,10 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[GatewayRule]:
         """
-        Fetches the Zero Trust Gateway rules for an account.
+        List Zero Trust Gateway rules for an account.
 
         Args:
           extra_headers: Send extra headers
@@ -305,13 +354,13 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RuleDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
-        Deletes a Zero Trust Gateway rule.
+        Delete a Zero Trust Gateway rule.
 
         Args:
-          rule_id: The API resource UUID.
+          rule_id: Identify the API resource with a UUID.
 
           extra_headers: Send extra headers
 
@@ -325,21 +374,16 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not rule_id:
             raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
-        return cast(
-            Optional[RuleDeleteResponse],
-            self._delete(
-                f"/accounts/{account_id}/gateway/rules/{rule_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[RuleDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[RuleDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._delete(
+            f"/accounts/{account_id}/gateway/rules/{rule_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     def get(
@@ -352,13 +396,13 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewayRule]:
         """
-        Fetches a single Zero Trust Gateway rule.
+        Get a single Zero Trust Gateway rule.
 
         Args:
-          rule_id: The API resource UUID.
+          rule_id: Identify the API resource with a UUID.
 
           extra_headers: Send extra headers
 
@@ -384,14 +428,104 @@ def get(
             cast_to=cast(Type[Optional[GatewayRule]], ResultWrapper[GatewayRule]),
         )
 
+    def list_tenant(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[GatewayRule]:
+        """
+        List Zero Trust Gateway rules for the parent account of an account in the MSP
+        configuration.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/gateway/rules/tenant",
+            page=SyncSinglePage[GatewayRule],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=GatewayRule,
+        )
+
+    def reset_expiration(
+        self,
+        rule_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[GatewayRule]:
+        """
+        Resets the expiration of a Zero Trust Gateway Rule if its duration elapsed and
+        it has a default duration. The Zero Trust Gateway Rule must have values for both
+        `expiration.expires_at` and `expiration.duration`.
+
+        Args:
+          rule_id: Identify the API resource with a UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/gateway/rules/{rule_id}/reset_expiration",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[GatewayRule]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[GatewayRule]], ResultWrapper[GatewayRule]),
+        )
+
 
 class AsyncRulesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncRulesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRulesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRulesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRulesResourceWithStreamingResponse(self)
 
     async def create(
@@ -412,56 +546,76 @@ async def create(
             "override",
             "l4_override",
             "egress",
-            "audit_ssh",
             "resolve",
+            "quarantine",
+            "redirect",
         ],
         name: str,
-        description: str | NotGiven = NOT_GIVEN,
-        device_posture: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        filters: List[GatewayFilter] | NotGiven = NOT_GIVEN,
-        identity: str | NotGiven = NOT_GIVEN,
-        precedence: int | NotGiven = NOT_GIVEN,
-        rule_settings: RuleSettingParam | NotGiven = NOT_GIVEN,
-        schedule: ScheduleParam | NotGiven = NOT_GIVEN,
-        traffic: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        device_posture: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        expiration: Optional[rule_create_params.Expiration] | Omit = omit,
+        filters: List[GatewayFilter] | Omit = omit,
+        identity: str | Omit = omit,
+        precedence: int | Omit = omit,
+        rule_settings: RuleSettingParam | Omit = omit,
+        schedule: Optional[ScheduleParam] | Omit = omit,
+        traffic: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewayRule]:
         """
-        Creates a new Zero Trust Gateway rule.
+        Create a new Zero Trust Gateway rule.
 
         Args:
-          action: The action to preform when the associated traffic, identity, and device posture
-              expressions are either absent or evaluate to `true`.
+          action: Specify the action to perform when the associated traffic, identity, and device
+              posture expressions either absent or evaluate to `true`.
+
+          name: Specify the rule name.
 
-          name: The name of the rule.
+          description: Specify the rule description.
 
-          description: The description of the rule.
+          device_posture: Specify the wirefilter expression used for device posture check. The API
+              automatically formats and sanitizes expressions before storing them. To prevent
+              Terraform state drift, use the formatted expression returned in the API
+              response.
 
-          device_posture: The wirefilter expression used for device posture check matching.
+          enabled: Specify whether the rule is enabled.
 
-          enabled: True if the rule is enabled.
+          expiration: Defines the expiration time stamp and default duration of a DNS policy. Takes
+              precedence over the policy's `schedule` configuration, if any. This does not
+              apply to HTTP or network policies. Settable only for `dns` rules.
 
-          filters: The protocol or layer to evaluate the traffic, identity, and device posture
-              expressions.
+          filters: Specify the protocol or layer to evaluate the traffic, identity, and device
+              posture expressions. Can only contain a single value.
 
-          identity: The wirefilter expression used for identity matching.
+          identity: Specify the wirefilter expression used for identity matching. The API
+              automatically formats and sanitizes expressions before storing them. To prevent
+              Terraform state drift, use the formatted expression returned in the API
+              response.
 
-          precedence: Precedence sets the order of your rules. Lower values indicate higher
-              precedence. At each processing phase, applicable rules are evaluated in
-              ascending order of this value.
+          precedence: Set the order of your rules. Lower values indicate higher precedence. At each
+              processing phase, evaluate applicable rules in ascending order of this value.
+              Refer to
+              [Order of enforcement](http://developers.cloudflare.com/learning-paths/secure-internet-traffic/understand-policies/order-of-enforcement/#manage-precedence-with-terraform)
+              to manage precedence via Terraform.
 
-          rule_settings: Additional settings that modify the rule's action.
+          rule_settings: Defines settings for this rule. Settings apply only to specific rule types and
+              must use compatible selectors. If Terraform detects drift, confirm the setting
+              supports your rule type and check whether the API modifies the value. Use
+              API-returned values in your configuration to prevent drift.
 
-          schedule: The schedule for activating DNS policies. This does not apply to HTTP or network
-              policies.
+          schedule: Defines the schedule for activating DNS policies. Settable only for `dns` and
+              `dns_resolver` rules.
 
-          traffic: The wirefilter expression used for traffic matching.
+          traffic: Specify the wirefilter expression used for traffic matching. The API
+              automatically formats and sanitizes expressions before storing them. To prevent
+              Terraform state drift, use the formatted expression returned in the API
+              response.
 
           extra_headers: Send extra headers
 
@@ -482,6 +636,7 @@ async def create(
                     "description": description,
                     "device_posture": device_posture,
                     "enabled": enabled,
+                    "expiration": expiration,
                     "filters": filters,
                     "identity": identity,
                     "precedence": precedence,
@@ -520,58 +675,78 @@ async def update(
             "override",
             "l4_override",
             "egress",
-            "audit_ssh",
             "resolve",
+            "quarantine",
+            "redirect",
         ],
         name: str,
-        description: str | NotGiven = NOT_GIVEN,
-        device_posture: str | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        filters: List[GatewayFilter] | NotGiven = NOT_GIVEN,
-        identity: str | NotGiven = NOT_GIVEN,
-        precedence: int | NotGiven = NOT_GIVEN,
-        rule_settings: RuleSettingParam | NotGiven = NOT_GIVEN,
-        schedule: ScheduleParam | NotGiven = NOT_GIVEN,
-        traffic: str | NotGiven = NOT_GIVEN,
+        description: str | Omit = omit,
+        device_posture: str | Omit = omit,
+        enabled: bool | Omit = omit,
+        expiration: Optional[rule_update_params.Expiration] | Omit = omit,
+        filters: List[GatewayFilter] | Omit = omit,
+        identity: str | Omit = omit,
+        precedence: int | Omit = omit,
+        rule_settings: RuleSettingParam | Omit = omit,
+        schedule: Optional[ScheduleParam] | Omit = omit,
+        traffic: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewayRule]:
         """
-        Updates a configured Zero Trust Gateway rule.
+        Update a configured Zero Trust Gateway rule.
 
         Args:
-          rule_id: The API resource UUID.
+          rule_id: Identify the API resource with a UUID.
 
-          action: The action to preform when the associated traffic, identity, and device posture
-              expressions are either absent or evaluate to `true`.
+          action: Specify the action to perform when the associated traffic, identity, and device
+              posture expressions either absent or evaluate to `true`.
 
-          name: The name of the rule.
+          name: Specify the rule name.
 
-          description: The description of the rule.
+          description: Specify the rule description.
 
-          device_posture: The wirefilter expression used for device posture check matching.
+          device_posture: Specify the wirefilter expression used for device posture check. The API
+              automatically formats and sanitizes expressions before storing them. To prevent
+              Terraform state drift, use the formatted expression returned in the API
+              response.
 
-          enabled: True if the rule is enabled.
+          enabled: Specify whether the rule is enabled.
 
-          filters: The protocol or layer to evaluate the traffic, identity, and device posture
-              expressions.
+          expiration: Defines the expiration time stamp and default duration of a DNS policy. Takes
+              precedence over the policy's `schedule` configuration, if any. This does not
+              apply to HTTP or network policies. Settable only for `dns` rules.
 
-          identity: The wirefilter expression used for identity matching.
+          filters: Specify the protocol or layer to evaluate the traffic, identity, and device
+              posture expressions. Can only contain a single value.
 
-          precedence: Precedence sets the order of your rules. Lower values indicate higher
-              precedence. At each processing phase, applicable rules are evaluated in
-              ascending order of this value.
+          identity: Specify the wirefilter expression used for identity matching. The API
+              automatically formats and sanitizes expressions before storing them. To prevent
+              Terraform state drift, use the formatted expression returned in the API
+              response.
 
-          rule_settings: Additional settings that modify the rule's action.
+          precedence: Set the order of your rules. Lower values indicate higher precedence. At each
+              processing phase, evaluate applicable rules in ascending order of this value.
+              Refer to
+              [Order of enforcement](http://developers.cloudflare.com/learning-paths/secure-internet-traffic/understand-policies/order-of-enforcement/#manage-precedence-with-terraform)
+              to manage precedence via Terraform.
 
-          schedule: The schedule for activating DNS policies. This does not apply to HTTP or network
-              policies.
+          rule_settings: Defines settings for this rule. Settings apply only to specific rule types and
+              must use compatible selectors. If Terraform detects drift, confirm the setting
+              supports your rule type and check whether the API modifies the value. Use
+              API-returned values in your configuration to prevent drift.
 
-          traffic: The wirefilter expression used for traffic matching.
+          schedule: Defines the schedule for activating DNS policies. Settable only for `dns` and
+              `dns_resolver` rules.
+
+          traffic: Specify the wirefilter expression used for traffic matching. The API
+              automatically formats and sanitizes expressions before storing them. To prevent
+              Terraform state drift, use the formatted expression returned in the API
+              response.
 
           extra_headers: Send extra headers
 
@@ -594,6 +769,7 @@ async def update(
                     "description": description,
                     "device_posture": device_posture,
                     "enabled": enabled,
+                    "expiration": expiration,
                     "filters": filters,
                     "identity": identity,
                     "precedence": precedence,
@@ -622,10 +798,10 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[GatewayRule, AsyncSinglePage[GatewayRule]]:
         """
-        Fetches the Zero Trust Gateway rules for an account.
+        List Zero Trust Gateway rules for an account.
 
         Args:
           extra_headers: Send extra headers
@@ -657,13 +833,13 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RuleDeleteResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
-        Deletes a Zero Trust Gateway rule.
+        Delete a Zero Trust Gateway rule.
 
         Args:
-          rule_id: The API resource UUID.
+          rule_id: Identify the API resource with a UUID.
 
           extra_headers: Send extra headers
 
@@ -677,21 +853,16 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not rule_id:
             raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
-        return cast(
-            Optional[RuleDeleteResponse],
-            await self._delete(
-                f"/accounts/{account_id}/gateway/rules/{rule_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[RuleDeleteResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[RuleDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._delete(
+            f"/accounts/{account_id}/gateway/rules/{rule_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
     async def get(
@@ -704,13 +875,13 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[GatewayRule]:
         """
-        Fetches a single Zero Trust Gateway rule.
+        Get a single Zero Trust Gateway rule.
 
         Args:
-          rule_id: The API resource UUID.
+          rule_id: Identify the API resource with a UUID.
 
           extra_headers: Send extra headers
 
@@ -736,6 +907,85 @@ async def get(
             cast_to=cast(Type[Optional[GatewayRule]], ResultWrapper[GatewayRule]),
         )
 
+    def list_tenant(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[GatewayRule, AsyncSinglePage[GatewayRule]]:
+        """
+        List Zero Trust Gateway rules for the parent account of an account in the MSP
+        configuration.
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/gateway/rules/tenant",
+            page=AsyncSinglePage[GatewayRule],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=GatewayRule,
+        )
+
+    async def reset_expiration(
+        self,
+        rule_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[GatewayRule]:
+        """
+        Resets the expiration of a Zero Trust Gateway Rule if its duration elapsed and
+        it has a default duration. The Zero Trust Gateway Rule must have values for both
+        `expiration.expires_at` and `expiration.duration`.
+
+        Args:
+          rule_id: Identify the API resource with a UUID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not rule_id:
+            raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/gateway/rules/{rule_id}/reset_expiration",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[GatewayRule]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[GatewayRule]], ResultWrapper[GatewayRule]),
+        )
+
 
 class RulesResourceWithRawResponse:
     def __init__(self, rules: RulesResource) -> None:
@@ -756,6 +1006,12 @@ def __init__(self, rules: RulesResource) -> None:
         self.get = to_raw_response_wrapper(
             rules.get,
         )
+        self.list_tenant = to_raw_response_wrapper(
+            rules.list_tenant,
+        )
+        self.reset_expiration = to_raw_response_wrapper(
+            rules.reset_expiration,
+        )
 
 
 class AsyncRulesResourceWithRawResponse:
@@ -777,6 +1033,12 @@ def __init__(self, rules: AsyncRulesResource) -> None:
         self.get = async_to_raw_response_wrapper(
             rules.get,
         )
+        self.list_tenant = async_to_raw_response_wrapper(
+            rules.list_tenant,
+        )
+        self.reset_expiration = async_to_raw_response_wrapper(
+            rules.reset_expiration,
+        )
 
 
 class RulesResourceWithStreamingResponse:
@@ -798,6 +1060,12 @@ def __init__(self, rules: RulesResource) -> None:
         self.get = to_streamed_response_wrapper(
             rules.get,
         )
+        self.list_tenant = to_streamed_response_wrapper(
+            rules.list_tenant,
+        )
+        self.reset_expiration = to_streamed_response_wrapper(
+            rules.reset_expiration,
+        )
 
 
 class AsyncRulesResourceWithStreamingResponse:
@@ -819,3 +1087,9 @@ def __init__(self, rules: AsyncRulesResource) -> None:
         self.get = async_to_streamed_response_wrapper(
             rules.get,
         )
+        self.list_tenant = async_to_streamed_response_wrapper(
+            rules.list_tenant,
+        )
+        self.reset_expiration = async_to_streamed_response_wrapper(
+            rules.reset_expiration,
+        )
diff --git a/src/cloudflare/resources/zero_trust/identity_providers/__init__.py b/src/cloudflare/resources/zero_trust/identity_providers/__init__.py
new file mode 100644
index 00000000000..f35232c2d5c
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/identity_providers/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .scim import (
+    SCIMResource,
+    AsyncSCIMResource,
+    SCIMResourceWithRawResponse,
+    AsyncSCIMResourceWithRawResponse,
+    SCIMResourceWithStreamingResponse,
+    AsyncSCIMResourceWithStreamingResponse,
+)
+from .identity_providers import (
+    IdentityProvidersResource,
+    AsyncIdentityProvidersResource,
+    IdentityProvidersResourceWithRawResponse,
+    AsyncIdentityProvidersResourceWithRawResponse,
+    IdentityProvidersResourceWithStreamingResponse,
+    AsyncIdentityProvidersResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "SCIMResource",
+    "AsyncSCIMResource",
+    "SCIMResourceWithRawResponse",
+    "AsyncSCIMResourceWithRawResponse",
+    "SCIMResourceWithStreamingResponse",
+    "AsyncSCIMResourceWithStreamingResponse",
+    "IdentityProvidersResource",
+    "AsyncIdentityProvidersResource",
+    "IdentityProvidersResourceWithRawResponse",
+    "AsyncIdentityProvidersResourceWithRawResponse",
+    "IdentityProvidersResourceWithStreamingResponse",
+    "AsyncIdentityProvidersResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/identity_providers.py b/src/cloudflare/resources/zero_trust/identity_providers/identity_providers.py
similarity index 86%
rename from src/cloudflare/resources/zero_trust/identity_providers.py
rename to src/cloudflare/resources/zero_trust/identity_providers/identity_providers.py
index 48c9c7b9027..ca7fdc64a04 100644
--- a/src/cloudflare/resources/zero_trust/identity_providers.py
+++ b/src/cloudflare/resources/zero_trust/identity_providers/identity_providers.py
@@ -2,49 +2,70 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Optional, cast, overload
+from typing import Any, Type, Optional, cast
+from typing_extensions import overload
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    required_args,
-    maybe_transform,
-    async_maybe_transform,
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import required_args, maybe_transform, async_maybe_transform
+from .scim.scim import (
+    SCIMResource,
+    AsyncSCIMResource,
+    SCIMResourceWithRawResponse,
+    AsyncSCIMResourceWithRawResponse,
+    SCIMResourceWithStreamingResponse,
+    AsyncSCIMResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
     to_raw_response_wrapper,
     to_streamed_response_wrapper,
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._wrappers import ResultWrapper
-from ...pagination import SyncSinglePage, AsyncSinglePage
-from ..._base_client import AsyncPaginator, make_request_options
-from ...types.zero_trust import (
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.zero_trust import (
     IdentityProviderType,
+    identity_provider_list_params,
     identity_provider_create_params,
     identity_provider_update_params,
 )
-from ...types.zero_trust.identity_provider import IdentityProvider
-from ...types.zero_trust.scim_config_param import SCIMConfigParam
-from ...types.zero_trust.identity_provider_type import IdentityProviderType
-from ...types.zero_trust.generic_oauth_config_param import GenericOAuthConfigParam
-from ...types.zero_trust.identity_provider_list_response import IdentityProviderListResponse
-from ...types.zero_trust.identity_provider_delete_response import IdentityProviderDeleteResponse
+from ....types.zero_trust.identity_provider import IdentityProvider
+from ....types.zero_trust.identity_provider_type import IdentityProviderType
+from ....types.zero_trust.generic_oauth_config_param import GenericOAuthConfigParam
+from ....types.zero_trust.identity_provider_list_response import IdentityProviderListResponse
+from ....types.zero_trust.identity_provider_delete_response import IdentityProviderDeleteResponse
+from ....types.zero_trust.identity_provider_scim_config_param import IdentityProviderSCIMConfigParam
 
 __all__ = ["IdentityProvidersResource", "AsyncIdentityProvidersResource"]
 
 
 class IdentityProvidersResource(SyncAPIResource):
+    @cached_property
+    def scim(self) -> SCIMResource:
+        return SCIMResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> IdentityProvidersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return IdentityProvidersResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> IdentityProvidersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return IdentityProvidersResourceWithStreamingResponse(self)
 
     @overload
@@ -54,16 +75,15 @@ def create(
         config: identity_provider_create_params.AzureADConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -83,8 +103,6 @@ def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -105,16 +123,15 @@ def create(
         config: identity_provider_create_params.AccessCentrifyConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -134,8 +151,6 @@ def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -156,16 +171,15 @@ def create(
         config: GenericOAuthConfigParam,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -185,8 +199,6 @@ def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -207,16 +219,15 @@ def create(
         config: GenericOAuthConfigParam,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -236,8 +247,6 @@ def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -258,16 +267,15 @@ def create(
         config: identity_provider_create_params.AccessGoogleConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -287,8 +295,6 @@ def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -309,16 +315,15 @@ def create(
         config: identity_provider_create_params.AccessGoogleAppsConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -338,8 +343,6 @@ def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -360,16 +363,15 @@ def create(
         config: GenericOAuthConfigParam,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -389,8 +391,6 @@ def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -411,16 +411,15 @@ def create(
         config: identity_provider_create_params.AccessOIDCConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -440,8 +439,6 @@ def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -462,16 +459,15 @@ def create(
         config: identity_provider_create_params.AccessOktaConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -491,8 +487,6 @@ def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -513,16 +507,15 @@ def create(
         config: identity_provider_create_params.AccessOneloginConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -542,8 +535,6 @@ def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -564,16 +555,15 @@ def create(
         config: identity_provider_create_params.AccessPingoneConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -593,8 +583,6 @@ def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -615,16 +603,15 @@ def create(
         config: identity_provider_create_params.AccessSAMLConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -644,8 +631,6 @@ def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -666,16 +651,15 @@ def create(
         config: GenericOAuthConfigParam,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -695,8 +679,6 @@ def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -714,19 +696,18 @@ def create(
     def create(
         self,
         *,
-        config: object,
+        config: identity_provider_create_params.AccessOnetimepinConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -746,8 +727,6 @@ def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -775,19 +754,18 @@ def create(
         | identity_provider_create_params.AccessOneloginConfig
         | identity_provider_create_params.AccessPingoneConfig
         | identity_provider_create_params.AccessSAMLConfig
-        | object,
+        | identity_provider_create_params.AccessOnetimepinConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
@@ -810,7 +788,6 @@ def create(
                         "config": config,
                         "name": name,
                         "type": type,
-                        "id": id,
                         "scim_config": scim_config,
                     },
                     identity_provider_create_params.IdentityProviderCreateParams,
@@ -836,22 +813,21 @@ def update(
         config: identity_provider_update_params.AzureADConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -867,8 +843,6 @@ def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -890,22 +864,21 @@ def update(
         config: identity_provider_update_params.AccessCentrifyConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -921,8 +894,6 @@ def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -944,22 +915,21 @@ def update(
         config: GenericOAuthConfigParam,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -975,8 +945,6 @@ def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -998,22 +966,21 @@ def update(
         config: GenericOAuthConfigParam,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -1029,8 +996,6 @@ def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -1052,22 +1017,21 @@ def update(
         config: identity_provider_update_params.AccessGoogleConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -1083,8 +1047,6 @@ def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -1106,22 +1068,21 @@ def update(
         config: identity_provider_update_params.AccessGoogleAppsConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -1137,8 +1098,6 @@ def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -1160,22 +1119,21 @@ def update(
         config: GenericOAuthConfigParam,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -1191,8 +1149,6 @@ def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -1214,22 +1170,21 @@ def update(
         config: identity_provider_update_params.AccessOIDCConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -1245,8 +1200,6 @@ def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -1268,22 +1221,21 @@ def update(
         config: identity_provider_update_params.AccessOktaConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -1299,8 +1251,6 @@ def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -1322,22 +1272,21 @@ def update(
         config: identity_provider_update_params.AccessOneloginConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -1353,8 +1302,6 @@ def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -1376,22 +1323,21 @@ def update(
         config: identity_provider_update_params.AccessPingoneConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -1407,8 +1353,6 @@ def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -1430,22 +1374,21 @@ def update(
         config: identity_provider_update_params.AccessSAMLConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -1461,8 +1404,6 @@ def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -1484,22 +1425,21 @@ def update(
         config: GenericOAuthConfigParam,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -1515,8 +1455,6 @@ def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -1535,25 +1473,24 @@ def update(
         self,
         identity_provider_id: str,
         *,
-        config: object,
+        config: identity_provider_update_params.AccessOnetimepinConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -1569,8 +1506,6 @@ def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -1599,19 +1534,18 @@ def update(
         | identity_provider_update_params.AccessOneloginConfig
         | identity_provider_update_params.AccessPingoneConfig
         | identity_provider_update_params.AccessSAMLConfig
-        | object,
+        | identity_provider_update_params.AccessOnetimepinConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         if not identity_provider_id:
             raise ValueError(
@@ -1638,7 +1572,6 @@ def update(
                         "config": config,
                         "name": name,
                         "type": type,
-                        "id": id,
                         "scim_config": scim_config,
                     },
                     identity_provider_update_params.IdentityProviderUpdateParams,
@@ -1659,15 +1592,18 @@ def update(
     def list(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        scim_enabled: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[IdentityProviderListResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[IdentityProviderListResponse]:
         """
         Lists all configured identity providers.
 
@@ -1676,6 +1612,13 @@ def list(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
+          scim_enabled: Indicates to Access to only retrieve identity providers that have the System for
+              Cross-Domain Identity Management (SCIM) enabled.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -1698,9 +1641,20 @@ def list(
             account_or_zone_id = zone_id
         return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/access/identity_providers",
-            page=SyncSinglePage[IdentityProviderListResponse],
+            page=SyncV4PagePaginationArray[IdentityProviderListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "scim_enabled": scim_enabled,
+                    },
+                    identity_provider_list_params.IdentityProviderListParams,
+                ),
             ),
             model=cast(
                 Any, IdentityProviderListResponse
@@ -1711,20 +1665,20 @@ def delete(
         self,
         identity_provider_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProviderDeleteResponse]:
         """
         Deletes an identity provider from Access.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -1770,20 +1724,20 @@ def get(
         self,
         identity_provider_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Fetches a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -1832,12 +1786,27 @@ def get(
 
 
 class AsyncIdentityProvidersResource(AsyncAPIResource):
+    @cached_property
+    def scim(self) -> AsyncSCIMResource:
+        return AsyncSCIMResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncIdentityProvidersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncIdentityProvidersResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncIdentityProvidersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncIdentityProvidersResourceWithStreamingResponse(self)
 
     @overload
@@ -1847,16 +1816,15 @@ async def create(
         config: identity_provider_create_params.AzureADConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -1876,8 +1844,6 @@ async def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -1898,16 +1864,15 @@ async def create(
         config: identity_provider_create_params.AccessCentrifyConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -1927,8 +1892,6 @@ async def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -1949,16 +1912,15 @@ async def create(
         config: GenericOAuthConfigParam,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -1978,8 +1940,6 @@ async def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -2000,16 +1960,15 @@ async def create(
         config: GenericOAuthConfigParam,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -2029,8 +1988,6 @@ async def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -2051,16 +2008,15 @@ async def create(
         config: identity_provider_create_params.AccessGoogleConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -2080,8 +2036,6 @@ async def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -2102,16 +2056,15 @@ async def create(
         config: identity_provider_create_params.AccessGoogleAppsConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -2131,8 +2084,6 @@ async def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -2153,16 +2104,15 @@ async def create(
         config: GenericOAuthConfigParam,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -2182,8 +2132,6 @@ async def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -2204,16 +2152,15 @@ async def create(
         config: identity_provider_create_params.AccessOIDCConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -2233,8 +2180,6 @@ async def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -2255,16 +2200,15 @@ async def create(
         config: identity_provider_create_params.AccessOktaConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -2284,8 +2228,6 @@ async def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -2306,16 +2248,15 @@ async def create(
         config: identity_provider_create_params.AccessOneloginConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -2335,8 +2276,6 @@ async def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -2357,16 +2296,15 @@ async def create(
         config: identity_provider_create_params.AccessPingoneConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -2386,8 +2324,6 @@ async def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -2408,16 +2344,15 @@ async def create(
         config: identity_provider_create_params.AccessSAMLConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -2437,8 +2372,6 @@ async def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -2459,16 +2392,15 @@ async def create(
         config: GenericOAuthConfigParam,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -2488,8 +2420,6 @@ async def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -2507,19 +2437,18 @@ async def create(
     async def create(
         self,
         *,
-        config: object,
+        config: identity_provider_create_params.AccessOnetimepinConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Adds a new identity provider to Access.
@@ -2539,8 +2468,6 @@ async def create(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -2568,19 +2495,18 @@ async def create(
         | identity_provider_create_params.AccessOneloginConfig
         | identity_provider_create_params.AccessPingoneConfig
         | identity_provider_create_params.AccessSAMLConfig
-        | object,
+        | identity_provider_create_params.AccessOnetimepinConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         if account_id and zone_id:
             raise ValueError("You cannot provide both account_id and zone_id")
@@ -2603,7 +2529,6 @@ async def create(
                         "config": config,
                         "name": name,
                         "type": type,
-                        "id": id,
                         "scim_config": scim_config,
                     },
                     identity_provider_create_params.IdentityProviderCreateParams,
@@ -2629,22 +2554,21 @@ async def update(
         config: identity_provider_update_params.AzureADConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -2660,8 +2584,6 @@ async def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -2683,22 +2605,21 @@ async def update(
         config: identity_provider_update_params.AccessCentrifyConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -2714,8 +2635,6 @@ async def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -2737,22 +2656,21 @@ async def update(
         config: GenericOAuthConfigParam,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -2768,8 +2686,6 @@ async def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -2791,22 +2707,21 @@ async def update(
         config: GenericOAuthConfigParam,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -2822,8 +2737,6 @@ async def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -2845,22 +2758,21 @@ async def update(
         config: identity_provider_update_params.AccessGoogleConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -2876,8 +2788,6 @@ async def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -2899,22 +2809,21 @@ async def update(
         config: identity_provider_update_params.AccessGoogleAppsConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -2930,8 +2839,6 @@ async def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -2953,22 +2860,21 @@ async def update(
         config: GenericOAuthConfigParam,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -2984,8 +2890,6 @@ async def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -3007,22 +2911,21 @@ async def update(
         config: identity_provider_update_params.AccessOIDCConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -3038,8 +2941,6 @@ async def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -3061,22 +2962,21 @@ async def update(
         config: identity_provider_update_params.AccessOktaConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -3092,8 +2992,6 @@ async def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -3115,22 +3013,21 @@ async def update(
         config: identity_provider_update_params.AccessOneloginConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -3146,8 +3043,6 @@ async def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -3169,22 +3064,21 @@ async def update(
         config: identity_provider_update_params.AccessPingoneConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -3200,8 +3094,6 @@ async def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -3223,22 +3115,21 @@ async def update(
         config: identity_provider_update_params.AccessSAMLConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -3254,8 +3145,6 @@ async def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -3277,22 +3166,21 @@ async def update(
         config: GenericOAuthConfigParam,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -3308,8 +3196,6 @@ async def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -3328,25 +3214,24 @@ async def update(
         self,
         identity_provider_id: str,
         *,
-        config: object,
+        config: identity_provider_update_params.AccessOnetimepinConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Updates a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           config: The configuration parameters for the identity provider. To view the required
               parameters for a specific provider, refer to our
@@ -3362,8 +3247,6 @@ async def update(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
-          id: UUID
-
           scim_config: The configuration settings for enabling a System for Cross-Domain Identity
               Management (SCIM) with the identity provider.
 
@@ -3392,19 +3275,18 @@ async def update(
         | identity_provider_update_params.AccessOneloginConfig
         | identity_provider_update_params.AccessPingoneConfig
         | identity_provider_update_params.AccessSAMLConfig
-        | object,
+        | identity_provider_update_params.AccessOnetimepinConfig,
         name: str,
         type: IdentityProviderType,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        id: str | NotGiven = NOT_GIVEN,
-        scim_config: SCIMConfigParam | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        scim_config: IdentityProviderSCIMConfigParam | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         if not identity_provider_id:
             raise ValueError(
@@ -3431,7 +3313,6 @@ async def update(
                         "config": config,
                         "name": name,
                         "type": type,
-                        "id": id,
                         "scim_config": scim_config,
                     },
                     identity_provider_update_params.IdentityProviderUpdateParams,
@@ -3452,15 +3333,18 @@ async def update(
     def list(
         self,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        scim_enabled: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[IdentityProviderListResponse, AsyncSinglePage[IdentityProviderListResponse]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[IdentityProviderListResponse, AsyncV4PagePaginationArray[IdentityProviderListResponse]]:
         """
         Lists all configured identity providers.
 
@@ -3469,6 +3353,13 @@ def list(
 
           zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
 
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
+          scim_enabled: Indicates to Access to only retrieve identity providers that have the System for
+              Cross-Domain Identity Management (SCIM) enabled.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -3491,9 +3382,20 @@ def list(
             account_or_zone_id = zone_id
         return self._get_api_list(
             f"/{account_or_zone}/{account_or_zone_id}/access/identity_providers",
-            page=AsyncSinglePage[IdentityProviderListResponse],
+            page=AsyncV4PagePaginationArray[IdentityProviderListResponse],
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                        "scim_enabled": scim_enabled,
+                    },
+                    identity_provider_list_params.IdentityProviderListParams,
+                ),
             ),
             model=cast(
                 Any, IdentityProviderListResponse
@@ -3504,20 +3406,20 @@ async def delete(
         self,
         identity_provider_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProviderDeleteResponse]:
         """
         Deletes an identity provider from Access.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -3563,20 +3465,20 @@ async def get(
         self,
         identity_provider_id: str,
         *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IdentityProvider]:
         """
         Fetches a configured identity provider.
 
         Args:
-          identity_provider_id: UUID
+          identity_provider_id: UUID.
 
           account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
 
@@ -3644,6 +3546,10 @@ def __init__(self, identity_providers: IdentityProvidersResource) -> None:
             identity_providers.get,
         )
 
+    @cached_property
+    def scim(self) -> SCIMResourceWithRawResponse:
+        return SCIMResourceWithRawResponse(self._identity_providers.scim)
+
 
 class AsyncIdentityProvidersResourceWithRawResponse:
     def __init__(self, identity_providers: AsyncIdentityProvidersResource) -> None:
@@ -3665,6 +3571,10 @@ def __init__(self, identity_providers: AsyncIdentityProvidersResource) -> None:
             identity_providers.get,
         )
 
+    @cached_property
+    def scim(self) -> AsyncSCIMResourceWithRawResponse:
+        return AsyncSCIMResourceWithRawResponse(self._identity_providers.scim)
+
 
 class IdentityProvidersResourceWithStreamingResponse:
     def __init__(self, identity_providers: IdentityProvidersResource) -> None:
@@ -3686,6 +3596,10 @@ def __init__(self, identity_providers: IdentityProvidersResource) -> None:
             identity_providers.get,
         )
 
+    @cached_property
+    def scim(self) -> SCIMResourceWithStreamingResponse:
+        return SCIMResourceWithStreamingResponse(self._identity_providers.scim)
+
 
 class AsyncIdentityProvidersResourceWithStreamingResponse:
     def __init__(self, identity_providers: AsyncIdentityProvidersResource) -> None:
@@ -3706,3 +3620,7 @@ def __init__(self, identity_providers: AsyncIdentityProvidersResource) -> None:
         self.get = async_to_streamed_response_wrapper(
             identity_providers.get,
         )
+
+    @cached_property
+    def scim(self) -> AsyncSCIMResourceWithStreamingResponse:
+        return AsyncSCIMResourceWithStreamingResponse(self._identity_providers.scim)
diff --git a/src/cloudflare/resources/zero_trust/identity_providers/scim/__init__.py b/src/cloudflare/resources/zero_trust/identity_providers/scim/__init__.py
new file mode 100644
index 00000000000..187a6e97d8e
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/identity_providers/scim/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .scim import (
+    SCIMResource,
+    AsyncSCIMResource,
+    SCIMResourceWithRawResponse,
+    AsyncSCIMResourceWithRawResponse,
+    SCIMResourceWithStreamingResponse,
+    AsyncSCIMResourceWithStreamingResponse,
+)
+from .users import (
+    UsersResource,
+    AsyncUsersResource,
+    UsersResourceWithRawResponse,
+    AsyncUsersResourceWithRawResponse,
+    UsersResourceWithStreamingResponse,
+    AsyncUsersResourceWithStreamingResponse,
+)
+from .groups import (
+    GroupsResource,
+    AsyncGroupsResource,
+    GroupsResourceWithRawResponse,
+    AsyncGroupsResourceWithRawResponse,
+    GroupsResourceWithStreamingResponse,
+    AsyncGroupsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "GroupsResource",
+    "AsyncGroupsResource",
+    "GroupsResourceWithRawResponse",
+    "AsyncGroupsResourceWithRawResponse",
+    "GroupsResourceWithStreamingResponse",
+    "AsyncGroupsResourceWithStreamingResponse",
+    "UsersResource",
+    "AsyncUsersResource",
+    "UsersResourceWithRawResponse",
+    "AsyncUsersResourceWithRawResponse",
+    "UsersResourceWithStreamingResponse",
+    "AsyncUsersResourceWithStreamingResponse",
+    "SCIMResource",
+    "AsyncSCIMResource",
+    "SCIMResourceWithRawResponse",
+    "AsyncSCIMResourceWithRawResponse",
+    "SCIMResourceWithStreamingResponse",
+    "AsyncSCIMResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/identity_providers/scim/groups.py b/src/cloudflare/resources/zero_trust/identity_providers/scim/groups.py
new file mode 100644
index 00000000000..306e7a45343
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/identity_providers/scim/groups.py
@@ -0,0 +1,248 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from .....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.zero_trust.access.zero_trust_group import ZeroTrustGroup
+from .....types.zero_trust.identity_providers.scim import group_list_params
+
+__all__ = ["GroupsResource", "AsyncGroupsResource"]
+
+
+class GroupsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> GroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return GroupsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> GroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return GroupsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        identity_provider_id: str,
+        *,
+        account_id: str,
+        cf_resource_id: str | Omit = omit,
+        idp_resource_id: str | Omit = omit,
+        name: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[ZeroTrustGroup]:
+        """
+        Lists SCIM Group resources synced to Cloudflare via the System for Cross-domain
+        Identity Management (SCIM).
+
+        Args:
+          account_id: Identifier.
+
+          identity_provider_id: UUID.
+
+          cf_resource_id: The unique Cloudflare-generated Id of the SCIM Group resource; also known as the
+              "Id".
+
+          idp_resource_id: The IdP-generated Id of the SCIM Group resource; also known as the "external
+              Id".
+
+          name: The display name of the SCIM Group resource.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not identity_provider_id:
+            raise ValueError(
+                f"Expected a non-empty value for `identity_provider_id` but received {identity_provider_id!r}"
+            )
+        return self._get_api_list(
+            f"/accounts/{account_id}/access/identity_providers/{identity_provider_id}/scim/groups",
+            page=SyncV4PagePaginationArray[ZeroTrustGroup],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "cf_resource_id": cf_resource_id,
+                        "idp_resource_id": idp_resource_id,
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    group_list_params.GroupListParams,
+                ),
+            ),
+            model=ZeroTrustGroup,
+        )
+
+
+class AsyncGroupsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncGroupsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncGroupsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncGroupsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncGroupsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        identity_provider_id: str,
+        *,
+        account_id: str,
+        cf_resource_id: str | Omit = omit,
+        idp_resource_id: str | Omit = omit,
+        name: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[ZeroTrustGroup, AsyncV4PagePaginationArray[ZeroTrustGroup]]:
+        """
+        Lists SCIM Group resources synced to Cloudflare via the System for Cross-domain
+        Identity Management (SCIM).
+
+        Args:
+          account_id: Identifier.
+
+          identity_provider_id: UUID.
+
+          cf_resource_id: The unique Cloudflare-generated Id of the SCIM Group resource; also known as the
+              "Id".
+
+          idp_resource_id: The IdP-generated Id of the SCIM Group resource; also known as the "external
+              Id".
+
+          name: The display name of the SCIM Group resource.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not identity_provider_id:
+            raise ValueError(
+                f"Expected a non-empty value for `identity_provider_id` but received {identity_provider_id!r}"
+            )
+        return self._get_api_list(
+            f"/accounts/{account_id}/access/identity_providers/{identity_provider_id}/scim/groups",
+            page=AsyncV4PagePaginationArray[ZeroTrustGroup],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "cf_resource_id": cf_resource_id,
+                        "idp_resource_id": idp_resource_id,
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    group_list_params.GroupListParams,
+                ),
+            ),
+            model=ZeroTrustGroup,
+        )
+
+
+class GroupsResourceWithRawResponse:
+    def __init__(self, groups: GroupsResource) -> None:
+        self._groups = groups
+
+        self.list = to_raw_response_wrapper(
+            groups.list,
+        )
+
+
+class AsyncGroupsResourceWithRawResponse:
+    def __init__(self, groups: AsyncGroupsResource) -> None:
+        self._groups = groups
+
+        self.list = async_to_raw_response_wrapper(
+            groups.list,
+        )
+
+
+class GroupsResourceWithStreamingResponse:
+    def __init__(self, groups: GroupsResource) -> None:
+        self._groups = groups
+
+        self.list = to_streamed_response_wrapper(
+            groups.list,
+        )
+
+
+class AsyncGroupsResourceWithStreamingResponse:
+    def __init__(self, groups: AsyncGroupsResource) -> None:
+        self._groups = groups
+
+        self.list = async_to_streamed_response_wrapper(
+            groups.list,
+        )
diff --git a/src/cloudflare/resources/zero_trust/identity_providers/scim/scim.py b/src/cloudflare/resources/zero_trust/identity_providers/scim/scim.py
new file mode 100644
index 00000000000..2ad46a7e9e8
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/identity_providers/scim/scim.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .users import (
+    UsersResource,
+    AsyncUsersResource,
+    UsersResourceWithRawResponse,
+    AsyncUsersResourceWithRawResponse,
+    UsersResourceWithStreamingResponse,
+    AsyncUsersResourceWithStreamingResponse,
+)
+from .groups import (
+    GroupsResource,
+    AsyncGroupsResource,
+    GroupsResourceWithRawResponse,
+    AsyncGroupsResourceWithRawResponse,
+    GroupsResourceWithStreamingResponse,
+    AsyncGroupsResourceWithStreamingResponse,
+)
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+
+__all__ = ["SCIMResource", "AsyncSCIMResource"]
+
+
+class SCIMResource(SyncAPIResource):
+    @cached_property
+    def groups(self) -> GroupsResource:
+        return GroupsResource(self._client)
+
+    @cached_property
+    def users(self) -> UsersResource:
+        return UsersResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> SCIMResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SCIMResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SCIMResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SCIMResourceWithStreamingResponse(self)
+
+
+class AsyncSCIMResource(AsyncAPIResource):
+    @cached_property
+    def groups(self) -> AsyncGroupsResource:
+        return AsyncGroupsResource(self._client)
+
+    @cached_property
+    def users(self) -> AsyncUsersResource:
+        return AsyncUsersResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncSCIMResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSCIMResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSCIMResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSCIMResourceWithStreamingResponse(self)
+
+
+class SCIMResourceWithRawResponse:
+    def __init__(self, scim: SCIMResource) -> None:
+        self._scim = scim
+
+    @cached_property
+    def groups(self) -> GroupsResourceWithRawResponse:
+        return GroupsResourceWithRawResponse(self._scim.groups)
+
+    @cached_property
+    def users(self) -> UsersResourceWithRawResponse:
+        return UsersResourceWithRawResponse(self._scim.users)
+
+
+class AsyncSCIMResourceWithRawResponse:
+    def __init__(self, scim: AsyncSCIMResource) -> None:
+        self._scim = scim
+
+    @cached_property
+    def groups(self) -> AsyncGroupsResourceWithRawResponse:
+        return AsyncGroupsResourceWithRawResponse(self._scim.groups)
+
+    @cached_property
+    def users(self) -> AsyncUsersResourceWithRawResponse:
+        return AsyncUsersResourceWithRawResponse(self._scim.users)
+
+
+class SCIMResourceWithStreamingResponse:
+    def __init__(self, scim: SCIMResource) -> None:
+        self._scim = scim
+
+    @cached_property
+    def groups(self) -> GroupsResourceWithStreamingResponse:
+        return GroupsResourceWithStreamingResponse(self._scim.groups)
+
+    @cached_property
+    def users(self) -> UsersResourceWithStreamingResponse:
+        return UsersResourceWithStreamingResponse(self._scim.users)
+
+
+class AsyncSCIMResourceWithStreamingResponse:
+    def __init__(self, scim: AsyncSCIMResource) -> None:
+        self._scim = scim
+
+    @cached_property
+    def groups(self) -> AsyncGroupsResourceWithStreamingResponse:
+        return AsyncGroupsResourceWithStreamingResponse(self._scim.groups)
+
+    @cached_property
+    def users(self) -> AsyncUsersResourceWithStreamingResponse:
+        return AsyncUsersResourceWithStreamingResponse(self._scim.users)
diff --git a/src/cloudflare/resources/zero_trust/identity_providers/scim/users.py b/src/cloudflare/resources/zero_trust/identity_providers/scim/users.py
new file mode 100644
index 00000000000..3f1736acb2a
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/identity_providers/scim/users.py
@@ -0,0 +1,262 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from .....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.zero_trust.access.access_user import AccessUser
+from .....types.zero_trust.identity_providers.scim import user_list_params
+
+__all__ = ["UsersResource", "AsyncUsersResource"]
+
+
+class UsersResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> UsersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return UsersResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> UsersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return UsersResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        identity_provider_id: str,
+        *,
+        account_id: str,
+        cf_resource_id: str | Omit = omit,
+        email: str | Omit = omit,
+        idp_resource_id: str | Omit = omit,
+        name: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        username: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[AccessUser]:
+        """
+        Lists SCIM User resources synced to Cloudflare via the System for Cross-domain
+        Identity Management (SCIM).
+
+        Args:
+          account_id: Identifier.
+
+          identity_provider_id: UUID.
+
+          cf_resource_id: The unique Cloudflare-generated Id of the SCIM User resource; also known as the
+              "Id".
+
+          email: The email address of the SCIM User resource.
+
+          idp_resource_id: The IdP-generated Id of the SCIM User resource; also known as the "external Id".
+
+          name: The name of the SCIM User resource.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
+          username: The username of the SCIM User resource.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not identity_provider_id:
+            raise ValueError(
+                f"Expected a non-empty value for `identity_provider_id` but received {identity_provider_id!r}"
+            )
+        return self._get_api_list(
+            f"/accounts/{account_id}/access/identity_providers/{identity_provider_id}/scim/users",
+            page=SyncV4PagePaginationArray[AccessUser],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "cf_resource_id": cf_resource_id,
+                        "email": email,
+                        "idp_resource_id": idp_resource_id,
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                        "username": username,
+                    },
+                    user_list_params.UserListParams,
+                ),
+            ),
+            model=AccessUser,
+        )
+
+
+class AsyncUsersResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncUsersResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncUsersResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncUsersResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncUsersResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        identity_provider_id: str,
+        *,
+        account_id: str,
+        cf_resource_id: str | Omit = omit,
+        email: str | Omit = omit,
+        idp_resource_id: str | Omit = omit,
+        name: str | Omit = omit,
+        page: int | Omit = omit,
+        per_page: int | Omit = omit,
+        username: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[AccessUser, AsyncV4PagePaginationArray[AccessUser]]:
+        """
+        Lists SCIM User resources synced to Cloudflare via the System for Cross-domain
+        Identity Management (SCIM).
+
+        Args:
+          account_id: Identifier.
+
+          identity_provider_id: UUID.
+
+          cf_resource_id: The unique Cloudflare-generated Id of the SCIM User resource; also known as the
+              "Id".
+
+          email: The email address of the SCIM User resource.
+
+          idp_resource_id: The IdP-generated Id of the SCIM User resource; also known as the "external Id".
+
+          name: The name of the SCIM User resource.
+
+          page: Page number of results.
+
+          per_page: Number of results per page.
+
+          username: The username of the SCIM User resource.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not identity_provider_id:
+            raise ValueError(
+                f"Expected a non-empty value for `identity_provider_id` but received {identity_provider_id!r}"
+            )
+        return self._get_api_list(
+            f"/accounts/{account_id}/access/identity_providers/{identity_provider_id}/scim/users",
+            page=AsyncV4PagePaginationArray[AccessUser],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "cf_resource_id": cf_resource_id,
+                        "email": email,
+                        "idp_resource_id": idp_resource_id,
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                        "username": username,
+                    },
+                    user_list_params.UserListParams,
+                ),
+            ),
+            model=AccessUser,
+        )
+
+
+class UsersResourceWithRawResponse:
+    def __init__(self, users: UsersResource) -> None:
+        self._users = users
+
+        self.list = to_raw_response_wrapper(
+            users.list,
+        )
+
+
+class AsyncUsersResourceWithRawResponse:
+    def __init__(self, users: AsyncUsersResource) -> None:
+        self._users = users
+
+        self.list = async_to_raw_response_wrapper(
+            users.list,
+        )
+
+
+class UsersResourceWithStreamingResponse:
+    def __init__(self, users: UsersResource) -> None:
+        self._users = users
+
+        self.list = to_streamed_response_wrapper(
+            users.list,
+        )
+
+
+class AsyncUsersResourceWithStreamingResponse:
+    def __init__(self, users: AsyncUsersResource) -> None:
+        self._users = users
+
+        self.list = async_to_streamed_response_wrapper(
+            users.list,
+        )
diff --git a/src/cloudflare/resources/zero_trust/networks/__init__.py b/src/cloudflare/resources/zero_trust/networks/__init__.py
index 0672f0849f0..a1c303de4f7 100644
--- a/src/cloudflare/resources/zero_trust/networks/__init__.py
+++ b/src/cloudflare/resources/zero_trust/networks/__init__.py
@@ -8,6 +8,14 @@
     RoutesResourceWithStreamingResponse,
     AsyncRoutesResourceWithStreamingResponse,
 )
+from .subnets import (
+    SubnetsResource,
+    AsyncSubnetsResource,
+    SubnetsResourceWithRawResponse,
+    AsyncSubnetsResourceWithRawResponse,
+    SubnetsResourceWithStreamingResponse,
+    AsyncSubnetsResourceWithStreamingResponse,
+)
 from .networks import (
     NetworksResource,
     AsyncNetworksResource,
@@ -16,6 +24,14 @@
     NetworksResourceWithStreamingResponse,
     AsyncNetworksResourceWithStreamingResponse,
 )
+from .hostname_routes import (
+    HostnameRoutesResource,
+    AsyncHostnameRoutesResource,
+    HostnameRoutesResourceWithRawResponse,
+    AsyncHostnameRoutesResourceWithRawResponse,
+    HostnameRoutesResourceWithStreamingResponse,
+    AsyncHostnameRoutesResourceWithStreamingResponse,
+)
 from .virtual_networks import (
     VirtualNetworksResource,
     AsyncVirtualNetworksResource,
@@ -38,6 +54,18 @@
     "AsyncVirtualNetworksResourceWithRawResponse",
     "VirtualNetworksResourceWithStreamingResponse",
     "AsyncVirtualNetworksResourceWithStreamingResponse",
+    "SubnetsResource",
+    "AsyncSubnetsResource",
+    "SubnetsResourceWithRawResponse",
+    "AsyncSubnetsResourceWithRawResponse",
+    "SubnetsResourceWithStreamingResponse",
+    "AsyncSubnetsResourceWithStreamingResponse",
+    "HostnameRoutesResource",
+    "AsyncHostnameRoutesResource",
+    "HostnameRoutesResourceWithRawResponse",
+    "AsyncHostnameRoutesResourceWithRawResponse",
+    "HostnameRoutesResourceWithStreamingResponse",
+    "AsyncHostnameRoutesResourceWithStreamingResponse",
     "NetworksResource",
     "AsyncNetworksResource",
     "NetworksResourceWithRawResponse",
diff --git a/src/cloudflare/resources/zero_trust/networks/hostname_routes.py b/src/cloudflare/resources/zero_trust/networks/hostname_routes.py
new file mode 100644
index 00000000000..db22dd6bdf2
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/networks/hostname_routes.py
@@ -0,0 +1,723 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.zero_trust.networks import (
+    hostname_route_edit_params,
+    hostname_route_list_params,
+    hostname_route_create_params,
+)
+from ....types.zero_trust.networks.hostname_route import HostnameRoute
+
+__all__ = ["HostnameRoutesResource", "AsyncHostnameRoutesResource"]
+
+
+class HostnameRoutesResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> HostnameRoutesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return HostnameRoutesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> HostnameRoutesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return HostnameRoutesResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        comment: str | Omit = omit,
+        hostname: str | Omit = omit,
+        tunnel_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> HostnameRoute:
+        """
+        Create a hostname route.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          comment: An optional description of the hostname route.
+
+          hostname: The hostname of the route.
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/zerotrust/routes/hostname",
+            body=maybe_transform(
+                {
+                    "comment": comment,
+                    "hostname": hostname,
+                    "tunnel_id": tunnel_id,
+                },
+                hostname_route_create_params.HostnameRouteCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[HostnameRoute]._unwrapper,
+            ),
+            cast_to=cast(Type[HostnameRoute], ResultWrapper[HostnameRoute]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        id: str | Omit = omit,
+        comment: str | Omit = omit,
+        existed_at: str | Omit = omit,
+        hostname: str | Omit = omit,
+        is_deleted: bool | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        tunnel_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[HostnameRoute]:
+        """
+        Lists and filters hostname routes in an account.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          id: The hostname route ID.
+
+          comment: If set, only list hostname routes with the given comment.
+
+          existed_at: If provided, include only resources that were created (and not deleted) before
+              this time. URL encoded.
+
+          hostname: If set, only list hostname routes that contain a substring of the given value,
+              the filter is case-insensitive.
+
+          is_deleted: If `true`, only return deleted hostname routes. If `false`, exclude deleted
+              hostname routes.
+
+          page: Page number of paginated results.
+
+          per_page: Number of results to display.
+
+          tunnel_id: If set, only list hostname routes that point to a specific tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/zerotrust/routes/hostname",
+            page=SyncV4PagePaginationArray[HostnameRoute],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "id": id,
+                        "comment": comment,
+                        "existed_at": existed_at,
+                        "hostname": hostname,
+                        "is_deleted": is_deleted,
+                        "page": page,
+                        "per_page": per_page,
+                        "tunnel_id": tunnel_id,
+                    },
+                    hostname_route_list_params.HostnameRouteListParams,
+                ),
+            ),
+            model=HostnameRoute,
+        )
+
+    def delete(
+        self,
+        hostname_route_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> HostnameRoute:
+        """
+        Delete a hostname route.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          hostname_route_id: The hostname route ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not hostname_route_id:
+            raise ValueError(f"Expected a non-empty value for `hostname_route_id` but received {hostname_route_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/zerotrust/routes/hostname/{hostname_route_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[HostnameRoute]._unwrapper,
+            ),
+            cast_to=cast(Type[HostnameRoute], ResultWrapper[HostnameRoute]),
+        )
+
+    def edit(
+        self,
+        hostname_route_id: str,
+        *,
+        account_id: str,
+        comment: str | Omit = omit,
+        hostname: str | Omit = omit,
+        tunnel_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> HostnameRoute:
+        """
+        Updates a hostname route.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          hostname_route_id: The hostname route ID.
+
+          comment: An optional description of the hostname route.
+
+          hostname: The hostname of the route.
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not hostname_route_id:
+            raise ValueError(f"Expected a non-empty value for `hostname_route_id` but received {hostname_route_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/zerotrust/routes/hostname/{hostname_route_id}",
+            body=maybe_transform(
+                {
+                    "comment": comment,
+                    "hostname": hostname,
+                    "tunnel_id": tunnel_id,
+                },
+                hostname_route_edit_params.HostnameRouteEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[HostnameRoute]._unwrapper,
+            ),
+            cast_to=cast(Type[HostnameRoute], ResultWrapper[HostnameRoute]),
+        )
+
+    def get(
+        self,
+        hostname_route_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> HostnameRoute:
+        """
+        Get a hostname route.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          hostname_route_id: The hostname route ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not hostname_route_id:
+            raise ValueError(f"Expected a non-empty value for `hostname_route_id` but received {hostname_route_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/zerotrust/routes/hostname/{hostname_route_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[HostnameRoute]._unwrapper,
+            ),
+            cast_to=cast(Type[HostnameRoute], ResultWrapper[HostnameRoute]),
+        )
+
+
+class AsyncHostnameRoutesResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncHostnameRoutesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncHostnameRoutesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncHostnameRoutesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncHostnameRoutesResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        comment: str | Omit = omit,
+        hostname: str | Omit = omit,
+        tunnel_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> HostnameRoute:
+        """
+        Create a hostname route.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          comment: An optional description of the hostname route.
+
+          hostname: The hostname of the route.
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/zerotrust/routes/hostname",
+            body=await async_maybe_transform(
+                {
+                    "comment": comment,
+                    "hostname": hostname,
+                    "tunnel_id": tunnel_id,
+                },
+                hostname_route_create_params.HostnameRouteCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[HostnameRoute]._unwrapper,
+            ),
+            cast_to=cast(Type[HostnameRoute], ResultWrapper[HostnameRoute]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        id: str | Omit = omit,
+        comment: str | Omit = omit,
+        existed_at: str | Omit = omit,
+        hostname: str | Omit = omit,
+        is_deleted: bool | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        tunnel_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[HostnameRoute, AsyncV4PagePaginationArray[HostnameRoute]]:
+        """
+        Lists and filters hostname routes in an account.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          id: The hostname route ID.
+
+          comment: If set, only list hostname routes with the given comment.
+
+          existed_at: If provided, include only resources that were created (and not deleted) before
+              this time. URL encoded.
+
+          hostname: If set, only list hostname routes that contain a substring of the given value,
+              the filter is case-insensitive.
+
+          is_deleted: If `true`, only return deleted hostname routes. If `false`, exclude deleted
+              hostname routes.
+
+          page: Page number of paginated results.
+
+          per_page: Number of results to display.
+
+          tunnel_id: If set, only list hostname routes that point to a specific tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/zerotrust/routes/hostname",
+            page=AsyncV4PagePaginationArray[HostnameRoute],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "id": id,
+                        "comment": comment,
+                        "existed_at": existed_at,
+                        "hostname": hostname,
+                        "is_deleted": is_deleted,
+                        "page": page,
+                        "per_page": per_page,
+                        "tunnel_id": tunnel_id,
+                    },
+                    hostname_route_list_params.HostnameRouteListParams,
+                ),
+            ),
+            model=HostnameRoute,
+        )
+
+    async def delete(
+        self,
+        hostname_route_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> HostnameRoute:
+        """
+        Delete a hostname route.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          hostname_route_id: The hostname route ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not hostname_route_id:
+            raise ValueError(f"Expected a non-empty value for `hostname_route_id` but received {hostname_route_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/zerotrust/routes/hostname/{hostname_route_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[HostnameRoute]._unwrapper,
+            ),
+            cast_to=cast(Type[HostnameRoute], ResultWrapper[HostnameRoute]),
+        )
+
+    async def edit(
+        self,
+        hostname_route_id: str,
+        *,
+        account_id: str,
+        comment: str | Omit = omit,
+        hostname: str | Omit = omit,
+        tunnel_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> HostnameRoute:
+        """
+        Updates a hostname route.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          hostname_route_id: The hostname route ID.
+
+          comment: An optional description of the hostname route.
+
+          hostname: The hostname of the route.
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not hostname_route_id:
+            raise ValueError(f"Expected a non-empty value for `hostname_route_id` but received {hostname_route_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/zerotrust/routes/hostname/{hostname_route_id}",
+            body=await async_maybe_transform(
+                {
+                    "comment": comment,
+                    "hostname": hostname,
+                    "tunnel_id": tunnel_id,
+                },
+                hostname_route_edit_params.HostnameRouteEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[HostnameRoute]._unwrapper,
+            ),
+            cast_to=cast(Type[HostnameRoute], ResultWrapper[HostnameRoute]),
+        )
+
+    async def get(
+        self,
+        hostname_route_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> HostnameRoute:
+        """
+        Get a hostname route.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          hostname_route_id: The hostname route ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not hostname_route_id:
+            raise ValueError(f"Expected a non-empty value for `hostname_route_id` but received {hostname_route_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/zerotrust/routes/hostname/{hostname_route_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[HostnameRoute]._unwrapper,
+            ),
+            cast_to=cast(Type[HostnameRoute], ResultWrapper[HostnameRoute]),
+        )
+
+
+class HostnameRoutesResourceWithRawResponse:
+    def __init__(self, hostname_routes: HostnameRoutesResource) -> None:
+        self._hostname_routes = hostname_routes
+
+        self.create = to_raw_response_wrapper(
+            hostname_routes.create,
+        )
+        self.list = to_raw_response_wrapper(
+            hostname_routes.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            hostname_routes.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            hostname_routes.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            hostname_routes.get,
+        )
+
+
+class AsyncHostnameRoutesResourceWithRawResponse:
+    def __init__(self, hostname_routes: AsyncHostnameRoutesResource) -> None:
+        self._hostname_routes = hostname_routes
+
+        self.create = async_to_raw_response_wrapper(
+            hostname_routes.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            hostname_routes.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            hostname_routes.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            hostname_routes.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            hostname_routes.get,
+        )
+
+
+class HostnameRoutesResourceWithStreamingResponse:
+    def __init__(self, hostname_routes: HostnameRoutesResource) -> None:
+        self._hostname_routes = hostname_routes
+
+        self.create = to_streamed_response_wrapper(
+            hostname_routes.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            hostname_routes.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            hostname_routes.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            hostname_routes.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            hostname_routes.get,
+        )
+
+
+class AsyncHostnameRoutesResourceWithStreamingResponse:
+    def __init__(self, hostname_routes: AsyncHostnameRoutesResource) -> None:
+        self._hostname_routes = hostname_routes
+
+        self.create = async_to_streamed_response_wrapper(
+            hostname_routes.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            hostname_routes.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            hostname_routes.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            hostname_routes.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            hostname_routes.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/networks/networks.py b/src/cloudflare/resources/zero_trust/networks/networks.py
index 0fb746f07a6..1ca2ffb5b3d 100644
--- a/src/cloudflare/resources/zero_trust/networks/networks.py
+++ b/src/cloudflare/resources/zero_trust/networks/networks.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .routes import (
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .routes.routes import (
     RoutesResource,
     AsyncRoutesResource,
     RoutesResourceWithRawResponse,
@@ -10,9 +12,22 @@
     RoutesResourceWithStreamingResponse,
     AsyncRoutesResourceWithStreamingResponse,
 )
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from .routes.routes import RoutesResource, AsyncRoutesResource
+from .hostname_routes import (
+    HostnameRoutesResource,
+    AsyncHostnameRoutesResource,
+    HostnameRoutesResourceWithRawResponse,
+    AsyncHostnameRoutesResourceWithRawResponse,
+    HostnameRoutesResourceWithStreamingResponse,
+    AsyncHostnameRoutesResourceWithStreamingResponse,
+)
+from .subnets.subnets import (
+    SubnetsResource,
+    AsyncSubnetsResource,
+    SubnetsResourceWithRawResponse,
+    AsyncSubnetsResourceWithRawResponse,
+    SubnetsResourceWithStreamingResponse,
+    AsyncSubnetsResourceWithStreamingResponse,
+)
 from .virtual_networks import (
     VirtualNetworksResource,
     AsyncVirtualNetworksResource,
@@ -34,12 +49,31 @@ def routes(self) -> RoutesResource:
     def virtual_networks(self) -> VirtualNetworksResource:
         return VirtualNetworksResource(self._client)
 
+    @cached_property
+    def subnets(self) -> SubnetsResource:
+        return SubnetsResource(self._client)
+
+    @cached_property
+    def hostname_routes(self) -> HostnameRoutesResource:
+        return HostnameRoutesResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> NetworksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return NetworksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> NetworksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return NetworksResourceWithStreamingResponse(self)
 
 
@@ -52,12 +86,31 @@ def routes(self) -> AsyncRoutesResource:
     def virtual_networks(self) -> AsyncVirtualNetworksResource:
         return AsyncVirtualNetworksResource(self._client)
 
+    @cached_property
+    def subnets(self) -> AsyncSubnetsResource:
+        return AsyncSubnetsResource(self._client)
+
+    @cached_property
+    def hostname_routes(self) -> AsyncHostnameRoutesResource:
+        return AsyncHostnameRoutesResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncNetworksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncNetworksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncNetworksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncNetworksResourceWithStreamingResponse(self)
 
 
@@ -73,6 +126,14 @@ def routes(self) -> RoutesResourceWithRawResponse:
     def virtual_networks(self) -> VirtualNetworksResourceWithRawResponse:
         return VirtualNetworksResourceWithRawResponse(self._networks.virtual_networks)
 
+    @cached_property
+    def subnets(self) -> SubnetsResourceWithRawResponse:
+        return SubnetsResourceWithRawResponse(self._networks.subnets)
+
+    @cached_property
+    def hostname_routes(self) -> HostnameRoutesResourceWithRawResponse:
+        return HostnameRoutesResourceWithRawResponse(self._networks.hostname_routes)
+
 
 class AsyncNetworksResourceWithRawResponse:
     def __init__(self, networks: AsyncNetworksResource) -> None:
@@ -86,6 +147,14 @@ def routes(self) -> AsyncRoutesResourceWithRawResponse:
     def virtual_networks(self) -> AsyncVirtualNetworksResourceWithRawResponse:
         return AsyncVirtualNetworksResourceWithRawResponse(self._networks.virtual_networks)
 
+    @cached_property
+    def subnets(self) -> AsyncSubnetsResourceWithRawResponse:
+        return AsyncSubnetsResourceWithRawResponse(self._networks.subnets)
+
+    @cached_property
+    def hostname_routes(self) -> AsyncHostnameRoutesResourceWithRawResponse:
+        return AsyncHostnameRoutesResourceWithRawResponse(self._networks.hostname_routes)
+
 
 class NetworksResourceWithStreamingResponse:
     def __init__(self, networks: NetworksResource) -> None:
@@ -99,6 +168,14 @@ def routes(self) -> RoutesResourceWithStreamingResponse:
     def virtual_networks(self) -> VirtualNetworksResourceWithStreamingResponse:
         return VirtualNetworksResourceWithStreamingResponse(self._networks.virtual_networks)
 
+    @cached_property
+    def subnets(self) -> SubnetsResourceWithStreamingResponse:
+        return SubnetsResourceWithStreamingResponse(self._networks.subnets)
+
+    @cached_property
+    def hostname_routes(self) -> HostnameRoutesResourceWithStreamingResponse:
+        return HostnameRoutesResourceWithStreamingResponse(self._networks.hostname_routes)
+
 
 class AsyncNetworksResourceWithStreamingResponse:
     def __init__(self, networks: AsyncNetworksResource) -> None:
@@ -111,3 +188,11 @@ def routes(self) -> AsyncRoutesResourceWithStreamingResponse:
     @cached_property
     def virtual_networks(self) -> AsyncVirtualNetworksResourceWithStreamingResponse:
         return AsyncVirtualNetworksResourceWithStreamingResponse(self._networks.virtual_networks)
+
+    @cached_property
+    def subnets(self) -> AsyncSubnetsResourceWithStreamingResponse:
+        return AsyncSubnetsResourceWithStreamingResponse(self._networks.subnets)
+
+    @cached_property
+    def hostname_routes(self) -> AsyncHostnameRoutesResourceWithStreamingResponse:
+        return AsyncHostnameRoutesResourceWithStreamingResponse(self._networks.hostname_routes)
diff --git a/src/cloudflare/resources/zero_trust/networks/routes/ips.py b/src/cloudflare/resources/zero_trust/networks/routes/ips.py
index c0dfa2f679c..9641d3eda30 100644
--- a/src/cloudflare/resources/zero_trust/networks/routes/ips.py
+++ b/src/cloudflare/resources/zero_trust/networks/routes/ips.py
@@ -6,11 +6,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -30,10 +27,21 @@
 class IPsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> IPsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return IPsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> IPsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return IPsResourceWithStreamingResponse(self)
 
     def get(
@@ -41,13 +49,14 @@ def get(
         ip: str,
         *,
         account_id: str,
-        virtual_network_id: str | NotGiven = NOT_GIVEN,
+        default_virtual_network_fallback: bool | Omit = omit,
+        virtual_network_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Teamnet:
         """
         Fetches routes that contain the given IP address.
@@ -55,6 +64,11 @@ def get(
         Args:
           account_id: Cloudflare account ID
 
+          default_virtual_network_fallback: When the virtual_network_id parameter is not provided the request filter will
+              default search routes that are in the default virtual network for the account.
+              If this parameter is set to false, the search will include routes that do not
+              have a virtual network.
+
           virtual_network_id: UUID of the virtual network.
 
           extra_headers: Send extra headers
@@ -76,7 +90,13 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=maybe_transform({"virtual_network_id": virtual_network_id}, ip_get_params.IPGetParams),
+                query=maybe_transform(
+                    {
+                        "default_virtual_network_fallback": default_virtual_network_fallback,
+                        "virtual_network_id": virtual_network_id,
+                    },
+                    ip_get_params.IPGetParams,
+                ),
                 post_parser=ResultWrapper[Teamnet]._unwrapper,
             ),
             cast_to=cast(Type[Teamnet], ResultWrapper[Teamnet]),
@@ -86,10 +106,21 @@ def get(
 class AsyncIPsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncIPsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncIPsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncIPsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncIPsResourceWithStreamingResponse(self)
 
     async def get(
@@ -97,13 +128,14 @@ async def get(
         ip: str,
         *,
         account_id: str,
-        virtual_network_id: str | NotGiven = NOT_GIVEN,
+        default_virtual_network_fallback: bool | Omit = omit,
+        virtual_network_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Teamnet:
         """
         Fetches routes that contain the given IP address.
@@ -111,6 +143,11 @@ async def get(
         Args:
           account_id: Cloudflare account ID
 
+          default_virtual_network_fallback: When the virtual_network_id parameter is not provided the request filter will
+              default search routes that are in the default virtual network for the account.
+              If this parameter is set to false, the search will include routes that do not
+              have a virtual network.
+
           virtual_network_id: UUID of the virtual network.
 
           extra_headers: Send extra headers
@@ -133,7 +170,11 @@ async def get(
                 extra_body=extra_body,
                 timeout=timeout,
                 query=await async_maybe_transform(
-                    {"virtual_network_id": virtual_network_id}, ip_get_params.IPGetParams
+                    {
+                        "default_virtual_network_fallback": default_virtual_network_fallback,
+                        "virtual_network_id": virtual_network_id,
+                    },
+                    ip_get_params.IPGetParams,
                 ),
                 post_parser=ResultWrapper[Teamnet]._unwrapper,
             ),
diff --git a/src/cloudflare/resources/zero_trust/networks/routes/networks.py b/src/cloudflare/resources/zero_trust/networks/routes/networks.py
index 6363a91a951..3b9f9249a10 100644
--- a/src/cloudflare/resources/zero_trust/networks/routes/networks.py
+++ b/src/cloudflare/resources/zero_trust/networks/routes/networks.py
@@ -2,16 +2,14 @@
 
 from __future__ import annotations
 
+import typing_extensions
 from typing import Type, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -31,26 +29,40 @@
 class NetworksResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> NetworksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return NetworksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> NetworksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return NetworksResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "This endpoint and its related APIs are deprecated in favor of the equivalent Tunnel Route (without CIDR) APIs."
+    )
     def create(
         self,
         ip_network_encoded: str,
         *,
         account_id: str,
         tunnel_id: str,
-        comment: str | NotGiven = NOT_GIVEN,
-        virtual_network_id: str | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        virtual_network_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Route:
         """Routes a private network through a Cloudflare Tunnel.
 
@@ -100,20 +112,23 @@ def create(
             cast_to=cast(Type[Route], ResultWrapper[Route]),
         )
 
+    @typing_extensions.deprecated(
+        "This endpoint and its related APIs are deprecated in favor of the equivalent Tunnel Route (without CIDR) APIs."
+    )
     def delete(
         self,
         ip_network_encoded: str,
         *,
         account_id: str,
-        tun_type: Literal["cfd_tunnel", "warp_connector", "ip_sec", "gre", "cni"] | NotGiven = NOT_GIVEN,
-        tunnel_id: str | NotGiven = NOT_GIVEN,
-        virtual_network_id: str | NotGiven = NOT_GIVEN,
+        tun_type: Literal["cfd_tunnel", "warp_connector", "warp", "magic", "ip_sec", "gre", "cni"] | Omit = omit,
+        tunnel_id: str | Omit = omit,
+        virtual_network_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Route:
         """Deletes a private network route from an account.
 
@@ -168,6 +183,9 @@ def delete(
             cast_to=cast(Type[Route], ResultWrapper[Route]),
         )
 
+    @typing_extensions.deprecated(
+        "This endpoint and its related APIs are deprecated in favor of the equivalent Tunnel Route (without CIDR) APIs."
+    )
     def edit(
         self,
         ip_network_encoded: str,
@@ -178,7 +196,7 @@ def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Route:
         """Updates an existing private network route in an account.
 
@@ -218,26 +236,40 @@ def edit(
 class AsyncNetworksResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncNetworksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncNetworksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncNetworksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncNetworksResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "This endpoint and its related APIs are deprecated in favor of the equivalent Tunnel Route (without CIDR) APIs."
+    )
     async def create(
         self,
         ip_network_encoded: str,
         *,
         account_id: str,
         tunnel_id: str,
-        comment: str | NotGiven = NOT_GIVEN,
-        virtual_network_id: str | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        virtual_network_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Route:
         """Routes a private network through a Cloudflare Tunnel.
 
@@ -287,20 +319,23 @@ async def create(
             cast_to=cast(Type[Route], ResultWrapper[Route]),
         )
 
+    @typing_extensions.deprecated(
+        "This endpoint and its related APIs are deprecated in favor of the equivalent Tunnel Route (without CIDR) APIs."
+    )
     async def delete(
         self,
         ip_network_encoded: str,
         *,
         account_id: str,
-        tun_type: Literal["cfd_tunnel", "warp_connector", "ip_sec", "gre", "cni"] | NotGiven = NOT_GIVEN,
-        tunnel_id: str | NotGiven = NOT_GIVEN,
-        virtual_network_id: str | NotGiven = NOT_GIVEN,
+        tun_type: Literal["cfd_tunnel", "warp_connector", "warp", "magic", "ip_sec", "gre", "cni"] | Omit = omit,
+        tunnel_id: str | Omit = omit,
+        virtual_network_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Route:
         """Deletes a private network route from an account.
 
@@ -355,6 +390,9 @@ async def delete(
             cast_to=cast(Type[Route], ResultWrapper[Route]),
         )
 
+    @typing_extensions.deprecated(
+        "This endpoint and its related APIs are deprecated in favor of the equivalent Tunnel Route (without CIDR) APIs."
+    )
     async def edit(
         self,
         ip_network_encoded: str,
@@ -365,7 +403,7 @@ async def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Route:
         """Updates an existing private network route in an account.
 
@@ -406,14 +444,20 @@ class NetworksResourceWithRawResponse:
     def __init__(self, networks: NetworksResource) -> None:
         self._networks = networks
 
-        self.create = to_raw_response_wrapper(
-            networks.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                networks.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = to_raw_response_wrapper(
-            networks.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                networks.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = to_raw_response_wrapper(
-            networks.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                networks.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -421,14 +465,20 @@ class AsyncNetworksResourceWithRawResponse:
     def __init__(self, networks: AsyncNetworksResource) -> None:
         self._networks = networks
 
-        self.create = async_to_raw_response_wrapper(
-            networks.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                networks.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = async_to_raw_response_wrapper(
-            networks.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                networks.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = async_to_raw_response_wrapper(
-            networks.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                networks.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -436,14 +486,20 @@ class NetworksResourceWithStreamingResponse:
     def __init__(self, networks: NetworksResource) -> None:
         self._networks = networks
 
-        self.create = to_streamed_response_wrapper(
-            networks.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                networks.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = to_streamed_response_wrapper(
-            networks.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                networks.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = to_streamed_response_wrapper(
-            networks.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                networks.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -451,12 +507,18 @@ class AsyncNetworksResourceWithStreamingResponse:
     def __init__(self, networks: AsyncNetworksResource) -> None:
         self._networks = networks
 
-        self.create = async_to_streamed_response_wrapper(
-            networks.create,
+        self.create = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                networks.create,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.delete = async_to_streamed_response_wrapper(
-            networks.delete,
+        self.delete = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                networks.delete,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.edit = async_to_streamed_response_wrapper(
-            networks.edit,
+        self.edit = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                networks.edit,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/zero_trust/networks/routes/routes.py b/src/cloudflare/resources/zero_trust/networks/routes/routes.py
index d4d7cb45e53..e185d23080e 100644
--- a/src/cloudflare/resources/zero_trust/networks/routes/routes.py
+++ b/src/cloudflare/resources/zero_trust/networks/routes/routes.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from typing import Type, Union, cast
-from datetime import datetime
+from typing import List, Type, cast
+from typing_extensions import Literal
 
 import httpx
 
@@ -23,11 +23,8 @@
     NetworksResourceWithStreamingResponse,
     AsyncNetworksResourceWithStreamingResponse,
 )
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -57,10 +54,21 @@ def networks(self) -> NetworksResource:
 
     @cached_property
     def with_raw_response(self) -> RoutesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RoutesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RoutesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RoutesResourceWithStreamingResponse(self)
 
     def create(
@@ -69,14 +77,14 @@ def create(
         account_id: str,
         network: str,
         tunnel_id: str,
-        comment: str | NotGiven = NOT_GIVEN,
-        virtual_network_id: str | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        virtual_network_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Route:
         """
         Routes a private network through a Cloudflare Tunnel.
@@ -127,23 +135,23 @@ def list(
         self,
         *,
         account_id: str,
-        comment: str | NotGiven = NOT_GIVEN,
-        existed_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        is_deleted: bool | NotGiven = NOT_GIVEN,
-        network_subset: str | NotGiven = NOT_GIVEN,
-        network_superset: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        route_id: str | NotGiven = NOT_GIVEN,
-        tun_types: str | NotGiven = NOT_GIVEN,
-        tunnel_id: str | NotGiven = NOT_GIVEN,
-        virtual_network_id: str | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        existed_at: str | Omit = omit,
+        is_deleted: bool | Omit = omit,
+        network_subset: str | Omit = omit,
+        network_superset: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        route_id: str | Omit = omit,
+        tun_types: List[Literal["cfd_tunnel", "warp_connector", "warp", "magic", "ip_sec", "gre", "cni"]] | Omit = omit,
+        tunnel_id: str | Omit = omit,
+        virtual_network_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[Teamnet]:
         """
         Lists and filters private network routes in an account.
@@ -153,8 +161,8 @@ def list(
 
           comment: Optional remark describing the route.
 
-          existed_at: If provided, include only tunnels that were created (and not deleted) before
-              this time.
+          existed_at: If provided, include only resources that were created (and not deleted) before
+              this time. URL encoded.
 
           is_deleted: If `true`, only include deleted routes. If `false`, exclude deleted routes. If
               empty, all routes will be included.
@@ -169,7 +177,7 @@ def list(
 
           route_id: UUID of the route.
 
-          tun_types: The types of tunnels to filter separated by a comma.
+          tun_types: The types of tunnels to filter by, separated by commas.
 
           tunnel_id: UUID of the tunnel.
 
@@ -223,7 +231,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Route:
         """
         Deletes a private network route from an account.
@@ -262,16 +270,16 @@ def edit(
         route_id: str,
         *,
         account_id: str,
-        comment: str | NotGiven = NOT_GIVEN,
-        network: str | NotGiven = NOT_GIVEN,
-        tunnel_id: str | NotGiven = NOT_GIVEN,
-        virtual_network_id: str | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        network: str | Omit = omit,
+        tunnel_id: str | Omit = omit,
+        virtual_network_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Route:
         """Updates an existing private network route in an account.
 
@@ -324,6 +332,50 @@ def edit(
             cast_to=cast(Type[Route], ResultWrapper[Route]),
         )
 
+    def get(
+        self,
+        route_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Route:
+        """
+        Get a private network route in an account.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          route_id: UUID of the route.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not route_id:
+            raise ValueError(f"Expected a non-empty value for `route_id` but received {route_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/teamnet/routes/{route_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Route]._unwrapper,
+            ),
+            cast_to=cast(Type[Route], ResultWrapper[Route]),
+        )
+
 
 class AsyncRoutesResource(AsyncAPIResource):
     @cached_property
@@ -336,10 +388,21 @@ def networks(self) -> AsyncNetworksResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncRoutesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRoutesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRoutesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRoutesResourceWithStreamingResponse(self)
 
     async def create(
@@ -348,14 +411,14 @@ async def create(
         account_id: str,
         network: str,
         tunnel_id: str,
-        comment: str | NotGiven = NOT_GIVEN,
-        virtual_network_id: str | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        virtual_network_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Route:
         """
         Routes a private network through a Cloudflare Tunnel.
@@ -406,23 +469,23 @@ def list(
         self,
         *,
         account_id: str,
-        comment: str | NotGiven = NOT_GIVEN,
-        existed_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        is_deleted: bool | NotGiven = NOT_GIVEN,
-        network_subset: str | NotGiven = NOT_GIVEN,
-        network_superset: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        route_id: str | NotGiven = NOT_GIVEN,
-        tun_types: str | NotGiven = NOT_GIVEN,
-        tunnel_id: str | NotGiven = NOT_GIVEN,
-        virtual_network_id: str | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        existed_at: str | Omit = omit,
+        is_deleted: bool | Omit = omit,
+        network_subset: str | Omit = omit,
+        network_superset: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        route_id: str | Omit = omit,
+        tun_types: List[Literal["cfd_tunnel", "warp_connector", "warp", "magic", "ip_sec", "gre", "cni"]] | Omit = omit,
+        tunnel_id: str | Omit = omit,
+        virtual_network_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Teamnet, AsyncV4PagePaginationArray[Teamnet]]:
         """
         Lists and filters private network routes in an account.
@@ -432,8 +495,8 @@ def list(
 
           comment: Optional remark describing the route.
 
-          existed_at: If provided, include only tunnels that were created (and not deleted) before
-              this time.
+          existed_at: If provided, include only resources that were created (and not deleted) before
+              this time. URL encoded.
 
           is_deleted: If `true`, only include deleted routes. If `false`, exclude deleted routes. If
               empty, all routes will be included.
@@ -448,7 +511,7 @@ def list(
 
           route_id: UUID of the route.
 
-          tun_types: The types of tunnels to filter separated by a comma.
+          tun_types: The types of tunnels to filter by, separated by commas.
 
           tunnel_id: UUID of the tunnel.
 
@@ -502,7 +565,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Route:
         """
         Deletes a private network route from an account.
@@ -541,16 +604,16 @@ async def edit(
         route_id: str,
         *,
         account_id: str,
-        comment: str | NotGiven = NOT_GIVEN,
-        network: str | NotGiven = NOT_GIVEN,
-        tunnel_id: str | NotGiven = NOT_GIVEN,
-        virtual_network_id: str | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        network: str | Omit = omit,
+        tunnel_id: str | Omit = omit,
+        virtual_network_id: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Route:
         """Updates an existing private network route in an account.
 
@@ -603,6 +666,50 @@ async def edit(
             cast_to=cast(Type[Route], ResultWrapper[Route]),
         )
 
+    async def get(
+        self,
+        route_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Route:
+        """
+        Get a private network route in an account.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          route_id: UUID of the route.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not route_id:
+            raise ValueError(f"Expected a non-empty value for `route_id` but received {route_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/teamnet/routes/{route_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Route]._unwrapper,
+            ),
+            cast_to=cast(Type[Route], ResultWrapper[Route]),
+        )
+
 
 class RoutesResourceWithRawResponse:
     def __init__(self, routes: RoutesResource) -> None:
@@ -620,6 +727,9 @@ def __init__(self, routes: RoutesResource) -> None:
         self.edit = to_raw_response_wrapper(
             routes.edit,
         )
+        self.get = to_raw_response_wrapper(
+            routes.get,
+        )
 
     @cached_property
     def ips(self) -> IPsResourceWithRawResponse:
@@ -646,6 +756,9 @@ def __init__(self, routes: AsyncRoutesResource) -> None:
         self.edit = async_to_raw_response_wrapper(
             routes.edit,
         )
+        self.get = async_to_raw_response_wrapper(
+            routes.get,
+        )
 
     @cached_property
     def ips(self) -> AsyncIPsResourceWithRawResponse:
@@ -672,6 +785,9 @@ def __init__(self, routes: RoutesResource) -> None:
         self.edit = to_streamed_response_wrapper(
             routes.edit,
         )
+        self.get = to_streamed_response_wrapper(
+            routes.get,
+        )
 
     @cached_property
     def ips(self) -> IPsResourceWithStreamingResponse:
@@ -698,6 +814,9 @@ def __init__(self, routes: AsyncRoutesResource) -> None:
         self.edit = async_to_streamed_response_wrapper(
             routes.edit,
         )
+        self.get = async_to_streamed_response_wrapper(
+            routes.get,
+        )
 
     @cached_property
     def ips(self) -> AsyncIPsResourceWithStreamingResponse:
diff --git a/src/cloudflare/resources/zero_trust/networks/subnets/__init__.py b/src/cloudflare/resources/zero_trust/networks/subnets/__init__.py
new file mode 100644
index 00000000000..3af4ace5d3b
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/networks/subnets/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .subnets import (
+    SubnetsResource,
+    AsyncSubnetsResource,
+    SubnetsResourceWithRawResponse,
+    AsyncSubnetsResourceWithRawResponse,
+    SubnetsResourceWithStreamingResponse,
+    AsyncSubnetsResourceWithStreamingResponse,
+)
+from .cloudflare_source import (
+    CloudflareSourceResource,
+    AsyncCloudflareSourceResource,
+    CloudflareSourceResourceWithRawResponse,
+    AsyncCloudflareSourceResourceWithRawResponse,
+    CloudflareSourceResourceWithStreamingResponse,
+    AsyncCloudflareSourceResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "CloudflareSourceResource",
+    "AsyncCloudflareSourceResource",
+    "CloudflareSourceResourceWithRawResponse",
+    "AsyncCloudflareSourceResourceWithRawResponse",
+    "CloudflareSourceResourceWithStreamingResponse",
+    "AsyncCloudflareSourceResourceWithStreamingResponse",
+    "SubnetsResource",
+    "AsyncSubnetsResource",
+    "SubnetsResourceWithRawResponse",
+    "AsyncSubnetsResourceWithRawResponse",
+    "SubnetsResourceWithStreamingResponse",
+    "AsyncSubnetsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/networks/subnets/cloudflare_source.py b/src/cloudflare/resources/zero_trust/networks/subnets/cloudflare_source.py
new file mode 100644
index 00000000000..9245c6df3f9
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/networks/subnets/cloudflare_source.py
@@ -0,0 +1,225 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.zero_trust.networks.subnets import cloudflare_source_update_params
+from .....types.zero_trust.networks.subnets.cloudflare_source_update_response import CloudflareSourceUpdateResponse
+
+__all__ = ["CloudflareSourceResource", "AsyncCloudflareSourceResource"]
+
+
+class CloudflareSourceResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> CloudflareSourceResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CloudflareSourceResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CloudflareSourceResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CloudflareSourceResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        address_family: Literal["v4", "v6"],
+        *,
+        account_id: str,
+        comment: str | Omit = omit,
+        name: str | Omit = omit,
+        network: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudflareSourceUpdateResponse:
+        """
+        Updates the Cloudflare Source subnet of the given address family
+
+        Args:
+          account_id: Cloudflare account ID
+
+          address_family: IP address family, either `v4` (IPv4) or `v6` (IPv6)
+
+          comment: An optional description of the subnet.
+
+          name: A user-friendly name for the subnet.
+
+          network: The private IPv4 or IPv6 range defining the subnet, in CIDR notation.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not address_family:
+            raise ValueError(f"Expected a non-empty value for `address_family` but received {address_family!r}")
+        return self._patch(
+            f"/accounts/{account_id}/zerotrust/subnets/cloudflare_source/{address_family}",
+            body=maybe_transform(
+                {
+                    "comment": comment,
+                    "name": name,
+                    "network": network,
+                },
+                cloudflare_source_update_params.CloudflareSourceUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CloudflareSourceUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudflareSourceUpdateResponse], ResultWrapper[CloudflareSourceUpdateResponse]),
+        )
+
+
+class AsyncCloudflareSourceResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncCloudflareSourceResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCloudflareSourceResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCloudflareSourceResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCloudflareSourceResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        address_family: Literal["v4", "v6"],
+        *,
+        account_id: str,
+        comment: str | Omit = omit,
+        name: str | Omit = omit,
+        network: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudflareSourceUpdateResponse:
+        """
+        Updates the Cloudflare Source subnet of the given address family
+
+        Args:
+          account_id: Cloudflare account ID
+
+          address_family: IP address family, either `v4` (IPv4) or `v6` (IPv6)
+
+          comment: An optional description of the subnet.
+
+          name: A user-friendly name for the subnet.
+
+          network: The private IPv4 or IPv6 range defining the subnet, in CIDR notation.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not address_family:
+            raise ValueError(f"Expected a non-empty value for `address_family` but received {address_family!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/zerotrust/subnets/cloudflare_source/{address_family}",
+            body=await async_maybe_transform(
+                {
+                    "comment": comment,
+                    "name": name,
+                    "network": network,
+                },
+                cloudflare_source_update_params.CloudflareSourceUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CloudflareSourceUpdateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudflareSourceUpdateResponse], ResultWrapper[CloudflareSourceUpdateResponse]),
+        )
+
+
+class CloudflareSourceResourceWithRawResponse:
+    def __init__(self, cloudflare_source: CloudflareSourceResource) -> None:
+        self._cloudflare_source = cloudflare_source
+
+        self.update = to_raw_response_wrapper(
+            cloudflare_source.update,
+        )
+
+
+class AsyncCloudflareSourceResourceWithRawResponse:
+    def __init__(self, cloudflare_source: AsyncCloudflareSourceResource) -> None:
+        self._cloudflare_source = cloudflare_source
+
+        self.update = async_to_raw_response_wrapper(
+            cloudflare_source.update,
+        )
+
+
+class CloudflareSourceResourceWithStreamingResponse:
+    def __init__(self, cloudflare_source: CloudflareSourceResource) -> None:
+        self._cloudflare_source = cloudflare_source
+
+        self.update = to_streamed_response_wrapper(
+            cloudflare_source.update,
+        )
+
+
+class AsyncCloudflareSourceResourceWithStreamingResponse:
+    def __init__(self, cloudflare_source: AsyncCloudflareSourceResource) -> None:
+        self._cloudflare_source = cloudflare_source
+
+        self.update = async_to_streamed_response_wrapper(
+            cloudflare_source.update,
+        )
diff --git a/src/cloudflare/resources/zero_trust/networks/subnets/subnets.py b/src/cloudflare/resources/zero_trust/networks/subnets/subnets.py
new file mode 100644
index 00000000000..c7d545c3809
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/networks/subnets/subnets.py
@@ -0,0 +1,318 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from .....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ....._base_client import AsyncPaginator, make_request_options
+from .cloudflare_source import (
+    CloudflareSourceResource,
+    AsyncCloudflareSourceResource,
+    CloudflareSourceResourceWithRawResponse,
+    AsyncCloudflareSourceResourceWithRawResponse,
+    CloudflareSourceResourceWithStreamingResponse,
+    AsyncCloudflareSourceResourceWithStreamingResponse,
+)
+from .....types.zero_trust.networks import subnet_list_params
+from .....types.zero_trust.networks.subnet_list_response import SubnetListResponse
+
+__all__ = ["SubnetsResource", "AsyncSubnetsResource"]
+
+
+class SubnetsResource(SyncAPIResource):
+    @cached_property
+    def cloudflare_source(self) -> CloudflareSourceResource:
+        return CloudflareSourceResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> SubnetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return SubnetsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> SubnetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return SubnetsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        address_family: Literal["v4", "v6"] | Omit = omit,
+        comment: str | Omit = omit,
+        existed_at: str | Omit = omit,
+        is_default_network: bool | Omit = omit,
+        is_deleted: bool | Omit = omit,
+        name: str | Omit = omit,
+        network: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        sort_order: Literal["asc", "desc"] | Omit = omit,
+        subnet_types: Literal["cloudflare_source", "warp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[SubnetListResponse]:
+        """
+        Lists and filters subnets in an account.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          address_family: If set, only include subnets in the given address family - `v4` or `v6`
+
+          comment: If set, only list subnets with the given comment.
+
+          existed_at: If provided, include only resources that were created (and not deleted) before
+              this time. URL encoded.
+
+          is_default_network: If `true`, only include default subnets. If `false`, exclude default subnets
+              subnets. If not set, all subnets will be included.
+
+          is_deleted: If `true`, only include deleted subnets. If `false`, exclude deleted subnets. If
+              not set, all subnets will be included.
+
+          name: If set, only list subnets with the given name
+
+          network: If set, only list the subnet whose network exactly matches the given CIDR.
+
+          page: Page number of paginated results.
+
+          per_page: Number of results to display.
+
+          sort_order: Sort order of the results. `asc` means oldest to newest, `desc` means newest to
+              oldest. If not set, they will not be in any particular order.
+
+          subnet_types: If set, the types of subnets to include, separated by comma.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/zerotrust/subnets",
+            page=SyncV4PagePaginationArray[SubnetListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "address_family": address_family,
+                        "comment": comment,
+                        "existed_at": existed_at,
+                        "is_default_network": is_default_network,
+                        "is_deleted": is_deleted,
+                        "name": name,
+                        "network": network,
+                        "page": page,
+                        "per_page": per_page,
+                        "sort_order": sort_order,
+                        "subnet_types": subnet_types,
+                    },
+                    subnet_list_params.SubnetListParams,
+                ),
+            ),
+            model=SubnetListResponse,
+        )
+
+
+class AsyncSubnetsResource(AsyncAPIResource):
+    @cached_property
+    def cloudflare_source(self) -> AsyncCloudflareSourceResource:
+        return AsyncCloudflareSourceResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncSubnetsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncSubnetsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncSubnetsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncSubnetsResourceWithStreamingResponse(self)
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        address_family: Literal["v4", "v6"] | Omit = omit,
+        comment: str | Omit = omit,
+        existed_at: str | Omit = omit,
+        is_default_network: bool | Omit = omit,
+        is_deleted: bool | Omit = omit,
+        name: str | Omit = omit,
+        network: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        sort_order: Literal["asc", "desc"] | Omit = omit,
+        subnet_types: Literal["cloudflare_source", "warp"] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[SubnetListResponse, AsyncV4PagePaginationArray[SubnetListResponse]]:
+        """
+        Lists and filters subnets in an account.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          address_family: If set, only include subnets in the given address family - `v4` or `v6`
+
+          comment: If set, only list subnets with the given comment.
+
+          existed_at: If provided, include only resources that were created (and not deleted) before
+              this time. URL encoded.
+
+          is_default_network: If `true`, only include default subnets. If `false`, exclude default subnets
+              subnets. If not set, all subnets will be included.
+
+          is_deleted: If `true`, only include deleted subnets. If `false`, exclude deleted subnets. If
+              not set, all subnets will be included.
+
+          name: If set, only list subnets with the given name
+
+          network: If set, only list the subnet whose network exactly matches the given CIDR.
+
+          page: Page number of paginated results.
+
+          per_page: Number of results to display.
+
+          sort_order: Sort order of the results. `asc` means oldest to newest, `desc` means newest to
+              oldest. If not set, they will not be in any particular order.
+
+          subnet_types: If set, the types of subnets to include, separated by comma.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/zerotrust/subnets",
+            page=AsyncV4PagePaginationArray[SubnetListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "address_family": address_family,
+                        "comment": comment,
+                        "existed_at": existed_at,
+                        "is_default_network": is_default_network,
+                        "is_deleted": is_deleted,
+                        "name": name,
+                        "network": network,
+                        "page": page,
+                        "per_page": per_page,
+                        "sort_order": sort_order,
+                        "subnet_types": subnet_types,
+                    },
+                    subnet_list_params.SubnetListParams,
+                ),
+            ),
+            model=SubnetListResponse,
+        )
+
+
+class SubnetsResourceWithRawResponse:
+    def __init__(self, subnets: SubnetsResource) -> None:
+        self._subnets = subnets
+
+        self.list = to_raw_response_wrapper(
+            subnets.list,
+        )
+
+    @cached_property
+    def cloudflare_source(self) -> CloudflareSourceResourceWithRawResponse:
+        return CloudflareSourceResourceWithRawResponse(self._subnets.cloudflare_source)
+
+
+class AsyncSubnetsResourceWithRawResponse:
+    def __init__(self, subnets: AsyncSubnetsResource) -> None:
+        self._subnets = subnets
+
+        self.list = async_to_raw_response_wrapper(
+            subnets.list,
+        )
+
+    @cached_property
+    def cloudflare_source(self) -> AsyncCloudflareSourceResourceWithRawResponse:
+        return AsyncCloudflareSourceResourceWithRawResponse(self._subnets.cloudflare_source)
+
+
+class SubnetsResourceWithStreamingResponse:
+    def __init__(self, subnets: SubnetsResource) -> None:
+        self._subnets = subnets
+
+        self.list = to_streamed_response_wrapper(
+            subnets.list,
+        )
+
+    @cached_property
+    def cloudflare_source(self) -> CloudflareSourceResourceWithStreamingResponse:
+        return CloudflareSourceResourceWithStreamingResponse(self._subnets.cloudflare_source)
+
+
+class AsyncSubnetsResourceWithStreamingResponse:
+    def __init__(self, subnets: AsyncSubnetsResource) -> None:
+        self._subnets = subnets
+
+        self.list = async_to_streamed_response_wrapper(
+            subnets.list,
+        )
+
+    @cached_property
+    def cloudflare_source(self) -> AsyncCloudflareSourceResourceWithStreamingResponse:
+        return AsyncCloudflareSourceResourceWithStreamingResponse(self._subnets.cloudflare_source)
diff --git a/src/cloudflare/resources/zero_trust/networks/virtual_networks.py b/src/cloudflare/resources/zero_trust/networks/virtual_networks.py
index 03a4689a51f..f89bf422286 100644
--- a/src/cloudflare/resources/zero_trust/networks/virtual_networks.py
+++ b/src/cloudflare/resources/zero_trust/networks/virtual_networks.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Any, cast
+from typing import Type, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -28,9 +25,6 @@
     virtual_network_create_params,
 )
 from ....types.zero_trust.networks.virtual_network import VirtualNetwork
-from ....types.zero_trust.networks.virtual_network_edit_response import VirtualNetworkEditResponse
-from ....types.zero_trust.networks.virtual_network_create_response import VirtualNetworkCreateResponse
-from ....types.zero_trust.networks.virtual_network_delete_response import VirtualNetworkDeleteResponse
 
 __all__ = ["VirtualNetworksResource", "AsyncVirtualNetworksResource"]
 
@@ -38,10 +32,21 @@
 class VirtualNetworksResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> VirtualNetworksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return VirtualNetworksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> VirtualNetworksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return VirtualNetworksResourceWithStreamingResponse(self)
 
     def create(
@@ -49,15 +54,16 @@ def create(
         *,
         account_id: str,
         name: str,
-        comment: str | NotGiven = NOT_GIVEN,
-        is_default: bool | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        is_default: bool | Omit = omit,
+        is_default_network: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> VirtualNetworkCreateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> VirtualNetwork:
         """
         Adds a new virtual network to an account.
 
@@ -70,6 +76,8 @@ def create(
 
           is_default: If `true`, this virtual network is the default for the account.
 
+          is_default_network: If `true`, this virtual network is the default for the account.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -80,45 +88,42 @@ def create(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            VirtualNetworkCreateResponse,
-            self._post(
-                f"/accounts/{account_id}/teamnet/virtual_networks",
-                body=maybe_transform(
-                    {
-                        "name": name,
-                        "comment": comment,
-                        "is_default": is_default,
-                    },
-                    virtual_network_create_params.VirtualNetworkCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[VirtualNetworkCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[VirtualNetworkCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._post(
+            f"/accounts/{account_id}/teamnet/virtual_networks",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "comment": comment,
+                    "is_default": is_default,
+                    "is_default_network": is_default_network,
+                },
+                virtual_network_create_params.VirtualNetworkCreateParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[VirtualNetwork]._unwrapper,
+            ),
+            cast_to=cast(Type[VirtualNetwork], ResultWrapper[VirtualNetwork]),
         )
 
     def list(
         self,
         *,
         account_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        is_default: bool | NotGiven = NOT_GIVEN,
-        is_deleted: bool | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        id: str | Omit = omit,
+        is_default: bool | Omit = omit,
+        is_default_network: bool | Omit = omit,
+        is_deleted: bool | Omit = omit,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[VirtualNetwork]:
         """
         Lists and filters virtual networks in an account.
@@ -131,6 +136,9 @@ def list(
           is_default: If `true`, only include the default virtual network. If `false`, exclude the
               default virtual network. If empty, all virtual networks will be included.
 
+          is_default_network: If `true`, only include the default virtual network. If `false`, exclude the
+              default virtual network. If empty, all virtual networks will be included.
+
           is_deleted: If `true`, only include deleted virtual networks. If `false`, exclude deleted
               virtual networks. If empty, all virtual networks will be included.
 
@@ -158,6 +166,7 @@ def list(
                     {
                         "id": id,
                         "is_default": is_default,
+                        "is_default_network": is_default_network,
                         "is_deleted": is_deleted,
                         "name": name,
                     },
@@ -177,8 +186,8 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> VirtualNetworkDeleteResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> VirtualNetwork:
         """
         Deletes an existing virtual network.
 
@@ -199,21 +208,16 @@ def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not virtual_network_id:
             raise ValueError(f"Expected a non-empty value for `virtual_network_id` but received {virtual_network_id!r}")
-        return cast(
-            VirtualNetworkDeleteResponse,
-            self._delete(
-                f"/accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[VirtualNetworkDeleteResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[VirtualNetworkDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._delete(
+            f"/accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[VirtualNetwork]._unwrapper,
             ),
+            cast_to=cast(Type[VirtualNetwork], ResultWrapper[VirtualNetwork]),
         )
 
     def edit(
@@ -221,16 +225,16 @@ def edit(
         virtual_network_id: str,
         *,
         account_id: str,
-        comment: str | NotGiven = NOT_GIVEN,
-        is_default_network: bool | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        is_default_network: bool | Omit = omit,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> VirtualNetworkEditResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> VirtualNetwork:
         """
         Updates an existing virtual network.
 
@@ -257,39 +261,89 @@ def edit(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not virtual_network_id:
             raise ValueError(f"Expected a non-empty value for `virtual_network_id` but received {virtual_network_id!r}")
-        return cast(
-            VirtualNetworkEditResponse,
-            self._patch(
-                f"/accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}",
-                body=maybe_transform(
-                    {
-                        "comment": comment,
-                        "is_default_network": is_default_network,
-                        "name": name,
-                    },
-                    virtual_network_edit_params.VirtualNetworkEditParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[VirtualNetworkEditResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[VirtualNetworkEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._patch(
+            f"/accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}",
+            body=maybe_transform(
+                {
+                    "comment": comment,
+                    "is_default_network": is_default_network,
+                    "name": name,
+                },
+                virtual_network_edit_params.VirtualNetworkEditParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[VirtualNetwork]._unwrapper,
+            ),
+            cast_to=cast(Type[VirtualNetwork], ResultWrapper[VirtualNetwork]),
+        )
+
+    def get(
+        self,
+        virtual_network_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> VirtualNetwork:
+        """
+        Get a virtual network.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          virtual_network_id: UUID of the virtual network.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not virtual_network_id:
+            raise ValueError(f"Expected a non-empty value for `virtual_network_id` but received {virtual_network_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[VirtualNetwork]._unwrapper,
+            ),
+            cast_to=cast(Type[VirtualNetwork], ResultWrapper[VirtualNetwork]),
         )
 
 
 class AsyncVirtualNetworksResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncVirtualNetworksResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncVirtualNetworksResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncVirtualNetworksResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncVirtualNetworksResourceWithStreamingResponse(self)
 
     async def create(
@@ -297,15 +351,16 @@ async def create(
         *,
         account_id: str,
         name: str,
-        comment: str | NotGiven = NOT_GIVEN,
-        is_default: bool | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        is_default: bool | Omit = omit,
+        is_default_network: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> VirtualNetworkCreateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> VirtualNetwork:
         """
         Adds a new virtual network to an account.
 
@@ -318,6 +373,8 @@ async def create(
 
           is_default: If `true`, this virtual network is the default for the account.
 
+          is_default_network: If `true`, this virtual network is the default for the account.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -328,45 +385,42 @@ async def create(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return cast(
-            VirtualNetworkCreateResponse,
-            await self._post(
-                f"/accounts/{account_id}/teamnet/virtual_networks",
-                body=await async_maybe_transform(
-                    {
-                        "name": name,
-                        "comment": comment,
-                        "is_default": is_default,
-                    },
-                    virtual_network_create_params.VirtualNetworkCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[VirtualNetworkCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[VirtualNetworkCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._post(
+            f"/accounts/{account_id}/teamnet/virtual_networks",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "comment": comment,
+                    "is_default": is_default,
+                    "is_default_network": is_default_network,
+                },
+                virtual_network_create_params.VirtualNetworkCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[VirtualNetwork]._unwrapper,
             ),
+            cast_to=cast(Type[VirtualNetwork], ResultWrapper[VirtualNetwork]),
         )
 
     def list(
         self,
         *,
         account_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        is_default: bool | NotGiven = NOT_GIVEN,
-        is_deleted: bool | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        id: str | Omit = omit,
+        is_default: bool | Omit = omit,
+        is_default_network: bool | Omit = omit,
+        is_deleted: bool | Omit = omit,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[VirtualNetwork, AsyncSinglePage[VirtualNetwork]]:
         """
         Lists and filters virtual networks in an account.
@@ -379,6 +433,9 @@ def list(
           is_default: If `true`, only include the default virtual network. If `false`, exclude the
               default virtual network. If empty, all virtual networks will be included.
 
+          is_default_network: If `true`, only include the default virtual network. If `false`, exclude the
+              default virtual network. If empty, all virtual networks will be included.
+
           is_deleted: If `true`, only include deleted virtual networks. If `false`, exclude deleted
               virtual networks. If empty, all virtual networks will be included.
 
@@ -406,6 +463,7 @@ def list(
                     {
                         "id": id,
                         "is_default": is_default,
+                        "is_default_network": is_default_network,
                         "is_deleted": is_deleted,
                         "name": name,
                     },
@@ -425,8 +483,8 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> VirtualNetworkDeleteResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> VirtualNetwork:
         """
         Deletes an existing virtual network.
 
@@ -447,21 +505,16 @@ async def delete(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not virtual_network_id:
             raise ValueError(f"Expected a non-empty value for `virtual_network_id` but received {virtual_network_id!r}")
-        return cast(
-            VirtualNetworkDeleteResponse,
-            await self._delete(
-                f"/accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[VirtualNetworkDeleteResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[VirtualNetworkDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._delete(
+            f"/accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[VirtualNetwork]._unwrapper,
             ),
+            cast_to=cast(Type[VirtualNetwork], ResultWrapper[VirtualNetwork]),
         )
 
     async def edit(
@@ -469,16 +522,16 @@ async def edit(
         virtual_network_id: str,
         *,
         account_id: str,
-        comment: str | NotGiven = NOT_GIVEN,
-        is_default_network: bool | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
+        comment: str | Omit = omit,
+        is_default_network: bool | Omit = omit,
+        name: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> VirtualNetworkEditResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> VirtualNetwork:
         """
         Updates an existing virtual network.
 
@@ -505,29 +558,68 @@ async def edit(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not virtual_network_id:
             raise ValueError(f"Expected a non-empty value for `virtual_network_id` but received {virtual_network_id!r}")
-        return cast(
-            VirtualNetworkEditResponse,
-            await self._patch(
-                f"/accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}",
-                body=await async_maybe_transform(
-                    {
-                        "comment": comment,
-                        "is_default_network": is_default_network,
-                        "name": name,
-                    },
-                    virtual_network_edit_params.VirtualNetworkEditParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[VirtualNetworkEditResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[VirtualNetworkEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._patch(
+            f"/accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}",
+            body=await async_maybe_transform(
+                {
+                    "comment": comment,
+                    "is_default_network": is_default_network,
+                    "name": name,
+                },
+                virtual_network_edit_params.VirtualNetworkEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[VirtualNetwork]._unwrapper,
             ),
+            cast_to=cast(Type[VirtualNetwork], ResultWrapper[VirtualNetwork]),
+        )
+
+    async def get(
+        self,
+        virtual_network_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> VirtualNetwork:
+        """
+        Get a virtual network.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          virtual_network_id: UUID of the virtual network.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not virtual_network_id:
+            raise ValueError(f"Expected a non-empty value for `virtual_network_id` but received {virtual_network_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[VirtualNetwork]._unwrapper,
+            ),
+            cast_to=cast(Type[VirtualNetwork], ResultWrapper[VirtualNetwork]),
         )
 
 
@@ -547,6 +639,9 @@ def __init__(self, virtual_networks: VirtualNetworksResource) -> None:
         self.edit = to_raw_response_wrapper(
             virtual_networks.edit,
         )
+        self.get = to_raw_response_wrapper(
+            virtual_networks.get,
+        )
 
 
 class AsyncVirtualNetworksResourceWithRawResponse:
@@ -565,6 +660,9 @@ def __init__(self, virtual_networks: AsyncVirtualNetworksResource) -> None:
         self.edit = async_to_raw_response_wrapper(
             virtual_networks.edit,
         )
+        self.get = async_to_raw_response_wrapper(
+            virtual_networks.get,
+        )
 
 
 class VirtualNetworksResourceWithStreamingResponse:
@@ -583,6 +681,9 @@ def __init__(self, virtual_networks: VirtualNetworksResource) -> None:
         self.edit = to_streamed_response_wrapper(
             virtual_networks.edit,
         )
+        self.get = to_streamed_response_wrapper(
+            virtual_networks.get,
+        )
 
 
 class AsyncVirtualNetworksResourceWithStreamingResponse:
@@ -601,3 +702,6 @@ def __init__(self, virtual_networks: AsyncVirtualNetworksResource) -> None:
         self.edit = async_to_streamed_response_wrapper(
             virtual_networks.edit,
         )
+        self.get = async_to_streamed_response_wrapper(
+            virtual_networks.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/organizations.py b/src/cloudflare/resources/zero_trust/organizations.py
deleted file mode 100644
index 049a368926e..00000000000
--- a/src/cloudflare/resources/zero_trust/organizations.py
+++ /dev/null
@@ -1,767 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, Optional, cast
-
-import httpx
-
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from ..._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
-from ...types.zero_trust import (
-    organization_create_params,
-    organization_update_params,
-    organization_revoke_users_params,
-)
-from ...types.zero_trust.organization import Organization
-from ...types.zero_trust.login_design_param import LoginDesignParam
-from ...types.zero_trust.organization_revoke_users_response import OrganizationRevokeUsersResponse
-
-__all__ = ["OrganizationsResource", "AsyncOrganizationsResource"]
-
-
-class OrganizationsResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> OrganizationsResourceWithRawResponse:
-        return OrganizationsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> OrganizationsResourceWithStreamingResponse:
-        return OrganizationsResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        *,
-        auth_domain: str,
-        name: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        is_ui_read_only: bool | NotGiven = NOT_GIVEN,
-        login_design: LoginDesignParam | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        ui_read_only_toggle_reason: str | NotGiven = NOT_GIVEN,
-        user_seat_expiration_inactive_time: str | NotGiven = NOT_GIVEN,
-        warp_auth_session_duration: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Organization]:
-        """
-        Sets up a Zero Trust organization for your account or zone.
-
-        Args:
-          auth_domain: The unique subdomain assigned to your Zero Trust organization.
-
-          name: The name of your Zero Trust organization.
-
-          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-
-          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-
-          allow_authenticate_via_warp: When set to true, users can authenticate via WARP for any application in your
-              organization. Application settings will take precedence over this value.
-
-          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
-              login.
-
-          is_ui_read_only: Lock all settings as Read-Only in the Dashboard, regardless of user permission.
-              Updates may only be made via the API or Terraform for this account when enabled.
-
-          session_duration: The amount of time that tokens issued for applications will be valid. Must be in
-              the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m,
-              h.
-
-          ui_read_only_toggle_reason: A description of the reason why the UI read only field is being toggled.
-
-          user_seat_expiration_inactive_time: The amount of time a user seat is inactive before it expires. When the user seat
-              exceeds the set time of inactivity, the user is removed as an active seat and no
-              longer counts against your Teams seat count. Must be in the format `300ms` or
-              `2h45m`. Valid time units are: `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.
-
-          warp_auth_session_duration: The amount of time that tokens issued for applications will be valid. Must be in
-              the format `30m` or `2h45m`. Valid time units are: m, h.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if account_id and zone_id:
-            raise ValueError("You cannot provide both account_id and zone_id")
-
-        if account_id:
-            account_or_zone = "accounts"
-            account_or_zone_id = account_id
-        else:
-            if not zone_id:
-                raise ValueError("You must provide either account_id or zone_id")
-
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return self._post(
-            f"/{account_or_zone}/{account_or_zone_id}/access/organizations",
-            body=maybe_transform(
-                {
-                    "auth_domain": auth_domain,
-                    "name": name,
-                    "allow_authenticate_via_warp": allow_authenticate_via_warp,
-                    "auto_redirect_to_identity": auto_redirect_to_identity,
-                    "is_ui_read_only": is_ui_read_only,
-                    "login_design": login_design,
-                    "session_duration": session_duration,
-                    "ui_read_only_toggle_reason": ui_read_only_toggle_reason,
-                    "user_seat_expiration_inactive_time": user_seat_expiration_inactive_time,
-                    "warp_auth_session_duration": warp_auth_session_duration,
-                },
-                organization_create_params.OrganizationCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[Organization]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Organization]], ResultWrapper[Organization]),
-        )
-
-    def update(
-        self,
-        *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        auth_domain: str | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        custom_pages: organization_update_params.CustomPages | NotGiven = NOT_GIVEN,
-        is_ui_read_only: bool | NotGiven = NOT_GIVEN,
-        login_design: LoginDesignParam | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        ui_read_only_toggle_reason: str | NotGiven = NOT_GIVEN,
-        user_seat_expiration_inactive_time: str | NotGiven = NOT_GIVEN,
-        warp_auth_session_duration: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Organization]:
-        """
-        Updates the configuration for your Zero Trust organization.
-
-        Args:
-          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-
-          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-
-          allow_authenticate_via_warp: When set to true, users can authenticate via WARP for any application in your
-              organization. Application settings will take precedence over this value.
-
-          auth_domain: The unique subdomain assigned to your Zero Trust organization.
-
-          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
-              login.
-
-          is_ui_read_only: Lock all settings as Read-Only in the Dashboard, regardless of user permission.
-              Updates may only be made via the API or Terraform for this account when enabled.
-
-          name: The name of your Zero Trust organization.
-
-          session_duration: The amount of time that tokens issued for applications will be valid. Must be in
-              the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m,
-              h.
-
-          ui_read_only_toggle_reason: A description of the reason why the UI read only field is being toggled.
-
-          user_seat_expiration_inactive_time: The amount of time a user seat is inactive before it expires. When the user seat
-              exceeds the set time of inactivity, the user is removed as an active seat and no
-              longer counts against your Teams seat count. Must be in the format `300ms` or
-              `2h45m`. Valid time units are: `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.
-
-          warp_auth_session_duration: The amount of time that tokens issued for applications will be valid. Must be in
-              the format `30m` or `2h45m`. Valid time units are: m, h.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if account_id and zone_id:
-            raise ValueError("You cannot provide both account_id and zone_id")
-
-        if account_id:
-            account_or_zone = "accounts"
-            account_or_zone_id = account_id
-        else:
-            if not zone_id:
-                raise ValueError("You must provide either account_id or zone_id")
-
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return self._put(
-            f"/{account_or_zone}/{account_or_zone_id}/access/organizations",
-            body=maybe_transform(
-                {
-                    "allow_authenticate_via_warp": allow_authenticate_via_warp,
-                    "auth_domain": auth_domain,
-                    "auto_redirect_to_identity": auto_redirect_to_identity,
-                    "custom_pages": custom_pages,
-                    "is_ui_read_only": is_ui_read_only,
-                    "login_design": login_design,
-                    "name": name,
-                    "session_duration": session_duration,
-                    "ui_read_only_toggle_reason": ui_read_only_toggle_reason,
-                    "user_seat_expiration_inactive_time": user_seat_expiration_inactive_time,
-                    "warp_auth_session_duration": warp_auth_session_duration,
-                },
-                organization_update_params.OrganizationUpdateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[Organization]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Organization]], ResultWrapper[Organization]),
-        )
-
-    def list(
-        self,
-        *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Organization]:
-        """
-        Returns the configuration for your Zero Trust organization.
-
-        Args:
-          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-
-          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if account_id and zone_id:
-            raise ValueError("You cannot provide both account_id and zone_id")
-
-        if account_id:
-            account_or_zone = "accounts"
-            account_or_zone_id = account_id
-        else:
-            if not zone_id:
-                raise ValueError("You must provide either account_id or zone_id")
-
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return self._get(
-            f"/{account_or_zone}/{account_or_zone_id}/access/organizations",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[Organization]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Organization]], ResultWrapper[Organization]),
-        )
-
-    def revoke_users(
-        self,
-        *,
-        email: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OrganizationRevokeUsersResponse]:
-        """
-        Revokes a user's access across all applications.
-
-        Args:
-          email: The email of the user to revoke.
-
-          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-
-          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if account_id and zone_id:
-            raise ValueError("You cannot provide both account_id and zone_id")
-
-        if account_id:
-            account_or_zone = "accounts"
-            account_or_zone_id = account_id
-        else:
-            if not zone_id:
-                raise ValueError("You must provide either account_id or zone_id")
-
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return self._post(
-            f"/{account_or_zone}/{account_or_zone_id}/access/organizations/revoke_user",
-            body=maybe_transform({"email": email}, organization_revoke_users_params.OrganizationRevokeUsersParams),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[OrganizationRevokeUsersResponse]]._unwrapper,
-            ),
-            cast_to=cast(
-                Type[Optional[OrganizationRevokeUsersResponse]], ResultWrapper[OrganizationRevokeUsersResponse]
-            ),
-        )
-
-
-class AsyncOrganizationsResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncOrganizationsResourceWithRawResponse:
-        return AsyncOrganizationsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncOrganizationsResourceWithStreamingResponse:
-        return AsyncOrganizationsResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        *,
-        auth_domain: str,
-        name: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        is_ui_read_only: bool | NotGiven = NOT_GIVEN,
-        login_design: LoginDesignParam | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        ui_read_only_toggle_reason: str | NotGiven = NOT_GIVEN,
-        user_seat_expiration_inactive_time: str | NotGiven = NOT_GIVEN,
-        warp_auth_session_duration: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Organization]:
-        """
-        Sets up a Zero Trust organization for your account or zone.
-
-        Args:
-          auth_domain: The unique subdomain assigned to your Zero Trust organization.
-
-          name: The name of your Zero Trust organization.
-
-          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-
-          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-
-          allow_authenticate_via_warp: When set to true, users can authenticate via WARP for any application in your
-              organization. Application settings will take precedence over this value.
-
-          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
-              login.
-
-          is_ui_read_only: Lock all settings as Read-Only in the Dashboard, regardless of user permission.
-              Updates may only be made via the API or Terraform for this account when enabled.
-
-          session_duration: The amount of time that tokens issued for applications will be valid. Must be in
-              the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m,
-              h.
-
-          ui_read_only_toggle_reason: A description of the reason why the UI read only field is being toggled.
-
-          user_seat_expiration_inactive_time: The amount of time a user seat is inactive before it expires. When the user seat
-              exceeds the set time of inactivity, the user is removed as an active seat and no
-              longer counts against your Teams seat count. Must be in the format `300ms` or
-              `2h45m`. Valid time units are: `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.
-
-          warp_auth_session_duration: The amount of time that tokens issued for applications will be valid. Must be in
-              the format `30m` or `2h45m`. Valid time units are: m, h.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if account_id and zone_id:
-            raise ValueError("You cannot provide both account_id and zone_id")
-
-        if account_id:
-            account_or_zone = "accounts"
-            account_or_zone_id = account_id
-        else:
-            if not zone_id:
-                raise ValueError("You must provide either account_id or zone_id")
-
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return await self._post(
-            f"/{account_or_zone}/{account_or_zone_id}/access/organizations",
-            body=await async_maybe_transform(
-                {
-                    "auth_domain": auth_domain,
-                    "name": name,
-                    "allow_authenticate_via_warp": allow_authenticate_via_warp,
-                    "auto_redirect_to_identity": auto_redirect_to_identity,
-                    "is_ui_read_only": is_ui_read_only,
-                    "login_design": login_design,
-                    "session_duration": session_duration,
-                    "ui_read_only_toggle_reason": ui_read_only_toggle_reason,
-                    "user_seat_expiration_inactive_time": user_seat_expiration_inactive_time,
-                    "warp_auth_session_duration": warp_auth_session_duration,
-                },
-                organization_create_params.OrganizationCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[Organization]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Organization]], ResultWrapper[Organization]),
-        )
-
-    async def update(
-        self,
-        *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        allow_authenticate_via_warp: bool | NotGiven = NOT_GIVEN,
-        auth_domain: str | NotGiven = NOT_GIVEN,
-        auto_redirect_to_identity: bool | NotGiven = NOT_GIVEN,
-        custom_pages: organization_update_params.CustomPages | NotGiven = NOT_GIVEN,
-        is_ui_read_only: bool | NotGiven = NOT_GIVEN,
-        login_design: LoginDesignParam | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        session_duration: str | NotGiven = NOT_GIVEN,
-        ui_read_only_toggle_reason: str | NotGiven = NOT_GIVEN,
-        user_seat_expiration_inactive_time: str | NotGiven = NOT_GIVEN,
-        warp_auth_session_duration: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Organization]:
-        """
-        Updates the configuration for your Zero Trust organization.
-
-        Args:
-          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-
-          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-
-          allow_authenticate_via_warp: When set to true, users can authenticate via WARP for any application in your
-              organization. Application settings will take precedence over this value.
-
-          auth_domain: The unique subdomain assigned to your Zero Trust organization.
-
-          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
-              login.
-
-          is_ui_read_only: Lock all settings as Read-Only in the Dashboard, regardless of user permission.
-              Updates may only be made via the API or Terraform for this account when enabled.
-
-          name: The name of your Zero Trust organization.
-
-          session_duration: The amount of time that tokens issued for applications will be valid. Must be in
-              the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m,
-              h.
-
-          ui_read_only_toggle_reason: A description of the reason why the UI read only field is being toggled.
-
-          user_seat_expiration_inactive_time: The amount of time a user seat is inactive before it expires. When the user seat
-              exceeds the set time of inactivity, the user is removed as an active seat and no
-              longer counts against your Teams seat count. Must be in the format `300ms` or
-              `2h45m`. Valid time units are: `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.
-
-          warp_auth_session_duration: The amount of time that tokens issued for applications will be valid. Must be in
-              the format `30m` or `2h45m`. Valid time units are: m, h.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if account_id and zone_id:
-            raise ValueError("You cannot provide both account_id and zone_id")
-
-        if account_id:
-            account_or_zone = "accounts"
-            account_or_zone_id = account_id
-        else:
-            if not zone_id:
-                raise ValueError("You must provide either account_id or zone_id")
-
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return await self._put(
-            f"/{account_or_zone}/{account_or_zone_id}/access/organizations",
-            body=await async_maybe_transform(
-                {
-                    "allow_authenticate_via_warp": allow_authenticate_via_warp,
-                    "auth_domain": auth_domain,
-                    "auto_redirect_to_identity": auto_redirect_to_identity,
-                    "custom_pages": custom_pages,
-                    "is_ui_read_only": is_ui_read_only,
-                    "login_design": login_design,
-                    "name": name,
-                    "session_duration": session_duration,
-                    "ui_read_only_toggle_reason": ui_read_only_toggle_reason,
-                    "user_seat_expiration_inactive_time": user_seat_expiration_inactive_time,
-                    "warp_auth_session_duration": warp_auth_session_duration,
-                },
-                organization_update_params.OrganizationUpdateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[Organization]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Organization]], ResultWrapper[Organization]),
-        )
-
-    async def list(
-        self,
-        *,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Organization]:
-        """
-        Returns the configuration for your Zero Trust organization.
-
-        Args:
-          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-
-          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if account_id and zone_id:
-            raise ValueError("You cannot provide both account_id and zone_id")
-
-        if account_id:
-            account_or_zone = "accounts"
-            account_or_zone_id = account_id
-        else:
-            if not zone_id:
-                raise ValueError("You must provide either account_id or zone_id")
-
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return await self._get(
-            f"/{account_or_zone}/{account_or_zone_id}/access/organizations",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[Organization]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[Organization]], ResultWrapper[Organization]),
-        )
-
-    async def revoke_users(
-        self,
-        *,
-        email: str,
-        account_id: str | NotGiven = NOT_GIVEN,
-        zone_id: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[OrganizationRevokeUsersResponse]:
-        """
-        Revokes a user's access across all applications.
-
-        Args:
-          email: The email of the user to revoke.
-
-          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-
-          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if account_id and zone_id:
-            raise ValueError("You cannot provide both account_id and zone_id")
-
-        if account_id:
-            account_or_zone = "accounts"
-            account_or_zone_id = account_id
-        else:
-            if not zone_id:
-                raise ValueError("You must provide either account_id or zone_id")
-
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return await self._post(
-            f"/{account_or_zone}/{account_or_zone_id}/access/organizations/revoke_user",
-            body=await async_maybe_transform(
-                {"email": email}, organization_revoke_users_params.OrganizationRevokeUsersParams
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[OrganizationRevokeUsersResponse]]._unwrapper,
-            ),
-            cast_to=cast(
-                Type[Optional[OrganizationRevokeUsersResponse]], ResultWrapper[OrganizationRevokeUsersResponse]
-            ),
-        )
-
-
-class OrganizationsResourceWithRawResponse:
-    def __init__(self, organizations: OrganizationsResource) -> None:
-        self._organizations = organizations
-
-        self.create = to_raw_response_wrapper(
-            organizations.create,
-        )
-        self.update = to_raw_response_wrapper(
-            organizations.update,
-        )
-        self.list = to_raw_response_wrapper(
-            organizations.list,
-        )
-        self.revoke_users = to_raw_response_wrapper(
-            organizations.revoke_users,
-        )
-
-
-class AsyncOrganizationsResourceWithRawResponse:
-    def __init__(self, organizations: AsyncOrganizationsResource) -> None:
-        self._organizations = organizations
-
-        self.create = async_to_raw_response_wrapper(
-            organizations.create,
-        )
-        self.update = async_to_raw_response_wrapper(
-            organizations.update,
-        )
-        self.list = async_to_raw_response_wrapper(
-            organizations.list,
-        )
-        self.revoke_users = async_to_raw_response_wrapper(
-            organizations.revoke_users,
-        )
-
-
-class OrganizationsResourceWithStreamingResponse:
-    def __init__(self, organizations: OrganizationsResource) -> None:
-        self._organizations = organizations
-
-        self.create = to_streamed_response_wrapper(
-            organizations.create,
-        )
-        self.update = to_streamed_response_wrapper(
-            organizations.update,
-        )
-        self.list = to_streamed_response_wrapper(
-            organizations.list,
-        )
-        self.revoke_users = to_streamed_response_wrapper(
-            organizations.revoke_users,
-        )
-
-
-class AsyncOrganizationsResourceWithStreamingResponse:
-    def __init__(self, organizations: AsyncOrganizationsResource) -> None:
-        self._organizations = organizations
-
-        self.create = async_to_streamed_response_wrapper(
-            organizations.create,
-        )
-        self.update = async_to_streamed_response_wrapper(
-            organizations.update,
-        )
-        self.list = async_to_streamed_response_wrapper(
-            organizations.list,
-        )
-        self.revoke_users = async_to_streamed_response_wrapper(
-            organizations.revoke_users,
-        )
diff --git a/src/cloudflare/resources/zero_trust/organizations/__init__.py b/src/cloudflare/resources/zero_trust/organizations/__init__.py
new file mode 100644
index 00000000000..fb5b654a139
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/organizations/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .doh import (
+    DOHResource,
+    AsyncDOHResource,
+    DOHResourceWithRawResponse,
+    AsyncDOHResourceWithRawResponse,
+    DOHResourceWithStreamingResponse,
+    AsyncDOHResourceWithStreamingResponse,
+)
+from .organizations import (
+    OrganizationsResource,
+    AsyncOrganizationsResource,
+    OrganizationsResourceWithRawResponse,
+    AsyncOrganizationsResourceWithRawResponse,
+    OrganizationsResourceWithStreamingResponse,
+    AsyncOrganizationsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "DOHResource",
+    "AsyncDOHResource",
+    "DOHResourceWithRawResponse",
+    "AsyncDOHResourceWithRawResponse",
+    "DOHResourceWithStreamingResponse",
+    "AsyncDOHResourceWithStreamingResponse",
+    "OrganizationsResource",
+    "AsyncOrganizationsResource",
+    "OrganizationsResourceWithRawResponse",
+    "AsyncOrganizationsResourceWithRawResponse",
+    "OrganizationsResourceWithStreamingResponse",
+    "AsyncOrganizationsResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/organizations/doh.py b/src/cloudflare/resources/zero_trust/organizations/doh.py
new file mode 100644
index 00000000000..61e2ccdb031
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/organizations/doh.py
@@ -0,0 +1,303 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.zero_trust.organizations import doh_update_params
+from ....types.zero_trust.organizations.doh_get_response import DOHGetResponse
+from ....types.zero_trust.organizations.doh_update_response import DOHUpdateResponse
+
+__all__ = ["DOHResource", "AsyncDOHResource"]
+
+
+class DOHResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> DOHResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return DOHResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> DOHResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return DOHResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        *,
+        account_id: str,
+        doh_jwt_duration: str | Omit = omit,
+        service_token_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DOHUpdateResponse]:
+        """
+        Updates the DoH settings for your Zero Trust organization.
+
+        Args:
+          account_id: Identifier.
+
+          doh_jwt_duration: The duration the DoH JWT is valid for. Must be in the format `300ms` or `2h45m`.
+              Valid time units are: ns, us (or µs), ms, s, m, h. Note that the maximum
+              duration for this setting is the same as the key rotation period on the account.
+              Default expiration is 24h
+
+          service_token_id: The uuid of the service token you want to use for DoH authentication
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/access/organizations/doh",
+            body=maybe_transform(
+                {
+                    "doh_jwt_duration": doh_jwt_duration,
+                    "service_token_id": service_token_id,
+                },
+                doh_update_params.DOHUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DOHUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DOHUpdateResponse]], ResultWrapper[DOHUpdateResponse]),
+        )
+
+    def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DOHGetResponse]:
+        """
+        Returns the DoH settings for your Zero Trust organization.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/access/organizations/doh",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DOHGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DOHGetResponse]], ResultWrapper[DOHGetResponse]),
+        )
+
+
+class AsyncDOHResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncDOHResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncDOHResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncDOHResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncDOHResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        *,
+        account_id: str,
+        doh_jwt_duration: str | Omit = omit,
+        service_token_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DOHUpdateResponse]:
+        """
+        Updates the DoH settings for your Zero Trust organization.
+
+        Args:
+          account_id: Identifier.
+
+          doh_jwt_duration: The duration the DoH JWT is valid for. Must be in the format `300ms` or `2h45m`.
+              Valid time units are: ns, us (or µs), ms, s, m, h. Note that the maximum
+              duration for this setting is the same as the key rotation period on the account.
+              Default expiration is 24h
+
+          service_token_id: The uuid of the service token you want to use for DoH authentication
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/access/organizations/doh",
+            body=await async_maybe_transform(
+                {
+                    "doh_jwt_duration": doh_jwt_duration,
+                    "service_token_id": service_token_id,
+                },
+                doh_update_params.DOHUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DOHUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DOHUpdateResponse]], ResultWrapper[DOHUpdateResponse]),
+        )
+
+    async def get(
+        self,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[DOHGetResponse]:
+        """
+        Returns the DoH settings for your Zero Trust organization.
+
+        Args:
+          account_id: Identifier.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/access/organizations/doh",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[DOHGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[DOHGetResponse]], ResultWrapper[DOHGetResponse]),
+        )
+
+
+class DOHResourceWithRawResponse:
+    def __init__(self, doh: DOHResource) -> None:
+        self._doh = doh
+
+        self.update = to_raw_response_wrapper(
+            doh.update,
+        )
+        self.get = to_raw_response_wrapper(
+            doh.get,
+        )
+
+
+class AsyncDOHResourceWithRawResponse:
+    def __init__(self, doh: AsyncDOHResource) -> None:
+        self._doh = doh
+
+        self.update = async_to_raw_response_wrapper(
+            doh.update,
+        )
+        self.get = async_to_raw_response_wrapper(
+            doh.get,
+        )
+
+
+class DOHResourceWithStreamingResponse:
+    def __init__(self, doh: DOHResource) -> None:
+        self._doh = doh
+
+        self.update = to_streamed_response_wrapper(
+            doh.update,
+        )
+        self.get = to_streamed_response_wrapper(
+            doh.get,
+        )
+
+
+class AsyncDOHResourceWithStreamingResponse:
+    def __init__(self, doh: AsyncDOHResource) -> None:
+        self._doh = doh
+
+        self.update = async_to_streamed_response_wrapper(
+            doh.update,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            doh.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/organizations/organizations.py b/src/cloudflare/resources/zero_trust/organizations/organizations.py
new file mode 100644
index 00000000000..322f37c0f13
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/organizations/organizations.py
@@ -0,0 +1,930 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Any, Type, Optional, cast
+
+import httpx
+
+from .doh import (
+    DOHResource,
+    AsyncDOHResource,
+    DOHResourceWithRawResponse,
+    AsyncDOHResourceWithRawResponse,
+    DOHResourceWithStreamingResponse,
+    AsyncDOHResourceWithStreamingResponse,
+)
+from ...._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ...._utils import maybe_transform, async_maybe_transform
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...._wrappers import ResultWrapper
+from ...._base_client import make_request_options
+from ....types.zero_trust import (
+    organization_create_params,
+    organization_update_params,
+    organization_revoke_users_params,
+)
+from ....types.zero_trust.organization import Organization
+from ....types.zero_trust.login_design_param import LoginDesignParam
+from ....types.zero_trust.organization_revoke_users_response import OrganizationRevokeUsersResponse
+
+__all__ = ["OrganizationsResource", "AsyncOrganizationsResource"]
+
+
+class OrganizationsResource(SyncAPIResource):
+    @cached_property
+    def doh(self) -> DOHResource:
+        return DOHResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> OrganizationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return OrganizationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> OrganizationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return OrganizationsResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        auth_domain: str,
+        name: str,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        deny_unmatched_requests: bool | Omit = omit,
+        deny_unmatched_requests_exempted_zone_names: SequenceNotStr[str] | Omit = omit,
+        is_ui_read_only: bool | Omit = omit,
+        login_design: LoginDesignParam | Omit = omit,
+        session_duration: str | Omit = omit,
+        ui_read_only_toggle_reason: str | Omit = omit,
+        user_seat_expiration_inactive_time: str | Omit = omit,
+        warp_auth_session_duration: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Organization]:
+        """
+        Sets up a Zero Trust organization for your account or zone.
+
+        Args:
+          auth_domain: The unique subdomain assigned to your Zero Trust organization.
+
+          name: The name of your Zero Trust organization.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          allow_authenticate_via_warp: When set to true, users can authenticate via WARP for any application in your
+              organization. Application settings will take precedence over this value.
+
+          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
+              login.
+
+          deny_unmatched_requests: Determines whether to deny all requests to Cloudflare-protected resources that
+              lack an associated Access application. If enabled, you must explicitly configure
+              an Access application and policy to allow traffic to your Cloudflare-protected
+              resources. For domains you want to be public across all subdomains, add the
+              domain to the `deny_unmatched_requests_exempted_zone_names` array.
+
+          deny_unmatched_requests_exempted_zone_names: Contains zone names to exempt from the `deny_unmatched_requests` feature.
+              Requests to a subdomain in an exempted zone will block unauthenticated traffic
+              by default if there is a configured Access application and policy that matches
+              the request.
+
+          is_ui_read_only: Lock all settings as Read-Only in the Dashboard, regardless of user permission.
+              Updates may only be made via the API or Terraform for this account when enabled.
+
+          session_duration: The amount of time that tokens issued for applications will be valid. Must be in
+              the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m,
+              h.
+
+          ui_read_only_toggle_reason: A description of the reason why the UI read only field is being toggled.
+
+          user_seat_expiration_inactive_time: The amount of time a user seat is inactive before it expires. When the user seat
+              exceeds the set time of inactivity, the user is removed as an active seat and no
+              longer counts against your Teams seat count. Minimum value for this setting is 1
+              month (730h). Must be in the format `300ms` or `2h45m`. Valid time units are:
+              `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.
+
+          warp_auth_session_duration: The amount of time that tokens issued for applications will be valid. Must be in
+              the format `30m` or `2h45m`. Valid time units are: m, h.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._post(
+            f"/{account_or_zone}/{account_or_zone_id}/access/organizations",
+            body=maybe_transform(
+                {
+                    "auth_domain": auth_domain,
+                    "name": name,
+                    "allow_authenticate_via_warp": allow_authenticate_via_warp,
+                    "auto_redirect_to_identity": auto_redirect_to_identity,
+                    "deny_unmatched_requests": deny_unmatched_requests,
+                    "deny_unmatched_requests_exempted_zone_names": deny_unmatched_requests_exempted_zone_names,
+                    "is_ui_read_only": is_ui_read_only,
+                    "login_design": login_design,
+                    "session_duration": session_duration,
+                    "ui_read_only_toggle_reason": ui_read_only_toggle_reason,
+                    "user_seat_expiration_inactive_time": user_seat_expiration_inactive_time,
+                    "warp_auth_session_duration": warp_auth_session_duration,
+                },
+                organization_create_params.OrganizationCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Organization]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Organization]], ResultWrapper[Organization]),
+        )
+
+    def update(
+        self,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        auth_domain: str | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        custom_pages: organization_update_params.CustomPages | Omit = omit,
+        deny_unmatched_requests: bool | Omit = omit,
+        deny_unmatched_requests_exempted_zone_names: SequenceNotStr[str] | Omit = omit,
+        is_ui_read_only: bool | Omit = omit,
+        login_design: LoginDesignParam | Omit = omit,
+        name: str | Omit = omit,
+        session_duration: str | Omit = omit,
+        ui_read_only_toggle_reason: str | Omit = omit,
+        user_seat_expiration_inactive_time: str | Omit = omit,
+        warp_auth_session_duration: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Organization]:
+        """
+        Updates the configuration for your Zero Trust organization.
+
+        Args:
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          allow_authenticate_via_warp: When set to true, users can authenticate via WARP for any application in your
+              organization. Application settings will take precedence over this value.
+
+          auth_domain: The unique subdomain assigned to your Zero Trust organization.
+
+          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
+              login.
+
+          deny_unmatched_requests: Determines whether to deny all requests to Cloudflare-protected resources that
+              lack an associated Access application. If enabled, you must explicitly configure
+              an Access application and policy to allow traffic to your Cloudflare-protected
+              resources. For domains you want to be public across all subdomains, add the
+              domain to the `deny_unmatched_requests_exempted_zone_names` array.
+
+          deny_unmatched_requests_exempted_zone_names: Contains zone names to exempt from the `deny_unmatched_requests` feature.
+              Requests to a subdomain in an exempted zone will block unauthenticated traffic
+              by default if there is a configured Access application and policy that matches
+              the request.
+
+          is_ui_read_only: Lock all settings as Read-Only in the Dashboard, regardless of user permission.
+              Updates may only be made via the API or Terraform for this account when enabled.
+
+          name: The name of your Zero Trust organization.
+
+          session_duration: The amount of time that tokens issued for applications will be valid. Must be in
+              the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m,
+              h.
+
+          ui_read_only_toggle_reason: A description of the reason why the UI read only field is being toggled.
+
+          user_seat_expiration_inactive_time: The amount of time a user seat is inactive before it expires. When the user seat
+              exceeds the set time of inactivity, the user is removed as an active seat and no
+              longer counts against your Teams seat count. Minimum value for this setting is 1
+              month (730h). Must be in the format `300ms` or `2h45m`. Valid time units are:
+              `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.
+
+          warp_auth_session_duration: The amount of time that tokens issued for applications will be valid. Must be in
+              the format `30m` or `2h45m`. Valid time units are: m, h.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._put(
+            f"/{account_or_zone}/{account_or_zone_id}/access/organizations",
+            body=maybe_transform(
+                {
+                    "allow_authenticate_via_warp": allow_authenticate_via_warp,
+                    "auth_domain": auth_domain,
+                    "auto_redirect_to_identity": auto_redirect_to_identity,
+                    "custom_pages": custom_pages,
+                    "deny_unmatched_requests": deny_unmatched_requests,
+                    "deny_unmatched_requests_exempted_zone_names": deny_unmatched_requests_exempted_zone_names,
+                    "is_ui_read_only": is_ui_read_only,
+                    "login_design": login_design,
+                    "name": name,
+                    "session_duration": session_duration,
+                    "ui_read_only_toggle_reason": ui_read_only_toggle_reason,
+                    "user_seat_expiration_inactive_time": user_seat_expiration_inactive_time,
+                    "warp_auth_session_duration": warp_auth_session_duration,
+                },
+                organization_update_params.OrganizationUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Organization]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Organization]], ResultWrapper[Organization]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Organization]:
+        """
+        Returns the configuration for your Zero Trust organization.
+
+        Args:
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._get(
+            f"/{account_or_zone}/{account_or_zone_id}/access/organizations",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Organization]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Organization]], ResultWrapper[Organization]),
+        )
+
+    def revoke_users(
+        self,
+        *,
+        email: str,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        query_devices: bool | Omit = omit,
+        body_devices: bool | Omit = omit,
+        user_uid: str | Omit = omit,
+        warp_session_reauth: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[OrganizationRevokeUsersResponse]:
+        """
+        Revokes a user's access across all applications.
+
+        Args:
+          email: The email of the user to revoke.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          query_devices: When set to `true`, all devices associated with the user will be revoked.
+
+          body_devices: When set to `true`, all devices associated with the user will be revoked.
+
+          user_uid: The uuid of the user to revoke.
+
+          warp_session_reauth: When set to `true`, the user will be required to re-authenticate to WARP for all
+              Gateway policies that enforce a WARP client session duration. When `false`, the
+              user’s WARP session will remain active
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return self._post(
+            f"/{account_or_zone}/{account_or_zone_id}/access/organizations/revoke_user",
+            body=maybe_transform(
+                {
+                    "email": email,
+                    "body_devices": body_devices,
+                    "user_uid": user_uid,
+                    "warp_session_reauth": warp_session_reauth,
+                },
+                organization_revoke_users_params.OrganizationRevokeUsersParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {"query_devices": query_devices}, organization_revoke_users_params.OrganizationRevokeUsersParams
+                ),
+                post_parser=ResultWrapper[Optional[OrganizationRevokeUsersResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Any, ResultWrapper[OrganizationRevokeUsersResponse]
+            ),  # Enum types cannot be passed in as arguments in the type system
+        )
+
+
+class AsyncOrganizationsResource(AsyncAPIResource):
+    @cached_property
+    def doh(self) -> AsyncDOHResource:
+        return AsyncDOHResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncOrganizationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncOrganizationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncOrganizationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncOrganizationsResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        auth_domain: str,
+        name: str,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        deny_unmatched_requests: bool | Omit = omit,
+        deny_unmatched_requests_exempted_zone_names: SequenceNotStr[str] | Omit = omit,
+        is_ui_read_only: bool | Omit = omit,
+        login_design: LoginDesignParam | Omit = omit,
+        session_duration: str | Omit = omit,
+        ui_read_only_toggle_reason: str | Omit = omit,
+        user_seat_expiration_inactive_time: str | Omit = omit,
+        warp_auth_session_duration: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Organization]:
+        """
+        Sets up a Zero Trust organization for your account or zone.
+
+        Args:
+          auth_domain: The unique subdomain assigned to your Zero Trust organization.
+
+          name: The name of your Zero Trust organization.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          allow_authenticate_via_warp: When set to true, users can authenticate via WARP for any application in your
+              organization. Application settings will take precedence over this value.
+
+          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
+              login.
+
+          deny_unmatched_requests: Determines whether to deny all requests to Cloudflare-protected resources that
+              lack an associated Access application. If enabled, you must explicitly configure
+              an Access application and policy to allow traffic to your Cloudflare-protected
+              resources. For domains you want to be public across all subdomains, add the
+              domain to the `deny_unmatched_requests_exempted_zone_names` array.
+
+          deny_unmatched_requests_exempted_zone_names: Contains zone names to exempt from the `deny_unmatched_requests` feature.
+              Requests to a subdomain in an exempted zone will block unauthenticated traffic
+              by default if there is a configured Access application and policy that matches
+              the request.
+
+          is_ui_read_only: Lock all settings as Read-Only in the Dashboard, regardless of user permission.
+              Updates may only be made via the API or Terraform for this account when enabled.
+
+          session_duration: The amount of time that tokens issued for applications will be valid. Must be in
+              the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m,
+              h.
+
+          ui_read_only_toggle_reason: A description of the reason why the UI read only field is being toggled.
+
+          user_seat_expiration_inactive_time: The amount of time a user seat is inactive before it expires. When the user seat
+              exceeds the set time of inactivity, the user is removed as an active seat and no
+              longer counts against your Teams seat count. Minimum value for this setting is 1
+              month (730h). Must be in the format `300ms` or `2h45m`. Valid time units are:
+              `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.
+
+          warp_auth_session_duration: The amount of time that tokens issued for applications will be valid. Must be in
+              the format `30m` or `2h45m`. Valid time units are: m, h.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return await self._post(
+            f"/{account_or_zone}/{account_or_zone_id}/access/organizations",
+            body=await async_maybe_transform(
+                {
+                    "auth_domain": auth_domain,
+                    "name": name,
+                    "allow_authenticate_via_warp": allow_authenticate_via_warp,
+                    "auto_redirect_to_identity": auto_redirect_to_identity,
+                    "deny_unmatched_requests": deny_unmatched_requests,
+                    "deny_unmatched_requests_exempted_zone_names": deny_unmatched_requests_exempted_zone_names,
+                    "is_ui_read_only": is_ui_read_only,
+                    "login_design": login_design,
+                    "session_duration": session_duration,
+                    "ui_read_only_toggle_reason": ui_read_only_toggle_reason,
+                    "user_seat_expiration_inactive_time": user_seat_expiration_inactive_time,
+                    "warp_auth_session_duration": warp_auth_session_duration,
+                },
+                organization_create_params.OrganizationCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Organization]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Organization]], ResultWrapper[Organization]),
+        )
+
+    async def update(
+        self,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        allow_authenticate_via_warp: bool | Omit = omit,
+        auth_domain: str | Omit = omit,
+        auto_redirect_to_identity: bool | Omit = omit,
+        custom_pages: organization_update_params.CustomPages | Omit = omit,
+        deny_unmatched_requests: bool | Omit = omit,
+        deny_unmatched_requests_exempted_zone_names: SequenceNotStr[str] | Omit = omit,
+        is_ui_read_only: bool | Omit = omit,
+        login_design: LoginDesignParam | Omit = omit,
+        name: str | Omit = omit,
+        session_duration: str | Omit = omit,
+        ui_read_only_toggle_reason: str | Omit = omit,
+        user_seat_expiration_inactive_time: str | Omit = omit,
+        warp_auth_session_duration: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Organization]:
+        """
+        Updates the configuration for your Zero Trust organization.
+
+        Args:
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          allow_authenticate_via_warp: When set to true, users can authenticate via WARP for any application in your
+              organization. Application settings will take precedence over this value.
+
+          auth_domain: The unique subdomain assigned to your Zero Trust organization.
+
+          auto_redirect_to_identity: When set to `true`, users skip the identity provider selection step during
+              login.
+
+          deny_unmatched_requests: Determines whether to deny all requests to Cloudflare-protected resources that
+              lack an associated Access application. If enabled, you must explicitly configure
+              an Access application and policy to allow traffic to your Cloudflare-protected
+              resources. For domains you want to be public across all subdomains, add the
+              domain to the `deny_unmatched_requests_exempted_zone_names` array.
+
+          deny_unmatched_requests_exempted_zone_names: Contains zone names to exempt from the `deny_unmatched_requests` feature.
+              Requests to a subdomain in an exempted zone will block unauthenticated traffic
+              by default if there is a configured Access application and policy that matches
+              the request.
+
+          is_ui_read_only: Lock all settings as Read-Only in the Dashboard, regardless of user permission.
+              Updates may only be made via the API or Terraform for this account when enabled.
+
+          name: The name of your Zero Trust organization.
+
+          session_duration: The amount of time that tokens issued for applications will be valid. Must be in
+              the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m,
+              h.
+
+          ui_read_only_toggle_reason: A description of the reason why the UI read only field is being toggled.
+
+          user_seat_expiration_inactive_time: The amount of time a user seat is inactive before it expires. When the user seat
+              exceeds the set time of inactivity, the user is removed as an active seat and no
+              longer counts against your Teams seat count. Minimum value for this setting is 1
+              month (730h). Must be in the format `300ms` or `2h45m`. Valid time units are:
+              `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.
+
+          warp_auth_session_duration: The amount of time that tokens issued for applications will be valid. Must be in
+              the format `30m` or `2h45m`. Valid time units are: m, h.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return await self._put(
+            f"/{account_or_zone}/{account_or_zone_id}/access/organizations",
+            body=await async_maybe_transform(
+                {
+                    "allow_authenticate_via_warp": allow_authenticate_via_warp,
+                    "auth_domain": auth_domain,
+                    "auto_redirect_to_identity": auto_redirect_to_identity,
+                    "custom_pages": custom_pages,
+                    "deny_unmatched_requests": deny_unmatched_requests,
+                    "deny_unmatched_requests_exempted_zone_names": deny_unmatched_requests_exempted_zone_names,
+                    "is_ui_read_only": is_ui_read_only,
+                    "login_design": login_design,
+                    "name": name,
+                    "session_duration": session_duration,
+                    "ui_read_only_toggle_reason": ui_read_only_toggle_reason,
+                    "user_seat_expiration_inactive_time": user_seat_expiration_inactive_time,
+                    "warp_auth_session_duration": warp_auth_session_duration,
+                },
+                organization_update_params.OrganizationUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Organization]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Organization]], ResultWrapper[Organization]),
+        )
+
+    async def list(
+        self,
+        *,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[Organization]:
+        """
+        Returns the configuration for your Zero Trust organization.
+
+        Args:
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return await self._get(
+            f"/{account_or_zone}/{account_or_zone_id}/access/organizations",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Organization]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Organization]], ResultWrapper[Organization]),
+        )
+
+    async def revoke_users(
+        self,
+        *,
+        email: str,
+        account_id: str | Omit = omit,
+        zone_id: str | Omit = omit,
+        query_devices: bool | Omit = omit,
+        body_devices: bool | Omit = omit,
+        user_uid: str | Omit = omit,
+        warp_session_reauth: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[OrganizationRevokeUsersResponse]:
+        """
+        Revokes a user's access across all applications.
+
+        Args:
+          email: The email of the user to revoke.
+
+          account_id: The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+
+          zone_id: The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+
+          query_devices: When set to `true`, all devices associated with the user will be revoked.
+
+          body_devices: When set to `true`, all devices associated with the user will be revoked.
+
+          user_uid: The uuid of the user to revoke.
+
+          warp_session_reauth: When set to `true`, the user will be required to re-authenticate to WARP for all
+              Gateway policies that enforce a WARP client session duration. When `false`, the
+              user’s WARP session will remain active
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if account_id and zone_id:
+            raise ValueError("You cannot provide both account_id and zone_id")
+
+        if account_id:
+            account_or_zone = "accounts"
+            account_or_zone_id = account_id
+        else:
+            if not zone_id:
+                raise ValueError("You must provide either account_id or zone_id")
+
+            account_or_zone = "zones"
+            account_or_zone_id = zone_id
+        return await self._post(
+            f"/{account_or_zone}/{account_or_zone_id}/access/organizations/revoke_user",
+            body=await async_maybe_transform(
+                {
+                    "email": email,
+                    "body_devices": body_devices,
+                    "user_uid": user_uid,
+                    "warp_session_reauth": warp_session_reauth,
+                },
+                organization_revoke_users_params.OrganizationRevokeUsersParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"query_devices": query_devices}, organization_revoke_users_params.OrganizationRevokeUsersParams
+                ),
+                post_parser=ResultWrapper[Optional[OrganizationRevokeUsersResponse]]._unwrapper,
+            ),
+            cast_to=cast(
+                Any, ResultWrapper[OrganizationRevokeUsersResponse]
+            ),  # Enum types cannot be passed in as arguments in the type system
+        )
+
+
+class OrganizationsResourceWithRawResponse:
+    def __init__(self, organizations: OrganizationsResource) -> None:
+        self._organizations = organizations
+
+        self.create = to_raw_response_wrapper(
+            organizations.create,
+        )
+        self.update = to_raw_response_wrapper(
+            organizations.update,
+        )
+        self.list = to_raw_response_wrapper(
+            organizations.list,
+        )
+        self.revoke_users = to_raw_response_wrapper(
+            organizations.revoke_users,
+        )
+
+    @cached_property
+    def doh(self) -> DOHResourceWithRawResponse:
+        return DOHResourceWithRawResponse(self._organizations.doh)
+
+
+class AsyncOrganizationsResourceWithRawResponse:
+    def __init__(self, organizations: AsyncOrganizationsResource) -> None:
+        self._organizations = organizations
+
+        self.create = async_to_raw_response_wrapper(
+            organizations.create,
+        )
+        self.update = async_to_raw_response_wrapper(
+            organizations.update,
+        )
+        self.list = async_to_raw_response_wrapper(
+            organizations.list,
+        )
+        self.revoke_users = async_to_raw_response_wrapper(
+            organizations.revoke_users,
+        )
+
+    @cached_property
+    def doh(self) -> AsyncDOHResourceWithRawResponse:
+        return AsyncDOHResourceWithRawResponse(self._organizations.doh)
+
+
+class OrganizationsResourceWithStreamingResponse:
+    def __init__(self, organizations: OrganizationsResource) -> None:
+        self._organizations = organizations
+
+        self.create = to_streamed_response_wrapper(
+            organizations.create,
+        )
+        self.update = to_streamed_response_wrapper(
+            organizations.update,
+        )
+        self.list = to_streamed_response_wrapper(
+            organizations.list,
+        )
+        self.revoke_users = to_streamed_response_wrapper(
+            organizations.revoke_users,
+        )
+
+    @cached_property
+    def doh(self) -> DOHResourceWithStreamingResponse:
+        return DOHResourceWithStreamingResponse(self._organizations.doh)
+
+
+class AsyncOrganizationsResourceWithStreamingResponse:
+    def __init__(self, organizations: AsyncOrganizationsResource) -> None:
+        self._organizations = organizations
+
+        self.create = async_to_streamed_response_wrapper(
+            organizations.create,
+        )
+        self.update = async_to_streamed_response_wrapper(
+            organizations.update,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            organizations.list,
+        )
+        self.revoke_users = async_to_streamed_response_wrapper(
+            organizations.revoke_users,
+        )
+
+    @cached_property
+    def doh(self) -> AsyncDOHResourceWithStreamingResponse:
+        return AsyncDOHResourceWithStreamingResponse(self._organizations.doh)
diff --git a/src/cloudflare/resources/zero_trust/risk_scoring/behaviours.py b/src/cloudflare/resources/zero_trust/risk_scoring/behaviours.py
index 8f4f42fc83c..eadc2e70206 100644
--- a/src/cloudflare/resources/zero_trust/risk_scoring/behaviours.py
+++ b/src/cloudflare/resources/zero_trust/risk_scoring/behaviours.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Dict, Type, cast
+from typing import Dict, Type, Optional, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, not_given
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -31,30 +28,39 @@
 class BehavioursResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> BehavioursResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return BehavioursResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> BehavioursResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return BehavioursResourceWithStreamingResponse(self)
 
     def update(
         self,
-        account_identifier: str,
         *,
-        behaviors: Dict[str, behaviour_update_params.Behaviors] | NotGiven = NOT_GIVEN,
+        account_id: str,
+        behaviors: Dict[str, behaviour_update_params.Behaviors],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> BehaviourUpdateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[BehaviourUpdateResponse]:
         """
         Update configuration for risk behaviors
 
         Args:
-          account_identifier: Identifier
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -63,38 +69,36 @@ def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._put(
-            f"/accounts/{account_identifier}/zt_risk_scoring/behaviors",
+            f"/accounts/{account_id}/zt_risk_scoring/behaviors",
             body=maybe_transform({"behaviors": behaviors}, behaviour_update_params.BehaviourUpdateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[BehaviourUpdateResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[BehaviourUpdateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[BehaviourUpdateResponse], ResultWrapper[BehaviourUpdateResponse]),
+            cast_to=cast(Type[Optional[BehaviourUpdateResponse]], ResultWrapper[BehaviourUpdateResponse]),
         )
 
     def get(
         self,
-        account_identifier: str,
         *,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> BehaviourGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[BehaviourGetResponse]:
         """
         Get all behaviors and associated configuration
 
         Args:
-          account_identifier: Identifier
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -103,48 +107,57 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get(
-            f"/accounts/{account_identifier}/zt_risk_scoring/behaviors",
+            f"/accounts/{account_id}/zt_risk_scoring/behaviors",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[BehaviourGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[BehaviourGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[BehaviourGetResponse], ResultWrapper[BehaviourGetResponse]),
+            cast_to=cast(Type[Optional[BehaviourGetResponse]], ResultWrapper[BehaviourGetResponse]),
         )
 
 
 class AsyncBehavioursResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncBehavioursResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncBehavioursResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncBehavioursResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncBehavioursResourceWithStreamingResponse(self)
 
     async def update(
         self,
-        account_identifier: str,
         *,
-        behaviors: Dict[str, behaviour_update_params.Behaviors] | NotGiven = NOT_GIVEN,
+        account_id: str,
+        behaviors: Dict[str, behaviour_update_params.Behaviors],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> BehaviourUpdateResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[BehaviourUpdateResponse]:
         """
         Update configuration for risk behaviors
 
         Args:
-          account_identifier: Identifier
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -153,38 +166,36 @@ async def update(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._put(
-            f"/accounts/{account_identifier}/zt_risk_scoring/behaviors",
+            f"/accounts/{account_id}/zt_risk_scoring/behaviors",
             body=await async_maybe_transform({"behaviors": behaviors}, behaviour_update_params.BehaviourUpdateParams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[BehaviourUpdateResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[BehaviourUpdateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[BehaviourUpdateResponse], ResultWrapper[BehaviourUpdateResponse]),
+            cast_to=cast(Type[Optional[BehaviourUpdateResponse]], ResultWrapper[BehaviourUpdateResponse]),
         )
 
     async def get(
         self,
-        account_identifier: str,
         *,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> BehaviourGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[BehaviourGetResponse]:
         """
         Get all behaviors and associated configuration
 
         Args:
-          account_identifier: Identifier
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -193,18 +204,18 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._get(
-            f"/accounts/{account_identifier}/zt_risk_scoring/behaviors",
+            f"/accounts/{account_id}/zt_risk_scoring/behaviors",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[BehaviourGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[BehaviourGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[BehaviourGetResponse], ResultWrapper[BehaviourGetResponse]),
+            cast_to=cast(Type[Optional[BehaviourGetResponse]], ResultWrapper[BehaviourGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/zero_trust/risk_scoring/integrations/integrations.py b/src/cloudflare/resources/zero_trust/risk_scoring/integrations/integrations.py
index 0e1c8f96254..3b29a5b4835 100644
--- a/src/cloudflare/resources/zero_trust/risk_scoring/integrations/integrations.py
+++ b/src/cloudflare/resources/zero_trust/risk_scoring/integrations/integrations.py
@@ -7,11 +7,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ....._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
 from .references import (
     ReferencesResource,
     AsyncReferencesResource,
@@ -47,10 +44,21 @@ def references(self) -> ReferencesResource:
 
     @cached_property
     def with_raw_response(self) -> IntegrationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return IntegrationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> IntegrationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return IntegrationsResourceWithStreamingResponse(self)
 
     def create(
@@ -59,19 +67,19 @@ def create(
         account_id: str,
         integration_type: Literal["Okta"],
         tenant_url: str,
-        reference_id: Optional[str] | NotGiven = NOT_GIVEN,
+        reference_id: Optional[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IntegrationCreateResponse]:
         """
         Create new risk score integration.
 
         Args:
-          tenant_url: The base url of the tenant, e.g. "https://tenant.okta.com"
+          tenant_url: The base url of the tenant, e.g. "https://tenant.okta.com".
 
           reference_id: A reference id that can be supplied by the client. Currently this should be set
               to the Access-Okta IDP ID (a UUIDv4).
@@ -114,24 +122,23 @@ def update(
         account_id: str,
         active: bool,
         tenant_url: str,
-        reference_id: Optional[str] | NotGiven = NOT_GIVEN,
+        reference_id: Optional[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IntegrationUpdateResponse]:
         """
-        Update a risk score integration.
-
-        Overwrite the reference_id, tenant_url, and active values with the ones provided
+        Overwrite the reference_id, tenant_url, and active values with the ones
+        provided.
 
         Args:
           active: Whether this integration is enabled. If disabled, no risk changes will be
               exported to the third-party.
 
-          tenant_url: The base url of the tenant, e.g. "https://tenant.okta.com"
+          tenant_url: The base url of the tenant, e.g. "https://tenant.okta.com".
 
           reference_id: A reference id that can be supplied by the client. Currently this should be set
               to the Access-Okta IDP ID (a UUIDv4).
@@ -178,7 +185,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[IntegrationListResponse]:
         """
         List all risk score integrations for the account.
@@ -213,7 +220,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Delete a risk score integration.
@@ -253,7 +260,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IntegrationGetResponse]:
         """
         Get risk score integration by id.
@@ -291,10 +298,21 @@ def references(self) -> AsyncReferencesResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncIntegrationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncIntegrationsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncIntegrationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncIntegrationsResourceWithStreamingResponse(self)
 
     async def create(
@@ -303,19 +321,19 @@ async def create(
         account_id: str,
         integration_type: Literal["Okta"],
         tenant_url: str,
-        reference_id: Optional[str] | NotGiven = NOT_GIVEN,
+        reference_id: Optional[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IntegrationCreateResponse]:
         """
         Create new risk score integration.
 
         Args:
-          tenant_url: The base url of the tenant, e.g. "https://tenant.okta.com"
+          tenant_url: The base url of the tenant, e.g. "https://tenant.okta.com".
 
           reference_id: A reference id that can be supplied by the client. Currently this should be set
               to the Access-Okta IDP ID (a UUIDv4).
@@ -358,24 +376,23 @@ async def update(
         account_id: str,
         active: bool,
         tenant_url: str,
-        reference_id: Optional[str] | NotGiven = NOT_GIVEN,
+        reference_id: Optional[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IntegrationUpdateResponse]:
         """
-        Update a risk score integration.
-
-        Overwrite the reference_id, tenant_url, and active values with the ones provided
+        Overwrite the reference_id, tenant_url, and active values with the ones
+        provided.
 
         Args:
           active: Whether this integration is enabled. If disabled, no risk changes will be
               exported to the third-party.
 
-          tenant_url: The base url of the tenant, e.g. "https://tenant.okta.com"
+          tenant_url: The base url of the tenant, e.g. "https://tenant.okta.com".
 
           reference_id: A reference id that can be supplied by the client. Currently this should be set
               to the Access-Okta IDP ID (a UUIDv4).
@@ -422,7 +439,7 @@ def list(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[IntegrationListResponse, AsyncSinglePage[IntegrationListResponse]]:
         """
         List all risk score integrations for the account.
@@ -457,7 +474,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> object:
         """
         Delete a risk score integration.
@@ -497,7 +514,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[IntegrationGetResponse]:
         """
         Get risk score integration by id.
diff --git a/src/cloudflare/resources/zero_trust/risk_scoring/integrations/references.py b/src/cloudflare/resources/zero_trust/risk_scoring/integrations/references.py
index 654afa2ccc5..f3587823371 100644
--- a/src/cloudflare/resources/zero_trust/risk_scoring/integrations/references.py
+++ b/src/cloudflare/resources/zero_trust/risk_scoring/integrations/references.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ....._types import Body, Query, Headers, NotGiven, not_given
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -25,10 +25,21 @@
 class ReferencesResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ReferencesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ReferencesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ReferencesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ReferencesResourceWithStreamingResponse(self)
 
     def get(
@@ -41,7 +52,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ReferenceGetResponse]:
         """
         Get risk score integration by reference id.
@@ -75,10 +86,21 @@ def get(
 class AsyncReferencesResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncReferencesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncReferencesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncReferencesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncReferencesResourceWithStreamingResponse(self)
 
     async def get(
@@ -91,7 +113,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ReferenceGetResponse]:
         """
         Get risk score integration by reference id.
diff --git a/src/cloudflare/resources/zero_trust/risk_scoring/risk_scoring.py b/src/cloudflare/resources/zero_trust/risk_scoring/risk_scoring.py
index 143c217ba65..48ddc41779b 100644
--- a/src/cloudflare/resources/zero_trust/risk_scoring/risk_scoring.py
+++ b/src/cloudflare/resources/zero_trust/risk_scoring/risk_scoring.py
@@ -2,8 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, cast
-from typing_extensions import Literal
+from typing import Type, Optional, cast
 
 import httpx
 
@@ -15,11 +14,7 @@
     SummaryResourceWithStreamingResponse,
     AsyncSummaryResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from .behaviours import (
     BehavioursResource,
@@ -37,7 +32,8 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from .integrations import (
+from ...._base_client import make_request_options
+from .integrations.integrations import (
     IntegrationsResource,
     AsyncIntegrationsResource,
     IntegrationsResourceWithRawResponse,
@@ -45,11 +41,7 @@
     IntegrationsResourceWithStreamingResponse,
     AsyncIntegrationsResourceWithStreamingResponse,
 )
-from ...._base_client import make_request_options
-from ....types.zero_trust import risk_scoring_get_params
-from .integrations.integrations import IntegrationsResource, AsyncIntegrationsResource
 from ....types.zero_trust.risk_scoring_get_response import RiskScoringGetResponse
-from ....types.zero_trust.risk_scoring_reset_response import RiskScoringResetResponse
 
 __all__ = ["RiskScoringResource", "AsyncRiskScoringResource"]
 
@@ -69,36 +61,39 @@ def integrations(self) -> IntegrationsResource:
 
     @cached_property
     def with_raw_response(self) -> RiskScoringResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return RiskScoringResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> RiskScoringResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return RiskScoringResourceWithStreamingResponse(self)
 
     def get(
         self,
         user_id: str,
         *,
-        account_identifier: str,
-        direction: Literal["desc", "asc"] | NotGiven = NOT_GIVEN,
-        order_by: Literal["timestamp", "risk_level"] | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RiskScoringGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RiskScoringGetResponse]:
         """
         Get risk event/score information for a specific user
 
         Args:
-          account_identifier: Identifier
-
-          user_id: The ID for a user
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -107,51 +102,38 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not user_id:
             raise ValueError(f"Expected a non-empty value for `user_id` but received {user_id!r}")
         return self._get(
-            f"/accounts/{account_identifier}/zt_risk_scoring/{user_id}",
+            f"/accounts/{account_id}/zt_risk_scoring/{user_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "direction": direction,
-                        "order_by": order_by,
-                        "page": page,
-                        "per_page": per_page,
-                    },
-                    risk_scoring_get_params.RiskScoringGetParams,
-                ),
-                post_parser=ResultWrapper[RiskScoringGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[RiskScoringGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[RiskScoringGetResponse], ResultWrapper[RiskScoringGetResponse]),
+            cast_to=cast(Type[Optional[RiskScoringGetResponse]], ResultWrapper[RiskScoringGetResponse]),
         )
 
     def reset(
         self,
         user_id: str,
         *,
-        account_identifier: str,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RiskScoringResetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
         Clear the risk score for a particular user
 
         Args:
-          account_identifier: Identifier
-
-          user_id: The ID for a user
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -160,25 +142,20 @@ def reset(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not user_id:
             raise ValueError(f"Expected a non-empty value for `user_id` but received {user_id!r}")
-        return cast(
-            RiskScoringResetResponse,
-            self._post(
-                f"/accounts/{account_identifier}/zt_risk_scoring/{user_id}/reset",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[RiskScoringResetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[RiskScoringResetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._post(
+            f"/accounts/{account_id}/zt_risk_scoring/{user_id}/reset",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
 
@@ -197,36 +174,39 @@ def integrations(self) -> AsyncIntegrationsResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncRiskScoringResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncRiskScoringResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncRiskScoringResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncRiskScoringResourceWithStreamingResponse(self)
 
     async def get(
         self,
         user_id: str,
         *,
-        account_identifier: str,
-        direction: Literal["desc", "asc"] | NotGiven = NOT_GIVEN,
-        order_by: Literal["timestamp", "risk_level"] | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RiskScoringGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[RiskScoringGetResponse]:
         """
         Get risk event/score information for a specific user
 
         Args:
-          account_identifier: Identifier
-
-          user_id: The ID for a user
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -235,51 +215,38 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not user_id:
             raise ValueError(f"Expected a non-empty value for `user_id` but received {user_id!r}")
         return await self._get(
-            f"/accounts/{account_identifier}/zt_risk_scoring/{user_id}",
+            f"/accounts/{account_id}/zt_risk_scoring/{user_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=await async_maybe_transform(
-                    {
-                        "direction": direction,
-                        "order_by": order_by,
-                        "page": page,
-                        "per_page": per_page,
-                    },
-                    risk_scoring_get_params.RiskScoringGetParams,
-                ),
-                post_parser=ResultWrapper[RiskScoringGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[RiskScoringGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[RiskScoringGetResponse], ResultWrapper[RiskScoringGetResponse]),
+            cast_to=cast(Type[Optional[RiskScoringGetResponse]], ResultWrapper[RiskScoringGetResponse]),
         )
 
     async def reset(
         self,
         user_id: str,
         *,
-        account_identifier: str,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> RiskScoringResetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
         """
         Clear the risk score for a particular user
 
         Args:
-          account_identifier: Identifier
-
-          user_id: The ID for a user
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -288,25 +255,20 @@ async def reset(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not user_id:
             raise ValueError(f"Expected a non-empty value for `user_id` but received {user_id!r}")
-        return cast(
-            RiskScoringResetResponse,
-            await self._post(
-                f"/accounts/{account_identifier}/zt_risk_scoring/{user_id}/reset",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[RiskScoringResetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[RiskScoringResetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._post(
+            f"/accounts/{account_id}/zt_risk_scoring/{user_id}/reset",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
             ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
         )
 
 
diff --git a/src/cloudflare/resources/zero_trust/risk_scoring/summary.py b/src/cloudflare/resources/zero_trust/risk_scoring/summary.py
index 9546d14a2c6..0a43b204780 100644
--- a/src/cloudflare/resources/zero_trust/risk_scoring/summary.py
+++ b/src/cloudflare/resources/zero_trust/risk_scoring/summary.py
@@ -2,16 +2,11 @@
 
 from __future__ import annotations
 
-from typing import Type, cast
-from typing_extensions import Literal
+from typing import Type, Optional, cast
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -22,7 +17,6 @@
 )
 from ...._wrappers import ResultWrapper
 from ...._base_client import make_request_options
-from ....types.zero_trust.risk_scoring import summary_get_params
 from ....types.zero_trust.risk_scoring.summary_get_response import SummaryGetResponse
 
 __all__ = ["SummaryResource", "AsyncSummaryResource"]
@@ -31,33 +25,38 @@
 class SummaryResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SummaryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SummaryResourceWithStreamingResponse(self)
 
     def get(
         self,
-        account_identifier: str,
         *,
-        direction: Literal["desc", "asc"] | NotGiven = NOT_GIVEN,
-        order_by: Literal["timestamp", "event_count", "max_risk_level"] | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SummaryGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SummaryGetResponse]:
         """
         Get risk score info for all users in the account
 
         Args:
-          account_identifier: Identifier
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -66,60 +65,56 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get(
-            f"/accounts/{account_identifier}/zt_risk_scoring/summary",
+            f"/accounts/{account_id}/zt_risk_scoring/summary",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "direction": direction,
-                        "order_by": order_by,
-                        "page": page,
-                        "per_page": per_page,
-                    },
-                    summary_get_params.SummaryGetParams,
-                ),
-                post_parser=ResultWrapper[SummaryGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[SummaryGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[SummaryGetResponse], ResultWrapper[SummaryGetResponse]),
+            cast_to=cast(Type[Optional[SummaryGetResponse]], ResultWrapper[SummaryGetResponse]),
         )
 
 
 class AsyncSummaryResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSummaryResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSummaryResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSummaryResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSummaryResourceWithStreamingResponse(self)
 
     async def get(
         self,
-        account_identifier: str,
         *,
-        direction: Literal["desc", "asc"] | NotGiven = NOT_GIVEN,
-        order_by: Literal["timestamp", "event_count", "max_risk_level"] | NotGiven = NOT_GIVEN,
-        page: int | NotGiven = NOT_GIVEN,
-        per_page: int | NotGiven = NOT_GIVEN,
+        account_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SummaryGetResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SummaryGetResponse]:
         """
         Get risk score info for all users in the account
 
         Args:
-          account_identifier: Identifier
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -128,27 +123,18 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return await self._get(
-            f"/accounts/{account_identifier}/zt_risk_scoring/summary",
+            f"/accounts/{account_id}/zt_risk_scoring/summary",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=await async_maybe_transform(
-                    {
-                        "direction": direction,
-                        "order_by": order_by,
-                        "page": page,
-                        "per_page": per_page,
-                    },
-                    summary_get_params.SummaryGetParams,
-                ),
-                post_parser=ResultWrapper[SummaryGetResponse]._unwrapper,
+                post_parser=ResultWrapper[Optional[SummaryGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[SummaryGetResponse], ResultWrapper[SummaryGetResponse]),
+            cast_to=cast(Type[Optional[SummaryGetResponse]], ResultWrapper[SummaryGetResponse]),
         )
 
 
diff --git a/src/cloudflare/resources/zero_trust/seats.py b/src/cloudflare/resources/zero_trust/seats.py
index 583fab41a80..33b23e1567c 100644
--- a/src/cloudflare/resources/zero_trust/seats.py
+++ b/src/cloudflare/resources/zero_trust/seats.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Iterable, Optional, cast
+from typing import Iterable
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -19,10 +16,10 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._wrappers import ResultWrapper
-from ..._base_client import make_request_options
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
 from ...types.zero_trust import seat_edit_params
-from ...types.zero_trust.seat_edit_response import SeatEditResponse
+from ...types.zero_trust.seat import Seat
 
 __all__ = ["SeatsResource", "AsyncSeatsResource"]
 
@@ -30,10 +27,21 @@
 class SeatsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SeatsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SeatsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SeatsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SeatsResourceWithStreamingResponse(self)
 
     def edit(
@@ -46,14 +54,14 @@ def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SeatEditResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[Seat]:
         """
         Removes a user from a Zero Trust seat when both `access_seat` and `gateway_seat`
         are set to false.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -65,30 +73,39 @@ def edit(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._patch(
+        return self._get_api_list(
             f"/accounts/{account_id}/access/seats",
-            body=maybe_transform(body, seat_edit_params.SeatEditParams),
+            page=SyncSinglePage[Seat],
+            body=maybe_transform(body, Iterable[seat_edit_params.Body]),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SeatEditResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[SeatEditResponse]], ResultWrapper[SeatEditResponse]),
+            model=Seat,
+            method="patch",
         )
 
 
 class AsyncSeatsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSeatsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSeatsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSeatsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSeatsResourceWithStreamingResponse(self)
 
-    async def edit(
+    def edit(
         self,
         *,
         account_id: str,
@@ -98,14 +115,14 @@ async def edit(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SeatEditResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Seat, AsyncSinglePage[Seat]]:
         """
         Removes a user from a Zero Trust seat when both `access_seat` and `gateway_seat`
         are set to false.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -117,17 +134,15 @@ async def edit(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._patch(
+        return self._get_api_list(
             f"/accounts/{account_id}/access/seats",
-            body=await async_maybe_transform(body, seat_edit_params.SeatEditParams),
+            page=AsyncSinglePage[Seat],
+            body=maybe_transform(body, Iterable[seat_edit_params.Body]),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[SeatEditResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[SeatEditResponse]], ResultWrapper[SeatEditResponse]),
+            model=Seat,
+            method="patch",
         )
 
 
diff --git a/src/cloudflare/resources/zero_trust/tunnels/__init__.py b/src/cloudflare/resources/zero_trust/tunnels/__init__.py
index 6b6b14ed647..7bd5ec5c21f 100644
--- a/src/cloudflare/resources/zero_trust/tunnels/__init__.py
+++ b/src/cloudflare/resources/zero_trust/tunnels/__init__.py
@@ -1,13 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from .token import (
-    TokenResource,
-    AsyncTokenResource,
-    TokenResourceWithRawResponse,
-    AsyncTokenResourceWithRawResponse,
-    TokenResourceWithStreamingResponse,
-    AsyncTokenResourceWithStreamingResponse,
-)
 from .tunnels import (
     TunnelsResource,
     AsyncTunnelsResource,
@@ -16,70 +8,36 @@
     TunnelsResourceWithStreamingResponse,
     AsyncTunnelsResourceWithStreamingResponse,
 )
-from .connectors import (
-    ConnectorsResource,
-    AsyncConnectorsResource,
-    ConnectorsResourceWithRawResponse,
-    AsyncConnectorsResourceWithRawResponse,
-    ConnectorsResourceWithStreamingResponse,
-    AsyncConnectorsResourceWithStreamingResponse,
-)
-from .management import (
-    ManagementResource,
-    AsyncManagementResource,
-    ManagementResourceWithRawResponse,
-    AsyncManagementResourceWithRawResponse,
-    ManagementResourceWithStreamingResponse,
-    AsyncManagementResourceWithStreamingResponse,
-)
-from .connections import (
-    ConnectionsResource,
-    AsyncConnectionsResource,
-    ConnectionsResourceWithRawResponse,
-    AsyncConnectionsResourceWithRawResponse,
-    ConnectionsResourceWithStreamingResponse,
-    AsyncConnectionsResourceWithStreamingResponse,
+from .cloudflared import (
+    CloudflaredResource,
+    AsyncCloudflaredResource,
+    CloudflaredResourceWithRawResponse,
+    AsyncCloudflaredResourceWithRawResponse,
+    CloudflaredResourceWithStreamingResponse,
+    AsyncCloudflaredResourceWithStreamingResponse,
 )
-from .configurations import (
-    ConfigurationsResource,
-    AsyncConfigurationsResource,
-    ConfigurationsResourceWithRawResponse,
-    AsyncConfigurationsResourceWithRawResponse,
-    ConfigurationsResourceWithStreamingResponse,
-    AsyncConfigurationsResourceWithStreamingResponse,
+from .warp_connector import (
+    WARPConnectorResource,
+    AsyncWARPConnectorResource,
+    WARPConnectorResourceWithRawResponse,
+    AsyncWARPConnectorResourceWithRawResponse,
+    WARPConnectorResourceWithStreamingResponse,
+    AsyncWARPConnectorResourceWithStreamingResponse,
 )
 
 __all__ = [
-    "ConfigurationsResource",
-    "AsyncConfigurationsResource",
-    "ConfigurationsResourceWithRawResponse",
-    "AsyncConfigurationsResourceWithRawResponse",
-    "ConfigurationsResourceWithStreamingResponse",
-    "AsyncConfigurationsResourceWithStreamingResponse",
-    "ConnectionsResource",
-    "AsyncConnectionsResource",
-    "ConnectionsResourceWithRawResponse",
-    "AsyncConnectionsResourceWithRawResponse",
-    "ConnectionsResourceWithStreamingResponse",
-    "AsyncConnectionsResourceWithStreamingResponse",
-    "TokenResource",
-    "AsyncTokenResource",
-    "TokenResourceWithRawResponse",
-    "AsyncTokenResourceWithRawResponse",
-    "TokenResourceWithStreamingResponse",
-    "AsyncTokenResourceWithStreamingResponse",
-    "ConnectorsResource",
-    "AsyncConnectorsResource",
-    "ConnectorsResourceWithRawResponse",
-    "AsyncConnectorsResourceWithRawResponse",
-    "ConnectorsResourceWithStreamingResponse",
-    "AsyncConnectorsResourceWithStreamingResponse",
-    "ManagementResource",
-    "AsyncManagementResource",
-    "ManagementResourceWithRawResponse",
-    "AsyncManagementResourceWithRawResponse",
-    "ManagementResourceWithStreamingResponse",
-    "AsyncManagementResourceWithStreamingResponse",
+    "CloudflaredResource",
+    "AsyncCloudflaredResource",
+    "CloudflaredResourceWithRawResponse",
+    "AsyncCloudflaredResourceWithRawResponse",
+    "CloudflaredResourceWithStreamingResponse",
+    "AsyncCloudflaredResourceWithStreamingResponse",
+    "WARPConnectorResource",
+    "AsyncWARPConnectorResource",
+    "WARPConnectorResourceWithRawResponse",
+    "AsyncWARPConnectorResourceWithRawResponse",
+    "WARPConnectorResourceWithStreamingResponse",
+    "AsyncWARPConnectorResourceWithStreamingResponse",
     "TunnelsResource",
     "AsyncTunnelsResource",
     "TunnelsResourceWithRawResponse",
diff --git a/src/cloudflare/resources/zero_trust/tunnels/cloudflared/__init__.py b/src/cloudflare/resources/zero_trust/tunnels/cloudflared/__init__.py
new file mode 100644
index 00000000000..1a1c8c15bbe
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/tunnels/cloudflared/__init__.py
@@ -0,0 +1,89 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .token import (
+    TokenResource,
+    AsyncTokenResource,
+    TokenResourceWithRawResponse,
+    AsyncTokenResourceWithRawResponse,
+    TokenResourceWithStreamingResponse,
+    AsyncTokenResourceWithStreamingResponse,
+)
+from .connectors import (
+    ConnectorsResource,
+    AsyncConnectorsResource,
+    ConnectorsResourceWithRawResponse,
+    AsyncConnectorsResourceWithRawResponse,
+    ConnectorsResourceWithStreamingResponse,
+    AsyncConnectorsResourceWithStreamingResponse,
+)
+from .management import (
+    ManagementResource,
+    AsyncManagementResource,
+    ManagementResourceWithRawResponse,
+    AsyncManagementResourceWithRawResponse,
+    ManagementResourceWithStreamingResponse,
+    AsyncManagementResourceWithStreamingResponse,
+)
+from .cloudflared import (
+    CloudflaredResource,
+    AsyncCloudflaredResource,
+    CloudflaredResourceWithRawResponse,
+    AsyncCloudflaredResourceWithRawResponse,
+    CloudflaredResourceWithStreamingResponse,
+    AsyncCloudflaredResourceWithStreamingResponse,
+)
+from .connections import (
+    ConnectionsResource,
+    AsyncConnectionsResource,
+    ConnectionsResourceWithRawResponse,
+    AsyncConnectionsResourceWithRawResponse,
+    ConnectionsResourceWithStreamingResponse,
+    AsyncConnectionsResourceWithStreamingResponse,
+)
+from .configurations import (
+    ConfigurationsResource,
+    AsyncConfigurationsResource,
+    ConfigurationsResourceWithRawResponse,
+    AsyncConfigurationsResourceWithRawResponse,
+    ConfigurationsResourceWithStreamingResponse,
+    AsyncConfigurationsResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "ConfigurationsResource",
+    "AsyncConfigurationsResource",
+    "ConfigurationsResourceWithRawResponse",
+    "AsyncConfigurationsResourceWithRawResponse",
+    "ConfigurationsResourceWithStreamingResponse",
+    "AsyncConfigurationsResourceWithStreamingResponse",
+    "ConnectionsResource",
+    "AsyncConnectionsResource",
+    "ConnectionsResourceWithRawResponse",
+    "AsyncConnectionsResourceWithRawResponse",
+    "ConnectionsResourceWithStreamingResponse",
+    "AsyncConnectionsResourceWithStreamingResponse",
+    "TokenResource",
+    "AsyncTokenResource",
+    "TokenResourceWithRawResponse",
+    "AsyncTokenResourceWithRawResponse",
+    "TokenResourceWithStreamingResponse",
+    "AsyncTokenResourceWithStreamingResponse",
+    "ConnectorsResource",
+    "AsyncConnectorsResource",
+    "ConnectorsResourceWithRawResponse",
+    "AsyncConnectorsResourceWithRawResponse",
+    "ConnectorsResourceWithStreamingResponse",
+    "AsyncConnectorsResourceWithStreamingResponse",
+    "ManagementResource",
+    "AsyncManagementResource",
+    "ManagementResourceWithRawResponse",
+    "AsyncManagementResourceWithRawResponse",
+    "ManagementResourceWithStreamingResponse",
+    "AsyncManagementResourceWithStreamingResponse",
+    "CloudflaredResource",
+    "AsyncCloudflaredResource",
+    "CloudflaredResourceWithRawResponse",
+    "AsyncCloudflaredResourceWithRawResponse",
+    "CloudflaredResourceWithStreamingResponse",
+    "AsyncCloudflaredResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/tunnels/cloudflared/cloudflared.py b/src/cloudflare/resources/zero_trust/tunnels/cloudflared/cloudflared.py
new file mode 100644
index 00000000000..5f6a23aacfb
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/tunnels/cloudflared/cloudflared.py
@@ -0,0 +1,893 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Union, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from .token import (
+    TokenResource,
+    AsyncTokenResource,
+    TokenResourceWithRawResponse,
+    AsyncTokenResourceWithRawResponse,
+    TokenResourceWithStreamingResponse,
+    AsyncTokenResourceWithStreamingResponse,
+)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from .connectors import (
+    ConnectorsResource,
+    AsyncConnectorsResource,
+    ConnectorsResourceWithRawResponse,
+    AsyncConnectorsResourceWithRawResponse,
+    ConnectorsResourceWithStreamingResponse,
+    AsyncConnectorsResourceWithStreamingResponse,
+)
+from .management import (
+    ManagementResource,
+    AsyncManagementResource,
+    ManagementResourceWithRawResponse,
+    AsyncManagementResourceWithRawResponse,
+    ManagementResourceWithStreamingResponse,
+    AsyncManagementResourceWithStreamingResponse,
+)
+from ....._compat import cached_property
+from .connections import (
+    ConnectionsResource,
+    AsyncConnectionsResource,
+    ConnectionsResourceWithRawResponse,
+    AsyncConnectionsResourceWithRawResponse,
+    ConnectionsResourceWithStreamingResponse,
+    AsyncConnectionsResourceWithStreamingResponse,
+)
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from .....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from .configurations import (
+    ConfigurationsResource,
+    AsyncConfigurationsResource,
+    ConfigurationsResourceWithRawResponse,
+    AsyncConfigurationsResourceWithRawResponse,
+    ConfigurationsResourceWithStreamingResponse,
+    AsyncConfigurationsResourceWithStreamingResponse,
+)
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.zero_trust.tunnels import cloudflared_edit_params, cloudflared_list_params, cloudflared_create_params
+from .....types.shared.cloudflare_tunnel import CloudflareTunnel
+
+__all__ = ["CloudflaredResource", "AsyncCloudflaredResource"]
+
+
+class CloudflaredResource(SyncAPIResource):
+    @cached_property
+    def configurations(self) -> ConfigurationsResource:
+        return ConfigurationsResource(self._client)
+
+    @cached_property
+    def connections(self) -> ConnectionsResource:
+        return ConnectionsResource(self._client)
+
+    @cached_property
+    def token(self) -> TokenResource:
+        return TokenResource(self._client)
+
+    @cached_property
+    def connectors(self) -> ConnectorsResource:
+        return ConnectorsResource(self._client)
+
+    @cached_property
+    def management(self) -> ManagementResource:
+        return ManagementResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> CloudflaredResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return CloudflaredResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> CloudflaredResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return CloudflaredResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        config_src: Literal["local", "cloudflare"] | Omit = omit,
+        tunnel_secret: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudflareTunnel:
+        """
+        Creates a new Cloudflare Tunnel in an account.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          name: A user-friendly name for a tunnel.
+
+          config_src: Indicates if this is a locally or remotely configured tunnel. If `local`, manage
+              the tunnel using a YAML file on the origin machine. If `cloudflare`, manage the
+              tunnel on the Zero Trust dashboard.
+
+          tunnel_secret: Sets the password required to run a locally-managed tunnel. Must be at least 32
+              bytes and encoded as a base64 string.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/cfd_tunnel",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "config_src": config_src,
+                    "tunnel_secret": tunnel_secret,
+                },
+                cloudflared_create_params.CloudflaredCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CloudflareTunnel]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudflareTunnel], ResultWrapper[CloudflareTunnel]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        exclude_prefix: str | Omit = omit,
+        existed_at: str | Omit = omit,
+        include_prefix: str | Omit = omit,
+        is_deleted: bool | Omit = omit,
+        name: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal["inactive", "degraded", "healthy", "down"] | Omit = omit,
+        uuid: str | Omit = omit,
+        was_active_at: Union[str, datetime] | Omit = omit,
+        was_inactive_at: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[CloudflareTunnel]:
+        """
+        Lists and filters Cloudflare Tunnels in an account.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          existed_at: If provided, include only resources that were created (and not deleted) before
+              this time. URL encoded.
+
+          is_deleted: If `true`, only include deleted tunnels. If `false`, exclude deleted tunnels. If
+              empty, all tunnels will be included.
+
+          name: A user-friendly name for a tunnel.
+
+          page: Page number of paginated results.
+
+          per_page: Number of results to display.
+
+          status: The status of the tunnel. Valid values are `inactive` (tunnel has never been
+              run), `degraded` (tunnel is active and able to serve traffic but in an unhealthy
+              state), `healthy` (tunnel is active and able to serve traffic), or `down`
+              (tunnel can not serve traffic as it has no connections to the Cloudflare Edge).
+
+          uuid: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/cfd_tunnel",
+            page=SyncV4PagePaginationArray[CloudflareTunnel],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "exclude_prefix": exclude_prefix,
+                        "existed_at": existed_at,
+                        "include_prefix": include_prefix,
+                        "is_deleted": is_deleted,
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                        "status": status,
+                        "uuid": uuid,
+                        "was_active_at": was_active_at,
+                        "was_inactive_at": was_inactive_at,
+                    },
+                    cloudflared_list_params.CloudflaredListParams,
+                ),
+            ),
+            model=CloudflareTunnel,
+        )
+
+    def delete(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudflareTunnel:
+        """
+        Deletes a Cloudflare Tunnel from an account.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CloudflareTunnel]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudflareTunnel], ResultWrapper[CloudflareTunnel]),
+        )
+
+    def edit(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        tunnel_secret: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudflareTunnel:
+        """
+        Updates an existing Cloudflare Tunnel.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          name: A user-friendly name for a tunnel.
+
+          tunnel_secret: Sets the password required to run a locally-managed tunnel. Must be at least 32
+              bytes and encoded as a base64 string.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "tunnel_secret": tunnel_secret,
+                },
+                cloudflared_edit_params.CloudflaredEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CloudflareTunnel]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudflareTunnel], ResultWrapper[CloudflareTunnel]),
+        )
+
+    def get(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudflareTunnel:
+        """
+        Fetches a single Cloudflare Tunnel.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CloudflareTunnel]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudflareTunnel], ResultWrapper[CloudflareTunnel]),
+        )
+
+
+class AsyncCloudflaredResource(AsyncAPIResource):
+    @cached_property
+    def configurations(self) -> AsyncConfigurationsResource:
+        return AsyncConfigurationsResource(self._client)
+
+    @cached_property
+    def connections(self) -> AsyncConnectionsResource:
+        return AsyncConnectionsResource(self._client)
+
+    @cached_property
+    def token(self) -> AsyncTokenResource:
+        return AsyncTokenResource(self._client)
+
+    @cached_property
+    def connectors(self) -> AsyncConnectorsResource:
+        return AsyncConnectorsResource(self._client)
+
+    @cached_property
+    def management(self) -> AsyncManagementResource:
+        return AsyncManagementResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncCloudflaredResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncCloudflaredResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncCloudflaredResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncCloudflaredResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        config_src: Literal["local", "cloudflare"] | Omit = omit,
+        tunnel_secret: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudflareTunnel:
+        """
+        Creates a new Cloudflare Tunnel in an account.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          name: A user-friendly name for a tunnel.
+
+          config_src: Indicates if this is a locally or remotely configured tunnel. If `local`, manage
+              the tunnel using a YAML file on the origin machine. If `cloudflare`, manage the
+              tunnel on the Zero Trust dashboard.
+
+          tunnel_secret: Sets the password required to run a locally-managed tunnel. Must be at least 32
+              bytes and encoded as a base64 string.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/cfd_tunnel",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "config_src": config_src,
+                    "tunnel_secret": tunnel_secret,
+                },
+                cloudflared_create_params.CloudflaredCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CloudflareTunnel]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudflareTunnel], ResultWrapper[CloudflareTunnel]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        exclude_prefix: str | Omit = omit,
+        existed_at: str | Omit = omit,
+        include_prefix: str | Omit = omit,
+        is_deleted: bool | Omit = omit,
+        name: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal["inactive", "degraded", "healthy", "down"] | Omit = omit,
+        uuid: str | Omit = omit,
+        was_active_at: Union[str, datetime] | Omit = omit,
+        was_inactive_at: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[CloudflareTunnel, AsyncV4PagePaginationArray[CloudflareTunnel]]:
+        """
+        Lists and filters Cloudflare Tunnels in an account.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          existed_at: If provided, include only resources that were created (and not deleted) before
+              this time. URL encoded.
+
+          is_deleted: If `true`, only include deleted tunnels. If `false`, exclude deleted tunnels. If
+              empty, all tunnels will be included.
+
+          name: A user-friendly name for a tunnel.
+
+          page: Page number of paginated results.
+
+          per_page: Number of results to display.
+
+          status: The status of the tunnel. Valid values are `inactive` (tunnel has never been
+              run), `degraded` (tunnel is active and able to serve traffic but in an unhealthy
+              state), `healthy` (tunnel is active and able to serve traffic), or `down`
+              (tunnel can not serve traffic as it has no connections to the Cloudflare Edge).
+
+          uuid: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/cfd_tunnel",
+            page=AsyncV4PagePaginationArray[CloudflareTunnel],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "exclude_prefix": exclude_prefix,
+                        "existed_at": existed_at,
+                        "include_prefix": include_prefix,
+                        "is_deleted": is_deleted,
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                        "status": status,
+                        "uuid": uuid,
+                        "was_active_at": was_active_at,
+                        "was_inactive_at": was_inactive_at,
+                    },
+                    cloudflared_list_params.CloudflaredListParams,
+                ),
+            ),
+            model=CloudflareTunnel,
+        )
+
+    async def delete(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudflareTunnel:
+        """
+        Deletes a Cloudflare Tunnel from an account.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CloudflareTunnel]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudflareTunnel], ResultWrapper[CloudflareTunnel]),
+        )
+
+    async def edit(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        tunnel_secret: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudflareTunnel:
+        """
+        Updates an existing Cloudflare Tunnel.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          name: A user-friendly name for a tunnel.
+
+          tunnel_secret: Sets the password required to run a locally-managed tunnel. Must be at least 32
+              bytes and encoded as a base64 string.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "tunnel_secret": tunnel_secret,
+                },
+                cloudflared_edit_params.CloudflaredEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CloudflareTunnel]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudflareTunnel], ResultWrapper[CloudflareTunnel]),
+        )
+
+    async def get(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CloudflareTunnel:
+        """
+        Fetches a single Cloudflare Tunnel.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[CloudflareTunnel]._unwrapper,
+            ),
+            cast_to=cast(Type[CloudflareTunnel], ResultWrapper[CloudflareTunnel]),
+        )
+
+
+class CloudflaredResourceWithRawResponse:
+    def __init__(self, cloudflared: CloudflaredResource) -> None:
+        self._cloudflared = cloudflared
+
+        self.create = to_raw_response_wrapper(
+            cloudflared.create,
+        )
+        self.list = to_raw_response_wrapper(
+            cloudflared.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            cloudflared.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            cloudflared.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            cloudflared.get,
+        )
+
+    @cached_property
+    def configurations(self) -> ConfigurationsResourceWithRawResponse:
+        return ConfigurationsResourceWithRawResponse(self._cloudflared.configurations)
+
+    @cached_property
+    def connections(self) -> ConnectionsResourceWithRawResponse:
+        return ConnectionsResourceWithRawResponse(self._cloudflared.connections)
+
+    @cached_property
+    def token(self) -> TokenResourceWithRawResponse:
+        return TokenResourceWithRawResponse(self._cloudflared.token)
+
+    @cached_property
+    def connectors(self) -> ConnectorsResourceWithRawResponse:
+        return ConnectorsResourceWithRawResponse(self._cloudflared.connectors)
+
+    @cached_property
+    def management(self) -> ManagementResourceWithRawResponse:
+        return ManagementResourceWithRawResponse(self._cloudflared.management)
+
+
+class AsyncCloudflaredResourceWithRawResponse:
+    def __init__(self, cloudflared: AsyncCloudflaredResource) -> None:
+        self._cloudflared = cloudflared
+
+        self.create = async_to_raw_response_wrapper(
+            cloudflared.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            cloudflared.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            cloudflared.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            cloudflared.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            cloudflared.get,
+        )
+
+    @cached_property
+    def configurations(self) -> AsyncConfigurationsResourceWithRawResponse:
+        return AsyncConfigurationsResourceWithRawResponse(self._cloudflared.configurations)
+
+    @cached_property
+    def connections(self) -> AsyncConnectionsResourceWithRawResponse:
+        return AsyncConnectionsResourceWithRawResponse(self._cloudflared.connections)
+
+    @cached_property
+    def token(self) -> AsyncTokenResourceWithRawResponse:
+        return AsyncTokenResourceWithRawResponse(self._cloudflared.token)
+
+    @cached_property
+    def connectors(self) -> AsyncConnectorsResourceWithRawResponse:
+        return AsyncConnectorsResourceWithRawResponse(self._cloudflared.connectors)
+
+    @cached_property
+    def management(self) -> AsyncManagementResourceWithRawResponse:
+        return AsyncManagementResourceWithRawResponse(self._cloudflared.management)
+
+
+class CloudflaredResourceWithStreamingResponse:
+    def __init__(self, cloudflared: CloudflaredResource) -> None:
+        self._cloudflared = cloudflared
+
+        self.create = to_streamed_response_wrapper(
+            cloudflared.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            cloudflared.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            cloudflared.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            cloudflared.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            cloudflared.get,
+        )
+
+    @cached_property
+    def configurations(self) -> ConfigurationsResourceWithStreamingResponse:
+        return ConfigurationsResourceWithStreamingResponse(self._cloudflared.configurations)
+
+    @cached_property
+    def connections(self) -> ConnectionsResourceWithStreamingResponse:
+        return ConnectionsResourceWithStreamingResponse(self._cloudflared.connections)
+
+    @cached_property
+    def token(self) -> TokenResourceWithStreamingResponse:
+        return TokenResourceWithStreamingResponse(self._cloudflared.token)
+
+    @cached_property
+    def connectors(self) -> ConnectorsResourceWithStreamingResponse:
+        return ConnectorsResourceWithStreamingResponse(self._cloudflared.connectors)
+
+    @cached_property
+    def management(self) -> ManagementResourceWithStreamingResponse:
+        return ManagementResourceWithStreamingResponse(self._cloudflared.management)
+
+
+class AsyncCloudflaredResourceWithStreamingResponse:
+    def __init__(self, cloudflared: AsyncCloudflaredResource) -> None:
+        self._cloudflared = cloudflared
+
+        self.create = async_to_streamed_response_wrapper(
+            cloudflared.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            cloudflared.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            cloudflared.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            cloudflared.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            cloudflared.get,
+        )
+
+    @cached_property
+    def configurations(self) -> AsyncConfigurationsResourceWithStreamingResponse:
+        return AsyncConfigurationsResourceWithStreamingResponse(self._cloudflared.configurations)
+
+    @cached_property
+    def connections(self) -> AsyncConnectionsResourceWithStreamingResponse:
+        return AsyncConnectionsResourceWithStreamingResponse(self._cloudflared.connections)
+
+    @cached_property
+    def token(self) -> AsyncTokenResourceWithStreamingResponse:
+        return AsyncTokenResourceWithStreamingResponse(self._cloudflared.token)
+
+    @cached_property
+    def connectors(self) -> AsyncConnectorsResourceWithStreamingResponse:
+        return AsyncConnectorsResourceWithStreamingResponse(self._cloudflared.connectors)
+
+    @cached_property
+    def management(self) -> AsyncManagementResourceWithStreamingResponse:
+        return AsyncManagementResourceWithStreamingResponse(self._cloudflared.management)
diff --git a/src/cloudflare/resources/zero_trust/tunnels/cloudflared/configurations.py b/src/cloudflare/resources/zero_trust/tunnels/cloudflared/configurations.py
new file mode 100644
index 00000000000..b70cdd5caf2
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/tunnels/cloudflared/configurations.py
@@ -0,0 +1,299 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.zero_trust.tunnels.cloudflared import configuration_update_params
+from .....types.zero_trust.tunnels.cloudflared.configuration_get_response import ConfigurationGetResponse
+from .....types.zero_trust.tunnels.cloudflared.configuration_update_response import ConfigurationUpdateResponse
+
+__all__ = ["ConfigurationsResource", "AsyncConfigurationsResource"]
+
+
+class ConfigurationsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ConfigurationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ConfigurationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ConfigurationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ConfigurationsResourceWithStreamingResponse(self)
+
+    def update(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        config: configuration_update_params.Config | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConfigurationUpdateResponse]:
+        """
+        Adds or updates the configuration for a remotely-managed tunnel.
+
+        Args:
+          account_id: Identifier.
+
+          tunnel_id: UUID of the tunnel.
+
+          config: The tunnel configuration and ingress rules.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return self._put(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/configurations",
+            body=maybe_transform({"config": config}, configuration_update_params.ConfigurationUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ConfigurationUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ConfigurationUpdateResponse]], ResultWrapper[ConfigurationUpdateResponse]),
+        )
+
+    def get(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConfigurationGetResponse]:
+        """
+        Gets the configuration for a remotely-managed tunnel
+
+        Args:
+          account_id: Identifier.
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/configurations",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ConfigurationGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ConfigurationGetResponse]], ResultWrapper[ConfigurationGetResponse]),
+        )
+
+
+class AsyncConfigurationsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncConfigurationsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncConfigurationsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncConfigurationsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncConfigurationsResourceWithStreamingResponse(self)
+
+    async def update(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        config: configuration_update_params.Config | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConfigurationUpdateResponse]:
+        """
+        Adds or updates the configuration for a remotely-managed tunnel.
+
+        Args:
+          account_id: Identifier.
+
+          tunnel_id: UUID of the tunnel.
+
+          config: The tunnel configuration and ingress rules.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return await self._put(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/configurations",
+            body=await async_maybe_transform({"config": config}, configuration_update_params.ConfigurationUpdateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ConfigurationUpdateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ConfigurationUpdateResponse]], ResultWrapper[ConfigurationUpdateResponse]),
+        )
+
+    async def get(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[ConfigurationGetResponse]:
+        """
+        Gets the configuration for a remotely-managed tunnel
+
+        Args:
+          account_id: Identifier.
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/configurations",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[ConfigurationGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[ConfigurationGetResponse]], ResultWrapper[ConfigurationGetResponse]),
+        )
+
+
+class ConfigurationsResourceWithRawResponse:
+    def __init__(self, configurations: ConfigurationsResource) -> None:
+        self._configurations = configurations
+
+        self.update = to_raw_response_wrapper(
+            configurations.update,
+        )
+        self.get = to_raw_response_wrapper(
+            configurations.get,
+        )
+
+
+class AsyncConfigurationsResourceWithRawResponse:
+    def __init__(self, configurations: AsyncConfigurationsResource) -> None:
+        self._configurations = configurations
+
+        self.update = async_to_raw_response_wrapper(
+            configurations.update,
+        )
+        self.get = async_to_raw_response_wrapper(
+            configurations.get,
+        )
+
+
+class ConfigurationsResourceWithStreamingResponse:
+    def __init__(self, configurations: ConfigurationsResource) -> None:
+        self._configurations = configurations
+
+        self.update = to_streamed_response_wrapper(
+            configurations.update,
+        )
+        self.get = to_streamed_response_wrapper(
+            configurations.get,
+        )
+
+
+class AsyncConfigurationsResourceWithStreamingResponse:
+    def __init__(self, configurations: AsyncConfigurationsResource) -> None:
+        self._configurations = configurations
+
+        self.update = async_to_streamed_response_wrapper(
+            configurations.update,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            configurations.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/tunnels/cloudflared/connections.py b/src/cloudflare/resources/zero_trust/tunnels/cloudflared/connections.py
new file mode 100644
index 00000000000..478f3deaaa4
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/tunnels/cloudflared/connections.py
@@ -0,0 +1,301 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Optional, cast
+
+import httpx
+
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from .....pagination import SyncSinglePage, AsyncSinglePage
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.zero_trust.tunnels.cloudflared import connection_delete_params
+from .....types.zero_trust.tunnels.cloudflared.client import Client
+
+__all__ = ["ConnectionsResource", "AsyncConnectionsResource"]
+
+
+class ConnectionsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ConnectionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ConnectionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ConnectionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ConnectionsResourceWithStreamingResponse(self)
+
+    def delete(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        client_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Removes a connection (aka Cloudflare Tunnel Connector) from a Cloudflare Tunnel
+        independently of its current state. If no connector id (client_id) is provided
+        all connectors will be removed. We recommend running this command after rotating
+        tokens.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          client_id: UUID of the Cloudflare Tunnel connector.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/connections",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform({"client_id": client_id}, connection_delete_params.ConnectionDeleteParams),
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def get(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[Client]:
+        """
+        Fetches connection details for a Cloudflare Tunnel.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/connections",
+            page=SyncSinglePage[Client],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=Client,
+        )
+
+
+class AsyncConnectionsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncConnectionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncConnectionsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncConnectionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncConnectionsResourceWithStreamingResponse(self)
+
+    async def delete(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        client_id: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> object:
+        """
+        Removes a connection (aka Cloudflare Tunnel Connector) from a Cloudflare Tunnel
+        independently of its current state. If no connector id (client_id) is provided
+        all connectors will be removed. We recommend running this command after rotating
+        tokens.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          client_id: UUID of the Cloudflare Tunnel connector.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/connections",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=await async_maybe_transform(
+                    {"client_id": client_id}, connection_delete_params.ConnectionDeleteParams
+                ),
+                post_parser=ResultWrapper[Optional[object]]._unwrapper,
+            ),
+            cast_to=cast(Type[object], ResultWrapper[object]),
+        )
+
+    def get(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[Client, AsyncSinglePage[Client]]:
+        """
+        Fetches connection details for a Cloudflare Tunnel.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/connections",
+            page=AsyncSinglePage[Client],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=Client,
+        )
+
+
+class ConnectionsResourceWithRawResponse:
+    def __init__(self, connections: ConnectionsResource) -> None:
+        self._connections = connections
+
+        self.delete = to_raw_response_wrapper(
+            connections.delete,
+        )
+        self.get = to_raw_response_wrapper(
+            connections.get,
+        )
+
+
+class AsyncConnectionsResourceWithRawResponse:
+    def __init__(self, connections: AsyncConnectionsResource) -> None:
+        self._connections = connections
+
+        self.delete = async_to_raw_response_wrapper(
+            connections.delete,
+        )
+        self.get = async_to_raw_response_wrapper(
+            connections.get,
+        )
+
+
+class ConnectionsResourceWithStreamingResponse:
+    def __init__(self, connections: ConnectionsResource) -> None:
+        self._connections = connections
+
+        self.delete = to_streamed_response_wrapper(
+            connections.delete,
+        )
+        self.get = to_streamed_response_wrapper(
+            connections.get,
+        )
+
+
+class AsyncConnectionsResourceWithStreamingResponse:
+    def __init__(self, connections: AsyncConnectionsResource) -> None:
+        self._connections = connections
+
+        self.delete = async_to_streamed_response_wrapper(
+            connections.delete,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            connections.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/tunnels/cloudflared/connectors.py b/src/cloudflare/resources/zero_trust/tunnels/cloudflared/connectors.py
new file mode 100644
index 00000000000..4bb21057683
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/tunnels/cloudflared/connectors.py
@@ -0,0 +1,198 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ....._types import Body, Query, Headers, NotGiven, not_given
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.zero_trust.tunnels.cloudflared.client import Client
+
+__all__ = ["ConnectorsResource", "AsyncConnectorsResource"]
+
+
+class ConnectorsResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ConnectorsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ConnectorsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ConnectorsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ConnectorsResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        connector_id: str,
+        *,
+        account_id: str,
+        tunnel_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Client:
+        """
+        Fetches connector and connection details for a Cloudflare Tunnel.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          connector_id: UUID of the Cloudflare Tunnel connector.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/connectors/{connector_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Client]._unwrapper,
+            ),
+            cast_to=cast(Type[Client], ResultWrapper[Client]),
+        )
+
+
+class AsyncConnectorsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncConnectorsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncConnectorsResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncConnectorsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncConnectorsResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        connector_id: str,
+        *,
+        account_id: str,
+        tunnel_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Client:
+        """
+        Fetches connector and connection details for a Cloudflare Tunnel.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          connector_id: UUID of the Cloudflare Tunnel connector.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/connectors/{connector_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Client]._unwrapper,
+            ),
+            cast_to=cast(Type[Client], ResultWrapper[Client]),
+        )
+
+
+class ConnectorsResourceWithRawResponse:
+    def __init__(self, connectors: ConnectorsResource) -> None:
+        self._connectors = connectors
+
+        self.get = to_raw_response_wrapper(
+            connectors.get,
+        )
+
+
+class AsyncConnectorsResourceWithRawResponse:
+    def __init__(self, connectors: AsyncConnectorsResource) -> None:
+        self._connectors = connectors
+
+        self.get = async_to_raw_response_wrapper(
+            connectors.get,
+        )
+
+
+class ConnectorsResourceWithStreamingResponse:
+    def __init__(self, connectors: ConnectorsResource) -> None:
+        self._connectors = connectors
+
+        self.get = to_streamed_response_wrapper(
+            connectors.get,
+        )
+
+
+class AsyncConnectorsResourceWithStreamingResponse:
+    def __init__(self, connectors: AsyncConnectorsResource) -> None:
+        self._connectors = connectors
+
+        self.get = async_to_streamed_response_wrapper(
+            connectors.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/tunnels/cloudflared/management.py b/src/cloudflare/resources/zero_trust/tunnels/cloudflared/management.py
new file mode 100644
index 00000000000..f6c7015dfef
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/tunnels/cloudflared/management.py
@@ -0,0 +1,199 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Type, cast
+from typing_extensions import Literal
+
+import httpx
+
+from ....._types import Body, Query, Headers, NotGiven, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.zero_trust.tunnels.cloudflared import management_create_params
+from .....types.zero_trust.tunnels.cloudflared.management_create_response import ManagementCreateResponse
+
+__all__ = ["ManagementResource", "AsyncManagementResource"]
+
+
+class ManagementResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> ManagementResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return ManagementResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> ManagementResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return ManagementResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        resources: List[Literal["logs"]],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """Gets a management token used to access the management resources (i.e.
+
+        Streaming
+        Logs) of a tunnel.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/management",
+            body=maybe_transform({"resources": resources}, management_create_params.ManagementCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ManagementCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class AsyncManagementResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncManagementResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncManagementResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncManagementResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncManagementResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        resources: List[Literal["logs"]],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """Gets a management token used to access the management resources (i.e.
+
+        Streaming
+        Logs) of a tunnel.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/management",
+            body=await async_maybe_transform({"resources": resources}, management_create_params.ManagementCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ManagementCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class ManagementResourceWithRawResponse:
+    def __init__(self, management: ManagementResource) -> None:
+        self._management = management
+
+        self.create = to_raw_response_wrapper(
+            management.create,
+        )
+
+
+class AsyncManagementResourceWithRawResponse:
+    def __init__(self, management: AsyncManagementResource) -> None:
+        self._management = management
+
+        self.create = async_to_raw_response_wrapper(
+            management.create,
+        )
+
+
+class ManagementResourceWithStreamingResponse:
+    def __init__(self, management: ManagementResource) -> None:
+        self._management = management
+
+        self.create = to_streamed_response_wrapper(
+            management.create,
+        )
+
+
+class AsyncManagementResourceWithStreamingResponse:
+    def __init__(self, management: AsyncManagementResource) -> None:
+        self._management = management
+
+        self.create = async_to_streamed_response_wrapper(
+            management.create,
+        )
diff --git a/src/cloudflare/resources/zero_trust/tunnels/cloudflared/token.py b/src/cloudflare/resources/zero_trust/tunnels/cloudflared/token.py
new file mode 100644
index 00000000000..d16411c5002
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/tunnels/cloudflared/token.py
@@ -0,0 +1,188 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ....._types import Body, Query, Headers, NotGiven, not_given
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.zero_trust.tunnels.cloudflared.token_get_response import TokenGetResponse
+
+__all__ = ["TokenResource", "AsyncTokenResource"]
+
+
+class TokenResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> TokenResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TokenResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TokenResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TokenResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Gets the token used to associate cloudflared with a specific tunnel.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/token",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class AsyncTokenResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncTokenResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTokenResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTokenResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTokenResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Gets the token used to associate cloudflared with a specific tunnel.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/token",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class TokenResourceWithRawResponse:
+    def __init__(self, token: TokenResource) -> None:
+        self._token = token
+
+        self.get = to_raw_response_wrapper(
+            token.get,
+        )
+
+
+class AsyncTokenResourceWithRawResponse:
+    def __init__(self, token: AsyncTokenResource) -> None:
+        self._token = token
+
+        self.get = async_to_raw_response_wrapper(
+            token.get,
+        )
+
+
+class TokenResourceWithStreamingResponse:
+    def __init__(self, token: TokenResource) -> None:
+        self._token = token
+
+        self.get = to_streamed_response_wrapper(
+            token.get,
+        )
+
+
+class AsyncTokenResourceWithStreamingResponse:
+    def __init__(self, token: AsyncTokenResource) -> None:
+        self._token = token
+
+        self.get = async_to_streamed_response_wrapper(
+            token.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/tunnels/configurations.py b/src/cloudflare/resources/zero_trust/tunnels/configurations.py
deleted file mode 100644
index 13769b1de9f..00000000000
--- a/src/cloudflare/resources/zero_trust/tunnels/configurations.py
+++ /dev/null
@@ -1,302 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Any, cast
-
-import httpx
-
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
-from ....types.zero_trust.tunnels import configuration_update_params
-from ....types.zero_trust.tunnels.configuration_get_response import ConfigurationGetResponse
-from ....types.zero_trust.tunnels.configuration_update_response import ConfigurationUpdateResponse
-
-__all__ = ["ConfigurationsResource", "AsyncConfigurationsResource"]
-
-
-class ConfigurationsResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> ConfigurationsResourceWithRawResponse:
-        return ConfigurationsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> ConfigurationsResourceWithStreamingResponse:
-        return ConfigurationsResourceWithStreamingResponse(self)
-
-    def update(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        config: configuration_update_params.Config | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConfigurationUpdateResponse:
-        """
-        Adds or updates the configuration for a remotely-managed tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          config: The tunnel configuration and ingress rules.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            ConfigurationUpdateResponse,
-            self._put(
-                f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/configurations",
-                body=maybe_transform({"config": config}, configuration_update_params.ConfigurationUpdateParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[ConfigurationUpdateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ConfigurationUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    def get(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConfigurationGetResponse:
-        """
-        Gets the configuration for a remotely-managed tunnel
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            ConfigurationGetResponse,
-            self._get(
-                f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/configurations",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[ConfigurationGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ConfigurationGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class AsyncConfigurationsResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncConfigurationsResourceWithRawResponse:
-        return AsyncConfigurationsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncConfigurationsResourceWithStreamingResponse:
-        return AsyncConfigurationsResourceWithStreamingResponse(self)
-
-    async def update(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        config: configuration_update_params.Config | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConfigurationUpdateResponse:
-        """
-        Adds or updates the configuration for a remotely-managed tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          config: The tunnel configuration and ingress rules.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            ConfigurationUpdateResponse,
-            await self._put(
-                f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/configurations",
-                body=await async_maybe_transform(
-                    {"config": config}, configuration_update_params.ConfigurationUpdateParams
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[ConfigurationUpdateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ConfigurationUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    async def get(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConfigurationGetResponse:
-        """
-        Gets the configuration for a remotely-managed tunnel
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            ConfigurationGetResponse,
-            await self._get(
-                f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/configurations",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[ConfigurationGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ConfigurationGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class ConfigurationsResourceWithRawResponse:
-    def __init__(self, configurations: ConfigurationsResource) -> None:
-        self._configurations = configurations
-
-        self.update = to_raw_response_wrapper(
-            configurations.update,
-        )
-        self.get = to_raw_response_wrapper(
-            configurations.get,
-        )
-
-
-class AsyncConfigurationsResourceWithRawResponse:
-    def __init__(self, configurations: AsyncConfigurationsResource) -> None:
-        self._configurations = configurations
-
-        self.update = async_to_raw_response_wrapper(
-            configurations.update,
-        )
-        self.get = async_to_raw_response_wrapper(
-            configurations.get,
-        )
-
-
-class ConfigurationsResourceWithStreamingResponse:
-    def __init__(self, configurations: ConfigurationsResource) -> None:
-        self._configurations = configurations
-
-        self.update = to_streamed_response_wrapper(
-            configurations.update,
-        )
-        self.get = to_streamed_response_wrapper(
-            configurations.get,
-        )
-
-
-class AsyncConfigurationsResourceWithStreamingResponse:
-    def __init__(self, configurations: AsyncConfigurationsResource) -> None:
-        self._configurations = configurations
-
-        self.update = async_to_streamed_response_wrapper(
-            configurations.update,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            configurations.get,
-        )
diff --git a/src/cloudflare/resources/zero_trust/tunnels/connections.py b/src/cloudflare/resources/zero_trust/tunnels/connections.py
deleted file mode 100644
index 65bdd4c4477..00000000000
--- a/src/cloudflare/resources/zero_trust/tunnels/connections.py
+++ /dev/null
@@ -1,281 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Any, Type, Optional, cast
-
-import httpx
-
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
-from ....types.zero_trust.tunnels.connection_get_response import ConnectionGetResponse
-from ....types.zero_trust.tunnels.connection_delete_response import ConnectionDeleteResponse
-
-__all__ = ["ConnectionsResource", "AsyncConnectionsResource"]
-
-
-class ConnectionsResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> ConnectionsResourceWithRawResponse:
-        return ConnectionsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> ConnectionsResourceWithStreamingResponse:
-        return ConnectionsResourceWithStreamingResponse(self)
-
-    def delete(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConnectionDeleteResponse:
-        """Removes connections that are in a disconnected or pending reconnect state.
-
-        We
-        recommend running this command after shutting down a tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            ConnectionDeleteResponse,
-            self._delete(
-                f"/accounts/{account_id}/tunnels/{tunnel_id}/connections",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[ConnectionDeleteResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ConnectionDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    def get(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ConnectionGetResponse]:
-        """
-        Fetches connection details for a Cloudflare Tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/connections",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ConnectionGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ConnectionGetResponse]], ResultWrapper[ConnectionGetResponse]),
-        )
-
-
-class AsyncConnectionsResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncConnectionsResourceWithRawResponse:
-        return AsyncConnectionsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncConnectionsResourceWithStreamingResponse:
-        return AsyncConnectionsResourceWithStreamingResponse(self)
-
-    async def delete(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ConnectionDeleteResponse:
-        """Removes connections that are in a disconnected or pending reconnect state.
-
-        We
-        recommend running this command after shutting down a tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            ConnectionDeleteResponse,
-            await self._delete(
-                f"/accounts/{account_id}/tunnels/{tunnel_id}/connections",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[ConnectionDeleteResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ConnectionDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    async def get(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ConnectionGetResponse]:
-        """
-        Fetches connection details for a Cloudflare Tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/connections",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[ConnectionGetResponse]]._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[ConnectionGetResponse]], ResultWrapper[ConnectionGetResponse]),
-        )
-
-
-class ConnectionsResourceWithRawResponse:
-    def __init__(self, connections: ConnectionsResource) -> None:
-        self._connections = connections
-
-        self.delete = to_raw_response_wrapper(
-            connections.delete,
-        )
-        self.get = to_raw_response_wrapper(
-            connections.get,
-        )
-
-
-class AsyncConnectionsResourceWithRawResponse:
-    def __init__(self, connections: AsyncConnectionsResource) -> None:
-        self._connections = connections
-
-        self.delete = async_to_raw_response_wrapper(
-            connections.delete,
-        )
-        self.get = async_to_raw_response_wrapper(
-            connections.get,
-        )
-
-
-class ConnectionsResourceWithStreamingResponse:
-    def __init__(self, connections: ConnectionsResource) -> None:
-        self._connections = connections
-
-        self.delete = to_streamed_response_wrapper(
-            connections.delete,
-        )
-        self.get = to_streamed_response_wrapper(
-            connections.get,
-        )
-
-
-class AsyncConnectionsResourceWithStreamingResponse:
-    def __init__(self, connections: AsyncConnectionsResource) -> None:
-        self._connections = connections
-
-        self.delete = async_to_streamed_response_wrapper(
-            connections.delete,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            connections.get,
-        )
diff --git a/src/cloudflare/resources/zero_trust/tunnels/connectors.py b/src/cloudflare/resources/zero_trust/tunnels/connectors.py
deleted file mode 100644
index 3e446f0d7e6..00000000000
--- a/src/cloudflare/resources/zero_trust/tunnels/connectors.py
+++ /dev/null
@@ -1,176 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Type, cast
-
-import httpx
-
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
-from ....types.zero_trust.tunnels.client import Client
-
-__all__ = ["ConnectorsResource", "AsyncConnectorsResource"]
-
-
-class ConnectorsResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> ConnectorsResourceWithRawResponse:
-        return ConnectorsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> ConnectorsResourceWithStreamingResponse:
-        return ConnectorsResourceWithStreamingResponse(self)
-
-    def get(
-        self,
-        connector_id: str,
-        *,
-        account_id: str,
-        tunnel_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Client:
-        """
-        Fetches connector and connection details for a Cloudflare Tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          connector_id: UUID of the Cloudflare Tunnel connector.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        if not connector_id:
-            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/connectors/{connector_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Client]._unwrapper,
-            ),
-            cast_to=cast(Type[Client], ResultWrapper[Client]),
-        )
-
-
-class AsyncConnectorsResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncConnectorsResourceWithRawResponse:
-        return AsyncConnectorsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncConnectorsResourceWithStreamingResponse:
-        return AsyncConnectorsResourceWithStreamingResponse(self)
-
-    async def get(
-        self,
-        connector_id: str,
-        *,
-        account_id: str,
-        tunnel_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Client:
-        """
-        Fetches connector and connection details for a Cloudflare Tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          connector_id: UUID of the Cloudflare Tunnel connector.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        if not connector_id:
-            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/connectors/{connector_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Client]._unwrapper,
-            ),
-            cast_to=cast(Type[Client], ResultWrapper[Client]),
-        )
-
-
-class ConnectorsResourceWithRawResponse:
-    def __init__(self, connectors: ConnectorsResource) -> None:
-        self._connectors = connectors
-
-        self.get = to_raw_response_wrapper(
-            connectors.get,
-        )
-
-
-class AsyncConnectorsResourceWithRawResponse:
-    def __init__(self, connectors: AsyncConnectorsResource) -> None:
-        self._connectors = connectors
-
-        self.get = async_to_raw_response_wrapper(
-            connectors.get,
-        )
-
-
-class ConnectorsResourceWithStreamingResponse:
-    def __init__(self, connectors: ConnectorsResource) -> None:
-        self._connectors = connectors
-
-        self.get = to_streamed_response_wrapper(
-            connectors.get,
-        )
-
-
-class AsyncConnectorsResourceWithStreamingResponse:
-    def __init__(self, connectors: AsyncConnectorsResource) -> None:
-        self._connectors = connectors
-
-        self.get = async_to_streamed_response_wrapper(
-            connectors.get,
-        )
diff --git a/src/cloudflare/resources/zero_trust/tunnels/management.py b/src/cloudflare/resources/zero_trust/tunnels/management.py
deleted file mode 100644
index 4da193130b6..00000000000
--- a/src/cloudflare/resources/zero_trust/tunnels/management.py
+++ /dev/null
@@ -1,192 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Any, List, cast
-from typing_extensions import Literal
-
-import httpx
-
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
-from ....types.zero_trust.tunnels import management_create_params
-from ....types.zero_trust.tunnels.management_create_response import ManagementCreateResponse
-
-__all__ = ["ManagementResource", "AsyncManagementResource"]
-
-
-class ManagementResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> ManagementResourceWithRawResponse:
-        return ManagementResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> ManagementResourceWithStreamingResponse:
-        return ManagementResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        resources: List[Literal["logs"]],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ManagementCreateResponse:
-        """Gets a management token used to access the management resources (i.e.
-
-        Streaming
-        Logs) of a tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            ManagementCreateResponse,
-            self._post(
-                f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/management",
-                body=maybe_transform({"resources": resources}, management_create_params.ManagementCreateParams),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[ManagementCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ManagementCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class AsyncManagementResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncManagementResourceWithRawResponse:
-        return AsyncManagementResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncManagementResourceWithStreamingResponse:
-        return AsyncManagementResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        resources: List[Literal["logs"]],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ManagementCreateResponse:
-        """Gets a management token used to access the management resources (i.e.
-
-        Streaming
-        Logs) of a tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            ManagementCreateResponse,
-            await self._post(
-                f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/management",
-                body=await async_maybe_transform(
-                    {"resources": resources}, management_create_params.ManagementCreateParams
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[ManagementCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ManagementCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class ManagementResourceWithRawResponse:
-    def __init__(self, management: ManagementResource) -> None:
-        self._management = management
-
-        self.create = to_raw_response_wrapper(
-            management.create,
-        )
-
-
-class AsyncManagementResourceWithRawResponse:
-    def __init__(self, management: AsyncManagementResource) -> None:
-        self._management = management
-
-        self.create = async_to_raw_response_wrapper(
-            management.create,
-        )
-
-
-class ManagementResourceWithStreamingResponse:
-    def __init__(self, management: ManagementResource) -> None:
-        self._management = management
-
-        self.create = to_streamed_response_wrapper(
-            management.create,
-        )
-
-
-class AsyncManagementResourceWithStreamingResponse:
-    def __init__(self, management: AsyncManagementResource) -> None:
-        self._management = management
-
-        self.create = async_to_streamed_response_wrapper(
-            management.create,
-        )
diff --git a/src/cloudflare/resources/zero_trust/tunnels/token.py b/src/cloudflare/resources/zero_trust/tunnels/token.py
deleted file mode 100644
index 2f98dd7102e..00000000000
--- a/src/cloudflare/resources/zero_trust/tunnels/token.py
+++ /dev/null
@@ -1,176 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Any, cast
-
-import httpx
-
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response import (
-    to_raw_response_wrapper,
-    to_streamed_response_wrapper,
-    async_to_raw_response_wrapper,
-    async_to_streamed_response_wrapper,
-)
-from ...._wrappers import ResultWrapper
-from ...._base_client import make_request_options
-from ....types.zero_trust.tunnels.token_get_response import TokenGetResponse
-
-__all__ = ["TokenResource", "AsyncTokenResource"]
-
-
-class TokenResource(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> TokenResourceWithRawResponse:
-        return TokenResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> TokenResourceWithStreamingResponse:
-        return TokenResourceWithStreamingResponse(self)
-
-    def get(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TokenGetResponse:
-        """
-        Gets the token used to associate cloudflared with a specific tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            TokenGetResponse,
-            self._get(
-                f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/token",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[TokenGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[TokenGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class AsyncTokenResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncTokenResourceWithRawResponse:
-        return AsyncTokenResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncTokenResourceWithStreamingResponse:
-        return AsyncTokenResourceWithStreamingResponse(self)
-
-    async def get(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TokenGetResponse:
-        """
-        Gets the token used to associate cloudflared with a specific tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            TokenGetResponse,
-            await self._get(
-                f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}/token",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[TokenGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[TokenGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class TokenResourceWithRawResponse:
-    def __init__(self, token: TokenResource) -> None:
-        self._token = token
-
-        self.get = to_raw_response_wrapper(
-            token.get,
-        )
-
-
-class AsyncTokenResourceWithRawResponse:
-    def __init__(self, token: AsyncTokenResource) -> None:
-        self._token = token
-
-        self.get = async_to_raw_response_wrapper(
-            token.get,
-        )
-
-
-class TokenResourceWithStreamingResponse:
-    def __init__(self, token: TokenResource) -> None:
-        self._token = token
-
-        self.get = to_streamed_response_wrapper(
-            token.get,
-        )
-
-
-class AsyncTokenResourceWithStreamingResponse:
-    def __init__(self, token: AsyncTokenResource) -> None:
-        self._token = token
-
-        self.get = async_to_streamed_response_wrapper(
-            token.get,
-        )
diff --git a/src/cloudflare/resources/zero_trust/tunnels/tunnels.py b/src/cloudflare/resources/zero_trust/tunnels/tunnels.py
index cac703fedf1..7f0cc04bdfa 100644
--- a/src/cloudflare/resources/zero_trust/tunnels/tunnels.py
+++ b/src/cloudflare/resources/zero_trust/tunnels/tunnels.py
@@ -2,50 +2,15 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Union, cast
+from typing import Any, List, Union, cast
 from datetime import datetime
 from typing_extensions import Literal
 
 import httpx
 
-from .token import (
-    TokenResource,
-    AsyncTokenResource,
-    TokenResourceWithRawResponse,
-    AsyncTokenResourceWithRawResponse,
-    TokenResourceWithStreamingResponse,
-    AsyncTokenResourceWithStreamingResponse,
-)
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ...._utils import maybe_transform
 from ...._compat import cached_property
-from .connectors import (
-    ConnectorsResource,
-    AsyncConnectorsResource,
-    ConnectorsResourceWithRawResponse,
-    AsyncConnectorsResourceWithRawResponse,
-    ConnectorsResourceWithStreamingResponse,
-    AsyncConnectorsResourceWithStreamingResponse,
-)
-from .management import (
-    ManagementResource,
-    AsyncManagementResource,
-    ManagementResourceWithRawResponse,
-    AsyncManagementResourceWithRawResponse,
-    ManagementResourceWithStreamingResponse,
-    AsyncManagementResourceWithStreamingResponse,
-)
-from .connections import (
-    ConnectionsResource,
-    AsyncConnectionsResource,
-    ConnectionsResourceWithRawResponse,
-    AsyncConnectionsResourceWithRawResponse,
-    ConnectionsResourceWithStreamingResponse,
-    AsyncConnectionsResourceWithStreamingResponse,
-)
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
     to_raw_response_wrapper,
@@ -53,131 +18,80 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ...._wrappers import ResultWrapper
 from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
-from .configurations import (
-    ConfigurationsResource,
-    AsyncConfigurationsResource,
-    ConfigurationsResourceWithRawResponse,
-    AsyncConfigurationsResourceWithRawResponse,
-    ConfigurationsResourceWithStreamingResponse,
-    AsyncConfigurationsResourceWithStreamingResponse,
-)
 from ...._base_client import AsyncPaginator, make_request_options
-from ....types.zero_trust import tunnel_edit_params, tunnel_list_params, tunnel_create_params
-from ....types.zero_trust.tunnel_get_response import TunnelGetResponse
-from ....types.zero_trust.tunnel_edit_response import TunnelEditResponse
+from ....types.zero_trust import tunnel_list_params
+from .cloudflared.cloudflared import (
+    CloudflaredResource,
+    AsyncCloudflaredResource,
+    CloudflaredResourceWithRawResponse,
+    AsyncCloudflaredResourceWithRawResponse,
+    CloudflaredResourceWithStreamingResponse,
+    AsyncCloudflaredResourceWithStreamingResponse,
+)
+from .warp_connector.warp_connector import (
+    WARPConnectorResource,
+    AsyncWARPConnectorResource,
+    WARPConnectorResourceWithRawResponse,
+    AsyncWARPConnectorResourceWithRawResponse,
+    WARPConnectorResourceWithStreamingResponse,
+    AsyncWARPConnectorResourceWithStreamingResponse,
+)
 from ....types.zero_trust.tunnel_list_response import TunnelListResponse
-from ....types.zero_trust.tunnel_create_response import TunnelCreateResponse
-from ....types.zero_trust.tunnel_delete_response import TunnelDeleteResponse
 
 __all__ = ["TunnelsResource", "AsyncTunnelsResource"]
 
 
 class TunnelsResource(SyncAPIResource):
     @cached_property
-    def configurations(self) -> ConfigurationsResource:
-        return ConfigurationsResource(self._client)
+    def cloudflared(self) -> CloudflaredResource:
+        return CloudflaredResource(self._client)
 
     @cached_property
-    def connections(self) -> ConnectionsResource:
-        return ConnectionsResource(self._client)
-
-    @cached_property
-    def token(self) -> TokenResource:
-        return TokenResource(self._client)
-
-    @cached_property
-    def connectors(self) -> ConnectorsResource:
-        return ConnectorsResource(self._client)
-
-    @cached_property
-    def management(self) -> ManagementResource:
-        return ManagementResource(self._client)
+    def warp_connector(self) -> WARPConnectorResource:
+        return WARPConnectorResource(self._client)
 
     @cached_property
     def with_raw_response(self) -> TunnelsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return TunnelsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> TunnelsResourceWithStreamingResponse:
-        return TunnelsResourceWithStreamingResponse(self)
-
-    def create(
-        self,
-        *,
-        account_id: str,
-        name: str,
-        tunnel_secret: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TunnelCreateResponse:
         """
-        Creates a new Argo Tunnel in an account.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          name: A user-friendly name for a tunnel.
-
-          tunnel_secret: Sets the password required to run a locally-managed tunnel. Must be at least 32
-              bytes and encoded as a base64 string.
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
         """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._post(
-            f"/accounts/{account_id}/tunnels",
-            body=maybe_transform(
-                {
-                    "name": name,
-                    "tunnel_secret": tunnel_secret,
-                },
-                tunnel_create_params.TunnelCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[TunnelCreateResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[TunnelCreateResponse], ResultWrapper[TunnelCreateResponse]),
-        )
+        return TunnelsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
-        exclude_prefix: str | NotGiven = NOT_GIVEN,
-        existed_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        include_prefix: str | NotGiven = NOT_GIVEN,
-        is_deleted: bool | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        status: Literal["inactive", "degraded", "healthy", "down"] | NotGiven = NOT_GIVEN,
-        tun_types: str | NotGiven = NOT_GIVEN,
-        uuid: str | NotGiven = NOT_GIVEN,
-        was_active_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        was_inactive_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        exclude_prefix: str | Omit = omit,
+        existed_at: str | Omit = omit,
+        include_prefix: str | Omit = omit,
+        is_deleted: bool | Omit = omit,
+        name: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal["inactive", "degraded", "healthy", "down"] | Omit = omit,
+        tun_types: List[Literal["cfd_tunnel", "warp_connector", "warp", "magic", "ip_sec", "gre", "cni"]] | Omit = omit,
+        uuid: str | Omit = omit,
+        was_active_at: Union[str, datetime] | Omit = omit,
+        was_inactive_at: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[TunnelListResponse]:
         """
         Lists and filters all types of Tunnels in an account.
@@ -185,8 +99,8 @@ def list(
         Args:
           account_id: Cloudflare account ID
 
-          existed_at: If provided, include only tunnels that were created (and not deleted) before
-              this time.
+          existed_at: If provided, include only resources that were created (and not deleted) before
+              this time. URL encoded.
 
           is_deleted: If `true`, only include deleted tunnels. If `false`, exclude deleted tunnels. If
               empty, all tunnels will be included.
@@ -202,7 +116,7 @@ def list(
               state), `healthy` (tunnel is active and able to serve traffic), or `down`
               (tunnel can not serve traffic as it has no connections to the Cloudflare Edge).
 
-          tun_types: The types of tunnels to filter separated by a comma.
+          tun_types: The types of tunnels to filter by, separated by commas.
 
           uuid: UUID of the tunnel.
 
@@ -245,262 +159,57 @@ def list(
             model=cast(Any, TunnelListResponse),  # Union types cannot be passed in as arguments in the type system
         )
 
-    def delete(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TunnelDeleteResponse:
-        """
-        Deletes an Argo Tunnel from an account.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return self._delete(
-            f"/accounts/{account_id}/tunnels/{tunnel_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[TunnelDeleteResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[TunnelDeleteResponse], ResultWrapper[TunnelDeleteResponse]),
-        )
-
-    def edit(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        tunnel_secret: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TunnelEditResponse:
-        """
-        Updates an existing Cloudflare Tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          name: A user-friendly name for a tunnel.
-
-          tunnel_secret: Sets the password required to run a locally-managed tunnel. Must be at least 32
-              bytes and encoded as a base64 string.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            TunnelEditResponse,
-            self._patch(
-                f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}",
-                body=maybe_transform(
-                    {
-                        "name": name,
-                        "tunnel_secret": tunnel_secret,
-                    },
-                    tunnel_edit_params.TunnelEditParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[TunnelEditResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[TunnelEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    def get(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TunnelGetResponse:
-        """
-        Fetches a single Argo Tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return self._get(
-            f"/accounts/{account_id}/tunnels/{tunnel_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[TunnelGetResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[TunnelGetResponse], ResultWrapper[TunnelGetResponse]),
-        )
-
 
 class AsyncTunnelsResource(AsyncAPIResource):
     @cached_property
-    def configurations(self) -> AsyncConfigurationsResource:
-        return AsyncConfigurationsResource(self._client)
-
-    @cached_property
-    def connections(self) -> AsyncConnectionsResource:
-        return AsyncConnectionsResource(self._client)
-
-    @cached_property
-    def token(self) -> AsyncTokenResource:
-        return AsyncTokenResource(self._client)
-
-    @cached_property
-    def connectors(self) -> AsyncConnectorsResource:
-        return AsyncConnectorsResource(self._client)
+    def cloudflared(self) -> AsyncCloudflaredResource:
+        return AsyncCloudflaredResource(self._client)
 
     @cached_property
-    def management(self) -> AsyncManagementResource:
-        return AsyncManagementResource(self._client)
+    def warp_connector(self) -> AsyncWARPConnectorResource:
+        return AsyncWARPConnectorResource(self._client)
 
     @cached_property
     def with_raw_response(self) -> AsyncTunnelsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncTunnelsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncTunnelsResourceWithStreamingResponse:
-        return AsyncTunnelsResourceWithStreamingResponse(self)
-
-    async def create(
-        self,
-        *,
-        account_id: str,
-        name: str,
-        tunnel_secret: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TunnelCreateResponse:
         """
-        Creates a new Argo Tunnel in an account.
-
-        Args:
-          account_id: Cloudflare account ID
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-          name: A user-friendly name for a tunnel.
-
-          tunnel_secret: Sets the password required to run a locally-managed tunnel. Must be at least 32
-              bytes and encoded as a base64 string.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
         """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._post(
-            f"/accounts/{account_id}/tunnels",
-            body=await async_maybe_transform(
-                {
-                    "name": name,
-                    "tunnel_secret": tunnel_secret,
-                },
-                tunnel_create_params.TunnelCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[TunnelCreateResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[TunnelCreateResponse], ResultWrapper[TunnelCreateResponse]),
-        )
+        return AsyncTunnelsResourceWithStreamingResponse(self)
 
     def list(
         self,
         *,
         account_id: str,
-        exclude_prefix: str | NotGiven = NOT_GIVEN,
-        existed_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        include_prefix: str | NotGiven = NOT_GIVEN,
-        is_deleted: bool | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        status: Literal["inactive", "degraded", "healthy", "down"] | NotGiven = NOT_GIVEN,
-        tun_types: str | NotGiven = NOT_GIVEN,
-        uuid: str | NotGiven = NOT_GIVEN,
-        was_active_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        was_inactive_at: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        exclude_prefix: str | Omit = omit,
+        existed_at: str | Omit = omit,
+        include_prefix: str | Omit = omit,
+        is_deleted: bool | Omit = omit,
+        name: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal["inactive", "degraded", "healthy", "down"] | Omit = omit,
+        tun_types: List[Literal["cfd_tunnel", "warp_connector", "warp", "magic", "ip_sec", "gre", "cni"]] | Omit = omit,
+        uuid: str | Omit = omit,
+        was_active_at: Union[str, datetime] | Omit = omit,
+        was_inactive_at: Union[str, datetime] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[TunnelListResponse, AsyncV4PagePaginationArray[TunnelListResponse]]:
         """
         Lists and filters all types of Tunnels in an account.
@@ -508,8 +217,8 @@ def list(
         Args:
           account_id: Cloudflare account ID
 
-          existed_at: If provided, include only tunnels that were created (and not deleted) before
-              this time.
+          existed_at: If provided, include only resources that were created (and not deleted) before
+              this time. URL encoded.
 
           is_deleted: If `true`, only include deleted tunnels. If `false`, exclude deleted tunnels. If
               empty, all tunnels will be included.
@@ -525,7 +234,7 @@ def list(
               state), `healthy` (tunnel is active and able to serve traffic), or `down`
               (tunnel can not serve traffic as it has no connections to the Cloudflare Edge).
 
-          tun_types: The types of tunnels to filter separated by a comma.
+          tun_types: The types of tunnels to filter by, separated by commas.
 
           uuid: UUID of the tunnel.
 
@@ -568,317 +277,70 @@ def list(
             model=cast(Any, TunnelListResponse),  # Union types cannot be passed in as arguments in the type system
         )
 
-    async def delete(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TunnelDeleteResponse:
-        """
-        Deletes an Argo Tunnel from an account.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return await self._delete(
-            f"/accounts/{account_id}/tunnels/{tunnel_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[TunnelDeleteResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[TunnelDeleteResponse], ResultWrapper[TunnelDeleteResponse]),
-        )
-
-    async def edit(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        name: str | NotGiven = NOT_GIVEN,
-        tunnel_secret: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TunnelEditResponse:
-        """
-        Updates an existing Cloudflare Tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          name: A user-friendly name for a tunnel.
-
-          tunnel_secret: Sets the password required to run a locally-managed tunnel. Must be at least 32
-              bytes and encoded as a base64 string.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return cast(
-            TunnelEditResponse,
-            await self._patch(
-                f"/accounts/{account_id}/cfd_tunnel/{tunnel_id}",
-                body=await async_maybe_transform(
-                    {
-                        "name": name,
-                        "tunnel_secret": tunnel_secret,
-                    },
-                    tunnel_edit_params.TunnelEditParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[TunnelEditResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[TunnelEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    async def get(
-        self,
-        tunnel_id: str,
-        *,
-        account_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TunnelGetResponse:
-        """
-        Fetches a single Argo Tunnel.
-
-        Args:
-          account_id: Cloudflare account ID
-
-          tunnel_id: UUID of the tunnel.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not account_id:
-            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        if not tunnel_id:
-            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
-        return await self._get(
-            f"/accounts/{account_id}/tunnels/{tunnel_id}",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[TunnelGetResponse]._unwrapper,
-            ),
-            cast_to=cast(Type[TunnelGetResponse], ResultWrapper[TunnelGetResponse]),
-        )
-
 
 class TunnelsResourceWithRawResponse:
     def __init__(self, tunnels: TunnelsResource) -> None:
         self._tunnels = tunnels
 
-        self.create = to_raw_response_wrapper(
-            tunnels.create,
-        )
         self.list = to_raw_response_wrapper(
             tunnels.list,
         )
-        self.delete = to_raw_response_wrapper(
-            tunnels.delete,
-        )
-        self.edit = to_raw_response_wrapper(
-            tunnels.edit,
-        )
-        self.get = to_raw_response_wrapper(
-            tunnels.get,
-        )
-
-    @cached_property
-    def configurations(self) -> ConfigurationsResourceWithRawResponse:
-        return ConfigurationsResourceWithRawResponse(self._tunnels.configurations)
-
-    @cached_property
-    def connections(self) -> ConnectionsResourceWithRawResponse:
-        return ConnectionsResourceWithRawResponse(self._tunnels.connections)
-
-    @cached_property
-    def token(self) -> TokenResourceWithRawResponse:
-        return TokenResourceWithRawResponse(self._tunnels.token)
 
     @cached_property
-    def connectors(self) -> ConnectorsResourceWithRawResponse:
-        return ConnectorsResourceWithRawResponse(self._tunnels.connectors)
+    def cloudflared(self) -> CloudflaredResourceWithRawResponse:
+        return CloudflaredResourceWithRawResponse(self._tunnels.cloudflared)
 
     @cached_property
-    def management(self) -> ManagementResourceWithRawResponse:
-        return ManagementResourceWithRawResponse(self._tunnels.management)
+    def warp_connector(self) -> WARPConnectorResourceWithRawResponse:
+        return WARPConnectorResourceWithRawResponse(self._tunnels.warp_connector)
 
 
 class AsyncTunnelsResourceWithRawResponse:
     def __init__(self, tunnels: AsyncTunnelsResource) -> None:
         self._tunnels = tunnels
 
-        self.create = async_to_raw_response_wrapper(
-            tunnels.create,
-        )
         self.list = async_to_raw_response_wrapper(
             tunnels.list,
         )
-        self.delete = async_to_raw_response_wrapper(
-            tunnels.delete,
-        )
-        self.edit = async_to_raw_response_wrapper(
-            tunnels.edit,
-        )
-        self.get = async_to_raw_response_wrapper(
-            tunnels.get,
-        )
-
-    @cached_property
-    def configurations(self) -> AsyncConfigurationsResourceWithRawResponse:
-        return AsyncConfigurationsResourceWithRawResponse(self._tunnels.configurations)
-
-    @cached_property
-    def connections(self) -> AsyncConnectionsResourceWithRawResponse:
-        return AsyncConnectionsResourceWithRawResponse(self._tunnels.connections)
-
-    @cached_property
-    def token(self) -> AsyncTokenResourceWithRawResponse:
-        return AsyncTokenResourceWithRawResponse(self._tunnels.token)
 
     @cached_property
-    def connectors(self) -> AsyncConnectorsResourceWithRawResponse:
-        return AsyncConnectorsResourceWithRawResponse(self._tunnels.connectors)
+    def cloudflared(self) -> AsyncCloudflaredResourceWithRawResponse:
+        return AsyncCloudflaredResourceWithRawResponse(self._tunnels.cloudflared)
 
     @cached_property
-    def management(self) -> AsyncManagementResourceWithRawResponse:
-        return AsyncManagementResourceWithRawResponse(self._tunnels.management)
+    def warp_connector(self) -> AsyncWARPConnectorResourceWithRawResponse:
+        return AsyncWARPConnectorResourceWithRawResponse(self._tunnels.warp_connector)
 
 
 class TunnelsResourceWithStreamingResponse:
     def __init__(self, tunnels: TunnelsResource) -> None:
         self._tunnels = tunnels
 
-        self.create = to_streamed_response_wrapper(
-            tunnels.create,
-        )
         self.list = to_streamed_response_wrapper(
             tunnels.list,
         )
-        self.delete = to_streamed_response_wrapper(
-            tunnels.delete,
-        )
-        self.edit = to_streamed_response_wrapper(
-            tunnels.edit,
-        )
-        self.get = to_streamed_response_wrapper(
-            tunnels.get,
-        )
-
-    @cached_property
-    def configurations(self) -> ConfigurationsResourceWithStreamingResponse:
-        return ConfigurationsResourceWithStreamingResponse(self._tunnels.configurations)
-
-    @cached_property
-    def connections(self) -> ConnectionsResourceWithStreamingResponse:
-        return ConnectionsResourceWithStreamingResponse(self._tunnels.connections)
-
-    @cached_property
-    def token(self) -> TokenResourceWithStreamingResponse:
-        return TokenResourceWithStreamingResponse(self._tunnels.token)
 
     @cached_property
-    def connectors(self) -> ConnectorsResourceWithStreamingResponse:
-        return ConnectorsResourceWithStreamingResponse(self._tunnels.connectors)
+    def cloudflared(self) -> CloudflaredResourceWithStreamingResponse:
+        return CloudflaredResourceWithStreamingResponse(self._tunnels.cloudflared)
 
     @cached_property
-    def management(self) -> ManagementResourceWithStreamingResponse:
-        return ManagementResourceWithStreamingResponse(self._tunnels.management)
+    def warp_connector(self) -> WARPConnectorResourceWithStreamingResponse:
+        return WARPConnectorResourceWithStreamingResponse(self._tunnels.warp_connector)
 
 
 class AsyncTunnelsResourceWithStreamingResponse:
     def __init__(self, tunnels: AsyncTunnelsResource) -> None:
         self._tunnels = tunnels
 
-        self.create = async_to_streamed_response_wrapper(
-            tunnels.create,
-        )
         self.list = async_to_streamed_response_wrapper(
             tunnels.list,
         )
-        self.delete = async_to_streamed_response_wrapper(
-            tunnels.delete,
-        )
-        self.edit = async_to_streamed_response_wrapper(
-            tunnels.edit,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            tunnels.get,
-        )
-
-    @cached_property
-    def configurations(self) -> AsyncConfigurationsResourceWithStreamingResponse:
-        return AsyncConfigurationsResourceWithStreamingResponse(self._tunnels.configurations)
-
-    @cached_property
-    def connections(self) -> AsyncConnectionsResourceWithStreamingResponse:
-        return AsyncConnectionsResourceWithStreamingResponse(self._tunnels.connections)
-
-    @cached_property
-    def token(self) -> AsyncTokenResourceWithStreamingResponse:
-        return AsyncTokenResourceWithStreamingResponse(self._tunnels.token)
 
     @cached_property
-    def connectors(self) -> AsyncConnectorsResourceWithStreamingResponse:
-        return AsyncConnectorsResourceWithStreamingResponse(self._tunnels.connectors)
+    def cloudflared(self) -> AsyncCloudflaredResourceWithStreamingResponse:
+        return AsyncCloudflaredResourceWithStreamingResponse(self._tunnels.cloudflared)
 
     @cached_property
-    def management(self) -> AsyncManagementResourceWithStreamingResponse:
-        return AsyncManagementResourceWithStreamingResponse(self._tunnels.management)
+    def warp_connector(self) -> AsyncWARPConnectorResourceWithStreamingResponse:
+        return AsyncWARPConnectorResourceWithStreamingResponse(self._tunnels.warp_connector)
diff --git a/src/cloudflare/resources/zero_trust/tunnels/warp_connector/__init__.py b/src/cloudflare/resources/zero_trust/tunnels/warp_connector/__init__.py
new file mode 100644
index 00000000000..3b5b3b22545
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/tunnels/warp_connector/__init__.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .token import (
+    TokenResource,
+    AsyncTokenResource,
+    TokenResourceWithRawResponse,
+    AsyncTokenResourceWithRawResponse,
+    TokenResourceWithStreamingResponse,
+    AsyncTokenResourceWithStreamingResponse,
+)
+from .warp_connector import (
+    WARPConnectorResource,
+    AsyncWARPConnectorResource,
+    WARPConnectorResourceWithRawResponse,
+    AsyncWARPConnectorResourceWithRawResponse,
+    WARPConnectorResourceWithStreamingResponse,
+    AsyncWARPConnectorResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "TokenResource",
+    "AsyncTokenResource",
+    "TokenResourceWithRawResponse",
+    "AsyncTokenResourceWithRawResponse",
+    "TokenResourceWithStreamingResponse",
+    "AsyncTokenResourceWithStreamingResponse",
+    "WARPConnectorResource",
+    "AsyncWARPConnectorResource",
+    "WARPConnectorResourceWithRawResponse",
+    "AsyncWARPConnectorResourceWithRawResponse",
+    "WARPConnectorResourceWithStreamingResponse",
+    "AsyncWARPConnectorResourceWithStreamingResponse",
+]
diff --git a/src/cloudflare/resources/zero_trust/tunnels/warp_connector/token.py b/src/cloudflare/resources/zero_trust/tunnels/warp_connector/token.py
new file mode 100644
index 00000000000..aeb96269e07
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/tunnels/warp_connector/token.py
@@ -0,0 +1,190 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, cast
+
+import httpx
+
+from ....._types import Body, Query, Headers, NotGiven, not_given
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from ....._base_client import make_request_options
+from .....types.zero_trust.tunnels.warp_connector.token_get_response import TokenGetResponse
+
+__all__ = ["TokenResource", "AsyncTokenResource"]
+
+
+class TokenResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> TokenResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return TokenResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> TokenResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return TokenResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Gets the token used to associate warp device with a specific Warp Connector
+        tunnel.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/warp_connector/{tunnel_id}/token",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class AsyncTokenResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncTokenResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncTokenResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncTokenResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncTokenResourceWithStreamingResponse(self)
+
+    async def get(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> str:
+        """
+        Gets the token used to associate warp device with a specific Warp Connector
+        tunnel.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/warp_connector/{tunnel_id}/token",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[TokenGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[str], ResultWrapper[str]),
+        )
+
+
+class TokenResourceWithRawResponse:
+    def __init__(self, token: TokenResource) -> None:
+        self._token = token
+
+        self.get = to_raw_response_wrapper(
+            token.get,
+        )
+
+
+class AsyncTokenResourceWithRawResponse:
+    def __init__(self, token: AsyncTokenResource) -> None:
+        self._token = token
+
+        self.get = async_to_raw_response_wrapper(
+            token.get,
+        )
+
+
+class TokenResourceWithStreamingResponse:
+    def __init__(self, token: TokenResource) -> None:
+        self._token = token
+
+        self.get = to_streamed_response_wrapper(
+            token.get,
+        )
+
+
+class AsyncTokenResourceWithStreamingResponse:
+    def __init__(self, token: AsyncTokenResource) -> None:
+        self._token = token
+
+        self.get = async_to_streamed_response_wrapper(
+            token.get,
+        )
diff --git a/src/cloudflare/resources/zero_trust/tunnels/warp_connector/warp_connector.py b/src/cloudflare/resources/zero_trust/tunnels/warp_connector/warp_connector.py
new file mode 100644
index 00000000000..db0b48d25fe
--- /dev/null
+++ b/src/cloudflare/resources/zero_trust/tunnels/warp_connector/warp_connector.py
@@ -0,0 +1,741 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Type, Union, cast
+from datetime import datetime
+from typing_extensions import Literal
+
+import httpx
+
+from .token import (
+    TokenResource,
+    AsyncTokenResource,
+    TokenResourceWithRawResponse,
+    AsyncTokenResourceWithRawResponse,
+    TokenResourceWithStreamingResponse,
+    AsyncTokenResourceWithStreamingResponse,
+)
+from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ....._utils import maybe_transform, async_maybe_transform
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from ....._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ....._wrappers import ResultWrapper
+from .....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ....._base_client import AsyncPaginator, make_request_options
+from .....types.zero_trust.tunnels import (
+    warp_connector_edit_params,
+    warp_connector_list_params,
+    warp_connector_create_params,
+)
+from .....types.zero_trust.tunnels.warp_connector_get_response import WARPConnectorGetResponse
+from .....types.zero_trust.tunnels.warp_connector_edit_response import WARPConnectorEditResponse
+from .....types.zero_trust.tunnels.warp_connector_list_response import WARPConnectorListResponse
+from .....types.zero_trust.tunnels.warp_connector_create_response import WARPConnectorCreateResponse
+from .....types.zero_trust.tunnels.warp_connector_delete_response import WARPConnectorDeleteResponse
+
+__all__ = ["WARPConnectorResource", "AsyncWARPConnectorResource"]
+
+
+class WARPConnectorResource(SyncAPIResource):
+    @cached_property
+    def token(self) -> TokenResource:
+        return TokenResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> WARPConnectorResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return WARPConnectorResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> WARPConnectorResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return WARPConnectorResourceWithStreamingResponse(self)
+
+    def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WARPConnectorCreateResponse:
+        """
+        Creates a new Warp Connector Tunnel in an account.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          name: A user-friendly name for a tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._post(
+            f"/accounts/{account_id}/warp_connector",
+            body=maybe_transform({"name": name}, warp_connector_create_params.WARPConnectorCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[WARPConnectorCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[WARPConnectorCreateResponse], ResultWrapper[WARPConnectorCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        exclude_prefix: str | Omit = omit,
+        existed_at: str | Omit = omit,
+        include_prefix: str | Omit = omit,
+        is_deleted: bool | Omit = omit,
+        name: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal["inactive", "degraded", "healthy", "down"] | Omit = omit,
+        uuid: str | Omit = omit,
+        was_active_at: Union[str, datetime] | Omit = omit,
+        was_inactive_at: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncV4PagePaginationArray[WARPConnectorListResponse]:
+        """
+        Lists and filters Warp Connector Tunnels in an account.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          existed_at: If provided, include only resources that were created (and not deleted) before
+              this time. URL encoded.
+
+          is_deleted: If `true`, only include deleted tunnels. If `false`, exclude deleted tunnels. If
+              empty, all tunnels will be included.
+
+          name: A user-friendly name for the tunnel.
+
+          page: Page number of paginated results.
+
+          per_page: Number of results to display.
+
+          status: The status of the tunnel. Valid values are `inactive` (tunnel has never been
+              run), `degraded` (tunnel is active and able to serve traffic but in an unhealthy
+              state), `healthy` (tunnel is active and able to serve traffic), or `down`
+              (tunnel can not serve traffic as it has no connections to the Cloudflare Edge).
+
+          uuid: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/warp_connector",
+            page=SyncV4PagePaginationArray[WARPConnectorListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "exclude_prefix": exclude_prefix,
+                        "existed_at": existed_at,
+                        "include_prefix": include_prefix,
+                        "is_deleted": is_deleted,
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                        "status": status,
+                        "uuid": uuid,
+                        "was_active_at": was_active_at,
+                        "was_inactive_at": was_inactive_at,
+                    },
+                    warp_connector_list_params.WARPConnectorListParams,
+                ),
+            ),
+            model=WARPConnectorListResponse,
+        )
+
+    def delete(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WARPConnectorDeleteResponse:
+        """
+        Deletes a Warp Connector Tunnel from an account.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return self._delete(
+            f"/accounts/{account_id}/warp_connector/{tunnel_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[WARPConnectorDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[WARPConnectorDeleteResponse], ResultWrapper[WARPConnectorDeleteResponse]),
+        )
+
+    def edit(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        tunnel_secret: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WARPConnectorEditResponse:
+        """
+        Updates an existing Warp Connector Tunnel.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          name: A user-friendly name for a tunnel.
+
+          tunnel_secret: Sets the password required to run a locally-managed tunnel. Must be at least 32
+              bytes and encoded as a base64 string.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return self._patch(
+            f"/accounts/{account_id}/warp_connector/{tunnel_id}",
+            body=maybe_transform(
+                {
+                    "name": name,
+                    "tunnel_secret": tunnel_secret,
+                },
+                warp_connector_edit_params.WARPConnectorEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[WARPConnectorEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[WARPConnectorEditResponse], ResultWrapper[WARPConnectorEditResponse]),
+        )
+
+    def get(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WARPConnectorGetResponse:
+        """
+        Fetches a single Warp Connector Tunnel.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return self._get(
+            f"/accounts/{account_id}/warp_connector/{tunnel_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[WARPConnectorGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[WARPConnectorGetResponse], ResultWrapper[WARPConnectorGetResponse]),
+        )
+
+
+class AsyncWARPConnectorResource(AsyncAPIResource):
+    @cached_property
+    def token(self) -> AsyncTokenResource:
+        return AsyncTokenResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncWARPConnectorResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncWARPConnectorResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncWARPConnectorResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncWARPConnectorResourceWithStreamingResponse(self)
+
+    async def create(
+        self,
+        *,
+        account_id: str,
+        name: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WARPConnectorCreateResponse:
+        """
+        Creates a new Warp Connector Tunnel in an account.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          name: A user-friendly name for a tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return await self._post(
+            f"/accounts/{account_id}/warp_connector",
+            body=await async_maybe_transform({"name": name}, warp_connector_create_params.WARPConnectorCreateParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[WARPConnectorCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[WARPConnectorCreateResponse], ResultWrapper[WARPConnectorCreateResponse]),
+        )
+
+    def list(
+        self,
+        *,
+        account_id: str,
+        exclude_prefix: str | Omit = omit,
+        existed_at: str | Omit = omit,
+        include_prefix: str | Omit = omit,
+        is_deleted: bool | Omit = omit,
+        name: str | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal["inactive", "degraded", "healthy", "down"] | Omit = omit,
+        uuid: str | Omit = omit,
+        was_active_at: Union[str, datetime] | Omit = omit,
+        was_inactive_at: Union[str, datetime] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[WARPConnectorListResponse, AsyncV4PagePaginationArray[WARPConnectorListResponse]]:
+        """
+        Lists and filters Warp Connector Tunnels in an account.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          existed_at: If provided, include only resources that were created (and not deleted) before
+              this time. URL encoded.
+
+          is_deleted: If `true`, only include deleted tunnels. If `false`, exclude deleted tunnels. If
+              empty, all tunnels will be included.
+
+          name: A user-friendly name for the tunnel.
+
+          page: Page number of paginated results.
+
+          per_page: Number of results to display.
+
+          status: The status of the tunnel. Valid values are `inactive` (tunnel has never been
+              run), `degraded` (tunnel is active and able to serve traffic but in an unhealthy
+              state), `healthy` (tunnel is active and able to serve traffic), or `down`
+              (tunnel can not serve traffic as it has no connections to the Cloudflare Edge).
+
+          uuid: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        return self._get_api_list(
+            f"/accounts/{account_id}/warp_connector",
+            page=AsyncV4PagePaginationArray[WARPConnectorListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                query=maybe_transform(
+                    {
+                        "exclude_prefix": exclude_prefix,
+                        "existed_at": existed_at,
+                        "include_prefix": include_prefix,
+                        "is_deleted": is_deleted,
+                        "name": name,
+                        "page": page,
+                        "per_page": per_page,
+                        "status": status,
+                        "uuid": uuid,
+                        "was_active_at": was_active_at,
+                        "was_inactive_at": was_inactive_at,
+                    },
+                    warp_connector_list_params.WARPConnectorListParams,
+                ),
+            ),
+            model=WARPConnectorListResponse,
+        )
+
+    async def delete(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WARPConnectorDeleteResponse:
+        """
+        Deletes a Warp Connector Tunnel from an account.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return await self._delete(
+            f"/accounts/{account_id}/warp_connector/{tunnel_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[WARPConnectorDeleteResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[WARPConnectorDeleteResponse], ResultWrapper[WARPConnectorDeleteResponse]),
+        )
+
+    async def edit(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        name: str | Omit = omit,
+        tunnel_secret: str | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WARPConnectorEditResponse:
+        """
+        Updates an existing Warp Connector Tunnel.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          name: A user-friendly name for a tunnel.
+
+          tunnel_secret: Sets the password required to run a locally-managed tunnel. Must be at least 32
+              bytes and encoded as a base64 string.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return await self._patch(
+            f"/accounts/{account_id}/warp_connector/{tunnel_id}",
+            body=await async_maybe_transform(
+                {
+                    "name": name,
+                    "tunnel_secret": tunnel_secret,
+                },
+                warp_connector_edit_params.WARPConnectorEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[WARPConnectorEditResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[WARPConnectorEditResponse], ResultWrapper[WARPConnectorEditResponse]),
+        )
+
+    async def get(
+        self,
+        tunnel_id: str,
+        *,
+        account_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WARPConnectorGetResponse:
+        """
+        Fetches a single Warp Connector Tunnel.
+
+        Args:
+          account_id: Cloudflare account ID
+
+          tunnel_id: UUID of the tunnel.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
+        if not tunnel_id:
+            raise ValueError(f"Expected a non-empty value for `tunnel_id` but received {tunnel_id!r}")
+        return await self._get(
+            f"/accounts/{account_id}/warp_connector/{tunnel_id}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[WARPConnectorGetResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[WARPConnectorGetResponse], ResultWrapper[WARPConnectorGetResponse]),
+        )
+
+
+class WARPConnectorResourceWithRawResponse:
+    def __init__(self, warp_connector: WARPConnectorResource) -> None:
+        self._warp_connector = warp_connector
+
+        self.create = to_raw_response_wrapper(
+            warp_connector.create,
+        )
+        self.list = to_raw_response_wrapper(
+            warp_connector.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            warp_connector.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            warp_connector.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            warp_connector.get,
+        )
+
+    @cached_property
+    def token(self) -> TokenResourceWithRawResponse:
+        return TokenResourceWithRawResponse(self._warp_connector.token)
+
+
+class AsyncWARPConnectorResourceWithRawResponse:
+    def __init__(self, warp_connector: AsyncWARPConnectorResource) -> None:
+        self._warp_connector = warp_connector
+
+        self.create = async_to_raw_response_wrapper(
+            warp_connector.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            warp_connector.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            warp_connector.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            warp_connector.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            warp_connector.get,
+        )
+
+    @cached_property
+    def token(self) -> AsyncTokenResourceWithRawResponse:
+        return AsyncTokenResourceWithRawResponse(self._warp_connector.token)
+
+
+class WARPConnectorResourceWithStreamingResponse:
+    def __init__(self, warp_connector: WARPConnectorResource) -> None:
+        self._warp_connector = warp_connector
+
+        self.create = to_streamed_response_wrapper(
+            warp_connector.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            warp_connector.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            warp_connector.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            warp_connector.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            warp_connector.get,
+        )
+
+    @cached_property
+    def token(self) -> TokenResourceWithStreamingResponse:
+        return TokenResourceWithStreamingResponse(self._warp_connector.token)
+
+
+class AsyncWARPConnectorResourceWithStreamingResponse:
+    def __init__(self, warp_connector: AsyncWARPConnectorResource) -> None:
+        self._warp_connector = warp_connector
+
+        self.create = async_to_streamed_response_wrapper(
+            warp_connector.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            warp_connector.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            warp_connector.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            warp_connector.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            warp_connector.get,
+        )
+
+    @cached_property
+    def token(self) -> AsyncTokenResourceWithStreamingResponse:
+        return AsyncTokenResourceWithStreamingResponse(self._warp_connector.token)
diff --git a/src/cloudflare/resources/zero_trust/zero_trust.py b/src/cloudflare/resources/zero_trust/zero_trust.py
index 63aefc65ac1..a8de3d6cb8b 100644
--- a/src/cloudflare/resources/zero_trust/zero_trust.py
+++ b/src/cloudflare/resources/zero_trust/zero_trust.py
@@ -2,7 +2,15 @@
 
 from __future__ import annotations
 
-from .dex import (
+from .seats import (
+    SeatsResource,
+    AsyncSeatsResource,
+    SeatsResourceWithRawResponse,
+    AsyncSeatsResourceWithRawResponse,
+    SeatsResourceWithStreamingResponse,
+    AsyncSeatsResourceWithStreamingResponse,
+)
+from .dex.dex import (
     DEXResource,
     AsyncDEXResource,
     DEXResourceWithRawResponse,
@@ -10,7 +18,7 @@
     DEXResourceWithStreamingResponse,
     AsyncDEXResourceWithStreamingResponse,
 )
-from .dlp import (
+from .dlp.dlp import (
     DLPResource,
     AsyncDLPResource,
     DLPResourceWithRawResponse,
@@ -18,15 +26,9 @@
     DLPResourceWithStreamingResponse,
     AsyncDLPResourceWithStreamingResponse,
 )
-from .seats import (
-    SeatsResource,
-    AsyncSeatsResource,
-    SeatsResourceWithRawResponse,
-    AsyncSeatsResourceWithRawResponse,
-    SeatsResourceWithStreamingResponse,
-    AsyncSeatsResourceWithStreamingResponse,
-)
-from .access import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .access.access import (
     AccessResource,
     AsyncAccessResource,
     AccessResourceWithRawResponse,
@@ -34,7 +36,7 @@
     AccessResourceWithStreamingResponse,
     AsyncAccessResourceWithStreamingResponse,
 )
-from .devices import (
+from .devices.devices import (
     DevicesResource,
     AsyncDevicesResource,
     DevicesResourceWithRawResponse,
@@ -42,9 +44,7 @@
     DevicesResourceWithStreamingResponse,
     AsyncDevicesResourceWithStreamingResponse,
 )
-from .dex.dex import DEXResource, AsyncDEXResource
-from .dlp.dlp import DLPResource, AsyncDLPResource
-from .gateway import (
+from .gateway.gateway import (
     GatewayResource,
     AsyncGatewayResource,
     GatewayResourceWithRawResponse,
@@ -52,7 +52,7 @@
     GatewayResourceWithStreamingResponse,
     AsyncGatewayResourceWithStreamingResponse,
 )
-from .tunnels import (
+from .tunnels.tunnels import (
     TunnelsResource,
     AsyncTunnelsResource,
     TunnelsResourceWithRawResponse,
@@ -60,7 +60,7 @@
     TunnelsResourceWithStreamingResponse,
     AsyncTunnelsResourceWithStreamingResponse,
 )
-from .networks import (
+from .networks.networks import (
     NetworksResource,
     AsyncNetworksResource,
     NetworksResourceWithRawResponse,
@@ -68,9 +68,15 @@
     NetworksResourceWithStreamingResponse,
     AsyncNetworksResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .risk_scoring import (
+from .connectivity_settings import (
+    ConnectivitySettingsResource,
+    AsyncConnectivitySettingsResource,
+    ConnectivitySettingsResourceWithRawResponse,
+    AsyncConnectivitySettingsResourceWithRawResponse,
+    ConnectivitySettingsResourceWithStreamingResponse,
+    AsyncConnectivitySettingsResourceWithStreamingResponse,
+)
+from .risk_scoring.risk_scoring import (
     RiskScoringResource,
     AsyncRiskScoringResource,
     RiskScoringResourceWithRawResponse,
@@ -78,8 +84,7 @@
     RiskScoringResourceWithStreamingResponse,
     AsyncRiskScoringResourceWithStreamingResponse,
 )
-from .access.access import AccessResource, AsyncAccessResource
-from .organizations import (
+from .organizations.organizations import (
     OrganizationsResource,
     AsyncOrganizationsResource,
     OrganizationsResourceWithRawResponse,
@@ -87,11 +92,7 @@
     OrganizationsResourceWithStreamingResponse,
     AsyncOrganizationsResourceWithStreamingResponse,
 )
-from .devices.devices import DevicesResource, AsyncDevicesResource
-from .gateway.gateway import GatewayResource, AsyncGatewayResource
-from .tunnels.tunnels import TunnelsResource, AsyncTunnelsResource
-from .networks.networks import NetworksResource, AsyncNetworksResource
-from .identity_providers import (
+from .identity_providers.identity_providers import (
     IdentityProvidersResource,
     AsyncIdentityProvidersResource,
     IdentityProvidersResourceWithRawResponse,
@@ -99,15 +100,6 @@
     IdentityProvidersResourceWithStreamingResponse,
     AsyncIdentityProvidersResourceWithStreamingResponse,
 )
-from .connectivity_settings import (
-    ConnectivitySettingsResource,
-    AsyncConnectivitySettingsResource,
-    ConnectivitySettingsResourceWithRawResponse,
-    AsyncConnectivitySettingsResourceWithRawResponse,
-    ConnectivitySettingsResourceWithStreamingResponse,
-    AsyncConnectivitySettingsResourceWithStreamingResponse,
-)
-from .risk_scoring.risk_scoring import RiskScoringResource, AsyncRiskScoringResource
 
 __all__ = ["ZeroTrustResource", "AsyncZeroTrustResource"]
 
@@ -163,10 +155,21 @@ def risk_scoring(self) -> RiskScoringResource:
 
     @cached_property
     def with_raw_response(self) -> ZeroTrustResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ZeroTrustResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ZeroTrustResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ZeroTrustResourceWithStreamingResponse(self)
 
 
@@ -221,10 +224,21 @@ def risk_scoring(self) -> AsyncRiskScoringResource:
 
     @cached_property
     def with_raw_response(self) -> AsyncZeroTrustResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncZeroTrustResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncZeroTrustResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncZeroTrustResourceWithStreamingResponse(self)
 
 
diff --git a/src/cloudflare/resources/zones/__init__.py b/src/cloudflare/resources/zones/__init__.py
index 06e8291ed86..cbe662019bf 100644
--- a/src/cloudflare/resources/zones/__init__.py
+++ b/src/cloudflare/resources/zones/__init__.py
@@ -8,6 +8,14 @@
     HoldsResourceWithStreamingResponse,
     AsyncHoldsResourceWithStreamingResponse,
 )
+from .plans import (
+    PlansResource,
+    AsyncPlansResource,
+    PlansResourceWithRawResponse,
+    AsyncPlansResourceWithRawResponse,
+    PlansResourceWithStreamingResponse,
+    AsyncPlansResourceWithStreamingResponse,
+)
 from .zones import (
     ZonesResource,
     AsyncZonesResource,
@@ -24,6 +32,14 @@
     SettingsResourceWithStreamingResponse,
     AsyncSettingsResourceWithStreamingResponse,
 )
+from .rate_plans import (
+    RatePlansResource,
+    AsyncRatePlansResource,
+    RatePlansResourceWithRawResponse,
+    AsyncRatePlansResourceWithRawResponse,
+    RatePlansResourceWithStreamingResponse,
+    AsyncRatePlansResourceWithStreamingResponse,
+)
 from .subscriptions import (
     SubscriptionsResource,
     AsyncSubscriptionsResource,
@@ -80,6 +96,18 @@
     "AsyncSubscriptionsResourceWithRawResponse",
     "SubscriptionsResourceWithStreamingResponse",
     "AsyncSubscriptionsResourceWithStreamingResponse",
+    "PlansResource",
+    "AsyncPlansResource",
+    "PlansResourceWithRawResponse",
+    "AsyncPlansResourceWithRawResponse",
+    "PlansResourceWithStreamingResponse",
+    "AsyncPlansResourceWithStreamingResponse",
+    "RatePlansResource",
+    "AsyncRatePlansResource",
+    "RatePlansResourceWithRawResponse",
+    "AsyncRatePlansResourceWithRawResponse",
+    "RatePlansResourceWithStreamingResponse",
+    "AsyncRatePlansResourceWithStreamingResponse",
     "ZonesResource",
     "AsyncZonesResource",
     "ZonesResourceWithRawResponse",
diff --git a/src/cloudflare/resources/zones/activation_check.py b/src/cloudflare/resources/zones/activation_check.py
index 7770e90f797..8d829f2f272 100644
--- a/src/cloudflare/resources/zones/activation_check.py
+++ b/src/cloudflare/resources/zones/activation_check.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Query, Headers, NotGiven, not_given
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -25,10 +25,21 @@
 class ActivationCheckResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> ActivationCheckResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ActivationCheckResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ActivationCheckResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ActivationCheckResourceWithStreamingResponse(self)
 
     def trigger(
@@ -40,7 +51,7 @@ def trigger(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ActivationCheckTriggerResponse]:
         """Triggeres a new activation check for a PENDING Zone.
 
@@ -48,7 +59,7 @@ def trigger(
         5 min for paygo/ent customers, every hour for FREE Zones.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -76,10 +87,21 @@ def trigger(
 class AsyncActivationCheckResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncActivationCheckResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncActivationCheckResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncActivationCheckResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncActivationCheckResourceWithStreamingResponse(self)
 
     async def trigger(
@@ -91,7 +113,7 @@ async def trigger(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ActivationCheckTriggerResponse]:
         """Triggeres a new activation check for a PENDING Zone.
 
@@ -99,7 +121,7 @@ async def trigger(
         5 min for paygo/ent customers, every hour for FREE Zones.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
diff --git a/src/cloudflare/resources/zones/custom_nameservers.py b/src/cloudflare/resources/zones/custom_nameservers.py
index a0bb540a1f7..b4632a7aaf3 100644
--- a/src/cloudflare/resources/zones/custom_nameservers.py
+++ b/src/cloudflare/resources/zones/custom_nameservers.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+import typing_extensions
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -19,9 +16,9 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..._wrappers import ResultWrapper
+from ...pagination import SyncSinglePage, AsyncSinglePage
 from ...types.zones import custom_nameserver_update_params
-from ..._base_client import make_request_options
+from ..._base_client import AsyncPaginator, make_request_options
 from ...types.zones.custom_nameserver_get_response import CustomNameserverGetResponse
 from ...types.zones.custom_nameserver_update_response import CustomNameserverUpdateResponse
 
@@ -31,25 +28,39 @@
 class CustomNameserversResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> CustomNameserversResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return CustomNameserversResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> CustomNameserversResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return CustomNameserversResourceWithStreamingResponse(self)
 
+    @typing_extensions.deprecated(
+        "Use [DNS settings API](https://developers.cloudflare.com/api/resources/dns/subresources/settings/methods/put/) instead."
+    )
     def update(
         self,
         *,
         zone_id: str,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        ns_set: float | NotGiven = NOT_GIVEN,
+        enabled: bool | Omit = omit,
+        ns_set: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CustomNameserverUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[CustomNameserverUpdateResponse]:
         """
         Set metadata for account-level custom nameservers on a zone.
 
@@ -57,8 +68,11 @@ def update(
         default, use PUT /accounts/:identifier to set the account setting
         use_account_custom_ns_by_default to true.
 
+        Deprecated in favor of
+        [Update DNS Settings](https://developers.cloudflare.com/api/operations/dns-settings-for-a-zone-update-dns-settings).
+
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           enabled: Whether zone uses account-level custom nameservers.
 
@@ -74,8 +88,9 @@ def update(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return self._put(
+        return self._get_api_list(
             f"/zones/{zone_id}/custom_ns",
+            page=SyncSinglePage[CustomNameserverUpdateResponse],
             body=maybe_transform(
                 {
                     "enabled": enabled,
@@ -84,15 +99,15 @@ def update(
                 custom_nameserver_update_params.CustomNameserverUpdateParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CustomNameserverUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[CustomNameserverUpdateResponse]], ResultWrapper[CustomNameserverUpdateResponse]),
+            model=str,
+            method="put",
         )
 
+    @typing_extensions.deprecated(
+        "Use [DNS settings API](https://developers.cloudflare.com/api/resources/dns/subresources/settings/methods/get/) instead."
+    )
     def get(
         self,
         *,
@@ -102,13 +117,16 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CustomNameserverGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CustomNameserverGetResponse:
         """
         Get metadata for account-level custom nameservers on a zone.
 
+        Deprecated in favor of
+        [Show DNS Settings](https://developers.cloudflare.com/api/operations/dns-settings-for-a-zone-list-dns-settings).
+
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -123,38 +141,48 @@ def get(
         return self._get(
             f"/zones/{zone_id}/custom_ns",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CustomNameserverGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[CustomNameserverGetResponse]], ResultWrapper[CustomNameserverGetResponse]),
+            cast_to=CustomNameserverGetResponse,
         )
 
 
 class AsyncCustomNameserversResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncCustomNameserversResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncCustomNameserversResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncCustomNameserversResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncCustomNameserversResourceWithStreamingResponse(self)
 
-    async def update(
+    @typing_extensions.deprecated(
+        "Use [DNS settings API](https://developers.cloudflare.com/api/resources/dns/subresources/settings/methods/put/) instead."
+    )
+    def update(
         self,
         *,
         zone_id: str,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        ns_set: float | NotGiven = NOT_GIVEN,
+        enabled: bool | Omit = omit,
+        ns_set: float | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CustomNameserverUpdateResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[CustomNameserverUpdateResponse, AsyncSinglePage[CustomNameserverUpdateResponse]]:
         """
         Set metadata for account-level custom nameservers on a zone.
 
@@ -162,8 +190,11 @@ async def update(
         default, use PUT /accounts/:identifier to set the account setting
         use_account_custom_ns_by_default to true.
 
+        Deprecated in favor of
+        [Update DNS Settings](https://developers.cloudflare.com/api/operations/dns-settings-for-a-zone-update-dns-settings).
+
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           enabled: Whether zone uses account-level custom nameservers.
 
@@ -179,9 +210,10 @@ async def update(
         """
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        return await self._put(
+        return self._get_api_list(
             f"/zones/{zone_id}/custom_ns",
-            body=await async_maybe_transform(
+            page=AsyncSinglePage[CustomNameserverUpdateResponse],
+            body=maybe_transform(
                 {
                     "enabled": enabled,
                     "ns_set": ns_set,
@@ -189,15 +221,15 @@ async def update(
                 custom_nameserver_update_params.CustomNameserverUpdateParams,
             ),
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CustomNameserverUpdateResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[CustomNameserverUpdateResponse]], ResultWrapper[CustomNameserverUpdateResponse]),
+            model=str,
+            method="put",
         )
 
+    @typing_extensions.deprecated(
+        "Use [DNS settings API](https://developers.cloudflare.com/api/resources/dns/subresources/settings/methods/get/) instead."
+    )
     async def get(
         self,
         *,
@@ -207,13 +239,16 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[CustomNameserverGetResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> CustomNameserverGetResponse:
         """
         Get metadata for account-level custom nameservers on a zone.
 
+        Deprecated in favor of
+        [Show DNS Settings](https://developers.cloudflare.com/api/operations/dns-settings-for-a-zone-list-dns-settings).
+
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -228,13 +263,9 @@ async def get(
         return await self._get(
             f"/zones/{zone_id}/custom_ns",
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper[Optional[CustomNameserverGetResponse]]._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[CustomNameserverGetResponse]], ResultWrapper[CustomNameserverGetResponse]),
+            cast_to=CustomNameserverGetResponse,
         )
 
 
@@ -242,11 +273,15 @@ class CustomNameserversResourceWithRawResponse:
     def __init__(self, custom_nameservers: CustomNameserversResource) -> None:
         self._custom_nameservers = custom_nameservers
 
-        self.update = to_raw_response_wrapper(
-            custom_nameservers.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                custom_nameservers.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_raw_response_wrapper(
-            custom_nameservers.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_raw_response_wrapper(
+                custom_nameservers.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -254,11 +289,15 @@ class AsyncCustomNameserversResourceWithRawResponse:
     def __init__(self, custom_nameservers: AsyncCustomNameserversResource) -> None:
         self._custom_nameservers = custom_nameservers
 
-        self.update = async_to_raw_response_wrapper(
-            custom_nameservers.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                custom_nameservers.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_raw_response_wrapper(
-            custom_nameservers.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_raw_response_wrapper(
+                custom_nameservers.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -266,11 +305,15 @@ class CustomNameserversResourceWithStreamingResponse:
     def __init__(self, custom_nameservers: CustomNameserversResource) -> None:
         self._custom_nameservers = custom_nameservers
 
-        self.update = to_streamed_response_wrapper(
-            custom_nameservers.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                custom_nameservers.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = to_streamed_response_wrapper(
-            custom_nameservers.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            to_streamed_response_wrapper(
+                custom_nameservers.get,  # pyright: ignore[reportDeprecated],
+            )
         )
 
 
@@ -278,9 +321,13 @@ class AsyncCustomNameserversResourceWithStreamingResponse:
     def __init__(self, custom_nameservers: AsyncCustomNameserversResource) -> None:
         self._custom_nameservers = custom_nameservers
 
-        self.update = async_to_streamed_response_wrapper(
-            custom_nameservers.update,
+        self.update = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                custom_nameservers.update,  # pyright: ignore[reportDeprecated],
+            )
         )
-        self.get = async_to_streamed_response_wrapper(
-            custom_nameservers.get,
+        self.get = (  # pyright: ignore[reportDeprecated]
+            async_to_streamed_response_wrapper(
+                custom_nameservers.get,  # pyright: ignore[reportDeprecated],
+            )
         )
diff --git a/src/cloudflare/resources/zones/holds.py b/src/cloudflare/resources/zones/holds.py
index 3e96ed85ab8..788b8bf77d2 100644
--- a/src/cloudflare/resources/zones/holds.py
+++ b/src/cloudflare/resources/zones/holds.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Type, cast
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -20,7 +17,7 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from ...types.zones import hold_create_params, hold_delete_params
+from ...types.zones import hold_edit_params, hold_create_params, hold_delete_params
 from ..._base_client import make_request_options
 from ...types.zones.zone_hold import ZoneHold
 
@@ -30,30 +27,41 @@
 class HoldsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> HoldsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return HoldsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> HoldsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return HoldsResourceWithStreamingResponse(self)
 
     def create(
         self,
         *,
         zone_id: str,
-        include_subdomains: bool | NotGiven = NOT_GIVEN,
+        include_subdomains: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ZoneHold:
         """
         Enforce a zone hold on the zone, blocking the creation and activation of zones
         with this zone's hostname.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           include_subdomains: If provided, the zone hold will extend to block any subdomain of the given zone,
               as well as SSL4SaaS Custom Hostnames. For example, a zone hold on a zone with
@@ -87,20 +95,20 @@ def delete(
         self,
         *,
         zone_id: str,
-        hold_after: str | NotGiven = NOT_GIVEN,
+        hold_after: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ZoneHold]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ZoneHold:
         """
         Stop enforcement of a zone hold on the zone, permanently or temporarily,
         allowing the creation and activation of zones with this zone's hostname.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           hold_after: If `hold_after` is provided, the hold will be temporarily disabled, then
               automatically re-enabled by the system at the time specified in this
@@ -124,9 +132,69 @@ def delete(
                 extra_body=extra_body,
                 timeout=timeout,
                 query=maybe_transform({"hold_after": hold_after}, hold_delete_params.HoldDeleteParams),
-                post_parser=ResultWrapper[Optional[ZoneHold]]._unwrapper,
+                post_parser=ResultWrapper[ZoneHold]._unwrapper,
+            ),
+            cast_to=cast(Type[ZoneHold], ResultWrapper[ZoneHold]),
+        )
+
+    def edit(
+        self,
+        *,
+        zone_id: str,
+        hold_after: str | Omit = omit,
+        include_subdomains: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ZoneHold:
+        """
+        Update the `hold_after` and/or `include_subdomains` values on an existing zone
+        hold. The hold is enabled if the `hold_after` date-time value is in the past.
+
+        Args:
+          zone_id: Identifier.
+
+          hold_after: If `hold_after` is provided and future-dated, the hold will be temporarily
+              disabled, then automatically re-enabled by the system at the time specified in
+              this RFC3339-formatted timestamp. A past-dated `hold_after` value will have no
+              effect on an existing, enabled hold. Providing an empty string will set its
+              value to the current time.
+
+          include_subdomains: If `true`, the zone hold will extend to block any subdomain of the given zone,
+              as well as SSL4SaaS Custom Hostnames. For example, a zone hold on a zone with
+              the hostname 'example.com' and include_subdomains=true will block 'example.com',
+              'staging.example.com', 'api.staging.example.com', etc.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._patch(
+            f"/zones/{zone_id}/hold",
+            body=maybe_transform(
+                {
+                    "hold_after": hold_after,
+                    "include_subdomains": include_subdomains,
+                },
+                hold_edit_params.HoldEditParams,
             ),
-            cast_to=cast(Type[Optional[ZoneHold]], ResultWrapper[ZoneHold]),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ZoneHold]._unwrapper,
+            ),
+            cast_to=cast(Type[ZoneHold], ResultWrapper[ZoneHold]),
         )
 
     def get(
@@ -138,14 +206,14 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ZoneHold:
         """
         Retrieve whether the zone is subject to a zone hold, and metadata about the
         hold.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -173,30 +241,41 @@ def get(
 class AsyncHoldsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncHoldsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncHoldsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncHoldsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncHoldsResourceWithStreamingResponse(self)
 
     async def create(
         self,
         *,
         zone_id: str,
-        include_subdomains: bool | NotGiven = NOT_GIVEN,
+        include_subdomains: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ZoneHold:
         """
         Enforce a zone hold on the zone, blocking the creation and activation of zones
         with this zone's hostname.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           include_subdomains: If provided, the zone hold will extend to block any subdomain of the given zone,
               as well as SSL4SaaS Custom Hostnames. For example, a zone hold on a zone with
@@ -232,20 +311,20 @@ async def delete(
         self,
         *,
         zone_id: str,
-        hold_after: str | NotGiven = NOT_GIVEN,
+        hold_after: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ZoneHold]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ZoneHold:
         """
         Stop enforcement of a zone hold on the zone, permanently or temporarily,
         allowing the creation and activation of zones with this zone's hostname.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           hold_after: If `hold_after` is provided, the hold will be temporarily disabled, then
               automatically re-enabled by the system at the time specified in this
@@ -269,9 +348,69 @@ async def delete(
                 extra_body=extra_body,
                 timeout=timeout,
                 query=await async_maybe_transform({"hold_after": hold_after}, hold_delete_params.HoldDeleteParams),
-                post_parser=ResultWrapper[Optional[ZoneHold]]._unwrapper,
+                post_parser=ResultWrapper[ZoneHold]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ZoneHold]], ResultWrapper[ZoneHold]),
+            cast_to=cast(Type[ZoneHold], ResultWrapper[ZoneHold]),
+        )
+
+    async def edit(
+        self,
+        *,
+        zone_id: str,
+        hold_after: str | Omit = omit,
+        include_subdomains: bool | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> ZoneHold:
+        """
+        Update the `hold_after` and/or `include_subdomains` values on an existing zone
+        hold. The hold is enabled if the `hold_after` date-time value is in the past.
+
+        Args:
+          zone_id: Identifier.
+
+          hold_after: If `hold_after` is provided and future-dated, the hold will be temporarily
+              disabled, then automatically re-enabled by the system at the time specified in
+              this RFC3339-formatted timestamp. A past-dated `hold_after` value will have no
+              effect on an existing, enabled hold. Providing an empty string will set its
+              value to the current time.
+
+          include_subdomains: If `true`, the zone hold will extend to block any subdomain of the given zone,
+              as well as SSL4SaaS Custom Hostnames. For example, a zone hold on a zone with
+              the hostname 'example.com' and include_subdomains=true will block 'example.com',
+              'staging.example.com', 'api.staging.example.com', etc.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._patch(
+            f"/zones/{zone_id}/hold",
+            body=await async_maybe_transform(
+                {
+                    "hold_after": hold_after,
+                    "include_subdomains": include_subdomains,
+                },
+                hold_edit_params.HoldEditParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[ZoneHold]._unwrapper,
+            ),
+            cast_to=cast(Type[ZoneHold], ResultWrapper[ZoneHold]),
         )
 
     async def get(
@@ -283,14 +422,14 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> ZoneHold:
         """
         Retrieve whether the zone is subject to a zone hold, and metadata about the
         hold.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -325,6 +464,9 @@ def __init__(self, holds: HoldsResource) -> None:
         self.delete = to_raw_response_wrapper(
             holds.delete,
         )
+        self.edit = to_raw_response_wrapper(
+            holds.edit,
+        )
         self.get = to_raw_response_wrapper(
             holds.get,
         )
@@ -340,6 +482,9 @@ def __init__(self, holds: AsyncHoldsResource) -> None:
         self.delete = async_to_raw_response_wrapper(
             holds.delete,
         )
+        self.edit = async_to_raw_response_wrapper(
+            holds.edit,
+        )
         self.get = async_to_raw_response_wrapper(
             holds.get,
         )
@@ -355,6 +500,9 @@ def __init__(self, holds: HoldsResource) -> None:
         self.delete = to_streamed_response_wrapper(
             holds.delete,
         )
+        self.edit = to_streamed_response_wrapper(
+            holds.edit,
+        )
         self.get = to_streamed_response_wrapper(
             holds.get,
         )
@@ -370,6 +518,9 @@ def __init__(self, holds: AsyncHoldsResource) -> None:
         self.delete = async_to_streamed_response_wrapper(
             holds.delete,
         )
+        self.edit = async_to_streamed_response_wrapper(
+            holds.edit,
+        )
         self.get = async_to_streamed_response_wrapper(
             holds.get,
         )
diff --git a/src/cloudflare/resources/plans.py b/src/cloudflare/resources/zones/plans.py
similarity index 76%
rename from src/cloudflare/resources/plans.py
rename to src/cloudflare/resources/zones/plans.py
index fec32838ad7..907f8eb216d 100644
--- a/src/cloudflare/resources/plans.py
+++ b/src/cloudflare/resources/zones/plans.py
@@ -6,19 +6,19 @@
 
 import httpx
 
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._compat import cached_property
-from .._resource import SyncAPIResource, AsyncAPIResource
-from .._response import (
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
     to_raw_response_wrapper,
     to_streamed_response_wrapper,
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from .._wrappers import ResultWrapper
-from ..pagination import SyncSinglePage, AsyncSinglePage
-from .._base_client import AsyncPaginator, make_request_options
-from ..types.plans.available_rate_plan import AvailableRatePlan
+from ..._wrappers import ResultWrapper
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.zones.available_rate_plan import AvailableRatePlan
 
 __all__ = ["PlansResource", "AsyncPlansResource"]
 
@@ -26,28 +26,39 @@
 class PlansResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> PlansResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return PlansResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> PlansResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return PlansResourceWithStreamingResponse(self)
 
     def list(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncSinglePage[AvailableRatePlan]:
         """
         Lists available plans the zone can subscribe to.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier
 
           extra_headers: Send extra headers
 
@@ -57,10 +68,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/available_plans",
+            f"/zones/{zone_id}/available_plans",
             page=SyncSinglePage[AvailableRatePlan],
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
@@ -72,19 +83,19 @@ def get(
         self,
         plan_identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AvailableRatePlan:
         """
         Details of the available plan that the zone can subscribe to.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier
 
           plan_identifier: Identifier
 
@@ -96,12 +107,12 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not plan_identifier:
             raise ValueError(f"Expected a non-empty value for `plan_identifier` but received {plan_identifier!r}")
         return self._get(
-            f"/zones/{zone_identifier}/available_plans/{plan_identifier}",
+            f"/zones/{zone_id}/available_plans/{plan_identifier}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -116,28 +127,39 @@ def get(
 class AsyncPlansResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncPlansResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncPlansResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncPlansResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncPlansResourceWithStreamingResponse(self)
 
     def list(
         self,
-        zone_identifier: str,
         *,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[AvailableRatePlan, AsyncSinglePage[AvailableRatePlan]]:
         """
         Lists available plans the zone can subscribe to.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier
 
           extra_headers: Send extra headers
 
@@ -147,10 +169,10 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         return self._get_api_list(
-            f"/zones/{zone_identifier}/available_plans",
+            f"/zones/{zone_id}/available_plans",
             page=AsyncSinglePage[AvailableRatePlan],
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
@@ -162,19 +184,19 @@ async def get(
         self,
         plan_identifier: str,
         *,
-        zone_identifier: str,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AvailableRatePlan:
         """
         Details of the available plan that the zone can subscribe to.
 
         Args:
-          zone_identifier: Identifier
+          zone_id: Identifier
 
           plan_identifier: Identifier
 
@@ -186,12 +208,12 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not zone_identifier:
-            raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
         if not plan_identifier:
             raise ValueError(f"Expected a non-empty value for `plan_identifier` but received {plan_identifier!r}")
         return await self._get(
-            f"/zones/{zone_identifier}/available_plans/{plan_identifier}",
+            f"/zones/{zone_id}/available_plans/{plan_identifier}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
diff --git a/src/cloudflare/resources/zones/rate_plans.py b/src/cloudflare/resources/zones/rate_plans.py
new file mode 100644
index 00000000000..0cf59d0d07a
--- /dev/null
+++ b/src/cloudflare/resources/zones/rate_plans.py
@@ -0,0 +1,170 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import httpx
+
+from ..._types import Body, Query, Headers, NotGiven, not_given
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
+    to_raw_response_wrapper,
+    to_streamed_response_wrapper,
+    async_to_raw_response_wrapper,
+    async_to_streamed_response_wrapper,
+)
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.zones.rate_plan_get_response import RatePlanGetResponse
+
+__all__ = ["RatePlansResource", "AsyncRatePlansResource"]
+
+
+class RatePlansResource(SyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> RatePlansResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return RatePlansResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> RatePlansResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return RatePlansResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SyncSinglePage[RatePlanGetResponse]:
+        """
+        Lists all rate plans the zone can subscribe to.
+
+        Args:
+          zone_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/available_rate_plans",
+            page=SyncSinglePage[RatePlanGetResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=RatePlanGetResponse,
+        )
+
+
+class AsyncRatePlansResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncRatePlansResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncRatePlansResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncRatePlansResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncRatePlansResourceWithStreamingResponse(self)
+
+    def get(
+        self,
+        *,
+        zone_id: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AsyncPaginator[RatePlanGetResponse, AsyncSinglePage[RatePlanGetResponse]]:
+        """
+        Lists all rate plans the zone can subscribe to.
+
+        Args:
+          zone_id: Identifier
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get_api_list(
+            f"/zones/{zone_id}/available_rate_plans",
+            page=AsyncSinglePage[RatePlanGetResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=RatePlanGetResponse,
+        )
+
+
+class RatePlansResourceWithRawResponse:
+    def __init__(self, rate_plans: RatePlansResource) -> None:
+        self._rate_plans = rate_plans
+
+        self.get = to_raw_response_wrapper(
+            rate_plans.get,
+        )
+
+
+class AsyncRatePlansResourceWithRawResponse:
+    def __init__(self, rate_plans: AsyncRatePlansResource) -> None:
+        self._rate_plans = rate_plans
+
+        self.get = async_to_raw_response_wrapper(
+            rate_plans.get,
+        )
+
+
+class RatePlansResourceWithStreamingResponse:
+    def __init__(self, rate_plans: RatePlansResource) -> None:
+        self._rate_plans = rate_plans
+
+        self.get = to_streamed_response_wrapper(
+            rate_plans.get,
+        )
+
+
+class AsyncRatePlansResourceWithStreamingResponse:
+    def __init__(self, rate_plans: AsyncRatePlansResource) -> None:
+        self._rate_plans = rate_plans
+
+        self.get = async_to_streamed_response_wrapper(
+            rate_plans.get,
+        )
diff --git a/src/cloudflare/resources/zones/settings.py b/src/cloudflare/resources/zones/settings.py
index d9196989881..0c7fc85891b 100644
--- a/src/cloudflare/resources/zones/settings.py
+++ b/src/cloudflare/resources/zones/settings.py
@@ -2,17 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, List, Optional, cast, overload
-from typing_extensions import Literal
+from typing import Any, Optional, cast
+from typing_extensions import overload
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    required_args,
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import required_args, maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -26,7 +22,6 @@
 from ..._base_client import make_request_options
 from ...types.zones.setting_get_response import SettingGetResponse
 from ...types.zones.setting_edit_response import SettingEditResponse
-from ...types.zones.automatic_platform_optimization_param import AutomaticPlatformOptimizationParam
 
 __all__ = ["SettingsResource", "AsyncSettingsResource"]
 
@@ -34,85 +29,22 @@
 class SettingsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SettingsResourceWithRawResponse:
-        return SettingsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
-        return SettingsResourceWithStreamingResponse(self)
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["0rtt"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
         """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
 
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
         """
-        ...
+        return SettingsResourceWithRawResponse(self)
 
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["advanced_ddos"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
+    @cached_property
+    def with_streaming_response(self) -> SettingsResourceWithStreamingResponse:
         """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
         """
-        ...
+        return SettingsResourceWithStreamingResponse(self)
 
     @overload
     def edit(
@@ -120,14 +52,13 @@ def edit(
         setting_id: str,
         *,
         zone_id: str,
-        id: Literal["always_online"],
-        value: Literal["on", "off"],
+        enabled: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SettingEditResponse]:
         """
         Updates a single zone setting by the identifier
@@ -137,9 +68,7 @@ def edit(
 
           setting_id: Setting name
 
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
+          enabled: ssl-recommender enrollment setting.
 
           extra_headers: Send extra headers
 
@@ -157,14 +86,13 @@ def edit(
         setting_id: str,
         *,
         zone_id: str,
-        id: Literal["always_use_https"],
-        value: Literal["on", "off"],
+        value: setting_edit_params.Variant1Value | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SettingEditResponse]:
         """
         Updates a single zone setting by the identifier
@@ -174,9 +102,7 @@ def edit(
 
           setting_id: Setting name
 
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
+          value: Value of the zone setting.
 
           extra_headers: Send extra headers
 
@@ -188,70 +114,69 @@ def edit(
         """
         ...
 
-    @overload
+    @required_args(["zone_id"])
     def edit(
         self,
         setting_id: str,
         *,
         zone_id: str,
-        id: Literal["automatic_https_rewrites"],
-        value: Literal["on", "off"],
+        enabled: bool | Omit = omit,
+        value: setting_edit_params.Variant1Value | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not setting_id:
+            raise ValueError(f"Expected a non-empty value for `setting_id` but received {setting_id!r}")
+        return cast(
+            Optional[SettingEditResponse],
+            self._patch(
+                f"/zones/{zone_id}/settings/{setting_id}",
+                body=maybe_transform(
+                    {
+                        "enabled": enabled,
+                        "value": value,
+                    },
+                    setting_edit_params.SettingEditParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[SettingEditResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[SettingEditResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
 
-    @overload
-    def edit(
+    def get(
         self,
         setting_id: str,
         *,
         zone_id: str,
-        id: Literal["brotli"],
-        value: Literal["off", "on"],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Optional[SettingGetResponse]:
         """
-        Updates a single zone setting by the identifier
+        Fetch a single zone setting by name
 
         Args:
           zone_id: Identifier
 
           setting_id: Setting name
 
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -260,162 +185,61 @@ def edit(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["browser_cache_ttl"],
-        value: Literal[
-            0,
-            30,
-            60,
-            120,
-            300,
-            1200,
-            1800,
-            3600,
-            7200,
-            10800,
-            14400,
-            18000,
-            28800,
-            43200,
-            57600,
-            72000,
-            86400,
-            172800,
-            259200,
-            345600,
-            432000,
-            691200,
-            1382400,
-            2073600,
-            2678400,
-            5356800,
-            16070400,
-            31536000,
-        ],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        if not setting_id:
+            raise ValueError(f"Expected a non-empty value for `setting_id` but received {setting_id!r}")
+        return cast(
+            Optional[SettingGetResponse],
+            self._get(
+                f"/zones/{zone_id}/settings/{setting_id}",
+                options=make_request_options(
+                    extra_headers=extra_headers,
+                    extra_query=extra_query,
+                    extra_body=extra_body,
+                    timeout=timeout,
+                    post_parser=ResultWrapper[Optional[SettingGetResponse]]._unwrapper,
+                ),
+                cast_to=cast(
+                    Any, ResultWrapper[SettingGetResponse]
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
 
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
 
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["browser_check"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
+class AsyncSettingsResource(AsyncAPIResource):
+    @cached_property
+    def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
         """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
 
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
         """
-        ...
+        return AsyncSettingsResourceWithRawResponse(self)
 
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["cache_level"],
-        value: Literal["aggressive", "basic", "simplified"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
+    @cached_property
+    def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
         """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
         """
-        ...
+        return AsyncSettingsResourceWithStreamingResponse(self)
 
     @overload
-    def edit(
+    async def edit(
         self,
         setting_id: str,
         *,
         zone_id: str,
-        id: Literal["challenge_ttl"],
-        value: Literal[300, 900, 1800, 2700, 3600, 7200, 10800, 14400, 28800, 57600, 86400, 604800, 2592000, 31536000],
+        enabled: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SettingEditResponse]:
         """
         Updates a single zone setting by the identifier
@@ -425,9 +249,7 @@ def edit(
 
           setting_id: Setting name
 
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
+          enabled: ssl-recommender enrollment setting.
 
           extra_headers: Send extra headers
 
@@ -440,19 +262,18 @@ def edit(
         ...
 
     @overload
-    def edit(
+    async def edit(
         self,
         setting_id: str,
         *,
         zone_id: str,
-        id: Literal["ciphers"],
-        value: List[str],
+        value: setting_edit_params.Variant1Value | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SettingEditResponse]:
         """
         Updates a single zone setting by the identifier
@@ -462,9 +283,7 @@ def edit(
 
           setting_id: Setting name
 
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
+          value: Value of the zone setting.
 
           extra_headers: Send extra headers
 
@@ -476,4117 +295,20 @@ def edit(
         """
         ...
 
-    @overload
-    def edit(
+    @required_args(["zone_id"])
+    async def edit(
         self,
         setting_id: str,
         *,
         zone_id: str,
-        id: Literal["cname_flattening"],
-        value: Literal["flatten_at_root", "flatten_all"],
+        enabled: bool | Omit = omit,
+        value: setting_edit_params.Variant1Value | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: How to flatten the cname destination.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["development_mode"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["early_hints"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["edge_cache_ttl"],
-        value: Literal[
-            30,
-            60,
-            300,
-            1200,
-            1800,
-            3600,
-            7200,
-            10800,
-            14400,
-            18000,
-            28800,
-            43200,
-            57600,
-            72000,
-            86400,
-            172800,
-            259200,
-            345600,
-            432000,
-            518400,
-            604800,
-        ],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["email_obfuscation"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["h2_prioritization"],
-        value: Literal["on", "off", "custom"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["hotlink_protection"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["http2"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["http3"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["image_resizing"],
-        value: Literal["on", "off", "open"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["ip_geolocation"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["ipv6"],
-        value: Literal["off", "on"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["max_upload"],
-        value: Literal[100, 200, 500],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: identifier of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["min_tls_version"],
-        value: Literal["1.0", "1.1", "1.2", "1.3"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["minify"],
-        value: setting_edit_params.MinifyValue,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: Zone setting identifier.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["mirage"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["mobile_redirect"],
-        value: setting_edit_params.MobileRedirectValue,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: Identifier of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["nel"],
-        value: setting_edit_params.NELValue,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: Zone setting identifier.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["opportunistic_encryption"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["opportunistic_onion"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["orange_to_orange"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["origin_error_page_pass_thru"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["polish"],
-        value: Literal["off", "lossless", "lossy"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["prefetch_preload"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["proxy_read_timeout"],
-        value: float,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["pseudo_ipv4"],
-        value: Literal["off", "add_header", "overwrite_header"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: Value of the Pseudo IPv4 setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["replace_insecure_js"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["response_buffering"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["rocket_loader"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["automatic_platform_optimization"],
-        value: AutomaticPlatformOptimizationParam,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["security_header"],
-        value: setting_edit_params.SecurityHeadersValue,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone's security header.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["security_level"],
-        value: Literal["off", "essentially_off", "low", "medium", "high", "under_attack"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["server_side_exclude"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["sha1_support"],
-        value: Literal["off", "on"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: Zone setting identifier.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["sort_query_string_for_cache"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["ssl"],
-        value: Literal["off", "flexible", "full", "strict"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["ssl_recommender"] | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: Enrollment value for SSL/TLS Recommender.
-
-          enabled: ssl-recommender enrollment setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["tls_1_2_only"],
-        value: Literal["off", "on"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: Zone setting identifier.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["tls_1_3"],
-        value: Literal["on", "off", "zrt"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["tls_client_auth"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["true_client_ip_header"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["waf"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["webp"],
-        value: Literal["off", "on"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["websockets"],
-        value: Literal["off", "on"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @required_args(["zone_id", "id", "value"], ["zone_id"])
-    def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["0rtt"]
-        | Literal["advanced_ddos"]
-        | Literal["always_online"]
-        | Literal["always_use_https"]
-        | Literal["automatic_https_rewrites"]
-        | Literal["brotli"]
-        | Literal["browser_cache_ttl"]
-        | Literal["browser_check"]
-        | Literal["cache_level"]
-        | Literal["challenge_ttl"]
-        | Literal["ciphers"]
-        | Literal["cname_flattening"]
-        | Literal["development_mode"]
-        | Literal["early_hints"]
-        | Literal["edge_cache_ttl"]
-        | Literal["email_obfuscation"]
-        | Literal["h2_prioritization"]
-        | Literal["hotlink_protection"]
-        | Literal["http2"]
-        | Literal["http3"]
-        | Literal["image_resizing"]
-        | Literal["ip_geolocation"]
-        | Literal["ipv6"]
-        | Literal["max_upload"]
-        | Literal["min_tls_version"]
-        | Literal["minify"]
-        | Literal["mirage"]
-        | Literal["mobile_redirect"]
-        | Literal["nel"]
-        | Literal["opportunistic_encryption"]
-        | Literal["opportunistic_onion"]
-        | Literal["orange_to_orange"]
-        | Literal["origin_error_page_pass_thru"]
-        | Literal["polish"]
-        | Literal["prefetch_preload"]
-        | Literal["proxy_read_timeout"]
-        | Literal["pseudo_ipv4"]
-        | Literal["replace_insecure_js"]
-        | Literal["response_buffering"]
-        | Literal["rocket_loader"]
-        | Literal["automatic_platform_optimization"]
-        | Literal["security_header"]
-        | Literal["security_level"]
-        | Literal["server_side_exclude"]
-        | Literal["sha1_support"]
-        | Literal["sort_query_string_for_cache"]
-        | Literal["ssl"]
-        | Literal["ssl_recommender"]
-        | Literal["tls_1_2_only"]
-        | Literal["tls_1_3"]
-        | Literal["tls_client_auth"]
-        | Literal["true_client_ip_header"]
-        | Literal["waf"]
-        | Literal["webp"]
-        | Literal["websockets"]
-        | NotGiven = NOT_GIVEN,
-        value: Literal["on", "off"]
-        | Literal[
-            0,
-            30,
-            60,
-            120,
-            300,
-            1200,
-            1800,
-            3600,
-            7200,
-            10800,
-            14400,
-            18000,
-            28800,
-            43200,
-            57600,
-            72000,
-            86400,
-            172800,
-            259200,
-            345600,
-            432000,
-            691200,
-            1382400,
-            2073600,
-            2678400,
-            5356800,
-            16070400,
-            31536000,
-        ]
-        | Literal["aggressive", "basic", "simplified"]
-        | Literal[300, 900, 1800, 2700, 3600, 7200, 10800, 14400, 28800, 57600, 86400, 604800, 2592000, 31536000]
-        | List[str]
-        | Literal["flatten_at_root", "flatten_all"]
-        | Literal[
-            30,
-            60,
-            300,
-            1200,
-            1800,
-            3600,
-            7200,
-            10800,
-            14400,
-            18000,
-            28800,
-            43200,
-            57600,
-            72000,
-            86400,
-            172800,
-            259200,
-            345600,
-            432000,
-            518400,
-            604800,
-        ]
-        | Literal["on", "off", "custom"]
-        | Literal["on", "off", "open"]
-        | Literal[100, 200, 500]
-        | Literal["1.0", "1.1", "1.2", "1.3"]
-        | setting_edit_params.MinifyValue
-        | setting_edit_params.MobileRedirectValue
-        | setting_edit_params.NELValue
-        | Literal["off", "lossless", "lossy"]
-        | float
-        | Literal["off", "add_header", "overwrite_header"]
-        | AutomaticPlatformOptimizationParam
-        | setting_edit_params.SecurityHeadersValue
-        | Literal["off", "essentially_off", "low", "medium", "high", "under_attack"]
-        | Literal["off", "flexible", "full", "strict"]
-        | Literal["on", "off", "zrt"]
-        | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        if not setting_id:
-            raise ValueError(f"Expected a non-empty value for `setting_id` but received {setting_id!r}")
-        return cast(
-            Optional[SettingEditResponse],
-            self._patch(
-                f"/zones/{zone_id}/settings/{setting_id}",
-                body=maybe_transform(
-                    {
-                        "id": id,
-                        "value": value,
-                        "enabled": enabled,
-                    },
-                    setting_edit_params.SettingEditParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[SettingEditResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[SettingEditResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    def get(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingGetResponse]:
-        """
-        Fetch a single zone setting by name
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not zone_id:
-            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
-        if not setting_id:
-            raise ValueError(f"Expected a non-empty value for `setting_id` but received {setting_id!r}")
-        return cast(
-            Optional[SettingGetResponse],
-            self._get(
-                f"/zones/{zone_id}/settings/{setting_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[Optional[SettingGetResponse]]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[SettingGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class AsyncSettingsResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncSettingsResourceWithRawResponse:
-        return AsyncSettingsResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncSettingsResourceWithStreamingResponse:
-        return AsyncSettingsResourceWithStreamingResponse(self)
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["0rtt"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["advanced_ddos"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["always_online"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["always_use_https"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["automatic_https_rewrites"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["brotli"],
-        value: Literal["off", "on"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["browser_cache_ttl"],
-        value: Literal[
-            0,
-            30,
-            60,
-            120,
-            300,
-            1200,
-            1800,
-            3600,
-            7200,
-            10800,
-            14400,
-            18000,
-            28800,
-            43200,
-            57600,
-            72000,
-            86400,
-            172800,
-            259200,
-            345600,
-            432000,
-            691200,
-            1382400,
-            2073600,
-            2678400,
-            5356800,
-            16070400,
-            31536000,
-        ],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["browser_check"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["cache_level"],
-        value: Literal["aggressive", "basic", "simplified"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["challenge_ttl"],
-        value: Literal[300, 900, 1800, 2700, 3600, 7200, 10800, 14400, 28800, 57600, 86400, 604800, 2592000, 31536000],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["ciphers"],
-        value: List[str],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["cname_flattening"],
-        value: Literal["flatten_at_root", "flatten_all"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: How to flatten the cname destination.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["development_mode"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["early_hints"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["edge_cache_ttl"],
-        value: Literal[
-            30,
-            60,
-            300,
-            1200,
-            1800,
-            3600,
-            7200,
-            10800,
-            14400,
-            18000,
-            28800,
-            43200,
-            57600,
-            72000,
-            86400,
-            172800,
-            259200,
-            345600,
-            432000,
-            518400,
-            604800,
-        ],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["email_obfuscation"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["h2_prioritization"],
-        value: Literal["on", "off", "custom"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["hotlink_protection"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["http2"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["http3"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["image_resizing"],
-        value: Literal["on", "off", "open"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["ip_geolocation"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["ipv6"],
-        value: Literal["off", "on"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["max_upload"],
-        value: Literal[100, 200, 500],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: identifier of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["min_tls_version"],
-        value: Literal["1.0", "1.1", "1.2", "1.3"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["minify"],
-        value: setting_edit_params.MinifyValue,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: Zone setting identifier.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["mirage"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["mobile_redirect"],
-        value: setting_edit_params.MobileRedirectValue,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: Identifier of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["nel"],
-        value: setting_edit_params.NELValue,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: Zone setting identifier.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["opportunistic_encryption"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["opportunistic_onion"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["orange_to_orange"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["origin_error_page_pass_thru"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["polish"],
-        value: Literal["off", "lossless", "lossy"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["prefetch_preload"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["proxy_read_timeout"],
-        value: float,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["pseudo_ipv4"],
-        value: Literal["off", "add_header", "overwrite_header"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: Value of the Pseudo IPv4 setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["replace_insecure_js"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["response_buffering"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["rocket_loader"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["automatic_platform_optimization"],
-        value: AutomaticPlatformOptimizationParam,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["security_header"],
-        value: setting_edit_params.SecurityHeadersValue,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone's security header.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["security_level"],
-        value: Literal["off", "essentially_off", "low", "medium", "high", "under_attack"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["server_side_exclude"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["sha1_support"],
-        value: Literal["off", "on"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: Zone setting identifier.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["sort_query_string_for_cache"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["ssl"],
-        value: Literal["off", "flexible", "full", "strict"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["ssl_recommender"] | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: Enrollment value for SSL/TLS Recommender.
-
-          enabled: ssl-recommender enrollment setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["tls_1_2_only"],
-        value: Literal["off", "on"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: Zone setting identifier.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["tls_1_3"],
-        value: Literal["on", "off", "zrt"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["tls_client_auth"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["true_client_ip_header"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["waf"],
-        value: Literal["on", "off"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["webp"],
-        value: Literal["off", "on"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["websockets"],
-        value: Literal["off", "on"],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[SettingEditResponse]:
-        """
-        Updates a single zone setting by the identifier
-
-        Args:
-          zone_id: Identifier
-
-          setting_id: Setting name
-
-          id: ID of the zone setting.
-
-          value: Current value of the zone setting.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @required_args(["zone_id", "id", "value"], ["zone_id"])
-    async def edit(
-        self,
-        setting_id: str,
-        *,
-        zone_id: str,
-        id: Literal["0rtt"]
-        | Literal["advanced_ddos"]
-        | Literal["always_online"]
-        | Literal["always_use_https"]
-        | Literal["automatic_https_rewrites"]
-        | Literal["brotli"]
-        | Literal["browser_cache_ttl"]
-        | Literal["browser_check"]
-        | Literal["cache_level"]
-        | Literal["challenge_ttl"]
-        | Literal["ciphers"]
-        | Literal["cname_flattening"]
-        | Literal["development_mode"]
-        | Literal["early_hints"]
-        | Literal["edge_cache_ttl"]
-        | Literal["email_obfuscation"]
-        | Literal["h2_prioritization"]
-        | Literal["hotlink_protection"]
-        | Literal["http2"]
-        | Literal["http3"]
-        | Literal["image_resizing"]
-        | Literal["ip_geolocation"]
-        | Literal["ipv6"]
-        | Literal["max_upload"]
-        | Literal["min_tls_version"]
-        | Literal["minify"]
-        | Literal["mirage"]
-        | Literal["mobile_redirect"]
-        | Literal["nel"]
-        | Literal["opportunistic_encryption"]
-        | Literal["opportunistic_onion"]
-        | Literal["orange_to_orange"]
-        | Literal["origin_error_page_pass_thru"]
-        | Literal["polish"]
-        | Literal["prefetch_preload"]
-        | Literal["proxy_read_timeout"]
-        | Literal["pseudo_ipv4"]
-        | Literal["replace_insecure_js"]
-        | Literal["response_buffering"]
-        | Literal["rocket_loader"]
-        | Literal["automatic_platform_optimization"]
-        | Literal["security_header"]
-        | Literal["security_level"]
-        | Literal["server_side_exclude"]
-        | Literal["sha1_support"]
-        | Literal["sort_query_string_for_cache"]
-        | Literal["ssl"]
-        | Literal["ssl_recommender"]
-        | Literal["tls_1_2_only"]
-        | Literal["tls_1_3"]
-        | Literal["tls_client_auth"]
-        | Literal["true_client_ip_header"]
-        | Literal["waf"]
-        | Literal["webp"]
-        | Literal["websockets"]
-        | NotGiven = NOT_GIVEN,
-        value: Literal["on", "off"]
-        | Literal[
-            0,
-            30,
-            60,
-            120,
-            300,
-            1200,
-            1800,
-            3600,
-            7200,
-            10800,
-            14400,
-            18000,
-            28800,
-            43200,
-            57600,
-            72000,
-            86400,
-            172800,
-            259200,
-            345600,
-            432000,
-            691200,
-            1382400,
-            2073600,
-            2678400,
-            5356800,
-            16070400,
-            31536000,
-        ]
-        | Literal["aggressive", "basic", "simplified"]
-        | Literal[300, 900, 1800, 2700, 3600, 7200, 10800, 14400, 28800, 57600, 86400, 604800, 2592000, 31536000]
-        | List[str]
-        | Literal["flatten_at_root", "flatten_all"]
-        | Literal[
-            30,
-            60,
-            300,
-            1200,
-            1800,
-            3600,
-            7200,
-            10800,
-            14400,
-            18000,
-            28800,
-            43200,
-            57600,
-            72000,
-            86400,
-            172800,
-            259200,
-            345600,
-            432000,
-            518400,
-            604800,
-        ]
-        | Literal["on", "off", "custom"]
-        | Literal["on", "off", "open"]
-        | Literal[100, 200, 500]
-        | Literal["1.0", "1.1", "1.2", "1.3"]
-        | setting_edit_params.MinifyValue
-        | setting_edit_params.MobileRedirectValue
-        | setting_edit_params.NELValue
-        | Literal["off", "lossless", "lossy"]
-        | float
-        | Literal["off", "add_header", "overwrite_header"]
-        | AutomaticPlatformOptimizationParam
-        | setting_edit_params.SecurityHeadersValue
-        | Literal["off", "essentially_off", "low", "medium", "high", "under_attack"]
-        | Literal["off", "flexible", "full", "strict"]
-        | Literal["on", "off", "zrt"]
-        | NotGiven = NOT_GIVEN,
-        enabled: bool | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SettingEditResponse]:
         if not zone_id:
             raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
@@ -4598,9 +320,8 @@ async def edit(
                 f"/zones/{zone_id}/settings/{setting_id}",
                 body=await async_maybe_transform(
                     {
-                        "id": id,
-                        "value": value,
                         "enabled": enabled,
+                        "value": value,
                     },
                     setting_edit_params.SettingEditParams,
                 ),
@@ -4627,7 +348,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[SettingGetResponse]:
         """
         Fetch a single zone setting by name
diff --git a/src/cloudflare/resources/zones/subscriptions.py b/src/cloudflare/resources/zones/subscriptions.py
index 4db014c8cc8..78acb39ee35 100644
--- a/src/cloudflare/resources/zones/subscriptions.py
+++ b/src/cloudflare/resources/zones/subscriptions.py
@@ -2,16 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, Iterable, cast
+from typing import Type, cast
 from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -21,15 +18,12 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from ...pagination import SyncSinglePage, AsyncSinglePage
-from ...types.zones import subscription_create_params
-from ..._base_client import AsyncPaginator, make_request_options
-from ...types.user.subscription import Subscription
-from ...types.user.rate_plan_param import RatePlanParam
-from ...types.user.subscription_zone_param import SubscriptionZoneParam
+from ...types.zones import subscription_create_params, subscription_update_params
+from ..._base_client import make_request_options
+from ...types.shared_params.rate_plan import RatePlan
 from ...types.zones.subscription_get_response import SubscriptionGetResponse
-from ...types.user.subscription_component_param import SubscriptionComponentParam
 from ...types.zones.subscription_create_response import SubscriptionCreateResponse
+from ...types.zones.subscription_update_response import SubscriptionUpdateResponse
 
 __all__ = ["SubscriptionsResource", "AsyncSubscriptionsResource"]
 
@@ -37,42 +31,46 @@
 class SubscriptionsResource(SyncAPIResource):
     @cached_property
     def with_raw_response(self) -> SubscriptionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return SubscriptionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> SubscriptionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return SubscriptionsResourceWithStreamingResponse(self)
 
     def create(
         self,
-        identifier: str,
         *,
-        app: subscription_create_params.App | NotGiven = NOT_GIVEN,
-        component_values: Iterable[SubscriptionComponentParam] | NotGiven = NOT_GIVEN,
-        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | NotGiven = NOT_GIVEN,
-        rate_plan: RatePlanParam | NotGiven = NOT_GIVEN,
-        zone: SubscriptionZoneParam | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | Omit = omit,
+        rate_plan: RatePlan | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SubscriptionCreateResponse:
         """
         Create a zone subscription, either plan or add-ons.
 
         Args:
-          identifier: Subscription identifier tag.
-
-          component_values: The list of add-ons subscribed to.
+          zone_id: Identifier
 
           frequency: How often the subscription is renewed automatically.
 
           rate_plan: The rate plan applied to the subscription.
 
-          zone: A simple zone object. May have null properties if not a zone subscription.
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -81,51 +79,49 @@ def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not identifier:
-            raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            SubscriptionCreateResponse,
-            self._post(
-                f"/zones/{identifier}/subscription",
-                body=maybe_transform(
-                    {
-                        "app": app,
-                        "component_values": component_values,
-                        "frequency": frequency,
-                        "rate_plan": rate_plan,
-                        "zone": zone,
-                    },
-                    subscription_create_params.SubscriptionCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[SubscriptionCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[SubscriptionCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._post(
+            f"/zones/{zone_id}/subscription",
+            body=maybe_transform(
+                {
+                    "frequency": frequency,
+                    "rate_plan": rate_plan,
+                },
+                subscription_create_params.SubscriptionCreateParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SubscriptionCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SubscriptionCreateResponse], ResultWrapper[SubscriptionCreateResponse]),
         )
 
-    def list(
+    def update(
         self,
-        account_identifier: str,
         *,
+        zone_id: str,
+        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | Omit = omit,
+        rate_plan: RatePlan | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncSinglePage[Subscription]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SubscriptionUpdateResponse:
         """
-        Lists all of an account's subscriptions.
+        Updates zone subscriptions, either plan or add-ons.
 
         Args:
-          account_identifier: Identifier
+          zone_id: Identifier
+
+          frequency: How often the subscription is renewed automatically.
+
+          rate_plan: The rate plan applied to the subscription.
 
           extra_headers: Send extra headers
 
@@ -135,33 +131,43 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        return self._get_api_list(
-            f"/accounts/{account_identifier}/subscriptions",
-            page=SyncSinglePage[Subscription],
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._put(
+            f"/zones/{zone_id}/subscription",
+            body=maybe_transform(
+                {
+                    "frequency": frequency,
+                    "rate_plan": rate_plan,
+                },
+                subscription_update_params.SubscriptionUpdateParams,
+            ),
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SubscriptionUpdateResponse]._unwrapper,
             ),
-            model=Subscription,
+            cast_to=cast(Type[SubscriptionUpdateResponse], ResultWrapper[SubscriptionUpdateResponse]),
         )
 
     def get(
         self,
-        identifier: str,
         *,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SubscriptionGetResponse:
         """
         Lists zone subscription details.
 
         Args:
-          identifier: Subscription identifier tag.
+          zone_id: Identifier
 
           extra_headers: Send extra headers
 
@@ -171,65 +177,64 @@ def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not identifier:
-            raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            SubscriptionGetResponse,
-            self._get(
-                f"/zones/{identifier}/subscription",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[SubscriptionGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[SubscriptionGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return self._get(
+            f"/zones/{zone_id}/subscription",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SubscriptionGetResponse]._unwrapper,
             ),
+            cast_to=cast(Type[SubscriptionGetResponse], ResultWrapper[SubscriptionGetResponse]),
         )
 
 
 class AsyncSubscriptionsResource(AsyncAPIResource):
     @cached_property
     def with_raw_response(self) -> AsyncSubscriptionsResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncSubscriptionsResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncSubscriptionsResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncSubscriptionsResourceWithStreamingResponse(self)
 
     async def create(
         self,
-        identifier: str,
         *,
-        app: subscription_create_params.App | NotGiven = NOT_GIVEN,
-        component_values: Iterable[SubscriptionComponentParam] | NotGiven = NOT_GIVEN,
-        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | NotGiven = NOT_GIVEN,
-        rate_plan: RatePlanParam | NotGiven = NOT_GIVEN,
-        zone: SubscriptionZoneParam | NotGiven = NOT_GIVEN,
+        zone_id: str,
+        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | Omit = omit,
+        rate_plan: RatePlan | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SubscriptionCreateResponse:
         """
         Create a zone subscription, either plan or add-ons.
 
         Args:
-          identifier: Subscription identifier tag.
-
-          component_values: The list of add-ons subscribed to.
+          zone_id: Identifier
 
           frequency: How often the subscription is renewed automatically.
 
           rate_plan: The rate plan applied to the subscription.
 
-          zone: A simple zone object. May have null properties if not a zone subscription.
-
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -238,51 +243,49 @@ async def create(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not identifier:
-            raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            SubscriptionCreateResponse,
-            await self._post(
-                f"/zones/{identifier}/subscription",
-                body=await async_maybe_transform(
-                    {
-                        "app": app,
-                        "component_values": component_values,
-                        "frequency": frequency,
-                        "rate_plan": rate_plan,
-                        "zone": zone,
-                    },
-                    subscription_create_params.SubscriptionCreateParams,
-                ),
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[SubscriptionCreateResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[SubscriptionCreateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._post(
+            f"/zones/{zone_id}/subscription",
+            body=await async_maybe_transform(
+                {
+                    "frequency": frequency,
+                    "rate_plan": rate_plan,
+                },
+                subscription_create_params.SubscriptionCreateParams,
             ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SubscriptionCreateResponse]._unwrapper,
+            ),
+            cast_to=cast(Type[SubscriptionCreateResponse], ResultWrapper[SubscriptionCreateResponse]),
         )
 
-    def list(
+    async def update(
         self,
-        account_identifier: str,
         *,
+        zone_id: str,
+        frequency: Literal["weekly", "monthly", "quarterly", "yearly"] | Omit = omit,
+        rate_plan: RatePlan | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[Subscription, AsyncSinglePage[Subscription]]:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> SubscriptionUpdateResponse:
         """
-        Lists all of an account's subscriptions.
+        Updates zone subscriptions, either plan or add-ons.
 
         Args:
-          account_identifier: Identifier
+          zone_id: Identifier
+
+          frequency: How often the subscription is renewed automatically.
+
+          rate_plan: The rate plan applied to the subscription.
 
           extra_headers: Send extra headers
 
@@ -292,33 +295,43 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not account_identifier:
-            raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
-        return self._get_api_list(
-            f"/accounts/{account_identifier}/subscriptions",
-            page=AsyncSinglePage[Subscription],
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._put(
+            f"/zones/{zone_id}/subscription",
+            body=await async_maybe_transform(
+                {
+                    "frequency": frequency,
+                    "rate_plan": rate_plan,
+                },
+                subscription_update_params.SubscriptionUpdateParams,
+            ),
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SubscriptionUpdateResponse]._unwrapper,
             ),
-            model=Subscription,
+            cast_to=cast(Type[SubscriptionUpdateResponse], ResultWrapper[SubscriptionUpdateResponse]),
         )
 
     async def get(
         self,
-        identifier: str,
         *,
+        zone_id: str,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SubscriptionGetResponse:
         """
         Lists zone subscription details.
 
         Args:
-          identifier: Subscription identifier tag.
+          zone_id: Identifier
 
           extra_headers: Send extra headers
 
@@ -328,23 +341,18 @@ async def get(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not identifier:
-            raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}")
-        return cast(
-            SubscriptionGetResponse,
-            await self._get(
-                f"/zones/{identifier}/subscription",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper[SubscriptionGetResponse]._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[SubscriptionGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        if not zone_id:
+            raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
+        return await self._get(
+            f"/zones/{zone_id}/subscription",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[SubscriptionGetResponse]._unwrapper,
             ),
+            cast_to=cast(Type[SubscriptionGetResponse], ResultWrapper[SubscriptionGetResponse]),
         )
 
 
@@ -355,8 +363,8 @@ def __init__(self, subscriptions: SubscriptionsResource) -> None:
         self.create = to_raw_response_wrapper(
             subscriptions.create,
         )
-        self.list = to_raw_response_wrapper(
-            subscriptions.list,
+        self.update = to_raw_response_wrapper(
+            subscriptions.update,
         )
         self.get = to_raw_response_wrapper(
             subscriptions.get,
@@ -370,8 +378,8 @@ def __init__(self, subscriptions: AsyncSubscriptionsResource) -> None:
         self.create = async_to_raw_response_wrapper(
             subscriptions.create,
         )
-        self.list = async_to_raw_response_wrapper(
-            subscriptions.list,
+        self.update = async_to_raw_response_wrapper(
+            subscriptions.update,
         )
         self.get = async_to_raw_response_wrapper(
             subscriptions.get,
@@ -385,8 +393,8 @@ def __init__(self, subscriptions: SubscriptionsResource) -> None:
         self.create = to_streamed_response_wrapper(
             subscriptions.create,
         )
-        self.list = to_streamed_response_wrapper(
-            subscriptions.list,
+        self.update = to_streamed_response_wrapper(
+            subscriptions.update,
         )
         self.get = to_streamed_response_wrapper(
             subscriptions.get,
@@ -400,8 +408,8 @@ def __init__(self, subscriptions: AsyncSubscriptionsResource) -> None:
         self.create = async_to_streamed_response_wrapper(
             subscriptions.create,
         )
-        self.list = async_to_streamed_response_wrapper(
-            subscriptions.list,
+        self.update = async_to_streamed_response_wrapper(
+            subscriptions.update,
         )
         self.get = async_to_streamed_response_wrapper(
             subscriptions.get,
diff --git a/src/cloudflare/resources/zones/zones.py b/src/cloudflare/resources/zones/zones.py
index e526d6012c1..ea3f6779233 100644
--- a/src/cloudflare/resources/zones/zones.py
+++ b/src/cloudflare/resources/zones/zones.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import List, Type as TypingType, Optional, cast
+from typing import Type as TypingType, Optional, cast
 from typing_extensions import Literal
 
 import httpx
@@ -15,11 +15,16 @@
     HoldsResourceWithStreamingResponse,
     AsyncHoldsResourceWithStreamingResponse,
 )
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
+from .plans import (
+    PlansResource,
+    AsyncPlansResource,
+    PlansResourceWithRawResponse,
+    AsyncPlansResourceWithRawResponse,
+    PlansResourceWithStreamingResponse,
+    AsyncPlansResourceWithStreamingResponse,
 )
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, async_maybe_transform
 from .settings import (
     SettingsResource,
     AsyncSettingsResource,
@@ -29,6 +34,14 @@
     AsyncSettingsResourceWithStreamingResponse,
 )
 from ..._compat import cached_property
+from .rate_plans import (
+    RatePlansResource,
+    AsyncRatePlansResource,
+    RatePlansResourceWithRawResponse,
+    AsyncRatePlansResourceWithRawResponse,
+    RatePlansResourceWithStreamingResponse,
+    AsyncRatePlansResourceWithStreamingResponse,
+)
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
     to_raw_response_wrapper,
@@ -92,12 +105,31 @@ def holds(self) -> HoldsResource:
     def subscriptions(self) -> SubscriptionsResource:
         return SubscriptionsResource(self._client)
 
+    @cached_property
+    def plans(self) -> PlansResource:
+        return PlansResource(self._client)
+
+    @cached_property
+    def rate_plans(self) -> RatePlansResource:
+        return RatePlansResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> ZonesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return ZonesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> ZonesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return ZonesResourceWithStreamingResponse(self)
 
     def create(
@@ -105,19 +137,19 @@ def create(
         *,
         account: zone_create_params.Account,
         name: str,
-        type: ZonesType | NotGiven = NOT_GIVEN,
+        type: ZonesType | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Zone]:
         """
         Create Zone
 
         Args:
-          name: The domain name
+          name: The domain name.
 
           type: A full zone implies that DNS is hosted with Cloudflare. A partial zone is
               typically a partner-hosted zone or a CNAME setup.
@@ -153,23 +185,25 @@ def create(
     def list(
         self,
         *,
-        account: zone_list_params.Account | NotGiven = NOT_GIVEN,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        match: Literal["any", "all"] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        order: Literal["name", "status", "account.id", "account.name"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        status: Literal["initializing", "pending", "active", "moved"] | NotGiven = NOT_GIVEN,
+        account: zone_list_params.Account | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        match: Literal["any", "all"] | Omit = omit,
+        name: str | Omit = omit,
+        order: Literal["name", "status", "account.id", "account.name", "plan.id"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal["initializing", "pending", "active", "moved"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncV4PagePaginationArray[Zone]:
-        """
-        Lists, searches, sorts, and filters your zones.
+        """Lists, searches, sorts, and filters your zones.
+
+        Listing zones across more than
+        500 accounts is currently not allowed.
 
         Args:
           direction: Direction to order zones.
@@ -194,7 +228,7 @@ def list(
 
           per_page: Number of zones per page.
 
-          status: A zone status
+          status: Specify a zone status to filter by.
 
           extra_headers: Send extra headers
 
@@ -238,7 +272,7 @@ def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ZoneDeleteResponse]:
         """
         Deletes an existing zone.
@@ -272,15 +306,15 @@ def edit(
         self,
         *,
         zone_id: str,
-        plan: zone_edit_params.Plan | NotGiven = NOT_GIVEN,
-        type: Literal["full", "partial", "secondary"] | NotGiven = NOT_GIVEN,
-        vanity_name_servers: List[str] | NotGiven = NOT_GIVEN,
+        paused: bool | Omit = omit,
+        type: Literal["full", "partial", "secondary", "internal"] | Omit = omit,
+        vanity_name_servers: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Zone]:
         """Edits a zone.
 
@@ -289,9 +323,8 @@ def edit(
         Args:
           zone_id: Identifier
 
-          plan: (Deprecated) Please use the `/zones/{zone_id}/subscription` API to update a
-              zone's plan. Changing this value will create/cancel associated subscriptions. To
-              view available plans for this zone, see Zone Plans.
+          paused: Indicates whether the zone is only using Cloudflare DNS services. A true value
+              means the zone will not receive security or performance benefits.
 
           type: A full zone implies that DNS is hosted with Cloudflare. A partial zone is
               typically a partner-hosted zone or a CNAME setup. This parameter is only
@@ -315,7 +348,7 @@ def edit(
             f"/zones/{zone_id}",
             body=maybe_transform(
                 {
-                    "plan": plan,
+                    "paused": paused,
                     "type": type,
                     "vanity_name_servers": vanity_name_servers,
                 },
@@ -340,7 +373,7 @@ def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Zone]:
         """
         Zone Details
@@ -392,12 +425,31 @@ def holds(self) -> AsyncHoldsResource:
     def subscriptions(self) -> AsyncSubscriptionsResource:
         return AsyncSubscriptionsResource(self._client)
 
+    @cached_property
+    def plans(self) -> AsyncPlansResource:
+        return AsyncPlansResource(self._client)
+
+    @cached_property
+    def rate_plans(self) -> AsyncRatePlansResource:
+        return AsyncRatePlansResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> AsyncZonesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
         return AsyncZonesResourceWithRawResponse(self)
 
     @cached_property
     def with_streaming_response(self) -> AsyncZonesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
         return AsyncZonesResourceWithStreamingResponse(self)
 
     async def create(
@@ -405,19 +457,19 @@ async def create(
         *,
         account: zone_create_params.Account,
         name: str,
-        type: ZonesType | NotGiven = NOT_GIVEN,
+        type: ZonesType | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Zone]:
         """
         Create Zone
 
         Args:
-          name: The domain name
+          name: The domain name.
 
           type: A full zone implies that DNS is hosted with Cloudflare. A partial zone is
               typically a partner-hosted zone or a CNAME setup.
@@ -453,23 +505,25 @@ async def create(
     def list(
         self,
         *,
-        account: zone_list_params.Account | NotGiven = NOT_GIVEN,
-        direction: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
-        match: Literal["any", "all"] | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        order: Literal["name", "status", "account.id", "account.name"] | NotGiven = NOT_GIVEN,
-        page: float | NotGiven = NOT_GIVEN,
-        per_page: float | NotGiven = NOT_GIVEN,
-        status: Literal["initializing", "pending", "active", "moved"] | NotGiven = NOT_GIVEN,
+        account: zone_list_params.Account | Omit = omit,
+        direction: Literal["asc", "desc"] | Omit = omit,
+        match: Literal["any", "all"] | Omit = omit,
+        name: str | Omit = omit,
+        order: Literal["name", "status", "account.id", "account.name", "plan.id"] | Omit = omit,
+        page: float | Omit = omit,
+        per_page: float | Omit = omit,
+        status: Literal["initializing", "pending", "active", "moved"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[Zone, AsyncV4PagePaginationArray[Zone]]:
-        """
-        Lists, searches, sorts, and filters your zones.
+        """Lists, searches, sorts, and filters your zones.
+
+        Listing zones across more than
+        500 accounts is currently not allowed.
 
         Args:
           direction: Direction to order zones.
@@ -494,7 +548,7 @@ def list(
 
           per_page: Number of zones per page.
 
-          status: A zone status
+          status: Specify a zone status to filter by.
 
           extra_headers: Send extra headers
 
@@ -538,7 +592,7 @@ async def delete(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[ZoneDeleteResponse]:
         """
         Deletes an existing zone.
@@ -572,15 +626,15 @@ async def edit(
         self,
         *,
         zone_id: str,
-        plan: zone_edit_params.Plan | NotGiven = NOT_GIVEN,
-        type: Literal["full", "partial", "secondary"] | NotGiven = NOT_GIVEN,
-        vanity_name_servers: List[str] | NotGiven = NOT_GIVEN,
+        paused: bool | Omit = omit,
+        type: Literal["full", "partial", "secondary", "internal"] | Omit = omit,
+        vanity_name_servers: SequenceNotStr[str] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Zone]:
         """Edits a zone.
 
@@ -589,9 +643,8 @@ async def edit(
         Args:
           zone_id: Identifier
 
-          plan: (Deprecated) Please use the `/zones/{zone_id}/subscription` API to update a
-              zone's plan. Changing this value will create/cancel associated subscriptions. To
-              view available plans for this zone, see Zone Plans.
+          paused: Indicates whether the zone is only using Cloudflare DNS services. A true value
+              means the zone will not receive security or performance benefits.
 
           type: A full zone implies that DNS is hosted with Cloudflare. A partial zone is
               typically a partner-hosted zone or a CNAME setup. This parameter is only
@@ -615,7 +668,7 @@ async def edit(
             f"/zones/{zone_id}",
             body=await async_maybe_transform(
                 {
-                    "plan": plan,
+                    "paused": paused,
                     "type": type,
                     "vanity_name_servers": vanity_name_servers,
                 },
@@ -640,7 +693,7 @@ async def get(
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Optional[Zone]:
         """
         Zone Details
@@ -711,6 +764,14 @@ def holds(self) -> HoldsResourceWithRawResponse:
     def subscriptions(self) -> SubscriptionsResourceWithRawResponse:
         return SubscriptionsResourceWithRawResponse(self._zones.subscriptions)
 
+    @cached_property
+    def plans(self) -> PlansResourceWithRawResponse:
+        return PlansResourceWithRawResponse(self._zones.plans)
+
+    @cached_property
+    def rate_plans(self) -> RatePlansResourceWithRawResponse:
+        return RatePlansResourceWithRawResponse(self._zones.rate_plans)
+
 
 class AsyncZonesResourceWithRawResponse:
     def __init__(self, zones: AsyncZonesResource) -> None:
@@ -752,6 +813,14 @@ def holds(self) -> AsyncHoldsResourceWithRawResponse:
     def subscriptions(self) -> AsyncSubscriptionsResourceWithRawResponse:
         return AsyncSubscriptionsResourceWithRawResponse(self._zones.subscriptions)
 
+    @cached_property
+    def plans(self) -> AsyncPlansResourceWithRawResponse:
+        return AsyncPlansResourceWithRawResponse(self._zones.plans)
+
+    @cached_property
+    def rate_plans(self) -> AsyncRatePlansResourceWithRawResponse:
+        return AsyncRatePlansResourceWithRawResponse(self._zones.rate_plans)
+
 
 class ZonesResourceWithStreamingResponse:
     def __init__(self, zones: ZonesResource) -> None:
@@ -793,6 +862,14 @@ def holds(self) -> HoldsResourceWithStreamingResponse:
     def subscriptions(self) -> SubscriptionsResourceWithStreamingResponse:
         return SubscriptionsResourceWithStreamingResponse(self._zones.subscriptions)
 
+    @cached_property
+    def plans(self) -> PlansResourceWithStreamingResponse:
+        return PlansResourceWithStreamingResponse(self._zones.plans)
+
+    @cached_property
+    def rate_plans(self) -> RatePlansResourceWithStreamingResponse:
+        return RatePlansResourceWithStreamingResponse(self._zones.rate_plans)
+
 
 class AsyncZonesResourceWithStreamingResponse:
     def __init__(self, zones: AsyncZonesResource) -> None:
@@ -833,3 +910,11 @@ def holds(self) -> AsyncHoldsResourceWithStreamingResponse:
     @cached_property
     def subscriptions(self) -> AsyncSubscriptionsResourceWithStreamingResponse:
         return AsyncSubscriptionsResourceWithStreamingResponse(self._zones.subscriptions)
+
+    @cached_property
+    def plans(self) -> AsyncPlansResourceWithStreamingResponse:
+        return AsyncPlansResourceWithStreamingResponse(self._zones.plans)
+
+    @cached_property
+    def rate_plans(self) -> AsyncRatePlansResourceWithStreamingResponse:
+        return AsyncRatePlansResourceWithStreamingResponse(self._zones.rate_plans)
diff --git a/src/cloudflare/types/__init__.py b/src/cloudflare/types/__init__.py
index d99e0567acf..bfc0722f849 100644
--- a/src/cloudflare/types/__init__.py
+++ b/src/cloudflare/types/__init__.py
@@ -5,18 +5,26 @@
 from .shared import (
     ASN as ASN,
     Role as Role,
+    Token as Token,
     Member as Member,
     Result as Result,
     AuditLog as AuditLog,
+    RatePlan as RatePlan,
     ErrorData as ErrorData,
     Identifier as Identifier,
     Permission as Permission,
+    TokenValue as TokenValue,
+    TokenPolicy as TokenPolicy,
     ResponseInfo as ResponseInfo,
+    Subscription as Subscription,
     CertificateCA as CertificateCA,
     SortDirection as SortDirection,
     PaginationInfo as PaginationInfo,
     PermissionGrant as PermissionGrant,
     CloudflareTunnel as CloudflareTunnel,
+    SubscriptionZone as SubscriptionZone,
     LoadBalancerPreview as LoadBalancerPreview,
+    SubscriptionComponent as SubscriptionComponent,
     CertificateRequestType as CertificateRequestType,
+    TokenConditionCIDRList as TokenConditionCIDRList,
 )
diff --git a/src/cloudflare/types/abuse_reports/__init__.py b/src/cloudflare/types/abuse_reports/__init__.py
new file mode 100644
index 00000000000..189da3a99af
--- /dev/null
+++ b/src/cloudflare/types/abuse_reports/__init__.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .mitigation_list_params import MitigationListParams as MitigationListParams
+from .abuse_report_list_params import AbuseReportListParams as AbuseReportListParams
+from .mitigation_list_response import MitigationListResponse as MitigationListResponse
+from .mitigation_review_params import MitigationReviewParams as MitigationReviewParams
+from .abuse_report_get_response import AbuseReportGetResponse as AbuseReportGetResponse
+from .abuse_report_create_params import AbuseReportCreateParams as AbuseReportCreateParams
+from .abuse_report_list_response import AbuseReportListResponse as AbuseReportListResponse
+from .mitigation_review_response import MitigationReviewResponse as MitigationReviewResponse
+from .abuse_report_create_response import AbuseReportCreateResponse as AbuseReportCreateResponse
diff --git a/src/cloudflare/types/abuse_reports/abuse_report_create_params.py b/src/cloudflare/types/abuse_reports/abuse_report_create_params.py
new file mode 100644
index 00000000000..9d6ae29ffc0
--- /dev/null
+++ b/src/cloudflare/types/abuse_reports/abuse_report_create_params.py
@@ -0,0 +1,732 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+__all__ = [
+    "AbuseReportCreateParams",
+    "AbuseReportsDmcaReport",
+    "AbuseReportsTrademarkReport",
+    "AbuseReportsGeneralReport",
+    "AbuseReportsPhishingReport",
+    "AbuseReportsCsamReport",
+    "AbuseReportsThreatReport",
+    "AbuseReportsRegistrarWhoisReport",
+    "AbuseReportsNcseiReport",
+]
+
+
+class AbuseReportsDmcaReport(TypedDict, total=False):
+    account_id: Required[str]
+
+    act: Required[Literal["abuse_dmca"]]
+    """The report type for submitted reports."""
+
+    address1: Required[str]
+    """Text not exceeding 100 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    agent_name: Required[str]
+    """The name of the copyright holder.
+
+    Text not exceeding 60 characters. This field may be released by Cloudflare to
+    third parties such as the Lumen Database (https://lumendatabase.org/).
+    """
+
+    agree: Required[Literal[1]]
+    """Can be `0` for false or `1` for true. Must be value: 1 for DMCA reports"""
+
+    city: Required[str]
+    """Text not exceeding 255 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    country: Required[str]
+    """Text not exceeding 255 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    email: Required[str]
+    """A valid email of the abuse reporter.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    email2: Required[str]
+    """Should match the value provided in `email`"""
+
+    host_notification: Required[Literal["send"]]
+    """Notification type based on the abuse type.
+
+    NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.
+    """
+
+    name: Required[str]
+    """Text not exceeding 255 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    original_work: Required[str]
+    """Text not exceeding 255 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    owner_notification: Required[Literal["send"]]
+    """Notification type based on the abuse type.
+
+    NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.
+    """
+
+    signature: Required[str]
+    """Required for DMCA reports, should be same as Name.
+
+    An affirmation that all information in the report is true and accurate while
+    agreeing to the policies of Cloudflare's abuse reports
+    """
+
+    state: Required[str]
+    """Text not exceeding 255 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    urls: Required[str]
+    """A list of valid URLs separated by ‘\n’ (new line character).
+
+    The list of the URLs should not exceed 250 URLs. All URLs should have the same
+    hostname. Each URL should be unique. This field may be released by Cloudflare to
+    third parties such as the Lumen Database (https://lumendatabase.org/).
+    """
+
+    comments: str
+    """Any additional comments about the infringement not exceeding 2000 characters"""
+
+    company: str
+    """Text not exceeding 100 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    reported_country: str
+    """Text containing 2 characters"""
+
+    reported_user_agent: str
+    """Text not exceeding 255 characters"""
+
+    tele: str
+    """Text not exceeding 20 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    title: str
+    """Text not exceeding 255 characters"""
+
+
+class AbuseReportsTrademarkReport(TypedDict, total=False):
+    account_id: Required[str]
+
+    act: Required[Literal["abuse_trademark"]]
+    """The report type for submitted reports."""
+
+    email: Required[str]
+    """A valid email of the abuse reporter.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    email2: Required[str]
+    """Should match the value provided in `email`"""
+
+    host_notification: Required[Literal["send"]]
+    """Notification type based on the abuse type.
+
+    NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.
+    """
+
+    justification: Required[str]
+    """
+    A detailed description of the infringement, including any necessary access
+    details and the exact steps needed to view the content, not exceeding 5000
+    characters.
+    """
+
+    name: Required[str]
+    """Text not exceeding 255 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    owner_notification: Required[Literal["send"]]
+    """Notification type based on the abuse type.
+
+    NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.
+    """
+
+    trademark_number: Required[str]
+    """Text not exceeding 1000 characters"""
+
+    trademark_office: Required[str]
+    """Text not exceeding 1000 characters"""
+
+    trademark_symbol: Required[str]
+    """Text not exceeding 1000 characters"""
+
+    urls: Required[str]
+    """A list of valid URLs separated by ‘\n’ (new line character).
+
+    The list of the URLs should not exceed 250 URLs. All URLs should have the same
+    hostname. Each URL should be unique. This field may be released by Cloudflare to
+    third parties such as the Lumen Database (https://lumendatabase.org/).
+    """
+
+    comments: str
+    """Any additional comments about the infringement not exceeding 2000 characters"""
+
+    company: str
+    """Text not exceeding 100 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    reported_country: str
+    """Text containing 2 characters"""
+
+    reported_user_agent: str
+    """Text not exceeding 255 characters"""
+
+    tele: str
+    """Text not exceeding 20 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    title: str
+    """Text not exceeding 255 characters"""
+
+
+class AbuseReportsGeneralReport(TypedDict, total=False):
+    account_id: Required[str]
+
+    act: Required[Literal["abuse_general"]]
+    """The report type for submitted reports."""
+
+    email: Required[str]
+    """A valid email of the abuse reporter.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    email2: Required[str]
+    """Should match the value provided in `email`"""
+
+    host_notification: Required[Literal["send", "send-anon"]]
+    """Notification type based on the abuse type.
+
+    NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.
+    """
+
+    justification: Required[str]
+    """
+    A detailed description of the infringement, including any necessary access
+    details and the exact steps needed to view the content, not exceeding 5000
+    characters.
+    """
+
+    name: Required[str]
+    """Text not exceeding 255 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    owner_notification: Required[Literal["send", "send-anon", "none"]]
+    """Notification type based on the abuse type.
+
+    NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.
+    """
+
+    urls: Required[str]
+    """A list of valid URLs separated by ‘\n’ (new line character).
+
+    The list of the URLs should not exceed 250 URLs. All URLs should have the same
+    hostname. Each URL should be unique. This field may be released by Cloudflare to
+    third parties such as the Lumen Database (https://lumendatabase.org/).
+    """
+
+    comments: str
+    """Any additional comments about the infringement not exceeding 2000 characters"""
+
+    company: str
+    """Text not exceeding 100 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    destination_ips: str
+    """A list of IP addresses separated by ‘\n’ (new line character).
+
+    The list of destination IPs should not exceed 30 IP addresses. Each one of the
+    IP addresses ought to be unique.
+    """
+
+    ports_protocols: str
+    """A comma separated list of ports and protocols e.g.
+
+    80/TCP, 22/UDP. The total size of the field should not exceed 2000 characters.
+    Each individual port/protocol should not exceed 100 characters. The list should
+    not have more than 30 unique ports and protocols.
+    """
+
+    reported_country: str
+    """Text containing 2 characters"""
+
+    reported_user_agent: str
+    """Text not exceeding 255 characters"""
+
+    source_ips: str
+    """A list of IP addresses separated by ‘\n’ (new line character).
+
+    The list of source IPs should not exceed 30 IP addresses. Each one of the IP
+    addresses ought to be unique.
+    """
+
+    tele: str
+    """Text not exceeding 20 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    title: str
+    """Text not exceeding 255 characters"""
+
+
+class AbuseReportsPhishingReport(TypedDict, total=False):
+    account_id: Required[str]
+
+    act: Required[Literal["abuse_phishing"]]
+    """The report type for submitted reports."""
+
+    email: Required[str]
+    """A valid email of the abuse reporter.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    email2: Required[str]
+    """Should match the value provided in `email`"""
+
+    host_notification: Required[Literal["send", "send-anon"]]
+    """Notification type based on the abuse type.
+
+    NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.
+    """
+
+    justification: Required[str]
+    """
+    A detailed description of the infringement, including any necessary access
+    details and the exact steps needed to view the content, not exceeding 5000
+    characters.
+    """
+
+    name: Required[str]
+    """Text not exceeding 255 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    owner_notification: Required[Literal["send", "send-anon"]]
+    """Notification type based on the abuse type.
+
+    NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.
+    """
+
+    urls: Required[str]
+    """A list of valid URLs separated by ‘\n’ (new line character).
+
+    The list of the URLs should not exceed 250 URLs. All URLs should have the same
+    hostname. Each URL should be unique. This field may be released by Cloudflare to
+    third parties such as the Lumen Database (https://lumendatabase.org/).
+    """
+
+    comments: str
+    """Any additional comments about the infringement not exceeding 2000 characters"""
+
+    company: str
+    """Text not exceeding 100 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    original_work: str
+    """Text not exceeding 255 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    reported_country: str
+    """Text containing 2 characters"""
+
+    reported_user_agent: str
+    """Text not exceeding 255 characters"""
+
+    tele: str
+    """Text not exceeding 20 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    title: str
+    """Text not exceeding 255 characters"""
+
+
+class AbuseReportsCsamReport(TypedDict, total=False):
+    account_id: Required[str]
+
+    act: Required[Literal["abuse_children"]]
+    """The report type for submitted reports."""
+
+    email: Required[str]
+    """A valid email of the abuse reporter.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    email2: Required[str]
+    """Should match the value provided in `email`"""
+
+    host_notification: Required[Literal["send", "send-anon"]]
+    """Notification type based on the abuse type.
+
+    NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.
+    """
+
+    justification: Required[str]
+    """
+    A detailed description of the infringement, including any necessary access
+    details and the exact steps needed to view the content, not exceeding 5000
+    characters.
+    """
+
+    name: Required[str]
+    """Text not exceeding 255 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    ncmec_notification: Required[Literal["send", "send-anon"]]
+    """Notification type based on the abuse type.
+
+    NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.
+    """
+
+    owner_notification: Required[Literal["send", "send-anon", "none"]]
+    """Notification type based on the abuse type.
+
+    NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.
+    """
+
+    urls: Required[str]
+    """A list of valid URLs separated by ‘\n’ (new line character).
+
+    The list of the URLs should not exceed 250 URLs. All URLs should have the same
+    hostname. Each URL should be unique. This field may be released by Cloudflare to
+    third parties such as the Lumen Database (https://lumendatabase.org/).
+    """
+
+    comments: str
+    """Any additional comments about the infringement not exceeding 2000 characters"""
+
+    company: str
+    """Text not exceeding 100 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    country: str
+    """Text not exceeding 255 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    reported_country: str
+    """Text containing 2 characters"""
+
+    reported_user_agent: str
+    """Text not exceeding 255 characters"""
+
+    tele: str
+    """Text not exceeding 20 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    title: str
+    """Text not exceeding 255 characters"""
+
+
+class AbuseReportsThreatReport(TypedDict, total=False):
+    account_id: Required[str]
+
+    act: Required[Literal["abuse_threat"]]
+    """The report type for submitted reports."""
+
+    email: Required[str]
+    """A valid email of the abuse reporter.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    email2: Required[str]
+    """Should match the value provided in `email`"""
+
+    host_notification: Required[Literal["send", "send-anon"]]
+    """Notification type based on the abuse type.
+
+    NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.
+    """
+
+    justification: Required[str]
+    """
+    A detailed description of the infringement, including any necessary access
+    details and the exact steps needed to view the content, not exceeding 5000
+    characters.
+    """
+
+    name: Required[str]
+    """Text not exceeding 255 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    owner_notification: Required[Literal["send", "send-anon"]]
+    """Notification type based on the abuse type.
+
+    NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.
+    """
+
+    urls: Required[str]
+    """A list of valid URLs separated by ‘\n’ (new line character).
+
+    The list of the URLs should not exceed 250 URLs. All URLs should have the same
+    hostname. Each URL should be unique. This field may be released by Cloudflare to
+    third parties such as the Lumen Database (https://lumendatabase.org/).
+    """
+
+    comments: str
+    """Any additional comments about the infringement not exceeding 2000 characters"""
+
+    company: str
+    """Text not exceeding 100 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    reported_country: str
+    """Text containing 2 characters"""
+
+    reported_user_agent: str
+    """Text not exceeding 255 characters"""
+
+    tele: str
+    """Text not exceeding 20 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    title: str
+    """Text not exceeding 255 characters"""
+
+
+class AbuseReportsRegistrarWhoisReport(TypedDict, total=False):
+    account_id: Required[str]
+
+    act: Required[Literal["abuse_registrar_whois"]]
+    """The report type for submitted reports."""
+
+    email: Required[str]
+    """A valid email of the abuse reporter.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    email2: Required[str]
+    """Should match the value provided in `email`"""
+
+    name: Required[str]
+    """Text not exceeding 255 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    owner_notification: Required[Literal["send", "send-anon", "none"]]
+    """Notification type based on the abuse type.
+
+    NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.
+    """
+
+    urls: Required[str]
+    """A list of valid URLs separated by ‘\n’ (new line character).
+
+    The list of the URLs should not exceed 250 URLs. All URLs should have the same
+    hostname. Each URL should be unique. This field may be released by Cloudflare to
+    third parties such as the Lumen Database (https://lumendatabase.org/).
+    """
+
+    comments: str
+    """Any additional comments about the infringement not exceeding 2000 characters"""
+
+    company: str
+    """Text not exceeding 100 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    reported_country: str
+    """Text containing 2 characters"""
+
+    reported_user_agent: str
+    """Text not exceeding 255 characters"""
+
+    tele: str
+    """Text not exceeding 20 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    title: str
+    """Text not exceeding 255 characters"""
+
+
+class AbuseReportsNcseiReport(TypedDict, total=False):
+    account_id: Required[str]
+
+    act: Required[Literal["abuse_ncsei"]]
+    """The report type for submitted reports."""
+
+    email: Required[str]
+    """A valid email of the abuse reporter.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    email2: Required[str]
+    """Should match the value provided in `email`"""
+
+    host_notification: Required[Literal["send", "send-anon"]]
+    """Notification type based on the abuse type.
+
+    NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.
+    """
+
+    name: Required[str]
+    """Text not exceeding 255 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    ncsei_subject_representation: Required[bool]
+    """If the submitter is the target of NCSEI in the URLs of the abuse report."""
+
+    owner_notification: Required[Literal["send", "send-anon", "none"]]
+    """Notification type based on the abuse type.
+
+    NOTE: Copyright (DMCA) and Trademark reports cannot be anonymous.
+    """
+
+    urls: Required[str]
+    """A list of valid URLs separated by ‘\n’ (new line character).
+
+    The list of the URLs should not exceed 250 URLs. All URLs should have the same
+    hostname. Each URL should be unique. This field may be released by Cloudflare to
+    third parties such as the Lumen Database (https://lumendatabase.org/).
+    """
+
+    comments: str
+    """Any additional comments about the infringement not exceeding 2000 characters"""
+
+    company: str
+    """Text not exceeding 100 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    country: str
+    """Text not exceeding 255 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    reported_country: str
+    """Text containing 2 characters"""
+
+    reported_user_agent: str
+    """Text not exceeding 255 characters"""
+
+    tele: str
+    """Text not exceeding 20 characters.
+
+    This field may be released by Cloudflare to third parties such as the Lumen
+    Database (https://lumendatabase.org/).
+    """
+
+    title: str
+    """Text not exceeding 255 characters"""
+
+
+AbuseReportCreateParams: TypeAlias = Union[
+    AbuseReportsDmcaReport,
+    AbuseReportsTrademarkReport,
+    AbuseReportsGeneralReport,
+    AbuseReportsPhishingReport,
+    AbuseReportsCsamReport,
+    AbuseReportsThreatReport,
+    AbuseReportsRegistrarWhoisReport,
+    AbuseReportsNcseiReport,
+]
diff --git a/src/cloudflare/types/abuse_reports/abuse_report_create_response.py b/src/cloudflare/types/abuse_reports/abuse_report_create_response.py
new file mode 100644
index 00000000000..03fc4011e68
--- /dev/null
+++ b/src/cloudflare/types/abuse_reports/abuse_report_create_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["AbuseReportCreateResponse"]
+
+AbuseReportCreateResponse: TypeAlias = str
diff --git a/src/cloudflare/types/abuse_reports/abuse_report_get_response.py b/src/cloudflare/types/abuse_reports/abuse_report_get_response.py
new file mode 100644
index 00000000000..3cbe3920820
--- /dev/null
+++ b/src/cloudflare/types/abuse_reports/abuse_report_get_response.py
@@ -0,0 +1,73 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["AbuseReportGetResponse", "MitigationSummary", "Submitter"]
+
+
+class MitigationSummary(BaseModel):
+    """A summary of the mitigations related to this report."""
+
+    accepted_url_count: int
+    """How many of the reported URLs were confirmed as abusive."""
+
+    active_count: int
+    """How many mitigations are active."""
+
+    external_host_notified: bool
+    """Whether the report has been forwarded to an external hosting provider."""
+
+    in_review_count: int
+    """How many mitigations are under review."""
+
+    pending_count: int
+    """How many mitigations are pending their effective date."""
+
+
+class Submitter(BaseModel):
+    """Information about the submitter of the report."""
+
+    company: Optional[str] = None
+
+    email: Optional[str] = None
+
+    name: Optional[str] = None
+
+    telephone: Optional[str] = None
+
+
+class AbuseReportGetResponse(BaseModel):
+    id: str
+    """Public facing ID of abuse report, aka abuse_rand."""
+
+    cdate: str
+    """Creation date of report.
+
+    Time in RFC 3339 format (https://www.rfc-editor.org/rfc/rfc3339.html)
+    """
+
+    domain: str
+    """Domain that relates to the report."""
+
+    mitigation_summary: MitigationSummary
+    """A summary of the mitigations related to this report."""
+
+    status: Literal["accepted", "in_review"]
+    """An enum value that represents the status of an abuse record"""
+
+    type: Literal["PHISH", "GEN", "THREAT", "DMCA", "EMER", "TM", "REG_WHO", "NCSEI", "NETWORK"]
+    """The abuse report type"""
+
+    justification: Optional[str] = None
+    """Justification for the report."""
+
+    original_work: Optional[str] = None
+    """Original work / Targeted brand in the alleged abuse."""
+
+    submitter: Optional[Submitter] = None
+    """Information about the submitter of the report."""
+
+    urls: Optional[List[str]] = None
diff --git a/src/cloudflare/types/abuse_reports/abuse_report_list_params.py b/src/cloudflare/types/abuse_reports/abuse_report_list_params.py
new file mode 100644
index 00000000000..94ececff967
--- /dev/null
+++ b/src/cloudflare/types/abuse_reports/abuse_report_list_params.py
@@ -0,0 +1,38 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["AbuseReportListParams"]
+
+
+class AbuseReportListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    created_after: str
+    """Returns reports created after the specified date"""
+
+    created_before: str
+    """Returns reports created before the specified date"""
+
+    domain: str
+    """Filter by domain name related to the abuse report"""
+
+    mitigation_status: Literal["pending", "active", "in_review", "cancelled", "removed"]
+    """Filter reports that have any mitigations in the given status."""
+
+    page: int
+    """Where in pagination to start listing abuse reports"""
+
+    per_page: int
+    """How many abuse reports per page to list"""
+
+    sort: str
+    """A property to sort by, followed by the order (id, cdate, domain, type, status)"""
+
+    status: Literal["accepted", "in_review"]
+    """Filter by the status of the report."""
+
+    type: Literal["PHISH", "GEN", "THREAT", "DMCA", "EMER", "TM", "REG_WHO", "NCSEI", "NETWORK"]
+    """Filter by the type of the report."""
diff --git a/src/cloudflare/types/abuse_reports/abuse_report_list_response.py b/src/cloudflare/types/abuse_reports/abuse_report_list_response.py
new file mode 100644
index 00000000000..2bdeacfb26f
--- /dev/null
+++ b/src/cloudflare/types/abuse_reports/abuse_report_list_response.py
@@ -0,0 +1,77 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["AbuseReportListResponse", "Report", "ReportMitigationSummary", "ReportSubmitter"]
+
+
+class ReportMitigationSummary(BaseModel):
+    """A summary of the mitigations related to this report."""
+
+    accepted_url_count: int
+    """How many of the reported URLs were confirmed as abusive."""
+
+    active_count: int
+    """How many mitigations are active."""
+
+    external_host_notified: bool
+    """Whether the report has been forwarded to an external hosting provider."""
+
+    in_review_count: int
+    """How many mitigations are under review."""
+
+    pending_count: int
+    """How many mitigations are pending their effective date."""
+
+
+class ReportSubmitter(BaseModel):
+    """Information about the submitter of the report."""
+
+    company: Optional[str] = None
+
+    email: Optional[str] = None
+
+    name: Optional[str] = None
+
+    telephone: Optional[str] = None
+
+
+class Report(BaseModel):
+    id: str
+    """Public facing ID of abuse report, aka abuse_rand."""
+
+    cdate: str
+    """Creation date of report.
+
+    Time in RFC 3339 format (https://www.rfc-editor.org/rfc/rfc3339.html)
+    """
+
+    domain: str
+    """Domain that relates to the report."""
+
+    mitigation_summary: ReportMitigationSummary
+    """A summary of the mitigations related to this report."""
+
+    status: Literal["accepted", "in_review"]
+    """An enum value that represents the status of an abuse record"""
+
+    type: Literal["PHISH", "GEN", "THREAT", "DMCA", "EMER", "TM", "REG_WHO", "NCSEI", "NETWORK"]
+    """The abuse report type"""
+
+    justification: Optional[str] = None
+    """Justification for the report."""
+
+    original_work: Optional[str] = None
+    """Original work / Targeted brand in the alleged abuse."""
+
+    submitter: Optional[ReportSubmitter] = None
+    """Information about the submitter of the report."""
+
+    urls: Optional[List[str]] = None
+
+
+class AbuseReportListResponse(BaseModel):
+    reports: List[Report]
diff --git a/src/cloudflare/types/abuse_reports/mitigation_list_params.py b/src/cloudflare/types/abuse_reports/mitigation_list_params.py
new file mode 100644
index 00000000000..7cf26fad890
--- /dev/null
+++ b/src/cloudflare/types/abuse_reports/mitigation_list_params.py
@@ -0,0 +1,55 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["MitigationListParams"]
+
+
+class MitigationListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    effective_after: str
+    """Returns mitigation that were dispatched after the given date"""
+
+    effective_before: str
+    """Returns mitigations that were dispatched before the given date"""
+
+    entity_type: Literal["url_pattern", "account", "zone"]
+    """Filter by the type of entity the mitigation impacts."""
+
+    page: int
+    """Where in pagination to start listing abuse reports"""
+
+    per_page: int
+    """How many abuse reports per page to list"""
+
+    sort: Literal[
+        "type,asc",
+        "type,desc",
+        "effective_date,asc",
+        "effective_date,desc",
+        "status,asc",
+        "status,desc",
+        "entity_type,asc",
+        "entity_type,desc",
+    ]
+    """A property to sort by, followed by the order"""
+
+    status: Literal["pending", "active", "in_review", "cancelled", "removed"]
+    """Filter by the status of the mitigation."""
+
+    type: Literal[
+        "legal_block",
+        "phishing_interstitial",
+        "network_block",
+        "rate_limit_cache",
+        "account_suspend",
+        "redirect_video_stream",
+    ]
+    """Filter by the type of mitigation.
+
+    This filter parameter can be specified multiple times to include multiple types
+    of mitigations in the result set, e.g. ?type=rate_limit_cache&type=legal_block.
+    """
diff --git a/src/cloudflare/types/abuse_reports/mitigation_list_response.py b/src/cloudflare/types/abuse_reports/mitigation_list_response.py
new file mode 100644
index 00000000000..36d3e8261d7
--- /dev/null
+++ b/src/cloudflare/types/abuse_reports/mitigation_list_response.py
@@ -0,0 +1,40 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["MitigationListResponse", "Mitigation"]
+
+
+class Mitigation(BaseModel):
+    id: str
+    """ID of remediation."""
+
+    effective_date: str
+    """Date when the mitigation will become active.
+
+    Time in RFC 3339 format (https://www.rfc-editor.org/rfc/rfc3339.html)
+    """
+
+    entity_id: str
+
+    entity_type: Literal["url_pattern", "account", "zone"]
+
+    status: Literal["pending", "active", "in_review", "cancelled", "removed"]
+    """The status of a mitigation"""
+
+    type: Literal[
+        "legal_block",
+        "phishing_interstitial",
+        "network_block",
+        "rate_limit_cache",
+        "account_suspend",
+        "redirect_video_stream",
+    ]
+    """The type of mitigation"""
+
+
+class MitigationListResponse(BaseModel):
+    mitigations: List[Mitigation]
diff --git a/src/cloudflare/types/abuse_reports/mitigation_review_params.py b/src/cloudflare/types/abuse_reports/mitigation_review_params.py
new file mode 100644
index 00000000000..93cdff5c1ad
--- /dev/null
+++ b/src/cloudflare/types/abuse_reports/mitigation_review_params.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["MitigationReviewParams", "Appeal"]
+
+
+class MitigationReviewParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    appeals: Required[Iterable[Appeal]]
+    """List of mitigations to appeal."""
+
+
+class Appeal(TypedDict, total=False):
+    id: Required[str]
+    """ID of the mitigation to appeal."""
+
+    reason: Required[Literal["removed", "misclassified"]]
+    """Reason why the customer is appealing."""
diff --git a/src/cloudflare/types/abuse_reports/mitigation_review_response.py b/src/cloudflare/types/abuse_reports/mitigation_review_response.py
new file mode 100644
index 00000000000..a8c31fe7375
--- /dev/null
+++ b/src/cloudflare/types/abuse_reports/mitigation_review_response.py
@@ -0,0 +1,35 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["MitigationReviewResponse"]
+
+
+class MitigationReviewResponse(BaseModel):
+    id: str
+    """ID of remediation."""
+
+    effective_date: str
+    """Date when the mitigation will become active.
+
+    Time in RFC 3339 format (https://www.rfc-editor.org/rfc/rfc3339.html)
+    """
+
+    entity_id: str
+
+    entity_type: Literal["url_pattern", "account", "zone"]
+
+    status: Literal["pending", "active", "in_review", "cancelled", "removed"]
+    """The status of a mitigation"""
+
+    type: Literal[
+        "legal_block",
+        "phishing_interstitial",
+        "network_block",
+        "rate_limit_cache",
+        "account_suspend",
+        "redirect_video_stream",
+    ]
+    """The type of mitigation"""
diff --git a/src/cloudflare/types/accounts/__init__.py b/src/cloudflare/types/accounts/__init__.py
index 4379841c49a..142051f805b 100644
--- a/src/cloudflare/types/accounts/__init__.py
+++ b/src/cloudflare/types/accounts/__init__.py
@@ -4,13 +4,21 @@
 
 from .status import Status as Status
 from .account import Account as Account
+from .role_list_params import RoleListParams as RoleListParams
+from .token_list_params import TokenListParams as TokenListParams
 from .member_list_params import MemberListParams as MemberListParams
 from .account_list_params import AccountListParams as AccountListParams
-from .member_get_response import MemberGetResponse as MemberGetResponse
+from .token_create_params import TokenCreateParams as TokenCreateParams
+from .token_update_params import TokenUpdateParams as TokenUpdateParams
 from .member_create_params import MemberCreateParams as MemberCreateParams
-from .member_list_response import MemberListResponse as MemberListResponse
 from .member_update_params import MemberUpdateParams as MemberUpdateParams
+from .account_create_params import AccountCreateParams as AccountCreateParams
 from .account_update_params import AccountUpdateParams as AccountUpdateParams
-from .member_create_response import MemberCreateResponse as MemberCreateResponse
+from .token_create_response import TokenCreateResponse as TokenCreateResponse
+from .token_delete_response import TokenDeleteResponse as TokenDeleteResponse
+from .token_verify_response import TokenVerifyResponse as TokenVerifyResponse
 from .member_delete_response import MemberDeleteResponse as MemberDeleteResponse
-from .member_update_response import MemberUpdateResponse as MemberUpdateResponse
+from .account_delete_response import AccountDeleteResponse as AccountDeleteResponse
+from .subscription_create_params import SubscriptionCreateParams as SubscriptionCreateParams
+from .subscription_update_params import SubscriptionUpdateParams as SubscriptionUpdateParams
+from .subscription_delete_response import SubscriptionDeleteResponse as SubscriptionDeleteResponse
diff --git a/src/cloudflare/types/accounts/account.py b/src/cloudflare/types/accounts/account.py
index 1c26f03b23e..80d79581a44 100644
--- a/src/cloudflare/types/accounts/account.py
+++ b/src/cloudflare/types/accounts/account.py
@@ -6,26 +6,24 @@
 
 from ..._models import BaseModel
 
-__all__ = ["Account", "Settings"]
+__all__ = ["Account", "ManagedBy", "Settings"]
 
 
-class Settings(BaseModel):
-    abuse_contact_email: Optional[str] = None
-    """Sets an abuse contact email to notify for abuse reports."""
+class ManagedBy(BaseModel):
+    """Parent container details"""
 
-    default_nameservers: Optional[Literal["cloudflare.standard", "custom.account", "custom.tenant"]] = None
-    """
-    Specifies the default nameservers to be used for new zones added to this
-    account.
+    parent_org_id: Optional[str] = None
+    """ID of the parent Organization, if one exists"""
 
-    - `cloudflare.standard` for Cloudflare-branded nameservers
-    - `custom.account` for account custom nameservers
-    - `custom.tenant` for tenant custom nameservers
+    parent_org_name: Optional[str] = None
+    """Name of the parent Organization, if one exists"""
 
-    See
-    [Custom Nameservers](https://developers.cloudflare.com/dns/additional-options/custom-nameservers/)
-    for more information.
-    """
+
+class Settings(BaseModel):
+    """Account settings"""
+
+    abuse_contact_email: Optional[str] = None
+    """Sets an abuse contact email to notify for abuse reports."""
 
     enforce_twofactor: Optional[bool] = None
     """
@@ -33,14 +31,6 @@ class Settings(BaseModel):
     Authentication is enabled
     """
 
-    use_account_custom_ns_by_default: Optional[bool] = None
-    """
-    Indicates whether new zones should use the account-level custom nameservers by
-    default.
-
-    Deprecated in favor of `default_nameservers`.
-    """
-
 
 class Account(BaseModel):
     id: str
@@ -49,8 +39,13 @@ class Account(BaseModel):
     name: str
     """Account name"""
 
+    type: Literal["standard", "enterprise"]
+
     created_on: Optional[datetime] = None
     """Timestamp for the creation of the account"""
 
+    managed_by: Optional[ManagedBy] = None
+    """Parent container details"""
+
     settings: Optional[Settings] = None
     """Account settings"""
diff --git a/src/cloudflare/types/accounts/account_create_params.py b/src/cloudflare/types/accounts/account_create_params.py
new file mode 100755
index 00000000000..5101e287de0
--- /dev/null
+++ b/src/cloudflare/types/accounts/account_create_params.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["AccountCreateParams", "Unit"]
+
+
+class AccountCreateParams(TypedDict, total=False):
+    name: Required[str]
+    """Account name"""
+
+    type: Literal["standard", "enterprise"]
+
+    unit: Unit
+    """
+    information related to the tenant unit, and optionally, an id of the unit to
+    create the account on. see
+    https://developers.cloudflare.com/tenant/how-to/manage-accounts/
+    """
+
+
+class Unit(TypedDict, total=False):
+    """
+    information related to the tenant unit, and optionally, an id of the unit to create the account on. see https://developers.cloudflare.com/tenant/how-to/manage-accounts/
+    """
+
+    id: str
+    """Tenant unit ID"""
diff --git a/src/cloudflare/types/accounts/account_delete_response.py b/src/cloudflare/types/accounts/account_delete_response.py
new file mode 100755
index 00000000000..07fb19563ff
--- /dev/null
+++ b/src/cloudflare/types/accounts/account_delete_response.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["AccountDeleteResponse"]
+
+
+class AccountDeleteResponse(BaseModel):
+    id: str
+    """Identifier"""
diff --git a/src/cloudflare/types/accounts/account_update_params.py b/src/cloudflare/types/accounts/account_update_params.py
index 3b472cb0778..d0cb3859d99 100644
--- a/src/cloudflare/types/accounts/account_update_params.py
+++ b/src/cloudflare/types/accounts/account_update_params.py
@@ -4,47 +4,42 @@
 
 from typing_extensions import Literal, Required, TypedDict
 
-__all__ = ["AccountUpdateParams", "Settings"]
+__all__ = ["AccountUpdateParams", "ManagedBy", "Settings"]
 
 
 class AccountUpdateParams(TypedDict, total=False):
-    account_id: Required[object]
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    id: Required[str]
+    """Identifier"""
 
     name: Required[str]
     """Account name"""
 
+    type: Required[Literal["standard", "enterprise"]]
+
+    managed_by: ManagedBy
+    """Parent container details"""
+
     settings: Settings
     """Account settings"""
 
 
-class Settings(TypedDict, total=False):
-    abuse_contact_email: str
-    """Sets an abuse contact email to notify for abuse reports."""
+class ManagedBy(TypedDict, total=False):
+    """Parent container details"""
 
-    default_nameservers: Literal["cloudflare.standard", "custom.account", "custom.tenant"]
-    """
-    Specifies the default nameservers to be used for new zones added to this
-    account.
+    pass
 
-    - `cloudflare.standard` for Cloudflare-branded nameservers
-    - `custom.account` for account custom nameservers
-    - `custom.tenant` for tenant custom nameservers
 
-    See
-    [Custom Nameservers](https://developers.cloudflare.com/dns/additional-options/custom-nameservers/)
-    for more information.
-    """
+class Settings(TypedDict, total=False):
+    """Account settings"""
+
+    abuse_contact_email: str
+    """Sets an abuse contact email to notify for abuse reports."""
 
     enforce_twofactor: bool
     """
     Indicates whether membership in this account requires that Two-Factor
     Authentication is enabled
     """
-
-    use_account_custom_ns_by_default: bool
-    """
-    Indicates whether new zones should use the account-level custom nameservers by
-    default.
-
-    Deprecated in favor of `default_nameservers`.
-    """
diff --git a/src/cloudflare/types/accounts/logs/__init__.py b/src/cloudflare/types/accounts/logs/__init__.py
new file mode 100644
index 00000000000..4db884733b2
--- /dev/null
+++ b/src/cloudflare/types/accounts/logs/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .audit_list_params import AuditListParams as AuditListParams
+from .audit_list_response import AuditListResponse as AuditListResponse
diff --git a/src/cloudflare/types/accounts/logs/audit_list_params.py b/src/cloudflare/types/accounts/logs/audit_list_params.py
new file mode 100644
index 00000000000..6bf576a43e2
--- /dev/null
+++ b/src/cloudflare/types/accounts/logs/audit_list_params.py
@@ -0,0 +1,403 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable
+from datetime import date
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = [
+    "AuditListParams",
+    "ID",
+    "AccountName",
+    "ActionResult",
+    "ActionType",
+    "ActorContext",
+    "ActorEmail",
+    "ActorID",
+    "ActorIPAddress",
+    "ActorTokenID",
+    "ActorTokenName",
+    "ActorType",
+    "AuditLogID",
+    "RawCfRayID",
+    "RawMethod",
+    "RawStatusCode",
+    "RawURI",
+    "ResourceID",
+    "ResourceProduct",
+    "ResourceScope",
+    "ResourceType",
+    "ZoneID",
+    "ZoneName",
+]
+
+
+class AuditListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The unique id that identifies the account."""
+
+    before: Required[Annotated[Union[str, date], PropertyInfo(format="iso8601")]]
+    """Limits the returned results to logs older than the specified date.
+
+    This can be a date string 2019-04-30 (interpreted in UTC) or an absolute
+    timestamp that conforms to RFC3339.
+    """
+
+    since: Required[Annotated[Union[str, date], PropertyInfo(format="iso8601")]]
+    """Limits the returned results to logs newer than the specified date.
+
+    This can be a date string 2019-04-30 (interpreted in UTC) or an absolute
+    timestamp that conforms to RFC3339.
+    """
+
+    id: ID
+
+    account_name: AccountName
+
+    action_result: ActionResult
+
+    action_type: ActionType
+
+    actor_context: ActorContext
+
+    actor_email: ActorEmail
+
+    actor_id: ActorID
+
+    actor_ip_address: ActorIPAddress
+
+    actor_token_id: ActorTokenID
+
+    actor_token_name: ActorTokenName
+
+    actor_type: ActorType
+
+    audit_log_id: AuditLogID
+
+    cursor: str
+    """The cursor is an opaque token used to paginate through large sets of records.
+
+    It indicates the position from which to continue when requesting the next set of
+    records. A valid cursor value can be obtained from the cursor object in the
+    result_info structure of a previous response.
+    """
+
+    direction: Literal["desc", "asc"]
+    """Sets sorting order."""
+
+    limit: float
+    """The number limits the objects to return.
+
+    The cursor attribute may be used to iterate over the next batch of objects if
+    there are more than the limit.
+    """
+
+    raw_cf_rayid: Annotated[RawCfRayID, PropertyInfo(alias="raw_cf_ray_id")]
+
+    raw_method: RawMethod
+
+    raw_status_code: RawStatusCode
+
+    raw_uri: RawURI
+
+    resource_id: ResourceID
+
+    resource_product: ResourceProduct
+
+    resource_scope: ResourceScope
+
+    resource_type: ResourceType
+
+    zone_id: ZoneID
+
+    zone_name: ZoneName
+
+
+_IDReservedKeywords = TypedDict(
+    "_IDReservedKeywords",
+    {
+        "not": SequenceNotStr[str],
+    },
+    total=False,
+)
+
+
+class ID(_IDReservedKeywords, total=False):
+    pass
+
+
+_AccountNameReservedKeywords = TypedDict(
+    "_AccountNameReservedKeywords",
+    {
+        "not": SequenceNotStr[str],
+    },
+    total=False,
+)
+
+
+class AccountName(_AccountNameReservedKeywords, total=False):
+    pass
+
+
+_ActionResultReservedKeywords = TypedDict(
+    "_ActionResultReservedKeywords",
+    {
+        "not": List[Literal["success", "failure"]],
+    },
+    total=False,
+)
+
+
+class ActionResult(_ActionResultReservedKeywords, total=False):
+    pass
+
+
+_ActionTypeReservedKeywords = TypedDict(
+    "_ActionTypeReservedKeywords",
+    {
+        "not": List[Literal["create", "delete", "view", "update"]],
+    },
+    total=False,
+)
+
+
+class ActionType(_ActionTypeReservedKeywords, total=False):
+    pass
+
+
+_ActorContextReservedKeywords = TypedDict(
+    "_ActorContextReservedKeywords",
+    {
+        "not": List[Literal["api_key", "api_token", "dash", "oauth", "origin_ca_key"]],
+    },
+    total=False,
+)
+
+
+class ActorContext(_ActorContextReservedKeywords, total=False):
+    pass
+
+
+_ActorEmailReservedKeywords = TypedDict(
+    "_ActorEmailReservedKeywords",
+    {
+        "not": SequenceNotStr[str],
+    },
+    total=False,
+)
+
+
+class ActorEmail(_ActorEmailReservedKeywords, total=False):
+    pass
+
+
+_ActorIDReservedKeywords = TypedDict(
+    "_ActorIDReservedKeywords",
+    {
+        "not": SequenceNotStr[str],
+    },
+    total=False,
+)
+
+
+class ActorID(_ActorIDReservedKeywords, total=False):
+    pass
+
+
+_ActorIPAddressReservedKeywords = TypedDict(
+    "_ActorIPAddressReservedKeywords",
+    {
+        "not": SequenceNotStr[str],
+    },
+    total=False,
+)
+
+
+class ActorIPAddress(_ActorIPAddressReservedKeywords, total=False):
+    pass
+
+
+_ActorTokenIDReservedKeywords = TypedDict(
+    "_ActorTokenIDReservedKeywords",
+    {
+        "not": SequenceNotStr[str],
+    },
+    total=False,
+)
+
+
+class ActorTokenID(_ActorTokenIDReservedKeywords, total=False):
+    pass
+
+
+_ActorTokenNameReservedKeywords = TypedDict(
+    "_ActorTokenNameReservedKeywords",
+    {
+        "not": SequenceNotStr[str],
+    },
+    total=False,
+)
+
+
+class ActorTokenName(_ActorTokenNameReservedKeywords, total=False):
+    pass
+
+
+_ActorTypeReservedKeywords = TypedDict(
+    "_ActorTypeReservedKeywords",
+    {
+        "not": List[Literal["account", "cloudflare_admin", "system", "user"]],
+    },
+    total=False,
+)
+
+
+class ActorType(_ActorTypeReservedKeywords, total=False):
+    pass
+
+
+_AuditLogIDReservedKeywords = TypedDict(
+    "_AuditLogIDReservedKeywords",
+    {
+        "not": SequenceNotStr[str],
+    },
+    total=False,
+)
+
+
+class AuditLogID(_AuditLogIDReservedKeywords, total=False):
+    pass
+
+
+_RawCfRayIDReservedKeywords = TypedDict(
+    "_RawCfRayIDReservedKeywords",
+    {
+        "not": SequenceNotStr[str],
+    },
+    total=False,
+)
+
+
+class RawCfRayID(_RawCfRayIDReservedKeywords, total=False):
+    pass
+
+
+_RawMethodReservedKeywords = TypedDict(
+    "_RawMethodReservedKeywords",
+    {
+        "not": SequenceNotStr[str],
+    },
+    total=False,
+)
+
+
+class RawMethod(_RawMethodReservedKeywords, total=False):
+    pass
+
+
+_RawStatusCodeReservedKeywords = TypedDict(
+    "_RawStatusCodeReservedKeywords",
+    {
+        "not": Iterable[int],
+    },
+    total=False,
+)
+
+
+class RawStatusCode(_RawStatusCodeReservedKeywords, total=False):
+    pass
+
+
+_RawURIReservedKeywords = TypedDict(
+    "_RawURIReservedKeywords",
+    {
+        "not": SequenceNotStr[str],
+    },
+    total=False,
+)
+
+
+class RawURI(_RawURIReservedKeywords, total=False):
+    pass
+
+
+_ResourceIDReservedKeywords = TypedDict(
+    "_ResourceIDReservedKeywords",
+    {
+        "not": SequenceNotStr[str],
+    },
+    total=False,
+)
+
+
+class ResourceID(_ResourceIDReservedKeywords, total=False):
+    pass
+
+
+_ResourceProductReservedKeywords = TypedDict(
+    "_ResourceProductReservedKeywords",
+    {
+        "not": SequenceNotStr[str],
+    },
+    total=False,
+)
+
+
+class ResourceProduct(_ResourceProductReservedKeywords, total=False):
+    pass
+
+
+_ResourceScopeReservedKeywords = TypedDict(
+    "_ResourceScopeReservedKeywords",
+    {
+        "not": List[Literal["accounts", "user", "zones"]],
+    },
+    total=False,
+)
+
+
+class ResourceScope(_ResourceScopeReservedKeywords, total=False):
+    pass
+
+
+_ResourceTypeReservedKeywords = TypedDict(
+    "_ResourceTypeReservedKeywords",
+    {
+        "not": SequenceNotStr[str],
+    },
+    total=False,
+)
+
+
+class ResourceType(_ResourceTypeReservedKeywords, total=False):
+    pass
+
+
+_ZoneIDReservedKeywords = TypedDict(
+    "_ZoneIDReservedKeywords",
+    {
+        "not": SequenceNotStr[str],
+    },
+    total=False,
+)
+
+
+class ZoneID(_ZoneIDReservedKeywords, total=False):
+    pass
+
+
+_ZoneNameReservedKeywords = TypedDict(
+    "_ZoneNameReservedKeywords",
+    {
+        "not": SequenceNotStr[str],
+    },
+    total=False,
+)
+
+
+class ZoneName(_ZoneNameReservedKeywords, total=False):
+    pass
diff --git a/src/cloudflare/types/accounts/logs/audit_list_response.py b/src/cloudflare/types/accounts/logs/audit_list_response.py
new file mode 100644
index 00000000000..ec889153e7e
--- /dev/null
+++ b/src/cloudflare/types/accounts/logs/audit_list_response.py
@@ -0,0 +1,136 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["AuditListResponse", "Account", "Action", "Actor", "Raw", "Resource", "Zone"]
+
+
+class Account(BaseModel):
+    """Contains account related information."""
+
+    id: Optional[str] = None
+    """A unique identifier for the account."""
+
+    name: Optional[str] = None
+    """A string that identifies the account name."""
+
+
+class Action(BaseModel):
+    """Provides information about the action performed."""
+
+    description: Optional[str] = None
+    """A short description of the action performed."""
+
+    result: Optional[str] = None
+    """The result of the action, indicating success or failure."""
+
+    time: Optional[datetime] = None
+    """A timestamp indicating when the action was logged."""
+
+    type: Optional[str] = None
+    """A short string that describes the action that was performed."""
+
+
+class Actor(BaseModel):
+    """Provides details about the actor who performed the action."""
+
+    id: Optional[str] = None
+    """The ID of the actor who performed the action.
+
+    If a user performed the action, this will be their User ID.
+    """
+
+    context: Optional[Literal["api_key", "api_token", "dash", "oauth", "origin_ca_key"]] = None
+
+    email: Optional[str] = None
+    """The email of the actor who performed the action."""
+
+    ip_address: Optional[str] = None
+    """The IP address of the request that performed the action."""
+
+    token_id: Optional[str] = None
+    """Filters by the API token ID when the actor context is an api_token."""
+
+    token_name: Optional[str] = None
+    """Filters by the API token name when the actor context is an api_token."""
+
+    type: Optional[Literal["account", "cloudflare_admin", "system", "user"]] = None
+    """The type of actor."""
+
+
+class Raw(BaseModel):
+    """Provides raw information about the request and response."""
+
+    cf_rayid: Optional[str] = FieldInfo(alias="cf_ray_id", default=None)
+    """The Cloudflare Ray ID for the request."""
+
+    method: Optional[str] = None
+    """The HTTP method of the request."""
+
+    status_code: Optional[int] = None
+    """The HTTP response status code returned by the API."""
+
+    uri: Optional[str] = None
+    """The URI of the request."""
+
+    user_agent: Optional[str] = None
+    """The client's user agent string sent with the request."""
+
+
+class Resource(BaseModel):
+    """Provides details about the affected resource."""
+
+    id: Optional[str] = None
+    """The unique identifier for the affected resource."""
+
+    product: Optional[str] = None
+    """The Cloudflare product associated with the resource."""
+
+    request: Optional[object] = None
+
+    response: Optional[object] = None
+
+    scope: Optional[object] = None
+    """The scope of the resource."""
+
+    type: Optional[str] = None
+    """The type of the resource."""
+
+
+class Zone(BaseModel):
+    """Provides details about the zone affected by the action."""
+
+    id: Optional[str] = None
+    """A string that identifies the zone id."""
+
+    name: Optional[str] = None
+    """A string that identifies the zone name."""
+
+
+class AuditListResponse(BaseModel):
+    id: Optional[str] = None
+    """A unique identifier for the audit log entry."""
+
+    account: Optional[Account] = None
+    """Contains account related information."""
+
+    action: Optional[Action] = None
+    """Provides information about the action performed."""
+
+    actor: Optional[Actor] = None
+    """Provides details about the actor who performed the action."""
+
+    raw: Optional[Raw] = None
+    """Provides raw information about the request and response."""
+
+    resource: Optional[Resource] = None
+    """Provides details about the affected resource."""
+
+    zone: Optional[Zone] = None
+    """Provides details about the zone affected by the action."""
diff --git a/src/cloudflare/types/accounts/member_create_params.py b/src/cloudflare/types/accounts/member_create_params.py
index 793e4eb5199..0fbe8a7347d 100644
--- a/src/cloudflare/types/accounts/member_create_params.py
+++ b/src/cloudflare/types/accounts/member_create_params.py
@@ -2,8 +2,10 @@
 
 from __future__ import annotations
 
-from typing import List, Union, Iterable
-from typing_extensions import Literal, Required, TypedDict
+from typing import Union, Iterable
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
 
 __all__ = [
     "MemberCreateParams",
@@ -22,7 +24,7 @@ class IAMCreateMemberWithRoles(TypedDict, total=False):
     email: Required[str]
     """The contact email address of the user."""
 
-    roles: Required[List[str]]
+    roles: Required[SequenceNotStr[str]]
     """Array of roles associated with this member."""
 
     status: Literal["accepted", "pending"]
@@ -42,11 +44,15 @@ class IAMCreateMemberWithPolicies(TypedDict, total=False):
 
 
 class IAMCreateMemberWithPoliciesPolicyPermissionGroup(TypedDict, total=False):
+    """A group of permissions."""
+
     id: Required[str]
     """Identifier of the group."""
 
 
 class IAMCreateMemberWithPoliciesPolicyResourceGroup(TypedDict, total=False):
+    """A group of scoped resources."""
+
     id: Required[str]
     """Identifier of the group."""
 
@@ -62,4 +68,4 @@ class IAMCreateMemberWithPoliciesPolicy(TypedDict, total=False):
     """A list of resource groups that the policy applies to."""
 
 
-MemberCreateParams = Union[IAMCreateMemberWithRoles, IAMCreateMemberWithPolicies]
+MemberCreateParams: TypeAlias = Union[IAMCreateMemberWithRoles, IAMCreateMemberWithPolicies]
diff --git a/src/cloudflare/types/accounts/member_create_response.py b/src/cloudflare/types/accounts/member_create_response.py
deleted file mode 100644
index dd71bbe04ce..00000000000
--- a/src/cloudflare/types/accounts/member_create_response.py
+++ /dev/null
@@ -1,112 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-from ..shared.role import Role
-
-__all__ = [
-    "MemberCreateResponse",
-    "Policy",
-    "PolicyPermissionGroup",
-    "PolicyResourceGroup",
-    "PolicyResourceGroupScope",
-    "PolicyResourceGroupScopeObject",
-    "User",
-]
-
-
-class PolicyPermissionGroup(BaseModel):
-    id: str
-    """Identifier of the group."""
-
-    meta: Optional[object] = None
-    """Attributes associated to the permission group."""
-
-    name: Optional[str] = None
-    """Name of the group."""
-
-
-class PolicyResourceGroupScopeObject(BaseModel):
-    key: str
-    """
-    This is a combination of pre-defined resource name and identifier (like Zone ID
-    etc.)
-    """
-
-
-class PolicyResourceGroupScope(BaseModel):
-    key: str
-    """
-    This is a combination of pre-defined resource name and identifier (like Account
-    ID etc.)
-    """
-
-    objects: List[PolicyResourceGroupScopeObject]
-    """A list of scope objects for additional context."""
-
-
-class PolicyResourceGroup(BaseModel):
-    id: str
-    """Identifier of the group."""
-
-    scope: List[PolicyResourceGroupScope]
-    """The scope associated to the resource group"""
-
-    meta: Optional[object] = None
-    """Attributes associated to the resource group."""
-
-    name: Optional[str] = None
-    """Name of the resource group."""
-
-
-class Policy(BaseModel):
-    id: Optional[str] = None
-    """Policy identifier."""
-
-    access: Optional[Literal["allow", "deny"]] = None
-    """Allow or deny operations against the resources."""
-
-    permission_groups: Optional[List[PolicyPermissionGroup]] = None
-    """A set of permission groups that are specified to the policy."""
-
-    resource_groups: Optional[List[PolicyResourceGroup]] = None
-    """A list of resource groups that the policy applies to."""
-
-
-class User(BaseModel):
-    email: str
-    """The contact email address of the user."""
-
-    id: Optional[str] = None
-    """Identifier"""
-
-    first_name: Optional[str] = None
-    """User's first name"""
-
-    last_name: Optional[str] = None
-    """User's last name"""
-
-    two_factor_authentication_enabled: Optional[bool] = None
-    """Indicates whether two-factor authentication is enabled for the user account.
-
-    Does not apply to API authentication.
-    """
-
-
-class MemberCreateResponse(BaseModel):
-    id: Optional[str] = None
-    """Membership identifier tag."""
-
-    policies: Optional[List[Policy]] = None
-    """Access policy for the membership"""
-
-    roles: Optional[List[Role]] = None
-    """Roles assigned to this Member."""
-
-    status: Optional[Literal["accepted", "pending"]] = None
-    """A member's status in the account."""
-
-    user: Optional[User] = None
-    """Details of the user associated to the membership."""
diff --git a/src/cloudflare/types/accounts/member_delete_response.py b/src/cloudflare/types/accounts/member_delete_response.py
index 77717aeeeb9..971bb07457f 100644
--- a/src/cloudflare/types/accounts/member_delete_response.py
+++ b/src/cloudflare/types/accounts/member_delete_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ..._models import BaseModel
 
 __all__ = ["MemberDeleteResponse"]
diff --git a/src/cloudflare/types/accounts/member_get_response.py b/src/cloudflare/types/accounts/member_get_response.py
deleted file mode 100644
index 61da641cd72..00000000000
--- a/src/cloudflare/types/accounts/member_get_response.py
+++ /dev/null
@@ -1,112 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-from ..shared.role import Role
-
-__all__ = [
-    "MemberGetResponse",
-    "Policy",
-    "PolicyPermissionGroup",
-    "PolicyResourceGroup",
-    "PolicyResourceGroupScope",
-    "PolicyResourceGroupScopeObject",
-    "User",
-]
-
-
-class PolicyPermissionGroup(BaseModel):
-    id: str
-    """Identifier of the group."""
-
-    meta: Optional[object] = None
-    """Attributes associated to the permission group."""
-
-    name: Optional[str] = None
-    """Name of the group."""
-
-
-class PolicyResourceGroupScopeObject(BaseModel):
-    key: str
-    """
-    This is a combination of pre-defined resource name and identifier (like Zone ID
-    etc.)
-    """
-
-
-class PolicyResourceGroupScope(BaseModel):
-    key: str
-    """
-    This is a combination of pre-defined resource name and identifier (like Account
-    ID etc.)
-    """
-
-    objects: List[PolicyResourceGroupScopeObject]
-    """A list of scope objects for additional context."""
-
-
-class PolicyResourceGroup(BaseModel):
-    id: str
-    """Identifier of the group."""
-
-    scope: List[PolicyResourceGroupScope]
-    """The scope associated to the resource group"""
-
-    meta: Optional[object] = None
-    """Attributes associated to the resource group."""
-
-    name: Optional[str] = None
-    """Name of the resource group."""
-
-
-class Policy(BaseModel):
-    id: Optional[str] = None
-    """Policy identifier."""
-
-    access: Optional[Literal["allow", "deny"]] = None
-    """Allow or deny operations against the resources."""
-
-    permission_groups: Optional[List[PolicyPermissionGroup]] = None
-    """A set of permission groups that are specified to the policy."""
-
-    resource_groups: Optional[List[PolicyResourceGroup]] = None
-    """A list of resource groups that the policy applies to."""
-
-
-class User(BaseModel):
-    email: str
-    """The contact email address of the user."""
-
-    id: Optional[str] = None
-    """Identifier"""
-
-    first_name: Optional[str] = None
-    """User's first name"""
-
-    last_name: Optional[str] = None
-    """User's last name"""
-
-    two_factor_authentication_enabled: Optional[bool] = None
-    """Indicates whether two-factor authentication is enabled for the user account.
-
-    Does not apply to API authentication.
-    """
-
-
-class MemberGetResponse(BaseModel):
-    id: Optional[str] = None
-    """Membership identifier tag."""
-
-    policies: Optional[List[Policy]] = None
-    """Access policy for the membership"""
-
-    roles: Optional[List[Role]] = None
-    """Roles assigned to this Member."""
-
-    status: Optional[Literal["accepted", "pending"]] = None
-    """A member's status in the account."""
-
-    user: Optional[User] = None
-    """Details of the user associated to the membership."""
diff --git a/src/cloudflare/types/accounts/member_list_response.py b/src/cloudflare/types/accounts/member_list_response.py
deleted file mode 100644
index 5a8a4f49c10..00000000000
--- a/src/cloudflare/types/accounts/member_list_response.py
+++ /dev/null
@@ -1,112 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-from ..shared.role import Role
-
-__all__ = [
-    "MemberListResponse",
-    "Policy",
-    "PolicyPermissionGroup",
-    "PolicyResourceGroup",
-    "PolicyResourceGroupScope",
-    "PolicyResourceGroupScopeObject",
-    "User",
-]
-
-
-class PolicyPermissionGroup(BaseModel):
-    id: str
-    """Identifier of the group."""
-
-    meta: Optional[object] = None
-    """Attributes associated to the permission group."""
-
-    name: Optional[str] = None
-    """Name of the group."""
-
-
-class PolicyResourceGroupScopeObject(BaseModel):
-    key: str
-    """
-    This is a combination of pre-defined resource name and identifier (like Zone ID
-    etc.)
-    """
-
-
-class PolicyResourceGroupScope(BaseModel):
-    key: str
-    """
-    This is a combination of pre-defined resource name and identifier (like Account
-    ID etc.)
-    """
-
-    objects: List[PolicyResourceGroupScopeObject]
-    """A list of scope objects for additional context."""
-
-
-class PolicyResourceGroup(BaseModel):
-    id: str
-    """Identifier of the group."""
-
-    scope: List[PolicyResourceGroupScope]
-    """The scope associated to the resource group"""
-
-    meta: Optional[object] = None
-    """Attributes associated to the resource group."""
-
-    name: Optional[str] = None
-    """Name of the resource group."""
-
-
-class Policy(BaseModel):
-    id: Optional[str] = None
-    """Policy identifier."""
-
-    access: Optional[Literal["allow", "deny"]] = None
-    """Allow or deny operations against the resources."""
-
-    permission_groups: Optional[List[PolicyPermissionGroup]] = None
-    """A set of permission groups that are specified to the policy."""
-
-    resource_groups: Optional[List[PolicyResourceGroup]] = None
-    """A list of resource groups that the policy applies to."""
-
-
-class User(BaseModel):
-    email: str
-    """The contact email address of the user."""
-
-    id: Optional[str] = None
-    """Identifier"""
-
-    first_name: Optional[str] = None
-    """User's first name"""
-
-    last_name: Optional[str] = None
-    """User's last name"""
-
-    two_factor_authentication_enabled: Optional[bool] = None
-    """Indicates whether two-factor authentication is enabled for the user account.
-
-    Does not apply to API authentication.
-    """
-
-
-class MemberListResponse(BaseModel):
-    id: Optional[str] = None
-    """Membership identifier tag."""
-
-    policies: Optional[List[Policy]] = None
-    """Access policy for the membership"""
-
-    roles: Optional[List[Role]] = None
-    """Roles assigned to this Member."""
-
-    status: Optional[Literal["accepted", "pending"]] = None
-    """A member's status in the account."""
-
-    user: Optional[User] = None
-    """Details of the user associated to the membership."""
diff --git a/src/cloudflare/types/accounts/member_update_params.py b/src/cloudflare/types/accounts/member_update_params.py
index e95d51f43fa..6c0a304dce1 100644
--- a/src/cloudflare/types/accounts/member_update_params.py
+++ b/src/cloudflare/types/accounts/member_update_params.py
@@ -3,12 +3,13 @@
 from __future__ import annotations
 
 from typing import Union, Iterable
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ..shared_params.role import Role
 
 __all__ = [
     "MemberUpdateParams",
-    "Member",
-    "MemberRole",
+    "IAMUpdateMemberWithRoles",
     "IAMUpdateMemberWithPolicies",
     "IAMUpdateMemberWithPoliciesPolicy",
     "IAMUpdateMemberWithPoliciesPolicyPermissionGroup",
@@ -16,19 +17,14 @@
 ]
 
 
-class Member(TypedDict, total=False):
+class IAMUpdateMemberWithRoles(TypedDict, total=False):
     account_id: Required[str]
     """Account identifier tag."""
 
-    roles: Iterable[MemberRole]
+    roles: Iterable[Role]
     """Roles assigned to this member."""
 
 
-class MemberRole(TypedDict, total=False):
-    id: Required[str]
-    """Role identifier tag."""
-
-
 class IAMUpdateMemberWithPolicies(TypedDict, total=False):
     account_id: Required[str]
     """Account identifier tag."""
@@ -38,11 +34,15 @@ class IAMUpdateMemberWithPolicies(TypedDict, total=False):
 
 
 class IAMUpdateMemberWithPoliciesPolicyPermissionGroup(TypedDict, total=False):
+    """A group of permissions."""
+
     id: Required[str]
     """Identifier of the group."""
 
 
 class IAMUpdateMemberWithPoliciesPolicyResourceGroup(TypedDict, total=False):
+    """A group of scoped resources."""
+
     id: Required[str]
     """Identifier of the group."""
 
@@ -58,4 +58,4 @@ class IAMUpdateMemberWithPoliciesPolicy(TypedDict, total=False):
     """A list of resource groups that the policy applies to."""
 
 
-MemberUpdateParams = Union[Member, IAMUpdateMemberWithPolicies]
+MemberUpdateParams: TypeAlias = Union[IAMUpdateMemberWithRoles, IAMUpdateMemberWithPolicies]
diff --git a/src/cloudflare/types/accounts/member_update_response.py b/src/cloudflare/types/accounts/member_update_response.py
deleted file mode 100644
index 0c92f9b20fb..00000000000
--- a/src/cloudflare/types/accounts/member_update_response.py
+++ /dev/null
@@ -1,112 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-from ..shared.role import Role
-
-__all__ = [
-    "MemberUpdateResponse",
-    "Policy",
-    "PolicyPermissionGroup",
-    "PolicyResourceGroup",
-    "PolicyResourceGroupScope",
-    "PolicyResourceGroupScopeObject",
-    "User",
-]
-
-
-class PolicyPermissionGroup(BaseModel):
-    id: str
-    """Identifier of the group."""
-
-    meta: Optional[object] = None
-    """Attributes associated to the permission group."""
-
-    name: Optional[str] = None
-    """Name of the group."""
-
-
-class PolicyResourceGroupScopeObject(BaseModel):
-    key: str
-    """
-    This is a combination of pre-defined resource name and identifier (like Zone ID
-    etc.)
-    """
-
-
-class PolicyResourceGroupScope(BaseModel):
-    key: str
-    """
-    This is a combination of pre-defined resource name and identifier (like Account
-    ID etc.)
-    """
-
-    objects: List[PolicyResourceGroupScopeObject]
-    """A list of scope objects for additional context."""
-
-
-class PolicyResourceGroup(BaseModel):
-    id: str
-    """Identifier of the group."""
-
-    scope: List[PolicyResourceGroupScope]
-    """The scope associated to the resource group"""
-
-    meta: Optional[object] = None
-    """Attributes associated to the resource group."""
-
-    name: Optional[str] = None
-    """Name of the resource group."""
-
-
-class Policy(BaseModel):
-    id: Optional[str] = None
-    """Policy identifier."""
-
-    access: Optional[Literal["allow", "deny"]] = None
-    """Allow or deny operations against the resources."""
-
-    permission_groups: Optional[List[PolicyPermissionGroup]] = None
-    """A set of permission groups that are specified to the policy."""
-
-    resource_groups: Optional[List[PolicyResourceGroup]] = None
-    """A list of resource groups that the policy applies to."""
-
-
-class User(BaseModel):
-    email: str
-    """The contact email address of the user."""
-
-    id: Optional[str] = None
-    """Identifier"""
-
-    first_name: Optional[str] = None
-    """User's first name"""
-
-    last_name: Optional[str] = None
-    """User's last name"""
-
-    two_factor_authentication_enabled: Optional[bool] = None
-    """Indicates whether two-factor authentication is enabled for the user account.
-
-    Does not apply to API authentication.
-    """
-
-
-class MemberUpdateResponse(BaseModel):
-    id: Optional[str] = None
-    """Membership identifier tag."""
-
-    policies: Optional[List[Policy]] = None
-    """Access policy for the membership"""
-
-    roles: Optional[List[Role]] = None
-    """Roles assigned to this Member."""
-
-    status: Optional[Literal["accepted", "pending"]] = None
-    """A member's status in the account."""
-
-    user: Optional[User] = None
-    """Details of the user associated to the membership."""
diff --git a/src/cloudflare/types/accounts/role_list_params.py b/src/cloudflare/types/accounts/role_list_params.py
new file mode 100644
index 00000000000..d4e5289bbec
--- /dev/null
+++ b/src/cloudflare/types/accounts/role_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["RoleListParams"]
+
+
+class RoleListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    page: float
+    """Page number of paginated results."""
+
+    per_page: float
+    """Number of roles per page."""
diff --git a/src/cloudflare/types/accounts/status.py b/src/cloudflare/types/accounts/status.py
index b38c2d347e1..c525afffa6c 100644
--- a/src/cloudflare/types/accounts/status.py
+++ b/src/cloudflare/types/accounts/status.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["Status"]
 
-Status = Literal["member", "invited"]
+Status: TypeAlias = Literal["member", "invited"]
diff --git a/src/cloudflare/types/accounts/subscription_create_params.py b/src/cloudflare/types/accounts/subscription_create_params.py
new file mode 100644
index 00000000000..8e1e503d9f6
--- /dev/null
+++ b/src/cloudflare/types/accounts/subscription_create_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..shared_params.rate_plan import RatePlan
+
+__all__ = ["SubscriptionCreateParams"]
+
+
+class SubscriptionCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier"""
+
+    frequency: Literal["weekly", "monthly", "quarterly", "yearly"]
+    """How often the subscription is renewed automatically."""
+
+    rate_plan: RatePlan
+    """The rate plan applied to the subscription."""
diff --git a/src/cloudflare/types/subscriptions/subscription_delete_response.py b/src/cloudflare/types/accounts/subscription_delete_response.py
similarity index 100%
rename from src/cloudflare/types/subscriptions/subscription_delete_response.py
rename to src/cloudflare/types/accounts/subscription_delete_response.py
diff --git a/src/cloudflare/types/accounts/subscription_update_params.py b/src/cloudflare/types/accounts/subscription_update_params.py
new file mode 100644
index 00000000000..fa42b5e2337
--- /dev/null
+++ b/src/cloudflare/types/accounts/subscription_update_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..shared_params.rate_plan import RatePlan
+
+__all__ = ["SubscriptionUpdateParams"]
+
+
+class SubscriptionUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier"""
+
+    frequency: Literal["weekly", "monthly", "quarterly", "yearly"]
+    """How often the subscription is renewed automatically."""
+
+    rate_plan: RatePlan
+    """The rate plan applied to the subscription."""
diff --git a/src/cloudflare/types/accounts/token_create_params.py b/src/cloudflare/types/accounts/token_create_params.py
new file mode 100644
index 00000000000..6ff13271545
--- /dev/null
+++ b/src/cloudflare/types/accounts/token_create_params.py
@@ -0,0 +1,57 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from datetime import datetime
+from typing_extensions import Required, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+from ..shared_params.token_policy import TokenPolicy
+from ..shared.token_condition_cidr_list import TokenConditionCIDRList
+
+__all__ = ["TokenCreateParams", "Condition", "ConditionRequestIP"]
+
+
+class TokenCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    name: Required[str]
+    """Token name."""
+
+    policies: Required[Iterable[TokenPolicy]]
+    """List of access policies assigned to the token."""
+
+    condition: Condition
+
+    expires_on: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """
+    The expiration time on or after which the JWT MUST NOT be accepted for
+    processing.
+    """
+
+    not_before: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """The time before which the token MUST NOT be accepted for processing."""
+
+
+_ConditionRequestIPReservedKeywords = TypedDict(
+    "_ConditionRequestIPReservedKeywords",
+    {
+        "in": SequenceNotStr[TokenConditionCIDRList],
+    },
+    total=False,
+)
+
+
+class ConditionRequestIP(_ConditionRequestIPReservedKeywords, total=False):
+    """Client IP restrictions."""
+
+    not_in: SequenceNotStr[TokenConditionCIDRList]
+    """List of IPv4/IPv6 CIDR addresses."""
+
+
+class Condition(TypedDict, total=False):
+    request_ip: ConditionRequestIP
+    """Client IP restrictions."""
diff --git a/src/cloudflare/types/accounts/token_create_response.py b/src/cloudflare/types/accounts/token_create_response.py
new file mode 100644
index 00000000000..7185c9bfb4c
--- /dev/null
+++ b/src/cloudflare/types/accounts/token_create_response.py
@@ -0,0 +1,66 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+from ..shared.token_value import TokenValue
+from ..shared.token_policy import TokenPolicy
+from ..shared.token_condition_cidr_list import TokenConditionCIDRList
+
+__all__ = ["TokenCreateResponse", "Condition", "ConditionRequestIP"]
+
+
+class ConditionRequestIP(BaseModel):
+    """Client IP restrictions."""
+
+    in_: Optional[List[TokenConditionCIDRList]] = FieldInfo(alias="in", default=None)
+    """List of IPv4/IPv6 CIDR addresses."""
+
+    not_in: Optional[List[TokenConditionCIDRList]] = None
+    """List of IPv4/IPv6 CIDR addresses."""
+
+
+class Condition(BaseModel):
+    request_ip: Optional[ConditionRequestIP] = None
+    """Client IP restrictions."""
+
+
+class TokenCreateResponse(BaseModel):
+    id: Optional[str] = None
+    """Token identifier tag."""
+
+    condition: Optional[Condition] = None
+
+    expires_on: Optional[datetime] = None
+    """
+    The expiration time on or after which the JWT MUST NOT be accepted for
+    processing.
+    """
+
+    issued_on: Optional[datetime] = None
+    """The time on which the token was created."""
+
+    last_used_on: Optional[datetime] = None
+    """Last time the token was used."""
+
+    modified_on: Optional[datetime] = None
+    """Last time the token was modified."""
+
+    name: Optional[str] = None
+    """Token name."""
+
+    not_before: Optional[datetime] = None
+    """The time before which the token MUST NOT be accepted for processing."""
+
+    policies: Optional[List[TokenPolicy]] = None
+    """List of access policies assigned to the token."""
+
+    status: Optional[Literal["active", "disabled", "expired"]] = None
+    """Status of the token."""
+
+    value: Optional[TokenValue] = None
+    """The token value."""
diff --git a/src/cloudflare/types/accounts/token_delete_response.py b/src/cloudflare/types/accounts/token_delete_response.py
new file mode 100644
index 00000000000..2229135e433
--- /dev/null
+++ b/src/cloudflare/types/accounts/token_delete_response.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["TokenDeleteResponse"]
+
+
+class TokenDeleteResponse(BaseModel):
+    id: str
+    """Identifier"""
diff --git a/src/cloudflare/types/accounts/token_list_params.py b/src/cloudflare/types/accounts/token_list_params.py
new file mode 100644
index 00000000000..7a9ded98d9e
--- /dev/null
+++ b/src/cloudflare/types/accounts/token_list_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["TokenListParams"]
+
+
+class TokenListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    direction: Literal["asc", "desc"]
+    """Direction to order results."""
+
+    page: float
+    """Page number of paginated results."""
+
+    per_page: float
+    """Maximum number of results per page."""
diff --git a/src/cloudflare/types/accounts/token_update_params.py b/src/cloudflare/types/accounts/token_update_params.py
new file mode 100644
index 00000000000..524886308b0
--- /dev/null
+++ b/src/cloudflare/types/accounts/token_update_params.py
@@ -0,0 +1,60 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from datetime import datetime
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+from ..shared_params.token_policy import TokenPolicy
+from ..shared.token_condition_cidr_list import TokenConditionCIDRList
+
+__all__ = ["TokenUpdateParams", "Condition", "ConditionRequestIP"]
+
+
+class TokenUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    name: Required[str]
+    """Token name."""
+
+    policies: Required[Iterable[TokenPolicy]]
+    """List of access policies assigned to the token."""
+
+    condition: Condition
+
+    expires_on: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """
+    The expiration time on or after which the JWT MUST NOT be accepted for
+    processing.
+    """
+
+    not_before: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """The time before which the token MUST NOT be accepted for processing."""
+
+    status: Literal["active", "disabled", "expired"]
+    """Status of the token."""
+
+
+_ConditionRequestIPReservedKeywords = TypedDict(
+    "_ConditionRequestIPReservedKeywords",
+    {
+        "in": SequenceNotStr[TokenConditionCIDRList],
+    },
+    total=False,
+)
+
+
+class ConditionRequestIP(_ConditionRequestIPReservedKeywords, total=False):
+    """Client IP restrictions."""
+
+    not_in: SequenceNotStr[TokenConditionCIDRList]
+    """List of IPv4/IPv6 CIDR addresses."""
+
+
+class Condition(TypedDict, total=False):
+    request_ip: ConditionRequestIP
+    """Client IP restrictions."""
diff --git a/src/cloudflare/types/accounts/token_verify_response.py b/src/cloudflare/types/accounts/token_verify_response.py
new file mode 100644
index 00000000000..76a6a85ed62
--- /dev/null
+++ b/src/cloudflare/types/accounts/token_verify_response.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["TokenVerifyResponse"]
+
+
+class TokenVerifyResponse(BaseModel):
+    id: str
+    """Token identifier tag."""
+
+    status: Literal["active", "disabled", "expired"]
+    """Status of the token."""
+
+    expires_on: Optional[datetime] = None
+    """
+    The expiration time on or after which the JWT MUST NOT be accepted for
+    processing.
+    """
+
+    not_before: Optional[datetime] = None
+    """The time before which the token MUST NOT be accepted for processing."""
diff --git a/src/cloudflare/types/accounts/tokens/__init__.py b/src/cloudflare/types/accounts/tokens/__init__.py
new file mode 100644
index 00000000000..249ef18bc57
--- /dev/null
+++ b/src/cloudflare/types/accounts/tokens/__init__.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .value_update_params import ValueUpdateParams as ValueUpdateParams
+from .permission_group_get_params import PermissionGroupGetParams as PermissionGroupGetParams
+from .permission_group_list_params import PermissionGroupListParams as PermissionGroupListParams
+from .permission_group_get_response import PermissionGroupGetResponse as PermissionGroupGetResponse
+from .permission_group_list_response import PermissionGroupListResponse as PermissionGroupListResponse
diff --git a/src/cloudflare/types/accounts/tokens/permission_group_get_params.py b/src/cloudflare/types/accounts/tokens/permission_group_get_params.py
new file mode 100644
index 00000000000..c91ca4db066
--- /dev/null
+++ b/src/cloudflare/types/accounts/tokens/permission_group_get_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["PermissionGroupGetParams"]
+
+
+class PermissionGroupGetParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    name: str
+    """Filter by the name of the permission group. The value must be URL-encoded."""
+
+    scope: str
+    """Filter by the scope of the permission group. The value must be URL-encoded."""
diff --git a/src/cloudflare/types/accounts/tokens/permission_group_get_response.py b/src/cloudflare/types/accounts/tokens/permission_group_get_response.py
new file mode 100644
index 00000000000..81d6a1d88ba
--- /dev/null
+++ b/src/cloudflare/types/accounts/tokens/permission_group_get_response.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal, TypeAlias
+
+from ...._models import BaseModel
+
+__all__ = ["PermissionGroupGetResponse", "PermissionGroupGetResponseItem"]
+
+
+class PermissionGroupGetResponseItem(BaseModel):
+    id: Optional[str] = None
+    """Public ID."""
+
+    name: Optional[str] = None
+    """Permission Group Name"""
+
+    scopes: Optional[
+        List[
+            Literal[
+                "com.cloudflare.api.account",
+                "com.cloudflare.api.account.zone",
+                "com.cloudflare.api.user",
+                "com.cloudflare.edge.r2.bucket",
+            ]
+        ]
+    ] = None
+    """Resources to which the Permission Group is scoped"""
+
+
+PermissionGroupGetResponse: TypeAlias = List[PermissionGroupGetResponseItem]
diff --git a/src/cloudflare/types/accounts/tokens/permission_group_list_params.py b/src/cloudflare/types/accounts/tokens/permission_group_list_params.py
new file mode 100644
index 00000000000..3a3000cb8a6
--- /dev/null
+++ b/src/cloudflare/types/accounts/tokens/permission_group_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["PermissionGroupListParams"]
+
+
+class PermissionGroupListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    name: str
+    """Filter by the name of the permission group. The value must be URL-encoded."""
+
+    scope: str
+    """Filter by the scope of the permission group. The value must be URL-encoded."""
diff --git a/src/cloudflare/types/accounts/tokens/permission_group_list_response.py b/src/cloudflare/types/accounts/tokens/permission_group_list_response.py
new file mode 100644
index 00000000000..b34b7ff89c2
--- /dev/null
+++ b/src/cloudflare/types/accounts/tokens/permission_group_list_response.py
@@ -0,0 +1,28 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["PermissionGroupListResponse"]
+
+
+class PermissionGroupListResponse(BaseModel):
+    id: Optional[str] = None
+    """Public ID."""
+
+    name: Optional[str] = None
+    """Permission Group Name"""
+
+    scopes: Optional[
+        List[
+            Literal[
+                "com.cloudflare.api.account",
+                "com.cloudflare.api.account.zone",
+                "com.cloudflare.api.user",
+                "com.cloudflare.edge.r2.bucket",
+            ]
+        ]
+    ] = None
+    """Resources to which the Permission Group is scoped"""
diff --git a/src/cloudflare/types/accounts/tokens/value_update_params.py b/src/cloudflare/types/accounts/tokens/value_update_params.py
new file mode 100644
index 00000000000..a70fab2ae59
--- /dev/null
+++ b/src/cloudflare/types/accounts/tokens/value_update_params.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ValueUpdateParams"]
+
+
+class ValueUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    body: Required[object]
diff --git a/src/cloudflare/types/acm/__init__.py b/src/cloudflare/types/acm/__init__.py
index 3e75a50890f..9a1d8d08f7f 100644
--- a/src/cloudflare/types/acm/__init__.py
+++ b/src/cloudflare/types/acm/__init__.py
@@ -3,6 +3,8 @@
 from __future__ import annotations
 
 from .certificate_authority import CertificateAuthority as CertificateAuthority
+from .total_tls_edit_params import TotalTLSEditParams as TotalTLSEditParams
 from .total_tls_get_response import TotalTLSGetResponse as TotalTLSGetResponse
-from .total_tls_create_params import TotalTLSCreateParams as TotalTLSCreateParams
-from .total_tls_create_response import TotalTLSCreateResponse as TotalTLSCreateResponse
+from .total_tls_edit_response import TotalTLSEditResponse as TotalTLSEditResponse
+from .total_tls_update_params import TotalTLSUpdateParams as TotalTLSUpdateParams
+from .total_tls_update_response import TotalTLSUpdateResponse as TotalTLSUpdateResponse
diff --git a/src/cloudflare/types/acm/certificate_authority.py b/src/cloudflare/types/acm/certificate_authority.py
index 74ff1407188..aedf043e537 100644
--- a/src/cloudflare/types/acm/certificate_authority.py
+++ b/src/cloudflare/types/acm/certificate_authority.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["CertificateAuthority"]
 
-CertificateAuthority = Literal["google", "lets_encrypt"]
+CertificateAuthority: TypeAlias = Literal["google", "lets_encrypt", "ssl_com"]
diff --git a/src/cloudflare/types/acm/total_tls_create_params.py b/src/cloudflare/types/acm/total_tls_create_params.py
deleted file mode 100644
index aa49802762e..00000000000
--- a/src/cloudflare/types/acm/total_tls_create_params.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-from .certificate_authority import CertificateAuthority
-
-__all__ = ["TotalTLSCreateParams"]
-
-
-class TotalTLSCreateParams(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    enabled: Required[bool]
-    """
-    If enabled, Total TLS will order a hostname specific TLS certificate for any
-    proxied A, AAAA, or CNAME record in your zone.
-    """
-
-    certificate_authority: CertificateAuthority
-    """The Certificate Authority that Total TLS certificates will be issued through."""
diff --git a/src/cloudflare/types/acm/total_tls_create_response.py b/src/cloudflare/types/acm/total_tls_create_response.py
deleted file mode 100644
index 36bb25cef77..00000000000
--- a/src/cloudflare/types/acm/total_tls_create_response.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-from .certificate_authority import CertificateAuthority
-
-__all__ = ["TotalTLSCreateResponse"]
-
-
-class TotalTLSCreateResponse(BaseModel):
-    certificate_authority: Optional[CertificateAuthority] = None
-    """The Certificate Authority that Total TLS certificates will be issued through."""
-
-    enabled: Optional[bool] = None
-    """
-    If enabled, Total TLS will order a hostname specific TLS certificate for any
-    proxied A, AAAA, or CNAME record in your zone.
-    """
-
-    validity_days: Optional[Literal[90]] = None
-    """The validity period in days for the certificates ordered via Total TLS."""
diff --git a/src/cloudflare/types/acm/total_tls_edit_params.py b/src/cloudflare/types/acm/total_tls_edit_params.py
new file mode 100644
index 00000000000..defd75ebdd5
--- /dev/null
+++ b/src/cloudflare/types/acm/total_tls_edit_params.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from .certificate_authority import CertificateAuthority
+
+__all__ = ["TotalTLSEditParams"]
+
+
+class TotalTLSEditParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    enabled: Required[bool]
+    """
+    If enabled, Total TLS will order a hostname specific TLS certificate for any
+    proxied A, AAAA, or CNAME record in your zone.
+    """
+
+    certificate_authority: CertificateAuthority
+    """The Certificate Authority that Total TLS certificates will be issued through."""
diff --git a/src/cloudflare/types/acm/total_tls_edit_response.py b/src/cloudflare/types/acm/total_tls_edit_response.py
new file mode 100644
index 00000000000..0a6b7fcc8b9
--- /dev/null
+++ b/src/cloudflare/types/acm/total_tls_edit_response.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+from .certificate_authority import CertificateAuthority
+
+__all__ = ["TotalTLSEditResponse"]
+
+
+class TotalTLSEditResponse(BaseModel):
+    certificate_authority: Optional[CertificateAuthority] = None
+    """The Certificate Authority that Total TLS certificates will be issued through."""
+
+    enabled: Optional[bool] = None
+    """
+    If enabled, Total TLS will order a hostname specific TLS certificate for any
+    proxied A, AAAA, or CNAME record in your zone.
+    """
+
+    validity_period: Optional[Literal[90]] = None
+    """The validity period in days for the certificates ordered via Total TLS."""
diff --git a/src/cloudflare/types/acm/total_tls_get_response.py b/src/cloudflare/types/acm/total_tls_get_response.py
index b2d6953e68b..41f51a7acac 100644
--- a/src/cloudflare/types/acm/total_tls_get_response.py
+++ b/src/cloudflare/types/acm/total_tls_get_response.py
@@ -19,5 +19,5 @@ class TotalTLSGetResponse(BaseModel):
     proxied A, AAAA, or CNAME record in your zone.
     """
 
-    validity_days: Optional[Literal[90]] = None
+    validity_period: Optional[Literal[90]] = None
     """The validity period in days for the certificates ordered via Total TLS."""
diff --git a/src/cloudflare/types/acm/total_tls_update_params.py b/src/cloudflare/types/acm/total_tls_update_params.py
new file mode 100644
index 00000000000..8a100d6e937
--- /dev/null
+++ b/src/cloudflare/types/acm/total_tls_update_params.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from .certificate_authority import CertificateAuthority
+
+__all__ = ["TotalTLSUpdateParams"]
+
+
+class TotalTLSUpdateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    enabled: Required[bool]
+    """
+    If enabled, Total TLS will order a hostname specific TLS certificate for any
+    proxied A, AAAA, or CNAME record in your zone.
+    """
+
+    certificate_authority: CertificateAuthority
+    """The Certificate Authority that Total TLS certificates will be issued through."""
diff --git a/src/cloudflare/types/acm/total_tls_update_response.py b/src/cloudflare/types/acm/total_tls_update_response.py
new file mode 100644
index 00000000000..ab507c7061d
--- /dev/null
+++ b/src/cloudflare/types/acm/total_tls_update_response.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+from .certificate_authority import CertificateAuthority
+
+__all__ = ["TotalTLSUpdateResponse"]
+
+
+class TotalTLSUpdateResponse(BaseModel):
+    certificate_authority: Optional[CertificateAuthority] = None
+    """The Certificate Authority that Total TLS certificates will be issued through."""
+
+    enabled: Optional[bool] = None
+    """
+    If enabled, Total TLS will order a hostname specific TLS certificate for any
+    proxied A, AAAA, or CNAME record in your zone.
+    """
+
+    validity_period: Optional[Literal[90]] = None
+    """The validity period in days for the certificates ordered via Total TLS."""
diff --git a/src/cloudflare/types/addressing/address_map.py b/src/cloudflare/types/addressing/address_map.py
index dff7660e50c..1ff0f0ab4f2 100644
--- a/src/cloudflare/types/addressing/address_map.py
+++ b/src/cloudflare/types/addressing/address_map.py
@@ -10,7 +10,7 @@
 
 class AddressMap(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier of an Address Map."""
 
     can_delete: Optional[bool] = None
     """If set to false, then the Address Map cannot be deleted via API.
diff --git a/src/cloudflare/types/addressing/address_map_create_params.py b/src/cloudflare/types/addressing/address_map_create_params.py
index b0eae43afc8..7437032d536 100644
--- a/src/cloudflare/types/addressing/address_map_create_params.py
+++ b/src/cloudflare/types/addressing/address_map_create_params.py
@@ -2,19 +2,18 @@
 
 from __future__ import annotations
 
-from typing import List, Union, Iterable, Optional
-from datetime import datetime
-from typing_extensions import Required, Annotated, TypedDict
+from typing import Iterable, Optional
+from typing_extensions import Required, TypedDict
 
 from .kind import Kind
-from ..._utils import PropertyInfo
+from ..._types import SequenceNotStr
 
 __all__ = ["AddressMapCreateParams", "Membership"]
 
 
 class AddressMapCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier of a Cloudflare account."""
 
     description: Optional[str]
     """
@@ -29,7 +28,7 @@ class AddressMapCreateParams(TypedDict, total=False):
     map is enabled.
     """
 
-    ips: List[str]
+    ips: SequenceNotStr[str]
 
     memberships: Iterable[Membership]
     """Zones and Accounts which will be assigned IPs on this Address Map.
@@ -39,8 +38,6 @@ class AddressMapCreateParams(TypedDict, total=False):
 
 
 class Membership(TypedDict, total=False):
-    created_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-
     identifier: str
     """The identifier for the membership (eg. a zone or account tag)."""
 
diff --git a/src/cloudflare/types/addressing/address_map_create_response.py b/src/cloudflare/types/addressing/address_map_create_response.py
index 032e1166d18..ac50d140e86 100644
--- a/src/cloudflare/types/addressing/address_map_create_response.py
+++ b/src/cloudflare/types/addressing/address_map_create_response.py
@@ -4,16 +4,10 @@
 from datetime import datetime
 
 from .kind import Kind
+from ..ips.ips import IPs
 from ..._models import BaseModel
 
-__all__ = ["AddressMapCreateResponse", "IP", "Membership"]
-
-
-class IP(BaseModel):
-    created_at: Optional[datetime] = None
-
-    ip: Optional[str] = None
-    """An IPv4 or IPv6 address."""
+__all__ = ["AddressMapCreateResponse", "Membership"]
 
 
 class Membership(BaseModel):
@@ -31,7 +25,7 @@ class Membership(BaseModel):
 
 class AddressMapCreateResponse(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier of an Address Map."""
 
     can_delete: Optional[bool] = None
     """If set to false, then the Address Map cannot be deleted via API.
@@ -69,7 +63,7 @@ class AddressMapCreateResponse(BaseModel):
     map is enabled.
     """
 
-    ips: Optional[List[IP]] = None
+    ips: Optional[IPs] = None
     """The set of IPs on the Address Map."""
 
     memberships: Optional[List[Membership]] = None
diff --git a/src/cloudflare/types/addressing/address_map_delete_response.py b/src/cloudflare/types/addressing/address_map_delete_response.py
index f9c7d73ddf8..033db6851d3 100644
--- a/src/cloudflare/types/addressing/address_map_delete_response.py
+++ b/src/cloudflare/types/addressing/address_map_delete_response.py
@@ -1,7 +1,61 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
+from typing_extensions import Literal
 
-__all__ = ["AddressMapDeleteResponse"]
+from ..._models import BaseModel
 
-AddressMapDeleteResponse = List[object]
+__all__ = ["AddressMapDeleteResponse", "Error", "ErrorSource", "Message", "MessageSource", "ResultInfo"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class ResultInfo(BaseModel):
+    count: Optional[float] = None
+    """Total number of results for the requested service."""
+
+    page: Optional[float] = None
+    """Current page within paginated list of results."""
+
+    per_page: Optional[float] = None
+    """Number of results per page of results."""
+
+    total_count: Optional[float] = None
+    """Total results available without any search parameters."""
+
+
+class AddressMapDeleteResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
+
+    result_info: Optional[ResultInfo] = None
diff --git a/src/cloudflare/types/addressing/address_map_edit_params.py b/src/cloudflare/types/addressing/address_map_edit_params.py
index 5d91c15dab3..78a94270693 100644
--- a/src/cloudflare/types/addressing/address_map_edit_params.py
+++ b/src/cloudflare/types/addressing/address_map_edit_params.py
@@ -10,7 +10,7 @@
 
 class AddressMapEditParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier of a Cloudflare account."""
 
     default_sni: Optional[str]
     """
diff --git a/src/cloudflare/types/addressing/address_map_get_response.py b/src/cloudflare/types/addressing/address_map_get_response.py
index 0eb306ccdbd..aa6a1c2233c 100644
--- a/src/cloudflare/types/addressing/address_map_get_response.py
+++ b/src/cloudflare/types/addressing/address_map_get_response.py
@@ -4,16 +4,10 @@
 from datetime import datetime
 
 from .kind import Kind
+from ..ips.ips import IPs
 from ..._models import BaseModel
 
-__all__ = ["AddressMapGetResponse", "IP", "Membership"]
-
-
-class IP(BaseModel):
-    created_at: Optional[datetime] = None
-
-    ip: Optional[str] = None
-    """An IPv4 or IPv6 address."""
+__all__ = ["AddressMapGetResponse", "Membership"]
 
 
 class Membership(BaseModel):
@@ -31,7 +25,7 @@ class Membership(BaseModel):
 
 class AddressMapGetResponse(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier of an Address Map."""
 
     can_delete: Optional[bool] = None
     """If set to false, then the Address Map cannot be deleted via API.
@@ -69,7 +63,7 @@ class AddressMapGetResponse(BaseModel):
     map is enabled.
     """
 
-    ips: Optional[List[IP]] = None
+    ips: Optional[IPs] = None
     """The set of IPs on the Address Map."""
 
     memberships: Optional[List[Membership]] = None
diff --git a/src/cloudflare/types/addressing/address_maps/account_delete_response.py b/src/cloudflare/types/addressing/address_maps/account_delete_response.py
index 30142d8d8e1..d1ca6f5454b 100644
--- a/src/cloudflare/types/addressing/address_maps/account_delete_response.py
+++ b/src/cloudflare/types/addressing/address_maps/account_delete_response.py
@@ -1,7 +1,61 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
+from typing_extensions import Literal
 
-__all__ = ["AccountDeleteResponse"]
+from ...._models import BaseModel
 
-AccountDeleteResponse = List[object]
+__all__ = ["AccountDeleteResponse", "Error", "ErrorSource", "Message", "MessageSource", "ResultInfo"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class ResultInfo(BaseModel):
+    count: Optional[float] = None
+    """Total number of results for the requested service."""
+
+    page: Optional[float] = None
+    """Current page within paginated list of results."""
+
+    per_page: Optional[float] = None
+    """Number of results per page of results."""
+
+    total_count: Optional[float] = None
+    """Total results available without any search parameters."""
+
+
+class AccountDeleteResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
+
+    result_info: Optional[ResultInfo] = None
diff --git a/src/cloudflare/types/addressing/address_maps/account_update_params.py b/src/cloudflare/types/addressing/address_maps/account_update_params.py
index f06483675c1..ff618f7f917 100644
--- a/src/cloudflare/types/addressing/address_maps/account_update_params.py
+++ b/src/cloudflare/types/addressing/address_maps/account_update_params.py
@@ -9,6 +9,6 @@
 
 class AccountUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier of a Cloudflare account."""
 
     body: Required[object]
diff --git a/src/cloudflare/types/addressing/address_maps/account_update_response.py b/src/cloudflare/types/addressing/address_maps/account_update_response.py
index 946503210f5..dd6b73c5770 100644
--- a/src/cloudflare/types/addressing/address_maps/account_update_response.py
+++ b/src/cloudflare/types/addressing/address_maps/account_update_response.py
@@ -1,7 +1,61 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
+from typing_extensions import Literal
 
-__all__ = ["AccountUpdateResponse"]
+from ...._models import BaseModel
 
-AccountUpdateResponse = List[object]
+__all__ = ["AccountUpdateResponse", "Error", "ErrorSource", "Message", "MessageSource", "ResultInfo"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class ResultInfo(BaseModel):
+    count: Optional[float] = None
+    """Total number of results for the requested service."""
+
+    page: Optional[float] = None
+    """Current page within paginated list of results."""
+
+    per_page: Optional[float] = None
+    """Number of results per page of results."""
+
+    total_count: Optional[float] = None
+    """Total results available without any search parameters."""
+
+
+class AccountUpdateResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
+
+    result_info: Optional[ResultInfo] = None
diff --git a/src/cloudflare/types/addressing/address_maps/ip_delete_response.py b/src/cloudflare/types/addressing/address_maps/ip_delete_response.py
index 1559d31d584..8ecaf2f4aef 100644
--- a/src/cloudflare/types/addressing/address_maps/ip_delete_response.py
+++ b/src/cloudflare/types/addressing/address_maps/ip_delete_response.py
@@ -1,7 +1,61 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
+from typing_extensions import Literal
 
-__all__ = ["IPDeleteResponse"]
+from ...._models import BaseModel
 
-IPDeleteResponse = List[object]
+__all__ = ["IPDeleteResponse", "Error", "ErrorSource", "Message", "MessageSource", "ResultInfo"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class ResultInfo(BaseModel):
+    count: Optional[float] = None
+    """Total number of results for the requested service."""
+
+    page: Optional[float] = None
+    """Current page within paginated list of results."""
+
+    per_page: Optional[float] = None
+    """Number of results per page of results."""
+
+    total_count: Optional[float] = None
+    """Total results available without any search parameters."""
+
+
+class IPDeleteResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
+
+    result_info: Optional[ResultInfo] = None
diff --git a/src/cloudflare/types/addressing/address_maps/ip_update_params.py b/src/cloudflare/types/addressing/address_maps/ip_update_params.py
index 41cd04d50b1..7c4e1611411 100644
--- a/src/cloudflare/types/addressing/address_maps/ip_update_params.py
+++ b/src/cloudflare/types/addressing/address_maps/ip_update_params.py
@@ -9,9 +9,9 @@
 
 class IPUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier of a Cloudflare account."""
 
     address_map_id: Required[str]
-    """Identifier"""
+    """Identifier of an Address Map."""
 
     body: Required[object]
diff --git a/src/cloudflare/types/addressing/address_maps/ip_update_response.py b/src/cloudflare/types/addressing/address_maps/ip_update_response.py
index 6db8b575a14..93eba6ec548 100644
--- a/src/cloudflare/types/addressing/address_maps/ip_update_response.py
+++ b/src/cloudflare/types/addressing/address_maps/ip_update_response.py
@@ -1,7 +1,61 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
+from typing_extensions import Literal
 
-__all__ = ["IPUpdateResponse"]
+from ...._models import BaseModel
 
-IPUpdateResponse = List[object]
+__all__ = ["IPUpdateResponse", "Error", "ErrorSource", "Message", "MessageSource", "ResultInfo"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class ResultInfo(BaseModel):
+    count: Optional[float] = None
+    """Total number of results for the requested service."""
+
+    page: Optional[float] = None
+    """Current page within paginated list of results."""
+
+    per_page: Optional[float] = None
+    """Number of results per page of results."""
+
+    total_count: Optional[float] = None
+    """Total results available without any search parameters."""
+
+
+class IPUpdateResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
+
+    result_info: Optional[ResultInfo] = None
diff --git a/src/cloudflare/types/addressing/address_maps/zone_delete_response.py b/src/cloudflare/types/addressing/address_maps/zone_delete_response.py
index c03361c6def..48f93c61b5b 100644
--- a/src/cloudflare/types/addressing/address_maps/zone_delete_response.py
+++ b/src/cloudflare/types/addressing/address_maps/zone_delete_response.py
@@ -1,7 +1,61 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
+from typing_extensions import Literal
 
-__all__ = ["ZoneDeleteResponse"]
+from ...._models import BaseModel
 
-ZoneDeleteResponse = List[object]
+__all__ = ["ZoneDeleteResponse", "Error", "ErrorSource", "Message", "MessageSource", "ResultInfo"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class ResultInfo(BaseModel):
+    count: Optional[float] = None
+    """Total number of results for the requested service."""
+
+    page: Optional[float] = None
+    """Current page within paginated list of results."""
+
+    per_page: Optional[float] = None
+    """Number of results per page of results."""
+
+    total_count: Optional[float] = None
+    """Total results available without any search parameters."""
+
+
+class ZoneDeleteResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
+
+    result_info: Optional[ResultInfo] = None
diff --git a/src/cloudflare/types/addressing/address_maps/zone_update_params.py b/src/cloudflare/types/addressing/address_maps/zone_update_params.py
index 3cd7060a7ed..04047f85fc0 100644
--- a/src/cloudflare/types/addressing/address_maps/zone_update_params.py
+++ b/src/cloudflare/types/addressing/address_maps/zone_update_params.py
@@ -9,9 +9,9 @@
 
 class ZoneUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier of a zone."""
 
     account_id: Required[str]
-    """Identifier"""
+    """Identifier of a Cloudflare account."""
 
     body: Required[object]
diff --git a/src/cloudflare/types/addressing/address_maps/zone_update_response.py b/src/cloudflare/types/addressing/address_maps/zone_update_response.py
index 40c1da23a29..f4ee09df073 100644
--- a/src/cloudflare/types/addressing/address_maps/zone_update_response.py
+++ b/src/cloudflare/types/addressing/address_maps/zone_update_response.py
@@ -1,7 +1,61 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
+from typing_extensions import Literal
 
-__all__ = ["ZoneUpdateResponse"]
+from ...._models import BaseModel
 
-ZoneUpdateResponse = List[object]
+__all__ = ["ZoneUpdateResponse", "Error", "ErrorSource", "Message", "MessageSource", "ResultInfo"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class ResultInfo(BaseModel):
+    count: Optional[float] = None
+    """Total number of results for the requested service."""
+
+    page: Optional[float] = None
+    """Current page within paginated list of results."""
+
+    per_page: Optional[float] = None
+    """Number of results per page of results."""
+
+    total_count: Optional[float] = None
+    """Total results available without any search parameters."""
+
+
+class ZoneUpdateResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
+
+    result_info: Optional[ResultInfo] = None
diff --git a/src/cloudflare/types/addressing/kind.py b/src/cloudflare/types/addressing/kind.py
index 5e706ccd7e3..7efd73f1c25 100644
--- a/src/cloudflare/types/addressing/kind.py
+++ b/src/cloudflare/types/addressing/kind.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["Kind"]
 
-Kind = Literal["zone", "account"]
+Kind: TypeAlias = Literal["zone", "account"]
diff --git a/src/cloudflare/types/addressing/loa_document_create_params.py b/src/cloudflare/types/addressing/loa_document_create_params.py
index 4f8da69a2a5..3ea6bd6de69 100644
--- a/src/cloudflare/types/addressing/loa_document_create_params.py
+++ b/src/cloudflare/types/addressing/loa_document_create_params.py
@@ -9,7 +9,7 @@
 
 class LOADocumentCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier of a Cloudflare account."""
 
     loa_document: Required[str]
     """LOA document to upload."""
diff --git a/src/cloudflare/types/addressing/loa_document_create_response.py b/src/cloudflare/types/addressing/loa_document_create_response.py
index f621a9f2db4..453f199eb6b 100644
--- a/src/cloudflare/types/addressing/loa_document_create_response.py
+++ b/src/cloudflare/types/addressing/loa_document_create_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from datetime import datetime
 
 from ..._models import BaseModel
 
@@ -8,5 +9,25 @@
 
 
 class LOADocumentCreateResponse(BaseModel):
+    id: Optional[str] = None
+    """Identifier for the uploaded LOA document."""
+
+    account_id: Optional[str] = None
+    """Identifier of a Cloudflare account."""
+
+    auto_generated: Optional[bool] = None
+    """Whether the LOA has been auto-generated for the prefix owner by Cloudflare."""
+
+    created: Optional[datetime] = None
+
     filename: Optional[str] = None
-    """Name of LOA document."""
+    """Name of LOA document. Max file size 10MB, and supported filetype is pdf."""
+
+    size_bytes: Optional[int] = None
+    """File size of the uploaded LOA document."""
+
+    verified: Optional[bool] = None
+    """Whether the LOA has been verified by Cloudflare staff."""
+
+    verified_at: Optional[datetime] = None
+    """Timestamp of the moment the LOA was marked as validated."""
diff --git a/src/cloudflare/types/addressing/prefix.py b/src/cloudflare/types/addressing/prefix.py
index 9dd12947704..3030ac71268 100644
--- a/src/cloudflare/types/addressing/prefix.py
+++ b/src/cloudflare/types/addressing/prefix.py
@@ -10,10 +10,10 @@
 
 class Prefix(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier of an IP Prefix."""
 
     account_id: Optional[str] = None
-    """Identifier"""
+    """Identifier of a Cloudflare account."""
 
     advertised: Optional[bool] = None
     """Prefix advertisement status to the Internet.
@@ -38,9 +38,18 @@ class Prefix(BaseModel):
 
     created_at: Optional[datetime] = None
 
+    delegate_loa_creation: Optional[bool] = None
+    """
+    Whether Cloudflare is allowed to generate the LOA document on behalf of the
+    prefix owner.
+    """
+
     description: Optional[str] = None
     """Description of the prefix."""
 
+    irr_validation_state: Optional[str] = None
+    """State of one kind of validation for an IP prefix."""
+
     loa_document_id: Optional[str] = None
     """Identifier for the uploaded LOA document."""
 
@@ -57,3 +66,12 @@ class Prefix(BaseModel):
     Whether advertisement status of the prefix is locked, meaning it cannot be
     changed.
     """
+
+    ownership_validation_state: Optional[str] = None
+    """State of one kind of validation for an IP prefix."""
+
+    ownership_validation_token: Optional[str] = None
+    """Token provided to demonstrate ownership of the prefix."""
+
+    rpki_validation_state: Optional[str] = None
+    """State of one kind of validation for an IP prefix."""
diff --git a/src/cloudflare/types/addressing/prefix_create_params.py b/src/cloudflare/types/addressing/prefix_create_params.py
index edbe51ebcf4..86828ed1d96 100644
--- a/src/cloudflare/types/addressing/prefix_create_params.py
+++ b/src/cloudflare/types/addressing/prefix_create_params.py
@@ -10,13 +10,22 @@
 
 class PrefixCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier of a Cloudflare account."""
 
-    asn: Required[Optional[int]]
+    asn: Required[int]
     """Autonomous System Number (ASN) the prefix will be advertised under."""
 
     cidr: Required[str]
     """IP Prefix in Classless Inter-Domain Routing format."""
 
-    loa_document_id: Required[Optional[str]]
+    delegate_loa_creation: bool
+    """
+    Whether Cloudflare is allowed to generate the LOA document on behalf of the
+    prefix owner.
+    """
+
+    description: str
+    """Description of the prefix."""
+
+    loa_document_id: Optional[str]
     """Identifier for the uploaded LOA document."""
diff --git a/src/cloudflare/types/addressing/prefix_delete_response.py b/src/cloudflare/types/addressing/prefix_delete_response.py
index 333f820274b..b9cee8e3a4c 100644
--- a/src/cloudflare/types/addressing/prefix_delete_response.py
+++ b/src/cloudflare/types/addressing/prefix_delete_response.py
@@ -1,7 +1,45 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
+from typing_extensions import Literal
 
-__all__ = ["PrefixDeleteResponse"]
+from ..._models import BaseModel
 
-PrefixDeleteResponse = List[object]
+__all__ = ["PrefixDeleteResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class PrefixDeleteResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/addressing/prefix_edit_params.py b/src/cloudflare/types/addressing/prefix_edit_params.py
index 9f4b08a8b40..b1ad60bb46f 100644
--- a/src/cloudflare/types/addressing/prefix_edit_params.py
+++ b/src/cloudflare/types/addressing/prefix_edit_params.py
@@ -9,7 +9,7 @@
 
 class PrefixEditParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier of a Cloudflare account."""
 
     description: Required[str]
     """Description of the prefix."""
diff --git a/src/cloudflare/types/addressing/prefixes/__init__.py b/src/cloudflare/types/addressing/prefixes/__init__.py
index 3f5ae7763da..70970ffbada 100644
--- a/src/cloudflare/types/addressing/prefixes/__init__.py
+++ b/src/cloudflare/types/addressing/prefixes/__init__.py
@@ -2,6 +2,15 @@
 
 from __future__ import annotations
 
+from .bgp_prefix import BGPPrefix as BGPPrefix
 from .delegations import Delegations as Delegations
+from .service_binding import ServiceBinding as ServiceBinding
+from .bgp_prefix_edit_params import BGPPrefixEditParams as BGPPrefixEditParams
+from .bgp_prefix_create_params import BGPPrefixCreateParams as BGPPrefixCreateParams
 from .delegation_create_params import DelegationCreateParams as DelegationCreateParams
 from .delegation_delete_response import DelegationDeleteResponse as DelegationDeleteResponse
+from .service_binding_create_params import ServiceBindingCreateParams as ServiceBindingCreateParams
+from .service_binding_delete_response import ServiceBindingDeleteResponse as ServiceBindingDeleteResponse
+from .advertisement_status_edit_params import AdvertisementStatusEditParams as AdvertisementStatusEditParams
+from .advertisement_status_get_response import AdvertisementStatusGetResponse as AdvertisementStatusGetResponse
+from .advertisement_status_edit_response import AdvertisementStatusEditResponse as AdvertisementStatusEditResponse
diff --git a/src/cloudflare/types/addressing/prefixes/advertisement_status_edit_params.py b/src/cloudflare/types/addressing/prefixes/advertisement_status_edit_params.py
new file mode 100644
index 00000000000..5de84a7f1d0
--- /dev/null
+++ b/src/cloudflare/types/addressing/prefixes/advertisement_status_edit_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["AdvertisementStatusEditParams"]
+
+
+class AdvertisementStatusEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier of a Cloudflare account."""
+
+    advertised: Required[bool]
+    """Advertisement status of the prefix.
+
+    If `true`, the BGP route for the prefix is advertised to the Internet. If
+    `false`, the BGP route is withdrawn.
+    """
diff --git a/src/cloudflare/types/addressing/prefixes/advertisement_status_edit_response.py b/src/cloudflare/types/addressing/prefixes/advertisement_status_edit_response.py
new file mode 100644
index 00000000000..3c32d04dfcd
--- /dev/null
+++ b/src/cloudflare/types/addressing/prefixes/advertisement_status_edit_response.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["AdvertisementStatusEditResponse"]
+
+
+class AdvertisementStatusEditResponse(BaseModel):
+    advertised: Optional[bool] = None
+    """Advertisement status of the prefix.
+
+    If `true`, the BGP route for the prefix is advertised to the Internet. If
+    `false`, the BGP route is withdrawn.
+    """
+
+    advertised_modified_at: Optional[datetime] = None
+    """Last time the advertisement status was changed.
+
+    This field is only not 'null' if on demand is enabled.
+    """
diff --git a/src/cloudflare/types/addressing/prefixes/advertisement_status_get_response.py b/src/cloudflare/types/addressing/prefixes/advertisement_status_get_response.py
new file mode 100644
index 00000000000..86260979361
--- /dev/null
+++ b/src/cloudflare/types/addressing/prefixes/advertisement_status_get_response.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["AdvertisementStatusGetResponse"]
+
+
+class AdvertisementStatusGetResponse(BaseModel):
+    advertised: Optional[bool] = None
+    """Advertisement status of the prefix.
+
+    If `true`, the BGP route for the prefix is advertised to the Internet. If
+    `false`, the BGP route is withdrawn.
+    """
+
+    advertised_modified_at: Optional[datetime] = None
+    """Last time the advertisement status was changed.
+
+    This field is only not 'null' if on demand is enabled.
+    """
diff --git a/src/cloudflare/types/addressing/prefixes/bgp/__init__.py b/src/cloudflare/types/addressing/prefixes/bgp/__init__.py
deleted file mode 100644
index bf70ca01135..00000000000
--- a/src/cloudflare/types/addressing/prefixes/bgp/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from .bgp_prefix import BGPPrefix as BGPPrefix
-from .service_binding import ServiceBinding as ServiceBinding
-from .prefix_edit_params import PrefixEditParams as PrefixEditParams
-from .status_edit_params import StatusEditParams as StatusEditParams
-from .status_get_response import StatusGetResponse as StatusGetResponse
-from .status_edit_response import StatusEditResponse as StatusEditResponse
-from .binding_create_params import BindingCreateParams as BindingCreateParams
-from .binding_delete_response import BindingDeleteResponse as BindingDeleteResponse
diff --git a/src/cloudflare/types/addressing/prefixes/bgp/bgp_prefix.py b/src/cloudflare/types/addressing/prefixes/bgp/bgp_prefix.py
deleted file mode 100644
index d9eecdf9d89..00000000000
--- a/src/cloudflare/types/addressing/prefixes/bgp/bgp_prefix.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from datetime import datetime
-
-from ....._models import BaseModel
-
-__all__ = ["BGPPrefix", "BGPSignalOpts", "OnDemand"]
-
-
-class BGPSignalOpts(BaseModel):
-    enabled: Optional[bool] = None
-    """
-    Whether control of advertisement of the prefix to the Internet is enabled to be
-    performed via BGP signal
-    """
-
-    modified_at: Optional[datetime] = None
-    """Last time BGP signaling control was toggled.
-
-    This field is null if BGP signaling has never been enabled.
-    """
-
-
-class OnDemand(BaseModel):
-    advertised: Optional[bool] = None
-    """Prefix advertisement status to the Internet.
-
-    This field is only not 'null' if on demand is enabled.
-    """
-
-    advertised_modified_at: Optional[datetime] = None
-    """Last time the advertisement status was changed.
-
-    This field is only not 'null' if on demand is enabled.
-    """
-
-    on_demand_enabled: Optional[bool] = None
-    """
-    Whether advertisement of the prefix to the Internet may be dynamically enabled
-    or disabled.
-    """
-
-    on_demand_locked: Optional[bool] = None
-    """
-    Whether advertisement status of the prefix is locked, meaning it cannot be
-    changed.
-    """
-
-
-class BGPPrefix(BaseModel):
-    id: Optional[str] = None
-    """Identifier"""
-
-    asn: Optional[int] = None
-    """Autonomous System Number (ASN) the prefix will be advertised under."""
-
-    bgp_signal_opts: Optional[BGPSignalOpts] = None
-
-    cidr: Optional[str] = None
-    """IP Prefix in Classless Inter-Domain Routing format."""
-
-    created_at: Optional[datetime] = None
-
-    modified_at: Optional[datetime] = None
-
-    on_demand: Optional[OnDemand] = None
diff --git a/src/cloudflare/types/addressing/prefixes/bgp/binding_create_params.py b/src/cloudflare/types/addressing/prefixes/bgp/binding_create_params.py
deleted file mode 100644
index d4b3604ae77..00000000000
--- a/src/cloudflare/types/addressing/prefixes/bgp/binding_create_params.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["BindingCreateParams"]
-
-
-class BindingCreateParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    cidr: str
-    """IP Prefix in Classless Inter-Domain Routing format."""
-
-    service_id: str
-    """Identifier"""
diff --git a/src/cloudflare/types/addressing/prefixes/bgp/binding_delete_response.py b/src/cloudflare/types/addressing/prefixes/bgp/binding_delete_response.py
deleted file mode 100644
index 9746074b34a..00000000000
--- a/src/cloudflare/types/addressing/prefixes/bgp/binding_delete_response.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-from typing_extensions import Literal
-
-from ....._models import BaseModel
-from ....shared.response_info import ResponseInfo
-
-__all__ = ["BindingDeleteResponse"]
-
-
-class BindingDeleteResponse(BaseModel):
-    errors: List[ResponseInfo]
-
-    messages: List[ResponseInfo]
-
-    success: Literal[True]
-    """Whether the API call was successful"""
diff --git a/src/cloudflare/types/addressing/prefixes/bgp/prefix_edit_params.py b/src/cloudflare/types/addressing/prefixes/bgp/prefix_edit_params.py
deleted file mode 100644
index 5040a427e1f..00000000000
--- a/src/cloudflare/types/addressing/prefixes/bgp/prefix_edit_params.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["PrefixEditParams", "OnDemand"]
-
-
-class PrefixEditParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    prefix_id: Required[str]
-    """Identifier"""
-
-    on_demand: OnDemand
-
-
-class OnDemand(TypedDict, total=False):
-    advertised: bool
diff --git a/src/cloudflare/types/addressing/prefixes/bgp/service_binding.py b/src/cloudflare/types/addressing/prefixes/bgp/service_binding.py
deleted file mode 100644
index 505f89b7c2e..00000000000
--- a/src/cloudflare/types/addressing/prefixes/bgp/service_binding.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from typing_extensions import Literal
-
-from ....._models import BaseModel
-
-__all__ = ["ServiceBinding", "Provisioning"]
-
-
-class Provisioning(BaseModel):
-    state: Optional[Literal["provisioning", "active"]] = None
-    """
-    When a binding has been deployed to a majority of Cloudflare datacenters, the
-    binding will become active and can be used with its associated service.
-    """
-
-
-class ServiceBinding(BaseModel):
-    id: Optional[str] = None
-    """Identifier"""
-
-    cidr: Optional[str] = None
-    """IP Prefix in Classless Inter-Domain Routing format."""
-
-    provisioning: Optional[Provisioning] = None
-    """Status of a Service Binding's deployment to the Cloudflare network"""
-
-    service_id: Optional[str] = None
-    """Identifier"""
-
-    service_name: Optional[str] = None
-    """Name of a service running on the Cloudflare network"""
diff --git a/src/cloudflare/types/addressing/prefixes/bgp/status_edit_params.py b/src/cloudflare/types/addressing/prefixes/bgp/status_edit_params.py
deleted file mode 100644
index 10f8c1cf7b3..00000000000
--- a/src/cloudflare/types/addressing/prefixes/bgp/status_edit_params.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["StatusEditParams"]
-
-
-class StatusEditParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    advertised: Required[bool]
-    """Enablement of prefix advertisement to the Internet."""
diff --git a/src/cloudflare/types/addressing/prefixes/bgp/status_edit_response.py b/src/cloudflare/types/addressing/prefixes/bgp/status_edit_response.py
deleted file mode 100644
index f67cfc5baef..00000000000
--- a/src/cloudflare/types/addressing/prefixes/bgp/status_edit_response.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from datetime import datetime
-
-from ....._models import BaseModel
-
-__all__ = ["StatusEditResponse"]
-
-
-class StatusEditResponse(BaseModel):
-    advertised: Optional[bool] = None
-    """Enablement of prefix advertisement to the Internet."""
-
-    advertised_modified_at: Optional[datetime] = None
-    """Last time the advertisement status was changed.
-
-    This field is only not 'null' if on demand is enabled.
-    """
diff --git a/src/cloudflare/types/addressing/prefixes/bgp/status_get_response.py b/src/cloudflare/types/addressing/prefixes/bgp/status_get_response.py
deleted file mode 100644
index a6012cb77de..00000000000
--- a/src/cloudflare/types/addressing/prefixes/bgp/status_get_response.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from datetime import datetime
-
-from ....._models import BaseModel
-
-__all__ = ["StatusGetResponse"]
-
-
-class StatusGetResponse(BaseModel):
-    advertised: Optional[bool] = None
-    """Enablement of prefix advertisement to the Internet."""
-
-    advertised_modified_at: Optional[datetime] = None
-    """Last time the advertisement status was changed.
-
-    This field is only not 'null' if on demand is enabled.
-    """
diff --git a/src/cloudflare/types/addressing/prefixes/bgp_prefix.py b/src/cloudflare/types/addressing/prefixes/bgp_prefix.py
new file mode 100644
index 00000000000..1572357945c
--- /dev/null
+++ b/src/cloudflare/types/addressing/prefixes/bgp_prefix.py
@@ -0,0 +1,78 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["BGPPrefix", "BGPSignalOpts", "OnDemand"]
+
+
+class BGPSignalOpts(BaseModel):
+    enabled: Optional[bool] = None
+    """
+    Whether control of advertisement of the prefix to the Internet is enabled to be
+    performed via BGP signal
+    """
+
+    modified_at: Optional[datetime] = None
+    """Last time BGP signaling control was toggled.
+
+    This field is null if BGP signaling has never been enabled.
+    """
+
+
+class OnDemand(BaseModel):
+    advertised: Optional[bool] = None
+    """Prefix advertisement status to the Internet.
+
+    This field is only not 'null' if on demand is enabled.
+    """
+
+    advertised_modified_at: Optional[datetime] = None
+    """Last time the advertisement status was changed.
+
+    This field is only not 'null' if on demand is enabled.
+    """
+
+    on_demand_enabled: Optional[bool] = None
+    """
+    Whether advertisement of the prefix to the Internet may be dynamically enabled
+    or disabled.
+    """
+
+    on_demand_locked: Optional[bool] = None
+    """
+    Whether the advertisement status of the prefix is locked, meaning it cannot be
+    changed.
+    """
+
+
+class BGPPrefix(BaseModel):
+    id: Optional[str] = None
+    """Identifier of BGP Prefix."""
+
+    asn: Optional[int] = None
+    """Autonomous System Number (ASN) the prefix will be advertised under."""
+
+    asn_prepend_count: Optional[int] = None
+    """Number of times to prepend the Cloudflare ASN to the BGP AS-Path attribute"""
+
+    auto_advertise_withdraw: Optional[bool] = None
+    """
+    Determines if Cloudflare advertises a BYOIP BGP prefix even when there is no
+    matching BGP prefix in the Magic routing table. When true, Cloudflare will
+    automatically withdraw the BGP prefix when there are no matching BGP routes, and
+    will resume advertising when there is at least one matching BGP route.
+    """
+
+    bgp_signal_opts: Optional[BGPSignalOpts] = None
+
+    cidr: Optional[str] = None
+    """IP Prefix in Classless Inter-Domain Routing format."""
+
+    created_at: Optional[datetime] = None
+
+    modified_at: Optional[datetime] = None
+
+    on_demand: Optional[OnDemand] = None
diff --git a/src/cloudflare/types/addressing/prefixes/bgp_prefix_create_params.py b/src/cloudflare/types/addressing/prefixes/bgp_prefix_create_params.py
new file mode 100644
index 00000000000..dc9d548929e
--- /dev/null
+++ b/src/cloudflare/types/addressing/prefixes/bgp_prefix_create_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["BGPPrefixCreateParams"]
+
+
+class BGPPrefixCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier of a Cloudflare account."""
+
+    cidr: Required[str]
+    """IP Prefix in Classless Inter-Domain Routing format."""
diff --git a/src/cloudflare/types/addressing/prefixes/bgp_prefix_edit_params.py b/src/cloudflare/types/addressing/prefixes/bgp_prefix_edit_params.py
new file mode 100644
index 00000000000..f610ee9434f
--- /dev/null
+++ b/src/cloudflare/types/addressing/prefixes/bgp_prefix_edit_params.py
@@ -0,0 +1,32 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["BGPPrefixEditParams", "OnDemand"]
+
+
+class BGPPrefixEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier of a Cloudflare account."""
+
+    prefix_id: Required[str]
+    """Identifier of an IP Prefix."""
+
+    asn_prepend_count: int
+    """Number of times to prepend the Cloudflare ASN to the BGP AS-Path attribute"""
+
+    auto_advertise_withdraw: bool
+    """
+    Determines if Cloudflare advertises a BYOIP BGP prefix even when there is no
+    matching BGP prefix in the Magic routing table. When true, Cloudflare will
+    automatically withdraw the BGP prefix when there are no matching BGP routes, and
+    will resume advertising when there is at least one matching BGP route.
+    """
+
+    on_demand: OnDemand
+
+
+class OnDemand(TypedDict, total=False):
+    advertised: bool
diff --git a/src/cloudflare/types/addressing/prefixes/delegation_create_params.py b/src/cloudflare/types/addressing/prefixes/delegation_create_params.py
index f8f9c9719f2..948fe969d3e 100644
--- a/src/cloudflare/types/addressing/prefixes/delegation_create_params.py
+++ b/src/cloudflare/types/addressing/prefixes/delegation_create_params.py
@@ -9,7 +9,7 @@
 
 class DelegationCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier of a Cloudflare account."""
 
     cidr: Required[str]
     """IP Prefix in Classless Inter-Domain Routing format."""
diff --git a/src/cloudflare/types/addressing/prefixes/delegation_delete_response.py b/src/cloudflare/types/addressing/prefixes/delegation_delete_response.py
index 3581f2c3c0a..352868765b9 100644
--- a/src/cloudflare/types/addressing/prefixes/delegation_delete_response.py
+++ b/src/cloudflare/types/addressing/prefixes/delegation_delete_response.py
@@ -9,4 +9,4 @@
 
 class DelegationDeleteResponse(BaseModel):
     id: Optional[str] = None
-    """Delegation identifier tag."""
+    """Identifier of a Delegation."""
diff --git a/src/cloudflare/types/addressing/prefixes/delegations.py b/src/cloudflare/types/addressing/prefixes/delegations.py
index 8a2d2d8fea8..c9b97dfc3d5 100644
--- a/src/cloudflare/types/addressing/prefixes/delegations.py
+++ b/src/cloudflare/types/addressing/prefixes/delegations.py
@@ -10,7 +10,7 @@
 
 class Delegations(BaseModel):
     id: Optional[str] = None
-    """Delegation identifier tag."""
+    """Identifier of a Delegation."""
 
     cidr: Optional[str] = None
     """IP Prefix in Classless Inter-Domain Routing format."""
@@ -23,4 +23,4 @@ class Delegations(BaseModel):
     modified_at: Optional[datetime] = None
 
     parent_prefix_id: Optional[str] = None
-    """Identifier"""
+    """Identifier of an IP Prefix."""
diff --git a/src/cloudflare/types/addressing/prefixes/service_binding.py b/src/cloudflare/types/addressing/prefixes/service_binding.py
new file mode 100644
index 00000000000..66afcea404c
--- /dev/null
+++ b/src/cloudflare/types/addressing/prefixes/service_binding.py
@@ -0,0 +1,38 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["ServiceBinding", "Provisioning"]
+
+
+class Provisioning(BaseModel):
+    """Status of a Service Binding's deployment to the Cloudflare network"""
+
+    state: Optional[Literal["provisioning", "active"]] = None
+    """
+    When a binding has been deployed to a majority of Cloudflare datacenters, the
+    binding will become active and can be used with its associated service.
+    """
+
+
+class ServiceBinding(BaseModel):
+    id: Optional[str] = None
+    """Identifier of a Service Binding."""
+
+    cidr: Optional[str] = None
+    """IP Prefix in Classless Inter-Domain Routing format."""
+
+    provisioning: Optional[Provisioning] = None
+    """Status of a Service Binding's deployment to the Cloudflare network"""
+
+    service_id: Optional[str] = None
+    """Identifier of a Service on the Cloudflare network.
+
+    Available services and their IDs may be found in the **List Services** endpoint.
+    """
+
+    service_name: Optional[str] = None
+    """Name of a service running on the Cloudflare network"""
diff --git a/src/cloudflare/types/addressing/prefixes/service_binding_create_params.py b/src/cloudflare/types/addressing/prefixes/service_binding_create_params.py
new file mode 100644
index 00000000000..ed098c0dc4f
--- /dev/null
+++ b/src/cloudflare/types/addressing/prefixes/service_binding_create_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ServiceBindingCreateParams"]
+
+
+class ServiceBindingCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier of a Cloudflare account."""
+
+    cidr: Required[str]
+    """IP Prefix in Classless Inter-Domain Routing format."""
+
+    service_id: Required[str]
+    """Identifier of a Service on the Cloudflare network.
+
+    Available services and their IDs may be found in the **List Services** endpoint.
+    """
diff --git a/src/cloudflare/types/addressing/prefixes/service_binding_delete_response.py b/src/cloudflare/types/addressing/prefixes/service_binding_delete_response.py
new file mode 100644
index 00000000000..2916e4e71c7
--- /dev/null
+++ b/src/cloudflare/types/addressing/prefixes/service_binding_delete_response.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["ServiceBindingDeleteResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class ServiceBindingDeleteResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/addressing/regional_hostname_create_params.py b/src/cloudflare/types/addressing/regional_hostname_create_params.py
index 630c2f0bed3..c462c98f63d 100644
--- a/src/cloudflare/types/addressing/regional_hostname_create_params.py
+++ b/src/cloudflare/types/addressing/regional_hostname_create_params.py
@@ -9,7 +9,7 @@
 
 class RegionalHostnameCreateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     hostname: Required[str]
     """DNS hostname to be regionalized, must be a subdomain of the zone.
@@ -19,3 +19,6 @@ class RegionalHostnameCreateParams(TypedDict, total=False):
 
     region_key: Required[str]
     """Identifying key for the region"""
+
+    routing: str
+    """Configure which routing method to use for the regional hostname"""
diff --git a/src/cloudflare/types/addressing/regional_hostname_create_response.py b/src/cloudflare/types/addressing/regional_hostname_create_response.py
index f2717ccf6ed..a0b471ef232 100644
--- a/src/cloudflare/types/addressing/regional_hostname_create_response.py
+++ b/src/cloudflare/types/addressing/regional_hostname_create_response.py
@@ -1,5 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import Optional
 from datetime import datetime
 
 from ..._models import BaseModel
@@ -19,3 +20,6 @@ class RegionalHostnameCreateResponse(BaseModel):
 
     region_key: str
     """Identifying key for the region"""
+
+    routing: Optional[str] = None
+    """Configure which routing method to use for the regional hostname"""
diff --git a/src/cloudflare/types/addressing/regional_hostname_delete_response.py b/src/cloudflare/types/addressing/regional_hostname_delete_response.py
index 1031166663d..f478054084e 100644
--- a/src/cloudflare/types/addressing/regional_hostname_delete_response.py
+++ b/src/cloudflare/types/addressing/regional_hostname_delete_response.py
@@ -1,18 +1,45 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
 from typing_extensions import Literal
 
 from ..._models import BaseModel
-from ..shared.response_info import ResponseInfo
 
-__all__ = ["RegionalHostnameDeleteResponse"]
+__all__ = ["RegionalHostnameDeleteResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
 
 
 class RegionalHostnameDeleteResponse(BaseModel):
-    errors: List[ResponseInfo]
+    errors: List[Error]
 
-    messages: List[ResponseInfo]
+    messages: List[Message]
 
     success: Literal[True]
-    """Whether the API call was successful"""
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/addressing/regional_hostname_edit_params.py b/src/cloudflare/types/addressing/regional_hostname_edit_params.py
index a205f2de604..822196cf6af 100644
--- a/src/cloudflare/types/addressing/regional_hostname_edit_params.py
+++ b/src/cloudflare/types/addressing/regional_hostname_edit_params.py
@@ -9,7 +9,7 @@
 
 class RegionalHostnameEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     region_key: Required[str]
     """Identifying key for the region"""
diff --git a/src/cloudflare/types/addressing/regional_hostname_edit_response.py b/src/cloudflare/types/addressing/regional_hostname_edit_response.py
index 06a760610de..d51b95ec7c7 100644
--- a/src/cloudflare/types/addressing/regional_hostname_edit_response.py
+++ b/src/cloudflare/types/addressing/regional_hostname_edit_response.py
@@ -1,5 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import Optional
 from datetime import datetime
 
 from ..._models import BaseModel
@@ -19,3 +20,6 @@ class RegionalHostnameEditResponse(BaseModel):
 
     region_key: str
     """Identifying key for the region"""
+
+    routing: Optional[str] = None
+    """Configure which routing method to use for the regional hostname"""
diff --git a/src/cloudflare/types/addressing/regional_hostname_get_response.py b/src/cloudflare/types/addressing/regional_hostname_get_response.py
index 24fe021f2fe..c64330e33b0 100644
--- a/src/cloudflare/types/addressing/regional_hostname_get_response.py
+++ b/src/cloudflare/types/addressing/regional_hostname_get_response.py
@@ -1,5 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import Optional
 from datetime import datetime
 
 from ..._models import BaseModel
@@ -19,3 +20,6 @@ class RegionalHostnameGetResponse(BaseModel):
 
     region_key: str
     """Identifying key for the region"""
+
+    routing: Optional[str] = None
+    """Configure which routing method to use for the regional hostname"""
diff --git a/src/cloudflare/types/addressing/regional_hostname_list_response.py b/src/cloudflare/types/addressing/regional_hostname_list_response.py
index fe454021dc0..35cc3743895 100644
--- a/src/cloudflare/types/addressing/regional_hostname_list_response.py
+++ b/src/cloudflare/types/addressing/regional_hostname_list_response.py
@@ -1,5 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import Optional
 from datetime import datetime
 
 from ..._models import BaseModel
@@ -19,3 +20,6 @@ class RegionalHostnameListResponse(BaseModel):
 
     region_key: str
     """Identifying key for the region"""
+
+    routing: Optional[str] = None
+    """Configure which routing method to use for the regional hostname"""
diff --git a/src/cloudflare/types/addressing/service_list_response.py b/src/cloudflare/types/addressing/service_list_response.py
index e4e66040091..a97b11929a2 100644
--- a/src/cloudflare/types/addressing/service_list_response.py
+++ b/src/cloudflare/types/addressing/service_list_response.py
@@ -9,7 +9,10 @@
 
 class ServiceListResponse(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier of a Service on the Cloudflare network.
+
+    Available services and their IDs may be found in the **List Services** endpoint.
+    """
 
     name: Optional[str] = None
     """Name of a service running on the Cloudflare network"""
diff --git a/src/cloudflare/types/ai/__init__.py b/src/cloudflare/types/ai/__init__.py
new file mode 100644
index 00000000000..5098d91d6f1
--- /dev/null
+++ b/src/cloudflare/types/ai/__init__.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .ai_run_params import AIRunParams as AIRunParams
+from .ai_run_response import AIRunResponse as AIRunResponse
+from .model_list_params import ModelListParams as ModelListParams
+from .finetune_create_params import FinetuneCreateParams as FinetuneCreateParams
+from .finetune_list_response import FinetuneListResponse as FinetuneListResponse
+from .finetune_create_response import FinetuneCreateResponse as FinetuneCreateResponse
+from .to_markdown_transform_params import ToMarkdownTransformParams as ToMarkdownTransformParams
+from .to_markdown_supported_response import ToMarkdownSupportedResponse as ToMarkdownSupportedResponse
+from .to_markdown_transform_response import ToMarkdownTransformResponse as ToMarkdownTransformResponse
diff --git a/src/cloudflare/types/ai/ai_run_params.py b/src/cloudflare/types/ai/ai_run_params.py
new file mode 100644
index 00000000000..753b2da85d4
--- /dev/null
+++ b/src/cloudflare/types/ai/ai_run_params.py
@@ -0,0 +1,599 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Union, Iterable
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = [
+    "AIRunParams",
+    "TextClassification",
+    "TextToImage",
+    "TextToSpeech",
+    "TextEmbeddings",
+    "AutomaticSpeechRecognition",
+    "ImageClassification",
+    "ObjectDetection",
+    "Prompt",
+    "PromptResponseFormat",
+    "Messages",
+    "MessagesMessage",
+    "MessagesFunction",
+    "MessagesResponseFormat",
+    "MessagesTool",
+    "MessagesToolUnionMember0",
+    "MessagesToolUnionMember0Parameters",
+    "MessagesToolUnionMember0ParametersProperties",
+    "MessagesToolFunction",
+    "MessagesToolFunctionFunction",
+    "MessagesToolFunctionFunctionParameters",
+    "MessagesToolFunctionFunctionParametersProperties",
+    "Translation",
+    "Summarization",
+    "ImageToText",
+    "Variant12",
+    "Variant13",
+    "Variant13Message",
+    "MultimodalEmbeddings",
+]
+
+
+class TextClassification(TypedDict, total=False):
+    account_id: Required[str]
+
+    text: Required[str]
+    """The text that you want to classify"""
+
+
+class TextToImage(TypedDict, total=False):
+    account_id: Required[str]
+
+    prompt: Required[str]
+    """A text description of the image you want to generate"""
+
+    guidance: float
+    """
+    Controls how closely the generated image should adhere to the prompt; higher
+    values make the image more aligned with the prompt
+    """
+
+    height: int
+    """The height of the generated image in pixels"""
+
+    image: Iterable[float]
+    """For use with img2img tasks.
+
+    An array of integers that represent the image data constrained to 8-bit unsigned
+    integer values
+    """
+
+    image_b64: str
+    """For use with img2img tasks. A base64-encoded string of the input image"""
+
+    mask: Iterable[float]
+    """
+    An array representing An array of integers that represent mask image data for
+    inpainting constrained to 8-bit unsigned integer values
+    """
+
+    negative_prompt: str
+    """Text describing elements to avoid in the generated image"""
+
+    num_steps: int
+    """
+    The number of diffusion steps; higher values can improve quality but take longer
+    """
+
+    seed: int
+    """Random seed for reproducibility of the image generation"""
+
+    strength: float
+    """
+    A value between 0 and 1 indicating how strongly to apply the transformation
+    during img2img tasks; lower values make the output closer to the input image
+    """
+
+    width: int
+    """The width of the generated image in pixels"""
+
+
+class TextToSpeech(TypedDict, total=False):
+    account_id: Required[str]
+
+    prompt: Required[str]
+    """A text description of the audio you want to generate"""
+
+    lang: str
+    """The speech language (e.g., 'en' for English, 'fr' for French).
+
+    Defaults to 'en' if not specified
+    """
+
+
+class TextEmbeddings(TypedDict, total=False):
+    account_id: Required[str]
+
+    text: Required[Union[str, SequenceNotStr[str]]]
+    """The text to embed"""
+
+
+class AutomaticSpeechRecognition(TypedDict, total=False):
+    account_id: Required[str]
+
+    audio: Required[Iterable[float]]
+    """
+    An array of integers that represent the audio data constrained to 8-bit unsigned
+    integer values
+    """
+
+    source_lang: str
+    """The language of the recorded audio"""
+
+    target_lang: str
+    """The language to translate the transcription into.
+
+    Currently only English is supported.
+    """
+
+
+class ImageClassification(TypedDict, total=False):
+    account_id: Required[str]
+
+    image: Required[Iterable[float]]
+    """
+    An array of integers that represent the image data constrained to 8-bit unsigned
+    integer values
+    """
+
+
+class ObjectDetection(TypedDict, total=False):
+    account_id: Required[str]
+
+    image: Iterable[float]
+    """
+    An array of integers that represent the image data constrained to 8-bit unsigned
+    integer values
+    """
+
+
+class Prompt(TypedDict, total=False):
+    account_id: Required[str]
+
+    prompt: Required[str]
+    """The input text prompt for the model to generate a response."""
+
+    frequency_penalty: float
+    """Decreases the likelihood of the model repeating the same lines verbatim."""
+
+    lora: str
+    """Name of the LoRA (Low-Rank Adaptation) model to fine-tune the base model."""
+
+    max_tokens: int
+    """The maximum number of tokens to generate in the response."""
+
+    presence_penalty: float
+    """Increases the likelihood of the model introducing new topics."""
+
+    raw: bool
+    """
+    If true, a chat template is not applied and you must adhere to the specific
+    model's expected formatting.
+    """
+
+    repetition_penalty: float
+    """Penalty for repeated tokens; higher values discourage repetition."""
+
+    response_format: PromptResponseFormat
+
+    seed: int
+    """Random seed for reproducibility of the generation."""
+
+    stream: bool
+    """
+    If true, the response will be streamed back incrementally using SSE, Server Sent
+    Events.
+    """
+
+    temperature: float
+    """
+    Controls the randomness of the output; higher values produce more random
+    results.
+    """
+
+    top_k: int
+    """Limits the AI to choose from the top 'k' most probable words.
+
+    Lower values make responses more focused; higher values introduce more variety
+    and potential surprises.
+    """
+
+    top_p: float
+    """
+    Adjusts the creativity of the AI's responses by controlling how many possible
+    words it considers. Lower values make outputs more predictable; higher values
+    allow for more varied and creative responses.
+    """
+
+
+class PromptResponseFormat(TypedDict, total=False):
+    json_schema: object
+
+    type: Literal["json_object", "json_schema"]
+
+
+class Messages(TypedDict, total=False):
+    account_id: Required[str]
+
+    messages: Required[Iterable[MessagesMessage]]
+    """An array of message objects representing the conversation history."""
+
+    frequency_penalty: float
+    """Decreases the likelihood of the model repeating the same lines verbatim."""
+
+    functions: Iterable[MessagesFunction]
+
+    max_tokens: int
+    """The maximum number of tokens to generate in the response."""
+
+    presence_penalty: float
+    """Increases the likelihood of the model introducing new topics."""
+
+    raw: bool
+    """
+    If true, a chat template is not applied and you must adhere to the specific
+    model's expected formatting.
+    """
+
+    repetition_penalty: float
+    """Penalty for repeated tokens; higher values discourage repetition."""
+
+    response_format: MessagesResponseFormat
+
+    seed: int
+    """Random seed for reproducibility of the generation."""
+
+    stream: bool
+    """
+    If true, the response will be streamed back incrementally using SSE, Server Sent
+    Events.
+    """
+
+    temperature: float
+    """
+    Controls the randomness of the output; higher values produce more random
+    results.
+    """
+
+    tools: Iterable[MessagesTool]
+    """A list of tools available for the assistant to use."""
+
+    top_k: int
+    """Limits the AI to choose from the top 'k' most probable words.
+
+    Lower values make responses more focused; higher values introduce more variety
+    and potential surprises.
+    """
+
+    top_p: float
+    """
+    Adjusts the creativity of the AI's responses by controlling how many possible
+    words it considers. Lower values make outputs more predictable; higher values
+    allow for more varied and creative responses.
+    """
+
+
+class MessagesMessage(TypedDict, total=False):
+    content: Required[str]
+    """The content of the message as a string."""
+
+    role: Required[str]
+    """The role of the message sender (e.g., 'user', 'assistant', 'system', 'tool')."""
+
+
+class MessagesFunction(TypedDict, total=False):
+    code: Required[str]
+
+    name: Required[str]
+
+
+class MessagesResponseFormat(TypedDict, total=False):
+    json_schema: object
+
+    type: Literal["json_object", "json_schema"]
+
+
+class MessagesToolUnionMember0ParametersProperties(TypedDict, total=False):
+    description: Required[str]
+    """A description of the expected parameter."""
+
+    type: Required[str]
+    """The data type of the parameter."""
+
+
+class MessagesToolUnionMember0Parameters(TypedDict, total=False):
+    """Schema defining the parameters accepted by the tool."""
+
+    properties: Required[Dict[str, MessagesToolUnionMember0ParametersProperties]]
+    """Definitions of each parameter."""
+
+    type: Required[str]
+    """The type of the parameters object (usually 'object')."""
+
+    required: SequenceNotStr[str]
+    """List of required parameter names."""
+
+
+class MessagesToolUnionMember0(TypedDict, total=False):
+    description: Required[str]
+    """A brief description of what the tool does."""
+
+    name: Required[str]
+    """The name of the tool. More descriptive the better."""
+
+    parameters: Required[MessagesToolUnionMember0Parameters]
+    """Schema defining the parameters accepted by the tool."""
+
+
+class MessagesToolFunctionFunctionParametersProperties(TypedDict, total=False):
+    description: Required[str]
+    """A description of the expected parameter."""
+
+    type: Required[str]
+    """The data type of the parameter."""
+
+
+class MessagesToolFunctionFunctionParameters(TypedDict, total=False):
+    """Schema defining the parameters accepted by the function."""
+
+    properties: Required[Dict[str, MessagesToolFunctionFunctionParametersProperties]]
+    """Definitions of each parameter."""
+
+    type: Required[str]
+    """The type of the parameters object (usually 'object')."""
+
+    required: SequenceNotStr[str]
+    """List of required parameter names."""
+
+
+class MessagesToolFunctionFunction(TypedDict, total=False):
+    """Details of the function tool."""
+
+    description: Required[str]
+    """A brief description of what the function does."""
+
+    name: Required[str]
+    """The name of the function."""
+
+    parameters: Required[MessagesToolFunctionFunctionParameters]
+    """Schema defining the parameters accepted by the function."""
+
+
+class MessagesToolFunction(TypedDict, total=False):
+    function: Required[MessagesToolFunctionFunction]
+    """Details of the function tool."""
+
+    type: Required[str]
+    """Specifies the type of tool (e.g., 'function')."""
+
+
+MessagesTool: TypeAlias = Union[MessagesToolUnionMember0, MessagesToolFunction]
+
+
+class Translation(TypedDict, total=False):
+    account_id: Required[str]
+
+    target_lang: Required[str]
+    """The language code to translate the text into (e.g., 'es' for Spanish)"""
+
+    text: Required[str]
+    """The text to be translated"""
+
+    source_lang: str
+    """The language code of the source text (e.g., 'en' for English).
+
+    Defaults to 'en' if not specified
+    """
+
+
+class Summarization(TypedDict, total=False):
+    account_id: Required[str]
+
+    input_text: Required[str]
+    """The text that you want the model to summarize"""
+
+    max_length: int
+    """The maximum length of the generated summary in tokens"""
+
+
+class ImageToText(TypedDict, total=False):
+    account_id: Required[str]
+
+    image: Required[Iterable[float]]
+    """
+    An array of integers that represent the image data constrained to 8-bit unsigned
+    integer values
+    """
+
+    frequency_penalty: float
+    """Decreases the likelihood of the model repeating the same lines verbatim."""
+
+    max_tokens: int
+    """The maximum number of tokens to generate in the response."""
+
+    presence_penalty: float
+    """Increases the likelihood of the model introducing new topics."""
+
+    prompt: str
+    """The input text prompt for the model to generate a response."""
+
+    raw: bool
+    """
+    If true, a chat template is not applied and you must adhere to the specific
+    model's expected formatting.
+    """
+
+    repetition_penalty: float
+    """Penalty for repeated tokens; higher values discourage repetition."""
+
+    seed: float
+    """Random seed for reproducibility of the generation."""
+
+    temperature: float
+    """
+    Controls the randomness of the output; higher values produce more random
+    results.
+    """
+
+    top_k: float
+    """Limits the AI to choose from the top 'k' most probable words.
+
+    Lower values make responses more focused; higher values introduce more variety
+    and potential surprises.
+    """
+
+    top_p: float
+    """
+    Controls the creativity of the AI's responses by adjusting how many possible
+    words it considers. Lower values make outputs more predictable; higher values
+    allow for more varied and creative responses.
+    """
+
+
+class Variant12(TypedDict, total=False):
+    account_id: Required[str]
+
+    image: Required[str]
+    """Image in base64 encoded format."""
+
+    prompt: Required[str]
+    """The input text prompt for the model to generate a response."""
+
+    frequency_penalty: float
+    """Decreases the likelihood of the model repeating the same lines verbatim."""
+
+    ignore_eos: bool
+    """
+    Whether to ignore the EOS token and continue generating tokens after the EOS
+    token is generated.
+    """
+
+    max_tokens: int
+    """The maximum number of tokens to generate in the response."""
+
+    presence_penalty: float
+    """Increases the likelihood of the model introducing new topics."""
+
+    repetition_penalty: float
+    """Penalty for repeated tokens; higher values discourage repetition."""
+
+    seed: float
+    """Random seed for reproducibility of the generation."""
+
+    temperature: float
+    """
+    Controls the randomness of the output; higher values produce more random
+    results.
+    """
+
+    top_k: float
+    """Limits the AI to choose from the top 'k' most probable words.
+
+    Lower values make responses more focused; higher values introduce more variety
+    and potential surprises.
+    """
+
+    top_p: float
+    """
+    Controls the creativity of the AI's responses by adjusting how many possible
+    words it considers. Lower values make outputs more predictable; higher values
+    allow for more varied and creative responses.
+    """
+
+
+class Variant13(TypedDict, total=False):
+    account_id: Required[str]
+
+    image: Required[str]
+    """Image in base64 encoded format."""
+
+    messages: Required[Iterable[Variant13Message]]
+    """An array of message objects representing the conversation history."""
+
+    frequency_penalty: float
+    """Decreases the likelihood of the model repeating the same lines verbatim."""
+
+    ignore_eos: bool
+    """
+    Whether to ignore the EOS token and continue generating tokens after the EOS
+    token is generated.
+    """
+
+    max_tokens: int
+    """The maximum number of tokens to generate in the response."""
+
+    presence_penalty: float
+    """Increases the likelihood of the model introducing new topics."""
+
+    repetition_penalty: float
+    """Penalty for repeated tokens; higher values discourage repetition."""
+
+    seed: float
+    """Random seed for reproducibility of the generation."""
+
+    temperature: float
+    """
+    Controls the randomness of the output; higher values produce more random
+    results.
+    """
+
+    top_k: float
+    """Limits the AI to choose from the top 'k' most probable words.
+
+    Lower values make responses more focused; higher values introduce more variety
+    and potential surprises.
+    """
+
+    top_p: float
+    """
+    Controls the creativity of the AI's responses by adjusting how many possible
+    words it considers. Lower values make outputs more predictable; higher values
+    allow for more varied and creative responses.
+    """
+
+
+class Variant13Message(TypedDict, total=False):
+    content: Required[str]
+    """The content of the message as a string."""
+
+    role: Required[str]
+    """The role of the message sender (e.g., 'user', 'assistant', 'system', 'tool')."""
+
+
+class MultimodalEmbeddings(TypedDict, total=False):
+    account_id: Required[str]
+
+    image: str
+    """Image in base64 encoded format."""
+
+    text: SequenceNotStr[str]
+
+
+AIRunParams: TypeAlias = Union[
+    TextClassification,
+    TextToImage,
+    TextToSpeech,
+    TextEmbeddings,
+    AutomaticSpeechRecognition,
+    ImageClassification,
+    ObjectDetection,
+    Prompt,
+    Messages,
+    Translation,
+    Summarization,
+    ImageToText,
+    Variant12,
+    Variant13,
+    MultimodalEmbeddings,
+]
diff --git a/src/cloudflare/types/ai/ai_run_response.py b/src/cloudflare/types/ai/ai_run_response.py
new file mode 100644
index 00000000000..b9408293f26
--- /dev/null
+++ b/src/cloudflare/types/ai/ai_run_response.py
@@ -0,0 +1,183 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from typing_extensions import TypeAlias
+
+from ..._models import BaseModel
+
+__all__ = [
+    "AIRunResponse",
+    "TextClassification",
+    "Audio",
+    "TextEmbeddings",
+    "AutomaticSpeechRecognition",
+    "AutomaticSpeechRecognitionWord",
+    "ImageClassification",
+    "ObjectDetection",
+    "ObjectDetectionBox",
+    "UnionMember8",
+    "UnionMember8ToolCall",
+    "UnionMember8Usage",
+    "Translation",
+    "Summarization",
+    "ImageToText",
+    "ImageTextToText",
+    "MultimodalEmbeddings",
+]
+
+
+class TextClassification(BaseModel):
+    label: Optional[str] = None
+    """The classification label assigned to the text (e.g., 'POSITIVE' or 'NEGATIVE')"""
+
+    score: Optional[float] = None
+    """
+    Confidence score indicating the likelihood that the text belongs to the
+    specified label
+    """
+
+
+class Audio(BaseModel):
+    audio: Optional[str] = None
+    """The generated audio in MP3 format, base64-encoded"""
+
+
+class TextEmbeddings(BaseModel):
+    data: Optional[List[List[float]]] = None
+    """Embeddings of the requested text values"""
+
+    shape: Optional[List[float]] = None
+
+
+class AutomaticSpeechRecognitionWord(BaseModel):
+    end: Optional[float] = None
+    """The ending second when the word completes"""
+
+    start: Optional[float] = None
+    """The second this word begins in the recording"""
+
+    word: Optional[str] = None
+
+
+class AutomaticSpeechRecognition(BaseModel):
+    text: str
+    """The transcription"""
+
+    vtt: Optional[str] = None
+
+    word_count: Optional[float] = None
+
+    words: Optional[List[AutomaticSpeechRecognitionWord]] = None
+
+
+class ImageClassification(BaseModel):
+    label: Optional[str] = None
+    """The predicted category or class for the input image based on analysis"""
+
+    score: Optional[float] = None
+    """
+    A confidence value, between 0 and 1, indicating how certain the model is about
+    the predicted label
+    """
+
+
+class ObjectDetectionBox(BaseModel):
+    """Coordinates defining the bounding box around the detected object"""
+
+    xmax: Optional[float] = None
+    """The x-coordinate of the bottom-right corner of the bounding box"""
+
+    xmin: Optional[float] = None
+    """The x-coordinate of the top-left corner of the bounding box"""
+
+    ymax: Optional[float] = None
+    """The y-coordinate of the bottom-right corner of the bounding box"""
+
+    ymin: Optional[float] = None
+    """The y-coordinate of the top-left corner of the bounding box"""
+
+
+class ObjectDetection(BaseModel):
+    box: Optional[ObjectDetectionBox] = None
+    """Coordinates defining the bounding box around the detected object"""
+
+    label: Optional[str] = None
+    """The class label or name of the detected object"""
+
+    score: Optional[float] = None
+    """Confidence score indicating the likelihood that the detection is correct"""
+
+
+class UnionMember8ToolCall(BaseModel):
+    arguments: Optional[object] = None
+    """The arguments passed to be passed to the tool call request"""
+
+    name: Optional[str] = None
+    """The name of the tool to be called"""
+
+
+class UnionMember8Usage(BaseModel):
+    """Usage statistics for the inference request"""
+
+    completion_tokens: Optional[float] = None
+    """Total number of tokens in output"""
+
+    prompt_tokens: Optional[float] = None
+    """Total number of tokens in input"""
+
+    total_tokens: Optional[float] = None
+    """Total number of input and output tokens"""
+
+
+class UnionMember8(BaseModel):
+    response: str
+    """The generated text response from the model"""
+
+    tool_calls: Optional[List[UnionMember8ToolCall]] = None
+    """An array of tool calls requests made during the response generation"""
+
+    usage: Optional[UnionMember8Usage] = None
+    """Usage statistics for the inference request"""
+
+
+class Translation(BaseModel):
+    translated_text: Optional[str] = None
+    """The translated text in the target language"""
+
+
+class Summarization(BaseModel):
+    summary: Optional[str] = None
+    """The summarized version of the input text"""
+
+
+class ImageToText(BaseModel):
+    description: Optional[str] = None
+
+
+class ImageTextToText(BaseModel):
+    description: Optional[str] = None
+
+
+class MultimodalEmbeddings(BaseModel):
+    data: Optional[List[List[float]]] = None
+
+    shape: Optional[List[float]] = None
+
+
+AIRunResponse: TypeAlias = Union[
+    List[TextClassification],
+    object,
+    Audio,
+    object,
+    TextEmbeddings,
+    AutomaticSpeechRecognition,
+    List[ImageClassification],
+    List[ObjectDetection],
+    UnionMember8,
+    object,
+    Translation,
+    Summarization,
+    ImageToText,
+    ImageTextToText,
+    MultimodalEmbeddings,
+]
diff --git a/src/cloudflare/types/ai/finetune_create_params.py b/src/cloudflare/types/ai/finetune_create_params.py
new file mode 100644
index 00000000000..84fc0d24f14
--- /dev/null
+++ b/src/cloudflare/types/ai/finetune_create_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["FinetuneCreateParams"]
+
+
+class FinetuneCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    model: Required[str]
+
+    name: Required[str]
+
+    description: str
+
+    public: bool
diff --git a/src/cloudflare/types/ai/finetune_create_response.py b/src/cloudflare/types/ai/finetune_create_response.py
new file mode 100644
index 00000000000..2b4b9963389
--- /dev/null
+++ b/src/cloudflare/types/ai/finetune_create_response.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["FinetuneCreateResponse"]
+
+
+class FinetuneCreateResponse(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    model: str
+
+    modified_at: datetime
+
+    name: str
+
+    public: bool
+
+    description: Optional[str] = None
diff --git a/src/cloudflare/types/ai/finetune_list_response.py b/src/cloudflare/types/ai/finetune_list_response.py
new file mode 100644
index 00000000000..b036b170114
--- /dev/null
+++ b/src/cloudflare/types/ai/finetune_list_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["FinetuneListResponse"]
+
+
+class FinetuneListResponse(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    model: str
+
+    modified_at: datetime
+
+    name: str
+
+    description: Optional[str] = None
diff --git a/src/cloudflare/types/ai/finetunes/__init__.py b/src/cloudflare/types/ai/finetunes/__init__.py
new file mode 100644
index 00000000000..736711396fa
--- /dev/null
+++ b/src/cloudflare/types/ai/finetunes/__init__.py
@@ -0,0 +1,8 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .public_list_params import PublicListParams as PublicListParams
+from .asset_create_params import AssetCreateParams as AssetCreateParams
+from .public_list_response import PublicListResponse as PublicListResponse
+from .asset_create_response import AssetCreateResponse as AssetCreateResponse
diff --git a/src/cloudflare/types/ai/finetunes/asset_create_params.py b/src/cloudflare/types/ai/finetunes/asset_create_params.py
new file mode 100644
index 00000000000..26f0da33305
--- /dev/null
+++ b/src/cloudflare/types/ai/finetunes/asset_create_params.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ...._types import FileTypes
+
+__all__ = ["AssetCreateParams"]
+
+
+class AssetCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    file: FileTypes
+
+    file_name: str
diff --git a/src/cloudflare/types/ai/finetunes/asset_create_response.py b/src/cloudflare/types/ai/finetunes/asset_create_response.py
new file mode 100644
index 00000000000..5647b5f222c
--- /dev/null
+++ b/src/cloudflare/types/ai/finetunes/asset_create_response.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["AssetCreateResponse"]
+
+
+class AssetCreateResponse(BaseModel):
+    success: bool
diff --git a/src/cloudflare/types/ai/finetunes/public_list_params.py b/src/cloudflare/types/ai/finetunes/public_list_params.py
new file mode 100644
index 00000000000..c5a973eaf63
--- /dev/null
+++ b/src/cloudflare/types/ai/finetunes/public_list_params.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ...._utils import PropertyInfo
+
+__all__ = ["PublicListParams"]
+
+
+class PublicListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    limit: float
+    """Pagination Limit"""
+
+    offset: float
+    """Pagination Offset"""
+
+    order_by: Annotated[str, PropertyInfo(alias="orderBy")]
+    """Order By Column Name"""
diff --git a/src/cloudflare/types/ai/finetunes/public_list_response.py b/src/cloudflare/types/ai/finetunes/public_list_response.py
new file mode 100644
index 00000000000..4f96442b435
--- /dev/null
+++ b/src/cloudflare/types/ai/finetunes/public_list_response.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["PublicListResponse"]
+
+
+class PublicListResponse(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    model: str
+
+    modified_at: datetime
+
+    name: str
+
+    public: bool
+
+    description: Optional[str] = None
diff --git a/src/cloudflare/types/ai/model_list_params.py b/src/cloudflare/types/ai/model_list_params.py
new file mode 100644
index 00000000000..bcbc1d7bc05
--- /dev/null
+++ b/src/cloudflare/types/ai/model_list_params.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ModelListParams"]
+
+
+class ModelListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    author: str
+    """Filter by Author"""
+
+    hide_experimental: bool
+    """Filter to hide experimental models"""
+
+    page: int
+
+    per_page: int
+
+    search: str
+    """Search"""
+
+    source: float
+    """Filter by Source Id"""
+
+    task: str
+    """Filter by Task Name"""
diff --git a/src/cloudflare/types/workers/ai/models/__init__.py b/src/cloudflare/types/ai/models/__init__.py
similarity index 100%
rename from src/cloudflare/types/workers/ai/models/__init__.py
rename to src/cloudflare/types/ai/models/__init__.py
diff --git a/src/cloudflare/types/workers/ai/models/schema_get_params.py b/src/cloudflare/types/ai/models/schema_get_params.py
similarity index 100%
rename from src/cloudflare/types/workers/ai/models/schema_get_params.py
rename to src/cloudflare/types/ai/models/schema_get_params.py
diff --git a/src/cloudflare/types/ai/to_markdown_supported_response.py b/src/cloudflare/types/ai/to_markdown_supported_response.py
new file mode 100644
index 00000000000..29f7e2a30d4
--- /dev/null
+++ b/src/cloudflare/types/ai/to_markdown_supported_response.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["ToMarkdownSupportedResponse"]
+
+
+class ToMarkdownSupportedResponse(BaseModel):
+    extension: str
+
+    mime_type: str = FieldInfo(alias="mimeType")
diff --git a/src/cloudflare/types/ai/to_markdown_transform_params.py b/src/cloudflare/types/ai/to_markdown_transform_params.py
new file mode 100644
index 00000000000..8a39a616882
--- /dev/null
+++ b/src/cloudflare/types/ai/to_markdown_transform_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ..._types import FileTypes, SequenceNotStr
+
+__all__ = ["ToMarkdownTransformParams", "File"]
+
+
+class ToMarkdownTransformParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    file: Required[File]
+
+
+class File(TypedDict, total=False):
+    files: Required[SequenceNotStr[FileTypes]]
diff --git a/src/cloudflare/types/ai/to_markdown_transform_response.py b/src/cloudflare/types/ai/to_markdown_transform_response.py
new file mode 100644
index 00000000000..cae6ac94db4
--- /dev/null
+++ b/src/cloudflare/types/ai/to_markdown_transform_response.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["ToMarkdownTransformResponse"]
+
+
+class ToMarkdownTransformResponse(BaseModel):
+    data: str
+
+    format: str
+
+    mime_type: str = FieldInfo(alias="mimeType")
+
+    name: str
+
+    tokens: str
diff --git a/src/cloudflare/types/ai_gateway/__init__.py b/src/cloudflare/types/ai_gateway/__init__.py
index 8a4216b8edb..faf6b260a5d 100644
--- a/src/cloudflare/types/ai_gateway/__init__.py
+++ b/src/cloudflare/types/ai_gateway/__init__.py
@@ -2,13 +2,64 @@
 
 from __future__ import annotations
 
+from .log_edit_params import LogEditParams as LogEditParams
 from .log_list_params import LogListParams as LogListParams
+from .log_get_response import LogGetResponse as LogGetResponse
+from .url_get_response import URLGetResponse as URLGetResponse
+from .log_delete_params import LogDeleteParams as LogDeleteParams
 from .log_list_response import LogListResponse as LogListResponse
+from .dataset_list_params import DatasetListParams as DatasetListParams
+from .log_delete_response import LogDeleteResponse as LogDeleteResponse
+from .dataset_get_response import DatasetGetResponse as DatasetGetResponse
+from .dataset_create_params import DatasetCreateParams as DatasetCreateParams
+from .dataset_list_response import DatasetListResponse as DatasetListResponse
+from .dataset_update_params import DatasetUpdateParams as DatasetUpdateParams
 from .ai_gateway_list_params import AIGatewayListParams as AIGatewayListParams
+from .evaluation_list_params import EvaluationListParams as EvaluationListParams
 from .ai_gateway_get_response import AIGatewayGetResponse as AIGatewayGetResponse
+from .dataset_create_response import DatasetCreateResponse as DatasetCreateResponse
+from .dataset_delete_response import DatasetDeleteResponse as DatasetDeleteResponse
+from .dataset_update_response import DatasetUpdateResponse as DatasetUpdateResponse
+from .evaluation_get_response import EvaluationGetResponse as EvaluationGetResponse
 from .ai_gateway_create_params import AIGatewayCreateParams as AIGatewayCreateParams
 from .ai_gateway_list_response import AIGatewayListResponse as AIGatewayListResponse
 from .ai_gateway_update_params import AIGatewayUpdateParams as AIGatewayUpdateParams
+from .evaluation_create_params import EvaluationCreateParams as EvaluationCreateParams
+from .evaluation_list_response import EvaluationListResponse as EvaluationListResponse
 from .ai_gateway_create_response import AIGatewayCreateResponse as AIGatewayCreateResponse
 from .ai_gateway_delete_response import AIGatewayDeleteResponse as AIGatewayDeleteResponse
 from .ai_gateway_update_response import AIGatewayUpdateResponse as AIGatewayUpdateResponse
+from .evaluation_create_response import EvaluationCreateResponse as EvaluationCreateResponse
+from .evaluation_delete_response import EvaluationDeleteResponse as EvaluationDeleteResponse
+from .evaluation_type_list_params import EvaluationTypeListParams as EvaluationTypeListParams
+from .provider_config_list_params import ProviderConfigListParams as ProviderConfigListParams
+from .dynamic_routing_get_response import DynamicRoutingGetResponse as DynamicRoutingGetResponse
+from .dynamic_routing_create_params import DynamicRoutingCreateParams as DynamicRoutingCreateParams
+from .dynamic_routing_list_response import DynamicRoutingListResponse as DynamicRoutingListResponse
+from .dynamic_routing_update_params import DynamicRoutingUpdateParams as DynamicRoutingUpdateParams
+from .evaluation_type_list_response import EvaluationTypeListResponse as EvaluationTypeListResponse
+from .provider_config_create_params import ProviderConfigCreateParams as ProviderConfigCreateParams
+from .provider_config_list_response import ProviderConfigListResponse as ProviderConfigListResponse
+from .dynamic_routing_create_response import DynamicRoutingCreateResponse as DynamicRoutingCreateResponse
+from .dynamic_routing_delete_response import DynamicRoutingDeleteResponse as DynamicRoutingDeleteResponse
+from .dynamic_routing_update_response import DynamicRoutingUpdateResponse as DynamicRoutingUpdateResponse
+from .provider_config_create_response import ProviderConfigCreateResponse as ProviderConfigCreateResponse
+from .dynamic_routing_get_version_response import DynamicRoutingGetVersionResponse as DynamicRoutingGetVersionResponse
+from .dynamic_routing_create_version_params import (
+    DynamicRoutingCreateVersionParams as DynamicRoutingCreateVersionParams,
+)
+from .dynamic_routing_list_versions_response import (
+    DynamicRoutingListVersionsResponse as DynamicRoutingListVersionsResponse,
+)
+from .dynamic_routing_create_version_response import (
+    DynamicRoutingCreateVersionResponse as DynamicRoutingCreateVersionResponse,
+)
+from .dynamic_routing_create_deployment_params import (
+    DynamicRoutingCreateDeploymentParams as DynamicRoutingCreateDeploymentParams,
+)
+from .dynamic_routing_list_deployments_response import (
+    DynamicRoutingListDeploymentsResponse as DynamicRoutingListDeploymentsResponse,
+)
+from .dynamic_routing_create_deployment_response import (
+    DynamicRoutingCreateDeploymentResponse as DynamicRoutingCreateDeploymentResponse,
+)
diff --git a/src/cloudflare/types/ai_gateway/ai_gateway_create_params.py b/src/cloudflare/types/ai_gateway/ai_gateway_create_params.py
index 666a25e174e..be112a797dc 100644
--- a/src/cloudflare/types/ai_gateway/ai_gateway_create_params.py
+++ b/src/cloudflare/types/ai_gateway/ai_gateway_create_params.py
@@ -25,3 +25,17 @@ class AIGatewayCreateParams(TypedDict, total=False):
     rate_limiting_limit: Required[Optional[int]]
 
     rate_limiting_technique: Required[Literal["fixed", "sliding"]]
+
+    authentication: bool
+
+    is_default: bool
+
+    log_management: Optional[int]
+
+    log_management_strategy: Optional[Literal["STOP_INSERTING", "DELETE_OLDEST"]]
+
+    logpush: bool
+
+    logpush_public_key: Optional[str]
+
+    zdr: bool
diff --git a/src/cloudflare/types/ai_gateway/ai_gateway_create_response.py b/src/cloudflare/types/ai_gateway/ai_gateway_create_response.py
index 0b9b7af0175..690cf4b30d1 100644
--- a/src/cloudflare/types/ai_gateway/ai_gateway_create_response.py
+++ b/src/cloudflare/types/ai_gateway/ai_gateway_create_response.py
@@ -1,18 +1,78 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import Dict, List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
 
-__all__ = ["AIGatewayCreateResponse", "Task"]
+__all__ = [
+    "AIGatewayCreateResponse",
+    "DLP",
+    "DLPUnionMember0",
+    "DLPUnionMember1",
+    "DLPUnionMember1Policy",
+    "Otel",
+    "Stripe",
+    "StripeUsageEvent",
+]
 
 
-class Task(BaseModel):
+class DLPUnionMember0(BaseModel):
+    action: Literal["BLOCK", "FLAG"]
+
+    enabled: bool
+
+    profiles: List[str]
+
+
+class DLPUnionMember1Policy(BaseModel):
+    id: str
+
+    action: Literal["FLAG", "BLOCK"]
+
+    check: List[Literal["REQUEST", "RESPONSE"]]
+
+    enabled: bool
+
+    profiles: List[str]
+
+
+class DLPUnionMember1(BaseModel):
+    enabled: bool
+
+    policies: List[DLPUnionMember1Policy]
+
+
+DLP: TypeAlias = Union[DLPUnionMember0, DLPUnionMember1]
+
+
+class Otel(BaseModel):
+    authorization: str
+
+    headers: Dict[str, str]
+
+    url: str
+
+
+class StripeUsageEvent(BaseModel):
+    payload: str
+
+
+class Stripe(BaseModel):
+    authorization: str
+
+    usage_events: List[StripeUsageEvent]
+
+
+class AIGatewayCreateResponse(BaseModel):
     id: str
     """gateway id"""
 
+    account_id: str
+
+    account_tag: str
+
     cache_invalidate_on_update: bool
 
     cache_ttl: Optional[int] = None
@@ -21,6 +81,8 @@ class Task(BaseModel):
 
     created_at: datetime
 
+    internal_id: str
+
     modified_at: datetime
 
     rate_limiting_interval: Optional[int] = None
@@ -29,6 +91,24 @@ class Task(BaseModel):
 
     rate_limiting_technique: Literal["fixed", "sliding"]
 
+    authentication: Optional[bool] = None
 
-class AIGatewayCreateResponse(BaseModel):
-    task: Task
+    dlp: Optional[DLP] = None
+
+    is_default: Optional[bool] = None
+
+    log_management: Optional[int] = None
+
+    log_management_strategy: Optional[Literal["STOP_INSERTING", "DELETE_OLDEST"]] = None
+
+    logpush: Optional[bool] = None
+
+    logpush_public_key: Optional[str] = None
+
+    otel: Optional[List[Otel]] = None
+
+    store_id: Optional[str] = None
+
+    stripe: Optional[Stripe] = None
+
+    zdr: Optional[bool] = None
diff --git a/src/cloudflare/types/ai_gateway/ai_gateway_delete_response.py b/src/cloudflare/types/ai_gateway/ai_gateway_delete_response.py
index e66ae46e886..3575a8d62ad 100644
--- a/src/cloudflare/types/ai_gateway/ai_gateway_delete_response.py
+++ b/src/cloudflare/types/ai_gateway/ai_gateway_delete_response.py
@@ -1,18 +1,78 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import Dict, List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
 
-__all__ = ["AIGatewayDeleteResponse"]
+__all__ = [
+    "AIGatewayDeleteResponse",
+    "DLP",
+    "DLPUnionMember0",
+    "DLPUnionMember1",
+    "DLPUnionMember1Policy",
+    "Otel",
+    "Stripe",
+    "StripeUsageEvent",
+]
+
+
+class DLPUnionMember0(BaseModel):
+    action: Literal["BLOCK", "FLAG"]
+
+    enabled: bool
+
+    profiles: List[str]
+
+
+class DLPUnionMember1Policy(BaseModel):
+    id: str
+
+    action: Literal["FLAG", "BLOCK"]
+
+    check: List[Literal["REQUEST", "RESPONSE"]]
+
+    enabled: bool
+
+    profiles: List[str]
+
+
+class DLPUnionMember1(BaseModel):
+    enabled: bool
+
+    policies: List[DLPUnionMember1Policy]
+
+
+DLP: TypeAlias = Union[DLPUnionMember0, DLPUnionMember1]
+
+
+class Otel(BaseModel):
+    authorization: str
+
+    headers: Dict[str, str]
+
+    url: str
+
+
+class StripeUsageEvent(BaseModel):
+    payload: str
+
+
+class Stripe(BaseModel):
+    authorization: str
+
+    usage_events: List[StripeUsageEvent]
 
 
 class AIGatewayDeleteResponse(BaseModel):
     id: str
     """gateway id"""
 
+    account_id: str
+
+    account_tag: str
+
     cache_invalidate_on_update: bool
 
     cache_ttl: Optional[int] = None
@@ -21,6 +81,8 @@ class AIGatewayDeleteResponse(BaseModel):
 
     created_at: datetime
 
+    internal_id: str
+
     modified_at: datetime
 
     rate_limiting_interval: Optional[int] = None
@@ -28,3 +90,25 @@ class AIGatewayDeleteResponse(BaseModel):
     rate_limiting_limit: Optional[int] = None
 
     rate_limiting_technique: Literal["fixed", "sliding"]
+
+    authentication: Optional[bool] = None
+
+    dlp: Optional[DLP] = None
+
+    is_default: Optional[bool] = None
+
+    log_management: Optional[int] = None
+
+    log_management_strategy: Optional[Literal["STOP_INSERTING", "DELETE_OLDEST"]] = None
+
+    logpush: Optional[bool] = None
+
+    logpush_public_key: Optional[str] = None
+
+    otel: Optional[List[Otel]] = None
+
+    store_id: Optional[str] = None
+
+    stripe: Optional[Stripe] = None
+
+    zdr: Optional[bool] = None
diff --git a/src/cloudflare/types/ai_gateway/ai_gateway_get_response.py b/src/cloudflare/types/ai_gateway/ai_gateway_get_response.py
index d62e61d19b2..ad13af400f9 100644
--- a/src/cloudflare/types/ai_gateway/ai_gateway_get_response.py
+++ b/src/cloudflare/types/ai_gateway/ai_gateway_get_response.py
@@ -1,18 +1,78 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import Dict, List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
 
-__all__ = ["AIGatewayGetResponse"]
+__all__ = [
+    "AIGatewayGetResponse",
+    "DLP",
+    "DLPUnionMember0",
+    "DLPUnionMember1",
+    "DLPUnionMember1Policy",
+    "Otel",
+    "Stripe",
+    "StripeUsageEvent",
+]
+
+
+class DLPUnionMember0(BaseModel):
+    action: Literal["BLOCK", "FLAG"]
+
+    enabled: bool
+
+    profiles: List[str]
+
+
+class DLPUnionMember1Policy(BaseModel):
+    id: str
+
+    action: Literal["FLAG", "BLOCK"]
+
+    check: List[Literal["REQUEST", "RESPONSE"]]
+
+    enabled: bool
+
+    profiles: List[str]
+
+
+class DLPUnionMember1(BaseModel):
+    enabled: bool
+
+    policies: List[DLPUnionMember1Policy]
+
+
+DLP: TypeAlias = Union[DLPUnionMember0, DLPUnionMember1]
+
+
+class Otel(BaseModel):
+    authorization: str
+
+    headers: Dict[str, str]
+
+    url: str
+
+
+class StripeUsageEvent(BaseModel):
+    payload: str
+
+
+class Stripe(BaseModel):
+    authorization: str
+
+    usage_events: List[StripeUsageEvent]
 
 
 class AIGatewayGetResponse(BaseModel):
     id: str
     """gateway id"""
 
+    account_id: str
+
+    account_tag: str
+
     cache_invalidate_on_update: bool
 
     cache_ttl: Optional[int] = None
@@ -21,6 +81,8 @@ class AIGatewayGetResponse(BaseModel):
 
     created_at: datetime
 
+    internal_id: str
+
     modified_at: datetime
 
     rate_limiting_interval: Optional[int] = None
@@ -28,3 +90,25 @@ class AIGatewayGetResponse(BaseModel):
     rate_limiting_limit: Optional[int] = None
 
     rate_limiting_technique: Literal["fixed", "sliding"]
+
+    authentication: Optional[bool] = None
+
+    dlp: Optional[DLP] = None
+
+    is_default: Optional[bool] = None
+
+    log_management: Optional[int] = None
+
+    log_management_strategy: Optional[Literal["STOP_INSERTING", "DELETE_OLDEST"]] = None
+
+    logpush: Optional[bool] = None
+
+    logpush_public_key: Optional[str] = None
+
+    otel: Optional[List[Otel]] = None
+
+    store_id: Optional[str] = None
+
+    stripe: Optional[Stripe] = None
+
+    zdr: Optional[bool] = None
diff --git a/src/cloudflare/types/ai_gateway/ai_gateway_list_params.py b/src/cloudflare/types/ai_gateway/ai_gateway_list_params.py
index 71961792462..a2545d4af8e 100644
--- a/src/cloudflare/types/ai_gateway/ai_gateway_list_params.py
+++ b/src/cloudflare/types/ai_gateway/ai_gateway_list_params.py
@@ -10,12 +10,9 @@
 class AIGatewayListParams(TypedDict, total=False):
     account_id: Required[str]
 
-    id: str
-    """gateway id"""
-
-    order_by: str
-    """Order By Column Name"""
-
     page: int
 
     per_page: int
+
+    search: str
+    """Search by id"""
diff --git a/src/cloudflare/types/ai_gateway/ai_gateway_list_response.py b/src/cloudflare/types/ai_gateway/ai_gateway_list_response.py
index bd4a36e0bfb..99681cb27c7 100644
--- a/src/cloudflare/types/ai_gateway/ai_gateway_list_response.py
+++ b/src/cloudflare/types/ai_gateway/ai_gateway_list_response.py
@@ -1,18 +1,78 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import Dict, List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
 
-__all__ = ["AIGatewayListResponse"]
+__all__ = [
+    "AIGatewayListResponse",
+    "DLP",
+    "DLPUnionMember0",
+    "DLPUnionMember1",
+    "DLPUnionMember1Policy",
+    "Otel",
+    "Stripe",
+    "StripeUsageEvent",
+]
+
+
+class DLPUnionMember0(BaseModel):
+    action: Literal["BLOCK", "FLAG"]
+
+    enabled: bool
+
+    profiles: List[str]
+
+
+class DLPUnionMember1Policy(BaseModel):
+    id: str
+
+    action: Literal["FLAG", "BLOCK"]
+
+    check: List[Literal["REQUEST", "RESPONSE"]]
+
+    enabled: bool
+
+    profiles: List[str]
+
+
+class DLPUnionMember1(BaseModel):
+    enabled: bool
+
+    policies: List[DLPUnionMember1Policy]
+
+
+DLP: TypeAlias = Union[DLPUnionMember0, DLPUnionMember1]
+
+
+class Otel(BaseModel):
+    authorization: str
+
+    headers: Dict[str, str]
+
+    url: str
+
+
+class StripeUsageEvent(BaseModel):
+    payload: str
+
+
+class Stripe(BaseModel):
+    authorization: str
+
+    usage_events: List[StripeUsageEvent]
 
 
 class AIGatewayListResponse(BaseModel):
     id: str
     """gateway id"""
 
+    account_id: str
+
+    account_tag: str
+
     cache_invalidate_on_update: bool
 
     cache_ttl: Optional[int] = None
@@ -21,6 +81,8 @@ class AIGatewayListResponse(BaseModel):
 
     created_at: datetime
 
+    internal_id: str
+
     modified_at: datetime
 
     rate_limiting_interval: Optional[int] = None
@@ -28,3 +90,25 @@ class AIGatewayListResponse(BaseModel):
     rate_limiting_limit: Optional[int] = None
 
     rate_limiting_technique: Literal["fixed", "sliding"]
+
+    authentication: Optional[bool] = None
+
+    dlp: Optional[DLP] = None
+
+    is_default: Optional[bool] = None
+
+    log_management: Optional[int] = None
+
+    log_management_strategy: Optional[Literal["STOP_INSERTING", "DELETE_OLDEST"]] = None
+
+    logpush: Optional[bool] = None
+
+    logpush_public_key: Optional[str] = None
+
+    otel: Optional[List[Otel]] = None
+
+    store_id: Optional[str] = None
+
+    stripe: Optional[Stripe] = None
+
+    zdr: Optional[bool] = None
diff --git a/src/cloudflare/types/ai_gateway/ai_gateway_update_params.py b/src/cloudflare/types/ai_gateway/ai_gateway_update_params.py
index 05588bd7cf3..b59349236ae 100644
--- a/src/cloudflare/types/ai_gateway/ai_gateway_update_params.py
+++ b/src/cloudflare/types/ai_gateway/ai_gateway_update_params.py
@@ -2,10 +2,21 @@
 
 from __future__ import annotations
 
-from typing import Optional
-from typing_extensions import Literal, Required, TypedDict
+from typing import Dict, List, Union, Iterable, Optional
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
-__all__ = ["AIGatewayUpdateParams"]
+from ..._types import SequenceNotStr
+
+__all__ = [
+    "AIGatewayUpdateParams",
+    "DLP",
+    "DLPUnionMember0",
+    "DLPUnionMember1",
+    "DLPUnionMember1Policy",
+    "Otel",
+    "Stripe",
+    "StripeUsageEvent",
+]
 
 
 class AIGatewayUpdateParams(TypedDict, total=False):
@@ -22,3 +33,72 @@ class AIGatewayUpdateParams(TypedDict, total=False):
     rate_limiting_limit: Required[Optional[int]]
 
     rate_limiting_technique: Required[Literal["fixed", "sliding"]]
+
+    authentication: bool
+
+    dlp: DLP
+
+    is_default: bool
+
+    log_management: Optional[int]
+
+    log_management_strategy: Optional[Literal["STOP_INSERTING", "DELETE_OLDEST"]]
+
+    logpush: bool
+
+    logpush_public_key: Optional[str]
+
+    otel: Optional[Iterable[Otel]]
+
+    store_id: Optional[str]
+
+    stripe: Optional[Stripe]
+
+    zdr: bool
+
+
+class DLPUnionMember0(TypedDict, total=False):
+    action: Required[Literal["BLOCK", "FLAG"]]
+
+    enabled: Required[bool]
+
+    profiles: Required[SequenceNotStr[str]]
+
+
+class DLPUnionMember1Policy(TypedDict, total=False):
+    id: Required[str]
+
+    action: Required[Literal["FLAG", "BLOCK"]]
+
+    check: Required[List[Literal["REQUEST", "RESPONSE"]]]
+
+    enabled: Required[bool]
+
+    profiles: Required[SequenceNotStr[str]]
+
+
+class DLPUnionMember1(TypedDict, total=False):
+    enabled: Required[bool]
+
+    policies: Required[Iterable[DLPUnionMember1Policy]]
+
+
+DLP: TypeAlias = Union[DLPUnionMember0, DLPUnionMember1]
+
+
+class Otel(TypedDict, total=False):
+    authorization: Required[str]
+
+    headers: Required[Dict[str, str]]
+
+    url: Required[str]
+
+
+class StripeUsageEvent(TypedDict, total=False):
+    payload: Required[str]
+
+
+class Stripe(TypedDict, total=False):
+    authorization: Required[str]
+
+    usage_events: Required[Iterable[StripeUsageEvent]]
diff --git a/src/cloudflare/types/ai_gateway/ai_gateway_update_response.py b/src/cloudflare/types/ai_gateway/ai_gateway_update_response.py
index f07218099b5..6250e1cc8ba 100644
--- a/src/cloudflare/types/ai_gateway/ai_gateway_update_response.py
+++ b/src/cloudflare/types/ai_gateway/ai_gateway_update_response.py
@@ -1,18 +1,78 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import Dict, List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
 
-__all__ = ["AIGatewayUpdateResponse"]
+__all__ = [
+    "AIGatewayUpdateResponse",
+    "DLP",
+    "DLPUnionMember0",
+    "DLPUnionMember1",
+    "DLPUnionMember1Policy",
+    "Otel",
+    "Stripe",
+    "StripeUsageEvent",
+]
+
+
+class DLPUnionMember0(BaseModel):
+    action: Literal["BLOCK", "FLAG"]
+
+    enabled: bool
+
+    profiles: List[str]
+
+
+class DLPUnionMember1Policy(BaseModel):
+    id: str
+
+    action: Literal["FLAG", "BLOCK"]
+
+    check: List[Literal["REQUEST", "RESPONSE"]]
+
+    enabled: bool
+
+    profiles: List[str]
+
+
+class DLPUnionMember1(BaseModel):
+    enabled: bool
+
+    policies: List[DLPUnionMember1Policy]
+
+
+DLP: TypeAlias = Union[DLPUnionMember0, DLPUnionMember1]
+
+
+class Otel(BaseModel):
+    authorization: str
+
+    headers: Dict[str, str]
+
+    url: str
+
+
+class StripeUsageEvent(BaseModel):
+    payload: str
+
+
+class Stripe(BaseModel):
+    authorization: str
+
+    usage_events: List[StripeUsageEvent]
 
 
 class AIGatewayUpdateResponse(BaseModel):
     id: str
     """gateway id"""
 
+    account_id: str
+
+    account_tag: str
+
     cache_invalidate_on_update: bool
 
     cache_ttl: Optional[int] = None
@@ -21,6 +81,8 @@ class AIGatewayUpdateResponse(BaseModel):
 
     created_at: datetime
 
+    internal_id: str
+
     modified_at: datetime
 
     rate_limiting_interval: Optional[int] = None
@@ -28,3 +90,25 @@ class AIGatewayUpdateResponse(BaseModel):
     rate_limiting_limit: Optional[int] = None
 
     rate_limiting_technique: Literal["fixed", "sliding"]
+
+    authentication: Optional[bool] = None
+
+    dlp: Optional[DLP] = None
+
+    is_default: Optional[bool] = None
+
+    log_management: Optional[int] = None
+
+    log_management_strategy: Optional[Literal["STOP_INSERTING", "DELETE_OLDEST"]] = None
+
+    logpush: Optional[bool] = None
+
+    logpush_public_key: Optional[str] = None
+
+    otel: Optional[List[Otel]] = None
+
+    store_id: Optional[str] = None
+
+    stripe: Optional[Stripe] = None
+
+    zdr: Optional[bool] = None
diff --git a/src/cloudflare/types/ai_gateway/dataset_create_params.py b/src/cloudflare/types/ai_gateway/dataset_create_params.py
new file mode 100644
index 00000000000..8c558e8d20b
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dataset_create_params.py
@@ -0,0 +1,44 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["DatasetCreateParams", "Filter"]
+
+
+class DatasetCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    enable: Required[bool]
+
+    filters: Required[Iterable[Filter]]
+
+    name: Required[str]
+
+
+class Filter(TypedDict, total=False):
+    key: Required[
+        Literal[
+            "created_at",
+            "request_content_type",
+            "response_content_type",
+            "success",
+            "cached",
+            "provider",
+            "model",
+            "cost",
+            "tokens",
+            "tokens_in",
+            "tokens_out",
+            "duration",
+            "feedback",
+        ]
+    ]
+
+    operator: Required[Literal["eq", "contains", "lt", "gt"]]
+
+    value: Required[SequenceNotStr[Union[str, float, bool]]]
diff --git a/src/cloudflare/types/ai_gateway/dataset_create_response.py b/src/cloudflare/types/ai_gateway/dataset_create_response.py
new file mode 100644
index 00000000000..5be90be4a14
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dataset_create_response.py
@@ -0,0 +1,52 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["DatasetCreateResponse", "Filter"]
+
+
+class Filter(BaseModel):
+    key: Literal[
+        "created_at",
+        "request_content_type",
+        "response_content_type",
+        "success",
+        "cached",
+        "provider",
+        "model",
+        "cost",
+        "tokens",
+        "tokens_in",
+        "tokens_out",
+        "duration",
+        "feedback",
+    ]
+
+    operator: Literal["eq", "contains", "lt", "gt"]
+
+    value: List[Union[str, float, bool]]
+
+
+class DatasetCreateResponse(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    enable: bool
+
+    filters: List[Filter]
+
+    gateway_id: str
+    """gateway id"""
+
+    modified_at: datetime
+
+    name: str
diff --git a/src/cloudflare/types/ai_gateway/dataset_delete_response.py b/src/cloudflare/types/ai_gateway/dataset_delete_response.py
new file mode 100644
index 00000000000..9b9ede756f2
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dataset_delete_response.py
@@ -0,0 +1,52 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["DatasetDeleteResponse", "Filter"]
+
+
+class Filter(BaseModel):
+    key: Literal[
+        "created_at",
+        "request_content_type",
+        "response_content_type",
+        "success",
+        "cached",
+        "provider",
+        "model",
+        "cost",
+        "tokens",
+        "tokens_in",
+        "tokens_out",
+        "duration",
+        "feedback",
+    ]
+
+    operator: Literal["eq", "contains", "lt", "gt"]
+
+    value: List[Union[str, float, bool]]
+
+
+class DatasetDeleteResponse(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    enable: bool
+
+    filters: List[Filter]
+
+    gateway_id: str
+    """gateway id"""
+
+    modified_at: datetime
+
+    name: str
diff --git a/src/cloudflare/types/ai_gateway/dataset_get_response.py b/src/cloudflare/types/ai_gateway/dataset_get_response.py
new file mode 100644
index 00000000000..102c0cd1b49
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dataset_get_response.py
@@ -0,0 +1,52 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["DatasetGetResponse", "Filter"]
+
+
+class Filter(BaseModel):
+    key: Literal[
+        "created_at",
+        "request_content_type",
+        "response_content_type",
+        "success",
+        "cached",
+        "provider",
+        "model",
+        "cost",
+        "tokens",
+        "tokens_in",
+        "tokens_out",
+        "duration",
+        "feedback",
+    ]
+
+    operator: Literal["eq", "contains", "lt", "gt"]
+
+    value: List[Union[str, float, bool]]
+
+
+class DatasetGetResponse(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    enable: bool
+
+    filters: List[Filter]
+
+    gateway_id: str
+    """gateway id"""
+
+    modified_at: datetime
+
+    name: str
diff --git a/src/cloudflare/types/ai_gateway/dataset_list_params.py b/src/cloudflare/types/ai_gateway/dataset_list_params.py
new file mode 100644
index 00000000000..440331fa032
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dataset_list_params.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["DatasetListParams"]
+
+
+class DatasetListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    enable: bool
+
+    name: str
+
+    page: int
+
+    per_page: int
+
+    search: str
+    """Search by id, name, filters"""
diff --git a/src/cloudflare/types/ai_gateway/dataset_list_response.py b/src/cloudflare/types/ai_gateway/dataset_list_response.py
new file mode 100644
index 00000000000..cf9d6e28bd3
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dataset_list_response.py
@@ -0,0 +1,52 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["DatasetListResponse", "Filter"]
+
+
+class Filter(BaseModel):
+    key: Literal[
+        "created_at",
+        "request_content_type",
+        "response_content_type",
+        "success",
+        "cached",
+        "provider",
+        "model",
+        "cost",
+        "tokens",
+        "tokens_in",
+        "tokens_out",
+        "duration",
+        "feedback",
+    ]
+
+    operator: Literal["eq", "contains", "lt", "gt"]
+
+    value: List[Union[str, float, bool]]
+
+
+class DatasetListResponse(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    enable: bool
+
+    filters: List[Filter]
+
+    gateway_id: str
+    """gateway id"""
+
+    modified_at: datetime
+
+    name: str
diff --git a/src/cloudflare/types/ai_gateway/dataset_update_params.py b/src/cloudflare/types/ai_gateway/dataset_update_params.py
new file mode 100644
index 00000000000..78abca5484d
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dataset_update_params.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["DatasetUpdateParams", "Filter"]
+
+
+class DatasetUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    gateway_id: Required[str]
+    """gateway id"""
+
+    enable: Required[bool]
+
+    filters: Required[Iterable[Filter]]
+
+    name: Required[str]
+
+
+class Filter(TypedDict, total=False):
+    key: Required[
+        Literal[
+            "created_at",
+            "request_content_type",
+            "response_content_type",
+            "success",
+            "cached",
+            "provider",
+            "model",
+            "cost",
+            "tokens",
+            "tokens_in",
+            "tokens_out",
+            "duration",
+            "feedback",
+        ]
+    ]
+
+    operator: Required[Literal["eq", "contains", "lt", "gt"]]
+
+    value: Required[SequenceNotStr[Union[str, float, bool]]]
diff --git a/src/cloudflare/types/ai_gateway/dataset_update_response.py b/src/cloudflare/types/ai_gateway/dataset_update_response.py
new file mode 100644
index 00000000000..2cfeca9e20c
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dataset_update_response.py
@@ -0,0 +1,52 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["DatasetUpdateResponse", "Filter"]
+
+
+class Filter(BaseModel):
+    key: Literal[
+        "created_at",
+        "request_content_type",
+        "response_content_type",
+        "success",
+        "cached",
+        "provider",
+        "model",
+        "cost",
+        "tokens",
+        "tokens_in",
+        "tokens_out",
+        "duration",
+        "feedback",
+    ]
+
+    operator: Literal["eq", "contains", "lt", "gt"]
+
+    value: List[Union[str, float, bool]]
+
+
+class DatasetUpdateResponse(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    enable: bool
+
+    filters: List[Filter]
+
+    gateway_id: str
+    """gateway id"""
+
+    modified_at: datetime
+
+    name: str
diff --git a/src/cloudflare/types/ai_gateway/dynamic_routing_create_deployment_params.py b/src/cloudflare/types/ai_gateway/dynamic_routing_create_deployment_params.py
new file mode 100644
index 00000000000..f481575dafd
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dynamic_routing_create_deployment_params.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["DynamicRoutingCreateDeploymentParams"]
+
+
+class DynamicRoutingCreateDeploymentParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    gateway_id: Required[str]
+
+    comment: Required[str]
+
+    version_id: Required[str]
diff --git a/src/cloudflare/types/ai_gateway/dynamic_routing_create_deployment_response.py b/src/cloudflare/types/ai_gateway/dynamic_routing_create_deployment_response.py
new file mode 100644
index 00000000000..52f0bcbcfae
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dynamic_routing_create_deployment_response.py
@@ -0,0 +1,198 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "DynamicRoutingCreateDeploymentResponse",
+    "Element",
+    "ElementUnionMember0",
+    "ElementUnionMember0Outputs",
+    "ElementUnionMember0OutputsNext",
+    "ElementUnionMember1",
+    "ElementUnionMember1Outputs",
+    "ElementUnionMember1OutputsFalse_",
+    "ElementUnionMember1OutputsTrue_",
+    "ElementUnionMember1Properties",
+    "ElementUnionMember2",
+    "ElementUnionMember2Outputs",
+    "ElementUnionMember3",
+    "ElementUnionMember3Outputs",
+    "ElementUnionMember3OutputsFallback",
+    "ElementUnionMember3OutputsSuccess",
+    "ElementUnionMember3Properties",
+    "ElementUnionMember4",
+    "ElementUnionMember4Outputs",
+    "ElementUnionMember4OutputsFallback",
+    "ElementUnionMember4OutputsSuccess",
+    "ElementUnionMember4Properties",
+    "ElementUnionMember5",
+    "ElementUnionMember5Outputs",
+]
+
+
+class ElementUnionMember0OutputsNext(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember0Outputs(BaseModel):
+    next: ElementUnionMember0OutputsNext
+
+
+class ElementUnionMember0(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember0Outputs
+
+    type: Literal["start"]
+
+
+class ElementUnionMember1OutputsFalse_(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember1OutputsTrue_(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember1Outputs(BaseModel):
+    false: ElementUnionMember1OutputsFalse_
+
+    true: ElementUnionMember1OutputsTrue_
+
+
+class ElementUnionMember1Properties(BaseModel):
+    conditions: Optional[object] = None
+
+
+class ElementUnionMember1(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember1Outputs
+
+    properties: ElementUnionMember1Properties
+
+    type: Literal["conditional"]
+
+
+class ElementUnionMember2Outputs(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember2(BaseModel):
+    id: str
+
+    outputs: Dict[str, ElementUnionMember2Outputs]
+
+    type: Literal["percentage"]
+
+
+class ElementUnionMember3OutputsFallback(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember3OutputsSuccess(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember3Outputs(BaseModel):
+    fallback: ElementUnionMember3OutputsFallback
+
+    success: ElementUnionMember3OutputsSuccess
+
+
+class ElementUnionMember3Properties(BaseModel):
+    key: str
+
+    limit: float
+
+    limit_type: Literal["count", "cost"] = FieldInfo(alias="limitType")
+
+    window: float
+
+
+class ElementUnionMember3(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember3Outputs
+
+    properties: ElementUnionMember3Properties
+
+    type: Literal["rate"]
+
+
+class ElementUnionMember4OutputsFallback(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember4OutputsSuccess(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember4Outputs(BaseModel):
+    fallback: ElementUnionMember4OutputsFallback
+
+    success: ElementUnionMember4OutputsSuccess
+
+
+class ElementUnionMember4Properties(BaseModel):
+    model: str
+
+    provider: str
+
+    retries: float
+
+    timeout: float
+
+
+class ElementUnionMember4(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember4Outputs
+
+    properties: ElementUnionMember4Properties
+
+    type: Literal["model"]
+
+
+class ElementUnionMember5Outputs(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember5(BaseModel):
+    id: str
+
+    outputs: Dict[str, ElementUnionMember5Outputs]
+
+    type: Literal["end"]
+
+
+Element: TypeAlias = Union[
+    ElementUnionMember0,
+    ElementUnionMember1,
+    ElementUnionMember2,
+    ElementUnionMember3,
+    ElementUnionMember4,
+    ElementUnionMember5,
+]
+
+
+class DynamicRoutingCreateDeploymentResponse(BaseModel):
+    id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    elements: List[Element]
+
+    gateway_id: str
+
+    modified_at: datetime
+
+    name: str
diff --git a/src/cloudflare/types/ai_gateway/dynamic_routing_create_params.py b/src/cloudflare/types/ai_gateway/dynamic_routing_create_params.py
new file mode 100644
index 00000000000..135063ee111
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dynamic_routing_create_params.py
@@ -0,0 +1,189 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Union, Iterable
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = [
+    "DynamicRoutingCreateParams",
+    "Element",
+    "ElementUnionMember0",
+    "ElementUnionMember0Outputs",
+    "ElementUnionMember0OutputsNext",
+    "ElementUnionMember1",
+    "ElementUnionMember1Outputs",
+    "ElementUnionMember1OutputsFalse_",
+    "ElementUnionMember1OutputsTrue_",
+    "ElementUnionMember1Properties",
+    "ElementUnionMember2",
+    "ElementUnionMember2Outputs",
+    "ElementUnionMember3",
+    "ElementUnionMember3Outputs",
+    "ElementUnionMember3OutputsFallback",
+    "ElementUnionMember3OutputsSuccess",
+    "ElementUnionMember3Properties",
+    "ElementUnionMember4",
+    "ElementUnionMember4Outputs",
+    "ElementUnionMember4OutputsFallback",
+    "ElementUnionMember4OutputsSuccess",
+    "ElementUnionMember4Properties",
+    "ElementUnionMember5",
+    "ElementUnionMember5Outputs",
+]
+
+
+class DynamicRoutingCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    elements: Required[Iterable[Element]]
+
+    name: Required[str]
+
+
+class ElementUnionMember0OutputsNext(TypedDict, total=False):
+    element_id: Required[Annotated[str, PropertyInfo(alias="elementId")]]
+
+
+class ElementUnionMember0Outputs(TypedDict, total=False):
+    next: Required[ElementUnionMember0OutputsNext]
+
+
+class ElementUnionMember0(TypedDict, total=False):
+    id: Required[str]
+
+    outputs: Required[ElementUnionMember0Outputs]
+
+    type: Required[Literal["start"]]
+
+
+class ElementUnionMember1OutputsFalse_(TypedDict, total=False):
+    element_id: Required[Annotated[str, PropertyInfo(alias="elementId")]]
+
+
+class ElementUnionMember1OutputsTrue_(TypedDict, total=False):
+    element_id: Required[Annotated[str, PropertyInfo(alias="elementId")]]
+
+
+class ElementUnionMember1Outputs(TypedDict, total=False):
+    false: Required[ElementUnionMember1OutputsFalse_]
+
+    true: Required[ElementUnionMember1OutputsTrue_]
+
+
+class ElementUnionMember1Properties(TypedDict, total=False):
+    conditions: object
+
+
+class ElementUnionMember1(TypedDict, total=False):
+    id: Required[str]
+
+    outputs: Required[ElementUnionMember1Outputs]
+
+    properties: Required[ElementUnionMember1Properties]
+
+    type: Required[Literal["conditional"]]
+
+
+class ElementUnionMember2Outputs(TypedDict, total=False):
+    element_id: Required[Annotated[str, PropertyInfo(alias="elementId")]]
+
+
+class ElementUnionMember2(TypedDict, total=False):
+    id: Required[str]
+
+    outputs: Required[Dict[str, ElementUnionMember2Outputs]]
+
+    type: Required[Literal["percentage"]]
+
+
+class ElementUnionMember3OutputsFallback(TypedDict, total=False):
+    element_id: Required[Annotated[str, PropertyInfo(alias="elementId")]]
+
+
+class ElementUnionMember3OutputsSuccess(TypedDict, total=False):
+    element_id: Required[Annotated[str, PropertyInfo(alias="elementId")]]
+
+
+class ElementUnionMember3Outputs(TypedDict, total=False):
+    fallback: Required[ElementUnionMember3OutputsFallback]
+
+    success: Required[ElementUnionMember3OutputsSuccess]
+
+
+class ElementUnionMember3Properties(TypedDict, total=False):
+    key: Required[str]
+
+    limit: Required[float]
+
+    limit_type: Required[Annotated[Literal["count", "cost"], PropertyInfo(alias="limitType")]]
+
+    window: Required[float]
+
+
+class ElementUnionMember3(TypedDict, total=False):
+    id: Required[str]
+
+    outputs: Required[ElementUnionMember3Outputs]
+
+    properties: Required[ElementUnionMember3Properties]
+
+    type: Required[Literal["rate"]]
+
+
+class ElementUnionMember4OutputsFallback(TypedDict, total=False):
+    element_id: Required[Annotated[str, PropertyInfo(alias="elementId")]]
+
+
+class ElementUnionMember4OutputsSuccess(TypedDict, total=False):
+    element_id: Required[Annotated[str, PropertyInfo(alias="elementId")]]
+
+
+class ElementUnionMember4Outputs(TypedDict, total=False):
+    fallback: Required[ElementUnionMember4OutputsFallback]
+
+    success: Required[ElementUnionMember4OutputsSuccess]
+
+
+class ElementUnionMember4Properties(TypedDict, total=False):
+    model: Required[str]
+
+    provider: Required[str]
+
+    retries: Required[float]
+
+    timeout: Required[float]
+
+
+class ElementUnionMember4(TypedDict, total=False):
+    id: Required[str]
+
+    outputs: Required[ElementUnionMember4Outputs]
+
+    properties: Required[ElementUnionMember4Properties]
+
+    type: Required[Literal["model"]]
+
+
+class ElementUnionMember5Outputs(TypedDict, total=False):
+    element_id: Required[Annotated[str, PropertyInfo(alias="elementId")]]
+
+
+class ElementUnionMember5(TypedDict, total=False):
+    id: Required[str]
+
+    outputs: Required[Dict[str, ElementUnionMember5Outputs]]
+
+    type: Required[Literal["end"]]
+
+
+Element: TypeAlias = Union[
+    ElementUnionMember0,
+    ElementUnionMember1,
+    ElementUnionMember2,
+    ElementUnionMember3,
+    ElementUnionMember4,
+    ElementUnionMember5,
+]
diff --git a/src/cloudflare/types/ai_gateway/dynamic_routing_create_response.py b/src/cloudflare/types/ai_gateway/dynamic_routing_create_response.py
new file mode 100644
index 00000000000..c474ddb8514
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dynamic_routing_create_response.py
@@ -0,0 +1,226 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "DynamicRoutingCreateResponse",
+    "Deployment",
+    "Element",
+    "ElementUnionMember0",
+    "ElementUnionMember0Outputs",
+    "ElementUnionMember0OutputsNext",
+    "ElementUnionMember1",
+    "ElementUnionMember1Outputs",
+    "ElementUnionMember1OutputsFalse_",
+    "ElementUnionMember1OutputsTrue_",
+    "ElementUnionMember1Properties",
+    "ElementUnionMember2",
+    "ElementUnionMember2Outputs",
+    "ElementUnionMember3",
+    "ElementUnionMember3Outputs",
+    "ElementUnionMember3OutputsFallback",
+    "ElementUnionMember3OutputsSuccess",
+    "ElementUnionMember3Properties",
+    "ElementUnionMember4",
+    "ElementUnionMember4Outputs",
+    "ElementUnionMember4OutputsFallback",
+    "ElementUnionMember4OutputsSuccess",
+    "ElementUnionMember4Properties",
+    "ElementUnionMember5",
+    "ElementUnionMember5Outputs",
+    "Version",
+]
+
+
+class Deployment(BaseModel):
+    created_at: str
+
+    deployment_id: str
+
+    version_id: str
+
+    comment: Optional[str] = None
+
+
+class ElementUnionMember0OutputsNext(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember0Outputs(BaseModel):
+    next: ElementUnionMember0OutputsNext
+
+
+class ElementUnionMember0(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember0Outputs
+
+    type: Literal["start"]
+
+
+class ElementUnionMember1OutputsFalse_(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember1OutputsTrue_(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember1Outputs(BaseModel):
+    false: ElementUnionMember1OutputsFalse_
+
+    true: ElementUnionMember1OutputsTrue_
+
+
+class ElementUnionMember1Properties(BaseModel):
+    conditions: Optional[object] = None
+
+
+class ElementUnionMember1(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember1Outputs
+
+    properties: ElementUnionMember1Properties
+
+    type: Literal["conditional"]
+
+
+class ElementUnionMember2Outputs(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember2(BaseModel):
+    id: str
+
+    outputs: Dict[str, ElementUnionMember2Outputs]
+
+    type: Literal["percentage"]
+
+
+class ElementUnionMember3OutputsFallback(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember3OutputsSuccess(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember3Outputs(BaseModel):
+    fallback: ElementUnionMember3OutputsFallback
+
+    success: ElementUnionMember3OutputsSuccess
+
+
+class ElementUnionMember3Properties(BaseModel):
+    key: str
+
+    limit: float
+
+    limit_type: Literal["count", "cost"] = FieldInfo(alias="limitType")
+
+    window: float
+
+
+class ElementUnionMember3(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember3Outputs
+
+    properties: ElementUnionMember3Properties
+
+    type: Literal["rate"]
+
+
+class ElementUnionMember4OutputsFallback(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember4OutputsSuccess(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember4Outputs(BaseModel):
+    fallback: ElementUnionMember4OutputsFallback
+
+    success: ElementUnionMember4OutputsSuccess
+
+
+class ElementUnionMember4Properties(BaseModel):
+    model: str
+
+    provider: str
+
+    retries: float
+
+    timeout: float
+
+
+class ElementUnionMember4(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember4Outputs
+
+    properties: ElementUnionMember4Properties
+
+    type: Literal["model"]
+
+
+class ElementUnionMember5Outputs(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember5(BaseModel):
+    id: str
+
+    outputs: Dict[str, ElementUnionMember5Outputs]
+
+    type: Literal["end"]
+
+
+Element: TypeAlias = Union[
+    ElementUnionMember0,
+    ElementUnionMember1,
+    ElementUnionMember2,
+    ElementUnionMember3,
+    ElementUnionMember4,
+    ElementUnionMember5,
+]
+
+
+class Version(BaseModel):
+    active: Literal["true", "false"]
+
+    created_at: str
+
+    data: str
+
+    version_id: str
+
+    comment: Optional[str] = None
+
+
+class DynamicRoutingCreateResponse(BaseModel):
+    id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    deployment: Deployment
+
+    elements: List[Element]
+
+    gateway_id: str
+
+    modified_at: datetime
+
+    name: str
+
+    version: Version
diff --git a/src/cloudflare/types/ai_gateway/dynamic_routing_create_version_params.py b/src/cloudflare/types/ai_gateway/dynamic_routing_create_version_params.py
new file mode 100644
index 00000000000..06123fe2f98
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dynamic_routing_create_version_params.py
@@ -0,0 +1,191 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Union, Iterable
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = [
+    "DynamicRoutingCreateVersionParams",
+    "Element",
+    "ElementUnionMember0",
+    "ElementUnionMember0Outputs",
+    "ElementUnionMember0OutputsNext",
+    "ElementUnionMember1",
+    "ElementUnionMember1Outputs",
+    "ElementUnionMember1OutputsFalse_",
+    "ElementUnionMember1OutputsTrue_",
+    "ElementUnionMember1Properties",
+    "ElementUnionMember2",
+    "ElementUnionMember2Outputs",
+    "ElementUnionMember3",
+    "ElementUnionMember3Outputs",
+    "ElementUnionMember3OutputsFallback",
+    "ElementUnionMember3OutputsSuccess",
+    "ElementUnionMember3Properties",
+    "ElementUnionMember4",
+    "ElementUnionMember4Outputs",
+    "ElementUnionMember4OutputsFallback",
+    "ElementUnionMember4OutputsSuccess",
+    "ElementUnionMember4Properties",
+    "ElementUnionMember5",
+    "ElementUnionMember5Outputs",
+]
+
+
+class DynamicRoutingCreateVersionParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    gateway_id: Required[str]
+
+    comment: Required[str]
+
+    elements: Required[Iterable[Element]]
+
+
+class ElementUnionMember0OutputsNext(TypedDict, total=False):
+    element_id: Required[Annotated[str, PropertyInfo(alias="elementId")]]
+
+
+class ElementUnionMember0Outputs(TypedDict, total=False):
+    next: Required[ElementUnionMember0OutputsNext]
+
+
+class ElementUnionMember0(TypedDict, total=False):
+    id: Required[str]
+
+    outputs: Required[ElementUnionMember0Outputs]
+
+    type: Required[Literal["start"]]
+
+
+class ElementUnionMember1OutputsFalse_(TypedDict, total=False):
+    element_id: Required[Annotated[str, PropertyInfo(alias="elementId")]]
+
+
+class ElementUnionMember1OutputsTrue_(TypedDict, total=False):
+    element_id: Required[Annotated[str, PropertyInfo(alias="elementId")]]
+
+
+class ElementUnionMember1Outputs(TypedDict, total=False):
+    false: Required[ElementUnionMember1OutputsFalse_]
+
+    true: Required[ElementUnionMember1OutputsTrue_]
+
+
+class ElementUnionMember1Properties(TypedDict, total=False):
+    conditions: object
+
+
+class ElementUnionMember1(TypedDict, total=False):
+    id: Required[str]
+
+    outputs: Required[ElementUnionMember1Outputs]
+
+    properties: Required[ElementUnionMember1Properties]
+
+    type: Required[Literal["conditional"]]
+
+
+class ElementUnionMember2Outputs(TypedDict, total=False):
+    element_id: Required[Annotated[str, PropertyInfo(alias="elementId")]]
+
+
+class ElementUnionMember2(TypedDict, total=False):
+    id: Required[str]
+
+    outputs: Required[Dict[str, ElementUnionMember2Outputs]]
+
+    type: Required[Literal["percentage"]]
+
+
+class ElementUnionMember3OutputsFallback(TypedDict, total=False):
+    element_id: Required[Annotated[str, PropertyInfo(alias="elementId")]]
+
+
+class ElementUnionMember3OutputsSuccess(TypedDict, total=False):
+    element_id: Required[Annotated[str, PropertyInfo(alias="elementId")]]
+
+
+class ElementUnionMember3Outputs(TypedDict, total=False):
+    fallback: Required[ElementUnionMember3OutputsFallback]
+
+    success: Required[ElementUnionMember3OutputsSuccess]
+
+
+class ElementUnionMember3Properties(TypedDict, total=False):
+    key: Required[str]
+
+    limit: Required[float]
+
+    limit_type: Required[Annotated[Literal["count", "cost"], PropertyInfo(alias="limitType")]]
+
+    window: Required[float]
+
+
+class ElementUnionMember3(TypedDict, total=False):
+    id: Required[str]
+
+    outputs: Required[ElementUnionMember3Outputs]
+
+    properties: Required[ElementUnionMember3Properties]
+
+    type: Required[Literal["rate"]]
+
+
+class ElementUnionMember4OutputsFallback(TypedDict, total=False):
+    element_id: Required[Annotated[str, PropertyInfo(alias="elementId")]]
+
+
+class ElementUnionMember4OutputsSuccess(TypedDict, total=False):
+    element_id: Required[Annotated[str, PropertyInfo(alias="elementId")]]
+
+
+class ElementUnionMember4Outputs(TypedDict, total=False):
+    fallback: Required[ElementUnionMember4OutputsFallback]
+
+    success: Required[ElementUnionMember4OutputsSuccess]
+
+
+class ElementUnionMember4Properties(TypedDict, total=False):
+    model: Required[str]
+
+    provider: Required[str]
+
+    retries: Required[float]
+
+    timeout: Required[float]
+
+
+class ElementUnionMember4(TypedDict, total=False):
+    id: Required[str]
+
+    outputs: Required[ElementUnionMember4Outputs]
+
+    properties: Required[ElementUnionMember4Properties]
+
+    type: Required[Literal["model"]]
+
+
+class ElementUnionMember5Outputs(TypedDict, total=False):
+    element_id: Required[Annotated[str, PropertyInfo(alias="elementId")]]
+
+
+class ElementUnionMember5(TypedDict, total=False):
+    id: Required[str]
+
+    outputs: Required[Dict[str, ElementUnionMember5Outputs]]
+
+    type: Required[Literal["end"]]
+
+
+Element: TypeAlias = Union[
+    ElementUnionMember0,
+    ElementUnionMember1,
+    ElementUnionMember2,
+    ElementUnionMember3,
+    ElementUnionMember4,
+    ElementUnionMember5,
+]
diff --git a/src/cloudflare/types/ai_gateway/dynamic_routing_create_version_response.py b/src/cloudflare/types/ai_gateway/dynamic_routing_create_version_response.py
new file mode 100644
index 00000000000..7ceef2f3a58
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dynamic_routing_create_version_response.py
@@ -0,0 +1,198 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "DynamicRoutingCreateVersionResponse",
+    "Element",
+    "ElementUnionMember0",
+    "ElementUnionMember0Outputs",
+    "ElementUnionMember0OutputsNext",
+    "ElementUnionMember1",
+    "ElementUnionMember1Outputs",
+    "ElementUnionMember1OutputsFalse_",
+    "ElementUnionMember1OutputsTrue_",
+    "ElementUnionMember1Properties",
+    "ElementUnionMember2",
+    "ElementUnionMember2Outputs",
+    "ElementUnionMember3",
+    "ElementUnionMember3Outputs",
+    "ElementUnionMember3OutputsFallback",
+    "ElementUnionMember3OutputsSuccess",
+    "ElementUnionMember3Properties",
+    "ElementUnionMember4",
+    "ElementUnionMember4Outputs",
+    "ElementUnionMember4OutputsFallback",
+    "ElementUnionMember4OutputsSuccess",
+    "ElementUnionMember4Properties",
+    "ElementUnionMember5",
+    "ElementUnionMember5Outputs",
+]
+
+
+class ElementUnionMember0OutputsNext(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember0Outputs(BaseModel):
+    next: ElementUnionMember0OutputsNext
+
+
+class ElementUnionMember0(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember0Outputs
+
+    type: Literal["start"]
+
+
+class ElementUnionMember1OutputsFalse_(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember1OutputsTrue_(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember1Outputs(BaseModel):
+    false: ElementUnionMember1OutputsFalse_
+
+    true: ElementUnionMember1OutputsTrue_
+
+
+class ElementUnionMember1Properties(BaseModel):
+    conditions: Optional[object] = None
+
+
+class ElementUnionMember1(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember1Outputs
+
+    properties: ElementUnionMember1Properties
+
+    type: Literal["conditional"]
+
+
+class ElementUnionMember2Outputs(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember2(BaseModel):
+    id: str
+
+    outputs: Dict[str, ElementUnionMember2Outputs]
+
+    type: Literal["percentage"]
+
+
+class ElementUnionMember3OutputsFallback(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember3OutputsSuccess(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember3Outputs(BaseModel):
+    fallback: ElementUnionMember3OutputsFallback
+
+    success: ElementUnionMember3OutputsSuccess
+
+
+class ElementUnionMember3Properties(BaseModel):
+    key: str
+
+    limit: float
+
+    limit_type: Literal["count", "cost"] = FieldInfo(alias="limitType")
+
+    window: float
+
+
+class ElementUnionMember3(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember3Outputs
+
+    properties: ElementUnionMember3Properties
+
+    type: Literal["rate"]
+
+
+class ElementUnionMember4OutputsFallback(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember4OutputsSuccess(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember4Outputs(BaseModel):
+    fallback: ElementUnionMember4OutputsFallback
+
+    success: ElementUnionMember4OutputsSuccess
+
+
+class ElementUnionMember4Properties(BaseModel):
+    model: str
+
+    provider: str
+
+    retries: float
+
+    timeout: float
+
+
+class ElementUnionMember4(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember4Outputs
+
+    properties: ElementUnionMember4Properties
+
+    type: Literal["model"]
+
+
+class ElementUnionMember5Outputs(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember5(BaseModel):
+    id: str
+
+    outputs: Dict[str, ElementUnionMember5Outputs]
+
+    type: Literal["end"]
+
+
+Element: TypeAlias = Union[
+    ElementUnionMember0,
+    ElementUnionMember1,
+    ElementUnionMember2,
+    ElementUnionMember3,
+    ElementUnionMember4,
+    ElementUnionMember5,
+]
+
+
+class DynamicRoutingCreateVersionResponse(BaseModel):
+    id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    elements: List[Element]
+
+    gateway_id: str
+
+    modified_at: datetime
+
+    name: str
diff --git a/src/cloudflare/types/ai_gateway/dynamic_routing_delete_response.py b/src/cloudflare/types/ai_gateway/dynamic_routing_delete_response.py
new file mode 100644
index 00000000000..32a4772e569
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dynamic_routing_delete_response.py
@@ -0,0 +1,198 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "DynamicRoutingDeleteResponse",
+    "Element",
+    "ElementUnionMember0",
+    "ElementUnionMember0Outputs",
+    "ElementUnionMember0OutputsNext",
+    "ElementUnionMember1",
+    "ElementUnionMember1Outputs",
+    "ElementUnionMember1OutputsFalse_",
+    "ElementUnionMember1OutputsTrue_",
+    "ElementUnionMember1Properties",
+    "ElementUnionMember2",
+    "ElementUnionMember2Outputs",
+    "ElementUnionMember3",
+    "ElementUnionMember3Outputs",
+    "ElementUnionMember3OutputsFallback",
+    "ElementUnionMember3OutputsSuccess",
+    "ElementUnionMember3Properties",
+    "ElementUnionMember4",
+    "ElementUnionMember4Outputs",
+    "ElementUnionMember4OutputsFallback",
+    "ElementUnionMember4OutputsSuccess",
+    "ElementUnionMember4Properties",
+    "ElementUnionMember5",
+    "ElementUnionMember5Outputs",
+]
+
+
+class ElementUnionMember0OutputsNext(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember0Outputs(BaseModel):
+    next: ElementUnionMember0OutputsNext
+
+
+class ElementUnionMember0(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember0Outputs
+
+    type: Literal["start"]
+
+
+class ElementUnionMember1OutputsFalse_(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember1OutputsTrue_(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember1Outputs(BaseModel):
+    false: ElementUnionMember1OutputsFalse_
+
+    true: ElementUnionMember1OutputsTrue_
+
+
+class ElementUnionMember1Properties(BaseModel):
+    conditions: Optional[object] = None
+
+
+class ElementUnionMember1(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember1Outputs
+
+    properties: ElementUnionMember1Properties
+
+    type: Literal["conditional"]
+
+
+class ElementUnionMember2Outputs(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember2(BaseModel):
+    id: str
+
+    outputs: Dict[str, ElementUnionMember2Outputs]
+
+    type: Literal["percentage"]
+
+
+class ElementUnionMember3OutputsFallback(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember3OutputsSuccess(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember3Outputs(BaseModel):
+    fallback: ElementUnionMember3OutputsFallback
+
+    success: ElementUnionMember3OutputsSuccess
+
+
+class ElementUnionMember3Properties(BaseModel):
+    key: str
+
+    limit: float
+
+    limit_type: Literal["count", "cost"] = FieldInfo(alias="limitType")
+
+    window: float
+
+
+class ElementUnionMember3(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember3Outputs
+
+    properties: ElementUnionMember3Properties
+
+    type: Literal["rate"]
+
+
+class ElementUnionMember4OutputsFallback(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember4OutputsSuccess(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember4Outputs(BaseModel):
+    fallback: ElementUnionMember4OutputsFallback
+
+    success: ElementUnionMember4OutputsSuccess
+
+
+class ElementUnionMember4Properties(BaseModel):
+    model: str
+
+    provider: str
+
+    retries: float
+
+    timeout: float
+
+
+class ElementUnionMember4(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember4Outputs
+
+    properties: ElementUnionMember4Properties
+
+    type: Literal["model"]
+
+
+class ElementUnionMember5Outputs(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember5(BaseModel):
+    id: str
+
+    outputs: Dict[str, ElementUnionMember5Outputs]
+
+    type: Literal["end"]
+
+
+Element: TypeAlias = Union[
+    ElementUnionMember0,
+    ElementUnionMember1,
+    ElementUnionMember2,
+    ElementUnionMember3,
+    ElementUnionMember4,
+    ElementUnionMember5,
+]
+
+
+class DynamicRoutingDeleteResponse(BaseModel):
+    id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    elements: List[Element]
+
+    gateway_id: str
+
+    modified_at: datetime
+
+    name: str
diff --git a/src/cloudflare/types/ai_gateway/dynamic_routing_get_response.py b/src/cloudflare/types/ai_gateway/dynamic_routing_get_response.py
new file mode 100644
index 00000000000..d2641a522fb
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dynamic_routing_get_response.py
@@ -0,0 +1,226 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "DynamicRoutingGetResponse",
+    "Deployment",
+    "Element",
+    "ElementUnionMember0",
+    "ElementUnionMember0Outputs",
+    "ElementUnionMember0OutputsNext",
+    "ElementUnionMember1",
+    "ElementUnionMember1Outputs",
+    "ElementUnionMember1OutputsFalse_",
+    "ElementUnionMember1OutputsTrue_",
+    "ElementUnionMember1Properties",
+    "ElementUnionMember2",
+    "ElementUnionMember2Outputs",
+    "ElementUnionMember3",
+    "ElementUnionMember3Outputs",
+    "ElementUnionMember3OutputsFallback",
+    "ElementUnionMember3OutputsSuccess",
+    "ElementUnionMember3Properties",
+    "ElementUnionMember4",
+    "ElementUnionMember4Outputs",
+    "ElementUnionMember4OutputsFallback",
+    "ElementUnionMember4OutputsSuccess",
+    "ElementUnionMember4Properties",
+    "ElementUnionMember5",
+    "ElementUnionMember5Outputs",
+    "Version",
+]
+
+
+class Deployment(BaseModel):
+    created_at: str
+
+    deployment_id: str
+
+    version_id: str
+
+    comment: Optional[str] = None
+
+
+class ElementUnionMember0OutputsNext(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember0Outputs(BaseModel):
+    next: ElementUnionMember0OutputsNext
+
+
+class ElementUnionMember0(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember0Outputs
+
+    type: Literal["start"]
+
+
+class ElementUnionMember1OutputsFalse_(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember1OutputsTrue_(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember1Outputs(BaseModel):
+    false: ElementUnionMember1OutputsFalse_
+
+    true: ElementUnionMember1OutputsTrue_
+
+
+class ElementUnionMember1Properties(BaseModel):
+    conditions: Optional[object] = None
+
+
+class ElementUnionMember1(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember1Outputs
+
+    properties: ElementUnionMember1Properties
+
+    type: Literal["conditional"]
+
+
+class ElementUnionMember2Outputs(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember2(BaseModel):
+    id: str
+
+    outputs: Dict[str, ElementUnionMember2Outputs]
+
+    type: Literal["percentage"]
+
+
+class ElementUnionMember3OutputsFallback(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember3OutputsSuccess(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember3Outputs(BaseModel):
+    fallback: ElementUnionMember3OutputsFallback
+
+    success: ElementUnionMember3OutputsSuccess
+
+
+class ElementUnionMember3Properties(BaseModel):
+    key: str
+
+    limit: float
+
+    limit_type: Literal["count", "cost"] = FieldInfo(alias="limitType")
+
+    window: float
+
+
+class ElementUnionMember3(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember3Outputs
+
+    properties: ElementUnionMember3Properties
+
+    type: Literal["rate"]
+
+
+class ElementUnionMember4OutputsFallback(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember4OutputsSuccess(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember4Outputs(BaseModel):
+    fallback: ElementUnionMember4OutputsFallback
+
+    success: ElementUnionMember4OutputsSuccess
+
+
+class ElementUnionMember4Properties(BaseModel):
+    model: str
+
+    provider: str
+
+    retries: float
+
+    timeout: float
+
+
+class ElementUnionMember4(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember4Outputs
+
+    properties: ElementUnionMember4Properties
+
+    type: Literal["model"]
+
+
+class ElementUnionMember5Outputs(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember5(BaseModel):
+    id: str
+
+    outputs: Dict[str, ElementUnionMember5Outputs]
+
+    type: Literal["end"]
+
+
+Element: TypeAlias = Union[
+    ElementUnionMember0,
+    ElementUnionMember1,
+    ElementUnionMember2,
+    ElementUnionMember3,
+    ElementUnionMember4,
+    ElementUnionMember5,
+]
+
+
+class Version(BaseModel):
+    active: Literal["true", "false"]
+
+    created_at: str
+
+    data: str
+
+    version_id: str
+
+    comment: Optional[str] = None
+
+
+class DynamicRoutingGetResponse(BaseModel):
+    id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    deployment: Deployment
+
+    elements: List[Element]
+
+    gateway_id: str
+
+    modified_at: datetime
+
+    name: str
+
+    version: Version
diff --git a/src/cloudflare/types/ai_gateway/dynamic_routing_get_version_response.py b/src/cloudflare/types/ai_gateway/dynamic_routing_get_version_response.py
new file mode 100644
index 00000000000..649d4cf78e2
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dynamic_routing_get_version_response.py
@@ -0,0 +1,206 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "DynamicRoutingGetVersionResponse",
+    "Element",
+    "ElementUnionMember0",
+    "ElementUnionMember0Outputs",
+    "ElementUnionMember0OutputsNext",
+    "ElementUnionMember1",
+    "ElementUnionMember1Outputs",
+    "ElementUnionMember1OutputsFalse_",
+    "ElementUnionMember1OutputsTrue_",
+    "ElementUnionMember1Properties",
+    "ElementUnionMember2",
+    "ElementUnionMember2Outputs",
+    "ElementUnionMember3",
+    "ElementUnionMember3Outputs",
+    "ElementUnionMember3OutputsFallback",
+    "ElementUnionMember3OutputsSuccess",
+    "ElementUnionMember3Properties",
+    "ElementUnionMember4",
+    "ElementUnionMember4Outputs",
+    "ElementUnionMember4OutputsFallback",
+    "ElementUnionMember4OutputsSuccess",
+    "ElementUnionMember4Properties",
+    "ElementUnionMember5",
+    "ElementUnionMember5Outputs",
+]
+
+
+class ElementUnionMember0OutputsNext(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember0Outputs(BaseModel):
+    next: ElementUnionMember0OutputsNext
+
+
+class ElementUnionMember0(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember0Outputs
+
+    type: Literal["start"]
+
+
+class ElementUnionMember1OutputsFalse_(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember1OutputsTrue_(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember1Outputs(BaseModel):
+    false: ElementUnionMember1OutputsFalse_
+
+    true: ElementUnionMember1OutputsTrue_
+
+
+class ElementUnionMember1Properties(BaseModel):
+    conditions: Optional[object] = None
+
+
+class ElementUnionMember1(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember1Outputs
+
+    properties: ElementUnionMember1Properties
+
+    type: Literal["conditional"]
+
+
+class ElementUnionMember2Outputs(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember2(BaseModel):
+    id: str
+
+    outputs: Dict[str, ElementUnionMember2Outputs]
+
+    type: Literal["percentage"]
+
+
+class ElementUnionMember3OutputsFallback(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember3OutputsSuccess(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember3Outputs(BaseModel):
+    fallback: ElementUnionMember3OutputsFallback
+
+    success: ElementUnionMember3OutputsSuccess
+
+
+class ElementUnionMember3Properties(BaseModel):
+    key: str
+
+    limit: float
+
+    limit_type: Literal["count", "cost"] = FieldInfo(alias="limitType")
+
+    window: float
+
+
+class ElementUnionMember3(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember3Outputs
+
+    properties: ElementUnionMember3Properties
+
+    type: Literal["rate"]
+
+
+class ElementUnionMember4OutputsFallback(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember4OutputsSuccess(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember4Outputs(BaseModel):
+    fallback: ElementUnionMember4OutputsFallback
+
+    success: ElementUnionMember4OutputsSuccess
+
+
+class ElementUnionMember4Properties(BaseModel):
+    model: str
+
+    provider: str
+
+    retries: float
+
+    timeout: float
+
+
+class ElementUnionMember4(BaseModel):
+    id: str
+
+    outputs: ElementUnionMember4Outputs
+
+    properties: ElementUnionMember4Properties
+
+    type: Literal["model"]
+
+
+class ElementUnionMember5Outputs(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class ElementUnionMember5(BaseModel):
+    id: str
+
+    outputs: Dict[str, ElementUnionMember5Outputs]
+
+    type: Literal["end"]
+
+
+Element: TypeAlias = Union[
+    ElementUnionMember0,
+    ElementUnionMember1,
+    ElementUnionMember2,
+    ElementUnionMember3,
+    ElementUnionMember4,
+    ElementUnionMember5,
+]
+
+
+class DynamicRoutingGetVersionResponse(BaseModel):
+    id: str
+
+    account_tag: str
+
+    active: Literal["true", "false"]
+
+    created_at: str
+
+    data: str
+
+    elements: List[Element]
+
+    gateway_id: str
+
+    modified_at: datetime
+
+    name: str
+
+    version_id: str
+
+    comment: Optional[str] = None
diff --git a/src/cloudflare/types/ai_gateway/dynamic_routing_list_deployments_response.py b/src/cloudflare/types/ai_gateway/dynamic_routing_list_deployments_response.py
new file mode 100644
index 00000000000..67c679c5e8d
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dynamic_routing_list_deployments_response.py
@@ -0,0 +1,35 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["DynamicRoutingListDeploymentsResponse", "Data", "DataDeployment"]
+
+
+class DataDeployment(BaseModel):
+    created_at: str
+
+    deployment_id: str
+
+    version_id: str
+
+    comment: Optional[str] = None
+
+
+class Data(BaseModel):
+    deployments: List[DataDeployment]
+
+    order_by: str
+
+    order_by_direction: str
+
+    page: float
+
+    per_page: float
+
+
+class DynamicRoutingListDeploymentsResponse(BaseModel):
+    data: Data
+
+    success: bool
diff --git a/src/cloudflare/types/ai_gateway/dynamic_routing_list_response.py b/src/cloudflare/types/ai_gateway/dynamic_routing_list_response.py
new file mode 100644
index 00000000000..234cdce6c17
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dynamic_routing_list_response.py
@@ -0,0 +1,246 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "DynamicRoutingListResponse",
+    "Data",
+    "DataRoute",
+    "DataRouteDeployment",
+    "DataRouteElement",
+    "DataRouteElementUnionMember0",
+    "DataRouteElementUnionMember0Outputs",
+    "DataRouteElementUnionMember0OutputsNext",
+    "DataRouteElementUnionMember1",
+    "DataRouteElementUnionMember1Outputs",
+    "DataRouteElementUnionMember1OutputsFalse_",
+    "DataRouteElementUnionMember1OutputsTrue_",
+    "DataRouteElementUnionMember1Properties",
+    "DataRouteElementUnionMember2",
+    "DataRouteElementUnionMember2Outputs",
+    "DataRouteElementUnionMember3",
+    "DataRouteElementUnionMember3Outputs",
+    "DataRouteElementUnionMember3OutputsFallback",
+    "DataRouteElementUnionMember3OutputsSuccess",
+    "DataRouteElementUnionMember3Properties",
+    "DataRouteElementUnionMember4",
+    "DataRouteElementUnionMember4Outputs",
+    "DataRouteElementUnionMember4OutputsFallback",
+    "DataRouteElementUnionMember4OutputsSuccess",
+    "DataRouteElementUnionMember4Properties",
+    "DataRouteElementUnionMember5",
+    "DataRouteElementUnionMember5Outputs",
+    "DataRouteVersion",
+]
+
+
+class DataRouteDeployment(BaseModel):
+    created_at: str
+
+    deployment_id: str
+
+    version_id: str
+
+    comment: Optional[str] = None
+
+
+class DataRouteElementUnionMember0OutputsNext(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class DataRouteElementUnionMember0Outputs(BaseModel):
+    next: DataRouteElementUnionMember0OutputsNext
+
+
+class DataRouteElementUnionMember0(BaseModel):
+    id: str
+
+    outputs: DataRouteElementUnionMember0Outputs
+
+    type: Literal["start"]
+
+
+class DataRouteElementUnionMember1OutputsFalse_(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class DataRouteElementUnionMember1OutputsTrue_(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class DataRouteElementUnionMember1Outputs(BaseModel):
+    false: DataRouteElementUnionMember1OutputsFalse_
+
+    true: DataRouteElementUnionMember1OutputsTrue_
+
+
+class DataRouteElementUnionMember1Properties(BaseModel):
+    conditions: Optional[object] = None
+
+
+class DataRouteElementUnionMember1(BaseModel):
+    id: str
+
+    outputs: DataRouteElementUnionMember1Outputs
+
+    properties: DataRouteElementUnionMember1Properties
+
+    type: Literal["conditional"]
+
+
+class DataRouteElementUnionMember2Outputs(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class DataRouteElementUnionMember2(BaseModel):
+    id: str
+
+    outputs: Dict[str, DataRouteElementUnionMember2Outputs]
+
+    type: Literal["percentage"]
+
+
+class DataRouteElementUnionMember3OutputsFallback(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class DataRouteElementUnionMember3OutputsSuccess(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class DataRouteElementUnionMember3Outputs(BaseModel):
+    fallback: DataRouteElementUnionMember3OutputsFallback
+
+    success: DataRouteElementUnionMember3OutputsSuccess
+
+
+class DataRouteElementUnionMember3Properties(BaseModel):
+    key: str
+
+    limit: float
+
+    limit_type: Literal["count", "cost"] = FieldInfo(alias="limitType")
+
+    window: float
+
+
+class DataRouteElementUnionMember3(BaseModel):
+    id: str
+
+    outputs: DataRouteElementUnionMember3Outputs
+
+    properties: DataRouteElementUnionMember3Properties
+
+    type: Literal["rate"]
+
+
+class DataRouteElementUnionMember4OutputsFallback(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class DataRouteElementUnionMember4OutputsSuccess(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class DataRouteElementUnionMember4Outputs(BaseModel):
+    fallback: DataRouteElementUnionMember4OutputsFallback
+
+    success: DataRouteElementUnionMember4OutputsSuccess
+
+
+class DataRouteElementUnionMember4Properties(BaseModel):
+    model: str
+
+    provider: str
+
+    retries: float
+
+    timeout: float
+
+
+class DataRouteElementUnionMember4(BaseModel):
+    id: str
+
+    outputs: DataRouteElementUnionMember4Outputs
+
+    properties: DataRouteElementUnionMember4Properties
+
+    type: Literal["model"]
+
+
+class DataRouteElementUnionMember5Outputs(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class DataRouteElementUnionMember5(BaseModel):
+    id: str
+
+    outputs: Dict[str, DataRouteElementUnionMember5Outputs]
+
+    type: Literal["end"]
+
+
+DataRouteElement: TypeAlias = Union[
+    DataRouteElementUnionMember0,
+    DataRouteElementUnionMember1,
+    DataRouteElementUnionMember2,
+    DataRouteElementUnionMember3,
+    DataRouteElementUnionMember4,
+    DataRouteElementUnionMember5,
+]
+
+
+class DataRouteVersion(BaseModel):
+    active: Literal["true", "false"]
+
+    created_at: str
+
+    data: str
+
+    version_id: str
+
+    comment: Optional[str] = None
+
+
+class DataRoute(BaseModel):
+    id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    deployment: DataRouteDeployment
+
+    elements: List[DataRouteElement]
+
+    gateway_id: str
+
+    modified_at: datetime
+
+    name: str
+
+    version: DataRouteVersion
+
+
+class Data(BaseModel):
+    order_by: str
+
+    order_by_direction: str
+
+    page: float
+
+    per_page: float
+
+    routes: List[DataRoute]
+
+
+class DynamicRoutingListResponse(BaseModel):
+    data: Data
+
+    success: bool
diff --git a/src/cloudflare/types/ai_gateway/dynamic_routing_list_versions_response.py b/src/cloudflare/types/ai_gateway/dynamic_routing_list_versions_response.py
new file mode 100644
index 00000000000..f4478f42906
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dynamic_routing_list_versions_response.py
@@ -0,0 +1,38 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["DynamicRoutingListVersionsResponse", "Data", "DataVersion"]
+
+
+class DataVersion(BaseModel):
+    active: Literal["true", "false"]
+
+    created_at: str
+
+    data: str
+
+    version_id: str
+
+    comment: Optional[str] = None
+
+
+class Data(BaseModel):
+    order_by: str
+
+    order_by_direction: str
+
+    page: float
+
+    per_page: float
+
+    versions: List[DataVersion]
+
+
+class DynamicRoutingListVersionsResponse(BaseModel):
+    data: Data
+
+    success: bool
diff --git a/src/cloudflare/types/ai_gateway/dynamic_routing_update_params.py b/src/cloudflare/types/ai_gateway/dynamic_routing_update_params.py
new file mode 100644
index 00000000000..75453811680
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dynamic_routing_update_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["DynamicRoutingUpdateParams"]
+
+
+class DynamicRoutingUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    gateway_id: Required[str]
+
+    name: Required[str]
diff --git a/src/cloudflare/types/ai_gateway/dynamic_routing_update_response.py b/src/cloudflare/types/ai_gateway/dynamic_routing_update_response.py
new file mode 100644
index 00000000000..bdb889aef2f
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/dynamic_routing_update_response.py
@@ -0,0 +1,233 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "DynamicRoutingUpdateResponse",
+    "Route",
+    "RouteDeployment",
+    "RouteElement",
+    "RouteElementUnionMember0",
+    "RouteElementUnionMember0Outputs",
+    "RouteElementUnionMember0OutputsNext",
+    "RouteElementUnionMember1",
+    "RouteElementUnionMember1Outputs",
+    "RouteElementUnionMember1OutputsFalse_",
+    "RouteElementUnionMember1OutputsTrue_",
+    "RouteElementUnionMember1Properties",
+    "RouteElementUnionMember2",
+    "RouteElementUnionMember2Outputs",
+    "RouteElementUnionMember3",
+    "RouteElementUnionMember3Outputs",
+    "RouteElementUnionMember3OutputsFallback",
+    "RouteElementUnionMember3OutputsSuccess",
+    "RouteElementUnionMember3Properties",
+    "RouteElementUnionMember4",
+    "RouteElementUnionMember4Outputs",
+    "RouteElementUnionMember4OutputsFallback",
+    "RouteElementUnionMember4OutputsSuccess",
+    "RouteElementUnionMember4Properties",
+    "RouteElementUnionMember5",
+    "RouteElementUnionMember5Outputs",
+    "RouteVersion",
+]
+
+
+class RouteDeployment(BaseModel):
+    created_at: str
+
+    deployment_id: str
+
+    version_id: str
+
+    comment: Optional[str] = None
+
+
+class RouteElementUnionMember0OutputsNext(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class RouteElementUnionMember0Outputs(BaseModel):
+    next: RouteElementUnionMember0OutputsNext
+
+
+class RouteElementUnionMember0(BaseModel):
+    id: str
+
+    outputs: RouteElementUnionMember0Outputs
+
+    type: Literal["start"]
+
+
+class RouteElementUnionMember1OutputsFalse_(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class RouteElementUnionMember1OutputsTrue_(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class RouteElementUnionMember1Outputs(BaseModel):
+    false: RouteElementUnionMember1OutputsFalse_
+
+    true: RouteElementUnionMember1OutputsTrue_
+
+
+class RouteElementUnionMember1Properties(BaseModel):
+    conditions: Optional[object] = None
+
+
+class RouteElementUnionMember1(BaseModel):
+    id: str
+
+    outputs: RouteElementUnionMember1Outputs
+
+    properties: RouteElementUnionMember1Properties
+
+    type: Literal["conditional"]
+
+
+class RouteElementUnionMember2Outputs(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class RouteElementUnionMember2(BaseModel):
+    id: str
+
+    outputs: Dict[str, RouteElementUnionMember2Outputs]
+
+    type: Literal["percentage"]
+
+
+class RouteElementUnionMember3OutputsFallback(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class RouteElementUnionMember3OutputsSuccess(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class RouteElementUnionMember3Outputs(BaseModel):
+    fallback: RouteElementUnionMember3OutputsFallback
+
+    success: RouteElementUnionMember3OutputsSuccess
+
+
+class RouteElementUnionMember3Properties(BaseModel):
+    key: str
+
+    limit: float
+
+    limit_type: Literal["count", "cost"] = FieldInfo(alias="limitType")
+
+    window: float
+
+
+class RouteElementUnionMember3(BaseModel):
+    id: str
+
+    outputs: RouteElementUnionMember3Outputs
+
+    properties: RouteElementUnionMember3Properties
+
+    type: Literal["rate"]
+
+
+class RouteElementUnionMember4OutputsFallback(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class RouteElementUnionMember4OutputsSuccess(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class RouteElementUnionMember4Outputs(BaseModel):
+    fallback: RouteElementUnionMember4OutputsFallback
+
+    success: RouteElementUnionMember4OutputsSuccess
+
+
+class RouteElementUnionMember4Properties(BaseModel):
+    model: str
+
+    provider: str
+
+    retries: float
+
+    timeout: float
+
+
+class RouteElementUnionMember4(BaseModel):
+    id: str
+
+    outputs: RouteElementUnionMember4Outputs
+
+    properties: RouteElementUnionMember4Properties
+
+    type: Literal["model"]
+
+
+class RouteElementUnionMember5Outputs(BaseModel):
+    element_id: str = FieldInfo(alias="elementId")
+
+
+class RouteElementUnionMember5(BaseModel):
+    id: str
+
+    outputs: Dict[str, RouteElementUnionMember5Outputs]
+
+    type: Literal["end"]
+
+
+RouteElement: TypeAlias = Union[
+    RouteElementUnionMember0,
+    RouteElementUnionMember1,
+    RouteElementUnionMember2,
+    RouteElementUnionMember3,
+    RouteElementUnionMember4,
+    RouteElementUnionMember5,
+]
+
+
+class RouteVersion(BaseModel):
+    active: Literal["true", "false"]
+
+    created_at: str
+
+    data: str
+
+    version_id: str
+
+    comment: Optional[str] = None
+
+
+class Route(BaseModel):
+    id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    deployment: RouteDeployment
+
+    elements: List[RouteElement]
+
+    gateway_id: str
+
+    modified_at: datetime
+
+    name: str
+
+    version: RouteVersion
+
+
+class DynamicRoutingUpdateResponse(BaseModel):
+    route: Route
+
+    success: bool
diff --git a/src/cloudflare/types/ai_gateway/evaluation_create_params.py b/src/cloudflare/types/ai_gateway/evaluation_create_params.py
new file mode 100644
index 00000000000..f434312dce7
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/evaluation_create_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["EvaluationCreateParams"]
+
+
+class EvaluationCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    dataset_ids: Required[SequenceNotStr[str]]
+
+    evaluation_type_ids: Required[SequenceNotStr[str]]
+
+    name: Required[str]
diff --git a/src/cloudflare/types/ai_gateway/evaluation_create_response.py b/src/cloudflare/types/ai_gateway/evaluation_create_response.py
new file mode 100644
index 00000000000..40b1b09254b
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/evaluation_create_response.py
@@ -0,0 +1,97 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["EvaluationCreateResponse", "Dataset", "DatasetFilter", "Result"]
+
+
+class DatasetFilter(BaseModel):
+    key: Literal[
+        "created_at",
+        "request_content_type",
+        "response_content_type",
+        "success",
+        "cached",
+        "provider",
+        "model",
+        "cost",
+        "tokens",
+        "tokens_in",
+        "tokens_out",
+        "duration",
+        "feedback",
+    ]
+
+    operator: Literal["eq", "contains", "lt", "gt"]
+
+    value: List[Union[str, float, bool]]
+
+
+class Dataset(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    enable: bool
+
+    filters: List[DatasetFilter]
+
+    gateway_id: str
+    """gateway id"""
+
+    modified_at: datetime
+
+    name: str
+
+
+class Result(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    evaluation_id: str
+
+    evaluation_type_id: str
+
+    modified_at: datetime
+
+    result: str
+
+    status: float
+
+    status_description: str
+
+    total_logs: float
+
+
+class EvaluationCreateResponse(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    datasets: List[Dataset]
+
+    gateway_id: str
+    """gateway id"""
+
+    modified_at: datetime
+
+    name: str
+
+    processed: bool
+
+    results: List[Result]
+
+    total_logs: float
diff --git a/src/cloudflare/types/ai_gateway/evaluation_delete_response.py b/src/cloudflare/types/ai_gateway/evaluation_delete_response.py
new file mode 100644
index 00000000000..163d4406dd6
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/evaluation_delete_response.py
@@ -0,0 +1,97 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["EvaluationDeleteResponse", "Dataset", "DatasetFilter", "Result"]
+
+
+class DatasetFilter(BaseModel):
+    key: Literal[
+        "created_at",
+        "request_content_type",
+        "response_content_type",
+        "success",
+        "cached",
+        "provider",
+        "model",
+        "cost",
+        "tokens",
+        "tokens_in",
+        "tokens_out",
+        "duration",
+        "feedback",
+    ]
+
+    operator: Literal["eq", "contains", "lt", "gt"]
+
+    value: List[Union[str, float, bool]]
+
+
+class Dataset(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    enable: bool
+
+    filters: List[DatasetFilter]
+
+    gateway_id: str
+    """gateway id"""
+
+    modified_at: datetime
+
+    name: str
+
+
+class Result(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    evaluation_id: str
+
+    evaluation_type_id: str
+
+    modified_at: datetime
+
+    result: str
+
+    status: float
+
+    status_description: str
+
+    total_logs: float
+
+
+class EvaluationDeleteResponse(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    datasets: List[Dataset]
+
+    gateway_id: str
+    """gateway id"""
+
+    modified_at: datetime
+
+    name: str
+
+    processed: bool
+
+    results: List[Result]
+
+    total_logs: float
diff --git a/src/cloudflare/types/ai_gateway/evaluation_get_response.py b/src/cloudflare/types/ai_gateway/evaluation_get_response.py
new file mode 100644
index 00000000000..2ac71bd4a18
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/evaluation_get_response.py
@@ -0,0 +1,97 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["EvaluationGetResponse", "Dataset", "DatasetFilter", "Result"]
+
+
+class DatasetFilter(BaseModel):
+    key: Literal[
+        "created_at",
+        "request_content_type",
+        "response_content_type",
+        "success",
+        "cached",
+        "provider",
+        "model",
+        "cost",
+        "tokens",
+        "tokens_in",
+        "tokens_out",
+        "duration",
+        "feedback",
+    ]
+
+    operator: Literal["eq", "contains", "lt", "gt"]
+
+    value: List[Union[str, float, bool]]
+
+
+class Dataset(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    enable: bool
+
+    filters: List[DatasetFilter]
+
+    gateway_id: str
+    """gateway id"""
+
+    modified_at: datetime
+
+    name: str
+
+
+class Result(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    evaluation_id: str
+
+    evaluation_type_id: str
+
+    modified_at: datetime
+
+    result: str
+
+    status: float
+
+    status_description: str
+
+    total_logs: float
+
+
+class EvaluationGetResponse(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    datasets: List[Dataset]
+
+    gateway_id: str
+    """gateway id"""
+
+    modified_at: datetime
+
+    name: str
+
+    processed: bool
+
+    results: List[Result]
+
+    total_logs: float
diff --git a/src/cloudflare/types/ai_gateway/evaluation_list_params.py b/src/cloudflare/types/ai_gateway/evaluation_list_params.py
new file mode 100644
index 00000000000..deefec45cbf
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/evaluation_list_params.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["EvaluationListParams"]
+
+
+class EvaluationListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    name: str
+
+    page: int
+
+    per_page: int
+
+    processed: bool
+
+    search: str
+    """Search by id, name"""
diff --git a/src/cloudflare/types/ai_gateway/evaluation_list_response.py b/src/cloudflare/types/ai_gateway/evaluation_list_response.py
new file mode 100644
index 00000000000..e40b09a38aa
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/evaluation_list_response.py
@@ -0,0 +1,97 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["EvaluationListResponse", "Dataset", "DatasetFilter", "Result"]
+
+
+class DatasetFilter(BaseModel):
+    key: Literal[
+        "created_at",
+        "request_content_type",
+        "response_content_type",
+        "success",
+        "cached",
+        "provider",
+        "model",
+        "cost",
+        "tokens",
+        "tokens_in",
+        "tokens_out",
+        "duration",
+        "feedback",
+    ]
+
+    operator: Literal["eq", "contains", "lt", "gt"]
+
+    value: List[Union[str, float, bool]]
+
+
+class Dataset(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    enable: bool
+
+    filters: List[DatasetFilter]
+
+    gateway_id: str
+    """gateway id"""
+
+    modified_at: datetime
+
+    name: str
+
+
+class Result(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    evaluation_id: str
+
+    evaluation_type_id: str
+
+    modified_at: datetime
+
+    result: str
+
+    status: float
+
+    status_description: str
+
+    total_logs: float
+
+
+class EvaluationListResponse(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    datasets: List[Dataset]
+
+    gateway_id: str
+    """gateway id"""
+
+    modified_at: datetime
+
+    name: str
+
+    processed: bool
+
+    results: List[Result]
+
+    total_logs: float
diff --git a/src/cloudflare/types/ai_gateway/evaluation_type_list_params.py b/src/cloudflare/types/ai_gateway/evaluation_type_list_params.py
new file mode 100644
index 00000000000..5a03c32439c
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/evaluation_type_list_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["EvaluationTypeListParams"]
+
+
+class EvaluationTypeListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    order_by: str
+
+    order_by_direction: Literal["asc", "desc"]
+
+    page: int
+
+    per_page: int
diff --git a/src/cloudflare/types/ai_gateway/evaluation_type_list_response.py b/src/cloudflare/types/ai_gateway/evaluation_type_list_response.py
new file mode 100644
index 00000000000..428f484d00f
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/evaluation_type_list_response.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["EvaluationTypeListResponse"]
+
+
+class EvaluationTypeListResponse(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    description: str
+
+    enable: bool
+
+    mandatory: bool
+
+    modified_at: datetime
+
+    name: str
+
+    type: str
diff --git a/src/cloudflare/types/ai_gateway/log_delete_params.py b/src/cloudflare/types/ai_gateway/log_delete_params.py
new file mode 100644
index 00000000000..2e516f34cb5
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/log_delete_params.py
@@ -0,0 +1,70 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable, Optional
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["LogDeleteParams", "Filter"]
+
+
+class LogDeleteParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    filters: Iterable[Filter]
+
+    limit: int
+
+    order_by: Literal[
+        "created_at",
+        "provider",
+        "model",
+        "model_type",
+        "success",
+        "cached",
+        "cost",
+        "tokens_in",
+        "tokens_out",
+        "duration",
+        "feedback",
+    ]
+
+    order_by_direction: Literal["asc", "desc"]
+
+
+class Filter(TypedDict, total=False):
+    key: Required[
+        Literal[
+            "id",
+            "created_at",
+            "request_content_type",
+            "response_content_type",
+            "request_type",
+            "success",
+            "cached",
+            "provider",
+            "model",
+            "model_type",
+            "cost",
+            "tokens",
+            "tokens_in",
+            "tokens_out",
+            "duration",
+            "feedback",
+            "event_id",
+            "metadata.key",
+            "metadata.value",
+            "prompts.prompt_id",
+            "prompts.version_id",
+            "authentication",
+            "wholesale",
+            "compatibilityMode",
+            "dlp_action",
+        ]
+    ]
+
+    operator: Required[Literal["eq", "neq", "contains", "lt", "gt"]]
+
+    value: Required[SequenceNotStr[Union[Optional[str], float, bool]]]
diff --git a/src/cloudflare/types/ai_gateway/log_delete_response.py b/src/cloudflare/types/ai_gateway/log_delete_response.py
new file mode 100644
index 00000000000..94f5268144c
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/log_delete_response.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["LogDeleteResponse"]
+
+
+class LogDeleteResponse(BaseModel):
+    success: bool
diff --git a/src/cloudflare/types/ai_gateway/log_edit_params.py b/src/cloudflare/types/ai_gateway/log_edit_params.py
new file mode 100644
index 00000000000..140b789b00c
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/log_edit_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Union, Optional
+from typing_extensions import Required, TypedDict
+
+__all__ = ["LogEditParams"]
+
+
+class LogEditParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    gateway_id: Required[str]
+    """gateway id"""
+
+    feedback: Optional[float]
+
+    metadata: Optional[Dict[str, Union[str, float, bool]]]
+
+    score: Optional[float]
diff --git a/src/cloudflare/types/ai_gateway/log_get_response.py b/src/cloudflare/types/ai_gateway/log_get_response.py
new file mode 100644
index 00000000000..05f0b40bf04
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/log_get_response.py
@@ -0,0 +1,62 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["LogGetResponse"]
+
+
+class LogGetResponse(BaseModel):
+    id: str
+
+    cached: bool
+
+    created_at: datetime
+
+    duration: int
+
+    model: str
+
+    path: str
+
+    provider: str
+
+    success: bool
+
+    tokens_in: Optional[int] = None
+
+    tokens_out: Optional[int] = None
+
+    cost: Optional[float] = None
+
+    custom_cost: Optional[bool] = None
+
+    metadata: Optional[str] = None
+
+    ai_model_type: Optional[str] = FieldInfo(alias="model_type", default=None)
+
+    request_content_type: Optional[str] = None
+
+    request_head: Optional[str] = None
+
+    request_head_complete: Optional[bool] = None
+
+    request_size: Optional[int] = None
+
+    request_type: Optional[str] = None
+
+    response_content_type: Optional[str] = None
+
+    response_head: Optional[str] = None
+
+    response_head_complete: Optional[bool] = None
+
+    response_size: Optional[int] = None
+
+    status_code: Optional[int] = None
+
+    step: Optional[int] = None
diff --git a/src/cloudflare/types/ai_gateway/log_list_params.py b/src/cloudflare/types/ai_gateway/log_list_params.py
index 3f3bbe5efa6..27c4229155c 100644
--- a/src/cloudflare/types/ai_gateway/log_list_params.py
+++ b/src/cloudflare/types/ai_gateway/log_list_params.py
@@ -2,13 +2,14 @@
 
 from __future__ import annotations
 
-from typing import Union
+from typing import Union, Iterable, Optional
 from datetime import datetime
 from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 
-__all__ = ["LogListParams"]
+__all__ = ["LogListParams", "Filter"]
 
 
 class LogListParams(TypedDict, total=False):
@@ -20,14 +21,88 @@ class LogListParams(TypedDict, total=False):
 
     end_date: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
 
-    order_by: Literal["created_at", "provider"]
+    feedback: Literal[0, 1]
+
+    filters: Iterable[Filter]
+
+    max_cost: float
+
+    max_duration: float
+
+    max_tokens_in: float
+
+    max_tokens_out: float
+
+    max_total_tokens: float
+
+    meta_info: bool
+
+    min_cost: float
+
+    min_duration: float
+
+    min_tokens_in: float
+
+    min_tokens_out: float
+
+    min_total_tokens: float
+
+    model: str
+
+    model_type: str
+
+    order_by: Literal["created_at", "provider", "model", "model_type", "success", "cached"]
+
+    order_by_direction: Literal["asc", "desc"]
 
     page: int
 
     per_page: int
 
+    provider: str
+
+    request_content_type: str
+
+    response_content_type: str
+
     search: str
 
     start_date: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
 
     success: bool
+
+
+class Filter(TypedDict, total=False):
+    key: Required[
+        Literal[
+            "id",
+            "created_at",
+            "request_content_type",
+            "response_content_type",
+            "request_type",
+            "success",
+            "cached",
+            "provider",
+            "model",
+            "model_type",
+            "cost",
+            "tokens",
+            "tokens_in",
+            "tokens_out",
+            "duration",
+            "feedback",
+            "event_id",
+            "metadata.key",
+            "metadata.value",
+            "prompts.prompt_id",
+            "prompts.version_id",
+            "authentication",
+            "wholesale",
+            "compatibilityMode",
+            "dlp_action",
+        ]
+    ]
+
+    operator: Required[Literal["eq", "neq", "contains", "lt", "gt"]]
+
+    value: Required[SequenceNotStr[Union[Optional[str], float, bool]]]
diff --git a/src/cloudflare/types/ai_gateway/log_list_response.py b/src/cloudflare/types/ai_gateway/log_list_response.py
index 54366ffe597..b3fc2803d0a 100644
--- a/src/cloudflare/types/ai_gateway/log_list_response.py
+++ b/src/cloudflare/types/ai_gateway/log_list_response.py
@@ -3,6 +3,8 @@
 from typing import Optional
 from datetime import datetime
 
+from pydantic import Field as FieldInfo
+
 from ..._models import BaseModel
 
 __all__ = ["LogListResponse"]
@@ -23,18 +25,20 @@ class LogListResponse(BaseModel):
 
     provider: str
 
-    request: str
+    success: bool
 
-    response: str
+    tokens_in: Optional[int] = None
 
-    success: bool
+    tokens_out: Optional[int] = None
 
-    tokens_in: int
+    cost: Optional[float] = None
 
-    tokens_out: int
+    custom_cost: Optional[bool] = None
 
     metadata: Optional[str] = None
 
+    ai_model_type: Optional[str] = FieldInfo(alias="model_type", default=None)
+
     request_content_type: Optional[str] = None
 
     request_type: Optional[str] = None
diff --git a/src/cloudflare/types/ai_gateway/provider_config_create_params.py b/src/cloudflare/types/ai_gateway/provider_config_create_params.py
new file mode 100644
index 00000000000..fecfe448bcb
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/provider_config_create_params.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ProviderConfigCreateParams"]
+
+
+class ProviderConfigCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    alias: Required[str]
+
+    default_config: Required[bool]
+
+    provider_slug: Required[str]
+
+    secret: Required[str]
+
+    secret_id: Required[str]
+
+    rate_limit: float
+
+    rate_limit_period: float
diff --git a/src/cloudflare/types/ai_gateway/provider_config_create_response.py b/src/cloudflare/types/ai_gateway/provider_config_create_response.py
new file mode 100644
index 00000000000..7beec1a3a36
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/provider_config_create_response.py
@@ -0,0 +1,35 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["ProviderConfigCreateResponse"]
+
+
+class ProviderConfigCreateResponse(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    alias: str
+
+    default_config: bool
+
+    gateway_id: str
+    """gateway id"""
+
+    modified_at: datetime
+
+    provider_slug: str
+
+    secret_id: str
+
+    secret_preview: str
+
+    rate_limit: Optional[float] = None
+
+    rate_limit_period: Optional[float] = None
diff --git a/src/cloudflare/types/ai_gateway/provider_config_list_params.py b/src/cloudflare/types/ai_gateway/provider_config_list_params.py
new file mode 100644
index 00000000000..c1a36c2428a
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/provider_config_list_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ProviderConfigListParams"]
+
+
+class ProviderConfigListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    page: int
+
+    per_page: int
diff --git a/src/cloudflare/types/ai_gateway/provider_config_list_response.py b/src/cloudflare/types/ai_gateway/provider_config_list_response.py
new file mode 100644
index 00000000000..6c2fa3aef29
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/provider_config_list_response.py
@@ -0,0 +1,35 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["ProviderConfigListResponse"]
+
+
+class ProviderConfigListResponse(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    alias: str
+
+    default_config: bool
+
+    gateway_id: str
+    """gateway id"""
+
+    modified_at: datetime
+
+    provider_slug: str
+
+    secret_id: str
+
+    secret_preview: str
+
+    rate_limit: Optional[float] = None
+
+    rate_limit_period: Optional[float] = None
diff --git a/src/cloudflare/types/ai_gateway/url_get_response.py b/src/cloudflare/types/ai_gateway/url_get_response.py
new file mode 100644
index 00000000000..d6ac9014186
--- /dev/null
+++ b/src/cloudflare/types/ai_gateway/url_get_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["URLGetResponse"]
+
+URLGetResponse: TypeAlias = str
diff --git a/src/cloudflare/types/aisearch/__init__.py b/src/cloudflare/types/aisearch/__init__.py
new file mode 100644
index 00000000000..93509eebddb
--- /dev/null
+++ b/src/cloudflare/types/aisearch/__init__.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .token_list_params import TokenListParams as TokenListParams
+from .token_create_params import TokenCreateParams as TokenCreateParams
+from .token_list_response import TokenListResponse as TokenListResponse
+from .token_read_response import TokenReadResponse as TokenReadResponse
+from .token_update_params import TokenUpdateParams as TokenUpdateParams
+from .instance_list_params import InstanceListParams as InstanceListParams
+from .token_create_response import TokenCreateResponse as TokenCreateResponse
+from .token_delete_response import TokenDeleteResponse as TokenDeleteResponse
+from .token_update_response import TokenUpdateResponse as TokenUpdateResponse
+from .instance_create_params import InstanceCreateParams as InstanceCreateParams
+from .instance_list_response import InstanceListResponse as InstanceListResponse
+from .instance_read_response import InstanceReadResponse as InstanceReadResponse
+from .instance_search_params import InstanceSearchParams as InstanceSearchParams
+from .instance_update_params import InstanceUpdateParams as InstanceUpdateParams
+from .instance_stats_response import InstanceStatsResponse as InstanceStatsResponse
+from .instance_create_response import InstanceCreateResponse as InstanceCreateResponse
+from .instance_delete_response import InstanceDeleteResponse as InstanceDeleteResponse
+from .instance_search_response import InstanceSearchResponse as InstanceSearchResponse
+from .instance_update_response import InstanceUpdateResponse as InstanceUpdateResponse
+from .instance_chat_completions_params import InstanceChatCompletionsParams as InstanceChatCompletionsParams
+from .instance_chat_completions_response import InstanceChatCompletionsResponse as InstanceChatCompletionsResponse
diff --git a/src/cloudflare/types/aisearch/instance_chat_completions_params.py b/src/cloudflare/types/aisearch/instance_chat_completions_params.py
new file mode 100644
index 00000000000..9dee87fffad
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instance_chat_completions_params.py
@@ -0,0 +1,159 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Union, Iterable, Optional
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = [
+    "InstanceChatCompletionsParams",
+    "Message",
+    "AISearchOptions",
+    "AISearchOptionsQueryRewrite",
+    "AISearchOptionsReranking",
+    "AISearchOptionsRetrieval",
+    "AISearchOptionsRetrievalFilters",
+    "AISearchOptionsRetrievalFiltersUnionMember0",
+    "AISearchOptionsRetrievalFiltersUnionMember1",
+    "AISearchOptionsRetrievalFiltersUnionMember1Filter",
+]
+
+
+class InstanceChatCompletionsParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    messages: Required[Iterable[Message]]
+
+    aisearch_options: Annotated[AISearchOptions, PropertyInfo(alias="ai_search_options")]
+
+    model: Literal[
+        "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+        "@cf/meta/llama-3.1-8b-instruct-fast",
+        "@cf/meta/llama-3.1-8b-instruct-fp8",
+        "@cf/meta/llama-4-scout-17b-16e-instruct",
+        "@cf/qwen/qwen3-30b-a3b-fp8",
+        "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+        "@cf/moonshotai/kimi-k2-instruct",
+        "anthropic/claude-3-7-sonnet",
+        "anthropic/claude-sonnet-4",
+        "anthropic/claude-opus-4",
+        "anthropic/claude-3-5-haiku",
+        "cerebras/qwen-3-235b-a22b-instruct",
+        "cerebras/qwen-3-235b-a22b-thinking",
+        "cerebras/llama-3.3-70b",
+        "cerebras/llama-4-maverick-17b-128e-instruct",
+        "cerebras/llama-4-scout-17b-16e-instruct",
+        "cerebras/gpt-oss-120b",
+        "google-ai-studio/gemini-2.5-flash",
+        "google-ai-studio/gemini-2.5-pro",
+        "grok/grok-4",
+        "groq/llama-3.3-70b-versatile",
+        "groq/llama-3.1-8b-instant",
+        "openai/gpt-5",
+        "openai/gpt-5-mini",
+        "openai/gpt-5-nano",
+        "",
+    ]
+
+    stream: bool
+
+
+class MessageTyped(TypedDict, total=False):
+    content: Required[Optional[str]]
+
+    role: Required[Literal["system", "developer", "user", "assistant", "tool"]]
+
+
+Message: TypeAlias = Union[MessageTyped, Dict[str, object]]
+
+
+class AISearchOptionsQueryRewrite(TypedDict, total=False):
+    enabled: bool
+
+    model: Literal[
+        "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+        "@cf/meta/llama-3.1-8b-instruct-fast",
+        "@cf/meta/llama-3.1-8b-instruct-fp8",
+        "@cf/meta/llama-4-scout-17b-16e-instruct",
+        "@cf/qwen/qwen3-30b-a3b-fp8",
+        "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+        "@cf/moonshotai/kimi-k2-instruct",
+        "anthropic/claude-3-7-sonnet",
+        "anthropic/claude-sonnet-4",
+        "anthropic/claude-opus-4",
+        "anthropic/claude-3-5-haiku",
+        "cerebras/qwen-3-235b-a22b-instruct",
+        "cerebras/qwen-3-235b-a22b-thinking",
+        "cerebras/llama-3.3-70b",
+        "cerebras/llama-4-maverick-17b-128e-instruct",
+        "cerebras/llama-4-scout-17b-16e-instruct",
+        "cerebras/gpt-oss-120b",
+        "google-ai-studio/gemini-2.5-flash",
+        "google-ai-studio/gemini-2.5-pro",
+        "grok/grok-4",
+        "groq/llama-3.3-70b-versatile",
+        "groq/llama-3.1-8b-instant",
+        "openai/gpt-5",
+        "openai/gpt-5-mini",
+        "openai/gpt-5-nano",
+        "",
+    ]
+
+    rewrite_prompt: str
+
+
+class AISearchOptionsReranking(TypedDict, total=False):
+    enabled: bool
+
+    match_threshold: float
+
+    model: Literal["@cf/baai/bge-reranker-base", ""]
+
+
+class AISearchOptionsRetrievalFiltersUnionMember0(TypedDict, total=False):
+    key: Required[str]
+
+    type: Required[Literal["eq", "ne", "gt", "gte", "lt", "lte"]]
+
+    value: Required[Union[str, float, bool]]
+
+
+class AISearchOptionsRetrievalFiltersUnionMember1Filter(TypedDict, total=False):
+    key: Required[str]
+
+    type: Required[Literal["eq", "ne", "gt", "gte", "lt", "lte"]]
+
+    value: Required[Union[str, float, bool]]
+
+
+class AISearchOptionsRetrievalFiltersUnionMember1(TypedDict, total=False):
+    filters: Required[Iterable[AISearchOptionsRetrievalFiltersUnionMember1Filter]]
+
+    type: Required[Literal["and", "or"]]
+
+
+AISearchOptionsRetrievalFilters: TypeAlias = Union[
+    AISearchOptionsRetrievalFiltersUnionMember0, AISearchOptionsRetrievalFiltersUnionMember1
+]
+
+
+class AISearchOptionsRetrieval(TypedDict, total=False):
+    context_expansion: int
+
+    filters: AISearchOptionsRetrievalFilters
+
+    match_threshold: float
+
+    max_num_results: int
+
+    retrieval_type: Literal["vector", "keyword", "hybrid"]
+
+
+class AISearchOptions(TypedDict, total=False):
+    query_rewrite: AISearchOptionsQueryRewrite
+
+    reranking: AISearchOptionsReranking
+
+    retrieval: AISearchOptionsRetrieval
diff --git a/src/cloudflare/types/aisearch/instance_chat_completions_response.py b/src/cloudflare/types/aisearch/instance_chat_completions_response.py
new file mode 100644
index 00000000000..6b8a7e4b614
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instance_chat_completions_response.py
@@ -0,0 +1,91 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import builtins
+from typing import TYPE_CHECKING, Dict, List, Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["InstanceChatCompletionsResponse", "Choice", "ChoiceMessage", "Chunk", "ChunkItem", "ChunkScoringDetails"]
+
+
+class ChoiceMessage(BaseModel):
+    content: Optional[str] = None
+
+    role: Literal["system", "developer", "user", "assistant", "tool"]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, object] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> object: ...
+    else:
+        __pydantic_extra__: Dict[str, object]
+
+
+class Choice(BaseModel):
+    message: ChoiceMessage
+
+    index: Optional[int] = None
+
+
+class ChunkItem(BaseModel):
+    key: str
+
+    metadata: Optional[Dict[str, object]] = None
+
+    timestamp: Optional[float] = None
+
+
+class ChunkScoringDetails(BaseModel):
+    keyword_rank: Optional[float] = None
+
+    keyword_score: Optional[float] = None
+
+    vector_rank: Optional[float] = None
+
+    vector_score: Optional[float] = None
+
+
+class Chunk(BaseModel):
+    id: str
+
+    score: float
+
+    text: str
+
+    type: str
+
+    item: Optional[ChunkItem] = None
+
+    scoring_details: Optional[ChunkScoringDetails] = None
+
+
+class InstanceChatCompletionsResponse(BaseModel):
+    choices: List[Choice]
+
+    chunks: List[Chunk]
+
+    id: Optional[str] = None
+
+    model: Optional[str] = None
+
+    object: Optional[str] = None
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, builtins.object] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> builtins.object: ...
+    else:
+        __pydantic_extra__: Dict[str, builtins.object]
diff --git a/src/cloudflare/types/aisearch/instance_create_params.py b/src/cloudflare/types/aisearch/instance_create_params.py
new file mode 100644
index 00000000000..d88e808b521
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instance_create_params.py
@@ -0,0 +1,240 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Iterable
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+from ..r2.buckets.provider import Provider
+
+__all__ = [
+    "InstanceCreateParams",
+    "CustomMetadata",
+    "Metadata",
+    "PublicEndpointParams",
+    "PublicEndpointParamsChatCompletionsEndpoint",
+    "PublicEndpointParamsMcp",
+    "PublicEndpointParamsRateLimit",
+    "PublicEndpointParamsSearchEndpoint",
+    "SourceParams",
+    "SourceParamsWebCrawler",
+    "SourceParamsWebCrawlerParseOptions",
+    "SourceParamsWebCrawlerStoreOptions",
+]
+
+
+class InstanceCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    id: Required[str]
+    """Use your AI Search ID."""
+
+    source: Required[str]
+
+    type: Required[Literal["r2", "web-crawler"]]
+
+    ai_gateway_id: str
+
+    aisearch_model: Annotated[
+        Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ],
+        PropertyInfo(alias="ai_search_model"),
+    ]
+
+    chunk: bool
+
+    chunk_overlap: int
+
+    chunk_size: int
+
+    custom_metadata: Iterable[CustomMetadata]
+
+    embedding_model: Literal[
+        "@cf/qwen/qwen3-embedding-0.6b",
+        "@cf/baai/bge-m3",
+        "@cf/baai/bge-large-en-v1.5",
+        "@cf/google/embeddinggemma-300m",
+        "google-ai-studio/gemini-embedding-001",
+        "openai/text-embedding-3-small",
+        "openai/text-embedding-3-large",
+        "",
+    ]
+
+    hybrid_search_enabled: bool
+
+    max_num_results: int
+
+    metadata: Metadata
+
+    public_endpoint_params: PublicEndpointParams
+
+    reranking: bool
+
+    reranking_model: Literal["@cf/baai/bge-reranker-base", ""]
+
+    rewrite_model: Literal[
+        "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+        "@cf/meta/llama-3.1-8b-instruct-fast",
+        "@cf/meta/llama-3.1-8b-instruct-fp8",
+        "@cf/meta/llama-4-scout-17b-16e-instruct",
+        "@cf/qwen/qwen3-30b-a3b-fp8",
+        "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+        "@cf/moonshotai/kimi-k2-instruct",
+        "anthropic/claude-3-7-sonnet",
+        "anthropic/claude-sonnet-4",
+        "anthropic/claude-opus-4",
+        "anthropic/claude-3-5-haiku",
+        "cerebras/qwen-3-235b-a22b-instruct",
+        "cerebras/qwen-3-235b-a22b-thinking",
+        "cerebras/llama-3.3-70b",
+        "cerebras/llama-4-maverick-17b-128e-instruct",
+        "cerebras/llama-4-scout-17b-16e-instruct",
+        "cerebras/gpt-oss-120b",
+        "google-ai-studio/gemini-2.5-flash",
+        "google-ai-studio/gemini-2.5-pro",
+        "grok/grok-4",
+        "groq/llama-3.3-70b-versatile",
+        "groq/llama-3.1-8b-instant",
+        "openai/gpt-5",
+        "openai/gpt-5-mini",
+        "openai/gpt-5-nano",
+        "",
+    ]
+
+    rewrite_query: bool
+
+    score_threshold: float
+
+    source_params: SourceParams
+
+    token_id: str
+
+
+class CustomMetadata(TypedDict, total=False):
+    data_type: Required[Literal["text", "number", "boolean"]]
+
+    field_name: Required[str]
+
+
+class Metadata(TypedDict, total=False):
+    created_from_aisearch_wizard: bool
+
+    worker_domain: str
+
+
+class PublicEndpointParamsChatCompletionsEndpoint(TypedDict, total=False):
+    disabled: bool
+    """Disable chat completions endpoint for this public endpoint"""
+
+
+class PublicEndpointParamsMcp(TypedDict, total=False):
+    disabled: bool
+    """Disable MCP endpoint for this public endpoint"""
+
+
+class PublicEndpointParamsRateLimit(TypedDict, total=False):
+    period_ms: int
+
+    requests: int
+
+    technique: Literal["fixed", "sliding"]
+
+
+class PublicEndpointParamsSearchEndpoint(TypedDict, total=False):
+    disabled: bool
+    """Disable search endpoint for this public endpoint"""
+
+
+class PublicEndpointParams(TypedDict, total=False):
+    authorized_hosts: SequenceNotStr[str]
+
+    chat_completions_endpoint: PublicEndpointParamsChatCompletionsEndpoint
+
+    enabled: bool
+
+    mcp: PublicEndpointParamsMcp
+
+    rate_limit: PublicEndpointParamsRateLimit
+
+    search_endpoint: PublicEndpointParamsSearchEndpoint
+
+
+class SourceParamsWebCrawlerParseOptions(TypedDict, total=False):
+    include_headers: Dict[str, str]
+
+    include_images: bool
+
+    specific_sitemaps: SequenceNotStr[str]
+    """List of specific sitemap URLs to use for crawling.
+
+    Only valid when parse_type is 'sitemap'.
+    """
+
+    use_browser_rendering: bool
+
+
+class SourceParamsWebCrawlerStoreOptions(TypedDict, total=False):
+    storage_id: Required[str]
+
+    r2_jurisdiction: str
+
+    storage_type: Provider
+
+
+class SourceParamsWebCrawler(TypedDict, total=False):
+    parse_options: SourceParamsWebCrawlerParseOptions
+
+    parse_type: Literal["sitemap", "feed-rss"]
+
+    store_options: SourceParamsWebCrawlerStoreOptions
+
+
+class SourceParams(TypedDict, total=False):
+    exclude_items: SequenceNotStr[str]
+    """List of path patterns to exclude.
+
+    Uses micromatch glob syntax: \\** matches within a path segment, ** matches across
+    path segments (e.g., /admin/** matches /admin/users and
+    /admin/settings/advanced)
+    """
+
+    include_items: SequenceNotStr[str]
+    """List of path patterns to include.
+
+    Uses micromatch glob syntax: \\** matches within a path segment, ** matches across
+    path segments (e.g., /blog/** matches /blog/post and /blog/2024/post)
+    """
+
+    prefix: str
+
+    r2_jurisdiction: str
+
+    web_crawler: SourceParamsWebCrawler
diff --git a/src/cloudflare/types/aisearch/instance_create_response.py b/src/cloudflare/types/aisearch/instance_create_response.py
new file mode 100644
index 00000000000..7e3f4709640
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instance_create_response.py
@@ -0,0 +1,314 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+from ..r2.buckets.provider import Provider
+
+__all__ = [
+    "InstanceCreateResponse",
+    "CustomMetadata",
+    "Metadata",
+    "PublicEndpointParams",
+    "PublicEndpointParamsChatCompletionsEndpoint",
+    "PublicEndpointParamsMcp",
+    "PublicEndpointParamsRateLimit",
+    "PublicEndpointParamsSearchEndpoint",
+    "SourceParams",
+    "SourceParamsWebCrawler",
+    "SourceParamsWebCrawlerParseOptions",
+    "SourceParamsWebCrawlerStoreOptions",
+]
+
+
+class CustomMetadata(BaseModel):
+    data_type: Literal["text", "number", "boolean"]
+
+    field_name: str
+
+
+class Metadata(BaseModel):
+    created_from_aisearch_wizard: Optional[bool] = None
+
+    worker_domain: Optional[str] = None
+
+
+class PublicEndpointParamsChatCompletionsEndpoint(BaseModel):
+    disabled: Optional[bool] = None
+    """Disable chat completions endpoint for this public endpoint"""
+
+
+class PublicEndpointParamsMcp(BaseModel):
+    disabled: Optional[bool] = None
+    """Disable MCP endpoint for this public endpoint"""
+
+
+class PublicEndpointParamsRateLimit(BaseModel):
+    period_ms: Optional[int] = None
+
+    requests: Optional[int] = None
+
+    technique: Optional[Literal["fixed", "sliding"]] = None
+
+
+class PublicEndpointParamsSearchEndpoint(BaseModel):
+    disabled: Optional[bool] = None
+    """Disable search endpoint for this public endpoint"""
+
+
+class PublicEndpointParams(BaseModel):
+    authorized_hosts: Optional[List[str]] = None
+
+    chat_completions_endpoint: Optional[PublicEndpointParamsChatCompletionsEndpoint] = None
+
+    enabled: Optional[bool] = None
+
+    mcp: Optional[PublicEndpointParamsMcp] = None
+
+    rate_limit: Optional[PublicEndpointParamsRateLimit] = None
+
+    search_endpoint: Optional[PublicEndpointParamsSearchEndpoint] = None
+
+
+class SourceParamsWebCrawlerParseOptions(BaseModel):
+    include_headers: Optional[Dict[str, str]] = None
+
+    include_images: Optional[bool] = None
+
+    specific_sitemaps: Optional[List[str]] = None
+    """List of specific sitemap URLs to use for crawling.
+
+    Only valid when parse_type is 'sitemap'.
+    """
+
+    use_browser_rendering: Optional[bool] = None
+
+
+class SourceParamsWebCrawlerStoreOptions(BaseModel):
+    storage_id: str
+
+    r2_jurisdiction: Optional[str] = None
+
+    storage_type: Optional[Provider] = None
+
+
+class SourceParamsWebCrawler(BaseModel):
+    parse_options: Optional[SourceParamsWebCrawlerParseOptions] = None
+
+    parse_type: Optional[Literal["sitemap", "feed-rss"]] = None
+
+    store_options: Optional[SourceParamsWebCrawlerStoreOptions] = None
+
+
+class SourceParams(BaseModel):
+    exclude_items: Optional[List[str]] = None
+    """List of path patterns to exclude.
+
+    Uses micromatch glob syntax: \\** matches within a path segment, ** matches across
+    path segments (e.g., /admin/** matches /admin/users and
+    /admin/settings/advanced)
+    """
+
+    include_items: Optional[List[str]] = None
+    """List of path patterns to include.
+
+    Uses micromatch glob syntax: \\** matches within a path segment, ** matches across
+    path segments (e.g., /blog/** matches /blog/post and /blog/2024/post)
+    """
+
+    prefix: Optional[str] = None
+
+    r2_jurisdiction: Optional[str] = None
+
+    web_crawler: Optional[SourceParamsWebCrawler] = None
+
+
+class InstanceCreateResponse(BaseModel):
+    id: str
+    """Use your AI Search ID."""
+
+    account_id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    internal_id: str
+
+    modified_at: datetime
+
+    source: str
+
+    type: Literal["r2", "web-crawler"]
+
+    vectorize_name: str
+
+    ai_gateway_id: Optional[str] = None
+
+    aisearch_model: Optional[
+        Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+    ] = FieldInfo(alias="ai_search_model", default=None)
+
+    cache: Optional[bool] = None
+
+    cache_threshold: Optional[Literal["super_strict_match", "close_enough", "flexible_friend", "anything_goes"]] = None
+
+    chunk: Optional[bool] = None
+
+    chunk_overlap: Optional[int] = None
+
+    chunk_size: Optional[int] = None
+
+    created_by: Optional[str] = None
+
+    custom_metadata: Optional[List[CustomMetadata]] = None
+
+    embedding_model: Optional[
+        Literal[
+            "@cf/qwen/qwen3-embedding-0.6b",
+            "@cf/baai/bge-m3",
+            "@cf/baai/bge-large-en-v1.5",
+            "@cf/google/embeddinggemma-300m",
+            "google-ai-studio/gemini-embedding-001",
+            "openai/text-embedding-3-small",
+            "openai/text-embedding-3-large",
+            "",
+        ]
+    ] = None
+
+    enable: Optional[bool] = None
+
+    engine_version: Optional[float] = None
+
+    hybrid_search_enabled: Optional[bool] = None
+
+    last_activity: Optional[datetime] = None
+
+    max_num_results: Optional[int] = None
+
+    metadata: Optional[Metadata] = None
+
+    modified_by: Optional[str] = None
+
+    paused: Optional[bool] = None
+
+    public_endpoint_id: Optional[str] = None
+
+    public_endpoint_params: Optional[PublicEndpointParams] = None
+
+    reranking: Optional[bool] = None
+
+    reranking_model: Optional[Literal["@cf/baai/bge-reranker-base", ""]] = None
+
+    rewrite_model: Optional[
+        Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+    ] = None
+
+    rewrite_query: Optional[bool] = None
+
+    score_threshold: Optional[float] = None
+
+    source_params: Optional[SourceParams] = None
+
+    status: Optional[str] = None
+
+    summarization: Optional[bool] = None
+
+    summarization_model: Optional[
+        Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+    ] = None
+
+    system_prompt_aisearch: Optional[str] = FieldInfo(alias="system_prompt_ai_search", default=None)
+
+    system_prompt_index_summarization: Optional[str] = None
+
+    system_prompt_rewrite_query: Optional[str] = None
+
+    token_id: Optional[str] = None
+
+    vectorize_active_namespace: Optional[str] = None
diff --git a/src/cloudflare/types/aisearch/instance_delete_response.py b/src/cloudflare/types/aisearch/instance_delete_response.py
new file mode 100644
index 00000000000..e5f966ee6b3
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instance_delete_response.py
@@ -0,0 +1,314 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+from ..r2.buckets.provider import Provider
+
+__all__ = [
+    "InstanceDeleteResponse",
+    "CustomMetadata",
+    "Metadata",
+    "PublicEndpointParams",
+    "PublicEndpointParamsChatCompletionsEndpoint",
+    "PublicEndpointParamsMcp",
+    "PublicEndpointParamsRateLimit",
+    "PublicEndpointParamsSearchEndpoint",
+    "SourceParams",
+    "SourceParamsWebCrawler",
+    "SourceParamsWebCrawlerParseOptions",
+    "SourceParamsWebCrawlerStoreOptions",
+]
+
+
+class CustomMetadata(BaseModel):
+    data_type: Literal["text", "number", "boolean"]
+
+    field_name: str
+
+
+class Metadata(BaseModel):
+    created_from_aisearch_wizard: Optional[bool] = None
+
+    worker_domain: Optional[str] = None
+
+
+class PublicEndpointParamsChatCompletionsEndpoint(BaseModel):
+    disabled: Optional[bool] = None
+    """Disable chat completions endpoint for this public endpoint"""
+
+
+class PublicEndpointParamsMcp(BaseModel):
+    disabled: Optional[bool] = None
+    """Disable MCP endpoint for this public endpoint"""
+
+
+class PublicEndpointParamsRateLimit(BaseModel):
+    period_ms: Optional[int] = None
+
+    requests: Optional[int] = None
+
+    technique: Optional[Literal["fixed", "sliding"]] = None
+
+
+class PublicEndpointParamsSearchEndpoint(BaseModel):
+    disabled: Optional[bool] = None
+    """Disable search endpoint for this public endpoint"""
+
+
+class PublicEndpointParams(BaseModel):
+    authorized_hosts: Optional[List[str]] = None
+
+    chat_completions_endpoint: Optional[PublicEndpointParamsChatCompletionsEndpoint] = None
+
+    enabled: Optional[bool] = None
+
+    mcp: Optional[PublicEndpointParamsMcp] = None
+
+    rate_limit: Optional[PublicEndpointParamsRateLimit] = None
+
+    search_endpoint: Optional[PublicEndpointParamsSearchEndpoint] = None
+
+
+class SourceParamsWebCrawlerParseOptions(BaseModel):
+    include_headers: Optional[Dict[str, str]] = None
+
+    include_images: Optional[bool] = None
+
+    specific_sitemaps: Optional[List[str]] = None
+    """List of specific sitemap URLs to use for crawling.
+
+    Only valid when parse_type is 'sitemap'.
+    """
+
+    use_browser_rendering: Optional[bool] = None
+
+
+class SourceParamsWebCrawlerStoreOptions(BaseModel):
+    storage_id: str
+
+    r2_jurisdiction: Optional[str] = None
+
+    storage_type: Optional[Provider] = None
+
+
+class SourceParamsWebCrawler(BaseModel):
+    parse_options: Optional[SourceParamsWebCrawlerParseOptions] = None
+
+    parse_type: Optional[Literal["sitemap", "feed-rss"]] = None
+
+    store_options: Optional[SourceParamsWebCrawlerStoreOptions] = None
+
+
+class SourceParams(BaseModel):
+    exclude_items: Optional[List[str]] = None
+    """List of path patterns to exclude.
+
+    Uses micromatch glob syntax: \\** matches within a path segment, ** matches across
+    path segments (e.g., /admin/** matches /admin/users and
+    /admin/settings/advanced)
+    """
+
+    include_items: Optional[List[str]] = None
+    """List of path patterns to include.
+
+    Uses micromatch glob syntax: \\** matches within a path segment, ** matches across
+    path segments (e.g., /blog/** matches /blog/post and /blog/2024/post)
+    """
+
+    prefix: Optional[str] = None
+
+    r2_jurisdiction: Optional[str] = None
+
+    web_crawler: Optional[SourceParamsWebCrawler] = None
+
+
+class InstanceDeleteResponse(BaseModel):
+    id: str
+    """Use your AI Search ID."""
+
+    account_id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    internal_id: str
+
+    modified_at: datetime
+
+    source: str
+
+    type: Literal["r2", "web-crawler"]
+
+    vectorize_name: str
+
+    ai_gateway_id: Optional[str] = None
+
+    aisearch_model: Optional[
+        Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+    ] = FieldInfo(alias="ai_search_model", default=None)
+
+    cache: Optional[bool] = None
+
+    cache_threshold: Optional[Literal["super_strict_match", "close_enough", "flexible_friend", "anything_goes"]] = None
+
+    chunk: Optional[bool] = None
+
+    chunk_overlap: Optional[int] = None
+
+    chunk_size: Optional[int] = None
+
+    created_by: Optional[str] = None
+
+    custom_metadata: Optional[List[CustomMetadata]] = None
+
+    embedding_model: Optional[
+        Literal[
+            "@cf/qwen/qwen3-embedding-0.6b",
+            "@cf/baai/bge-m3",
+            "@cf/baai/bge-large-en-v1.5",
+            "@cf/google/embeddinggemma-300m",
+            "google-ai-studio/gemini-embedding-001",
+            "openai/text-embedding-3-small",
+            "openai/text-embedding-3-large",
+            "",
+        ]
+    ] = None
+
+    enable: Optional[bool] = None
+
+    engine_version: Optional[float] = None
+
+    hybrid_search_enabled: Optional[bool] = None
+
+    last_activity: Optional[datetime] = None
+
+    max_num_results: Optional[int] = None
+
+    metadata: Optional[Metadata] = None
+
+    modified_by: Optional[str] = None
+
+    paused: Optional[bool] = None
+
+    public_endpoint_id: Optional[str] = None
+
+    public_endpoint_params: Optional[PublicEndpointParams] = None
+
+    reranking: Optional[bool] = None
+
+    reranking_model: Optional[Literal["@cf/baai/bge-reranker-base", ""]] = None
+
+    rewrite_model: Optional[
+        Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+    ] = None
+
+    rewrite_query: Optional[bool] = None
+
+    score_threshold: Optional[float] = None
+
+    source_params: Optional[SourceParams] = None
+
+    status: Optional[str] = None
+
+    summarization: Optional[bool] = None
+
+    summarization_model: Optional[
+        Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+    ] = None
+
+    system_prompt_aisearch: Optional[str] = FieldInfo(alias="system_prompt_ai_search", default=None)
+
+    system_prompt_index_summarization: Optional[str] = None
+
+    system_prompt_rewrite_query: Optional[str] = None
+
+    token_id: Optional[str] = None
+
+    vectorize_active_namespace: Optional[str] = None
diff --git a/src/cloudflare/types/aisearch/instance_list_params.py b/src/cloudflare/types/aisearch/instance_list_params.py
new file mode 100644
index 00000000000..543926bdaee
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instance_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["InstanceListParams"]
+
+
+class InstanceListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    page: int
+
+    per_page: int
+
+    search: str
+    """Search by id"""
diff --git a/src/cloudflare/types/aisearch/instance_list_response.py b/src/cloudflare/types/aisearch/instance_list_response.py
new file mode 100644
index 00000000000..8488c61e58a
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instance_list_response.py
@@ -0,0 +1,314 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+from ..r2.buckets.provider import Provider
+
+__all__ = [
+    "InstanceListResponse",
+    "CustomMetadata",
+    "Metadata",
+    "PublicEndpointParams",
+    "PublicEndpointParamsChatCompletionsEndpoint",
+    "PublicEndpointParamsMcp",
+    "PublicEndpointParamsRateLimit",
+    "PublicEndpointParamsSearchEndpoint",
+    "SourceParams",
+    "SourceParamsWebCrawler",
+    "SourceParamsWebCrawlerParseOptions",
+    "SourceParamsWebCrawlerStoreOptions",
+]
+
+
+class CustomMetadata(BaseModel):
+    data_type: Literal["text", "number", "boolean"]
+
+    field_name: str
+
+
+class Metadata(BaseModel):
+    created_from_aisearch_wizard: Optional[bool] = None
+
+    worker_domain: Optional[str] = None
+
+
+class PublicEndpointParamsChatCompletionsEndpoint(BaseModel):
+    disabled: Optional[bool] = None
+    """Disable chat completions endpoint for this public endpoint"""
+
+
+class PublicEndpointParamsMcp(BaseModel):
+    disabled: Optional[bool] = None
+    """Disable MCP endpoint for this public endpoint"""
+
+
+class PublicEndpointParamsRateLimit(BaseModel):
+    period_ms: Optional[int] = None
+
+    requests: Optional[int] = None
+
+    technique: Optional[Literal["fixed", "sliding"]] = None
+
+
+class PublicEndpointParamsSearchEndpoint(BaseModel):
+    disabled: Optional[bool] = None
+    """Disable search endpoint for this public endpoint"""
+
+
+class PublicEndpointParams(BaseModel):
+    authorized_hosts: Optional[List[str]] = None
+
+    chat_completions_endpoint: Optional[PublicEndpointParamsChatCompletionsEndpoint] = None
+
+    enabled: Optional[bool] = None
+
+    mcp: Optional[PublicEndpointParamsMcp] = None
+
+    rate_limit: Optional[PublicEndpointParamsRateLimit] = None
+
+    search_endpoint: Optional[PublicEndpointParamsSearchEndpoint] = None
+
+
+class SourceParamsWebCrawlerParseOptions(BaseModel):
+    include_headers: Optional[Dict[str, str]] = None
+
+    include_images: Optional[bool] = None
+
+    specific_sitemaps: Optional[List[str]] = None
+    """List of specific sitemap URLs to use for crawling.
+
+    Only valid when parse_type is 'sitemap'.
+    """
+
+    use_browser_rendering: Optional[bool] = None
+
+
+class SourceParamsWebCrawlerStoreOptions(BaseModel):
+    storage_id: str
+
+    r2_jurisdiction: Optional[str] = None
+
+    storage_type: Optional[Provider] = None
+
+
+class SourceParamsWebCrawler(BaseModel):
+    parse_options: Optional[SourceParamsWebCrawlerParseOptions] = None
+
+    parse_type: Optional[Literal["sitemap", "feed-rss"]] = None
+
+    store_options: Optional[SourceParamsWebCrawlerStoreOptions] = None
+
+
+class SourceParams(BaseModel):
+    exclude_items: Optional[List[str]] = None
+    """List of path patterns to exclude.
+
+    Uses micromatch glob syntax: \\** matches within a path segment, ** matches across
+    path segments (e.g., /admin/** matches /admin/users and
+    /admin/settings/advanced)
+    """
+
+    include_items: Optional[List[str]] = None
+    """List of path patterns to include.
+
+    Uses micromatch glob syntax: \\** matches within a path segment, ** matches across
+    path segments (e.g., /blog/** matches /blog/post and /blog/2024/post)
+    """
+
+    prefix: Optional[str] = None
+
+    r2_jurisdiction: Optional[str] = None
+
+    web_crawler: Optional[SourceParamsWebCrawler] = None
+
+
+class InstanceListResponse(BaseModel):
+    id: str
+    """Use your AI Search ID."""
+
+    account_id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    internal_id: str
+
+    modified_at: datetime
+
+    source: str
+
+    type: Literal["r2", "web-crawler"]
+
+    vectorize_name: str
+
+    ai_gateway_id: Optional[str] = None
+
+    aisearch_model: Optional[
+        Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+    ] = FieldInfo(alias="ai_search_model", default=None)
+
+    cache: Optional[bool] = None
+
+    cache_threshold: Optional[Literal["super_strict_match", "close_enough", "flexible_friend", "anything_goes"]] = None
+
+    chunk: Optional[bool] = None
+
+    chunk_overlap: Optional[int] = None
+
+    chunk_size: Optional[int] = None
+
+    created_by: Optional[str] = None
+
+    custom_metadata: Optional[List[CustomMetadata]] = None
+
+    embedding_model: Optional[
+        Literal[
+            "@cf/qwen/qwen3-embedding-0.6b",
+            "@cf/baai/bge-m3",
+            "@cf/baai/bge-large-en-v1.5",
+            "@cf/google/embeddinggemma-300m",
+            "google-ai-studio/gemini-embedding-001",
+            "openai/text-embedding-3-small",
+            "openai/text-embedding-3-large",
+            "",
+        ]
+    ] = None
+
+    enable: Optional[bool] = None
+
+    engine_version: Optional[float] = None
+
+    hybrid_search_enabled: Optional[bool] = None
+
+    last_activity: Optional[datetime] = None
+
+    max_num_results: Optional[int] = None
+
+    metadata: Optional[Metadata] = None
+
+    modified_by: Optional[str] = None
+
+    paused: Optional[bool] = None
+
+    public_endpoint_id: Optional[str] = None
+
+    public_endpoint_params: Optional[PublicEndpointParams] = None
+
+    reranking: Optional[bool] = None
+
+    reranking_model: Optional[Literal["@cf/baai/bge-reranker-base", ""]] = None
+
+    rewrite_model: Optional[
+        Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+    ] = None
+
+    rewrite_query: Optional[bool] = None
+
+    score_threshold: Optional[float] = None
+
+    source_params: Optional[SourceParams] = None
+
+    status: Optional[str] = None
+
+    summarization: Optional[bool] = None
+
+    summarization_model: Optional[
+        Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+    ] = None
+
+    system_prompt_aisearch: Optional[str] = FieldInfo(alias="system_prompt_ai_search", default=None)
+
+    system_prompt_index_summarization: Optional[str] = None
+
+    system_prompt_rewrite_query: Optional[str] = None
+
+    token_id: Optional[str] = None
+
+    vectorize_active_namespace: Optional[str] = None
diff --git a/src/cloudflare/types/aisearch/instance_read_response.py b/src/cloudflare/types/aisearch/instance_read_response.py
new file mode 100644
index 00000000000..0b3afdbe6a8
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instance_read_response.py
@@ -0,0 +1,314 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+from ..r2.buckets.provider import Provider
+
+__all__ = [
+    "InstanceReadResponse",
+    "CustomMetadata",
+    "Metadata",
+    "PublicEndpointParams",
+    "PublicEndpointParamsChatCompletionsEndpoint",
+    "PublicEndpointParamsMcp",
+    "PublicEndpointParamsRateLimit",
+    "PublicEndpointParamsSearchEndpoint",
+    "SourceParams",
+    "SourceParamsWebCrawler",
+    "SourceParamsWebCrawlerParseOptions",
+    "SourceParamsWebCrawlerStoreOptions",
+]
+
+
+class CustomMetadata(BaseModel):
+    data_type: Literal["text", "number", "boolean"]
+
+    field_name: str
+
+
+class Metadata(BaseModel):
+    created_from_aisearch_wizard: Optional[bool] = None
+
+    worker_domain: Optional[str] = None
+
+
+class PublicEndpointParamsChatCompletionsEndpoint(BaseModel):
+    disabled: Optional[bool] = None
+    """Disable chat completions endpoint for this public endpoint"""
+
+
+class PublicEndpointParamsMcp(BaseModel):
+    disabled: Optional[bool] = None
+    """Disable MCP endpoint for this public endpoint"""
+
+
+class PublicEndpointParamsRateLimit(BaseModel):
+    period_ms: Optional[int] = None
+
+    requests: Optional[int] = None
+
+    technique: Optional[Literal["fixed", "sliding"]] = None
+
+
+class PublicEndpointParamsSearchEndpoint(BaseModel):
+    disabled: Optional[bool] = None
+    """Disable search endpoint for this public endpoint"""
+
+
+class PublicEndpointParams(BaseModel):
+    authorized_hosts: Optional[List[str]] = None
+
+    chat_completions_endpoint: Optional[PublicEndpointParamsChatCompletionsEndpoint] = None
+
+    enabled: Optional[bool] = None
+
+    mcp: Optional[PublicEndpointParamsMcp] = None
+
+    rate_limit: Optional[PublicEndpointParamsRateLimit] = None
+
+    search_endpoint: Optional[PublicEndpointParamsSearchEndpoint] = None
+
+
+class SourceParamsWebCrawlerParseOptions(BaseModel):
+    include_headers: Optional[Dict[str, str]] = None
+
+    include_images: Optional[bool] = None
+
+    specific_sitemaps: Optional[List[str]] = None
+    """List of specific sitemap URLs to use for crawling.
+
+    Only valid when parse_type is 'sitemap'.
+    """
+
+    use_browser_rendering: Optional[bool] = None
+
+
+class SourceParamsWebCrawlerStoreOptions(BaseModel):
+    storage_id: str
+
+    r2_jurisdiction: Optional[str] = None
+
+    storage_type: Optional[Provider] = None
+
+
+class SourceParamsWebCrawler(BaseModel):
+    parse_options: Optional[SourceParamsWebCrawlerParseOptions] = None
+
+    parse_type: Optional[Literal["sitemap", "feed-rss"]] = None
+
+    store_options: Optional[SourceParamsWebCrawlerStoreOptions] = None
+
+
+class SourceParams(BaseModel):
+    exclude_items: Optional[List[str]] = None
+    """List of path patterns to exclude.
+
+    Uses micromatch glob syntax: \\** matches within a path segment, ** matches across
+    path segments (e.g., /admin/** matches /admin/users and
+    /admin/settings/advanced)
+    """
+
+    include_items: Optional[List[str]] = None
+    """List of path patterns to include.
+
+    Uses micromatch glob syntax: \\** matches within a path segment, ** matches across
+    path segments (e.g., /blog/** matches /blog/post and /blog/2024/post)
+    """
+
+    prefix: Optional[str] = None
+
+    r2_jurisdiction: Optional[str] = None
+
+    web_crawler: Optional[SourceParamsWebCrawler] = None
+
+
+class InstanceReadResponse(BaseModel):
+    id: str
+    """Use your AI Search ID."""
+
+    account_id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    internal_id: str
+
+    modified_at: datetime
+
+    source: str
+
+    type: Literal["r2", "web-crawler"]
+
+    vectorize_name: str
+
+    ai_gateway_id: Optional[str] = None
+
+    aisearch_model: Optional[
+        Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+    ] = FieldInfo(alias="ai_search_model", default=None)
+
+    cache: Optional[bool] = None
+
+    cache_threshold: Optional[Literal["super_strict_match", "close_enough", "flexible_friend", "anything_goes"]] = None
+
+    chunk: Optional[bool] = None
+
+    chunk_overlap: Optional[int] = None
+
+    chunk_size: Optional[int] = None
+
+    created_by: Optional[str] = None
+
+    custom_metadata: Optional[List[CustomMetadata]] = None
+
+    embedding_model: Optional[
+        Literal[
+            "@cf/qwen/qwen3-embedding-0.6b",
+            "@cf/baai/bge-m3",
+            "@cf/baai/bge-large-en-v1.5",
+            "@cf/google/embeddinggemma-300m",
+            "google-ai-studio/gemini-embedding-001",
+            "openai/text-embedding-3-small",
+            "openai/text-embedding-3-large",
+            "",
+        ]
+    ] = None
+
+    enable: Optional[bool] = None
+
+    engine_version: Optional[float] = None
+
+    hybrid_search_enabled: Optional[bool] = None
+
+    last_activity: Optional[datetime] = None
+
+    max_num_results: Optional[int] = None
+
+    metadata: Optional[Metadata] = None
+
+    modified_by: Optional[str] = None
+
+    paused: Optional[bool] = None
+
+    public_endpoint_id: Optional[str] = None
+
+    public_endpoint_params: Optional[PublicEndpointParams] = None
+
+    reranking: Optional[bool] = None
+
+    reranking_model: Optional[Literal["@cf/baai/bge-reranker-base", ""]] = None
+
+    rewrite_model: Optional[
+        Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+    ] = None
+
+    rewrite_query: Optional[bool] = None
+
+    score_threshold: Optional[float] = None
+
+    source_params: Optional[SourceParams] = None
+
+    status: Optional[str] = None
+
+    summarization: Optional[bool] = None
+
+    summarization_model: Optional[
+        Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+    ] = None
+
+    system_prompt_aisearch: Optional[str] = FieldInfo(alias="system_prompt_ai_search", default=None)
+
+    system_prompt_index_summarization: Optional[str] = None
+
+    system_prompt_rewrite_query: Optional[str] = None
+
+    token_id: Optional[str] = None
+
+    vectorize_active_namespace: Optional[str] = None
diff --git a/src/cloudflare/types/aisearch/instance_search_params.py b/src/cloudflare/types/aisearch/instance_search_params.py
new file mode 100644
index 00000000000..5be0494bf19
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instance_search_params.py
@@ -0,0 +1,128 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Union, Iterable, Optional
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = [
+    "InstanceSearchParams",
+    "Message",
+    "AISearchOptions",
+    "AISearchOptionsQueryRewrite",
+    "AISearchOptionsReranking",
+    "AISearchOptionsRetrieval",
+    "AISearchOptionsRetrievalFilters",
+    "AISearchOptionsRetrievalFiltersUnionMember0",
+    "AISearchOptionsRetrievalFiltersUnionMember1",
+    "AISearchOptionsRetrievalFiltersUnionMember1Filter",
+]
+
+
+class InstanceSearchParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    messages: Required[Iterable[Message]]
+
+    aisearch_options: Annotated[AISearchOptions, PropertyInfo(alias="ai_search_options")]
+
+
+class MessageTyped(TypedDict, total=False):
+    content: Required[Optional[str]]
+
+    role: Required[Literal["system", "developer", "user", "assistant", "tool"]]
+
+
+Message: TypeAlias = Union[MessageTyped, Dict[str, object]]
+
+
+class AISearchOptionsQueryRewrite(TypedDict, total=False):
+    enabled: bool
+
+    model: Literal[
+        "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+        "@cf/meta/llama-3.1-8b-instruct-fast",
+        "@cf/meta/llama-3.1-8b-instruct-fp8",
+        "@cf/meta/llama-4-scout-17b-16e-instruct",
+        "@cf/qwen/qwen3-30b-a3b-fp8",
+        "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+        "@cf/moonshotai/kimi-k2-instruct",
+        "anthropic/claude-3-7-sonnet",
+        "anthropic/claude-sonnet-4",
+        "anthropic/claude-opus-4",
+        "anthropic/claude-3-5-haiku",
+        "cerebras/qwen-3-235b-a22b-instruct",
+        "cerebras/qwen-3-235b-a22b-thinking",
+        "cerebras/llama-3.3-70b",
+        "cerebras/llama-4-maverick-17b-128e-instruct",
+        "cerebras/llama-4-scout-17b-16e-instruct",
+        "cerebras/gpt-oss-120b",
+        "google-ai-studio/gemini-2.5-flash",
+        "google-ai-studio/gemini-2.5-pro",
+        "grok/grok-4",
+        "groq/llama-3.3-70b-versatile",
+        "groq/llama-3.1-8b-instant",
+        "openai/gpt-5",
+        "openai/gpt-5-mini",
+        "openai/gpt-5-nano",
+        "",
+    ]
+
+    rewrite_prompt: str
+
+
+class AISearchOptionsReranking(TypedDict, total=False):
+    enabled: bool
+
+    match_threshold: float
+
+    model: Literal["@cf/baai/bge-reranker-base", ""]
+
+
+class AISearchOptionsRetrievalFiltersUnionMember0(TypedDict, total=False):
+    key: Required[str]
+
+    type: Required[Literal["eq", "ne", "gt", "gte", "lt", "lte"]]
+
+    value: Required[Union[str, float, bool]]
+
+
+class AISearchOptionsRetrievalFiltersUnionMember1Filter(TypedDict, total=False):
+    key: Required[str]
+
+    type: Required[Literal["eq", "ne", "gt", "gte", "lt", "lte"]]
+
+    value: Required[Union[str, float, bool]]
+
+
+class AISearchOptionsRetrievalFiltersUnionMember1(TypedDict, total=False):
+    filters: Required[Iterable[AISearchOptionsRetrievalFiltersUnionMember1Filter]]
+
+    type: Required[Literal["and", "or"]]
+
+
+AISearchOptionsRetrievalFilters: TypeAlias = Union[
+    AISearchOptionsRetrievalFiltersUnionMember0, AISearchOptionsRetrievalFiltersUnionMember1
+]
+
+
+class AISearchOptionsRetrieval(TypedDict, total=False):
+    context_expansion: int
+
+    filters: AISearchOptionsRetrievalFilters
+
+    match_threshold: float
+
+    max_num_results: int
+
+    retrieval_type: Literal["vector", "keyword", "hybrid"]
+
+
+class AISearchOptions(TypedDict, total=False):
+    query_rewrite: AISearchOptionsQueryRewrite
+
+    reranking: AISearchOptionsReranking
+
+    retrieval: AISearchOptionsRetrieval
diff --git a/src/cloudflare/types/aisearch/instance_search_response.py b/src/cloudflare/types/aisearch/instance_search_response.py
new file mode 100644
index 00000000000..c55a1106067
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instance_search_response.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["InstanceSearchResponse", "Chunk", "ChunkItem", "ChunkScoringDetails"]
+
+
+class ChunkItem(BaseModel):
+    key: str
+
+    metadata: Optional[Dict[str, object]] = None
+
+    timestamp: Optional[float] = None
+
+
+class ChunkScoringDetails(BaseModel):
+    keyword_rank: Optional[float] = None
+
+    keyword_score: Optional[float] = None
+
+    vector_rank: Optional[float] = None
+
+    vector_score: Optional[float] = None
+
+
+class Chunk(BaseModel):
+    id: str
+
+    score: float
+
+    text: str
+
+    type: str
+
+    item: Optional[ChunkItem] = None
+
+    scoring_details: Optional[ChunkScoringDetails] = None
+
+
+class InstanceSearchResponse(BaseModel):
+    chunks: List[Chunk]
+
+    search_query: str
diff --git a/src/cloudflare/types/aisearch/instance_stats_response.py b/src/cloudflare/types/aisearch/instance_stats_response.py
new file mode 100644
index 00000000000..e4de0067194
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instance_stats_response.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["InstanceStatsResponse"]
+
+
+class InstanceStatsResponse(BaseModel):
+    completed: Optional[int] = None
+
+    error: Optional[int] = None
+
+    file_embed_errors: Optional[Dict[str, object]] = None
+
+    index_source_errors: Optional[Dict[str, object]] = None
+
+    last_activity: Optional[datetime] = None
+
+    queued: Optional[int] = None
+
+    running: Optional[int] = None
+
+    skipped: Optional[int] = None
diff --git a/src/cloudflare/types/aisearch/instance_update_params.py b/src/cloudflare/types/aisearch/instance_update_params.py
new file mode 100644
index 00000000000..b39743c1fac
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instance_update_params.py
@@ -0,0 +1,276 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Iterable
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+from ..r2.buckets.provider import Provider
+
+__all__ = [
+    "InstanceUpdateParams",
+    "CustomMetadata",
+    "Metadata",
+    "PublicEndpointParams",
+    "PublicEndpointParamsChatCompletionsEndpoint",
+    "PublicEndpointParamsMcp",
+    "PublicEndpointParamsRateLimit",
+    "PublicEndpointParamsSearchEndpoint",
+    "SourceParams",
+    "SourceParamsWebCrawler",
+    "SourceParamsWebCrawlerParseOptions",
+    "SourceParamsWebCrawlerStoreOptions",
+]
+
+
+class InstanceUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    ai_gateway_id: str
+
+    aisearch_model: Annotated[
+        Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ],
+        PropertyInfo(alias="ai_search_model"),
+    ]
+
+    cache: bool
+
+    cache_threshold: Literal["super_strict_match", "close_enough", "flexible_friend", "anything_goes"]
+
+    chunk: bool
+
+    chunk_overlap: int
+
+    chunk_size: int
+
+    custom_metadata: Iterable[CustomMetadata]
+
+    embedding_model: Literal[
+        "@cf/qwen/qwen3-embedding-0.6b",
+        "@cf/baai/bge-m3",
+        "@cf/baai/bge-large-en-v1.5",
+        "@cf/google/embeddinggemma-300m",
+        "google-ai-studio/gemini-embedding-001",
+        "openai/text-embedding-3-small",
+        "openai/text-embedding-3-large",
+        "",
+    ]
+
+    hybrid_search_enabled: bool
+
+    max_num_results: int
+
+    metadata: Metadata
+
+    paused: bool
+
+    public_endpoint_params: PublicEndpointParams
+
+    reranking: bool
+
+    reranking_model: Literal["@cf/baai/bge-reranker-base", ""]
+
+    rewrite_model: Literal[
+        "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+        "@cf/meta/llama-3.1-8b-instruct-fast",
+        "@cf/meta/llama-3.1-8b-instruct-fp8",
+        "@cf/meta/llama-4-scout-17b-16e-instruct",
+        "@cf/qwen/qwen3-30b-a3b-fp8",
+        "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+        "@cf/moonshotai/kimi-k2-instruct",
+        "anthropic/claude-3-7-sonnet",
+        "anthropic/claude-sonnet-4",
+        "anthropic/claude-opus-4",
+        "anthropic/claude-3-5-haiku",
+        "cerebras/qwen-3-235b-a22b-instruct",
+        "cerebras/qwen-3-235b-a22b-thinking",
+        "cerebras/llama-3.3-70b",
+        "cerebras/llama-4-maverick-17b-128e-instruct",
+        "cerebras/llama-4-scout-17b-16e-instruct",
+        "cerebras/gpt-oss-120b",
+        "google-ai-studio/gemini-2.5-flash",
+        "google-ai-studio/gemini-2.5-pro",
+        "grok/grok-4",
+        "groq/llama-3.3-70b-versatile",
+        "groq/llama-3.1-8b-instant",
+        "openai/gpt-5",
+        "openai/gpt-5-mini",
+        "openai/gpt-5-nano",
+        "",
+    ]
+
+    rewrite_query: bool
+
+    score_threshold: float
+
+    source_params: SourceParams
+
+    summarization: bool
+
+    summarization_model: Literal[
+        "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+        "@cf/meta/llama-3.1-8b-instruct-fast",
+        "@cf/meta/llama-3.1-8b-instruct-fp8",
+        "@cf/meta/llama-4-scout-17b-16e-instruct",
+        "@cf/qwen/qwen3-30b-a3b-fp8",
+        "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+        "@cf/moonshotai/kimi-k2-instruct",
+        "anthropic/claude-3-7-sonnet",
+        "anthropic/claude-sonnet-4",
+        "anthropic/claude-opus-4",
+        "anthropic/claude-3-5-haiku",
+        "cerebras/qwen-3-235b-a22b-instruct",
+        "cerebras/qwen-3-235b-a22b-thinking",
+        "cerebras/llama-3.3-70b",
+        "cerebras/llama-4-maverick-17b-128e-instruct",
+        "cerebras/llama-4-scout-17b-16e-instruct",
+        "cerebras/gpt-oss-120b",
+        "google-ai-studio/gemini-2.5-flash",
+        "google-ai-studio/gemini-2.5-pro",
+        "grok/grok-4",
+        "groq/llama-3.3-70b-versatile",
+        "groq/llama-3.1-8b-instant",
+        "openai/gpt-5",
+        "openai/gpt-5-mini",
+        "openai/gpt-5-nano",
+        "",
+    ]
+
+    system_prompt_aisearch: Annotated[str, PropertyInfo(alias="system_prompt_ai_search")]
+
+    system_prompt_index_summarization: str
+
+    system_prompt_rewrite_query: str
+
+    token_id: str
+
+
+class CustomMetadata(TypedDict, total=False):
+    data_type: Required[Literal["text", "number", "boolean"]]
+
+    field_name: Required[str]
+
+
+class Metadata(TypedDict, total=False):
+    created_from_aisearch_wizard: bool
+
+    worker_domain: str
+
+
+class PublicEndpointParamsChatCompletionsEndpoint(TypedDict, total=False):
+    disabled: bool
+    """Disable chat completions endpoint for this public endpoint"""
+
+
+class PublicEndpointParamsMcp(TypedDict, total=False):
+    disabled: bool
+    """Disable MCP endpoint for this public endpoint"""
+
+
+class PublicEndpointParamsRateLimit(TypedDict, total=False):
+    period_ms: int
+
+    requests: int
+
+    technique: Literal["fixed", "sliding"]
+
+
+class PublicEndpointParamsSearchEndpoint(TypedDict, total=False):
+    disabled: bool
+    """Disable search endpoint for this public endpoint"""
+
+
+class PublicEndpointParams(TypedDict, total=False):
+    authorized_hosts: SequenceNotStr[str]
+
+    chat_completions_endpoint: PublicEndpointParamsChatCompletionsEndpoint
+
+    enabled: bool
+
+    mcp: PublicEndpointParamsMcp
+
+    rate_limit: PublicEndpointParamsRateLimit
+
+    search_endpoint: PublicEndpointParamsSearchEndpoint
+
+
+class SourceParamsWebCrawlerParseOptions(TypedDict, total=False):
+    include_headers: Dict[str, str]
+
+    include_images: bool
+
+    specific_sitemaps: SequenceNotStr[str]
+    """List of specific sitemap URLs to use for crawling.
+
+    Only valid when parse_type is 'sitemap'.
+    """
+
+    use_browser_rendering: bool
+
+
+class SourceParamsWebCrawlerStoreOptions(TypedDict, total=False):
+    storage_id: Required[str]
+
+    r2_jurisdiction: str
+
+    storage_type: Provider
+
+
+class SourceParamsWebCrawler(TypedDict, total=False):
+    parse_options: SourceParamsWebCrawlerParseOptions
+
+    parse_type: Literal["sitemap", "feed-rss"]
+
+    store_options: SourceParamsWebCrawlerStoreOptions
+
+
+class SourceParams(TypedDict, total=False):
+    exclude_items: SequenceNotStr[str]
+    """List of path patterns to exclude.
+
+    Uses micromatch glob syntax: \\** matches within a path segment, ** matches across
+    path segments (e.g., /admin/** matches /admin/users and
+    /admin/settings/advanced)
+    """
+
+    include_items: SequenceNotStr[str]
+    """List of path patterns to include.
+
+    Uses micromatch glob syntax: \\** matches within a path segment, ** matches across
+    path segments (e.g., /blog/** matches /blog/post and /blog/2024/post)
+    """
+
+    prefix: str
+
+    r2_jurisdiction: str
+
+    web_crawler: SourceParamsWebCrawler
diff --git a/src/cloudflare/types/aisearch/instance_update_response.py b/src/cloudflare/types/aisearch/instance_update_response.py
new file mode 100644
index 00000000000..76cecdbb792
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instance_update_response.py
@@ -0,0 +1,314 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+from ..r2.buckets.provider import Provider
+
+__all__ = [
+    "InstanceUpdateResponse",
+    "CustomMetadata",
+    "Metadata",
+    "PublicEndpointParams",
+    "PublicEndpointParamsChatCompletionsEndpoint",
+    "PublicEndpointParamsMcp",
+    "PublicEndpointParamsRateLimit",
+    "PublicEndpointParamsSearchEndpoint",
+    "SourceParams",
+    "SourceParamsWebCrawler",
+    "SourceParamsWebCrawlerParseOptions",
+    "SourceParamsWebCrawlerStoreOptions",
+]
+
+
+class CustomMetadata(BaseModel):
+    data_type: Literal["text", "number", "boolean"]
+
+    field_name: str
+
+
+class Metadata(BaseModel):
+    created_from_aisearch_wizard: Optional[bool] = None
+
+    worker_domain: Optional[str] = None
+
+
+class PublicEndpointParamsChatCompletionsEndpoint(BaseModel):
+    disabled: Optional[bool] = None
+    """Disable chat completions endpoint for this public endpoint"""
+
+
+class PublicEndpointParamsMcp(BaseModel):
+    disabled: Optional[bool] = None
+    """Disable MCP endpoint for this public endpoint"""
+
+
+class PublicEndpointParamsRateLimit(BaseModel):
+    period_ms: Optional[int] = None
+
+    requests: Optional[int] = None
+
+    technique: Optional[Literal["fixed", "sliding"]] = None
+
+
+class PublicEndpointParamsSearchEndpoint(BaseModel):
+    disabled: Optional[bool] = None
+    """Disable search endpoint for this public endpoint"""
+
+
+class PublicEndpointParams(BaseModel):
+    authorized_hosts: Optional[List[str]] = None
+
+    chat_completions_endpoint: Optional[PublicEndpointParamsChatCompletionsEndpoint] = None
+
+    enabled: Optional[bool] = None
+
+    mcp: Optional[PublicEndpointParamsMcp] = None
+
+    rate_limit: Optional[PublicEndpointParamsRateLimit] = None
+
+    search_endpoint: Optional[PublicEndpointParamsSearchEndpoint] = None
+
+
+class SourceParamsWebCrawlerParseOptions(BaseModel):
+    include_headers: Optional[Dict[str, str]] = None
+
+    include_images: Optional[bool] = None
+
+    specific_sitemaps: Optional[List[str]] = None
+    """List of specific sitemap URLs to use for crawling.
+
+    Only valid when parse_type is 'sitemap'.
+    """
+
+    use_browser_rendering: Optional[bool] = None
+
+
+class SourceParamsWebCrawlerStoreOptions(BaseModel):
+    storage_id: str
+
+    r2_jurisdiction: Optional[str] = None
+
+    storage_type: Optional[Provider] = None
+
+
+class SourceParamsWebCrawler(BaseModel):
+    parse_options: Optional[SourceParamsWebCrawlerParseOptions] = None
+
+    parse_type: Optional[Literal["sitemap", "feed-rss"]] = None
+
+    store_options: Optional[SourceParamsWebCrawlerStoreOptions] = None
+
+
+class SourceParams(BaseModel):
+    exclude_items: Optional[List[str]] = None
+    """List of path patterns to exclude.
+
+    Uses micromatch glob syntax: \\** matches within a path segment, ** matches across
+    path segments (e.g., /admin/** matches /admin/users and
+    /admin/settings/advanced)
+    """
+
+    include_items: Optional[List[str]] = None
+    """List of path patterns to include.
+
+    Uses micromatch glob syntax: \\** matches within a path segment, ** matches across
+    path segments (e.g., /blog/** matches /blog/post and /blog/2024/post)
+    """
+
+    prefix: Optional[str] = None
+
+    r2_jurisdiction: Optional[str] = None
+
+    web_crawler: Optional[SourceParamsWebCrawler] = None
+
+
+class InstanceUpdateResponse(BaseModel):
+    id: str
+    """Use your AI Search ID."""
+
+    account_id: str
+
+    account_tag: str
+
+    created_at: datetime
+
+    internal_id: str
+
+    modified_at: datetime
+
+    source: str
+
+    type: Literal["r2", "web-crawler"]
+
+    vectorize_name: str
+
+    ai_gateway_id: Optional[str] = None
+
+    aisearch_model: Optional[
+        Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+    ] = FieldInfo(alias="ai_search_model", default=None)
+
+    cache: Optional[bool] = None
+
+    cache_threshold: Optional[Literal["super_strict_match", "close_enough", "flexible_friend", "anything_goes"]] = None
+
+    chunk: Optional[bool] = None
+
+    chunk_overlap: Optional[int] = None
+
+    chunk_size: Optional[int] = None
+
+    created_by: Optional[str] = None
+
+    custom_metadata: Optional[List[CustomMetadata]] = None
+
+    embedding_model: Optional[
+        Literal[
+            "@cf/qwen/qwen3-embedding-0.6b",
+            "@cf/baai/bge-m3",
+            "@cf/baai/bge-large-en-v1.5",
+            "@cf/google/embeddinggemma-300m",
+            "google-ai-studio/gemini-embedding-001",
+            "openai/text-embedding-3-small",
+            "openai/text-embedding-3-large",
+            "",
+        ]
+    ] = None
+
+    enable: Optional[bool] = None
+
+    engine_version: Optional[float] = None
+
+    hybrid_search_enabled: Optional[bool] = None
+
+    last_activity: Optional[datetime] = None
+
+    max_num_results: Optional[int] = None
+
+    metadata: Optional[Metadata] = None
+
+    modified_by: Optional[str] = None
+
+    paused: Optional[bool] = None
+
+    public_endpoint_id: Optional[str] = None
+
+    public_endpoint_params: Optional[PublicEndpointParams] = None
+
+    reranking: Optional[bool] = None
+
+    reranking_model: Optional[Literal["@cf/baai/bge-reranker-base", ""]] = None
+
+    rewrite_model: Optional[
+        Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+    ] = None
+
+    rewrite_query: Optional[bool] = None
+
+    score_threshold: Optional[float] = None
+
+    source_params: Optional[SourceParams] = None
+
+    status: Optional[str] = None
+
+    summarization: Optional[bool] = None
+
+    summarization_model: Optional[
+        Literal[
+            "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fast",
+            "@cf/meta/llama-3.1-8b-instruct-fp8",
+            "@cf/meta/llama-4-scout-17b-16e-instruct",
+            "@cf/qwen/qwen3-30b-a3b-fp8",
+            "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+            "@cf/moonshotai/kimi-k2-instruct",
+            "anthropic/claude-3-7-sonnet",
+            "anthropic/claude-sonnet-4",
+            "anthropic/claude-opus-4",
+            "anthropic/claude-3-5-haiku",
+            "cerebras/qwen-3-235b-a22b-instruct",
+            "cerebras/qwen-3-235b-a22b-thinking",
+            "cerebras/llama-3.3-70b",
+            "cerebras/llama-4-maverick-17b-128e-instruct",
+            "cerebras/llama-4-scout-17b-16e-instruct",
+            "cerebras/gpt-oss-120b",
+            "google-ai-studio/gemini-2.5-flash",
+            "google-ai-studio/gemini-2.5-pro",
+            "grok/grok-4",
+            "groq/llama-3.3-70b-versatile",
+            "groq/llama-3.1-8b-instant",
+            "openai/gpt-5",
+            "openai/gpt-5-mini",
+            "openai/gpt-5-nano",
+            "",
+        ]
+    ] = None
+
+    system_prompt_aisearch: Optional[str] = FieldInfo(alias="system_prompt_ai_search", default=None)
+
+    system_prompt_index_summarization: Optional[str] = None
+
+    system_prompt_rewrite_query: Optional[str] = None
+
+    token_id: Optional[str] = None
+
+    vectorize_active_namespace: Optional[str] = None
diff --git a/src/cloudflare/types/aisearch/instances/__init__.py b/src/cloudflare/types/aisearch/instances/__init__.py
new file mode 100644
index 00000000000..a9a19580c09
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instances/__init__.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .job_list_params import JobListParams as JobListParams
+from .job_logs_params import JobLogsParams as JobLogsParams
+from .item_list_params import ItemListParams as ItemListParams
+from .job_get_response import JobGetResponse as JobGetResponse
+from .item_get_response import ItemGetResponse as ItemGetResponse
+from .job_list_response import JobListResponse as JobListResponse
+from .job_logs_response import JobLogsResponse as JobLogsResponse
+from .item_list_response import ItemListResponse as ItemListResponse
+from .job_create_response import JobCreateResponse as JobCreateResponse
diff --git a/src/cloudflare/types/aisearch/instances/item_get_response.py b/src/cloudflare/types/aisearch/instances/item_get_response.py
new file mode 100644
index 00000000000..4df3c0b94a8
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instances/item_get_response.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["ItemGetResponse"]
+
+
+class ItemGetResponse(BaseModel):
+    id: str
+
+    key: str
+
+    status: Literal["queued", "running", "completed", "error", "skipped"]
+
+    error: Optional[str] = None
+
+    last_seen_at: Optional[datetime] = None
+
+    next_action: Optional[str] = None
diff --git a/src/cloudflare/types/aisearch/instances/item_list_params.py b/src/cloudflare/types/aisearch/instances/item_list_params.py
new file mode 100644
index 00000000000..a21050011ba
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instances/item_list_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["ItemListParams"]
+
+
+class ItemListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    page: int
+
+    per_page: int
+
+    search: str
+
+    status: Literal["queued", "running", "completed", "error", "skipped"]
diff --git a/src/cloudflare/types/aisearch/instances/item_list_response.py b/src/cloudflare/types/aisearch/instances/item_list_response.py
new file mode 100644
index 00000000000..ff22e5ab677
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instances/item_list_response.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["ItemListResponse"]
+
+
+class ItemListResponse(BaseModel):
+    id: str
+
+    key: str
+
+    status: Literal["queued", "running", "completed", "error", "skipped"]
+
+    error: Optional[str] = None
+
+    last_seen_at: Optional[datetime] = None
+
+    next_action: Optional[str] = None
diff --git a/src/cloudflare/types/aisearch/instances/job_create_response.py b/src/cloudflare/types/aisearch/instances/job_create_response.py
new file mode 100644
index 00000000000..25ad1d27903
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instances/job_create_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["JobCreateResponse"]
+
+
+class JobCreateResponse(BaseModel):
+    id: str
+
+    source: Literal["user", "schedule"]
+
+    end_reason: Optional[str] = None
+
+    ended_at: Optional[str] = None
+
+    last_seen_at: Optional[str] = None
+
+    started_at: Optional[str] = None
diff --git a/src/cloudflare/types/aisearch/instances/job_get_response.py b/src/cloudflare/types/aisearch/instances/job_get_response.py
new file mode 100644
index 00000000000..6fbbda8a3ab
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instances/job_get_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["JobGetResponse"]
+
+
+class JobGetResponse(BaseModel):
+    id: str
+
+    source: Literal["user", "schedule"]
+
+    end_reason: Optional[str] = None
+
+    ended_at: Optional[str] = None
+
+    last_seen_at: Optional[str] = None
+
+    started_at: Optional[str] = None
diff --git a/src/cloudflare/types/aisearch/instances/job_list_params.py b/src/cloudflare/types/aisearch/instances/job_list_params.py
new file mode 100644
index 00000000000..41df366ab10
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instances/job_list_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["JobListParams"]
+
+
+class JobListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    page: int
+
+    per_page: int
diff --git a/src/cloudflare/types/aisearch/instances/job_list_response.py b/src/cloudflare/types/aisearch/instances/job_list_response.py
new file mode 100644
index 00000000000..1b550a45c10
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instances/job_list_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["JobListResponse"]
+
+
+class JobListResponse(BaseModel):
+    id: str
+
+    source: Literal["user", "schedule"]
+
+    end_reason: Optional[str] = None
+
+    ended_at: Optional[str] = None
+
+    last_seen_at: Optional[str] = None
+
+    started_at: Optional[str] = None
diff --git a/src/cloudflare/types/aisearch/instances/job_logs_params.py b/src/cloudflare/types/aisearch/instances/job_logs_params.py
new file mode 100644
index 00000000000..eb74252f187
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instances/job_logs_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["JobLogsParams"]
+
+
+class JobLogsParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    id: Required[str]
+    """Use your AI Search ID."""
+
+    page: int
+
+    per_page: int
diff --git a/src/cloudflare/types/aisearch/instances/job_logs_response.py b/src/cloudflare/types/aisearch/instances/job_logs_response.py
new file mode 100644
index 00000000000..2cbed697f19
--- /dev/null
+++ b/src/cloudflare/types/aisearch/instances/job_logs_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from typing_extensions import TypeAlias
+
+from ...._models import BaseModel
+
+__all__ = ["JobLogsResponse", "JobLogsResponseItem"]
+
+
+class JobLogsResponseItem(BaseModel):
+    id: int
+
+    created_at: float
+
+    message: str
+
+    message_type: int
+
+
+JobLogsResponse: TypeAlias = List[JobLogsResponseItem]
diff --git a/src/cloudflare/types/aisearch/token_create_params.py b/src/cloudflare/types/aisearch/token_create_params.py
new file mode 100644
index 00000000000..930d7b5eb33
--- /dev/null
+++ b/src/cloudflare/types/aisearch/token_create_params.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["TokenCreateParams"]
+
+
+class TokenCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    cf_api_id: Required[str]
+
+    cf_api_key: Required[str]
+
+    name: Required[str]
diff --git a/src/cloudflare/types/aisearch/token_create_response.py b/src/cloudflare/types/aisearch/token_create_response.py
new file mode 100644
index 00000000000..c452115f380
--- /dev/null
+++ b/src/cloudflare/types/aisearch/token_create_response.py
@@ -0,0 +1,36 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["TokenCreateResponse"]
+
+
+class TokenCreateResponse(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    cf_api_id: str
+
+    cf_api_key: str
+
+    created_at: datetime
+
+    modified_at: datetime
+
+    name: str
+
+    created_by: Optional[str] = None
+
+    enabled: Optional[bool] = None
+
+    legacy: Optional[bool] = None
+
+    modified_by: Optional[str] = None
+
+    synced_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/aisearch/token_delete_response.py b/src/cloudflare/types/aisearch/token_delete_response.py
new file mode 100644
index 00000000000..18c34a2b30a
--- /dev/null
+++ b/src/cloudflare/types/aisearch/token_delete_response.py
@@ -0,0 +1,36 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["TokenDeleteResponse"]
+
+
+class TokenDeleteResponse(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    cf_api_id: str
+
+    cf_api_key: str
+
+    created_at: datetime
+
+    modified_at: datetime
+
+    name: str
+
+    created_by: Optional[str] = None
+
+    enabled: Optional[bool] = None
+
+    legacy: Optional[bool] = None
+
+    modified_by: Optional[str] = None
+
+    synced_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/aisearch/token_list_params.py b/src/cloudflare/types/aisearch/token_list_params.py
new file mode 100644
index 00000000000..2133c57baba
--- /dev/null
+++ b/src/cloudflare/types/aisearch/token_list_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["TokenListParams"]
+
+
+class TokenListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    page: int
+
+    per_page: int
diff --git a/src/cloudflare/types/aisearch/token_list_response.py b/src/cloudflare/types/aisearch/token_list_response.py
new file mode 100644
index 00000000000..4f55e5e18d4
--- /dev/null
+++ b/src/cloudflare/types/aisearch/token_list_response.py
@@ -0,0 +1,36 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["TokenListResponse"]
+
+
+class TokenListResponse(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    cf_api_id: str
+
+    cf_api_key: str
+
+    created_at: datetime
+
+    modified_at: datetime
+
+    name: str
+
+    created_by: Optional[str] = None
+
+    enabled: Optional[bool] = None
+
+    legacy: Optional[bool] = None
+
+    modified_by: Optional[str] = None
+
+    synced_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/aisearch/token_read_response.py b/src/cloudflare/types/aisearch/token_read_response.py
new file mode 100644
index 00000000000..54e861afb99
--- /dev/null
+++ b/src/cloudflare/types/aisearch/token_read_response.py
@@ -0,0 +1,36 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["TokenReadResponse"]
+
+
+class TokenReadResponse(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    cf_api_id: str
+
+    cf_api_key: str
+
+    created_at: datetime
+
+    modified_at: datetime
+
+    name: str
+
+    created_by: Optional[str] = None
+
+    enabled: Optional[bool] = None
+
+    legacy: Optional[bool] = None
+
+    modified_by: Optional[str] = None
+
+    synced_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/aisearch/token_update_params.py b/src/cloudflare/types/aisearch/token_update_params.py
new file mode 100644
index 00000000000..5591335b963
--- /dev/null
+++ b/src/cloudflare/types/aisearch/token_update_params.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["TokenUpdateParams"]
+
+
+class TokenUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    cf_api_id: Required[str]
+
+    cf_api_key: Required[str]
+
+    name: Required[str]
diff --git a/src/cloudflare/types/aisearch/token_update_response.py b/src/cloudflare/types/aisearch/token_update_response.py
new file mode 100644
index 00000000000..5ce9eae30af
--- /dev/null
+++ b/src/cloudflare/types/aisearch/token_update_response.py
@@ -0,0 +1,36 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["TokenUpdateResponse"]
+
+
+class TokenUpdateResponse(BaseModel):
+    id: str
+
+    account_id: str
+
+    account_tag: str
+
+    cf_api_id: str
+
+    cf_api_key: str
+
+    created_at: datetime
+
+    modified_at: datetime
+
+    name: str
+
+    created_by: Optional[str] = None
+
+    enabled: Optional[bool] = None
+
+    legacy: Optional[bool] = None
+
+    modified_by: Optional[str] = None
+
+    synced_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/alerting/__init__.py b/src/cloudflare/types/alerting/__init__.py
index bb4a0f9f756..8bb9b2ba920 100644
--- a/src/cloudflare/types/alerting/__init__.py
+++ b/src/cloudflare/types/alerting/__init__.py
@@ -11,7 +11,14 @@
 from .policy_filter_param import PolicyFilterParam as PolicyFilterParam
 from .policy_create_params import PolicyCreateParams as PolicyCreateParams
 from .policy_update_params import PolicyUpdateParams as PolicyUpdateParams
+from .silence_get_response import SilenceGetResponse as SilenceGetResponse
+from .silence_create_params import SilenceCreateParams as SilenceCreateParams
+from .silence_list_response import SilenceListResponse as SilenceListResponse
+from .silence_update_params import SilenceUpdateParams as SilenceUpdateParams
 from .policy_create_response import PolicyCreateResponse as PolicyCreateResponse
 from .policy_delete_response import PolicyDeleteResponse as PolicyDeleteResponse
 from .policy_update_response import PolicyUpdateResponse as PolicyUpdateResponse
+from .silence_create_response import SilenceCreateResponse as SilenceCreateResponse
+from .silence_delete_response import SilenceDeleteResponse as SilenceDeleteResponse
+from .silence_update_response import SilenceUpdateResponse as SilenceUpdateResponse
 from .available_alert_list_response import AvailableAlertListResponse as AvailableAlertListResponse
diff --git a/src/cloudflare/types/alerting/available_alert_list_response.py b/src/cloudflare/types/alerting/available_alert_list_response.py
index b0ff8190634..b8b9efc1b91 100644
--- a/src/cloudflare/types/alerting/available_alert_list_response.py
+++ b/src/cloudflare/types/alerting/available_alert_list_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Dict, List, Optional
+from typing_extensions import TypeAlias
 
 from ..._models import BaseModel
 
@@ -24,4 +25,4 @@ class AvailableAlertListResponseItem(BaseModel):
     """Use this value when creating and updating a notification policy."""
 
 
-AvailableAlertListResponse = Dict[str, List[AvailableAlertListResponseItem]]
+AvailableAlertListResponse: TypeAlias = Dict[str, List[AvailableAlertListResponseItem]]
diff --git a/src/cloudflare/types/alerting/destinations/__init__.py b/src/cloudflare/types/alerting/destinations/__init__.py
index fd61e30e290..848b0dd5555 100644
--- a/src/cloudflare/types/alerting/destinations/__init__.py
+++ b/src/cloudflare/types/alerting/destinations/__init__.py
@@ -7,7 +7,6 @@
 from .eligible_get_response import EligibleGetResponse as EligibleGetResponse
 from .webhook_create_params import WebhookCreateParams as WebhookCreateParams
 from .webhook_update_params import WebhookUpdateParams as WebhookUpdateParams
-from .pagerduty_get_response import PagerdutyGetResponse as PagerdutyGetResponse
 from .pagerduty_link_response import PagerdutyLinkResponse as PagerdutyLinkResponse
 from .webhook_create_response import WebhookCreateResponse as WebhookCreateResponse
 from .webhook_delete_response import WebhookDeleteResponse as WebhookDeleteResponse
diff --git a/src/cloudflare/types/alerting/destinations/eligible_get_response.py b/src/cloudflare/types/alerting/destinations/eligible_get_response.py
index 127867de2c7..f727c8f4fe0 100644
--- a/src/cloudflare/types/alerting/destinations/eligible_get_response.py
+++ b/src/cloudflare/types/alerting/destinations/eligible_get_response.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Dict, List, Optional
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from ...._models import BaseModel
 
@@ -23,4 +23,4 @@ class EligibleGetResponseItem(BaseModel):
     """Determines type of delivery mechanism."""
 
 
-EligibleGetResponse = Dict[str, List[EligibleGetResponseItem]]
+EligibleGetResponse: TypeAlias = Dict[str, List[EligibleGetResponseItem]]
diff --git a/src/cloudflare/types/alerting/destinations/pagerduty_delete_response.py b/src/cloudflare/types/alerting/destinations/pagerduty_delete_response.py
index 958d795048c..2c80c20a3cc 100644
--- a/src/cloudflare/types/alerting/destinations/pagerduty_delete_response.py
+++ b/src/cloudflare/types/alerting/destinations/pagerduty_delete_response.py
@@ -4,31 +4,26 @@
 from typing_extensions import Literal
 
 from ...._models import BaseModel
-from ...shared.response_info import ResponseInfo
 
-__all__ = ["PagerdutyDeleteResponse", "ResultInfo"]
+__all__ = ["PagerdutyDeleteResponse", "Error", "Message"]
 
 
-class ResultInfo(BaseModel):
-    count: Optional[float] = None
-    """Total number of results for the requested service"""
+class Error(BaseModel):
+    message: str
 
-    page: Optional[float] = None
-    """Current page within paginated list of results"""
+    code: Optional[int] = None
 
-    per_page: Optional[float] = None
-    """Number of results per page of results"""
 
-    total_count: Optional[float] = None
-    """Total results available without any search parameters"""
+class Message(BaseModel):
+    message: str
+
+    code: Optional[int] = None
 
 
 class PagerdutyDeleteResponse(BaseModel):
-    errors: List[ResponseInfo]
+    errors: List[Error]
 
-    messages: List[ResponseInfo]
+    messages: List[Message]
 
     success: Literal[True]
     """Whether the API call was successful"""
-
-    result_info: Optional[ResultInfo] = None
diff --git a/src/cloudflare/types/alerting/destinations/pagerduty_get_response.py b/src/cloudflare/types/alerting/destinations/pagerduty_get_response.py
deleted file mode 100644
index 655283d7dbd..00000000000
--- a/src/cloudflare/types/alerting/destinations/pagerduty_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .pagerduty import Pagerduty
-
-__all__ = ["PagerdutyGetResponse"]
-
-PagerdutyGetResponse = List[Pagerduty]
diff --git a/src/cloudflare/types/alerting/destinations/webhook_delete_response.py b/src/cloudflare/types/alerting/destinations/webhook_delete_response.py
index eef159b9921..b35c98e70f7 100644
--- a/src/cloudflare/types/alerting/destinations/webhook_delete_response.py
+++ b/src/cloudflare/types/alerting/destinations/webhook_delete_response.py
@@ -4,31 +4,26 @@
 from typing_extensions import Literal
 
 from ...._models import BaseModel
-from ...shared.response_info import ResponseInfo
 
-__all__ = ["WebhookDeleteResponse", "ResultInfo"]
+__all__ = ["WebhookDeleteResponse", "Error", "Message"]
 
 
-class ResultInfo(BaseModel):
-    count: Optional[float] = None
-    """Total number of results for the requested service"""
+class Error(BaseModel):
+    message: str
 
-    page: Optional[float] = None
-    """Current page within paginated list of results"""
+    code: Optional[int] = None
 
-    per_page: Optional[float] = None
-    """Number of results per page of results"""
 
-    total_count: Optional[float] = None
-    """Total results available without any search parameters"""
+class Message(BaseModel):
+    message: str
+
+    code: Optional[int] = None
 
 
 class WebhookDeleteResponse(BaseModel):
-    errors: List[ResponseInfo]
+    errors: List[Error]
 
-    messages: List[ResponseInfo]
+    messages: List[Message]
 
     success: Literal[True]
     """Whether the API call was successful"""
-
-    result_info: Optional[ResultInfo] = None
diff --git a/src/cloudflare/types/alerting/destinations/webhooks.py b/src/cloudflare/types/alerting/destinations/webhooks.py
index 36fb89342c0..282b56790f3 100644
--- a/src/cloudflare/types/alerting/destinations/webhooks.py
+++ b/src/cloudflare/types/alerting/destinations/webhooks.py
@@ -35,14 +35,7 @@ class Webhooks(BaseModel):
     notification.
     """
 
-    secret: Optional[str] = None
-    """
-    Optional secret that will be passed in the `cf-webhook-auth` header when
-    dispatching generic webhook notifications or formatted for supported
-    destinations. Secrets are not returned in any API response body.
-    """
-
-    type: Optional[Literal["slack", "generic", "gchat"]] = None
+    type: Optional[Literal["datadog", "discord", "feishu", "gchat", "generic", "opsgenie", "slack", "splunk"]] = None
     """Type of webhook endpoint."""
 
     url: Optional[str] = None
diff --git a/src/cloudflare/types/alerting/mechanism.py b/src/cloudflare/types/alerting/mechanism.py
index 583c4b38651..eecb83718fc 100644
--- a/src/cloudflare/types/alerting/mechanism.py
+++ b/src/cloudflare/types/alerting/mechanism.py
@@ -1,15 +1,35 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Dict, List, Union
+from typing import List, Optional
 
 from ..._models import BaseModel
 
-__all__ = ["Mechanism", "MechanismItem"]
+__all__ = ["Mechanism", "Email", "Pagerduty", "Webhook"]
 
 
-class MechanismItem(BaseModel):
-    id: Union[str, str, None] = None
+class Email(BaseModel):
+    id: Optional[str] = None
+    """The email address"""
+
+
+class Pagerduty(BaseModel):
+    id: Optional[str] = None
+    """UUID"""
+
+
+class Webhook(BaseModel):
+    id: Optional[str] = None
     """UUID"""
 
 
-Mechanism = Dict[str, List[MechanismItem]]
+class Mechanism(BaseModel):
+    """List of IDs that will be used when dispatching a notification.
+
+    IDs for email type will be the email address.
+    """
+
+    email: Optional[List[Email]] = None
+
+    pagerduty: Optional[List[Pagerduty]] = None
+
+    webhooks: Optional[List[Webhook]] = None
diff --git a/src/cloudflare/types/alerting/mechanism_param.py b/src/cloudflare/types/alerting/mechanism_param.py
index 7124a33e3b7..89ff230df22 100644
--- a/src/cloudflare/types/alerting/mechanism_param.py
+++ b/src/cloudflare/types/alerting/mechanism_param.py
@@ -2,15 +2,35 @@
 
 from __future__ import annotations
 
-from typing import Dict, Union, Iterable
+from typing import Iterable
 from typing_extensions import TypedDict
 
-__all__ = ["MechanismParam", "MechanismParamItem"]
+__all__ = ["MechanismParam", "Email", "Pagerduty", "Webhook"]
 
 
-class MechanismParamItem(TypedDict, total=False):
-    id: Union[str, str]
+class Email(TypedDict, total=False):
+    id: str
+    """The email address"""
+
+
+class Pagerduty(TypedDict, total=False):
+    id: str
+    """UUID"""
+
+
+class Webhook(TypedDict, total=False):
+    id: str
     """UUID"""
 
 
-MechanismParam = Dict[str, Iterable[MechanismParamItem]]
+class MechanismParam(TypedDict, total=False):
+    """List of IDs that will be used when dispatching a notification.
+
+    IDs for email type will be the email address.
+    """
+
+    email: Iterable[Email]
+
+    pagerduty: Iterable[Pagerduty]
+
+    webhooks: Iterable[Webhook]
diff --git a/src/cloudflare/types/alerting/policy.py b/src/cloudflare/types/alerting/policy.py
index 6fd5915e74e..39b85618e16 100644
--- a/src/cloudflare/types/alerting/policy.py
+++ b/src/cloudflare/types/alerting/policy.py
@@ -15,8 +15,15 @@ class Policy(BaseModel):
     id: Optional[str] = None
     """The unique identifier of a notification policy"""
 
+    alert_interval: Optional[str] = None
+    """
+    Optional specification of how often to re-alert from the same incident, not
+    support on all alert types.
+    """
+
     alert_type: Optional[
         Literal[
+            "abuse_report_alert",
             "access_custom_certificate_expiration_type",
             "advanced_ddos_attack_l4_alert",
             "advanced_ddos_attack_l7_alert",
@@ -26,12 +33,17 @@ class Policy(BaseModel):
             "block_notification_block_removed",
             "block_notification_new_block",
             "block_notification_review_rejected",
+            "bot_traffic_basic_alert",
             "brand_protection_alert",
             "brand_protection_digest",
             "clickhouse_alert_fw_anomaly",
             "clickhouse_alert_fw_ent_anomaly",
+            "cloudforce_one_request_notification",
+            "custom_analytics",
+            "custom_bot_detection_alert",
             "custom_ssl_certificate_event_type",
             "dedicated_ssl_certificate_event_type",
+            "device_connectivity_anomaly_alert",
             "dos_attack_l4",
             "dos_attack_l7",
             "expiring_service_token_alert",
@@ -43,11 +55,14 @@ class Policy(BaseModel):
             "hostname_aop_custom_certificate_expiration_type",
             "http_alert_edge_error",
             "http_alert_origin_error",
+            "image_notification",
+            "image_resizing_notification",
             "incident_alert",
             "load_balancing_health_alert",
             "load_balancing_pool_enablement_alert",
             "logo_match_alert",
             "magic_tunnel_health_check_event",
+            "magic_wan_tunnel_health",
             "maintenance_event_notification",
             "mtls_certificate_store_certificate_expiration_type",
             "pages_event_alert",
@@ -62,10 +77,14 @@ class Policy(BaseModel):
             "scriptmonitor_alert_new_resources",
             "secondary_dns_all_primaries_failing",
             "secondary_dns_primaries_failing",
+            "secondary_dns_warning",
             "secondary_dns_zone_successfully_updated",
             "secondary_dns_zone_validation_warning",
+            "security_insights_alert",
             "sentinel_alert",
             "stream_live_notifications",
+            "synthetic_test_latency_alert",
+            "synthetic_test_low_availability_alert",
             "traffic_anomalies_alert",
             "tunnel_health_event",
             "tunnel_update_event",
diff --git a/src/cloudflare/types/alerting/policy_create_params.py b/src/cloudflare/types/alerting/policy_create_params.py
index 6f366cbf980..f6922a4d71e 100644
--- a/src/cloudflare/types/alerting/policy_create_params.py
+++ b/src/cloudflare/types/alerting/policy_create_params.py
@@ -16,6 +16,7 @@ class PolicyCreateParams(TypedDict, total=False):
 
     alert_type: Required[
         Literal[
+            "abuse_report_alert",
             "access_custom_certificate_expiration_type",
             "advanced_ddos_attack_l4_alert",
             "advanced_ddos_attack_l7_alert",
@@ -25,12 +26,17 @@ class PolicyCreateParams(TypedDict, total=False):
             "block_notification_block_removed",
             "block_notification_new_block",
             "block_notification_review_rejected",
+            "bot_traffic_basic_alert",
             "brand_protection_alert",
             "brand_protection_digest",
             "clickhouse_alert_fw_anomaly",
             "clickhouse_alert_fw_ent_anomaly",
+            "cloudforce_one_request_notification",
+            "custom_analytics",
+            "custom_bot_detection_alert",
             "custom_ssl_certificate_event_type",
             "dedicated_ssl_certificate_event_type",
+            "device_connectivity_anomaly_alert",
             "dos_attack_l4",
             "dos_attack_l7",
             "expiring_service_token_alert",
@@ -42,11 +48,14 @@ class PolicyCreateParams(TypedDict, total=False):
             "hostname_aop_custom_certificate_expiration_type",
             "http_alert_edge_error",
             "http_alert_origin_error",
+            "image_notification",
+            "image_resizing_notification",
             "incident_alert",
             "load_balancing_health_alert",
             "load_balancing_pool_enablement_alert",
             "logo_match_alert",
             "magic_tunnel_health_check_event",
+            "magic_wan_tunnel_health",
             "maintenance_event_notification",
             "mtls_certificate_store_certificate_expiration_type",
             "pages_event_alert",
@@ -61,10 +70,14 @@ class PolicyCreateParams(TypedDict, total=False):
             "scriptmonitor_alert_new_resources",
             "secondary_dns_all_primaries_failing",
             "secondary_dns_primaries_failing",
+            "secondary_dns_warning",
             "secondary_dns_zone_successfully_updated",
             "secondary_dns_zone_validation_warning",
+            "security_insights_alert",
             "sentinel_alert",
             "stream_live_notifications",
+            "synthetic_test_latency_alert",
+            "synthetic_test_low_availability_alert",
             "traffic_anomalies_alert",
             "tunnel_health_event",
             "tunnel_update_event",
@@ -91,6 +104,12 @@ class PolicyCreateParams(TypedDict, total=False):
     name: Required[str]
     """Name of the policy."""
 
+    alert_interval: str
+    """
+    Optional specification of how often to re-alert from the same incident, not
+    support on all alert types.
+    """
+
     description: str
     """Optional description for the Notification policy."""
 
diff --git a/src/cloudflare/types/alerting/policy_delete_response.py b/src/cloudflare/types/alerting/policy_delete_response.py
index d0feccf6ae2..c4ffa82754d 100644
--- a/src/cloudflare/types/alerting/policy_delete_response.py
+++ b/src/cloudflare/types/alerting/policy_delete_response.py
@@ -4,9 +4,20 @@
 from typing_extensions import Literal
 
 from ..._models import BaseModel
-from ..shared.response_info import ResponseInfo
 
-__all__ = ["PolicyDeleteResponse", "ResultInfo"]
+__all__ = ["PolicyDeleteResponse", "Error", "Message", "ResultInfo"]
+
+
+class Error(BaseModel):
+    message: str
+
+    code: Optional[int] = None
+
+
+class Message(BaseModel):
+    message: str
+
+    code: Optional[int] = None
 
 
 class ResultInfo(BaseModel):
@@ -24,9 +35,9 @@ class ResultInfo(BaseModel):
 
 
 class PolicyDeleteResponse(BaseModel):
-    errors: List[ResponseInfo]
+    errors: List[Error]
 
-    messages: List[ResponseInfo]
+    messages: List[Message]
 
     success: Literal[True]
     """Whether the API call was successful"""
diff --git a/src/cloudflare/types/alerting/policy_filter.py b/src/cloudflare/types/alerting/policy_filter.py
index 1206dbd5725..d5b4bb13b2b 100644
--- a/src/cloudflare/types/alerting/policy_filter.py
+++ b/src/cloudflare/types/alerting/policy_filter.py
@@ -9,6 +9,10 @@
 
 
 class PolicyFilter(BaseModel):
+    """
+    Optional filters that allow you to be alerted only on a subset of events for that alert type based on some criteria. This is only available for select alert types. See alert type documentation for more details.
+    """
+
     actions: Optional[List[str]] = None
     """Usage depends on specific alert type"""
 
@@ -16,10 +20,7 @@ class PolicyFilter(BaseModel):
     """Used for configuring radar_notification"""
 
     affected_components: Optional[List[str]] = None
-    """Used for configuring incident_alert.
-
-    A list of identifiers for each component to monitor.
-    """
+    """Used for configuring incident_alert"""
 
     affected_locations: Optional[List[str]] = None
     """Used for configuring radar_notification"""
@@ -30,8 +31,8 @@ class PolicyFilter(BaseModel):
     alert_trigger_preferences: Optional[List[str]] = None
     """Usage depends on specific alert type"""
 
-    alert_trigger_preferences_value: Optional[List[Literal["99.0", "98.0", "97.0"]]] = None
-    """Used for configuring magic_tunnel_health_check_event"""
+    alert_trigger_preferences_value: Optional[List[str]] = None
+    """Usage depends on specific alert type"""
 
     enabled: Optional[List[str]] = None
     """Used for configuring load_balancing_pool_enablement_alert"""
@@ -66,6 +67,9 @@ class PolicyFilter(BaseModel):
     input_id: Optional[List[str]] = None
     """Used for configuring stream_live_notifications"""
 
+    insight_class: Optional[List[str]] = None
+    """Used for configuring security_insights_alert"""
+
     limit: Optional[List[str]] = None
     """Used for configuring billing_usage_alert"""
 
@@ -87,6 +91,9 @@ class PolicyFilter(BaseModel):
     pool_id: Optional[List[str]] = None
     """Usage depends on specific alert type"""
 
+    pop_names: Optional[List[str]] = None
+    """Usage depends on specific alert type"""
+
     product: Optional[List[str]] = None
     """Used for configuring billing_usage_alert"""
 
@@ -130,7 +137,10 @@ class PolicyFilter(BaseModel):
     """Used for configuring tunnel_health_event"""
 
     tunnel_name: Optional[List[str]] = None
-    """Used for configuring magic_tunnel_health_check_event"""
+    """Usage depends on specific alert type"""
+
+    type: Optional[List[str]] = None
+    """Usage depends on specific alert type"""
 
     where: Optional[List[str]] = None
     """Usage depends on specific alert type"""
diff --git a/src/cloudflare/types/alerting/policy_filter_param.py b/src/cloudflare/types/alerting/policy_filter_param.py
index bf852b4099d..318df6298bd 100644
--- a/src/cloudflare/types/alerting/policy_filter_param.py
+++ b/src/cloudflare/types/alerting/policy_filter_param.py
@@ -5,53 +5,56 @@
 from typing import List
 from typing_extensions import Literal, TypedDict
 
+from ..._types import SequenceNotStr
+
 __all__ = ["PolicyFilterParam"]
 
 
 class PolicyFilterParam(TypedDict, total=False):
-    actions: List[str]
+    """
+    Optional filters that allow you to be alerted only on a subset of events for that alert type based on some criteria. This is only available for select alert types. See alert type documentation for more details.
+    """
+
+    actions: SequenceNotStr[str]
     """Usage depends on specific alert type"""
 
-    affected_asns: List[str]
+    affected_asns: SequenceNotStr[str]
     """Used for configuring radar_notification"""
 
-    affected_components: List[str]
-    """Used for configuring incident_alert.
-
-    A list of identifiers for each component to monitor.
-    """
+    affected_components: SequenceNotStr[str]
+    """Used for configuring incident_alert"""
 
-    affected_locations: List[str]
+    affected_locations: SequenceNotStr[str]
     """Used for configuring radar_notification"""
 
-    airport_code: List[str]
+    airport_code: SequenceNotStr[str]
     """Used for configuring maintenance_event_notification"""
 
-    alert_trigger_preferences: List[str]
+    alert_trigger_preferences: SequenceNotStr[str]
     """Usage depends on specific alert type"""
 
-    alert_trigger_preferences_value: List[Literal["99.0", "98.0", "97.0"]]
-    """Used for configuring magic_tunnel_health_check_event"""
+    alert_trigger_preferences_value: SequenceNotStr[str]
+    """Usage depends on specific alert type"""
 
-    enabled: List[str]
+    enabled: SequenceNotStr[str]
     """Used for configuring load_balancing_pool_enablement_alert"""
 
-    environment: List[str]
+    environment: SequenceNotStr[str]
     """Used for configuring pages_event_alert"""
 
-    event: List[str]
+    event: SequenceNotStr[str]
     """Used for configuring pages_event_alert"""
 
-    event_source: List[str]
+    event_source: SequenceNotStr[str]
     """Used for configuring load_balancing_health_alert"""
 
-    event_type: List[str]
+    event_type: SequenceNotStr[str]
     """Usage depends on specific alert type"""
 
-    group_by: List[str]
+    group_by: SequenceNotStr[str]
     """Usage depends on specific alert type"""
 
-    health_check_id: List[str]
+    health_check_id: SequenceNotStr[str]
     """Used for configuring health_check_status_notification"""
 
     incident_impact: List[
@@ -59,77 +62,86 @@ class PolicyFilterParam(TypedDict, total=False):
     ]
     """Used for configuring incident_alert"""
 
-    input_id: List[str]
+    input_id: SequenceNotStr[str]
     """Used for configuring stream_live_notifications"""
 
-    limit: List[str]
+    insight_class: SequenceNotStr[str]
+    """Used for configuring security_insights_alert"""
+
+    limit: SequenceNotStr[str]
     """Used for configuring billing_usage_alert"""
 
-    logo_tag: List[str]
+    logo_tag: SequenceNotStr[str]
     """Used for configuring logo_match_alert"""
 
-    megabits_per_second: List[str]
+    megabits_per_second: SequenceNotStr[str]
     """Used for configuring advanced_ddos_attack_l4_alert"""
 
-    new_health: List[str]
+    new_health: SequenceNotStr[str]
     """Used for configuring load_balancing_health_alert"""
 
-    new_status: List[str]
+    new_status: SequenceNotStr[str]
     """Used for configuring tunnel_health_event"""
 
-    packets_per_second: List[str]
+    packets_per_second: SequenceNotStr[str]
     """Used for configuring advanced_ddos_attack_l4_alert"""
 
-    pool_id: List[str]
+    pool_id: SequenceNotStr[str]
+    """Usage depends on specific alert type"""
+
+    pop_names: SequenceNotStr[str]
     """Usage depends on specific alert type"""
 
-    product: List[str]
+    product: SequenceNotStr[str]
     """Used for configuring billing_usage_alert"""
 
-    project_id: List[str]
+    project_id: SequenceNotStr[str]
     """Used for configuring pages_event_alert"""
 
-    protocol: List[str]
+    protocol: SequenceNotStr[str]
     """Used for configuring advanced_ddos_attack_l4_alert"""
 
-    query_tag: List[str]
+    query_tag: SequenceNotStr[str]
     """Usage depends on specific alert type"""
 
-    requests_per_second: List[str]
+    requests_per_second: SequenceNotStr[str]
     """Used for configuring advanced_ddos_attack_l7_alert"""
 
-    selectors: List[str]
+    selectors: SequenceNotStr[str]
     """Usage depends on specific alert type"""
 
-    services: List[str]
+    services: SequenceNotStr[str]
     """Used for configuring clickhouse_alert_fw_ent_anomaly"""
 
-    slo: List[str]
+    slo: SequenceNotStr[str]
     """Usage depends on specific alert type"""
 
-    status: List[str]
+    status: SequenceNotStr[str]
     """Used for configuring health_check_status_notification"""
 
-    target_hostname: List[str]
+    target_hostname: SequenceNotStr[str]
     """Used for configuring advanced_ddos_attack_l7_alert"""
 
-    target_ip: List[str]
+    target_ip: SequenceNotStr[str]
     """Used for configuring advanced_ddos_attack_l4_alert"""
 
-    target_zone_name: List[str]
+    target_zone_name: SequenceNotStr[str]
     """Used for configuring advanced_ddos_attack_l7_alert"""
 
     traffic_exclusions: List[Literal["security_events"]]
     """Used for configuring traffic_anomalies_alert"""
 
-    tunnel_id: List[str]
+    tunnel_id: SequenceNotStr[str]
     """Used for configuring tunnel_health_event"""
 
-    tunnel_name: List[str]
-    """Used for configuring magic_tunnel_health_check_event"""
+    tunnel_name: SequenceNotStr[str]
+    """Usage depends on specific alert type"""
+
+    type: SequenceNotStr[str]
+    """Usage depends on specific alert type"""
 
-    where: List[str]
+    where: SequenceNotStr[str]
     """Usage depends on specific alert type"""
 
-    zones: List[str]
+    zones: SequenceNotStr[str]
     """Usage depends on specific alert type"""
diff --git a/src/cloudflare/types/alerting/policy_update_params.py b/src/cloudflare/types/alerting/policy_update_params.py
index ff4d371d9f3..8f054e67fe3 100644
--- a/src/cloudflare/types/alerting/policy_update_params.py
+++ b/src/cloudflare/types/alerting/policy_update_params.py
@@ -14,7 +14,14 @@ class PolicyUpdateParams(TypedDict, total=False):
     account_id: Required[str]
     """The account id"""
 
+    alert_interval: str
+    """
+    Optional specification of how often to re-alert from the same incident, not
+    support on all alert types.
+    """
+
     alert_type: Literal[
+        "abuse_report_alert",
         "access_custom_certificate_expiration_type",
         "advanced_ddos_attack_l4_alert",
         "advanced_ddos_attack_l7_alert",
@@ -24,12 +31,17 @@ class PolicyUpdateParams(TypedDict, total=False):
         "block_notification_block_removed",
         "block_notification_new_block",
         "block_notification_review_rejected",
+        "bot_traffic_basic_alert",
         "brand_protection_alert",
         "brand_protection_digest",
         "clickhouse_alert_fw_anomaly",
         "clickhouse_alert_fw_ent_anomaly",
+        "cloudforce_one_request_notification",
+        "custom_analytics",
+        "custom_bot_detection_alert",
         "custom_ssl_certificate_event_type",
         "dedicated_ssl_certificate_event_type",
+        "device_connectivity_anomaly_alert",
         "dos_attack_l4",
         "dos_attack_l7",
         "expiring_service_token_alert",
@@ -41,11 +53,14 @@ class PolicyUpdateParams(TypedDict, total=False):
         "hostname_aop_custom_certificate_expiration_type",
         "http_alert_edge_error",
         "http_alert_origin_error",
+        "image_notification",
+        "image_resizing_notification",
         "incident_alert",
         "load_balancing_health_alert",
         "load_balancing_pool_enablement_alert",
         "logo_match_alert",
         "magic_tunnel_health_check_event",
+        "magic_wan_tunnel_health",
         "maintenance_event_notification",
         "mtls_certificate_store_certificate_expiration_type",
         "pages_event_alert",
@@ -60,10 +75,14 @@ class PolicyUpdateParams(TypedDict, total=False):
         "scriptmonitor_alert_new_resources",
         "secondary_dns_all_primaries_failing",
         "secondary_dns_primaries_failing",
+        "secondary_dns_warning",
         "secondary_dns_zone_successfully_updated",
         "secondary_dns_zone_validation_warning",
+        "security_insights_alert",
         "sentinel_alert",
         "stream_live_notifications",
+        "synthetic_test_latency_alert",
+        "synthetic_test_low_availability_alert",
         "traffic_anomalies_alert",
         "tunnel_health_event",
         "tunnel_update_event",
diff --git a/src/cloudflare/types/alerting/silence_create_params.py b/src/cloudflare/types/alerting/silence_create_params.py
new file mode 100644
index 00000000000..d8d733bab17
--- /dev/null
+++ b/src/cloudflare/types/alerting/silence_create_params.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SilenceCreateParams", "Body"]
+
+
+class SilenceCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account id"""
+
+    body: Required[Iterable[Body]]
+
+
+class Body(TypedDict, total=False):
+    end_time: str
+    """When the silence ends."""
+
+    policy_id: str
+    """The unique identifier of a notification policy"""
+
+    start_time: str
+    """When the silence starts."""
diff --git a/src/cloudflare/types/alerting/silence_create_response.py b/src/cloudflare/types/alerting/silence_create_response.py
new file mode 100644
index 00000000000..42453c16b7e
--- /dev/null
+++ b/src/cloudflare/types/alerting/silence_create_response.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["SilenceCreateResponse", "Error", "Message"]
+
+
+class Error(BaseModel):
+    message: str
+
+    code: Optional[int] = None
+
+
+class Message(BaseModel):
+    message: str
+
+    code: Optional[int] = None
+
+
+class SilenceCreateResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful"""
diff --git a/src/cloudflare/types/alerting/silence_delete_response.py b/src/cloudflare/types/alerting/silence_delete_response.py
new file mode 100644
index 00000000000..1a803530c92
--- /dev/null
+++ b/src/cloudflare/types/alerting/silence_delete_response.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["SilenceDeleteResponse", "Error", "Message"]
+
+
+class Error(BaseModel):
+    message: str
+
+    code: Optional[int] = None
+
+
+class Message(BaseModel):
+    message: str
+
+    code: Optional[int] = None
+
+
+class SilenceDeleteResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful"""
diff --git a/src/cloudflare/types/alerting/silence_get_response.py b/src/cloudflare/types/alerting/silence_get_response.py
new file mode 100644
index 00000000000..fecd4f1b64b
--- /dev/null
+++ b/src/cloudflare/types/alerting/silence_get_response.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["SilenceGetResponse"]
+
+
+class SilenceGetResponse(BaseModel):
+    id: Optional[str] = None
+    """Silence ID"""
+
+    created_at: Optional[str] = None
+    """When the silence was created."""
+
+    end_time: Optional[str] = None
+    """When the silence ends."""
+
+    policy_id: Optional[str] = None
+    """The unique identifier of a notification policy"""
+
+    start_time: Optional[str] = None
+    """When the silence starts."""
+
+    updated_at: Optional[str] = None
+    """When the silence was modified."""
diff --git a/src/cloudflare/types/alerting/silence_list_response.py b/src/cloudflare/types/alerting/silence_list_response.py
new file mode 100644
index 00000000000..07148aad888
--- /dev/null
+++ b/src/cloudflare/types/alerting/silence_list_response.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["SilenceListResponse"]
+
+
+class SilenceListResponse(BaseModel):
+    id: Optional[str] = None
+    """Silence ID"""
+
+    created_at: Optional[str] = None
+    """When the silence was created."""
+
+    end_time: Optional[str] = None
+    """When the silence ends."""
+
+    policy_id: Optional[str] = None
+    """The unique identifier of a notification policy"""
+
+    start_time: Optional[str] = None
+    """When the silence starts."""
+
+    updated_at: Optional[str] = None
+    """When the silence was modified."""
diff --git a/src/cloudflare/types/alerting/silence_update_params.py b/src/cloudflare/types/alerting/silence_update_params.py
new file mode 100644
index 00000000000..59567cfd488
--- /dev/null
+++ b/src/cloudflare/types/alerting/silence_update_params.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SilenceUpdateParams", "Body"]
+
+
+class SilenceUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account id"""
+
+    body: Required[Iterable[Body]]
+
+
+class Body(TypedDict, total=False):
+    id: str
+    """Silence ID"""
+
+    end_time: str
+    """When the silence ends."""
+
+    start_time: str
+    """When the silence starts."""
diff --git a/src/cloudflare/types/alerting/silence_update_response.py b/src/cloudflare/types/alerting/silence_update_response.py
new file mode 100644
index 00000000000..06d1a6e0856
--- /dev/null
+++ b/src/cloudflare/types/alerting/silence_update_response.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["SilenceUpdateResponse"]
+
+
+class SilenceUpdateResponse(BaseModel):
+    id: Optional[str] = None
+    """Silence ID"""
+
+    created_at: Optional[str] = None
+    """When the silence was created."""
+
+    end_time: Optional[str] = None
+    """When the silence ends."""
+
+    policy_id: Optional[str] = None
+    """The unique identifier of a notification policy"""
+
+    start_time: Optional[str] = None
+    """When the silence starts."""
+
+    updated_at: Optional[str] = None
+    """When the silence was modified."""
diff --git a/src/cloudflare/types/api_gateway/__init__.py b/src/cloudflare/types/api_gateway/__init__.py
index 15d29b9c6f3..af823ed1bc6 100644
--- a/src/cloudflare/types/api_gateway/__init__.py
+++ b/src/cloudflare/types/api_gateway/__init__.py
@@ -4,10 +4,8 @@
 
 from .message import Message as Message
 from .settings import Settings as Settings
-from .api_shield import APIShield as APIShield
 from .configuration import Configuration as Configuration
-from .public_schema import PublicSchema as PublicSchema
-from .schema_upload import SchemaUpload as SchemaUpload
+from .old_public_schema import OldPublicSchema as OldPublicSchema
 from .schema_list_params import SchemaListParams as SchemaListParams
 from .discovery_operation import DiscoveryOperation as DiscoveryOperation
 from .operation_get_params import OperationGetParams as OperationGetParams
@@ -25,5 +23,8 @@
 from .operation_delete_response import OperationDeleteResponse as OperationDeleteResponse
 from .user_schema_create_params import UserSchemaCreateParams as UserSchemaCreateParams
 from .configuration_update_params import ConfigurationUpdateParams as ConfigurationUpdateParams
+from .user_schema_create_response import UserSchemaCreateResponse as UserSchemaCreateResponse
 from .user_schema_delete_response import UserSchemaDeleteResponse as UserSchemaDeleteResponse
-from .configuration_update_response import ConfigurationUpdateResponse as ConfigurationUpdateResponse
+from .operation_bulk_create_params import OperationBulkCreateParams as OperationBulkCreateParams
+from .operation_bulk_create_response import OperationBulkCreateResponse as OperationBulkCreateResponse
+from .operation_bulk_delete_response import OperationBulkDeleteResponse as OperationBulkDeleteResponse
diff --git a/src/cloudflare/types/api_gateway/api_shield.py b/src/cloudflare/types/api_gateway/api_shield.py
deleted file mode 100644
index e3ca4b81018..00000000000
--- a/src/cloudflare/types/api_gateway/api_shield.py
+++ /dev/null
@@ -1,227 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union, Optional
-from datetime import datetime
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = [
-    "APIShield",
-    "Features",
-    "FeaturesAPIShieldOperationFeatureThresholds",
-    "FeaturesAPIShieldOperationFeatureThresholdsThresholds",
-    "FeaturesAPIShieldOperationFeatureParameterSchemas",
-    "FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemas",
-    "FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameterSchemas",
-    "FeaturesAPIShieldOperationFeatureAPIRouting",
-    "FeaturesAPIShieldOperationFeatureAPIRoutingAPIRouting",
-    "FeaturesAPIShieldOperationFeatureConfidenceIntervals",
-    "FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervals",
-    "FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThreshold",
-    "FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervals",
-    "FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP90",
-    "FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP95",
-    "FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP99",
-    "FeaturesAPIShieldOperationFeatureSchemaInfo",
-    "FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfo",
-    "FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfoActiveSchema",
-]
-
-
-class FeaturesAPIShieldOperationFeatureThresholdsThresholds(BaseModel):
-    auth_id_tokens: Optional[int] = None
-    """The total number of auth-ids seen across this calculation."""
-
-    data_points: Optional[int] = None
-    """The number of data points used for the threshold suggestion calculation."""
-
-    last_updated: Optional[datetime] = None
-
-    p50: Optional[int] = None
-    """The p50 quantile of requests (in period_seconds)."""
-
-    p90: Optional[int] = None
-    """The p90 quantile of requests (in period_seconds)."""
-
-    p99: Optional[int] = None
-    """The p99 quantile of requests (in period_seconds)."""
-
-    period_seconds: Optional[int] = None
-    """The period over which this threshold is suggested."""
-
-    requests: Optional[int] = None
-    """The estimated number of requests covered by these calculations."""
-
-    suggested_threshold: Optional[int] = None
-    """The suggested threshold in requests done by the same auth_id or period_seconds."""
-
-
-class FeaturesAPIShieldOperationFeatureThresholds(BaseModel):
-    thresholds: Optional[FeaturesAPIShieldOperationFeatureThresholdsThresholds] = None
-
-
-class FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameterSchemas(BaseModel):
-    parameters: Optional[List[object]] = None
-    """An array containing the learned parameter schemas."""
-
-    responses: Optional[object] = None
-    """An empty response object.
-
-    This field is required to yield a valid operation schema.
-    """
-
-
-class FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemas(BaseModel):
-    last_updated: Optional[datetime] = None
-
-    parameter_schemas: Optional[
-        FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameterSchemas
-    ] = None
-    """An operation schema object containing a response."""
-
-
-class FeaturesAPIShieldOperationFeatureParameterSchemas(BaseModel):
-    parameter_schemas: FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemas
-
-
-class FeaturesAPIShieldOperationFeatureAPIRoutingAPIRouting(BaseModel):
-    last_updated: Optional[datetime] = None
-
-    route: Optional[str] = None
-    """Target route."""
-
-
-class FeaturesAPIShieldOperationFeatureAPIRouting(BaseModel):
-    api_routing: Optional[FeaturesAPIShieldOperationFeatureAPIRoutingAPIRouting] = None
-    """API Routing settings on endpoint."""
-
-
-class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP90(
-    BaseModel
-):
-    lower: Optional[float] = None
-    """Lower bound for percentile estimate"""
-
-    upper: Optional[float] = None
-    """Upper bound for percentile estimate"""
-
-
-class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP95(
-    BaseModel
-):
-    lower: Optional[float] = None
-    """Lower bound for percentile estimate"""
-
-    upper: Optional[float] = None
-    """Upper bound for percentile estimate"""
-
-
-class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP99(
-    BaseModel
-):
-    lower: Optional[float] = None
-    """Lower bound for percentile estimate"""
-
-    upper: Optional[float] = None
-    """Upper bound for percentile estimate"""
-
-
-class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervals(
-    BaseModel
-):
-    p90: Optional[
-        FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP90
-    ] = None
-    """Upper and lower bound for percentile estimate"""
-
-    p95: Optional[
-        FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP95
-    ] = None
-    """Upper and lower bound for percentile estimate"""
-
-    p99: Optional[
-        FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP99
-    ] = None
-    """Upper and lower bound for percentile estimate"""
-
-
-class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThreshold(BaseModel):
-    confidence_intervals: Optional[
-        FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervals
-    ] = None
-
-    mean: Optional[float] = None
-    """Suggested threshold."""
-
-
-class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervals(BaseModel):
-    last_updated: Optional[datetime] = None
-
-    suggested_threshold: Optional[
-        FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThreshold
-    ] = None
-
-
-class FeaturesAPIShieldOperationFeatureConfidenceIntervals(BaseModel):
-    confidence_intervals: Optional[FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervals] = None
-
-
-class FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfoActiveSchema(BaseModel):
-    id: Optional[str] = None
-    """UUID"""
-
-    created_at: Optional[datetime] = None
-
-    is_learned: Optional[bool] = None
-    """True if schema is Cloudflare-provided."""
-
-    name: Optional[str] = None
-    """Schema file name."""
-
-
-class FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfo(BaseModel):
-    active_schema: Optional[FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfoActiveSchema] = None
-    """Schema active on endpoint."""
-
-    learned_available: Optional[bool] = None
-    """True if a Cloudflare-provided learned schema is available for this endpoint."""
-
-    mitigation_action: Optional[Literal["none", "log", "block"]] = None
-    """Action taken on requests failing validation."""
-
-
-class FeaturesAPIShieldOperationFeatureSchemaInfo(BaseModel):
-    schema_info: Optional[FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfo] = None
-
-
-Features = Union[
-    FeaturesAPIShieldOperationFeatureThresholds,
-    FeaturesAPIShieldOperationFeatureParameterSchemas,
-    FeaturesAPIShieldOperationFeatureAPIRouting,
-    FeaturesAPIShieldOperationFeatureConfidenceIntervals,
-    FeaturesAPIShieldOperationFeatureSchemaInfo,
-]
-
-
-class APIShield(BaseModel):
-    endpoint: str
-    """
-    The endpoint which can contain path parameter templates in curly braces, each
-    will be replaced from left to right with {varN}, starting with {var1}, during
-    insertion. This will further be Cloudflare-normalized upon insertion. See:
-    https://developers.cloudflare.com/rules/normalization/how-it-works/.
-    """
-
-    host: str
-    """RFC3986-compliant host."""
-
-    last_updated: datetime
-
-    method: Literal["GET", "POST", "HEAD", "OPTIONS", "PUT", "DELETE", "CONNECT", "PATCH", "TRACE"]
-    """The HTTP method used to access the endpoint."""
-
-    operation_id: str
-    """UUID"""
-
-    features: Optional[Features] = None
diff --git a/src/cloudflare/types/api_gateway/configuration.py b/src/cloudflare/types/api_gateway/configuration.py
index b9dbfd61c92..f171e4dc46d 100644
--- a/src/cloudflare/types/api_gateway/configuration.py
+++ b/src/cloudflare/types/api_gateway/configuration.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Union
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
 
@@ -9,11 +9,13 @@
     "Configuration",
     "AuthIDCharacteristic",
     "AuthIDCharacteristicAPIShieldAuthIDCharacteristic",
-    "AuthIDCharacteristicAPIShieldAuthIDCharacteristicJwtClaim",
+    "AuthIDCharacteristicAPIShieldAuthIDCharacteristicJWTClaim",
 ]
 
 
 class AuthIDCharacteristicAPIShieldAuthIDCharacteristic(BaseModel):
+    """Auth ID Characteristic"""
+
     name: str
     """The name of the characteristic field, i.e., the header or cookie name."""
 
@@ -21,7 +23,9 @@ class AuthIDCharacteristicAPIShieldAuthIDCharacteristic(BaseModel):
     """The type of characteristic."""
 
 
-class AuthIDCharacteristicAPIShieldAuthIDCharacteristicJwtClaim(BaseModel):
+class AuthIDCharacteristicAPIShieldAuthIDCharacteristicJWTClaim(BaseModel):
+    """Auth ID Characteristic extracted from JWT Token Claims"""
+
     name: str
     """
     Claim location expressed as `$(token_config_id):$(json_path)`, where
@@ -37,8 +41,8 @@ class AuthIDCharacteristicAPIShieldAuthIDCharacteristicJwtClaim(BaseModel):
     """The type of characteristic."""
 
 
-AuthIDCharacteristic = Union[
-    AuthIDCharacteristicAPIShieldAuthIDCharacteristic, AuthIDCharacteristicAPIShieldAuthIDCharacteristicJwtClaim
+AuthIDCharacteristic: TypeAlias = Union[
+    AuthIDCharacteristicAPIShieldAuthIDCharacteristic, AuthIDCharacteristicAPIShieldAuthIDCharacteristicJWTClaim
 ]
 
 
diff --git a/src/cloudflare/types/api_gateway/configuration_get_params.py b/src/cloudflare/types/api_gateway/configuration_get_params.py
index c1be0a862e8..c00dd74928d 100644
--- a/src/cloudflare/types/api_gateway/configuration_get_params.py
+++ b/src/cloudflare/types/api_gateway/configuration_get_params.py
@@ -2,15 +2,14 @@
 
 from __future__ import annotations
 
-from typing import List
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Required, TypedDict
 
 __all__ = ["ConfigurationGetParams"]
 
 
 class ConfigurationGetParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    properties: List[Literal["auth_id_characteristics"]]
-    """Requests information about certain properties."""
+    normalize: bool
+    """Ensures that the configuration is written or retrieved in normalized fashion"""
diff --git a/src/cloudflare/types/api_gateway/configuration_update_params.py b/src/cloudflare/types/api_gateway/configuration_update_params.py
index db98617b582..f1d0aae61cc 100644
--- a/src/cloudflare/types/api_gateway/configuration_update_params.py
+++ b/src/cloudflare/types/api_gateway/configuration_update_params.py
@@ -3,24 +3,29 @@
 from __future__ import annotations
 
 from typing import Union, Iterable
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
 __all__ = [
     "ConfigurationUpdateParams",
     "AuthIDCharacteristic",
     "AuthIDCharacteristicAPIShieldAuthIDCharacteristic",
-    "AuthIDCharacteristicAPIShieldAuthIDCharacteristicJwtClaim",
+    "AuthIDCharacteristicAPIShieldAuthIDCharacteristicJWTClaim",
 ]
 
 
 class ConfigurationUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     auth_id_characteristics: Required[Iterable[AuthIDCharacteristic]]
 
+    normalize: bool
+    """Ensures that the configuration is written or retrieved in normalized fashion"""
+
 
 class AuthIDCharacteristicAPIShieldAuthIDCharacteristic(TypedDict, total=False):
+    """Auth ID Characteristic"""
+
     name: Required[str]
     """The name of the characteristic field, i.e., the header or cookie name."""
 
@@ -28,7 +33,9 @@ class AuthIDCharacteristicAPIShieldAuthIDCharacteristic(TypedDict, total=False):
     """The type of characteristic."""
 
 
-class AuthIDCharacteristicAPIShieldAuthIDCharacteristicJwtClaim(TypedDict, total=False):
+class AuthIDCharacteristicAPIShieldAuthIDCharacteristicJWTClaim(TypedDict, total=False):
+    """Auth ID Characteristic extracted from JWT Token Claims"""
+
     name: Required[str]
     """
     Claim location expressed as `$(token_config_id):$(json_path)`, where
@@ -44,6 +51,6 @@ class AuthIDCharacteristicAPIShieldAuthIDCharacteristicJwtClaim(TypedDict, total
     """The type of characteristic."""
 
 
-AuthIDCharacteristic = Union[
-    AuthIDCharacteristicAPIShieldAuthIDCharacteristic, AuthIDCharacteristicAPIShieldAuthIDCharacteristicJwtClaim
+AuthIDCharacteristic: TypeAlias = Union[
+    AuthIDCharacteristicAPIShieldAuthIDCharacteristic, AuthIDCharacteristicAPIShieldAuthIDCharacteristicJWTClaim
 ]
diff --git a/src/cloudflare/types/api_gateway/configuration_update_response.py b/src/cloudflare/types/api_gateway/configuration_update_response.py
deleted file mode 100644
index ae84bf09c04..00000000000
--- a/src/cloudflare/types/api_gateway/configuration_update_response.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing_extensions import Literal
-
-from .message import Message
-from ..._models import BaseModel
-
-__all__ = ["ConfigurationUpdateResponse"]
-
-
-class ConfigurationUpdateResponse(BaseModel):
-    errors: Message
-
-    messages: Message
-
-    success: Literal[True]
-    """Whether the API call was successful"""
diff --git a/src/cloudflare/types/api_gateway/discovery/__init__.py b/src/cloudflare/types/api_gateway/discovery/__init__.py
index 91d80c2cedc..40378bcab0c 100644
--- a/src/cloudflare/types/api_gateway/discovery/__init__.py
+++ b/src/cloudflare/types/api_gateway/discovery/__init__.py
@@ -5,3 +5,5 @@
 from .operation_edit_params import OperationEditParams as OperationEditParams
 from .operation_list_params import OperationListParams as OperationListParams
 from .operation_edit_response import OperationEditResponse as OperationEditResponse
+from .operation_bulk_edit_params import OperationBulkEditParams as OperationBulkEditParams
+from .operation_bulk_edit_response import OperationBulkEditResponse as OperationBulkEditResponse
diff --git a/src/cloudflare/types/api_gateway/discovery/operation_bulk_edit_params.py b/src/cloudflare/types/api_gateway/discovery/operation_bulk_edit_params.py
new file mode 100644
index 00000000000..c750d5f3eed
--- /dev/null
+++ b/src/cloudflare/types/api_gateway/discovery/operation_bulk_edit_params.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["OperationBulkEditParams", "Body"]
+
+
+class OperationBulkEditParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    body: Required[Dict[str, Body]]
+
+
+class Body(TypedDict, total=False):
+    """Mappings of discovered operations (keys) to objects describing their state"""
+
+    state: Literal["review", "ignored"]
+    """Mark state of operation in API Discovery
+
+    - `review` - Mark operation as for review
+    - `ignored` - Mark operation as ignored
+    """
diff --git a/src/cloudflare/types/api_gateway/discovery/operation_bulk_edit_response.py b/src/cloudflare/types/api_gateway/discovery/operation_bulk_edit_response.py
new file mode 100644
index 00000000000..b15532861a0
--- /dev/null
+++ b/src/cloudflare/types/api_gateway/discovery/operation_bulk_edit_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, Optional
+from typing_extensions import Literal, TypeAlias
+
+from ...._models import BaseModel
+
+__all__ = ["OperationBulkEditResponse", "OperationBulkEditResponseItem"]
+
+
+class OperationBulkEditResponseItem(BaseModel):
+    """Mappings of discovered operations (keys) to objects describing their state"""
+
+    state: Optional[Literal["review", "ignored"]] = None
+    """Mark state of operation in API Discovery
+
+    - `review` - Mark operation as for review
+    - `ignored` - Mark operation as ignored
+    """
+
+
+OperationBulkEditResponse: TypeAlias = Dict[str, OperationBulkEditResponseItem]
diff --git a/src/cloudflare/types/api_gateway/discovery/operation_edit_params.py b/src/cloudflare/types/api_gateway/discovery/operation_edit_params.py
index 903d84d39fc..8431ce868d8 100644
--- a/src/cloudflare/types/api_gateway/discovery/operation_edit_params.py
+++ b/src/cloudflare/types/api_gateway/discovery/operation_edit_params.py
@@ -9,7 +9,7 @@
 
 class OperationEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     state: Literal["review", "ignored"]
     """Mark state of operation in API Discovery
diff --git a/src/cloudflare/types/api_gateway/discovery/operation_list_params.py b/src/cloudflare/types/api_gateway/discovery/operation_list_params.py
index 0b33645439c..9fa1389e662 100644
--- a/src/cloudflare/types/api_gateway/discovery/operation_list_params.py
+++ b/src/cloudflare/types/api_gateway/discovery/operation_list_params.py
@@ -2,15 +2,16 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Literal, Required, TypedDict
 
+from ...._types import SequenceNotStr
+
 __all__ = ["OperationListParams"]
 
 
 class OperationListParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     diff: bool
     """
@@ -24,16 +25,16 @@ class OperationListParams(TypedDict, total=False):
     endpoint: str
     """Filter results to only include endpoints containing this pattern."""
 
-    host: List[str]
+    host: SequenceNotStr[str]
     """Filter results to only include the specified hosts."""
 
-    method: List[str]
+    method: SequenceNotStr[str]
     """Filter results to only include the specified HTTP methods."""
 
     order: Literal["host", "method", "endpoint", "traffic_stats.requests", "traffic_stats.last_updated"]
     """Field to order by"""
 
-    origin: Literal["ML", "SessionIdentifier"]
+    origin: Literal["ML", "SessionIdentifier", "LabelDiscovery"]
     """
     Filter results to only include discovery results sourced from a particular
     discovery engine
diff --git a/src/cloudflare/types/api_gateway/discovery_operation.py b/src/cloudflare/types/api_gateway/discovery_operation.py
index 8c3fe0a8617..66c1bbef256 100644
--- a/src/cloudflare/types/api_gateway/discovery_operation.py
+++ b/src/cloudflare/types/api_gateway/discovery_operation.py
@@ -25,7 +25,7 @@ class Features(BaseModel):
 
 class DiscoveryOperation(BaseModel):
     id: str
-    """UUID"""
+    """UUID."""
 
     endpoint: str
     """
@@ -43,7 +43,7 @@ class DiscoveryOperation(BaseModel):
     method: Literal["GET", "POST", "HEAD", "OPTIONS", "PUT", "DELETE", "CONNECT", "PATCH", "TRACE"]
     """The HTTP method used to access the endpoint."""
 
-    origin: List[Literal["ML", "SessionIdentifier"]]
+    origin: List[Literal["ML", "SessionIdentifier", "LabelDiscovery"]]
     """API discovery engine(s) that discovered this operation"""
 
     state: Literal["review", "saved", "ignored"]
diff --git a/src/cloudflare/types/api_gateway/expression_template/__init__.py b/src/cloudflare/types/api_gateway/expression_template/__init__.py
new file mode 100644
index 00000000000..1626e4d2aae
--- /dev/null
+++ b/src/cloudflare/types/api_gateway/expression_template/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .fallthrough_create_params import FallthroughCreateParams as FallthroughCreateParams
+from .fallthrough_create_response import FallthroughCreateResponse as FallthroughCreateResponse
diff --git a/src/cloudflare/types/api_gateway/expression_template/fallthrough_create_params.py b/src/cloudflare/types/api_gateway/expression_template/fallthrough_create_params.py
new file mode 100644
index 00000000000..18508a7a0d9
--- /dev/null
+++ b/src/cloudflare/types/api_gateway/expression_template/fallthrough_create_params.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["FallthroughCreateParams"]
+
+
+class FallthroughCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    hosts: Required[SequenceNotStr[str]]
+    """List of hosts to be targeted in the expression"""
diff --git a/src/cloudflare/types/api_gateway/expression_template/fallthrough_create_response.py b/src/cloudflare/types/api_gateway/expression_template/fallthrough_create_response.py
new file mode 100644
index 00000000000..3972cf47baf
--- /dev/null
+++ b/src/cloudflare/types/api_gateway/expression_template/fallthrough_create_response.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["FallthroughCreateResponse"]
+
+
+class FallthroughCreateResponse(BaseModel):
+    expression: str
+    """WAF Expression for fallthrough"""
+
+    title: str
+    """Title for the expression"""
diff --git a/src/cloudflare/types/api_gateway/message.py b/src/cloudflare/types/api_gateway/message.py
index a09437a8d14..8ac2447fc82 100644
--- a/src/cloudflare/types/api_gateway/message.py
+++ b/src/cloudflare/types/api_gateway/message.py
@@ -1,9 +1,25 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
+from typing_extensions import TypeAlias
 
-from ..shared.response_info import ResponseInfo
+from ..._models import BaseModel
 
-__all__ = ["Message"]
+__all__ = ["Message", "MessageItem", "MessageItemSource"]
 
-Message = List[ResponseInfo]
+
+class MessageItemSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class MessageItem(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageItemSource] = None
+
+
+Message: TypeAlias = List[MessageItem]
diff --git a/src/cloudflare/types/api_gateway/old_public_schema.py b/src/cloudflare/types/api_gateway/old_public_schema.py
new file mode 100644
index 00000000000..03e5cac9fcc
--- /dev/null
+++ b/src/cloudflare/types/api_gateway/old_public_schema.py
@@ -0,0 +1,28 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["OldPublicSchema"]
+
+
+class OldPublicSchema(BaseModel):
+    created_at: datetime
+
+    kind: Literal["openapi_v3"]
+    """Kind of schema"""
+
+    name: str
+    """Name of the schema"""
+
+    schema_id: str
+    """UUID."""
+
+    source: Optional[str] = None
+    """Source of the schema"""
+
+    validation_enabled: Optional[bool] = None
+    """Flag whether schema is enabled for validation."""
diff --git a/src/cloudflare/types/api_gateway/operation_bulk_create_params.py b/src/cloudflare/types/api_gateway/operation_bulk_create_params.py
new file mode 100644
index 00000000000..f5ef1ce8db1
--- /dev/null
+++ b/src/cloudflare/types/api_gateway/operation_bulk_create_params.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["OperationBulkCreateParams", "Body"]
+
+
+class OperationBulkCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    body: Required[Iterable[Body]]
+
+
+class Body(TypedDict, total=False):
+    endpoint: Required[str]
+    """
+    The endpoint which can contain path parameter templates in curly braces, each
+    will be replaced from left to right with {varN}, starting with {var1}, during
+    insertion. This will further be Cloudflare-normalized upon insertion. See:
+    https://developers.cloudflare.com/rules/normalization/how-it-works/.
+    """
+
+    host: Required[str]
+    """RFC3986-compliant host."""
+
+    method: Required[Literal["GET", "POST", "HEAD", "OPTIONS", "PUT", "DELETE", "CONNECT", "PATCH", "TRACE"]]
+    """The HTTP method used to access the endpoint."""
diff --git a/src/cloudflare/types/api_gateway/operation_bulk_create_response.py b/src/cloudflare/types/api_gateway/operation_bulk_create_response.py
new file mode 100644
index 00000000000..212158c8223
--- /dev/null
+++ b/src/cloudflare/types/api_gateway/operation_bulk_create_response.py
@@ -0,0 +1,239 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ..._models import BaseModel
+
+__all__ = [
+    "OperationBulkCreateResponse",
+    "Features",
+    "FeaturesAPIShieldOperationFeatureThresholds",
+    "FeaturesAPIShieldOperationFeatureThresholdsThresholds",
+    "FeaturesAPIShieldOperationFeatureParameterSchemas",
+    "FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemas",
+    "FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameterSchemas",
+    "FeaturesAPIShieldOperationFeatureAPIRouting",
+    "FeaturesAPIShieldOperationFeatureAPIRoutingAPIRouting",
+    "FeaturesAPIShieldOperationFeatureConfidenceIntervals",
+    "FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervals",
+    "FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThreshold",
+    "FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervals",
+    "FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP90",
+    "FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP95",
+    "FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP99",
+    "FeaturesAPIShieldOperationFeatureSchemaInfo",
+    "FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfo",
+    "FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfoActiveSchema",
+]
+
+
+class FeaturesAPIShieldOperationFeatureThresholdsThresholds(BaseModel):
+    auth_id_tokens: Optional[int] = None
+    """The total number of auth-ids seen across this calculation."""
+
+    data_points: Optional[int] = None
+    """The number of data points used for the threshold suggestion calculation."""
+
+    last_updated: Optional[datetime] = None
+
+    p50: Optional[int] = None
+    """The p50 quantile of requests (in period_seconds)."""
+
+    p90: Optional[int] = None
+    """The p90 quantile of requests (in period_seconds)."""
+
+    p99: Optional[int] = None
+    """The p99 quantile of requests (in period_seconds)."""
+
+    period_seconds: Optional[int] = None
+    """The period over which this threshold is suggested."""
+
+    requests: Optional[int] = None
+    """The estimated number of requests covered by these calculations."""
+
+    suggested_threshold: Optional[int] = None
+    """The suggested threshold in requests done by the same auth_id or period_seconds."""
+
+
+class FeaturesAPIShieldOperationFeatureThresholds(BaseModel):
+    thresholds: Optional[FeaturesAPIShieldOperationFeatureThresholdsThresholds] = None
+
+
+class FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameterSchemas(BaseModel):
+    """An operation schema object containing a response."""
+
+    parameters: Optional[List[object]] = None
+    """An array containing the learned parameter schemas."""
+
+    responses: Optional[object] = None
+    """An empty response object.
+
+    This field is required to yield a valid operation schema.
+    """
+
+
+class FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemas(BaseModel):
+    last_updated: Optional[datetime] = None
+
+    parameter_schemas: Optional[FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameterSchemas] = (
+        None
+    )
+    """An operation schema object containing a response."""
+
+
+class FeaturesAPIShieldOperationFeatureParameterSchemas(BaseModel):
+    parameter_schemas: FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemas
+
+
+class FeaturesAPIShieldOperationFeatureAPIRoutingAPIRouting(BaseModel):
+    """API Routing settings on endpoint."""
+
+    last_updated: Optional[datetime] = None
+
+    route: Optional[str] = None
+    """Target route."""
+
+
+class FeaturesAPIShieldOperationFeatureAPIRouting(BaseModel):
+    api_routing: Optional[FeaturesAPIShieldOperationFeatureAPIRoutingAPIRouting] = None
+    """API Routing settings on endpoint."""
+
+
+class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP90(
+    BaseModel
+):
+    """Upper and lower bound for percentile estimate"""
+
+    lower: Optional[float] = None
+    """Lower bound for percentile estimate"""
+
+    upper: Optional[float] = None
+    """Upper bound for percentile estimate"""
+
+
+class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP95(
+    BaseModel
+):
+    """Upper and lower bound for percentile estimate"""
+
+    lower: Optional[float] = None
+    """Lower bound for percentile estimate"""
+
+    upper: Optional[float] = None
+    """Upper bound for percentile estimate"""
+
+
+class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP99(
+    BaseModel
+):
+    """Upper and lower bound for percentile estimate"""
+
+    lower: Optional[float] = None
+    """Lower bound for percentile estimate"""
+
+    upper: Optional[float] = None
+    """Upper bound for percentile estimate"""
+
+
+class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervals(
+    BaseModel
+):
+    p90: Optional[
+        FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP90
+    ] = None
+    """Upper and lower bound for percentile estimate"""
+
+    p95: Optional[
+        FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP95
+    ] = None
+    """Upper and lower bound for percentile estimate"""
+
+    p99: Optional[
+        FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP99
+    ] = None
+    """Upper and lower bound for percentile estimate"""
+
+
+class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThreshold(BaseModel):
+    confidence_intervals: Optional[
+        FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervals
+    ] = None
+
+    mean: Optional[float] = None
+    """Suggested threshold."""
+
+
+class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervals(BaseModel):
+    last_updated: Optional[datetime] = None
+
+    suggested_threshold: Optional[
+        FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThreshold
+    ] = None
+
+
+class FeaturesAPIShieldOperationFeatureConfidenceIntervals(BaseModel):
+    confidence_intervals: Optional[FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervals] = None
+
+
+class FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfoActiveSchema(BaseModel):
+    """Schema active on endpoint."""
+
+    id: Optional[str] = None
+    """UUID."""
+
+    created_at: Optional[datetime] = None
+
+    is_learned: Optional[bool] = None
+    """True if schema is Cloudflare-provided."""
+
+    name: Optional[str] = None
+    """Schema file name."""
+
+
+class FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfo(BaseModel):
+    active_schema: Optional[FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfoActiveSchema] = None
+    """Schema active on endpoint."""
+
+    learned_available: Optional[bool] = None
+    """True if a Cloudflare-provided learned schema is available for this endpoint."""
+
+    mitigation_action: Optional[Literal["none", "log", "block"]] = None
+    """Action taken on requests failing validation."""
+
+
+class FeaturesAPIShieldOperationFeatureSchemaInfo(BaseModel):
+    schema_info: Optional[FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfo] = None
+
+
+Features: TypeAlias = Union[
+    FeaturesAPIShieldOperationFeatureThresholds,
+    FeaturesAPIShieldOperationFeatureParameterSchemas,
+    FeaturesAPIShieldOperationFeatureAPIRouting,
+    FeaturesAPIShieldOperationFeatureConfidenceIntervals,
+    FeaturesAPIShieldOperationFeatureSchemaInfo,
+]
+
+
+class OperationBulkCreateResponse(BaseModel):
+    endpoint: str
+    """
+    The endpoint which can contain path parameter templates in curly braces, each
+    will be replaced from left to right with {varN}, starting with {var1}, during
+    insertion. This will further be Cloudflare-normalized upon insertion. See:
+    https://developers.cloudflare.com/rules/normalization/how-it-works/.
+    """
+
+    host: str
+    """RFC3986-compliant host."""
+
+    last_updated: datetime
+
+    method: Literal["GET", "POST", "HEAD", "OPTIONS", "PUT", "DELETE", "CONNECT", "PATCH", "TRACE"]
+    """The HTTP method used to access the endpoint."""
+
+    operation_id: str
+    """UUID."""
+
+    features: Optional[Features] = None
diff --git a/src/cloudflare/types/api_gateway/operation_bulk_delete_response.py b/src/cloudflare/types/api_gateway/operation_bulk_delete_response.py
new file mode 100644
index 00000000000..5e2e15abd74
--- /dev/null
+++ b/src/cloudflare/types/api_gateway/operation_bulk_delete_response.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import Literal
+
+from .message import Message
+from ..._models import BaseModel
+
+__all__ = ["OperationBulkDeleteResponse"]
+
+
+class OperationBulkDeleteResponse(BaseModel):
+    errors: Message
+
+    messages: Message
+
+    success: Literal[True]
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/api_gateway/operation_create_params.py b/src/cloudflare/types/api_gateway/operation_create_params.py
index dbfa97bf6e8..f6eeb0677a1 100644
--- a/src/cloudflare/types/api_gateway/operation_create_params.py
+++ b/src/cloudflare/types/api_gateway/operation_create_params.py
@@ -2,20 +2,15 @@
 
 from __future__ import annotations
 
-from typing import Iterable
 from typing_extensions import Literal, Required, TypedDict
 
-__all__ = ["OperationCreateParams", "Body"]
+__all__ = ["OperationCreateParams"]
 
 
 class OperationCreateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    body: Required[Iterable[Body]]
-
-
-class Body(TypedDict, total=False):
     endpoint: Required[str]
     """
     The endpoint which can contain path parameter templates in curly braces, each
diff --git a/src/cloudflare/types/api_gateway/operation_create_response.py b/src/cloudflare/types/api_gateway/operation_create_response.py
index 2244d14cf30..3ca28f40890 100644
--- a/src/cloudflare/types/api_gateway/operation_create_response.py
+++ b/src/cloudflare/types/api_gateway/operation_create_response.py
@@ -1,9 +1,239 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
-from .api_shield import APIShield
+from ..._models import BaseModel
 
-__all__ = ["OperationCreateResponse"]
+__all__ = [
+    "OperationCreateResponse",
+    "Features",
+    "FeaturesAPIShieldOperationFeatureThresholds",
+    "FeaturesAPIShieldOperationFeatureThresholdsThresholds",
+    "FeaturesAPIShieldOperationFeatureParameterSchemas",
+    "FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemas",
+    "FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameterSchemas",
+    "FeaturesAPIShieldOperationFeatureAPIRouting",
+    "FeaturesAPIShieldOperationFeatureAPIRoutingAPIRouting",
+    "FeaturesAPIShieldOperationFeatureConfidenceIntervals",
+    "FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervals",
+    "FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThreshold",
+    "FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervals",
+    "FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP90",
+    "FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP95",
+    "FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP99",
+    "FeaturesAPIShieldOperationFeatureSchemaInfo",
+    "FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfo",
+    "FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfoActiveSchema",
+]
 
-OperationCreateResponse = List[APIShield]
+
+class FeaturesAPIShieldOperationFeatureThresholdsThresholds(BaseModel):
+    auth_id_tokens: Optional[int] = None
+    """The total number of auth-ids seen across this calculation."""
+
+    data_points: Optional[int] = None
+    """The number of data points used for the threshold suggestion calculation."""
+
+    last_updated: Optional[datetime] = None
+
+    p50: Optional[int] = None
+    """The p50 quantile of requests (in period_seconds)."""
+
+    p90: Optional[int] = None
+    """The p90 quantile of requests (in period_seconds)."""
+
+    p99: Optional[int] = None
+    """The p99 quantile of requests (in period_seconds)."""
+
+    period_seconds: Optional[int] = None
+    """The period over which this threshold is suggested."""
+
+    requests: Optional[int] = None
+    """The estimated number of requests covered by these calculations."""
+
+    suggested_threshold: Optional[int] = None
+    """The suggested threshold in requests done by the same auth_id or period_seconds."""
+
+
+class FeaturesAPIShieldOperationFeatureThresholds(BaseModel):
+    thresholds: Optional[FeaturesAPIShieldOperationFeatureThresholdsThresholds] = None
+
+
+class FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameterSchemas(BaseModel):
+    """An operation schema object containing a response."""
+
+    parameters: Optional[List[object]] = None
+    """An array containing the learned parameter schemas."""
+
+    responses: Optional[object] = None
+    """An empty response object.
+
+    This field is required to yield a valid operation schema.
+    """
+
+
+class FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemas(BaseModel):
+    last_updated: Optional[datetime] = None
+
+    parameter_schemas: Optional[FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameterSchemas] = (
+        None
+    )
+    """An operation schema object containing a response."""
+
+
+class FeaturesAPIShieldOperationFeatureParameterSchemas(BaseModel):
+    parameter_schemas: FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemas
+
+
+class FeaturesAPIShieldOperationFeatureAPIRoutingAPIRouting(BaseModel):
+    """API Routing settings on endpoint."""
+
+    last_updated: Optional[datetime] = None
+
+    route: Optional[str] = None
+    """Target route."""
+
+
+class FeaturesAPIShieldOperationFeatureAPIRouting(BaseModel):
+    api_routing: Optional[FeaturesAPIShieldOperationFeatureAPIRoutingAPIRouting] = None
+    """API Routing settings on endpoint."""
+
+
+class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP90(
+    BaseModel
+):
+    """Upper and lower bound for percentile estimate"""
+
+    lower: Optional[float] = None
+    """Lower bound for percentile estimate"""
+
+    upper: Optional[float] = None
+    """Upper bound for percentile estimate"""
+
+
+class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP95(
+    BaseModel
+):
+    """Upper and lower bound for percentile estimate"""
+
+    lower: Optional[float] = None
+    """Lower bound for percentile estimate"""
+
+    upper: Optional[float] = None
+    """Upper bound for percentile estimate"""
+
+
+class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP99(
+    BaseModel
+):
+    """Upper and lower bound for percentile estimate"""
+
+    lower: Optional[float] = None
+    """Lower bound for percentile estimate"""
+
+    upper: Optional[float] = None
+    """Upper bound for percentile estimate"""
+
+
+class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervals(
+    BaseModel
+):
+    p90: Optional[
+        FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP90
+    ] = None
+    """Upper and lower bound for percentile estimate"""
+
+    p95: Optional[
+        FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP95
+    ] = None
+    """Upper and lower bound for percentile estimate"""
+
+    p99: Optional[
+        FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP99
+    ] = None
+    """Upper and lower bound for percentile estimate"""
+
+
+class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThreshold(BaseModel):
+    confidence_intervals: Optional[
+        FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervals
+    ] = None
+
+    mean: Optional[float] = None
+    """Suggested threshold."""
+
+
+class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervals(BaseModel):
+    last_updated: Optional[datetime] = None
+
+    suggested_threshold: Optional[
+        FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThreshold
+    ] = None
+
+
+class FeaturesAPIShieldOperationFeatureConfidenceIntervals(BaseModel):
+    confidence_intervals: Optional[FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervals] = None
+
+
+class FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfoActiveSchema(BaseModel):
+    """Schema active on endpoint."""
+
+    id: Optional[str] = None
+    """UUID."""
+
+    created_at: Optional[datetime] = None
+
+    is_learned: Optional[bool] = None
+    """True if schema is Cloudflare-provided."""
+
+    name: Optional[str] = None
+    """Schema file name."""
+
+
+class FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfo(BaseModel):
+    active_schema: Optional[FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfoActiveSchema] = None
+    """Schema active on endpoint."""
+
+    learned_available: Optional[bool] = None
+    """True if a Cloudflare-provided learned schema is available for this endpoint."""
+
+    mitigation_action: Optional[Literal["none", "log", "block"]] = None
+    """Action taken on requests failing validation."""
+
+
+class FeaturesAPIShieldOperationFeatureSchemaInfo(BaseModel):
+    schema_info: Optional[FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfo] = None
+
+
+Features: TypeAlias = Union[
+    FeaturesAPIShieldOperationFeatureThresholds,
+    FeaturesAPIShieldOperationFeatureParameterSchemas,
+    FeaturesAPIShieldOperationFeatureAPIRouting,
+    FeaturesAPIShieldOperationFeatureConfidenceIntervals,
+    FeaturesAPIShieldOperationFeatureSchemaInfo,
+]
+
+
+class OperationCreateResponse(BaseModel):
+    endpoint: str
+    """
+    The endpoint which can contain path parameter templates in curly braces, each
+    will be replaced from left to right with {varN}, starting with {var1}, during
+    insertion. This will further be Cloudflare-normalized upon insertion. See:
+    https://developers.cloudflare.com/rules/normalization/how-it-works/.
+    """
+
+    host: str
+    """RFC3986-compliant host."""
+
+    last_updated: datetime
+
+    method: Literal["GET", "POST", "HEAD", "OPTIONS", "PUT", "DELETE", "CONNECT", "PATCH", "TRACE"]
+    """The HTTP method used to access the endpoint."""
+
+    operation_id: str
+    """UUID."""
+
+    features: Optional[Features] = None
diff --git a/src/cloudflare/types/api_gateway/operation_delete_response.py b/src/cloudflare/types/api_gateway/operation_delete_response.py
index 3122a809ae2..c66bed9cd35 100644
--- a/src/cloudflare/types/api_gateway/operation_delete_response.py
+++ b/src/cloudflare/types/api_gateway/operation_delete_response.py
@@ -14,4 +14,4 @@ class OperationDeleteResponse(BaseModel):
     messages: Message
 
     success: Literal[True]
-    """Whether the API call was successful"""
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/api_gateway/operation_get_params.py b/src/cloudflare/types/api_gateway/operation_get_params.py
index e752e501aae..80b1e80e724 100644
--- a/src/cloudflare/types/api_gateway/operation_get_params.py
+++ b/src/cloudflare/types/api_gateway/operation_get_params.py
@@ -10,7 +10,7 @@
 
 class OperationGetParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     feature: List[Literal["thresholds", "parameter_schemas", "schema_info"]]
     """Add feature(s) to the results.
diff --git a/src/cloudflare/types/api_gateway/operation_get_response.py b/src/cloudflare/types/api_gateway/operation_get_response.py
index 70a9d927019..7c45d8d8431 100644
--- a/src/cloudflare/types/api_gateway/operation_get_response.py
+++ b/src/cloudflare/types/api_gateway/operation_get_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
 
@@ -62,6 +62,8 @@ class FeaturesAPIShieldOperationFeatureThresholds(BaseModel):
 
 
 class FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameterSchemas(BaseModel):
+    """An operation schema object containing a response."""
+
     parameters: Optional[List[object]] = None
     """An array containing the learned parameter schemas."""
 
@@ -75,9 +77,9 @@ class FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameter
 class FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemas(BaseModel):
     last_updated: Optional[datetime] = None
 
-    parameter_schemas: Optional[
-        FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameterSchemas
-    ] = None
+    parameter_schemas: Optional[FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameterSchemas] = (
+        None
+    )
     """An operation schema object containing a response."""
 
 
@@ -86,6 +88,8 @@ class FeaturesAPIShieldOperationFeatureParameterSchemas(BaseModel):
 
 
 class FeaturesAPIShieldOperationFeatureAPIRoutingAPIRouting(BaseModel):
+    """API Routing settings on endpoint."""
+
     last_updated: Optional[datetime] = None
 
     route: Optional[str] = None
@@ -100,6 +104,8 @@ class FeaturesAPIShieldOperationFeatureAPIRouting(BaseModel):
 class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP90(
     BaseModel
 ):
+    """Upper and lower bound for percentile estimate"""
+
     lower: Optional[float] = None
     """Lower bound for percentile estimate"""
 
@@ -110,6 +116,8 @@ class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSug
 class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP95(
     BaseModel
 ):
+    """Upper and lower bound for percentile estimate"""
+
     lower: Optional[float] = None
     """Lower bound for percentile estimate"""
 
@@ -120,6 +128,8 @@ class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSug
 class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP99(
     BaseModel
 ):
+    """Upper and lower bound for percentile estimate"""
+
     lower: Optional[float] = None
     """Lower bound for percentile estimate"""
 
@@ -168,8 +178,10 @@ class FeaturesAPIShieldOperationFeatureConfidenceIntervals(BaseModel):
 
 
 class FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfoActiveSchema(BaseModel):
+    """Schema active on endpoint."""
+
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     created_at: Optional[datetime] = None
 
@@ -195,7 +207,7 @@ class FeaturesAPIShieldOperationFeatureSchemaInfo(BaseModel):
     schema_info: Optional[FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfo] = None
 
 
-Features = Union[
+Features: TypeAlias = Union[
     FeaturesAPIShieldOperationFeatureThresholds,
     FeaturesAPIShieldOperationFeatureParameterSchemas,
     FeaturesAPIShieldOperationFeatureAPIRouting,
@@ -222,6 +234,6 @@ class OperationGetResponse(BaseModel):
     """The HTTP method used to access the endpoint."""
 
     operation_id: str
-    """UUID"""
+    """UUID."""
 
     features: Optional[Features] = None
diff --git a/src/cloudflare/types/api_gateway/operation_list_params.py b/src/cloudflare/types/api_gateway/operation_list_params.py
index 1244f5a078f..4ecdcf5db5e 100644
--- a/src/cloudflare/types/api_gateway/operation_list_params.py
+++ b/src/cloudflare/types/api_gateway/operation_list_params.py
@@ -5,12 +5,14 @@
 from typing import List
 from typing_extensions import Literal, Required, TypedDict
 
+from ..._types import SequenceNotStr
+
 __all__ = ["OperationListParams"]
 
 
 class OperationListParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     direction: Literal["asc", "desc"]
     """Direction to order results."""
@@ -26,10 +28,10 @@ class OperationListParams(TypedDict, total=False):
     meaning.
     """
 
-    host: List[str]
+    host: SequenceNotStr[str]
     """Filter results to only include the specified hosts."""
 
-    method: List[str]
+    method: SequenceNotStr[str]
     """Filter results to only include the specified HTTP methods."""
 
     order: Literal["method", "host", "endpoint", "thresholds.$key"]
diff --git a/src/cloudflare/types/api_gateway/operation_list_response.py b/src/cloudflare/types/api_gateway/operation_list_response.py
index 53c500cb16f..e74e39cc86c 100644
--- a/src/cloudflare/types/api_gateway/operation_list_response.py
+++ b/src/cloudflare/types/api_gateway/operation_list_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
 
@@ -62,6 +62,8 @@ class FeaturesAPIShieldOperationFeatureThresholds(BaseModel):
 
 
 class FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameterSchemas(BaseModel):
+    """An operation schema object containing a response."""
+
     parameters: Optional[List[object]] = None
     """An array containing the learned parameter schemas."""
 
@@ -75,9 +77,9 @@ class FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameter
 class FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemas(BaseModel):
     last_updated: Optional[datetime] = None
 
-    parameter_schemas: Optional[
-        FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameterSchemas
-    ] = None
+    parameter_schemas: Optional[FeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameterSchemas] = (
+        None
+    )
     """An operation schema object containing a response."""
 
 
@@ -86,6 +88,8 @@ class FeaturesAPIShieldOperationFeatureParameterSchemas(BaseModel):
 
 
 class FeaturesAPIShieldOperationFeatureAPIRoutingAPIRouting(BaseModel):
+    """API Routing settings on endpoint."""
+
     last_updated: Optional[datetime] = None
 
     route: Optional[str] = None
@@ -100,6 +104,8 @@ class FeaturesAPIShieldOperationFeatureAPIRouting(BaseModel):
 class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP90(
     BaseModel
 ):
+    """Upper and lower bound for percentile estimate"""
+
     lower: Optional[float] = None
     """Lower bound for percentile estimate"""
 
@@ -110,6 +116,8 @@ class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSug
 class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP95(
     BaseModel
 ):
+    """Upper and lower bound for percentile estimate"""
+
     lower: Optional[float] = None
     """Lower bound for percentile estimate"""
 
@@ -120,6 +128,8 @@ class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSug
 class FeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP99(
     BaseModel
 ):
+    """Upper and lower bound for percentile estimate"""
+
     lower: Optional[float] = None
     """Lower bound for percentile estimate"""
 
@@ -168,8 +178,10 @@ class FeaturesAPIShieldOperationFeatureConfidenceIntervals(BaseModel):
 
 
 class FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfoActiveSchema(BaseModel):
+    """Schema active on endpoint."""
+
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     created_at: Optional[datetime] = None
 
@@ -195,7 +207,7 @@ class FeaturesAPIShieldOperationFeatureSchemaInfo(BaseModel):
     schema_info: Optional[FeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfo] = None
 
 
-Features = Union[
+Features: TypeAlias = Union[
     FeaturesAPIShieldOperationFeatureThresholds,
     FeaturesAPIShieldOperationFeatureParameterSchemas,
     FeaturesAPIShieldOperationFeatureAPIRouting,
@@ -222,6 +234,6 @@ class OperationListResponse(BaseModel):
     """The HTTP method used to access the endpoint."""
 
     operation_id: str
-    """UUID"""
+    """UUID."""
 
     features: Optional[Features] = None
diff --git a/src/cloudflare/types/api_gateway/operations/schema_validation_edit_params.py b/src/cloudflare/types/api_gateway/operations/schema_validation_edit_params.py
index 45926402aa5..ac49e74f27c 100644
--- a/src/cloudflare/types/api_gateway/operations/schema_validation_edit_params.py
+++ b/src/cloudflare/types/api_gateway/operations/schema_validation_edit_params.py
@@ -11,6 +11,6 @@
 
 class SchemaValidationEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     settings_multiple_request: Required[SettingsMultipleRequestParam]
diff --git a/src/cloudflare/types/api_gateway/operations/schema_validation_get_response.py b/src/cloudflare/types/api_gateway/operations/schema_validation_get_response.py
index 32fdc4cb3d4..4d577a036ff 100644
--- a/src/cloudflare/types/api_gateway/operations/schema_validation_get_response.py
+++ b/src/cloudflare/types/api_gateway/operations/schema_validation_get_response.py
@@ -19,3 +19,6 @@ class SchemaValidationGetResponse(BaseModel):
     - `null` indicates that no operation level mitigation is in place, see Zone
       Level Schema Validation Settings for mitigation action that will be applied
     """
+
+    operation_id: Optional[str] = None
+    """UUID."""
diff --git a/src/cloudflare/types/api_gateway/operations/schema_validation_update_params.py b/src/cloudflare/types/api_gateway/operations/schema_validation_update_params.py
index e9975b01cda..ce1a0354046 100644
--- a/src/cloudflare/types/api_gateway/operations/schema_validation_update_params.py
+++ b/src/cloudflare/types/api_gateway/operations/schema_validation_update_params.py
@@ -10,7 +10,7 @@
 
 class SchemaValidationUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     mitigation_action: Optional[Literal["log", "block", "none"]]
     """When set, this applies a mitigation action to this operation
diff --git a/src/cloudflare/types/api_gateway/operations/schema_validation_update_response.py b/src/cloudflare/types/api_gateway/operations/schema_validation_update_response.py
index ab2d8ffd967..d6412d1c990 100644
--- a/src/cloudflare/types/api_gateway/operations/schema_validation_update_response.py
+++ b/src/cloudflare/types/api_gateway/operations/schema_validation_update_response.py
@@ -19,3 +19,6 @@ class SchemaValidationUpdateResponse(BaseModel):
     - `null` indicates that no operation level mitigation is in place, see Zone
       Level Schema Validation Settings for mitigation action that will be applied
     """
+
+    operation_id: Optional[str] = None
+    """UUID."""
diff --git a/src/cloudflare/types/api_gateway/operations/settings_multiple_request.py b/src/cloudflare/types/api_gateway/operations/settings_multiple_request.py
index b55c1a48c87..382f5d177af 100644
--- a/src/cloudflare/types/api_gateway/operations/settings_multiple_request.py
+++ b/src/cloudflare/types/api_gateway/operations/settings_multiple_request.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Dict, Optional
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from ...._models import BaseModel
 
@@ -9,6 +9,8 @@
 
 
 class SettingsMultipleRequestItem(BaseModel):
+    """Operation ID to mitigation action mappings"""
+
     mitigation_action: Optional[Literal["log", "block", "none"]] = None
     """When set, this applies a mitigation action to this operation
 
@@ -21,4 +23,4 @@ class SettingsMultipleRequestItem(BaseModel):
     """
 
 
-SettingsMultipleRequest = Dict[str, SettingsMultipleRequestItem]
+SettingsMultipleRequest: TypeAlias = Dict[str, SettingsMultipleRequestItem]
diff --git a/src/cloudflare/types/api_gateway/operations/settings_multiple_request_param.py b/src/cloudflare/types/api_gateway/operations/settings_multiple_request_param.py
index ec180487534..01cc9fd427f 100644
--- a/src/cloudflare/types/api_gateway/operations/settings_multiple_request_param.py
+++ b/src/cloudflare/types/api_gateway/operations/settings_multiple_request_param.py
@@ -3,12 +3,14 @@
 from __future__ import annotations
 
 from typing import Dict, Optional
-from typing_extensions import Literal, TypedDict
+from typing_extensions import Literal, TypeAlias, TypedDict
 
 __all__ = ["SettingsMultipleRequestParam", "SettingsMultipleRequestParamItem"]
 
 
 class SettingsMultipleRequestParamItem(TypedDict, total=False):
+    """Operation ID to mitigation action mappings"""
+
     mitigation_action: Optional[Literal["log", "block", "none"]]
     """When set, this applies a mitigation action to this operation
 
@@ -21,4 +23,4 @@ class SettingsMultipleRequestParamItem(TypedDict, total=False):
     """
 
 
-SettingsMultipleRequestParam = Dict[str, SettingsMultipleRequestParamItem]
+SettingsMultipleRequestParam: TypeAlias = Dict[str, SettingsMultipleRequestParamItem]
diff --git a/src/cloudflare/types/api_gateway/public_schema.py b/src/cloudflare/types/api_gateway/public_schema.py
deleted file mode 100644
index bdff5f529aa..00000000000
--- a/src/cloudflare/types/api_gateway/public_schema.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from datetime import datetime
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = ["PublicSchema"]
-
-
-class PublicSchema(BaseModel):
-    created_at: datetime
-
-    kind: Literal["openapi_v3"]
-    """Kind of schema"""
-
-    name: str
-    """Name of the schema"""
-
-    schema_id: str
-    """UUID"""
-
-    source: Optional[str] = None
-    """Source of the schema"""
-
-    validation_enabled: Optional[bool] = None
-    """Flag whether schema is enabled for validation."""
diff --git a/src/cloudflare/types/api_gateway/schema_list_params.py b/src/cloudflare/types/api_gateway/schema_list_params.py
index 7bc4f9ac025..b80273584a1 100644
--- a/src/cloudflare/types/api_gateway/schema_list_params.py
+++ b/src/cloudflare/types/api_gateway/schema_list_params.py
@@ -5,12 +5,14 @@
 from typing import List
 from typing_extensions import Literal, Required, TypedDict
 
+from ..._types import SequenceNotStr
+
 __all__ = ["SchemaListParams"]
 
 
 class SchemaListParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     feature: List[Literal["thresholds", "parameter_schemas", "schema_info"]]
     """Add feature(s) to the results.
@@ -20,5 +22,5 @@ class SchemaListParams(TypedDict, total=False):
     meaning.
     """
 
-    host: List[str]
+    host: SequenceNotStr[str]
     """Receive schema only for the given host(s)."""
diff --git a/src/cloudflare/types/api_gateway/schema_upload.py b/src/cloudflare/types/api_gateway/schema_upload.py
deleted file mode 100644
index 3df20a038b4..00000000000
--- a/src/cloudflare/types/api_gateway/schema_upload.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from pydantic import Field as FieldInfo
-
-from ..._models import BaseModel
-from .public_schema import PublicSchema
-
-__all__ = ["SchemaUpload", "UploadDetails", "UploadDetailsWarning"]
-
-
-class UploadDetailsWarning(BaseModel):
-    code: int
-    """Code that identifies the event that occurred."""
-
-    locations: Optional[List[str]] = None
-    """JSONPath location(s) in the schema where these events were encountered.
-
-    See
-    [https://goessner.net/articles/JsonPath/](https://goessner.net/articles/JsonPath/)
-    for JSONPath specification.
-    """
-
-    message: Optional[str] = None
-    """Diagnostic message that describes the event."""
-
-
-class UploadDetails(BaseModel):
-    warnings: Optional[List[UploadDetailsWarning]] = None
-    """Diagnostic warning events that occurred during processing.
-
-    These events are non-critical errors found within the schema.
-    """
-
-
-class SchemaUpload(BaseModel):
-    schema_: PublicSchema = FieldInfo(alias="schema")
-
-    upload_details: Optional[UploadDetails] = None
diff --git a/src/cloudflare/types/api_gateway/settings/schema_validation_edit_params.py b/src/cloudflare/types/api_gateway/settings/schema_validation_edit_params.py
index 424471b1283..16b93fa100e 100644
--- a/src/cloudflare/types/api_gateway/settings/schema_validation_edit_params.py
+++ b/src/cloudflare/types/api_gateway/settings/schema_validation_edit_params.py
@@ -10,7 +10,7 @@
 
 class SchemaValidationEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     validation_default_mitigation_action: Optional[Literal["none", "log", "block"]]
     """
diff --git a/src/cloudflare/types/api_gateway/settings/schema_validation_update_params.py b/src/cloudflare/types/api_gateway/settings/schema_validation_update_params.py
index e7ffb4e6bdd..f77dd31637e 100644
--- a/src/cloudflare/types/api_gateway/settings/schema_validation_update_params.py
+++ b/src/cloudflare/types/api_gateway/settings/schema_validation_update_params.py
@@ -10,7 +10,7 @@
 
 class SchemaValidationUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     validation_default_mitigation_action: Required[Literal["none", "log", "block"]]
     """
diff --git a/src/cloudflare/types/api_gateway/user_schema_create_params.py b/src/cloudflare/types/api_gateway/user_schema_create_params.py
index 10d9593240a..12dcf783e18 100644
--- a/src/cloudflare/types/api_gateway/user_schema_create_params.py
+++ b/src/cloudflare/types/api_gateway/user_schema_create_params.py
@@ -11,7 +11,7 @@
 
 class UserSchemaCreateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     file: Required[FileTypes]
     """Schema file bytes"""
diff --git a/src/cloudflare/types/api_gateway/user_schema_create_response.py b/src/cloudflare/types/api_gateway/user_schema_create_response.py
new file mode 100644
index 00000000000..bba8139084b
--- /dev/null
+++ b/src/cloudflare/types/api_gateway/user_schema_create_response.py
@@ -0,0 +1,40 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+from .old_public_schema import OldPublicSchema
+
+__all__ = ["UserSchemaCreateResponse", "UploadDetails", "UploadDetailsWarning"]
+
+
+class UploadDetailsWarning(BaseModel):
+    code: int
+    """Code that identifies the event that occurred."""
+
+    locations: Optional[List[str]] = None
+    """JSONPath location(s) in the schema where these events were encountered.
+
+    See
+    [https://goessner.net/articles/JsonPath/](https://goessner.net/articles/JsonPath/)
+    for JSONPath specification.
+    """
+
+    message: Optional[str] = None
+    """Diagnostic message that describes the event."""
+
+
+class UploadDetails(BaseModel):
+    warnings: Optional[List[UploadDetailsWarning]] = None
+    """Diagnostic warning events that occurred during processing.
+
+    These events are non-critical errors found within the schema.
+    """
+
+
+class UserSchemaCreateResponse(BaseModel):
+    schema_: OldPublicSchema = FieldInfo(alias="schema")
+
+    upload_details: Optional[UploadDetails] = None
diff --git a/src/cloudflare/types/api_gateway/user_schema_delete_response.py b/src/cloudflare/types/api_gateway/user_schema_delete_response.py
index 88f23ea6482..461066b9212 100644
--- a/src/cloudflare/types/api_gateway/user_schema_delete_response.py
+++ b/src/cloudflare/types/api_gateway/user_schema_delete_response.py
@@ -1,7 +1,17 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union
+from typing_extensions import Literal
+
+from .message import Message
+from ..._models import BaseModel
 
 __all__ = ["UserSchemaDeleteResponse"]
 
-UserSchemaDeleteResponse = Union[str, object]
+
+class UserSchemaDeleteResponse(BaseModel):
+    errors: Message
+
+    messages: Message
+
+    success: Literal[True]
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/api_gateway/user_schema_edit_params.py b/src/cloudflare/types/api_gateway/user_schema_edit_params.py
index 99e15349c77..085ba5a2fbf 100644
--- a/src/cloudflare/types/api_gateway/user_schema_edit_params.py
+++ b/src/cloudflare/types/api_gateway/user_schema_edit_params.py
@@ -9,7 +9,7 @@
 
 class UserSchemaEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     validation_enabled: Literal[True]
     """Flag whether schema is enabled for validation."""
diff --git a/src/cloudflare/types/api_gateway/user_schema_get_params.py b/src/cloudflare/types/api_gateway/user_schema_get_params.py
index dbaee3dee47..3fa24a59bce 100644
--- a/src/cloudflare/types/api_gateway/user_schema_get_params.py
+++ b/src/cloudflare/types/api_gateway/user_schema_get_params.py
@@ -9,7 +9,7 @@
 
 class UserSchemaGetParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     omit_source: bool
     """Omit the source-files of schemas and only retrieve their meta-data."""
diff --git a/src/cloudflare/types/api_gateway/user_schema_list_params.py b/src/cloudflare/types/api_gateway/user_schema_list_params.py
index faca68fa945..4cb1bdbbcca 100644
--- a/src/cloudflare/types/api_gateway/user_schema_list_params.py
+++ b/src/cloudflare/types/api_gateway/user_schema_list_params.py
@@ -9,7 +9,7 @@
 
 class UserSchemaListParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     omit_source: bool
     """Omit the source-files of schemas and only retrieve their meta-data."""
diff --git a/src/cloudflare/types/api_gateway/user_schemas/__init__.py b/src/cloudflare/types/api_gateway/user_schemas/__init__.py
index 597343a578b..2ac3f60144f 100644
--- a/src/cloudflare/types/api_gateway/user_schemas/__init__.py
+++ b/src/cloudflare/types/api_gateway/user_schemas/__init__.py
@@ -2,5 +2,7 @@
 
 from __future__ import annotations
 
+from .host_list_params import HostListParams as HostListParams
+from .host_list_response import HostListResponse as HostListResponse
 from .operation_list_params import OperationListParams as OperationListParams
 from .operation_list_response import OperationListResponse as OperationListResponse
diff --git a/src/cloudflare/types/api_gateway/user_schemas/host_list_params.py b/src/cloudflare/types/api_gateway/user_schemas/host_list_params.py
new file mode 100644
index 00000000000..5865ee0d036
--- /dev/null
+++ b/src/cloudflare/types/api_gateway/user_schemas/host_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["HostListParams"]
+
+
+class HostListParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    page: int
+    """Page number of paginated results."""
+
+    per_page: int
+    """Maximum number of results per page."""
diff --git a/src/cloudflare/types/api_gateway/user_schemas/host_list_response.py b/src/cloudflare/types/api_gateway/user_schemas/host_list_response.py
new file mode 100644
index 00000000000..8b1d3df5efc
--- /dev/null
+++ b/src/cloudflare/types/api_gateway/user_schemas/host_list_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["HostListResponse"]
+
+
+class HostListResponse(BaseModel):
+    created_at: datetime
+
+    hosts: List[str]
+    """Hosts serving the schema, e.g zone.host.com"""
+
+    name: str
+    """Name of the schema"""
+
+    schema_id: str
+    """UUID."""
diff --git a/src/cloudflare/types/api_gateway/user_schemas/operation_list_params.py b/src/cloudflare/types/api_gateway/user_schemas/operation_list_params.py
index 64cb5bdccae..25cd71a53c6 100644
--- a/src/cloudflare/types/api_gateway/user_schemas/operation_list_params.py
+++ b/src/cloudflare/types/api_gateway/user_schemas/operation_list_params.py
@@ -5,12 +5,14 @@
 from typing import List
 from typing_extensions import Literal, Required, TypedDict
 
+from ...._types import SequenceNotStr
+
 __all__ = ["OperationListParams"]
 
 
 class OperationListParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     endpoint: str
     """Filter results to only include endpoints containing this pattern."""
@@ -23,10 +25,10 @@ class OperationListParams(TypedDict, total=False):
     meaning.
     """
 
-    host: List[str]
+    host: SequenceNotStr[str]
     """Filter results to only include the specified hosts."""
 
-    method: List[str]
+    method: SequenceNotStr[str]
     """Filter results to only include the specified HTTP methods."""
 
     operation_status: Literal["new", "existing"]
diff --git a/src/cloudflare/types/api_gateway/user_schemas/operation_list_response.py b/src/cloudflare/types/api_gateway/user_schemas/operation_list_response.py
index b4ff6af36be..94598f5f513 100644
--- a/src/cloudflare/types/api_gateway/user_schemas/operation_list_response.py
+++ b/src/cloudflare/types/api_gateway/user_schemas/operation_list_response.py
@@ -1,12 +1,248 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union
-from typing_extensions import Literal
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
 from ...._models import BaseModel
-from ..api_shield import APIShield
 
-__all__ = ["OperationListResponse", "APIShieldBasicOperation"]
+__all__ = [
+    "OperationListResponse",
+    "APIShieldOperation",
+    "APIShieldOperationFeatures",
+    "APIShieldOperationFeaturesAPIShieldOperationFeatureThresholds",
+    "APIShieldOperationFeaturesAPIShieldOperationFeatureThresholdsThresholds",
+    "APIShieldOperationFeaturesAPIShieldOperationFeatureParameterSchemas",
+    "APIShieldOperationFeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemas",
+    "APIShieldOperationFeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameterSchemas",
+    "APIShieldOperationFeaturesAPIShieldOperationFeatureAPIRouting",
+    "APIShieldOperationFeaturesAPIShieldOperationFeatureAPIRoutingAPIRouting",
+    "APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervals",
+    "APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervals",
+    "APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThreshold",
+    "APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervals",
+    "APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP90",
+    "APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP95",
+    "APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP99",
+    "APIShieldOperationFeaturesAPIShieldOperationFeatureSchemaInfo",
+    "APIShieldOperationFeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfo",
+    "APIShieldOperationFeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfoActiveSchema",
+    "APIShieldBasicOperation",
+]
+
+
+class APIShieldOperationFeaturesAPIShieldOperationFeatureThresholdsThresholds(BaseModel):
+    auth_id_tokens: Optional[int] = None
+    """The total number of auth-ids seen across this calculation."""
+
+    data_points: Optional[int] = None
+    """The number of data points used for the threshold suggestion calculation."""
+
+    last_updated: Optional[datetime] = None
+
+    p50: Optional[int] = None
+    """The p50 quantile of requests (in period_seconds)."""
+
+    p90: Optional[int] = None
+    """The p90 quantile of requests (in period_seconds)."""
+
+    p99: Optional[int] = None
+    """The p99 quantile of requests (in period_seconds)."""
+
+    period_seconds: Optional[int] = None
+    """The period over which this threshold is suggested."""
+
+    requests: Optional[int] = None
+    """The estimated number of requests covered by these calculations."""
+
+    suggested_threshold: Optional[int] = None
+    """The suggested threshold in requests done by the same auth_id or period_seconds."""
+
+
+class APIShieldOperationFeaturesAPIShieldOperationFeatureThresholds(BaseModel):
+    thresholds: Optional[APIShieldOperationFeaturesAPIShieldOperationFeatureThresholdsThresholds] = None
+
+
+class APIShieldOperationFeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameterSchemas(BaseModel):
+    """An operation schema object containing a response."""
+
+    parameters: Optional[List[object]] = None
+    """An array containing the learned parameter schemas."""
+
+    responses: Optional[object] = None
+    """An empty response object.
+
+    This field is required to yield a valid operation schema.
+    """
+
+
+class APIShieldOperationFeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemas(BaseModel):
+    last_updated: Optional[datetime] = None
+
+    parameter_schemas: Optional[
+        APIShieldOperationFeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemasParameterSchemas
+    ] = None
+    """An operation schema object containing a response."""
+
+
+class APIShieldOperationFeaturesAPIShieldOperationFeatureParameterSchemas(BaseModel):
+    parameter_schemas: APIShieldOperationFeaturesAPIShieldOperationFeatureParameterSchemasParameterSchemas
+
+
+class APIShieldOperationFeaturesAPIShieldOperationFeatureAPIRoutingAPIRouting(BaseModel):
+    """API Routing settings on endpoint."""
+
+    last_updated: Optional[datetime] = None
+
+    route: Optional[str] = None
+    """Target route."""
+
+
+class APIShieldOperationFeaturesAPIShieldOperationFeatureAPIRouting(BaseModel):
+    api_routing: Optional[APIShieldOperationFeaturesAPIShieldOperationFeatureAPIRoutingAPIRouting] = None
+    """API Routing settings on endpoint."""
+
+
+class APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP90(
+    BaseModel
+):
+    """Upper and lower bound for percentile estimate"""
+
+    lower: Optional[float] = None
+    """Lower bound for percentile estimate"""
+
+    upper: Optional[float] = None
+    """Upper bound for percentile estimate"""
+
+
+class APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP95(
+    BaseModel
+):
+    """Upper and lower bound for percentile estimate"""
+
+    lower: Optional[float] = None
+    """Lower bound for percentile estimate"""
+
+    upper: Optional[float] = None
+    """Upper bound for percentile estimate"""
+
+
+class APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP99(
+    BaseModel
+):
+    """Upper and lower bound for percentile estimate"""
+
+    lower: Optional[float] = None
+    """Lower bound for percentile estimate"""
+
+    upper: Optional[float] = None
+    """Upper bound for percentile estimate"""
+
+
+class APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervals(
+    BaseModel
+):
+    p90: Optional[
+        APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP90
+    ] = None
+    """Upper and lower bound for percentile estimate"""
+
+    p95: Optional[
+        APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP95
+    ] = None
+    """Upper and lower bound for percentile estimate"""
+
+    p99: Optional[
+        APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervalsP99
+    ] = None
+    """Upper and lower bound for percentile estimate"""
+
+
+class APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThreshold(
+    BaseModel
+):
+    confidence_intervals: Optional[
+        APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThresholdConfidenceIntervals
+    ] = None
+
+    mean: Optional[float] = None
+    """Suggested threshold."""
+
+
+class APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervals(BaseModel):
+    last_updated: Optional[datetime] = None
+
+    suggested_threshold: Optional[
+        APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervalsSuggestedThreshold
+    ] = None
+
+
+class APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervals(BaseModel):
+    confidence_intervals: Optional[
+        APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervalsConfidenceIntervals
+    ] = None
+
+
+class APIShieldOperationFeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfoActiveSchema(BaseModel):
+    """Schema active on endpoint."""
+
+    id: Optional[str] = None
+    """UUID."""
+
+    created_at: Optional[datetime] = None
+
+    is_learned: Optional[bool] = None
+    """True if schema is Cloudflare-provided."""
+
+    name: Optional[str] = None
+    """Schema file name."""
+
+
+class APIShieldOperationFeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfo(BaseModel):
+    active_schema: Optional[APIShieldOperationFeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfoActiveSchema] = None
+    """Schema active on endpoint."""
+
+    learned_available: Optional[bool] = None
+    """True if a Cloudflare-provided learned schema is available for this endpoint."""
+
+    mitigation_action: Optional[Literal["none", "log", "block"]] = None
+    """Action taken on requests failing validation."""
+
+
+class APIShieldOperationFeaturesAPIShieldOperationFeatureSchemaInfo(BaseModel):
+    schema_info: Optional[APIShieldOperationFeaturesAPIShieldOperationFeatureSchemaInfoSchemaInfo] = None
+
+
+APIShieldOperationFeatures: TypeAlias = Union[
+    APIShieldOperationFeaturesAPIShieldOperationFeatureThresholds,
+    APIShieldOperationFeaturesAPIShieldOperationFeatureParameterSchemas,
+    APIShieldOperationFeaturesAPIShieldOperationFeatureAPIRouting,
+    APIShieldOperationFeaturesAPIShieldOperationFeatureConfidenceIntervals,
+    APIShieldOperationFeaturesAPIShieldOperationFeatureSchemaInfo,
+]
+
+
+class APIShieldOperation(BaseModel):
+    endpoint: str
+    """
+    The endpoint which can contain path parameter templates in curly braces, each
+    will be replaced from left to right with {varN}, starting with {var1}, during
+    insertion. This will further be Cloudflare-normalized upon insertion. See:
+    https://developers.cloudflare.com/rules/normalization/how-it-works/.
+    """
+
+    host: str
+    """RFC3986-compliant host."""
+
+    last_updated: datetime
+
+    method: Literal["GET", "POST", "HEAD", "OPTIONS", "PUT", "DELETE", "CONNECT", "PATCH", "TRACE"]
+    """The HTTP method used to access the endpoint."""
+
+    operation_id: str
+    """UUID."""
+
+    features: Optional[APIShieldOperationFeatures] = None
 
 
 class APIShieldBasicOperation(BaseModel):
@@ -25,4 +261,4 @@ class APIShieldBasicOperation(BaseModel):
     """The HTTP method used to access the endpoint."""
 
 
-OperationListResponse = Union[APIShield, APIShieldBasicOperation]
+OperationListResponse: TypeAlias = Union[APIShieldOperation, APIShieldBasicOperation]
diff --git a/src/cloudflare/types/argo/smart_routing_edit_params.py b/src/cloudflare/types/argo/smart_routing_edit_params.py
index 44d5123b878..6a0817f9c6a 100644
--- a/src/cloudflare/types/argo/smart_routing_edit_params.py
+++ b/src/cloudflare/types/argo/smart_routing_edit_params.py
@@ -9,7 +9,7 @@
 
 class SmartRoutingEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Specifies the zone associated with the API call."""
 
     value: Required[Literal["on", "off"]]
-    """Enables Argo Smart Routing."""
+    """Specifies the enablement value of Argo Smart Routing."""
diff --git a/src/cloudflare/types/argo/smart_routing_edit_response.py b/src/cloudflare/types/argo/smart_routing_edit_response.py
index 6d377a0f9a3..686c1ea1ba9 100644
--- a/src/cloudflare/types/argo/smart_routing_edit_response.py
+++ b/src/cloudflare/types/argo/smart_routing_edit_response.py
@@ -1,7 +1,23 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
 
 __all__ = ["SmartRoutingEditResponse"]
 
-SmartRoutingEditResponse = Union[Optional[str], Optional[object]]
+
+class SmartRoutingEditResponse(BaseModel):
+    id: str
+    """Specifies the identifier of the Argo Smart Routing setting."""
+
+    editable: bool
+    """Specifies if the setting is editable."""
+
+    value: Literal["on", "off"]
+    """Specifies the enablement value of Argo Smart Routing."""
+
+    modified_on: Optional[datetime] = None
+    """Specifies the time when the setting was last modified."""
diff --git a/src/cloudflare/types/argo/smart_routing_get_response.py b/src/cloudflare/types/argo/smart_routing_get_response.py
index 666187291ad..6249bb13ea2 100644
--- a/src/cloudflare/types/argo/smart_routing_get_response.py
+++ b/src/cloudflare/types/argo/smart_routing_get_response.py
@@ -1,7 +1,23 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
 
 __all__ = ["SmartRoutingGetResponse"]
 
-SmartRoutingGetResponse = Union[Optional[str], Optional[object]]
+
+class SmartRoutingGetResponse(BaseModel):
+    id: str
+    """Specifies the identifier of the Argo Smart Routing setting."""
+
+    editable: bool
+    """Specifies if the setting is editable."""
+
+    value: Literal["on", "off"]
+    """Specifies the enablement value of Argo Smart Routing."""
+
+    modified_on: Optional[datetime] = None
+    """Specifies the time when the setting was last modified."""
diff --git a/src/cloudflare/types/argo/tiered_caching_edit_params.py b/src/cloudflare/types/argo/tiered_caching_edit_params.py
index bab4bf2900c..1a1702873c2 100644
--- a/src/cloudflare/types/argo/tiered_caching_edit_params.py
+++ b/src/cloudflare/types/argo/tiered_caching_edit_params.py
@@ -9,7 +9,7 @@
 
 class TieredCachingEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     value: Required[Literal["on", "off"]]
     """Enables Tiered Caching."""
diff --git a/src/cloudflare/types/argo/tiered_caching_edit_response.py b/src/cloudflare/types/argo/tiered_caching_edit_response.py
index 0e99559b8f5..88ed3325780 100644
--- a/src/cloudflare/types/argo/tiered_caching_edit_response.py
+++ b/src/cloudflare/types/argo/tiered_caching_edit_response.py
@@ -1,5 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import Optional
 from datetime import datetime
 from typing_extensions import Literal
 
@@ -9,14 +10,14 @@
 
 
 class TieredCachingEditResponse(BaseModel):
-    id: str
-    """The identifier of the caching setting"""
+    id: Literal["tiered_caching"]
+    """The identifier of the caching setting."""
 
     editable: bool
-    """Whether the setting is editable"""
-
-    modified_on: datetime
-    """The time when the setting was last modified"""
+    """Whether the setting is editable."""
 
     value: Literal["on", "off"]
-    """The status of the feature being on / off"""
+    """Value of the Tiered Cache zone setting."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
diff --git a/src/cloudflare/types/argo/tiered_caching_get_response.py b/src/cloudflare/types/argo/tiered_caching_get_response.py
index 72f04aac880..b4b468a63af 100644
--- a/src/cloudflare/types/argo/tiered_caching_get_response.py
+++ b/src/cloudflare/types/argo/tiered_caching_get_response.py
@@ -1,5 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import Optional
 from datetime import datetime
 from typing_extensions import Literal
 
@@ -9,14 +10,14 @@
 
 
 class TieredCachingGetResponse(BaseModel):
-    id: str
-    """The identifier of the caching setting"""
+    id: Literal["tiered_caching"]
+    """The identifier of the caching setting."""
 
     editable: bool
-    """Whether the setting is editable"""
-
-    modified_on: datetime
-    """The time when the setting was last modified"""
+    """Whether the setting is editable."""
 
     value: Literal["on", "off"]
-    """The status of the feature being on / off"""
+    """Value of the Tiered Cache zone setting."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
diff --git a/src/cloudflare/types/audit_logs/audit_log_list_params.py b/src/cloudflare/types/audit_logs/audit_log_list_params.py
index 3ad70b082c0..5b43966e45b 100644
--- a/src/cloudflare/types/audit_logs/audit_log_list_params.py
+++ b/src/cloudflare/types/audit_logs/audit_log_list_params.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from typing import Union
-from datetime import datetime
+from datetime import date, datetime
 from typing_extensions import Literal, Required, Annotated, TypedDict
 
 from ..._utils import PropertyInfo
@@ -22,11 +22,10 @@ class AuditLogListParams(TypedDict, total=False):
 
     actor: Actor
 
-    before: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    before: Annotated[Union[Union[str, date], Union[str, datetime]], PropertyInfo(format="iso8601")]
     """Limits the returned results to logs older than the specified date.
 
-    This can be a date string `2019-04-30` or an absolute timestamp that conforms to
-    RFC3339.
+    A `full-date` that conforms to RFC3339.
     """
 
     direction: Literal["desc", "asc"]
@@ -44,11 +43,10 @@ class AuditLogListParams(TypedDict, total=False):
     per_page: float
     """Sets the number of results to return per page."""
 
-    since: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    since: Annotated[Union[Union[str, date], Union[str, datetime]], PropertyInfo(format="iso8601")]
     """Limits the returned results to logs newer than the specified date.
 
-    This can be a date string `2019-04-30` or an absolute timestamp that conforms to
-    RFC3339.
+    A `full-date` that conforms to RFC3339.
     """
 
     zone: Zone
diff --git a/src/cloudflare/types/billing/profile_get_response.py b/src/cloudflare/types/billing/profile_get_response.py
index 29d6d78c949..a6cb23fb4d5 100644
--- a/src/cloudflare/types/billing/profile_get_response.py
+++ b/src/cloudflare/types/billing/profile_get_response.py
@@ -1,7 +1,89 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
 
 __all__ = ["ProfileGetResponse"]
 
-ProfileGetResponse = Union[Optional[str], Optional[object]]
+
+class ProfileGetResponse(BaseModel):
+    id: Optional[str] = None
+    """Billing item identifier tag."""
+
+    account_type: Optional[str] = None
+
+    address: Optional[str] = None
+
+    address2: Optional[str] = None
+
+    balance: Optional[str] = None
+
+    card_expiry_month: Optional[int] = None
+
+    card_expiry_year: Optional[int] = None
+
+    card_number: Optional[str] = None
+
+    city: Optional[str] = None
+
+    company: Optional[str] = None
+
+    country: Optional[str] = None
+
+    created_on: Optional[datetime] = None
+
+    device_data: Optional[str] = None
+
+    edited_on: Optional[datetime] = None
+
+    enterprise_billing_email: Optional[str] = None
+
+    enterprise_primary_email: Optional[str] = None
+
+    first_name: Optional[str] = None
+
+    is_partner: Optional[bool] = None
+
+    last_name: Optional[str] = None
+
+    next_bill_date: Optional[datetime] = None
+
+    payment_address: Optional[str] = None
+
+    payment_address2: Optional[str] = None
+
+    payment_city: Optional[str] = None
+
+    payment_country: Optional[str] = None
+
+    payment_email: Optional[str] = None
+
+    payment_first_name: Optional[str] = None
+
+    payment_gateway: Optional[str] = None
+
+    payment_last_name: Optional[str] = None
+
+    payment_nonce: Optional[str] = None
+
+    payment_state: Optional[str] = None
+
+    payment_zipcode: Optional[str] = None
+
+    primary_email: Optional[str] = None
+
+    state: Optional[str] = None
+
+    tax_id_type: Optional[str] = None
+
+    telephone: Optional[str] = None
+
+    use_legacy: Optional[bool] = None
+
+    validation_code: Optional[str] = None
+
+    vat: Optional[str] = None
+
+    zipcode: Optional[str] = None
diff --git a/src/cloudflare/types/bot_management/__init__.py b/src/cloudflare/types/bot_management/__init__.py
index f7225855fc6..e645a5153c7 100644
--- a/src/cloudflare/types/bot_management/__init__.py
+++ b/src/cloudflare/types/bot_management/__init__.py
@@ -7,9 +7,17 @@
 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 .subscription_configuration_param import SubscriptionConfigurationParam as SubscriptionConfigurationParam
+from .bot_fight_mode_configuration_param import BotFightModeConfigurationParam as BotFightModeConfigurationParam
 from .super_bot_fight_mode_likely_configuration import (
     SuperBotFightModeLikelyConfiguration as SuperBotFightModeLikelyConfiguration,
 )
 from .super_bot_fight_mode_definitely_configuration import (
     SuperBotFightModeDefinitelyConfiguration as SuperBotFightModeDefinitelyConfiguration,
 )
+from .super_bot_fight_mode_likely_configuration_param import (
+    SuperBotFightModeLikelyConfigurationParam as SuperBotFightModeLikelyConfigurationParam,
+)
+from .super_bot_fight_mode_definitely_configuration_param import (
+    SuperBotFightModeDefinitelyConfigurationParam as SuperBotFightModeDefinitelyConfigurationParam,
+)
diff --git a/src/cloudflare/types/bot_management/bot_fight_mode_configuration.py b/src/cloudflare/types/bot_management/bot_fight_mode_configuration.py
index ca47e2d1a71..01b845aa89d 100644
--- a/src/cloudflare/types/bot_management/bot_fight_mode_configuration.py
+++ b/src/cloudflare/types/bot_management/bot_fight_mode_configuration.py
@@ -1,13 +1,57 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from typing_extensions import Literal
 
 from ..._models import BaseModel
 
-__all__ = ["BotFightModeConfiguration"]
+__all__ = ["BotFightModeConfiguration", "StaleZoneConfiguration"]
+
+
+class StaleZoneConfiguration(BaseModel):
+    """
+    A read-only field that shows which unauthorized settings are currently active on the zone. These settings typically result from upgrades or downgrades.
+    """
+
+    optimize_wordpress: Optional[bool] = None
+    """Indicates that the zone's wordpress optimization for SBFM is turned on."""
+
+    sbfm_definitely_automated: Optional[str] = None
+    """
+    Indicates that the zone's definitely automated requests are being blocked or
+    challenged.
+    """
+
+    sbfm_likely_automated: Optional[str] = None
+    """
+    Indicates that the zone's likely automated requests are being blocked or
+    challenged.
+    """
+
+    sbfm_static_resource_protection: Optional[str] = None
+    """Indicates that the zone's static resource protection is turned on."""
+
+    sbfm_verified_bots: Optional[str] = None
+    """Indicates that the zone's verified bot requests are being blocked."""
+
+    suppress_session_score: Optional[bool] = None
+    """Indicates that the zone's session score tracking is disabled."""
 
 
 class BotFightModeConfiguration(BaseModel):
+    ai_bots_protection: Optional[Literal["block", "disabled", "only_on_ad_pages"]] = None
+    """Enable rule to block AI Scrapers and Crawlers.
+
+    Please note the value `only_on_ad_pages` is currently not available for
+    Enterprise customers.
+    """
+
+    cf_robots_variant: Optional[Literal["off", "policy_only"]] = None
+    """Specifies the Robots Access Control License variant to use."""
+
+    crawler_protection: Optional[Literal["enabled", "disabled"]] = None
+    """Enable rule to punish AI Scrapers and Crawlers via a link maze."""
+
     enable_js: Optional[bool] = None
     """Use lightweight, invisible JavaScript detections to improve Bot Management.
 
@@ -17,6 +61,19 @@ class BotFightModeConfiguration(BaseModel):
     fight_mode: Optional[bool] = None
     """Whether to enable Bot Fight Mode."""
 
+    is_robots_txt_managed: Optional[bool] = None
+    """Enable cloudflare managed robots.txt.
+
+    If an existing robots.txt is detected, then managed robots.txt will be prepended
+    to the existing robots.txt.
+    """
+
+    stale_zone_configuration: Optional[StaleZoneConfiguration] = None
+    """
+    A read-only field that shows which unauthorized settings are currently active on
+    the zone. These settings typically result from upgrades or downgrades.
+    """
+
     using_latest_model: Optional[bool] = None
     """
     A read-only field that indicates whether the zone currently is running the
diff --git a/src/cloudflare/types/bot_management/bot_fight_mode_configuration_param.py b/src/cloudflare/types/bot_management/bot_fight_mode_configuration_param.py
new file mode 100644
index 00000000000..64151a6bf71
--- /dev/null
+++ b/src/cloudflare/types/bot_management/bot_fight_mode_configuration_param.py
@@ -0,0 +1,38 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["BotFightModeConfigurationParam"]
+
+
+class BotFightModeConfigurationParam(TypedDict, total=False):
+    ai_bots_protection: Literal["block", "disabled", "only_on_ad_pages"]
+    """Enable rule to block AI Scrapers and Crawlers.
+
+    Please note the value `only_on_ad_pages` is currently not available for
+    Enterprise customers.
+    """
+
+    cf_robots_variant: Literal["off", "policy_only"]
+    """Specifies the Robots Access Control License variant to use."""
+
+    crawler_protection: Literal["enabled", "disabled"]
+    """Enable rule to punish AI Scrapers and Crawlers via a link maze."""
+
+    enable_js: bool
+    """Use lightweight, invisible JavaScript detections to improve Bot Management.
+
+    [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
+    """
+
+    fight_mode: bool
+    """Whether to enable Bot Fight Mode."""
+
+    is_robots_txt_managed: bool
+    """Enable cloudflare managed robots.txt.
+
+    If an existing robots.txt is detected, then managed robots.txt will be prepended
+    to the existing robots.txt.
+    """
diff --git a/src/cloudflare/types/bot_management/bot_management_get_response.py b/src/cloudflare/types/bot_management/bot_management_get_response.py
index 2153b087213..9db219d9017 100644
--- a/src/cloudflare/types/bot_management/bot_management_get_response.py
+++ b/src/cloudflare/types/bot_management/bot_management_get_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Union
+from typing_extensions import TypeAlias
 
 from .subscription_configuration import SubscriptionConfiguration
 from .bot_fight_mode_configuration import BotFightModeConfiguration
@@ -9,7 +10,7 @@
 
 __all__ = ["BotManagementGetResponse"]
 
-BotManagementGetResponse = Union[
+BotManagementGetResponse: TypeAlias = Union[
     BotFightModeConfiguration,
     SuperBotFightModeDefinitelyConfiguration,
     SuperBotFightModeLikelyConfiguration,
diff --git a/src/cloudflare/types/bot_management/bot_management_update_params.py b/src/cloudflare/types/bot_management/bot_management_update_params.py
index 199be0ab054..eeaf0a45fc3 100644
--- a/src/cloudflare/types/bot_management/bot_management_update_params.py
+++ b/src/cloudflare/types/bot_management/bot_management_update_params.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from typing import Union
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
 __all__ = [
     "BotManagementUpdateParams",
@@ -16,7 +16,20 @@
 
 class BotFightModeConfiguration(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
+
+    ai_bots_protection: Literal["block", "disabled", "only_on_ad_pages"]
+    """Enable rule to block AI Scrapers and Crawlers.
+
+    Please note the value `only_on_ad_pages` is currently not available for
+    Enterprise customers.
+    """
+
+    cf_robots_variant: Literal["off", "policy_only"]
+    """Specifies the Robots Access Control License variant to use."""
+
+    crawler_protection: Literal["enabled", "disabled"]
+    """Enable rule to punish AI Scrapers and Crawlers via a link maze."""
 
     enable_js: bool
     """Use lightweight, invisible JavaScript detections to improve Bot Management.
@@ -27,10 +40,30 @@ class BotFightModeConfiguration(TypedDict, total=False):
     fight_mode: bool
     """Whether to enable Bot Fight Mode."""
 
+    is_robots_txt_managed: bool
+    """Enable cloudflare managed robots.txt.
+
+    If an existing robots.txt is detected, then managed robots.txt will be prepended
+    to the existing robots.txt.
+    """
+
 
 class SuperBotFightModeDefinitelyConfiguration(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
+
+    ai_bots_protection: Literal["block", "disabled", "only_on_ad_pages"]
+    """Enable rule to block AI Scrapers and Crawlers.
+
+    Please note the value `only_on_ad_pages` is currently not available for
+    Enterprise customers.
+    """
+
+    cf_robots_variant: Literal["off", "policy_only"]
+    """Specifies the Robots Access Control License variant to use."""
+
+    crawler_protection: Literal["enabled", "disabled"]
+    """Enable rule to punish AI Scrapers and Crawlers via a link maze."""
 
     enable_js: bool
     """Use lightweight, invisible JavaScript detections to improve Bot Management.
@@ -38,6 +71,13 @@ class SuperBotFightModeDefinitelyConfiguration(TypedDict, total=False):
     [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
     """
 
+    is_robots_txt_managed: bool
+    """Enable cloudflare managed robots.txt.
+
+    If an existing robots.txt is detected, then managed robots.txt will be prepended
+    to the existing robots.txt.
+    """
+
     optimize_wordpress: bool
     """Whether to optimize Super Bot Fight Mode protections for Wordpress."""
 
@@ -57,7 +97,20 @@ class SuperBotFightModeDefinitelyConfiguration(TypedDict, total=False):
 
 class SuperBotFightModeLikelyConfiguration(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
+
+    ai_bots_protection: Literal["block", "disabled", "only_on_ad_pages"]
+    """Enable rule to block AI Scrapers and Crawlers.
+
+    Please note the value `only_on_ad_pages` is currently not available for
+    Enterprise customers.
+    """
+
+    cf_robots_variant: Literal["off", "policy_only"]
+    """Specifies the Robots Access Control License variant to use."""
+
+    crawler_protection: Literal["enabled", "disabled"]
+    """Enable rule to punish AI Scrapers and Crawlers via a link maze."""
 
     enable_js: bool
     """Use lightweight, invisible JavaScript detections to improve Bot Management.
@@ -65,6 +118,13 @@ class SuperBotFightModeLikelyConfiguration(TypedDict, total=False):
     [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
     """
 
+    is_robots_txt_managed: bool
+    """Enable cloudflare managed robots.txt.
+
+    If an existing robots.txt is detected, then managed robots.txt will be prepended
+    to the existing robots.txt.
+    """
+
     optimize_wordpress: bool
     """Whether to optimize Super Bot Fight Mode protections for Wordpress."""
 
@@ -87,7 +147,14 @@ class SuperBotFightModeLikelyConfiguration(TypedDict, total=False):
 
 class SubscriptionConfiguration(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
+
+    ai_bots_protection: Literal["block", "disabled", "only_on_ad_pages"]
+    """Enable rule to block AI Scrapers and Crawlers.
+
+    Please note the value `only_on_ad_pages` is currently not available for
+    Enterprise customers.
+    """
 
     auto_update_model: bool
     """
@@ -96,12 +163,31 @@ class SubscriptionConfiguration(TypedDict, total=False):
     [Learn more.](https://developers.cloudflare.com/bots/reference/machine-learning-models#model-versions-and-release-notes)
     """
 
+    bm_cookie_enabled: bool
+    """
+    Indicates that the bot management cookie can be placed on end user devices
+    accessing the site. Defaults to true
+    """
+
+    cf_robots_variant: Literal["off", "policy_only"]
+    """Specifies the Robots Access Control License variant to use."""
+
+    crawler_protection: Literal["enabled", "disabled"]
+    """Enable rule to punish AI Scrapers and Crawlers via a link maze."""
+
     enable_js: bool
     """Use lightweight, invisible JavaScript detections to improve Bot Management.
 
     [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
     """
 
+    is_robots_txt_managed: bool
+    """Enable cloudflare managed robots.txt.
+
+    If an existing robots.txt is detected, then managed robots.txt will be prepended
+    to the existing robots.txt.
+    """
+
     suppress_session_score: bool
     """
     Whether to disable tracking the highest bot score for a session in the Bot
@@ -109,7 +195,7 @@ class SubscriptionConfiguration(TypedDict, total=False):
     """
 
 
-BotManagementUpdateParams = Union[
+BotManagementUpdateParams: TypeAlias = Union[
     BotFightModeConfiguration,
     SuperBotFightModeDefinitelyConfiguration,
     SuperBotFightModeLikelyConfiguration,
diff --git a/src/cloudflare/types/bot_management/bot_management_update_response.py b/src/cloudflare/types/bot_management/bot_management_update_response.py
index 6880ad7a3ef..5d4dced7fba 100644
--- a/src/cloudflare/types/bot_management/bot_management_update_response.py
+++ b/src/cloudflare/types/bot_management/bot_management_update_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Union
+from typing_extensions import TypeAlias
 
 from .subscription_configuration import SubscriptionConfiguration
 from .bot_fight_mode_configuration import BotFightModeConfiguration
@@ -9,7 +10,7 @@
 
 __all__ = ["BotManagementUpdateResponse"]
 
-BotManagementUpdateResponse = Union[
+BotManagementUpdateResponse: TypeAlias = Union[
     BotFightModeConfiguration,
     SuperBotFightModeDefinitelyConfiguration,
     SuperBotFightModeLikelyConfiguration,
diff --git a/src/cloudflare/types/bot_management/subscription_configuration.py b/src/cloudflare/types/bot_management/subscription_configuration.py
index b9734638ceb..fc306d5ddda 100644
--- a/src/cloudflare/types/bot_management/subscription_configuration.py
+++ b/src/cloudflare/types/bot_management/subscription_configuration.py
@@ -1,13 +1,51 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from typing_extensions import Literal
 
 from ..._models import BaseModel
 
-__all__ = ["SubscriptionConfiguration"]
+__all__ = ["SubscriptionConfiguration", "StaleZoneConfiguration"]
+
+
+class StaleZoneConfiguration(BaseModel):
+    """
+    A read-only field that shows which unauthorized settings are currently active on the zone. These settings typically result from upgrades or downgrades.
+    """
+
+    fight_mode: Optional[bool] = None
+    """Indicates that the zone's Bot Fight Mode is turned on."""
+
+    optimize_wordpress: Optional[bool] = None
+    """Indicates that the zone's wordpress optimization for SBFM is turned on."""
+
+    sbfm_definitely_automated: Optional[str] = None
+    """
+    Indicates that the zone's definitely automated requests are being blocked or
+    challenged.
+    """
+
+    sbfm_likely_automated: Optional[str] = None
+    """
+    Indicates that the zone's likely automated requests are being blocked or
+    challenged.
+    """
+
+    sbfm_static_resource_protection: Optional[str] = None
+    """Indicates that the zone's static resource protection is turned on."""
+
+    sbfm_verified_bots: Optional[str] = None
+    """Indicates that the zone's verified bot requests are being blocked."""
 
 
 class SubscriptionConfiguration(BaseModel):
+    ai_bots_protection: Optional[Literal["block", "disabled", "only_on_ad_pages"]] = None
+    """Enable rule to block AI Scrapers and Crawlers.
+
+    Please note the value `only_on_ad_pages` is currently not available for
+    Enterprise customers.
+    """
+
     auto_update_model: Optional[bool] = None
     """
     Automatically update to the newest bot detection models created by Cloudflare as
@@ -15,12 +53,37 @@ class SubscriptionConfiguration(BaseModel):
     [Learn more.](https://developers.cloudflare.com/bots/reference/machine-learning-models#model-versions-and-release-notes)
     """
 
+    bm_cookie_enabled: Optional[bool] = None
+    """
+    Indicates that the bot management cookie can be placed on end user devices
+    accessing the site. Defaults to true
+    """
+
+    cf_robots_variant: Optional[Literal["off", "policy_only"]] = None
+    """Specifies the Robots Access Control License variant to use."""
+
+    crawler_protection: Optional[Literal["enabled", "disabled"]] = None
+    """Enable rule to punish AI Scrapers and Crawlers via a link maze."""
+
     enable_js: Optional[bool] = None
     """Use lightweight, invisible JavaScript detections to improve Bot Management.
 
     [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
     """
 
+    is_robots_txt_managed: Optional[bool] = None
+    """Enable cloudflare managed robots.txt.
+
+    If an existing robots.txt is detected, then managed robots.txt will be prepended
+    to the existing robots.txt.
+    """
+
+    stale_zone_configuration: Optional[StaleZoneConfiguration] = None
+    """
+    A read-only field that shows which unauthorized settings are currently active on
+    the zone. These settings typically result from upgrades or downgrades.
+    """
+
     suppress_session_score: Optional[bool] = None
     """
     Whether to disable tracking the highest bot score for a session in the Bot
diff --git a/src/cloudflare/types/bot_management/subscription_configuration_param.py b/src/cloudflare/types/bot_management/subscription_configuration_param.py
new file mode 100644
index 00000000000..45ffd01599d
--- /dev/null
+++ b/src/cloudflare/types/bot_management/subscription_configuration_param.py
@@ -0,0 +1,54 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["SubscriptionConfigurationParam"]
+
+
+class SubscriptionConfigurationParam(TypedDict, total=False):
+    ai_bots_protection: Literal["block", "disabled", "only_on_ad_pages"]
+    """Enable rule to block AI Scrapers and Crawlers.
+
+    Please note the value `only_on_ad_pages` is currently not available for
+    Enterprise customers.
+    """
+
+    auto_update_model: bool
+    """
+    Automatically update to the newest bot detection models created by Cloudflare as
+    they are released.
+    [Learn more.](https://developers.cloudflare.com/bots/reference/machine-learning-models#model-versions-and-release-notes)
+    """
+
+    bm_cookie_enabled: bool
+    """
+    Indicates that the bot management cookie can be placed on end user devices
+    accessing the site. Defaults to true
+    """
+
+    cf_robots_variant: Literal["off", "policy_only"]
+    """Specifies the Robots Access Control License variant to use."""
+
+    crawler_protection: Literal["enabled", "disabled"]
+    """Enable rule to punish AI Scrapers and Crawlers via a link maze."""
+
+    enable_js: bool
+    """Use lightweight, invisible JavaScript detections to improve Bot Management.
+
+    [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
+    """
+
+    is_robots_txt_managed: bool
+    """Enable cloudflare managed robots.txt.
+
+    If an existing robots.txt is detected, then managed robots.txt will be prepended
+    to the existing robots.txt.
+    """
+
+    suppress_session_score: bool
+    """
+    Whether to disable tracking the highest bot score for a session in the Bot
+    Management cookie.
+    """
diff --git a/src/cloudflare/types/bot_management/super_bot_fight_mode_definitely_configuration.py b/src/cloudflare/types/bot_management/super_bot_fight_mode_definitely_configuration.py
index 64d6bf32f27..4204c285ecc 100644
--- a/src/cloudflare/types/bot_management/super_bot_fight_mode_definitely_configuration.py
+++ b/src/cloudflare/types/bot_management/super_bot_fight_mode_definitely_configuration.py
@@ -5,16 +5,51 @@
 
 from ..._models import BaseModel
 
-__all__ = ["SuperBotFightModeDefinitelyConfiguration"]
+__all__ = ["SuperBotFightModeDefinitelyConfiguration", "StaleZoneConfiguration"]
+
+
+class StaleZoneConfiguration(BaseModel):
+    """
+    A read-only field that shows which unauthorized settings are currently active on the zone. These settings typically result from upgrades or downgrades.
+    """
+
+    fight_mode: Optional[bool] = None
+    """Indicates that the zone's Bot Fight Mode is turned on."""
+
+    sbfm_likely_automated: Optional[str] = None
+    """
+    Indicates that the zone's likely automated requests are being blocked or
+    challenged.
+    """
 
 
 class SuperBotFightModeDefinitelyConfiguration(BaseModel):
+    ai_bots_protection: Optional[Literal["block", "disabled", "only_on_ad_pages"]] = None
+    """Enable rule to block AI Scrapers and Crawlers.
+
+    Please note the value `only_on_ad_pages` is currently not available for
+    Enterprise customers.
+    """
+
+    cf_robots_variant: Optional[Literal["off", "policy_only"]] = None
+    """Specifies the Robots Access Control License variant to use."""
+
+    crawler_protection: Optional[Literal["enabled", "disabled"]] = None
+    """Enable rule to punish AI Scrapers and Crawlers via a link maze."""
+
     enable_js: Optional[bool] = None
     """Use lightweight, invisible JavaScript detections to improve Bot Management.
 
     [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
     """
 
+    is_robots_txt_managed: Optional[bool] = None
+    """Enable cloudflare managed robots.txt.
+
+    If an existing robots.txt is detected, then managed robots.txt will be prepended
+    to the existing robots.txt.
+    """
+
     optimize_wordpress: Optional[bool] = None
     """Whether to optimize Super Bot Fight Mode protections for Wordpress."""
 
@@ -31,6 +66,12 @@ class SuperBotFightModeDefinitelyConfiguration(BaseModel):
     sbfm_verified_bots: Optional[Literal["allow", "block"]] = None
     """Super Bot Fight Mode (SBFM) action to take on verified bots requests."""
 
+    stale_zone_configuration: Optional[StaleZoneConfiguration] = None
+    """
+    A read-only field that shows which unauthorized settings are currently active on
+    the zone. These settings typically result from upgrades or downgrades.
+    """
+
     using_latest_model: Optional[bool] = None
     """
     A read-only field that indicates whether the zone currently is running the
diff --git a/src/cloudflare/types/bot_management/super_bot_fight_mode_definitely_configuration_param.py b/src/cloudflare/types/bot_management/super_bot_fight_mode_definitely_configuration_param.py
new file mode 100644
index 00000000000..2ab93f1f5cf
--- /dev/null
+++ b/src/cloudflare/types/bot_management/super_bot_fight_mode_definitely_configuration_param.py
@@ -0,0 +1,51 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["SuperBotFightModeDefinitelyConfigurationParam"]
+
+
+class SuperBotFightModeDefinitelyConfigurationParam(TypedDict, total=False):
+    ai_bots_protection: Literal["block", "disabled", "only_on_ad_pages"]
+    """Enable rule to block AI Scrapers and Crawlers.
+
+    Please note the value `only_on_ad_pages` is currently not available for
+    Enterprise customers.
+    """
+
+    cf_robots_variant: Literal["off", "policy_only"]
+    """Specifies the Robots Access Control License variant to use."""
+
+    crawler_protection: Literal["enabled", "disabled"]
+    """Enable rule to punish AI Scrapers and Crawlers via a link maze."""
+
+    enable_js: bool
+    """Use lightweight, invisible JavaScript detections to improve Bot Management.
+
+    [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
+    """
+
+    is_robots_txt_managed: bool
+    """Enable cloudflare managed robots.txt.
+
+    If an existing robots.txt is detected, then managed robots.txt will be prepended
+    to the existing robots.txt.
+    """
+
+    optimize_wordpress: bool
+    """Whether to optimize Super Bot Fight Mode protections for Wordpress."""
+
+    sbfm_definitely_automated: Literal["allow", "block", "managed_challenge"]
+    """Super Bot Fight Mode (SBFM) action to take on definitely automated requests."""
+
+    sbfm_static_resource_protection: bool
+    """
+    Super Bot Fight Mode (SBFM) to enable static resource protection. Enable if
+    static resources on your application need bot protection. Note: Static resource
+    protection can also result in legitimate traffic being blocked.
+    """
+
+    sbfm_verified_bots: Literal["allow", "block"]
+    """Super Bot Fight Mode (SBFM) action to take on verified bots requests."""
diff --git a/src/cloudflare/types/bot_management/super_bot_fight_mode_likely_configuration.py b/src/cloudflare/types/bot_management/super_bot_fight_mode_likely_configuration.py
index c0878cfdf0a..6368c98a654 100644
--- a/src/cloudflare/types/bot_management/super_bot_fight_mode_likely_configuration.py
+++ b/src/cloudflare/types/bot_management/super_bot_fight_mode_likely_configuration.py
@@ -5,16 +5,45 @@
 
 from ..._models import BaseModel
 
-__all__ = ["SuperBotFightModeLikelyConfiguration"]
+__all__ = ["SuperBotFightModeLikelyConfiguration", "StaleZoneConfiguration"]
+
+
+class StaleZoneConfiguration(BaseModel):
+    """
+    A read-only field that shows which unauthorized settings are currently active on the zone. These settings typically result from upgrades or downgrades.
+    """
+
+    fight_mode: Optional[bool] = None
+    """Indicates that the zone's Bot Fight Mode is turned on."""
 
 
 class SuperBotFightModeLikelyConfiguration(BaseModel):
+    ai_bots_protection: Optional[Literal["block", "disabled", "only_on_ad_pages"]] = None
+    """Enable rule to block AI Scrapers and Crawlers.
+
+    Please note the value `only_on_ad_pages` is currently not available for
+    Enterprise customers.
+    """
+
+    cf_robots_variant: Optional[Literal["off", "policy_only"]] = None
+    """Specifies the Robots Access Control License variant to use."""
+
+    crawler_protection: Optional[Literal["enabled", "disabled"]] = None
+    """Enable rule to punish AI Scrapers and Crawlers via a link maze."""
+
     enable_js: Optional[bool] = None
     """Use lightweight, invisible JavaScript detections to improve Bot Management.
 
     [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
     """
 
+    is_robots_txt_managed: Optional[bool] = None
+    """Enable cloudflare managed robots.txt.
+
+    If an existing robots.txt is detected, then managed robots.txt will be prepended
+    to the existing robots.txt.
+    """
+
     optimize_wordpress: Optional[bool] = None
     """Whether to optimize Super Bot Fight Mode protections for Wordpress."""
 
@@ -34,6 +63,12 @@ class SuperBotFightModeLikelyConfiguration(BaseModel):
     sbfm_verified_bots: Optional[Literal["allow", "block"]] = None
     """Super Bot Fight Mode (SBFM) action to take on verified bots requests."""
 
+    stale_zone_configuration: Optional[StaleZoneConfiguration] = None
+    """
+    A read-only field that shows which unauthorized settings are currently active on
+    the zone. These settings typically result from upgrades or downgrades.
+    """
+
     using_latest_model: Optional[bool] = None
     """
     A read-only field that indicates whether the zone currently is running the
diff --git a/src/cloudflare/types/bot_management/super_bot_fight_mode_likely_configuration_param.py b/src/cloudflare/types/bot_management/super_bot_fight_mode_likely_configuration_param.py
new file mode 100644
index 00000000000..a219a368a2b
--- /dev/null
+++ b/src/cloudflare/types/bot_management/super_bot_fight_mode_likely_configuration_param.py
@@ -0,0 +1,54 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["SuperBotFightModeLikelyConfigurationParam"]
+
+
+class SuperBotFightModeLikelyConfigurationParam(TypedDict, total=False):
+    ai_bots_protection: Literal["block", "disabled", "only_on_ad_pages"]
+    """Enable rule to block AI Scrapers and Crawlers.
+
+    Please note the value `only_on_ad_pages` is currently not available for
+    Enterprise customers.
+    """
+
+    cf_robots_variant: Literal["off", "policy_only"]
+    """Specifies the Robots Access Control License variant to use."""
+
+    crawler_protection: Literal["enabled", "disabled"]
+    """Enable rule to punish AI Scrapers and Crawlers via a link maze."""
+
+    enable_js: bool
+    """Use lightweight, invisible JavaScript detections to improve Bot Management.
+
+    [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
+    """
+
+    is_robots_txt_managed: bool
+    """Enable cloudflare managed robots.txt.
+
+    If an existing robots.txt is detected, then managed robots.txt will be prepended
+    to the existing robots.txt.
+    """
+
+    optimize_wordpress: bool
+    """Whether to optimize Super Bot Fight Mode protections for Wordpress."""
+
+    sbfm_definitely_automated: Literal["allow", "block", "managed_challenge"]
+    """Super Bot Fight Mode (SBFM) action to take on definitely automated requests."""
+
+    sbfm_likely_automated: Literal["allow", "block", "managed_challenge"]
+    """Super Bot Fight Mode (SBFM) action to take on likely automated requests."""
+
+    sbfm_static_resource_protection: bool
+    """
+    Super Bot Fight Mode (SBFM) to enable static resource protection. Enable if
+    static resources on your application need bot protection. Note: Static resource
+    protection can also result in legitimate traffic being blocked.
+    """
+
+    sbfm_verified_bots: Literal["allow", "block"]
+    """Super Bot Fight Mode (SBFM) action to take on verified bots requests."""
diff --git a/src/cloudflare/types/botnet_feed/__init__.py b/src/cloudflare/types/botnet_feed/__init__.py
new file mode 100755
index 00000000000..67ecec6eadd
--- /dev/null
+++ b/src/cloudflare/types/botnet_feed/__init__.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .asn_day_report_params import ASNDayReportParams as ASNDayReportParams
+from .asn_day_report_response import ASNDayReportResponse as ASNDayReportResponse
+from .asn_full_report_response import ASNFullReportResponse as ASNFullReportResponse
diff --git a/src/cloudflare/types/botnet_feed/asn_day_report_params.py b/src/cloudflare/types/botnet_feed/asn_day_report_params.py
new file mode 100755
index 00000000000..516f4c6d977
--- /dev/null
+++ b/src/cloudflare/types/botnet_feed/asn_day_report_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["ASNDayReportParams"]
+
+
+class ASNDayReportParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    date: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
diff --git a/src/cloudflare/types/botnet_feed/asn_day_report_response.py b/src/cloudflare/types/botnet_feed/asn_day_report_response.py
new file mode 100755
index 00000000000..0d6c8afd519
--- /dev/null
+++ b/src/cloudflare/types/botnet_feed/asn_day_report_response.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["ASNDayReportResponse"]
+
+
+class ASNDayReportResponse(BaseModel):
+    cidr: Optional[str] = None
+
+    date: Optional[datetime] = None
+
+    offense_count: Optional[int] = None
diff --git a/src/cloudflare/types/botnet_feed/asn_full_report_response.py b/src/cloudflare/types/botnet_feed/asn_full_report_response.py
new file mode 100755
index 00000000000..31055423eea
--- /dev/null
+++ b/src/cloudflare/types/botnet_feed/asn_full_report_response.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["ASNFullReportResponse"]
+
+
+class ASNFullReportResponse(BaseModel):
+    cidr: Optional[str] = None
+
+    date: Optional[datetime] = None
+
+    offense_count: Optional[int] = None
diff --git a/src/cloudflare/types/botnet_feed/configs/__init__.py b/src/cloudflare/types/botnet_feed/configs/__init__.py
new file mode 100755
index 00000000000..1e423fc3790
--- /dev/null
+++ b/src/cloudflare/types/botnet_feed/configs/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .asn_get_response import ASNGetResponse as ASNGetResponse
+from .asn_delete_response import ASNDeleteResponse as ASNDeleteResponse
diff --git a/src/cloudflare/types/botnet_feed/configs/asn_delete_response.py b/src/cloudflare/types/botnet_feed/configs/asn_delete_response.py
new file mode 100755
index 00000000000..2f064ce3233
--- /dev/null
+++ b/src/cloudflare/types/botnet_feed/configs/asn_delete_response.py
@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ...._models import BaseModel
+
+__all__ = ["ASNDeleteResponse"]
+
+
+class ASNDeleteResponse(BaseModel):
+    asn: Optional[int] = None
diff --git a/src/cloudflare/types/botnet_feed/configs/asn_get_response.py b/src/cloudflare/types/botnet_feed/configs/asn_get_response.py
new file mode 100755
index 00000000000..adc84aed79d
--- /dev/null
+++ b/src/cloudflare/types/botnet_feed/configs/asn_get_response.py
@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ...._models import BaseModel
+
+__all__ = ["ASNGetResponse"]
+
+
+class ASNGetResponse(BaseModel):
+    asn: Optional[int] = None
diff --git a/src/cloudflare/types/brand_protection/__init__.py b/src/cloudflare/types/brand_protection/__init__.py
index 3fa7ed724bd..f6f5aa1c0fd 100644
--- a/src/cloudflare/types/brand_protection/__init__.py
+++ b/src/cloudflare/types/brand_protection/__init__.py
@@ -2,10 +2,18 @@
 
 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
+from .match_get_params import MatchGetParams as MatchGetParams
+from .query_bulk_params import QueryBulkParams as QueryBulkParams
+from .logo_create_params import LogoCreateParams as LogoCreateParams
+from .match_get_response import MatchGetResponse as MatchGetResponse
+from .query_create_params import QueryCreateParams as QueryCreateParams
+from .query_delete_params import QueryDeleteParams as QueryDeleteParams
+from .logo_create_response import LogoCreateResponse as LogoCreateResponse
+from .logo_match_get_params import LogoMatchGetParams as LogoMatchGetParams
+from .match_download_params import MatchDownloadParams as MatchDownloadParams
+from .logo_match_get_response import LogoMatchGetResponse as LogoMatchGetResponse
+from .match_download_response import MatchDownloadResponse as MatchDownloadResponse
+from .logo_match_download_params import LogoMatchDownloadParams as LogoMatchDownloadParams
+from .logo_match_download_response import LogoMatchDownloadResponse as LogoMatchDownloadResponse
+from .brand_protection_submit_response import BrandProtectionSubmitResponse as BrandProtectionSubmitResponse
+from .brand_protection_url_info_response import BrandProtectionURLInfoResponse as BrandProtectionURLInfoResponse
diff --git a/src/cloudflare/types/brand_protection/brand_protection_submit_params.py b/src/cloudflare/types/brand_protection/brand_protection_submit_params.py
deleted file mode 100644
index 713cb526c22..00000000000
--- a/src/cloudflare/types/brand_protection/brand_protection_submit_params.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["BrandProtectionSubmitParams"]
-
-
-class BrandProtectionSubmitParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    url: str
-    """URL(s) to filter submissions results by"""
diff --git a/src/cloudflare/types/brand_protection/brand_protection_submit_response.py b/src/cloudflare/types/brand_protection/brand_protection_submit_response.py
new file mode 100644
index 00000000000..3254b97c4d0
--- /dev/null
+++ b/src/cloudflare/types/brand_protection/brand_protection_submit_response.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["BrandProtectionSubmitResponse"]
+
+
+class BrandProtectionSubmitResponse(BaseModel):
+    skipped_urls: Optional[List[Dict[str, object]]] = None
+
+    submitted_urls: Optional[List[Dict[str, object]]] = None
diff --git a/src/cloudflare/types/brand_protection/brand_protection_url_info_params.py b/src/cloudflare/types/brand_protection/brand_protection_url_info_params.py
deleted file mode 100644
index 18b365c32c5..00000000000
--- a/src/cloudflare/types/brand_protection/brand_protection_url_info_params.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["BrandProtectionURLInfoParams", "URLIDParam"]
-
-
-class BrandProtectionURLInfoParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    url: str
-
-    url_id_param: URLIDParam
-
-
-class URLIDParam(TypedDict, total=False):
-    url_id: int
-    """Submission ID(s) to filter submission results by."""
diff --git a/src/cloudflare/types/brand_protection/brand_protection_url_info_response.py b/src/cloudflare/types/brand_protection/brand_protection_url_info_response.py
new file mode 100644
index 00000000000..25dd3de5a58
--- /dev/null
+++ b/src/cloudflare/types/brand_protection/brand_protection_url_info_response.py
@@ -0,0 +1,8 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict
+from typing_extensions import TypeAlias
+
+__all__ = ["BrandProtectionURLInfoResponse"]
+
+BrandProtectionURLInfoResponse: TypeAlias = Dict[str, object]
diff --git a/src/cloudflare/types/brand_protection/info.py b/src/cloudflare/types/brand_protection/info.py
deleted file mode 100644
index ecc27c62f00..00000000000
--- a/src/cloudflare/types/brand_protection/info.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from pydantic import Field as FieldInfo
-
-from ..._models import BaseModel
-from .rule_match import RuleMatch
-from .scan_status import ScanStatus
-from .url_info_model_results import URLInfoModelResults
-
-__all__ = ["Info", "Categorization"]
-
-
-class Categorization(BaseModel):
-    category: Optional[str] = None
-    """Name of the category applied."""
-
-    verification_status: Optional[str] = None
-    """Result of human review for this categorization."""
-
-
-class Info(BaseModel):
-    categorizations: Optional[List[Categorization]] = None
-    """List of categorizations applied to this submission."""
-
-    ai_model_results: Optional[List[URLInfoModelResults]] = FieldInfo(alias="model_results", default=None)
-    """List of model results for completed scans."""
-
-    rule_matches: Optional[List[RuleMatch]] = None
-    """
-    List of signatures that matched against site content found when crawling the
-    URL.
-    """
-
-    scan_status: Optional[ScanStatus] = None
-    """Status of the most recent scan found."""
-
-    screenshot_download_signature: Optional[str] = None
-    """For internal use."""
-
-    screenshot_path: Optional[str] = None
-    """For internal use."""
-
-    url: Optional[str] = None
-    """URL that was submitted."""
diff --git a/src/cloudflare/types/brand_protection/logo_create_params.py b/src/cloudflare/types/brand_protection/logo_create_params.py
new file mode 100644
index 00000000000..2fd40da7f6b
--- /dev/null
+++ b/src/cloudflare/types/brand_protection/logo_create_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ..._types import FileTypes
+
+__all__ = ["LogoCreateParams"]
+
+
+class LogoCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    match_type: str
+
+    tag: str
+
+    threshold: float
+
+    image: FileTypes
diff --git a/src/cloudflare/types/brand_protection/logo_create_response.py b/src/cloudflare/types/brand_protection/logo_create_response.py
new file mode 100644
index 00000000000..d6a6055502f
--- /dev/null
+++ b/src/cloudflare/types/brand_protection/logo_create_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["LogoCreateResponse"]
+
+
+class LogoCreateResponse(BaseModel):
+    id: Optional[int] = None
+
+    tag: Optional[str] = None
+
+    upload_path: Optional[str] = None
diff --git a/src/cloudflare/types/brand_protection/logo_match_download_params.py b/src/cloudflare/types/brand_protection/logo_match_download_params.py
new file mode 100644
index 00000000000..7d69d0c35a3
--- /dev/null
+++ b/src/cloudflare/types/brand_protection/logo_match_download_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["LogoMatchDownloadParams"]
+
+
+class LogoMatchDownloadParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    limit: str
+
+    logo_id: SequenceNotStr[str]
+
+    offset: str
diff --git a/src/cloudflare/types/brand_protection/logo_match_download_response.py b/src/cloudflare/types/brand_protection/logo_match_download_response.py
new file mode 100644
index 00000000000..494aeefcdd5
--- /dev/null
+++ b/src/cloudflare/types/brand_protection/logo_match_download_response.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["LogoMatchDownloadResponse"]
+
+
+class LogoMatchDownloadResponse(BaseModel):
+    matches: Optional[List[Dict[str, object]]] = None
+
+    total: Optional[int] = None
diff --git a/src/cloudflare/types/brand_protection/logo_match_get_params.py b/src/cloudflare/types/brand_protection/logo_match_get_params.py
new file mode 100644
index 00000000000..19bc5dd4f9b
--- /dev/null
+++ b/src/cloudflare/types/brand_protection/logo_match_get_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["LogoMatchGetParams"]
+
+
+class LogoMatchGetParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    limit: str
+
+    logo_id: SequenceNotStr[str]
+
+    offset: str
diff --git a/src/cloudflare/types/brand_protection/logo_match_get_response.py b/src/cloudflare/types/brand_protection/logo_match_get_response.py
new file mode 100644
index 00000000000..b61e431ad09
--- /dev/null
+++ b/src/cloudflare/types/brand_protection/logo_match_get_response.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["LogoMatchGetResponse"]
+
+
+class LogoMatchGetResponse(BaseModel):
+    matches: Optional[List[Dict[str, object]]] = None
+
+    total: Optional[int] = None
diff --git a/src/cloudflare/types/brand_protection/match_download_params.py b/src/cloudflare/types/brand_protection/match_download_params.py
new file mode 100644
index 00000000000..c9c1474e874
--- /dev/null
+++ b/src/cloudflare/types/brand_protection/match_download_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["MatchDownloadParams"]
+
+
+class MatchDownloadParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    id: str
+
+    include_domain_id: bool
+
+    limit: int
+
+    offset: int
diff --git a/src/cloudflare/types/brand_protection/match_download_response.py b/src/cloudflare/types/brand_protection/match_download_response.py
new file mode 100644
index 00000000000..8f19d4deab4
--- /dev/null
+++ b/src/cloudflare/types/brand_protection/match_download_response.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["MatchDownloadResponse"]
+
+
+class MatchDownloadResponse(BaseModel):
+    matches: Optional[List[Dict[str, object]]] = None
+
+    total: Optional[int] = None
diff --git a/src/cloudflare/types/brand_protection/match_get_params.py b/src/cloudflare/types/brand_protection/match_get_params.py
new file mode 100644
index 00000000000..e328903a3ec
--- /dev/null
+++ b/src/cloudflare/types/brand_protection/match_get_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["MatchGetParams"]
+
+
+class MatchGetParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    id: str
+
+    include_domain_id: bool
+
+    limit: int
+
+    offset: int
diff --git a/src/cloudflare/types/brand_protection/match_get_response.py b/src/cloudflare/types/brand_protection/match_get_response.py
new file mode 100644
index 00000000000..bdf7bfdcb6d
--- /dev/null
+++ b/src/cloudflare/types/brand_protection/match_get_response.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["MatchGetResponse"]
+
+
+class MatchGetResponse(BaseModel):
+    matches: Optional[List[Dict[str, object]]] = None
+
+    total: Optional[int] = None
diff --git a/src/cloudflare/types/brand_protection/query_bulk_params.py b/src/cloudflare/types/brand_protection/query_bulk_params.py
new file mode 100644
index 00000000000..6d03a6801e1
--- /dev/null
+++ b/src/cloudflare/types/brand_protection/query_bulk_params.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["QueryBulkParams"]
+
+
+class QueryBulkParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    queries: Iterable[Dict[str, object]]
diff --git a/src/cloudflare/types/brand_protection/query_create_params.py b/src/cloudflare/types/brand_protection/query_create_params.py
new file mode 100644
index 00000000000..543c7bbbc71
--- /dev/null
+++ b/src/cloudflare/types/brand_protection/query_create_params.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["QueryCreateParams"]
+
+
+class QueryCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    id: str
+
+    query_scan: Annotated[bool, PropertyInfo(alias="scan")]
+
+    query_tag: Annotated[str, PropertyInfo(alias="tag")]
+
+    max_time: Annotated[Union[str, datetime, None], PropertyInfo(format="iso8601")]
+
+    min_time: Annotated[Union[str, datetime, None], PropertyInfo(format="iso8601")]
+
+    body_scan: Annotated[bool, PropertyInfo(alias="scan")]
+
+    string_matches: object
+
+    body_tag: Annotated[str, PropertyInfo(alias="tag")]
diff --git a/src/cloudflare/types/brand_protection/query_delete_params.py b/src/cloudflare/types/brand_protection/query_delete_params.py
new file mode 100644
index 00000000000..d4a095e924d
--- /dev/null
+++ b/src/cloudflare/types/brand_protection/query_delete_params.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["QueryDeleteParams"]
+
+
+class QueryDeleteParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    id: str
+
+    scan: bool
+
+    tag: str
diff --git a/src/cloudflare/types/brand_protection/rule_match.py b/src/cloudflare/types/brand_protection/rule_match.py
deleted file mode 100644
index 00452de5674..00000000000
--- a/src/cloudflare/types/brand_protection/rule_match.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ..._models import BaseModel
-
-__all__ = ["RuleMatch"]
-
-
-class RuleMatch(BaseModel):
-    banning: Optional[bool] = None
-    """For internal use."""
-
-    blocking: Optional[bool] = None
-    """For internal use."""
-
-    description: Optional[str] = None
-    """Description of the signature that matched."""
-
-    name: Optional[str] = None
-    """Name of the signature that matched."""
diff --git a/src/cloudflare/types/brand_protection/scan_status.py b/src/cloudflare/types/brand_protection/scan_status.py
deleted file mode 100644
index 711de0b5ed6..00000000000
--- a/src/cloudflare/types/brand_protection/scan_status.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ..._models import BaseModel
-
-__all__ = ["ScanStatus"]
-
-
-class ScanStatus(BaseModel):
-    last_processed: Optional[str] = None
-    """Timestamp of when the submission was processed."""
-
-    scan_complete: Optional[bool] = None
-    """For internal use."""
-
-    status_code: Optional[int] = None
-    """Status code that the crawler received when loading the submitted URL."""
-
-    submission_id: Optional[int] = None
-    """ID of the most recent submission."""
diff --git a/src/cloudflare/types/brand_protection/submit.py b/src/cloudflare/types/brand_protection/submit.py
deleted file mode 100644
index 766580137d5..00000000000
--- a/src/cloudflare/types/brand_protection/submit.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from ..._models import BaseModel
-
-__all__ = ["Submit", "ExcludedURL", "SkippedURL", "SubmittedURL"]
-
-
-class ExcludedURL(BaseModel):
-    url: Optional[str] = None
-    """URL that was excluded."""
-
-
-class SkippedURL(BaseModel):
-    url: Optional[str] = None
-    """URL that was skipped."""
-
-    url_id: Optional[int] = None
-    """ID of the submission of that URL that is currently scanning."""
-
-
-class SubmittedURL(BaseModel):
-    url: Optional[str] = None
-    """URL that was submitted."""
-
-    url_id: Optional[int] = None
-    """ID assigned to this URL submission. Used to retrieve scanning results."""
-
-
-class Submit(BaseModel):
-    excluded_urls: Optional[List[ExcludedURL]] = None
-    """
-    URLs that were excluded from scanning because their domain is in our no-scan
-    list.
-    """
-
-    skipped_urls: Optional[List[SkippedURL]] = None
-    """URLs that were skipped because the same URL is currently being scanned"""
-
-    submitted_urls: Optional[List[SubmittedURL]] = None
-    """URLs that were successfully submitted for scanning."""
diff --git a/src/cloudflare/types/brand_protection/url_info_model_results.py b/src/cloudflare/types/brand_protection/url_info_model_results.py
deleted file mode 100644
index cd2086aba49..00000000000
--- a/src/cloudflare/types/brand_protection/url_info_model_results.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from pydantic import Field as FieldInfo
-
-from ..._models import BaseModel
-
-__all__ = ["URLInfoModelResults"]
-
-
-class URLInfoModelResults(BaseModel):
-    ai_model_name: Optional[str] = FieldInfo(alias="model_name", default=None)
-    """Name of the model."""
-
-    ai_model_score: Optional[float] = FieldInfo(alias="model_score", default=None)
-    """Score output by the model for this submission."""
diff --git a/src/cloudflare/types/browser_rendering/__init__.py b/src/cloudflare/types/browser_rendering/__init__.py
new file mode 100644
index 00000000000..9539438ee5f
--- /dev/null
+++ b/src/cloudflare/types/browser_rendering/__init__.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .pdf_create_params import PDFCreateParams as PDFCreateParams
+from .json_create_params import JsonCreateParams as JsonCreateParams
+from .link_create_params import LinkCreateParams as LinkCreateParams
+from .json_create_response import JsonCreateResponse as JsonCreateResponse
+from .link_create_response import LinkCreateResponse as LinkCreateResponse
+from .scrape_create_params import ScrapeCreateParams as ScrapeCreateParams
+from .content_create_params import ContentCreateParams as ContentCreateParams
+from .markdown_create_params import MarkdownCreateParams as MarkdownCreateParams
+from .scrape_create_response import ScrapeCreateResponse as ScrapeCreateResponse
+from .snapshot_create_params import SnapshotCreateParams as SnapshotCreateParams
+from .content_create_response import ContentCreateResponse as ContentCreateResponse
+from .markdown_create_response import MarkdownCreateResponse as MarkdownCreateResponse
+from .screenshot_create_params import ScreenshotCreateParams as ScreenshotCreateParams
+from .snapshot_create_response import SnapshotCreateResponse as SnapshotCreateResponse
+from .screenshot_create_response import ScreenshotCreateResponse as ScreenshotCreateResponse
diff --git a/src/cloudflare/types/browser_rendering/content_create_params.py b/src/cloudflare/types/browser_rendering/content_create_params.py
new file mode 100644
index 00000000000..ec6f046b661
--- /dev/null
+++ b/src/cloudflare/types/browser_rendering/content_create_params.py
@@ -0,0 +1,497 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Union, Iterable
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = [
+    "ContentCreateParams",
+    "Variant0",
+    "Variant0AddScriptTag",
+    "Variant0AddStyleTag",
+    "Variant0Authenticate",
+    "Variant0Cookie",
+    "Variant0GotoOptions",
+    "Variant0Viewport",
+    "Variant0WaitForSelector",
+    "Variant1",
+    "Variant1AddScriptTag",
+    "Variant1AddStyleTag",
+    "Variant1Authenticate",
+    "Variant1Cookie",
+    "Variant1GotoOptions",
+    "Variant1Viewport",
+    "Variant1WaitForSelector",
+]
+
+
+class Variant0(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    url: Required[str]
+    """URL to navigate to, eg. `https://example.com`."""
+
+    cache_ttl: Annotated[float, PropertyInfo(alias="cacheTTL")]
+    """Cache TTL default is 5s. Set to 0 to disable."""
+
+    action_timeout: Annotated[float, PropertyInfo(alias="actionTimeout")]
+    """
+    The maximum duration allowed for the browser action to complete after the page
+    has loaded (such as taking screenshots, extracting content, or generating PDFs).
+    If this time limit is exceeded, the action stops and returns a timeout error.
+    """
+
+    add_script_tag: Annotated[Iterable[Variant0AddScriptTag], PropertyInfo(alias="addScriptTag")]
+    """Adds a `<script>` tag into the page with the desired URL or content."""
+
+    add_style_tag: Annotated[Iterable[Variant0AddStyleTag], PropertyInfo(alias="addStyleTag")]
+    """
+    Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+    `<style type="text/css">` tag with the content.
+    """
+
+    allow_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="allowRequestPattern")]
+    """Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'."""
+
+    allow_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="allowResourceTypes"),
+    ]
+    """Only allow requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    authenticate: Variant0Authenticate
+    """Provide credentials for HTTP authentication."""
+
+    best_attempt: Annotated[bool, PropertyInfo(alias="bestAttempt")]
+    """Attempt to proceed when 'awaited' events fail or timeout."""
+
+    cookies: Iterable[Variant0Cookie]
+    """Check [options](https://pptr.dev/api/puppeteer.page.setcookie)."""
+
+    emulate_media_type: Annotated[str, PropertyInfo(alias="emulateMediaType")]
+
+    goto_options: Annotated[Variant0GotoOptions, PropertyInfo(alias="gotoOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    reject_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="rejectRequestPattern")]
+    """Block undesired requests that match the provided regex patterns, eg.
+
+    '/^.\\**\\..(css)'.
+    """
+
+    reject_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="rejectResourceTypes"),
+    ]
+    """Block undesired requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    set_extra_http_headers: Annotated[Dict[str, str], PropertyInfo(alias="setExtraHTTPHeaders")]
+
+    set_java_script_enabled: Annotated[bool, PropertyInfo(alias="setJavaScriptEnabled")]
+
+    user_agent: Annotated[str, PropertyInfo(alias="userAgent")]
+
+    viewport: Variant0Viewport
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    wait_for_selector: Annotated[Variant0WaitForSelector, PropertyInfo(alias="waitForSelector")]
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    wait_for_timeout: Annotated[float, PropertyInfo(alias="waitForTimeout")]
+    """Waits for a specified timeout before continuing."""
+
+
+class Variant0AddScriptTag(TypedDict, total=False):
+    id: str
+
+    content: str
+
+    type: str
+
+    url: str
+
+
+class Variant0AddStyleTag(TypedDict, total=False):
+    content: str
+
+    url: str
+
+
+class Variant0Authenticate(TypedDict, total=False):
+    """Provide credentials for HTTP authentication."""
+
+    password: Required[str]
+
+    username: Required[str]
+
+
+class Variant0Cookie(TypedDict, total=False):
+    name: Required[str]
+
+    value: Required[str]
+
+    domain: str
+
+    expires: float
+
+    http_only: Annotated[bool, PropertyInfo(alias="httpOnly")]
+
+    partition_key: Annotated[str, PropertyInfo(alias="partitionKey")]
+
+    path: str
+
+    priority: Literal["Low", "Medium", "High"]
+
+    same_party: Annotated[bool, PropertyInfo(alias="sameParty")]
+
+    same_site: Annotated[Literal["Strict", "Lax", "None"], PropertyInfo(alias="sameSite")]
+
+    secure: bool
+
+    source_port: Annotated[float, PropertyInfo(alias="sourcePort")]
+
+    source_scheme: Annotated[Literal["Unset", "NonSecure", "Secure"], PropertyInfo(alias="sourceScheme")]
+
+    url: str
+
+
+class Variant0GotoOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    referer: str
+
+    referrer_policy: Annotated[str, PropertyInfo(alias="referrerPolicy")]
+
+    timeout: float
+
+    wait_until: Annotated[
+        Union[
+            Literal["load", "domcontentloaded", "networkidle0", "networkidle2"],
+            List[Literal["load", "domcontentloaded", "networkidle0", "networkidle2"]],
+        ],
+        PropertyInfo(alias="waitUntil"),
+    ]
+
+
+class Variant0Viewport(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    height: Required[float]
+
+    width: Required[float]
+
+    device_scale_factor: Annotated[float, PropertyInfo(alias="deviceScaleFactor")]
+
+    has_touch: Annotated[bool, PropertyInfo(alias="hasTouch")]
+
+    is_landscape: Annotated[bool, PropertyInfo(alias="isLandscape")]
+
+    is_mobile: Annotated[bool, PropertyInfo(alias="isMobile")]
+
+
+class Variant0WaitForSelector(TypedDict, total=False):
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    selector: Required[str]
+
+    hidden: Literal[True]
+
+    timeout: float
+
+    visible: Literal[True]
+
+
+class Variant1(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    html: Required[str]
+    """Set the content of the page, eg: `<h1>Hello World!!</h1>`.
+
+    Either `html` or `url` must be set.
+    """
+
+    cache_ttl: Annotated[float, PropertyInfo(alias="cacheTTL")]
+    """Cache TTL default is 5s. Set to 0 to disable."""
+
+    action_timeout: Annotated[float, PropertyInfo(alias="actionTimeout")]
+    """
+    The maximum duration allowed for the browser action to complete after the page
+    has loaded (such as taking screenshots, extracting content, or generating PDFs).
+    If this time limit is exceeded, the action stops and returns a timeout error.
+    """
+
+    add_script_tag: Annotated[Iterable[Variant1AddScriptTag], PropertyInfo(alias="addScriptTag")]
+    """Adds a `<script>` tag into the page with the desired URL or content."""
+
+    add_style_tag: Annotated[Iterable[Variant1AddStyleTag], PropertyInfo(alias="addStyleTag")]
+    """
+    Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+    `<style type="text/css">` tag with the content.
+    """
+
+    allow_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="allowRequestPattern")]
+    """Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'."""
+
+    allow_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="allowResourceTypes"),
+    ]
+    """Only allow requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    authenticate: Variant1Authenticate
+    """Provide credentials for HTTP authentication."""
+
+    best_attempt: Annotated[bool, PropertyInfo(alias="bestAttempt")]
+    """Attempt to proceed when 'awaited' events fail or timeout."""
+
+    cookies: Iterable[Variant1Cookie]
+    """Check [options](https://pptr.dev/api/puppeteer.page.setcookie)."""
+
+    emulate_media_type: Annotated[str, PropertyInfo(alias="emulateMediaType")]
+
+    goto_options: Annotated[Variant1GotoOptions, PropertyInfo(alias="gotoOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    reject_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="rejectRequestPattern")]
+    """Block undesired requests that match the provided regex patterns, eg.
+
+    '/^.\\**\\..(css)'.
+    """
+
+    reject_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="rejectResourceTypes"),
+    ]
+    """Block undesired requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    set_extra_http_headers: Annotated[Dict[str, str], PropertyInfo(alias="setExtraHTTPHeaders")]
+
+    set_java_script_enabled: Annotated[bool, PropertyInfo(alias="setJavaScriptEnabled")]
+
+    user_agent: Annotated[str, PropertyInfo(alias="userAgent")]
+
+    viewport: Variant1Viewport
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    wait_for_selector: Annotated[Variant1WaitForSelector, PropertyInfo(alias="waitForSelector")]
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    wait_for_timeout: Annotated[float, PropertyInfo(alias="waitForTimeout")]
+    """Waits for a specified timeout before continuing."""
+
+
+class Variant1AddScriptTag(TypedDict, total=False):
+    id: str
+
+    content: str
+
+    type: str
+
+    url: str
+
+
+class Variant1AddStyleTag(TypedDict, total=False):
+    content: str
+
+    url: str
+
+
+class Variant1Authenticate(TypedDict, total=False):
+    """Provide credentials for HTTP authentication."""
+
+    password: Required[str]
+
+    username: Required[str]
+
+
+class Variant1Cookie(TypedDict, total=False):
+    name: Required[str]
+
+    value: Required[str]
+
+    domain: str
+
+    expires: float
+
+    http_only: Annotated[bool, PropertyInfo(alias="httpOnly")]
+
+    partition_key: Annotated[str, PropertyInfo(alias="partitionKey")]
+
+    path: str
+
+    priority: Literal["Low", "Medium", "High"]
+
+    same_party: Annotated[bool, PropertyInfo(alias="sameParty")]
+
+    same_site: Annotated[Literal["Strict", "Lax", "None"], PropertyInfo(alias="sameSite")]
+
+    secure: bool
+
+    source_port: Annotated[float, PropertyInfo(alias="sourcePort")]
+
+    source_scheme: Annotated[Literal["Unset", "NonSecure", "Secure"], PropertyInfo(alias="sourceScheme")]
+
+    url: str
+
+
+class Variant1GotoOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    referer: str
+
+    referrer_policy: Annotated[str, PropertyInfo(alias="referrerPolicy")]
+
+    timeout: float
+
+    wait_until: Annotated[
+        Union[
+            Literal["load", "domcontentloaded", "networkidle0", "networkidle2"],
+            List[Literal["load", "domcontentloaded", "networkidle0", "networkidle2"]],
+        ],
+        PropertyInfo(alias="waitUntil"),
+    ]
+
+
+class Variant1Viewport(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    height: Required[float]
+
+    width: Required[float]
+
+    device_scale_factor: Annotated[float, PropertyInfo(alias="deviceScaleFactor")]
+
+    has_touch: Annotated[bool, PropertyInfo(alias="hasTouch")]
+
+    is_landscape: Annotated[bool, PropertyInfo(alias="isLandscape")]
+
+    is_mobile: Annotated[bool, PropertyInfo(alias="isMobile")]
+
+
+class Variant1WaitForSelector(TypedDict, total=False):
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    selector: Required[str]
+
+    hidden: Literal[True]
+
+    timeout: float
+
+    visible: Literal[True]
+
+
+ContentCreateParams: TypeAlias = Union[Variant0, Variant1]
diff --git a/src/cloudflare/types/browser_rendering/content_create_response.py b/src/cloudflare/types/browser_rendering/content_create_response.py
new file mode 100644
index 00000000000..add352f74ee
--- /dev/null
+++ b/src/cloudflare/types/browser_rendering/content_create_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["ContentCreateResponse"]
+
+ContentCreateResponse: TypeAlias = str
diff --git a/src/cloudflare/types/browser_rendering/json_create_params.py b/src/cloudflare/types/browser_rendering/json_create_params.py
new file mode 100644
index 00000000000..891214c3f7c
--- /dev/null
+++ b/src/cloudflare/types/browser_rendering/json_create_params.py
@@ -0,0 +1,567 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Union, Iterable, Optional
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = [
+    "JsonCreateParams",
+    "Variant0",
+    "Variant0AddScriptTag",
+    "Variant0AddStyleTag",
+    "Variant0Authenticate",
+    "Variant0Cookie",
+    "Variant0CustomAI",
+    "Variant0GotoOptions",
+    "Variant0ResponseFormat",
+    "Variant0Viewport",
+    "Variant0WaitForSelector",
+    "Variant1",
+    "Variant1AddScriptTag",
+    "Variant1AddStyleTag",
+    "Variant1Authenticate",
+    "Variant1Cookie",
+    "Variant1CustomAI",
+    "Variant1GotoOptions",
+    "Variant1ResponseFormat",
+    "Variant1Viewport",
+    "Variant1WaitForSelector",
+]
+
+
+class Variant0(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    html: Required[str]
+    """Set the content of the page, eg: `<h1>Hello World!!</h1>`.
+
+    Either `html` or `url` must be set.
+    """
+
+    cache_ttl: Annotated[float, PropertyInfo(alias="cacheTTL")]
+    """Cache TTL default is 5s. Set to 0 to disable."""
+
+    action_timeout: Annotated[float, PropertyInfo(alias="actionTimeout")]
+    """
+    The maximum duration allowed for the browser action to complete after the page
+    has loaded (such as taking screenshots, extracting content, or generating PDFs).
+    If this time limit is exceeded, the action stops and returns a timeout error.
+    """
+
+    add_script_tag: Annotated[Iterable[Variant0AddScriptTag], PropertyInfo(alias="addScriptTag")]
+    """Adds a `<script>` tag into the page with the desired URL or content."""
+
+    add_style_tag: Annotated[Iterable[Variant0AddStyleTag], PropertyInfo(alias="addStyleTag")]
+    """
+    Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+    `<style type="text/css">` tag with the content.
+    """
+
+    allow_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="allowRequestPattern")]
+    """Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'."""
+
+    allow_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="allowResourceTypes"),
+    ]
+    """Only allow requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    authenticate: Variant0Authenticate
+    """Provide credentials for HTTP authentication."""
+
+    best_attempt: Annotated[bool, PropertyInfo(alias="bestAttempt")]
+    """Attempt to proceed when 'awaited' events fail or timeout."""
+
+    cookies: Iterable[Variant0Cookie]
+    """Check [options](https://pptr.dev/api/puppeteer.page.setcookie)."""
+
+    custom_ai: Iterable[Variant0CustomAI]
+    """Optional list of custom AI models to use for the request.
+
+    The models will be tried in the order provided, and in case a model returns an
+    error, the next one will be used as fallback.
+    """
+
+    emulate_media_type: Annotated[str, PropertyInfo(alias="emulateMediaType")]
+
+    goto_options: Annotated[Variant0GotoOptions, PropertyInfo(alias="gotoOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    prompt: str
+
+    reject_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="rejectRequestPattern")]
+    """Block undesired requests that match the provided regex patterns, eg.
+
+    '/^.\\**\\..(css)'.
+    """
+
+    reject_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="rejectResourceTypes"),
+    ]
+    """Block undesired requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    response_format: Variant0ResponseFormat
+
+    set_extra_http_headers: Annotated[Dict[str, str], PropertyInfo(alias="setExtraHTTPHeaders")]
+
+    set_java_script_enabled: Annotated[bool, PropertyInfo(alias="setJavaScriptEnabled")]
+
+    user_agent: Annotated[str, PropertyInfo(alias="userAgent")]
+
+    viewport: Variant0Viewport
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    wait_for_selector: Annotated[Variant0WaitForSelector, PropertyInfo(alias="waitForSelector")]
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    wait_for_timeout: Annotated[float, PropertyInfo(alias="waitForTimeout")]
+    """Waits for a specified timeout before continuing."""
+
+
+class Variant0AddScriptTag(TypedDict, total=False):
+    id: str
+
+    content: str
+
+    type: str
+
+    url: str
+
+
+class Variant0AddStyleTag(TypedDict, total=False):
+    content: str
+
+    url: str
+
+
+class Variant0Authenticate(TypedDict, total=False):
+    """Provide credentials for HTTP authentication."""
+
+    password: Required[str]
+
+    username: Required[str]
+
+
+class Variant0Cookie(TypedDict, total=False):
+    name: Required[str]
+
+    value: Required[str]
+
+    domain: str
+
+    expires: float
+
+    http_only: Annotated[bool, PropertyInfo(alias="httpOnly")]
+
+    partition_key: Annotated[str, PropertyInfo(alias="partitionKey")]
+
+    path: str
+
+    priority: Literal["Low", "Medium", "High"]
+
+    same_party: Annotated[bool, PropertyInfo(alias="sameParty")]
+
+    same_site: Annotated[Literal["Strict", "Lax", "None"], PropertyInfo(alias="sameSite")]
+
+    secure: bool
+
+    source_port: Annotated[float, PropertyInfo(alias="sourcePort")]
+
+    source_scheme: Annotated[Literal["Unset", "NonSecure", "Secure"], PropertyInfo(alias="sourceScheme")]
+
+    url: str
+
+
+class Variant0CustomAI(TypedDict, total=False):
+    authorization: Required[str]
+    """Authorization token for the AI model: `Bearer <token>`."""
+
+    model: Required[str]
+    """AI model to use for the request.
+
+    Must be formed as `<provider>/<model_name>`, e.g.
+    `workers-ai/@cf/meta/llama-3.3-70b-instruct-fp8-fast`
+    """
+
+
+class Variant0GotoOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    referer: str
+
+    referrer_policy: Annotated[str, PropertyInfo(alias="referrerPolicy")]
+
+    timeout: float
+
+    wait_until: Annotated[
+        Union[
+            Literal["load", "domcontentloaded", "networkidle0", "networkidle2"],
+            List[Literal["load", "domcontentloaded", "networkidle0", "networkidle2"]],
+        ],
+        PropertyInfo(alias="waitUntil"),
+    ]
+
+
+class Variant0ResponseFormat(TypedDict, total=False):
+    type: Required[str]
+
+    json_schema: Optional[Dict[str, Union[str, float, bool, SequenceNotStr[str], object]]]
+    """Schema for the response format.
+
+    More information here: https://developers.cloudflare.com/workers-ai/json-mode/
+    """
+
+
+class Variant0Viewport(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    height: Required[float]
+
+    width: Required[float]
+
+    device_scale_factor: Annotated[float, PropertyInfo(alias="deviceScaleFactor")]
+
+    has_touch: Annotated[bool, PropertyInfo(alias="hasTouch")]
+
+    is_landscape: Annotated[bool, PropertyInfo(alias="isLandscape")]
+
+    is_mobile: Annotated[bool, PropertyInfo(alias="isMobile")]
+
+
+class Variant0WaitForSelector(TypedDict, total=False):
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    selector: Required[str]
+
+    hidden: Literal[True]
+
+    timeout: float
+
+    visible: Literal[True]
+
+
+class Variant1(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    url: Required[str]
+    """URL to navigate to, eg. `https://example.com`."""
+
+    cache_ttl: Annotated[float, PropertyInfo(alias="cacheTTL")]
+    """Cache TTL default is 5s. Set to 0 to disable."""
+
+    action_timeout: Annotated[float, PropertyInfo(alias="actionTimeout")]
+    """
+    The maximum duration allowed for the browser action to complete after the page
+    has loaded (such as taking screenshots, extracting content, or generating PDFs).
+    If this time limit is exceeded, the action stops and returns a timeout error.
+    """
+
+    add_script_tag: Annotated[Iterable[Variant1AddScriptTag], PropertyInfo(alias="addScriptTag")]
+    """Adds a `<script>` tag into the page with the desired URL or content."""
+
+    add_style_tag: Annotated[Iterable[Variant1AddStyleTag], PropertyInfo(alias="addStyleTag")]
+    """
+    Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+    `<style type="text/css">` tag with the content.
+    """
+
+    allow_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="allowRequestPattern")]
+    """Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'."""
+
+    allow_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="allowResourceTypes"),
+    ]
+    """Only allow requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    authenticate: Variant1Authenticate
+    """Provide credentials for HTTP authentication."""
+
+    best_attempt: Annotated[bool, PropertyInfo(alias="bestAttempt")]
+    """Attempt to proceed when 'awaited' events fail or timeout."""
+
+    cookies: Iterable[Variant1Cookie]
+    """Check [options](https://pptr.dev/api/puppeteer.page.setcookie)."""
+
+    custom_ai: Iterable[Variant1CustomAI]
+    """Optional list of custom AI models to use for the request.
+
+    The models will be tried in the order provided, and in case a model returns an
+    error, the next one will be used as fallback.
+    """
+
+    emulate_media_type: Annotated[str, PropertyInfo(alias="emulateMediaType")]
+
+    goto_options: Annotated[Variant1GotoOptions, PropertyInfo(alias="gotoOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    prompt: str
+
+    reject_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="rejectRequestPattern")]
+    """Block undesired requests that match the provided regex patterns, eg.
+
+    '/^.\\**\\..(css)'.
+    """
+
+    reject_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="rejectResourceTypes"),
+    ]
+    """Block undesired requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    response_format: Variant1ResponseFormat
+
+    set_extra_http_headers: Annotated[Dict[str, str], PropertyInfo(alias="setExtraHTTPHeaders")]
+
+    set_java_script_enabled: Annotated[bool, PropertyInfo(alias="setJavaScriptEnabled")]
+
+    user_agent: Annotated[str, PropertyInfo(alias="userAgent")]
+
+    viewport: Variant1Viewport
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    wait_for_selector: Annotated[Variant1WaitForSelector, PropertyInfo(alias="waitForSelector")]
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    wait_for_timeout: Annotated[float, PropertyInfo(alias="waitForTimeout")]
+    """Waits for a specified timeout before continuing."""
+
+
+class Variant1AddScriptTag(TypedDict, total=False):
+    id: str
+
+    content: str
+
+    type: str
+
+    url: str
+
+
+class Variant1AddStyleTag(TypedDict, total=False):
+    content: str
+
+    url: str
+
+
+class Variant1Authenticate(TypedDict, total=False):
+    """Provide credentials for HTTP authentication."""
+
+    password: Required[str]
+
+    username: Required[str]
+
+
+class Variant1Cookie(TypedDict, total=False):
+    name: Required[str]
+
+    value: Required[str]
+
+    domain: str
+
+    expires: float
+
+    http_only: Annotated[bool, PropertyInfo(alias="httpOnly")]
+
+    partition_key: Annotated[str, PropertyInfo(alias="partitionKey")]
+
+    path: str
+
+    priority: Literal["Low", "Medium", "High"]
+
+    same_party: Annotated[bool, PropertyInfo(alias="sameParty")]
+
+    same_site: Annotated[Literal["Strict", "Lax", "None"], PropertyInfo(alias="sameSite")]
+
+    secure: bool
+
+    source_port: Annotated[float, PropertyInfo(alias="sourcePort")]
+
+    source_scheme: Annotated[Literal["Unset", "NonSecure", "Secure"], PropertyInfo(alias="sourceScheme")]
+
+    url: str
+
+
+class Variant1CustomAI(TypedDict, total=False):
+    authorization: Required[str]
+    """Authorization token for the AI model: `Bearer <token>`."""
+
+    model: Required[str]
+    """AI model to use for the request.
+
+    Must be formed as `<provider>/<model_name>`, e.g.
+    `workers-ai/@cf/meta/llama-3.3-70b-instruct-fp8-fast`
+    """
+
+
+class Variant1GotoOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    referer: str
+
+    referrer_policy: Annotated[str, PropertyInfo(alias="referrerPolicy")]
+
+    timeout: float
+
+    wait_until: Annotated[
+        Union[
+            Literal["load", "domcontentloaded", "networkidle0", "networkidle2"],
+            List[Literal["load", "domcontentloaded", "networkidle0", "networkidle2"]],
+        ],
+        PropertyInfo(alias="waitUntil"),
+    ]
+
+
+class Variant1ResponseFormat(TypedDict, total=False):
+    type: Required[str]
+
+    json_schema: Optional[Dict[str, Union[str, float, bool, SequenceNotStr[str], object]]]
+    """Schema for the response format.
+
+    More information here: https://developers.cloudflare.com/workers-ai/json-mode/
+    """
+
+
+class Variant1Viewport(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    height: Required[float]
+
+    width: Required[float]
+
+    device_scale_factor: Annotated[float, PropertyInfo(alias="deviceScaleFactor")]
+
+    has_touch: Annotated[bool, PropertyInfo(alias="hasTouch")]
+
+    is_landscape: Annotated[bool, PropertyInfo(alias="isLandscape")]
+
+    is_mobile: Annotated[bool, PropertyInfo(alias="isMobile")]
+
+
+class Variant1WaitForSelector(TypedDict, total=False):
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    selector: Required[str]
+
+    hidden: Literal[True]
+
+    timeout: float
+
+    visible: Literal[True]
+
+
+JsonCreateParams: TypeAlias = Union[Variant0, Variant1]
diff --git a/src/cloudflare/types/browser_rendering/json_create_response.py b/src/cloudflare/types/browser_rendering/json_create_response.py
new file mode 100644
index 00000000000..79dfd26ceaa
--- /dev/null
+++ b/src/cloudflare/types/browser_rendering/json_create_response.py
@@ -0,0 +1,8 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, Optional
+from typing_extensions import TypeAlias
+
+__all__ = ["JsonCreateResponse"]
+
+JsonCreateResponse: TypeAlias = Dict[str, Optional[object]]
diff --git a/src/cloudflare/types/browser_rendering/link_create_params.py b/src/cloudflare/types/browser_rendering/link_create_params.py
new file mode 100644
index 00000000000..e1de712b69c
--- /dev/null
+++ b/src/cloudflare/types/browser_rendering/link_create_params.py
@@ -0,0 +1,505 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Union, Iterable
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = [
+    "LinkCreateParams",
+    "Variant0",
+    "Variant0AddScriptTag",
+    "Variant0AddStyleTag",
+    "Variant0Authenticate",
+    "Variant0Cookie",
+    "Variant0GotoOptions",
+    "Variant0Viewport",
+    "Variant0WaitForSelector",
+    "Variant1",
+    "Variant1AddScriptTag",
+    "Variant1AddStyleTag",
+    "Variant1Authenticate",
+    "Variant1Cookie",
+    "Variant1GotoOptions",
+    "Variant1Viewport",
+    "Variant1WaitForSelector",
+]
+
+
+class Variant0(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    html: Required[str]
+    """Set the content of the page, eg: `<h1>Hello World!!</h1>`.
+
+    Either `html` or `url` must be set.
+    """
+
+    cache_ttl: Annotated[float, PropertyInfo(alias="cacheTTL")]
+    """Cache TTL default is 5s. Set to 0 to disable."""
+
+    action_timeout: Annotated[float, PropertyInfo(alias="actionTimeout")]
+    """
+    The maximum duration allowed for the browser action to complete after the page
+    has loaded (such as taking screenshots, extracting content, or generating PDFs).
+    If this time limit is exceeded, the action stops and returns a timeout error.
+    """
+
+    add_script_tag: Annotated[Iterable[Variant0AddScriptTag], PropertyInfo(alias="addScriptTag")]
+    """Adds a `<script>` tag into the page with the desired URL or content."""
+
+    add_style_tag: Annotated[Iterable[Variant0AddStyleTag], PropertyInfo(alias="addStyleTag")]
+    """
+    Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+    `<style type="text/css">` tag with the content.
+    """
+
+    allow_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="allowRequestPattern")]
+    """Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'."""
+
+    allow_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="allowResourceTypes"),
+    ]
+    """Only allow requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    authenticate: Variant0Authenticate
+    """Provide credentials for HTTP authentication."""
+
+    best_attempt: Annotated[bool, PropertyInfo(alias="bestAttempt")]
+    """Attempt to proceed when 'awaited' events fail or timeout."""
+
+    cookies: Iterable[Variant0Cookie]
+    """Check [options](https://pptr.dev/api/puppeteer.page.setcookie)."""
+
+    emulate_media_type: Annotated[str, PropertyInfo(alias="emulateMediaType")]
+
+    exclude_external_links: Annotated[bool, PropertyInfo(alias="excludeExternalLinks")]
+
+    goto_options: Annotated[Variant0GotoOptions, PropertyInfo(alias="gotoOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    reject_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="rejectRequestPattern")]
+    """Block undesired requests that match the provided regex patterns, eg.
+
+    '/^.\\**\\..(css)'.
+    """
+
+    reject_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="rejectResourceTypes"),
+    ]
+    """Block undesired requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    set_extra_http_headers: Annotated[Dict[str, str], PropertyInfo(alias="setExtraHTTPHeaders")]
+
+    set_java_script_enabled: Annotated[bool, PropertyInfo(alias="setJavaScriptEnabled")]
+
+    user_agent: Annotated[str, PropertyInfo(alias="userAgent")]
+
+    viewport: Variant0Viewport
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    visible_links_only: Annotated[bool, PropertyInfo(alias="visibleLinksOnly")]
+
+    wait_for_selector: Annotated[Variant0WaitForSelector, PropertyInfo(alias="waitForSelector")]
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    wait_for_timeout: Annotated[float, PropertyInfo(alias="waitForTimeout")]
+    """Waits for a specified timeout before continuing."""
+
+
+class Variant0AddScriptTag(TypedDict, total=False):
+    id: str
+
+    content: str
+
+    type: str
+
+    url: str
+
+
+class Variant0AddStyleTag(TypedDict, total=False):
+    content: str
+
+    url: str
+
+
+class Variant0Authenticate(TypedDict, total=False):
+    """Provide credentials for HTTP authentication."""
+
+    password: Required[str]
+
+    username: Required[str]
+
+
+class Variant0Cookie(TypedDict, total=False):
+    name: Required[str]
+
+    value: Required[str]
+
+    domain: str
+
+    expires: float
+
+    http_only: Annotated[bool, PropertyInfo(alias="httpOnly")]
+
+    partition_key: Annotated[str, PropertyInfo(alias="partitionKey")]
+
+    path: str
+
+    priority: Literal["Low", "Medium", "High"]
+
+    same_party: Annotated[bool, PropertyInfo(alias="sameParty")]
+
+    same_site: Annotated[Literal["Strict", "Lax", "None"], PropertyInfo(alias="sameSite")]
+
+    secure: bool
+
+    source_port: Annotated[float, PropertyInfo(alias="sourcePort")]
+
+    source_scheme: Annotated[Literal["Unset", "NonSecure", "Secure"], PropertyInfo(alias="sourceScheme")]
+
+    url: str
+
+
+class Variant0GotoOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    referer: str
+
+    referrer_policy: Annotated[str, PropertyInfo(alias="referrerPolicy")]
+
+    timeout: float
+
+    wait_until: Annotated[
+        Union[
+            Literal["load", "domcontentloaded", "networkidle0", "networkidle2"],
+            List[Literal["load", "domcontentloaded", "networkidle0", "networkidle2"]],
+        ],
+        PropertyInfo(alias="waitUntil"),
+    ]
+
+
+class Variant0Viewport(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    height: Required[float]
+
+    width: Required[float]
+
+    device_scale_factor: Annotated[float, PropertyInfo(alias="deviceScaleFactor")]
+
+    has_touch: Annotated[bool, PropertyInfo(alias="hasTouch")]
+
+    is_landscape: Annotated[bool, PropertyInfo(alias="isLandscape")]
+
+    is_mobile: Annotated[bool, PropertyInfo(alias="isMobile")]
+
+
+class Variant0WaitForSelector(TypedDict, total=False):
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    selector: Required[str]
+
+    hidden: Literal[True]
+
+    timeout: float
+
+    visible: Literal[True]
+
+
+class Variant1(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    url: Required[str]
+    """URL to navigate to, eg. `https://example.com`."""
+
+    cache_ttl: Annotated[float, PropertyInfo(alias="cacheTTL")]
+    """Cache TTL default is 5s. Set to 0 to disable."""
+
+    action_timeout: Annotated[float, PropertyInfo(alias="actionTimeout")]
+    """
+    The maximum duration allowed for the browser action to complete after the page
+    has loaded (such as taking screenshots, extracting content, or generating PDFs).
+    If this time limit is exceeded, the action stops and returns a timeout error.
+    """
+
+    add_script_tag: Annotated[Iterable[Variant1AddScriptTag], PropertyInfo(alias="addScriptTag")]
+    """Adds a `<script>` tag into the page with the desired URL or content."""
+
+    add_style_tag: Annotated[Iterable[Variant1AddStyleTag], PropertyInfo(alias="addStyleTag")]
+    """
+    Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+    `<style type="text/css">` tag with the content.
+    """
+
+    allow_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="allowRequestPattern")]
+    """Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'."""
+
+    allow_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="allowResourceTypes"),
+    ]
+    """Only allow requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    authenticate: Variant1Authenticate
+    """Provide credentials for HTTP authentication."""
+
+    best_attempt: Annotated[bool, PropertyInfo(alias="bestAttempt")]
+    """Attempt to proceed when 'awaited' events fail or timeout."""
+
+    cookies: Iterable[Variant1Cookie]
+    """Check [options](https://pptr.dev/api/puppeteer.page.setcookie)."""
+
+    emulate_media_type: Annotated[str, PropertyInfo(alias="emulateMediaType")]
+
+    exclude_external_links: Annotated[bool, PropertyInfo(alias="excludeExternalLinks")]
+
+    goto_options: Annotated[Variant1GotoOptions, PropertyInfo(alias="gotoOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    reject_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="rejectRequestPattern")]
+    """Block undesired requests that match the provided regex patterns, eg.
+
+    '/^.\\**\\..(css)'.
+    """
+
+    reject_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="rejectResourceTypes"),
+    ]
+    """Block undesired requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    set_extra_http_headers: Annotated[Dict[str, str], PropertyInfo(alias="setExtraHTTPHeaders")]
+
+    set_java_script_enabled: Annotated[bool, PropertyInfo(alias="setJavaScriptEnabled")]
+
+    user_agent: Annotated[str, PropertyInfo(alias="userAgent")]
+
+    viewport: Variant1Viewport
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    visible_links_only: Annotated[bool, PropertyInfo(alias="visibleLinksOnly")]
+
+    wait_for_selector: Annotated[Variant1WaitForSelector, PropertyInfo(alias="waitForSelector")]
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    wait_for_timeout: Annotated[float, PropertyInfo(alias="waitForTimeout")]
+    """Waits for a specified timeout before continuing."""
+
+
+class Variant1AddScriptTag(TypedDict, total=False):
+    id: str
+
+    content: str
+
+    type: str
+
+    url: str
+
+
+class Variant1AddStyleTag(TypedDict, total=False):
+    content: str
+
+    url: str
+
+
+class Variant1Authenticate(TypedDict, total=False):
+    """Provide credentials for HTTP authentication."""
+
+    password: Required[str]
+
+    username: Required[str]
+
+
+class Variant1Cookie(TypedDict, total=False):
+    name: Required[str]
+
+    value: Required[str]
+
+    domain: str
+
+    expires: float
+
+    http_only: Annotated[bool, PropertyInfo(alias="httpOnly")]
+
+    partition_key: Annotated[str, PropertyInfo(alias="partitionKey")]
+
+    path: str
+
+    priority: Literal["Low", "Medium", "High"]
+
+    same_party: Annotated[bool, PropertyInfo(alias="sameParty")]
+
+    same_site: Annotated[Literal["Strict", "Lax", "None"], PropertyInfo(alias="sameSite")]
+
+    secure: bool
+
+    source_port: Annotated[float, PropertyInfo(alias="sourcePort")]
+
+    source_scheme: Annotated[Literal["Unset", "NonSecure", "Secure"], PropertyInfo(alias="sourceScheme")]
+
+    url: str
+
+
+class Variant1GotoOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    referer: str
+
+    referrer_policy: Annotated[str, PropertyInfo(alias="referrerPolicy")]
+
+    timeout: float
+
+    wait_until: Annotated[
+        Union[
+            Literal["load", "domcontentloaded", "networkidle0", "networkidle2"],
+            List[Literal["load", "domcontentloaded", "networkidle0", "networkidle2"]],
+        ],
+        PropertyInfo(alias="waitUntil"),
+    ]
+
+
+class Variant1Viewport(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    height: Required[float]
+
+    width: Required[float]
+
+    device_scale_factor: Annotated[float, PropertyInfo(alias="deviceScaleFactor")]
+
+    has_touch: Annotated[bool, PropertyInfo(alias="hasTouch")]
+
+    is_landscape: Annotated[bool, PropertyInfo(alias="isLandscape")]
+
+    is_mobile: Annotated[bool, PropertyInfo(alias="isMobile")]
+
+
+class Variant1WaitForSelector(TypedDict, total=False):
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    selector: Required[str]
+
+    hidden: Literal[True]
+
+    timeout: float
+
+    visible: Literal[True]
+
+
+LinkCreateParams: TypeAlias = Union[Variant0, Variant1]
diff --git a/src/cloudflare/types/browser_rendering/link_create_response.py b/src/cloudflare/types/browser_rendering/link_create_response.py
new file mode 100644
index 00000000000..ff284440bbb
--- /dev/null
+++ b/src/cloudflare/types/browser_rendering/link_create_response.py
@@ -0,0 +1,8 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from typing_extensions import TypeAlias
+
+__all__ = ["LinkCreateResponse"]
+
+LinkCreateResponse: TypeAlias = List[str]
diff --git a/src/cloudflare/types/browser_rendering/markdown_create_params.py b/src/cloudflare/types/browser_rendering/markdown_create_params.py
new file mode 100644
index 00000000000..8902292c02a
--- /dev/null
+++ b/src/cloudflare/types/browser_rendering/markdown_create_params.py
@@ -0,0 +1,497 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Union, Iterable
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = [
+    "MarkdownCreateParams",
+    "Variant0",
+    "Variant0AddScriptTag",
+    "Variant0AddStyleTag",
+    "Variant0Authenticate",
+    "Variant0Cookie",
+    "Variant0GotoOptions",
+    "Variant0Viewport",
+    "Variant0WaitForSelector",
+    "Variant1",
+    "Variant1AddScriptTag",
+    "Variant1AddStyleTag",
+    "Variant1Authenticate",
+    "Variant1Cookie",
+    "Variant1GotoOptions",
+    "Variant1Viewport",
+    "Variant1WaitForSelector",
+]
+
+
+class Variant0(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    url: Required[str]
+    """URL to navigate to, eg. `https://example.com`."""
+
+    cache_ttl: Annotated[float, PropertyInfo(alias="cacheTTL")]
+    """Cache TTL default is 5s. Set to 0 to disable."""
+
+    action_timeout: Annotated[float, PropertyInfo(alias="actionTimeout")]
+    """
+    The maximum duration allowed for the browser action to complete after the page
+    has loaded (such as taking screenshots, extracting content, or generating PDFs).
+    If this time limit is exceeded, the action stops and returns a timeout error.
+    """
+
+    add_script_tag: Annotated[Iterable[Variant0AddScriptTag], PropertyInfo(alias="addScriptTag")]
+    """Adds a `<script>` tag into the page with the desired URL or content."""
+
+    add_style_tag: Annotated[Iterable[Variant0AddStyleTag], PropertyInfo(alias="addStyleTag")]
+    """
+    Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+    `<style type="text/css">` tag with the content.
+    """
+
+    allow_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="allowRequestPattern")]
+    """Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'."""
+
+    allow_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="allowResourceTypes"),
+    ]
+    """Only allow requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    authenticate: Variant0Authenticate
+    """Provide credentials for HTTP authentication."""
+
+    best_attempt: Annotated[bool, PropertyInfo(alias="bestAttempt")]
+    """Attempt to proceed when 'awaited' events fail or timeout."""
+
+    cookies: Iterable[Variant0Cookie]
+    """Check [options](https://pptr.dev/api/puppeteer.page.setcookie)."""
+
+    emulate_media_type: Annotated[str, PropertyInfo(alias="emulateMediaType")]
+
+    goto_options: Annotated[Variant0GotoOptions, PropertyInfo(alias="gotoOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    reject_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="rejectRequestPattern")]
+    """Block undesired requests that match the provided regex patterns, eg.
+
+    '/^.\\**\\..(css)'.
+    """
+
+    reject_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="rejectResourceTypes"),
+    ]
+    """Block undesired requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    set_extra_http_headers: Annotated[Dict[str, str], PropertyInfo(alias="setExtraHTTPHeaders")]
+
+    set_java_script_enabled: Annotated[bool, PropertyInfo(alias="setJavaScriptEnabled")]
+
+    user_agent: Annotated[str, PropertyInfo(alias="userAgent")]
+
+    viewport: Variant0Viewport
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    wait_for_selector: Annotated[Variant0WaitForSelector, PropertyInfo(alias="waitForSelector")]
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    wait_for_timeout: Annotated[float, PropertyInfo(alias="waitForTimeout")]
+    """Waits for a specified timeout before continuing."""
+
+
+class Variant0AddScriptTag(TypedDict, total=False):
+    id: str
+
+    content: str
+
+    type: str
+
+    url: str
+
+
+class Variant0AddStyleTag(TypedDict, total=False):
+    content: str
+
+    url: str
+
+
+class Variant0Authenticate(TypedDict, total=False):
+    """Provide credentials for HTTP authentication."""
+
+    password: Required[str]
+
+    username: Required[str]
+
+
+class Variant0Cookie(TypedDict, total=False):
+    name: Required[str]
+
+    value: Required[str]
+
+    domain: str
+
+    expires: float
+
+    http_only: Annotated[bool, PropertyInfo(alias="httpOnly")]
+
+    partition_key: Annotated[str, PropertyInfo(alias="partitionKey")]
+
+    path: str
+
+    priority: Literal["Low", "Medium", "High"]
+
+    same_party: Annotated[bool, PropertyInfo(alias="sameParty")]
+
+    same_site: Annotated[Literal["Strict", "Lax", "None"], PropertyInfo(alias="sameSite")]
+
+    secure: bool
+
+    source_port: Annotated[float, PropertyInfo(alias="sourcePort")]
+
+    source_scheme: Annotated[Literal["Unset", "NonSecure", "Secure"], PropertyInfo(alias="sourceScheme")]
+
+    url: str
+
+
+class Variant0GotoOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    referer: str
+
+    referrer_policy: Annotated[str, PropertyInfo(alias="referrerPolicy")]
+
+    timeout: float
+
+    wait_until: Annotated[
+        Union[
+            Literal["load", "domcontentloaded", "networkidle0", "networkidle2"],
+            List[Literal["load", "domcontentloaded", "networkidle0", "networkidle2"]],
+        ],
+        PropertyInfo(alias="waitUntil"),
+    ]
+
+
+class Variant0Viewport(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    height: Required[float]
+
+    width: Required[float]
+
+    device_scale_factor: Annotated[float, PropertyInfo(alias="deviceScaleFactor")]
+
+    has_touch: Annotated[bool, PropertyInfo(alias="hasTouch")]
+
+    is_landscape: Annotated[bool, PropertyInfo(alias="isLandscape")]
+
+    is_mobile: Annotated[bool, PropertyInfo(alias="isMobile")]
+
+
+class Variant0WaitForSelector(TypedDict, total=False):
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    selector: Required[str]
+
+    hidden: Literal[True]
+
+    timeout: float
+
+    visible: Literal[True]
+
+
+class Variant1(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    html: Required[str]
+    """Set the content of the page, eg: `<h1>Hello World!!</h1>`.
+
+    Either `html` or `url` must be set.
+    """
+
+    cache_ttl: Annotated[float, PropertyInfo(alias="cacheTTL")]
+    """Cache TTL default is 5s. Set to 0 to disable."""
+
+    action_timeout: Annotated[float, PropertyInfo(alias="actionTimeout")]
+    """
+    The maximum duration allowed for the browser action to complete after the page
+    has loaded (such as taking screenshots, extracting content, or generating PDFs).
+    If this time limit is exceeded, the action stops and returns a timeout error.
+    """
+
+    add_script_tag: Annotated[Iterable[Variant1AddScriptTag], PropertyInfo(alias="addScriptTag")]
+    """Adds a `<script>` tag into the page with the desired URL or content."""
+
+    add_style_tag: Annotated[Iterable[Variant1AddStyleTag], PropertyInfo(alias="addStyleTag")]
+    """
+    Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+    `<style type="text/css">` tag with the content.
+    """
+
+    allow_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="allowRequestPattern")]
+    """Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'."""
+
+    allow_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="allowResourceTypes"),
+    ]
+    """Only allow requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    authenticate: Variant1Authenticate
+    """Provide credentials for HTTP authentication."""
+
+    best_attempt: Annotated[bool, PropertyInfo(alias="bestAttempt")]
+    """Attempt to proceed when 'awaited' events fail or timeout."""
+
+    cookies: Iterable[Variant1Cookie]
+    """Check [options](https://pptr.dev/api/puppeteer.page.setcookie)."""
+
+    emulate_media_type: Annotated[str, PropertyInfo(alias="emulateMediaType")]
+
+    goto_options: Annotated[Variant1GotoOptions, PropertyInfo(alias="gotoOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    reject_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="rejectRequestPattern")]
+    """Block undesired requests that match the provided regex patterns, eg.
+
+    '/^.\\**\\..(css)'.
+    """
+
+    reject_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="rejectResourceTypes"),
+    ]
+    """Block undesired requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    set_extra_http_headers: Annotated[Dict[str, str], PropertyInfo(alias="setExtraHTTPHeaders")]
+
+    set_java_script_enabled: Annotated[bool, PropertyInfo(alias="setJavaScriptEnabled")]
+
+    user_agent: Annotated[str, PropertyInfo(alias="userAgent")]
+
+    viewport: Variant1Viewport
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    wait_for_selector: Annotated[Variant1WaitForSelector, PropertyInfo(alias="waitForSelector")]
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    wait_for_timeout: Annotated[float, PropertyInfo(alias="waitForTimeout")]
+    """Waits for a specified timeout before continuing."""
+
+
+class Variant1AddScriptTag(TypedDict, total=False):
+    id: str
+
+    content: str
+
+    type: str
+
+    url: str
+
+
+class Variant1AddStyleTag(TypedDict, total=False):
+    content: str
+
+    url: str
+
+
+class Variant1Authenticate(TypedDict, total=False):
+    """Provide credentials for HTTP authentication."""
+
+    password: Required[str]
+
+    username: Required[str]
+
+
+class Variant1Cookie(TypedDict, total=False):
+    name: Required[str]
+
+    value: Required[str]
+
+    domain: str
+
+    expires: float
+
+    http_only: Annotated[bool, PropertyInfo(alias="httpOnly")]
+
+    partition_key: Annotated[str, PropertyInfo(alias="partitionKey")]
+
+    path: str
+
+    priority: Literal["Low", "Medium", "High"]
+
+    same_party: Annotated[bool, PropertyInfo(alias="sameParty")]
+
+    same_site: Annotated[Literal["Strict", "Lax", "None"], PropertyInfo(alias="sameSite")]
+
+    secure: bool
+
+    source_port: Annotated[float, PropertyInfo(alias="sourcePort")]
+
+    source_scheme: Annotated[Literal["Unset", "NonSecure", "Secure"], PropertyInfo(alias="sourceScheme")]
+
+    url: str
+
+
+class Variant1GotoOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    referer: str
+
+    referrer_policy: Annotated[str, PropertyInfo(alias="referrerPolicy")]
+
+    timeout: float
+
+    wait_until: Annotated[
+        Union[
+            Literal["load", "domcontentloaded", "networkidle0", "networkidle2"],
+            List[Literal["load", "domcontentloaded", "networkidle0", "networkidle2"]],
+        ],
+        PropertyInfo(alias="waitUntil"),
+    ]
+
+
+class Variant1Viewport(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    height: Required[float]
+
+    width: Required[float]
+
+    device_scale_factor: Annotated[float, PropertyInfo(alias="deviceScaleFactor")]
+
+    has_touch: Annotated[bool, PropertyInfo(alias="hasTouch")]
+
+    is_landscape: Annotated[bool, PropertyInfo(alias="isLandscape")]
+
+    is_mobile: Annotated[bool, PropertyInfo(alias="isMobile")]
+
+
+class Variant1WaitForSelector(TypedDict, total=False):
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    selector: Required[str]
+
+    hidden: Literal[True]
+
+    timeout: float
+
+    visible: Literal[True]
+
+
+MarkdownCreateParams: TypeAlias = Union[Variant0, Variant1]
diff --git a/src/cloudflare/types/browser_rendering/markdown_create_response.py b/src/cloudflare/types/browser_rendering/markdown_create_response.py
new file mode 100644
index 00000000000..a416ee052b5
--- /dev/null
+++ b/src/cloudflare/types/browser_rendering/markdown_create_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["MarkdownCreateResponse"]
+
+MarkdownCreateResponse: TypeAlias = str
diff --git a/src/cloudflare/types/browser_rendering/pdf_create_params.py b/src/cloudflare/types/browser_rendering/pdf_create_params.py
new file mode 100644
index 00000000000..1b0698c02b5
--- /dev/null
+++ b/src/cloudflare/types/browser_rendering/pdf_create_params.py
@@ -0,0 +1,635 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Union, Iterable
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = [
+    "PDFCreateParams",
+    "Variant0",
+    "Variant0AddScriptTag",
+    "Variant0AddStyleTag",
+    "Variant0Authenticate",
+    "Variant0Cookie",
+    "Variant0GotoOptions",
+    "Variant0PDFOptions",
+    "Variant0PDFOptionsMargin",
+    "Variant0Viewport",
+    "Variant0WaitForSelector",
+    "Variant1",
+    "Variant1AddScriptTag",
+    "Variant1AddStyleTag",
+    "Variant1Authenticate",
+    "Variant1Cookie",
+    "Variant1GotoOptions",
+    "Variant1PDFOptions",
+    "Variant1PDFOptionsMargin",
+    "Variant1Viewport",
+    "Variant1WaitForSelector",
+]
+
+
+class Variant0(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    html: Required[str]
+    """Set the content of the page, eg: `<h1>Hello World!!</h1>`.
+
+    Either `html` or `url` must be set.
+    """
+
+    cache_ttl: Annotated[float, PropertyInfo(alias="cacheTTL")]
+    """Cache TTL default is 5s. Set to 0 to disable."""
+
+    action_timeout: Annotated[float, PropertyInfo(alias="actionTimeout")]
+    """
+    The maximum duration allowed for the browser action to complete after the page
+    has loaded (such as taking screenshots, extracting content, or generating PDFs).
+    If this time limit is exceeded, the action stops and returns a timeout error.
+    """
+
+    add_script_tag: Annotated[Iterable[Variant0AddScriptTag], PropertyInfo(alias="addScriptTag")]
+    """Adds a `<script>` tag into the page with the desired URL or content."""
+
+    add_style_tag: Annotated[Iterable[Variant0AddStyleTag], PropertyInfo(alias="addStyleTag")]
+    """
+    Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+    `<style type="text/css">` tag with the content.
+    """
+
+    allow_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="allowRequestPattern")]
+    """Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'."""
+
+    allow_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="allowResourceTypes"),
+    ]
+    """Only allow requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    authenticate: Variant0Authenticate
+    """Provide credentials for HTTP authentication."""
+
+    best_attempt: Annotated[bool, PropertyInfo(alias="bestAttempt")]
+    """Attempt to proceed when 'awaited' events fail or timeout."""
+
+    cookies: Iterable[Variant0Cookie]
+    """Check [options](https://pptr.dev/api/puppeteer.page.setcookie)."""
+
+    emulate_media_type: Annotated[str, PropertyInfo(alias="emulateMediaType")]
+
+    goto_options: Annotated[Variant0GotoOptions, PropertyInfo(alias="gotoOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    pdf_options: Annotated[Variant0PDFOptions, PropertyInfo(alias="pdfOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.pdfoptions)."""
+
+    reject_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="rejectRequestPattern")]
+    """Block undesired requests that match the provided regex patterns, eg.
+
+    '/^.\\**\\..(css)'.
+    """
+
+    reject_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="rejectResourceTypes"),
+    ]
+    """Block undesired requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    set_extra_http_headers: Annotated[Dict[str, str], PropertyInfo(alias="setExtraHTTPHeaders")]
+
+    set_java_script_enabled: Annotated[bool, PropertyInfo(alias="setJavaScriptEnabled")]
+
+    user_agent: Annotated[str, PropertyInfo(alias="userAgent")]
+
+    viewport: Variant0Viewport
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    wait_for_selector: Annotated[Variant0WaitForSelector, PropertyInfo(alias="waitForSelector")]
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    wait_for_timeout: Annotated[float, PropertyInfo(alias="waitForTimeout")]
+    """Waits for a specified timeout before continuing."""
+
+
+class Variant0AddScriptTag(TypedDict, total=False):
+    id: str
+
+    content: str
+
+    type: str
+
+    url: str
+
+
+class Variant0AddStyleTag(TypedDict, total=False):
+    content: str
+
+    url: str
+
+
+class Variant0Authenticate(TypedDict, total=False):
+    """Provide credentials for HTTP authentication."""
+
+    password: Required[str]
+
+    username: Required[str]
+
+
+class Variant0Cookie(TypedDict, total=False):
+    name: Required[str]
+
+    value: Required[str]
+
+    domain: str
+
+    expires: float
+
+    http_only: Annotated[bool, PropertyInfo(alias="httpOnly")]
+
+    partition_key: Annotated[str, PropertyInfo(alias="partitionKey")]
+
+    path: str
+
+    priority: Literal["Low", "Medium", "High"]
+
+    same_party: Annotated[bool, PropertyInfo(alias="sameParty")]
+
+    same_site: Annotated[Literal["Strict", "Lax", "None"], PropertyInfo(alias="sameSite")]
+
+    secure: bool
+
+    source_port: Annotated[float, PropertyInfo(alias="sourcePort")]
+
+    source_scheme: Annotated[Literal["Unset", "NonSecure", "Secure"], PropertyInfo(alias="sourceScheme")]
+
+    url: str
+
+
+class Variant0GotoOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    referer: str
+
+    referrer_policy: Annotated[str, PropertyInfo(alias="referrerPolicy")]
+
+    timeout: float
+
+    wait_until: Annotated[
+        Union[
+            Literal["load", "domcontentloaded", "networkidle0", "networkidle2"],
+            List[Literal["load", "domcontentloaded", "networkidle0", "networkidle2"]],
+        ],
+        PropertyInfo(alias="waitUntil"),
+    ]
+
+
+class Variant0PDFOptionsMargin(TypedDict, total=False):
+    """Set the PDF margins. Useful when setting header and footer."""
+
+    bottom: Union[str, float]
+
+    left: Union[str, float]
+
+    right: Union[str, float]
+
+    top: Union[str, float]
+
+
+class Variant0PDFOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.pdfoptions)."""
+
+    display_header_footer: Annotated[bool, PropertyInfo(alias="displayHeaderFooter")]
+    """Whether to show the header and footer."""
+
+    footer_template: Annotated[str, PropertyInfo(alias="footerTemplate")]
+    """HTML template for the print footer."""
+
+    format: Literal["letter", "legal", "tabloid", "ledger", "a0", "a1", "a2", "a3", "a4", "a5", "a6"]
+    """Paper format. Takes priority over width and height if set."""
+
+    header_template: Annotated[str, PropertyInfo(alias="headerTemplate")]
+    """HTML template for the print header."""
+
+    height: Union[str, float]
+    """Sets the height of paper. Can be a number or string with unit."""
+
+    landscape: bool
+    """Whether to print in landscape orientation."""
+
+    margin: Variant0PDFOptionsMargin
+    """Set the PDF margins. Useful when setting header and footer."""
+
+    omit_background: Annotated[bool, PropertyInfo(alias="omitBackground")]
+    """Hides default white background and allows generating pdfs with transparency."""
+
+    outline: bool
+    """Generate document outline."""
+
+    page_ranges: Annotated[str, PropertyInfo(alias="pageRanges")]
+    """Paper ranges to print, e.g. '1-5, 8, 11-13'."""
+
+    prefer_css_page_size: Annotated[bool, PropertyInfo(alias="preferCSSPageSize")]
+    """Give CSS @page size priority over other size declarations."""
+
+    print_background: Annotated[bool, PropertyInfo(alias="printBackground")]
+    """Set to true to print background graphics."""
+
+    scale: float
+    """Scales the rendering of the web page. Amount must be between 0.1 and 2."""
+
+    tagged: bool
+    """Generate tagged (accessible) PDF."""
+
+    timeout: float
+    """Timeout in milliseconds."""
+
+    width: Union[str, float]
+    """Sets the width of paper. Can be a number or string with unit."""
+
+
+class Variant0Viewport(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    height: Required[float]
+
+    width: Required[float]
+
+    device_scale_factor: Annotated[float, PropertyInfo(alias="deviceScaleFactor")]
+
+    has_touch: Annotated[bool, PropertyInfo(alias="hasTouch")]
+
+    is_landscape: Annotated[bool, PropertyInfo(alias="isLandscape")]
+
+    is_mobile: Annotated[bool, PropertyInfo(alias="isMobile")]
+
+
+class Variant0WaitForSelector(TypedDict, total=False):
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    selector: Required[str]
+
+    hidden: Literal[True]
+
+    timeout: float
+
+    visible: Literal[True]
+
+
+class Variant1(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    url: Required[str]
+    """URL to navigate to, eg. `https://example.com`."""
+
+    cache_ttl: Annotated[float, PropertyInfo(alias="cacheTTL")]
+    """Cache TTL default is 5s. Set to 0 to disable."""
+
+    action_timeout: Annotated[float, PropertyInfo(alias="actionTimeout")]
+    """
+    The maximum duration allowed for the browser action to complete after the page
+    has loaded (such as taking screenshots, extracting content, or generating PDFs).
+    If this time limit is exceeded, the action stops and returns a timeout error.
+    """
+
+    add_script_tag: Annotated[Iterable[Variant1AddScriptTag], PropertyInfo(alias="addScriptTag")]
+    """Adds a `<script>` tag into the page with the desired URL or content."""
+
+    add_style_tag: Annotated[Iterable[Variant1AddStyleTag], PropertyInfo(alias="addStyleTag")]
+    """
+    Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+    `<style type="text/css">` tag with the content.
+    """
+
+    allow_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="allowRequestPattern")]
+    """Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'."""
+
+    allow_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="allowResourceTypes"),
+    ]
+    """Only allow requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    authenticate: Variant1Authenticate
+    """Provide credentials for HTTP authentication."""
+
+    best_attempt: Annotated[bool, PropertyInfo(alias="bestAttempt")]
+    """Attempt to proceed when 'awaited' events fail or timeout."""
+
+    cookies: Iterable[Variant1Cookie]
+    """Check [options](https://pptr.dev/api/puppeteer.page.setcookie)."""
+
+    emulate_media_type: Annotated[str, PropertyInfo(alias="emulateMediaType")]
+
+    goto_options: Annotated[Variant1GotoOptions, PropertyInfo(alias="gotoOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    pdf_options: Annotated[Variant1PDFOptions, PropertyInfo(alias="pdfOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.pdfoptions)."""
+
+    reject_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="rejectRequestPattern")]
+    """Block undesired requests that match the provided regex patterns, eg.
+
+    '/^.\\**\\..(css)'.
+    """
+
+    reject_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="rejectResourceTypes"),
+    ]
+    """Block undesired requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    set_extra_http_headers: Annotated[Dict[str, str], PropertyInfo(alias="setExtraHTTPHeaders")]
+
+    set_java_script_enabled: Annotated[bool, PropertyInfo(alias="setJavaScriptEnabled")]
+
+    user_agent: Annotated[str, PropertyInfo(alias="userAgent")]
+
+    viewport: Variant1Viewport
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    wait_for_selector: Annotated[Variant1WaitForSelector, PropertyInfo(alias="waitForSelector")]
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    wait_for_timeout: Annotated[float, PropertyInfo(alias="waitForTimeout")]
+    """Waits for a specified timeout before continuing."""
+
+
+class Variant1AddScriptTag(TypedDict, total=False):
+    id: str
+
+    content: str
+
+    type: str
+
+    url: str
+
+
+class Variant1AddStyleTag(TypedDict, total=False):
+    content: str
+
+    url: str
+
+
+class Variant1Authenticate(TypedDict, total=False):
+    """Provide credentials for HTTP authentication."""
+
+    password: Required[str]
+
+    username: Required[str]
+
+
+class Variant1Cookie(TypedDict, total=False):
+    name: Required[str]
+
+    value: Required[str]
+
+    domain: str
+
+    expires: float
+
+    http_only: Annotated[bool, PropertyInfo(alias="httpOnly")]
+
+    partition_key: Annotated[str, PropertyInfo(alias="partitionKey")]
+
+    path: str
+
+    priority: Literal["Low", "Medium", "High"]
+
+    same_party: Annotated[bool, PropertyInfo(alias="sameParty")]
+
+    same_site: Annotated[Literal["Strict", "Lax", "None"], PropertyInfo(alias="sameSite")]
+
+    secure: bool
+
+    source_port: Annotated[float, PropertyInfo(alias="sourcePort")]
+
+    source_scheme: Annotated[Literal["Unset", "NonSecure", "Secure"], PropertyInfo(alias="sourceScheme")]
+
+    url: str
+
+
+class Variant1GotoOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    referer: str
+
+    referrer_policy: Annotated[str, PropertyInfo(alias="referrerPolicy")]
+
+    timeout: float
+
+    wait_until: Annotated[
+        Union[
+            Literal["load", "domcontentloaded", "networkidle0", "networkidle2"],
+            List[Literal["load", "domcontentloaded", "networkidle0", "networkidle2"]],
+        ],
+        PropertyInfo(alias="waitUntil"),
+    ]
+
+
+class Variant1PDFOptionsMargin(TypedDict, total=False):
+    """Set the PDF margins. Useful when setting header and footer."""
+
+    bottom: Union[str, float]
+
+    left: Union[str, float]
+
+    right: Union[str, float]
+
+    top: Union[str, float]
+
+
+class Variant1PDFOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.pdfoptions)."""
+
+    display_header_footer: Annotated[bool, PropertyInfo(alias="displayHeaderFooter")]
+    """Whether to show the header and footer."""
+
+    footer_template: Annotated[str, PropertyInfo(alias="footerTemplate")]
+    """HTML template for the print footer."""
+
+    format: Literal["letter", "legal", "tabloid", "ledger", "a0", "a1", "a2", "a3", "a4", "a5", "a6"]
+    """Paper format. Takes priority over width and height if set."""
+
+    header_template: Annotated[str, PropertyInfo(alias="headerTemplate")]
+    """HTML template for the print header."""
+
+    height: Union[str, float]
+    """Sets the height of paper. Can be a number or string with unit."""
+
+    landscape: bool
+    """Whether to print in landscape orientation."""
+
+    margin: Variant1PDFOptionsMargin
+    """Set the PDF margins. Useful when setting header and footer."""
+
+    omit_background: Annotated[bool, PropertyInfo(alias="omitBackground")]
+    """Hides default white background and allows generating pdfs with transparency."""
+
+    outline: bool
+    """Generate document outline."""
+
+    page_ranges: Annotated[str, PropertyInfo(alias="pageRanges")]
+    """Paper ranges to print, e.g. '1-5, 8, 11-13'."""
+
+    prefer_css_page_size: Annotated[bool, PropertyInfo(alias="preferCSSPageSize")]
+    """Give CSS @page size priority over other size declarations."""
+
+    print_background: Annotated[bool, PropertyInfo(alias="printBackground")]
+    """Set to true to print background graphics."""
+
+    scale: float
+    """Scales the rendering of the web page. Amount must be between 0.1 and 2."""
+
+    tagged: bool
+    """Generate tagged (accessible) PDF."""
+
+    timeout: float
+    """Timeout in milliseconds."""
+
+    width: Union[str, float]
+    """Sets the width of paper. Can be a number or string with unit."""
+
+
+class Variant1Viewport(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    height: Required[float]
+
+    width: Required[float]
+
+    device_scale_factor: Annotated[float, PropertyInfo(alias="deviceScaleFactor")]
+
+    has_touch: Annotated[bool, PropertyInfo(alias="hasTouch")]
+
+    is_landscape: Annotated[bool, PropertyInfo(alias="isLandscape")]
+
+    is_mobile: Annotated[bool, PropertyInfo(alias="isMobile")]
+
+
+class Variant1WaitForSelector(TypedDict, total=False):
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    selector: Required[str]
+
+    hidden: Literal[True]
+
+    timeout: float
+
+    visible: Literal[True]
+
+
+PDFCreateParams: TypeAlias = Union[Variant0, Variant1]
diff --git a/src/cloudflare/types/browser_rendering/scrape_create_params.py b/src/cloudflare/types/browser_rendering/scrape_create_params.py
new file mode 100644
index 00000000000..169792b7d37
--- /dev/null
+++ b/src/cloudflare/types/browser_rendering/scrape_create_params.py
@@ -0,0 +1,511 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Union, Iterable
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = [
+    "ScrapeCreateParams",
+    "Variant0",
+    "Variant0Element",
+    "Variant0AddScriptTag",
+    "Variant0AddStyleTag",
+    "Variant0Authenticate",
+    "Variant0Cookie",
+    "Variant0GotoOptions",
+    "Variant0Viewport",
+    "Variant0WaitForSelector",
+    "Variant1",
+    "Variant1Element",
+    "Variant1AddScriptTag",
+    "Variant1AddStyleTag",
+    "Variant1Authenticate",
+    "Variant1Cookie",
+    "Variant1GotoOptions",
+    "Variant1Viewport",
+    "Variant1WaitForSelector",
+]
+
+
+class Variant0(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    elements: Required[Iterable[Variant0Element]]
+
+    html: Required[str]
+    """Set the content of the page, eg: `<h1>Hello World!!</h1>`.
+
+    Either `html` or `url` must be set.
+    """
+
+    cache_ttl: Annotated[float, PropertyInfo(alias="cacheTTL")]
+    """Cache TTL default is 5s. Set to 0 to disable."""
+
+    action_timeout: Annotated[float, PropertyInfo(alias="actionTimeout")]
+    """
+    The maximum duration allowed for the browser action to complete after the page
+    has loaded (such as taking screenshots, extracting content, or generating PDFs).
+    If this time limit is exceeded, the action stops and returns a timeout error.
+    """
+
+    add_script_tag: Annotated[Iterable[Variant0AddScriptTag], PropertyInfo(alias="addScriptTag")]
+    """Adds a `<script>` tag into the page with the desired URL or content."""
+
+    add_style_tag: Annotated[Iterable[Variant0AddStyleTag], PropertyInfo(alias="addStyleTag")]
+    """
+    Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+    `<style type="text/css">` tag with the content.
+    """
+
+    allow_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="allowRequestPattern")]
+    """Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'."""
+
+    allow_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="allowResourceTypes"),
+    ]
+    """Only allow requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    authenticate: Variant0Authenticate
+    """Provide credentials for HTTP authentication."""
+
+    best_attempt: Annotated[bool, PropertyInfo(alias="bestAttempt")]
+    """Attempt to proceed when 'awaited' events fail or timeout."""
+
+    cookies: Iterable[Variant0Cookie]
+    """Check [options](https://pptr.dev/api/puppeteer.page.setcookie)."""
+
+    emulate_media_type: Annotated[str, PropertyInfo(alias="emulateMediaType")]
+
+    goto_options: Annotated[Variant0GotoOptions, PropertyInfo(alias="gotoOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    reject_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="rejectRequestPattern")]
+    """Block undesired requests that match the provided regex patterns, eg.
+
+    '/^.\\**\\..(css)'.
+    """
+
+    reject_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="rejectResourceTypes"),
+    ]
+    """Block undesired requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    set_extra_http_headers: Annotated[Dict[str, str], PropertyInfo(alias="setExtraHTTPHeaders")]
+
+    set_java_script_enabled: Annotated[bool, PropertyInfo(alias="setJavaScriptEnabled")]
+
+    user_agent: Annotated[str, PropertyInfo(alias="userAgent")]
+
+    viewport: Variant0Viewport
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    wait_for_selector: Annotated[Variant0WaitForSelector, PropertyInfo(alias="waitForSelector")]
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    wait_for_timeout: Annotated[float, PropertyInfo(alias="waitForTimeout")]
+    """Waits for a specified timeout before continuing."""
+
+
+class Variant0Element(TypedDict, total=False):
+    selector: Required[str]
+
+
+class Variant0AddScriptTag(TypedDict, total=False):
+    id: str
+
+    content: str
+
+    type: str
+
+    url: str
+
+
+class Variant0AddStyleTag(TypedDict, total=False):
+    content: str
+
+    url: str
+
+
+class Variant0Authenticate(TypedDict, total=False):
+    """Provide credentials for HTTP authentication."""
+
+    password: Required[str]
+
+    username: Required[str]
+
+
+class Variant0Cookie(TypedDict, total=False):
+    name: Required[str]
+
+    value: Required[str]
+
+    domain: str
+
+    expires: float
+
+    http_only: Annotated[bool, PropertyInfo(alias="httpOnly")]
+
+    partition_key: Annotated[str, PropertyInfo(alias="partitionKey")]
+
+    path: str
+
+    priority: Literal["Low", "Medium", "High"]
+
+    same_party: Annotated[bool, PropertyInfo(alias="sameParty")]
+
+    same_site: Annotated[Literal["Strict", "Lax", "None"], PropertyInfo(alias="sameSite")]
+
+    secure: bool
+
+    source_port: Annotated[float, PropertyInfo(alias="sourcePort")]
+
+    source_scheme: Annotated[Literal["Unset", "NonSecure", "Secure"], PropertyInfo(alias="sourceScheme")]
+
+    url: str
+
+
+class Variant0GotoOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    referer: str
+
+    referrer_policy: Annotated[str, PropertyInfo(alias="referrerPolicy")]
+
+    timeout: float
+
+    wait_until: Annotated[
+        Union[
+            Literal["load", "domcontentloaded", "networkidle0", "networkidle2"],
+            List[Literal["load", "domcontentloaded", "networkidle0", "networkidle2"]],
+        ],
+        PropertyInfo(alias="waitUntil"),
+    ]
+
+
+class Variant0Viewport(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    height: Required[float]
+
+    width: Required[float]
+
+    device_scale_factor: Annotated[float, PropertyInfo(alias="deviceScaleFactor")]
+
+    has_touch: Annotated[bool, PropertyInfo(alias="hasTouch")]
+
+    is_landscape: Annotated[bool, PropertyInfo(alias="isLandscape")]
+
+    is_mobile: Annotated[bool, PropertyInfo(alias="isMobile")]
+
+
+class Variant0WaitForSelector(TypedDict, total=False):
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    selector: Required[str]
+
+    hidden: Literal[True]
+
+    timeout: float
+
+    visible: Literal[True]
+
+
+class Variant1(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    elements: Required[Iterable[Variant1Element]]
+
+    url: Required[str]
+    """URL to navigate to, eg. `https://example.com`."""
+
+    cache_ttl: Annotated[float, PropertyInfo(alias="cacheTTL")]
+    """Cache TTL default is 5s. Set to 0 to disable."""
+
+    action_timeout: Annotated[float, PropertyInfo(alias="actionTimeout")]
+    """
+    The maximum duration allowed for the browser action to complete after the page
+    has loaded (such as taking screenshots, extracting content, or generating PDFs).
+    If this time limit is exceeded, the action stops and returns a timeout error.
+    """
+
+    add_script_tag: Annotated[Iterable[Variant1AddScriptTag], PropertyInfo(alias="addScriptTag")]
+    """Adds a `<script>` tag into the page with the desired URL or content."""
+
+    add_style_tag: Annotated[Iterable[Variant1AddStyleTag], PropertyInfo(alias="addStyleTag")]
+    """
+    Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+    `<style type="text/css">` tag with the content.
+    """
+
+    allow_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="allowRequestPattern")]
+    """Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'."""
+
+    allow_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="allowResourceTypes"),
+    ]
+    """Only allow requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    authenticate: Variant1Authenticate
+    """Provide credentials for HTTP authentication."""
+
+    best_attempt: Annotated[bool, PropertyInfo(alias="bestAttempt")]
+    """Attempt to proceed when 'awaited' events fail or timeout."""
+
+    cookies: Iterable[Variant1Cookie]
+    """Check [options](https://pptr.dev/api/puppeteer.page.setcookie)."""
+
+    emulate_media_type: Annotated[str, PropertyInfo(alias="emulateMediaType")]
+
+    goto_options: Annotated[Variant1GotoOptions, PropertyInfo(alias="gotoOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    reject_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="rejectRequestPattern")]
+    """Block undesired requests that match the provided regex patterns, eg.
+
+    '/^.\\**\\..(css)'.
+    """
+
+    reject_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="rejectResourceTypes"),
+    ]
+    """Block undesired requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    set_extra_http_headers: Annotated[Dict[str, str], PropertyInfo(alias="setExtraHTTPHeaders")]
+
+    set_java_script_enabled: Annotated[bool, PropertyInfo(alias="setJavaScriptEnabled")]
+
+    user_agent: Annotated[str, PropertyInfo(alias="userAgent")]
+
+    viewport: Variant1Viewport
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    wait_for_selector: Annotated[Variant1WaitForSelector, PropertyInfo(alias="waitForSelector")]
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    wait_for_timeout: Annotated[float, PropertyInfo(alias="waitForTimeout")]
+    """Waits for a specified timeout before continuing."""
+
+
+class Variant1Element(TypedDict, total=False):
+    selector: Required[str]
+
+
+class Variant1AddScriptTag(TypedDict, total=False):
+    id: str
+
+    content: str
+
+    type: str
+
+    url: str
+
+
+class Variant1AddStyleTag(TypedDict, total=False):
+    content: str
+
+    url: str
+
+
+class Variant1Authenticate(TypedDict, total=False):
+    """Provide credentials for HTTP authentication."""
+
+    password: Required[str]
+
+    username: Required[str]
+
+
+class Variant1Cookie(TypedDict, total=False):
+    name: Required[str]
+
+    value: Required[str]
+
+    domain: str
+
+    expires: float
+
+    http_only: Annotated[bool, PropertyInfo(alias="httpOnly")]
+
+    partition_key: Annotated[str, PropertyInfo(alias="partitionKey")]
+
+    path: str
+
+    priority: Literal["Low", "Medium", "High"]
+
+    same_party: Annotated[bool, PropertyInfo(alias="sameParty")]
+
+    same_site: Annotated[Literal["Strict", "Lax", "None"], PropertyInfo(alias="sameSite")]
+
+    secure: bool
+
+    source_port: Annotated[float, PropertyInfo(alias="sourcePort")]
+
+    source_scheme: Annotated[Literal["Unset", "NonSecure", "Secure"], PropertyInfo(alias="sourceScheme")]
+
+    url: str
+
+
+class Variant1GotoOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    referer: str
+
+    referrer_policy: Annotated[str, PropertyInfo(alias="referrerPolicy")]
+
+    timeout: float
+
+    wait_until: Annotated[
+        Union[
+            Literal["load", "domcontentloaded", "networkidle0", "networkidle2"],
+            List[Literal["load", "domcontentloaded", "networkidle0", "networkidle2"]],
+        ],
+        PropertyInfo(alias="waitUntil"),
+    ]
+
+
+class Variant1Viewport(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    height: Required[float]
+
+    width: Required[float]
+
+    device_scale_factor: Annotated[float, PropertyInfo(alias="deviceScaleFactor")]
+
+    has_touch: Annotated[bool, PropertyInfo(alias="hasTouch")]
+
+    is_landscape: Annotated[bool, PropertyInfo(alias="isLandscape")]
+
+    is_mobile: Annotated[bool, PropertyInfo(alias="isMobile")]
+
+
+class Variant1WaitForSelector(TypedDict, total=False):
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    selector: Required[str]
+
+    hidden: Literal[True]
+
+    timeout: float
+
+    visible: Literal[True]
+
+
+ScrapeCreateParams: TypeAlias = Union[Variant0, Variant1]
diff --git a/src/cloudflare/types/browser_rendering/scrape_create_response.py b/src/cloudflare/types/browser_rendering/scrape_create_response.py
new file mode 100644
index 00000000000..d09633f2224
--- /dev/null
+++ b/src/cloudflare/types/browser_rendering/scrape_create_response.py
@@ -0,0 +1,53 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from typing_extensions import TypeAlias
+
+from ..._models import BaseModel
+
+__all__ = [
+    "ScrapeCreateResponse",
+    "ScrapeCreateResponseItem",
+    "ScrapeCreateResponseItemResults",
+    "ScrapeCreateResponseItemResultsAttribute",
+]
+
+
+class ScrapeCreateResponseItemResultsAttribute(BaseModel):
+    name: str
+    """Attribute name"""
+
+    value: str
+    """Attribute value"""
+
+
+class ScrapeCreateResponseItemResults(BaseModel):
+    attributes: List[ScrapeCreateResponseItemResultsAttribute]
+
+    height: float
+    """Element height"""
+
+    html: str
+    """Html content"""
+
+    left: float
+    """Element left"""
+
+    text: str
+    """Text content"""
+
+    top: float
+    """Element top"""
+
+    width: float
+    """Element width"""
+
+
+class ScrapeCreateResponseItem(BaseModel):
+    results: ScrapeCreateResponseItemResults
+
+    selector: str
+    """Selector"""
+
+
+ScrapeCreateResponse: TypeAlias = List[ScrapeCreateResponseItem]
diff --git a/src/cloudflare/types/browser_rendering/screenshot_create_params.py b/src/cloudflare/types/browser_rendering/screenshot_create_params.py
new file mode 100644
index 00000000000..0f4f48f827e
--- /dev/null
+++ b/src/cloudflare/types/browser_rendering/screenshot_create_params.py
@@ -0,0 +1,583 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Union, Iterable
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = [
+    "ScreenshotCreateParams",
+    "Variant0",
+    "Variant0AddScriptTag",
+    "Variant0AddStyleTag",
+    "Variant0Authenticate",
+    "Variant0Cookie",
+    "Variant0GotoOptions",
+    "Variant0ScreenshotOptions",
+    "Variant0ScreenshotOptionsClip",
+    "Variant0Viewport",
+    "Variant0WaitForSelector",
+    "Variant1",
+    "Variant1AddScriptTag",
+    "Variant1AddStyleTag",
+    "Variant1Authenticate",
+    "Variant1Cookie",
+    "Variant1GotoOptions",
+    "Variant1ScreenshotOptions",
+    "Variant1ScreenshotOptionsClip",
+    "Variant1Viewport",
+    "Variant1WaitForSelector",
+]
+
+
+class Variant0(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    html: Required[str]
+    """Set the content of the page, eg: `<h1>Hello World!!</h1>`.
+
+    Either `html` or `url` must be set.
+    """
+
+    cache_ttl: Annotated[float, PropertyInfo(alias="cacheTTL")]
+    """Cache TTL default is 5s. Set to 0 to disable."""
+
+    action_timeout: Annotated[float, PropertyInfo(alias="actionTimeout")]
+    """
+    The maximum duration allowed for the browser action to complete after the page
+    has loaded (such as taking screenshots, extracting content, or generating PDFs).
+    If this time limit is exceeded, the action stops and returns a timeout error.
+    """
+
+    add_script_tag: Annotated[Iterable[Variant0AddScriptTag], PropertyInfo(alias="addScriptTag")]
+    """Adds a `<script>` tag into the page with the desired URL or content."""
+
+    add_style_tag: Annotated[Iterable[Variant0AddStyleTag], PropertyInfo(alias="addStyleTag")]
+    """
+    Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+    `<style type="text/css">` tag with the content.
+    """
+
+    allow_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="allowRequestPattern")]
+    """Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'."""
+
+    allow_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="allowResourceTypes"),
+    ]
+    """Only allow requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    authenticate: Variant0Authenticate
+    """Provide credentials for HTTP authentication."""
+
+    best_attempt: Annotated[bool, PropertyInfo(alias="bestAttempt")]
+    """Attempt to proceed when 'awaited' events fail or timeout."""
+
+    cookies: Iterable[Variant0Cookie]
+    """Check [options](https://pptr.dev/api/puppeteer.page.setcookie)."""
+
+    emulate_media_type: Annotated[str, PropertyInfo(alias="emulateMediaType")]
+
+    goto_options: Annotated[Variant0GotoOptions, PropertyInfo(alias="gotoOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    reject_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="rejectRequestPattern")]
+    """Block undesired requests that match the provided regex patterns, eg.
+
+    '/^.\\**\\..(css)'.
+    """
+
+    reject_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="rejectResourceTypes"),
+    ]
+    """Block undesired requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    screenshot_options: Annotated[Variant0ScreenshotOptions, PropertyInfo(alias="screenshotOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.screenshotoptions)."""
+
+    scroll_page: Annotated[bool, PropertyInfo(alias="scrollPage")]
+
+    selector: str
+
+    set_extra_http_headers: Annotated[Dict[str, str], PropertyInfo(alias="setExtraHTTPHeaders")]
+
+    set_java_script_enabled: Annotated[bool, PropertyInfo(alias="setJavaScriptEnabled")]
+
+    user_agent: Annotated[str, PropertyInfo(alias="userAgent")]
+
+    viewport: Variant0Viewport
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    wait_for_selector: Annotated[Variant0WaitForSelector, PropertyInfo(alias="waitForSelector")]
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    wait_for_timeout: Annotated[float, PropertyInfo(alias="waitForTimeout")]
+    """Waits for a specified timeout before continuing."""
+
+
+class Variant0AddScriptTag(TypedDict, total=False):
+    id: str
+
+    content: str
+
+    type: str
+
+    url: str
+
+
+class Variant0AddStyleTag(TypedDict, total=False):
+    content: str
+
+    url: str
+
+
+class Variant0Authenticate(TypedDict, total=False):
+    """Provide credentials for HTTP authentication."""
+
+    password: Required[str]
+
+    username: Required[str]
+
+
+class Variant0Cookie(TypedDict, total=False):
+    name: Required[str]
+
+    value: Required[str]
+
+    domain: str
+
+    expires: float
+
+    http_only: Annotated[bool, PropertyInfo(alias="httpOnly")]
+
+    partition_key: Annotated[str, PropertyInfo(alias="partitionKey")]
+
+    path: str
+
+    priority: Literal["Low", "Medium", "High"]
+
+    same_party: Annotated[bool, PropertyInfo(alias="sameParty")]
+
+    same_site: Annotated[Literal["Strict", "Lax", "None"], PropertyInfo(alias="sameSite")]
+
+    secure: bool
+
+    source_port: Annotated[float, PropertyInfo(alias="sourcePort")]
+
+    source_scheme: Annotated[Literal["Unset", "NonSecure", "Secure"], PropertyInfo(alias="sourceScheme")]
+
+    url: str
+
+
+class Variant0GotoOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    referer: str
+
+    referrer_policy: Annotated[str, PropertyInfo(alias="referrerPolicy")]
+
+    timeout: float
+
+    wait_until: Annotated[
+        Union[
+            Literal["load", "domcontentloaded", "networkidle0", "networkidle2"],
+            List[Literal["load", "domcontentloaded", "networkidle0", "networkidle2"]],
+        ],
+        PropertyInfo(alias="waitUntil"),
+    ]
+
+
+class Variant0ScreenshotOptionsClip(TypedDict, total=False):
+    height: Required[float]
+
+    width: Required[float]
+
+    x: Required[float]
+
+    y: Required[float]
+
+    scale: float
+
+
+class Variant0ScreenshotOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.screenshotoptions)."""
+
+    capture_beyond_viewport: Annotated[bool, PropertyInfo(alias="captureBeyondViewport")]
+
+    clip: Variant0ScreenshotOptionsClip
+
+    encoding: Literal["binary", "base64"]
+
+    from_surface: Annotated[bool, PropertyInfo(alias="fromSurface")]
+
+    full_page: Annotated[bool, PropertyInfo(alias="fullPage")]
+
+    omit_background: Annotated[bool, PropertyInfo(alias="omitBackground")]
+
+    optimize_for_speed: Annotated[bool, PropertyInfo(alias="optimizeForSpeed")]
+
+    quality: float
+
+    type: Literal["png", "jpeg", "webp"]
+
+
+class Variant0Viewport(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    height: Required[float]
+
+    width: Required[float]
+
+    device_scale_factor: Annotated[float, PropertyInfo(alias="deviceScaleFactor")]
+
+    has_touch: Annotated[bool, PropertyInfo(alias="hasTouch")]
+
+    is_landscape: Annotated[bool, PropertyInfo(alias="isLandscape")]
+
+    is_mobile: Annotated[bool, PropertyInfo(alias="isMobile")]
+
+
+class Variant0WaitForSelector(TypedDict, total=False):
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    selector: Required[str]
+
+    hidden: Literal[True]
+
+    timeout: float
+
+    visible: Literal[True]
+
+
+class Variant1(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    url: Required[str]
+    """URL to navigate to, eg. `https://example.com`."""
+
+    cache_ttl: Annotated[float, PropertyInfo(alias="cacheTTL")]
+    """Cache TTL default is 5s. Set to 0 to disable."""
+
+    action_timeout: Annotated[float, PropertyInfo(alias="actionTimeout")]
+    """
+    The maximum duration allowed for the browser action to complete after the page
+    has loaded (such as taking screenshots, extracting content, or generating PDFs).
+    If this time limit is exceeded, the action stops and returns a timeout error.
+    """
+
+    add_script_tag: Annotated[Iterable[Variant1AddScriptTag], PropertyInfo(alias="addScriptTag")]
+    """Adds a `<script>` tag into the page with the desired URL or content."""
+
+    add_style_tag: Annotated[Iterable[Variant1AddStyleTag], PropertyInfo(alias="addStyleTag")]
+    """
+    Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+    `<style type="text/css">` tag with the content.
+    """
+
+    allow_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="allowRequestPattern")]
+    """Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'."""
+
+    allow_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="allowResourceTypes"),
+    ]
+    """Only allow requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    authenticate: Variant1Authenticate
+    """Provide credentials for HTTP authentication."""
+
+    best_attempt: Annotated[bool, PropertyInfo(alias="bestAttempt")]
+    """Attempt to proceed when 'awaited' events fail or timeout."""
+
+    cookies: Iterable[Variant1Cookie]
+    """Check [options](https://pptr.dev/api/puppeteer.page.setcookie)."""
+
+    emulate_media_type: Annotated[str, PropertyInfo(alias="emulateMediaType")]
+
+    goto_options: Annotated[Variant1GotoOptions, PropertyInfo(alias="gotoOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    reject_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="rejectRequestPattern")]
+    """Block undesired requests that match the provided regex patterns, eg.
+
+    '/^.\\**\\..(css)'.
+    """
+
+    reject_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="rejectResourceTypes"),
+    ]
+    """Block undesired requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    screenshot_options: Annotated[Variant1ScreenshotOptions, PropertyInfo(alias="screenshotOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.screenshotoptions)."""
+
+    scroll_page: Annotated[bool, PropertyInfo(alias="scrollPage")]
+
+    selector: str
+
+    set_extra_http_headers: Annotated[Dict[str, str], PropertyInfo(alias="setExtraHTTPHeaders")]
+
+    set_java_script_enabled: Annotated[bool, PropertyInfo(alias="setJavaScriptEnabled")]
+
+    user_agent: Annotated[str, PropertyInfo(alias="userAgent")]
+
+    viewport: Variant1Viewport
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    wait_for_selector: Annotated[Variant1WaitForSelector, PropertyInfo(alias="waitForSelector")]
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    wait_for_timeout: Annotated[float, PropertyInfo(alias="waitForTimeout")]
+    """Waits for a specified timeout before continuing."""
+
+
+class Variant1AddScriptTag(TypedDict, total=False):
+    id: str
+
+    content: str
+
+    type: str
+
+    url: str
+
+
+class Variant1AddStyleTag(TypedDict, total=False):
+    content: str
+
+    url: str
+
+
+class Variant1Authenticate(TypedDict, total=False):
+    """Provide credentials for HTTP authentication."""
+
+    password: Required[str]
+
+    username: Required[str]
+
+
+class Variant1Cookie(TypedDict, total=False):
+    name: Required[str]
+
+    value: Required[str]
+
+    domain: str
+
+    expires: float
+
+    http_only: Annotated[bool, PropertyInfo(alias="httpOnly")]
+
+    partition_key: Annotated[str, PropertyInfo(alias="partitionKey")]
+
+    path: str
+
+    priority: Literal["Low", "Medium", "High"]
+
+    same_party: Annotated[bool, PropertyInfo(alias="sameParty")]
+
+    same_site: Annotated[Literal["Strict", "Lax", "None"], PropertyInfo(alias="sameSite")]
+
+    secure: bool
+
+    source_port: Annotated[float, PropertyInfo(alias="sourcePort")]
+
+    source_scheme: Annotated[Literal["Unset", "NonSecure", "Secure"], PropertyInfo(alias="sourceScheme")]
+
+    url: str
+
+
+class Variant1GotoOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    referer: str
+
+    referrer_policy: Annotated[str, PropertyInfo(alias="referrerPolicy")]
+
+    timeout: float
+
+    wait_until: Annotated[
+        Union[
+            Literal["load", "domcontentloaded", "networkidle0", "networkidle2"],
+            List[Literal["load", "domcontentloaded", "networkidle0", "networkidle2"]],
+        ],
+        PropertyInfo(alias="waitUntil"),
+    ]
+
+
+class Variant1ScreenshotOptionsClip(TypedDict, total=False):
+    height: Required[float]
+
+    width: Required[float]
+
+    x: Required[float]
+
+    y: Required[float]
+
+    scale: float
+
+
+class Variant1ScreenshotOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.screenshotoptions)."""
+
+    capture_beyond_viewport: Annotated[bool, PropertyInfo(alias="captureBeyondViewport")]
+
+    clip: Variant1ScreenshotOptionsClip
+
+    encoding: Literal["binary", "base64"]
+
+    from_surface: Annotated[bool, PropertyInfo(alias="fromSurface")]
+
+    full_page: Annotated[bool, PropertyInfo(alias="fullPage")]
+
+    omit_background: Annotated[bool, PropertyInfo(alias="omitBackground")]
+
+    optimize_for_speed: Annotated[bool, PropertyInfo(alias="optimizeForSpeed")]
+
+    quality: float
+
+    type: Literal["png", "jpeg", "webp"]
+
+
+class Variant1Viewport(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    height: Required[float]
+
+    width: Required[float]
+
+    device_scale_factor: Annotated[float, PropertyInfo(alias="deviceScaleFactor")]
+
+    has_touch: Annotated[bool, PropertyInfo(alias="hasTouch")]
+
+    is_landscape: Annotated[bool, PropertyInfo(alias="isLandscape")]
+
+    is_mobile: Annotated[bool, PropertyInfo(alias="isMobile")]
+
+
+class Variant1WaitForSelector(TypedDict, total=False):
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    selector: Required[str]
+
+    hidden: Literal[True]
+
+    timeout: float
+
+    visible: Literal[True]
+
+
+ScreenshotCreateParams: TypeAlias = Union[Variant0, Variant1]
diff --git a/src/cloudflare/types/browser_rendering/screenshot_create_response.py b/src/cloudflare/types/browser_rendering/screenshot_create_response.py
new file mode 100644
index 00000000000..48dd6304e77
--- /dev/null
+++ b/src/cloudflare/types/browser_rendering/screenshot_create_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["ScreenshotCreateResponse", "Error"]
+
+
+class Error(BaseModel):
+    code: float
+    """Error code"""
+
+    message: str
+    """Error Message"""
+
+
+class ScreenshotCreateResponse(BaseModel):
+    success: bool
+    """Response status"""
+
+    errors: Optional[List[Error]] = None
diff --git a/src/cloudflare/types/browser_rendering/snapshot_create_params.py b/src/cloudflare/types/browser_rendering/snapshot_create_params.py
new file mode 100644
index 00000000000..b64cb138959
--- /dev/null
+++ b/src/cloudflare/types/browser_rendering/snapshot_create_params.py
@@ -0,0 +1,565 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Union, Iterable
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = [
+    "SnapshotCreateParams",
+    "Variant0",
+    "Variant0AddScriptTag",
+    "Variant0AddStyleTag",
+    "Variant0Authenticate",
+    "Variant0Cookie",
+    "Variant0GotoOptions",
+    "Variant0ScreenshotOptions",
+    "Variant0ScreenshotOptionsClip",
+    "Variant0Viewport",
+    "Variant0WaitForSelector",
+    "Variant1",
+    "Variant1AddScriptTag",
+    "Variant1AddStyleTag",
+    "Variant1Authenticate",
+    "Variant1Cookie",
+    "Variant1GotoOptions",
+    "Variant1ScreenshotOptions",
+    "Variant1ScreenshotOptionsClip",
+    "Variant1Viewport",
+    "Variant1WaitForSelector",
+]
+
+
+class Variant0(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    html: Required[str]
+    """Set the content of the page, eg: `<h1>Hello World!!</h1>`.
+
+    Either `html` or `url` must be set.
+    """
+
+    cache_ttl: Annotated[float, PropertyInfo(alias="cacheTTL")]
+    """Cache TTL default is 5s. Set to 0 to disable."""
+
+    action_timeout: Annotated[float, PropertyInfo(alias="actionTimeout")]
+    """
+    The maximum duration allowed for the browser action to complete after the page
+    has loaded (such as taking screenshots, extracting content, or generating PDFs).
+    If this time limit is exceeded, the action stops and returns a timeout error.
+    """
+
+    add_script_tag: Annotated[Iterable[Variant0AddScriptTag], PropertyInfo(alias="addScriptTag")]
+    """Adds a `<script>` tag into the page with the desired URL or content."""
+
+    add_style_tag: Annotated[Iterable[Variant0AddStyleTag], PropertyInfo(alias="addStyleTag")]
+    """
+    Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+    `<style type="text/css">` tag with the content.
+    """
+
+    allow_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="allowRequestPattern")]
+    """Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'."""
+
+    allow_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="allowResourceTypes"),
+    ]
+    """Only allow requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    authenticate: Variant0Authenticate
+    """Provide credentials for HTTP authentication."""
+
+    best_attempt: Annotated[bool, PropertyInfo(alias="bestAttempt")]
+    """Attempt to proceed when 'awaited' events fail or timeout."""
+
+    cookies: Iterable[Variant0Cookie]
+    """Check [options](https://pptr.dev/api/puppeteer.page.setcookie)."""
+
+    emulate_media_type: Annotated[str, PropertyInfo(alias="emulateMediaType")]
+
+    goto_options: Annotated[Variant0GotoOptions, PropertyInfo(alias="gotoOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    reject_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="rejectRequestPattern")]
+    """Block undesired requests that match the provided regex patterns, eg.
+
+    '/^.\\**\\..(css)'.
+    """
+
+    reject_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="rejectResourceTypes"),
+    ]
+    """Block undesired requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    screenshot_options: Annotated[Variant0ScreenshotOptions, PropertyInfo(alias="screenshotOptions")]
+
+    set_extra_http_headers: Annotated[Dict[str, str], PropertyInfo(alias="setExtraHTTPHeaders")]
+
+    set_java_script_enabled: Annotated[bool, PropertyInfo(alias="setJavaScriptEnabled")]
+
+    user_agent: Annotated[str, PropertyInfo(alias="userAgent")]
+
+    viewport: Variant0Viewport
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    wait_for_selector: Annotated[Variant0WaitForSelector, PropertyInfo(alias="waitForSelector")]
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    wait_for_timeout: Annotated[float, PropertyInfo(alias="waitForTimeout")]
+    """Waits for a specified timeout before continuing."""
+
+
+class Variant0AddScriptTag(TypedDict, total=False):
+    id: str
+
+    content: str
+
+    type: str
+
+    url: str
+
+
+class Variant0AddStyleTag(TypedDict, total=False):
+    content: str
+
+    url: str
+
+
+class Variant0Authenticate(TypedDict, total=False):
+    """Provide credentials for HTTP authentication."""
+
+    password: Required[str]
+
+    username: Required[str]
+
+
+class Variant0Cookie(TypedDict, total=False):
+    name: Required[str]
+
+    value: Required[str]
+
+    domain: str
+
+    expires: float
+
+    http_only: Annotated[bool, PropertyInfo(alias="httpOnly")]
+
+    partition_key: Annotated[str, PropertyInfo(alias="partitionKey")]
+
+    path: str
+
+    priority: Literal["Low", "Medium", "High"]
+
+    same_party: Annotated[bool, PropertyInfo(alias="sameParty")]
+
+    same_site: Annotated[Literal["Strict", "Lax", "None"], PropertyInfo(alias="sameSite")]
+
+    secure: bool
+
+    source_port: Annotated[float, PropertyInfo(alias="sourcePort")]
+
+    source_scheme: Annotated[Literal["Unset", "NonSecure", "Secure"], PropertyInfo(alias="sourceScheme")]
+
+    url: str
+
+
+class Variant0GotoOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    referer: str
+
+    referrer_policy: Annotated[str, PropertyInfo(alias="referrerPolicy")]
+
+    timeout: float
+
+    wait_until: Annotated[
+        Union[
+            Literal["load", "domcontentloaded", "networkidle0", "networkidle2"],
+            List[Literal["load", "domcontentloaded", "networkidle0", "networkidle2"]],
+        ],
+        PropertyInfo(alias="waitUntil"),
+    ]
+
+
+class Variant0ScreenshotOptionsClip(TypedDict, total=False):
+    height: Required[float]
+
+    width: Required[float]
+
+    x: Required[float]
+
+    y: Required[float]
+
+    scale: float
+
+
+class Variant0ScreenshotOptions(TypedDict, total=False):
+    capture_beyond_viewport: Annotated[bool, PropertyInfo(alias="captureBeyondViewport")]
+
+    clip: Variant0ScreenshotOptionsClip
+
+    from_surface: Annotated[bool, PropertyInfo(alias="fromSurface")]
+
+    full_page: Annotated[bool, PropertyInfo(alias="fullPage")]
+
+    omit_background: Annotated[bool, PropertyInfo(alias="omitBackground")]
+
+    optimize_for_speed: Annotated[bool, PropertyInfo(alias="optimizeForSpeed")]
+
+    quality: float
+
+    type: Literal["png", "jpeg", "webp"]
+
+
+class Variant0Viewport(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    height: Required[float]
+
+    width: Required[float]
+
+    device_scale_factor: Annotated[float, PropertyInfo(alias="deviceScaleFactor")]
+
+    has_touch: Annotated[bool, PropertyInfo(alias="hasTouch")]
+
+    is_landscape: Annotated[bool, PropertyInfo(alias="isLandscape")]
+
+    is_mobile: Annotated[bool, PropertyInfo(alias="isMobile")]
+
+
+class Variant0WaitForSelector(TypedDict, total=False):
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    selector: Required[str]
+
+    hidden: Literal[True]
+
+    timeout: float
+
+    visible: Literal[True]
+
+
+class Variant1(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    url: Required[str]
+    """URL to navigate to, eg. `https://example.com`."""
+
+    cache_ttl: Annotated[float, PropertyInfo(alias="cacheTTL")]
+    """Cache TTL default is 5s. Set to 0 to disable."""
+
+    action_timeout: Annotated[float, PropertyInfo(alias="actionTimeout")]
+    """
+    The maximum duration allowed for the browser action to complete after the page
+    has loaded (such as taking screenshots, extracting content, or generating PDFs).
+    If this time limit is exceeded, the action stops and returns a timeout error.
+    """
+
+    add_script_tag: Annotated[Iterable[Variant1AddScriptTag], PropertyInfo(alias="addScriptTag")]
+    """Adds a `<script>` tag into the page with the desired URL or content."""
+
+    add_style_tag: Annotated[Iterable[Variant1AddStyleTag], PropertyInfo(alias="addStyleTag")]
+    """
+    Adds a `<link rel="stylesheet">` tag into the page with the desired URL or a
+    `<style type="text/css">` tag with the content.
+    """
+
+    allow_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="allowRequestPattern")]
+    """Only allow requests that match the provided regex patterns, eg. '/^.\\**\\..(css)'."""
+
+    allow_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="allowResourceTypes"),
+    ]
+    """Only allow requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    authenticate: Variant1Authenticate
+    """Provide credentials for HTTP authentication."""
+
+    best_attempt: Annotated[bool, PropertyInfo(alias="bestAttempt")]
+    """Attempt to proceed when 'awaited' events fail or timeout."""
+
+    cookies: Iterable[Variant1Cookie]
+    """Check [options](https://pptr.dev/api/puppeteer.page.setcookie)."""
+
+    emulate_media_type: Annotated[str, PropertyInfo(alias="emulateMediaType")]
+
+    goto_options: Annotated[Variant1GotoOptions, PropertyInfo(alias="gotoOptions")]
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    reject_request_pattern: Annotated[SequenceNotStr[str], PropertyInfo(alias="rejectRequestPattern")]
+    """Block undesired requests that match the provided regex patterns, eg.
+
+    '/^.\\**\\..(css)'.
+    """
+
+    reject_resource_types: Annotated[
+        List[
+            Literal[
+                "document",
+                "stylesheet",
+                "image",
+                "media",
+                "font",
+                "script",
+                "texttrack",
+                "xhr",
+                "fetch",
+                "prefetch",
+                "eventsource",
+                "websocket",
+                "manifest",
+                "signedexchange",
+                "ping",
+                "cspviolationreport",
+                "preflight",
+                "other",
+            ]
+        ],
+        PropertyInfo(alias="rejectResourceTypes"),
+    ]
+    """Block undesired requests that match the provided resource types, eg.
+
+    'image' or 'script'.
+    """
+
+    screenshot_options: Annotated[Variant1ScreenshotOptions, PropertyInfo(alias="screenshotOptions")]
+
+    set_extra_http_headers: Annotated[Dict[str, str], PropertyInfo(alias="setExtraHTTPHeaders")]
+
+    set_java_script_enabled: Annotated[bool, PropertyInfo(alias="setJavaScriptEnabled")]
+
+    user_agent: Annotated[str, PropertyInfo(alias="userAgent")]
+
+    viewport: Variant1Viewport
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    wait_for_selector: Annotated[Variant1WaitForSelector, PropertyInfo(alias="waitForSelector")]
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    wait_for_timeout: Annotated[float, PropertyInfo(alias="waitForTimeout")]
+    """Waits for a specified timeout before continuing."""
+
+
+class Variant1AddScriptTag(TypedDict, total=False):
+    id: str
+
+    content: str
+
+    type: str
+
+    url: str
+
+
+class Variant1AddStyleTag(TypedDict, total=False):
+    content: str
+
+    url: str
+
+
+class Variant1Authenticate(TypedDict, total=False):
+    """Provide credentials for HTTP authentication."""
+
+    password: Required[str]
+
+    username: Required[str]
+
+
+class Variant1Cookie(TypedDict, total=False):
+    name: Required[str]
+
+    value: Required[str]
+
+    domain: str
+
+    expires: float
+
+    http_only: Annotated[bool, PropertyInfo(alias="httpOnly")]
+
+    partition_key: Annotated[str, PropertyInfo(alias="partitionKey")]
+
+    path: str
+
+    priority: Literal["Low", "Medium", "High"]
+
+    same_party: Annotated[bool, PropertyInfo(alias="sameParty")]
+
+    same_site: Annotated[Literal["Strict", "Lax", "None"], PropertyInfo(alias="sameSite")]
+
+    secure: bool
+
+    source_port: Annotated[float, PropertyInfo(alias="sourcePort")]
+
+    source_scheme: Annotated[Literal["Unset", "NonSecure", "Secure"], PropertyInfo(alias="sourceScheme")]
+
+    url: str
+
+
+class Variant1GotoOptions(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.gotooptions)."""
+
+    referer: str
+
+    referrer_policy: Annotated[str, PropertyInfo(alias="referrerPolicy")]
+
+    timeout: float
+
+    wait_until: Annotated[
+        Union[
+            Literal["load", "domcontentloaded", "networkidle0", "networkidle2"],
+            List[Literal["load", "domcontentloaded", "networkidle0", "networkidle2"]],
+        ],
+        PropertyInfo(alias="waitUntil"),
+    ]
+
+
+class Variant1ScreenshotOptionsClip(TypedDict, total=False):
+    height: Required[float]
+
+    width: Required[float]
+
+    x: Required[float]
+
+    y: Required[float]
+
+    scale: float
+
+
+class Variant1ScreenshotOptions(TypedDict, total=False):
+    capture_beyond_viewport: Annotated[bool, PropertyInfo(alias="captureBeyondViewport")]
+
+    clip: Variant1ScreenshotOptionsClip
+
+    from_surface: Annotated[bool, PropertyInfo(alias="fromSurface")]
+
+    full_page: Annotated[bool, PropertyInfo(alias="fullPage")]
+
+    omit_background: Annotated[bool, PropertyInfo(alias="omitBackground")]
+
+    optimize_for_speed: Annotated[bool, PropertyInfo(alias="optimizeForSpeed")]
+
+    quality: float
+
+    type: Literal["png", "jpeg", "webp"]
+
+
+class Variant1Viewport(TypedDict, total=False):
+    """Check [options](https://pptr.dev/api/puppeteer.page.setviewport)."""
+
+    height: Required[float]
+
+    width: Required[float]
+
+    device_scale_factor: Annotated[float, PropertyInfo(alias="deviceScaleFactor")]
+
+    has_touch: Annotated[bool, PropertyInfo(alias="hasTouch")]
+
+    is_landscape: Annotated[bool, PropertyInfo(alias="isLandscape")]
+
+    is_mobile: Annotated[bool, PropertyInfo(alias="isMobile")]
+
+
+class Variant1WaitForSelector(TypedDict, total=False):
+    """Wait for the selector to appear in page.
+
+    Check [options](https://pptr.dev/api/puppeteer.page.waitforselector).
+    """
+
+    selector: Required[str]
+
+    hidden: Literal[True]
+
+    timeout: float
+
+    visible: Literal[True]
+
+
+SnapshotCreateParams: TypeAlias = Union[Variant0, Variant1]
diff --git a/src/cloudflare/types/browser_rendering/snapshot_create_response.py b/src/cloudflare/types/browser_rendering/snapshot_create_response.py
new file mode 100644
index 00000000000..46441d17e23
--- /dev/null
+++ b/src/cloudflare/types/browser_rendering/snapshot_create_response.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["SnapshotCreateResponse"]
+
+
+class SnapshotCreateResponse(BaseModel):
+    content: str
+    """HTML content"""
+
+    screenshot: str
+    """Base64 encoded image"""
diff --git a/src/cloudflare/types/cache/__init__.py b/src/cloudflare/types/cache/__init__.py
index 520b990501d..10937a5c1b3 100644
--- a/src/cloudflare/types/cache/__init__.py
+++ b/src/cloudflare/types/cache/__init__.py
@@ -4,7 +4,6 @@
 
 from .state import State as State
 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
@@ -12,7 +11,7 @@
 from .variant_get_response import VariantGetResponse as VariantGetResponse
 from .regional_tiered_cache import RegionalTieredCache as RegionalTieredCache
 from .variant_edit_response import VariantEditResponse as VariantEditResponse
-from .cache_variant_identifier import CacheVariantIdentifier as CacheVariantIdentifier
+from .variant_delete_response import VariantDeleteResponse as VariantDeleteResponse
 from .cache_reserve_edit_params import CacheReserveEditParams as CacheReserveEditParams
 from .cache_reserve_clear_params import CacheReserveClearParams as CacheReserveClearParams
 from .cache_reserve_get_response import CacheReserveGetResponse as CacheReserveGetResponse
diff --git a/src/cloudflare/types/cache/cache_purge_params.py b/src/cloudflare/types/cache/cache_purge_params.py
index 53155b6f63a..800757500ba 100644
--- a/src/cloudflare/types/cache/cache_purge_params.py
+++ b/src/cloudflare/types/cache/cache_purge_params.py
@@ -2,8 +2,10 @@
 
 from __future__ import annotations
 
-from typing import List, Union, Iterable
-from typing_extensions import Required, TypedDict
+from typing import Dict, Union, Iterable
+from typing_extensions import Required, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
 
 __all__ = [
     "CachePurgeParams",
@@ -20,17 +22,17 @@
 class CachePurgeFlexPurgeByTags(TypedDict, total=False):
     zone_id: Required[str]
 
-    tags: List[str]
+    tags: SequenceNotStr[str]
     """
     For more information on cache tags and purging by tags, please refer to
-    [purge by cache-tags documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge-by-tags/#purge-cache-by-cache-tags-enterprise-only).
+    [purge by cache-tags documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge-by-tags/).
     """
 
 
 class CachePurgeFlexPurgeByHostnames(TypedDict, total=False):
     zone_id: Required[str]
 
-    hosts: List[str]
+    hosts: SequenceNotStr[str]
     """
     For more information purging by hostnames, please refer to
     [purge by hostname documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge-by-hostname/).
@@ -40,7 +42,7 @@ class CachePurgeFlexPurgeByHostnames(TypedDict, total=False):
 class CachePurgeFlexPurgeByPrefixes(TypedDict, total=False):
     zone_id: Required[str]
 
-    prefixes: List[str]
+    prefixes: SequenceNotStr[str]
     """
     For more information on purging by prefixes, please refer to
     [purge by prefix documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge_by_prefix/).
@@ -60,7 +62,7 @@ class CachePurgeEverything(TypedDict, total=False):
 class CachePurgeSingleFile(TypedDict, total=False):
     zone_id: Required[str]
 
-    files: List[str]
+    files: SequenceNotStr[str]
     """
     For more information on purging files, please refer to
     [purge by single-file documentation page](https://developers.cloudflare.com/cache/how-to/purge-cache/purge-by-single-file/).
@@ -78,12 +80,12 @@ class CachePurgeSingleFileWithURLAndHeaders(TypedDict, total=False):
 
 
 class CachePurgeSingleFileWithURLAndHeadersFile(TypedDict, total=False):
-    headers: object
+    headers: Dict[str, str]
 
     url: str
 
 
-CachePurgeParams = Union[
+CachePurgeParams: TypeAlias = Union[
     CachePurgeFlexPurgeByTags,
     CachePurgeFlexPurgeByHostnames,
     CachePurgeFlexPurgeByPrefixes,
diff --git a/src/cloudflare/types/cache/cache_purge_response.py b/src/cloudflare/types/cache/cache_purge_response.py
index f9d84123a29..b273a296fbc 100644
--- a/src/cloudflare/types/cache/cache_purge_response.py
+++ b/src/cloudflare/types/cache/cache_purge_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ..._models import BaseModel
 
 __all__ = ["CachePurgeResponse"]
@@ -8,4 +7,3 @@
 
 class CachePurgeResponse(BaseModel):
     id: str
-    """Identifier"""
diff --git a/src/cloudflare/types/cache/cache_reserve.py b/src/cloudflare/types/cache/cache_reserve.py
index 2113d16a9fc..05aac60eee5 100644
--- a/src/cloudflare/types/cache/cache_reserve.py
+++ b/src/cloudflare/types/cache/cache_reserve.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["CacheReserve"]
 
-CacheReserve = Literal["cache_reserve"]
+CacheReserve: TypeAlias = Literal["cache_reserve"]
diff --git a/src/cloudflare/types/cache/cache_reserve_clear.py b/src/cloudflare/types/cache/cache_reserve_clear.py
index 4f92b373231..2c89da30490 100644
--- a/src/cloudflare/types/cache/cache_reserve_clear.py
+++ b/src/cloudflare/types/cache/cache_reserve_clear.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["CacheReserveClear"]
 
-CacheReserveClear = Literal["cache_reserve_clear"]
+CacheReserveClear: TypeAlias = Literal["cache_reserve_clear"]
diff --git a/src/cloudflare/types/cache/cache_reserve_clear_params.py b/src/cloudflare/types/cache/cache_reserve_clear_params.py
index 72908b2031f..e549d5f3eca 100644
--- a/src/cloudflare/types/cache/cache_reserve_clear_params.py
+++ b/src/cloudflare/types/cache/cache_reserve_clear_params.py
@@ -9,6 +9,6 @@
 
 class CacheReserveClearParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     body: Required[object]
diff --git a/src/cloudflare/types/cache/cache_reserve_clear_response.py b/src/cloudflare/types/cache/cache_reserve_clear_response.py
index 6ef83d88029..d04bc2cb61f 100644
--- a/src/cloudflare/types/cache/cache_reserve_clear_response.py
+++ b/src/cloudflare/types/cache/cache_reserve_clear_response.py
@@ -11,12 +11,13 @@
 
 
 class CacheReserveClearResponse(BaseModel):
+    """
+    You can use Cache Reserve Clear to clear your Cache Reserve, but you must first disable Cache Reserve. In most cases, this will be accomplished within 24 hours. You cannot re-enable Cache Reserve while this process is ongoing. Keep in mind that you cannot undo or cancel this operation.
+    """
+
     id: CacheReserveClear
     """ID of the zone setting."""
 
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
-
     start_ts: datetime
     """The time that the latest Cache Reserve Clear operation started."""
 
@@ -25,3 +26,6 @@ class CacheReserveClearResponse(BaseModel):
 
     end_ts: Optional[datetime] = None
     """The time that the latest Cache Reserve Clear operation completed."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
diff --git a/src/cloudflare/types/cache/cache_reserve_edit_params.py b/src/cloudflare/types/cache/cache_reserve_edit_params.py
index 99452f268df..5565b6cf2e9 100644
--- a/src/cloudflare/types/cache/cache_reserve_edit_params.py
+++ b/src/cloudflare/types/cache/cache_reserve_edit_params.py
@@ -9,7 +9,7 @@
 
 class CacheReserveEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     value: Required[Literal["on", "off"]]
     """Value of the Cache Reserve zone setting."""
diff --git a/src/cloudflare/types/cache/cache_reserve_edit_response.py b/src/cloudflare/types/cache/cache_reserve_edit_response.py
index cf94dab2551..c11ed232243 100644
--- a/src/cloudflare/types/cache/cache_reserve_edit_response.py
+++ b/src/cloudflare/types/cache/cache_reserve_edit_response.py
@@ -12,10 +12,13 @@
 
 class CacheReserveEditResponse(BaseModel):
     id: CacheReserve
-    """ID of the zone setting."""
+    """The identifier of the caching setting."""
 
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    editable: bool
+    """Whether the setting is editable."""
 
     value: Literal["on", "off"]
     """Value of the Cache Reserve zone setting."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
diff --git a/src/cloudflare/types/cache/cache_reserve_get_response.py b/src/cloudflare/types/cache/cache_reserve_get_response.py
index 78ddefe3883..b57c3ee8bc2 100644
--- a/src/cloudflare/types/cache/cache_reserve_get_response.py
+++ b/src/cloudflare/types/cache/cache_reserve_get_response.py
@@ -12,10 +12,13 @@
 
 class CacheReserveGetResponse(BaseModel):
     id: CacheReserve
-    """ID of the zone setting."""
+    """The identifier of the caching setting."""
 
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    editable: bool
+    """Whether the setting is editable."""
 
     value: Literal["on", "off"]
     """Value of the Cache Reserve zone setting."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
diff --git a/src/cloudflare/types/cache/cache_reserve_status_response.py b/src/cloudflare/types/cache/cache_reserve_status_response.py
index abc1c4cba82..0f20c65b86d 100644
--- a/src/cloudflare/types/cache/cache_reserve_status_response.py
+++ b/src/cloudflare/types/cache/cache_reserve_status_response.py
@@ -11,12 +11,13 @@
 
 
 class CacheReserveStatusResponse(BaseModel):
+    """
+    You can use Cache Reserve Clear to clear your Cache Reserve, but you must first disable Cache Reserve. In most cases, this will be accomplished within 24 hours. You cannot re-enable Cache Reserve while this process is ongoing. Keep in mind that you cannot undo or cancel this operation.
+    """
+
     id: CacheReserveClear
     """ID of the zone setting."""
 
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
-
     start_ts: datetime
     """The time that the latest Cache Reserve Clear operation started."""
 
@@ -25,3 +26,6 @@ class CacheReserveStatusResponse(BaseModel):
 
     end_ts: Optional[datetime] = None
     """The time that the latest Cache Reserve Clear operation completed."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
diff --git a/src/cloudflare/types/cache/cache_variant.py b/src/cloudflare/types/cache/cache_variant.py
deleted file mode 100644
index 6f442feaf26..00000000000
--- a/src/cloudflare/types/cache/cache_variant.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from datetime import datetime
-
-from ..._models import BaseModel
-from .cache_variant_identifier import CacheVariantIdentifier
-
-__all__ = ["CacheVariant"]
-
-
-class CacheVariant(BaseModel):
-    id: CacheVariantIdentifier
-    """ID of the zone setting."""
-
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
diff --git a/src/cloudflare/types/cache/cache_variant_identifier.py b/src/cloudflare/types/cache/cache_variant_identifier.py
deleted file mode 100644
index 064a574bdac..00000000000
--- a/src/cloudflare/types/cache/cache_variant_identifier.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing_extensions import Literal
-
-__all__ = ["CacheVariantIdentifier"]
-
-CacheVariantIdentifier = Literal["variants"]
diff --git a/src/cloudflare/types/cache/regional_tiered_cache.py b/src/cloudflare/types/cache/regional_tiered_cache.py
index 1f78beeb784..83303075765 100644
--- a/src/cloudflare/types/cache/regional_tiered_cache.py
+++ b/src/cloudflare/types/cache/regional_tiered_cache.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["RegionalTieredCache"]
 
-RegionalTieredCache = Literal["tc_regional"]
+RegionalTieredCache: TypeAlias = Literal["tc_regional"]
diff --git a/src/cloudflare/types/cache/regional_tiered_cache_edit_params.py b/src/cloudflare/types/cache/regional_tiered_cache_edit_params.py
index 07193f6f8e9..f5d8b1ea299 100644
--- a/src/cloudflare/types/cache/regional_tiered_cache_edit_params.py
+++ b/src/cloudflare/types/cache/regional_tiered_cache_edit_params.py
@@ -9,7 +9,7 @@
 
 class RegionalTieredCacheEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     value: Required[Literal["on", "off"]]
     """Value of the Regional Tiered Cache zone setting."""
diff --git a/src/cloudflare/types/cache/regional_tiered_cache_edit_response.py b/src/cloudflare/types/cache/regional_tiered_cache_edit_response.py
index 8350d75dc86..aa8ccf8830e 100644
--- a/src/cloudflare/types/cache/regional_tiered_cache_edit_response.py
+++ b/src/cloudflare/types/cache/regional_tiered_cache_edit_response.py
@@ -2,31 +2,23 @@
 
 from typing import Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from ..._models import BaseModel
 from .regional_tiered_cache import RegionalTieredCache
 
-__all__ = ["RegionalTieredCacheEditResponse", "Value"]
+__all__ = ["RegionalTieredCacheEditResponse"]
 
 
-class Value(BaseModel):
+class RegionalTieredCacheEditResponse(BaseModel):
     id: RegionalTieredCache
-    """ID of the zone setting."""
-
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    """The identifier of the caching setting."""
 
+    editable: bool
+    """Whether the setting is editable."""
 
-class RegionalTieredCacheEditResponse(BaseModel):
-    id: RegionalTieredCache
-    """ID of the zone setting."""
+    value: Literal["on", "off"]
+    """Value of the Regional Tiered Cache zone setting."""
 
     modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
-
-    value: Value
-    """
-    Instructs Cloudflare to check a regional hub data center on the way to your
-    upper tier. This can help improve performance for smart and custom tiered cache
-    topologies.
-    """
+    """Last time this setting was modified."""
diff --git a/src/cloudflare/types/cache/regional_tiered_cache_get_response.py b/src/cloudflare/types/cache/regional_tiered_cache_get_response.py
index ac3f6c4e6e3..71610e07ee4 100644
--- a/src/cloudflare/types/cache/regional_tiered_cache_get_response.py
+++ b/src/cloudflare/types/cache/regional_tiered_cache_get_response.py
@@ -2,31 +2,23 @@
 
 from typing import Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from ..._models import BaseModel
 from .regional_tiered_cache import RegionalTieredCache
 
-__all__ = ["RegionalTieredCacheGetResponse", "Value"]
+__all__ = ["RegionalTieredCacheGetResponse"]
 
 
-class Value(BaseModel):
+class RegionalTieredCacheGetResponse(BaseModel):
     id: RegionalTieredCache
-    """ID of the zone setting."""
-
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    """The identifier of the caching setting."""
 
+    editable: bool
+    """Whether the setting is editable."""
 
-class RegionalTieredCacheGetResponse(BaseModel):
-    id: RegionalTieredCache
-    """ID of the zone setting."""
+    value: Literal["on", "off"]
+    """Value of the Regional Tiered Cache zone setting."""
 
     modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
-
-    value: Value
-    """
-    Instructs Cloudflare to check a regional hub data center on the way to your
-    upper tier. This can help improve performance for smart and custom tiered cache
-    topologies.
-    """
+    """Last time this setting was modified."""
diff --git a/src/cloudflare/types/cache/smart_tiered_cache_delete_response.py b/src/cloudflare/types/cache/smart_tiered_cache_delete_response.py
index 3ccc2711f88..01c2295667c 100644
--- a/src/cloudflare/types/cache/smart_tiered_cache_delete_response.py
+++ b/src/cloudflare/types/cache/smart_tiered_cache_delete_response.py
@@ -1,5 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import Optional
 from datetime import datetime
 from typing_extensions import Literal
 
@@ -9,14 +10,11 @@
 
 
 class SmartTieredCacheDeleteResponse(BaseModel):
-    id: str
-    """The identifier of the caching setting"""
+    id: Literal["tiered_cache_smart_topology_enable"]
+    """The identifier of the caching setting."""
 
     editable: bool
-    """Whether the setting is editable"""
+    """Whether the setting is editable."""
 
-    modified_on: datetime
-    """The time when the setting was last modified"""
-
-    value: Literal["on", "off"]
-    """The status of the feature being on / off"""
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
diff --git a/src/cloudflare/types/cache/smart_tiered_cache_edit_params.py b/src/cloudflare/types/cache/smart_tiered_cache_edit_params.py
index 557f0df09fe..fccba724a30 100644
--- a/src/cloudflare/types/cache/smart_tiered_cache_edit_params.py
+++ b/src/cloudflare/types/cache/smart_tiered_cache_edit_params.py
@@ -9,7 +9,7 @@
 
 class SmartTieredCacheEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     value: Required[Literal["on", "off"]]
-    """Enable or disable the Smart Tiered Cache"""
+    """Enable or disable the Smart Tiered Cache."""
diff --git a/src/cloudflare/types/cache/smart_tiered_cache_edit_response.py b/src/cloudflare/types/cache/smart_tiered_cache_edit_response.py
index 8e871b0599c..938147b8506 100644
--- a/src/cloudflare/types/cache/smart_tiered_cache_edit_response.py
+++ b/src/cloudflare/types/cache/smart_tiered_cache_edit_response.py
@@ -1,5 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import Optional
 from datetime import datetime
 from typing_extensions import Literal
 
@@ -9,14 +10,14 @@
 
 
 class SmartTieredCacheEditResponse(BaseModel):
-    id: str
-    """The identifier of the caching setting"""
+    id: Literal["tiered_cache_smart_topology_enable"]
+    """The identifier of the caching setting."""
 
     editable: bool
-    """Whether the setting is editable"""
-
-    modified_on: datetime
-    """The time when the setting was last modified"""
+    """Whether the setting is editable."""
 
     value: Literal["on", "off"]
-    """The status of the feature being on / off"""
+    """Value of the Smart Tiered Cache zone setting."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
diff --git a/src/cloudflare/types/cache/smart_tiered_cache_get_response.py b/src/cloudflare/types/cache/smart_tiered_cache_get_response.py
index 787aa0d5d59..0190f848041 100644
--- a/src/cloudflare/types/cache/smart_tiered_cache_get_response.py
+++ b/src/cloudflare/types/cache/smart_tiered_cache_get_response.py
@@ -1,5 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import Optional
 from datetime import datetime
 from typing_extensions import Literal
 
@@ -9,14 +10,14 @@
 
 
 class SmartTieredCacheGetResponse(BaseModel):
-    id: str
-    """The identifier of the caching setting"""
+    id: Literal["tiered_cache_smart_topology_enable"]
+    """The identifier of the caching setting."""
 
     editable: bool
-    """Whether the setting is editable"""
-
-    modified_on: datetime
-    """The time when the setting was last modified"""
+    """Whether the setting is editable."""
 
     value: Literal["on", "off"]
-    """The status of the feature being on / off"""
+    """Value of the Smart Tiered Cache zone setting."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
diff --git a/src/cloudflare/types/cache/state.py b/src/cloudflare/types/cache/state.py
index 24320fdfa62..1a5a1aa33d5 100644
--- a/src/cloudflare/types/cache/state.py
+++ b/src/cloudflare/types/cache/state.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["State"]
 
-State = Literal["In-progress", "Completed"]
+State: TypeAlias = Literal["In-progress", "Completed"]
diff --git a/src/cloudflare/types/cache/variant_delete_response.py b/src/cloudflare/types/cache/variant_delete_response.py
new file mode 100644
index 00000000000..0693763e647
--- /dev/null
+++ b/src/cloudflare/types/cache/variant_delete_response.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["VariantDeleteResponse"]
+
+
+class VariantDeleteResponse(BaseModel):
+    id: Literal["variants"]
+    """The identifier of the caching setting."""
+
+    editable: bool
+    """Whether the setting is editable."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
diff --git a/src/cloudflare/types/cache/variant_edit_params.py b/src/cloudflare/types/cache/variant_edit_params.py
index 2c7c09d1991..d7b12d1a7a7 100644
--- a/src/cloudflare/types/cache/variant_edit_params.py
+++ b/src/cloudflare/types/cache/variant_edit_params.py
@@ -2,82 +2,85 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Required, TypedDict
 
+from ..._types import SequenceNotStr
+
 __all__ = ["VariantEditParams", "Value"]
 
 
 class VariantEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     value: Required[Value]
     """Value of the zone setting."""
 
 
 class Value(TypedDict, total=False):
-    avif: List[str]
+    """Value of the zone setting."""
+
+    avif: SequenceNotStr[str]
     """
     List of strings with the MIME types of all the variants that should be served
     for avif.
     """
 
-    bmp: List[str]
+    bmp: SequenceNotStr[str]
     """
     List of strings with the MIME types of all the variants that should be served
     for bmp.
     """
 
-    gif: List[str]
+    gif: SequenceNotStr[str]
     """
     List of strings with the MIME types of all the variants that should be served
     for gif.
     """
 
-    jp2: List[str]
+    jp2: SequenceNotStr[str]
     """
     List of strings with the MIME types of all the variants that should be served
     for jp2.
     """
 
-    jpeg: List[str]
+    jpeg: SequenceNotStr[str]
     """
     List of strings with the MIME types of all the variants that should be served
     for jpeg.
     """
 
-    jpg: List[str]
+    jpg: SequenceNotStr[str]
     """
     List of strings with the MIME types of all the variants that should be served
     for jpg.
     """
 
-    jpg2: List[str]
+    jpg2: SequenceNotStr[str]
     """
     List of strings with the MIME types of all the variants that should be served
     for jpg2.
     """
 
-    png: List[str]
+    png: SequenceNotStr[str]
     """
     List of strings with the MIME types of all the variants that should be served
     for png.
     """
 
-    tif: List[str]
+    tif: SequenceNotStr[str]
     """
     List of strings with the MIME types of all the variants that should be served
     for tif.
     """
 
-    tiff: List[str]
+    tiff: SequenceNotStr[str]
     """
     List of strings with the MIME types of all the variants that should be served
     for tiff.
     """
 
-    webp: List[str]
+    webp: SequenceNotStr[str]
     """
     List of strings with the MIME types of all the variants that should be served
     for webp.
diff --git a/src/cloudflare/types/cache/variant_edit_response.py b/src/cloudflare/types/cache/variant_edit_response.py
index 636afadd456..fdc78a57689 100644
--- a/src/cloudflare/types/cache/variant_edit_response.py
+++ b/src/cloudflare/types/cache/variant_edit_response.py
@@ -2,14 +2,16 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from ..._models import BaseModel
-from .cache_variant_identifier import CacheVariantIdentifier
 
 __all__ = ["VariantEditResponse", "Value"]
 
 
 class Value(BaseModel):
+    """Value of the zone setting."""
+
     avif: Optional[List[str]] = None
     """
     List of strings with the MIME types of all the variants that should be served
@@ -78,11 +80,14 @@ class Value(BaseModel):
 
 
 class VariantEditResponse(BaseModel):
-    id: CacheVariantIdentifier
-    """ID of the zone setting."""
+    id: Literal["variants"]
+    """The identifier of the caching setting."""
 
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    editable: bool
+    """Whether the setting is editable."""
 
     value: Value
     """Value of the zone setting."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
diff --git a/src/cloudflare/types/cache/variant_get_response.py b/src/cloudflare/types/cache/variant_get_response.py
index c646004adaa..6cb4ca2ec93 100644
--- a/src/cloudflare/types/cache/variant_get_response.py
+++ b/src/cloudflare/types/cache/variant_get_response.py
@@ -2,14 +2,16 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from ..._models import BaseModel
-from .cache_variant_identifier import CacheVariantIdentifier
 
 __all__ = ["VariantGetResponse", "Value"]
 
 
 class Value(BaseModel):
+    """Value of the zone setting."""
+
     avif: Optional[List[str]] = None
     """
     List of strings with the MIME types of all the variants that should be served
@@ -78,11 +80,14 @@ class Value(BaseModel):
 
 
 class VariantGetResponse(BaseModel):
-    id: CacheVariantIdentifier
-    """ID of the zone setting."""
+    id: Literal["variants"]
+    """The identifier of the caching setting."""
 
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    editable: bool
+    """Whether the setting is editable."""
 
     value: Value
     """Value of the zone setting."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
diff --git a/src/cloudflare/types/calls/__init__.py b/src/cloudflare/types/calls/__init__.py
index df3d07db98d..682838783b9 100644
--- a/src/cloudflare/types/calls/__init__.py
+++ b/src/cloudflare/types/calls/__init__.py
@@ -2,8 +2,17 @@
 
 from __future__ import annotations
 
-from .calls_app import CallsApp as CallsApp
-from .call_create_params import CallCreateParams as CallCreateParams
-from .call_list_response import CallListResponse as CallListResponse
-from .call_update_params import CallUpdateParams as CallUpdateParams
-from .calls_app_with_secret import CallsAppWithSecret as CallsAppWithSecret
+from .sfu_get_response import SFUGetResponse as SFUGetResponse
+from .sfu_create_params import SFUCreateParams as SFUCreateParams
+from .sfu_list_response import SFUListResponse as SFUListResponse
+from .sfu_update_params import SFUUpdateParams as SFUUpdateParams
+from .turn_get_response import TURNGetResponse as TURNGetResponse
+from .turn_create_params import TURNCreateParams as TURNCreateParams
+from .turn_list_response import TURNListResponse as TURNListResponse
+from .turn_update_params import TURNUpdateParams as TURNUpdateParams
+from .sfu_create_response import SFUCreateResponse as SFUCreateResponse
+from .sfu_delete_response import SFUDeleteResponse as SFUDeleteResponse
+from .sfu_update_response import SFUUpdateResponse as SFUUpdateResponse
+from .turn_create_response import TURNCreateResponse as TURNCreateResponse
+from .turn_delete_response import TURNDeleteResponse as TURNDeleteResponse
+from .turn_update_response import TURNUpdateResponse as TURNUpdateResponse
diff --git a/src/cloudflare/types/calls/call_create_params.py b/src/cloudflare/types/calls/call_create_params.py
deleted file mode 100644
index 39661b25999..00000000000
--- a/src/cloudflare/types/calls/call_create_params.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["CallCreateParams"]
-
-
-class CallCreateParams(TypedDict, total=False):
-    account_id: Required[str]
-    """The account identifier tag."""
-
-    name: str
-    """A short description of Calls app, not shown to end users."""
diff --git a/src/cloudflare/types/calls/call_list_response.py b/src/cloudflare/types/calls/call_list_response.py
deleted file mode 100644
index ff6eaf3e99f..00000000000
--- a/src/cloudflare/types/calls/call_list_response.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-__all__ = ["CallListResponse"]
-
-CallListResponse = str
diff --git a/src/cloudflare/types/calls/call_update_params.py b/src/cloudflare/types/calls/call_update_params.py
deleted file mode 100644
index c62617f3e2c..00000000000
--- a/src/cloudflare/types/calls/call_update_params.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["CallUpdateParams"]
-
-
-class CallUpdateParams(TypedDict, total=False):
-    account_id: Required[str]
-    """The account identifier tag."""
-
-    name: str
-    """A short description of Calls app, not shown to end users."""
diff --git a/src/cloudflare/types/calls/calls_app.py b/src/cloudflare/types/calls/calls_app.py
deleted file mode 100644
index e29517063f6..00000000000
--- a/src/cloudflare/types/calls/calls_app.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from datetime import datetime
-
-from ..._models import BaseModel
-
-__all__ = ["CallsApp"]
-
-
-class CallsApp(BaseModel):
-    created: Optional[datetime] = None
-    """The date and time the item was created."""
-
-    modified: Optional[datetime] = None
-    """The date and time the item was last modified."""
-
-    name: Optional[str] = None
-    """A short description of Calls app, not shown to end users."""
-
-    uid: Optional[str] = None
-    """A Cloudflare-generated unique identifier for a item."""
diff --git a/src/cloudflare/types/calls/calls_app_with_secret.py b/src/cloudflare/types/calls/calls_app_with_secret.py
deleted file mode 100644
index 41adc52c1f5..00000000000
--- a/src/cloudflare/types/calls/calls_app_with_secret.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from datetime import datetime
-
-from ..._models import BaseModel
-
-__all__ = ["CallsAppWithSecret"]
-
-
-class CallsAppWithSecret(BaseModel):
-    created: Optional[datetime] = None
-    """The date and time the item was created."""
-
-    modified: Optional[datetime] = None
-    """The date and time the item was last modified."""
-
-    name: Optional[str] = None
-    """A short description of Calls app, not shown to end users."""
-
-    secret: Optional[str] = None
-    """Bearer token"""
-
-    uid: Optional[str] = None
-    """A Cloudflare-generated unique identifier for a item."""
diff --git a/src/cloudflare/types/calls/sfu_create_params.py b/src/cloudflare/types/calls/sfu_create_params.py
new file mode 100644
index 00000000000..701904d9621
--- /dev/null
+++ b/src/cloudflare/types/calls/sfu_create_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SFUCreateParams"]
+
+
+class SFUCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    name: str
+    """A short description of Calls app, not shown to end users."""
diff --git a/src/cloudflare/types/calls/sfu_create_response.py b/src/cloudflare/types/calls/sfu_create_response.py
new file mode 100644
index 00000000000..24c3ac28546
--- /dev/null
+++ b/src/cloudflare/types/calls/sfu_create_response.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["SFUCreateResponse"]
+
+
+class SFUCreateResponse(BaseModel):
+    created: Optional[datetime] = None
+    """The date and time the item was created."""
+
+    modified: Optional[datetime] = None
+    """The date and time the item was last modified."""
+
+    name: Optional[str] = None
+    """A short description of Calls app, not shown to end users."""
+
+    secret: Optional[str] = None
+    """Bearer token"""
+
+    uid: Optional[str] = None
+    """A Cloudflare-generated unique identifier for a item."""
diff --git a/src/cloudflare/types/calls/sfu_delete_response.py b/src/cloudflare/types/calls/sfu_delete_response.py
new file mode 100644
index 00000000000..c72560958af
--- /dev/null
+++ b/src/cloudflare/types/calls/sfu_delete_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["SFUDeleteResponse"]
+
+
+class SFUDeleteResponse(BaseModel):
+    created: Optional[datetime] = None
+    """The date and time the item was created."""
+
+    modified: Optional[datetime] = None
+    """The date and time the item was last modified."""
+
+    name: Optional[str] = None
+    """A short description of Calls app, not shown to end users."""
+
+    uid: Optional[str] = None
+    """A Cloudflare-generated unique identifier for a item."""
diff --git a/src/cloudflare/types/calls/sfu_get_response.py b/src/cloudflare/types/calls/sfu_get_response.py
new file mode 100644
index 00000000000..b19e4ea8bec
--- /dev/null
+++ b/src/cloudflare/types/calls/sfu_get_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["SFUGetResponse"]
+
+
+class SFUGetResponse(BaseModel):
+    created: Optional[datetime] = None
+    """The date and time the item was created."""
+
+    modified: Optional[datetime] = None
+    """The date and time the item was last modified."""
+
+    name: Optional[str] = None
+    """A short description of Calls app, not shown to end users."""
+
+    uid: Optional[str] = None
+    """A Cloudflare-generated unique identifier for a item."""
diff --git a/src/cloudflare/types/calls/sfu_list_response.py b/src/cloudflare/types/calls/sfu_list_response.py
new file mode 100644
index 00000000000..8b7d755dced
--- /dev/null
+++ b/src/cloudflare/types/calls/sfu_list_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["SFUListResponse"]
+
+
+class SFUListResponse(BaseModel):
+    created: Optional[datetime] = None
+    """The date and time the item was created."""
+
+    modified: Optional[datetime] = None
+    """The date and time the item was last modified."""
+
+    name: Optional[str] = None
+    """A short description of Calls app, not shown to end users."""
+
+    uid: Optional[str] = None
+    """A Cloudflare-generated unique identifier for a item."""
diff --git a/src/cloudflare/types/calls/sfu_update_params.py b/src/cloudflare/types/calls/sfu_update_params.py
new file mode 100644
index 00000000000..a6c9750c222
--- /dev/null
+++ b/src/cloudflare/types/calls/sfu_update_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SFUUpdateParams"]
+
+
+class SFUUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    name: str
+    """A short description of Calls app, not shown to end users."""
diff --git a/src/cloudflare/types/calls/sfu_update_response.py b/src/cloudflare/types/calls/sfu_update_response.py
new file mode 100644
index 00000000000..a55ceb93381
--- /dev/null
+++ b/src/cloudflare/types/calls/sfu_update_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["SFUUpdateResponse"]
+
+
+class SFUUpdateResponse(BaseModel):
+    created: Optional[datetime] = None
+    """The date and time the item was created."""
+
+    modified: Optional[datetime] = None
+    """The date and time the item was last modified."""
+
+    name: Optional[str] = None
+    """A short description of Calls app, not shown to end users."""
+
+    uid: Optional[str] = None
+    """A Cloudflare-generated unique identifier for a item."""
diff --git a/src/cloudflare/types/calls/turn/__init__.py b/src/cloudflare/types/calls/turn/__init__.py
deleted file mode 100644
index 4bb96b15b72..00000000000
--- a/src/cloudflare/types/calls/turn/__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from .key_get_response import KeyGetResponse as KeyGetResponse
-from .key_create_params import KeyCreateParams as KeyCreateParams
-from .key_list_response import KeyListResponse as KeyListResponse
-from .key_update_params import KeyUpdateParams as KeyUpdateParams
-from .key_create_response import KeyCreateResponse as KeyCreateResponse
-from .key_delete_response import KeyDeleteResponse as KeyDeleteResponse
-from .key_update_response import KeyUpdateResponse as KeyUpdateResponse
diff --git a/src/cloudflare/types/calls/turn/key_create_params.py b/src/cloudflare/types/calls/turn/key_create_params.py
deleted file mode 100644
index 7bf69400dc0..00000000000
--- a/src/cloudflare/types/calls/turn/key_create_params.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["KeyCreateParams"]
-
-
-class KeyCreateParams(TypedDict, total=False):
-    account_id: Required[str]
-    """The account identifier tag."""
-
-    name: str
-    """A short description of a TURN key, not shown to end users."""
diff --git a/src/cloudflare/types/calls/turn/key_create_response.py b/src/cloudflare/types/calls/turn/key_create_response.py
deleted file mode 100644
index fb228b86b86..00000000000
--- a/src/cloudflare/types/calls/turn/key_create_response.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from datetime import datetime
-
-from ...._models import BaseModel
-
-__all__ = ["KeyCreateResponse"]
-
-
-class KeyCreateResponse(BaseModel):
-    created: Optional[datetime] = None
-    """The date and time the item was created."""
-
-    key: Optional[str] = None
-    """Bearer token"""
-
-    modified: Optional[datetime] = None
-    """The date and time the item was last modified."""
-
-    name: Optional[str] = None
-    """A short description of a TURN key, not shown to end users."""
-
-    uid: Optional[str] = None
-    """A Cloudflare-generated unique identifier for a item."""
diff --git a/src/cloudflare/types/calls/turn/key_delete_response.py b/src/cloudflare/types/calls/turn/key_delete_response.py
deleted file mode 100644
index 567f4d5cd8f..00000000000
--- a/src/cloudflare/types/calls/turn/key_delete_response.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-__all__ = ["KeyDeleteResponse"]
-
-KeyDeleteResponse = str
diff --git a/src/cloudflare/types/calls/turn/key_get_response.py b/src/cloudflare/types/calls/turn/key_get_response.py
deleted file mode 100644
index 71d24bb41c9..00000000000
--- a/src/cloudflare/types/calls/turn/key_get_response.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-__all__ = ["KeyGetResponse"]
-
-KeyGetResponse = str
diff --git a/src/cloudflare/types/calls/turn/key_list_response.py b/src/cloudflare/types/calls/turn/key_list_response.py
deleted file mode 100644
index 0361bf29dc9..00000000000
--- a/src/cloudflare/types/calls/turn/key_list_response.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-__all__ = ["KeyListResponse"]
-
-KeyListResponse = str
diff --git a/src/cloudflare/types/calls/turn/key_update_params.py b/src/cloudflare/types/calls/turn/key_update_params.py
deleted file mode 100644
index 0895691ce90..00000000000
--- a/src/cloudflare/types/calls/turn/key_update_params.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["KeyUpdateParams"]
-
-
-class KeyUpdateParams(TypedDict, total=False):
-    account_id: Required[str]
-    """The account identifier tag."""
-
-    name: str
-    """A short description of a TURN key, not shown to end users."""
diff --git a/src/cloudflare/types/calls/turn/key_update_response.py b/src/cloudflare/types/calls/turn/key_update_response.py
deleted file mode 100644
index 77ea5be7481..00000000000
--- a/src/cloudflare/types/calls/turn/key_update_response.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-__all__ = ["KeyUpdateResponse"]
-
-KeyUpdateResponse = str
diff --git a/src/cloudflare/types/calls/turn_create_params.py b/src/cloudflare/types/calls/turn_create_params.py
new file mode 100644
index 00000000000..c81ae39b420
--- /dev/null
+++ b/src/cloudflare/types/calls/turn_create_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["TURNCreateParams"]
+
+
+class TURNCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    name: str
+    """A short description of a TURN key, not shown to end users."""
diff --git a/src/cloudflare/types/calls/turn_create_response.py b/src/cloudflare/types/calls/turn_create_response.py
new file mode 100644
index 00000000000..8189fe9b976
--- /dev/null
+++ b/src/cloudflare/types/calls/turn_create_response.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["TURNCreateResponse"]
+
+
+class TURNCreateResponse(BaseModel):
+    created: Optional[datetime] = None
+    """The date and time the item was created."""
+
+    key: Optional[str] = None
+    """Bearer token"""
+
+    modified: Optional[datetime] = None
+    """The date and time the item was last modified."""
+
+    name: Optional[str] = None
+    """A short description of a TURN key, not shown to end users."""
+
+    uid: Optional[str] = None
+    """A Cloudflare-generated unique identifier for a item."""
diff --git a/src/cloudflare/types/calls/turn_delete_response.py b/src/cloudflare/types/calls/turn_delete_response.py
new file mode 100644
index 00000000000..1fa63a67125
--- /dev/null
+++ b/src/cloudflare/types/calls/turn_delete_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["TURNDeleteResponse"]
+
+
+class TURNDeleteResponse(BaseModel):
+    created: Optional[datetime] = None
+    """The date and time the item was created."""
+
+    modified: Optional[datetime] = None
+    """The date and time the item was last modified."""
+
+    name: Optional[str] = None
+    """A short description of Calls app, not shown to end users."""
+
+    uid: Optional[str] = None
+    """A Cloudflare-generated unique identifier for a item."""
diff --git a/src/cloudflare/types/calls/turn_get_response.py b/src/cloudflare/types/calls/turn_get_response.py
new file mode 100644
index 00000000000..b96cf938ad3
--- /dev/null
+++ b/src/cloudflare/types/calls/turn_get_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["TURNGetResponse"]
+
+
+class TURNGetResponse(BaseModel):
+    created: Optional[datetime] = None
+    """The date and time the item was created."""
+
+    modified: Optional[datetime] = None
+    """The date and time the item was last modified."""
+
+    name: Optional[str] = None
+    """A short description of Calls app, not shown to end users."""
+
+    uid: Optional[str] = None
+    """A Cloudflare-generated unique identifier for a item."""
diff --git a/src/cloudflare/types/calls/turn_list_response.py b/src/cloudflare/types/calls/turn_list_response.py
new file mode 100644
index 00000000000..f7952fc7d91
--- /dev/null
+++ b/src/cloudflare/types/calls/turn_list_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["TURNListResponse"]
+
+
+class TURNListResponse(BaseModel):
+    created: Optional[datetime] = None
+    """The date and time the item was created."""
+
+    modified: Optional[datetime] = None
+    """The date and time the item was last modified."""
+
+    name: Optional[str] = None
+    """A short description of Calls app, not shown to end users."""
+
+    uid: Optional[str] = None
+    """A Cloudflare-generated unique identifier for a item."""
diff --git a/src/cloudflare/types/calls/turn_update_params.py b/src/cloudflare/types/calls/turn_update_params.py
new file mode 100644
index 00000000000..98e663a8388
--- /dev/null
+++ b/src/cloudflare/types/calls/turn_update_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["TURNUpdateParams"]
+
+
+class TURNUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    name: str
+    """A short description of a TURN key, not shown to end users."""
diff --git a/src/cloudflare/types/calls/turn_update_response.py b/src/cloudflare/types/calls/turn_update_response.py
new file mode 100644
index 00000000000..fbe9f489dc5
--- /dev/null
+++ b/src/cloudflare/types/calls/turn_update_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["TURNUpdateResponse"]
+
+
+class TURNUpdateResponse(BaseModel):
+    created: Optional[datetime] = None
+    """The date and time the item was created."""
+
+    modified: Optional[datetime] = None
+    """The date and time the item was last modified."""
+
+    name: Optional[str] = None
+    """A short description of Calls app, not shown to end users."""
+
+    uid: Optional[str] = None
+    """A Cloudflare-generated unique identifier for a item."""
diff --git a/src/cloudflare/types/certificate_authorities/hostname_association.py b/src/cloudflare/types/certificate_authorities/hostname_association.py
index 971951cd3e0..c5bfa88f702 100644
--- a/src/cloudflare/types/certificate_authorities/hostname_association.py
+++ b/src/cloudflare/types/certificate_authorities/hostname_association.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["HostnameAssociation"]
 
-HostnameAssociation = str
+HostnameAssociation: TypeAlias = str
diff --git a/src/cloudflare/types/certificate_authorities/hostname_association_get_params.py b/src/cloudflare/types/certificate_authorities/hostname_association_get_params.py
index 83be686e02c..f0383af9e5f 100644
--- a/src/cloudflare/types/certificate_authorities/hostname_association_get_params.py
+++ b/src/cloudflare/types/certificate_authorities/hostname_association_get_params.py
@@ -9,7 +9,7 @@
 
 class HostnameAssociationGetParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     mtls_certificate_id: str
     """
diff --git a/src/cloudflare/types/certificate_authorities/hostname_association_update_params.py b/src/cloudflare/types/certificate_authorities/hostname_association_update_params.py
index cc9377d392a..b0c621712c6 100644
--- a/src/cloudflare/types/certificate_authorities/hostname_association_update_params.py
+++ b/src/cloudflare/types/certificate_authorities/hostname_association_update_params.py
@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Required, TypedDict
 
+from ..._types import SequenceNotStr
 from .hostname_association import HostnameAssociation
 
 __all__ = ["HostnameAssociationUpdateParams"]
@@ -12,9 +12,9 @@
 
 class HostnameAssociationUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    hostnames: List[HostnameAssociation]
+    hostnames: SequenceNotStr[HostnameAssociation]
 
     mtls_certificate_id: str
     """
diff --git a/src/cloudflare/types/challenges/widget_create_params.py b/src/cloudflare/types/challenges/widget_create_params.py
deleted file mode 100644
index 12d0b058c19..00000000000
--- a/src/cloudflare/types/challenges/widget_create_params.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List
-from typing_extensions import Literal, Required, TypedDict
-
-from .widget_domain import WidgetDomain
-
-__all__ = ["WidgetCreateParams"]
-
-
-class WidgetCreateParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    domains: Required[List[WidgetDomain]]
-
-    mode: Required[Literal["non-interactive", "invisible", "managed"]]
-    """Widget Mode"""
-
-    name: Required[str]
-    """Human readable widget name.
-
-    Not unique. Cloudflare suggests that you set this to a meaningful string to make
-    it easier to identify your widget, and where it is used.
-    """
-
-    direction: Literal["asc", "desc"]
-    """Direction to order widgets."""
-
-    order: Literal["id", "sitekey", "name", "created_on", "modified_on"]
-    """Field to order widgets by."""
-
-    page: float
-    """Page number of paginated results."""
-
-    per_page: float
-    """Number of items per page."""
-
-    bot_fight_mode: bool
-    """
-    If bot_fight_mode is set to `true`, Cloudflare issues computationally expensive
-    challenges in response to malicious bots (ENT only).
-    """
-
-    clearance_level: Literal["no_clearance", "jschallenge", "managed", "interactive"]
-    """
-    If Turnstile is embedded on a Cloudflare site and the widget should grant
-    challenge clearance, this setting can determine the clearance level to be set
-    """
-
-    offlabel: bool
-    """Do not show any Cloudflare branding on the widget (ENT only)."""
-
-    region: Literal["world"]
-    """Region where this widget can be used."""
diff --git a/src/cloudflare/types/challenges/widget_domain.py b/src/cloudflare/types/challenges/widget_domain.py
deleted file mode 100644
index 20d73b3d548..00000000000
--- a/src/cloudflare/types/challenges/widget_domain.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-__all__ = ["WidgetDomain"]
-
-WidgetDomain = str
diff --git a/src/cloudflare/types/challenges/widget_list_params.py b/src/cloudflare/types/challenges/widget_list_params.py
deleted file mode 100644
index bdc0056b1f3..00000000000
--- a/src/cloudflare/types/challenges/widget_list_params.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, Required, TypedDict
-
-__all__ = ["WidgetListParams"]
-
-
-class WidgetListParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    direction: Literal["asc", "desc"]
-    """Direction to order widgets."""
-
-    order: Literal["id", "sitekey", "name", "created_on", "modified_on"]
-    """Field to order widgets by."""
-
-    page: float
-    """Page number of paginated results."""
-
-    per_page: float
-    """Number of items per page."""
diff --git a/src/cloudflare/types/client_certificates/__init__.py b/src/cloudflare/types/client_certificates/__init__.py
index a7c9d42fe40..06460cdfe7e 100644
--- a/src/cloudflare/types/client_certificates/__init__.py
+++ b/src/cloudflare/types/client_certificates/__init__.py
@@ -3,5 +3,6 @@
 from __future__ import annotations
 
 from .client_certificate import ClientCertificate as ClientCertificate
+from .client_certificate_edit_params import ClientCertificateEditParams as ClientCertificateEditParams
 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_certificates/client_certificate.py b/src/cloudflare/types/client_certificates/client_certificate.py
index 58026ca697f..0d87ce4e49b 100644
--- a/src/cloudflare/types/client_certificates/client_certificate.py
+++ b/src/cloudflare/types/client_certificates/client_certificate.py
@@ -9,6 +9,8 @@
 
 
 class CertificateAuthority(BaseModel):
+    """Certificate Authority used to issue the Client Certificate"""
+
     id: Optional[str] = None
 
     name: Optional[str] = None
@@ -16,7 +18,7 @@ class CertificateAuthority(BaseModel):
 
 class ClientCertificate(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
 
     certificate: Optional[str] = None
     """The Client Certificate PEM"""
diff --git a/src/cloudflare/types/client_certificates/client_certificate_create_params.py b/src/cloudflare/types/client_certificates/client_certificate_create_params.py
index a09505c4cf0..b2c10107501 100644
--- a/src/cloudflare/types/client_certificates/client_certificate_create_params.py
+++ b/src/cloudflare/types/client_certificates/client_certificate_create_params.py
@@ -9,7 +9,7 @@
 
 class ClientCertificateCreateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     csr: Required[str]
     """The Certificate Signing Request (CSR). Must be newline-encoded."""
diff --git a/src/cloudflare/types/client_certificates/client_certificate_edit_params.py b/src/cloudflare/types/client_certificates/client_certificate_edit_params.py
new file mode 100644
index 00000000000..91c3632b733
--- /dev/null
+++ b/src/cloudflare/types/client_certificates/client_certificate_edit_params.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ClientCertificateEditParams"]
+
+
+class ClientCertificateEditParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    reactivate: bool
diff --git a/src/cloudflare/types/client_certificates/client_certificate_list_params.py b/src/cloudflare/types/client_certificates/client_certificate_list_params.py
index 4fccfbe2bd9..10dc96904dc 100644
--- a/src/cloudflare/types/client_certificates/client_certificate_list_params.py
+++ b/src/cloudflare/types/client_certificates/client_certificate_list_params.py
@@ -9,7 +9,7 @@
 
 class ClientCertificateListParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     limit: int
     """Limit to the number of records returned."""
diff --git a/src/cloudflare/types/cloud_connector/rule_list_response.py b/src/cloudflare/types/cloud_connector/rule_list_response.py
index 059d139b74b..db6726fcd6d 100644
--- a/src/cloudflare/types/cloud_connector/rule_list_response.py
+++ b/src/cloudflare/types/cloud_connector/rule_list_response.py
@@ -9,6 +9,8 @@
 
 
 class Parameters(BaseModel):
+    """Parameters of Cloud Connector Rule"""
+
     host: Optional[str] = None
     """Host to perform Cloud Connection to"""
 
@@ -25,5 +27,5 @@ class RuleListResponse(BaseModel):
     parameters: Optional[Parameters] = None
     """Parameters of Cloud Connector Rule"""
 
-    provider: Optional[Literal["aws_s3", "r2", "gcp_storage", "azure_storage"]] = None
+    provider: Optional[Literal["aws_s3", "cloudflare_r2", "gcp_storage", "azure_storage"]] = None
     """Cloud Provider type"""
diff --git a/src/cloudflare/types/cloud_connector/rule_update_params.py b/src/cloudflare/types/cloud_connector/rule_update_params.py
index f8c25c9b2a7..29a4207e16b 100644
--- a/src/cloudflare/types/cloud_connector/rule_update_params.py
+++ b/src/cloudflare/types/cloud_connector/rule_update_params.py
@@ -5,23 +5,24 @@
 from typing import Iterable
 from typing_extensions import Literal, Required, TypedDict
 
-__all__ = ["RuleUpdateParams", "Body", "BodyParameters"]
+__all__ = ["RuleUpdateParams", "Rule", "RuleParameters"]
 
 
 class RuleUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    body: Required[Iterable[Body]]
-    """List of Cloud Connector rules"""
+    rules: Iterable[Rule]
 
 
-class BodyParameters(TypedDict, total=False):
+class RuleParameters(TypedDict, total=False):
+    """Parameters of Cloud Connector Rule"""
+
     host: str
     """Host to perform Cloud Connection to"""
 
 
-class Body(TypedDict, total=False):
+class Rule(TypedDict, total=False):
     id: str
 
     description: str
@@ -30,8 +31,8 @@ class Body(TypedDict, total=False):
 
     expression: str
 
-    parameters: BodyParameters
+    parameters: RuleParameters
     """Parameters of Cloud Connector Rule"""
 
-    provider: Literal["aws_s3", "r2", "gcp_storage", "azure_storage"]
+    provider: Literal["aws_s3", "cloudflare_r2", "gcp_storage", "azure_storage"]
     """Cloud Provider type"""
diff --git a/src/cloudflare/types/cloud_connector/rule_update_response.py b/src/cloudflare/types/cloud_connector/rule_update_response.py
index 86d08cd682e..138a036dae4 100644
--- a/src/cloudflare/types/cloud_connector/rule_update_response.py
+++ b/src/cloudflare/types/cloud_connector/rule_update_response.py
@@ -1,19 +1,21 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Optional
 from typing_extensions import Literal
 
 from ..._models import BaseModel
 
-__all__ = ["RuleUpdateResponse", "RuleUpdateResponseItem", "RuleUpdateResponseItemParameters"]
+__all__ = ["RuleUpdateResponse", "Parameters"]
 
 
-class RuleUpdateResponseItemParameters(BaseModel):
+class Parameters(BaseModel):
+    """Parameters of Cloud Connector Rule"""
+
     host: Optional[str] = None
     """Host to perform Cloud Connection to"""
 
 
-class RuleUpdateResponseItem(BaseModel):
+class RuleUpdateResponse(BaseModel):
     id: Optional[str] = None
 
     description: Optional[str] = None
@@ -22,11 +24,8 @@ class RuleUpdateResponseItem(BaseModel):
 
     expression: Optional[str] = None
 
-    parameters: Optional[RuleUpdateResponseItemParameters] = None
+    parameters: Optional[Parameters] = None
     """Parameters of Cloud Connector Rule"""
 
-    provider: Optional[Literal["aws_s3", "r2", "gcp_storage", "azure_storage"]] = None
+    provider: Optional[Literal["aws_s3", "cloudflare_r2", "gcp_storage", "azure_storage"]] = None
     """Cloud Provider type"""
-
-
-RuleUpdateResponse = List[RuleUpdateResponseItem]
diff --git a/src/cloudflare/types/cloudforce_one/__init__.py b/src/cloudflare/types/cloudforce_one/__init__.py
index f069202d49b..89926d23c3f 100644
--- a/src/cloudflare/types/cloudforce_one/__init__.py
+++ b/src/cloudflare/types/cloudforce_one/__init__.py
@@ -10,4 +10,17 @@
 from .request_list_params import RequestListParams as RequestListParams
 from .request_create_params import RequestCreateParams as RequestCreateParams
 from .request_update_params import RequestUpdateParams as RequestUpdateParams
+from .request_types_response import RequestTypesResponse as RequestTypesResponse
 from .request_delete_response import RequestDeleteResponse as RequestDeleteResponse
+from .threat_event_edit_params import ThreatEventEditParams as ThreatEventEditParams
+from .threat_event_list_params import ThreatEventListParams as ThreatEventListParams
+from .threat_event_get_response import ThreatEventGetResponse as ThreatEventGetResponse
+from .threat_event_create_params import ThreatEventCreateParams as ThreatEventCreateParams
+from .threat_event_edit_response import ThreatEventEditResponse as ThreatEventEditResponse
+from .threat_event_list_response import ThreatEventListResponse as ThreatEventListResponse
+from .binary_storage_create_params import BinaryStorageCreateParams as BinaryStorageCreateParams
+from .threat_event_create_response import ThreatEventCreateResponse as ThreatEventCreateResponse
+from .threat_event_delete_response import ThreatEventDeleteResponse as ThreatEventDeleteResponse
+from .binary_storage_create_response import BinaryStorageCreateResponse as BinaryStorageCreateResponse
+from .threat_event_bulk_create_params import ThreatEventBulkCreateParams as ThreatEventBulkCreateParams
+from .threat_event_bulk_create_response import ThreatEventBulkCreateResponse as ThreatEventBulkCreateResponse
diff --git a/src/cloudflare/types/cloudforce_one/binary_storage_create_params.py b/src/cloudflare/types/cloudforce_one/binary_storage_create_params.py
new file mode 100644
index 00000000000..ff8d1882de7
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/binary_storage_create_params.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ..._types import FileTypes
+
+__all__ = ["BinaryStorageCreateParams"]
+
+
+class BinaryStorageCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    file: Required[FileTypes]
+    """The binary file content to upload."""
diff --git a/src/cloudflare/types/cloudforce_one/binary_storage_create_response.py b/src/cloudflare/types/cloudforce_one/binary_storage_create_response.py
new file mode 100644
index 00000000000..55c34d4e2fa
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/binary_storage_create_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["BinaryStorageCreateResponse"]
+
+
+class BinaryStorageCreateResponse(BaseModel):
+    content_type: str
+
+    md5: str
+
+    sha1: str
+
+    sha256: str
diff --git a/src/cloudflare/types/cloudforce_one/item.py b/src/cloudflare/types/cloudforce_one/item.py
index fc01fe5c174..cf8bf25eb49 100644
--- a/src/cloudflare/types/cloudforce_one/item.py
+++ b/src/cloudflare/types/cloudforce_one/item.py
@@ -11,36 +11,36 @@
 
 class Item(BaseModel):
     id: str
-    """UUID"""
+    """UUID."""
 
     content: str
-    """Request content"""
+    """Request content."""
 
     created: datetime
 
     priority: datetime
 
     request: str
-    """Requested information from request"""
+    """Requested information from request."""
 
     summary: str
-    """Brief description of the request"""
+    """Brief description of the request."""
 
     tlp: Literal["clear", "amber", "amber-strict", "green", "red"]
-    """The CISA defined Traffic Light Protocol (TLP)"""
+    """The CISA defined Traffic Light Protocol (TLP)."""
 
     updated: datetime
 
     completed: Optional[datetime] = None
 
     message_tokens: Optional[int] = None
-    """Tokens for the request messages"""
+    """Tokens for the request messages."""
 
     readable_id: Optional[str] = None
-    """Readable Request ID"""
+    """Readable Request ID."""
 
     status: Optional[Literal["open", "accepted", "reported", "approved", "completed", "declined"]] = None
-    """Request Status"""
+    """Request Status."""
 
     tokens: Optional[int] = None
-    """Tokens for the request"""
+    """Tokens for the request."""
diff --git a/src/cloudflare/types/cloudforce_one/list_item.py b/src/cloudflare/types/cloudforce_one/list_item.py
index 99703584af8..b8533107348 100644
--- a/src/cloudflare/types/cloudforce_one/list_item.py
+++ b/src/cloudflare/types/cloudforce_one/list_item.py
@@ -11,36 +11,36 @@
 
 class ListItem(BaseModel):
     id: str
-    """UUID"""
+    """UUID."""
 
     created: datetime
-    """Request creation time"""
+    """Request creation time."""
 
     priority: Literal["routine", "high", "urgent"]
 
     request: str
-    """Requested information from request"""
+    """Requested information from request."""
 
     summary: str
-    """Brief description of the request"""
+    """Brief description of the request."""
 
     tlp: Literal["clear", "amber", "amber-strict", "green", "red"]
-    """The CISA defined Traffic Light Protocol (TLP)"""
+    """The CISA defined Traffic Light Protocol (TLP)."""
 
     updated: datetime
-    """Request last updated time"""
+    """Request last updated time."""
 
     completed: Optional[datetime] = None
-    """Request completion time"""
+    """Request completion time."""
 
     message_tokens: Optional[int] = None
-    """Tokens for the request messages"""
+    """Tokens for the request messages."""
 
     readable_id: Optional[str] = None
-    """Readable Request ID"""
+    """Readable Request ID."""
 
     status: Optional[Literal["open", "accepted", "reported", "approved", "completed", "declined"]] = None
-    """Request Status"""
+    """Request Status."""
 
     tokens: Optional[int] = None
-    """Tokens for the request"""
+    """Tokens for the request."""
diff --git a/src/cloudflare/types/cloudforce_one/quota.py b/src/cloudflare/types/cloudforce_one/quota.py
index 8eff78bfcc5..9fca5cf899c 100644
--- a/src/cloudflare/types/cloudforce_one/quota.py
+++ b/src/cloudflare/types/cloudforce_one/quota.py
@@ -10,13 +10,13 @@
 
 class Quota(BaseModel):
     anniversary_date: Optional[datetime] = None
-    """Anniversary date is when annual quota limit is refresh"""
+    """Anniversary date is when annual quota limit is refreshed."""
 
     quarter_anniversary_date: Optional[datetime] = None
-    """Quater anniversary date is when quota limit is refreshed each quarter"""
+    """Quarter anniversary date is when quota limit is refreshed each quarter."""
 
     quota: Optional[int] = None
-    """Tokens for the quarter"""
+    """Tokens for the quarter."""
 
     remaining: Optional[int] = None
-    """Tokens remaining for the quarter"""
+    """Tokens remaining for the quarter."""
diff --git a/src/cloudflare/types/cloudforce_one/request_create_params.py b/src/cloudflare/types/cloudforce_one/request_create_params.py
index 481f3d6e23e..e145b6b4e5f 100644
--- a/src/cloudflare/types/cloudforce_one/request_create_params.py
+++ b/src/cloudflare/types/cloudforce_one/request_create_params.py
@@ -2,23 +2,26 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
 __all__ = ["RequestCreateParams"]
 
 
 class RequestCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
     content: str
-    """Request content"""
+    """Request content."""
 
     priority: str
-    """Priority for analyzing the request"""
+    """Priority for analyzing the request."""
 
     request_type: str
-    """Requested information from request"""
+    """Requested information from request."""
 
     summary: str
-    """Brief description of the request"""
+    """Brief description of the request."""
 
     tlp: Literal["clear", "amber", "amber-strict", "green", "red"]
-    """The CISA defined Traffic Light Protocol (TLP)"""
+    """The CISA defined Traffic Light Protocol (TLP)."""
diff --git a/src/cloudflare/types/cloudforce_one/request_delete_response.py b/src/cloudflare/types/cloudforce_one/request_delete_response.py
index b7ed5ffbe10..e92fb978acb 100644
--- a/src/cloudflare/types/cloudforce_one/request_delete_response.py
+++ b/src/cloudflare/types/cloudforce_one/request_delete_response.py
@@ -1,18 +1,45 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
 from typing_extensions import Literal
 
 from ..._models import BaseModel
-from ..shared.response_info import ResponseInfo
 
-__all__ = ["RequestDeleteResponse"]
+__all__ = ["RequestDeleteResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
 
 
 class RequestDeleteResponse(BaseModel):
-    errors: List[ResponseInfo]
+    errors: List[Error]
 
-    messages: List[ResponseInfo]
+    messages: List[Message]
 
     success: Literal[True]
-    """Whether the API call was successful"""
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/cloudforce_one/request_list_params.py b/src/cloudflare/types/cloudforce_one/request_list_params.py
index cc21ecf8073..385f0dc0d77 100644
--- a/src/cloudflare/types/cloudforce_one/request_list_params.py
+++ b/src/cloudflare/types/cloudforce_one/request_list_params.py
@@ -12,32 +12,35 @@
 
 
 class RequestListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
     page: Required[int]
-    """Page number of results"""
+    """Page number of results."""
 
     per_page: Required[int]
-    """Number of results per page"""
+    """Number of results per page."""
 
     completed_after: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-    """Retrieve requests completed after this time"""
+    """Retrieve requests completed after this time."""
 
     completed_before: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-    """Retrieve requests completed before this time"""
+    """Retrieve requests completed before this time."""
 
     created_after: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-    """Retrieve requests created after this time"""
+    """Retrieve requests created after this time."""
 
     created_before: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-    """Retrieve requests created before this time"""
+    """Retrieve requests created before this time."""
 
     request_type: str
-    """Requested information from request"""
+    """Requested information from request."""
 
     sort_by: str
-    """Field to sort results by"""
+    """Field to sort results by."""
 
     sort_order: Literal["asc", "desc"]
-    """Sort order (asc or desc)"""
+    """Sort order (asc or desc)."""
 
     status: Literal["open", "accepted", "reported", "approved", "completed", "declined"]
-    """Request Status"""
+    """Request Status."""
diff --git a/src/cloudflare/types/cloudforce_one/request_types.py b/src/cloudflare/types/cloudforce_one/request_types.py
index 829b4ebe664..7393af0e69d 100644
--- a/src/cloudflare/types/cloudforce_one/request_types.py
+++ b/src/cloudflare/types/cloudforce_one/request_types.py
@@ -1,7 +1,10 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from typing_extensions import TypeAlias
+
+from .request_types_response import RequestTypesResponse
 
 __all__ = ["RequestTypes"]
 
-RequestTypes = List[str]
+RequestTypes: TypeAlias = List[RequestTypesResponse]
diff --git a/src/cloudflare/types/cloudforce_one/request_types_response.py b/src/cloudflare/types/cloudforce_one/request_types_response.py
new file mode 100644
index 00000000000..4be6a1748c5
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/request_types_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["RequestTypesResponse"]
+
+RequestTypesResponse: TypeAlias = str
diff --git a/src/cloudflare/types/cloudforce_one/request_update_params.py b/src/cloudflare/types/cloudforce_one/request_update_params.py
index f4ce30ba182..ac96d7fb0ca 100644
--- a/src/cloudflare/types/cloudforce_one/request_update_params.py
+++ b/src/cloudflare/types/cloudforce_one/request_update_params.py
@@ -8,20 +8,20 @@
 
 
 class RequestUpdateParams(TypedDict, total=False):
-    account_identifier: Required[str]
-    """Identifier"""
+    account_id: Required[str]
+    """Identifier."""
 
     content: str
-    """Request content"""
+    """Request content."""
 
     priority: str
-    """Priority for analyzing the request"""
+    """Priority for analyzing the request."""
 
     request_type: str
-    """Requested information from request"""
+    """Requested information from request."""
 
     summary: str
-    """Brief description of the request"""
+    """Brief description of the request."""
 
     tlp: Literal["clear", "amber", "amber-strict", "green", "red"]
-    """The CISA defined Traffic Light Protocol (TLP)"""
+    """The CISA defined Traffic Light Protocol (TLP)."""
diff --git a/src/cloudflare/types/cloudforce_one/requests/__init__.py b/src/cloudflare/types/cloudforce_one/requests/__init__.py
index 29b61ceae98..f5da4d3a21a 100644
--- a/src/cloudflare/types/cloudforce_one/requests/__init__.py
+++ b/src/cloudflare/types/cloudforce_one/requests/__init__.py
@@ -5,8 +5,13 @@
 from .label import Label as Label
 from .message import Message as Message
 from .priority import Priority as Priority
+from .asset_get_response import AssetGetResponse as AssetGetResponse
 from .message_get_params import MessageGetParams as MessageGetParams
-from .message_get_response import MessageGetResponse as MessageGetResponse
+from .asset_create_params import AssetCreateParams as AssetCreateParams
+from .asset_update_params import AssetUpdateParams as AssetUpdateParams
+from .asset_create_response import AssetCreateResponse as AssetCreateResponse
+from .asset_delete_response import AssetDeleteResponse as AssetDeleteResponse
+from .asset_update_response import AssetUpdateResponse as AssetUpdateResponse
 from .message_create_params import MessageCreateParams as MessageCreateParams
 from .message_update_params import MessageUpdateParams as MessageUpdateParams
 from .priority_create_params import PriorityCreateParams as PriorityCreateParams
diff --git a/src/cloudflare/types/cloudforce_one/requests/asset_create_params.py b/src/cloudflare/types/cloudforce_one/requests/asset_create_params.py
new file mode 100644
index 00000000000..23f5455f55c
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/requests/asset_create_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["AssetCreateParams"]
+
+
+class AssetCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    page: Required[int]
+    """Page number of results."""
+
+    per_page: Required[int]
+    """Number of results per page."""
diff --git a/src/cloudflare/types/cloudforce_one/requests/asset_create_response.py b/src/cloudflare/types/cloudforce_one/requests/asset_create_response.py
new file mode 100644
index 00000000000..f34bcb45784
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/requests/asset_create_response.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["AssetCreateResponse"]
+
+
+class AssetCreateResponse(BaseModel):
+    id: int
+    """Asset ID."""
+
+    name: str
+    """Asset name."""
+
+    created: Optional[datetime] = None
+    """Defines the asset creation time."""
+
+    description: Optional[str] = None
+    """Asset description."""
+
+    file_type: Optional[str] = None
+    """Asset file type."""
diff --git a/src/cloudflare/types/cloudforce_one/requests/asset_delete_response.py b/src/cloudflare/types/cloudforce_one/requests/asset_delete_response.py
new file mode 100644
index 00000000000..7267e1fa0bb
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/requests/asset_delete_response.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["AssetDeleteResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class AssetDeleteResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/cloudforce_one/requests/asset_get_response.py b/src/cloudflare/types/cloudforce_one/requests/asset_get_response.py
new file mode 100644
index 00000000000..d9f54f16ac1
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/requests/asset_get_response.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["AssetGetResponse"]
+
+
+class AssetGetResponse(BaseModel):
+    id: int
+    """Asset ID."""
+
+    name: str
+    """Asset name."""
+
+    created: Optional[datetime] = None
+    """Defines the asset creation time."""
+
+    description: Optional[str] = None
+    """Asset description."""
+
+    file_type: Optional[str] = None
+    """Asset file type."""
diff --git a/src/cloudflare/types/cloudforce_one/requests/asset_update_params.py b/src/cloudflare/types/cloudforce_one/requests/asset_update_params.py
new file mode 100644
index 00000000000..edde12c4a66
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/requests/asset_update_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["AssetUpdateParams"]
+
+
+class AssetUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    request_id: Required[str]
+    """UUID."""
+
+    source: str
+    """Asset file to upload."""
diff --git a/src/cloudflare/types/cloudforce_one/requests/asset_update_response.py b/src/cloudflare/types/cloudforce_one/requests/asset_update_response.py
new file mode 100644
index 00000000000..1ed20be66de
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/requests/asset_update_response.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["AssetUpdateResponse"]
+
+
+class AssetUpdateResponse(BaseModel):
+    id: int
+    """Asset ID."""
+
+    name: str
+    """Asset name."""
+
+    created: Optional[datetime] = None
+    """Defines the asset creation time."""
+
+    description: Optional[str] = None
+    """Asset description."""
+
+    file_type: Optional[str] = None
+    """Asset file type."""
diff --git a/src/cloudflare/types/cloudforce_one/requests/label.py b/src/cloudflare/types/cloudforce_one/requests/label.py
index 589cb02b053..156ce881e86 100644
--- a/src/cloudflare/types/cloudforce_one/requests/label.py
+++ b/src/cloudflare/types/cloudforce_one/requests/label.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["Label"]
 
-Label = str
+Label: TypeAlias = str
diff --git a/src/cloudflare/types/cloudforce_one/requests/message.py b/src/cloudflare/types/cloudforce_one/requests/message.py
index b36882e68c4..170586df776 100644
--- a/src/cloudflare/types/cloudforce_one/requests/message.py
+++ b/src/cloudflare/types/cloudforce_one/requests/message.py
@@ -10,19 +10,19 @@
 
 class Message(BaseModel):
     id: int
-    """Message ID"""
+    """Message ID."""
 
     author: str
-    """Author of message"""
+    """Author of message."""
 
     content: str
-    """Content of message"""
+    """Content of message."""
 
     is_follow_on_request: bool
-    """Message is a follow-on request"""
+    """Whether the message is a follow-on request."""
 
     updated: datetime
-    """Message last updated time"""
+    """Defines the message last updated time."""
 
     created: Optional[datetime] = None
-    """Message creation time"""
+    """Defines the message creation time."""
diff --git a/src/cloudflare/types/cloudforce_one/requests/message_create_params.py b/src/cloudflare/types/cloudforce_one/requests/message_create_params.py
index 8250618687f..eed1082151a 100644
--- a/src/cloudflare/types/cloudforce_one/requests/message_create_params.py
+++ b/src/cloudflare/types/cloudforce_one/requests/message_create_params.py
@@ -8,8 +8,8 @@
 
 
 class MessageCreateParams(TypedDict, total=False):
-    account_identifier: Required[str]
-    """Identifier"""
+    account_id: Required[str]
+    """Identifier."""
 
     content: str
-    """Content of message"""
+    """Content of message."""
diff --git a/src/cloudflare/types/cloudforce_one/requests/message_delete_response.py b/src/cloudflare/types/cloudforce_one/requests/message_delete_response.py
index a0d45a64036..8dcf9f38a18 100644
--- a/src/cloudflare/types/cloudforce_one/requests/message_delete_response.py
+++ b/src/cloudflare/types/cloudforce_one/requests/message_delete_response.py
@@ -1,18 +1,45 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
 from typing_extensions import Literal
 
 from ...._models import BaseModel
-from ...shared.response_info import ResponseInfo
 
-__all__ = ["MessageDeleteResponse"]
+__all__ = ["MessageDeleteResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
 
 
 class MessageDeleteResponse(BaseModel):
-    errors: List[ResponseInfo]
+    errors: List[Error]
 
-    messages: List[ResponseInfo]
+    messages: List[Message]
 
     success: Literal[True]
-    """Whether the API call was successful"""
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/cloudforce_one/requests/message_get_params.py b/src/cloudflare/types/cloudforce_one/requests/message_get_params.py
index ec315a3a527..f8a73ef040c 100644
--- a/src/cloudflare/types/cloudforce_one/requests/message_get_params.py
+++ b/src/cloudflare/types/cloudforce_one/requests/message_get_params.py
@@ -12,23 +12,23 @@
 
 
 class MessageGetParams(TypedDict, total=False):
-    account_identifier: Required[str]
-    """Identifier"""
+    account_id: Required[str]
+    """Identifier."""
 
     page: Required[int]
-    """Page number of results"""
+    """Page number of results."""
 
     per_page: Required[int]
-    """Number of results per page"""
+    """Number of results per page."""
 
     after: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-    """Retrieve messages created after this time"""
+    """Retrieve mes ges created after this time."""
 
     before: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-    """Retrieve messages created before this time"""
+    """Retrieve messages created before this time."""
 
     sort_by: str
-    """Field to sort results by"""
+    """Field to sort results by."""
 
     sort_order: Literal["asc", "desc"]
-    """Sort order (asc or desc)"""
+    """Sort order (asc or desc)."""
diff --git a/src/cloudflare/types/cloudforce_one/requests/message_get_response.py b/src/cloudflare/types/cloudforce_one/requests/message_get_response.py
deleted file mode 100644
index 52f2c5cf762..00000000000
--- a/src/cloudflare/types/cloudforce_one/requests/message_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .message import Message
-
-__all__ = ["MessageGetResponse"]
-
-MessageGetResponse = List[Message]
diff --git a/src/cloudflare/types/cloudforce_one/requests/message_update_params.py b/src/cloudflare/types/cloudforce_one/requests/message_update_params.py
index 76a9b248dcf..c832ce22237 100644
--- a/src/cloudflare/types/cloudforce_one/requests/message_update_params.py
+++ b/src/cloudflare/types/cloudforce_one/requests/message_update_params.py
@@ -2,29 +2,17 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Required, TypedDict
 
 __all__ = ["MessageUpdateParams"]
 
 
 class MessageUpdateParams(TypedDict, total=False):
-    account_identifier: Required[str]
-    """Identifier"""
+    account_id: Required[str]
+    """Identifier."""
 
-    request_identifier: Required[str]
-    """UUID"""
+    request_id: Required[str]
+    """UUID."""
 
     content: str
-    """Request content"""
-
-    priority: str
-    """Priority for analyzing the request"""
-
-    request_type: str
-    """Requested information from request"""
-
-    summary: str
-    """Brief description of the request"""
-
-    tlp: Literal["clear", "amber", "amber-strict", "green", "red"]
-    """The CISA defined Traffic Light Protocol (TLP)"""
+    """Content of message."""
diff --git a/src/cloudflare/types/cloudforce_one/requests/priority.py b/src/cloudflare/types/cloudforce_one/requests/priority.py
index a374ce96aa1..0619416d4dc 100644
--- a/src/cloudflare/types/cloudforce_one/requests/priority.py
+++ b/src/cloudflare/types/cloudforce_one/requests/priority.py
@@ -12,22 +12,22 @@
 
 class Priority(BaseModel):
     id: str
-    """UUID"""
+    """UUID."""
 
     created: datetime
-    """Priority creation time"""
+    """Priority creation time."""
 
     labels: List[Label]
-    """List of labels"""
+    """List of labels."""
 
     priority: int
-    """Priority"""
+    """Priority."""
 
     requirement: str
-    """Requirement"""
+    """Requirement."""
 
     tlp: Literal["clear", "amber", "amber-strict", "green", "red"]
-    """The CISA defined Traffic Light Protocol (TLP)"""
+    """The CISA defined Traffic Light Protocol (TLP)."""
 
     updated: datetime
-    """Priority last updated time"""
+    """Priority last updated time."""
diff --git a/src/cloudflare/types/cloudforce_one/requests/priority_create_params.py b/src/cloudflare/types/cloudforce_one/requests/priority_create_params.py
index 155ad36b0c4..58a30eaf6d7 100644
--- a/src/cloudflare/types/cloudforce_one/requests/priority_create_params.py
+++ b/src/cloudflare/types/cloudforce_one/requests/priority_create_params.py
@@ -2,23 +2,26 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Literal, Required, TypedDict
 
 from .label import Label
+from ...._types import SequenceNotStr
 
 __all__ = ["PriorityCreateParams"]
 
 
 class PriorityCreateParams(TypedDict, total=False):
-    labels: Required[List[Label]]
-    """List of labels"""
+    account_id: Required[str]
+    """Identifier."""
+
+    labels: Required[SequenceNotStr[Label]]
+    """List of labels."""
 
     priority: Required[int]
-    """Priority"""
+    """Priority."""
 
     requirement: Required[str]
-    """Requirement"""
+    """Requirement."""
 
     tlp: Required[Literal["clear", "amber", "amber-strict", "green", "red"]]
-    """The CISA defined Traffic Light Protocol (TLP)"""
+    """The CISA defined Traffic Light Protocol (TLP)."""
diff --git a/src/cloudflare/types/cloudforce_one/requests/priority_delete_response.py b/src/cloudflare/types/cloudforce_one/requests/priority_delete_response.py
index ee172239bfe..eff3c75492a 100644
--- a/src/cloudflare/types/cloudforce_one/requests/priority_delete_response.py
+++ b/src/cloudflare/types/cloudforce_one/requests/priority_delete_response.py
@@ -1,18 +1,45 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
 from typing_extensions import Literal
 
 from ...._models import BaseModel
-from ...shared.response_info import ResponseInfo
 
-__all__ = ["PriorityDeleteResponse"]
+__all__ = ["PriorityDeleteResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
 
 
 class PriorityDeleteResponse(BaseModel):
-    errors: List[ResponseInfo]
+    errors: List[Error]
 
-    messages: List[ResponseInfo]
+    messages: List[Message]
 
     success: Literal[True]
-    """Whether the API call was successful"""
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/cloudforce_one/requests/priority_update_params.py b/src/cloudflare/types/cloudforce_one/requests/priority_update_params.py
index 248b24319ce..27a0b98135a 100644
--- a/src/cloudflare/types/cloudforce_one/requests/priority_update_params.py
+++ b/src/cloudflare/types/cloudforce_one/requests/priority_update_params.py
@@ -2,26 +2,26 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Literal, Required, TypedDict
 
 from .label import Label
+from ...._types import SequenceNotStr
 
 __all__ = ["PriorityUpdateParams"]
 
 
 class PriorityUpdateParams(TypedDict, total=False):
-    account_identifier: Required[str]
-    """Identifier"""
+    account_id: Required[str]
+    """Identifier."""
 
-    labels: Required[List[Label]]
-    """List of labels"""
+    labels: Required[SequenceNotStr[Label]]
+    """List of labels."""
 
     priority: Required[int]
-    """Priority"""
+    """Priority."""
 
     requirement: Required[str]
-    """Requirement"""
+    """Requirement."""
 
     tlp: Required[Literal["clear", "amber", "amber-strict", "green", "red"]]
-    """The CISA defined Traffic Light Protocol (TLP)"""
+    """The CISA defined Traffic Light Protocol (TLP)."""
diff --git a/src/cloudflare/types/cloudforce_one/scans/__init__.py b/src/cloudflare/types/cloudforce_one/scans/__init__.py
new file mode 100644
index 00000000000..20eebc53db3
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/scans/__init__.py
@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .scan_result import ScanResult as ScanResult
+from .config_edit_params import ConfigEditParams as ConfigEditParams
+from .result_get_response import ResultGetResponse as ResultGetResponse
+from .config_create_params import ConfigCreateParams as ConfigCreateParams
+from .config_edit_response import ConfigEditResponse as ConfigEditResponse
+from .config_list_response import ConfigListResponse as ConfigListResponse
+from .config_create_response import ConfigCreateResponse as ConfigCreateResponse
diff --git a/src/cloudflare/types/cloudforce_one/scans/config_create_params.py b/src/cloudflare/types/cloudforce_one/scans/config_create_params.py
new file mode 100644
index 00000000000..f974a52f24e
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/scans/config_create_params.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["ConfigCreateParams"]
+
+
+class ConfigCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Defines the Account ID."""
+
+    ips: Required[SequenceNotStr[str]]
+    """Defines a list of IP addresses or CIDR blocks to scan.
+
+    The maximum number of total IP addresses allowed is 5000.
+    """
+
+    frequency: float
+    """Defines the number of days between each scan (0 = One-off scan)."""
+
+    ports: SequenceNotStr[str]
+    """Defines a list of ports to scan.
+
+    Valid values are:"default", "all", or a comma-separated list of ports or range
+    of ports (e.g. ["1-80", "443"]). "default" scans the 100 most commonly open
+    ports.
+    """
diff --git a/src/cloudflare/types/cloudforce_one/scans/config_create_response.py b/src/cloudflare/types/cloudforce_one/scans/config_create_response.py
new file mode 100644
index 00000000000..16b562c6cb7
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/scans/config_create_response.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+
+from ...._models import BaseModel
+
+__all__ = ["ConfigCreateResponse"]
+
+
+class ConfigCreateResponse(BaseModel):
+    id: str
+    """Defines the Config ID."""
+
+    account_id: str
+
+    frequency: float
+    """Defines the number of days between each scan (0 = One-off scan)."""
+
+    ips: List[str]
+    """Defines a list of IP addresses or CIDR blocks to scan.
+
+    The maximum number of total IP addresses allowed is 5000.
+    """
+
+    ports: List[str]
+    """Defines a list of ports to scan.
+
+    Valid values are:"default", "all", or a comma-separated list of ports or range
+    of ports (e.g. ["1-80", "443"]). "default" scans the 100 most commonly open
+    ports.
+    """
diff --git a/src/cloudflare/types/cloudforce_one/scans/config_edit_params.py b/src/cloudflare/types/cloudforce_one/scans/config_edit_params.py
new file mode 100644
index 00000000000..57ced5e57e8
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/scans/config_edit_params.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["ConfigEditParams"]
+
+
+class ConfigEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Defines the Account ID."""
+
+    frequency: float
+    """Defines the number of days between each scan (0 = One-off scan)."""
+
+    ips: SequenceNotStr[str]
+    """Defines a list of IP addresses or CIDR blocks to scan.
+
+    The maximum number of total IP addresses allowed is 5000.
+    """
+
+    ports: SequenceNotStr[str]
+    """Defines a list of ports to scan.
+
+    Valid values are:"default", "all", or a comma-separated list of ports or range
+    of ports (e.g. ["1-80", "443"]). "default" scans the 100 most commonly open
+    ports.
+    """
diff --git a/src/cloudflare/types/cloudforce_one/scans/config_edit_response.py b/src/cloudflare/types/cloudforce_one/scans/config_edit_response.py
new file mode 100644
index 00000000000..e56adac9974
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/scans/config_edit_response.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+
+from ...._models import BaseModel
+
+__all__ = ["ConfigEditResponse"]
+
+
+class ConfigEditResponse(BaseModel):
+    id: str
+    """Defines the Config ID."""
+
+    account_id: str
+
+    frequency: float
+    """Defines the number of days between each scan (0 = One-off scan)."""
+
+    ips: List[str]
+    """Defines a list of IP addresses or CIDR blocks to scan.
+
+    The maximum number of total IP addresses allowed is 5000.
+    """
+
+    ports: List[str]
+    """Defines a list of ports to scan.
+
+    Valid values are:"default", "all", or a comma-separated list of ports or range
+    of ports (e.g. ["1-80", "443"]). "default" scans the 100 most commonly open
+    ports.
+    """
diff --git a/src/cloudflare/types/cloudforce_one/scans/config_list_response.py b/src/cloudflare/types/cloudforce_one/scans/config_list_response.py
new file mode 100644
index 00000000000..282b23d4da4
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/scans/config_list_response.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+
+from ...._models import BaseModel
+
+__all__ = ["ConfigListResponse"]
+
+
+class ConfigListResponse(BaseModel):
+    id: str
+    """Defines the Config ID."""
+
+    account_id: str
+
+    frequency: float
+    """Defines the number of days between each scan (0 = One-off scan)."""
+
+    ips: List[str]
+    """Defines a list of IP addresses or CIDR blocks to scan.
+
+    The maximum number of total IP addresses allowed is 5000.
+    """
+
+    ports: List[str]
+    """Defines a list of ports to scan.
+
+    Valid values are:"default", "all", or a comma-separated list of ports or range
+    of ports (e.g. ["1-80", "443"]). "default" scans the 100 most commonly open
+    ports.
+    """
diff --git a/src/cloudflare/types/cloudforce_one/scans/result_get_response.py b/src/cloudflare/types/cloudforce_one/scans/result_get_response.py
new file mode 100644
index 00000000000..a0c5eefe69b
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/scans/result_get_response.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+from .scan_result import ScanResult
+
+__all__ = ["ResultGetResponse"]
+
+
+class ResultGetResponse(BaseModel):
+    one_one_one_one: List[ScanResult] = FieldInfo(alias="1.1.1.1")
diff --git a/src/cloudflare/types/cloudforce_one/scans/scan_result.py b/src/cloudflare/types/cloudforce_one/scans/scan_result.py
new file mode 100644
index 00000000000..595fb25c350
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/scans/scan_result.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ...._models import BaseModel
+
+__all__ = ["ScanResult"]
+
+
+class ScanResult(BaseModel):
+    number: Optional[float] = None
+
+    proto: Optional[str] = None
+
+    status: Optional[str] = None
diff --git a/src/cloudflare/types/cloudforce_one/threat_event_bulk_create_params.py b/src/cloudflare/types/cloudforce_one/threat_event_bulk_create_params.py
new file mode 100644
index 00000000000..772769f2651
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_event_bulk_create_params.py
@@ -0,0 +1,81 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Required, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["ThreatEventBulkCreateParams", "Data", "DataRaw", "DataIndicator"]
+
+
+class ThreatEventBulkCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    data: Required[Iterable[Data]]
+
+    dataset_id: Required[Annotated[str, PropertyInfo(alias="datasetId")]]
+
+    include_created_events: Annotated[bool, PropertyInfo(alias="includeCreatedEvents")]
+    """When true, response includes array of created event UUIDs and shard IDs.
+
+    Useful for tracking which events were created and where.
+    """
+
+
+class DataRaw(TypedDict, total=False):
+    data: Required[Optional[Dict[str, object]]]
+
+    source: str
+
+    tlp: str
+
+
+class DataIndicator(TypedDict, total=False):
+    indicator_type: Required[Annotated[str, PropertyInfo(alias="indicatorType")]]
+    """The type of indicator (e.g., DOMAIN, IP, JA3, HASH)"""
+
+    value: Required[str]
+    """The indicator value (e.g., domain name, IP address, hash)"""
+
+
+class Data(TypedDict, total=False):
+    category: Required[str]
+
+    date: Required[Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]]
+
+    event: Required[str]
+
+    raw: Required[DataRaw]
+
+    tlp: Required[str]
+
+    account_id: Annotated[float, PropertyInfo(alias="accountId")]
+
+    attacker: Optional[str]
+
+    attacker_country: Annotated[str, PropertyInfo(alias="attackerCountry")]
+
+    dataset_id: Annotated[str, PropertyInfo(alias="datasetId")]
+
+    indicator: str
+
+    indicators: Iterable[DataIndicator]
+    """Array of indicators for this event.
+
+    Supports multiple indicators per event for complex scenarios.
+    """
+
+    indicator_type: Annotated[str, PropertyInfo(alias="indicatorType")]
+
+    insight: str
+
+    tags: SequenceNotStr[str]
+
+    target_country: Annotated[str, PropertyInfo(alias="targetCountry")]
+
+    target_industry: Annotated[str, PropertyInfo(alias="targetIndustry")]
diff --git a/src/cloudflare/types/cloudforce_one/threat_event_bulk_create_response.py b/src/cloudflare/types/cloudforce_one/threat_event_bulk_create_response.py
new file mode 100644
index 00000000000..af0fd25b02d
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_event_bulk_create_response.py
@@ -0,0 +1,56 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["ThreatEventBulkCreateResponse", "CreatedEvent", "Error"]
+
+
+class CreatedEvent(BaseModel):
+    event_index: float = FieldInfo(alias="eventIndex")
+    """Original index in the input data array"""
+
+    shard_id: str = FieldInfo(alias="shardId")
+    """Dataset ID of the shard where the event was created"""
+
+    uuid: str
+    """UUID of the created event"""
+
+
+class Error(BaseModel):
+    error: str
+    """Error message"""
+
+    event_index: float = FieldInfo(alias="eventIndex")
+    """Index of the event that caused the error"""
+
+
+class ThreatEventBulkCreateResponse(BaseModel):
+    """Detailed result of bulk event creation with auto-tag management"""
+
+    created_events_count: float = FieldInfo(alias="createdEventsCount")
+    """Number of events created"""
+
+    created_tags_count: float = FieldInfo(alias="createdTagsCount")
+    """Number of new tags created in SoT"""
+
+    error_count: float = FieldInfo(alias="errorCount")
+    """Number of errors encountered"""
+
+    queued_indicators_count: float = FieldInfo(alias="queuedIndicatorsCount")
+    """Number of indicators queued for async processing"""
+
+    create_bulk_events_request_id: Optional[str] = FieldInfo(alias="createBulkEventsRequestId", default=None)
+    """Correlation ID for async indicator processing"""
+
+    created_events: Optional[List[CreatedEvent]] = FieldInfo(alias="createdEvents", default=None)
+    """Array of created events with UUIDs and shard locations.
+
+    Only present when includeCreatedEvents=true
+    """
+
+    errors: Optional[List[Error]] = None
+    """Array of error details"""
diff --git a/src/cloudflare/types/cloudforce_one/threat_event_create_params.py b/src/cloudflare/types/cloudforce_one/threat_event_create_params.py
new file mode 100644
index 00000000000..8a06c593aee
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_event_create_params.py
@@ -0,0 +1,69 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Required, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["ThreatEventCreateParams", "Raw", "Indicator"]
+
+
+class ThreatEventCreateParams(TypedDict, total=False):
+    path_account_id: Required[Annotated[str, PropertyInfo(alias="account_id")]]
+    """Account ID."""
+
+    category: Required[str]
+
+    date: Required[Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]]
+
+    event: Required[str]
+
+    raw: Required[Raw]
+
+    tlp: Required[str]
+
+    body_account_id: Annotated[float, PropertyInfo(alias="accountId")]
+
+    attacker: Optional[str]
+
+    attacker_country: Annotated[str, PropertyInfo(alias="attackerCountry")]
+
+    dataset_id: Annotated[str, PropertyInfo(alias="datasetId")]
+
+    indicator: str
+
+    indicators: Iterable[Indicator]
+    """Array of indicators for this event.
+
+    Supports multiple indicators per event for complex scenarios.
+    """
+
+    indicator_type: Annotated[str, PropertyInfo(alias="indicatorType")]
+
+    insight: str
+
+    tags: SequenceNotStr[str]
+
+    target_country: Annotated[str, PropertyInfo(alias="targetCountry")]
+
+    target_industry: Annotated[str, PropertyInfo(alias="targetIndustry")]
+
+
+class Raw(TypedDict, total=False):
+    data: Required[Optional[Dict[str, object]]]
+
+    source: str
+
+    tlp: str
+
+
+class Indicator(TypedDict, total=False):
+    indicator_type: Required[Annotated[str, PropertyInfo(alias="indicatorType")]]
+    """The type of indicator (e.g., DOMAIN, IP, JA3, HASH)"""
+
+    value: Required[str]
+    """The indicator value (e.g., domain name, IP address, hash)"""
diff --git a/src/cloudflare/types/cloudforce_one/threat_event_create_response.py b/src/cloudflare/types/cloudforce_one/threat_event_create_response.py
new file mode 100644
index 00000000000..c55d98170d8
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_event_create_response.py
@@ -0,0 +1,63 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["ThreatEventCreateResponse"]
+
+
+class ThreatEventCreateResponse(BaseModel):
+    attacker: str
+
+    attacker_country: str = FieldInfo(alias="attackerCountry")
+
+    category: str
+
+    dataset_id: str = FieldInfo(alias="datasetId")
+
+    date: str
+
+    event: str
+
+    has_children: bool = FieldInfo(alias="hasChildren")
+
+    indicator: str
+
+    indicator_type: str = FieldInfo(alias="indicatorType")
+
+    indicator_type_id: float = FieldInfo(alias="indicatorTypeId")
+
+    kill_chain: float = FieldInfo(alias="killChain")
+
+    mitre_attack: List[str] = FieldInfo(alias="mitreAttack")
+
+    num_referenced: float = FieldInfo(alias="numReferenced")
+
+    num_references: float = FieldInfo(alias="numReferences")
+
+    raw_id: str = FieldInfo(alias="rawId")
+
+    referenced: List[str]
+
+    referenced_ids: List[float] = FieldInfo(alias="referencedIds")
+
+    references: List[str]
+
+    references_ids: List[float] = FieldInfo(alias="referencesIds")
+
+    tags: List[str]
+
+    target_country: str = FieldInfo(alias="targetCountry")
+
+    target_industry: str = FieldInfo(alias="targetIndustry")
+
+    tlp: str
+
+    uuid: str
+
+    insight: Optional[str] = None
+
+    releasability_id: Optional[str] = FieldInfo(alias="releasabilityId", default=None)
diff --git a/src/cloudflare/types/cloudforce_one/threat_event_delete_response.py b/src/cloudflare/types/cloudforce_one/threat_event_delete_response.py
new file mode 100644
index 00000000000..cf389ba658b
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_event_delete_response.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["ThreatEventDeleteResponse"]
+
+
+class ThreatEventDeleteResponse(BaseModel):
+    uuid: str
diff --git a/src/cloudflare/types/cloudforce_one/threat_event_edit_params.py b/src/cloudflare/types/cloudforce_one/threat_event_edit_params.py
new file mode 100644
index 00000000000..8d8f6ad2690
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_event_edit_params.py
@@ -0,0 +1,52 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Union, Optional
+from datetime import datetime
+from typing_extensions import Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["ThreatEventEditParams", "Raw"]
+
+
+class ThreatEventEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    attacker: Optional[str]
+
+    attacker_country: Annotated[str, PropertyInfo(alias="attackerCountry")]
+
+    category: str
+
+    created_at: Annotated[Union[str, datetime], PropertyInfo(alias="createdAt", format="iso8601")]
+
+    dataset_id: Annotated[str, PropertyInfo(alias="datasetId")]
+
+    date: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+
+    event: str
+
+    indicator: str
+
+    indicator_type: Annotated[str, PropertyInfo(alias="indicatorType")]
+
+    insight: str
+
+    raw: Raw
+
+    target_country: Annotated[str, PropertyInfo(alias="targetCountry")]
+
+    target_industry: Annotated[str, PropertyInfo(alias="targetIndustry")]
+
+    tlp: str
+
+
+class Raw(TypedDict, total=False):
+    data: Optional[Dict[str, object]]
+
+    source: str
+
+    tlp: str
diff --git a/src/cloudflare/types/cloudforce_one/threat_event_edit_response.py b/src/cloudflare/types/cloudforce_one/threat_event_edit_response.py
new file mode 100644
index 00000000000..7055a82dc94
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_event_edit_response.py
@@ -0,0 +1,63 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["ThreatEventEditResponse"]
+
+
+class ThreatEventEditResponse(BaseModel):
+    attacker: str
+
+    attacker_country: str = FieldInfo(alias="attackerCountry")
+
+    category: str
+
+    dataset_id: str = FieldInfo(alias="datasetId")
+
+    date: str
+
+    event: str
+
+    has_children: bool = FieldInfo(alias="hasChildren")
+
+    indicator: str
+
+    indicator_type: str = FieldInfo(alias="indicatorType")
+
+    indicator_type_id: float = FieldInfo(alias="indicatorTypeId")
+
+    kill_chain: float = FieldInfo(alias="killChain")
+
+    mitre_attack: List[str] = FieldInfo(alias="mitreAttack")
+
+    num_referenced: float = FieldInfo(alias="numReferenced")
+
+    num_references: float = FieldInfo(alias="numReferences")
+
+    raw_id: str = FieldInfo(alias="rawId")
+
+    referenced: List[str]
+
+    referenced_ids: List[float] = FieldInfo(alias="referencedIds")
+
+    references: List[str]
+
+    references_ids: List[float] = FieldInfo(alias="referencesIds")
+
+    tags: List[str]
+
+    target_country: str = FieldInfo(alias="targetCountry")
+
+    target_industry: str = FieldInfo(alias="targetIndustry")
+
+    tlp: str
+
+    uuid: str
+
+    insight: Optional[str] = None
+
+    releasability_id: Optional[str] = FieldInfo(alias="releasabilityId", default=None)
diff --git a/src/cloudflare/types/cloudforce_one/threat_event_get_response.py b/src/cloudflare/types/cloudforce_one/threat_event_get_response.py
new file mode 100644
index 00000000000..6ad63ac4baa
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_event_get_response.py
@@ -0,0 +1,63 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["ThreatEventGetResponse"]
+
+
+class ThreatEventGetResponse(BaseModel):
+    attacker: str
+
+    attacker_country: str = FieldInfo(alias="attackerCountry")
+
+    category: str
+
+    dataset_id: str = FieldInfo(alias="datasetId")
+
+    date: str
+
+    event: str
+
+    has_children: bool = FieldInfo(alias="hasChildren")
+
+    indicator: str
+
+    indicator_type: str = FieldInfo(alias="indicatorType")
+
+    indicator_type_id: float = FieldInfo(alias="indicatorTypeId")
+
+    kill_chain: float = FieldInfo(alias="killChain")
+
+    mitre_attack: List[str] = FieldInfo(alias="mitreAttack")
+
+    num_referenced: float = FieldInfo(alias="numReferenced")
+
+    num_references: float = FieldInfo(alias="numReferences")
+
+    raw_id: str = FieldInfo(alias="rawId")
+
+    referenced: List[str]
+
+    referenced_ids: List[float] = FieldInfo(alias="referencedIds")
+
+    references: List[str]
+
+    references_ids: List[float] = FieldInfo(alias="referencesIds")
+
+    tags: List[str]
+
+    target_country: str = FieldInfo(alias="targetCountry")
+
+    target_industry: str = FieldInfo(alias="targetIndustry")
+
+    tlp: str
+
+    uuid: str
+
+    insight: Optional[str] = None
+
+    releasability_id: Optional[str] = FieldInfo(alias="releasabilityId", default=None)
diff --git a/src/cloudflare/types/cloudforce_one/threat_event_list_params.py b/src/cloudflare/types/cloudforce_one/threat_event_list_params.py
new file mode 100644
index 00000000000..065d90b873c
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_event_list_params.py
@@ -0,0 +1,55 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["ThreatEventListParams", "Search"]
+
+
+class ThreatEventListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    cursor: str
+    """Cursor for pagination.
+
+    When provided, filters are embedded in the cursor so you only need to pass
+    cursor and pageSize. Returned in the previous response's result_info.cursor
+    field. Use cursor-based pagination for deep pagination (beyond 100,000 records)
+    or for optimal performance.
+    """
+
+    dataset_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="datasetId")]
+
+    force_refresh: Annotated[bool, PropertyInfo(alias="forceRefresh")]
+
+    format: Literal["json", "stix2"]
+
+    order: Literal["asc", "desc"]
+
+    order_by: Annotated[str, PropertyInfo(alias="orderBy")]
+
+    page: float
+    """Page number (1-indexed) for offset-based pagination.
+
+    Limited to offset of 100,000 records. For deep pagination, use cursor-based
+    pagination instead.
+    """
+
+    page_size: Annotated[float, PropertyInfo(alias="pageSize")]
+    """Number of results per page. Maximum 25,000."""
+
+    search: Iterable[Search]
+
+
+class Search(TypedDict, total=False):
+    field: str
+
+    op: Literal["equals", "not", "gt", "gte", "lt", "lte", "like", "contains", "startsWith", "endsWith", "in", "find"]
+
+    value: Union[str, float, SequenceNotStr[Union[str, float]]]
diff --git a/src/cloudflare/types/cloudforce_one/threat_event_list_response.py b/src/cloudflare/types/cloudforce_one/threat_event_list_response.py
new file mode 100644
index 00000000000..9efac030910
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_event_list_response.py
@@ -0,0 +1,67 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["ThreatEventListResponse", "ThreatEventListResponseItem"]
+
+
+class ThreatEventListResponseItem(BaseModel):
+    attacker: str
+
+    attacker_country: str = FieldInfo(alias="attackerCountry")
+
+    category: str
+
+    dataset_id: str = FieldInfo(alias="datasetId")
+
+    date: str
+
+    event: str
+
+    has_children: bool = FieldInfo(alias="hasChildren")
+
+    indicator: str
+
+    indicator_type: str = FieldInfo(alias="indicatorType")
+
+    indicator_type_id: float = FieldInfo(alias="indicatorTypeId")
+
+    kill_chain: float = FieldInfo(alias="killChain")
+
+    mitre_attack: List[str] = FieldInfo(alias="mitreAttack")
+
+    num_referenced: float = FieldInfo(alias="numReferenced")
+
+    num_references: float = FieldInfo(alias="numReferences")
+
+    raw_id: str = FieldInfo(alias="rawId")
+
+    referenced: List[str]
+
+    referenced_ids: List[float] = FieldInfo(alias="referencedIds")
+
+    references: List[str]
+
+    references_ids: List[float] = FieldInfo(alias="referencesIds")
+
+    tags: List[str]
+
+    target_country: str = FieldInfo(alias="targetCountry")
+
+    target_industry: str = FieldInfo(alias="targetIndustry")
+
+    tlp: str
+
+    uuid: str
+
+    insight: Optional[str] = None
+
+    releasability_id: Optional[str] = FieldInfo(alias="releasabilityId", default=None)
+
+
+ThreatEventListResponse: TypeAlias = List[ThreatEventListResponseItem]
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/__init__.py b/src/cloudflare/types/cloudforce_one/threat_events/__init__.py
new file mode 100644
index 00000000000..ca0dac14947
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/__init__.py
@@ -0,0 +1,34 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .raw_edit_params import RawEditParams as RawEditParams
+from .raw_get_response import RawGetResponse as RawGetResponse
+from .raw_edit_response import RawEditResponse as RawEditResponse
+from .tag_create_params import TagCreateParams as TagCreateParams
+from .dataset_edit_params import DatasetEditParams as DatasetEditParams
+from .tag_create_response import TagCreateResponse as TagCreateResponse
+from .attacker_list_params import AttackerListParams as AttackerListParams
+from .category_edit_params import CategoryEditParams as CategoryEditParams
+from .category_list_params import CategoryListParams as CategoryListParams
+from .dataset_get_response import DatasetGetResponse as DatasetGetResponse
+from .dataset_raw_response import DatasetRawResponse as DatasetRawResponse
+from .category_get_response import CategoryGetResponse as CategoryGetResponse
+from .country_list_response import CountryListResponse as CountryListResponse
+from .dataset_create_params import DatasetCreateParams as DatasetCreateParams
+from .dataset_edit_response import DatasetEditResponse as DatasetEditResponse
+from .dataset_list_response import DatasetListResponse as DatasetListResponse
+from .attacker_list_response import AttackerListResponse as AttackerListResponse
+from .category_create_params import CategoryCreateParams as CategoryCreateParams
+from .category_edit_response import CategoryEditResponse as CategoryEditResponse
+from .category_list_response import CategoryListResponse as CategoryListResponse
+from .relate_delete_response import RelateDeleteResponse as RelateDeleteResponse
+from .dataset_create_response import DatasetCreateResponse as DatasetCreateResponse
+from .event_tag_create_params import EventTagCreateParams as EventTagCreateParams
+from .category_create_response import CategoryCreateResponse as CategoryCreateResponse
+from .category_delete_response import CategoryDeleteResponse as CategoryDeleteResponse
+from .event_tag_create_response import EventTagCreateResponse as EventTagCreateResponse
+from .event_tag_delete_response import EventTagDeleteResponse as EventTagDeleteResponse
+from .target_industry_list_params import TargetIndustryListParams as TargetIndustryListParams
+from .indicator_type_list_response import IndicatorTypeListResponse as IndicatorTypeListResponse
+from .target_industry_list_response import TargetIndustryListResponse as TargetIndustryListResponse
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/attacker_list_params.py b/src/cloudflare/types/cloudforce_one/threat_events/attacker_list_params.py
new file mode 100644
index 00000000000..e0d50581e80
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/attacker_list_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["AttackerListParams"]
+
+
+class AttackerListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    dataset_ids: Annotated[SequenceNotStr[str], PropertyInfo(alias="datasetIds")]
+    """Array of dataset IDs to query attackers from.
+
+    If not provided, uses the default dataset.
+    """
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/attacker_list_response.py b/src/cloudflare/types/cloudforce_one/threat_events/attacker_list_response.py
new file mode 100644
index 00000000000..e539de8f0af
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/attacker_list_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["AttackerListResponse", "Items"]
+
+
+class Items(BaseModel):
+    type: str
+
+
+class AttackerListResponse(BaseModel):
+    items: Items
+
+    type: str
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/category_create_params.py b/src/cloudflare/types/cloudforce_one/threat_events/category_create_params.py
new file mode 100644
index 00000000000..17b53c424eb
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/category_create_params.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["CategoryCreateParams"]
+
+
+class CategoryCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    kill_chain: Required[Annotated[float, PropertyInfo(alias="killChain")]]
+
+    name: Required[str]
+
+    mitre_attack: Annotated[SequenceNotStr[str], PropertyInfo(alias="mitreAttack")]
+
+    shortname: str
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/category_create_response.py b/src/cloudflare/types/cloudforce_one/threat_events/category_create_response.py
new file mode 100644
index 00000000000..18aba95acd8
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/category_create_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["CategoryCreateResponse"]
+
+
+class CategoryCreateResponse(BaseModel):
+    kill_chain: float = FieldInfo(alias="killChain")
+
+    name: str
+
+    uuid: str
+
+    mitre_attack: Optional[List[str]] = FieldInfo(alias="mitreAttack", default=None)
+
+    shortname: Optional[str] = None
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/category_delete_response.py b/src/cloudflare/types/cloudforce_one/threat_events/category_delete_response.py
new file mode 100644
index 00000000000..1a9669c082f
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/category_delete_response.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["CategoryDeleteResponse"]
+
+
+class CategoryDeleteResponse(BaseModel):
+    uuid: str
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/category_edit_params.py b/src/cloudflare/types/cloudforce_one/threat_events/category_edit_params.py
new file mode 100644
index 00000000000..edbbf412b3b
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/category_edit_params.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["CategoryEditParams"]
+
+
+class CategoryEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    kill_chain: Annotated[float, PropertyInfo(alias="killChain")]
+
+    mitre_attack: Annotated[SequenceNotStr[str], PropertyInfo(alias="mitreAttack")]
+
+    name: str
+
+    shortname: str
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/category_edit_response.py b/src/cloudflare/types/cloudforce_one/threat_events/category_edit_response.py
new file mode 100644
index 00000000000..ca0a5b7dfcf
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/category_edit_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["CategoryEditResponse"]
+
+
+class CategoryEditResponse(BaseModel):
+    kill_chain: float = FieldInfo(alias="killChain")
+
+    name: str
+
+    uuid: str
+
+    mitre_attack: Optional[List[str]] = FieldInfo(alias="mitreAttack", default=None)
+
+    shortname: Optional[str] = None
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/category_get_response.py b/src/cloudflare/types/cloudforce_one/threat_events/category_get_response.py
new file mode 100644
index 00000000000..71b786056e0
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/category_get_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["CategoryGetResponse"]
+
+
+class CategoryGetResponse(BaseModel):
+    kill_chain: float = FieldInfo(alias="killChain")
+
+    name: str
+
+    uuid: str
+
+    mitre_attack: Optional[List[str]] = FieldInfo(alias="mitreAttack", default=None)
+
+    shortname: Optional[str] = None
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/category_list_params.py b/src/cloudflare/types/cloudforce_one/threat_events/category_list_params.py
new file mode 100644
index 00000000000..fa43c1a4b41
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/category_list_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["CategoryListParams"]
+
+
+class CategoryListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    dataset_ids: Annotated[SequenceNotStr[str], PropertyInfo(alias="datasetIds")]
+    """Array of dataset IDs to query categories from.
+
+    If not provided, uses the default dataset.
+    """
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/category_list_response.py b/src/cloudflare/types/cloudforce_one/threat_events/category_list_response.py
new file mode 100644
index 00000000000..76c5ed72b90
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/category_list_response.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["CategoryListResponse", "CategoryListResponseItem"]
+
+
+class CategoryListResponseItem(BaseModel):
+    kill_chain: float = FieldInfo(alias="killChain")
+
+    name: str
+
+    uuid: str
+
+    mitre_attack: Optional[List[str]] = FieldInfo(alias="mitreAttack", default=None)
+
+    shortname: Optional[str] = None
+
+
+CategoryListResponse: TypeAlias = List[CategoryListResponseItem]
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/country_list_response.py b/src/cloudflare/types/cloudforce_one/threat_events/country_list_response.py
new file mode 100644
index 00000000000..c6309e41696
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/country_list_response.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from typing_extensions import TypeAlias
+
+from ...._models import BaseModel
+
+__all__ = ["CountryListResponse", "CountryListResponseItem", "CountryListResponseItemResult"]
+
+
+class CountryListResponseItemResult(BaseModel):
+    alpha3: str
+
+    name: str
+
+
+class CountryListResponseItem(BaseModel):
+    result: List[CountryListResponseItemResult]
+
+    success: str
+
+
+CountryListResponse: TypeAlias = List[CountryListResponseItem]
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/dataset_create_params.py b/src/cloudflare/types/cloudforce_one/threat_events/dataset_create_params.py
new file mode 100644
index 00000000000..dfeaa66e4c5
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/dataset_create_params.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ...._utils import PropertyInfo
+
+__all__ = ["DatasetCreateParams"]
+
+
+class DatasetCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    is_public: Required[Annotated[bool, PropertyInfo(alias="isPublic")]]
+    """If true, then anyone can search the dataset.
+
+    If false, then its limited to the account.
+    """
+
+    name: Required[str]
+    """Used to describe the dataset within the account context."""
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/dataset_create_response.py b/src/cloudflare/types/cloudforce_one/threat_events/dataset_create_response.py
new file mode 100644
index 00000000000..d2a4ed0bce2
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/dataset_create_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["DatasetCreateResponse"]
+
+
+class DatasetCreateResponse(BaseModel):
+    is_public: bool = FieldInfo(alias="isPublic")
+
+    name: str
+
+    uuid: str
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/dataset_edit_params.py b/src/cloudflare/types/cloudforce_one/threat_events/dataset_edit_params.py
new file mode 100644
index 00000000000..105e8e30834
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/dataset_edit_params.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ...._utils import PropertyInfo
+
+__all__ = ["DatasetEditParams"]
+
+
+class DatasetEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    is_public: Required[Annotated[bool, PropertyInfo(alias="isPublic")]]
+    """If true, then anyone can search the dataset.
+
+    If false, then its limited to the account.
+    """
+
+    name: Required[str]
+    """Used to describe the dataset within the account context."""
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/dataset_edit_response.py b/src/cloudflare/types/cloudforce_one/threat_events/dataset_edit_response.py
new file mode 100644
index 00000000000..791c041c355
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/dataset_edit_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["DatasetEditResponse"]
+
+
+class DatasetEditResponse(BaseModel):
+    is_public: bool = FieldInfo(alias="isPublic")
+
+    name: str
+
+    uuid: str
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/dataset_get_response.py b/src/cloudflare/types/cloudforce_one/threat_events/dataset_get_response.py
new file mode 100644
index 00000000000..7e30033d8fe
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/dataset_get_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["DatasetGetResponse"]
+
+
+class DatasetGetResponse(BaseModel):
+    is_public: bool = FieldInfo(alias="isPublic")
+
+    name: str
+
+    uuid: str
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/dataset_list_response.py b/src/cloudflare/types/cloudforce_one/threat_events/dataset_list_response.py
new file mode 100644
index 00000000000..810843f27ef
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/dataset_list_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from typing_extensions import TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["DatasetListResponse", "DatasetListResponseItem"]
+
+
+class DatasetListResponseItem(BaseModel):
+    is_public: bool = FieldInfo(alias="isPublic")
+
+    name: str
+
+    uuid: str
+
+
+DatasetListResponse: TypeAlias = List[DatasetListResponseItem]
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/dataset_raw_response.py b/src/cloudflare/types/cloudforce_one/threat_events/dataset_raw_response.py
new file mode 100644
index 00000000000..6baf8e4b567
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/dataset_raw_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["DatasetRawResponse"]
+
+
+class DatasetRawResponse(BaseModel):
+    id: str
+
+    account_id: float = FieldInfo(alias="accountId")
+
+    created: str
+
+    data: object
+
+    source: str
+
+    tlp: str
diff --git a/src/cloudflare/types/addressing/loa_documents/__init__.py b/src/cloudflare/types/cloudforce_one/threat_events/datasets/__init__.py
similarity index 100%
rename from src/cloudflare/types/addressing/loa_documents/__init__.py
rename to src/cloudflare/types/cloudforce_one/threat_events/datasets/__init__.py
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/event_tag_create_params.py b/src/cloudflare/types/cloudforce_one/threat_events/event_tag_create_params.py
new file mode 100644
index 00000000000..8a28221ab3e
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/event_tag_create_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["EventTagCreateParams"]
+
+
+class EventTagCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    tags: Required[SequenceNotStr[str]]
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/event_tag_create_response.py b/src/cloudflare/types/cloudforce_one/threat_events/event_tag_create_response.py
new file mode 100644
index 00000000000..06f3ea0916f
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/event_tag_create_response.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["EventTagCreateResponse"]
+
+
+class EventTagCreateResponse(BaseModel):
+    success: bool
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/event_tag_delete_response.py b/src/cloudflare/types/cloudforce_one/threat_events/event_tag_delete_response.py
new file mode 100644
index 00000000000..52dae76576f
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/event_tag_delete_response.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["EventTagDeleteResponse"]
+
+
+class EventTagDeleteResponse(BaseModel):
+    success: bool
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/indicator_type_list_response.py b/src/cloudflare/types/cloudforce_one/threat_events/indicator_type_list_response.py
new file mode 100644
index 00000000000..4bcc9828993
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/indicator_type_list_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["IndicatorTypeListResponse", "Items"]
+
+
+class Items(BaseModel):
+    type: str
+
+
+class IndicatorTypeListResponse(BaseModel):
+    items: Items
+
+    type: str
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/raw_edit_params.py b/src/cloudflare/types/cloudforce_one/threat_events/raw_edit_params.py
new file mode 100644
index 00000000000..c1a14dd1a1a
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/raw_edit_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["RawEditParams"]
+
+
+class RawEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    event_id: Required[str]
+    """Event UUID."""
+
+    data: object
+
+    source: str
+
+    tlp: str
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/raw_edit_response.py b/src/cloudflare/types/cloudforce_one/threat_events/raw_edit_response.py
new file mode 100644
index 00000000000..5fe329a20cb
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/raw_edit_response.py
@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["RawEditResponse"]
+
+
+class RawEditResponse(BaseModel):
+    id: str
+
+    data: object
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/raw_get_response.py b/src/cloudflare/types/cloudforce_one/threat_events/raw_get_response.py
new file mode 100644
index 00000000000..417926ea1cb
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/raw_get_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["RawGetResponse"]
+
+
+class RawGetResponse(BaseModel):
+    id: str
+
+    account_id: float = FieldInfo(alias="accountId")
+
+    created: str
+
+    data: object
+
+    source: str
+
+    tlp: str
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/relate_delete_response.py b/src/cloudflare/types/cloudforce_one/threat_events/relate_delete_response.py
new file mode 100644
index 00000000000..702115e69b0
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/relate_delete_response.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["RelateDeleteResponse"]
+
+
+class RelateDeleteResponse(BaseModel):
+    success: bool
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/tag_create_params.py b/src/cloudflare/types/cloudforce_one/threat_events/tag_create_params.py
new file mode 100644
index 00000000000..85452744e19
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/tag_create_params.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TagCreateParams"]
+
+
+class TagCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    value: Required[str]
+
+    active_duration: Annotated[str, PropertyInfo(alias="activeDuration")]
+
+    actor_category: Annotated[str, PropertyInfo(alias="actorCategory")]
+
+    alias_group_names: Annotated[SequenceNotStr[str], PropertyInfo(alias="aliasGroupNames")]
+
+    alias_group_names_internal: Annotated[SequenceNotStr[str], PropertyInfo(alias="aliasGroupNamesInternal")]
+
+    analytic_priority: Annotated[float, PropertyInfo(alias="analyticPriority")]
+
+    attribution_confidence: Annotated[str, PropertyInfo(alias="attributionConfidence")]
+
+    attribution_organization: Annotated[str, PropertyInfo(alias="attributionOrganization")]
+
+    category_uuid: Annotated[str, PropertyInfo(alias="categoryUuid")]
+
+    external_reference_links: Annotated[SequenceNotStr[str], PropertyInfo(alias="externalReferenceLinks")]
+
+    internal_description: Annotated[str, PropertyInfo(alias="internalDescription")]
+
+    motive: str
+
+    opsec_level: Annotated[str, PropertyInfo(alias="opsecLevel")]
+
+    origin_country_iso: Annotated[str, PropertyInfo(alias="originCountryISO")]
+
+    priority: float
+
+    sophistication_level: Annotated[str, PropertyInfo(alias="sophisticationLevel")]
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/tag_create_response.py b/src/cloudflare/types/cloudforce_one/threat_events/tag_create_response.py
new file mode 100644
index 00000000000..fc2f5c059e1
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/tag_create_response.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["TagCreateResponse"]
+
+
+class TagCreateResponse(BaseModel):
+    uuid: str
+
+    value: str
+
+    active_duration: Optional[str] = FieldInfo(alias="activeDuration", default=None)
+
+    actor_category: Optional[str] = FieldInfo(alias="actorCategory", default=None)
+
+    alias_group_names: Optional[List[str]] = FieldInfo(alias="aliasGroupNames", default=None)
+
+    alias_group_names_internal: Optional[List[str]] = FieldInfo(alias="aliasGroupNamesInternal", default=None)
+
+    analytic_priority: Optional[float] = FieldInfo(alias="analyticPriority", default=None)
+
+    attribution_confidence: Optional[str] = FieldInfo(alias="attributionConfidence", default=None)
+
+    attribution_organization: Optional[str] = FieldInfo(alias="attributionOrganization", default=None)
+
+    category_name: Optional[str] = FieldInfo(alias="categoryName", default=None)
+
+    category_uuid: Optional[str] = FieldInfo(alias="categoryUuid", default=None)
+
+    external_reference_links: Optional[List[str]] = FieldInfo(alias="externalReferenceLinks", default=None)
+
+    internal_description: Optional[str] = FieldInfo(alias="internalDescription", default=None)
+
+    motive: Optional[str] = None
+
+    opsec_level: Optional[str] = FieldInfo(alias="opsecLevel", default=None)
+
+    origin_country_iso: Optional[str] = FieldInfo(alias="originCountryISO", default=None)
+
+    priority: Optional[float] = None
+
+    sophistication_level: Optional[str] = FieldInfo(alias="sophisticationLevel", default=None)
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/target_industry_list_params.py b/src/cloudflare/types/cloudforce_one/threat_events/target_industry_list_params.py
new file mode 100644
index 00000000000..2fde8d89e9a
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/target_industry_list_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TargetIndustryListParams"]
+
+
+class TargetIndustryListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    dataset_ids: Annotated[SequenceNotStr[str], PropertyInfo(alias="datasetIds")]
+    """Array of dataset IDs to query target industries from.
+
+    If not provided, uses the default dataset.
+    """
diff --git a/src/cloudflare/types/cloudforce_one/threat_events/target_industry_list_response.py b/src/cloudflare/types/cloudforce_one/threat_events/target_industry_list_response.py
new file mode 100644
index 00000000000..020b09e1210
--- /dev/null
+++ b/src/cloudflare/types/cloudforce_one/threat_events/target_industry_list_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["TargetIndustryListResponse", "Items"]
+
+
+class Items(BaseModel):
+    type: str
+
+
+class TargetIndustryListResponse(BaseModel):
+    items: Items
+
+    type: str
diff --git a/src/cloudflare/types/event_notifications/__init__.py b/src/cloudflare/types/connectivity/__init__.py
similarity index 100%
rename from src/cloudflare/types/event_notifications/__init__.py
rename to src/cloudflare/types/connectivity/__init__.py
diff --git a/src/cloudflare/types/connectivity/directory/__init__.py b/src/cloudflare/types/connectivity/directory/__init__.py
new file mode 100644
index 00000000000..326aa179d87
--- /dev/null
+++ b/src/cloudflare/types/connectivity/directory/__init__.py
@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .service_list_params import ServiceListParams as ServiceListParams
+from .service_get_response import ServiceGetResponse as ServiceGetResponse
+from .service_create_params import ServiceCreateParams as ServiceCreateParams
+from .service_list_response import ServiceListResponse as ServiceListResponse
+from .service_update_params import ServiceUpdateParams as ServiceUpdateParams
+from .service_create_response import ServiceCreateResponse as ServiceCreateResponse
+from .service_update_response import ServiceUpdateResponse as ServiceUpdateResponse
diff --git a/src/cloudflare/types/connectivity/directory/service_create_params.py b/src/cloudflare/types/connectivity/directory/service_create_params.py
new file mode 100644
index 00000000000..118019f531f
--- /dev/null
+++ b/src/cloudflare/types/connectivity/directory/service_create_params.py
@@ -0,0 +1,83 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Optional
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = [
+    "ServiceCreateParams",
+    "Host",
+    "HostInfraIPv4Host",
+    "HostInfraIPv4HostNetwork",
+    "HostInfraIPv6Host",
+    "HostInfraIPv6HostNetwork",
+    "HostInfraDualStackHost",
+    "HostInfraDualStackHostNetwork",
+    "HostInfraHostnameHost",
+    "HostInfraHostnameHostResolverNetwork",
+]
+
+
+class ServiceCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier"""
+
+    host: Required[Host]
+
+    name: Required[str]
+
+    type: Required[Literal["http"]]
+
+    http_port: Optional[int]
+
+    https_port: Optional[int]
+
+
+class HostInfraIPv4HostNetwork(TypedDict, total=False):
+    tunnel_id: Required[str]
+
+
+class HostInfraIPv4Host(TypedDict, total=False):
+    ipv4: Required[str]
+
+    network: Required[HostInfraIPv4HostNetwork]
+
+
+class HostInfraIPv6HostNetwork(TypedDict, total=False):
+    tunnel_id: Required[str]
+
+
+class HostInfraIPv6Host(TypedDict, total=False):
+    ipv6: Required[str]
+
+    network: Required[HostInfraIPv6HostNetwork]
+
+
+class HostInfraDualStackHostNetwork(TypedDict, total=False):
+    tunnel_id: Required[str]
+
+
+class HostInfraDualStackHost(TypedDict, total=False):
+    ipv4: Required[str]
+
+    ipv6: Required[str]
+
+    network: Required[HostInfraDualStackHostNetwork]
+
+
+class HostInfraHostnameHostResolverNetwork(TypedDict, total=False):
+    tunnel_id: Required[str]
+
+    resolver_ips: Optional[SequenceNotStr[str]]
+
+
+class HostInfraHostnameHost(TypedDict, total=False):
+    hostname: Required[str]
+
+    resolver_network: Required[HostInfraHostnameHostResolverNetwork]
+
+
+Host: TypeAlias = Union[HostInfraIPv4Host, HostInfraIPv6Host, HostInfraDualStackHost, HostInfraHostnameHost]
diff --git a/src/cloudflare/types/connectivity/directory/service_create_response.py b/src/cloudflare/types/connectivity/directory/service_create_response.py
new file mode 100644
index 00000000000..381032dceb3
--- /dev/null
+++ b/src/cloudflare/types/connectivity/directory/service_create_response.py
@@ -0,0 +1,85 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ...._models import BaseModel
+
+__all__ = [
+    "ServiceCreateResponse",
+    "Host",
+    "HostInfraIPv4Host",
+    "HostInfraIPv4HostNetwork",
+    "HostInfraIPv6Host",
+    "HostInfraIPv6HostNetwork",
+    "HostInfraDualStackHost",
+    "HostInfraDualStackHostNetwork",
+    "HostInfraHostnameHost",
+    "HostInfraHostnameHostResolverNetwork",
+]
+
+
+class HostInfraIPv4HostNetwork(BaseModel):
+    tunnel_id: str
+
+
+class HostInfraIPv4Host(BaseModel):
+    ipv4: str
+
+    network: HostInfraIPv4HostNetwork
+
+
+class HostInfraIPv6HostNetwork(BaseModel):
+    tunnel_id: str
+
+
+class HostInfraIPv6Host(BaseModel):
+    ipv6: str
+
+    network: HostInfraIPv6HostNetwork
+
+
+class HostInfraDualStackHostNetwork(BaseModel):
+    tunnel_id: str
+
+
+class HostInfraDualStackHost(BaseModel):
+    ipv4: str
+
+    ipv6: str
+
+    network: HostInfraDualStackHostNetwork
+
+
+class HostInfraHostnameHostResolverNetwork(BaseModel):
+    tunnel_id: str
+
+    resolver_ips: Optional[List[str]] = None
+
+
+class HostInfraHostnameHost(BaseModel):
+    hostname: str
+
+    resolver_network: HostInfraHostnameHostResolverNetwork
+
+
+Host: TypeAlias = Union[HostInfraIPv4Host, HostInfraIPv6Host, HostInfraDualStackHost, HostInfraHostnameHost]
+
+
+class ServiceCreateResponse(BaseModel):
+    host: Host
+
+    name: str
+
+    type: Literal["http"]
+
+    created_at: Optional[datetime] = None
+
+    http_port: Optional[int] = None
+
+    https_port: Optional[int] = None
+
+    service_id: Optional[str] = None
+
+    updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/connectivity/directory/service_get_response.py b/src/cloudflare/types/connectivity/directory/service_get_response.py
new file mode 100644
index 00000000000..3aed13c9692
--- /dev/null
+++ b/src/cloudflare/types/connectivity/directory/service_get_response.py
@@ -0,0 +1,85 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ...._models import BaseModel
+
+__all__ = [
+    "ServiceGetResponse",
+    "Host",
+    "HostInfraIPv4Host",
+    "HostInfraIPv4HostNetwork",
+    "HostInfraIPv6Host",
+    "HostInfraIPv6HostNetwork",
+    "HostInfraDualStackHost",
+    "HostInfraDualStackHostNetwork",
+    "HostInfraHostnameHost",
+    "HostInfraHostnameHostResolverNetwork",
+]
+
+
+class HostInfraIPv4HostNetwork(BaseModel):
+    tunnel_id: str
+
+
+class HostInfraIPv4Host(BaseModel):
+    ipv4: str
+
+    network: HostInfraIPv4HostNetwork
+
+
+class HostInfraIPv6HostNetwork(BaseModel):
+    tunnel_id: str
+
+
+class HostInfraIPv6Host(BaseModel):
+    ipv6: str
+
+    network: HostInfraIPv6HostNetwork
+
+
+class HostInfraDualStackHostNetwork(BaseModel):
+    tunnel_id: str
+
+
+class HostInfraDualStackHost(BaseModel):
+    ipv4: str
+
+    ipv6: str
+
+    network: HostInfraDualStackHostNetwork
+
+
+class HostInfraHostnameHostResolverNetwork(BaseModel):
+    tunnel_id: str
+
+    resolver_ips: Optional[List[str]] = None
+
+
+class HostInfraHostnameHost(BaseModel):
+    hostname: str
+
+    resolver_network: HostInfraHostnameHostResolverNetwork
+
+
+Host: TypeAlias = Union[HostInfraIPv4Host, HostInfraIPv6Host, HostInfraDualStackHost, HostInfraHostnameHost]
+
+
+class ServiceGetResponse(BaseModel):
+    host: Host
+
+    name: str
+
+    type: Literal["http"]
+
+    created_at: Optional[datetime] = None
+
+    http_port: Optional[int] = None
+
+    https_port: Optional[int] = None
+
+    service_id: Optional[str] = None
+
+    updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/connectivity/directory/service_list_params.py b/src/cloudflare/types/connectivity/directory/service_list_params.py
new file mode 100644
index 00000000000..d9e2733ca79
--- /dev/null
+++ b/src/cloudflare/types/connectivity/directory/service_list_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["ServiceListParams"]
+
+
+class ServiceListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier"""
+
+    page: int
+    """Current page in the response"""
+
+    per_page: int
+    """Max amount of entries returned per page"""
+
+    type: Optional[Literal["http"]]
diff --git a/src/cloudflare/types/connectivity/directory/service_list_response.py b/src/cloudflare/types/connectivity/directory/service_list_response.py
new file mode 100644
index 00000000000..41b40be3db6
--- /dev/null
+++ b/src/cloudflare/types/connectivity/directory/service_list_response.py
@@ -0,0 +1,85 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ...._models import BaseModel
+
+__all__ = [
+    "ServiceListResponse",
+    "Host",
+    "HostInfraIPv4Host",
+    "HostInfraIPv4HostNetwork",
+    "HostInfraIPv6Host",
+    "HostInfraIPv6HostNetwork",
+    "HostInfraDualStackHost",
+    "HostInfraDualStackHostNetwork",
+    "HostInfraHostnameHost",
+    "HostInfraHostnameHostResolverNetwork",
+]
+
+
+class HostInfraIPv4HostNetwork(BaseModel):
+    tunnel_id: str
+
+
+class HostInfraIPv4Host(BaseModel):
+    ipv4: str
+
+    network: HostInfraIPv4HostNetwork
+
+
+class HostInfraIPv6HostNetwork(BaseModel):
+    tunnel_id: str
+
+
+class HostInfraIPv6Host(BaseModel):
+    ipv6: str
+
+    network: HostInfraIPv6HostNetwork
+
+
+class HostInfraDualStackHostNetwork(BaseModel):
+    tunnel_id: str
+
+
+class HostInfraDualStackHost(BaseModel):
+    ipv4: str
+
+    ipv6: str
+
+    network: HostInfraDualStackHostNetwork
+
+
+class HostInfraHostnameHostResolverNetwork(BaseModel):
+    tunnel_id: str
+
+    resolver_ips: Optional[List[str]] = None
+
+
+class HostInfraHostnameHost(BaseModel):
+    hostname: str
+
+    resolver_network: HostInfraHostnameHostResolverNetwork
+
+
+Host: TypeAlias = Union[HostInfraIPv4Host, HostInfraIPv6Host, HostInfraDualStackHost, HostInfraHostnameHost]
+
+
+class ServiceListResponse(BaseModel):
+    host: Host
+
+    name: str
+
+    type: Literal["http"]
+
+    created_at: Optional[datetime] = None
+
+    http_port: Optional[int] = None
+
+    https_port: Optional[int] = None
+
+    service_id: Optional[str] = None
+
+    updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/connectivity/directory/service_update_params.py b/src/cloudflare/types/connectivity/directory/service_update_params.py
new file mode 100644
index 00000000000..6d618f8d936
--- /dev/null
+++ b/src/cloudflare/types/connectivity/directory/service_update_params.py
@@ -0,0 +1,82 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Optional
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = [
+    "ServiceUpdateParams",
+    "Host",
+    "HostInfraIPv4Host",
+    "HostInfraIPv4HostNetwork",
+    "HostInfraIPv6Host",
+    "HostInfraIPv6HostNetwork",
+    "HostInfraDualStackHost",
+    "HostInfraDualStackHostNetwork",
+    "HostInfraHostnameHost",
+    "HostInfraHostnameHostResolverNetwork",
+]
+
+
+class ServiceUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    host: Required[Host]
+
+    name: Required[str]
+
+    type: Required[Literal["http"]]
+
+    http_port: Optional[int]
+
+    https_port: Optional[int]
+
+
+class HostInfraIPv4HostNetwork(TypedDict, total=False):
+    tunnel_id: Required[str]
+
+
+class HostInfraIPv4Host(TypedDict, total=False):
+    ipv4: Required[str]
+
+    network: Required[HostInfraIPv4HostNetwork]
+
+
+class HostInfraIPv6HostNetwork(TypedDict, total=False):
+    tunnel_id: Required[str]
+
+
+class HostInfraIPv6Host(TypedDict, total=False):
+    ipv6: Required[str]
+
+    network: Required[HostInfraIPv6HostNetwork]
+
+
+class HostInfraDualStackHostNetwork(TypedDict, total=False):
+    tunnel_id: Required[str]
+
+
+class HostInfraDualStackHost(TypedDict, total=False):
+    ipv4: Required[str]
+
+    ipv6: Required[str]
+
+    network: Required[HostInfraDualStackHostNetwork]
+
+
+class HostInfraHostnameHostResolverNetwork(TypedDict, total=False):
+    tunnel_id: Required[str]
+
+    resolver_ips: Optional[SequenceNotStr[str]]
+
+
+class HostInfraHostnameHost(TypedDict, total=False):
+    hostname: Required[str]
+
+    resolver_network: Required[HostInfraHostnameHostResolverNetwork]
+
+
+Host: TypeAlias = Union[HostInfraIPv4Host, HostInfraIPv6Host, HostInfraDualStackHost, HostInfraHostnameHost]
diff --git a/src/cloudflare/types/connectivity/directory/service_update_response.py b/src/cloudflare/types/connectivity/directory/service_update_response.py
new file mode 100644
index 00000000000..1da08113149
--- /dev/null
+++ b/src/cloudflare/types/connectivity/directory/service_update_response.py
@@ -0,0 +1,85 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ...._models import BaseModel
+
+__all__ = [
+    "ServiceUpdateResponse",
+    "Host",
+    "HostInfraIPv4Host",
+    "HostInfraIPv4HostNetwork",
+    "HostInfraIPv6Host",
+    "HostInfraIPv6HostNetwork",
+    "HostInfraDualStackHost",
+    "HostInfraDualStackHostNetwork",
+    "HostInfraHostnameHost",
+    "HostInfraHostnameHostResolverNetwork",
+]
+
+
+class HostInfraIPv4HostNetwork(BaseModel):
+    tunnel_id: str
+
+
+class HostInfraIPv4Host(BaseModel):
+    ipv4: str
+
+    network: HostInfraIPv4HostNetwork
+
+
+class HostInfraIPv6HostNetwork(BaseModel):
+    tunnel_id: str
+
+
+class HostInfraIPv6Host(BaseModel):
+    ipv6: str
+
+    network: HostInfraIPv6HostNetwork
+
+
+class HostInfraDualStackHostNetwork(BaseModel):
+    tunnel_id: str
+
+
+class HostInfraDualStackHost(BaseModel):
+    ipv4: str
+
+    ipv6: str
+
+    network: HostInfraDualStackHostNetwork
+
+
+class HostInfraHostnameHostResolverNetwork(BaseModel):
+    tunnel_id: str
+
+    resolver_ips: Optional[List[str]] = None
+
+
+class HostInfraHostnameHost(BaseModel):
+    hostname: str
+
+    resolver_network: HostInfraHostnameHostResolverNetwork
+
+
+Host: TypeAlias = Union[HostInfraIPv4Host, HostInfraIPv6Host, HostInfraDualStackHost, HostInfraHostnameHost]
+
+
+class ServiceUpdateResponse(BaseModel):
+    host: Host
+
+    name: str
+
+    type: Literal["http"]
+
+    created_at: Optional[datetime] = None
+
+    http_port: Optional[int] = None
+
+    https_port: Optional[int] = None
+
+    service_id: Optional[str] = None
+
+    updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/content_scanning/__init__.py b/src/cloudflare/types/content_scanning/__init__.py
new file mode 100644
index 00000000000..ecb45719e2d
--- /dev/null
+++ b/src/cloudflare/types/content_scanning/__init__.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .setting_get_response import SettingGetResponse as SettingGetResponse
+from .payload_create_params import PayloadCreateParams as PayloadCreateParams
+from .payload_list_response import PayloadListResponse as PayloadListResponse
+from .payload_create_response import PayloadCreateResponse as PayloadCreateResponse
+from .payload_delete_response import PayloadDeleteResponse as PayloadDeleteResponse
+from .content_scanning_get_response import ContentScanningGetResponse as ContentScanningGetResponse
+from .content_scanning_create_params import ContentScanningCreateParams as ContentScanningCreateParams
+from .content_scanning_update_params import ContentScanningUpdateParams as ContentScanningUpdateParams
+from .content_scanning_create_response import ContentScanningCreateResponse as ContentScanningCreateResponse
+from .content_scanning_update_response import ContentScanningUpdateResponse as ContentScanningUpdateResponse
diff --git a/src/cloudflare/types/content_scanning/content_scanning_create_params.py b/src/cloudflare/types/content_scanning/content_scanning_create_params.py
new file mode 100644
index 00000000000..ddfc7e607e4
--- /dev/null
+++ b/src/cloudflare/types/content_scanning/content_scanning_create_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["ContentScanningCreateParams"]
+
+
+class ContentScanningCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    value: Required[Literal["enabled", "disabled"]]
+    """The status value for Content Scanning."""
diff --git a/src/cloudflare/types/content_scanning/content_scanning_create_response.py b/src/cloudflare/types/content_scanning/content_scanning_create_response.py
new file mode 100644
index 00000000000..ee017a94fd9
--- /dev/null
+++ b/src/cloudflare/types/content_scanning/content_scanning_create_response.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["ContentScanningCreateResponse"]
+
+
+class ContentScanningCreateResponse(BaseModel):
+    """Defines the status for Content Scanning."""
+
+    modified: Optional[str] = None
+    """Defines the last modification date (ISO 8601) of the Content Scanning status."""
+
+    value: Optional[str] = None
+    """Defines the status of Content Scanning."""
diff --git a/src/cloudflare/types/content_scanning/content_scanning_get_response.py b/src/cloudflare/types/content_scanning/content_scanning_get_response.py
new file mode 100644
index 00000000000..bde3a03bb66
--- /dev/null
+++ b/src/cloudflare/types/content_scanning/content_scanning_get_response.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["ContentScanningGetResponse"]
+
+
+class ContentScanningGetResponse(BaseModel):
+    """Defines the status for Content Scanning."""
+
+    modified: Optional[str] = None
+    """Defines the last modification date (ISO 8601) of the Content Scanning status."""
+
+    value: Optional[str] = None
+    """Defines the status of Content Scanning."""
diff --git a/src/cloudflare/types/content_scanning/content_scanning_update_params.py b/src/cloudflare/types/content_scanning/content_scanning_update_params.py
new file mode 100644
index 00000000000..4f50aaa3e87
--- /dev/null
+++ b/src/cloudflare/types/content_scanning/content_scanning_update_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["ContentScanningUpdateParams"]
+
+
+class ContentScanningUpdateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    value: Required[Literal["enabled", "disabled"]]
+    """The status value for Content Scanning."""
diff --git a/src/cloudflare/types/content_scanning/content_scanning_update_response.py b/src/cloudflare/types/content_scanning/content_scanning_update_response.py
new file mode 100644
index 00000000000..dc4938c0475
--- /dev/null
+++ b/src/cloudflare/types/content_scanning/content_scanning_update_response.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["ContentScanningUpdateResponse"]
+
+
+class ContentScanningUpdateResponse(BaseModel):
+    """Defines the status for Content Scanning."""
+
+    modified: Optional[str] = None
+    """Defines the last modification date (ISO 8601) of the Content Scanning status."""
+
+    value: Optional[str] = None
+    """Defines the status of Content Scanning."""
diff --git a/src/cloudflare/types/content_scanning/payload_create_params.py b/src/cloudflare/types/content_scanning/payload_create_params.py
new file mode 100644
index 00000000000..d4cc40f8d10
--- /dev/null
+++ b/src/cloudflare/types/content_scanning/payload_create_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["PayloadCreateParams", "Body"]
+
+
+class PayloadCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    body: Required[Iterable[Body]]
+
+
+class Body(TypedDict, total=False):
+    payload: Required[str]
+    """Defines the ruleset expression to use in matching content objects."""
diff --git a/src/cloudflare/types/content_scanning/payload_create_response.py b/src/cloudflare/types/content_scanning/payload_create_response.py
new file mode 100644
index 00000000000..de79afe017a
--- /dev/null
+++ b/src/cloudflare/types/content_scanning/payload_create_response.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["PayloadCreateResponse"]
+
+
+class PayloadCreateResponse(BaseModel):
+    """Defines a custom scan expression to match Content Scanning on."""
+
+    id: Optional[str] = None
+    """defines the unique ID for this custom scan expression."""
+
+    payload: Optional[str] = None
+    """Defines the ruleset expression to use in matching content objects."""
diff --git a/src/cloudflare/types/content_scanning/payload_delete_response.py b/src/cloudflare/types/content_scanning/payload_delete_response.py
new file mode 100644
index 00000000000..10d782ae077
--- /dev/null
+++ b/src/cloudflare/types/content_scanning/payload_delete_response.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["PayloadDeleteResponse"]
+
+
+class PayloadDeleteResponse(BaseModel):
+    """Defines a custom scan expression to match Content Scanning on."""
+
+    id: Optional[str] = None
+    """defines the unique ID for this custom scan expression."""
+
+    payload: Optional[str] = None
+    """Defines the ruleset expression to use in matching content objects."""
diff --git a/src/cloudflare/types/content_scanning/payload_list_response.py b/src/cloudflare/types/content_scanning/payload_list_response.py
new file mode 100644
index 00000000000..87111f44b89
--- /dev/null
+++ b/src/cloudflare/types/content_scanning/payload_list_response.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["PayloadListResponse"]
+
+
+class PayloadListResponse(BaseModel):
+    """Defines a custom scan expression to match Content Scanning on."""
+
+    id: Optional[str] = None
+    """defines the unique ID for this custom scan expression."""
+
+    payload: Optional[str] = None
+    """Defines the ruleset expression to use in matching content objects."""
diff --git a/src/cloudflare/types/content_scanning/setting_get_response.py b/src/cloudflare/types/content_scanning/setting_get_response.py
new file mode 100644
index 00000000000..b8da3b02884
--- /dev/null
+++ b/src/cloudflare/types/content_scanning/setting_get_response.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["SettingGetResponse"]
+
+
+class SettingGetResponse(BaseModel):
+    """Defines the status for Content Scanning."""
+
+    modified: Optional[str] = None
+    """Defines the last modification date (ISO 8601) of the Content Scanning status."""
+
+    value: Optional[str] = None
+    """Defines the status of Content Scanning."""
diff --git a/src/cloudflare/types/custom_certificates/__init__.py b/src/cloudflare/types/custom_certificates/__init__.py
index 755996fb44a..0c22e5de0ca 100644
--- a/src/cloudflare/types/custom_certificates/__init__.py
+++ b/src/cloudflare/types/custom_certificates/__init__.py
@@ -7,11 +7,7 @@
 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_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_certificates/custom_certificate.py b/src/cloudflare/types/custom_certificates/custom_certificate.py
index b5579f8a95f..e68d4a7d256 100644
--- a/src/cloudflare/types/custom_certificates/custom_certificate.py
+++ b/src/cloudflare/types/custom_certificates/custom_certificate.py
@@ -14,9 +14,12 @@
 
 class CustomCertificate(BaseModel):
     id: str
-    """Identifier"""
+    """Identifier."""
 
-    bundle_method: BundleMethod
+    zone_id: str
+    """Identifier."""
+
+    bundle_method: Optional[BundleMethod] = None
     """
     A ubiquitous bundle has the highest probability of being verified everywhere,
     even by clients using outdated or unusual trust stores. An optimal bundle uses
@@ -24,37 +27,9 @@ class CustomCertificate(BaseModel):
     chain, but does not otherwise modify it.
     """
 
-    expires_on: datetime
+    expires_on: Optional[datetime] = None
     """When the certificate from the authority expires."""
 
-    hosts: List[str]
-
-    issuer: str
-    """The certificate authority that issued the certificate."""
-
-    modified_on: datetime
-    """When the certificate was last modified."""
-
-    priority: float
-    """The order/priority in which the certificate will be used in a request.
-
-    The higher priority will break ties across overlapping 'legacy_custom'
-    certificates, but 'legacy_custom' certificates will always supercede
-    'sni_custom' certificates.
-    """
-
-    signature: str
-    """The type of hash used for the certificate."""
-
-    status: Literal["active", "expired", "deleted", "pending", "initializing"]
-    """Status of the zone's custom SSL."""
-
-    uploaded_on: datetime
-    """When the certificate was uploaded to Cloudflare."""
-
-    zone_id: str
-    """Identifier"""
-
     geo_restrictions: Optional[GeoRestrictions] = None
     """
     Specify the region where your private key can be held locally for optimal TLS
@@ -66,8 +41,16 @@ class CustomCertificate(BaseModel):
     for optimal performance.
     """
 
+    hosts: Optional[List[str]] = None
+
+    issuer: Optional[str] = None
+    """The certificate authority that issued the certificate."""
+
     keyless_server: Optional[KeylessCertificate] = None
 
+    modified_on: Optional[datetime] = None
+    """When the certificate was last modified."""
+
     policy: Optional[str] = None
     """
     Specify the policy that determines the region where your private key will be
@@ -80,3 +63,20 @@ class CustomCertificate(BaseModel):
     the EU region. If there are too few data centers satisfying the policy, it will
     be rejected.
     """
+
+    priority: Optional[float] = None
+    """The order/priority in which the certificate will be used in a request.
+
+    The higher priority will break ties across overlapping 'legacy_custom'
+    certificates, but 'legacy_custom' certificates will always supercede
+    'sni_custom' certificates.
+    """
+
+    signature: Optional[str] = None
+    """The type of hash used for the certificate."""
+
+    status: Optional[Literal["active", "expired", "deleted", "pending", "initializing"]] = None
+    """Status of the zone's custom SSL."""
+
+    uploaded_on: Optional[datetime] = None
+    """When the certificate was uploaded to Cloudflare."""
diff --git a/src/cloudflare/types/custom_certificates/custom_certificate_create_params.py b/src/cloudflare/types/custom_certificates/custom_certificate_create_params.py
index 015cc848ee0..e136cd19a8d 100644
--- a/src/cloudflare/types/custom_certificates/custom_certificate_create_params.py
+++ b/src/cloudflare/types/custom_certificates/custom_certificate_create_params.py
@@ -12,7 +12,7 @@
 
 class CustomCertificateCreateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     certificate: Required[str]
     """The zone's SSL certificate or certificate and the intermediate(s)."""
diff --git a/src/cloudflare/types/custom_certificates/custom_certificate_create_response.py b/src/cloudflare/types/custom_certificates/custom_certificate_create_response.py
deleted file mode 100644
index 051cffb09f8..00000000000
--- a/src/cloudflare/types/custom_certificates/custom_certificate_create_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["CustomCertificateCreateResponse"]
-
-CustomCertificateCreateResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/custom_certificates/custom_certificate_delete_response.py b/src/cloudflare/types/custom_certificates/custom_certificate_delete_response.py
index 0f730c57cbc..a370efeb29d 100644
--- a/src/cloudflare/types/custom_certificates/custom_certificate_delete_response.py
+++ b/src/cloudflare/types/custom_certificates/custom_certificate_delete_response.py
@@ -9,4 +9,4 @@
 
 class CustomCertificateDeleteResponse(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
diff --git a/src/cloudflare/types/custom_certificates/custom_certificate_edit_params.py b/src/cloudflare/types/custom_certificates/custom_certificate_edit_params.py
index 3fc3b9281b0..d2c6545582f 100644
--- a/src/cloudflare/types/custom_certificates/custom_certificate_edit_params.py
+++ b/src/cloudflare/types/custom_certificates/custom_certificate_edit_params.py
@@ -2,17 +2,18 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import Union
+from typing_extensions import Required, TypeAlias, TypedDict
 
 from .geo_restrictions_param import GeoRestrictionsParam
 from ..custom_hostnames.bundle_method import BundleMethod
 
-__all__ = ["CustomCertificateEditParams"]
+__all__ = ["CustomCertificateEditParams", "Variant0", "Variant1"]
 
 
-class CustomCertificateEditParams(TypedDict, total=False):
+class Variant0(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     bundle_method: BundleMethod
     """
@@ -22,9 +23,25 @@ class CustomCertificateEditParams(TypedDict, total=False):
     chain, but does not otherwise modify it.
     """
 
-    certificate: str
+
+class Variant1(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    certificate: Required[str]
     """The zone's SSL certificate or certificate and the intermediate(s)."""
 
+    private_key: Required[str]
+    """The zone's private key."""
+
+    bundle_method: BundleMethod
+    """
+    A ubiquitous bundle has the highest probability of being verified everywhere,
+    even by clients using outdated or unusual trust stores. An optimal bundle uses
+    the shortest chain and newest intermediates. And the force bundle verifies the
+    chain, but does not otherwise modify it.
+    """
+
     geo_restrictions: GeoRestrictionsParam
     """
     Specify the region where your private key can be held locally for optimal TLS
@@ -49,5 +66,5 @@ class CustomCertificateEditParams(TypedDict, total=False):
     be rejected.
     """
 
-    private_key: str
-    """The zone's private key."""
+
+CustomCertificateEditParams: TypeAlias = Union[Variant0, Variant1]
diff --git a/src/cloudflare/types/custom_certificates/custom_certificate_edit_response.py b/src/cloudflare/types/custom_certificates/custom_certificate_edit_response.py
deleted file mode 100644
index eefb2807119..00000000000
--- a/src/cloudflare/types/custom_certificates/custom_certificate_edit_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["CustomCertificateEditResponse"]
-
-CustomCertificateEditResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/custom_certificates/custom_certificate_get_response.py b/src/cloudflare/types/custom_certificates/custom_certificate_get_response.py
deleted file mode 100644
index f49aed30a8c..00000000000
--- a/src/cloudflare/types/custom_certificates/custom_certificate_get_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["CustomCertificateGetResponse"]
-
-CustomCertificateGetResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/custom_certificates/custom_certificate_list_params.py b/src/cloudflare/types/custom_certificates/custom_certificate_list_params.py
index 07d747ed472..20c06cc0e2f 100644
--- a/src/cloudflare/types/custom_certificates/custom_certificate_list_params.py
+++ b/src/cloudflare/types/custom_certificates/custom_certificate_list_params.py
@@ -9,7 +9,7 @@
 
 class CustomCertificateListParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     match: Literal["any", "all"]
     """Whether to match all search requirements or at least one (any)."""
diff --git a/src/cloudflare/types/custom_certificates/geo_restrictions.py b/src/cloudflare/types/custom_certificates/geo_restrictions.py
index 05462d8d2f8..e855de60490 100644
--- a/src/cloudflare/types/custom_certificates/geo_restrictions.py
+++ b/src/cloudflare/types/custom_certificates/geo_restrictions.py
@@ -9,4 +9,8 @@
 
 
 class GeoRestrictions(BaseModel):
+    """
+    Specify the region where your private key can be held locally for optimal TLS performance. HTTPS connections to any excluded data center will still be fully encrypted, but will incur some latency while Keyless SSL is used to complete the handshake with the nearest allowed data center. Options allow distribution to only to U.S. data centers, only to E.U. data centers, or only to highest security data centers. Default distribution is to all Cloudflare datacenters, for optimal performance.
+    """
+
     label: Optional[Literal["us", "eu", "highest_security"]] = None
diff --git a/src/cloudflare/types/custom_certificates/geo_restrictions_param.py b/src/cloudflare/types/custom_certificates/geo_restrictions_param.py
index 18590e2f34d..98e5377a8c4 100644
--- a/src/cloudflare/types/custom_certificates/geo_restrictions_param.py
+++ b/src/cloudflare/types/custom_certificates/geo_restrictions_param.py
@@ -8,4 +8,8 @@
 
 
 class GeoRestrictionsParam(TypedDict, total=False):
+    """
+    Specify the region where your private key can be held locally for optimal TLS performance. HTTPS connections to any excluded data center will still be fully encrypted, but will incur some latency while Keyless SSL is used to complete the handshake with the nearest allowed data center. Options allow distribution to only to U.S. data centers, only to E.U. data centers, or only to highest security data centers. Default distribution is to all Cloudflare datacenters, for optimal performance.
+    """
+
     label: Literal["us", "eu", "highest_security"]
diff --git a/src/cloudflare/types/custom_certificates/prioritize_update_params.py b/src/cloudflare/types/custom_certificates/prioritize_update_params.py
index 8e290afb630..faae994d81c 100644
--- a/src/cloudflare/types/custom_certificates/prioritize_update_params.py
+++ b/src/cloudflare/types/custom_certificates/prioritize_update_params.py
@@ -10,7 +10,7 @@
 
 class PrioritizeUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     certificates: Required[Iterable[Certificate]]
     """Array of ordered certificates."""
@@ -18,7 +18,7 @@ class PrioritizeUpdateParams(TypedDict, total=False):
 
 class Certificate(TypedDict, total=False):
     id: str
-    """Identifier"""
+    """Identifier."""
 
     priority: float
     """The order/priority in which the certificate will be used in a request.
diff --git a/src/cloudflare/types/custom_certificates/prioritize_update_response.py b/src/cloudflare/types/custom_certificates/prioritize_update_response.py
deleted file mode 100644
index c61eef0af1a..00000000000
--- a/src/cloudflare/types/custom_certificates/prioritize_update_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .custom_certificate import CustomCertificate
-
-__all__ = ["PrioritizeUpdateResponse"]
-
-PrioritizeUpdateResponse = List[CustomCertificate]
diff --git a/src/cloudflare/types/custom_certificates/status.py b/src/cloudflare/types/custom_certificates/status.py
index 428ccb247b1..2c587f35f29 100644
--- a/src/cloudflare/types/custom_certificates/status.py
+++ b/src/cloudflare/types/custom_certificates/status.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["Status"]
 
-Status = Literal["active", "pending_reactivation", "pending_revocation", "revoked"]
+Status: TypeAlias = Literal["active", "pending_reactivation", "pending_revocation", "revoked"]
diff --git a/src/cloudflare/types/custom_hostnames/bundle_method.py b/src/cloudflare/types/custom_hostnames/bundle_method.py
index eb7600c9e10..56a82b7270b 100644
--- a/src/cloudflare/types/custom_hostnames/bundle_method.py
+++ b/src/cloudflare/types/custom_hostnames/bundle_method.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["BundleMethod"]
 
-BundleMethod = Literal["ubiquitous", "optimal", "force"]
+BundleMethod: TypeAlias = Literal["ubiquitous", "optimal", "force"]
diff --git a/src/cloudflare/types/custom_hostnames/certificate_pack/__init__.py b/src/cloudflare/types/custom_hostnames/certificate_pack/__init__.py
new file mode 100644
index 00000000000..f5f692ca02a
--- /dev/null
+++ b/src/cloudflare/types/custom_hostnames/certificate_pack/__init__.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .certificate_update_params import CertificateUpdateParams as CertificateUpdateParams
+from .certificate_delete_response import CertificateDeleteResponse as CertificateDeleteResponse
+from .certificate_update_response import CertificateUpdateResponse as CertificateUpdateResponse
diff --git a/src/cloudflare/types/custom_hostnames/certificate_pack/certificate_delete_response.py b/src/cloudflare/types/custom_hostnames/certificate_pack/certificate_delete_response.py
new file mode 100644
index 00000000000..0772f706286
--- /dev/null
+++ b/src/cloudflare/types/custom_hostnames/certificate_pack/certificate_delete_response.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ...._models import BaseModel
+
+__all__ = ["CertificateDeleteResponse"]
+
+
+class CertificateDeleteResponse(BaseModel):
+    id: Optional[str] = None
+    """Identifier."""
diff --git a/src/cloudflare/types/custom_hostnames/certificate_pack/certificate_update_params.py b/src/cloudflare/types/custom_hostnames/certificate_pack/certificate_update_params.py
new file mode 100644
index 00000000000..802bf9b20ac
--- /dev/null
+++ b/src/cloudflare/types/custom_hostnames/certificate_pack/certificate_update_params.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["CertificateUpdateParams"]
+
+
+class CertificateUpdateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    custom_hostname_id: Required[str]
+    """Identifier."""
+
+    certificate_pack_id: Required[str]
+    """Identifier."""
+
+    custom_certificate: Required[str]
+    """If a custom uploaded certificate is used."""
+
+    custom_key: Required[str]
+    """The key for a custom uploaded certificate."""
diff --git a/src/cloudflare/types/custom_hostnames/certificate_pack/certificate_update_response.py b/src/cloudflare/types/custom_hostnames/certificate_pack/certificate_update_response.py
new file mode 100644
index 00000000000..fd789d39a14
--- /dev/null
+++ b/src/cloudflare/types/custom_hostnames/certificate_pack/certificate_update_response.py
@@ -0,0 +1,263 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+from ..dcv_method import DCVMethod
+from ..bundle_method import BundleMethod
+from ...shared.certificate_ca import CertificateCA
+from ..domain_validation_type import DomainValidationType
+
+__all__ = [
+    "CertificateUpdateResponse",
+    "SSL",
+    "SSLSettings",
+    "SSLValidationError",
+    "SSLValidationRecord",
+    "OwnershipVerification",
+    "OwnershipVerificationHTTP",
+]
+
+
+class SSLSettings(BaseModel):
+    ciphers: Optional[List[str]] = None
+    """An allowlist of ciphers for TLS termination.
+
+    These ciphers must be in the BoringSSL format.
+    """
+
+    early_hints: Optional[Literal["on", "off"]] = None
+    """Whether or not Early Hints is enabled."""
+
+    http2: Optional[Literal["on", "off"]] = None
+    """Whether or not HTTP2 is enabled."""
+
+    min_tls_version: Optional[Literal["1.0", "1.1", "1.2", "1.3"]] = None
+    """The minimum TLS version supported."""
+
+    tls_1_3: Optional[Literal["on", "off"]] = None
+    """Whether or not TLS 1.3 is enabled."""
+
+
+class SSLValidationError(BaseModel):
+    message: Optional[str] = None
+    """A domain validation error."""
+
+
+class SSLValidationRecord(BaseModel):
+    emails: Optional[List[str]] = None
+    """
+    The set of email addresses that the certificate authority (CA) will use to
+    complete domain validation.
+    """
+
+    http_body: Optional[str] = None
+    """
+    The content that the certificate authority (CA) will expect to find at the
+    http_url during the domain validation.
+    """
+
+    http_url: Optional[str] = None
+    """The url that will be checked during domain validation."""
+
+    txt_name: Optional[str] = None
+    """
+    The hostname that the certificate authority (CA) will check for a TXT record
+    during domain validation .
+    """
+
+    txt_value: Optional[str] = None
+    """
+    The TXT record that the certificate authority (CA) will check during domain
+    validation.
+    """
+
+
+class SSL(BaseModel):
+    id: Optional[str] = None
+    """Custom hostname SSL identifier tag."""
+
+    bundle_method: Optional[BundleMethod] = None
+    """
+    A ubiquitous bundle has the highest probability of being verified everywhere,
+    even by clients using outdated or unusual trust stores. An optimal bundle uses
+    the shortest chain and newest intermediates. And the force bundle verifies the
+    chain, but does not otherwise modify it.
+    """
+
+    certificate_authority: Optional[CertificateCA] = None
+    """The Certificate Authority that will issue the certificate"""
+
+    custom_certificate: Optional[str] = None
+    """If a custom uploaded certificate is used."""
+
+    custom_csr_id: Optional[str] = None
+    """The identifier for the Custom CSR that was used."""
+
+    custom_key: Optional[str] = None
+    """The key for a custom uploaded certificate."""
+
+    expires_on: Optional[datetime] = None
+    """The time the custom certificate expires on."""
+
+    hosts: Optional[List[str]] = None
+    """A list of Hostnames on a custom uploaded certificate."""
+
+    issuer: Optional[str] = None
+    """The issuer on a custom uploaded certificate."""
+
+    method: Optional[DCVMethod] = None
+    """Domain control validation (DCV) method used for this hostname."""
+
+    serial_number: Optional[str] = None
+    """The serial number on a custom uploaded certificate."""
+
+    settings: Optional[SSLSettings] = None
+
+    signature: Optional[str] = None
+    """The signature on a custom uploaded certificate."""
+
+    status: Optional[
+        Literal[
+            "initializing",
+            "pending_validation",
+            "deleted",
+            "pending_issuance",
+            "pending_deployment",
+            "pending_deletion",
+            "pending_expiration",
+            "expired",
+            "active",
+            "initializing_timed_out",
+            "validation_timed_out",
+            "issuance_timed_out",
+            "deployment_timed_out",
+            "deletion_timed_out",
+            "pending_cleanup",
+            "staging_deployment",
+            "staging_active",
+            "deactivating",
+            "inactive",
+            "backup_issued",
+            "holding_deployment",
+        ]
+    ] = None
+    """Status of the hostname's SSL certificates."""
+
+    type: Optional[DomainValidationType] = None
+    """Level of validation to be used for this hostname.
+
+    Domain validation (dv) must be used.
+    """
+
+    uploaded_on: Optional[datetime] = None
+    """The time the custom certificate was uploaded."""
+
+    validation_errors: Optional[List[SSLValidationError]] = None
+    """
+    Domain validation errors that have been received by the certificate authority
+    (CA).
+    """
+
+    validation_records: Optional[List[SSLValidationRecord]] = None
+
+    wildcard: Optional[bool] = None
+    """Indicates whether the certificate covers a wildcard."""
+
+
+class OwnershipVerification(BaseModel):
+    """This is a record which can be placed to activate a hostname."""
+
+    name: Optional[str] = None
+    """DNS Name for record."""
+
+    type: Optional[Literal["txt"]] = None
+    """DNS Record type."""
+
+    value: Optional[str] = None
+    """Content for the record."""
+
+
+class OwnershipVerificationHTTP(BaseModel):
+    """
+    This presents the token to be served by the given http url to activate a hostname.
+    """
+
+    http_body: Optional[str] = None
+    """Token to be served."""
+
+    http_url: Optional[str] = None
+    """
+    The HTTP URL that will be checked during custom hostname verification and where
+    the customer should host the token.
+    """
+
+
+class CertificateUpdateResponse(BaseModel):
+    id: str
+    """Identifier."""
+
+    hostname: str
+    """The custom hostname that will point to your hostname via CNAME."""
+
+    ssl: SSL
+
+    created_at: Optional[datetime] = None
+    """This is the time the hostname was created."""
+
+    custom_metadata: Optional[Dict[str, str]] = None
+    """Unique key/value metadata for this hostname.
+
+    These are per-hostname (customer) settings.
+    """
+
+    custom_origin_server: Optional[str] = None
+    """
+    a valid hostname that’s been added to your DNS zone as an A, AAAA, or CNAME
+    record.
+    """
+
+    custom_origin_sni: Optional[str] = None
+    """
+    A hostname that will be sent to your custom origin server as SNI for TLS
+    handshake. This can be a valid subdomain of the zone or custom origin server
+    name or the string ':request_host_header:' which will cause the host header in
+    the request to be used as SNI. Not configurable with default/fallback origin
+    server.
+    """
+
+    ownership_verification: Optional[OwnershipVerification] = None
+    """This is a record which can be placed to activate a hostname."""
+
+    ownership_verification_http: Optional[OwnershipVerificationHTTP] = None
+    """
+    This presents the token to be served by the given http url to activate a
+    hostname.
+    """
+
+    status: Optional[
+        Literal[
+            "active",
+            "pending",
+            "active_redeploying",
+            "moved",
+            "pending_deletion",
+            "deleted",
+            "pending_blocked",
+            "pending_migration",
+            "pending_provisioned",
+            "test_pending",
+            "test_active",
+            "test_active_apex",
+            "test_blocked",
+            "test_failed",
+            "provisioned",
+            "blocked",
+        ]
+    ] = None
+    """Status of the hostname's activation."""
+
+    verification_errors: Optional[List[str]] = None
+    """These are errors that were encountered while trying to activate a hostname."""
diff --git a/src/cloudflare/types/custom_hostnames/custom_hostname_create_params.py b/src/cloudflare/types/custom_hostnames/custom_hostname_create_params.py
index d47976e8d28..bb62627ca00 100644
--- a/src/cloudflare/types/custom_hostnames/custom_hostname_create_params.py
+++ b/src/cloudflare/types/custom_hostnames/custom_hostname_create_params.py
@@ -2,33 +2,47 @@
 
 from __future__ import annotations
 
-from typing import List
+from typing import Dict, Iterable
 from typing_extensions import Literal, Required, TypedDict
 
+from ..._types import SequenceNotStr
 from .dcv_method import DCVMethod
 from .bundle_method import BundleMethod
 from ..shared.certificate_ca import CertificateCA
 from .domain_validation_type import DomainValidationType
 
-__all__ = ["CustomHostnameCreateParams", "SSL", "SSLSettings", "CustomMetadata"]
+__all__ = ["CustomHostnameCreateParams", "SSL", "SSLCustomCERTBundle", "SSLSettings"]
 
 
 class CustomHostnameCreateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     hostname: Required[str]
     """The custom hostname that will point to your hostname via CNAME."""
 
-    ssl: Required[SSL]
+    custom_metadata: Dict[str, str]
+    """Unique key/value metadata for this hostname.
+
+    These are per-hostname (customer) settings.
+    """
+
+    ssl: SSL
     """SSL properties used when creating the custom hostname."""
 
-    custom_metadata: CustomMetadata
-    """These are per-hostname (customer) settings."""
+
+class SSLCustomCERTBundle(TypedDict, total=False):
+    custom_certificate: Required[str]
+    """If a custom uploaded certificate is used."""
+
+    custom_key: Required[str]
+    """The key for a custom uploaded certificate."""
 
 
 class SSLSettings(TypedDict, total=False):
-    ciphers: List[str]
+    """SSL specific settings."""
+
+    ciphers: SequenceNotStr[str]
     """An allowlist of ciphers for TLS termination.
 
     These ciphers must be in the BoringSSL format.
@@ -48,6 +62,8 @@ class SSLSettings(TypedDict, total=False):
 
 
 class SSL(TypedDict, total=False):
+    """SSL properties used when creating the custom hostname."""
+
     bundle_method: BundleMethod
     """
     A ubiquitous bundle has the highest probability of being verified everywhere,
@@ -59,6 +75,16 @@ class SSL(TypedDict, total=False):
     certificate_authority: CertificateCA
     """The Certificate Authority that will issue the certificate"""
 
+    cloudflare_branding: bool
+    """Whether or not to add Cloudflare Branding for the order.
+
+    This will add a subdomain of sni.cloudflaressl.com as the Common Name if set to
+    true
+    """
+
+    custom_cert_bundle: Iterable[SSLCustomCERTBundle]
+    """Array of custom certificate and key pairs (1 or 2 pairs allowed)"""
+
     custom_certificate: str
     """If a custom uploaded certificate is used."""
 
@@ -79,8 +105,3 @@ class SSL(TypedDict, total=False):
 
     wildcard: bool
     """Indicates whether the certificate covers a wildcard."""
-
-
-class CustomMetadata(TypedDict, total=False):
-    key: str
-    """Unique metadata for this hostname."""
diff --git a/src/cloudflare/types/custom_hostnames/custom_hostname_create_response.py b/src/cloudflare/types/custom_hostnames/custom_hostname_create_response.py
index dfe7fd48f7f..a12bffbcc24 100644
--- a/src/cloudflare/types/custom_hostnames/custom_hostname_create_response.py
+++ b/src/cloudflare/types/custom_hostnames/custom_hostname_create_response.py
@@ -1,6 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Dict, List, Optional
 from datetime import datetime
 from typing_extensions import Literal
 
@@ -16,7 +16,6 @@
     "SSLSettings",
     "SSLValidationError",
     "SSLValidationRecord",
-    "CustomMetadata",
     "OwnershipVerification",
     "OwnershipVerificationHTTP",
 ]
@@ -48,7 +47,7 @@ class SSLValidationError(BaseModel):
 
 
 class SSLValidationRecord(BaseModel):
-    emails: Optional[List[object]] = None
+    emails: Optional[List[str]] = None
     """
     The set of email addresses that the certificate authority (CA) will use to
     complete domain validation.
@@ -103,7 +102,7 @@ class SSL(BaseModel):
     expires_on: Optional[datetime] = None
     """The time the custom certificate expires on."""
 
-    hosts: Optional[List[object]] = None
+    hosts: Optional[List[str]] = None
     """A list of Hostnames on a custom uploaded certificate."""
 
     issuer: Optional[str] = None
@@ -116,7 +115,6 @@ class SSL(BaseModel):
     """The serial number on a custom uploaded certificate."""
 
     settings: Optional[SSLSettings] = None
-    """SSL specific settings."""
 
     signature: Optional[str] = None
     """The signature on a custom uploaded certificate."""
@@ -169,12 +167,9 @@ class SSL(BaseModel):
     """Indicates whether the certificate covers a wildcard."""
 
 
-class CustomMetadata(BaseModel):
-    key: Optional[str] = None
-    """Unique metadata for this hostname."""
-
-
 class OwnershipVerification(BaseModel):
+    """This is a record which can be placed to activate a hostname."""
+
     name: Optional[str] = None
     """DNS Name for record."""
 
@@ -186,6 +181,10 @@ class OwnershipVerification(BaseModel):
 
 
 class OwnershipVerificationHTTP(BaseModel):
+    """
+    This presents the token to be served by the given http url to activate a hostname.
+    """
+
     http_body: Optional[str] = None
     """Token to be served."""
 
@@ -198,19 +197,21 @@ class OwnershipVerificationHTTP(BaseModel):
 
 class CustomHostnameCreateResponse(BaseModel):
     id: str
-    """Identifier"""
+    """Identifier."""
 
     hostname: str
     """The custom hostname that will point to your hostname via CNAME."""
 
     ssl: SSL
-    """SSL properties for the custom hostname."""
 
     created_at: Optional[datetime] = None
     """This is the time the hostname was created."""
 
-    custom_metadata: Optional[CustomMetadata] = None
-    """These are per-hostname (customer) settings."""
+    custom_metadata: Optional[Dict[str, str]] = None
+    """Unique key/value metadata for this hostname.
+
+    These are per-hostname (customer) settings.
+    """
 
     custom_origin_server: Optional[str] = None
     """
@@ -258,5 +259,5 @@ class CustomHostnameCreateResponse(BaseModel):
     ] = None
     """Status of the hostname's activation."""
 
-    verification_errors: Optional[List[object]] = None
+    verification_errors: Optional[List[str]] = None
     """These are errors that were encountered while trying to activate a hostname."""
diff --git a/src/cloudflare/types/custom_hostnames/custom_hostname_delete_response.py b/src/cloudflare/types/custom_hostnames/custom_hostname_delete_response.py
index 138a18a96ed..ead158d9e2d 100644
--- a/src/cloudflare/types/custom_hostnames/custom_hostname_delete_response.py
+++ b/src/cloudflare/types/custom_hostnames/custom_hostname_delete_response.py
@@ -9,4 +9,4 @@
 
 class CustomHostnameDeleteResponse(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
diff --git a/src/cloudflare/types/custom_hostnames/custom_hostname_edit_params.py b/src/cloudflare/types/custom_hostnames/custom_hostname_edit_params.py
index 52e45f8ec77..027a31dcd58 100644
--- a/src/cloudflare/types/custom_hostnames/custom_hostname_edit_params.py
+++ b/src/cloudflare/types/custom_hostnames/custom_hostname_edit_params.py
@@ -2,23 +2,27 @@
 
 from __future__ import annotations
 
-from typing import List
+from typing import Dict, Iterable
 from typing_extensions import Literal, Required, TypedDict
 
+from ..._types import SequenceNotStr
 from .dcv_method import DCVMethod
 from .bundle_method import BundleMethod
 from ..shared.certificate_ca import CertificateCA
 from .domain_validation_type import DomainValidationType
 
-__all__ = ["CustomHostnameEditParams", "CustomMetadata", "SSL", "SSLSettings"]
+__all__ = ["CustomHostnameEditParams", "SSL", "SSLCustomCERTBundle", "SSLSettings"]
 
 
 class CustomHostnameEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    custom_metadata: CustomMetadata
-    """These are per-hostname (customer) settings."""
+    custom_metadata: Dict[str, str]
+    """Unique key/value metadata for this hostname.
+
+    These are per-hostname (customer) settings.
+    """
 
     custom_origin_server: str
     """
@@ -39,13 +43,18 @@ class CustomHostnameEditParams(TypedDict, total=False):
     """SSL properties used when creating the custom hostname."""
 
 
-class CustomMetadata(TypedDict, total=False):
-    key: str
-    """Unique metadata for this hostname."""
+class SSLCustomCERTBundle(TypedDict, total=False):
+    custom_certificate: Required[str]
+    """If a custom uploaded certificate is used."""
+
+    custom_key: Required[str]
+    """The key for a custom uploaded certificate."""
 
 
 class SSLSettings(TypedDict, total=False):
-    ciphers: List[str]
+    """SSL specific settings."""
+
+    ciphers: SequenceNotStr[str]
     """An allowlist of ciphers for TLS termination.
 
     These ciphers must be in the BoringSSL format.
@@ -65,6 +74,8 @@ class SSLSettings(TypedDict, total=False):
 
 
 class SSL(TypedDict, total=False):
+    """SSL properties used when creating the custom hostname."""
+
     bundle_method: BundleMethod
     """
     A ubiquitous bundle has the highest probability of being verified everywhere,
@@ -76,6 +87,16 @@ class SSL(TypedDict, total=False):
     certificate_authority: CertificateCA
     """The Certificate Authority that will issue the certificate"""
 
+    cloudflare_branding: bool
+    """Whether or not to add Cloudflare Branding for the order.
+
+    This will add a subdomain of sni.cloudflaressl.com as the Common Name if set to
+    true
+    """
+
+    custom_cert_bundle: Iterable[SSLCustomCERTBundle]
+    """Array of custom certificate and key pairs (1 or 2 pairs allowed)"""
+
     custom_certificate: str
     """If a custom uploaded certificate is used."""
 
diff --git a/src/cloudflare/types/custom_hostnames/custom_hostname_edit_response.py b/src/cloudflare/types/custom_hostnames/custom_hostname_edit_response.py
index c566f4a4411..4fab5861d1f 100644
--- a/src/cloudflare/types/custom_hostnames/custom_hostname_edit_response.py
+++ b/src/cloudflare/types/custom_hostnames/custom_hostname_edit_response.py
@@ -1,6 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Dict, List, Optional
 from datetime import datetime
 from typing_extensions import Literal
 
@@ -16,7 +16,6 @@
     "SSLSettings",
     "SSLValidationError",
     "SSLValidationRecord",
-    "CustomMetadata",
     "OwnershipVerification",
     "OwnershipVerificationHTTP",
 ]
@@ -48,7 +47,7 @@ class SSLValidationError(BaseModel):
 
 
 class SSLValidationRecord(BaseModel):
-    emails: Optional[List[object]] = None
+    emails: Optional[List[str]] = None
     """
     The set of email addresses that the certificate authority (CA) will use to
     complete domain validation.
@@ -103,7 +102,7 @@ class SSL(BaseModel):
     expires_on: Optional[datetime] = None
     """The time the custom certificate expires on."""
 
-    hosts: Optional[List[object]] = None
+    hosts: Optional[List[str]] = None
     """A list of Hostnames on a custom uploaded certificate."""
 
     issuer: Optional[str] = None
@@ -116,7 +115,6 @@ class SSL(BaseModel):
     """The serial number on a custom uploaded certificate."""
 
     settings: Optional[SSLSettings] = None
-    """SSL specific settings."""
 
     signature: Optional[str] = None
     """The signature on a custom uploaded certificate."""
@@ -169,12 +167,9 @@ class SSL(BaseModel):
     """Indicates whether the certificate covers a wildcard."""
 
 
-class CustomMetadata(BaseModel):
-    key: Optional[str] = None
-    """Unique metadata for this hostname."""
-
-
 class OwnershipVerification(BaseModel):
+    """This is a record which can be placed to activate a hostname."""
+
     name: Optional[str] = None
     """DNS Name for record."""
 
@@ -186,6 +181,10 @@ class OwnershipVerification(BaseModel):
 
 
 class OwnershipVerificationHTTP(BaseModel):
+    """
+    This presents the token to be served by the given http url to activate a hostname.
+    """
+
     http_body: Optional[str] = None
     """Token to be served."""
 
@@ -198,19 +197,21 @@ class OwnershipVerificationHTTP(BaseModel):
 
 class CustomHostnameEditResponse(BaseModel):
     id: str
-    """Identifier"""
+    """Identifier."""
 
     hostname: str
     """The custom hostname that will point to your hostname via CNAME."""
 
     ssl: SSL
-    """SSL properties for the custom hostname."""
 
     created_at: Optional[datetime] = None
     """This is the time the hostname was created."""
 
-    custom_metadata: Optional[CustomMetadata] = None
-    """These are per-hostname (customer) settings."""
+    custom_metadata: Optional[Dict[str, str]] = None
+    """Unique key/value metadata for this hostname.
+
+    These are per-hostname (customer) settings.
+    """
 
     custom_origin_server: Optional[str] = None
     """
@@ -258,5 +259,5 @@ class CustomHostnameEditResponse(BaseModel):
     ] = None
     """Status of the hostname's activation."""
 
-    verification_errors: Optional[List[object]] = None
+    verification_errors: Optional[List[str]] = None
     """These are errors that were encountered while trying to activate a hostname."""
diff --git a/src/cloudflare/types/custom_hostnames/custom_hostname_get_response.py b/src/cloudflare/types/custom_hostnames/custom_hostname_get_response.py
index 16d15f4f222..53c6e8f704f 100644
--- a/src/cloudflare/types/custom_hostnames/custom_hostname_get_response.py
+++ b/src/cloudflare/types/custom_hostnames/custom_hostname_get_response.py
@@ -1,6 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Dict, List, Optional
 from datetime import datetime
 from typing_extensions import Literal
 
@@ -16,7 +16,6 @@
     "SSLSettings",
     "SSLValidationError",
     "SSLValidationRecord",
-    "CustomMetadata",
     "OwnershipVerification",
     "OwnershipVerificationHTTP",
 ]
@@ -48,7 +47,7 @@ class SSLValidationError(BaseModel):
 
 
 class SSLValidationRecord(BaseModel):
-    emails: Optional[List[object]] = None
+    emails: Optional[List[str]] = None
     """
     The set of email addresses that the certificate authority (CA) will use to
     complete domain validation.
@@ -103,7 +102,7 @@ class SSL(BaseModel):
     expires_on: Optional[datetime] = None
     """The time the custom certificate expires on."""
 
-    hosts: Optional[List[object]] = None
+    hosts: Optional[List[str]] = None
     """A list of Hostnames on a custom uploaded certificate."""
 
     issuer: Optional[str] = None
@@ -116,7 +115,6 @@ class SSL(BaseModel):
     """The serial number on a custom uploaded certificate."""
 
     settings: Optional[SSLSettings] = None
-    """SSL specific settings."""
 
     signature: Optional[str] = None
     """The signature on a custom uploaded certificate."""
@@ -169,12 +167,9 @@ class SSL(BaseModel):
     """Indicates whether the certificate covers a wildcard."""
 
 
-class CustomMetadata(BaseModel):
-    key: Optional[str] = None
-    """Unique metadata for this hostname."""
-
-
 class OwnershipVerification(BaseModel):
+    """This is a record which can be placed to activate a hostname."""
+
     name: Optional[str] = None
     """DNS Name for record."""
 
@@ -186,6 +181,10 @@ class OwnershipVerification(BaseModel):
 
 
 class OwnershipVerificationHTTP(BaseModel):
+    """
+    This presents the token to be served by the given http url to activate a hostname.
+    """
+
     http_body: Optional[str] = None
     """Token to be served."""
 
@@ -198,19 +197,21 @@ class OwnershipVerificationHTTP(BaseModel):
 
 class CustomHostnameGetResponse(BaseModel):
     id: str
-    """Identifier"""
+    """Identifier."""
 
     hostname: str
     """The custom hostname that will point to your hostname via CNAME."""
 
     ssl: SSL
-    """SSL properties for the custom hostname."""
 
     created_at: Optional[datetime] = None
     """This is the time the hostname was created."""
 
-    custom_metadata: Optional[CustomMetadata] = None
-    """These are per-hostname (customer) settings."""
+    custom_metadata: Optional[Dict[str, str]] = None
+    """Unique key/value metadata for this hostname.
+
+    These are per-hostname (customer) settings.
+    """
 
     custom_origin_server: Optional[str] = None
     """
@@ -258,5 +259,5 @@ class CustomHostnameGetResponse(BaseModel):
     ] = None
     """Status of the hostname's activation."""
 
-    verification_errors: Optional[List[object]] = None
+    verification_errors: Optional[List[str]] = None
     """These are errors that were encountered while trying to activate a hostname."""
diff --git a/src/cloudflare/types/custom_hostnames/custom_hostname_list_params.py b/src/cloudflare/types/custom_hostnames/custom_hostname_list_params.py
index 65b0464db76..2c8353475af 100644
--- a/src/cloudflare/types/custom_hostnames/custom_hostname_list_params.py
+++ b/src/cloudflare/types/custom_hostnames/custom_hostname_list_params.py
@@ -9,7 +9,7 @@
 
 class CustomHostnameListParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     id: str
     """Hostname ID to match against.
diff --git a/src/cloudflare/types/custom_hostnames/custom_hostname_list_response.py b/src/cloudflare/types/custom_hostnames/custom_hostname_list_response.py
index 691ee91af4e..aabb7ebf897 100644
--- a/src/cloudflare/types/custom_hostnames/custom_hostname_list_response.py
+++ b/src/cloudflare/types/custom_hostnames/custom_hostname_list_response.py
@@ -1,6 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Dict, List, Optional
 from datetime import datetime
 from typing_extensions import Literal
 
@@ -16,7 +16,6 @@
     "SSLSettings",
     "SSLValidationError",
     "SSLValidationRecord",
-    "CustomMetadata",
     "OwnershipVerification",
     "OwnershipVerificationHTTP",
 ]
@@ -48,7 +47,7 @@ class SSLValidationError(BaseModel):
 
 
 class SSLValidationRecord(BaseModel):
-    emails: Optional[List[object]] = None
+    emails: Optional[List[str]] = None
     """
     The set of email addresses that the certificate authority (CA) will use to
     complete domain validation.
@@ -103,7 +102,7 @@ class SSL(BaseModel):
     expires_on: Optional[datetime] = None
     """The time the custom certificate expires on."""
 
-    hosts: Optional[List[object]] = None
+    hosts: Optional[List[str]] = None
     """A list of Hostnames on a custom uploaded certificate."""
 
     issuer: Optional[str] = None
@@ -116,7 +115,6 @@ class SSL(BaseModel):
     """The serial number on a custom uploaded certificate."""
 
     settings: Optional[SSLSettings] = None
-    """SSL specific settings."""
 
     signature: Optional[str] = None
     """The signature on a custom uploaded certificate."""
@@ -169,12 +167,9 @@ class SSL(BaseModel):
     """Indicates whether the certificate covers a wildcard."""
 
 
-class CustomMetadata(BaseModel):
-    key: Optional[str] = None
-    """Unique metadata for this hostname."""
-
-
 class OwnershipVerification(BaseModel):
+    """This is a record which can be placed to activate a hostname."""
+
     name: Optional[str] = None
     """DNS Name for record."""
 
@@ -186,6 +181,10 @@ class OwnershipVerification(BaseModel):
 
 
 class OwnershipVerificationHTTP(BaseModel):
+    """
+    This presents the token to be served by the given http url to activate a hostname.
+    """
+
     http_body: Optional[str] = None
     """Token to be served."""
 
@@ -198,19 +197,21 @@ class OwnershipVerificationHTTP(BaseModel):
 
 class CustomHostnameListResponse(BaseModel):
     id: str
-    """Identifier"""
+    """Identifier."""
 
     hostname: str
     """The custom hostname that will point to your hostname via CNAME."""
 
     ssl: SSL
-    """SSL properties for the custom hostname."""
 
     created_at: Optional[datetime] = None
     """This is the time the hostname was created."""
 
-    custom_metadata: Optional[CustomMetadata] = None
-    """These are per-hostname (customer) settings."""
+    custom_metadata: Optional[Dict[str, str]] = None
+    """Unique key/value metadata for this hostname.
+
+    These are per-hostname (customer) settings.
+    """
 
     custom_origin_server: Optional[str] = None
     """
@@ -258,5 +259,5 @@ class CustomHostnameListResponse(BaseModel):
     ] = None
     """Status of the hostname's activation."""
 
-    verification_errors: Optional[List[object]] = None
+    verification_errors: Optional[List[str]] = None
     """These are errors that were encountered while trying to activate a hostname."""
diff --git a/src/cloudflare/types/custom_hostnames/dcv_method.py b/src/cloudflare/types/custom_hostnames/dcv_method.py
index 0a87ee2154f..ebfada34a6e 100644
--- a/src/cloudflare/types/custom_hostnames/dcv_method.py
+++ b/src/cloudflare/types/custom_hostnames/dcv_method.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["DCVMethod"]
 
-DCVMethod = Literal["http", "txt", "email"]
+DCVMethod: TypeAlias = Literal["http", "txt", "email"]
diff --git a/src/cloudflare/types/custom_hostnames/domain_validation_type.py b/src/cloudflare/types/custom_hostnames/domain_validation_type.py
index 1d079af9828..11e882fa1b1 100644
--- a/src/cloudflare/types/custom_hostnames/domain_validation_type.py
+++ b/src/cloudflare/types/custom_hostnames/domain_validation_type.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["DomainValidationType"]
 
-DomainValidationType = Literal["dv"]
+DomainValidationType: TypeAlias = Literal["dv"]
diff --git a/src/cloudflare/types/custom_hostnames/fallback_origin_delete_response.py b/src/cloudflare/types/custom_hostnames/fallback_origin_delete_response.py
index 3b4c1ef2f97..86fde134bf0 100644
--- a/src/cloudflare/types/custom_hostnames/fallback_origin_delete_response.py
+++ b/src/cloudflare/types/custom_hostnames/fallback_origin_delete_response.py
@@ -1,7 +1,38 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
 
 __all__ = ["FallbackOriginDeleteResponse"]
 
-FallbackOriginDeleteResponse = Union[Optional[str], Optional[object]]
+
+class FallbackOriginDeleteResponse(BaseModel):
+    created_at: Optional[datetime] = None
+    """This is the time the fallback origin was created."""
+
+    errors: Optional[List[str]] = None
+    """
+    These are errors that were encountered while trying to activate a fallback
+    origin.
+    """
+
+    origin: Optional[str] = None
+    """Your origin hostname that requests to your custom hostnames will be sent to."""
+
+    status: Optional[
+        Literal[
+            "initializing",
+            "pending_deployment",
+            "pending_deletion",
+            "active",
+            "deployment_timed_out",
+            "deletion_timed_out",
+        ]
+    ] = None
+    """Status of the fallback origin's activation."""
+
+    updated_at: Optional[datetime] = None
+    """This is the time the fallback origin was updated."""
diff --git a/src/cloudflare/types/custom_hostnames/fallback_origin_get_response.py b/src/cloudflare/types/custom_hostnames/fallback_origin_get_response.py
index 2a43cf04e81..b87d2c59b1e 100644
--- a/src/cloudflare/types/custom_hostnames/fallback_origin_get_response.py
+++ b/src/cloudflare/types/custom_hostnames/fallback_origin_get_response.py
@@ -1,7 +1,38 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
 
 __all__ = ["FallbackOriginGetResponse"]
 
-FallbackOriginGetResponse = Union[Optional[str], Optional[object]]
+
+class FallbackOriginGetResponse(BaseModel):
+    created_at: Optional[datetime] = None
+    """This is the time the fallback origin was created."""
+
+    errors: Optional[List[str]] = None
+    """
+    These are errors that were encountered while trying to activate a fallback
+    origin.
+    """
+
+    origin: Optional[str] = None
+    """Your origin hostname that requests to your custom hostnames will be sent to."""
+
+    status: Optional[
+        Literal[
+            "initializing",
+            "pending_deployment",
+            "pending_deletion",
+            "active",
+            "deployment_timed_out",
+            "deletion_timed_out",
+        ]
+    ] = None
+    """Status of the fallback origin's activation."""
+
+    updated_at: Optional[datetime] = None
+    """This is the time the fallback origin was updated."""
diff --git a/src/cloudflare/types/custom_hostnames/fallback_origin_update_params.py b/src/cloudflare/types/custom_hostnames/fallback_origin_update_params.py
index 3818b404323..d03e8bacde4 100644
--- a/src/cloudflare/types/custom_hostnames/fallback_origin_update_params.py
+++ b/src/cloudflare/types/custom_hostnames/fallback_origin_update_params.py
@@ -9,7 +9,7 @@
 
 class FallbackOriginUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     origin: Required[str]
     """Your origin hostname that requests to your custom hostnames will be sent to."""
diff --git a/src/cloudflare/types/custom_hostnames/fallback_origin_update_response.py b/src/cloudflare/types/custom_hostnames/fallback_origin_update_response.py
index 0902ecd4e58..022f3db10e5 100644
--- a/src/cloudflare/types/custom_hostnames/fallback_origin_update_response.py
+++ b/src/cloudflare/types/custom_hostnames/fallback_origin_update_response.py
@@ -1,7 +1,38 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
 
 __all__ = ["FallbackOriginUpdateResponse"]
 
-FallbackOriginUpdateResponse = Union[Optional[str], Optional[object]]
+
+class FallbackOriginUpdateResponse(BaseModel):
+    created_at: Optional[datetime] = None
+    """This is the time the fallback origin was created."""
+
+    errors: Optional[List[str]] = None
+    """
+    These are errors that were encountered while trying to activate a fallback
+    origin.
+    """
+
+    origin: Optional[str] = None
+    """Your origin hostname that requests to your custom hostnames will be sent to."""
+
+    status: Optional[
+        Literal[
+            "initializing",
+            "pending_deployment",
+            "pending_deletion",
+            "active",
+            "deployment_timed_out",
+            "deletion_timed_out",
+        ]
+    ] = None
+    """Status of the fallback origin's activation."""
+
+    updated_at: Optional[datetime] = None
+    """This is the time the fallback origin was updated."""
diff --git a/src/cloudflare/types/custom_nameservers/__init__.py b/src/cloudflare/types/custom_nameservers/__init__.py
index a67351a5bcd..8f7f4302b4b 100644
--- a/src/cloudflare/types/custom_nameservers/__init__.py
+++ b/src/cloudflare/types/custom_nameservers/__init__.py
@@ -3,9 +3,5 @@
 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_response import CustomNameserverDeleteResponse as CustomNameserverDeleteResponse
-from .custom_nameserver_availabilty_response import (
-    CustomNameserverAvailabiltyResponse as CustomNameserverAvailabiltyResponse,
-)
diff --git a/src/cloudflare/types/custom_nameservers/custom_nameserver.py b/src/cloudflare/types/custom_nameservers/custom_nameserver.py
index 9b56d6d5495..b530a5609fa 100644
--- a/src/cloudflare/types/custom_nameservers/custom_nameserver.py
+++ b/src/cloudflare/types/custom_nameservers/custom_nameserver.py
@@ -17,6 +17,8 @@ class DNSRecord(BaseModel):
 
 
 class CustomNameserver(BaseModel):
+    """A single account custom nameserver."""
+
     dns_records: List[DNSRecord]
     """A and AAAA records associated with the nameserver."""
 
@@ -27,7 +29,7 @@ class CustomNameserver(BaseModel):
     """Verification status of the nameserver."""
 
     zone_tag: str
-    """Identifier"""
+    """Identifier."""
 
     ns_set: Optional[float] = None
     """The number of the set that this name server belongs to."""
diff --git a/src/cloudflare/types/custom_nameservers/custom_nameserver_availabilty_response.py b/src/cloudflare/types/custom_nameservers/custom_nameserver_availabilty_response.py
deleted file mode 100644
index 84e9163fe6a..00000000000
--- a/src/cloudflare/types/custom_nameservers/custom_nameserver_availabilty_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-__all__ = ["CustomNameserverAvailabiltyResponse"]
-
-CustomNameserverAvailabiltyResponse = List[str]
diff --git a/src/cloudflare/types/custom_nameservers/custom_nameserver_delete_response.py b/src/cloudflare/types/custom_nameservers/custom_nameserver_delete_response.py
index fe6ff20f1de..b49cbce768f 100644
--- a/src/cloudflare/types/custom_nameservers/custom_nameserver_delete_response.py
+++ b/src/cloudflare/types/custom_nameservers/custom_nameserver_delete_response.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing_extensions import TypeAlias
 
 __all__ = ["CustomNameserverDeleteResponse"]
 
-CustomNameserverDeleteResponse = List[object]
+CustomNameserverDeleteResponse: TypeAlias = str
diff --git a/src/cloudflare/types/custom_nameservers/custom_nameserver_get_response.py b/src/cloudflare/types/custom_nameservers/custom_nameserver_get_response.py
deleted file mode 100644
index 52cccf43186..00000000000
--- a/src/cloudflare/types/custom_nameservers/custom_nameserver_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .custom_nameserver import CustomNameserver
-
-__all__ = ["CustomNameserverGetResponse"]
-
-CustomNameserverGetResponse = List[CustomNameserver]
diff --git a/src/cloudflare/types/custom_pages/__init__.py b/src/cloudflare/types/custom_pages/__init__.py
new file mode 100644
index 00000000000..82f908e3834
--- /dev/null
+++ b/src/cloudflare/types/custom_pages/__init__.py
@@ -0,0 +1,8 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .custom_page_get_response import CustomPageGetResponse as CustomPageGetResponse
+from .custom_page_list_response import CustomPageListResponse as CustomPageListResponse
+from .custom_page_update_params import CustomPageUpdateParams as CustomPageUpdateParams
+from .custom_page_update_response import CustomPageUpdateResponse as CustomPageUpdateResponse
diff --git a/src/cloudflare/types/custom_pages/custom_page_get_response.py b/src/cloudflare/types/custom_pages/custom_page_get_response.py
new file mode 100644
index 00000000000..3644da0fec0
--- /dev/null
+++ b/src/cloudflare/types/custom_pages/custom_page_get_response.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["CustomPageGetResponse"]
+
+
+class CustomPageGetResponse(BaseModel):
+    id: Optional[str] = None
+
+    created_on: Optional[datetime] = None
+
+    description: Optional[str] = None
+
+    modified_on: Optional[datetime] = None
+
+    preview_target: Optional[str] = None
+
+    required_tokens: Optional[List[str]] = None
+
+    state: Optional[Literal["default", "customized"]] = None
+    """The custom page state."""
+
+    url: Optional[str] = None
+    """The URL associated with the custom page."""
diff --git a/src/cloudflare/types/custom_pages/custom_page_list_response.py b/src/cloudflare/types/custom_pages/custom_page_list_response.py
new file mode 100644
index 00000000000..da03e87bada
--- /dev/null
+++ b/src/cloudflare/types/custom_pages/custom_page_list_response.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["CustomPageListResponse"]
+
+
+class CustomPageListResponse(BaseModel):
+    id: Optional[str] = None
+
+    created_on: Optional[datetime] = None
+
+    description: Optional[str] = None
+
+    modified_on: Optional[datetime] = None
+
+    preview_target: Optional[str] = None
+
+    required_tokens: Optional[List[str]] = None
+
+    state: Optional[Literal["default", "customized"]] = None
+    """The custom page state."""
+
+    url: Optional[str] = None
+    """The URL associated with the custom page."""
diff --git a/src/cloudflare/types/custom_pages/custom_page_update_params.py b/src/cloudflare/types/custom_pages/custom_page_update_params.py
new file mode 100644
index 00000000000..eaa0afb1ea7
--- /dev/null
+++ b/src/cloudflare/types/custom_pages/custom_page_update_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["CustomPageUpdateParams"]
+
+
+class CustomPageUpdateParams(TypedDict, total=False):
+    state: Required[Literal["default", "customized"]]
+    """The custom page state."""
+
+    url: Required[str]
+    """The URL associated with the custom page."""
+
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
diff --git a/src/cloudflare/types/custom_pages/custom_page_update_response.py b/src/cloudflare/types/custom_pages/custom_page_update_response.py
new file mode 100644
index 00000000000..fd32fe3fd44
--- /dev/null
+++ b/src/cloudflare/types/custom_pages/custom_page_update_response.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["CustomPageUpdateResponse"]
+
+
+class CustomPageUpdateResponse(BaseModel):
+    id: Optional[str] = None
+
+    created_on: Optional[datetime] = None
+
+    description: Optional[str] = None
+
+    modified_on: Optional[datetime] = None
+
+    preview_target: Optional[str] = None
+
+    required_tokens: Optional[List[str]] = None
+
+    state: Optional[Literal["default", "customized"]] = None
+    """The custom page state."""
+
+    url: Optional[str] = None
+    """The URL associated with the custom page."""
diff --git a/src/cloudflare/types/d1/__init__.py b/src/cloudflare/types/d1/__init__.py
index fe272f9209e..fcfb2c53a47 100644
--- a/src/cloudflare/types/d1/__init__.py
+++ b/src/cloudflare/types/d1/__init__.py
@@ -5,11 +5,14 @@
 from .d1 import D1 as D1
 from .query_result import QueryResult as QueryResult
 from .database_raw_params import DatabaseRawParams as DatabaseRawParams
+from .database_edit_params import DatabaseEditParams as DatabaseEditParams
 from .database_list_params import DatabaseListParams as DatabaseListParams
 from .database_query_params import DatabaseQueryParams as DatabaseQueryParams
 from .database_raw_response import DatabaseRawResponse as DatabaseRawResponse
 from .database_create_params import DatabaseCreateParams as DatabaseCreateParams
+from .database_export_params import DatabaseExportParams as DatabaseExportParams
+from .database_import_params import DatabaseImportParams as DatabaseImportParams
 from .database_list_response import DatabaseListResponse as DatabaseListResponse
-from .database_query_response import DatabaseQueryResponse as DatabaseQueryResponse
-from .database_create_response import DatabaseCreateResponse as DatabaseCreateResponse
-from .database_delete_response import DatabaseDeleteResponse as DatabaseDeleteResponse
+from .database_update_params import DatabaseUpdateParams as DatabaseUpdateParams
+from .database_export_response import DatabaseExportResponse as DatabaseExportResponse
+from .database_import_response import DatabaseImportResponse as DatabaseImportResponse
diff --git a/src/cloudflare/types/d1/d1.py b/src/cloudflare/types/d1/d1.py
index 8db6a1dcb3f..41fe1cb45a3 100644
--- a/src/cloudflare/types/d1/d1.py
+++ b/src/cloudflare/types/d1/d1.py
@@ -1,23 +1,44 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
 
 from ..._models import BaseModel
 
-__all__ = ["D1"]
+__all__ = ["D1", "ReadReplication"]
+
+
+class ReadReplication(BaseModel):
+    """Configuration for D1 read replication."""
+
+    mode: Literal["auto", "disabled"]
+    """The read replication mode for the database.
+
+    Use 'auto' to create replicas and allow D1 automatically place them around the
+    world, or 'disabled' to not use any database replicas (it can take a few hours
+    for all replicas to be deleted).
+    """
 
 
 class D1(BaseModel):
-    created_at: Optional[str] = None
+    """The details of the D1 database."""
+
+    created_at: Optional[datetime] = None
     """Specifies the timestamp the resource was created as an ISO8601 string."""
 
     file_size: Optional[float] = None
     """The D1 database's size, in bytes."""
 
     name: Optional[str] = None
+    """D1 database name."""
 
     num_tables: Optional[float] = None
 
+    read_replication: Optional[ReadReplication] = None
+    """Configuration for D1 read replication."""
+
     uuid: Optional[str] = None
+    """D1 database identifier (UUID)."""
 
     version: Optional[str] = None
diff --git a/src/cloudflare/types/d1/database/__init__.py b/src/cloudflare/types/d1/database/__init__.py
new file mode 100644
index 00000000000..d01a1918c7c
--- /dev/null
+++ b/src/cloudflare/types/d1/database/__init__.py
@@ -0,0 +1,8 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .time_travel_restore_params import TimeTravelRestoreParams as TimeTravelRestoreParams
+from .time_travel_restore_response import TimeTravelRestoreResponse as TimeTravelRestoreResponse
+from .time_travel_get_bookmark_params import TimeTravelGetBookmarkParams as TimeTravelGetBookmarkParams
+from .time_travel_get_bookmark_response import TimeTravelGetBookmarkResponse as TimeTravelGetBookmarkResponse
diff --git a/src/cloudflare/types/d1/database/time_travel_get_bookmark_params.py b/src/cloudflare/types/d1/database/time_travel_get_bookmark_params.py
new file mode 100644
index 00000000000..690290b6676
--- /dev/null
+++ b/src/cloudflare/types/d1/database/time_travel_get_bookmark_params.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Required, Annotated, TypedDict
+
+from ...._utils import PropertyInfo
+
+__all__ = ["TimeTravelGetBookmarkParams"]
+
+
+class TimeTravelGetBookmarkParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    timestamp: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """An optional ISO 8601 timestamp.
+
+    If provided, returns the nearest available bookmark at or before this timestamp.
+    If omitted, returns the current bookmark.
+    """
diff --git a/src/cloudflare/types/d1/database/time_travel_get_bookmark_response.py b/src/cloudflare/types/d1/database/time_travel_get_bookmark_response.py
new file mode 100644
index 00000000000..48ce81fdb73
--- /dev/null
+++ b/src/cloudflare/types/d1/database/time_travel_get_bookmark_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ...._models import BaseModel
+
+__all__ = ["TimeTravelGetBookmarkResponse"]
+
+
+class TimeTravelGetBookmarkResponse(BaseModel):
+    bookmark: Optional[str] = None
+    """
+    A bookmark representing a specific state of the database at a specific point in
+    time.
+    """
diff --git a/src/cloudflare/types/d1/database/time_travel_restore_params.py b/src/cloudflare/types/d1/database/time_travel_restore_params.py
new file mode 100644
index 00000000000..ef86ba6d9ac
--- /dev/null
+++ b/src/cloudflare/types/d1/database/time_travel_restore_params.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Required, Annotated, TypedDict
+
+from ...._utils import PropertyInfo
+
+__all__ = ["TimeTravelRestoreParams"]
+
+
+class TimeTravelRestoreParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    bookmark: str
+    """A bookmark to restore the database to. Required if `timestamp` is not provided."""
+
+    timestamp: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """An ISO 8601 timestamp to restore the database to.
+
+    Required if `bookmark` is not provided.
+    """
diff --git a/src/cloudflare/types/d1/database/time_travel_restore_response.py b/src/cloudflare/types/d1/database/time_travel_restore_response.py
new file mode 100644
index 00000000000..671d5922a67
--- /dev/null
+++ b/src/cloudflare/types/d1/database/time_travel_restore_response.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ...._models import BaseModel
+
+__all__ = ["TimeTravelRestoreResponse"]
+
+
+class TimeTravelRestoreResponse(BaseModel):
+    """Response from a time travel restore operation."""
+
+    bookmark: Optional[str] = None
+    """
+    The new bookmark representing the state of the database after the restore
+    operation.
+    """
+
+    message: Optional[str] = None
+    """A message describing the result of the restore operation."""
+
+    previous_bookmark: Optional[str] = None
+    """The bookmark representing the state of the database before the restore
+    operation.
+
+    Can be used to undo the restore if needed.
+    """
diff --git a/src/cloudflare/types/d1/database_create_params.py b/src/cloudflare/types/d1/database_create_params.py
index 3db8ef15021..54fc7485a7f 100644
--- a/src/cloudflare/types/d1/database_create_params.py
+++ b/src/cloudflare/types/d1/database_create_params.py
@@ -12,6 +12,13 @@ class DatabaseCreateParams(TypedDict, total=False):
     """Account identifier tag."""
 
     name: Required[str]
+    """D1 database name."""
+
+    jurisdiction: Literal["eu", "fedramp"]
+    """Specify the location to restrict the D1 database to run and store data.
+
+    If this option is present, the location hint is ignored.
+    """
 
     primary_location_hint: Literal["wnam", "enam", "weur", "eeur", "apac", "oc"]
     """Specify the region to create the D1 primary, if available.
diff --git a/src/cloudflare/types/d1/database_create_response.py b/src/cloudflare/types/d1/database_create_response.py
deleted file mode 100644
index 5f5715433e1..00000000000
--- a/src/cloudflare/types/d1/database_create_response.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ..._models import BaseModel
-
-__all__ = ["DatabaseCreateResponse"]
-
-
-class DatabaseCreateResponse(BaseModel):
-    created_at: Optional[str] = None
-    """Specifies the timestamp the resource was created as an ISO8601 string."""
-
-    name: Optional[str] = None
-
-    uuid: Optional[str] = None
-
-    version: Optional[str] = None
diff --git a/src/cloudflare/types/d1/database_delete_response.py b/src/cloudflare/types/d1/database_delete_response.py
deleted file mode 100644
index 53e10cdd237..00000000000
--- a/src/cloudflare/types/d1/database_delete_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["DatabaseDeleteResponse"]
-
-DatabaseDeleteResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/d1/database_edit_params.py b/src/cloudflare/types/d1/database_edit_params.py
new file mode 100644
index 00000000000..4dfec27b80e
--- /dev/null
+++ b/src/cloudflare/types/d1/database_edit_params.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["DatabaseEditParams", "ReadReplication"]
+
+
+class DatabaseEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    read_replication: ReadReplication
+    """Configuration for D1 read replication."""
+
+
+class ReadReplication(TypedDict, total=False):
+    """Configuration for D1 read replication."""
+
+    mode: Required[Literal["auto", "disabled"]]
+    """The read replication mode for the database.
+
+    Use 'auto' to create replicas and allow D1 automatically place them around the
+    world, or 'disabled' to not use any database replicas (it can take a few hours
+    for all replicas to be deleted).
+    """
diff --git a/src/cloudflare/types/d1/database_export_params.py b/src/cloudflare/types/d1/database_export_params.py
new file mode 100644
index 00000000000..cfe21f17154
--- /dev/null
+++ b/src/cloudflare/types/d1/database_export_params.py
@@ -0,0 +1,40 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["DatabaseExportParams", "DumpOptions"]
+
+
+class DatabaseExportParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    output_format: Required[Literal["polling"]]
+    """Specifies that you will poll this endpoint until the export completes"""
+
+    current_bookmark: str
+    """
+    To poll an in-progress export, provide the current bookmark (returned by your
+    first polling response)
+    """
+
+    dump_options: DumpOptions
+
+
+class DumpOptions(TypedDict, total=False):
+    no_data: bool
+    """Export only the table definitions, not their contents"""
+
+    no_schema: bool
+    """Export only each table's contents, not its definition"""
+
+    tables: SequenceNotStr[str]
+    """Filter the export to just one or more tables.
+
+    Passing an empty array is the same as not passing anything and means: export all
+    tables.
+    """
diff --git a/src/cloudflare/types/d1/database_export_response.py b/src/cloudflare/types/d1/database_export_response.py
new file mode 100644
index 00000000000..9ded12b8a5c
--- /dev/null
+++ b/src/cloudflare/types/d1/database_export_response.py
@@ -0,0 +1,41 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["DatabaseExportResponse", "Result"]
+
+
+class Result(BaseModel):
+    """Only present when status = 'complete'"""
+
+    filename: Optional[str] = None
+    """The generated SQL filename."""
+
+    signed_url: Optional[str] = None
+    """The URL to download the exported SQL. Available for one hour."""
+
+
+class DatabaseExportResponse(BaseModel):
+    at_bookmark: Optional[str] = None
+    """The current time-travel bookmark for your D1, used to poll for updates.
+
+    Will not change for the duration of the export task.
+    """
+
+    error: Optional[str] = None
+    """Only present when status = 'error'. Contains the error message."""
+
+    messages: Optional[List[str]] = None
+    """Logs since the last time you polled"""
+
+    result: Optional[Result] = None
+    """Only present when status = 'complete'"""
+
+    status: Optional[Literal["complete", "error"]] = None
+
+    success: Optional[bool] = None
+
+    type: Optional[Literal["export"]] = None
diff --git a/src/cloudflare/types/d1/database_import_params.py b/src/cloudflare/types/d1/database_import_params.py
new file mode 100644
index 00000000000..63afb92175e
--- /dev/null
+++ b/src/cloudflare/types/d1/database_import_params.py
@@ -0,0 +1,54 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+__all__ = ["DatabaseImportParams", "Init", "Ingest", "Poll"]
+
+
+class Init(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    action: Required[Literal["init"]]
+    """Indicates you have a new SQL file to upload."""
+
+    etag: Required[str]
+    """Required when action is 'init' or 'ingest'.
+
+    An md5 hash of the file you're uploading. Used to check if it already exists,
+    and validate its contents before ingesting.
+    """
+
+
+class Ingest(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    action: Required[Literal["ingest"]]
+    """Indicates you've finished uploading to tell the D1 to start consuming it"""
+
+    etag: Required[str]
+    """An md5 hash of the file you're uploading.
+
+    Used to check if it already exists, and validate its contents before ingesting.
+    """
+
+    filename: Required[str]
+    """The filename you have successfully uploaded."""
+
+
+class Poll(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    action: Required[Literal["poll"]]
+    """Indicates you've finished uploading to tell the D1 to start consuming it"""
+
+    current_bookmark: Required[str]
+    """This identifies the currently-running import, checking its status."""
+
+
+DatabaseImportParams: TypeAlias = Union[Init, Ingest, Poll]
diff --git a/src/cloudflare/types/d1/database_import_response.py b/src/cloudflare/types/d1/database_import_response.py
new file mode 100644
index 00000000000..a01524c17de
--- /dev/null
+++ b/src/cloudflare/types/d1/database_import_response.py
@@ -0,0 +1,119 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["DatabaseImportResponse", "Result", "ResultMeta", "ResultMetaTimings"]
+
+
+class ResultMetaTimings(BaseModel):
+    """Various durations for the query."""
+
+    sql_duration_ms: Optional[float] = None
+    """The duration of the SQL query execution inside the database.
+
+    Does not include any network communication.
+    """
+
+
+class ResultMeta(BaseModel):
+    changed_db: Optional[bool] = None
+    """Denotes if the database has been altered in some way, like deleting rows."""
+
+    changes: Optional[float] = None
+    """
+    Rough indication of how many rows were modified by the query, as provided by
+    SQLite's `sqlite3_total_changes()`.
+    """
+
+    duration: Optional[float] = None
+    """The duration of the SQL query execution inside the database.
+
+    Does not include any network communication.
+    """
+
+    last_row_id: Optional[float] = None
+    """
+    The row ID of the last inserted row in a table with an `INTEGER PRIMARY KEY` as
+    provided by SQLite. Tables created with `WITHOUT ROWID` do not populate this.
+    """
+
+    rows_read: Optional[float] = None
+    """
+    Number of rows read during the SQL query execution, including indices (not all
+    rows are necessarily returned).
+    """
+
+    rows_written: Optional[float] = None
+    """Number of rows written during the SQL query execution, including indices."""
+
+    served_by_colo: Optional[str] = None
+    """The three letters airport code of the colo that handled the query."""
+
+    served_by_primary: Optional[bool] = None
+    """Denotes if the query has been handled by the database primary instance."""
+
+    served_by_region: Optional[Literal["WNAM", "ENAM", "WEUR", "EEUR", "APAC", "OC"]] = None
+    """Region location hint of the database instance that handled the query."""
+
+    size_after: Optional[float] = None
+    """Size of the database after the query committed, in bytes."""
+
+    timings: Optional[ResultMetaTimings] = None
+    """Various durations for the query."""
+
+
+class Result(BaseModel):
+    """Only present when status = 'complete'"""
+
+    final_bookmark: Optional[str] = None
+    """
+    The time-travel bookmark if you need restore your D1 to directly after the
+    import succeeded.
+    """
+
+    meta: Optional[ResultMeta] = None
+
+    num_queries: Optional[float] = None
+    """The total number of queries that were executed during the import."""
+
+
+class DatabaseImportResponse(BaseModel):
+    at_bookmark: Optional[str] = None
+    """The current time-travel bookmark for your D1, used to poll for updates.
+
+    Will not change for the duration of the import. Only returned if an import
+    process is currently running or recently finished.
+    """
+
+    error: Optional[str] = None
+    """Only present when status = 'error'.
+
+    Contains the error message that prevented the import from succeeding.
+    """
+
+    filename: Optional[str] = None
+    """Derived from the database ID and etag, to use in avoiding repeated uploads.
+
+    Only returned when for the 'init' action.
+    """
+
+    messages: Optional[List[str]] = None
+    """Logs since the last time you polled"""
+
+    result: Optional[Result] = None
+    """Only present when status = 'complete'"""
+
+    status: Optional[Literal["complete", "error"]] = None
+
+    success: Optional[bool] = None
+
+    type: Optional[Literal["import"]] = None
+
+    upload_url: Optional[str] = None
+    """The R2 presigned URL to use for uploading.
+
+    Only returned when for the 'init' action.
+    """
diff --git a/src/cloudflare/types/d1/database_list_response.py b/src/cloudflare/types/d1/database_list_response.py
index 5ecb1b94674..bdcb159357d 100644
--- a/src/cloudflare/types/d1/database_list_response.py
+++ b/src/cloudflare/types/d1/database_list_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from datetime import datetime
 
 from ..._models import BaseModel
 
@@ -8,11 +9,13 @@
 
 
 class DatabaseListResponse(BaseModel):
-    created_at: Optional[str] = None
+    created_at: Optional[datetime] = None
     """Specifies the timestamp the resource was created as an ISO8601 string."""
 
     name: Optional[str] = None
+    """D1 database name."""
 
     uuid: Optional[str] = None
+    """D1 database identifier (UUID)."""
 
     version: Optional[str] = None
diff --git a/src/cloudflare/types/d1/database_query_params.py b/src/cloudflare/types/d1/database_query_params.py
index f7c06437625..afd658c44b2 100644
--- a/src/cloudflare/types/d1/database_query_params.py
+++ b/src/cloudflare/types/d1/database_query_params.py
@@ -2,16 +2,38 @@
 
 from __future__ import annotations
 
-from typing import List
-from typing_extensions import Required, TypedDict
+from typing import Union, Iterable
+from typing_extensions import Required, TypeAlias, TypedDict
 
-__all__ = ["DatabaseQueryParams"]
+from ..._types import SequenceNotStr
 
+__all__ = ["DatabaseQueryParams", "D1SingleQuery", "MultipleQueries", "MultipleQueriesBatch"]
 
-class DatabaseQueryParams(TypedDict, total=False):
+
+class D1SingleQuery(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    sql: Required[str]
+    """Your SQL query.
+
+    Supports multiple statements, joined by semicolons, which will be executed as a
+    batch.
+    """
+
+    params: SequenceNotStr[str]
+
+
+class MultipleQueries(TypedDict, total=False):
     account_id: Required[str]
     """Account identifier tag."""
 
+    batch: Required[Iterable[MultipleQueriesBatch]]
+
+
+class MultipleQueriesBatch(TypedDict, total=False):
+    """A single query with or without parameters"""
+
     sql: Required[str]
     """Your SQL query.
 
@@ -19,4 +41,7 @@ class DatabaseQueryParams(TypedDict, total=False):
     batch.
     """
 
-    params: List[str]
+    params: SequenceNotStr[str]
+
+
+DatabaseQueryParams: TypeAlias = Union[D1SingleQuery, MultipleQueries]
diff --git a/src/cloudflare/types/d1/database_query_response.py b/src/cloudflare/types/d1/database_query_response.py
deleted file mode 100644
index 4e2d7a949cd..00000000000
--- a/src/cloudflare/types/d1/database_query_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .query_result import QueryResult
-
-__all__ = ["DatabaseQueryResponse"]
-
-DatabaseQueryResponse = List[QueryResult]
diff --git a/src/cloudflare/types/d1/database_raw_params.py b/src/cloudflare/types/d1/database_raw_params.py
index 5a7fd0ae2e3..ee9268e9649 100644
--- a/src/cloudflare/types/d1/database_raw_params.py
+++ b/src/cloudflare/types/d1/database_raw_params.py
@@ -2,16 +2,38 @@
 
 from __future__ import annotations
 
-from typing import List
-from typing_extensions import Required, TypedDict
+from typing import Union, Iterable
+from typing_extensions import Required, TypeAlias, TypedDict
 
-__all__ = ["DatabaseRawParams"]
+from ..._types import SequenceNotStr
 
+__all__ = ["DatabaseRawParams", "D1SingleQuery", "MultipleQueries", "MultipleQueriesBatch"]
 
-class DatabaseRawParams(TypedDict, total=False):
+
+class D1SingleQuery(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    sql: Required[str]
+    """Your SQL query.
+
+    Supports multiple statements, joined by semicolons, which will be executed as a
+    batch.
+    """
+
+    params: SequenceNotStr[str]
+
+
+class MultipleQueries(TypedDict, total=False):
     account_id: Required[str]
     """Account identifier tag."""
 
+    batch: Required[Iterable[MultipleQueriesBatch]]
+
+
+class MultipleQueriesBatch(TypedDict, total=False):
+    """A single query with or without parameters"""
+
     sql: Required[str]
     """Your SQL query.
 
@@ -19,4 +41,7 @@ class DatabaseRawParams(TypedDict, total=False):
     batch.
     """
 
-    params: List[str]
+    params: SequenceNotStr[str]
+
+
+DatabaseRawParams: TypeAlias = Union[D1SingleQuery, MultipleQueries]
diff --git a/src/cloudflare/types/d1/database_raw_response.py b/src/cloudflare/types/d1/database_raw_response.py
index f59973dba74..4c824df4063 100644
--- a/src/cloudflare/types/d1/database_raw_response.py
+++ b/src/cloudflare/types/d1/database_raw_response.py
@@ -1,45 +1,79 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Union, Optional
+from typing_extensions import Literal
 
 from ..._models import BaseModel
 
-__all__ = [
-    "DatabaseRawResponse",
-    "DatabaseRawResponseItem",
-    "DatabaseRawResponseItemMeta",
-    "DatabaseRawResponseItemResults",
-]
+__all__ = ["DatabaseRawResponse", "Meta", "MetaTimings", "Results"]
 
 
-class DatabaseRawResponseItemMeta(BaseModel):
+class MetaTimings(BaseModel):
+    """Various durations for the query."""
+
+    sql_duration_ms: Optional[float] = None
+    """The duration of the SQL query execution inside the database.
+
+    Does not include any network communication.
+    """
+
+
+class Meta(BaseModel):
     changed_db: Optional[bool] = None
+    """Denotes if the database has been altered in some way, like deleting rows."""
 
     changes: Optional[float] = None
+    """
+    Rough indication of how many rows were modified by the query, as provided by
+    SQLite's `sqlite3_total_changes()`.
+    """
 
     duration: Optional[float] = None
+    """The duration of the SQL query execution inside the database.
+
+    Does not include any network communication.
+    """
 
     last_row_id: Optional[float] = None
+    """
+    The row ID of the last inserted row in a table with an `INTEGER PRIMARY KEY` as
+    provided by SQLite. Tables created with `WITHOUT ROWID` do not populate this.
+    """
 
     rows_read: Optional[float] = None
+    """
+    Number of rows read during the SQL query execution, including indices (not all
+    rows are necessarily returned).
+    """
 
     rows_written: Optional[float] = None
+    """Number of rows written during the SQL query execution, including indices."""
+
+    served_by_colo: Optional[str] = None
+    """The three letters airport code of the colo that handled the query."""
+
+    served_by_primary: Optional[bool] = None
+    """Denotes if the query has been handled by the database primary instance."""
+
+    served_by_region: Optional[Literal["WNAM", "ENAM", "WEUR", "EEUR", "APAC", "OC"]] = None
+    """Region location hint of the database instance that handled the query."""
 
     size_after: Optional[float] = None
+    """Size of the database after the query committed, in bytes."""
+
+    timings: Optional[MetaTimings] = None
+    """Various durations for the query."""
 
 
-class DatabaseRawResponseItemResults(BaseModel):
+class Results(BaseModel):
     columns: Optional[List[str]] = None
 
     rows: Optional[List[List[Union[float, str, object]]]] = None
 
 
-class DatabaseRawResponseItem(BaseModel):
-    meta: Optional[DatabaseRawResponseItemMeta] = None
+class DatabaseRawResponse(BaseModel):
+    meta: Optional[Meta] = None
 
-    results: Optional[DatabaseRawResponseItemResults] = None
+    results: Optional[Results] = None
 
     success: Optional[bool] = None
-
-
-DatabaseRawResponse = List[DatabaseRawResponseItem]
diff --git a/src/cloudflare/types/d1/database_update_params.py b/src/cloudflare/types/d1/database_update_params.py
new file mode 100644
index 00000000000..24355c484a5
--- /dev/null
+++ b/src/cloudflare/types/d1/database_update_params.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["DatabaseUpdateParams", "ReadReplication"]
+
+
+class DatabaseUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    read_replication: Required[ReadReplication]
+    """Configuration for D1 read replication."""
+
+
+class ReadReplication(TypedDict, total=False):
+    """Configuration for D1 read replication."""
+
+    mode: Required[Literal["auto", "disabled"]]
+    """The read replication mode for the database.
+
+    Use 'auto' to create replicas and allow D1 automatically place them around the
+    world, or 'disabled' to not use any database replicas (it can take a few hours
+    for all replicas to be deleted).
+    """
diff --git a/src/cloudflare/types/d1/query_result.py b/src/cloudflare/types/d1/query_result.py
index 7b6447cd084..1587d0f6e45 100644
--- a/src/cloudflare/types/d1/query_result.py
+++ b/src/cloudflare/types/d1/query_result.py
@@ -1,26 +1,68 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
+from typing_extensions import Literal
 
 from ..._models import BaseModel
 
-__all__ = ["QueryResult", "Meta"]
+__all__ = ["QueryResult", "Meta", "MetaTimings"]
+
+
+class MetaTimings(BaseModel):
+    """Various durations for the query."""
+
+    sql_duration_ms: Optional[float] = None
+    """The duration of the SQL query execution inside the database.
+
+    Does not include any network communication.
+    """
 
 
 class Meta(BaseModel):
     changed_db: Optional[bool] = None
+    """Denotes if the database has been altered in some way, like deleting rows."""
 
     changes: Optional[float] = None
+    """
+    Rough indication of how many rows were modified by the query, as provided by
+    SQLite's `sqlite3_total_changes()`.
+    """
 
     duration: Optional[float] = None
+    """The duration of the SQL query execution inside the database.
+
+    Does not include any network communication.
+    """
 
     last_row_id: Optional[float] = None
+    """
+    The row ID of the last inserted row in a table with an `INTEGER PRIMARY KEY` as
+    provided by SQLite. Tables created with `WITHOUT ROWID` do not populate this.
+    """
 
     rows_read: Optional[float] = None
+    """
+    Number of rows read during the SQL query execution, including indices (not all
+    rows are necessarily returned).
+    """
 
     rows_written: Optional[float] = None
+    """Number of rows written during the SQL query execution, including indices."""
+
+    served_by_colo: Optional[str] = None
+    """The three letters airport code of the colo that handled the query."""
+
+    served_by_primary: Optional[bool] = None
+    """Denotes if the query has been handled by the database primary instance."""
+
+    served_by_region: Optional[Literal["WNAM", "ENAM", "WEUR", "EEUR", "APAC", "OC"]] = None
+    """Region location hint of the database instance that handled the query."""
 
     size_after: Optional[float] = None
+    """Size of the database after the query committed, in bytes."""
+
+    timings: Optional[MetaTimings] = None
+    """Various durations for the query."""
 
 
 class QueryResult(BaseModel):
diff --git a/src/cloudflare/types/diagnostics/__init__.py b/src/cloudflare/types/diagnostics/__init__.py
index 94d7a66c1ee..34ee1d787f3 100644
--- a/src/cloudflare/types/diagnostics/__init__.py
+++ b/src/cloudflare/types/diagnostics/__init__.py
@@ -4,4 +4,10 @@
 
 from .traceroute import Traceroute as Traceroute
 from .traceroute_create_params import TracerouteCreateParams as TracerouteCreateParams
-from .traceroute_create_response import TracerouteCreateResponse as TracerouteCreateResponse
+from .endpoint_healthcheck_get_response import EndpointHealthcheckGetResponse as EndpointHealthcheckGetResponse
+from .endpoint_healthcheck_create_params import EndpointHealthcheckCreateParams as EndpointHealthcheckCreateParams
+from .endpoint_healthcheck_list_response import EndpointHealthcheckListResponse as EndpointHealthcheckListResponse
+from .endpoint_healthcheck_update_params import EndpointHealthcheckUpdateParams as EndpointHealthcheckUpdateParams
+from .endpoint_healthcheck_create_response import EndpointHealthcheckCreateResponse as EndpointHealthcheckCreateResponse
+from .endpoint_healthcheck_delete_response import EndpointHealthcheckDeleteResponse as EndpointHealthcheckDeleteResponse
+from .endpoint_healthcheck_update_response import EndpointHealthcheckUpdateResponse as EndpointHealthcheckUpdateResponse
diff --git a/src/cloudflare/types/diagnostics/endpoint_healthcheck_create_params.py b/src/cloudflare/types/diagnostics/endpoint_healthcheck_create_params.py
new file mode 100644
index 00000000000..f47f969bac2
--- /dev/null
+++ b/src/cloudflare/types/diagnostics/endpoint_healthcheck_create_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["EndpointHealthcheckCreateParams"]
+
+
+class EndpointHealthcheckCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier"""
+
+    check_type: Required[Literal["icmp"]]
+    """type of check to perform"""
+
+    endpoint: Required[str]
+    """the IP address of the host to perform checks against"""
+
+    name: str
+    """Optional name associated with this check"""
diff --git a/src/cloudflare/types/diagnostics/endpoint_healthcheck_create_response.py b/src/cloudflare/types/diagnostics/endpoint_healthcheck_create_response.py
new file mode 100644
index 00000000000..9d27507c25c
--- /dev/null
+++ b/src/cloudflare/types/diagnostics/endpoint_healthcheck_create_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["EndpointHealthcheckCreateResponse"]
+
+
+class EndpointHealthcheckCreateResponse(BaseModel):
+    check_type: Literal["icmp"]
+    """type of check to perform"""
+
+    endpoint: str
+    """the IP address of the host to perform checks against"""
+
+    id: Optional[str] = None
+    """UUID."""
+
+    name: Optional[str] = None
+    """Optional name associated with this check"""
diff --git a/src/cloudflare/types/diagnostics/endpoint_healthcheck_delete_response.py b/src/cloudflare/types/diagnostics/endpoint_healthcheck_delete_response.py
new file mode 100644
index 00000000000..bd763657c92
--- /dev/null
+++ b/src/cloudflare/types/diagnostics/endpoint_healthcheck_delete_response.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["EndpointHealthcheckDeleteResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class EndpointHealthcheckDeleteResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/diagnostics/endpoint_healthcheck_get_response.py b/src/cloudflare/types/diagnostics/endpoint_healthcheck_get_response.py
new file mode 100644
index 00000000000..0106c8489c5
--- /dev/null
+++ b/src/cloudflare/types/diagnostics/endpoint_healthcheck_get_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["EndpointHealthcheckGetResponse"]
+
+
+class EndpointHealthcheckGetResponse(BaseModel):
+    check_type: Literal["icmp"]
+    """type of check to perform"""
+
+    endpoint: str
+    """the IP address of the host to perform checks against"""
+
+    id: Optional[str] = None
+    """UUID."""
+
+    name: Optional[str] = None
+    """Optional name associated with this check"""
diff --git a/src/cloudflare/types/diagnostics/endpoint_healthcheck_list_response.py b/src/cloudflare/types/diagnostics/endpoint_healthcheck_list_response.py
new file mode 100644
index 00000000000..0d6b2811c24
--- /dev/null
+++ b/src/cloudflare/types/diagnostics/endpoint_healthcheck_list_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["EndpointHealthcheckListResponse"]
+
+
+class EndpointHealthcheckListResponse(BaseModel):
+    check_type: Literal["icmp"]
+    """type of check to perform"""
+
+    endpoint: str
+    """the IP address of the host to perform checks against"""
+
+    id: Optional[str] = None
+    """UUID."""
+
+    name: Optional[str] = None
+    """Optional name associated with this check"""
diff --git a/src/cloudflare/types/diagnostics/endpoint_healthcheck_update_params.py b/src/cloudflare/types/diagnostics/endpoint_healthcheck_update_params.py
new file mode 100644
index 00000000000..85e0b0b7077
--- /dev/null
+++ b/src/cloudflare/types/diagnostics/endpoint_healthcheck_update_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["EndpointHealthcheckUpdateParams"]
+
+
+class EndpointHealthcheckUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier"""
+
+    check_type: Required[Literal["icmp"]]
+    """type of check to perform"""
+
+    endpoint: Required[str]
+    """the IP address of the host to perform checks against"""
+
+    name: str
+    """Optional name associated with this check"""
diff --git a/src/cloudflare/types/diagnostics/endpoint_healthcheck_update_response.py b/src/cloudflare/types/diagnostics/endpoint_healthcheck_update_response.py
new file mode 100644
index 00000000000..57a1b932e20
--- /dev/null
+++ b/src/cloudflare/types/diagnostics/endpoint_healthcheck_update_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["EndpointHealthcheckUpdateResponse"]
+
+
+class EndpointHealthcheckUpdateResponse(BaseModel):
+    check_type: Literal["icmp"]
+    """type of check to perform"""
+
+    endpoint: str
+    """the IP address of the host to perform checks against"""
+
+    id: Optional[str] = None
+    """UUID."""
+
+    name: Optional[str] = None
+    """Optional name associated with this check"""
diff --git a/src/cloudflare/types/diagnostics/traceroute_create_params.py b/src/cloudflare/types/diagnostics/traceroute_create_params.py
index 4604e3c4f5e..8e7419b2acc 100644
--- a/src/cloudflare/types/diagnostics/traceroute_create_params.py
+++ b/src/cloudflare/types/diagnostics/traceroute_create_params.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Literal, Required, TypedDict
 
+from ..._types import SequenceNotStr
+
 __all__ = ["TracerouteCreateParams", "Options"]
 
 
@@ -12,9 +13,9 @@ class TracerouteCreateParams(TypedDict, total=False):
     account_id: Required[str]
     """Identifier"""
 
-    targets: Required[List[str]]
+    targets: Required[SequenceNotStr[str]]
 
-    colos: List[str]
+    colos: SequenceNotStr[str]
     """If no source colo names specified, all colos will be used.
 
     China colos are unavailable for traceroutes.
diff --git a/src/cloudflare/types/diagnostics/traceroute_create_response.py b/src/cloudflare/types/diagnostics/traceroute_create_response.py
deleted file mode 100644
index 388d43add11..00000000000
--- a/src/cloudflare/types/diagnostics/traceroute_create_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .traceroute import Traceroute
-
-__all__ = ["TracerouteCreateResponse"]
-
-TracerouteCreateResponse = List[Traceroute]
diff --git a/src/cloudflare/types/dns/__init__.py b/src/cloudflare/types/dns/__init__.py
index 3b3aa6dfb0b..039d76e2f31 100644
--- a/src/cloudflare/types/dns/__init__.py
+++ b/src/cloudflare/types/dns/__init__.py
@@ -3,58 +3,66 @@
 from __future__ import annotations
 
 from .ttl import TTL as TTL
-from .record import Record as Record
+from .dnssec import DNSSEC as DNSSEC
 from .a_record import ARecord as ARecord
-from .firewall import Firewall as Firewall
 from .ds_record import DSRecord as DSRecord
 from .mx_record import MXRecord as MXRecord
 from .ns_record import NSRecord as NSRecord
 from .ttl_param import TTLParam as TTLParam
 from .caa_record import CAARecord as CAARecord
 from .loc_record import LOCRecord as LOCRecord
-from .nameserver import Nameserver as Nameserver
 from .ptr_record import PTRRecord as PTRRecord
 from .srv_record import SRVRecord as SRVRecord
 from .txt_record import TXTRecord as TXTRecord
 from .uri_record import URIRecord as URIRecord
 from .aaaa_record import AAAARecord as AAAARecord
 from .cert_record import CERTRecord as CERTRecord
-from .dns_setting import DNSSetting as DNSSetting
 from .record_tags import RecordTags as RecordTags
 from .svcb_record import SVCBRecord as SVCBRecord
 from .tlsa_record import TLSARecord as TLSARecord
 from .cname_record import CNAMERecord as CNAMERecord
-from .firewall_ips import FirewallIPs as FirewallIPs
 from .https_record import HTTPSRecord as HTTPSRecord
 from .naptr_record import NAPTRRecord as NAPTRRecord
 from .sshfp_record import SSHFPRecord as SSHFPRecord
-from .upstream_ips import UpstreamIPs as UpstreamIPs
 from .dnskey_record import DNSKEYRecord as DNSKEYRecord
 from .smimea_record import SMIMEARecord as SMIMEARecord
-from .record_metadata import RecordMetadata as RecordMetadata
-from .nameserver_param import NameserverParam as NameserverParam
-from .attack_mitigation import AttackMitigation as AttackMitigation
-from .dns_setting_param import DNSSettingParam as DNSSettingParam
-from .firewall_ips_param import FirewallIPsParam as FirewallIPsParam
+from .a_record_param import ARecordParam as ARecordParam
+from .batch_put_param import BatchPutParam as BatchPutParam
+from .ds_record_param import DSRecordParam as DSRecordParam
+from .mx_record_param import MXRecordParam as MXRecordParam
+from .ns_record_param import NSRecordParam as NSRecordParam
+from .record_response import RecordResponse as RecordResponse
+from .caa_record_param import CAARecordParam as CAARecordParam
+from .loc_record_param import LOCRecordParam as LOCRecordParam
+from .ptr_record_param import PTRRecordParam as PTRRecordParam
+from .srv_record_param import SRVRecordParam as SRVRecordParam
+from .txt_record_param import TXTRecordParam as TXTRecordParam
+from .uri_record_param import URIRecordParam as URIRecordParam
+from .aaaa_record_param import AAAARecordParam as AAAARecordParam
+from .batch_patch_param import BatchPatchParam as BatchPatchParam
+from .cert_record_param import CERTRecordParam as CERTRecordParam
+from .svcb_record_param import SVCBRecordParam as SVCBRecordParam
+from .tlsa_record_param import TLSARecordParam as TLSARecordParam
+from .cname_record_param import CNAMERecordParam as CNAMERecordParam
+from .dnssec_edit_params import DNSSECEditParams as DNSSECEditParams
+from .https_record_param import HTTPSRecordParam as HTTPSRecordParam
+from .naptr_record_param import NAPTRRecordParam as NAPTRRecordParam
 from .record_edit_params import RecordEditParams as RecordEditParams
 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 .setting_edit_params import SettingEditParams as SettingEditParams
-from .firewall_edit_params import FirewallEditParams as FirewallEditParams
-from .firewall_list_params import FirewallListParams as FirewallListParams
+from .sshfp_record_param import SSHFPRecordParam as SSHFPRecordParam
+from .dnskey_record_param import DNSKEYRecordParam as DNSKEYRecordParam
+from .record_batch_params import RecordBatchParams as RecordBatchParams
+from .smimea_record_param import SMIMEARecordParam as SMIMEARecordParam
 from .record_create_params import RecordCreateParams as RecordCreateParams
 from .record_import_params import RecordImportParams as RecordImportParams
 from .record_scan_response import RecordScanResponse as RecordScanResponse
 from .record_update_params import RecordUpdateParams as RecordUpdateParams
-from .setting_get_response import SettingGetResponse as SettingGetResponse
-from .record_process_timing import RecordProcessTiming as RecordProcessTiming
-from .setting_edit_response import SettingEditResponse as SettingEditResponse
-from .firewall_create_params import FirewallCreateParams as FirewallCreateParams
+from .record_batch_response import RecordBatchResponse as RecordBatchResponse
+from .dnssec_delete_response import DNSSECDeleteResponse as DNSSECDeleteResponse
 from .record_delete_response import RecordDeleteResponse as RecordDeleteResponse
 from .record_export_response import RecordExportResponse as RecordExportResponse
 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
+from .record_scan_review_params import RecordScanReviewParams as RecordScanReviewParams
+from .record_scan_review_response import RecordScanReviewResponse as RecordScanReviewResponse
+from .record_scan_trigger_response import RecordScanTriggerResponse as RecordScanTriggerResponse
diff --git a/src/cloudflare/types/dns/a_record.py b/src/cloudflare/types/dns/a_record.py
index 33011fe5efe..7ec1734945a 100644
--- a/src/cloudflare/types/dns/a_record.py
+++ b/src/cloudflare/types/dns/a_record.py
@@ -1,47 +1,57 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["ARecord"]
+__all__ = ["ARecord", "Settings"]
 
 
-class ARecord(BaseModel):
-    content: str
-    """A valid IPv4 address."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
+
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
 
+class ARecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Literal["A"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
-
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
-
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
-
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    content: Optional[str] = None
+    """A valid IPv4 address."""
 
     proxied: Optional[bool] = None
     """
@@ -49,12 +59,8 @@ class ARecord(BaseModel):
     Cloudflare.
     """
 
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
+
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/a_record_param.py b/src/cloudflare/types/dns/a_record_param.py
new file mode 100644
index 00000000000..cf551389ca4
--- /dev/null
+++ b/src/cloudflare/types/dns/a_record_param.py
@@ -0,0 +1,67 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["ARecordParam", "Settings"]
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class ARecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["A"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A valid IPv4 address."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/aaaa_record.py b/src/cloudflare/types/dns/aaaa_record.py
index a18b95d8b06..c937fcc850d 100644
--- a/src/cloudflare/types/dns/aaaa_record.py
+++ b/src/cloudflare/types/dns/aaaa_record.py
@@ -1,47 +1,57 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["AAAARecord"]
+__all__ = ["AAAARecord", "Settings"]
 
 
-class AAAARecord(BaseModel):
-    content: str
-    """A valid IPv6 address."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
+
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
 
+class AAAARecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Literal["AAAA"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
-
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
-
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
-
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    content: Optional[str] = None
+    """A valid IPv6 address."""
 
     proxied: Optional[bool] = None
     """
@@ -49,12 +59,8 @@ class AAAARecord(BaseModel):
     Cloudflare.
     """
 
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
+
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/aaaa_record_param.py b/src/cloudflare/types/dns/aaaa_record_param.py
new file mode 100644
index 00000000000..81b6c1f935f
--- /dev/null
+++ b/src/cloudflare/types/dns/aaaa_record_param.py
@@ -0,0 +1,67 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["AAAARecordParam", "Settings"]
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class AAAARecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["AAAA"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A valid IPv6 address."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/analytics/report_get_params.py b/src/cloudflare/types/dns/analytics/report_get_params.py
index 12caad200d7..aba9c385ba9 100644
--- a/src/cloudflare/types/dns/analytics/report_get_params.py
+++ b/src/cloudflare/types/dns/analytics/report_get_params.py
@@ -13,7 +13,7 @@
 
 class ReportGetParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     dimensions: str
     """A comma-separated list of dimensions to group results by."""
diff --git a/src/cloudflare/types/dns/analytics/reports/by_time.py b/src/cloudflare/types/dns/analytics/reports/by_time.py
index 54d6c796c02..79c413ebc37 100644
--- a/src/cloudflare/types/dns/analytics/reports/by_time.py
+++ b/src/cloudflare/types/dns/analytics/reports/by_time.py
@@ -1,13 +1,12 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from ....._models import BaseModel
-from ...dns_analytics_query import DNSAnalyticsQuery
-from ...dns_analytics_nominal_metric import DNSAnalyticsNominalMetric
 
-__all__ = ["ByTime", "Data"]
+__all__ = ["ByTime", "Data", "Query"]
 
 
 class Data(BaseModel):
@@ -17,13 +16,42 @@ class Data(BaseModel):
     corresponding to this row.
     """
 
-    metrics: List[DNSAnalyticsNominalMetric]
+    metrics: List[List[float]]
     """Array with one item per requested metric.
 
     Each item is an array of values, broken down by time interval.
     """
 
 
+class Query(BaseModel):
+    dimensions: List[str]
+    """Array of dimension names."""
+
+    limit: int
+    """Limit number of returned metrics."""
+
+    metrics: List[str]
+    """Array of metric names."""
+
+    since: datetime
+    """Start date and time of requesting data period in ISO 8601 format."""
+
+    time_delta: Literal["all", "auto", "year", "quarter", "month", "week", "day", "hour", "dekaminute", "minute"]
+    """Unit of time to group data by."""
+
+    until: datetime
+    """End date and time of requesting data period in ISO 8601 format."""
+
+    filters: Optional[str] = None
+    """Segmentation filter in 'attribute operator value' format."""
+
+    sort: Optional[List[str]] = None
+    """
+    Array of dimensions to sort by, where each dimension may be prefixed by -
+    (descending) or + (ascending).
+    """
+
+
 class ByTime(BaseModel):
     data: List[Data]
     """Array with one row per combination of dimension values."""
@@ -46,7 +74,7 @@ class ByTime(BaseModel):
     Currently always an empty object.
     """
 
-    query: DNSAnalyticsQuery
+    query: Query
 
     rows: float
     """Total number of rows in the result."""
diff --git a/src/cloudflare/types/dns/analytics/reports/bytime_get_params.py b/src/cloudflare/types/dns/analytics/reports/bytime_get_params.py
index ece9fe71b05..c4cd5738dea 100644
--- a/src/cloudflare/types/dns/analytics/reports/bytime_get_params.py
+++ b/src/cloudflare/types/dns/analytics/reports/bytime_get_params.py
@@ -4,17 +4,16 @@
 
 from typing import Union
 from datetime import datetime
-from typing_extensions import Required, Annotated, TypedDict
+from typing_extensions import Literal, Required, Annotated, TypedDict
 
 from ....._utils import PropertyInfo
-from ...firewall.delta import Delta
 
 __all__ = ["BytimeGetParams"]
 
 
 class BytimeGetParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     dimensions: str
     """A comma-separated list of dimensions to group results by."""
@@ -37,7 +36,7 @@ class BytimeGetParams(TypedDict, total=False):
     prefixed by - (descending) or + (ascending).
     """
 
-    time_delta: Delta
+    time_delta: Literal["all", "auto", "year", "quarter", "month", "week", "day", "hour", "dekaminute", "minute"]
     """Unit of time to group data by."""
 
     until: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
diff --git a/src/cloudflare/types/dns/attack_mitigation.py b/src/cloudflare/types/dns/attack_mitigation.py
deleted file mode 100644
index cfbe6224fc6..00000000000
--- a/src/cloudflare/types/dns/attack_mitigation.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ..._models import BaseModel
-
-__all__ = ["AttackMitigation"]
-
-
-class AttackMitigation(BaseModel):
-    enabled: Optional[bool] = None
-    """
-    When enabled, random-prefix attacks are automatically mitigated and the upstream
-    DNS servers protected.
-    """
-
-    only_when_upstream_unhealthy: Optional[bool] = None
-    """Only mitigate attacks when upstream servers seem unhealthy."""
diff --git a/src/cloudflare/types/dns/attack_mitigation_param.py b/src/cloudflare/types/dns/attack_mitigation_param.py
deleted file mode 100644
index 66a854ef67e..00000000000
--- a/src/cloudflare/types/dns/attack_mitigation_param.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import TypedDict
-
-__all__ = ["AttackMitigationParam"]
-
-
-class AttackMitigationParam(TypedDict, total=False):
-    enabled: bool
-    """
-    When enabled, random-prefix attacks are automatically mitigated and the upstream
-    DNS servers protected.
-    """
-
-    only_when_upstream_unhealthy: bool
-    """Only mitigate attacks when upstream servers seem unhealthy."""
diff --git a/src/cloudflare/types/dns/batch_patch_param.py b/src/cloudflare/types/dns/batch_patch_param.py
new file mode 100644
index 00000000000..2a476de9d8a
--- /dev/null
+++ b/src/cloudflare/types/dns/batch_patch_param.py
@@ -0,0 +1,240 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+from .a_record_param import ARecordParam
+from .ds_record_param import DSRecordParam
+from .mx_record_param import MXRecordParam
+from .ns_record_param import NSRecordParam
+from .caa_record_param import CAARecordParam
+from .loc_record_param import LOCRecordParam
+from .ptr_record_param import PTRRecordParam
+from .srv_record_param import SRVRecordParam
+from .txt_record_param import TXTRecordParam
+from .uri_record_param import URIRecordParam
+from .aaaa_record_param import AAAARecordParam
+from .cert_record_param import CERTRecordParam
+from .svcb_record_param import SVCBRecordParam
+from .tlsa_record_param import TLSARecordParam
+from .cname_record_param import CNAMERecordParam
+from .https_record_param import HTTPSRecordParam
+from .naptr_record_param import NAPTRRecordParam
+from .sshfp_record_param import SSHFPRecordParam
+from .dnskey_record_param import DNSKEYRecordParam
+from .smimea_record_param import SMIMEARecordParam
+
+__all__ = [
+    "BatchPatchParam",
+    "ARecord",
+    "AAAARecord",
+    "CNAMERecord",
+    "MXRecord",
+    "NSRecord",
+    "OpenpgpkeyRecord",
+    "OpenpgpkeyRecordSettings",
+    "PTRRecord",
+    "TXTRecord",
+    "CAARecord",
+    "CERTRecord",
+    "DNSKEYRecord",
+    "DSRecord",
+    "HTTPSRecord",
+    "LOCRecord",
+    "NAPTRRecord",
+    "SMIMEARecord",
+    "SRVRecord",
+    "SSHFPRecord",
+    "SVCBRecord",
+    "TLSARecord",
+    "URIRecord",
+]
+
+
+class ARecord(ARecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class AAAARecord(AAAARecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class CNAMERecord(CNAMERecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class MXRecord(MXRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class NSRecord(NSRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class OpenpgpkeyRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class OpenpgpkeyRecord(TypedDict, total=False):
+    id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["OPENPGPKEY"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)"""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: OpenpgpkeyRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class PTRRecord(PTRRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class TXTRecord(TXTRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class CAARecord(CAARecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class CERTRecord(CERTRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class DNSKEYRecord(DNSKEYRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class DSRecord(DSRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class HTTPSRecord(HTTPSRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class LOCRecord(LOCRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class NAPTRRecord(NAPTRRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class SMIMEARecord(SMIMEARecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class SRVRecord(SRVRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class SSHFPRecord(SSHFPRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class SVCBRecord(SVCBRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class TLSARecord(TLSARecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class URIRecord(URIRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+BatchPatchParam: TypeAlias = Union[
+    ARecord,
+    AAAARecord,
+    CNAMERecord,
+    MXRecord,
+    NSRecord,
+    OpenpgpkeyRecord,
+    PTRRecord,
+    TXTRecord,
+    CAARecord,
+    CERTRecord,
+    DNSKEYRecord,
+    DSRecord,
+    HTTPSRecord,
+    LOCRecord,
+    NAPTRRecord,
+    SMIMEARecord,
+    SRVRecord,
+    SSHFPRecord,
+    SVCBRecord,
+    TLSARecord,
+    URIRecord,
+]
diff --git a/src/cloudflare/types/dns/batch_put_param.py b/src/cloudflare/types/dns/batch_put_param.py
new file mode 100644
index 00000000000..60d0bdeda19
--- /dev/null
+++ b/src/cloudflare/types/dns/batch_put_param.py
@@ -0,0 +1,240 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+from .a_record_param import ARecordParam
+from .ds_record_param import DSRecordParam
+from .mx_record_param import MXRecordParam
+from .ns_record_param import NSRecordParam
+from .caa_record_param import CAARecordParam
+from .loc_record_param import LOCRecordParam
+from .ptr_record_param import PTRRecordParam
+from .srv_record_param import SRVRecordParam
+from .txt_record_param import TXTRecordParam
+from .uri_record_param import URIRecordParam
+from .aaaa_record_param import AAAARecordParam
+from .cert_record_param import CERTRecordParam
+from .svcb_record_param import SVCBRecordParam
+from .tlsa_record_param import TLSARecordParam
+from .cname_record_param import CNAMERecordParam
+from .https_record_param import HTTPSRecordParam
+from .naptr_record_param import NAPTRRecordParam
+from .sshfp_record_param import SSHFPRecordParam
+from .dnskey_record_param import DNSKEYRecordParam
+from .smimea_record_param import SMIMEARecordParam
+
+__all__ = [
+    "BatchPutParam",
+    "ARecord",
+    "AAAARecord",
+    "CNAMERecord",
+    "MXRecord",
+    "NSRecord",
+    "OpenpgpkeyRecord",
+    "OpenpgpkeyRecordSettings",
+    "PTRRecord",
+    "TXTRecord",
+    "CAARecord",
+    "CERTRecord",
+    "DNSKEYRecord",
+    "DSRecord",
+    "HTTPSRecord",
+    "LOCRecord",
+    "NAPTRRecord",
+    "SMIMEARecord",
+    "SRVRecord",
+    "SSHFPRecord",
+    "SVCBRecord",
+    "TLSARecord",
+    "URIRecord",
+]
+
+
+class ARecord(ARecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class AAAARecord(AAAARecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class CNAMERecord(CNAMERecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class MXRecord(MXRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class NSRecord(NSRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class OpenpgpkeyRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class OpenpgpkeyRecord(TypedDict, total=False):
+    id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["OPENPGPKEY"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)"""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: OpenpgpkeyRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class PTRRecord(PTRRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class TXTRecord(TXTRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class CAARecord(CAARecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class CERTRecord(CERTRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class DNSKEYRecord(DNSKEYRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class DSRecord(DSRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class HTTPSRecord(HTTPSRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class LOCRecord(LOCRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class NAPTRRecord(NAPTRRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class SMIMEARecord(SMIMEARecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class SRVRecord(SRVRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class SSHFPRecord(SSHFPRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class SVCBRecord(SVCBRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class TLSARecord(TLSARecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class URIRecord(URIRecordParam, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+BatchPutParam: TypeAlias = Union[
+    ARecord,
+    AAAARecord,
+    CNAMERecord,
+    MXRecord,
+    NSRecord,
+    OpenpgpkeyRecord,
+    PTRRecord,
+    TXTRecord,
+    CAARecord,
+    CERTRecord,
+    DNSKEYRecord,
+    DSRecord,
+    HTTPSRecord,
+    LOCRecord,
+    NAPTRRecord,
+    SMIMEARecord,
+    SRVRecord,
+    SSHFPRecord,
+    SVCBRecord,
+    TLSARecord,
+    URIRecord,
+]
diff --git a/src/cloudflare/types/dns/caa_record.py b/src/cloudflare/types/dns/caa_record.py
index 651ab47480b..c61687a3012 100644
--- a/src/cloudflare/types/dns/caa_record.py
+++ b/src/cloudflare/types/dns/caa_record.py
@@ -1,18 +1,18 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["CAARecord", "Data"]
+__all__ = ["CAARecord", "Data", "Settings"]
 
 
 class Data(BaseModel):
+    """Components of a CAA record."""
+
     flags: Optional[float] = None
     """Flags for the CAA record."""
 
@@ -23,19 +23,40 @@ class Data(BaseModel):
     """Value of the record. This field's semantics depend on the chosen tag."""
 
 
-class CAARecord(BaseModel):
-    data: Data
-    """Components of a CAA record."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
 
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class CAARecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Literal["CAA"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
@@ -45,24 +66,17 @@ class CAARecord(BaseModel):
     content: Optional[str] = None
     """Formatted CAA content. See 'data' to set CAA properties."""
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
-
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
+    data: Optional[Data] = None
+    """Components of a CAA record."""
 
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
+    proxied: Optional[bool] = None
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
 
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
 
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/caa_record_param.py b/src/cloudflare/types/dns/caa_record_param.py
new file mode 100644
index 00000000000..8ebf9d90550
--- /dev/null
+++ b/src/cloudflare/types/dns/caa_record_param.py
@@ -0,0 +1,80 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["CAARecordParam", "Data", "Settings"]
+
+
+class Data(TypedDict, total=False):
+    """Components of a CAA record."""
+
+    flags: float
+    """Flags for the CAA record."""
+
+    tag: str
+    """Name of the property controlled by this record (e.g.: issue, issuewild, iodef)."""
+
+    value: str
+    """Value of the record. This field's semantics depend on the chosen tag."""
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class CAARecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["CAA"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    data: Data
+    """Components of a CAA record."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/cert_record.py b/src/cloudflare/types/dns/cert_record.py
index 0aa1f0e3a27..52670890d8b 100644
--- a/src/cloudflare/types/dns/cert_record.py
+++ b/src/cloudflare/types/dns/cert_record.py
@@ -1,18 +1,18 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["CERTRecord", "Data"]
+__all__ = ["CERTRecord", "Data", "Settings"]
 
 
 class Data(BaseModel):
+    """Components of a CERT record."""
+
     algorithm: Optional[float] = None
     """Algorithm."""
 
@@ -26,19 +26,40 @@ class Data(BaseModel):
     """Type."""
 
 
-class CERTRecord(BaseModel):
-    data: Data
-    """Components of a CERT record."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
 
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class CERTRecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Literal["CERT"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
@@ -48,24 +69,17 @@ class CERTRecord(BaseModel):
     content: Optional[str] = None
     """Formatted CERT content. See 'data' to set CERT properties."""
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
-
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
+    data: Optional[Data] = None
+    """Components of a CERT record."""
 
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
+    proxied: Optional[bool] = None
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
 
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
 
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/cert_record_param.py b/src/cloudflare/types/dns/cert_record_param.py
new file mode 100644
index 00000000000..712c45dd5ef
--- /dev/null
+++ b/src/cloudflare/types/dns/cert_record_param.py
@@ -0,0 +1,83 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["CERTRecordParam", "Data", "Settings"]
+
+
+class Data(TypedDict, total=False):
+    """Components of a CERT record."""
+
+    algorithm: float
+    """Algorithm."""
+
+    certificate: str
+    """Certificate."""
+
+    key_tag: float
+    """Key Tag."""
+
+    type: float
+    """Type."""
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class CERTRecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["CERT"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    data: Data
+    """Components of a CERT record."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/cname_record.py b/src/cloudflare/types/dns/cname_record.py
index d7b6d9b1073..ababb7c86e2 100644
--- a/src/cloudflare/types/dns/cname_record.py
+++ b/src/cloudflare/types/dns/cname_record.py
@@ -1,47 +1,65 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["CNAMERecord"]
+__all__ = ["CNAMERecord", "Settings"]
 
 
-class CNAMERecord(BaseModel):
-    content: object
-    """A valid hostname. Must not match the record's name."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
+
+    flatten_cname: Optional[bool] = None
+    """
+    If enabled, causes the CNAME record to be resolved externally and the resulting
+    address records (e.g., A and AAAA) to be returned instead of the CNAME record
+    itself. This setting is unavailable for proxied records, since they are always
+    flattened.
+    """
+
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
 
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class CNAMERecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Literal["CNAME"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
-
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
-
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
-
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    content: Optional[str] = None
+    """A valid hostname. Must not match the record's name."""
 
     proxied: Optional[bool] = None
     """
@@ -49,12 +67,8 @@ class CNAMERecord(BaseModel):
     Cloudflare.
     """
 
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
+
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/cname_record_param.py b/src/cloudflare/types/dns/cname_record_param.py
new file mode 100644
index 00000000000..ef97014558e
--- /dev/null
+++ b/src/cloudflare/types/dns/cname_record_param.py
@@ -0,0 +1,75 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["CNAMERecordParam", "Settings"]
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    flatten_cname: bool
+    """
+    If enabled, causes the CNAME record to be resolved externally and the resulting
+    address records (e.g., A and AAAA) to be returned instead of the CNAME record
+    itself. This setting is unavailable for proxied records, since they are always
+    flattened.
+    """
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class CNAMERecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["CNAME"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A valid hostname. Must not match the record's name."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/dns_analytics_nominal_metric.py b/src/cloudflare/types/dns/dns_analytics_nominal_metric.py
deleted file mode 100644
index c8805568346..00000000000
--- a/src/cloudflare/types/dns/dns_analytics_nominal_metric.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-__all__ = ["DNSAnalyticsNominalMetric"]
-
-DNSAnalyticsNominalMetric = List[object]
diff --git a/src/cloudflare/types/dns/dns_analytics_query.py b/src/cloudflare/types/dns/dns_analytics_query.py
deleted file mode 100644
index a34fcd322bb..00000000000
--- a/src/cloudflare/types/dns/dns_analytics_query.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from datetime import datetime
-
-from ..._models import BaseModel
-from .firewall.delta import Delta
-
-__all__ = ["DNSAnalyticsQuery"]
-
-
-class DNSAnalyticsQuery(BaseModel):
-    dimensions: List[str]
-    """Array of dimension names."""
-
-    limit: int
-    """Limit number of returned metrics."""
-
-    metrics: List[str]
-    """Array of metric names."""
-
-    since: datetime
-    """Start date and time of requesting data period in ISO 8601 format."""
-
-    time_delta: Delta
-    """Unit of time to group data by."""
-
-    until: datetime
-    """End date and time of requesting data period in ISO 8601 format."""
-
-    filters: Optional[str] = None
-    """Segmentation filter in 'attribute operator value' format."""
-
-    sort: Optional[List[str]] = None
-    """
-    Array of dimensions to sort by, where each dimension may be prefixed by -
-    (descending) or + (ascending).
-    """
diff --git a/src/cloudflare/types/dns/dns_setting.py b/src/cloudflare/types/dns/dns_setting.py
deleted file mode 100644
index c96b14afb67..00000000000
--- a/src/cloudflare/types/dns/dns_setting.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-from .nameserver import Nameserver
-
-__all__ = ["DNSSetting", "SOA"]
-
-
-class SOA(BaseModel):
-    expire: float
-    """
-    Time in seconds of being unable to query the primary server after which
-    secondary servers should stop serving the zone.
-    """
-
-    min_ttl: float
-    """The time to live (TTL) for negative caching of records within the zone."""
-
-    mname: str
-    """The primary nameserver, which may be used for outbound zone transfers."""
-
-    refresh: float
-    """
-    Time in seconds after which secondary servers should re-check the SOA record to
-    see if the zone has been updated.
-    """
-
-    retry: float
-    """
-    Time in seconds after which secondary servers should retry queries after the
-    primary server was unresponsive.
-    """
-
-    rname: str
-    """
-    The email address of the zone administrator, with the first label representing
-    the local part of the email address.
-    """
-
-    ttl: float
-    """The time to live (TTL) of the SOA record itself."""
-
-
-class DNSSetting(BaseModel):
-    foundation_dns: Optional[bool] = None
-    """Whether to enable Foundation DNS Advanced Nameservers on the zone."""
-
-    multi_provider: Optional[bool] = None
-    """
-    Whether to enable multi-provider DNS, which causes Cloudflare to activate the
-    zone even when non-Cloudflare NS records exist, and to respect NS records at the
-    zone apex during outbound zone transfers.
-    """
-
-    nameservers: Optional[Nameserver] = None
-    """
-    Settings determining the nameservers through which the zone should be available.
-    """
-
-    ns_ttl: Optional[float] = None
-    """The time to live (TTL) of the zone's nameserver (NS) records."""
-
-    secondary_overrides: Optional[bool] = None
-    """
-    Allows a Secondary DNS zone to use (proxied) override records and CNAME
-    flattening at the zone apex.
-    """
-
-    soa: Optional[SOA] = None
-    """Components of the zone's SOA record."""
-
-    zone_mode: Optional[Literal["standard", "cdn_only", "dns_only"]] = None
-    """Whether the zone mode is a regular or CDN/DNS only zone."""
diff --git a/src/cloudflare/types/dns/dns_setting_param.py b/src/cloudflare/types/dns/dns_setting_param.py
deleted file mode 100644
index 127be3c6a83..00000000000
--- a/src/cloudflare/types/dns/dns_setting_param.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, Required, TypedDict
-
-from .nameserver_param import NameserverParam
-
-__all__ = ["DNSSettingParam", "SOA"]
-
-
-class SOA(TypedDict, total=False):
-    expire: Required[float]
-    """
-    Time in seconds of being unable to query the primary server after which
-    secondary servers should stop serving the zone.
-    """
-
-    min_ttl: Required[float]
-    """The time to live (TTL) for negative caching of records within the zone."""
-
-    mname: Required[str]
-    """The primary nameserver, which may be used for outbound zone transfers."""
-
-    refresh: Required[float]
-    """
-    Time in seconds after which secondary servers should re-check the SOA record to
-    see if the zone has been updated.
-    """
-
-    retry: Required[float]
-    """
-    Time in seconds after which secondary servers should retry queries after the
-    primary server was unresponsive.
-    """
-
-    rname: Required[str]
-    """
-    The email address of the zone administrator, with the first label representing
-    the local part of the email address.
-    """
-
-    ttl: Required[float]
-    """The time to live (TTL) of the SOA record itself."""
-
-
-class DNSSettingParam(TypedDict, total=False):
-    foundation_dns: bool
-    """Whether to enable Foundation DNS Advanced Nameservers on the zone."""
-
-    multi_provider: bool
-    """
-    Whether to enable multi-provider DNS, which causes Cloudflare to activate the
-    zone even when non-Cloudflare NS records exist, and to respect NS records at the
-    zone apex during outbound zone transfers.
-    """
-
-    nameservers: NameserverParam
-    """
-    Settings determining the nameservers through which the zone should be available.
-    """
-
-    ns_ttl: float
-    """The time to live (TTL) of the zone's nameserver (NS) records."""
-
-    secondary_overrides: bool
-    """
-    Allows a Secondary DNS zone to use (proxied) override records and CNAME
-    flattening at the zone apex.
-    """
-
-    soa: SOA
-    """Components of the zone's SOA record."""
-
-    zone_mode: Literal["standard", "cdn_only", "dns_only"]
-    """Whether the zone mode is a regular or CDN/DNS only zone."""
diff --git a/src/cloudflare/types/dns/dnskey_record.py b/src/cloudflare/types/dns/dnskey_record.py
index 75621b33783..33ca182dbbb 100644
--- a/src/cloudflare/types/dns/dnskey_record.py
+++ b/src/cloudflare/types/dns/dnskey_record.py
@@ -1,18 +1,18 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["DNSKEYRecord", "Data"]
+__all__ = ["DNSKEYRecord", "Data", "Settings"]
 
 
 class Data(BaseModel):
+    """Components of a DNSKEY record."""
+
     algorithm: Optional[float] = None
     """Algorithm."""
 
@@ -26,19 +26,40 @@ class Data(BaseModel):
     """Public Key."""
 
 
-class DNSKEYRecord(BaseModel):
-    data: Data
-    """Components of a DNSKEY record."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
 
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class DNSKEYRecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Literal["DNSKEY"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
@@ -48,24 +69,17 @@ class DNSKEYRecord(BaseModel):
     content: Optional[str] = None
     """Formatted DNSKEY content. See 'data' to set DNSKEY properties."""
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
-
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
+    data: Optional[Data] = None
+    """Components of a DNSKEY record."""
 
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
+    proxied: Optional[bool] = None
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
 
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
 
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/dnskey_record_param.py b/src/cloudflare/types/dns/dnskey_record_param.py
new file mode 100644
index 00000000000..dca8b77889f
--- /dev/null
+++ b/src/cloudflare/types/dns/dnskey_record_param.py
@@ -0,0 +1,83 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["DNSKEYRecordParam", "Data", "Settings"]
+
+
+class Data(TypedDict, total=False):
+    """Components of a DNSKEY record."""
+
+    algorithm: float
+    """Algorithm."""
+
+    flags: float
+    """Flags."""
+
+    protocol: float
+    """Protocol."""
+
+    public_key: str
+    """Public Key."""
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class DNSKEYRecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["DNSKEY"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    data: Data
+    """Components of a DNSKEY record."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/dnssec.py b/src/cloudflare/types/dns/dnssec.py
new file mode 100644
index 00000000000..427f2e09b18
--- /dev/null
+++ b/src/cloudflare/types/dns/dnssec.py
@@ -0,0 +1,82 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["DNSSEC"]
+
+
+class DNSSEC(BaseModel):
+    algorithm: Optional[str] = None
+    """Algorithm key code."""
+
+    digest: Optional[str] = None
+    """Digest hash."""
+
+    digest_algorithm: Optional[str] = None
+    """Type of digest algorithm."""
+
+    digest_type: Optional[str] = None
+    """Coded type for digest algorithm."""
+
+    dnssec_multi_signer: Optional[bool] = None
+    """
+    If true, multi-signer DNSSEC is enabled on the zone, allowing multiple providers
+    to serve a DNSSEC-signed zone at the same time. This is required for DNSKEY
+    records (except those automatically generated by Cloudflare) to be added to the
+    zone.
+
+    See
+    [Multi-signer DNSSEC](https://developers.cloudflare.com/dns/dnssec/multi-signer-dnssec/)
+    for details.
+    """
+
+    dnssec_presigned: Optional[bool] = None
+    """
+    If true, allows Cloudflare to transfer in a DNSSEC-signed zone including
+    signatures from an external provider, without requiring Cloudflare to sign any
+    records on the fly.
+
+    Note that this feature has some limitations. See
+    [Cloudflare as Secondary](https://developers.cloudflare.com/dns/zone-setups/zone-transfers/cloudflare-as-secondary/setup/#dnssec)
+    for details.
+    """
+
+    dnssec_use_nsec3: Optional[bool] = None
+    """
+    If true, enables the use of NSEC3 together with DNSSEC on the zone. Combined
+    with setting dnssec_presigned to true, this enables the use of NSEC3 records
+    when transferring in from an external provider. If dnssec_presigned is instead
+    set to false (default), NSEC3 records will be generated and signed at request
+    time.
+
+    See
+    [DNSSEC with NSEC3](https://developers.cloudflare.com/dns/dnssec/enable-nsec3/)
+    for details.
+    """
+
+    ds: Optional[str] = None
+    """Full DS record."""
+
+    flags: Optional[float] = None
+    """Flag for DNSSEC record."""
+
+    key_tag: Optional[float] = None
+    """Code for key tag."""
+
+    key_type: Optional[str] = None
+    """Algorithm key type."""
+
+    modified_on: Optional[datetime] = None
+    """When DNSSEC was last modified."""
+
+    public_key: Optional[str] = None
+    """Public key for DS record."""
+
+    status: Optional[Literal["active", "pending", "disabled", "pending-disabled", "error"]] = None
+    """
+    Status of DNSSEC, based on user-desired state and presence of necessary records.
+    """
diff --git a/src/cloudflare/types/dns/dnssec_delete_response.py b/src/cloudflare/types/dns/dnssec_delete_response.py
new file mode 100644
index 00000000000..895a6c00234
--- /dev/null
+++ b/src/cloudflare/types/dns/dnssec_delete_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["DNSSECDeleteResponse"]
+
+DNSSECDeleteResponse: TypeAlias = str
diff --git a/src/cloudflare/types/dns/dnssec_edit_params.py b/src/cloudflare/types/dns/dnssec_edit_params.py
new file mode 100644
index 00000000000..3e8e050f7ea
--- /dev/null
+++ b/src/cloudflare/types/dns/dnssec_edit_params.py
@@ -0,0 +1,53 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["DNSSECEditParams"]
+
+
+class DNSSECEditParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    dnssec_multi_signer: bool
+    """
+    If true, multi-signer DNSSEC is enabled on the zone, allowing multiple providers
+    to serve a DNSSEC-signed zone at the same time. This is required for DNSKEY
+    records (except those automatically generated by Cloudflare) to be added to the
+    zone.
+
+    See
+    [Multi-signer DNSSEC](https://developers.cloudflare.com/dns/dnssec/multi-signer-dnssec/)
+    for details.
+    """
+
+    dnssec_presigned: bool
+    """
+    If true, allows Cloudflare to transfer in a DNSSEC-signed zone including
+    signatures from an external provider, without requiring Cloudflare to sign any
+    records on the fly.
+
+    Note that this feature has some limitations. See
+    [Cloudflare as Secondary](https://developers.cloudflare.com/dns/zone-setups/zone-transfers/cloudflare-as-secondary/setup/#dnssec)
+    for details.
+    """
+
+    dnssec_use_nsec3: bool
+    """
+    If true, enables the use of NSEC3 together with DNSSEC on the zone. Combined
+    with setting dnssec_presigned to true, this enables the use of NSEC3 records
+    when transferring in from an external provider. If dnssec_presigned is instead
+    set to false (default), NSEC3 records will be generated and signed at request
+    time.
+
+    See
+    [DNSSEC with NSEC3](https://developers.cloudflare.com/dns/dnssec/enable-nsec3/)
+    for details.
+    """
+
+    status: Literal["active", "disabled"]
+    """
+    Status of DNSSEC, based on user-desired state and presence of necessary records.
+    """
diff --git a/src/cloudflare/types/dns/ds_record.py b/src/cloudflare/types/dns/ds_record.py
index af3abd1f1ec..fe8a878c5cb 100644
--- a/src/cloudflare/types/dns/ds_record.py
+++ b/src/cloudflare/types/dns/ds_record.py
@@ -1,18 +1,18 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["DSRecord", "Data"]
+__all__ = ["DSRecord", "Data", "Settings"]
 
 
 class Data(BaseModel):
+    """Components of a DS record."""
+
     algorithm: Optional[float] = None
     """Algorithm."""
 
@@ -26,19 +26,40 @@ class Data(BaseModel):
     """Key Tag."""
 
 
-class DSRecord(BaseModel):
-    data: Data
-    """Components of a DS record."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
 
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class DSRecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Literal["DS"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
@@ -48,24 +69,17 @@ class DSRecord(BaseModel):
     content: Optional[str] = None
     """Formatted DS content. See 'data' to set DS properties."""
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
-
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
+    data: Optional[Data] = None
+    """Components of a DS record."""
 
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
+    proxied: Optional[bool] = None
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
 
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
 
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/ds_record_param.py b/src/cloudflare/types/dns/ds_record_param.py
new file mode 100644
index 00000000000..f68b9c2f060
--- /dev/null
+++ b/src/cloudflare/types/dns/ds_record_param.py
@@ -0,0 +1,83 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["DSRecordParam", "Data", "Settings"]
+
+
+class Data(TypedDict, total=False):
+    """Components of a DS record."""
+
+    algorithm: float
+    """Algorithm."""
+
+    digest: str
+    """Digest."""
+
+    digest_type: float
+    """Digest Type."""
+
+    key_tag: float
+    """Key Tag."""
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class DSRecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["DS"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    data: Data
+    """Components of a DS record."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/firewall/__init__.py b/src/cloudflare/types/dns/firewall/__init__.py
deleted file mode 100644
index 72f681823a2..00000000000
--- a/src/cloudflare/types/dns/firewall/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from .delta import Delta as Delta
-from .firewall import Firewall as Firewall
diff --git a/src/cloudflare/types/dns/firewall/delta.py b/src/cloudflare/types/dns/firewall/delta.py
deleted file mode 100644
index 0d5a9933f8b..00000000000
--- a/src/cloudflare/types/dns/firewall/delta.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing_extensions import Literal
-
-__all__ = ["Delta"]
-
-Delta = Literal["all", "auto", "year", "quarter", "month", "week", "day", "hour", "dekaminute", "minute"]
diff --git a/src/cloudflare/types/dns/firewall/firewall.py b/src/cloudflare/types/dns/firewall/firewall.py
deleted file mode 100644
index 3ab282e0310..00000000000
--- a/src/cloudflare/types/dns/firewall/firewall.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from datetime import datetime
-
-from ...._models import BaseModel
-from ..firewall_ips import FirewallIPs
-from ..upstream_ips import UpstreamIPs
-from ..attack_mitigation import AttackMitigation
-
-__all__ = ["Firewall"]
-
-
-class Firewall(BaseModel):
-    id: str
-    """Identifier"""
-
-    deprecate_any_requests: bool
-    """Deprecate the response to ANY requests."""
-
-    dns_firewall_ips: List[FirewallIPs]
-
-    ecs_fallback: bool
-    """Forward client IP (resolver) subnet if no EDNS Client Subnet is sent."""
-
-    maximum_cache_ttl: float
-    """Maximum DNS cache TTL.
-
-    This setting sets an upper bound on DNS TTLs for purposes of caching between DNS
-    Firewall and the upstream servers. Higher TTLs will be decreased to the maximum
-    defined here for caching purposes.
-    """
-
-    minimum_cache_ttl: float
-    """Minimum DNS cache TTL.
-
-    This setting sets a lower bound on DNS TTLs for purposes of caching between DNS
-    Firewall and the upstream servers. Lower TTLs will be increased to the minimum
-    defined here for caching purposes.
-    """
-
-    modified_on: datetime
-    """Last modification of DNS Firewall cluster."""
-
-    name: str
-    """DNS Firewall Cluster Name."""
-
-    upstream_ips: List[UpstreamIPs]
-
-    attack_mitigation: Optional[AttackMitigation] = None
-    """Attack mitigation settings."""
-
-    negative_cache_ttl: Optional[float] = None
-    """Negative DNS cache TTL.
-
-    This setting controls how long DNS Firewall should cache negative responses
-    (e.g., NXDOMAIN) from the upstream servers.
-    """
-
-    ratelimit: Optional[float] = None
-    """
-    Ratelimit in queries per second per datacenter (applies to DNS queries sent to
-    the upstream nameservers configured on the cluster).
-    """
-
-    retries: Optional[float] = None
-    """
-    Number of retries for fetching DNS responses from upstream nameservers (not
-    counting the initial attempt).
-    """
diff --git a/src/cloudflare/types/dns/firewall_create_params.py b/src/cloudflare/types/dns/firewall_create_params.py
deleted file mode 100644
index 9c2e530b9d0..00000000000
--- a/src/cloudflare/types/dns/firewall_create_params.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List, Optional
-from typing_extensions import Required, TypedDict
-
-from .upstream_ips_param import UpstreamIPsParam
-from .attack_mitigation_param import AttackMitigationParam
-
-__all__ = ["FirewallCreateParams"]
-
-
-class FirewallCreateParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    name: Required[str]
-    """DNS Firewall Cluster Name."""
-
-    upstream_ips: Required[List[UpstreamIPsParam]]
-
-    attack_mitigation: Optional[AttackMitigationParam]
-    """Attack mitigation settings."""
-
-    deprecate_any_requests: bool
-    """Deprecate the response to ANY requests."""
-
-    ecs_fallback: bool
-    """Forward client IP (resolver) subnet if no EDNS Client Subnet is sent."""
-
-    maximum_cache_ttl: float
-    """Maximum DNS cache TTL.
-
-    This setting sets an upper bound on DNS TTLs for purposes of caching between DNS
-    Firewall and the upstream servers. Higher TTLs will be decreased to the maximum
-    defined here for caching purposes.
-    """
-
-    minimum_cache_ttl: float
-    """Minimum DNS cache TTL.
-
-    This setting sets a lower bound on DNS TTLs for purposes of caching between DNS
-    Firewall and the upstream servers. Lower TTLs will be increased to the minimum
-    defined here for caching purposes.
-    """
-
-    negative_cache_ttl: Optional[float]
-    """Negative DNS cache TTL.
-
-    This setting controls how long DNS Firewall should cache negative responses
-    (e.g., NXDOMAIN) from the upstream servers.
-    """
-
-    ratelimit: Optional[float]
-    """
-    Ratelimit in queries per second per datacenter (applies to DNS queries sent to
-    the upstream nameservers configured on the cluster).
-    """
-
-    retries: float
-    """
-    Number of retries for fetching DNS responses from upstream nameservers (not
-    counting the initial attempt).
-    """
diff --git a/src/cloudflare/types/dns/firewall_delete_response.py b/src/cloudflare/types/dns/firewall_delete_response.py
deleted file mode 100644
index e885b33427c..00000000000
--- a/src/cloudflare/types/dns/firewall_delete_response.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ..._models import BaseModel
-
-__all__ = ["FirewallDeleteResponse"]
-
-
-class FirewallDeleteResponse(BaseModel):
-    id: Optional[str] = None
-    """Identifier"""
diff --git a/src/cloudflare/types/dns/firewall_edit_params.py b/src/cloudflare/types/dns/firewall_edit_params.py
deleted file mode 100644
index 3e87a30ef50..00000000000
--- a/src/cloudflare/types/dns/firewall_edit_params.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List, Optional
-from typing_extensions import Required, TypedDict
-
-from .firewall_ips_param import FirewallIPsParam
-from .upstream_ips_param import UpstreamIPsParam
-from .attack_mitigation_param import AttackMitigationParam
-
-__all__ = ["FirewallEditParams"]
-
-
-class FirewallEditParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    id: Required[str]
-    """Identifier"""
-
-    deprecate_any_requests: Required[bool]
-    """Deprecate the response to ANY requests."""
-
-    dns_firewall_ips: Required[List[FirewallIPsParam]]
-
-    ecs_fallback: Required[bool]
-    """Forward client IP (resolver) subnet if no EDNS Client Subnet is sent."""
-
-    maximum_cache_ttl: Required[float]
-    """Maximum DNS cache TTL.
-
-    This setting sets an upper bound on DNS TTLs for purposes of caching between DNS
-    Firewall and the upstream servers. Higher TTLs will be decreased to the maximum
-    defined here for caching purposes.
-    """
-
-    minimum_cache_ttl: Required[float]
-    """Minimum DNS cache TTL.
-
-    This setting sets a lower bound on DNS TTLs for purposes of caching between DNS
-    Firewall and the upstream servers. Lower TTLs will be increased to the minimum
-    defined here for caching purposes.
-    """
-
-    name: Required[str]
-    """DNS Firewall Cluster Name."""
-
-    upstream_ips: Required[List[UpstreamIPsParam]]
-
-    attack_mitigation: Optional[AttackMitigationParam]
-    """Attack mitigation settings."""
-
-    negative_cache_ttl: Optional[float]
-    """Negative DNS cache TTL.
-
-    This setting controls how long DNS Firewall should cache negative responses
-    (e.g., NXDOMAIN) from the upstream servers.
-    """
-
-    ratelimit: Optional[float]
-    """
-    Ratelimit in queries per second per datacenter (applies to DNS queries sent to
-    the upstream nameservers configured on the cluster).
-    """
-
-    retries: float
-    """
-    Number of retries for fetching DNS responses from upstream nameservers (not
-    counting the initial attempt).
-    """
diff --git a/src/cloudflare/types/dns/firewall_ips.py b/src/cloudflare/types/dns/firewall_ips.py
deleted file mode 100644
index ec1ec7a1fc3..00000000000
--- a/src/cloudflare/types/dns/firewall_ips.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union
-
-__all__ = ["FirewallIPs"]
-
-FirewallIPs = Union[str, str]
diff --git a/src/cloudflare/types/dns/firewall_ips_param.py b/src/cloudflare/types/dns/firewall_ips_param.py
deleted file mode 100644
index 9a199cf8505..00000000000
--- a/src/cloudflare/types/dns/firewall_ips_param.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Union
-
-__all__ = ["FirewallIPsParam"]
-
-FirewallIPsParam = Union[str, str]
diff --git a/src/cloudflare/types/dns/firewall_list_params.py b/src/cloudflare/types/dns/firewall_list_params.py
deleted file mode 100644
index 2e754962ef4..00000000000
--- a/src/cloudflare/types/dns/firewall_list_params.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["FirewallListParams"]
-
-
-class FirewallListParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    page: float
-    """Page number of paginated results."""
-
-    per_page: float
-    """Number of clusters per page."""
diff --git a/src/cloudflare/types/dns/https_record.py b/src/cloudflare/types/dns/https_record.py
index 42121b3fc3a..1568aed7d6f 100644
--- a/src/cloudflare/types/dns/https_record.py
+++ b/src/cloudflare/types/dns/https_record.py
@@ -1,41 +1,62 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["HTTPSRecord", "Data"]
+__all__ = ["HTTPSRecord", "Data", "Settings"]
 
 
 class Data(BaseModel):
+    """Components of a HTTPS record."""
+
     priority: Optional[float] = None
-    """priority."""
+    """Priority."""
 
     target: Optional[str] = None
-    """target."""
+    """Target."""
 
     value: Optional[str] = None
-    """value."""
+    """Value."""
 
 
-class HTTPSRecord(BaseModel):
-    data: Data
-    """Components of a HTTPS record."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
 
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class HTTPSRecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Literal["HTTPS"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
@@ -45,24 +66,17 @@ class HTTPSRecord(BaseModel):
     content: Optional[str] = None
     """Formatted HTTPS content. See 'data' to set HTTPS properties."""
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
-
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
+    data: Optional[Data] = None
+    """Components of a HTTPS record."""
 
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
+    proxied: Optional[bool] = None
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
 
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
 
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/https_record_param.py b/src/cloudflare/types/dns/https_record_param.py
new file mode 100644
index 00000000000..3481c60ce19
--- /dev/null
+++ b/src/cloudflare/types/dns/https_record_param.py
@@ -0,0 +1,80 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["HTTPSRecordParam", "Data", "Settings"]
+
+
+class Data(TypedDict, total=False):
+    """Components of a HTTPS record."""
+
+    priority: float
+    """Priority."""
+
+    target: str
+    """Target."""
+
+    value: str
+    """Value."""
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class HTTPSRecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["HTTPS"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    data: Data
+    """Components of a HTTPS record."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/loc_record.py b/src/cloudflare/types/dns/loc_record.py
index 5608a4701fc..80b825de033 100644
--- a/src/cloudflare/types/dns/loc_record.py
+++ b/src/cloudflare/types/dns/loc_record.py
@@ -1,18 +1,18 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["LOCRecord", "Data"]
+__all__ = ["LOCRecord", "Data", "Settings"]
 
 
 class Data(BaseModel):
+    """Components of a LOC record."""
+
     altitude: Optional[float] = None
     """Altitude of location in meters."""
 
@@ -50,19 +50,40 @@ class Data(BaseModel):
     """Size of location in meters."""
 
 
-class LOCRecord(BaseModel):
-    data: Data
-    """Components of a LOC record."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
 
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class LOCRecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Literal["LOC"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
@@ -72,24 +93,17 @@ class LOCRecord(BaseModel):
     content: Optional[str] = None
     """Formatted LOC content. See 'data' to set LOC properties."""
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
-
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
+    data: Optional[Data] = None
+    """Components of a LOC record."""
 
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
+    proxied: Optional[bool] = None
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
 
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
 
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/loc_record_param.py b/src/cloudflare/types/dns/loc_record_param.py
new file mode 100644
index 00000000000..be6ab197d8c
--- /dev/null
+++ b/src/cloudflare/types/dns/loc_record_param.py
@@ -0,0 +1,107 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["LOCRecordParam", "Data", "Settings"]
+
+
+class Data(TypedDict, total=False):
+    """Components of a LOC record."""
+
+    altitude: float
+    """Altitude of location in meters."""
+
+    lat_degrees: float
+    """Degrees of latitude."""
+
+    lat_direction: Literal["N", "S"]
+    """Latitude direction."""
+
+    lat_minutes: float
+    """Minutes of latitude."""
+
+    lat_seconds: float
+    """Seconds of latitude."""
+
+    long_degrees: float
+    """Degrees of longitude."""
+
+    long_direction: Literal["E", "W"]
+    """Longitude direction."""
+
+    long_minutes: float
+    """Minutes of longitude."""
+
+    long_seconds: float
+    """Seconds of longitude."""
+
+    precision_horz: float
+    """Horizontal precision of location."""
+
+    precision_vert: float
+    """Vertical precision of location."""
+
+    size: float
+    """Size of location in meters."""
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class LOCRecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["LOC"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    data: Data
+    """Components of a LOC record."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/mx_record.py b/src/cloudflare/types/dns/mx_record.py
index c1d1f3aba97..1cf845a463b 100644
--- a/src/cloudflare/types/dns/mx_record.py
+++ b/src/cloudflare/types/dns/mx_record.py
@@ -1,60 +1,72 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["MXRecord"]
+__all__ = ["MXRecord", "Settings"]
 
 
-class MXRecord(BaseModel):
-    content: str
-    """A valid mail server hostname."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
+
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
 
+
+class MXRecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
 
-    priority: float
-    """Required for MX, SRV and URI records; unused by other record types.
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
 
-    Records with lower priorities are preferred.
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
     """
 
     type: Literal["MX"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
+    content: Optional[str] = None
+    """A valid mail server hostname."""
 
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
+    priority: Optional[float] = None
+    """Required for MX, SRV and URI records; unused by other record types.
 
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
+    Records with lower priorities are preferred.
+    """
+
+    proxied: Optional[bool] = None
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
 
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
 
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/mx_record_param.py b/src/cloudflare/types/dns/mx_record_param.py
new file mode 100644
index 00000000000..33d8e365ff3
--- /dev/null
+++ b/src/cloudflare/types/dns/mx_record_param.py
@@ -0,0 +1,73 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["MXRecordParam", "Settings"]
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class MXRecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["MX"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A valid mail server hostname."""
+
+    priority: float
+    """Required for MX, SRV and URI records; unused by other record types.
+
+    Records with lower priorities are preferred.
+    """
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/nameserver.py b/src/cloudflare/types/dns/nameserver.py
deleted file mode 100644
index 3076da16fbd..00000000000
--- a/src/cloudflare/types/dns/nameserver.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = ["Nameserver"]
-
-
-class Nameserver(BaseModel):
-    type: Literal["cloudflare.standard"]
-    """Nameserver type"""
diff --git a/src/cloudflare/types/dns/nameserver_param.py b/src/cloudflare/types/dns/nameserver_param.py
deleted file mode 100644
index 6d73075a2ae..00000000000
--- a/src/cloudflare/types/dns/nameserver_param.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, Required, TypedDict
-
-__all__ = ["NameserverParam"]
-
-
-class NameserverParam(TypedDict, total=False):
-    type: Required[Literal["cloudflare.standard"]]
-    """Nameserver type"""
diff --git a/src/cloudflare/types/dns/naptr_record.py b/src/cloudflare/types/dns/naptr_record.py
index 796caffdbb9..0628ed1d7c3 100644
--- a/src/cloudflare/types/dns/naptr_record.py
+++ b/src/cloudflare/types/dns/naptr_record.py
@@ -1,18 +1,18 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["NAPTRRecord", "Data"]
+__all__ = ["NAPTRRecord", "Data", "Settings"]
 
 
 class Data(BaseModel):
+    """Components of a NAPTR record."""
+
     flags: Optional[str] = None
     """Flags."""
 
@@ -32,19 +32,40 @@ class Data(BaseModel):
     """Service."""
 
 
-class NAPTRRecord(BaseModel):
-    data: Data
-    """Components of a NAPTR record."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
 
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class NAPTRRecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Literal["NAPTR"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
@@ -54,24 +75,17 @@ class NAPTRRecord(BaseModel):
     content: Optional[str] = None
     """Formatted NAPTR content. See 'data' to set NAPTR properties."""
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
-
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
+    data: Optional[Data] = None
+    """Components of a NAPTR record."""
 
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
+    proxied: Optional[bool] = None
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
 
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
 
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/naptr_record_param.py b/src/cloudflare/types/dns/naptr_record_param.py
new file mode 100644
index 00000000000..42d907ca842
--- /dev/null
+++ b/src/cloudflare/types/dns/naptr_record_param.py
@@ -0,0 +1,89 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["NAPTRRecordParam", "Data", "Settings"]
+
+
+class Data(TypedDict, total=False):
+    """Components of a NAPTR record."""
+
+    flags: str
+    """Flags."""
+
+    order: float
+    """Order."""
+
+    preference: float
+    """Preference."""
+
+    regex: str
+    """Regex."""
+
+    replacement: str
+    """Replacement."""
+
+    service: str
+    """Service."""
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class NAPTRRecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["NAPTR"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    data: Data
+    """Components of a NAPTR record."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/ns_record.py b/src/cloudflare/types/dns/ns_record.py
index b9ad8683302..50a0da7486b 100644
--- a/src/cloudflare/types/dns/ns_record.py
+++ b/src/cloudflare/types/dns/ns_record.py
@@ -1,54 +1,66 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["NSRecord"]
+__all__ = ["NSRecord", "Settings"]
 
 
-class NSRecord(BaseModel):
-    content: str
-    """A valid name server host name."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
+
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
 
+class NSRecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Literal["NS"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
-
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
+    content: Optional[str] = None
+    """A valid name server host name."""
 
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
+    proxied: Optional[bool] = None
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
 
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
 
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/ns_record_param.py b/src/cloudflare/types/dns/ns_record_param.py
new file mode 100644
index 00000000000..00f5dda3255
--- /dev/null
+++ b/src/cloudflare/types/dns/ns_record_param.py
@@ -0,0 +1,67 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["NSRecordParam", "Settings"]
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class NSRecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["NS"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A valid name server host name."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/ptr_record.py b/src/cloudflare/types/dns/ptr_record.py
index e83d664a949..50a52d9571a 100644
--- a/src/cloudflare/types/dns/ptr_record.py
+++ b/src/cloudflare/types/dns/ptr_record.py
@@ -1,54 +1,66 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["PTRRecord"]
+__all__ = ["PTRRecord", "Settings"]
 
 
-class PTRRecord(BaseModel):
-    content: str
-    """Domain name pointing to the address."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
+
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
 
+class PTRRecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Literal["PTR"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
-
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
+    content: Optional[str] = None
+    """Domain name pointing to the address."""
 
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
+    proxied: Optional[bool] = None
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
 
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
 
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/ptr_record_param.py b/src/cloudflare/types/dns/ptr_record_param.py
new file mode 100644
index 00000000000..2732fa10f64
--- /dev/null
+++ b/src/cloudflare/types/dns/ptr_record_param.py
@@ -0,0 +1,67 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["PTRRecordParam", "Settings"]
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class PTRRecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["PTR"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """Domain name pointing to the address."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/record.py b/src/cloudflare/types/dns/record.py
deleted file mode 100644
index 6dcc3a1a15c..00000000000
--- a/src/cloudflare/types/dns/record.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union
-from typing_extensions import Annotated
-
-from ..._utils import PropertyInfo
-from .a_record import ARecord
-from .ds_record import DSRecord
-from .mx_record import MXRecord
-from .ns_record import NSRecord
-from .caa_record import CAARecord
-from .loc_record import LOCRecord
-from .ptr_record import PTRRecord
-from .srv_record import SRVRecord
-from .txt_record import TXTRecord
-from .uri_record import URIRecord
-from .aaaa_record import AAAARecord
-from .cert_record import CERTRecord
-from .svcb_record import SVCBRecord
-from .tlsa_record import TLSARecord
-from .cname_record import CNAMERecord
-from .https_record import HTTPSRecord
-from .naptr_record import NAPTRRecord
-from .sshfp_record import SSHFPRecord
-from .dnskey_record import DNSKEYRecord
-from .smimea_record import SMIMEARecord
-
-__all__ = ["Record"]
-
-Record = Annotated[
-    Union[
-        ARecord,
-        AAAARecord,
-        CAARecord,
-        CERTRecord,
-        CNAMERecord,
-        DNSKEYRecord,
-        DSRecord,
-        HTTPSRecord,
-        LOCRecord,
-        MXRecord,
-        NAPTRRecord,
-        NSRecord,
-        PTRRecord,
-        SMIMEARecord,
-        SRVRecord,
-        SSHFPRecord,
-        SVCBRecord,
-        TLSARecord,
-        TXTRecord,
-        URIRecord,
-    ],
-    PropertyInfo(discriminator="type"),
-]
diff --git a/src/cloudflare/types/dns/record_batch_params.py b/src/cloudflare/types/dns/record_batch_params.py
new file mode 100644
index 00000000000..62fa8a549a0
--- /dev/null
+++ b/src/cloudflare/types/dns/record_batch_params.py
@@ -0,0 +1,139 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+from .a_record_param import ARecordParam
+from .batch_put_param import BatchPutParam
+from .ds_record_param import DSRecordParam
+from .mx_record_param import MXRecordParam
+from .ns_record_param import NSRecordParam
+from .caa_record_param import CAARecordParam
+from .loc_record_param import LOCRecordParam
+from .ptr_record_param import PTRRecordParam
+from .srv_record_param import SRVRecordParam
+from .txt_record_param import TXTRecordParam
+from .uri_record_param import URIRecordParam
+from .aaaa_record_param import AAAARecordParam
+from .batch_patch_param import BatchPatchParam
+from .cert_record_param import CERTRecordParam
+from .svcb_record_param import SVCBRecordParam
+from .tlsa_record_param import TLSARecordParam
+from .cname_record_param import CNAMERecordParam
+from .https_record_param import HTTPSRecordParam
+from .naptr_record_param import NAPTRRecordParam
+from .sshfp_record_param import SSHFPRecordParam
+from .dnskey_record_param import DNSKEYRecordParam
+from .smimea_record_param import SMIMEARecordParam
+
+__all__ = [
+    "RecordBatchParams",
+    "Delete",
+    "Post",
+    "PostDNSRecordsOpenpgpkeyRecord",
+    "PostDNSRecordsOpenpgpkeyRecordSettings",
+]
+
+
+class RecordBatchParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    deletes: Iterable[Delete]
+
+    patches: Iterable[BatchPatchParam]
+
+    posts: Iterable[Post]
+
+    puts: Iterable[BatchPutParam]
+
+
+class Delete(TypedDict, total=False):
+    id: Required[str]
+    """Identifier."""
+
+
+class PostDNSRecordsOpenpgpkeyRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class PostDNSRecordsOpenpgpkeyRecord(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["OPENPGPKEY"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)"""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: PostDNSRecordsOpenpgpkeyRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+Post: TypeAlias = Union[
+    ARecordParam,
+    AAAARecordParam,
+    CNAMERecordParam,
+    MXRecordParam,
+    NSRecordParam,
+    PostDNSRecordsOpenpgpkeyRecord,
+    PTRRecordParam,
+    TXTRecordParam,
+    CAARecordParam,
+    CERTRecordParam,
+    DNSKEYRecordParam,
+    DSRecordParam,
+    HTTPSRecordParam,
+    LOCRecordParam,
+    NAPTRRecordParam,
+    SMIMEARecordParam,
+    SRVRecordParam,
+    SSHFPRecordParam,
+    SVCBRecordParam,
+    TLSARecordParam,
+    URIRecordParam,
+]
diff --git a/src/cloudflare/types/dns/record_batch_response.py b/src/cloudflare/types/dns/record_batch_response.py
new file mode 100644
index 00000000000..4bdc03c4b1c
--- /dev/null
+++ b/src/cloudflare/types/dns/record_batch_response.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+from .record_response import RecordResponse
+
+__all__ = ["RecordBatchResponse"]
+
+
+class RecordBatchResponse(BaseModel):
+    deletes: Optional[List[RecordResponse]] = None
+
+    patches: Optional[List[RecordResponse]] = None
+
+    posts: Optional[List[RecordResponse]] = None
+
+    puts: Optional[List[RecordResponse]] = None
diff --git a/src/cloudflare/types/dns/record_create_params.py b/src/cloudflare/types/dns/record_create_params.py
index c7fbb84ff10..370da434a10 100644
--- a/src/cloudflare/types/dns/record_create_params.py
+++ b/src/cloudflare/types/dns/record_create_params.py
@@ -2,104 +2,274 @@
 
 from __future__ import annotations
 
-from typing import List, Union
-from typing_extensions import Literal, Required, TypedDict
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
+from ..._types import SequenceNotStr
 from .ttl_param import TTLParam
 from .record_tags import RecordTags
 
 __all__ = [
     "RecordCreateParams",
     "ARecord",
+    "ARecordSettings",
     "AAAARecord",
+    "AAAARecordSettings",
+    "CNAMERecord",
+    "CNAMERecordSettings",
+    "MXRecord",
+    "MXRecordSettings",
+    "NSRecord",
+    "NSRecordSettings",
+    "DNSRecordsOpenpgpkeyRecord",
+    "DNSRecordsOpenpgpkeyRecordSettings",
+    "PTRRecord",
+    "PTRRecordSettings",
+    "TXTRecord",
+    "TXTRecordSettings",
     "CAARecord",
     "CAARecordData",
+    "CAARecordSettings",
     "CERTRecord",
     "CERTRecordData",
-    "CNAMERecord",
+    "CERTRecordSettings",
     "DNSKEYRecord",
     "DNSKEYRecordData",
+    "DNSKEYRecordSettings",
     "DSRecord",
     "DSRecordData",
+    "DSRecordSettings",
     "HTTPSRecord",
     "HTTPSRecordData",
+    "HTTPSRecordSettings",
     "LOCRecord",
     "LOCRecordData",
-    "MXRecord",
+    "LOCRecordSettings",
     "NAPTRRecord",
     "NAPTRRecordData",
-    "NSRecord",
-    "PTRRecord",
+    "NAPTRRecordSettings",
     "SMIMEARecord",
     "SMIMEARecordData",
+    "SMIMEARecordSettings",
     "SRVRecord",
     "SRVRecordData",
+    "SRVRecordSettings",
     "SSHFPRecord",
     "SSHFPRecordData",
+    "SSHFPRecordSettings",
     "SVCBRecord",
     "SVCBRecordData",
+    "SVCBRecordSettings",
     "TLSARecord",
     "TLSARecordData",
-    "TXTRecord",
+    "TLSARecordSettings",
     "URIRecord",
     "URIRecordData",
+    "URIRecordSettings",
 ]
 
 
 class ARecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    content: Required[str]
-    """A valid IPv4 address."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["A"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
+    content: str
+    """A valid IPv4 address."""
+
     proxied: bool
     """
     Whether the record is receiving the performance and security benefits of
     Cloudflare.
     """
 
-    tags: List[RecordTags]
+    settings: ARecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
 
-    ttl: TTLParam
+
+class ARecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class AAAARecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
     """Time To Live (TTL) of the DNS record in seconds.
 
     Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
     minimum reduced to 30 for Enterprise zones.
     """
 
+    type: Required[Literal["AAAA"]]
+    """Record type."""
 
-class AAAARecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
 
-    content: Required[str]
+    content: str
     """A valid IPv6 address."""
 
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: AAAARecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class AAAARecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class CNAMERecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
 
-    type: Required[Literal["AAAA"]]
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["CNAME"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A valid hostname. Must not match the record's name."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: CNAMERecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class CNAMERecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    flatten_cname: bool
+    """
+    If enabled, causes the CNAME record to be resolved externally and the resulting
+    address records (e.g., A and AAAA) to be returned instead of the CNAME record
+    itself. This setting is unavailable for proxied records, since they are always
+    flattened.
+    """
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class MXRecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["MX"]]
+    """Record type."""
 
     comment: str
     """Comments or notes about the DNS record.
@@ -107,38 +277,241 @@ class AAAARecord(TypedDict, total=False):
     This field has no effect on DNS responses.
     """
 
+    content: str
+    """A valid mail server hostname."""
+
+    priority: float
+    """Required for MX, SRV and URI records; unused by other record types.
+
+    Records with lower priorities are preferred.
+    """
+
     proxied: bool
     """
     Whether the record is receiving the performance and security benefits of
     Cloudflare.
     """
 
-    tags: List[RecordTags]
+    settings: MXRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
 
-    ttl: TTLParam
+
+class MXRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class NSRecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
     """Time To Live (TTL) of the DNS record in seconds.
 
     Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
     minimum reduced to 30 for Enterprise zones.
     """
 
+    type: Required[Literal["NS"]]
+    """Record type."""
 
-class CAARecord(TypedDict, total=False):
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A valid name server host name."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: NSRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class NSRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class DNSRecordsOpenpgpkeyRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    data: Required[CAARecordData]
-    """Components of a CAA record."""
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["OPENPGPKEY"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)"""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: DNSRecordsOpenpgpkeyRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class DNSRecordsOpenpgpkeyRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class PTRRecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
 
-    type: Required[Literal["CAA"]]
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["PTR"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """Domain name pointing to the address."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: PTRRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class PTRRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class TXTRecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["TXT"]]
+    """Record type."""
 
     comment: str
     """Comments or notes about the DNS record.
@@ -146,18 +519,92 @@ class CAARecord(TypedDict, total=False):
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
+    content: str
+    """Text content for the record.
+
+    The content must consist of quoted "character strings" (RFC 1035), each with a
+    length of up to 255 bytes. Strings exceeding this allowed maximum length are
+    automatically split.
+
+    Learn more at
+    <https://www.cloudflare.com/learning/dns/dns-records/dns-txt-record/>.
+    """
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: TXTRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
 
-    ttl: TTLParam
+
+class TXTRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class CAARecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
     """Time To Live (TTL) of the DNS record in seconds.
 
     Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
     minimum reduced to 30 for Enterprise zones.
     """
 
+    type: Required[Literal["CAA"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    data: CAARecordData
+    """Components of a CAA record."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: CAARecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class CAARecordData(TypedDict, total=False):
+    """Components of a CAA record."""
+
     flags: float
     """Flags for the CAA record."""
 
@@ -168,40 +615,68 @@ class CAARecordData(TypedDict, total=False):
     """Value of the record. This field's semantics depend on the chosen tag."""
 
 
+class CAARecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
 class CERTRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[CERTRecordData]
-    """Components of a CERT record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["CERT"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: CERTRecordData
+    """Components of a CERT record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: CERTRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class CERTRecordData(TypedDict, total=False):
+    """Components of a CERT record."""
+
     algorithm: float
     """Algorithm."""
 
@@ -215,79 +690,68 @@ class CERTRecordData(TypedDict, total=False):
     """Type."""
 
 
-class CNAMERecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    content: Required[object]
-    """A valid hostname. Must not match the record's name."""
-
-    name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
-
-    type: Required[Literal["CNAME"]]
-    """Record type."""
-
-    id: str
-    """Identifier"""
+class CERTRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
 
-    comment: str
-    """Comments or notes about the DNS record.
-
-    This field has no effect on DNS responses.
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
-    proxied: bool
+    ipv6_only: bool
     """
-    Whether the record is receiving the performance and security benefits of
-    Cloudflare.
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
 
-    ttl: TTLParam
+class DNSKEYRecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
     """Time To Live (TTL) of the DNS record in seconds.
 
     Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
     minimum reduced to 30 for Enterprise zones.
     """
 
-
-class DNSKEYRecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[DNSKEYRecordData]
-    """Components of a DNSKEY record."""
-
-    name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
-
     type: Required[Literal["DNSKEY"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: DNSKEYRecordData
+    """Components of a DNSKEY record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: DNSKEYRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class DNSKEYRecordData(TypedDict, total=False):
+    """Components of a DNSKEY record."""
+
     algorithm: float
     """Algorithm."""
 
@@ -301,40 +765,68 @@ class DNSKEYRecordData(TypedDict, total=False):
     """Public Key."""
 
 
+class DNSKEYRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
 class DSRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[DSRecordData]
-    """Components of a DS record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["DS"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: DSRecordData
+    """Components of a DS record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: DSRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class DSRecordData(TypedDict, total=False):
+    """Components of a DS record."""
+
     algorithm: float
     """Algorithm."""
 
@@ -348,84 +840,140 @@ class DSRecordData(TypedDict, total=False):
     """Key Tag."""
 
 
+class DSRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
 class HTTPSRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[HTTPSRecordData]
-    """Components of a HTTPS record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["HTTPS"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: HTTPSRecordData
+    """Components of a HTTPS record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: HTTPSRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class HTTPSRecordData(TypedDict, total=False):
+    """Components of a HTTPS record."""
+
     priority: float
-    """priority."""
+    """Priority."""
 
     target: str
-    """target."""
+    """Target."""
 
     value: str
-    """value."""
+    """Value."""
+
+
+class HTTPSRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
 
 
 class LOCRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[LOCRecordData]
-    """Components of a LOC record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["LOC"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: LOCRecordData
+    """Components of a LOC record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: LOCRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class LOCRecordData(TypedDict, total=False):
+    """Components of a LOC record."""
+
     altitude: float
     """Altitude of location in meters."""
 
@@ -463,198 +1011,149 @@ class LOCRecordData(TypedDict, total=False):
     """Size of location in meters."""
 
 
-class MXRecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    content: Required[str]
-    """A valid mail server hostname."""
-
-    name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
-
-    priority: Required[float]
-    """Required for MX, SRV and URI records; unused by other record types.
+class LOCRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
 
-    Records with lower priorities are preferred.
+    ipv4_only: bool
     """
-
-    type: Required[Literal["MX"]]
-    """Record type."""
-
-    id: str
-    """Identifier"""
-
-    comment: str
-    """Comments or notes about the DNS record.
-
-    This field has no effect on DNS responses.
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
 
 class NAPTRRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[NAPTRRecordData]
-    """Components of a NAPTR record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
-
-    type: Required[Literal["NAPTR"]]
-    """Record type."""
-
-    id: str
-    """Identifier"""
-
-    comment: str
-    """Comments or notes about the DNS record.
-
-    This field has no effect on DNS responses.
-    """
-
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+    """Complete DNS record name, including the zone name, in Punycode."""
 
-    ttl: TTLParam
+    ttl: Required[TTLParam]
     """Time To Live (TTL) of the DNS record in seconds.
 
     Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
     minimum reduced to 30 for Enterprise zones.
     """
 
-
-class NAPTRRecordData(TypedDict, total=False):
-    flags: str
-    """Flags."""
-
-    order: float
-    """Order."""
-
-    preference: float
-    """Preference."""
-
-    regex: str
-    """Regex."""
-
-    replacement: str
-    """Replacement."""
-
-    service: str
-    """Service."""
-
-
-class NSRecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    content: Required[str]
-    """A valid name server host name."""
-
-    name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
-
-    type: Required[Literal["NS"]]
+    type: Required[Literal["NAPTR"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: NAPTRRecordData
+    """Components of a NAPTR record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: NAPTRRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class NAPTRRecordData(TypedDict, total=False):
+    """Components of a NAPTR record."""
 
-class PTRRecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
+    flags: str
+    """Flags."""
 
-    content: Required[str]
-    """Domain name pointing to the address."""
+    order: float
+    """Order."""
 
-    name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    preference: float
+    """Preference."""
 
-    type: Required[Literal["PTR"]]
-    """Record type."""
+    regex: str
+    """Regex."""
 
-    id: str
-    """Identifier"""
+    replacement: str
+    """Replacement."""
 
-    comment: str
-    """Comments or notes about the DNS record.
+    service: str
+    """Service."""
 
-    This field has no effect on DNS responses.
-    """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+class NAPTRRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
 
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
 
 class SMIMEARecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[SMIMEARecordData]
-    """Components of a SMIMEA record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["SMIMEA"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: SMIMEARecordData
+    """Components of a SMIMEA record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: SMIMEARecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class SMIMEARecordData(TypedDict, total=False):
+    """Components of a SMIMEA record."""
+
     certificate: str
     """Certificate."""
 
@@ -668,51 +1167,67 @@ class SMIMEARecordData(TypedDict, total=False):
     """Usage."""
 
 
+class SMIMEARecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
 class SRVRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[SRVRecordData]
-    """Components of a SRV record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode.
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
 
-    For SRV records, the first label is normally a service and the second a protocol
-    name, each starting with an underscore.
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
     """
 
     type: Required[Literal["SRV"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: SRVRecordData
+    """Components of a SRV record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: SRVRecordSettings
+    """Settings for the DNS record."""
 
-class SRVRecordData(TypedDict, total=False):
-    name: str
-    """A valid hostname.
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
 
-    Deprecated in favor of the regular 'name' outside the data map. This data map
-    field represents the remainder of the full 'name' after the service and
-    protocol.
-    """
+
+class SRVRecordData(TypedDict, total=False):
+    """Components of a SRV record."""
 
     port: float
     """The port of the service."""
@@ -723,20 +1238,6 @@ class SRVRecordData(TypedDict, total=False):
     Records with lower priorities are preferred.
     """
 
-    proto: str
-    """A valid protocol, prefixed with an underscore.
-
-    Deprecated in favor of the regular 'name' outside the data map. This data map
-    field normally represents the second label of that 'name'.
-    """
-
-    service: str
-    """A service type, prefixed with an underscore.
-
-    Deprecated in favor of the regular 'name' outside the data map. This data map
-    field normally represents the first label of that 'name'.
-    """
-
     target: str
     """A valid hostname."""
 
@@ -744,130 +1245,214 @@ class SRVRecordData(TypedDict, total=False):
     """The record weight."""
 
 
+class SRVRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
 class SSHFPRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[SSHFPRecordData]
-    """Components of a SSHFP record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["SSHFP"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: SSHFPRecordData
+    """Components of a SSHFP record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: SSHFPRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class SSHFPRecordData(TypedDict, total=False):
+    """Components of a SSHFP record."""
+
     algorithm: float
-    """algorithm."""
+    """Algorithm."""
 
     fingerprint: str
-    """fingerprint."""
+    """Fingerprint."""
 
     type: float
-    """type."""
+    """Type."""
+
+
+class SSHFPRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
 
 
 class SVCBRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[SVCBRecordData]
-    """Components of a SVCB record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["SVCB"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: SVCBRecordData
+    """Components of a SVCB record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: SVCBRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class SVCBRecordData(TypedDict, total=False):
+    """Components of a SVCB record."""
+
     priority: float
-    """priority."""
+    """Priority."""
 
     target: str
-    """target."""
+    """Target."""
 
     value: str
-    """value."""
+    """Value."""
+
+
+class SVCBRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
 
 
 class TLSARecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[TLSARecordData]
-    """Components of a TLSA record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["TLSA"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: TLSARecordData
+    """Components of a TLSA record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: TLSARecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class TLSARecordData(TypedDict, total=False):
+    """Components of a TLSA record."""
+
     certificate: str
-    """certificate."""
+    """Certificate."""
 
     matching_type: float
     """Matching Type."""
@@ -879,79 +1464,74 @@ class TLSARecordData(TypedDict, total=False):
     """Usage."""
 
 
-class TXTRecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    content: Required[str]
-    """Text content for the record."""
-
-    name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
-
-    type: Required[Literal["TXT"]]
-    """Record type."""
-
-    id: str
-    """Identifier"""
-
-    comment: str
-    """Comments or notes about the DNS record.
+class TLSARecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
 
-    This field has no effect on DNS responses.
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
 
 class URIRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[URIRecordData]
-    """Components of a URI record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
 
-    priority: Required[float]
-    """Required for MX, SRV and URI records; unused by other record types.
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
 
-    Records with lower priorities are preferred.
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
     """
 
     type: Required[Literal["URI"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+    data: URIRecordData
+    """Components of a URI record."""
 
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    priority: float
+    """Required for MX, SRV and URI records; unused by other record types.
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    Records with lower priorities are preferred.
+    """
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: URIRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class URIRecordData(TypedDict, total=False):
+    """Components of a URI record."""
+
     target: str
     """The record content."""
 
@@ -959,25 +1539,46 @@ class URIRecordData(TypedDict, total=False):
     """The record weight."""
 
 
-RecordCreateParams = Union[
+class URIRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+RecordCreateParams: TypeAlias = Union[
     ARecord,
     AAAARecord,
+    CNAMERecord,
+    MXRecord,
+    NSRecord,
+    DNSRecordsOpenpgpkeyRecord,
+    PTRRecord,
+    TXTRecord,
     CAARecord,
     CERTRecord,
-    CNAMERecord,
     DNSKEYRecord,
     DSRecord,
     HTTPSRecord,
     LOCRecord,
-    MXRecord,
     NAPTRRecord,
-    NSRecord,
-    PTRRecord,
     SMIMEARecord,
     SRVRecord,
     SSHFPRecord,
     SVCBRecord,
     TLSARecord,
-    TXTRecord,
     URIRecord,
 ]
diff --git a/src/cloudflare/types/dns/record_delete_response.py b/src/cloudflare/types/dns/record_delete_response.py
index b01d800ed2b..7799bd37008 100644
--- a/src/cloudflare/types/dns/record_delete_response.py
+++ b/src/cloudflare/types/dns/record_delete_response.py
@@ -9,4 +9,4 @@
 
 class RecordDeleteResponse(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
diff --git a/src/cloudflare/types/dns/record_edit_params.py b/src/cloudflare/types/dns/record_edit_params.py
index 4162570edcc..279a325c2d3 100644
--- a/src/cloudflare/types/dns/record_edit_params.py
+++ b/src/cloudflare/types/dns/record_edit_params.py
@@ -2,104 +2,274 @@
 
 from __future__ import annotations
 
-from typing import List, Union
-from typing_extensions import Literal, Required, TypedDict
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
+from ..._types import SequenceNotStr
 from .ttl_param import TTLParam
 from .record_tags import RecordTags
 
 __all__ = [
     "RecordEditParams",
     "ARecord",
+    "ARecordSettings",
     "AAAARecord",
+    "AAAARecordSettings",
+    "CNAMERecord",
+    "CNAMERecordSettings",
+    "MXRecord",
+    "MXRecordSettings",
+    "NSRecord",
+    "NSRecordSettings",
+    "DNSRecordsOpenpgpkeyRecord",
+    "DNSRecordsOpenpgpkeyRecordSettings",
+    "PTRRecord",
+    "PTRRecordSettings",
+    "TXTRecord",
+    "TXTRecordSettings",
     "CAARecord",
     "CAARecordData",
+    "CAARecordSettings",
     "CERTRecord",
     "CERTRecordData",
-    "CNAMERecord",
+    "CERTRecordSettings",
     "DNSKEYRecord",
     "DNSKEYRecordData",
+    "DNSKEYRecordSettings",
     "DSRecord",
     "DSRecordData",
+    "DSRecordSettings",
     "HTTPSRecord",
     "HTTPSRecordData",
+    "HTTPSRecordSettings",
     "LOCRecord",
     "LOCRecordData",
-    "MXRecord",
+    "LOCRecordSettings",
     "NAPTRRecord",
     "NAPTRRecordData",
-    "NSRecord",
-    "PTRRecord",
+    "NAPTRRecordSettings",
     "SMIMEARecord",
     "SMIMEARecordData",
+    "SMIMEARecordSettings",
     "SRVRecord",
     "SRVRecordData",
+    "SRVRecordSettings",
     "SSHFPRecord",
     "SSHFPRecordData",
+    "SSHFPRecordSettings",
     "SVCBRecord",
     "SVCBRecordData",
+    "SVCBRecordSettings",
     "TLSARecord",
     "TLSARecordData",
-    "TXTRecord",
+    "TLSARecordSettings",
     "URIRecord",
     "URIRecordData",
+    "URIRecordSettings",
 ]
 
 
 class ARecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    content: Required[str]
-    """A valid IPv4 address."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["A"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
+    content: str
+    """A valid IPv4 address."""
+
     proxied: bool
     """
     Whether the record is receiving the performance and security benefits of
     Cloudflare.
     """
 
-    tags: List[RecordTags]
+    settings: ARecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
 
-    ttl: TTLParam
+
+class ARecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class AAAARecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
     """Time To Live (TTL) of the DNS record in seconds.
 
     Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
     minimum reduced to 30 for Enterprise zones.
     """
 
+    type: Required[Literal["AAAA"]]
+    """Record type."""
 
-class AAAARecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
 
-    content: Required[str]
+    content: str
     """A valid IPv6 address."""
 
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: AAAARecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class AAAARecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class CNAMERecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
 
-    type: Required[Literal["AAAA"]]
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["CNAME"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A valid hostname. Must not match the record's name."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: CNAMERecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class CNAMERecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    flatten_cname: bool
+    """
+    If enabled, causes the CNAME record to be resolved externally and the resulting
+    address records (e.g., A and AAAA) to be returned instead of the CNAME record
+    itself. This setting is unavailable for proxied records, since they are always
+    flattened.
+    """
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class MXRecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["MX"]]
+    """Record type."""
 
     comment: str
     """Comments or notes about the DNS record.
@@ -107,38 +277,241 @@ class AAAARecord(TypedDict, total=False):
     This field has no effect on DNS responses.
     """
 
+    content: str
+    """A valid mail server hostname."""
+
+    priority: float
+    """Required for MX, SRV and URI records; unused by other record types.
+
+    Records with lower priorities are preferred.
+    """
+
     proxied: bool
     """
     Whether the record is receiving the performance and security benefits of
     Cloudflare.
     """
 
-    tags: List[RecordTags]
+    settings: MXRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
 
-    ttl: TTLParam
+
+class MXRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class NSRecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
     """Time To Live (TTL) of the DNS record in seconds.
 
     Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
     minimum reduced to 30 for Enterprise zones.
     """
 
+    type: Required[Literal["NS"]]
+    """Record type."""
 
-class CAARecord(TypedDict, total=False):
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A valid name server host name."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: NSRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class NSRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class DNSRecordsOpenpgpkeyRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    data: Required[CAARecordData]
-    """Components of a CAA record."""
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["OPENPGPKEY"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)"""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: DNSRecordsOpenpgpkeyRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class DNSRecordsOpenpgpkeyRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class PTRRecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
 
-    type: Required[Literal["CAA"]]
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["PTR"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """Domain name pointing to the address."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: PTRRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class PTRRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class TXTRecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["TXT"]]
+    """Record type."""
 
     comment: str
     """Comments or notes about the DNS record.
@@ -146,18 +519,92 @@ class CAARecord(TypedDict, total=False):
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
+    content: str
+    """Text content for the record.
+
+    The content must consist of quoted "character strings" (RFC 1035), each with a
+    length of up to 255 bytes. Strings exceeding this allowed maximum length are
+    automatically split.
+
+    Learn more at
+    <https://www.cloudflare.com/learning/dns/dns-records/dns-txt-record/>.
+    """
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: TXTRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
 
-    ttl: TTLParam
+
+class TXTRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class CAARecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
     """Time To Live (TTL) of the DNS record in seconds.
 
     Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
     minimum reduced to 30 for Enterprise zones.
     """
 
+    type: Required[Literal["CAA"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    data: CAARecordData
+    """Components of a CAA record."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: CAARecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class CAARecordData(TypedDict, total=False):
+    """Components of a CAA record."""
+
     flags: float
     """Flags for the CAA record."""
 
@@ -168,40 +615,68 @@ class CAARecordData(TypedDict, total=False):
     """Value of the record. This field's semantics depend on the chosen tag."""
 
 
+class CAARecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
 class CERTRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[CERTRecordData]
-    """Components of a CERT record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["CERT"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: CERTRecordData
+    """Components of a CERT record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: CERTRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class CERTRecordData(TypedDict, total=False):
+    """Components of a CERT record."""
+
     algorithm: float
     """Algorithm."""
 
@@ -215,79 +690,68 @@ class CERTRecordData(TypedDict, total=False):
     """Type."""
 
 
-class CNAMERecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    content: Required[object]
-    """A valid hostname. Must not match the record's name."""
-
-    name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
-
-    type: Required[Literal["CNAME"]]
-    """Record type."""
-
-    id: str
-    """Identifier"""
+class CERTRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
 
-    comment: str
-    """Comments or notes about the DNS record.
-
-    This field has no effect on DNS responses.
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
-    proxied: bool
+    ipv6_only: bool
     """
-    Whether the record is receiving the performance and security benefits of
-    Cloudflare.
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
 
-    ttl: TTLParam
+class DNSKEYRecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
     """Time To Live (TTL) of the DNS record in seconds.
 
     Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
     minimum reduced to 30 for Enterprise zones.
     """
 
-
-class DNSKEYRecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[DNSKEYRecordData]
-    """Components of a DNSKEY record."""
-
-    name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
-
     type: Required[Literal["DNSKEY"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: DNSKEYRecordData
+    """Components of a DNSKEY record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: DNSKEYRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class DNSKEYRecordData(TypedDict, total=False):
+    """Components of a DNSKEY record."""
+
     algorithm: float
     """Algorithm."""
 
@@ -301,40 +765,68 @@ class DNSKEYRecordData(TypedDict, total=False):
     """Public Key."""
 
 
+class DNSKEYRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
 class DSRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[DSRecordData]
-    """Components of a DS record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["DS"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: DSRecordData
+    """Components of a DS record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: DSRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class DSRecordData(TypedDict, total=False):
+    """Components of a DS record."""
+
     algorithm: float
     """Algorithm."""
 
@@ -348,84 +840,140 @@ class DSRecordData(TypedDict, total=False):
     """Key Tag."""
 
 
+class DSRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
 class HTTPSRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[HTTPSRecordData]
-    """Components of a HTTPS record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["HTTPS"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: HTTPSRecordData
+    """Components of a HTTPS record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: HTTPSRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class HTTPSRecordData(TypedDict, total=False):
+    """Components of a HTTPS record."""
+
     priority: float
-    """priority."""
+    """Priority."""
 
     target: str
-    """target."""
+    """Target."""
 
     value: str
-    """value."""
+    """Value."""
+
+
+class HTTPSRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
 
 
 class LOCRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[LOCRecordData]
-    """Components of a LOC record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["LOC"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: LOCRecordData
+    """Components of a LOC record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: LOCRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class LOCRecordData(TypedDict, total=False):
+    """Components of a LOC record."""
+
     altitude: float
     """Altitude of location in meters."""
 
@@ -463,198 +1011,149 @@ class LOCRecordData(TypedDict, total=False):
     """Size of location in meters."""
 
 
-class MXRecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    content: Required[str]
-    """A valid mail server hostname."""
-
-    name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
-
-    priority: Required[float]
-    """Required for MX, SRV and URI records; unused by other record types.
+class LOCRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
 
-    Records with lower priorities are preferred.
+    ipv4_only: bool
     """
-
-    type: Required[Literal["MX"]]
-    """Record type."""
-
-    id: str
-    """Identifier"""
-
-    comment: str
-    """Comments or notes about the DNS record.
-
-    This field has no effect on DNS responses.
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
 
 class NAPTRRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[NAPTRRecordData]
-    """Components of a NAPTR record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
-
-    type: Required[Literal["NAPTR"]]
-    """Record type."""
-
-    id: str
-    """Identifier"""
-
-    comment: str
-    """Comments or notes about the DNS record.
-
-    This field has no effect on DNS responses.
-    """
-
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+    """Complete DNS record name, including the zone name, in Punycode."""
 
-    ttl: TTLParam
+    ttl: Required[TTLParam]
     """Time To Live (TTL) of the DNS record in seconds.
 
     Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
     minimum reduced to 30 for Enterprise zones.
     """
 
-
-class NAPTRRecordData(TypedDict, total=False):
-    flags: str
-    """Flags."""
-
-    order: float
-    """Order."""
-
-    preference: float
-    """Preference."""
-
-    regex: str
-    """Regex."""
-
-    replacement: str
-    """Replacement."""
-
-    service: str
-    """Service."""
-
-
-class NSRecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    content: Required[str]
-    """A valid name server host name."""
-
-    name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
-
-    type: Required[Literal["NS"]]
+    type: Required[Literal["NAPTR"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: NAPTRRecordData
+    """Components of a NAPTR record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: NAPTRRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class NAPTRRecordData(TypedDict, total=False):
+    """Components of a NAPTR record."""
 
-class PTRRecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
+    flags: str
+    """Flags."""
 
-    content: Required[str]
-    """Domain name pointing to the address."""
+    order: float
+    """Order."""
 
-    name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    preference: float
+    """Preference."""
 
-    type: Required[Literal["PTR"]]
-    """Record type."""
+    regex: str
+    """Regex."""
 
-    id: str
-    """Identifier"""
+    replacement: str
+    """Replacement."""
 
-    comment: str
-    """Comments or notes about the DNS record.
+    service: str
+    """Service."""
 
-    This field has no effect on DNS responses.
-    """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+class NAPTRRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
 
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
 
 class SMIMEARecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[SMIMEARecordData]
-    """Components of a SMIMEA record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["SMIMEA"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: SMIMEARecordData
+    """Components of a SMIMEA record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: SMIMEARecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class SMIMEARecordData(TypedDict, total=False):
+    """Components of a SMIMEA record."""
+
     certificate: str
     """Certificate."""
 
@@ -668,51 +1167,67 @@ class SMIMEARecordData(TypedDict, total=False):
     """Usage."""
 
 
+class SMIMEARecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
 class SRVRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[SRVRecordData]
-    """Components of a SRV record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode.
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
 
-    For SRV records, the first label is normally a service and the second a protocol
-    name, each starting with an underscore.
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
     """
 
     type: Required[Literal["SRV"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: SRVRecordData
+    """Components of a SRV record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: SRVRecordSettings
+    """Settings for the DNS record."""
 
-class SRVRecordData(TypedDict, total=False):
-    name: str
-    """A valid hostname.
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
 
-    Deprecated in favor of the regular 'name' outside the data map. This data map
-    field represents the remainder of the full 'name' after the service and
-    protocol.
-    """
+
+class SRVRecordData(TypedDict, total=False):
+    """Components of a SRV record."""
 
     port: float
     """The port of the service."""
@@ -723,20 +1238,6 @@ class SRVRecordData(TypedDict, total=False):
     Records with lower priorities are preferred.
     """
 
-    proto: str
-    """A valid protocol, prefixed with an underscore.
-
-    Deprecated in favor of the regular 'name' outside the data map. This data map
-    field normally represents the second label of that 'name'.
-    """
-
-    service: str
-    """A service type, prefixed with an underscore.
-
-    Deprecated in favor of the regular 'name' outside the data map. This data map
-    field normally represents the first label of that 'name'.
-    """
-
     target: str
     """A valid hostname."""
 
@@ -744,130 +1245,214 @@ class SRVRecordData(TypedDict, total=False):
     """The record weight."""
 
 
+class SRVRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
 class SSHFPRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[SSHFPRecordData]
-    """Components of a SSHFP record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["SSHFP"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: SSHFPRecordData
+    """Components of a SSHFP record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: SSHFPRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class SSHFPRecordData(TypedDict, total=False):
+    """Components of a SSHFP record."""
+
     algorithm: float
-    """algorithm."""
+    """Algorithm."""
 
     fingerprint: str
-    """fingerprint."""
+    """Fingerprint."""
 
     type: float
-    """type."""
+    """Type."""
+
+
+class SSHFPRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
 
 
 class SVCBRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[SVCBRecordData]
-    """Components of a SVCB record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["SVCB"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: SVCBRecordData
+    """Components of a SVCB record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: SVCBRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class SVCBRecordData(TypedDict, total=False):
+    """Components of a SVCB record."""
+
     priority: float
-    """priority."""
+    """Priority."""
 
     target: str
-    """target."""
+    """Target."""
 
     value: str
-    """value."""
+    """Value."""
+
+
+class SVCBRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
 
 
 class TLSARecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[TLSARecordData]
-    """Components of a TLSA record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["TLSA"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: TLSARecordData
+    """Components of a TLSA record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: TLSARecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class TLSARecordData(TypedDict, total=False):
+    """Components of a TLSA record."""
+
     certificate: str
-    """certificate."""
+    """Certificate."""
 
     matching_type: float
     """Matching Type."""
@@ -879,79 +1464,74 @@ class TLSARecordData(TypedDict, total=False):
     """Usage."""
 
 
-class TXTRecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    content: Required[str]
-    """Text content for the record."""
-
-    name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
-
-    type: Required[Literal["TXT"]]
-    """Record type."""
-
-    id: str
-    """Identifier"""
-
-    comment: str
-    """Comments or notes about the DNS record.
+class TLSARecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
 
-    This field has no effect on DNS responses.
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
 
 class URIRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[URIRecordData]
-    """Components of a URI record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
 
-    priority: Required[float]
-    """Required for MX, SRV and URI records; unused by other record types.
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
 
-    Records with lower priorities are preferred.
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
     """
 
     type: Required[Literal["URI"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+    data: URIRecordData
+    """Components of a URI record."""
 
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    priority: float
+    """Required for MX, SRV and URI records; unused by other record types.
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    Records with lower priorities are preferred.
+    """
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: URIRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class URIRecordData(TypedDict, total=False):
+    """Components of a URI record."""
+
     target: str
     """The record content."""
 
@@ -959,25 +1539,46 @@ class URIRecordData(TypedDict, total=False):
     """The record weight."""
 
 
-RecordEditParams = Union[
+class URIRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+RecordEditParams: TypeAlias = Union[
     ARecord,
     AAAARecord,
+    CNAMERecord,
+    MXRecord,
+    NSRecord,
+    DNSRecordsOpenpgpkeyRecord,
+    PTRRecord,
+    TXTRecord,
     CAARecord,
     CERTRecord,
-    CNAMERecord,
     DNSKEYRecord,
     DSRecord,
     HTTPSRecord,
     LOCRecord,
-    MXRecord,
     NAPTRRecord,
-    NSRecord,
-    PTRRecord,
     SMIMEARecord,
     SRVRecord,
     SSHFPRecord,
     SVCBRecord,
     TLSARecord,
-    TXTRecord,
     URIRecord,
 ]
diff --git a/src/cloudflare/types/dns/record_export_response.py b/src/cloudflare/types/dns/record_export_response.py
index 52bb53db11a..0f3ad8a590a 100644
--- a/src/cloudflare/types/dns/record_export_response.py
+++ b/src/cloudflare/types/dns/record_export_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["RecordExportResponse"]
 
-RecordExportResponse = str
+RecordExportResponse: TypeAlias = str
diff --git a/src/cloudflare/types/dns/record_import_params.py b/src/cloudflare/types/dns/record_import_params.py
index 0280a0e6453..36d58d3607c 100644
--- a/src/cloudflare/types/dns/record_import_params.py
+++ b/src/cloudflare/types/dns/record_import_params.py
@@ -9,7 +9,7 @@
 
 class RecordImportParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     file: Required[str]
     """BIND config to import.
diff --git a/src/cloudflare/types/dns/record_list_params.py b/src/cloudflare/types/dns/record_list_params.py
index 1effd2f75e9..c69ac2400bc 100644
--- a/src/cloudflare/types/dns/record_list_params.py
+++ b/src/cloudflare/types/dns/record_list_params.py
@@ -6,17 +6,16 @@
 
 from ..shared.sort_direction import SortDirection
 
-__all__ = ["RecordListParams", "Comment", "Tag"]
+__all__ = ["RecordListParams", "Comment", "Content", "Name", "Tag"]
 
 
 class RecordListParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     comment: Comment
 
-    content: str
-    """DNS record content."""
+    content: Content
 
     direction: SortDirection
     """Direction to order DNS records in."""
@@ -29,8 +28,7 @@ class RecordListParams(TypedDict, total=False):
     controlled by the `tag-match` parameter instead.
     """
 
-    name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    name: Name
 
     order: Literal["type", "name", "content", "ttl", "proxied"]
     """Field to order DNS records by."""
@@ -80,6 +78,7 @@ class RecordListParams(TypedDict, total=False):
         "MX",
         "NAPTR",
         "NS",
+        "OPENPGPKEY",
         "PTR",
         "SMIMEA",
         "SRV",
@@ -112,6 +111,34 @@ class Comment(TypedDict, total=False):
     """Prefix of the DNS record comment. Comment filters are case-insensitive."""
 
 
+class Content(TypedDict, total=False):
+    contains: str
+    """Substring of the DNS record content. Content filters are case-insensitive."""
+
+    endswith: str
+    """Suffix of the DNS record content. Content filters are case-insensitive."""
+
+    exact: str
+    """Exact value of the DNS record content. Content filters are case-insensitive."""
+
+    startswith: str
+    """Prefix of the DNS record content. Content filters are case-insensitive."""
+
+
+class Name(TypedDict, total=False):
+    contains: str
+    """Substring of the DNS record name. Name filters are case-insensitive."""
+
+    endswith: str
+    """Suffix of the DNS record name. Name filters are case-insensitive."""
+
+    exact: str
+    """Exact value of the DNS record name. Name filters are case-insensitive."""
+
+    startswith: str
+    """Prefix of the DNS record name. Name filters are case-insensitive."""
+
+
 class Tag(TypedDict, total=False):
     absent: str
     """Name of a tag which must _not_ be present on the DNS record.
diff --git a/src/cloudflare/types/dns/record_metadata.py b/src/cloudflare/types/dns/record_metadata.py
deleted file mode 100644
index f2e67cdb214..00000000000
--- a/src/cloudflare/types/dns/record_metadata.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ..._models import BaseModel
-
-__all__ = ["RecordMetadata"]
-
-
-class RecordMetadata(BaseModel):
-    auto_added: Optional[bool] = None
-    """
-    Will exist if Cloudflare automatically added this DNS record during initial
-    setup.
-    """
-
-    source: Optional[str] = None
-    """Where the record originated from."""
diff --git a/src/cloudflare/types/dns/record_process_timing.py b/src/cloudflare/types/dns/record_process_timing.py
deleted file mode 100644
index 1fc4d7db12a..00000000000
--- a/src/cloudflare/types/dns/record_process_timing.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from datetime import datetime
-
-from ..._models import BaseModel
-
-__all__ = ["RecordProcessTiming"]
-
-
-class RecordProcessTiming(BaseModel):
-    end_time: Optional[datetime] = None
-    """When the file parsing ended."""
-
-    process_time: Optional[float] = None
-    """Processing time of the file in seconds."""
-
-    start_time: Optional[datetime] = None
-    """When the file parsing started."""
diff --git a/src/cloudflare/types/dns/record_response.py b/src/cloudflare/types/dns/record_response.py
new file mode 100644
index 00000000000..0c597eeb184
--- /dev/null
+++ b/src/cloudflare/types/dns/record_response.py
@@ -0,0 +1,621 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from .ttl import TTL
+from ..._utils import PropertyInfo
+from .a_record import ARecord
+from ..._models import BaseModel
+from .ds_record import DSRecord
+from .mx_record import MXRecord
+from .ns_record import NSRecord
+from .caa_record import CAARecord
+from .loc_record import LOCRecord
+from .ptr_record import PTRRecord
+from .srv_record import SRVRecord
+from .txt_record import TXTRecord
+from .uri_record import URIRecord
+from .aaaa_record import AAAARecord
+from .cert_record import CERTRecord
+from .record_tags import RecordTags
+from .svcb_record import SVCBRecord
+from .tlsa_record import TLSARecord
+from .cname_record import CNAMERecord
+from .https_record import HTTPSRecord
+from .naptr_record import NAPTRRecord
+from .sshfp_record import SSHFPRecord
+from .dnskey_record import DNSKEYRecord
+from .smimea_record import SMIMEARecord
+
+__all__ = [
+    "RecordResponse",
+    "A",
+    "AAAA",
+    "CNAME",
+    "MX",
+    "NS",
+    "Openpgpkey",
+    "OpenpgpkeySettings",
+    "PTR",
+    "TXT",
+    "CAA",
+    "CERT",
+    "DNSKEY",
+    "DS",
+    "HTTPS",
+    "LOC",
+    "NAPTR",
+    "SMIMEA",
+    "SRV",
+    "SSHFP",
+    "SVCB",
+    "TLSA",
+    "URI",
+]
+
+
+class A(ARecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class AAAA(AAAARecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class CNAME(CNAMERecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class MX(MXRecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class NS(NSRecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class OpenpgpkeySettings(BaseModel):
+    """Settings for the DNS record."""
+
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class Openpgpkey(BaseModel):
+    id: str
+    """Identifier."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)"""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    name: str
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: OpenpgpkeySettings
+    """Settings for the DNS record."""
+
+    tags: List[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Literal["OPENPGPKEY"]
+    """Record type."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class PTR(PTRRecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class TXT(TXTRecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class CAA(CAARecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class CERT(CERTRecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class DNSKEY(DNSKEYRecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class DS(DSRecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class HTTPS(HTTPSRecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class LOC(LOCRecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class NAPTR(NAPTRRecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class SMIMEA(SMIMEARecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class SRV(SRVRecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class SSHFP(SSHFPRecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class SVCB(SVCBRecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class TLSA(TLSARecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+class URI(URIRecord):
+    id: str
+    """Identifier."""
+
+    created_on: datetime
+    """When the record was created."""
+
+    meta: object
+    """Extra Cloudflare-specific information about the record."""
+
+    modified_on: datetime
+    """When the record was last modified."""
+
+    proxiable: bool
+    """Whether the record can be proxied by Cloudflare or not."""
+
+    comment_modified_on: Optional[datetime] = None
+    """When the record comment was last modified. Omitted if there is no comment."""
+
+    tags_modified_on: Optional[datetime] = None
+    """When the record tags were last modified. Omitted if there are no tags."""
+
+
+RecordResponse: TypeAlias = Annotated[
+    Union[
+        A,
+        AAAA,
+        CNAME,
+        MX,
+        NS,
+        Openpgpkey,
+        PTR,
+        TXT,
+        CAA,
+        CERT,
+        DNSKEY,
+        DS,
+        HTTPS,
+        LOC,
+        NAPTR,
+        SMIMEA,
+        SRV,
+        SSHFP,
+        SVCB,
+        TLSA,
+        URI,
+    ],
+    PropertyInfo(discriminator="type"),
+]
diff --git a/src/cloudflare/types/dns/record_scan_params.py b/src/cloudflare/types/dns/record_scan_params.py
index 070a021300f..096c48fc645 100644
--- a/src/cloudflare/types/dns/record_scan_params.py
+++ b/src/cloudflare/types/dns/record_scan_params.py
@@ -9,6 +9,6 @@
 
 class RecordScanParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     body: Required[object]
diff --git a/src/cloudflare/types/dns/record_scan_review_params.py b/src/cloudflare/types/dns/record_scan_review_params.py
new file mode 100644
index 00000000000..249dba460f3
--- /dev/null
+++ b/src/cloudflare/types/dns/record_scan_review_params.py
@@ -0,0 +1,133 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+from .a_record_param import ARecordParam
+from .ds_record_param import DSRecordParam
+from .mx_record_param import MXRecordParam
+from .ns_record_param import NSRecordParam
+from .caa_record_param import CAARecordParam
+from .loc_record_param import LOCRecordParam
+from .ptr_record_param import PTRRecordParam
+from .srv_record_param import SRVRecordParam
+from .txt_record_param import TXTRecordParam
+from .uri_record_param import URIRecordParam
+from .aaaa_record_param import AAAARecordParam
+from .cert_record_param import CERTRecordParam
+from .svcb_record_param import SVCBRecordParam
+from .tlsa_record_param import TLSARecordParam
+from .cname_record_param import CNAMERecordParam
+from .https_record_param import HTTPSRecordParam
+from .naptr_record_param import NAPTRRecordParam
+from .sshfp_record_param import SSHFPRecordParam
+from .dnskey_record_param import DNSKEYRecordParam
+from .smimea_record_param import SMIMEARecordParam
+
+__all__ = [
+    "RecordScanReviewParams",
+    "Accept",
+    "AcceptDNSRecordsOpenpgpkeyRecord",
+    "AcceptDNSRecordsOpenpgpkeyRecordSettings",
+    "Reject",
+]
+
+
+class RecordScanReviewParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    accepts: Iterable[Accept]
+
+    rejects: Iterable[Reject]
+
+
+class AcceptDNSRecordsOpenpgpkeyRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class AcceptDNSRecordsOpenpgpkeyRecord(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["OPENPGPKEY"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)"""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: AcceptDNSRecordsOpenpgpkeyRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+Accept: TypeAlias = Union[
+    ARecordParam,
+    AAAARecordParam,
+    CNAMERecordParam,
+    MXRecordParam,
+    NSRecordParam,
+    AcceptDNSRecordsOpenpgpkeyRecord,
+    PTRRecordParam,
+    TXTRecordParam,
+    CAARecordParam,
+    CERTRecordParam,
+    DNSKEYRecordParam,
+    DSRecordParam,
+    HTTPSRecordParam,
+    LOCRecordParam,
+    NAPTRRecordParam,
+    SMIMEARecordParam,
+    SRVRecordParam,
+    SSHFPRecordParam,
+    SVCBRecordParam,
+    TLSARecordParam,
+    URIRecordParam,
+]
+
+
+class Reject(TypedDict, total=False):
+    id: Required[str]
+    """Identifier."""
diff --git a/src/cloudflare/types/dns/record_scan_review_response.py b/src/cloudflare/types/dns/record_scan_review_response.py
new file mode 100644
index 00000000000..df01c1eb592
--- /dev/null
+++ b/src/cloudflare/types/dns/record_scan_review_response.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+from .record_response import RecordResponse
+
+__all__ = ["RecordScanReviewResponse"]
+
+
+class RecordScanReviewResponse(BaseModel):
+    accepts: Optional[List[RecordResponse]] = None
+
+    rejects: Optional[List[str]] = None
diff --git a/src/cloudflare/types/dns/record_scan_trigger_response.py b/src/cloudflare/types/dns/record_scan_trigger_response.py
new file mode 100644
index 00000000000..b328db7b173
--- /dev/null
+++ b/src/cloudflare/types/dns/record_scan_trigger_response.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["RecordScanTriggerResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class RecordScanTriggerResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/dns/record_tags.py b/src/cloudflare/types/dns/record_tags.py
index 202ad9b305e..0e3cb22ffd1 100644
--- a/src/cloudflare/types/dns/record_tags.py
+++ b/src/cloudflare/types/dns/record_tags.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["RecordTags"]
 
-RecordTags = str
+RecordTags: TypeAlias = str
diff --git a/src/cloudflare/types/dns/record_update_params.py b/src/cloudflare/types/dns/record_update_params.py
index 743522c6331..d714d8c4ee4 100644
--- a/src/cloudflare/types/dns/record_update_params.py
+++ b/src/cloudflare/types/dns/record_update_params.py
@@ -2,104 +2,274 @@
 
 from __future__ import annotations
 
-from typing import List, Union
-from typing_extensions import Literal, Required, TypedDict
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
+from ..._types import SequenceNotStr
 from .ttl_param import TTLParam
 from .record_tags import RecordTags
 
 __all__ = [
     "RecordUpdateParams",
     "ARecord",
+    "ARecordSettings",
     "AAAARecord",
+    "AAAARecordSettings",
+    "CNAMERecord",
+    "CNAMERecordSettings",
+    "MXRecord",
+    "MXRecordSettings",
+    "NSRecord",
+    "NSRecordSettings",
+    "DNSRecordsOpenpgpkeyRecord",
+    "DNSRecordsOpenpgpkeyRecordSettings",
+    "PTRRecord",
+    "PTRRecordSettings",
+    "TXTRecord",
+    "TXTRecordSettings",
     "CAARecord",
     "CAARecordData",
+    "CAARecordSettings",
     "CERTRecord",
     "CERTRecordData",
-    "CNAMERecord",
+    "CERTRecordSettings",
     "DNSKEYRecord",
     "DNSKEYRecordData",
+    "DNSKEYRecordSettings",
     "DSRecord",
     "DSRecordData",
+    "DSRecordSettings",
     "HTTPSRecord",
     "HTTPSRecordData",
+    "HTTPSRecordSettings",
     "LOCRecord",
     "LOCRecordData",
-    "MXRecord",
+    "LOCRecordSettings",
     "NAPTRRecord",
     "NAPTRRecordData",
-    "NSRecord",
-    "PTRRecord",
+    "NAPTRRecordSettings",
     "SMIMEARecord",
     "SMIMEARecordData",
+    "SMIMEARecordSettings",
     "SRVRecord",
     "SRVRecordData",
+    "SRVRecordSettings",
     "SSHFPRecord",
     "SSHFPRecordData",
+    "SSHFPRecordSettings",
     "SVCBRecord",
     "SVCBRecordData",
+    "SVCBRecordSettings",
     "TLSARecord",
     "TLSARecordData",
-    "TXTRecord",
+    "TLSARecordSettings",
     "URIRecord",
     "URIRecordData",
+    "URIRecordSettings",
 ]
 
 
 class ARecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    content: Required[str]
-    """A valid IPv4 address."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["A"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
+    content: str
+    """A valid IPv4 address."""
+
     proxied: bool
     """
     Whether the record is receiving the performance and security benefits of
     Cloudflare.
     """
 
-    tags: List[RecordTags]
+    settings: ARecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
 
-    ttl: TTLParam
+
+class ARecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class AAAARecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
     """Time To Live (TTL) of the DNS record in seconds.
 
     Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
     minimum reduced to 30 for Enterprise zones.
     """
 
+    type: Required[Literal["AAAA"]]
+    """Record type."""
 
-class AAAARecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
 
-    content: Required[str]
+    content: str
     """A valid IPv6 address."""
 
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: AAAARecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class AAAARecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class CNAMERecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
 
-    type: Required[Literal["AAAA"]]
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["CNAME"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A valid hostname. Must not match the record's name."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: CNAMERecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class CNAMERecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    flatten_cname: bool
+    """
+    If enabled, causes the CNAME record to be resolved externally and the resulting
+    address records (e.g., A and AAAA) to be returned instead of the CNAME record
+    itself. This setting is unavailable for proxied records, since they are always
+    flattened.
+    """
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class MXRecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["MX"]]
+    """Record type."""
 
     comment: str
     """Comments or notes about the DNS record.
@@ -107,38 +277,241 @@ class AAAARecord(TypedDict, total=False):
     This field has no effect on DNS responses.
     """
 
+    content: str
+    """A valid mail server hostname."""
+
+    priority: float
+    """Required for MX, SRV and URI records; unused by other record types.
+
+    Records with lower priorities are preferred.
+    """
+
     proxied: bool
     """
     Whether the record is receiving the performance and security benefits of
     Cloudflare.
     """
 
-    tags: List[RecordTags]
+    settings: MXRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
 
-    ttl: TTLParam
+
+class MXRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class NSRecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
     """Time To Live (TTL) of the DNS record in seconds.
 
     Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
     minimum reduced to 30 for Enterprise zones.
     """
 
+    type: Required[Literal["NS"]]
+    """Record type."""
 
-class CAARecord(TypedDict, total=False):
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A valid name server host name."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: NSRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class NSRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class DNSRecordsOpenpgpkeyRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    data: Required[CAARecordData]
-    """Components of a CAA record."""
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["OPENPGPKEY"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)"""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: DNSRecordsOpenpgpkeyRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class DNSRecordsOpenpgpkeyRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class PTRRecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
 
-    type: Required[Literal["CAA"]]
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["PTR"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """Domain name pointing to the address."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: PTRRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class PTRRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class TXTRecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["TXT"]]
+    """Record type."""
 
     comment: str
     """Comments or notes about the DNS record.
@@ -146,18 +519,92 @@ class CAARecord(TypedDict, total=False):
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
+    content: str
+    """Text content for the record.
+
+    The content must consist of quoted "character strings" (RFC 1035), each with a
+    length of up to 255 bytes. Strings exceeding this allowed maximum length are
+    automatically split.
+
+    Learn more at
+    <https://www.cloudflare.com/learning/dns/dns-records/dns-txt-record/>.
+    """
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: TXTRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
 
-    ttl: TTLParam
+
+class TXTRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class CAARecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
     """Time To Live (TTL) of the DNS record in seconds.
 
     Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
     minimum reduced to 30 for Enterprise zones.
     """
 
+    type: Required[Literal["CAA"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    data: CAARecordData
+    """Components of a CAA record."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: CAARecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class CAARecordData(TypedDict, total=False):
+    """Components of a CAA record."""
+
     flags: float
     """Flags for the CAA record."""
 
@@ -168,40 +615,68 @@ class CAARecordData(TypedDict, total=False):
     """Value of the record. This field's semantics depend on the chosen tag."""
 
 
+class CAARecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
 class CERTRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[CERTRecordData]
-    """Components of a CERT record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["CERT"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: CERTRecordData
+    """Components of a CERT record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: CERTRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class CERTRecordData(TypedDict, total=False):
+    """Components of a CERT record."""
+
     algorithm: float
     """Algorithm."""
 
@@ -215,79 +690,68 @@ class CERTRecordData(TypedDict, total=False):
     """Type."""
 
 
-class CNAMERecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    content: Required[object]
-    """A valid hostname. Must not match the record's name."""
-
-    name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
-
-    type: Required[Literal["CNAME"]]
-    """Record type."""
-
-    id: str
-    """Identifier"""
+class CERTRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
 
-    comment: str
-    """Comments or notes about the DNS record.
-
-    This field has no effect on DNS responses.
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
-    proxied: bool
+    ipv6_only: bool
     """
-    Whether the record is receiving the performance and security benefits of
-    Cloudflare.
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
 
-    ttl: TTLParam
+class DNSKEYRecord(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
     """Time To Live (TTL) of the DNS record in seconds.
 
     Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
     minimum reduced to 30 for Enterprise zones.
     """
 
-
-class DNSKEYRecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[DNSKEYRecordData]
-    """Components of a DNSKEY record."""
-
-    name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
-
     type: Required[Literal["DNSKEY"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: DNSKEYRecordData
+    """Components of a DNSKEY record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: DNSKEYRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class DNSKEYRecordData(TypedDict, total=False):
+    """Components of a DNSKEY record."""
+
     algorithm: float
     """Algorithm."""
 
@@ -301,40 +765,68 @@ class DNSKEYRecordData(TypedDict, total=False):
     """Public Key."""
 
 
+class DNSKEYRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
 class DSRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[DSRecordData]
-    """Components of a DS record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["DS"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: DSRecordData
+    """Components of a DS record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: DSRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class DSRecordData(TypedDict, total=False):
+    """Components of a DS record."""
+
     algorithm: float
     """Algorithm."""
 
@@ -348,84 +840,140 @@ class DSRecordData(TypedDict, total=False):
     """Key Tag."""
 
 
+class DSRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
 class HTTPSRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[HTTPSRecordData]
-    """Components of a HTTPS record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["HTTPS"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: HTTPSRecordData
+    """Components of a HTTPS record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: HTTPSRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class HTTPSRecordData(TypedDict, total=False):
+    """Components of a HTTPS record."""
+
     priority: float
-    """priority."""
+    """Priority."""
 
     target: str
-    """target."""
+    """Target."""
 
     value: str
-    """value."""
+    """Value."""
+
+
+class HTTPSRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
 
 
 class LOCRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[LOCRecordData]
-    """Components of a LOC record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["LOC"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: LOCRecordData
+    """Components of a LOC record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: LOCRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class LOCRecordData(TypedDict, total=False):
+    """Components of a LOC record."""
+
     altitude: float
     """Altitude of location in meters."""
 
@@ -463,198 +1011,149 @@ class LOCRecordData(TypedDict, total=False):
     """Size of location in meters."""
 
 
-class MXRecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    content: Required[str]
-    """A valid mail server hostname."""
-
-    name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
-
-    priority: Required[float]
-    """Required for MX, SRV and URI records; unused by other record types.
+class LOCRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
 
-    Records with lower priorities are preferred.
+    ipv4_only: bool
     """
-
-    type: Required[Literal["MX"]]
-    """Record type."""
-
-    id: str
-    """Identifier"""
-
-    comment: str
-    """Comments or notes about the DNS record.
-
-    This field has no effect on DNS responses.
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
 
 class NAPTRRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[NAPTRRecordData]
-    """Components of a NAPTR record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
-
-    type: Required[Literal["NAPTR"]]
-    """Record type."""
-
-    id: str
-    """Identifier"""
-
-    comment: str
-    """Comments or notes about the DNS record.
-
-    This field has no effect on DNS responses.
-    """
-
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+    """Complete DNS record name, including the zone name, in Punycode."""
 
-    ttl: TTLParam
+    ttl: Required[TTLParam]
     """Time To Live (TTL) of the DNS record in seconds.
 
     Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
     minimum reduced to 30 for Enterprise zones.
     """
 
-
-class NAPTRRecordData(TypedDict, total=False):
-    flags: str
-    """Flags."""
-
-    order: float
-    """Order."""
-
-    preference: float
-    """Preference."""
-
-    regex: str
-    """Regex."""
-
-    replacement: str
-    """Replacement."""
-
-    service: str
-    """Service."""
-
-
-class NSRecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    content: Required[str]
-    """A valid name server host name."""
-
-    name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
-
-    type: Required[Literal["NS"]]
+    type: Required[Literal["NAPTR"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: NAPTRRecordData
+    """Components of a NAPTR record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: NAPTRRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
+
+class NAPTRRecordData(TypedDict, total=False):
+    """Components of a NAPTR record."""
 
-class PTRRecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
+    flags: str
+    """Flags."""
 
-    content: Required[str]
-    """Domain name pointing to the address."""
+    order: float
+    """Order."""
 
-    name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    preference: float
+    """Preference."""
 
-    type: Required[Literal["PTR"]]
-    """Record type."""
+    regex: str
+    """Regex."""
 
-    id: str
-    """Identifier"""
+    replacement: str
+    """Replacement."""
 
-    comment: str
-    """Comments or notes about the DNS record.
+    service: str
+    """Service."""
 
-    This field has no effect on DNS responses.
-    """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+class NAPTRRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
 
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
 
 class SMIMEARecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[SMIMEARecordData]
-    """Components of a SMIMEA record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["SMIMEA"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: SMIMEARecordData
+    """Components of a SMIMEA record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: SMIMEARecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class SMIMEARecordData(TypedDict, total=False):
+    """Components of a SMIMEA record."""
+
     certificate: str
     """Certificate."""
 
@@ -668,51 +1167,67 @@ class SMIMEARecordData(TypedDict, total=False):
     """Usage."""
 
 
+class SMIMEARecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
 class SRVRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[SRVRecordData]
-    """Components of a SRV record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode.
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
 
-    For SRV records, the first label is normally a service and the second a protocol
-    name, each starting with an underscore.
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
     """
 
     type: Required[Literal["SRV"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: SRVRecordData
+    """Components of a SRV record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: SRVRecordSettings
+    """Settings for the DNS record."""
 
-class SRVRecordData(TypedDict, total=False):
-    name: str
-    """A valid hostname.
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
 
-    Deprecated in favor of the regular 'name' outside the data map. This data map
-    field represents the remainder of the full 'name' after the service and
-    protocol.
-    """
+
+class SRVRecordData(TypedDict, total=False):
+    """Components of a SRV record."""
 
     port: float
     """The port of the service."""
@@ -723,20 +1238,6 @@ class SRVRecordData(TypedDict, total=False):
     Records with lower priorities are preferred.
     """
 
-    proto: str
-    """A valid protocol, prefixed with an underscore.
-
-    Deprecated in favor of the regular 'name' outside the data map. This data map
-    field normally represents the second label of that 'name'.
-    """
-
-    service: str
-    """A service type, prefixed with an underscore.
-
-    Deprecated in favor of the regular 'name' outside the data map. This data map
-    field normally represents the first label of that 'name'.
-    """
-
     target: str
     """A valid hostname."""
 
@@ -744,130 +1245,214 @@ class SRVRecordData(TypedDict, total=False):
     """The record weight."""
 
 
+class SRVRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
 class SSHFPRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[SSHFPRecordData]
-    """Components of a SSHFP record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["SSHFP"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: SSHFPRecordData
+    """Components of a SSHFP record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: SSHFPRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class SSHFPRecordData(TypedDict, total=False):
+    """Components of a SSHFP record."""
+
     algorithm: float
-    """algorithm."""
+    """Algorithm."""
 
     fingerprint: str
-    """fingerprint."""
+    """Fingerprint."""
 
     type: float
-    """type."""
+    """Type."""
+
+
+class SSHFPRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
 
 
 class SVCBRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[SVCBRecordData]
-    """Components of a SVCB record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["SVCB"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: SVCBRecordData
+    """Components of a SVCB record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: SVCBRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class SVCBRecordData(TypedDict, total=False):
+    """Components of a SVCB record."""
+
     priority: float
-    """priority."""
+    """Priority."""
 
     target: str
-    """target."""
+    """Target."""
 
     value: str
-    """value."""
+    """Value."""
+
+
+class SVCBRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
 
 
 class TLSARecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[TLSARecordData]
-    """Components of a TLSA record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Required[Literal["TLSA"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    data: TLSARecordData
+    """Components of a TLSA record."""
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: TLSARecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class TLSARecordData(TypedDict, total=False):
+    """Components of a TLSA record."""
+
     certificate: str
-    """certificate."""
+    """Certificate."""
 
     matching_type: float
     """Matching Type."""
@@ -879,79 +1464,74 @@ class TLSARecordData(TypedDict, total=False):
     """Usage."""
 
 
-class TXTRecord(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    content: Required[str]
-    """Text content for the record."""
-
-    name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
-
-    type: Required[Literal["TXT"]]
-    """Record type."""
-
-    id: str
-    """Identifier"""
-
-    comment: str
-    """Comments or notes about the DNS record.
+class TLSARecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
 
-    This field has no effect on DNS responses.
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
     """
 
 
 class URIRecord(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
-
-    data: Required[URIRecordData]
-    """Components of a URI record."""
+    """Identifier."""
 
     name: Required[str]
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
 
-    priority: Required[float]
-    """Required for MX, SRV and URI records; unused by other record types.
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
 
-    Records with lower priorities are preferred.
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
     """
 
     type: Required[Literal["URI"]]
     """Record type."""
 
-    id: str
-    """Identifier"""
-
     comment: str
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    tags: List[RecordTags]
-    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+    data: URIRecordData
+    """Components of a URI record."""
 
-    ttl: TTLParam
-    """Time To Live (TTL) of the DNS record in seconds.
+    priority: float
+    """Required for MX, SRV and URI records; unused by other record types.
 
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
+    Records with lower priorities are preferred.
+    """
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
     """
 
+    settings: URIRecordSettings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
+
 
 class URIRecordData(TypedDict, total=False):
+    """Components of a URI record."""
+
     target: str
     """The record content."""
 
@@ -959,25 +1539,46 @@ class URIRecordData(TypedDict, total=False):
     """The record weight."""
 
 
-RecordUpdateParams = Union[
+class URIRecordSettings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+RecordUpdateParams: TypeAlias = Union[
     ARecord,
     AAAARecord,
+    CNAMERecord,
+    MXRecord,
+    NSRecord,
+    DNSRecordsOpenpgpkeyRecord,
+    PTRRecord,
+    TXTRecord,
     CAARecord,
     CERTRecord,
-    CNAMERecord,
     DNSKEYRecord,
     DSRecord,
     HTTPSRecord,
     LOCRecord,
-    MXRecord,
     NAPTRRecord,
-    NSRecord,
-    PTRRecord,
     SMIMEARecord,
     SRVRecord,
     SSHFPRecord,
     SVCBRecord,
     TLSARecord,
-    TXTRecord,
     URIRecord,
 ]
diff --git a/src/cloudflare/types/dns/setting_edit_params.py b/src/cloudflare/types/dns/setting_edit_params.py
deleted file mode 100644
index 1ac1ba3eeae..00000000000
--- a/src/cloudflare/types/dns/setting_edit_params.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import TypedDict
-
-from .dns_setting_param import DNSSettingParam
-
-__all__ = ["SettingEditParams"]
-
-
-class SettingEditParams(TypedDict, total=False):
-    account_id: str
-    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
-
-    zone_id: str
-    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
-
-    zone_defaults: DNSSettingParam
diff --git a/src/cloudflare/types/dns/setting_edit_response.py b/src/cloudflare/types/dns/setting_edit_response.py
deleted file mode 100644
index 87a73a5356f..00000000000
--- a/src/cloudflare/types/dns/setting_edit_response.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ..._models import BaseModel
-from .dns_setting import DNSSetting
-
-__all__ = ["SettingEditResponse"]
-
-
-class SettingEditResponse(BaseModel):
-    zone_defaults: Optional[DNSSetting] = None
diff --git a/src/cloudflare/types/dns/setting_get_response.py b/src/cloudflare/types/dns/setting_get_response.py
deleted file mode 100644
index 42c33600842..00000000000
--- a/src/cloudflare/types/dns/setting_get_response.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ..._models import BaseModel
-from .dns_setting import DNSSetting
-
-__all__ = ["SettingGetResponse"]
-
-
-class SettingGetResponse(BaseModel):
-    zone_defaults: Optional[DNSSetting] = None
diff --git a/src/cloudflare/types/dns/settings/__init__.py b/src/cloudflare/types/dns/settings/__init__.py
new file mode 100644
index 00000000000..1c775ded108
--- /dev/null
+++ b/src/cloudflare/types/dns/settings/__init__.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .zone_edit_params import ZoneEditParams as ZoneEditParams
+from .zone_get_response import ZoneGetResponse as ZoneGetResponse
+from .zone_edit_response import ZoneEditResponse as ZoneEditResponse
+from .account_edit_params import AccountEditParams as AccountEditParams
+from .account_get_response import AccountGetResponse as AccountGetResponse
+from .account_edit_response import AccountEditResponse as AccountEditResponse
diff --git a/src/cloudflare/types/dns/settings/account/__init__.py b/src/cloudflare/types/dns/settings/account/__init__.py
new file mode 100644
index 00000000000..f0f5e0851cc
--- /dev/null
+++ b/src/cloudflare/types/dns/settings/account/__init__.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .view_edit_params import ViewEditParams as ViewEditParams
+from .view_list_params import ViewListParams as ViewListParams
+from .view_get_response import ViewGetResponse as ViewGetResponse
+from .view_create_params import ViewCreateParams as ViewCreateParams
+from .view_edit_response import ViewEditResponse as ViewEditResponse
+from .view_list_response import ViewListResponse as ViewListResponse
+from .view_create_response import ViewCreateResponse as ViewCreateResponse
+from .view_delete_response import ViewDeleteResponse as ViewDeleteResponse
diff --git a/src/cloudflare/types/dns/settings/account/view_create_params.py b/src/cloudflare/types/dns/settings/account/view_create_params.py
new file mode 100644
index 00000000000..52f64cd69cf
--- /dev/null
+++ b/src/cloudflare/types/dns/settings/account/view_create_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ....._types import SequenceNotStr
+
+__all__ = ["ViewCreateParams"]
+
+
+class ViewCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """The name of the view."""
+
+    zones: Required[SequenceNotStr[str]]
+    """The list of zones linked to this view."""
diff --git a/src/cloudflare/types/dns/settings/account/view_create_response.py b/src/cloudflare/types/dns/settings/account/view_create_response.py
new file mode 100644
index 00000000000..78792e1795f
--- /dev/null
+++ b/src/cloudflare/types/dns/settings/account/view_create_response.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+
+from ....._models import BaseModel
+
+__all__ = ["ViewCreateResponse"]
+
+
+class ViewCreateResponse(BaseModel):
+    id: str
+    """Identifier."""
+
+    created_time: datetime
+    """When the view was created."""
+
+    modified_time: datetime
+    """When the view was last modified."""
+
+    name: str
+    """The name of the view."""
+
+    zones: List[str]
+    """The list of zones linked to this view."""
diff --git a/src/cloudflare/types/dns/settings/account/view_delete_response.py b/src/cloudflare/types/dns/settings/account/view_delete_response.py
new file mode 100644
index 00000000000..da28718be30
--- /dev/null
+++ b/src/cloudflare/types/dns/settings/account/view_delete_response.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ....._models import BaseModel
+
+__all__ = ["ViewDeleteResponse"]
+
+
+class ViewDeleteResponse(BaseModel):
+    id: Optional[str] = None
+    """Identifier."""
diff --git a/src/cloudflare/types/dns/settings/account/view_edit_params.py b/src/cloudflare/types/dns/settings/account/view_edit_params.py
new file mode 100644
index 00000000000..9160eb261e7
--- /dev/null
+++ b/src/cloudflare/types/dns/settings/account/view_edit_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ....._types import SequenceNotStr
+
+__all__ = ["ViewEditParams"]
+
+
+class ViewEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    name: str
+    """The name of the view."""
+
+    zones: SequenceNotStr[str]
+    """The list of zones linked to this view."""
diff --git a/src/cloudflare/types/dns/settings/account/view_edit_response.py b/src/cloudflare/types/dns/settings/account/view_edit_response.py
new file mode 100644
index 00000000000..8c475b5d85f
--- /dev/null
+++ b/src/cloudflare/types/dns/settings/account/view_edit_response.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+
+from ....._models import BaseModel
+
+__all__ = ["ViewEditResponse"]
+
+
+class ViewEditResponse(BaseModel):
+    id: str
+    """Identifier."""
+
+    created_time: datetime
+    """When the view was created."""
+
+    modified_time: datetime
+    """When the view was last modified."""
+
+    name: str
+    """The name of the view."""
+
+    zones: List[str]
+    """The list of zones linked to this view."""
diff --git a/src/cloudflare/types/dns/settings/account/view_get_response.py b/src/cloudflare/types/dns/settings/account/view_get_response.py
new file mode 100644
index 00000000000..1091c669c22
--- /dev/null
+++ b/src/cloudflare/types/dns/settings/account/view_get_response.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+
+from ....._models import BaseModel
+
+__all__ = ["ViewGetResponse"]
+
+
+class ViewGetResponse(BaseModel):
+    id: str
+    """Identifier."""
+
+    created_time: datetime
+    """When the view was created."""
+
+    modified_time: datetime
+    """When the view was last modified."""
+
+    name: str
+    """The name of the view."""
+
+    zones: List[str]
+    """The list of zones linked to this view."""
diff --git a/src/cloudflare/types/dns/settings/account/view_list_params.py b/src/cloudflare/types/dns/settings/account/view_list_params.py
new file mode 100644
index 00000000000..30aa2c6e47d
--- /dev/null
+++ b/src/cloudflare/types/dns/settings/account/view_list_params.py
@@ -0,0 +1,53 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["ViewListParams", "Name"]
+
+
+class ViewListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    direction: Literal["asc", "desc"]
+    """Direction to order DNS views in."""
+
+    match: Literal["any", "all"]
+    """Whether to match all search requirements or at least one (any).
+
+    If set to `all`, acts like a logical AND between filters. If set to `any`, acts
+    like a logical OR instead.
+    """
+
+    name: Name
+
+    order: Literal["name", "created_on", "modified_on"]
+    """Field to order DNS views by."""
+
+    page: float
+    """Page number of paginated results."""
+
+    per_page: float
+    """Number of DNS views per page."""
+
+    zone_id: str
+    """A zone ID that exists in the zones list for the view."""
+
+    zone_name: str
+    """A zone name that exists in the zones list for the view."""
+
+
+class Name(TypedDict, total=False):
+    contains: str
+    """Substring of the DNS view name."""
+
+    endswith: str
+    """Suffix of the DNS view name."""
+
+    exact: str
+    """Exact value of the DNS view name."""
+
+    startswith: str
+    """Prefix of the DNS view name."""
diff --git a/src/cloudflare/types/dns/settings/account/view_list_response.py b/src/cloudflare/types/dns/settings/account/view_list_response.py
new file mode 100644
index 00000000000..90d48c247bd
--- /dev/null
+++ b/src/cloudflare/types/dns/settings/account/view_list_response.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+
+from ....._models import BaseModel
+
+__all__ = ["ViewListResponse"]
+
+
+class ViewListResponse(BaseModel):
+    id: str
+    """Identifier."""
+
+    created_time: datetime
+    """When the view was created."""
+
+    modified_time: datetime
+    """When the view was last modified."""
+
+    name: str
+    """The name of the view."""
+
+    zones: List[str]
+    """The list of zones linked to this view."""
diff --git a/src/cloudflare/types/dns/settings/account_edit_params.py b/src/cloudflare/types/dns/settings/account_edit_params.py
new file mode 100644
index 00000000000..a0c45ebf444
--- /dev/null
+++ b/src/cloudflare/types/dns/settings/account_edit_params.py
@@ -0,0 +1,113 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["AccountEditParams", "ZoneDefaults", "ZoneDefaultsInternalDNS", "ZoneDefaultsNameservers", "ZoneDefaultsSOA"]
+
+
+class AccountEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    zone_defaults: ZoneDefaults
+
+
+class ZoneDefaultsInternalDNS(TypedDict, total=False):
+    """Settings for this internal zone."""
+
+    reference_zone_id: str
+    """The ID of the zone to fallback to."""
+
+
+class ZoneDefaultsNameservers(TypedDict, total=False):
+    """
+    Settings determining the nameservers through which the zone should be available.
+    """
+
+    type: Literal["cloudflare.standard", "cloudflare.standard.random", "custom.account", "custom.tenant"]
+    """Nameserver type"""
+
+
+class ZoneDefaultsSOA(TypedDict, total=False):
+    """Components of the zone's SOA record."""
+
+    expire: float
+    """
+    Time in seconds of being unable to query the primary server after which
+    secondary servers should stop serving the zone.
+    """
+
+    min_ttl: float
+    """The time to live (TTL) for negative caching of records within the zone."""
+
+    mname: Optional[str]
+    """The primary nameserver, which may be used for outbound zone transfers.
+
+    If null, a Cloudflare-assigned value will be used.
+    """
+
+    refresh: float
+    """
+    Time in seconds after which secondary servers should re-check the SOA record to
+    see if the zone has been updated.
+    """
+
+    retry: float
+    """
+    Time in seconds after which secondary servers should retry queries after the
+    primary server was unresponsive.
+    """
+
+    rname: str
+    """
+    The email address of the zone administrator, with the first label representing
+    the local part of the email address.
+    """
+
+    ttl: float
+    """The time to live (TTL) of the SOA record itself."""
+
+
+class ZoneDefaults(TypedDict, total=False):
+    flatten_all_cnames: bool
+    """Whether to flatten all CNAME records in the zone.
+
+    Note that, due to DNS limitations, a CNAME record at the zone apex will always
+    be flattened.
+    """
+
+    foundation_dns: bool
+    """Whether to enable Foundation DNS Advanced Nameservers on the zone."""
+
+    internal_dns: ZoneDefaultsInternalDNS
+    """Settings for this internal zone."""
+
+    multi_provider: bool
+    """
+    Whether to enable multi-provider DNS, which causes Cloudflare to activate the
+    zone even when non-Cloudflare NS records exist, and to respect NS records at the
+    zone apex during outbound zone transfers.
+    """
+
+    nameservers: ZoneDefaultsNameservers
+    """
+    Settings determining the nameservers through which the zone should be available.
+    """
+
+    ns_ttl: float
+    """The time to live (TTL) of the zone's nameserver (NS) records."""
+
+    secondary_overrides: bool
+    """
+    Allows a Secondary DNS zone to use (proxied) override records and CNAME
+    flattening at the zone apex.
+    """
+
+    soa: ZoneDefaultsSOA
+    """Components of the zone's SOA record."""
+
+    zone_mode: Literal["standard", "cdn_only", "dns_only"]
+    """Whether the zone mode is a regular or CDN/DNS only zone."""
diff --git a/src/cloudflare/types/dns/settings/account_edit_response.py b/src/cloudflare/types/dns/settings/account_edit_response.py
new file mode 100644
index 00000000000..63b2827efc3
--- /dev/null
+++ b/src/cloudflare/types/dns/settings/account_edit_response.py
@@ -0,0 +1,116 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = [
+    "AccountEditResponse",
+    "ZoneDefaults",
+    "ZoneDefaultsInternalDNS",
+    "ZoneDefaultsNameservers",
+    "ZoneDefaultsSOA",
+]
+
+
+class ZoneDefaultsInternalDNS(BaseModel):
+    """Settings for this internal zone."""
+
+    reference_zone_id: Optional[str] = None
+    """The ID of the zone to fallback to."""
+
+
+class ZoneDefaultsNameservers(BaseModel):
+    """
+    Settings determining the nameservers through which the zone should be available.
+    """
+
+    type: Literal["cloudflare.standard", "cloudflare.standard.random", "custom.account", "custom.tenant"]
+    """Nameserver type"""
+
+
+class ZoneDefaultsSOA(BaseModel):
+    """Components of the zone's SOA record."""
+
+    expire: Optional[float] = None
+    """
+    Time in seconds of being unable to query the primary server after which
+    secondary servers should stop serving the zone.
+    """
+
+    min_ttl: Optional[float] = None
+    """The time to live (TTL) for negative caching of records within the zone."""
+
+    mname: Optional[str] = None
+    """The primary nameserver, which may be used for outbound zone transfers.
+
+    If null, a Cloudflare-assigned value will be used.
+    """
+
+    refresh: Optional[float] = None
+    """
+    Time in seconds after which secondary servers should re-check the SOA record to
+    see if the zone has been updated.
+    """
+
+    retry: Optional[float] = None
+    """
+    Time in seconds after which secondary servers should retry queries after the
+    primary server was unresponsive.
+    """
+
+    rname: Optional[str] = None
+    """
+    The email address of the zone administrator, with the first label representing
+    the local part of the email address.
+    """
+
+    ttl: Optional[float] = None
+    """The time to live (TTL) of the SOA record itself."""
+
+
+class ZoneDefaults(BaseModel):
+    flatten_all_cnames: bool
+    """Whether to flatten all CNAME records in the zone.
+
+    Note that, due to DNS limitations, a CNAME record at the zone apex will always
+    be flattened.
+    """
+
+    foundation_dns: bool
+    """Whether to enable Foundation DNS Advanced Nameservers on the zone."""
+
+    internal_dns: ZoneDefaultsInternalDNS
+    """Settings for this internal zone."""
+
+    multi_provider: bool
+    """
+    Whether to enable multi-provider DNS, which causes Cloudflare to activate the
+    zone even when non-Cloudflare NS records exist, and to respect NS records at the
+    zone apex during outbound zone transfers.
+    """
+
+    nameservers: ZoneDefaultsNameservers
+    """
+    Settings determining the nameservers through which the zone should be available.
+    """
+
+    ns_ttl: float
+    """The time to live (TTL) of the zone's nameserver (NS) records."""
+
+    secondary_overrides: bool
+    """
+    Allows a Secondary DNS zone to use (proxied) override records and CNAME
+    flattening at the zone apex.
+    """
+
+    soa: ZoneDefaultsSOA
+    """Components of the zone's SOA record."""
+
+    zone_mode: Literal["standard", "cdn_only", "dns_only"]
+    """Whether the zone mode is a regular or CDN/DNS only zone."""
+
+
+class AccountEditResponse(BaseModel):
+    zone_defaults: ZoneDefaults
diff --git a/src/cloudflare/types/dns/settings/account_get_response.py b/src/cloudflare/types/dns/settings/account_get_response.py
new file mode 100644
index 00000000000..2a1b91d3697
--- /dev/null
+++ b/src/cloudflare/types/dns/settings/account_get_response.py
@@ -0,0 +1,116 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = [
+    "AccountGetResponse",
+    "ZoneDefaults",
+    "ZoneDefaultsInternalDNS",
+    "ZoneDefaultsNameservers",
+    "ZoneDefaultsSOA",
+]
+
+
+class ZoneDefaultsInternalDNS(BaseModel):
+    """Settings for this internal zone."""
+
+    reference_zone_id: Optional[str] = None
+    """The ID of the zone to fallback to."""
+
+
+class ZoneDefaultsNameservers(BaseModel):
+    """
+    Settings determining the nameservers through which the zone should be available.
+    """
+
+    type: Literal["cloudflare.standard", "cloudflare.standard.random", "custom.account", "custom.tenant"]
+    """Nameserver type"""
+
+
+class ZoneDefaultsSOA(BaseModel):
+    """Components of the zone's SOA record."""
+
+    expire: Optional[float] = None
+    """
+    Time in seconds of being unable to query the primary server after which
+    secondary servers should stop serving the zone.
+    """
+
+    min_ttl: Optional[float] = None
+    """The time to live (TTL) for negative caching of records within the zone."""
+
+    mname: Optional[str] = None
+    """The primary nameserver, which may be used for outbound zone transfers.
+
+    If null, a Cloudflare-assigned value will be used.
+    """
+
+    refresh: Optional[float] = None
+    """
+    Time in seconds after which secondary servers should re-check the SOA record to
+    see if the zone has been updated.
+    """
+
+    retry: Optional[float] = None
+    """
+    Time in seconds after which secondary servers should retry queries after the
+    primary server was unresponsive.
+    """
+
+    rname: Optional[str] = None
+    """
+    The email address of the zone administrator, with the first label representing
+    the local part of the email address.
+    """
+
+    ttl: Optional[float] = None
+    """The time to live (TTL) of the SOA record itself."""
+
+
+class ZoneDefaults(BaseModel):
+    flatten_all_cnames: bool
+    """Whether to flatten all CNAME records in the zone.
+
+    Note that, due to DNS limitations, a CNAME record at the zone apex will always
+    be flattened.
+    """
+
+    foundation_dns: bool
+    """Whether to enable Foundation DNS Advanced Nameservers on the zone."""
+
+    internal_dns: ZoneDefaultsInternalDNS
+    """Settings for this internal zone."""
+
+    multi_provider: bool
+    """
+    Whether to enable multi-provider DNS, which causes Cloudflare to activate the
+    zone even when non-Cloudflare NS records exist, and to respect NS records at the
+    zone apex during outbound zone transfers.
+    """
+
+    nameservers: ZoneDefaultsNameservers
+    """
+    Settings determining the nameservers through which the zone should be available.
+    """
+
+    ns_ttl: float
+    """The time to live (TTL) of the zone's nameserver (NS) records."""
+
+    secondary_overrides: bool
+    """
+    Allows a Secondary DNS zone to use (proxied) override records and CNAME
+    flattening at the zone apex.
+    """
+
+    soa: ZoneDefaultsSOA
+    """Components of the zone's SOA record."""
+
+    zone_mode: Literal["standard", "cdn_only", "dns_only"]
+    """Whether the zone mode is a regular or CDN/DNS only zone."""
+
+
+class AccountGetResponse(BaseModel):
+    zone_defaults: ZoneDefaults
diff --git a/src/cloudflare/types/dns/settings/zone_edit_params.py b/src/cloudflare/types/dns/settings/zone_edit_params.py
new file mode 100644
index 00000000000..b413561f0e4
--- /dev/null
+++ b/src/cloudflare/types/dns/settings/zone_edit_params.py
@@ -0,0 +1,112 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["ZoneEditParams", "InternalDNS", "Nameservers", "SOA"]
+
+
+class ZoneEditParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    flatten_all_cnames: bool
+    """Whether to flatten all CNAME records in the zone.
+
+    Note that, due to DNS limitations, a CNAME record at the zone apex will always
+    be flattened.
+    """
+
+    foundation_dns: bool
+    """Whether to enable Foundation DNS Advanced Nameservers on the zone."""
+
+    internal_dns: InternalDNS
+    """Settings for this internal zone."""
+
+    multi_provider: bool
+    """
+    Whether to enable multi-provider DNS, which causes Cloudflare to activate the
+    zone even when non-Cloudflare NS records exist, and to respect NS records at the
+    zone apex during outbound zone transfers.
+    """
+
+    nameservers: Nameservers
+    """
+    Settings determining the nameservers through which the zone should be available.
+    """
+
+    ns_ttl: float
+    """The time to live (TTL) of the zone's nameserver (NS) records."""
+
+    secondary_overrides: bool
+    """
+    Allows a Secondary DNS zone to use (proxied) override records and CNAME
+    flattening at the zone apex.
+    """
+
+    soa: SOA
+    """Components of the zone's SOA record."""
+
+    zone_mode: Literal["standard", "cdn_only", "dns_only"]
+    """Whether the zone mode is a regular or CDN/DNS only zone."""
+
+
+class InternalDNS(TypedDict, total=False):
+    """Settings for this internal zone."""
+
+    reference_zone_id: str
+    """The ID of the zone to fallback to."""
+
+
+class Nameservers(TypedDict, total=False):
+    """
+    Settings determining the nameservers through which the zone should be available.
+    """
+
+    ns_set: int
+    """Configured nameserver set to be used for this zone"""
+
+    type: Literal["cloudflare.standard", "custom.account", "custom.tenant", "custom.zone"]
+    """Nameserver type"""
+
+
+class SOA(TypedDict, total=False):
+    """Components of the zone's SOA record."""
+
+    expire: float
+    """
+    Time in seconds of being unable to query the primary server after which
+    secondary servers should stop serving the zone.
+    """
+
+    min_ttl: float
+    """The time to live (TTL) for negative caching of records within the zone."""
+
+    mname: Optional[str]
+    """The primary nameserver, which may be used for outbound zone transfers.
+
+    If null, a Cloudflare-assigned value will be used.
+    """
+
+    refresh: float
+    """
+    Time in seconds after which secondary servers should re-check the SOA record to
+    see if the zone has been updated.
+    """
+
+    retry: float
+    """
+    Time in seconds after which secondary servers should retry queries after the
+    primary server was unresponsive.
+    """
+
+    rname: str
+    """
+    The email address of the zone administrator, with the first label representing
+    the local part of the email address.
+    """
+
+    ttl: float
+    """The time to live (TTL) of the SOA record itself."""
diff --git a/src/cloudflare/types/dns/settings/zone_edit_response.py b/src/cloudflare/types/dns/settings/zone_edit_response.py
new file mode 100644
index 00000000000..9d38d16fb3d
--- /dev/null
+++ b/src/cloudflare/types/dns/settings/zone_edit_response.py
@@ -0,0 +1,109 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["ZoneEditResponse", "InternalDNS", "Nameservers", "SOA"]
+
+
+class InternalDNS(BaseModel):
+    """Settings for this internal zone."""
+
+    reference_zone_id: Optional[str] = None
+    """The ID of the zone to fallback to."""
+
+
+class Nameservers(BaseModel):
+    """
+    Settings determining the nameservers through which the zone should be available.
+    """
+
+    type: Literal["cloudflare.standard", "custom.account", "custom.tenant", "custom.zone"]
+    """Nameserver type"""
+
+    ns_set: Optional[int] = None
+    """Configured nameserver set to be used for this zone"""
+
+
+class SOA(BaseModel):
+    """Components of the zone's SOA record."""
+
+    expire: Optional[float] = None
+    """
+    Time in seconds of being unable to query the primary server after which
+    secondary servers should stop serving the zone.
+    """
+
+    min_ttl: Optional[float] = None
+    """The time to live (TTL) for negative caching of records within the zone."""
+
+    mname: Optional[str] = None
+    """The primary nameserver, which may be used for outbound zone transfers.
+
+    If null, a Cloudflare-assigned value will be used.
+    """
+
+    refresh: Optional[float] = None
+    """
+    Time in seconds after which secondary servers should re-check the SOA record to
+    see if the zone has been updated.
+    """
+
+    retry: Optional[float] = None
+    """
+    Time in seconds after which secondary servers should retry queries after the
+    primary server was unresponsive.
+    """
+
+    rname: Optional[str] = None
+    """
+    The email address of the zone administrator, with the first label representing
+    the local part of the email address.
+    """
+
+    ttl: Optional[float] = None
+    """The time to live (TTL) of the SOA record itself."""
+
+
+class ZoneEditResponse(BaseModel):
+    flatten_all_cnames: bool
+    """Whether to flatten all CNAME records in the zone.
+
+    Note that, due to DNS limitations, a CNAME record at the zone apex will always
+    be flattened.
+    """
+
+    foundation_dns: bool
+    """Whether to enable Foundation DNS Advanced Nameservers on the zone."""
+
+    internal_dns: InternalDNS
+    """Settings for this internal zone."""
+
+    multi_provider: bool
+    """
+    Whether to enable multi-provider DNS, which causes Cloudflare to activate the
+    zone even when non-Cloudflare NS records exist, and to respect NS records at the
+    zone apex during outbound zone transfers.
+    """
+
+    nameservers: Nameservers
+    """
+    Settings determining the nameservers through which the zone should be available.
+    """
+
+    ns_ttl: float
+    """The time to live (TTL) of the zone's nameserver (NS) records."""
+
+    secondary_overrides: bool
+    """
+    Allows a Secondary DNS zone to use (proxied) override records and CNAME
+    flattening at the zone apex.
+    """
+
+    soa: SOA
+    """Components of the zone's SOA record."""
+
+    zone_mode: Literal["standard", "cdn_only", "dns_only"]
+    """Whether the zone mode is a regular or CDN/DNS only zone."""
diff --git a/src/cloudflare/types/dns/settings/zone_get_response.py b/src/cloudflare/types/dns/settings/zone_get_response.py
new file mode 100644
index 00000000000..cc6aca1ef06
--- /dev/null
+++ b/src/cloudflare/types/dns/settings/zone_get_response.py
@@ -0,0 +1,109 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["ZoneGetResponse", "InternalDNS", "Nameservers", "SOA"]
+
+
+class InternalDNS(BaseModel):
+    """Settings for this internal zone."""
+
+    reference_zone_id: Optional[str] = None
+    """The ID of the zone to fallback to."""
+
+
+class Nameservers(BaseModel):
+    """
+    Settings determining the nameservers through which the zone should be available.
+    """
+
+    type: Literal["cloudflare.standard", "custom.account", "custom.tenant", "custom.zone"]
+    """Nameserver type"""
+
+    ns_set: Optional[int] = None
+    """Configured nameserver set to be used for this zone"""
+
+
+class SOA(BaseModel):
+    """Components of the zone's SOA record."""
+
+    expire: Optional[float] = None
+    """
+    Time in seconds of being unable to query the primary server after which
+    secondary servers should stop serving the zone.
+    """
+
+    min_ttl: Optional[float] = None
+    """The time to live (TTL) for negative caching of records within the zone."""
+
+    mname: Optional[str] = None
+    """The primary nameserver, which may be used for outbound zone transfers.
+
+    If null, a Cloudflare-assigned value will be used.
+    """
+
+    refresh: Optional[float] = None
+    """
+    Time in seconds after which secondary servers should re-check the SOA record to
+    see if the zone has been updated.
+    """
+
+    retry: Optional[float] = None
+    """
+    Time in seconds after which secondary servers should retry queries after the
+    primary server was unresponsive.
+    """
+
+    rname: Optional[str] = None
+    """
+    The email address of the zone administrator, with the first label representing
+    the local part of the email address.
+    """
+
+    ttl: Optional[float] = None
+    """The time to live (TTL) of the SOA record itself."""
+
+
+class ZoneGetResponse(BaseModel):
+    flatten_all_cnames: bool
+    """Whether to flatten all CNAME records in the zone.
+
+    Note that, due to DNS limitations, a CNAME record at the zone apex will always
+    be flattened.
+    """
+
+    foundation_dns: bool
+    """Whether to enable Foundation DNS Advanced Nameservers on the zone."""
+
+    internal_dns: InternalDNS
+    """Settings for this internal zone."""
+
+    multi_provider: bool
+    """
+    Whether to enable multi-provider DNS, which causes Cloudflare to activate the
+    zone even when non-Cloudflare NS records exist, and to respect NS records at the
+    zone apex during outbound zone transfers.
+    """
+
+    nameservers: Nameservers
+    """
+    Settings determining the nameservers through which the zone should be available.
+    """
+
+    ns_ttl: float
+    """The time to live (TTL) of the zone's nameserver (NS) records."""
+
+    secondary_overrides: bool
+    """
+    Allows a Secondary DNS zone to use (proxied) override records and CNAME
+    flattening at the zone apex.
+    """
+
+    soa: SOA
+    """Components of the zone's SOA record."""
+
+    zone_mode: Literal["standard", "cdn_only", "dns_only"]
+    """Whether the zone mode is a regular or CDN/DNS only zone."""
diff --git a/src/cloudflare/types/dns/smimea_record.py b/src/cloudflare/types/dns/smimea_record.py
index 8fadd271738..8fce4ac2f23 100644
--- a/src/cloudflare/types/dns/smimea_record.py
+++ b/src/cloudflare/types/dns/smimea_record.py
@@ -1,18 +1,18 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["SMIMEARecord", "Data"]
+__all__ = ["SMIMEARecord", "Data", "Settings"]
 
 
 class Data(BaseModel):
+    """Components of a SMIMEA record."""
+
     certificate: Optional[str] = None
     """Certificate."""
 
@@ -26,19 +26,40 @@ class Data(BaseModel):
     """Usage."""
 
 
-class SMIMEARecord(BaseModel):
-    data: Data
-    """Components of a SMIMEA record."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
 
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class SMIMEARecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Literal["SMIMEA"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
@@ -48,24 +69,17 @@ class SMIMEARecord(BaseModel):
     content: Optional[str] = None
     """Formatted SMIMEA content. See 'data' to set SMIMEA properties."""
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
-
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
+    data: Optional[Data] = None
+    """Components of a SMIMEA record."""
 
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
+    proxied: Optional[bool] = None
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
 
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
 
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/smimea_record_param.py b/src/cloudflare/types/dns/smimea_record_param.py
new file mode 100644
index 00000000000..08fcd8e9dc7
--- /dev/null
+++ b/src/cloudflare/types/dns/smimea_record_param.py
@@ -0,0 +1,83 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["SMIMEARecordParam", "Data", "Settings"]
+
+
+class Data(TypedDict, total=False):
+    """Components of a SMIMEA record."""
+
+    certificate: str
+    """Certificate."""
+
+    matching_type: float
+    """Matching Type."""
+
+    selector: float
+    """Selector."""
+
+    usage: float
+    """Usage."""
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class SMIMEARecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["SMIMEA"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    data: Data
+    """Components of a SMIMEA record."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/srv_record.py b/src/cloudflare/types/dns/srv_record.py
index 77dbaa50cfb..45b73018fe4 100644
--- a/src/cloudflare/types/dns/srv_record.py
+++ b/src/cloudflare/types/dns/srv_record.py
@@ -1,25 +1,17 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["SRVRecord", "Data"]
+__all__ = ["SRVRecord", "Data", "Settings"]
 
 
 class Data(BaseModel):
-    name: Optional[str] = None
-    """A valid hostname.
-
-    Deprecated in favor of the regular 'name' outside the data map. This data map
-    field represents the remainder of the full 'name' after the service and
-    protocol.
-    """
+    """Components of a SRV record."""
 
     port: Optional[float] = None
     """The port of the service."""
@@ -30,20 +22,6 @@ class Data(BaseModel):
     Records with lower priorities are preferred.
     """
 
-    proto: Optional[str] = None
-    """A valid protocol, prefixed with an underscore.
-
-    Deprecated in favor of the regular 'name' outside the data map. This data map
-    field normally represents the second label of that 'name'.
-    """
-
-    service: Optional[str] = None
-    """A service type, prefixed with an underscore.
-
-    Deprecated in favor of the regular 'name' outside the data map. This data map
-    field normally represents the first label of that 'name'.
-    """
-
     target: Optional[str] = None
     """A valid hostname."""
 
@@ -51,23 +29,40 @@ class Data(BaseModel):
     """The record weight."""
 
 
-class SRVRecord(BaseModel):
-    data: Data
-    """Components of a SRV record."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
+
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
 
+
+class SRVRecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode.
+    """Complete DNS record name, including the zone name, in Punycode."""
 
-    For SRV records, the first label is normally a service and the second a protocol
-    name, each starting with an underscore.
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
     """
 
     type: Literal["SRV"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
@@ -80,24 +75,17 @@ class SRVRecord(BaseModel):
     See 'data' for setting the individual component values.
     """
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
-
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
+    data: Optional[Data] = None
+    """Components of a SRV record."""
 
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
+    proxied: Optional[bool] = None
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
 
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
 
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/srv_record_param.py b/src/cloudflare/types/dns/srv_record_param.py
new file mode 100644
index 00000000000..7a492c85a6a
--- /dev/null
+++ b/src/cloudflare/types/dns/srv_record_param.py
@@ -0,0 +1,86 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["SRVRecordParam", "Data", "Settings"]
+
+
+class Data(TypedDict, total=False):
+    """Components of a SRV record."""
+
+    port: float
+    """The port of the service."""
+
+    priority: float
+    """Required for MX, SRV and URI records; unused by other record types.
+
+    Records with lower priorities are preferred.
+    """
+
+    target: str
+    """A valid hostname."""
+
+    weight: float
+    """The record weight."""
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class SRVRecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["SRV"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    data: Data
+    """Components of a SRV record."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/sshfp_record.py b/src/cloudflare/types/dns/sshfp_record.py
index aad44a8cb6b..3e655a62484 100644
--- a/src/cloudflare/types/dns/sshfp_record.py
+++ b/src/cloudflare/types/dns/sshfp_record.py
@@ -1,41 +1,62 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["SSHFPRecord", "Data"]
+__all__ = ["SSHFPRecord", "Data", "Settings"]
 
 
 class Data(BaseModel):
+    """Components of a SSHFP record."""
+
     algorithm: Optional[float] = None
-    """algorithm."""
+    """Algorithm."""
 
     fingerprint: Optional[str] = None
-    """fingerprint."""
+    """Fingerprint."""
 
     type: Optional[float] = None
-    """type."""
+    """Type."""
 
 
-class SSHFPRecord(BaseModel):
-    data: Data
-    """Components of a SSHFP record."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
 
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class SSHFPRecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Literal["SSHFP"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
@@ -45,24 +66,17 @@ class SSHFPRecord(BaseModel):
     content: Optional[str] = None
     """Formatted SSHFP content. See 'data' to set SSHFP properties."""
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
-
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
+    data: Optional[Data] = None
+    """Components of a SSHFP record."""
 
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
+    proxied: Optional[bool] = None
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
 
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
 
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/sshfp_record_param.py b/src/cloudflare/types/dns/sshfp_record_param.py
new file mode 100644
index 00000000000..63f883d960d
--- /dev/null
+++ b/src/cloudflare/types/dns/sshfp_record_param.py
@@ -0,0 +1,80 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["SSHFPRecordParam", "Data", "Settings"]
+
+
+class Data(TypedDict, total=False):
+    """Components of a SSHFP record."""
+
+    algorithm: float
+    """Algorithm."""
+
+    fingerprint: str
+    """Fingerprint."""
+
+    type: float
+    """Type."""
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class SSHFPRecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["SSHFP"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    data: Data
+    """Components of a SSHFP record."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/svcb_record.py b/src/cloudflare/types/dns/svcb_record.py
index a503e64e925..2ef12704445 100644
--- a/src/cloudflare/types/dns/svcb_record.py
+++ b/src/cloudflare/types/dns/svcb_record.py
@@ -1,41 +1,62 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["SVCBRecord", "Data"]
+__all__ = ["SVCBRecord", "Data", "Settings"]
 
 
 class Data(BaseModel):
+    """Components of a SVCB record."""
+
     priority: Optional[float] = None
-    """priority."""
+    """Priority."""
 
     target: Optional[str] = None
-    """target."""
+    """Target."""
 
     value: Optional[str] = None
-    """value."""
+    """Value."""
 
 
-class SVCBRecord(BaseModel):
-    data: Data
-    """Components of a SVCB record."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
 
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class SVCBRecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Literal["SVCB"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
@@ -45,24 +66,17 @@ class SVCBRecord(BaseModel):
     content: Optional[str] = None
     """Formatted SVCB content. See 'data' to set SVCB properties."""
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
-
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
+    data: Optional[Data] = None
+    """Components of a SVCB record."""
 
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
+    proxied: Optional[bool] = None
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
 
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
 
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/svcb_record_param.py b/src/cloudflare/types/dns/svcb_record_param.py
new file mode 100644
index 00000000000..6736c664e17
--- /dev/null
+++ b/src/cloudflare/types/dns/svcb_record_param.py
@@ -0,0 +1,80 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["SVCBRecordParam", "Data", "Settings"]
+
+
+class Data(TypedDict, total=False):
+    """Components of a SVCB record."""
+
+    priority: float
+    """Priority."""
+
+    target: str
+    """Target."""
+
+    value: str
+    """Value."""
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class SVCBRecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["SVCB"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    data: Data
+    """Components of a SVCB record."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/tlsa_record.py b/src/cloudflare/types/dns/tlsa_record.py
index 68b273d28d5..067c8edd8d4 100644
--- a/src/cloudflare/types/dns/tlsa_record.py
+++ b/src/cloudflare/types/dns/tlsa_record.py
@@ -1,20 +1,20 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["TLSARecord", "Data"]
+__all__ = ["TLSARecord", "Data", "Settings"]
 
 
 class Data(BaseModel):
+    """Components of a TLSA record."""
+
     certificate: Optional[str] = None
-    """certificate."""
+    """Certificate."""
 
     matching_type: Optional[float] = None
     """Matching Type."""
@@ -26,19 +26,40 @@ class Data(BaseModel):
     """Usage."""
 
 
-class TLSARecord(BaseModel):
-    data: Data
-    """Components of a TLSA record."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
 
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class TLSARecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Literal["TLSA"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
@@ -48,24 +69,17 @@ class TLSARecord(BaseModel):
     content: Optional[str] = None
     """Formatted TLSA content. See 'data' to set TLSA properties."""
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
-
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
+    data: Optional[Data] = None
+    """Components of a TLSA record."""
 
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
+    proxied: Optional[bool] = None
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
 
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
 
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/tlsa_record_param.py b/src/cloudflare/types/dns/tlsa_record_param.py
new file mode 100644
index 00000000000..1dbb1397e18
--- /dev/null
+++ b/src/cloudflare/types/dns/tlsa_record_param.py
@@ -0,0 +1,83 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["TLSARecordParam", "Data", "Settings"]
+
+
+class Data(TypedDict, total=False):
+    """Components of a TLSA record."""
+
+    certificate: str
+    """Certificate."""
+
+    matching_type: float
+    """Matching Type."""
+
+    selector: float
+    """Selector."""
+
+    usage: float
+    """Usage."""
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class TLSARecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["TLSA"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    data: Data
+    """Components of a TLSA record."""
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/ttl.py b/src/cloudflare/types/dns/ttl.py
index 0fdce1c28c8..693c9980bf0 100644
--- a/src/cloudflare/types/dns/ttl.py
+++ b/src/cloudflare/types/dns/ttl.py
@@ -1,8 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Union
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["TTL"]
 
-TTL = Union[float, Literal[1]]
+TTL: TypeAlias = Union[float, Literal[1]]
diff --git a/src/cloudflare/types/dns/ttl_param.py b/src/cloudflare/types/dns/ttl_param.py
index aab7e93732e..462543b959a 100644
--- a/src/cloudflare/types/dns/ttl_param.py
+++ b/src/cloudflare/types/dns/ttl_param.py
@@ -3,8 +3,8 @@
 from __future__ import annotations
 
 from typing import Union
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["TTLParam"]
 
-TTLParam = Union[float, Literal[1]]
+TTLParam: TypeAlias = Union[float, Literal[1]]
diff --git a/src/cloudflare/types/dns/txt_record.py b/src/cloudflare/types/dns/txt_record.py
index 7ba595ed654..d7c8f56022f 100644
--- a/src/cloudflare/types/dns/txt_record.py
+++ b/src/cloudflare/types/dns/txt_record.py
@@ -1,54 +1,74 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["TXTRecord"]
+__all__ = ["TXTRecord", "Settings"]
 
 
-class TXTRecord(BaseModel):
-    content: str
-    """Text content for the record."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
+
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
 
+
+class TXTRecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
 
     type: Literal["TXT"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
     This field has no effect on DNS responses.
     """
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
+    content: Optional[str] = None
+    """Text content for the record.
 
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
+    The content must consist of quoted "character strings" (RFC 1035), each with a
+    length of up to 255 bytes. Strings exceeding this allowed maximum length are
+    automatically split.
 
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
+    Learn more at
+    <https://www.cloudflare.com/learning/dns/dns-records/dns-txt-record/>.
+    """
+
+    proxied: Optional[bool] = None
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
 
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
 
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/txt_record_param.py b/src/cloudflare/types/dns/txt_record_param.py
new file mode 100644
index 00000000000..c032985777c
--- /dev/null
+++ b/src/cloudflare/types/dns/txt_record_param.py
@@ -0,0 +1,75 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["TXTRecordParam", "Settings"]
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class TXTRecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["TXT"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    content: str
+    """Text content for the record.
+
+    The content must consist of quoted "character strings" (RFC 1035), each with a
+    length of up to 255 bytes. Strings exceeding this allowed maximum length are
+    automatically split.
+
+    Learn more at
+    <https://www.cloudflare.com/learning/dns/dns-records/dns-txt-record/>.
+    """
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/dns/upstream_ips.py b/src/cloudflare/types/dns/upstream_ips.py
deleted file mode 100644
index 4c1aa1b226a..00000000000
--- a/src/cloudflare/types/dns/upstream_ips.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union
-
-__all__ = ["UpstreamIPs"]
-
-UpstreamIPs = Union[str, str]
diff --git a/src/cloudflare/types/dns/upstream_ips_param.py b/src/cloudflare/types/dns/upstream_ips_param.py
deleted file mode 100644
index 88e14503b2a..00000000000
--- a/src/cloudflare/types/dns/upstream_ips_param.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Union
-
-__all__ = ["UpstreamIPsParam"]
-
-UpstreamIPsParam = Union[str, str]
diff --git a/src/cloudflare/types/dns/uri_record.py b/src/cloudflare/types/dns/uri_record.py
index 6cd8c686f18..0c99dda4d7b 100644
--- a/src/cloudflare/types/dns/uri_record.py
+++ b/src/cloudflare/types/dns/uri_record.py
@@ -1,18 +1,18 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from .ttl import TTL
 from ..._models import BaseModel
 from .record_tags import RecordTags
-from .record_metadata import RecordMetadata
 
-__all__ = ["URIRecord", "Data"]
+__all__ = ["URIRecord", "Data", "Settings"]
 
 
 class Data(BaseModel):
+    """Components of a URI record."""
+
     target: Optional[str] = None
     """The record content."""
 
@@ -20,25 +20,40 @@ class Data(BaseModel):
     """The record weight."""
 
 
-class URIRecord(BaseModel):
-    data: Data
-    """Components of a URI record."""
+class Settings(BaseModel):
+    """Settings for the DNS record."""
+
+    ipv4_only: Optional[bool] = None
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: Optional[bool] = None
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
 
+
+class URIRecord(BaseModel):
     name: str
-    """DNS record name (or @ for the zone apex) in Punycode."""
+    """Complete DNS record name, including the zone name, in Punycode."""
 
-    priority: float
-    """Required for MX, SRV and URI records; unused by other record types.
+    ttl: TTL
+    """Time To Live (TTL) of the DNS record in seconds.
 
-    Records with lower priorities are preferred.
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
     """
 
     type: Literal["URI"]
     """Record type."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     comment: Optional[str] = None
     """Comments or notes about the DNS record.
 
@@ -48,24 +63,23 @@ class URIRecord(BaseModel):
     content: Optional[str] = None
     """Formatted URI content. See 'data' to set URI properties."""
 
-    created_on: Optional[datetime] = None
-    """When the record was created."""
+    data: Optional[Data] = None
+    """Components of a URI record."""
 
-    meta: Optional[RecordMetadata] = None
-    """Extra Cloudflare-specific information about the record."""
+    priority: Optional[float] = None
+    """Required for MX, SRV and URI records; unused by other record types.
 
-    modified_on: Optional[datetime] = None
-    """When the record was last modified."""
+    Records with lower priorities are preferred.
+    """
 
-    proxiable: Optional[bool] = None
-    """Whether the record can be proxied by Cloudflare or not."""
+    proxied: Optional[bool] = None
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Optional[Settings] = None
+    """Settings for the DNS record."""
 
     tags: Optional[List[RecordTags]] = None
     """Custom tags for the DNS record. This field has no effect on DNS responses."""
-
-    ttl: Optional[TTL] = None
-    """Time To Live (TTL) of the DNS record in seconds.
-
-    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
-    minimum reduced to 30 for Enterprise zones.
-    """
diff --git a/src/cloudflare/types/dns/uri_record_param.py b/src/cloudflare/types/dns/uri_record_param.py
new file mode 100644
index 00000000000..8fc98547ac5
--- /dev/null
+++ b/src/cloudflare/types/dns/uri_record_param.py
@@ -0,0 +1,83 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .ttl_param import TTLParam
+from .record_tags import RecordTags
+
+__all__ = ["URIRecordParam", "Data", "Settings"]
+
+
+class Data(TypedDict, total=False):
+    """Components of a URI record."""
+
+    target: str
+    """The record content."""
+
+    weight: float
+    """The record weight."""
+
+
+class Settings(TypedDict, total=False):
+    """Settings for the DNS record."""
+
+    ipv4_only: bool
+    """
+    When enabled, only A records will be generated, and AAAA records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+    ipv6_only: bool
+    """
+    When enabled, only AAAA records will be generated, and A records will not be
+    created. This setting is intended for exceptional cases. Note that this option
+    only applies to proxied records and it has no effect on whether Cloudflare
+    communicates with the origin using IPv4 or IPv6.
+    """
+
+
+class URIRecordParam(TypedDict, total=False):
+    name: Required[str]
+    """Complete DNS record name, including the zone name, in Punycode."""
+
+    ttl: Required[TTLParam]
+    """Time To Live (TTL) of the DNS record in seconds.
+
+    Setting to 1 means 'automatic'. Value must be between 60 and 86400, with the
+    minimum reduced to 30 for Enterprise zones.
+    """
+
+    type: Required[Literal["URI"]]
+    """Record type."""
+
+    comment: str
+    """Comments or notes about the DNS record.
+
+    This field has no effect on DNS responses.
+    """
+
+    data: Data
+    """Components of a URI record."""
+
+    priority: float
+    """Required for MX, SRV and URI records; unused by other record types.
+
+    Records with lower priorities are preferred.
+    """
+
+    proxied: bool
+    """
+    Whether the record is receiving the performance and security benefits of
+    Cloudflare.
+    """
+
+    settings: Settings
+    """Settings for the DNS record."""
+
+    tags: SequenceNotStr[RecordTags]
+    """Custom tags for the DNS record. This field has no effect on DNS responses."""
diff --git a/src/cloudflare/types/secondary_dns/__init__.py b/src/cloudflare/types/dns/zone_transfers/__init__.py
similarity index 100%
rename from src/cloudflare/types/secondary_dns/__init__.py
rename to src/cloudflare/types/dns/zone_transfers/__init__.py
diff --git a/src/cloudflare/types/secondary_dns/acl.py b/src/cloudflare/types/dns/zone_transfers/acl.py
similarity index 94%
rename from src/cloudflare/types/secondary_dns/acl.py
rename to src/cloudflare/types/dns/zone_transfers/acl.py
index 375990882a0..b37afd30660 100644
--- a/src/cloudflare/types/secondary_dns/acl.py
+++ b/src/cloudflare/types/dns/zone_transfers/acl.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
-from ..._models import BaseModel
+from ...._models import BaseModel
 
 __all__ = ["ACL"]
 
diff --git a/src/cloudflare/types/dns/zone_transfers/acl_create_params.py b/src/cloudflare/types/dns/zone_transfers/acl_create_params.py
new file mode 100644
index 00000000000..45b0f0d7811
--- /dev/null
+++ b/src/cloudflare/types/dns/zone_transfers/acl_create_params.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ACLCreateParams"]
+
+
+class ACLCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    ip_range: Required[str]
+    """Allowed IPv4/IPv6 address range of primary or secondary nameservers.
+
+    This will be applied for the entire account. The IP range is used to allow
+    additional NOTIFY IPs for secondary zones and IPs Cloudflare allows AXFR/IXFR
+    requests from for primary zones. CIDRs are limited to a maximum of /24 for IPv4
+    and /64 for IPv6 respectively.
+    """
+
+    name: Required[str]
+    """The name of the acl."""
diff --git a/src/cloudflare/types/secondary_dns/acl_delete_response.py b/src/cloudflare/types/dns/zone_transfers/acl_delete_response.py
similarity index 86%
rename from src/cloudflare/types/secondary_dns/acl_delete_response.py
rename to src/cloudflare/types/dns/zone_transfers/acl_delete_response.py
index cc996c38654..384a4e5d576 100644
--- a/src/cloudflare/types/secondary_dns/acl_delete_response.py
+++ b/src/cloudflare/types/dns/zone_transfers/acl_delete_response.py
@@ -2,7 +2,7 @@
 
 from typing import Optional
 
-from ..._models import BaseModel
+from ...._models import BaseModel
 
 __all__ = ["ACLDeleteResponse"]
 
diff --git a/src/cloudflare/types/secondary_dns/acl_update_params.py b/src/cloudflare/types/dns/zone_transfers/acl_update_params.py
similarity index 100%
rename from src/cloudflare/types/secondary_dns/acl_update_params.py
rename to src/cloudflare/types/dns/zone_transfers/acl_update_params.py
diff --git a/src/cloudflare/types/dns/zone_transfers/disable_transfer.py b/src/cloudflare/types/dns/zone_transfers/disable_transfer.py
new file mode 100644
index 00000000000..a2ef61a6a41
--- /dev/null
+++ b/src/cloudflare/types/dns/zone_transfers/disable_transfer.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["DisableTransfer"]
+
+DisableTransfer: TypeAlias = str
diff --git a/src/cloudflare/types/dns/zone_transfers/enable_transfer.py b/src/cloudflare/types/dns/zone_transfers/enable_transfer.py
new file mode 100644
index 00000000000..48b62c01ca3
--- /dev/null
+++ b/src/cloudflare/types/dns/zone_transfers/enable_transfer.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["EnableTransfer"]
+
+EnableTransfer: TypeAlias = str
diff --git a/src/cloudflare/types/dns/zone_transfers/force_axfr.py b/src/cloudflare/types/dns/zone_transfers/force_axfr.py
new file mode 100644
index 00000000000..cfee811da31
--- /dev/null
+++ b/src/cloudflare/types/dns/zone_transfers/force_axfr.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["ForceAXFR"]
+
+ForceAXFR: TypeAlias = str
diff --git a/src/cloudflare/types/secondary_dns/force_axfr_create_params.py b/src/cloudflare/types/dns/zone_transfers/force_axfr_create_params.py
similarity index 100%
rename from src/cloudflare/types/secondary_dns/force_axfr_create_params.py
rename to src/cloudflare/types/dns/zone_transfers/force_axfr_create_params.py
diff --git a/src/cloudflare/types/dns/zone_transfers/incoming.py b/src/cloudflare/types/dns/zone_transfers/incoming.py
new file mode 100644
index 00000000000..726e5e41302
--- /dev/null
+++ b/src/cloudflare/types/dns/zone_transfers/incoming.py
@@ -0,0 +1,35 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ...._models import BaseModel
+
+__all__ = ["Incoming"]
+
+
+class Incoming(BaseModel):
+    id: Optional[str] = None
+
+    auto_refresh_seconds: Optional[float] = None
+    """
+    How often should a secondary zone auto refresh regardless of DNS NOTIFY. Not
+    applicable for primary zones.
+    """
+
+    checked_time: Optional[str] = None
+    """The time for a specific event."""
+
+    created_time: Optional[str] = None
+    """The time for a specific event."""
+
+    modified_time: Optional[str] = None
+    """The time for a specific event."""
+
+    name: Optional[str] = None
+    """Zone name."""
+
+    peers: Optional[List[str]] = None
+    """A list of peer tags."""
+
+    soa_serial: Optional[float] = None
+    """The serial number of the SOA for the given zone."""
diff --git a/src/cloudflare/types/secondary_dns/incoming_create_params.py b/src/cloudflare/types/dns/zone_transfers/incoming_create_params.py
similarity index 87%
rename from src/cloudflare/types/secondary_dns/incoming_create_params.py
rename to src/cloudflare/types/dns/zone_transfers/incoming_create_params.py
index 14f5dc9437a..961ace68261 100644
--- a/src/cloudflare/types/secondary_dns/incoming_create_params.py
+++ b/src/cloudflare/types/dns/zone_transfers/incoming_create_params.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from typing import Iterable
 from typing_extensions import Required, TypedDict
 
+from ...._types import SequenceNotStr
+
 __all__ = ["IncomingCreateParams"]
 
 
@@ -20,5 +21,5 @@ class IncomingCreateParams(TypedDict, total=False):
     name: Required[str]
     """Zone name."""
 
-    peers: Required[Iterable[object]]
+    peers: Required[SequenceNotStr[str]]
     """A list of peer tags."""
diff --git a/src/cloudflare/types/secondary_dns/incoming_create_response.py b/src/cloudflare/types/dns/zone_transfers/incoming_create_response.py
similarity index 91%
rename from src/cloudflare/types/secondary_dns/incoming_create_response.py
rename to src/cloudflare/types/dns/zone_transfers/incoming_create_response.py
index 05c13258d1c..e4750a058a4 100644
--- a/src/cloudflare/types/secondary_dns/incoming_create_response.py
+++ b/src/cloudflare/types/dns/zone_transfers/incoming_create_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Optional
 
-from ..._models import BaseModel
+from ...._models import BaseModel
 
 __all__ = ["IncomingCreateResponse"]
 
@@ -28,7 +28,7 @@ class IncomingCreateResponse(BaseModel):
     name: Optional[str] = None
     """Zone name."""
 
-    peers: Optional[List[object]] = None
+    peers: Optional[List[str]] = None
     """A list of peer tags."""
 
     soa_serial: Optional[float] = None
diff --git a/src/cloudflare/types/secondary_dns/incoming_delete_response.py b/src/cloudflare/types/dns/zone_transfers/incoming_delete_response.py
similarity index 86%
rename from src/cloudflare/types/secondary_dns/incoming_delete_response.py
rename to src/cloudflare/types/dns/zone_transfers/incoming_delete_response.py
index 367531fefd8..c0b868a078d 100644
--- a/src/cloudflare/types/secondary_dns/incoming_delete_response.py
+++ b/src/cloudflare/types/dns/zone_transfers/incoming_delete_response.py
@@ -2,7 +2,7 @@
 
 from typing import Optional
 
-from ..._models import BaseModel
+from ...._models import BaseModel
 
 __all__ = ["IncomingDeleteResponse"]
 
diff --git a/src/cloudflare/types/secondary_dns/incoming_get_response.py b/src/cloudflare/types/dns/zone_transfers/incoming_get_response.py
similarity index 91%
rename from src/cloudflare/types/secondary_dns/incoming_get_response.py
rename to src/cloudflare/types/dns/zone_transfers/incoming_get_response.py
index 16b22caaaa7..29bd7de91e0 100644
--- a/src/cloudflare/types/secondary_dns/incoming_get_response.py
+++ b/src/cloudflare/types/dns/zone_transfers/incoming_get_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Optional
 
-from ..._models import BaseModel
+from ...._models import BaseModel
 
 __all__ = ["IncomingGetResponse"]
 
@@ -28,7 +28,7 @@ class IncomingGetResponse(BaseModel):
     name: Optional[str] = None
     """Zone name."""
 
-    peers: Optional[List[object]] = None
+    peers: Optional[List[str]] = None
     """A list of peer tags."""
 
     soa_serial: Optional[float] = None
diff --git a/src/cloudflare/types/secondary_dns/incoming_update_params.py b/src/cloudflare/types/dns/zone_transfers/incoming_update_params.py
similarity index 87%
rename from src/cloudflare/types/secondary_dns/incoming_update_params.py
rename to src/cloudflare/types/dns/zone_transfers/incoming_update_params.py
index 05ffc8e0b7c..9fb936a108d 100644
--- a/src/cloudflare/types/secondary_dns/incoming_update_params.py
+++ b/src/cloudflare/types/dns/zone_transfers/incoming_update_params.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from typing import Iterable
 from typing_extensions import Required, TypedDict
 
+from ...._types import SequenceNotStr
+
 __all__ = ["IncomingUpdateParams"]
 
 
@@ -20,5 +21,5 @@ class IncomingUpdateParams(TypedDict, total=False):
     name: Required[str]
     """Zone name."""
 
-    peers: Required[Iterable[object]]
+    peers: Required[SequenceNotStr[str]]
     """A list of peer tags."""
diff --git a/src/cloudflare/types/secondary_dns/incoming_update_response.py b/src/cloudflare/types/dns/zone_transfers/incoming_update_response.py
similarity index 91%
rename from src/cloudflare/types/secondary_dns/incoming_update_response.py
rename to src/cloudflare/types/dns/zone_transfers/incoming_update_response.py
index aa89d805cbc..4858976efcb 100644
--- a/src/cloudflare/types/secondary_dns/incoming_update_response.py
+++ b/src/cloudflare/types/dns/zone_transfers/incoming_update_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Optional
 
-from ..._models import BaseModel
+from ...._models import BaseModel
 
 __all__ = ["IncomingUpdateResponse"]
 
@@ -28,7 +28,7 @@ class IncomingUpdateResponse(BaseModel):
     name: Optional[str] = None
     """Zone name."""
 
-    peers: Optional[List[object]] = None
+    peers: Optional[List[str]] = None
     """A list of peer tags."""
 
     soa_serial: Optional[float] = None
diff --git a/src/cloudflare/types/secondary_dns/outgoing/__init__.py b/src/cloudflare/types/dns/zone_transfers/outgoing/__init__.py
similarity index 100%
rename from src/cloudflare/types/secondary_dns/outgoing/__init__.py
rename to src/cloudflare/types/dns/zone_transfers/outgoing/__init__.py
diff --git a/src/cloudflare/types/dns/zone_transfers/outgoing/outgoing.py b/src/cloudflare/types/dns/zone_transfers/outgoing/outgoing.py
new file mode 100644
index 00000000000..bac651c175d
--- /dev/null
+++ b/src/cloudflare/types/dns/zone_transfers/outgoing/outgoing.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ....._models import BaseModel
+
+__all__ = ["Outgoing"]
+
+
+class Outgoing(BaseModel):
+    id: Optional[str] = None
+
+    checked_time: Optional[str] = None
+    """The time for a specific event."""
+
+    created_time: Optional[str] = None
+    """The time for a specific event."""
+
+    last_transferred_time: Optional[str] = None
+    """The time for a specific event."""
+
+    name: Optional[str] = None
+    """Zone name."""
+
+    peers: Optional[List[str]] = None
+    """A list of peer tags."""
+
+    soa_serial: Optional[float] = None
+    """The serial number of the SOA for the given zone."""
diff --git a/src/cloudflare/types/secondary_dns/outgoing_create_params.py b/src/cloudflare/types/dns/zone_transfers/outgoing_create_params.py
similarity index 82%
rename from src/cloudflare/types/secondary_dns/outgoing_create_params.py
rename to src/cloudflare/types/dns/zone_transfers/outgoing_create_params.py
index 665868cb203..eb52b533c3e 100644
--- a/src/cloudflare/types/secondary_dns/outgoing_create_params.py
+++ b/src/cloudflare/types/dns/zone_transfers/outgoing_create_params.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from typing import Iterable
 from typing_extensions import Required, TypedDict
 
+from ...._types import SequenceNotStr
+
 __all__ = ["OutgoingCreateParams"]
 
 
@@ -14,5 +15,5 @@ class OutgoingCreateParams(TypedDict, total=False):
     name: Required[str]
     """Zone name."""
 
-    peers: Required[Iterable[object]]
+    peers: Required[SequenceNotStr[str]]
     """A list of peer tags."""
diff --git a/src/cloudflare/types/secondary_dns/outgoing_create_response.py b/src/cloudflare/types/dns/zone_transfers/outgoing_create_response.py
similarity index 90%
rename from src/cloudflare/types/secondary_dns/outgoing_create_response.py
rename to src/cloudflare/types/dns/zone_transfers/outgoing_create_response.py
index 60c85d6157b..4f045d76f4e 100644
--- a/src/cloudflare/types/secondary_dns/outgoing_create_response.py
+++ b/src/cloudflare/types/dns/zone_transfers/outgoing_create_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Optional
 
-from ..._models import BaseModel
+from ...._models import BaseModel
 
 __all__ = ["OutgoingCreateResponse"]
 
@@ -22,7 +22,7 @@ class OutgoingCreateResponse(BaseModel):
     name: Optional[str] = None
     """Zone name."""
 
-    peers: Optional[List[object]] = None
+    peers: Optional[List[str]] = None
     """A list of peer tags."""
 
     soa_serial: Optional[float] = None
diff --git a/src/cloudflare/types/secondary_dns/outgoing_delete_response.py b/src/cloudflare/types/dns/zone_transfers/outgoing_delete_response.py
similarity index 86%
rename from src/cloudflare/types/secondary_dns/outgoing_delete_response.py
rename to src/cloudflare/types/dns/zone_transfers/outgoing_delete_response.py
index 4c2ace4164f..39e322a2f11 100644
--- a/src/cloudflare/types/secondary_dns/outgoing_delete_response.py
+++ b/src/cloudflare/types/dns/zone_transfers/outgoing_delete_response.py
@@ -2,7 +2,7 @@
 
 from typing import Optional
 
-from ..._models import BaseModel
+from ...._models import BaseModel
 
 __all__ = ["OutgoingDeleteResponse"]
 
diff --git a/src/cloudflare/types/secondary_dns/outgoing_disable_params.py b/src/cloudflare/types/dns/zone_transfers/outgoing_disable_params.py
similarity index 100%
rename from src/cloudflare/types/secondary_dns/outgoing_disable_params.py
rename to src/cloudflare/types/dns/zone_transfers/outgoing_disable_params.py
diff --git a/src/cloudflare/types/secondary_dns/outgoing_enable_params.py b/src/cloudflare/types/dns/zone_transfers/outgoing_enable_params.py
similarity index 100%
rename from src/cloudflare/types/secondary_dns/outgoing_enable_params.py
rename to src/cloudflare/types/dns/zone_transfers/outgoing_enable_params.py
diff --git a/src/cloudflare/types/secondary_dns/outgoing_force_notify_params.py b/src/cloudflare/types/dns/zone_transfers/outgoing_force_notify_params.py
similarity index 100%
rename from src/cloudflare/types/secondary_dns/outgoing_force_notify_params.py
rename to src/cloudflare/types/dns/zone_transfers/outgoing_force_notify_params.py
diff --git a/src/cloudflare/types/dns/zone_transfers/outgoing_force_notify_response.py b/src/cloudflare/types/dns/zone_transfers/outgoing_force_notify_response.py
new file mode 100644
index 00000000000..6078b13fda3
--- /dev/null
+++ b/src/cloudflare/types/dns/zone_transfers/outgoing_force_notify_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["OutgoingForceNotifyResponse"]
+
+OutgoingForceNotifyResponse: TypeAlias = str
diff --git a/src/cloudflare/types/secondary_dns/outgoing_get_response.py b/src/cloudflare/types/dns/zone_transfers/outgoing_get_response.py
similarity index 89%
rename from src/cloudflare/types/secondary_dns/outgoing_get_response.py
rename to src/cloudflare/types/dns/zone_transfers/outgoing_get_response.py
index 359cd452c4e..8b408baf68f 100644
--- a/src/cloudflare/types/secondary_dns/outgoing_get_response.py
+++ b/src/cloudflare/types/dns/zone_transfers/outgoing_get_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Optional
 
-from ..._models import BaseModel
+from ...._models import BaseModel
 
 __all__ = ["OutgoingGetResponse"]
 
@@ -22,7 +22,7 @@ class OutgoingGetResponse(BaseModel):
     name: Optional[str] = None
     """Zone name."""
 
-    peers: Optional[List[object]] = None
+    peers: Optional[List[str]] = None
     """A list of peer tags."""
 
     soa_serial: Optional[float] = None
diff --git a/src/cloudflare/types/dns/zone_transfers/outgoing_status.py b/src/cloudflare/types/dns/zone_transfers/outgoing_status.py
new file mode 100644
index 00000000000..f119a6242ef
--- /dev/null
+++ b/src/cloudflare/types/dns/zone_transfers/outgoing_status.py
@@ -0,0 +1,8 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import TypeAlias
+
+__all__ = ["OutgoingStatus"]
+
+OutgoingStatus: TypeAlias = Optional[str]
diff --git a/src/cloudflare/types/secondary_dns/outgoing_update_params.py b/src/cloudflare/types/dns/zone_transfers/outgoing_update_params.py
similarity index 82%
rename from src/cloudflare/types/secondary_dns/outgoing_update_params.py
rename to src/cloudflare/types/dns/zone_transfers/outgoing_update_params.py
index dbeee72f143..f9ac9478654 100644
--- a/src/cloudflare/types/secondary_dns/outgoing_update_params.py
+++ b/src/cloudflare/types/dns/zone_transfers/outgoing_update_params.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from typing import Iterable
 from typing_extensions import Required, TypedDict
 
+from ...._types import SequenceNotStr
+
 __all__ = ["OutgoingUpdateParams"]
 
 
@@ -14,5 +15,5 @@ class OutgoingUpdateParams(TypedDict, total=False):
     name: Required[str]
     """Zone name."""
 
-    peers: Required[Iterable[object]]
+    peers: Required[SequenceNotStr[str]]
     """A list of peer tags."""
diff --git a/src/cloudflare/types/secondary_dns/outgoing_update_response.py b/src/cloudflare/types/dns/zone_transfers/outgoing_update_response.py
similarity index 90%
rename from src/cloudflare/types/secondary_dns/outgoing_update_response.py
rename to src/cloudflare/types/dns/zone_transfers/outgoing_update_response.py
index b68ac372b63..78708d34102 100644
--- a/src/cloudflare/types/secondary_dns/outgoing_update_response.py
+++ b/src/cloudflare/types/dns/zone_transfers/outgoing_update_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Optional
 
-from ..._models import BaseModel
+from ...._models import BaseModel
 
 __all__ = ["OutgoingUpdateResponse"]
 
@@ -22,7 +22,7 @@ class OutgoingUpdateResponse(BaseModel):
     name: Optional[str] = None
     """Zone name."""
 
-    peers: Optional[List[object]] = None
+    peers: Optional[List[str]] = None
     """A list of peer tags."""
 
     soa_serial: Optional[float] = None
diff --git a/src/cloudflare/types/secondary_dns/peer.py b/src/cloudflare/types/dns/zone_transfers/peer.py
similarity index 96%
rename from src/cloudflare/types/secondary_dns/peer.py
rename to src/cloudflare/types/dns/zone_transfers/peer.py
index 502be2d220f..8156454b694 100644
--- a/src/cloudflare/types/secondary_dns/peer.py
+++ b/src/cloudflare/types/dns/zone_transfers/peer.py
@@ -2,7 +2,7 @@
 
 from typing import Optional
 
-from ..._models import BaseModel
+from ...._models import BaseModel
 
 __all__ = ["Peer"]
 
diff --git a/src/cloudflare/types/secondary_dns/peer_create_params.py b/src/cloudflare/types/dns/zone_transfers/peer_create_params.py
similarity index 83%
rename from src/cloudflare/types/secondary_dns/peer_create_params.py
rename to src/cloudflare/types/dns/zone_transfers/peer_create_params.py
index b6e7691aa4b..6e4dfbf4275 100644
--- a/src/cloudflare/types/secondary_dns/peer_create_params.py
+++ b/src/cloudflare/types/dns/zone_transfers/peer_create_params.py
@@ -10,4 +10,5 @@
 class PeerCreateParams(TypedDict, total=False):
     account_id: Required[str]
 
-    body: Required[object]
+    name: Required[str]
+    """The name of the peer."""
diff --git a/src/cloudflare/types/secondary_dns/peer_delete_response.py b/src/cloudflare/types/dns/zone_transfers/peer_delete_response.py
similarity index 86%
rename from src/cloudflare/types/secondary_dns/peer_delete_response.py
rename to src/cloudflare/types/dns/zone_transfers/peer_delete_response.py
index f15beb9db63..8b28863bf57 100644
--- a/src/cloudflare/types/secondary_dns/peer_delete_response.py
+++ b/src/cloudflare/types/dns/zone_transfers/peer_delete_response.py
@@ -2,7 +2,7 @@
 
 from typing import Optional
 
-from ..._models import BaseModel
+from ...._models import BaseModel
 
 __all__ = ["PeerDeleteResponse"]
 
diff --git a/src/cloudflare/types/secondary_dns/peer_update_params.py b/src/cloudflare/types/dns/zone_transfers/peer_update_params.py
similarity index 100%
rename from src/cloudflare/types/secondary_dns/peer_update_params.py
rename to src/cloudflare/types/dns/zone_transfers/peer_update_params.py
diff --git a/src/cloudflare/types/secondary_dns/tsig.py b/src/cloudflare/types/dns/zone_transfers/tsig.py
similarity index 88%
rename from src/cloudflare/types/secondary_dns/tsig.py
rename to src/cloudflare/types/dns/zone_transfers/tsig.py
index d5642ba3b72..2a00aad218d 100644
--- a/src/cloudflare/types/secondary_dns/tsig.py
+++ b/src/cloudflare/types/dns/zone_transfers/tsig.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
-from ..._models import BaseModel
+from ...._models import BaseModel
 
 __all__ = ["TSIG"]
 
diff --git a/src/cloudflare/types/secondary_dns/tsig_create_params.py b/src/cloudflare/types/dns/zone_transfers/tsig_create_params.py
similarity index 100%
rename from src/cloudflare/types/secondary_dns/tsig_create_params.py
rename to src/cloudflare/types/dns/zone_transfers/tsig_create_params.py
diff --git a/src/cloudflare/types/secondary_dns/tsig_delete_response.py b/src/cloudflare/types/dns/zone_transfers/tsig_delete_response.py
similarity index 86%
rename from src/cloudflare/types/secondary_dns/tsig_delete_response.py
rename to src/cloudflare/types/dns/zone_transfers/tsig_delete_response.py
index f81e354e528..7489ede5a76 100644
--- a/src/cloudflare/types/secondary_dns/tsig_delete_response.py
+++ b/src/cloudflare/types/dns/zone_transfers/tsig_delete_response.py
@@ -2,7 +2,7 @@
 
 from typing import Optional
 
-from ..._models import BaseModel
+from ...._models import BaseModel
 
 __all__ = ["TSIGDeleteResponse"]
 
diff --git a/src/cloudflare/types/secondary_dns/tsig_update_params.py b/src/cloudflare/types/dns/zone_transfers/tsig_update_params.py
similarity index 100%
rename from src/cloudflare/types/secondary_dns/tsig_update_params.py
rename to src/cloudflare/types/dns/zone_transfers/tsig_update_params.py
diff --git a/src/cloudflare/types/dns_firewall/__init__.py b/src/cloudflare/types/dns_firewall/__init__.py
new file mode 100644
index 00000000000..cd9e5cce5cb
--- /dev/null
+++ b/src/cloudflare/types/dns_firewall/__init__.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .firewall_ips import FirewallIPs as FirewallIPs
+from .upstream_ips import UpstreamIPs as UpstreamIPs
+from .attack_mitigation import AttackMitigation as AttackMitigation
+from .attack_mitigation_param import AttackMitigationParam as AttackMitigationParam
+from .reverse_dns_edit_params import ReverseDNSEditParams as ReverseDNSEditParams
+from .dns_firewall_edit_params import DNSFirewallEditParams as DNSFirewallEditParams
+from .dns_firewall_list_params import DNSFirewallListParams as DNSFirewallListParams
+from .reverse_dns_get_response import ReverseDNSGetResponse as ReverseDNSGetResponse
+from .dns_firewall_get_response import DNSFirewallGetResponse as DNSFirewallGetResponse
+from .reverse_dns_edit_response import ReverseDNSEditResponse as ReverseDNSEditResponse
+from .dns_firewall_create_params import DNSFirewallCreateParams as DNSFirewallCreateParams
+from .dns_firewall_edit_response import DNSFirewallEditResponse as DNSFirewallEditResponse
+from .dns_firewall_list_response import DNSFirewallListResponse as DNSFirewallListResponse
+from .dns_firewall_create_response import DNSFirewallCreateResponse as DNSFirewallCreateResponse
+from .dns_firewall_delete_response import DNSFirewallDeleteResponse as DNSFirewallDeleteResponse
diff --git a/src/cloudflare/types/dns/firewall/analytics/__init__.py b/src/cloudflare/types/dns_firewall/analytics/__init__.py
similarity index 100%
rename from src/cloudflare/types/dns/firewall/analytics/__init__.py
rename to src/cloudflare/types/dns_firewall/analytics/__init__.py
diff --git a/src/cloudflare/types/dns/firewall/analytics/report_get_params.py b/src/cloudflare/types/dns_firewall/analytics/report_get_params.py
similarity index 95%
rename from src/cloudflare/types/dns/firewall/analytics/report_get_params.py
rename to src/cloudflare/types/dns_firewall/analytics/report_get_params.py
index 5697245f32d..8ef5f5c9902 100644
--- a/src/cloudflare/types/dns/firewall/analytics/report_get_params.py
+++ b/src/cloudflare/types/dns_firewall/analytics/report_get_params.py
@@ -6,14 +6,14 @@
 from datetime import datetime
 from typing_extensions import Required, Annotated, TypedDict
 
-from ....._utils import PropertyInfo
+from ...._utils import PropertyInfo
 
 __all__ = ["ReportGetParams"]
 
 
 class ReportGetParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     dimensions: str
     """A comma-separated list of dimensions to group results by."""
diff --git a/src/cloudflare/types/dns/firewall/analytics/reports/__init__.py b/src/cloudflare/types/dns_firewall/analytics/reports/__init__.py
similarity index 100%
rename from src/cloudflare/types/dns/firewall/analytics/reports/__init__.py
rename to src/cloudflare/types/dns_firewall/analytics/reports/__init__.py
diff --git a/src/cloudflare/types/dns/firewall/analytics/reports/bytime_get_params.py b/src/cloudflare/types/dns_firewall/analytics/reports/bytime_get_params.py
similarity index 81%
rename from src/cloudflare/types/dns/firewall/analytics/reports/bytime_get_params.py
rename to src/cloudflare/types/dns_firewall/analytics/reports/bytime_get_params.py
index 34773f8974a..e335fd562be 100644
--- a/src/cloudflare/types/dns/firewall/analytics/reports/bytime_get_params.py
+++ b/src/cloudflare/types/dns_firewall/analytics/reports/bytime_get_params.py
@@ -4,17 +4,16 @@
 
 from typing import Union
 from datetime import datetime
-from typing_extensions import Required, Annotated, TypedDict
+from typing_extensions import Literal, Required, Annotated, TypedDict
 
-from ...delta import Delta
-from ......_utils import PropertyInfo
+from ....._utils import PropertyInfo
 
 __all__ = ["BytimeGetParams"]
 
 
 class BytimeGetParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     dimensions: str
     """A comma-separated list of dimensions to group results by."""
@@ -37,7 +36,7 @@ class BytimeGetParams(TypedDict, total=False):
     prefixed by - (descending) or + (ascending).
     """
 
-    time_delta: Delta
+    time_delta: Literal["all", "auto", "year", "quarter", "month", "week", "day", "hour", "dekaminute", "minute"]
     """Unit of time to group data by."""
 
     until: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
diff --git a/src/cloudflare/types/dns_firewall/attack_mitigation.py b/src/cloudflare/types/dns_firewall/attack_mitigation.py
new file mode 100644
index 00000000000..96d14dca279
--- /dev/null
+++ b/src/cloudflare/types/dns_firewall/attack_mitigation.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["AttackMitigation"]
+
+
+class AttackMitigation(BaseModel):
+    """Attack mitigation settings"""
+
+    enabled: Optional[bool] = None
+    """
+    When enabled, automatically mitigate random-prefix attacks to protect upstream
+    DNS servers
+    """
+
+    only_when_upstream_unhealthy: Optional[bool] = None
+    """Only mitigate attacks when upstream servers seem unhealthy"""
diff --git a/src/cloudflare/types/dns_firewall/attack_mitigation_param.py b/src/cloudflare/types/dns_firewall/attack_mitigation_param.py
new file mode 100644
index 00000000000..72dd6c61198
--- /dev/null
+++ b/src/cloudflare/types/dns_firewall/attack_mitigation_param.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import TypedDict
+
+__all__ = ["AttackMitigationParam"]
+
+
+class AttackMitigationParam(TypedDict, total=False):
+    """Attack mitigation settings"""
+
+    enabled: bool
+    """
+    When enabled, automatically mitigate random-prefix attacks to protect upstream
+    DNS servers
+    """
+
+    only_when_upstream_unhealthy: bool
+    """Only mitigate attacks when upstream servers seem unhealthy"""
diff --git a/src/cloudflare/types/dns_firewall/dns_firewall_create_params.py b/src/cloudflare/types/dns_firewall/dns_firewall_create_params.py
new file mode 100644
index 00000000000..996bf478de0
--- /dev/null
+++ b/src/cloudflare/types/dns_firewall/dns_firewall_create_params.py
@@ -0,0 +1,81 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .upstream_ips import UpstreamIPs
+from .attack_mitigation_param import AttackMitigationParam
+
+__all__ = ["DNSFirewallCreateParams"]
+
+
+class DNSFirewallCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """DNS Firewall cluster name"""
+
+    upstream_ips: Required[SequenceNotStr[UpstreamIPs]]
+
+    attack_mitigation: Optional[AttackMitigationParam]
+    """Attack mitigation settings"""
+
+    deprecate_any_requests: bool
+    """Whether to refuse to answer queries for the ANY type"""
+
+    ecs_fallback: bool
+    """Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent"""
+
+    maximum_cache_ttl: float
+    """
+    By default, Cloudflare attempts to cache responses for as long as indicated by
+    the TTL received from upstream nameservers. This setting sets an upper bound on
+    this duration. For caching purposes, higher TTLs will be decreased to the
+    maximum value defined by this setting.
+
+    This setting does not affect the TTL value in the DNS response Cloudflare
+    returns to clients. Cloudflare will always forward the TTL value received from
+    upstream nameservers.
+    """
+
+    minimum_cache_ttl: float
+    """
+    By default, Cloudflare attempts to cache responses for as long as indicated by
+    the TTL received from upstream nameservers. This setting sets a lower bound on
+    this duration. For caching purposes, lower TTLs will be increased to the minimum
+    value defined by this setting.
+
+    This setting does not affect the TTL value in the DNS response Cloudflare
+    returns to clients. Cloudflare will always forward the TTL value received from
+    upstream nameservers.
+
+    Note that, even with this setting, there is no guarantee that a response will be
+    cached for at least the specified duration. Cached responses may be removed
+    earlier for capacity or other operational reasons.
+    """
+
+    negative_cache_ttl: Optional[float]
+    """
+    This setting controls how long DNS Firewall should cache negative responses
+    (e.g., NXDOMAIN) from the upstream servers.
+
+    This setting does not affect the TTL value in the DNS response Cloudflare
+    returns to clients. Cloudflare will always forward the TTL value received from
+    upstream nameservers.
+    """
+
+    ratelimit: Optional[float]
+    """
+    Ratelimit in queries per second per datacenter (applies to DNS queries sent to
+    the upstream nameservers configured on the cluster)
+    """
+
+    retries: float
+    """
+    Number of retries for fetching DNS responses from upstream nameservers (not
+    counting the initial attempt)
+    """
diff --git a/src/cloudflare/types/dns_firewall/dns_firewall_create_response.py b/src/cloudflare/types/dns_firewall/dns_firewall_create_response.py
new file mode 100644
index 00000000000..f04b927506a
--- /dev/null
+++ b/src/cloudflare/types/dns_firewall/dns_firewall_create_response.py
@@ -0,0 +1,85 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+from .firewall_ips import FirewallIPs
+from .upstream_ips import UpstreamIPs
+from .attack_mitigation import AttackMitigation
+
+__all__ = ["DNSFirewallCreateResponse"]
+
+
+class DNSFirewallCreateResponse(BaseModel):
+    id: str
+    """Identifier."""
+
+    deprecate_any_requests: bool
+    """Whether to refuse to answer queries for the ANY type"""
+
+    dns_firewall_ips: List[FirewallIPs]
+
+    ecs_fallback: bool
+    """Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent"""
+
+    maximum_cache_ttl: float
+    """
+    By default, Cloudflare attempts to cache responses for as long as indicated by
+    the TTL received from upstream nameservers. This setting sets an upper bound on
+    this duration. For caching purposes, higher TTLs will be decreased to the
+    maximum value defined by this setting.
+
+    This setting does not affect the TTL value in the DNS response Cloudflare
+    returns to clients. Cloudflare will always forward the TTL value received from
+    upstream nameservers.
+    """
+
+    minimum_cache_ttl: float
+    """
+    By default, Cloudflare attempts to cache responses for as long as indicated by
+    the TTL received from upstream nameservers. This setting sets a lower bound on
+    this duration. For caching purposes, lower TTLs will be increased to the minimum
+    value defined by this setting.
+
+    This setting does not affect the TTL value in the DNS response Cloudflare
+    returns to clients. Cloudflare will always forward the TTL value received from
+    upstream nameservers.
+
+    Note that, even with this setting, there is no guarantee that a response will be
+    cached for at least the specified duration. Cached responses may be removed
+    earlier for capacity or other operational reasons.
+    """
+
+    modified_on: datetime
+    """Last modification of DNS Firewall cluster"""
+
+    name: str
+    """DNS Firewall cluster name"""
+
+    negative_cache_ttl: Optional[float] = None
+    """
+    This setting controls how long DNS Firewall should cache negative responses
+    (e.g., NXDOMAIN) from the upstream servers.
+
+    This setting does not affect the TTL value in the DNS response Cloudflare
+    returns to clients. Cloudflare will always forward the TTL value received from
+    upstream nameservers.
+    """
+
+    ratelimit: Optional[float] = None
+    """
+    Ratelimit in queries per second per datacenter (applies to DNS queries sent to
+    the upstream nameservers configured on the cluster)
+    """
+
+    retries: float
+    """
+    Number of retries for fetching DNS responses from upstream nameservers (not
+    counting the initial attempt)
+    """
+
+    upstream_ips: List[UpstreamIPs]
+
+    attack_mitigation: Optional[AttackMitigation] = None
+    """Attack mitigation settings"""
diff --git a/src/cloudflare/types/dns_firewall/dns_firewall_delete_response.py b/src/cloudflare/types/dns_firewall/dns_firewall_delete_response.py
new file mode 100644
index 00000000000..d608263842b
--- /dev/null
+++ b/src/cloudflare/types/dns_firewall/dns_firewall_delete_response.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["DNSFirewallDeleteResponse"]
+
+
+class DNSFirewallDeleteResponse(BaseModel):
+    id: Optional[str] = None
+    """Identifier."""
diff --git a/src/cloudflare/types/dns_firewall/dns_firewall_edit_params.py b/src/cloudflare/types/dns_firewall/dns_firewall_edit_params.py
new file mode 100644
index 00000000000..54db8800756
--- /dev/null
+++ b/src/cloudflare/types/dns_firewall/dns_firewall_edit_params.py
@@ -0,0 +1,81 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .upstream_ips import UpstreamIPs
+from .attack_mitigation_param import AttackMitigationParam
+
+__all__ = ["DNSFirewallEditParams"]
+
+
+class DNSFirewallEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    attack_mitigation: Optional[AttackMitigationParam]
+    """Attack mitigation settings"""
+
+    deprecate_any_requests: bool
+    """Whether to refuse to answer queries for the ANY type"""
+
+    ecs_fallback: bool
+    """Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent"""
+
+    maximum_cache_ttl: float
+    """
+    By default, Cloudflare attempts to cache responses for as long as indicated by
+    the TTL received from upstream nameservers. This setting sets an upper bound on
+    this duration. For caching purposes, higher TTLs will be decreased to the
+    maximum value defined by this setting.
+
+    This setting does not affect the TTL value in the DNS response Cloudflare
+    returns to clients. Cloudflare will always forward the TTL value received from
+    upstream nameservers.
+    """
+
+    minimum_cache_ttl: float
+    """
+    By default, Cloudflare attempts to cache responses for as long as indicated by
+    the TTL received from upstream nameservers. This setting sets a lower bound on
+    this duration. For caching purposes, lower TTLs will be increased to the minimum
+    value defined by this setting.
+
+    This setting does not affect the TTL value in the DNS response Cloudflare
+    returns to clients. Cloudflare will always forward the TTL value received from
+    upstream nameservers.
+
+    Note that, even with this setting, there is no guarantee that a response will be
+    cached for at least the specified duration. Cached responses may be removed
+    earlier for capacity or other operational reasons.
+    """
+
+    name: str
+    """DNS Firewall cluster name"""
+
+    negative_cache_ttl: Optional[float]
+    """
+    This setting controls how long DNS Firewall should cache negative responses
+    (e.g., NXDOMAIN) from the upstream servers.
+
+    This setting does not affect the TTL value in the DNS response Cloudflare
+    returns to clients. Cloudflare will always forward the TTL value received from
+    upstream nameservers.
+    """
+
+    ratelimit: Optional[float]
+    """
+    Ratelimit in queries per second per datacenter (applies to DNS queries sent to
+    the upstream nameservers configured on the cluster)
+    """
+
+    retries: float
+    """
+    Number of retries for fetching DNS responses from upstream nameservers (not
+    counting the initial attempt)
+    """
+
+    upstream_ips: SequenceNotStr[UpstreamIPs]
diff --git a/src/cloudflare/types/dns_firewall/dns_firewall_edit_response.py b/src/cloudflare/types/dns_firewall/dns_firewall_edit_response.py
new file mode 100644
index 00000000000..80253f6f09e
--- /dev/null
+++ b/src/cloudflare/types/dns_firewall/dns_firewall_edit_response.py
@@ -0,0 +1,85 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+from .firewall_ips import FirewallIPs
+from .upstream_ips import UpstreamIPs
+from .attack_mitigation import AttackMitigation
+
+__all__ = ["DNSFirewallEditResponse"]
+
+
+class DNSFirewallEditResponse(BaseModel):
+    id: str
+    """Identifier."""
+
+    deprecate_any_requests: bool
+    """Whether to refuse to answer queries for the ANY type"""
+
+    dns_firewall_ips: List[FirewallIPs]
+
+    ecs_fallback: bool
+    """Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent"""
+
+    maximum_cache_ttl: float
+    """
+    By default, Cloudflare attempts to cache responses for as long as indicated by
+    the TTL received from upstream nameservers. This setting sets an upper bound on
+    this duration. For caching purposes, higher TTLs will be decreased to the
+    maximum value defined by this setting.
+
+    This setting does not affect the TTL value in the DNS response Cloudflare
+    returns to clients. Cloudflare will always forward the TTL value received from
+    upstream nameservers.
+    """
+
+    minimum_cache_ttl: float
+    """
+    By default, Cloudflare attempts to cache responses for as long as indicated by
+    the TTL received from upstream nameservers. This setting sets a lower bound on
+    this duration. For caching purposes, lower TTLs will be increased to the minimum
+    value defined by this setting.
+
+    This setting does not affect the TTL value in the DNS response Cloudflare
+    returns to clients. Cloudflare will always forward the TTL value received from
+    upstream nameservers.
+
+    Note that, even with this setting, there is no guarantee that a response will be
+    cached for at least the specified duration. Cached responses may be removed
+    earlier for capacity or other operational reasons.
+    """
+
+    modified_on: datetime
+    """Last modification of DNS Firewall cluster"""
+
+    name: str
+    """DNS Firewall cluster name"""
+
+    negative_cache_ttl: Optional[float] = None
+    """
+    This setting controls how long DNS Firewall should cache negative responses
+    (e.g., NXDOMAIN) from the upstream servers.
+
+    This setting does not affect the TTL value in the DNS response Cloudflare
+    returns to clients. Cloudflare will always forward the TTL value received from
+    upstream nameservers.
+    """
+
+    ratelimit: Optional[float] = None
+    """
+    Ratelimit in queries per second per datacenter (applies to DNS queries sent to
+    the upstream nameservers configured on the cluster)
+    """
+
+    retries: float
+    """
+    Number of retries for fetching DNS responses from upstream nameservers (not
+    counting the initial attempt)
+    """
+
+    upstream_ips: List[UpstreamIPs]
+
+    attack_mitigation: Optional[AttackMitigation] = None
+    """Attack mitigation settings"""
diff --git a/src/cloudflare/types/dns_firewall/dns_firewall_get_response.py b/src/cloudflare/types/dns_firewall/dns_firewall_get_response.py
new file mode 100644
index 00000000000..b489d2635ad
--- /dev/null
+++ b/src/cloudflare/types/dns_firewall/dns_firewall_get_response.py
@@ -0,0 +1,85 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+from .firewall_ips import FirewallIPs
+from .upstream_ips import UpstreamIPs
+from .attack_mitigation import AttackMitigation
+
+__all__ = ["DNSFirewallGetResponse"]
+
+
+class DNSFirewallGetResponse(BaseModel):
+    id: str
+    """Identifier."""
+
+    deprecate_any_requests: bool
+    """Whether to refuse to answer queries for the ANY type"""
+
+    dns_firewall_ips: List[FirewallIPs]
+
+    ecs_fallback: bool
+    """Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent"""
+
+    maximum_cache_ttl: float
+    """
+    By default, Cloudflare attempts to cache responses for as long as indicated by
+    the TTL received from upstream nameservers. This setting sets an upper bound on
+    this duration. For caching purposes, higher TTLs will be decreased to the
+    maximum value defined by this setting.
+
+    This setting does not affect the TTL value in the DNS response Cloudflare
+    returns to clients. Cloudflare will always forward the TTL value received from
+    upstream nameservers.
+    """
+
+    minimum_cache_ttl: float
+    """
+    By default, Cloudflare attempts to cache responses for as long as indicated by
+    the TTL received from upstream nameservers. This setting sets a lower bound on
+    this duration. For caching purposes, lower TTLs will be increased to the minimum
+    value defined by this setting.
+
+    This setting does not affect the TTL value in the DNS response Cloudflare
+    returns to clients. Cloudflare will always forward the TTL value received from
+    upstream nameservers.
+
+    Note that, even with this setting, there is no guarantee that a response will be
+    cached for at least the specified duration. Cached responses may be removed
+    earlier for capacity or other operational reasons.
+    """
+
+    modified_on: datetime
+    """Last modification of DNS Firewall cluster"""
+
+    name: str
+    """DNS Firewall cluster name"""
+
+    negative_cache_ttl: Optional[float] = None
+    """
+    This setting controls how long DNS Firewall should cache negative responses
+    (e.g., NXDOMAIN) from the upstream servers.
+
+    This setting does not affect the TTL value in the DNS response Cloudflare
+    returns to clients. Cloudflare will always forward the TTL value received from
+    upstream nameservers.
+    """
+
+    ratelimit: Optional[float] = None
+    """
+    Ratelimit in queries per second per datacenter (applies to DNS queries sent to
+    the upstream nameservers configured on the cluster)
+    """
+
+    retries: float
+    """
+    Number of retries for fetching DNS responses from upstream nameservers (not
+    counting the initial attempt)
+    """
+
+    upstream_ips: List[UpstreamIPs]
+
+    attack_mitigation: Optional[AttackMitigation] = None
+    """Attack mitigation settings"""
diff --git a/src/cloudflare/types/dns_firewall/dns_firewall_list_params.py b/src/cloudflare/types/dns_firewall/dns_firewall_list_params.py
new file mode 100644
index 00000000000..7be6cb9e4c5
--- /dev/null
+++ b/src/cloudflare/types/dns_firewall/dns_firewall_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["DNSFirewallListParams"]
+
+
+class DNSFirewallListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    page: float
+    """Page number of paginated results"""
+
+    per_page: float
+    """Number of clusters per page"""
diff --git a/src/cloudflare/types/dns_firewall/dns_firewall_list_response.py b/src/cloudflare/types/dns_firewall/dns_firewall_list_response.py
new file mode 100644
index 00000000000..1aebe5c2159
--- /dev/null
+++ b/src/cloudflare/types/dns_firewall/dns_firewall_list_response.py
@@ -0,0 +1,85 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+from .firewall_ips import FirewallIPs
+from .upstream_ips import UpstreamIPs
+from .attack_mitigation import AttackMitigation
+
+__all__ = ["DNSFirewallListResponse"]
+
+
+class DNSFirewallListResponse(BaseModel):
+    id: str
+    """Identifier."""
+
+    deprecate_any_requests: bool
+    """Whether to refuse to answer queries for the ANY type"""
+
+    dns_firewall_ips: List[FirewallIPs]
+
+    ecs_fallback: bool
+    """Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent"""
+
+    maximum_cache_ttl: float
+    """
+    By default, Cloudflare attempts to cache responses for as long as indicated by
+    the TTL received from upstream nameservers. This setting sets an upper bound on
+    this duration. For caching purposes, higher TTLs will be decreased to the
+    maximum value defined by this setting.
+
+    This setting does not affect the TTL value in the DNS response Cloudflare
+    returns to clients. Cloudflare will always forward the TTL value received from
+    upstream nameservers.
+    """
+
+    minimum_cache_ttl: float
+    """
+    By default, Cloudflare attempts to cache responses for as long as indicated by
+    the TTL received from upstream nameservers. This setting sets a lower bound on
+    this duration. For caching purposes, lower TTLs will be increased to the minimum
+    value defined by this setting.
+
+    This setting does not affect the TTL value in the DNS response Cloudflare
+    returns to clients. Cloudflare will always forward the TTL value received from
+    upstream nameservers.
+
+    Note that, even with this setting, there is no guarantee that a response will be
+    cached for at least the specified duration. Cached responses may be removed
+    earlier for capacity or other operational reasons.
+    """
+
+    modified_on: datetime
+    """Last modification of DNS Firewall cluster"""
+
+    name: str
+    """DNS Firewall cluster name"""
+
+    negative_cache_ttl: Optional[float] = None
+    """
+    This setting controls how long DNS Firewall should cache negative responses
+    (e.g., NXDOMAIN) from the upstream servers.
+
+    This setting does not affect the TTL value in the DNS response Cloudflare
+    returns to clients. Cloudflare will always forward the TTL value received from
+    upstream nameservers.
+    """
+
+    ratelimit: Optional[float] = None
+    """
+    Ratelimit in queries per second per datacenter (applies to DNS queries sent to
+    the upstream nameservers configured on the cluster)
+    """
+
+    retries: float
+    """
+    Number of retries for fetching DNS responses from upstream nameservers (not
+    counting the initial attempt)
+    """
+
+    upstream_ips: List[UpstreamIPs]
+
+    attack_mitigation: Optional[AttackMitigation] = None
+    """Attack mitigation settings"""
diff --git a/src/cloudflare/types/dns_firewall/firewall_ips.py b/src/cloudflare/types/dns_firewall/firewall_ips.py
new file mode 100644
index 00000000000..9858c803091
--- /dev/null
+++ b/src/cloudflare/types/dns_firewall/firewall_ips.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["FirewallIPs"]
+
+FirewallIPs: TypeAlias = str
diff --git a/src/cloudflare/types/dns_firewall/reverse_dns_edit_params.py b/src/cloudflare/types/dns_firewall/reverse_dns_edit_params.py
new file mode 100644
index 00000000000..3dcee9d7c76
--- /dev/null
+++ b/src/cloudflare/types/dns_firewall/reverse_dns_edit_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ReverseDNSEditParams"]
+
+
+class ReverseDNSEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    ptr: Dict[str, str]
+    """Map of cluster IP addresses to PTR record contents"""
diff --git a/src/cloudflare/types/dns_firewall/reverse_dns_edit_response.py b/src/cloudflare/types/dns_firewall/reverse_dns_edit_response.py
new file mode 100644
index 00000000000..2d62ac9f0dd
--- /dev/null
+++ b/src/cloudflare/types/dns_firewall/reverse_dns_edit_response.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict
+
+from ..._models import BaseModel
+
+__all__ = ["ReverseDNSEditResponse"]
+
+
+class ReverseDNSEditResponse(BaseModel):
+    ptr: Dict[str, str]
+    """Map of cluster IP addresses to PTR record contents"""
diff --git a/src/cloudflare/types/dns_firewall/reverse_dns_get_response.py b/src/cloudflare/types/dns_firewall/reverse_dns_get_response.py
new file mode 100644
index 00000000000..21478156b97
--- /dev/null
+++ b/src/cloudflare/types/dns_firewall/reverse_dns_get_response.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict
+
+from ..._models import BaseModel
+
+__all__ = ["ReverseDNSGetResponse"]
+
+
+class ReverseDNSGetResponse(BaseModel):
+    ptr: Dict[str, str]
+    """Map of cluster IP addresses to PTR record contents"""
diff --git a/src/cloudflare/types/dns_firewall/upstream_ips.py b/src/cloudflare/types/dns_firewall/upstream_ips.py
new file mode 100644
index 00000000000..202a81ff09a
--- /dev/null
+++ b/src/cloudflare/types/dns_firewall/upstream_ips.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["UpstreamIPs"]
+
+UpstreamIPs: TypeAlias = str
diff --git a/src/cloudflare/types/dnssec/__init__.py b/src/cloudflare/types/dnssec/__init__.py
deleted file mode 100644
index a8c3b38cc31..00000000000
--- a/src/cloudflare/types/dnssec/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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_response import DNSSECDeleteResponse as DNSSECDeleteResponse
diff --git a/src/cloudflare/types/dnssec/dnssec.py b/src/cloudflare/types/dnssec/dnssec.py
deleted file mode 100644
index 0b18c1f6d2d..00000000000
--- a/src/cloudflare/types/dnssec/dnssec.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from datetime import datetime
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = ["DNSSEC"]
-
-
-class DNSSEC(BaseModel):
-    algorithm: Optional[str] = None
-    """Algorithm key code."""
-
-    digest: Optional[str] = None
-    """Digest hash."""
-
-    digest_algorithm: Optional[str] = None
-    """Type of digest algorithm."""
-
-    digest_type: Optional[str] = None
-    """Coded type for digest algorithm."""
-
-    dnssec_multi_signer: Optional[bool] = None
-    """
-    If true, multi-signer DNSSEC is enabled on the zone, allowing multiple providers
-    to serve a DNSSEC-signed zone at the same time. This is required for DNSKEY
-    records (except those automatically generated by Cloudflare) to be added to the
-    zone.
-
-    See
-    [Multi-signer DNSSEC](https://developers.cloudflare.com/dns/dnssec/multi-signer-dnssec/)
-    for details.
-    """
-
-    dnssec_presigned: Optional[bool] = None
-    """
-    If true, allows Cloudflare to transfer in a DNSSEC-signed zone including
-    signatures from an external provider, without requiring Cloudflare to sign any
-    records on the fly.
-
-    Note that this feature has some limitations. See
-    [Cloudflare as Secondary](https://developers.cloudflare.com/dns/zone-setups/zone-transfers/cloudflare-as-secondary/setup/#dnssec)
-    for details.
-    """
-
-    ds: Optional[str] = None
-    """Full DS record."""
-
-    flags: Optional[float] = None
-    """Flag for DNSSEC record."""
-
-    key_tag: Optional[float] = None
-    """Code for key tag."""
-
-    key_type: Optional[str] = None
-    """Algorithm key type."""
-
-    modified_on: Optional[datetime] = None
-    """When DNSSEC was last modified."""
-
-    public_key: Optional[str] = None
-    """Public key for DS record."""
-
-    status: Optional[Literal["active", "pending", "disabled", "pending-disabled", "error"]] = None
-    """
-    Status of DNSSEC, based on user-desired state and presence of necessary records.
-    """
diff --git a/src/cloudflare/types/dnssec/dnssec_delete_response.py b/src/cloudflare/types/dnssec/dnssec_delete_response.py
deleted file mode 100644
index cf05605b328..00000000000
--- a/src/cloudflare/types/dnssec/dnssec_delete_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union
-
-__all__ = ["DNSSECDeleteResponse"]
-
-DNSSECDeleteResponse = Union[str, object]
diff --git a/src/cloudflare/types/dnssec/dnssec_edit_params.py b/src/cloudflare/types/dnssec/dnssec_edit_params.py
deleted file mode 100644
index e2d99ec8a2f..00000000000
--- a/src/cloudflare/types/dnssec/dnssec_edit_params.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, Required, TypedDict
-
-__all__ = ["DNSSECEditParams"]
-
-
-class DNSSECEditParams(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    dnssec_multi_signer: bool
-    """
-    If true, multi-signer DNSSEC is enabled on the zone, allowing multiple providers
-    to serve a DNSSEC-signed zone at the same time. This is required for DNSKEY
-    records (except those automatically generated by Cloudflare) to be added to the
-    zone.
-
-    See
-    [Multi-signer DNSSEC](https://developers.cloudflare.com/dns/dnssec/multi-signer-dnssec/)
-    for details.
-    """
-
-    dnssec_presigned: bool
-    """
-    If true, allows Cloudflare to transfer in a DNSSEC-signed zone including
-    signatures from an external provider, without requiring Cloudflare to sign any
-    records on the fly.
-
-    Note that this feature has some limitations. See
-    [Cloudflare as Secondary](https://developers.cloudflare.com/dns/zone-setups/zone-transfers/cloudflare-as-secondary/setup/#dnssec)
-    for details.
-    """
-
-    status: Literal["active", "disabled"]
-    """
-    Status of DNSSEC, based on user-desired state and presence of necessary records.
-    """
diff --git a/src/cloudflare/types/durable_objects/__init__.py b/src/cloudflare/types/durable_objects/__init__.py
index c2e170ca3ca..16d53c80fdc 100644
--- a/src/cloudflare/types/durable_objects/__init__.py
+++ b/src/cloudflare/types/durable_objects/__init__.py
@@ -3,3 +3,4 @@
 from __future__ import annotations
 
 from .namespace import Namespace as Namespace
+from .namespace_list_params import NamespaceListParams as NamespaceListParams
diff --git a/src/cloudflare/types/durable_objects/namespace.py b/src/cloudflare/types/durable_objects/namespace.py
index 930c338d76a..cb1bb82f93f 100644
--- a/src/cloudflare/types/durable_objects/namespace.py
+++ b/src/cloudflare/types/durable_objects/namespace.py
@@ -10,10 +10,12 @@
 
 
 class Namespace(BaseModel):
-    id: Optional[object] = None
+    id: Optional[str] = None
 
-    class_: Optional[object] = FieldInfo(alias="class", default=None)
+    class_: Optional[str] = FieldInfo(alias="class", default=None)
 
-    name: Optional[object] = None
+    name: Optional[str] = None
 
-    script: Optional[object] = None
+    script: Optional[str] = None
+
+    use_sqlite: Optional[bool] = None
diff --git a/src/cloudflare/types/durable_objects/namespace_list_params.py b/src/cloudflare/types/durable_objects/namespace_list_params.py
new file mode 100644
index 00000000000..fbcee077363
--- /dev/null
+++ b/src/cloudflare/types/durable_objects/namespace_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["NamespaceListParams"]
+
+
+class NamespaceListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    page: int
+    """Current page."""
+
+    per_page: int
+    """Items per-page."""
diff --git a/src/cloudflare/types/durable_objects/namespaces/object_list_params.py b/src/cloudflare/types/durable_objects/namespaces/object_list_params.py
index f8f513d2d8a..c9aed59a0d1 100644
--- a/src/cloudflare/types/durable_objects/namespaces/object_list_params.py
+++ b/src/cloudflare/types/durable_objects/namespaces/object_list_params.py
@@ -9,7 +9,7 @@
 
 class ObjectListParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     cursor: str
     """
diff --git a/src/cloudflare/types/email_routing/__init__.py b/src/cloudflare/types/email_routing/__init__.py
index 8d2246d0cf8..553bab1e508 100644
--- a/src/cloudflare/types/email_routing/__init__.py
+++ b/src/cloudflare/types/email_routing/__init__.py
@@ -9,8 +9,11 @@
 from .dns_record import DNSRecord as DNSRecord
 from .action_param import ActionParam as ActionParam
 from .matcher_param import MatcherParam as MatcherParam
+from .dns_get_params import DNSGetParams as DNSGetParams
+from .dns_edit_params import DNSEditParams as DNSEditParams
 from .dns_get_response import DNSGetResponse as DNSGetResponse
 from .rule_list_params import RuleListParams as RuleListParams
+from .dns_create_params import DNSCreateParams as DNSCreateParams
 from .email_routing_rule import EmailRoutingRule as EmailRoutingRule
 from .rule_create_params import RuleCreateParams as RuleCreateParams
 from .rule_update_params import RuleUpdateParams as RuleUpdateParams
diff --git a/src/cloudflare/types/email_routing/action.py b/src/cloudflare/types/email_routing/action.py
index b27c3f1a41b..bb148d50819 100644
--- a/src/cloudflare/types/email_routing/action.py
+++ b/src/cloudflare/types/email_routing/action.py
@@ -1,6 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -9,7 +9,9 @@
 
 
 class Action(BaseModel):
+    """Actions pattern."""
+
     type: Literal["drop", "forward", "worker"]
     """Type of supported action."""
 
-    value: List[str]
+    value: Optional[List[str]] = None
diff --git a/src/cloudflare/types/email_routing/action_param.py b/src/cloudflare/types/email_routing/action_param.py
index 20411ce329e..e226f82c295 100644
--- a/src/cloudflare/types/email_routing/action_param.py
+++ b/src/cloudflare/types/email_routing/action_param.py
@@ -2,14 +2,17 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Literal, Required, TypedDict
 
+from ..._types import SequenceNotStr
+
 __all__ = ["ActionParam"]
 
 
 class ActionParam(TypedDict, total=False):
+    """Actions pattern."""
+
     type: Required[Literal["drop", "forward", "worker"]]
     """Type of supported action."""
 
-    value: Required[List[str]]
+    value: SequenceNotStr[str]
diff --git a/src/cloudflare/types/email_routing/address_create_params.py b/src/cloudflare/types/email_routing/address_create_params.py
index 433516b89eb..fa5067b932d 100644
--- a/src/cloudflare/types/email_routing/address_create_params.py
+++ b/src/cloudflare/types/email_routing/address_create_params.py
@@ -8,5 +8,8 @@
 
 
 class AddressCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
     email: Required[str]
     """The contact email address of the user."""
diff --git a/src/cloudflare/types/email_routing/address_list_params.py b/src/cloudflare/types/email_routing/address_list_params.py
index 4d3c0a7dddf..8e345e2e994 100644
--- a/src/cloudflare/types/email_routing/address_list_params.py
+++ b/src/cloudflare/types/email_routing/address_list_params.py
@@ -2,12 +2,15 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
 __all__ = ["AddressListParams"]
 
 
 class AddressListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
     direction: Literal["asc", "desc"]
     """Sorts results in an ascending or descending order."""
 
diff --git a/src/cloudflare/types/email_routing/dns_create_params.py b/src/cloudflare/types/email_routing/dns_create_params.py
new file mode 100644
index 00000000000..1d46da69429
--- /dev/null
+++ b/src/cloudflare/types/email_routing/dns_create_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["DNSCreateParams"]
+
+
+class DNSCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: str
+    """Domain of your zone."""
diff --git a/src/cloudflare/types/email_routing/dns_edit_params.py b/src/cloudflare/types/email_routing/dns_edit_params.py
new file mode 100644
index 00000000000..67ec9ed80d9
--- /dev/null
+++ b/src/cloudflare/types/email_routing/dns_edit_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["DNSEditParams"]
+
+
+class DNSEditParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    name: str
+    """Domain of your zone."""
diff --git a/src/cloudflare/types/email_routing/dns_get_params.py b/src/cloudflare/types/email_routing/dns_get_params.py
new file mode 100644
index 00000000000..926b1619307
--- /dev/null
+++ b/src/cloudflare/types/email_routing/dns_get_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["DNSGetParams"]
+
+
+class DNSGetParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    subdomain: str
+    """Domain of your zone."""
diff --git a/src/cloudflare/types/email_routing/dns_get_response.py b/src/cloudflare/types/email_routing/dns_get_response.py
index 9f15c755fa3..54476f9c753 100644
--- a/src/cloudflare/types/email_routing/dns_get_response.py
+++ b/src/cloudflare/types/email_routing/dns_get_response.py
@@ -1,9 +1,151 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Union, Optional
+from typing_extensions import Literal, TypeAlias
 
+from ..._models import BaseModel
 from .dns_record import DNSRecord
 
-__all__ = ["DNSGetResponse"]
+__all__ = [
+    "DNSGetResponse",
+    "EmailEmailRoutingDNSQueryResponse",
+    "EmailEmailRoutingDNSQueryResponseError",
+    "EmailEmailRoutingDNSQueryResponseErrorSource",
+    "EmailEmailRoutingDNSQueryResponseMessage",
+    "EmailEmailRoutingDNSQueryResponseMessageSource",
+    "EmailEmailRoutingDNSQueryResponseResult",
+    "EmailEmailRoutingDNSQueryResponseResultError",
+    "EmailEmailRoutingDNSQueryResponseResultInfo",
+    "EmailDNSSettingsResponseCollection",
+    "EmailDNSSettingsResponseCollectionError",
+    "EmailDNSSettingsResponseCollectionErrorSource",
+    "EmailDNSSettingsResponseCollectionMessage",
+    "EmailDNSSettingsResponseCollectionMessageSource",
+    "EmailDNSSettingsResponseCollectionResultInfo",
+]
 
-DNSGetResponse = List[DNSRecord]
+
+class EmailEmailRoutingDNSQueryResponseErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class EmailEmailRoutingDNSQueryResponseError(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[EmailEmailRoutingDNSQueryResponseErrorSource] = None
+
+
+class EmailEmailRoutingDNSQueryResponseMessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class EmailEmailRoutingDNSQueryResponseMessage(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[EmailEmailRoutingDNSQueryResponseMessageSource] = None
+
+
+class EmailEmailRoutingDNSQueryResponseResultError(BaseModel):
+    code: Optional[str] = None
+
+    missing: Optional[DNSRecord] = None
+    """List of records needed to enable an Email Routing zone."""
+
+
+class EmailEmailRoutingDNSQueryResponseResult(BaseModel):
+    errors: Optional[List[EmailEmailRoutingDNSQueryResponseResultError]] = None
+
+    record: Optional[List[DNSRecord]] = None
+
+
+class EmailEmailRoutingDNSQueryResponseResultInfo(BaseModel):
+    count: Optional[float] = None
+    """Total number of results for the requested service."""
+
+    page: Optional[float] = None
+    """Current page within paginated list of results."""
+
+    per_page: Optional[float] = None
+    """Number of results per page of results."""
+
+    total_count: Optional[float] = None
+    """Total results available without any search parameters."""
+
+
+class EmailEmailRoutingDNSQueryResponse(BaseModel):
+    errors: List[EmailEmailRoutingDNSQueryResponseError]
+
+    messages: List[EmailEmailRoutingDNSQueryResponseMessage]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
+
+    result: Optional[EmailEmailRoutingDNSQueryResponseResult] = None
+
+    result_info: Optional[EmailEmailRoutingDNSQueryResponseResultInfo] = None
+
+
+class EmailDNSSettingsResponseCollectionErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class EmailDNSSettingsResponseCollectionError(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[EmailDNSSettingsResponseCollectionErrorSource] = None
+
+
+class EmailDNSSettingsResponseCollectionMessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class EmailDNSSettingsResponseCollectionMessage(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[EmailDNSSettingsResponseCollectionMessageSource] = None
+
+
+class EmailDNSSettingsResponseCollectionResultInfo(BaseModel):
+    count: Optional[float] = None
+    """Total number of results for the requested service."""
+
+    page: Optional[float] = None
+    """Current page within paginated list of results."""
+
+    per_page: Optional[float] = None
+    """Number of results per page of results."""
+
+    total_count: Optional[float] = None
+    """Total results available without any search parameters."""
+
+
+class EmailDNSSettingsResponseCollection(BaseModel):
+    errors: List[EmailDNSSettingsResponseCollectionError]
+
+    messages: List[EmailDNSSettingsResponseCollectionMessage]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
+
+    result: Optional[List[DNSRecord]] = None
+
+    result_info: Optional[EmailDNSSettingsResponseCollectionResultInfo] = None
+
+
+DNSGetResponse: TypeAlias = Union[EmailEmailRoutingDNSQueryResponse, EmailDNSSettingsResponseCollection]
diff --git a/src/cloudflare/types/email_routing/dns_record.py b/src/cloudflare/types/email_routing/dns_record.py
index 92b600ce404..4819206e700 100644
--- a/src/cloudflare/types/email_routing/dns_record.py
+++ b/src/cloudflare/types/email_routing/dns_record.py
@@ -9,6 +9,8 @@
 
 
 class DNSRecord(BaseModel):
+    """List of records needed to enable an Email Routing zone."""
+
     content: Optional[str] = None
     """DNS record content."""
 
diff --git a/src/cloudflare/types/email_routing/email_routing_disable_params.py b/src/cloudflare/types/email_routing/email_routing_disable_params.py
index e6fb98c600d..94f4891ad9b 100644
--- a/src/cloudflare/types/email_routing/email_routing_disable_params.py
+++ b/src/cloudflare/types/email_routing/email_routing_disable_params.py
@@ -8,4 +8,7 @@
 
 
 class EmailRoutingDisableParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
     body: Required[object]
diff --git a/src/cloudflare/types/email_routing/email_routing_enable_params.py b/src/cloudflare/types/email_routing/email_routing_enable_params.py
index 5dfc90d2384..5feb5e016fa 100644
--- a/src/cloudflare/types/email_routing/email_routing_enable_params.py
+++ b/src/cloudflare/types/email_routing/email_routing_enable_params.py
@@ -8,4 +8,7 @@
 
 
 class EmailRoutingEnableParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
     body: Required[object]
diff --git a/src/cloudflare/types/email_routing/matcher.py b/src/cloudflare/types/email_routing/matcher.py
index d63819b6a3c..f2855be2a88 100644
--- a/src/cloudflare/types/email_routing/matcher.py
+++ b/src/cloudflare/types/email_routing/matcher.py
@@ -1,5 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import Optional
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -8,11 +9,13 @@
 
 
 class Matcher(BaseModel):
-    field: Literal["to"]
-    """Field for type matcher."""
+    """Matching pattern to forward your actions."""
 
-    type: Literal["literal"]
+    type: Literal["all", "literal"]
     """Type of matcher."""
 
-    value: str
+    field: Optional[Literal["to"]] = None
+    """Field for type matcher."""
+
+    value: Optional[str] = None
     """Value for matcher."""
diff --git a/src/cloudflare/types/email_routing/matcher_param.py b/src/cloudflare/types/email_routing/matcher_param.py
index cae8d7e45dd..06d725a34a2 100644
--- a/src/cloudflare/types/email_routing/matcher_param.py
+++ b/src/cloudflare/types/email_routing/matcher_param.py
@@ -8,11 +8,13 @@
 
 
 class MatcherParam(TypedDict, total=False):
-    field: Required[Literal["to"]]
-    """Field for type matcher."""
+    """Matching pattern to forward your actions."""
 
-    type: Required[Literal["literal"]]
+    type: Required[Literal["all", "literal"]]
     """Type of matcher."""
 
-    value: Required[str]
+    field: Literal["to"]
+    """Field for type matcher."""
+
+    value: str
     """Value for matcher."""
diff --git a/src/cloudflare/types/email_routing/rule_create_params.py b/src/cloudflare/types/email_routing/rule_create_params.py
index 2dca15de5ec..9c99864160e 100644
--- a/src/cloudflare/types/email_routing/rule_create_params.py
+++ b/src/cloudflare/types/email_routing/rule_create_params.py
@@ -12,6 +12,9 @@
 
 
 class RuleCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
     actions: Required[Iterable[ActionParam]]
     """List actions patterns."""
 
diff --git a/src/cloudflare/types/email_routing/rule_list_params.py b/src/cloudflare/types/email_routing/rule_list_params.py
index d1311938e06..bb27b3d4885 100644
--- a/src/cloudflare/types/email_routing/rule_list_params.py
+++ b/src/cloudflare/types/email_routing/rule_list_params.py
@@ -2,12 +2,15 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
 __all__ = ["RuleListParams"]
 
 
 class RuleListParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
     enabled: Literal[True, False]
     """Filter by enabled routing rules."""
 
diff --git a/src/cloudflare/types/email_routing/rule_update_params.py b/src/cloudflare/types/email_routing/rule_update_params.py
index 3ed26c999ab..eaa7f60e258 100644
--- a/src/cloudflare/types/email_routing/rule_update_params.py
+++ b/src/cloudflare/types/email_routing/rule_update_params.py
@@ -12,8 +12,8 @@
 
 
 class RuleUpdateParams(TypedDict, total=False):
-    zone_identifier: Required[str]
-    """Identifier"""
+    zone_id: Required[str]
+    """Identifier."""
 
     actions: Required[Iterable[ActionParam]]
     """List actions patterns."""
diff --git a/src/cloudflare/types/email_routing/rules/catch_all_action.py b/src/cloudflare/types/email_routing/rules/catch_all_action.py
index bfd4485f68d..bbf14c181aa 100644
--- a/src/cloudflare/types/email_routing/rules/catch_all_action.py
+++ b/src/cloudflare/types/email_routing/rules/catch_all_action.py
@@ -9,6 +9,8 @@
 
 
 class CatchAllAction(BaseModel):
+    """Action for the catch-all routing rule."""
+
     type: Literal["drop", "forward", "worker"]
     """Type of action for catch-all rule."""
 
diff --git a/src/cloudflare/types/email_routing/rules/catch_all_action_param.py b/src/cloudflare/types/email_routing/rules/catch_all_action_param.py
index 832c3457bcb..3891eac13c1 100644
--- a/src/cloudflare/types/email_routing/rules/catch_all_action_param.py
+++ b/src/cloudflare/types/email_routing/rules/catch_all_action_param.py
@@ -2,14 +2,17 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Literal, Required, TypedDict
 
+from ...._types import SequenceNotStr
+
 __all__ = ["CatchAllActionParam"]
 
 
 class CatchAllActionParam(TypedDict, total=False):
+    """Action for the catch-all routing rule."""
+
     type: Required[Literal["drop", "forward", "worker"]]
     """Type of action for catch-all rule."""
 
-    value: List[str]
+    value: SequenceNotStr[str]
diff --git a/src/cloudflare/types/email_routing/rules/catch_all_matcher.py b/src/cloudflare/types/email_routing/rules/catch_all_matcher.py
index 982ed202d06..32ded4fedc1 100644
--- a/src/cloudflare/types/email_routing/rules/catch_all_matcher.py
+++ b/src/cloudflare/types/email_routing/rules/catch_all_matcher.py
@@ -8,5 +8,7 @@
 
 
 class CatchAllMatcher(BaseModel):
+    """Matcher for catch-all routing rule."""
+
     type: Literal["all"]
     """Type of matcher. Default is 'all'."""
diff --git a/src/cloudflare/types/email_routing/rules/catch_all_matcher_param.py b/src/cloudflare/types/email_routing/rules/catch_all_matcher_param.py
index d22950c2d68..8e6b9e96d4c 100644
--- a/src/cloudflare/types/email_routing/rules/catch_all_matcher_param.py
+++ b/src/cloudflare/types/email_routing/rules/catch_all_matcher_param.py
@@ -8,5 +8,7 @@
 
 
 class CatchAllMatcherParam(TypedDict, total=False):
+    """Matcher for catch-all routing rule."""
+
     type: Required[Literal["all"]]
     """Type of matcher. Default is 'all'."""
diff --git a/src/cloudflare/types/email_routing/rules/catch_all_update_params.py b/src/cloudflare/types/email_routing/rules/catch_all_update_params.py
index a4841b1995d..950fb1e1b36 100644
--- a/src/cloudflare/types/email_routing/rules/catch_all_update_params.py
+++ b/src/cloudflare/types/email_routing/rules/catch_all_update_params.py
@@ -12,6 +12,9 @@
 
 
 class CatchAllUpdateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
     actions: Required[Iterable[CatchAllActionParam]]
     """List actions for the catch-all routing rule."""
 
diff --git a/src/cloudflare/types/email_routing/settings.py b/src/cloudflare/types/email_routing/settings.py
index 7db6e4a5f0b..9688cfbe2d1 100644
--- a/src/cloudflare/types/email_routing/settings.py
+++ b/src/cloudflare/types/email_routing/settings.py
@@ -10,21 +10,21 @@
 
 
 class Settings(BaseModel):
-    id: Optional[str] = None
+    id: str
     """Email Routing settings identifier."""
 
+    enabled: Literal[True, False]
+    """State of the zone settings for Email Routing."""
+
+    name: str
+    """Domain of your zone."""
+
     created: Optional[datetime] = None
     """The date and time the settings have been created."""
 
-    enabled: Optional[Literal[True, False]] = None
-    """State of the zone settings for Email Routing."""
-
     modified: Optional[datetime] = None
     """The date and time the settings have been modified."""
 
-    name: Optional[str] = None
-    """Domain of your zone."""
-
     skip_wizard: Optional[Literal[True, False]] = None
     """Flag to check if the user skipped the configuration wizard."""
 
diff --git a/src/cloudflare/types/email_security/__init__.py b/src/cloudflare/types/email_security/__init__.py
new file mode 100644
index 00000000000..c6de765e0ce
--- /dev/null
+++ b/src/cloudflare/types/email_security/__init__.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .submission_list_params import SubmissionListParams as SubmissionListParams
+from .investigate_list_params import InvestigateListParams as InvestigateListParams
+from .investigate_get_response import InvestigateGetResponse as InvestigateGetResponse
+from .submission_list_response import SubmissionListResponse as SubmissionListResponse
+from .investigate_list_response import InvestigateListResponse as InvestigateListResponse
diff --git a/src/cloudflare/types/email_security/investigate/__init__.py b/src/cloudflare/types/email_security/investigate/__init__.py
new file mode 100644
index 00000000000..e694dd47b9b
--- /dev/null
+++ b/src/cloudflare/types/email_security/investigate/__init__.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .move_bulk_params import MoveBulkParams as MoveBulkParams
+from .raw_get_response import RawGetResponse as RawGetResponse
+from .move_bulk_response import MoveBulkResponse as MoveBulkResponse
+from .move_create_params import MoveCreateParams as MoveCreateParams
+from .trace_get_response import TraceGetResponse as TraceGetResponse
+from .release_bulk_params import ReleaseBulkParams as ReleaseBulkParams
+from .move_create_response import MoveCreateResponse as MoveCreateResponse
+from .preview_get_response import PreviewGetResponse as PreviewGetResponse
+from .preview_create_params import PreviewCreateParams as PreviewCreateParams
+from .release_bulk_response import ReleaseBulkResponse as ReleaseBulkResponse
+from .detection_get_response import DetectionGetResponse as DetectionGetResponse
+from .preview_create_response import PreviewCreateResponse as PreviewCreateResponse
+from .reclassify_create_params import ReclassifyCreateParams as ReclassifyCreateParams
diff --git a/src/cloudflare/types/email_security/investigate/detection_get_response.py b/src/cloudflare/types/email_security/investigate/detection_get_response.py
new file mode 100644
index 00000000000..0897317cee2
--- /dev/null
+++ b/src/cloudflare/types/email_security/investigate/detection_get_response.py
@@ -0,0 +1,108 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["DetectionGetResponse", "Attachment", "Header", "Link", "SenderInfo", "ThreatCategory", "Validation"]
+
+
+class Attachment(BaseModel):
+    size: int
+
+    content_type: Optional[str] = None
+
+    detection: Optional[
+        Literal[
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE",
+        ]
+    ] = None
+
+    encrypted: Optional[bool] = None
+
+    name: Optional[str] = None
+
+
+class Header(BaseModel):
+    name: str
+
+    value: str
+
+
+class Link(BaseModel):
+    href: str
+
+    text: Optional[str] = None
+
+
+class SenderInfo(BaseModel):
+    as_name: Optional[str] = None
+    """The name of the autonomous system."""
+
+    as_number: Optional[int] = None
+    """The number of the autonomous system."""
+
+    geo: Optional[str] = None
+
+    ip: Optional[str] = None
+
+    pld: Optional[str] = None
+
+
+class ThreatCategory(BaseModel):
+    id: int
+
+    description: Optional[str] = None
+
+    name: Optional[str] = None
+
+
+class Validation(BaseModel):
+    comment: Optional[str] = None
+
+    dkim: Optional[Literal["pass", "neutral", "fail", "error", "none"]] = None
+
+    dmarc: Optional[Literal["pass", "neutral", "fail", "error", "none"]] = None
+
+    spf: Optional[Literal["pass", "neutral", "fail", "error", "none"]] = None
+
+
+class DetectionGetResponse(BaseModel):
+    action: str
+
+    attachments: List[Attachment]
+
+    headers: List[Header]
+
+    links: List[Link]
+
+    sender_info: SenderInfo
+
+    threat_categories: List[ThreatCategory]
+
+    validation: Validation
+
+    final_disposition: Optional[
+        Literal[
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE",
+        ]
+    ] = None
diff --git a/src/cloudflare/types/email_security/investigate/move_bulk_params.py b/src/cloudflare/types/email_security/investigate/move_bulk_params.py
new file mode 100644
index 00000000000..b269132b524
--- /dev/null
+++ b/src/cloudflare/types/email_security/investigate/move_bulk_params.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["MoveBulkParams"]
+
+
+class MoveBulkParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    destination: Required[
+        Literal["Inbox", "JunkEmail", "DeletedItems", "RecoverableItemsDeletions", "RecoverableItemsPurges"]
+    ]
+
+    ids: SequenceNotStr[str]
+    """List of message IDs to move."""
+
+    postfix_ids: SequenceNotStr[str]
+    """Deprecated: Use `ids` instead. List of message IDs to move."""
diff --git a/src/cloudflare/types/email_security/investigate/move_bulk_response.py b/src/cloudflare/types/email_security/investigate/move_bulk_response.py
new file mode 100644
index 00000000000..2a927604874
--- /dev/null
+++ b/src/cloudflare/types/email_security/investigate/move_bulk_response.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["MoveBulkResponse"]
+
+
+class MoveBulkResponse(BaseModel):
+    completed_timestamp: datetime
+
+    item_count: int
+
+    success: bool
+
+    destination: Optional[str] = None
+
+    message_id: Optional[str] = None
+
+    operation: Optional[str] = None
+
+    recipient: Optional[str] = None
+
+    status: Optional[str] = None
diff --git a/src/cloudflare/types/email_security/investigate/move_create_params.py b/src/cloudflare/types/email_security/investigate/move_create_params.py
new file mode 100644
index 00000000000..7628fa91699
--- /dev/null
+++ b/src/cloudflare/types/email_security/investigate/move_create_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["MoveCreateParams"]
+
+
+class MoveCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    destination: Required[
+        Literal["Inbox", "JunkEmail", "DeletedItems", "RecoverableItemsDeletions", "RecoverableItemsPurges"]
+    ]
diff --git a/src/cloudflare/types/email_security/investigate/move_create_response.py b/src/cloudflare/types/email_security/investigate/move_create_response.py
new file mode 100644
index 00000000000..db48b89aa9f
--- /dev/null
+++ b/src/cloudflare/types/email_security/investigate/move_create_response.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["MoveCreateResponse"]
+
+
+class MoveCreateResponse(BaseModel):
+    completed_timestamp: datetime
+
+    item_count: int
+
+    success: bool
+
+    destination: Optional[str] = None
+
+    message_id: Optional[str] = None
+
+    operation: Optional[str] = None
+
+    recipient: Optional[str] = None
+
+    status: Optional[str] = None
diff --git a/src/cloudflare/types/email_security/investigate/preview_create_params.py b/src/cloudflare/types/email_security/investigate/preview_create_params.py
new file mode 100644
index 00000000000..b5443edc58f
--- /dev/null
+++ b/src/cloudflare/types/email_security/investigate/preview_create_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["PreviewCreateParams"]
+
+
+class PreviewCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    postfix_id: Required[str]
+    """The identifier of the message."""
diff --git a/src/cloudflare/types/email_security/investigate/preview_create_response.py b/src/cloudflare/types/email_security/investigate/preview_create_response.py
new file mode 100644
index 00000000000..5a42736be47
--- /dev/null
+++ b/src/cloudflare/types/email_security/investigate/preview_create_response.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["PreviewCreateResponse"]
+
+
+class PreviewCreateResponse(BaseModel):
+    screenshot: str
+    """A base64 encoded PNG image of the email."""
diff --git a/src/cloudflare/types/email_security/investigate/preview_get_response.py b/src/cloudflare/types/email_security/investigate/preview_get_response.py
new file mode 100644
index 00000000000..a34a109ac48
--- /dev/null
+++ b/src/cloudflare/types/email_security/investigate/preview_get_response.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["PreviewGetResponse"]
+
+
+class PreviewGetResponse(BaseModel):
+    screenshot: str
+    """A base64 encoded PNG image of the email."""
diff --git a/src/cloudflare/types/email_security/investigate/raw_get_response.py b/src/cloudflare/types/email_security/investigate/raw_get_response.py
new file mode 100644
index 00000000000..06544943fca
--- /dev/null
+++ b/src/cloudflare/types/email_security/investigate/raw_get_response.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["RawGetResponse"]
+
+
+class RawGetResponse(BaseModel):
+    raw: str
+    """A UTF-8 encoded eml file of the email."""
diff --git a/src/cloudflare/types/email_security/investigate/reclassify_create_params.py b/src/cloudflare/types/email_security/investigate/reclassify_create_params.py
new file mode 100644
index 00000000000..fac700c39e1
--- /dev/null
+++ b/src/cloudflare/types/email_security/investigate/reclassify_create_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["ReclassifyCreateParams"]
+
+
+class ReclassifyCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    expected_disposition: Required[Literal["NONE", "BULK", "MALICIOUS", "SPAM", "SPOOF", "SUSPICIOUS"]]
+
+    eml_content: str
+    """Base64 encoded content of the EML file"""
+
+    escalated_submission_id: str
diff --git a/src/cloudflare/types/email_security/investigate/release_bulk_params.py b/src/cloudflare/types/email_security/investigate/release_bulk_params.py
new file mode 100644
index 00000000000..fa6f4ef65b3
--- /dev/null
+++ b/src/cloudflare/types/email_security/investigate/release_bulk_params.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["ReleaseBulkParams"]
+
+
+class ReleaseBulkParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    body: Required[SequenceNotStr[str]]
+    """A list of messages identfied by their `postfix_id`s that should be released."""
diff --git a/src/cloudflare/types/email_security/investigate/release_bulk_response.py b/src/cloudflare/types/email_security/investigate/release_bulk_response.py
new file mode 100644
index 00000000000..b766ac7b3f0
--- /dev/null
+++ b/src/cloudflare/types/email_security/investigate/release_bulk_response.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ...._models import BaseModel
+
+__all__ = ["ReleaseBulkResponse"]
+
+
+class ReleaseBulkResponse(BaseModel):
+    id: str
+
+    postfix_id: str
+    """The identifier of the message."""
+
+    delivered: Optional[List[str]] = None
+
+    failed: Optional[List[str]] = None
+
+    undelivered: Optional[List[str]] = None
diff --git a/src/cloudflare/types/email_security/investigate/trace_get_response.py b/src/cloudflare/types/email_security/investigate/trace_get_response.py
new file mode 100644
index 00000000000..98bce7e2bd2
--- /dev/null
+++ b/src/cloudflare/types/email_security/investigate/trace_get_response.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["TraceGetResponse", "Inbound", "InboundLine", "Outbound", "OutboundLine"]
+
+
+class InboundLine(BaseModel):
+    lineno: int
+
+    message: str
+
+    ts: datetime
+
+
+class Inbound(BaseModel):
+    lines: Optional[List[InboundLine]] = None
+
+    pending: Optional[bool] = None
+
+
+class OutboundLine(BaseModel):
+    lineno: int
+
+    message: str
+
+    ts: datetime
+
+
+class Outbound(BaseModel):
+    lines: Optional[List[OutboundLine]] = None
+
+    pending: Optional[bool] = None
+
+
+class TraceGetResponse(BaseModel):
+    inbound: Inbound
+
+    outbound: Outbound
diff --git a/src/cloudflare/types/email_security/investigate_get_response.py b/src/cloudflare/types/email_security/investigate_get_response.py
new file mode 100644
index 00000000000..c3bb7927ab0
--- /dev/null
+++ b/src/cloudflare/types/email_security/investigate_get_response.py
@@ -0,0 +1,173 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["InvestigateGetResponse", "Properties", "Finding", "Validation"]
+
+
+class Properties(BaseModel):
+    allowlisted_pattern: Optional[str] = None
+
+    allowlisted_pattern_type: Optional[
+        Literal[
+            "quarantine_release",
+            "acceptable_sender",
+            "allowed_sender",
+            "allowed_recipient",
+            "domain_similarity",
+            "domain_recency",
+            "managed_acceptable_sender",
+            "outbound_ndr",
+        ]
+    ] = None
+
+    blocklisted_message: Optional[bool] = None
+
+    blocklisted_pattern: Optional[str] = None
+
+    whitelisted_pattern_type: Optional[
+        Literal[
+            "quarantine_release",
+            "acceptable_sender",
+            "allowed_sender",
+            "allowed_recipient",
+            "domain_similarity",
+            "domain_recency",
+            "managed_acceptable_sender",
+            "outbound_ndr",
+        ]
+    ] = None
+
+
+class Finding(BaseModel):
+    attachment: Optional[str] = None
+
+    detail: Optional[str] = None
+
+    detection: Optional[
+        Literal[
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE",
+        ]
+    ] = None
+
+    field: Optional[str] = None
+
+    name: Optional[str] = None
+
+    portion: Optional[str] = None
+
+    reason: Optional[str] = None
+
+    score: Optional[float] = None
+
+    value: Optional[str] = None
+
+
+class Validation(BaseModel):
+    comment: Optional[str] = None
+
+    dkim: Optional[Literal["pass", "neutral", "fail", "error", "none"]] = None
+
+    dmarc: Optional[Literal["pass", "neutral", "fail", "error", "none"]] = None
+
+    spf: Optional[Literal["pass", "neutral", "fail", "error", "none"]] = None
+
+
+class InvestigateGetResponse(BaseModel):
+    id: str
+
+    action_log: object
+
+    client_recipients: List[str]
+
+    detection_reasons: List[str]
+
+    is_phish_submission: bool
+
+    is_quarantined: bool
+
+    postfix_id: str
+    """The identifier of the message."""
+
+    properties: Properties
+
+    ts: str
+
+    alert_id: Optional[str] = None
+
+    delivery_mode: Optional[
+        Literal[
+            "DIRECT",
+            "BCC",
+            "JOURNAL",
+            "REVIEW_SUBMISSION",
+            "DMARC_UNVERIFIED",
+            "DMARC_FAILURE_REPORT",
+            "DMARC_AGGREGATE_REPORT",
+            "THREAT_INTEL_SUBMISSION",
+            "SIMULATION_SUBMISSION",
+            "API",
+            "RETRO_SCAN",
+        ]
+    ] = None
+
+    edf_hash: Optional[str] = None
+
+    envelope_from: Optional[str] = None
+
+    envelope_to: Optional[List[str]] = None
+
+    final_disposition: Optional[
+        Literal[
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE",
+        ]
+    ] = None
+
+    findings: Optional[List[Finding]] = None
+
+    from_: Optional[str] = FieldInfo(alias="from", default=None)
+
+    from_name: Optional[str] = None
+
+    htmltext_structure_hash: Optional[str] = None
+
+    message_id: Optional[str] = None
+
+    postfix_id_outbound: Optional[str] = None
+
+    replyto: Optional[str] = None
+
+    sent_date: Optional[str] = None
+
+    subject: Optional[str] = None
+
+    threat_categories: Optional[List[str]] = None
+
+    to: Optional[List[str]] = None
+
+    to_name: Optional[List[str]] = None
+
+    validation: Optional[Validation] = None
diff --git a/src/cloudflare/types/email_security/investigate_list_params.py b/src/cloudflare/types/email_security/investigate_list_params.py
new file mode 100644
index 00000000000..8d1ee8bc1a6
--- /dev/null
+++ b/src/cloudflare/types/email_security/investigate_list_params.py
@@ -0,0 +1,84 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["InvestigateListParams"]
+
+
+class InvestigateListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    action_log: bool
+    """Determines if the message action log is included in the response."""
+
+    alert_id: str
+
+    cursor: str
+
+    detections_only: bool
+    """Determines if the search results will include detections or not."""
+
+    domain: str
+    """The sender domains the search filters by."""
+
+    end: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """The end of the search date range. Defaults to `now`."""
+
+    final_disposition: Literal["MALICIOUS", "SUSPICIOUS", "SPOOF", "SPAM", "BULK", "NONE"]
+    """The dispositions the search filters by."""
+
+    message_action: Literal["PREVIEW", "QUARANTINE_RELEASED", "MOVED"]
+    """The message actions the search filters by."""
+
+    message_id: str
+
+    metric: str
+
+    page: Optional[int]
+    """Deprecated: Use cursor pagination instead."""
+
+    per_page: int
+    """The number of results per page."""
+
+    query: str
+    """The space-delimited term used in the query. The search is case-insensitive.
+
+    The content of the following email metadata fields are searched:
+
+    - alert_id
+    - CC
+    - From (envelope_from)
+    - From Name
+    - final_disposition
+    - md5 hash (of any attachment)
+    - sha1 hash (of any attachment)
+    - sha256 hash (of any attachment)
+    - name (of any attachment)
+    - Reason
+    - Received DateTime (yyyy-mm-ddThh:mm:ss)
+    - Sent DateTime (yyyy-mm-ddThh:mm:ss)
+    - ReplyTo
+    - To (envelope_to)
+    - To Name
+    - Message-ID
+    - smtp_helo_server_ip
+    - smtp_previous_hop_ip
+    - x_originating_ip
+    - Subject
+    """
+
+    recipient: str
+
+    sender: str
+
+    start: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """The beginning of the search date range. Defaults to `now - 30 days`."""
+
+    subject: str
diff --git a/src/cloudflare/types/email_security/investigate_list_response.py b/src/cloudflare/types/email_security/investigate_list_response.py
new file mode 100644
index 00000000000..dbf5f9c25e6
--- /dev/null
+++ b/src/cloudflare/types/email_security/investigate_list_response.py
@@ -0,0 +1,173 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["InvestigateListResponse", "Properties", "Finding", "Validation"]
+
+
+class Properties(BaseModel):
+    allowlisted_pattern: Optional[str] = None
+
+    allowlisted_pattern_type: Optional[
+        Literal[
+            "quarantine_release",
+            "acceptable_sender",
+            "allowed_sender",
+            "allowed_recipient",
+            "domain_similarity",
+            "domain_recency",
+            "managed_acceptable_sender",
+            "outbound_ndr",
+        ]
+    ] = None
+
+    blocklisted_message: Optional[bool] = None
+
+    blocklisted_pattern: Optional[str] = None
+
+    whitelisted_pattern_type: Optional[
+        Literal[
+            "quarantine_release",
+            "acceptable_sender",
+            "allowed_sender",
+            "allowed_recipient",
+            "domain_similarity",
+            "domain_recency",
+            "managed_acceptable_sender",
+            "outbound_ndr",
+        ]
+    ] = None
+
+
+class Finding(BaseModel):
+    attachment: Optional[str] = None
+
+    detail: Optional[str] = None
+
+    detection: Optional[
+        Literal[
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE",
+        ]
+    ] = None
+
+    field: Optional[str] = None
+
+    name: Optional[str] = None
+
+    portion: Optional[str] = None
+
+    reason: Optional[str] = None
+
+    score: Optional[float] = None
+
+    value: Optional[str] = None
+
+
+class Validation(BaseModel):
+    comment: Optional[str] = None
+
+    dkim: Optional[Literal["pass", "neutral", "fail", "error", "none"]] = None
+
+    dmarc: Optional[Literal["pass", "neutral", "fail", "error", "none"]] = None
+
+    spf: Optional[Literal["pass", "neutral", "fail", "error", "none"]] = None
+
+
+class InvestigateListResponse(BaseModel):
+    id: str
+
+    action_log: object
+
+    client_recipients: List[str]
+
+    detection_reasons: List[str]
+
+    is_phish_submission: bool
+
+    is_quarantined: bool
+
+    postfix_id: str
+    """The identifier of the message."""
+
+    properties: Properties
+
+    ts: str
+
+    alert_id: Optional[str] = None
+
+    delivery_mode: Optional[
+        Literal[
+            "DIRECT",
+            "BCC",
+            "JOURNAL",
+            "REVIEW_SUBMISSION",
+            "DMARC_UNVERIFIED",
+            "DMARC_FAILURE_REPORT",
+            "DMARC_AGGREGATE_REPORT",
+            "THREAT_INTEL_SUBMISSION",
+            "SIMULATION_SUBMISSION",
+            "API",
+            "RETRO_SCAN",
+        ]
+    ] = None
+
+    edf_hash: Optional[str] = None
+
+    envelope_from: Optional[str] = None
+
+    envelope_to: Optional[List[str]] = None
+
+    final_disposition: Optional[
+        Literal[
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE",
+        ]
+    ] = None
+
+    findings: Optional[List[Finding]] = None
+
+    from_: Optional[str] = FieldInfo(alias="from", default=None)
+
+    from_name: Optional[str] = None
+
+    htmltext_structure_hash: Optional[str] = None
+
+    message_id: Optional[str] = None
+
+    postfix_id_outbound: Optional[str] = None
+
+    replyto: Optional[str] = None
+
+    sent_date: Optional[str] = None
+
+    subject: Optional[str] = None
+
+    threat_categories: Optional[List[str]] = None
+
+    to: Optional[List[str]] = None
+
+    to_name: Optional[List[str]] = None
+
+    validation: Optional[Validation] = None
diff --git a/src/cloudflare/types/email_security/settings/__init__.py b/src/cloudflare/types/email_security/settings/__init__.py
new file mode 100644
index 00000000000..26c5fc41f06
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/__init__.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .domain_edit_params import DomainEditParams as DomainEditParams
+from .domain_list_params import DomainListParams as DomainListParams
+from .domain_get_response import DomainGetResponse as DomainGetResponse
+from .domain_edit_response import DomainEditResponse as DomainEditResponse
+from .domain_list_response import DomainListResponse as DomainListResponse
+from .domain_delete_response import DomainDeleteResponse as DomainDeleteResponse
+from .allow_policy_edit_params import AllowPolicyEditParams as AllowPolicyEditParams
+from .allow_policy_list_params import AllowPolicyListParams as AllowPolicyListParams
+from .block_sender_edit_params import BlockSenderEditParams as BlockSenderEditParams
+from .block_sender_list_params import BlockSenderListParams as BlockSenderListParams
+from .allow_policy_get_response import AllowPolicyGetResponse as AllowPolicyGetResponse
+from .block_sender_get_response import BlockSenderGetResponse as BlockSenderGetResponse
+from .allow_policy_create_params import AllowPolicyCreateParams as AllowPolicyCreateParams
+from .allow_policy_edit_response import AllowPolicyEditResponse as AllowPolicyEditResponse
+from .allow_policy_list_response import AllowPolicyListResponse as AllowPolicyListResponse
+from .block_sender_create_params import BlockSenderCreateParams as BlockSenderCreateParams
+from .block_sender_edit_response import BlockSenderEditResponse as BlockSenderEditResponse
+from .block_sender_list_response import BlockSenderListResponse as BlockSenderListResponse
+from .trusted_domain_edit_params import TrustedDomainEditParams as TrustedDomainEditParams
+from .trusted_domain_list_params import TrustedDomainListParams as TrustedDomainListParams
+from .domain_bulk_delete_response import DomainBulkDeleteResponse as DomainBulkDeleteResponse
+from .trusted_domain_get_response import TrustedDomainGetResponse as TrustedDomainGetResponse
+from .allow_policy_create_response import AllowPolicyCreateResponse as AllowPolicyCreateResponse
+from .allow_policy_delete_response import AllowPolicyDeleteResponse as AllowPolicyDeleteResponse
+from .block_sender_create_response import BlockSenderCreateResponse as BlockSenderCreateResponse
+from .block_sender_delete_response import BlockSenderDeleteResponse as BlockSenderDeleteResponse
+from .trusted_domain_create_params import TrustedDomainCreateParams as TrustedDomainCreateParams
+from .trusted_domain_edit_response import TrustedDomainEditResponse as TrustedDomainEditResponse
+from .trusted_domain_list_response import TrustedDomainListResponse as TrustedDomainListResponse
+from .trusted_domain_create_response import TrustedDomainCreateResponse as TrustedDomainCreateResponse
+from .trusted_domain_delete_response import TrustedDomainDeleteResponse as TrustedDomainDeleteResponse
+from .impersonation_registry_edit_params import ImpersonationRegistryEditParams as ImpersonationRegistryEditParams
+from .impersonation_registry_list_params import ImpersonationRegistryListParams as ImpersonationRegistryListParams
+from .impersonation_registry_get_response import ImpersonationRegistryGetResponse as ImpersonationRegistryGetResponse
+from .impersonation_registry_create_params import ImpersonationRegistryCreateParams as ImpersonationRegistryCreateParams
+from .impersonation_registry_edit_response import ImpersonationRegistryEditResponse as ImpersonationRegistryEditResponse
+from .impersonation_registry_list_response import ImpersonationRegistryListResponse as ImpersonationRegistryListResponse
+from .impersonation_registry_create_response import (
+    ImpersonationRegistryCreateResponse as ImpersonationRegistryCreateResponse,
+)
+from .impersonation_registry_delete_response import (
+    ImpersonationRegistryDeleteResponse as ImpersonationRegistryDeleteResponse,
+)
diff --git a/src/cloudflare/types/email_security/settings/allow_policy_create_params.py b/src/cloudflare/types/email_security/settings/allow_policy_create_params.py
new file mode 100644
index 00000000000..9c0e132e1b2
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/allow_policy_create_params.py
@@ -0,0 +1,46 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["AllowPolicyCreateParams"]
+
+
+class AllowPolicyCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    is_acceptable_sender: Required[bool]
+    """
+    Messages from this sender will be exempted from Spam, Spoof and Bulk
+    dispositions. Note: This will not exempt messages with Malicious or Suspicious
+    dispositions.
+    """
+
+    is_exempt_recipient: Required[bool]
+    """Messages to this recipient will bypass all detections."""
+
+    is_regex: Required[bool]
+
+    is_trusted_sender: Required[bool]
+    """Messages from this sender will bypass all detections and link following."""
+
+    pattern: Required[str]
+
+    pattern_type: Required[Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"]]
+
+    verify_sender: Required[bool]
+    """
+    Enforce DMARC, SPF or DKIM authentication. When on, Email Security only honors
+    policies that pass authentication.
+    """
+
+    comments: Optional[str]
+
+    is_recipient: bool
+
+    is_sender: bool
+
+    is_spoof: bool
diff --git a/src/cloudflare/types/email_security/settings/allow_policy_create_response.py b/src/cloudflare/types/email_security/settings/allow_policy_create_response.py
new file mode 100644
index 00000000000..312ff7e2a7c
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/allow_policy_create_response.py
@@ -0,0 +1,51 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["AllowPolicyCreateResponse"]
+
+
+class AllowPolicyCreateResponse(BaseModel):
+    id: int
+    """The unique identifier for the allow policy."""
+
+    created_at: datetime
+
+    is_acceptable_sender: bool
+    """
+    Messages from this sender will be exempted from Spam, Spoof and Bulk
+    dispositions. Note: This will not exempt messages with Malicious or Suspicious
+    dispositions.
+    """
+
+    is_exempt_recipient: bool
+    """Messages to this recipient will bypass all detections."""
+
+    is_regex: bool
+
+    is_trusted_sender: bool
+    """Messages from this sender will bypass all detections and link following."""
+
+    last_modified: datetime
+
+    pattern: str
+
+    pattern_type: Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"]
+
+    verify_sender: bool
+    """
+    Enforce DMARC, SPF or DKIM authentication. When on, Email Security only honors
+    policies that pass authentication.
+    """
+
+    comments: Optional[str] = None
+
+    is_recipient: Optional[bool] = None
+
+    is_sender: Optional[bool] = None
+
+    is_spoof: Optional[bool] = None
diff --git a/src/cloudflare/types/email_security/settings/allow_policy_delete_response.py b/src/cloudflare/types/email_security/settings/allow_policy_delete_response.py
new file mode 100644
index 00000000000..38627fc0c30
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/allow_policy_delete_response.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["AllowPolicyDeleteResponse"]
+
+
+class AllowPolicyDeleteResponse(BaseModel):
+    id: int
+    """The unique identifier for the allow policy."""
diff --git a/src/cloudflare/types/email_security/settings/allow_policy_edit_params.py b/src/cloudflare/types/email_security/settings/allow_policy_edit_params.py
new file mode 100644
index 00000000000..6b4de29a3bb
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/allow_policy_edit_params.py
@@ -0,0 +1,40 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["AllowPolicyEditParams"]
+
+
+class AllowPolicyEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    comments: Optional[str]
+
+    is_acceptable_sender: Optional[bool]
+    """
+    Messages from this sender will be exempted from Spam, Spoof and Bulk
+    dispositions. Note: This will not exempt messages with Malicious or Suspicious
+    dispositions.
+    """
+
+    is_exempt_recipient: Optional[bool]
+    """Messages to this recipient will bypass all detections."""
+
+    is_regex: Optional[bool]
+
+    is_trusted_sender: Optional[bool]
+    """Messages from this sender will bypass all detections and link following."""
+
+    pattern: Optional[str]
+
+    pattern_type: Optional[Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"]]
+
+    verify_sender: Optional[bool]
+    """
+    Enforce DMARC, SPF or DKIM authentication. When on, Email Security only honors
+    policies that pass authentication.
+    """
diff --git a/src/cloudflare/types/email_security/settings/allow_policy_edit_response.py b/src/cloudflare/types/email_security/settings/allow_policy_edit_response.py
new file mode 100644
index 00000000000..eb66126b593
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/allow_policy_edit_response.py
@@ -0,0 +1,51 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["AllowPolicyEditResponse"]
+
+
+class AllowPolicyEditResponse(BaseModel):
+    id: int
+    """The unique identifier for the allow policy."""
+
+    created_at: datetime
+
+    is_acceptable_sender: bool
+    """
+    Messages from this sender will be exempted from Spam, Spoof and Bulk
+    dispositions. Note: This will not exempt messages with Malicious or Suspicious
+    dispositions.
+    """
+
+    is_exempt_recipient: bool
+    """Messages to this recipient will bypass all detections."""
+
+    is_regex: bool
+
+    is_trusted_sender: bool
+    """Messages from this sender will bypass all detections and link following."""
+
+    last_modified: datetime
+
+    pattern: str
+
+    pattern_type: Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"]
+
+    verify_sender: bool
+    """
+    Enforce DMARC, SPF or DKIM authentication. When on, Email Security only honors
+    policies that pass authentication.
+    """
+
+    comments: Optional[str] = None
+
+    is_recipient: Optional[bool] = None
+
+    is_sender: Optional[bool] = None
+
+    is_spoof: Optional[bool] = None
diff --git a/src/cloudflare/types/email_security/settings/allow_policy_get_response.py b/src/cloudflare/types/email_security/settings/allow_policy_get_response.py
new file mode 100644
index 00000000000..e9cb0384cf3
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/allow_policy_get_response.py
@@ -0,0 +1,51 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["AllowPolicyGetResponse"]
+
+
+class AllowPolicyGetResponse(BaseModel):
+    id: int
+    """The unique identifier for the allow policy."""
+
+    created_at: datetime
+
+    is_acceptable_sender: bool
+    """
+    Messages from this sender will be exempted from Spam, Spoof and Bulk
+    dispositions. Note: This will not exempt messages with Malicious or Suspicious
+    dispositions.
+    """
+
+    is_exempt_recipient: bool
+    """Messages to this recipient will bypass all detections."""
+
+    is_regex: bool
+
+    is_trusted_sender: bool
+    """Messages from this sender will bypass all detections and link following."""
+
+    last_modified: datetime
+
+    pattern: str
+
+    pattern_type: Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"]
+
+    verify_sender: bool
+    """
+    Enforce DMARC, SPF or DKIM authentication. When on, Email Security only honors
+    policies that pass authentication.
+    """
+
+    comments: Optional[str] = None
+
+    is_recipient: Optional[bool] = None
+
+    is_sender: Optional[bool] = None
+
+    is_spoof: Optional[bool] = None
diff --git a/src/cloudflare/types/email_security/settings/allow_policy_list_params.py b/src/cloudflare/types/email_security/settings/allow_policy_list_params.py
new file mode 100644
index 00000000000..85380271064
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/allow_policy_list_params.py
@@ -0,0 +1,49 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["AllowPolicyListParams"]
+
+
+class AllowPolicyListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    direction: Literal["asc", "desc"]
+    """The sorting direction."""
+
+    is_acceptable_sender: bool
+
+    is_exempt_recipient: bool
+
+    is_recipient: bool
+
+    is_sender: bool
+
+    is_spoof: bool
+
+    is_trusted_sender: bool
+
+    order: Literal["pattern", "created_at"]
+    """The field to sort by."""
+
+    page: int
+    """The page number of paginated results."""
+
+    pattern: str
+
+    pattern_type: Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"]
+
+    per_page: int
+    """The number of results per page."""
+
+    search: str
+    """
+    Allows searching in multiple properties of a record simultaneously. This
+    parameter is intended for human users, not automation. Its exact behavior is
+    intentionally left unspecified and is subject to change in the future.
+    """
+
+    verify_sender: bool
diff --git a/src/cloudflare/types/email_security/settings/allow_policy_list_response.py b/src/cloudflare/types/email_security/settings/allow_policy_list_response.py
new file mode 100644
index 00000000000..9b4c57f2a22
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/allow_policy_list_response.py
@@ -0,0 +1,51 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["AllowPolicyListResponse"]
+
+
+class AllowPolicyListResponse(BaseModel):
+    id: int
+    """The unique identifier for the allow policy."""
+
+    created_at: datetime
+
+    is_acceptable_sender: bool
+    """
+    Messages from this sender will be exempted from Spam, Spoof and Bulk
+    dispositions. Note: This will not exempt messages with Malicious or Suspicious
+    dispositions.
+    """
+
+    is_exempt_recipient: bool
+    """Messages to this recipient will bypass all detections."""
+
+    is_regex: bool
+
+    is_trusted_sender: bool
+    """Messages from this sender will bypass all detections and link following."""
+
+    last_modified: datetime
+
+    pattern: str
+
+    pattern_type: Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"]
+
+    verify_sender: bool
+    """
+    Enforce DMARC, SPF or DKIM authentication. When on, Email Security only honors
+    policies that pass authentication.
+    """
+
+    comments: Optional[str] = None
+
+    is_recipient: Optional[bool] = None
+
+    is_sender: Optional[bool] = None
+
+    is_spoof: Optional[bool] = None
diff --git a/src/cloudflare/types/email_security/settings/block_sender_create_params.py b/src/cloudflare/types/email_security/settings/block_sender_create_params.py
new file mode 100644
index 00000000000..dc5290d600f
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/block_sender_create_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["BlockSenderCreateParams"]
+
+
+class BlockSenderCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    is_regex: Required[bool]
+
+    pattern: Required[str]
+
+    pattern_type: Required[Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"]]
+
+    comments: Optional[str]
diff --git a/src/cloudflare/types/email_security/settings/block_sender_create_response.py b/src/cloudflare/types/email_security/settings/block_sender_create_response.py
new file mode 100644
index 00000000000..615755f8fd7
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/block_sender_create_response.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["BlockSenderCreateResponse"]
+
+
+class BlockSenderCreateResponse(BaseModel):
+    id: int
+    """The unique identifier for the allow policy."""
+
+    created_at: datetime
+
+    is_regex: bool
+
+    last_modified: datetime
+
+    pattern: str
+
+    pattern_type: Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"]
+
+    comments: Optional[str] = None
diff --git a/src/cloudflare/types/email_security/settings/block_sender_delete_response.py b/src/cloudflare/types/email_security/settings/block_sender_delete_response.py
new file mode 100644
index 00000000000..ea8337060bf
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/block_sender_delete_response.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["BlockSenderDeleteResponse"]
+
+
+class BlockSenderDeleteResponse(BaseModel):
+    id: int
+    """The unique identifier for the allow policy."""
diff --git a/src/cloudflare/types/email_security/settings/block_sender_edit_params.py b/src/cloudflare/types/email_security/settings/block_sender_edit_params.py
new file mode 100644
index 00000000000..19f2d23458a
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/block_sender_edit_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["BlockSenderEditParams"]
+
+
+class BlockSenderEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    comments: Optional[str]
+
+    is_regex: Optional[bool]
+
+    pattern: Optional[str]
+
+    pattern_type: Optional[Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"]]
diff --git a/src/cloudflare/types/email_security/settings/block_sender_edit_response.py b/src/cloudflare/types/email_security/settings/block_sender_edit_response.py
new file mode 100644
index 00000000000..764d9fd5dee
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/block_sender_edit_response.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["BlockSenderEditResponse"]
+
+
+class BlockSenderEditResponse(BaseModel):
+    id: int
+    """The unique identifier for the allow policy."""
+
+    created_at: datetime
+
+    is_regex: bool
+
+    last_modified: datetime
+
+    pattern: str
+
+    pattern_type: Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"]
+
+    comments: Optional[str] = None
diff --git a/src/cloudflare/types/email_security/settings/block_sender_get_response.py b/src/cloudflare/types/email_security/settings/block_sender_get_response.py
new file mode 100644
index 00000000000..66f03f3e3f6
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/block_sender_get_response.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["BlockSenderGetResponse"]
+
+
+class BlockSenderGetResponse(BaseModel):
+    id: int
+    """The unique identifier for the allow policy."""
+
+    created_at: datetime
+
+    is_regex: bool
+
+    last_modified: datetime
+
+    pattern: str
+
+    pattern_type: Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"]
+
+    comments: Optional[str] = None
diff --git a/src/cloudflare/types/email_security/settings/block_sender_list_params.py b/src/cloudflare/types/email_security/settings/block_sender_list_params.py
new file mode 100644
index 00000000000..712ad5932dd
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/block_sender_list_params.py
@@ -0,0 +1,35 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["BlockSenderListParams"]
+
+
+class BlockSenderListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    direction: Literal["asc", "desc"]
+    """The sorting direction."""
+
+    order: Literal["pattern", "created_at"]
+    """The field to sort by."""
+
+    page: int
+    """The page number of paginated results."""
+
+    pattern: str
+
+    pattern_type: Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"]
+
+    per_page: int
+    """The number of results per page."""
+
+    search: str
+    """
+    Allows searching in multiple properties of a record simultaneously. This
+    parameter is intended for human users, not automation. Its exact behavior is
+    intentionally left unspecified and is subject to change in the future.
+    """
diff --git a/src/cloudflare/types/email_security/settings/block_sender_list_response.py b/src/cloudflare/types/email_security/settings/block_sender_list_response.py
new file mode 100644
index 00000000000..497ae4dc93d
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/block_sender_list_response.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["BlockSenderListResponse"]
+
+
+class BlockSenderListResponse(BaseModel):
+    id: int
+    """The unique identifier for the allow policy."""
+
+    created_at: datetime
+
+    is_regex: bool
+
+    last_modified: datetime
+
+    pattern: str
+
+    pattern_type: Literal["EMAIL", "DOMAIN", "IP", "UNKNOWN"]
+
+    comments: Optional[str] = None
diff --git a/src/cloudflare/types/email_security/settings/domain_bulk_delete_response.py b/src/cloudflare/types/email_security/settings/domain_bulk_delete_response.py
new file mode 100644
index 00000000000..76cb04b1987
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/domain_bulk_delete_response.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["DomainBulkDeleteResponse"]
+
+
+class DomainBulkDeleteResponse(BaseModel):
+    id: int
+    """The unique identifier for the domain."""
diff --git a/src/cloudflare/types/email_security/settings/domain_delete_response.py b/src/cloudflare/types/email_security/settings/domain_delete_response.py
new file mode 100644
index 00000000000..ab5ea3c8842
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/domain_delete_response.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["DomainDeleteResponse"]
+
+
+class DomainDeleteResponse(BaseModel):
+    id: int
+    """The unique identifier for the domain."""
diff --git a/src/cloudflare/types/email_security/settings/domain_edit_params.py b/src/cloudflare/types/email_security/settings/domain_edit_params.py
new file mode 100644
index 00000000000..bf6dec63309
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/domain_edit_params.py
@@ -0,0 +1,50 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List
+from typing_extensions import Literal, Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["DomainEditParams"]
+
+
+class DomainEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    ip_restrictions: Required[SequenceNotStr[str]]
+
+    allowed_delivery_modes: List[Literal["DIRECT", "BCC", "JOURNAL", "API", "RETRO_SCAN"]]
+
+    domain: str
+
+    drop_dispositions: List[
+        Literal[
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE",
+        ]
+    ]
+
+    folder: Literal["AllItems", "Inbox"]
+
+    integration_id: str
+
+    lookback_hops: int
+
+    regions: List[Literal["GLOBAL", "AU", "DE", "IN", "US"]]
+
+    require_tls_inbound: bool
+
+    require_tls_outbound: bool
+
+    transport: str
diff --git a/src/cloudflare/types/email_security/settings/domain_edit_response.py b/src/cloudflare/types/email_security/settings/domain_edit_response.py
new file mode 100644
index 00000000000..341b48ed16d
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/domain_edit_response.py
@@ -0,0 +1,81 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["DomainEditResponse", "Authorization", "EmailsProcessed"]
+
+
+class Authorization(BaseModel):
+    authorized: bool
+
+    timestamp: datetime
+
+    status_message: Optional[str] = None
+
+
+class EmailsProcessed(BaseModel):
+    timestamp: datetime
+
+    total_emails_processed: int
+
+    total_emails_processed_previous: int
+
+
+class DomainEditResponse(BaseModel):
+    id: int
+    """The unique identifier for the domain."""
+
+    allowed_delivery_modes: List[Literal["DIRECT", "BCC", "JOURNAL", "API", "RETRO_SCAN"]]
+
+    created_at: datetime
+
+    domain: str
+
+    drop_dispositions: List[
+        Literal[
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE",
+        ]
+    ]
+
+    ip_restrictions: List[str]
+
+    last_modified: datetime
+
+    lookback_hops: int
+
+    regions: List[Literal["GLOBAL", "AU", "DE", "IN", "US"]]
+
+    transport: str
+
+    authorization: Optional[Authorization] = None
+
+    dmarc_status: Optional[Literal["none", "good", "invalid"]] = None
+
+    emails_processed: Optional[EmailsProcessed] = None
+
+    folder: Optional[Literal["AllItems", "Inbox"]] = None
+
+    inbox_provider: Optional[Literal["Microsoft", "Google"]] = None
+
+    integration_id: Optional[str] = None
+
+    o365_tenant_id: Optional[str] = None
+
+    require_tls_inbound: Optional[bool] = None
+
+    require_tls_outbound: Optional[bool] = None
+
+    spf_status: Optional[Literal["none", "good", "neutral", "open", "invalid"]] = None
diff --git a/src/cloudflare/types/email_security/settings/domain_get_response.py b/src/cloudflare/types/email_security/settings/domain_get_response.py
new file mode 100644
index 00000000000..08557681736
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/domain_get_response.py
@@ -0,0 +1,81 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["DomainGetResponse", "Authorization", "EmailsProcessed"]
+
+
+class Authorization(BaseModel):
+    authorized: bool
+
+    timestamp: datetime
+
+    status_message: Optional[str] = None
+
+
+class EmailsProcessed(BaseModel):
+    timestamp: datetime
+
+    total_emails_processed: int
+
+    total_emails_processed_previous: int
+
+
+class DomainGetResponse(BaseModel):
+    id: int
+    """The unique identifier for the domain."""
+
+    allowed_delivery_modes: List[Literal["DIRECT", "BCC", "JOURNAL", "API", "RETRO_SCAN"]]
+
+    created_at: datetime
+
+    domain: str
+
+    drop_dispositions: List[
+        Literal[
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE",
+        ]
+    ]
+
+    ip_restrictions: List[str]
+
+    last_modified: datetime
+
+    lookback_hops: int
+
+    regions: List[Literal["GLOBAL", "AU", "DE", "IN", "US"]]
+
+    transport: str
+
+    authorization: Optional[Authorization] = None
+
+    dmarc_status: Optional[Literal["none", "good", "invalid"]] = None
+
+    emails_processed: Optional[EmailsProcessed] = None
+
+    folder: Optional[Literal["AllItems", "Inbox"]] = None
+
+    inbox_provider: Optional[Literal["Microsoft", "Google"]] = None
+
+    integration_id: Optional[str] = None
+
+    o365_tenant_id: Optional[str] = None
+
+    require_tls_inbound: Optional[bool] = None
+
+    require_tls_outbound: Optional[bool] = None
+
+    spf_status: Optional[Literal["none", "good", "neutral", "open", "invalid"]] = None
diff --git a/src/cloudflare/types/email_security/settings/domain_list_params.py b/src/cloudflare/types/email_security/settings/domain_list_params.py
new file mode 100644
index 00000000000..6546a419a74
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/domain_list_params.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["DomainListParams"]
+
+
+class DomainListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    active_delivery_mode: Literal["DIRECT", "BCC", "JOURNAL", "API", "RETRO_SCAN"]
+    """Filters response to domains with the currently active delivery mode."""
+
+    allowed_delivery_mode: Literal["DIRECT", "BCC", "JOURNAL", "API", "RETRO_SCAN"]
+    """Filters response to domains with the provided delivery mode."""
+
+    direction: Literal["asc", "desc"]
+    """The sorting direction."""
+
+    domain: SequenceNotStr[str]
+    """Filters results by the provided domains, allowing for multiple occurrences."""
+
+    integration_id: str
+    """Filters response to domains with the provided integration ID."""
+
+    order: Literal["domain", "created_at"]
+    """The field to sort by."""
+
+    page: int
+    """The page number of paginated results."""
+
+    per_page: int
+    """The number of results per page."""
+
+    search: str
+    """
+    Allows searching in multiple properties of a record simultaneously. This
+    parameter is intended for human users, not automation. Its exact behavior is
+    intentionally left unspecified and is subject to change in the future.
+    """
diff --git a/src/cloudflare/types/email_security/settings/domain_list_response.py b/src/cloudflare/types/email_security/settings/domain_list_response.py
new file mode 100644
index 00000000000..eec5a9fcc9c
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/domain_list_response.py
@@ -0,0 +1,81 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["DomainListResponse", "Authorization", "EmailsProcessed"]
+
+
+class Authorization(BaseModel):
+    authorized: bool
+
+    timestamp: datetime
+
+    status_message: Optional[str] = None
+
+
+class EmailsProcessed(BaseModel):
+    timestamp: datetime
+
+    total_emails_processed: int
+
+    total_emails_processed_previous: int
+
+
+class DomainListResponse(BaseModel):
+    id: int
+    """The unique identifier for the domain."""
+
+    allowed_delivery_modes: List[Literal["DIRECT", "BCC", "JOURNAL", "API", "RETRO_SCAN"]]
+
+    created_at: datetime
+
+    domain: str
+
+    drop_dispositions: List[
+        Literal[
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE",
+        ]
+    ]
+
+    ip_restrictions: List[str]
+
+    last_modified: datetime
+
+    lookback_hops: int
+
+    regions: List[Literal["GLOBAL", "AU", "DE", "IN", "US"]]
+
+    transport: str
+
+    authorization: Optional[Authorization] = None
+
+    dmarc_status: Optional[Literal["none", "good", "invalid"]] = None
+
+    emails_processed: Optional[EmailsProcessed] = None
+
+    folder: Optional[Literal["AllItems", "Inbox"]] = None
+
+    inbox_provider: Optional[Literal["Microsoft", "Google"]] = None
+
+    integration_id: Optional[str] = None
+
+    o365_tenant_id: Optional[str] = None
+
+    require_tls_inbound: Optional[bool] = None
+
+    require_tls_outbound: Optional[bool] = None
+
+    spf_status: Optional[Literal["none", "good", "neutral", "open", "invalid"]] = None
diff --git a/src/cloudflare/types/email_security/settings/impersonation_registry_create_params.py b/src/cloudflare/types/email_security/settings/impersonation_registry_create_params.py
new file mode 100644
index 00000000000..db25db7e746
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/impersonation_registry_create_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ImpersonationRegistryCreateParams"]
+
+
+class ImpersonationRegistryCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    email: Required[str]
+
+    is_email_regex: Required[bool]
+
+    name: Required[str]
diff --git a/src/cloudflare/types/email_security/settings/impersonation_registry_create_response.py b/src/cloudflare/types/email_security/settings/impersonation_registry_create_response.py
new file mode 100644
index 00000000000..c0dd1f55354
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/impersonation_registry_create_response.py
@@ -0,0 +1,32 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["ImpersonationRegistryCreateResponse"]
+
+
+class ImpersonationRegistryCreateResponse(BaseModel):
+    id: int
+
+    created_at: datetime
+
+    email: str
+
+    is_email_regex: bool
+
+    last_modified: datetime
+
+    name: str
+
+    comments: Optional[str] = None
+
+    directory_id: Optional[int] = None
+
+    directory_node_id: Optional[int] = None
+
+    external_directory_node_id: Optional[str] = None
+
+    provenance: Optional[str] = None
diff --git a/src/cloudflare/types/email_security/settings/impersonation_registry_delete_response.py b/src/cloudflare/types/email_security/settings/impersonation_registry_delete_response.py
new file mode 100644
index 00000000000..ba4913c92f1
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/impersonation_registry_delete_response.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["ImpersonationRegistryDeleteResponse"]
+
+
+class ImpersonationRegistryDeleteResponse(BaseModel):
+    id: int
diff --git a/src/cloudflare/types/email_security/settings/impersonation_registry_edit_params.py b/src/cloudflare/types/email_security/settings/impersonation_registry_edit_params.py
new file mode 100644
index 00000000000..8dceb0e75f7
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/impersonation_registry_edit_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ImpersonationRegistryEditParams"]
+
+
+class ImpersonationRegistryEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    email: Optional[str]
+
+    is_email_regex: Optional[bool]
+
+    name: Optional[str]
diff --git a/src/cloudflare/types/email_security/settings/impersonation_registry_edit_response.py b/src/cloudflare/types/email_security/settings/impersonation_registry_edit_response.py
new file mode 100644
index 00000000000..824a0946f7c
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/impersonation_registry_edit_response.py
@@ -0,0 +1,32 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["ImpersonationRegistryEditResponse"]
+
+
+class ImpersonationRegistryEditResponse(BaseModel):
+    id: int
+
+    created_at: datetime
+
+    email: str
+
+    is_email_regex: bool
+
+    last_modified: datetime
+
+    name: str
+
+    comments: Optional[str] = None
+
+    directory_id: Optional[int] = None
+
+    directory_node_id: Optional[int] = None
+
+    external_directory_node_id: Optional[str] = None
+
+    provenance: Optional[str] = None
diff --git a/src/cloudflare/types/email_security/settings/impersonation_registry_get_response.py b/src/cloudflare/types/email_security/settings/impersonation_registry_get_response.py
new file mode 100644
index 00000000000..85a8ab50d71
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/impersonation_registry_get_response.py
@@ -0,0 +1,32 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["ImpersonationRegistryGetResponse"]
+
+
+class ImpersonationRegistryGetResponse(BaseModel):
+    id: int
+
+    created_at: datetime
+
+    email: str
+
+    is_email_regex: bool
+
+    last_modified: datetime
+
+    name: str
+
+    comments: Optional[str] = None
+
+    directory_id: Optional[int] = None
+
+    directory_node_id: Optional[int] = None
+
+    external_directory_node_id: Optional[str] = None
+
+    provenance: Optional[str] = None
diff --git a/src/cloudflare/types/email_security/settings/impersonation_registry_list_params.py b/src/cloudflare/types/email_security/settings/impersonation_registry_list_params.py
new file mode 100644
index 00000000000..49a2b1ddf0a
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/impersonation_registry_list_params.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["ImpersonationRegistryListParams"]
+
+
+class ImpersonationRegistryListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    direction: Literal["asc", "desc"]
+    """The sorting direction."""
+
+    order: Literal["name", "email", "created_at"]
+    """The field to sort by."""
+
+    page: int
+    """The page number of paginated results."""
+
+    per_page: int
+    """The number of results per page."""
+
+    provenance: Literal["A1S_INTERNAL", "SNOOPY-CASB_OFFICE_365", "SNOOPY-OFFICE_365", "SNOOPY-GOOGLE_DIRECTORY"]
+
+    search: str
+    """
+    Allows searching in multiple properties of a record simultaneously. This
+    parameter is intended for human users, not automation. Its exact behavior is
+    intentionally left unspecified and is subject to change in the future.
+    """
diff --git a/src/cloudflare/types/email_security/settings/impersonation_registry_list_response.py b/src/cloudflare/types/email_security/settings/impersonation_registry_list_response.py
new file mode 100644
index 00000000000..800c8d4bfd7
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/impersonation_registry_list_response.py
@@ -0,0 +1,32 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["ImpersonationRegistryListResponse"]
+
+
+class ImpersonationRegistryListResponse(BaseModel):
+    id: int
+
+    created_at: datetime
+
+    email: str
+
+    is_email_regex: bool
+
+    last_modified: datetime
+
+    name: str
+
+    comments: Optional[str] = None
+
+    directory_id: Optional[int] = None
+
+    directory_node_id: Optional[int] = None
+
+    external_directory_node_id: Optional[str] = None
+
+    provenance: Optional[str] = None
diff --git a/src/cloudflare/types/email_security/settings/trusted_domain_create_params.py b/src/cloudflare/types/email_security/settings/trusted_domain_create_params.py
new file mode 100644
index 00000000000..3159478e22d
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/trusted_domain_create_params.py
@@ -0,0 +1,61 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable, Optional
+from typing_extensions import Required, TypeAlias, TypedDict
+
+__all__ = ["TrustedDomainCreateParams", "EmailSecurityCreateTrustedDomain", "Variant1", "Variant1Body"]
+
+
+class EmailSecurityCreateTrustedDomain(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    is_recent: Required[bool]
+    """
+    Select to prevent recently registered domains from triggering a Suspicious or
+    Malicious disposition.
+    """
+
+    is_regex: Required[bool]
+
+    is_similarity: Required[bool]
+    """
+    Select for partner or other approved domains that have similar spelling to your
+    connected domains. Prevents listed domains from triggering a Spoof disposition.
+    """
+
+    pattern: Required[str]
+
+    comments: Optional[str]
+
+
+class Variant1(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    body: Required[Iterable[Variant1Body]]
+
+
+class Variant1Body(TypedDict, total=False):
+    is_recent: Required[bool]
+    """
+    Select to prevent recently registered domains from triggering a Suspicious or
+    Malicious disposition.
+    """
+
+    is_regex: Required[bool]
+
+    is_similarity: Required[bool]
+    """
+    Select for partner or other approved domains that have similar spelling to your
+    connected domains. Prevents listed domains from triggering a Spoof disposition.
+    """
+
+    pattern: Required[str]
+
+    comments: Optional[str]
+
+
+TrustedDomainCreateParams: TypeAlias = Union[EmailSecurityCreateTrustedDomain, Variant1]
diff --git a/src/cloudflare/types/email_security/settings/trusted_domain_create_response.py b/src/cloudflare/types/email_security/settings/trusted_domain_create_response.py
new file mode 100644
index 00000000000..1dfe56cf075
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/trusted_domain_create_response.py
@@ -0,0 +1,66 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import TypeAlias
+
+from ...._models import BaseModel
+
+__all__ = ["TrustedDomainCreateResponse", "EmailSecurityTrustedDomain", "UnionMember1"]
+
+
+class EmailSecurityTrustedDomain(BaseModel):
+    id: int
+    """The unique identifier for the trusted domain."""
+
+    created_at: datetime
+
+    is_recent: bool
+    """
+    Select to prevent recently registered domains from triggering a Suspicious or
+    Malicious disposition.
+    """
+
+    is_regex: bool
+
+    is_similarity: bool
+    """
+    Select for partner or other approved domains that have similar spelling to your
+    connected domains. Prevents listed domains from triggering a Spoof disposition.
+    """
+
+    last_modified: datetime
+
+    pattern: str
+
+    comments: Optional[str] = None
+
+
+class UnionMember1(BaseModel):
+    id: int
+    """The unique identifier for the trusted domain."""
+
+    created_at: datetime
+
+    is_recent: bool
+    """
+    Select to prevent recently registered domains from triggering a Suspicious or
+    Malicious disposition.
+    """
+
+    is_regex: bool
+
+    is_similarity: bool
+    """
+    Select for partner or other approved domains that have similar spelling to your
+    connected domains. Prevents listed domains from triggering a Spoof disposition.
+    """
+
+    last_modified: datetime
+
+    pattern: str
+
+    comments: Optional[str] = None
+
+
+TrustedDomainCreateResponse: TypeAlias = Union[EmailSecurityTrustedDomain, List[UnionMember1]]
diff --git a/src/cloudflare/types/email_security/settings/trusted_domain_delete_response.py b/src/cloudflare/types/email_security/settings/trusted_domain_delete_response.py
new file mode 100644
index 00000000000..9c5251946fd
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/trusted_domain_delete_response.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["TrustedDomainDeleteResponse"]
+
+
+class TrustedDomainDeleteResponse(BaseModel):
+    id: int
+    """The unique identifier for the trusted domain."""
diff --git a/src/cloudflare/types/email_security/settings/trusted_domain_edit_params.py b/src/cloudflare/types/email_security/settings/trusted_domain_edit_params.py
new file mode 100644
index 00000000000..90d1acfc7c0
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/trusted_domain_edit_params.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["TrustedDomainEditParams"]
+
+
+class TrustedDomainEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    comments: str
+
+    is_recent: bool
+    """
+    Select to prevent recently registered domains from triggering a Suspicious or
+    Malicious disposition.
+    """
+
+    is_regex: bool
+
+    is_similarity: bool
+    """
+    Select for partner or other approved domains that have similar spelling to your
+    connected domains. Prevents listed domains from triggering a Spoof disposition.
+    """
+
+    pattern: str
diff --git a/src/cloudflare/types/email_security/settings/trusted_domain_edit_response.py b/src/cloudflare/types/email_security/settings/trusted_domain_edit_response.py
new file mode 100644
index 00000000000..eb86a0bfebc
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/trusted_domain_edit_response.py
@@ -0,0 +1,35 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["TrustedDomainEditResponse"]
+
+
+class TrustedDomainEditResponse(BaseModel):
+    id: int
+    """The unique identifier for the trusted domain."""
+
+    created_at: datetime
+
+    is_recent: bool
+    """
+    Select to prevent recently registered domains from triggering a Suspicious or
+    Malicious disposition.
+    """
+
+    is_regex: bool
+
+    is_similarity: bool
+    """
+    Select for partner or other approved domains that have similar spelling to your
+    connected domains. Prevents listed domains from triggering a Spoof disposition.
+    """
+
+    last_modified: datetime
+
+    pattern: str
+
+    comments: Optional[str] = None
diff --git a/src/cloudflare/types/email_security/settings/trusted_domain_get_response.py b/src/cloudflare/types/email_security/settings/trusted_domain_get_response.py
new file mode 100644
index 00000000000..23b217fa8d7
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/trusted_domain_get_response.py
@@ -0,0 +1,35 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["TrustedDomainGetResponse"]
+
+
+class TrustedDomainGetResponse(BaseModel):
+    id: int
+    """The unique identifier for the trusted domain."""
+
+    created_at: datetime
+
+    is_recent: bool
+    """
+    Select to prevent recently registered domains from triggering a Suspicious or
+    Malicious disposition.
+    """
+
+    is_regex: bool
+
+    is_similarity: bool
+    """
+    Select for partner or other approved domains that have similar spelling to your
+    connected domains. Prevents listed domains from triggering a Spoof disposition.
+    """
+
+    last_modified: datetime
+
+    pattern: str
+
+    comments: Optional[str] = None
diff --git a/src/cloudflare/types/email_security/settings/trusted_domain_list_params.py b/src/cloudflare/types/email_security/settings/trusted_domain_list_params.py
new file mode 100644
index 00000000000..b9446971853
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/trusted_domain_list_params.py
@@ -0,0 +1,37 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["TrustedDomainListParams"]
+
+
+class TrustedDomainListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    direction: Literal["asc", "desc"]
+    """The sorting direction."""
+
+    is_recent: bool
+
+    is_similarity: bool
+
+    order: Literal["pattern", "created_at"]
+    """The field to sort by."""
+
+    page: int
+    """The page number of paginated results."""
+
+    pattern: str
+
+    per_page: int
+    """The number of results per page."""
+
+    search: str
+    """
+    Allows searching in multiple properties of a record simultaneously. This
+    parameter is intended for human users, not automation. Its exact behavior is
+    intentionally left unspecified and is subject to change in the future.
+    """
diff --git a/src/cloudflare/types/email_security/settings/trusted_domain_list_response.py b/src/cloudflare/types/email_security/settings/trusted_domain_list_response.py
new file mode 100644
index 00000000000..42e7eec4fed
--- /dev/null
+++ b/src/cloudflare/types/email_security/settings/trusted_domain_list_response.py
@@ -0,0 +1,35 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["TrustedDomainListResponse"]
+
+
+class TrustedDomainListResponse(BaseModel):
+    id: int
+    """The unique identifier for the trusted domain."""
+
+    created_at: datetime
+
+    is_recent: bool
+    """
+    Select to prevent recently registered domains from triggering a Suspicious or
+    Malicious disposition.
+    """
+
+    is_regex: bool
+
+    is_similarity: bool
+    """
+    Select for partner or other approved domains that have similar spelling to your
+    connected domains. Prevents listed domains from triggering a Spoof disposition.
+    """
+
+    last_modified: datetime
+
+    pattern: str
+
+    comments: Optional[str] = None
diff --git a/src/cloudflare/types/email_security/submission_list_params.py b/src/cloudflare/types/email_security/submission_list_params.py
new file mode 100644
index 00000000000..2114d3c0e9d
--- /dev/null
+++ b/src/cloudflare/types/email_security/submission_list_params.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["SubmissionListParams"]
+
+
+class SubmissionListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    end: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """The end of the search date range. Defaults to `now`."""
+
+    original_disposition: Literal["MALICIOUS", "SUSPICIOUS", "SPOOF", "SPAM", "BULK", "NONE"]
+
+    outcome_disposition: Literal["MALICIOUS", "SUSPICIOUS", "SPOOF", "SPAM", "BULK", "NONE"]
+
+    page: int
+    """The page number of paginated results."""
+
+    per_page: int
+    """The number of results per page."""
+
+    query: Optional[str]
+
+    requested_disposition: Literal["MALICIOUS", "SUSPICIOUS", "SPOOF", "SPAM", "BULK", "NONE"]
+
+    start: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """The beginning of the search date range. Defaults to `now - 30 days`."""
+
+    status: str
+
+    submission_id: str
+
+    type: Literal["TEAM", "USER"]
diff --git a/src/cloudflare/types/email_security/submission_list_response.py b/src/cloudflare/types/email_security/submission_list_response.py
new file mode 100644
index 00000000000..841284d9801
--- /dev/null
+++ b/src/cloudflare/types/email_security/submission_list_response.py
@@ -0,0 +1,72 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["SubmissionListResponse"]
+
+
+class SubmissionListResponse(BaseModel):
+    requested_ts: datetime
+
+    submission_id: str
+
+    original_disposition: Optional[
+        Literal[
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE",
+        ]
+    ] = None
+
+    original_edf_hash: Optional[str] = None
+
+    outcome: Optional[str] = None
+
+    outcome_disposition: Optional[
+        Literal[
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE",
+        ]
+    ] = None
+
+    requested_by: Optional[str] = None
+
+    requested_disposition: Optional[
+        Literal[
+            "MALICIOUS",
+            "MALICIOUS-BEC",
+            "SUSPICIOUS",
+            "SPOOF",
+            "SPAM",
+            "BULK",
+            "ENCRYPTED",
+            "EXTERNAL",
+            "UNKNOWN",
+            "NONE",
+        ]
+    ] = None
+
+    status: Optional[str] = None
+
+    subject: Optional[str] = None
+
+    type: Optional[str] = None
diff --git a/src/cloudflare/types/event_notifications/r2/__init__.py b/src/cloudflare/types/event_notifications/r2/__init__.py
deleted file mode 100644
index b1fcfe993b2..00000000000
--- a/src/cloudflare/types/event_notifications/r2/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from .configuration_get_response import ConfigurationGetResponse as ConfigurationGetResponse
diff --git a/src/cloudflare/types/event_notifications/r2/configuration/__init__.py b/src/cloudflare/types/event_notifications/r2/configuration/__init__.py
deleted file mode 100644
index 9b08b16f6f8..00000000000
--- a/src/cloudflare/types/event_notifications/r2/configuration/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from .queue_update_params import QueueUpdateParams as QueueUpdateParams
-from .queue_delete_response import QueueDeleteResponse as QueueDeleteResponse
-from .queue_update_response import QueueUpdateResponse as QueueUpdateResponse
diff --git a/src/cloudflare/types/event_notifications/r2/configuration/queue_delete_response.py b/src/cloudflare/types/event_notifications/r2/configuration/queue_delete_response.py
deleted file mode 100644
index 578c4867074..00000000000
--- a/src/cloudflare/types/event_notifications/r2/configuration/queue_delete_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union
-
-__all__ = ["QueueDeleteResponse"]
-
-QueueDeleteResponse = Union[List[object], str, object]
diff --git a/src/cloudflare/types/event_notifications/r2/configuration/queue_update_params.py b/src/cloudflare/types/event_notifications/r2/configuration/queue_update_params.py
deleted file mode 100644
index 08718f376d4..00000000000
--- a/src/cloudflare/types/event_notifications/r2/configuration/queue_update_params.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List, Iterable
-from typing_extensions import Literal, Required, TypedDict
-
-__all__ = ["QueueUpdateParams", "Rule"]
-
-
-class QueueUpdateParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    bucket_name: Required[str]
-    """Identifier"""
-
-    rules: Iterable[Rule]
-    """Array of rules to drive notifications"""
-
-
-class Rule(TypedDict, total=False):
-    actions: Required[
-        List[Literal["PutObject", "CopyObject", "DeleteObject", "CompleteMultipartUpload", "AbortMultipartUpload"]]
-    ]
-    """Array of R2 object actions that will trigger notifications"""
-
-    prefix: str
-    """Notifications will be sent only for objects with this prefix"""
-
-    suffix: str
-    """Notifications will be sent only for objects with this suffix"""
diff --git a/src/cloudflare/types/event_notifications/r2/configuration/queue_update_response.py b/src/cloudflare/types/event_notifications/r2/configuration/queue_update_response.py
deleted file mode 100644
index 2d2f608f91f..00000000000
--- a/src/cloudflare/types/event_notifications/r2/configuration/queue_update_response.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ....._models import BaseModel
-
-__all__ = ["QueueUpdateResponse"]
-
-
-class QueueUpdateResponse(BaseModel):
-    event_notification_detail_id: Optional[str] = None
diff --git a/src/cloudflare/types/event_notifications/r2/configuration_get_response.py b/src/cloudflare/types/event_notifications/r2/configuration_get_response.py
deleted file mode 100644
index ae1ed76ea41..00000000000
--- a/src/cloudflare/types/event_notifications/r2/configuration_get_response.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Dict, List, Optional
-from typing_extensions import Literal
-
-from ...._models import BaseModel
-
-__all__ = [
-    "ConfigurationGetResponse",
-    "ConfigurationGetResponseItemConfigurationGetResponseItemItem",
-    "ConfigurationGetResponseItemConfigurationGetResponseItemItemRule",
-]
-
-
-class ConfigurationGetResponseItemConfigurationGetResponseItemItemRule(BaseModel):
-    actions: List[Literal["PutObject", "CopyObject", "DeleteObject", "CompleteMultipartUpload", "AbortMultipartUpload"]]
-    """Array of R2 object actions that will trigger notifications"""
-
-    prefix: Optional[str] = None
-    """Notifications will be sent only for objects with this prefix"""
-
-    suffix: Optional[str] = None
-    """Notifications will be sent only for objects with this suffix"""
-
-
-class ConfigurationGetResponseItemConfigurationGetResponseItemItem(BaseModel):
-    queue: str
-    """Queue ID that will receive notifications based on the configured rules"""
-
-    rules: List[ConfigurationGetResponseItemConfigurationGetResponseItemItemRule]
-    """Array of rules to drive notifications"""
-
-
-ConfigurationGetResponse = Dict[str, Dict[str, ConfigurationGetResponseItemConfigurationGetResponseItemItem]]
diff --git a/src/cloudflare/types/filters/__init__.py b/src/cloudflare/types/filters/__init__.py
index 14ec0c81123..3821f4d8523 100644
--- a/src/cloudflare/types/filters/__init__.py
+++ b/src/cloudflare/types/filters/__init__.py
@@ -6,4 +6,8 @@
 from .filter_list_params import FilterListParams as FilterListParams
 from .filter_create_params import FilterCreateParams as FilterCreateParams
 from .filter_update_params import FilterUpdateParams as FilterUpdateParams
-from .filter_create_response import FilterCreateResponse as FilterCreateResponse
+from .firewall_filter_param import FirewallFilterParam as FirewallFilterParam
+from .filter_delete_response import FilterDeleteResponse as FilterDeleteResponse
+from .filter_bulk_delete_params import FilterBulkDeleteParams as FilterBulkDeleteParams
+from .filter_bulk_update_params import FilterBulkUpdateParams as FilterBulkUpdateParams
+from .filter_bulk_delete_response import FilterBulkDeleteResponse as FilterBulkDeleteResponse
diff --git a/src/cloudflare/types/filters/filter_bulk_delete_params.py b/src/cloudflare/types/filters/filter_bulk_delete_params.py
new file mode 100644
index 00000000000..7150780b6bd
--- /dev/null
+++ b/src/cloudflare/types/filters/filter_bulk_delete_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["FilterBulkDeleteParams"]
+
+
+class FilterBulkDeleteParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    id: Required[SequenceNotStr[str]]
diff --git a/src/cloudflare/types/filters/filter_bulk_delete_response.py b/src/cloudflare/types/filters/filter_bulk_delete_response.py
new file mode 100644
index 00000000000..293101ea20c
--- /dev/null
+++ b/src/cloudflare/types/filters/filter_bulk_delete_response.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import TypeAlias
+
+from ..._models import BaseModel
+
+__all__ = ["FilterBulkDeleteResponse", "FilterBulkDeleteResponseItem"]
+
+
+class FilterBulkDeleteResponseItem(BaseModel):
+    id: Optional[str] = None
+    """The unique identifier of the filter."""
+
+
+FilterBulkDeleteResponse: TypeAlias = List[FilterBulkDeleteResponseItem]
diff --git a/src/cloudflare/types/filters/filter_bulk_update_params.py b/src/cloudflare/types/filters/filter_bulk_update_params.py
new file mode 100644
index 00000000000..23cc086a37b
--- /dev/null
+++ b/src/cloudflare/types/filters/filter_bulk_update_params.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["FilterBulkUpdateParams", "Body"]
+
+
+class FilterBulkUpdateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    body: Required[Iterable[Body]]
+
+
+class Body(TypedDict, total=False):
+    description: str
+    """An informative summary of the filter."""
+
+    expression: str
+    """The filter expression.
+
+    For more information, refer to
+    [Expressions](https://developers.cloudflare.com/ruleset-engine/rules-language/expressions/).
+    """
+
+    paused: bool
+    """When true, indicates that the filter is currently paused."""
+
+    ref: str
+    """A short reference tag. Allows you to select related filters."""
diff --git a/src/cloudflare/types/filters/filter_create_params.py b/src/cloudflare/types/filters/filter_create_params.py
index d095687b400..f21059d8cb8 100644
--- a/src/cloudflare/types/filters/filter_create_params.py
+++ b/src/cloudflare/types/filters/filter_create_params.py
@@ -2,10 +2,16 @@
 
 from __future__ import annotations
 
+from typing import Iterable
 from typing_extensions import Required, TypedDict
 
+from .firewall_filter_param import FirewallFilterParam
+
 __all__ = ["FilterCreateParams"]
 
 
 class FilterCreateParams(TypedDict, total=False):
-    body: Required[object]
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    body: Required[Iterable[FirewallFilterParam]]
diff --git a/src/cloudflare/types/filters/filter_create_response.py b/src/cloudflare/types/filters/filter_create_response.py
deleted file mode 100644
index 410ac59aed1..00000000000
--- a/src/cloudflare/types/filters/filter_create_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .firewall_filter import FirewallFilter
-
-__all__ = ["FilterCreateResponse"]
-
-FilterCreateResponse = List[FirewallFilter]
diff --git a/src/cloudflare/types/filters/filter_delete_response.py b/src/cloudflare/types/filters/filter_delete_response.py
new file mode 100644
index 00000000000..393cd9af0fd
--- /dev/null
+++ b/src/cloudflare/types/filters/filter_delete_response.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["FilterDeleteResponse"]
+
+
+class FilterDeleteResponse(BaseModel):
+    id: str
+    """The unique identifier of the filter."""
diff --git a/src/cloudflare/types/filters/filter_list_params.py b/src/cloudflare/types/filters/filter_list_params.py
index 0b4f189cd22..d64f470e5eb 100644
--- a/src/cloudflare/types/filters/filter_list_params.py
+++ b/src/cloudflare/types/filters/filter_list_params.py
@@ -2,12 +2,15 @@
 
 from __future__ import annotations
 
-from typing_extensions import TypedDict
+from typing_extensions import Required, TypedDict
 
 __all__ = ["FilterListParams"]
 
 
 class FilterListParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Defines an identifier."""
+
     id: str
     """The unique identifier of the filter."""
 
diff --git a/src/cloudflare/types/filters/filter_update_params.py b/src/cloudflare/types/filters/filter_update_params.py
index 2e72680cc76..38f6c3af411 100644
--- a/src/cloudflare/types/filters/filter_update_params.py
+++ b/src/cloudflare/types/filters/filter_update_params.py
@@ -8,7 +8,21 @@
 
 
 class FilterUpdateParams(TypedDict, total=False):
-    zone_identifier: Required[str]
-    """Identifier"""
+    zone_id: Required[str]
+    """Defines an identifier."""
 
-    body: Required[object]
+    description: str
+    """An informative summary of the filter."""
+
+    expression: str
+    """The filter expression.
+
+    For more information, refer to
+    [Expressions](https://developers.cloudflare.com/ruleset-engine/rules-language/expressions/).
+    """
+
+    paused: bool
+    """When true, indicates that the filter is currently paused."""
+
+    ref: str
+    """A short reference tag. Allows you to select related filters."""
diff --git a/src/cloudflare/types/filters/firewall_filter_param.py b/src/cloudflare/types/filters/firewall_filter_param.py
new file mode 100644
index 00000000000..39b4c9b9620
--- /dev/null
+++ b/src/cloudflare/types/filters/firewall_filter_param.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import TypedDict
+
+__all__ = ["FirewallFilterParam"]
+
+
+class FirewallFilterParam(TypedDict, total=False):
+    description: str
+    """An informative summary of the filter."""
+
+    expression: str
+    """The filter expression.
+
+    For more information, refer to
+    [Expressions](https://developers.cloudflare.com/ruleset-engine/rules-language/expressions/).
+    """
+
+    paused: bool
+    """When true, indicates that the filter is currently paused."""
+
+    ref: str
+    """A short reference tag. Allows you to select related filters."""
diff --git a/src/cloudflare/types/firewall/__init__.py b/src/cloudflare/types/firewall/__init__.py
index b93cee390ef..bf8211b7fcf 100644
--- a/src/cloudflare/types/firewall/__init__.py
+++ b/src/cloudflare/types/firewall/__init__.py
@@ -8,16 +8,17 @@
 from .configuration import Configuration as Configuration
 from .firewall_rule import FirewallRule as FirewallRule
 from .deleted_filter import DeletedFilter as DeletedFilter
-from .rule_get_params import RuleGetParams as RuleGetParams
-from .rule_edit_params import RuleEditParams as RuleEditParams
 from .rule_list_params import RuleListParams as RuleListParams
+from .asn_configuration import ASNConfiguration as ASNConfiguration
+from .ipv6_configuration import IPV6Configuration as IPV6Configuration
 from .rule_create_params import RuleCreateParams as RuleCreateParams
-from .rule_edit_response import RuleEditResponse as RuleEditResponse
 from .rule_update_params import RuleUpdateParams as RuleUpdateParams
+from .configuration_param import ConfigurationParam as ConfigurationParam
 from .ua_rule_list_params import UARuleListParams as UARuleListParams
 from .lockdown_list_params import LockdownListParams as LockdownListParams
-from .rule_create_response import RuleCreateResponse as RuleCreateResponse
 from .ua_rule_get_response import UARuleGetResponse as UARuleGetResponse
+from .country_configuration import CountryConfiguration as CountryConfiguration
+from .rule_bulk_edit_params import RuleBulkEditParams as RuleBulkEditParams
 from .ua_rule_create_params import UARuleCreateParams as UARuleCreateParams
 from .ua_rule_list_response import UARuleListResponse as UARuleListResponse
 from .ua_rule_update_params import UARuleUpdateParams as UARuleUpdateParams
@@ -26,6 +27,7 @@
 from .access_rule_edit_params import AccessRuleEditParams as AccessRuleEditParams
 from .access_rule_list_params import AccessRuleListParams as AccessRuleListParams
 from .asn_configuration_param import ASNConfigurationParam as ASNConfigurationParam
+from .rule_bulk_update_params import RuleBulkUpdateParams as RuleBulkUpdateParams
 from .ua_rule_create_response import UARuleCreateResponse as UARuleCreateResponse
 from .ua_rule_delete_response import UARuleDeleteResponse as UARuleDeleteResponse
 from .ua_rule_update_response import UARuleUpdateResponse as UARuleUpdateResponse
@@ -34,10 +36,15 @@
 from .lockdown_delete_response import LockdownDeleteResponse as LockdownDeleteResponse
 from .access_rule_create_params import AccessRuleCreateParams as AccessRuleCreateParams
 from .access_rule_edit_response import AccessRuleEditResponse as AccessRuleEditResponse
+from .access_rule_list_response import AccessRuleListResponse as AccessRuleListResponse
 from .lockdown_ip_configuration import LockdownIPConfiguration as LockdownIPConfiguration
 from .access_rule_create_response import AccessRuleCreateResponse as AccessRuleCreateResponse
 from .access_rule_delete_response import AccessRuleDeleteResponse as AccessRuleDeleteResponse
 from .country_configuration_param import CountryConfigurationParam as CountryConfigurationParam
 from .lockdown_cidr_configuration import LockdownCIDRConfiguration as LockdownCIDRConfiguration
+from .access_rule_ip_configuration import AccessRuleIPConfiguration as AccessRuleIPConfiguration
+from .access_rule_cidr_configuration import AccessRuleCIDRConfiguration as AccessRuleCIDRConfiguration
+from .lockdown_ip_configuration_param import LockdownIPConfigurationParam as LockdownIPConfigurationParam
+from .lockdown_cidr_configuration_param import LockdownCIDRConfigurationParam as LockdownCIDRConfigurationParam
 from .access_rule_ip_configuration_param import AccessRuleIPConfigurationParam as AccessRuleIPConfigurationParam
 from .access_rule_cidr_configuration_param import AccessRuleCIDRConfigurationParam as AccessRuleCIDRConfigurationParam
diff --git a/src/cloudflare/types/firewall/access_rule_cidr_configuration.py b/src/cloudflare/types/firewall/access_rule_cidr_configuration.py
new file mode 100644
index 00000000000..7a88829b272
--- /dev/null
+++ b/src/cloudflare/types/firewall/access_rule_cidr_configuration.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["AccessRuleCIDRConfiguration"]
+
+
+class AccessRuleCIDRConfiguration(BaseModel):
+    target: Optional[Literal["ip_range"]] = None
+    """The configuration target.
+
+    You must set the target to `ip_range` when specifying an IP address range in the
+    rule.
+    """
+
+    value: Optional[str] = None
+    """The IP address range to match.
+
+    You can only use prefix lengths `/16` and `/24` for IPv4 ranges, and prefix
+    lengths `/32`, `/48`, and `/64` for IPv6 ranges.
+    """
diff --git a/src/cloudflare/types/firewall/access_rule_create_params.py b/src/cloudflare/types/firewall/access_rule_create_params.py
index b33d495b8b1..be9c6680927 100644
--- a/src/cloudflare/types/firewall/access_rule_create_params.py
+++ b/src/cloudflare/types/firewall/access_rule_create_params.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from typing import Union
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
 from .asn_configuration_param import ASNConfigurationParam
 from .ipv6_configuration_param import IPV6ConfigurationParam
@@ -33,7 +33,7 @@ class AccessRuleCreateParams(TypedDict, total=False):
     """
 
 
-Configuration = Union[
+Configuration: TypeAlias = Union[
     AccessRuleIPConfigurationParam,
     IPV6ConfigurationParam,
     AccessRuleCIDRConfigurationParam,
diff --git a/src/cloudflare/types/firewall/access_rule_create_response.py b/src/cloudflare/types/firewall/access_rule_create_response.py
index 0a4df8a881b..7b253f96afb 100644
--- a/src/cloudflare/types/firewall/access_rule_create_response.py
+++ b/src/cloudflare/types/firewall/access_rule_create_response.py
@@ -1,7 +1,59 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
-__all__ = ["AccessRuleCreateResponse"]
+from ..._models import BaseModel
+from .asn_configuration import ASNConfiguration
+from .ipv6_configuration import IPV6Configuration
+from .country_configuration import CountryConfiguration
+from .access_rule_ip_configuration import AccessRuleIPConfiguration
+from .access_rule_cidr_configuration import AccessRuleCIDRConfiguration
 
-AccessRuleCreateResponse = Union[Optional[str], Optional[object]]
+__all__ = ["AccessRuleCreateResponse", "Configuration", "Scope"]
+
+Configuration: TypeAlias = Union[
+    AccessRuleIPConfiguration, IPV6Configuration, AccessRuleCIDRConfiguration, ASNConfiguration, CountryConfiguration
+]
+
+
+class Scope(BaseModel):
+    """All zones owned by the user will have the rule applied."""
+
+    id: Optional[str] = None
+    """Defines an identifier."""
+
+    email: Optional[str] = None
+    """The contact email address of the user."""
+
+    type: Optional[Literal["user", "organization"]] = None
+    """Defines the scope of the rule."""
+
+
+class AccessRuleCreateResponse(BaseModel):
+    id: str
+    """The unique identifier of the IP Access rule."""
+
+    allowed_modes: List[Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"]]
+    """The available actions that a rule can apply to a matched request."""
+
+    configuration: Configuration
+    """The rule configuration."""
+
+    mode: Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"]
+    """The action to apply to a matched request."""
+
+    created_on: Optional[datetime] = None
+    """The timestamp of when the rule was created."""
+
+    modified_on: Optional[datetime] = None
+    """The timestamp of when the rule was last modified."""
+
+    notes: Optional[str] = None
+    """
+    An informative summary of the rule, typically used as a reminder or explanation.
+    """
+
+    scope: Optional[Scope] = None
+    """All zones owned by the user will have the rule applied."""
diff --git a/src/cloudflare/types/firewall/access_rule_delete_response.py b/src/cloudflare/types/firewall/access_rule_delete_response.py
index 3e76fc0182b..150f0c982fa 100644
--- a/src/cloudflare/types/firewall/access_rule_delete_response.py
+++ b/src/cloudflare/types/firewall/access_rule_delete_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ..._models import BaseModel
 
 __all__ = ["AccessRuleDeleteResponse"]
@@ -8,4 +7,4 @@
 
 class AccessRuleDeleteResponse(BaseModel):
     id: str
-    """Identifier"""
+    """Defines an identifier."""
diff --git a/src/cloudflare/types/firewall/access_rule_edit_params.py b/src/cloudflare/types/firewall/access_rule_edit_params.py
index 8a7d69b38ea..0b00f853493 100644
--- a/src/cloudflare/types/firewall/access_rule_edit_params.py
+++ b/src/cloudflare/types/firewall/access_rule_edit_params.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from typing import Union
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
 from .asn_configuration_param import ASNConfigurationParam
 from .ipv6_configuration_param import IPV6ConfigurationParam
@@ -33,7 +33,7 @@ class AccessRuleEditParams(TypedDict, total=False):
     """
 
 
-Configuration = Union[
+Configuration: TypeAlias = Union[
     AccessRuleIPConfigurationParam,
     IPV6ConfigurationParam,
     AccessRuleCIDRConfigurationParam,
diff --git a/src/cloudflare/types/firewall/access_rule_edit_response.py b/src/cloudflare/types/firewall/access_rule_edit_response.py
index a27b308d2ab..6b652fb39b7 100644
--- a/src/cloudflare/types/firewall/access_rule_edit_response.py
+++ b/src/cloudflare/types/firewall/access_rule_edit_response.py
@@ -1,7 +1,59 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
-__all__ = ["AccessRuleEditResponse"]
+from ..._models import BaseModel
+from .asn_configuration import ASNConfiguration
+from .ipv6_configuration import IPV6Configuration
+from .country_configuration import CountryConfiguration
+from .access_rule_ip_configuration import AccessRuleIPConfiguration
+from .access_rule_cidr_configuration import AccessRuleCIDRConfiguration
 
-AccessRuleEditResponse = Union[Optional[str], Optional[object]]
+__all__ = ["AccessRuleEditResponse", "Configuration", "Scope"]
+
+Configuration: TypeAlias = Union[
+    AccessRuleIPConfiguration, IPV6Configuration, AccessRuleCIDRConfiguration, ASNConfiguration, CountryConfiguration
+]
+
+
+class Scope(BaseModel):
+    """All zones owned by the user will have the rule applied."""
+
+    id: Optional[str] = None
+    """Defines an identifier."""
+
+    email: Optional[str] = None
+    """The contact email address of the user."""
+
+    type: Optional[Literal["user", "organization"]] = None
+    """Defines the scope of the rule."""
+
+
+class AccessRuleEditResponse(BaseModel):
+    id: str
+    """The unique identifier of the IP Access rule."""
+
+    allowed_modes: List[Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"]]
+    """The available actions that a rule can apply to a matched request."""
+
+    configuration: Configuration
+    """The rule configuration."""
+
+    mode: Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"]
+    """The action to apply to a matched request."""
+
+    created_on: Optional[datetime] = None
+    """The timestamp of when the rule was created."""
+
+    modified_on: Optional[datetime] = None
+    """The timestamp of when the rule was last modified."""
+
+    notes: Optional[str] = None
+    """
+    An informative summary of the rule, typically used as a reminder or explanation.
+    """
+
+    scope: Optional[Scope] = None
+    """All zones owned by the user will have the rule applied."""
diff --git a/src/cloudflare/types/firewall/access_rule_get_response.py b/src/cloudflare/types/firewall/access_rule_get_response.py
index a824c545bc9..5457a1245f4 100644
--- a/src/cloudflare/types/firewall/access_rule_get_response.py
+++ b/src/cloudflare/types/firewall/access_rule_get_response.py
@@ -1,7 +1,59 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
-__all__ = ["AccessRuleGetResponse"]
+from ..._models import BaseModel
+from .asn_configuration import ASNConfiguration
+from .ipv6_configuration import IPV6Configuration
+from .country_configuration import CountryConfiguration
+from .access_rule_ip_configuration import AccessRuleIPConfiguration
+from .access_rule_cidr_configuration import AccessRuleCIDRConfiguration
 
-AccessRuleGetResponse = Union[Optional[str], Optional[object]]
+__all__ = ["AccessRuleGetResponse", "Configuration", "Scope"]
+
+Configuration: TypeAlias = Union[
+    AccessRuleIPConfiguration, IPV6Configuration, AccessRuleCIDRConfiguration, ASNConfiguration, CountryConfiguration
+]
+
+
+class Scope(BaseModel):
+    """All zones owned by the user will have the rule applied."""
+
+    id: Optional[str] = None
+    """Defines an identifier."""
+
+    email: Optional[str] = None
+    """The contact email address of the user."""
+
+    type: Optional[Literal["user", "organization"]] = None
+    """Defines the scope of the rule."""
+
+
+class AccessRuleGetResponse(BaseModel):
+    id: str
+    """The unique identifier of the IP Access rule."""
+
+    allowed_modes: List[Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"]]
+    """The available actions that a rule can apply to a matched request."""
+
+    configuration: Configuration
+    """The rule configuration."""
+
+    mode: Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"]
+    """The action to apply to a matched request."""
+
+    created_on: Optional[datetime] = None
+    """The timestamp of when the rule was created."""
+
+    modified_on: Optional[datetime] = None
+    """The timestamp of when the rule was last modified."""
+
+    notes: Optional[str] = None
+    """
+    An informative summary of the rule, typically used as a reminder or explanation.
+    """
+
+    scope: Optional[Scope] = None
+    """All zones owned by the user will have the rule applied."""
diff --git a/src/cloudflare/types/firewall/access_rule_ip_configuration.py b/src/cloudflare/types/firewall/access_rule_ip_configuration.py
new file mode 100644
index 00000000000..bb5ced460e5
--- /dev/null
+++ b/src/cloudflare/types/firewall/access_rule_ip_configuration.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["AccessRuleIPConfiguration"]
+
+
+class AccessRuleIPConfiguration(BaseModel):
+    target: Optional[Literal["ip"]] = None
+    """The configuration target.
+
+    You must set the target to `ip` when specifying an IP address in the rule.
+    """
+
+    value: Optional[str] = None
+    """The IP address to match.
+
+    This address will be compared to the IP address of incoming requests.
+    """
diff --git a/src/cloudflare/types/firewall/access_rule_list_params.py b/src/cloudflare/types/firewall/access_rule_list_params.py
index ace0e0e0039..b8c9dcc7307 100644
--- a/src/cloudflare/types/firewall/access_rule_list_params.py
+++ b/src/cloudflare/types/firewall/access_rule_list_params.py
@@ -2,11 +2,9 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal, Annotated, TypedDict
+from typing_extensions import Literal, TypedDict
 
-from ..._utils import PropertyInfo
-
-__all__ = ["AccessRuleListParams", "EgsPagination", "EgsPaginationJson", "Filters"]
+__all__ = ["AccessRuleListParams", "Configuration"]
 
 
 class AccessRuleListParams(TypedDict, total=False):
@@ -16,65 +14,47 @@ class AccessRuleListParams(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    direction: Literal["asc", "desc"]
-    """The direction used to sort returned rules."""
+    configuration: Configuration
 
-    egs_pagination: Annotated[EgsPagination, PropertyInfo(alias="egs-pagination")]
+    direction: Literal["asc", "desc"]
+    """Defines the direction used to sort returned rules."""
 
-    filters: Filters
+    match: Literal["any", "all"]
+    """Defines the search requirements.
 
-    order: Literal["configuration.target", "configuration.value", "mode"]
-    """The field used to sort returned rules."""
+    When set to `all`, all the search requirements must match. When set to `any`,
+    only one of the search requirements has to match.
+    """
 
-    page: float
-    """Requested page within paginated list of results."""
+    mode: Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"]
+    """The action to apply to a matched request."""
 
-    per_page: float
-    """Maximum number of results requested."""
+    notes: str
+    """
+    Defines the string to search for in the notes of existing IP Access rules.
+    Notes: For example, the string 'attack' would match IP Access rules with notes
+    'Attack 26/02' and 'Attack 27/02'. The search is case insensitive.
+    """
 
+    order: Literal["configuration.target", "configuration.value", "mode"]
+    """Defines the field used to sort returned rules."""
 
-class EgsPaginationJson(TypedDict, total=False):
     page: float
-    """The page number of paginated results."""
+    """Defines the requested page within paginated list of results."""
 
     per_page: float
-    """The maximum number of results per page.
+    """Defines the maximum number of results requested."""
 
-    You can only set the value to `1` or to a multiple of 5 such as `5`, `10`, `15`,
-    or `20`.
-    """
 
+class Configuration(TypedDict, total=False):
+    target: Literal["ip", "ip_range", "asn", "country"]
+    """Defines the target to search in existing rules."""
 
-class EgsPagination(TypedDict, total=False):
-    json: EgsPaginationJson
-
-
-class Filters(TypedDict, total=False):
-    configuration_target: Annotated[
-        Literal["ip", "ip_range", "asn", "country"], PropertyInfo(alias="configuration.target")
-    ]
-    """The target to search in existing rules."""
-
-    configuration_value: Annotated[str, PropertyInfo(alias="configuration.value")]
-    """
-    The target value to search for in existing rules: an IP address, an IP address
-    range, or a country code, depending on the provided `configuration.target`.
-    Notes: You can search for a single IPv4 address, an IP address range with a
-    subnet of '/16' or '/24', or a two-letter ISO-3166-1 alpha-2 country code.
-    """
-
-    match: Literal["any", "all"]
-    """When set to `all`, all the search requirements must match.
-
-    When set to `any`, only one of the search requirements has to match.
-    """
-
-    mode: Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"]
-    """The action to apply to a matched request."""
-
-    notes: str
+    value: str
     """
-    The string to search for in the notes of existing IP Access rules. Notes: For
-    example, the string 'attack' would match IP Access rules with notes 'Attack
-    26/02' and 'Attack 27/02'. The search is case insensitive.
+    Defines the target value to search for in existing rules: an IP address, an IP
+    address range, or a country code, depending on the provided
+    `configuration.target`. Notes: You can search for a single IPv4 address, an IP
+    address range with a subnet of '/16' or '/24', or a two-letter ISO-3166-1
+    alpha-2 country code.
     """
diff --git a/src/cloudflare/types/firewall/access_rule_list_response.py b/src/cloudflare/types/firewall/access_rule_list_response.py
new file mode 100644
index 00000000000..eb55818a15b
--- /dev/null
+++ b/src/cloudflare/types/firewall/access_rule_list_response.py
@@ -0,0 +1,59 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ..._models import BaseModel
+from .asn_configuration import ASNConfiguration
+from .ipv6_configuration import IPV6Configuration
+from .country_configuration import CountryConfiguration
+from .access_rule_ip_configuration import AccessRuleIPConfiguration
+from .access_rule_cidr_configuration import AccessRuleCIDRConfiguration
+
+__all__ = ["AccessRuleListResponse", "Configuration", "Scope"]
+
+Configuration: TypeAlias = Union[
+    AccessRuleIPConfiguration, IPV6Configuration, AccessRuleCIDRConfiguration, ASNConfiguration, CountryConfiguration
+]
+
+
+class Scope(BaseModel):
+    """All zones owned by the user will have the rule applied."""
+
+    id: Optional[str] = None
+    """Defines an identifier."""
+
+    email: Optional[str] = None
+    """The contact email address of the user."""
+
+    type: Optional[Literal["user", "organization"]] = None
+    """Defines the scope of the rule."""
+
+
+class AccessRuleListResponse(BaseModel):
+    id: str
+    """The unique identifier of the IP Access rule."""
+
+    allowed_modes: List[Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"]]
+    """The available actions that a rule can apply to a matched request."""
+
+    configuration: Configuration
+    """The rule configuration."""
+
+    mode: Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"]
+    """The action to apply to a matched request."""
+
+    created_on: Optional[datetime] = None
+    """The timestamp of when the rule was created."""
+
+    modified_on: Optional[datetime] = None
+    """The timestamp of when the rule was last modified."""
+
+    notes: Optional[str] = None
+    """
+    An informative summary of the rule, typically used as a reminder or explanation.
+    """
+
+    scope: Optional[Scope] = None
+    """All zones owned by the user will have the rule applied."""
diff --git a/src/cloudflare/types/firewall/asn_configuration.py b/src/cloudflare/types/firewall/asn_configuration.py
new file mode 100644
index 00000000000..6681a67e6b1
--- /dev/null
+++ b/src/cloudflare/types/firewall/asn_configuration.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["ASNConfiguration"]
+
+
+class ASNConfiguration(BaseModel):
+    target: Optional[Literal["asn"]] = None
+    """The configuration target.
+
+    You must set the target to `asn` when specifying an Autonomous System Number
+    (ASN) in the rule.
+    """
+
+    value: Optional[str] = None
+    """The AS number to match."""
diff --git a/src/cloudflare/types/firewall/configuration.py b/src/cloudflare/types/firewall/configuration.py
index c795db49b4f..74e6fe404d4 100644
--- a/src/cloudflare/types/firewall/configuration.py
+++ b/src/cloudflare/types/firewall/configuration.py
@@ -1,10 +1,13 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union
+from typing import List, Union
+from typing_extensions import TypeAlias
 
 from .lockdown_ip_configuration import LockdownIPConfiguration
 from .lockdown_cidr_configuration import LockdownCIDRConfiguration
 
-__all__ = ["Configuration"]
+__all__ = ["Configuration", "ConfigurationItem"]
 
-Configuration = Union[LockdownIPConfiguration, LockdownCIDRConfiguration]
+ConfigurationItem: TypeAlias = Union[LockdownIPConfiguration, LockdownCIDRConfiguration]
+
+Configuration: TypeAlias = List[ConfigurationItem]
diff --git a/src/cloudflare/types/firewall/configuration_param.py b/src/cloudflare/types/firewall/configuration_param.py
new file mode 100644
index 00000000000..ba136e9f291
--- /dev/null
+++ b/src/cloudflare/types/firewall/configuration_param.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from typing_extensions import TypeAlias
+
+from .lockdown_ip_configuration_param import LockdownIPConfigurationParam
+from .lockdown_cidr_configuration_param import LockdownCIDRConfigurationParam
+
+__all__ = ["ConfigurationParam", "ConfigurationParamItem"]
+
+ConfigurationParamItem: TypeAlias = Union[LockdownIPConfigurationParam, LockdownCIDRConfigurationParam]
+
+ConfigurationParam: TypeAlias = List[ConfigurationParamItem]
diff --git a/src/cloudflare/types/firewall/country_configuration.py b/src/cloudflare/types/firewall/country_configuration.py
new file mode 100644
index 00000000000..6fa7ec43fac
--- /dev/null
+++ b/src/cloudflare/types/firewall/country_configuration.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["CountryConfiguration"]
+
+
+class CountryConfiguration(BaseModel):
+    target: Optional[Literal["country"]] = None
+    """The configuration target.
+
+    You must set the target to `country` when specifying a country code in the rule.
+    """
+
+    value: Optional[str] = None
+    """The two-letter ISO-3166-1 alpha-2 code to match.
+
+    For more information, refer to
+    [IP Access rules: Parameters](https://developers.cloudflare.com/waf/tools/ip-access-rules/parameters/#country).
+    """
diff --git a/src/cloudflare/types/firewall/deleted_filter.py b/src/cloudflare/types/firewall/deleted_filter.py
index 2f81710d06b..2172524a4be 100644
--- a/src/cloudflare/types/firewall/deleted_filter.py
+++ b/src/cloudflare/types/firewall/deleted_filter.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ..._models import BaseModel
 
 __all__ = ["DeletedFilter"]
diff --git a/src/cloudflare/types/firewall/firewall_rule.py b/src/cloudflare/types/firewall/firewall_rule.py
index 179de38e86d..1cf88c79af3 100644
--- a/src/cloudflare/types/firewall/firewall_rule.py
+++ b/src/cloudflare/types/firewall/firewall_rule.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Union, Optional
+from typing_extensions import TypeAlias
 
 from .product import Product
 from ..._models import BaseModel
@@ -10,7 +11,7 @@
 
 __all__ = ["FirewallRule", "Filter"]
 
-Filter = Union[FirewallFilter, DeletedFilter]
+Filter: TypeAlias = Union[FirewallFilter, DeletedFilter]
 
 
 class FirewallRule(BaseModel):
diff --git a/src/cloudflare/types/firewall/ipv6_configuration.py b/src/cloudflare/types/firewall/ipv6_configuration.py
new file mode 100644
index 00000000000..3bf40ed6bc2
--- /dev/null
+++ b/src/cloudflare/types/firewall/ipv6_configuration.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["IPV6Configuration"]
+
+
+class IPV6Configuration(BaseModel):
+    target: Optional[Literal["ip6"]] = None
+    """The configuration target.
+
+    You must set the target to `ip6` when specifying an IPv6 address in the rule.
+    """
+
+    value: Optional[str] = None
+    """The IPv6 address to match."""
diff --git a/src/cloudflare/types/firewall/lockdown_cidr_configuration_param.py b/src/cloudflare/types/firewall/lockdown_cidr_configuration_param.py
new file mode 100644
index 00000000000..2748218d297
--- /dev/null
+++ b/src/cloudflare/types/firewall/lockdown_cidr_configuration_param.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["LockdownCIDRConfigurationParam"]
+
+
+class LockdownCIDRConfigurationParam(TypedDict, total=False):
+    target: Literal["ip_range"]
+    """The configuration target.
+
+    You must set the target to `ip_range` when specifying an IP address range in the
+    Zone Lockdown rule.
+    """
+
+    value: str
+    """The IP address range to match. You can only use prefix lengths `/16` and `/24`."""
diff --git a/src/cloudflare/types/firewall/lockdown_create_params.py b/src/cloudflare/types/firewall/lockdown_create_params.py
index bcf525836d4..b25d78212dd 100644
--- a/src/cloudflare/types/firewall/lockdown_create_params.py
+++ b/src/cloudflare/types/firewall/lockdown_create_params.py
@@ -4,8 +4,43 @@
 
 from typing_extensions import Required, TypedDict
 
+from ..._types import SequenceNotStr
+from .waf.override_url import OverrideURL
+from .configuration_param import ConfigurationParam
+
 __all__ = ["LockdownCreateParams"]
 
 
 class LockdownCreateParams(TypedDict, total=False):
-    body: Required[object]
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    configurations: Required[ConfigurationParam]
+    """
+    A list of IP addresses or CIDR ranges that will be allowed to access the URLs
+    specified in the Zone Lockdown rule. You can include any number of `ip` or
+    `ip_range` configurations.
+    """
+
+    urls: Required[SequenceNotStr[OverrideURL]]
+    """The URLs to include in the current WAF override.
+
+    You can use wildcards. Each entered URL will be escaped before use, which means
+    you can only use simple wildcard patterns.
+    """
+
+    description: str
+    """An informative summary of the rule.
+
+    This value is sanitized and any tags will be removed.
+    """
+
+    paused: bool
+    """When true, indicates that the rule is currently paused."""
+
+    priority: float
+    """The priority of the rule to control the processing order.
+
+    A lower number indicates higher priority. If not provided, any rules with a
+    configured priority will be processed before rules without a priority.
+    """
diff --git a/src/cloudflare/types/firewall/lockdown_ip_configuration_param.py b/src/cloudflare/types/firewall/lockdown_ip_configuration_param.py
new file mode 100644
index 00000000000..8c3b3322596
--- /dev/null
+++ b/src/cloudflare/types/firewall/lockdown_ip_configuration_param.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["LockdownIPConfigurationParam"]
+
+
+class LockdownIPConfigurationParam(TypedDict, total=False):
+    target: Literal["ip"]
+    """The configuration target.
+
+    You must set the target to `ip` when specifying an IP address in the Zone
+    Lockdown rule.
+    """
+
+    value: str
+    """The IP address to match.
+
+    This address will be compared to the IP address of incoming requests.
+    """
diff --git a/src/cloudflare/types/firewall/lockdown_list_params.py b/src/cloudflare/types/firewall/lockdown_list_params.py
index bf2c8abb5c2..85b6a5cb4f0 100644
--- a/src/cloudflare/types/firewall/lockdown_list_params.py
+++ b/src/cloudflare/types/firewall/lockdown_list_params.py
@@ -4,7 +4,7 @@
 
 from typing import Union
 from datetime import datetime
-from typing_extensions import Annotated, TypedDict
+from typing_extensions import Required, Annotated, TypedDict
 
 from ..._utils import PropertyInfo
 
@@ -12,6 +12,9 @@
 
 
 class LockdownListParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Defines an identifier."""
+
     created_on: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
     """The timestamp of when the rule was created."""
 
diff --git a/src/cloudflare/types/firewall/lockdown_update_params.py b/src/cloudflare/types/firewall/lockdown_update_params.py
index 26d6b7ac3b3..79c4db1b756 100644
--- a/src/cloudflare/types/firewall/lockdown_update_params.py
+++ b/src/cloudflare/types/firewall/lockdown_update_params.py
@@ -4,11 +4,27 @@
 
 from typing_extensions import Required, TypedDict
 
+from ..._types import SequenceNotStr
+from .waf.override_url import OverrideURL
+from .configuration_param import ConfigurationParam
+
 __all__ = ["LockdownUpdateParams"]
 
 
 class LockdownUpdateParams(TypedDict, total=False):
-    zone_identifier: Required[str]
-    """Identifier"""
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    configurations: Required[ConfigurationParam]
+    """
+    A list of IP addresses or CIDR ranges that will be allowed to access the URLs
+    specified in the Zone Lockdown rule. You can include any number of `ip` or
+    `ip_range` configurations.
+    """
+
+    urls: Required[SequenceNotStr[OverrideURL]]
+    """The URLs to include in the current WAF override.
 
-    body: Required[object]
+    You can use wildcards. Each entered URL will be escaped before use, which means
+    you can only use simple wildcard patterns.
+    """
diff --git a/src/cloudflare/types/firewall/lockdown_url.py b/src/cloudflare/types/firewall/lockdown_url.py
index 0a1b07bf3a3..a5e4133f94a 100644
--- a/src/cloudflare/types/firewall/lockdown_url.py
+++ b/src/cloudflare/types/firewall/lockdown_url.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["LockdownURL"]
 
-LockdownURL = str
+LockdownURL: TypeAlias = str
diff --git a/src/cloudflare/types/firewall/product.py b/src/cloudflare/types/firewall/product.py
index 5a004e3217c..27cb6c6bec6 100644
--- a/src/cloudflare/types/firewall/product.py
+++ b/src/cloudflare/types/firewall/product.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["Product"]
 
-Product = Literal["zoneLockdown", "uaBlock", "bic", "hot", "securityLevel", "rateLimit", "waf"]
+Product: TypeAlias = Literal["zoneLockdown", "uaBlock", "bic", "hot", "securityLevel", "rateLimit", "waf"]
diff --git a/src/cloudflare/types/firewall/rule_bulk_edit_params.py b/src/cloudflare/types/firewall/rule_bulk_edit_params.py
new file mode 100644
index 00000000000..1ac14b38861
--- /dev/null
+++ b/src/cloudflare/types/firewall/rule_bulk_edit_params.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["RuleBulkEditParams"]
+
+
+class RuleBulkEditParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    body: Required[object]
diff --git a/src/cloudflare/types/firewall/rule_bulk_update_params.py b/src/cloudflare/types/firewall/rule_bulk_update_params.py
new file mode 100644
index 00000000000..2f5e7331b4c
--- /dev/null
+++ b/src/cloudflare/types/firewall/rule_bulk_update_params.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["RuleBulkUpdateParams"]
+
+
+class RuleBulkUpdateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    body: Required[object]
diff --git a/src/cloudflare/types/firewall/rule_create_params.py b/src/cloudflare/types/firewall/rule_create_params.py
index 6b66e50fb5c..a11900bed22 100644
--- a/src/cloudflare/types/firewall/rule_create_params.py
+++ b/src/cloudflare/types/firewall/rule_create_params.py
@@ -2,10 +2,68 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
-__all__ = ["RuleCreateParams"]
+from ..filters.firewall_filter_param import FirewallFilterParam
+
+__all__ = ["RuleCreateParams", "Action", "ActionResponse"]
 
 
 class RuleCreateParams(TypedDict, total=False):
-    body: Required[object]
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    action: Required[Action]
+    """
+    The action to perform when the threshold of matched traffic within the
+    configured period is exceeded.
+    """
+
+    filter: Required[FirewallFilterParam]
+
+
+class ActionResponse(TypedDict, total=False):
+    """A custom content type and reponse to return when the threshold is exceeded.
+
+    The custom response configured in this object will override the custom error for the zone. This object is optional.
+    Notes: If you omit this object, Cloudflare will use the default HTML error page. If "mode" is "challenge", "managed_challenge", or "js_challenge", Cloudflare will use the zone challenge pages and you should not provide the "response" object.
+    """
+
+    body: str
+    """The response body to return.
+
+    The value must conform to the configured content type.
+    """
+
+    content_type: str
+    """The content type of the body.
+
+    Must be one of the following: `text/plain`, `text/xml`, or `application/json`.
+    """
+
+
+class Action(TypedDict, total=False):
+    """
+    The action to perform when the threshold of matched traffic within the configured period is exceeded.
+    """
+
+    mode: Literal["simulate", "ban", "challenge", "js_challenge", "managed_challenge"]
+    """The action to perform."""
+
+    response: ActionResponse
+    """A custom content type and reponse to return when the threshold is exceeded.
+
+    The custom response configured in this object will override the custom error for
+    the zone. This object is optional. Notes: If you omit this object, Cloudflare
+    will use the default HTML error page. If "mode" is "challenge",
+    "managed_challenge", or "js_challenge", Cloudflare will use the zone challenge
+    pages and you should not provide the "response" object.
+    """
+
+    timeout: float
+    """The time in seconds during which Cloudflare will perform the mitigation action.
+
+    Must be an integer value greater than or equal to the period. Notes: If "mode"
+    is "challenge", "managed_challenge", or "js_challenge", Cloudflare will use the
+    zone's Challenge Passage time and you should not provide this value.
+    """
diff --git a/src/cloudflare/types/firewall/rule_create_response.py b/src/cloudflare/types/firewall/rule_create_response.py
deleted file mode 100644
index 9e9e460a11f..00000000000
--- a/src/cloudflare/types/firewall/rule_create_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .firewall_rule import FirewallRule
-
-__all__ = ["RuleCreateResponse"]
-
-RuleCreateResponse = List[FirewallRule]
diff --git a/src/cloudflare/types/firewall/rule_edit_params.py b/src/cloudflare/types/firewall/rule_edit_params.py
deleted file mode 100644
index ef32d806fdb..00000000000
--- a/src/cloudflare/types/firewall/rule_edit_params.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["RuleEditParams"]
-
-
-class RuleEditParams(TypedDict, total=False):
-    zone_identifier: Required[str]
-    """Identifier"""
-
-    body: Required[object]
diff --git a/src/cloudflare/types/firewall/rule_edit_response.py b/src/cloudflare/types/firewall/rule_edit_response.py
deleted file mode 100644
index 7c461c4190f..00000000000
--- a/src/cloudflare/types/firewall/rule_edit_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .firewall_rule import FirewallRule
-
-__all__ = ["RuleEditResponse"]
-
-RuleEditResponse = List[FirewallRule]
diff --git a/src/cloudflare/types/firewall/rule_get_params.py b/src/cloudflare/types/firewall/rule_get_params.py
deleted file mode 100644
index 79bd6c28748..00000000000
--- a/src/cloudflare/types/firewall/rule_get_params.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, Annotated, TypedDict
-
-from ..._utils import PropertyInfo
-
-__all__ = ["RuleGetParams"]
-
-
-class RuleGetParams(TypedDict, total=False):
-    path_id: Required[Annotated[str, PropertyInfo(alias="id")]]
-    """The unique identifier of the firewall rule."""
-
-    query_id: Annotated[str, PropertyInfo(alias="id")]
-    """The unique identifier of the firewall rule."""
diff --git a/src/cloudflare/types/firewall/rule_list_params.py b/src/cloudflare/types/firewall/rule_list_params.py
index d46c0f938ef..8cfb84bcb12 100644
--- a/src/cloudflare/types/firewall/rule_list_params.py
+++ b/src/cloudflare/types/firewall/rule_list_params.py
@@ -2,12 +2,15 @@
 
 from __future__ import annotations
 
-from typing_extensions import TypedDict
+from typing_extensions import Required, TypedDict
 
 __all__ = ["RuleListParams"]
 
 
 class RuleListParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Defines an identifier."""
+
     id: str
     """The unique identifier of the firewall rule."""
 
diff --git a/src/cloudflare/types/firewall/rule_update_params.py b/src/cloudflare/types/firewall/rule_update_params.py
index 469a9f8b85e..cde6e776dd3 100644
--- a/src/cloudflare/types/firewall/rule_update_params.py
+++ b/src/cloudflare/types/firewall/rule_update_params.py
@@ -2,13 +2,68 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
-__all__ = ["RuleUpdateParams"]
+from ..filters.firewall_filter_param import FirewallFilterParam
+
+__all__ = ["RuleUpdateParams", "Action", "ActionResponse"]
 
 
 class RuleUpdateParams(TypedDict, total=False):
-    zone_identifier: Required[str]
-    """Identifier"""
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    action: Required[Action]
+    """
+    The action to perform when the threshold of matched traffic within the
+    configured period is exceeded.
+    """
+
+    filter: Required[FirewallFilterParam]
+
+
+class ActionResponse(TypedDict, total=False):
+    """A custom content type and reponse to return when the threshold is exceeded.
+
+    The custom response configured in this object will override the custom error for the zone. This object is optional.
+    Notes: If you omit this object, Cloudflare will use the default HTML error page. If "mode" is "challenge", "managed_challenge", or "js_challenge", Cloudflare will use the zone challenge pages and you should not provide the "response" object.
+    """
+
+    body: str
+    """The response body to return.
+
+    The value must conform to the configured content type.
+    """
+
+    content_type: str
+    """The content type of the body.
+
+    Must be one of the following: `text/plain`, `text/xml`, or `application/json`.
+    """
+
+
+class Action(TypedDict, total=False):
+    """
+    The action to perform when the threshold of matched traffic within the configured period is exceeded.
+    """
+
+    mode: Literal["simulate", "ban", "challenge", "js_challenge", "managed_challenge"]
+    """The action to perform."""
+
+    response: ActionResponse
+    """A custom content type and reponse to return when the threshold is exceeded.
+
+    The custom response configured in this object will override the custom error for
+    the zone. This object is optional. Notes: If you omit this object, Cloudflare
+    will use the default HTML error page. If "mode" is "challenge",
+    "managed_challenge", or "js_challenge", Cloudflare will use the zone challenge
+    pages and you should not provide the "response" object.
+    """
+
+    timeout: float
+    """The time in seconds during which Cloudflare will perform the mitigation action.
 
-    body: Required[object]
+    Must be an integer value greater than or equal to the period. Notes: If "mode"
+    is "challenge", "managed_challenge", or "js_challenge", Cloudflare will use the
+    zone's Challenge Passage time and you should not provide this value.
+    """
diff --git a/src/cloudflare/types/firewall/ua_rule_create_params.py b/src/cloudflare/types/firewall/ua_rule_create_params.py
index ac0ac5daab2..01e49728041 100644
--- a/src/cloudflare/types/firewall/ua_rule_create_params.py
+++ b/src/cloudflare/types/firewall/ua_rule_create_params.py
@@ -2,10 +2,36 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
-__all__ = ["UARuleCreateParams"]
+__all__ = ["UARuleCreateParams", "Configuration"]
 
 
 class UARuleCreateParams(TypedDict, total=False):
-    body: Required[object]
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    configuration: Required[Configuration]
+
+    mode: Required[Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"]]
+    """The action to apply to a matched request."""
+
+    description: str
+    """An informative summary of the rule.
+
+    This value is sanitized and any tags will be removed.
+    """
+
+    paused: bool
+    """When true, indicates that the rule is currently paused."""
+
+
+class Configuration(TypedDict, total=False):
+    target: Literal["ua"]
+    """The configuration target.
+
+    You must set the target to `ua` when specifying a user agent in the rule.
+    """
+
+    value: str
+    """the user agent to exactly match"""
diff --git a/src/cloudflare/types/firewall/ua_rule_create_response.py b/src/cloudflare/types/firewall/ua_rule_create_response.py
index 9f5213baa44..3f1b5a448a2 100644
--- a/src/cloudflare/types/firewall/ua_rule_create_response.py
+++ b/src/cloudflare/types/firewall/ua_rule_create_response.py
@@ -1,7 +1,41 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Optional
+from typing_extensions import Literal
 
-__all__ = ["UARuleCreateResponse"]
+from ..._models import BaseModel
 
-UARuleCreateResponse = Union[Optional[str], Optional[object]]
+__all__ = ["UARuleCreateResponse", "Configuration"]
+
+
+class Configuration(BaseModel):
+    """The configuration object for the current rule."""
+
+    target: Optional[str] = None
+    """The configuration target for this rule.
+
+    You must set the target to `ua` for User Agent Blocking rules.
+    """
+
+    value: Optional[str] = None
+    """The exact user agent string to match.
+
+    This value will be compared to the received `User-Agent` HTTP header value.
+    """
+
+
+class UARuleCreateResponse(BaseModel):
+    id: Optional[str] = None
+    """The unique identifier of the User Agent Blocking rule."""
+
+    configuration: Optional[Configuration] = None
+    """The configuration object for the current rule."""
+
+    description: Optional[str] = None
+    """An informative summary of the rule."""
+
+    mode: Optional[Literal["block", "challenge", "js_challenge", "managed_challenge"]] = None
+    """The action to apply to a matched request."""
+
+    paused: Optional[bool] = None
+    """When true, indicates that the rule is currently paused."""
diff --git a/src/cloudflare/types/firewall/ua_rule_delete_response.py b/src/cloudflare/types/firewall/ua_rule_delete_response.py
index 0d7cbd7d69d..efa8fdff586 100644
--- a/src/cloudflare/types/firewall/ua_rule_delete_response.py
+++ b/src/cloudflare/types/firewall/ua_rule_delete_response.py
@@ -1,12 +1,41 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from typing_extensions import Literal
 
 from ..._models import BaseModel
 
-__all__ = ["UARuleDeleteResponse"]
+__all__ = ["UARuleDeleteResponse", "Configuration"]
+
+
+class Configuration(BaseModel):
+    """The configuration object for the current rule."""
+
+    target: Optional[str] = None
+    """The configuration target for this rule.
+
+    You must set the target to `ua` for User Agent Blocking rules.
+    """
+
+    value: Optional[str] = None
+    """The exact user agent string to match.
+
+    This value will be compared to the received `User-Agent` HTTP header value.
+    """
 
 
 class UARuleDeleteResponse(BaseModel):
     id: Optional[str] = None
     """The unique identifier of the User Agent Blocking rule."""
+
+    configuration: Optional[Configuration] = None
+    """The configuration object for the current rule."""
+
+    description: Optional[str] = None
+    """An informative summary of the rule."""
+
+    mode: Optional[Literal["block", "challenge", "js_challenge", "managed_challenge"]] = None
+    """The action to apply to a matched request."""
+
+    paused: Optional[bool] = None
+    """When true, indicates that the rule is currently paused."""
diff --git a/src/cloudflare/types/firewall/ua_rule_get_response.py b/src/cloudflare/types/firewall/ua_rule_get_response.py
index 135eee2fdca..7a7d7ccb733 100644
--- a/src/cloudflare/types/firewall/ua_rule_get_response.py
+++ b/src/cloudflare/types/firewall/ua_rule_get_response.py
@@ -1,7 +1,41 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Optional
+from typing_extensions import Literal
 
-__all__ = ["UARuleGetResponse"]
+from ..._models import BaseModel
 
-UARuleGetResponse = Union[Optional[str], Optional[object]]
+__all__ = ["UARuleGetResponse", "Configuration"]
+
+
+class Configuration(BaseModel):
+    """The configuration object for the current rule."""
+
+    target: Optional[str] = None
+    """The configuration target for this rule.
+
+    You must set the target to `ua` for User Agent Blocking rules.
+    """
+
+    value: Optional[str] = None
+    """The exact user agent string to match.
+
+    This value will be compared to the received `User-Agent` HTTP header value.
+    """
+
+
+class UARuleGetResponse(BaseModel):
+    id: Optional[str] = None
+    """The unique identifier of the User Agent Blocking rule."""
+
+    configuration: Optional[Configuration] = None
+    """The configuration object for the current rule."""
+
+    description: Optional[str] = None
+    """An informative summary of the rule."""
+
+    mode: Optional[Literal["block", "challenge", "js_challenge", "managed_challenge"]] = None
+    """The action to apply to a matched request."""
+
+    paused: Optional[bool] = None
+    """When true, indicates that the rule is currently paused."""
diff --git a/src/cloudflare/types/firewall/ua_rule_list_params.py b/src/cloudflare/types/firewall/ua_rule_list_params.py
index c26cde362b4..c40c8bd6cde 100644
--- a/src/cloudflare/types/firewall/ua_rule_list_params.py
+++ b/src/cloudflare/types/firewall/ua_rule_list_params.py
@@ -2,21 +2,24 @@
 
 from __future__ import annotations
 
-from typing_extensions import TypedDict
+from typing_extensions import Required, TypedDict
 
 __all__ = ["UARuleListParams"]
 
 
 class UARuleListParams(TypedDict, total=False):
-    description: str
-    """A string to search for in the description of existing rules."""
+    zone_id: Required[str]
+    """Defines an identifier."""
 
-    description_search: str
+    description: str
     """A string to search for in the description of existing rules."""
 
     page: float
     """Page number of paginated results."""
 
+    paused: bool
+    """When true, indicates that the rule is currently paused."""
+
     per_page: float
     """The maximum number of results per page.
 
@@ -24,5 +27,5 @@ class UARuleListParams(TypedDict, total=False):
     or `20`.
     """
 
-    ua_search: str
+    user_agent: str
     """A string to search for in the user agent values of existing rules."""
diff --git a/src/cloudflare/types/firewall/ua_rule_list_response.py b/src/cloudflare/types/firewall/ua_rule_list_response.py
index d3426a93fc3..f5771a02b1d 100644
--- a/src/cloudflare/types/firewall/ua_rule_list_response.py
+++ b/src/cloudflare/types/firewall/ua_rule_list_response.py
@@ -9,6 +9,8 @@
 
 
 class Configuration(BaseModel):
+    """The configuration object for the current rule."""
+
     target: Optional[str] = None
     """The configuration target for this rule.
 
diff --git a/src/cloudflare/types/firewall/ua_rule_update_params.py b/src/cloudflare/types/firewall/ua_rule_update_params.py
index 7bb0afb3f5a..eb27661492d 100644
--- a/src/cloudflare/types/firewall/ua_rule_update_params.py
+++ b/src/cloudflare/types/firewall/ua_rule_update_params.py
@@ -2,13 +2,42 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
-__all__ = ["UARuleUpdateParams"]
+from .asn_configuration_param import ASNConfigurationParam
+from .ipv6_configuration_param import IPV6ConfigurationParam
+from .country_configuration_param import CountryConfigurationParam
+from .access_rule_ip_configuration_param import AccessRuleIPConfigurationParam
+from .access_rule_cidr_configuration_param import AccessRuleCIDRConfigurationParam
+
+__all__ = ["UARuleUpdateParams", "Configuration"]
 
 
 class UARuleUpdateParams(TypedDict, total=False):
-    zone_identifier: Required[str]
-    """Identifier"""
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    configuration: Required[Configuration]
+    """The rule configuration."""
+
+    mode: Required[Literal["block", "challenge", "whitelist", "js_challenge", "managed_challenge"]]
+    """The action to apply to a matched request."""
+
+    description: str
+    """An informative summary of the rule.
+
+    This value is sanitized and any tags will be removed.
+    """
+
+    paused: bool
+    """When true, indicates that the rule is currently paused."""
+
 
-    body: Required[object]
+Configuration: TypeAlias = Union[
+    AccessRuleIPConfigurationParam,
+    IPV6ConfigurationParam,
+    AccessRuleCIDRConfigurationParam,
+    ASNConfigurationParam,
+    CountryConfigurationParam,
+]
diff --git a/src/cloudflare/types/firewall/ua_rule_update_response.py b/src/cloudflare/types/firewall/ua_rule_update_response.py
index 4d88bc66b96..dec487d9406 100644
--- a/src/cloudflare/types/firewall/ua_rule_update_response.py
+++ b/src/cloudflare/types/firewall/ua_rule_update_response.py
@@ -1,7 +1,41 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Optional
+from typing_extensions import Literal
 
-__all__ = ["UARuleUpdateResponse"]
+from ..._models import BaseModel
 
-UARuleUpdateResponse = Union[Optional[str], Optional[object]]
+__all__ = ["UARuleUpdateResponse", "Configuration"]
+
+
+class Configuration(BaseModel):
+    """The configuration object for the current rule."""
+
+    target: Optional[str] = None
+    """The configuration target for this rule.
+
+    You must set the target to `ua` for User Agent Blocking rules.
+    """
+
+    value: Optional[str] = None
+    """The exact user agent string to match.
+
+    This value will be compared to the received `User-Agent` HTTP header value.
+    """
+
+
+class UARuleUpdateResponse(BaseModel):
+    id: Optional[str] = None
+    """The unique identifier of the User Agent Blocking rule."""
+
+    configuration: Optional[Configuration] = None
+    """The configuration object for the current rule."""
+
+    description: Optional[str] = None
+    """An informative summary of the rule."""
+
+    mode: Optional[Literal["block", "challenge", "js_challenge", "managed_challenge"]] = None
+    """The action to apply to a matched request."""
+
+    paused: Optional[bool] = None
+    """When true, indicates that the rule is currently paused."""
diff --git a/src/cloudflare/types/firewall/waf/__init__.py b/src/cloudflare/types/firewall/waf/__init__.py
index 1ab23bf139b..45373da4f22 100644
--- a/src/cloudflare/types/firewall/waf/__init__.py
+++ b/src/cloudflare/types/firewall/waf/__init__.py
@@ -6,10 +6,11 @@
 from .waf_rule import WAFRule as WAFRule
 from .override_url import OverrideURL as OverrideURL
 from .rewrite_action import RewriteAction as RewriteAction
+from .waf_rule_param import WAFRuleParam as WAFRuleParam
 from .package_list_params import PackageListParams as PackageListParams
 from .override_list_params import OverrideListParams as OverrideListParams
 from .package_get_response import PackageGetResponse as PackageGetResponse
-from .package_list_response import PackageListResponse as PackageListResponse
+from .rewrite_action_param import RewriteActionParam as RewriteActionParam
 from .override_create_params import OverrideCreateParams as OverrideCreateParams
 from .override_update_params import OverrideUpdateParams as OverrideUpdateParams
 from .override_delete_response import OverrideDeleteResponse as OverrideDeleteResponse
diff --git a/src/cloudflare/types/firewall/waf/override.py b/src/cloudflare/types/firewall/waf/override.py
index a758b89d18b..2a1312ee4ec 100644
--- a/src/cloudflare/types/firewall/waf/override.py
+++ b/src/cloudflare/types/firewall/waf/override.py
@@ -27,7 +27,7 @@ class Override(BaseModel):
     """
 
     paused: Optional[bool] = None
-    """When true, indicates that the WAF package is currently paused."""
+    """When true, indicates that the rule is currently paused."""
 
     priority: Optional[float] = None
     """
diff --git a/src/cloudflare/types/firewall/waf/override_create_params.py b/src/cloudflare/types/firewall/waf/override_create_params.py
index 2f4c82f9989..d280db03748 100644
--- a/src/cloudflare/types/firewall/waf/override_create_params.py
+++ b/src/cloudflare/types/firewall/waf/override_create_params.py
@@ -4,8 +4,19 @@
 
 from typing_extensions import Required, TypedDict
 
+from ...._types import SequenceNotStr
+from .override_url import OverrideURL
+
 __all__ = ["OverrideCreateParams"]
 
 
 class OverrideCreateParams(TypedDict, total=False):
-    body: Required[object]
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    urls: Required[SequenceNotStr[OverrideURL]]
+    """The URLs to include in the current WAF override.
+
+    You can use wildcards. Each entered URL will be escaped before use, which means
+    you can only use simple wildcard patterns.
+    """
diff --git a/src/cloudflare/types/firewall/waf/override_list_params.py b/src/cloudflare/types/firewall/waf/override_list_params.py
index bcee4430185..12d8111435e 100644
--- a/src/cloudflare/types/firewall/waf/override_list_params.py
+++ b/src/cloudflare/types/firewall/waf/override_list_params.py
@@ -2,12 +2,15 @@
 
 from __future__ import annotations
 
-from typing_extensions import TypedDict
+from typing_extensions import Required, TypedDict
 
 __all__ = ["OverrideListParams"]
 
 
 class OverrideListParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Defines an identifier."""
+
     page: float
     """The page number of paginated results."""
 
diff --git a/src/cloudflare/types/firewall/waf/override_update_params.py b/src/cloudflare/types/firewall/waf/override_update_params.py
index 34d1d0fbcd9..2c138cbd98a 100644
--- a/src/cloudflare/types/firewall/waf/override_update_params.py
+++ b/src/cloudflare/types/firewall/waf/override_update_params.py
@@ -4,11 +4,39 @@
 
 from typing_extensions import Required, TypedDict
 
+from ...._types import SequenceNotStr
+from .override_url import OverrideURL
+from .waf_rule_param import WAFRuleParam
+from .rewrite_action_param import RewriteActionParam
+
 __all__ = ["OverrideUpdateParams"]
 
 
 class OverrideUpdateParams(TypedDict, total=False):
-    zone_identifier: Required[str]
-    """Identifier"""
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    id: Required[str]
+    """Defines an identifier."""
+
+    rewrite_action: Required[RewriteActionParam]
+    """
+    Specifies that, when a WAF rule matches, its configured action will be replaced
+    by the action configured in this object.
+    """
+
+    rules: Required[WAFRuleParam]
+    """An object that allows you to override the action of specific WAF rules.
+
+    Each key of this object must be the ID of a WAF rule, and each value must be a
+    valid WAF action. Unless you are disabling a rule, ensure that you also enable
+    the rule group that this WAF rule belongs to. When creating a new URI-based WAF
+    override, you must provide a `groups` object or a `rules` object.
+    """
+
+    urls: Required[SequenceNotStr[OverrideURL]]
+    """The URLs to include in the current WAF override.
 
-    body: Required[object]
+    You can use wildcards. Each entered URL will be escaped before use, which means
+    you can only use simple wildcard patterns.
+    """
diff --git a/src/cloudflare/types/firewall/waf/override_url.py b/src/cloudflare/types/firewall/waf/override_url.py
index f18aa215408..b4d8606a3c2 100644
--- a/src/cloudflare/types/firewall/waf/override_url.py
+++ b/src/cloudflare/types/firewall/waf/override_url.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["OverrideURL"]
 
-OverrideURL = str
+OverrideURL: TypeAlias = str
diff --git a/src/cloudflare/types/firewall/waf/package_get_response.py b/src/cloudflare/types/firewall/waf/package_get_response.py
index 989c04aa3a5..0d0e19b7036 100644
--- a/src/cloudflare/types/firewall/waf/package_get_response.py
+++ b/src/cloudflare/types/firewall/waf/package_get_response.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Union, Optional
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from ...._models import BaseModel
 from ...shared.response_info import ResponseInfo
@@ -17,11 +17,11 @@ class FirewallAPIResponseSingle(BaseModel):
     result: Union[Optional[str], Optional[object]]
 
     success: Literal[True]
-    """Whether the API call was successful"""
+    """Defines whether the API call was successful."""
 
 
 class Result(BaseModel):
     result: Optional[object] = None
 
 
-PackageGetResponse = Union[FirewallAPIResponseSingle, Result]
+PackageGetResponse: TypeAlias = Union[FirewallAPIResponseSingle, Result]
diff --git a/src/cloudflare/types/firewall/waf/package_list_params.py b/src/cloudflare/types/firewall/waf/package_list_params.py
index 63d46fc6f7f..364d1f35f07 100644
--- a/src/cloudflare/types/firewall/waf/package_list_params.py
+++ b/src/cloudflare/types/firewall/waf/package_list_params.py
@@ -2,12 +2,15 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
 __all__ = ["PackageListParams"]
 
 
 class PackageListParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Defines an identifier."""
+
     direction: Literal["asc", "desc"]
     """The direction used to sort returned packages."""
 
diff --git a/src/cloudflare/types/firewall/waf/package_list_response.py b/src/cloudflare/types/firewall/waf/package_list_response.py
deleted file mode 100644
index f42e59fd524..00000000000
--- a/src/cloudflare/types/firewall/waf/package_list_response.py
+++ /dev/null
@@ -1,120 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union, Optional
-from typing_extensions import Literal
-
-from ...._models import BaseModel
-from ...shared.response_info import ResponseInfo
-
-__all__ = [
-    "PackageListResponse",
-    "FirewallAPIResponseCollection",
-    "FirewallAPIResponseCollectionResultInfo",
-    "Result",
-    "ResultResult",
-    "ResultResultFirewallPackageDefinition",
-    "ResultResultFirewallAnomalyPackage",
-]
-
-
-class FirewallAPIResponseCollectionResultInfo(BaseModel):
-    count: Optional[float] = None
-    """Total number of results for the requested service"""
-
-    page: Optional[float] = None
-    """Current page within paginated list of results"""
-
-    per_page: Optional[float] = None
-    """Number of results per page of results"""
-
-    total_count: Optional[float] = None
-    """Total results available without any search parameters"""
-
-
-class FirewallAPIResponseCollection(BaseModel):
-    errors: List[ResponseInfo]
-
-    messages: List[ResponseInfo]
-
-    result: Union[List[object], str, object, None] = None
-
-    success: Literal[True]
-    """Whether the API call was successful"""
-
-    result_info: Optional[FirewallAPIResponseCollectionResultInfo] = None
-
-
-class ResultResultFirewallPackageDefinition(BaseModel):
-    id: str
-    """Identifier"""
-
-    description: str
-    """A summary of the purpose/function of the WAF package."""
-
-    detection_mode: Literal["anomaly", "traditional"]
-    """
-    The mode that defines how rules within the package are evaluated during the
-    course of a request. When a package uses anomaly detection mode (`anomaly`
-    value), each rule is given a score when triggered. If the total score of all
-    triggered rules exceeds the sensitivity defined in the WAF package, the action
-    configured in the package will be performed. Traditional detection mode
-    (`traditional` value) will decide the action to take when it is triggered by the
-    request. If multiple rules are triggered, the action providing the highest
-    protection will be applied (for example, a 'block' action will win over a
-    'challenge' action).
-    """
-
-    name: str
-    """The name of the WAF package."""
-
-    zone_id: str
-    """Identifier"""
-
-    status: Optional[Literal["active"]] = None
-    """
-    When set to `active`, indicates that the WAF package will be applied to the
-    zone.
-    """
-
-
-class ResultResultFirewallAnomalyPackage(BaseModel):
-    id: str
-    """Identifier"""
-
-    description: str
-    """A summary of the purpose/function of the WAF package."""
-
-    detection_mode: Literal["anomaly", "traditional"]
-    """
-    When a WAF package uses anomaly detection, each rule is given a score when
-    triggered. If the total score of all triggered rules exceeds the sensitivity
-    defined on the WAF package, the action defined on the package will be taken.
-    """
-
-    name: str
-    """The name of the WAF package."""
-
-    zone_id: str
-    """Identifier"""
-
-    action_mode: Optional[Literal["simulate", "block", "challenge"]] = None
-    """The default action performed by the rules in the WAF package."""
-
-    sensitivity: Optional[Literal["high", "medium", "low", "off"]] = None
-    """The sensitivity of the WAF package."""
-
-    status: Optional[Literal["active"]] = None
-    """
-    When set to `active`, indicates that the WAF package will be applied to the
-    zone.
-    """
-
-
-ResultResult = Union[ResultResultFirewallPackageDefinition, ResultResultFirewallAnomalyPackage]
-
-
-class Result(BaseModel):
-    result: Optional[List[ResultResult]] = None
-
-
-PackageListResponse = Union[FirewallAPIResponseCollection, Result]
diff --git a/src/cloudflare/types/firewall/waf/packages/allowed_modes_anomaly.py b/src/cloudflare/types/firewall/waf/packages/allowed_modes_anomaly.py
index 51509474ee5..2aff3bf74ad 100644
--- a/src/cloudflare/types/firewall/waf/packages/allowed_modes_anomaly.py
+++ b/src/cloudflare/types/firewall/waf/packages/allowed_modes_anomaly.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["AllowedModesAnomaly"]
 
-AllowedModesAnomaly = Literal["on", "off"]
+AllowedModesAnomaly: TypeAlias = Literal["on", "off"]
diff --git a/src/cloudflare/types/firewall/waf/packages/group.py b/src/cloudflare/types/firewall/waf/packages/group.py
index 56484bdd5b8..67c8175b876 100644
--- a/src/cloudflare/types/firewall/waf/packages/group.py
+++ b/src/cloudflare/types/firewall/waf/packages/group.py
@@ -10,31 +10,31 @@
 
 class Group(BaseModel):
     id: str
-    """The unique identifier of the rule group."""
+    """Defines the unique identifier of the rule group."""
 
     description: Optional[str] = None
-    """An informative summary of what the rule group does."""
+    """Defines an informative summary of what the rule group does."""
 
     mode: Literal["on", "off"]
-    """The state of the rules contained in the rule group.
+    """Defines the state of the rules contained in the rule group.
 
     When `on`, the rules in the group are configurable/usable.
     """
 
     name: str
-    """The name of the rule group."""
+    """Defines the name of the rule group."""
 
     rules_count: float
-    """The number of rules in the current rule group."""
+    """Defines the number of rules in the current rule group."""
 
     allowed_modes: Optional[List[Literal["on", "off"]]] = None
-    """The available states for the rule group."""
+    """Defines the available states for the rule group."""
 
     modified_rules_count: Optional[float] = None
     """
-    The number of rules within the group that have been modified from their default
-    configuration.
+    Defines the number of rules within the group that have been modified from their
+    default configuration.
     """
 
     package_id: Optional[str] = None
-    """The unique identifier of a WAF package."""
+    """Defines the unique identifier of a WAF package."""
diff --git a/src/cloudflare/types/firewall/waf/packages/group_edit_params.py b/src/cloudflare/types/firewall/waf/packages/group_edit_params.py
index 3fa775bcb3a..2134f85a1e0 100644
--- a/src/cloudflare/types/firewall/waf/packages/group_edit_params.py
+++ b/src/cloudflare/types/firewall/waf/packages/group_edit_params.py
@@ -9,13 +9,13 @@
 
 class GroupEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Defines an identifier of a schema."""
 
     package_id: Required[str]
-    """The unique identifier of a WAF package."""
+    """Defines the unique identifier of a WAF package."""
 
     mode: Literal["on", "off"]
-    """The state of the rules contained in the rule group.
+    """Defines the state of the rules contained in the rule group.
 
     When `on`, the rules in the group are configurable/usable.
     """
diff --git a/src/cloudflare/types/firewall/waf/packages/group_edit_response.py b/src/cloudflare/types/firewall/waf/packages/group_edit_response.py
index 8e8ef5a3f20..1c60b3dc5cd 100644
--- a/src/cloudflare/types/firewall/waf/packages/group_edit_response.py
+++ b/src/cloudflare/types/firewall/waf/packages/group_edit_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Union, Optional
+from typing_extensions import TypeAlias
 
 __all__ = ["GroupEditResponse"]
 
-GroupEditResponse = Union[Optional[str], Optional[object]]
+GroupEditResponse: TypeAlias = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/firewall/waf/packages/group_get_response.py b/src/cloudflare/types/firewall/waf/packages/group_get_response.py
index 3d8278e8487..3a957c0f004 100644
--- a/src/cloudflare/types/firewall/waf/packages/group_get_response.py
+++ b/src/cloudflare/types/firewall/waf/packages/group_get_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Union, Optional
+from typing_extensions import TypeAlias
 
 __all__ = ["GroupGetResponse"]
 
-GroupGetResponse = Union[Optional[str], Optional[object]]
+GroupGetResponse: TypeAlias = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/firewall/waf/packages/group_list_params.py b/src/cloudflare/types/firewall/waf/packages/group_list_params.py
index 5a2e79068a4..d7e0dea3b06 100644
--- a/src/cloudflare/types/firewall/waf/packages/group_list_params.py
+++ b/src/cloudflare/types/firewall/waf/packages/group_list_params.py
@@ -9,34 +9,35 @@
 
 class GroupListParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Defines an identifier of a schema."""
 
     direction: Literal["asc", "desc"]
-    """The direction used to sort returned rule groups."""
+    """Defines the direction used to sort returned rule groups."""
 
     match: Literal["any", "all"]
-    """When set to `all`, all the search requirements must match.
+    """Defines the condition for search requirements.
 
-    When set to `any`, only one of the search requirements has to match.
+    When set to `all`, all the search requirements must match. When set to `any`,
+    only one of the search requirements has to match.
     """
 
     mode: Literal["on", "off"]
-    """The state of the rules contained in the rule group.
+    """Defines the state of the rules contained in the rule group.
 
     When `on`, the rules in the group are configurable/usable.
     """
 
     name: str
-    """The name of the rule group."""
+    """Defines the name of the rule group."""
 
     order: Literal["mode", "rules_count"]
-    """The field used to sort returned rule groups."""
+    """Defines the field used to sort returned rule groups."""
 
     page: float
-    """The page number of paginated results."""
+    """Defines the page number of paginated results."""
 
     per_page: float
-    """The number of rule groups per page."""
+    """Defines the number of rule groups per page."""
 
     rules_count: float
-    """The number of rules in the current rule group."""
+    """Defines the number of rules in the current rule group."""
diff --git a/src/cloudflare/types/firewall/waf/packages/rule_edit_params.py b/src/cloudflare/types/firewall/waf/packages/rule_edit_params.py
index 79481b14e87..b9a3c69b7a2 100644
--- a/src/cloudflare/types/firewall/waf/packages/rule_edit_params.py
+++ b/src/cloudflare/types/firewall/waf/packages/rule_edit_params.py
@@ -9,13 +9,13 @@
 
 class RuleEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Defines an identifier of a schema."""
 
     package_id: Required[str]
-    """The unique identifier of a WAF package."""
+    """Defines the unique identifier of a WAF package."""
 
     mode: Literal["default", "disable", "simulate", "block", "challenge", "on", "off"]
-    """The mode/action of the rule when triggered.
+    """Defines the mode/action of the rule when triggered.
 
     You must use a value from the `allowed_modes` array of the current rule.
     """
diff --git a/src/cloudflare/types/firewall/waf/packages/rule_edit_response.py b/src/cloudflare/types/firewall/waf/packages/rule_edit_response.py
index a11036ad2f9..3b64c3043be 100644
--- a/src/cloudflare/types/firewall/waf/packages/rule_edit_response.py
+++ b/src/cloudflare/types/firewall/waf/packages/rule_edit_response.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Union
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from ....._models import BaseModel
 from .waf_rule_group import WAFRuleGroup
@@ -16,8 +16,12 @@
 
 
 class WAFManagedRulesAnomalyRule(BaseModel):
+    """
+    When triggered, anomaly detection WAF rules contribute to an overall threat score that will determine if a request is considered malicious. You can configure the total scoring threshold through the 'sensitivity' property of the WAF package.
+    """
+
     id: str
-    """The unique identifier of the WAF rule."""
+    """Defines the unique identifier of the WAF rule."""
 
     allowed_modes: List[AllowedModesAnomaly]
     """Defines the available modes for the current WAF rule.
@@ -26,65 +30,80 @@ class WAFManagedRulesAnomalyRule(BaseModel):
     """
 
     description: str
-    """The public description of the WAF rule."""
+    """Defines the public description of the WAF rule."""
 
     group: WAFRuleGroup
-    """The rule group to which the current WAF rule belongs."""
+    """Defines the rule group to which the current WAF rule belongs."""
 
     mode: AllowedModesAnomaly
-    """When set to `on`, the current WAF rule will be used when evaluating the request.
+    """Defines the mode anomaly.
 
+    When set to `on`, the current WAF rule will be used when evaluating the request.
     Applies to anomaly detection WAF rules.
     """
 
     package_id: str
-    """The unique identifier of a WAF package."""
+    """Defines the unique identifier of a WAF package."""
 
     priority: str
-    """The order in which the individual WAF rule is executed within its rule group."""
+    """
+    Defines the order in which the individual WAF rule is executed within its rule
+    group.
+    """
 
 
 class WAFManagedRulesTraditionalDenyRule(BaseModel):
+    """
+    When triggered, traditional WAF rules cause the firewall to immediately act upon the request based on the configuration of the rule. A 'deny' rule will immediately respond to the request based on the configured rule action/mode (for example, 'block') and no other rules will be processed.
+    """
+
     id: str
-    """The unique identifier of the WAF rule."""
+    """Defines the unique identifier of the WAF rule."""
 
     allowed_modes: List[Literal["default", "disable", "simulate", "block", "challenge"]]
-    """The list of possible actions of the WAF rule when it is triggered."""
+    """Defines the list of possible actions of the WAF rule when it is triggered."""
 
     default_mode: Literal["disable", "simulate", "block", "challenge"]
-    """The default action/mode of a rule."""
+    """Defines the default action/mode of a rule."""
 
     description: str
-    """The public description of the WAF rule."""
+    """Defines the public description of the WAF rule."""
 
     group: WAFRuleGroup
-    """The rule group to which the current WAF rule belongs."""
+    """Defines the rule group to which the current WAF rule belongs."""
 
     mode: Literal["default", "disable", "simulate", "block", "challenge"]
-    """The action that the current WAF rule will perform when triggered.
+    """Defines the action that the current WAF rule will perform when triggered.
 
     Applies to traditional (deny) WAF rules.
     """
 
     package_id: str
-    """The unique identifier of a WAF package."""
+    """Defines the unique identifier of a WAF package."""
 
     priority: str
-    """The order in which the individual WAF rule is executed within its rule group."""
+    """
+    Defines the order in which the individual WAF rule is executed within its rule
+    group.
+    """
 
 
 class WAFManagedRulesTraditionalAllowRule(BaseModel):
+    """
+    When triggered, traditional WAF rules cause the firewall to immediately act on the request based on the rule configuration. An 'allow' rule will immediately allow the request and no other rules will be processed.
+    """
+
     id: str
-    """The unique identifier of the WAF rule."""
+    """Defines the unique identifier of the WAF rule."""
 
     allowed_modes: List[Literal["on", "off"]]
     """Defines the available modes for the current WAF rule."""
 
     description: str
-    """The public description of the WAF rule."""
+    """Defines the public description of the WAF rule."""
 
     group: WAFRuleGroup
-    """The rule group to which the current WAF rule belongs."""
+    """Defines the rule group to which the current WAF rule belongs."""
 
     mode: Literal["on", "off"]
     """When set to `on`, the current rule will be used when evaluating the request.
@@ -93,12 +112,15 @@ class WAFManagedRulesTraditionalAllowRule(BaseModel):
     """
 
     package_id: str
-    """The unique identifier of a WAF package."""
+    """Defines the unique identifier of a WAF package."""
 
     priority: str
-    """The order in which the individual WAF rule is executed within its rule group."""
+    """
+    Defines the order in which the individual WAF rule is executed within its rule
+    group.
+    """
 
 
-RuleEditResponse = Union[
+RuleEditResponse: TypeAlias = Union[
     WAFManagedRulesAnomalyRule, WAFManagedRulesTraditionalDenyRule, WAFManagedRulesTraditionalAllowRule
 ]
diff --git a/src/cloudflare/types/firewall/waf/packages/rule_get_response.py b/src/cloudflare/types/firewall/waf/packages/rule_get_response.py
index b17274e52fe..13fee82f1b2 100644
--- a/src/cloudflare/types/firewall/waf/packages/rule_get_response.py
+++ b/src/cloudflare/types/firewall/waf/packages/rule_get_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Union, Optional
+from typing_extensions import TypeAlias
 
 __all__ = ["RuleGetResponse"]
 
-RuleGetResponse = Union[Optional[str], Optional[object]]
+RuleGetResponse: TypeAlias = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/firewall/waf/packages/rule_list_params.py b/src/cloudflare/types/firewall/waf/packages/rule_list_params.py
index 9de33e821a6..0288be1e0fa 100644
--- a/src/cloudflare/types/firewall/waf/packages/rule_list_params.py
+++ b/src/cloudflare/types/firewall/waf/packages/rule_list_params.py
@@ -9,34 +9,38 @@
 
 class RuleListParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Defines an identifier of a schema."""
 
     description: str
-    """The public description of the WAF rule."""
+    """Defines the public description of the WAF rule."""
 
     direction: Literal["asc", "desc"]
-    """The direction used to sort returned rules."""
+    """Defines the direction used to sort returned rules."""
 
     group_id: str
-    """The unique identifier of the rule group."""
+    """Defines the unique identifier of the rule group."""
 
     match: Literal["any", "all"]
-    """When set to `all`, all the search requirements must match.
+    """Defines the search requirements.
 
-    When set to `any`, only one of the search requirements has to match.
+    When set to `all`, all the search requirements must match. When set to `any`,
+    only one of the search requirements has to match.
     """
 
     mode: Literal["DIS", "CHL", "BLK", "SIM"]
-    """The action/mode a rule has been overridden to perform."""
+    """Defines the action/mode a rule has been overridden to perform."""
 
     order: Literal["priority", "group_id", "description"]
-    """The field used to sort returned rules."""
+    """Defines the field used to sort returned rules."""
 
     page: float
-    """The page number of paginated results."""
+    """Defines the page number of paginated results."""
 
     per_page: float
-    """The number of rules per page."""
+    """Defines the number of rules per page."""
 
     priority: str
-    """The order in which the individual WAF rule is executed within its rule group."""
+    """
+    Defines the order in which the individual WAF rule is executed within its rule
+    group.
+    """
diff --git a/src/cloudflare/types/firewall/waf/packages/rule_list_response.py b/src/cloudflare/types/firewall/waf/packages/rule_list_response.py
index 5043962f2ed..b9e1c135eaf 100644
--- a/src/cloudflare/types/firewall/waf/packages/rule_list_response.py
+++ b/src/cloudflare/types/firewall/waf/packages/rule_list_response.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Union
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from ....._models import BaseModel
 from .waf_rule_group import WAFRuleGroup
@@ -16,8 +16,12 @@
 
 
 class WAFManagedRulesAnomalyRule(BaseModel):
+    """
+    When triggered, anomaly detection WAF rules contribute to an overall threat score that will determine if a request is considered malicious. You can configure the total scoring threshold through the 'sensitivity' property of the WAF package.
+    """
+
     id: str
-    """The unique identifier of the WAF rule."""
+    """Defines the unique identifier of the WAF rule."""
 
     allowed_modes: List[AllowedModesAnomaly]
     """Defines the available modes for the current WAF rule.
@@ -26,65 +30,80 @@ class WAFManagedRulesAnomalyRule(BaseModel):
     """
 
     description: str
-    """The public description of the WAF rule."""
+    """Defines the public description of the WAF rule."""
 
     group: WAFRuleGroup
-    """The rule group to which the current WAF rule belongs."""
+    """Defines the rule group to which the current WAF rule belongs."""
 
     mode: AllowedModesAnomaly
-    """When set to `on`, the current WAF rule will be used when evaluating the request.
+    """Defines the mode anomaly.
 
+    When set to `on`, the current WAF rule will be used when evaluating the request.
     Applies to anomaly detection WAF rules.
     """
 
     package_id: str
-    """The unique identifier of a WAF package."""
+    """Defines the unique identifier of a WAF package."""
 
     priority: str
-    """The order in which the individual WAF rule is executed within its rule group."""
+    """
+    Defines the order in which the individual WAF rule is executed within its rule
+    group.
+    """
 
 
 class WAFManagedRulesTraditionalDenyRule(BaseModel):
+    """
+    When triggered, traditional WAF rules cause the firewall to immediately act upon the request based on the configuration of the rule. A 'deny' rule will immediately respond to the request based on the configured rule action/mode (for example, 'block') and no other rules will be processed.
+    """
+
     id: str
-    """The unique identifier of the WAF rule."""
+    """Defines the unique identifier of the WAF rule."""
 
     allowed_modes: List[Literal["default", "disable", "simulate", "block", "challenge"]]
-    """The list of possible actions of the WAF rule when it is triggered."""
+    """Defines the list of possible actions of the WAF rule when it is triggered."""
 
     default_mode: Literal["disable", "simulate", "block", "challenge"]
-    """The default action/mode of a rule."""
+    """Defines the default action/mode of a rule."""
 
     description: str
-    """The public description of the WAF rule."""
+    """Defines the public description of the WAF rule."""
 
     group: WAFRuleGroup
-    """The rule group to which the current WAF rule belongs."""
+    """Defines the rule group to which the current WAF rule belongs."""
 
     mode: Literal["default", "disable", "simulate", "block", "challenge"]
-    """The action that the current WAF rule will perform when triggered.
+    """Defines the action that the current WAF rule will perform when triggered.
 
     Applies to traditional (deny) WAF rules.
     """
 
     package_id: str
-    """The unique identifier of a WAF package."""
+    """Defines the unique identifier of a WAF package."""
 
     priority: str
-    """The order in which the individual WAF rule is executed within its rule group."""
+    """
+    Defines the order in which the individual WAF rule is executed within its rule
+    group.
+    """
 
 
 class WAFManagedRulesTraditionalAllowRule(BaseModel):
+    """
+    When triggered, traditional WAF rules cause the firewall to immediately act on the request based on the rule configuration. An 'allow' rule will immediately allow the request and no other rules will be processed.
+    """
+
     id: str
-    """The unique identifier of the WAF rule."""
+    """Defines the unique identifier of the WAF rule."""
 
     allowed_modes: List[Literal["on", "off"]]
     """Defines the available modes for the current WAF rule."""
 
     description: str
-    """The public description of the WAF rule."""
+    """Defines the public description of the WAF rule."""
 
     group: WAFRuleGroup
-    """The rule group to which the current WAF rule belongs."""
+    """Defines the rule group to which the current WAF rule belongs."""
 
     mode: Literal["on", "off"]
     """When set to `on`, the current rule will be used when evaluating the request.
@@ -93,12 +112,15 @@ class WAFManagedRulesTraditionalAllowRule(BaseModel):
     """
 
     package_id: str
-    """The unique identifier of a WAF package."""
+    """Defines the unique identifier of a WAF package."""
 
     priority: str
-    """The order in which the individual WAF rule is executed within its rule group."""
+    """
+    Defines the order in which the individual WAF rule is executed within its rule
+    group.
+    """
 
 
-RuleListResponse = Union[
+RuleListResponse: TypeAlias = Union[
     WAFManagedRulesAnomalyRule, WAFManagedRulesTraditionalDenyRule, WAFManagedRulesTraditionalAllowRule
 ]
diff --git a/src/cloudflare/types/firewall/waf/packages/waf_rule_group.py b/src/cloudflare/types/firewall/waf/packages/waf_rule_group.py
index 2ce0dcabcad..de42431dddb 100644
--- a/src/cloudflare/types/firewall/waf/packages/waf_rule_group.py
+++ b/src/cloudflare/types/firewall/waf/packages/waf_rule_group.py
@@ -8,8 +8,10 @@
 
 
 class WAFRuleGroup(BaseModel):
+    """Defines the rule group to which the current WAF rule belongs."""
+
     id: Optional[str] = None
-    """The unique identifier of the rule group."""
+    """Defines the unique identifier of the rule group."""
 
     name: Optional[str] = None
-    """The name of the rule group."""
+    """Defines the name of the rule group."""
diff --git a/src/cloudflare/types/firewall/waf/rewrite_action.py b/src/cloudflare/types/firewall/waf/rewrite_action.py
index 489bc26641a..9a739b07d4c 100644
--- a/src/cloudflare/types/firewall/waf/rewrite_action.py
+++ b/src/cloudflare/types/firewall/waf/rewrite_action.py
@@ -9,14 +9,21 @@
 
 
 class RewriteAction(BaseModel):
+    """
+    Specifies that, when a WAF rule matches, its configured action will be replaced by the action configured in this object.
+    """
+
     block: Optional[Literal["challenge", "block", "simulate", "disable", "default"]] = None
     """The WAF rule action to apply."""
 
-    challenge: Optional[str] = None
+    challenge: Optional[Literal["challenge", "block", "simulate", "disable", "default"]] = None
+    """The WAF rule action to apply."""
 
-    default: Optional[str] = None
+    default: Optional[Literal["challenge", "block", "simulate", "disable", "default"]] = None
+    """The WAF rule action to apply."""
 
     disable: Optional[Literal["challenge", "block", "simulate", "disable", "default"]] = None
     """The WAF rule action to apply."""
 
-    simulate: Optional[str] = None
+    simulate: Optional[Literal["challenge", "block", "simulate", "disable", "default"]] = None
+    """The WAF rule action to apply."""
diff --git a/src/cloudflare/types/firewall/waf/rewrite_action_param.py b/src/cloudflare/types/firewall/waf/rewrite_action_param.py
new file mode 100644
index 00000000000..3de50bee1c4
--- /dev/null
+++ b/src/cloudflare/types/firewall/waf/rewrite_action_param.py
@@ -0,0 +1,28 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["RewriteActionParam"]
+
+
+class RewriteActionParam(TypedDict, total=False):
+    """
+    Specifies that, when a WAF rule matches, its configured action will be replaced by the action configured in this object.
+    """
+
+    block: Literal["challenge", "block", "simulate", "disable", "default"]
+    """The WAF rule action to apply."""
+
+    challenge: Literal["challenge", "block", "simulate", "disable", "default"]
+    """The WAF rule action to apply."""
+
+    default: Literal["challenge", "block", "simulate", "disable", "default"]
+    """The WAF rule action to apply."""
+
+    disable: Literal["challenge", "block", "simulate", "disable", "default"]
+    """The WAF rule action to apply."""
+
+    simulate: Literal["challenge", "block", "simulate", "disable", "default"]
+    """The WAF rule action to apply."""
diff --git a/src/cloudflare/types/firewall/waf/waf_rule.py b/src/cloudflare/types/firewall/waf/waf_rule.py
index d6fea426df4..3e6abc12da2 100644
--- a/src/cloudflare/types/firewall/waf/waf_rule.py
+++ b/src/cloudflare/types/firewall/waf/waf_rule.py
@@ -1,8 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Dict
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["WAFRule"]
 
-WAFRule = Dict[str, Literal["challenge", "block", "simulate", "disable", "default"]]
+WAFRule: TypeAlias = Dict[str, Literal["challenge", "block", "simulate", "disable", "default"]]
diff --git a/src/cloudflare/types/firewall/waf/waf_rule_param.py b/src/cloudflare/types/firewall/waf/waf_rule_param.py
new file mode 100644
index 00000000000..80123839548
--- /dev/null
+++ b/src/cloudflare/types/firewall/waf/waf_rule_param.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict
+from typing_extensions import Literal, TypeAlias
+
+__all__ = ["WAFRuleParam"]
+
+WAFRuleParam: TypeAlias = Dict[str, Literal["challenge", "block", "simulate", "disable", "default"]]
diff --git a/src/cloudflare/types/fraud/__init__.py b/src/cloudflare/types/fraud/__init__.py
new file mode 100644
index 00000000000..403175df102
--- /dev/null
+++ b/src/cloudflare/types/fraud/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .fraud_settings import FraudSettings as FraudSettings
+from .fraud_update_params import FraudUpdateParams as FraudUpdateParams
diff --git a/src/cloudflare/types/fraud/fraud_settings.py b/src/cloudflare/types/fraud/fraud_settings.py
new file mode 100644
index 00000000000..cfd9506fe5c
--- /dev/null
+++ b/src/cloudflare/types/fraud/fraud_settings.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["FraudSettings"]
+
+
+class FraudSettings(BaseModel):
+    user_profiles: Optional[Literal["enabled", "disabled"]] = None
+    """Whether Fraud User Profiles is enabled for the zone."""
+
+    username_expressions: Optional[List[str]] = None
+    """List of expressions to detect usernames in write HTTP requests.
+
+    - Maximum of 10 expressions.
+    - Omit or set to null to leave unchanged on update.
+    - Provide an empty array `[]` to clear all expressions on update.
+    - Invalid expressions will result in a 10400 Bad Request with details in the
+      `messages` array.
+    """
diff --git a/src/cloudflare/types/fraud/fraud_update_params.py b/src/cloudflare/types/fraud/fraud_update_params.py
new file mode 100644
index 00000000000..78d59357e8c
--- /dev/null
+++ b/src/cloudflare/types/fraud/fraud_update_params.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["FraudUpdateParams"]
+
+
+class FraudUpdateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    user_profiles: Literal["enabled", "disabled"]
+    """Whether Fraud User Profiles is enabled for the zone."""
+
+    username_expressions: SequenceNotStr[str]
+    """List of expressions to detect usernames in write HTTP requests.
+
+    - Maximum of 10 expressions.
+    - Omit or set to null to leave unchanged on update.
+    - Provide an empty array `[]` to clear all expressions on update.
+    - Invalid expressions will result in a 10400 Bad Request with details in the
+      `messages` array.
+    """
diff --git a/src/cloudflare/types/healthchecks/check_region.py b/src/cloudflare/types/healthchecks/check_region.py
index 46b58dd4b75..8a28fc2b62e 100644
--- a/src/cloudflare/types/healthchecks/check_region.py
+++ b/src/cloudflare/types/healthchecks/check_region.py
@@ -1,9 +1,9 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["CheckRegion"]
 
-CheckRegion = Literal[
+CheckRegion: TypeAlias = Literal[
     "WNAM", "ENAM", "WEU", "EEU", "NSAM", "SSAM", "OC", "ME", "NAF", "SAF", "IN", "SEAS", "NEAS", "ALL_REGIONS"
 ]
diff --git a/src/cloudflare/types/healthchecks/healthcheck_list_params.py b/src/cloudflare/types/healthchecks/healthcheck_list_params.py
index a2d33808065..919be7432fb 100644
--- a/src/cloudflare/types/healthchecks/healthcheck_list_params.py
+++ b/src/cloudflare/types/healthchecks/healthcheck_list_params.py
@@ -11,8 +11,8 @@ class HealthcheckListParams(TypedDict, total=False):
     zone_id: Required[str]
     """Identifier"""
 
-    page: object
+    page: float
     """Page number of paginated results."""
 
-    per_page: object
+    per_page: float
     """Maximum number of results per page. Must be a multiple of 5."""
diff --git a/src/cloudflare/types/healthchecks/http_configuration.py b/src/cloudflare/types/healthchecks/http_configuration.py
index b000623d5f9..5fb868ba4ab 100644
--- a/src/cloudflare/types/healthchecks/http_configuration.py
+++ b/src/cloudflare/types/healthchecks/http_configuration.py
@@ -9,6 +9,8 @@
 
 
 class HTTPConfiguration(BaseModel):
+    """Parameters specific to an HTTP or HTTPS health check."""
+
     allow_insecure: Optional[bool] = None
     """Do not validate the certificate when the health check uses HTTPS."""
 
diff --git a/src/cloudflare/types/healthchecks/http_configuration_param.py b/src/cloudflare/types/healthchecks/http_configuration_param.py
index f8f0bc4ac32..bd969800fc9 100644
--- a/src/cloudflare/types/healthchecks/http_configuration_param.py
+++ b/src/cloudflare/types/healthchecks/http_configuration_param.py
@@ -2,13 +2,17 @@
 
 from __future__ import annotations
 
-from typing import Dict, List, Optional
+from typing import Dict, Optional
 from typing_extensions import Literal, TypedDict
 
+from ..._types import SequenceNotStr
+
 __all__ = ["HTTPConfigurationParam"]
 
 
 class HTTPConfigurationParam(TypedDict, total=False):
+    """Parameters specific to an HTTP or HTTPS health check."""
+
     allow_insecure: bool
     """Do not validate the certificate when the health check uses HTTPS."""
 
@@ -18,7 +22,7 @@ class HTTPConfigurationParam(TypedDict, total=False):
     If this string is not found, the origin will be marked as unhealthy.
     """
 
-    expected_codes: Optional[List[str]]
+    expected_codes: Optional[SequenceNotStr[str]]
     """The expected HTTP response codes (e.g.
 
     "200") or code ranges (e.g. "2xx" for all codes starting with 2) of the health
@@ -28,7 +32,7 @@ class HTTPConfigurationParam(TypedDict, total=False):
     follow_redirects: bool
     """Follow redirects if the origin returns a 3xx status code."""
 
-    header: Optional[Dict[str, List[str]]]
+    header: Optional[Dict[str, SequenceNotStr[str]]]
     """The HTTP request headers to send in the health check.
 
     It is recommended you set a Host header by default. The User-Agent header cannot
diff --git a/src/cloudflare/types/healthchecks/tcp_configuration.py b/src/cloudflare/types/healthchecks/tcp_configuration.py
index f654cccf8f9..f2ad0353923 100644
--- a/src/cloudflare/types/healthchecks/tcp_configuration.py
+++ b/src/cloudflare/types/healthchecks/tcp_configuration.py
@@ -9,6 +9,8 @@
 
 
 class TCPConfiguration(BaseModel):
+    """Parameters specific to TCP health check."""
+
     method: Optional[Literal["connection_established"]] = None
     """The TCP connection method to use for the health check."""
 
diff --git a/src/cloudflare/types/healthchecks/tcp_configuration_param.py b/src/cloudflare/types/healthchecks/tcp_configuration_param.py
index edbb9a4cf5d..5c7cf1ebe6f 100644
--- a/src/cloudflare/types/healthchecks/tcp_configuration_param.py
+++ b/src/cloudflare/types/healthchecks/tcp_configuration_param.py
@@ -8,6 +8,8 @@
 
 
 class TCPConfigurationParam(TypedDict, total=False):
+    """Parameters specific to TCP health check."""
+
     method: Literal["connection_established"]
     """The TCP connection method to use for the health check."""
 
diff --git a/src/cloudflare/types/hostnames/settings/setting_value.py b/src/cloudflare/types/hostnames/settings/setting_value.py
index 89a5a79dc56..51b9395ef3d 100644
--- a/src/cloudflare/types/hostnames/settings/setting_value.py
+++ b/src/cloudflare/types/hostnames/settings/setting_value.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Union
+from typing_extensions import TypeAlias
 
 __all__ = ["SettingValue"]
 
-SettingValue = Union[float, str, List[str]]
+SettingValue: TypeAlias = Union[float, str, List[str]]
diff --git a/src/cloudflare/types/hostnames/settings/setting_value_param.py b/src/cloudflare/types/hostnames/settings/setting_value_param.py
index cebf4d70d9b..38c0e9bb153 100644
--- a/src/cloudflare/types/hostnames/settings/setting_value_param.py
+++ b/src/cloudflare/types/hostnames/settings/setting_value_param.py
@@ -2,8 +2,11 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
+from typing_extensions import TypeAlias
+
+from ...._types import SequenceNotStr
 
 __all__ = ["SettingValueParam"]
 
-SettingValueParam = Union[float, str, List[str]]
+SettingValueParam: TypeAlias = Union[float, str, SequenceNotStr[str]]
diff --git a/src/cloudflare/types/hostnames/settings/tls_delete_response.py b/src/cloudflare/types/hostnames/settings/tls_delete_response.py
index b59537ed954..4d3fdff0d22 100644
--- a/src/cloudflare/types/hostnames/settings/tls_delete_response.py
+++ b/src/cloudflare/types/hostnames/settings/tls_delete_response.py
@@ -4,6 +4,7 @@
 from datetime import datetime
 
 from ...._models import BaseModel
+from .setting_value import SettingValue
 
 __all__ = ["TLSDeleteResponse"]
 
@@ -16,8 +17,10 @@ class TLSDeleteResponse(BaseModel):
     """The hostname for which the tls settings are set."""
 
     status: Optional[str] = None
+    """Deployment status for the given tls setting."""
 
     updated_at: Optional[datetime] = None
     """This is the time the tls setting was updated."""
 
-    value: Optional[str] = None
+    value: Optional[SettingValue] = None
+    """The tls setting value."""
diff --git a/src/cloudflare/types/hostnames/settings/tls_get_response.py b/src/cloudflare/types/hostnames/settings/tls_get_response.py
index 3a8e780e9d0..5afefb3f047 100644
--- a/src/cloudflare/types/hostnames/settings/tls_get_response.py
+++ b/src/cloudflare/types/hostnames/settings/tls_get_response.py
@@ -1,15 +1,15 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Optional
 from datetime import datetime
 
 from ...._models import BaseModel
 from .setting_value import SettingValue
 
-__all__ = ["TLSGetResponse", "TLSGetResponseItem"]
+__all__ = ["TLSGetResponse"]
 
 
-class TLSGetResponseItem(BaseModel):
+class TLSGetResponse(BaseModel):
     created_at: Optional[datetime] = None
     """This is the time the tls setting was originally created for this hostname."""
 
@@ -24,6 +24,3 @@ class TLSGetResponseItem(BaseModel):
 
     value: Optional[SettingValue] = None
     """The tls setting value."""
-
-
-TLSGetResponse = List[TLSGetResponseItem]
diff --git a/src/cloudflare/types/hostnames/settings/tls_update_params.py b/src/cloudflare/types/hostnames/settings/tls_update_params.py
index d24e3bea217..1b398d22e23 100644
--- a/src/cloudflare/types/hostnames/settings/tls_update_params.py
+++ b/src/cloudflare/types/hostnames/settings/tls_update_params.py
@@ -11,7 +11,7 @@
 
 class TLSUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     setting_id: Required[Literal["ciphers", "min_tls_version", "http2"]]
     """The TLS Setting name."""
diff --git a/src/cloudflare/types/hyperdrive/__init__.py b/src/cloudflare/types/hyperdrive/__init__.py
index db97c2c8547..dea31023f50 100644
--- a/src/cloudflare/types/hyperdrive/__init__.py
+++ b/src/cloudflare/types/hyperdrive/__init__.py
@@ -3,9 +3,6 @@
 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 f75ec02aafd..9b9910fd10a 100644
--- a/src/cloudflare/types/hyperdrive/config_create_params.py
+++ b/src/cloudflare/types/hyperdrive/config_create_params.py
@@ -2,37 +2,136 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
-from .configuration_param import ConfigurationParam
-
-__all__ = ["ConfigCreateParams", "Caching"]
+__all__ = [
+    "ConfigCreateParams",
+    "Origin",
+    "OriginPublicDatabase",
+    "OriginAccessProtectedDatabaseBehindCloudflareTunnel",
+    "Caching",
+    "CachingHyperdriveHyperdriveCachingCommon",
+    "CachingHyperdriveHyperdriveCachingEnabled",
+    "MTLS",
+]
 
 
 class ConfigCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Define configurations using a unique string identifier."""
 
     name: Required[str]
+    """The name of the Hyperdrive configuration.
+
+    Used to identify the configuration in the Cloudflare dashboard and API.
+    """
 
-    origin: Required[ConfigurationParam]
+    origin: Required[Origin]
 
     caching: Caching
 
+    mtls: MTLS
+
+    origin_connection_limit: int
+    """
+    The (soft) maximum number of connections the Hyperdrive is allowed to make to
+    the origin database.
+    """
+
+
+class OriginPublicDatabase(TypedDict, total=False):
+    database: Required[str]
+    """Set the name of your origin database."""
+
+    host: Required[str]
+    """Defines the host (hostname or IP) of your origin database."""
+
+    password: Required[str]
+    """Set the password needed to access your origin database.
+
+    The API never returns this write-only value.
+    """
 
-class Caching(TypedDict, total=False):
+    port: Required[int]
+    """Defines the port of your origin database.
+
+    Defaults to 5432 for PostgreSQL or 3306 for MySQL if not specified.
+    """
+
+    scheme: Required[Literal["postgres", "postgresql", "mysql"]]
+    """Specifies the URL scheme used to connect to your origin database."""
+
+    user: Required[str]
+    """Set the user of your origin database."""
+
+
+class OriginAccessProtectedDatabaseBehindCloudflareTunnel(TypedDict, total=False):
+    access_client_id: Required[str]
+    """
+    Defines the Client ID of the Access token to use when connecting to the origin
+    database.
+    """
+
+    access_client_secret: Required[str]
+    """
+    Defines the Client Secret of the Access Token to use when connecting to the
+    origin database. The API never returns this write-only value.
+    """
+
+    database: Required[str]
+    """Set the name of your origin database."""
+
+    host: Required[str]
+    """Defines the host (hostname or IP) of your origin database."""
+
+    password: Required[str]
+    """Set the password needed to access your origin database.
+
+    The API never returns this write-only value.
+    """
+
+    scheme: Required[Literal["postgres", "postgresql", "mysql"]]
+    """Specifies the URL scheme used to connect to your origin database."""
+
+    user: Required[str]
+    """Set the user of your origin database."""
+
+
+Origin: TypeAlias = Union[OriginPublicDatabase, OriginAccessProtectedDatabaseBehindCloudflareTunnel]
+
+
+class CachingHyperdriveHyperdriveCachingCommon(TypedDict, total=False):
     disabled: bool
-    """When set to true, disables the caching of SQL responses. (Default: false)"""
+    """Set to true to disable caching of SQL responses. Default is false."""
+
+
+class CachingHyperdriveHyperdriveCachingEnabled(TypedDict, total=False):
+    disabled: bool
+    """Set to true to disable caching of SQL responses. Default is false."""
 
     max_age: int
-    """When present, specifies max duration for which items should persist in the
-    cache.
+    """Specify the maximum duration (in seconds) items should persist in the cache.
 
-    (Default: 60)
+    Defaults to 60 seconds if not specified.
     """
 
     stale_while_revalidate: int
+    """Specify the number of seconds the cache may serve a stale response.
+
+    Defaults to 15 seconds if not specified.
     """
-    When present, indicates the number of seconds cache may serve the response after
-    it becomes stale. (Default: 15)
-    """
+
+
+Caching: TypeAlias = Union[CachingHyperdriveHyperdriveCachingCommon, CachingHyperdriveHyperdriveCachingEnabled]
+
+
+class MTLS(TypedDict, total=False):
+    ca_certificate_id: str
+    """Define CA certificate ID obtained after uploading CA cert."""
+
+    mtls_certificate_id: str
+    """Define mTLS certificate ID obtained after uploading client cert."""
+
+    sslmode: str
+    """Set SSL mode to 'require', 'verify-ca', or 'verify-full' to verify the CA."""
diff --git a/src/cloudflare/types/hyperdrive/config_delete_response.py b/src/cloudflare/types/hyperdrive/config_delete_response.py
deleted file mode 100644
index be480da8945..00000000000
--- a/src/cloudflare/types/hyperdrive/config_delete_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["ConfigDeleteResponse"]
-
-ConfigDeleteResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/hyperdrive/config_edit_params.py b/src/cloudflare/types/hyperdrive/config_edit_params.py
index 6e63828615c..4d7a4752cbd 100644
--- a/src/cloudflare/types/hyperdrive/config_edit_params.py
+++ b/src/cloudflare/types/hyperdrive/config_edit_params.py
@@ -2,37 +2,126 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
-from .configuration_param import ConfigurationParam
-
-__all__ = ["ConfigEditParams", "Caching"]
+__all__ = [
+    "ConfigEditParams",
+    "Caching",
+    "CachingHyperdriveHyperdriveCachingCommon",
+    "CachingHyperdriveHyperdriveCachingEnabled",
+    "MTLS",
+    "Origin",
+    "OriginHyperdriveHyperdriveDatabase",
+    "OriginHyperdriveInternetOrigin",
+    "OriginHyperdriveOverAccessOrigin",
+]
 
 
 class ConfigEditParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Define configurations using a unique string identifier."""
 
     caching: Caching
 
+    mtls: MTLS
+
     name: str
+    """The name of the Hyperdrive configuration.
+
+    Used to identify the configuration in the Cloudflare dashboard and API.
+    """
+
+    origin: Origin
 
-    origin: ConfigurationParam
+    origin_connection_limit: int
+    """
+    The (soft) maximum number of connections the Hyperdrive is allowed to make to
+    the origin database.
+    """
+
+
+class CachingHyperdriveHyperdriveCachingCommon(TypedDict, total=False):
+    disabled: bool
+    """Set to true to disable caching of SQL responses. Default is false."""
 
 
-class Caching(TypedDict, total=False):
+class CachingHyperdriveHyperdriveCachingEnabled(TypedDict, total=False):
     disabled: bool
-    """When set to true, disables the caching of SQL responses. (Default: false)"""
+    """Set to true to disable caching of SQL responses. Default is false."""
 
     max_age: int
-    """When present, specifies max duration for which items should persist in the
-    cache.
+    """Specify the maximum duration (in seconds) items should persist in the cache.
 
-    (Default: 60)
+    Defaults to 60 seconds if not specified.
     """
 
     stale_while_revalidate: int
+    """Specify the number of seconds the cache may serve a stale response.
+
+    Defaults to 15 seconds if not specified.
+    """
+
+
+Caching: TypeAlias = Union[CachingHyperdriveHyperdriveCachingCommon, CachingHyperdriveHyperdriveCachingEnabled]
+
+
+class MTLS(TypedDict, total=False):
+    ca_certificate_id: str
+    """Define CA certificate ID obtained after uploading CA cert."""
+
+    mtls_certificate_id: str
+    """Define mTLS certificate ID obtained after uploading client cert."""
+
+    sslmode: str
+    """Set SSL mode to 'require', 'verify-ca', or 'verify-full' to verify the CA."""
+
+
+class OriginHyperdriveHyperdriveDatabase(TypedDict, total=False):
+    database: str
+    """Set the name of your origin database."""
+
+    password: str
+    """Set the password needed to access your origin database.
+
+    The API never returns this write-only value.
     """
-    When present, indicates the number of seconds cache may serve the response after
-    it becomes stale. (Default: 15)
+
+    scheme: Literal["postgres", "postgresql", "mysql"]
+    """Specifies the URL scheme used to connect to your origin database."""
+
+    user: str
+    """Set the user of your origin database."""
+
+
+class OriginHyperdriveInternetOrigin(TypedDict, total=False):
+    host: Required[str]
+    """Defines the host (hostname or IP) of your origin database."""
+
+    port: Required[int]
+    """Defines the port of your origin database.
+
+    Defaults to 5432 for PostgreSQL or 3306 for MySQL if not specified.
     """
+
+
+class OriginHyperdriveOverAccessOrigin(TypedDict, total=False):
+    access_client_id: Required[str]
+    """
+    Defines the Client ID of the Access token to use when connecting to the origin
+    database.
+    """
+
+    access_client_secret: Required[str]
+    """
+    Defines the Client Secret of the Access Token to use when connecting to the
+    origin database. The API never returns this write-only value.
+    """
+
+    host: Required[str]
+    """Defines the host (hostname or IP) of your origin database."""
+
+
+Origin: TypeAlias = Union[
+    OriginHyperdriveHyperdriveDatabase, OriginHyperdriveInternetOrigin, OriginHyperdriveOverAccessOrigin
+]
diff --git a/src/cloudflare/types/hyperdrive/config_update_params.py b/src/cloudflare/types/hyperdrive/config_update_params.py
index 451436b383d..4b2814b4d04 100644
--- a/src/cloudflare/types/hyperdrive/config_update_params.py
+++ b/src/cloudflare/types/hyperdrive/config_update_params.py
@@ -2,37 +2,136 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
-from .configuration_param import ConfigurationParam
-
-__all__ = ["ConfigUpdateParams", "Caching"]
+__all__ = [
+    "ConfigUpdateParams",
+    "Origin",
+    "OriginPublicDatabase",
+    "OriginAccessProtectedDatabaseBehindCloudflareTunnel",
+    "Caching",
+    "CachingHyperdriveHyperdriveCachingCommon",
+    "CachingHyperdriveHyperdriveCachingEnabled",
+    "MTLS",
+]
 
 
 class ConfigUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Define configurations using a unique string identifier."""
 
     name: Required[str]
+    """The name of the Hyperdrive configuration.
+
+    Used to identify the configuration in the Cloudflare dashboard and API.
+    """
 
-    origin: Required[ConfigurationParam]
+    origin: Required[Origin]
 
     caching: Caching
 
+    mtls: MTLS
+
+    origin_connection_limit: int
+    """
+    The (soft) maximum number of connections the Hyperdrive is allowed to make to
+    the origin database.
+    """
+
+
+class OriginPublicDatabase(TypedDict, total=False):
+    database: Required[str]
+    """Set the name of your origin database."""
+
+    host: Required[str]
+    """Defines the host (hostname or IP) of your origin database."""
+
+    password: Required[str]
+    """Set the password needed to access your origin database.
+
+    The API never returns this write-only value.
+    """
 
-class Caching(TypedDict, total=False):
+    port: Required[int]
+    """Defines the port of your origin database.
+
+    Defaults to 5432 for PostgreSQL or 3306 for MySQL if not specified.
+    """
+
+    scheme: Required[Literal["postgres", "postgresql", "mysql"]]
+    """Specifies the URL scheme used to connect to your origin database."""
+
+    user: Required[str]
+    """Set the user of your origin database."""
+
+
+class OriginAccessProtectedDatabaseBehindCloudflareTunnel(TypedDict, total=False):
+    access_client_id: Required[str]
+    """
+    Defines the Client ID of the Access token to use when connecting to the origin
+    database.
+    """
+
+    access_client_secret: Required[str]
+    """
+    Defines the Client Secret of the Access Token to use when connecting to the
+    origin database. The API never returns this write-only value.
+    """
+
+    database: Required[str]
+    """Set the name of your origin database."""
+
+    host: Required[str]
+    """Defines the host (hostname or IP) of your origin database."""
+
+    password: Required[str]
+    """Set the password needed to access your origin database.
+
+    The API never returns this write-only value.
+    """
+
+    scheme: Required[Literal["postgres", "postgresql", "mysql"]]
+    """Specifies the URL scheme used to connect to your origin database."""
+
+    user: Required[str]
+    """Set the user of your origin database."""
+
+
+Origin: TypeAlias = Union[OriginPublicDatabase, OriginAccessProtectedDatabaseBehindCloudflareTunnel]
+
+
+class CachingHyperdriveHyperdriveCachingCommon(TypedDict, total=False):
     disabled: bool
-    """When set to true, disables the caching of SQL responses. (Default: false)"""
+    """Set to true to disable caching of SQL responses. Default is false."""
+
+
+class CachingHyperdriveHyperdriveCachingEnabled(TypedDict, total=False):
+    disabled: bool
+    """Set to true to disable caching of SQL responses. Default is false."""
 
     max_age: int
-    """When present, specifies max duration for which items should persist in the
-    cache.
+    """Specify the maximum duration (in seconds) items should persist in the cache.
 
-    (Default: 60)
+    Defaults to 60 seconds if not specified.
     """
 
     stale_while_revalidate: int
+    """Specify the number of seconds the cache may serve a stale response.
+
+    Defaults to 15 seconds if not specified.
     """
-    When present, indicates the number of seconds cache may serve the response after
-    it becomes stale. (Default: 15)
-    """
+
+
+Caching: TypeAlias = Union[CachingHyperdriveHyperdriveCachingCommon, CachingHyperdriveHyperdriveCachingEnabled]
+
+
+class MTLS(TypedDict, total=False):
+    ca_certificate_id: str
+    """Define CA certificate ID obtained after uploading CA cert."""
+
+    mtls_certificate_id: str
+    """Define mTLS certificate ID obtained after uploading client cert."""
+
+    sslmode: str
+    """Set SSL mode to 'require', 'verify-ca', or 'verify-full' to verify the CA."""
diff --git a/src/cloudflare/types/hyperdrive/configuration.py b/src/cloudflare/types/hyperdrive/configuration.py
deleted file mode 100644
index 5a6158e9e95..00000000000
--- a/src/cloudflare/types/hyperdrive/configuration.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = ["Configuration"]
-
-
-class Configuration(BaseModel):
-    database: str
-    """The name of your origin database."""
-
-    host: str
-    """The host (hostname or IP) of your origin database."""
-
-    scheme: Literal["postgres", "postgresql", "mysql"]
-    """Specifies the URL scheme used to connect to your origin database."""
-
-    user: str
-    """The user of your origin database."""
-
-    access_client_id: Optional[str] = None
-    """The Client ID of the Access token to use when connecting to the origin database"""
-
-    port: Optional[int] = None
-    """The port (default: 5432 for Postgres) of your origin database."""
diff --git a/src/cloudflare/types/hyperdrive/configuration_param.py b/src/cloudflare/types/hyperdrive/configuration_param.py
deleted file mode 100644
index bd751b98e04..00000000000
--- a/src/cloudflare/types/hyperdrive/configuration_param.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, Required, TypedDict
-
-__all__ = ["ConfigurationParam"]
-
-
-class ConfigurationParam(TypedDict, total=False):
-    database: Required[str]
-    """The name of your origin database."""
-
-    host: Required[str]
-    """The host (hostname or IP) of your origin database."""
-
-    scheme: Required[Literal["postgres", "postgresql", "mysql"]]
-    """Specifies the URL scheme used to connect to your origin database."""
-
-    user: Required[str]
-    """The user of your origin database."""
-
-    access_client_id: str
-    """The Client ID of the Access token to use when connecting to the origin database"""
-
-    port: int
-    """The port (default: 5432 for Postgres) of your origin database."""
diff --git a/src/cloudflare/types/hyperdrive/hyperdrive.py b/src/cloudflare/types/hyperdrive/hyperdrive.py
index 70822832c29..d6982a94d44 100644
--- a/src/cloudflare/types/hyperdrive/hyperdrive.py
+++ b/src/cloudflare/types/hyperdrive/hyperdrive.py
@@ -1,34 +1,126 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
-from .configuration import Configuration
 
-__all__ = ["Hyperdrive", "Caching"]
+__all__ = [
+    "Hyperdrive",
+    "Origin",
+    "OriginPublicDatabase",
+    "OriginAccessProtectedDatabaseBehindCloudflareTunnel",
+    "Caching",
+    "CachingHyperdriveHyperdriveCachingCommon",
+    "CachingHyperdriveHyperdriveCachingEnabled",
+    "MTLS",
+]
 
 
-class Caching(BaseModel):
+class OriginPublicDatabase(BaseModel):
+    database: str
+    """Set the name of your origin database."""
+
+    host: str
+    """Defines the host (hostname or IP) of your origin database."""
+
+    port: int
+    """Defines the port of your origin database.
+
+    Defaults to 5432 for PostgreSQL or 3306 for MySQL if not specified.
+    """
+
+    scheme: Literal["postgres", "postgresql", "mysql"]
+    """Specifies the URL scheme used to connect to your origin database."""
+
+    user: str
+    """Set the user of your origin database."""
+
+
+class OriginAccessProtectedDatabaseBehindCloudflareTunnel(BaseModel):
+    access_client_id: str
+    """
+    Defines the Client ID of the Access token to use when connecting to the origin
+    database.
+    """
+
+    database: str
+    """Set the name of your origin database."""
+
+    host: str
+    """Defines the host (hostname or IP) of your origin database."""
+
+    scheme: Literal["postgres", "postgresql", "mysql"]
+    """Specifies the URL scheme used to connect to your origin database."""
+
+    user: str
+    """Set the user of your origin database."""
+
+
+Origin: TypeAlias = Union[OriginPublicDatabase, OriginAccessProtectedDatabaseBehindCloudflareTunnel]
+
+
+class CachingHyperdriveHyperdriveCachingCommon(BaseModel):
+    disabled: Optional[bool] = None
+    """Set to true to disable caching of SQL responses. Default is false."""
+
+
+class CachingHyperdriveHyperdriveCachingEnabled(BaseModel):
     disabled: Optional[bool] = None
-    """When set to true, disables the caching of SQL responses. (Default: false)"""
+    """Set to true to disable caching of SQL responses. Default is false."""
 
     max_age: Optional[int] = None
-    """When present, specifies max duration for which items should persist in the
-    cache.
+    """Specify the maximum duration (in seconds) items should persist in the cache.
 
-    (Default: 60)
+    Defaults to 60 seconds if not specified.
     """
 
     stale_while_revalidate: Optional[int] = None
+    """Specify the number of seconds the cache may serve a stale response.
+
+    Defaults to 15 seconds if not specified.
     """
-    When present, indicates the number of seconds cache may serve the response after
-    it becomes stale. (Default: 15)
-    """
+
+
+Caching: TypeAlias = Union[CachingHyperdriveHyperdriveCachingCommon, CachingHyperdriveHyperdriveCachingEnabled]
+
+
+class MTLS(BaseModel):
+    ca_certificate_id: Optional[str] = None
+    """Define CA certificate ID obtained after uploading CA cert."""
+
+    mtls_certificate_id: Optional[str] = None
+    """Define mTLS certificate ID obtained after uploading client cert."""
+
+    sslmode: Optional[str] = None
+    """Set SSL mode to 'require', 'verify-ca', or 'verify-full' to verify the CA."""
 
 
 class Hyperdrive(BaseModel):
+    id: str
+    """Define configurations using a unique string identifier."""
+
+    name: str
+    """The name of the Hyperdrive configuration.
+
+    Used to identify the configuration in the Cloudflare dashboard and API.
+    """
+
+    origin: Origin
+
     caching: Optional[Caching] = None
 
-    name: Optional[str] = None
+    created_on: Optional[datetime] = None
+    """Defines the creation time of the Hyperdrive configuration."""
 
-    origin: Optional[Configuration] = None
+    modified_on: Optional[datetime] = None
+    """Defines the last modified time of the Hyperdrive configuration."""
+
+    mtls: Optional[MTLS] = None
+
+    origin_connection_limit: Optional[int] = None
+    """
+    The (soft) maximum number of connections the Hyperdrive is allowed to make to
+    the origin database.
+    """
diff --git a/src/cloudflare/types/iam/__init__.py b/src/cloudflare/types/iam/__init__.py
index 5982e2443a2..1f133064fa2 100644
--- a/src/cloudflare/types/iam/__init__.py
+++ b/src/cloudflare/types/iam/__init__.py
@@ -2,12 +2,30 @@
 
 from __future__ import annotations
 
+from .sso_get_response import SSOGetResponse as SSOGetResponse
+from .sso_create_params import SSOCreateParams as SSOCreateParams
+from .sso_list_response import SSOListResponse as SSOListResponse
+from .sso_update_params import SSOUpdateParams as SSOUpdateParams
+from .sso_create_response import SSOCreateResponse as SSOCreateResponse
+from .sso_delete_response import SSODeleteResponse as SSODeleteResponse
+from .sso_update_response import SSOUpdateResponse as SSOUpdateResponse
+from .user_group_list_params import UserGroupListParams as UserGroupListParams
+from .user_group_get_response import UserGroupGetResponse as UserGroupGetResponse
+from .user_group_create_params import UserGroupCreateParams as UserGroupCreateParams
+from .user_group_list_response import UserGroupListResponse as UserGroupListResponse
+from .user_group_update_params import UserGroupUpdateParams as UserGroupUpdateParams
 from .resource_group_list_params import ResourceGroupListParams as ResourceGroupListParams
+from .user_group_create_response import UserGroupCreateResponse as UserGroupCreateResponse
+from .user_group_delete_response import UserGroupDeleteResponse as UserGroupDeleteResponse
+from .user_group_update_response import UserGroupUpdateResponse as UserGroupUpdateResponse
 from .resource_group_get_response import ResourceGroupGetResponse as ResourceGroupGetResponse
 from .permission_group_list_params import PermissionGroupListParams as PermissionGroupListParams
 from .resource_group_create_params import ResourceGroupCreateParams as ResourceGroupCreateParams
+from .resource_group_list_response import ResourceGroupListResponse as ResourceGroupListResponse
 from .resource_group_update_params import ResourceGroupUpdateParams as ResourceGroupUpdateParams
 from .permission_group_get_response import PermissionGroupGetResponse as PermissionGroupGetResponse
+from .permission_group_list_response import PermissionGroupListResponse as PermissionGroupListResponse
 from .resource_group_create_response import ResourceGroupCreateResponse as ResourceGroupCreateResponse
 from .resource_group_delete_response import ResourceGroupDeleteResponse as ResourceGroupDeleteResponse
 from .resource_group_update_response import ResourceGroupUpdateResponse as ResourceGroupUpdateResponse
+from .sso_begin_verification_response import SSOBeginVerificationResponse as SSOBeginVerificationResponse
diff --git a/src/cloudflare/types/iam/permission_group_get_response.py b/src/cloudflare/types/iam/permission_group_get_response.py
index bfafb28bc92..b349eed485b 100644
--- a/src/cloudflare/types/iam/permission_group_get_response.py
+++ b/src/cloudflare/types/iam/permission_group_get_response.py
@@ -4,15 +4,27 @@
 
 from ..._models import BaseModel
 
-__all__ = ["PermissionGroupGetResponse"]
+__all__ = ["PermissionGroupGetResponse", "Meta"]
+
+
+class Meta(BaseModel):
+    """Attributes associated to the permission group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
 
 
 class PermissionGroupGetResponse(BaseModel):
+    """
+    A named group of permissions that map to a group of operations against resources.
+    """
+
     id: str
-    """Identifier of the group."""
+    """Identifier of the permission group."""
 
-    meta: Optional[object] = None
+    meta: Optional[Meta] = None
     """Attributes associated to the permission group."""
 
     name: Optional[str] = None
-    """Name of the group."""
+    """Name of the permission group."""
diff --git a/src/cloudflare/types/iam/permission_group_list_response.py b/src/cloudflare/types/iam/permission_group_list_response.py
new file mode 100644
index 00000000000..65ab7f672ec
--- /dev/null
+++ b/src/cloudflare/types/iam/permission_group_list_response.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["PermissionGroupListResponse", "Meta"]
+
+
+class Meta(BaseModel):
+    """Attributes associated to the permission group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
+
+
+class PermissionGroupListResponse(BaseModel):
+    """
+    A named group of permissions that map to a group of operations against resources.
+    """
+
+    id: str
+    """Identifier of the permission group."""
+
+    meta: Optional[Meta] = None
+    """Attributes associated to the permission group."""
+
+    name: Optional[str] = None
+    """Name of the permission group."""
diff --git a/src/cloudflare/types/iam/resource_group_create_params.py b/src/cloudflare/types/iam/resource_group_create_params.py
index 7f583c5f87c..f732c8d93d1 100644
--- a/src/cloudflare/types/iam/resource_group_create_params.py
+++ b/src/cloudflare/types/iam/resource_group_create_params.py
@@ -12,14 +12,18 @@ class ResourceGroupCreateParams(TypedDict, total=False):
     account_id: Required[str]
     """Account identifier tag."""
 
+    name: Required[str]
+    """Name of the resource group"""
+
     scope: Required[Scope]
     """A scope is a combination of scope objects which provides additional context."""
 
-    meta: object
-    """Attributes associated to the resource group."""
-
 
 class ScopeObject(TypedDict, total=False):
+    """
+    A scope object represents any resource that can have actions applied against invite.
+    """
+
     key: Required[str]
     """
     This is a combination of pre-defined resource name and identifier (like Zone ID
@@ -28,6 +32,8 @@ class ScopeObject(TypedDict, total=False):
 
 
 class Scope(TypedDict, total=False):
+    """A scope is a combination of scope objects which provides additional context."""
+
     key: Required[str]
     """
     This is a combination of pre-defined resource name and identifier (like Account
diff --git a/src/cloudflare/types/iam/resource_group_create_response.py b/src/cloudflare/types/iam/resource_group_create_response.py
index a6c3b5dc1b0..b728d41b819 100644
--- a/src/cloudflare/types/iam/resource_group_create_response.py
+++ b/src/cloudflare/types/iam/resource_group_create_response.py
@@ -4,10 +4,14 @@
 
 from ..._models import BaseModel
 
-__all__ = ["ResourceGroupCreateResponse", "Scope", "ScopeObject"]
+__all__ = ["ResourceGroupCreateResponse", "Scope", "ScopeObject", "Meta"]
 
 
 class ScopeObject(BaseModel):
+    """
+    A scope object represents any resource that can have actions applied against invite.
+    """
+
     key: str
     """
     This is a combination of pre-defined resource name and identifier (like Zone ID
@@ -16,6 +20,8 @@ class ScopeObject(BaseModel):
 
 
 class Scope(BaseModel):
+    """A scope is a combination of scope objects which provides additional context."""
+
     key: str
     """
     This is a combination of pre-defined resource name and identifier (like Account
@@ -23,18 +29,28 @@ class Scope(BaseModel):
     """
 
     objects: List[ScopeObject]
-    """A list of scope objects for additional context.
+    """A list of scope objects for additional context."""
 
-    The number of Scope objects should not be zero.
-    """
+
+class Meta(BaseModel):
+    """Attributes associated to the resource group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
 
 
 class ResourceGroupCreateResponse(BaseModel):
-    id: Optional[str] = None
-    """Identifier of the group."""
+    """A group of scoped resources."""
 
-    meta: Optional[object] = None
+    id: str
+    """Identifier of the resource group."""
+
+    scope: List[Scope]
+    """The scope associated to the resource group"""
+
+    meta: Optional[Meta] = None
     """Attributes associated to the resource group."""
 
-    scope: Optional[Scope] = None
-    """A scope is a combination of scope objects which provides additional context."""
+    name: Optional[str] = None
+    """Name of the resource group."""
diff --git a/src/cloudflare/types/iam/resource_group_delete_response.py b/src/cloudflare/types/iam/resource_group_delete_response.py
index d9472de8c27..74ff80e4595 100644
--- a/src/cloudflare/types/iam/resource_group_delete_response.py
+++ b/src/cloudflare/types/iam/resource_group_delete_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ..._models import BaseModel
 
 __all__ = ["ResourceGroupDeleteResponse"]
diff --git a/src/cloudflare/types/iam/resource_group_get_response.py b/src/cloudflare/types/iam/resource_group_get_response.py
index 26cc4314edc..f14dab67063 100644
--- a/src/cloudflare/types/iam/resource_group_get_response.py
+++ b/src/cloudflare/types/iam/resource_group_get_response.py
@@ -4,10 +4,14 @@
 
 from ..._models import BaseModel
 
-__all__ = ["ResourceGroupGetResponse", "Scope", "ScopeObject"]
+__all__ = ["ResourceGroupGetResponse", "Scope", "ScopeObject", "Meta"]
 
 
 class ScopeObject(BaseModel):
+    """
+    A scope object represents any resource that can have actions applied against invite.
+    """
+
     key: str
     """
     This is a combination of pre-defined resource name and identifier (like Zone ID
@@ -16,6 +20,8 @@ class ScopeObject(BaseModel):
 
 
 class Scope(BaseModel):
+    """A scope is a combination of scope objects which provides additional context."""
+
     key: str
     """
     This is a combination of pre-defined resource name and identifier (like Account
@@ -26,14 +32,24 @@ class Scope(BaseModel):
     """A list of scope objects for additional context."""
 
 
+class Meta(BaseModel):
+    """Attributes associated to the resource group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
+
+
 class ResourceGroupGetResponse(BaseModel):
+    """A group of scoped resources."""
+
     id: str
-    """Identifier of the group."""
+    """Identifier of the resource group."""
 
     scope: List[Scope]
     """The scope associated to the resource group"""
 
-    meta: Optional[object] = None
+    meta: Optional[Meta] = None
     """Attributes associated to the resource group."""
 
     name: Optional[str] = None
diff --git a/src/cloudflare/types/iam/resource_group_list_params.py b/src/cloudflare/types/iam/resource_group_list_params.py
index f6153181a2f..847d73fcdac 100644
--- a/src/cloudflare/types/iam/resource_group_list_params.py
+++ b/src/cloudflare/types/iam/resource_group_list_params.py
@@ -16,9 +16,3 @@ class ResourceGroupListParams(TypedDict, total=False):
 
     name: str
     """Name of the resource group to be fetched."""
-
-    page: float
-    """Page number of paginated results."""
-
-    per_page: float
-    """Maximum number of results per page."""
diff --git a/src/cloudflare/types/iam/resource_group_list_response.py b/src/cloudflare/types/iam/resource_group_list_response.py
new file mode 100644
index 00000000000..66e180cdaf2
--- /dev/null
+++ b/src/cloudflare/types/iam/resource_group_list_response.py
@@ -0,0 +1,56 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["ResourceGroupListResponse", "Scope", "ScopeObject", "Meta"]
+
+
+class ScopeObject(BaseModel):
+    """
+    A scope object represents any resource that can have actions applied against invite.
+    """
+
+    key: str
+    """
+    This is a combination of pre-defined resource name and identifier (like Zone ID
+    etc.)
+    """
+
+
+class Scope(BaseModel):
+    """A scope is a combination of scope objects which provides additional context."""
+
+    key: str
+    """
+    This is a combination of pre-defined resource name and identifier (like Account
+    ID etc.)
+    """
+
+    objects: List[ScopeObject]
+    """A list of scope objects for additional context."""
+
+
+class Meta(BaseModel):
+    """Attributes associated to the resource group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
+
+
+class ResourceGroupListResponse(BaseModel):
+    """A group of scoped resources."""
+
+    id: str
+    """Identifier of the resource group."""
+
+    scope: List[Scope]
+    """The scope associated to the resource group"""
+
+    meta: Optional[Meta] = None
+    """Attributes associated to the resource group."""
+
+    name: Optional[str] = None
+    """Name of the resource group."""
diff --git a/src/cloudflare/types/iam/resource_group_update_params.py b/src/cloudflare/types/iam/resource_group_update_params.py
index eb50831f7be..14274c889a0 100644
--- a/src/cloudflare/types/iam/resource_group_update_params.py
+++ b/src/cloudflare/types/iam/resource_group_update_params.py
@@ -12,14 +12,18 @@ class ResourceGroupUpdateParams(TypedDict, total=False):
     account_id: Required[str]
     """Account identifier tag."""
 
-    scope: Required[Scope]
-    """A scope is a combination of scope objects which provides additional context."""
+    name: str
+    """Name of the resource group"""
 
-    meta: object
-    """Attributes associated to the resource group."""
+    scope: Scope
+    """A scope is a combination of scope objects which provides additional context."""
 
 
 class ScopeObject(TypedDict, total=False):
+    """
+    A scope object represents any resource that can have actions applied against invite.
+    """
+
     key: Required[str]
     """
     This is a combination of pre-defined resource name and identifier (like Zone ID
@@ -28,6 +32,8 @@ class ScopeObject(TypedDict, total=False):
 
 
 class Scope(TypedDict, total=False):
+    """A scope is a combination of scope objects which provides additional context."""
+
     key: Required[str]
     """
     This is a combination of pre-defined resource name and identifier (like Account
diff --git a/src/cloudflare/types/iam/resource_group_update_response.py b/src/cloudflare/types/iam/resource_group_update_response.py
index 8aa70682f42..43f9e872f00 100644
--- a/src/cloudflare/types/iam/resource_group_update_response.py
+++ b/src/cloudflare/types/iam/resource_group_update_response.py
@@ -4,10 +4,14 @@
 
 from ..._models import BaseModel
 
-__all__ = ["ResourceGroupUpdateResponse", "Scope", "ScopeObject"]
+__all__ = ["ResourceGroupUpdateResponse", "Scope", "ScopeObject", "Meta"]
 
 
 class ScopeObject(BaseModel):
+    """
+    A scope object represents any resource that can have actions applied against invite.
+    """
+
     key: str
     """
     This is a combination of pre-defined resource name and identifier (like Zone ID
@@ -16,6 +20,8 @@ class ScopeObject(BaseModel):
 
 
 class Scope(BaseModel):
+    """A scope is a combination of scope objects which provides additional context."""
+
     key: str
     """
     This is a combination of pre-defined resource name and identifier (like Account
@@ -26,14 +32,24 @@ class Scope(BaseModel):
     """A list of scope objects for additional context."""
 
 
+class Meta(BaseModel):
+    """Attributes associated to the resource group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
+
+
 class ResourceGroupUpdateResponse(BaseModel):
+    """A group of scoped resources."""
+
     id: str
-    """Identifier of the group."""
+    """Identifier of the resource group."""
 
     scope: List[Scope]
     """The scope associated to the resource group"""
 
-    meta: Optional[object] = None
+    meta: Optional[Meta] = None
     """Attributes associated to the resource group."""
 
     name: Optional[str] = None
diff --git a/src/cloudflare/types/iam/sso_begin_verification_response.py b/src/cloudflare/types/iam/sso_begin_verification_response.py
new file mode 100644
index 00000000000..d193453ffb3
--- /dev/null
+++ b/src/cloudflare/types/iam/sso_begin_verification_response.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["SSOBeginVerificationResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class SSOBeginVerificationResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/iam/sso_create_params.py b/src/cloudflare/types/iam/sso_create_params.py
new file mode 100644
index 00000000000..ec1076e8d0a
--- /dev/null
+++ b/src/cloudflare/types/iam/sso_create_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SSOCreateParams"]
+
+
+class SSOCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    email_domain: Required[str]
+    """Email domain of the new SSO connector"""
+
+    begin_verification: bool
+    """Begin the verification process after creation"""
+
+    use_fedramp_language: bool
+    """Controls the display of FedRAMP language to the user during SSO login"""
diff --git a/src/cloudflare/types/iam/sso_create_response.py b/src/cloudflare/types/iam/sso_create_response.py
new file mode 100644
index 00000000000..26e4574a767
--- /dev/null
+++ b/src/cloudflare/types/iam/sso_create_response.py
@@ -0,0 +1,41 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["SSOCreateResponse", "Verification"]
+
+
+class Verification(BaseModel):
+    code: Optional[str] = None
+    """DNS verification code.
+
+    Add this entire string to the DNS TXT record of the email domain to validate
+    ownership.
+    """
+
+    status: Optional[Literal["awaiting", "pending", "failed", "verified"]] = None
+    """The status of the verification code from the verification process."""
+
+
+class SSOCreateResponse(BaseModel):
+    id: Optional[str] = None
+    """SSO Connector identifier tag."""
+
+    created_on: Optional[datetime] = None
+    """Timestamp for the creation of the SSO connector"""
+
+    email_domain: Optional[str] = None
+
+    enabled: Optional[bool] = None
+
+    updated_on: Optional[datetime] = None
+    """Timestamp for the last update of the SSO connector"""
+
+    use_fedramp_language: Optional[bool] = None
+    """Controls the display of FedRAMP language to the user during SSO login"""
+
+    verification: Optional[Verification] = None
diff --git a/src/cloudflare/types/iam/sso_delete_response.py b/src/cloudflare/types/iam/sso_delete_response.py
new file mode 100644
index 00000000000..e5e2ff944ba
--- /dev/null
+++ b/src/cloudflare/types/iam/sso_delete_response.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["SSODeleteResponse"]
+
+
+class SSODeleteResponse(BaseModel):
+    id: str
+    """Identifier"""
diff --git a/src/cloudflare/types/iam/sso_get_response.py b/src/cloudflare/types/iam/sso_get_response.py
new file mode 100644
index 00000000000..b2b64028cba
--- /dev/null
+++ b/src/cloudflare/types/iam/sso_get_response.py
@@ -0,0 +1,41 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["SSOGetResponse", "Verification"]
+
+
+class Verification(BaseModel):
+    code: Optional[str] = None
+    """DNS verification code.
+
+    Add this entire string to the DNS TXT record of the email domain to validate
+    ownership.
+    """
+
+    status: Optional[Literal["awaiting", "pending", "failed", "verified"]] = None
+    """The status of the verification code from the verification process."""
+
+
+class SSOGetResponse(BaseModel):
+    id: Optional[str] = None
+    """SSO Connector identifier tag."""
+
+    created_on: Optional[datetime] = None
+    """Timestamp for the creation of the SSO connector"""
+
+    email_domain: Optional[str] = None
+
+    enabled: Optional[bool] = None
+
+    updated_on: Optional[datetime] = None
+    """Timestamp for the last update of the SSO connector"""
+
+    use_fedramp_language: Optional[bool] = None
+    """Controls the display of FedRAMP language to the user during SSO login"""
+
+    verification: Optional[Verification] = None
diff --git a/src/cloudflare/types/iam/sso_list_response.py b/src/cloudflare/types/iam/sso_list_response.py
new file mode 100644
index 00000000000..cf186064f96
--- /dev/null
+++ b/src/cloudflare/types/iam/sso_list_response.py
@@ -0,0 +1,41 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["SSOListResponse", "Verification"]
+
+
+class Verification(BaseModel):
+    code: Optional[str] = None
+    """DNS verification code.
+
+    Add this entire string to the DNS TXT record of the email domain to validate
+    ownership.
+    """
+
+    status: Optional[Literal["awaiting", "pending", "failed", "verified"]] = None
+    """The status of the verification code from the verification process."""
+
+
+class SSOListResponse(BaseModel):
+    id: Optional[str] = None
+    """SSO Connector identifier tag."""
+
+    created_on: Optional[datetime] = None
+    """Timestamp for the creation of the SSO connector"""
+
+    email_domain: Optional[str] = None
+
+    enabled: Optional[bool] = None
+
+    updated_on: Optional[datetime] = None
+    """Timestamp for the last update of the SSO connector"""
+
+    use_fedramp_language: Optional[bool] = None
+    """Controls the display of FedRAMP language to the user during SSO login"""
+
+    verification: Optional[Verification] = None
diff --git a/src/cloudflare/types/iam/sso_update_params.py b/src/cloudflare/types/iam/sso_update_params.py
new file mode 100644
index 00000000000..6f337f80b01
--- /dev/null
+++ b/src/cloudflare/types/iam/sso_update_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SSOUpdateParams"]
+
+
+class SSOUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    enabled: bool
+    """SSO Connector enabled state"""
+
+    use_fedramp_language: bool
+    """Controls the display of FedRAMP language to the user during SSO login"""
diff --git a/src/cloudflare/types/iam/sso_update_response.py b/src/cloudflare/types/iam/sso_update_response.py
new file mode 100644
index 00000000000..8bbaf618a8c
--- /dev/null
+++ b/src/cloudflare/types/iam/sso_update_response.py
@@ -0,0 +1,41 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["SSOUpdateResponse", "Verification"]
+
+
+class Verification(BaseModel):
+    code: Optional[str] = None
+    """DNS verification code.
+
+    Add this entire string to the DNS TXT record of the email domain to validate
+    ownership.
+    """
+
+    status: Optional[Literal["awaiting", "pending", "failed", "verified"]] = None
+    """The status of the verification code from the verification process."""
+
+
+class SSOUpdateResponse(BaseModel):
+    id: Optional[str] = None
+    """SSO Connector identifier tag."""
+
+    created_on: Optional[datetime] = None
+    """Timestamp for the creation of the SSO connector"""
+
+    email_domain: Optional[str] = None
+
+    enabled: Optional[bool] = None
+
+    updated_on: Optional[datetime] = None
+    """Timestamp for the last update of the SSO connector"""
+
+    use_fedramp_language: Optional[bool] = None
+    """Controls the display of FedRAMP language to the user during SSO login"""
+
+    verification: Optional[Verification] = None
diff --git a/src/cloudflare/types/iam/user_group_create_params.py b/src/cloudflare/types/iam/user_group_create_params.py
new file mode 100644
index 00000000000..84d18d7aa2b
--- /dev/null
+++ b/src/cloudflare/types/iam/user_group_create_params.py
@@ -0,0 +1,46 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["UserGroupCreateParams", "Policy", "PolicyPermissionGroup", "PolicyResourceGroup"]
+
+
+class UserGroupCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    name: Required[str]
+    """Name of the User group."""
+
+    policies: Required[Iterable[Policy]]
+    """Policies attached to the User group"""
+
+
+class PolicyPermissionGroup(TypedDict, total=False):
+    """
+    A named group of permissions that map to a group of operations against resources.
+    """
+
+    id: Required[str]
+    """Permission Group identifier tag."""
+
+
+class PolicyResourceGroup(TypedDict, total=False):
+    """A group of scoped resources."""
+
+    id: Required[str]
+    """Resource Group identifier tag."""
+
+
+class Policy(TypedDict, total=False):
+    access: Required[Literal["allow", "deny"]]
+    """Allow or deny operations against the resources."""
+
+    permission_groups: Required[Iterable[PolicyPermissionGroup]]
+    """A set of permission groups that are specified to the policy."""
+
+    resource_groups: Required[Iterable[PolicyResourceGroup]]
+    """A set of resource groups that are specified to the policy."""
diff --git a/src/cloudflare/types/iam/user_group_create_response.py b/src/cloudflare/types/iam/user_group_create_response.py
new file mode 100644
index 00000000000..5ef0c79e50b
--- /dev/null
+++ b/src/cloudflare/types/iam/user_group_create_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "UserGroupCreateResponse",
+    "Policy",
+    "PolicyPermissionGroup",
+    "PolicyPermissionGroupMeta",
+    "PolicyResourceGroup",
+    "PolicyResourceGroupScope",
+    "PolicyResourceGroupScopeObject",
+    "PolicyResourceGroupMeta",
+]
+
+
+class PolicyPermissionGroupMeta(BaseModel):
+    """Attributes associated to the permission group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
+
+
+class PolicyPermissionGroup(BaseModel):
+    """
+    A named group of permissions that map to a group of operations against resources.
+    """
+
+    id: str
+    """Identifier of the permission group."""
+
+    meta: Optional[PolicyPermissionGroupMeta] = None
+    """Attributes associated to the permission group."""
+
+    name: Optional[str] = None
+    """Name of the permission group."""
+
+
+class PolicyResourceGroupScopeObject(BaseModel):
+    """
+    A scope object represents any resource that can have actions applied against invite.
+    """
+
+    key: str
+    """
+    This is a combination of pre-defined resource name and identifier (like Zone ID
+    etc.)
+    """
+
+
+class PolicyResourceGroupScope(BaseModel):
+    """A scope is a combination of scope objects which provides additional context."""
+
+    key: str
+    """
+    This is a combination of pre-defined resource name and identifier (like Account
+    ID etc.)
+    """
+
+    objects: List[PolicyResourceGroupScopeObject]
+    """A list of scope objects for additional context."""
+
+
+class PolicyResourceGroupMeta(BaseModel):
+    """Attributes associated to the resource group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
+
+
+class PolicyResourceGroup(BaseModel):
+    """A group of scoped resources."""
+
+    id: str
+    """Identifier of the resource group."""
+
+    scope: List[PolicyResourceGroupScope]
+    """The scope associated to the resource group"""
+
+    meta: Optional[PolicyResourceGroupMeta] = None
+    """Attributes associated to the resource group."""
+
+    name: Optional[str] = None
+    """Name of the resource group."""
+
+
+class Policy(BaseModel):
+    """Policy"""
+
+    id: Optional[str] = None
+    """Policy identifier."""
+
+    access: Optional[Literal["allow", "deny"]] = None
+    """Allow or deny operations against the resources."""
+
+    permission_groups: Optional[List[PolicyPermissionGroup]] = None
+    """A set of permission groups that are specified to the policy."""
+
+    resource_groups: Optional[List[PolicyResourceGroup]] = None
+    """A list of resource groups that the policy applies to."""
+
+
+class UserGroupCreateResponse(BaseModel):
+    """A group of policies resources."""
+
+    id: str
+    """User Group identifier tag."""
+
+    created_on: datetime
+    """Timestamp for the creation of the user group"""
+
+    modified_on: datetime
+    """Last time the user group was modified."""
+
+    name: str
+    """Name of the user group."""
+
+    policies: Optional[List[Policy]] = None
+    """Policies attached to the User group"""
diff --git a/src/cloudflare/types/iam/user_group_delete_response.py b/src/cloudflare/types/iam/user_group_delete_response.py
new file mode 100644
index 00000000000..ed58df2b8a3
--- /dev/null
+++ b/src/cloudflare/types/iam/user_group_delete_response.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["UserGroupDeleteResponse"]
+
+
+class UserGroupDeleteResponse(BaseModel):
+    id: str
+    """Identifier"""
diff --git a/src/cloudflare/types/iam/user_group_get_response.py b/src/cloudflare/types/iam/user_group_get_response.py
new file mode 100644
index 00000000000..1f83d845b58
--- /dev/null
+++ b/src/cloudflare/types/iam/user_group_get_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "UserGroupGetResponse",
+    "Policy",
+    "PolicyPermissionGroup",
+    "PolicyPermissionGroupMeta",
+    "PolicyResourceGroup",
+    "PolicyResourceGroupScope",
+    "PolicyResourceGroupScopeObject",
+    "PolicyResourceGroupMeta",
+]
+
+
+class PolicyPermissionGroupMeta(BaseModel):
+    """Attributes associated to the permission group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
+
+
+class PolicyPermissionGroup(BaseModel):
+    """
+    A named group of permissions that map to a group of operations against resources.
+    """
+
+    id: str
+    """Identifier of the permission group."""
+
+    meta: Optional[PolicyPermissionGroupMeta] = None
+    """Attributes associated to the permission group."""
+
+    name: Optional[str] = None
+    """Name of the permission group."""
+
+
+class PolicyResourceGroupScopeObject(BaseModel):
+    """
+    A scope object represents any resource that can have actions applied against invite.
+    """
+
+    key: str
+    """
+    This is a combination of pre-defined resource name and identifier (like Zone ID
+    etc.)
+    """
+
+
+class PolicyResourceGroupScope(BaseModel):
+    """A scope is a combination of scope objects which provides additional context."""
+
+    key: str
+    """
+    This is a combination of pre-defined resource name and identifier (like Account
+    ID etc.)
+    """
+
+    objects: List[PolicyResourceGroupScopeObject]
+    """A list of scope objects for additional context."""
+
+
+class PolicyResourceGroupMeta(BaseModel):
+    """Attributes associated to the resource group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
+
+
+class PolicyResourceGroup(BaseModel):
+    """A group of scoped resources."""
+
+    id: str
+    """Identifier of the resource group."""
+
+    scope: List[PolicyResourceGroupScope]
+    """The scope associated to the resource group"""
+
+    meta: Optional[PolicyResourceGroupMeta] = None
+    """Attributes associated to the resource group."""
+
+    name: Optional[str] = None
+    """Name of the resource group."""
+
+
+class Policy(BaseModel):
+    """Policy"""
+
+    id: Optional[str] = None
+    """Policy identifier."""
+
+    access: Optional[Literal["allow", "deny"]] = None
+    """Allow or deny operations against the resources."""
+
+    permission_groups: Optional[List[PolicyPermissionGroup]] = None
+    """A set of permission groups that are specified to the policy."""
+
+    resource_groups: Optional[List[PolicyResourceGroup]] = None
+    """A list of resource groups that the policy applies to."""
+
+
+class UserGroupGetResponse(BaseModel):
+    """A group of policies resources."""
+
+    id: str
+    """User Group identifier tag."""
+
+    created_on: datetime
+    """Timestamp for the creation of the user group"""
+
+    modified_on: datetime
+    """Last time the user group was modified."""
+
+    name: str
+    """Name of the user group."""
+
+    policies: Optional[List[Policy]] = None
+    """Policies attached to the User group"""
diff --git a/src/cloudflare/types/iam/user_group_list_params.py b/src/cloudflare/types/iam/user_group_list_params.py
new file mode 100644
index 00000000000..8280bb6c3e0
--- /dev/null
+++ b/src/cloudflare/types/iam/user_group_list_params.py
@@ -0,0 +1,36 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["UserGroupListParams"]
+
+
+class UserGroupListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    id: str
+    """ID of the user group to be fetched."""
+
+    direction: str
+    """The sort order of returned user groups by name.
+
+    Default sort order is ascending. To switch to descending, set this parameter to
+    "desc"
+    """
+
+    fuzzy_name: Annotated[str, PropertyInfo(alias="fuzzyName")]
+    """A string used for searching for user groups containing that substring."""
+
+    name: str
+    """Name of the user group to be fetched."""
+
+    page: float
+    """Page number of paginated results."""
+
+    per_page: float
+    """Maximum number of results per page."""
diff --git a/src/cloudflare/types/iam/user_group_list_response.py b/src/cloudflare/types/iam/user_group_list_response.py
new file mode 100644
index 00000000000..b59fce8654c
--- /dev/null
+++ b/src/cloudflare/types/iam/user_group_list_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "UserGroupListResponse",
+    "Policy",
+    "PolicyPermissionGroup",
+    "PolicyPermissionGroupMeta",
+    "PolicyResourceGroup",
+    "PolicyResourceGroupScope",
+    "PolicyResourceGroupScopeObject",
+    "PolicyResourceGroupMeta",
+]
+
+
+class PolicyPermissionGroupMeta(BaseModel):
+    """Attributes associated to the permission group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
+
+
+class PolicyPermissionGroup(BaseModel):
+    """
+    A named group of permissions that map to a group of operations against resources.
+    """
+
+    id: str
+    """Identifier of the permission group."""
+
+    meta: Optional[PolicyPermissionGroupMeta] = None
+    """Attributes associated to the permission group."""
+
+    name: Optional[str] = None
+    """Name of the permission group."""
+
+
+class PolicyResourceGroupScopeObject(BaseModel):
+    """
+    A scope object represents any resource that can have actions applied against invite.
+    """
+
+    key: str
+    """
+    This is a combination of pre-defined resource name and identifier (like Zone ID
+    etc.)
+    """
+
+
+class PolicyResourceGroupScope(BaseModel):
+    """A scope is a combination of scope objects which provides additional context."""
+
+    key: str
+    """
+    This is a combination of pre-defined resource name and identifier (like Account
+    ID etc.)
+    """
+
+    objects: List[PolicyResourceGroupScopeObject]
+    """A list of scope objects for additional context."""
+
+
+class PolicyResourceGroupMeta(BaseModel):
+    """Attributes associated to the resource group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
+
+
+class PolicyResourceGroup(BaseModel):
+    """A group of scoped resources."""
+
+    id: str
+    """Identifier of the resource group."""
+
+    scope: List[PolicyResourceGroupScope]
+    """The scope associated to the resource group"""
+
+    meta: Optional[PolicyResourceGroupMeta] = None
+    """Attributes associated to the resource group."""
+
+    name: Optional[str] = None
+    """Name of the resource group."""
+
+
+class Policy(BaseModel):
+    """Policy"""
+
+    id: Optional[str] = None
+    """Policy identifier."""
+
+    access: Optional[Literal["allow", "deny"]] = None
+    """Allow or deny operations against the resources."""
+
+    permission_groups: Optional[List[PolicyPermissionGroup]] = None
+    """A set of permission groups that are specified to the policy."""
+
+    resource_groups: Optional[List[PolicyResourceGroup]] = None
+    """A list of resource groups that the policy applies to."""
+
+
+class UserGroupListResponse(BaseModel):
+    """A group of policies resources."""
+
+    id: str
+    """User Group identifier tag."""
+
+    created_on: datetime
+    """Timestamp for the creation of the user group"""
+
+    modified_on: datetime
+    """Last time the user group was modified."""
+
+    name: str
+    """Name of the user group."""
+
+    policies: Optional[List[Policy]] = None
+    """Policies attached to the User group"""
diff --git a/src/cloudflare/types/iam/user_group_update_params.py b/src/cloudflare/types/iam/user_group_update_params.py
new file mode 100644
index 00000000000..19d6be93124
--- /dev/null
+++ b/src/cloudflare/types/iam/user_group_update_params.py
@@ -0,0 +1,49 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["UserGroupUpdateParams", "Policy", "PolicyPermissionGroup", "PolicyResourceGroup"]
+
+
+class UserGroupUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    name: str
+    """Name of the User group."""
+
+    policies: Iterable[Policy]
+    """Policies attached to the User group"""
+
+
+class PolicyPermissionGroup(TypedDict, total=False):
+    """
+    A named group of permissions that map to a group of operations against resources.
+    """
+
+    id: Required[str]
+    """Permission Group identifier tag."""
+
+
+class PolicyResourceGroup(TypedDict, total=False):
+    """A group of scoped resources."""
+
+    id: Required[str]
+    """Resource Group identifier tag."""
+
+
+class Policy(TypedDict, total=False):
+    id: Required[str]
+    """Policy identifier."""
+
+    access: Required[Literal["allow", "deny"]]
+    """Allow or deny operations against the resources."""
+
+    permission_groups: Required[Iterable[PolicyPermissionGroup]]
+    """A set of permission groups that are specified to the policy."""
+
+    resource_groups: Required[Iterable[PolicyResourceGroup]]
+    """A set of resource groups that are specified to the policy."""
diff --git a/src/cloudflare/types/iam/user_group_update_response.py b/src/cloudflare/types/iam/user_group_update_response.py
new file mode 100644
index 00000000000..3d9f257011d
--- /dev/null
+++ b/src/cloudflare/types/iam/user_group_update_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "UserGroupUpdateResponse",
+    "Policy",
+    "PolicyPermissionGroup",
+    "PolicyPermissionGroupMeta",
+    "PolicyResourceGroup",
+    "PolicyResourceGroupScope",
+    "PolicyResourceGroupScopeObject",
+    "PolicyResourceGroupMeta",
+]
+
+
+class PolicyPermissionGroupMeta(BaseModel):
+    """Attributes associated to the permission group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
+
+
+class PolicyPermissionGroup(BaseModel):
+    """
+    A named group of permissions that map to a group of operations against resources.
+    """
+
+    id: str
+    """Identifier of the permission group."""
+
+    meta: Optional[PolicyPermissionGroupMeta] = None
+    """Attributes associated to the permission group."""
+
+    name: Optional[str] = None
+    """Name of the permission group."""
+
+
+class PolicyResourceGroupScopeObject(BaseModel):
+    """
+    A scope object represents any resource that can have actions applied against invite.
+    """
+
+    key: str
+    """
+    This is a combination of pre-defined resource name and identifier (like Zone ID
+    etc.)
+    """
+
+
+class PolicyResourceGroupScope(BaseModel):
+    """A scope is a combination of scope objects which provides additional context."""
+
+    key: str
+    """
+    This is a combination of pre-defined resource name and identifier (like Account
+    ID etc.)
+    """
+
+    objects: List[PolicyResourceGroupScopeObject]
+    """A list of scope objects for additional context."""
+
+
+class PolicyResourceGroupMeta(BaseModel):
+    """Attributes associated to the resource group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
+
+
+class PolicyResourceGroup(BaseModel):
+    """A group of scoped resources."""
+
+    id: str
+    """Identifier of the resource group."""
+
+    scope: List[PolicyResourceGroupScope]
+    """The scope associated to the resource group"""
+
+    meta: Optional[PolicyResourceGroupMeta] = None
+    """Attributes associated to the resource group."""
+
+    name: Optional[str] = None
+    """Name of the resource group."""
+
+
+class Policy(BaseModel):
+    """Policy"""
+
+    id: Optional[str] = None
+    """Policy identifier."""
+
+    access: Optional[Literal["allow", "deny"]] = None
+    """Allow or deny operations against the resources."""
+
+    permission_groups: Optional[List[PolicyPermissionGroup]] = None
+    """A set of permission groups that are specified to the policy."""
+
+    resource_groups: Optional[List[PolicyResourceGroup]] = None
+    """A list of resource groups that the policy applies to."""
+
+
+class UserGroupUpdateResponse(BaseModel):
+    """A group of policies resources."""
+
+    id: str
+    """User Group identifier tag."""
+
+    created_on: datetime
+    """Timestamp for the creation of the user group"""
+
+    modified_on: datetime
+    """Last time the user group was modified."""
+
+    name: str
+    """Name of the user group."""
+
+    policies: Optional[List[Policy]] = None
+    """Policies attached to the User group"""
diff --git a/src/cloudflare/types/iam/user_groups/__init__.py b/src/cloudflare/types/iam/user_groups/__init__.py
new file mode 100644
index 00000000000..61081ac868f
--- /dev/null
+++ b/src/cloudflare/types/iam/user_groups/__init__.py
@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .member_list_params import MemberListParams as MemberListParams
+from .member_create_params import MemberCreateParams as MemberCreateParams
+from .member_list_response import MemberListResponse as MemberListResponse
+from .member_update_params import MemberUpdateParams as MemberUpdateParams
+from .member_create_response import MemberCreateResponse as MemberCreateResponse
+from .member_delete_response import MemberDeleteResponse as MemberDeleteResponse
+from .member_update_response import MemberUpdateResponse as MemberUpdateResponse
diff --git a/src/cloudflare/types/iam/user_groups/member_create_params.py b/src/cloudflare/types/iam/user_groups/member_create_params.py
new file mode 100644
index 00000000000..e1cfe45ece1
--- /dev/null
+++ b/src/cloudflare/types/iam/user_groups/member_create_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["MemberCreateParams", "Body"]
+
+
+class MemberCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    body: Required[Iterable[Body]]
+
+
+class Body(TypedDict, total=False):
+    id: Required[str]
+    """The identifier of an existing account Member."""
diff --git a/src/cloudflare/types/iam/user_groups/member_create_response.py b/src/cloudflare/types/iam/user_groups/member_create_response.py
new file mode 100644
index 00000000000..3f8956ceb09
--- /dev/null
+++ b/src/cloudflare/types/iam/user_groups/member_create_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["MemberCreateResponse"]
+
+
+class MemberCreateResponse(BaseModel):
+    """Member attached to a User Group."""
+
+    id: str
+    """Account member identifier."""
+
+    email: Optional[str] = None
+    """The contact email address of the user."""
+
+    status: Optional[Literal["accepted", "pending"]] = None
+    """The member's status in the account."""
diff --git a/src/cloudflare/types/iam/user_groups/member_delete_response.py b/src/cloudflare/types/iam/user_groups/member_delete_response.py
new file mode 100644
index 00000000000..1f87a18199b
--- /dev/null
+++ b/src/cloudflare/types/iam/user_groups/member_delete_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["MemberDeleteResponse"]
+
+
+class MemberDeleteResponse(BaseModel):
+    """Member attached to a User Group."""
+
+    id: str
+    """Account member identifier."""
+
+    email: Optional[str] = None
+    """The contact email address of the user."""
+
+    status: Optional[Literal["accepted", "pending"]] = None
+    """The member's status in the account."""
diff --git a/src/cloudflare/types/iam/user_groups/member_list_params.py b/src/cloudflare/types/iam/user_groups/member_list_params.py
new file mode 100644
index 00000000000..49532964553
--- /dev/null
+++ b/src/cloudflare/types/iam/user_groups/member_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["MemberListParams"]
+
+
+class MemberListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    page: float
+    """Page number of paginated results."""
+
+    per_page: float
+    """Maximum number of results per page."""
diff --git a/src/cloudflare/types/iam/user_groups/member_list_response.py b/src/cloudflare/types/iam/user_groups/member_list_response.py
new file mode 100644
index 00000000000..1a39bed5a6f
--- /dev/null
+++ b/src/cloudflare/types/iam/user_groups/member_list_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["MemberListResponse"]
+
+
+class MemberListResponse(BaseModel):
+    """Member attached to a User Group."""
+
+    id: str
+    """Account member identifier."""
+
+    email: Optional[str] = None
+    """The contact email address of the user."""
+
+    status: Optional[Literal["accepted", "pending"]] = None
+    """The member's status in the account."""
diff --git a/src/cloudflare/types/iam/user_groups/member_update_params.py b/src/cloudflare/types/iam/user_groups/member_update_params.py
new file mode 100644
index 00000000000..49c0ea06569
--- /dev/null
+++ b/src/cloudflare/types/iam/user_groups/member_update_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["MemberUpdateParams", "Body"]
+
+
+class MemberUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier tag."""
+
+    body: Required[Iterable[Body]]
+    """Set/Replace members to a user group."""
+
+
+class Body(TypedDict, total=False):
+    id: Required[str]
+    """The identifier of an existing account Member."""
diff --git a/src/cloudflare/types/iam/user_groups/member_update_response.py b/src/cloudflare/types/iam/user_groups/member_update_response.py
new file mode 100644
index 00000000000..acb4b190b4d
--- /dev/null
+++ b/src/cloudflare/types/iam/user_groups/member_update_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["MemberUpdateResponse"]
+
+
+class MemberUpdateResponse(BaseModel):
+    """Member attached to a User Group."""
+
+    id: str
+    """Account member identifier."""
+
+    email: Optional[str] = None
+    """The contact email address of the user."""
+
+    status: Optional[Literal["accepted", "pending"]] = None
+    """The member's status in the account."""
diff --git a/src/cloudflare/types/images/image.py b/src/cloudflare/types/images/image.py
index 9be5724c4f0..7260a8c3d04 100644
--- a/src/cloudflare/types/images/image.py
+++ b/src/cloudflare/types/images/image.py
@@ -1,6 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Union, Optional
+from typing import List, Optional
 from datetime import datetime
 
 from pydantic import Field as FieldInfo
@@ -14,6 +14,9 @@ class Image(BaseModel):
     id: Optional[str] = None
     """Image unique identifier."""
 
+    creator: Optional[str] = None
+    """Can set the creator field with an internal user ID."""
+
     filename: Optional[str] = None
     """Image file name."""
 
@@ -34,5 +37,5 @@ class Image(BaseModel):
     uploaded: Optional[datetime] = None
     """When the media item was uploaded."""
 
-    variants: Optional[List[Union[str, str, str]]] = None
+    variants: Optional[List[str]] = None
     """Object specifying available variants for an image."""
diff --git a/src/cloudflare/types/images/v1/variant.py b/src/cloudflare/types/images/v1/variant.py
index c2796655888..75fbf260d58 100644
--- a/src/cloudflare/types/images/v1/variant.py
+++ b/src/cloudflare/types/images/v1/variant.py
@@ -11,6 +11,8 @@
 
 
 class VariantsHeroOptions(BaseModel):
+    """Allows you to define image resizing sizes for different use cases."""
+
     fit: Literal["scale-down", "contain", "cover", "crop", "pad"]
     """
     The fit property describes how the width and height dimensions should be
diff --git a/src/cloudflare/types/images/v1/variant_create_params.py b/src/cloudflare/types/images/v1/variant_create_params.py
index 6bb7fa9bff7..ea2907aca25 100644
--- a/src/cloudflare/types/images/v1/variant_create_params.py
+++ b/src/cloudflare/types/images/v1/variant_create_params.py
@@ -26,6 +26,8 @@ class VariantCreateParams(TypedDict, total=False):
 
 
 class Options(TypedDict, total=False):
+    """Allows you to define image resizing sizes for different use cases."""
+
     fit: Required[Literal["scale-down", "contain", "cover", "crop", "pad"]]
     """
     The fit property describes how the width and height dimensions should be
diff --git a/src/cloudflare/types/images/v1/variant_create_response.py b/src/cloudflare/types/images/v1/variant_create_response.py
index 723ef2b90f6..1c1d4786165 100644
--- a/src/cloudflare/types/images/v1/variant_create_response.py
+++ b/src/cloudflare/types/images/v1/variant_create_response.py
@@ -11,6 +11,8 @@
 
 
 class VariantOptions(BaseModel):
+    """Allows you to define image resizing sizes for different use cases."""
+
     fit: Literal["scale-down", "contain", "cover", "crop", "pad"]
     """
     The fit property describes how the width and height dimensions should be
diff --git a/src/cloudflare/types/images/v1/variant_delete_response.py b/src/cloudflare/types/images/v1/variant_delete_response.py
index 76df3ba49a2..3b3a97038ec 100644
--- a/src/cloudflare/types/images/v1/variant_delete_response.py
+++ b/src/cloudflare/types/images/v1/variant_delete_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Union
+from typing_extensions import TypeAlias
 
 __all__ = ["VariantDeleteResponse"]
 
-VariantDeleteResponse = Union[Optional[str], Optional[object]]
+VariantDeleteResponse: TypeAlias = Union[str, object]
diff --git a/src/cloudflare/types/images/v1/variant_edit_params.py b/src/cloudflare/types/images/v1/variant_edit_params.py
index db2b4e3ada2..8f36382f9af 100644
--- a/src/cloudflare/types/images/v1/variant_edit_params.py
+++ b/src/cloudflare/types/images/v1/variant_edit_params.py
@@ -24,6 +24,8 @@ class VariantEditParams(TypedDict, total=False):
 
 
 class Options(TypedDict, total=False):
+    """Allows you to define image resizing sizes for different use cases."""
+
     fit: Required[Literal["scale-down", "contain", "cover", "crop", "pad"]]
     """
     The fit property describes how the width and height dimensions should be
diff --git a/src/cloudflare/types/images/v1/variant_edit_response.py b/src/cloudflare/types/images/v1/variant_edit_response.py
index 64d25e4b9ee..abc56bb73b9 100644
--- a/src/cloudflare/types/images/v1/variant_edit_response.py
+++ b/src/cloudflare/types/images/v1/variant_edit_response.py
@@ -11,6 +11,8 @@
 
 
 class VariantOptions(BaseModel):
+    """Allows you to define image resizing sizes for different use cases."""
+
     fit: Literal["scale-down", "contain", "cover", "crop", "pad"]
     """
     The fit property describes how the width and height dimensions should be
diff --git a/src/cloudflare/types/images/v1/variant_get_response.py b/src/cloudflare/types/images/v1/variant_get_response.py
index add794835e3..af0b9c6e2e9 100644
--- a/src/cloudflare/types/images/v1/variant_get_response.py
+++ b/src/cloudflare/types/images/v1/variant_get_response.py
@@ -11,6 +11,8 @@
 
 
 class VariantOptions(BaseModel):
+    """Allows you to define image resizing sizes for different use cases."""
+
     fit: Literal["scale-down", "contain", "cover", "crop", "pad"]
     """
     The fit property describes how the width and height dimensions should be
diff --git a/src/cloudflare/types/images/v1_create_params.py b/src/cloudflare/types/images/v1_create_params.py
index ede7cddf3e8..87764baa3a7 100644
--- a/src/cloudflare/types/images/v1_create_params.py
+++ b/src/cloudflare/types/images/v1_create_params.py
@@ -4,6 +4,7 @@
 
 from typing_extensions import Required, Annotated, TypedDict
 
+from ..._types import FileTypes
 from ..._utils import PropertyInfo
 
 __all__ = ["V1CreateParams"]
@@ -13,7 +14,13 @@ class V1CreateParams(TypedDict, total=False):
     account_id: Required[str]
     """Account identifier tag."""
 
-    file: object
+    id: str
+    """An optional custom unique identifier for your image."""
+
+    creator: str
+    """Can set the creator field with an internal user ID."""
+
+    file: FileTypes
     """An image binary data. Only needed when type is uploading a file."""
 
     metadata: object
diff --git a/src/cloudflare/types/images/v1_delete_response.py b/src/cloudflare/types/images/v1_delete_response.py
index 1cd4c8aec50..0122c846f86 100644
--- a/src/cloudflare/types/images/v1_delete_response.py
+++ b/src/cloudflare/types/images/v1_delete_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Union
+from typing_extensions import TypeAlias
 
 __all__ = ["V1DeleteResponse"]
 
-V1DeleteResponse = Union[Optional[str], Optional[object]]
+V1DeleteResponse: TypeAlias = Union[str, object]
diff --git a/src/cloudflare/types/images/v1_edit_params.py b/src/cloudflare/types/images/v1_edit_params.py
index 5b77a97bd40..47b3f325861 100644
--- a/src/cloudflare/types/images/v1_edit_params.py
+++ b/src/cloudflare/types/images/v1_edit_params.py
@@ -13,6 +13,9 @@ class V1EditParams(TypedDict, total=False):
     account_id: Required[str]
     """Account identifier tag."""
 
+    creator: str
+    """Can set the creator field with an internal user ID."""
+
     metadata: object
     """User modifiable key-value store.
 
diff --git a/src/cloudflare/types/images/v1_list_params.py b/src/cloudflare/types/images/v1_list_params.py
index b77d95f1d8b..4e726436864 100644
--- a/src/cloudflare/types/images/v1_list_params.py
+++ b/src/cloudflare/types/images/v1_list_params.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from typing import Optional
 from typing_extensions import Required, TypedDict
 
 __all__ = ["V1ListParams"]
@@ -11,6 +12,12 @@ class V1ListParams(TypedDict, total=False):
     account_id: Required[str]
     """Account identifier tag."""
 
+    creator: Optional[str]
+    """Internal user ID set within the creator field.
+
+    Setting to empty string "" will return images where creator field is not set
+    """
+
     page: float
     """Page number of paginated results."""
 
diff --git a/src/cloudflare/types/images/v1_list_response.py b/src/cloudflare/types/images/v1_list_response.py
index 44974f29c14..45acf6106d2 100644
--- a/src/cloudflare/types/images/v1_list_response.py
+++ b/src/cloudflare/types/images/v1_list_response.py
@@ -1,25 +1,12 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from typing_extensions import Literal
 
 from .image import Image
 from ..._models import BaseModel
-from ..shared.response_info import ResponseInfo
 
-__all__ = ["V1ListResponse", "Result"]
-
-
-class Result(BaseModel):
-    images: Optional[List[Image]] = None
+__all__ = ["V1ListResponse"]
 
 
 class V1ListResponse(BaseModel):
-    errors: List[ResponseInfo]
-
-    messages: List[ResponseInfo]
-
-    result: Result
-
-    success: Literal[True]
-    """Whether the API call was successful"""
+    images: Optional[List[Image]] = None
diff --git a/src/cloudflare/types/images/v2/direct_upload_create_params.py b/src/cloudflare/types/images/v2/direct_upload_create_params.py
index 477b46c0e38..f4c7b7971b1 100644
--- a/src/cloudflare/types/images/v2/direct_upload_create_params.py
+++ b/src/cloudflare/types/images/v2/direct_upload_create_params.py
@@ -22,6 +22,9 @@ class DirectUploadCreateParams(TypedDict, total=False):
     Cannot start nor end with a / (forward slash). Cannot be a UUID.
     """
 
+    creator: str
+    """Can set the creator field with an internal user ID."""
+
     expiry: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
     """The date after which the upload will not be accepted.
 
diff --git a/src/cloudflare/types/images/v2_list_params.py b/src/cloudflare/types/images/v2_list_params.py
index 234d7442c86..05b6d34de6d 100644
--- a/src/cloudflare/types/images/v2_list_params.py
+++ b/src/cloudflare/types/images/v2_list_params.py
@@ -3,9 +3,11 @@
 from __future__ import annotations
 
 from typing import Optional
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Literal, Required, Annotated, TypedDict
 
-__all__ = ["V2ListParams"]
+from ..._utils import PropertyInfo
+
+__all__ = ["V2ListParams", "Meta"]
 
 
 class V2ListParams(TypedDict, total=False):
@@ -13,10 +15,39 @@ class V2ListParams(TypedDict, total=False):
     """Account identifier tag."""
 
     continuation_token: Optional[str]
-    """Continuation token for a next page. List images V2 returns continuation_token"""
+    """Continuation token to fetch next page.
+
+    Passed as a query param when requesting List V2 api endpoint.
+    """
+
+    creator: Optional[str]
+    """Internal user ID set within the creator field.
+
+    Setting to empty string "" will return images where creator field is not set
+    """
+
+    meta: Meta
 
     per_page: float
-    """Number of items per page."""
+    """Number of items per page"""
 
     sort_order: Literal["asc", "desc"]
-    """Sorting order by upload time."""
+    """Sorting order by upload time"""
+
+
+class Meta(TypedDict, total=False):
+    field_operator: Annotated[str, PropertyInfo(alias="<field>[<operator>]")]
+    """Optional metadata filter(s). Multiple filters can be combined with AND logic.
+
+    **Operators:**
+
+    - `eq`, `eq:string`, `eq:number`, `eq:boolean` - Exact match
+    - `in`, `in:string`, `in:number` - Match any value in pipe-separated list
+
+    **Examples:**
+
+    - `meta.status[eq]=active`
+    - `meta.priority[eq:number]=5`
+    - `meta.enabled[eq:boolean]=true`
+    - `meta.region[in]=us-east|us-west|eu-west`
+    """
diff --git a/src/cloudflare/types/intel/__init__.py b/src/cloudflare/types/intel/__init__.py
index 42260a14d9c..cdfcd12d90d 100644
--- a/src/cloudflare/types/intel/__init__.py
+++ b/src/cloudflare/types/intel/__init__.py
@@ -5,17 +5,14 @@
 from .ip import IP as IP
 from .dns import DNS as DNS
 from .domain import Domain as Domain
-from .ip_list import IPList as IPList
 from .sinkhole import Sinkhole as Sinkhole
 from .ip_get_params import IPGetParams as IPGetParams
 from .domain_history import DomainHistory as DomainHistory
 from .dns_list_params import DNSListParams as DNSListParams
 from .ip_get_response import IPGetResponse as IPGetResponse
 from .whois_get_params import WhoisGetParams as WhoisGetParams
-from .dns_list_response import DNSListResponse as DNSListResponse
 from .domain_get_params import DomainGetParams as DomainGetParams
 from .whois_get_response import WhoisGetResponse as WhoisGetResponse
-from .ip_list_get_response import IPListGetResponse as IPListGetResponse
 from .domain_history_get_params import DomainHistoryGetParams as DomainHistoryGetParams
 from .domain_history_get_response import DomainHistoryGetResponse as DomainHistoryGetResponse
 from .indicator_feed_get_response import IndicatorFeedGetResponse as IndicatorFeedGetResponse
diff --git a/src/cloudflare/types/intel/attack_surface_report/issue_class_params.py b/src/cloudflare/types/intel/attack_surface_report/issue_class_params.py
index c1491016c5c..dea6bc517db 100644
--- a/src/cloudflare/types/intel/attack_surface_report/issue_class_params.py
+++ b/src/cloudflare/types/intel/attack_surface_report/issue_class_params.py
@@ -5,6 +5,7 @@
 from typing import List
 from typing_extensions import Required, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 from .issue_type import IssueType
 from .severity_query_param import SeverityQueryParam
@@ -14,26 +15,26 @@
 
 class IssueClassParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     dismissed: bool
 
-    issue_class: List[str]
+    issue_class: SequenceNotStr[str]
 
-    issue_class_neq: Annotated[List[str], PropertyInfo(alias="issue_class~neq")]
+    issue_class_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="issue_class~neq")]
 
     issue_type: List[IssueType]
 
     issue_type_neq: Annotated[List[IssueType], PropertyInfo(alias="issue_type~neq")]
 
-    product: List[str]
+    product: SequenceNotStr[str]
 
-    product_neq: Annotated[List[str], PropertyInfo(alias="product~neq")]
+    product_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="product~neq")]
 
     severity: List[SeverityQueryParam]
 
     severity_neq: Annotated[List[SeverityQueryParam], PropertyInfo(alias="severity~neq")]
 
-    subject: List[str]
+    subject: SequenceNotStr[str]
 
-    subject_neq: Annotated[List[str], PropertyInfo(alias="subject~neq")]
+    subject_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="subject~neq")]
diff --git a/src/cloudflare/types/intel/attack_surface_report/issue_class_response.py b/src/cloudflare/types/intel/attack_surface_report/issue_class_response.py
index 3db1267f7d8..b21bd119eac 100644
--- a/src/cloudflare/types/intel/attack_surface_report/issue_class_response.py
+++ b/src/cloudflare/types/intel/attack_surface_report/issue_class_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
+from typing_extensions import TypeAlias
 
 from ...._models import BaseModel
 
@@ -13,4 +14,4 @@ class IssueClassResponseItem(BaseModel):
     value: Optional[str] = None
 
 
-IssueClassResponse = List[IssueClassResponseItem]
+IssueClassResponse: TypeAlias = List[IssueClassResponseItem]
diff --git a/src/cloudflare/types/intel/attack_surface_report/issue_dismiss_params.py b/src/cloudflare/types/intel/attack_surface_report/issue_dismiss_params.py
index b7083cfbb34..9e99366289a 100644
--- a/src/cloudflare/types/intel/attack_surface_report/issue_dismiss_params.py
+++ b/src/cloudflare/types/intel/attack_surface_report/issue_dismiss_params.py
@@ -9,6 +9,6 @@
 
 class IssueDismissParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     dismiss: bool
diff --git a/src/cloudflare/types/intel/attack_surface_report/issue_dismiss_response.py b/src/cloudflare/types/intel/attack_surface_report/issue_dismiss_response.py
index f693bbe9eee..cdd7afbd851 100644
--- a/src/cloudflare/types/intel/attack_surface_report/issue_dismiss_response.py
+++ b/src/cloudflare/types/intel/attack_surface_report/issue_dismiss_response.py
@@ -1,7 +1,45 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union
+from typing import List, Optional
+from typing_extensions import Literal
 
-__all__ = ["IssueDismissResponse"]
+from ...._models import BaseModel
 
-IssueDismissResponse = Union[str, object]
+__all__ = ["IssueDismissResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class IssueDismissResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/intel/attack_surface_report/issue_list_params.py b/src/cloudflare/types/intel/attack_surface_report/issue_list_params.py
index 99a5eba82cc..2966798f2b0 100644
--- a/src/cloudflare/types/intel/attack_surface_report/issue_list_params.py
+++ b/src/cloudflare/types/intel/attack_surface_report/issue_list_params.py
@@ -5,6 +5,7 @@
 from typing import List
 from typing_extensions import Required, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 from .issue_type import IssueType
 from .severity_query_param import SeverityQueryParam
@@ -14,32 +15,32 @@
 
 class IssueListParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     dismissed: bool
 
-    issue_class: List[str]
+    issue_class: SequenceNotStr[str]
 
-    issue_class_neq: Annotated[List[str], PropertyInfo(alias="issue_class~neq")]
+    issue_class_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="issue_class~neq")]
 
     issue_type: List[IssueType]
 
     issue_type_neq: Annotated[List[IssueType], PropertyInfo(alias="issue_type~neq")]
 
     page: int
-    """Current page within paginated list of results"""
+    """Specifies the current page within paginated list of results."""
 
     per_page: int
-    """Number of results per page of results"""
+    """Sets the number of results per page of results."""
 
-    product: List[str]
+    product: SequenceNotStr[str]
 
-    product_neq: Annotated[List[str], PropertyInfo(alias="product~neq")]
+    product_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="product~neq")]
 
     severity: List[SeverityQueryParam]
 
     severity_neq: Annotated[List[SeverityQueryParam], PropertyInfo(alias="severity~neq")]
 
-    subject: List[str]
+    subject: SequenceNotStr[str]
 
-    subject_neq: Annotated[List[str], PropertyInfo(alias="subject~neq")]
+    subject_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="subject~neq")]
diff --git a/src/cloudflare/types/intel/attack_surface_report/issue_list_response.py b/src/cloudflare/types/intel/attack_surface_report/issue_list_response.py
index dfdd7cf43f4..74e30ccdc12 100644
--- a/src/cloudflare/types/intel/attack_surface_report/issue_list_response.py
+++ b/src/cloudflare/types/intel/attack_surface_report/issue_list_response.py
@@ -6,12 +6,18 @@
 
 from ...._models import BaseModel
 from .issue_type import IssueType
-from ...shared.response_info import ResponseInfo
 
-__all__ = ["IssueListResponse", "Result", "ResultIssue"]
+__all__ = ["IssueListResponse", "Issue", "IssuePayload"]
 
 
-class ResultIssue(BaseModel):
+class IssuePayload(BaseModel):
+    detection_method: Optional[str] = None
+    """Describes the method used to detect insight."""
+
+    zone_tag: Optional[str] = None
+
+
+class Issue(BaseModel):
     id: Optional[str] = None
 
     dismissed: Optional[bool] = None
@@ -20,7 +26,7 @@ class ResultIssue(BaseModel):
 
     issue_type: Optional[IssueType] = None
 
-    payload: Optional[object] = None
+    payload: Optional[IssuePayload] = None
 
     resolve_link: Optional[str] = None
 
@@ -35,25 +41,14 @@ class ResultIssue(BaseModel):
     timestamp: Optional[datetime] = None
 
 
-class Result(BaseModel):
+class IssueListResponse(BaseModel):
     count: Optional[int] = None
-    """Total number of results"""
+    """Indicates the total number of results."""
 
-    issues: Optional[List[ResultIssue]] = None
+    issues: Optional[List[Issue]] = None
 
     page: Optional[int] = None
-    """Current page within paginated list of results"""
+    """Specifies the current page within paginated list of results."""
 
     per_page: Optional[int] = None
-    """Number of results per page of results"""
-
-
-class IssueListResponse(BaseModel):
-    errors: List[ResponseInfo]
-
-    messages: List[ResponseInfo]
-
-    success: Literal[True]
-    """Whether the API call was successful"""
-
-    result: Optional[Result] = None
+    """Sets the number of results per page of results."""
diff --git a/src/cloudflare/types/intel/attack_surface_report/issue_severity_params.py b/src/cloudflare/types/intel/attack_surface_report/issue_severity_params.py
index bb92b4f2777..be70edbc260 100644
--- a/src/cloudflare/types/intel/attack_surface_report/issue_severity_params.py
+++ b/src/cloudflare/types/intel/attack_surface_report/issue_severity_params.py
@@ -5,6 +5,7 @@
 from typing import List
 from typing_extensions import Required, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 from .issue_type import IssueType
 from .severity_query_param import SeverityQueryParam
@@ -14,26 +15,26 @@
 
 class IssueSeverityParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     dismissed: bool
 
-    issue_class: List[str]
+    issue_class: SequenceNotStr[str]
 
-    issue_class_neq: Annotated[List[str], PropertyInfo(alias="issue_class~neq")]
+    issue_class_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="issue_class~neq")]
 
     issue_type: List[IssueType]
 
     issue_type_neq: Annotated[List[IssueType], PropertyInfo(alias="issue_type~neq")]
 
-    product: List[str]
+    product: SequenceNotStr[str]
 
-    product_neq: Annotated[List[str], PropertyInfo(alias="product~neq")]
+    product_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="product~neq")]
 
     severity: List[SeverityQueryParam]
 
     severity_neq: Annotated[List[SeverityQueryParam], PropertyInfo(alias="severity~neq")]
 
-    subject: List[str]
+    subject: SequenceNotStr[str]
 
-    subject_neq: Annotated[List[str], PropertyInfo(alias="subject~neq")]
+    subject_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="subject~neq")]
diff --git a/src/cloudflare/types/intel/attack_surface_report/issue_severity_response.py b/src/cloudflare/types/intel/attack_surface_report/issue_severity_response.py
index 9af2b3c6de2..13c5ba4d10f 100644
--- a/src/cloudflare/types/intel/attack_surface_report/issue_severity_response.py
+++ b/src/cloudflare/types/intel/attack_surface_report/issue_severity_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
+from typing_extensions import TypeAlias
 
 from ...._models import BaseModel
 
@@ -13,4 +14,4 @@ class IssueSeverityResponseItem(BaseModel):
     value: Optional[str] = None
 
 
-IssueSeverityResponse = List[IssueSeverityResponseItem]
+IssueSeverityResponse: TypeAlias = List[IssueSeverityResponseItem]
diff --git a/src/cloudflare/types/intel/attack_surface_report/issue_type.py b/src/cloudflare/types/intel/attack_surface_report/issue_type.py
index 72d55104624..0682effcde8 100644
--- a/src/cloudflare/types/intel/attack_surface_report/issue_type.py
+++ b/src/cloudflare/types/intel/attack_surface_report/issue_type.py
@@ -1,9 +1,14 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["IssueType"]
 
-IssueType = Literal[
-    "compliance_violation", "email_security", "exposed_infrastructure", "insecure_configuration", "weak_authentication"
+IssueType: TypeAlias = Literal[
+    "compliance_violation",
+    "email_security",
+    "exposed_infrastructure",
+    "insecure_configuration",
+    "weak_authentication",
+    "configuration_suggestion",
 ]
diff --git a/src/cloudflare/types/intel/attack_surface_report/issue_type_get_response.py b/src/cloudflare/types/intel/attack_surface_report/issue_type_get_response.py
index 05763fdfe46..06ab82a0706 100644
--- a/src/cloudflare/types/intel/attack_surface_report/issue_type_get_response.py
+++ b/src/cloudflare/types/intel/attack_surface_report/issue_type_get_response.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing_extensions import TypeAlias
 
 __all__ = ["IssueTypeGetResponse"]
 
-IssueTypeGetResponse = List[str]
+IssueTypeGetResponse: TypeAlias = str
diff --git a/src/cloudflare/types/intel/attack_surface_report/issue_type_params.py b/src/cloudflare/types/intel/attack_surface_report/issue_type_params.py
index 9f3b934bee5..25cd8bde53f 100644
--- a/src/cloudflare/types/intel/attack_surface_report/issue_type_params.py
+++ b/src/cloudflare/types/intel/attack_surface_report/issue_type_params.py
@@ -5,6 +5,7 @@
 from typing import List
 from typing_extensions import Required, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 from .issue_type import IssueType
 from .severity_query_param import SeverityQueryParam
@@ -14,26 +15,26 @@
 
 class IssueTypeParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     dismissed: bool
 
-    issue_class: List[str]
+    issue_class: SequenceNotStr[str]
 
-    issue_class_neq: Annotated[List[str], PropertyInfo(alias="issue_class~neq")]
+    issue_class_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="issue_class~neq")]
 
     issue_type: List[IssueType]
 
     issue_type_neq: Annotated[List[IssueType], PropertyInfo(alias="issue_type~neq")]
 
-    product: List[str]
+    product: SequenceNotStr[str]
 
-    product_neq: Annotated[List[str], PropertyInfo(alias="product~neq")]
+    product_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="product~neq")]
 
     severity: List[SeverityQueryParam]
 
     severity_neq: Annotated[List[SeverityQueryParam], PropertyInfo(alias="severity~neq")]
 
-    subject: List[str]
+    subject: SequenceNotStr[str]
 
-    subject_neq: Annotated[List[str], PropertyInfo(alias="subject~neq")]
+    subject_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="subject~neq")]
diff --git a/src/cloudflare/types/intel/attack_surface_report/issue_type_response.py b/src/cloudflare/types/intel/attack_surface_report/issue_type_response.py
index d371af77230..d0b4abfc605 100644
--- a/src/cloudflare/types/intel/attack_surface_report/issue_type_response.py
+++ b/src/cloudflare/types/intel/attack_surface_report/issue_type_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
+from typing_extensions import TypeAlias
 
 from ...._models import BaseModel
 
@@ -13,4 +14,4 @@ class IssueTypeResponseItem(BaseModel):
     value: Optional[str] = None
 
 
-IssueTypeResponse = List[IssueTypeResponseItem]
+IssueTypeResponse: TypeAlias = List[IssueTypeResponseItem]
diff --git a/src/cloudflare/types/intel/attack_surface_report/severity_query_param.py b/src/cloudflare/types/intel/attack_surface_report/severity_query_param.py
index cd208c07b4b..61493c872db 100644
--- a/src/cloudflare/types/intel/attack_surface_report/severity_query_param.py
+++ b/src/cloudflare/types/intel/attack_surface_report/severity_query_param.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["SeverityQueryParam"]
 
-SeverityQueryParam = Literal["low", "moderate", "critical"]
+SeverityQueryParam: TypeAlias = Literal["low", "moderate", "critical"]
diff --git a/src/cloudflare/types/intel/dns.py b/src/cloudflare/types/intel/dns.py
index 66f00d109dd..c2745d795e5 100644
--- a/src/cloudflare/types/intel/dns.py
+++ b/src/cloudflare/types/intel/dns.py
@@ -12,7 +12,7 @@ class ReverseRecord(BaseModel):
     first_seen: Optional[date] = None
     """First seen date of the DNS record during the time period."""
 
-    hostname: Optional[object] = None
+    hostname: Optional[str] = None
     """Hostname that the IP was observed resolving to."""
 
     last_seen: Optional[date] = None
diff --git a/src/cloudflare/types/intel/dns_list_params.py b/src/cloudflare/types/intel/dns_list_params.py
index 1937591d655..0d040386777 100644
--- a/src/cloudflare/types/intel/dns_list_params.py
+++ b/src/cloudflare/types/intel/dns_list_params.py
@@ -13,7 +13,7 @@
 
 class DNSListParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     ipv4: str
 
diff --git a/src/cloudflare/types/intel/dns_list_response.py b/src/cloudflare/types/intel/dns_list_response.py
deleted file mode 100644
index b17d1940c3f..00000000000
--- a/src/cloudflare/types/intel/dns_list_response.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from typing_extensions import Literal
-
-from .dns import DNS
-from ..._models import BaseModel
-from ..shared.response_info import ResponseInfo
-
-__all__ = ["DNSListResponse"]
-
-
-class DNSListResponse(BaseModel):
-    errors: List[ResponseInfo]
-
-    messages: List[ResponseInfo]
-
-    success: Literal[True]
-    """Whether the API call was successful"""
-
-    result: Optional[DNS] = None
diff --git a/src/cloudflare/types/intel/domain.py b/src/cloudflare/types/intel/domain.py
index 843c1adf8f9..bf952e2148b 100644
--- a/src/cloudflare/types/intel/domain.py
+++ b/src/cloudflare/types/intel/domain.py
@@ -8,23 +8,39 @@
     "Domain",
     "AdditionalInformation",
     "Application",
+    "ContentCategory",
     "InheritedContentCategory",
     "InheritedRiskType",
     "ResolvesToRef",
+    "RiskType",
 ]
 
 
 class AdditionalInformation(BaseModel):
+    """Additional information related to the host name."""
+
     suspected_malware_family: Optional[str] = None
     """Suspected DGA malware family."""
 
 
 class Application(BaseModel):
+    """Application that the hostname belongs to."""
+
     id: Optional[int] = None
 
     name: Optional[str] = None
 
 
+class ContentCategory(BaseModel):
+    """Current content categories."""
+
+    id: Optional[int] = None
+
+    name: Optional[str] = None
+
+    super_category_id: Optional[int] = None
+
+
 class InheritedContentCategory(BaseModel):
     id: Optional[int] = None
 
@@ -45,13 +61,21 @@ class ResolvesToRef(BaseModel):
     id: Optional[str] = None
     """
     STIX 2.1 identifier:
-    https://docs.oasis-open.org/cti/stix/v2.1/cs02/stix-v2.1-cs02.html#_64yvzeku5a5c
+    https://docs.oasis-open.org/cti/stix/v2.1/cs02/stix-v2.1-cs02.html#_64yvzeku5a5c.
     """
 
     value: Optional[str] = None
     """IP address or domain name."""
 
 
+class RiskType(BaseModel):
+    id: Optional[int] = None
+
+    name: Optional[str] = None
+
+    super_category_id: Optional[int] = None
+
+
 class Domain(BaseModel):
     additional_information: Optional[AdditionalInformation] = None
     """Additional information related to the host name."""
@@ -59,8 +83,7 @@ class Domain(BaseModel):
     application: Optional[Application] = None
     """Application that the hostname belongs to."""
 
-    content_categories: Optional[List[object]] = None
-    """Current content categories."""
+    content_categories: Optional[List[ContentCategory]] = None
 
     domain: Optional[str] = None
 
@@ -92,4 +115,4 @@ class Domain(BaseModel):
     risk).
     """
 
-    risk_types: Optional[List[object]] = None
+    risk_types: Optional[List[RiskType]] = None
diff --git a/src/cloudflare/types/intel/domain_get_params.py b/src/cloudflare/types/intel/domain_get_params.py
index 8fb2353acb8..a04d1eb592f 100644
--- a/src/cloudflare/types/intel/domain_get_params.py
+++ b/src/cloudflare/types/intel/domain_get_params.py
@@ -9,6 +9,6 @@
 
 class DomainGetParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     domain: str
diff --git a/src/cloudflare/types/intel/domain_history.py b/src/cloudflare/types/intel/domain_history.py
index a490b4770ff..8a452f21cb4 100644
--- a/src/cloudflare/types/intel/domain_history.py
+++ b/src/cloudflare/types/intel/domain_history.py
@@ -5,11 +5,17 @@
 
 from ..._models import BaseModel
 
-__all__ = ["DomainHistory", "Categorization"]
+__all__ = ["DomainHistory", "Categorization", "CategorizationCategory"]
+
+
+class CategorizationCategory(BaseModel):
+    id: Optional[int] = None
+
+    name: Optional[str] = None
 
 
 class Categorization(BaseModel):
-    categories: Optional[List[object]] = None
+    categories: Optional[List[CategorizationCategory]] = None
 
     end: Optional[date] = None
 
diff --git a/src/cloudflare/types/intel/domain_history_get_params.py b/src/cloudflare/types/intel/domain_history_get_params.py
index 004e88064a9..a4715231d50 100644
--- a/src/cloudflare/types/intel/domain_history_get_params.py
+++ b/src/cloudflare/types/intel/domain_history_get_params.py
@@ -9,6 +9,6 @@
 
 class DomainHistoryGetParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     domain: str
diff --git a/src/cloudflare/types/intel/domain_history_get_response.py b/src/cloudflare/types/intel/domain_history_get_response.py
index e3b3c3bd1b3..573fd80a6ec 100644
--- a/src/cloudflare/types/intel/domain_history_get_response.py
+++ b/src/cloudflare/types/intel/domain_history_get_response.py
@@ -1,9 +1,10 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from typing_extensions import TypeAlias
 
 from .domain_history import DomainHistory
 
 __all__ = ["DomainHistoryGetResponse"]
 
-DomainHistoryGetResponse = List[DomainHistory]
+DomainHistoryGetResponse: TypeAlias = List[DomainHistory]
diff --git a/src/cloudflare/types/intel/domains/bulk_get_params.py b/src/cloudflare/types/intel/domains/bulk_get_params.py
index 8aad8c0a607..5fd9ed9f983 100644
--- a/src/cloudflare/types/intel/domains/bulk_get_params.py
+++ b/src/cloudflare/types/intel/domains/bulk_get_params.py
@@ -4,12 +4,14 @@
 
 from typing_extensions import Required, TypedDict
 
+from ...._types import SequenceNotStr
+
 __all__ = ["BulkGetParams"]
 
 
 class BulkGetParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    domain: object
-    """Accepts multiple values, i.e. `?domain=cloudflare.com&domain=example.com`."""
+    domain: SequenceNotStr[str]
+    """Accepts multiple values like `?domain=cloudflare.com&domain=example.com`."""
diff --git a/src/cloudflare/types/intel/domains/bulk_get_response.py b/src/cloudflare/types/intel/domains/bulk_get_response.py
index b3c71233e00..9b96b53638b 100644
--- a/src/cloudflare/types/intel/domains/bulk_get_response.py
+++ b/src/cloudflare/types/intel/domains/bulk_get_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
+from typing_extensions import TypeAlias
 
 from ...._models import BaseModel
 
@@ -9,22 +10,38 @@
     "BulkGetResponseItem",
     "BulkGetResponseItemAdditionalInformation",
     "BulkGetResponseItemApplication",
+    "BulkGetResponseItemContentCategory",
     "BulkGetResponseItemInheritedContentCategory",
     "BulkGetResponseItemInheritedRiskType",
+    "BulkGetResponseItemRiskType",
 ]
 
 
 class BulkGetResponseItemAdditionalInformation(BaseModel):
+    """Additional information related to the host name."""
+
     suspected_malware_family: Optional[str] = None
     """Suspected DGA malware family."""
 
 
 class BulkGetResponseItemApplication(BaseModel):
+    """Application that the hostname belongs to."""
+
     id: Optional[int] = None
 
     name: Optional[str] = None
 
 
+class BulkGetResponseItemContentCategory(BaseModel):
+    """Current content categories."""
+
+    id: Optional[int] = None
+
+    name: Optional[str] = None
+
+    super_category_id: Optional[int] = None
+
+
 class BulkGetResponseItemInheritedContentCategory(BaseModel):
     id: Optional[int] = None
 
@@ -41,6 +58,14 @@ class BulkGetResponseItemInheritedRiskType(BaseModel):
     super_category_id: Optional[int] = None
 
 
+class BulkGetResponseItemRiskType(BaseModel):
+    id: Optional[int] = None
+
+    name: Optional[str] = None
+
+    super_category_id: Optional[int] = None
+
+
 class BulkGetResponseItem(BaseModel):
     additional_information: Optional[BulkGetResponseItemAdditionalInformation] = None
     """Additional information related to the host name."""
@@ -48,8 +73,7 @@ class BulkGetResponseItem(BaseModel):
     application: Optional[BulkGetResponseItemApplication] = None
     """Application that the hostname belongs to."""
 
-    content_categories: Optional[List[object]] = None
-    """Current content categories."""
+    content_categories: Optional[List[BulkGetResponseItemContentCategory]] = None
 
     domain: Optional[str] = None
 
@@ -75,7 +99,7 @@ class BulkGetResponseItem(BaseModel):
     risk).
     """
 
-    risk_types: Optional[List[object]] = None
+    risk_types: Optional[List[BulkGetResponseItemRiskType]] = None
 
 
-BulkGetResponse = List[BulkGetResponseItem]
+BulkGetResponse: TypeAlias = List[BulkGetResponseItem]
diff --git a/src/cloudflare/types/intel/indicator_feed_create_response.py b/src/cloudflare/types/intel/indicator_feed_create_response.py
index 3f6e80b940d..26e2ab0fff4 100644
--- a/src/cloudflare/types/intel/indicator_feed_create_response.py
+++ b/src/cloudflare/types/intel/indicator_feed_create_response.py
@@ -21,6 +21,9 @@ class IndicatorFeedCreateResponse(BaseModel):
     is_attributable: Optional[bool] = None
     """Whether the indicator feed can be attributed to a provider"""
 
+    is_downloadable: Optional[bool] = None
+    """Whether the indicator feed can be downloaded"""
+
     is_public: Optional[bool] = None
     """Whether the indicator feed is exposed to customers"""
 
diff --git a/src/cloudflare/types/intel/indicator_feed_data_response.py b/src/cloudflare/types/intel/indicator_feed_data_response.py
index 77bcbf2f3a7..c7b0cda059a 100644
--- a/src/cloudflare/types/intel/indicator_feed_data_response.py
+++ b/src/cloudflare/types/intel/indicator_feed_data_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["IndicatorFeedDataResponse"]
 
-IndicatorFeedDataResponse = str
+IndicatorFeedDataResponse: TypeAlias = str
diff --git a/src/cloudflare/types/intel/indicator_feed_get_response.py b/src/cloudflare/types/intel/indicator_feed_get_response.py
index 2ba6e9a1cfa..6373b835d80 100644
--- a/src/cloudflare/types/intel/indicator_feed_get_response.py
+++ b/src/cloudflare/types/intel/indicator_feed_get_response.py
@@ -22,12 +22,15 @@ class IndicatorFeedGetResponse(BaseModel):
     is_attributable: Optional[bool] = None
     """Whether the indicator feed can be attributed to a provider"""
 
+    is_downloadable: Optional[bool] = None
+    """Whether the indicator feed can be downloaded"""
+
     is_public: Optional[bool] = None
     """Whether the indicator feed is exposed to customers"""
 
-    latest_upload_status: Optional[
-        Literal["Mirroring", "Unifying", "Loading", "Provisioning", "Complete", "Error"]
-    ] = None
+    latest_upload_status: Optional[Literal["Mirroring", "Unifying", "Loading", "Provisioning", "Complete", "Error"]] = (
+        None
+    )
     """Status of the latest snapshot uploaded"""
 
     modified_on: Optional[datetime] = None
diff --git a/src/cloudflare/types/intel/indicator_feed_list_response.py b/src/cloudflare/types/intel/indicator_feed_list_response.py
index 9358f20f981..017258ed619 100644
--- a/src/cloudflare/types/intel/indicator_feed_list_response.py
+++ b/src/cloudflare/types/intel/indicator_feed_list_response.py
@@ -21,6 +21,9 @@ class IndicatorFeedListResponse(BaseModel):
     is_attributable: Optional[bool] = None
     """Whether the indicator feed can be attributed to a provider"""
 
+    is_downloadable: Optional[bool] = None
+    """Whether the indicator feed can be downloaded"""
+
     is_public: Optional[bool] = None
     """Whether the indicator feed is exposed to customers"""
 
diff --git a/src/cloudflare/types/intel/indicator_feed_update_params.py b/src/cloudflare/types/intel/indicator_feed_update_params.py
index 0d1eeb4f5da..8709cabc628 100644
--- a/src/cloudflare/types/intel/indicator_feed_update_params.py
+++ b/src/cloudflare/types/intel/indicator_feed_update_params.py
@@ -17,6 +17,9 @@ class IndicatorFeedUpdateParams(TypedDict, total=False):
     is_attributable: bool
     """The new is_attributable value of the feed"""
 
+    is_downloadable: bool
+    """The new is_downloadable value of the feed"""
+
     is_public: bool
     """The new is_public value of the feed"""
 
diff --git a/src/cloudflare/types/intel/indicator_feed_update_response.py b/src/cloudflare/types/intel/indicator_feed_update_response.py
index 9cc5828a4e1..e85e4173343 100644
--- a/src/cloudflare/types/intel/indicator_feed_update_response.py
+++ b/src/cloudflare/types/intel/indicator_feed_update_response.py
@@ -21,6 +21,9 @@ class IndicatorFeedUpdateResponse(BaseModel):
     is_attributable: Optional[bool] = None
     """Whether the indicator feed can be attributed to a provider"""
 
+    is_downloadable: Optional[bool] = None
+    """Whether the indicator feed can be downloaded"""
+
     is_public: Optional[bool] = None
     """Whether the indicator feed is exposed to customers"""
 
diff --git a/src/cloudflare/types/intel/indicator_feeds/permission_list_response.py b/src/cloudflare/types/intel/indicator_feeds/permission_list_response.py
index 141ef2696f2..eb42f44795a 100644
--- a/src/cloudflare/types/intel/indicator_feeds/permission_list_response.py
+++ b/src/cloudflare/types/intel/indicator_feeds/permission_list_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
+from typing_extensions import TypeAlias
 
 from ...._models import BaseModel
 
@@ -17,6 +18,9 @@ class PermissionListResponseItem(BaseModel):
     is_attributable: Optional[bool] = None
     """Whether the indicator feed can be attributed to a provider"""
 
+    is_downloadable: Optional[bool] = None
+    """Whether the indicator feed can be downloaded"""
+
     is_public: Optional[bool] = None
     """Whether the indicator feed is exposed to customers"""
 
@@ -24,4 +28,4 @@ class PermissionListResponseItem(BaseModel):
     """The name of the indicator feed"""
 
 
-PermissionListResponse = List[PermissionListResponseItem]
+PermissionListResponse: TypeAlias = List[PermissionListResponseItem]
diff --git a/src/cloudflare/types/intel/ip.py b/src/cloudflare/types/intel/ip.py
index ae1ebd501ab..d312ede6696 100644
--- a/src/cloudflare/types/intel/ip.py
+++ b/src/cloudflare/types/intel/ip.py
@@ -1,14 +1,18 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Union, Optional
+from typing import List, Optional
 from typing_extensions import Literal
 
 from ..._models import BaseModel
 
-__all__ = ["IP", "BelongsToRef"]
+__all__ = ["IP", "BelongsToRef", "RiskType"]
 
 
 class BelongsToRef(BaseModel):
+    """
+    Specifies a reference to the autonomous systems (AS) that the IP address belongs to.
+    """
+
     id: Optional[str] = None
 
     country: Optional[str] = None
@@ -21,6 +25,14 @@ class BelongsToRef(BaseModel):
     value: Optional[str] = None
 
 
+class RiskType(BaseModel):
+    id: Optional[float] = None
+
+    name: Optional[str] = None
+
+    super_category_id: Optional[float] = None
+
+
 class IP(BaseModel):
     belongs_to_ref: Optional[BelongsToRef] = None
     """
@@ -28,6 +40,6 @@ class IP(BaseModel):
     to.
     """
 
-    ip: Union[str, str, None] = None
+    ip: Optional[str] = None
 
-    risk_types: Optional[List[object]] = None
+    risk_types: Optional[List[RiskType]] = None
diff --git a/src/cloudflare/types/intel/ip_get_params.py b/src/cloudflare/types/intel/ip_get_params.py
index de6ad728a1a..ac4b4ee5f88 100644
--- a/src/cloudflare/types/intel/ip_get_params.py
+++ b/src/cloudflare/types/intel/ip_get_params.py
@@ -9,7 +9,7 @@
 
 class IPGetParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     ipv4: str
 
diff --git a/src/cloudflare/types/intel/ip_get_response.py b/src/cloudflare/types/intel/ip_get_response.py
index 74a42e28125..13e505272a0 100644
--- a/src/cloudflare/types/intel/ip_get_response.py
+++ b/src/cloudflare/types/intel/ip_get_response.py
@@ -1,9 +1,10 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from typing_extensions import TypeAlias
 
 from .ip import IP
 
 __all__ = ["IPGetResponse"]
 
-IPGetResponse = List[IP]
+IPGetResponse: TypeAlias = List[IP]
diff --git a/src/cloudflare/types/intel/ip_list.py b/src/cloudflare/types/intel/ip_list.py
deleted file mode 100644
index 2eccd1107b0..00000000000
--- a/src/cloudflare/types/intel/ip_list.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ..._models import BaseModel
-
-__all__ = ["IPList"]
-
-
-class IPList(BaseModel):
-    id: Optional[int] = None
-
-    description: Optional[str] = None
-
-    name: Optional[str] = None
diff --git a/src/cloudflare/types/intel/ip_list_get_response.py b/src/cloudflare/types/intel/ip_list_get_response.py
deleted file mode 100644
index f87a5210833..00000000000
--- a/src/cloudflare/types/intel/ip_list_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .ip_list import IPList
-
-__all__ = ["IPListGetResponse"]
-
-IPListGetResponse = List[IPList]
diff --git a/src/cloudflare/types/intel/miscategorization_create_params.py b/src/cloudflare/types/intel/miscategorization_create_params.py
index ca19cf201b5..3be6db1feeb 100644
--- a/src/cloudflare/types/intel/miscategorization_create_params.py
+++ b/src/cloudflare/types/intel/miscategorization_create_params.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Iterable
+from typing import Iterable, Optional
 from typing_extensions import Literal, Required, TypedDict
 
 __all__ = ["MiscategorizationCreateParams"]
@@ -10,23 +10,23 @@
 
 class MiscategorizationCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    content_adds: Iterable[float]
+    content_adds: Iterable[int]
     """Content category IDs to add."""
 
-    content_removes: Iterable[float]
+    content_removes: Iterable[int]
     """Content category IDs to remove."""
 
     indicator_type: Literal["domain", "ipv4", "ipv6", "url"]
 
-    ip: object
+    ip: Optional[str]
     """Provide only if indicator_type is `ipv4` or `ipv6`."""
 
-    security_adds: Iterable[float]
+    security_adds: Iterable[int]
     """Security category IDs to add."""
 
-    security_removes: Iterable[float]
+    security_removes: Iterable[int]
     """Security category IDs to remove."""
 
     url: str
diff --git a/src/cloudflare/types/intel/miscategorization_create_response.py b/src/cloudflare/types/intel/miscategorization_create_response.py
index 07185dc54c7..686dbaacf1f 100644
--- a/src/cloudflare/types/intel/miscategorization_create_response.py
+++ b/src/cloudflare/types/intel/miscategorization_create_response.py
@@ -1,7 +1,45 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union
+from typing import List, Optional
+from typing_extensions import Literal
 
-__all__ = ["MiscategorizationCreateResponse"]
+from ..._models import BaseModel
 
-MiscategorizationCreateResponse = Union[str, object]
+__all__ = ["MiscategorizationCreateResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class MiscategorizationCreateResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/intel/whois_get_params.py b/src/cloudflare/types/intel/whois_get_params.py
index d4069d2a7a0..6bcf3ee91d0 100644
--- a/src/cloudflare/types/intel/whois_get_params.py
+++ b/src/cloudflare/types/intel/whois_get_params.py
@@ -9,6 +9,6 @@
 
 class WhoisGetParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Use to uniquely identify or reference the resource."""
 
     domain: str
diff --git a/src/cloudflare/types/intel/whois_get_response.py b/src/cloudflare/types/intel/whois_get_response.py
index 4856a756a9c..660a6877518 100644
--- a/src/cloudflare/types/intel/whois_get_response.py
+++ b/src/cloudflare/types/intel/whois_get_response.py
@@ -9,6 +9,8 @@
 
 
 class WhoisGetResponse(BaseModel):
+    dnssec: bool
+
     domain: str
 
     extension: str
@@ -85,8 +87,6 @@ class WhoisGetResponse(BaseModel):
 
     created_date_raw: Optional[str] = None
 
-    dnssec: Optional[bool] = None
-
     expiration_date: Optional[datetime] = None
 
     expiration_date_raw: Optional[str] = None
diff --git a/src/cloudflare/types/ips/__init__.py b/src/cloudflare/types/ips/__init__.py
index 4b563930dab..785aaadcdb2 100644
--- a/src/cloudflare/types/ips/__init__.py
+++ b/src/cloudflare/types/ips/__init__.py
@@ -3,6 +3,5 @@
 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/ips/ip_list_response.py b/src/cloudflare/types/ips/ip_list_response.py
index eed5e1950ec..cb8d088bdd7 100644
--- a/src/cloudflare/types/ips/ip_list_response.py
+++ b/src/cloudflare/types/ips/ip_list_response.py
@@ -1,10 +1,36 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union
+from typing import List, Union, Optional
+from typing_extensions import TypeAlias
 
-from .ips import IPs
-from .jdcloud_ips import JDCloudIPs
+from ..._models import BaseModel
 
-__all__ = ["IPListResponse"]
+__all__ = ["IPListResponse", "PublicIPIPs", "PublicIPIPsJDCloud"]
 
-IPListResponse = Union[IPs, JDCloudIPs]
+
+class PublicIPIPs(BaseModel):
+    etag: Optional[str] = None
+    """A digest of the IP data. Useful for determining if the data has changed."""
+
+    ipv4_cidrs: Optional[List[str]] = None
+    """List of Cloudflare IPv4 CIDR addresses."""
+
+    ipv6_cidrs: Optional[List[str]] = None
+    """List of Cloudflare IPv6 CIDR addresses."""
+
+
+class PublicIPIPsJDCloud(BaseModel):
+    etag: Optional[str] = None
+    """A digest of the IP data. Useful for determining if the data has changed."""
+
+    ipv4_cidrs: Optional[List[str]] = None
+    """List of Cloudflare IPv4 CIDR addresses."""
+
+    ipv6_cidrs: Optional[List[str]] = None
+    """List of Cloudflare IPv6 CIDR addresses."""
+
+    jdcloud_cidrs: Optional[List[str]] = None
+    """List IPv4 and IPv6 CIDRs, only populated if `?networks=jdcloud` is used."""
+
+
+IPListResponse: TypeAlias = Union[PublicIPIPs, PublicIPIPsJDCloud]
diff --git a/src/cloudflare/types/ips/ips.py b/src/cloudflare/types/ips/ips.py
index 176e4c0db8a..ec535d669a4 100644
--- a/src/cloudflare/types/ips/ips.py
+++ b/src/cloudflare/types/ips/ips.py
@@ -1,18 +1,19 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
+from datetime import datetime
+from typing_extensions import TypeAlias
 
 from ..._models import BaseModel
 
-__all__ = ["IPs"]
+__all__ = ["IPs", "IPItem"]
 
 
-class IPs(BaseModel):
-    etag: Optional[str] = None
-    """A digest of the IP data. Useful for determining if the data has changed."""
+class IPItem(BaseModel):
+    created_at: Optional[datetime] = None
 
-    ipv4_cidrs: Optional[List[str]] = None
-    """List of Cloudflare IPv4 CIDR addresses."""
+    ip: Optional[str] = None
+    """An IPv4 or IPv6 address."""
 
-    ipv6_cidrs: Optional[List[str]] = None
-    """List of Cloudflare IPv6 CIDR addresses."""
+
+IPs: TypeAlias = List[IPItem]
diff --git a/src/cloudflare/types/ips/jdcloud_ips.py b/src/cloudflare/types/ips/jdcloud_ips.py
deleted file mode 100644
index d09b6d10a60..00000000000
--- a/src/cloudflare/types/ips/jdcloud_ips.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from ..._models import BaseModel
-
-__all__ = ["JDCloudIPs"]
-
-
-class JDCloudIPs(BaseModel):
-    etag: Optional[str] = None
-    """A digest of the IP data. Useful for determining if the data has changed."""
-
-    ipv4_cidrs: Optional[List[str]] = None
-    """List of Cloudflare IPv4 CIDR addresses."""
-
-    ipv6_cidrs: Optional[List[str]] = None
-    """List of Cloudflare IPv6 CIDR addresses."""
-
-    jdcloud_cidrs: Optional[List[str]] = None
-    """List IPv4 and IPv6 CIDRs, only populated if `?networks=jdcloud` is used."""
diff --git a/src/cloudflare/types/keyless_certificates/keyless_certificate.py b/src/cloudflare/types/keyless_certificates/keyless_certificate.py
index 12075f47715..3f9b40440a9 100644
--- a/src/cloudflare/types/keyless_certificates/keyless_certificate.py
+++ b/src/cloudflare/types/keyless_certificates/keyless_certificate.py
@@ -29,7 +29,7 @@ class KeylessCertificate(BaseModel):
     name: str
     """The keyless SSL name."""
 
-    permissions: List[object]
+    permissions: List[str]
     """
     Available permissions for the Keyless SSL for the current user requesting the
     item.
diff --git a/src/cloudflare/types/keyless_certificates/keyless_certificate_create_params.py b/src/cloudflare/types/keyless_certificates/keyless_certificate_create_params.py
index eb5ac3a6285..77056c21b7d 100644
--- a/src/cloudflare/types/keyless_certificates/keyless_certificate_create_params.py
+++ b/src/cloudflare/types/keyless_certificates/keyless_certificate_create_params.py
@@ -12,7 +12,7 @@
 
 class KeylessCertificateCreateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     certificate: Required[str]
     """The zone's SSL certificate or SSL certificate and intermediate(s)."""
diff --git a/src/cloudflare/types/keyless_certificates/keyless_certificate_delete_response.py b/src/cloudflare/types/keyless_certificates/keyless_certificate_delete_response.py
index 9544ffc0d28..f242c5bfa2b 100644
--- a/src/cloudflare/types/keyless_certificates/keyless_certificate_delete_response.py
+++ b/src/cloudflare/types/keyless_certificates/keyless_certificate_delete_response.py
@@ -9,4 +9,4 @@
 
 class KeylessCertificateDeleteResponse(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
diff --git a/src/cloudflare/types/keyless_certificates/keyless_certificate_edit_params.py b/src/cloudflare/types/keyless_certificates/keyless_certificate_edit_params.py
index 1aba961af6a..298e4bfe4b6 100644
--- a/src/cloudflare/types/keyless_certificates/keyless_certificate_edit_params.py
+++ b/src/cloudflare/types/keyless_certificates/keyless_certificate_edit_params.py
@@ -11,7 +11,7 @@
 
 class KeylessCertificateEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     enabled: bool
     """Whether or not the Keyless SSL is on or off."""
diff --git a/src/cloudflare/types/keyless_certificates/tunnel.py b/src/cloudflare/types/keyless_certificates/tunnel.py
index 6aa966dd5c7..48dc07e0834 100644
--- a/src/cloudflare/types/keyless_certificates/tunnel.py
+++ b/src/cloudflare/types/keyless_certificates/tunnel.py
@@ -1,12 +1,13 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ..._models import BaseModel
 
 __all__ = ["Tunnel"]
 
 
 class Tunnel(BaseModel):
+    """Configuration for using Keyless SSL through a Cloudflare Tunnel"""
+
     private_ip: str
     """Private IP of the Key Server Host"""
 
diff --git a/src/cloudflare/types/keyless_certificates/tunnel_param.py b/src/cloudflare/types/keyless_certificates/tunnel_param.py
index c6ebab906b6..62d928b94ad 100644
--- a/src/cloudflare/types/keyless_certificates/tunnel_param.py
+++ b/src/cloudflare/types/keyless_certificates/tunnel_param.py
@@ -8,6 +8,8 @@
 
 
 class TunnelParam(TypedDict, total=False):
+    """Configuration for using Keyless SSL through a Cloudflare Tunnel"""
+
     private_ip: Required[str]
     """Private IP of the Key Server Host"""
 
diff --git a/src/cloudflare/types/kv/__init__.py b/src/cloudflare/types/kv/__init__.py
index e345eaf540a..512003710f4 100644
--- a/src/cloudflare/types/kv/__init__.py
+++ b/src/cloudflare/types/kv/__init__.py
@@ -6,5 +6,10 @@
 from .namespace_list_params import NamespaceListParams as NamespaceListParams
 from .namespace_create_params import NamespaceCreateParams as NamespaceCreateParams
 from .namespace_update_params import NamespaceUpdateParams as NamespaceUpdateParams
+from .namespace_bulk_get_params import NamespaceBulkGetParams as NamespaceBulkGetParams
 from .namespace_delete_response import NamespaceDeleteResponse as NamespaceDeleteResponse
-from .namespace_update_response import NamespaceUpdateResponse as NamespaceUpdateResponse
+from .namespace_bulk_get_response import NamespaceBulkGetResponse as NamespaceBulkGetResponse
+from .namespace_bulk_delete_params import NamespaceBulkDeleteParams as NamespaceBulkDeleteParams
+from .namespace_bulk_update_params import NamespaceBulkUpdateParams as NamespaceBulkUpdateParams
+from .namespace_bulk_delete_response import NamespaceBulkDeleteResponse as NamespaceBulkDeleteResponse
+from .namespace_bulk_update_response import NamespaceBulkUpdateResponse as NamespaceBulkUpdateResponse
diff --git a/src/cloudflare/types/kv/namespace_bulk_delete_params.py b/src/cloudflare/types/kv/namespace_bulk_delete_params.py
new file mode 100644
index 00000000000..b5c49385eb5
--- /dev/null
+++ b/src/cloudflare/types/kv/namespace_bulk_delete_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["NamespaceBulkDeleteParams"]
+
+
+class NamespaceBulkDeleteParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    body: Required[SequenceNotStr[str]]
diff --git a/src/cloudflare/types/kv/namespace_bulk_delete_response.py b/src/cloudflare/types/kv/namespace_bulk_delete_response.py
new file mode 100644
index 00000000000..0c3592c90d5
--- /dev/null
+++ b/src/cloudflare/types/kv/namespace_bulk_delete_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["NamespaceBulkDeleteResponse"]
+
+
+class NamespaceBulkDeleteResponse(BaseModel):
+    successful_key_count: Optional[float] = None
+    """Number of keys successfully updated."""
+
+    unsuccessful_keys: Optional[List[str]] = None
+    """Name of the keys that failed to be fully updated. They should be retried."""
diff --git a/src/cloudflare/types/kv/namespace_bulk_get_params.py b/src/cloudflare/types/kv/namespace_bulk_get_params.py
new file mode 100644
index 00000000000..4f5db117c23
--- /dev/null
+++ b/src/cloudflare/types/kv/namespace_bulk_get_params.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["NamespaceBulkGetParams"]
+
+
+class NamespaceBulkGetParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    keys: Required[SequenceNotStr[str]]
+    """Array of keys to retrieve (maximum of 100)."""
+
+    type: Literal["text", "json"]
+    """Whether to parse JSON values in the response."""
+
+    with_metadata: Annotated[bool, PropertyInfo(alias="withMetadata")]
+    """Whether to include metadata in the response."""
diff --git a/src/cloudflare/types/kv/namespace_bulk_get_response.py b/src/cloudflare/types/kv/namespace_bulk_get_response.py
new file mode 100644
index 00000000000..b0b172374f7
--- /dev/null
+++ b/src/cloudflare/types/kv/namespace_bulk_get_response.py
@@ -0,0 +1,40 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, Union, Optional
+from typing_extensions import TypeAlias
+
+from ..._models import BaseModel
+
+__all__ = [
+    "NamespaceBulkGetResponse",
+    "WorkersKVBulkGetResult",
+    "WorkersKVBulkGetResultWithMetadata",
+    "WorkersKVBulkGetResultWithMetadataValues",
+]
+
+
+class WorkersKVBulkGetResult(BaseModel):
+    values: Optional[Dict[str, Union[str, float, bool, Dict[str, object]]]] = None
+    """Requested keys are paired with their values in an object."""
+
+
+class WorkersKVBulkGetResultWithMetadataValues(BaseModel):
+    metadata: object
+    """The metadata associated with the key."""
+
+    value: object
+    """The value associated with the key."""
+
+    expiration: Optional[float] = None
+    """
+    Expires the key at a certain time, measured in number of seconds since the UNIX
+    epoch.
+    """
+
+
+class WorkersKVBulkGetResultWithMetadata(BaseModel):
+    values: Optional[Dict[str, Optional[WorkersKVBulkGetResultWithMetadataValues]]] = None
+    """Requested keys are paired with their values and metadata in an object."""
+
+
+NamespaceBulkGetResponse: TypeAlias = Union[WorkersKVBulkGetResult, WorkersKVBulkGetResultWithMetadata, None]
diff --git a/src/cloudflare/types/kv/namespace_bulk_update_params.py b/src/cloudflare/types/kv/namespace_bulk_update_params.py
new file mode 100644
index 00000000000..d56c1a14bbb
--- /dev/null
+++ b/src/cloudflare/types/kv/namespace_bulk_update_params.py
@@ -0,0 +1,46 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["NamespaceBulkUpdateParams", "Body"]
+
+
+class NamespaceBulkUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    body: Required[Iterable[Body]]
+
+
+class Body(TypedDict, total=False):
+    key: Required[str]
+    """A key's name.
+
+    The name may be at most 512 bytes. All printable, non-whitespace characters are
+    valid.
+    """
+
+    value: Required[str]
+    """A UTF-8 encoded string to be stored, up to 25 MiB in length."""
+
+    base64: bool
+    """
+    Indicates whether or not the server should base64 decode the value before
+    storing it. Useful for writing values that wouldn't otherwise be valid JSON
+    strings, such as images.
+    """
+
+    expiration: float
+    """
+    Expires the key at a certain time, measured in number of seconds since the UNIX
+    epoch.
+    """
+
+    expiration_ttl: float
+    """Expires the key after a number of seconds. Must be at least 60."""
+
+    metadata: object
+    """Arbitrary JSON that is associated with a key."""
diff --git a/src/cloudflare/types/kv/namespace_bulk_update_response.py b/src/cloudflare/types/kv/namespace_bulk_update_response.py
new file mode 100644
index 00000000000..3b67c223d81
--- /dev/null
+++ b/src/cloudflare/types/kv/namespace_bulk_update_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["NamespaceBulkUpdateResponse"]
+
+
+class NamespaceBulkUpdateResponse(BaseModel):
+    successful_key_count: Optional[float] = None
+    """Number of keys successfully updated."""
+
+    unsuccessful_keys: Optional[List[str]] = None
+    """Name of the keys that failed to be fully updated. They should be retried."""
diff --git a/src/cloudflare/types/kv/namespace_create_params.py b/src/cloudflare/types/kv/namespace_create_params.py
index 876990c7603..85397033b26 100644
--- a/src/cloudflare/types/kv/namespace_create_params.py
+++ b/src/cloudflare/types/kv/namespace_create_params.py
@@ -9,7 +9,7 @@
 
 class NamespaceCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     title: Required[str]
     """A human-readable string name for a Namespace."""
diff --git a/src/cloudflare/types/kv/namespace_delete_response.py b/src/cloudflare/types/kv/namespace_delete_response.py
index 9f3c63195c7..2c945673dd9 100644
--- a/src/cloudflare/types/kv/namespace_delete_response.py
+++ b/src/cloudflare/types/kv/namespace_delete_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ..._models import BaseModel
 
 __all__ = ["NamespaceDeleteResponse"]
diff --git a/src/cloudflare/types/kv/namespace_list_params.py b/src/cloudflare/types/kv/namespace_list_params.py
index 2c832c88595..8c217e6fef4 100644
--- a/src/cloudflare/types/kv/namespace_list_params.py
+++ b/src/cloudflare/types/kv/namespace_list_params.py
@@ -9,7 +9,7 @@
 
 class NamespaceListParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     direction: Literal["asc", "desc"]
     """Direction to order namespaces."""
diff --git a/src/cloudflare/types/kv/namespace_update_params.py b/src/cloudflare/types/kv/namespace_update_params.py
index 531377b614b..71f317ca4e4 100644
--- a/src/cloudflare/types/kv/namespace_update_params.py
+++ b/src/cloudflare/types/kv/namespace_update_params.py
@@ -9,7 +9,7 @@
 
 class NamespaceUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     title: Required[str]
     """A human-readable string name for a Namespace."""
diff --git a/src/cloudflare/types/kv/namespace_update_response.py b/src/cloudflare/types/kv/namespace_update_response.py
deleted file mode 100644
index 6bafe0d03fb..00000000000
--- a/src/cloudflare/types/kv/namespace_update_response.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-from ..._models import BaseModel
-
-__all__ = ["NamespaceUpdateResponse"]
-
-
-class NamespaceUpdateResponse(BaseModel):
-    pass
diff --git a/src/cloudflare/types/kv/namespaces/__init__.py b/src/cloudflare/types/kv/namespaces/__init__.py
index 69632f0965e..34b5eaa0716 100644
--- a/src/cloudflare/types/kv/namespaces/__init__.py
+++ b/src/cloudflare/types/kv/namespaces/__init__.py
@@ -4,10 +4,12 @@
 
 from .key import Key as Key
 from .key_list_params import KeyListParams as KeyListParams
-from .bulk_update_params import BulkUpdateParams as BulkUpdateParams
+from .key_bulk_get_params import KeyBulkGetParams as KeyBulkGetParams
 from .value_update_params import ValueUpdateParams as ValueUpdateParams
-from .bulk_delete_response import BulkDeleteResponse as BulkDeleteResponse
-from .bulk_update_response import BulkUpdateResponse as BulkUpdateResponse
-from .metadata_get_response import MetadataGetResponse as MetadataGetResponse
+from .key_bulk_get_response import KeyBulkGetResponse as KeyBulkGetResponse
 from .value_delete_response import ValueDeleteResponse as ValueDeleteResponse
 from .value_update_response import ValueUpdateResponse as ValueUpdateResponse
+from .key_bulk_delete_params import KeyBulkDeleteParams as KeyBulkDeleteParams
+from .key_bulk_update_params import KeyBulkUpdateParams as KeyBulkUpdateParams
+from .key_bulk_delete_response import KeyBulkDeleteResponse as KeyBulkDeleteResponse
+from .key_bulk_update_response import KeyBulkUpdateResponse as KeyBulkUpdateResponse
diff --git a/src/cloudflare/types/kv/namespaces/bulk_delete_response.py b/src/cloudflare/types/kv/namespaces/bulk_delete_response.py
deleted file mode 100644
index 5982193c7b1..00000000000
--- a/src/cloudflare/types/kv/namespaces/bulk_delete_response.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-from ...._models import BaseModel
-
-__all__ = ["BulkDeleteResponse"]
-
-
-class BulkDeleteResponse(BaseModel):
-    pass
diff --git a/src/cloudflare/types/kv/namespaces/bulk_update_params.py b/src/cloudflare/types/kv/namespaces/bulk_update_params.py
deleted file mode 100644
index 6cb8d8702c8..00000000000
--- a/src/cloudflare/types/kv/namespaces/bulk_update_params.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Dict, Iterable
-from typing_extensions import Required, TypedDict
-
-__all__ = ["BulkUpdateParams", "Body"]
-
-
-class BulkUpdateParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    body: Required[Iterable[Body]]
-
-
-class Body(TypedDict, total=False):
-    base64: bool
-    """Whether or not the server should base64 decode the value before storing it.
-
-    Useful for writing values that wouldn't otherwise be valid JSON strings, such as
-    images.
-    """
-
-    expiration: float
-    """
-    The time, measured in number of seconds since the UNIX epoch, at which the key
-    should expire.
-    """
-
-    expiration_ttl: float
-    """The number of seconds for which the key should be visible before it expires.
-
-    At least 60.
-    """
-
-    key: str
-    """A key's name.
-
-    The name may be at most 512 bytes. All printable, non-whitespace characters are
-    valid.
-    """
-
-    metadata: Dict[str, object]
-    """Arbitrary JSON that is associated with a key."""
-
-    value: str
-    """A UTF-8 encoded string to be stored, up to 25 MiB in length."""
diff --git a/src/cloudflare/types/kv/namespaces/bulk_update_response.py b/src/cloudflare/types/kv/namespaces/bulk_update_response.py
deleted file mode 100644
index 3ab1dbb71be..00000000000
--- a/src/cloudflare/types/kv/namespaces/bulk_update_response.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-from ...._models import BaseModel
-
-__all__ = ["BulkUpdateResponse"]
-
-
-class BulkUpdateResponse(BaseModel):
-    pass
diff --git a/src/cloudflare/types/kv/namespaces/key.py b/src/cloudflare/types/kv/namespaces/key.py
index 5b48057e954..33482b9fb9a 100644
--- a/src/cloudflare/types/kv/namespaces/key.py
+++ b/src/cloudflare/types/kv/namespaces/key.py
@@ -1,6 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Dict, Optional
+from typing import Optional
 
 from ...._models import BaseModel
 
@@ -8,6 +8,11 @@
 
 
 class Key(BaseModel):
+    """A name for a value.
+
+    A value stored under a given key may be retrieved via the same key.
+    """
+
     name: str
     """A key's name.
 
@@ -21,5 +26,5 @@ class Key(BaseModel):
     will expire. This property is omitted for keys that will not expire.
     """
 
-    metadata: Optional[Dict[str, object]] = None
+    metadata: Optional[object] = None
     """Arbitrary JSON that is associated with a key."""
diff --git a/src/cloudflare/types/kv/namespaces/key_bulk_delete_params.py b/src/cloudflare/types/kv/namespaces/key_bulk_delete_params.py
new file mode 100644
index 00000000000..4ca950ad537
--- /dev/null
+++ b/src/cloudflare/types/kv/namespaces/key_bulk_delete_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["KeyBulkDeleteParams"]
+
+
+class KeyBulkDeleteParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    body: Required[SequenceNotStr[str]]
diff --git a/src/cloudflare/types/kv/namespaces/key_bulk_delete_response.py b/src/cloudflare/types/kv/namespaces/key_bulk_delete_response.py
new file mode 100644
index 00000000000..d533940c000
--- /dev/null
+++ b/src/cloudflare/types/kv/namespaces/key_bulk_delete_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ...._models import BaseModel
+
+__all__ = ["KeyBulkDeleteResponse"]
+
+
+class KeyBulkDeleteResponse(BaseModel):
+    successful_key_count: Optional[float] = None
+    """Number of keys successfully updated."""
+
+    unsuccessful_keys: Optional[List[str]] = None
+    """Name of the keys that failed to be fully updated. They should be retried."""
diff --git a/src/cloudflare/types/kv/namespaces/key_bulk_get_params.py b/src/cloudflare/types/kv/namespaces/key_bulk_get_params.py
new file mode 100644
index 00000000000..807dcd6a7f6
--- /dev/null
+++ b/src/cloudflare/types/kv/namespaces/key_bulk_get_params.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["KeyBulkGetParams"]
+
+
+class KeyBulkGetParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    keys: Required[SequenceNotStr[str]]
+    """Array of keys to retrieve (maximum of 100)."""
+
+    type: Literal["text", "json"]
+    """Whether to parse JSON values in the response."""
+
+    with_metadata: Annotated[bool, PropertyInfo(alias="withMetadata")]
+    """Whether to include metadata in the response."""
diff --git a/src/cloudflare/types/kv/namespaces/key_bulk_get_response.py b/src/cloudflare/types/kv/namespaces/key_bulk_get_response.py
new file mode 100644
index 00000000000..b2261786a62
--- /dev/null
+++ b/src/cloudflare/types/kv/namespaces/key_bulk_get_response.py
@@ -0,0 +1,40 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, Union, Optional
+from typing_extensions import TypeAlias
+
+from ...._models import BaseModel
+
+__all__ = [
+    "KeyBulkGetResponse",
+    "WorkersKVBulkGetResult",
+    "WorkersKVBulkGetResultWithMetadata",
+    "WorkersKVBulkGetResultWithMetadataValues",
+]
+
+
+class WorkersKVBulkGetResult(BaseModel):
+    values: Optional[Dict[str, Union[str, float, bool, Dict[str, object]]]] = None
+    """Requested keys are paired with their values in an object."""
+
+
+class WorkersKVBulkGetResultWithMetadataValues(BaseModel):
+    metadata: object
+    """The metadata associated with the key."""
+
+    value: object
+    """The value associated with the key."""
+
+    expiration: Optional[float] = None
+    """
+    Expires the key at a certain time, measured in number of seconds since the UNIX
+    epoch.
+    """
+
+
+class WorkersKVBulkGetResultWithMetadata(BaseModel):
+    values: Optional[Dict[str, Optional[WorkersKVBulkGetResultWithMetadataValues]]] = None
+    """Requested keys are paired with their values and metadata in an object."""
+
+
+KeyBulkGetResponse: TypeAlias = Union[WorkersKVBulkGetResult, WorkersKVBulkGetResultWithMetadata, None]
diff --git a/src/cloudflare/types/kv/namespaces/key_bulk_update_params.py b/src/cloudflare/types/kv/namespaces/key_bulk_update_params.py
new file mode 100644
index 00000000000..e7a48702ec1
--- /dev/null
+++ b/src/cloudflare/types/kv/namespaces/key_bulk_update_params.py
@@ -0,0 +1,46 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["KeyBulkUpdateParams", "Body"]
+
+
+class KeyBulkUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    body: Required[Iterable[Body]]
+
+
+class Body(TypedDict, total=False):
+    key: Required[str]
+    """A key's name.
+
+    The name may be at most 512 bytes. All printable, non-whitespace characters are
+    valid.
+    """
+
+    value: Required[str]
+    """A UTF-8 encoded string to be stored, up to 25 MiB in length."""
+
+    base64: bool
+    """
+    Indicates whether or not the server should base64 decode the value before
+    storing it. Useful for writing values that wouldn't otherwise be valid JSON
+    strings, such as images.
+    """
+
+    expiration: float
+    """
+    Expires the key at a certain time, measured in number of seconds since the UNIX
+    epoch.
+    """
+
+    expiration_ttl: float
+    """Expires the key after a number of seconds. Must be at least 60."""
+
+    metadata: object
+    """Arbitrary JSON that is associated with a key."""
diff --git a/src/cloudflare/types/kv/namespaces/key_bulk_update_response.py b/src/cloudflare/types/kv/namespaces/key_bulk_update_response.py
new file mode 100644
index 00000000000..1a13f4265c0
--- /dev/null
+++ b/src/cloudflare/types/kv/namespaces/key_bulk_update_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ...._models import BaseModel
+
+__all__ = ["KeyBulkUpdateResponse"]
+
+
+class KeyBulkUpdateResponse(BaseModel):
+    successful_key_count: Optional[float] = None
+    """Number of keys successfully updated."""
+
+    unsuccessful_keys: Optional[List[str]] = None
+    """Name of the keys that failed to be fully updated. They should be retried."""
diff --git a/src/cloudflare/types/kv/namespaces/key_list_params.py b/src/cloudflare/types/kv/namespaces/key_list_params.py
index 230b7b1986e..804e1ee1c56 100644
--- a/src/cloudflare/types/kv/namespaces/key_list_params.py
+++ b/src/cloudflare/types/kv/namespaces/key_list_params.py
@@ -9,7 +9,7 @@
 
 class KeyListParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     cursor: str
     """
@@ -20,14 +20,14 @@ class KeyListParams(TypedDict, total=False):
     """
 
     limit: float
-    """The number of keys to return.
+    """Limits the number of keys returned in the response.
 
     The cursor attribute may be used to iterate over the next batch of keys if there
     are more than the limit.
     """
 
     prefix: str
-    """A string prefix used to filter down which keys will be returned.
+    """Filters returned keys by a name prefix.
 
     Exact matches and any key names that begin with the prefix will be returned.
     """
diff --git a/src/cloudflare/types/kv/namespaces/metadata_get_response.py b/src/cloudflare/types/kv/namespaces/metadata_get_response.py
deleted file mode 100644
index 6b0475335e2..00000000000
--- a/src/cloudflare/types/kv/namespaces/metadata_get_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Dict
-
-__all__ = ["MetadataGetResponse"]
-
-MetadataGetResponse = Dict[str, object]
diff --git a/src/cloudflare/types/kv/namespaces/value_delete_response.py b/src/cloudflare/types/kv/namespaces/value_delete_response.py
index c0446010d3a..1603a673607 100644
--- a/src/cloudflare/types/kv/namespaces/value_delete_response.py
+++ b/src/cloudflare/types/kv/namespaces/value_delete_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ...._models import BaseModel
 
 __all__ = ["ValueDeleteResponse"]
diff --git a/src/cloudflare/types/kv/namespaces/value_update_params.py b/src/cloudflare/types/kv/namespaces/value_update_params.py
index 99baa23886e..320a496f11c 100644
--- a/src/cloudflare/types/kv/namespaces/value_update_params.py
+++ b/src/cloudflare/types/kv/namespaces/value_update_params.py
@@ -2,20 +2,32 @@
 
 from __future__ import annotations
 
+from typing import Union
 from typing_extensions import Required, TypedDict
 
+from ...._types import FileTypes
+
 __all__ = ["ValueUpdateParams"]
 
 
 class ValueUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     namespace_id: Required[str]
     """Namespace identifier tag."""
 
-    metadata: Required[str]
-    """Arbitrary JSON to be associated with a key/value pair."""
-
-    value: Required[str]
+    value: Required[Union[str, FileTypes]]
     """A byte sequence to be stored, up to 25 MiB in length."""
+
+    expiration: float
+    """
+    Expires the key at a certain time, measured in number of seconds since the UNIX
+    epoch.
+    """
+
+    expiration_ttl: float
+    """Expires the key after a number of seconds. Must be at least 60."""
+
+    metadata: object
+    """Associates arbitrary JSON data with a key/value pair."""
diff --git a/src/cloudflare/types/kv/namespaces/value_update_response.py b/src/cloudflare/types/kv/namespaces/value_update_response.py
index ca6dfd751bb..f14a1f226cf 100644
--- a/src/cloudflare/types/kv/namespaces/value_update_response.py
+++ b/src/cloudflare/types/kv/namespaces/value_update_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ...._models import BaseModel
 
 __all__ = ["ValueUpdateResponse"]
diff --git a/src/cloudflare/types/leaked_credential_checks/__init__.py b/src/cloudflare/types/leaked_credential_checks/__init__.py
new file mode 100644
index 00000000000..9c5c8fca53a
--- /dev/null
+++ b/src/cloudflare/types/leaked_credential_checks/__init__.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .detection_get_response import DetectionGetResponse as DetectionGetResponse
+from .detection_create_params import DetectionCreateParams as DetectionCreateParams
+from .detection_list_response import DetectionListResponse as DetectionListResponse
+from .detection_update_params import DetectionUpdateParams as DetectionUpdateParams
+from .detection_create_response import DetectionCreateResponse as DetectionCreateResponse
+from .detection_update_response import DetectionUpdateResponse as DetectionUpdateResponse
+from .leaked_credential_check_get_response import LeakedCredentialCheckGetResponse as LeakedCredentialCheckGetResponse
+from .leaked_credential_check_create_params import (
+    LeakedCredentialCheckCreateParams as LeakedCredentialCheckCreateParams,
+)
+from .leaked_credential_check_create_response import (
+    LeakedCredentialCheckCreateResponse as LeakedCredentialCheckCreateResponse,
+)
diff --git a/src/cloudflare/types/leaked_credential_checks/detection_create_params.py b/src/cloudflare/types/leaked_credential_checks/detection_create_params.py
new file mode 100644
index 00000000000..4aa1306de9c
--- /dev/null
+++ b/src/cloudflare/types/leaked_credential_checks/detection_create_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["DetectionCreateParams"]
+
+
+class DetectionCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    password: str
+    """Defines ehe ruleset expression to use in matching the password in a request."""
+
+    username: str
+    """Defines the ruleset expression to use in matching the username in a request."""
diff --git a/src/cloudflare/types/leaked_credential_checks/detection_create_response.py b/src/cloudflare/types/leaked_credential_checks/detection_create_response.py
new file mode 100644
index 00000000000..2a5cc515dc5
--- /dev/null
+++ b/src/cloudflare/types/leaked_credential_checks/detection_create_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["DetectionCreateResponse"]
+
+
+class DetectionCreateResponse(BaseModel):
+    """
+    Defines a custom set of username/password expressions to match Leaked Credential Checks on.
+    """
+
+    id: Optional[str] = None
+    """Defines the unique ID for this custom detection."""
+
+    password: Optional[str] = None
+    """Defines ehe ruleset expression to use in matching the password in a request."""
+
+    username: Optional[str] = None
+    """Defines the ruleset expression to use in matching the username in a request."""
diff --git a/src/cloudflare/types/leaked_credential_checks/detection_get_response.py b/src/cloudflare/types/leaked_credential_checks/detection_get_response.py
new file mode 100644
index 00000000000..38b42f8cbb4
--- /dev/null
+++ b/src/cloudflare/types/leaked_credential_checks/detection_get_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["DetectionGetResponse"]
+
+
+class DetectionGetResponse(BaseModel):
+    """
+    Defines a custom set of username/password expressions to match Leaked Credential Checks on.
+    """
+
+    id: Optional[str] = None
+    """Defines the unique ID for this custom detection."""
+
+    password: Optional[str] = None
+    """Defines ehe ruleset expression to use in matching the password in a request."""
+
+    username: Optional[str] = None
+    """Defines the ruleset expression to use in matching the username in a request."""
diff --git a/src/cloudflare/types/leaked_credential_checks/detection_list_response.py b/src/cloudflare/types/leaked_credential_checks/detection_list_response.py
new file mode 100644
index 00000000000..9f74fc847f0
--- /dev/null
+++ b/src/cloudflare/types/leaked_credential_checks/detection_list_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["DetectionListResponse"]
+
+
+class DetectionListResponse(BaseModel):
+    """
+    Defines a custom set of username/password expressions to match Leaked Credential Checks on.
+    """
+
+    id: Optional[str] = None
+    """Defines the unique ID for this custom detection."""
+
+    password: Optional[str] = None
+    """Defines ehe ruleset expression to use in matching the password in a request."""
+
+    username: Optional[str] = None
+    """Defines the ruleset expression to use in matching the username in a request."""
diff --git a/src/cloudflare/types/leaked_credential_checks/detection_update_params.py b/src/cloudflare/types/leaked_credential_checks/detection_update_params.py
new file mode 100644
index 00000000000..b89243110b3
--- /dev/null
+++ b/src/cloudflare/types/leaked_credential_checks/detection_update_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["DetectionUpdateParams"]
+
+
+class DetectionUpdateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    password: str
+    """Defines ehe ruleset expression to use in matching the password in a request."""
+
+    username: str
+    """Defines the ruleset expression to use in matching the username in a request."""
diff --git a/src/cloudflare/types/leaked_credential_checks/detection_update_response.py b/src/cloudflare/types/leaked_credential_checks/detection_update_response.py
new file mode 100644
index 00000000000..da219c883e2
--- /dev/null
+++ b/src/cloudflare/types/leaked_credential_checks/detection_update_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["DetectionUpdateResponse"]
+
+
+class DetectionUpdateResponse(BaseModel):
+    """
+    Defines a custom set of username/password expressions to match Leaked Credential Checks on.
+    """
+
+    id: Optional[str] = None
+    """Defines the unique ID for this custom detection."""
+
+    password: Optional[str] = None
+    """Defines ehe ruleset expression to use in matching the password in a request."""
+
+    username: Optional[str] = None
+    """Defines the ruleset expression to use in matching the username in a request."""
diff --git a/src/cloudflare/types/leaked_credential_checks/leaked_credential_check_create_params.py b/src/cloudflare/types/leaked_credential_checks/leaked_credential_check_create_params.py
new file mode 100644
index 00000000000..3e89ee960d5
--- /dev/null
+++ b/src/cloudflare/types/leaked_credential_checks/leaked_credential_check_create_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["LeakedCredentialCheckCreateParams"]
+
+
+class LeakedCredentialCheckCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    enabled: bool
+    """Determines whether or not Leaked Credential Checks are enabled."""
diff --git a/src/cloudflare/types/leaked_credential_checks/leaked_credential_check_create_response.py b/src/cloudflare/types/leaked_credential_checks/leaked_credential_check_create_response.py
new file mode 100644
index 00000000000..8c352312432
--- /dev/null
+++ b/src/cloudflare/types/leaked_credential_checks/leaked_credential_check_create_response.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["LeakedCredentialCheckCreateResponse"]
+
+
+class LeakedCredentialCheckCreateResponse(BaseModel):
+    """Defines the overall status for Leaked Credential Checks."""
+
+    enabled: Optional[bool] = None
+    """Determines whether or not Leaked Credential Checks are enabled."""
diff --git a/src/cloudflare/types/leaked_credential_checks/leaked_credential_check_get_response.py b/src/cloudflare/types/leaked_credential_checks/leaked_credential_check_get_response.py
new file mode 100644
index 00000000000..f62b13b5236
--- /dev/null
+++ b/src/cloudflare/types/leaked_credential_checks/leaked_credential_check_get_response.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["LeakedCredentialCheckGetResponse"]
+
+
+class LeakedCredentialCheckGetResponse(BaseModel):
+    """Defines the overall status for Leaked Credential Checks."""
+
+    enabled: Optional[bool] = None
+    """Determines whether or not Leaked Credential Checks are enabled."""
diff --git a/src/cloudflare/types/load_balancers/__init__.py b/src/cloudflare/types/load_balancers/__init__.py
index 46d78e92ec5..e19f1c5a9df 100644
--- a/src/cloudflare/types/load_balancers/__init__.py
+++ b/src/cloudflare/types/load_balancers/__init__.py
@@ -15,6 +15,7 @@
 from .default_pools import DefaultPools as DefaultPools
 from .load_balancer import LoadBalancer as LoadBalancer
 from .load_shedding import LoadShedding as LoadShedding
+from .monitor_group import MonitorGroup as MonitorGroup
 from .filter_options import FilterOptions as FilterOptions
 from .origin_steering import OriginSteering as OriginSteering
 from .random_steering import RandomSteering as RandomSteering
@@ -24,30 +25,34 @@
 from .pool_list_params import PoolListParams as PoolListParams
 from .session_affinity import SessionAffinity as SessionAffinity
 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_update_params import PoolUpdateParams as PoolUpdateParams
 from .region_list_params import RegionListParams as RegionListParams
+from .search_list_params import SearchListParams as SearchListParams
 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 .search_list_response import SearchListResponse as SearchListResponse
 from .monitor_create_params import MonitorCreateParams as MonitorCreateParams
 from .monitor_update_params import MonitorUpdateParams as MonitorUpdateParams
 from .origin_steering_param import OriginSteeringParam as OriginSteeringParam
+from .pool_bulk_edit_params import PoolBulkEditParams as PoolBulkEditParams
 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 .monitor_group_edit_params import MonitorGroupEditParams as MonitorGroupEditParams
 from .notification_filter_param import NotificationFilterParam as NotificationFilterParam
 from .load_balancer_create_params import LoadBalancerCreateParams as LoadBalancerCreateParams
 from .load_balancer_update_params import LoadBalancerUpdateParams as LoadBalancerUpdateParams
+from .monitor_group_create_params import MonitorGroupCreateParams as MonitorGroupCreateParams
+from .monitor_group_update_params import MonitorGroupUpdateParams as MonitorGroupUpdateParams
 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/load_balancers/adaptive_routing.py b/src/cloudflare/types/load_balancers/adaptive_routing.py
index b4d03c48652..99d9de1107f 100644
--- a/src/cloudflare/types/load_balancers/adaptive_routing.py
+++ b/src/cloudflare/types/load_balancers/adaptive_routing.py
@@ -8,6 +8,10 @@
 
 
 class AdaptiveRouting(BaseModel):
+    """
+    Controls features that modify the routing of requests to pools and origins in response to dynamic conditions, such as during the interval between active health monitoring requests. For example, zero-downtime failover occurs immediately when an origin becomes unavailable due to HTTP 521, 522, or 523 response codes. If there is another healthy origin in the same pool, the request is retried once against this alternate origin.
+    """
+
     failover_across_pools: Optional[bool] = None
     """
     Extends zero-downtime failover of requests to healthy origins from alternate
diff --git a/src/cloudflare/types/load_balancers/adaptive_routing_param.py b/src/cloudflare/types/load_balancers/adaptive_routing_param.py
index 1cb5eb09c3a..8f946e19806 100644
--- a/src/cloudflare/types/load_balancers/adaptive_routing_param.py
+++ b/src/cloudflare/types/load_balancers/adaptive_routing_param.py
@@ -8,6 +8,10 @@
 
 
 class AdaptiveRoutingParam(TypedDict, total=False):
+    """
+    Controls features that modify the routing of requests to pools and origins in response to dynamic conditions, such as during the interval between active health monitoring requests. For example, zero-downtime failover occurs immediately when an origin becomes unavailable due to HTTP 521, 522, or 523 response codes. If there is another healthy origin in the same pool, the request is retried once against this alternate origin.
+    """
+
     failover_across_pools: bool
     """
     Extends zero-downtime failover of requests to healthy origins from alternate
diff --git a/src/cloudflare/types/load_balancers/check_region.py b/src/cloudflare/types/load_balancers/check_region.py
index 195c879900e..f40e920ee7d 100644
--- a/src/cloudflare/types/load_balancers/check_region.py
+++ b/src/cloudflare/types/load_balancers/check_region.py
@@ -1,9 +1,9 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["CheckRegion"]
 
-CheckRegion = Literal[
+CheckRegion: TypeAlias = Literal[
     "WNAM", "ENAM", "WEU", "EEU", "NSAM", "SSAM", "OC", "ME", "NAF", "SAF", "SAS", "SEAS", "NEAS", "ALL_REGIONS"
 ]
diff --git a/src/cloudflare/types/load_balancers/default_pools.py b/src/cloudflare/types/load_balancers/default_pools.py
index 80afa57bd13..c9a8024c086 100644
--- a/src/cloudflare/types/load_balancers/default_pools.py
+++ b/src/cloudflare/types/load_balancers/default_pools.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["DefaultPools"]
 
-DefaultPools = str
+DefaultPools: TypeAlias = str
diff --git a/src/cloudflare/types/load_balancers/filter_options.py b/src/cloudflare/types/load_balancers/filter_options.py
index a1b4b46c17d..f3de39aca1d 100644
--- a/src/cloudflare/types/load_balancers/filter_options.py
+++ b/src/cloudflare/types/load_balancers/filter_options.py
@@ -8,6 +8,11 @@
 
 
 class FilterOptions(BaseModel):
+    """Filter options for a particular resource type (pool or origin).
+
+    Use null to reset.
+    """
+
     disable: Optional[bool] = None
     """If set true, disable notifications for this type of resource (pool or origin)."""
 
diff --git a/src/cloudflare/types/load_balancers/filter_options_param.py b/src/cloudflare/types/load_balancers/filter_options_param.py
index 5fa6ff70390..0a694803283 100644
--- a/src/cloudflare/types/load_balancers/filter_options_param.py
+++ b/src/cloudflare/types/load_balancers/filter_options_param.py
@@ -9,6 +9,11 @@
 
 
 class FilterOptionsParam(TypedDict, total=False):
+    """Filter options for a particular resource type (pool or origin).
+
+    Use null to reset.
+    """
+
     disable: bool
     """If set true, disable notifications for this type of resource (pool or origin)."""
 
diff --git a/src/cloudflare/types/load_balancers/header.py b/src/cloudflare/types/load_balancers/header.py
index b6bd2830a64..6f6d90f1c0a 100644
--- a/src/cloudflare/types/load_balancers/header.py
+++ b/src/cloudflare/types/load_balancers/header.py
@@ -11,6 +11,11 @@
 
 
 class Header(BaseModel):
+    """The request header is used to pass additional information with an HTTP request.
+
+    Currently supported header is 'Host'.
+    """
+
     host: Optional[List[Host]] = FieldInfo(alias="Host", default=None)
     """The 'Host' header allows to override the hostname set in the HTTP request.
 
diff --git a/src/cloudflare/types/load_balancers/header_param.py b/src/cloudflare/types/load_balancers/header_param.py
index b3e837d92f9..dc1cb087470 100644
--- a/src/cloudflare/types/load_balancers/header_param.py
+++ b/src/cloudflare/types/load_balancers/header_param.py
@@ -2,17 +2,22 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Annotated, TypedDict
 
 from .host import Host
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 
 __all__ = ["HeaderParam"]
 
 
 class HeaderParam(TypedDict, total=False):
-    host: Annotated[List[Host], PropertyInfo(alias="Host")]
+    """The request header is used to pass additional information with an HTTP request.
+
+    Currently supported header is 'Host'.
+    """
+
+    host: Annotated[SequenceNotStr[Host], PropertyInfo(alias="Host")]
     """The 'Host' header allows to override the hostname set in the HTTP request.
 
     Current support is 1 'Host' header override per origin.
diff --git a/src/cloudflare/types/load_balancers/host.py b/src/cloudflare/types/load_balancers/host.py
index f5b05acf1c6..c294bcb2e2f 100644
--- a/src/cloudflare/types/load_balancers/host.py
+++ b/src/cloudflare/types/load_balancers/host.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["Host"]
 
-Host = str
+Host: TypeAlias = str
diff --git a/src/cloudflare/types/load_balancers/load_balancer.py b/src/cloudflare/types/load_balancers/load_balancer.py
index 11e17929346..46f00b2ae26 100644
--- a/src/cloudflare/types/load_balancers/load_balancer.py
+++ b/src/cloudflare/types/load_balancers/load_balancer.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
-from datetime import datetime
+from typing import Dict, List, Optional
 
 from .rules import Rules
 from ..._models import BaseModel
@@ -29,7 +28,7 @@ class LoadBalancer(BaseModel):
     is retried once against this alternate origin.
     """
 
-    country_pools: Optional[object] = None
+    country_pools: Optional[Dict[str, List[str]]] = None
     """
     A mapping of country codes to a list of pool IDs (ordered by their failover
     priority) for the given country. Any country not explicitly defined will fall
@@ -37,7 +36,7 @@ class LoadBalancer(BaseModel):
     default_pools.
     """
 
-    created_on: Optional[datetime] = None
+    created_on: Optional[str] = None
 
     default_pools: Optional[List[DefaultPools]] = None
     """A list of pool IDs ordered by their failover priority.
@@ -52,7 +51,7 @@ class LoadBalancer(BaseModel):
     enabled: Optional[bool] = None
     """Whether to enable (the default) this load balancer."""
 
-    fallback_pool: Optional[object] = None
+    fallback_pool: Optional[str] = None
     """The pool ID to use when all other pools are detected as unhealthy."""
 
     location_strategy: Optional[LocationStrategy] = None
@@ -61,7 +60,7 @@ class LoadBalancer(BaseModel):
     See `steering_policy` to learn how steering is affected.
     """
 
-    modified_on: Optional[datetime] = None
+    modified_on: Optional[str] = None
 
     name: Optional[str] = None
     """The DNS hostname to associate with your Load Balancer.
@@ -70,9 +69,12 @@ class LoadBalancer(BaseModel):
     Balancer will take precedence and the DNS record will not be used.
     """
 
-    pop_pools: Optional[object] = None
+    networks: Optional[List[str]] = None
+    """List of networks where Load Balancer or Pool is enabled."""
+
+    pop_pools: Optional[Dict[str, List[str]]] = None
     """
-    (Enterprise only): A mapping of Cloudflare PoP identifiers to a list of pool IDs
+    Enterprise only: A mapping of Cloudflare PoP identifiers to a list of pool IDs
     (ordered by their failover priority) for the PoP (datacenter). Any PoPs not
     explicitly defined will fall back to using the corresponding country_pool, then
     region_pool mapping if it exists else to default_pools.
@@ -92,7 +94,7 @@ class LoadBalancer(BaseModel):
       open connections.
     """
 
-    region_pools: Optional[object] = None
+    region_pools: Optional[Dict[str, List[str]]] = None
     """
     A mapping of region codes to a list of pool IDs (ordered by their failover
     priority) for the given region. Any regions not explicitly defined will fall
@@ -108,28 +110,25 @@ class LoadBalancer(BaseModel):
     session_affinity: Optional[SessionAffinity] = None
     """
     Specifies the type of session affinity the load balancer should use unless
-    specified as `"none"` or "" (default). The supported types are:
-
-    - `"cookie"`: On the first request to a proxied load balancer, a cookie is
-      generated, encoding information of which origin the request will be forwarded
-      to. Subsequent requests, by the same client to the same load balancer, will be
-      sent to the origin server the cookie encodes, for the duration of the cookie
-      and as long as the origin server remains healthy. If the cookie has expired or
-      the origin server is unhealthy, then a new origin server is calculated and
-      used.
-    - `"ip_cookie"`: Behaves the same as `"cookie"` except the initial origin
-      selection is stable and based on the client's ip address.
-    - `"header"`: On the first request to a proxied load balancer, a session key
-      based on the configured HTTP headers (see
-      `session_affinity_attributes.headers`) is generated, encoding the request
-      headers used for storing in the load balancer session state which origin the
-      request will be forwarded to. Subsequent requests to the load balancer with
-      the same headers will be sent to the same origin server, for the duration of
-      the session and as long as the origin server remains healthy. If the session
-      has been idle for the duration of `session_affinity_ttl` seconds or the origin
-      server is unhealthy, then a new origin server is calculated and used. See
-      `headers` in `session_affinity_attributes` for additional required
-      configuration.
+    specified as `"none"`. The supported types are: - `"cookie"`: On the first
+    request to a proxied load balancer, a cookie is generated, encoding information
+    of which origin the request will be forwarded to. Subsequent requests, by the
+    same client to the same load balancer, will be sent to the origin server the
+    cookie encodes, for the duration of the cookie and as long as the origin server
+    remains healthy. If the cookie has expired or the origin server is unhealthy,
+    then a new origin server is calculated and used. - `"ip_cookie"`: Behaves the
+    same as `"cookie"` except the initial origin selection is stable and based on
+    the client's ip address. - `"header"`: On the first request to a proxied load
+    balancer, a session key based on the configured HTTP headers (see
+    `session_affinity_attributes.headers`) is generated, encoding the request
+    headers used for storing in the load balancer session state which origin the
+    request will be forwarded to. Subsequent requests to the load balancer with the
+    same headers will be sent to the same origin server, for the duration of the
+    session and as long as the origin server remains healthy. If the session has
+    been idle for the duration of `session_affinity_ttl` seconds or the origin
+    server is unhealthy, then a new origin server is calculated and used. See
+    `headers` in `session_affinity_attributes` for additional required
+    configuration.
     """
 
     session_affinity_attributes: Optional[SessionAffinityAttributes] = None
@@ -139,14 +138,13 @@ class LoadBalancer(BaseModel):
     """Time, in seconds, until a client's session expires after being created.
 
     Once the expiry time has been reached, subsequent requests may get sent to a
-    different origin server. The accepted ranges per `session_affinity` policy are:
-
-    - `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used
-      unless explicitly set. The accepted range of values is between [1800, 604800].
-    - `"header"`: The current default of 1800 seconds will be used unless explicitly
-      set. The accepted range of values is between [30, 3600]. Note: With session
-      affinity by header, sessions only expire after they haven't been used for the
-      number of seconds specified.
+    different origin server. The accepted ranges per `session_affinity` policy
+    are: - `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used
+    unless explicitly set. The accepted range of values is between [1800, 604800]. -
+    `"header"`: The current default of 1800 seconds will be used unless explicitly
+    set. The accepted range of values is between [30, 3600]. Note: With session
+    affinity by header, sessions only expire after they haven't been used for the
+    number of seconds specified.
     """
 
     steering_policy: Optional[SteeringPolicy] = None
@@ -179,3 +177,5 @@ class LoadBalancer(BaseModel):
     Time to live (TTL) of the DNS entry for the IP address returned by this load
     balancer. This only applies to gray-clouded (unproxied) load balancers.
     """
+
+    zone_name: Optional[str] = None
diff --git a/src/cloudflare/types/load_balancers/load_balancer_create_params.py b/src/cloudflare/types/load_balancers/load_balancer_create_params.py
index 74a4d9d4742..39dcc94d3d3 100644
--- a/src/cloudflare/types/load_balancers/load_balancer_create_params.py
+++ b/src/cloudflare/types/load_balancers/load_balancer_create_params.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from typing import List, Iterable
+from typing import Dict, Iterable
 from typing_extensions import Required, TypedDict
 
+from ..._types import SequenceNotStr
 from .rules_param import RulesParam
 from .default_pools import DefaultPools
 from .steering_policy import SteeringPolicy
@@ -20,14 +21,14 @@
 class LoadBalancerCreateParams(TypedDict, total=False):
     zone_id: Required[str]
 
-    default_pools: Required[List[DefaultPools]]
+    default_pools: Required[SequenceNotStr[DefaultPools]]
     """A list of pool IDs ordered by their failover priority.
 
     Pools defined here are used by default, or when region_pools are not configured
     for a given region.
     """
 
-    fallback_pool: Required[object]
+    fallback_pool: Required[str]
     """The pool ID to use when all other pools are detected as unhealthy."""
 
     name: Required[str]
@@ -47,7 +48,7 @@ class LoadBalancerCreateParams(TypedDict, total=False):
     is retried once against this alternate origin.
     """
 
-    country_pools: object
+    country_pools: Dict[str, SequenceNotStr[str]]
     """
     A mapping of country codes to a list of pool IDs (ordered by their failover
     priority) for the given country. Any country not explicitly defined will fall
@@ -64,9 +65,12 @@ class LoadBalancerCreateParams(TypedDict, total=False):
     See `steering_policy` to learn how steering is affected.
     """
 
-    pop_pools: object
+    networks: SequenceNotStr[str]
+    """List of networks where Load Balancer or Pool is enabled."""
+
+    pop_pools: Dict[str, SequenceNotStr[str]]
     """
-    (Enterprise only): A mapping of Cloudflare PoP identifiers to a list of pool IDs
+    Enterprise only: A mapping of Cloudflare PoP identifiers to a list of pool IDs
     (ordered by their failover priority) for the PoP (datacenter). Any PoPs not
     explicitly defined will fall back to using the corresponding country_pool, then
     region_pool mapping if it exists else to default_pools.
@@ -86,7 +90,7 @@ class LoadBalancerCreateParams(TypedDict, total=False):
       open connections.
     """
 
-    region_pools: object
+    region_pools: Dict[str, SequenceNotStr[str]]
     """
     A mapping of region codes to a list of pool IDs (ordered by their failover
     priority) for the given region. Any regions not explicitly defined will fall
@@ -102,28 +106,25 @@ class LoadBalancerCreateParams(TypedDict, total=False):
     session_affinity: SessionAffinity
     """
     Specifies the type of session affinity the load balancer should use unless
-    specified as `"none"` or "" (default). The supported types are:
-
-    - `"cookie"`: On the first request to a proxied load balancer, a cookie is
-      generated, encoding information of which origin the request will be forwarded
-      to. Subsequent requests, by the same client to the same load balancer, will be
-      sent to the origin server the cookie encodes, for the duration of the cookie
-      and as long as the origin server remains healthy. If the cookie has expired or
-      the origin server is unhealthy, then a new origin server is calculated and
-      used.
-    - `"ip_cookie"`: Behaves the same as `"cookie"` except the initial origin
-      selection is stable and based on the client's ip address.
-    - `"header"`: On the first request to a proxied load balancer, a session key
-      based on the configured HTTP headers (see
-      `session_affinity_attributes.headers`) is generated, encoding the request
-      headers used for storing in the load balancer session state which origin the
-      request will be forwarded to. Subsequent requests to the load balancer with
-      the same headers will be sent to the same origin server, for the duration of
-      the session and as long as the origin server remains healthy. If the session
-      has been idle for the duration of `session_affinity_ttl` seconds or the origin
-      server is unhealthy, then a new origin server is calculated and used. See
-      `headers` in `session_affinity_attributes` for additional required
-      configuration.
+    specified as `"none"`. The supported types are: - `"cookie"`: On the first
+    request to a proxied load balancer, a cookie is generated, encoding information
+    of which origin the request will be forwarded to. Subsequent requests, by the
+    same client to the same load balancer, will be sent to the origin server the
+    cookie encodes, for the duration of the cookie and as long as the origin server
+    remains healthy. If the cookie has expired or the origin server is unhealthy,
+    then a new origin server is calculated and used. - `"ip_cookie"`: Behaves the
+    same as `"cookie"` except the initial origin selection is stable and based on
+    the client's ip address. - `"header"`: On the first request to a proxied load
+    balancer, a session key based on the configured HTTP headers (see
+    `session_affinity_attributes.headers`) is generated, encoding the request
+    headers used for storing in the load balancer session state which origin the
+    request will be forwarded to. Subsequent requests to the load balancer with the
+    same headers will be sent to the same origin server, for the duration of the
+    session and as long as the origin server remains healthy. If the session has
+    been idle for the duration of `session_affinity_ttl` seconds or the origin
+    server is unhealthy, then a new origin server is calculated and used. See
+    `headers` in `session_affinity_attributes` for additional required
+    configuration.
     """
 
     session_affinity_attributes: SessionAffinityAttributesParam
@@ -133,14 +134,13 @@ class LoadBalancerCreateParams(TypedDict, total=False):
     """Time, in seconds, until a client's session expires after being created.
 
     Once the expiry time has been reached, subsequent requests may get sent to a
-    different origin server. The accepted ranges per `session_affinity` policy are:
-
-    - `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used
-      unless explicitly set. The accepted range of values is between [1800, 604800].
-    - `"header"`: The current default of 1800 seconds will be used unless explicitly
-      set. The accepted range of values is between [30, 3600]. Note: With session
-      affinity by header, sessions only expire after they haven't been used for the
-      number of seconds specified.
+    different origin server. The accepted ranges per `session_affinity` policy
+    are: - `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used
+    unless explicitly set. The accepted range of values is between [1800, 604800]. -
+    `"header"`: The current default of 1800 seconds will be used unless explicitly
+    set. The accepted range of values is between [30, 3600]. Note: With session
+    affinity by header, sessions only expire after they haven't been used for the
+    number of seconds specified.
     """
 
     steering_policy: SteeringPolicy
diff --git a/src/cloudflare/types/load_balancers/load_balancer_edit_params.py b/src/cloudflare/types/load_balancers/load_balancer_edit_params.py
index 54a9a2ab9c6..88da48c58e3 100644
--- a/src/cloudflare/types/load_balancers/load_balancer_edit_params.py
+++ b/src/cloudflare/types/load_balancers/load_balancer_edit_params.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from typing import List, Iterable
+from typing import Dict, Iterable
 from typing_extensions import Required, TypedDict
 
+from ..._types import SequenceNotStr
 from .rules_param import RulesParam
 from .default_pools import DefaultPools
 from .steering_policy import SteeringPolicy
@@ -30,7 +31,7 @@ class LoadBalancerEditParams(TypedDict, total=False):
     is retried once against this alternate origin.
     """
 
-    country_pools: object
+    country_pools: Dict[str, SequenceNotStr[str]]
     """
     A mapping of country codes to a list of pool IDs (ordered by their failover
     priority) for the given country. Any country not explicitly defined will fall
@@ -38,7 +39,7 @@ class LoadBalancerEditParams(TypedDict, total=False):
     default_pools.
     """
 
-    default_pools: List[DefaultPools]
+    default_pools: SequenceNotStr[DefaultPools]
     """A list of pool IDs ordered by their failover priority.
 
     Pools defined here are used by default, or when region_pools are not configured
@@ -51,7 +52,7 @@ class LoadBalancerEditParams(TypedDict, total=False):
     enabled: bool
     """Whether to enable (the default) this load balancer."""
 
-    fallback_pool: object
+    fallback_pool: str
     """The pool ID to use when all other pools are detected as unhealthy."""
 
     location_strategy: LocationStrategyParam
@@ -67,9 +68,9 @@ class LoadBalancerEditParams(TypedDict, total=False):
     Balancer will take precedence and the DNS record will not be used.
     """
 
-    pop_pools: object
+    pop_pools: Dict[str, SequenceNotStr[str]]
     """
-    (Enterprise only): A mapping of Cloudflare PoP identifiers to a list of pool IDs
+    Enterprise only: A mapping of Cloudflare PoP identifiers to a list of pool IDs
     (ordered by their failover priority) for the PoP (datacenter). Any PoPs not
     explicitly defined will fall back to using the corresponding country_pool, then
     region_pool mapping if it exists else to default_pools.
@@ -89,7 +90,7 @@ class LoadBalancerEditParams(TypedDict, total=False):
       open connections.
     """
 
-    region_pools: object
+    region_pools: Dict[str, SequenceNotStr[str]]
     """
     A mapping of region codes to a list of pool IDs (ordered by their failover
     priority) for the given region. Any regions not explicitly defined will fall
@@ -105,28 +106,25 @@ class LoadBalancerEditParams(TypedDict, total=False):
     session_affinity: SessionAffinity
     """
     Specifies the type of session affinity the load balancer should use unless
-    specified as `"none"` or "" (default). The supported types are:
-
-    - `"cookie"`: On the first request to a proxied load balancer, a cookie is
-      generated, encoding information of which origin the request will be forwarded
-      to. Subsequent requests, by the same client to the same load balancer, will be
-      sent to the origin server the cookie encodes, for the duration of the cookie
-      and as long as the origin server remains healthy. If the cookie has expired or
-      the origin server is unhealthy, then a new origin server is calculated and
-      used.
-    - `"ip_cookie"`: Behaves the same as `"cookie"` except the initial origin
-      selection is stable and based on the client's ip address.
-    - `"header"`: On the first request to a proxied load balancer, a session key
-      based on the configured HTTP headers (see
-      `session_affinity_attributes.headers`) is generated, encoding the request
-      headers used for storing in the load balancer session state which origin the
-      request will be forwarded to. Subsequent requests to the load balancer with
-      the same headers will be sent to the same origin server, for the duration of
-      the session and as long as the origin server remains healthy. If the session
-      has been idle for the duration of `session_affinity_ttl` seconds or the origin
-      server is unhealthy, then a new origin server is calculated and used. See
-      `headers` in `session_affinity_attributes` for additional required
-      configuration.
+    specified as `"none"`. The supported types are: - `"cookie"`: On the first
+    request to a proxied load balancer, a cookie is generated, encoding information
+    of which origin the request will be forwarded to. Subsequent requests, by the
+    same client to the same load balancer, will be sent to the origin server the
+    cookie encodes, for the duration of the cookie and as long as the origin server
+    remains healthy. If the cookie has expired or the origin server is unhealthy,
+    then a new origin server is calculated and used. - `"ip_cookie"`: Behaves the
+    same as `"cookie"` except the initial origin selection is stable and based on
+    the client's ip address. - `"header"`: On the first request to a proxied load
+    balancer, a session key based on the configured HTTP headers (see
+    `session_affinity_attributes.headers`) is generated, encoding the request
+    headers used for storing in the load balancer session state which origin the
+    request will be forwarded to. Subsequent requests to the load balancer with the
+    same headers will be sent to the same origin server, for the duration of the
+    session and as long as the origin server remains healthy. If the session has
+    been idle for the duration of `session_affinity_ttl` seconds or the origin
+    server is unhealthy, then a new origin server is calculated and used. See
+    `headers` in `session_affinity_attributes` for additional required
+    configuration.
     """
 
     session_affinity_attributes: SessionAffinityAttributesParam
@@ -136,14 +134,13 @@ class LoadBalancerEditParams(TypedDict, total=False):
     """Time, in seconds, until a client's session expires after being created.
 
     Once the expiry time has been reached, subsequent requests may get sent to a
-    different origin server. The accepted ranges per `session_affinity` policy are:
-
-    - `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used
-      unless explicitly set. The accepted range of values is between [1800, 604800].
-    - `"header"`: The current default of 1800 seconds will be used unless explicitly
-      set. The accepted range of values is between [30, 3600]. Note: With session
-      affinity by header, sessions only expire after they haven't been used for the
-      number of seconds specified.
+    different origin server. The accepted ranges per `session_affinity` policy
+    are: - `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used
+    unless explicitly set. The accepted range of values is between [1800, 604800]. -
+    `"header"`: The current default of 1800 seconds will be used unless explicitly
+    set. The accepted range of values is between [30, 3600]. Note: With session
+    affinity by header, sessions only expire after they haven't been used for the
+    number of seconds specified.
     """
 
     steering_policy: SteeringPolicy
diff --git a/src/cloudflare/types/load_balancers/load_balancer_update_params.py b/src/cloudflare/types/load_balancers/load_balancer_update_params.py
index 4055e4c5438..0908929cb3e 100644
--- a/src/cloudflare/types/load_balancers/load_balancer_update_params.py
+++ b/src/cloudflare/types/load_balancers/load_balancer_update_params.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from typing import List, Iterable
+from typing import Dict, Iterable
 from typing_extensions import Required, TypedDict
 
+from ..._types import SequenceNotStr
 from .rules_param import RulesParam
 from .default_pools import DefaultPools
 from .steering_policy import SteeringPolicy
@@ -20,14 +21,14 @@
 class LoadBalancerUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
 
-    default_pools: Required[List[DefaultPools]]
+    default_pools: Required[SequenceNotStr[DefaultPools]]
     """A list of pool IDs ordered by their failover priority.
 
     Pools defined here are used by default, or when region_pools are not configured
     for a given region.
     """
 
-    fallback_pool: Required[object]
+    fallback_pool: Required[str]
     """The pool ID to use when all other pools are detected as unhealthy."""
 
     name: Required[str]
@@ -47,7 +48,7 @@ class LoadBalancerUpdateParams(TypedDict, total=False):
     is retried once against this alternate origin.
     """
 
-    country_pools: object
+    country_pools: Dict[str, SequenceNotStr[str]]
     """
     A mapping of country codes to a list of pool IDs (ordered by their failover
     priority) for the given country. Any country not explicitly defined will fall
@@ -67,9 +68,12 @@ class LoadBalancerUpdateParams(TypedDict, total=False):
     See `steering_policy` to learn how steering is affected.
     """
 
-    pop_pools: object
+    networks: SequenceNotStr[str]
+    """List of networks where Load Balancer or Pool is enabled."""
+
+    pop_pools: Dict[str, SequenceNotStr[str]]
     """
-    (Enterprise only): A mapping of Cloudflare PoP identifiers to a list of pool IDs
+    Enterprise only: A mapping of Cloudflare PoP identifiers to a list of pool IDs
     (ordered by their failover priority) for the PoP (datacenter). Any PoPs not
     explicitly defined will fall back to using the corresponding country_pool, then
     region_pool mapping if it exists else to default_pools.
@@ -89,7 +93,7 @@ class LoadBalancerUpdateParams(TypedDict, total=False):
       open connections.
     """
 
-    region_pools: object
+    region_pools: Dict[str, SequenceNotStr[str]]
     """
     A mapping of region codes to a list of pool IDs (ordered by their failover
     priority) for the given region. Any regions not explicitly defined will fall
@@ -105,28 +109,25 @@ class LoadBalancerUpdateParams(TypedDict, total=False):
     session_affinity: SessionAffinity
     """
     Specifies the type of session affinity the load balancer should use unless
-    specified as `"none"` or "" (default). The supported types are:
-
-    - `"cookie"`: On the first request to a proxied load balancer, a cookie is
-      generated, encoding information of which origin the request will be forwarded
-      to. Subsequent requests, by the same client to the same load balancer, will be
-      sent to the origin server the cookie encodes, for the duration of the cookie
-      and as long as the origin server remains healthy. If the cookie has expired or
-      the origin server is unhealthy, then a new origin server is calculated and
-      used.
-    - `"ip_cookie"`: Behaves the same as `"cookie"` except the initial origin
-      selection is stable and based on the client's ip address.
-    - `"header"`: On the first request to a proxied load balancer, a session key
-      based on the configured HTTP headers (see
-      `session_affinity_attributes.headers`) is generated, encoding the request
-      headers used for storing in the load balancer session state which origin the
-      request will be forwarded to. Subsequent requests to the load balancer with
-      the same headers will be sent to the same origin server, for the duration of
-      the session and as long as the origin server remains healthy. If the session
-      has been idle for the duration of `session_affinity_ttl` seconds or the origin
-      server is unhealthy, then a new origin server is calculated and used. See
-      `headers` in `session_affinity_attributes` for additional required
-      configuration.
+    specified as `"none"`. The supported types are: - `"cookie"`: On the first
+    request to a proxied load balancer, a cookie is generated, encoding information
+    of which origin the request will be forwarded to. Subsequent requests, by the
+    same client to the same load balancer, will be sent to the origin server the
+    cookie encodes, for the duration of the cookie and as long as the origin server
+    remains healthy. If the cookie has expired or the origin server is unhealthy,
+    then a new origin server is calculated and used. - `"ip_cookie"`: Behaves the
+    same as `"cookie"` except the initial origin selection is stable and based on
+    the client's ip address. - `"header"`: On the first request to a proxied load
+    balancer, a session key based on the configured HTTP headers (see
+    `session_affinity_attributes.headers`) is generated, encoding the request
+    headers used for storing in the load balancer session state which origin the
+    request will be forwarded to. Subsequent requests to the load balancer with the
+    same headers will be sent to the same origin server, for the duration of the
+    session and as long as the origin server remains healthy. If the session has
+    been idle for the duration of `session_affinity_ttl` seconds or the origin
+    server is unhealthy, then a new origin server is calculated and used. See
+    `headers` in `session_affinity_attributes` for additional required
+    configuration.
     """
 
     session_affinity_attributes: SessionAffinityAttributesParam
@@ -136,14 +137,13 @@ class LoadBalancerUpdateParams(TypedDict, total=False):
     """Time, in seconds, until a client's session expires after being created.
 
     Once the expiry time has been reached, subsequent requests may get sent to a
-    different origin server. The accepted ranges per `session_affinity` policy are:
-
-    - `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used
-      unless explicitly set. The accepted range of values is between [1800, 604800].
-    - `"header"`: The current default of 1800 seconds will be used unless explicitly
-      set. The accepted range of values is between [30, 3600]. Note: With session
-      affinity by header, sessions only expire after they haven't been used for the
-      number of seconds specified.
+    different origin server. The accepted ranges per `session_affinity` policy
+    are: - `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used
+    unless explicitly set. The accepted range of values is between [1800, 604800]. -
+    `"header"`: The current default of 1800 seconds will be used unless explicitly
+    set. The accepted range of values is between [30, 3600]. Note: With session
+    affinity by header, sessions only expire after they haven't been used for the
+    number of seconds specified.
     """
 
     steering_policy: SteeringPolicy
diff --git a/src/cloudflare/types/load_balancers/load_shedding.py b/src/cloudflare/types/load_balancers/load_shedding.py
index 882b6787d30..d8345905fa3 100644
--- a/src/cloudflare/types/load_balancers/load_shedding.py
+++ b/src/cloudflare/types/load_balancers/load_shedding.py
@@ -9,6 +9,8 @@
 
 
 class LoadShedding(BaseModel):
+    """Configures load shedding policies and percentages for the pool."""
+
     default_percent: Optional[float] = None
     """The percent of traffic to shed from the pool, according to the default policy.
 
diff --git a/src/cloudflare/types/load_balancers/load_shedding_param.py b/src/cloudflare/types/load_balancers/load_shedding_param.py
index 96a271c86a7..1654a5c90e3 100644
--- a/src/cloudflare/types/load_balancers/load_shedding_param.py
+++ b/src/cloudflare/types/load_balancers/load_shedding_param.py
@@ -8,6 +8,8 @@
 
 
 class LoadSheddingParam(TypedDict, total=False):
+    """Configures load shedding policies and percentages for the pool."""
+
     default_percent: float
     """The percent of traffic to shed from the pool, according to the default policy.
 
diff --git a/src/cloudflare/types/load_balancers/location_strategy.py b/src/cloudflare/types/load_balancers/location_strategy.py
index 87853e3b5d6..c64d855aaf2 100644
--- a/src/cloudflare/types/load_balancers/location_strategy.py
+++ b/src/cloudflare/types/load_balancers/location_strategy.py
@@ -9,6 +9,11 @@
 
 
 class LocationStrategy(BaseModel):
+    """Controls location-based steering for non-proxied requests.
+
+    See `steering_policy` to learn how steering is affected.
+    """
+
     mode: Optional[Literal["pop", "resolver_ip"]] = None
     """
     Determines the authoritative location when ECS is not preferred, does not exist
diff --git a/src/cloudflare/types/load_balancers/location_strategy_param.py b/src/cloudflare/types/load_balancers/location_strategy_param.py
index 232138b3c5d..67689b24eff 100644
--- a/src/cloudflare/types/load_balancers/location_strategy_param.py
+++ b/src/cloudflare/types/load_balancers/location_strategy_param.py
@@ -8,6 +8,11 @@
 
 
 class LocationStrategyParam(TypedDict, total=False):
+    """Controls location-based steering for non-proxied requests.
+
+    See `steering_policy` to learn how steering is affected.
+    """
+
     mode: Literal["pop", "resolver_ip"]
     """
     Determines the authoritative location when ECS is not preferred, does not exist
diff --git a/src/cloudflare/types/load_balancers/monitor.py b/src/cloudflare/types/load_balancers/monitor.py
index 5ab61feed08..39d78e0ae70 100644
--- a/src/cloudflare/types/load_balancers/monitor.py
+++ b/src/cloudflare/types/load_balancers/monitor.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
-from datetime import datetime
+from typing import Dict, List, Optional
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -30,7 +29,7 @@ class Monitor(BaseModel):
     consecutive times.
     """
 
-    created_on: Optional[datetime] = None
+    created_on: Optional[str] = None
 
     description: Optional[str] = None
     """Object description."""
@@ -54,7 +53,7 @@ class Monitor(BaseModel):
     This parameter is only valid for HTTP and HTTPS monitors.
     """
 
-    header: Optional[object] = None
+    header: Optional[Dict[str, List[str]]] = None
     """The HTTP request headers to send in the health check.
 
     It is recommended you set a Host header by default. The User-Agent header cannot
@@ -75,7 +74,7 @@ class Monitor(BaseModel):
     for TCP based health checks.
     """
 
-    modified_on: Optional[datetime] = None
+    modified_on: Optional[str] = None
 
     path: Optional[str] = None
     """The endpoint path you want to conduct a health check against.
diff --git a/src/cloudflare/types/load_balancers/monitor_create_params.py b/src/cloudflare/types/load_balancers/monitor_create_params.py
index f6b63b1307e..b68e28a1226 100644
--- a/src/cloudflare/types/load_balancers/monitor_create_params.py
+++ b/src/cloudflare/types/load_balancers/monitor_create_params.py
@@ -2,8 +2,10 @@
 
 from __future__ import annotations
 
+from typing import Dict, Optional
 from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 
 __all__ = ["MonitorCreateParams"]
@@ -11,13 +13,7 @@
 
 class MonitorCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
-
-    expected_codes: Required[str]
-    """The expected HTTP response code or code range of the health check.
-
-    This parameter is only valid for HTTP and HTTPS monitors.
-    """
+    """Identifier."""
 
     allow_insecure: bool
     """Do not validate the certificate when monitor use HTTPS.
@@ -47,13 +43,19 @@ class MonitorCreateParams(TypedDict, total=False):
     parameter is only valid for HTTP and HTTPS monitors.
     """
 
+    expected_codes: str
+    """The expected HTTP response code or code range of the health check.
+
+    This parameter is only valid for HTTP and HTTPS monitors.
+    """
+
     follow_redirects: bool
     """Follow redirects if returned by the origin.
 
     This parameter is only valid for HTTP and HTTPS monitors.
     """
 
-    header: object
+    header: Dict[str, SequenceNotStr[str]]
     """The HTTP request headers to send in the health check.
 
     It is recommended you set a Host header by default. The User-Agent header cannot
@@ -80,7 +82,7 @@ class MonitorCreateParams(TypedDict, total=False):
     This parameter is only valid for HTTP and HTTPS monitors.
     """
 
-    port: int
+    port: Optional[int]
     """The port number to connect to for the health check.
 
     Required for TCP, UDP, and SMTP checks. HTTP and HTTPS checks should only define
diff --git a/src/cloudflare/types/load_balancers/monitor_edit_params.py b/src/cloudflare/types/load_balancers/monitor_edit_params.py
index 1e05492fc87..e826841b064 100644
--- a/src/cloudflare/types/load_balancers/monitor_edit_params.py
+++ b/src/cloudflare/types/load_balancers/monitor_edit_params.py
@@ -2,8 +2,10 @@
 
 from __future__ import annotations
 
+from typing import Dict, Optional
 from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 
 __all__ = ["MonitorEditParams"]
@@ -11,13 +13,7 @@
 
 class MonitorEditParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
-
-    expected_codes: Required[str]
-    """The expected HTTP response code or code range of the health check.
-
-    This parameter is only valid for HTTP and HTTPS monitors.
-    """
+    """Identifier."""
 
     allow_insecure: bool
     """Do not validate the certificate when monitor use HTTPS.
@@ -47,13 +43,19 @@ class MonitorEditParams(TypedDict, total=False):
     parameter is only valid for HTTP and HTTPS monitors.
     """
 
+    expected_codes: str
+    """The expected HTTP response code or code range of the health check.
+
+    This parameter is only valid for HTTP and HTTPS monitors.
+    """
+
     follow_redirects: bool
     """Follow redirects if returned by the origin.
 
     This parameter is only valid for HTTP and HTTPS monitors.
     """
 
-    header: object
+    header: Dict[str, SequenceNotStr[str]]
     """The HTTP request headers to send in the health check.
 
     It is recommended you set a Host header by default. The User-Agent header cannot
@@ -80,7 +82,7 @@ class MonitorEditParams(TypedDict, total=False):
     This parameter is only valid for HTTP and HTTPS monitors.
     """
 
-    port: int
+    port: Optional[int]
     """The port number to connect to for the health check.
 
     Required for TCP, UDP, and SMTP checks. HTTP and HTTPS checks should only define
diff --git a/src/cloudflare/types/load_balancers/monitor_group.py b/src/cloudflare/types/load_balancers/monitor_group.py
new file mode 100644
index 00000000000..bd6ac9c5a38
--- /dev/null
+++ b/src/cloudflare/types/load_balancers/monitor_group.py
@@ -0,0 +1,51 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["MonitorGroup", "Member"]
+
+
+class Member(BaseModel):
+    enabled: bool
+    """Whether this monitor is enabled in the group"""
+
+    monitor_id: str
+    """
+    The ID of the Monitor to use for checking the health of origins within this
+    pool.
+    """
+
+    monitoring_only: bool
+    """Whether this monitor is used for monitoring only (does not affect pool health)"""
+
+    must_be_healthy: bool
+    """Whether this monitor must be healthy for the pool to be considered healthy"""
+
+    created_at: Optional[datetime] = None
+    """The timestamp of when the monitor was added to the group"""
+
+    updated_at: Optional[datetime] = None
+    """The timestamp of when the monitor group member was last updated"""
+
+
+class MonitorGroup(BaseModel):
+    id: str
+    """
+    The ID of the Monitor Group to use for checking the health of origins within
+    this pool.
+    """
+
+    description: str
+    """A short description of the monitor group"""
+
+    members: List[Member]
+    """List of monitors in this group"""
+
+    created_at: Optional[datetime] = None
+    """The timestamp of when the monitor group was created"""
+
+    updated_at: Optional[datetime] = None
+    """The timestamp of when the monitor group was last updated"""
diff --git a/src/cloudflare/types/load_balancers/monitor_group_create_params.py b/src/cloudflare/types/load_balancers/monitor_group_create_params.py
new file mode 100644
index 00000000000..0d9b6714ddd
--- /dev/null
+++ b/src/cloudflare/types/load_balancers/monitor_group_create_params.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["MonitorGroupCreateParams", "Member"]
+
+
+class MonitorGroupCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    id: Required[str]
+    """
+    The ID of the Monitor Group to use for checking the health of origins within
+    this pool.
+    """
+
+    description: Required[str]
+    """A short description of the monitor group"""
+
+    members: Required[Iterable[Member]]
+    """List of monitors in this group"""
+
+
+class Member(TypedDict, total=False):
+    enabled: Required[bool]
+    """Whether this monitor is enabled in the group"""
+
+    monitor_id: Required[str]
+    """
+    The ID of the Monitor to use for checking the health of origins within this
+    pool.
+    """
+
+    monitoring_only: Required[bool]
+    """Whether this monitor is used for monitoring only (does not affect pool health)"""
+
+    must_be_healthy: Required[bool]
+    """Whether this monitor must be healthy for the pool to be considered healthy"""
diff --git a/src/cloudflare/types/load_balancers/monitor_group_edit_params.py b/src/cloudflare/types/load_balancers/monitor_group_edit_params.py
new file mode 100644
index 00000000000..212f85f5360
--- /dev/null
+++ b/src/cloudflare/types/load_balancers/monitor_group_edit_params.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["MonitorGroupEditParams", "Member"]
+
+
+class MonitorGroupEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    id: Required[str]
+    """
+    The ID of the Monitor Group to use for checking the health of origins within
+    this pool.
+    """
+
+    description: Required[str]
+    """A short description of the monitor group"""
+
+    members: Required[Iterable[Member]]
+    """List of monitors in this group"""
+
+
+class Member(TypedDict, total=False):
+    enabled: Required[bool]
+    """Whether this monitor is enabled in the group"""
+
+    monitor_id: Required[str]
+    """
+    The ID of the Monitor to use for checking the health of origins within this
+    pool.
+    """
+
+    monitoring_only: Required[bool]
+    """Whether this monitor is used for monitoring only (does not affect pool health)"""
+
+    must_be_healthy: Required[bool]
+    """Whether this monitor must be healthy for the pool to be considered healthy"""
diff --git a/src/cloudflare/types/load_balancers/monitor_group_update_params.py b/src/cloudflare/types/load_balancers/monitor_group_update_params.py
new file mode 100644
index 00000000000..9122012730b
--- /dev/null
+++ b/src/cloudflare/types/load_balancers/monitor_group_update_params.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["MonitorGroupUpdateParams", "Member"]
+
+
+class MonitorGroupUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    id: Required[str]
+    """
+    The ID of the Monitor Group to use for checking the health of origins within
+    this pool.
+    """
+
+    description: Required[str]
+    """A short description of the monitor group"""
+
+    members: Required[Iterable[Member]]
+    """List of monitors in this group"""
+
+
+class Member(TypedDict, total=False):
+    enabled: Required[bool]
+    """Whether this monitor is enabled in the group"""
+
+    monitor_id: Required[str]
+    """
+    The ID of the Monitor to use for checking the health of origins within this
+    pool.
+    """
+
+    monitoring_only: Required[bool]
+    """Whether this monitor is used for monitoring only (does not affect pool health)"""
+
+    must_be_healthy: Required[bool]
+    """Whether this monitor must be healthy for the pool to be considered healthy"""
diff --git a/src/cloudflare/types/load_balancers/monitor_update_params.py b/src/cloudflare/types/load_balancers/monitor_update_params.py
index 8b2e71f14ca..77c2394d060 100644
--- a/src/cloudflare/types/load_balancers/monitor_update_params.py
+++ b/src/cloudflare/types/load_balancers/monitor_update_params.py
@@ -2,8 +2,10 @@
 
 from __future__ import annotations
 
+from typing import Dict, Optional
 from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 
 __all__ = ["MonitorUpdateParams"]
@@ -11,13 +13,7 @@
 
 class MonitorUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
-
-    expected_codes: Required[str]
-    """The expected HTTP response code or code range of the health check.
-
-    This parameter is only valid for HTTP and HTTPS monitors.
-    """
+    """Identifier."""
 
     allow_insecure: bool
     """Do not validate the certificate when monitor use HTTPS.
@@ -47,13 +43,19 @@ class MonitorUpdateParams(TypedDict, total=False):
     parameter is only valid for HTTP and HTTPS monitors.
     """
 
+    expected_codes: str
+    """The expected HTTP response code or code range of the health check.
+
+    This parameter is only valid for HTTP and HTTPS monitors.
+    """
+
     follow_redirects: bool
     """Follow redirects if returned by the origin.
 
     This parameter is only valid for HTTP and HTTPS monitors.
     """
 
-    header: object
+    header: Dict[str, SequenceNotStr[str]]
     """The HTTP request headers to send in the health check.
 
     It is recommended you set a Host header by default. The User-Agent header cannot
@@ -80,7 +82,7 @@ class MonitorUpdateParams(TypedDict, total=False):
     This parameter is only valid for HTTP and HTTPS monitors.
     """
 
-    port: int
+    port: Optional[int]
     """The port number to connect to for the health check.
 
     Required for TCP, UDP, and SMTP checks. HTTP and HTTPS checks should only define
diff --git a/src/cloudflare/types/load_balancers/monitors/preview_create_params.py b/src/cloudflare/types/load_balancers/monitors/preview_create_params.py
index bbd4132b0c5..c9a8d5b7b68 100644
--- a/src/cloudflare/types/load_balancers/monitors/preview_create_params.py
+++ b/src/cloudflare/types/load_balancers/monitors/preview_create_params.py
@@ -2,8 +2,10 @@
 
 from __future__ import annotations
 
+from typing import Dict, Optional
 from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["PreviewCreateParams"]
@@ -11,13 +13,7 @@
 
 class PreviewCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
-
-    expected_codes: Required[str]
-    """The expected HTTP response code or code range of the health check.
-
-    This parameter is only valid for HTTP and HTTPS monitors.
-    """
+    """Identifier."""
 
     allow_insecure: bool
     """Do not validate the certificate when monitor use HTTPS.
@@ -47,13 +43,19 @@ class PreviewCreateParams(TypedDict, total=False):
     parameter is only valid for HTTP and HTTPS monitors.
     """
 
+    expected_codes: str
+    """The expected HTTP response code or code range of the health check.
+
+    This parameter is only valid for HTTP and HTTPS monitors.
+    """
+
     follow_redirects: bool
     """Follow redirects if returned by the origin.
 
     This parameter is only valid for HTTP and HTTPS monitors.
     """
 
-    header: object
+    header: Dict[str, SequenceNotStr[str]]
     """The HTTP request headers to send in the health check.
 
     It is recommended you set a Host header by default. The User-Agent header cannot
@@ -80,7 +82,7 @@ class PreviewCreateParams(TypedDict, total=False):
     This parameter is only valid for HTTP and HTTPS monitors.
     """
 
-    port: int
+    port: Optional[int]
     """The port number to connect to for the health check.
 
     Required for TCP, UDP, and SMTP checks. HTTP and HTTPS checks should only define
diff --git a/src/cloudflare/types/load_balancers/monitors/reference_get_response.py b/src/cloudflare/types/load_balancers/monitors/reference_get_response.py
index 6d8e6c352ed..91f6725f1c8 100644
--- a/src/cloudflare/types/load_balancers/monitors/reference_get_response.py
+++ b/src/cloudflare/types/load_balancers/monitors/reference_get_response.py
@@ -1,14 +1,14 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Optional
 from typing_extensions import Literal
 
 from ...._models import BaseModel
 
-__all__ = ["ReferenceGetResponse", "ReferenceGetResponseItem"]
+__all__ = ["ReferenceGetResponse"]
 
 
-class ReferenceGetResponseItem(BaseModel):
+class ReferenceGetResponse(BaseModel):
     reference_type: Optional[Literal["*", "referral", "referrer"]] = None
 
     resource_id: Optional[str] = None
@@ -16,6 +16,3 @@ class ReferenceGetResponseItem(BaseModel):
     resource_name: Optional[str] = None
 
     resource_type: Optional[str] = None
-
-
-ReferenceGetResponse = List[ReferenceGetResponseItem]
diff --git a/src/cloudflare/types/load_balancers/notification_filter.py b/src/cloudflare/types/load_balancers/notification_filter.py
index de6857dea4d..b31030dc832 100644
--- a/src/cloudflare/types/load_balancers/notification_filter.py
+++ b/src/cloudflare/types/load_balancers/notification_filter.py
@@ -9,6 +9,11 @@
 
 
 class NotificationFilter(BaseModel):
+    """Filter pool and origin health notifications by resource type or health status.
+
+    Use null to reset.
+    """
+
     origin: Optional[FilterOptions] = None
     """Filter options for a particular resource type (pool or origin).
 
diff --git a/src/cloudflare/types/load_balancers/notification_filter_param.py b/src/cloudflare/types/load_balancers/notification_filter_param.py
index ac4daaabaf3..ac1aebd619e 100644
--- a/src/cloudflare/types/load_balancers/notification_filter_param.py
+++ b/src/cloudflare/types/load_balancers/notification_filter_param.py
@@ -11,6 +11,11 @@
 
 
 class NotificationFilterParam(TypedDict, total=False):
+    """Filter pool and origin health notifications by resource type or health status.
+
+    Use null to reset.
+    """
+
     origin: Optional[FilterOptionsParam]
     """Filter options for a particular resource type (pool or origin).
 
diff --git a/src/cloudflare/types/load_balancers/origin.py b/src/cloudflare/types/load_balancers/origin.py
index dda86860147..2745c7ea766 100644
--- a/src/cloudflare/types/load_balancers/origin.py
+++ b/src/cloudflare/types/load_balancers/origin.py
@@ -40,6 +40,12 @@ class Origin(BaseModel):
     name: Optional[str] = None
     """A human-identifiable name for the origin."""
 
+    port: Optional[int] = None
+    """The port for upstream connections.
+
+    A value of 0 means the default port for the protocol will be used.
+    """
+
     virtual_network_id: Optional[str] = None
     """The virtual network subnet ID the origin belongs in.
 
diff --git a/src/cloudflare/types/load_balancers/origin_param.py b/src/cloudflare/types/load_balancers/origin_param.py
index 0b35856a9b5..1872d937828 100644
--- a/src/cloudflare/types/load_balancers/origin_param.py
+++ b/src/cloudflare/types/load_balancers/origin_param.py
@@ -34,6 +34,12 @@ class OriginParam(TypedDict, total=False):
     name: str
     """A human-identifiable name for the origin."""
 
+    port: int
+    """The port for upstream connections.
+
+    A value of 0 means the default port for the protocol will be used.
+    """
+
     virtual_network_id: str
     """The virtual network subnet ID the origin belongs in.
 
diff --git a/src/cloudflare/types/load_balancers/origin_steering.py b/src/cloudflare/types/load_balancers/origin_steering.py
index e7983ceea0b..0c41d8596c5 100644
--- a/src/cloudflare/types/load_balancers/origin_steering.py
+++ b/src/cloudflare/types/load_balancers/origin_steering.py
@@ -9,6 +9,11 @@
 
 
 class OriginSteering(BaseModel):
+    """Configures origin steering for the pool.
+
+    Controls how origins are selected for new sessions and traffic without session affinity.
+    """
+
     policy: Optional[Literal["random", "hash", "least_outstanding_requests", "least_connections"]] = None
     """The type of origin steering policy to use.
 
diff --git a/src/cloudflare/types/load_balancers/origin_steering_param.py b/src/cloudflare/types/load_balancers/origin_steering_param.py
index 82bfee85f69..9ba511fb250 100644
--- a/src/cloudflare/types/load_balancers/origin_steering_param.py
+++ b/src/cloudflare/types/load_balancers/origin_steering_param.py
@@ -8,6 +8,11 @@
 
 
 class OriginSteeringParam(TypedDict, total=False):
+    """Configures origin steering for the pool.
+
+    Controls how origins are selected for new sessions and traffic without session affinity.
+    """
+
     policy: Literal["random", "hash", "least_outstanding_requests", "least_connections"]
     """The type of origin steering policy to use.
 
diff --git a/src/cloudflare/types/load_balancers/pool.py b/src/cloudflare/types/load_balancers/pool.py
index beb27193b3d..32095149e87 100644
--- a/src/cloudflare/types/load_balancers/pool.py
+++ b/src/cloudflare/types/load_balancers/pool.py
@@ -22,7 +22,7 @@ class Pool(BaseModel):
     Null means every Cloudflare data center.
     """
 
-    created_on: Optional[datetime] = None
+    created_on: Optional[str] = None
 
     description: Optional[str] = None
     """A human-readable description of the pool."""
@@ -63,20 +63,29 @@ class Pool(BaseModel):
     be marked unhealthy and will failover to the next available pool.
     """
 
-    modified_on: Optional[datetime] = None
+    modified_on: Optional[str] = None
 
-    monitor: Optional[object] = None
+    monitor: Optional[str] = None
     """
     The ID of the Monitor to use for checking the health of origins within this
     pool.
     """
 
+    monitor_group: Optional[str] = None
+    """
+    The ID of the Monitor Group to use for checking the health of origins within
+    this pool.
+    """
+
     name: Optional[str] = None
     """A short name (tag) for the pool.
 
     Only alphanumeric characters, hyphens, and underscores are allowed.
     """
 
+    networks: Optional[List[str]] = None
+    """List of networks where Load Balancer or Pool is enabled."""
+
     notification_email: Optional[str] = None
     """This field is now deprecated.
 
diff --git a/src/cloudflare/types/load_balancers/pool_bulk_edit_params.py b/src/cloudflare/types/load_balancers/pool_bulk_edit_params.py
new file mode 100644
index 00000000000..af6bc6635c8
--- /dev/null
+++ b/src/cloudflare/types/load_balancers/pool_bulk_edit_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["PoolBulkEditParams"]
+
+
+class PoolBulkEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    notification_email: Literal[""]
+    """The email address to send health status notifications to.
+
+    This field is now deprecated in favor of Cloudflare Notifications for Load
+    Balancing, so only resetting this field with an empty string `""` is accepted.
+    """
diff --git a/src/cloudflare/types/load_balancers/pool_create_params.py b/src/cloudflare/types/load_balancers/pool_create_params.py
index 49c54c78fc0..08779830381 100644
--- a/src/cloudflare/types/load_balancers/pool_create_params.py
+++ b/src/cloudflare/types/load_balancers/pool_create_params.py
@@ -15,7 +15,7 @@
 
 class PoolCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     name: Required[str]
     """A short name (tag) for the pool.
@@ -47,7 +47,7 @@ class PoolCreateParams(TypedDict, total=False):
     decimal degrees. If this is set, longitude must also be set.
     """
 
-    load_shedding: LoadSheddingParam
+    load_shedding: Optional[LoadSheddingParam]
     """Configures load shedding policies and percentages for the pool."""
 
     longitude: float
@@ -63,12 +63,18 @@ class PoolCreateParams(TypedDict, total=False):
     be marked unhealthy and will failover to the next available pool.
     """
 
-    monitor: object
+    monitor: str
     """
     The ID of the Monitor to use for checking the health of origins within this
     pool.
     """
 
+    monitor_group: str
+    """
+    The ID of the Monitor Group to use for checking the health of origins within
+    this pool.
+    """
+
     notification_email: str
     """This field is now deprecated.
 
@@ -84,7 +90,7 @@ class PoolCreateParams(TypedDict, total=False):
     Use null to reset.
     """
 
-    origin_steering: OriginSteeringParam
+    origin_steering: Optional[OriginSteeringParam]
     """Configures origin steering for the pool.
 
     Controls how origins are selected for new sessions and traffic without session
diff --git a/src/cloudflare/types/load_balancers/pool_edit_params.py b/src/cloudflare/types/load_balancers/pool_edit_params.py
index 222e8ab9357..e3f89941084 100644
--- a/src/cloudflare/types/load_balancers/pool_edit_params.py
+++ b/src/cloudflare/types/load_balancers/pool_edit_params.py
@@ -16,7 +16,7 @@
 
 class PoolEditParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     check_regions: Optional[List[CheckRegion]]
     """A list of regions from which to run health checks.
@@ -41,7 +41,7 @@ class PoolEditParams(TypedDict, total=False):
     decimal degrees. If this is set, longitude must also be set.
     """
 
-    load_shedding: LoadSheddingParam
+    load_shedding: Optional[LoadSheddingParam]
     """Configures load shedding policies and percentages for the pool."""
 
     longitude: float
@@ -57,12 +57,18 @@ class PoolEditParams(TypedDict, total=False):
     be marked unhealthy and will failover to the next available pool.
     """
 
-    monitor: object
+    monitor: str
     """
     The ID of the Monitor to use for checking the health of origins within this
     pool.
     """
 
+    monitor_group: str
+    """
+    The ID of the Monitor Group to use for checking the health of origins within
+    this pool.
+    """
+
     name: str
     """A short name (tag) for the pool.
 
@@ -84,7 +90,7 @@ class PoolEditParams(TypedDict, total=False):
     Use null to reset.
     """
 
-    origin_steering: OriginSteeringParam
+    origin_steering: Optional[OriginSteeringParam]
     """Configures origin steering for the pool.
 
     Controls how origins are selected for new sessions and traffic without session
diff --git a/src/cloudflare/types/load_balancers/pool_list_params.py b/src/cloudflare/types/load_balancers/pool_list_params.py
index c545fe63854..35367c51396 100644
--- a/src/cloudflare/types/load_balancers/pool_list_params.py
+++ b/src/cloudflare/types/load_balancers/pool_list_params.py
@@ -9,9 +9,9 @@
 
 class PoolListParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    monitor: object
+    monitor: str
     """
     The ID of the Monitor to use for checking the health of origins within this
     pool.
diff --git a/src/cloudflare/types/load_balancers/pool_update_params.py b/src/cloudflare/types/load_balancers/pool_update_params.py
index 834c3ec1b70..bfcf15e6b84 100644
--- a/src/cloudflare/types/load_balancers/pool_update_params.py
+++ b/src/cloudflare/types/load_balancers/pool_update_params.py
@@ -16,7 +16,7 @@
 
 class PoolUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     name: Required[str]
     """A short name (tag) for the pool.
@@ -54,7 +54,7 @@ class PoolUpdateParams(TypedDict, total=False):
     decimal degrees. If this is set, longitude must also be set.
     """
 
-    load_shedding: LoadSheddingParam
+    load_shedding: Optional[LoadSheddingParam]
     """Configures load shedding policies and percentages for the pool."""
 
     longitude: float
@@ -70,12 +70,18 @@ class PoolUpdateParams(TypedDict, total=False):
     be marked unhealthy and will failover to the next available pool.
     """
 
-    monitor: object
+    monitor: str
     """
     The ID of the Monitor to use for checking the health of origins within this
     pool.
     """
 
+    monitor_group: str
+    """
+    The ID of the Monitor Group to use for checking the health of origins within
+    this pool.
+    """
+
     notification_email: str
     """This field is now deprecated.
 
@@ -91,7 +97,7 @@ class PoolUpdateParams(TypedDict, total=False):
     Use null to reset.
     """
 
-    origin_steering: OriginSteeringParam
+    origin_steering: Optional[OriginSteeringParam]
     """Configures origin steering for the pool.
 
     Controls how origins are selected for new sessions and traffic without session
diff --git a/src/cloudflare/types/load_balancers/pools/health_create_params.py b/src/cloudflare/types/load_balancers/pools/health_create_params.py
index 6ed9397aac8..4cc0852bba0 100644
--- a/src/cloudflare/types/load_balancers/pools/health_create_params.py
+++ b/src/cloudflare/types/load_balancers/pools/health_create_params.py
@@ -2,8 +2,10 @@
 
 from __future__ import annotations
 
+from typing import Dict, Optional
 from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["HealthCreateParams"]
@@ -11,13 +13,7 @@
 
 class HealthCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
-
-    expected_codes: Required[str]
-    """The expected HTTP response code or code range of the health check.
-
-    This parameter is only valid for HTTP and HTTPS monitors.
-    """
+    """Identifier."""
 
     allow_insecure: bool
     """Do not validate the certificate when monitor use HTTPS.
@@ -47,13 +43,19 @@ class HealthCreateParams(TypedDict, total=False):
     parameter is only valid for HTTP and HTTPS monitors.
     """
 
+    expected_codes: str
+    """The expected HTTP response code or code range of the health check.
+
+    This parameter is only valid for HTTP and HTTPS monitors.
+    """
+
     follow_redirects: bool
     """Follow redirects if returned by the origin.
 
     This parameter is only valid for HTTP and HTTPS monitors.
     """
 
-    header: object
+    header: Dict[str, SequenceNotStr[str]]
     """The HTTP request headers to send in the health check.
 
     It is recommended you set a Host header by default. The User-Agent header cannot
@@ -80,7 +82,7 @@ class HealthCreateParams(TypedDict, total=False):
     This parameter is only valid for HTTP and HTTPS monitors.
     """
 
-    port: int
+    port: Optional[int]
     """The port number to connect to for the health check.
 
     Required for TCP, UDP, and SMTP checks. HTTP and HTTPS checks should only define
diff --git a/src/cloudflare/types/load_balancers/pools/health_get_response.py b/src/cloudflare/types/load_balancers/pools/health_get_response.py
index 03984e327ce..334929adf3b 100644
--- a/src/cloudflare/types/load_balancers/pools/health_get_response.py
+++ b/src/cloudflare/types/load_balancers/pools/health_get_response.py
@@ -1,7 +1,47 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import List, Optional
 
-__all__ = ["HealthGetResponse"]
+from ...._models import BaseModel
 
-HealthGetResponse = Union[Optional[str], Optional[object]]
+__all__ = ["HealthGetResponse", "POPHealth", "POPHealthOrigin", "POPHealthOriginIP"]
+
+
+class POPHealthOriginIP(BaseModel):
+    failure_reason: Optional[str] = None
+    """Failure reason."""
+
+    healthy: Optional[bool] = None
+    """Origin health status."""
+
+    response_code: Optional[float] = None
+    """Response code from origin health check."""
+
+    rtt: Optional[str] = None
+    """Origin RTT (Round Trip Time) response."""
+
+
+class POPHealthOrigin(BaseModel):
+    ip: Optional[POPHealthOriginIP] = None
+
+
+class POPHealth(BaseModel):
+    """List of regions and associated health status."""
+
+    healthy: Optional[bool] = None
+    """Whether health check in region is healthy."""
+
+    origins: Optional[List[POPHealthOrigin]] = None
+
+
+class HealthGetResponse(BaseModel):
+    """A list of regions from which to run health checks.
+
+    Null means every Cloudflare data center.
+    """
+
+    pool_id: Optional[str] = None
+    """Pool ID."""
+
+    pop_health: Optional[POPHealth] = None
+    """List of regions and associated health status."""
diff --git a/src/cloudflare/types/load_balancers/pools/reference_get_response.py b/src/cloudflare/types/load_balancers/pools/reference_get_response.py
index 6d8e6c352ed..91f6725f1c8 100644
--- a/src/cloudflare/types/load_balancers/pools/reference_get_response.py
+++ b/src/cloudflare/types/load_balancers/pools/reference_get_response.py
@@ -1,14 +1,14 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Optional
 from typing_extensions import Literal
 
 from ...._models import BaseModel
 
-__all__ = ["ReferenceGetResponse", "ReferenceGetResponseItem"]
+__all__ = ["ReferenceGetResponse"]
 
 
-class ReferenceGetResponseItem(BaseModel):
+class ReferenceGetResponse(BaseModel):
     reference_type: Optional[Literal["*", "referral", "referrer"]] = None
 
     resource_id: Optional[str] = None
@@ -16,6 +16,3 @@ class ReferenceGetResponseItem(BaseModel):
     resource_name: Optional[str] = None
 
     resource_type: Optional[str] = None
-
-
-ReferenceGetResponse = List[ReferenceGetResponseItem]
diff --git a/src/cloudflare/types/load_balancers/preview_get_response.py b/src/cloudflare/types/load_balancers/preview_get_response.py
index 60d5ed36be9..ceeee8db378 100644
--- a/src/cloudflare/types/load_balancers/preview_get_response.py
+++ b/src/cloudflare/types/load_balancers/preview_get_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Dict, List, Optional
+from typing_extensions import TypeAlias
 
 from ..._models import BaseModel
 
@@ -12,6 +13,8 @@
 
 
 class PreviewGetResponseItemOriginPreviewGetResponseItemOriginItem(BaseModel):
+    """The origin ipv4/ipv6 address or domain name mapped to its health data."""
+
     failure_reason: Optional[str] = None
 
     healthy: Optional[bool] = None
@@ -27,4 +30,4 @@ class PreviewGetResponseItem(BaseModel):
     origins: Optional[List[Dict[str, PreviewGetResponseItemOriginPreviewGetResponseItemOriginItem]]] = None
 
 
-PreviewGetResponse = Dict[str, PreviewGetResponseItem]
+PreviewGetResponse: TypeAlias = Dict[str, PreviewGetResponseItem]
diff --git a/src/cloudflare/types/load_balancers/random_steering.py b/src/cloudflare/types/load_balancers/random_steering.py
index 0eaa15fd484..51ddca20b11 100644
--- a/src/cloudflare/types/load_balancers/random_steering.py
+++ b/src/cloudflare/types/load_balancers/random_steering.py
@@ -1,6 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import Dict, Optional
 
 from ..._models import BaseModel
 
@@ -8,13 +8,20 @@
 
 
 class RandomSteering(BaseModel):
+    """
+    Configures pool weights.
+    - `steering_policy="random"`: A random pool is selected with probability proportional to pool weights.
+    - `steering_policy="least_outstanding_requests"`: Use pool weights to scale each pool's outstanding requests.
+    - `steering_policy="least_connections"`: Use pool weights to scale each pool's open connections.
+    """
+
     default_weight: Optional[float] = None
     """
     The default weight for pools in the load balancer that are not specified in the
     pool_weights map.
     """
 
-    pool_weights: Optional[object] = None
+    pool_weights: Optional[Dict[str, float]] = None
     """A mapping of pool IDs to custom weights.
 
     The weight is relative to other pools in the load balancer.
diff --git a/src/cloudflare/types/load_balancers/random_steering_param.py b/src/cloudflare/types/load_balancers/random_steering_param.py
index bd064e0a834..131fbd924ce 100644
--- a/src/cloudflare/types/load_balancers/random_steering_param.py
+++ b/src/cloudflare/types/load_balancers/random_steering_param.py
@@ -2,19 +2,27 @@
 
 from __future__ import annotations
 
+from typing import Dict
 from typing_extensions import TypedDict
 
 __all__ = ["RandomSteeringParam"]
 
 
 class RandomSteeringParam(TypedDict, total=False):
+    """
+    Configures pool weights.
+    - `steering_policy="random"`: A random pool is selected with probability proportional to pool weights.
+    - `steering_policy="least_outstanding_requests"`: Use pool weights to scale each pool's outstanding requests.
+    - `steering_policy="least_connections"`: Use pool weights to scale each pool's open connections.
+    """
+
     default_weight: float
     """
     The default weight for pools in the load balancer that are not specified in the
     pool_weights map.
     """
 
-    pool_weights: object
+    pool_weights: Dict[str, float]
     """A mapping of pool IDs to custom weights.
 
     The weight is relative to other pools in the load balancer.
diff --git a/src/cloudflare/types/load_balancers/region_get_response.py b/src/cloudflare/types/load_balancers/region_get_response.py
index 183ae9eef70..c4bbad7f15f 100644
--- a/src/cloudflare/types/load_balancers/region_get_response.py
+++ b/src/cloudflare/types/load_balancers/region_get_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Union, Optional
+from typing_extensions import TypeAlias
 
 __all__ = ["RegionGetResponse"]
 
-RegionGetResponse = Union[Optional[str], Optional[object]]
+RegionGetResponse: TypeAlias = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/load_balancers/region_list_params.py b/src/cloudflare/types/load_balancers/region_list_params.py
index 5f42c0470fb..8dbdd2156b8 100644
--- a/src/cloudflare/types/load_balancers/region_list_params.py
+++ b/src/cloudflare/types/load_balancers/region_list_params.py
@@ -9,7 +9,7 @@
 
 class RegionListParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     country_code_a2: str
     """Two-letter alpha-2 country code followed in ISO 3166-1."""
diff --git a/src/cloudflare/types/load_balancers/region_list_response.py b/src/cloudflare/types/load_balancers/region_list_response.py
index 1e027bdb51f..668f256ec66 100644
--- a/src/cloudflare/types/load_balancers/region_list_response.py
+++ b/src/cloudflare/types/load_balancers/region_list_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Union, Optional
+from typing_extensions import TypeAlias
 
 __all__ = ["RegionListResponse"]
 
-RegionListResponse = Union[Optional[str], Optional[object]]
+RegionListResponse: TypeAlias = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/load_balancers/rules.py b/src/cloudflare/types/load_balancers/rules.py
index 41e166c9635..00aee296d76 100644
--- a/src/cloudflare/types/load_balancers/rules.py
+++ b/src/cloudflare/types/load_balancers/rules.py
@@ -1,6 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Dict, List, Optional
 
 from ..._models import BaseModel
 from .default_pools import DefaultPools
@@ -15,6 +15,10 @@
 
 
 class FixedResponse(BaseModel):
+    """
+    A collection of fields used to directly respond to the eyeball instead of routing to a pool. If a fixed_response is supplied the rule will be marked as terminates.
+    """
+
     content_type: Optional[str] = None
     """The http 'Content-Type' header to include in the response."""
 
@@ -29,6 +33,10 @@ class FixedResponse(BaseModel):
 
 
 class Overrides(BaseModel):
+    """
+    A collection of overrides to apply to the load balancer when this rule's condition is true. All fields are optional.
+    """
+
     adaptive_routing: Optional[AdaptiveRouting] = None
     """
     Controls features that modify the routing of requests to pools and origins in
@@ -39,7 +47,7 @@ class Overrides(BaseModel):
     is retried once against this alternate origin.
     """
 
-    country_pools: Optional[object] = None
+    country_pools: Optional[Dict[str, List[str]]] = None
     """
     A mapping of country codes to a list of pool IDs (ordered by their failover
     priority) for the given country. Any country not explicitly defined will fall
@@ -54,7 +62,7 @@ class Overrides(BaseModel):
     for a given region.
     """
 
-    fallback_pool: Optional[object] = None
+    fallback_pool: Optional[str] = None
     """The pool ID to use when all other pools are detected as unhealthy."""
 
     location_strategy: Optional[LocationStrategy] = None
@@ -63,9 +71,9 @@ class Overrides(BaseModel):
     See `steering_policy` to learn how steering is affected.
     """
 
-    pop_pools: Optional[object] = None
+    pop_pools: Optional[Dict[str, List[str]]] = None
     """
-    (Enterprise only): A mapping of Cloudflare PoP identifiers to a list of pool IDs
+    Enterprise only: A mapping of Cloudflare PoP identifiers to a list of pool IDs
     (ordered by their failover priority) for the PoP (datacenter). Any PoPs not
     explicitly defined will fall back to using the corresponding country_pool, then
     region_pool mapping if it exists else to default_pools.
@@ -82,7 +90,7 @@ class Overrides(BaseModel):
       open connections.
     """
 
-    region_pools: Optional[object] = None
+    region_pools: Optional[Dict[str, List[str]]] = None
     """
     A mapping of region codes to a list of pool IDs (ordered by their failover
     priority) for the given region. Any regions not explicitly defined will fall
@@ -92,28 +100,25 @@ class Overrides(BaseModel):
     session_affinity: Optional[SessionAffinity] = None
     """
     Specifies the type of session affinity the load balancer should use unless
-    specified as `"none"` or "" (default). The supported types are:
-
-    - `"cookie"`: On the first request to a proxied load balancer, a cookie is
-      generated, encoding information of which origin the request will be forwarded
-      to. Subsequent requests, by the same client to the same load balancer, will be
-      sent to the origin server the cookie encodes, for the duration of the cookie
-      and as long as the origin server remains healthy. If the cookie has expired or
-      the origin server is unhealthy, then a new origin server is calculated and
-      used.
-    - `"ip_cookie"`: Behaves the same as `"cookie"` except the initial origin
-      selection is stable and based on the client's ip address.
-    - `"header"`: On the first request to a proxied load balancer, a session key
-      based on the configured HTTP headers (see
-      `session_affinity_attributes.headers`) is generated, encoding the request
-      headers used for storing in the load balancer session state which origin the
-      request will be forwarded to. Subsequent requests to the load balancer with
-      the same headers will be sent to the same origin server, for the duration of
-      the session and as long as the origin server remains healthy. If the session
-      has been idle for the duration of `session_affinity_ttl` seconds or the origin
-      server is unhealthy, then a new origin server is calculated and used. See
-      `headers` in `session_affinity_attributes` for additional required
-      configuration.
+    specified as `"none"`. The supported types are: - `"cookie"`: On the first
+    request to a proxied load balancer, a cookie is generated, encoding information
+    of which origin the request will be forwarded to. Subsequent requests, by the
+    same client to the same load balancer, will be sent to the origin server the
+    cookie encodes, for the duration of the cookie and as long as the origin server
+    remains healthy. If the cookie has expired or the origin server is unhealthy,
+    then a new origin server is calculated and used. - `"ip_cookie"`: Behaves the
+    same as `"cookie"` except the initial origin selection is stable and based on
+    the client's ip address. - `"header"`: On the first request to a proxied load
+    balancer, a session key based on the configured HTTP headers (see
+    `session_affinity_attributes.headers`) is generated, encoding the request
+    headers used for storing in the load balancer session state which origin the
+    request will be forwarded to. Subsequent requests to the load balancer with the
+    same headers will be sent to the same origin server, for the duration of the
+    session and as long as the origin server remains healthy. If the session has
+    been idle for the duration of `session_affinity_ttl` seconds or the origin
+    server is unhealthy, then a new origin server is calculated and used. See
+    `headers` in `session_affinity_attributes` for additional required
+    configuration.
     """
 
     session_affinity_attributes: Optional[SessionAffinityAttributes] = None
@@ -123,14 +128,13 @@ class Overrides(BaseModel):
     """Time, in seconds, until a client's session expires after being created.
 
     Once the expiry time has been reached, subsequent requests may get sent to a
-    different origin server. The accepted ranges per `session_affinity` policy are:
-
-    - `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used
-      unless explicitly set. The accepted range of values is between [1800, 604800].
-    - `"header"`: The current default of 1800 seconds will be used unless explicitly
-      set. The accepted range of values is between [30, 3600]. Note: With session
-      affinity by header, sessions only expire after they haven't been used for the
-      number of seconds specified.
+    different origin server. The accepted ranges per `session_affinity` policy
+    are: - `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used
+    unless explicitly set. The accepted range of values is between [1800, 604800]. -
+    `"header"`: The current default of 1800 seconds will be used unless explicitly
+    set. The accepted range of values is between [30, 3600]. Note: With session
+    affinity by header, sessions only expire after they haven't been used for the
+    number of seconds specified.
     """
 
     steering_policy: Optional[SteeringPolicy] = None
@@ -166,6 +170,10 @@ class Overrides(BaseModel):
 
 
 class Rules(BaseModel):
+    """
+    A rule object containing conditions and overrides for this load balancer to evaluate.
+    """
+
     condition: Optional[str] = None
     """The condition expressions to evaluate.
 
diff --git a/src/cloudflare/types/load_balancers/rules_param.py b/src/cloudflare/types/load_balancers/rules_param.py
index 4ff218a8a84..05a6960cce8 100644
--- a/src/cloudflare/types/load_balancers/rules_param.py
+++ b/src/cloudflare/types/load_balancers/rules_param.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from typing import List
+from typing import Dict
 from typing_extensions import TypedDict
 
+from ..._types import SequenceNotStr
 from .default_pools import DefaultPools
 from .steering_policy import SteeringPolicy
 from .session_affinity import SessionAffinity
@@ -17,6 +18,10 @@
 
 
 class FixedResponse(TypedDict, total=False):
+    """
+    A collection of fields used to directly respond to the eyeball instead of routing to a pool. If a fixed_response is supplied the rule will be marked as terminates.
+    """
+
     content_type: str
     """The http 'Content-Type' header to include in the response."""
 
@@ -31,6 +36,10 @@ class FixedResponse(TypedDict, total=False):
 
 
 class Overrides(TypedDict, total=False):
+    """
+    A collection of overrides to apply to the load balancer when this rule's condition is true. All fields are optional.
+    """
+
     adaptive_routing: AdaptiveRoutingParam
     """
     Controls features that modify the routing of requests to pools and origins in
@@ -41,7 +50,7 @@ class Overrides(TypedDict, total=False):
     is retried once against this alternate origin.
     """
 
-    country_pools: object
+    country_pools: Dict[str, SequenceNotStr[str]]
     """
     A mapping of country codes to a list of pool IDs (ordered by their failover
     priority) for the given country. Any country not explicitly defined will fall
@@ -49,14 +58,14 @@ class Overrides(TypedDict, total=False):
     default_pools.
     """
 
-    default_pools: List[DefaultPools]
+    default_pools: SequenceNotStr[DefaultPools]
     """A list of pool IDs ordered by their failover priority.
 
     Pools defined here are used by default, or when region_pools are not configured
     for a given region.
     """
 
-    fallback_pool: object
+    fallback_pool: str
     """The pool ID to use when all other pools are detected as unhealthy."""
 
     location_strategy: LocationStrategyParam
@@ -65,9 +74,9 @@ class Overrides(TypedDict, total=False):
     See `steering_policy` to learn how steering is affected.
     """
 
-    pop_pools: object
+    pop_pools: Dict[str, SequenceNotStr[str]]
     """
-    (Enterprise only): A mapping of Cloudflare PoP identifiers to a list of pool IDs
+    Enterprise only: A mapping of Cloudflare PoP identifiers to a list of pool IDs
     (ordered by their failover priority) for the PoP (datacenter). Any PoPs not
     explicitly defined will fall back to using the corresponding country_pool, then
     region_pool mapping if it exists else to default_pools.
@@ -84,7 +93,7 @@ class Overrides(TypedDict, total=False):
       open connections.
     """
 
-    region_pools: object
+    region_pools: Dict[str, SequenceNotStr[str]]
     """
     A mapping of region codes to a list of pool IDs (ordered by their failover
     priority) for the given region. Any regions not explicitly defined will fall
@@ -94,28 +103,25 @@ class Overrides(TypedDict, total=False):
     session_affinity: SessionAffinity
     """
     Specifies the type of session affinity the load balancer should use unless
-    specified as `"none"` or "" (default). The supported types are:
-
-    - `"cookie"`: On the first request to a proxied load balancer, a cookie is
-      generated, encoding information of which origin the request will be forwarded
-      to. Subsequent requests, by the same client to the same load balancer, will be
-      sent to the origin server the cookie encodes, for the duration of the cookie
-      and as long as the origin server remains healthy. If the cookie has expired or
-      the origin server is unhealthy, then a new origin server is calculated and
-      used.
-    - `"ip_cookie"`: Behaves the same as `"cookie"` except the initial origin
-      selection is stable and based on the client's ip address.
-    - `"header"`: On the first request to a proxied load balancer, a session key
-      based on the configured HTTP headers (see
-      `session_affinity_attributes.headers`) is generated, encoding the request
-      headers used for storing in the load balancer session state which origin the
-      request will be forwarded to. Subsequent requests to the load balancer with
-      the same headers will be sent to the same origin server, for the duration of
-      the session and as long as the origin server remains healthy. If the session
-      has been idle for the duration of `session_affinity_ttl` seconds or the origin
-      server is unhealthy, then a new origin server is calculated and used. See
-      `headers` in `session_affinity_attributes` for additional required
-      configuration.
+    specified as `"none"`. The supported types are: - `"cookie"`: On the first
+    request to a proxied load balancer, a cookie is generated, encoding information
+    of which origin the request will be forwarded to. Subsequent requests, by the
+    same client to the same load balancer, will be sent to the origin server the
+    cookie encodes, for the duration of the cookie and as long as the origin server
+    remains healthy. If the cookie has expired or the origin server is unhealthy,
+    then a new origin server is calculated and used. - `"ip_cookie"`: Behaves the
+    same as `"cookie"` except the initial origin selection is stable and based on
+    the client's ip address. - `"header"`: On the first request to a proxied load
+    balancer, a session key based on the configured HTTP headers (see
+    `session_affinity_attributes.headers`) is generated, encoding the request
+    headers used for storing in the load balancer session state which origin the
+    request will be forwarded to. Subsequent requests to the load balancer with the
+    same headers will be sent to the same origin server, for the duration of the
+    session and as long as the origin server remains healthy. If the session has
+    been idle for the duration of `session_affinity_ttl` seconds or the origin
+    server is unhealthy, then a new origin server is calculated and used. See
+    `headers` in `session_affinity_attributes` for additional required
+    configuration.
     """
 
     session_affinity_attributes: SessionAffinityAttributesParam
@@ -125,14 +131,13 @@ class Overrides(TypedDict, total=False):
     """Time, in seconds, until a client's session expires after being created.
 
     Once the expiry time has been reached, subsequent requests may get sent to a
-    different origin server. The accepted ranges per `session_affinity` policy are:
-
-    - `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used
-      unless explicitly set. The accepted range of values is between [1800, 604800].
-    - `"header"`: The current default of 1800 seconds will be used unless explicitly
-      set. The accepted range of values is between [30, 3600]. Note: With session
-      affinity by header, sessions only expire after they haven't been used for the
-      number of seconds specified.
+    different origin server. The accepted ranges per `session_affinity` policy
+    are: - `"cookie"` / `"ip_cookie"`: The current default of 23 hours will be used
+    unless explicitly set. The accepted range of values is between [1800, 604800]. -
+    `"header"`: The current default of 1800 seconds will be used unless explicitly
+    set. The accepted range of values is between [30, 3600]. Note: With session
+    affinity by header, sessions only expire after they haven't been used for the
+    number of seconds specified.
     """
 
     steering_policy: SteeringPolicy
@@ -168,6 +173,10 @@ class Overrides(TypedDict, total=False):
 
 
 class RulesParam(TypedDict, total=False):
+    """
+    A rule object containing conditions and overrides for this load balancer to evaluate.
+    """
+
     condition: str
     """The condition expressions to evaluate.
 
diff --git a/src/cloudflare/types/load_balancers/search_get_params.py b/src/cloudflare/types/load_balancers/search_get_params.py
deleted file mode 100644
index d67357eef88..00000000000
--- a/src/cloudflare/types/load_balancers/search_get_params.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, Required, TypedDict
-
-__all__ = ["SearchGetParams", "SearchParams"]
-
-
-class SearchGetParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    page: object
-
-    per_page: object
-
-    search_params: SearchParams
-
-
-class SearchParams(TypedDict, total=False):
-    query: str
-    """Search query term."""
-
-    references: Literal["", "*", "referral", "referrer"]
-    """The type of references to include ("\\**" for all)."""
diff --git a/src/cloudflare/types/load_balancers/search_get_response.py b/src/cloudflare/types/load_balancers/search_get_response.py
deleted file mode 100644
index 15e3b82911a..00000000000
--- a/src/cloudflare/types/load_balancers/search_get_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-__all__ = ["SearchGetResponse"]
-
-SearchGetResponse = List[object]
diff --git a/src/cloudflare/types/load_balancers/search_list_params.py b/src/cloudflare/types/load_balancers/search_list_params.py
new file mode 100644
index 00000000000..73c63622446
--- /dev/null
+++ b/src/cloudflare/types/load_balancers/search_list_params.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["SearchListParams"]
+
+
+class SearchListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    page: float
+
+    per_page: float
+
+    query: str
+    """Search query term."""
+
+    references: Literal["", "*", "referral", "referrer"]
+    """The type of references to include.
+
+    "\\**" to include both referral and referrer references. "" to not include any
+    reference information.
+    """
diff --git a/src/cloudflare/types/load_balancers/search_list_response.py b/src/cloudflare/types/load_balancers/search_list_response.py
new file mode 100644
index 00000000000..e153c0dca41
--- /dev/null
+++ b/src/cloudflare/types/load_balancers/search_list_response.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["SearchListResponse", "Resource"]
+
+
+class Resource(BaseModel):
+    """A reference to a load balancer resource."""
+
+    reference_type: Optional[Literal["referral", "referrer"]] = None
+    """When listed as a reference, the type (direction) of the reference."""
+
+    references: Optional[List[object]] = None
+    """A list of references to (referrer) or from (referral) this resource."""
+
+    resource_id: Optional[str] = None
+
+    resource_name: Optional[str] = None
+    """The human-identifiable name of the resource."""
+
+    resource_type: Optional[Literal["load_balancer", "monitor", "pool"]] = None
+    """The type of the resource."""
+
+
+class SearchListResponse(BaseModel):
+    resources: Optional[List[Resource]] = None
+    """A list of resources matching the search query."""
diff --git a/src/cloudflare/types/load_balancers/session_affinity.py b/src/cloudflare/types/load_balancers/session_affinity.py
index 43b79ef9037..09d77325d30 100644
--- a/src/cloudflare/types/load_balancers/session_affinity.py
+++ b/src/cloudflare/types/load_balancers/session_affinity.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["SessionAffinity"]
 
-SessionAffinity = Literal["none", "cookie", "ip_cookie", "header", '""']
+SessionAffinity: TypeAlias = Literal["none", "cookie", "ip_cookie", "header"]
diff --git a/src/cloudflare/types/load_balancers/session_affinity_attributes.py b/src/cloudflare/types/load_balancers/session_affinity_attributes.py
index 10b0de12222..71e1a62be3a 100644
--- a/src/cloudflare/types/load_balancers/session_affinity_attributes.py
+++ b/src/cloudflare/types/load_balancers/session_affinity_attributes.py
@@ -9,6 +9,8 @@
 
 
 class SessionAffinityAttributes(BaseModel):
+    """Configures attributes for session affinity."""
+
     drain_duration: Optional[float] = None
     """Configures the drain duration in seconds.
 
@@ -31,14 +33,11 @@ class SessionAffinityAttributes(BaseModel):
     """
     When header `session_affinity` is enabled, this option can be used to specify
     how HTTP headers on load balancing requests will be used. The supported values
-    are:
-
-    - `"true"`: Load balancing requests must contain _all_ of the HTTP headers
-      specified by the `headers` session affinity attribute, otherwise sessions
-      aren't created.
-    - `"false"`: Load balancing requests must contain _at least one_ of the HTTP
-      headers specified by the `headers` session affinity attribute, otherwise
-      sessions aren't created.
+    are: - `"true"`: Load balancing requests must contain _all_ of the HTTP headers
+    specified by the `headers` session affinity attribute, otherwise sessions aren't
+    created. - `"false"`: Load balancing requests must contain _at least one_ of the
+    HTTP headers specified by the `headers` session affinity attribute, otherwise
+    sessions aren't created.
     """
 
     samesite: Optional[Literal["Auto", "Lax", "None", "Strict"]] = None
@@ -61,13 +60,11 @@ class SessionAffinityAttributes(BaseModel):
     """
     Configures the zero-downtime failover between origins within a pool when session
     affinity is enabled. This feature is currently incompatible with Argo, Tiered
-    Cache, and Bandwidth Alliance. The supported values are:
-
-    - `"none"`: No failover takes place for sessions pinned to the origin (default).
-    - `"temporary"`: Traffic will be sent to another other healthy origin until the
-      originally pinned origin is available; note that this can potentially result
-      in heavy origin flapping.
-    - `"sticky"`: The session affinity cookie is updated and subsequent requests are
-      sent to the new origin. Note: Zero-downtime failover with sticky sessions is
-      currently not supported for session affinity by header.
+    Cache, and Bandwidth Alliance. The supported values are: - `"none"`: No failover
+    takes place for sessions pinned to the origin (default). - `"temporary"`:
+    Traffic will be sent to another other healthy origin until the originally pinned
+    origin is available; note that this can potentially result in heavy origin
+    flapping. - `"sticky"`: The session affinity cookie is updated and subsequent
+    requests are sent to the new origin. Note: Zero-downtime failover with sticky
+    sessions is currently not supported for session affinity by header.
     """
diff --git a/src/cloudflare/types/load_balancers/session_affinity_attributes_param.py b/src/cloudflare/types/load_balancers/session_affinity_attributes_param.py
index 559881fa95f..2bf843dc3f5 100644
--- a/src/cloudflare/types/load_balancers/session_affinity_attributes_param.py
+++ b/src/cloudflare/types/load_balancers/session_affinity_attributes_param.py
@@ -2,20 +2,23 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Literal, TypedDict
 
+from ..._types import SequenceNotStr
+
 __all__ = ["SessionAffinityAttributesParam"]
 
 
 class SessionAffinityAttributesParam(TypedDict, total=False):
+    """Configures attributes for session affinity."""
+
     drain_duration: float
     """Configures the drain duration in seconds.
 
     This field is only used when session affinity is enabled on the load balancer.
     """
 
-    headers: List[str]
+    headers: SequenceNotStr[str]
     """
     Configures the names of HTTP headers to base session affinity on when header
     `session_affinity` is enabled. At least one HTTP header name must be provided.
@@ -31,14 +34,11 @@ class SessionAffinityAttributesParam(TypedDict, total=False):
     """
     When header `session_affinity` is enabled, this option can be used to specify
     how HTTP headers on load balancing requests will be used. The supported values
-    are:
-
-    - `"true"`: Load balancing requests must contain _all_ of the HTTP headers
-      specified by the `headers` session affinity attribute, otherwise sessions
-      aren't created.
-    - `"false"`: Load balancing requests must contain _at least one_ of the HTTP
-      headers specified by the `headers` session affinity attribute, otherwise
-      sessions aren't created.
+    are: - `"true"`: Load balancing requests must contain _all_ of the HTTP headers
+    specified by the `headers` session affinity attribute, otherwise sessions aren't
+    created. - `"false"`: Load balancing requests must contain _at least one_ of the
+    HTTP headers specified by the `headers` session affinity attribute, otherwise
+    sessions aren't created.
     """
 
     samesite: Literal["Auto", "Lax", "None", "Strict"]
@@ -61,13 +61,11 @@ class SessionAffinityAttributesParam(TypedDict, total=False):
     """
     Configures the zero-downtime failover between origins within a pool when session
     affinity is enabled. This feature is currently incompatible with Argo, Tiered
-    Cache, and Bandwidth Alliance. The supported values are:
-
-    - `"none"`: No failover takes place for sessions pinned to the origin (default).
-    - `"temporary"`: Traffic will be sent to another other healthy origin until the
-      originally pinned origin is available; note that this can potentially result
-      in heavy origin flapping.
-    - `"sticky"`: The session affinity cookie is updated and subsequent requests are
-      sent to the new origin. Note: Zero-downtime failover with sticky sessions is
-      currently not supported for session affinity by header.
+    Cache, and Bandwidth Alliance. The supported values are: - `"none"`: No failover
+    takes place for sessions pinned to the origin (default). - `"temporary"`:
+    Traffic will be sent to another other healthy origin until the originally pinned
+    origin is available; note that this can potentially result in heavy origin
+    flapping. - `"sticky"`: The session affinity cookie is updated and subsequent
+    requests are sent to the new origin. Note: Zero-downtime failover with sticky
+    sessions is currently not supported for session affinity by header.
     """
diff --git a/src/cloudflare/types/load_balancers/steering_policy.py b/src/cloudflare/types/load_balancers/steering_policy.py
index eb7637c2237..1c8528e1b82 100644
--- a/src/cloudflare/types/load_balancers/steering_policy.py
+++ b/src/cloudflare/types/load_balancers/steering_policy.py
@@ -1,9 +1,9 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["SteeringPolicy"]
 
-SteeringPolicy = Literal[
-    "off", "geo", "random", "dynamic_latency", "proximity", "least_outstanding_requests", "least_connections", '""'
+SteeringPolicy: TypeAlias = Literal[
+    "off", "geo", "random", "dynamic_latency", "proximity", "least_outstanding_requests", "least_connections", ""
 ]
diff --git a/src/cloudflare/types/logpush/__init__.py b/src/cloudflare/types/logpush/__init__.py
index b7f78156bfc..f47e5fbcf8b 100644
--- a/src/cloudflare/types/logpush/__init__.py
+++ b/src/cloudflare/types/logpush/__init__.py
@@ -4,11 +4,11 @@
 
 from .logpush_job import LogpushJob as LogpushJob
 from .output_options import OutputOptions as OutputOptions
-from .edge_get_response import EdgeGetResponse as EdgeGetResponse
 from .job_create_params import JobCreateParams as JobCreateParams
 from .job_update_params import JobUpdateParams as JobUpdateParams
 from .edge_create_params import EdgeCreateParams as EdgeCreateParams
 from .instant_logpush_job import InstantLogpushJob as InstantLogpushJob
+from .job_delete_response import JobDeleteResponse as JobDeleteResponse
 from .output_options_param import OutputOptionsParam as OutputOptionsParam
 from .ownership_validation import OwnershipValidation as OwnershipValidation
 from .validate_origin_params import ValidateOriginParams as ValidateOriginParams
@@ -18,3 +18,5 @@
 from .ownership_validate_params import OwnershipValidateParams as OwnershipValidateParams
 from .validate_destination_params import ValidateDestinationParams as ValidateDestinationParams
 from .validate_destination_response import ValidateDestinationResponse as ValidateDestinationResponse
+from .validate_destination_exists_params import ValidateDestinationExistsParams as ValidateDestinationExistsParams
+from .validate_destination_exists_response import ValidateDestinationExistsResponse as ValidateDestinationExistsResponse
diff --git a/src/cloudflare/types/logpush/datasets/__init__.py b/src/cloudflare/types/logpush/datasets/__init__.py
index 8c60dd28797..f8ee8b14b1c 100644
--- a/src/cloudflare/types/logpush/datasets/__init__.py
+++ b/src/cloudflare/types/logpush/datasets/__init__.py
@@ -1,5 +1,3 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from __future__ import annotations
-
-from .job_get_response import JobGetResponse as JobGetResponse
diff --git a/src/cloudflare/types/logpush/datasets/job_get_response.py b/src/cloudflare/types/logpush/datasets/job_get_response.py
deleted file mode 100644
index 18a04965c99..00000000000
--- a/src/cloudflare/types/logpush/datasets/job_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from ..logpush_job import LogpushJob
-
-__all__ = ["JobGetResponse"]
-
-JobGetResponse = List[Optional[LogpushJob]]
diff --git a/src/cloudflare/types/logpush/edge_create_params.py b/src/cloudflare/types/logpush/edge_create_params.py
index 0a3908f5071..339abcf0286 100644
--- a/src/cloudflare/types/logpush/edge_create_params.py
+++ b/src/cloudflare/types/logpush/edge_create_params.py
@@ -9,7 +9,7 @@
 
 class EdgeCreateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     fields: str
     """Comma-separated list of fields."""
diff --git a/src/cloudflare/types/logpush/edge_get_response.py b/src/cloudflare/types/logpush/edge_get_response.py
deleted file mode 100644
index b7f061196c9..00000000000
--- a/src/cloudflare/types/logpush/edge_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from .instant_logpush_job import InstantLogpushJob
-
-__all__ = ["EdgeGetResponse"]
-
-EdgeGetResponse = List[Optional[InstantLogpushJob]]
diff --git a/src/cloudflare/types/logpush/job_create_params.py b/src/cloudflare/types/logpush/job_create_params.py
index a1887398142..d1462136074 100644
--- a/src/cloudflare/types/logpush/job_create_params.py
+++ b/src/cloudflare/types/logpush/job_create_params.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Optional
+from typing import Union, Optional
 from typing_extensions import Literal, Required, TypedDict
 
 from .output_options_param import OutputOptionsParam
@@ -12,10 +12,10 @@
 
 class JobCreateParams(TypedDict, total=False):
     destination_conf: Required[str]
-    """Uniquely identifies a resource (such as an s3 bucket) where data will be pushed.
+    """Uniquely identifies a resource (such as an s3 bucket) where data.
 
-    Additional configuration parameters supported by the destination may be
-    included.
+    will be pushed. Additional configuration parameters supported by the destination
+    may be included.
     """
 
     account_id: str
@@ -24,7 +24,40 @@ class JobCreateParams(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    dataset: Optional[str]
+    dataset: Optional[
+        Literal[
+            "access_requests",
+            "audit_logs",
+            "audit_logs_v2",
+            "biso_user_actions",
+            "casb_findings",
+            "device_posture_results",
+            "dex_application_tests",
+            "dex_device_state_events",
+            "dlp_forensic_copies",
+            "dns_firewall_logs",
+            "dns_logs",
+            "email_security_alerts",
+            "firewall_events",
+            "gateway_dns",
+            "gateway_http",
+            "gateway_network",
+            "http_requests",
+            "ipsec_logs",
+            "magic_ids_detections",
+            "nel_reports",
+            "network_analytics_logs",
+            "page_shield_events",
+            "sinkhole_http_logs",
+            "spectrum_events",
+            "ssh_logs",
+            "warp_config_changes",
+            "warp_toggle_changes",
+            "workers_trace_events",
+            "zaraz_events",
+            "zero_trust_network_sessions",
+        ]
+    ]
     """Name of the dataset.
 
     A list of supported datasets can be found on the
@@ -34,20 +67,26 @@ class JobCreateParams(TypedDict, total=False):
     enabled: bool
     """Flag that indicates if the job is enabled."""
 
+    filter: Optional[str]
+    """The filters to select the events to include and/or remove from your logs.
+
+    For more information, refer to
+    [Filters](https://developers.cloudflare.com/logs/reference/filters/).
+    """
+
     frequency: Optional[Literal["high", "low"]]
     """This field is deprecated.
 
-    Please use `max_upload_*` parameters instead. The frequency at which Cloudflare
-    sends batches of logs to your destination. Setting frequency to high sends your
-    logs in larger quantities of smaller files. Setting frequency to low sends logs
-    in smaller quantities of larger files.
+    Please use `max_upload_*` parameters instead. . The frequency at which
+    Cloudflare sends batches of logs to your destination. Setting frequency to high
+    sends your logs in larger quantities of smaller files. Setting frequency to low
+    sends logs in smaller quantities of larger files.
     """
 
-    kind: Optional[Literal["edge"]]
+    kind: Literal["", "edge"]
     """
     The kind parameter (optional) is used to differentiate between Logpush and Edge
-    Log Delivery jobs. Currently, Edge Log Delivery is only supported for the
-    `http_requests` dataset.
+    Log Delivery jobs (when supported by the dataset).
     """
 
     logpull_options: Optional[str]
@@ -59,37 +98,34 @@ class JobCreateParams(TypedDict, total=False):
     keep on making this call for you, setting start and end times appropriately.
     """
 
-    max_upload_bytes: Optional[int]
+    max_upload_bytes: Union[Literal[0], int, None]
     """The maximum uncompressed file size of a batch of logs.
 
     This setting value must be between `5 MB` and `1 GB`, or `0` to disable it. Note
     that you cannot set a minimum file size; this means that log files may be much
-    smaller than this batch size. This parameter is not available for jobs with
-    `edge` as its kind.
+    smaller than this batch size.
     """
 
-    max_upload_interval_seconds: Optional[int]
+    max_upload_interval_seconds: Union[Literal[0], int, None]
     """The maximum interval in seconds for log batches.
 
     This setting must be between 30 and 300 seconds (5 minutes), or `0` to disable
     it. Note that you cannot specify a minimum interval for log batches; this means
-    that log files may be sent in shorter intervals than this. This parameter is
-    only used for jobs with `edge` as its kind.
+    that log files may be sent in shorter intervals than this.
     """
 
-    max_upload_records: Optional[int]
+    max_upload_records: Union[Literal[0], int, None]
     """The maximum number of log lines per batch.
 
     This setting must be between 1000 and 1,000,000 lines, or `0` to disable it.
     Note that you cannot specify a minimum number of log lines per batch; this means
-    that log files may contain many fewer lines than this. This parameter is not
-    available for jobs with `edge` as its kind.
+    that log files may contain many fewer lines than this.
     """
 
     name: Optional[str]
     """Optional human readable job name.
 
-    Not unique. Cloudflare suggests that you set this to a meaningful string, like
+    Not unique. Cloudflare suggests. that you set this to a meaningful string, like
     the domain name, to make it easier to identify your job.
     """
 
diff --git a/src/cloudflare/types/logpush/job_delete_response.py b/src/cloudflare/types/logpush/job_delete_response.py
new file mode 100644
index 00000000000..bcd1bd1a269
--- /dev/null
+++ b/src/cloudflare/types/logpush/job_delete_response.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["JobDeleteResponse"]
+
+
+class JobDeleteResponse(BaseModel):
+    id: Optional[int] = None
+    """Unique id of the job."""
diff --git a/src/cloudflare/types/logpush/job_update_params.py b/src/cloudflare/types/logpush/job_update_params.py
index 857882c86bf..dd01009f946 100644
--- a/src/cloudflare/types/logpush/job_update_params.py
+++ b/src/cloudflare/types/logpush/job_update_params.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Optional
+from typing import Union, Optional
 from typing_extensions import Literal, TypedDict
 
 from .output_options_param import OutputOptionsParam
@@ -18,29 +18,35 @@ class JobUpdateParams(TypedDict, total=False):
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
     destination_conf: str
-    """Uniquely identifies a resource (such as an s3 bucket) where data will be pushed.
+    """Uniquely identifies a resource (such as an s3 bucket) where data.
 
-    Additional configuration parameters supported by the destination may be
-    included.
+    will be pushed. Additional configuration parameters supported by the destination
+    may be included.
     """
 
     enabled: bool
     """Flag that indicates if the job is enabled."""
 
+    filter: Optional[str]
+    """The filters to select the events to include and/or remove from your logs.
+
+    For more information, refer to
+    [Filters](https://developers.cloudflare.com/logs/reference/filters/).
+    """
+
     frequency: Optional[Literal["high", "low"]]
     """This field is deprecated.
 
-    Please use `max_upload_*` parameters instead. The frequency at which Cloudflare
-    sends batches of logs to your destination. Setting frequency to high sends your
-    logs in larger quantities of smaller files. Setting frequency to low sends logs
-    in smaller quantities of larger files.
+    Please use `max_upload_*` parameters instead. . The frequency at which
+    Cloudflare sends batches of logs to your destination. Setting frequency to high
+    sends your logs in larger quantities of smaller files. Setting frequency to low
+    sends logs in smaller quantities of larger files.
     """
 
-    kind: Optional[Literal["edge"]]
+    kind: Literal["", "edge"]
     """
     The kind parameter (optional) is used to differentiate between Logpush and Edge
-    Log Delivery jobs. Currently, Edge Log Delivery is only supported for the
-    `http_requests` dataset.
+    Log Delivery jobs (when supported by the dataset).
     """
 
     logpull_options: Optional[str]
@@ -52,31 +58,35 @@ class JobUpdateParams(TypedDict, total=False):
     keep on making this call for you, setting start and end times appropriately.
     """
 
-    max_upload_bytes: Optional[int]
+    max_upload_bytes: Union[Literal[0], int, None]
     """The maximum uncompressed file size of a batch of logs.
 
     This setting value must be between `5 MB` and `1 GB`, or `0` to disable it. Note
     that you cannot set a minimum file size; this means that log files may be much
-    smaller than this batch size. This parameter is not available for jobs with
-    `edge` as its kind.
+    smaller than this batch size.
     """
 
-    max_upload_interval_seconds: Optional[int]
+    max_upload_interval_seconds: Union[Literal[0], int, None]
     """The maximum interval in seconds for log batches.
 
     This setting must be between 30 and 300 seconds (5 minutes), or `0` to disable
     it. Note that you cannot specify a minimum interval for log batches; this means
-    that log files may be sent in shorter intervals than this. This parameter is
-    only used for jobs with `edge` as its kind.
+    that log files may be sent in shorter intervals than this.
     """
 
-    max_upload_records: Optional[int]
+    max_upload_records: Union[Literal[0], int, None]
     """The maximum number of log lines per batch.
 
     This setting must be between 1000 and 1,000,000 lines, or `0` to disable it.
     Note that you cannot specify a minimum number of log lines per batch; this means
-    that log files may contain many fewer lines than this. This parameter is not
-    available for jobs with `edge` as its kind.
+    that log files may contain many fewer lines than this.
+    """
+
+    name: Optional[str]
+    """Optional human readable job name.
+
+    Not unique. Cloudflare suggests. that you set this to a meaningful string, like
+    the domain name, to make it easier to identify your job.
     """
 
     output_options: Optional[OutputOptionsParam]
diff --git a/src/cloudflare/types/logpush/logpush_job.py b/src/cloudflare/types/logpush/logpush_job.py
index adfb6bb1587..8d5368f7893 100644
--- a/src/cloudflare/types/logpush/logpush_job.py
+++ b/src/cloudflare/types/logpush/logpush_job.py
@@ -1,6 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import Union, Optional
 from datetime import datetime
 from typing_extensions import Literal
 
@@ -14,7 +14,40 @@ class LogpushJob(BaseModel):
     id: Optional[int] = None
     """Unique id of the job."""
 
-    dataset: Optional[str] = None
+    dataset: Optional[
+        Literal[
+            "access_requests",
+            "audit_logs",
+            "audit_logs_v2",
+            "biso_user_actions",
+            "casb_findings",
+            "device_posture_results",
+            "dex_application_tests",
+            "dex_device_state_events",
+            "dlp_forensic_copies",
+            "dns_firewall_logs",
+            "dns_logs",
+            "email_security_alerts",
+            "firewall_events",
+            "gateway_dns",
+            "gateway_http",
+            "gateway_network",
+            "http_requests",
+            "ipsec_logs",
+            "magic_ids_detections",
+            "nel_reports",
+            "network_analytics_logs",
+            "page_shield_events",
+            "sinkhole_http_logs",
+            "spectrum_events",
+            "ssh_logs",
+            "warp_config_changes",
+            "warp_toggle_changes",
+            "workers_trace_events",
+            "zaraz_events",
+            "zero_trust_network_sessions",
+        ]
+    ] = None
     """Name of the dataset.
 
     A list of supported datasets can be found on the
@@ -22,37 +55,36 @@ class LogpushJob(BaseModel):
     """
 
     destination_conf: Optional[str] = None
-    """Uniquely identifies a resource (such as an s3 bucket) where data will be pushed.
+    """Uniquely identifies a resource (such as an s3 bucket) where data.
 
-    Additional configuration parameters supported by the destination may be
-    included.
+    will be pushed. Additional configuration parameters supported by the destination
+    may be included.
     """
 
     enabled: Optional[bool] = None
     """Flag that indicates if the job is enabled."""
 
-    error_message: Optional[datetime] = None
+    error_message: Optional[str] = None
     """If not null, the job is currently failing.
 
-    Failures are usually repetitive (example: no permissions to write to destination
-    bucket). Only the last failure is recorded. On successful execution of a job the
-    error_message and last_error are set to null.
+    Failures are usually. repetitive (example: no permissions to write to
+    destination bucket). Only the last failure is recorded. On successful execution
+    of a job the error_message and last_error are set to null.
     """
 
     frequency: Optional[Literal["high", "low"]] = None
     """This field is deprecated.
 
-    Please use `max_upload_*` parameters instead. The frequency at which Cloudflare
-    sends batches of logs to your destination. Setting frequency to high sends your
-    logs in larger quantities of smaller files. Setting frequency to low sends logs
-    in smaller quantities of larger files.
+    Please use `max_upload_*` parameters instead. . The frequency at which
+    Cloudflare sends batches of logs to your destination. Setting frequency to high
+    sends your logs in larger quantities of smaller files. Setting frequency to low
+    sends logs in smaller quantities of larger files.
     """
 
-    kind: Optional[Literal["edge"]] = None
+    kind: Optional[Literal["", "edge"]] = None
     """
     The kind parameter (optional) is used to differentiate between Logpush and Edge
-    Log Delivery jobs. Currently, Edge Log Delivery is only supported for the
-    `http_requests` dataset.
+    Log Delivery jobs (when supported by the dataset).
     """
 
     last_complete: Optional[datetime] = None
@@ -67,7 +99,7 @@ class LogpushJob(BaseModel):
     last_error: Optional[datetime] = None
     """Records the last time the job failed.
 
-    If not null, the job is currently failing. If null, the job has either never
+    If not null, the job is currently. failing. If null, the job has either never
     failed or has run successfully at least once since last failure. See also the
     error_message field.
     """
@@ -81,37 +113,34 @@ class LogpushJob(BaseModel):
     keep on making this call for you, setting start and end times appropriately.
     """
 
-    max_upload_bytes: Optional[int] = None
+    max_upload_bytes: Union[Literal[0], int, None] = None
     """The maximum uncompressed file size of a batch of logs.
 
     This setting value must be between `5 MB` and `1 GB`, or `0` to disable it. Note
     that you cannot set a minimum file size; this means that log files may be much
-    smaller than this batch size. This parameter is not available for jobs with
-    `edge` as its kind.
+    smaller than this batch size.
     """
 
-    max_upload_interval_seconds: Optional[int] = None
+    max_upload_interval_seconds: Union[Literal[0], int, None] = None
     """The maximum interval in seconds for log batches.
 
     This setting must be between 30 and 300 seconds (5 minutes), or `0` to disable
     it. Note that you cannot specify a minimum interval for log batches; this means
-    that log files may be sent in shorter intervals than this. This parameter is
-    only used for jobs with `edge` as its kind.
+    that log files may be sent in shorter intervals than this.
     """
 
-    max_upload_records: Optional[int] = None
+    max_upload_records: Union[Literal[0], int, None] = None
     """The maximum number of log lines per batch.
 
     This setting must be between 1000 and 1,000,000 lines, or `0` to disable it.
     Note that you cannot specify a minimum number of log lines per batch; this means
-    that log files may contain many fewer lines than this. This parameter is not
-    available for jobs with `edge` as its kind.
+    that log files may contain many fewer lines than this.
     """
 
     name: Optional[str] = None
     """Optional human readable job name.
 
-    Not unique. Cloudflare suggests that you set this to a meaningful string, like
+    Not unique. Cloudflare suggests. that you set this to a meaningful string, like
     the domain name, to make it easier to identify your job.
     """
 
diff --git a/src/cloudflare/types/logpush/output_options.py b/src/cloudflare/types/logpush/output_options.py
index 6cd72a01e72..e52fed2a7ce 100644
--- a/src/cloudflare/types/logpush/output_options.py
+++ b/src/cloudflare/types/logpush/output_options.py
@@ -11,13 +11,18 @@
 
 
 class OutputOptions(BaseModel):
+    """The structured replacement for `logpull_options`.
+
+    When including this field, the `logpull_option` field will be ignored.
+    """
+
     batch_prefix: Optional[str] = None
     """String to be prepended before each batch."""
 
     batch_suffix: Optional[str] = None
     """String to be appended after each batch."""
 
-    cve_2021_4428: Optional[bool] = FieldInfo(alias="CVE-2021-4428", default=None)
+    cve_2021_44228: Optional[bool] = FieldInfo(alias="CVE-2021-44228", default=None)
     """
     If set to true, will cause all occurrences of `${` in the generated files to be
     replaced with `x{`.
@@ -52,10 +57,10 @@ class OutputOptions(BaseModel):
 
     record_template: Optional[str] = None
     """
-    String to use as template for each record instead of the default comma-separated
-    list. All fields used in the template must be present in `field_names` as well,
-    otherwise they will end up as null. Format as a Go `text/template` without any
-    standard functions, like conditionals, loops, sub-templates, etc.
+    String to use as template for each record instead of the default json key value
+    mapping. All fields used in the template must be present in `field_names` as
+    well, otherwise they will end up as null. Format as a Go `text/template` without
+    any standard functions, like conditionals, loops, sub-templates, etc.
     """
 
     sample_rate: Optional[float] = None
diff --git a/src/cloudflare/types/logpush/output_options_param.py b/src/cloudflare/types/logpush/output_options_param.py
index 78e97b57a74..29db19d9f66 100644
--- a/src/cloudflare/types/logpush/output_options_param.py
+++ b/src/cloudflare/types/logpush/output_options_param.py
@@ -2,22 +2,28 @@
 
 from __future__ import annotations
 
-from typing import List, Optional
+from typing import Optional
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 
 __all__ = ["OutputOptionsParam"]
 
 
 class OutputOptionsParam(TypedDict, total=False):
+    """The structured replacement for `logpull_options`.
+
+    When including this field, the `logpull_option` field will be ignored.
+    """
+
     batch_prefix: Optional[str]
     """String to be prepended before each batch."""
 
     batch_suffix: Optional[str]
     """String to be appended after each batch."""
 
-    cve_2021_4428: Annotated[Optional[bool], PropertyInfo(alias="CVE-2021-4428")]
+    cve_2021_44228: Annotated[Optional[bool], PropertyInfo(alias="CVE-2021-44228")]
     """
     If set to true, will cause all occurrences of `${` in the generated files to be
     replaced with `x{`.
@@ -26,7 +32,7 @@ class OutputOptionsParam(TypedDict, total=False):
     field_delimiter: Optional[str]
     """String to join fields. This field be ignored when `record_template` is set."""
 
-    field_names: List[str]
+    field_names: SequenceNotStr[str]
     """List of field names to be included in the Logpush output.
 
     For the moment, there is no option to add all fields at once, so you must
@@ -52,10 +58,10 @@ class OutputOptionsParam(TypedDict, total=False):
 
     record_template: Optional[str]
     """
-    String to use as template for each record instead of the default comma-separated
-    list. All fields used in the template must be present in `field_names` as well,
-    otherwise they will end up as null. Format as a Go `text/template` without any
-    standard functions, like conditionals, loops, sub-templates, etc.
+    String to use as template for each record instead of the default json key value
+    mapping. All fields used in the template must be present in `field_names` as
+    well, otherwise they will end up as null. Format as a Go `text/template` without
+    any standard functions, like conditionals, loops, sub-templates, etc.
     """
 
     sample_rate: Optional[float]
diff --git a/src/cloudflare/types/logpush/ownership_create_params.py b/src/cloudflare/types/logpush/ownership_create_params.py
index 9088769b54e..d58059eb773 100644
--- a/src/cloudflare/types/logpush/ownership_create_params.py
+++ b/src/cloudflare/types/logpush/ownership_create_params.py
@@ -9,10 +9,10 @@
 
 class OwnershipCreateParams(TypedDict, total=False):
     destination_conf: Required[str]
-    """Uniquely identifies a resource (such as an s3 bucket) where data will be pushed.
+    """Uniquely identifies a resource (such as an s3 bucket) where data.
 
-    Additional configuration parameters supported by the destination may be
-    included.
+    will be pushed. Additional configuration parameters supported by the destination
+    may be included.
     """
 
     account_id: str
diff --git a/src/cloudflare/types/logpush/ownership_validate_params.py b/src/cloudflare/types/logpush/ownership_validate_params.py
index 825ea2efb03..f49abf21f9b 100644
--- a/src/cloudflare/types/logpush/ownership_validate_params.py
+++ b/src/cloudflare/types/logpush/ownership_validate_params.py
@@ -9,10 +9,10 @@
 
 class OwnershipValidateParams(TypedDict, total=False):
     destination_conf: Required[str]
-    """Uniquely identifies a resource (such as an s3 bucket) where data will be pushed.
+    """Uniquely identifies a resource (such as an s3 bucket) where data.
 
-    Additional configuration parameters supported by the destination may be
-    included.
+    will be pushed. Additional configuration parameters supported by the destination
+    may be included.
     """
 
     ownership_challenge: Required[str]
diff --git a/src/cloudflare/types/logpush/validate_destination_exists_params.py b/src/cloudflare/types/logpush/validate_destination_exists_params.py
new file mode 100644
index 00000000000..b61d60580d1
--- /dev/null
+++ b/src/cloudflare/types/logpush/validate_destination_exists_params.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ValidateDestinationExistsParams"]
+
+
+class ValidateDestinationExistsParams(TypedDict, total=False):
+    destination_conf: Required[str]
+    """Uniquely identifies a resource (such as an s3 bucket) where data.
+
+    will be pushed. Additional configuration parameters supported by the destination
+    may be included.
+    """
+
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
diff --git a/src/cloudflare/types/logpush/validate_destination_exists_response.py b/src/cloudflare/types/logpush/validate_destination_exists_response.py
new file mode 100644
index 00000000000..6a0d5189763
--- /dev/null
+++ b/src/cloudflare/types/logpush/validate_destination_exists_response.py
@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["ValidateDestinationExistsResponse"]
+
+
+class ValidateDestinationExistsResponse(BaseModel):
+    exists: Optional[bool] = None
diff --git a/src/cloudflare/types/logpush/validate_destination_params.py b/src/cloudflare/types/logpush/validate_destination_params.py
index 1af8228f6e8..359e7ec90a9 100644
--- a/src/cloudflare/types/logpush/validate_destination_params.py
+++ b/src/cloudflare/types/logpush/validate_destination_params.py
@@ -9,10 +9,10 @@
 
 class ValidateDestinationParams(TypedDict, total=False):
     destination_conf: Required[str]
-    """Uniquely identifies a resource (such as an s3 bucket) where data will be pushed.
+    """Uniquely identifies a resource (such as an s3 bucket) where data.
 
-    Additional configuration parameters supported by the destination may be
-    included.
+    will be pushed. Additional configuration parameters supported by the destination
+    may be included.
     """
 
     account_id: str
diff --git a/src/cloudflare/types/logpush/validate_destination_response.py b/src/cloudflare/types/logpush/validate_destination_response.py
index e7fe2fd5ea9..e47e8559eb0 100644
--- a/src/cloudflare/types/logpush/validate_destination_response.py
+++ b/src/cloudflare/types/logpush/validate_destination_response.py
@@ -8,4 +8,6 @@
 
 
 class ValidateDestinationResponse(BaseModel):
-    exists: Optional[bool] = None
+    message: Optional[str] = None
+
+    valid: Optional[bool] = None
diff --git a/src/cloudflare/types/logs/control/cmb/cmb_config.py b/src/cloudflare/types/logs/control/cmb/cmb_config.py
index cf1f90f7437..c6f1a2d64cd 100644
--- a/src/cloudflare/types/logs/control/cmb/cmb_config.py
+++ b/src/cloudflare/types/logs/control/cmb/cmb_config.py
@@ -8,5 +8,8 @@
 
 
 class CmbConfig(BaseModel):
+    allow_out_of_region_access: Optional[bool] = None
+    """Allow out of region access"""
+
     regions: Optional[str] = None
-    """Comma-separated list of regions."""
+    """Name of the region."""
diff --git a/src/cloudflare/types/logs/control/cmb/config_create_params.py b/src/cloudflare/types/logs/control/cmb/config_create_params.py
index 3819f9e03bc..4fb77a53222 100644
--- a/src/cloudflare/types/logs/control/cmb/config_create_params.py
+++ b/src/cloudflare/types/logs/control/cmb/config_create_params.py
@@ -9,7 +9,10 @@
 
 class ConfigCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
+
+    allow_out_of_region_access: bool
+    """Allow out of region access"""
 
     regions: str
-    """Comma-separated list of regions."""
+    """Name of the region."""
diff --git a/src/cloudflare/types/logs/control/retention_create_params.py b/src/cloudflare/types/logs/control/retention_create_params.py
index d022c669bc2..7d14eaf90f6 100644
--- a/src/cloudflare/types/logs/control/retention_create_params.py
+++ b/src/cloudflare/types/logs/control/retention_create_params.py
@@ -8,5 +8,8 @@
 
 
 class RetentionCreateParams(TypedDict, total=False):
-    flag: Required[bool]
+    zone_id: Required[str]
+    """Identifier."""
+
+    flag: bool
     """The log retention flag for Logpull API."""
diff --git a/src/cloudflare/types/logs/control/retention_create_response.py b/src/cloudflare/types/logs/control/retention_create_response.py
index 1c2d420bb34..f33ed6a19a7 100644
--- a/src/cloudflare/types/logs/control/retention_create_response.py
+++ b/src/cloudflare/types/logs/control/retention_create_response.py
@@ -9,3 +9,4 @@
 
 class RetentionCreateResponse(BaseModel):
     flag: Optional[bool] = None
+    """The log retention flag for Logpull API."""
diff --git a/src/cloudflare/types/logs/control/retention_get_response.py b/src/cloudflare/types/logs/control/retention_get_response.py
index 3d2d09e5461..991307d30d0 100644
--- a/src/cloudflare/types/logs/control/retention_get_response.py
+++ b/src/cloudflare/types/logs/control/retention_get_response.py
@@ -9,3 +9,4 @@
 
 class RetentionGetResponse(BaseModel):
     flag: Optional[bool] = None
+    """The log retention flag for Logpull API."""
diff --git a/src/cloudflare/types/logs/rayid_get_params.py b/src/cloudflare/types/logs/rayid_get_params.py
index cb11c3e8b79..d80a596c1a4 100644
--- a/src/cloudflare/types/logs/rayid_get_params.py
+++ b/src/cloudflare/types/logs/rayid_get_params.py
@@ -8,8 +8,8 @@
 
 
 class RayIDGetParams(TypedDict, total=False):
-    zone_identifier: Required[str]
-    """Identifier"""
+    zone_id: Required[str]
+    """Identifier."""
 
     fields: str
     """
diff --git a/src/cloudflare/types/logs/rayid_get_response.py b/src/cloudflare/types/logs/rayid_get_response.py
index f4437a09f17..ff1397840b4 100644
--- a/src/cloudflare/types/logs/rayid_get_response.py
+++ b/src/cloudflare/types/logs/rayid_get_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Union
+from typing_extensions import TypeAlias
 
 __all__ = ["RayIDGetResponse"]
 
-RayIDGetResponse = Union[str, object]
+RayIDGetResponse: TypeAlias = Union[str, object]
diff --git a/src/cloudflare/types/logs/received_get_params.py b/src/cloudflare/types/logs/received_get_params.py
index 0894ccfbe38..859b062c5a4 100644
--- a/src/cloudflare/types/logs/received_get_params.py
+++ b/src/cloudflare/types/logs/received_get_params.py
@@ -9,6 +9,9 @@
 
 
 class ReceivedGetParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
     end: Required[Union[str, int]]
     """Sets the (exclusive) end of the requested time frame.
 
diff --git a/src/cloudflare/types/logs/received_get_response.py b/src/cloudflare/types/logs/received_get_response.py
index 042e8a4bd39..8483642b3e5 100644
--- a/src/cloudflare/types/logs/received_get_response.py
+++ b/src/cloudflare/types/logs/received_get_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Union
+from typing_extensions import TypeAlias
 
 __all__ = ["ReceivedGetResponse"]
 
-ReceivedGetResponse = Union[str, object]
+ReceivedGetResponse: TypeAlias = Union[str, object]
diff --git a/src/cloudflare/types/magic_cloud_networking/__init__.py b/src/cloudflare/types/magic_cloud_networking/__init__.py
new file mode 100644
index 00000000000..ebb3e55754e
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/__init__.py
@@ -0,0 +1,55 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .on_ramp_get_params import OnRampGetParams as OnRampGetParams
+from .on_ramp_edit_params import OnRampEditParams as OnRampEditParams
+from .on_ramp_list_params import OnRampListParams as OnRampListParams
+from .resource_get_params import ResourceGetParams as ResourceGetParams
+from .on_ramp_get_response import OnRampGetResponse as OnRampGetResponse
+from .resource_list_params import ResourceListParams as ResourceListParams
+from .on_ramp_create_params import OnRampCreateParams as OnRampCreateParams
+from .on_ramp_delete_params import OnRampDeleteParams as OnRampDeleteParams
+from .on_ramp_edit_response import OnRampEditResponse as OnRampEditResponse
+from .on_ramp_list_response import OnRampListResponse as OnRampListResponse
+from .on_ramp_plan_response import OnRampPlanResponse as OnRampPlanResponse
+from .on_ramp_update_params import OnRampUpdateParams as OnRampUpdateParams
+from .resource_get_response import ResourceGetResponse as ResourceGetResponse
+from .on_ramp_apply_response import OnRampApplyResponse as OnRampApplyResponse
+from .resource_export_params import ResourceExportParams as ResourceExportParams
+from .resource_list_response import ResourceListResponse as ResourceListResponse
+from .on_ramp_create_response import OnRampCreateResponse as OnRampCreateResponse
+from .on_ramp_delete_response import OnRampDeleteResponse as OnRampDeleteResponse
+from .on_ramp_update_response import OnRampUpdateResponse as OnRampUpdateResponse
+from .catalog_sync_edit_params import CatalogSyncEditParams as CatalogSyncEditParams
+from .catalog_sync_get_response import CatalogSyncGetResponse as CatalogSyncGetResponse
+from .catalog_sync_create_params import CatalogSyncCreateParams as CatalogSyncCreateParams
+from .catalog_sync_delete_params import CatalogSyncDeleteParams as CatalogSyncDeleteParams
+from .catalog_sync_edit_response import CatalogSyncEditResponse as CatalogSyncEditResponse
+from .catalog_sync_list_response import CatalogSyncListResponse as CatalogSyncListResponse
+from .catalog_sync_update_params import CatalogSyncUpdateParams as CatalogSyncUpdateParams
+from .catalog_sync_create_response import CatalogSyncCreateResponse as CatalogSyncCreateResponse
+from .catalog_sync_delete_response import CatalogSyncDeleteResponse as CatalogSyncDeleteResponse
+from .catalog_sync_update_response import CatalogSyncUpdateResponse as CatalogSyncUpdateResponse
+from .cloud_integration_get_params import CloudIntegrationGetParams as CloudIntegrationGetParams
+from .catalog_sync_refresh_response import CatalogSyncRefreshResponse as CatalogSyncRefreshResponse
+from .cloud_integration_edit_params import CloudIntegrationEditParams as CloudIntegrationEditParams
+from .cloud_integration_list_params import CloudIntegrationListParams as CloudIntegrationListParams
+from .cloud_integration_get_response import CloudIntegrationGetResponse as CloudIntegrationGetResponse
+from .resource_policy_preview_params import ResourcePolicyPreviewParams as ResourcePolicyPreviewParams
+from .cloud_integration_create_params import CloudIntegrationCreateParams as CloudIntegrationCreateParams
+from .cloud_integration_edit_response import CloudIntegrationEditResponse as CloudIntegrationEditResponse
+from .cloud_integration_list_response import CloudIntegrationListResponse as CloudIntegrationListResponse
+from .cloud_integration_update_params import CloudIntegrationUpdateParams as CloudIntegrationUpdateParams
+from .resource_policy_preview_response import ResourcePolicyPreviewResponse as ResourcePolicyPreviewResponse
+from .cloud_integration_create_response import CloudIntegrationCreateResponse as CloudIntegrationCreateResponse
+from .cloud_integration_delete_response import CloudIntegrationDeleteResponse as CloudIntegrationDeleteResponse
+from .cloud_integration_discover_params import CloudIntegrationDiscoverParams as CloudIntegrationDiscoverParams
+from .cloud_integration_update_response import CloudIntegrationUpdateResponse as CloudIntegrationUpdateResponse
+from .cloud_integration_discover_response import CloudIntegrationDiscoverResponse as CloudIntegrationDiscoverResponse
+from .cloud_integration_discover_all_response import (
+    CloudIntegrationDiscoverAllResponse as CloudIntegrationDiscoverAllResponse,
+)
+from .cloud_integration_initial_setup_response import (
+    CloudIntegrationInitialSetupResponse as CloudIntegrationInitialSetupResponse,
+)
diff --git a/src/cloudflare/types/magic_cloud_networking/catalog_sync_create_params.py b/src/cloudflare/types/magic_cloud_networking/catalog_sync_create_params.py
new file mode 100644
index 00000000000..18c8dd7a081
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/catalog_sync_create_params.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["CatalogSyncCreateParams"]
+
+
+class CatalogSyncCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    destination_type: Required[Literal["NONE", "ZERO_TRUST_LIST"]]
+
+    name: Required[str]
+
+    update_mode: Required[Literal["AUTO", "MANUAL"]]
+
+    description: str
+
+    policy: str
+
+    forwarded: str
diff --git a/src/cloudflare/types/magic_cloud_networking/catalog_sync_create_response.py b/src/cloudflare/types/magic_cloud_networking/catalog_sync_create_response.py
new file mode 100644
index 00000000000..845ddada455
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/catalog_sync_create_response.py
@@ -0,0 +1,220 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["CatalogSyncCreateResponse", "Errors", "ErrorsMeta", "ErrorsSource"]
+
+
+class ErrorsMeta(BaseModel):
+    l10n_key: Optional[str] = None
+
+    loggable_error: Optional[str] = None
+
+    template_data: Optional[object] = None
+
+    trace_id: Optional[str] = None
+
+
+class ErrorsSource(BaseModel):
+    parameter: Optional[str] = None
+
+    parameter_value_index: Optional[int] = None
+
+    pointer: Optional[str] = None
+
+
+class Errors(BaseModel):
+    code: Literal[
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016,
+        1017,
+        1018,
+        2001,
+        2002,
+        2003,
+        2004,
+        2005,
+        2006,
+        2007,
+        2008,
+        2009,
+        2010,
+        2011,
+        2012,
+        2013,
+        2014,
+        2015,
+        2016,
+        2017,
+        2018,
+        2019,
+        2020,
+        2021,
+        2022,
+        3001,
+        3002,
+        3003,
+        3004,
+        3005,
+        3006,
+        3007,
+        4001,
+        4002,
+        4003,
+        4004,
+        4005,
+        4006,
+        4007,
+        4008,
+        4009,
+        4010,
+        4011,
+        4012,
+        4013,
+        4014,
+        4015,
+        4016,
+        4017,
+        4018,
+        4019,
+        4020,
+        4021,
+        4022,
+        4023,
+        5001,
+        5002,
+        5003,
+        5004,
+        102000,
+        102001,
+        102002,
+        102003,
+        102004,
+        102005,
+        102006,
+        102007,
+        102008,
+        102009,
+        102010,
+        102011,
+        102012,
+        102013,
+        102014,
+        102015,
+        102016,
+        102017,
+        102018,
+        102019,
+        102020,
+        102021,
+        102022,
+        102023,
+        102024,
+        102025,
+        102026,
+        102027,
+        102028,
+        102029,
+        102030,
+        102031,
+        102032,
+        102033,
+        102034,
+        102035,
+        102036,
+        102037,
+        102038,
+        102039,
+        102040,
+        102041,
+        102042,
+        102043,
+        102044,
+        102045,
+        102046,
+        102047,
+        102048,
+        102049,
+        102050,
+        102051,
+        102052,
+        102053,
+        102054,
+        102055,
+        102056,
+        102057,
+        102058,
+        102059,
+        102060,
+        102061,
+        102062,
+        102063,
+        102064,
+        102065,
+        102066,
+        102067,
+        102068,
+        102069,
+        102070,
+        102071,
+        102072,
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007,
+        103008,
+    ]
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    meta: Optional[ErrorsMeta] = None
+
+    source: Optional[ErrorsSource] = None
+
+
+class CatalogSyncCreateResponse(BaseModel):
+    id: str
+
+    description: str
+
+    destination_id: str
+
+    destination_type: Literal["NONE", "ZERO_TRUST_LIST"]
+
+    last_user_update_at: str
+
+    name: str
+
+    policy: str
+
+    update_mode: Literal["AUTO", "MANUAL"]
+
+    errors: Optional[Dict[str, Errors]] = None
+
+    includes_discoveries_until: Optional[str] = None
+
+    last_attempted_update_at: Optional[str] = None
+
+    last_successful_update_at: Optional[str] = None
diff --git a/src/cloudflare/types/magic_cloud_networking/catalog_sync_delete_params.py b/src/cloudflare/types/magic_cloud_networking/catalog_sync_delete_params.py
new file mode 100644
index 00000000000..b8422d6eef9
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/catalog_sync_delete_params.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["CatalogSyncDeleteParams"]
+
+
+class CatalogSyncDeleteParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    delete_destination: bool
diff --git a/src/cloudflare/types/magic_cloud_networking/catalog_sync_delete_response.py b/src/cloudflare/types/magic_cloud_networking/catalog_sync_delete_response.py
new file mode 100644
index 00000000000..0d982cf9640
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/catalog_sync_delete_response.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["CatalogSyncDeleteResponse"]
+
+
+class CatalogSyncDeleteResponse(BaseModel):
+    id: str
diff --git a/src/cloudflare/types/magic_cloud_networking/catalog_sync_edit_params.py b/src/cloudflare/types/magic_cloud_networking/catalog_sync_edit_params.py
new file mode 100644
index 00000000000..4d4c617d89a
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/catalog_sync_edit_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["CatalogSyncEditParams"]
+
+
+class CatalogSyncEditParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    description: str
+
+    name: str
+
+    policy: str
+
+    update_mode: Literal["AUTO", "MANUAL"]
diff --git a/src/cloudflare/types/magic_cloud_networking/catalog_sync_edit_response.py b/src/cloudflare/types/magic_cloud_networking/catalog_sync_edit_response.py
new file mode 100644
index 00000000000..fe1abbc965f
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/catalog_sync_edit_response.py
@@ -0,0 +1,220 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["CatalogSyncEditResponse", "Errors", "ErrorsMeta", "ErrorsSource"]
+
+
+class ErrorsMeta(BaseModel):
+    l10n_key: Optional[str] = None
+
+    loggable_error: Optional[str] = None
+
+    template_data: Optional[object] = None
+
+    trace_id: Optional[str] = None
+
+
+class ErrorsSource(BaseModel):
+    parameter: Optional[str] = None
+
+    parameter_value_index: Optional[int] = None
+
+    pointer: Optional[str] = None
+
+
+class Errors(BaseModel):
+    code: Literal[
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016,
+        1017,
+        1018,
+        2001,
+        2002,
+        2003,
+        2004,
+        2005,
+        2006,
+        2007,
+        2008,
+        2009,
+        2010,
+        2011,
+        2012,
+        2013,
+        2014,
+        2015,
+        2016,
+        2017,
+        2018,
+        2019,
+        2020,
+        2021,
+        2022,
+        3001,
+        3002,
+        3003,
+        3004,
+        3005,
+        3006,
+        3007,
+        4001,
+        4002,
+        4003,
+        4004,
+        4005,
+        4006,
+        4007,
+        4008,
+        4009,
+        4010,
+        4011,
+        4012,
+        4013,
+        4014,
+        4015,
+        4016,
+        4017,
+        4018,
+        4019,
+        4020,
+        4021,
+        4022,
+        4023,
+        5001,
+        5002,
+        5003,
+        5004,
+        102000,
+        102001,
+        102002,
+        102003,
+        102004,
+        102005,
+        102006,
+        102007,
+        102008,
+        102009,
+        102010,
+        102011,
+        102012,
+        102013,
+        102014,
+        102015,
+        102016,
+        102017,
+        102018,
+        102019,
+        102020,
+        102021,
+        102022,
+        102023,
+        102024,
+        102025,
+        102026,
+        102027,
+        102028,
+        102029,
+        102030,
+        102031,
+        102032,
+        102033,
+        102034,
+        102035,
+        102036,
+        102037,
+        102038,
+        102039,
+        102040,
+        102041,
+        102042,
+        102043,
+        102044,
+        102045,
+        102046,
+        102047,
+        102048,
+        102049,
+        102050,
+        102051,
+        102052,
+        102053,
+        102054,
+        102055,
+        102056,
+        102057,
+        102058,
+        102059,
+        102060,
+        102061,
+        102062,
+        102063,
+        102064,
+        102065,
+        102066,
+        102067,
+        102068,
+        102069,
+        102070,
+        102071,
+        102072,
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007,
+        103008,
+    ]
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    meta: Optional[ErrorsMeta] = None
+
+    source: Optional[ErrorsSource] = None
+
+
+class CatalogSyncEditResponse(BaseModel):
+    id: str
+
+    description: str
+
+    destination_id: str
+
+    destination_type: Literal["NONE", "ZERO_TRUST_LIST"]
+
+    last_user_update_at: str
+
+    name: str
+
+    policy: str
+
+    update_mode: Literal["AUTO", "MANUAL"]
+
+    errors: Optional[Dict[str, Errors]] = None
+
+    includes_discoveries_until: Optional[str] = None
+
+    last_attempted_update_at: Optional[str] = None
+
+    last_successful_update_at: Optional[str] = None
diff --git a/src/cloudflare/types/magic_cloud_networking/catalog_sync_get_response.py b/src/cloudflare/types/magic_cloud_networking/catalog_sync_get_response.py
new file mode 100644
index 00000000000..b8dcdebfed4
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/catalog_sync_get_response.py
@@ -0,0 +1,220 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["CatalogSyncGetResponse", "Errors", "ErrorsMeta", "ErrorsSource"]
+
+
+class ErrorsMeta(BaseModel):
+    l10n_key: Optional[str] = None
+
+    loggable_error: Optional[str] = None
+
+    template_data: Optional[object] = None
+
+    trace_id: Optional[str] = None
+
+
+class ErrorsSource(BaseModel):
+    parameter: Optional[str] = None
+
+    parameter_value_index: Optional[int] = None
+
+    pointer: Optional[str] = None
+
+
+class Errors(BaseModel):
+    code: Literal[
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016,
+        1017,
+        1018,
+        2001,
+        2002,
+        2003,
+        2004,
+        2005,
+        2006,
+        2007,
+        2008,
+        2009,
+        2010,
+        2011,
+        2012,
+        2013,
+        2014,
+        2015,
+        2016,
+        2017,
+        2018,
+        2019,
+        2020,
+        2021,
+        2022,
+        3001,
+        3002,
+        3003,
+        3004,
+        3005,
+        3006,
+        3007,
+        4001,
+        4002,
+        4003,
+        4004,
+        4005,
+        4006,
+        4007,
+        4008,
+        4009,
+        4010,
+        4011,
+        4012,
+        4013,
+        4014,
+        4015,
+        4016,
+        4017,
+        4018,
+        4019,
+        4020,
+        4021,
+        4022,
+        4023,
+        5001,
+        5002,
+        5003,
+        5004,
+        102000,
+        102001,
+        102002,
+        102003,
+        102004,
+        102005,
+        102006,
+        102007,
+        102008,
+        102009,
+        102010,
+        102011,
+        102012,
+        102013,
+        102014,
+        102015,
+        102016,
+        102017,
+        102018,
+        102019,
+        102020,
+        102021,
+        102022,
+        102023,
+        102024,
+        102025,
+        102026,
+        102027,
+        102028,
+        102029,
+        102030,
+        102031,
+        102032,
+        102033,
+        102034,
+        102035,
+        102036,
+        102037,
+        102038,
+        102039,
+        102040,
+        102041,
+        102042,
+        102043,
+        102044,
+        102045,
+        102046,
+        102047,
+        102048,
+        102049,
+        102050,
+        102051,
+        102052,
+        102053,
+        102054,
+        102055,
+        102056,
+        102057,
+        102058,
+        102059,
+        102060,
+        102061,
+        102062,
+        102063,
+        102064,
+        102065,
+        102066,
+        102067,
+        102068,
+        102069,
+        102070,
+        102071,
+        102072,
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007,
+        103008,
+    ]
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    meta: Optional[ErrorsMeta] = None
+
+    source: Optional[ErrorsSource] = None
+
+
+class CatalogSyncGetResponse(BaseModel):
+    id: str
+
+    description: str
+
+    destination_id: str
+
+    destination_type: Literal["NONE", "ZERO_TRUST_LIST"]
+
+    last_user_update_at: str
+
+    name: str
+
+    policy: str
+
+    update_mode: Literal["AUTO", "MANUAL"]
+
+    errors: Optional[Dict[str, Errors]] = None
+
+    includes_discoveries_until: Optional[str] = None
+
+    last_attempted_update_at: Optional[str] = None
+
+    last_successful_update_at: Optional[str] = None
diff --git a/src/cloudflare/types/magic_cloud_networking/catalog_sync_list_response.py b/src/cloudflare/types/magic_cloud_networking/catalog_sync_list_response.py
new file mode 100644
index 00000000000..75f04b5f4ce
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/catalog_sync_list_response.py
@@ -0,0 +1,220 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["CatalogSyncListResponse", "Errors", "ErrorsMeta", "ErrorsSource"]
+
+
+class ErrorsMeta(BaseModel):
+    l10n_key: Optional[str] = None
+
+    loggable_error: Optional[str] = None
+
+    template_data: Optional[object] = None
+
+    trace_id: Optional[str] = None
+
+
+class ErrorsSource(BaseModel):
+    parameter: Optional[str] = None
+
+    parameter_value_index: Optional[int] = None
+
+    pointer: Optional[str] = None
+
+
+class Errors(BaseModel):
+    code: Literal[
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016,
+        1017,
+        1018,
+        2001,
+        2002,
+        2003,
+        2004,
+        2005,
+        2006,
+        2007,
+        2008,
+        2009,
+        2010,
+        2011,
+        2012,
+        2013,
+        2014,
+        2015,
+        2016,
+        2017,
+        2018,
+        2019,
+        2020,
+        2021,
+        2022,
+        3001,
+        3002,
+        3003,
+        3004,
+        3005,
+        3006,
+        3007,
+        4001,
+        4002,
+        4003,
+        4004,
+        4005,
+        4006,
+        4007,
+        4008,
+        4009,
+        4010,
+        4011,
+        4012,
+        4013,
+        4014,
+        4015,
+        4016,
+        4017,
+        4018,
+        4019,
+        4020,
+        4021,
+        4022,
+        4023,
+        5001,
+        5002,
+        5003,
+        5004,
+        102000,
+        102001,
+        102002,
+        102003,
+        102004,
+        102005,
+        102006,
+        102007,
+        102008,
+        102009,
+        102010,
+        102011,
+        102012,
+        102013,
+        102014,
+        102015,
+        102016,
+        102017,
+        102018,
+        102019,
+        102020,
+        102021,
+        102022,
+        102023,
+        102024,
+        102025,
+        102026,
+        102027,
+        102028,
+        102029,
+        102030,
+        102031,
+        102032,
+        102033,
+        102034,
+        102035,
+        102036,
+        102037,
+        102038,
+        102039,
+        102040,
+        102041,
+        102042,
+        102043,
+        102044,
+        102045,
+        102046,
+        102047,
+        102048,
+        102049,
+        102050,
+        102051,
+        102052,
+        102053,
+        102054,
+        102055,
+        102056,
+        102057,
+        102058,
+        102059,
+        102060,
+        102061,
+        102062,
+        102063,
+        102064,
+        102065,
+        102066,
+        102067,
+        102068,
+        102069,
+        102070,
+        102071,
+        102072,
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007,
+        103008,
+    ]
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    meta: Optional[ErrorsMeta] = None
+
+    source: Optional[ErrorsSource] = None
+
+
+class CatalogSyncListResponse(BaseModel):
+    id: str
+
+    description: str
+
+    destination_id: str
+
+    destination_type: Literal["NONE", "ZERO_TRUST_LIST"]
+
+    last_user_update_at: str
+
+    name: str
+
+    policy: str
+
+    update_mode: Literal["AUTO", "MANUAL"]
+
+    errors: Optional[Dict[str, Errors]] = None
+
+    includes_discoveries_until: Optional[str] = None
+
+    last_attempted_update_at: Optional[str] = None
+
+    last_successful_update_at: Optional[str] = None
diff --git a/src/cloudflare/types/magic_cloud_networking/catalog_sync_refresh_response.py b/src/cloudflare/types/magic_cloud_networking/catalog_sync_refresh_response.py
new file mode 100644
index 00000000000..2a04a2d1f5c
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/catalog_sync_refresh_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["CatalogSyncRefreshResponse"]
+
+CatalogSyncRefreshResponse: TypeAlias = str
diff --git a/src/cloudflare/types/magic_cloud_networking/catalog_sync_update_params.py b/src/cloudflare/types/magic_cloud_networking/catalog_sync_update_params.py
new file mode 100644
index 00000000000..b3503d5f411
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/catalog_sync_update_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["CatalogSyncUpdateParams"]
+
+
+class CatalogSyncUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    description: str
+
+    name: str
+
+    policy: str
+
+    update_mode: Literal["AUTO", "MANUAL"]
diff --git a/src/cloudflare/types/magic_cloud_networking/catalog_sync_update_response.py b/src/cloudflare/types/magic_cloud_networking/catalog_sync_update_response.py
new file mode 100644
index 00000000000..0d4ca7aa5cb
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/catalog_sync_update_response.py
@@ -0,0 +1,220 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["CatalogSyncUpdateResponse", "Errors", "ErrorsMeta", "ErrorsSource"]
+
+
+class ErrorsMeta(BaseModel):
+    l10n_key: Optional[str] = None
+
+    loggable_error: Optional[str] = None
+
+    template_data: Optional[object] = None
+
+    trace_id: Optional[str] = None
+
+
+class ErrorsSource(BaseModel):
+    parameter: Optional[str] = None
+
+    parameter_value_index: Optional[int] = None
+
+    pointer: Optional[str] = None
+
+
+class Errors(BaseModel):
+    code: Literal[
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016,
+        1017,
+        1018,
+        2001,
+        2002,
+        2003,
+        2004,
+        2005,
+        2006,
+        2007,
+        2008,
+        2009,
+        2010,
+        2011,
+        2012,
+        2013,
+        2014,
+        2015,
+        2016,
+        2017,
+        2018,
+        2019,
+        2020,
+        2021,
+        2022,
+        3001,
+        3002,
+        3003,
+        3004,
+        3005,
+        3006,
+        3007,
+        4001,
+        4002,
+        4003,
+        4004,
+        4005,
+        4006,
+        4007,
+        4008,
+        4009,
+        4010,
+        4011,
+        4012,
+        4013,
+        4014,
+        4015,
+        4016,
+        4017,
+        4018,
+        4019,
+        4020,
+        4021,
+        4022,
+        4023,
+        5001,
+        5002,
+        5003,
+        5004,
+        102000,
+        102001,
+        102002,
+        102003,
+        102004,
+        102005,
+        102006,
+        102007,
+        102008,
+        102009,
+        102010,
+        102011,
+        102012,
+        102013,
+        102014,
+        102015,
+        102016,
+        102017,
+        102018,
+        102019,
+        102020,
+        102021,
+        102022,
+        102023,
+        102024,
+        102025,
+        102026,
+        102027,
+        102028,
+        102029,
+        102030,
+        102031,
+        102032,
+        102033,
+        102034,
+        102035,
+        102036,
+        102037,
+        102038,
+        102039,
+        102040,
+        102041,
+        102042,
+        102043,
+        102044,
+        102045,
+        102046,
+        102047,
+        102048,
+        102049,
+        102050,
+        102051,
+        102052,
+        102053,
+        102054,
+        102055,
+        102056,
+        102057,
+        102058,
+        102059,
+        102060,
+        102061,
+        102062,
+        102063,
+        102064,
+        102065,
+        102066,
+        102067,
+        102068,
+        102069,
+        102070,
+        102071,
+        102072,
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007,
+        103008,
+    ]
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    meta: Optional[ErrorsMeta] = None
+
+    source: Optional[ErrorsSource] = None
+
+
+class CatalogSyncUpdateResponse(BaseModel):
+    id: str
+
+    description: str
+
+    destination_id: str
+
+    destination_type: Literal["NONE", "ZERO_TRUST_LIST"]
+
+    last_user_update_at: str
+
+    name: str
+
+    policy: str
+
+    update_mode: Literal["AUTO", "MANUAL"]
+
+    errors: Optional[Dict[str, Errors]] = None
+
+    includes_discoveries_until: Optional[str] = None
+
+    last_attempted_update_at: Optional[str] = None
+
+    last_successful_update_at: Optional[str] = None
diff --git a/src/cloudflare/types/magic_cloud_networking/catalog_syncs/__init__.py b/src/cloudflare/types/magic_cloud_networking/catalog_syncs/__init__.py
new file mode 100644
index 00000000000..87a6478946d
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/catalog_syncs/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .prebuilt_policy_list_params import PrebuiltPolicyListParams as PrebuiltPolicyListParams
+from .prebuilt_policy_list_response import PrebuiltPolicyListResponse as PrebuiltPolicyListResponse
diff --git a/src/cloudflare/types/magic_cloud_networking/catalog_syncs/prebuilt_policy_list_params.py b/src/cloudflare/types/magic_cloud_networking/catalog_syncs/prebuilt_policy_list_params.py
new file mode 100644
index 00000000000..d13cde44409
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/catalog_syncs/prebuilt_policy_list_params.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["PrebuiltPolicyListParams"]
+
+
+class PrebuiltPolicyListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    destination_type: Literal["NONE", "ZERO_TRUST_LIST"]
+    """Specify type of destination, omit to return all."""
diff --git a/src/cloudflare/types/magic_cloud_networking/catalog_syncs/prebuilt_policy_list_response.py b/src/cloudflare/types/magic_cloud_networking/catalog_syncs/prebuilt_policy_list_response.py
new file mode 100644
index 00000000000..f15faa8c685
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/catalog_syncs/prebuilt_policy_list_response.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["PrebuiltPolicyListResponse"]
+
+
+class PrebuiltPolicyListResponse(BaseModel):
+    applicable_destinations: List[Literal["NONE", "ZERO_TRUST_LIST"]]
+
+    policy_description: str
+
+    policy_name: str
+
+    policy_string: str
diff --git a/src/cloudflare/types/magic_cloud_networking/cloud_integration_create_params.py b/src/cloudflare/types/magic_cloud_networking/cloud_integration_create_params.py
new file mode 100644
index 00000000000..066d1a6d3bd
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/cloud_integration_create_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["CloudIntegrationCreateParams"]
+
+
+class CloudIntegrationCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    cloud_type: Required[Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]]
+
+    friendly_name: Required[str]
+
+    description: str
+
+    forwarded: str
diff --git a/src/cloudflare/types/magic_cloud_networking/cloud_integration_create_response.py b/src/cloudflare/types/magic_cloud_networking/cloud_integration_create_response.py
new file mode 100644
index 00000000000..ffaadd9ae06
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/cloud_integration_create_response.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "CloudIntegrationCreateResponse",
+    "Status",
+    "StatusDiscoveryProgress",
+    "StatusDiscoveryProgressV2",
+    "StatusInUseBy",
+]
+
+
+class StatusDiscoveryProgress(BaseModel):
+    done: int
+
+    total: int
+
+    unit: str
+
+
+class StatusDiscoveryProgressV2(BaseModel):
+    done: int
+
+    total: int
+
+    unit: str
+
+
+class StatusInUseBy(BaseModel):
+    id: str
+
+    client_type: Literal["MAGIC_WAN_CLOUD_ONRAMP"]
+
+    name: str
+
+
+class Status(BaseModel):
+    discovery_progress: StatusDiscoveryProgress
+
+    discovery_progress_v2: StatusDiscoveryProgressV2
+
+    last_discovery_status: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    last_discovery_status_v2: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    regions: List[str]
+
+    credentials_good_since: Optional[str] = None
+
+    credentials_missing_since: Optional[str] = None
+
+    credentials_rejected_since: Optional[str] = None
+
+    discovery_message: Optional[str] = None
+
+    discovery_message_v2: Optional[str] = None
+
+    in_use_by: Optional[List[StatusInUseBy]] = None
+
+    last_discovery_completed_at: Optional[str] = None
+
+    last_discovery_completed_at_v2: Optional[str] = None
+
+    last_discovery_started_at: Optional[str] = None
+
+    last_discovery_started_at_v2: Optional[str] = None
+
+    last_updated: Optional[str] = None
+
+
+class CloudIntegrationCreateResponse(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    friendly_name: str
+
+    last_updated: str
+
+    lifecycle_state: Literal["ACTIVE", "PENDING_SETUP", "RETIRED"]
+
+    state: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    state_v2: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    aws_arn: Optional[str] = None
+
+    azure_subscription_id: Optional[str] = None
+
+    azure_tenant_id: Optional[str] = None
+
+    description: Optional[str] = None
+
+    gcp_project_id: Optional[str] = None
+
+    gcp_service_account_email: Optional[str] = None
+
+    status: Optional[Status] = None
diff --git a/src/cloudflare/types/magic_cloud_networking/cloud_integration_delete_response.py b/src/cloudflare/types/magic_cloud_networking/cloud_integration_delete_response.py
new file mode 100644
index 00000000000..b84445359c2
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/cloud_integration_delete_response.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["CloudIntegrationDeleteResponse"]
+
+
+class CloudIntegrationDeleteResponse(BaseModel):
+    id: str
diff --git a/src/cloudflare/types/magic_cloud_networking/cloud_integration_discover_all_response.py b/src/cloudflare/types/magic_cloud_networking/cloud_integration_discover_all_response.py
new file mode 100644
index 00000000000..8a543eaa169
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/cloud_integration_discover_all_response.py
@@ -0,0 +1,396 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "CloudIntegrationDiscoverAllResponse",
+    "Error",
+    "ErrorMeta",
+    "ErrorSource",
+    "Message",
+    "MessageMeta",
+    "MessageSource",
+]
+
+
+class ErrorMeta(BaseModel):
+    l10n_key: Optional[str] = None
+
+    loggable_error: Optional[str] = None
+
+    template_data: Optional[object] = None
+
+    trace_id: Optional[str] = None
+
+
+class ErrorSource(BaseModel):
+    parameter: Optional[str] = None
+
+    parameter_value_index: Optional[int] = None
+
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: Literal[
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016,
+        1017,
+        1018,
+        2001,
+        2002,
+        2003,
+        2004,
+        2005,
+        2006,
+        2007,
+        2008,
+        2009,
+        2010,
+        2011,
+        2012,
+        2013,
+        2014,
+        2015,
+        2016,
+        2017,
+        2018,
+        2019,
+        2020,
+        2021,
+        2022,
+        3001,
+        3002,
+        3003,
+        3004,
+        3005,
+        3006,
+        3007,
+        4001,
+        4002,
+        4003,
+        4004,
+        4005,
+        4006,
+        4007,
+        4008,
+        4009,
+        4010,
+        4011,
+        4012,
+        4013,
+        4014,
+        4015,
+        4016,
+        4017,
+        4018,
+        4019,
+        4020,
+        4021,
+        4022,
+        4023,
+        5001,
+        5002,
+        5003,
+        5004,
+        102000,
+        102001,
+        102002,
+        102003,
+        102004,
+        102005,
+        102006,
+        102007,
+        102008,
+        102009,
+        102010,
+        102011,
+        102012,
+        102013,
+        102014,
+        102015,
+        102016,
+        102017,
+        102018,
+        102019,
+        102020,
+        102021,
+        102022,
+        102023,
+        102024,
+        102025,
+        102026,
+        102027,
+        102028,
+        102029,
+        102030,
+        102031,
+        102032,
+        102033,
+        102034,
+        102035,
+        102036,
+        102037,
+        102038,
+        102039,
+        102040,
+        102041,
+        102042,
+        102043,
+        102044,
+        102045,
+        102046,
+        102047,
+        102048,
+        102049,
+        102050,
+        102051,
+        102052,
+        102053,
+        102054,
+        102055,
+        102056,
+        102057,
+        102058,
+        102059,
+        102060,
+        102061,
+        102062,
+        102063,
+        102064,
+        102065,
+        102066,
+        102067,
+        102068,
+        102069,
+        102070,
+        102071,
+        102072,
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007,
+        103008,
+    ]
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    meta: Optional[ErrorMeta] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageMeta(BaseModel):
+    l10n_key: Optional[str] = None
+
+    loggable_error: Optional[str] = None
+
+    template_data: Optional[object] = None
+
+    trace_id: Optional[str] = None
+
+
+class MessageSource(BaseModel):
+    parameter: Optional[str] = None
+
+    parameter_value_index: Optional[int] = None
+
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: Literal[
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016,
+        1017,
+        1018,
+        2001,
+        2002,
+        2003,
+        2004,
+        2005,
+        2006,
+        2007,
+        2008,
+        2009,
+        2010,
+        2011,
+        2012,
+        2013,
+        2014,
+        2015,
+        2016,
+        2017,
+        2018,
+        2019,
+        2020,
+        2021,
+        2022,
+        3001,
+        3002,
+        3003,
+        3004,
+        3005,
+        3006,
+        3007,
+        4001,
+        4002,
+        4003,
+        4004,
+        4005,
+        4006,
+        4007,
+        4008,
+        4009,
+        4010,
+        4011,
+        4012,
+        4013,
+        4014,
+        4015,
+        4016,
+        4017,
+        4018,
+        4019,
+        4020,
+        4021,
+        4022,
+        4023,
+        5001,
+        5002,
+        5003,
+        5004,
+        102000,
+        102001,
+        102002,
+        102003,
+        102004,
+        102005,
+        102006,
+        102007,
+        102008,
+        102009,
+        102010,
+        102011,
+        102012,
+        102013,
+        102014,
+        102015,
+        102016,
+        102017,
+        102018,
+        102019,
+        102020,
+        102021,
+        102022,
+        102023,
+        102024,
+        102025,
+        102026,
+        102027,
+        102028,
+        102029,
+        102030,
+        102031,
+        102032,
+        102033,
+        102034,
+        102035,
+        102036,
+        102037,
+        102038,
+        102039,
+        102040,
+        102041,
+        102042,
+        102043,
+        102044,
+        102045,
+        102046,
+        102047,
+        102048,
+        102049,
+        102050,
+        102051,
+        102052,
+        102053,
+        102054,
+        102055,
+        102056,
+        102057,
+        102058,
+        102059,
+        102060,
+        102061,
+        102062,
+        102063,
+        102064,
+        102065,
+        102066,
+        102067,
+        102068,
+        102069,
+        102070,
+        102071,
+        102072,
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007,
+        103008,
+    ]
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    meta: Optional[MessageMeta] = None
+
+    source: Optional[MessageSource] = None
+
+
+class CloudIntegrationDiscoverAllResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: bool
diff --git a/src/cloudflare/types/magic_cloud_networking/cloud_integration_discover_params.py b/src/cloudflare/types/magic_cloud_networking/cloud_integration_discover_params.py
new file mode 100644
index 00000000000..f54258bfcbe
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/cloud_integration_discover_params.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["CloudIntegrationDiscoverParams"]
+
+
+class CloudIntegrationDiscoverParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    v2: bool
diff --git a/src/cloudflare/types/magic_cloud_networking/cloud_integration_discover_response.py b/src/cloudflare/types/magic_cloud_networking/cloud_integration_discover_response.py
new file mode 100644
index 00000000000..9e817b739b2
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/cloud_integration_discover_response.py
@@ -0,0 +1,396 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "CloudIntegrationDiscoverResponse",
+    "Error",
+    "ErrorMeta",
+    "ErrorSource",
+    "Message",
+    "MessageMeta",
+    "MessageSource",
+]
+
+
+class ErrorMeta(BaseModel):
+    l10n_key: Optional[str] = None
+
+    loggable_error: Optional[str] = None
+
+    template_data: Optional[object] = None
+
+    trace_id: Optional[str] = None
+
+
+class ErrorSource(BaseModel):
+    parameter: Optional[str] = None
+
+    parameter_value_index: Optional[int] = None
+
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: Literal[
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016,
+        1017,
+        1018,
+        2001,
+        2002,
+        2003,
+        2004,
+        2005,
+        2006,
+        2007,
+        2008,
+        2009,
+        2010,
+        2011,
+        2012,
+        2013,
+        2014,
+        2015,
+        2016,
+        2017,
+        2018,
+        2019,
+        2020,
+        2021,
+        2022,
+        3001,
+        3002,
+        3003,
+        3004,
+        3005,
+        3006,
+        3007,
+        4001,
+        4002,
+        4003,
+        4004,
+        4005,
+        4006,
+        4007,
+        4008,
+        4009,
+        4010,
+        4011,
+        4012,
+        4013,
+        4014,
+        4015,
+        4016,
+        4017,
+        4018,
+        4019,
+        4020,
+        4021,
+        4022,
+        4023,
+        5001,
+        5002,
+        5003,
+        5004,
+        102000,
+        102001,
+        102002,
+        102003,
+        102004,
+        102005,
+        102006,
+        102007,
+        102008,
+        102009,
+        102010,
+        102011,
+        102012,
+        102013,
+        102014,
+        102015,
+        102016,
+        102017,
+        102018,
+        102019,
+        102020,
+        102021,
+        102022,
+        102023,
+        102024,
+        102025,
+        102026,
+        102027,
+        102028,
+        102029,
+        102030,
+        102031,
+        102032,
+        102033,
+        102034,
+        102035,
+        102036,
+        102037,
+        102038,
+        102039,
+        102040,
+        102041,
+        102042,
+        102043,
+        102044,
+        102045,
+        102046,
+        102047,
+        102048,
+        102049,
+        102050,
+        102051,
+        102052,
+        102053,
+        102054,
+        102055,
+        102056,
+        102057,
+        102058,
+        102059,
+        102060,
+        102061,
+        102062,
+        102063,
+        102064,
+        102065,
+        102066,
+        102067,
+        102068,
+        102069,
+        102070,
+        102071,
+        102072,
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007,
+        103008,
+    ]
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    meta: Optional[ErrorMeta] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageMeta(BaseModel):
+    l10n_key: Optional[str] = None
+
+    loggable_error: Optional[str] = None
+
+    template_data: Optional[object] = None
+
+    trace_id: Optional[str] = None
+
+
+class MessageSource(BaseModel):
+    parameter: Optional[str] = None
+
+    parameter_value_index: Optional[int] = None
+
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: Literal[
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016,
+        1017,
+        1018,
+        2001,
+        2002,
+        2003,
+        2004,
+        2005,
+        2006,
+        2007,
+        2008,
+        2009,
+        2010,
+        2011,
+        2012,
+        2013,
+        2014,
+        2015,
+        2016,
+        2017,
+        2018,
+        2019,
+        2020,
+        2021,
+        2022,
+        3001,
+        3002,
+        3003,
+        3004,
+        3005,
+        3006,
+        3007,
+        4001,
+        4002,
+        4003,
+        4004,
+        4005,
+        4006,
+        4007,
+        4008,
+        4009,
+        4010,
+        4011,
+        4012,
+        4013,
+        4014,
+        4015,
+        4016,
+        4017,
+        4018,
+        4019,
+        4020,
+        4021,
+        4022,
+        4023,
+        5001,
+        5002,
+        5003,
+        5004,
+        102000,
+        102001,
+        102002,
+        102003,
+        102004,
+        102005,
+        102006,
+        102007,
+        102008,
+        102009,
+        102010,
+        102011,
+        102012,
+        102013,
+        102014,
+        102015,
+        102016,
+        102017,
+        102018,
+        102019,
+        102020,
+        102021,
+        102022,
+        102023,
+        102024,
+        102025,
+        102026,
+        102027,
+        102028,
+        102029,
+        102030,
+        102031,
+        102032,
+        102033,
+        102034,
+        102035,
+        102036,
+        102037,
+        102038,
+        102039,
+        102040,
+        102041,
+        102042,
+        102043,
+        102044,
+        102045,
+        102046,
+        102047,
+        102048,
+        102049,
+        102050,
+        102051,
+        102052,
+        102053,
+        102054,
+        102055,
+        102056,
+        102057,
+        102058,
+        102059,
+        102060,
+        102061,
+        102062,
+        102063,
+        102064,
+        102065,
+        102066,
+        102067,
+        102068,
+        102069,
+        102070,
+        102071,
+        102072,
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007,
+        103008,
+    ]
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    meta: Optional[MessageMeta] = None
+
+    source: Optional[MessageSource] = None
+
+
+class CloudIntegrationDiscoverResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: bool
diff --git a/src/cloudflare/types/magic_cloud_networking/cloud_integration_edit_params.py b/src/cloudflare/types/magic_cloud_networking/cloud_integration_edit_params.py
new file mode 100644
index 00000000000..e069ee25408
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/cloud_integration_edit_params.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["CloudIntegrationEditParams"]
+
+
+class CloudIntegrationEditParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    aws_arn: str
+
+    azure_subscription_id: str
+
+    azure_tenant_id: str
+
+    description: str
+
+    friendly_name: str
+
+    gcp_project_id: str
+
+    gcp_service_account_email: str
diff --git a/src/cloudflare/types/magic_cloud_networking/cloud_integration_edit_response.py b/src/cloudflare/types/magic_cloud_networking/cloud_integration_edit_response.py
new file mode 100644
index 00000000000..c558b193ffe
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/cloud_integration_edit_response.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "CloudIntegrationEditResponse",
+    "Status",
+    "StatusDiscoveryProgress",
+    "StatusDiscoveryProgressV2",
+    "StatusInUseBy",
+]
+
+
+class StatusDiscoveryProgress(BaseModel):
+    done: int
+
+    total: int
+
+    unit: str
+
+
+class StatusDiscoveryProgressV2(BaseModel):
+    done: int
+
+    total: int
+
+    unit: str
+
+
+class StatusInUseBy(BaseModel):
+    id: str
+
+    client_type: Literal["MAGIC_WAN_CLOUD_ONRAMP"]
+
+    name: str
+
+
+class Status(BaseModel):
+    discovery_progress: StatusDiscoveryProgress
+
+    discovery_progress_v2: StatusDiscoveryProgressV2
+
+    last_discovery_status: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    last_discovery_status_v2: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    regions: List[str]
+
+    credentials_good_since: Optional[str] = None
+
+    credentials_missing_since: Optional[str] = None
+
+    credentials_rejected_since: Optional[str] = None
+
+    discovery_message: Optional[str] = None
+
+    discovery_message_v2: Optional[str] = None
+
+    in_use_by: Optional[List[StatusInUseBy]] = None
+
+    last_discovery_completed_at: Optional[str] = None
+
+    last_discovery_completed_at_v2: Optional[str] = None
+
+    last_discovery_started_at: Optional[str] = None
+
+    last_discovery_started_at_v2: Optional[str] = None
+
+    last_updated: Optional[str] = None
+
+
+class CloudIntegrationEditResponse(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    friendly_name: str
+
+    last_updated: str
+
+    lifecycle_state: Literal["ACTIVE", "PENDING_SETUP", "RETIRED"]
+
+    state: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    state_v2: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    aws_arn: Optional[str] = None
+
+    azure_subscription_id: Optional[str] = None
+
+    azure_tenant_id: Optional[str] = None
+
+    description: Optional[str] = None
+
+    gcp_project_id: Optional[str] = None
+
+    gcp_service_account_email: Optional[str] = None
+
+    status: Optional[Status] = None
diff --git a/src/cloudflare/types/magic_cloud_networking/cloud_integration_get_params.py b/src/cloudflare/types/magic_cloud_networking/cloud_integration_get_params.py
new file mode 100644
index 00000000000..4a26230bc6f
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/cloud_integration_get_params.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["CloudIntegrationGetParams"]
+
+
+class CloudIntegrationGetParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    status: bool
diff --git a/src/cloudflare/types/magic_cloud_networking/cloud_integration_get_response.py b/src/cloudflare/types/magic_cloud_networking/cloud_integration_get_response.py
new file mode 100644
index 00000000000..5774ec5c2e6
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/cloud_integration_get_response.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "CloudIntegrationGetResponse",
+    "Status",
+    "StatusDiscoveryProgress",
+    "StatusDiscoveryProgressV2",
+    "StatusInUseBy",
+]
+
+
+class StatusDiscoveryProgress(BaseModel):
+    done: int
+
+    total: int
+
+    unit: str
+
+
+class StatusDiscoveryProgressV2(BaseModel):
+    done: int
+
+    total: int
+
+    unit: str
+
+
+class StatusInUseBy(BaseModel):
+    id: str
+
+    client_type: Literal["MAGIC_WAN_CLOUD_ONRAMP"]
+
+    name: str
+
+
+class Status(BaseModel):
+    discovery_progress: StatusDiscoveryProgress
+
+    discovery_progress_v2: StatusDiscoveryProgressV2
+
+    last_discovery_status: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    last_discovery_status_v2: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    regions: List[str]
+
+    credentials_good_since: Optional[str] = None
+
+    credentials_missing_since: Optional[str] = None
+
+    credentials_rejected_since: Optional[str] = None
+
+    discovery_message: Optional[str] = None
+
+    discovery_message_v2: Optional[str] = None
+
+    in_use_by: Optional[List[StatusInUseBy]] = None
+
+    last_discovery_completed_at: Optional[str] = None
+
+    last_discovery_completed_at_v2: Optional[str] = None
+
+    last_discovery_started_at: Optional[str] = None
+
+    last_discovery_started_at_v2: Optional[str] = None
+
+    last_updated: Optional[str] = None
+
+
+class CloudIntegrationGetResponse(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    friendly_name: str
+
+    last_updated: str
+
+    lifecycle_state: Literal["ACTIVE", "PENDING_SETUP", "RETIRED"]
+
+    state: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    state_v2: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    aws_arn: Optional[str] = None
+
+    azure_subscription_id: Optional[str] = None
+
+    azure_tenant_id: Optional[str] = None
+
+    description: Optional[str] = None
+
+    gcp_project_id: Optional[str] = None
+
+    gcp_service_account_email: Optional[str] = None
+
+    status: Optional[Status] = None
diff --git a/src/cloudflare/types/magic_cloud_networking/cloud_integration_initial_setup_response.py b/src/cloudflare/types/magic_cloud_networking/cloud_integration_initial_setup_response.py
new file mode 100644
index 00000000000..0f5e59ac598
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/cloud_integration_initial_setup_response.py
@@ -0,0 +1,38 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Union
+from typing_extensions import Annotated, TypeAlias
+
+from ..._utils import PropertyInfo
+from ..._models import BaseModel
+
+__all__ = ["CloudIntegrationInitialSetupResponse", "McnAwsTrustPolicy", "McnAzureSetup", "McnGcpSetup"]
+
+
+class McnAwsTrustPolicy(BaseModel):
+    aws_trust_policy: str
+
+    item_type: str
+
+
+class McnAzureSetup(BaseModel):
+    azure_consent_url: str
+
+    integration_identity_tag: str
+
+    item_type: str
+
+    tag_cli_command: str
+
+
+class McnGcpSetup(BaseModel):
+    integration_identity_tag: str
+
+    item_type: str
+
+    tag_cli_command: str
+
+
+CloudIntegrationInitialSetupResponse: TypeAlias = Annotated[
+    Union[McnAwsTrustPolicy, McnAzureSetup, McnGcpSetup], PropertyInfo(discriminator="item_type")
+]
diff --git a/src/cloudflare/types/magic_cloud_networking/cloud_integration_list_params.py b/src/cloudflare/types/magic_cloud_networking/cloud_integration_list_params.py
new file mode 100644
index 00000000000..94bead9742a
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/cloud_integration_list_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["CloudIntegrationListParams"]
+
+
+class CloudIntegrationListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    cloudflare: bool
+
+    desc: bool
+
+    order_by: str
+    """One of ["updated_at", "id", "cloud_type", "name"]."""
+
+    status: bool
diff --git a/src/cloudflare/types/magic_cloud_networking/cloud_integration_list_response.py b/src/cloudflare/types/magic_cloud_networking/cloud_integration_list_response.py
new file mode 100644
index 00000000000..7fa27eeeb38
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/cloud_integration_list_response.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "CloudIntegrationListResponse",
+    "Status",
+    "StatusDiscoveryProgress",
+    "StatusDiscoveryProgressV2",
+    "StatusInUseBy",
+]
+
+
+class StatusDiscoveryProgress(BaseModel):
+    done: int
+
+    total: int
+
+    unit: str
+
+
+class StatusDiscoveryProgressV2(BaseModel):
+    done: int
+
+    total: int
+
+    unit: str
+
+
+class StatusInUseBy(BaseModel):
+    id: str
+
+    client_type: Literal["MAGIC_WAN_CLOUD_ONRAMP"]
+
+    name: str
+
+
+class Status(BaseModel):
+    discovery_progress: StatusDiscoveryProgress
+
+    discovery_progress_v2: StatusDiscoveryProgressV2
+
+    last_discovery_status: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    last_discovery_status_v2: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    regions: List[str]
+
+    credentials_good_since: Optional[str] = None
+
+    credentials_missing_since: Optional[str] = None
+
+    credentials_rejected_since: Optional[str] = None
+
+    discovery_message: Optional[str] = None
+
+    discovery_message_v2: Optional[str] = None
+
+    in_use_by: Optional[List[StatusInUseBy]] = None
+
+    last_discovery_completed_at: Optional[str] = None
+
+    last_discovery_completed_at_v2: Optional[str] = None
+
+    last_discovery_started_at: Optional[str] = None
+
+    last_discovery_started_at_v2: Optional[str] = None
+
+    last_updated: Optional[str] = None
+
+
+class CloudIntegrationListResponse(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    friendly_name: str
+
+    last_updated: str
+
+    lifecycle_state: Literal["ACTIVE", "PENDING_SETUP", "RETIRED"]
+
+    state: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    state_v2: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    aws_arn: Optional[str] = None
+
+    azure_subscription_id: Optional[str] = None
+
+    azure_tenant_id: Optional[str] = None
+
+    description: Optional[str] = None
+
+    gcp_project_id: Optional[str] = None
+
+    gcp_service_account_email: Optional[str] = None
+
+    status: Optional[Status] = None
diff --git a/src/cloudflare/types/magic_cloud_networking/cloud_integration_update_params.py b/src/cloudflare/types/magic_cloud_networking/cloud_integration_update_params.py
new file mode 100644
index 00000000000..9321e19b5d8
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/cloud_integration_update_params.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["CloudIntegrationUpdateParams"]
+
+
+class CloudIntegrationUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    aws_arn: str
+
+    azure_subscription_id: str
+
+    azure_tenant_id: str
+
+    description: str
+
+    friendly_name: str
+
+    gcp_project_id: str
+
+    gcp_service_account_email: str
diff --git a/src/cloudflare/types/magic_cloud_networking/cloud_integration_update_response.py b/src/cloudflare/types/magic_cloud_networking/cloud_integration_update_response.py
new file mode 100644
index 00000000000..80182a46e99
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/cloud_integration_update_response.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "CloudIntegrationUpdateResponse",
+    "Status",
+    "StatusDiscoveryProgress",
+    "StatusDiscoveryProgressV2",
+    "StatusInUseBy",
+]
+
+
+class StatusDiscoveryProgress(BaseModel):
+    done: int
+
+    total: int
+
+    unit: str
+
+
+class StatusDiscoveryProgressV2(BaseModel):
+    done: int
+
+    total: int
+
+    unit: str
+
+
+class StatusInUseBy(BaseModel):
+    id: str
+
+    client_type: Literal["MAGIC_WAN_CLOUD_ONRAMP"]
+
+    name: str
+
+
+class Status(BaseModel):
+    discovery_progress: StatusDiscoveryProgress
+
+    discovery_progress_v2: StatusDiscoveryProgressV2
+
+    last_discovery_status: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    last_discovery_status_v2: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    regions: List[str]
+
+    credentials_good_since: Optional[str] = None
+
+    credentials_missing_since: Optional[str] = None
+
+    credentials_rejected_since: Optional[str] = None
+
+    discovery_message: Optional[str] = None
+
+    discovery_message_v2: Optional[str] = None
+
+    in_use_by: Optional[List[StatusInUseBy]] = None
+
+    last_discovery_completed_at: Optional[str] = None
+
+    last_discovery_completed_at_v2: Optional[str] = None
+
+    last_discovery_started_at: Optional[str] = None
+
+    last_discovery_started_at_v2: Optional[str] = None
+
+    last_updated: Optional[str] = None
+
+
+class CloudIntegrationUpdateResponse(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    friendly_name: str
+
+    last_updated: str
+
+    lifecycle_state: Literal["ACTIVE", "PENDING_SETUP", "RETIRED"]
+
+    state: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    state_v2: Literal["UNSPECIFIED", "PENDING", "DISCOVERING", "FAILED", "SUCCEEDED"]
+
+    aws_arn: Optional[str] = None
+
+    azure_subscription_id: Optional[str] = None
+
+    azure_tenant_id: Optional[str] = None
+
+    description: Optional[str] = None
+
+    gcp_project_id: Optional[str] = None
+
+    gcp_service_account_email: Optional[str] = None
+
+    status: Optional[Status] = None
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramp_apply_response.py b/src/cloudflare/types/magic_cloud_networking/on_ramp_apply_response.py
new file mode 100644
index 00000000000..a2681f95e45
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramp_apply_response.py
@@ -0,0 +1,388 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["OnRampApplyResponse", "Error", "ErrorMeta", "ErrorSource", "Message", "MessageMeta", "MessageSource"]
+
+
+class ErrorMeta(BaseModel):
+    l10n_key: Optional[str] = None
+
+    loggable_error: Optional[str] = None
+
+    template_data: Optional[object] = None
+
+    trace_id: Optional[str] = None
+
+
+class ErrorSource(BaseModel):
+    parameter: Optional[str] = None
+
+    parameter_value_index: Optional[int] = None
+
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: Literal[
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016,
+        1017,
+        1018,
+        2001,
+        2002,
+        2003,
+        2004,
+        2005,
+        2006,
+        2007,
+        2008,
+        2009,
+        2010,
+        2011,
+        2012,
+        2013,
+        2014,
+        2015,
+        2016,
+        2017,
+        2018,
+        2019,
+        2020,
+        2021,
+        2022,
+        3001,
+        3002,
+        3003,
+        3004,
+        3005,
+        3006,
+        3007,
+        4001,
+        4002,
+        4003,
+        4004,
+        4005,
+        4006,
+        4007,
+        4008,
+        4009,
+        4010,
+        4011,
+        4012,
+        4013,
+        4014,
+        4015,
+        4016,
+        4017,
+        4018,
+        4019,
+        4020,
+        4021,
+        4022,
+        4023,
+        5001,
+        5002,
+        5003,
+        5004,
+        102000,
+        102001,
+        102002,
+        102003,
+        102004,
+        102005,
+        102006,
+        102007,
+        102008,
+        102009,
+        102010,
+        102011,
+        102012,
+        102013,
+        102014,
+        102015,
+        102016,
+        102017,
+        102018,
+        102019,
+        102020,
+        102021,
+        102022,
+        102023,
+        102024,
+        102025,
+        102026,
+        102027,
+        102028,
+        102029,
+        102030,
+        102031,
+        102032,
+        102033,
+        102034,
+        102035,
+        102036,
+        102037,
+        102038,
+        102039,
+        102040,
+        102041,
+        102042,
+        102043,
+        102044,
+        102045,
+        102046,
+        102047,
+        102048,
+        102049,
+        102050,
+        102051,
+        102052,
+        102053,
+        102054,
+        102055,
+        102056,
+        102057,
+        102058,
+        102059,
+        102060,
+        102061,
+        102062,
+        102063,
+        102064,
+        102065,
+        102066,
+        102067,
+        102068,
+        102069,
+        102070,
+        102071,
+        102072,
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007,
+        103008,
+    ]
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    meta: Optional[ErrorMeta] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageMeta(BaseModel):
+    l10n_key: Optional[str] = None
+
+    loggable_error: Optional[str] = None
+
+    template_data: Optional[object] = None
+
+    trace_id: Optional[str] = None
+
+
+class MessageSource(BaseModel):
+    parameter: Optional[str] = None
+
+    parameter_value_index: Optional[int] = None
+
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: Literal[
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016,
+        1017,
+        1018,
+        2001,
+        2002,
+        2003,
+        2004,
+        2005,
+        2006,
+        2007,
+        2008,
+        2009,
+        2010,
+        2011,
+        2012,
+        2013,
+        2014,
+        2015,
+        2016,
+        2017,
+        2018,
+        2019,
+        2020,
+        2021,
+        2022,
+        3001,
+        3002,
+        3003,
+        3004,
+        3005,
+        3006,
+        3007,
+        4001,
+        4002,
+        4003,
+        4004,
+        4005,
+        4006,
+        4007,
+        4008,
+        4009,
+        4010,
+        4011,
+        4012,
+        4013,
+        4014,
+        4015,
+        4016,
+        4017,
+        4018,
+        4019,
+        4020,
+        4021,
+        4022,
+        4023,
+        5001,
+        5002,
+        5003,
+        5004,
+        102000,
+        102001,
+        102002,
+        102003,
+        102004,
+        102005,
+        102006,
+        102007,
+        102008,
+        102009,
+        102010,
+        102011,
+        102012,
+        102013,
+        102014,
+        102015,
+        102016,
+        102017,
+        102018,
+        102019,
+        102020,
+        102021,
+        102022,
+        102023,
+        102024,
+        102025,
+        102026,
+        102027,
+        102028,
+        102029,
+        102030,
+        102031,
+        102032,
+        102033,
+        102034,
+        102035,
+        102036,
+        102037,
+        102038,
+        102039,
+        102040,
+        102041,
+        102042,
+        102043,
+        102044,
+        102045,
+        102046,
+        102047,
+        102048,
+        102049,
+        102050,
+        102051,
+        102052,
+        102053,
+        102054,
+        102055,
+        102056,
+        102057,
+        102058,
+        102059,
+        102060,
+        102061,
+        102062,
+        102063,
+        102064,
+        102065,
+        102066,
+        102067,
+        102068,
+        102069,
+        102070,
+        102071,
+        102072,
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007,
+        103008,
+    ]
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    meta: Optional[MessageMeta] = None
+
+    source: Optional[MessageSource] = None
+
+
+class OnRampApplyResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: bool
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramp_create_params.py b/src/cloudflare/types/magic_cloud_networking/on_ramp_create_params.py
new file mode 100644
index 00000000000..7cf2f9b0df7
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramp_create_params.py
@@ -0,0 +1,55 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["OnRampCreateParams"]
+
+
+class OnRampCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    cloud_type: Required[Literal["AWS", "AZURE", "GOOGLE"]]
+
+    dynamic_routing: Required[bool]
+    """
+    if set to true, install_routes_in_cloud and install_routes_in_magic_wan should
+    be set to false
+    """
+
+    install_routes_in_cloud: Required[bool]
+
+    install_routes_in_magic_wan: Required[bool]
+
+    name: Required[str]
+
+    type: Required[Literal["OnrampTypeSingle", "OnrampTypeHub"]]
+
+    adopted_hub_id: str
+
+    attached_hubs: SequenceNotStr[str]
+
+    attached_vpcs: SequenceNotStr[str]
+
+    cloud_asn: int
+    """the ASN to use on the cloud side.
+
+    If unset or zero, the cloud's default will be used.
+    """
+
+    description: str
+
+    hub_provider_id: str
+
+    manage_hub_to_hub_attachments: bool
+
+    manage_vpc_to_hub_attachments: bool
+
+    region: str
+
+    vpc: str
+
+    forwarded: str
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramp_create_response.py b/src/cloudflare/types/magic_cloud_networking/on_ramp_create_response.py
new file mode 100644
index 00000000000..c7c00da4cdd
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramp_create_response.py
@@ -0,0 +1,1675 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._utils import PropertyInfo
+from ..._models import BaseModel
+
+__all__ = [
+    "OnRampCreateResponse",
+    "PlannedMonthlyCostEstimate",
+    "PlannedResource",
+    "PlannedResourceDiff",
+    "PlannedResourceMonthlyCostEstimateDiff",
+    "PlannedResourceResource",
+    "PostApplyMonthlyCostEstimate",
+    "PostApplyResources",
+    "PostApplyResourcesMonthlyCostEstimate",
+    "PostApplyResourcesObservations",
+    "PostApplyResourcesSection",
+    "PostApplyResourcesSectionHiddenItem",
+    "PostApplyResourcesSectionHiddenItemValue",
+    "PostApplyResourcesSectionHiddenItemValueMcnStringItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnYamlItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItemYamlDiff",
+    "PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemList",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnStringItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesSectionVisibleItem",
+    "PostApplyResourcesSectionVisibleItemValue",
+    "PostApplyResourcesSectionVisibleItemValueMcnStringItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnYamlItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItemYamlDiff",
+    "PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemList",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnStringItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesManagedBy",
+    "Status",
+    "StatusApplyProgress",
+    "StatusPlanProgress",
+    "StatusLifecycleErrors",
+    "StatusLifecycleErrorsMeta",
+    "StatusLifecycleErrorsSource",
+    "VPCsByID",
+    "VPCsByIDMonthlyCostEstimate",
+    "VPCsByIDObservations",
+    "VPCsByIDSection",
+    "VPCsByIDSectionHiddenItem",
+    "VPCsByIDSectionHiddenItemValue",
+    "VPCsByIDSectionHiddenItemValueMcnStringItem",
+    "VPCsByIDSectionHiddenItemValueMcnYamlItem",
+    "VPCsByIDSectionHiddenItemValueMcnYamlDiffItem",
+    "VPCsByIDSectionHiddenItemValueMcnYamlDiffItemYamlDiff",
+    "VPCsByIDSectionHiddenItemValueMcnResourcePreviewItem",
+    "VPCsByIDSectionHiddenItemValueMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDSectionHiddenItemValueMcnListItem",
+    "VPCsByIDSectionHiddenItemValueMcnListItemList",
+    "VPCsByIDSectionHiddenItemValueMcnListItemListMcnStringItem",
+    "VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem",
+    "VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDSectionVisibleItem",
+    "VPCsByIDSectionVisibleItemValue",
+    "VPCsByIDSectionVisibleItemValueMcnStringItem",
+    "VPCsByIDSectionVisibleItemValueMcnYamlItem",
+    "VPCsByIDSectionVisibleItemValueMcnYamlDiffItem",
+    "VPCsByIDSectionVisibleItemValueMcnYamlDiffItemYamlDiff",
+    "VPCsByIDSectionVisibleItemValueMcnResourcePreviewItem",
+    "VPCsByIDSectionVisibleItemValueMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDSectionVisibleItemValueMcnListItem",
+    "VPCsByIDSectionVisibleItemValueMcnListItemList",
+    "VPCsByIDSectionVisibleItemValueMcnListItemListMcnStringItem",
+    "VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem",
+    "VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDManagedBy",
+]
+
+
+class PlannedMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    current_monthly_cost: float
+
+    diff: float
+
+    proposed_monthly_cost: float
+
+
+class PlannedResourceDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class PlannedResourceMonthlyCostEstimateDiff(BaseModel):
+    currency: str
+
+    current_monthly_cost: float
+
+    diff: float
+
+    proposed_monthly_cost: float
+
+
+class PlannedResourceResource(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PlannedResource(BaseModel):
+    diff: PlannedResourceDiff
+
+    keys_require_replace: List[str]
+
+    monthly_cost_estimate_diff: PlannedResourceMonthlyCostEstimateDiff
+
+    planned_action: Literal["no_op", "create", "update", "replace", "destroy"]
+
+    resource: PlannedResourceResource
+
+
+class PostApplyMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    monthly_cost: float
+
+
+class PostApplyResourcesMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    monthly_cost: float
+
+
+class PostApplyResourcesObservations(BaseModel):
+    first_observed_at: str
+
+    last_observed_at: str
+
+    provider_id: str
+
+    resource_id: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItemYamlDiff
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItemResourcePreview
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+PostApplyResourcesSectionHiddenItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnStringItem,
+        PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[PostApplyResourcesSectionHiddenItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+PostApplyResourcesSectionHiddenItemValue: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionHiddenItemValueMcnStringItem,
+        PostApplyResourcesSectionHiddenItemValueMcnYamlItem,
+        PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItem,
+        PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItem,
+        PostApplyResourcesSectionHiddenItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionHiddenItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[PostApplyResourcesSectionHiddenItemValue] = None
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItemYamlDiff
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItemResourcePreview
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+PostApplyResourcesSectionVisibleItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnStringItem,
+        PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[PostApplyResourcesSectionVisibleItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+PostApplyResourcesSectionVisibleItemValue: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionVisibleItemValueMcnStringItem,
+        PostApplyResourcesSectionVisibleItemValueMcnYamlItem,
+        PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItem,
+        PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItem,
+        PostApplyResourcesSectionVisibleItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionVisibleItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[PostApplyResourcesSectionVisibleItemValue] = None
+
+
+class PostApplyResourcesSection(BaseModel):
+    hidden_items: List[PostApplyResourcesSectionHiddenItem]
+
+    name: str
+
+    visible_items: List[PostApplyResourcesSectionVisibleItem]
+
+    help_text: Optional[str] = None
+
+
+class PostApplyResourcesManagedBy(BaseModel):
+    id: str
+
+    client_type: Literal["MAGIC_WAN_CLOUD_ONRAMP"]
+
+    name: str
+
+
+class PostApplyResources(BaseModel):
+    id: str
+
+    account_id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    config: Dict[str, object]
+
+    deployment_provider: str
+
+    managed: bool
+
+    monthly_cost_estimate: PostApplyResourcesMonthlyCostEstimate
+
+    name: str
+
+    native_id: str
+
+    observations: Dict[str, PostApplyResourcesObservations]
+
+    provider_ids: List[str]
+
+    provider_names_by_id: Dict[str, str]
+
+    region: str
+
+    resource_group: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    sections: List[PostApplyResourcesSection]
+
+    state: Dict[str, object]
+
+    tags: Dict[str, str]
+
+    updated_at: str
+
+    url: str
+
+    managed_by: Optional[List[PostApplyResourcesManagedBy]] = None
+
+
+class StatusApplyProgress(BaseModel):
+    done: int
+
+    total: int
+
+
+class StatusPlanProgress(BaseModel):
+    done: int
+
+    total: int
+
+
+class StatusLifecycleErrorsMeta(BaseModel):
+    l10n_key: Optional[str] = None
+
+    loggable_error: Optional[str] = None
+
+    template_data: Optional[object] = None
+
+    trace_id: Optional[str] = None
+
+
+class StatusLifecycleErrorsSource(BaseModel):
+    parameter: Optional[str] = None
+
+    parameter_value_index: Optional[int] = None
+
+    pointer: Optional[str] = None
+
+
+class StatusLifecycleErrors(BaseModel):
+    code: Literal[
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016,
+        1017,
+        1018,
+        2001,
+        2002,
+        2003,
+        2004,
+        2005,
+        2006,
+        2007,
+        2008,
+        2009,
+        2010,
+        2011,
+        2012,
+        2013,
+        2014,
+        2015,
+        2016,
+        2017,
+        2018,
+        2019,
+        2020,
+        2021,
+        2022,
+        3001,
+        3002,
+        3003,
+        3004,
+        3005,
+        3006,
+        3007,
+        4001,
+        4002,
+        4003,
+        4004,
+        4005,
+        4006,
+        4007,
+        4008,
+        4009,
+        4010,
+        4011,
+        4012,
+        4013,
+        4014,
+        4015,
+        4016,
+        4017,
+        4018,
+        4019,
+        4020,
+        4021,
+        4022,
+        4023,
+        5001,
+        5002,
+        5003,
+        5004,
+        102000,
+        102001,
+        102002,
+        102003,
+        102004,
+        102005,
+        102006,
+        102007,
+        102008,
+        102009,
+        102010,
+        102011,
+        102012,
+        102013,
+        102014,
+        102015,
+        102016,
+        102017,
+        102018,
+        102019,
+        102020,
+        102021,
+        102022,
+        102023,
+        102024,
+        102025,
+        102026,
+        102027,
+        102028,
+        102029,
+        102030,
+        102031,
+        102032,
+        102033,
+        102034,
+        102035,
+        102036,
+        102037,
+        102038,
+        102039,
+        102040,
+        102041,
+        102042,
+        102043,
+        102044,
+        102045,
+        102046,
+        102047,
+        102048,
+        102049,
+        102050,
+        102051,
+        102052,
+        102053,
+        102054,
+        102055,
+        102056,
+        102057,
+        102058,
+        102059,
+        102060,
+        102061,
+        102062,
+        102063,
+        102064,
+        102065,
+        102066,
+        102067,
+        102068,
+        102069,
+        102070,
+        102071,
+        102072,
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007,
+        103008,
+    ]
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    meta: Optional[StatusLifecycleErrorsMeta] = None
+
+    source: Optional[StatusLifecycleErrorsSource] = None
+
+
+class Status(BaseModel):
+    apply_progress: StatusApplyProgress
+
+    lifecycle_state: Literal[
+        "OnrampNeedsApply",
+        "OnrampPendingPlan",
+        "OnrampPlanning",
+        "OnrampPlanFailed",
+        "OnrampPendingApproval",
+        "OnrampPendingApply",
+        "OnrampApplying",
+        "OnrampApplyFailed",
+        "OnrampActive",
+        "OnrampPendingDestroy",
+        "OnrampDestroying",
+        "OnrampDestroyFailed",
+    ]
+
+    plan_progress: StatusPlanProgress
+
+    routes: List[str]
+
+    tunnels: List[str]
+
+    lifecycle_errors: Optional[Dict[str, StatusLifecycleErrors]] = None
+
+
+class VPCsByIDMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    monthly_cost: float
+
+
+class VPCsByIDObservations(BaseModel):
+    first_observed_at: str
+
+    last_observed_at: str
+
+    provider_id: str
+
+    resource_id: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: VPCsByIDSectionHiddenItemValueMcnYamlDiffItemYamlDiff
+
+
+class VPCsByIDSectionHiddenItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionHiddenItemValueMcnResourcePreviewItemResourcePreview
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+VPCsByIDSectionHiddenItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionHiddenItemValueMcnListItemListMcnStringItem,
+        VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[VPCsByIDSectionHiddenItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+VPCsByIDSectionHiddenItemValue: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionHiddenItemValueMcnStringItem,
+        VPCsByIDSectionHiddenItemValueMcnYamlItem,
+        VPCsByIDSectionHiddenItemValueMcnYamlDiffItem,
+        VPCsByIDSectionHiddenItemValueMcnResourcePreviewItem,
+        VPCsByIDSectionHiddenItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionHiddenItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[VPCsByIDSectionHiddenItemValue] = None
+
+
+class VPCsByIDSectionVisibleItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: VPCsByIDSectionVisibleItemValueMcnYamlDiffItemYamlDiff
+
+
+class VPCsByIDSectionVisibleItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionVisibleItemValueMcnResourcePreviewItemResourcePreview
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+VPCsByIDSectionVisibleItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionVisibleItemValueMcnListItemListMcnStringItem,
+        VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[VPCsByIDSectionVisibleItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+VPCsByIDSectionVisibleItemValue: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionVisibleItemValueMcnStringItem,
+        VPCsByIDSectionVisibleItemValueMcnYamlItem,
+        VPCsByIDSectionVisibleItemValueMcnYamlDiffItem,
+        VPCsByIDSectionVisibleItemValueMcnResourcePreviewItem,
+        VPCsByIDSectionVisibleItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionVisibleItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[VPCsByIDSectionVisibleItemValue] = None
+
+
+class VPCsByIDSection(BaseModel):
+    hidden_items: List[VPCsByIDSectionHiddenItem]
+
+    name: str
+
+    visible_items: List[VPCsByIDSectionVisibleItem]
+
+    help_text: Optional[str] = None
+
+
+class VPCsByIDManagedBy(BaseModel):
+    id: str
+
+    client_type: Literal["MAGIC_WAN_CLOUD_ONRAMP"]
+
+    name: str
+
+
+class VPCsByID(BaseModel):
+    id: str
+
+    account_id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    config: Dict[str, object]
+
+    deployment_provider: str
+
+    managed: bool
+
+    monthly_cost_estimate: VPCsByIDMonthlyCostEstimate
+
+    name: str
+
+    native_id: str
+
+    observations: Dict[str, VPCsByIDObservations]
+
+    provider_ids: List[str]
+
+    provider_names_by_id: Dict[str, str]
+
+    region: str
+
+    resource_group: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    sections: List[VPCsByIDSection]
+
+    state: Dict[str, object]
+
+    tags: Dict[str, str]
+
+    updated_at: str
+
+    url: str
+
+    managed_by: Optional[List[VPCsByIDManagedBy]] = None
+
+
+class OnRampCreateResponse(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE"]
+
+    dynamic_routing: bool
+
+    install_routes_in_cloud: bool
+
+    install_routes_in_magic_wan: bool
+
+    name: str
+
+    type: Literal["OnrampTypeSingle", "OnrampTypeHub"]
+
+    updated_at: str
+
+    attached_hubs: Optional[List[str]] = None
+
+    attached_vpcs: Optional[List[str]] = None
+
+    cloud_asn: Optional[int] = None
+
+    description: Optional[str] = None
+
+    hub: Optional[str] = None
+
+    last_applied_at: Optional[str] = None
+
+    last_exported_at: Optional[str] = None
+
+    last_planned_at: Optional[str] = None
+
+    manage_hub_to_hub_attachments: Optional[bool] = None
+
+    manage_vpc_to_hub_attachments: Optional[bool] = None
+
+    planned_monthly_cost_estimate: Optional[PlannedMonthlyCostEstimate] = None
+
+    planned_resources: Optional[List[PlannedResource]] = None
+
+    planned_resources_unavailable: Optional[bool] = None
+
+    post_apply_monthly_cost_estimate: Optional[PostApplyMonthlyCostEstimate] = None
+
+    post_apply_resources: Optional[Dict[str, PostApplyResources]] = None
+
+    post_apply_resources_unavailable: Optional[bool] = None
+
+    region: Optional[str] = None
+
+    status: Optional[Status] = None
+
+    vpc: Optional[str] = None
+
+    vpcs_by_id: Optional[Dict[str, VPCsByID]] = None
+
+    vpcs_by_id_unavailable: Optional[List[str]] = None
+    """The list of vpc IDs for which resource details failed to generate."""
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramp_delete_params.py b/src/cloudflare/types/magic_cloud_networking/on_ramp_delete_params.py
new file mode 100644
index 00000000000..6ace6d226de
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramp_delete_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["OnRampDeleteParams"]
+
+
+class OnRampDeleteParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    destroy: bool
+
+    force: bool
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramp_delete_response.py b/src/cloudflare/types/magic_cloud_networking/on_ramp_delete_response.py
new file mode 100644
index 00000000000..5ff6f58fdc0
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramp_delete_response.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["OnRampDeleteResponse"]
+
+
+class OnRampDeleteResponse(BaseModel):
+    id: str
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramp_edit_params.py b/src/cloudflare/types/magic_cloud_networking/on_ramp_edit_params.py
new file mode 100644
index 00000000000..04cb0a141e5
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramp_edit_params.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["OnRampEditParams"]
+
+
+class OnRampEditParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    attached_hubs: SequenceNotStr[str]
+
+    attached_vpcs: SequenceNotStr[str]
+
+    description: str
+
+    install_routes_in_cloud: bool
+
+    install_routes_in_magic_wan: bool
+
+    manage_hub_to_hub_attachments: bool
+
+    manage_vpc_to_hub_attachments: bool
+
+    name: str
+
+    vpc: str
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramp_edit_response.py b/src/cloudflare/types/magic_cloud_networking/on_ramp_edit_response.py
new file mode 100644
index 00000000000..0925c0b18dd
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramp_edit_response.py
@@ -0,0 +1,1675 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._utils import PropertyInfo
+from ..._models import BaseModel
+
+__all__ = [
+    "OnRampEditResponse",
+    "PlannedMonthlyCostEstimate",
+    "PlannedResource",
+    "PlannedResourceDiff",
+    "PlannedResourceMonthlyCostEstimateDiff",
+    "PlannedResourceResource",
+    "PostApplyMonthlyCostEstimate",
+    "PostApplyResources",
+    "PostApplyResourcesMonthlyCostEstimate",
+    "PostApplyResourcesObservations",
+    "PostApplyResourcesSection",
+    "PostApplyResourcesSectionHiddenItem",
+    "PostApplyResourcesSectionHiddenItemValue",
+    "PostApplyResourcesSectionHiddenItemValueMcnStringItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnYamlItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItemYamlDiff",
+    "PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemList",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnStringItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesSectionVisibleItem",
+    "PostApplyResourcesSectionVisibleItemValue",
+    "PostApplyResourcesSectionVisibleItemValueMcnStringItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnYamlItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItemYamlDiff",
+    "PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemList",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnStringItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesManagedBy",
+    "Status",
+    "StatusApplyProgress",
+    "StatusPlanProgress",
+    "StatusLifecycleErrors",
+    "StatusLifecycleErrorsMeta",
+    "StatusLifecycleErrorsSource",
+    "VPCsByID",
+    "VPCsByIDMonthlyCostEstimate",
+    "VPCsByIDObservations",
+    "VPCsByIDSection",
+    "VPCsByIDSectionHiddenItem",
+    "VPCsByIDSectionHiddenItemValue",
+    "VPCsByIDSectionHiddenItemValueMcnStringItem",
+    "VPCsByIDSectionHiddenItemValueMcnYamlItem",
+    "VPCsByIDSectionHiddenItemValueMcnYamlDiffItem",
+    "VPCsByIDSectionHiddenItemValueMcnYamlDiffItemYamlDiff",
+    "VPCsByIDSectionHiddenItemValueMcnResourcePreviewItem",
+    "VPCsByIDSectionHiddenItemValueMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDSectionHiddenItemValueMcnListItem",
+    "VPCsByIDSectionHiddenItemValueMcnListItemList",
+    "VPCsByIDSectionHiddenItemValueMcnListItemListMcnStringItem",
+    "VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem",
+    "VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDSectionVisibleItem",
+    "VPCsByIDSectionVisibleItemValue",
+    "VPCsByIDSectionVisibleItemValueMcnStringItem",
+    "VPCsByIDSectionVisibleItemValueMcnYamlItem",
+    "VPCsByIDSectionVisibleItemValueMcnYamlDiffItem",
+    "VPCsByIDSectionVisibleItemValueMcnYamlDiffItemYamlDiff",
+    "VPCsByIDSectionVisibleItemValueMcnResourcePreviewItem",
+    "VPCsByIDSectionVisibleItemValueMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDSectionVisibleItemValueMcnListItem",
+    "VPCsByIDSectionVisibleItemValueMcnListItemList",
+    "VPCsByIDSectionVisibleItemValueMcnListItemListMcnStringItem",
+    "VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem",
+    "VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDManagedBy",
+]
+
+
+class PlannedMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    current_monthly_cost: float
+
+    diff: float
+
+    proposed_monthly_cost: float
+
+
+class PlannedResourceDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class PlannedResourceMonthlyCostEstimateDiff(BaseModel):
+    currency: str
+
+    current_monthly_cost: float
+
+    diff: float
+
+    proposed_monthly_cost: float
+
+
+class PlannedResourceResource(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PlannedResource(BaseModel):
+    diff: PlannedResourceDiff
+
+    keys_require_replace: List[str]
+
+    monthly_cost_estimate_diff: PlannedResourceMonthlyCostEstimateDiff
+
+    planned_action: Literal["no_op", "create", "update", "replace", "destroy"]
+
+    resource: PlannedResourceResource
+
+
+class PostApplyMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    monthly_cost: float
+
+
+class PostApplyResourcesMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    monthly_cost: float
+
+
+class PostApplyResourcesObservations(BaseModel):
+    first_observed_at: str
+
+    last_observed_at: str
+
+    provider_id: str
+
+    resource_id: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItemYamlDiff
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItemResourcePreview
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+PostApplyResourcesSectionHiddenItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnStringItem,
+        PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[PostApplyResourcesSectionHiddenItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+PostApplyResourcesSectionHiddenItemValue: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionHiddenItemValueMcnStringItem,
+        PostApplyResourcesSectionHiddenItemValueMcnYamlItem,
+        PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItem,
+        PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItem,
+        PostApplyResourcesSectionHiddenItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionHiddenItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[PostApplyResourcesSectionHiddenItemValue] = None
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItemYamlDiff
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItemResourcePreview
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+PostApplyResourcesSectionVisibleItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnStringItem,
+        PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[PostApplyResourcesSectionVisibleItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+PostApplyResourcesSectionVisibleItemValue: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionVisibleItemValueMcnStringItem,
+        PostApplyResourcesSectionVisibleItemValueMcnYamlItem,
+        PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItem,
+        PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItem,
+        PostApplyResourcesSectionVisibleItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionVisibleItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[PostApplyResourcesSectionVisibleItemValue] = None
+
+
+class PostApplyResourcesSection(BaseModel):
+    hidden_items: List[PostApplyResourcesSectionHiddenItem]
+
+    name: str
+
+    visible_items: List[PostApplyResourcesSectionVisibleItem]
+
+    help_text: Optional[str] = None
+
+
+class PostApplyResourcesManagedBy(BaseModel):
+    id: str
+
+    client_type: Literal["MAGIC_WAN_CLOUD_ONRAMP"]
+
+    name: str
+
+
+class PostApplyResources(BaseModel):
+    id: str
+
+    account_id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    config: Dict[str, object]
+
+    deployment_provider: str
+
+    managed: bool
+
+    monthly_cost_estimate: PostApplyResourcesMonthlyCostEstimate
+
+    name: str
+
+    native_id: str
+
+    observations: Dict[str, PostApplyResourcesObservations]
+
+    provider_ids: List[str]
+
+    provider_names_by_id: Dict[str, str]
+
+    region: str
+
+    resource_group: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    sections: List[PostApplyResourcesSection]
+
+    state: Dict[str, object]
+
+    tags: Dict[str, str]
+
+    updated_at: str
+
+    url: str
+
+    managed_by: Optional[List[PostApplyResourcesManagedBy]] = None
+
+
+class StatusApplyProgress(BaseModel):
+    done: int
+
+    total: int
+
+
+class StatusPlanProgress(BaseModel):
+    done: int
+
+    total: int
+
+
+class StatusLifecycleErrorsMeta(BaseModel):
+    l10n_key: Optional[str] = None
+
+    loggable_error: Optional[str] = None
+
+    template_data: Optional[object] = None
+
+    trace_id: Optional[str] = None
+
+
+class StatusLifecycleErrorsSource(BaseModel):
+    parameter: Optional[str] = None
+
+    parameter_value_index: Optional[int] = None
+
+    pointer: Optional[str] = None
+
+
+class StatusLifecycleErrors(BaseModel):
+    code: Literal[
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016,
+        1017,
+        1018,
+        2001,
+        2002,
+        2003,
+        2004,
+        2005,
+        2006,
+        2007,
+        2008,
+        2009,
+        2010,
+        2011,
+        2012,
+        2013,
+        2014,
+        2015,
+        2016,
+        2017,
+        2018,
+        2019,
+        2020,
+        2021,
+        2022,
+        3001,
+        3002,
+        3003,
+        3004,
+        3005,
+        3006,
+        3007,
+        4001,
+        4002,
+        4003,
+        4004,
+        4005,
+        4006,
+        4007,
+        4008,
+        4009,
+        4010,
+        4011,
+        4012,
+        4013,
+        4014,
+        4015,
+        4016,
+        4017,
+        4018,
+        4019,
+        4020,
+        4021,
+        4022,
+        4023,
+        5001,
+        5002,
+        5003,
+        5004,
+        102000,
+        102001,
+        102002,
+        102003,
+        102004,
+        102005,
+        102006,
+        102007,
+        102008,
+        102009,
+        102010,
+        102011,
+        102012,
+        102013,
+        102014,
+        102015,
+        102016,
+        102017,
+        102018,
+        102019,
+        102020,
+        102021,
+        102022,
+        102023,
+        102024,
+        102025,
+        102026,
+        102027,
+        102028,
+        102029,
+        102030,
+        102031,
+        102032,
+        102033,
+        102034,
+        102035,
+        102036,
+        102037,
+        102038,
+        102039,
+        102040,
+        102041,
+        102042,
+        102043,
+        102044,
+        102045,
+        102046,
+        102047,
+        102048,
+        102049,
+        102050,
+        102051,
+        102052,
+        102053,
+        102054,
+        102055,
+        102056,
+        102057,
+        102058,
+        102059,
+        102060,
+        102061,
+        102062,
+        102063,
+        102064,
+        102065,
+        102066,
+        102067,
+        102068,
+        102069,
+        102070,
+        102071,
+        102072,
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007,
+        103008,
+    ]
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    meta: Optional[StatusLifecycleErrorsMeta] = None
+
+    source: Optional[StatusLifecycleErrorsSource] = None
+
+
+class Status(BaseModel):
+    apply_progress: StatusApplyProgress
+
+    lifecycle_state: Literal[
+        "OnrampNeedsApply",
+        "OnrampPendingPlan",
+        "OnrampPlanning",
+        "OnrampPlanFailed",
+        "OnrampPendingApproval",
+        "OnrampPendingApply",
+        "OnrampApplying",
+        "OnrampApplyFailed",
+        "OnrampActive",
+        "OnrampPendingDestroy",
+        "OnrampDestroying",
+        "OnrampDestroyFailed",
+    ]
+
+    plan_progress: StatusPlanProgress
+
+    routes: List[str]
+
+    tunnels: List[str]
+
+    lifecycle_errors: Optional[Dict[str, StatusLifecycleErrors]] = None
+
+
+class VPCsByIDMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    monthly_cost: float
+
+
+class VPCsByIDObservations(BaseModel):
+    first_observed_at: str
+
+    last_observed_at: str
+
+    provider_id: str
+
+    resource_id: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: VPCsByIDSectionHiddenItemValueMcnYamlDiffItemYamlDiff
+
+
+class VPCsByIDSectionHiddenItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionHiddenItemValueMcnResourcePreviewItemResourcePreview
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+VPCsByIDSectionHiddenItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionHiddenItemValueMcnListItemListMcnStringItem,
+        VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[VPCsByIDSectionHiddenItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+VPCsByIDSectionHiddenItemValue: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionHiddenItemValueMcnStringItem,
+        VPCsByIDSectionHiddenItemValueMcnYamlItem,
+        VPCsByIDSectionHiddenItemValueMcnYamlDiffItem,
+        VPCsByIDSectionHiddenItemValueMcnResourcePreviewItem,
+        VPCsByIDSectionHiddenItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionHiddenItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[VPCsByIDSectionHiddenItemValue] = None
+
+
+class VPCsByIDSectionVisibleItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: VPCsByIDSectionVisibleItemValueMcnYamlDiffItemYamlDiff
+
+
+class VPCsByIDSectionVisibleItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionVisibleItemValueMcnResourcePreviewItemResourcePreview
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+VPCsByIDSectionVisibleItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionVisibleItemValueMcnListItemListMcnStringItem,
+        VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[VPCsByIDSectionVisibleItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+VPCsByIDSectionVisibleItemValue: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionVisibleItemValueMcnStringItem,
+        VPCsByIDSectionVisibleItemValueMcnYamlItem,
+        VPCsByIDSectionVisibleItemValueMcnYamlDiffItem,
+        VPCsByIDSectionVisibleItemValueMcnResourcePreviewItem,
+        VPCsByIDSectionVisibleItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionVisibleItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[VPCsByIDSectionVisibleItemValue] = None
+
+
+class VPCsByIDSection(BaseModel):
+    hidden_items: List[VPCsByIDSectionHiddenItem]
+
+    name: str
+
+    visible_items: List[VPCsByIDSectionVisibleItem]
+
+    help_text: Optional[str] = None
+
+
+class VPCsByIDManagedBy(BaseModel):
+    id: str
+
+    client_type: Literal["MAGIC_WAN_CLOUD_ONRAMP"]
+
+    name: str
+
+
+class VPCsByID(BaseModel):
+    id: str
+
+    account_id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    config: Dict[str, object]
+
+    deployment_provider: str
+
+    managed: bool
+
+    monthly_cost_estimate: VPCsByIDMonthlyCostEstimate
+
+    name: str
+
+    native_id: str
+
+    observations: Dict[str, VPCsByIDObservations]
+
+    provider_ids: List[str]
+
+    provider_names_by_id: Dict[str, str]
+
+    region: str
+
+    resource_group: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    sections: List[VPCsByIDSection]
+
+    state: Dict[str, object]
+
+    tags: Dict[str, str]
+
+    updated_at: str
+
+    url: str
+
+    managed_by: Optional[List[VPCsByIDManagedBy]] = None
+
+
+class OnRampEditResponse(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE"]
+
+    dynamic_routing: bool
+
+    install_routes_in_cloud: bool
+
+    install_routes_in_magic_wan: bool
+
+    name: str
+
+    type: Literal["OnrampTypeSingle", "OnrampTypeHub"]
+
+    updated_at: str
+
+    attached_hubs: Optional[List[str]] = None
+
+    attached_vpcs: Optional[List[str]] = None
+
+    cloud_asn: Optional[int] = None
+
+    description: Optional[str] = None
+
+    hub: Optional[str] = None
+
+    last_applied_at: Optional[str] = None
+
+    last_exported_at: Optional[str] = None
+
+    last_planned_at: Optional[str] = None
+
+    manage_hub_to_hub_attachments: Optional[bool] = None
+
+    manage_vpc_to_hub_attachments: Optional[bool] = None
+
+    planned_monthly_cost_estimate: Optional[PlannedMonthlyCostEstimate] = None
+
+    planned_resources: Optional[List[PlannedResource]] = None
+
+    planned_resources_unavailable: Optional[bool] = None
+
+    post_apply_monthly_cost_estimate: Optional[PostApplyMonthlyCostEstimate] = None
+
+    post_apply_resources: Optional[Dict[str, PostApplyResources]] = None
+
+    post_apply_resources_unavailable: Optional[bool] = None
+
+    region: Optional[str] = None
+
+    status: Optional[Status] = None
+
+    vpc: Optional[str] = None
+
+    vpcs_by_id: Optional[Dict[str, VPCsByID]] = None
+
+    vpcs_by_id_unavailable: Optional[List[str]] = None
+    """The list of vpc IDs for which resource details failed to generate."""
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramp_get_params.py b/src/cloudflare/types/magic_cloud_networking/on_ramp_get_params.py
new file mode 100644
index 00000000000..b3c8a9df5a2
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramp_get_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["OnRampGetParams"]
+
+
+class OnRampGetParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    planned_resources: bool
+
+    post_apply_resources: bool
+
+    status: bool
+
+    vpcs: bool
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramp_get_response.py b/src/cloudflare/types/magic_cloud_networking/on_ramp_get_response.py
new file mode 100644
index 00000000000..70f48a4e22a
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramp_get_response.py
@@ -0,0 +1,1675 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._utils import PropertyInfo
+from ..._models import BaseModel
+
+__all__ = [
+    "OnRampGetResponse",
+    "PlannedMonthlyCostEstimate",
+    "PlannedResource",
+    "PlannedResourceDiff",
+    "PlannedResourceMonthlyCostEstimateDiff",
+    "PlannedResourceResource",
+    "PostApplyMonthlyCostEstimate",
+    "PostApplyResources",
+    "PostApplyResourcesMonthlyCostEstimate",
+    "PostApplyResourcesObservations",
+    "PostApplyResourcesSection",
+    "PostApplyResourcesSectionHiddenItem",
+    "PostApplyResourcesSectionHiddenItemValue",
+    "PostApplyResourcesSectionHiddenItemValueMcnStringItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnYamlItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItemYamlDiff",
+    "PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemList",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnStringItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesSectionVisibleItem",
+    "PostApplyResourcesSectionVisibleItemValue",
+    "PostApplyResourcesSectionVisibleItemValueMcnStringItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnYamlItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItemYamlDiff",
+    "PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemList",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnStringItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesManagedBy",
+    "Status",
+    "StatusApplyProgress",
+    "StatusPlanProgress",
+    "StatusLifecycleErrors",
+    "StatusLifecycleErrorsMeta",
+    "StatusLifecycleErrorsSource",
+    "VPCsByID",
+    "VPCsByIDMonthlyCostEstimate",
+    "VPCsByIDObservations",
+    "VPCsByIDSection",
+    "VPCsByIDSectionHiddenItem",
+    "VPCsByIDSectionHiddenItemValue",
+    "VPCsByIDSectionHiddenItemValueMcnStringItem",
+    "VPCsByIDSectionHiddenItemValueMcnYamlItem",
+    "VPCsByIDSectionHiddenItemValueMcnYamlDiffItem",
+    "VPCsByIDSectionHiddenItemValueMcnYamlDiffItemYamlDiff",
+    "VPCsByIDSectionHiddenItemValueMcnResourcePreviewItem",
+    "VPCsByIDSectionHiddenItemValueMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDSectionHiddenItemValueMcnListItem",
+    "VPCsByIDSectionHiddenItemValueMcnListItemList",
+    "VPCsByIDSectionHiddenItemValueMcnListItemListMcnStringItem",
+    "VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem",
+    "VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDSectionVisibleItem",
+    "VPCsByIDSectionVisibleItemValue",
+    "VPCsByIDSectionVisibleItemValueMcnStringItem",
+    "VPCsByIDSectionVisibleItemValueMcnYamlItem",
+    "VPCsByIDSectionVisibleItemValueMcnYamlDiffItem",
+    "VPCsByIDSectionVisibleItemValueMcnYamlDiffItemYamlDiff",
+    "VPCsByIDSectionVisibleItemValueMcnResourcePreviewItem",
+    "VPCsByIDSectionVisibleItemValueMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDSectionVisibleItemValueMcnListItem",
+    "VPCsByIDSectionVisibleItemValueMcnListItemList",
+    "VPCsByIDSectionVisibleItemValueMcnListItemListMcnStringItem",
+    "VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem",
+    "VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDManagedBy",
+]
+
+
+class PlannedMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    current_monthly_cost: float
+
+    diff: float
+
+    proposed_monthly_cost: float
+
+
+class PlannedResourceDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class PlannedResourceMonthlyCostEstimateDiff(BaseModel):
+    currency: str
+
+    current_monthly_cost: float
+
+    diff: float
+
+    proposed_monthly_cost: float
+
+
+class PlannedResourceResource(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PlannedResource(BaseModel):
+    diff: PlannedResourceDiff
+
+    keys_require_replace: List[str]
+
+    monthly_cost_estimate_diff: PlannedResourceMonthlyCostEstimateDiff
+
+    planned_action: Literal["no_op", "create", "update", "replace", "destroy"]
+
+    resource: PlannedResourceResource
+
+
+class PostApplyMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    monthly_cost: float
+
+
+class PostApplyResourcesMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    monthly_cost: float
+
+
+class PostApplyResourcesObservations(BaseModel):
+    first_observed_at: str
+
+    last_observed_at: str
+
+    provider_id: str
+
+    resource_id: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItemYamlDiff
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItemResourcePreview
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+PostApplyResourcesSectionHiddenItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnStringItem,
+        PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[PostApplyResourcesSectionHiddenItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+PostApplyResourcesSectionHiddenItemValue: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionHiddenItemValueMcnStringItem,
+        PostApplyResourcesSectionHiddenItemValueMcnYamlItem,
+        PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItem,
+        PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItem,
+        PostApplyResourcesSectionHiddenItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionHiddenItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[PostApplyResourcesSectionHiddenItemValue] = None
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItemYamlDiff
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItemResourcePreview
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+PostApplyResourcesSectionVisibleItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnStringItem,
+        PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[PostApplyResourcesSectionVisibleItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+PostApplyResourcesSectionVisibleItemValue: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionVisibleItemValueMcnStringItem,
+        PostApplyResourcesSectionVisibleItemValueMcnYamlItem,
+        PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItem,
+        PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItem,
+        PostApplyResourcesSectionVisibleItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionVisibleItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[PostApplyResourcesSectionVisibleItemValue] = None
+
+
+class PostApplyResourcesSection(BaseModel):
+    hidden_items: List[PostApplyResourcesSectionHiddenItem]
+
+    name: str
+
+    visible_items: List[PostApplyResourcesSectionVisibleItem]
+
+    help_text: Optional[str] = None
+
+
+class PostApplyResourcesManagedBy(BaseModel):
+    id: str
+
+    client_type: Literal["MAGIC_WAN_CLOUD_ONRAMP"]
+
+    name: str
+
+
+class PostApplyResources(BaseModel):
+    id: str
+
+    account_id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    config: Dict[str, object]
+
+    deployment_provider: str
+
+    managed: bool
+
+    monthly_cost_estimate: PostApplyResourcesMonthlyCostEstimate
+
+    name: str
+
+    native_id: str
+
+    observations: Dict[str, PostApplyResourcesObservations]
+
+    provider_ids: List[str]
+
+    provider_names_by_id: Dict[str, str]
+
+    region: str
+
+    resource_group: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    sections: List[PostApplyResourcesSection]
+
+    state: Dict[str, object]
+
+    tags: Dict[str, str]
+
+    updated_at: str
+
+    url: str
+
+    managed_by: Optional[List[PostApplyResourcesManagedBy]] = None
+
+
+class StatusApplyProgress(BaseModel):
+    done: int
+
+    total: int
+
+
+class StatusPlanProgress(BaseModel):
+    done: int
+
+    total: int
+
+
+class StatusLifecycleErrorsMeta(BaseModel):
+    l10n_key: Optional[str] = None
+
+    loggable_error: Optional[str] = None
+
+    template_data: Optional[object] = None
+
+    trace_id: Optional[str] = None
+
+
+class StatusLifecycleErrorsSource(BaseModel):
+    parameter: Optional[str] = None
+
+    parameter_value_index: Optional[int] = None
+
+    pointer: Optional[str] = None
+
+
+class StatusLifecycleErrors(BaseModel):
+    code: Literal[
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016,
+        1017,
+        1018,
+        2001,
+        2002,
+        2003,
+        2004,
+        2005,
+        2006,
+        2007,
+        2008,
+        2009,
+        2010,
+        2011,
+        2012,
+        2013,
+        2014,
+        2015,
+        2016,
+        2017,
+        2018,
+        2019,
+        2020,
+        2021,
+        2022,
+        3001,
+        3002,
+        3003,
+        3004,
+        3005,
+        3006,
+        3007,
+        4001,
+        4002,
+        4003,
+        4004,
+        4005,
+        4006,
+        4007,
+        4008,
+        4009,
+        4010,
+        4011,
+        4012,
+        4013,
+        4014,
+        4015,
+        4016,
+        4017,
+        4018,
+        4019,
+        4020,
+        4021,
+        4022,
+        4023,
+        5001,
+        5002,
+        5003,
+        5004,
+        102000,
+        102001,
+        102002,
+        102003,
+        102004,
+        102005,
+        102006,
+        102007,
+        102008,
+        102009,
+        102010,
+        102011,
+        102012,
+        102013,
+        102014,
+        102015,
+        102016,
+        102017,
+        102018,
+        102019,
+        102020,
+        102021,
+        102022,
+        102023,
+        102024,
+        102025,
+        102026,
+        102027,
+        102028,
+        102029,
+        102030,
+        102031,
+        102032,
+        102033,
+        102034,
+        102035,
+        102036,
+        102037,
+        102038,
+        102039,
+        102040,
+        102041,
+        102042,
+        102043,
+        102044,
+        102045,
+        102046,
+        102047,
+        102048,
+        102049,
+        102050,
+        102051,
+        102052,
+        102053,
+        102054,
+        102055,
+        102056,
+        102057,
+        102058,
+        102059,
+        102060,
+        102061,
+        102062,
+        102063,
+        102064,
+        102065,
+        102066,
+        102067,
+        102068,
+        102069,
+        102070,
+        102071,
+        102072,
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007,
+        103008,
+    ]
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    meta: Optional[StatusLifecycleErrorsMeta] = None
+
+    source: Optional[StatusLifecycleErrorsSource] = None
+
+
+class Status(BaseModel):
+    apply_progress: StatusApplyProgress
+
+    lifecycle_state: Literal[
+        "OnrampNeedsApply",
+        "OnrampPendingPlan",
+        "OnrampPlanning",
+        "OnrampPlanFailed",
+        "OnrampPendingApproval",
+        "OnrampPendingApply",
+        "OnrampApplying",
+        "OnrampApplyFailed",
+        "OnrampActive",
+        "OnrampPendingDestroy",
+        "OnrampDestroying",
+        "OnrampDestroyFailed",
+    ]
+
+    plan_progress: StatusPlanProgress
+
+    routes: List[str]
+
+    tunnels: List[str]
+
+    lifecycle_errors: Optional[Dict[str, StatusLifecycleErrors]] = None
+
+
+class VPCsByIDMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    monthly_cost: float
+
+
+class VPCsByIDObservations(BaseModel):
+    first_observed_at: str
+
+    last_observed_at: str
+
+    provider_id: str
+
+    resource_id: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: VPCsByIDSectionHiddenItemValueMcnYamlDiffItemYamlDiff
+
+
+class VPCsByIDSectionHiddenItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionHiddenItemValueMcnResourcePreviewItemResourcePreview
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+VPCsByIDSectionHiddenItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionHiddenItemValueMcnListItemListMcnStringItem,
+        VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[VPCsByIDSectionHiddenItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+VPCsByIDSectionHiddenItemValue: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionHiddenItemValueMcnStringItem,
+        VPCsByIDSectionHiddenItemValueMcnYamlItem,
+        VPCsByIDSectionHiddenItemValueMcnYamlDiffItem,
+        VPCsByIDSectionHiddenItemValueMcnResourcePreviewItem,
+        VPCsByIDSectionHiddenItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionHiddenItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[VPCsByIDSectionHiddenItemValue] = None
+
+
+class VPCsByIDSectionVisibleItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: VPCsByIDSectionVisibleItemValueMcnYamlDiffItemYamlDiff
+
+
+class VPCsByIDSectionVisibleItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionVisibleItemValueMcnResourcePreviewItemResourcePreview
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+VPCsByIDSectionVisibleItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionVisibleItemValueMcnListItemListMcnStringItem,
+        VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[VPCsByIDSectionVisibleItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+VPCsByIDSectionVisibleItemValue: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionVisibleItemValueMcnStringItem,
+        VPCsByIDSectionVisibleItemValueMcnYamlItem,
+        VPCsByIDSectionVisibleItemValueMcnYamlDiffItem,
+        VPCsByIDSectionVisibleItemValueMcnResourcePreviewItem,
+        VPCsByIDSectionVisibleItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionVisibleItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[VPCsByIDSectionVisibleItemValue] = None
+
+
+class VPCsByIDSection(BaseModel):
+    hidden_items: List[VPCsByIDSectionHiddenItem]
+
+    name: str
+
+    visible_items: List[VPCsByIDSectionVisibleItem]
+
+    help_text: Optional[str] = None
+
+
+class VPCsByIDManagedBy(BaseModel):
+    id: str
+
+    client_type: Literal["MAGIC_WAN_CLOUD_ONRAMP"]
+
+    name: str
+
+
+class VPCsByID(BaseModel):
+    id: str
+
+    account_id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    config: Dict[str, object]
+
+    deployment_provider: str
+
+    managed: bool
+
+    monthly_cost_estimate: VPCsByIDMonthlyCostEstimate
+
+    name: str
+
+    native_id: str
+
+    observations: Dict[str, VPCsByIDObservations]
+
+    provider_ids: List[str]
+
+    provider_names_by_id: Dict[str, str]
+
+    region: str
+
+    resource_group: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    sections: List[VPCsByIDSection]
+
+    state: Dict[str, object]
+
+    tags: Dict[str, str]
+
+    updated_at: str
+
+    url: str
+
+    managed_by: Optional[List[VPCsByIDManagedBy]] = None
+
+
+class OnRampGetResponse(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE"]
+
+    dynamic_routing: bool
+
+    install_routes_in_cloud: bool
+
+    install_routes_in_magic_wan: bool
+
+    name: str
+
+    type: Literal["OnrampTypeSingle", "OnrampTypeHub"]
+
+    updated_at: str
+
+    attached_hubs: Optional[List[str]] = None
+
+    attached_vpcs: Optional[List[str]] = None
+
+    cloud_asn: Optional[int] = None
+
+    description: Optional[str] = None
+
+    hub: Optional[str] = None
+
+    last_applied_at: Optional[str] = None
+
+    last_exported_at: Optional[str] = None
+
+    last_planned_at: Optional[str] = None
+
+    manage_hub_to_hub_attachments: Optional[bool] = None
+
+    manage_vpc_to_hub_attachments: Optional[bool] = None
+
+    planned_monthly_cost_estimate: Optional[PlannedMonthlyCostEstimate] = None
+
+    planned_resources: Optional[List[PlannedResource]] = None
+
+    planned_resources_unavailable: Optional[bool] = None
+
+    post_apply_monthly_cost_estimate: Optional[PostApplyMonthlyCostEstimate] = None
+
+    post_apply_resources: Optional[Dict[str, PostApplyResources]] = None
+
+    post_apply_resources_unavailable: Optional[bool] = None
+
+    region: Optional[str] = None
+
+    status: Optional[Status] = None
+
+    vpc: Optional[str] = None
+
+    vpcs_by_id: Optional[Dict[str, VPCsByID]] = None
+
+    vpcs_by_id_unavailable: Optional[List[str]] = None
+    """The list of vpc IDs for which resource details failed to generate."""
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramp_list_params.py b/src/cloudflare/types/magic_cloud_networking/on_ramp_list_params.py
new file mode 100644
index 00000000000..b7c660ad5c4
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramp_list_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["OnRampListParams"]
+
+
+class OnRampListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    desc: bool
+
+    order_by: str
+    """One of ["updated_at", "id", "cloud_type", "name"]."""
+
+    status: bool
+
+    vpcs: bool
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramp_list_response.py b/src/cloudflare/types/magic_cloud_networking/on_ramp_list_response.py
new file mode 100644
index 00000000000..6135947f34a
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramp_list_response.py
@@ -0,0 +1,1675 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._utils import PropertyInfo
+from ..._models import BaseModel
+
+__all__ = [
+    "OnRampListResponse",
+    "PlannedMonthlyCostEstimate",
+    "PlannedResource",
+    "PlannedResourceDiff",
+    "PlannedResourceMonthlyCostEstimateDiff",
+    "PlannedResourceResource",
+    "PostApplyMonthlyCostEstimate",
+    "PostApplyResources",
+    "PostApplyResourcesMonthlyCostEstimate",
+    "PostApplyResourcesObservations",
+    "PostApplyResourcesSection",
+    "PostApplyResourcesSectionHiddenItem",
+    "PostApplyResourcesSectionHiddenItemValue",
+    "PostApplyResourcesSectionHiddenItemValueMcnStringItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnYamlItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItemYamlDiff",
+    "PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemList",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnStringItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesSectionVisibleItem",
+    "PostApplyResourcesSectionVisibleItemValue",
+    "PostApplyResourcesSectionVisibleItemValueMcnStringItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnYamlItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItemYamlDiff",
+    "PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemList",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnStringItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesManagedBy",
+    "Status",
+    "StatusApplyProgress",
+    "StatusPlanProgress",
+    "StatusLifecycleErrors",
+    "StatusLifecycleErrorsMeta",
+    "StatusLifecycleErrorsSource",
+    "VPCsByID",
+    "VPCsByIDMonthlyCostEstimate",
+    "VPCsByIDObservations",
+    "VPCsByIDSection",
+    "VPCsByIDSectionHiddenItem",
+    "VPCsByIDSectionHiddenItemValue",
+    "VPCsByIDSectionHiddenItemValueMcnStringItem",
+    "VPCsByIDSectionHiddenItemValueMcnYamlItem",
+    "VPCsByIDSectionHiddenItemValueMcnYamlDiffItem",
+    "VPCsByIDSectionHiddenItemValueMcnYamlDiffItemYamlDiff",
+    "VPCsByIDSectionHiddenItemValueMcnResourcePreviewItem",
+    "VPCsByIDSectionHiddenItemValueMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDSectionHiddenItemValueMcnListItem",
+    "VPCsByIDSectionHiddenItemValueMcnListItemList",
+    "VPCsByIDSectionHiddenItemValueMcnListItemListMcnStringItem",
+    "VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem",
+    "VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDSectionVisibleItem",
+    "VPCsByIDSectionVisibleItemValue",
+    "VPCsByIDSectionVisibleItemValueMcnStringItem",
+    "VPCsByIDSectionVisibleItemValueMcnYamlItem",
+    "VPCsByIDSectionVisibleItemValueMcnYamlDiffItem",
+    "VPCsByIDSectionVisibleItemValueMcnYamlDiffItemYamlDiff",
+    "VPCsByIDSectionVisibleItemValueMcnResourcePreviewItem",
+    "VPCsByIDSectionVisibleItemValueMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDSectionVisibleItemValueMcnListItem",
+    "VPCsByIDSectionVisibleItemValueMcnListItemList",
+    "VPCsByIDSectionVisibleItemValueMcnListItemListMcnStringItem",
+    "VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem",
+    "VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDManagedBy",
+]
+
+
+class PlannedMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    current_monthly_cost: float
+
+    diff: float
+
+    proposed_monthly_cost: float
+
+
+class PlannedResourceDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class PlannedResourceMonthlyCostEstimateDiff(BaseModel):
+    currency: str
+
+    current_monthly_cost: float
+
+    diff: float
+
+    proposed_monthly_cost: float
+
+
+class PlannedResourceResource(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PlannedResource(BaseModel):
+    diff: PlannedResourceDiff
+
+    keys_require_replace: List[str]
+
+    monthly_cost_estimate_diff: PlannedResourceMonthlyCostEstimateDiff
+
+    planned_action: Literal["no_op", "create", "update", "replace", "destroy"]
+
+    resource: PlannedResourceResource
+
+
+class PostApplyMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    monthly_cost: float
+
+
+class PostApplyResourcesMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    monthly_cost: float
+
+
+class PostApplyResourcesObservations(BaseModel):
+    first_observed_at: str
+
+    last_observed_at: str
+
+    provider_id: str
+
+    resource_id: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItemYamlDiff
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItemResourcePreview
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+PostApplyResourcesSectionHiddenItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnStringItem,
+        PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[PostApplyResourcesSectionHiddenItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+PostApplyResourcesSectionHiddenItemValue: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionHiddenItemValueMcnStringItem,
+        PostApplyResourcesSectionHiddenItemValueMcnYamlItem,
+        PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItem,
+        PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItem,
+        PostApplyResourcesSectionHiddenItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionHiddenItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[PostApplyResourcesSectionHiddenItemValue] = None
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItemYamlDiff
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItemResourcePreview
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+PostApplyResourcesSectionVisibleItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnStringItem,
+        PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[PostApplyResourcesSectionVisibleItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+PostApplyResourcesSectionVisibleItemValue: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionVisibleItemValueMcnStringItem,
+        PostApplyResourcesSectionVisibleItemValueMcnYamlItem,
+        PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItem,
+        PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItem,
+        PostApplyResourcesSectionVisibleItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionVisibleItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[PostApplyResourcesSectionVisibleItemValue] = None
+
+
+class PostApplyResourcesSection(BaseModel):
+    hidden_items: List[PostApplyResourcesSectionHiddenItem]
+
+    name: str
+
+    visible_items: List[PostApplyResourcesSectionVisibleItem]
+
+    help_text: Optional[str] = None
+
+
+class PostApplyResourcesManagedBy(BaseModel):
+    id: str
+
+    client_type: Literal["MAGIC_WAN_CLOUD_ONRAMP"]
+
+    name: str
+
+
+class PostApplyResources(BaseModel):
+    id: str
+
+    account_id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    config: Dict[str, object]
+
+    deployment_provider: str
+
+    managed: bool
+
+    monthly_cost_estimate: PostApplyResourcesMonthlyCostEstimate
+
+    name: str
+
+    native_id: str
+
+    observations: Dict[str, PostApplyResourcesObservations]
+
+    provider_ids: List[str]
+
+    provider_names_by_id: Dict[str, str]
+
+    region: str
+
+    resource_group: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    sections: List[PostApplyResourcesSection]
+
+    state: Dict[str, object]
+
+    tags: Dict[str, str]
+
+    updated_at: str
+
+    url: str
+
+    managed_by: Optional[List[PostApplyResourcesManagedBy]] = None
+
+
+class StatusApplyProgress(BaseModel):
+    done: int
+
+    total: int
+
+
+class StatusPlanProgress(BaseModel):
+    done: int
+
+    total: int
+
+
+class StatusLifecycleErrorsMeta(BaseModel):
+    l10n_key: Optional[str] = None
+
+    loggable_error: Optional[str] = None
+
+    template_data: Optional[object] = None
+
+    trace_id: Optional[str] = None
+
+
+class StatusLifecycleErrorsSource(BaseModel):
+    parameter: Optional[str] = None
+
+    parameter_value_index: Optional[int] = None
+
+    pointer: Optional[str] = None
+
+
+class StatusLifecycleErrors(BaseModel):
+    code: Literal[
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016,
+        1017,
+        1018,
+        2001,
+        2002,
+        2003,
+        2004,
+        2005,
+        2006,
+        2007,
+        2008,
+        2009,
+        2010,
+        2011,
+        2012,
+        2013,
+        2014,
+        2015,
+        2016,
+        2017,
+        2018,
+        2019,
+        2020,
+        2021,
+        2022,
+        3001,
+        3002,
+        3003,
+        3004,
+        3005,
+        3006,
+        3007,
+        4001,
+        4002,
+        4003,
+        4004,
+        4005,
+        4006,
+        4007,
+        4008,
+        4009,
+        4010,
+        4011,
+        4012,
+        4013,
+        4014,
+        4015,
+        4016,
+        4017,
+        4018,
+        4019,
+        4020,
+        4021,
+        4022,
+        4023,
+        5001,
+        5002,
+        5003,
+        5004,
+        102000,
+        102001,
+        102002,
+        102003,
+        102004,
+        102005,
+        102006,
+        102007,
+        102008,
+        102009,
+        102010,
+        102011,
+        102012,
+        102013,
+        102014,
+        102015,
+        102016,
+        102017,
+        102018,
+        102019,
+        102020,
+        102021,
+        102022,
+        102023,
+        102024,
+        102025,
+        102026,
+        102027,
+        102028,
+        102029,
+        102030,
+        102031,
+        102032,
+        102033,
+        102034,
+        102035,
+        102036,
+        102037,
+        102038,
+        102039,
+        102040,
+        102041,
+        102042,
+        102043,
+        102044,
+        102045,
+        102046,
+        102047,
+        102048,
+        102049,
+        102050,
+        102051,
+        102052,
+        102053,
+        102054,
+        102055,
+        102056,
+        102057,
+        102058,
+        102059,
+        102060,
+        102061,
+        102062,
+        102063,
+        102064,
+        102065,
+        102066,
+        102067,
+        102068,
+        102069,
+        102070,
+        102071,
+        102072,
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007,
+        103008,
+    ]
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    meta: Optional[StatusLifecycleErrorsMeta] = None
+
+    source: Optional[StatusLifecycleErrorsSource] = None
+
+
+class Status(BaseModel):
+    apply_progress: StatusApplyProgress
+
+    lifecycle_state: Literal[
+        "OnrampNeedsApply",
+        "OnrampPendingPlan",
+        "OnrampPlanning",
+        "OnrampPlanFailed",
+        "OnrampPendingApproval",
+        "OnrampPendingApply",
+        "OnrampApplying",
+        "OnrampApplyFailed",
+        "OnrampActive",
+        "OnrampPendingDestroy",
+        "OnrampDestroying",
+        "OnrampDestroyFailed",
+    ]
+
+    plan_progress: StatusPlanProgress
+
+    routes: List[str]
+
+    tunnels: List[str]
+
+    lifecycle_errors: Optional[Dict[str, StatusLifecycleErrors]] = None
+
+
+class VPCsByIDMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    monthly_cost: float
+
+
+class VPCsByIDObservations(BaseModel):
+    first_observed_at: str
+
+    last_observed_at: str
+
+    provider_id: str
+
+    resource_id: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: VPCsByIDSectionHiddenItemValueMcnYamlDiffItemYamlDiff
+
+
+class VPCsByIDSectionHiddenItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionHiddenItemValueMcnResourcePreviewItemResourcePreview
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+VPCsByIDSectionHiddenItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionHiddenItemValueMcnListItemListMcnStringItem,
+        VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[VPCsByIDSectionHiddenItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+VPCsByIDSectionHiddenItemValue: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionHiddenItemValueMcnStringItem,
+        VPCsByIDSectionHiddenItemValueMcnYamlItem,
+        VPCsByIDSectionHiddenItemValueMcnYamlDiffItem,
+        VPCsByIDSectionHiddenItemValueMcnResourcePreviewItem,
+        VPCsByIDSectionHiddenItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionHiddenItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[VPCsByIDSectionHiddenItemValue] = None
+
+
+class VPCsByIDSectionVisibleItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: VPCsByIDSectionVisibleItemValueMcnYamlDiffItemYamlDiff
+
+
+class VPCsByIDSectionVisibleItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionVisibleItemValueMcnResourcePreviewItemResourcePreview
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+VPCsByIDSectionVisibleItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionVisibleItemValueMcnListItemListMcnStringItem,
+        VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[VPCsByIDSectionVisibleItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+VPCsByIDSectionVisibleItemValue: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionVisibleItemValueMcnStringItem,
+        VPCsByIDSectionVisibleItemValueMcnYamlItem,
+        VPCsByIDSectionVisibleItemValueMcnYamlDiffItem,
+        VPCsByIDSectionVisibleItemValueMcnResourcePreviewItem,
+        VPCsByIDSectionVisibleItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionVisibleItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[VPCsByIDSectionVisibleItemValue] = None
+
+
+class VPCsByIDSection(BaseModel):
+    hidden_items: List[VPCsByIDSectionHiddenItem]
+
+    name: str
+
+    visible_items: List[VPCsByIDSectionVisibleItem]
+
+    help_text: Optional[str] = None
+
+
+class VPCsByIDManagedBy(BaseModel):
+    id: str
+
+    client_type: Literal["MAGIC_WAN_CLOUD_ONRAMP"]
+
+    name: str
+
+
+class VPCsByID(BaseModel):
+    id: str
+
+    account_id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    config: Dict[str, object]
+
+    deployment_provider: str
+
+    managed: bool
+
+    monthly_cost_estimate: VPCsByIDMonthlyCostEstimate
+
+    name: str
+
+    native_id: str
+
+    observations: Dict[str, VPCsByIDObservations]
+
+    provider_ids: List[str]
+
+    provider_names_by_id: Dict[str, str]
+
+    region: str
+
+    resource_group: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    sections: List[VPCsByIDSection]
+
+    state: Dict[str, object]
+
+    tags: Dict[str, str]
+
+    updated_at: str
+
+    url: str
+
+    managed_by: Optional[List[VPCsByIDManagedBy]] = None
+
+
+class OnRampListResponse(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE"]
+
+    dynamic_routing: bool
+
+    install_routes_in_cloud: bool
+
+    install_routes_in_magic_wan: bool
+
+    name: str
+
+    type: Literal["OnrampTypeSingle", "OnrampTypeHub"]
+
+    updated_at: str
+
+    attached_hubs: Optional[List[str]] = None
+
+    attached_vpcs: Optional[List[str]] = None
+
+    cloud_asn: Optional[int] = None
+
+    description: Optional[str] = None
+
+    hub: Optional[str] = None
+
+    last_applied_at: Optional[str] = None
+
+    last_exported_at: Optional[str] = None
+
+    last_planned_at: Optional[str] = None
+
+    manage_hub_to_hub_attachments: Optional[bool] = None
+
+    manage_vpc_to_hub_attachments: Optional[bool] = None
+
+    planned_monthly_cost_estimate: Optional[PlannedMonthlyCostEstimate] = None
+
+    planned_resources: Optional[List[PlannedResource]] = None
+
+    planned_resources_unavailable: Optional[bool] = None
+
+    post_apply_monthly_cost_estimate: Optional[PostApplyMonthlyCostEstimate] = None
+
+    post_apply_resources: Optional[Dict[str, PostApplyResources]] = None
+
+    post_apply_resources_unavailable: Optional[bool] = None
+
+    region: Optional[str] = None
+
+    status: Optional[Status] = None
+
+    vpc: Optional[str] = None
+
+    vpcs_by_id: Optional[Dict[str, VPCsByID]] = None
+
+    vpcs_by_id_unavailable: Optional[List[str]] = None
+    """The list of vpc IDs for which resource details failed to generate."""
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramp_plan_response.py b/src/cloudflare/types/magic_cloud_networking/on_ramp_plan_response.py
new file mode 100644
index 00000000000..8828c3fb18c
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramp_plan_response.py
@@ -0,0 +1,388 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["OnRampPlanResponse", "Error", "ErrorMeta", "ErrorSource", "Message", "MessageMeta", "MessageSource"]
+
+
+class ErrorMeta(BaseModel):
+    l10n_key: Optional[str] = None
+
+    loggable_error: Optional[str] = None
+
+    template_data: Optional[object] = None
+
+    trace_id: Optional[str] = None
+
+
+class ErrorSource(BaseModel):
+    parameter: Optional[str] = None
+
+    parameter_value_index: Optional[int] = None
+
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: Literal[
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016,
+        1017,
+        1018,
+        2001,
+        2002,
+        2003,
+        2004,
+        2005,
+        2006,
+        2007,
+        2008,
+        2009,
+        2010,
+        2011,
+        2012,
+        2013,
+        2014,
+        2015,
+        2016,
+        2017,
+        2018,
+        2019,
+        2020,
+        2021,
+        2022,
+        3001,
+        3002,
+        3003,
+        3004,
+        3005,
+        3006,
+        3007,
+        4001,
+        4002,
+        4003,
+        4004,
+        4005,
+        4006,
+        4007,
+        4008,
+        4009,
+        4010,
+        4011,
+        4012,
+        4013,
+        4014,
+        4015,
+        4016,
+        4017,
+        4018,
+        4019,
+        4020,
+        4021,
+        4022,
+        4023,
+        5001,
+        5002,
+        5003,
+        5004,
+        102000,
+        102001,
+        102002,
+        102003,
+        102004,
+        102005,
+        102006,
+        102007,
+        102008,
+        102009,
+        102010,
+        102011,
+        102012,
+        102013,
+        102014,
+        102015,
+        102016,
+        102017,
+        102018,
+        102019,
+        102020,
+        102021,
+        102022,
+        102023,
+        102024,
+        102025,
+        102026,
+        102027,
+        102028,
+        102029,
+        102030,
+        102031,
+        102032,
+        102033,
+        102034,
+        102035,
+        102036,
+        102037,
+        102038,
+        102039,
+        102040,
+        102041,
+        102042,
+        102043,
+        102044,
+        102045,
+        102046,
+        102047,
+        102048,
+        102049,
+        102050,
+        102051,
+        102052,
+        102053,
+        102054,
+        102055,
+        102056,
+        102057,
+        102058,
+        102059,
+        102060,
+        102061,
+        102062,
+        102063,
+        102064,
+        102065,
+        102066,
+        102067,
+        102068,
+        102069,
+        102070,
+        102071,
+        102072,
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007,
+        103008,
+    ]
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    meta: Optional[ErrorMeta] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageMeta(BaseModel):
+    l10n_key: Optional[str] = None
+
+    loggable_error: Optional[str] = None
+
+    template_data: Optional[object] = None
+
+    trace_id: Optional[str] = None
+
+
+class MessageSource(BaseModel):
+    parameter: Optional[str] = None
+
+    parameter_value_index: Optional[int] = None
+
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: Literal[
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016,
+        1017,
+        1018,
+        2001,
+        2002,
+        2003,
+        2004,
+        2005,
+        2006,
+        2007,
+        2008,
+        2009,
+        2010,
+        2011,
+        2012,
+        2013,
+        2014,
+        2015,
+        2016,
+        2017,
+        2018,
+        2019,
+        2020,
+        2021,
+        2022,
+        3001,
+        3002,
+        3003,
+        3004,
+        3005,
+        3006,
+        3007,
+        4001,
+        4002,
+        4003,
+        4004,
+        4005,
+        4006,
+        4007,
+        4008,
+        4009,
+        4010,
+        4011,
+        4012,
+        4013,
+        4014,
+        4015,
+        4016,
+        4017,
+        4018,
+        4019,
+        4020,
+        4021,
+        4022,
+        4023,
+        5001,
+        5002,
+        5003,
+        5004,
+        102000,
+        102001,
+        102002,
+        102003,
+        102004,
+        102005,
+        102006,
+        102007,
+        102008,
+        102009,
+        102010,
+        102011,
+        102012,
+        102013,
+        102014,
+        102015,
+        102016,
+        102017,
+        102018,
+        102019,
+        102020,
+        102021,
+        102022,
+        102023,
+        102024,
+        102025,
+        102026,
+        102027,
+        102028,
+        102029,
+        102030,
+        102031,
+        102032,
+        102033,
+        102034,
+        102035,
+        102036,
+        102037,
+        102038,
+        102039,
+        102040,
+        102041,
+        102042,
+        102043,
+        102044,
+        102045,
+        102046,
+        102047,
+        102048,
+        102049,
+        102050,
+        102051,
+        102052,
+        102053,
+        102054,
+        102055,
+        102056,
+        102057,
+        102058,
+        102059,
+        102060,
+        102061,
+        102062,
+        102063,
+        102064,
+        102065,
+        102066,
+        102067,
+        102068,
+        102069,
+        102070,
+        102071,
+        102072,
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007,
+        103008,
+    ]
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    meta: Optional[MessageMeta] = None
+
+    source: Optional[MessageSource] = None
+
+
+class OnRampPlanResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: bool
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramp_update_params.py b/src/cloudflare/types/magic_cloud_networking/on_ramp_update_params.py
new file mode 100644
index 00000000000..bbcd6aae218
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramp_update_params.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["OnRampUpdateParams"]
+
+
+class OnRampUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    attached_hubs: SequenceNotStr[str]
+
+    attached_vpcs: SequenceNotStr[str]
+
+    description: str
+
+    install_routes_in_cloud: bool
+
+    install_routes_in_magic_wan: bool
+
+    manage_hub_to_hub_attachments: bool
+
+    manage_vpc_to_hub_attachments: bool
+
+    name: str
+
+    vpc: str
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramp_update_response.py b/src/cloudflare/types/magic_cloud_networking/on_ramp_update_response.py
new file mode 100644
index 00000000000..ea145da1dde
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramp_update_response.py
@@ -0,0 +1,1675 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._utils import PropertyInfo
+from ..._models import BaseModel
+
+__all__ = [
+    "OnRampUpdateResponse",
+    "PlannedMonthlyCostEstimate",
+    "PlannedResource",
+    "PlannedResourceDiff",
+    "PlannedResourceMonthlyCostEstimateDiff",
+    "PlannedResourceResource",
+    "PostApplyMonthlyCostEstimate",
+    "PostApplyResources",
+    "PostApplyResourcesMonthlyCostEstimate",
+    "PostApplyResourcesObservations",
+    "PostApplyResourcesSection",
+    "PostApplyResourcesSectionHiddenItem",
+    "PostApplyResourcesSectionHiddenItemValue",
+    "PostApplyResourcesSectionHiddenItemValueMcnStringItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnYamlItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItemYamlDiff",
+    "PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemList",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnStringItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem",
+    "PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesSectionVisibleItem",
+    "PostApplyResourcesSectionVisibleItemValue",
+    "PostApplyResourcesSectionVisibleItemValueMcnStringItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnYamlItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItemYamlDiff",
+    "PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemList",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnStringItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem",
+    "PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "PostApplyResourcesManagedBy",
+    "Status",
+    "StatusApplyProgress",
+    "StatusPlanProgress",
+    "StatusLifecycleErrors",
+    "StatusLifecycleErrorsMeta",
+    "StatusLifecycleErrorsSource",
+    "VPCsByID",
+    "VPCsByIDMonthlyCostEstimate",
+    "VPCsByIDObservations",
+    "VPCsByIDSection",
+    "VPCsByIDSectionHiddenItem",
+    "VPCsByIDSectionHiddenItemValue",
+    "VPCsByIDSectionHiddenItemValueMcnStringItem",
+    "VPCsByIDSectionHiddenItemValueMcnYamlItem",
+    "VPCsByIDSectionHiddenItemValueMcnYamlDiffItem",
+    "VPCsByIDSectionHiddenItemValueMcnYamlDiffItemYamlDiff",
+    "VPCsByIDSectionHiddenItemValueMcnResourcePreviewItem",
+    "VPCsByIDSectionHiddenItemValueMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDSectionHiddenItemValueMcnListItem",
+    "VPCsByIDSectionHiddenItemValueMcnListItemList",
+    "VPCsByIDSectionHiddenItemValueMcnListItemListMcnStringItem",
+    "VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem",
+    "VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDSectionVisibleItem",
+    "VPCsByIDSectionVisibleItemValue",
+    "VPCsByIDSectionVisibleItemValueMcnStringItem",
+    "VPCsByIDSectionVisibleItemValueMcnYamlItem",
+    "VPCsByIDSectionVisibleItemValueMcnYamlDiffItem",
+    "VPCsByIDSectionVisibleItemValueMcnYamlDiffItemYamlDiff",
+    "VPCsByIDSectionVisibleItemValueMcnResourcePreviewItem",
+    "VPCsByIDSectionVisibleItemValueMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDSectionVisibleItemValueMcnListItem",
+    "VPCsByIDSectionVisibleItemValueMcnListItemList",
+    "VPCsByIDSectionVisibleItemValueMcnListItemListMcnStringItem",
+    "VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem",
+    "VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "VPCsByIDManagedBy",
+]
+
+
+class PlannedMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    current_monthly_cost: float
+
+    diff: float
+
+    proposed_monthly_cost: float
+
+
+class PlannedResourceDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class PlannedResourceMonthlyCostEstimateDiff(BaseModel):
+    currency: str
+
+    current_monthly_cost: float
+
+    diff: float
+
+    proposed_monthly_cost: float
+
+
+class PlannedResourceResource(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PlannedResource(BaseModel):
+    diff: PlannedResourceDiff
+
+    keys_require_replace: List[str]
+
+    monthly_cost_estimate_diff: PlannedResourceMonthlyCostEstimateDiff
+
+    planned_action: Literal["no_op", "create", "update", "replace", "destroy"]
+
+    resource: PlannedResourceResource
+
+
+class PostApplyMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    monthly_cost: float
+
+
+class PostApplyResourcesMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    monthly_cost: float
+
+
+class PostApplyResourcesObservations(BaseModel):
+    first_observed_at: str
+
+    last_observed_at: str
+
+    provider_id: str
+
+    resource_id: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItemYamlDiff
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItemResourcePreview
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+PostApplyResourcesSectionHiddenItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnStringItem,
+        PostApplyResourcesSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionHiddenItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[PostApplyResourcesSectionHiddenItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+PostApplyResourcesSectionHiddenItemValue: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionHiddenItemValueMcnStringItem,
+        PostApplyResourcesSectionHiddenItemValueMcnYamlItem,
+        PostApplyResourcesSectionHiddenItemValueMcnYamlDiffItem,
+        PostApplyResourcesSectionHiddenItemValueMcnResourcePreviewItem,
+        PostApplyResourcesSectionHiddenItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionHiddenItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[PostApplyResourcesSectionHiddenItemValue] = None
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItemYamlDiff
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItemResourcePreview
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+PostApplyResourcesSectionVisibleItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnStringItem,
+        PostApplyResourcesSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionVisibleItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[PostApplyResourcesSectionVisibleItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+PostApplyResourcesSectionVisibleItemValue: TypeAlias = Annotated[
+    Union[
+        PostApplyResourcesSectionVisibleItemValueMcnStringItem,
+        PostApplyResourcesSectionVisibleItemValueMcnYamlItem,
+        PostApplyResourcesSectionVisibleItemValueMcnYamlDiffItem,
+        PostApplyResourcesSectionVisibleItemValueMcnResourcePreviewItem,
+        PostApplyResourcesSectionVisibleItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class PostApplyResourcesSectionVisibleItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[PostApplyResourcesSectionVisibleItemValue] = None
+
+
+class PostApplyResourcesSection(BaseModel):
+    hidden_items: List[PostApplyResourcesSectionHiddenItem]
+
+    name: str
+
+    visible_items: List[PostApplyResourcesSectionVisibleItem]
+
+    help_text: Optional[str] = None
+
+
+class PostApplyResourcesManagedBy(BaseModel):
+    id: str
+
+    client_type: Literal["MAGIC_WAN_CLOUD_ONRAMP"]
+
+    name: str
+
+
+class PostApplyResources(BaseModel):
+    id: str
+
+    account_id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    config: Dict[str, object]
+
+    deployment_provider: str
+
+    managed: bool
+
+    monthly_cost_estimate: PostApplyResourcesMonthlyCostEstimate
+
+    name: str
+
+    native_id: str
+
+    observations: Dict[str, PostApplyResourcesObservations]
+
+    provider_ids: List[str]
+
+    provider_names_by_id: Dict[str, str]
+
+    region: str
+
+    resource_group: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    sections: List[PostApplyResourcesSection]
+
+    state: Dict[str, object]
+
+    tags: Dict[str, str]
+
+    updated_at: str
+
+    url: str
+
+    managed_by: Optional[List[PostApplyResourcesManagedBy]] = None
+
+
+class StatusApplyProgress(BaseModel):
+    done: int
+
+    total: int
+
+
+class StatusPlanProgress(BaseModel):
+    done: int
+
+    total: int
+
+
+class StatusLifecycleErrorsMeta(BaseModel):
+    l10n_key: Optional[str] = None
+
+    loggable_error: Optional[str] = None
+
+    template_data: Optional[object] = None
+
+    trace_id: Optional[str] = None
+
+
+class StatusLifecycleErrorsSource(BaseModel):
+    parameter: Optional[str] = None
+
+    parameter_value_index: Optional[int] = None
+
+    pointer: Optional[str] = None
+
+
+class StatusLifecycleErrors(BaseModel):
+    code: Literal[
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016,
+        1017,
+        1018,
+        2001,
+        2002,
+        2003,
+        2004,
+        2005,
+        2006,
+        2007,
+        2008,
+        2009,
+        2010,
+        2011,
+        2012,
+        2013,
+        2014,
+        2015,
+        2016,
+        2017,
+        2018,
+        2019,
+        2020,
+        2021,
+        2022,
+        3001,
+        3002,
+        3003,
+        3004,
+        3005,
+        3006,
+        3007,
+        4001,
+        4002,
+        4003,
+        4004,
+        4005,
+        4006,
+        4007,
+        4008,
+        4009,
+        4010,
+        4011,
+        4012,
+        4013,
+        4014,
+        4015,
+        4016,
+        4017,
+        4018,
+        4019,
+        4020,
+        4021,
+        4022,
+        4023,
+        5001,
+        5002,
+        5003,
+        5004,
+        102000,
+        102001,
+        102002,
+        102003,
+        102004,
+        102005,
+        102006,
+        102007,
+        102008,
+        102009,
+        102010,
+        102011,
+        102012,
+        102013,
+        102014,
+        102015,
+        102016,
+        102017,
+        102018,
+        102019,
+        102020,
+        102021,
+        102022,
+        102023,
+        102024,
+        102025,
+        102026,
+        102027,
+        102028,
+        102029,
+        102030,
+        102031,
+        102032,
+        102033,
+        102034,
+        102035,
+        102036,
+        102037,
+        102038,
+        102039,
+        102040,
+        102041,
+        102042,
+        102043,
+        102044,
+        102045,
+        102046,
+        102047,
+        102048,
+        102049,
+        102050,
+        102051,
+        102052,
+        102053,
+        102054,
+        102055,
+        102056,
+        102057,
+        102058,
+        102059,
+        102060,
+        102061,
+        102062,
+        102063,
+        102064,
+        102065,
+        102066,
+        102067,
+        102068,
+        102069,
+        102070,
+        102071,
+        102072,
+        103001,
+        103002,
+        103003,
+        103004,
+        103005,
+        103006,
+        103007,
+        103008,
+    ]
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    meta: Optional[StatusLifecycleErrorsMeta] = None
+
+    source: Optional[StatusLifecycleErrorsSource] = None
+
+
+class Status(BaseModel):
+    apply_progress: StatusApplyProgress
+
+    lifecycle_state: Literal[
+        "OnrampNeedsApply",
+        "OnrampPendingPlan",
+        "OnrampPlanning",
+        "OnrampPlanFailed",
+        "OnrampPendingApproval",
+        "OnrampPendingApply",
+        "OnrampApplying",
+        "OnrampApplyFailed",
+        "OnrampActive",
+        "OnrampPendingDestroy",
+        "OnrampDestroying",
+        "OnrampDestroyFailed",
+    ]
+
+    plan_progress: StatusPlanProgress
+
+    routes: List[str]
+
+    tunnels: List[str]
+
+    lifecycle_errors: Optional[Dict[str, StatusLifecycleErrors]] = None
+
+
+class VPCsByIDMonthlyCostEstimate(BaseModel):
+    currency: str
+
+    monthly_cost: float
+
+
+class VPCsByIDObservations(BaseModel):
+    first_observed_at: str
+
+    last_observed_at: str
+
+    provider_id: str
+
+    resource_id: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: VPCsByIDSectionHiddenItemValueMcnYamlDiffItemYamlDiff
+
+
+class VPCsByIDSectionHiddenItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionHiddenItemValueMcnResourcePreviewItemResourcePreview
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+VPCsByIDSectionHiddenItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionHiddenItemValueMcnListItemListMcnStringItem,
+        VPCsByIDSectionHiddenItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionHiddenItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[VPCsByIDSectionHiddenItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+VPCsByIDSectionHiddenItemValue: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionHiddenItemValueMcnStringItem,
+        VPCsByIDSectionHiddenItemValueMcnYamlItem,
+        VPCsByIDSectionHiddenItemValueMcnYamlDiffItem,
+        VPCsByIDSectionHiddenItemValueMcnResourcePreviewItem,
+        VPCsByIDSectionHiddenItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionHiddenItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[VPCsByIDSectionHiddenItemValue] = None
+
+
+class VPCsByIDSectionVisibleItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: VPCsByIDSectionVisibleItemValueMcnYamlDiffItemYamlDiff
+
+
+class VPCsByIDSectionVisibleItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionVisibleItemValueMcnResourcePreviewItemResourcePreview
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+VPCsByIDSectionVisibleItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionVisibleItemValueMcnListItemListMcnStringItem,
+        VPCsByIDSectionVisibleItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionVisibleItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[VPCsByIDSectionVisibleItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+VPCsByIDSectionVisibleItemValue: TypeAlias = Annotated[
+    Union[
+        VPCsByIDSectionVisibleItemValueMcnStringItem,
+        VPCsByIDSectionVisibleItemValueMcnYamlItem,
+        VPCsByIDSectionVisibleItemValueMcnYamlDiffItem,
+        VPCsByIDSectionVisibleItemValueMcnResourcePreviewItem,
+        VPCsByIDSectionVisibleItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class VPCsByIDSectionVisibleItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[VPCsByIDSectionVisibleItemValue] = None
+
+
+class VPCsByIDSection(BaseModel):
+    hidden_items: List[VPCsByIDSectionHiddenItem]
+
+    name: str
+
+    visible_items: List[VPCsByIDSectionVisibleItem]
+
+    help_text: Optional[str] = None
+
+
+class VPCsByIDManagedBy(BaseModel):
+    id: str
+
+    client_type: Literal["MAGIC_WAN_CLOUD_ONRAMP"]
+
+    name: str
+
+
+class VPCsByID(BaseModel):
+    id: str
+
+    account_id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    config: Dict[str, object]
+
+    deployment_provider: str
+
+    managed: bool
+
+    monthly_cost_estimate: VPCsByIDMonthlyCostEstimate
+
+    name: str
+
+    native_id: str
+
+    observations: Dict[str, VPCsByIDObservations]
+
+    provider_ids: List[str]
+
+    provider_names_by_id: Dict[str, str]
+
+    region: str
+
+    resource_group: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    sections: List[VPCsByIDSection]
+
+    state: Dict[str, object]
+
+    tags: Dict[str, str]
+
+    updated_at: str
+
+    url: str
+
+    managed_by: Optional[List[VPCsByIDManagedBy]] = None
+
+
+class OnRampUpdateResponse(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE"]
+
+    dynamic_routing: bool
+
+    install_routes_in_cloud: bool
+
+    install_routes_in_magic_wan: bool
+
+    name: str
+
+    type: Literal["OnrampTypeSingle", "OnrampTypeHub"]
+
+    updated_at: str
+
+    attached_hubs: Optional[List[str]] = None
+
+    attached_vpcs: Optional[List[str]] = None
+
+    cloud_asn: Optional[int] = None
+
+    description: Optional[str] = None
+
+    hub: Optional[str] = None
+
+    last_applied_at: Optional[str] = None
+
+    last_exported_at: Optional[str] = None
+
+    last_planned_at: Optional[str] = None
+
+    manage_hub_to_hub_attachments: Optional[bool] = None
+
+    manage_vpc_to_hub_attachments: Optional[bool] = None
+
+    planned_monthly_cost_estimate: Optional[PlannedMonthlyCostEstimate] = None
+
+    planned_resources: Optional[List[PlannedResource]] = None
+
+    planned_resources_unavailable: Optional[bool] = None
+
+    post_apply_monthly_cost_estimate: Optional[PostApplyMonthlyCostEstimate] = None
+
+    post_apply_resources: Optional[Dict[str, PostApplyResources]] = None
+
+    post_apply_resources_unavailable: Optional[bool] = None
+
+    region: Optional[str] = None
+
+    status: Optional[Status] = None
+
+    vpc: Optional[str] = None
+
+    vpcs_by_id: Optional[Dict[str, VPCsByID]] = None
+
+    vpcs_by_id_unavailable: Optional[List[str]] = None
+    """The list of vpc IDs for which resource details failed to generate."""
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramps/__init__.py b/src/cloudflare/types/magic_cloud_networking/on_ramps/__init__.py
new file mode 100644
index 00000000000..08b228458d1
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramps/__init__.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .address_space_edit_params import AddressSpaceEditParams as AddressSpaceEditParams
+from .address_space_edit_response import AddressSpaceEditResponse as AddressSpaceEditResponse
+from .address_space_list_response import AddressSpaceListResponse as AddressSpaceListResponse
+from .address_space_update_params import AddressSpaceUpdateParams as AddressSpaceUpdateParams
+from .address_space_update_response import AddressSpaceUpdateResponse as AddressSpaceUpdateResponse
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_edit_params.py b/src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_edit_params.py
new file mode 100644
index 00000000000..09fc69ad5fa
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_edit_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["AddressSpaceEditParams"]
+
+
+class AddressSpaceEditParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    prefixes: Required[SequenceNotStr[str]]
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_edit_response.py b/src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_edit_response.py
new file mode 100644
index 00000000000..636524b2790
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_edit_response.py
@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+
+from ...._models import BaseModel
+
+__all__ = ["AddressSpaceEditResponse"]
+
+
+class AddressSpaceEditResponse(BaseModel):
+    prefixes: List[str]
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_list_response.py b/src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_list_response.py
new file mode 100644
index 00000000000..31912818236
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_list_response.py
@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+
+from ...._models import BaseModel
+
+__all__ = ["AddressSpaceListResponse"]
+
+
+class AddressSpaceListResponse(BaseModel):
+    prefixes: List[str]
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_update_params.py b/src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_update_params.py
new file mode 100644
index 00000000000..ed1ef67b196
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_update_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["AddressSpaceUpdateParams"]
+
+
+class AddressSpaceUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    prefixes: Required[SequenceNotStr[str]]
diff --git a/src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_update_response.py b/src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_update_response.py
new file mode 100644
index 00000000000..b6277529be4
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/on_ramps/address_space_update_response.py
@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+
+from ...._models import BaseModel
+
+__all__ = ["AddressSpaceUpdateResponse"]
+
+
+class AddressSpaceUpdateResponse(BaseModel):
+    prefixes: List[str]
diff --git a/src/cloudflare/types/magic_cloud_networking/resource_export_params.py b/src/cloudflare/types/magic_cloud_networking/resource_export_params.py
new file mode 100644
index 00000000000..73d6753fcc2
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/resource_export_params.py
@@ -0,0 +1,93 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["ResourceExportParams"]
+
+
+class ResourceExportParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    desc: bool
+
+    order_by: str
+    """One of ["id", "resource_type", "region"]."""
+
+    provider_id: str
+
+    region: str
+
+    resource_group: str
+
+    resource_id: SequenceNotStr[str]
+
+    resource_type: List[
+        Literal[
+            "aws_customer_gateway",
+            "aws_egress_only_internet_gateway",
+            "aws_internet_gateway",
+            "aws_instance",
+            "aws_network_interface",
+            "aws_route",
+            "aws_route_table",
+            "aws_route_table_association",
+            "aws_subnet",
+            "aws_vpc",
+            "aws_vpc_ipv4_cidr_block_association",
+            "aws_vpn_connection",
+            "aws_vpn_connection_route",
+            "aws_vpn_gateway",
+            "aws_security_group",
+            "aws_vpc_security_group_ingress_rule",
+            "aws_vpc_security_group_egress_rule",
+            "aws_ec2_managed_prefix_list",
+            "aws_ec2_transit_gateway",
+            "aws_ec2_transit_gateway_prefix_list_reference",
+            "aws_ec2_transit_gateway_vpc_attachment",
+            "azurerm_application_security_group",
+            "azurerm_lb",
+            "azurerm_lb_backend_address_pool",
+            "azurerm_lb_nat_pool",
+            "azurerm_lb_nat_rule",
+            "azurerm_lb_rule",
+            "azurerm_local_network_gateway",
+            "azurerm_network_interface",
+            "azurerm_network_interface_application_security_group_association",
+            "azurerm_network_interface_backend_address_pool_association",
+            "azurerm_network_interface_security_group_association",
+            "azurerm_network_security_group",
+            "azurerm_public_ip",
+            "azurerm_route",
+            "azurerm_route_table",
+            "azurerm_subnet",
+            "azurerm_subnet_route_table_association",
+            "azurerm_virtual_machine",
+            "azurerm_virtual_network_gateway_connection",
+            "azurerm_virtual_network",
+            "azurerm_virtual_network_gateway",
+            "google_compute_network",
+            "google_compute_subnetwork",
+            "google_compute_vpn_gateway",
+            "google_compute_vpn_tunnel",
+            "google_compute_route",
+            "google_compute_address",
+            "google_compute_global_address",
+            "google_compute_router",
+            "google_compute_interconnect_attachment",
+            "google_compute_ha_vpn_gateway",
+            "google_compute_forwarding_rule",
+            "google_compute_network_firewall_policy",
+            "google_compute_network_firewall_policy_rule",
+            "cloudflare_static_route",
+            "cloudflare_ipsec_tunnel",
+        ]
+    ]
+
+    search: SequenceNotStr[str]
+
+    v2: bool
diff --git a/src/cloudflare/types/magic_cloud_networking/resource_get_params.py b/src/cloudflare/types/magic_cloud_networking/resource_get_params.py
new file mode 100644
index 00000000000..e3f392e392a
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/resource_get_params.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ResourceGetParams"]
+
+
+class ResourceGetParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    v2: bool
diff --git a/src/cloudflare/types/magic_cloud_networking/resource_get_response.py b/src/cloudflare/types/magic_cloud_networking/resource_get_response.py
new file mode 100644
index 00000000000..54f68907fca
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/resource_get_response.py
@@ -0,0 +1,632 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._utils import PropertyInfo
+from ..._models import BaseModel
+
+__all__ = [
+    "ResourceGetResponse",
+    "MonthlyCostEstimate",
+    "Observations",
+    "Section",
+    "SectionHiddenItem",
+    "SectionHiddenItemValue",
+    "SectionHiddenItemValueMcnStringItem",
+    "SectionHiddenItemValueMcnYamlItem",
+    "SectionHiddenItemValueMcnYamlDiffItem",
+    "SectionHiddenItemValueMcnYamlDiffItemYamlDiff",
+    "SectionHiddenItemValueMcnResourcePreviewItem",
+    "SectionHiddenItemValueMcnResourcePreviewItemResourcePreview",
+    "SectionHiddenItemValueMcnListItem",
+    "SectionHiddenItemValueMcnListItemList",
+    "SectionHiddenItemValueMcnListItemListMcnStringItem",
+    "SectionHiddenItemValueMcnListItemListMcnResourcePreviewItem",
+    "SectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "SectionVisibleItem",
+    "SectionVisibleItemValue",
+    "SectionVisibleItemValueMcnStringItem",
+    "SectionVisibleItemValueMcnYamlItem",
+    "SectionVisibleItemValueMcnYamlDiffItem",
+    "SectionVisibleItemValueMcnYamlDiffItemYamlDiff",
+    "SectionVisibleItemValueMcnResourcePreviewItem",
+    "SectionVisibleItemValueMcnResourcePreviewItemResourcePreview",
+    "SectionVisibleItemValueMcnListItem",
+    "SectionVisibleItemValueMcnListItemList",
+    "SectionVisibleItemValueMcnListItemListMcnStringItem",
+    "SectionVisibleItemValueMcnListItemListMcnResourcePreviewItem",
+    "SectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "ManagedBy",
+]
+
+
+class MonthlyCostEstimate(BaseModel):
+    currency: str
+
+    monthly_cost: float
+
+
+class Observations(BaseModel):
+    first_observed_at: str
+
+    last_observed_at: str
+
+    provider_id: str
+
+    resource_id: str
+
+
+class SectionHiddenItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class SectionHiddenItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class SectionHiddenItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class SectionHiddenItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: SectionHiddenItemValueMcnYamlDiffItemYamlDiff
+
+
+class SectionHiddenItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class SectionHiddenItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: SectionHiddenItemValueMcnResourcePreviewItemResourcePreview
+
+
+class SectionHiddenItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class SectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class SectionHiddenItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: SectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+SectionHiddenItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        SectionHiddenItemValueMcnListItemListMcnStringItem, SectionHiddenItemValueMcnListItemListMcnResourcePreviewItem
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class SectionHiddenItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[SectionHiddenItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+SectionHiddenItemValue: TypeAlias = Annotated[
+    Union[
+        SectionHiddenItemValueMcnStringItem,
+        SectionHiddenItemValueMcnYamlItem,
+        SectionHiddenItemValueMcnYamlDiffItem,
+        SectionHiddenItemValueMcnResourcePreviewItem,
+        SectionHiddenItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class SectionHiddenItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[SectionHiddenItemValue] = None
+
+
+class SectionVisibleItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class SectionVisibleItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class SectionVisibleItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class SectionVisibleItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: SectionVisibleItemValueMcnYamlDiffItemYamlDiff
+
+
+class SectionVisibleItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class SectionVisibleItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: SectionVisibleItemValueMcnResourcePreviewItemResourcePreview
+
+
+class SectionVisibleItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class SectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class SectionVisibleItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: SectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+SectionVisibleItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        SectionVisibleItemValueMcnListItemListMcnStringItem,
+        SectionVisibleItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class SectionVisibleItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[SectionVisibleItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+SectionVisibleItemValue: TypeAlias = Annotated[
+    Union[
+        SectionVisibleItemValueMcnStringItem,
+        SectionVisibleItemValueMcnYamlItem,
+        SectionVisibleItemValueMcnYamlDiffItem,
+        SectionVisibleItemValueMcnResourcePreviewItem,
+        SectionVisibleItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class SectionVisibleItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[SectionVisibleItemValue] = None
+
+
+class Section(BaseModel):
+    hidden_items: List[SectionHiddenItem]
+
+    name: str
+
+    visible_items: List[SectionVisibleItem]
+
+    help_text: Optional[str] = None
+
+
+class ManagedBy(BaseModel):
+    id: str
+
+    client_type: Literal["MAGIC_WAN_CLOUD_ONRAMP"]
+
+    name: str
+
+
+class ResourceGetResponse(BaseModel):
+    id: str
+
+    account_id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    config: Dict[str, object]
+
+    deployment_provider: str
+
+    managed: bool
+
+    monthly_cost_estimate: MonthlyCostEstimate
+
+    name: str
+
+    native_id: str
+
+    observations: Dict[str, Observations]
+
+    provider_ids: List[str]
+
+    provider_names_by_id: Dict[str, str]
+
+    region: str
+
+    resource_group: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    sections: List[Section]
+
+    state: Dict[str, object]
+
+    tags: Dict[str, str]
+
+    updated_at: str
+
+    url: str
+
+    managed_by: Optional[List[ManagedBy]] = None
diff --git a/src/cloudflare/types/magic_cloud_networking/resource_list_params.py b/src/cloudflare/types/magic_cloud_networking/resource_list_params.py
new file mode 100644
index 00000000000..d48313a1b22
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/resource_list_params.py
@@ -0,0 +1,101 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["ResourceListParams"]
+
+
+class ResourceListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    cloudflare: bool
+
+    desc: bool
+
+    managed: bool
+
+    order_by: str
+    """One of ["id", "resource_type", "region"]."""
+
+    page: int
+
+    per_page: int
+
+    provider_id: str
+
+    region: str
+
+    resource_group: str
+
+    resource_id: SequenceNotStr[str]
+
+    resource_type: List[
+        Literal[
+            "aws_customer_gateway",
+            "aws_egress_only_internet_gateway",
+            "aws_internet_gateway",
+            "aws_instance",
+            "aws_network_interface",
+            "aws_route",
+            "aws_route_table",
+            "aws_route_table_association",
+            "aws_subnet",
+            "aws_vpc",
+            "aws_vpc_ipv4_cidr_block_association",
+            "aws_vpn_connection",
+            "aws_vpn_connection_route",
+            "aws_vpn_gateway",
+            "aws_security_group",
+            "aws_vpc_security_group_ingress_rule",
+            "aws_vpc_security_group_egress_rule",
+            "aws_ec2_managed_prefix_list",
+            "aws_ec2_transit_gateway",
+            "aws_ec2_transit_gateway_prefix_list_reference",
+            "aws_ec2_transit_gateway_vpc_attachment",
+            "azurerm_application_security_group",
+            "azurerm_lb",
+            "azurerm_lb_backend_address_pool",
+            "azurerm_lb_nat_pool",
+            "azurerm_lb_nat_rule",
+            "azurerm_lb_rule",
+            "azurerm_local_network_gateway",
+            "azurerm_network_interface",
+            "azurerm_network_interface_application_security_group_association",
+            "azurerm_network_interface_backend_address_pool_association",
+            "azurerm_network_interface_security_group_association",
+            "azurerm_network_security_group",
+            "azurerm_public_ip",
+            "azurerm_route",
+            "azurerm_route_table",
+            "azurerm_subnet",
+            "azurerm_subnet_route_table_association",
+            "azurerm_virtual_machine",
+            "azurerm_virtual_network_gateway_connection",
+            "azurerm_virtual_network",
+            "azurerm_virtual_network_gateway",
+            "google_compute_network",
+            "google_compute_subnetwork",
+            "google_compute_vpn_gateway",
+            "google_compute_vpn_tunnel",
+            "google_compute_route",
+            "google_compute_address",
+            "google_compute_global_address",
+            "google_compute_router",
+            "google_compute_interconnect_attachment",
+            "google_compute_ha_vpn_gateway",
+            "google_compute_forwarding_rule",
+            "google_compute_network_firewall_policy",
+            "google_compute_network_firewall_policy_rule",
+            "cloudflare_static_route",
+            "cloudflare_ipsec_tunnel",
+        ]
+    ]
+
+    search: SequenceNotStr[str]
+
+    v2: bool
diff --git a/src/cloudflare/types/magic_cloud_networking/resource_list_response.py b/src/cloudflare/types/magic_cloud_networking/resource_list_response.py
new file mode 100644
index 00000000000..ad52c983732
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/resource_list_response.py
@@ -0,0 +1,632 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._utils import PropertyInfo
+from ..._models import BaseModel
+
+__all__ = [
+    "ResourceListResponse",
+    "MonthlyCostEstimate",
+    "Observations",
+    "Section",
+    "SectionHiddenItem",
+    "SectionHiddenItemValue",
+    "SectionHiddenItemValueMcnStringItem",
+    "SectionHiddenItemValueMcnYamlItem",
+    "SectionHiddenItemValueMcnYamlDiffItem",
+    "SectionHiddenItemValueMcnYamlDiffItemYamlDiff",
+    "SectionHiddenItemValueMcnResourcePreviewItem",
+    "SectionHiddenItemValueMcnResourcePreviewItemResourcePreview",
+    "SectionHiddenItemValueMcnListItem",
+    "SectionHiddenItemValueMcnListItemList",
+    "SectionHiddenItemValueMcnListItemListMcnStringItem",
+    "SectionHiddenItemValueMcnListItemListMcnResourcePreviewItem",
+    "SectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "SectionVisibleItem",
+    "SectionVisibleItemValue",
+    "SectionVisibleItemValueMcnStringItem",
+    "SectionVisibleItemValueMcnYamlItem",
+    "SectionVisibleItemValueMcnYamlDiffItem",
+    "SectionVisibleItemValueMcnYamlDiffItemYamlDiff",
+    "SectionVisibleItemValueMcnResourcePreviewItem",
+    "SectionVisibleItemValueMcnResourcePreviewItemResourcePreview",
+    "SectionVisibleItemValueMcnListItem",
+    "SectionVisibleItemValueMcnListItemList",
+    "SectionVisibleItemValueMcnListItemListMcnStringItem",
+    "SectionVisibleItemValueMcnListItemListMcnResourcePreviewItem",
+    "SectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview",
+    "ManagedBy",
+]
+
+
+class MonthlyCostEstimate(BaseModel):
+    currency: str
+
+    monthly_cost: float
+
+
+class Observations(BaseModel):
+    first_observed_at: str
+
+    last_observed_at: str
+
+    provider_id: str
+
+    resource_id: str
+
+
+class SectionHiddenItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class SectionHiddenItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class SectionHiddenItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class SectionHiddenItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: SectionHiddenItemValueMcnYamlDiffItemYamlDiff
+
+
+class SectionHiddenItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class SectionHiddenItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: SectionHiddenItemValueMcnResourcePreviewItemResourcePreview
+
+
+class SectionHiddenItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class SectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class SectionHiddenItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: SectionHiddenItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+SectionHiddenItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        SectionHiddenItemValueMcnListItemListMcnStringItem, SectionHiddenItemValueMcnListItemListMcnResourcePreviewItem
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class SectionHiddenItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[SectionHiddenItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+SectionHiddenItemValue: TypeAlias = Annotated[
+    Union[
+        SectionHiddenItemValueMcnStringItem,
+        SectionHiddenItemValueMcnYamlItem,
+        SectionHiddenItemValueMcnYamlDiffItem,
+        SectionHiddenItemValueMcnResourcePreviewItem,
+        SectionHiddenItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class SectionHiddenItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[SectionHiddenItemValue] = None
+
+
+class SectionVisibleItemValueMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class SectionVisibleItemValueMcnYamlItem(BaseModel):
+    item_type: str
+
+    yaml: str
+
+
+class SectionVisibleItemValueMcnYamlDiffItemYamlDiff(BaseModel):
+    diff: str
+
+    left_description: str
+
+    left_yaml: str
+
+    right_description: str
+
+    right_yaml: str
+
+
+class SectionVisibleItemValueMcnYamlDiffItem(BaseModel):
+    item_type: str
+
+    yaml_diff: SectionVisibleItemValueMcnYamlDiffItemYamlDiff
+
+
+class SectionVisibleItemValueMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class SectionVisibleItemValueMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: SectionVisibleItemValueMcnResourcePreviewItemResourcePreview
+
+
+class SectionVisibleItemValueMcnListItemListMcnStringItem(BaseModel):
+    item_type: str
+
+    string: str
+
+
+class SectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview(BaseModel):
+    id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    detail: str
+
+    name: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    title: str
+
+
+class SectionVisibleItemValueMcnListItemListMcnResourcePreviewItem(BaseModel):
+    item_type: str
+
+    resource_preview: SectionVisibleItemValueMcnListItemListMcnResourcePreviewItemResourcePreview
+
+
+SectionVisibleItemValueMcnListItemList: TypeAlias = Annotated[
+    Union[
+        SectionVisibleItemValueMcnListItemListMcnStringItem,
+        SectionVisibleItemValueMcnListItemListMcnResourcePreviewItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class SectionVisibleItemValueMcnListItem(BaseModel):
+    item_type: str
+
+    rule_list: List[SectionVisibleItemValueMcnListItemList] = FieldInfo(alias="list")
+
+
+SectionVisibleItemValue: TypeAlias = Annotated[
+    Union[
+        SectionVisibleItemValueMcnStringItem,
+        SectionVisibleItemValueMcnYamlItem,
+        SectionVisibleItemValueMcnYamlDiffItem,
+        SectionVisibleItemValueMcnResourcePreviewItem,
+        SectionVisibleItemValueMcnListItem,
+    ],
+    PropertyInfo(discriminator="item_type"),
+]
+
+
+class SectionVisibleItem(BaseModel):
+    help_text: Optional[str] = FieldInfo(alias="helpText", default=None)
+
+    name: Optional[str] = None
+
+    value: Optional[SectionVisibleItemValue] = None
+
+
+class Section(BaseModel):
+    hidden_items: List[SectionHiddenItem]
+
+    name: str
+
+    visible_items: List[SectionVisibleItem]
+
+    help_text: Optional[str] = None
+
+
+class ManagedBy(BaseModel):
+    id: str
+
+    client_type: Literal["MAGIC_WAN_CLOUD_ONRAMP"]
+
+    name: str
+
+
+class ResourceListResponse(BaseModel):
+    id: str
+
+    account_id: str
+
+    cloud_type: Literal["AWS", "AZURE", "GOOGLE", "CLOUDFLARE"]
+
+    config: Dict[str, object]
+
+    deployment_provider: str
+
+    managed: bool
+
+    monthly_cost_estimate: MonthlyCostEstimate
+
+    name: str
+
+    native_id: str
+
+    observations: Dict[str, Observations]
+
+    provider_ids: List[str]
+
+    provider_names_by_id: Dict[str, str]
+
+    region: str
+
+    resource_group: str
+
+    resource_type: Literal[
+        "aws_customer_gateway",
+        "aws_egress_only_internet_gateway",
+        "aws_internet_gateway",
+        "aws_instance",
+        "aws_network_interface",
+        "aws_route",
+        "aws_route_table",
+        "aws_route_table_association",
+        "aws_subnet",
+        "aws_vpc",
+        "aws_vpc_ipv4_cidr_block_association",
+        "aws_vpn_connection",
+        "aws_vpn_connection_route",
+        "aws_vpn_gateway",
+        "aws_security_group",
+        "aws_vpc_security_group_ingress_rule",
+        "aws_vpc_security_group_egress_rule",
+        "aws_ec2_managed_prefix_list",
+        "aws_ec2_transit_gateway",
+        "aws_ec2_transit_gateway_prefix_list_reference",
+        "aws_ec2_transit_gateway_vpc_attachment",
+        "azurerm_application_security_group",
+        "azurerm_lb",
+        "azurerm_lb_backend_address_pool",
+        "azurerm_lb_nat_pool",
+        "azurerm_lb_nat_rule",
+        "azurerm_lb_rule",
+        "azurerm_local_network_gateway",
+        "azurerm_network_interface",
+        "azurerm_network_interface_application_security_group_association",
+        "azurerm_network_interface_backend_address_pool_association",
+        "azurerm_network_interface_security_group_association",
+        "azurerm_network_security_group",
+        "azurerm_public_ip",
+        "azurerm_route",
+        "azurerm_route_table",
+        "azurerm_subnet",
+        "azurerm_subnet_route_table_association",
+        "azurerm_virtual_machine",
+        "azurerm_virtual_network_gateway_connection",
+        "azurerm_virtual_network",
+        "azurerm_virtual_network_gateway",
+        "google_compute_network",
+        "google_compute_subnetwork",
+        "google_compute_vpn_gateway",
+        "google_compute_vpn_tunnel",
+        "google_compute_route",
+        "google_compute_address",
+        "google_compute_global_address",
+        "google_compute_router",
+        "google_compute_interconnect_attachment",
+        "google_compute_ha_vpn_gateway",
+        "google_compute_forwarding_rule",
+        "google_compute_network_firewall_policy",
+        "google_compute_network_firewall_policy_rule",
+        "cloudflare_static_route",
+        "cloudflare_ipsec_tunnel",
+    ]
+
+    sections: List[Section]
+
+    state: Dict[str, object]
+
+    tags: Dict[str, str]
+
+    updated_at: str
+
+    url: str
+
+    managed_by: Optional[List[ManagedBy]] = None
diff --git a/src/cloudflare/types/magic_cloud_networking/resource_policy_preview_params.py b/src/cloudflare/types/magic_cloud_networking/resource_policy_preview_params.py
new file mode 100644
index 00000000000..81c74c2fef6
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/resource_policy_preview_params.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ResourcePolicyPreviewParams"]
+
+
+class ResourcePolicyPreviewParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    policy: Required[str]
diff --git a/src/cloudflare/types/magic_cloud_networking/resource_policy_preview_response.py b/src/cloudflare/types/magic_cloud_networking/resource_policy_preview_response.py
new file mode 100644
index 00000000000..cb86b584190
--- /dev/null
+++ b/src/cloudflare/types/magic_cloud_networking/resource_policy_preview_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["ResourcePolicyPreviewResponse"]
+
+ResourcePolicyPreviewResponse: TypeAlias = str
diff --git a/src/cloudflare/types/magic_network_monitoring/config_create_params.py b/src/cloudflare/types/magic_network_monitoring/config_create_params.py
index 3bb01f0cb07..c6736af91a2 100644
--- a/src/cloudflare/types/magic_network_monitoring/config_create_params.py
+++ b/src/cloudflare/types/magic_network_monitoring/config_create_params.py
@@ -2,12 +2,42 @@
 
 from __future__ import annotations
 
+from typing import Iterable
 from typing_extensions import Required, TypedDict
 
-__all__ = ["ConfigCreateParams"]
+from ..._types import SequenceNotStr
+
+__all__ = ["ConfigCreateParams", "WARPDevice"]
 
 
 class ConfigCreateParams(TypedDict, total=False):
     account_id: Required[str]
 
-    body: Required[object]
+    default_sampling: Required[float]
+    """Fallback sampling rate of flow messages being sent in packets per second.
+
+    This should match the packet sampling rate configured on the router.
+    """
+
+    name: Required[str]
+    """The account name."""
+
+    router_ips: SequenceNotStr[str]
+
+    warp_devices: Iterable[WARPDevice]
+
+
+class WARPDevice(TypedDict, total=False):
+    """Object representing a warp device with an ID and name."""
+
+    id: Required[str]
+    """Unique identifier for the warp device."""
+
+    name: Required[str]
+    """Name of the warp device."""
+
+    router_ip: Required[str]
+    """IPv4 CIDR of the router sourcing flow data associated with this warp device.
+
+    Only /32 addresses are currently supported.
+    """
diff --git a/src/cloudflare/types/magic_network_monitoring/config_edit_params.py b/src/cloudflare/types/magic_network_monitoring/config_edit_params.py
index f02fba5f3d2..4248ff62f9d 100644
--- a/src/cloudflare/types/magic_network_monitoring/config_edit_params.py
+++ b/src/cloudflare/types/magic_network_monitoring/config_edit_params.py
@@ -2,12 +2,42 @@
 
 from __future__ import annotations
 
+from typing import Iterable
 from typing_extensions import Required, TypedDict
 
-__all__ = ["ConfigEditParams"]
+from ..._types import SequenceNotStr
+
+__all__ = ["ConfigEditParams", "WARPDevice"]
 
 
 class ConfigEditParams(TypedDict, total=False):
     account_id: Required[str]
 
-    body: Required[object]
+    default_sampling: float
+    """Fallback sampling rate of flow messages being sent in packets per second.
+
+    This should match the packet sampling rate configured on the router.
+    """
+
+    name: str
+    """The account name."""
+
+    router_ips: SequenceNotStr[str]
+
+    warp_devices: Iterable[WARPDevice]
+
+
+class WARPDevice(TypedDict, total=False):
+    """Object representing a warp device with an ID and name."""
+
+    id: Required[str]
+    """Unique identifier for the warp device."""
+
+    name: Required[str]
+    """Name of the warp device."""
+
+    router_ip: Required[str]
+    """IPv4 CIDR of the router sourcing flow data associated with this warp device.
+
+    Only /32 addresses are currently supported.
+    """
diff --git a/src/cloudflare/types/magic_network_monitoring/config_update_params.py b/src/cloudflare/types/magic_network_monitoring/config_update_params.py
index acfef585f57..04530d1c37a 100644
--- a/src/cloudflare/types/magic_network_monitoring/config_update_params.py
+++ b/src/cloudflare/types/magic_network_monitoring/config_update_params.py
@@ -2,12 +2,42 @@
 
 from __future__ import annotations
 
+from typing import Iterable
 from typing_extensions import Required, TypedDict
 
-__all__ = ["ConfigUpdateParams"]
+from ..._types import SequenceNotStr
+
+__all__ = ["ConfigUpdateParams", "WARPDevice"]
 
 
 class ConfigUpdateParams(TypedDict, total=False):
     account_id: Required[str]
 
-    body: Required[object]
+    default_sampling: Required[float]
+    """Fallback sampling rate of flow messages being sent in packets per second.
+
+    This should match the packet sampling rate configured on the router.
+    """
+
+    name: Required[str]
+    """The account name."""
+
+    router_ips: SequenceNotStr[str]
+
+    warp_devices: Iterable[WARPDevice]
+
+
+class WARPDevice(TypedDict, total=False):
+    """Object representing a warp device with an ID and name."""
+
+    id: Required[str]
+    """Unique identifier for the warp device."""
+
+    name: Required[str]
+    """Name of the warp device."""
+
+    router_ip: Required[str]
+    """IPv4 CIDR of the router sourcing flow data associated with this warp device.
+
+    Only /32 addresses are currently supported.
+    """
diff --git a/src/cloudflare/types/magic_network_monitoring/configuration.py b/src/cloudflare/types/magic_network_monitoring/configuration.py
index 46f5e0a2d83..3071ea02caa 100644
--- a/src/cloudflare/types/magic_network_monitoring/configuration.py
+++ b/src/cloudflare/types/magic_network_monitoring/configuration.py
@@ -4,7 +4,23 @@
 
 from ..._models import BaseModel
 
-__all__ = ["Configuration"]
+__all__ = ["Configuration", "WARPDevice"]
+
+
+class WARPDevice(BaseModel):
+    """Object representing a warp device with an ID and name."""
+
+    id: str
+    """Unique identifier for the warp device."""
+
+    name: str
+    """Name of the warp device."""
+
+    router_ip: str
+    """IPv4 CIDR of the router sourcing flow data associated with this warp device.
+
+    Only /32 addresses are currently supported.
+    """
 
 
 class Configuration(BaseModel):
@@ -18,3 +34,5 @@ class Configuration(BaseModel):
     """The account name."""
 
     router_ips: List[str]
+
+    warp_devices: List[WARPDevice]
diff --git a/src/cloudflare/types/magic_network_monitoring/magic_network_monitoring_rule.py b/src/cloudflare/types/magic_network_monitoring/magic_network_monitoring_rule.py
index 3dbb9d85afa..b9e8c6d7023 100644
--- a/src/cloudflare/types/magic_network_monitoring/magic_network_monitoring_rule.py
+++ b/src/cloudflare/types/magic_network_monitoring/magic_network_monitoring_rule.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
+from typing_extensions import Literal
 
 from ..._models import BaseModel
 
@@ -15,15 +16,6 @@ class MagicNetworkMonitoringRule(BaseModel):
     available for users of Magic Transit.
     """
 
-    duration: str
-    """
-    The amount of time that the rule threshold must be exceeded to send an alert
-    notification. The final value must be equivalent to one of the following 8
-    values ["1m","5m","10m","15m","20m","30m","45m","60m"]. The format is
-    AhBmCsDmsEusFns where A, B, C, D, E and F durations are optional; however at
-    least one unit must be provided.
-    """
-
     name: str
     """The name of the rule.
 
@@ -34,6 +26,9 @@ class MagicNetworkMonitoringRule(BaseModel):
 
     prefixes: List[str]
 
+    type: Literal["threshold", "zscore", "advanced_ddos"]
+    """MNM rule type."""
+
     id: Optional[str] = None
     """The id of the rule. Must be unique."""
 
@@ -44,9 +39,28 @@ class MagicNetworkMonitoringRule(BaseModel):
     Minimum of 1 and no maximum.
     """
 
+    duration: Optional[Literal["1m", "5m", "10m", "15m", "20m", "30m", "45m", "60m"]] = None
+    """
+    The amount of time that the rule threshold must be exceeded to send an alert
+    notification. The final value must be equivalent to one of the following 8
+    values ["1m","5m","10m","15m","20m","30m","45m","60m"].
+    """
+
     packet_threshold: Optional[float] = None
     """The number of packets per second for the rule.
 
     When this value is exceeded for the set duration, an alert notification is sent.
     Minimum of 1 and no maximum.
     """
+
+    prefix_match: Optional[Literal["exact", "subnet", "supernet"]] = None
+    """
+    Prefix match type to be applied for a prefix auto advertisement when using an
+    advanced_ddos rule.
+    """
+
+    zscore_sensitivity: Optional[Literal["low", "medium", "high"]] = None
+    """Level of sensitivity set for zscore rules."""
+
+    zscore_target: Optional[Literal["bits", "packets"]] = None
+    """Target of the zscore rule analysis."""
diff --git a/src/cloudflare/types/magic_network_monitoring/rule_create_params.py b/src/cloudflare/types/magic_network_monitoring/rule_create_params.py
index dd4c5f4092f..a5e82d0afa4 100644
--- a/src/cloudflare/types/magic_network_monitoring/rule_create_params.py
+++ b/src/cloudflare/types/magic_network_monitoring/rule_create_params.py
@@ -2,7 +2,10 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import Optional
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
 
 __all__ = ["RuleCreateParams"]
 
@@ -10,4 +13,40 @@
 class RuleCreateParams(TypedDict, total=False):
     account_id: Required[str]
 
-    body: Required[object]
+    duration: Required[Literal["1m", "5m", "10m", "15m", "20m", "30m", "45m", "60m"]]
+    """
+    The amount of time that the rule threshold must be exceeded to send an alert
+    notification. The final value must be equivalent to one of the following 8
+    values ["1m","5m","10m","15m","20m","30m","45m","60m"].
+    """
+
+    name: Required[str]
+    """The name of the rule.
+
+    Must be unique. Supports characters A-Z, a-z, 0-9, underscore (\\__), dash (-),
+    period (.), and tilde (~). You can’t have a space in the rule name. Max 256
+    characters.
+    """
+
+    automatic_advertisement: Optional[bool]
+    """
+    Toggle on if you would like Cloudflare to automatically advertise the IP
+    Prefixes within the rule via Magic Transit when the rule is triggered. Only
+    available for users of Magic Transit.
+    """
+
+    bandwidth: float
+    """The number of bits per second for the rule.
+
+    When this value is exceeded for the set duration, an alert notification is sent.
+    Minimum of 1 and no maximum.
+    """
+
+    packet_threshold: float
+    """The number of packets per second for the rule.
+
+    When this value is exceeded for the set duration, an alert notification is sent.
+    Minimum of 1 and no maximum.
+    """
+
+    prefixes: SequenceNotStr[str]
diff --git a/src/cloudflare/types/magic_network_monitoring/rule_edit_params.py b/src/cloudflare/types/magic_network_monitoring/rule_edit_params.py
index 005bdbb0ad5..83638877c6b 100644
--- a/src/cloudflare/types/magic_network_monitoring/rule_edit_params.py
+++ b/src/cloudflare/types/magic_network_monitoring/rule_edit_params.py
@@ -2,7 +2,10 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import Optional
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
 
 __all__ = ["RuleEditParams"]
 
@@ -10,4 +13,40 @@
 class RuleEditParams(TypedDict, total=False):
     account_id: Required[str]
 
-    body: Required[object]
+    automatic_advertisement: Optional[bool]
+    """
+    Toggle on if you would like Cloudflare to automatically advertise the IP
+    Prefixes within the rule via Magic Transit when the rule is triggered. Only
+    available for users of Magic Transit.
+    """
+
+    bandwidth: float
+    """The number of bits per second for the rule.
+
+    When this value is exceeded for the set duration, an alert notification is sent.
+    Minimum of 1 and no maximum.
+    """
+
+    duration: Literal["1m", "5m", "10m", "15m", "20m", "30m", "45m", "60m"]
+    """
+    The amount of time that the rule threshold must be exceeded to send an alert
+    notification. The final value must be equivalent to one of the following 8
+    values ["1m","5m","10m","15m","20m","30m","45m","60m"].
+    """
+
+    name: str
+    """The name of the rule.
+
+    Must be unique. Supports characters A-Z, a-z, 0-9, underscore (\\__), dash (-),
+    period (.), and tilde (~). You can’t have a space in the rule name. Max 256
+    characters.
+    """
+
+    packet_threshold: float
+    """The number of packets per second for the rule.
+
+    When this value is exceeded for the set duration, an alert notification is sent.
+    Minimum of 1 and no maximum.
+    """
+
+    prefixes: SequenceNotStr[str]
diff --git a/src/cloudflare/types/magic_network_monitoring/rule_update_params.py b/src/cloudflare/types/magic_network_monitoring/rule_update_params.py
index d9ae09df664..c6a2dc39047 100644
--- a/src/cloudflare/types/magic_network_monitoring/rule_update_params.py
+++ b/src/cloudflare/types/magic_network_monitoring/rule_update_params.py
@@ -2,7 +2,10 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import Optional
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
 
 __all__ = ["RuleUpdateParams"]
 
@@ -10,4 +13,43 @@
 class RuleUpdateParams(TypedDict, total=False):
     account_id: Required[str]
 
-    body: Required[object]
+    duration: Required[Literal["1m", "5m", "10m", "15m", "20m", "30m", "45m", "60m"]]
+    """
+    The amount of time that the rule threshold must be exceeded to send an alert
+    notification. The final value must be equivalent to one of the following 8
+    values ["1m","5m","10m","15m","20m","30m","45m","60m"].
+    """
+
+    name: Required[str]
+    """The name of the rule.
+
+    Must be unique. Supports characters A-Z, a-z, 0-9, underscore (\\__), dash (-),
+    period (.), and tilde (~). You can’t have a space in the rule name. Max 256
+    characters.
+    """
+
+    id: str
+    """The id of the rule. Must be unique."""
+
+    automatic_advertisement: Optional[bool]
+    """
+    Toggle on if you would like Cloudflare to automatically advertise the IP
+    Prefixes within the rule via Magic Transit when the rule is triggered. Only
+    available for users of Magic Transit.
+    """
+
+    bandwidth: float
+    """The number of bits per second for the rule.
+
+    When this value is exceeded for the set duration, an alert notification is sent.
+    Minimum of 1 and no maximum.
+    """
+
+    packet_threshold: float
+    """The number of packets per second for the rule.
+
+    When this value is exceeded for the set duration, an alert notification is sent.
+    Minimum of 1 and no maximum.
+    """
+
+    prefixes: SequenceNotStr[str]
diff --git a/src/cloudflare/types/magic_network_monitoring/vpc_flows/__init__.py b/src/cloudflare/types/magic_network_monitoring/vpc_flows/__init__.py
new file mode 100644
index 00000000000..a50c944db8f
--- /dev/null
+++ b/src/cloudflare/types/magic_network_monitoring/vpc_flows/__init__.py
@@ -0,0 +1,5 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .token_create_response import TokenCreateResponse as TokenCreateResponse
diff --git a/src/cloudflare/types/magic_network_monitoring/vpc_flows/token_create_response.py b/src/cloudflare/types/magic_network_monitoring/vpc_flows/token_create_response.py
new file mode 100644
index 00000000000..58d33dba745
--- /dev/null
+++ b/src/cloudflare/types/magic_network_monitoring/vpc_flows/token_create_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["TokenCreateResponse"]
+
+TokenCreateResponse: TypeAlias = str
diff --git a/src/cloudflare/types/magic_transit/__init__.py b/src/cloudflare/types/magic_transit/__init__.py
index ad2327c5724..700b72f955b 100644
--- a/src/cloudflare/types/magic_transit/__init__.py
+++ b/src/cloudflare/types/magic_transit/__init__.py
@@ -2,20 +2,28 @@
 
 from __future__ import annotations
 
+from .pcap import PCAP as PCAP
 from .site import Site as Site
 from .scope import Scope as Scope
+from .pcap_filter import PCAPFilter as PCAPFilter
 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 .app_edit_params import AppEditParams as AppEditParams
 from .site_edit_params import SiteEditParams as SiteEditParams
 from .site_list_params import SiteListParams as SiteListParams
 from .app_create_params import AppCreateParams as AppCreateParams
+from .app_edit_response import AppEditResponse as AppEditResponse
 from .app_list_response import AppListResponse as AppListResponse
 from .app_update_params import AppUpdateParams as AppUpdateParams
 from .health_check_rate import HealthCheckRate as HealthCheckRate
 from .health_check_type import HealthCheckType as HealthCheckType
+from .pcap_filter_param import PCAPFilterParam as PCAPFilterParam
+from .pcap_get_response import PCAPGetResponse as PCAPGetResponse
 from .health_check_param import HealthCheckParam as HealthCheckParam
+from .pcap_create_params import PCAPCreateParams as PCAPCreateParams
+from .pcap_list_response import PCAPListResponse as PCAPListResponse
 from .route_get_response import RouteGetResponse as RouteGetResponse
 from .site_create_params import SiteCreateParams as SiteCreateParams
 from .site_update_params import SiteUpdateParams as SiteUpdateParams
@@ -26,12 +34,14 @@
 from .route_list_response import RouteListResponse as RouteListResponse
 from .route_update_params import RouteUpdateParams as RouteUpdateParams
 from .site_location_param import SiteLocationParam as SiteLocationParam
+from .pcap_create_response import PCAPCreateResponse as PCAPCreateResponse
 from .route_empty_response import RouteEmptyResponse as RouteEmptyResponse
 from .connector_edit_params import ConnectorEditParams as ConnectorEditParams
 from .route_create_response import RouteCreateResponse as RouteCreateResponse
 from .route_delete_response import RouteDeleteResponse as RouteDeleteResponse
 from .route_update_response import RouteUpdateResponse as RouteUpdateResponse
 from .connector_get_response import ConnectorGetResponse as ConnectorGetResponse
+from .connector_create_params import ConnectorCreateParams as ConnectorCreateParams
 from .connector_edit_response import ConnectorEditResponse as ConnectorEditResponse
 from .connector_list_response import ConnectorListResponse as ConnectorListResponse
 from .connector_update_params import ConnectorUpdateParams as ConnectorUpdateParams
@@ -39,6 +49,9 @@
 from .gre_tunnel_create_params import GRETunnelCreateParams as GRETunnelCreateParams
 from .gre_tunnel_list_response import GRETunnelListResponse as GRETunnelListResponse
 from .gre_tunnel_update_params import GRETunnelUpdateParams as GRETunnelUpdateParams
+from .route_bulk_update_params import RouteBulkUpdateParams as RouteBulkUpdateParams
+from .connector_create_response import ConnectorCreateResponse as ConnectorCreateResponse
+from .connector_delete_response import ConnectorDeleteResponse as ConnectorDeleteResponse
 from .connector_update_response import ConnectorUpdateResponse as ConnectorUpdateResponse
 from .ipsec_tunnel_get_response import IPSECTunnelGetResponse as IPSECTunnelGetResponse
 from .gre_tunnel_create_response import GRETunnelCreateResponse as GRETunnelCreateResponse
@@ -47,12 +60,19 @@
 from .ipsec_tunnel_create_params import IPSECTunnelCreateParams as IPSECTunnelCreateParams
 from .ipsec_tunnel_list_response import IPSECTunnelListResponse as IPSECTunnelListResponse
 from .ipsec_tunnel_update_params import IPSECTunnelUpdateParams as IPSECTunnelUpdateParams
+from .route_bulk_update_response import RouteBulkUpdateResponse as RouteBulkUpdateResponse
 from .cf_interconnect_get_response import CfInterconnectGetResponse as CfInterconnectGetResponse
 from .ipsec_tunnel_create_response import IPSECTunnelCreateResponse as IPSECTunnelCreateResponse
 from .ipsec_tunnel_delete_response import IPSECTunnelDeleteResponse as IPSECTunnelDeleteResponse
 from .ipsec_tunnel_update_response import IPSECTunnelUpdateResponse as IPSECTunnelUpdateResponse
 from .cf_interconnect_list_response import CfInterconnectListResponse as CfInterconnectListResponse
 from .cf_interconnect_update_params import CfInterconnectUpdateParams as CfInterconnectUpdateParams
+from .gre_tunnel_bulk_update_params import GRETunnelBulkUpdateParams as GRETunnelBulkUpdateParams
 from .cf_interconnect_update_response import CfInterconnectUpdateResponse as CfInterconnectUpdateResponse
+from .gre_tunnel_bulk_update_response import GRETunnelBulkUpdateResponse as GRETunnelBulkUpdateResponse
+from .ipsec_tunnel_bulk_update_params import IPSECTunnelBulkUpdateParams as IPSECTunnelBulkUpdateParams
 from .ipsec_tunnel_psk_generate_params import IPSECTunnelPSKGenerateParams as IPSECTunnelPSKGenerateParams
+from .ipsec_tunnel_bulk_update_response import IPSECTunnelBulkUpdateResponse as IPSECTunnelBulkUpdateResponse
+from .cf_interconnect_bulk_update_params import CfInterconnectBulkUpdateParams as CfInterconnectBulkUpdateParams
 from .ipsec_tunnel_psk_generate_response import IPSECTunnelPSKGenerateResponse as IPSECTunnelPSKGenerateResponse
+from .cf_interconnect_bulk_update_response import CfInterconnectBulkUpdateResponse as CfInterconnectBulkUpdateResponse
diff --git a/src/cloudflare/types/magic_transit/app_create_params.py b/src/cloudflare/types/magic_transit/app_create_params.py
index 663405d69c1..06e6ea07417 100644
--- a/src/cloudflare/types/magic_transit/app_create_params.py
+++ b/src/cloudflare/types/magic_transit/app_create_params.py
@@ -2,24 +2,28 @@
 
 from __future__ import annotations
 
-from typing import Union
 from typing_extensions import Required, TypedDict
 
-__all__ = ["AppCreateParams", "Hostnames", "Subnets"]
+from ..._types import SequenceNotStr
 
+__all__ = ["AppCreateParams"]
 
-class Hostnames(TypedDict, total=False):
+
+class AppCreateParams(TypedDict, total=False):
     account_id: Required[str]
     """Identifier"""
 
-    body: Required[object]
-
+    name: Required[str]
+    """Display name for the app."""
 
-class Subnets(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
+    type: Required[str]
+    """Category of the app."""
 
-    body: Required[object]
+    hostnames: SequenceNotStr[str]
+    """FQDNs to associate with traffic decisions."""
 
+    ip_subnets: SequenceNotStr[str]
+    """IPv4 CIDRs to associate with traffic decisions.
 
-AppCreateParams = Union[Hostnames, Subnets]
+    (IPv6 CIDRs are currently unsupported)
+    """
diff --git a/src/cloudflare/types/magic_transit/app_create_response.py b/src/cloudflare/types/magic_transit/app_create_response.py
index 109887e4753..9dc78cc85e0 100644
--- a/src/cloudflare/types/magic_transit/app_create_response.py
+++ b/src/cloudflare/types/magic_transit/app_create_response.py
@@ -8,6 +8,8 @@
 
 
 class AppCreateResponse(BaseModel):
+    """Custom app defined for an account."""
+
     account_app_id: str
     """Magic account app ID."""
 
@@ -15,7 +17,10 @@ class AppCreateResponse(BaseModel):
     """FQDNs to associate with traffic decisions."""
 
     ip_subnets: Optional[List[str]] = None
-    """CIDRs to associate with traffic decisions."""
+    """IPv4 CIDRs to associate with traffic decisions.
+
+    (IPv6 CIDRs are currently unsupported)
+    """
 
     name: Optional[str] = None
     """Display name for the app."""
diff --git a/src/cloudflare/types/magic_transit/app_delete_response.py b/src/cloudflare/types/magic_transit/app_delete_response.py
index 0eafc15562c..034a9d740ed 100644
--- a/src/cloudflare/types/magic_transit/app_delete_response.py
+++ b/src/cloudflare/types/magic_transit/app_delete_response.py
@@ -8,6 +8,8 @@
 
 
 class AppDeleteResponse(BaseModel):
+    """Custom app defined for an account."""
+
     account_app_id: str
     """Magic account app ID."""
 
@@ -15,7 +17,10 @@ class AppDeleteResponse(BaseModel):
     """FQDNs to associate with traffic decisions."""
 
     ip_subnets: Optional[List[str]] = None
-    """CIDRs to associate with traffic decisions."""
+    """IPv4 CIDRs to associate with traffic decisions.
+
+    (IPv6 CIDRs are currently unsupported)
+    """
 
     name: Optional[str] = None
     """Display name for the app."""
diff --git a/src/cloudflare/types/magic_transit/app_edit_params.py b/src/cloudflare/types/magic_transit/app_edit_params.py
new file mode 100644
index 00000000000..8d0052ab142
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/app_edit_params.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["AppEditParams"]
+
+
+class AppEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier"""
+
+    hostnames: SequenceNotStr[str]
+    """FQDNs to associate with traffic decisions."""
+
+    ip_subnets: SequenceNotStr[str]
+    """IPv4 CIDRs to associate with traffic decisions.
+
+    (IPv6 CIDRs are currently unsupported)
+    """
+
+    name: str
+    """Display name for the app."""
+
+    type: str
+    """Category of the app."""
diff --git a/src/cloudflare/types/magic_transit/app_edit_response.py b/src/cloudflare/types/magic_transit/app_edit_response.py
new file mode 100644
index 00000000000..da5bda564f6
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/app_edit_response.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["AppEditResponse"]
+
+
+class AppEditResponse(BaseModel):
+    """Custom app defined for an account."""
+
+    account_app_id: str
+    """Magic account app ID."""
+
+    hostnames: Optional[List[str]] = None
+    """FQDNs to associate with traffic decisions."""
+
+    ip_subnets: Optional[List[str]] = None
+    """IPv4 CIDRs to associate with traffic decisions.
+
+    (IPv6 CIDRs are currently unsupported)
+    """
+
+    name: Optional[str] = None
+    """Display name for the app."""
+
+    type: Optional[str] = None
+    """Category of the app."""
diff --git a/src/cloudflare/types/magic_transit/app_list_response.py b/src/cloudflare/types/magic_transit/app_list_response.py
index a7ef5d8cbd3..4698cdc6883 100644
--- a/src/cloudflare/types/magic_transit/app_list_response.py
+++ b/src/cloudflare/types/magic_transit/app_list_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Union, Optional
+from typing_extensions import TypeAlias
 
 from ..._models import BaseModel
 
@@ -8,6 +9,8 @@
 
 
 class MagicAccountApp(BaseModel):
+    """Custom app defined for an account."""
+
     account_app_id: str
     """Magic account app ID."""
 
@@ -15,7 +18,10 @@ class MagicAccountApp(BaseModel):
     """FQDNs to associate with traffic decisions."""
 
     ip_subnets: Optional[List[str]] = None
-    """CIDRs to associate with traffic decisions."""
+    """IPv4 CIDRs to associate with traffic decisions.
+
+    (IPv6 CIDRs are currently unsupported)
+    """
 
     name: Optional[str] = None
     """Display name for the app."""
@@ -25,6 +31,8 @@ class MagicAccountApp(BaseModel):
 
 
 class MagicManagedApp(BaseModel):
+    """Managed app defined by Cloudflare."""
+
     managed_app_id: str
     """Managed app ID."""
 
@@ -32,7 +40,10 @@ class MagicManagedApp(BaseModel):
     """FQDNs to associate with traffic decisions."""
 
     ip_subnets: Optional[List[str]] = None
-    """CIDRs to associate with traffic decisions."""
+    """IPv4 CIDRs to associate with traffic decisions.
+
+    (IPv6 CIDRs are currently unsupported)
+    """
 
     name: Optional[str] = None
     """Display name for the app."""
@@ -41,4 +52,4 @@ class MagicManagedApp(BaseModel):
     """Category of the app."""
 
 
-AppListResponse = Union[MagicAccountApp, MagicManagedApp]
+AppListResponse: TypeAlias = Union[MagicAccountApp, MagicManagedApp]
diff --git a/src/cloudflare/types/magic_transit/app_update_params.py b/src/cloudflare/types/magic_transit/app_update_params.py
index 4aa43a96678..4ae6f412734 100644
--- a/src/cloudflare/types/magic_transit/app_update_params.py
+++ b/src/cloudflare/types/magic_transit/app_update_params.py
@@ -2,38 +2,28 @@
 
 from __future__ import annotations
 
-from typing import Union
 from typing_extensions import Required, TypedDict
 
-__all__ = ["AppUpdateParams", "UpdateAppName", "UpdateAppType", "UpdateAppHostnames", "UpdateAppSubnets"]
+from ..._types import SequenceNotStr
 
-
-class UpdateAppName(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    body: Required[object]
-
-
-class UpdateAppType(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    body: Required[object]
+__all__ = ["AppUpdateParams"]
 
 
-class UpdateAppHostnames(TypedDict, total=False):
+class AppUpdateParams(TypedDict, total=False):
     account_id: Required[str]
     """Identifier"""
 
-    body: Required[object]
+    hostnames: SequenceNotStr[str]
+    """FQDNs to associate with traffic decisions."""
 
+    ip_subnets: SequenceNotStr[str]
+    """IPv4 CIDRs to associate with traffic decisions.
 
-class UpdateAppSubnets(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    body: Required[object]
+    (IPv6 CIDRs are currently unsupported)
+    """
 
+    name: str
+    """Display name for the app."""
 
-AppUpdateParams = Union[UpdateAppName, UpdateAppType, UpdateAppHostnames, UpdateAppSubnets]
+    type: str
+    """Category of the app."""
diff --git a/src/cloudflare/types/magic_transit/app_update_response.py b/src/cloudflare/types/magic_transit/app_update_response.py
index fb98877f021..b32d7944666 100644
--- a/src/cloudflare/types/magic_transit/app_update_response.py
+++ b/src/cloudflare/types/magic_transit/app_update_response.py
@@ -8,6 +8,8 @@
 
 
 class AppUpdateResponse(BaseModel):
+    """Custom app defined for an account."""
+
     account_app_id: str
     """Magic account app ID."""
 
@@ -15,7 +17,10 @@ class AppUpdateResponse(BaseModel):
     """FQDNs to associate with traffic decisions."""
 
     ip_subnets: Optional[List[str]] = None
-    """CIDRs to associate with traffic decisions."""
+    """IPv4 CIDRs to associate with traffic decisions.
+
+    (IPv6 CIDRs are currently unsupported)
+    """
 
     name: Optional[str] = None
     """Display name for the app."""
diff --git a/src/cloudflare/types/magic_transit/cf_interconnect_bulk_update_params.py b/src/cloudflare/types/magic_transit/cf_interconnect_bulk_update_params.py
new file mode 100644
index 00000000000..ab9e94f12de
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/cf_interconnect_bulk_update_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["CfInterconnectBulkUpdateParams"]
+
+
+class CfInterconnectBulkUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier"""
+
+    body: Required[object]
+
+    x_magic_new_hc_target: Annotated[bool, PropertyInfo(alias="x-magic-new-hc-target")]
diff --git a/src/cloudflare/types/magic_transit/cf_interconnect_bulk_update_response.py b/src/cloudflare/types/magic_transit/cf_interconnect_bulk_update_response.py
new file mode 100644
index 00000000000..db5fb9168b3
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/cf_interconnect_bulk_update_response.py
@@ -0,0 +1,77 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+from .health_check import HealthCheck
+
+__all__ = ["CfInterconnectBulkUpdateResponse", "ModifiedInterconnect", "ModifiedInterconnectGRE"]
+
+
+class ModifiedInterconnectGRE(BaseModel):
+    """The configuration specific to GRE interconnects."""
+
+    cloudflare_endpoint: Optional[str] = None
+    """
+    The IP address assigned to the Cloudflare side of the GRE tunnel created as part
+    of the Interconnect.
+    """
+
+
+class ModifiedInterconnect(BaseModel):
+    id: Optional[str] = None
+    """Identifier"""
+
+    automatic_return_routing: Optional[bool] = None
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
+    colo_name: Optional[str] = None
+    """The name of the interconnect. The name cannot share a name with other tunnels."""
+
+    created_on: Optional[datetime] = None
+    """The date and time the tunnel was created."""
+
+    description: Optional[str] = None
+    """An optional description of the interconnect."""
+
+    gre: Optional[ModifiedInterconnectGRE] = None
+    """The configuration specific to GRE interconnects."""
+
+    health_check: Optional[HealthCheck] = None
+
+    interface_address: Optional[str] = None
+    """
+    A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+    of the tunnel. Select the subnet from the following private IP space:
+    10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+    """
+
+    interface_address6: Optional[str] = None
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
+
+    modified_on: Optional[datetime] = None
+    """The date and time the tunnel was last modified."""
+
+    mtu: Optional[int] = None
+    """The Maximum Transmission Unit (MTU) in bytes for the interconnect.
+
+    The minimum value is 576.
+    """
+
+    name: Optional[str] = None
+    """The name of the interconnect. The name cannot share a name with other tunnels."""
+
+
+class CfInterconnectBulkUpdateResponse(BaseModel):
+    modified: Optional[bool] = None
+
+    modified_interconnects: Optional[List[ModifiedInterconnect]] = None
diff --git a/src/cloudflare/types/magic_transit/cf_interconnect_get_response.py b/src/cloudflare/types/magic_transit/cf_interconnect_get_response.py
index 1693571a82a..ac16d4dd925 100644
--- a/src/cloudflare/types/magic_transit/cf_interconnect_get_response.py
+++ b/src/cloudflare/types/magic_transit/cf_interconnect_get_response.py
@@ -1,11 +1,75 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from datetime import datetime
 
 from ..._models import BaseModel
+from .health_check import HealthCheck
 
-__all__ = ["CfInterconnectGetResponse"]
+__all__ = ["CfInterconnectGetResponse", "Interconnect", "InterconnectGRE"]
+
+
+class InterconnectGRE(BaseModel):
+    """The configuration specific to GRE interconnects."""
+
+    cloudflare_endpoint: Optional[str] = None
+    """
+    The IP address assigned to the Cloudflare side of the GRE tunnel created as part
+    of the Interconnect.
+    """
+
+
+class Interconnect(BaseModel):
+    id: Optional[str] = None
+    """Identifier"""
+
+    automatic_return_routing: Optional[bool] = None
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
+    colo_name: Optional[str] = None
+    """The name of the interconnect. The name cannot share a name with other tunnels."""
+
+    created_on: Optional[datetime] = None
+    """The date and time the tunnel was created."""
+
+    description: Optional[str] = None
+    """An optional description of the interconnect."""
+
+    gre: Optional[InterconnectGRE] = None
+    """The configuration specific to GRE interconnects."""
+
+    health_check: Optional[HealthCheck] = None
+
+    interface_address: Optional[str] = None
+    """
+    A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+    of the tunnel. Select the subnet from the following private IP space:
+    10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+    """
+
+    interface_address6: Optional[str] = None
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
+
+    modified_on: Optional[datetime] = None
+    """The date and time the tunnel was last modified."""
+
+    mtu: Optional[int] = None
+    """The Maximum Transmission Unit (MTU) in bytes for the interconnect.
+
+    The minimum value is 576.
+    """
+
+    name: Optional[str] = None
+    """The name of the interconnect. The name cannot share a name with other tunnels."""
 
 
 class CfInterconnectGetResponse(BaseModel):
-    interconnect: Optional[object] = None
+    interconnect: Optional[Interconnect] = None
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 38c321caba8..e253f51cd41 100644
--- a/src/cloudflare/types/magic_transit/cf_interconnect_list_response.py
+++ b/src/cloudflare/types/magic_transit/cf_interconnect_list_response.py
@@ -4,13 +4,14 @@
 from datetime import datetime
 
 from ..._models import BaseModel
-from .health_check_rate import HealthCheckRate
-from .health_check_type import HealthCheckType
+from .health_check import HealthCheck
 
-__all__ = ["CfInterconnectListResponse", "Interconnect", "InterconnectGRE", "InterconnectHealthCheck"]
+__all__ = ["CfInterconnectListResponse", "Interconnect", "InterconnectGRE"]
 
 
 class InterconnectGRE(BaseModel):
+    """The configuration specific to GRE interconnects."""
+
     cloudflare_endpoint: Optional[str] = None
     """
     The IP address assigned to the Cloudflare side of the GRE tunnel created as part
@@ -18,28 +19,15 @@ class InterconnectGRE(BaseModel):
     """
 
 
-class InterconnectHealthCheck(BaseModel):
-    enabled: Optional[bool] = None
-    """Determines whether to run healthchecks for a tunnel."""
-
-    rate: Optional[HealthCheckRate] = None
-    """How frequent the health check is run. The default value is `mid`."""
-
-    target: Optional[str] = None
-    """The destination address in a request type health check.
-
-    After the healthcheck is decapsulated at the customer end of the tunnel, the
-    ICMP echo will be forwarded to this address. This field defaults to
-    `customer_gre_endpoint address`.
-    """
-
-    type: Optional[HealthCheckType] = None
-    """The type of healthcheck to run, reply or request. The default value is `reply`."""
-
-
 class Interconnect(BaseModel):
     id: Optional[str] = None
-    """Tunnel identifier tag."""
+    """Identifier"""
+
+    automatic_return_routing: Optional[bool] = None
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
 
     colo_name: Optional[str] = None
     """The name of the interconnect. The name cannot share a name with other tunnels."""
@@ -53,7 +41,7 @@ class Interconnect(BaseModel):
     gre: Optional[InterconnectGRE] = None
     """The configuration specific to GRE interconnects."""
 
-    health_check: Optional[InterconnectHealthCheck] = None
+    health_check: Optional[HealthCheck] = None
 
     interface_address: Optional[str] = None
     """
@@ -62,6 +50,14 @@ class Interconnect(BaseModel):
     10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
     """
 
+    interface_address6: Optional[str] = None
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
+
     modified_on: Optional[datetime] = None
     """The date and time the tunnel was last modified."""
 
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 00fca27a8f2..046a14bc85b 100644
--- a/src/cloudflare/types/magic_transit/cf_interconnect_update_params.py
+++ b/src/cloudflare/types/magic_transit/cf_interconnect_update_params.py
@@ -2,25 +2,31 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing_extensions import Required, Annotated, TypedDict
 
-from .health_check_rate import HealthCheckRate
-from .health_check_type import HealthCheckType
+from ..._utils import PropertyInfo
+from .health_check_param import HealthCheckParam
 
-__all__ = ["CfInterconnectUpdateParams", "GRE", "HealthCheck"]
+__all__ = ["CfInterconnectUpdateParams", "GRE"]
 
 
 class CfInterconnectUpdateParams(TypedDict, total=False):
     account_id: Required[str]
     """Identifier"""
 
+    automatic_return_routing: bool
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
     description: str
     """An optional description of the interconnect."""
 
     gre: GRE
     """The configuration specific to GRE interconnects."""
 
-    health_check: HealthCheck
+    health_check: HealthCheckParam
 
     interface_address: str
     """
@@ -29,35 +35,28 @@ class CfInterconnectUpdateParams(TypedDict, total=False):
     10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
     """
 
+    interface_address6: str
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
+
     mtu: int
     """The Maximum Transmission Unit (MTU) in bytes for the interconnect.
 
     The minimum value is 576.
     """
 
+    x_magic_new_hc_target: Annotated[bool, PropertyInfo(alias="x-magic-new-hc-target")]
+
 
 class GRE(TypedDict, total=False):
+    """The configuration specific to GRE interconnects."""
+
     cloudflare_endpoint: str
     """
     The IP address assigned to the Cloudflare side of the GRE tunnel created as part
     of the Interconnect.
     """
-
-
-class HealthCheck(TypedDict, total=False):
-    enabled: bool
-    """Determines whether to run healthchecks for a tunnel."""
-
-    rate: HealthCheckRate
-    """How frequent the health check is run. The default value is `mid`."""
-
-    target: str
-    """The destination address in a request type health check.
-
-    After the healthcheck is decapsulated at the customer end of the tunnel, the
-    ICMP echo will be forwarded to this address. This field defaults to
-    `customer_gre_endpoint address`.
-    """
-
-    type: HealthCheckType
-    """The type of healthcheck to run, reply or request. The default value is `reply`."""
diff --git a/src/cloudflare/types/magic_transit/cf_interconnect_update_response.py b/src/cloudflare/types/magic_transit/cf_interconnect_update_response.py
index e21d22dbd40..8be80cf0d4f 100644
--- a/src/cloudflare/types/magic_transit/cf_interconnect_update_response.py
+++ b/src/cloudflare/types/magic_transit/cf_interconnect_update_response.py
@@ -1,13 +1,77 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from datetime import datetime
 
 from ..._models import BaseModel
+from .health_check import HealthCheck
 
-__all__ = ["CfInterconnectUpdateResponse"]
+__all__ = ["CfInterconnectUpdateResponse", "ModifiedInterconnect", "ModifiedInterconnectGRE"]
+
+
+class ModifiedInterconnectGRE(BaseModel):
+    """The configuration specific to GRE interconnects."""
+
+    cloudflare_endpoint: Optional[str] = None
+    """
+    The IP address assigned to the Cloudflare side of the GRE tunnel created as part
+    of the Interconnect.
+    """
+
+
+class ModifiedInterconnect(BaseModel):
+    id: Optional[str] = None
+    """Identifier"""
+
+    automatic_return_routing: Optional[bool] = None
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
+    colo_name: Optional[str] = None
+    """The name of the interconnect. The name cannot share a name with other tunnels."""
+
+    created_on: Optional[datetime] = None
+    """The date and time the tunnel was created."""
+
+    description: Optional[str] = None
+    """An optional description of the interconnect."""
+
+    gre: Optional[ModifiedInterconnectGRE] = None
+    """The configuration specific to GRE interconnects."""
+
+    health_check: Optional[HealthCheck] = None
+
+    interface_address: Optional[str] = None
+    """
+    A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+    of the tunnel. Select the subnet from the following private IP space:
+    10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+    """
+
+    interface_address6: Optional[str] = None
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
+
+    modified_on: Optional[datetime] = None
+    """The date and time the tunnel was last modified."""
+
+    mtu: Optional[int] = None
+    """The Maximum Transmission Unit (MTU) in bytes for the interconnect.
+
+    The minimum value is 576.
+    """
+
+    name: Optional[str] = None
+    """The name of the interconnect. The name cannot share a name with other tunnels."""
 
 
 class CfInterconnectUpdateResponse(BaseModel):
     modified: Optional[bool] = None
 
-    modified_interconnect: Optional[object] = None
+    modified_interconnect: Optional[ModifiedInterconnect] = None
diff --git a/src/cloudflare/types/magic_transit/connector_create_params.py b/src/cloudflare/types/magic_transit/connector_create_params.py
new file mode 100644
index 00000000000..f39191505a0
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/connector_create_params.py
@@ -0,0 +1,36 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ConnectorCreateParams", "Device"]
+
+
+class ConnectorCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier"""
+
+    device: Required[Device]
+    """Exactly one of id, serial_number, or provision_license must be provided."""
+
+    activated: bool
+
+    interrupt_window_duration_hours: float
+
+    interrupt_window_hour_of_day: float
+
+    notes: str
+
+    timezone: str
+
+
+class Device(TypedDict, total=False):
+    """Exactly one of id, serial_number, or provision_license must be provided."""
+
+    id: str
+
+    provision_license: bool
+    """When true, create and provision a new licence key for the connector."""
+
+    serial_number: str
diff --git a/src/cloudflare/types/magic_transit/connector_create_response.py b/src/cloudflare/types/magic_transit/connector_create_response.py
new file mode 100644
index 00000000000..9c0e39f9f1a
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/connector_create_response.py
@@ -0,0 +1,37 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["ConnectorCreateResponse", "Device"]
+
+
+class Device(BaseModel):
+    id: str
+
+    serial_number: Optional[str] = None
+
+
+class ConnectorCreateResponse(BaseModel):
+    id: str
+
+    activated: bool
+
+    interrupt_window_duration_hours: float
+
+    interrupt_window_hour_of_day: float
+
+    last_updated: str
+
+    notes: str
+
+    timezone: str
+
+    device: Optional[Device] = None
+
+    last_heartbeat: Optional[str] = None
+
+    last_seen_version: Optional[str] = None
+
+    license_key: Optional[str] = None
diff --git a/src/cloudflare/types/magic_transit/connector_delete_response.py b/src/cloudflare/types/magic_transit/connector_delete_response.py
new file mode 100644
index 00000000000..3337342f6aa
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/connector_delete_response.py
@@ -0,0 +1,37 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["ConnectorDeleteResponse", "Device"]
+
+
+class Device(BaseModel):
+    id: str
+
+    serial_number: Optional[str] = None
+
+
+class ConnectorDeleteResponse(BaseModel):
+    id: str
+
+    activated: bool
+
+    interrupt_window_duration_hours: float
+
+    interrupt_window_hour_of_day: float
+
+    last_updated: str
+
+    notes: str
+
+    timezone: str
+
+    device: Optional[Device] = None
+
+    last_heartbeat: Optional[str] = None
+
+    last_seen_version: Optional[str] = None
+
+    license_key: Optional[str] = None
diff --git a/src/cloudflare/types/magic_transit/connector_edit_params.py b/src/cloudflare/types/magic_transit/connector_edit_params.py
index da638c4e8a3..0f2e12db6c8 100644
--- a/src/cloudflare/types/magic_transit/connector_edit_params.py
+++ b/src/cloudflare/types/magic_transit/connector_edit_params.py
@@ -19,4 +19,7 @@ class ConnectorEditParams(TypedDict, total=False):
 
     notes: str
 
+    provision_license: bool
+    """When true, regenerate license key for the connector."""
+
     timezone: str
diff --git a/src/cloudflare/types/magic_transit/connector_edit_response.py b/src/cloudflare/types/magic_transit/connector_edit_response.py
index 47d29cef4a4..d7e96504124 100644
--- a/src/cloudflare/types/magic_transit/connector_edit_response.py
+++ b/src/cloudflare/types/magic_transit/connector_edit_response.py
@@ -33,3 +33,5 @@ class ConnectorEditResponse(BaseModel):
     last_heartbeat: Optional[str] = None
 
     last_seen_version: Optional[str] = None
+
+    license_key: Optional[str] = None
diff --git a/src/cloudflare/types/magic_transit/connector_get_response.py b/src/cloudflare/types/magic_transit/connector_get_response.py
index 6b36ed76687..bb1b53e6d78 100644
--- a/src/cloudflare/types/magic_transit/connector_get_response.py
+++ b/src/cloudflare/types/magic_transit/connector_get_response.py
@@ -33,3 +33,5 @@ class ConnectorGetResponse(BaseModel):
     last_heartbeat: Optional[str] = None
 
     last_seen_version: Optional[str] = None
+
+    license_key: Optional[str] = None
diff --git a/src/cloudflare/types/magic_transit/connector_list_response.py b/src/cloudflare/types/magic_transit/connector_list_response.py
index abad515443c..2de6b683db6 100644
--- a/src/cloudflare/types/magic_transit/connector_list_response.py
+++ b/src/cloudflare/types/magic_transit/connector_list_response.py
@@ -33,3 +33,5 @@ class ConnectorListResponse(BaseModel):
     last_heartbeat: Optional[str] = None
 
     last_seen_version: Optional[str] = None
+
+    license_key: Optional[str] = None
diff --git a/src/cloudflare/types/magic_transit/connector_update_params.py b/src/cloudflare/types/magic_transit/connector_update_params.py
index bce1d58116e..44529b716a5 100644
--- a/src/cloudflare/types/magic_transit/connector_update_params.py
+++ b/src/cloudflare/types/magic_transit/connector_update_params.py
@@ -19,4 +19,7 @@ class ConnectorUpdateParams(TypedDict, total=False):
 
     notes: str
 
+    provision_license: bool
+    """When true, regenerate license key for the connector."""
+
     timezone: str
diff --git a/src/cloudflare/types/magic_transit/connector_update_response.py b/src/cloudflare/types/magic_transit/connector_update_response.py
index 80f6a6a5198..6e6430b7df3 100644
--- a/src/cloudflare/types/magic_transit/connector_update_response.py
+++ b/src/cloudflare/types/magic_transit/connector_update_response.py
@@ -33,3 +33,5 @@ class ConnectorUpdateResponse(BaseModel):
     last_heartbeat: Optional[str] = None
 
     last_seen_version: Optional[str] = None
+
+    license_key: Optional[str] = None
diff --git a/src/cloudflare/types/magic_transit/connectors/__init__.py b/src/cloudflare/types/magic_transit/connectors/__init__.py
new file mode 100644
index 00000000000..97c4286eacf
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/connectors/__init__.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .event_list_params import EventListParams as EventListParams
+from .event_get_response import EventGetResponse as EventGetResponse
+from .event_list_response import EventListResponse as EventListResponse
+from .snapshot_list_params import SnapshotListParams as SnapshotListParams
+from .snapshot_get_response import SnapshotGetResponse as SnapshotGetResponse
+from .snapshot_list_response import SnapshotListResponse as SnapshotListResponse
diff --git a/src/cloudflare/types/magic_transit/connectors/event_get_response.py b/src/cloudflare/types/magic_transit/connectors/event_get_response.py
new file mode 100644
index 00000000000..298a3871759
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/connectors/event_get_response.py
@@ -0,0 +1,146 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Union
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from ...._utils import PropertyInfo
+from ...._models import BaseModel
+
+__all__ = [
+    "EventGetResponse",
+    "E",
+    "EInit",
+    "ELeave",
+    "EStartAttestation",
+    "EFinishAttestationSuccess",
+    "EFinishAttestationFailure",
+    "EStartRotateCryptKey",
+    "EFinishRotateCryptKeySuccess",
+    "EFinishRotateCryptKeyFailure",
+    "EStartRotatePki",
+    "EFinishRotatePkiSuccess",
+    "EFinishRotatePkiFailure",
+    "EStartUpgrade",
+    "EFinishUpgradeSuccess",
+    "EFinishUpgradeFailure",
+    "EReconcile",
+    "EConfigureCloudflaredTunnel",
+]
+
+
+class EInit(BaseModel):
+    k: Literal["Init"]
+    """Initialized process"""
+
+
+class ELeave(BaseModel):
+    k: Literal["Leave"]
+    """Stopped process"""
+
+
+class EStartAttestation(BaseModel):
+    k: Literal["StartAttestation"]
+    """Started attestation"""
+
+
+class EFinishAttestationSuccess(BaseModel):
+    k: Literal["FinishAttestationSuccess"]
+    """Finished attestation"""
+
+
+class EFinishAttestationFailure(BaseModel):
+    k: Literal["FinishAttestationFailure"]
+    """Failed attestation"""
+
+
+class EStartRotateCryptKey(BaseModel):
+    k: Literal["StartRotateCryptKey"]
+    """Started crypt key rotation"""
+
+
+class EFinishRotateCryptKeySuccess(BaseModel):
+    k: Literal["FinishRotateCryptKeySuccess"]
+    """Finished crypt key rotation"""
+
+
+class EFinishRotateCryptKeyFailure(BaseModel):
+    k: Literal["FinishRotateCryptKeyFailure"]
+    """Failed crypt key rotation"""
+
+
+class EStartRotatePki(BaseModel):
+    k: Literal["StartRotatePki"]
+    """Started PKI rotation"""
+
+
+class EFinishRotatePkiSuccess(BaseModel):
+    k: Literal["FinishRotatePkiSuccess"]
+    """Finished PKI rotation"""
+
+
+class EFinishRotatePkiFailure(BaseModel):
+    k: Literal["FinishRotatePkiFailure"]
+    """Failed PKI rotation"""
+
+
+class EStartUpgrade(BaseModel):
+    k: Literal["StartUpgrade"]
+    """Started upgrade"""
+
+    url: str
+    """Location of upgrade bundle"""
+
+
+class EFinishUpgradeSuccess(BaseModel):
+    k: Literal["FinishUpgradeSuccess"]
+    """Finished upgrade"""
+
+
+class EFinishUpgradeFailure(BaseModel):
+    k: Literal["FinishUpgradeFailure"]
+    """Failed upgrade"""
+
+
+class EReconcile(BaseModel):
+    k: Literal["Reconcile"]
+    """Reconciled"""
+
+
+class EConfigureCloudflaredTunnel(BaseModel):
+    k: Literal["ConfigureCloudflaredTunnel"]
+    """Configured Cloudflared tunnel"""
+
+
+E: TypeAlias = Annotated[
+    Union[
+        EInit,
+        ELeave,
+        EStartAttestation,
+        EFinishAttestationSuccess,
+        EFinishAttestationFailure,
+        EStartRotateCryptKey,
+        EFinishRotateCryptKeySuccess,
+        EFinishRotateCryptKeyFailure,
+        EStartRotatePki,
+        EFinishRotatePkiSuccess,
+        EFinishRotatePkiFailure,
+        EStartUpgrade,
+        EFinishUpgradeSuccess,
+        EFinishUpgradeFailure,
+        EReconcile,
+        EConfigureCloudflaredTunnel,
+    ],
+    PropertyInfo(discriminator="k"),
+]
+
+
+class EventGetResponse(BaseModel):
+    """Recorded Event"""
+
+    e: E
+
+    n: float
+    """Sequence number, used to order events with the same timestamp"""
+
+    t: float
+    """Time the Event was recorded (seconds since the Unix epoch)"""
diff --git a/src/cloudflare/types/magic_transit/connectors/event_list_params.py b/src/cloudflare/types/magic_transit/connectors/event_list_params.py
new file mode 100644
index 00000000000..b8ba2917823
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/connectors/event_list_params.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ...._utils import PropertyInfo
+
+__all__ = ["EventListParams"]
+
+
+class EventListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier"""
+
+    from_: Required[Annotated[float, PropertyInfo(alias="from")]]
+
+    to: Required[float]
+
+    cursor: str
+
+    k: str
+    """Filter by event kind"""
+
+    limit: float
diff --git a/src/cloudflare/types/magic_transit/connectors/event_list_response.py b/src/cloudflare/types/magic_transit/connectors/event_list_response.py
new file mode 100644
index 00000000000..79fcc858511
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/connectors/event_list_response.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ...._models import BaseModel
+
+__all__ = ["EventListResponse", "Item"]
+
+
+class Item(BaseModel):
+    a: float
+    """Time the Event was collected (seconds since the Unix epoch)"""
+
+    k: str
+    """Kind"""
+
+    n: float
+    """Sequence number, used to order events with the same timestamp"""
+
+    t: float
+    """Time the Event was recorded (seconds since the Unix epoch)"""
+
+
+class EventListResponse(BaseModel):
+    count: float
+
+    items: List[Item]
+
+    cursor: Optional[str] = None
diff --git a/src/cloudflare/types/magic_transit/connectors/events/__init__.py b/src/cloudflare/types/magic_transit/connectors/events/__init__.py
new file mode 100644
index 00000000000..92bf5533ae5
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/connectors/events/__init__.py
@@ -0,0 +1,5 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .latest_list_response import LatestListResponse as LatestListResponse
diff --git a/src/cloudflare/types/magic_transit/connectors/events/latest_list_response.py b/src/cloudflare/types/magic_transit/connectors/events/latest_list_response.py
new file mode 100644
index 00000000000..86030706ec1
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/connectors/events/latest_list_response.py
@@ -0,0 +1,153 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from ....._utils import PropertyInfo
+from ....._models import BaseModel
+
+__all__ = [
+    "LatestListResponse",
+    "Item",
+    "ItemE",
+    "ItemEInit",
+    "ItemELeave",
+    "ItemEStartAttestation",
+    "ItemEFinishAttestationSuccess",
+    "ItemEFinishAttestationFailure",
+    "ItemEStartRotateCryptKey",
+    "ItemEFinishRotateCryptKeySuccess",
+    "ItemEFinishRotateCryptKeyFailure",
+    "ItemEStartRotatePki",
+    "ItemEFinishRotatePkiSuccess",
+    "ItemEFinishRotatePkiFailure",
+    "ItemEStartUpgrade",
+    "ItemEFinishUpgradeSuccess",
+    "ItemEFinishUpgradeFailure",
+    "ItemEReconcile",
+    "ItemEConfigureCloudflaredTunnel",
+]
+
+
+class ItemEInit(BaseModel):
+    k: Literal["Init"]
+    """Initialized process"""
+
+
+class ItemELeave(BaseModel):
+    k: Literal["Leave"]
+    """Stopped process"""
+
+
+class ItemEStartAttestation(BaseModel):
+    k: Literal["StartAttestation"]
+    """Started attestation"""
+
+
+class ItemEFinishAttestationSuccess(BaseModel):
+    k: Literal["FinishAttestationSuccess"]
+    """Finished attestation"""
+
+
+class ItemEFinishAttestationFailure(BaseModel):
+    k: Literal["FinishAttestationFailure"]
+    """Failed attestation"""
+
+
+class ItemEStartRotateCryptKey(BaseModel):
+    k: Literal["StartRotateCryptKey"]
+    """Started crypt key rotation"""
+
+
+class ItemEFinishRotateCryptKeySuccess(BaseModel):
+    k: Literal["FinishRotateCryptKeySuccess"]
+    """Finished crypt key rotation"""
+
+
+class ItemEFinishRotateCryptKeyFailure(BaseModel):
+    k: Literal["FinishRotateCryptKeyFailure"]
+    """Failed crypt key rotation"""
+
+
+class ItemEStartRotatePki(BaseModel):
+    k: Literal["StartRotatePki"]
+    """Started PKI rotation"""
+
+
+class ItemEFinishRotatePkiSuccess(BaseModel):
+    k: Literal["FinishRotatePkiSuccess"]
+    """Finished PKI rotation"""
+
+
+class ItemEFinishRotatePkiFailure(BaseModel):
+    k: Literal["FinishRotatePkiFailure"]
+    """Failed PKI rotation"""
+
+
+class ItemEStartUpgrade(BaseModel):
+    k: Literal["StartUpgrade"]
+    """Started upgrade"""
+
+    url: str
+    """Location of upgrade bundle"""
+
+
+class ItemEFinishUpgradeSuccess(BaseModel):
+    k: Literal["FinishUpgradeSuccess"]
+    """Finished upgrade"""
+
+
+class ItemEFinishUpgradeFailure(BaseModel):
+    k: Literal["FinishUpgradeFailure"]
+    """Failed upgrade"""
+
+
+class ItemEReconcile(BaseModel):
+    k: Literal["Reconcile"]
+    """Reconciled"""
+
+
+class ItemEConfigureCloudflaredTunnel(BaseModel):
+    k: Literal["ConfigureCloudflaredTunnel"]
+    """Configured Cloudflared tunnel"""
+
+
+ItemE: TypeAlias = Annotated[
+    Union[
+        ItemEInit,
+        ItemELeave,
+        ItemEStartAttestation,
+        ItemEFinishAttestationSuccess,
+        ItemEFinishAttestationFailure,
+        ItemEStartRotateCryptKey,
+        ItemEFinishRotateCryptKeySuccess,
+        ItemEFinishRotateCryptKeyFailure,
+        ItemEStartRotatePki,
+        ItemEFinishRotatePkiSuccess,
+        ItemEFinishRotatePkiFailure,
+        ItemEStartUpgrade,
+        ItemEFinishUpgradeSuccess,
+        ItemEFinishUpgradeFailure,
+        ItemEReconcile,
+        ItemEConfigureCloudflaredTunnel,
+    ],
+    PropertyInfo(discriminator="k"),
+]
+
+
+class Item(BaseModel):
+    """Recorded Event"""
+
+    e: ItemE
+
+    n: float
+    """Sequence number, used to order events with the same timestamp"""
+
+    t: float
+    """Time the Event was recorded (seconds since the Unix epoch)"""
+
+
+class LatestListResponse(BaseModel):
+    count: float
+
+    items: List[Item]
diff --git a/src/cloudflare/types/magic_transit/connectors/snapshot_get_response.py b/src/cloudflare/types/magic_transit/connectors/snapshot_get_response.py
new file mode 100644
index 00000000000..f081d6cc605
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/connectors/snapshot_get_response.py
@@ -0,0 +1,822 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ...._models import BaseModel
+
+__all__ = [
+    "SnapshotGetResponse",
+    "Bond",
+    "DHCPLease",
+    "Disk",
+    "Interface",
+    "InterfaceIPAddress",
+    "Mount",
+    "Netdev",
+    "Thermal",
+    "Tunnel",
+]
+
+
+class Bond(BaseModel):
+    """Snapshot Bond"""
+
+    name: str
+    """Name of the network interface"""
+
+    status: str
+    """Current status of the network interface"""
+
+
+class DHCPLease(BaseModel):
+    """Snapshot DHCP lease"""
+
+    client_id: str
+    """Client ID of the device the IP Address was leased to"""
+
+    expiry_time: float
+    """Expiry time of the DHCP lease (seconds since the Unix epoch)"""
+
+    hostname: str
+    """Hostname of the device the IP Address was leased to"""
+
+    interface_name: str
+    """Name of the network interface"""
+
+    ip_address: str
+    """IP Address that was leased"""
+
+    mac_address: str
+    """MAC Address of the device the IP Address was leased to"""
+
+    connector_id: Optional[str] = None
+    """Connector identifier"""
+
+
+class Disk(BaseModel):
+    """Snapshot Disk"""
+
+    in_progress: float
+    """I/Os currently in progress"""
+
+    major: float
+    """Device major number"""
+
+    merged: float
+    """Reads merged"""
+
+    minor: float
+    """Device minor number"""
+
+    name: str
+    """Device name"""
+
+    reads: float
+    """Reads completed successfully"""
+
+    sectors_read: float
+    """Sectors read successfully"""
+
+    sectors_written: float
+    """Sectors written successfully"""
+
+    time_in_progress_ms: float
+    """Time spent doing I/Os (milliseconds)"""
+
+    time_reading_ms: float
+    """Time spent reading (milliseconds)"""
+
+    time_writing_ms: float
+    """Time spent writing (milliseconds)"""
+
+    weighted_time_in_progress_ms: float
+    """Weighted time spent doing I/Os (milliseconds)"""
+
+    writes: float
+    """Writes completed"""
+
+    writes_merged: float
+    """Writes merged"""
+
+    connector_id: Optional[str] = None
+    """Connector identifier"""
+
+    discards: Optional[float] = None
+    """Discards completed successfully"""
+
+    discards_merged: Optional[float] = None
+    """Discards merged"""
+
+    flushes: Optional[float] = None
+    """Flushes completed successfully"""
+
+    sectors_discarded: Optional[float] = None
+    """Sectors discarded"""
+
+    time_discarding_ms: Optional[float] = None
+    """Time spent discarding (milliseconds)"""
+
+    time_flushing_ms: Optional[float] = None
+    """Time spent flushing (milliseconds)"""
+
+
+class InterfaceIPAddress(BaseModel):
+    """Snapshot Interface Address"""
+
+    interface_name: str
+    """Name of the network interface"""
+
+    ip_address: str
+    """IP address of the network interface"""
+
+    connector_id: Optional[str] = None
+    """Connector identifier"""
+
+
+class Interface(BaseModel):
+    """Snapshot Interface"""
+
+    name: str
+    """Name of the network interface"""
+
+    operstate: str
+    """UP/DOWN state of the network interface"""
+
+    connector_id: Optional[str] = None
+    """Connector identifier"""
+
+    ip_addresses: Optional[List[InterfaceIPAddress]] = None
+
+    speed: Optional[float] = None
+    """Speed of the network interface (bits per second)"""
+
+
+class Mount(BaseModel):
+    """Snapshot Mount"""
+
+    file_system: str
+    """File system on disk (EXT4, NTFS, etc.)"""
+
+    kind: str
+    """Kind of disk (HDD, SSD, etc.)"""
+
+    mount_point: str
+    """Path where disk is mounted"""
+
+    name: str
+    """Name of the disk mount"""
+
+    available_bytes: Optional[float] = None
+    """Available disk size (bytes)"""
+
+    connector_id: Optional[str] = None
+    """Connector identifier"""
+
+    is_read_only: Optional[bool] = None
+    """Determines whether the disk is read-only"""
+
+    is_removable: Optional[bool] = None
+    """Determines whether the disk is removable"""
+
+    total_bytes: Optional[float] = None
+    """Total disk size (bytes)"""
+
+
+class Netdev(BaseModel):
+    """Snapshot Netdev"""
+
+    name: str
+    """Name of the network device"""
+
+    recv_bytes: float
+    """Total bytes received"""
+
+    recv_compressed: float
+    """Compressed packets received"""
+
+    recv_drop: float
+    """Packets dropped"""
+
+    recv_errs: float
+    """Bad packets received"""
+
+    recv_fifo: float
+    """FIFO overruns"""
+
+    recv_frame: float
+    """Frame alignment errors"""
+
+    recv_multicast: float
+    """Multicast packets received"""
+
+    recv_packets: float
+    """Total packets received"""
+
+    sent_bytes: float
+    """Total bytes transmitted"""
+
+    sent_carrier: float
+    """Number of packets not sent due to carrier errors"""
+
+    sent_colls: float
+    """Number of collisions"""
+
+    sent_compressed: float
+    """Number of compressed packets transmitted"""
+
+    sent_drop: float
+    """Number of packets dropped during transmission"""
+
+    sent_errs: float
+    """Number of transmission errors"""
+
+    sent_fifo: float
+    """FIFO overruns"""
+
+    sent_packets: float
+    """Total packets transmitted"""
+
+    connector_id: Optional[str] = None
+    """Connector identifier"""
+
+
+class Thermal(BaseModel):
+    """Snapshot Thermal"""
+
+    label: str
+    """Sensor identifier for the component"""
+
+    connector_id: Optional[str] = None
+    """Connector identifier"""
+
+    critical_celcius: Optional[float] = None
+    """Critical failure temperature of the component (degrees Celsius)"""
+
+    current_celcius: Optional[float] = None
+    """Current temperature of the component (degrees Celsius)"""
+
+    max_celcius: Optional[float] = None
+    """Maximum temperature of the component (degrees Celsius)"""
+
+
+class Tunnel(BaseModel):
+    """Snapshot Tunnels"""
+
+    health_state: str
+    """Name of tunnel health state (unknown, healthy, degraded, down)"""
+
+    health_value: float
+    """
+    Numeric value associated with tunnel state (0 = unknown, 1 = healthy, 2 =
+    degraded, 3 = down)
+    """
+
+    interface_name: str
+    """The tunnel interface name (i.e. xfrm1, xfrm3.99, etc.)"""
+
+    tunnel_id: str
+    """Tunnel identifier"""
+
+    connector_id: Optional[str] = None
+    """Connector identifier"""
+
+    probed_mtu: Optional[float] = None
+    """MTU as measured between the two ends of the tunnel"""
+
+    recent_healthy_pings: Optional[float] = None
+    """Number of recent healthy pings for this tunnel"""
+
+    recent_unhealthy_pings: Optional[float] = None
+    """Number of recent unhealthy pings for this tunnel"""
+
+
+class SnapshotGetResponse(BaseModel):
+    """Snapshot"""
+
+    count_reclaim_failures: float
+    """Count of failures to reclaim space"""
+
+    count_reclaimed_paths: float
+    """Count of reclaimed paths"""
+
+    count_record_failed: float
+    """Count of failed snapshot recordings"""
+
+    count_transmit_failures: float
+    """Count of failed snapshot transmissions"""
+
+    t: float
+    """Time the Snapshot was recorded (seconds since the Unix epoch)"""
+
+    v: str
+    """Version"""
+
+    bonds: Optional[List[Bond]] = None
+
+    cpu_count: Optional[float] = None
+    """Count of processors/cores"""
+
+    cpu_pressure_10s: Optional[float] = None
+    """Percentage of time over a 10 second window that tasks were stalled"""
+
+    cpu_pressure_300s: Optional[float] = None
+    """Percentage of time over a 5 minute window that tasks were stalled"""
+
+    cpu_pressure_60s: Optional[float] = None
+    """Percentage of time over a 1 minute window that tasks were stalled"""
+
+    cpu_pressure_total_us: Optional[float] = None
+    """Total stall time (microseconds)"""
+
+    cpu_time_guest_ms: Optional[float] = None
+    """Time spent running a virtual CPU or guest OS (milliseconds)"""
+
+    cpu_time_guest_nice_ms: Optional[float] = None
+    """Time spent running a niced guest (milliseconds)"""
+
+    cpu_time_idle_ms: Optional[float] = None
+    """Time spent in idle state (milliseconds)"""
+
+    cpu_time_iowait_ms: Optional[float] = None
+    """Time spent wait for I/O to complete (milliseconds)"""
+
+    cpu_time_irq_ms: Optional[float] = None
+    """Time spent servicing interrupts (milliseconds)"""
+
+    cpu_time_nice_ms: Optional[float] = None
+    """Time spent in low-priority user mode (milliseconds)"""
+
+    cpu_time_softirq_ms: Optional[float] = None
+    """Time spent servicing softirqs (milliseconds)"""
+
+    cpu_time_steal_ms: Optional[float] = None
+    """Time stolen (milliseconds)"""
+
+    cpu_time_system_ms: Optional[float] = None
+    """Time spent in system mode (milliseconds)"""
+
+    cpu_time_user_ms: Optional[float] = None
+    """Time spent in user mode (milliseconds)"""
+
+    dhcp_leases: Optional[List[DHCPLease]] = None
+
+    disks: Optional[List[Disk]] = None
+
+    ha_state: Optional[str] = None
+    """Name of high availability state"""
+
+    ha_value: Optional[float] = None
+    """
+    Numeric value associated with high availability state (0 = disabled, 1 = active,
+    2 = standby, 3 = stopped, 4 = fault)
+    """
+
+    interfaces: Optional[List[Interface]] = None
+
+    io_pressure_full_10s: Optional[float] = None
+    """Percentage of time over a 10 second window that all tasks were stalled"""
+
+    io_pressure_full_300s: Optional[float] = None
+    """Percentage of time over a 5 minute window that all tasks were stalled"""
+
+    io_pressure_full_60s: Optional[float] = None
+    """Percentage of time over a 1 minute window that all tasks were stalled"""
+
+    io_pressure_full_total_us: Optional[float] = None
+    """Total stall time (microseconds)"""
+
+    io_pressure_some_10s: Optional[float] = None
+    """Percentage of time over a 10 second window that some tasks were stalled"""
+
+    io_pressure_some_300s: Optional[float] = None
+    """Percentage of time over a 3 minute window that some tasks were stalled"""
+
+    io_pressure_some_60s: Optional[float] = None
+    """Percentage of time over a 1 minute window that some tasks were stalled"""
+
+    io_pressure_some_total_us: Optional[float] = None
+    """Total stall time (microseconds)"""
+
+    kernel_btime: Optional[float] = None
+    """Boot time (seconds since Unix epoch)"""
+
+    kernel_ctxt: Optional[float] = None
+    """Number of context switches that the system underwent"""
+
+    kernel_processes: Optional[float] = None
+    """Number of forks since boot"""
+
+    kernel_processes_blocked: Optional[float] = None
+    """Number of processes blocked waiting for I/O"""
+
+    kernel_processes_running: Optional[float] = None
+    """Number of processes in runnable state"""
+
+    load_average_15m: Optional[float] = None
+    """The fifteen-minute load average"""
+
+    load_average_1m: Optional[float] = None
+    """The one-minute load average"""
+
+    load_average_5m: Optional[float] = None
+    """The five-minute load average"""
+
+    load_average_cur: Optional[float] = None
+    """Number of currently runnable kernel scheduling entities"""
+
+    load_average_max: Optional[float] = None
+    """Number of kernel scheduling entities that currently exist on the system"""
+
+    memory_active_bytes: Optional[float] = None
+    """Memory that has been used more recently"""
+
+    memory_anon_hugepages_bytes: Optional[float] = None
+    """Non-file backed huge pages mapped into user-space page tables"""
+
+    memory_anon_pages_bytes: Optional[float] = None
+    """Non-file backed pages mapped into user-space page tables"""
+
+    memory_available_bytes: Optional[float] = None
+    """Estimate of how much memory is available for starting new applications"""
+
+    memory_bounce_bytes: Optional[float] = None
+    """Memory used for block device bounce buffers"""
+
+    memory_buffers_bytes: Optional[float] = None
+    """Relatively temporary storage for raw disk blocks"""
+
+    memory_cached_bytes: Optional[float] = None
+    """In-memory cache for files read from the disk"""
+
+    memory_cma_free_bytes: Optional[float] = None
+    """Free CMA (Contiguous Memory Allocator) pages"""
+
+    memory_cma_total_bytes: Optional[float] = None
+    """Total CMA (Contiguous Memory Allocator) pages"""
+
+    memory_commit_limit_bytes: Optional[float] = None
+    """Total amount of memory currently available to be allocated on the system"""
+
+    memory_committed_as_bytes: Optional[float] = None
+    """Amount of memory presently allocated on the system"""
+
+    memory_dirty_bytes: Optional[float] = None
+    """Memory which is waiting to get written back to the disk"""
+
+    memory_free_bytes: Optional[float] = None
+    """The sum of LowFree and HighFree"""
+
+    memory_high_free_bytes: Optional[float] = None
+    """Amount of free highmem"""
+
+    memory_high_total_bytes: Optional[float] = None
+    """Total amount of highmem"""
+
+    memory_hugepages_free: Optional[float] = None
+    """The number of huge pages in the pool that are not yet allocated"""
+
+    memory_hugepages_rsvd: Optional[float] = None
+    """
+    Number of huge pages for which a commitment has been made, but no allocation has
+    yet been made
+    """
+
+    memory_hugepages_surp: Optional[float] = None
+    """Number of huge pages in the pool above the threshold"""
+
+    memory_hugepages_total: Optional[float] = None
+    """The size of the pool of huge pages"""
+
+    memory_hugepagesize_bytes: Optional[float] = None
+    """The size of huge pages"""
+
+    memory_inactive_bytes: Optional[float] = None
+    """Memory which has been less recently used"""
+
+    memory_k_reclaimable_bytes: Optional[float] = None
+    """
+    Kernel allocations that the kernel will attempt to reclaim under memory pressure
+    """
+
+    memory_kernel_stack_bytes: Optional[float] = None
+    """Amount of memory allocated to kernel stacks"""
+
+    memory_low_free_bytes: Optional[float] = None
+    """Amount of free lowmem"""
+
+    memory_low_total_bytes: Optional[float] = None
+    """Total amount of lowmem"""
+
+    memory_mapped_bytes: Optional[float] = None
+    """Files which have been mapped into memory"""
+
+    memory_page_tables_bytes: Optional[float] = None
+    """Amount of memory dedicated to the lowest level of page tables"""
+
+    memory_per_cpu_bytes: Optional[float] = None
+    """Memory allocated to the per-cpu alloctor used to back per-cpu allocations"""
+
+    memory_pressure_full_10s: Optional[float] = None
+    """Percentage of time over a 10 second window that all tasks were stalled"""
+
+    memory_pressure_full_300s: Optional[float] = None
+    """Percentage of time over a 5 minute window that all tasks were stalled"""
+
+    memory_pressure_full_60s: Optional[float] = None
+    """Percentage of time over a 1 minute window that all tasks were stalled"""
+
+    memory_pressure_full_total_us: Optional[float] = None
+    """Total stall time (microseconds)"""
+
+    memory_pressure_some_10s: Optional[float] = None
+    """Percentage of time over a 10 second window that some tasks were stalled"""
+
+    memory_pressure_some_300s: Optional[float] = None
+    """Percentage of time over a 5 minute window that some tasks were stalled"""
+
+    memory_pressure_some_60s: Optional[float] = None
+    """Percentage of time over a 1 minute window that some tasks were stalled"""
+
+    memory_pressure_some_total_us: Optional[float] = None
+    """Total stall time (microseconds)"""
+
+    memory_s_reclaimable_bytes: Optional[float] = None
+    """Part of slab that can be reclaimed on memory pressure"""
+
+    memory_s_unreclaim_bytes: Optional[float] = None
+    """Part of slab that cannot be reclaimed on memory pressure"""
+
+    memory_secondary_page_tables_bytes: Optional[float] = None
+    """Amount of memory dedicated to the lowest level of page tables"""
+
+    memory_shmem_bytes: Optional[float] = None
+    """Amount of memory consumed by tmpfs"""
+
+    memory_shmem_hugepages_bytes: Optional[float] = None
+    """Memory used by shmem and tmpfs, allocated with huge pages"""
+
+    memory_shmem_pmd_mapped_bytes: Optional[float] = None
+    """Shared memory mapped into user space with huge pages"""
+
+    memory_slab_bytes: Optional[float] = None
+    """In-kernel data structures cache"""
+
+    memory_swap_cached_bytes: Optional[float] = None
+    """Memory swapped out and back in while still in swap file"""
+
+    memory_swap_free_bytes: Optional[float] = None
+    """Amount of swap space that is currently unused"""
+
+    memory_swap_total_bytes: Optional[float] = None
+    """Total amount of swap space available"""
+
+    memory_total_bytes: Optional[float] = None
+    """Total usable RAM"""
+
+    memory_vmalloc_chunk_bytes: Optional[float] = None
+    """Largest contiguous block of vmalloc area which is free"""
+
+    memory_vmalloc_total_bytes: Optional[float] = None
+    """Total size of vmalloc memory area"""
+
+    memory_vmalloc_used_bytes: Optional[float] = None
+    """Amount of vmalloc area which is used"""
+
+    memory_writeback_bytes: Optional[float] = None
+    """Memory which is actively being written back to the disk"""
+
+    memory_writeback_tmp_bytes: Optional[float] = None
+    """Memory used by FUSE for temporary writeback buffers"""
+
+    memory_z_swap_bytes: Optional[float] = None
+    """Memory consumed by the zswap backend, compressed"""
+
+    memory_z_swapped_bytes: Optional[float] = None
+    """Amount of anonymous memory stored in zswap, uncompressed"""
+
+    mounts: Optional[List[Mount]] = None
+
+    netdevs: Optional[List[Netdev]] = None
+
+    snmp_icmp_in_addr_mask_reps: Optional[float] = None
+    """Number of ICMP Address Mask Reply messages received"""
+
+    snmp_icmp_in_addr_masks: Optional[float] = None
+    """Number of ICMP Address Mask Request messages received"""
+
+    snmp_icmp_in_csum_errors: Optional[float] = None
+    """Number of ICMP messages received with bad checksums"""
+
+    snmp_icmp_in_dest_unreachs: Optional[float] = None
+    """Number of ICMP Destination Unreachable messages received"""
+
+    snmp_icmp_in_echo_reps: Optional[float] = None
+    """Number of ICMP Echo Reply messages received"""
+
+    snmp_icmp_in_echos: Optional[float] = None
+    """Number of ICMP Echo (request) messages received"""
+
+    snmp_icmp_in_errors: Optional[float] = None
+    """Number of ICMP messages received with ICMP-specific errors"""
+
+    snmp_icmp_in_msgs: Optional[float] = None
+    """Number of ICMP messages received"""
+
+    snmp_icmp_in_parm_probs: Optional[float] = None
+    """Number of ICMP Parameter Problem messages received"""
+
+    snmp_icmp_in_redirects: Optional[float] = None
+    """Number of ICMP Redirect messages received"""
+
+    snmp_icmp_in_src_quenchs: Optional[float] = None
+    """Number of ICMP Source Quench messages received"""
+
+    snmp_icmp_in_time_excds: Optional[float] = None
+    """Number of ICMP Time Exceeded messages received"""
+
+    snmp_icmp_in_timestamp_reps: Optional[float] = None
+    """Number of ICMP Address Mask Request messages received"""
+
+    snmp_icmp_in_timestamps: Optional[float] = None
+    """Number of ICMP Timestamp (request) messages received"""
+
+    snmp_icmp_out_addr_mask_reps: Optional[float] = None
+    """Number of ICMP Address Mask Reply messages sent"""
+
+    snmp_icmp_out_addr_masks: Optional[float] = None
+    """Number of ICMP Address Mask Request messages sent"""
+
+    snmp_icmp_out_dest_unreachs: Optional[float] = None
+    """Number of ICMP Destination Unreachable messages sent"""
+
+    snmp_icmp_out_echo_reps: Optional[float] = None
+    """Number of ICMP Echo Reply messages sent"""
+
+    snmp_icmp_out_echos: Optional[float] = None
+    """Number of ICMP Echo (request) messages sent"""
+
+    snmp_icmp_out_errors: Optional[float] = None
+    """
+    Number of ICMP messages which this entity did not send due to ICMP-specific
+    errors
+    """
+
+    snmp_icmp_out_msgs: Optional[float] = None
+    """Number of ICMP messages attempted to send"""
+
+    snmp_icmp_out_parm_probs: Optional[float] = None
+    """Number of ICMP Parameter Problem messages sent"""
+
+    snmp_icmp_out_redirects: Optional[float] = None
+    """Number of ICMP Redirect messages sent"""
+
+    snmp_icmp_out_src_quenchs: Optional[float] = None
+    """Number of ICMP Source Quench messages sent"""
+
+    snmp_icmp_out_time_excds: Optional[float] = None
+    """Number of ICMP Time Exceeded messages sent"""
+
+    snmp_icmp_out_timestamp_reps: Optional[float] = None
+    """Number of ICMP Timestamp Reply messages sent"""
+
+    snmp_icmp_out_timestamps: Optional[float] = None
+    """Number of ICMP Timestamp (request) messages sent"""
+
+    snmp_ip_default_ttl: Optional[float] = None
+    """Default value of the Time-To-Live field of the IP header"""
+
+    snmp_ip_forw_datagrams: Optional[float] = None
+    """Number of datagrams forwarded to their final destination"""
+
+    snmp_ip_forwarding_enabled: Optional[bool] = None
+    """Set when acting as an IP gateway"""
+
+    snmp_ip_frag_creates: Optional[float] = None
+    """Number of datagrams generated by fragmentation"""
+
+    snmp_ip_frag_fails: Optional[float] = None
+    """Number of datagrams discarded because fragmentation failed"""
+
+    snmp_ip_frag_oks: Optional[float] = None
+    """Number of datagrams successfully fragmented"""
+
+    snmp_ip_in_addr_errors: Optional[float] = None
+    """Number of input datagrams discarded due to errors in the IP address"""
+
+    snmp_ip_in_delivers: Optional[float] = None
+    """Number of input datagrams successfully delivered to IP user-protocols"""
+
+    snmp_ip_in_discards: Optional[float] = None
+    """Number of input datagrams otherwise discarded"""
+
+    snmp_ip_in_hdr_errors: Optional[float] = None
+    """Number of input datagrams discarded due to errors in the IP header"""
+
+    snmp_ip_in_receives: Optional[float] = None
+    """Number of input datagrams received from interfaces"""
+
+    snmp_ip_in_unknown_protos: Optional[float] = None
+    """Number of input datagrams discarded due unknown or unsupported protocol"""
+
+    snmp_ip_out_discards: Optional[float] = None
+    """Number of output datagrams otherwise discarded"""
+
+    snmp_ip_out_no_routes: Optional[float] = None
+    """Number of output datagrams discarded because no route matched"""
+
+    snmp_ip_out_requests: Optional[float] = None
+    """Number of datagrams supplied for transmission"""
+
+    snmp_ip_reasm_fails: Optional[float] = None
+    """Number of failures detected by the reassembly algorithm"""
+
+    snmp_ip_reasm_oks: Optional[float] = None
+    """Number of datagrams successfully reassembled"""
+
+    snmp_ip_reasm_reqds: Optional[float] = None
+    """Number of fragments received which needed to be reassembled"""
+
+    snmp_ip_reasm_timeout: Optional[float] = None
+    """Number of seconds fragments are held while awaiting reassembly"""
+
+    snmp_tcp_active_opens: Optional[float] = None
+    """Number of times TCP transitions to SYN-SENT from CLOSED"""
+
+    snmp_tcp_attempt_fails: Optional[float] = None
+    """
+    Number of times TCP transitions to CLOSED from SYN-SENT or SYN-RCVD, plus
+    transitions to LISTEN from SYN-RCVD
+    """
+
+    snmp_tcp_curr_estab: Optional[float] = None
+    """Number of TCP connections in ESTABLISHED or CLOSE-WAIT"""
+
+    snmp_tcp_estab_resets: Optional[float] = None
+    """Number of times TCP transitions to CLOSED from ESTABLISHED or CLOSE-WAIT"""
+
+    snmp_tcp_in_csum_errors: Optional[float] = None
+    """Number of TCP segments received with checksum errors"""
+
+    snmp_tcp_in_errs: Optional[float] = None
+    """Number of TCP segments received in error"""
+
+    snmp_tcp_in_segs: Optional[float] = None
+    """Number of TCP segments received"""
+
+    snmp_tcp_max_conn: Optional[float] = None
+    """Limit on the total number of TCP connections"""
+
+    snmp_tcp_out_rsts: Optional[float] = None
+    """Number of TCP segments sent with RST flag"""
+
+    snmp_tcp_out_segs: Optional[float] = None
+    """Number of TCP segments sent"""
+
+    snmp_tcp_passive_opens: Optional[float] = None
+    """Number of times TCP transitions to SYN-RCVD from LISTEN"""
+
+    snmp_tcp_retrans_segs: Optional[float] = None
+    """Number of TCP segments retransmitted"""
+
+    snmp_tcp_rto_max: Optional[float] = None
+    """
+    Maximum value permitted by a TCP implementation for the retransmission timeout
+    (milliseconds)
+    """
+
+    snmp_tcp_rto_min: Optional[float] = None
+    """
+    Minimum value permitted by a TCP implementation for the retransmission timeout
+    (milliseconds)
+    """
+
+    snmp_udp_in_datagrams: Optional[float] = None
+    """Number of UDP datagrams delivered to UDP applications"""
+
+    snmp_udp_in_errors: Optional[float] = None
+    """
+    Number of UDP datagrams failed to be delivered for reasons other than lack of
+    application at the destination port
+    """
+
+    snmp_udp_no_ports: Optional[float] = None
+    """
+    Number of UDP datagrams received for which there was not application at the
+    destination port
+    """
+
+    snmp_udp_out_datagrams: Optional[float] = None
+    """Number of UDP datagrams sent"""
+
+    system_boot_time_s: Optional[float] = None
+    """Boottime of the system (seconds since the Unix epoch)"""
+
+    thermals: Optional[List[Thermal]] = None
+
+    tunnels: Optional[List[Tunnel]] = None
+
+    uptime_idle_ms: Optional[float] = None
+    """Sum of how much time each core has spent idle"""
+
+    uptime_total_ms: Optional[float] = None
+    """Uptime of the system, including time spent in suspend"""
diff --git a/src/cloudflare/types/magic_transit/connectors/snapshot_list_params.py b/src/cloudflare/types/magic_transit/connectors/snapshot_list_params.py
new file mode 100644
index 00000000000..b2c9a69b3a6
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/connectors/snapshot_list_params.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ...._utils import PropertyInfo
+
+__all__ = ["SnapshotListParams"]
+
+
+class SnapshotListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier"""
+
+    from_: Required[Annotated[float, PropertyInfo(alias="from")]]
+
+    to: Required[float]
+
+    cursor: str
+
+    limit: float
diff --git a/src/cloudflare/types/magic_transit/connectors/snapshot_list_response.py b/src/cloudflare/types/magic_transit/connectors/snapshot_list_response.py
new file mode 100644
index 00000000000..5c26f94cfb5
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/connectors/snapshot_list_response.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ...._models import BaseModel
+
+__all__ = ["SnapshotListResponse", "Item"]
+
+
+class Item(BaseModel):
+    a: float
+    """Time the Snapshot was collected (seconds since the Unix epoch)"""
+
+    t: float
+    """Time the Snapshot was recorded (seconds since the Unix epoch)"""
+
+
+class SnapshotListResponse(BaseModel):
+    count: float
+
+    items: List[Item]
+
+    cursor: Optional[str] = None
diff --git a/src/cloudflare/types/magic_transit/connectors/snapshots/__init__.py b/src/cloudflare/types/magic_transit/connectors/snapshots/__init__.py
new file mode 100644
index 00000000000..92bf5533ae5
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/connectors/snapshots/__init__.py
@@ -0,0 +1,5 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .latest_list_response import LatestListResponse as LatestListResponse
diff --git a/src/cloudflare/types/magic_transit/connectors/snapshots/latest_list_response.py b/src/cloudflare/types/magic_transit/connectors/snapshots/latest_list_response.py
new file mode 100644
index 00000000000..1ec69de491f
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/connectors/snapshots/latest_list_response.py
@@ -0,0 +1,829 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ....._models import BaseModel
+
+__all__ = [
+    "LatestListResponse",
+    "Item",
+    "ItemBond",
+    "ItemDHCPLease",
+    "ItemDisk",
+    "ItemInterface",
+    "ItemInterfaceIPAddress",
+    "ItemMount",
+    "ItemNetdev",
+    "ItemThermal",
+    "ItemTunnel",
+]
+
+
+class ItemBond(BaseModel):
+    """Snapshot Bond"""
+
+    name: str
+    """Name of the network interface"""
+
+    status: str
+    """Current status of the network interface"""
+
+
+class ItemDHCPLease(BaseModel):
+    """Snapshot DHCP lease"""
+
+    client_id: str
+    """Client ID of the device the IP Address was leased to"""
+
+    expiry_time: float
+    """Expiry time of the DHCP lease (seconds since the Unix epoch)"""
+
+    hostname: str
+    """Hostname of the device the IP Address was leased to"""
+
+    interface_name: str
+    """Name of the network interface"""
+
+    ip_address: str
+    """IP Address that was leased"""
+
+    mac_address: str
+    """MAC Address of the device the IP Address was leased to"""
+
+    connector_id: Optional[str] = None
+    """Connector identifier"""
+
+
+class ItemDisk(BaseModel):
+    """Snapshot Disk"""
+
+    in_progress: float
+    """I/Os currently in progress"""
+
+    major: float
+    """Device major number"""
+
+    merged: float
+    """Reads merged"""
+
+    minor: float
+    """Device minor number"""
+
+    name: str
+    """Device name"""
+
+    reads: float
+    """Reads completed successfully"""
+
+    sectors_read: float
+    """Sectors read successfully"""
+
+    sectors_written: float
+    """Sectors written successfully"""
+
+    time_in_progress_ms: float
+    """Time spent doing I/Os (milliseconds)"""
+
+    time_reading_ms: float
+    """Time spent reading (milliseconds)"""
+
+    time_writing_ms: float
+    """Time spent writing (milliseconds)"""
+
+    weighted_time_in_progress_ms: float
+    """Weighted time spent doing I/Os (milliseconds)"""
+
+    writes: float
+    """Writes completed"""
+
+    writes_merged: float
+    """Writes merged"""
+
+    connector_id: Optional[str] = None
+    """Connector identifier"""
+
+    discards: Optional[float] = None
+    """Discards completed successfully"""
+
+    discards_merged: Optional[float] = None
+    """Discards merged"""
+
+    flushes: Optional[float] = None
+    """Flushes completed successfully"""
+
+    sectors_discarded: Optional[float] = None
+    """Sectors discarded"""
+
+    time_discarding_ms: Optional[float] = None
+    """Time spent discarding (milliseconds)"""
+
+    time_flushing_ms: Optional[float] = None
+    """Time spent flushing (milliseconds)"""
+
+
+class ItemInterfaceIPAddress(BaseModel):
+    """Snapshot Interface Address"""
+
+    interface_name: str
+    """Name of the network interface"""
+
+    ip_address: str
+    """IP address of the network interface"""
+
+    connector_id: Optional[str] = None
+    """Connector identifier"""
+
+
+class ItemInterface(BaseModel):
+    """Snapshot Interface"""
+
+    name: str
+    """Name of the network interface"""
+
+    operstate: str
+    """UP/DOWN state of the network interface"""
+
+    connector_id: Optional[str] = None
+    """Connector identifier"""
+
+    ip_addresses: Optional[List[ItemInterfaceIPAddress]] = None
+
+    speed: Optional[float] = None
+    """Speed of the network interface (bits per second)"""
+
+
+class ItemMount(BaseModel):
+    """Snapshot Mount"""
+
+    file_system: str
+    """File system on disk (EXT4, NTFS, etc.)"""
+
+    kind: str
+    """Kind of disk (HDD, SSD, etc.)"""
+
+    mount_point: str
+    """Path where disk is mounted"""
+
+    name: str
+    """Name of the disk mount"""
+
+    available_bytes: Optional[float] = None
+    """Available disk size (bytes)"""
+
+    connector_id: Optional[str] = None
+    """Connector identifier"""
+
+    is_read_only: Optional[bool] = None
+    """Determines whether the disk is read-only"""
+
+    is_removable: Optional[bool] = None
+    """Determines whether the disk is removable"""
+
+    total_bytes: Optional[float] = None
+    """Total disk size (bytes)"""
+
+
+class ItemNetdev(BaseModel):
+    """Snapshot Netdev"""
+
+    name: str
+    """Name of the network device"""
+
+    recv_bytes: float
+    """Total bytes received"""
+
+    recv_compressed: float
+    """Compressed packets received"""
+
+    recv_drop: float
+    """Packets dropped"""
+
+    recv_errs: float
+    """Bad packets received"""
+
+    recv_fifo: float
+    """FIFO overruns"""
+
+    recv_frame: float
+    """Frame alignment errors"""
+
+    recv_multicast: float
+    """Multicast packets received"""
+
+    recv_packets: float
+    """Total packets received"""
+
+    sent_bytes: float
+    """Total bytes transmitted"""
+
+    sent_carrier: float
+    """Number of packets not sent due to carrier errors"""
+
+    sent_colls: float
+    """Number of collisions"""
+
+    sent_compressed: float
+    """Number of compressed packets transmitted"""
+
+    sent_drop: float
+    """Number of packets dropped during transmission"""
+
+    sent_errs: float
+    """Number of transmission errors"""
+
+    sent_fifo: float
+    """FIFO overruns"""
+
+    sent_packets: float
+    """Total packets transmitted"""
+
+    connector_id: Optional[str] = None
+    """Connector identifier"""
+
+
+class ItemThermal(BaseModel):
+    """Snapshot Thermal"""
+
+    label: str
+    """Sensor identifier for the component"""
+
+    connector_id: Optional[str] = None
+    """Connector identifier"""
+
+    critical_celcius: Optional[float] = None
+    """Critical failure temperature of the component (degrees Celsius)"""
+
+    current_celcius: Optional[float] = None
+    """Current temperature of the component (degrees Celsius)"""
+
+    max_celcius: Optional[float] = None
+    """Maximum temperature of the component (degrees Celsius)"""
+
+
+class ItemTunnel(BaseModel):
+    """Snapshot Tunnels"""
+
+    health_state: str
+    """Name of tunnel health state (unknown, healthy, degraded, down)"""
+
+    health_value: float
+    """
+    Numeric value associated with tunnel state (0 = unknown, 1 = healthy, 2 =
+    degraded, 3 = down)
+    """
+
+    interface_name: str
+    """The tunnel interface name (i.e. xfrm1, xfrm3.99, etc.)"""
+
+    tunnel_id: str
+    """Tunnel identifier"""
+
+    connector_id: Optional[str] = None
+    """Connector identifier"""
+
+    probed_mtu: Optional[float] = None
+    """MTU as measured between the two ends of the tunnel"""
+
+    recent_healthy_pings: Optional[float] = None
+    """Number of recent healthy pings for this tunnel"""
+
+    recent_unhealthy_pings: Optional[float] = None
+    """Number of recent unhealthy pings for this tunnel"""
+
+
+class Item(BaseModel):
+    """Snapshot"""
+
+    count_reclaim_failures: float
+    """Count of failures to reclaim space"""
+
+    count_reclaimed_paths: float
+    """Count of reclaimed paths"""
+
+    count_record_failed: float
+    """Count of failed snapshot recordings"""
+
+    count_transmit_failures: float
+    """Count of failed snapshot transmissions"""
+
+    t: float
+    """Time the Snapshot was recorded (seconds since the Unix epoch)"""
+
+    v: str
+    """Version"""
+
+    bonds: Optional[List[ItemBond]] = None
+
+    cpu_count: Optional[float] = None
+    """Count of processors/cores"""
+
+    cpu_pressure_10s: Optional[float] = None
+    """Percentage of time over a 10 second window that tasks were stalled"""
+
+    cpu_pressure_300s: Optional[float] = None
+    """Percentage of time over a 5 minute window that tasks were stalled"""
+
+    cpu_pressure_60s: Optional[float] = None
+    """Percentage of time over a 1 minute window that tasks were stalled"""
+
+    cpu_pressure_total_us: Optional[float] = None
+    """Total stall time (microseconds)"""
+
+    cpu_time_guest_ms: Optional[float] = None
+    """Time spent running a virtual CPU or guest OS (milliseconds)"""
+
+    cpu_time_guest_nice_ms: Optional[float] = None
+    """Time spent running a niced guest (milliseconds)"""
+
+    cpu_time_idle_ms: Optional[float] = None
+    """Time spent in idle state (milliseconds)"""
+
+    cpu_time_iowait_ms: Optional[float] = None
+    """Time spent wait for I/O to complete (milliseconds)"""
+
+    cpu_time_irq_ms: Optional[float] = None
+    """Time spent servicing interrupts (milliseconds)"""
+
+    cpu_time_nice_ms: Optional[float] = None
+    """Time spent in low-priority user mode (milliseconds)"""
+
+    cpu_time_softirq_ms: Optional[float] = None
+    """Time spent servicing softirqs (milliseconds)"""
+
+    cpu_time_steal_ms: Optional[float] = None
+    """Time stolen (milliseconds)"""
+
+    cpu_time_system_ms: Optional[float] = None
+    """Time spent in system mode (milliseconds)"""
+
+    cpu_time_user_ms: Optional[float] = None
+    """Time spent in user mode (milliseconds)"""
+
+    dhcp_leases: Optional[List[ItemDHCPLease]] = None
+
+    disks: Optional[List[ItemDisk]] = None
+
+    ha_state: Optional[str] = None
+    """Name of high availability state"""
+
+    ha_value: Optional[float] = None
+    """
+    Numeric value associated with high availability state (0 = disabled, 1 = active,
+    2 = standby, 3 = stopped, 4 = fault)
+    """
+
+    interfaces: Optional[List[ItemInterface]] = None
+
+    io_pressure_full_10s: Optional[float] = None
+    """Percentage of time over a 10 second window that all tasks were stalled"""
+
+    io_pressure_full_300s: Optional[float] = None
+    """Percentage of time over a 5 minute window that all tasks were stalled"""
+
+    io_pressure_full_60s: Optional[float] = None
+    """Percentage of time over a 1 minute window that all tasks were stalled"""
+
+    io_pressure_full_total_us: Optional[float] = None
+    """Total stall time (microseconds)"""
+
+    io_pressure_some_10s: Optional[float] = None
+    """Percentage of time over a 10 second window that some tasks were stalled"""
+
+    io_pressure_some_300s: Optional[float] = None
+    """Percentage of time over a 3 minute window that some tasks were stalled"""
+
+    io_pressure_some_60s: Optional[float] = None
+    """Percentage of time over a 1 minute window that some tasks were stalled"""
+
+    io_pressure_some_total_us: Optional[float] = None
+    """Total stall time (microseconds)"""
+
+    kernel_btime: Optional[float] = None
+    """Boot time (seconds since Unix epoch)"""
+
+    kernel_ctxt: Optional[float] = None
+    """Number of context switches that the system underwent"""
+
+    kernel_processes: Optional[float] = None
+    """Number of forks since boot"""
+
+    kernel_processes_blocked: Optional[float] = None
+    """Number of processes blocked waiting for I/O"""
+
+    kernel_processes_running: Optional[float] = None
+    """Number of processes in runnable state"""
+
+    load_average_15m: Optional[float] = None
+    """The fifteen-minute load average"""
+
+    load_average_1m: Optional[float] = None
+    """The one-minute load average"""
+
+    load_average_5m: Optional[float] = None
+    """The five-minute load average"""
+
+    load_average_cur: Optional[float] = None
+    """Number of currently runnable kernel scheduling entities"""
+
+    load_average_max: Optional[float] = None
+    """Number of kernel scheduling entities that currently exist on the system"""
+
+    memory_active_bytes: Optional[float] = None
+    """Memory that has been used more recently"""
+
+    memory_anon_hugepages_bytes: Optional[float] = None
+    """Non-file backed huge pages mapped into user-space page tables"""
+
+    memory_anon_pages_bytes: Optional[float] = None
+    """Non-file backed pages mapped into user-space page tables"""
+
+    memory_available_bytes: Optional[float] = None
+    """Estimate of how much memory is available for starting new applications"""
+
+    memory_bounce_bytes: Optional[float] = None
+    """Memory used for block device bounce buffers"""
+
+    memory_buffers_bytes: Optional[float] = None
+    """Relatively temporary storage for raw disk blocks"""
+
+    memory_cached_bytes: Optional[float] = None
+    """In-memory cache for files read from the disk"""
+
+    memory_cma_free_bytes: Optional[float] = None
+    """Free CMA (Contiguous Memory Allocator) pages"""
+
+    memory_cma_total_bytes: Optional[float] = None
+    """Total CMA (Contiguous Memory Allocator) pages"""
+
+    memory_commit_limit_bytes: Optional[float] = None
+    """Total amount of memory currently available to be allocated on the system"""
+
+    memory_committed_as_bytes: Optional[float] = None
+    """Amount of memory presently allocated on the system"""
+
+    memory_dirty_bytes: Optional[float] = None
+    """Memory which is waiting to get written back to the disk"""
+
+    memory_free_bytes: Optional[float] = None
+    """The sum of LowFree and HighFree"""
+
+    memory_high_free_bytes: Optional[float] = None
+    """Amount of free highmem"""
+
+    memory_high_total_bytes: Optional[float] = None
+    """Total amount of highmem"""
+
+    memory_hugepages_free: Optional[float] = None
+    """The number of huge pages in the pool that are not yet allocated"""
+
+    memory_hugepages_rsvd: Optional[float] = None
+    """
+    Number of huge pages for which a commitment has been made, but no allocation has
+    yet been made
+    """
+
+    memory_hugepages_surp: Optional[float] = None
+    """Number of huge pages in the pool above the threshold"""
+
+    memory_hugepages_total: Optional[float] = None
+    """The size of the pool of huge pages"""
+
+    memory_hugepagesize_bytes: Optional[float] = None
+    """The size of huge pages"""
+
+    memory_inactive_bytes: Optional[float] = None
+    """Memory which has been less recently used"""
+
+    memory_k_reclaimable_bytes: Optional[float] = None
+    """
+    Kernel allocations that the kernel will attempt to reclaim under memory pressure
+    """
+
+    memory_kernel_stack_bytes: Optional[float] = None
+    """Amount of memory allocated to kernel stacks"""
+
+    memory_low_free_bytes: Optional[float] = None
+    """Amount of free lowmem"""
+
+    memory_low_total_bytes: Optional[float] = None
+    """Total amount of lowmem"""
+
+    memory_mapped_bytes: Optional[float] = None
+    """Files which have been mapped into memory"""
+
+    memory_page_tables_bytes: Optional[float] = None
+    """Amount of memory dedicated to the lowest level of page tables"""
+
+    memory_per_cpu_bytes: Optional[float] = None
+    """Memory allocated to the per-cpu alloctor used to back per-cpu allocations"""
+
+    memory_pressure_full_10s: Optional[float] = None
+    """Percentage of time over a 10 second window that all tasks were stalled"""
+
+    memory_pressure_full_300s: Optional[float] = None
+    """Percentage of time over a 5 minute window that all tasks were stalled"""
+
+    memory_pressure_full_60s: Optional[float] = None
+    """Percentage of time over a 1 minute window that all tasks were stalled"""
+
+    memory_pressure_full_total_us: Optional[float] = None
+    """Total stall time (microseconds)"""
+
+    memory_pressure_some_10s: Optional[float] = None
+    """Percentage of time over a 10 second window that some tasks were stalled"""
+
+    memory_pressure_some_300s: Optional[float] = None
+    """Percentage of time over a 5 minute window that some tasks were stalled"""
+
+    memory_pressure_some_60s: Optional[float] = None
+    """Percentage of time over a 1 minute window that some tasks were stalled"""
+
+    memory_pressure_some_total_us: Optional[float] = None
+    """Total stall time (microseconds)"""
+
+    memory_s_reclaimable_bytes: Optional[float] = None
+    """Part of slab that can be reclaimed on memory pressure"""
+
+    memory_s_unreclaim_bytes: Optional[float] = None
+    """Part of slab that cannot be reclaimed on memory pressure"""
+
+    memory_secondary_page_tables_bytes: Optional[float] = None
+    """Amount of memory dedicated to the lowest level of page tables"""
+
+    memory_shmem_bytes: Optional[float] = None
+    """Amount of memory consumed by tmpfs"""
+
+    memory_shmem_hugepages_bytes: Optional[float] = None
+    """Memory used by shmem and tmpfs, allocated with huge pages"""
+
+    memory_shmem_pmd_mapped_bytes: Optional[float] = None
+    """Shared memory mapped into user space with huge pages"""
+
+    memory_slab_bytes: Optional[float] = None
+    """In-kernel data structures cache"""
+
+    memory_swap_cached_bytes: Optional[float] = None
+    """Memory swapped out and back in while still in swap file"""
+
+    memory_swap_free_bytes: Optional[float] = None
+    """Amount of swap space that is currently unused"""
+
+    memory_swap_total_bytes: Optional[float] = None
+    """Total amount of swap space available"""
+
+    memory_total_bytes: Optional[float] = None
+    """Total usable RAM"""
+
+    memory_vmalloc_chunk_bytes: Optional[float] = None
+    """Largest contiguous block of vmalloc area which is free"""
+
+    memory_vmalloc_total_bytes: Optional[float] = None
+    """Total size of vmalloc memory area"""
+
+    memory_vmalloc_used_bytes: Optional[float] = None
+    """Amount of vmalloc area which is used"""
+
+    memory_writeback_bytes: Optional[float] = None
+    """Memory which is actively being written back to the disk"""
+
+    memory_writeback_tmp_bytes: Optional[float] = None
+    """Memory used by FUSE for temporary writeback buffers"""
+
+    memory_z_swap_bytes: Optional[float] = None
+    """Memory consumed by the zswap backend, compressed"""
+
+    memory_z_swapped_bytes: Optional[float] = None
+    """Amount of anonymous memory stored in zswap, uncompressed"""
+
+    mounts: Optional[List[ItemMount]] = None
+
+    netdevs: Optional[List[ItemNetdev]] = None
+
+    snmp_icmp_in_addr_mask_reps: Optional[float] = None
+    """Number of ICMP Address Mask Reply messages received"""
+
+    snmp_icmp_in_addr_masks: Optional[float] = None
+    """Number of ICMP Address Mask Request messages received"""
+
+    snmp_icmp_in_csum_errors: Optional[float] = None
+    """Number of ICMP messages received with bad checksums"""
+
+    snmp_icmp_in_dest_unreachs: Optional[float] = None
+    """Number of ICMP Destination Unreachable messages received"""
+
+    snmp_icmp_in_echo_reps: Optional[float] = None
+    """Number of ICMP Echo Reply messages received"""
+
+    snmp_icmp_in_echos: Optional[float] = None
+    """Number of ICMP Echo (request) messages received"""
+
+    snmp_icmp_in_errors: Optional[float] = None
+    """Number of ICMP messages received with ICMP-specific errors"""
+
+    snmp_icmp_in_msgs: Optional[float] = None
+    """Number of ICMP messages received"""
+
+    snmp_icmp_in_parm_probs: Optional[float] = None
+    """Number of ICMP Parameter Problem messages received"""
+
+    snmp_icmp_in_redirects: Optional[float] = None
+    """Number of ICMP Redirect messages received"""
+
+    snmp_icmp_in_src_quenchs: Optional[float] = None
+    """Number of ICMP Source Quench messages received"""
+
+    snmp_icmp_in_time_excds: Optional[float] = None
+    """Number of ICMP Time Exceeded messages received"""
+
+    snmp_icmp_in_timestamp_reps: Optional[float] = None
+    """Number of ICMP Address Mask Request messages received"""
+
+    snmp_icmp_in_timestamps: Optional[float] = None
+    """Number of ICMP Timestamp (request) messages received"""
+
+    snmp_icmp_out_addr_mask_reps: Optional[float] = None
+    """Number of ICMP Address Mask Reply messages sent"""
+
+    snmp_icmp_out_addr_masks: Optional[float] = None
+    """Number of ICMP Address Mask Request messages sent"""
+
+    snmp_icmp_out_dest_unreachs: Optional[float] = None
+    """Number of ICMP Destination Unreachable messages sent"""
+
+    snmp_icmp_out_echo_reps: Optional[float] = None
+    """Number of ICMP Echo Reply messages sent"""
+
+    snmp_icmp_out_echos: Optional[float] = None
+    """Number of ICMP Echo (request) messages sent"""
+
+    snmp_icmp_out_errors: Optional[float] = None
+    """
+    Number of ICMP messages which this entity did not send due to ICMP-specific
+    errors
+    """
+
+    snmp_icmp_out_msgs: Optional[float] = None
+    """Number of ICMP messages attempted to send"""
+
+    snmp_icmp_out_parm_probs: Optional[float] = None
+    """Number of ICMP Parameter Problem messages sent"""
+
+    snmp_icmp_out_redirects: Optional[float] = None
+    """Number of ICMP Redirect messages sent"""
+
+    snmp_icmp_out_src_quenchs: Optional[float] = None
+    """Number of ICMP Source Quench messages sent"""
+
+    snmp_icmp_out_time_excds: Optional[float] = None
+    """Number of ICMP Time Exceeded messages sent"""
+
+    snmp_icmp_out_timestamp_reps: Optional[float] = None
+    """Number of ICMP Timestamp Reply messages sent"""
+
+    snmp_icmp_out_timestamps: Optional[float] = None
+    """Number of ICMP Timestamp (request) messages sent"""
+
+    snmp_ip_default_ttl: Optional[float] = None
+    """Default value of the Time-To-Live field of the IP header"""
+
+    snmp_ip_forw_datagrams: Optional[float] = None
+    """Number of datagrams forwarded to their final destination"""
+
+    snmp_ip_forwarding_enabled: Optional[bool] = None
+    """Set when acting as an IP gateway"""
+
+    snmp_ip_frag_creates: Optional[float] = None
+    """Number of datagrams generated by fragmentation"""
+
+    snmp_ip_frag_fails: Optional[float] = None
+    """Number of datagrams discarded because fragmentation failed"""
+
+    snmp_ip_frag_oks: Optional[float] = None
+    """Number of datagrams successfully fragmented"""
+
+    snmp_ip_in_addr_errors: Optional[float] = None
+    """Number of input datagrams discarded due to errors in the IP address"""
+
+    snmp_ip_in_delivers: Optional[float] = None
+    """Number of input datagrams successfully delivered to IP user-protocols"""
+
+    snmp_ip_in_discards: Optional[float] = None
+    """Number of input datagrams otherwise discarded"""
+
+    snmp_ip_in_hdr_errors: Optional[float] = None
+    """Number of input datagrams discarded due to errors in the IP header"""
+
+    snmp_ip_in_receives: Optional[float] = None
+    """Number of input datagrams received from interfaces"""
+
+    snmp_ip_in_unknown_protos: Optional[float] = None
+    """Number of input datagrams discarded due unknown or unsupported protocol"""
+
+    snmp_ip_out_discards: Optional[float] = None
+    """Number of output datagrams otherwise discarded"""
+
+    snmp_ip_out_no_routes: Optional[float] = None
+    """Number of output datagrams discarded because no route matched"""
+
+    snmp_ip_out_requests: Optional[float] = None
+    """Number of datagrams supplied for transmission"""
+
+    snmp_ip_reasm_fails: Optional[float] = None
+    """Number of failures detected by the reassembly algorithm"""
+
+    snmp_ip_reasm_oks: Optional[float] = None
+    """Number of datagrams successfully reassembled"""
+
+    snmp_ip_reasm_reqds: Optional[float] = None
+    """Number of fragments received which needed to be reassembled"""
+
+    snmp_ip_reasm_timeout: Optional[float] = None
+    """Number of seconds fragments are held while awaiting reassembly"""
+
+    snmp_tcp_active_opens: Optional[float] = None
+    """Number of times TCP transitions to SYN-SENT from CLOSED"""
+
+    snmp_tcp_attempt_fails: Optional[float] = None
+    """
+    Number of times TCP transitions to CLOSED from SYN-SENT or SYN-RCVD, plus
+    transitions to LISTEN from SYN-RCVD
+    """
+
+    snmp_tcp_curr_estab: Optional[float] = None
+    """Number of TCP connections in ESTABLISHED or CLOSE-WAIT"""
+
+    snmp_tcp_estab_resets: Optional[float] = None
+    """Number of times TCP transitions to CLOSED from ESTABLISHED or CLOSE-WAIT"""
+
+    snmp_tcp_in_csum_errors: Optional[float] = None
+    """Number of TCP segments received with checksum errors"""
+
+    snmp_tcp_in_errs: Optional[float] = None
+    """Number of TCP segments received in error"""
+
+    snmp_tcp_in_segs: Optional[float] = None
+    """Number of TCP segments received"""
+
+    snmp_tcp_max_conn: Optional[float] = None
+    """Limit on the total number of TCP connections"""
+
+    snmp_tcp_out_rsts: Optional[float] = None
+    """Number of TCP segments sent with RST flag"""
+
+    snmp_tcp_out_segs: Optional[float] = None
+    """Number of TCP segments sent"""
+
+    snmp_tcp_passive_opens: Optional[float] = None
+    """Number of times TCP transitions to SYN-RCVD from LISTEN"""
+
+    snmp_tcp_retrans_segs: Optional[float] = None
+    """Number of TCP segments retransmitted"""
+
+    snmp_tcp_rto_max: Optional[float] = None
+    """
+    Maximum value permitted by a TCP implementation for the retransmission timeout
+    (milliseconds)
+    """
+
+    snmp_tcp_rto_min: Optional[float] = None
+    """
+    Minimum value permitted by a TCP implementation for the retransmission timeout
+    (milliseconds)
+    """
+
+    snmp_udp_in_datagrams: Optional[float] = None
+    """Number of UDP datagrams delivered to UDP applications"""
+
+    snmp_udp_in_errors: Optional[float] = None
+    """
+    Number of UDP datagrams failed to be delivered for reasons other than lack of
+    application at the destination port
+    """
+
+    snmp_udp_no_ports: Optional[float] = None
+    """
+    Number of UDP datagrams received for which there was not application at the
+    destination port
+    """
+
+    snmp_udp_out_datagrams: Optional[float] = None
+    """Number of UDP datagrams sent"""
+
+    system_boot_time_s: Optional[float] = None
+    """Boottime of the system (seconds since the Unix epoch)"""
+
+    thermals: Optional[List[ItemThermal]] = None
+
+    tunnels: Optional[List[ItemTunnel]] = None
+
+    uptime_idle_ms: Optional[float] = None
+    """Sum of how much time each core has spent idle"""
+
+    uptime_total_ms: Optional[float] = None
+    """Uptime of the system, including time spent in suspend"""
+
+
+class LatestListResponse(BaseModel):
+    count: float
+
+    items: List[Item]
diff --git a/src/cloudflare/types/magic_transit/gre_tunnel_bulk_update_params.py b/src/cloudflare/types/magic_transit/gre_tunnel_bulk_update_params.py
new file mode 100644
index 00000000000..652e4f41702
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/gre_tunnel_bulk_update_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["GRETunnelBulkUpdateParams"]
+
+
+class GRETunnelBulkUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier"""
+
+    body: Required[object]
+
+    x_magic_new_hc_target: Annotated[bool, PropertyInfo(alias="x-magic-new-hc-target")]
diff --git a/src/cloudflare/types/magic_transit/gre_tunnel_bulk_update_response.py b/src/cloudflare/types/magic_transit/gre_tunnel_bulk_update_response.py
new file mode 100644
index 00000000000..d98f4e9f5bf
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/gre_tunnel_bulk_update_response.py
@@ -0,0 +1,193 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ..._models import BaseModel
+from .health_check_rate import HealthCheckRate
+from .health_check_type import HealthCheckType
+
+__all__ = [
+    "GRETunnelBulkUpdateResponse",
+    "ModifiedGRETunnel",
+    "ModifiedGRETunnelBGP",
+    "ModifiedGRETunnelBGPStatus",
+    "ModifiedGRETunnelHealthCheck",
+    "ModifiedGRETunnelHealthCheckTarget",
+    "ModifiedGRETunnelHealthCheckTargetMagicHealthCheckTarget",
+]
+
+
+class ModifiedGRETunnelBGP(BaseModel):
+    customer_asn: int
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: Optional[List[str]] = None
+    """
+    Prefixes in this list will be advertised to the customer device, in addition to
+    the routes in the Magic routing table.
+    """
+
+    md5_key: Optional[str] = None
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class ModifiedGRETunnelBGPStatus(BaseModel):
+    state: Literal["BGP_DOWN", "BGP_UP", "BGP_ESTABLISHING"]
+
+    tcp_established: bool
+
+    updated_at: datetime
+
+    bgp_state: Optional[str] = None
+
+    cf_speaker_ip: Optional[str] = None
+
+    cf_speaker_port: Optional[int] = None
+
+    customer_speaker_ip: Optional[str] = None
+
+    customer_speaker_port: Optional[int] = None
+
+
+class ModifiedGRETunnelHealthCheckTargetMagicHealthCheckTarget(BaseModel):
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded to this address. This field defaults to `customer_gre_endpoint address`. This field is ignored for bidirectional healthchecks as the interface_address (not assigned to the Cloudflare side of the tunnel) is used as the target.
+    """
+
+    effective: Optional[str] = None
+    """The effective health check target.
+
+    If 'saved' is empty, then this field will be populated with the calculated
+    default value on GET requests. Ignored in POST, PUT, and PATCH requests.
+    """
+
+    saved: Optional[str] = None
+    """The saved health check target.
+
+    Setting the value to the empty string indicates that the calculated default
+    value will be used.
+    """
+
+
+ModifiedGRETunnelHealthCheckTarget: TypeAlias = Union[ModifiedGRETunnelHealthCheckTargetMagicHealthCheckTarget, str]
+
+
+class ModifiedGRETunnelHealthCheck(BaseModel):
+    direction: Optional[Literal["unidirectional", "bidirectional"]] = None
+    """The direction of the flow of the healthcheck.
+
+    Either unidirectional, where the probe comes to you via the tunnel and the
+    result comes back to Cloudflare via the open Internet, or bidirectional where
+    both the probe and result come and go via the tunnel.
+    """
+
+    enabled: Optional[bool] = None
+    """Determines whether to run healthchecks for a tunnel."""
+
+    rate: Optional[HealthCheckRate] = None
+    """How frequent the health check is run. The default value is `mid`."""
+
+    target: Optional[ModifiedGRETunnelHealthCheckTarget] = None
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the
+    ICMP echo will be forwarded to this address. This field defaults to
+    `customer_gre_endpoint address`. This field is ignored for bidirectional
+    healthchecks as the interface_address (not assigned to the Cloudflare side of
+    the tunnel) is used as the target. Must be in object form if the
+    x-magic-new-hc-target header is set to true and string form if
+    x-magic-new-hc-target is absent or set to false.
+    """
+
+    type: Optional[HealthCheckType] = None
+    """The type of healthcheck to run, reply or request. The default value is `reply`."""
+
+
+class ModifiedGRETunnel(BaseModel):
+    id: str
+    """Identifier"""
+
+    cloudflare_gre_endpoint: str
+    """The IP address assigned to the Cloudflare side of the GRE tunnel."""
+
+    customer_gre_endpoint: str
+    """The IP address assigned to the customer side of the GRE tunnel."""
+
+    interface_address: str
+    """
+    A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+    of the tunnel. Select the subnet from the following private IP space:
+    10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+    """
+
+    name: str
+    """The name of the tunnel.
+
+    The name cannot contain spaces or special characters, must be 15 characters or
+    less, and cannot share a name with another GRE tunnel.
+    """
+
+    automatic_return_routing: Optional[bool] = None
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
+    bgp: Optional[ModifiedGRETunnelBGP] = None
+
+    bgp_status: Optional[ModifiedGRETunnelBGPStatus] = None
+
+    created_on: Optional[datetime] = None
+    """The date and time the tunnel was created."""
+
+    description: Optional[str] = None
+    """An optional description of the GRE tunnel."""
+
+    health_check: Optional[ModifiedGRETunnelHealthCheck] = None
+
+    interface_address6: Optional[str] = None
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
+
+    modified_on: Optional[datetime] = None
+    """The date and time the tunnel was last modified."""
+
+    mtu: Optional[int] = None
+    """Maximum Transmission Unit (MTU) in bytes for the GRE tunnel.
+
+    The minimum value is 576.
+    """
+
+    ttl: Optional[int] = None
+    """Time To Live (TTL) in number of hops of the GRE tunnel."""
+
+
+class GRETunnelBulkUpdateResponse(BaseModel):
+    modified: Optional[bool] = None
+
+    modified_gre_tunnels: Optional[List[ModifiedGRETunnel]] = None
diff --git a/src/cloudflare/types/magic_transit/gre_tunnel_create_params.py b/src/cloudflare/types/magic_transit/gre_tunnel_create_params.py
index 3e2fa625ec0..2e8e4a5b8e8 100644
--- a/src/cloudflare/types/magic_transit/gre_tunnel_create_params.py
+++ b/src/cloudflare/types/magic_transit/gre_tunnel_create_params.py
@@ -2,13 +2,155 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import Union
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
 
-__all__ = ["GRETunnelCreateParams"]
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+from .health_check_rate import HealthCheckRate
+from .health_check_type import HealthCheckType
+
+__all__ = [
+    "GRETunnelCreateParams",
+    "BGP",
+    "HealthCheck",
+    "HealthCheckTarget",
+    "HealthCheckTargetMagicHealthCheckTarget",
+]
 
 
 class GRETunnelCreateParams(TypedDict, total=False):
     account_id: Required[str]
     """Identifier"""
 
-    body: Required[object]
+    cloudflare_gre_endpoint: Required[str]
+    """The IP address assigned to the Cloudflare side of the GRE tunnel."""
+
+    customer_gre_endpoint: Required[str]
+    """The IP address assigned to the customer side of the GRE tunnel."""
+
+    interface_address: Required[str]
+    """
+    A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+    of the tunnel. Select the subnet from the following private IP space:
+    10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+    """
+
+    name: Required[str]
+    """The name of the tunnel.
+
+    The name cannot contain spaces or special characters, must be 15 characters or
+    less, and cannot share a name with another GRE tunnel.
+    """
+
+    automatic_return_routing: bool
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
+    bgp: BGP
+
+    description: str
+    """An optional description of the GRE tunnel."""
+
+    health_check: HealthCheck
+
+    interface_address6: str
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
+
+    mtu: int
+    """Maximum Transmission Unit (MTU) in bytes for the GRE tunnel.
+
+    The minimum value is 576.
+    """
+
+    ttl: int
+    """Time To Live (TTL) in number of hops of the GRE tunnel."""
+
+    x_magic_new_hc_target: Annotated[bool, PropertyInfo(alias="x-magic-new-hc-target")]
+
+
+class BGP(TypedDict, total=False):
+    customer_asn: Required[int]
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: SequenceNotStr[str]
+    """
+    Prefixes in this list will be advertised to the customer device, in addition to
+    the routes in the Magic routing table.
+    """
+
+    md5_key: str
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class HealthCheckTargetMagicHealthCheckTarget(TypedDict, total=False):
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded to this address. This field defaults to `customer_gre_endpoint address`. This field is ignored for bidirectional healthchecks as the interface_address (not assigned to the Cloudflare side of the tunnel) is used as the target.
+    """
+
+    saved: str
+    """The saved health check target.
+
+    Setting the value to the empty string indicates that the calculated default
+    value will be used.
+    """
+
+
+HealthCheckTarget: TypeAlias = Union[HealthCheckTargetMagicHealthCheckTarget, str]
+
+
+class HealthCheck(TypedDict, total=False):
+    direction: Literal["unidirectional", "bidirectional"]
+    """The direction of the flow of the healthcheck.
+
+    Either unidirectional, where the probe comes to you via the tunnel and the
+    result comes back to Cloudflare via the open Internet, or bidirectional where
+    both the probe and result come and go via the tunnel.
+    """
+
+    enabled: bool
+    """Determines whether to run healthchecks for a tunnel."""
+
+    rate: HealthCheckRate
+    """How frequent the health check is run. The default value is `mid`."""
+
+    target: HealthCheckTarget
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the
+    ICMP echo will be forwarded to this address. This field defaults to
+    `customer_gre_endpoint address`. This field is ignored for bidirectional
+    healthchecks as the interface_address (not assigned to the Cloudflare side of
+    the tunnel) is used as the target. Must be in object form if the
+    x-magic-new-hc-target header is set to true and string form if
+    x-magic-new-hc-target is absent or set to false.
+    """
+
+    type: HealthCheckType
+    """The type of healthcheck to run, reply or request. The default value is `reply`."""
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 cb4d4c1b6ab..d9af36faaab 100644
--- a/src/cloudflare/types/magic_transit/gre_tunnel_create_response.py
+++ b/src/cloudflare/types/magic_transit/gre_tunnel_create_response.py
@@ -1,15 +1,132 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List, Union, Optional
 from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
-from .health_check import HealthCheck
+from .health_check_rate import HealthCheckRate
+from .health_check_type import HealthCheckType
 
-__all__ = ["GRETunnelCreateResponse", "GRETunnel"]
+__all__ = [
+    "GRETunnelCreateResponse",
+    "BGP",
+    "BGPStatus",
+    "HealthCheck",
+    "HealthCheckTarget",
+    "HealthCheckTargetMagicHealthCheckTarget",
+]
 
 
-class GRETunnel(BaseModel):
+class BGP(BaseModel):
+    customer_asn: int
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: Optional[List[str]] = None
+    """
+    Prefixes in this list will be advertised to the customer device, in addition to
+    the routes in the Magic routing table.
+    """
+
+    md5_key: Optional[str] = None
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class BGPStatus(BaseModel):
+    state: Literal["BGP_DOWN", "BGP_UP", "BGP_ESTABLISHING"]
+
+    tcp_established: bool
+
+    updated_at: datetime
+
+    bgp_state: Optional[str] = None
+
+    cf_speaker_ip: Optional[str] = None
+
+    cf_speaker_port: Optional[int] = None
+
+    customer_speaker_ip: Optional[str] = None
+
+    customer_speaker_port: Optional[int] = None
+
+
+class HealthCheckTargetMagicHealthCheckTarget(BaseModel):
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded to this address. This field defaults to `customer_gre_endpoint address`. This field is ignored for bidirectional healthchecks as the interface_address (not assigned to the Cloudflare side of the tunnel) is used as the target.
+    """
+
+    effective: Optional[str] = None
+    """The effective health check target.
+
+    If 'saved' is empty, then this field will be populated with the calculated
+    default value on GET requests. Ignored in POST, PUT, and PATCH requests.
+    """
+
+    saved: Optional[str] = None
+    """The saved health check target.
+
+    Setting the value to the empty string indicates that the calculated default
+    value will be used.
+    """
+
+
+HealthCheckTarget: TypeAlias = Union[HealthCheckTargetMagicHealthCheckTarget, str]
+
+
+class HealthCheck(BaseModel):
+    direction: Optional[Literal["unidirectional", "bidirectional"]] = None
+    """The direction of the flow of the healthcheck.
+
+    Either unidirectional, where the probe comes to you via the tunnel and the
+    result comes back to Cloudflare via the open Internet, or bidirectional where
+    both the probe and result come and go via the tunnel.
+    """
+
+    enabled: Optional[bool] = None
+    """Determines whether to run healthchecks for a tunnel."""
+
+    rate: Optional[HealthCheckRate] = None
+    """How frequent the health check is run. The default value is `mid`."""
+
+    target: Optional[HealthCheckTarget] = None
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the
+    ICMP echo will be forwarded to this address. This field defaults to
+    `customer_gre_endpoint address`. This field is ignored for bidirectional
+    healthchecks as the interface_address (not assigned to the Cloudflare side of
+    the tunnel) is used as the target. Must be in object form if the
+    x-magic-new-hc-target header is set to true and string form if
+    x-magic-new-hc-target is absent or set to false.
+    """
+
+    type: Optional[HealthCheckType] = None
+    """The type of healthcheck to run, reply or request. The default value is `reply`."""
+
+
+class GRETunnelCreateResponse(BaseModel):
+    id: str
+    """Identifier"""
+
     cloudflare_gre_endpoint: str
     """The IP address assigned to the Cloudflare side of the GRE tunnel."""
 
@@ -30,8 +147,15 @@ class GRETunnel(BaseModel):
     less, and cannot share a name with another GRE tunnel.
     """
 
-    id: Optional[str] = None
-    """Tunnel identifier tag."""
+    automatic_return_routing: Optional[bool] = None
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
+    bgp: Optional[BGP] = None
+
+    bgp_status: Optional[BGPStatus] = None
 
     created_on: Optional[datetime] = None
     """The date and time the tunnel was created."""
@@ -41,6 +165,14 @@ class GRETunnel(BaseModel):
 
     health_check: Optional[HealthCheck] = None
 
+    interface_address6: Optional[str] = None
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
+
     modified_on: Optional[datetime] = None
     """The date and time the tunnel was last modified."""
 
@@ -52,7 +184,3 @@ class GRETunnel(BaseModel):
 
     ttl: Optional[int] = None
     """Time To Live (TTL) in number of hops of the GRE tunnel."""
-
-
-class GRETunnelCreateResponse(BaseModel):
-    gre_tunnels: Optional[List[GRETunnel]] = None
diff --git a/src/cloudflare/types/magic_transit/gre_tunnel_delete_response.py b/src/cloudflare/types/magic_transit/gre_tunnel_delete_response.py
index 5165f2dcc3b..c31aed82b80 100644
--- a/src/cloudflare/types/magic_transit/gre_tunnel_delete_response.py
+++ b/src/cloudflare/types/magic_transit/gre_tunnel_delete_response.py
@@ -1,13 +1,193 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
+from .health_check_rate import HealthCheckRate
+from .health_check_type import HealthCheckType
 
-__all__ = ["GRETunnelDeleteResponse"]
+__all__ = [
+    "GRETunnelDeleteResponse",
+    "DeletedGRETunnel",
+    "DeletedGRETunnelBGP",
+    "DeletedGRETunnelBGPStatus",
+    "DeletedGRETunnelHealthCheck",
+    "DeletedGRETunnelHealthCheckTarget",
+    "DeletedGRETunnelHealthCheckTargetMagicHealthCheckTarget",
+]
+
+
+class DeletedGRETunnelBGP(BaseModel):
+    customer_asn: int
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: Optional[List[str]] = None
+    """
+    Prefixes in this list will be advertised to the customer device, in addition to
+    the routes in the Magic routing table.
+    """
+
+    md5_key: Optional[str] = None
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class DeletedGRETunnelBGPStatus(BaseModel):
+    state: Literal["BGP_DOWN", "BGP_UP", "BGP_ESTABLISHING"]
+
+    tcp_established: bool
+
+    updated_at: datetime
+
+    bgp_state: Optional[str] = None
+
+    cf_speaker_ip: Optional[str] = None
+
+    cf_speaker_port: Optional[int] = None
+
+    customer_speaker_ip: Optional[str] = None
+
+    customer_speaker_port: Optional[int] = None
+
+
+class DeletedGRETunnelHealthCheckTargetMagicHealthCheckTarget(BaseModel):
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded to this address. This field defaults to `customer_gre_endpoint address`. This field is ignored for bidirectional healthchecks as the interface_address (not assigned to the Cloudflare side of the tunnel) is used as the target.
+    """
+
+    effective: Optional[str] = None
+    """The effective health check target.
+
+    If 'saved' is empty, then this field will be populated with the calculated
+    default value on GET requests. Ignored in POST, PUT, and PATCH requests.
+    """
+
+    saved: Optional[str] = None
+    """The saved health check target.
+
+    Setting the value to the empty string indicates that the calculated default
+    value will be used.
+    """
+
+
+DeletedGRETunnelHealthCheckTarget: TypeAlias = Union[DeletedGRETunnelHealthCheckTargetMagicHealthCheckTarget, str]
+
+
+class DeletedGRETunnelHealthCheck(BaseModel):
+    direction: Optional[Literal["unidirectional", "bidirectional"]] = None
+    """The direction of the flow of the healthcheck.
+
+    Either unidirectional, where the probe comes to you via the tunnel and the
+    result comes back to Cloudflare via the open Internet, or bidirectional where
+    both the probe and result come and go via the tunnel.
+    """
+
+    enabled: Optional[bool] = None
+    """Determines whether to run healthchecks for a tunnel."""
+
+    rate: Optional[HealthCheckRate] = None
+    """How frequent the health check is run. The default value is `mid`."""
+
+    target: Optional[DeletedGRETunnelHealthCheckTarget] = None
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the
+    ICMP echo will be forwarded to this address. This field defaults to
+    `customer_gre_endpoint address`. This field is ignored for bidirectional
+    healthchecks as the interface_address (not assigned to the Cloudflare side of
+    the tunnel) is used as the target. Must be in object form if the
+    x-magic-new-hc-target header is set to true and string form if
+    x-magic-new-hc-target is absent or set to false.
+    """
+
+    type: Optional[HealthCheckType] = None
+    """The type of healthcheck to run, reply or request. The default value is `reply`."""
+
+
+class DeletedGRETunnel(BaseModel):
+    id: str
+    """Identifier"""
+
+    cloudflare_gre_endpoint: str
+    """The IP address assigned to the Cloudflare side of the GRE tunnel."""
+
+    customer_gre_endpoint: str
+    """The IP address assigned to the customer side of the GRE tunnel."""
+
+    interface_address: str
+    """
+    A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+    of the tunnel. Select the subnet from the following private IP space:
+    10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+    """
+
+    name: str
+    """The name of the tunnel.
+
+    The name cannot contain spaces or special characters, must be 15 characters or
+    less, and cannot share a name with another GRE tunnel.
+    """
+
+    automatic_return_routing: Optional[bool] = None
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
+    bgp: Optional[DeletedGRETunnelBGP] = None
+
+    bgp_status: Optional[DeletedGRETunnelBGPStatus] = None
+
+    created_on: Optional[datetime] = None
+    """The date and time the tunnel was created."""
+
+    description: Optional[str] = None
+    """An optional description of the GRE tunnel."""
+
+    health_check: Optional[DeletedGRETunnelHealthCheck] = None
+
+    interface_address6: Optional[str] = None
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
+
+    modified_on: Optional[datetime] = None
+    """The date and time the tunnel was last modified."""
+
+    mtu: Optional[int] = None
+    """Maximum Transmission Unit (MTU) in bytes for the GRE tunnel.
+
+    The minimum value is 576.
+    """
+
+    ttl: Optional[int] = None
+    """Time To Live (TTL) in number of hops of the GRE tunnel."""
 
 
 class GRETunnelDeleteResponse(BaseModel):
     deleted: Optional[bool] = None
 
-    deleted_gre_tunnel: Optional[object] = None
+    deleted_gre_tunnel: Optional[DeletedGRETunnel] = None
diff --git a/src/cloudflare/types/magic_transit/gre_tunnel_get_response.py b/src/cloudflare/types/magic_transit/gre_tunnel_get_response.py
index 141c70992f1..77e2db7f295 100644
--- a/src/cloudflare/types/magic_transit/gre_tunnel_get_response.py
+++ b/src/cloudflare/types/magic_transit/gre_tunnel_get_response.py
@@ -1,11 +1,191 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
+from .health_check_rate import HealthCheckRate
+from .health_check_type import HealthCheckType
 
-__all__ = ["GRETunnelGetResponse"]
+__all__ = [
+    "GRETunnelGetResponse",
+    "GRETunnel",
+    "GRETunnelBGP",
+    "GRETunnelBGPStatus",
+    "GRETunnelHealthCheck",
+    "GRETunnelHealthCheckTarget",
+    "GRETunnelHealthCheckTargetMagicHealthCheckTarget",
+]
+
+
+class GRETunnelBGP(BaseModel):
+    customer_asn: int
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: Optional[List[str]] = None
+    """
+    Prefixes in this list will be advertised to the customer device, in addition to
+    the routes in the Magic routing table.
+    """
+
+    md5_key: Optional[str] = None
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class GRETunnelBGPStatus(BaseModel):
+    state: Literal["BGP_DOWN", "BGP_UP", "BGP_ESTABLISHING"]
+
+    tcp_established: bool
+
+    updated_at: datetime
+
+    bgp_state: Optional[str] = None
+
+    cf_speaker_ip: Optional[str] = None
+
+    cf_speaker_port: Optional[int] = None
+
+    customer_speaker_ip: Optional[str] = None
+
+    customer_speaker_port: Optional[int] = None
+
+
+class GRETunnelHealthCheckTargetMagicHealthCheckTarget(BaseModel):
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded to this address. This field defaults to `customer_gre_endpoint address`. This field is ignored for bidirectional healthchecks as the interface_address (not assigned to the Cloudflare side of the tunnel) is used as the target.
+    """
+
+    effective: Optional[str] = None
+    """The effective health check target.
+
+    If 'saved' is empty, then this field will be populated with the calculated
+    default value on GET requests. Ignored in POST, PUT, and PATCH requests.
+    """
+
+    saved: Optional[str] = None
+    """The saved health check target.
+
+    Setting the value to the empty string indicates that the calculated default
+    value will be used.
+    """
+
+
+GRETunnelHealthCheckTarget: TypeAlias = Union[GRETunnelHealthCheckTargetMagicHealthCheckTarget, str]
+
+
+class GRETunnelHealthCheck(BaseModel):
+    direction: Optional[Literal["unidirectional", "bidirectional"]] = None
+    """The direction of the flow of the healthcheck.
+
+    Either unidirectional, where the probe comes to you via the tunnel and the
+    result comes back to Cloudflare via the open Internet, or bidirectional where
+    both the probe and result come and go via the tunnel.
+    """
+
+    enabled: Optional[bool] = None
+    """Determines whether to run healthchecks for a tunnel."""
+
+    rate: Optional[HealthCheckRate] = None
+    """How frequent the health check is run. The default value is `mid`."""
+
+    target: Optional[GRETunnelHealthCheckTarget] = None
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the
+    ICMP echo will be forwarded to this address. This field defaults to
+    `customer_gre_endpoint address`. This field is ignored for bidirectional
+    healthchecks as the interface_address (not assigned to the Cloudflare side of
+    the tunnel) is used as the target. Must be in object form if the
+    x-magic-new-hc-target header is set to true and string form if
+    x-magic-new-hc-target is absent or set to false.
+    """
+
+    type: Optional[HealthCheckType] = None
+    """The type of healthcheck to run, reply or request. The default value is `reply`."""
+
+
+class GRETunnel(BaseModel):
+    id: str
+    """Identifier"""
+
+    cloudflare_gre_endpoint: str
+    """The IP address assigned to the Cloudflare side of the GRE tunnel."""
+
+    customer_gre_endpoint: str
+    """The IP address assigned to the customer side of the GRE tunnel."""
+
+    interface_address: str
+    """
+    A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+    of the tunnel. Select the subnet from the following private IP space:
+    10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+    """
+
+    name: str
+    """The name of the tunnel.
+
+    The name cannot contain spaces or special characters, must be 15 characters or
+    less, and cannot share a name with another GRE tunnel.
+    """
+
+    automatic_return_routing: Optional[bool] = None
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
+    bgp: Optional[GRETunnelBGP] = None
+
+    bgp_status: Optional[GRETunnelBGPStatus] = None
+
+    created_on: Optional[datetime] = None
+    """The date and time the tunnel was created."""
+
+    description: Optional[str] = None
+    """An optional description of the GRE tunnel."""
+
+    health_check: Optional[GRETunnelHealthCheck] = None
+
+    interface_address6: Optional[str] = None
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
+
+    modified_on: Optional[datetime] = None
+    """The date and time the tunnel was last modified."""
+
+    mtu: Optional[int] = None
+    """Maximum Transmission Unit (MTU) in bytes for the GRE tunnel.
+
+    The minimum value is 576.
+    """
+
+    ttl: Optional[int] = None
+    """Time To Live (TTL) in number of hops of the GRE tunnel."""
 
 
 class GRETunnelGetResponse(BaseModel):
-    gre_tunnel: Optional[object] = None
+    gre_tunnel: Optional[GRETunnel] = None
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 54f3538e769..45d3abf29dd 100644
--- a/src/cloudflare/types/magic_transit/gre_tunnel_list_response.py
+++ b/src/cloudflare/types/magic_transit/gre_tunnel_list_response.py
@@ -1,15 +1,133 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List, Union, Optional
 from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
-from .health_check import HealthCheck
+from .health_check_rate import HealthCheckRate
+from .health_check_type import HealthCheckType
 
-__all__ = ["GRETunnelListResponse", "GRETunnel"]
+__all__ = [
+    "GRETunnelListResponse",
+    "GRETunnel",
+    "GRETunnelBGP",
+    "GRETunnelBGPStatus",
+    "GRETunnelHealthCheck",
+    "GRETunnelHealthCheckTarget",
+    "GRETunnelHealthCheckTargetMagicHealthCheckTarget",
+]
+
+
+class GRETunnelBGP(BaseModel):
+    customer_asn: int
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: Optional[List[str]] = None
+    """
+    Prefixes in this list will be advertised to the customer device, in addition to
+    the routes in the Magic routing table.
+    """
+
+    md5_key: Optional[str] = None
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class GRETunnelBGPStatus(BaseModel):
+    state: Literal["BGP_DOWN", "BGP_UP", "BGP_ESTABLISHING"]
+
+    tcp_established: bool
+
+    updated_at: datetime
+
+    bgp_state: Optional[str] = None
+
+    cf_speaker_ip: Optional[str] = None
+
+    cf_speaker_port: Optional[int] = None
+
+    customer_speaker_ip: Optional[str] = None
+
+    customer_speaker_port: Optional[int] = None
+
+
+class GRETunnelHealthCheckTargetMagicHealthCheckTarget(BaseModel):
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded to this address. This field defaults to `customer_gre_endpoint address`. This field is ignored for bidirectional healthchecks as the interface_address (not assigned to the Cloudflare side of the tunnel) is used as the target.
+    """
+
+    effective: Optional[str] = None
+    """The effective health check target.
+
+    If 'saved' is empty, then this field will be populated with the calculated
+    default value on GET requests. Ignored in POST, PUT, and PATCH requests.
+    """
+
+    saved: Optional[str] = None
+    """The saved health check target.
+
+    Setting the value to the empty string indicates that the calculated default
+    value will be used.
+    """
+
+
+GRETunnelHealthCheckTarget: TypeAlias = Union[GRETunnelHealthCheckTargetMagicHealthCheckTarget, str]
+
+
+class GRETunnelHealthCheck(BaseModel):
+    direction: Optional[Literal["unidirectional", "bidirectional"]] = None
+    """The direction of the flow of the healthcheck.
+
+    Either unidirectional, where the probe comes to you via the tunnel and the
+    result comes back to Cloudflare via the open Internet, or bidirectional where
+    both the probe and result come and go via the tunnel.
+    """
+
+    enabled: Optional[bool] = None
+    """Determines whether to run healthchecks for a tunnel."""
+
+    rate: Optional[HealthCheckRate] = None
+    """How frequent the health check is run. The default value is `mid`."""
+
+    target: Optional[GRETunnelHealthCheckTarget] = None
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the
+    ICMP echo will be forwarded to this address. This field defaults to
+    `customer_gre_endpoint address`. This field is ignored for bidirectional
+    healthchecks as the interface_address (not assigned to the Cloudflare side of
+    the tunnel) is used as the target. Must be in object form if the
+    x-magic-new-hc-target header is set to true and string form if
+    x-magic-new-hc-target is absent or set to false.
+    """
+
+    type: Optional[HealthCheckType] = None
+    """The type of healthcheck to run, reply or request. The default value is `reply`."""
 
 
 class GRETunnel(BaseModel):
+    id: str
+    """Identifier"""
+
     cloudflare_gre_endpoint: str
     """The IP address assigned to the Cloudflare side of the GRE tunnel."""
 
@@ -30,8 +148,15 @@ class GRETunnel(BaseModel):
     less, and cannot share a name with another GRE tunnel.
     """
 
-    id: Optional[str] = None
-    """Tunnel identifier tag."""
+    automatic_return_routing: Optional[bool] = None
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
+    bgp: Optional[GRETunnelBGP] = None
+
+    bgp_status: Optional[GRETunnelBGPStatus] = None
 
     created_on: Optional[datetime] = None
     """The date and time the tunnel was created."""
@@ -39,7 +164,15 @@ class GRETunnel(BaseModel):
     description: Optional[str] = None
     """An optional description of the GRE tunnel."""
 
-    health_check: Optional[HealthCheck] = None
+    health_check: Optional[GRETunnelHealthCheck] = None
+
+    interface_address6: Optional[str] = None
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
 
     modified_on: Optional[datetime] = None
     """The date and time the tunnel was last modified."""
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 6d891bbe546..0081115a1d3 100644
--- a/src/cloudflare/types/magic_transit/gre_tunnel_update_params.py
+++ b/src/cloudflare/types/magic_transit/gre_tunnel_update_params.py
@@ -2,11 +2,14 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import Union
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
 
-from .health_check_param import HealthCheckParam
+from ..._utils import PropertyInfo
+from .health_check_rate import HealthCheckRate
+from .health_check_type import HealthCheckType
 
-__all__ = ["GRETunnelUpdateParams"]
+__all__ = ["GRETunnelUpdateParams", "HealthCheck", "HealthCheckTarget", "HealthCheckTargetMagicHealthCheckTarget"]
 
 
 class GRETunnelUpdateParams(TypedDict, total=False):
@@ -33,10 +36,24 @@ class GRETunnelUpdateParams(TypedDict, total=False):
     less, and cannot share a name with another GRE tunnel.
     """
 
+    automatic_return_routing: bool
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
     description: str
     """An optional description of the GRE tunnel."""
 
-    health_check: HealthCheckParam
+    health_check: HealthCheck
+
+    interface_address6: str
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
 
     mtu: int
     """Maximum Transmission Unit (MTU) in bytes for the GRE tunnel.
@@ -46,3 +63,53 @@ class GRETunnelUpdateParams(TypedDict, total=False):
 
     ttl: int
     """Time To Live (TTL) in number of hops of the GRE tunnel."""
+
+    x_magic_new_hc_target: Annotated[bool, PropertyInfo(alias="x-magic-new-hc-target")]
+
+
+class HealthCheckTargetMagicHealthCheckTarget(TypedDict, total=False):
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded to this address. This field defaults to `customer_gre_endpoint address`. This field is ignored for bidirectional healthchecks as the interface_address (not assigned to the Cloudflare side of the tunnel) is used as the target.
+    """
+
+    saved: str
+    """The saved health check target.
+
+    Setting the value to the empty string indicates that the calculated default
+    value will be used.
+    """
+
+
+HealthCheckTarget: TypeAlias = Union[HealthCheckTargetMagicHealthCheckTarget, str]
+
+
+class HealthCheck(TypedDict, total=False):
+    direction: Literal["unidirectional", "bidirectional"]
+    """The direction of the flow of the healthcheck.
+
+    Either unidirectional, where the probe comes to you via the tunnel and the
+    result comes back to Cloudflare via the open Internet, or bidirectional where
+    both the probe and result come and go via the tunnel.
+    """
+
+    enabled: bool
+    """Determines whether to run healthchecks for a tunnel."""
+
+    rate: HealthCheckRate
+    """How frequent the health check is run. The default value is `mid`."""
+
+    target: HealthCheckTarget
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the
+    ICMP echo will be forwarded to this address. This field defaults to
+    `customer_gre_endpoint address`. This field is ignored for bidirectional
+    healthchecks as the interface_address (not assigned to the Cloudflare side of
+    the tunnel) is used as the target. Must be in object form if the
+    x-magic-new-hc-target header is set to true and string form if
+    x-magic-new-hc-target is absent or set to false.
+    """
+
+    type: HealthCheckType
+    """The type of healthcheck to run, reply or request. The default value is `reply`."""
diff --git a/src/cloudflare/types/magic_transit/gre_tunnel_update_response.py b/src/cloudflare/types/magic_transit/gre_tunnel_update_response.py
index c84ba582d7e..637b448d880 100644
--- a/src/cloudflare/types/magic_transit/gre_tunnel_update_response.py
+++ b/src/cloudflare/types/magic_transit/gre_tunnel_update_response.py
@@ -1,13 +1,193 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
+from .health_check_rate import HealthCheckRate
+from .health_check_type import HealthCheckType
 
-__all__ = ["GRETunnelUpdateResponse"]
+__all__ = [
+    "GRETunnelUpdateResponse",
+    "ModifiedGRETunnel",
+    "ModifiedGRETunnelBGP",
+    "ModifiedGRETunnelBGPStatus",
+    "ModifiedGRETunnelHealthCheck",
+    "ModifiedGRETunnelHealthCheckTarget",
+    "ModifiedGRETunnelHealthCheckTargetMagicHealthCheckTarget",
+]
+
+
+class ModifiedGRETunnelBGP(BaseModel):
+    customer_asn: int
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: Optional[List[str]] = None
+    """
+    Prefixes in this list will be advertised to the customer device, in addition to
+    the routes in the Magic routing table.
+    """
+
+    md5_key: Optional[str] = None
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class ModifiedGRETunnelBGPStatus(BaseModel):
+    state: Literal["BGP_DOWN", "BGP_UP", "BGP_ESTABLISHING"]
+
+    tcp_established: bool
+
+    updated_at: datetime
+
+    bgp_state: Optional[str] = None
+
+    cf_speaker_ip: Optional[str] = None
+
+    cf_speaker_port: Optional[int] = None
+
+    customer_speaker_ip: Optional[str] = None
+
+    customer_speaker_port: Optional[int] = None
+
+
+class ModifiedGRETunnelHealthCheckTargetMagicHealthCheckTarget(BaseModel):
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded to this address. This field defaults to `customer_gre_endpoint address`. This field is ignored for bidirectional healthchecks as the interface_address (not assigned to the Cloudflare side of the tunnel) is used as the target.
+    """
+
+    effective: Optional[str] = None
+    """The effective health check target.
+
+    If 'saved' is empty, then this field will be populated with the calculated
+    default value on GET requests. Ignored in POST, PUT, and PATCH requests.
+    """
+
+    saved: Optional[str] = None
+    """The saved health check target.
+
+    Setting the value to the empty string indicates that the calculated default
+    value will be used.
+    """
+
+
+ModifiedGRETunnelHealthCheckTarget: TypeAlias = Union[ModifiedGRETunnelHealthCheckTargetMagicHealthCheckTarget, str]
+
+
+class ModifiedGRETunnelHealthCheck(BaseModel):
+    direction: Optional[Literal["unidirectional", "bidirectional"]] = None
+    """The direction of the flow of the healthcheck.
+
+    Either unidirectional, where the probe comes to you via the tunnel and the
+    result comes back to Cloudflare via the open Internet, or bidirectional where
+    both the probe and result come and go via the tunnel.
+    """
+
+    enabled: Optional[bool] = None
+    """Determines whether to run healthchecks for a tunnel."""
+
+    rate: Optional[HealthCheckRate] = None
+    """How frequent the health check is run. The default value is `mid`."""
+
+    target: Optional[ModifiedGRETunnelHealthCheckTarget] = None
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the
+    ICMP echo will be forwarded to this address. This field defaults to
+    `customer_gre_endpoint address`. This field is ignored for bidirectional
+    healthchecks as the interface_address (not assigned to the Cloudflare side of
+    the tunnel) is used as the target. Must be in object form if the
+    x-magic-new-hc-target header is set to true and string form if
+    x-magic-new-hc-target is absent or set to false.
+    """
+
+    type: Optional[HealthCheckType] = None
+    """The type of healthcheck to run, reply or request. The default value is `reply`."""
+
+
+class ModifiedGRETunnel(BaseModel):
+    id: str
+    """Identifier"""
+
+    cloudflare_gre_endpoint: str
+    """The IP address assigned to the Cloudflare side of the GRE tunnel."""
+
+    customer_gre_endpoint: str
+    """The IP address assigned to the customer side of the GRE tunnel."""
+
+    interface_address: str
+    """
+    A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+    of the tunnel. Select the subnet from the following private IP space:
+    10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+    """
+
+    name: str
+    """The name of the tunnel.
+
+    The name cannot contain spaces or special characters, must be 15 characters or
+    less, and cannot share a name with another GRE tunnel.
+    """
+
+    automatic_return_routing: Optional[bool] = None
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
+    bgp: Optional[ModifiedGRETunnelBGP] = None
+
+    bgp_status: Optional[ModifiedGRETunnelBGPStatus] = None
+
+    created_on: Optional[datetime] = None
+    """The date and time the tunnel was created."""
+
+    description: Optional[str] = None
+    """An optional description of the GRE tunnel."""
+
+    health_check: Optional[ModifiedGRETunnelHealthCheck] = None
+
+    interface_address6: Optional[str] = None
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
+
+    modified_on: Optional[datetime] = None
+    """The date and time the tunnel was last modified."""
+
+    mtu: Optional[int] = None
+    """Maximum Transmission Unit (MTU) in bytes for the GRE tunnel.
+
+    The minimum value is 576.
+    """
+
+    ttl: Optional[int] = None
+    """Time To Live (TTL) in number of hops of the GRE tunnel."""
 
 
 class GRETunnelUpdateResponse(BaseModel):
     modified: Optional[bool] = None
 
-    modified_gre_tunnel: Optional[object] = None
+    modified_gre_tunnel: Optional[ModifiedGRETunnel] = None
diff --git a/src/cloudflare/types/magic_transit/health_check.py b/src/cloudflare/types/magic_transit/health_check.py
index ae4874cb9ee..e9a7e77b46e 100644
--- a/src/cloudflare/types/magic_transit/health_check.py
+++ b/src/cloudflare/types/magic_transit/health_check.py
@@ -1,40 +1,56 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
-from typing_extensions import Literal
+from typing import Union, Optional
+from typing_extensions import TypeAlias
 
 from ..._models import BaseModel
 from .health_check_rate import HealthCheckRate
 from .health_check_type import HealthCheckType
 
-__all__ = ["HealthCheck"]
+__all__ = ["HealthCheck", "Target", "TargetMagicHealthCheckTarget"]
 
 
-class HealthCheck(BaseModel):
-    direction: Optional[Literal["unidirectional", "bidirectional"]] = None
-    """The direction of the flow of the healthcheck.
-
-    Either unidirectional, where the probe comes to you via the tunnel and the
-    result comes back to Cloudflare via the open Internet, or bidirectional where
-    both the probe and result come and go via the tunnel. Note in the case of
-    bidirecitonal healthchecks, the target field in health_check is ignored as the
-    interface_address is used to send traffic into the tunnel.
+class TargetMagicHealthCheckTarget(BaseModel):
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded to this address. This field defaults to `customer_gre_endpoint address`. This field is ignored for bidirectional healthchecks as the interface_address (not assigned to the Cloudflare side of the tunnel) is used as the target.
     """
 
+    effective: Optional[str] = None
+    """The effective health check target.
+
+    If 'saved' is empty, then this field will be populated with the calculated
+    default value on GET requests. Ignored in POST, PUT, and PATCH requests.
+    """
+
+    saved: Optional[str] = None
+    """The saved health check target.
+
+    Setting the value to the empty string indicates that the calculated default
+    value will be used.
+    """
+
+
+Target: TypeAlias = Union[TargetMagicHealthCheckTarget, str]
+
+
+class HealthCheck(BaseModel):
     enabled: Optional[bool] = None
     """Determines whether to run healthchecks for a tunnel."""
 
     rate: Optional[HealthCheckRate] = None
     """How frequent the health check is run. The default value is `mid`."""
 
-    target: Optional[str] = None
+    target: Optional[Target] = None
     """The destination address in a request type health check.
 
     After the healthcheck is decapsulated at the customer end of the tunnel, the
     ICMP echo will be forwarded to this address. This field defaults to
     `customer_gre_endpoint address`. This field is ignored for bidirectional
     healthchecks as the interface_address (not assigned to the Cloudflare side of
-    the tunnel) is used as the target.
+    the tunnel) is used as the target. Must be in object form if the
+    x-magic-new-hc-target header is set to true and string form if
+    x-magic-new-hc-target is absent or set to false.
     """
 
     type: Optional[HealthCheckType] = None
diff --git a/src/cloudflare/types/magic_transit/health_check_param.py b/src/cloudflare/types/magic_transit/health_check_param.py
index 10d28c17f4a..934d2b2dc94 100644
--- a/src/cloudflare/types/magic_transit/health_check_param.py
+++ b/src/cloudflare/types/magic_transit/health_check_param.py
@@ -2,39 +2,49 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal, TypedDict
+from typing import Union
+from typing_extensions import TypeAlias, TypedDict
 
 from .health_check_rate import HealthCheckRate
 from .health_check_type import HealthCheckType
 
-__all__ = ["HealthCheckParam"]
+__all__ = ["HealthCheckParam", "Target", "TargetMagicHealthCheckTarget"]
 
 
-class HealthCheckParam(TypedDict, total=False):
-    direction: Literal["unidirectional", "bidirectional"]
-    """The direction of the flow of the healthcheck.
-
-    Either unidirectional, where the probe comes to you via the tunnel and the
-    result comes back to Cloudflare via the open Internet, or bidirectional where
-    both the probe and result come and go via the tunnel. Note in the case of
-    bidirecitonal healthchecks, the target field in health_check is ignored as the
-    interface_address is used to send traffic into the tunnel.
+class TargetMagicHealthCheckTarget(TypedDict, total=False):
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded to this address. This field defaults to `customer_gre_endpoint address`. This field is ignored for bidirectional healthchecks as the interface_address (not assigned to the Cloudflare side of the tunnel) is used as the target.
+    """
+
+    saved: str
+    """The saved health check target.
+
+    Setting the value to the empty string indicates that the calculated default
+    value will be used.
     """
 
+
+Target: TypeAlias = Union[TargetMagicHealthCheckTarget, str]
+
+
+class HealthCheckParam(TypedDict, total=False):
     enabled: bool
     """Determines whether to run healthchecks for a tunnel."""
 
     rate: HealthCheckRate
     """How frequent the health check is run. The default value is `mid`."""
 
-    target: str
+    target: Target
     """The destination address in a request type health check.
 
     After the healthcheck is decapsulated at the customer end of the tunnel, the
     ICMP echo will be forwarded to this address. This field defaults to
     `customer_gre_endpoint address`. This field is ignored for bidirectional
     healthchecks as the interface_address (not assigned to the Cloudflare side of
-    the tunnel) is used as the target.
+    the tunnel) is used as the target. Must be in object form if the
+    x-magic-new-hc-target header is set to true and string form if
+    x-magic-new-hc-target is absent or set to false.
     """
 
     type: HealthCheckType
diff --git a/src/cloudflare/types/magic_transit/health_check_rate.py b/src/cloudflare/types/magic_transit/health_check_rate.py
index f0c649d64d7..f774ffc5d70 100644
--- a/src/cloudflare/types/magic_transit/health_check_rate.py
+++ b/src/cloudflare/types/magic_transit/health_check_rate.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["HealthCheckRate"]
 
-HealthCheckRate = Literal["low", "mid", "high"]
+HealthCheckRate: TypeAlias = Literal["low", "mid", "high"]
diff --git a/src/cloudflare/types/magic_transit/health_check_type.py b/src/cloudflare/types/magic_transit/health_check_type.py
index a1d16204e08..27197fa13dc 100644
--- a/src/cloudflare/types/magic_transit/health_check_type.py
+++ b/src/cloudflare/types/magic_transit/health_check_type.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["HealthCheckType"]
 
-HealthCheckType = Literal["reply", "request"]
+HealthCheckType: TypeAlias = Literal["reply", "request"]
diff --git a/src/cloudflare/types/magic_transit/ipsec_tunnel_bulk_update_params.py b/src/cloudflare/types/magic_transit/ipsec_tunnel_bulk_update_params.py
new file mode 100644
index 00000000000..c35b7181e30
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/ipsec_tunnel_bulk_update_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["IPSECTunnelBulkUpdateParams"]
+
+
+class IPSECTunnelBulkUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier"""
+
+    body: Required[object]
+
+    x_magic_new_hc_target: Annotated[bool, PropertyInfo(alias="x-magic-new-hc-target")]
diff --git a/src/cloudflare/types/magic_transit/ipsec_tunnel_bulk_update_response.py b/src/cloudflare/types/magic_transit/ipsec_tunnel_bulk_update_response.py
new file mode 100644
index 00000000000..6fa99f7d723
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/ipsec_tunnel_bulk_update_response.py
@@ -0,0 +1,216 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ..._models import BaseModel
+from .psk_metadata import PSKMetadata
+from .health_check_rate import HealthCheckRate
+from .health_check_type import HealthCheckType
+
+__all__ = [
+    "IPSECTunnelBulkUpdateResponse",
+    "ModifiedIPSECTunnel",
+    "ModifiedIPSECTunnelBGP",
+    "ModifiedIPSECTunnelBGPStatus",
+    "ModifiedIPSECTunnelCustomRemoteIdentities",
+    "ModifiedIPSECTunnelHealthCheck",
+    "ModifiedIPSECTunnelHealthCheckTarget",
+    "ModifiedIPSECTunnelHealthCheckTargetMagicHealthCheckTarget",
+]
+
+
+class ModifiedIPSECTunnelBGP(BaseModel):
+    customer_asn: int
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: Optional[List[str]] = None
+    """
+    Prefixes in this list will be advertised to the customer device, in addition to
+    the routes in the Magic routing table.
+    """
+
+    md5_key: Optional[str] = None
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class ModifiedIPSECTunnelBGPStatus(BaseModel):
+    state: Literal["BGP_DOWN", "BGP_UP", "BGP_ESTABLISHING"]
+
+    tcp_established: bool
+
+    updated_at: datetime
+
+    bgp_state: Optional[str] = None
+
+    cf_speaker_ip: Optional[str] = None
+
+    cf_speaker_port: Optional[int] = None
+
+    customer_speaker_ip: Optional[str] = None
+
+    customer_speaker_port: Optional[int] = None
+
+
+class ModifiedIPSECTunnelCustomRemoteIdentities(BaseModel):
+    fqdn_id: Optional[str] = None
+    """A custom IKE ID of type FQDN that may be used to identity the IPsec tunnel.
+
+    The generated IKE IDs can still be used even if this custom value is specified.
+
+    Must be of the form `<custom label>.<account ID>.custom.ipsec.cloudflare.com`.
+
+    This custom ID does not need to be unique. Two IPsec tunnels may have the same
+    custom fqdn_id. However, if another IPsec tunnel has the same value then the two
+    tunnels cannot have the same cloudflare_endpoint.
+    """
+
+
+class ModifiedIPSECTunnelHealthCheckTargetMagicHealthCheckTarget(BaseModel):
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded to this address. This field defaults to `customer_gre_endpoint address`. This field is ignored for bidirectional healthchecks as the interface_address (not assigned to the Cloudflare side of the tunnel) is used as the target.
+    """
+
+    effective: Optional[str] = None
+    """The effective health check target.
+
+    If 'saved' is empty, then this field will be populated with the calculated
+    default value on GET requests. Ignored in POST, PUT, and PATCH requests.
+    """
+
+    saved: Optional[str] = None
+    """The saved health check target.
+
+    Setting the value to the empty string indicates that the calculated default
+    value will be used.
+    """
+
+
+ModifiedIPSECTunnelHealthCheckTarget: TypeAlias = Union[ModifiedIPSECTunnelHealthCheckTargetMagicHealthCheckTarget, str]
+
+
+class ModifiedIPSECTunnelHealthCheck(BaseModel):
+    direction: Optional[Literal["unidirectional", "bidirectional"]] = None
+    """The direction of the flow of the healthcheck.
+
+    Either unidirectional, where the probe comes to you via the tunnel and the
+    result comes back to Cloudflare via the open Internet, or bidirectional where
+    both the probe and result come and go via the tunnel.
+    """
+
+    enabled: Optional[bool] = None
+    """Determines whether to run healthchecks for a tunnel."""
+
+    rate: Optional[HealthCheckRate] = None
+    """How frequent the health check is run. The default value is `mid`."""
+
+    target: Optional[ModifiedIPSECTunnelHealthCheckTarget] = None
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the
+    ICMP echo will be forwarded to this address. This field defaults to
+    `customer_gre_endpoint address`. This field is ignored for bidirectional
+    healthchecks as the interface_address (not assigned to the Cloudflare side of
+    the tunnel) is used as the target. Must be in object form if the
+    x-magic-new-hc-target header is set to true and string form if
+    x-magic-new-hc-target is absent or set to false.
+    """
+
+    type: Optional[HealthCheckType] = None
+    """The type of healthcheck to run, reply or request. The default value is `reply`."""
+
+
+class ModifiedIPSECTunnel(BaseModel):
+    id: str
+    """Identifier"""
+
+    cloudflare_endpoint: str
+    """The IP address assigned to the Cloudflare side of the IPsec tunnel."""
+
+    interface_address: str
+    """
+    A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+    of the tunnel. Select the subnet from the following private IP space:
+    10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+    """
+
+    name: str
+    """The name of the IPsec tunnel. The name cannot share a name with other tunnels."""
+
+    allow_null_cipher: Optional[bool] = None
+    """
+    When `true`, the tunnel can use a null-cipher (`ENCR_NULL`) in the ESP tunnel
+    (Phase 2).
+    """
+
+    automatic_return_routing: Optional[bool] = None
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
+    bgp: Optional[ModifiedIPSECTunnelBGP] = None
+
+    bgp_status: Optional[ModifiedIPSECTunnelBGPStatus] = None
+
+    created_on: Optional[datetime] = None
+    """The date and time the tunnel was created."""
+
+    custom_remote_identities: Optional[ModifiedIPSECTunnelCustomRemoteIdentities] = None
+
+    customer_endpoint: Optional[str] = None
+    """The IP address assigned to the customer side of the IPsec tunnel.
+
+    Not required, but must be set for proactive traceroutes to work.
+    """
+
+    description: Optional[str] = None
+    """An optional description forthe IPsec tunnel."""
+
+    health_check: Optional[ModifiedIPSECTunnelHealthCheck] = None
+
+    interface_address6: Optional[str] = None
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
+
+    modified_on: Optional[datetime] = None
+    """The date and time the tunnel was last modified."""
+
+    psk_metadata: Optional[PSKMetadata] = None
+    """The PSK metadata that includes when the PSK was generated."""
+
+    replay_protection: Optional[bool] = None
+    """
+    If `true`, then IPsec replay protection will be supported in the
+    Cloudflare-to-customer direction.
+    """
+
+
+class IPSECTunnelBulkUpdateResponse(BaseModel):
+    modified: Optional[bool] = None
+
+    modified_ipsec_tunnels: Optional[List[ModifiedIPSECTunnel]] = None
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 1b59178828f..1b6171df8e7 100644
--- a/src/cloudflare/types/magic_transit/ipsec_tunnel_create_params.py
+++ b/src/cloudflare/types/magic_transit/ipsec_tunnel_create_params.py
@@ -2,11 +2,22 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import Union
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
 
-from .health_check_param import HealthCheckParam
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+from .health_check_rate import HealthCheckRate
+from .health_check_type import HealthCheckType
 
-__all__ = ["IPSECTunnelCreateParams"]
+__all__ = [
+    "IPSECTunnelCreateParams",
+    "BGP",
+    "CustomRemoteIdentities",
+    "HealthCheck",
+    "HealthCheckTarget",
+    "HealthCheckTargetMagicHealthCheckTarget",
+]
 
 
 class IPSECTunnelCreateParams(TypedDict, total=False):
@@ -26,6 +37,16 @@ class IPSECTunnelCreateParams(TypedDict, total=False):
     name: Required[str]
     """The name of the IPsec tunnel. The name cannot share a name with other tunnels."""
 
+    automatic_return_routing: bool
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
+    bgp: BGP
+
+    custom_remote_identities: CustomRemoteIdentities
+
     customer_endpoint: str
     """The IP address assigned to the customer side of the IPsec tunnel.
 
@@ -35,7 +56,15 @@ class IPSECTunnelCreateParams(TypedDict, total=False):
     description: str
     """An optional description forthe IPsec tunnel."""
 
-    health_check: HealthCheckParam
+    health_check: HealthCheck
+
+    interface_address6: str
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
 
     psk: str
     """A randomly generated or provided string for use in the IPsec tunnel."""
@@ -45,3 +74,99 @@ class IPSECTunnelCreateParams(TypedDict, total=False):
     If `true`, then IPsec replay protection will be supported in the
     Cloudflare-to-customer direction.
     """
+
+    x_magic_new_hc_target: Annotated[bool, PropertyInfo(alias="x-magic-new-hc-target")]
+
+
+class BGP(TypedDict, total=False):
+    customer_asn: Required[int]
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: SequenceNotStr[str]
+    """
+    Prefixes in this list will be advertised to the customer device, in addition to
+    the routes in the Magic routing table.
+    """
+
+    md5_key: str
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class CustomRemoteIdentities(TypedDict, total=False):
+    fqdn_id: str
+    """A custom IKE ID of type FQDN that may be used to identity the IPsec tunnel.
+
+    The generated IKE IDs can still be used even if this custom value is specified.
+
+    Must be of the form `<custom label>.<account ID>.custom.ipsec.cloudflare.com`.
+
+    This custom ID does not need to be unique. Two IPsec tunnels may have the same
+    custom fqdn_id. However, if another IPsec tunnel has the same value then the two
+    tunnels cannot have the same cloudflare_endpoint.
+    """
+
+
+class HealthCheckTargetMagicHealthCheckTarget(TypedDict, total=False):
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded to this address. This field defaults to `customer_gre_endpoint address`. This field is ignored for bidirectional healthchecks as the interface_address (not assigned to the Cloudflare side of the tunnel) is used as the target.
+    """
+
+    saved: str
+    """The saved health check target.
+
+    Setting the value to the empty string indicates that the calculated default
+    value will be used.
+    """
+
+
+HealthCheckTarget: TypeAlias = Union[HealthCheckTargetMagicHealthCheckTarget, str]
+
+
+class HealthCheck(TypedDict, total=False):
+    direction: Literal["unidirectional", "bidirectional"]
+    """The direction of the flow of the healthcheck.
+
+    Either unidirectional, where the probe comes to you via the tunnel and the
+    result comes back to Cloudflare via the open Internet, or bidirectional where
+    both the probe and result come and go via the tunnel.
+    """
+
+    enabled: bool
+    """Determines whether to run healthchecks for a tunnel."""
+
+    rate: HealthCheckRate
+    """How frequent the health check is run. The default value is `mid`."""
+
+    target: HealthCheckTarget
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the
+    ICMP echo will be forwarded to this address. This field defaults to
+    `customer_gre_endpoint address`. This field is ignored for bidirectional
+    healthchecks as the interface_address (not assigned to the Cloudflare side of
+    the tunnel) is used as the target. Must be in object form if the
+    x-magic-new-hc-target header is set to true and string form if
+    x-magic-new-hc-target is absent or set to false.
+    """
+
+    type: HealthCheckType
+    """The type of healthcheck to run, reply or request. The default value is `reply`."""
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 21de60ecfcb..62a8802d687 100644
--- a/src/cloudflare/types/magic_transit/ipsec_tunnel_create_response.py
+++ b/src/cloudflare/types/magic_transit/ipsec_tunnel_create_response.py
@@ -1,36 +1,148 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List, Union, Optional
 from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
 from .psk_metadata import PSKMetadata
 from .health_check_rate import HealthCheckRate
 from .health_check_type import HealthCheckType
 
-__all__ = ["IPSECTunnelCreateResponse", "IPSECTunnel", "IPSECTunnelTunnelHealthCheck"]
+__all__ = [
+    "IPSECTunnelCreateResponse",
+    "BGP",
+    "BGPStatus",
+    "CustomRemoteIdentities",
+    "HealthCheck",
+    "HealthCheckTarget",
+    "HealthCheckTargetMagicHealthCheckTarget",
+]
 
 
-class IPSECTunnelTunnelHealthCheck(BaseModel):
+class BGP(BaseModel):
+    customer_asn: int
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: Optional[List[str]] = None
+    """
+    Prefixes in this list will be advertised to the customer device, in addition to
+    the routes in the Magic routing table.
+    """
+
+    md5_key: Optional[str] = None
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class BGPStatus(BaseModel):
+    state: Literal["BGP_DOWN", "BGP_UP", "BGP_ESTABLISHING"]
+
+    tcp_established: bool
+
+    updated_at: datetime
+
+    bgp_state: Optional[str] = None
+
+    cf_speaker_ip: Optional[str] = None
+
+    cf_speaker_port: Optional[int] = None
+
+    customer_speaker_ip: Optional[str] = None
+
+    customer_speaker_port: Optional[int] = None
+
+
+class CustomRemoteIdentities(BaseModel):
+    fqdn_id: Optional[str] = None
+    """A custom IKE ID of type FQDN that may be used to identity the IPsec tunnel.
+
+    The generated IKE IDs can still be used even if this custom value is specified.
+
+    Must be of the form `<custom label>.<account ID>.custom.ipsec.cloudflare.com`.
+
+    This custom ID does not need to be unique. Two IPsec tunnels may have the same
+    custom fqdn_id. However, if another IPsec tunnel has the same value then the two
+    tunnels cannot have the same cloudflare_endpoint.
+    """
+
+
+class HealthCheckTargetMagicHealthCheckTarget(BaseModel):
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded to this address. This field defaults to `customer_gre_endpoint address`. This field is ignored for bidirectional healthchecks as the interface_address (not assigned to the Cloudflare side of the tunnel) is used as the target.
+    """
+
+    effective: Optional[str] = None
+    """The effective health check target.
+
+    If 'saved' is empty, then this field will be populated with the calculated
+    default value on GET requests. Ignored in POST, PUT, and PATCH requests.
+    """
+
+    saved: Optional[str] = None
+    """The saved health check target.
+
+    Setting the value to the empty string indicates that the calculated default
+    value will be used.
+    """
+
+
+HealthCheckTarget: TypeAlias = Union[HealthCheckTargetMagicHealthCheckTarget, str]
+
+
+class HealthCheck(BaseModel):
+    direction: Optional[Literal["unidirectional", "bidirectional"]] = None
+    """The direction of the flow of the healthcheck.
+
+    Either unidirectional, where the probe comes to you via the tunnel and the
+    result comes back to Cloudflare via the open Internet, or bidirectional where
+    both the probe and result come and go via the tunnel.
+    """
+
     enabled: Optional[bool] = None
     """Determines whether to run healthchecks for a tunnel."""
 
     rate: Optional[HealthCheckRate] = None
     """How frequent the health check is run. The default value is `mid`."""
 
-    target: Optional[str] = None
+    target: Optional[HealthCheckTarget] = None
     """The destination address in a request type health check.
 
     After the healthcheck is decapsulated at the customer end of the tunnel, the
     ICMP echo will be forwarded to this address. This field defaults to
-    `customer_gre_endpoint address`.
+    `customer_gre_endpoint address`. This field is ignored for bidirectional
+    healthchecks as the interface_address (not assigned to the Cloudflare side of
+    the tunnel) is used as the target. Must be in object form if the
+    x-magic-new-hc-target header is set to true and string form if
+    x-magic-new-hc-target is absent or set to false.
     """
 
     type: Optional[HealthCheckType] = None
     """The type of healthcheck to run, reply or request. The default value is `reply`."""
 
 
-class IPSECTunnel(BaseModel):
+class IPSECTunnelCreateResponse(BaseModel):
+    id: str
+    """Identifier"""
+
     cloudflare_endpoint: str
     """The IP address assigned to the Cloudflare side of the IPsec tunnel."""
 
@@ -44,18 +156,27 @@ class IPSECTunnel(BaseModel):
     name: str
     """The name of the IPsec tunnel. The name cannot share a name with other tunnels."""
 
-    id: Optional[str] = None
-    """Tunnel identifier tag."""
-
     allow_null_cipher: Optional[bool] = None
     """
     When `true`, the tunnel can use a null-cipher (`ENCR_NULL`) in the ESP tunnel
     (Phase 2).
     """
 
+    automatic_return_routing: Optional[bool] = None
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
+    bgp: Optional[BGP] = None
+
+    bgp_status: Optional[BGPStatus] = None
+
     created_on: Optional[datetime] = None
     """The date and time the tunnel was created."""
 
+    custom_remote_identities: Optional[CustomRemoteIdentities] = None
+
     customer_endpoint: Optional[str] = None
     """The IP address assigned to the customer side of the IPsec tunnel.
 
@@ -65,6 +186,16 @@ class IPSECTunnel(BaseModel):
     description: Optional[str] = None
     """An optional description forthe IPsec tunnel."""
 
+    health_check: Optional[HealthCheck] = None
+
+    interface_address6: Optional[str] = None
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
+
     modified_on: Optional[datetime] = None
     """The date and time the tunnel was last modified."""
 
@@ -76,9 +207,3 @@ class IPSECTunnel(BaseModel):
     If `true`, then IPsec replay protection will be supported in the
     Cloudflare-to-customer direction.
     """
-
-    tunnel_health_check: Optional[IPSECTunnelTunnelHealthCheck] = None
-
-
-class IPSECTunnelCreateResponse(BaseModel):
-    ipsec_tunnels: Optional[List[IPSECTunnel]] = None
diff --git a/src/cloudflare/types/magic_transit/ipsec_tunnel_delete_response.py b/src/cloudflare/types/magic_transit/ipsec_tunnel_delete_response.py
index b39ba183f72..20b73971937 100644
--- a/src/cloudflare/types/magic_transit/ipsec_tunnel_delete_response.py
+++ b/src/cloudflare/types/magic_transit/ipsec_tunnel_delete_response.py
@@ -1,13 +1,216 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
+from .psk_metadata import PSKMetadata
+from .health_check_rate import HealthCheckRate
+from .health_check_type import HealthCheckType
 
-__all__ = ["IPSECTunnelDeleteResponse"]
+__all__ = [
+    "IPSECTunnelDeleteResponse",
+    "DeletedIPSECTunnel",
+    "DeletedIPSECTunnelBGP",
+    "DeletedIPSECTunnelBGPStatus",
+    "DeletedIPSECTunnelCustomRemoteIdentities",
+    "DeletedIPSECTunnelHealthCheck",
+    "DeletedIPSECTunnelHealthCheckTarget",
+    "DeletedIPSECTunnelHealthCheckTargetMagicHealthCheckTarget",
+]
+
+
+class DeletedIPSECTunnelBGP(BaseModel):
+    customer_asn: int
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: Optional[List[str]] = None
+    """
+    Prefixes in this list will be advertised to the customer device, in addition to
+    the routes in the Magic routing table.
+    """
+
+    md5_key: Optional[str] = None
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class DeletedIPSECTunnelBGPStatus(BaseModel):
+    state: Literal["BGP_DOWN", "BGP_UP", "BGP_ESTABLISHING"]
+
+    tcp_established: bool
+
+    updated_at: datetime
+
+    bgp_state: Optional[str] = None
+
+    cf_speaker_ip: Optional[str] = None
+
+    cf_speaker_port: Optional[int] = None
+
+    customer_speaker_ip: Optional[str] = None
+
+    customer_speaker_port: Optional[int] = None
+
+
+class DeletedIPSECTunnelCustomRemoteIdentities(BaseModel):
+    fqdn_id: Optional[str] = None
+    """A custom IKE ID of type FQDN that may be used to identity the IPsec tunnel.
+
+    The generated IKE IDs can still be used even if this custom value is specified.
+
+    Must be of the form `<custom label>.<account ID>.custom.ipsec.cloudflare.com`.
+
+    This custom ID does not need to be unique. Two IPsec tunnels may have the same
+    custom fqdn_id. However, if another IPsec tunnel has the same value then the two
+    tunnels cannot have the same cloudflare_endpoint.
+    """
+
+
+class DeletedIPSECTunnelHealthCheckTargetMagicHealthCheckTarget(BaseModel):
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded to this address. This field defaults to `customer_gre_endpoint address`. This field is ignored for bidirectional healthchecks as the interface_address (not assigned to the Cloudflare side of the tunnel) is used as the target.
+    """
+
+    effective: Optional[str] = None
+    """The effective health check target.
+
+    If 'saved' is empty, then this field will be populated with the calculated
+    default value on GET requests. Ignored in POST, PUT, and PATCH requests.
+    """
+
+    saved: Optional[str] = None
+    """The saved health check target.
+
+    Setting the value to the empty string indicates that the calculated default
+    value will be used.
+    """
+
+
+DeletedIPSECTunnelHealthCheckTarget: TypeAlias = Union[DeletedIPSECTunnelHealthCheckTargetMagicHealthCheckTarget, str]
+
+
+class DeletedIPSECTunnelHealthCheck(BaseModel):
+    direction: Optional[Literal["unidirectional", "bidirectional"]] = None
+    """The direction of the flow of the healthcheck.
+
+    Either unidirectional, where the probe comes to you via the tunnel and the
+    result comes back to Cloudflare via the open Internet, or bidirectional where
+    both the probe and result come and go via the tunnel.
+    """
+
+    enabled: Optional[bool] = None
+    """Determines whether to run healthchecks for a tunnel."""
+
+    rate: Optional[HealthCheckRate] = None
+    """How frequent the health check is run. The default value is `mid`."""
+
+    target: Optional[DeletedIPSECTunnelHealthCheckTarget] = None
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the
+    ICMP echo will be forwarded to this address. This field defaults to
+    `customer_gre_endpoint address`. This field is ignored for bidirectional
+    healthchecks as the interface_address (not assigned to the Cloudflare side of
+    the tunnel) is used as the target. Must be in object form if the
+    x-magic-new-hc-target header is set to true and string form if
+    x-magic-new-hc-target is absent or set to false.
+    """
+
+    type: Optional[HealthCheckType] = None
+    """The type of healthcheck to run, reply or request. The default value is `reply`."""
+
+
+class DeletedIPSECTunnel(BaseModel):
+    id: str
+    """Identifier"""
+
+    cloudflare_endpoint: str
+    """The IP address assigned to the Cloudflare side of the IPsec tunnel."""
+
+    interface_address: str
+    """
+    A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+    of the tunnel. Select the subnet from the following private IP space:
+    10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+    """
+
+    name: str
+    """The name of the IPsec tunnel. The name cannot share a name with other tunnels."""
+
+    allow_null_cipher: Optional[bool] = None
+    """
+    When `true`, the tunnel can use a null-cipher (`ENCR_NULL`) in the ESP tunnel
+    (Phase 2).
+    """
+
+    automatic_return_routing: Optional[bool] = None
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
+    bgp: Optional[DeletedIPSECTunnelBGP] = None
+
+    bgp_status: Optional[DeletedIPSECTunnelBGPStatus] = None
+
+    created_on: Optional[datetime] = None
+    """The date and time the tunnel was created."""
+
+    custom_remote_identities: Optional[DeletedIPSECTunnelCustomRemoteIdentities] = None
+
+    customer_endpoint: Optional[str] = None
+    """The IP address assigned to the customer side of the IPsec tunnel.
+
+    Not required, but must be set for proactive traceroutes to work.
+    """
+
+    description: Optional[str] = None
+    """An optional description forthe IPsec tunnel."""
+
+    health_check: Optional[DeletedIPSECTunnelHealthCheck] = None
+
+    interface_address6: Optional[str] = None
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
+
+    modified_on: Optional[datetime] = None
+    """The date and time the tunnel was last modified."""
+
+    psk_metadata: Optional[PSKMetadata] = None
+    """The PSK metadata that includes when the PSK was generated."""
+
+    replay_protection: Optional[bool] = None
+    """
+    If `true`, then IPsec replay protection will be supported in the
+    Cloudflare-to-customer direction.
+    """
 
 
 class IPSECTunnelDeleteResponse(BaseModel):
     deleted: Optional[bool] = None
 
-    deleted_ipsec_tunnel: Optional[object] = None
+    deleted_ipsec_tunnel: Optional[DeletedIPSECTunnel] = None
diff --git a/src/cloudflare/types/magic_transit/ipsec_tunnel_get_response.py b/src/cloudflare/types/magic_transit/ipsec_tunnel_get_response.py
index 816098c9ead..5a01d3e1a75 100644
--- a/src/cloudflare/types/magic_transit/ipsec_tunnel_get_response.py
+++ b/src/cloudflare/types/magic_transit/ipsec_tunnel_get_response.py
@@ -1,11 +1,214 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
+from .psk_metadata import PSKMetadata
+from .health_check_rate import HealthCheckRate
+from .health_check_type import HealthCheckType
 
-__all__ = ["IPSECTunnelGetResponse"]
+__all__ = [
+    "IPSECTunnelGetResponse",
+    "IPSECTunnel",
+    "IPSECTunnelBGP",
+    "IPSECTunnelBGPStatus",
+    "IPSECTunnelCustomRemoteIdentities",
+    "IPSECTunnelHealthCheck",
+    "IPSECTunnelHealthCheckTarget",
+    "IPSECTunnelHealthCheckTargetMagicHealthCheckTarget",
+]
+
+
+class IPSECTunnelBGP(BaseModel):
+    customer_asn: int
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: Optional[List[str]] = None
+    """
+    Prefixes in this list will be advertised to the customer device, in addition to
+    the routes in the Magic routing table.
+    """
+
+    md5_key: Optional[str] = None
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class IPSECTunnelBGPStatus(BaseModel):
+    state: Literal["BGP_DOWN", "BGP_UP", "BGP_ESTABLISHING"]
+
+    tcp_established: bool
+
+    updated_at: datetime
+
+    bgp_state: Optional[str] = None
+
+    cf_speaker_ip: Optional[str] = None
+
+    cf_speaker_port: Optional[int] = None
+
+    customer_speaker_ip: Optional[str] = None
+
+    customer_speaker_port: Optional[int] = None
+
+
+class IPSECTunnelCustomRemoteIdentities(BaseModel):
+    fqdn_id: Optional[str] = None
+    """A custom IKE ID of type FQDN that may be used to identity the IPsec tunnel.
+
+    The generated IKE IDs can still be used even if this custom value is specified.
+
+    Must be of the form `<custom label>.<account ID>.custom.ipsec.cloudflare.com`.
+
+    This custom ID does not need to be unique. Two IPsec tunnels may have the same
+    custom fqdn_id. However, if another IPsec tunnel has the same value then the two
+    tunnels cannot have the same cloudflare_endpoint.
+    """
+
+
+class IPSECTunnelHealthCheckTargetMagicHealthCheckTarget(BaseModel):
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded to this address. This field defaults to `customer_gre_endpoint address`. This field is ignored for bidirectional healthchecks as the interface_address (not assigned to the Cloudflare side of the tunnel) is used as the target.
+    """
+
+    effective: Optional[str] = None
+    """The effective health check target.
+
+    If 'saved' is empty, then this field will be populated with the calculated
+    default value on GET requests. Ignored in POST, PUT, and PATCH requests.
+    """
+
+    saved: Optional[str] = None
+    """The saved health check target.
+
+    Setting the value to the empty string indicates that the calculated default
+    value will be used.
+    """
+
+
+IPSECTunnelHealthCheckTarget: TypeAlias = Union[IPSECTunnelHealthCheckTargetMagicHealthCheckTarget, str]
+
+
+class IPSECTunnelHealthCheck(BaseModel):
+    direction: Optional[Literal["unidirectional", "bidirectional"]] = None
+    """The direction of the flow of the healthcheck.
+
+    Either unidirectional, where the probe comes to you via the tunnel and the
+    result comes back to Cloudflare via the open Internet, or bidirectional where
+    both the probe and result come and go via the tunnel.
+    """
+
+    enabled: Optional[bool] = None
+    """Determines whether to run healthchecks for a tunnel."""
+
+    rate: Optional[HealthCheckRate] = None
+    """How frequent the health check is run. The default value is `mid`."""
+
+    target: Optional[IPSECTunnelHealthCheckTarget] = None
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the
+    ICMP echo will be forwarded to this address. This field defaults to
+    `customer_gre_endpoint address`. This field is ignored for bidirectional
+    healthchecks as the interface_address (not assigned to the Cloudflare side of
+    the tunnel) is used as the target. Must be in object form if the
+    x-magic-new-hc-target header is set to true and string form if
+    x-magic-new-hc-target is absent or set to false.
+    """
+
+    type: Optional[HealthCheckType] = None
+    """The type of healthcheck to run, reply or request. The default value is `reply`."""
+
+
+class IPSECTunnel(BaseModel):
+    id: str
+    """Identifier"""
+
+    cloudflare_endpoint: str
+    """The IP address assigned to the Cloudflare side of the IPsec tunnel."""
+
+    interface_address: str
+    """
+    A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+    of the tunnel. Select the subnet from the following private IP space:
+    10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+    """
+
+    name: str
+    """The name of the IPsec tunnel. The name cannot share a name with other tunnels."""
+
+    allow_null_cipher: Optional[bool] = None
+    """
+    When `true`, the tunnel can use a null-cipher (`ENCR_NULL`) in the ESP tunnel
+    (Phase 2).
+    """
+
+    automatic_return_routing: Optional[bool] = None
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
+    bgp: Optional[IPSECTunnelBGP] = None
+
+    bgp_status: Optional[IPSECTunnelBGPStatus] = None
+
+    created_on: Optional[datetime] = None
+    """The date and time the tunnel was created."""
+
+    custom_remote_identities: Optional[IPSECTunnelCustomRemoteIdentities] = None
+
+    customer_endpoint: Optional[str] = None
+    """The IP address assigned to the customer side of the IPsec tunnel.
+
+    Not required, but must be set for proactive traceroutes to work.
+    """
+
+    description: Optional[str] = None
+    """An optional description forthe IPsec tunnel."""
+
+    health_check: Optional[IPSECTunnelHealthCheck] = None
+
+    interface_address6: Optional[str] = None
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
+
+    modified_on: Optional[datetime] = None
+    """The date and time the tunnel was last modified."""
+
+    psk_metadata: Optional[PSKMetadata] = None
+    """The PSK metadata that includes when the PSK was generated."""
+
+    replay_protection: Optional[bool] = None
+    """
+    If `true`, then IPsec replay protection will be supported in the
+    Cloudflare-to-customer direction.
+    """
 
 
 class IPSECTunnelGetResponse(BaseModel):
-    ipsec_tunnel: Optional[object] = None
+    ipsec_tunnel: Optional[IPSECTunnel] = None
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 7001f0e4eaa..a2671697a5a 100644
--- a/src/cloudflare/types/magic_transit/ipsec_tunnel_list_response.py
+++ b/src/cloudflare/types/magic_transit/ipsec_tunnel_list_response.py
@@ -1,29 +1,139 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List, Union, Optional
 from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
 from .psk_metadata import PSKMetadata
 from .health_check_rate import HealthCheckRate
 from .health_check_type import HealthCheckType
 
-__all__ = ["IPSECTunnelListResponse", "IPSECTunnel", "IPSECTunnelTunnelHealthCheck"]
+__all__ = [
+    "IPSECTunnelListResponse",
+    "IPSECTunnel",
+    "IPSECTunnelBGP",
+    "IPSECTunnelBGPStatus",
+    "IPSECTunnelCustomRemoteIdentities",
+    "IPSECTunnelHealthCheck",
+    "IPSECTunnelHealthCheckTarget",
+    "IPSECTunnelHealthCheckTargetMagicHealthCheckTarget",
+]
 
 
-class IPSECTunnelTunnelHealthCheck(BaseModel):
+class IPSECTunnelBGP(BaseModel):
+    customer_asn: int
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: Optional[List[str]] = None
+    """
+    Prefixes in this list will be advertised to the customer device, in addition to
+    the routes in the Magic routing table.
+    """
+
+    md5_key: Optional[str] = None
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class IPSECTunnelBGPStatus(BaseModel):
+    state: Literal["BGP_DOWN", "BGP_UP", "BGP_ESTABLISHING"]
+
+    tcp_established: bool
+
+    updated_at: datetime
+
+    bgp_state: Optional[str] = None
+
+    cf_speaker_ip: Optional[str] = None
+
+    cf_speaker_port: Optional[int] = None
+
+    customer_speaker_ip: Optional[str] = None
+
+    customer_speaker_port: Optional[int] = None
+
+
+class IPSECTunnelCustomRemoteIdentities(BaseModel):
+    fqdn_id: Optional[str] = None
+    """A custom IKE ID of type FQDN that may be used to identity the IPsec tunnel.
+
+    The generated IKE IDs can still be used even if this custom value is specified.
+
+    Must be of the form `<custom label>.<account ID>.custom.ipsec.cloudflare.com`.
+
+    This custom ID does not need to be unique. Two IPsec tunnels may have the same
+    custom fqdn_id. However, if another IPsec tunnel has the same value then the two
+    tunnels cannot have the same cloudflare_endpoint.
+    """
+
+
+class IPSECTunnelHealthCheckTargetMagicHealthCheckTarget(BaseModel):
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded to this address. This field defaults to `customer_gre_endpoint address`. This field is ignored for bidirectional healthchecks as the interface_address (not assigned to the Cloudflare side of the tunnel) is used as the target.
+    """
+
+    effective: Optional[str] = None
+    """The effective health check target.
+
+    If 'saved' is empty, then this field will be populated with the calculated
+    default value on GET requests. Ignored in POST, PUT, and PATCH requests.
+    """
+
+    saved: Optional[str] = None
+    """The saved health check target.
+
+    Setting the value to the empty string indicates that the calculated default
+    value will be used.
+    """
+
+
+IPSECTunnelHealthCheckTarget: TypeAlias = Union[IPSECTunnelHealthCheckTargetMagicHealthCheckTarget, str]
+
+
+class IPSECTunnelHealthCheck(BaseModel):
+    direction: Optional[Literal["unidirectional", "bidirectional"]] = None
+    """The direction of the flow of the healthcheck.
+
+    Either unidirectional, where the probe comes to you via the tunnel and the
+    result comes back to Cloudflare via the open Internet, or bidirectional where
+    both the probe and result come and go via the tunnel.
+    """
+
     enabled: Optional[bool] = None
     """Determines whether to run healthchecks for a tunnel."""
 
     rate: Optional[HealthCheckRate] = None
     """How frequent the health check is run. The default value is `mid`."""
 
-    target: Optional[str] = None
+    target: Optional[IPSECTunnelHealthCheckTarget] = None
     """The destination address in a request type health check.
 
     After the healthcheck is decapsulated at the customer end of the tunnel, the
     ICMP echo will be forwarded to this address. This field defaults to
-    `customer_gre_endpoint address`.
+    `customer_gre_endpoint address`. This field is ignored for bidirectional
+    healthchecks as the interface_address (not assigned to the Cloudflare side of
+    the tunnel) is used as the target. Must be in object form if the
+    x-magic-new-hc-target header is set to true and string form if
+    x-magic-new-hc-target is absent or set to false.
     """
 
     type: Optional[HealthCheckType] = None
@@ -31,6 +141,9 @@ class IPSECTunnelTunnelHealthCheck(BaseModel):
 
 
 class IPSECTunnel(BaseModel):
+    id: str
+    """Identifier"""
+
     cloudflare_endpoint: str
     """The IP address assigned to the Cloudflare side of the IPsec tunnel."""
 
@@ -44,18 +157,27 @@ class IPSECTunnel(BaseModel):
     name: str
     """The name of the IPsec tunnel. The name cannot share a name with other tunnels."""
 
-    id: Optional[str] = None
-    """Tunnel identifier tag."""
-
     allow_null_cipher: Optional[bool] = None
     """
     When `true`, the tunnel can use a null-cipher (`ENCR_NULL`) in the ESP tunnel
     (Phase 2).
     """
 
+    automatic_return_routing: Optional[bool] = None
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
+    bgp: Optional[IPSECTunnelBGP] = None
+
+    bgp_status: Optional[IPSECTunnelBGPStatus] = None
+
     created_on: Optional[datetime] = None
     """The date and time the tunnel was created."""
 
+    custom_remote_identities: Optional[IPSECTunnelCustomRemoteIdentities] = None
+
     customer_endpoint: Optional[str] = None
     """The IP address assigned to the customer side of the IPsec tunnel.
 
@@ -65,6 +187,16 @@ class IPSECTunnel(BaseModel):
     description: Optional[str] = None
     """An optional description forthe IPsec tunnel."""
 
+    health_check: Optional[IPSECTunnelHealthCheck] = None
+
+    interface_address6: Optional[str] = None
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
+
     modified_on: Optional[datetime] = None
     """The date and time the tunnel was last modified."""
 
@@ -77,8 +209,6 @@ class IPSECTunnel(BaseModel):
     Cloudflare-to-customer direction.
     """
 
-    tunnel_health_check: Optional[IPSECTunnelTunnelHealthCheck] = None
-
 
 class IPSECTunnelListResponse(BaseModel):
     ipsec_tunnels: Optional[List[IPSECTunnel]] = None
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 8a0170e0345..459e55c76ed 100644
--- a/src/cloudflare/types/magic_transit/ipsec_tunnel_update_params.py
+++ b/src/cloudflare/types/magic_transit/ipsec_tunnel_update_params.py
@@ -2,11 +2,22 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import Union
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
 
-from .health_check_param import HealthCheckParam
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+from .health_check_rate import HealthCheckRate
+from .health_check_type import HealthCheckType
 
-__all__ = ["IPSECTunnelUpdateParams"]
+__all__ = [
+    "IPSECTunnelUpdateParams",
+    "BGP",
+    "CustomRemoteIdentities",
+    "HealthCheck",
+    "HealthCheckTarget",
+    "HealthCheckTargetMagicHealthCheckTarget",
+]
 
 
 class IPSECTunnelUpdateParams(TypedDict, total=False):
@@ -26,6 +37,16 @@ class IPSECTunnelUpdateParams(TypedDict, total=False):
     name: Required[str]
     """The name of the IPsec tunnel. The name cannot share a name with other tunnels."""
 
+    automatic_return_routing: bool
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
+    bgp: BGP
+
+    custom_remote_identities: CustomRemoteIdentities
+
     customer_endpoint: str
     """The IP address assigned to the customer side of the IPsec tunnel.
 
@@ -35,7 +56,15 @@ class IPSECTunnelUpdateParams(TypedDict, total=False):
     description: str
     """An optional description forthe IPsec tunnel."""
 
-    health_check: HealthCheckParam
+    health_check: HealthCheck
+
+    interface_address6: str
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
 
     psk: str
     """A randomly generated or provided string for use in the IPsec tunnel."""
@@ -45,3 +74,99 @@ class IPSECTunnelUpdateParams(TypedDict, total=False):
     If `true`, then IPsec replay protection will be supported in the
     Cloudflare-to-customer direction.
     """
+
+    x_magic_new_hc_target: Annotated[bool, PropertyInfo(alias="x-magic-new-hc-target")]
+
+
+class BGP(TypedDict, total=False):
+    customer_asn: Required[int]
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: SequenceNotStr[str]
+    """
+    Prefixes in this list will be advertised to the customer device, in addition to
+    the routes in the Magic routing table.
+    """
+
+    md5_key: str
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class CustomRemoteIdentities(TypedDict, total=False):
+    fqdn_id: str
+    """A custom IKE ID of type FQDN that may be used to identity the IPsec tunnel.
+
+    The generated IKE IDs can still be used even if this custom value is specified.
+
+    Must be of the form `<custom label>.<account ID>.custom.ipsec.cloudflare.com`.
+
+    This custom ID does not need to be unique. Two IPsec tunnels may have the same
+    custom fqdn_id. However, if another IPsec tunnel has the same value then the two
+    tunnels cannot have the same cloudflare_endpoint.
+    """
+
+
+class HealthCheckTargetMagicHealthCheckTarget(TypedDict, total=False):
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded to this address. This field defaults to `customer_gre_endpoint address`. This field is ignored for bidirectional healthchecks as the interface_address (not assigned to the Cloudflare side of the tunnel) is used as the target.
+    """
+
+    saved: str
+    """The saved health check target.
+
+    Setting the value to the empty string indicates that the calculated default
+    value will be used.
+    """
+
+
+HealthCheckTarget: TypeAlias = Union[HealthCheckTargetMagicHealthCheckTarget, str]
+
+
+class HealthCheck(TypedDict, total=False):
+    direction: Literal["unidirectional", "bidirectional"]
+    """The direction of the flow of the healthcheck.
+
+    Either unidirectional, where the probe comes to you via the tunnel and the
+    result comes back to Cloudflare via the open Internet, or bidirectional where
+    both the probe and result come and go via the tunnel.
+    """
+
+    enabled: bool
+    """Determines whether to run healthchecks for a tunnel."""
+
+    rate: HealthCheckRate
+    """How frequent the health check is run. The default value is `mid`."""
+
+    target: HealthCheckTarget
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the
+    ICMP echo will be forwarded to this address. This field defaults to
+    `customer_gre_endpoint address`. This field is ignored for bidirectional
+    healthchecks as the interface_address (not assigned to the Cloudflare side of
+    the tunnel) is used as the target. Must be in object form if the
+    x-magic-new-hc-target header is set to true and string form if
+    x-magic-new-hc-target is absent or set to false.
+    """
+
+    type: HealthCheckType
+    """The type of healthcheck to run, reply or request. The default value is `reply`."""
diff --git a/src/cloudflare/types/magic_transit/ipsec_tunnel_update_response.py b/src/cloudflare/types/magic_transit/ipsec_tunnel_update_response.py
index 8a7b92e2b11..291befb11e9 100644
--- a/src/cloudflare/types/magic_transit/ipsec_tunnel_update_response.py
+++ b/src/cloudflare/types/magic_transit/ipsec_tunnel_update_response.py
@@ -1,13 +1,216 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
+from .psk_metadata import PSKMetadata
+from .health_check_rate import HealthCheckRate
+from .health_check_type import HealthCheckType
 
-__all__ = ["IPSECTunnelUpdateResponse"]
+__all__ = [
+    "IPSECTunnelUpdateResponse",
+    "ModifiedIPSECTunnel",
+    "ModifiedIPSECTunnelBGP",
+    "ModifiedIPSECTunnelBGPStatus",
+    "ModifiedIPSECTunnelCustomRemoteIdentities",
+    "ModifiedIPSECTunnelHealthCheck",
+    "ModifiedIPSECTunnelHealthCheckTarget",
+    "ModifiedIPSECTunnelHealthCheckTargetMagicHealthCheckTarget",
+]
+
+
+class ModifiedIPSECTunnelBGP(BaseModel):
+    customer_asn: int
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: Optional[List[str]] = None
+    """
+    Prefixes in this list will be advertised to the customer device, in addition to
+    the routes in the Magic routing table.
+    """
+
+    md5_key: Optional[str] = None
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class ModifiedIPSECTunnelBGPStatus(BaseModel):
+    state: Literal["BGP_DOWN", "BGP_UP", "BGP_ESTABLISHING"]
+
+    tcp_established: bool
+
+    updated_at: datetime
+
+    bgp_state: Optional[str] = None
+
+    cf_speaker_ip: Optional[str] = None
+
+    cf_speaker_port: Optional[int] = None
+
+    customer_speaker_ip: Optional[str] = None
+
+    customer_speaker_port: Optional[int] = None
+
+
+class ModifiedIPSECTunnelCustomRemoteIdentities(BaseModel):
+    fqdn_id: Optional[str] = None
+    """A custom IKE ID of type FQDN that may be used to identity the IPsec tunnel.
+
+    The generated IKE IDs can still be used even if this custom value is specified.
+
+    Must be of the form `<custom label>.<account ID>.custom.ipsec.cloudflare.com`.
+
+    This custom ID does not need to be unique. Two IPsec tunnels may have the same
+    custom fqdn_id. However, if another IPsec tunnel has the same value then the two
+    tunnels cannot have the same cloudflare_endpoint.
+    """
+
+
+class ModifiedIPSECTunnelHealthCheckTargetMagicHealthCheckTarget(BaseModel):
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded to this address. This field defaults to `customer_gre_endpoint address`. This field is ignored for bidirectional healthchecks as the interface_address (not assigned to the Cloudflare side of the tunnel) is used as the target.
+    """
+
+    effective: Optional[str] = None
+    """The effective health check target.
+
+    If 'saved' is empty, then this field will be populated with the calculated
+    default value on GET requests. Ignored in POST, PUT, and PATCH requests.
+    """
+
+    saved: Optional[str] = None
+    """The saved health check target.
+
+    Setting the value to the empty string indicates that the calculated default
+    value will be used.
+    """
+
+
+ModifiedIPSECTunnelHealthCheckTarget: TypeAlias = Union[ModifiedIPSECTunnelHealthCheckTargetMagicHealthCheckTarget, str]
+
+
+class ModifiedIPSECTunnelHealthCheck(BaseModel):
+    direction: Optional[Literal["unidirectional", "bidirectional"]] = None
+    """The direction of the flow of the healthcheck.
+
+    Either unidirectional, where the probe comes to you via the tunnel and the
+    result comes back to Cloudflare via the open Internet, or bidirectional where
+    both the probe and result come and go via the tunnel.
+    """
+
+    enabled: Optional[bool] = None
+    """Determines whether to run healthchecks for a tunnel."""
+
+    rate: Optional[HealthCheckRate] = None
+    """How frequent the health check is run. The default value is `mid`."""
+
+    target: Optional[ModifiedIPSECTunnelHealthCheckTarget] = None
+    """The destination address in a request type health check.
+
+    After the healthcheck is decapsulated at the customer end of the tunnel, the
+    ICMP echo will be forwarded to this address. This field defaults to
+    `customer_gre_endpoint address`. This field is ignored for bidirectional
+    healthchecks as the interface_address (not assigned to the Cloudflare side of
+    the tunnel) is used as the target. Must be in object form if the
+    x-magic-new-hc-target header is set to true and string form if
+    x-magic-new-hc-target is absent or set to false.
+    """
+
+    type: Optional[HealthCheckType] = None
+    """The type of healthcheck to run, reply or request. The default value is `reply`."""
+
+
+class ModifiedIPSECTunnel(BaseModel):
+    id: str
+    """Identifier"""
+
+    cloudflare_endpoint: str
+    """The IP address assigned to the Cloudflare side of the IPsec tunnel."""
+
+    interface_address: str
+    """
+    A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+    of the tunnel. Select the subnet from the following private IP space:
+    10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+    """
+
+    name: str
+    """The name of the IPsec tunnel. The name cannot share a name with other tunnels."""
+
+    allow_null_cipher: Optional[bool] = None
+    """
+    When `true`, the tunnel can use a null-cipher (`ENCR_NULL`) in the ESP tunnel
+    (Phase 2).
+    """
+
+    automatic_return_routing: Optional[bool] = None
+    """
+    True if automatic stateful return routing should be enabled for a tunnel, false
+    otherwise.
+    """
+
+    bgp: Optional[ModifiedIPSECTunnelBGP] = None
+
+    bgp_status: Optional[ModifiedIPSECTunnelBGPStatus] = None
+
+    created_on: Optional[datetime] = None
+    """The date and time the tunnel was created."""
+
+    custom_remote_identities: Optional[ModifiedIPSECTunnelCustomRemoteIdentities] = None
+
+    customer_endpoint: Optional[str] = None
+    """The IP address assigned to the customer side of the IPsec tunnel.
+
+    Not required, but must be set for proactive traceroutes to work.
+    """
+
+    description: Optional[str] = None
+    """An optional description forthe IPsec tunnel."""
+
+    health_check: Optional[ModifiedIPSECTunnelHealthCheck] = None
+
+    interface_address6: Optional[str] = None
+    """
+    A 127 bit IPV6 prefix from within the virtual_subnet6 prefix space with the
+    address being the first IP of the subnet and not same as the address of
+    virtual_subnet6. Eg if virtual_subnet6 is 2606:54c1:7:0:a9fe:12d2::/127 ,
+    interface_address6 could be 2606:54c1:7:0:a9fe:12d2:1:200/127
+    """
+
+    modified_on: Optional[datetime] = None
+    """The date and time the tunnel was last modified."""
+
+    psk_metadata: Optional[PSKMetadata] = None
+    """The PSK metadata that includes when the PSK was generated."""
+
+    replay_protection: Optional[bool] = None
+    """
+    If `true`, then IPsec replay protection will be supported in the
+    Cloudflare-to-customer direction.
+    """
 
 
 class IPSECTunnelUpdateResponse(BaseModel):
     modified: Optional[bool] = None
 
-    modified_ipsec_tunnel: Optional[object] = None
+    modified_ipsec_tunnel: Optional[ModifiedIPSECTunnel] = None
diff --git a/src/cloudflare/types/pcaps/pcap.py b/src/cloudflare/types/magic_transit/pcap.py
similarity index 82%
rename from src/cloudflare/types/pcaps/pcap.py
rename to src/cloudflare/types/magic_transit/pcap.py
index 849b466015c..f7e1d7cb30d 100644
--- a/src/cloudflare/types/pcaps/pcap.py
+++ b/src/cloudflare/types/magic_transit/pcap.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -16,6 +17,13 @@ class PCAP(BaseModel):
     filter_v1: Optional[PCAPFilter] = None
     """The packet capture filter. When this field is empty, all packets are captured."""
 
+    offset_time: Optional[datetime] = None
+    """The RFC 3339 offset timestamp from which to query backwards for packets.
+
+    Must be within the last 24h. When this field is empty, defaults to time of
+    request.
+    """
+
     status: Optional[
         Literal[
             "unknown", "success", "pending", "running", "conversion_pending", "conversion_running", "complete", "failed"
diff --git a/src/cloudflare/types/magic_transit/pcap_create_params.py b/src/cloudflare/types/magic_transit/pcap_create_params.py
new file mode 100644
index 00000000000..9f45d7a7416
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/pcap_create_params.py
@@ -0,0 +1,86 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ..._utils import PropertyInfo
+from .pcap_filter_param import PCAPFilterParam
+
+__all__ = ["PCAPCreateParams", "MagicVisibilityPCAPsPCAPsRequestSimple", "MagicVisibilityPCAPsPCAPsRequestFull"]
+
+
+class MagicVisibilityPCAPsPCAPsRequestSimple(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    packet_limit: Required[float]
+    """The limit of packets contained in a packet capture."""
+
+    system: Required[Literal["magic-transit"]]
+    """The system used to collect packet captures."""
+
+    time_limit: Required[float]
+    """The packet capture duration in seconds."""
+
+    type: Required[Literal["simple", "full"]]
+    """The type of packet capture.
+
+    `Simple` captures sampled packets, and `full` captures entire payloads and
+    non-sampled packets.
+    """
+
+    filter_v1: PCAPFilterParam
+    """The packet capture filter. When this field is empty, all packets are captured."""
+
+    offset_time: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """The RFC 3339 offset timestamp from which to query backwards for packets.
+
+    Must be within the last 24h. When this field is empty, defaults to time of
+    request.
+    """
+
+
+class MagicVisibilityPCAPsPCAPsRequestFull(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    colo_name: Required[str]
+    """The name of the data center used for the packet capture.
+
+    This can be a specific colo (ord02) or a multi-colo name (ORD). This field only
+    applies to `full` packet captures.
+    """
+
+    destination_conf: Required[str]
+    """The full URI for the bucket. This field only applies to `full` packet captures."""
+
+    system: Required[Literal["magic-transit"]]
+    """The system used to collect packet captures."""
+
+    time_limit: Required[float]
+    """The packet capture duration in seconds."""
+
+    type: Required[Literal["simple", "full"]]
+    """The type of packet capture.
+
+    `Simple` captures sampled packets, and `full` captures entire payloads and
+    non-sampled packets.
+    """
+
+    byte_limit: float
+    """The maximum number of bytes to capture.
+
+    This field only applies to `full` packet captures.
+    """
+
+    filter_v1: PCAPFilterParam
+    """The packet capture filter. When this field is empty, all packets are captured."""
+
+    packet_limit: float
+    """The limit of packets contained in a packet capture."""
+
+
+PCAPCreateParams: TypeAlias = Union[MagicVisibilityPCAPsPCAPsRequestSimple, MagicVisibilityPCAPsPCAPsRequestFull]
diff --git a/src/cloudflare/types/pcaps/pcap_create_response.py b/src/cloudflare/types/magic_transit/pcap_create_response.py
similarity index 76%
rename from src/cloudflare/types/pcaps/pcap_create_response.py
rename to src/cloudflare/types/magic_transit/pcap_create_response.py
index 8517c09d2dd..bbef4df51a4 100644
--- a/src/cloudflare/types/pcaps/pcap_create_response.py
+++ b/src/cloudflare/types/magic_transit/pcap_create_response.py
@@ -1,16 +1,17 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Union, Optional
-from typing_extensions import Literal
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
 from .pcap import PCAP
 from ..._models import BaseModel
 from .pcap_filter import PCAPFilter
 
-__all__ = ["PCAPCreateResponse", "MagicVisibilityPCAPsResponseFull"]
+__all__ = ["PCAPCreateResponse", "MagicVisibilityPCAPsPCAPsResponseFull"]
 
 
-class MagicVisibilityPCAPsResponseFull(BaseModel):
+class MagicVisibilityPCAPsPCAPsResponseFull(BaseModel):
     id: Optional[str] = None
     """The ID for the packet capture."""
 
@@ -39,6 +40,9 @@ class MagicVisibilityPCAPsResponseFull(BaseModel):
     filter_v1: Optional[PCAPFilter] = None
     """The packet capture filter. When this field is empty, all packets are captured."""
 
+    packets_captured: Optional[int] = None
+    """The number of packets captured."""
+
     status: Optional[
         Literal[
             "unknown", "success", "pending", "running", "conversion_pending", "conversion_running", "complete", "failed"
@@ -46,6 +50,12 @@ class MagicVisibilityPCAPsResponseFull(BaseModel):
     ] = None
     """The status of the packet capture request."""
 
+    stop_requested: Optional[datetime] = None
+    """The RFC 3339 timestamp when stopping the packet capture was requested.
+
+    This field only applies to `full` packet captures.
+    """
+
     submitted: Optional[str] = None
     """The RFC 3339 timestamp when the packet capture was created."""
 
@@ -63,4 +73,4 @@ class MagicVisibilityPCAPsResponseFull(BaseModel):
     """
 
 
-PCAPCreateResponse = Union[PCAP, MagicVisibilityPCAPsResponseFull]
+PCAPCreateResponse: TypeAlias = Union[PCAP, MagicVisibilityPCAPsPCAPsResponseFull]
diff --git a/src/cloudflare/types/pcaps/pcap_filter.py b/src/cloudflare/types/magic_transit/pcap_filter.py
similarity index 87%
rename from src/cloudflare/types/pcaps/pcap_filter.py
rename to src/cloudflare/types/magic_transit/pcap_filter.py
index edc1d8d3402..d0bc2f6b4f7 100644
--- a/src/cloudflare/types/pcaps/pcap_filter.py
+++ b/src/cloudflare/types/magic_transit/pcap_filter.py
@@ -8,6 +8,8 @@
 
 
 class PCAPFilter(BaseModel):
+    """The packet capture filter. When this field is empty, all packets are captured."""
+
     destination_address: Optional[str] = None
     """The destination IP address of the packet."""
 
diff --git a/src/cloudflare/types/pcaps/pcap_filter_param.py b/src/cloudflare/types/magic_transit/pcap_filter_param.py
similarity index 86%
rename from src/cloudflare/types/pcaps/pcap_filter_param.py
rename to src/cloudflare/types/magic_transit/pcap_filter_param.py
index 5808477bfc9..21f6823515d 100644
--- a/src/cloudflare/types/pcaps/pcap_filter_param.py
+++ b/src/cloudflare/types/magic_transit/pcap_filter_param.py
@@ -8,6 +8,8 @@
 
 
 class PCAPFilterParam(TypedDict, total=False):
+    """The packet capture filter. When this field is empty, all packets are captured."""
+
     destination_address: str
     """The destination IP address of the packet."""
 
diff --git a/src/cloudflare/types/pcaps/pcap_get_response.py b/src/cloudflare/types/magic_transit/pcap_get_response.py
similarity index 76%
rename from src/cloudflare/types/pcaps/pcap_get_response.py
rename to src/cloudflare/types/magic_transit/pcap_get_response.py
index 4b4ad1e9783..fe663bd15a5 100644
--- a/src/cloudflare/types/pcaps/pcap_get_response.py
+++ b/src/cloudflare/types/magic_transit/pcap_get_response.py
@@ -1,16 +1,17 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Union, Optional
-from typing_extensions import Literal
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
 from .pcap import PCAP
 from ..._models import BaseModel
 from .pcap_filter import PCAPFilter
 
-__all__ = ["PCAPGetResponse", "MagicVisibilityPCAPsResponseFull"]
+__all__ = ["PCAPGetResponse", "MagicVisibilityPCAPsPCAPsResponseFull"]
 
 
-class MagicVisibilityPCAPsResponseFull(BaseModel):
+class MagicVisibilityPCAPsPCAPsResponseFull(BaseModel):
     id: Optional[str] = None
     """The ID for the packet capture."""
 
@@ -39,6 +40,9 @@ class MagicVisibilityPCAPsResponseFull(BaseModel):
     filter_v1: Optional[PCAPFilter] = None
     """The packet capture filter. When this field is empty, all packets are captured."""
 
+    packets_captured: Optional[int] = None
+    """The number of packets captured."""
+
     status: Optional[
         Literal[
             "unknown", "success", "pending", "running", "conversion_pending", "conversion_running", "complete", "failed"
@@ -46,6 +50,12 @@ class MagicVisibilityPCAPsResponseFull(BaseModel):
     ] = None
     """The status of the packet capture request."""
 
+    stop_requested: Optional[datetime] = None
+    """The RFC 3339 timestamp when stopping the packet capture was requested.
+
+    This field only applies to `full` packet captures.
+    """
+
     submitted: Optional[str] = None
     """The RFC 3339 timestamp when the packet capture was created."""
 
@@ -63,4 +73,4 @@ class MagicVisibilityPCAPsResponseFull(BaseModel):
     """
 
 
-PCAPGetResponse = Union[PCAP, MagicVisibilityPCAPsResponseFull]
+PCAPGetResponse: TypeAlias = Union[PCAP, MagicVisibilityPCAPsPCAPsResponseFull]
diff --git a/src/cloudflare/types/pcaps/pcap_list_response.py b/src/cloudflare/types/magic_transit/pcap_list_response.py
similarity index 76%
rename from src/cloudflare/types/pcaps/pcap_list_response.py
rename to src/cloudflare/types/magic_transit/pcap_list_response.py
index ff1039713b4..661f116edca 100644
--- a/src/cloudflare/types/pcaps/pcap_list_response.py
+++ b/src/cloudflare/types/magic_transit/pcap_list_response.py
@@ -1,16 +1,17 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Union, Optional
-from typing_extensions import Literal
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
 from .pcap import PCAP
 from ..._models import BaseModel
 from .pcap_filter import PCAPFilter
 
-__all__ = ["PCAPListResponse", "MagicVisibilityPCAPsResponseFull"]
+__all__ = ["PCAPListResponse", "MagicVisibilityPCAPsPCAPsResponseFull"]
 
 
-class MagicVisibilityPCAPsResponseFull(BaseModel):
+class MagicVisibilityPCAPsPCAPsResponseFull(BaseModel):
     id: Optional[str] = None
     """The ID for the packet capture."""
 
@@ -39,6 +40,9 @@ class MagicVisibilityPCAPsResponseFull(BaseModel):
     filter_v1: Optional[PCAPFilter] = None
     """The packet capture filter. When this field is empty, all packets are captured."""
 
+    packets_captured: Optional[int] = None
+    """The number of packets captured."""
+
     status: Optional[
         Literal[
             "unknown", "success", "pending", "running", "conversion_pending", "conversion_running", "complete", "failed"
@@ -46,6 +50,12 @@ class MagicVisibilityPCAPsResponseFull(BaseModel):
     ] = None
     """The status of the packet capture request."""
 
+    stop_requested: Optional[datetime] = None
+    """The RFC 3339 timestamp when stopping the packet capture was requested.
+
+    This field only applies to `full` packet captures.
+    """
+
     submitted: Optional[str] = None
     """The RFC 3339 timestamp when the packet capture was created."""
 
@@ -63,4 +73,4 @@ class MagicVisibilityPCAPsResponseFull(BaseModel):
     """
 
 
-PCAPListResponse = Union[PCAP, MagicVisibilityPCAPsResponseFull]
+PCAPListResponse: TypeAlias = Union[PCAP, MagicVisibilityPCAPsPCAPsResponseFull]
diff --git a/src/cloudflare/types/magic_transit/pcaps/__init__.py b/src/cloudflare/types/magic_transit/pcaps/__init__.py
new file mode 100644
index 00000000000..baebb9439a6
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/pcaps/__init__.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .ownership import Ownership as Ownership
+from .ownership_create_params import OwnershipCreateParams as OwnershipCreateParams
+from .ownership_validate_params import OwnershipValidateParams as OwnershipValidateParams
diff --git a/src/cloudflare/types/magic_transit/pcaps/ownership.py b/src/cloudflare/types/magic_transit/pcaps/ownership.py
new file mode 100644
index 00000000000..bb41edceeff
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/pcaps/ownership.py
@@ -0,0 +1,28 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["Ownership"]
+
+
+class Ownership(BaseModel):
+    id: str
+    """The bucket ID associated with the packet captures API."""
+
+    destination_conf: str
+    """The full URI for the bucket. This field only applies to `full` packet captures."""
+
+    filename: str
+    """The ownership challenge filename stored in the bucket."""
+
+    status: Literal["pending", "success", "failed"]
+    """The status of the ownership challenge. Can be pending, success or failed."""
+
+    submitted: str
+    """The RFC 3339 timestamp when the bucket was added to packet captures API."""
+
+    validated: Optional[str] = None
+    """The RFC 3339 timestamp when the bucket was validated."""
diff --git a/src/cloudflare/types/pcaps/ownership_create_params.py b/src/cloudflare/types/magic_transit/pcaps/ownership_create_params.py
similarity index 95%
rename from src/cloudflare/types/pcaps/ownership_create_params.py
rename to src/cloudflare/types/magic_transit/pcaps/ownership_create_params.py
index 4d141092740..88697315303 100644
--- a/src/cloudflare/types/pcaps/ownership_create_params.py
+++ b/src/cloudflare/types/magic_transit/pcaps/ownership_create_params.py
@@ -9,7 +9,7 @@
 
 class OwnershipCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     destination_conf: Required[str]
     """The full URI for the bucket. This field only applies to `full` packet captures."""
diff --git a/src/cloudflare/types/pcaps/ownership_validate_params.py b/src/cloudflare/types/magic_transit/pcaps/ownership_validate_params.py
similarity index 96%
rename from src/cloudflare/types/pcaps/ownership_validate_params.py
rename to src/cloudflare/types/magic_transit/pcaps/ownership_validate_params.py
index cc7a076474f..9e8b16ef326 100644
--- a/src/cloudflare/types/pcaps/ownership_validate_params.py
+++ b/src/cloudflare/types/magic_transit/pcaps/ownership_validate_params.py
@@ -9,7 +9,7 @@
 
 class OwnershipValidateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     destination_conf: Required[str]
     """The full URI for the bucket. This field only applies to `full` packet captures."""
diff --git a/src/cloudflare/types/magic_transit/psk_metadata.py b/src/cloudflare/types/magic_transit/psk_metadata.py
index db1b57d2b5d..7bbea204401 100644
--- a/src/cloudflare/types/magic_transit/psk_metadata.py
+++ b/src/cloudflare/types/magic_transit/psk_metadata.py
@@ -9,5 +9,7 @@
 
 
 class PSKMetadata(BaseModel):
+    """The PSK metadata that includes when the PSK was generated."""
+
     last_generated_on: Optional[datetime] = None
     """The date and time the tunnel was last modified."""
diff --git a/src/cloudflare/types/magic_transit/route_bulk_update_params.py b/src/cloudflare/types/magic_transit/route_bulk_update_params.py
new file mode 100644
index 00000000000..9fe9f18041d
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/route_bulk_update_params.py
@@ -0,0 +1,40 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+from .scope_param import ScopeParam
+
+__all__ = ["RouteBulkUpdateParams", "Route"]
+
+
+class RouteBulkUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier"""
+
+    routes: Required[Iterable[Route]]
+
+
+class Route(TypedDict, total=False):
+    id: Required[str]
+    """Identifier"""
+
+    nexthop: Required[str]
+    """The next-hop IP Address for the static route."""
+
+    prefix: Required[str]
+    """IP Prefix in Classless Inter-Domain Routing format."""
+
+    priority: Required[int]
+    """Priority of the static route."""
+
+    description: str
+    """An optional human provided description of the static route."""
+
+    scope: ScopeParam
+    """Used only for ECMP routes."""
+
+    weight: int
+    """Optional weight of the ECMP scope - if provided."""
diff --git a/src/cloudflare/types/magic_transit/route_bulk_update_response.py b/src/cloudflare/types/magic_transit/route_bulk_update_response.py
new file mode 100644
index 00000000000..99205b7bfc1
--- /dev/null
+++ b/src/cloudflare/types/magic_transit/route_bulk_update_response.py
@@ -0,0 +1,44 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+
+from .scope import Scope
+from ..._models import BaseModel
+
+__all__ = ["RouteBulkUpdateResponse", "ModifiedRoute"]
+
+
+class ModifiedRoute(BaseModel):
+    id: str
+    """Identifier"""
+
+    nexthop: str
+    """The next-hop IP Address for the static route."""
+
+    prefix: str
+    """IP Prefix in Classless Inter-Domain Routing format."""
+
+    priority: int
+    """Priority of the static route."""
+
+    created_on: Optional[datetime] = None
+    """When the route was created."""
+
+    description: Optional[str] = None
+    """An optional human provided description of the static route."""
+
+    modified_on: Optional[datetime] = None
+    """When the route was last modified."""
+
+    scope: Optional[Scope] = None
+    """Used only for ECMP routes."""
+
+    weight: Optional[int] = None
+    """Optional weight of the ECMP scope - if provided."""
+
+
+class RouteBulkUpdateResponse(BaseModel):
+    modified: Optional[bool] = None
+
+    modified_routes: Optional[List[ModifiedRoute]] = None
diff --git a/src/cloudflare/types/magic_transit/route_create_params.py b/src/cloudflare/types/magic_transit/route_create_params.py
index 6afc20132d1..44f903dc099 100644
--- a/src/cloudflare/types/magic_transit/route_create_params.py
+++ b/src/cloudflare/types/magic_transit/route_create_params.py
@@ -4,6 +4,8 @@
 
 from typing_extensions import Required, TypedDict
 
+from .scope_param import ScopeParam
+
 __all__ = ["RouteCreateParams"]
 
 
@@ -11,4 +13,20 @@ class RouteCreateParams(TypedDict, total=False):
     account_id: Required[str]
     """Identifier"""
 
-    body: Required[object]
+    nexthop: Required[str]
+    """The next-hop IP Address for the static route."""
+
+    prefix: Required[str]
+    """IP Prefix in Classless Inter-Domain Routing format."""
+
+    priority: Required[int]
+    """Priority of the static route."""
+
+    description: str
+    """An optional human provided description of the static route."""
+
+    scope: ScopeParam
+    """Used only for ECMP routes."""
+
+    weight: int
+    """Optional weight of the ECMP scope - if provided."""
diff --git a/src/cloudflare/types/magic_transit/route_create_response.py b/src/cloudflare/types/magic_transit/route_create_response.py
index c8b0dd58904..25efd6163a5 100644
--- a/src/cloudflare/types/magic_transit/route_create_response.py
+++ b/src/cloudflare/types/magic_transit/route_create_response.py
@@ -1,15 +1,18 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Optional
 from datetime import datetime
 
 from .scope import Scope
 from ..._models import BaseModel
 
-__all__ = ["RouteCreateResponse", "Route"]
+__all__ = ["RouteCreateResponse"]
 
 
-class Route(BaseModel):
+class RouteCreateResponse(BaseModel):
+    id: str
+    """Identifier"""
+
     nexthop: str
     """The next-hop IP Address for the static route."""
 
@@ -19,9 +22,6 @@ class Route(BaseModel):
     priority: int
     """Priority of the static route."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     created_on: Optional[datetime] = None
     """When the route was created."""
 
@@ -36,7 +36,3 @@ class Route(BaseModel):
 
     weight: Optional[int] = None
     """Optional weight of the ECMP scope - if provided."""
-
-
-class RouteCreateResponse(BaseModel):
-    routes: Optional[List[Route]] = None
diff --git a/src/cloudflare/types/magic_transit/route_delete_response.py b/src/cloudflare/types/magic_transit/route_delete_response.py
index 096e4ece8f1..1096f746ed7 100644
--- a/src/cloudflare/types/magic_transit/route_delete_response.py
+++ b/src/cloudflare/types/magic_transit/route_delete_response.py
@@ -1,13 +1,44 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from datetime import datetime
 
+from .scope import Scope
 from ..._models import BaseModel
 
-__all__ = ["RouteDeleteResponse"]
+__all__ = ["RouteDeleteResponse", "DeletedRoute"]
+
+
+class DeletedRoute(BaseModel):
+    id: str
+    """Identifier"""
+
+    nexthop: str
+    """The next-hop IP Address for the static route."""
+
+    prefix: str
+    """IP Prefix in Classless Inter-Domain Routing format."""
+
+    priority: int
+    """Priority of the static route."""
+
+    created_on: Optional[datetime] = None
+    """When the route was created."""
+
+    description: Optional[str] = None
+    """An optional human provided description of the static route."""
+
+    modified_on: Optional[datetime] = None
+    """When the route was last modified."""
+
+    scope: Optional[Scope] = None
+    """Used only for ECMP routes."""
+
+    weight: Optional[int] = None
+    """Optional weight of the ECMP scope - if provided."""
 
 
 class RouteDeleteResponse(BaseModel):
     deleted: Optional[bool] = None
 
-    deleted_route: Optional[object] = None
+    deleted_route: Optional[DeletedRoute] = None
diff --git a/src/cloudflare/types/magic_transit/route_empty_response.py b/src/cloudflare/types/magic_transit/route_empty_response.py
index d44759f75c6..da130d4ceb6 100644
--- a/src/cloudflare/types/magic_transit/route_empty_response.py
+++ b/src/cloudflare/types/magic_transit/route_empty_response.py
@@ -1,13 +1,44 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import List, Optional
+from datetime import datetime
 
+from .scope import Scope
 from ..._models import BaseModel
 
-__all__ = ["RouteEmptyResponse"]
+__all__ = ["RouteEmptyResponse", "DeletedRoute"]
+
+
+class DeletedRoute(BaseModel):
+    id: str
+    """Identifier"""
+
+    nexthop: str
+    """The next-hop IP Address for the static route."""
+
+    prefix: str
+    """IP Prefix in Classless Inter-Domain Routing format."""
+
+    priority: int
+    """Priority of the static route."""
+
+    created_on: Optional[datetime] = None
+    """When the route was created."""
+
+    description: Optional[str] = None
+    """An optional human provided description of the static route."""
+
+    modified_on: Optional[datetime] = None
+    """When the route was last modified."""
+
+    scope: Optional[Scope] = None
+    """Used only for ECMP routes."""
+
+    weight: Optional[int] = None
+    """Optional weight of the ECMP scope - if provided."""
 
 
 class RouteEmptyResponse(BaseModel):
     deleted: Optional[bool] = None
 
-    deleted_routes: Optional[object] = None
+    deleted_routes: Optional[List[DeletedRoute]] = None
diff --git a/src/cloudflare/types/magic_transit/route_get_response.py b/src/cloudflare/types/magic_transit/route_get_response.py
index f23ba2c2ec4..92aa6624452 100644
--- a/src/cloudflare/types/magic_transit/route_get_response.py
+++ b/src/cloudflare/types/magic_transit/route_get_response.py
@@ -1,11 +1,42 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from datetime import datetime
 
+from .scope import Scope
 from ..._models import BaseModel
 
-__all__ = ["RouteGetResponse"]
+__all__ = ["RouteGetResponse", "Route"]
+
+
+class Route(BaseModel):
+    id: str
+    """Identifier"""
+
+    nexthop: str
+    """The next-hop IP Address for the static route."""
+
+    prefix: str
+    """IP Prefix in Classless Inter-Domain Routing format."""
+
+    priority: int
+    """Priority of the static route."""
+
+    created_on: Optional[datetime] = None
+    """When the route was created."""
+
+    description: Optional[str] = None
+    """An optional human provided description of the static route."""
+
+    modified_on: Optional[datetime] = None
+    """When the route was last modified."""
+
+    scope: Optional[Scope] = None
+    """Used only for ECMP routes."""
+
+    weight: Optional[int] = None
+    """Optional weight of the ECMP scope - if provided."""
 
 
 class RouteGetResponse(BaseModel):
-    route: Optional[object] = None
+    route: Optional[Route] = None
diff --git a/src/cloudflare/types/magic_transit/route_list_response.py b/src/cloudflare/types/magic_transit/route_list_response.py
index 5e19e5ba48a..3edbcfbfd74 100644
--- a/src/cloudflare/types/magic_transit/route_list_response.py
+++ b/src/cloudflare/types/magic_transit/route_list_response.py
@@ -10,6 +10,9 @@
 
 
 class Route(BaseModel):
+    id: str
+    """Identifier"""
+
     nexthop: str
     """The next-hop IP Address for the static route."""
 
@@ -19,9 +22,6 @@ class Route(BaseModel):
     priority: int
     """Priority of the static route."""
 
-    id: Optional[str] = None
-    """Identifier"""
-
     created_on: Optional[datetime] = None
     """When the route was created."""
 
diff --git a/src/cloudflare/types/magic_transit/route_update_response.py b/src/cloudflare/types/magic_transit/route_update_response.py
index 33b497d969f..aca017be22c 100644
--- a/src/cloudflare/types/magic_transit/route_update_response.py
+++ b/src/cloudflare/types/magic_transit/route_update_response.py
@@ -1,13 +1,44 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from datetime import datetime
 
+from .scope import Scope
 from ..._models import BaseModel
 
-__all__ = ["RouteUpdateResponse"]
+__all__ = ["RouteUpdateResponse", "ModifiedRoute"]
+
+
+class ModifiedRoute(BaseModel):
+    id: str
+    """Identifier"""
+
+    nexthop: str
+    """The next-hop IP Address for the static route."""
+
+    prefix: str
+    """IP Prefix in Classless Inter-Domain Routing format."""
+
+    priority: int
+    """Priority of the static route."""
+
+    created_on: Optional[datetime] = None
+    """When the route was created."""
+
+    description: Optional[str] = None
+    """An optional human provided description of the static route."""
+
+    modified_on: Optional[datetime] = None
+    """When the route was last modified."""
+
+    scope: Optional[Scope] = None
+    """Used only for ECMP routes."""
+
+    weight: Optional[int] = None
+    """Optional weight of the ECMP scope - if provided."""
 
 
 class RouteUpdateResponse(BaseModel):
     modified: Optional[bool] = None
 
-    modified_route: Optional[object] = None
+    modified_route: Optional[ModifiedRoute] = None
diff --git a/src/cloudflare/types/magic_transit/scope.py b/src/cloudflare/types/magic_transit/scope.py
index a01bc5eb301..7e24a288520 100644
--- a/src/cloudflare/types/magic_transit/scope.py
+++ b/src/cloudflare/types/magic_transit/scope.py
@@ -8,6 +8,8 @@
 
 
 class Scope(BaseModel):
+    """Used only for ECMP routes."""
+
     colo_names: Optional[List[str]] = None
     """List of colo names for the ECMP scope."""
 
diff --git a/src/cloudflare/types/magic_transit/scope_param.py b/src/cloudflare/types/magic_transit/scope_param.py
index 95df559e364..955cbe772d4 100644
--- a/src/cloudflare/types/magic_transit/scope_param.py
+++ b/src/cloudflare/types/magic_transit/scope_param.py
@@ -2,15 +2,18 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import TypedDict
 
+from ..._types import SequenceNotStr
+
 __all__ = ["ScopeParam"]
 
 
 class ScopeParam(TypedDict, total=False):
-    colo_names: List[str]
+    """Used only for ECMP routes."""
+
+    colo_names: SequenceNotStr[str]
     """List of colo names for the ECMP scope."""
 
-    colo_regions: List[str]
+    colo_regions: SequenceNotStr[str]
     """List of colo regions for the ECMP scope."""
diff --git a/src/cloudflare/types/magic_transit/site_list_params.py b/src/cloudflare/types/magic_transit/site_list_params.py
index 8f74157c2de..d446c2a2809 100644
--- a/src/cloudflare/types/magic_transit/site_list_params.py
+++ b/src/cloudflare/types/magic_transit/site_list_params.py
@@ -11,5 +11,5 @@ class SiteListParams(TypedDict, total=False):
     account_id: Required[str]
     """Identifier"""
 
-    connector_identifier: str
+    connectorid: str
     """Identifier"""
diff --git a/src/cloudflare/types/magic_transit/site_location.py b/src/cloudflare/types/magic_transit/site_location.py
index 6cf9417b1d5..7829178a1b7 100644
--- a/src/cloudflare/types/magic_transit/site_location.py
+++ b/src/cloudflare/types/magic_transit/site_location.py
@@ -8,6 +8,8 @@
 
 
 class SiteLocation(BaseModel):
+    """Location of site in latitude and longitude."""
+
     lat: Optional[str] = None
     """Latitude"""
 
diff --git a/src/cloudflare/types/magic_transit/site_location_param.py b/src/cloudflare/types/magic_transit/site_location_param.py
index ee126d180a6..347774d3e92 100644
--- a/src/cloudflare/types/magic_transit/site_location_param.py
+++ b/src/cloudflare/types/magic_transit/site_location_param.py
@@ -8,6 +8,8 @@
 
 
 class SiteLocationParam(TypedDict, total=False):
+    """Location of site in latitude and longitude."""
+
     lat: str
     """Latitude"""
 
diff --git a/src/cloudflare/types/magic_transit/sites/__init__.py b/src/cloudflare/types/magic_transit/sites/__init__.py
index 38f592bb4e6..cdf0ff32712 100644
--- a/src/cloudflare/types/magic_transit/sites/__init__.py
+++ b/src/cloudflare/types/magic_transit/sites/__init__.py
@@ -10,7 +10,6 @@
 from .nat_param import NatParam as NatParam
 from .dhcp_relay import DHCPRelay as DHCPRelay
 from .dhcp_server import DHCPServer as DHCPServer
-from .subnet_param import SubnetParam as SubnetParam
 from .routed_subnet import RoutedSubnet as RoutedSubnet
 from .acl_edit_params import ACLEditParams as ACLEditParams
 from .lan_edit_params import LANEditParams as LANEditParams
@@ -25,9 +24,7 @@
 from .lan_update_params import LANUpdateParams as LANUpdateParams
 from .wan_create_params import WANCreateParams as WANCreateParams
 from .wan_update_params import WANUpdateParams as WANUpdateParams
-from .lan_create_response import LANCreateResponse as LANCreateResponse
 from .routed_subnet_param import RoutedSubnetParam as RoutedSubnetParam
-from .wan_create_response import WANCreateResponse as WANCreateResponse
 from .lan_static_addressing import LANStaticAddressing as LANStaticAddressing
 from .wan_static_addressing import WANStaticAddressing as WANStaticAddressing
 from .acl_configuration_param import ACLConfigurationParam as ACLConfigurationParam
diff --git a/src/cloudflare/types/magic_transit/sites/acl.py b/src/cloudflare/types/magic_transit/sites/acl.py
index 5565fc0f5c9..63e17bd0742 100644
--- a/src/cloudflare/types/magic_transit/sites/acl.py
+++ b/src/cloudflare/types/magic_transit/sites/acl.py
@@ -10,6 +10,8 @@
 
 
 class ACL(BaseModel):
+    """Bidirectional ACL policy for network traffic within a site."""
+
     id: Optional[str] = None
     """Identifier"""
 
@@ -32,3 +34,11 @@ class ACL(BaseModel):
     """The name of the ACL."""
 
     protocols: Optional[List[AllowedProtocol]] = None
+
+    unidirectional: Optional[bool] = None
+    """The desired traffic direction for this ACL policy.
+
+    If set to "false", the policy will allow bidirectional traffic. If set to
+    "true", the policy will only allow traffic in one direction. If not included in
+    request, will default to false.
+    """
diff --git a/src/cloudflare/types/magic_transit/sites/acl_configuration.py b/src/cloudflare/types/magic_transit/sites/acl_configuration.py
index 6c934b500b5..99457cdecbf 100644
--- a/src/cloudflare/types/magic_transit/sites/acl_configuration.py
+++ b/src/cloudflare/types/magic_transit/sites/acl_configuration.py
@@ -15,10 +15,18 @@ class ACLConfiguration(BaseModel):
     lan_name: Optional[str] = None
     """The name of the LAN based on the provided lan_id."""
 
+    port_ranges: Optional[List[str]] = None
+    """Array of port ranges on the provided LAN that will be included in the ACL.
+
+    If no ports or port rangess are provided, communication on any port on this LAN
+    is allowed.
+    """
+
     ports: Optional[List[int]] = None
     """Array of ports on the provided LAN that will be included in the ACL.
 
-    If no ports are provided, communication on any port on this LAN is allowed.
+    If no ports or port ranges are provided, communication on any port on this LAN
+    is allowed.
     """
 
     subnets: Optional[List[Subnet]] = None
diff --git a/src/cloudflare/types/magic_transit/sites/acl_configuration_param.py b/src/cloudflare/types/magic_transit/sites/acl_configuration_param.py
index 918fe9e2628..ee414d88587 100644
--- a/src/cloudflare/types/magic_transit/sites/acl_configuration_param.py
+++ b/src/cloudflare/types/magic_transit/sites/acl_configuration_param.py
@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
-from typing import List, Iterable
+from typing import Iterable
 from typing_extensions import Required, TypedDict
 
-from .subnet_param import SubnetParam
+from .subnet import Subnet
+from ...._types import SequenceNotStr
 
 __all__ = ["ACLConfigurationParam"]
 
@@ -17,13 +18,21 @@ class ACLConfigurationParam(TypedDict, total=False):
     lan_name: str
     """The name of the LAN based on the provided lan_id."""
 
+    port_ranges: SequenceNotStr[str]
+    """Array of port ranges on the provided LAN that will be included in the ACL.
+
+    If no ports or port rangess are provided, communication on any port on this LAN
+    is allowed.
+    """
+
     ports: Iterable[int]
     """Array of ports on the provided LAN that will be included in the ACL.
 
-    If no ports are provided, communication on any port on this LAN is allowed.
+    If no ports or port ranges are provided, communication on any port on this LAN
+    is allowed.
     """
 
-    subnets: List[SubnetParam]
+    subnets: SequenceNotStr[Subnet]
     """Array of subnet IPs within the LAN that will be included in the ACL.
 
     If no subnets are provided, communication on any subnets on this LAN are
diff --git a/src/cloudflare/types/magic_transit/sites/acl_create_params.py b/src/cloudflare/types/magic_transit/sites/acl_create_params.py
index 48b2d5f517b..c193c6d556c 100644
--- a/src/cloudflare/types/magic_transit/sites/acl_create_params.py
+++ b/src/cloudflare/types/magic_transit/sites/acl_create_params.py
@@ -34,3 +34,11 @@ class ACLCreateParams(TypedDict, total=False):
     """
 
     protocols: List[AllowedProtocol]
+
+    unidirectional: bool
+    """The desired traffic direction for this ACL policy.
+
+    If set to "false", the policy will allow bidirectional traffic. If set to
+    "true", the policy will only allow traffic in one direction. If not included in
+    request, will default to false.
+    """
diff --git a/src/cloudflare/types/magic_transit/sites/acl_edit_params.py b/src/cloudflare/types/magic_transit/sites/acl_edit_params.py
index 8a6c7b0f5c6..3280bbe53b2 100644
--- a/src/cloudflare/types/magic_transit/sites/acl_edit_params.py
+++ b/src/cloudflare/types/magic_transit/sites/acl_edit_params.py
@@ -37,3 +37,11 @@ class ACLEditParams(TypedDict, total=False):
     """The name of the ACL."""
 
     protocols: List[AllowedProtocol]
+
+    unidirectional: bool
+    """The desired traffic direction for this ACL policy.
+
+    If set to "false", the policy will allow bidirectional traffic. If set to
+    "true", the policy will only allow traffic in one direction. If not included in
+    request, will default to false.
+    """
diff --git a/src/cloudflare/types/magic_transit/sites/acl_update_params.py b/src/cloudflare/types/magic_transit/sites/acl_update_params.py
index 5abc70c2329..250ed85c126 100644
--- a/src/cloudflare/types/magic_transit/sites/acl_update_params.py
+++ b/src/cloudflare/types/magic_transit/sites/acl_update_params.py
@@ -37,3 +37,11 @@ class ACLUpdateParams(TypedDict, total=False):
     """The name of the ACL."""
 
     protocols: List[AllowedProtocol]
+
+    unidirectional: bool
+    """The desired traffic direction for this ACL policy.
+
+    If set to "false", the policy will allow bidirectional traffic. If set to
+    "true", the policy will only allow traffic in one direction. If not included in
+    request, will default to false.
+    """
diff --git a/src/cloudflare/types/magic_transit/sites/allowed_protocol.py b/src/cloudflare/types/magic_transit/sites/allowed_protocol.py
index cce3a21021e..076a921f069 100644
--- a/src/cloudflare/types/magic_transit/sites/allowed_protocol.py
+++ b/src/cloudflare/types/magic_transit/sites/allowed_protocol.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["AllowedProtocol"]
 
-AllowedProtocol = Literal["tcp", "udp", "icmp"]
+AllowedProtocol: TypeAlias = Literal["tcp", "udp", "icmp"]
diff --git a/src/cloudflare/types/magic_transit/sites/dhcp_relay_param.py b/src/cloudflare/types/magic_transit/sites/dhcp_relay_param.py
index d683a321028..28d203311c7 100644
--- a/src/cloudflare/types/magic_transit/sites/dhcp_relay_param.py
+++ b/src/cloudflare/types/magic_transit/sites/dhcp_relay_param.py
@@ -2,12 +2,13 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import TypedDict
 
+from ...._types import SequenceNotStr
+
 __all__ = ["DHCPRelayParam"]
 
 
 class DHCPRelayParam(TypedDict, total=False):
-    server_addresses: List[str]
+    server_addresses: SequenceNotStr[str]
     """List of DHCP server IPs."""
diff --git a/src/cloudflare/types/magic_transit/sites/dhcp_server.py b/src/cloudflare/types/magic_transit/sites/dhcp_server.py
index 2afdcdc65dd..51cce549430 100644
--- a/src/cloudflare/types/magic_transit/sites/dhcp_server.py
+++ b/src/cloudflare/types/magic_transit/sites/dhcp_server.py
@@ -1,6 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Dict, Optional
+from typing import Dict, List, Optional
 
 from ...._models import BaseModel
 
@@ -17,5 +17,7 @@ class DHCPServer(BaseModel):
     dns_server: Optional[str] = None
     """A valid IPv4 address."""
 
+    dns_servers: Optional[List[str]] = None
+
     reservations: Optional[Dict[str, str]] = None
     """Mapping of MAC addresses to IP addresses"""
diff --git a/src/cloudflare/types/magic_transit/sites/dhcp_server_param.py b/src/cloudflare/types/magic_transit/sites/dhcp_server_param.py
index 85bfb2f7745..4eecd6a47df 100644
--- a/src/cloudflare/types/magic_transit/sites/dhcp_server_param.py
+++ b/src/cloudflare/types/magic_transit/sites/dhcp_server_param.py
@@ -5,6 +5,8 @@
 from typing import Dict
 from typing_extensions import TypedDict
 
+from ...._types import SequenceNotStr
+
 __all__ = ["DHCPServerParam"]
 
 
@@ -18,5 +20,7 @@ class DHCPServerParam(TypedDict, total=False):
     dns_server: str
     """A valid IPv4 address."""
 
+    dns_servers: SequenceNotStr[str]
+
     reservations: Dict[str, str]
     """Mapping of MAC addresses to IP addresses"""
diff --git a/src/cloudflare/types/magic_transit/sites/lan.py b/src/cloudflare/types/magic_transit/sites/lan.py
index 6df37634b0d..fa029373d9f 100644
--- a/src/cloudflare/types/magic_transit/sites/lan.py
+++ b/src/cloudflare/types/magic_transit/sites/lan.py
@@ -14,6 +14,8 @@ class LAN(BaseModel):
     id: Optional[str] = None
     """Identifier"""
 
+    bond_id: Optional[int] = None
+
     ha_link: Optional[bool] = None
     """mark true to use this LAN for HA probing.
 
@@ -39,4 +41,4 @@ class LAN(BaseModel):
     """
 
     vlan_tag: Optional[int] = None
-    """VLAN port number."""
+    """VLAN ID. Use zero for untagged."""
diff --git a/src/cloudflare/types/magic_transit/sites/lan_create_params.py b/src/cloudflare/types/magic_transit/sites/lan_create_params.py
index 16ca5e81832..e0cefcdc9e4 100644
--- a/src/cloudflare/types/magic_transit/sites/lan_create_params.py
+++ b/src/cloudflare/types/magic_transit/sites/lan_create_params.py
@@ -16,10 +16,7 @@ class LANCreateParams(TypedDict, total=False):
     account_id: Required[str]
     """Identifier"""
 
-    physport: Required[int]
-
-    vlan_tag: Required[int]
-    """VLAN port number."""
+    bond_id: int
 
     ha_link: bool
     """mark true to use this LAN for HA probing.
@@ -31,6 +28,8 @@ class LANCreateParams(TypedDict, total=False):
 
     nat: NatParam
 
+    physport: int
+
     routed_subnets: Iterable[RoutedSubnetParam]
 
     static_addressing: LANStaticAddressingParam
@@ -39,3 +38,6 @@ class LANCreateParams(TypedDict, total=False):
     optional (if omitted, use DHCP). However, if in high availability mode,
     static_address is required along with secondary and virtual address.
     """
+
+    vlan_tag: int
+    """VLAN ID. Use zero for untagged."""
diff --git a/src/cloudflare/types/magic_transit/sites/lan_create_response.py b/src/cloudflare/types/magic_transit/sites/lan_create_response.py
deleted file mode 100644
index 87939756ba3..00000000000
--- a/src/cloudflare/types/magic_transit/sites/lan_create_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .lan import LAN
-
-__all__ = ["LANCreateResponse"]
-
-LANCreateResponse = List[LAN]
diff --git a/src/cloudflare/types/magic_transit/sites/lan_edit_params.py b/src/cloudflare/types/magic_transit/sites/lan_edit_params.py
index ca11b71b860..8ae626d9846 100644
--- a/src/cloudflare/types/magic_transit/sites/lan_edit_params.py
+++ b/src/cloudflare/types/magic_transit/sites/lan_edit_params.py
@@ -19,6 +19,8 @@ class LANEditParams(TypedDict, total=False):
     site_id: Required[str]
     """Identifier"""
 
+    bond_id: int
+
     name: str
 
     nat: NatParam
@@ -35,4 +37,4 @@ class LANEditParams(TypedDict, total=False):
     """
 
     vlan_tag: int
-    """VLAN port number."""
+    """VLAN ID. Use zero for untagged."""
diff --git a/src/cloudflare/types/magic_transit/sites/lan_static_addressing.py b/src/cloudflare/types/magic_transit/sites/lan_static_addressing.py
index 31801ab8533..4c638d99646 100644
--- a/src/cloudflare/types/magic_transit/sites/lan_static_addressing.py
+++ b/src/cloudflare/types/magic_transit/sites/lan_static_addressing.py
@@ -10,6 +10,10 @@
 
 
 class LANStaticAddressing(BaseModel):
+    """
+    If the site is not configured in high availability mode, this configuration is optional (if omitted, use DHCP). However, if in high availability mode, static_address is required along with secondary and virtual address.
+    """
+
     address: str
     """A valid CIDR notation representing an IP range."""
 
diff --git a/src/cloudflare/types/magic_transit/sites/lan_static_addressing_param.py b/src/cloudflare/types/magic_transit/sites/lan_static_addressing_param.py
index 779724c0fcb..6ac08c0d6c5 100644
--- a/src/cloudflare/types/magic_transit/sites/lan_static_addressing_param.py
+++ b/src/cloudflare/types/magic_transit/sites/lan_static_addressing_param.py
@@ -11,6 +11,10 @@
 
 
 class LANStaticAddressingParam(TypedDict, total=False):
+    """
+    If the site is not configured in high availability mode, this configuration is optional (if omitted, use DHCP). However, if in high availability mode, static_address is required along with secondary and virtual address.
+    """
+
     address: Required[str]
     """A valid CIDR notation representing an IP range."""
 
diff --git a/src/cloudflare/types/magic_transit/sites/lan_update_params.py b/src/cloudflare/types/magic_transit/sites/lan_update_params.py
index 0dea4f2b81c..58c4bd03f1e 100644
--- a/src/cloudflare/types/magic_transit/sites/lan_update_params.py
+++ b/src/cloudflare/types/magic_transit/sites/lan_update_params.py
@@ -19,6 +19,8 @@ class LANUpdateParams(TypedDict, total=False):
     site_id: Required[str]
     """Identifier"""
 
+    bond_id: int
+
     name: str
 
     nat: NatParam
@@ -35,4 +37,4 @@ class LANUpdateParams(TypedDict, total=False):
     """
 
     vlan_tag: int
-    """VLAN port number."""
+    """VLAN ID. Use zero for untagged."""
diff --git a/src/cloudflare/types/magic_transit/sites/subnet.py b/src/cloudflare/types/magic_transit/sites/subnet.py
index 4644c7a7ea3..4dc5d4ab6a4 100644
--- a/src/cloudflare/types/magic_transit/sites/subnet.py
+++ b/src/cloudflare/types/magic_transit/sites/subnet.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union
+from typing_extensions import TypeAlias
 
 __all__ = ["Subnet"]
 
-Subnet = Union[str, str]
+Subnet: TypeAlias = str
diff --git a/src/cloudflare/types/magic_transit/sites/subnet_param.py b/src/cloudflare/types/magic_transit/sites/subnet_param.py
deleted file mode 100644
index 4e27c261a8b..00000000000
--- a/src/cloudflare/types/magic_transit/sites/subnet_param.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Union
-
-__all__ = ["SubnetParam"]
-
-SubnetParam = Union[str, str]
diff --git a/src/cloudflare/types/magic_transit/sites/wan.py b/src/cloudflare/types/magic_transit/sites/wan.py
index 1148e9f087f..84ff66aa870 100644
--- a/src/cloudflare/types/magic_transit/sites/wan.py
+++ b/src/cloudflare/types/magic_transit/sites/wan.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from typing_extensions import Literal
 
 from ...._models import BaseModel
 from .wan_static_addressing import WANStaticAddressing
@@ -12,6 +13,12 @@ class WAN(BaseModel):
     id: Optional[str] = None
     """Identifier"""
 
+    health_check_rate: Optional[Literal["low", "mid", "high"]] = None
+    """Magic WAN health check rate for tunnels created on this link.
+
+    The default value is `mid`.
+    """
+
     name: Optional[str] = None
 
     physport: Optional[int] = None
@@ -29,4 +36,4 @@ class WAN(BaseModel):
     """
 
     vlan_tag: Optional[int] = None
-    """VLAN port number."""
+    """VLAN ID. Use zero for untagged."""
diff --git a/src/cloudflare/types/magic_transit/sites/wan_create_params.py b/src/cloudflare/types/magic_transit/sites/wan_create_params.py
index f8bcb240d5f..3538b8411e3 100644
--- a/src/cloudflare/types/magic_transit/sites/wan_create_params.py
+++ b/src/cloudflare/types/magic_transit/sites/wan_create_params.py
@@ -15,9 +15,6 @@ class WANCreateParams(TypedDict, total=False):
 
     physport: Required[int]
 
-    vlan_tag: Required[int]
-    """VLAN port number."""
-
     name: str
 
     priority: int
@@ -27,3 +24,6 @@ class WANCreateParams(TypedDict, total=False):
 
     Submit secondary_address when site is in high availability mode.
     """
+
+    vlan_tag: int
+    """VLAN ID. Use zero for untagged."""
diff --git a/src/cloudflare/types/magic_transit/sites/wan_create_response.py b/src/cloudflare/types/magic_transit/sites/wan_create_response.py
deleted file mode 100644
index 40806aa462e..00000000000
--- a/src/cloudflare/types/magic_transit/sites/wan_create_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .wan import WAN
-
-__all__ = ["WANCreateResponse"]
-
-WANCreateResponse = List[WAN]
diff --git a/src/cloudflare/types/magic_transit/sites/wan_edit_params.py b/src/cloudflare/types/magic_transit/sites/wan_edit_params.py
index fdd941a07b4..33459da7830 100644
--- a/src/cloudflare/types/magic_transit/sites/wan_edit_params.py
+++ b/src/cloudflare/types/magic_transit/sites/wan_edit_params.py
@@ -29,4 +29,4 @@ class WANEditParams(TypedDict, total=False):
     """
 
     vlan_tag: int
-    """VLAN port number."""
+    """VLAN ID. Use zero for untagged."""
diff --git a/src/cloudflare/types/magic_transit/sites/wan_static_addressing.py b/src/cloudflare/types/magic_transit/sites/wan_static_addressing.py
index ffa5b4c1235..67c518474c3 100644
--- a/src/cloudflare/types/magic_transit/sites/wan_static_addressing.py
+++ b/src/cloudflare/types/magic_transit/sites/wan_static_addressing.py
@@ -8,6 +8,11 @@
 
 
 class WANStaticAddressing(BaseModel):
+    """(optional) if omitted, use DHCP.
+
+    Submit secondary_address when site is in high availability mode.
+    """
+
     address: str
     """A valid CIDR notation representing an IP range."""
 
diff --git a/src/cloudflare/types/magic_transit/sites/wan_static_addressing_param.py b/src/cloudflare/types/magic_transit/sites/wan_static_addressing_param.py
index 273de37cf61..c3b550d3264 100644
--- a/src/cloudflare/types/magic_transit/sites/wan_static_addressing_param.py
+++ b/src/cloudflare/types/magic_transit/sites/wan_static_addressing_param.py
@@ -8,6 +8,11 @@
 
 
 class WANStaticAddressingParam(TypedDict, total=False):
+    """(optional) if omitted, use DHCP.
+
+    Submit secondary_address when site is in high availability mode.
+    """
+
     address: Required[str]
     """A valid CIDR notation representing an IP range."""
 
diff --git a/src/cloudflare/types/magic_transit/sites/wan_update_params.py b/src/cloudflare/types/magic_transit/sites/wan_update_params.py
index 6b1a92759d5..55e62875c5d 100644
--- a/src/cloudflare/types/magic_transit/sites/wan_update_params.py
+++ b/src/cloudflare/types/magic_transit/sites/wan_update_params.py
@@ -29,4 +29,4 @@ class WANUpdateParams(TypedDict, total=False):
     """
 
     vlan_tag: int
-    """VLAN port number."""
+    """VLAN ID. Use zero for untagged."""
diff --git a/src/cloudflare/types/managed_headers/__init__.py b/src/cloudflare/types/managed_headers/__init__.py
deleted file mode 100644
index 4398e317107..00000000000
--- a/src/cloudflare/types/managed_headers/__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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_headers/managed_header_edit_params.py b/src/cloudflare/types/managed_headers/managed_header_edit_params.py
deleted file mode 100644
index a9bf71d9c3c..00000000000
--- a/src/cloudflare/types/managed_headers/managed_header_edit_params.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Iterable
-from typing_extensions import Required, TypedDict
-
-from .request_model_param import RequestModelParam
-
-__all__ = ["ManagedHeaderEditParams"]
-
-
-class ManagedHeaderEditParams(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    managed_request_headers: Required[Iterable[RequestModelParam]]
-
-    managed_response_headers: Required[Iterable[RequestModelParam]]
diff --git a/src/cloudflare/types/managed_headers/managed_header_edit_response.py b/src/cloudflare/types/managed_headers/managed_header_edit_response.py
deleted file mode 100644
index d1b0f60e8a5..00000000000
--- a/src/cloudflare/types/managed_headers/managed_header_edit_response.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from ..._models import BaseModel
-
-__all__ = ["ManagedHeaderEditResponse", "ManagedRequestHeader", "ManagedResponseHeader"]
-
-
-class ManagedRequestHeader(BaseModel):
-    id: Optional[str] = None
-    """Human-readable identifier of the Managed Transform."""
-
-    available: Optional[bool] = None
-    """When true, the Managed Transform is available in the current Cloudflare plan."""
-
-    enabled: Optional[bool] = None
-    """When true, the Managed Transform is enabled."""
-
-
-class ManagedResponseHeader(BaseModel):
-    id: Optional[str] = None
-    """Human-readable identifier of the Managed Transform."""
-
-    available: Optional[bool] = None
-    """When true, the Managed Transform is available in the current Cloudflare plan."""
-
-    enabled: Optional[bool] = None
-    """When true, the Managed Transform is enabled."""
-
-
-class ManagedHeaderEditResponse(BaseModel):
-    managed_request_headers: Optional[List[ManagedRequestHeader]] = None
-
-    managed_response_headers: Optional[List[ManagedResponseHeader]] = None
diff --git a/src/cloudflare/types/managed_headers/managed_header_list_response.py b/src/cloudflare/types/managed_headers/managed_header_list_response.py
deleted file mode 100644
index c155ecb594f..00000000000
--- a/src/cloudflare/types/managed_headers/managed_header_list_response.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from ..._models import BaseModel
-from .request_model import RequestModel
-
-__all__ = ["ManagedHeaderListResponse"]
-
-
-class ManagedHeaderListResponse(BaseModel):
-    managed_request_headers: Optional[List[RequestModel]] = None
-
-    managed_response_headers: Optional[List[RequestModel]] = None
diff --git a/src/cloudflare/types/managed_headers/request_model.py b/src/cloudflare/types/managed_headers/request_model.py
deleted file mode 100644
index 281db0613d3..00000000000
--- a/src/cloudflare/types/managed_headers/request_model.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ..._models import BaseModel
-
-__all__ = ["RequestModel"]
-
-
-class RequestModel(BaseModel):
-    id: Optional[str] = None
-    """Human-readable identifier of the Managed Transform."""
-
-    enabled: Optional[bool] = None
-    """When true, the Managed Transform is enabled."""
diff --git a/src/cloudflare/types/managed_headers/request_model_param.py b/src/cloudflare/types/managed_headers/request_model_param.py
deleted file mode 100644
index d207b5bf111..00000000000
--- a/src/cloudflare/types/managed_headers/request_model_param.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import TypedDict
-
-__all__ = ["RequestModelParam"]
-
-
-class RequestModelParam(TypedDict, total=False):
-    id: str
-    """Human-readable identifier of the Managed Transform."""
-
-    enabled: bool
-    """When true, the Managed Transform is enabled."""
diff --git a/src/cloudflare/types/managed_transforms/__init__.py b/src/cloudflare/types/managed_transforms/__init__.py
new file mode 100644
index 00000000000..34117bfe591
--- /dev/null
+++ b/src/cloudflare/types/managed_transforms/__init__.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .managed_transform_edit_params import ManagedTransformEditParams as ManagedTransformEditParams
+from .managed_transform_edit_response import ManagedTransformEditResponse as ManagedTransformEditResponse
+from .managed_transform_list_response import ManagedTransformListResponse as ManagedTransformListResponse
diff --git a/src/cloudflare/types/managed_transforms/managed_transform_edit_params.py b/src/cloudflare/types/managed_transforms/managed_transform_edit_params.py
new file mode 100644
index 00000000000..572146cec03
--- /dev/null
+++ b/src/cloudflare/types/managed_transforms/managed_transform_edit_params.py
@@ -0,0 +1,39 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ManagedTransformEditParams", "ManagedRequestHeader", "ManagedResponseHeader"]
+
+
+class ManagedTransformEditParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """The unique ID of the zone."""
+
+    managed_request_headers: Required[Iterable[ManagedRequestHeader]]
+    """The list of Managed Request Transforms."""
+
+    managed_response_headers: Required[Iterable[ManagedResponseHeader]]
+    """The list of Managed Response Transforms."""
+
+
+class ManagedRequestHeader(TypedDict, total=False):
+    """A Managed Transform object."""
+
+    id: Required[str]
+    """The human-readable identifier of the Managed Transform."""
+
+    enabled: Required[bool]
+    """Whether the Managed Transform is enabled."""
+
+
+class ManagedResponseHeader(TypedDict, total=False):
+    """A Managed Transform object."""
+
+    id: Required[str]
+    """The human-readable identifier of the Managed Transform."""
+
+    enabled: Required[bool]
+    """Whether the Managed Transform is enabled."""
diff --git a/src/cloudflare/types/managed_transforms/managed_transform_edit_response.py b/src/cloudflare/types/managed_transforms/managed_transform_edit_response.py
new file mode 100644
index 00000000000..e9b6200bbb2
--- /dev/null
+++ b/src/cloudflare/types/managed_transforms/managed_transform_edit_response.py
@@ -0,0 +1,55 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["ManagedTransformEditResponse", "ManagedRequestHeader", "ManagedResponseHeader"]
+
+
+class ManagedRequestHeader(BaseModel):
+    """A Managed Transform object."""
+
+    id: str
+    """The human-readable identifier of the Managed Transform."""
+
+    enabled: bool
+    """Whether the Managed Transform is enabled."""
+
+    has_conflict: bool
+    """
+    Whether the Managed Transform conflicts with the currently-enabled Managed
+    Transforms.
+    """
+
+    conflicts_with: Optional[List[str]] = None
+    """The Managed Transforms that this Managed Transform conflicts with."""
+
+
+class ManagedResponseHeader(BaseModel):
+    """A Managed Transform object."""
+
+    id: str
+    """The human-readable identifier of the Managed Transform."""
+
+    enabled: bool
+    """Whether the Managed Transform is enabled."""
+
+    has_conflict: bool
+    """
+    Whether the Managed Transform conflicts with the currently-enabled Managed
+    Transforms.
+    """
+
+    conflicts_with: Optional[List[str]] = None
+    """The Managed Transforms that this Managed Transform conflicts with."""
+
+
+class ManagedTransformEditResponse(BaseModel):
+    """A result."""
+
+    managed_request_headers: List[ManagedRequestHeader]
+    """The list of Managed Request Transforms."""
+
+    managed_response_headers: List[ManagedResponseHeader]
+    """The list of Managed Response Transforms."""
diff --git a/src/cloudflare/types/managed_transforms/managed_transform_list_response.py b/src/cloudflare/types/managed_transforms/managed_transform_list_response.py
new file mode 100644
index 00000000000..4f246ffb75d
--- /dev/null
+++ b/src/cloudflare/types/managed_transforms/managed_transform_list_response.py
@@ -0,0 +1,55 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["ManagedTransformListResponse", "ManagedRequestHeader", "ManagedResponseHeader"]
+
+
+class ManagedRequestHeader(BaseModel):
+    """A Managed Transform object."""
+
+    id: str
+    """The human-readable identifier of the Managed Transform."""
+
+    enabled: bool
+    """Whether the Managed Transform is enabled."""
+
+    has_conflict: bool
+    """
+    Whether the Managed Transform conflicts with the currently-enabled Managed
+    Transforms.
+    """
+
+    conflicts_with: Optional[List[str]] = None
+    """The Managed Transforms that this Managed Transform conflicts with."""
+
+
+class ManagedResponseHeader(BaseModel):
+    """A Managed Transform object."""
+
+    id: str
+    """The human-readable identifier of the Managed Transform."""
+
+    enabled: bool
+    """Whether the Managed Transform is enabled."""
+
+    has_conflict: bool
+    """
+    Whether the Managed Transform conflicts with the currently-enabled Managed
+    Transforms.
+    """
+
+    conflicts_with: Optional[List[str]] = None
+    """The Managed Transforms that this Managed Transform conflicts with."""
+
+
+class ManagedTransformListResponse(BaseModel):
+    """A result."""
+
+    managed_request_headers: List[ManagedRequestHeader]
+    """The list of Managed Request Transforms."""
+
+    managed_response_headers: List[ManagedResponseHeader]
+    """The list of Managed Response Transforms."""
diff --git a/src/cloudflare/types/memberships/membership.py b/src/cloudflare/types/memberships/membership.py
index a7fb6720539..80c62003645 100644
--- a/src/cloudflare/types/memberships/membership.py
+++ b/src/cloudflare/types/memberships/membership.py
@@ -11,6 +11,8 @@
 
 
 class Permissions(BaseModel):
+    """All access permissions for the user at the account."""
+
     analytics: Optional[PermissionGrant] = None
 
     billing: Optional[PermissionGrant] = None
@@ -53,7 +55,7 @@ class Membership(BaseModel):
     """All access permissions for the user at the account."""
 
     roles: Optional[List[str]] = None
-    """List of role names for the user at the account."""
+    """List of role names the membership has for this account."""
 
     status: Optional[Literal["accepted", "pending", "rejected"]] = None
     """Status of this membership."""
diff --git a/src/cloudflare/types/memberships/membership_get_response.py b/src/cloudflare/types/memberships/membership_get_response.py
index d828d038709..73cbc38ac5c 100644
--- a/src/cloudflare/types/memberships/membership_get_response.py
+++ b/src/cloudflare/types/memberships/membership_get_response.py
@@ -12,13 +12,17 @@
     "Permissions",
     "Policy",
     "PolicyPermissionGroup",
+    "PolicyPermissionGroupMeta",
     "PolicyResourceGroup",
     "PolicyResourceGroupScope",
     "PolicyResourceGroupScopeObject",
+    "PolicyResourceGroupMeta",
 ]
 
 
 class Permissions(BaseModel):
+    """All access permissions for the user at the account."""
+
     analytics: Optional[PermissionGrant] = None
 
     billing: Optional[PermissionGrant] = None
@@ -44,18 +48,34 @@ class Permissions(BaseModel):
     zones: Optional[PermissionGrant] = None
 
 
+class PolicyPermissionGroupMeta(BaseModel):
+    """Attributes associated to the permission group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
+
+
 class PolicyPermissionGroup(BaseModel):
+    """
+    A named group of permissions that map to a group of operations against resources.
+    """
+
     id: str
-    """Identifier of the group."""
+    """Identifier of the permission group."""
 
-    meta: Optional[object] = None
+    meta: Optional[PolicyPermissionGroupMeta] = None
     """Attributes associated to the permission group."""
 
     name: Optional[str] = None
-    """Name of the group."""
+    """Name of the permission group."""
 
 
 class PolicyResourceGroupScopeObject(BaseModel):
+    """
+    A scope object represents any resource that can have actions applied against invite.
+    """
+
     key: str
     """
     This is a combination of pre-defined resource name and identifier (like Zone ID
@@ -64,6 +84,8 @@ class PolicyResourceGroupScopeObject(BaseModel):
 
 
 class PolicyResourceGroupScope(BaseModel):
+    """A scope is a combination of scope objects which provides additional context."""
+
     key: str
     """
     This is a combination of pre-defined resource name and identifier (like Account
@@ -74,14 +96,24 @@ class PolicyResourceGroupScope(BaseModel):
     """A list of scope objects for additional context."""
 
 
+class PolicyResourceGroupMeta(BaseModel):
+    """Attributes associated to the resource group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
+
+
 class PolicyResourceGroup(BaseModel):
+    """A group of scoped resources."""
+
     id: str
-    """Identifier of the group."""
+    """Identifier of the resource group."""
 
     scope: List[PolicyResourceGroupScope]
     """The scope associated to the resource group"""
 
-    meta: Optional[object] = None
+    meta: Optional[PolicyResourceGroupMeta] = None
     """Attributes associated to the resource group."""
 
     name: Optional[str] = None
@@ -122,7 +154,7 @@ class MembershipGetResponse(BaseModel):
     """Access policy for the membership"""
 
     roles: Optional[List[str]] = None
-    """List of role names for the user at the account."""
+    """List of role names the membership has for this account."""
 
     status: Optional[Literal["accepted", "pending", "rejected"]] = None
     """Status of this membership."""
diff --git a/src/cloudflare/types/memberships/membership_update_response.py b/src/cloudflare/types/memberships/membership_update_response.py
index ee118776d7c..d1088531844 100644
--- a/src/cloudflare/types/memberships/membership_update_response.py
+++ b/src/cloudflare/types/memberships/membership_update_response.py
@@ -12,13 +12,17 @@
     "Permissions",
     "Policy",
     "PolicyPermissionGroup",
+    "PolicyPermissionGroupMeta",
     "PolicyResourceGroup",
     "PolicyResourceGroupScope",
     "PolicyResourceGroupScopeObject",
+    "PolicyResourceGroupMeta",
 ]
 
 
 class Permissions(BaseModel):
+    """All access permissions for the user at the account."""
+
     analytics: Optional[PermissionGrant] = None
 
     billing: Optional[PermissionGrant] = None
@@ -44,18 +48,34 @@ class Permissions(BaseModel):
     zones: Optional[PermissionGrant] = None
 
 
+class PolicyPermissionGroupMeta(BaseModel):
+    """Attributes associated to the permission group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
+
+
 class PolicyPermissionGroup(BaseModel):
+    """
+    A named group of permissions that map to a group of operations against resources.
+    """
+
     id: str
-    """Identifier of the group."""
+    """Identifier of the permission group."""
 
-    meta: Optional[object] = None
+    meta: Optional[PolicyPermissionGroupMeta] = None
     """Attributes associated to the permission group."""
 
     name: Optional[str] = None
-    """Name of the group."""
+    """Name of the permission group."""
 
 
 class PolicyResourceGroupScopeObject(BaseModel):
+    """
+    A scope object represents any resource that can have actions applied against invite.
+    """
+
     key: str
     """
     This is a combination of pre-defined resource name and identifier (like Zone ID
@@ -64,6 +84,8 @@ class PolicyResourceGroupScopeObject(BaseModel):
 
 
 class PolicyResourceGroupScope(BaseModel):
+    """A scope is a combination of scope objects which provides additional context."""
+
     key: str
     """
     This is a combination of pre-defined resource name and identifier (like Account
@@ -74,14 +96,24 @@ class PolicyResourceGroupScope(BaseModel):
     """A list of scope objects for additional context."""
 
 
+class PolicyResourceGroupMeta(BaseModel):
+    """Attributes associated to the resource group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
+
+
 class PolicyResourceGroup(BaseModel):
+    """A group of scoped resources."""
+
     id: str
-    """Identifier of the group."""
+    """Identifier of the resource group."""
 
     scope: List[PolicyResourceGroupScope]
     """The scope associated to the resource group"""
 
-    meta: Optional[object] = None
+    meta: Optional[PolicyResourceGroupMeta] = None
     """Attributes associated to the resource group."""
 
     name: Optional[str] = None
@@ -122,7 +154,7 @@ class MembershipUpdateResponse(BaseModel):
     """Access policy for the membership"""
 
     roles: Optional[List[str]] = None
-    """List of role names for the user at the account."""
+    """List of role names the membership has for this account."""
 
     status: Optional[Literal["accepted", "pending", "rejected"]] = None
     """Status of this membership."""
diff --git a/src/cloudflare/types/mtls_certificates/__init__.py b/src/cloudflare/types/mtls_certificates/__init__.py
index e7b6588986e..d44f658f608 100644
--- a/src/cloudflare/types/mtls_certificates/__init__.py
+++ b/src/cloudflare/types/mtls_certificates/__init__.py
@@ -3,7 +3,6 @@
 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_create_response import MTLSCertificateCreateResponse as MTLSCertificateCreateResponse
diff --git a/src/cloudflare/types/mtls_certificates/association_get_response.py b/src/cloudflare/types/mtls_certificates/association_get_response.py
deleted file mode 100644
index 6775dff66cb..00000000000
--- a/src/cloudflare/types/mtls_certificates/association_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .certificate_asssociation import CertificateAsssociation
-
-__all__ = ["AssociationGetResponse"]
-
-AssociationGetResponse = List[CertificateAsssociation]
diff --git a/src/cloudflare/types/mtls_certificates/mtls_certificate.py b/src/cloudflare/types/mtls_certificates/mtls_certificate.py
index 4b7a1e5f350..eff04886ecd 100644
--- a/src/cloudflare/types/mtls_certificates/mtls_certificate.py
+++ b/src/cloudflare/types/mtls_certificates/mtls_certificate.py
@@ -10,7 +10,7 @@
 
 class MTLSCertificate(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
 
     ca: Optional[bool] = None
     """Indicates whether the certificate is a CA or leaf certificate."""
diff --git a/src/cloudflare/types/mtls_certificates/mtls_certificate_create_params.py b/src/cloudflare/types/mtls_certificates/mtls_certificate_create_params.py
index 0a2e368e13f..e5e955f7641 100644
--- a/src/cloudflare/types/mtls_certificates/mtls_certificate_create_params.py
+++ b/src/cloudflare/types/mtls_certificates/mtls_certificate_create_params.py
@@ -9,7 +9,7 @@
 
 class MTLSCertificateCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     ca: Required[bool]
     """Indicates whether the certificate is a CA or leaf certificate."""
@@ -21,4 +21,8 @@ class MTLSCertificateCreateParams(TypedDict, total=False):
     """Optional unique name for the certificate. Only used for human readability."""
 
     private_key: str
-    """The private key for the certificate"""
+    """The private key for the certificate.
+
+    This field is only needed for specific use cases such as using a custom
+    certificate with Zero Trust's block page.
+    """
diff --git a/src/cloudflare/types/mtls_certificates/mtls_certificate_create_response.py b/src/cloudflare/types/mtls_certificates/mtls_certificate_create_response.py
index 4d1bd959fa6..83364497857 100644
--- a/src/cloudflare/types/mtls_certificates/mtls_certificate_create_response.py
+++ b/src/cloudflare/types/mtls_certificates/mtls_certificate_create_response.py
@@ -10,7 +10,7 @@
 
 class MTLSCertificateCreateResponse(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
 
     ca: Optional[bool] = None
     """Indicates whether the certificate is a CA or leaf certificate."""
diff --git a/src/cloudflare/types/network_interconnects/__init__.py b/src/cloudflare/types/network_interconnects/__init__.py
new file mode 100644
index 00000000000..e11165f0e11
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/__init__.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .cni_list_params import CNIListParams as CNIListParams
+from .cni_get_response import CNIGetResponse as CNIGetResponse
+from .slot_list_params import SlotListParams as SlotListParams
+from .cni_create_params import CNICreateParams as CNICreateParams
+from .cni_list_response import CNIListResponse as CNIListResponse
+from .cni_update_params import CNIUpdateParams as CNIUpdateParams
+from .slot_get_response import SlotGetResponse as SlotGetResponse
+from .slot_list_response import SlotListResponse as SlotListResponse
+from .cni_create_response import CNICreateResponse as CNICreateResponse
+from .cni_update_response import CNIUpdateResponse as CNIUpdateResponse
+from .setting_get_response import SettingGetResponse as SettingGetResponse
+from .setting_update_params import SettingUpdateParams as SettingUpdateParams
+from .setting_update_response import SettingUpdateResponse as SettingUpdateResponse
+from .interconnect_list_params import InterconnectListParams as InterconnectListParams
+from .interconnect_get_response import InterconnectGetResponse as InterconnectGetResponse
+from .interconnect_create_params import InterconnectCreateParams as InterconnectCreateParams
+from .interconnect_list_response import InterconnectListResponse as InterconnectListResponse
+from .interconnect_create_response import InterconnectCreateResponse as InterconnectCreateResponse
+from .interconnect_status_response import InterconnectStatusResponse as InterconnectStatusResponse
diff --git a/src/cloudflare/types/network_interconnects/cni_create_params.py b/src/cloudflare/types/network_interconnects/cni_create_params.py
new file mode 100644
index 00000000000..22518f602cf
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/cni_create_params.py
@@ -0,0 +1,61 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["CNICreateParams", "Magic", "BGP"]
+
+
+class CNICreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Customer account tag"""
+
+    account: Required[str]
+    """Customer account tag"""
+
+    interconnect: Required[str]
+
+    magic: Required[Magic]
+
+    bgp: BGP
+
+
+class Magic(TypedDict, total=False):
+    conduit_name: Required[str]
+
+    description: Required[str]
+
+    mtu: Required[int]
+
+
+class BGP(TypedDict, total=False):
+    customer_asn: Required[int]
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: Required[SequenceNotStr[str]]
+    """Extra set of static prefixes to advertise to the customer's end of the session"""
+
+    md5_key: Optional[str]
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
diff --git a/src/cloudflare/types/network_interconnects/cni_create_response.py b/src/cloudflare/types/network_interconnects/cni_create_response.py
new file mode 100644
index 00000000000..308e1c6ba7e
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/cni_create_response.py
@@ -0,0 +1,67 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["CNICreateResponse", "Magic", "BGP"]
+
+
+class Magic(BaseModel):
+    conduit_name: str
+
+    description: str
+
+    mtu: int
+
+
+class BGP(BaseModel):
+    customer_asn: int
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: List[str]
+    """Extra set of static prefixes to advertise to the customer's end of the session"""
+
+    md5_key: Optional[str] = None
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class CNICreateResponse(BaseModel):
+    id: str
+
+    account: str
+    """Customer account tag"""
+
+    cust_ip: str
+    """Customer end of the point-to-point link
+
+    This should always be inside the same prefix as `p2p_ip`.
+    """
+
+    interconnect: str
+    """Interconnect identifier hosting this CNI"""
+
+    magic: Magic
+
+    p2p_ip: str
+    """Cloudflare end of the point-to-point link"""
+
+    bgp: Optional[BGP] = None
diff --git a/src/cloudflare/types/network_interconnects/cni_get_response.py b/src/cloudflare/types/network_interconnects/cni_get_response.py
new file mode 100644
index 00000000000..ef4d36fb726
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/cni_get_response.py
@@ -0,0 +1,67 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["CNIGetResponse", "Magic", "BGP"]
+
+
+class Magic(BaseModel):
+    conduit_name: str
+
+    description: str
+
+    mtu: int
+
+
+class BGP(BaseModel):
+    customer_asn: int
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: List[str]
+    """Extra set of static prefixes to advertise to the customer's end of the session"""
+
+    md5_key: Optional[str] = None
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class CNIGetResponse(BaseModel):
+    id: str
+
+    account: str
+    """Customer account tag"""
+
+    cust_ip: str
+    """Customer end of the point-to-point link
+
+    This should always be inside the same prefix as `p2p_ip`.
+    """
+
+    interconnect: str
+    """Interconnect identifier hosting this CNI"""
+
+    magic: Magic
+
+    p2p_ip: str
+    """Cloudflare end of the point-to-point link"""
+
+    bgp: Optional[BGP] = None
diff --git a/src/cloudflare/types/network_interconnects/cni_list_params.py b/src/cloudflare/types/network_interconnects/cni_list_params.py
new file mode 100644
index 00000000000..105f62d5031
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/cni_list_params.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Required, TypedDict
+
+__all__ = ["CNIListParams"]
+
+
+class CNIListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Customer account tag"""
+
+    cursor: Optional[int]
+
+    limit: Optional[int]
+
+    slot: Optional[str]
+    """If specified, only show CNIs associated with the specified slot"""
+
+    tunnel_id: Optional[str]
+    """If specified, only show cnis associated with the specified tunnel id"""
diff --git a/src/cloudflare/types/network_interconnects/cni_list_response.py b/src/cloudflare/types/network_interconnects/cni_list_response.py
new file mode 100644
index 00000000000..6d40cbc1c40
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/cni_list_response.py
@@ -0,0 +1,73 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["CNIListResponse", "Item", "ItemMagic", "ItemBGP"]
+
+
+class ItemMagic(BaseModel):
+    conduit_name: str
+
+    description: str
+
+    mtu: int
+
+
+class ItemBGP(BaseModel):
+    customer_asn: int
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: List[str]
+    """Extra set of static prefixes to advertise to the customer's end of the session"""
+
+    md5_key: Optional[str] = None
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class Item(BaseModel):
+    id: str
+
+    account: str
+    """Customer account tag"""
+
+    cust_ip: str
+    """Customer end of the point-to-point link
+
+    This should always be inside the same prefix as `p2p_ip`.
+    """
+
+    interconnect: str
+    """Interconnect identifier hosting this CNI"""
+
+    magic: ItemMagic
+
+    p2p_ip: str
+    """Cloudflare end of the point-to-point link"""
+
+    bgp: Optional[ItemBGP] = None
+
+
+class CNIListResponse(BaseModel):
+    items: List[Item]
+
+    next: Optional[int] = None
diff --git a/src/cloudflare/types/network_interconnects/cni_update_params.py b/src/cloudflare/types/network_interconnects/cni_update_params.py
new file mode 100644
index 00000000000..bddc5d5e666
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/cni_update_params.py
@@ -0,0 +1,73 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["CNIUpdateParams", "Magic", "BGP"]
+
+
+class CNIUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Customer account tag"""
+
+    id: Required[str]
+
+    account: Required[str]
+    """Customer account tag"""
+
+    cust_ip: Required[str]
+    """Customer end of the point-to-point link
+
+    This should always be inside the same prefix as `p2p_ip`.
+    """
+
+    interconnect: Required[str]
+    """Interconnect identifier hosting this CNI"""
+
+    magic: Required[Magic]
+
+    p2p_ip: Required[str]
+    """Cloudflare end of the point-to-point link"""
+
+    bgp: BGP
+
+
+class Magic(TypedDict, total=False):
+    conduit_name: Required[str]
+
+    description: Required[str]
+
+    mtu: Required[int]
+
+
+class BGP(TypedDict, total=False):
+    customer_asn: Required[int]
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: Required[SequenceNotStr[str]]
+    """Extra set of static prefixes to advertise to the customer's end of the session"""
+
+    md5_key: Optional[str]
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
diff --git a/src/cloudflare/types/network_interconnects/cni_update_response.py b/src/cloudflare/types/network_interconnects/cni_update_response.py
new file mode 100644
index 00000000000..e7201af3d68
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/cni_update_response.py
@@ -0,0 +1,67 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["CNIUpdateResponse", "Magic", "BGP"]
+
+
+class Magic(BaseModel):
+    conduit_name: str
+
+    description: str
+
+    mtu: int
+
+
+class BGP(BaseModel):
+    customer_asn: int
+    """ASN used on the customer end of the BGP session"""
+
+    extra_prefixes: List[str]
+    """Extra set of static prefixes to advertise to the customer's end of the session"""
+
+    md5_key: Optional[str] = None
+    """MD5 key to use for session authentication.
+
+    Note that _this is not a security measure_. MD5 is not a valid security
+    mechanism, and the key is not treated as a secret value. This is _only_
+    supported for preventing misconfiguration, not for defending against malicious
+    attacks.
+
+    The MD5 key, if set, must be of non-zero length and consist only of the
+    following types of character:
+
+    - ASCII alphanumerics: `[a-zA-Z0-9]`
+    - Special characters in the set `'!@#$%^&*()+[]{}<>/.,;:_-~`= \\||`
+
+    In other words, MD5 keys may contain any printable ASCII character aside from
+    newline (0x0A), quotation mark (`"`), vertical tab (0x0B), carriage return
+    (0x0D), tab (0x09), form feed (0x0C), and the question mark (`?`). Requests
+    specifying an MD5 key with one or more of these disallowed characters will be
+    rejected.
+    """
+
+
+class CNIUpdateResponse(BaseModel):
+    id: str
+
+    account: str
+    """Customer account tag"""
+
+    cust_ip: str
+    """Customer end of the point-to-point link
+
+    This should always be inside the same prefix as `p2p_ip`.
+    """
+
+    interconnect: str
+    """Interconnect identifier hosting this CNI"""
+
+    magic: Magic
+
+    p2p_ip: str
+    """Cloudflare end of the point-to-point link"""
+
+    bgp: Optional[BGP] = None
diff --git a/src/cloudflare/types/network_interconnects/interconnect_create_params.py b/src/cloudflare/types/network_interconnects/interconnect_create_params.py
new file mode 100644
index 00000000000..c62824f18c9
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/interconnect_create_params.py
@@ -0,0 +1,39 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Optional
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+__all__ = ["InterconnectCreateParams", "NscInterconnectCreatePhysicalBody", "NscInterconnectCreateGcpPartnerBody"]
+
+
+class NscInterconnectCreatePhysicalBody(TypedDict, total=False):
+    account_id: Required[str]
+    """Customer account tag"""
+
+    account: Required[str]
+
+    slot_id: Required[str]
+
+    type: Required[str]
+
+    speed: Optional[str]
+
+
+class NscInterconnectCreateGcpPartnerBody(TypedDict, total=False):
+    account_id: Required[str]
+    """Customer account tag"""
+
+    account: Required[str]
+
+    bandwidth: Required[Literal["50M", "100M", "200M", "300M", "400M", "500M", "1G", "2G", "5G", "10G", "20G", "50G"]]
+    """Bandwidth structure as visible through the customer-facing API."""
+
+    pairing_key: Required[str]
+    """Pairing key provided by GCP"""
+
+    type: Required[str]
+
+
+InterconnectCreateParams: TypeAlias = Union[NscInterconnectCreatePhysicalBody, NscInterconnectCreateGcpPartnerBody]
diff --git a/src/cloudflare/types/network_interconnects/interconnect_create_response.py b/src/cloudflare/types/network_interconnects/interconnect_create_response.py
new file mode 100644
index 00000000000..21f706020e6
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/interconnect_create_response.py
@@ -0,0 +1,58 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from typing_extensions import Literal, TypeAlias
+
+from ..._models import BaseModel
+
+__all__ = [
+    "InterconnectCreateResponse",
+    "NscInterconnectPhysicalBody",
+    "NscInterconnectPhysicalBodyFacility",
+    "NscInterconnectGcpPartnerBody",
+]
+
+
+class NscInterconnectPhysicalBodyFacility(BaseModel):
+    address: List[str]
+
+    name: str
+
+
+class NscInterconnectPhysicalBody(BaseModel):
+    account: str
+
+    facility: NscInterconnectPhysicalBodyFacility
+
+    name: str
+
+    site: str
+    """A Cloudflare site name."""
+
+    slot_id: str
+
+    speed: str
+
+    type: str
+
+    owner: Optional[str] = None
+
+
+class NscInterconnectGcpPartnerBody(BaseModel):
+    account: str
+
+    name: str
+
+    region: str
+
+    type: str
+
+    owner: Optional[str] = None
+
+    speed: Optional[Literal["50M", "100M", "200M", "300M", "400M", "500M", "1G", "2G", "5G", "10G", "20G", "50G"]] = (
+        None
+    )
+    """Bandwidth structure as visible through the customer-facing API."""
+
+
+InterconnectCreateResponse: TypeAlias = Union[NscInterconnectPhysicalBody, NscInterconnectGcpPartnerBody]
diff --git a/src/cloudflare/types/network_interconnects/interconnect_get_response.py b/src/cloudflare/types/network_interconnects/interconnect_get_response.py
new file mode 100644
index 00000000000..6e0e75db84a
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/interconnect_get_response.py
@@ -0,0 +1,58 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from typing_extensions import Literal, TypeAlias
+
+from ..._models import BaseModel
+
+__all__ = [
+    "InterconnectGetResponse",
+    "NscInterconnectPhysicalBody",
+    "NscInterconnectPhysicalBodyFacility",
+    "NscInterconnectGcpPartnerBody",
+]
+
+
+class NscInterconnectPhysicalBodyFacility(BaseModel):
+    address: List[str]
+
+    name: str
+
+
+class NscInterconnectPhysicalBody(BaseModel):
+    account: str
+
+    facility: NscInterconnectPhysicalBodyFacility
+
+    name: str
+
+    site: str
+    """A Cloudflare site name."""
+
+    slot_id: str
+
+    speed: str
+
+    type: str
+
+    owner: Optional[str] = None
+
+
+class NscInterconnectGcpPartnerBody(BaseModel):
+    account: str
+
+    name: str
+
+    region: str
+
+    type: str
+
+    owner: Optional[str] = None
+
+    speed: Optional[Literal["50M", "100M", "200M", "300M", "400M", "500M", "1G", "2G", "5G", "10G", "20G", "50G"]] = (
+        None
+    )
+    """Bandwidth structure as visible through the customer-facing API."""
+
+
+InterconnectGetResponse: TypeAlias = Union[NscInterconnectPhysicalBody, NscInterconnectGcpPartnerBody]
diff --git a/src/cloudflare/types/network_interconnects/interconnect_list_params.py b/src/cloudflare/types/network_interconnects/interconnect_list_params.py
new file mode 100644
index 00000000000..1b60b5ce038
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/interconnect_list_params.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Required, TypedDict
+
+__all__ = ["InterconnectListParams"]
+
+
+class InterconnectListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Customer account tag"""
+
+    cursor: Optional[int]
+
+    limit: Optional[int]
+
+    site: Optional[str]
+    """If specified, only show interconnects located at the given site"""
+
+    type: Optional[str]
+    """If specified, only show interconnects of the given type"""
diff --git a/src/cloudflare/types/network_interconnects/interconnect_list_response.py b/src/cloudflare/types/network_interconnects/interconnect_list_response.py
new file mode 100644
index 00000000000..07ac20fe58d
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/interconnect_list_response.py
@@ -0,0 +1,65 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from typing_extensions import Literal, TypeAlias
+
+from ..._models import BaseModel
+
+__all__ = [
+    "InterconnectListResponse",
+    "Item",
+    "ItemNscInterconnectPhysicalBody",
+    "ItemNscInterconnectPhysicalBodyFacility",
+    "ItemNscInterconnectGcpPartnerBody",
+]
+
+
+class ItemNscInterconnectPhysicalBodyFacility(BaseModel):
+    address: List[str]
+
+    name: str
+
+
+class ItemNscInterconnectPhysicalBody(BaseModel):
+    account: str
+
+    facility: ItemNscInterconnectPhysicalBodyFacility
+
+    name: str
+
+    site: str
+    """A Cloudflare site name."""
+
+    slot_id: str
+
+    speed: str
+
+    type: str
+
+    owner: Optional[str] = None
+
+
+class ItemNscInterconnectGcpPartnerBody(BaseModel):
+    account: str
+
+    name: str
+
+    region: str
+
+    type: str
+
+    owner: Optional[str] = None
+
+    speed: Optional[Literal["50M", "100M", "200M", "300M", "400M", "500M", "1G", "2G", "5G", "10G", "20G", "50G"]] = (
+        None
+    )
+    """Bandwidth structure as visible through the customer-facing API."""
+
+
+Item: TypeAlias = Union[ItemNscInterconnectPhysicalBody, ItemNscInterconnectGcpPartnerBody]
+
+
+class InterconnectListResponse(BaseModel):
+    items: List[Item]
+
+    next: Optional[int] = None
diff --git a/src/cloudflare/types/network_interconnects/interconnect_status_response.py b/src/cloudflare/types/network_interconnects/interconnect_status_response.py
new file mode 100644
index 00000000000..6b05cd69e58
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/interconnect_status_response.py
@@ -0,0 +1,36 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Union, Optional
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from ..._utils import PropertyInfo
+from ..._models import BaseModel
+
+__all__ = ["InterconnectStatusResponse", "Pending", "Down", "Unhealthy", "Healthy"]
+
+
+class Pending(BaseModel):
+    state: Literal["Pending"]
+
+
+class Down(BaseModel):
+    state: Literal["Down"]
+
+    reason: Optional[str] = None
+    """Diagnostic information, if available"""
+
+
+class Unhealthy(BaseModel):
+    state: Literal["Unhealthy"]
+
+    reason: Optional[str] = None
+    """Diagnostic information, if available"""
+
+
+class Healthy(BaseModel):
+    state: Literal["Healthy"]
+
+
+InterconnectStatusResponse: TypeAlias = Annotated[
+    Union[Pending, Down, Unhealthy, Healthy], PropertyInfo(discriminator="state")
+]
diff --git a/src/cloudflare/types/network_interconnects/setting_get_response.py b/src/cloudflare/types/network_interconnects/setting_get_response.py
new file mode 100644
index 00000000000..328dbeb394c
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/setting_get_response.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["SettingGetResponse"]
+
+
+class SettingGetResponse(BaseModel):
+    default_asn: int
diff --git a/src/cloudflare/types/network_interconnects/setting_update_params.py b/src/cloudflare/types/network_interconnects/setting_update_params.py
new file mode 100644
index 00000000000..f548ca5b4d7
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/setting_update_params.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SettingUpdateParams"]
+
+
+class SettingUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    default_asn: Optional[int]
diff --git a/src/cloudflare/types/network_interconnects/setting_update_response.py b/src/cloudflare/types/network_interconnects/setting_update_response.py
new file mode 100644
index 00000000000..118f8769479
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/setting_update_response.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["SettingUpdateResponse"]
+
+
+class SettingUpdateResponse(BaseModel):
+    default_asn: int
diff --git a/src/cloudflare/types/network_interconnects/slot_get_response.py b/src/cloudflare/types/network_interconnects/slot_get_response.py
new file mode 100644
index 00000000000..40ba2d9f90b
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/slot_get_response.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["SlotGetResponse", "Facility"]
+
+
+class Facility(BaseModel):
+    address: List[str]
+
+    name: str
+
+
+class SlotGetResponse(BaseModel):
+    id: str
+    """Slot ID"""
+
+    facility: Facility
+
+    occupied: bool
+    """Whether the slot is occupied or not"""
+
+    site: str
+
+    speed: str
+
+    account: Optional[str] = None
+    """Customer account tag"""
diff --git a/src/cloudflare/types/network_interconnects/slot_list_params.py b/src/cloudflare/types/network_interconnects/slot_list_params.py
new file mode 100644
index 00000000000..a788e11fb1e
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/slot_list_params.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SlotListParams"]
+
+
+class SlotListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Customer account tag"""
+
+    address_contains: Optional[str]
+    """If specified, only show slots with the given text in their address field"""
+
+    cursor: Optional[int]
+
+    limit: Optional[int]
+
+    occupied: Optional[bool]
+    """If specified, only show slots with a specific occupied/unoccupied state"""
+
+    site: Optional[str]
+    """If specified, only show slots located at the given site"""
+
+    speed: Optional[str]
+    """If specified, only show slots that support the given speed"""
diff --git a/src/cloudflare/types/network_interconnects/slot_list_response.py b/src/cloudflare/types/network_interconnects/slot_list_response.py
new file mode 100644
index 00000000000..8eba3c1bc51
--- /dev/null
+++ b/src/cloudflare/types/network_interconnects/slot_list_response.py
@@ -0,0 +1,36 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["SlotListResponse", "Item", "ItemFacility"]
+
+
+class ItemFacility(BaseModel):
+    address: List[str]
+
+    name: str
+
+
+class Item(BaseModel):
+    id: str
+    """Slot ID"""
+
+    facility: ItemFacility
+
+    occupied: bool
+    """Whether the slot is occupied or not"""
+
+    site: str
+
+    speed: str
+
+    account: Optional[str] = None
+    """Customer account tag"""
+
+
+class SlotListResponse(BaseModel):
+    items: List[Item]
+
+    next: Optional[int] = None
diff --git a/src/cloudflare/types/organizations/__init__.py b/src/cloudflare/types/organizations/__init__.py
new file mode 100644
index 00000000000..af7b2fd5f68
--- /dev/null
+++ b/src/cloudflare/types/organizations/__init__.py
@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .organization import Organization as Organization
+from .organization_profile import OrganizationProfile as OrganizationProfile
+from .organization_list_params import OrganizationListParams as OrganizationListParams
+from .organization_create_params import OrganizationCreateParams as OrganizationCreateParams
+from .organization_update_params import OrganizationUpdateParams as OrganizationUpdateParams
+from .organization_delete_response import OrganizationDeleteResponse as OrganizationDeleteResponse
+from .organization_profile_update_params import OrganizationProfileUpdateParams as OrganizationProfileUpdateParams
diff --git a/src/cloudflare/types/organizations/organization.py b/src/cloudflare/types/organizations/organization.py
new file mode 100644
index 00000000000..20fe3365408
--- /dev/null
+++ b/src/cloudflare/types/organizations/organization.py
@@ -0,0 +1,77 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, Optional
+from datetime import datetime
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["Organization", "Meta", "MetaFlags", "Parent", "Profile"]
+
+
+class MetaFlags(BaseModel):
+    """Enable features for Organizations."""
+
+    account_creation: str
+
+    account_deletion: str
+
+    account_migration: str
+
+    account_mobility: str
+
+    sub_org_creation: str
+
+
+class Meta(BaseModel):
+    flags: Optional[MetaFlags] = None
+    """Enable features for Organizations."""
+
+    managed_by: Optional[str] = None
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, object] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> object: ...
+    else:
+        __pydantic_extra__: Dict[str, object]
+
+
+class Parent(BaseModel):
+    id: str
+
+    name: str
+
+
+class Profile(BaseModel):
+    business_address: str
+
+    business_email: str
+
+    business_name: str
+
+    business_phone: str
+
+    external_metadata: str
+
+
+class Organization(BaseModel):
+    """References an Organization in the Cloudflare data model."""
+
+    id: str
+
+    create_time: datetime
+
+    meta: Meta
+
+    name: str
+
+    parent: Optional[Parent] = None
+
+    profile: Optional[Profile] = None
diff --git a/src/cloudflare/types/organizations/organization_create_params.py b/src/cloudflare/types/organizations/organization_create_params.py
new file mode 100644
index 00000000000..a5a0eb0aab1
--- /dev/null
+++ b/src/cloudflare/types/organizations/organization_create_params.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["OrganizationCreateParams", "Parent", "Profile"]
+
+
+class OrganizationCreateParams(TypedDict, total=False):
+    name: Required[str]
+
+    parent: Parent
+
+    profile: Profile
+
+
+class Parent(TypedDict, total=False):
+    id: Required[str]
+
+
+class Profile(TypedDict, total=False):
+    business_address: Required[str]
+
+    business_email: Required[str]
+
+    business_name: Required[str]
+
+    business_phone: Required[str]
+
+    external_metadata: Required[str]
diff --git a/src/cloudflare/types/organizations/organization_delete_response.py b/src/cloudflare/types/organizations/organization_delete_response.py
new file mode 100644
index 00000000000..23d0118c65c
--- /dev/null
+++ b/src/cloudflare/types/organizations/organization_delete_response.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["OrganizationDeleteResponse"]
+
+
+class OrganizationDeleteResponse(BaseModel):
+    id: str
diff --git a/src/cloudflare/types/organizations/organization_list_params.py b/src/cloudflare/types/organizations/organization_list_params.py
new file mode 100644
index 00000000000..1567d6b973f
--- /dev/null
+++ b/src/cloudflare/types/organizations/organization_list_params.py
@@ -0,0 +1,91 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["OrganizationListParams", "Containing", "Name", "Parent"]
+
+
+class OrganizationListParams(TypedDict, total=False):
+    id: SequenceNotStr[str]
+    """Only return organizations with the specified IDs (ex.
+
+    id=foo&id=bar). Send multiple elements by repeating the query value.
+    """
+
+    containing: Containing
+
+    name: Name
+
+    page_size: int
+    """The amount of items to return. Defaults to 10."""
+
+    page_token: str
+    """
+    An opaque token returned from the last list response that when provided will
+    retrieve the next page.
+
+    Parameters used to filter the retrieved list must remain in subsequent requests
+    with a page token.
+    """
+
+    parent: Parent
+
+
+class Containing(TypedDict, total=False):
+    account: str
+    """
+    Filter the list of organizations to the ones that contain this particular
+    account.
+    """
+
+    organization: str
+    """
+    Filter the list of organizations to the ones that contain this particular
+    organization.
+    """
+
+    user: str
+    """Filter the list of organizations to the ones that contain this particular user.
+
+    IMPORTANT: Just because an organization "contains" a user is not a
+    representation of any authorization or privilege to manage any resources
+    therein. An organization "containing" a user simply means the user is managed by
+    that organization.
+    """
+
+
+class Name(TypedDict, total=False):
+    contains: str
+    """
+    (case-insensitive) Filter the list of organizations to where the name contains a
+    particular string.
+    """
+
+    ends_with: Annotated[str, PropertyInfo(alias="endsWith")]
+    """
+    (case-insensitive) Filter the list of organizations to where the name ends with
+    a particular string.
+    """
+
+    starts_with: Annotated[str, PropertyInfo(alias="startsWith")]
+    """
+    (case-insensitive) Filter the list of organizations to where the name starts
+    with a particular string.
+    """
+
+
+class Parent(TypedDict, total=False):
+    id: Union[str, Literal["null"]]
+    """
+    Filter the list of organizations to the ones that are a sub-organization of the
+    specified organization.
+
+    "null" is a valid value to provide for this parameter. It means "where an
+    organization has no parent (i.e. it is a 'root' organization)."
+    """
diff --git a/src/cloudflare/types/organizations/organization_profile.py b/src/cloudflare/types/organizations/organization_profile.py
new file mode 100644
index 00000000000..66274a147e1
--- /dev/null
+++ b/src/cloudflare/types/organizations/organization_profile.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["OrganizationProfile"]
+
+
+class OrganizationProfile(BaseModel):
+    business_address: str
+
+    business_email: str
+
+    business_name: str
+
+    business_phone: str
+
+    external_metadata: str
diff --git a/src/cloudflare/types/organizations/organization_profile_get_params.py b/src/cloudflare/types/organizations/organization_profile_get_params.py
new file mode 100644
index 00000000000..8075b04922b
--- /dev/null
+++ b/src/cloudflare/types/organizations/organization_profile_get_params.py
@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import TypeAlias
+
+from .organization_profile import OrganizationProfile
+
+__all__ = ["Result"]
+
+Result: TypeAlias = OrganizationProfile
diff --git a/src/cloudflare/types/organizations/organization_profile_update_params.py b/src/cloudflare/types/organizations/organization_profile_update_params.py
new file mode 100644
index 00000000000..6bd3a7f3bff
--- /dev/null
+++ b/src/cloudflare/types/organizations/organization_profile_update_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["OrganizationProfileUpdateParams"]
+
+
+class OrganizationProfileUpdateParams(TypedDict, total=False):
+    business_address: Required[str]
+
+    business_email: Required[str]
+
+    business_name: Required[str]
+
+    business_phone: Required[str]
+
+    external_metadata: Required[str]
diff --git a/src/cloudflare/types/organizations/organization_update_params.py b/src/cloudflare/types/organizations/organization_update_params.py
new file mode 100644
index 00000000000..c6de61d57a2
--- /dev/null
+++ b/src/cloudflare/types/organizations/organization_update_params.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["OrganizationUpdateParams", "Parent", "Profile"]
+
+
+class OrganizationUpdateParams(TypedDict, total=False):
+    name: Required[str]
+
+    parent: Parent
+
+    profile: Profile
+
+
+class Parent(TypedDict, total=False):
+    id: Required[str]
+
+
+class Profile(TypedDict, total=False):
+    business_address: Required[str]
+
+    business_email: Required[str]
+
+    business_name: Required[str]
+
+    business_phone: Required[str]
+
+    external_metadata: Required[str]
diff --git a/src/cloudflare/types/origin_ca_certificates/__init__.py b/src/cloudflare/types/origin_ca_certificates/__init__.py
index 7dda699e7c9..719af2c0770 100644
--- a/src/cloudflare/types/origin_ca_certificates/__init__.py
+++ b/src/cloudflare/types/origin_ca_certificates/__init__.py
@@ -4,11 +4,7 @@
 
 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_create_response import (
-    OriginCACertificateCreateResponse as OriginCACertificateCreateResponse,
-)
 from .origin_ca_certificate_delete_response import (
     OriginCACertificateDeleteResponse as OriginCACertificateDeleteResponse,
 )
diff --git a/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate.py b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate.py
index 0ded731e49c..375c957ce50 100644
--- a/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate.py
+++ b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from datetime import datetime
 
 from ..._models import BaseModel
 from ..ssl.request_validity import RequestValidity
@@ -14,7 +13,7 @@ class OriginCACertificate(BaseModel):
     csr: str
     """The Certificate Signing Request (CSR). Must be newline-encoded."""
 
-    hostnames: List[object]
+    hostnames: List[str]
     """
     Array of hostnames or wildcard names (e.g., \\**.example.com) bound to the
     certificate.
@@ -30,10 +29,10 @@ class OriginCACertificate(BaseModel):
     """The number of days for which the certificate should be valid."""
 
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
 
     certificate: Optional[str] = None
     """The Origin CA certificate. Will be newline-encoded."""
 
-    expires_on: Optional[datetime] = None
+    expires_on: Optional[str] = None
     """When the certificate will expire."""
diff --git a/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_create_params.py b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_create_params.py
index 704ed08eed1..47950cda0b6 100644
--- a/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_create_params.py
+++ b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_create_params.py
@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import Iterable
-from typing_extensions import TypedDict
+from typing_extensions import Required, TypedDict
 
+from ..._types import SequenceNotStr
 from ..ssl.request_validity import RequestValidity
 from ..shared.certificate_request_type import CertificateRequestType
 
@@ -12,16 +12,16 @@
 
 
 class OriginCACertificateCreateParams(TypedDict, total=False):
-    csr: str
+    csr: Required[str]
     """The Certificate Signing Request (CSR). Must be newline-encoded."""
 
-    hostnames: Iterable[object]
+    hostnames: Required[SequenceNotStr[str]]
     """
     Array of hostnames or wildcard names (e.g., \\**.example.com) bound to the
     certificate.
     """
 
-    request_type: CertificateRequestType
+    request_type: Required[CertificateRequestType]
     """
     Signature type desired on certificate ("origin-rsa" (rsa), "origin-ecc" (ecdsa),
     or "keyless-certificate" (for Keyless SSL servers).
diff --git a/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_create_response.py b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_create_response.py
deleted file mode 100644
index dfa04eb256f..00000000000
--- a/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_create_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["OriginCACertificateCreateResponse"]
-
-OriginCACertificateCreateResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_delete_response.py b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_delete_response.py
index 0077aa46b31..24361dd0520 100644
--- a/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_delete_response.py
+++ b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_delete_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from datetime import datetime
 
 from ..._models import BaseModel
 
@@ -9,4 +10,7 @@
 
 class OriginCACertificateDeleteResponse(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
+
+    revoked_at: Optional[datetime] = None
+    """When the certificate was revoked."""
diff --git a/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_get_response.py b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_get_response.py
deleted file mode 100644
index 7b2a5a6f147..00000000000
--- a/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_get_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["OriginCACertificateGetResponse"]
-
-OriginCACertificateGetResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_list_params.py b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_list_params.py
index e4f64955822..4aeca43f9ac 100644
--- a/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_list_params.py
+++ b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_list_params.py
@@ -2,11 +2,23 @@
 
 from __future__ import annotations
 
-from typing_extensions import TypedDict
+from typing_extensions import Required, TypedDict
 
 __all__ = ["OriginCACertificateListParams"]
 
 
 class OriginCACertificateListParams(TypedDict, total=False):
-    zone_id: str
-    """Identifier"""
+    zone_id: Required[str]
+    """Identifier."""
+
+    limit: int
+    """Limit to the number of records returned."""
+
+    offset: int
+    """Offset the results"""
+
+    page: float
+    """Page number of paginated results."""
+
+    per_page: float
+    """Number of records per page."""
diff --git a/src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_get_response.py b/src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_get_response.py
index 29d22ad7a3b..a3bac95921c 100644
--- a/src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_get_response.py
+++ b/src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_get_response.py
@@ -1,7 +1,23 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
 
 __all__ = ["OriginPostQuantumEncryptionGetResponse"]
 
-OriginPostQuantumEncryptionGetResponse = Union[Optional[str], Optional[object]]
+
+class OriginPostQuantumEncryptionGetResponse(BaseModel):
+    id: Literal["origin_pqe"]
+    """The identifier of the caching setting."""
+
+    editable: bool
+    """Whether the setting is editable."""
+
+    value: Literal["preferred", "supported", "off"]
+    """Value of the Origin Post Quantum Encryption Setting."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
diff --git a/src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_update_params.py b/src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_update_params.py
index b059d4aee6a..bee5dfc4afb 100644
--- a/src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_update_params.py
+++ b/src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_update_params.py
@@ -9,7 +9,7 @@
 
 class OriginPostQuantumEncryptionUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     value: Required[Literal["preferred", "supported", "off"]]
     """Value of the Origin Post Quantum Encryption Setting."""
diff --git a/src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_update_response.py b/src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_update_response.py
index ecf11d9553f..1f228e94d13 100644
--- a/src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_update_response.py
+++ b/src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_update_response.py
@@ -1,7 +1,23 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
 
 __all__ = ["OriginPostQuantumEncryptionUpdateResponse"]
 
-OriginPostQuantumEncryptionUpdateResponse = Union[Optional[str], Optional[object]]
+
+class OriginPostQuantumEncryptionUpdateResponse(BaseModel):
+    id: Literal["origin_pqe"]
+    """The identifier of the caching setting."""
+
+    editable: bool
+    """Whether the setting is editable."""
+
+    value: Literal["preferred", "supported", "off"]
+    """Value of the Origin Post Quantum Encryption Setting."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/__init__.py b/src/cloudflare/types/origin_tls_client_auth/__init__.py
index 685af0e2c2d..26b32bd9372 100644
--- a/src/cloudflare/types/origin_tls_client_auth/__init__.py
+++ b/src/cloudflare/types/origin_tls_client_auth/__init__.py
@@ -8,9 +8,20 @@
 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_certificate_get_response import ZoneCertificateGetResponse as ZoneCertificateGetResponse
 from .zone_authenticated_origin_pull import ZoneAuthenticatedOriginPull as ZoneAuthenticatedOriginPull
+from .zone_certificate_create_params import ZoneCertificateCreateParams as ZoneCertificateCreateParams
+from .zone_certificate_list_response import ZoneCertificateListResponse as ZoneCertificateListResponse
+from .zone_certificate_create_response import ZoneCertificateCreateResponse as ZoneCertificateCreateResponse
+from .zone_certificate_delete_response import ZoneCertificateDeleteResponse as ZoneCertificateDeleteResponse
+from .hostname_certificate_get_response import HostnameCertificateGetResponse as HostnameCertificateGetResponse
+from .hostname_certificate_create_params import HostnameCertificateCreateParams as HostnameCertificateCreateParams
+from .hostname_certificate_list_response import HostnameCertificateListResponse as HostnameCertificateListResponse
 from .origin_tls_client_auth_get_response import OriginTLSClientAuthGetResponse as OriginTLSClientAuthGetResponse
+from .hostname_certificate_create_response import HostnameCertificateCreateResponse as HostnameCertificateCreateResponse
+from .hostname_certificate_delete_response import HostnameCertificateDeleteResponse as HostnameCertificateDeleteResponse
 from .origin_tls_client_auth_create_params import OriginTLSClientAuthCreateParams as OriginTLSClientAuthCreateParams
+from .origin_tls_client_auth_list_response import OriginTLSClientAuthListResponse as OriginTLSClientAuthListResponse
 from .origin_tls_client_auth_create_response import (
     OriginTLSClientAuthCreateResponse as OriginTLSClientAuthCreateResponse,
 )
diff --git a/src/cloudflare/types/origin_tls_client_auth/authenticated_origin_pull.py b/src/cloudflare/types/origin_tls_client_auth/authenticated_origin_pull.py
index 4f996546dc2..f9f4ab50696 100644
--- a/src/cloudflare/types/origin_tls_client_auth/authenticated_origin_pull.py
+++ b/src/cloudflare/types/origin_tls_client_auth/authenticated_origin_pull.py
@@ -11,7 +11,7 @@
 
 class AuthenticatedOriginPull(BaseModel):
     cert_id: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
 
     cert_status: Optional[
         Literal[
diff --git a/src/cloudflare/types/origin_tls_client_auth/hostname_certificate_create_params.py b/src/cloudflare/types/origin_tls_client_auth/hostname_certificate_create_params.py
new file mode 100644
index 00000000000..b319cad88e3
--- /dev/null
+++ b/src/cloudflare/types/origin_tls_client_auth/hostname_certificate_create_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["HostnameCertificateCreateParams"]
+
+
+class HostnameCertificateCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    certificate: Required[str]
+    """The hostname certificate."""
+
+    private_key: Required[str]
+    """The hostname certificate's private key."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/hostname_certificate_create_response.py b/src/cloudflare/types/origin_tls_client_auth/hostname_certificate_create_response.py
new file mode 100644
index 00000000000..744c6a1aca8
--- /dev/null
+++ b/src/cloudflare/types/origin_tls_client_auth/hostname_certificate_create_response.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["HostnameCertificateCreateResponse"]
+
+
+class HostnameCertificateCreateResponse(BaseModel):
+    id: Optional[str] = None
+    """Identifier."""
+
+    certificate: Optional[str] = None
+    """The hostname certificate."""
+
+    expires_on: Optional[datetime] = None
+    """The date when the certificate expires."""
+
+    issuer: Optional[str] = None
+    """The certificate authority that issued the certificate."""
+
+    serial_number: Optional[str] = None
+    """The serial number on the uploaded certificate."""
+
+    signature: Optional[str] = None
+    """The type of hash used for the certificate."""
+
+    status: Optional[
+        Literal[
+            "initializing",
+            "pending_deployment",
+            "pending_deletion",
+            "active",
+            "deleted",
+            "deployment_timed_out",
+            "deletion_timed_out",
+        ]
+    ] = None
+    """Status of the certificate or the association."""
+
+    uploaded_on: Optional[datetime] = None
+    """The time when the certificate was uploaded."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/hostname_certificate_delete_response.py b/src/cloudflare/types/origin_tls_client_auth/hostname_certificate_delete_response.py
new file mode 100644
index 00000000000..ad892bfce77
--- /dev/null
+++ b/src/cloudflare/types/origin_tls_client_auth/hostname_certificate_delete_response.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["HostnameCertificateDeleteResponse"]
+
+
+class HostnameCertificateDeleteResponse(BaseModel):
+    id: Optional[str] = None
+    """Identifier."""
+
+    certificate: Optional[str] = None
+    """The hostname certificate."""
+
+    expires_on: Optional[datetime] = None
+    """The date when the certificate expires."""
+
+    issuer: Optional[str] = None
+    """The certificate authority that issued the certificate."""
+
+    serial_number: Optional[str] = None
+    """The serial number on the uploaded certificate."""
+
+    signature: Optional[str] = None
+    """The type of hash used for the certificate."""
+
+    status: Optional[
+        Literal[
+            "initializing",
+            "pending_deployment",
+            "pending_deletion",
+            "active",
+            "deleted",
+            "deployment_timed_out",
+            "deletion_timed_out",
+        ]
+    ] = None
+    """Status of the certificate or the association."""
+
+    uploaded_on: Optional[datetime] = None
+    """The time when the certificate was uploaded."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/hostname_certificate_get_response.py b/src/cloudflare/types/origin_tls_client_auth/hostname_certificate_get_response.py
new file mode 100644
index 00000000000..4983b50f43c
--- /dev/null
+++ b/src/cloudflare/types/origin_tls_client_auth/hostname_certificate_get_response.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["HostnameCertificateGetResponse"]
+
+
+class HostnameCertificateGetResponse(BaseModel):
+    id: Optional[str] = None
+    """Identifier."""
+
+    certificate: Optional[str] = None
+    """The hostname certificate."""
+
+    expires_on: Optional[datetime] = None
+    """The date when the certificate expires."""
+
+    issuer: Optional[str] = None
+    """The certificate authority that issued the certificate."""
+
+    serial_number: Optional[str] = None
+    """The serial number on the uploaded certificate."""
+
+    signature: Optional[str] = None
+    """The type of hash used for the certificate."""
+
+    status: Optional[
+        Literal[
+            "initializing",
+            "pending_deployment",
+            "pending_deletion",
+            "active",
+            "deleted",
+            "deployment_timed_out",
+            "deletion_timed_out",
+        ]
+    ] = None
+    """Status of the certificate or the association."""
+
+    uploaded_on: Optional[datetime] = None
+    """The time when the certificate was uploaded."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/hostname_certificate_list_response.py b/src/cloudflare/types/origin_tls_client_auth/hostname_certificate_list_response.py
new file mode 100644
index 00000000000..cda22f1e1b3
--- /dev/null
+++ b/src/cloudflare/types/origin_tls_client_auth/hostname_certificate_list_response.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from .authenticated_origin_pull import AuthenticatedOriginPull
+
+__all__ = ["HostnameCertificateListResponse"]
+
+
+class HostnameCertificateListResponse(AuthenticatedOriginPull):
+    id: Optional[str] = None
+    """Identifier."""
+
+    cert_id: Optional[str] = None  # type: ignore
+    """Identifier."""
+
+    certificate: Optional[str] = None  # type: ignore
+    """The hostname certificate."""
+
+    enabled: Optional[bool] = None  # type: ignore
+    """Indicates whether hostname-level authenticated origin pulls is enabled.
+
+    A null value voids the association.
+    """
+
+    hostname: Optional[str] = None  # type: ignore
+    """
+    The hostname on the origin for which the client certificate uploaded will be
+    used.
+    """
+
+    private_key: Optional[str] = None
+    """The hostname certificate's private key."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/hostname_update_params.py b/src/cloudflare/types/origin_tls_client_auth/hostname_update_params.py
index 9b135527465..60eaf149a18 100644
--- a/src/cloudflare/types/origin_tls_client_auth/hostname_update_params.py
+++ b/src/cloudflare/types/origin_tls_client_auth/hostname_update_params.py
@@ -10,7 +10,7 @@
 
 class HostnameUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     config: Required[Iterable[Config]]
 
diff --git a/src/cloudflare/types/origin_tls_client_auth/hostname_update_response.py b/src/cloudflare/types/origin_tls_client_auth/hostname_update_response.py
index 912106c9ff3..8d429853b42 100644
--- a/src/cloudflare/types/origin_tls_client_auth/hostname_update_response.py
+++ b/src/cloudflare/types/origin_tls_client_auth/hostname_update_response.py
@@ -1,9 +1,33 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import Optional
 
 from .authenticated_origin_pull import AuthenticatedOriginPull
 
 __all__ = ["HostnameUpdateResponse"]
 
-HostnameUpdateResponse = List[AuthenticatedOriginPull]
+
+class HostnameUpdateResponse(AuthenticatedOriginPull):
+    id: Optional[str] = None
+    """Identifier."""
+
+    cert_id: Optional[str] = None  # type: ignore
+    """Identifier."""
+
+    certificate: Optional[str] = None  # type: ignore
+    """The hostname certificate."""
+
+    enabled: Optional[bool] = None  # type: ignore
+    """Indicates whether hostname-level authenticated origin pulls is enabled.
+
+    A null value voids the association.
+    """
+
+    hostname: Optional[str] = None  # type: ignore
+    """
+    The hostname on the origin for which the client certificate uploaded will be
+    used.
+    """
+
+    private_key: Optional[str] = None
+    """The hostname certificate's private key."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/hostnames/__init__.py b/src/cloudflare/types/origin_tls_client_auth/hostnames/__init__.py
deleted file mode 100644
index bdf506a1e72..00000000000
--- a/src/cloudflare/types/origin_tls_client_auth/hostnames/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from .certificate_get_response import CertificateGetResponse as CertificateGetResponse
-from .certificate_create_params import CertificateCreateParams as CertificateCreateParams
-from .certificate_create_response import CertificateCreateResponse as CertificateCreateResponse
-from .certificate_delete_response import CertificateDeleteResponse as CertificateDeleteResponse
diff --git a/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_create_params.py b/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_create_params.py
deleted file mode 100644
index 9d4e5360e82..00000000000
--- a/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_create_params.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["CertificateCreateParams"]
-
-
-class CertificateCreateParams(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    certificate: Required[str]
-    """The hostname certificate."""
-
-    private_key: Required[str]
-    """The hostname certificate's private key."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_create_response.py b/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_create_response.py
deleted file mode 100644
index a841654f3c3..00000000000
--- a/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_create_response.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from datetime import datetime
-from typing_extensions import Literal
-
-from ...._models import BaseModel
-
-__all__ = ["CertificateCreateResponse"]
-
-
-class CertificateCreateResponse(BaseModel):
-    id: Optional[str] = None
-    """Identifier"""
-
-    certificate: Optional[str] = None
-    """The hostname certificate."""
-
-    expires_on: Optional[datetime] = None
-    """The date when the certificate expires."""
-
-    issuer: Optional[str] = None
-    """The certificate authority that issued the certificate."""
-
-    serial_number: Optional[str] = None
-    """The serial number on the uploaded certificate."""
-
-    signature: Optional[str] = None
-    """The type of hash used for the certificate."""
-
-    status: Optional[
-        Literal[
-            "initializing",
-            "pending_deployment",
-            "pending_deletion",
-            "active",
-            "deleted",
-            "deployment_timed_out",
-            "deletion_timed_out",
-        ]
-    ] = None
-    """Status of the certificate or the association."""
-
-    uploaded_on: Optional[datetime] = None
-    """The time when the certificate was uploaded."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_delete_response.py b/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_delete_response.py
deleted file mode 100644
index 2cd196b82e6..00000000000
--- a/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_delete_response.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from datetime import datetime
-from typing_extensions import Literal
-
-from ...._models import BaseModel
-
-__all__ = ["CertificateDeleteResponse"]
-
-
-class CertificateDeleteResponse(BaseModel):
-    id: Optional[str] = None
-    """Identifier"""
-
-    certificate: Optional[str] = None
-    """The hostname certificate."""
-
-    expires_on: Optional[datetime] = None
-    """The date when the certificate expires."""
-
-    issuer: Optional[str] = None
-    """The certificate authority that issued the certificate."""
-
-    serial_number: Optional[str] = None
-    """The serial number on the uploaded certificate."""
-
-    signature: Optional[str] = None
-    """The type of hash used for the certificate."""
-
-    status: Optional[
-        Literal[
-            "initializing",
-            "pending_deployment",
-            "pending_deletion",
-            "active",
-            "deleted",
-            "deployment_timed_out",
-            "deletion_timed_out",
-        ]
-    ] = None
-    """Status of the certificate or the association."""
-
-    uploaded_on: Optional[datetime] = None
-    """The time when the certificate was uploaded."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_get_response.py b/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_get_response.py
deleted file mode 100644
index 3f5da2edf1f..00000000000
--- a/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_get_response.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from datetime import datetime
-from typing_extensions import Literal
-
-from ...._models import BaseModel
-
-__all__ = ["CertificateGetResponse"]
-
-
-class CertificateGetResponse(BaseModel):
-    id: Optional[str] = None
-    """Identifier"""
-
-    certificate: Optional[str] = None
-    """The hostname certificate."""
-
-    expires_on: Optional[datetime] = None
-    """The date when the certificate expires."""
-
-    issuer: Optional[str] = None
-    """The certificate authority that issued the certificate."""
-
-    serial_number: Optional[str] = None
-    """The serial number on the uploaded certificate."""
-
-    signature: Optional[str] = None
-    """The type of hash used for the certificate."""
-
-    status: Optional[
-        Literal[
-            "initializing",
-            "pending_deployment",
-            "pending_deletion",
-            "active",
-            "deleted",
-            "deployment_timed_out",
-            "deletion_timed_out",
-        ]
-    ] = None
-    """Status of the certificate or the association."""
-
-    uploaded_on: Optional[datetime] = None
-    """The time when the certificate was uploaded."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_create_params.py b/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_create_params.py
index 721fb37c81b..09889f17e00 100644
--- a/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_create_params.py
+++ b/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_create_params.py
@@ -9,7 +9,7 @@
 
 class OriginTLSClientAuthCreateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     certificate: Required[str]
     """The zone's leaf certificate."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_create_response.py b/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_create_response.py
index 8342a97f7eb..9f9c67b7a46 100644
--- a/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_create_response.py
+++ b/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_create_response.py
@@ -1,7 +1,21 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Optional
+
+from .zone_authenticated_origin_pull import ZoneAuthenticatedOriginPull
 
 __all__ = ["OriginTLSClientAuthCreateResponse"]
 
-OriginTLSClientAuthCreateResponse = Union[Optional[str], Optional[object]]
+
+class OriginTLSClientAuthCreateResponse(ZoneAuthenticatedOriginPull):
+    id: Optional[str] = None  # type: ignore
+    """Identifier."""
+
+    certificate: Optional[str] = None  # type: ignore
+    """The zone's leaf certificate."""
+
+    enabled: Optional[bool] = None
+    """Indicates whether zone-level authenticated origin pulls is enabled."""
+
+    private_key: Optional[str] = None
+    """The zone's private key."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_delete_response.py b/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_delete_response.py
index 930afb0c8f4..9ff4c9cc6eb 100644
--- a/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_delete_response.py
+++ b/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_delete_response.py
@@ -1,7 +1,21 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Optional
+
+from .zone_authenticated_origin_pull import ZoneAuthenticatedOriginPull
 
 __all__ = ["OriginTLSClientAuthDeleteResponse"]
 
-OriginTLSClientAuthDeleteResponse = Union[Optional[str], Optional[object]]
+
+class OriginTLSClientAuthDeleteResponse(ZoneAuthenticatedOriginPull):
+    id: Optional[str] = None  # type: ignore
+    """Identifier."""
+
+    certificate: Optional[str] = None  # type: ignore
+    """The zone's leaf certificate."""
+
+    enabled: Optional[bool] = None
+    """Indicates whether zone-level authenticated origin pulls is enabled."""
+
+    private_key: Optional[str] = None
+    """The zone's private key."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_get_response.py b/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_get_response.py
index d75e3ab651d..8596fce6f95 100644
--- a/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_get_response.py
+++ b/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_get_response.py
@@ -1,7 +1,21 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Optional
+
+from .zone_authenticated_origin_pull import ZoneAuthenticatedOriginPull
 
 __all__ = ["OriginTLSClientAuthGetResponse"]
 
-OriginTLSClientAuthGetResponse = Union[Optional[str], Optional[object]]
+
+class OriginTLSClientAuthGetResponse(ZoneAuthenticatedOriginPull):
+    id: Optional[str] = None  # type: ignore
+    """Identifier."""
+
+    certificate: Optional[str] = None  # type: ignore
+    """The zone's leaf certificate."""
+
+    enabled: Optional[bool] = None
+    """Indicates whether zone-level authenticated origin pulls is enabled."""
+
+    private_key: Optional[str] = None
+    """The zone's private key."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_list_response.py b/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_list_response.py
new file mode 100644
index 00000000000..e6d134c987f
--- /dev/null
+++ b/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_list_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from .zone_authenticated_origin_pull import ZoneAuthenticatedOriginPull
+
+__all__ = ["OriginTLSClientAuthListResponse"]
+
+
+class OriginTLSClientAuthListResponse(ZoneAuthenticatedOriginPull):
+    id: Optional[str] = None  # type: ignore
+    """Identifier."""
+
+    certificate: Optional[str] = None  # type: ignore
+    """The zone's leaf certificate."""
+
+    enabled: Optional[bool] = None
+    """Indicates whether zone-level authenticated origin pulls is enabled."""
+
+    private_key: Optional[str] = None
+    """The zone's private key."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/setting_update_params.py b/src/cloudflare/types/origin_tls_client_auth/setting_update_params.py
index ba8a2b9f097..2c61f7f44ca 100644
--- a/src/cloudflare/types/origin_tls_client_auth/setting_update_params.py
+++ b/src/cloudflare/types/origin_tls_client_auth/setting_update_params.py
@@ -9,7 +9,7 @@
 
 class SettingUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     enabled: Required[bool]
     """Indicates whether zone-level authenticated origin pulls is enabled."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/zone_authenticated_origin_pull.py b/src/cloudflare/types/origin_tls_client_auth/zone_authenticated_origin_pull.py
index 77c12a377eb..0038e610a0e 100644
--- a/src/cloudflare/types/origin_tls_client_auth/zone_authenticated_origin_pull.py
+++ b/src/cloudflare/types/origin_tls_client_auth/zone_authenticated_origin_pull.py
@@ -11,7 +11,7 @@
 
 class ZoneAuthenticatedOriginPull(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
 
     certificate: Optional[str] = None
     """The zone's leaf certificate."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/zone_certificate_create_params.py b/src/cloudflare/types/origin_tls_client_auth/zone_certificate_create_params.py
new file mode 100644
index 00000000000..ac2c5b87bd6
--- /dev/null
+++ b/src/cloudflare/types/origin_tls_client_auth/zone_certificate_create_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ZoneCertificateCreateParams"]
+
+
+class ZoneCertificateCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    certificate: Required[str]
+    """The zone's leaf certificate."""
+
+    private_key: Required[str]
+    """The zone's private key."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/zone_certificate_create_response.py b/src/cloudflare/types/origin_tls_client_auth/zone_certificate_create_response.py
new file mode 100644
index 00000000000..68d66f8b8a0
--- /dev/null
+++ b/src/cloudflare/types/origin_tls_client_auth/zone_certificate_create_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from .zone_authenticated_origin_pull import ZoneAuthenticatedOriginPull
+
+__all__ = ["ZoneCertificateCreateResponse"]
+
+
+class ZoneCertificateCreateResponse(ZoneAuthenticatedOriginPull):
+    id: Optional[str] = None  # type: ignore
+    """Identifier."""
+
+    certificate: Optional[str] = None  # type: ignore
+    """The zone's leaf certificate."""
+
+    enabled: Optional[bool] = None
+    """Indicates whether zone-level authenticated origin pulls is enabled."""
+
+    private_key: Optional[str] = None
+    """The zone's private key."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/zone_certificate_delete_response.py b/src/cloudflare/types/origin_tls_client_auth/zone_certificate_delete_response.py
new file mode 100644
index 00000000000..fcb5bbb957d
--- /dev/null
+++ b/src/cloudflare/types/origin_tls_client_auth/zone_certificate_delete_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from .zone_authenticated_origin_pull import ZoneAuthenticatedOriginPull
+
+__all__ = ["ZoneCertificateDeleteResponse"]
+
+
+class ZoneCertificateDeleteResponse(ZoneAuthenticatedOriginPull):
+    id: Optional[str] = None  # type: ignore
+    """Identifier."""
+
+    certificate: Optional[str] = None  # type: ignore
+    """The zone's leaf certificate."""
+
+    enabled: Optional[bool] = None
+    """Indicates whether zone-level authenticated origin pulls is enabled."""
+
+    private_key: Optional[str] = None
+    """The zone's private key."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/zone_certificate_get_response.py b/src/cloudflare/types/origin_tls_client_auth/zone_certificate_get_response.py
new file mode 100644
index 00000000000..05e670a9a3a
--- /dev/null
+++ b/src/cloudflare/types/origin_tls_client_auth/zone_certificate_get_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from .zone_authenticated_origin_pull import ZoneAuthenticatedOriginPull
+
+__all__ = ["ZoneCertificateGetResponse"]
+
+
+class ZoneCertificateGetResponse(ZoneAuthenticatedOriginPull):
+    id: Optional[str] = None  # type: ignore
+    """Identifier."""
+
+    certificate: Optional[str] = None  # type: ignore
+    """The zone's leaf certificate."""
+
+    enabled: Optional[bool] = None
+    """Indicates whether zone-level authenticated origin pulls is enabled."""
+
+    private_key: Optional[str] = None
+    """The zone's private key."""
diff --git a/src/cloudflare/types/origin_tls_client_auth/zone_certificate_list_response.py b/src/cloudflare/types/origin_tls_client_auth/zone_certificate_list_response.py
new file mode 100644
index 00000000000..2f2353e10ae
--- /dev/null
+++ b/src/cloudflare/types/origin_tls_client_auth/zone_certificate_list_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from .zone_authenticated_origin_pull import ZoneAuthenticatedOriginPull
+
+__all__ = ["ZoneCertificateListResponse"]
+
+
+class ZoneCertificateListResponse(ZoneAuthenticatedOriginPull):
+    id: Optional[str] = None  # type: ignore
+    """Identifier."""
+
+    certificate: Optional[str] = None  # type: ignore
+    """The zone's leaf certificate."""
+
+    enabled: Optional[bool] = None
+    """Indicates whether zone-level authenticated origin pulls is enabled."""
+
+    private_key: Optional[str] = None
+    """The zone's private key."""
diff --git a/src/cloudflare/types/page_rules/__init__.py b/src/cloudflare/types/page_rules/__init__.py
new file mode 100644
index 00000000000..d85830d5966
--- /dev/null
+++ b/src/cloudflare/types/page_rules/__init__.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .target import Target as Target
+from .page_rule import PageRule as PageRule
+from .target_param import TargetParam as TargetParam
+from .page_rule_edit_params import PageRuleEditParams as PageRuleEditParams
+from .page_rule_list_params import PageRuleListParams as PageRuleListParams
+from .page_rule_create_params import PageRuleCreateParams as PageRuleCreateParams
+from .page_rule_list_response import PageRuleListResponse as PageRuleListResponse
+from .page_rule_update_params import PageRuleUpdateParams as PageRuleUpdateParams
+from .page_rule_delete_response import PageRuleDeleteResponse as PageRuleDeleteResponse
diff --git a/src/cloudflare/types/page_rules/page_rule.py b/src/cloudflare/types/page_rules/page_rule.py
new file mode 100644
index 00000000000..81adab3d741
--- /dev/null
+++ b/src/cloudflare/types/page_rules/page_rule.py
@@ -0,0 +1,424 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from .target import Target
+from ..._utils import PropertyInfo
+from ..._models import BaseModel
+from ..zones.ssl import SSL
+from ..zones.waf import WAF
+from ..zones.mirage import Mirage
+from ..zones.polish import Polish
+from ..zones.cache_level import CacheLevel
+from ..zones.browser_check import BrowserCheck
+from ..zones.rocket_loader import RocketLoader
+from ..zones.ip_geolocation import IPGeolocation
+from ..zones.security_level import SecurityLevel
+from ..zones.always_use_https import AlwaysUseHTTPS
+from ..zones.browser_cache_ttl import BrowserCacheTTL
+from ..zones.email_obfuscation import EmailObfuscation
+from ..zones.response_buffering import ResponseBuffering
+from ..zones.true_client_ip_header import TrueClientIPHeader
+from ..zones.automatic_https_rewrites import AutomaticHTTPSRewrites
+from ..zones.opportunistic_encryption import OpportunisticEncryption
+from ..zones.origin_error_page_pass_thru import OriginErrorPagePassThru
+from ..zones.sort_query_string_for_cache import SortQueryStringForCache
+
+__all__ = [
+    "PageRule",
+    "Action",
+    "ActionBypassCacheOnCookie",
+    "ActionCacheByDeviceType",
+    "ActionCacheDeceptionArmor",
+    "ActionCacheKeyFields",
+    "ActionCacheKeyFieldsValue",
+    "ActionCacheKeyFieldsValueCookie",
+    "ActionCacheKeyFieldsValueHeader",
+    "ActionCacheKeyFieldsValueHost",
+    "ActionCacheKeyFieldsValueQueryString",
+    "ActionCacheKeyFieldsValueUser",
+    "ActionCacheOnCookie",
+    "ActionCacheTTLByStatus",
+    "ActionDisableApps",
+    "ActionDisablePerformance",
+    "ActionDisableSecurity",
+    "ActionDisableZaraz",
+    "ActionEdgeCacheTTL",
+    "ActionExplicitCacheControl",
+    "ActionForwardingURL",
+    "ActionForwardingURLValue",
+    "ActionHostHeaderOverride",
+    "ActionResolveOverride",
+    "ActionRespectStrongEtag",
+]
+
+
+class ActionBypassCacheOnCookie(BaseModel):
+    id: Optional[Literal["bypass_cache_on_cookie"]] = None
+    """
+    Bypass cache and fetch resources from the origin server if a regular expression
+    matches against a cookie name present in the request.
+    """
+
+    value: Optional[str] = None
+    """The regular expression to use for matching cookie names in the request.
+
+    Refer to
+    [Bypass Cache on Cookie setting](https://developers.cloudflare.com/rules/page-rules/reference/additional-reference/#bypass-cache-on-cookie-setting)
+    to learn about limited regular expression support.
+    """
+
+
+class ActionCacheByDeviceType(BaseModel):
+    id: Optional[Literal["cache_by_device_type"]] = None
+    """Separate cached content based on the visitor's device type."""
+
+    value: Optional[Literal["on", "off"]] = None
+    """The status of Cache By Device Type."""
+
+
+class ActionCacheDeceptionArmor(BaseModel):
+    id: Optional[Literal["cache_deception_armor"]] = None
+    """
+    Protect from web cache deception attacks while still allowing static assets to
+    be cached. This setting verifies that the URL's extension matches the returned
+    `Content-Type`.
+    """
+
+    value: Optional[Literal["on", "off"]] = None
+    """The status of Cache Deception Armor."""
+
+
+class ActionCacheKeyFieldsValueCookie(BaseModel):
+    """Controls which cookies appear in the Cache Key."""
+
+    check_presence: Optional[List[str]] = None
+    """
+    A list of cookies to check for the presence of, without including their actual
+    values.
+    """
+
+    include: Optional[List[str]] = None
+    """A list of cookies to include."""
+
+
+class ActionCacheKeyFieldsValueHeader(BaseModel):
+    """Controls which headers go into the Cache Key.
+
+    Exactly one of
+    `include` or `exclude` is expected.
+    """
+
+    check_presence: Optional[List[str]] = None
+    """
+    A list of headers to check for the presence of, without including their actual
+    values.
+    """
+
+    exclude: Optional[List[str]] = None
+    """A list of headers to ignore."""
+
+    include: Optional[List[str]] = None
+    """A list of headers to include."""
+
+
+class ActionCacheKeyFieldsValueHost(BaseModel):
+    """Determines which host header to include in the Cache Key."""
+
+    resolved: Optional[bool] = None
+    """Whether to include the Host header in the HTTP request sent to the origin."""
+
+
+class ActionCacheKeyFieldsValueQueryString(BaseModel):
+    """Controls which URL query string parameters go into the Cache
+    Key.
+
+    Exactly one of `include` or `exclude` is expected.
+    """
+
+    exclude: Union[Literal["*"], List[str], None] = None
+    """Ignore all query string parameters."""
+
+    include: Union[Literal["*"], List[str], None] = None
+    """Include all query string parameters."""
+
+
+class ActionCacheKeyFieldsValueUser(BaseModel):
+    """
+    Feature fields to add features about the end-user (client) into
+    the Cache Key.
+    """
+
+    device_type: Optional[bool] = None
+    """
+    Classifies a request as `mobile`, `desktop`, or `tablet` based on the User
+    Agent.
+    """
+
+    geo: Optional[bool] = None
+    """Includes the client's country, derived from the IP address."""
+
+    lang: Optional[bool] = None
+    """
+    Includes the first language code contained in the `Accept-Language` header sent
+    by the client.
+    """
+
+
+class ActionCacheKeyFieldsValue(BaseModel):
+    cookie: Optional[ActionCacheKeyFieldsValueCookie] = None
+    """Controls which cookies appear in the Cache Key."""
+
+    header: Optional[ActionCacheKeyFieldsValueHeader] = None
+    """Controls which headers go into the Cache Key.
+
+    Exactly one of `include` or `exclude` is expected.
+    """
+
+    host: Optional[ActionCacheKeyFieldsValueHost] = None
+    """Determines which host header to include in the Cache Key."""
+
+    query_string: Optional[ActionCacheKeyFieldsValueQueryString] = None
+    """Controls which URL query string parameters go into the Cache Key.
+
+    Exactly one of `include` or `exclude` is expected.
+    """
+
+    user: Optional[ActionCacheKeyFieldsValueUser] = None
+    """Feature fields to add features about the end-user (client) into the Cache Key."""
+
+
+class ActionCacheKeyFields(BaseModel):
+    id: Optional[Literal["cache_key_fields"]] = None
+    """
+    Control specifically what variables to include when deciding which resources to
+    cache. This allows customers to determine what to cache based on something other
+    than just the URL.
+    """
+
+    value: Optional[ActionCacheKeyFieldsValue] = None
+
+
+class ActionCacheOnCookie(BaseModel):
+    id: Optional[Literal["cache_on_cookie"]] = None
+    """
+    Apply the Cache Everything option (Cache Level setting) based on a regular
+    expression match against a cookie name.
+    """
+
+    value: Optional[str] = None
+    """The regular expression to use for matching cookie names in the request."""
+
+
+class ActionCacheTTLByStatus(BaseModel):
+    id: Optional[Literal["cache_ttl_by_status"]] = None
+    """
+    Enterprise customers can set cache time-to-live (TTL) based on the response
+    status from the origin web server. Cache TTL refers to the duration of a
+    resource in the Cloudflare network before being marked as stale or discarded
+    from cache. Status codes are returned by a resource's origin. Setting cache TTL
+    based on response status overrides the default cache behavior (standard caching)
+    for static files and overrides cache instructions sent by the origin web server.
+    To cache non-static assets, set a Cache Level of Cache Everything using a Page
+    Rule. Setting no-store Cache-Control or a low TTL (using `max-age`/`s-maxage`)
+    increases requests to origin web servers and decreases performance.
+    """
+
+    value: Optional[Dict[str, Union[Literal["no-cache", "no-store"], int]]] = None
+    """
+    A JSON object containing status codes and their corresponding TTLs. Each
+    key-value pair in the cache TTL by status cache rule has the following syntax
+
+    - `status_code`: An integer value such as 200 or 500. status_code matches the
+      exact status code from the origin web server. Valid status codes are between
+      100-999.
+    - `status_code_range`: Integer values for from and to. status_code_range matches
+      any status code from the origin web server within the specified range.
+    - `value`: An integer value that defines the duration an asset is valid in
+      seconds or one of the following strings: no-store (equivalent to -1), no-cache
+      (equivalent to 0).
+    """
+
+
+class ActionDisableApps(BaseModel):
+    id: Optional[Literal["disable_apps"]] = None
+    """
+    Turn off all active
+    [Cloudflare Apps](https://developers.cloudflare.com/support/more-dashboard-apps/cloudflare-apps/)
+    (deprecated).
+    """
+
+
+class ActionDisablePerformance(BaseModel):
+    id: Optional[Literal["disable_performance"]] = None
+    """
+    Turn off
+    [Rocket Loader](https://developers.cloudflare.com/speed/optimization/content/rocket-loader/),
+    and [Polish](https://developers.cloudflare.com/images/polish/).
+    """
+
+
+class ActionDisableSecurity(BaseModel):
+    id: Optional[Literal["disable_security"]] = None
+    """
+    Turn off
+    [Email Obfuscation](https://developers.cloudflare.com/waf/tools/scrape-shield/email-address-obfuscation/),
+    [Rate Limiting (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-rate-limiting/),
+    [Scrape Shield](https://developers.cloudflare.com/waf/tools/scrape-shield/),
+    [URL (Zone) Lockdown](https://developers.cloudflare.com/waf/tools/zone-lockdown/),
+    and
+    [WAF managed rules (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-waf-managed-rules/).
+    """
+
+
+class ActionDisableZaraz(BaseModel):
+    id: Optional[Literal["disable_zaraz"]] = None
+    """Turn off [Zaraz](https://developers.cloudflare.com/zaraz/)."""
+
+
+class ActionEdgeCacheTTL(BaseModel):
+    id: Optional[Literal["edge_cache_ttl"]] = None
+    """Specify how long to cache a resource in the Cloudflare global network.
+
+    _Edge Cache TTL_ is not visible in response headers.
+    """
+
+    value: Optional[int] = None
+
+
+class ActionExplicitCacheControl(BaseModel):
+    id: Optional[Literal["explicit_cache_control"]] = None
+    """
+    Origin Cache Control is enabled by default for Free, Pro, and Business domains
+    and disabled by default for Enterprise domains.
+    """
+
+    value: Optional[Literal["on", "off"]] = None
+    """The status of Origin Cache Control."""
+
+
+class ActionForwardingURLValue(BaseModel):
+    status_code: Optional[Literal[301, 302]] = None
+    """The status code to use for the URL redirect.
+
+    301 is a permanent redirect. 302 is a temporary redirect.
+    """
+
+    url: Optional[str] = None
+    """
+    The URL to redirect the request to. Notes: ${num} refers to the position of '\\**'
+    in the constraint value.
+    """
+
+
+class ActionForwardingURL(BaseModel):
+    id: Optional[Literal["forwarding_url"]] = None
+    """Redirects one URL to another using an `HTTP 301/302` redirect.
+
+    Refer to
+    [Wildcard matching and referencing](https://developers.cloudflare.com/rules/page-rules/reference/wildcard-matching/).
+    """
+
+    value: Optional[ActionForwardingURLValue] = None
+
+
+class ActionHostHeaderOverride(BaseModel):
+    id: Optional[Literal["host_header_override"]] = None
+    """Apply a specific host header."""
+
+    value: Optional[str] = None
+    """The hostname to use in the `Host` header"""
+
+
+class ActionResolveOverride(BaseModel):
+    id: Optional[Literal["resolve_override"]] = None
+    """Change the origin address to the value specified in this setting."""
+
+    value: Optional[str] = None
+    """The origin address you want to override with."""
+
+
+class ActionRespectStrongEtag(BaseModel):
+    id: Optional[Literal["respect_strong_etag"]] = None
+    """
+    Turn on or off byte-for-byte equivalency checks between the Cloudflare cache and
+    the origin server.
+    """
+
+    value: Optional[Literal["on", "off"]] = None
+    """The status of Respect Strong ETags"""
+
+
+Action: TypeAlias = Annotated[
+    Union[
+        AlwaysUseHTTPS,
+        AutomaticHTTPSRewrites,
+        BrowserCacheTTL,
+        BrowserCheck,
+        ActionBypassCacheOnCookie,
+        ActionCacheByDeviceType,
+        ActionCacheDeceptionArmor,
+        ActionCacheKeyFields,
+        CacheLevel,
+        ActionCacheOnCookie,
+        ActionCacheTTLByStatus,
+        ActionDisableApps,
+        ActionDisablePerformance,
+        ActionDisableSecurity,
+        ActionDisableZaraz,
+        ActionEdgeCacheTTL,
+        EmailObfuscation,
+        ActionExplicitCacheControl,
+        ActionForwardingURL,
+        ActionHostHeaderOverride,
+        IPGeolocation,
+        Mirage,
+        OpportunisticEncryption,
+        OriginErrorPagePassThru,
+        Polish,
+        ActionResolveOverride,
+        ActionRespectStrongEtag,
+        ResponseBuffering,
+        RocketLoader,
+        SecurityLevel,
+        SortQueryStringForCache,
+        SSL,
+        TrueClientIPHeader,
+        WAF,
+    ],
+    PropertyInfo(discriminator="id"),
+]
+
+
+class PageRule(BaseModel):
+    id: str
+    """Identifier."""
+
+    actions: List[Action]
+    """The set of actions to perform if the targets of this rule match the request.
+
+    Actions can redirect to another URL or override settings, but not both.
+    """
+
+    created_on: datetime
+    """The timestamp of when the Page Rule was created."""
+
+    modified_on: datetime
+    """The timestamp of when the Page Rule was last modified."""
+
+    priority: int
+    """
+    The priority of the rule, used to define which Page Rule is processed over
+    another. A higher number indicates a higher priority. For example, if you have a
+    catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
+    take precedence (rule B: `/images/special/*`), specify a higher priority for
+    rule B so it overrides rule A.
+    """
+
+    status: Literal["active", "disabled"]
+    """The status of the Page Rule."""
+
+    targets: List[Target]
+    """The rule targets to evaluate on each request."""
diff --git a/src/cloudflare/types/page_rules/page_rule_create_params.py b/src/cloudflare/types/page_rules/page_rule_create_params.py
new file mode 100644
index 00000000000..2450668fc39
--- /dev/null
+++ b/src/cloudflare/types/page_rules/page_rule_create_params.py
@@ -0,0 +1,415 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Union, Iterable
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+from .target_param import TargetParam
+from ..zones.ssl_param import SSLParam
+from ..zones.waf_param import WAFParam
+from ..zones.mirage_param import MirageParam
+from ..zones.polish_param import PolishParam
+from ..zones.cache_level_param import CacheLevelParam
+from ..zones.browser_check_param import BrowserCheckParam
+from ..zones.rocket_loader_param import RocketLoaderParam
+from ..zones.ip_geolocation_param import IPGeolocationParam
+from ..zones.security_level_param import SecurityLevelParam
+from ..zones.always_use_https_param import AlwaysUseHTTPSParam
+from ..zones.browser_cache_ttl_param import BrowserCacheTTLParam
+from ..zones.email_obfuscation_param import EmailObfuscationParam
+from ..zones.response_buffering_param import ResponseBufferingParam
+from ..zones.true_client_ip_header_param import TrueClientIPHeaderParam
+from ..zones.automatic_https_rewrites_param import AutomaticHTTPSRewritesParam
+from ..zones.opportunistic_encryption_param import OpportunisticEncryptionParam
+from ..zones.origin_error_page_pass_thru_param import OriginErrorPagePassThruParam
+from ..zones.sort_query_string_for_cache_param import SortQueryStringForCacheParam
+
+__all__ = [
+    "PageRuleCreateParams",
+    "Action",
+    "ActionBypassCacheOnCookie",
+    "ActionCacheByDeviceType",
+    "ActionCacheDeceptionArmor",
+    "ActionCacheKeyFields",
+    "ActionCacheKeyFieldsValue",
+    "ActionCacheKeyFieldsValueCookie",
+    "ActionCacheKeyFieldsValueHeader",
+    "ActionCacheKeyFieldsValueHost",
+    "ActionCacheKeyFieldsValueQueryString",
+    "ActionCacheKeyFieldsValueUser",
+    "ActionCacheOnCookie",
+    "ActionCacheTTLByStatus",
+    "ActionDisableApps",
+    "ActionDisablePerformance",
+    "ActionDisableSecurity",
+    "ActionDisableZaraz",
+    "ActionEdgeCacheTTL",
+    "ActionExplicitCacheControl",
+    "ActionForwardingURL",
+    "ActionForwardingURLValue",
+    "ActionHostHeaderOverride",
+    "ActionResolveOverride",
+    "ActionRespectStrongEtag",
+]
+
+
+class PageRuleCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    actions: Required[Iterable[Action]]
+    """The set of actions to perform if the targets of this rule match the request.
+
+    Actions can redirect to another URL or override settings, but not both.
+    """
+
+    targets: Required[Iterable[TargetParam]]
+    """The rule targets to evaluate on each request."""
+
+    priority: int
+    """
+    The priority of the rule, used to define which Page Rule is processed over
+    another. A higher number indicates a higher priority. For example, if you have a
+    catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
+    take precedence (rule B: `/images/special/*`), specify a higher priority for
+    rule B so it overrides rule A.
+    """
+
+    status: Literal["active", "disabled"]
+    """The status of the Page Rule."""
+
+
+class ActionBypassCacheOnCookie(TypedDict, total=False):
+    id: Literal["bypass_cache_on_cookie"]
+    """
+    Bypass cache and fetch resources from the origin server if a regular expression
+    matches against a cookie name present in the request.
+    """
+
+    value: str
+    """The regular expression to use for matching cookie names in the request.
+
+    Refer to
+    [Bypass Cache on Cookie setting](https://developers.cloudflare.com/rules/page-rules/reference/additional-reference/#bypass-cache-on-cookie-setting)
+    to learn about limited regular expression support.
+    """
+
+
+class ActionCacheByDeviceType(TypedDict, total=False):
+    id: Literal["cache_by_device_type"]
+    """Separate cached content based on the visitor's device type."""
+
+    value: Literal["on", "off"]
+    """The status of Cache By Device Type."""
+
+
+class ActionCacheDeceptionArmor(TypedDict, total=False):
+    id: Literal["cache_deception_armor"]
+    """
+    Protect from web cache deception attacks while still allowing static assets to
+    be cached. This setting verifies that the URL's extension matches the returned
+    `Content-Type`.
+    """
+
+    value: Literal["on", "off"]
+    """The status of Cache Deception Armor."""
+
+
+class ActionCacheKeyFieldsValueCookie(TypedDict, total=False):
+    """Controls which cookies appear in the Cache Key."""
+
+    check_presence: SequenceNotStr[str]
+    """
+    A list of cookies to check for the presence of, without including their actual
+    values.
+    """
+
+    include: SequenceNotStr[str]
+    """A list of cookies to include."""
+
+
+class ActionCacheKeyFieldsValueHeader(TypedDict, total=False):
+    """Controls which headers go into the Cache Key.
+
+    Exactly one of
+    `include` or `exclude` is expected.
+    """
+
+    check_presence: SequenceNotStr[str]
+    """
+    A list of headers to check for the presence of, without including their actual
+    values.
+    """
+
+    exclude: SequenceNotStr[str]
+    """A list of headers to ignore."""
+
+    include: SequenceNotStr[str]
+    """A list of headers to include."""
+
+
+class ActionCacheKeyFieldsValueHost(TypedDict, total=False):
+    """Determines which host header to include in the Cache Key."""
+
+    resolved: bool
+    """Whether to include the Host header in the HTTP request sent to the origin."""
+
+
+class ActionCacheKeyFieldsValueQueryString(TypedDict, total=False):
+    """Controls which URL query string parameters go into the Cache
+    Key.
+
+    Exactly one of `include` or `exclude` is expected.
+    """
+
+    exclude: Union[Literal["*"], SequenceNotStr[str]]
+    """Ignore all query string parameters."""
+
+    include: Union[Literal["*"], SequenceNotStr[str]]
+    """Include all query string parameters."""
+
+
+class ActionCacheKeyFieldsValueUser(TypedDict, total=False):
+    """
+    Feature fields to add features about the end-user (client) into
+    the Cache Key.
+    """
+
+    device_type: bool
+    """
+    Classifies a request as `mobile`, `desktop`, or `tablet` based on the User
+    Agent.
+    """
+
+    geo: bool
+    """Includes the client's country, derived from the IP address."""
+
+    lang: bool
+    """
+    Includes the first language code contained in the `Accept-Language` header sent
+    by the client.
+    """
+
+
+class ActionCacheKeyFieldsValue(TypedDict, total=False):
+    cookie: ActionCacheKeyFieldsValueCookie
+    """Controls which cookies appear in the Cache Key."""
+
+    header: ActionCacheKeyFieldsValueHeader
+    """Controls which headers go into the Cache Key.
+
+    Exactly one of `include` or `exclude` is expected.
+    """
+
+    host: ActionCacheKeyFieldsValueHost
+    """Determines which host header to include in the Cache Key."""
+
+    query_string: ActionCacheKeyFieldsValueQueryString
+    """Controls which URL query string parameters go into the Cache Key.
+
+    Exactly one of `include` or `exclude` is expected.
+    """
+
+    user: ActionCacheKeyFieldsValueUser
+    """Feature fields to add features about the end-user (client) into the Cache Key."""
+
+
+class ActionCacheKeyFields(TypedDict, total=False):
+    id: Literal["cache_key_fields"]
+    """
+    Control specifically what variables to include when deciding which resources to
+    cache. This allows customers to determine what to cache based on something other
+    than just the URL.
+    """
+
+    value: ActionCacheKeyFieldsValue
+
+
+class ActionCacheOnCookie(TypedDict, total=False):
+    id: Literal["cache_on_cookie"]
+    """
+    Apply the Cache Everything option (Cache Level setting) based on a regular
+    expression match against a cookie name.
+    """
+
+    value: str
+    """The regular expression to use for matching cookie names in the request."""
+
+
+class ActionCacheTTLByStatus(TypedDict, total=False):
+    id: Literal["cache_ttl_by_status"]
+    """
+    Enterprise customers can set cache time-to-live (TTL) based on the response
+    status from the origin web server. Cache TTL refers to the duration of a
+    resource in the Cloudflare network before being marked as stale or discarded
+    from cache. Status codes are returned by a resource's origin. Setting cache TTL
+    based on response status overrides the default cache behavior (standard caching)
+    for static files and overrides cache instructions sent by the origin web server.
+    To cache non-static assets, set a Cache Level of Cache Everything using a Page
+    Rule. Setting no-store Cache-Control or a low TTL (using `max-age`/`s-maxage`)
+    increases requests to origin web servers and decreases performance.
+    """
+
+    value: Dict[str, Union[Literal["no-cache", "no-store"], int]]
+    """
+    A JSON object containing status codes and their corresponding TTLs. Each
+    key-value pair in the cache TTL by status cache rule has the following syntax
+
+    - `status_code`: An integer value such as 200 or 500. status_code matches the
+      exact status code from the origin web server. Valid status codes are between
+      100-999.
+    - `status_code_range`: Integer values for from and to. status_code_range matches
+      any status code from the origin web server within the specified range.
+    - `value`: An integer value that defines the duration an asset is valid in
+      seconds or one of the following strings: no-store (equivalent to -1), no-cache
+      (equivalent to 0).
+    """
+
+
+class ActionDisableApps(TypedDict, total=False):
+    id: Literal["disable_apps"]
+    """
+    Turn off all active
+    [Cloudflare Apps](https://developers.cloudflare.com/support/more-dashboard-apps/cloudflare-apps/)
+    (deprecated).
+    """
+
+
+class ActionDisablePerformance(TypedDict, total=False):
+    id: Literal["disable_performance"]
+    """
+    Turn off
+    [Rocket Loader](https://developers.cloudflare.com/speed/optimization/content/rocket-loader/),
+    and [Polish](https://developers.cloudflare.com/images/polish/).
+    """
+
+
+class ActionDisableSecurity(TypedDict, total=False):
+    id: Literal["disable_security"]
+    """
+    Turn off
+    [Email Obfuscation](https://developers.cloudflare.com/waf/tools/scrape-shield/email-address-obfuscation/),
+    [Rate Limiting (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-rate-limiting/),
+    [Scrape Shield](https://developers.cloudflare.com/waf/tools/scrape-shield/),
+    [URL (Zone) Lockdown](https://developers.cloudflare.com/waf/tools/zone-lockdown/),
+    and
+    [WAF managed rules (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-waf-managed-rules/).
+    """
+
+
+class ActionDisableZaraz(TypedDict, total=False):
+    id: Literal["disable_zaraz"]
+    """Turn off [Zaraz](https://developers.cloudflare.com/zaraz/)."""
+
+
+class ActionEdgeCacheTTL(TypedDict, total=False):
+    id: Literal["edge_cache_ttl"]
+    """Specify how long to cache a resource in the Cloudflare global network.
+
+    _Edge Cache TTL_ is not visible in response headers.
+    """
+
+    value: int
+
+
+class ActionExplicitCacheControl(TypedDict, total=False):
+    id: Literal["explicit_cache_control"]
+    """
+    Origin Cache Control is enabled by default for Free, Pro, and Business domains
+    and disabled by default for Enterprise domains.
+    """
+
+    value: Literal["on", "off"]
+    """The status of Origin Cache Control."""
+
+
+class ActionForwardingURLValue(TypedDict, total=False):
+    status_code: Literal[301, 302]
+    """The status code to use for the URL redirect.
+
+    301 is a permanent redirect. 302 is a temporary redirect.
+    """
+
+    url: str
+    """
+    The URL to redirect the request to. Notes: ${num} refers to the position of '\\**'
+    in the constraint value.
+    """
+
+
+class ActionForwardingURL(TypedDict, total=False):
+    id: Literal["forwarding_url"]
+    """Redirects one URL to another using an `HTTP 301/302` redirect.
+
+    Refer to
+    [Wildcard matching and referencing](https://developers.cloudflare.com/rules/page-rules/reference/wildcard-matching/).
+    """
+
+    value: ActionForwardingURLValue
+
+
+class ActionHostHeaderOverride(TypedDict, total=False):
+    id: Literal["host_header_override"]
+    """Apply a specific host header."""
+
+    value: str
+    """The hostname to use in the `Host` header"""
+
+
+class ActionResolveOverride(TypedDict, total=False):
+    id: Literal["resolve_override"]
+    """Change the origin address to the value specified in this setting."""
+
+    value: str
+    """The origin address you want to override with."""
+
+
+class ActionRespectStrongEtag(TypedDict, total=False):
+    id: Literal["respect_strong_etag"]
+    """
+    Turn on or off byte-for-byte equivalency checks between the Cloudflare cache and
+    the origin server.
+    """
+
+    value: Literal["on", "off"]
+    """The status of Respect Strong ETags"""
+
+
+Action: TypeAlias = Union[
+    AlwaysUseHTTPSParam,
+    AutomaticHTTPSRewritesParam,
+    BrowserCacheTTLParam,
+    BrowserCheckParam,
+    ActionBypassCacheOnCookie,
+    ActionCacheByDeviceType,
+    ActionCacheDeceptionArmor,
+    ActionCacheKeyFields,
+    CacheLevelParam,
+    ActionCacheOnCookie,
+    ActionCacheTTLByStatus,
+    ActionDisableApps,
+    ActionDisablePerformance,
+    ActionDisableSecurity,
+    ActionDisableZaraz,
+    ActionEdgeCacheTTL,
+    EmailObfuscationParam,
+    ActionExplicitCacheControl,
+    ActionForwardingURL,
+    ActionHostHeaderOverride,
+    IPGeolocationParam,
+    MirageParam,
+    OpportunisticEncryptionParam,
+    OriginErrorPagePassThruParam,
+    PolishParam,
+    ActionResolveOverride,
+    ActionRespectStrongEtag,
+    ResponseBufferingParam,
+    RocketLoaderParam,
+    SecurityLevelParam,
+    SortQueryStringForCacheParam,
+    SSLParam,
+    TrueClientIPHeaderParam,
+    WAFParam,
+]
diff --git a/src/cloudflare/types/page_rules/page_rule_delete_response.py b/src/cloudflare/types/page_rules/page_rule_delete_response.py
new file mode 100644
index 00000000000..05ce5560f46
--- /dev/null
+++ b/src/cloudflare/types/page_rules/page_rule_delete_response.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["PageRuleDeleteResponse"]
+
+
+class PageRuleDeleteResponse(BaseModel):
+    id: str
+    """Identifier."""
diff --git a/src/cloudflare/types/page_rules/page_rule_edit_params.py b/src/cloudflare/types/page_rules/page_rule_edit_params.py
new file mode 100644
index 00000000000..ceb4965fb66
--- /dev/null
+++ b/src/cloudflare/types/page_rules/page_rule_edit_params.py
@@ -0,0 +1,415 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Union, Iterable
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+from .target_param import TargetParam
+from ..zones.ssl_param import SSLParam
+from ..zones.waf_param import WAFParam
+from ..zones.mirage_param import MirageParam
+from ..zones.polish_param import PolishParam
+from ..zones.cache_level_param import CacheLevelParam
+from ..zones.browser_check_param import BrowserCheckParam
+from ..zones.rocket_loader_param import RocketLoaderParam
+from ..zones.ip_geolocation_param import IPGeolocationParam
+from ..zones.security_level_param import SecurityLevelParam
+from ..zones.always_use_https_param import AlwaysUseHTTPSParam
+from ..zones.browser_cache_ttl_param import BrowserCacheTTLParam
+from ..zones.email_obfuscation_param import EmailObfuscationParam
+from ..zones.response_buffering_param import ResponseBufferingParam
+from ..zones.true_client_ip_header_param import TrueClientIPHeaderParam
+from ..zones.automatic_https_rewrites_param import AutomaticHTTPSRewritesParam
+from ..zones.opportunistic_encryption_param import OpportunisticEncryptionParam
+from ..zones.origin_error_page_pass_thru_param import OriginErrorPagePassThruParam
+from ..zones.sort_query_string_for_cache_param import SortQueryStringForCacheParam
+
+__all__ = [
+    "PageRuleEditParams",
+    "Action",
+    "ActionBypassCacheOnCookie",
+    "ActionCacheByDeviceType",
+    "ActionCacheDeceptionArmor",
+    "ActionCacheKeyFields",
+    "ActionCacheKeyFieldsValue",
+    "ActionCacheKeyFieldsValueCookie",
+    "ActionCacheKeyFieldsValueHeader",
+    "ActionCacheKeyFieldsValueHost",
+    "ActionCacheKeyFieldsValueQueryString",
+    "ActionCacheKeyFieldsValueUser",
+    "ActionCacheOnCookie",
+    "ActionCacheTTLByStatus",
+    "ActionDisableApps",
+    "ActionDisablePerformance",
+    "ActionDisableSecurity",
+    "ActionDisableZaraz",
+    "ActionEdgeCacheTTL",
+    "ActionExplicitCacheControl",
+    "ActionForwardingURL",
+    "ActionForwardingURLValue",
+    "ActionHostHeaderOverride",
+    "ActionResolveOverride",
+    "ActionRespectStrongEtag",
+]
+
+
+class PageRuleEditParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    actions: Iterable[Action]
+    """The set of actions to perform if the targets of this rule match the request.
+
+    Actions can redirect to another URL or override settings, but not both.
+    """
+
+    priority: int
+    """
+    The priority of the rule, used to define which Page Rule is processed over
+    another. A higher number indicates a higher priority. For example, if you have a
+    catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
+    take precedence (rule B: `/images/special/*`), specify a higher priority for
+    rule B so it overrides rule A.
+    """
+
+    status: Literal["active", "disabled"]
+    """The status of the Page Rule."""
+
+    targets: Iterable[TargetParam]
+    """The rule targets to evaluate on each request."""
+
+
+class ActionBypassCacheOnCookie(TypedDict, total=False):
+    id: Literal["bypass_cache_on_cookie"]
+    """
+    Bypass cache and fetch resources from the origin server if a regular expression
+    matches against a cookie name present in the request.
+    """
+
+    value: str
+    """The regular expression to use for matching cookie names in the request.
+
+    Refer to
+    [Bypass Cache on Cookie setting](https://developers.cloudflare.com/rules/page-rules/reference/additional-reference/#bypass-cache-on-cookie-setting)
+    to learn about limited regular expression support.
+    """
+
+
+class ActionCacheByDeviceType(TypedDict, total=False):
+    id: Literal["cache_by_device_type"]
+    """Separate cached content based on the visitor's device type."""
+
+    value: Literal["on", "off"]
+    """The status of Cache By Device Type."""
+
+
+class ActionCacheDeceptionArmor(TypedDict, total=False):
+    id: Literal["cache_deception_armor"]
+    """
+    Protect from web cache deception attacks while still allowing static assets to
+    be cached. This setting verifies that the URL's extension matches the returned
+    `Content-Type`.
+    """
+
+    value: Literal["on", "off"]
+    """The status of Cache Deception Armor."""
+
+
+class ActionCacheKeyFieldsValueCookie(TypedDict, total=False):
+    """Controls which cookies appear in the Cache Key."""
+
+    check_presence: SequenceNotStr[str]
+    """
+    A list of cookies to check for the presence of, without including their actual
+    values.
+    """
+
+    include: SequenceNotStr[str]
+    """A list of cookies to include."""
+
+
+class ActionCacheKeyFieldsValueHeader(TypedDict, total=False):
+    """Controls which headers go into the Cache Key.
+
+    Exactly one of
+    `include` or `exclude` is expected.
+    """
+
+    check_presence: SequenceNotStr[str]
+    """
+    A list of headers to check for the presence of, without including their actual
+    values.
+    """
+
+    exclude: SequenceNotStr[str]
+    """A list of headers to ignore."""
+
+    include: SequenceNotStr[str]
+    """A list of headers to include."""
+
+
+class ActionCacheKeyFieldsValueHost(TypedDict, total=False):
+    """Determines which host header to include in the Cache Key."""
+
+    resolved: bool
+    """Whether to include the Host header in the HTTP request sent to the origin."""
+
+
+class ActionCacheKeyFieldsValueQueryString(TypedDict, total=False):
+    """Controls which URL query string parameters go into the Cache
+    Key.
+
+    Exactly one of `include` or `exclude` is expected.
+    """
+
+    exclude: Union[Literal["*"], SequenceNotStr[str]]
+    """Ignore all query string parameters."""
+
+    include: Union[Literal["*"], SequenceNotStr[str]]
+    """Include all query string parameters."""
+
+
+class ActionCacheKeyFieldsValueUser(TypedDict, total=False):
+    """
+    Feature fields to add features about the end-user (client) into
+    the Cache Key.
+    """
+
+    device_type: bool
+    """
+    Classifies a request as `mobile`, `desktop`, or `tablet` based on the User
+    Agent.
+    """
+
+    geo: bool
+    """Includes the client's country, derived from the IP address."""
+
+    lang: bool
+    """
+    Includes the first language code contained in the `Accept-Language` header sent
+    by the client.
+    """
+
+
+class ActionCacheKeyFieldsValue(TypedDict, total=False):
+    cookie: ActionCacheKeyFieldsValueCookie
+    """Controls which cookies appear in the Cache Key."""
+
+    header: ActionCacheKeyFieldsValueHeader
+    """Controls which headers go into the Cache Key.
+
+    Exactly one of `include` or `exclude` is expected.
+    """
+
+    host: ActionCacheKeyFieldsValueHost
+    """Determines which host header to include in the Cache Key."""
+
+    query_string: ActionCacheKeyFieldsValueQueryString
+    """Controls which URL query string parameters go into the Cache Key.
+
+    Exactly one of `include` or `exclude` is expected.
+    """
+
+    user: ActionCacheKeyFieldsValueUser
+    """Feature fields to add features about the end-user (client) into the Cache Key."""
+
+
+class ActionCacheKeyFields(TypedDict, total=False):
+    id: Literal["cache_key_fields"]
+    """
+    Control specifically what variables to include when deciding which resources to
+    cache. This allows customers to determine what to cache based on something other
+    than just the URL.
+    """
+
+    value: ActionCacheKeyFieldsValue
+
+
+class ActionCacheOnCookie(TypedDict, total=False):
+    id: Literal["cache_on_cookie"]
+    """
+    Apply the Cache Everything option (Cache Level setting) based on a regular
+    expression match against a cookie name.
+    """
+
+    value: str
+    """The regular expression to use for matching cookie names in the request."""
+
+
+class ActionCacheTTLByStatus(TypedDict, total=False):
+    id: Literal["cache_ttl_by_status"]
+    """
+    Enterprise customers can set cache time-to-live (TTL) based on the response
+    status from the origin web server. Cache TTL refers to the duration of a
+    resource in the Cloudflare network before being marked as stale or discarded
+    from cache. Status codes are returned by a resource's origin. Setting cache TTL
+    based on response status overrides the default cache behavior (standard caching)
+    for static files and overrides cache instructions sent by the origin web server.
+    To cache non-static assets, set a Cache Level of Cache Everything using a Page
+    Rule. Setting no-store Cache-Control or a low TTL (using `max-age`/`s-maxage`)
+    increases requests to origin web servers and decreases performance.
+    """
+
+    value: Dict[str, Union[Literal["no-cache", "no-store"], int]]
+    """
+    A JSON object containing status codes and their corresponding TTLs. Each
+    key-value pair in the cache TTL by status cache rule has the following syntax
+
+    - `status_code`: An integer value such as 200 or 500. status_code matches the
+      exact status code from the origin web server. Valid status codes are between
+      100-999.
+    - `status_code_range`: Integer values for from and to. status_code_range matches
+      any status code from the origin web server within the specified range.
+    - `value`: An integer value that defines the duration an asset is valid in
+      seconds or one of the following strings: no-store (equivalent to -1), no-cache
+      (equivalent to 0).
+    """
+
+
+class ActionDisableApps(TypedDict, total=False):
+    id: Literal["disable_apps"]
+    """
+    Turn off all active
+    [Cloudflare Apps](https://developers.cloudflare.com/support/more-dashboard-apps/cloudflare-apps/)
+    (deprecated).
+    """
+
+
+class ActionDisablePerformance(TypedDict, total=False):
+    id: Literal["disable_performance"]
+    """
+    Turn off
+    [Rocket Loader](https://developers.cloudflare.com/speed/optimization/content/rocket-loader/),
+    and [Polish](https://developers.cloudflare.com/images/polish/).
+    """
+
+
+class ActionDisableSecurity(TypedDict, total=False):
+    id: Literal["disable_security"]
+    """
+    Turn off
+    [Email Obfuscation](https://developers.cloudflare.com/waf/tools/scrape-shield/email-address-obfuscation/),
+    [Rate Limiting (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-rate-limiting/),
+    [Scrape Shield](https://developers.cloudflare.com/waf/tools/scrape-shield/),
+    [URL (Zone) Lockdown](https://developers.cloudflare.com/waf/tools/zone-lockdown/),
+    and
+    [WAF managed rules (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-waf-managed-rules/).
+    """
+
+
+class ActionDisableZaraz(TypedDict, total=False):
+    id: Literal["disable_zaraz"]
+    """Turn off [Zaraz](https://developers.cloudflare.com/zaraz/)."""
+
+
+class ActionEdgeCacheTTL(TypedDict, total=False):
+    id: Literal["edge_cache_ttl"]
+    """Specify how long to cache a resource in the Cloudflare global network.
+
+    _Edge Cache TTL_ is not visible in response headers.
+    """
+
+    value: int
+
+
+class ActionExplicitCacheControl(TypedDict, total=False):
+    id: Literal["explicit_cache_control"]
+    """
+    Origin Cache Control is enabled by default for Free, Pro, and Business domains
+    and disabled by default for Enterprise domains.
+    """
+
+    value: Literal["on", "off"]
+    """The status of Origin Cache Control."""
+
+
+class ActionForwardingURLValue(TypedDict, total=False):
+    status_code: Literal[301, 302]
+    """The status code to use for the URL redirect.
+
+    301 is a permanent redirect. 302 is a temporary redirect.
+    """
+
+    url: str
+    """
+    The URL to redirect the request to. Notes: ${num} refers to the position of '\\**'
+    in the constraint value.
+    """
+
+
+class ActionForwardingURL(TypedDict, total=False):
+    id: Literal["forwarding_url"]
+    """Redirects one URL to another using an `HTTP 301/302` redirect.
+
+    Refer to
+    [Wildcard matching and referencing](https://developers.cloudflare.com/rules/page-rules/reference/wildcard-matching/).
+    """
+
+    value: ActionForwardingURLValue
+
+
+class ActionHostHeaderOverride(TypedDict, total=False):
+    id: Literal["host_header_override"]
+    """Apply a specific host header."""
+
+    value: str
+    """The hostname to use in the `Host` header"""
+
+
+class ActionResolveOverride(TypedDict, total=False):
+    id: Literal["resolve_override"]
+    """Change the origin address to the value specified in this setting."""
+
+    value: str
+    """The origin address you want to override with."""
+
+
+class ActionRespectStrongEtag(TypedDict, total=False):
+    id: Literal["respect_strong_etag"]
+    """
+    Turn on or off byte-for-byte equivalency checks between the Cloudflare cache and
+    the origin server.
+    """
+
+    value: Literal["on", "off"]
+    """The status of Respect Strong ETags"""
+
+
+Action: TypeAlias = Union[
+    AlwaysUseHTTPSParam,
+    AutomaticHTTPSRewritesParam,
+    BrowserCacheTTLParam,
+    BrowserCheckParam,
+    ActionBypassCacheOnCookie,
+    ActionCacheByDeviceType,
+    ActionCacheDeceptionArmor,
+    ActionCacheKeyFields,
+    CacheLevelParam,
+    ActionCacheOnCookie,
+    ActionCacheTTLByStatus,
+    ActionDisableApps,
+    ActionDisablePerformance,
+    ActionDisableSecurity,
+    ActionDisableZaraz,
+    ActionEdgeCacheTTL,
+    EmailObfuscationParam,
+    ActionExplicitCacheControl,
+    ActionForwardingURL,
+    ActionHostHeaderOverride,
+    IPGeolocationParam,
+    MirageParam,
+    OpportunisticEncryptionParam,
+    OriginErrorPagePassThruParam,
+    PolishParam,
+    ActionResolveOverride,
+    ActionRespectStrongEtag,
+    ResponseBufferingParam,
+    RocketLoaderParam,
+    SecurityLevelParam,
+    SortQueryStringForCacheParam,
+    SSLParam,
+    TrueClientIPHeaderParam,
+    WAFParam,
+]
diff --git a/src/cloudflare/types/page_rules/page_rule_list_params.py b/src/cloudflare/types/page_rules/page_rule_list_params.py
new file mode 100644
index 00000000000..2e00e0732b7
--- /dev/null
+++ b/src/cloudflare/types/page_rules/page_rule_list_params.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["PageRuleListParams"]
+
+
+class PageRuleListParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    direction: Literal["asc", "desc"]
+    """The direction used to sort returned Page Rules."""
+
+    match: Literal["any", "all"]
+    """When set to `all`, all the search requirements must match.
+
+    When set to `any`, only one of the search requirements has to match.
+    """
+
+    order: Literal["status", "priority"]
+    """The field used to sort returned Page Rules."""
+
+    status: Literal["active", "disabled"]
+    """The status of the Page Rule."""
diff --git a/src/cloudflare/types/page_rules/page_rule_list_response.py b/src/cloudflare/types/page_rules/page_rule_list_response.py
new file mode 100644
index 00000000000..ef7956e70e5
--- /dev/null
+++ b/src/cloudflare/types/page_rules/page_rule_list_response.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from typing_extensions import TypeAlias
+
+from .page_rule import PageRule
+
+__all__ = ["PageRuleListResponse"]
+
+PageRuleListResponse: TypeAlias = List[PageRule]
diff --git a/src/cloudflare/types/page_rules/page_rule_update_params.py b/src/cloudflare/types/page_rules/page_rule_update_params.py
new file mode 100644
index 00000000000..baf13f4b982
--- /dev/null
+++ b/src/cloudflare/types/page_rules/page_rule_update_params.py
@@ -0,0 +1,415 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Union, Iterable
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+from .target_param import TargetParam
+from ..zones.ssl_param import SSLParam
+from ..zones.waf_param import WAFParam
+from ..zones.mirage_param import MirageParam
+from ..zones.polish_param import PolishParam
+from ..zones.cache_level_param import CacheLevelParam
+from ..zones.browser_check_param import BrowserCheckParam
+from ..zones.rocket_loader_param import RocketLoaderParam
+from ..zones.ip_geolocation_param import IPGeolocationParam
+from ..zones.security_level_param import SecurityLevelParam
+from ..zones.always_use_https_param import AlwaysUseHTTPSParam
+from ..zones.browser_cache_ttl_param import BrowserCacheTTLParam
+from ..zones.email_obfuscation_param import EmailObfuscationParam
+from ..zones.response_buffering_param import ResponseBufferingParam
+from ..zones.true_client_ip_header_param import TrueClientIPHeaderParam
+from ..zones.automatic_https_rewrites_param import AutomaticHTTPSRewritesParam
+from ..zones.opportunistic_encryption_param import OpportunisticEncryptionParam
+from ..zones.origin_error_page_pass_thru_param import OriginErrorPagePassThruParam
+from ..zones.sort_query_string_for_cache_param import SortQueryStringForCacheParam
+
+__all__ = [
+    "PageRuleUpdateParams",
+    "Action",
+    "ActionBypassCacheOnCookie",
+    "ActionCacheByDeviceType",
+    "ActionCacheDeceptionArmor",
+    "ActionCacheKeyFields",
+    "ActionCacheKeyFieldsValue",
+    "ActionCacheKeyFieldsValueCookie",
+    "ActionCacheKeyFieldsValueHeader",
+    "ActionCacheKeyFieldsValueHost",
+    "ActionCacheKeyFieldsValueQueryString",
+    "ActionCacheKeyFieldsValueUser",
+    "ActionCacheOnCookie",
+    "ActionCacheTTLByStatus",
+    "ActionDisableApps",
+    "ActionDisablePerformance",
+    "ActionDisableSecurity",
+    "ActionDisableZaraz",
+    "ActionEdgeCacheTTL",
+    "ActionExplicitCacheControl",
+    "ActionForwardingURL",
+    "ActionForwardingURLValue",
+    "ActionHostHeaderOverride",
+    "ActionResolveOverride",
+    "ActionRespectStrongEtag",
+]
+
+
+class PageRuleUpdateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    actions: Required[Iterable[Action]]
+    """The set of actions to perform if the targets of this rule match the request.
+
+    Actions can redirect to another URL or override settings, but not both.
+    """
+
+    targets: Required[Iterable[TargetParam]]
+    """The rule targets to evaluate on each request."""
+
+    priority: int
+    """
+    The priority of the rule, used to define which Page Rule is processed over
+    another. A higher number indicates a higher priority. For example, if you have a
+    catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
+    take precedence (rule B: `/images/special/*`), specify a higher priority for
+    rule B so it overrides rule A.
+    """
+
+    status: Literal["active", "disabled"]
+    """The status of the Page Rule."""
+
+
+class ActionBypassCacheOnCookie(TypedDict, total=False):
+    id: Literal["bypass_cache_on_cookie"]
+    """
+    Bypass cache and fetch resources from the origin server if a regular expression
+    matches against a cookie name present in the request.
+    """
+
+    value: str
+    """The regular expression to use for matching cookie names in the request.
+
+    Refer to
+    [Bypass Cache on Cookie setting](https://developers.cloudflare.com/rules/page-rules/reference/additional-reference/#bypass-cache-on-cookie-setting)
+    to learn about limited regular expression support.
+    """
+
+
+class ActionCacheByDeviceType(TypedDict, total=False):
+    id: Literal["cache_by_device_type"]
+    """Separate cached content based on the visitor's device type."""
+
+    value: Literal["on", "off"]
+    """The status of Cache By Device Type."""
+
+
+class ActionCacheDeceptionArmor(TypedDict, total=False):
+    id: Literal["cache_deception_armor"]
+    """
+    Protect from web cache deception attacks while still allowing static assets to
+    be cached. This setting verifies that the URL's extension matches the returned
+    `Content-Type`.
+    """
+
+    value: Literal["on", "off"]
+    """The status of Cache Deception Armor."""
+
+
+class ActionCacheKeyFieldsValueCookie(TypedDict, total=False):
+    """Controls which cookies appear in the Cache Key."""
+
+    check_presence: SequenceNotStr[str]
+    """
+    A list of cookies to check for the presence of, without including their actual
+    values.
+    """
+
+    include: SequenceNotStr[str]
+    """A list of cookies to include."""
+
+
+class ActionCacheKeyFieldsValueHeader(TypedDict, total=False):
+    """Controls which headers go into the Cache Key.
+
+    Exactly one of
+    `include` or `exclude` is expected.
+    """
+
+    check_presence: SequenceNotStr[str]
+    """
+    A list of headers to check for the presence of, without including their actual
+    values.
+    """
+
+    exclude: SequenceNotStr[str]
+    """A list of headers to ignore."""
+
+    include: SequenceNotStr[str]
+    """A list of headers to include."""
+
+
+class ActionCacheKeyFieldsValueHost(TypedDict, total=False):
+    """Determines which host header to include in the Cache Key."""
+
+    resolved: bool
+    """Whether to include the Host header in the HTTP request sent to the origin."""
+
+
+class ActionCacheKeyFieldsValueQueryString(TypedDict, total=False):
+    """Controls which URL query string parameters go into the Cache
+    Key.
+
+    Exactly one of `include` or `exclude` is expected.
+    """
+
+    exclude: Union[Literal["*"], SequenceNotStr[str]]
+    """Ignore all query string parameters."""
+
+    include: Union[Literal["*"], SequenceNotStr[str]]
+    """Include all query string parameters."""
+
+
+class ActionCacheKeyFieldsValueUser(TypedDict, total=False):
+    """
+    Feature fields to add features about the end-user (client) into
+    the Cache Key.
+    """
+
+    device_type: bool
+    """
+    Classifies a request as `mobile`, `desktop`, or `tablet` based on the User
+    Agent.
+    """
+
+    geo: bool
+    """Includes the client's country, derived from the IP address."""
+
+    lang: bool
+    """
+    Includes the first language code contained in the `Accept-Language` header sent
+    by the client.
+    """
+
+
+class ActionCacheKeyFieldsValue(TypedDict, total=False):
+    cookie: ActionCacheKeyFieldsValueCookie
+    """Controls which cookies appear in the Cache Key."""
+
+    header: ActionCacheKeyFieldsValueHeader
+    """Controls which headers go into the Cache Key.
+
+    Exactly one of `include` or `exclude` is expected.
+    """
+
+    host: ActionCacheKeyFieldsValueHost
+    """Determines which host header to include in the Cache Key."""
+
+    query_string: ActionCacheKeyFieldsValueQueryString
+    """Controls which URL query string parameters go into the Cache Key.
+
+    Exactly one of `include` or `exclude` is expected.
+    """
+
+    user: ActionCacheKeyFieldsValueUser
+    """Feature fields to add features about the end-user (client) into the Cache Key."""
+
+
+class ActionCacheKeyFields(TypedDict, total=False):
+    id: Literal["cache_key_fields"]
+    """
+    Control specifically what variables to include when deciding which resources to
+    cache. This allows customers to determine what to cache based on something other
+    than just the URL.
+    """
+
+    value: ActionCacheKeyFieldsValue
+
+
+class ActionCacheOnCookie(TypedDict, total=False):
+    id: Literal["cache_on_cookie"]
+    """
+    Apply the Cache Everything option (Cache Level setting) based on a regular
+    expression match against a cookie name.
+    """
+
+    value: str
+    """The regular expression to use for matching cookie names in the request."""
+
+
+class ActionCacheTTLByStatus(TypedDict, total=False):
+    id: Literal["cache_ttl_by_status"]
+    """
+    Enterprise customers can set cache time-to-live (TTL) based on the response
+    status from the origin web server. Cache TTL refers to the duration of a
+    resource in the Cloudflare network before being marked as stale or discarded
+    from cache. Status codes are returned by a resource's origin. Setting cache TTL
+    based on response status overrides the default cache behavior (standard caching)
+    for static files and overrides cache instructions sent by the origin web server.
+    To cache non-static assets, set a Cache Level of Cache Everything using a Page
+    Rule. Setting no-store Cache-Control or a low TTL (using `max-age`/`s-maxage`)
+    increases requests to origin web servers and decreases performance.
+    """
+
+    value: Dict[str, Union[Literal["no-cache", "no-store"], int]]
+    """
+    A JSON object containing status codes and their corresponding TTLs. Each
+    key-value pair in the cache TTL by status cache rule has the following syntax
+
+    - `status_code`: An integer value such as 200 or 500. status_code matches the
+      exact status code from the origin web server. Valid status codes are between
+      100-999.
+    - `status_code_range`: Integer values for from and to. status_code_range matches
+      any status code from the origin web server within the specified range.
+    - `value`: An integer value that defines the duration an asset is valid in
+      seconds or one of the following strings: no-store (equivalent to -1), no-cache
+      (equivalent to 0).
+    """
+
+
+class ActionDisableApps(TypedDict, total=False):
+    id: Literal["disable_apps"]
+    """
+    Turn off all active
+    [Cloudflare Apps](https://developers.cloudflare.com/support/more-dashboard-apps/cloudflare-apps/)
+    (deprecated).
+    """
+
+
+class ActionDisablePerformance(TypedDict, total=False):
+    id: Literal["disable_performance"]
+    """
+    Turn off
+    [Rocket Loader](https://developers.cloudflare.com/speed/optimization/content/rocket-loader/),
+    and [Polish](https://developers.cloudflare.com/images/polish/).
+    """
+
+
+class ActionDisableSecurity(TypedDict, total=False):
+    id: Literal["disable_security"]
+    """
+    Turn off
+    [Email Obfuscation](https://developers.cloudflare.com/waf/tools/scrape-shield/email-address-obfuscation/),
+    [Rate Limiting (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-rate-limiting/),
+    [Scrape Shield](https://developers.cloudflare.com/waf/tools/scrape-shield/),
+    [URL (Zone) Lockdown](https://developers.cloudflare.com/waf/tools/zone-lockdown/),
+    and
+    [WAF managed rules (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-waf-managed-rules/).
+    """
+
+
+class ActionDisableZaraz(TypedDict, total=False):
+    id: Literal["disable_zaraz"]
+    """Turn off [Zaraz](https://developers.cloudflare.com/zaraz/)."""
+
+
+class ActionEdgeCacheTTL(TypedDict, total=False):
+    id: Literal["edge_cache_ttl"]
+    """Specify how long to cache a resource in the Cloudflare global network.
+
+    _Edge Cache TTL_ is not visible in response headers.
+    """
+
+    value: int
+
+
+class ActionExplicitCacheControl(TypedDict, total=False):
+    id: Literal["explicit_cache_control"]
+    """
+    Origin Cache Control is enabled by default for Free, Pro, and Business domains
+    and disabled by default for Enterprise domains.
+    """
+
+    value: Literal["on", "off"]
+    """The status of Origin Cache Control."""
+
+
+class ActionForwardingURLValue(TypedDict, total=False):
+    status_code: Literal[301, 302]
+    """The status code to use for the URL redirect.
+
+    301 is a permanent redirect. 302 is a temporary redirect.
+    """
+
+    url: str
+    """
+    The URL to redirect the request to. Notes: ${num} refers to the position of '\\**'
+    in the constraint value.
+    """
+
+
+class ActionForwardingURL(TypedDict, total=False):
+    id: Literal["forwarding_url"]
+    """Redirects one URL to another using an `HTTP 301/302` redirect.
+
+    Refer to
+    [Wildcard matching and referencing](https://developers.cloudflare.com/rules/page-rules/reference/wildcard-matching/).
+    """
+
+    value: ActionForwardingURLValue
+
+
+class ActionHostHeaderOverride(TypedDict, total=False):
+    id: Literal["host_header_override"]
+    """Apply a specific host header."""
+
+    value: str
+    """The hostname to use in the `Host` header"""
+
+
+class ActionResolveOverride(TypedDict, total=False):
+    id: Literal["resolve_override"]
+    """Change the origin address to the value specified in this setting."""
+
+    value: str
+    """The origin address you want to override with."""
+
+
+class ActionRespectStrongEtag(TypedDict, total=False):
+    id: Literal["respect_strong_etag"]
+    """
+    Turn on or off byte-for-byte equivalency checks between the Cloudflare cache and
+    the origin server.
+    """
+
+    value: Literal["on", "off"]
+    """The status of Respect Strong ETags"""
+
+
+Action: TypeAlias = Union[
+    AlwaysUseHTTPSParam,
+    AutomaticHTTPSRewritesParam,
+    BrowserCacheTTLParam,
+    BrowserCheckParam,
+    ActionBypassCacheOnCookie,
+    ActionCacheByDeviceType,
+    ActionCacheDeceptionArmor,
+    ActionCacheKeyFields,
+    CacheLevelParam,
+    ActionCacheOnCookie,
+    ActionCacheTTLByStatus,
+    ActionDisableApps,
+    ActionDisablePerformance,
+    ActionDisableSecurity,
+    ActionDisableZaraz,
+    ActionEdgeCacheTTL,
+    EmailObfuscationParam,
+    ActionExplicitCacheControl,
+    ActionForwardingURL,
+    ActionHostHeaderOverride,
+    IPGeolocationParam,
+    MirageParam,
+    OpportunisticEncryptionParam,
+    OriginErrorPagePassThruParam,
+    PolishParam,
+    ActionResolveOverride,
+    ActionRespectStrongEtag,
+    ResponseBufferingParam,
+    RocketLoaderParam,
+    SecurityLevelParam,
+    SortQueryStringForCacheParam,
+    SSLParam,
+    TrueClientIPHeaderParam,
+    WAFParam,
+]
diff --git a/src/cloudflare/types/pagerules/target.py b/src/cloudflare/types/page_rules/target.py
similarity index 93%
rename from src/cloudflare/types/pagerules/target.py
rename to src/cloudflare/types/page_rules/target.py
index 497c176cb88..158269b2226 100644
--- a/src/cloudflare/types/pagerules/target.py
+++ b/src/cloudflare/types/page_rules/target.py
@@ -9,6 +9,8 @@
 
 
 class Constraint(BaseModel):
+    """String constraint."""
+
     operator: Literal["matches", "contains", "equals", "not_equal", "not_contain"]
     """
     The matches operator can use asterisks and pipes as wildcard and 'or' operators.
@@ -22,6 +24,8 @@ class Constraint(BaseModel):
 
 
 class Target(BaseModel):
+    """URL target."""
+
     constraint: Optional[Constraint] = None
     """String constraint."""
 
diff --git a/src/cloudflare/types/pagerules/target_param.py b/src/cloudflare/types/page_rules/target_param.py
similarity index 93%
rename from src/cloudflare/types/pagerules/target_param.py
rename to src/cloudflare/types/page_rules/target_param.py
index 9d6e179693e..58a862074c8 100644
--- a/src/cloudflare/types/pagerules/target_param.py
+++ b/src/cloudflare/types/page_rules/target_param.py
@@ -8,6 +8,8 @@
 
 
 class Constraint(TypedDict, total=False):
+    """String constraint."""
+
     operator: Required[Literal["matches", "contains", "equals", "not_equal", "not_contain"]]
     """
     The matches operator can use asterisks and pipes as wildcard and 'or' operators.
@@ -21,6 +23,8 @@ class Constraint(TypedDict, total=False):
 
 
 class TargetParam(TypedDict, total=False):
+    """URL target."""
+
     constraint: Constraint
     """String constraint."""
 
diff --git a/src/cloudflare/types/page_shield/__init__.py b/src/cloudflare/types/page_shield/__init__.py
index a115366d760..9a501fdfc85 100644
--- a/src/cloudflare/types/page_shield/__init__.py
+++ b/src/cloudflare/types/page_shield/__init__.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from .policy import Policy as Policy
 from .script import Script as Script
 from .setting import Setting as Setting
 from .connection import Connection as Connection
diff --git a/src/cloudflare/types/page_shield/connection_list_params.py b/src/cloudflare/types/page_shield/connection_list_params.py
index 3986c62ea72..7da26a46573 100644
--- a/src/cloudflare/types/page_shield/connection_list_params.py
+++ b/src/cloudflare/types/page_shield/connection_list_params.py
@@ -27,10 +27,7 @@ class ConnectionListParams(TypedDict, total=False):
     """
 
     export: Literal["csv"]
-    """Export the list of connections as a file.
-
-    Cannot be used with per_page or page options.
-    """
+    """Export the list of connections as a file, limited to 50000 entries."""
 
     hosts: str
     """
@@ -49,10 +46,9 @@ class ConnectionListParams(TypedDict, total=False):
     """The current page number of the paginated results.
 
     We additionally support a special value "all". When "all" is used, the API will
-    return all the connections with the applied filters in a single page.
-    Additionally, when using this value, the API will not return the categorisation
-    data for the URL and domain of the connections. This feature is best-effort and
-    it may only work for zones with a low number of connections
+    return all the connections with the applied filters in a single page. This
+    feature is best-effort and it may only work for zones with a low number of
+    connections
     """
 
     page_url: str
diff --git a/src/cloudflare/types/page_shield/cookie_list_params.py b/src/cloudflare/types/page_shield/cookie_list_params.py
index 3daf5bdee9c..2f1c508612b 100644
--- a/src/cloudflare/types/page_shield/cookie_list_params.py
+++ b/src/cloudflare/types/page_shield/cookie_list_params.py
@@ -18,10 +18,7 @@ class CookieListParams(TypedDict, total=False):
     """Filters the returned cookies that match the specified domain attribute"""
 
     export: Literal["csv"]
-    """Export the list of cookies as a file.
-
-    Cannot be used with per_page or page options.
-    """
+    """Export the list of cookies as a file, limited to 50000 entries."""
 
     hosts: str
     """
@@ -47,7 +44,12 @@ class CookieListParams(TypedDict, total=False):
     """The field used to sort returned cookies."""
 
     page: str
-    """The current page number of the paginated results."""
+    """The current page number of the paginated results.
+
+    We additionally support a special value "all". When "all" is used, the API will
+    return all the cookies with the applied filters in a single page. This feature
+    is best-effort and it may only work for zones with a low number of cookies
+    """
 
     page_url: str
     """
diff --git a/src/cloudflare/types/page_shield/page_shield_update_response.py b/src/cloudflare/types/page_shield/page_shield_update_response.py
index ab88144363c..9f26439ab37 100644
--- a/src/cloudflare/types/page_shield/page_shield_update_response.py
+++ b/src/cloudflare/types/page_shield/page_shield_update_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ..._models import BaseModel
 
 __all__ = ["PageShieldUpdateResponse"]
diff --git a/src/cloudflare/types/page_shield/policy.py b/src/cloudflare/types/page_shield/policy.py
deleted file mode 100644
index e2c5e6b02a5..00000000000
--- a/src/cloudflare/types/page_shield/policy.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = ["Policy"]
-
-
-class Policy(BaseModel):
-    action: Literal["allow", "log"]
-    """The action to take if the expression matches"""
-
-    description: str
-    """A description for the policy"""
-
-    enabled: bool
-    """Whether the policy is enabled"""
-
-    expression: str
-    """
-    The expression which must match for the policy to be applied, using the
-    Cloudflare Firewall rule expression syntax
-    """
-
-    value: str
-    """The policy which will be applied"""
diff --git a/src/cloudflare/types/page_shield/script.py b/src/cloudflare/types/page_shield/script.py
index 2db2c549968..d51cfd9ff13 100644
--- a/src/cloudflare/types/page_shield/script.py
+++ b/src/cloudflare/types/page_shield/script.py
@@ -24,6 +24,9 @@ class Script(BaseModel):
 
     url_contains_cdn_cgi_path: bool
 
+    cryptomining_score: Optional[int] = None
+    """The cryptomining score of the JavaScript content."""
+
     dataflow_score: Optional[int] = None
     """The dataflow score of the JavaScript content."""
 
@@ -40,10 +43,16 @@ class Script(BaseModel):
     js_integrity_score: Optional[int] = None
     """The integrity score of the JavaScript content."""
 
+    magecart_score: Optional[int] = None
+    """The magecart score of the JavaScript content."""
+
     malicious_domain_categories: Optional[List[str]] = None
 
     malicious_url_categories: Optional[List[str]] = None
 
+    malware_score: Optional[int] = None
+    """The malware score of the JavaScript content."""
+
     obfuscation_score: Optional[int] = None
     """The obfuscation score of the JavaScript content."""
 
diff --git a/src/cloudflare/types/page_shield/script_get_response.py b/src/cloudflare/types/page_shield/script_get_response.py
index 56d60bc2164..93da62f38e5 100644
--- a/src/cloudflare/types/page_shield/script_get_response.py
+++ b/src/cloudflare/types/page_shield/script_get_response.py
@@ -9,6 +9,11 @@
 
 
 class Version(BaseModel):
+    """The version of the analyzed script."""
+
+    cryptomining_score: Optional[int] = None
+    """The cryptomining score of the JavaScript content."""
+
     dataflow_score: Optional[int] = None
     """The dataflow score of the JavaScript content."""
 
@@ -21,6 +26,12 @@ class Version(BaseModel):
     js_integrity_score: Optional[int] = None
     """The integrity score of the JavaScript content."""
 
+    magecart_score: Optional[int] = None
+    """The magecart score of the JavaScript content."""
+
+    malware_score: Optional[int] = None
+    """The malware score of the JavaScript content."""
+
     obfuscation_score: Optional[int] = None
     """The obfuscation score of the JavaScript content."""
 
@@ -41,6 +52,9 @@ class ScriptGetResponse(BaseModel):
 
     url_contains_cdn_cgi_path: bool
 
+    cryptomining_score: Optional[int] = None
+    """The cryptomining score of the JavaScript content."""
+
     dataflow_score: Optional[int] = None
     """The dataflow score of the JavaScript content."""
 
@@ -57,10 +71,16 @@ class ScriptGetResponse(BaseModel):
     js_integrity_score: Optional[int] = None
     """The integrity score of the JavaScript content."""
 
+    magecart_score: Optional[int] = None
+    """The magecart score of the JavaScript content."""
+
     malicious_domain_categories: Optional[List[str]] = None
 
     malicious_url_categories: Optional[List[str]] = None
 
+    malware_score: Optional[int] = None
+    """The malware score of the JavaScript content."""
+
     obfuscation_score: Optional[int] = None
     """The obfuscation score of the JavaScript content."""
 
diff --git a/src/cloudflare/types/page_shield/script_list_params.py b/src/cloudflare/types/page_shield/script_list_params.py
index 99e6ba8ac9e..fea47abd515 100644
--- a/src/cloudflare/types/page_shield/script_list_params.py
+++ b/src/cloudflare/types/page_shield/script_list_params.py
@@ -35,10 +35,7 @@ class ScriptListParams(TypedDict, total=False):
     """
 
     export: Literal["csv"]
-    """Export the list of scripts as a file.
-
-    Cannot be used with per_page or page options.
-    """
+    """Export the list of scripts as a file, limited to 50000 entries."""
 
     hosts: str
     """
@@ -57,10 +54,8 @@ class ScriptListParams(TypedDict, total=False):
     """The current page number of the paginated results.
 
     We additionally support a special value "all". When "all" is used, the API will
-    return all the scripts with the applied filters in a single page. Additionally,
-    when using this value, the API will not return the script versions or
-    categorisation data for the URL and domain of the scripts. This feature is
-    best-effort and it may only work for zones with a low number of scripts
+    return all the scripts with the applied filters in a single page. This feature
+    is best-effort and it may only work for zones with a low number of scripts
     """
 
     page_url: str
diff --git a/src/cloudflare/types/page_shield/setting.py b/src/cloudflare/types/page_shield/setting.py
index 9686d461ff0..b328e1c3076 100644
--- a/src/cloudflare/types/page_shield/setting.py
+++ b/src/cloudflare/types/page_shield/setting.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ..._models import BaseModel
 
 __all__ = ["Setting"]
diff --git a/src/cloudflare/types/pagerules/__init__.py b/src/cloudflare/types/pagerules/__init__.py
deleted file mode 100644
index 02d46c7b4d4..00000000000
--- a/src/cloudflare/types/pagerules/__init__.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-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_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/pagerules/page_rule.py b/src/cloudflare/types/pagerules/page_rule.py
deleted file mode 100644
index d7a0d1b8117..00000000000
--- a/src/cloudflare/types/pagerules/page_rule.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-from datetime import datetime
-from typing_extensions import Literal
-
-from .route import Route
-from .target import Target
-from ..._models import BaseModel
-
-__all__ = ["PageRule"]
-
-
-class PageRule(BaseModel):
-    id: str
-    """Identifier"""
-
-    actions: List[Route]
-    """The set of actions to perform if the targets of this rule match the request.
-
-    Actions can redirect to another URL or override settings, but not both.
-    """
-
-    created_on: datetime
-    """The timestamp of when the Page Rule was created."""
-
-    modified_on: datetime
-    """The timestamp of when the Page Rule was last modified."""
-
-    priority: int
-    """
-    The priority of the rule, used to define which Page Rule is processed over
-    another. A higher number indicates a higher priority. For example, if you have a
-    catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
-    take precedence (rule B: `/images/special/*`), specify a higher priority for
-    rule B so it overrides rule A.
-    """
-
-    status: Literal["active", "disabled"]
-    """The status of the Page Rule."""
-
-    targets: List[Target]
-    """The rule targets to evaluate on each request."""
diff --git a/src/cloudflare/types/pagerules/pagerule_create_params.py b/src/cloudflare/types/pagerules/pagerule_create_params.py
deleted file mode 100644
index dfbfb883782..00000000000
--- a/src/cloudflare/types/pagerules/pagerule_create_params.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Iterable
-from typing_extensions import Literal, Required, TypedDict
-
-from .route_param import RouteParam
-from .target_param import TargetParam
-
-__all__ = ["PageruleCreateParams"]
-
-
-class PageruleCreateParams(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    actions: Required[Iterable[RouteParam]]
-    """The set of actions to perform if the targets of this rule match the request.
-
-    Actions can redirect to another URL or override settings, but not both.
-    """
-
-    targets: Required[Iterable[TargetParam]]
-    """The rule targets to evaluate on each request."""
-
-    priority: int
-    """
-    The priority of the rule, used to define which Page Rule is processed over
-    another. A higher number indicates a higher priority. For example, if you have a
-    catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
-    take precedence (rule B: `/images/special/*`), specify a higher priority for
-    rule B so it overrides rule A.
-    """
-
-    status: Literal["active", "disabled"]
-    """The status of the Page Rule."""
diff --git a/src/cloudflare/types/pagerules/pagerule_create_response.py b/src/cloudflare/types/pagerules/pagerule_create_response.py
deleted file mode 100644
index 96a4e595341..00000000000
--- a/src/cloudflare/types/pagerules/pagerule_create_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["PageruleCreateResponse"]
-
-PageruleCreateResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/pagerules/pagerule_delete_response.py b/src/cloudflare/types/pagerules/pagerule_delete_response.py
deleted file mode 100644
index d90b3c2a02b..00000000000
--- a/src/cloudflare/types/pagerules/pagerule_delete_response.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-from ..._models import BaseModel
-
-__all__ = ["PageruleDeleteResponse"]
-
-
-class PageruleDeleteResponse(BaseModel):
-    id: str
-    """Identifier"""
diff --git a/src/cloudflare/types/pagerules/pagerule_edit_params.py b/src/cloudflare/types/pagerules/pagerule_edit_params.py
deleted file mode 100644
index 5d2ed4636b2..00000000000
--- a/src/cloudflare/types/pagerules/pagerule_edit_params.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Iterable
-from typing_extensions import Literal, Required, TypedDict
-
-from .route_param import RouteParam
-from .target_param import TargetParam
-
-__all__ = ["PageruleEditParams"]
-
-
-class PageruleEditParams(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    actions: Iterable[RouteParam]
-    """The set of actions to perform if the targets of this rule match the request.
-
-    Actions can redirect to another URL or override settings, but not both.
-    """
-
-    priority: int
-    """
-    The priority of the rule, used to define which Page Rule is processed over
-    another. A higher number indicates a higher priority. For example, if you have a
-    catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
-    take precedence (rule B: `/images/special/*`), specify a higher priority for
-    rule B so it overrides rule A.
-    """
-
-    status: Literal["active", "disabled"]
-    """The status of the Page Rule."""
-
-    targets: Iterable[TargetParam]
-    """The rule targets to evaluate on each request."""
diff --git a/src/cloudflare/types/pagerules/pagerule_edit_response.py b/src/cloudflare/types/pagerules/pagerule_edit_response.py
deleted file mode 100644
index d57a5670779..00000000000
--- a/src/cloudflare/types/pagerules/pagerule_edit_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["PageruleEditResponse"]
-
-PageruleEditResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/pagerules/pagerule_get_response.py b/src/cloudflare/types/pagerules/pagerule_get_response.py
deleted file mode 100644
index 00aebec71a7..00000000000
--- a/src/cloudflare/types/pagerules/pagerule_get_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["PageruleGetResponse"]
-
-PageruleGetResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/pagerules/pagerule_list_params.py b/src/cloudflare/types/pagerules/pagerule_list_params.py
deleted file mode 100644
index f243c08faba..00000000000
--- a/src/cloudflare/types/pagerules/pagerule_list_params.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, Required, TypedDict
-
-__all__ = ["PageruleListParams"]
-
-
-class PageruleListParams(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    direction: Literal["asc", "desc"]
-    """The direction used to sort returned Page Rules."""
-
-    match: Literal["any", "all"]
-    """When set to `all`, all the search requirements must match.
-
-    When set to `any`, only one of the search requirements has to match.
-    """
-
-    order: Literal["status", "priority"]
-    """The field used to sort returned Page Rules."""
-
-    status: Literal["active", "disabled"]
-    """The status of the Page Rule."""
diff --git a/src/cloudflare/types/pagerules/pagerule_list_response.py b/src/cloudflare/types/pagerules/pagerule_list_response.py
deleted file mode 100644
index 1b111a722d6..00000000000
--- a/src/cloudflare/types/pagerules/pagerule_list_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .page_rule import PageRule
-
-__all__ = ["PageruleListResponse"]
-
-PageruleListResponse = List[PageRule]
diff --git a/src/cloudflare/types/pagerules/pagerule_update_params.py b/src/cloudflare/types/pagerules/pagerule_update_params.py
deleted file mode 100644
index 4637d036a12..00000000000
--- a/src/cloudflare/types/pagerules/pagerule_update_params.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Iterable
-from typing_extensions import Literal, Required, TypedDict
-
-from .route_param import RouteParam
-from .target_param import TargetParam
-
-__all__ = ["PageruleUpdateParams"]
-
-
-class PageruleUpdateParams(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    actions: Required[Iterable[RouteParam]]
-    """The set of actions to perform if the targets of this rule match the request.
-
-    Actions can redirect to another URL or override settings, but not both.
-    """
-
-    targets: Required[Iterable[TargetParam]]
-    """The rule targets to evaluate on each request."""
-
-    priority: int
-    """
-    The priority of the rule, used to define which Page Rule is processed over
-    another. A higher number indicates a higher priority. For example, if you have a
-    catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
-    take precedence (rule B: `/images/special/*`), specify a higher priority for
-    rule B so it overrides rule A.
-    """
-
-    status: Literal["active", "disabled"]
-    """The status of the Page Rule."""
diff --git a/src/cloudflare/types/pagerules/pagerule_update_response.py b/src/cloudflare/types/pagerules/pagerule_update_response.py
deleted file mode 100644
index 7e101d4eace..00000000000
--- a/src/cloudflare/types/pagerules/pagerule_update_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["PageruleUpdateResponse"]
-
-PageruleUpdateResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/pagerules/route.py b/src/cloudflare/types/pagerules/route.py
deleted file mode 100644
index df4910ea5d4..00000000000
--- a/src/cloudflare/types/pagerules/route.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from datetime import datetime
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = ["Route", "Value"]
-
-
-class Value(BaseModel):
-    type: Optional[Literal["temporary", "permanent"]] = None
-    """The response type for the URL redirect."""
-
-    url: Optional[str] = None
-    """
-    The URL to redirect the request to. Notes: ${num} refers to the position of '\\**'
-    in the constraint value.
-    """
-
-
-class Route(BaseModel):
-    modified_on: Optional[datetime] = None
-    """The timestamp of when the override was last modified."""
-
-    name: Optional[Literal["forward_url"]] = None
-    """The type of route."""
-
-    value: Optional[Value] = None
diff --git a/src/cloudflare/types/pagerules/route_param.py b/src/cloudflare/types/pagerules/route_param.py
deleted file mode 100644
index 3182d9be53a..00000000000
--- a/src/cloudflare/types/pagerules/route_param.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, TypedDict
-
-__all__ = ["RouteParam", "Value"]
-
-
-class Value(TypedDict, total=False):
-    type: Literal["temporary", "permanent"]
-    """The response type for the URL redirect."""
-
-    url: str
-    """
-    The URL to redirect the request to. Notes: ${num} refers to the position of '\\**'
-    in the constraint value.
-    """
-
-
-class RouteParam(TypedDict, total=False):
-    name: Literal["forward_url"]
-    """The type of route."""
-
-    value: Value
diff --git a/src/cloudflare/types/pagerules/setting_list_response.py b/src/cloudflare/types/pagerules/setting_list_response.py
deleted file mode 100644
index d186c559fe3..00000000000
--- a/src/cloudflare/types/pagerules/setting_list_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-__all__ = ["SettingListResponse"]
-
-SettingListResponse = List[object]
diff --git a/src/cloudflare/types/pages/__init__.py b/src/cloudflare/types/pages/__init__.py
index e28b1070dd5..117487b22ee 100644
--- a/src/cloudflare/types/pages/__init__.py
+++ b/src/cloudflare/types/pages/__init__.py
@@ -5,9 +5,6 @@
 from .stage import Stage as Stage
 from .project import Project as Project
 from .deployment import Deployment as Deployment
-from .stage_param import StageParam as StageParam
-from .deployment_param import DeploymentParam as DeploymentParam
 from .project_edit_params import ProjectEditParams as ProjectEditParams
+from .project_list_params import ProjectListParams as ProjectListParams
 from .project_create_params import ProjectCreateParams as ProjectCreateParams
-from .project_edit_response import ProjectEditResponse as ProjectEditResponse
-from .project_create_response import ProjectCreateResponse as ProjectCreateResponse
diff --git a/src/cloudflare/types/pages/deployment.py b/src/cloudflare/types/pages/deployment.py
index fcd5acbf94e..b5ddf2e5817 100644
--- a/src/cloudflare/types/pages/deployment.py
+++ b/src/cloudflare/types/pages/deployment.py
@@ -1,75 +1,214 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Dict, List, Union, Optional
 from datetime import datetime
+from typing_extensions import Literal, Annotated, TypeAlias
 
 from .stage import Stage
+from ..._utils import PropertyInfo
 from ..._models import BaseModel
 
-__all__ = ["Deployment", "DeploymentTrigger", "DeploymentTriggerMetadata"]
+__all__ = [
+    "Deployment",
+    "BuildConfig",
+    "DeploymentTrigger",
+    "DeploymentTriggerMetadata",
+    "EnvVars",
+    "EnvVarsPagesPlainTextEnvVar",
+    "EnvVarsPagesSecretTextEnvVar",
+    "Source",
+    "SourceConfig",
+]
+
+
+class BuildConfig(BaseModel):
+    """Configs for the project build process."""
+
+    web_analytics_tag: Optional[str] = None
+    """The classifying tag for analytics."""
+
+    web_analytics_token: Optional[str] = None
+    """The auth token for analytics."""
+
+    build_caching: Optional[bool] = None
+    """Enable build caching for the project."""
+
+    build_command: Optional[str] = None
+    """Command used to build project."""
+
+    destination_dir: Optional[str] = None
+    """Assets output directory of the build."""
+
+    root_dir: Optional[str] = None
+    """Directory to run the command."""
 
 
 class DeploymentTriggerMetadata(BaseModel):
-    branch: Optional[str] = None
+    """Additional info about the trigger."""
+
+    branch: str
     """Where the trigger happened."""
 
-    commit_hash: Optional[str] = None
+    commit_dirty: bool
+    """Whether the deployment trigger commit was dirty."""
+
+    commit_hash: str
     """Hash of the deployment trigger commit."""
 
-    commit_message: Optional[str] = None
+    commit_message: str
     """Message of the deployment trigger commit."""
 
 
 class DeploymentTrigger(BaseModel):
-    metadata: Optional[DeploymentTriggerMetadata] = None
+    """Info about what caused the deployment."""
+
+    metadata: DeploymentTriggerMetadata
     """Additional info about the trigger."""
 
-    type: Optional[str] = None
+    type: Literal["github:push", "ad_hoc", "deploy_hook"]
     """What caused the deployment."""
 
 
+class EnvVarsPagesPlainTextEnvVar(BaseModel):
+    """A plaintext environment variable."""
+
+    type: Literal["plain_text"]
+
+    value: str
+    """Environment variable value."""
+
+
+class EnvVarsPagesSecretTextEnvVar(BaseModel):
+    """An encrypted environment variable."""
+
+    type: Literal["secret_text"]
+
+    value: str
+    """Secret value."""
+
+
+EnvVars: TypeAlias = Annotated[
+    Union[Optional[EnvVarsPagesPlainTextEnvVar], Optional[EnvVarsPagesSecretTextEnvVar], None],
+    PropertyInfo(discriminator="type"),
+]
+
+
+class SourceConfig(BaseModel):
+    deployments_enabled: bool
+    """
+    Whether to enable automatic deployments when pushing to the source repository.
+    When disabled, no deployments (production or preview) will be triggered
+    automatically.
+    """
+
+    owner: str
+    """The owner of the repository."""
+
+    owner_id: str
+    """The owner ID of the repository."""
+
+    path_excludes: List[str]
+    """A list of paths that should be excluded from triggering a preview deployment.
+
+    Wildcard syntax (`*`) is supported.
+    """
+
+    path_includes: List[str]
+    """A list of paths that should be watched to trigger a preview deployment.
+
+    Wildcard syntax (`*`) is supported.
+    """
+
+    pr_comments_enabled: bool
+    """Whether to enable PR comments."""
+
+    preview_branch_excludes: List[str]
+    """A list of branches that should not trigger a preview deployment.
+
+    Wildcard syntax (`*`) is supported. Must be used with
+    `preview_deployment_setting` set to `custom`.
+    """
+
+    preview_branch_includes: List[str]
+    """A list of branches that should trigger a preview deployment.
+
+    Wildcard syntax (`*`) is supported. Must be used with
+    `preview_deployment_setting` set to `custom`.
+    """
+
+    preview_deployment_setting: Literal["all", "none", "custom"]
+    """Controls whether commits to preview branches trigger a preview deployment."""
+
+    production_branch: str
+    """The production branch of the repository."""
+
+    production_deployments_enabled: bool
+    """Whether to trigger a production deployment on commits to the production branch."""
+
+    repo_id: str
+    """The ID of the repository."""
+
+    repo_name: str
+    """The name of the repository."""
+
+
+class Source(BaseModel):
+    """Configs for the project source control."""
+
+    config: SourceConfig
+
+    type: Literal["github", "gitlab"]
+    """The source control management provider."""
+
+
 class Deployment(BaseModel):
-    id: Optional[str] = None
+    id: str
     """Id of the deployment."""
 
-    aliases: Optional[List[object]] = None
+    aliases: Optional[List[str]] = None
     """A list of alias URLs pointing to this deployment."""
 
-    build_config: Optional[object] = None
+    build_config: BuildConfig
+    """Configs for the project build process."""
 
-    created_on: Optional[datetime] = None
+    created_on: datetime
     """When the deployment was created."""
 
-    deployment_trigger: Optional[DeploymentTrigger] = None
+    deployment_trigger: DeploymentTrigger
     """Info about what caused the deployment."""
 
-    env_vars: Optional[object] = None
-    """A dict of env variables to build this deploy."""
+    env_vars: Optional[Dict[str, Optional[EnvVars]]] = None
+    """Environment variables used for builds and Pages Functions."""
 
-    environment: Optional[str] = None
+    environment: Literal["preview", "production"]
     """Type of deploy."""
 
-    is_skipped: Optional[bool] = None
+    is_skipped: bool
     """If the deployment has been skipped."""
 
-    latest_stage: Optional[object] = None
+    latest_stage: Stage
+    """The status of the deployment."""
 
-    modified_on: Optional[datetime] = None
+    modified_on: datetime
     """When the deployment was last modified."""
 
-    project_id: Optional[str] = None
+    project_id: str
     """Id of the project."""
 
-    project_name: Optional[str] = None
+    project_name: str
     """Name of the project."""
 
-    short_id: Optional[str] = None
+    short_id: str
     """Short Id (8 character) of the deployment."""
 
-    source: Optional[object] = None
+    source: Source
+    """Configs for the project source control."""
 
-    stages: Optional[List[Stage]] = None
+    stages: List[Stage]
     """List of past stages."""
 
-    url: Optional[str] = None
+    url: str
     """The live URL to view this deployment."""
+
+    uses_functions: Optional[bool] = None
+    """Whether the deployment uses functions."""
diff --git a/src/cloudflare/types/pages/deployment_param.py b/src/cloudflare/types/pages/deployment_param.py
deleted file mode 100644
index 4d265602dc2..00000000000
--- a/src/cloudflare/types/pages/deployment_param.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import TypedDict
-
-__all__ = ["DeploymentParam"]
-
-
-class DeploymentParam(TypedDict, total=False):
-    pass
diff --git a/src/cloudflare/types/pages/project.py b/src/cloudflare/types/pages/project.py
index d3e0210408f..96318b09637 100644
--- a/src/cloudflare/types/pages/project.py
+++ b/src/cloudflare/types/pages/project.py
@@ -1,532 +1,603 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Dict, List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
-
-from pydantic import Field as FieldInfo
+from typing_extensions import Literal, Annotated, TypeAlias
 
+from ..._utils import PropertyInfo
 from ..._models import BaseModel
 from .deployment import Deployment
 
 __all__ = [
     "Project",
-    "BuildConfig",
     "DeploymentConfigs",
     "DeploymentConfigsPreview",
+    "DeploymentConfigsPreviewEnvVars",
+    "DeploymentConfigsPreviewEnvVarsPagesPlainTextEnvVar",
+    "DeploymentConfigsPreviewEnvVarsPagesSecretTextEnvVar",
     "DeploymentConfigsPreviewAIBindings",
-    "DeploymentConfigsPreviewAIBindingsAIBinding",
     "DeploymentConfigsPreviewAnalyticsEngineDatasets",
-    "DeploymentConfigsPreviewAnalyticsEngineDatasetsAnalyticsEngineBinding",
     "DeploymentConfigsPreviewBrowsers",
     "DeploymentConfigsPreviewD1Databases",
-    "DeploymentConfigsPreviewD1DatabasesD1Binding",
     "DeploymentConfigsPreviewDurableObjectNamespaces",
-    "DeploymentConfigsPreviewDurableObjectNamespacesDoBinding",
-    "DeploymentConfigsPreviewEnvVars",
-    "DeploymentConfigsPreviewEnvVarsEnvironmentVariable",
     "DeploymentConfigsPreviewHyperdriveBindings",
-    "DeploymentConfigsPreviewHyperdriveBindingsHyperdrive",
     "DeploymentConfigsPreviewKVNamespaces",
-    "DeploymentConfigsPreviewKVNamespacesKVBinding",
+    "DeploymentConfigsPreviewLimits",
     "DeploymentConfigsPreviewMTLSCertificates",
-    "DeploymentConfigsPreviewMTLSCertificatesMTLS",
     "DeploymentConfigsPreviewPlacement",
     "DeploymentConfigsPreviewQueueProducers",
-    "DeploymentConfigsPreviewQueueProducersQueueProducerBinding",
     "DeploymentConfigsPreviewR2Buckets",
-    "DeploymentConfigsPreviewR2BucketsR2Binding",
     "DeploymentConfigsPreviewServices",
-    "DeploymentConfigsPreviewServicesServiceBinding",
     "DeploymentConfigsPreviewVectorizeBindings",
-    "DeploymentConfigsPreviewVectorizeBindingsVectorize",
     "DeploymentConfigsProduction",
+    "DeploymentConfigsProductionEnvVars",
+    "DeploymentConfigsProductionEnvVarsPagesPlainTextEnvVar",
+    "DeploymentConfigsProductionEnvVarsPagesSecretTextEnvVar",
     "DeploymentConfigsProductionAIBindings",
-    "DeploymentConfigsProductionAIBindingsAIBinding",
     "DeploymentConfigsProductionAnalyticsEngineDatasets",
-    "DeploymentConfigsProductionAnalyticsEngineDatasetsAnalyticsEngineBinding",
     "DeploymentConfigsProductionBrowsers",
     "DeploymentConfigsProductionD1Databases",
-    "DeploymentConfigsProductionD1DatabasesD1Binding",
     "DeploymentConfigsProductionDurableObjectNamespaces",
-    "DeploymentConfigsProductionDurableObjectNamespacesDoBinding",
-    "DeploymentConfigsProductionEnvVars",
-    "DeploymentConfigsProductionEnvVarsEnvironmentVariable",
     "DeploymentConfigsProductionHyperdriveBindings",
-    "DeploymentConfigsProductionHyperdriveBindingsHyperdrive",
     "DeploymentConfigsProductionKVNamespaces",
-    "DeploymentConfigsProductionKVNamespacesKVBinding",
+    "DeploymentConfigsProductionLimits",
     "DeploymentConfigsProductionMTLSCertificates",
-    "DeploymentConfigsProductionMTLSCertificatesMTLS",
     "DeploymentConfigsProductionPlacement",
     "DeploymentConfigsProductionQueueProducers",
-    "DeploymentConfigsProductionQueueProducersQueueProducerBinding",
     "DeploymentConfigsProductionR2Buckets",
-    "DeploymentConfigsProductionR2BucketsR2Binding",
     "DeploymentConfigsProductionServices",
-    "DeploymentConfigsProductionServicesServiceBinding",
     "DeploymentConfigsProductionVectorizeBindings",
-    "DeploymentConfigsProductionVectorizeBindingsVectorize",
+    "BuildConfig",
+    "Source",
+    "SourceConfig",
 ]
 
 
-class BuildConfig(BaseModel):
-    build_caching: Optional[bool] = None
-    """Enable build caching for the project."""
+class DeploymentConfigsPreviewEnvVarsPagesPlainTextEnvVar(BaseModel):
+    """A plaintext environment variable."""
 
-    build_command: Optional[str] = None
-    """Command used to build project."""
+    type: Literal["plain_text"]
 
-    destination_dir: Optional[str] = None
-    """Output directory of the build."""
+    value: str
+    """Environment variable value."""
 
-    root_dir: Optional[str] = None
-    """Directory to run the command."""
 
-    web_analytics_tag: Optional[str] = None
-    """The classifying tag for analytics."""
+class DeploymentConfigsPreviewEnvVarsPagesSecretTextEnvVar(BaseModel):
+    """An encrypted environment variable."""
 
-    web_analytics_token: Optional[str] = None
-    """The auth token for analytics."""
+    type: Literal["secret_text"]
 
+    value: str
+    """Secret value."""
 
-class DeploymentConfigsPreviewAIBindingsAIBinding(BaseModel):
-    project_id: Optional[object] = None
+
+DeploymentConfigsPreviewEnvVars: TypeAlias = Annotated[
+    Union[
+        Optional[DeploymentConfigsPreviewEnvVarsPagesPlainTextEnvVar],
+        Optional[DeploymentConfigsPreviewEnvVarsPagesSecretTextEnvVar],
+        None,
+    ],
+    PropertyInfo(discriminator="type"),
+]
 
 
 class DeploymentConfigsPreviewAIBindings(BaseModel):
-    ai_binding: Optional[DeploymentConfigsPreviewAIBindingsAIBinding] = FieldInfo(alias="AI_BINDING", default=None)
     """AI binding."""
 
-
-class DeploymentConfigsPreviewAnalyticsEngineDatasetsAnalyticsEngineBinding(BaseModel):
-    dataset: Optional[str] = None
-    """Name of the dataset."""
+    project_id: str
 
 
 class DeploymentConfigsPreviewAnalyticsEngineDatasets(BaseModel):
-    analytics_engine_binding: Optional[
-        DeploymentConfigsPreviewAnalyticsEngineDatasetsAnalyticsEngineBinding
-    ] = FieldInfo(alias="ANALYTICS_ENGINE_BINDING", default=None)
     """Analytics Engine binding."""
 
+    dataset: str
+    """Name of the dataset."""
+
 
 class DeploymentConfigsPreviewBrowsers(BaseModel):
-    browser: Optional[object] = FieldInfo(alias="BROWSER", default=None)
     """Browser binding."""
 
-
-class DeploymentConfigsPreviewD1DatabasesD1Binding(BaseModel):
-    id: Optional[str] = None
-    """UUID of the D1 database."""
+    pass
 
 
 class DeploymentConfigsPreviewD1Databases(BaseModel):
-    d1_binding: Optional[DeploymentConfigsPreviewD1DatabasesD1Binding] = FieldInfo(alias="D1_BINDING", default=None)
     """D1 binding."""
 
-
-class DeploymentConfigsPreviewDurableObjectNamespacesDoBinding(BaseModel):
-    namespace_id: Optional[str] = None
-    """ID of the Durabble Object namespace."""
+    id: str
+    """UUID of the D1 database."""
 
 
 class DeploymentConfigsPreviewDurableObjectNamespaces(BaseModel):
-    do_binding: Optional[DeploymentConfigsPreviewDurableObjectNamespacesDoBinding] = FieldInfo(
-        alias="DO_BINDING", default=None
-    )
-    """Durabble Object binding."""
-
-
-class DeploymentConfigsPreviewEnvVarsEnvironmentVariable(BaseModel):
-    type: Optional[Literal["plain_text", "secret_text"]] = None
-    """The type of environment variable (plain text or secret)"""
-
-    value: Optional[str] = None
-    """Environment variable value."""
+    """Durable Object binding."""
 
-
-class DeploymentConfigsPreviewEnvVars(BaseModel):
-    environment_variable: Optional[DeploymentConfigsPreviewEnvVarsEnvironmentVariable] = FieldInfo(
-        alias="ENVIRONMENT_VARIABLE", default=None
-    )
-    """Environment variable."""
-
-
-class DeploymentConfigsPreviewHyperdriveBindingsHyperdrive(BaseModel):
-    id: Optional[str] = None
+    namespace_id: str
+    """ID of the Durable Object namespace."""
 
 
 class DeploymentConfigsPreviewHyperdriveBindings(BaseModel):
-    hyperdrive: Optional[DeploymentConfigsPreviewHyperdriveBindingsHyperdrive] = FieldInfo(
-        alias="HYPERDRIVE", default=None
-    )
     """Hyperdrive binding."""
 
-
-class DeploymentConfigsPreviewKVNamespacesKVBinding(BaseModel):
-    namespace_id: Optional[str] = None
-    """ID of the KV namespace."""
+    id: str
 
 
 class DeploymentConfigsPreviewKVNamespaces(BaseModel):
-    kv_binding: Optional[DeploymentConfigsPreviewKVNamespacesKVBinding] = FieldInfo(alias="KV_BINDING", default=None)
-    """KV binding."""
+    """KV namespace binding."""
+
+    namespace_id: str
+    """ID of the KV namespace."""
+
 
+class DeploymentConfigsPreviewLimits(BaseModel):
+    """Limits for Pages Functions."""
 
-class DeploymentConfigsPreviewMTLSCertificatesMTLS(BaseModel):
-    certificate_id: Optional[str] = None
+    cpu_ms: int
+    """CPU time limit in milliseconds."""
 
 
 class DeploymentConfigsPreviewMTLSCertificates(BaseModel):
-    mtls: Optional[DeploymentConfigsPreviewMTLSCertificatesMTLS] = FieldInfo(alias="MTLS", default=None)
     """mTLS binding."""
 
+    certificate_id: str
+
 
 class DeploymentConfigsPreviewPlacement(BaseModel):
-    mode: Optional[str] = None
+    """Placement setting used for Pages Functions."""
+
+    mode: str
     """Placement mode."""
 
 
-class DeploymentConfigsPreviewQueueProducersQueueProducerBinding(BaseModel):
-    name: Optional[str] = None
+class DeploymentConfigsPreviewQueueProducers(BaseModel):
+    """Queue Producer binding."""
+
+    name: str
     """Name of the Queue."""
 
 
-class DeploymentConfigsPreviewQueueProducers(BaseModel):
-    queue_producer_binding: Optional[DeploymentConfigsPreviewQueueProducersQueueProducerBinding] = FieldInfo(
-        alias="QUEUE_PRODUCER_BINDING", default=None
-    )
-    """Queue Producer binding."""
+class DeploymentConfigsPreviewR2Buckets(BaseModel):
+    """R2 binding."""
 
+    name: str
+    """Name of the R2 bucket."""
 
-class DeploymentConfigsPreviewR2BucketsR2Binding(BaseModel):
     jurisdiction: Optional[str] = None
     """Jurisdiction of the R2 bucket."""
 
-    name: Optional[str] = None
-    """Name of the R2 bucket."""
 
+class DeploymentConfigsPreviewServices(BaseModel):
+    """Service binding."""
 
-class DeploymentConfigsPreviewR2Buckets(BaseModel):
-    r2_binding: Optional[DeploymentConfigsPreviewR2BucketsR2Binding] = FieldInfo(alias="R2_BINDING", default=None)
-    """R2 binding."""
+    environment: str
+    """The Service environment."""
 
+    service: str
+    """The Service name."""
 
-class DeploymentConfigsPreviewServicesServiceBinding(BaseModel):
     entrypoint: Optional[str] = None
     """The entrypoint to bind to."""
 
-    environment: Optional[str] = None
-    """The Service environment."""
 
-    service: Optional[str] = None
-    """The Service name."""
+class DeploymentConfigsPreviewVectorizeBindings(BaseModel):
+    """Vectorize binding."""
 
+    index_name: str
 
-class DeploymentConfigsPreviewServices(BaseModel):
-    service_binding: Optional[DeploymentConfigsPreviewServicesServiceBinding] = FieldInfo(
-        alias="SERVICE_BINDING", default=None
-    )
-    """Service binding."""
 
+class DeploymentConfigsPreview(BaseModel):
+    """Configs for preview deploys."""
 
-class DeploymentConfigsPreviewVectorizeBindingsVectorize(BaseModel):
-    index_name: Optional[str] = None
+    always_use_latest_compatibility_date: bool
+    """Whether to always use the latest compatibility date for Pages Functions."""
 
+    build_image_major_version: int
+    """The major version of the build image to use for Pages Functions."""
 
-class DeploymentConfigsPreviewVectorizeBindings(BaseModel):
-    vectorize: Optional[DeploymentConfigsPreviewVectorizeBindingsVectorize] = FieldInfo(alias="VECTORIZE", default=None)
-    """Vectorize binding."""
+    compatibility_date: str
+    """Compatibility date used for Pages Functions."""
 
+    compatibility_flags: List[str]
+    """Compatibility flags used for Pages Functions."""
 
-class DeploymentConfigsPreview(BaseModel):
-    ai_bindings: Optional[DeploymentConfigsPreviewAIBindings] = None
+    env_vars: Optional[Dict[str, Optional[DeploymentConfigsPreviewEnvVars]]] = None
+    """Environment variables used for builds and Pages Functions."""
+
+    fail_open: bool
+    """Whether to fail open when the deployment config cannot be applied."""
+
+    usage_model: Literal["standard", "bundled", "unbound"]
+    """The usage model for Pages Functions."""
+
+    ai_bindings: Optional[Dict[str, DeploymentConfigsPreviewAIBindings]] = None
     """Constellation bindings used for Pages Functions."""
 
-    analytics_engine_datasets: Optional[DeploymentConfigsPreviewAnalyticsEngineDatasets] = None
+    analytics_engine_datasets: Optional[Dict[str, DeploymentConfigsPreviewAnalyticsEngineDatasets]] = None
     """Analytics Engine bindings used for Pages Functions."""
 
-    browsers: Optional[DeploymentConfigsPreviewBrowsers] = None
+    browsers: Optional[Dict[str, Optional[DeploymentConfigsPreviewBrowsers]]] = None
     """Browser bindings used for Pages Functions."""
 
-    compatibility_date: Optional[str] = None
-    """Compatibility date used for Pages Functions."""
-
-    compatibility_flags: Optional[List[object]] = None
-    """Compatibility flags used for Pages Functions."""
-
-    d1_databases: Optional[DeploymentConfigsPreviewD1Databases] = None
+    d1_databases: Optional[Dict[str, DeploymentConfigsPreviewD1Databases]] = None
     """D1 databases used for Pages Functions."""
 
-    durable_object_namespaces: Optional[DeploymentConfigsPreviewDurableObjectNamespaces] = None
-    """Durabble Object namespaces used for Pages Functions."""
+    durable_object_namespaces: Optional[Dict[str, DeploymentConfigsPreviewDurableObjectNamespaces]] = None
+    """Durable Object namespaces used for Pages Functions."""
 
-    env_vars: Optional[DeploymentConfigsPreviewEnvVars] = None
-    """Environment variables for build configs."""
-
-    hyperdrive_bindings: Optional[DeploymentConfigsPreviewHyperdriveBindings] = None
+    hyperdrive_bindings: Optional[Dict[str, DeploymentConfigsPreviewHyperdriveBindings]] = None
     """Hyperdrive bindings used for Pages Functions."""
 
-    kv_namespaces: Optional[DeploymentConfigsPreviewKVNamespaces] = None
+    kv_namespaces: Optional[Dict[str, DeploymentConfigsPreviewKVNamespaces]] = None
     """KV namespaces used for Pages Functions."""
 
-    mtls_certificates: Optional[DeploymentConfigsPreviewMTLSCertificates] = None
+    limits: Optional[DeploymentConfigsPreviewLimits] = None
+    """Limits for Pages Functions."""
+
+    mtls_certificates: Optional[Dict[str, DeploymentConfigsPreviewMTLSCertificates]] = None
     """mTLS bindings used for Pages Functions."""
 
     placement: Optional[DeploymentConfigsPreviewPlacement] = None
     """Placement setting used for Pages Functions."""
 
-    queue_producers: Optional[DeploymentConfigsPreviewQueueProducers] = None
+    queue_producers: Optional[Dict[str, DeploymentConfigsPreviewQueueProducers]] = None
     """Queue Producer bindings used for Pages Functions."""
 
-    r2_buckets: Optional[DeploymentConfigsPreviewR2Buckets] = None
+    r2_buckets: Optional[Dict[str, DeploymentConfigsPreviewR2Buckets]] = None
     """R2 buckets used for Pages Functions."""
 
-    services: Optional[DeploymentConfigsPreviewServices] = None
+    services: Optional[Dict[str, DeploymentConfigsPreviewServices]] = None
     """Services used for Pages Functions."""
 
-    vectorize_bindings: Optional[DeploymentConfigsPreviewVectorizeBindings] = None
+    vectorize_bindings: Optional[Dict[str, DeploymentConfigsPreviewVectorizeBindings]] = None
     """Vectorize bindings used for Pages Functions."""
 
+    wrangler_config_hash: Optional[str] = None
+    """Hash of the Wrangler configuration used for the deployment."""
 
-class DeploymentConfigsProductionAIBindingsAIBinding(BaseModel):
-    project_id: Optional[object] = None
 
+class DeploymentConfigsProductionEnvVarsPagesPlainTextEnvVar(BaseModel):
+    """A plaintext environment variable."""
 
-class DeploymentConfigsProductionAIBindings(BaseModel):
-    ai_binding: Optional[DeploymentConfigsProductionAIBindingsAIBinding] = FieldInfo(alias="AI_BINDING", default=None)
-    """AI binding."""
+    type: Literal["plain_text"]
 
+    value: str
+    """Environment variable value."""
 
-class DeploymentConfigsProductionAnalyticsEngineDatasetsAnalyticsEngineBinding(BaseModel):
-    dataset: Optional[str] = None
-    """Name of the dataset."""
 
+class DeploymentConfigsProductionEnvVarsPagesSecretTextEnvVar(BaseModel):
+    """An encrypted environment variable."""
 
-class DeploymentConfigsProductionAnalyticsEngineDatasets(BaseModel):
-    analytics_engine_binding: Optional[
-        DeploymentConfigsProductionAnalyticsEngineDatasetsAnalyticsEngineBinding
-    ] = FieldInfo(alias="ANALYTICS_ENGINE_BINDING", default=None)
-    """Analytics Engine binding."""
+    type: Literal["secret_text"]
 
+    value: str
+    """Secret value."""
 
-class DeploymentConfigsProductionBrowsers(BaseModel):
-    browser: Optional[object] = FieldInfo(alias="BROWSER", default=None)
-    """Browser binding."""
 
+DeploymentConfigsProductionEnvVars: TypeAlias = Annotated[
+    Union[
+        Optional[DeploymentConfigsProductionEnvVarsPagesPlainTextEnvVar],
+        Optional[DeploymentConfigsProductionEnvVarsPagesSecretTextEnvVar],
+        None,
+    ],
+    PropertyInfo(discriminator="type"),
+]
 
-class DeploymentConfigsProductionD1DatabasesD1Binding(BaseModel):
-    id: Optional[str] = None
-    """UUID of the D1 database."""
 
+class DeploymentConfigsProductionAIBindings(BaseModel):
+    """AI binding."""
+
+    project_id: str
 
-class DeploymentConfigsProductionD1Databases(BaseModel):
-    d1_binding: Optional[DeploymentConfigsProductionD1DatabasesD1Binding] = FieldInfo(alias="D1_BINDING", default=None)
-    """D1 binding."""
 
+class DeploymentConfigsProductionAnalyticsEngineDatasets(BaseModel):
+    """Analytics Engine binding."""
 
-class DeploymentConfigsProductionDurableObjectNamespacesDoBinding(BaseModel):
-    namespace_id: Optional[str] = None
-    """ID of the Durabble Object namespace."""
+    dataset: str
+    """Name of the dataset."""
 
 
-class DeploymentConfigsProductionDurableObjectNamespaces(BaseModel):
-    do_binding: Optional[DeploymentConfigsProductionDurableObjectNamespacesDoBinding] = FieldInfo(
-        alias="DO_BINDING", default=None
-    )
-    """Durabble Object binding."""
+class DeploymentConfigsProductionBrowsers(BaseModel):
+    """Browser binding."""
 
+    pass
 
-class DeploymentConfigsProductionEnvVarsEnvironmentVariable(BaseModel):
-    type: Optional[Literal["plain_text", "secret_text"]] = None
-    """The type of environment variable (plain text or secret)"""
 
-    value: Optional[str] = None
-    """Environment variable value."""
+class DeploymentConfigsProductionD1Databases(BaseModel):
+    """D1 binding."""
 
+    id: str
+    """UUID of the D1 database."""
 
-class DeploymentConfigsProductionEnvVars(BaseModel):
-    environment_variable: Optional[DeploymentConfigsProductionEnvVarsEnvironmentVariable] = FieldInfo(
-        alias="ENVIRONMENT_VARIABLE", default=None
-    )
-    """Environment variable."""
 
+class DeploymentConfigsProductionDurableObjectNamespaces(BaseModel):
+    """Durable Object binding."""
 
-class DeploymentConfigsProductionHyperdriveBindingsHyperdrive(BaseModel):
-    id: Optional[str] = None
+    namespace_id: str
+    """ID of the Durable Object namespace."""
 
 
 class DeploymentConfigsProductionHyperdriveBindings(BaseModel):
-    hyperdrive: Optional[DeploymentConfigsProductionHyperdriveBindingsHyperdrive] = FieldInfo(
-        alias="HYPERDRIVE", default=None
-    )
     """Hyperdrive binding."""
 
-
-class DeploymentConfigsProductionKVNamespacesKVBinding(BaseModel):
-    namespace_id: Optional[str] = None
-    """ID of the KV namespace."""
+    id: str
 
 
 class DeploymentConfigsProductionKVNamespaces(BaseModel):
-    kv_binding: Optional[DeploymentConfigsProductionKVNamespacesKVBinding] = FieldInfo(alias="KV_BINDING", default=None)
-    """KV binding."""
+    """KV namespace binding."""
+
+    namespace_id: str
+    """ID of the KV namespace."""
+
 
+class DeploymentConfigsProductionLimits(BaseModel):
+    """Limits for Pages Functions."""
 
-class DeploymentConfigsProductionMTLSCertificatesMTLS(BaseModel):
-    certificate_id: Optional[str] = None
+    cpu_ms: int
+    """CPU time limit in milliseconds."""
 
 
 class DeploymentConfigsProductionMTLSCertificates(BaseModel):
-    mtls: Optional[DeploymentConfigsProductionMTLSCertificatesMTLS] = FieldInfo(alias="MTLS", default=None)
     """mTLS binding."""
 
+    certificate_id: str
+
 
 class DeploymentConfigsProductionPlacement(BaseModel):
-    mode: Optional[str] = None
+    """Placement setting used for Pages Functions."""
+
+    mode: str
     """Placement mode."""
 
 
-class DeploymentConfigsProductionQueueProducersQueueProducerBinding(BaseModel):
-    name: Optional[str] = None
+class DeploymentConfigsProductionQueueProducers(BaseModel):
+    """Queue Producer binding."""
+
+    name: str
     """Name of the Queue."""
 
 
-class DeploymentConfigsProductionQueueProducers(BaseModel):
-    queue_producer_binding: Optional[DeploymentConfigsProductionQueueProducersQueueProducerBinding] = FieldInfo(
-        alias="QUEUE_PRODUCER_BINDING", default=None
-    )
-    """Queue Producer binding."""
+class DeploymentConfigsProductionR2Buckets(BaseModel):
+    """R2 binding."""
 
+    name: str
+    """Name of the R2 bucket."""
 
-class DeploymentConfigsProductionR2BucketsR2Binding(BaseModel):
     jurisdiction: Optional[str] = None
     """Jurisdiction of the R2 bucket."""
 
-    name: Optional[str] = None
-    """Name of the R2 bucket."""
 
+class DeploymentConfigsProductionServices(BaseModel):
+    """Service binding."""
 
-class DeploymentConfigsProductionR2Buckets(BaseModel):
-    r2_binding: Optional[DeploymentConfigsProductionR2BucketsR2Binding] = FieldInfo(alias="R2_BINDING", default=None)
-    """R2 binding."""
+    environment: str
+    """The Service environment."""
 
+    service: str
+    """The Service name."""
 
-class DeploymentConfigsProductionServicesServiceBinding(BaseModel):
     entrypoint: Optional[str] = None
     """The entrypoint to bind to."""
 
-    environment: Optional[str] = None
-    """The Service environment."""
 
-    service: Optional[str] = None
-    """The Service name."""
+class DeploymentConfigsProductionVectorizeBindings(BaseModel):
+    """Vectorize binding."""
 
+    index_name: str
 
-class DeploymentConfigsProductionServices(BaseModel):
-    service_binding: Optional[DeploymentConfigsProductionServicesServiceBinding] = FieldInfo(
-        alias="SERVICE_BINDING", default=None
-    )
-    """Service binding."""
 
+class DeploymentConfigsProduction(BaseModel):
+    """Configs for production deploys."""
 
-class DeploymentConfigsProductionVectorizeBindingsVectorize(BaseModel):
-    index_name: Optional[str] = None
+    always_use_latest_compatibility_date: bool
+    """Whether to always use the latest compatibility date for Pages Functions."""
 
+    build_image_major_version: int
+    """The major version of the build image to use for Pages Functions."""
 
-class DeploymentConfigsProductionVectorizeBindings(BaseModel):
-    vectorize: Optional[DeploymentConfigsProductionVectorizeBindingsVectorize] = FieldInfo(
-        alias="VECTORIZE", default=None
-    )
-    """Vectorize binding."""
+    compatibility_date: str
+    """Compatibility date used for Pages Functions."""
+
+    compatibility_flags: List[str]
+    """Compatibility flags used for Pages Functions."""
 
+    env_vars: Optional[Dict[str, Optional[DeploymentConfigsProductionEnvVars]]] = None
+    """Environment variables used for builds and Pages Functions."""
 
-class DeploymentConfigsProduction(BaseModel):
-    ai_bindings: Optional[DeploymentConfigsProductionAIBindings] = None
+    fail_open: bool
+    """Whether to fail open when the deployment config cannot be applied."""
+
+    usage_model: Literal["standard", "bundled", "unbound"]
+    """The usage model for Pages Functions."""
+
+    ai_bindings: Optional[Dict[str, DeploymentConfigsProductionAIBindings]] = None
     """Constellation bindings used for Pages Functions."""
 
-    analytics_engine_datasets: Optional[DeploymentConfigsProductionAnalyticsEngineDatasets] = None
+    analytics_engine_datasets: Optional[Dict[str, DeploymentConfigsProductionAnalyticsEngineDatasets]] = None
     """Analytics Engine bindings used for Pages Functions."""
 
-    browsers: Optional[DeploymentConfigsProductionBrowsers] = None
+    browsers: Optional[Dict[str, Optional[DeploymentConfigsProductionBrowsers]]] = None
     """Browser bindings used for Pages Functions."""
 
-    compatibility_date: Optional[str] = None
-    """Compatibility date used for Pages Functions."""
-
-    compatibility_flags: Optional[List[object]] = None
-    """Compatibility flags used for Pages Functions."""
-
-    d1_databases: Optional[DeploymentConfigsProductionD1Databases] = None
+    d1_databases: Optional[Dict[str, DeploymentConfigsProductionD1Databases]] = None
     """D1 databases used for Pages Functions."""
 
-    durable_object_namespaces: Optional[DeploymentConfigsProductionDurableObjectNamespaces] = None
-    """Durabble Object namespaces used for Pages Functions."""
-
-    env_vars: Optional[DeploymentConfigsProductionEnvVars] = None
-    """Environment variables for build configs."""
+    durable_object_namespaces: Optional[Dict[str, DeploymentConfigsProductionDurableObjectNamespaces]] = None
+    """Durable Object namespaces used for Pages Functions."""
 
-    hyperdrive_bindings: Optional[DeploymentConfigsProductionHyperdriveBindings] = None
+    hyperdrive_bindings: Optional[Dict[str, DeploymentConfigsProductionHyperdriveBindings]] = None
     """Hyperdrive bindings used for Pages Functions."""
 
-    kv_namespaces: Optional[DeploymentConfigsProductionKVNamespaces] = None
+    kv_namespaces: Optional[Dict[str, DeploymentConfigsProductionKVNamespaces]] = None
     """KV namespaces used for Pages Functions."""
 
-    mtls_certificates: Optional[DeploymentConfigsProductionMTLSCertificates] = None
+    limits: Optional[DeploymentConfigsProductionLimits] = None
+    """Limits for Pages Functions."""
+
+    mtls_certificates: Optional[Dict[str, DeploymentConfigsProductionMTLSCertificates]] = None
     """mTLS bindings used for Pages Functions."""
 
     placement: Optional[DeploymentConfigsProductionPlacement] = None
     """Placement setting used for Pages Functions."""
 
-    queue_producers: Optional[DeploymentConfigsProductionQueueProducers] = None
+    queue_producers: Optional[Dict[str, DeploymentConfigsProductionQueueProducers]] = None
     """Queue Producer bindings used for Pages Functions."""
 
-    r2_buckets: Optional[DeploymentConfigsProductionR2Buckets] = None
+    r2_buckets: Optional[Dict[str, DeploymentConfigsProductionR2Buckets]] = None
     """R2 buckets used for Pages Functions."""
 
-    services: Optional[DeploymentConfigsProductionServices] = None
+    services: Optional[Dict[str, DeploymentConfigsProductionServices]] = None
     """Services used for Pages Functions."""
 
-    vectorize_bindings: Optional[DeploymentConfigsProductionVectorizeBindings] = None
+    vectorize_bindings: Optional[Dict[str, DeploymentConfigsProductionVectorizeBindings]] = None
     """Vectorize bindings used for Pages Functions."""
 
+    wrangler_config_hash: Optional[str] = None
+    """Hash of the Wrangler configuration used for the deployment."""
+
 
 class DeploymentConfigs(BaseModel):
-    preview: Optional[DeploymentConfigsPreview] = None
+    """Configs for deployments in a project."""
+
+    preview: DeploymentConfigsPreview
     """Configs for preview deploys."""
 
-    production: Optional[DeploymentConfigsProduction] = None
+    production: DeploymentConfigsProduction
     """Configs for production deploys."""
 
 
-class Project(BaseModel):
-    id: Optional[str] = None
-    """Id of the project."""
-
-    build_config: Optional[BuildConfig] = None
+class BuildConfig(BaseModel):
     """Configs for the project build process."""
 
+    web_analytics_tag: Optional[str] = None
+    """The classifying tag for analytics."""
+
+    web_analytics_token: Optional[str] = None
+    """The auth token for analytics."""
+
+    build_caching: Optional[bool] = None
+    """Enable build caching for the project."""
+
+    build_command: Optional[str] = None
+    """Command used to build project."""
+
+    destination_dir: Optional[str] = None
+    """Assets output directory of the build."""
+
+    root_dir: Optional[str] = None
+    """Directory to run the command."""
+
+
+class SourceConfig(BaseModel):
+    deployments_enabled: bool
+    """
+    Whether to enable automatic deployments when pushing to the source repository.
+    When disabled, no deployments (production or preview) will be triggered
+    automatically.
+    """
+
+    owner: str
+    """The owner of the repository."""
+
+    owner_id: str
+    """The owner ID of the repository."""
+
+    path_excludes: List[str]
+    """A list of paths that should be excluded from triggering a preview deployment.
+
+    Wildcard syntax (`*`) is supported.
+    """
+
+    path_includes: List[str]
+    """A list of paths that should be watched to trigger a preview deployment.
+
+    Wildcard syntax (`*`) is supported.
+    """
+
+    pr_comments_enabled: bool
+    """Whether to enable PR comments."""
+
+    preview_branch_excludes: List[str]
+    """A list of branches that should not trigger a preview deployment.
+
+    Wildcard syntax (`*`) is supported. Must be used with
+    `preview_deployment_setting` set to `custom`.
+    """
+
+    preview_branch_includes: List[str]
+    """A list of branches that should trigger a preview deployment.
+
+    Wildcard syntax (`*`) is supported. Must be used with
+    `preview_deployment_setting` set to `custom`.
+    """
+
+    preview_deployment_setting: Literal["all", "none", "custom"]
+    """Controls whether commits to preview branches trigger a preview deployment."""
+
+    production_branch: str
+    """The production branch of the repository."""
+
+    production_deployments_enabled: bool
+    """Whether to trigger a production deployment on commits to the production branch."""
+
+    repo_id: str
+    """The ID of the repository."""
+
+    repo_name: str
+    """The name of the repository."""
+
+
+class Source(BaseModel):
+    """Configs for the project source control."""
+
+    config: SourceConfig
+
+    type: Literal["github", "gitlab"]
+    """The source control management provider."""
+
+
+class Project(BaseModel):
+    id: str
+    """ID of the project."""
+
     canonical_deployment: Optional[Deployment] = None
+    """Most recent production deployment of the project."""
 
-    created_on: Optional[datetime] = None
+    created_on: datetime
     """When the project was created."""
 
-    deployment_configs: Optional[DeploymentConfigs] = None
+    deployment_configs: DeploymentConfigs
     """Configs for deployments in a project."""
 
-    domains: Optional[List[object]] = None
-    """A list of associated custom domains for the project."""
+    framework: str
+    """Framework the project is using."""
+
+    framework_version: str
+    """Version of the framework the project is using."""
 
     latest_deployment: Optional[Deployment] = None
+    """Most recent deployment of the project."""
 
-    name: Optional[str] = None
+    name: str
     """Name of the project."""
 
-    production_branch: Optional[str] = None
+    preview_script_name: str
+    """Name of the preview script."""
+
+    production_branch: str
     """Production branch of the project. Used to identify production deployments."""
 
-    source: Optional[object] = None
+    production_script_name: str
+    """Name of the production script."""
+
+    uses_functions: Optional[bool] = None
+    """Whether the project uses functions."""
+
+    build_config: Optional[BuildConfig] = None
+    """Configs for the project build process."""
+
+    domains: Optional[List[str]] = None
+    """A list of associated custom domains for the project."""
+
+    source: Optional[Source] = None
+    """Configs for the project source control."""
 
     subdomain: Optional[str] = None
     """The Cloudflare subdomain associated with the project."""
diff --git a/src/cloudflare/types/pages/project_create_params.py b/src/cloudflare/types/pages/project_create_params.py
index 8c524d05ead..321845dc2af 100644
--- a/src/cloudflare/types/pages/project_create_params.py
+++ b/src/cloudflare/types/pages/project_create_params.py
@@ -2,11 +2,10 @@
 
 from __future__ import annotations
 
-from typing import Iterable, Optional
-from typing_extensions import Literal, Required, Annotated, TypedDict
+from typing import Dict, Union, Optional
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
-from ..._utils import PropertyInfo
-from .deployment_param import DeploymentParam
+from ..._types import SequenceNotStr
 
 __all__ = [
     "ProjectCreateParams",
@@ -14,93 +13,78 @@
     "DeploymentConfigs",
     "DeploymentConfigsPreview",
     "DeploymentConfigsPreviewAIBindings",
-    "DeploymentConfigsPreviewAIBindingsAIBinding",
     "DeploymentConfigsPreviewAnalyticsEngineDatasets",
-    "DeploymentConfigsPreviewAnalyticsEngineDatasetsAnalyticsEngineBinding",
     "DeploymentConfigsPreviewBrowsers",
     "DeploymentConfigsPreviewD1Databases",
-    "DeploymentConfigsPreviewD1DatabasesD1Binding",
     "DeploymentConfigsPreviewDurableObjectNamespaces",
-    "DeploymentConfigsPreviewDurableObjectNamespacesDoBinding",
     "DeploymentConfigsPreviewEnvVars",
-    "DeploymentConfigsPreviewEnvVarsEnvironmentVariable",
+    "DeploymentConfigsPreviewEnvVarsPagesPlainTextEnvVar",
+    "DeploymentConfigsPreviewEnvVarsPagesSecretTextEnvVar",
     "DeploymentConfigsPreviewHyperdriveBindings",
-    "DeploymentConfigsPreviewHyperdriveBindingsHyperdrive",
     "DeploymentConfigsPreviewKVNamespaces",
-    "DeploymentConfigsPreviewKVNamespacesKVBinding",
+    "DeploymentConfigsPreviewLimits",
     "DeploymentConfigsPreviewMTLSCertificates",
-    "DeploymentConfigsPreviewMTLSCertificatesMTLS",
     "DeploymentConfigsPreviewPlacement",
     "DeploymentConfigsPreviewQueueProducers",
-    "DeploymentConfigsPreviewQueueProducersQueueProducerBinding",
     "DeploymentConfigsPreviewR2Buckets",
-    "DeploymentConfigsPreviewR2BucketsR2Binding",
     "DeploymentConfigsPreviewServices",
-    "DeploymentConfigsPreviewServicesServiceBinding",
     "DeploymentConfigsPreviewVectorizeBindings",
-    "DeploymentConfigsPreviewVectorizeBindingsVectorize",
     "DeploymentConfigsProduction",
     "DeploymentConfigsProductionAIBindings",
-    "DeploymentConfigsProductionAIBindingsAIBinding",
     "DeploymentConfigsProductionAnalyticsEngineDatasets",
-    "DeploymentConfigsProductionAnalyticsEngineDatasetsAnalyticsEngineBinding",
     "DeploymentConfigsProductionBrowsers",
     "DeploymentConfigsProductionD1Databases",
-    "DeploymentConfigsProductionD1DatabasesD1Binding",
     "DeploymentConfigsProductionDurableObjectNamespaces",
-    "DeploymentConfigsProductionDurableObjectNamespacesDoBinding",
     "DeploymentConfigsProductionEnvVars",
-    "DeploymentConfigsProductionEnvVarsEnvironmentVariable",
+    "DeploymentConfigsProductionEnvVarsPagesPlainTextEnvVar",
+    "DeploymentConfigsProductionEnvVarsPagesSecretTextEnvVar",
     "DeploymentConfigsProductionHyperdriveBindings",
-    "DeploymentConfigsProductionHyperdriveBindingsHyperdrive",
     "DeploymentConfigsProductionKVNamespaces",
-    "DeploymentConfigsProductionKVNamespacesKVBinding",
+    "DeploymentConfigsProductionLimits",
     "DeploymentConfigsProductionMTLSCertificates",
-    "DeploymentConfigsProductionMTLSCertificatesMTLS",
     "DeploymentConfigsProductionPlacement",
     "DeploymentConfigsProductionQueueProducers",
-    "DeploymentConfigsProductionQueueProducersQueueProducerBinding",
     "DeploymentConfigsProductionR2Buckets",
-    "DeploymentConfigsProductionR2BucketsR2Binding",
     "DeploymentConfigsProductionServices",
-    "DeploymentConfigsProductionServicesServiceBinding",
     "DeploymentConfigsProductionVectorizeBindings",
-    "DeploymentConfigsProductionVectorizeBindingsVectorize",
+    "Source",
+    "SourceConfig",
 ]
 
 
 class ProjectCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
+
+    name: Required[str]
+    """Name of the project."""
+
+    production_branch: Required[str]
+    """Production branch of the project. Used to identify production deployments."""
 
     build_config: BuildConfig
     """Configs for the project build process."""
 
-    canonical_deployment: DeploymentParam
-
     deployment_configs: DeploymentConfigs
     """Configs for deployments in a project."""
 
-    latest_deployment: DeploymentParam
-
-    name: str
-    """Name of the project."""
-
-    production_branch: str
-    """Production branch of the project. Used to identify production deployments."""
+    source: Source
+    """Configs for the project source control."""
 
 
 class BuildConfig(TypedDict, total=False):
-    build_caching: Optional[bool]
+    """Configs for the project build process."""
+
+    build_caching: bool
     """Enable build caching for the project."""
 
-    build_command: Optional[str]
+    build_command: str
     """Command used to build project."""
 
-    destination_dir: Optional[str]
+    destination_dir: str
     """Output directory of the build."""
 
-    root_dir: Optional[str]
+    root_dir: str
     """Directory to run the command."""
 
     web_analytics_tag: Optional[str]
@@ -110,399 +94,471 @@ class BuildConfig(TypedDict, total=False):
     """The auth token for analytics."""
 
 
-class DeploymentConfigsPreviewAIBindingsAIBinding(TypedDict, total=False):
-    project_id: object
-
-
 class DeploymentConfigsPreviewAIBindings(TypedDict, total=False):
-    ai_binding: Annotated[DeploymentConfigsPreviewAIBindingsAIBinding, PropertyInfo(alias="AI_BINDING")]
     """AI binding."""
 
-
-class DeploymentConfigsPreviewAnalyticsEngineDatasetsAnalyticsEngineBinding(TypedDict, total=False):
-    dataset: str
-    """Name of the dataset."""
+    project_id: Required[str]
 
 
 class DeploymentConfigsPreviewAnalyticsEngineDatasets(TypedDict, total=False):
-    analytics_engine_binding: Annotated[
-        DeploymentConfigsPreviewAnalyticsEngineDatasetsAnalyticsEngineBinding,
-        PropertyInfo(alias="ANALYTICS_ENGINE_BINDING"),
-    ]
     """Analytics Engine binding."""
 
+    dataset: Required[str]
+    """Name of the dataset."""
+
 
 class DeploymentConfigsPreviewBrowsers(TypedDict, total=False):
-    browser: Annotated[object, PropertyInfo(alias="BROWSER")]
     """Browser binding."""
 
-
-class DeploymentConfigsPreviewD1DatabasesD1Binding(TypedDict, total=False):
-    id: str
-    """UUID of the D1 database."""
+    pass
 
 
 class DeploymentConfigsPreviewD1Databases(TypedDict, total=False):
-    d1_binding: Annotated[DeploymentConfigsPreviewD1DatabasesD1Binding, PropertyInfo(alias="D1_BINDING")]
     """D1 binding."""
 
-
-class DeploymentConfigsPreviewDurableObjectNamespacesDoBinding(TypedDict, total=False):
-    namespace_id: str
-    """ID of the Durabble Object namespace."""
+    id: Required[str]
+    """UUID of the D1 database."""
 
 
 class DeploymentConfigsPreviewDurableObjectNamespaces(TypedDict, total=False):
-    do_binding: Annotated[DeploymentConfigsPreviewDurableObjectNamespacesDoBinding, PropertyInfo(alias="DO_BINDING")]
-    """Durabble Object binding."""
+    """Durable Object binding."""
+
+    namespace_id: Required[str]
+    """ID of the Durable Object namespace."""
+
 
+class DeploymentConfigsPreviewEnvVarsPagesPlainTextEnvVar(TypedDict, total=False):
+    """A plaintext environment variable."""
 
-class DeploymentConfigsPreviewEnvVarsEnvironmentVariable(TypedDict, total=False):
-    type: Literal["plain_text", "secret_text"]
-    """The type of environment variable (plain text or secret)"""
+    type: Required[Literal["plain_text"]]
 
-    value: str
+    value: Required[str]
     """Environment variable value."""
 
 
-class DeploymentConfigsPreviewEnvVars(TypedDict, total=False):
-    environment_variable: Annotated[
-        DeploymentConfigsPreviewEnvVarsEnvironmentVariable, PropertyInfo(alias="ENVIRONMENT_VARIABLE")
-    ]
-    """Environment variable."""
+class DeploymentConfigsPreviewEnvVarsPagesSecretTextEnvVar(TypedDict, total=False):
+    """An encrypted environment variable."""
 
+    type: Required[Literal["secret_text"]]
 
-class DeploymentConfigsPreviewHyperdriveBindingsHyperdrive(TypedDict, total=False):
-    id: str
+    value: Required[str]
+    """Secret value."""
+
+
+DeploymentConfigsPreviewEnvVars: TypeAlias = Union[
+    Optional[DeploymentConfigsPreviewEnvVarsPagesPlainTextEnvVar],
+    Optional[DeploymentConfigsPreviewEnvVarsPagesSecretTextEnvVar],
+]
 
 
 class DeploymentConfigsPreviewHyperdriveBindings(TypedDict, total=False):
-    hyperdrive: Annotated[DeploymentConfigsPreviewHyperdriveBindingsHyperdrive, PropertyInfo(alias="HYPERDRIVE")]
     """Hyperdrive binding."""
 
-
-class DeploymentConfigsPreviewKVNamespacesKVBinding(TypedDict, total=False):
-    namespace_id: str
-    """ID of the KV namespace."""
+    id: Required[str]
 
 
 class DeploymentConfigsPreviewKVNamespaces(TypedDict, total=False):
-    kv_binding: Annotated[DeploymentConfigsPreviewKVNamespacesKVBinding, PropertyInfo(alias="KV_BINDING")]
-    """KV binding."""
+    """KV namespace binding."""
+
+    namespace_id: Required[str]
+    """ID of the KV namespace."""
 
 
-class DeploymentConfigsPreviewMTLSCertificatesMTLS(TypedDict, total=False):
-    certificate_id: str
+class DeploymentConfigsPreviewLimits(TypedDict, total=False):
+    """Limits for Pages Functions."""
+
+    cpu_ms: Required[int]
+    """CPU time limit in milliseconds."""
 
 
 class DeploymentConfigsPreviewMTLSCertificates(TypedDict, total=False):
-    mtls: Annotated[DeploymentConfigsPreviewMTLSCertificatesMTLS, PropertyInfo(alias="MTLS")]
     """mTLS binding."""
 
+    certificate_id: Required[str]
+
 
 class DeploymentConfigsPreviewPlacement(TypedDict, total=False):
-    mode: str
+    """Placement setting used for Pages Functions."""
+
+    mode: Required[str]
     """Placement mode."""
 
 
-class DeploymentConfigsPreviewQueueProducersQueueProducerBinding(TypedDict, total=False):
-    name: str
+class DeploymentConfigsPreviewQueueProducers(TypedDict, total=False):
+    """Queue Producer binding."""
+
+    name: Required[str]
     """Name of the Queue."""
 
 
-class DeploymentConfigsPreviewQueueProducers(TypedDict, total=False):
-    queue_producer_binding: Annotated[
-        DeploymentConfigsPreviewQueueProducersQueueProducerBinding, PropertyInfo(alias="QUEUE_PRODUCER_BINDING")
-    ]
-    """Queue Producer binding."""
+class DeploymentConfigsPreviewR2Buckets(TypedDict, total=False):
+    """R2 binding."""
 
+    name: Required[str]
+    """Name of the R2 bucket."""
 
-class DeploymentConfigsPreviewR2BucketsR2Binding(TypedDict, total=False):
     jurisdiction: Optional[str]
     """Jurisdiction of the R2 bucket."""
 
-    name: str
-    """Name of the R2 bucket."""
-
 
-class DeploymentConfigsPreviewR2Buckets(TypedDict, total=False):
-    r2_binding: Annotated[DeploymentConfigsPreviewR2BucketsR2Binding, PropertyInfo(alias="R2_BINDING")]
-    """R2 binding."""
+class DeploymentConfigsPreviewServices(TypedDict, total=False):
+    """Service binding."""
 
+    service: Required[str]
+    """The Service name."""
 
-class DeploymentConfigsPreviewServicesServiceBinding(TypedDict, total=False):
     entrypoint: Optional[str]
     """The entrypoint to bind to."""
 
     environment: str
     """The Service environment."""
 
-    service: str
-    """The Service name."""
-
-
-class DeploymentConfigsPreviewServices(TypedDict, total=False):
-    service_binding: Annotated[DeploymentConfigsPreviewServicesServiceBinding, PropertyInfo(alias="SERVICE_BINDING")]
-    """Service binding."""
-
-
-class DeploymentConfigsPreviewVectorizeBindingsVectorize(TypedDict, total=False):
-    index_name: str
-
 
 class DeploymentConfigsPreviewVectorizeBindings(TypedDict, total=False):
-    vectorize: Annotated[DeploymentConfigsPreviewVectorizeBindingsVectorize, PropertyInfo(alias="VECTORIZE")]
     """Vectorize binding."""
 
+    index_name: Required[str]
+
 
 class DeploymentConfigsPreview(TypedDict, total=False):
-    ai_bindings: Optional[DeploymentConfigsPreviewAIBindings]
+    """Configs for preview deploys."""
+
+    ai_bindings: Dict[str, Optional[DeploymentConfigsPreviewAIBindings]]
     """Constellation bindings used for Pages Functions."""
 
-    analytics_engine_datasets: Optional[DeploymentConfigsPreviewAnalyticsEngineDatasets]
+    always_use_latest_compatibility_date: bool
+    """Whether to always use the latest compatibility date for Pages Functions."""
+
+    analytics_engine_datasets: Dict[str, Optional[DeploymentConfigsPreviewAnalyticsEngineDatasets]]
     """Analytics Engine bindings used for Pages Functions."""
 
-    browsers: Optional[DeploymentConfigsPreviewBrowsers]
+    browsers: Dict[str, Optional[DeploymentConfigsPreviewBrowsers]]
     """Browser bindings used for Pages Functions."""
 
+    build_image_major_version: int
+    """The major version of the build image to use for Pages Functions."""
+
     compatibility_date: str
     """Compatibility date used for Pages Functions."""
 
-    compatibility_flags: Iterable[object]
+    compatibility_flags: SequenceNotStr[str]
     """Compatibility flags used for Pages Functions."""
 
-    d1_databases: Optional[DeploymentConfigsPreviewD1Databases]
+    d1_databases: Dict[str, Optional[DeploymentConfigsPreviewD1Databases]]
     """D1 databases used for Pages Functions."""
 
-    durable_object_namespaces: Optional[DeploymentConfigsPreviewDurableObjectNamespaces]
-    """Durabble Object namespaces used for Pages Functions."""
+    durable_object_namespaces: Dict[str, Optional[DeploymentConfigsPreviewDurableObjectNamespaces]]
+    """Durable Object namespaces used for Pages Functions."""
+
+    env_vars: Dict[str, Optional[DeploymentConfigsPreviewEnvVars]]
+    """Environment variables used for builds and Pages Functions."""
 
-    env_vars: Optional[DeploymentConfigsPreviewEnvVars]
-    """Environment variables for build configs."""
+    fail_open: bool
+    """Whether to fail open when the deployment config cannot be applied."""
 
-    hyperdrive_bindings: Optional[DeploymentConfigsPreviewHyperdriveBindings]
+    hyperdrive_bindings: Dict[str, Optional[DeploymentConfigsPreviewHyperdriveBindings]]
     """Hyperdrive bindings used for Pages Functions."""
 
-    kv_namespaces: DeploymentConfigsPreviewKVNamespaces
+    kv_namespaces: Dict[str, Optional[DeploymentConfigsPreviewKVNamespaces]]
     """KV namespaces used for Pages Functions."""
 
-    mtls_certificates: Optional[DeploymentConfigsPreviewMTLSCertificates]
+    limits: DeploymentConfigsPreviewLimits
+    """Limits for Pages Functions."""
+
+    mtls_certificates: Dict[str, Optional[DeploymentConfigsPreviewMTLSCertificates]]
     """mTLS bindings used for Pages Functions."""
 
-    placement: Optional[DeploymentConfigsPreviewPlacement]
+    placement: DeploymentConfigsPreviewPlacement
     """Placement setting used for Pages Functions."""
 
-    queue_producers: Optional[DeploymentConfigsPreviewQueueProducers]
+    queue_producers: Dict[str, Optional[DeploymentConfigsPreviewQueueProducers]]
     """Queue Producer bindings used for Pages Functions."""
 
-    r2_buckets: Optional[DeploymentConfigsPreviewR2Buckets]
+    r2_buckets: Dict[str, Optional[DeploymentConfigsPreviewR2Buckets]]
     """R2 buckets used for Pages Functions."""
 
-    services: Optional[DeploymentConfigsPreviewServices]
+    services: Dict[str, Optional[DeploymentConfigsPreviewServices]]
     """Services used for Pages Functions."""
 
-    vectorize_bindings: Optional[DeploymentConfigsPreviewVectorizeBindings]
-    """Vectorize bindings used for Pages Functions."""
+    usage_model: Literal["standard", "bundled", "unbound"]
+    """The usage model for Pages Functions."""
 
+    vectorize_bindings: Dict[str, Optional[DeploymentConfigsPreviewVectorizeBindings]]
+    """Vectorize bindings used for Pages Functions."""
 
-class DeploymentConfigsProductionAIBindingsAIBinding(TypedDict, total=False):
-    project_id: object
+    wrangler_config_hash: str
+    """Hash of the Wrangler configuration used for the deployment."""
 
 
 class DeploymentConfigsProductionAIBindings(TypedDict, total=False):
-    ai_binding: Annotated[DeploymentConfigsProductionAIBindingsAIBinding, PropertyInfo(alias="AI_BINDING")]
     """AI binding."""
 
-
-class DeploymentConfigsProductionAnalyticsEngineDatasetsAnalyticsEngineBinding(TypedDict, total=False):
-    dataset: str
-    """Name of the dataset."""
+    project_id: Required[str]
 
 
 class DeploymentConfigsProductionAnalyticsEngineDatasets(TypedDict, total=False):
-    analytics_engine_binding: Annotated[
-        DeploymentConfigsProductionAnalyticsEngineDatasetsAnalyticsEngineBinding,
-        PropertyInfo(alias="ANALYTICS_ENGINE_BINDING"),
-    ]
     """Analytics Engine binding."""
 
+    dataset: Required[str]
+    """Name of the dataset."""
+
 
 class DeploymentConfigsProductionBrowsers(TypedDict, total=False):
-    browser: Annotated[object, PropertyInfo(alias="BROWSER")]
     """Browser binding."""
 
-
-class DeploymentConfigsProductionD1DatabasesD1Binding(TypedDict, total=False):
-    id: str
-    """UUID of the D1 database."""
+    pass
 
 
 class DeploymentConfigsProductionD1Databases(TypedDict, total=False):
-    d1_binding: Annotated[DeploymentConfigsProductionD1DatabasesD1Binding, PropertyInfo(alias="D1_BINDING")]
     """D1 binding."""
 
-
-class DeploymentConfigsProductionDurableObjectNamespacesDoBinding(TypedDict, total=False):
-    namespace_id: str
-    """ID of the Durabble Object namespace."""
+    id: Required[str]
+    """UUID of the D1 database."""
 
 
 class DeploymentConfigsProductionDurableObjectNamespaces(TypedDict, total=False):
-    do_binding: Annotated[DeploymentConfigsProductionDurableObjectNamespacesDoBinding, PropertyInfo(alias="DO_BINDING")]
-    """Durabble Object binding."""
+    """Durable Object binding."""
+
+    namespace_id: Required[str]
+    """ID of the Durable Object namespace."""
 
 
-class DeploymentConfigsProductionEnvVarsEnvironmentVariable(TypedDict, total=False):
-    type: Literal["plain_text", "secret_text"]
-    """The type of environment variable (plain text or secret)"""
+class DeploymentConfigsProductionEnvVarsPagesPlainTextEnvVar(TypedDict, total=False):
+    """A plaintext environment variable."""
 
-    value: str
+    type: Required[Literal["plain_text"]]
+
+    value: Required[str]
     """Environment variable value."""
 
 
-class DeploymentConfigsProductionEnvVars(TypedDict, total=False):
-    environment_variable: Annotated[
-        DeploymentConfigsProductionEnvVarsEnvironmentVariable, PropertyInfo(alias="ENVIRONMENT_VARIABLE")
-    ]
-    """Environment variable."""
+class DeploymentConfigsProductionEnvVarsPagesSecretTextEnvVar(TypedDict, total=False):
+    """An encrypted environment variable."""
 
+    type: Required[Literal["secret_text"]]
 
-class DeploymentConfigsProductionHyperdriveBindingsHyperdrive(TypedDict, total=False):
-    id: str
+    value: Required[str]
+    """Secret value."""
+
+
+DeploymentConfigsProductionEnvVars: TypeAlias = Union[
+    Optional[DeploymentConfigsProductionEnvVarsPagesPlainTextEnvVar],
+    Optional[DeploymentConfigsProductionEnvVarsPagesSecretTextEnvVar],
+]
 
 
 class DeploymentConfigsProductionHyperdriveBindings(TypedDict, total=False):
-    hyperdrive: Annotated[DeploymentConfigsProductionHyperdriveBindingsHyperdrive, PropertyInfo(alias="HYPERDRIVE")]
     """Hyperdrive binding."""
 
-
-class DeploymentConfigsProductionKVNamespacesKVBinding(TypedDict, total=False):
-    namespace_id: str
-    """ID of the KV namespace."""
+    id: Required[str]
 
 
 class DeploymentConfigsProductionKVNamespaces(TypedDict, total=False):
-    kv_binding: Annotated[DeploymentConfigsProductionKVNamespacesKVBinding, PropertyInfo(alias="KV_BINDING")]
-    """KV binding."""
+    """KV namespace binding."""
 
+    namespace_id: Required[str]
+    """ID of the KV namespace."""
+
+
+class DeploymentConfigsProductionLimits(TypedDict, total=False):
+    """Limits for Pages Functions."""
 
-class DeploymentConfigsProductionMTLSCertificatesMTLS(TypedDict, total=False):
-    certificate_id: str
+    cpu_ms: Required[int]
+    """CPU time limit in milliseconds."""
 
 
 class DeploymentConfigsProductionMTLSCertificates(TypedDict, total=False):
-    mtls: Annotated[DeploymentConfigsProductionMTLSCertificatesMTLS, PropertyInfo(alias="MTLS")]
     """mTLS binding."""
 
+    certificate_id: Required[str]
+
 
 class DeploymentConfigsProductionPlacement(TypedDict, total=False):
-    mode: str
+    """Placement setting used for Pages Functions."""
+
+    mode: Required[str]
     """Placement mode."""
 
 
-class DeploymentConfigsProductionQueueProducersQueueProducerBinding(TypedDict, total=False):
-    name: str
+class DeploymentConfigsProductionQueueProducers(TypedDict, total=False):
+    """Queue Producer binding."""
+
+    name: Required[str]
     """Name of the Queue."""
 
 
-class DeploymentConfigsProductionQueueProducers(TypedDict, total=False):
-    queue_producer_binding: Annotated[
-        DeploymentConfigsProductionQueueProducersQueueProducerBinding, PropertyInfo(alias="QUEUE_PRODUCER_BINDING")
-    ]
-    """Queue Producer binding."""
+class DeploymentConfigsProductionR2Buckets(TypedDict, total=False):
+    """R2 binding."""
 
+    name: Required[str]
+    """Name of the R2 bucket."""
 
-class DeploymentConfigsProductionR2BucketsR2Binding(TypedDict, total=False):
     jurisdiction: Optional[str]
     """Jurisdiction of the R2 bucket."""
 
-    name: str
-    """Name of the R2 bucket."""
-
 
-class DeploymentConfigsProductionR2Buckets(TypedDict, total=False):
-    r2_binding: Annotated[DeploymentConfigsProductionR2BucketsR2Binding, PropertyInfo(alias="R2_BINDING")]
-    """R2 binding."""
+class DeploymentConfigsProductionServices(TypedDict, total=False):
+    """Service binding."""
 
+    service: Required[str]
+    """The Service name."""
 
-class DeploymentConfigsProductionServicesServiceBinding(TypedDict, total=False):
     entrypoint: Optional[str]
     """The entrypoint to bind to."""
 
     environment: str
     """The Service environment."""
 
-    service: str
-    """The Service name."""
-
-
-class DeploymentConfigsProductionServices(TypedDict, total=False):
-    service_binding: Annotated[DeploymentConfigsProductionServicesServiceBinding, PropertyInfo(alias="SERVICE_BINDING")]
-    """Service binding."""
-
-
-class DeploymentConfigsProductionVectorizeBindingsVectorize(TypedDict, total=False):
-    index_name: str
-
 
 class DeploymentConfigsProductionVectorizeBindings(TypedDict, total=False):
-    vectorize: Annotated[DeploymentConfigsProductionVectorizeBindingsVectorize, PropertyInfo(alias="VECTORIZE")]
     """Vectorize binding."""
 
+    index_name: Required[str]
+
 
 class DeploymentConfigsProduction(TypedDict, total=False):
-    ai_bindings: Optional[DeploymentConfigsProductionAIBindings]
+    """Configs for production deploys."""
+
+    ai_bindings: Dict[str, Optional[DeploymentConfigsProductionAIBindings]]
     """Constellation bindings used for Pages Functions."""
 
-    analytics_engine_datasets: Optional[DeploymentConfigsProductionAnalyticsEngineDatasets]
+    always_use_latest_compatibility_date: bool
+    """Whether to always use the latest compatibility date for Pages Functions."""
+
+    analytics_engine_datasets: Dict[str, Optional[DeploymentConfigsProductionAnalyticsEngineDatasets]]
     """Analytics Engine bindings used for Pages Functions."""
 
-    browsers: Optional[DeploymentConfigsProductionBrowsers]
+    browsers: Dict[str, Optional[DeploymentConfigsProductionBrowsers]]
     """Browser bindings used for Pages Functions."""
 
+    build_image_major_version: int
+    """The major version of the build image to use for Pages Functions."""
+
     compatibility_date: str
     """Compatibility date used for Pages Functions."""
 
-    compatibility_flags: Iterable[object]
+    compatibility_flags: SequenceNotStr[str]
     """Compatibility flags used for Pages Functions."""
 
-    d1_databases: Optional[DeploymentConfigsProductionD1Databases]
+    d1_databases: Dict[str, Optional[DeploymentConfigsProductionD1Databases]]
     """D1 databases used for Pages Functions."""
 
-    durable_object_namespaces: Optional[DeploymentConfigsProductionDurableObjectNamespaces]
-    """Durabble Object namespaces used for Pages Functions."""
+    durable_object_namespaces: Dict[str, Optional[DeploymentConfigsProductionDurableObjectNamespaces]]
+    """Durable Object namespaces used for Pages Functions."""
 
-    env_vars: Optional[DeploymentConfigsProductionEnvVars]
-    """Environment variables for build configs."""
+    env_vars: Dict[str, Optional[DeploymentConfigsProductionEnvVars]]
+    """Environment variables used for builds and Pages Functions."""
 
-    hyperdrive_bindings: Optional[DeploymentConfigsProductionHyperdriveBindings]
+    fail_open: bool
+    """Whether to fail open when the deployment config cannot be applied."""
+
+    hyperdrive_bindings: Dict[str, Optional[DeploymentConfigsProductionHyperdriveBindings]]
     """Hyperdrive bindings used for Pages Functions."""
 
-    kv_namespaces: DeploymentConfigsProductionKVNamespaces
+    kv_namespaces: Dict[str, Optional[DeploymentConfigsProductionKVNamespaces]]
     """KV namespaces used for Pages Functions."""
 
-    mtls_certificates: Optional[DeploymentConfigsProductionMTLSCertificates]
+    limits: DeploymentConfigsProductionLimits
+    """Limits for Pages Functions."""
+
+    mtls_certificates: Dict[str, Optional[DeploymentConfigsProductionMTLSCertificates]]
     """mTLS bindings used for Pages Functions."""
 
-    placement: Optional[DeploymentConfigsProductionPlacement]
+    placement: DeploymentConfigsProductionPlacement
     """Placement setting used for Pages Functions."""
 
-    queue_producers: Optional[DeploymentConfigsProductionQueueProducers]
+    queue_producers: Dict[str, Optional[DeploymentConfigsProductionQueueProducers]]
     """Queue Producer bindings used for Pages Functions."""
 
-    r2_buckets: Optional[DeploymentConfigsProductionR2Buckets]
+    r2_buckets: Dict[str, Optional[DeploymentConfigsProductionR2Buckets]]
     """R2 buckets used for Pages Functions."""
 
-    services: Optional[DeploymentConfigsProductionServices]
+    services: Dict[str, Optional[DeploymentConfigsProductionServices]]
     """Services used for Pages Functions."""
 
-    vectorize_bindings: Optional[DeploymentConfigsProductionVectorizeBindings]
+    usage_model: Literal["standard", "bundled", "unbound"]
+    """The usage model for Pages Functions."""
+
+    vectorize_bindings: Dict[str, Optional[DeploymentConfigsProductionVectorizeBindings]]
     """Vectorize bindings used for Pages Functions."""
 
+    wrangler_config_hash: str
+    """Hash of the Wrangler configuration used for the deployment."""
+
 
 class DeploymentConfigs(TypedDict, total=False):
+    """Configs for deployments in a project."""
+
     preview: DeploymentConfigsPreview
     """Configs for preview deploys."""
 
     production: DeploymentConfigsProduction
     """Configs for production deploys."""
+
+
+class SourceConfig(TypedDict, total=False):
+    deployments_enabled: bool
+    """
+    Whether to enable automatic deployments when pushing to the source repository.
+    When disabled, no deployments (production or preview) will be triggered
+    automatically.
+    """
+
+    owner: str
+    """The owner of the repository."""
+
+    owner_id: str
+    """The owner ID of the repository."""
+
+    path_excludes: SequenceNotStr[str]
+    """A list of paths that should be excluded from triggering a preview deployment.
+
+    Wildcard syntax (`*`) is supported.
+    """
+
+    path_includes: SequenceNotStr[str]
+    """A list of paths that should be watched to trigger a preview deployment.
+
+    Wildcard syntax (`*`) is supported.
+    """
+
+    pr_comments_enabled: bool
+    """Whether to enable PR comments."""
+
+    preview_branch_excludes: SequenceNotStr[str]
+    """A list of branches that should not trigger a preview deployment.
+
+    Wildcard syntax (`*`) is supported. Must be used with
+    `preview_deployment_setting` set to `custom`.
+    """
+
+    preview_branch_includes: SequenceNotStr[str]
+    """A list of branches that should trigger a preview deployment.
+
+    Wildcard syntax (`*`) is supported. Must be used with
+    `preview_deployment_setting` set to `custom`.
+    """
+
+    preview_deployment_setting: Literal["all", "none", "custom"]
+    """Controls whether commits to preview branches trigger a preview deployment."""
+
+    production_branch: str
+    """The production branch of the repository."""
+
+    production_deployments_enabled: bool
+    """Whether to trigger a production deployment on commits to the production branch."""
+
+    repo_id: str
+    """The ID of the repository."""
+
+    repo_name: str
+    """The name of the repository."""
+
+
+class Source(TypedDict, total=False):
+    """Configs for the project source control."""
+
+    config: Required[SourceConfig]
+
+    type: Required[Literal["github", "gitlab"]]
+    """The source control management provider."""
diff --git a/src/cloudflare/types/pages/project_create_response.py b/src/cloudflare/types/pages/project_create_response.py
deleted file mode 100644
index b9fc105a33a..00000000000
--- a/src/cloudflare/types/pages/project_create_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union
-
-__all__ = ["ProjectCreateResponse"]
-
-ProjectCreateResponse = Union[List[object], str, object]
diff --git a/src/cloudflare/types/pages/project_edit_params.py b/src/cloudflare/types/pages/project_edit_params.py
index 69c85398248..793b61adbe0 100644
--- a/src/cloudflare/types/pages/project_edit_params.py
+++ b/src/cloudflare/types/pages/project_edit_params.py
@@ -2,13 +2,563 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import Dict, Union, Optional
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
-__all__ = ["ProjectEditParams"]
+from ..._types import SequenceNotStr
+
+__all__ = [
+    "ProjectEditParams",
+    "BuildConfig",
+    "DeploymentConfigs",
+    "DeploymentConfigsPreview",
+    "DeploymentConfigsPreviewAIBindings",
+    "DeploymentConfigsPreviewAnalyticsEngineDatasets",
+    "DeploymentConfigsPreviewBrowsers",
+    "DeploymentConfigsPreviewD1Databases",
+    "DeploymentConfigsPreviewDurableObjectNamespaces",
+    "DeploymentConfigsPreviewEnvVars",
+    "DeploymentConfigsPreviewEnvVarsPagesPlainTextEnvVar",
+    "DeploymentConfigsPreviewEnvVarsPagesSecretTextEnvVar",
+    "DeploymentConfigsPreviewHyperdriveBindings",
+    "DeploymentConfigsPreviewKVNamespaces",
+    "DeploymentConfigsPreviewLimits",
+    "DeploymentConfigsPreviewMTLSCertificates",
+    "DeploymentConfigsPreviewPlacement",
+    "DeploymentConfigsPreviewQueueProducers",
+    "DeploymentConfigsPreviewR2Buckets",
+    "DeploymentConfigsPreviewServices",
+    "DeploymentConfigsPreviewVectorizeBindings",
+    "DeploymentConfigsProduction",
+    "DeploymentConfigsProductionAIBindings",
+    "DeploymentConfigsProductionAnalyticsEngineDatasets",
+    "DeploymentConfigsProductionBrowsers",
+    "DeploymentConfigsProductionD1Databases",
+    "DeploymentConfigsProductionDurableObjectNamespaces",
+    "DeploymentConfigsProductionEnvVars",
+    "DeploymentConfigsProductionEnvVarsPagesPlainTextEnvVar",
+    "DeploymentConfigsProductionEnvVarsPagesSecretTextEnvVar",
+    "DeploymentConfigsProductionHyperdriveBindings",
+    "DeploymentConfigsProductionKVNamespaces",
+    "DeploymentConfigsProductionLimits",
+    "DeploymentConfigsProductionMTLSCertificates",
+    "DeploymentConfigsProductionPlacement",
+    "DeploymentConfigsProductionQueueProducers",
+    "DeploymentConfigsProductionR2Buckets",
+    "DeploymentConfigsProductionServices",
+    "DeploymentConfigsProductionVectorizeBindings",
+    "Source",
+    "SourceConfig",
+]
 
 
 class ProjectEditParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
+
+    build_config: BuildConfig
+    """Configs for the project build process."""
+
+    deployment_configs: DeploymentConfigs
+    """Configs for deployments in a project."""
+
+    name: str
+    """Name of the project."""
+
+    production_branch: str
+    """Production branch of the project. Used to identify production deployments."""
+
+    source: Source
+    """Configs for the project source control."""
+
+
+class BuildConfig(TypedDict, total=False):
+    """Configs for the project build process."""
+
+    build_caching: bool
+    """Enable build caching for the project."""
+
+    build_command: str
+    """Command used to build project."""
+
+    destination_dir: str
+    """Output directory of the build."""
+
+    root_dir: str
+    """Directory to run the command."""
+
+    web_analytics_tag: Optional[str]
+    """The classifying tag for analytics."""
+
+    web_analytics_token: Optional[str]
+    """The auth token for analytics."""
+
+
+class DeploymentConfigsPreviewAIBindings(TypedDict, total=False):
+    """AI binding."""
+
+    project_id: Required[str]
+
+
+class DeploymentConfigsPreviewAnalyticsEngineDatasets(TypedDict, total=False):
+    """Analytics Engine binding."""
+
+    dataset: Required[str]
+    """Name of the dataset."""
+
+
+class DeploymentConfigsPreviewBrowsers(TypedDict, total=False):
+    """Browser binding."""
+
+    pass
+
+
+class DeploymentConfigsPreviewD1Databases(TypedDict, total=False):
+    """D1 binding."""
+
+    id: Required[str]
+    """UUID of the D1 database."""
+
+
+class DeploymentConfigsPreviewDurableObjectNamespaces(TypedDict, total=False):
+    """Durable Object binding."""
+
+    namespace_id: Required[str]
+    """ID of the Durable Object namespace."""
+
+
+class DeploymentConfigsPreviewEnvVarsPagesPlainTextEnvVar(TypedDict, total=False):
+    """A plaintext environment variable."""
+
+    type: Required[Literal["plain_text"]]
+
+    value: Required[str]
+    """Environment variable value."""
+
+
+class DeploymentConfigsPreviewEnvVarsPagesSecretTextEnvVar(TypedDict, total=False):
+    """An encrypted environment variable."""
+
+    type: Required[Literal["secret_text"]]
+
+    value: Required[str]
+    """Secret value."""
+
+
+DeploymentConfigsPreviewEnvVars: TypeAlias = Union[
+    Optional[DeploymentConfigsPreviewEnvVarsPagesPlainTextEnvVar],
+    Optional[DeploymentConfigsPreviewEnvVarsPagesSecretTextEnvVar],
+]
+
+
+class DeploymentConfigsPreviewHyperdriveBindings(TypedDict, total=False):
+    """Hyperdrive binding."""
+
+    id: Required[str]
+
+
+class DeploymentConfigsPreviewKVNamespaces(TypedDict, total=False):
+    """KV namespace binding."""
+
+    namespace_id: Required[str]
+    """ID of the KV namespace."""
+
+
+class DeploymentConfigsPreviewLimits(TypedDict, total=False):
+    """Limits for Pages Functions."""
+
+    cpu_ms: Required[int]
+    """CPU time limit in milliseconds."""
+
+
+class DeploymentConfigsPreviewMTLSCertificates(TypedDict, total=False):
+    """mTLS binding."""
+
+    certificate_id: Required[str]
+
+
+class DeploymentConfigsPreviewPlacement(TypedDict, total=False):
+    """Placement setting used for Pages Functions."""
+
+    mode: Required[str]
+    """Placement mode."""
+
+
+class DeploymentConfigsPreviewQueueProducers(TypedDict, total=False):
+    """Queue Producer binding."""
+
+    name: Required[str]
+    """Name of the Queue."""
+
+
+class DeploymentConfigsPreviewR2Buckets(TypedDict, total=False):
+    """R2 binding."""
+
+    name: Required[str]
+    """Name of the R2 bucket."""
+
+    jurisdiction: Optional[str]
+    """Jurisdiction of the R2 bucket."""
+
+
+class DeploymentConfigsPreviewServices(TypedDict, total=False):
+    """Service binding."""
+
+    service: Required[str]
+    """The Service name."""
+
+    entrypoint: Optional[str]
+    """The entrypoint to bind to."""
+
+    environment: str
+    """The Service environment."""
+
+
+class DeploymentConfigsPreviewVectorizeBindings(TypedDict, total=False):
+    """Vectorize binding."""
+
+    index_name: Required[str]
+
+
+class DeploymentConfigsPreview(TypedDict, total=False):
+    """Configs for preview deploys."""
+
+    ai_bindings: Dict[str, Optional[DeploymentConfigsPreviewAIBindings]]
+    """Constellation bindings used for Pages Functions."""
+
+    always_use_latest_compatibility_date: bool
+    """Whether to always use the latest compatibility date for Pages Functions."""
+
+    analytics_engine_datasets: Dict[str, Optional[DeploymentConfigsPreviewAnalyticsEngineDatasets]]
+    """Analytics Engine bindings used for Pages Functions."""
+
+    browsers: Dict[str, Optional[DeploymentConfigsPreviewBrowsers]]
+    """Browser bindings used for Pages Functions."""
+
+    build_image_major_version: int
+    """The major version of the build image to use for Pages Functions."""
+
+    compatibility_date: str
+    """Compatibility date used for Pages Functions."""
+
+    compatibility_flags: SequenceNotStr[str]
+    """Compatibility flags used for Pages Functions."""
+
+    d1_databases: Dict[str, Optional[DeploymentConfigsPreviewD1Databases]]
+    """D1 databases used for Pages Functions."""
+
+    durable_object_namespaces: Dict[str, Optional[DeploymentConfigsPreviewDurableObjectNamespaces]]
+    """Durable Object namespaces used for Pages Functions."""
+
+    env_vars: Dict[str, Optional[DeploymentConfigsPreviewEnvVars]]
+    """Environment variables used for builds and Pages Functions."""
+
+    fail_open: bool
+    """Whether to fail open when the deployment config cannot be applied."""
+
+    hyperdrive_bindings: Dict[str, Optional[DeploymentConfigsPreviewHyperdriveBindings]]
+    """Hyperdrive bindings used for Pages Functions."""
+
+    kv_namespaces: Dict[str, Optional[DeploymentConfigsPreviewKVNamespaces]]
+    """KV namespaces used for Pages Functions."""
+
+    limits: DeploymentConfigsPreviewLimits
+    """Limits for Pages Functions."""
+
+    mtls_certificates: Dict[str, Optional[DeploymentConfigsPreviewMTLSCertificates]]
+    """mTLS bindings used for Pages Functions."""
+
+    placement: DeploymentConfigsPreviewPlacement
+    """Placement setting used for Pages Functions."""
+
+    queue_producers: Dict[str, Optional[DeploymentConfigsPreviewQueueProducers]]
+    """Queue Producer bindings used for Pages Functions."""
+
+    r2_buckets: Dict[str, Optional[DeploymentConfigsPreviewR2Buckets]]
+    """R2 buckets used for Pages Functions."""
+
+    services: Dict[str, Optional[DeploymentConfigsPreviewServices]]
+    """Services used for Pages Functions."""
+
+    usage_model: Literal["standard", "bundled", "unbound"]
+    """The usage model for Pages Functions."""
+
+    vectorize_bindings: Dict[str, Optional[DeploymentConfigsPreviewVectorizeBindings]]
+    """Vectorize bindings used for Pages Functions."""
+
+    wrangler_config_hash: str
+    """Hash of the Wrangler configuration used for the deployment."""
+
+
+class DeploymentConfigsProductionAIBindings(TypedDict, total=False):
+    """AI binding."""
+
+    project_id: Required[str]
+
+
+class DeploymentConfigsProductionAnalyticsEngineDatasets(TypedDict, total=False):
+    """Analytics Engine binding."""
+
+    dataset: Required[str]
+    """Name of the dataset."""
+
+
+class DeploymentConfigsProductionBrowsers(TypedDict, total=False):
+    """Browser binding."""
+
+    pass
+
+
+class DeploymentConfigsProductionD1Databases(TypedDict, total=False):
+    """D1 binding."""
+
+    id: Required[str]
+    """UUID of the D1 database."""
+
+
+class DeploymentConfigsProductionDurableObjectNamespaces(TypedDict, total=False):
+    """Durable Object binding."""
+
+    namespace_id: Required[str]
+    """ID of the Durable Object namespace."""
+
+
+class DeploymentConfigsProductionEnvVarsPagesPlainTextEnvVar(TypedDict, total=False):
+    """A plaintext environment variable."""
+
+    type: Required[Literal["plain_text"]]
+
+    value: Required[str]
+    """Environment variable value."""
+
+
+class DeploymentConfigsProductionEnvVarsPagesSecretTextEnvVar(TypedDict, total=False):
+    """An encrypted environment variable."""
+
+    type: Required[Literal["secret_text"]]
+
+    value: Required[str]
+    """Secret value."""
+
+
+DeploymentConfigsProductionEnvVars: TypeAlias = Union[
+    Optional[DeploymentConfigsProductionEnvVarsPagesPlainTextEnvVar],
+    Optional[DeploymentConfigsProductionEnvVarsPagesSecretTextEnvVar],
+]
+
+
+class DeploymentConfigsProductionHyperdriveBindings(TypedDict, total=False):
+    """Hyperdrive binding."""
+
+    id: Required[str]
+
+
+class DeploymentConfigsProductionKVNamespaces(TypedDict, total=False):
+    """KV namespace binding."""
+
+    namespace_id: Required[str]
+    """ID of the KV namespace."""
+
+
+class DeploymentConfigsProductionLimits(TypedDict, total=False):
+    """Limits for Pages Functions."""
+
+    cpu_ms: Required[int]
+    """CPU time limit in milliseconds."""
+
+
+class DeploymentConfigsProductionMTLSCertificates(TypedDict, total=False):
+    """mTLS binding."""
+
+    certificate_id: Required[str]
+
+
+class DeploymentConfigsProductionPlacement(TypedDict, total=False):
+    """Placement setting used for Pages Functions."""
+
+    mode: Required[str]
+    """Placement mode."""
+
+
+class DeploymentConfigsProductionQueueProducers(TypedDict, total=False):
+    """Queue Producer binding."""
+
+    name: Required[str]
+    """Name of the Queue."""
+
+
+class DeploymentConfigsProductionR2Buckets(TypedDict, total=False):
+    """R2 binding."""
+
+    name: Required[str]
+    """Name of the R2 bucket."""
+
+    jurisdiction: Optional[str]
+    """Jurisdiction of the R2 bucket."""
+
+
+class DeploymentConfigsProductionServices(TypedDict, total=False):
+    """Service binding."""
+
+    service: Required[str]
+    """The Service name."""
+
+    entrypoint: Optional[str]
+    """The entrypoint to bind to."""
+
+    environment: str
+    """The Service environment."""
+
+
+class DeploymentConfigsProductionVectorizeBindings(TypedDict, total=False):
+    """Vectorize binding."""
+
+    index_name: Required[str]
+
+
+class DeploymentConfigsProduction(TypedDict, total=False):
+    """Configs for production deploys."""
+
+    ai_bindings: Dict[str, Optional[DeploymentConfigsProductionAIBindings]]
+    """Constellation bindings used for Pages Functions."""
+
+    always_use_latest_compatibility_date: bool
+    """Whether to always use the latest compatibility date for Pages Functions."""
+
+    analytics_engine_datasets: Dict[str, Optional[DeploymentConfigsProductionAnalyticsEngineDatasets]]
+    """Analytics Engine bindings used for Pages Functions."""
+
+    browsers: Dict[str, Optional[DeploymentConfigsProductionBrowsers]]
+    """Browser bindings used for Pages Functions."""
+
+    build_image_major_version: int
+    """The major version of the build image to use for Pages Functions."""
+
+    compatibility_date: str
+    """Compatibility date used for Pages Functions."""
+
+    compatibility_flags: SequenceNotStr[str]
+    """Compatibility flags used for Pages Functions."""
+
+    d1_databases: Dict[str, Optional[DeploymentConfigsProductionD1Databases]]
+    """D1 databases used for Pages Functions."""
+
+    durable_object_namespaces: Dict[str, Optional[DeploymentConfigsProductionDurableObjectNamespaces]]
+    """Durable Object namespaces used for Pages Functions."""
+
+    env_vars: Dict[str, Optional[DeploymentConfigsProductionEnvVars]]
+    """Environment variables used for builds and Pages Functions."""
+
+    fail_open: bool
+    """Whether to fail open when the deployment config cannot be applied."""
+
+    hyperdrive_bindings: Dict[str, Optional[DeploymentConfigsProductionHyperdriveBindings]]
+    """Hyperdrive bindings used for Pages Functions."""
+
+    kv_namespaces: Dict[str, Optional[DeploymentConfigsProductionKVNamespaces]]
+    """KV namespaces used for Pages Functions."""
+
+    limits: DeploymentConfigsProductionLimits
+    """Limits for Pages Functions."""
+
+    mtls_certificates: Dict[str, Optional[DeploymentConfigsProductionMTLSCertificates]]
+    """mTLS bindings used for Pages Functions."""
+
+    placement: DeploymentConfigsProductionPlacement
+    """Placement setting used for Pages Functions."""
+
+    queue_producers: Dict[str, Optional[DeploymentConfigsProductionQueueProducers]]
+    """Queue Producer bindings used for Pages Functions."""
+
+    r2_buckets: Dict[str, Optional[DeploymentConfigsProductionR2Buckets]]
+    """R2 buckets used for Pages Functions."""
+
+    services: Dict[str, Optional[DeploymentConfigsProductionServices]]
+    """Services used for Pages Functions."""
+
+    usage_model: Literal["standard", "bundled", "unbound"]
+    """The usage model for Pages Functions."""
+
+    vectorize_bindings: Dict[str, Optional[DeploymentConfigsProductionVectorizeBindings]]
+    """Vectorize bindings used for Pages Functions."""
+
+    wrangler_config_hash: str
+    """Hash of the Wrangler configuration used for the deployment."""
+
+
+class DeploymentConfigs(TypedDict, total=False):
+    """Configs for deployments in a project."""
+
+    preview: DeploymentConfigsPreview
+    """Configs for preview deploys."""
+
+    production: DeploymentConfigsProduction
+    """Configs for production deploys."""
+
+
+class SourceConfig(TypedDict, total=False):
+    deployments_enabled: bool
+    """
+    Whether to enable automatic deployments when pushing to the source repository.
+    When disabled, no deployments (production or preview) will be triggered
+    automatically.
+    """
+
+    owner: str
+    """The owner of the repository."""
+
+    owner_id: str
+    """The owner ID of the repository."""
+
+    path_excludes: SequenceNotStr[str]
+    """A list of paths that should be excluded from triggering a preview deployment.
+
+    Wildcard syntax (`*`) is supported.
+    """
+
+    path_includes: SequenceNotStr[str]
+    """A list of paths that should be watched to trigger a preview deployment.
+
+    Wildcard syntax (`*`) is supported.
+    """
+
+    pr_comments_enabled: bool
+    """Whether to enable PR comments."""
+
+    preview_branch_excludes: SequenceNotStr[str]
+    """A list of branches that should not trigger a preview deployment.
+
+    Wildcard syntax (`*`) is supported. Must be used with
+    `preview_deployment_setting` set to `custom`.
+    """
+
+    preview_branch_includes: SequenceNotStr[str]
+    """A list of branches that should trigger a preview deployment.
+
+    Wildcard syntax (`*`) is supported. Must be used with
+    `preview_deployment_setting` set to `custom`.
+    """
+
+    preview_deployment_setting: Literal["all", "none", "custom"]
+    """Controls whether commits to preview branches trigger a preview deployment."""
+
+    production_branch: str
+    """The production branch of the repository."""
+
+    production_deployments_enabled: bool
+    """Whether to trigger a production deployment on commits to the production branch."""
+
+    repo_id: str
+    """The ID of the repository."""
+
+    repo_name: str
+    """The name of the repository."""
+
+
+class Source(TypedDict, total=False):
+    """Configs for the project source control."""
+
+    config: Required[SourceConfig]
 
-    body: Required[object]
+    type: Required[Literal["github", "gitlab"]]
+    """The source control management provider."""
diff --git a/src/cloudflare/types/pages/project_edit_response.py b/src/cloudflare/types/pages/project_edit_response.py
deleted file mode 100644
index 3a046d1a9c6..00000000000
--- a/src/cloudflare/types/pages/project_edit_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union
-
-__all__ = ["ProjectEditResponse"]
-
-ProjectEditResponse = Union[List[object], str, object]
diff --git a/src/cloudflare/types/pages/project_list_params.py b/src/cloudflare/types/pages/project_list_params.py
new file mode 100644
index 00000000000..a3331078193
--- /dev/null
+++ b/src/cloudflare/types/pages/project_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ProjectListParams"]
+
+
+class ProjectListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    page: int
+    """Which page of projects to fetch."""
+
+    per_page: int
+    """How many projects to return per page."""
diff --git a/src/cloudflare/types/pages/projects/__init__.py b/src/cloudflare/types/pages/projects/__init__.py
index d342db3a2e9..084d181817f 100644
--- a/src/cloudflare/types/pages/projects/__init__.py
+++ b/src/cloudflare/types/pages/projects/__init__.py
@@ -2,12 +2,10 @@
 
 from __future__ import annotations
 
-from .domain_edit_params import DomainEditParams as DomainEditParams
 from .domain_get_response import DomainGetResponse as DomainGetResponse
 from .domain_create_params import DomainCreateParams as DomainCreateParams
 from .domain_edit_response import DomainEditResponse as DomainEditResponse
+from .domain_list_response import DomainListResponse as DomainListResponse
 from .deployment_list_params import DeploymentListParams as DeploymentListParams
 from .domain_create_response import DomainCreateResponse as DomainCreateResponse
-from .deployment_retry_params import DeploymentRetryParams as DeploymentRetryParams
 from .deployment_create_params import DeploymentCreateParams as DeploymentCreateParams
-from .deployment_rollback_params import DeploymentRollbackParams as DeploymentRollbackParams
diff --git a/src/cloudflare/types/pages/projects/deployment_create_params.py b/src/cloudflare/types/pages/projects/deployment_create_params.py
index 6a628190f1d..c9c36ee79d9 100644
--- a/src/cloudflare/types/pages/projects/deployment_create_params.py
+++ b/src/cloudflare/types/pages/projects/deployment_create_params.py
@@ -2,14 +2,40 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ...._types import FileTypes
+from ...._utils import PropertyInfo
 
 __all__ = ["DeploymentCreateParams"]
 
 
 class DeploymentCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
+
+    _headers: FileTypes
+    """Headers configuration file for the deployment."""
+
+    _redirects: FileTypes
+    """Redirects configuration file for the deployment."""
+
+    _routes_json: Annotated[FileTypes, PropertyInfo(alias="_routes.json")]
+    """Routes configuration file defining routing rules."""
+
+    _worker_bundle: Annotated[FileTypes, PropertyInfo(alias="_worker.bundle")]
+    """Worker bundle file in multipart/form-data format.
+
+    Mutually exclusive with `_worker.js`. Cannot specify both `_worker.js` and
+    `_worker.bundle` in the same request. Maximum size: 25 MiB.
+    """
+
+    _worker_js: Annotated[FileTypes, PropertyInfo(alias="_worker.js")]
+    """Worker JavaScript file.
+
+    Mutually exclusive with `_worker.bundle`. Cannot specify both `_worker.js` and
+    `_worker.bundle` in the same request.
+    """
 
     branch: str
     """The branch to build the new deployment from.
@@ -17,3 +43,30 @@ class DeploymentCreateParams(TypedDict, total=False):
     The `HEAD` of the branch will be used. If omitted, the production branch will be
     used by default.
     """
+
+    commit_dirty: Literal["true", "false"]
+    """Boolean string indicating if the working directory has uncommitted changes."""
+
+    commit_hash: str
+    """Git commit SHA associated with this deployment."""
+
+    commit_message: str
+    """Git commit message associated with this deployment."""
+
+    functions_filepath_routing_config_json: Annotated[
+        FileTypes, PropertyInfo(alias="functions-filepath-routing-config.json")
+    ]
+    """Functions routing configuration file."""
+
+    manifest: str
+    """JSON string containing a manifest of files to deploy.
+
+    Maps file paths to their content hashes. Required for direct upload deployments.
+    Maximum 20,000 entries.
+    """
+
+    pages_build_output_dir: str
+    """The build output directory path."""
+
+    wrangler_config_hash: str
+    """Hash of the Wrangler configuration file used for this deployment."""
diff --git a/src/cloudflare/types/pages/projects/deployment_list_params.py b/src/cloudflare/types/pages/projects/deployment_list_params.py
index 5eec7e2468d..596f1462e6b 100644
--- a/src/cloudflare/types/pages/projects/deployment_list_params.py
+++ b/src/cloudflare/types/pages/projects/deployment_list_params.py
@@ -9,7 +9,13 @@
 
 class DeploymentListParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     env: Literal["production", "preview"]
     """What type of deployments to fetch."""
+
+    page: int
+    """Which page of deployments to fetch."""
+
+    per_page: int
+    """How many deployments to return per page."""
diff --git a/src/cloudflare/types/pages/projects/deployment_retry_params.py b/src/cloudflare/types/pages/projects/deployment_retry_params.py
deleted file mode 100644
index 298b72a3331..00000000000
--- a/src/cloudflare/types/pages/projects/deployment_retry_params.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["DeploymentRetryParams"]
-
-
-class DeploymentRetryParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    project_name: Required[str]
-    """Name of the project."""
-
-    body: Required[object]
diff --git a/src/cloudflare/types/pages/projects/deployment_rollback_params.py b/src/cloudflare/types/pages/projects/deployment_rollback_params.py
deleted file mode 100644
index 078d237c493..00000000000
--- a/src/cloudflare/types/pages/projects/deployment_rollback_params.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["DeploymentRollbackParams"]
-
-
-class DeploymentRollbackParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    project_name: Required[str]
-    """Name of the project."""
-
-    body: Required[object]
diff --git a/src/cloudflare/types/pages/projects/deployments/history/log_get_response.py b/src/cloudflare/types/pages/projects/deployments/history/log_get_response.py
index c5519eb2f4b..343761ea50a 100644
--- a/src/cloudflare/types/pages/projects/deployments/history/log_get_response.py
+++ b/src/cloudflare/types/pages/projects/deployments/history/log_get_response.py
@@ -1,7 +1,21 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Union
+from typing import List
 
-__all__ = ["LogGetResponse"]
+from ......_models import BaseModel
 
-LogGetResponse = Union[List[object], str, object]
+__all__ = ["LogGetResponse", "Data"]
+
+
+class Data(BaseModel):
+    line: str
+
+    ts: str
+
+
+class LogGetResponse(BaseModel):
+    data: List[Data]
+
+    includes_container_logs: bool
+
+    total: int
diff --git a/src/cloudflare/types/pages/projects/domain_create_params.py b/src/cloudflare/types/pages/projects/domain_create_params.py
index a48cff152cc..8e445ce2a62 100644
--- a/src/cloudflare/types/pages/projects/domain_create_params.py
+++ b/src/cloudflare/types/pages/projects/domain_create_params.py
@@ -9,6 +9,7 @@
 
 class DomainCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    body: Required[object]
+    name: Required[str]
+    """The domain name."""
diff --git a/src/cloudflare/types/pages/projects/domain_create_response.py b/src/cloudflare/types/pages/projects/domain_create_response.py
index 6d40d9d8a49..63b7d1ff63c 100644
--- a/src/cloudflare/types/pages/projects/domain_create_response.py
+++ b/src/cloudflare/types/pages/projects/domain_create_response.py
@@ -1,7 +1,47 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Union
+from typing import Optional
+from typing_extensions import Literal
 
-__all__ = ["DomainCreateResponse"]
+from ...._models import BaseModel
 
-DomainCreateResponse = Union[List[object], str, object, None]
+__all__ = ["DomainCreateResponse", "ValidationData", "VerificationData"]
+
+
+class ValidationData(BaseModel):
+    method: Literal["http", "txt"]
+
+    status: Literal["initializing", "pending", "active", "deactivated", "error"]
+
+    error_message: Optional[str] = None
+
+    txt_name: Optional[str] = None
+
+    txt_value: Optional[str] = None
+
+
+class VerificationData(BaseModel):
+    status: Literal["pending", "active", "deactivated", "blocked", "error"]
+
+    error_message: Optional[str] = None
+
+
+class DomainCreateResponse(BaseModel):
+    id: str
+
+    certificate_authority: Literal["google", "lets_encrypt"]
+
+    created_on: str
+
+    domain_id: str
+
+    name: str
+    """The domain name."""
+
+    status: Literal["initializing", "pending", "active", "deactivated", "blocked", "error"]
+
+    validation_data: ValidationData
+
+    verification_data: VerificationData
+
+    zone_tag: str
diff --git a/src/cloudflare/types/pages/projects/domain_edit_params.py b/src/cloudflare/types/pages/projects/domain_edit_params.py
deleted file mode 100644
index ff0dda3be6b..00000000000
--- a/src/cloudflare/types/pages/projects/domain_edit_params.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["DomainEditParams"]
-
-
-class DomainEditParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    project_name: Required[str]
-    """Name of the project."""
-
-    body: Required[object]
diff --git a/src/cloudflare/types/pages/projects/domain_edit_response.py b/src/cloudflare/types/pages/projects/domain_edit_response.py
index b13c4a8c6f9..51b3029c5bb 100644
--- a/src/cloudflare/types/pages/projects/domain_edit_response.py
+++ b/src/cloudflare/types/pages/projects/domain_edit_response.py
@@ -1,7 +1,47 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Union
+from typing import Optional
+from typing_extensions import Literal
 
-__all__ = ["DomainEditResponse"]
+from ...._models import BaseModel
 
-DomainEditResponse = Union[List[object], str, object, None]
+__all__ = ["DomainEditResponse", "ValidationData", "VerificationData"]
+
+
+class ValidationData(BaseModel):
+    method: Literal["http", "txt"]
+
+    status: Literal["initializing", "pending", "active", "deactivated", "error"]
+
+    error_message: Optional[str] = None
+
+    txt_name: Optional[str] = None
+
+    txt_value: Optional[str] = None
+
+
+class VerificationData(BaseModel):
+    status: Literal["pending", "active", "deactivated", "blocked", "error"]
+
+    error_message: Optional[str] = None
+
+
+class DomainEditResponse(BaseModel):
+    id: str
+
+    certificate_authority: Literal["google", "lets_encrypt"]
+
+    created_on: str
+
+    domain_id: str
+
+    name: str
+    """The domain name."""
+
+    status: Literal["initializing", "pending", "active", "deactivated", "blocked", "error"]
+
+    validation_data: ValidationData
+
+    verification_data: VerificationData
+
+    zone_tag: str
diff --git a/src/cloudflare/types/pages/projects/domain_get_response.py b/src/cloudflare/types/pages/projects/domain_get_response.py
index 31cc6350778..879bf6e30fa 100644
--- a/src/cloudflare/types/pages/projects/domain_get_response.py
+++ b/src/cloudflare/types/pages/projects/domain_get_response.py
@@ -1,7 +1,47 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Union
+from typing import Optional
+from typing_extensions import Literal
 
-__all__ = ["DomainGetResponse"]
+from ...._models import BaseModel
 
-DomainGetResponse = Union[List[object], str, object, None]
+__all__ = ["DomainGetResponse", "ValidationData", "VerificationData"]
+
+
+class ValidationData(BaseModel):
+    method: Literal["http", "txt"]
+
+    status: Literal["initializing", "pending", "active", "deactivated", "error"]
+
+    error_message: Optional[str] = None
+
+    txt_name: Optional[str] = None
+
+    txt_value: Optional[str] = None
+
+
+class VerificationData(BaseModel):
+    status: Literal["pending", "active", "deactivated", "blocked", "error"]
+
+    error_message: Optional[str] = None
+
+
+class DomainGetResponse(BaseModel):
+    id: str
+
+    certificate_authority: Literal["google", "lets_encrypt"]
+
+    created_on: str
+
+    domain_id: str
+
+    name: str
+    """The domain name."""
+
+    status: Literal["initializing", "pending", "active", "deactivated", "blocked", "error"]
+
+    validation_data: ValidationData
+
+    verification_data: VerificationData
+
+    zone_tag: str
diff --git a/src/cloudflare/types/pages/projects/domain_list_response.py b/src/cloudflare/types/pages/projects/domain_list_response.py
new file mode 100644
index 00000000000..e929cb1c925
--- /dev/null
+++ b/src/cloudflare/types/pages/projects/domain_list_response.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["DomainListResponse", "ValidationData", "VerificationData"]
+
+
+class ValidationData(BaseModel):
+    method: Literal["http", "txt"]
+
+    status: Literal["initializing", "pending", "active", "deactivated", "error"]
+
+    error_message: Optional[str] = None
+
+    txt_name: Optional[str] = None
+
+    txt_value: Optional[str] = None
+
+
+class VerificationData(BaseModel):
+    status: Literal["pending", "active", "deactivated", "blocked", "error"]
+
+    error_message: Optional[str] = None
+
+
+class DomainListResponse(BaseModel):
+    id: str
+
+    certificate_authority: Literal["google", "lets_encrypt"]
+
+    created_on: str
+
+    domain_id: str
+
+    name: str
+    """The domain name."""
+
+    status: Literal["initializing", "pending", "active", "deactivated", "blocked", "error"]
+
+    validation_data: ValidationData
+
+    verification_data: VerificationData
+
+    zone_tag: str
diff --git a/src/cloudflare/types/pages/stage.py b/src/cloudflare/types/pages/stage.py
index cd33c72ebe5..9b280b2b1a9 100644
--- a/src/cloudflare/types/pages/stage.py
+++ b/src/cloudflare/types/pages/stage.py
@@ -2,6 +2,7 @@
 
 from typing import Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from ..._models import BaseModel
 
@@ -9,14 +10,16 @@
 
 
 class Stage(BaseModel):
+    """The status of the deployment."""
+
     ended_on: Optional[datetime] = None
     """When the stage ended."""
 
-    name: Optional[str] = None
+    name: Literal["queued", "initialize", "clone_repo", "build", "deploy"]
     """The current build stage."""
 
     started_on: Optional[datetime] = None
     """When the stage started."""
 
-    status: Optional[str] = None
+    status: Literal["success", "idle", "active", "failure", "canceled"]
     """State of the current stage."""
diff --git a/src/cloudflare/types/pages/stage_param.py b/src/cloudflare/types/pages/stage_param.py
deleted file mode 100644
index c7fef7d063a..00000000000
--- a/src/cloudflare/types/pages/stage_param.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import TypedDict
-
-__all__ = ["StageParam"]
-
-
-class StageParam(TypedDict, total=False):
-    name: str
-    """The current build stage."""
diff --git a/src/cloudflare/types/pcaps/__init__.py b/src/cloudflare/types/pcaps/__init__.py
deleted file mode 100644
index 771b78a0850..00000000000
--- a/src/cloudflare/types/pcaps/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-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/pcaps/ownership.py b/src/cloudflare/types/pcaps/ownership.py
deleted file mode 100644
index 2373d88a8dc..00000000000
--- a/src/cloudflare/types/pcaps/ownership.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = ["Ownership"]
-
-
-class Ownership(BaseModel):
-    id: str
-    """The bucket ID associated with the packet captures API."""
-
-    destination_conf: str
-    """The full URI for the bucket. This field only applies to `full` packet captures."""
-
-    filename: str
-    """The ownership challenge filename stored in the bucket."""
-
-    status: Literal["pending", "success", "failed"]
-    """The status of the ownership challenge. Can be pending, success or failed."""
-
-    submitted: str
-    """The RFC 3339 timestamp when the bucket was added to packet captures API."""
-
-    validated: Optional[str] = None
-    """The RFC 3339 timestamp when the bucket was validated."""
diff --git a/src/cloudflare/types/pcaps/ownership_get_response.py b/src/cloudflare/types/pcaps/ownership_get_response.py
deleted file mode 100644
index 69cf682a9cf..00000000000
--- a/src/cloudflare/types/pcaps/ownership_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .ownership import Ownership
-
-__all__ = ["OwnershipGetResponse"]
-
-OwnershipGetResponse = List[Ownership]
diff --git a/src/cloudflare/types/pcaps/pcap_create_params.py b/src/cloudflare/types/pcaps/pcap_create_params.py
deleted file mode 100644
index b7d82a16252..00000000000
--- a/src/cloudflare/types/pcaps/pcap_create_params.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Union
-from typing_extensions import Literal, Required, TypedDict
-
-from .pcap_filter_param import PCAPFilterParam
-
-__all__ = ["PCAPCreateParams", "MagicVisibilityPCAPsRequestSimple", "MagicVisibilityPCAPsRequestFull"]
-
-
-class MagicVisibilityPCAPsRequestSimple(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    packet_limit: Required[float]
-    """The limit of packets contained in a packet capture."""
-
-    system: Required[Literal["magic-transit"]]
-    """The system used to collect packet captures."""
-
-    time_limit: Required[float]
-    """The packet capture duration in seconds."""
-
-    type: Required[Literal["simple", "full"]]
-    """The type of packet capture.
-
-    `Simple` captures sampled packets, and `full` captures entire payloads and
-    non-sampled packets.
-    """
-
-    filter_v1: PCAPFilterParam
-    """The packet capture filter. When this field is empty, all packets are captured."""
-
-
-class MagicVisibilityPCAPsRequestFull(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    colo_name: Required[str]
-    """The name of the data center used for the packet capture.
-
-    This can be a specific colo (ord02) or a multi-colo name (ORD). This field only
-    applies to `full` packet captures.
-    """
-
-    destination_conf: Required[str]
-    """The full URI for the bucket. This field only applies to `full` packet captures."""
-
-    system: Required[Literal["magic-transit"]]
-    """The system used to collect packet captures."""
-
-    time_limit: Required[float]
-    """The packet capture duration in seconds."""
-
-    type: Required[Literal["simple", "full"]]
-    """The type of packet capture.
-
-    `Simple` captures sampled packets, and `full` captures entire payloads and
-    non-sampled packets.
-    """
-
-    byte_limit: float
-    """The maximum number of bytes to capture.
-
-    This field only applies to `full` packet captures.
-    """
-
-    filter_v1: PCAPFilterParam
-    """The packet capture filter. When this field is empty, all packets are captured."""
-
-    packet_limit: float
-    """The limit of packets contained in a packet capture."""
-
-
-PCAPCreateParams = Union[MagicVisibilityPCAPsRequestSimple, MagicVisibilityPCAPsRequestFull]
diff --git a/src/cloudflare/types/pipelines/__init__.py b/src/cloudflare/types/pipelines/__init__.py
new file mode 100644
index 00000000000..f2addbdf6ee
--- /dev/null
+++ b/src/cloudflare/types/pipelines/__init__.py
@@ -0,0 +1,32 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .sink_list_params import SinkListParams as SinkListParams
+from .sink_get_response import SinkGetResponse as SinkGetResponse
+from .sink_create_params import SinkCreateParams as SinkCreateParams
+from .sink_delete_params import SinkDeleteParams as SinkDeleteParams
+from .sink_list_response import SinkListResponse as SinkListResponse
+from .stream_list_params import StreamListParams as StreamListParams
+from .stream_get_response import StreamGetResponse as StreamGetResponse
+from .pipeline_list_params import PipelineListParams as PipelineListParams
+from .sink_create_response import SinkCreateResponse as SinkCreateResponse
+from .stream_create_params import StreamCreateParams as StreamCreateParams
+from .stream_delete_params import StreamDeleteParams as StreamDeleteParams
+from .stream_list_response import StreamListResponse as StreamListResponse
+from .stream_update_params import StreamUpdateParams as StreamUpdateParams
+from .pipeline_get_response import PipelineGetResponse as PipelineGetResponse
+from .pipeline_create_params import PipelineCreateParams as PipelineCreateParams
+from .pipeline_list_response import PipelineListResponse as PipelineListResponse
+from .pipeline_update_params import PipelineUpdateParams as PipelineUpdateParams
+from .stream_create_response import StreamCreateResponse as StreamCreateResponse
+from .stream_update_response import StreamUpdateResponse as StreamUpdateResponse
+from .pipeline_list_v1_params import PipelineListV1Params as PipelineListV1Params
+from .pipeline_create_response import PipelineCreateResponse as PipelineCreateResponse
+from .pipeline_get_v1_response import PipelineGetV1Response as PipelineGetV1Response
+from .pipeline_update_response import PipelineUpdateResponse as PipelineUpdateResponse
+from .pipeline_create_v1_params import PipelineCreateV1Params as PipelineCreateV1Params
+from .pipeline_list_v1_response import PipelineListV1Response as PipelineListV1Response
+from .pipeline_create_v1_response import PipelineCreateV1Response as PipelineCreateV1Response
+from .pipeline_validate_sql_params import PipelineValidateSqlParams as PipelineValidateSqlParams
+from .pipeline_validate_sql_response import PipelineValidateSqlResponse as PipelineValidateSqlResponse
diff --git a/src/cloudflare/types/pipelines/pipeline_create_params.py b/src/cloudflare/types/pipelines/pipeline_create_params.py
new file mode 100644
index 00000000000..a89e16e3ef7
--- /dev/null
+++ b/src/cloudflare/types/pipelines/pipeline_create_params.py
@@ -0,0 +1,126 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = [
+    "PipelineCreateParams",
+    "Destination",
+    "DestinationBatch",
+    "DestinationCompression",
+    "DestinationCredentials",
+    "DestinationPath",
+    "Source",
+    "SourceCloudflarePipelinesWorkersPipelinesHTTPSource",
+    "SourceCloudflarePipelinesWorkersPipelinesHTTPSourceCORS",
+    "SourceCloudflarePipelinesWorkersPipelinesBindingSource",
+]
+
+
+class PipelineCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Specifies the public ID of the account."""
+
+    destination: Required[Destination]
+
+    name: Required[str]
+    """Defines the name of the pipeline."""
+
+    source: Required[Iterable[Source]]
+
+
+class DestinationBatch(TypedDict, total=False):
+    max_bytes: int
+    """Specifies rough maximum size of files."""
+
+    max_duration_s: float
+    """Specifies duration to wait to aggregate batches files."""
+
+    max_rows: int
+    """Specifies rough maximum number of rows per file."""
+
+
+class DestinationCompression(TypedDict, total=False):
+    type: Literal["none", "gzip", "deflate"]
+    """Specifies the desired compression algorithm and format."""
+
+
+class DestinationCredentials(TypedDict, total=False):
+    access_key_id: Required[str]
+    """Specifies the R2 Bucket Access Key Id."""
+
+    endpoint: Required[str]
+    """Specifies the R2 Endpoint."""
+
+    secret_access_key: Required[str]
+    """Specifies the R2 Bucket Secret Access Key."""
+
+
+class DestinationPath(TypedDict, total=False):
+    bucket: Required[str]
+    """Specifies the R2 Bucket to store files."""
+
+    filename: str
+    """Specifies the name pattern to for individual data files."""
+
+    filepath: str
+    """Specifies the name pattern for directory."""
+
+    prefix: str
+    """Specifies the base directory within the bucket."""
+
+
+class Destination(TypedDict, total=False):
+    batch: Required[DestinationBatch]
+
+    compression: Required[DestinationCompression]
+
+    credentials: Required[DestinationCredentials]
+
+    format: Required[Literal["json"]]
+    """Specifies the format of data to deliver."""
+
+    path: Required[DestinationPath]
+
+    type: Required[Literal["r2"]]
+    """Specifies the type of destination."""
+
+
+class SourceCloudflarePipelinesWorkersPipelinesHTTPSourceCORS(TypedDict, total=False):
+    origins: SequenceNotStr[str]
+    """Specifies allowed origins to allow Cross Origin HTTP Requests."""
+
+
+class SourceCloudflarePipelinesWorkersPipelinesHTTPSource(TypedDict, total=False):
+    """[DEPRECATED] HTTP source configuration. Use the new streams API instead."""
+
+    format: Required[Literal["json"]]
+    """Specifies the format of source data."""
+
+    type: Required[str]
+
+    authentication: bool
+    """Specifies whether authentication is required to send to this pipeline via HTTP."""
+
+    cors: SourceCloudflarePipelinesWorkersPipelinesHTTPSourceCORS
+
+
+class SourceCloudflarePipelinesWorkersPipelinesBindingSource(TypedDict, total=False):
+    """[DEPRECATED] Worker binding source configuration.
+
+    Use the new streams API instead.
+    """
+
+    format: Required[Literal["json"]]
+    """Specifies the format of source data."""
+
+    type: Required[str]
+
+
+Source: TypeAlias = Union[
+    SourceCloudflarePipelinesWorkersPipelinesHTTPSource, SourceCloudflarePipelinesWorkersPipelinesBindingSource
+]
diff --git a/src/cloudflare/types/pipelines/pipeline_create_response.py b/src/cloudflare/types/pipelines/pipeline_create_response.py
new file mode 100644
index 00000000000..296c600e0fe
--- /dev/null
+++ b/src/cloudflare/types/pipelines/pipeline_create_response.py
@@ -0,0 +1,121 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from typing_extensions import Literal, TypeAlias
+
+from ..._models import BaseModel
+
+__all__ = [
+    "PipelineCreateResponse",
+    "Destination",
+    "DestinationBatch",
+    "DestinationCompression",
+    "DestinationPath",
+    "Source",
+    "SourceCloudflarePipelinesWorkersPipelinesHTTPSource",
+    "SourceCloudflarePipelinesWorkersPipelinesHTTPSourceCORS",
+    "SourceCloudflarePipelinesWorkersPipelinesBindingSource",
+]
+
+
+class DestinationBatch(BaseModel):
+    max_bytes: int
+    """Specifies rough maximum size of files."""
+
+    max_duration_s: float
+    """Specifies duration to wait to aggregate batches files."""
+
+    max_rows: int
+    """Specifies rough maximum number of rows per file."""
+
+
+class DestinationCompression(BaseModel):
+    type: Literal["none", "gzip", "deflate"]
+    """Specifies the desired compression algorithm and format."""
+
+
+class DestinationPath(BaseModel):
+    bucket: str
+    """Specifies the R2 Bucket to store files."""
+
+    filename: Optional[str] = None
+    """Specifies the name pattern to for individual data files."""
+
+    filepath: Optional[str] = None
+    """Specifies the name pattern for directory."""
+
+    prefix: Optional[str] = None
+    """Specifies the base directory within the bucket."""
+
+
+class Destination(BaseModel):
+    batch: DestinationBatch
+
+    compression: DestinationCompression
+
+    format: Literal["json"]
+    """Specifies the format of data to deliver."""
+
+    path: DestinationPath
+
+    type: Literal["r2"]
+    """Specifies the type of destination."""
+
+
+class SourceCloudflarePipelinesWorkersPipelinesHTTPSourceCORS(BaseModel):
+    origins: Optional[List[str]] = None
+    """Specifies allowed origins to allow Cross Origin HTTP Requests."""
+
+
+class SourceCloudflarePipelinesWorkersPipelinesHTTPSource(BaseModel):
+    """[DEPRECATED] HTTP source configuration. Use the new streams API instead."""
+
+    format: Literal["json"]
+    """Specifies the format of source data."""
+
+    type: str
+
+    authentication: Optional[bool] = None
+    """Specifies whether authentication is required to send to this pipeline via HTTP."""
+
+    cors: Optional[SourceCloudflarePipelinesWorkersPipelinesHTTPSourceCORS] = None
+
+
+class SourceCloudflarePipelinesWorkersPipelinesBindingSource(BaseModel):
+    """[DEPRECATED] Worker binding source configuration.
+
+    Use the new streams API instead.
+    """
+
+    format: Literal["json"]
+    """Specifies the format of source data."""
+
+    type: str
+
+
+Source: TypeAlias = Union[
+    SourceCloudflarePipelinesWorkersPipelinesHTTPSource, SourceCloudflarePipelinesWorkersPipelinesBindingSource
+]
+
+
+class PipelineCreateResponse(BaseModel):
+    """[DEPRECATED] Describes the configuration of a pipeline.
+
+    Use the new streams/sinks/pipelines API instead.
+    """
+
+    id: str
+    """Specifies the pipeline identifier."""
+
+    destination: Destination
+
+    endpoint: str
+    """Indicates the endpoint URL to send traffic."""
+
+    name: str
+    """Defines the name of the pipeline."""
+
+    source: List[Source]
+
+    version: float
+    """Indicates the version number of last saved configuration."""
diff --git a/src/cloudflare/types/pipelines/pipeline_create_v1_params.py b/src/cloudflare/types/pipelines/pipeline_create_v1_params.py
new file mode 100644
index 00000000000..46ea0952d42
--- /dev/null
+++ b/src/cloudflare/types/pipelines/pipeline_create_v1_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["PipelineCreateV1Params"]
+
+
+class PipelineCreateV1Params(TypedDict, total=False):
+    account_id: Required[str]
+    """Specifies the public ID of the account."""
+
+    name: Required[str]
+    """Specifies the name of the Pipeline."""
+
+    sql: Required[str]
+    """Specifies SQL for the Pipeline processing flow."""
diff --git a/src/cloudflare/types/pipelines/pipeline_create_v1_response.py b/src/cloudflare/types/pipelines/pipeline_create_v1_response.py
new file mode 100644
index 00000000000..45224e8967b
--- /dev/null
+++ b/src/cloudflare/types/pipelines/pipeline_create_v1_response.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["PipelineCreateV1Response"]
+
+
+class PipelineCreateV1Response(BaseModel):
+    id: str
+    """Indicates a unique identifier for this pipeline."""
+
+    created_at: str
+
+    modified_at: str
+
+    name: str
+    """Indicates the name of the Pipeline."""
+
+    sql: str
+    """Specifies SQL for the Pipeline processing flow."""
+
+    status: str
+    """Indicates the current status of the Pipeline."""
diff --git a/src/cloudflare/types/pipelines/pipeline_get_response.py b/src/cloudflare/types/pipelines/pipeline_get_response.py
new file mode 100644
index 00000000000..e7b2f8f4cfb
--- /dev/null
+++ b/src/cloudflare/types/pipelines/pipeline_get_response.py
@@ -0,0 +1,121 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from typing_extensions import Literal, TypeAlias
+
+from ..._models import BaseModel
+
+__all__ = [
+    "PipelineGetResponse",
+    "Destination",
+    "DestinationBatch",
+    "DestinationCompression",
+    "DestinationPath",
+    "Source",
+    "SourceCloudflarePipelinesWorkersPipelinesHTTPSource",
+    "SourceCloudflarePipelinesWorkersPipelinesHTTPSourceCORS",
+    "SourceCloudflarePipelinesWorkersPipelinesBindingSource",
+]
+
+
+class DestinationBatch(BaseModel):
+    max_bytes: int
+    """Specifies rough maximum size of files."""
+
+    max_duration_s: float
+    """Specifies duration to wait to aggregate batches files."""
+
+    max_rows: int
+    """Specifies rough maximum number of rows per file."""
+
+
+class DestinationCompression(BaseModel):
+    type: Literal["none", "gzip", "deflate"]
+    """Specifies the desired compression algorithm and format."""
+
+
+class DestinationPath(BaseModel):
+    bucket: str
+    """Specifies the R2 Bucket to store files."""
+
+    filename: Optional[str] = None
+    """Specifies the name pattern to for individual data files."""
+
+    filepath: Optional[str] = None
+    """Specifies the name pattern for directory."""
+
+    prefix: Optional[str] = None
+    """Specifies the base directory within the bucket."""
+
+
+class Destination(BaseModel):
+    batch: DestinationBatch
+
+    compression: DestinationCompression
+
+    format: Literal["json"]
+    """Specifies the format of data to deliver."""
+
+    path: DestinationPath
+
+    type: Literal["r2"]
+    """Specifies the type of destination."""
+
+
+class SourceCloudflarePipelinesWorkersPipelinesHTTPSourceCORS(BaseModel):
+    origins: Optional[List[str]] = None
+    """Specifies allowed origins to allow Cross Origin HTTP Requests."""
+
+
+class SourceCloudflarePipelinesWorkersPipelinesHTTPSource(BaseModel):
+    """[DEPRECATED] HTTP source configuration. Use the new streams API instead."""
+
+    format: Literal["json"]
+    """Specifies the format of source data."""
+
+    type: str
+
+    authentication: Optional[bool] = None
+    """Specifies whether authentication is required to send to this pipeline via HTTP."""
+
+    cors: Optional[SourceCloudflarePipelinesWorkersPipelinesHTTPSourceCORS] = None
+
+
+class SourceCloudflarePipelinesWorkersPipelinesBindingSource(BaseModel):
+    """[DEPRECATED] Worker binding source configuration.
+
+    Use the new streams API instead.
+    """
+
+    format: Literal["json"]
+    """Specifies the format of source data."""
+
+    type: str
+
+
+Source: TypeAlias = Union[
+    SourceCloudflarePipelinesWorkersPipelinesHTTPSource, SourceCloudflarePipelinesWorkersPipelinesBindingSource
+]
+
+
+class PipelineGetResponse(BaseModel):
+    """[DEPRECATED] Describes the configuration of a pipeline.
+
+    Use the new streams/sinks/pipelines API instead.
+    """
+
+    id: str
+    """Specifies the pipeline identifier."""
+
+    destination: Destination
+
+    endpoint: str
+    """Indicates the endpoint URL to send traffic."""
+
+    name: str
+    """Defines the name of the pipeline."""
+
+    source: List[Source]
+
+    version: float
+    """Indicates the version number of last saved configuration."""
diff --git a/src/cloudflare/types/pipelines/pipeline_get_v1_response.py b/src/cloudflare/types/pipelines/pipeline_get_v1_response.py
new file mode 100644
index 00000000000..2875f326fc2
--- /dev/null
+++ b/src/cloudflare/types/pipelines/pipeline_get_v1_response.py
@@ -0,0 +1,46 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["PipelineGetV1Response", "Table"]
+
+
+class Table(BaseModel):
+    id: str
+    """Unique identifier for the connection (stream or sink)."""
+
+    latest: int
+    """Latest available version of the connection."""
+
+    name: str
+    """Name of the connection."""
+
+    type: Literal["stream", "sink"]
+    """Type of the connection."""
+
+    version: int
+    """Current version of the connection used by this pipeline."""
+
+
+class PipelineGetV1Response(BaseModel):
+    id: str
+    """Indicates a unique identifier for this pipeline."""
+
+    created_at: str
+
+    modified_at: str
+
+    name: str
+    """Indicates the name of the Pipeline."""
+
+    sql: str
+    """Specifies SQL for the Pipeline processing flow."""
+
+    status: str
+    """Indicates the current status of the Pipeline."""
+
+    tables: List[Table]
+    """List of streams and sinks used by this pipeline."""
diff --git a/src/cloudflare/types/pipelines/pipeline_list_params.py b/src/cloudflare/types/pipelines/pipeline_list_params.py
new file mode 100644
index 00000000000..85790ebefd2
--- /dev/null
+++ b/src/cloudflare/types/pipelines/pipeline_list_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["PipelineListParams"]
+
+
+class PipelineListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Specifies the public ID of the account."""
+
+    page: str
+    """Specifies which page to retrieve."""
+
+    per_page: str
+    """Specifies the number of pipelines per page."""
+
+    search: str
+    """Specifies the prefix of pipeline name to search."""
diff --git a/src/cloudflare/types/pipelines/pipeline_list_response.py b/src/cloudflare/types/pipelines/pipeline_list_response.py
new file mode 100644
index 00000000000..5ff89c1a29c
--- /dev/null
+++ b/src/cloudflare/types/pipelines/pipeline_list_response.py
@@ -0,0 +1,147 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from typing_extensions import Literal, TypeAlias
+
+from ..._models import BaseModel
+
+__all__ = [
+    "PipelineListResponse",
+    "ResultInfo",
+    "Result",
+    "ResultDestination",
+    "ResultDestinationBatch",
+    "ResultDestinationCompression",
+    "ResultDestinationPath",
+    "ResultSource",
+    "ResultSourceCloudflarePipelinesWorkersPipelinesHTTPSource",
+    "ResultSourceCloudflarePipelinesWorkersPipelinesHTTPSourceCORS",
+    "ResultSourceCloudflarePipelinesWorkersPipelinesBindingSource",
+]
+
+
+class ResultInfo(BaseModel):
+    count: float
+    """Indicates the number of items on current page."""
+
+    page: float
+    """Indicates the current page number."""
+
+    per_page: float
+    """Indicates the number of items per page."""
+
+    total_count: float
+    """Indicates the total number of items."""
+
+
+class ResultDestinationBatch(BaseModel):
+    max_bytes: int
+    """Specifies rough maximum size of files."""
+
+    max_duration_s: float
+    """Specifies duration to wait to aggregate batches files."""
+
+    max_rows: int
+    """Specifies rough maximum number of rows per file."""
+
+
+class ResultDestinationCompression(BaseModel):
+    type: Literal["none", "gzip", "deflate"]
+    """Specifies the desired compression algorithm and format."""
+
+
+class ResultDestinationPath(BaseModel):
+    bucket: str
+    """Specifies the R2 Bucket to store files."""
+
+    filename: Optional[str] = None
+    """Specifies the name pattern to for individual data files."""
+
+    filepath: Optional[str] = None
+    """Specifies the name pattern for directory."""
+
+    prefix: Optional[str] = None
+    """Specifies the base directory within the bucket."""
+
+
+class ResultDestination(BaseModel):
+    batch: ResultDestinationBatch
+
+    compression: ResultDestinationCompression
+
+    format: Literal["json"]
+    """Specifies the format of data to deliver."""
+
+    path: ResultDestinationPath
+
+    type: Literal["r2"]
+    """Specifies the type of destination."""
+
+
+class ResultSourceCloudflarePipelinesWorkersPipelinesHTTPSourceCORS(BaseModel):
+    origins: Optional[List[str]] = None
+    """Specifies allowed origins to allow Cross Origin HTTP Requests."""
+
+
+class ResultSourceCloudflarePipelinesWorkersPipelinesHTTPSource(BaseModel):
+    """[DEPRECATED] HTTP source configuration. Use the new streams API instead."""
+
+    format: Literal["json"]
+    """Specifies the format of source data."""
+
+    type: str
+
+    authentication: Optional[bool] = None
+    """Specifies whether authentication is required to send to this pipeline via HTTP."""
+
+    cors: Optional[ResultSourceCloudflarePipelinesWorkersPipelinesHTTPSourceCORS] = None
+
+
+class ResultSourceCloudflarePipelinesWorkersPipelinesBindingSource(BaseModel):
+    """[DEPRECATED] Worker binding source configuration.
+
+    Use the new streams API instead.
+    """
+
+    format: Literal["json"]
+    """Specifies the format of source data."""
+
+    type: str
+
+
+ResultSource: TypeAlias = Union[
+    ResultSourceCloudflarePipelinesWorkersPipelinesHTTPSource,
+    ResultSourceCloudflarePipelinesWorkersPipelinesBindingSource,
+]
+
+
+class Result(BaseModel):
+    """[DEPRECATED] Describes the configuration of a pipeline.
+
+    Use the new streams/sinks/pipelines API instead.
+    """
+
+    id: str
+    """Specifies the pipeline identifier."""
+
+    destination: ResultDestination
+
+    endpoint: str
+    """Indicates the endpoint URL to send traffic."""
+
+    name: str
+    """Defines the name of the pipeline."""
+
+    source: List[ResultSource]
+
+    version: float
+    """Indicates the version number of last saved configuration."""
+
+
+class PipelineListResponse(BaseModel):
+    result_info: ResultInfo
+
+    results: List[Result]
+
+    success: bool
+    """Indicates whether the API call was successful."""
diff --git a/src/cloudflare/types/pipelines/pipeline_list_v1_params.py b/src/cloudflare/types/pipelines/pipeline_list_v1_params.py
new file mode 100644
index 00000000000..47cc727832a
--- /dev/null
+++ b/src/cloudflare/types/pipelines/pipeline_list_v1_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["PipelineListV1Params"]
+
+
+class PipelineListV1Params(TypedDict, total=False):
+    account_id: Required[str]
+    """Specifies the public ID of the account."""
+
+    page: float
+
+    per_page: float
diff --git a/src/cloudflare/types/pipelines/pipeline_list_v1_response.py b/src/cloudflare/types/pipelines/pipeline_list_v1_response.py
new file mode 100644
index 00000000000..1a5dad38407
--- /dev/null
+++ b/src/cloudflare/types/pipelines/pipeline_list_v1_response.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["PipelineListV1Response"]
+
+
+class PipelineListV1Response(BaseModel):
+    id: str
+    """Indicates a unique identifier for this pipeline."""
+
+    created_at: str
+
+    modified_at: str
+
+    name: str
+    """Indicates the name of the Pipeline."""
+
+    sql: str
+    """Specifies SQL for the Pipeline processing flow."""
+
+    status: str
+    """Indicates the current status of the Pipeline."""
diff --git a/src/cloudflare/types/pipelines/pipeline_update_params.py b/src/cloudflare/types/pipelines/pipeline_update_params.py
new file mode 100644
index 00000000000..fa8979811cf
--- /dev/null
+++ b/src/cloudflare/types/pipelines/pipeline_update_params.py
@@ -0,0 +1,126 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = [
+    "PipelineUpdateParams",
+    "Destination",
+    "DestinationBatch",
+    "DestinationCompression",
+    "DestinationPath",
+    "DestinationCredentials",
+    "Source",
+    "SourceCloudflarePipelinesWorkersPipelinesHTTPSource",
+    "SourceCloudflarePipelinesWorkersPipelinesHTTPSourceCORS",
+    "SourceCloudflarePipelinesWorkersPipelinesBindingSource",
+]
+
+
+class PipelineUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Specifies the public ID of the account."""
+
+    destination: Required[Destination]
+
+    name: Required[str]
+    """Defines the name of the pipeline."""
+
+    source: Required[Iterable[Source]]
+
+
+class DestinationBatch(TypedDict, total=False):
+    max_bytes: int
+    """Specifies rough maximum size of files."""
+
+    max_duration_s: float
+    """Specifies duration to wait to aggregate batches files."""
+
+    max_rows: int
+    """Specifies rough maximum number of rows per file."""
+
+
+class DestinationCompression(TypedDict, total=False):
+    type: Literal["none", "gzip", "deflate"]
+    """Specifies the desired compression algorithm and format."""
+
+
+class DestinationPath(TypedDict, total=False):
+    bucket: Required[str]
+    """Specifies the R2 Bucket to store files."""
+
+    filename: str
+    """Specifies the name pattern to for individual data files."""
+
+    filepath: str
+    """Specifies the name pattern for directory."""
+
+    prefix: str
+    """Specifies the base directory within the bucket."""
+
+
+class DestinationCredentials(TypedDict, total=False):
+    access_key_id: Required[str]
+    """Specifies the R2 Bucket Access Key Id."""
+
+    endpoint: Required[str]
+    """Specifies the R2 Endpoint."""
+
+    secret_access_key: Required[str]
+    """Specifies the R2 Bucket Secret Access Key."""
+
+
+class Destination(TypedDict, total=False):
+    batch: Required[DestinationBatch]
+
+    compression: Required[DestinationCompression]
+
+    format: Required[Literal["json"]]
+    """Specifies the format of data to deliver."""
+
+    path: Required[DestinationPath]
+
+    type: Required[Literal["r2"]]
+    """Specifies the type of destination."""
+
+    credentials: DestinationCredentials
+
+
+class SourceCloudflarePipelinesWorkersPipelinesHTTPSourceCORS(TypedDict, total=False):
+    origins: SequenceNotStr[str]
+    """Specifies allowed origins to allow Cross Origin HTTP Requests."""
+
+
+class SourceCloudflarePipelinesWorkersPipelinesHTTPSource(TypedDict, total=False):
+    """[DEPRECATED] HTTP source configuration. Use the new streams API instead."""
+
+    format: Required[Literal["json"]]
+    """Specifies the format of source data."""
+
+    type: Required[str]
+
+    authentication: bool
+    """Specifies whether authentication is required to send to this pipeline via HTTP."""
+
+    cors: SourceCloudflarePipelinesWorkersPipelinesHTTPSourceCORS
+
+
+class SourceCloudflarePipelinesWorkersPipelinesBindingSource(TypedDict, total=False):
+    """[DEPRECATED] Worker binding source configuration.
+
+    Use the new streams API instead.
+    """
+
+    format: Required[Literal["json"]]
+    """Specifies the format of source data."""
+
+    type: Required[str]
+
+
+Source: TypeAlias = Union[
+    SourceCloudflarePipelinesWorkersPipelinesHTTPSource, SourceCloudflarePipelinesWorkersPipelinesBindingSource
+]
diff --git a/src/cloudflare/types/pipelines/pipeline_update_response.py b/src/cloudflare/types/pipelines/pipeline_update_response.py
new file mode 100644
index 00000000000..3cabd0732e4
--- /dev/null
+++ b/src/cloudflare/types/pipelines/pipeline_update_response.py
@@ -0,0 +1,121 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from typing_extensions import Literal, TypeAlias
+
+from ..._models import BaseModel
+
+__all__ = [
+    "PipelineUpdateResponse",
+    "Destination",
+    "DestinationBatch",
+    "DestinationCompression",
+    "DestinationPath",
+    "Source",
+    "SourceCloudflarePipelinesWorkersPipelinesHTTPSource",
+    "SourceCloudflarePipelinesWorkersPipelinesHTTPSourceCORS",
+    "SourceCloudflarePipelinesWorkersPipelinesBindingSource",
+]
+
+
+class DestinationBatch(BaseModel):
+    max_bytes: int
+    """Specifies rough maximum size of files."""
+
+    max_duration_s: float
+    """Specifies duration to wait to aggregate batches files."""
+
+    max_rows: int
+    """Specifies rough maximum number of rows per file."""
+
+
+class DestinationCompression(BaseModel):
+    type: Literal["none", "gzip", "deflate"]
+    """Specifies the desired compression algorithm and format."""
+
+
+class DestinationPath(BaseModel):
+    bucket: str
+    """Specifies the R2 Bucket to store files."""
+
+    filename: Optional[str] = None
+    """Specifies the name pattern to for individual data files."""
+
+    filepath: Optional[str] = None
+    """Specifies the name pattern for directory."""
+
+    prefix: Optional[str] = None
+    """Specifies the base directory within the bucket."""
+
+
+class Destination(BaseModel):
+    batch: DestinationBatch
+
+    compression: DestinationCompression
+
+    format: Literal["json"]
+    """Specifies the format of data to deliver."""
+
+    path: DestinationPath
+
+    type: Literal["r2"]
+    """Specifies the type of destination."""
+
+
+class SourceCloudflarePipelinesWorkersPipelinesHTTPSourceCORS(BaseModel):
+    origins: Optional[List[str]] = None
+    """Specifies allowed origins to allow Cross Origin HTTP Requests."""
+
+
+class SourceCloudflarePipelinesWorkersPipelinesHTTPSource(BaseModel):
+    """[DEPRECATED] HTTP source configuration. Use the new streams API instead."""
+
+    format: Literal["json"]
+    """Specifies the format of source data."""
+
+    type: str
+
+    authentication: Optional[bool] = None
+    """Specifies whether authentication is required to send to this pipeline via HTTP."""
+
+    cors: Optional[SourceCloudflarePipelinesWorkersPipelinesHTTPSourceCORS] = None
+
+
+class SourceCloudflarePipelinesWorkersPipelinesBindingSource(BaseModel):
+    """[DEPRECATED] Worker binding source configuration.
+
+    Use the new streams API instead.
+    """
+
+    format: Literal["json"]
+    """Specifies the format of source data."""
+
+    type: str
+
+
+Source: TypeAlias = Union[
+    SourceCloudflarePipelinesWorkersPipelinesHTTPSource, SourceCloudflarePipelinesWorkersPipelinesBindingSource
+]
+
+
+class PipelineUpdateResponse(BaseModel):
+    """[DEPRECATED] Describes the configuration of a pipeline.
+
+    Use the new streams/sinks/pipelines API instead.
+    """
+
+    id: str
+    """Specifies the pipeline identifier."""
+
+    destination: Destination
+
+    endpoint: str
+    """Indicates the endpoint URL to send traffic."""
+
+    name: str
+    """Defines the name of the pipeline."""
+
+    source: List[Source]
+
+    version: float
+    """Indicates the version number of last saved configuration."""
diff --git a/src/cloudflare/types/pipelines/pipeline_validate_sql_params.py b/src/cloudflare/types/pipelines/pipeline_validate_sql_params.py
new file mode 100644
index 00000000000..99043e42118
--- /dev/null
+++ b/src/cloudflare/types/pipelines/pipeline_validate_sql_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["PipelineValidateSqlParams"]
+
+
+class PipelineValidateSqlParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Specifies the public ID of the account."""
+
+    sql: Required[str]
+    """Specifies SQL to validate."""
diff --git a/src/cloudflare/types/pipelines/pipeline_validate_sql_response.py b/src/cloudflare/types/pipelines/pipeline_validate_sql_response.py
new file mode 100644
index 00000000000..8deed63b463
--- /dev/null
+++ b/src/cloudflare/types/pipelines/pipeline_validate_sql_response.py
@@ -0,0 +1,52 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["PipelineValidateSqlResponse", "Tables", "Graph", "GraphEdge", "GraphNode"]
+
+
+class Tables(BaseModel):
+    id: str
+
+    name: str
+
+    type: str
+
+    version: float
+
+
+class GraphEdge(BaseModel):
+    dest_id: int
+
+    edge_type: str
+
+    key_type: str
+
+    src_id: int
+
+    value_type: str
+
+
+class GraphNode(BaseModel):
+    description: str
+
+    node_id: int
+
+    operator: str
+
+    parallelism: int
+
+
+class Graph(BaseModel):
+    edges: List[GraphEdge]
+
+    nodes: List[GraphNode]
+
+
+class PipelineValidateSqlResponse(BaseModel):
+    tables: Dict[str, Tables]
+    """Indicates tables involved in the processing."""
+
+    graph: Optional[Graph] = None
diff --git a/src/cloudflare/types/pipelines/sink_create_params.py b/src/cloudflare/types/pipelines/sink_create_params.py
new file mode 100644
index 00000000000..fa0e23c63b1
--- /dev/null
+++ b/src/cloudflare/types/pipelines/sink_create_params.py
@@ -0,0 +1,362 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+__all__ = [
+    "SinkCreateParams",
+    "Config",
+    "ConfigCloudflarePipelinesR2Table",
+    "ConfigCloudflarePipelinesR2TableCredentials",
+    "ConfigCloudflarePipelinesR2TableFileNaming",
+    "ConfigCloudflarePipelinesR2TablePartitioning",
+    "ConfigCloudflarePipelinesR2TableRollingPolicy",
+    "ConfigCloudflarePipelinesR2DataCatalogTable",
+    "ConfigCloudflarePipelinesR2DataCatalogTableRollingPolicy",
+    "Format",
+    "FormatJson",
+    "FormatParquet",
+    "Schema",
+    "SchemaField",
+    "SchemaFieldInt32",
+    "SchemaFieldInt64",
+    "SchemaFieldFloat32",
+    "SchemaFieldFloat64",
+    "SchemaFieldBool",
+    "SchemaFieldString",
+    "SchemaFieldBinary",
+    "SchemaFieldTimestamp",
+    "SchemaFieldJson",
+    "SchemaFieldStruct",
+    "SchemaFieldList",
+    "SchemaFormat",
+    "SchemaFormatJson",
+    "SchemaFormatParquet",
+]
+
+
+class SinkCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Specifies the public ID of the account."""
+
+    name: Required[str]
+    """Defines the name of the Sink."""
+
+    type: Required[Literal["r2", "r2_data_catalog"]]
+    """Specifies the type of sink."""
+
+    config: Config
+    """Defines the configuration of the R2 Sink."""
+
+    format: Format
+
+    schema: Schema
+
+
+class ConfigCloudflarePipelinesR2TableCredentials(TypedDict, total=False):
+    access_key_id: Required[str]
+    """Cloudflare Account ID for the bucket"""
+
+    secret_access_key: Required[str]
+    """Cloudflare Account ID for the bucket"""
+
+
+class ConfigCloudflarePipelinesR2TableFileNaming(TypedDict, total=False):
+    """Controls filename prefix/suffix and strategy."""
+
+    prefix: str
+    """The prefix to use in file name. i.e prefix-<uuid>.parquet"""
+
+    strategy: Literal["serial", "uuid", "uuid_v7", "ulid"]
+    """Filename generation strategy."""
+
+    suffix: str
+    """This will overwrite the default file suffix. i.e .parquet, use with caution"""
+
+
+class ConfigCloudflarePipelinesR2TablePartitioning(TypedDict, total=False):
+    """Data-layout partitioning for sinks."""
+
+    time_pattern: str
+    """The pattern of the date string"""
+
+
+class ConfigCloudflarePipelinesR2TableRollingPolicy(TypedDict, total=False):
+    """Rolling policy for file sinks (when & why to close a file and open a new one)."""
+
+    file_size_bytes: int
+    """Files will be rolled after reaching this number of bytes"""
+
+    inactivity_seconds: int
+    """Number of seconds of inactivity to wait before rolling over to a new file"""
+
+    interval_seconds: int
+    """Number of seconds to wait before rolling over to a new file"""
+
+
+class ConfigCloudflarePipelinesR2Table(TypedDict, total=False):
+    account_id: Required[str]
+    """Cloudflare Account ID for the bucket"""
+
+    bucket: Required[str]
+    """R2 Bucket to write to"""
+
+    credentials: Required[ConfigCloudflarePipelinesR2TableCredentials]
+
+    file_naming: ConfigCloudflarePipelinesR2TableFileNaming
+    """Controls filename prefix/suffix and strategy."""
+
+    jurisdiction: str
+    """Jurisdiction this bucket is hosted in"""
+
+    partitioning: ConfigCloudflarePipelinesR2TablePartitioning
+    """Data-layout partitioning for sinks."""
+
+    path: str
+    """Subpath within the bucket to write to"""
+
+    rolling_policy: ConfigCloudflarePipelinesR2TableRollingPolicy
+    """Rolling policy for file sinks (when & why to close a file and open a new one)."""
+
+
+class ConfigCloudflarePipelinesR2DataCatalogTableRollingPolicy(TypedDict, total=False):
+    """Rolling policy for file sinks (when & why to close a file and open a new one)."""
+
+    file_size_bytes: int
+    """Files will be rolled after reaching this number of bytes"""
+
+    inactivity_seconds: int
+    """Number of seconds of inactivity to wait before rolling over to a new file"""
+
+    interval_seconds: int
+    """Number of seconds to wait before rolling over to a new file"""
+
+
+class ConfigCloudflarePipelinesR2DataCatalogTable(TypedDict, total=False):
+    """R2 Data Catalog Sink"""
+
+    token: Required[str]
+    """Authentication token"""
+
+    account_id: Required[str]
+    """Cloudflare Account ID"""
+
+    bucket: Required[str]
+    """The R2 Bucket that hosts this catalog"""
+
+    table_name: Required[str]
+    """Table name"""
+
+    namespace: str
+    """Table namespace"""
+
+    rolling_policy: ConfigCloudflarePipelinesR2DataCatalogTableRollingPolicy
+    """Rolling policy for file sinks (when & why to close a file and open a new one)."""
+
+
+Config: TypeAlias = Union[ConfigCloudflarePipelinesR2Table, ConfigCloudflarePipelinesR2DataCatalogTable]
+
+
+class FormatJson(TypedDict, total=False):
+    type: Required[Literal["json"]]
+
+    decimal_encoding: Literal["number", "string", "bytes"]
+
+    timestamp_format: Literal["rfc3339", "unix_millis"]
+
+    unstructured: bool
+
+
+class FormatParquet(TypedDict, total=False):
+    type: Required[Literal["parquet"]]
+
+    compression: Literal["uncompressed", "snappy", "gzip", "zstd", "lz4"]
+
+    row_group_bytes: Optional[int]
+
+
+Format: TypeAlias = Union[FormatJson, FormatParquet]
+
+
+class SchemaFieldInt32(TypedDict, total=False):
+    type: Required[Literal["int32"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+
+class SchemaFieldInt64(TypedDict, total=False):
+    type: Required[Literal["int64"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+
+class SchemaFieldFloat32(TypedDict, total=False):
+    type: Required[Literal["float32"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+
+class SchemaFieldFloat64(TypedDict, total=False):
+    type: Required[Literal["float64"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+
+class SchemaFieldBool(TypedDict, total=False):
+    type: Required[Literal["bool"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+
+class SchemaFieldString(TypedDict, total=False):
+    type: Required[Literal["string"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+
+class SchemaFieldBinary(TypedDict, total=False):
+    type: Required[Literal["binary"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+
+class SchemaFieldTimestamp(TypedDict, total=False):
+    type: Required[Literal["timestamp"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+    unit: Literal["second", "millisecond", "microsecond", "nanosecond"]
+
+
+class SchemaFieldJson(TypedDict, total=False):
+    type: Required[Literal["json"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+
+class SchemaFieldStruct(TypedDict, total=False):
+    type: Required[Literal["struct"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+    fields: Optional[List["SchemaField"]]
+
+
+class SchemaFieldList(TypedDict, total=False):
+    type: Required[Literal["list"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+    element: Optional["SchemaField"]
+
+
+SchemaField: TypeAlias = Union[
+    SchemaFieldInt32,
+    SchemaFieldInt64,
+    SchemaFieldFloat32,
+    SchemaFieldFloat64,
+    SchemaFieldBool,
+    SchemaFieldString,
+    SchemaFieldBinary,
+    SchemaFieldTimestamp,
+    SchemaFieldJson,
+    SchemaFieldStruct,
+    SchemaFieldList,
+]
+
+
+class SchemaFormatJson(TypedDict, total=False):
+    type: Required[Literal["json"]]
+
+    decimal_encoding: Literal["number", "string", "bytes"]
+
+    timestamp_format: Literal["rfc3339", "unix_millis"]
+
+    unstructured: bool
+
+
+class SchemaFormatParquet(TypedDict, total=False):
+    type: Required[Literal["parquet"]]
+
+    compression: Literal["uncompressed", "snappy", "gzip", "zstd", "lz4"]
+
+    row_group_bytes: Optional[int]
+
+
+SchemaFormat: TypeAlias = Union[SchemaFormatJson, SchemaFormatParquet]
+
+
+class Schema(TypedDict, total=False):
+    fields: Iterable[SchemaField]
+
+    format: SchemaFormat
+
+    inferred: Optional[bool]
diff --git a/src/cloudflare/types/pipelines/sink_create_response.py b/src/cloudflare/types/pipelines/sink_create_response.py
new file mode 100644
index 00000000000..cc00550df8d
--- /dev/null
+++ b/src/cloudflare/types/pipelines/sink_create_response.py
@@ -0,0 +1,373 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._utils import PropertyInfo
+from ..._models import BaseModel
+
+__all__ = [
+    "SinkCreateResponse",
+    "Config",
+    "ConfigCloudflarePipelinesR2Table",
+    "ConfigCloudflarePipelinesR2TableCredentials",
+    "ConfigCloudflarePipelinesR2TableFileNaming",
+    "ConfigCloudflarePipelinesR2TablePartitioning",
+    "ConfigCloudflarePipelinesR2TableRollingPolicy",
+    "ConfigCloudflarePipelinesR2DataCatalogTable",
+    "ConfigCloudflarePipelinesR2DataCatalogTableRollingPolicy",
+    "Format",
+    "FormatJson",
+    "FormatParquet",
+    "Schema",
+    "SchemaField",
+    "SchemaFieldInt32",
+    "SchemaFieldInt64",
+    "SchemaFieldFloat32",
+    "SchemaFieldFloat64",
+    "SchemaFieldBool",
+    "SchemaFieldString",
+    "SchemaFieldBinary",
+    "SchemaFieldTimestamp",
+    "SchemaFieldJson",
+    "SchemaFieldStruct",
+    "SchemaFieldList",
+    "SchemaFormat",
+    "SchemaFormatJson",
+    "SchemaFormatParquet",
+]
+
+
+class ConfigCloudflarePipelinesR2TableCredentials(BaseModel):
+    access_key_id: str
+    """Cloudflare Account ID for the bucket"""
+
+    secret_access_key: str
+    """Cloudflare Account ID for the bucket"""
+
+
+class ConfigCloudflarePipelinesR2TableFileNaming(BaseModel):
+    """Controls filename prefix/suffix and strategy."""
+
+    prefix: Optional[str] = None
+    """The prefix to use in file name. i.e prefix-<uuid>.parquet"""
+
+    strategy: Optional[Literal["serial", "uuid", "uuid_v7", "ulid"]] = None
+    """Filename generation strategy."""
+
+    suffix: Optional[str] = None
+    """This will overwrite the default file suffix. i.e .parquet, use with caution"""
+
+
+class ConfigCloudflarePipelinesR2TablePartitioning(BaseModel):
+    """Data-layout partitioning for sinks."""
+
+    time_pattern: Optional[str] = None
+    """The pattern of the date string"""
+
+
+class ConfigCloudflarePipelinesR2TableRollingPolicy(BaseModel):
+    """Rolling policy for file sinks (when & why to close a file and open a new one)."""
+
+    file_size_bytes: Optional[int] = None
+    """Files will be rolled after reaching this number of bytes"""
+
+    inactivity_seconds: Optional[int] = None
+    """Number of seconds of inactivity to wait before rolling over to a new file"""
+
+    interval_seconds: Optional[int] = None
+    """Number of seconds to wait before rolling over to a new file"""
+
+
+class ConfigCloudflarePipelinesR2Table(BaseModel):
+    account_id: str
+    """Cloudflare Account ID for the bucket"""
+
+    bucket: str
+    """R2 Bucket to write to"""
+
+    credentials: ConfigCloudflarePipelinesR2TableCredentials
+
+    file_naming: Optional[ConfigCloudflarePipelinesR2TableFileNaming] = None
+    """Controls filename prefix/suffix and strategy."""
+
+    jurisdiction: Optional[str] = None
+    """Jurisdiction this bucket is hosted in"""
+
+    partitioning: Optional[ConfigCloudflarePipelinesR2TablePartitioning] = None
+    """Data-layout partitioning for sinks."""
+
+    path: Optional[str] = None
+    """Subpath within the bucket to write to"""
+
+    rolling_policy: Optional[ConfigCloudflarePipelinesR2TableRollingPolicy] = None
+    """Rolling policy for file sinks (when & why to close a file and open a new one)."""
+
+
+class ConfigCloudflarePipelinesR2DataCatalogTableRollingPolicy(BaseModel):
+    """Rolling policy for file sinks (when & why to close a file and open a new one)."""
+
+    file_size_bytes: Optional[int] = None
+    """Files will be rolled after reaching this number of bytes"""
+
+    inactivity_seconds: Optional[int] = None
+    """Number of seconds of inactivity to wait before rolling over to a new file"""
+
+    interval_seconds: Optional[int] = None
+    """Number of seconds to wait before rolling over to a new file"""
+
+
+class ConfigCloudflarePipelinesR2DataCatalogTable(BaseModel):
+    """R2 Data Catalog Sink"""
+
+    token: str
+    """Authentication token"""
+
+    account_id: str
+    """Cloudflare Account ID"""
+
+    bucket: str
+    """The R2 Bucket that hosts this catalog"""
+
+    table_name: str
+    """Table name"""
+
+    namespace: Optional[str] = None
+    """Table namespace"""
+
+    rolling_policy: Optional[ConfigCloudflarePipelinesR2DataCatalogTableRollingPolicy] = None
+    """Rolling policy for file sinks (when & why to close a file and open a new one)."""
+
+
+Config: TypeAlias = Union[ConfigCloudflarePipelinesR2Table, ConfigCloudflarePipelinesR2DataCatalogTable]
+
+
+class FormatJson(BaseModel):
+    type: Literal["json"]
+
+    decimal_encoding: Optional[Literal["number", "string", "bytes"]] = None
+
+    timestamp_format: Optional[Literal["rfc3339", "unix_millis"]] = None
+
+    unstructured: Optional[bool] = None
+
+
+class FormatParquet(BaseModel):
+    type: Literal["parquet"]
+
+    compression: Optional[Literal["uncompressed", "snappy", "gzip", "zstd", "lz4"]] = None
+
+    row_group_bytes: Optional[int] = None
+
+
+Format: TypeAlias = Annotated[Union[FormatJson, FormatParquet], PropertyInfo(discriminator="type")]
+
+
+class SchemaFieldInt32(BaseModel):
+    type: Literal["int32"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldInt64(BaseModel):
+    type: Literal["int64"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldFloat32(BaseModel):
+    type: Literal["float32"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldFloat64(BaseModel):
+    type: Literal["float64"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldBool(BaseModel):
+    type: Literal["bool"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldString(BaseModel):
+    type: Literal["string"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldBinary(BaseModel):
+    type: Literal["binary"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldTimestamp(BaseModel):
+    type: Literal["timestamp"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+    unit: Optional[Literal["second", "millisecond", "microsecond", "nanosecond"]] = None
+
+
+class SchemaFieldJson(BaseModel):
+    type: Literal["json"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldStruct(BaseModel):
+    type: Literal["struct"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+    fields: Optional[List["SchemaField"]] = None
+
+
+class SchemaFieldList(BaseModel):
+    type: Literal["list"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+    element: Optional["SchemaField"] = None
+
+
+SchemaField: TypeAlias = Annotated[
+    Union[
+        SchemaFieldInt32,
+        SchemaFieldInt64,
+        SchemaFieldFloat32,
+        SchemaFieldFloat64,
+        SchemaFieldBool,
+        SchemaFieldString,
+        SchemaFieldBinary,
+        SchemaFieldTimestamp,
+        SchemaFieldJson,
+        SchemaFieldStruct,
+        SchemaFieldList,
+    ],
+    PropertyInfo(discriminator="type"),
+]
+
+
+class SchemaFormatJson(BaseModel):
+    type: Literal["json"]
+
+    decimal_encoding: Optional[Literal["number", "string", "bytes"]] = None
+
+    timestamp_format: Optional[Literal["rfc3339", "unix_millis"]] = None
+
+    unstructured: Optional[bool] = None
+
+
+class SchemaFormatParquet(BaseModel):
+    type: Literal["parquet"]
+
+    compression: Optional[Literal["uncompressed", "snappy", "gzip", "zstd", "lz4"]] = None
+
+    row_group_bytes: Optional[int] = None
+
+
+SchemaFormat: TypeAlias = Annotated[Union[SchemaFormatJson, SchemaFormatParquet], PropertyInfo(discriminator="type")]
+
+
+class Schema(BaseModel):
+    fields: Optional[List[SchemaField]] = None
+
+    format: Optional[SchemaFormat] = None
+
+    inferred: Optional[bool] = None
+
+
+class SinkCreateResponse(BaseModel):
+    id: str
+    """Indicates a unique identifier for this sink."""
+
+    created_at: datetime
+
+    modified_at: datetime
+
+    name: str
+    """Defines the name of the Sink."""
+
+    type: Literal["r2", "r2_data_catalog"]
+    """Specifies the type of sink."""
+
+    config: Optional[Config] = None
+    """R2 Data Catalog Sink"""
+
+    format: Optional[Format] = None
+
+    schema_: Optional[Schema] = FieldInfo(alias="schema", default=None)
diff --git a/src/cloudflare/types/pipelines/sink_delete_params.py b/src/cloudflare/types/pipelines/sink_delete_params.py
new file mode 100644
index 00000000000..d20c8ee161a
--- /dev/null
+++ b/src/cloudflare/types/pipelines/sink_delete_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SinkDeleteParams"]
+
+
+class SinkDeleteParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Specifies the public ID of the account."""
+
+    force: str
+    """Delete sink forcefully, including deleting any dependent pipelines."""
diff --git a/src/cloudflare/types/pipelines/sink_get_response.py b/src/cloudflare/types/pipelines/sink_get_response.py
new file mode 100644
index 00000000000..ba6144023c6
--- /dev/null
+++ b/src/cloudflare/types/pipelines/sink_get_response.py
@@ -0,0 +1,373 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._utils import PropertyInfo
+from ..._models import BaseModel
+
+__all__ = [
+    "SinkGetResponse",
+    "Config",
+    "ConfigCloudflarePipelinesR2Table",
+    "ConfigCloudflarePipelinesR2TableCredentials",
+    "ConfigCloudflarePipelinesR2TableFileNaming",
+    "ConfigCloudflarePipelinesR2TablePartitioning",
+    "ConfigCloudflarePipelinesR2TableRollingPolicy",
+    "ConfigCloudflarePipelinesR2DataCatalogTable",
+    "ConfigCloudflarePipelinesR2DataCatalogTableRollingPolicy",
+    "Format",
+    "FormatJson",
+    "FormatParquet",
+    "Schema",
+    "SchemaField",
+    "SchemaFieldInt32",
+    "SchemaFieldInt64",
+    "SchemaFieldFloat32",
+    "SchemaFieldFloat64",
+    "SchemaFieldBool",
+    "SchemaFieldString",
+    "SchemaFieldBinary",
+    "SchemaFieldTimestamp",
+    "SchemaFieldJson",
+    "SchemaFieldStruct",
+    "SchemaFieldList",
+    "SchemaFormat",
+    "SchemaFormatJson",
+    "SchemaFormatParquet",
+]
+
+
+class ConfigCloudflarePipelinesR2TableCredentials(BaseModel):
+    access_key_id: str
+    """Cloudflare Account ID for the bucket"""
+
+    secret_access_key: str
+    """Cloudflare Account ID for the bucket"""
+
+
+class ConfigCloudflarePipelinesR2TableFileNaming(BaseModel):
+    """Controls filename prefix/suffix and strategy."""
+
+    prefix: Optional[str] = None
+    """The prefix to use in file name. i.e prefix-<uuid>.parquet"""
+
+    strategy: Optional[Literal["serial", "uuid", "uuid_v7", "ulid"]] = None
+    """Filename generation strategy."""
+
+    suffix: Optional[str] = None
+    """This will overwrite the default file suffix. i.e .parquet, use with caution"""
+
+
+class ConfigCloudflarePipelinesR2TablePartitioning(BaseModel):
+    """Data-layout partitioning for sinks."""
+
+    time_pattern: Optional[str] = None
+    """The pattern of the date string"""
+
+
+class ConfigCloudflarePipelinesR2TableRollingPolicy(BaseModel):
+    """Rolling policy for file sinks (when & why to close a file and open a new one)."""
+
+    file_size_bytes: Optional[int] = None
+    """Files will be rolled after reaching this number of bytes"""
+
+    inactivity_seconds: Optional[int] = None
+    """Number of seconds of inactivity to wait before rolling over to a new file"""
+
+    interval_seconds: Optional[int] = None
+    """Number of seconds to wait before rolling over to a new file"""
+
+
+class ConfigCloudflarePipelinesR2Table(BaseModel):
+    account_id: str
+    """Cloudflare Account ID for the bucket"""
+
+    bucket: str
+    """R2 Bucket to write to"""
+
+    credentials: ConfigCloudflarePipelinesR2TableCredentials
+
+    file_naming: Optional[ConfigCloudflarePipelinesR2TableFileNaming] = None
+    """Controls filename prefix/suffix and strategy."""
+
+    jurisdiction: Optional[str] = None
+    """Jurisdiction this bucket is hosted in"""
+
+    partitioning: Optional[ConfigCloudflarePipelinesR2TablePartitioning] = None
+    """Data-layout partitioning for sinks."""
+
+    path: Optional[str] = None
+    """Subpath within the bucket to write to"""
+
+    rolling_policy: Optional[ConfigCloudflarePipelinesR2TableRollingPolicy] = None
+    """Rolling policy for file sinks (when & why to close a file and open a new one)."""
+
+
+class ConfigCloudflarePipelinesR2DataCatalogTableRollingPolicy(BaseModel):
+    """Rolling policy for file sinks (when & why to close a file and open a new one)."""
+
+    file_size_bytes: Optional[int] = None
+    """Files will be rolled after reaching this number of bytes"""
+
+    inactivity_seconds: Optional[int] = None
+    """Number of seconds of inactivity to wait before rolling over to a new file"""
+
+    interval_seconds: Optional[int] = None
+    """Number of seconds to wait before rolling over to a new file"""
+
+
+class ConfigCloudflarePipelinesR2DataCatalogTable(BaseModel):
+    """R2 Data Catalog Sink"""
+
+    token: str
+    """Authentication token"""
+
+    account_id: str
+    """Cloudflare Account ID"""
+
+    bucket: str
+    """The R2 Bucket that hosts this catalog"""
+
+    table_name: str
+    """Table name"""
+
+    namespace: Optional[str] = None
+    """Table namespace"""
+
+    rolling_policy: Optional[ConfigCloudflarePipelinesR2DataCatalogTableRollingPolicy] = None
+    """Rolling policy for file sinks (when & why to close a file and open a new one)."""
+
+
+Config: TypeAlias = Union[ConfigCloudflarePipelinesR2Table, ConfigCloudflarePipelinesR2DataCatalogTable]
+
+
+class FormatJson(BaseModel):
+    type: Literal["json"]
+
+    decimal_encoding: Optional[Literal["number", "string", "bytes"]] = None
+
+    timestamp_format: Optional[Literal["rfc3339", "unix_millis"]] = None
+
+    unstructured: Optional[bool] = None
+
+
+class FormatParquet(BaseModel):
+    type: Literal["parquet"]
+
+    compression: Optional[Literal["uncompressed", "snappy", "gzip", "zstd", "lz4"]] = None
+
+    row_group_bytes: Optional[int] = None
+
+
+Format: TypeAlias = Annotated[Union[FormatJson, FormatParquet], PropertyInfo(discriminator="type")]
+
+
+class SchemaFieldInt32(BaseModel):
+    type: Literal["int32"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldInt64(BaseModel):
+    type: Literal["int64"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldFloat32(BaseModel):
+    type: Literal["float32"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldFloat64(BaseModel):
+    type: Literal["float64"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldBool(BaseModel):
+    type: Literal["bool"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldString(BaseModel):
+    type: Literal["string"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldBinary(BaseModel):
+    type: Literal["binary"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldTimestamp(BaseModel):
+    type: Literal["timestamp"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+    unit: Optional[Literal["second", "millisecond", "microsecond", "nanosecond"]] = None
+
+
+class SchemaFieldJson(BaseModel):
+    type: Literal["json"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldStruct(BaseModel):
+    type: Literal["struct"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+    fields: Optional[List["SchemaField"]] = None
+
+
+class SchemaFieldList(BaseModel):
+    type: Literal["list"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+    element: Optional["SchemaField"] = None
+
+
+SchemaField: TypeAlias = Annotated[
+    Union[
+        SchemaFieldInt32,
+        SchemaFieldInt64,
+        SchemaFieldFloat32,
+        SchemaFieldFloat64,
+        SchemaFieldBool,
+        SchemaFieldString,
+        SchemaFieldBinary,
+        SchemaFieldTimestamp,
+        SchemaFieldJson,
+        SchemaFieldStruct,
+        SchemaFieldList,
+    ],
+    PropertyInfo(discriminator="type"),
+]
+
+
+class SchemaFormatJson(BaseModel):
+    type: Literal["json"]
+
+    decimal_encoding: Optional[Literal["number", "string", "bytes"]] = None
+
+    timestamp_format: Optional[Literal["rfc3339", "unix_millis"]] = None
+
+    unstructured: Optional[bool] = None
+
+
+class SchemaFormatParquet(BaseModel):
+    type: Literal["parquet"]
+
+    compression: Optional[Literal["uncompressed", "snappy", "gzip", "zstd", "lz4"]] = None
+
+    row_group_bytes: Optional[int] = None
+
+
+SchemaFormat: TypeAlias = Annotated[Union[SchemaFormatJson, SchemaFormatParquet], PropertyInfo(discriminator="type")]
+
+
+class Schema(BaseModel):
+    fields: Optional[List[SchemaField]] = None
+
+    format: Optional[SchemaFormat] = None
+
+    inferred: Optional[bool] = None
+
+
+class SinkGetResponse(BaseModel):
+    id: str
+    """Indicates a unique identifier for this sink."""
+
+    created_at: datetime
+
+    modified_at: datetime
+
+    name: str
+    """Defines the name of the Sink."""
+
+    type: Literal["r2", "r2_data_catalog"]
+    """Specifies the type of sink."""
+
+    config: Optional[Config] = None
+    """Defines the configuration of the R2 Sink."""
+
+    format: Optional[Format] = None
+
+    schema_: Optional[Schema] = FieldInfo(alias="schema", default=None)
diff --git a/src/cloudflare/types/pipelines/sink_list_params.py b/src/cloudflare/types/pipelines/sink_list_params.py
new file mode 100644
index 00000000000..1641ebedee9
--- /dev/null
+++ b/src/cloudflare/types/pipelines/sink_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SinkListParams"]
+
+
+class SinkListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Specifies the public ID of the account."""
+
+    page: float
+
+    per_page: float
+
+    pipeline_id: str
diff --git a/src/cloudflare/types/pipelines/sink_list_response.py b/src/cloudflare/types/pipelines/sink_list_response.py
new file mode 100644
index 00000000000..5509131b2e1
--- /dev/null
+++ b/src/cloudflare/types/pipelines/sink_list_response.py
@@ -0,0 +1,373 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._utils import PropertyInfo
+from ..._models import BaseModel
+
+__all__ = [
+    "SinkListResponse",
+    "Config",
+    "ConfigCloudflarePipelinesR2Table",
+    "ConfigCloudflarePipelinesR2TableCredentials",
+    "ConfigCloudflarePipelinesR2TableFileNaming",
+    "ConfigCloudflarePipelinesR2TablePartitioning",
+    "ConfigCloudflarePipelinesR2TableRollingPolicy",
+    "ConfigCloudflarePipelinesR2DataCatalogTable",
+    "ConfigCloudflarePipelinesR2DataCatalogTableRollingPolicy",
+    "Format",
+    "FormatJson",
+    "FormatParquet",
+    "Schema",
+    "SchemaField",
+    "SchemaFieldInt32",
+    "SchemaFieldInt64",
+    "SchemaFieldFloat32",
+    "SchemaFieldFloat64",
+    "SchemaFieldBool",
+    "SchemaFieldString",
+    "SchemaFieldBinary",
+    "SchemaFieldTimestamp",
+    "SchemaFieldJson",
+    "SchemaFieldStruct",
+    "SchemaFieldList",
+    "SchemaFormat",
+    "SchemaFormatJson",
+    "SchemaFormatParquet",
+]
+
+
+class ConfigCloudflarePipelinesR2TableCredentials(BaseModel):
+    access_key_id: str
+    """Cloudflare Account ID for the bucket"""
+
+    secret_access_key: str
+    """Cloudflare Account ID for the bucket"""
+
+
+class ConfigCloudflarePipelinesR2TableFileNaming(BaseModel):
+    """Controls filename prefix/suffix and strategy."""
+
+    prefix: Optional[str] = None
+    """The prefix to use in file name. i.e prefix-<uuid>.parquet"""
+
+    strategy: Optional[Literal["serial", "uuid", "uuid_v7", "ulid"]] = None
+    """Filename generation strategy."""
+
+    suffix: Optional[str] = None
+    """This will overwrite the default file suffix. i.e .parquet, use with caution"""
+
+
+class ConfigCloudflarePipelinesR2TablePartitioning(BaseModel):
+    """Data-layout partitioning for sinks."""
+
+    time_pattern: Optional[str] = None
+    """The pattern of the date string"""
+
+
+class ConfigCloudflarePipelinesR2TableRollingPolicy(BaseModel):
+    """Rolling policy for file sinks (when & why to close a file and open a new one)."""
+
+    file_size_bytes: Optional[int] = None
+    """Files will be rolled after reaching this number of bytes"""
+
+    inactivity_seconds: Optional[int] = None
+    """Number of seconds of inactivity to wait before rolling over to a new file"""
+
+    interval_seconds: Optional[int] = None
+    """Number of seconds to wait before rolling over to a new file"""
+
+
+class ConfigCloudflarePipelinesR2Table(BaseModel):
+    account_id: str
+    """Cloudflare Account ID for the bucket"""
+
+    bucket: str
+    """R2 Bucket to write to"""
+
+    credentials: ConfigCloudflarePipelinesR2TableCredentials
+
+    file_naming: Optional[ConfigCloudflarePipelinesR2TableFileNaming] = None
+    """Controls filename prefix/suffix and strategy."""
+
+    jurisdiction: Optional[str] = None
+    """Jurisdiction this bucket is hosted in"""
+
+    partitioning: Optional[ConfigCloudflarePipelinesR2TablePartitioning] = None
+    """Data-layout partitioning for sinks."""
+
+    path: Optional[str] = None
+    """Subpath within the bucket to write to"""
+
+    rolling_policy: Optional[ConfigCloudflarePipelinesR2TableRollingPolicy] = None
+    """Rolling policy for file sinks (when & why to close a file and open a new one)."""
+
+
+class ConfigCloudflarePipelinesR2DataCatalogTableRollingPolicy(BaseModel):
+    """Rolling policy for file sinks (when & why to close a file and open a new one)."""
+
+    file_size_bytes: Optional[int] = None
+    """Files will be rolled after reaching this number of bytes"""
+
+    inactivity_seconds: Optional[int] = None
+    """Number of seconds of inactivity to wait before rolling over to a new file"""
+
+    interval_seconds: Optional[int] = None
+    """Number of seconds to wait before rolling over to a new file"""
+
+
+class ConfigCloudflarePipelinesR2DataCatalogTable(BaseModel):
+    """R2 Data Catalog Sink"""
+
+    token: str
+    """Authentication token"""
+
+    account_id: str
+    """Cloudflare Account ID"""
+
+    bucket: str
+    """The R2 Bucket that hosts this catalog"""
+
+    table_name: str
+    """Table name"""
+
+    namespace: Optional[str] = None
+    """Table namespace"""
+
+    rolling_policy: Optional[ConfigCloudflarePipelinesR2DataCatalogTableRollingPolicy] = None
+    """Rolling policy for file sinks (when & why to close a file and open a new one)."""
+
+
+Config: TypeAlias = Union[ConfigCloudflarePipelinesR2Table, ConfigCloudflarePipelinesR2DataCatalogTable]
+
+
+class FormatJson(BaseModel):
+    type: Literal["json"]
+
+    decimal_encoding: Optional[Literal["number", "string", "bytes"]] = None
+
+    timestamp_format: Optional[Literal["rfc3339", "unix_millis"]] = None
+
+    unstructured: Optional[bool] = None
+
+
+class FormatParquet(BaseModel):
+    type: Literal["parquet"]
+
+    compression: Optional[Literal["uncompressed", "snappy", "gzip", "zstd", "lz4"]] = None
+
+    row_group_bytes: Optional[int] = None
+
+
+Format: TypeAlias = Annotated[Union[FormatJson, FormatParquet], PropertyInfo(discriminator="type")]
+
+
+class SchemaFieldInt32(BaseModel):
+    type: Literal["int32"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldInt64(BaseModel):
+    type: Literal["int64"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldFloat32(BaseModel):
+    type: Literal["float32"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldFloat64(BaseModel):
+    type: Literal["float64"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldBool(BaseModel):
+    type: Literal["bool"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldString(BaseModel):
+    type: Literal["string"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldBinary(BaseModel):
+    type: Literal["binary"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldTimestamp(BaseModel):
+    type: Literal["timestamp"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+    unit: Optional[Literal["second", "millisecond", "microsecond", "nanosecond"]] = None
+
+
+class SchemaFieldJson(BaseModel):
+    type: Literal["json"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldStruct(BaseModel):
+    type: Literal["struct"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+    fields: Optional[List["SchemaField"]] = None
+
+
+class SchemaFieldList(BaseModel):
+    type: Literal["list"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+    element: Optional["SchemaField"] = None
+
+
+SchemaField: TypeAlias = Annotated[
+    Union[
+        SchemaFieldInt32,
+        SchemaFieldInt64,
+        SchemaFieldFloat32,
+        SchemaFieldFloat64,
+        SchemaFieldBool,
+        SchemaFieldString,
+        SchemaFieldBinary,
+        SchemaFieldTimestamp,
+        SchemaFieldJson,
+        SchemaFieldStruct,
+        SchemaFieldList,
+    ],
+    PropertyInfo(discriminator="type"),
+]
+
+
+class SchemaFormatJson(BaseModel):
+    type: Literal["json"]
+
+    decimal_encoding: Optional[Literal["number", "string", "bytes"]] = None
+
+    timestamp_format: Optional[Literal["rfc3339", "unix_millis"]] = None
+
+    unstructured: Optional[bool] = None
+
+
+class SchemaFormatParquet(BaseModel):
+    type: Literal["parquet"]
+
+    compression: Optional[Literal["uncompressed", "snappy", "gzip", "zstd", "lz4"]] = None
+
+    row_group_bytes: Optional[int] = None
+
+
+SchemaFormat: TypeAlias = Annotated[Union[SchemaFormatJson, SchemaFormatParquet], PropertyInfo(discriminator="type")]
+
+
+class Schema(BaseModel):
+    fields: Optional[List[SchemaField]] = None
+
+    format: Optional[SchemaFormat] = None
+
+    inferred: Optional[bool] = None
+
+
+class SinkListResponse(BaseModel):
+    id: str
+    """Indicates a unique identifier for this sink."""
+
+    created_at: datetime
+
+    modified_at: datetime
+
+    name: str
+    """Defines the name of the Sink."""
+
+    type: Literal["r2", "r2_data_catalog"]
+    """Specifies the type of sink."""
+
+    config: Optional[Config] = None
+    """Defines the configuration of the R2 Sink."""
+
+    format: Optional[Format] = None
+
+    schema_: Optional[Schema] = FieldInfo(alias="schema", default=None)
diff --git a/src/cloudflare/types/pipelines/stream_create_params.py b/src/cloudflare/types/pipelines/stream_create_params.py
new file mode 100644
index 00000000000..14f128c820f
--- /dev/null
+++ b/src/cloudflare/types/pipelines/stream_create_params.py
@@ -0,0 +1,275 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = [
+    "StreamCreateParams",
+    "Format",
+    "FormatJson",
+    "FormatParquet",
+    "HTTP",
+    "HTTPCORS",
+    "Schema",
+    "SchemaField",
+    "SchemaFieldInt32",
+    "SchemaFieldInt64",
+    "SchemaFieldFloat32",
+    "SchemaFieldFloat64",
+    "SchemaFieldBool",
+    "SchemaFieldString",
+    "SchemaFieldBinary",
+    "SchemaFieldTimestamp",
+    "SchemaFieldJson",
+    "SchemaFieldStruct",
+    "SchemaFieldList",
+    "SchemaFormat",
+    "SchemaFormatJson",
+    "SchemaFormatParquet",
+    "WorkerBinding",
+]
+
+
+class StreamCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Specifies the public ID of the account."""
+
+    name: Required[str]
+    """Specifies the name of the Stream."""
+
+    format: Format
+
+    http: HTTP
+
+    schema: Schema
+
+    worker_binding: WorkerBinding
+
+
+class FormatJson(TypedDict, total=False):
+    type: Required[Literal["json"]]
+
+    decimal_encoding: Literal["number", "string", "bytes"]
+
+    timestamp_format: Literal["rfc3339", "unix_millis"]
+
+    unstructured: bool
+
+
+class FormatParquet(TypedDict, total=False):
+    type: Required[Literal["parquet"]]
+
+    compression: Literal["uncompressed", "snappy", "gzip", "zstd", "lz4"]
+
+    row_group_bytes: Optional[int]
+
+
+Format: TypeAlias = Union[FormatJson, FormatParquet]
+
+
+class HTTPCORS(TypedDict, total=False):
+    """Specifies the CORS options for the HTTP endpoint."""
+
+    origins: SequenceNotStr[str]
+
+
+class HTTP(TypedDict, total=False):
+    authentication: Required[bool]
+    """Indicates that authentication is required for the HTTP endpoint."""
+
+    enabled: Required[bool]
+    """Indicates that the HTTP endpoint is enabled."""
+
+    cors: HTTPCORS
+    """Specifies the CORS options for the HTTP endpoint."""
+
+
+class SchemaFieldInt32(TypedDict, total=False):
+    type: Required[Literal["int32"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+
+class SchemaFieldInt64(TypedDict, total=False):
+    type: Required[Literal["int64"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+
+class SchemaFieldFloat32(TypedDict, total=False):
+    type: Required[Literal["float32"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+
+class SchemaFieldFloat64(TypedDict, total=False):
+    type: Required[Literal["float64"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+
+class SchemaFieldBool(TypedDict, total=False):
+    type: Required[Literal["bool"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+
+class SchemaFieldString(TypedDict, total=False):
+    type: Required[Literal["string"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+
+class SchemaFieldBinary(TypedDict, total=False):
+    type: Required[Literal["binary"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+
+class SchemaFieldTimestamp(TypedDict, total=False):
+    type: Required[Literal["timestamp"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+    unit: Literal["second", "millisecond", "microsecond", "nanosecond"]
+
+
+class SchemaFieldJson(TypedDict, total=False):
+    type: Required[Literal["json"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+
+class SchemaFieldStruct(TypedDict, total=False):
+    type: Required[Literal["struct"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+    fields: Optional[List["SchemaField"]]
+
+
+class SchemaFieldList(TypedDict, total=False):
+    type: Required[Literal["list"]]
+
+    metadata_key: Optional[str]
+
+    name: str
+
+    required: bool
+
+    sql_name: str
+
+    element: Optional["SchemaField"]
+
+
+SchemaField: TypeAlias = Union[
+    SchemaFieldInt32,
+    SchemaFieldInt64,
+    SchemaFieldFloat32,
+    SchemaFieldFloat64,
+    SchemaFieldBool,
+    SchemaFieldString,
+    SchemaFieldBinary,
+    SchemaFieldTimestamp,
+    SchemaFieldJson,
+    SchemaFieldStruct,
+    SchemaFieldList,
+]
+
+
+class SchemaFormatJson(TypedDict, total=False):
+    type: Required[Literal["json"]]
+
+    decimal_encoding: Literal["number", "string", "bytes"]
+
+    timestamp_format: Literal["rfc3339", "unix_millis"]
+
+    unstructured: bool
+
+
+class SchemaFormatParquet(TypedDict, total=False):
+    type: Required[Literal["parquet"]]
+
+    compression: Literal["uncompressed", "snappy", "gzip", "zstd", "lz4"]
+
+    row_group_bytes: Optional[int]
+
+
+SchemaFormat: TypeAlias = Union[SchemaFormatJson, SchemaFormatParquet]
+
+
+class Schema(TypedDict, total=False):
+    fields: Iterable[SchemaField]
+
+    format: SchemaFormat
+
+    inferred: Optional[bool]
+
+
+class WorkerBinding(TypedDict, total=False):
+    enabled: Required[bool]
+    """Indicates that the worker binding is enabled."""
diff --git a/src/cloudflare/types/pipelines/stream_create_response.py b/src/cloudflare/types/pipelines/stream_create_response.py
new file mode 100644
index 00000000000..805ff5c9c3d
--- /dev/null
+++ b/src/cloudflare/types/pipelines/stream_create_response.py
@@ -0,0 +1,290 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._utils import PropertyInfo
+from ..._models import BaseModel
+
+__all__ = [
+    "StreamCreateResponse",
+    "HTTP",
+    "HTTPCORS",
+    "WorkerBinding",
+    "Format",
+    "FormatJson",
+    "FormatParquet",
+    "Schema",
+    "SchemaField",
+    "SchemaFieldInt32",
+    "SchemaFieldInt64",
+    "SchemaFieldFloat32",
+    "SchemaFieldFloat64",
+    "SchemaFieldBool",
+    "SchemaFieldString",
+    "SchemaFieldBinary",
+    "SchemaFieldTimestamp",
+    "SchemaFieldJson",
+    "SchemaFieldStruct",
+    "SchemaFieldList",
+    "SchemaFormat",
+    "SchemaFormatJson",
+    "SchemaFormatParquet",
+]
+
+
+class HTTPCORS(BaseModel):
+    """Specifies the CORS options for the HTTP endpoint."""
+
+    origins: Optional[List[str]] = None
+
+
+class HTTP(BaseModel):
+    authentication: bool
+    """Indicates that authentication is required for the HTTP endpoint."""
+
+    enabled: bool
+    """Indicates that the HTTP endpoint is enabled."""
+
+    cors: Optional[HTTPCORS] = None
+    """Specifies the CORS options for the HTTP endpoint."""
+
+
+class WorkerBinding(BaseModel):
+    enabled: bool
+    """Indicates that the worker binding is enabled."""
+
+
+class FormatJson(BaseModel):
+    type: Literal["json"]
+
+    decimal_encoding: Optional[Literal["number", "string", "bytes"]] = None
+
+    timestamp_format: Optional[Literal["rfc3339", "unix_millis"]] = None
+
+    unstructured: Optional[bool] = None
+
+
+class FormatParquet(BaseModel):
+    type: Literal["parquet"]
+
+    compression: Optional[Literal["uncompressed", "snappy", "gzip", "zstd", "lz4"]] = None
+
+    row_group_bytes: Optional[int] = None
+
+
+Format: TypeAlias = Annotated[Union[FormatJson, FormatParquet], PropertyInfo(discriminator="type")]
+
+
+class SchemaFieldInt32(BaseModel):
+    type: Literal["int32"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldInt64(BaseModel):
+    type: Literal["int64"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldFloat32(BaseModel):
+    type: Literal["float32"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldFloat64(BaseModel):
+    type: Literal["float64"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldBool(BaseModel):
+    type: Literal["bool"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldString(BaseModel):
+    type: Literal["string"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldBinary(BaseModel):
+    type: Literal["binary"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldTimestamp(BaseModel):
+    type: Literal["timestamp"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+    unit: Optional[Literal["second", "millisecond", "microsecond", "nanosecond"]] = None
+
+
+class SchemaFieldJson(BaseModel):
+    type: Literal["json"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldStruct(BaseModel):
+    type: Literal["struct"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+    fields: Optional[List["SchemaField"]] = None
+
+
+class SchemaFieldList(BaseModel):
+    type: Literal["list"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+    element: Optional["SchemaField"] = None
+
+
+SchemaField: TypeAlias = Annotated[
+    Union[
+        SchemaFieldInt32,
+        SchemaFieldInt64,
+        SchemaFieldFloat32,
+        SchemaFieldFloat64,
+        SchemaFieldBool,
+        SchemaFieldString,
+        SchemaFieldBinary,
+        SchemaFieldTimestamp,
+        SchemaFieldJson,
+        SchemaFieldStruct,
+        SchemaFieldList,
+    ],
+    PropertyInfo(discriminator="type"),
+]
+
+
+class SchemaFormatJson(BaseModel):
+    type: Literal["json"]
+
+    decimal_encoding: Optional[Literal["number", "string", "bytes"]] = None
+
+    timestamp_format: Optional[Literal["rfc3339", "unix_millis"]] = None
+
+    unstructured: Optional[bool] = None
+
+
+class SchemaFormatParquet(BaseModel):
+    type: Literal["parquet"]
+
+    compression: Optional[Literal["uncompressed", "snappy", "gzip", "zstd", "lz4"]] = None
+
+    row_group_bytes: Optional[int] = None
+
+
+SchemaFormat: TypeAlias = Annotated[Union[SchemaFormatJson, SchemaFormatParquet], PropertyInfo(discriminator="type")]
+
+
+class Schema(BaseModel):
+    fields: Optional[List[SchemaField]] = None
+
+    format: Optional[SchemaFormat] = None
+
+    inferred: Optional[bool] = None
+
+
+class StreamCreateResponse(BaseModel):
+    id: str
+    """Indicates a unique identifier for this stream."""
+
+    created_at: datetime
+
+    http: HTTP
+
+    modified_at: datetime
+
+    name: str
+    """Indicates the name of the Stream."""
+
+    version: int
+    """Indicates the current version of this stream."""
+
+    worker_binding: WorkerBinding
+
+    endpoint: Optional[str] = None
+    """Indicates the endpoint URL of this stream."""
+
+    format: Optional[Format] = None
+
+    schema_: Optional[Schema] = FieldInfo(alias="schema", default=None)
diff --git a/src/cloudflare/types/pipelines/stream_delete_params.py b/src/cloudflare/types/pipelines/stream_delete_params.py
new file mode 100644
index 00000000000..da55e85804e
--- /dev/null
+++ b/src/cloudflare/types/pipelines/stream_delete_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["StreamDeleteParams"]
+
+
+class StreamDeleteParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Specifies the public ID of the account."""
+
+    force: str
+    """Delete stream forcefully, including deleting any dependent pipelines."""
diff --git a/src/cloudflare/types/pipelines/stream_get_response.py b/src/cloudflare/types/pipelines/stream_get_response.py
new file mode 100644
index 00000000000..0398c601c14
--- /dev/null
+++ b/src/cloudflare/types/pipelines/stream_get_response.py
@@ -0,0 +1,290 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._utils import PropertyInfo
+from ..._models import BaseModel
+
+__all__ = [
+    "StreamGetResponse",
+    "HTTP",
+    "HTTPCORS",
+    "WorkerBinding",
+    "Format",
+    "FormatJson",
+    "FormatParquet",
+    "Schema",
+    "SchemaField",
+    "SchemaFieldInt32",
+    "SchemaFieldInt64",
+    "SchemaFieldFloat32",
+    "SchemaFieldFloat64",
+    "SchemaFieldBool",
+    "SchemaFieldString",
+    "SchemaFieldBinary",
+    "SchemaFieldTimestamp",
+    "SchemaFieldJson",
+    "SchemaFieldStruct",
+    "SchemaFieldList",
+    "SchemaFormat",
+    "SchemaFormatJson",
+    "SchemaFormatParquet",
+]
+
+
+class HTTPCORS(BaseModel):
+    """Specifies the CORS options for the HTTP endpoint."""
+
+    origins: Optional[List[str]] = None
+
+
+class HTTP(BaseModel):
+    authentication: bool
+    """Indicates that authentication is required for the HTTP endpoint."""
+
+    enabled: bool
+    """Indicates that the HTTP endpoint is enabled."""
+
+    cors: Optional[HTTPCORS] = None
+    """Specifies the CORS options for the HTTP endpoint."""
+
+
+class WorkerBinding(BaseModel):
+    enabled: bool
+    """Indicates that the worker binding is enabled."""
+
+
+class FormatJson(BaseModel):
+    type: Literal["json"]
+
+    decimal_encoding: Optional[Literal["number", "string", "bytes"]] = None
+
+    timestamp_format: Optional[Literal["rfc3339", "unix_millis"]] = None
+
+    unstructured: Optional[bool] = None
+
+
+class FormatParquet(BaseModel):
+    type: Literal["parquet"]
+
+    compression: Optional[Literal["uncompressed", "snappy", "gzip", "zstd", "lz4"]] = None
+
+    row_group_bytes: Optional[int] = None
+
+
+Format: TypeAlias = Annotated[Union[FormatJson, FormatParquet], PropertyInfo(discriminator="type")]
+
+
+class SchemaFieldInt32(BaseModel):
+    type: Literal["int32"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldInt64(BaseModel):
+    type: Literal["int64"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldFloat32(BaseModel):
+    type: Literal["float32"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldFloat64(BaseModel):
+    type: Literal["float64"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldBool(BaseModel):
+    type: Literal["bool"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldString(BaseModel):
+    type: Literal["string"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldBinary(BaseModel):
+    type: Literal["binary"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldTimestamp(BaseModel):
+    type: Literal["timestamp"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+    unit: Optional[Literal["second", "millisecond", "microsecond", "nanosecond"]] = None
+
+
+class SchemaFieldJson(BaseModel):
+    type: Literal["json"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldStruct(BaseModel):
+    type: Literal["struct"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+    fields: Optional[List["SchemaField"]] = None
+
+
+class SchemaFieldList(BaseModel):
+    type: Literal["list"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+    element: Optional["SchemaField"] = None
+
+
+SchemaField: TypeAlias = Annotated[
+    Union[
+        SchemaFieldInt32,
+        SchemaFieldInt64,
+        SchemaFieldFloat32,
+        SchemaFieldFloat64,
+        SchemaFieldBool,
+        SchemaFieldString,
+        SchemaFieldBinary,
+        SchemaFieldTimestamp,
+        SchemaFieldJson,
+        SchemaFieldStruct,
+        SchemaFieldList,
+    ],
+    PropertyInfo(discriminator="type"),
+]
+
+
+class SchemaFormatJson(BaseModel):
+    type: Literal["json"]
+
+    decimal_encoding: Optional[Literal["number", "string", "bytes"]] = None
+
+    timestamp_format: Optional[Literal["rfc3339", "unix_millis"]] = None
+
+    unstructured: Optional[bool] = None
+
+
+class SchemaFormatParquet(BaseModel):
+    type: Literal["parquet"]
+
+    compression: Optional[Literal["uncompressed", "snappy", "gzip", "zstd", "lz4"]] = None
+
+    row_group_bytes: Optional[int] = None
+
+
+SchemaFormat: TypeAlias = Annotated[Union[SchemaFormatJson, SchemaFormatParquet], PropertyInfo(discriminator="type")]
+
+
+class Schema(BaseModel):
+    fields: Optional[List[SchemaField]] = None
+
+    format: Optional[SchemaFormat] = None
+
+    inferred: Optional[bool] = None
+
+
+class StreamGetResponse(BaseModel):
+    id: str
+    """Indicates a unique identifier for this stream."""
+
+    created_at: datetime
+
+    http: HTTP
+
+    modified_at: datetime
+
+    name: str
+    """Indicates the name of the Stream."""
+
+    version: int
+    """Indicates the current version of this stream."""
+
+    worker_binding: WorkerBinding
+
+    endpoint: Optional[str] = None
+    """Indicates the endpoint URL of this stream."""
+
+    format: Optional[Format] = None
+
+    schema_: Optional[Schema] = FieldInfo(alias="schema", default=None)
diff --git a/src/cloudflare/types/pipelines/stream_list_params.py b/src/cloudflare/types/pipelines/stream_list_params.py
new file mode 100644
index 00000000000..08a052ed46a
--- /dev/null
+++ b/src/cloudflare/types/pipelines/stream_list_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["StreamListParams"]
+
+
+class StreamListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Specifies the public ID of the account."""
+
+    page: float
+
+    per_page: float
+
+    pipeline_id: str
+    """Specifies the public ID of the pipeline."""
diff --git a/src/cloudflare/types/pipelines/stream_list_response.py b/src/cloudflare/types/pipelines/stream_list_response.py
new file mode 100644
index 00000000000..13d5daf4134
--- /dev/null
+++ b/src/cloudflare/types/pipelines/stream_list_response.py
@@ -0,0 +1,290 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._utils import PropertyInfo
+from ..._models import BaseModel
+
+__all__ = [
+    "StreamListResponse",
+    "HTTP",
+    "HTTPCORS",
+    "WorkerBinding",
+    "Format",
+    "FormatJson",
+    "FormatParquet",
+    "Schema",
+    "SchemaField",
+    "SchemaFieldInt32",
+    "SchemaFieldInt64",
+    "SchemaFieldFloat32",
+    "SchemaFieldFloat64",
+    "SchemaFieldBool",
+    "SchemaFieldString",
+    "SchemaFieldBinary",
+    "SchemaFieldTimestamp",
+    "SchemaFieldJson",
+    "SchemaFieldStruct",
+    "SchemaFieldList",
+    "SchemaFormat",
+    "SchemaFormatJson",
+    "SchemaFormatParquet",
+]
+
+
+class HTTPCORS(BaseModel):
+    """Specifies the CORS options for the HTTP endpoint."""
+
+    origins: Optional[List[str]] = None
+
+
+class HTTP(BaseModel):
+    authentication: bool
+    """Indicates that authentication is required for the HTTP endpoint."""
+
+    enabled: bool
+    """Indicates that the HTTP endpoint is enabled."""
+
+    cors: Optional[HTTPCORS] = None
+    """Specifies the CORS options for the HTTP endpoint."""
+
+
+class WorkerBinding(BaseModel):
+    enabled: bool
+    """Indicates that the worker binding is enabled."""
+
+
+class FormatJson(BaseModel):
+    type: Literal["json"]
+
+    decimal_encoding: Optional[Literal["number", "string", "bytes"]] = None
+
+    timestamp_format: Optional[Literal["rfc3339", "unix_millis"]] = None
+
+    unstructured: Optional[bool] = None
+
+
+class FormatParquet(BaseModel):
+    type: Literal["parquet"]
+
+    compression: Optional[Literal["uncompressed", "snappy", "gzip", "zstd", "lz4"]] = None
+
+    row_group_bytes: Optional[int] = None
+
+
+Format: TypeAlias = Annotated[Union[FormatJson, FormatParquet], PropertyInfo(discriminator="type")]
+
+
+class SchemaFieldInt32(BaseModel):
+    type: Literal["int32"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldInt64(BaseModel):
+    type: Literal["int64"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldFloat32(BaseModel):
+    type: Literal["float32"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldFloat64(BaseModel):
+    type: Literal["float64"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldBool(BaseModel):
+    type: Literal["bool"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldString(BaseModel):
+    type: Literal["string"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldBinary(BaseModel):
+    type: Literal["binary"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldTimestamp(BaseModel):
+    type: Literal["timestamp"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+    unit: Optional[Literal["second", "millisecond", "microsecond", "nanosecond"]] = None
+
+
+class SchemaFieldJson(BaseModel):
+    type: Literal["json"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+
+class SchemaFieldStruct(BaseModel):
+    type: Literal["struct"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+    fields: Optional[List["SchemaField"]] = None
+
+
+class SchemaFieldList(BaseModel):
+    type: Literal["list"]
+
+    metadata_key: Optional[str] = None
+
+    name: Optional[str] = None
+
+    required: Optional[bool] = None
+
+    sql_name: Optional[str] = None
+
+    element: Optional["SchemaField"] = None
+
+
+SchemaField: TypeAlias = Annotated[
+    Union[
+        SchemaFieldInt32,
+        SchemaFieldInt64,
+        SchemaFieldFloat32,
+        SchemaFieldFloat64,
+        SchemaFieldBool,
+        SchemaFieldString,
+        SchemaFieldBinary,
+        SchemaFieldTimestamp,
+        SchemaFieldJson,
+        SchemaFieldStruct,
+        SchemaFieldList,
+    ],
+    PropertyInfo(discriminator="type"),
+]
+
+
+class SchemaFormatJson(BaseModel):
+    type: Literal["json"]
+
+    decimal_encoding: Optional[Literal["number", "string", "bytes"]] = None
+
+    timestamp_format: Optional[Literal["rfc3339", "unix_millis"]] = None
+
+    unstructured: Optional[bool] = None
+
+
+class SchemaFormatParquet(BaseModel):
+    type: Literal["parquet"]
+
+    compression: Optional[Literal["uncompressed", "snappy", "gzip", "zstd", "lz4"]] = None
+
+    row_group_bytes: Optional[int] = None
+
+
+SchemaFormat: TypeAlias = Annotated[Union[SchemaFormatJson, SchemaFormatParquet], PropertyInfo(discriminator="type")]
+
+
+class Schema(BaseModel):
+    fields: Optional[List[SchemaField]] = None
+
+    format: Optional[SchemaFormat] = None
+
+    inferred: Optional[bool] = None
+
+
+class StreamListResponse(BaseModel):
+    id: str
+    """Indicates a unique identifier for this stream."""
+
+    created_at: datetime
+
+    http: HTTP
+
+    modified_at: datetime
+
+    name: str
+    """Indicates the name of the Stream."""
+
+    version: int
+    """Indicates the current version of this stream."""
+
+    worker_binding: WorkerBinding
+
+    endpoint: Optional[str] = None
+    """Indicates the endpoint URL of this stream."""
+
+    format: Optional[Format] = None
+
+    schema_: Optional[Schema] = FieldInfo(alias="schema", default=None)
diff --git a/src/cloudflare/types/pipelines/stream_update_params.py b/src/cloudflare/types/pipelines/stream_update_params.py
new file mode 100644
index 00000000000..d2914d2e31b
--- /dev/null
+++ b/src/cloudflare/types/pipelines/stream_update_params.py
@@ -0,0 +1,40 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["StreamUpdateParams", "HTTP", "HTTPCORS", "WorkerBinding"]
+
+
+class StreamUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Specifies the public ID of the account."""
+
+    http: HTTP
+
+    worker_binding: WorkerBinding
+
+
+class HTTPCORS(TypedDict, total=False):
+    """Specifies the CORS options for the HTTP endpoint."""
+
+    origins: SequenceNotStr[str]
+
+
+class HTTP(TypedDict, total=False):
+    authentication: Required[bool]
+    """Indicates that authentication is required for the HTTP endpoint."""
+
+    enabled: Required[bool]
+    """Indicates that the HTTP endpoint is enabled."""
+
+    cors: HTTPCORS
+    """Specifies the CORS options for the HTTP endpoint."""
+
+
+class WorkerBinding(TypedDict, total=False):
+    enabled: Required[bool]
+    """Indicates that the worker binding is enabled."""
diff --git a/src/cloudflare/types/pipelines/stream_update_response.py b/src/cloudflare/types/pipelines/stream_update_response.py
new file mode 100644
index 00000000000..69760507b22
--- /dev/null
+++ b/src/cloudflare/types/pipelines/stream_update_response.py
@@ -0,0 +1,77 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from ..._utils import PropertyInfo
+from ..._models import BaseModel
+
+__all__ = ["StreamUpdateResponse", "HTTP", "HTTPCORS", "WorkerBinding", "Format", "FormatJson", "FormatParquet"]
+
+
+class HTTPCORS(BaseModel):
+    """Specifies the CORS options for the HTTP endpoint."""
+
+    origins: Optional[List[str]] = None
+
+
+class HTTP(BaseModel):
+    authentication: bool
+    """Indicates that authentication is required for the HTTP endpoint."""
+
+    enabled: bool
+    """Indicates that the HTTP endpoint is enabled."""
+
+    cors: Optional[HTTPCORS] = None
+    """Specifies the CORS options for the HTTP endpoint."""
+
+
+class WorkerBinding(BaseModel):
+    enabled: bool
+    """Indicates that the worker binding is enabled."""
+
+
+class FormatJson(BaseModel):
+    type: Literal["json"]
+
+    decimal_encoding: Optional[Literal["number", "string", "bytes"]] = None
+
+    timestamp_format: Optional[Literal["rfc3339", "unix_millis"]] = None
+
+    unstructured: Optional[bool] = None
+
+
+class FormatParquet(BaseModel):
+    type: Literal["parquet"]
+
+    compression: Optional[Literal["uncompressed", "snappy", "gzip", "zstd", "lz4"]] = None
+
+    row_group_bytes: Optional[int] = None
+
+
+Format: TypeAlias = Annotated[Union[FormatJson, FormatParquet], PropertyInfo(discriminator="type")]
+
+
+class StreamUpdateResponse(BaseModel):
+    id: str
+    """Indicates a unique identifier for this stream."""
+
+    created_at: datetime
+
+    http: HTTP
+
+    modified_at: datetime
+
+    name: str
+    """Indicates the name of the Stream."""
+
+    version: int
+    """Indicates the current version of this stream."""
+
+    worker_binding: WorkerBinding
+
+    endpoint: Optional[str] = None
+    """Indicates the endpoint URL of this stream."""
+
+    format: Optional[Format] = None
diff --git a/src/cloudflare/types/plans/__init__.py b/src/cloudflare/types/plans/__init__.py
deleted file mode 100644
index 372a262131e..00000000000
--- a/src/cloudflare/types/plans/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/queues/__init__.py b/src/cloudflare/types/queues/__init__.py
index 7dd8b118bbb..2d25382356d 100644
--- a/src/cloudflare/types/queues/__init__.py
+++ b/src/cloudflare/types/queues/__init__.py
@@ -4,18 +4,28 @@
 
 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 .queue_edit_params import QueueEditParams as QueueEditParams
 from .message_ack_params import MessageAckParams as MessageAckParams
+from .purge_start_params import PurgeStartParams as PurgeStartParams
 from .message_pull_params import MessagePullParams as MessagePullParams
+from .message_push_params import MessagePushParams as MessagePushParams
 from .queue_create_params import QueueCreateParams as QueueCreateParams
 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 .message_push_response import MessagePushResponse as MessagePushResponse
+from .purge_status_response import PurgeStatusResponse as PurgeStatusResponse
 from .queue_delete_response import QueueDeleteResponse as QueueDeleteResponse
 from .consumer_create_params import ConsumerCreateParams as ConsumerCreateParams
 from .consumer_update_params import ConsumerUpdateParams as ConsumerUpdateParams
-from .consumer_create_response import ConsumerCreateResponse as ConsumerCreateResponse
 from .consumer_delete_response import ConsumerDeleteResponse as ConsumerDeleteResponse
-from .consumer_update_response import ConsumerUpdateResponse as ConsumerUpdateResponse
+from .message_bulk_push_params import MessageBulkPushParams as MessageBulkPushParams
+from .subscription_list_params import SubscriptionListParams as SubscriptionListParams
+from .subscription_get_response import SubscriptionGetResponse as SubscriptionGetResponse
+from .message_bulk_push_response import MessageBulkPushResponse as MessageBulkPushResponse
+from .subscription_create_params import SubscriptionCreateParams as SubscriptionCreateParams
+from .subscription_list_response import SubscriptionListResponse as SubscriptionListResponse
+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/queues/consumer.py b/src/cloudflare/types/queues/consumer.py
index 86bd8eefd02..9c0070c3734 100644
--- a/src/cloudflare/types/queues/consumer.py
+++ b/src/cloudflare/types/queues/consumer.py
@@ -1,28 +1,88 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import Union, Optional
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
 
-__all__ = ["Consumer", "Settings"]
+__all__ = ["Consumer", "MqWorkerConsumer", "MqWorkerConsumerSettings", "MqHTTPConsumer", "MqHTTPConsumerSettings"]
 
 
-class Settings(BaseModel):
+class MqWorkerConsumerSettings(BaseModel):
     batch_size: Optional[float] = None
-    """The maximum number of messages to include in a batch"""
+    """The maximum number of messages to include in a batch."""
+
+    max_concurrency: Optional[float] = None
+    """Maximum number of concurrent consumers that may consume from this Queue.
+
+    Set to `null` to automatically opt in to the platform's maximum (recommended).
+    """
 
     max_retries: Optional[float] = None
+    """The maximum number of retries"""
 
     max_wait_time_ms: Optional[float] = None
+    """
+    The number of milliseconds to wait for a batch to fill up before attempting to
+    deliver it
+    """
+
+    retry_delay: Optional[float] = None
+    """
+    The number of seconds to delay before making the message available for another
+    attempt.
+    """
+
+
+class MqWorkerConsumer(BaseModel):
+    consumer_id: Optional[str] = None
+    """A Resource identifier."""
+
+    created_on: Optional[str] = None
+
+    queue_id: Optional[str] = None
+    """A Resource identifier."""
+
+    script: Optional[str] = None
+    """Name of a Worker"""
+
+    settings: Optional[MqWorkerConsumerSettings] = None
+
+    type: Optional[Literal["worker"]] = None
+
+
+class MqHTTPConsumerSettings(BaseModel):
+    batch_size: Optional[float] = None
+    """The maximum number of messages to include in a batch."""
+
+    max_retries: Optional[float] = None
+    """The maximum number of retries"""
+
+    retry_delay: Optional[float] = None
+    """
+    The number of seconds to delay before making the message available for another
+    attempt.
+    """
+
+    visibility_timeout_ms: Optional[float] = None
+    """The number of milliseconds that a message is exclusively leased.
+
+    After the timeout, the message becomes available for another attempt.
+    """
+
+
+class MqHTTPConsumer(BaseModel):
+    consumer_id: Optional[str] = None
+    """A Resource identifier."""
 
+    created_on: Optional[str] = None
 
-class Consumer(BaseModel):
-    created_on: Optional[object] = None
+    queue_id: Optional[str] = None
+    """A Resource identifier."""
 
-    environment: Optional[object] = None
+    settings: Optional[MqHTTPConsumerSettings] = None
 
-    queue_name: Optional[object] = None
+    type: Optional[Literal["http_pull"]] = None
 
-    service: Optional[object] = None
 
-    settings: Optional[Settings] = None
+Consumer: TypeAlias = Union[MqWorkerConsumer, MqHTTPConsumer]
diff --git a/src/cloudflare/types/queues/consumer_create_params.py b/src/cloudflare/types/queues/consumer_create_params.py
index ee3b7882d1e..d3c2f29e14d 100644
--- a/src/cloudflare/types/queues/consumer_create_params.py
+++ b/src/cloudflare/types/queues/consumer_create_params.py
@@ -2,13 +2,87 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
-__all__ = ["ConsumerCreateParams"]
+__all__ = [
+    "ConsumerCreateParams",
+    "MqWorkerConsumer",
+    "MqWorkerConsumerSettings",
+    "MqHTTPConsumer",
+    "MqHTTPConsumerSettings",
+]
 
 
-class ConsumerCreateParams(TypedDict, total=False):
+class MqWorkerConsumer(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """A Resource identifier."""
 
-    body: Required[object]
+    dead_letter_queue: str
+
+    script_name: str
+    """Name of a Worker"""
+
+    settings: MqWorkerConsumerSettings
+
+    type: Literal["worker"]
+
+
+class MqWorkerConsumerSettings(TypedDict, total=False):
+    batch_size: float
+    """The maximum number of messages to include in a batch."""
+
+    max_concurrency: float
+    """Maximum number of concurrent consumers that may consume from this Queue.
+
+    Set to `null` to automatically opt in to the platform's maximum (recommended).
+    """
+
+    max_retries: float
+    """The maximum number of retries"""
+
+    max_wait_time_ms: float
+    """
+    The number of milliseconds to wait for a batch to fill up before attempting to
+    deliver it
+    """
+
+    retry_delay: float
+    """
+    The number of seconds to delay before making the message available for another
+    attempt.
+    """
+
+
+class MqHTTPConsumer(TypedDict, total=False):
+    account_id: Required[str]
+    """A Resource identifier."""
+
+    dead_letter_queue: str
+
+    settings: MqHTTPConsumerSettings
+
+    type: Literal["http_pull"]
+
+
+class MqHTTPConsumerSettings(TypedDict, total=False):
+    batch_size: float
+    """The maximum number of messages to include in a batch."""
+
+    max_retries: float
+    """The maximum number of retries"""
+
+    retry_delay: float
+    """
+    The number of seconds to delay before making the message available for another
+    attempt.
+    """
+
+    visibility_timeout_ms: float
+    """The number of milliseconds that a message is exclusively leased.
+
+    After the timeout, the message becomes available for another attempt.
+    """
+
+
+ConsumerCreateParams: TypeAlias = Union[MqWorkerConsumer, MqHTTPConsumer]
diff --git a/src/cloudflare/types/queues/consumer_create_response.py b/src/cloudflare/types/queues/consumer_create_response.py
deleted file mode 100644
index 14efd41f1da..00000000000
--- a/src/cloudflare/types/queues/consumer_create_response.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ..._models import BaseModel
-
-__all__ = ["ConsumerCreateResponse", "Settings"]
-
-
-class Settings(BaseModel):
-    batch_size: Optional[float] = None
-    """The maximum number of messages to include in a batch"""
-
-    max_retries: Optional[float] = None
-
-    max_wait_time_ms: Optional[float] = None
-
-
-class ConsumerCreateResponse(BaseModel):
-    created_on: Optional[object] = None
-
-    dead_letter_queue: Optional[str] = None
-
-    environment: Optional[object] = None
-
-    queue_name: Optional[object] = None
-
-    script_name: Optional[object] = None
-
-    settings: Optional[Settings] = None
diff --git a/src/cloudflare/types/queues/consumer_delete_response.py b/src/cloudflare/types/queues/consumer_delete_response.py
index 341f83809a0..7de9b984436 100644
--- a/src/cloudflare/types/queues/consumer_delete_response.py
+++ b/src/cloudflare/types/queues/consumer_delete_response.py
@@ -1,7 +1,18 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Union
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+from ..shared.response_info import ResponseInfo
 
 __all__ = ["ConsumerDeleteResponse"]
 
-ConsumerDeleteResponse = Union[List[object], str, object, None]
+
+class ConsumerDeleteResponse(BaseModel):
+    errors: Optional[List[ResponseInfo]] = None
+
+    messages: Optional[List[str]] = None
+
+    success: Optional[Literal[True]] = None
+    """Indicates if the API call was successful or not."""
diff --git a/src/cloudflare/types/queues/consumer_get_response.py b/src/cloudflare/types/queues/consumer_get_response.py
deleted file mode 100644
index a812d05b30b..00000000000
--- a/src/cloudflare/types/queues/consumer_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .consumer import Consumer
-
-__all__ = ["ConsumerGetResponse"]
-
-ConsumerGetResponse = List[Consumer]
diff --git a/src/cloudflare/types/queues/consumer_update_params.py b/src/cloudflare/types/queues/consumer_update_params.py
index a741a247317..1c75d7948f0 100644
--- a/src/cloudflare/types/queues/consumer_update_params.py
+++ b/src/cloudflare/types/queues/consumer_update_params.py
@@ -2,16 +2,93 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
-__all__ = ["ConsumerUpdateParams"]
+__all__ = [
+    "ConsumerUpdateParams",
+    "MqWorkerConsumer",
+    "MqWorkerConsumerSettings",
+    "MqHTTPConsumer",
+    "MqHTTPConsumerSettings",
+]
 
 
-class ConsumerUpdateParams(TypedDict, total=False):
+class MqWorkerConsumer(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """A Resource identifier."""
 
     queue_id: Required[str]
-    """Identifier"""
+    """A Resource identifier."""
 
-    body: Required[object]
+    dead_letter_queue: str
+
+    script_name: str
+    """Name of a Worker"""
+
+    settings: MqWorkerConsumerSettings
+
+    type: Literal["worker"]
+
+
+class MqWorkerConsumerSettings(TypedDict, total=False):
+    batch_size: float
+    """The maximum number of messages to include in a batch."""
+
+    max_concurrency: float
+    """Maximum number of concurrent consumers that may consume from this Queue.
+
+    Set to `null` to automatically opt in to the platform's maximum (recommended).
+    """
+
+    max_retries: float
+    """The maximum number of retries"""
+
+    max_wait_time_ms: float
+    """
+    The number of milliseconds to wait for a batch to fill up before attempting to
+    deliver it
+    """
+
+    retry_delay: float
+    """
+    The number of seconds to delay before making the message available for another
+    attempt.
+    """
+
+
+class MqHTTPConsumer(TypedDict, total=False):
+    account_id: Required[str]
+    """A Resource identifier."""
+
+    queue_id: Required[str]
+    """A Resource identifier."""
+
+    dead_letter_queue: str
+
+    settings: MqHTTPConsumerSettings
+
+    type: Literal["http_pull"]
+
+
+class MqHTTPConsumerSettings(TypedDict, total=False):
+    batch_size: float
+    """The maximum number of messages to include in a batch."""
+
+    max_retries: float
+    """The maximum number of retries"""
+
+    retry_delay: float
+    """
+    The number of seconds to delay before making the message available for another
+    attempt.
+    """
+
+    visibility_timeout_ms: float
+    """The number of milliseconds that a message is exclusively leased.
+
+    After the timeout, the message becomes available for another attempt.
+    """
+
+
+ConsumerUpdateParams: TypeAlias = Union[MqWorkerConsumer, MqHTTPConsumer]
diff --git a/src/cloudflare/types/queues/consumer_update_response.py b/src/cloudflare/types/queues/consumer_update_response.py
deleted file mode 100644
index 5ce387b1acf..00000000000
--- a/src/cloudflare/types/queues/consumer_update_response.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ..._models import BaseModel
-
-__all__ = ["ConsumerUpdateResponse", "Settings"]
-
-
-class Settings(BaseModel):
-    batch_size: Optional[float] = None
-
-    max_retries: Optional[float] = None
-
-    max_wait_time_ms: Optional[float] = None
-
-
-class ConsumerUpdateResponse(BaseModel):
-    created_on: Optional[object] = None
-
-    dead_letter_queue: Optional[str] = None
-
-    environment: Optional[object] = None
-
-    queue_name: Optional[object] = None
-
-    script_name: Optional[object] = None
-
-    settings: Optional[Settings] = None
diff --git a/src/cloudflare/types/queues/message_ack_params.py b/src/cloudflare/types/queues/message_ack_params.py
index a076ef3df88..144cfac1f2f 100644
--- a/src/cloudflare/types/queues/message_ack_params.py
+++ b/src/cloudflare/types/queues/message_ack_params.py
@@ -10,7 +10,7 @@
 
 class MessageAckParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """A Resource identifier."""
 
     acks: Iterable[Ack]
 
@@ -19,7 +19,10 @@ class MessageAckParams(TypedDict, total=False):
 
 class Ack(TypedDict, total=False):
     lease_id: str
-    """Lease ID for a message to acknowledge."""
+    """An ID that represents an "in-flight" message that has been pulled from a Queue.
+
+    You must hold on to this ID and use it to acknowledge this message.
+    """
 
 
 class Retry(TypedDict, total=False):
@@ -30,4 +33,7 @@ class Retry(TypedDict, total=False):
     """
 
     lease_id: str
-    """Lease ID for a message to retry."""
+    """An ID that represents an "in-flight" message that has been pulled from a Queue.
+
+    You must hold on to this ID and use it to acknowledge this message.
+    """
diff --git a/src/cloudflare/types/queues/message_ack_response.py b/src/cloudflare/types/queues/message_ack_response.py
index c668fad5379..8b95c5cb92c 100644
--- a/src/cloudflare/types/queues/message_ack_response.py
+++ b/src/cloudflare/types/queues/message_ack_response.py
@@ -11,9 +11,9 @@
 
 class MessageAckResponse(BaseModel):
     ack_count: Optional[float] = FieldInfo(alias="ackCount", default=None)
-    """The number of messages that were succesfully acknowledged"""
+    """The number of messages that were succesfully acknowledged."""
 
     retry_count: Optional[float] = FieldInfo(alias="retryCount", default=None)
-    """The number of messages that were succesfully retried"""
+    """The number of messages that were succesfully retried."""
 
     warnings: Optional[List[str]] = None
diff --git a/src/cloudflare/types/queues/message_bulk_push_params.py b/src/cloudflare/types/queues/message_bulk_push_params.py
new file mode 100644
index 00000000000..8057dcb6740
--- /dev/null
+++ b/src/cloudflare/types/queues/message_bulk_push_params.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+__all__ = ["MessageBulkPushParams", "Message", "MessageMqQueueMessageText", "MessageMqQueueMessageJson"]
+
+
+class MessageBulkPushParams(TypedDict, total=False):
+    account_id: Required[str]
+    """A Resource identifier."""
+
+    delay_seconds: float
+    """The number of seconds to wait for attempting to deliver this batch to consumers"""
+
+    messages: Iterable[Message]
+
+
+class MessageMqQueueMessageText(TypedDict, total=False):
+    body: str
+
+    content_type: Literal["text"]
+
+    delay_seconds: float
+    """
+    The number of seconds to wait for attempting to deliver this message to
+    consumers
+    """
+
+
+class MessageMqQueueMessageJson(TypedDict, total=False):
+    body: object
+
+    content_type: Literal["json"]
+
+    delay_seconds: float
+    """
+    The number of seconds to wait for attempting to deliver this message to
+    consumers
+    """
+
+
+Message: TypeAlias = Union[MessageMqQueueMessageText, MessageMqQueueMessageJson]
diff --git a/src/cloudflare/types/queues/message_bulk_push_response.py b/src/cloudflare/types/queues/message_bulk_push_response.py
new file mode 100644
index 00000000000..5b73580cbcb
--- /dev/null
+++ b/src/cloudflare/types/queues/message_bulk_push_response.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+from ..shared.response_info import ResponseInfo
+
+__all__ = ["MessageBulkPushResponse"]
+
+
+class MessageBulkPushResponse(BaseModel):
+    errors: Optional[List[ResponseInfo]] = None
+
+    messages: Optional[List[str]] = None
+
+    success: Optional[Literal[True]] = None
+    """Indicates if the API call was successful or not."""
diff --git a/src/cloudflare/types/queues/message_pull_params.py b/src/cloudflare/types/queues/message_pull_params.py
index 02f48d4faec..2613f621005 100644
--- a/src/cloudflare/types/queues/message_pull_params.py
+++ b/src/cloudflare/types/queues/message_pull_params.py
@@ -9,10 +9,10 @@
 
 class MessagePullParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """A Resource identifier."""
 
     batch_size: float
-    """The maximum number of messages to include in a batch"""
+    """The maximum number of messages to include in a batch."""
 
     visibility_timeout_ms: float
     """The number of milliseconds that a message is exclusively leased.
diff --git a/src/cloudflare/types/queues/message_pull_response.py b/src/cloudflare/types/queues/message_pull_response.py
index 7944734a2cb..529a7132788 100644
--- a/src/cloudflare/types/queues/message_pull_response.py
+++ b/src/cloudflare/types/queues/message_pull_response.py
@@ -4,10 +4,10 @@
 
 from ..._models import BaseModel
 
-__all__ = ["MessagePullResponse", "MessagePullResponseItem"]
+__all__ = ["MessagePullResponse", "Message"]
 
 
-class MessagePullResponseItem(BaseModel):
+class Message(BaseModel):
     id: Optional[str] = None
 
     attempts: Optional[float] = None
@@ -15,10 +15,18 @@ class MessagePullResponseItem(BaseModel):
     body: Optional[str] = None
 
     lease_id: Optional[str] = None
+    """An ID that represents an "in-flight" message that has been pulled from a Queue.
+
+    You must hold on to this ID and use it to acknowledge this message.
+    """
 
     metadata: Optional[object] = None
 
     timestamp_ms: Optional[float] = None
 
 
-MessagePullResponse = List[MessagePullResponseItem]
+class MessagePullResponse(BaseModel):
+    message_backlog_count: Optional[float] = None
+    """The number of unacknowledged messages in the queue"""
+
+    messages: Optional[List[Message]] = None
diff --git a/src/cloudflare/types/queues/message_push_params.py b/src/cloudflare/types/queues/message_push_params.py
new file mode 100644
index 00000000000..d01605820d9
--- /dev/null
+++ b/src/cloudflare/types/queues/message_push_params.py
@@ -0,0 +1,41 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+__all__ = ["MessagePushParams", "MqQueueMessageText", "MqQueueMessageJson"]
+
+
+class MqQueueMessageText(TypedDict, total=False):
+    account_id: Required[str]
+    """A Resource identifier."""
+
+    body: str
+
+    content_type: Literal["text"]
+
+    delay_seconds: float
+    """
+    The number of seconds to wait for attempting to deliver this message to
+    consumers
+    """
+
+
+class MqQueueMessageJson(TypedDict, total=False):
+    account_id: Required[str]
+    """A Resource identifier."""
+
+    body: object
+
+    content_type: Literal["json"]
+
+    delay_seconds: float
+    """
+    The number of seconds to wait for attempting to deliver this message to
+    consumers
+    """
+
+
+MessagePushParams: TypeAlias = Union[MqQueueMessageText, MqQueueMessageJson]
diff --git a/src/cloudflare/types/queues/message_push_response.py b/src/cloudflare/types/queues/message_push_response.py
new file mode 100644
index 00000000000..73ae9465c1c
--- /dev/null
+++ b/src/cloudflare/types/queues/message_push_response.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+from ..shared.response_info import ResponseInfo
+
+__all__ = ["MessagePushResponse"]
+
+
+class MessagePushResponse(BaseModel):
+    errors: Optional[List[ResponseInfo]] = None
+
+    messages: Optional[List[str]] = None
+
+    success: Optional[Literal[True]] = None
+    """Indicates if the API call was successful or not."""
diff --git a/src/cloudflare/types/queues/purge_start_params.py b/src/cloudflare/types/queues/purge_start_params.py
new file mode 100644
index 00000000000..c6f16dc04c0
--- /dev/null
+++ b/src/cloudflare/types/queues/purge_start_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["PurgeStartParams"]
+
+
+class PurgeStartParams(TypedDict, total=False):
+    account_id: Required[str]
+    """A Resource identifier."""
+
+    delete_messages_permanently: bool
+    """Confimation that all messages will be deleted permanently."""
diff --git a/src/cloudflare/types/queues/purge_status_response.py b/src/cloudflare/types/queues/purge_status_response.py
new file mode 100644
index 00000000000..82578fa1f2b
--- /dev/null
+++ b/src/cloudflare/types/queues/purge_status_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["PurgeStatusResponse"]
+
+
+class PurgeStatusResponse(BaseModel):
+    completed: Optional[str] = None
+    """Indicates if the last purge operation completed successfully."""
+
+    started_at: Optional[str] = None
+    """Timestamp when the last purge operation started."""
diff --git a/src/cloudflare/types/queues/queue.py b/src/cloudflare/types/queues/queue.py
index 433e60db89c..9db9ab26583 100644
--- a/src/cloudflare/types/queues/queue.py
+++ b/src/cloudflare/types/queues/queue.py
@@ -1,25 +1,55 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import List, Union, Optional
+from typing_extensions import Literal, TypeAlias
 
+from .consumer import Consumer
 from ..._models import BaseModel
 
-__all__ = ["Queue"]
+__all__ = ["Queue", "Producer", "ProducerMqWorkerProducer", "ProducerMqR2Producer", "Settings"]
+
+
+class ProducerMqWorkerProducer(BaseModel):
+    script: Optional[str] = None
+
+    type: Optional[Literal["worker"]] = None
+
+
+class ProducerMqR2Producer(BaseModel):
+    bucket_name: Optional[str] = None
+
+    type: Optional[Literal["r2_bucket"]] = None
+
+
+Producer: TypeAlias = Union[ProducerMqWorkerProducer, ProducerMqR2Producer]
+
+
+class Settings(BaseModel):
+    delivery_delay: Optional[float] = None
+    """Number of seconds to delay delivery of all messages to consumers."""
+
+    delivery_paused: Optional[bool] = None
+    """Indicates if message delivery to consumers is currently paused."""
+
+    message_retention_period: Optional[float] = None
+    """Number of seconds after which an unconsumed message will be delayed."""
 
 
 class Queue(BaseModel):
-    consumers: Optional[object] = None
+    consumers: Optional[List[Consumer]] = None
 
-    consumers_total_count: Optional[object] = None
+    consumers_total_count: Optional[float] = None
 
-    created_on: Optional[object] = None
+    created_on: Optional[str] = None
 
-    modified_on: Optional[object] = None
+    modified_on: Optional[str] = None
 
-    producers: Optional[object] = None
+    producers: Optional[List[Producer]] = None
 
-    producers_total_count: Optional[object] = None
+    producers_total_count: Optional[float] = None
 
     queue_id: Optional[str] = None
 
     queue_name: Optional[str] = None
+
+    settings: Optional[Settings] = None
diff --git a/src/cloudflare/types/queues/queue_create_params.py b/src/cloudflare/types/queues/queue_create_params.py
index 218c011f9d0..e14f226a015 100644
--- a/src/cloudflare/types/queues/queue_create_params.py
+++ b/src/cloudflare/types/queues/queue_create_params.py
@@ -9,6 +9,6 @@
 
 class QueueCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """A Resource identifier."""
 
-    body: Required[object]
+    queue_name: Required[str]
diff --git a/src/cloudflare/types/queues/queue_created.py b/src/cloudflare/types/queues/queue_created.py
deleted file mode 100644
index 377e3f5a82d..00000000000
--- a/src/cloudflare/types/queues/queue_created.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ..._models import BaseModel
-
-__all__ = ["QueueCreated"]
-
-
-class QueueCreated(BaseModel):
-    created_on: Optional[object] = None
-
-    modified_on: Optional[object] = None
-
-    queue_id: Optional[str] = None
-
-    queue_name: Optional[str] = None
diff --git a/src/cloudflare/types/queues/queue_delete_response.py b/src/cloudflare/types/queues/queue_delete_response.py
index 4e660c2b0e0..91079074b40 100644
--- a/src/cloudflare/types/queues/queue_delete_response.py
+++ b/src/cloudflare/types/queues/queue_delete_response.py
@@ -1,7 +1,18 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Union
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+from ..shared.response_info import ResponseInfo
 
 __all__ = ["QueueDeleteResponse"]
 
-QueueDeleteResponse = Union[List[object], str, object, None]
+
+class QueueDeleteResponse(BaseModel):
+    errors: Optional[List[ResponseInfo]] = None
+
+    messages: Optional[List[str]] = None
+
+    success: Optional[Literal[True]] = None
+    """Indicates if the API call was successful or not."""
diff --git a/src/cloudflare/types/queues/queue_edit_params.py b/src/cloudflare/types/queues/queue_edit_params.py
new file mode 100644
index 00000000000..5b99c17dda8
--- /dev/null
+++ b/src/cloudflare/types/queues/queue_edit_params.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["QueueEditParams", "Settings"]
+
+
+class QueueEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """A Resource identifier."""
+
+    queue_name: str
+
+    settings: Settings
+
+
+class Settings(TypedDict, total=False):
+    delivery_delay: float
+    """Number of seconds to delay delivery of all messages to consumers."""
+
+    delivery_paused: bool
+    """Indicates if message delivery to consumers is currently paused."""
+
+    message_retention_period: float
+    """Number of seconds after which an unconsumed message will be delayed."""
diff --git a/src/cloudflare/types/queues/queue_update_params.py b/src/cloudflare/types/queues/queue_update_params.py
index e5f2bfc978c..9b53025f044 100644
--- a/src/cloudflare/types/queues/queue_update_params.py
+++ b/src/cloudflare/types/queues/queue_update_params.py
@@ -4,11 +4,24 @@
 
 from typing_extensions import Required, TypedDict
 
-__all__ = ["QueueUpdateParams"]
+__all__ = ["QueueUpdateParams", "Settings"]
 
 
 class QueueUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """A Resource identifier."""
 
-    body: Required[object]
+    queue_name: str
+
+    settings: Settings
+
+
+class Settings(TypedDict, total=False):
+    delivery_delay: float
+    """Number of seconds to delay delivery of all messages to consumers."""
+
+    delivery_paused: bool
+    """Indicates if message delivery to consumers is currently paused."""
+
+    message_retention_period: float
+    """Number of seconds after which an unconsumed message will be delayed."""
diff --git a/src/cloudflare/types/queues/queue_updated.py b/src/cloudflare/types/queues/queue_updated.py
deleted file mode 100644
index b3512d59720..00000000000
--- a/src/cloudflare/types/queues/queue_updated.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ..._models import BaseModel
-
-__all__ = ["QueueUpdated"]
-
-
-class QueueUpdated(BaseModel):
-    created_on: Optional[object] = None
-
-    modified_on: Optional[object] = None
-
-    queue_id: Optional[str] = None
-
-    queue_name: Optional[str] = None
diff --git a/src/cloudflare/types/queues/subscription_create_params.py b/src/cloudflare/types/queues/subscription_create_params.py
new file mode 100644
index 00000000000..5540bee2746
--- /dev/null
+++ b/src/cloudflare/types/queues/subscription_create_params.py
@@ -0,0 +1,113 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = [
+    "SubscriptionCreateParams",
+    "Destination",
+    "Source",
+    "SourceMqEventSourceImages",
+    "SourceMqEventSourceKV",
+    "SourceMqEventSourceR2",
+    "SourceMqEventSourceSuperSlurper",
+    "SourceMqEventSourceVectorize",
+    "SourceMqEventSourceWorkersAIModel",
+    "SourceMqEventSourceWorkersBuildsWorker",
+    "SourceMqEventSourceWorkflowsWorkflow",
+]
+
+
+class SubscriptionCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """A Resource identifier."""
+
+    destination: Destination
+    """Destination configuration for the subscription"""
+
+    enabled: bool
+    """Whether the subscription is active"""
+
+    events: SequenceNotStr[str]
+    """List of event types this subscription handles"""
+
+    name: str
+    """Name of the subscription"""
+
+    source: Source
+    """Source configuration for the subscription"""
+
+
+class Destination(TypedDict, total=False):
+    """Destination configuration for the subscription"""
+
+    queue_id: Required[str]
+    """ID of the target queue"""
+
+    type: Required[Literal["queues.queue"]]
+    """Type of destination"""
+
+
+class SourceMqEventSourceImages(TypedDict, total=False):
+    type: Literal["images"]
+    """Type of source"""
+
+
+class SourceMqEventSourceKV(TypedDict, total=False):
+    type: Literal["kv"]
+    """Type of source"""
+
+
+class SourceMqEventSourceR2(TypedDict, total=False):
+    type: Literal["r2"]
+    """Type of source"""
+
+
+class SourceMqEventSourceSuperSlurper(TypedDict, total=False):
+    type: Literal["superSlurper"]
+    """Type of source"""
+
+
+class SourceMqEventSourceVectorize(TypedDict, total=False):
+    type: Literal["vectorize"]
+    """Type of source"""
+
+
+class SourceMqEventSourceWorkersAIModel(TypedDict, total=False):
+    model_name: str
+    """Name of the Workers AI model"""
+
+    type: Literal["workersAi.model"]
+    """Type of source"""
+
+
+class SourceMqEventSourceWorkersBuildsWorker(TypedDict, total=False):
+    type: Literal["workersBuilds.worker"]
+    """Type of source"""
+
+    worker_name: str
+    """Name of the worker"""
+
+
+class SourceMqEventSourceWorkflowsWorkflow(TypedDict, total=False):
+    type: Literal["workflows.workflow"]
+    """Type of source"""
+
+    workflow_name: str
+    """Name of the workflow"""
+
+
+Source: TypeAlias = Union[
+    SourceMqEventSourceImages,
+    SourceMqEventSourceKV,
+    SourceMqEventSourceR2,
+    SourceMqEventSourceSuperSlurper,
+    SourceMqEventSourceVectorize,
+    SourceMqEventSourceWorkersAIModel,
+    SourceMqEventSourceWorkersBuildsWorker,
+    SourceMqEventSourceWorkflowsWorkflow,
+]
diff --git a/src/cloudflare/types/queues/subscription_create_response.py b/src/cloudflare/types/queues/subscription_create_response.py
new file mode 100644
index 00000000000..1e8b3382ad5
--- /dev/null
+++ b/src/cloudflare/types/queues/subscription_create_response.py
@@ -0,0 +1,120 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "SubscriptionCreateResponse",
+    "Destination",
+    "Source",
+    "SourceMqEventSourceImages",
+    "SourceMqEventSourceKV",
+    "SourceMqEventSourceR2",
+    "SourceMqEventSourceSuperSlurper",
+    "SourceMqEventSourceVectorize",
+    "SourceMqEventSourceWorkersAIModel",
+    "SourceMqEventSourceWorkersBuildsWorker",
+    "SourceMqEventSourceWorkflowsWorkflow",
+]
+
+
+class Destination(BaseModel):
+    """Destination configuration for the subscription"""
+
+    queue_id: str
+    """ID of the target queue"""
+
+    type: Literal["queues.queue"]
+    """Type of destination"""
+
+
+class SourceMqEventSourceImages(BaseModel):
+    type: Optional[Literal["images"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceKV(BaseModel):
+    type: Optional[Literal["kv"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceR2(BaseModel):
+    type: Optional[Literal["r2"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceSuperSlurper(BaseModel):
+    type: Optional[Literal["superSlurper"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceVectorize(BaseModel):
+    type: Optional[Literal["vectorize"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceWorkersAIModel(BaseModel):
+    ai_model_name: Optional[str] = FieldInfo(alias="model_name", default=None)
+    """Name of the Workers AI model"""
+
+    type: Optional[Literal["workersAi.model"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceWorkersBuildsWorker(BaseModel):
+    type: Optional[Literal["workersBuilds.worker"]] = None
+    """Type of source"""
+
+    worker_name: Optional[str] = None
+    """Name of the worker"""
+
+
+class SourceMqEventSourceWorkflowsWorkflow(BaseModel):
+    type: Optional[Literal["workflows.workflow"]] = None
+    """Type of source"""
+
+    workflow_name: Optional[str] = None
+    """Name of the workflow"""
+
+
+Source: TypeAlias = Union[
+    SourceMqEventSourceImages,
+    SourceMqEventSourceKV,
+    SourceMqEventSourceR2,
+    SourceMqEventSourceSuperSlurper,
+    SourceMqEventSourceVectorize,
+    SourceMqEventSourceWorkersAIModel,
+    SourceMqEventSourceWorkersBuildsWorker,
+    SourceMqEventSourceWorkflowsWorkflow,
+]
+
+
+class SubscriptionCreateResponse(BaseModel):
+    id: str
+    """Unique identifier for the subscription"""
+
+    created_at: datetime
+    """When the subscription was created"""
+
+    destination: Destination
+    """Destination configuration for the subscription"""
+
+    enabled: bool
+    """Whether the subscription is active"""
+
+    events: List[str]
+    """List of event types this subscription handles"""
+
+    modified_at: datetime
+    """When the subscription was last modified"""
+
+    name: str
+    """Name of the subscription"""
+
+    source: Source
+    """Source configuration for the subscription"""
diff --git a/src/cloudflare/types/queues/subscription_delete_response.py b/src/cloudflare/types/queues/subscription_delete_response.py
new file mode 100644
index 00000000000..23b1b21461f
--- /dev/null
+++ b/src/cloudflare/types/queues/subscription_delete_response.py
@@ -0,0 +1,120 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "SubscriptionDeleteResponse",
+    "Destination",
+    "Source",
+    "SourceMqEventSourceImages",
+    "SourceMqEventSourceKV",
+    "SourceMqEventSourceR2",
+    "SourceMqEventSourceSuperSlurper",
+    "SourceMqEventSourceVectorize",
+    "SourceMqEventSourceWorkersAIModel",
+    "SourceMqEventSourceWorkersBuildsWorker",
+    "SourceMqEventSourceWorkflowsWorkflow",
+]
+
+
+class Destination(BaseModel):
+    """Destination configuration for the subscription"""
+
+    queue_id: str
+    """ID of the target queue"""
+
+    type: Literal["queues.queue"]
+    """Type of destination"""
+
+
+class SourceMqEventSourceImages(BaseModel):
+    type: Optional[Literal["images"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceKV(BaseModel):
+    type: Optional[Literal["kv"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceR2(BaseModel):
+    type: Optional[Literal["r2"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceSuperSlurper(BaseModel):
+    type: Optional[Literal["superSlurper"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceVectorize(BaseModel):
+    type: Optional[Literal["vectorize"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceWorkersAIModel(BaseModel):
+    ai_model_name: Optional[str] = FieldInfo(alias="model_name", default=None)
+    """Name of the Workers AI model"""
+
+    type: Optional[Literal["workersAi.model"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceWorkersBuildsWorker(BaseModel):
+    type: Optional[Literal["workersBuilds.worker"]] = None
+    """Type of source"""
+
+    worker_name: Optional[str] = None
+    """Name of the worker"""
+
+
+class SourceMqEventSourceWorkflowsWorkflow(BaseModel):
+    type: Optional[Literal["workflows.workflow"]] = None
+    """Type of source"""
+
+    workflow_name: Optional[str] = None
+    """Name of the workflow"""
+
+
+Source: TypeAlias = Union[
+    SourceMqEventSourceImages,
+    SourceMqEventSourceKV,
+    SourceMqEventSourceR2,
+    SourceMqEventSourceSuperSlurper,
+    SourceMqEventSourceVectorize,
+    SourceMqEventSourceWorkersAIModel,
+    SourceMqEventSourceWorkersBuildsWorker,
+    SourceMqEventSourceWorkflowsWorkflow,
+]
+
+
+class SubscriptionDeleteResponse(BaseModel):
+    id: str
+    """Unique identifier for the subscription"""
+
+    created_at: datetime
+    """When the subscription was created"""
+
+    destination: Destination
+    """Destination configuration for the subscription"""
+
+    enabled: bool
+    """Whether the subscription is active"""
+
+    events: List[str]
+    """List of event types this subscription handles"""
+
+    modified_at: datetime
+    """When the subscription was last modified"""
+
+    name: str
+    """Name of the subscription"""
+
+    source: Source
+    """Source configuration for the subscription"""
diff --git a/src/cloudflare/types/queues/subscription_get_response.py b/src/cloudflare/types/queues/subscription_get_response.py
new file mode 100644
index 00000000000..41f0b4b8a2a
--- /dev/null
+++ b/src/cloudflare/types/queues/subscription_get_response.py
@@ -0,0 +1,120 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "SubscriptionGetResponse",
+    "Destination",
+    "Source",
+    "SourceMqEventSourceImages",
+    "SourceMqEventSourceKV",
+    "SourceMqEventSourceR2",
+    "SourceMqEventSourceSuperSlurper",
+    "SourceMqEventSourceVectorize",
+    "SourceMqEventSourceWorkersAIModel",
+    "SourceMqEventSourceWorkersBuildsWorker",
+    "SourceMqEventSourceWorkflowsWorkflow",
+]
+
+
+class Destination(BaseModel):
+    """Destination configuration for the subscription"""
+
+    queue_id: str
+    """ID of the target queue"""
+
+    type: Literal["queues.queue"]
+    """Type of destination"""
+
+
+class SourceMqEventSourceImages(BaseModel):
+    type: Optional[Literal["images"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceKV(BaseModel):
+    type: Optional[Literal["kv"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceR2(BaseModel):
+    type: Optional[Literal["r2"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceSuperSlurper(BaseModel):
+    type: Optional[Literal["superSlurper"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceVectorize(BaseModel):
+    type: Optional[Literal["vectorize"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceWorkersAIModel(BaseModel):
+    ai_model_name: Optional[str] = FieldInfo(alias="model_name", default=None)
+    """Name of the Workers AI model"""
+
+    type: Optional[Literal["workersAi.model"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceWorkersBuildsWorker(BaseModel):
+    type: Optional[Literal["workersBuilds.worker"]] = None
+    """Type of source"""
+
+    worker_name: Optional[str] = None
+    """Name of the worker"""
+
+
+class SourceMqEventSourceWorkflowsWorkflow(BaseModel):
+    type: Optional[Literal["workflows.workflow"]] = None
+    """Type of source"""
+
+    workflow_name: Optional[str] = None
+    """Name of the workflow"""
+
+
+Source: TypeAlias = Union[
+    SourceMqEventSourceImages,
+    SourceMqEventSourceKV,
+    SourceMqEventSourceR2,
+    SourceMqEventSourceSuperSlurper,
+    SourceMqEventSourceVectorize,
+    SourceMqEventSourceWorkersAIModel,
+    SourceMqEventSourceWorkersBuildsWorker,
+    SourceMqEventSourceWorkflowsWorkflow,
+]
+
+
+class SubscriptionGetResponse(BaseModel):
+    id: str
+    """Unique identifier for the subscription"""
+
+    created_at: datetime
+    """When the subscription was created"""
+
+    destination: Destination
+    """Destination configuration for the subscription"""
+
+    enabled: bool
+    """Whether the subscription is active"""
+
+    events: List[str]
+    """List of event types this subscription handles"""
+
+    modified_at: datetime
+    """When the subscription was last modified"""
+
+    name: str
+    """Name of the subscription"""
+
+    source: Source
+    """Source configuration for the subscription"""
diff --git a/src/cloudflare/types/queues/subscription_list_params.py b/src/cloudflare/types/queues/subscription_list_params.py
new file mode 100644
index 00000000000..362a6d63b93
--- /dev/null
+++ b/src/cloudflare/types/queues/subscription_list_params.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["SubscriptionListParams"]
+
+
+class SubscriptionListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """A Resource identifier."""
+
+    direction: Literal["asc", "desc"]
+    """Sort direction"""
+
+    order: Literal["created_at", "name", "enabled", "source"]
+    """Field to sort by"""
+
+    page: int
+    """Page number for pagination"""
+
+    per_page: int
+    """Number of items per page"""
diff --git a/src/cloudflare/types/queues/subscription_list_response.py b/src/cloudflare/types/queues/subscription_list_response.py
new file mode 100644
index 00000000000..b5efb0e25e6
--- /dev/null
+++ b/src/cloudflare/types/queues/subscription_list_response.py
@@ -0,0 +1,120 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "SubscriptionListResponse",
+    "Destination",
+    "Source",
+    "SourceMqEventSourceImages",
+    "SourceMqEventSourceKV",
+    "SourceMqEventSourceR2",
+    "SourceMqEventSourceSuperSlurper",
+    "SourceMqEventSourceVectorize",
+    "SourceMqEventSourceWorkersAIModel",
+    "SourceMqEventSourceWorkersBuildsWorker",
+    "SourceMqEventSourceWorkflowsWorkflow",
+]
+
+
+class Destination(BaseModel):
+    """Destination configuration for the subscription"""
+
+    queue_id: str
+    """ID of the target queue"""
+
+    type: Literal["queues.queue"]
+    """Type of destination"""
+
+
+class SourceMqEventSourceImages(BaseModel):
+    type: Optional[Literal["images"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceKV(BaseModel):
+    type: Optional[Literal["kv"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceR2(BaseModel):
+    type: Optional[Literal["r2"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceSuperSlurper(BaseModel):
+    type: Optional[Literal["superSlurper"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceVectorize(BaseModel):
+    type: Optional[Literal["vectorize"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceWorkersAIModel(BaseModel):
+    ai_model_name: Optional[str] = FieldInfo(alias="model_name", default=None)
+    """Name of the Workers AI model"""
+
+    type: Optional[Literal["workersAi.model"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceWorkersBuildsWorker(BaseModel):
+    type: Optional[Literal["workersBuilds.worker"]] = None
+    """Type of source"""
+
+    worker_name: Optional[str] = None
+    """Name of the worker"""
+
+
+class SourceMqEventSourceWorkflowsWorkflow(BaseModel):
+    type: Optional[Literal["workflows.workflow"]] = None
+    """Type of source"""
+
+    workflow_name: Optional[str] = None
+    """Name of the workflow"""
+
+
+Source: TypeAlias = Union[
+    SourceMqEventSourceImages,
+    SourceMqEventSourceKV,
+    SourceMqEventSourceR2,
+    SourceMqEventSourceSuperSlurper,
+    SourceMqEventSourceVectorize,
+    SourceMqEventSourceWorkersAIModel,
+    SourceMqEventSourceWorkersBuildsWorker,
+    SourceMqEventSourceWorkflowsWorkflow,
+]
+
+
+class SubscriptionListResponse(BaseModel):
+    id: str
+    """Unique identifier for the subscription"""
+
+    created_at: datetime
+    """When the subscription was created"""
+
+    destination: Destination
+    """Destination configuration for the subscription"""
+
+    enabled: bool
+    """Whether the subscription is active"""
+
+    events: List[str]
+    """List of event types this subscription handles"""
+
+    modified_at: datetime
+    """When the subscription was last modified"""
+
+    name: str
+    """Name of the subscription"""
+
+    source: Source
+    """Source configuration for the subscription"""
diff --git a/src/cloudflare/types/queues/subscription_update_params.py b/src/cloudflare/types/queues/subscription_update_params.py
new file mode 100644
index 00000000000..e1b9a00c85e
--- /dev/null
+++ b/src/cloudflare/types/queues/subscription_update_params.py
@@ -0,0 +1,36 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["SubscriptionUpdateParams", "Destination"]
+
+
+class SubscriptionUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """A Resource identifier."""
+
+    destination: Destination
+    """Destination configuration for the subscription"""
+
+    enabled: bool
+    """Whether the subscription is active"""
+
+    events: SequenceNotStr[str]
+    """List of event types this subscription handles"""
+
+    name: str
+    """Name of the subscription"""
+
+
+class Destination(TypedDict, total=False):
+    """Destination configuration for the subscription"""
+
+    queue_id: Required[str]
+    """ID of the target queue"""
+
+    type: Required[Literal["queues.queue"]]
+    """Type of destination"""
diff --git a/src/cloudflare/types/queues/subscription_update_response.py b/src/cloudflare/types/queues/subscription_update_response.py
new file mode 100644
index 00000000000..a65f9c39d68
--- /dev/null
+++ b/src/cloudflare/types/queues/subscription_update_response.py
@@ -0,0 +1,120 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "SubscriptionUpdateResponse",
+    "Destination",
+    "Source",
+    "SourceMqEventSourceImages",
+    "SourceMqEventSourceKV",
+    "SourceMqEventSourceR2",
+    "SourceMqEventSourceSuperSlurper",
+    "SourceMqEventSourceVectorize",
+    "SourceMqEventSourceWorkersAIModel",
+    "SourceMqEventSourceWorkersBuildsWorker",
+    "SourceMqEventSourceWorkflowsWorkflow",
+]
+
+
+class Destination(BaseModel):
+    """Destination configuration for the subscription"""
+
+    queue_id: str
+    """ID of the target queue"""
+
+    type: Literal["queues.queue"]
+    """Type of destination"""
+
+
+class SourceMqEventSourceImages(BaseModel):
+    type: Optional[Literal["images"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceKV(BaseModel):
+    type: Optional[Literal["kv"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceR2(BaseModel):
+    type: Optional[Literal["r2"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceSuperSlurper(BaseModel):
+    type: Optional[Literal["superSlurper"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceVectorize(BaseModel):
+    type: Optional[Literal["vectorize"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceWorkersAIModel(BaseModel):
+    ai_model_name: Optional[str] = FieldInfo(alias="model_name", default=None)
+    """Name of the Workers AI model"""
+
+    type: Optional[Literal["workersAi.model"]] = None
+    """Type of source"""
+
+
+class SourceMqEventSourceWorkersBuildsWorker(BaseModel):
+    type: Optional[Literal["workersBuilds.worker"]] = None
+    """Type of source"""
+
+    worker_name: Optional[str] = None
+    """Name of the worker"""
+
+
+class SourceMqEventSourceWorkflowsWorkflow(BaseModel):
+    type: Optional[Literal["workflows.workflow"]] = None
+    """Type of source"""
+
+    workflow_name: Optional[str] = None
+    """Name of the workflow"""
+
+
+Source: TypeAlias = Union[
+    SourceMqEventSourceImages,
+    SourceMqEventSourceKV,
+    SourceMqEventSourceR2,
+    SourceMqEventSourceSuperSlurper,
+    SourceMqEventSourceVectorize,
+    SourceMqEventSourceWorkersAIModel,
+    SourceMqEventSourceWorkersBuildsWorker,
+    SourceMqEventSourceWorkflowsWorkflow,
+]
+
+
+class SubscriptionUpdateResponse(BaseModel):
+    id: str
+    """Unique identifier for the subscription"""
+
+    created_at: datetime
+    """When the subscription was created"""
+
+    destination: Destination
+    """Destination configuration for the subscription"""
+
+    enabled: bool
+    """Whether the subscription is active"""
+
+    events: List[str]
+    """List of event types this subscription handles"""
+
+    modified_at: datetime
+    """When the subscription was last modified"""
+
+    name: str
+    """Name of the subscription"""
+
+    source: Source
+    """Source configuration for the subscription"""
diff --git a/src/cloudflare/types/r2/__init__.py b/src/cloudflare/types/r2/__init__.py
index a4a10ec7a7c..3662b5be035 100644
--- a/src/cloudflare/types/r2/__init__.py
+++ b/src/cloudflare/types/r2/__init__.py
@@ -2,12 +2,9 @@
 
 from __future__ import annotations
 
-from .sippy import Sippy as Sippy
 from .bucket import Bucket as Bucket
-from .provider import Provider as Provider
 from .bucket_list_params import BucketListParams as BucketListParams
-from .sippy_update_params import SippyUpdateParams as SippyUpdateParams
 from .bucket_create_params import BucketCreateParams as BucketCreateParams
-from .sippy_delete_response import SippyDeleteResponse as SippyDeleteResponse
+from .bucket_list_response import BucketListResponse as BucketListResponse
 from .temporary_credential_create_params import TemporaryCredentialCreateParams as TemporaryCredentialCreateParams
 from .temporary_credential_create_response import TemporaryCredentialCreateResponse as TemporaryCredentialCreateResponse
diff --git a/src/cloudflare/types/r2/bucket.py b/src/cloudflare/types/r2/bucket.py
index aa601305f38..ec3dd21cf27 100644
--- a/src/cloudflare/types/r2/bucket.py
+++ b/src/cloudflare/types/r2/bucket.py
@@ -9,14 +9,19 @@
 
 
 class Bucket(BaseModel):
+    """A single R2 bucket."""
+
     creation_date: Optional[str] = None
-    """Creation timestamp"""
+    """Creation timestamp."""
+
+    jurisdiction: Optional[Literal["default", "eu", "fedramp"]] = None
+    """Jurisdiction where objects in this bucket are guaranteed to be stored."""
 
-    location: Optional[Literal["apac", "eeur", "enam", "weur", "wnam"]] = None
-    """Location of the bucket"""
+    location: Optional[Literal["apac", "eeur", "enam", "weur", "wnam", "oc"]] = None
+    """Location of the bucket."""
 
     name: Optional[str] = None
-    """Name of the bucket"""
+    """Name of the bucket."""
 
     storage_class: Optional[Literal["Standard", "InfrequentAccess"]] = None
     """Storage class for newly uploaded objects, unless specified otherwise."""
diff --git a/src/cloudflare/types/r2/bucket_create_params.py b/src/cloudflare/types/r2/bucket_create_params.py
index ad5ad8a75b3..ca5f063a071 100644
--- a/src/cloudflare/types/r2/bucket_create_params.py
+++ b/src/cloudflare/types/r2/bucket_create_params.py
@@ -11,13 +11,16 @@
 
 class BucketCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Account ID"""
+    """Account ID."""
 
     name: Required[str]
-    """Name of the bucket"""
+    """Name of the bucket."""
 
-    location_hint: Annotated[Literal["apac", "eeur", "enam", "weur", "wnam"], PropertyInfo(alias="locationHint")]
-    """Location of the bucket"""
+    location_hint: Annotated[Literal["apac", "eeur", "enam", "weur", "wnam", "oc"], PropertyInfo(alias="locationHint")]
+    """Location of the bucket."""
 
     storage_class: Annotated[Literal["Standard", "InfrequentAccess"], PropertyInfo(alias="storageClass")]
     """Storage class for newly uploaded objects, unless specified otherwise."""
+
+    jurisdiction: Annotated[Literal["default", "eu", "fedramp"], PropertyInfo(alias="cf-r2-jurisdiction")]
+    """Jurisdiction where objects in this bucket are guaranteed to be stored."""
diff --git a/src/cloudflare/types/r2/bucket_list_params.py b/src/cloudflare/types/r2/bucket_list_params.py
index 260b44c7073..6370982092d 100644
--- a/src/cloudflare/types/r2/bucket_list_params.py
+++ b/src/cloudflare/types/r2/bucket_list_params.py
@@ -2,14 +2,16 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
 
 __all__ = ["BucketListParams"]
 
 
 class BucketListParams(TypedDict, total=False):
     account_id: Required[str]
-    """Account ID"""
+    """Account ID."""
 
     cursor: str
     """Pagination cursor received during the last List Buckets call.
@@ -18,7 +20,7 @@ class BucketListParams(TypedDict, total=False):
     """
 
     direction: Literal["asc", "desc"]
-    """Direction to order buckets"""
+    """Direction to order buckets."""
 
     name_contains: str
     """Bucket names to filter by.
@@ -27,10 +29,13 @@ class BucketListParams(TypedDict, total=False):
     """
 
     order: Literal["name"]
-    """Field to order buckets by"""
+    """Field to order buckets by."""
 
     per_page: float
-    """Maximum number of buckets to return in a single call"""
+    """Maximum number of buckets to return in a single call."""
 
     start_after: str
     """Bucket name to start searching after. Buckets are ordered lexicographically."""
+
+    jurisdiction: Annotated[Literal["default", "eu", "fedramp"], PropertyInfo(alias="cf-r2-jurisdiction")]
+    """Jurisdiction where objects in this bucket are guaranteed to be stored."""
diff --git a/src/cloudflare/types/r2/bucket_list_response.py b/src/cloudflare/types/r2/bucket_list_response.py
new file mode 100755
index 00000000000..a52999502b5
--- /dev/null
+++ b/src/cloudflare/types/r2/bucket_list_response.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from .bucket import Bucket
+from ..._models import BaseModel
+
+__all__ = ["BucketListResponse"]
+
+
+class BucketListResponse(BaseModel):
+    buckets: Optional[List[Bucket]] = None
diff --git a/src/cloudflare/types/r2/buckets/__init__.py b/src/cloudflare/types/r2/buckets/__init__.py
new file mode 100644
index 00000000000..8fffe97f94f
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/__init__.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .sippy import Sippy as Sippy
+from .provider import Provider as Provider
+from .cors_get_response import CORSGetResponse as CORSGetResponse
+from .lock_get_response import LockGetResponse as LockGetResponse
+from .cors_update_params import CORSUpdateParams as CORSUpdateParams
+from .lock_update_params import LockUpdateParams as LockUpdateParams
+from .sippy_update_params import SippyUpdateParams as SippyUpdateParams
+from .metric_list_response import MetricListResponse as MetricListResponse
+from .sippy_delete_response import SippyDeleteResponse as SippyDeleteResponse
+from .lifecycle_get_response import LifecycleGetResponse as LifecycleGetResponse
+from .lifecycle_update_params import LifecycleUpdateParams as LifecycleUpdateParams
+from .event_notification_get_response import EventNotificationGetResponse as EventNotificationGetResponse
+from .event_notification_list_response import EventNotificationListResponse as EventNotificationListResponse
+from .event_notification_update_params import EventNotificationUpdateParams as EventNotificationUpdateParams
diff --git a/src/cloudflare/types/r2/buckets/cors_get_response.py b/src/cloudflare/types/r2/buckets/cors_get_response.py
new file mode 100644
index 00000000000..4b6e58a9443
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/cors_get_response.py
@@ -0,0 +1,61 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["CORSGetResponse", "Rule", "RuleAllowed"]
+
+
+class RuleAllowed(BaseModel):
+    """Object specifying allowed origins, methods and headers for this CORS rule."""
+
+    methods: List[Literal["GET", "PUT", "POST", "DELETE", "HEAD"]]
+    """
+    Specifies the value for the Access-Control-Allow-Methods header R2 sets when
+    requesting objects in a bucket from a browser.
+    """
+
+    origins: List[str]
+    """
+    Specifies the value for the Access-Control-Allow-Origin header R2 sets when
+    requesting objects in a bucket from a browser.
+    """
+
+    headers: Optional[List[str]] = None
+    """
+    Specifies the value for the Access-Control-Allow-Headers header R2 sets when
+    requesting objects in this bucket from a browser. Cross-origin requests that
+    include custom headers (e.g. x-user-id) should specify these headers as
+    AllowedHeaders.
+    """
+
+
+class Rule(BaseModel):
+    allowed: RuleAllowed
+    """Object specifying allowed origins, methods and headers for this CORS rule."""
+
+    id: Optional[str] = None
+    """Identifier for this rule."""
+
+    expose_headers: Optional[List[str]] = FieldInfo(alias="exposeHeaders", default=None)
+    """
+    Specifies the headers that can be exposed back, and accessed by, the JavaScript
+    making the cross-origin request. If you need to access headers beyond the
+    safelisted response headers, such as Content-Encoding or cf-cache-status, you
+    must specify it here.
+    """
+
+    max_age_seconds: Optional[float] = FieldInfo(alias="maxAgeSeconds", default=None)
+    """
+    Specifies the amount of time (in seconds) browsers are allowed to cache CORS
+    preflight responses. Browsers may limit this to 2 hours or less, even if the
+    maximum value (86400) is specified.
+    """
+
+
+class CORSGetResponse(BaseModel):
+    rules: Optional[List[Rule]] = None
diff --git a/src/cloudflare/types/r2/buckets/cors_update_params.py b/src/cloudflare/types/r2/buckets/cors_update_params.py
new file mode 100644
index 00000000000..7525dd3ce7d
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/cors_update_params.py
@@ -0,0 +1,68 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Iterable
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["CORSUpdateParams", "Rule", "RuleAllowed"]
+
+
+class CORSUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    rules: Iterable[Rule]
+
+    jurisdiction: Annotated[Literal["default", "eu", "fedramp"], PropertyInfo(alias="cf-r2-jurisdiction")]
+    """Jurisdiction where objects in this bucket are guaranteed to be stored."""
+
+
+class RuleAllowed(TypedDict, total=False):
+    """Object specifying allowed origins, methods and headers for this CORS rule."""
+
+    methods: Required[List[Literal["GET", "PUT", "POST", "DELETE", "HEAD"]]]
+    """
+    Specifies the value for the Access-Control-Allow-Methods header R2 sets when
+    requesting objects in a bucket from a browser.
+    """
+
+    origins: Required[SequenceNotStr[str]]
+    """
+    Specifies the value for the Access-Control-Allow-Origin header R2 sets when
+    requesting objects in a bucket from a browser.
+    """
+
+    headers: SequenceNotStr[str]
+    """
+    Specifies the value for the Access-Control-Allow-Headers header R2 sets when
+    requesting objects in this bucket from a browser. Cross-origin requests that
+    include custom headers (e.g. x-user-id) should specify these headers as
+    AllowedHeaders.
+    """
+
+
+class Rule(TypedDict, total=False):
+    allowed: Required[RuleAllowed]
+    """Object specifying allowed origins, methods and headers for this CORS rule."""
+
+    id: str
+    """Identifier for this rule."""
+
+    expose_headers: Annotated[SequenceNotStr[str], PropertyInfo(alias="exposeHeaders")]
+    """
+    Specifies the headers that can be exposed back, and accessed by, the JavaScript
+    making the cross-origin request. If you need to access headers beyond the
+    safelisted response headers, such as Content-Encoding or cf-cache-status, you
+    must specify it here.
+    """
+
+    max_age_seconds: Annotated[float, PropertyInfo(alias="maxAgeSeconds")]
+    """
+    Specifies the amount of time (in seconds) browsers are allowed to cache CORS
+    preflight responses. Browsers may limit this to 2 hours or less, even if the
+    maximum value (86400) is specified.
+    """
diff --git a/src/cloudflare/types/r2/buckets/domains/__init__.py b/src/cloudflare/types/r2/buckets/domains/__init__.py
new file mode 100644
index 00000000000..3848ddc7940
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/domains/__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_get_response import CustomGetResponse as CustomGetResponse
+from .custom_create_params import CustomCreateParams as CustomCreateParams
+from .custom_list_response import CustomListResponse as CustomListResponse
+from .custom_update_params import CustomUpdateParams as CustomUpdateParams
+from .managed_list_response import ManagedListResponse as ManagedListResponse
+from .managed_update_params import ManagedUpdateParams as ManagedUpdateParams
+from .custom_create_response import CustomCreateResponse as CustomCreateResponse
+from .custom_delete_response import CustomDeleteResponse as CustomDeleteResponse
+from .custom_update_response import CustomUpdateResponse as CustomUpdateResponse
+from .managed_update_response import ManagedUpdateResponse as ManagedUpdateResponse
diff --git a/src/cloudflare/types/r2/buckets/domains/custom_create_params.py b/src/cloudflare/types/r2/buckets/domains/custom_create_params.py
new file mode 100644
index 00000000000..9c66d7810dd
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/domains/custom_create_params.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ....._types import SequenceNotStr
+from ....._utils import PropertyInfo
+
+__all__ = ["CustomCreateParams"]
+
+
+class CustomCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    domain: Required[str]
+    """Name of the custom domain to be added."""
+
+    enabled: Required[bool]
+    """Whether to enable public bucket access at the custom domain.
+
+    If undefined, the domain will be enabled.
+    """
+
+    zone_id: Required[Annotated[str, PropertyInfo(alias="zoneId")]]
+    """Zone ID of the custom domain."""
+
+    ciphers: SequenceNotStr[str]
+    """An allowlist of ciphers for TLS termination.
+
+    These ciphers must be in the BoringSSL format.
+    """
+
+    min_tls: Annotated[Literal["1.0", "1.1", "1.2", "1.3"], PropertyInfo(alias="minTLS")]
+    """Minimum TLS Version the custom domain will accept for incoming connections.
+
+    If not set, defaults to 1.0.
+    """
+
+    jurisdiction: Annotated[Literal["default", "eu", "fedramp"], PropertyInfo(alias="cf-r2-jurisdiction")]
+    """Jurisdiction where objects in this bucket are guaranteed to be stored."""
diff --git a/src/cloudflare/types/r2/buckets/domains/custom_create_response.py b/src/cloudflare/types/r2/buckets/domains/custom_create_response.py
new file mode 100644
index 00000000000..88a05be4d0e
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/domains/custom_create_response.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = ["CustomCreateResponse"]
+
+
+class CustomCreateResponse(BaseModel):
+    domain: str
+    """Domain name of the affected custom domain."""
+
+    enabled: bool
+    """Whether this bucket is publicly accessible at the specified custom domain."""
+
+    ciphers: Optional[List[str]] = None
+    """An allowlist of ciphers for TLS termination.
+
+    These ciphers must be in the BoringSSL format.
+    """
+
+    min_tls: Optional[Literal["1.0", "1.1", "1.2", "1.3"]] = FieldInfo(alias="minTLS", default=None)
+    """Minimum TLS Version the custom domain will accept for incoming connections.
+
+    If not set, defaults to 1.0.
+    """
diff --git a/src/cloudflare/types/r2/buckets/domains/custom_delete_response.py b/src/cloudflare/types/r2/buckets/domains/custom_delete_response.py
new file mode 100644
index 00000000000..3fabd0d2ca6
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/domains/custom_delete_response.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ....._models import BaseModel
+
+__all__ = ["CustomDeleteResponse"]
+
+
+class CustomDeleteResponse(BaseModel):
+    domain: str
+    """Name of the removed custom domain."""
diff --git a/src/cloudflare/types/r2/buckets/domains/custom_get_response.py b/src/cloudflare/types/r2/buckets/domains/custom_get_response.py
new file mode 100644
index 00000000000..8ff70bf04db
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/domains/custom_get_response.py
@@ -0,0 +1,46 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = ["CustomGetResponse", "Status"]
+
+
+class Status(BaseModel):
+    ownership: Literal["pending", "active", "deactivated", "blocked", "error", "unknown"]
+    """Ownership status of the domain."""
+
+    ssl: Literal["initializing", "pending", "active", "deactivated", "error", "unknown"]
+    """SSL certificate status."""
+
+
+class CustomGetResponse(BaseModel):
+    domain: str
+    """Domain name of the custom domain to be added."""
+
+    enabled: bool
+    """Whether this bucket is publicly accessible at the specified custom domain."""
+
+    status: Status
+
+    ciphers: Optional[List[str]] = None
+    """An allowlist of ciphers for TLS termination.
+
+    These ciphers must be in the BoringSSL format.
+    """
+
+    min_tls: Optional[Literal["1.0", "1.1", "1.2", "1.3"]] = FieldInfo(alias="minTLS", default=None)
+    """Minimum TLS Version the custom domain will accept for incoming connections.
+
+    If not set, defaults to 1.0.
+    """
+
+    zone_id: Optional[str] = FieldInfo(alias="zoneId", default=None)
+    """Zone ID of the custom domain resides in."""
+
+    zone_name: Optional[str] = FieldInfo(alias="zoneName", default=None)
+    """Zone that the custom domain resides in."""
diff --git a/src/cloudflare/types/r2/buckets/domains/custom_list_response.py b/src/cloudflare/types/r2/buckets/domains/custom_list_response.py
new file mode 100644
index 00000000000..31582337c51
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/domains/custom_list_response.py
@@ -0,0 +1,50 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = ["CustomListResponse", "Domain", "DomainStatus"]
+
+
+class DomainStatus(BaseModel):
+    ownership: Literal["pending", "active", "deactivated", "blocked", "error", "unknown"]
+    """Ownership status of the domain."""
+
+    ssl: Literal["initializing", "pending", "active", "deactivated", "error", "unknown"]
+    """SSL certificate status."""
+
+
+class Domain(BaseModel):
+    domain: str
+    """Domain name of the custom domain to be added."""
+
+    enabled: bool
+    """Whether this bucket is publicly accessible at the specified custom domain."""
+
+    status: DomainStatus
+
+    ciphers: Optional[List[str]] = None
+    """An allowlist of ciphers for TLS termination.
+
+    These ciphers must be in the BoringSSL format.
+    """
+
+    min_tls: Optional[Literal["1.0", "1.1", "1.2", "1.3"]] = FieldInfo(alias="minTLS", default=None)
+    """Minimum TLS Version the custom domain will accept for incoming connections.
+
+    If not set, defaults to 1.0.
+    """
+
+    zone_id: Optional[str] = FieldInfo(alias="zoneId", default=None)
+    """Zone ID of the custom domain resides in."""
+
+    zone_name: Optional[str] = FieldInfo(alias="zoneName", default=None)
+    """Zone that the custom domain resides in."""
+
+
+class CustomListResponse(BaseModel):
+    domains: List[Domain]
diff --git a/src/cloudflare/types/r2/buckets/domains/custom_update_params.py b/src/cloudflare/types/r2/buckets/domains/custom_update_params.py
new file mode 100644
index 00000000000..bf25374a084
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/domains/custom_update_params.py
@@ -0,0 +1,36 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ....._types import SequenceNotStr
+from ....._utils import PropertyInfo
+
+__all__ = ["CustomUpdateParams"]
+
+
+class CustomUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    bucket_name: Required[str]
+    """Name of the bucket."""
+
+    ciphers: SequenceNotStr[str]
+    """An allowlist of ciphers for TLS termination.
+
+    These ciphers must be in the BoringSSL format.
+    """
+
+    enabled: bool
+    """Whether to enable public bucket access at the specified custom domain."""
+
+    min_tls: Annotated[Literal["1.0", "1.1", "1.2", "1.3"], PropertyInfo(alias="minTLS")]
+    """Minimum TLS Version the custom domain will accept for incoming connections.
+
+    If not set, defaults to previous value.
+    """
+
+    jurisdiction: Annotated[Literal["default", "eu", "fedramp"], PropertyInfo(alias="cf-r2-jurisdiction")]
+    """Jurisdiction where objects in this bucket are guaranteed to be stored."""
diff --git a/src/cloudflare/types/r2/buckets/domains/custom_update_response.py b/src/cloudflare/types/r2/buckets/domains/custom_update_response.py
new file mode 100644
index 00000000000..d2a5971c29d
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/domains/custom_update_response.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = ["CustomUpdateResponse"]
+
+
+class CustomUpdateResponse(BaseModel):
+    domain: str
+    """Domain name of the affected custom domain."""
+
+    ciphers: Optional[List[str]] = None
+    """An allowlist of ciphers for TLS termination.
+
+    These ciphers must be in the BoringSSL format.
+    """
+
+    enabled: Optional[bool] = None
+    """Whether this bucket is publicly accessible at the specified custom domain."""
+
+    min_tls: Optional[Literal["1.0", "1.1", "1.2", "1.3"]] = FieldInfo(alias="minTLS", default=None)
+    """Minimum TLS Version the custom domain will accept for incoming connections.
+
+    If not set, defaults to 1.0.
+    """
diff --git a/src/cloudflare/types/r2/buckets/domains/managed_list_response.py b/src/cloudflare/types/r2/buckets/domains/managed_list_response.py
new file mode 100644
index 00000000000..9c99c14b4ac
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/domains/managed_list_response.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = ["ManagedListResponse"]
+
+
+class ManagedListResponse(BaseModel):
+    bucket_id: str = FieldInfo(alias="bucketId")
+    """Bucket ID."""
+
+    domain: str
+    """Domain name of the bucket's r2.dev domain."""
+
+    enabled: bool
+    """Whether this bucket is publicly accessible at the r2.dev domain."""
diff --git a/src/cloudflare/types/r2/buckets/domains/managed_update_params.py b/src/cloudflare/types/r2/buckets/domains/managed_update_params.py
new file mode 100644
index 00000000000..3c6275af635
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/domains/managed_update_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ....._utils import PropertyInfo
+
+__all__ = ["ManagedUpdateParams"]
+
+
+class ManagedUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    enabled: Required[bool]
+    """Whether to enable public bucket access at the r2.dev domain."""
+
+    jurisdiction: Annotated[Literal["default", "eu", "fedramp"], PropertyInfo(alias="cf-r2-jurisdiction")]
+    """Jurisdiction where objects in this bucket are guaranteed to be stored."""
diff --git a/src/cloudflare/types/r2/buckets/domains/managed_update_response.py b/src/cloudflare/types/r2/buckets/domains/managed_update_response.py
new file mode 100644
index 00000000000..dd69ee6f616
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/domains/managed_update_response.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = ["ManagedUpdateResponse"]
+
+
+class ManagedUpdateResponse(BaseModel):
+    bucket_id: str = FieldInfo(alias="bucketId")
+    """Bucket ID."""
+
+    domain: str
+    """Domain name of the bucket's r2.dev domain."""
+
+    enabled: bool
+    """Whether this bucket is publicly accessible at the r2.dev domain."""
diff --git a/src/cloudflare/types/r2/buckets/event_notification_get_response.py b/src/cloudflare/types/r2/buckets/event_notification_get_response.py
new file mode 100644
index 00000000000..7121c17b267
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/event_notification_get_response.py
@@ -0,0 +1,43 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["EventNotificationGetResponse", "Rule"]
+
+
+class Rule(BaseModel):
+    actions: List[Literal["PutObject", "CopyObject", "DeleteObject", "CompleteMultipartUpload", "LifecycleDeletion"]]
+    """Array of R2 object actions that will trigger notifications."""
+
+    created_at: Optional[str] = FieldInfo(alias="createdAt", default=None)
+    """Timestamp when the rule was created."""
+
+    description: Optional[str] = None
+    """
+    A description that can be used to identify the event notification rule after
+    creation.
+    """
+
+    prefix: Optional[str] = None
+    """Notifications will be sent only for objects with this prefix."""
+
+    rule_id: Optional[str] = FieldInfo(alias="ruleId", default=None)
+    """Rule ID."""
+
+    suffix: Optional[str] = None
+    """Notifications will be sent only for objects with this suffix."""
+
+
+class EventNotificationGetResponse(BaseModel):
+    queue_id: Optional[str] = FieldInfo(alias="queueId", default=None)
+    """Queue ID."""
+
+    queue_name: Optional[str] = FieldInfo(alias="queueName", default=None)
+    """Name of the queue."""
+
+    rules: Optional[List[Rule]] = None
diff --git a/src/cloudflare/types/r2/buckets/event_notification_list_response.py b/src/cloudflare/types/r2/buckets/event_notification_list_response.py
new file mode 100644
index 00000000000..8e55df1a86e
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/event_notification_list_response.py
@@ -0,0 +1,51 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["EventNotificationListResponse", "Queue", "QueueRule"]
+
+
+class QueueRule(BaseModel):
+    actions: List[Literal["PutObject", "CopyObject", "DeleteObject", "CompleteMultipartUpload", "LifecycleDeletion"]]
+    """Array of R2 object actions that will trigger notifications."""
+
+    created_at: Optional[str] = FieldInfo(alias="createdAt", default=None)
+    """Timestamp when the rule was created."""
+
+    description: Optional[str] = None
+    """
+    A description that can be used to identify the event notification rule after
+    creation.
+    """
+
+    prefix: Optional[str] = None
+    """Notifications will be sent only for objects with this prefix."""
+
+    rule_id: Optional[str] = FieldInfo(alias="ruleId", default=None)
+    """Rule ID."""
+
+    suffix: Optional[str] = None
+    """Notifications will be sent only for objects with this suffix."""
+
+
+class Queue(BaseModel):
+    queue_id: Optional[str] = FieldInfo(alias="queueId", default=None)
+    """Queue ID."""
+
+    queue_name: Optional[str] = FieldInfo(alias="queueName", default=None)
+    """Name of the queue."""
+
+    rules: Optional[List[QueueRule]] = None
+
+
+class EventNotificationListResponse(BaseModel):
+    bucket_name: Optional[str] = FieldInfo(alias="bucketName", default=None)
+    """Name of the bucket."""
+
+    queues: Optional[List[Queue]] = None
+    """List of queues associated with the bucket."""
diff --git a/src/cloudflare/types/r2/buckets/event_notification_update_params.py b/src/cloudflare/types/r2/buckets/event_notification_update_params.py
new file mode 100644
index 00000000000..c94ddbada0f
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/event_notification_update_params.py
@@ -0,0 +1,43 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Iterable
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ...._utils import PropertyInfo
+
+__all__ = ["EventNotificationUpdateParams", "Rule"]
+
+
+class EventNotificationUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    bucket_name: Required[str]
+    """Name of the bucket."""
+
+    rules: Required[Iterable[Rule]]
+    """Array of rules to drive notifications."""
+
+    jurisdiction: Annotated[Literal["default", "eu", "fedramp"], PropertyInfo(alias="cf-r2-jurisdiction")]
+    """Jurisdiction where objects in this bucket are guaranteed to be stored."""
+
+
+class Rule(TypedDict, total=False):
+    actions: Required[
+        List[Literal["PutObject", "CopyObject", "DeleteObject", "CompleteMultipartUpload", "LifecycleDeletion"]]
+    ]
+    """Array of R2 object actions that will trigger notifications."""
+
+    description: str
+    """
+    A description that can be used to identify the event notification rule after
+    creation.
+    """
+
+    prefix: str
+    """Notifications will be sent only for objects with this prefix."""
+
+    suffix: str
+    """Notifications will be sent only for objects with this suffix."""
diff --git a/src/cloudflare/types/r2/buckets/lifecycle_get_response.py b/src/cloudflare/types/r2/buckets/lifecycle_get_response.py
new file mode 100644
index 00000000000..39afb007209
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/lifecycle_get_response.py
@@ -0,0 +1,154 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "LifecycleGetResponse",
+    "Rule",
+    "RuleConditions",
+    "RuleAbortMultipartUploadsTransition",
+    "RuleAbortMultipartUploadsTransitionCondition",
+    "RuleDeleteObjectsTransition",
+    "RuleDeleteObjectsTransitionCondition",
+    "RuleDeleteObjectsTransitionConditionR2LifecycleAgeCondition",
+    "RuleDeleteObjectsTransitionConditionR2LifecycleDateCondition",
+    "RuleStorageClassTransition",
+    "RuleStorageClassTransitionCondition",
+    "RuleStorageClassTransitionConditionR2LifecycleAgeCondition",
+    "RuleStorageClassTransitionConditionR2LifecycleDateCondition",
+]
+
+
+class RuleConditions(BaseModel):
+    """Conditions that apply to all transitions of this rule."""
+
+    prefix: str
+    """
+    Transitions will only apply to objects/uploads in the bucket that start with the
+    given prefix, an empty prefix can be provided to scope rule to all
+    objects/uploads.
+    """
+
+
+class RuleAbortMultipartUploadsTransitionCondition(BaseModel):
+    """
+    Condition for lifecycle transitions to apply after an object reaches an age in seconds.
+    """
+
+    max_age: int = FieldInfo(alias="maxAge")
+
+    type: Literal["Age"]
+
+
+class RuleAbortMultipartUploadsTransition(BaseModel):
+    """Transition to abort ongoing multipart uploads."""
+
+    condition: Optional[RuleAbortMultipartUploadsTransitionCondition] = None
+    """
+    Condition for lifecycle transitions to apply after an object reaches an age in
+    seconds.
+    """
+
+
+class RuleDeleteObjectsTransitionConditionR2LifecycleAgeCondition(BaseModel):
+    """
+    Condition for lifecycle transitions to apply after an object reaches an age in seconds.
+    """
+
+    max_age: int = FieldInfo(alias="maxAge")
+
+    type: Literal["Age"]
+
+
+class RuleDeleteObjectsTransitionConditionR2LifecycleDateCondition(BaseModel):
+    """Condition for lifecycle transitions to apply on a specific date."""
+
+    date: datetime
+
+    type: Literal["Date"]
+
+
+RuleDeleteObjectsTransitionCondition: TypeAlias = Union[
+    RuleDeleteObjectsTransitionConditionR2LifecycleAgeCondition,
+    RuleDeleteObjectsTransitionConditionR2LifecycleDateCondition,
+]
+
+
+class RuleDeleteObjectsTransition(BaseModel):
+    """Transition to delete objects."""
+
+    condition: Optional[RuleDeleteObjectsTransitionCondition] = None
+    """
+    Condition for lifecycle transitions to apply after an object reaches an age in
+    seconds.
+    """
+
+
+class RuleStorageClassTransitionConditionR2LifecycleAgeCondition(BaseModel):
+    """
+    Condition for lifecycle transitions to apply after an object reaches an age in seconds.
+    """
+
+    max_age: int = FieldInfo(alias="maxAge")
+
+    type: Literal["Age"]
+
+
+class RuleStorageClassTransitionConditionR2LifecycleDateCondition(BaseModel):
+    """Condition for lifecycle transitions to apply on a specific date."""
+
+    date: datetime
+
+    type: Literal["Date"]
+
+
+RuleStorageClassTransitionCondition: TypeAlias = Union[
+    RuleStorageClassTransitionConditionR2LifecycleAgeCondition,
+    RuleStorageClassTransitionConditionR2LifecycleDateCondition,
+]
+
+
+class RuleStorageClassTransition(BaseModel):
+    condition: RuleStorageClassTransitionCondition
+    """
+    Condition for lifecycle transitions to apply after an object reaches an age in
+    seconds.
+    """
+
+    storage_class: Literal["InfrequentAccess"] = FieldInfo(alias="storageClass")
+
+
+class Rule(BaseModel):
+    id: str
+    """Unique identifier for this rule."""
+
+    conditions: RuleConditions
+    """Conditions that apply to all transitions of this rule."""
+
+    enabled: bool
+    """Whether or not this rule is in effect."""
+
+    abort_multipart_uploads_transition: Optional[RuleAbortMultipartUploadsTransition] = FieldInfo(
+        alias="abortMultipartUploadsTransition", default=None
+    )
+    """Transition to abort ongoing multipart uploads."""
+
+    delete_objects_transition: Optional[RuleDeleteObjectsTransition] = FieldInfo(
+        alias="deleteObjectsTransition", default=None
+    )
+    """Transition to delete objects."""
+
+    storage_class_transitions: Optional[List[RuleStorageClassTransition]] = FieldInfo(
+        alias="storageClassTransitions", default=None
+    )
+    """Transitions to change the storage class of objects."""
+
+
+class LifecycleGetResponse(BaseModel):
+    rules: Optional[List[Rule]] = None
diff --git a/src/cloudflare/types/r2/buckets/lifecycle_update_params.py b/src/cloudflare/types/r2/buckets/lifecycle_update_params.py
new file mode 100644
index 00000000000..abdbb29abce
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/lifecycle_update_params.py
@@ -0,0 +1,158 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from datetime import datetime
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ...._utils import PropertyInfo
+
+__all__ = [
+    "LifecycleUpdateParams",
+    "Rule",
+    "RuleConditions",
+    "RuleAbortMultipartUploadsTransition",
+    "RuleAbortMultipartUploadsTransitionCondition",
+    "RuleDeleteObjectsTransition",
+    "RuleDeleteObjectsTransitionCondition",
+    "RuleDeleteObjectsTransitionConditionR2LifecycleAgeCondition",
+    "RuleDeleteObjectsTransitionConditionR2LifecycleDateCondition",
+    "RuleStorageClassTransition",
+    "RuleStorageClassTransitionCondition",
+    "RuleStorageClassTransitionConditionR2LifecycleAgeCondition",
+    "RuleStorageClassTransitionConditionR2LifecycleDateCondition",
+]
+
+
+class LifecycleUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    rules: Iterable[Rule]
+
+    jurisdiction: Annotated[Literal["default", "eu", "fedramp"], PropertyInfo(alias="cf-r2-jurisdiction")]
+    """Jurisdiction where objects in this bucket are guaranteed to be stored."""
+
+
+class RuleConditions(TypedDict, total=False):
+    """Conditions that apply to all transitions of this rule."""
+
+    prefix: Required[str]
+    """
+    Transitions will only apply to objects/uploads in the bucket that start with the
+    given prefix, an empty prefix can be provided to scope rule to all
+    objects/uploads.
+    """
+
+
+class RuleAbortMultipartUploadsTransitionCondition(TypedDict, total=False):
+    """
+    Condition for lifecycle transitions to apply after an object reaches an age in seconds.
+    """
+
+    max_age: Required[Annotated[int, PropertyInfo(alias="maxAge")]]
+
+    type: Required[Literal["Age"]]
+
+
+class RuleAbortMultipartUploadsTransition(TypedDict, total=False):
+    """Transition to abort ongoing multipart uploads."""
+
+    condition: RuleAbortMultipartUploadsTransitionCondition
+    """
+    Condition for lifecycle transitions to apply after an object reaches an age in
+    seconds.
+    """
+
+
+class RuleDeleteObjectsTransitionConditionR2LifecycleAgeCondition(TypedDict, total=False):
+    """
+    Condition for lifecycle transitions to apply after an object reaches an age in seconds.
+    """
+
+    max_age: Required[Annotated[int, PropertyInfo(alias="maxAge")]]
+
+    type: Required[Literal["Age"]]
+
+
+class RuleDeleteObjectsTransitionConditionR2LifecycleDateCondition(TypedDict, total=False):
+    """Condition for lifecycle transitions to apply on a specific date."""
+
+    date: Required[Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]]
+
+    type: Required[Literal["Date"]]
+
+
+RuleDeleteObjectsTransitionCondition: TypeAlias = Union[
+    RuleDeleteObjectsTransitionConditionR2LifecycleAgeCondition,
+    RuleDeleteObjectsTransitionConditionR2LifecycleDateCondition,
+]
+
+
+class RuleDeleteObjectsTransition(TypedDict, total=False):
+    """Transition to delete objects."""
+
+    condition: RuleDeleteObjectsTransitionCondition
+    """
+    Condition for lifecycle transitions to apply after an object reaches an age in
+    seconds.
+    """
+
+
+class RuleStorageClassTransitionConditionR2LifecycleAgeCondition(TypedDict, total=False):
+    """
+    Condition for lifecycle transitions to apply after an object reaches an age in seconds.
+    """
+
+    max_age: Required[Annotated[int, PropertyInfo(alias="maxAge")]]
+
+    type: Required[Literal["Age"]]
+
+
+class RuleStorageClassTransitionConditionR2LifecycleDateCondition(TypedDict, total=False):
+    """Condition for lifecycle transitions to apply on a specific date."""
+
+    date: Required[Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]]
+
+    type: Required[Literal["Date"]]
+
+
+RuleStorageClassTransitionCondition: TypeAlias = Union[
+    RuleStorageClassTransitionConditionR2LifecycleAgeCondition,
+    RuleStorageClassTransitionConditionR2LifecycleDateCondition,
+]
+
+
+class RuleStorageClassTransition(TypedDict, total=False):
+    condition: Required[RuleStorageClassTransitionCondition]
+    """
+    Condition for lifecycle transitions to apply after an object reaches an age in
+    seconds.
+    """
+
+    storage_class: Required[Annotated[Literal["InfrequentAccess"], PropertyInfo(alias="storageClass")]]
+
+
+class Rule(TypedDict, total=False):
+    id: Required[str]
+    """Unique identifier for this rule."""
+
+    conditions: Required[RuleConditions]
+    """Conditions that apply to all transitions of this rule."""
+
+    enabled: Required[bool]
+    """Whether or not this rule is in effect."""
+
+    abort_multipart_uploads_transition: Annotated[
+        RuleAbortMultipartUploadsTransition, PropertyInfo(alias="abortMultipartUploadsTransition")
+    ]
+    """Transition to abort ongoing multipart uploads."""
+
+    delete_objects_transition: Annotated[RuleDeleteObjectsTransition, PropertyInfo(alias="deleteObjectsTransition")]
+    """Transition to delete objects."""
+
+    storage_class_transitions: Annotated[
+        Iterable[RuleStorageClassTransition], PropertyInfo(alias="storageClassTransitions")
+    ]
+    """Transitions to change the storage class of objects."""
diff --git a/src/cloudflare/types/r2/buckets/lock_get_response.py b/src/cloudflare/types/r2/buckets/lock_get_response.py
new file mode 100644
index 00000000000..72e8f59e109
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/lock_get_response.py
@@ -0,0 +1,68 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "LockGetResponse",
+    "Rule",
+    "RuleCondition",
+    "RuleConditionR2LockRuleAgeCondition",
+    "RuleConditionR2LockRuleDateCondition",
+    "RuleConditionR2LockRuleIndefiniteCondition",
+]
+
+
+class RuleConditionR2LockRuleAgeCondition(BaseModel):
+    """Condition to apply a lock rule to an object for how long in seconds."""
+
+    max_age_seconds: int = FieldInfo(alias="maxAgeSeconds")
+
+    type: Literal["Age"]
+
+
+class RuleConditionR2LockRuleDateCondition(BaseModel):
+    """Condition to apply a lock rule to an object until a specific date."""
+
+    date: datetime
+
+    type: Literal["Date"]
+
+
+class RuleConditionR2LockRuleIndefiniteCondition(BaseModel):
+    """Condition to apply a lock rule indefinitely."""
+
+    type: Literal["Indefinite"]
+
+
+RuleCondition: TypeAlias = Union[
+    RuleConditionR2LockRuleAgeCondition,
+    RuleConditionR2LockRuleDateCondition,
+    RuleConditionR2LockRuleIndefiniteCondition,
+]
+
+
+class Rule(BaseModel):
+    id: str
+    """Unique identifier for this rule."""
+
+    condition: RuleCondition
+    """Condition to apply a lock rule to an object for how long in seconds."""
+
+    enabled: bool
+    """Whether or not this rule is in effect."""
+
+    prefix: Optional[str] = None
+    """
+    Rule will only apply to objects/uploads in the bucket that start with the given
+    prefix, an empty prefix can be provided to scope rule to all objects/uploads.
+    """
+
+
+class LockGetResponse(BaseModel):
+    rules: Optional[List[Rule]] = None
diff --git a/src/cloudflare/types/r2/buckets/lock_update_params.py b/src/cloudflare/types/r2/buckets/lock_update_params.py
new file mode 100644
index 00000000000..ca8ad5c4e40
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/lock_update_params.py
@@ -0,0 +1,74 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from datetime import datetime
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ...._utils import PropertyInfo
+
+__all__ = [
+    "LockUpdateParams",
+    "Rule",
+    "RuleCondition",
+    "RuleConditionR2LockRuleAgeCondition",
+    "RuleConditionR2LockRuleDateCondition",
+    "RuleConditionR2LockRuleIndefiniteCondition",
+]
+
+
+class LockUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    rules: Iterable[Rule]
+
+    jurisdiction: Annotated[Literal["default", "eu", "fedramp"], PropertyInfo(alias="cf-r2-jurisdiction")]
+    """Jurisdiction where objects in this bucket are guaranteed to be stored."""
+
+
+class RuleConditionR2LockRuleAgeCondition(TypedDict, total=False):
+    """Condition to apply a lock rule to an object for how long in seconds."""
+
+    max_age_seconds: Required[Annotated[int, PropertyInfo(alias="maxAgeSeconds")]]
+
+    type: Required[Literal["Age"]]
+
+
+class RuleConditionR2LockRuleDateCondition(TypedDict, total=False):
+    """Condition to apply a lock rule to an object until a specific date."""
+
+    date: Required[Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]]
+
+    type: Required[Literal["Date"]]
+
+
+class RuleConditionR2LockRuleIndefiniteCondition(TypedDict, total=False):
+    """Condition to apply a lock rule indefinitely."""
+
+    type: Required[Literal["Indefinite"]]
+
+
+RuleCondition: TypeAlias = Union[
+    RuleConditionR2LockRuleAgeCondition,
+    RuleConditionR2LockRuleDateCondition,
+    RuleConditionR2LockRuleIndefiniteCondition,
+]
+
+
+class Rule(TypedDict, total=False):
+    id: Required[str]
+    """Unique identifier for this rule."""
+
+    condition: Required[RuleCondition]
+    """Condition to apply a lock rule to an object for how long in seconds."""
+
+    enabled: Required[bool]
+    """Whether or not this rule is in effect."""
+
+    prefix: str
+    """
+    Rule will only apply to objects/uploads in the bucket that start with the given
+    prefix, an empty prefix can be provided to scope rule to all objects/uploads.
+    """
diff --git a/src/cloudflare/types/r2/buckets/metric_list_response.py b/src/cloudflare/types/r2/buckets/metric_list_response.py
new file mode 100644
index 00000000000..e8a672c0bca
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/metric_list_response.py
@@ -0,0 +1,99 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "MetricListResponse",
+    "InfrequentAccess",
+    "InfrequentAccessPublished",
+    "InfrequentAccessUploaded",
+    "Standard",
+    "StandardPublished",
+    "StandardUploaded",
+]
+
+
+class InfrequentAccessPublished(BaseModel):
+    """Metrics on number of objects/amount of storage used."""
+
+    metadata_size: Optional[float] = FieldInfo(alias="metadataSize", default=None)
+    """Amount of."""
+
+    objects: Optional[float] = None
+    """Number of objects stored."""
+
+    payload_size: Optional[float] = FieldInfo(alias="payloadSize", default=None)
+    """Amount of storage used by object data."""
+
+
+class InfrequentAccessUploaded(BaseModel):
+    """Metrics on number of objects/amount of storage used."""
+
+    metadata_size: Optional[float] = FieldInfo(alias="metadataSize", default=None)
+    """Amount of."""
+
+    objects: Optional[float] = None
+    """Number of objects stored."""
+
+    payload_size: Optional[float] = FieldInfo(alias="payloadSize", default=None)
+    """Amount of storage used by object data."""
+
+
+class InfrequentAccess(BaseModel):
+    """Metrics based on what state they are in(uploaded or published)."""
+
+    published: Optional[InfrequentAccessPublished] = None
+    """Metrics on number of objects/amount of storage used."""
+
+    uploaded: Optional[InfrequentAccessUploaded] = None
+    """Metrics on number of objects/amount of storage used."""
+
+
+class StandardPublished(BaseModel):
+    """Metrics on number of objects/amount of storage used."""
+
+    metadata_size: Optional[float] = FieldInfo(alias="metadataSize", default=None)
+    """Amount of."""
+
+    objects: Optional[float] = None
+    """Number of objects stored."""
+
+    payload_size: Optional[float] = FieldInfo(alias="payloadSize", default=None)
+    """Amount of storage used by object data."""
+
+
+class StandardUploaded(BaseModel):
+    """Metrics on number of objects/amount of storage used."""
+
+    metadata_size: Optional[float] = FieldInfo(alias="metadataSize", default=None)
+    """Amount of."""
+
+    objects: Optional[float] = None
+    """Number of objects stored."""
+
+    payload_size: Optional[float] = FieldInfo(alias="payloadSize", default=None)
+    """Amount of storage used by object data."""
+
+
+class Standard(BaseModel):
+    """Metrics based on what state they are in(uploaded or published)."""
+
+    published: Optional[StandardPublished] = None
+    """Metrics on number of objects/amount of storage used."""
+
+    uploaded: Optional[StandardUploaded] = None
+    """Metrics on number of objects/amount of storage used."""
+
+
+class MetricListResponse(BaseModel):
+    """Metrics based on the class they belong to."""
+
+    infrequent_access: Optional[InfrequentAccess] = FieldInfo(alias="infrequentAccess", default=None)
+    """Metrics based on what state they are in(uploaded or published)."""
+
+    standard: Optional[Standard] = None
+    """Metrics based on what state they are in(uploaded or published)."""
diff --git a/src/cloudflare/types/r2/buckets/provider.py b/src/cloudflare/types/r2/buckets/provider.py
new file mode 100644
index 00000000000..45eb13e5c2c
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/provider.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import Literal, TypeAlias
+
+__all__ = ["Provider"]
+
+Provider: TypeAlias = Literal["r2"]
diff --git a/src/cloudflare/types/r2/buckets/sippy.py b/src/cloudflare/types/r2/buckets/sippy.py
new file mode 100644
index 00000000000..f19a71ca7dd
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/sippy.py
@@ -0,0 +1,51 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from .provider import Provider
+from ...._models import BaseModel
+
+__all__ = ["Sippy", "Destination", "Source"]
+
+
+class Destination(BaseModel):
+    """Details about the configured destination bucket."""
+
+    access_key_id: Optional[str] = FieldInfo(alias="accessKeyId", default=None)
+    """ID of the Cloudflare API token used when writing objects to this bucket."""
+
+    account: Optional[str] = None
+
+    bucket: Optional[str] = None
+    """Name of the bucket on the provider."""
+
+    provider: Optional[Provider] = None
+
+
+class Source(BaseModel):
+    """Details about the configured source bucket."""
+
+    bucket: Optional[str] = None
+    """Name of the bucket on the provider (AWS, GCS only)."""
+
+    bucket_url: Optional[str] = FieldInfo(alias="bucketUrl", default=None)
+    """S3-compatible URL (Generic S3-compatible providers only)."""
+
+    provider: Optional[Literal["aws", "gcs", "s3"]] = None
+
+    region: Optional[str] = None
+    """Region where the bucket resides (AWS only)."""
+
+
+class Sippy(BaseModel):
+    destination: Optional[Destination] = None
+    """Details about the configured destination bucket."""
+
+    enabled: Optional[bool] = None
+    """State of Sippy for this bucket."""
+
+    source: Optional[Source] = None
+    """Details about the configured source bucket."""
diff --git a/src/cloudflare/types/r2/sippy_delete_response.py b/src/cloudflare/types/r2/buckets/sippy_delete_response.py
similarity index 88%
rename from src/cloudflare/types/r2/sippy_delete_response.py
rename to src/cloudflare/types/r2/buckets/sippy_delete_response.py
index 312026706c5..909d1439201 100644
--- a/src/cloudflare/types/r2/sippy_delete_response.py
+++ b/src/cloudflare/types/r2/buckets/sippy_delete_response.py
@@ -3,7 +3,7 @@
 from typing import Optional
 from typing_extensions import Literal
 
-from ..._models import BaseModel
+from ...._models import BaseModel
 
 __all__ = ["SippyDeleteResponse"]
 
diff --git a/src/cloudflare/types/r2/buckets/sippy_update_params.py b/src/cloudflare/types/r2/buckets/sippy_update_params.py
new file mode 100644
index 00000000000..84ceaa1f875
--- /dev/null
+++ b/src/cloudflare/types/r2/buckets/sippy_update_params.py
@@ -0,0 +1,193 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from .provider import Provider
+from ...._utils import PropertyInfo
+
+__all__ = [
+    "SippyUpdateParams",
+    "R2EnableSippyAws",
+    "R2EnableSippyAwsDestination",
+    "R2EnableSippyAwsSource",
+    "R2EnableSippyGcs",
+    "R2EnableSippyGcsDestination",
+    "R2EnableSippyGcsSource",
+    "R2EnableSippyS3",
+    "R2EnableSippyS3Destination",
+    "R2EnableSippyS3Source",
+]
+
+
+class R2EnableSippyAws(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    destination: R2EnableSippyAwsDestination
+    """R2 bucket to copy objects to."""
+
+    source: R2EnableSippyAwsSource
+    """AWS S3 bucket to copy objects from."""
+
+    jurisdiction: Annotated[Literal["default", "eu", "fedramp"], PropertyInfo(alias="cf-r2-jurisdiction")]
+    """Jurisdiction where objects in this bucket are guaranteed to be stored."""
+
+
+class R2EnableSippyAwsDestination(TypedDict, total=False):
+    """R2 bucket to copy objects to."""
+
+    access_key_id: Annotated[str, PropertyInfo(alias="accessKeyId")]
+    """
+    ID of a Cloudflare API token. This is the value labelled "Access Key ID" when
+    creating an API. token from the
+    [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).
+
+    Sippy will use this token when writing objects to R2, so it is best to scope
+    this token to the bucket you're enabling Sippy for.
+    """
+
+    provider: Provider
+
+    secret_access_key: Annotated[str, PropertyInfo(alias="secretAccessKey")]
+    """
+    Value of a Cloudflare API token. This is the value labelled "Secret Access Key"
+    when creating an API. token from the
+    [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).
+
+    Sippy will use this token when writing objects to R2, so it is best to scope
+    this token to the bucket you're enabling Sippy for.
+    """
+
+
+class R2EnableSippyAwsSource(TypedDict, total=False):
+    """AWS S3 bucket to copy objects from."""
+
+    access_key_id: Annotated[str, PropertyInfo(alias="accessKeyId")]
+    """Access Key ID of an IAM credential (ideally scoped to a single S3 bucket)."""
+
+    bucket: str
+    """Name of the AWS S3 bucket."""
+
+    provider: Literal["aws"]
+
+    region: str
+    """Name of the AWS availability zone."""
+
+    secret_access_key: Annotated[str, PropertyInfo(alias="secretAccessKey")]
+    """Secret Access Key of an IAM credential (ideally scoped to a single S3 bucket)."""
+
+
+class R2EnableSippyGcs(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    destination: R2EnableSippyGcsDestination
+    """R2 bucket to copy objects to."""
+
+    source: R2EnableSippyGcsSource
+    """GCS bucket to copy objects from."""
+
+    jurisdiction: Annotated[Literal["default", "eu", "fedramp"], PropertyInfo(alias="cf-r2-jurisdiction")]
+    """Jurisdiction where objects in this bucket are guaranteed to be stored."""
+
+
+class R2EnableSippyGcsDestination(TypedDict, total=False):
+    """R2 bucket to copy objects to."""
+
+    access_key_id: Annotated[str, PropertyInfo(alias="accessKeyId")]
+    """
+    ID of a Cloudflare API token. This is the value labelled "Access Key ID" when
+    creating an API. token from the
+    [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).
+
+    Sippy will use this token when writing objects to R2, so it is best to scope
+    this token to the bucket you're enabling Sippy for.
+    """
+
+    provider: Provider
+
+    secret_access_key: Annotated[str, PropertyInfo(alias="secretAccessKey")]
+    """
+    Value of a Cloudflare API token. This is the value labelled "Secret Access Key"
+    when creating an API. token from the
+    [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).
+
+    Sippy will use this token when writing objects to R2, so it is best to scope
+    this token to the bucket you're enabling Sippy for.
+    """
+
+
+class R2EnableSippyGcsSource(TypedDict, total=False):
+    """GCS bucket to copy objects from."""
+
+    bucket: str
+    """Name of the GCS bucket."""
+
+    client_email: Annotated[str, PropertyInfo(alias="clientEmail")]
+    """Client email of an IAM credential (ideally scoped to a single GCS bucket)."""
+
+    private_key: Annotated[str, PropertyInfo(alias="privateKey")]
+    """Private Key of an IAM credential (ideally scoped to a single GCS bucket)."""
+
+    provider: Literal["gcs"]
+
+
+class R2EnableSippyS3(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    destination: R2EnableSippyS3Destination
+    """R2 bucket to copy objects to."""
+
+    source: R2EnableSippyS3Source
+    """General S3-compatible provider to copy objects from."""
+
+    jurisdiction: Annotated[Literal["default", "eu", "fedramp"], PropertyInfo(alias="cf-r2-jurisdiction")]
+    """Jurisdiction where objects in this bucket are guaranteed to be stored."""
+
+
+class R2EnableSippyS3Destination(TypedDict, total=False):
+    """R2 bucket to copy objects to."""
+
+    access_key_id: Annotated[str, PropertyInfo(alias="accessKeyId")]
+    """
+    ID of a Cloudflare API token. This is the value labelled "Access Key ID" when
+    creating an API. token from the
+    [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).
+
+    Sippy will use this token when writing objects to R2, so it is best to scope
+    this token to the bucket you're enabling Sippy for.
+    """
+
+    provider: Provider
+
+    secret_access_key: Annotated[str, PropertyInfo(alias="secretAccessKey")]
+    """
+    Value of a Cloudflare API token. This is the value labelled "Secret Access Key"
+    when creating an API. token from the
+    [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).
+
+    Sippy will use this token when writing objects to R2, so it is best to scope
+    this token to the bucket you're enabling Sippy for.
+    """
+
+
+class R2EnableSippyS3Source(TypedDict, total=False):
+    """General S3-compatible provider to copy objects from."""
+
+    access_key_id: Annotated[str, PropertyInfo(alias="accessKeyId")]
+    """Access Key ID of an IAM credential (ideally scoped to a single S3 bucket)."""
+
+    bucket_url: Annotated[str, PropertyInfo(alias="bucketUrl")]
+    """URL to the S3-compatible API of the bucket."""
+
+    provider: Literal["s3"]
+
+    secret_access_key: Annotated[str, PropertyInfo(alias="secretAccessKey")]
+    """Secret Access Key of an IAM credential (ideally scoped to a single S3 bucket)."""
+
+
+SippyUpdateParams: TypeAlias = Union[R2EnableSippyAws, R2EnableSippyGcs, R2EnableSippyS3]
diff --git a/src/cloudflare/types/r2/provider.py b/src/cloudflare/types/r2/provider.py
deleted file mode 100644
index a33e66d2fcc..00000000000
--- a/src/cloudflare/types/r2/provider.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing_extensions import Literal
-
-__all__ = ["Provider"]
-
-Provider = Literal["r2"]
diff --git a/src/cloudflare/types/r2/sippy.py b/src/cloudflare/types/r2/sippy.py
deleted file mode 100644
index 89d9935106f..00000000000
--- a/src/cloudflare/types/r2/sippy.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from typing_extensions import Literal
-
-from pydantic import Field as FieldInfo
-
-from .provider import Provider
-from ..._models import BaseModel
-
-__all__ = ["Sippy", "Destination", "Source"]
-
-
-class Destination(BaseModel):
-    access_key_id: Optional[str] = FieldInfo(alias="accessKeyId", default=None)
-    """ID of the Cloudflare API token used when writing objects to this bucket"""
-
-    account: Optional[str] = None
-
-    bucket: Optional[str] = None
-    """Name of the bucket on the provider"""
-
-    provider: Optional[Provider] = None
-
-
-class Source(BaseModel):
-    bucket: Optional[str] = None
-    """Name of the bucket on the provider"""
-
-    provider: Optional[Literal["aws", "gcs"]] = None
-
-    region: Optional[str] = None
-    """Region where the bucket resides (AWS only)"""
-
-
-class Sippy(BaseModel):
-    destination: Optional[Destination] = None
-    """Details about the configured destination bucket"""
-
-    enabled: Optional[bool] = None
-    """State of Sippy for this bucket"""
-
-    source: Optional[Source] = None
-    """Details about the configured source bucket"""
diff --git a/src/cloudflare/types/r2/sippy_update_params.py b/src/cloudflare/types/r2/sippy_update_params.py
deleted file mode 100644
index e51a01c0921..00000000000
--- a/src/cloudflare/types/r2/sippy_update_params.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Union
-from typing_extensions import Literal, Required, Annotated, TypedDict
-
-from ..._utils import PropertyInfo
-from .provider import Provider
-
-__all__ = [
-    "SippyUpdateParams",
-    "R2EnableSippyAws",
-    "R2EnableSippyAwsDestination",
-    "R2EnableSippyAwsSource",
-    "R2EnableSippyGcs",
-    "R2EnableSippyGcsDestination",
-    "R2EnableSippyGcsSource",
-]
-
-
-class R2EnableSippyAws(TypedDict, total=False):
-    account_id: Required[str]
-    """Account ID"""
-
-    destination: R2EnableSippyAwsDestination
-    """R2 bucket to copy objects to"""
-
-    source: R2EnableSippyAwsSource
-    """AWS S3 bucket to copy objects from"""
-
-
-class R2EnableSippyAwsDestination(TypedDict, total=False):
-    access_key_id: Annotated[str, PropertyInfo(alias="accessKeyId")]
-    """
-    ID of a Cloudflare API token. This is the value labelled "Access Key ID" when
-    creating an API token from the
-    [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).
-
-    Sippy will use this token when writing objects to R2, so it is best to scope
-    this token to the bucket you're enabling Sippy for.
-    """
-
-    provider: Provider
-
-    secret_access_key: Annotated[str, PropertyInfo(alias="secretAccessKey")]
-    """
-    Value of a Cloudflare API token. This is the value labelled "Secret Access Key"
-    when creating an API token from the
-    [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).
-
-    Sippy will use this token when writing objects to R2, so it is best to scope
-    this token to the bucket you're enabling Sippy for.
-    """
-
-
-class R2EnableSippyAwsSource(TypedDict, total=False):
-    access_key_id: Annotated[str, PropertyInfo(alias="accessKeyId")]
-    """Access Key ID of an IAM credential (ideally scoped to a single S3 bucket)"""
-
-    bucket: str
-    """Name of the AWS S3 bucket"""
-
-    provider: Literal["aws"]
-
-    region: str
-    """Name of the AWS availability zone"""
-
-    secret_access_key: Annotated[str, PropertyInfo(alias="secretAccessKey")]
-    """Secret Access Key of an IAM credential (ideally scoped to a single S3 bucket)"""
-
-
-class R2EnableSippyGcs(TypedDict, total=False):
-    account_id: Required[str]
-    """Account ID"""
-
-    destination: R2EnableSippyGcsDestination
-    """R2 bucket to copy objects to"""
-
-    source: R2EnableSippyGcsSource
-    """GCS bucket to copy objects from"""
-
-
-class R2EnableSippyGcsDestination(TypedDict, total=False):
-    access_key_id: Annotated[str, PropertyInfo(alias="accessKeyId")]
-    """
-    ID of a Cloudflare API token. This is the value labelled "Access Key ID" when
-    creating an API token from the
-    [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).
-
-    Sippy will use this token when writing objects to R2, so it is best to scope
-    this token to the bucket you're enabling Sippy for.
-    """
-
-    provider: Provider
-
-    secret_access_key: Annotated[str, PropertyInfo(alias="secretAccessKey")]
-    """
-    Value of a Cloudflare API token. This is the value labelled "Secret Access Key"
-    when creating an API token from the
-    [R2 dashboard](https://dash.cloudflare.com/?to=/:account/r2/api-tokens).
-
-    Sippy will use this token when writing objects to R2, so it is best to scope
-    this token to the bucket you're enabling Sippy for.
-    """
-
-
-class R2EnableSippyGcsSource(TypedDict, total=False):
-    bucket: str
-    """Name of the GCS bucket"""
-
-    client_email: Annotated[str, PropertyInfo(alias="clientEmail")]
-    """Client email of an IAM credential (ideally scoped to a single GCS bucket)"""
-
-    private_key: Annotated[str, PropertyInfo(alias="privateKey")]
-    """Private Key of an IAM credential (ideally scoped to a single GCS bucket)"""
-
-    provider: Literal["gcs"]
-
-
-SippyUpdateParams = Union[R2EnableSippyAws, R2EnableSippyGcs]
diff --git a/src/cloudflare/types/r2/super_slurper/__init__.py b/src/cloudflare/types/r2/super_slurper/__init__.py
new file mode 100644
index 00000000000..1c490b08ede
--- /dev/null
+++ b/src/cloudflare/types/r2/super_slurper/__init__.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .job_list_params import JobListParams as JobListParams
+from .job_get_response import JobGetResponse as JobGetResponse
+from .job_create_params import JobCreateParams as JobCreateParams
+from .job_list_response import JobListResponse as JobListResponse
+from .job_abort_response import JobAbortResponse as JobAbortResponse
+from .job_pause_response import JobPauseResponse as JobPauseResponse
+from .job_create_response import JobCreateResponse as JobCreateResponse
+from .job_resume_response import JobResumeResponse as JobResumeResponse
+from .job_progress_response import JobProgressResponse as JobProgressResponse
+from .job_abort_all_response import JobAbortAllResponse as JobAbortAllResponse
+from .connectivity_precheck_source_params import ConnectivityPrecheckSourceParams as ConnectivityPrecheckSourceParams
+from .connectivity_precheck_target_params import ConnectivityPrecheckTargetParams as ConnectivityPrecheckTargetParams
+from .connectivity_precheck_source_response import (
+    ConnectivityPrecheckSourceResponse as ConnectivityPrecheckSourceResponse,
+)
+from .connectivity_precheck_target_response import (
+    ConnectivityPrecheckTargetResponse as ConnectivityPrecheckTargetResponse,
+)
diff --git a/src/cloudflare/types/r2/super_slurper/connectivity_precheck_source_params.py b/src/cloudflare/types/r2/super_slurper/connectivity_precheck_source_params.py
new file mode 100644
index 00000000000..3164e57b396
--- /dev/null
+++ b/src/cloudflare/types/r2/super_slurper/connectivity_precheck_source_params.py
@@ -0,0 +1,84 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Optional
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ...._utils import PropertyInfo
+from ..buckets.provider import Provider
+
+__all__ = [
+    "ConnectivityPrecheckSourceParams",
+    "R2SlurperS3SourceSchema",
+    "R2SlurperS3SourceSchemaSecret",
+    "R2SlurperGcsSourceSchema",
+    "R2SlurperGcsSourceSchemaSecret",
+    "R2SlurperR2SourceSchema",
+    "R2SlurperR2SourceSchemaSecret",
+]
+
+
+class R2SlurperS3SourceSchema(TypedDict, total=False):
+    account_id: Required[str]
+
+    bucket: Required[str]
+
+    secret: Required[R2SlurperS3SourceSchemaSecret]
+
+    vendor: Required[Literal["s3"]]
+
+    endpoint: Optional[str]
+
+    path_prefix: Annotated[Optional[str], PropertyInfo(alias="pathPrefix")]
+
+    region: Optional[str]
+
+
+class R2SlurperS3SourceSchemaSecret(TypedDict, total=False):
+    access_key_id: Required[Annotated[str, PropertyInfo(alias="accessKeyId")]]
+
+    secret_access_key: Required[Annotated[str, PropertyInfo(alias="secretAccessKey")]]
+
+
+class R2SlurperGcsSourceSchema(TypedDict, total=False):
+    account_id: Required[str]
+
+    bucket: Required[str]
+
+    secret: Required[R2SlurperGcsSourceSchemaSecret]
+
+    vendor: Required[Literal["gcs"]]
+
+    path_prefix: Annotated[Optional[str], PropertyInfo(alias="pathPrefix")]
+
+
+class R2SlurperGcsSourceSchemaSecret(TypedDict, total=False):
+    client_email: Required[Annotated[str, PropertyInfo(alias="clientEmail")]]
+
+    private_key: Required[Annotated[str, PropertyInfo(alias="privateKey")]]
+
+
+class R2SlurperR2SourceSchema(TypedDict, total=False):
+    account_id: Required[str]
+
+    bucket: Required[str]
+
+    secret: Required[R2SlurperR2SourceSchemaSecret]
+
+    vendor: Required[Provider]
+
+    jurisdiction: Literal["default", "eu", "fedramp"]
+
+    path_prefix: Annotated[Optional[str], PropertyInfo(alias="pathPrefix")]
+
+
+class R2SlurperR2SourceSchemaSecret(TypedDict, total=False):
+    access_key_id: Required[Annotated[str, PropertyInfo(alias="accessKeyId")]]
+
+    secret_access_key: Required[Annotated[str, PropertyInfo(alias="secretAccessKey")]]
+
+
+ConnectivityPrecheckSourceParams: TypeAlias = Union[
+    R2SlurperS3SourceSchema, R2SlurperGcsSourceSchema, R2SlurperR2SourceSchema
+]
diff --git a/src/cloudflare/types/r2/super_slurper/connectivity_precheck_source_response.py b/src/cloudflare/types/r2/super_slurper/connectivity_precheck_source_response.py
new file mode 100644
index 00000000000..660bb1d0423
--- /dev/null
+++ b/src/cloudflare/types/r2/super_slurper/connectivity_precheck_source_response.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["ConnectivityPrecheckSourceResponse"]
+
+
+class ConnectivityPrecheckSourceResponse(BaseModel):
+    connectivity_status: Optional[Literal["success", "error"]] = FieldInfo(alias="connectivityStatus", default=None)
diff --git a/src/cloudflare/types/r2/super_slurper/connectivity_precheck_target_params.py b/src/cloudflare/types/r2/super_slurper/connectivity_precheck_target_params.py
new file mode 100644
index 00000000000..90bb1438ff9
--- /dev/null
+++ b/src/cloudflare/types/r2/super_slurper/connectivity_precheck_target_params.py
@@ -0,0 +1,28 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ...._utils import PropertyInfo
+from ..buckets.provider import Provider
+
+__all__ = ["ConnectivityPrecheckTargetParams", "Secret"]
+
+
+class ConnectivityPrecheckTargetParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    bucket: Required[str]
+
+    secret: Required[Secret]
+
+    vendor: Required[Provider]
+
+    jurisdiction: Literal["default", "eu", "fedramp"]
+
+
+class Secret(TypedDict, total=False):
+    access_key_id: Required[Annotated[str, PropertyInfo(alias="accessKeyId")]]
+
+    secret_access_key: Required[Annotated[str, PropertyInfo(alias="secretAccessKey")]]
diff --git a/src/cloudflare/types/r2/super_slurper/connectivity_precheck_target_response.py b/src/cloudflare/types/r2/super_slurper/connectivity_precheck_target_response.py
new file mode 100644
index 00000000000..112d57473c1
--- /dev/null
+++ b/src/cloudflare/types/r2/super_slurper/connectivity_precheck_target_response.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["ConnectivityPrecheckTargetResponse"]
+
+
+class ConnectivityPrecheckTargetResponse(BaseModel):
+    connectivity_status: Optional[Literal["success", "error"]] = FieldInfo(alias="connectivityStatus", default=None)
diff --git a/src/cloudflare/types/r2/super_slurper/job_abort_all_response.py b/src/cloudflare/types/r2/super_slurper/job_abort_all_response.py
new file mode 100644
index 00000000000..d7cb978d9c3
--- /dev/null
+++ b/src/cloudflare/types/r2/super_slurper/job_abort_all_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["JobAbortAllResponse"]
+
+JobAbortAllResponse: TypeAlias = str
diff --git a/src/cloudflare/types/r2/super_slurper/job_abort_response.py b/src/cloudflare/types/r2/super_slurper/job_abort_response.py
new file mode 100644
index 00000000000..92552827913
--- /dev/null
+++ b/src/cloudflare/types/r2/super_slurper/job_abort_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["JobAbortResponse"]
+
+JobAbortResponse: TypeAlias = str
diff --git a/src/cloudflare/types/r2/super_slurper/job_create_params.py b/src/cloudflare/types/r2/super_slurper/job_create_params.py
new file mode 100644
index 00000000000..47b97470a39
--- /dev/null
+++ b/src/cloudflare/types/r2/super_slurper/job_create_params.py
@@ -0,0 +1,105 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Optional
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ...._utils import PropertyInfo
+from ..buckets.provider import Provider
+
+__all__ = [
+    "JobCreateParams",
+    "Source",
+    "SourceR2SlurperS3SourceSchema",
+    "SourceR2SlurperS3SourceSchemaSecret",
+    "SourceR2SlurperGcsSourceSchema",
+    "SourceR2SlurperGcsSourceSchemaSecret",
+    "SourceR2SlurperR2SourceSchema",
+    "SourceR2SlurperR2SourceSchemaSecret",
+    "Target",
+    "TargetSecret",
+]
+
+
+class JobCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    overwrite: bool
+
+    source: Source
+
+    target: Target
+
+
+class SourceR2SlurperS3SourceSchemaSecret(TypedDict, total=False):
+    access_key_id: Required[Annotated[str, PropertyInfo(alias="accessKeyId")]]
+
+    secret_access_key: Required[Annotated[str, PropertyInfo(alias="secretAccessKey")]]
+
+
+class SourceR2SlurperS3SourceSchema(TypedDict, total=False):
+    bucket: Required[str]
+
+    secret: Required[SourceR2SlurperS3SourceSchemaSecret]
+
+    vendor: Required[Literal["s3"]]
+
+    endpoint: Optional[str]
+
+    path_prefix: Annotated[Optional[str], PropertyInfo(alias="pathPrefix")]
+
+    region: Optional[str]
+
+
+class SourceR2SlurperGcsSourceSchemaSecret(TypedDict, total=False):
+    client_email: Required[Annotated[str, PropertyInfo(alias="clientEmail")]]
+
+    private_key: Required[Annotated[str, PropertyInfo(alias="privateKey")]]
+
+
+class SourceR2SlurperGcsSourceSchema(TypedDict, total=False):
+    bucket: Required[str]
+
+    secret: Required[SourceR2SlurperGcsSourceSchemaSecret]
+
+    vendor: Required[Literal["gcs"]]
+
+    path_prefix: Annotated[Optional[str], PropertyInfo(alias="pathPrefix")]
+
+
+class SourceR2SlurperR2SourceSchemaSecret(TypedDict, total=False):
+    access_key_id: Required[Annotated[str, PropertyInfo(alias="accessKeyId")]]
+
+    secret_access_key: Required[Annotated[str, PropertyInfo(alias="secretAccessKey")]]
+
+
+class SourceR2SlurperR2SourceSchema(TypedDict, total=False):
+    bucket: Required[str]
+
+    secret: Required[SourceR2SlurperR2SourceSchemaSecret]
+
+    vendor: Required[Provider]
+
+    jurisdiction: Literal["default", "eu", "fedramp"]
+
+    path_prefix: Annotated[Optional[str], PropertyInfo(alias="pathPrefix")]
+
+
+Source: TypeAlias = Union[SourceR2SlurperS3SourceSchema, SourceR2SlurperGcsSourceSchema, SourceR2SlurperR2SourceSchema]
+
+
+class TargetSecret(TypedDict, total=False):
+    access_key_id: Required[Annotated[str, PropertyInfo(alias="accessKeyId")]]
+
+    secret_access_key: Required[Annotated[str, PropertyInfo(alias="secretAccessKey")]]
+
+
+class Target(TypedDict, total=False):
+    bucket: Required[str]
+
+    secret: Required[TargetSecret]
+
+    vendor: Required[Provider]
+
+    jurisdiction: Literal["default", "eu", "fedramp"]
diff --git a/src/cloudflare/types/r2/super_slurper/job_create_response.py b/src/cloudflare/types/r2/super_slurper/job_create_response.py
new file mode 100644
index 00000000000..3cbcc2b2e52
--- /dev/null
+++ b/src/cloudflare/types/r2/super_slurper/job_create_response.py
@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ...._models import BaseModel
+
+__all__ = ["JobCreateResponse"]
+
+
+class JobCreateResponse(BaseModel):
+    id: Optional[str] = None
diff --git a/src/cloudflare/types/r2/super_slurper/job_get_response.py b/src/cloudflare/types/r2/super_slurper/job_get_response.py
new file mode 100644
index 00000000000..0247c82c6e6
--- /dev/null
+++ b/src/cloudflare/types/r2/super_slurper/job_get_response.py
@@ -0,0 +1,79 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+from ..buckets.provider import Provider
+
+__all__ = [
+    "JobGetResponse",
+    "Source",
+    "SourceS3SourceResponseSchema",
+    "SourceGcsSourceResponseSchema",
+    "SourceR2SourceResponseSchema",
+    "Target",
+]
+
+
+class SourceS3SourceResponseSchema(BaseModel):
+    bucket: Optional[str] = None
+
+    endpoint: Optional[str] = None
+
+    keys: Optional[List[str]] = None
+
+    path_prefix: Optional[str] = FieldInfo(alias="pathPrefix", default=None)
+
+    vendor: Optional[Literal["s3"]] = None
+
+
+class SourceGcsSourceResponseSchema(BaseModel):
+    bucket: Optional[str] = None
+
+    keys: Optional[List[str]] = None
+
+    path_prefix: Optional[str] = FieldInfo(alias="pathPrefix", default=None)
+
+    vendor: Optional[Literal["gcs"]] = None
+
+
+class SourceR2SourceResponseSchema(BaseModel):
+    bucket: Optional[str] = None
+
+    jurisdiction: Optional[Literal["default", "eu", "fedramp"]] = None
+
+    keys: Optional[List[str]] = None
+
+    path_prefix: Optional[str] = FieldInfo(alias="pathPrefix", default=None)
+
+    vendor: Optional[Provider] = None
+
+
+Source: TypeAlias = Union[SourceS3SourceResponseSchema, SourceGcsSourceResponseSchema, SourceR2SourceResponseSchema]
+
+
+class Target(BaseModel):
+    bucket: Optional[str] = None
+
+    jurisdiction: Optional[Literal["default", "eu", "fedramp"]] = None
+
+    vendor: Optional[Provider] = None
+
+
+class JobGetResponse(BaseModel):
+    id: Optional[str] = None
+
+    created_at: Optional[str] = FieldInfo(alias="createdAt", default=None)
+
+    finished_at: Optional[str] = FieldInfo(alias="finishedAt", default=None)
+
+    overwrite: Optional[bool] = None
+
+    source: Optional[Source] = None
+
+    status: Optional[Literal["running", "paused", "aborted", "completed"]] = None
+
+    target: Optional[Target] = None
diff --git a/src/cloudflare/types/r2/super_slurper/job_list_params.py b/src/cloudflare/types/r2/super_slurper/job_list_params.py
new file mode 100644
index 00000000000..f1b0e487eb0
--- /dev/null
+++ b/src/cloudflare/types/r2/super_slurper/job_list_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["JobListParams"]
+
+
+class JobListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    limit: int
+
+    offset: int
diff --git a/src/cloudflare/types/r2/super_slurper/job_list_response.py b/src/cloudflare/types/r2/super_slurper/job_list_response.py
new file mode 100644
index 00000000000..976df54eee0
--- /dev/null
+++ b/src/cloudflare/types/r2/super_slurper/job_list_response.py
@@ -0,0 +1,79 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+from ..buckets.provider import Provider
+
+__all__ = [
+    "JobListResponse",
+    "Source",
+    "SourceS3SourceResponseSchema",
+    "SourceGcsSourceResponseSchema",
+    "SourceR2SourceResponseSchema",
+    "Target",
+]
+
+
+class SourceS3SourceResponseSchema(BaseModel):
+    bucket: Optional[str] = None
+
+    endpoint: Optional[str] = None
+
+    keys: Optional[List[str]] = None
+
+    path_prefix: Optional[str] = FieldInfo(alias="pathPrefix", default=None)
+
+    vendor: Optional[Literal["s3"]] = None
+
+
+class SourceGcsSourceResponseSchema(BaseModel):
+    bucket: Optional[str] = None
+
+    keys: Optional[List[str]] = None
+
+    path_prefix: Optional[str] = FieldInfo(alias="pathPrefix", default=None)
+
+    vendor: Optional[Literal["gcs"]] = None
+
+
+class SourceR2SourceResponseSchema(BaseModel):
+    bucket: Optional[str] = None
+
+    jurisdiction: Optional[Literal["default", "eu", "fedramp"]] = None
+
+    keys: Optional[List[str]] = None
+
+    path_prefix: Optional[str] = FieldInfo(alias="pathPrefix", default=None)
+
+    vendor: Optional[Provider] = None
+
+
+Source: TypeAlias = Union[SourceS3SourceResponseSchema, SourceGcsSourceResponseSchema, SourceR2SourceResponseSchema]
+
+
+class Target(BaseModel):
+    bucket: Optional[str] = None
+
+    jurisdiction: Optional[Literal["default", "eu", "fedramp"]] = None
+
+    vendor: Optional[Provider] = None
+
+
+class JobListResponse(BaseModel):
+    id: Optional[str] = None
+
+    created_at: Optional[str] = FieldInfo(alias="createdAt", default=None)
+
+    finished_at: Optional[str] = FieldInfo(alias="finishedAt", default=None)
+
+    overwrite: Optional[bool] = None
+
+    source: Optional[Source] = None
+
+    status: Optional[Literal["running", "paused", "aborted", "completed"]] = None
+
+    target: Optional[Target] = None
diff --git a/src/cloudflare/types/r2/super_slurper/job_pause_response.py b/src/cloudflare/types/r2/super_slurper/job_pause_response.py
new file mode 100644
index 00000000000..d9f144201e2
--- /dev/null
+++ b/src/cloudflare/types/r2/super_slurper/job_pause_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["JobPauseResponse"]
+
+JobPauseResponse: TypeAlias = str
diff --git a/src/cloudflare/types/r2/super_slurper/job_progress_response.py b/src/cloudflare/types/r2/super_slurper/job_progress_response.py
new file mode 100644
index 00000000000..0580765a9ea
--- /dev/null
+++ b/src/cloudflare/types/r2/super_slurper/job_progress_response.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["JobProgressResponse"]
+
+
+class JobProgressResponse(BaseModel):
+    id: Optional[str] = None
+
+    created_at: Optional[str] = FieldInfo(alias="createdAt", default=None)
+
+    failed_objects: Optional[int] = FieldInfo(alias="failedObjects", default=None)
+
+    objects: Optional[int] = None
+
+    skipped_objects: Optional[int] = FieldInfo(alias="skippedObjects", default=None)
+
+    status: Optional[Literal["running", "paused", "aborted", "completed"]] = None
+
+    transferred_objects: Optional[int] = FieldInfo(alias="transferredObjects", default=None)
diff --git a/src/cloudflare/types/r2/super_slurper/job_resume_response.py b/src/cloudflare/types/r2/super_slurper/job_resume_response.py
new file mode 100644
index 00000000000..fb430019b9f
--- /dev/null
+++ b/src/cloudflare/types/r2/super_slurper/job_resume_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["JobResumeResponse"]
+
+JobResumeResponse: TypeAlias = str
diff --git a/src/cloudflare/types/r2/super_slurper/jobs/__init__.py b/src/cloudflare/types/r2/super_slurper/jobs/__init__.py
new file mode 100644
index 00000000000..84992c3c21c
--- /dev/null
+++ b/src/cloudflare/types/r2/super_slurper/jobs/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .log_list_params import LogListParams as LogListParams
+from .log_list_response import LogListResponse as LogListResponse
diff --git a/src/cloudflare/types/r2/super_slurper/jobs/log_list_params.py b/src/cloudflare/types/r2/super_slurper/jobs/log_list_params.py
new file mode 100644
index 00000000000..ff059a25e3c
--- /dev/null
+++ b/src/cloudflare/types/r2/super_slurper/jobs/log_list_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["LogListParams"]
+
+
+class LogListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    limit: int
+
+    offset: int
diff --git a/src/cloudflare/types/r2/super_slurper/jobs/log_list_response.py b/src/cloudflare/types/r2/super_slurper/jobs/log_list_response.py
new file mode 100644
index 00000000000..c38aac2fb89
--- /dev/null
+++ b/src/cloudflare/types/r2/super_slurper/jobs/log_list_response.py
@@ -0,0 +1,40 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = ["LogListResponse"]
+
+
+class LogListResponse(BaseModel):
+    created_at: Optional[str] = FieldInfo(alias="createdAt", default=None)
+
+    job: Optional[str] = None
+
+    log_type: Optional[
+        Literal[
+            "migrationStart",
+            "migrationComplete",
+            "migrationAbort",
+            "migrationError",
+            "migrationPause",
+            "migrationResume",
+            "migrationErrorFailedContinuation",
+            "importErrorRetryExhaustion",
+            "importSkippedStorageClass",
+            "importSkippedOversized",
+            "importSkippedEmptyObject",
+            "importSkippedUnsupportedContentType",
+            "importSkippedExcludedContentType",
+            "importSkippedInvalidMedia",
+            "importSkippedRequiresRetrieval",
+        ]
+    ] = FieldInfo(alias="logType", default=None)
+
+    message: Optional[str] = None
+
+    object_key: Optional[str] = FieldInfo(alias="objectKey", default=None)
diff --git a/src/cloudflare/types/r2/temporary_credential_create_params.py b/src/cloudflare/types/r2/temporary_credential_create_params.py
index 861a6a184fe..f9b394c5eb6 100644
--- a/src/cloudflare/types/r2/temporary_credential_create_params.py
+++ b/src/cloudflare/types/r2/temporary_credential_create_params.py
@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 
 __all__ = ["TemporaryCredentialCreateParams"]
@@ -12,22 +12,22 @@
 
 class TemporaryCredentialCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Account ID"""
+    """Account ID."""
 
     bucket: Required[str]
-    """Name of the R2 bucket"""
+    """Name of the R2 bucket."""
 
     parent_access_key_id: Required[Annotated[str, PropertyInfo(alias="parentAccessKeyId")]]
-    """The parent access key id to use for signing"""
+    """The parent access key id to use for signing."""
 
     permission: Required[Literal["admin-read-write", "admin-read-only", "object-read-write", "object-read-only"]]
-    """Permissions allowed on the credentials"""
+    """Permissions allowed on the credentials."""
 
     ttl_seconds: Required[Annotated[float, PropertyInfo(alias="ttlSeconds")]]
-    """How long the credentials will live for in seconds"""
+    """How long the credentials will live for in seconds."""
 
-    objects: List[str]
-    """Optional object paths to scope the credentials to"""
+    objects: SequenceNotStr[str]
+    """Optional object paths to scope the credentials to."""
 
-    prefixes: List[str]
-    """Optional prefix paths to scope the credentials to"""
+    prefixes: SequenceNotStr[str]
+    """Optional prefix paths to scope the credentials to."""
diff --git a/src/cloudflare/types/r2/temporary_credential_create_response.py b/src/cloudflare/types/r2/temporary_credential_create_response.py
index 3a1838f74fc..21834acee94 100644
--- a/src/cloudflare/types/r2/temporary_credential_create_response.py
+++ b/src/cloudflare/types/r2/temporary_credential_create_response.py
@@ -11,10 +11,10 @@
 
 class TemporaryCredentialCreateResponse(BaseModel):
     access_key_id: Optional[str] = FieldInfo(alias="accessKeyId", default=None)
-    """ID for new access key"""
+    """ID for new access key."""
 
     secret_access_key: Optional[str] = FieldInfo(alias="secretAccessKey", default=None)
-    """Secret access key"""
+    """Secret access key."""
 
     session_token: Optional[str] = FieldInfo(alias="sessionToken", default=None)
-    """Security token"""
+    """Security token."""
diff --git a/src/cloudflare/types/r2_data_catalog/__init__.py b/src/cloudflare/types/r2_data_catalog/__init__.py
new file mode 100644
index 00000000000..cdfc68aca69
--- /dev/null
+++ b/src/cloudflare/types/r2_data_catalog/__init__.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .namespace_list_params import NamespaceListParams as NamespaceListParams
+from .namespace_list_response import NamespaceListResponse as NamespaceListResponse
+from .credential_create_params import CredentialCreateParams as CredentialCreateParams
+from .r2_data_catalog_get_response import R2DataCatalogGetResponse as R2DataCatalogGetResponse
+from .r2_data_catalog_list_response import R2DataCatalogListResponse as R2DataCatalogListResponse
+from .maintenance_config_get_response import MaintenanceConfigGetResponse as MaintenanceConfigGetResponse
+from .r2_data_catalog_enable_response import R2DataCatalogEnableResponse as R2DataCatalogEnableResponse
+from .maintenance_config_update_params import MaintenanceConfigUpdateParams as MaintenanceConfigUpdateParams
+from .maintenance_config_update_response import MaintenanceConfigUpdateResponse as MaintenanceConfigUpdateResponse
diff --git a/src/cloudflare/types/r2_data_catalog/credential_create_params.py b/src/cloudflare/types/r2_data_catalog/credential_create_params.py
new file mode 100644
index 00000000000..f4bfaacdb58
--- /dev/null
+++ b/src/cloudflare/types/r2_data_catalog/credential_create_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["CredentialCreateParams"]
+
+
+class CredentialCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Use this to identify the account."""
+
+    token: Required[str]
+    """Provides the Cloudflare API token for accessing R2."""
diff --git a/src/cloudflare/types/r2_data_catalog/maintenance_config_get_response.py b/src/cloudflare/types/r2_data_catalog/maintenance_config_get_response.py
new file mode 100644
index 00000000000..9ebe48d78ea
--- /dev/null
+++ b/src/cloudflare/types/r2_data_catalog/maintenance_config_get_response.py
@@ -0,0 +1,61 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "MaintenanceConfigGetResponse",
+    "MaintenanceConfig",
+    "MaintenanceConfigCompaction",
+    "MaintenanceConfigSnapshotExpiration",
+]
+
+
+class MaintenanceConfigCompaction(BaseModel):
+    """Configures compaction for catalog maintenance."""
+
+    state: Literal["enabled", "disabled"]
+    """Specifies the state of maintenance operations."""
+
+    target_size_mb: Literal["64", "128", "256", "512"]
+    """Sets the target file size for compaction in megabytes."""
+
+
+class MaintenanceConfigSnapshotExpiration(BaseModel):
+    """Configures snapshot expiration settings."""
+
+    max_snapshot_age: str
+    """Specifies the maximum age for snapshots.
+
+    The system deletes snapshots older than this age. Format: <number><unit> where
+    unit is d (days), h (hours), m (minutes), or s (seconds). Examples: "7d" (7
+    days), "48h" (48 hours), "2880m" (2,880 minutes).
+    """
+
+    min_snapshots_to_keep: int
+    """Specifies the minimum number of snapshots to retain."""
+
+    state: Literal["enabled", "disabled"]
+    """Specifies the state of maintenance operations."""
+
+
+class MaintenanceConfig(BaseModel):
+    """Configures maintenance for the catalog."""
+
+    compaction: Optional[MaintenanceConfigCompaction] = None
+    """Configures compaction for catalog maintenance."""
+
+    snapshot_expiration: Optional[MaintenanceConfigSnapshotExpiration] = None
+    """Configures snapshot expiration settings."""
+
+
+class MaintenanceConfigGetResponse(BaseModel):
+    """Contains maintenance configuration and credential status."""
+
+    credential_status: Literal["present", "absent"]
+    """Shows the credential configuration status."""
+
+    maintenance_config: MaintenanceConfig
+    """Configures maintenance for the catalog."""
diff --git a/src/cloudflare/types/r2_data_catalog/maintenance_config_update_params.py b/src/cloudflare/types/r2_data_catalog/maintenance_config_update_params.py
new file mode 100644
index 00000000000..ddaed40f425
--- /dev/null
+++ b/src/cloudflare/types/r2_data_catalog/maintenance_config_update_params.py
@@ -0,0 +1,41 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["MaintenanceConfigUpdateParams", "Compaction", "SnapshotExpiration"]
+
+
+class MaintenanceConfigUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Use this to identify the account."""
+
+    compaction: Compaction
+    """Updates compaction configuration (all fields optional)."""
+
+    snapshot_expiration: SnapshotExpiration
+    """Updates snapshot expiration configuration (all fields optional)."""
+
+
+class Compaction(TypedDict, total=False):
+    """Updates compaction configuration (all fields optional)."""
+
+    state: Literal["enabled", "disabled"]
+    """Updates the state optionally."""
+
+    target_size_mb: Literal["64", "128", "256", "512"]
+    """Updates the target file size optionally."""
+
+
+class SnapshotExpiration(TypedDict, total=False):
+    """Updates snapshot expiration configuration (all fields optional)."""
+
+    max_snapshot_age: str
+    """Updates the maximum age for snapshots optionally."""
+
+    min_snapshots_to_keep: int
+    """Updates the minimum number of snapshots to retain optionally."""
+
+    state: Literal["enabled", "disabled"]
+    """Updates the state optionally."""
diff --git a/src/cloudflare/types/r2_data_catalog/maintenance_config_update_response.py b/src/cloudflare/types/r2_data_catalog/maintenance_config_update_response.py
new file mode 100644
index 00000000000..bdb91220498
--- /dev/null
+++ b/src/cloudflare/types/r2_data_catalog/maintenance_config_update_response.py
@@ -0,0 +1,46 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["MaintenanceConfigUpdateResponse", "Compaction", "SnapshotExpiration"]
+
+
+class Compaction(BaseModel):
+    """Configures compaction for catalog maintenance."""
+
+    state: Literal["enabled", "disabled"]
+    """Specifies the state of maintenance operations."""
+
+    target_size_mb: Literal["64", "128", "256", "512"]
+    """Sets the target file size for compaction in megabytes."""
+
+
+class SnapshotExpiration(BaseModel):
+    """Configures snapshot expiration settings."""
+
+    max_snapshot_age: str
+    """Specifies the maximum age for snapshots.
+
+    The system deletes snapshots older than this age. Format: <number><unit> where
+    unit is d (days), h (hours), m (minutes), or s (seconds). Examples: "7d" (7
+    days), "48h" (48 hours), "2880m" (2,880 minutes).
+    """
+
+    min_snapshots_to_keep: int
+    """Specifies the minimum number of snapshots to retain."""
+
+    state: Literal["enabled", "disabled"]
+    """Specifies the state of maintenance operations."""
+
+
+class MaintenanceConfigUpdateResponse(BaseModel):
+    """Configures maintenance for the catalog."""
+
+    compaction: Optional[Compaction] = None
+    """Configures compaction for catalog maintenance."""
+
+    snapshot_expiration: Optional[SnapshotExpiration] = None
+    """Configures snapshot expiration settings."""
diff --git a/src/cloudflare/types/r2_data_catalog/namespace_list_params.py b/src/cloudflare/types/r2_data_catalog/namespace_list_params.py
new file mode 100644
index 00000000000..fb42c240184
--- /dev/null
+++ b/src/cloudflare/types/r2_data_catalog/namespace_list_params.py
@@ -0,0 +1,41 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["NamespaceListParams"]
+
+
+class NamespaceListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Use this to identify the account."""
+
+    page_size: int
+    """Maximum number of namespaces to return per page. Defaults to 100, maximum 1000."""
+
+    page_token: str
+    """
+    Opaque pagination token from a previous response. Use this to fetch the next
+    page of results.
+    """
+
+    parent: str
+    """Parent namespace to filter by.
+
+    Only returns direct children of this namespace. For nested namespaces, use %1F
+    as separator (e.g., "bronze%1Fanalytics"). Omit this parameter to list top-level
+    namespaces.
+    """
+
+    return_details: bool
+    """
+    Whether to include additional metadata (timestamps). When true, response
+    includes created_at and updated_at arrays.
+    """
+
+    return_uuids: bool
+    """
+    Whether to include namespace UUIDs in the response. Set to true to receive the
+    namespace_uuids array.
+    """
diff --git a/src/cloudflare/types/r2_data_catalog/namespace_list_response.py b/src/cloudflare/types/r2_data_catalog/namespace_list_response.py
new file mode 100644
index 00000000000..98f51af6e5f
--- /dev/null
+++ b/src/cloudflare/types/r2_data_catalog/namespace_list_response.py
@@ -0,0 +1,52 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["NamespaceListResponse", "Detail"]
+
+
+class Detail(BaseModel):
+    """Contains namespace with metadata details."""
+
+    namespace: List[str]
+    """
+    Specifies the hierarchical namespace parts as an array of strings. For example,
+    ["bronze", "analytics"] represents the namespace "bronze.analytics".
+    """
+
+    namespace_uuid: str
+    """Contains the UUID that persists across renames."""
+
+    created_at: Optional[datetime] = None
+    """Indicates the creation timestamp in ISO 8601 format."""
+
+    updated_at: Optional[datetime] = None
+    """Shows the last update timestamp in ISO 8601 format. Null if never updated."""
+
+
+class NamespaceListResponse(BaseModel):
+    """Contains the list of namespaces with optional pagination."""
+
+    namespaces: List[List[str]]
+    """Lists namespaces in the catalog."""
+
+    details: Optional[List[Detail]] = None
+    """
+    Contains detailed metadata for each namespace when return_details is true. Each
+    object includes the namespace, UUID, and timestamps.
+    """
+
+    namespace_uuids: Optional[List[str]] = None
+    """
+    Contains UUIDs for each namespace when return_uuids is true. The order
+    corresponds to the namespaces array.
+    """
+
+    next_page_token: Optional[str] = None
+    """
+    Use this opaque token to fetch the next page of results. A null or absent value
+    indicates the last page.
+    """
diff --git a/src/cloudflare/types/r2_data_catalog/namespaces/__init__.py b/src/cloudflare/types/r2_data_catalog/namespaces/__init__.py
new file mode 100644
index 00000000000..e6ecba7fdbe
--- /dev/null
+++ b/src/cloudflare/types/r2_data_catalog/namespaces/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .table_list_params import TableListParams as TableListParams
+from .table_list_response import TableListResponse as TableListResponse
diff --git a/src/cloudflare/types/r2_data_catalog/namespaces/table_list_params.py b/src/cloudflare/types/r2_data_catalog/namespaces/table_list_params.py
new file mode 100644
index 00000000000..e9b5044f6ee
--- /dev/null
+++ b/src/cloudflare/types/r2_data_catalog/namespaces/table_list_params.py
@@ -0,0 +1,37 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["TableListParams"]
+
+
+class TableListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Use this to identify the account."""
+
+    bucket_name: Required[str]
+    """Specifies the R2 bucket name."""
+
+    page_size: int
+    """Maximum number of tables to return per page. Defaults to 100, maximum 1000."""
+
+    page_token: str
+    """
+    Opaque pagination token from a previous response. Use this to fetch the next
+    page of results.
+    """
+
+    return_details: bool
+    """
+    Whether to include additional metadata (timestamps, locations). When true,
+    response includes created_at, updated_at, metadata_locations, and locations
+    arrays.
+    """
+
+    return_uuids: bool
+    """
+    Whether to include table UUIDs in the response. Set to true to receive the
+    table_uuids array.
+    """
diff --git a/src/cloudflare/types/r2_data_catalog/namespaces/table_list_response.py b/src/cloudflare/types/r2_data_catalog/namespaces/table_list_response.py
new file mode 100644
index 00000000000..ad0657255b2
--- /dev/null
+++ b/src/cloudflare/types/r2_data_catalog/namespaces/table_list_response.py
@@ -0,0 +1,81 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["TableListResponse", "Identifier", "Detail", "DetailIdentifier"]
+
+
+class Identifier(BaseModel):
+    """Specifies a unique table identifier within a catalog."""
+
+    name: str
+    """Specifies the table name."""
+
+    namespace: List[str]
+    """
+    Specifies the hierarchical namespace parts as an array of strings. For example,
+    ["bronze", "analytics"] represents the namespace "bronze.analytics".
+    """
+
+
+class DetailIdentifier(BaseModel):
+    """Specifies a unique table identifier within a catalog."""
+
+    name: str
+    """Specifies the table name."""
+
+    namespace: List[str]
+    """
+    Specifies the hierarchical namespace parts as an array of strings. For example,
+    ["bronze", "analytics"] represents the namespace "bronze.analytics".
+    """
+
+
+class Detail(BaseModel):
+    """Contains table with metadata."""
+
+    identifier: DetailIdentifier
+    """Specifies a unique table identifier within a catalog."""
+
+    table_uuid: str
+    """Contains the UUID that persists across renames."""
+
+    created_at: Optional[datetime] = None
+    """Indicates the creation timestamp in ISO 8601 format."""
+
+    location: Optional[str] = None
+    """Specifies the base S3 URI for table storage location."""
+
+    metadata_location: Optional[str] = None
+    """Contains the S3 URI to table metadata file. Null for staged tables."""
+
+    updated_at: Optional[datetime] = None
+    """Shows the last update timestamp in ISO 8601 format. Null if never updated."""
+
+
+class TableListResponse(BaseModel):
+    """Contains the list of tables with optional pagination."""
+
+    identifiers: List[Identifier]
+    """Lists tables in the namespace."""
+
+    details: Optional[List[Detail]] = None
+    """
+    Contains detailed metadata for each table when return_details is true. Each
+    object includes identifier, UUID, timestamps, and locations.
+    """
+
+    next_page_token: Optional[str] = None
+    """
+    Use this opaque token to fetch the next page of results. A null or absent value
+    indicates the last page.
+    """
+
+    table_uuids: Optional[List[str]] = None
+    """
+    Contains UUIDs for each table when return_uuids is true. The order corresponds
+    to the identifiers array.
+    """
diff --git a/src/cloudflare/types/r2_data_catalog/namespaces/tables/__init__.py b/src/cloudflare/types/r2_data_catalog/namespaces/tables/__init__.py
new file mode 100644
index 00000000000..522345bd5dd
--- /dev/null
+++ b/src/cloudflare/types/r2_data_catalog/namespaces/tables/__init__.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .maintenance_config_get_response import MaintenanceConfigGetResponse as MaintenanceConfigGetResponse
+from .maintenance_config_update_params import MaintenanceConfigUpdateParams as MaintenanceConfigUpdateParams
+from .maintenance_config_update_response import MaintenanceConfigUpdateResponse as MaintenanceConfigUpdateResponse
diff --git a/src/cloudflare/types/r2_data_catalog/namespaces/tables/maintenance_config_get_response.py b/src/cloudflare/types/r2_data_catalog/namespaces/tables/maintenance_config_get_response.py
new file mode 100644
index 00000000000..89cb6fa5e7c
--- /dev/null
+++ b/src/cloudflare/types/r2_data_catalog/namespaces/tables/maintenance_config_get_response.py
@@ -0,0 +1,58 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ....._models import BaseModel
+
+__all__ = [
+    "MaintenanceConfigGetResponse",
+    "MaintenanceConfig",
+    "MaintenanceConfigCompaction",
+    "MaintenanceConfigSnapshotExpiration",
+]
+
+
+class MaintenanceConfigCompaction(BaseModel):
+    """Configures compaction settings for table optimization."""
+
+    state: Literal["enabled", "disabled"]
+    """Specifies the state of maintenance operations."""
+
+    target_size_mb: Literal["64", "128", "256", "512"]
+    """Sets the target file size for compaction in megabytes."""
+
+
+class MaintenanceConfigSnapshotExpiration(BaseModel):
+    """Configures snapshot expiration settings."""
+
+    max_snapshot_age: str
+    """Specifies the maximum age for snapshots.
+
+    The system deletes snapshots older than this age. Format: <number><unit> where
+    unit is d (days), h (hours), m (minutes), or s (seconds). Examples: "7d" (7
+    days), "48h" (48 hours), "2880m" (2,880 minutes).
+    """
+
+    min_snapshots_to_keep: int
+    """Specifies the minimum number of snapshots to retain."""
+
+    state: Literal["enabled", "disabled"]
+    """Specifies the state of maintenance operations."""
+
+
+class MaintenanceConfig(BaseModel):
+    """Configures maintenance for the table."""
+
+    compaction: Optional[MaintenanceConfigCompaction] = None
+    """Configures compaction settings for table optimization."""
+
+    snapshot_expiration: Optional[MaintenanceConfigSnapshotExpiration] = None
+    """Configures snapshot expiration settings."""
+
+
+class MaintenanceConfigGetResponse(BaseModel):
+    """Contains table maintenance configuration."""
+
+    maintenance_config: MaintenanceConfig
+    """Configures maintenance for the table."""
diff --git a/src/cloudflare/types/r2_data_catalog/namespaces/tables/maintenance_config_update_params.py b/src/cloudflare/types/r2_data_catalog/namespaces/tables/maintenance_config_update_params.py
new file mode 100644
index 00000000000..020ce8f3b6c
--- /dev/null
+++ b/src/cloudflare/types/r2_data_catalog/namespaces/tables/maintenance_config_update_params.py
@@ -0,0 +1,46 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["MaintenanceConfigUpdateParams", "Compaction", "SnapshotExpiration"]
+
+
+class MaintenanceConfigUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Use this to identify the account."""
+
+    bucket_name: Required[str]
+    """Specifies the R2 bucket name."""
+
+    namespace: Required[str]
+
+    compaction: Compaction
+    """Updates compaction configuration (all fields optional)."""
+
+    snapshot_expiration: SnapshotExpiration
+    """Updates snapshot expiration configuration (all fields optional)."""
+
+
+class Compaction(TypedDict, total=False):
+    """Updates compaction configuration (all fields optional)."""
+
+    state: Literal["enabled", "disabled"]
+    """Updates the state optionally."""
+
+    target_size_mb: Literal["64", "128", "256", "512"]
+    """Updates the target file size optionally."""
+
+
+class SnapshotExpiration(TypedDict, total=False):
+    """Updates snapshot expiration configuration (all fields optional)."""
+
+    max_snapshot_age: str
+    """Updates the maximum age for snapshots optionally."""
+
+    min_snapshots_to_keep: int
+    """Updates the minimum number of snapshots to retain optionally."""
+
+    state: Literal["enabled", "disabled"]
+    """Updates the state optionally."""
diff --git a/src/cloudflare/types/r2_data_catalog/namespaces/tables/maintenance_config_update_response.py b/src/cloudflare/types/r2_data_catalog/namespaces/tables/maintenance_config_update_response.py
new file mode 100644
index 00000000000..776dbd6865f
--- /dev/null
+++ b/src/cloudflare/types/r2_data_catalog/namespaces/tables/maintenance_config_update_response.py
@@ -0,0 +1,46 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ....._models import BaseModel
+
+__all__ = ["MaintenanceConfigUpdateResponse", "Compaction", "SnapshotExpiration"]
+
+
+class Compaction(BaseModel):
+    """Configures compaction settings for table optimization."""
+
+    state: Literal["enabled", "disabled"]
+    """Specifies the state of maintenance operations."""
+
+    target_size_mb: Literal["64", "128", "256", "512"]
+    """Sets the target file size for compaction in megabytes."""
+
+
+class SnapshotExpiration(BaseModel):
+    """Configures snapshot expiration settings."""
+
+    max_snapshot_age: str
+    """Specifies the maximum age for snapshots.
+
+    The system deletes snapshots older than this age. Format: <number><unit> where
+    unit is d (days), h (hours), m (minutes), or s (seconds). Examples: "7d" (7
+    days), "48h" (48 hours), "2880m" (2,880 minutes).
+    """
+
+    min_snapshots_to_keep: int
+    """Specifies the minimum number of snapshots to retain."""
+
+    state: Literal["enabled", "disabled"]
+    """Specifies the state of maintenance operations."""
+
+
+class MaintenanceConfigUpdateResponse(BaseModel):
+    """Configures maintenance for the table."""
+
+    compaction: Optional[Compaction] = None
+    """Configures compaction settings for table optimization."""
+
+    snapshot_expiration: Optional[SnapshotExpiration] = None
+    """Configures snapshot expiration settings."""
diff --git a/src/cloudflare/types/r2_data_catalog/r2_data_catalog_enable_response.py b/src/cloudflare/types/r2_data_catalog/r2_data_catalog_enable_response.py
new file mode 100644
index 00000000000..ad6273694ca
--- /dev/null
+++ b/src/cloudflare/types/r2_data_catalog/r2_data_catalog_enable_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["R2DataCatalogEnableResponse"]
+
+
+class R2DataCatalogEnableResponse(BaseModel):
+    """Contains response from activating an R2 bucket as a catalog."""
+
+    id: str
+    """Use this to uniquely identify the activated catalog."""
+
+    name: str
+    """Specifies the name of the activated catalog."""
diff --git a/src/cloudflare/types/r2_data_catalog/r2_data_catalog_get_response.py b/src/cloudflare/types/r2_data_catalog/r2_data_catalog_get_response.py
new file mode 100644
index 00000000000..ff9070993a4
--- /dev/null
+++ b/src/cloudflare/types/r2_data_catalog/r2_data_catalog_get_response.py
@@ -0,0 +1,73 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "R2DataCatalogGetResponse",
+    "MaintenanceConfig",
+    "MaintenanceConfigCompaction",
+    "MaintenanceConfigSnapshotExpiration",
+]
+
+
+class MaintenanceConfigCompaction(BaseModel):
+    """Configures compaction for catalog maintenance."""
+
+    state: Literal["enabled", "disabled"]
+    """Specifies the state of maintenance operations."""
+
+    target_size_mb: Literal["64", "128", "256", "512"]
+    """Sets the target file size for compaction in megabytes."""
+
+
+class MaintenanceConfigSnapshotExpiration(BaseModel):
+    """Configures snapshot expiration settings."""
+
+    max_snapshot_age: str
+    """Specifies the maximum age for snapshots.
+
+    The system deletes snapshots older than this age. Format: <number><unit> where
+    unit is d (days), h (hours), m (minutes), or s (seconds). Examples: "7d" (7
+    days), "48h" (48 hours), "2880m" (2,880 minutes).
+    """
+
+    min_snapshots_to_keep: int
+    """Specifies the minimum number of snapshots to retain."""
+
+    state: Literal["enabled", "disabled"]
+    """Specifies the state of maintenance operations."""
+
+
+class MaintenanceConfig(BaseModel):
+    """Configures maintenance for the catalog."""
+
+    compaction: Optional[MaintenanceConfigCompaction] = None
+    """Configures compaction for catalog maintenance."""
+
+    snapshot_expiration: Optional[MaintenanceConfigSnapshotExpiration] = None
+    """Configures snapshot expiration settings."""
+
+
+class R2DataCatalogGetResponse(BaseModel):
+    """Contains R2 Data Catalog information."""
+
+    id: str
+    """Use this to uniquely identify the catalog."""
+
+    bucket: str
+    """Specifies the associated R2 bucket name."""
+
+    name: str
+    """Specifies the catalog name (generated from account and bucket name)."""
+
+    status: Literal["active", "inactive"]
+    """Indicates the status of the catalog."""
+
+    credential_status: Optional[Literal["present", "absent"]] = None
+    """Shows the credential configuration status."""
+
+    maintenance_config: Optional[MaintenanceConfig] = None
+    """Configures maintenance for the catalog."""
diff --git a/src/cloudflare/types/r2_data_catalog/r2_data_catalog_list_response.py b/src/cloudflare/types/r2_data_catalog/r2_data_catalog_list_response.py
new file mode 100644
index 00000000000..42451956047
--- /dev/null
+++ b/src/cloudflare/types/r2_data_catalog/r2_data_catalog_list_response.py
@@ -0,0 +1,81 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "R2DataCatalogListResponse",
+    "Warehouse",
+    "WarehouseMaintenanceConfig",
+    "WarehouseMaintenanceConfigCompaction",
+    "WarehouseMaintenanceConfigSnapshotExpiration",
+]
+
+
+class WarehouseMaintenanceConfigCompaction(BaseModel):
+    """Configures compaction for catalog maintenance."""
+
+    state: Literal["enabled", "disabled"]
+    """Specifies the state of maintenance operations."""
+
+    target_size_mb: Literal["64", "128", "256", "512"]
+    """Sets the target file size for compaction in megabytes."""
+
+
+class WarehouseMaintenanceConfigSnapshotExpiration(BaseModel):
+    """Configures snapshot expiration settings."""
+
+    max_snapshot_age: str
+    """Specifies the maximum age for snapshots.
+
+    The system deletes snapshots older than this age. Format: <number><unit> where
+    unit is d (days), h (hours), m (minutes), or s (seconds). Examples: "7d" (7
+    days), "48h" (48 hours), "2880m" (2,880 minutes).
+    """
+
+    min_snapshots_to_keep: int
+    """Specifies the minimum number of snapshots to retain."""
+
+    state: Literal["enabled", "disabled"]
+    """Specifies the state of maintenance operations."""
+
+
+class WarehouseMaintenanceConfig(BaseModel):
+    """Configures maintenance for the catalog."""
+
+    compaction: Optional[WarehouseMaintenanceConfigCompaction] = None
+    """Configures compaction for catalog maintenance."""
+
+    snapshot_expiration: Optional[WarehouseMaintenanceConfigSnapshotExpiration] = None
+    """Configures snapshot expiration settings."""
+
+
+class Warehouse(BaseModel):
+    """Contains R2 Data Catalog information."""
+
+    id: str
+    """Use this to uniquely identify the catalog."""
+
+    bucket: str
+    """Specifies the associated R2 bucket name."""
+
+    name: str
+    """Specifies the catalog name (generated from account and bucket name)."""
+
+    status: Literal["active", "inactive"]
+    """Indicates the status of the catalog."""
+
+    credential_status: Optional[Literal["present", "absent"]] = None
+    """Shows the credential configuration status."""
+
+    maintenance_config: Optional[WarehouseMaintenanceConfig] = None
+    """Configures maintenance for the catalog."""
+
+
+class R2DataCatalogListResponse(BaseModel):
+    """Contains the list of catalogs."""
+
+    warehouses: List[Warehouse]
+    """Lists catalogs in the account."""
diff --git a/src/cloudflare/types/radar/__init__.py b/src/cloudflare/types/radar/__init__.py
index 6fc109e3bb2..67a0f0766e3 100644
--- a/src/cloudflare/types/radar/__init__.py
+++ b/src/cloudflare/types/radar/__init__.py
@@ -2,36 +2,88 @@
 
 from __future__ import annotations
 
+from .bot_get_params import BotGetParams as BotGetParams
+from .bot_list_params import BotListParams as BotListParams
+from .bot_get_response import BotGetResponse as BotGetResponse
+from .bot_list_response import BotListResponse as BotListResponse
+from .ct_summary_params import CTSummaryParams as CTSummaryParams
 from .entity_get_params import EntityGetParams as EntityGetParams
+from .bot_summary_params import BotSummaryParams as BotSummaryParams
 from .radar_email_series import RadarEmailSeries as RadarEmailSeries
 from .ranking_top_params import RankingTopParams as RankingTopParams
+from .ct_summary_response import CTSummaryResponse as CTSummaryResponse
 from .dataset_list_params import DatasetListParams as DatasetListParams
 from .entity_get_response import EntityGetResponse as EntityGetResponse
 from .radar_email_summary import RadarEmailSummary as RadarEmailSummary
+from .bot_summary_response import BotSummaryResponse as BotSummaryResponse
+from .ct_timeseries_params import CTTimeseriesParams as CTTimeseriesParams
 from .dataset_get_response import DatasetGetResponse as DatasetGetResponse
 from .ranking_top_response import RankingTopResponse as RankingTopResponse
 from .search_global_params import SearchGlobalParams as SearchGlobalParams
 from .bgp_timeseries_params import BGPTimeseriesParams as BGPTimeseriesParams
+from .bot_timeseries_params import BotTimeseriesParams as BotTimeseriesParams
 from .dataset_list_response import DatasetListResponse as DatasetListResponse
+from .dns_summary_v2_params import DNSSummaryV2Params as DNSSummaryV2Params
+from .dns_timeseries_params import DNSTimeseriesParams as DNSTimeseriesParams
+from .annotation_list_params import AnnotationListParams as AnnotationListParams
+from .ct_timeseries_response import CTTimeseriesResponse as CTTimeseriesResponse
+from .geolocation_get_params import GeolocationGetParams as GeolocationGetParams
+from .http_summary_v2_params import HTTPSummaryV2Params as HTTPSummaryV2Params
 from .http_timeseries_params import HTTPTimeseriesParams as HTTPTimeseriesParams
 from .search_global_response import SearchGlobalResponse as SearchGlobalResponse
+from .as112_summary_v2_params import AS112SummaryV2Params as AS112SummaryV2Params
 from .as112_timeseries_params import AS112TimeseriesParams as AS112TimeseriesParams
 from .bgp_timeseries_response import BGPTimeseriesResponse as BGPTimeseriesResponse
+from .bot_timeseries_response import BotTimeseriesResponse as BotTimeseriesResponse
 from .dataset_download_params import DatasetDownloadParams as DatasetDownloadParams
+from .dns_summary_v2_response import DNSSummaryV2Response as DNSSummaryV2Response
+from .dns_timeseries_response import DNSTimeseriesResponse as DNSTimeseriesResponse
+from .geolocation_list_params import GeolocationListParams as GeolocationListParams
+from .netflows_summary_params import NetFlowsSummaryParams as NetFlowsSummaryParams
+from .annotation_list_response import AnnotationListResponse as AnnotationListResponse
+from .geolocation_get_response import GeolocationGetResponse as GeolocationGetResponse
+from .http_summary_v2_response import HTTPSummaryV2Response as HTTPSummaryV2Response
 from .http_timeseries_response import HTTPTimeseriesResponse as HTTPTimeseriesResponse
+from .as112_summary_v2_response import AS112SummaryV2Response as AS112SummaryV2Response
 from .as112_timeseries_response import AS112TimeseriesResponse as AS112TimeseriesResponse
 from .dataset_download_response import DatasetDownloadResponse as DatasetDownloadResponse
-from .netflow_timeseries_params import NetflowTimeseriesParams as NetflowTimeseriesParams
+from .geolocation_list_response import GeolocationListResponse as GeolocationListResponse
+from .netflows_summary_response import NetFlowsSummaryResponse as NetFlowsSummaryResponse
+from .netflows_summary_v2_params import NetFlowsSummaryV2Params as NetFlowsSummaryV2Params
+from .netflows_timeseries_params import NetFlowsTimeseriesParams as NetFlowsTimeseriesParams
 from .traffic_anomaly_get_params import TrafficAnomalyGetParams as TrafficAnomalyGetParams
-from .netflow_timeseries_response import NetflowTimeseriesResponse as NetflowTimeseriesResponse
+from .ct_timeseries_groups_params import CTTimeseriesGroupsParams as CTTimeseriesGroupsParams
+from .bot_timeseries_groups_params import BotTimeseriesGroupsParams as BotTimeseriesGroupsParams
+from .netflows_summary_v2_response import NetFlowsSummaryV2Response as NetFlowsSummaryV2Response
+from .netflows_timeseries_response import NetFlowsTimeseriesResponse as NetFlowsTimeseriesResponse
 from .traffic_anomaly_get_response import TrafficAnomalyGetResponse as TrafficAnomalyGetResponse
+from .ct_timeseries_groups_response import CTTimeseriesGroupsResponse as CTTimeseriesGroupsResponse
+from .bot_timeseries_groups_response import BotTimeseriesGroupsResponse as BotTimeseriesGroupsResponse
+from .dns_timeseries_groups_v2_params import DNSTimeseriesGroupsV2Params as DNSTimeseriesGroupsV2Params
+from .http_timeseries_groups_v2_params import HTTPTimeseriesGroupsV2Params as HTTPTimeseriesGroupsV2Params
 from .ranking_timeseries_groups_params import RankingTimeseriesGroupsParams as RankingTimeseriesGroupsParams
+from .as112_timeseries_groups_v2_params import AS112TimeseriesGroupsV2Params as AS112TimeseriesGroupsV2Params
+from .dns_timeseries_groups_v2_response import DNSTimeseriesGroupsV2Response as DNSTimeseriesGroupsV2Response
+from .netflows_timeseries_groups_params import NetFlowsTimeseriesGroupsParams as NetFlowsTimeseriesGroupsParams
 from .tcp_resets_timeout_summary_params import TCPResetsTimeoutSummaryParams as TCPResetsTimeoutSummaryParams
+from .http_timeseries_groups_v2_response import HTTPTimeseriesGroupsV2Response as HTTPTimeseriesGroupsV2Response
 from .ranking_timeseries_groups_response import RankingTimeseriesGroupsResponse as RankingTimeseriesGroupsResponse
+from .as112_timeseries_groups_v2_response import AS112TimeseriesGroupsV2Response as AS112TimeseriesGroupsV2Response
+from .leaked_credential_summary_v2_params import LeakedCredentialSummaryV2Params as LeakedCredentialSummaryV2Params
+from .netflows_timeseries_groups_response import NetFlowsTimeseriesGroupsResponse as NetFlowsTimeseriesGroupsResponse
 from .tcp_resets_timeout_summary_response import TCPResetsTimeoutSummaryResponse as TCPResetsTimeoutSummaryResponse
+from .leaked_credential_summary_v2_response import (
+    LeakedCredentialSummaryV2Response as LeakedCredentialSummaryV2Response,
+)
 from .tcp_resets_timeout_timeseries_groups_params import (
     TCPResetsTimeoutTimeseriesGroupsParams as TCPResetsTimeoutTimeseriesGroupsParams,
 )
+from .leaked_credential_timeseries_groups_v2_params import (
+    LeakedCredentialTimeseriesGroupsV2Params as LeakedCredentialTimeseriesGroupsV2Params,
+)
 from .tcp_resets_timeout_timeseries_groups_response import (
     TCPResetsTimeoutTimeseriesGroupsResponse as TCPResetsTimeoutTimeseriesGroupsResponse,
 )
+from .leaked_credential_timeseries_groups_v2_response import (
+    LeakedCredentialTimeseriesGroupsV2Response as LeakedCredentialTimeseriesGroupsV2Response,
+)
diff --git a/src/cloudflare/types/radar/ai/__init__.py b/src/cloudflare/types/radar/ai/__init__.py
new file mode 100755
index 00000000000..a86e9a183e7
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/__init__.py
@@ -0,0 +1,32 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .bot_summary_v2_params import BotSummaryV2Params as BotSummaryV2Params
+from .bot_timeseries_params import BotTimeseriesParams as BotTimeseriesParams
+from .bot_summary_v2_response import BotSummaryV2Response as BotSummaryV2Response
+from .bot_timeseries_response import BotTimeseriesResponse as BotTimeseriesResponse
+from .to_markdown_create_params import ToMarkdownCreateParams as ToMarkdownCreateParams
+from .inference_summary_v2_params import InferenceSummaryV2Params as InferenceSummaryV2Params
+from .to_markdown_create_response import ToMarkdownCreateResponse as ToMarkdownCreateResponse
+from .bot_timeseries_groups_params import BotTimeseriesGroupsParams as BotTimeseriesGroupsParams
+from .inference_summary_v2_response import InferenceSummaryV2Response as InferenceSummaryV2Response
+from .bot_timeseries_groups_response import BotTimeseriesGroupsResponse as BotTimeseriesGroupsResponse
+from .timeseries_group_summary_params import TimeseriesGroupSummaryParams as TimeseriesGroupSummaryParams
+from .timeseries_group_summary_response import TimeseriesGroupSummaryResponse as TimeseriesGroupSummaryResponse
+from .timeseries_group_timeseries_params import TimeseriesGroupTimeseriesParams as TimeseriesGroupTimeseriesParams
+from .timeseries_group_user_agent_params import TimeseriesGroupUserAgentParams as TimeseriesGroupUserAgentParams
+from .timeseries_group_timeseries_response import TimeseriesGroupTimeseriesResponse as TimeseriesGroupTimeseriesResponse
+from .timeseries_group_user_agent_response import TimeseriesGroupUserAgentResponse as TimeseriesGroupUserAgentResponse
+from .inference_timeseries_groups_v2_params import (
+    InferenceTimeseriesGroupsV2Params as InferenceTimeseriesGroupsV2Params,
+)
+from .inference_timeseries_groups_v2_response import (
+    InferenceTimeseriesGroupsV2Response as InferenceTimeseriesGroupsV2Response,
+)
+from .timeseries_group_timeseries_groups_params import (
+    TimeseriesGroupTimeseriesGroupsParams as TimeseriesGroupTimeseriesGroupsParams,
+)
+from .timeseries_group_timeseries_groups_response import (
+    TimeseriesGroupTimeseriesGroupsResponse as TimeseriesGroupTimeseriesGroupsResponse,
+)
diff --git a/src/cloudflare/types/radar/ai/bot_summary_v2_params.py b/src/cloudflare/types/radar/ai/bot_summary_v2_params.py
new file mode 100644
index 00000000000..047f6066c73
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/bot_summary_v2_params.py
@@ -0,0 +1,74 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["BotSummaryV2Params"]
+
+
+class BotSummaryV2Params(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    crawl_purpose: Annotated[SequenceNotStr[str], PropertyInfo(alias="crawlPurpose")]
+    """Filters results by bot crawl purpose."""
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    industry: SequenceNotStr[str]
+    """Filters results by industry."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    vertical: SequenceNotStr[str]
+    """Filters results by vertical."""
diff --git a/src/cloudflare/types/radar/ai/bot_summary_v2_response.py b/src/cloudflare/types/radar/ai/bot_summary_v2_response.py
new file mode 100644
index 00000000000..fb7c6418428
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/bot_summary_v2_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "BotSummaryV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class BotSummaryV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/ai/bot_timeseries_groups_params.py b/src/cloudflare/types/radar/ai/bot_timeseries_groups_params.py
new file mode 100644
index 00000000000..f67b5eb5569
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/bot_timeseries_groups_params.py
@@ -0,0 +1,88 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["BotTimeseriesGroupsParams"]
+
+
+class BotTimeseriesGroupsParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    crawl_purpose: Annotated[SequenceNotStr[str], PropertyInfo(alias="crawlPurpose")]
+    """Filters results by bot crawl purpose."""
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    industry: SequenceNotStr[str]
+    """Filters results by industry."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    vertical: SequenceNotStr[str]
+    """Filters results by vertical."""
diff --git a/src/cloudflare/types/radar/ai/bot_timeseries_groups_response.py b/src/cloudflare/types/radar/ai/bot_timeseries_groups_response.py
new file mode 100644
index 00000000000..e448b09bfe3
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/bot_timeseries_groups_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "BotTimeseriesGroupsResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class BotTimeseriesGroupsResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/ai/bot_timeseries_params.py b/src/cloudflare/types/radar/ai/bot_timeseries_params.py
new file mode 100644
index 00000000000..923174686fe
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/bot_timeseries_params.py
@@ -0,0 +1,84 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["BotTimeseriesParams"]
+
+
+class BotTimeseriesParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    crawl_purpose: Annotated[SequenceNotStr[str], PropertyInfo(alias="crawlPurpose")]
+    """Filters results by bot crawl purpose."""
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    industry: SequenceNotStr[str]
+    """Filters results by industry."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    user_agent: Annotated[SequenceNotStr[str], PropertyInfo(alias="userAgent")]
+    """Filters results by user agent."""
+
+    vertical: SequenceNotStr[str]
+    """Filters results by vertical."""
diff --git a/src/cloudflare/types/radar/ai/bot_timeseries_response.py b/src/cloudflare/types/radar/ai/bot_timeseries_response.py
new file mode 100644
index 00000000000..b71ad68c705
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/bot_timeseries_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "BotTimeseriesResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "BotTimeseriesResponseItem",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class BotTimeseriesResponseItem(BaseModel):
+    timestamps: List[datetime]
+
+    values: List[str]
+
+
+class BotTimeseriesResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, BotTimeseriesResponseItem] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> BotTimeseriesResponseItem: ...
+    else:
+        __pydantic_extra__: Dict[str, BotTimeseriesResponseItem]
diff --git a/src/cloudflare/types/radar/ai/bots/__init__.py b/src/cloudflare/types/radar/ai/bots/__init__.py
new file mode 100644
index 00000000000..0bc497b8e84
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/bots/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .summary_user_agent_params import SummaryUserAgentParams as SummaryUserAgentParams
+from .summary_user_agent_response import SummaryUserAgentResponse as SummaryUserAgentResponse
diff --git a/src/cloudflare/types/radar/ai/bots/summary_user_agent_params.py b/src/cloudflare/types/radar/ai/bots/summary_user_agent_params.py
new file mode 100644
index 00000000000..6767e637f65
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/bots/summary_user_agent_params.py
@@ -0,0 +1,65 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ....._types import SequenceNotStr
+from ....._utils import PropertyInfo
+
+__all__ = ["SummaryUserAgentParams"]
+
+
+class SummaryUserAgentParams(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/ai/bots/summary_user_agent_response.py b/src/cloudflare/types/radar/ai/bots/summary_user_agent_response.py
new file mode 100644
index 00000000000..ee5641e5b26
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/bots/summary_user_agent_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = [
+    "SummaryUserAgentResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class SummaryUserAgentResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/ai/inference/__init__.py b/src/cloudflare/types/radar/ai/inference/__init__.py
new file mode 100644
index 00000000000..d9c95a53d16
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/inference/__init__.py
@@ -0,0 +1,8 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .summary_task_params import SummaryTaskParams as SummaryTaskParams
+from .summary_model_params import SummaryModelParams as SummaryModelParams
+from .summary_task_response import SummaryTaskResponse as SummaryTaskResponse
+from .summary_model_response import SummaryModelResponse as SummaryModelResponse
diff --git a/src/cloudflare/types/radar/ai/inference/summary_model_params.py b/src/cloudflare/types/radar/ai/inference/summary_model_params.py
new file mode 100644
index 00000000000..9f509e559f0
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/inference/summary_model_params.py
@@ -0,0 +1,41 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ....._types import SequenceNotStr
+from ....._utils import PropertyInfo
+
+__all__ = ["SummaryModelParams"]
+
+
+class SummaryModelParams(TypedDict, total=False):
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/ai/inference/summary_model_response.py b/src/cloudflare/types/radar/ai/inference/summary_model_response.py
new file mode 100644
index 00000000000..4c99017eaa9
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/inference/summary_model_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = [
+    "SummaryModelResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class SummaryModelResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/ai/inference/summary_task_params.py b/src/cloudflare/types/radar/ai/inference/summary_task_params.py
new file mode 100644
index 00000000000..79aa97cdbbe
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/inference/summary_task_params.py
@@ -0,0 +1,41 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ....._types import SequenceNotStr
+from ....._utils import PropertyInfo
+
+__all__ = ["SummaryTaskParams"]
+
+
+class SummaryTaskParams(TypedDict, total=False):
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/ai/inference/summary_task_response.py b/src/cloudflare/types/radar/ai/inference/summary_task_response.py
new file mode 100644
index 00000000000..fd9c9ea732b
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/inference/summary_task_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = [
+    "SummaryTaskResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class SummaryTaskResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/ai/inference/timeseries_groups/__init__.py b/src/cloudflare/types/radar/ai/inference/timeseries_groups/__init__.py
new file mode 100644
index 00000000000..d9c95a53d16
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/inference/timeseries_groups/__init__.py
@@ -0,0 +1,8 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .summary_task_params import SummaryTaskParams as SummaryTaskParams
+from .summary_model_params import SummaryModelParams as SummaryModelParams
+from .summary_task_response import SummaryTaskResponse as SummaryTaskResponse
+from .summary_model_response import SummaryModelResponse as SummaryModelResponse
diff --git a/src/cloudflare/types/radar/ai/inference/timeseries_groups/summary_model_params.py b/src/cloudflare/types/radar/ai/inference/timeseries_groups/summary_model_params.py
new file mode 100644
index 00000000000..25b62f4d509
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/inference/timeseries_groups/summary_model_params.py
@@ -0,0 +1,48 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ......_types import SequenceNotStr
+from ......_utils import PropertyInfo
+
+__all__ = ["SummaryModelParams"]
+
+
+class SummaryModelParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/ai/inference/timeseries_groups/summary_model_response.py b/src/cloudflare/types/radar/ai/inference/timeseries_groups/summary_model_response.py
new file mode 100644
index 00000000000..f930f07fbdc
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/inference/timeseries_groups/summary_model_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ......_models import BaseModel
+
+__all__ = [
+    "SummaryModelResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class SummaryModelResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/ai/inference/timeseries_groups/summary_task_params.py b/src/cloudflare/types/radar/ai/inference/timeseries_groups/summary_task_params.py
new file mode 100644
index 00000000000..62cca734439
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/inference/timeseries_groups/summary_task_params.py
@@ -0,0 +1,48 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ......_types import SequenceNotStr
+from ......_utils import PropertyInfo
+
+__all__ = ["SummaryTaskParams"]
+
+
+class SummaryTaskParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/ai/inference/timeseries_groups/summary_task_response.py b/src/cloudflare/types/radar/ai/inference/timeseries_groups/summary_task_response.py
new file mode 100644
index 00000000000..c539d7d4e0e
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/inference/timeseries_groups/summary_task_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ......_models import BaseModel
+
+__all__ = [
+    "SummaryTaskResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class SummaryTaskResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/ai/inference_summary_v2_params.py b/src/cloudflare/types/radar/ai/inference_summary_v2_params.py
new file mode 100644
index 00000000000..cb68f30e57d
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/inference_summary_v2_params.py
@@ -0,0 +1,65 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["InferenceSummaryV2Params"]
+
+
+class InferenceSummaryV2Params(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/ai/inference_summary_v2_response.py b/src/cloudflare/types/radar/ai/inference_summary_v2_response.py
new file mode 100644
index 00000000000..e45dc345d65
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/inference_summary_v2_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "InferenceSummaryV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class InferenceSummaryV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/ai/inference_timeseries_groups_v2_params.py b/src/cloudflare/types/radar/ai/inference_timeseries_groups_v2_params.py
new file mode 100644
index 00000000000..db5f948dee9
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/inference_timeseries_groups_v2_params.py
@@ -0,0 +1,79 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["InferenceTimeseriesGroupsV2Params"]
+
+
+class InferenceTimeseriesGroupsV2Params(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
diff --git a/src/cloudflare/types/radar/ai/inference_timeseries_groups_v2_response.py b/src/cloudflare/types/radar/ai/inference_timeseries_groups_v2_response.py
new file mode 100644
index 00000000000..d8c67c5fe67
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/inference_timeseries_groups_v2_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "InferenceTimeseriesGroupsV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class InferenceTimeseriesGroupsV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/ai/timeseries_group_summary_params.py b/src/cloudflare/types/radar/ai/timeseries_group_summary_params.py
new file mode 100644
index 00000000000..3c9676e1319
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/timeseries_group_summary_params.py
@@ -0,0 +1,74 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TimeseriesGroupSummaryParams"]
+
+
+class TimeseriesGroupSummaryParams(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    crawl_purpose: Annotated[SequenceNotStr[str], PropertyInfo(alias="crawlPurpose")]
+    """Filters results by bot crawl purpose."""
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    industry: SequenceNotStr[str]
+    """Filters results by industry."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    vertical: SequenceNotStr[str]
+    """Filters results by vertical."""
diff --git a/src/cloudflare/types/radar/ai/timeseries_group_summary_response.py b/src/cloudflare/types/radar/ai/timeseries_group_summary_response.py
new file mode 100644
index 00000000000..3c8e27d5838
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/timeseries_group_summary_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TimeseriesGroupSummaryResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class TimeseriesGroupSummaryResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/ai/timeseries_group_timeseries_groups_params.py b/src/cloudflare/types/radar/ai/timeseries_group_timeseries_groups_params.py
new file mode 100644
index 00000000000..c5d54b02a09
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/timeseries_group_timeseries_groups_params.py
@@ -0,0 +1,88 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TimeseriesGroupTimeseriesGroupsParams"]
+
+
+class TimeseriesGroupTimeseriesGroupsParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    crawl_purpose: Annotated[SequenceNotStr[str], PropertyInfo(alias="crawlPurpose")]
+    """Filters results by bot crawl purpose."""
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    industry: SequenceNotStr[str]
+    """Filters results by industry."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    vertical: SequenceNotStr[str]
+    """Filters results by vertical."""
diff --git a/src/cloudflare/types/radar/ai/timeseries_group_timeseries_groups_response.py b/src/cloudflare/types/radar/ai/timeseries_group_timeseries_groups_response.py
new file mode 100644
index 00000000000..a666366d717
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/timeseries_group_timeseries_groups_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TimeseriesGroupTimeseriesGroupsResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class TimeseriesGroupTimeseriesGroupsResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/ai/timeseries_group_timeseries_params.py b/src/cloudflare/types/radar/ai/timeseries_group_timeseries_params.py
new file mode 100644
index 00000000000..cc74a76e020
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/timeseries_group_timeseries_params.py
@@ -0,0 +1,84 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TimeseriesGroupTimeseriesParams"]
+
+
+class TimeseriesGroupTimeseriesParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    crawl_purpose: Annotated[SequenceNotStr[str], PropertyInfo(alias="crawlPurpose")]
+    """Filters results by bot crawl purpose."""
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    industry: SequenceNotStr[str]
+    """Filters results by industry."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    user_agent: Annotated[SequenceNotStr[str], PropertyInfo(alias="userAgent")]
+    """Filters results by user agent."""
+
+    vertical: SequenceNotStr[str]
+    """Filters results by vertical."""
diff --git a/src/cloudflare/types/radar/ai/timeseries_group_timeseries_response.py b/src/cloudflare/types/radar/ai/timeseries_group_timeseries_response.py
new file mode 100644
index 00000000000..89bf10123f4
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/timeseries_group_timeseries_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TimeseriesGroupTimeseriesResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "TimeseriesGroupTimeseriesResponseItem",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class TimeseriesGroupTimeseriesResponseItem(BaseModel):
+    timestamps: List[datetime]
+
+    values: List[str]
+
+
+class TimeseriesGroupTimeseriesResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, TimeseriesGroupTimeseriesResponseItem] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> TimeseriesGroupTimeseriesResponseItem: ...
+    else:
+        __pydantic_extra__: Dict[str, TimeseriesGroupTimeseriesResponseItem]
diff --git a/src/cloudflare/types/radar/ai/timeseries_group_user_agent_params.py b/src/cloudflare/types/radar/ai/timeseries_group_user_agent_params.py
new file mode 100644
index 00000000000..132cd81fc42
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/timeseries_group_user_agent_params.py
@@ -0,0 +1,72 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TimeseriesGroupUserAgentParams"]
+
+
+class TimeseriesGroupUserAgentParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/ai/timeseries_group_user_agent_response.py b/src/cloudflare/types/radar/ai/timeseries_group_user_agent_response.py
new file mode 100644
index 00000000000..499de99147c
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/timeseries_group_user_agent_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TimeseriesGroupUserAgentResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class TimeseriesGroupUserAgentResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/ai/to_markdown_create_params.py b/src/cloudflare/types/radar/ai/to_markdown_create_params.py
new file mode 100644
index 00000000000..92304981b59
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/to_markdown_create_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ...._types import FileTypes, SequenceNotStr
+
+__all__ = ["ToMarkdownCreateParams"]
+
+
+class ToMarkdownCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    files: Required[SequenceNotStr[FileTypes]]
diff --git a/src/cloudflare/types/radar/ai/to_markdown_create_response.py b/src/cloudflare/types/radar/ai/to_markdown_create_response.py
new file mode 100644
index 00000000000..82540556a09
--- /dev/null
+++ b/src/cloudflare/types/radar/ai/to_markdown_create_response.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["ToMarkdownCreateResponse"]
+
+
+class ToMarkdownCreateResponse(BaseModel):
+    data: str
+
+    format: str
+
+    mime_type: str = FieldInfo(alias="mimeType")
+
+    name: str
+
+    tokens: str
diff --git a/src/cloudflare/types/radar/annotation_list_params.py b/src/cloudflare/types/radar/annotation_list_params.py
new file mode 100644
index 00000000000..2f83db44783
--- /dev/null
+++ b/src/cloudflare/types/radar/annotation_list_params.py
@@ -0,0 +1,81 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["AnnotationListParams"]
+
+
+class AnnotationListParams(TypedDict, total=False):
+    asn: int
+    """Filters results by Autonomous System.
+
+    Specify a single Autonomous System Number (ASN) as integer.
+    """
+
+    data_source: Annotated[
+        Literal[
+            "ALL",
+            "AI_BOTS",
+            "AI_GATEWAY",
+            "BGP",
+            "BOTS",
+            "CONNECTION_ANOMALY",
+            "CT",
+            "DNS",
+            "DNS_MAGNITUDE",
+            "DNS_AS112",
+            "DOS",
+            "EMAIL_ROUTING",
+            "EMAIL_SECURITY",
+            "FW",
+            "FW_PG",
+            "HTTP",
+            "HTTP_CONTROL",
+            "HTTP_CRAWLER_REFERER",
+            "HTTP_ORIGINS",
+            "IQI",
+            "LEAKED_CREDENTIALS",
+            "NET",
+            "ROBOTS_TXT",
+            "SPEED",
+            "WORKERS_AI",
+        ],
+        PropertyInfo(alias="dataSource"),
+    ]
+    """Filters results by data source."""
+
+    date_end: Annotated[Union[str, datetime], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[str, PropertyInfo(alias="dateRange")]
+    """Filters results by date range."""
+
+    date_start: Annotated[Union[str, datetime], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range (inclusive)."""
+
+    event_type: Annotated[
+        Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"],
+        PropertyInfo(alias="eventType"),
+    ]
+    """Filters results by event type."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit: int
+    """Limits the number of objects returned in the response."""
+
+    location: str
+    """Filters results by location. Specify an alpha-2 location code."""
+
+    offset: int
+    """Skips the specified number of objects before fetching the results."""
+
+    origin: str
+    """Filters results by origin."""
diff --git a/src/cloudflare/types/radar/annotation_list_response.py b/src/cloudflare/types/radar/annotation_list_response.py
new file mode 100644
index 00000000000..7762b5188da
--- /dev/null
+++ b/src/cloudflare/types/radar/annotation_list_response.py
@@ -0,0 +1,85 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "AnnotationListResponse",
+    "Annotation",
+    "AnnotationASNsDetail",
+    "AnnotationASNsDetailLocations",
+    "AnnotationLocationsDetail",
+    "AnnotationOriginsDetail",
+    "AnnotationOutage",
+]
+
+
+class AnnotationASNsDetailLocations(BaseModel):
+    code: str
+
+    name: str
+
+
+class AnnotationASNsDetail(BaseModel):
+    asn: str
+
+    name: str
+
+    locations: Optional[AnnotationASNsDetailLocations] = None
+
+
+class AnnotationLocationsDetail(BaseModel):
+    code: str
+
+    name: str
+
+
+class AnnotationOriginsDetail(BaseModel):
+    name: str
+
+    origin: str
+
+
+class AnnotationOutage(BaseModel):
+    outage_cause: str = FieldInfo(alias="outageCause")
+
+    outage_type: str = FieldInfo(alias="outageType")
+
+
+class Annotation(BaseModel):
+    id: str
+
+    asns: List[int]
+
+    asns_details: List[AnnotationASNsDetail] = FieldInfo(alias="asnsDetails")
+
+    data_source: str = FieldInfo(alias="dataSource")
+
+    event_type: str = FieldInfo(alias="eventType")
+
+    locations: List[str]
+
+    locations_details: List[AnnotationLocationsDetail] = FieldInfo(alias="locationsDetails")
+
+    origins: List[str]
+
+    origins_details: List[AnnotationOriginsDetail] = FieldInfo(alias="originsDetails")
+
+    outage: AnnotationOutage
+
+    start_date: str = FieldInfo(alias="startDate")
+
+    description: Optional[str] = None
+
+    end_date: Optional[str] = FieldInfo(alias="endDate", default=None)
+
+    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+
+    scope: Optional[str] = None
+
+
+class AnnotationListResponse(BaseModel):
+    annotations: List[Annotation]
diff --git a/src/cloudflare/types/radar/annotations/outage_get_params.py b/src/cloudflare/types/radar/annotations/outage_get_params.py
index 23df4113305..cf8cc7e50b4 100644
--- a/src/cloudflare/types/radar/annotations/outage_get_params.py
+++ b/src/cloudflare/types/radar/annotations/outage_get_params.py
@@ -13,28 +13,31 @@
 
 class OutageGetParams(TypedDict, total=False):
     asn: int
-    """Single ASN as integer."""
+    """Filters results by Autonomous System.
+
+    Specify a single Autonomous System Number (ASN) as integer.
+    """
 
     date_end: Annotated[Union[str, datetime], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
     date_range: Annotated[str, PropertyInfo(alias="dateRange")]
-    """
-    Shorthand date ranges for the last X days - use when you don't need specific
-    start and end dates.
-    """
+    """Filters results by date range."""
 
     date_start: Annotated[Union[str, datetime], PropertyInfo(alias="dateStart", format="iso8601")]
     """Start of the date range (inclusive)."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
     location: str
-    """Location Alpha2 code."""
+    """Filters results by location. Specify an alpha-2 location code."""
 
     offset: int
-    """Number of objects to skip before grabbing results."""
+    """Skips the specified number of objects before fetching the results."""
+
+    origin: str
+    """Filters results by origin."""
diff --git a/src/cloudflare/types/radar/annotations/outage_get_response.py b/src/cloudflare/types/radar/annotations/outage_get_response.py
index a849b72fd21..0addab631f8 100644
--- a/src/cloudflare/types/radar/annotations/outage_get_response.py
+++ b/src/cloudflare/types/radar/annotations/outage_get_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
+from datetime import datetime
 
 from pydantic import Field as FieldInfo
 
@@ -12,6 +13,7 @@
     "AnnotationASNsDetail",
     "AnnotationASNsDetailLocations",
     "AnnotationLocationsDetail",
+    "AnnotationOriginsDetail",
     "AnnotationOutage",
 ]
 
@@ -36,6 +38,12 @@ class AnnotationLocationsDetail(BaseModel):
     name: str
 
 
+class AnnotationOriginsDetail(BaseModel):
+    name: str
+
+    origin: str
+
+
 class AnnotationOutage(BaseModel):
     outage_cause: str = FieldInfo(alias="outageCause")
 
@@ -57,13 +65,17 @@ class Annotation(BaseModel):
 
     locations_details: List[AnnotationLocationsDetail] = FieldInfo(alias="locationsDetails")
 
+    origins: List[str]
+
+    origins_details: List[AnnotationOriginsDetail] = FieldInfo(alias="originsDetails")
+
     outage: AnnotationOutage
 
-    start_date: str = FieldInfo(alias="startDate")
+    start_date: datetime = FieldInfo(alias="startDate")
 
     description: Optional[str] = None
 
-    end_date: Optional[str] = FieldInfo(alias="endDate", default=None)
+    end_date: Optional[datetime] = FieldInfo(alias="endDate", default=None)
 
     linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
 
diff --git a/src/cloudflare/types/radar/annotations/outage_locations_params.py b/src/cloudflare/types/radar/annotations/outage_locations_params.py
index 51ae0778681..e184bb5bd65 100644
--- a/src/cloudflare/types/radar/annotations/outage_locations_params.py
+++ b/src/cloudflare/types/radar/annotations/outage_locations_params.py
@@ -16,16 +16,13 @@ class OutageLocationsParams(TypedDict, total=False):
     """End of the date range (inclusive)."""
 
     date_range: Annotated[str, PropertyInfo(alias="dateRange")]
-    """
-    Shorthand date ranges for the last X days - use when you don't need specific
-    start and end dates.
-    """
+    """Filters results by date range."""
 
     date_start: Annotated[Union[str, datetime], PropertyInfo(alias="dateStart", format="iso8601")]
     """Start of the date range (inclusive)."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
diff --git a/src/cloudflare/types/radar/annotations/outage_locations_response.py b/src/cloudflare/types/radar/annotations/outage_locations_response.py
index b175087e150..b01d0f0a089 100644
--- a/src/cloudflare/types/radar/annotations/outage_locations_response.py
+++ b/src/cloudflare/types/radar/annotations/outage_locations_response.py
@@ -15,6 +15,7 @@ class Annotation(BaseModel):
     client_country_name: str = FieldInfo(alias="clientCountryName")
 
     value: str
+    """A numeric string."""
 
 
 class OutageLocationsResponse(BaseModel):
diff --git a/src/cloudflare/types/radar/as112/summary_dnssec_params.py b/src/cloudflare/types/radar/as112/summary_dnssec_params.py
index df69e836284..65dcc3053f0 100644
--- a/src/cloudflare/types/radar/as112/summary_dnssec_params.py
+++ b/src/cloudflare/types/radar/as112/summary_dnssec_params.py
@@ -2,52 +2,179 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import List, Union, Optional
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["SummaryDNSSECParams"]
 
 
 class SummaryDNSSECParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
-
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
-    """
-
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
diff --git a/src/cloudflare/types/radar/as112/summary_dnssec_response.py b/src/cloudflare/types/radar/as112/summary_dnssec_response.py
index b692d28f07f..9784acaae95 100644
--- a/src/cloudflare/types/radar/as112/summary_dnssec_response.py
+++ b/src/cloudflare/types/radar/as112/summary_dnssec_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,124 @@
 __all__ = [
     "SummaryDNSSECResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     not_supported: str = FieldInfo(alias="NOT_SUPPORTED")
+    """A numeric string."""
 
     supported: str = FieldInfo(alias="SUPPORTED")
+    """A numeric string."""
 
 
 class SummaryDNSSECResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/as112/summary_edns_params.py b/src/cloudflare/types/radar/as112/summary_edns_params.py
index aa8cb759564..2d142dfc646 100644
--- a/src/cloudflare/types/radar/as112/summary_edns_params.py
+++ b/src/cloudflare/types/radar/as112/summary_edns_params.py
@@ -2,52 +2,179 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import List, Union, Optional
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["SummaryEdnsParams"]
 
 
 class SummaryEdnsParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
-
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
-    """
-
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
diff --git a/src/cloudflare/types/radar/as112/summary_edns_response.py b/src/cloudflare/types/radar/as112/summary_edns_response.py
index 48ca7517798..7a0209c9ea4 100644
--- a/src/cloudflare/types/radar/as112/summary_edns_response.py
+++ b/src/cloudflare/types/radar/as112/summary_edns_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,124 @@
 __all__ = [
     "SummaryEdnsResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     not_supported: str = FieldInfo(alias="NOT_SUPPORTED")
+    """A numeric string."""
 
     supported: str = FieldInfo(alias="SUPPORTED")
+    """A numeric string."""
 
 
 class SummaryEdnsResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/as112/summary_ip_version_params.py b/src/cloudflare/types/radar/as112/summary_ip_version_params.py
index edf5caac4ef..3e56f532e3c 100644
--- a/src/cloudflare/types/radar/as112/summary_ip_version_params.py
+++ b/src/cloudflare/types/radar/as112/summary_ip_version_params.py
@@ -2,52 +2,179 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import List, Union, Optional
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["SummaryIPVersionParams"]
 
 
 class SummaryIPVersionParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
-
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
-    """
-
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
diff --git a/src/cloudflare/types/radar/as112/summary_ip_version_response.py b/src/cloudflare/types/radar/as112/summary_ip_version_response.py
index 6286c80dc1d..c73c7cf94ab 100644
--- a/src/cloudflare/types/radar/as112/summary_ip_version_response.py
+++ b/src/cloudflare/types/radar/as112/summary_ip_version_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,124 @@
 __all__ = [
     "SummaryIPVersionResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     i_pv4: str = FieldInfo(alias="IPv4")
+    """A numeric string."""
 
     i_pv6: str = FieldInfo(alias="IPv6")
+    """A numeric string."""
 
 
 class SummaryIPVersionResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/as112/summary_protocol_params.py b/src/cloudflare/types/radar/as112/summary_protocol_params.py
index bfe7e77315b..3419408d2fb 100644
--- a/src/cloudflare/types/radar/as112/summary_protocol_params.py
+++ b/src/cloudflare/types/radar/as112/summary_protocol_params.py
@@ -2,52 +2,176 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import List, Union, Optional
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["SummaryProtocolParams"]
 
 
 class SummaryProtocolParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
-
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
-    """
-
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
diff --git a/src/cloudflare/types/radar/as112/summary_protocol_response.py b/src/cloudflare/types/radar/as112/summary_protocol_response.py
index 473abd3666c..ffa0f33760b 100644
--- a/src/cloudflare/types/radar/as112/summary_protocol_response.py
+++ b/src/cloudflare/types/radar/as112/summary_protocol_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,130 @@
 __all__ = [
     "SummaryProtocolResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    normalization: str
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
-    tcp: str
+    https: str = FieldInfo(alias="HTTPS")
+    """A numeric string."""
+
+    tcp: str = FieldInfo(alias="TCP")
+    """A numeric string."""
+
+    tls: str = FieldInfo(alias="TLS")
+    """A numeric string."""
 
-    udp: str
+    udp: str = FieldInfo(alias="UDP")
+    """A numeric string."""
 
 
 class SummaryProtocolResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/as112/summary_query_type_params.py b/src/cloudflare/types/radar/as112/summary_query_type_params.py
index aea17cb0a58..024dd13b7d3 100644
--- a/src/cloudflare/types/radar/as112/summary_query_type_params.py
+++ b/src/cloudflare/types/radar/as112/summary_query_type_params.py
@@ -6,48 +6,83 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["SummaryQueryTypeParams"]
 
 
 class SummaryQueryTypeParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
-
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
-    """
-
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
diff --git a/src/cloudflare/types/radar/as112/summary_query_type_response.py b/src/cloudflare/types/radar/as112/summary_query_type_response.py
index d5268d2eb3f..ae1ab1c7571 100644
--- a/src/cloudflare/types/radar/as112/summary_query_type_response.py
+++ b/src/cloudflare/types/radar/as112/summary_query_type_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Dict, List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,66 +11,115 @@
 __all__ = [
     "SummaryQueryTypeResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
-    "Summary0",
+    "MetaDateRange",
+    "MetaUnit",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
 
-    level: Optional[int] = None
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
 
-class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+class MetaUnit(BaseModel):
+    name: str
 
-    normalization: str
+    value: str
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
 
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
 
-class Summary0(BaseModel):
-    a: str = FieldInfo(alias="A")
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    aaaa: str = FieldInfo(alias="AAAA")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    ptr: str = FieldInfo(alias="PTR")
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    soa: str = FieldInfo(alias="SOA")
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    srv: str = FieldInfo(alias="SRV")
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class SummaryQueryTypeResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
-    summary_0: Summary0
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/as112/summary_response_codes_params.py b/src/cloudflare/types/radar/as112/summary_response_codes_params.py
index 9579b04766e..2aa9878c65d 100644
--- a/src/cloudflare/types/radar/as112/summary_response_codes_params.py
+++ b/src/cloudflare/types/radar/as112/summary_response_codes_params.py
@@ -2,52 +2,158 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import List, Union, Optional
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["SummaryResponseCodesParams"]
 
 
 class SummaryResponseCodesParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
-
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
-    """
-
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
diff --git a/src/cloudflare/types/radar/as112/summary_response_codes_response.py b/src/cloudflare/types/radar/as112/summary_response_codes_response.py
index 9c916f07a98..a71960387da 100644
--- a/src/cloudflare/types/radar/as112/summary_response_codes_response.py
+++ b/src/cloudflare/types/radar/as112/summary_response_codes_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Dict, List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,115 @@
 __all__ = [
     "SummaryResponseCodesResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
-    "Summary0",
+    "MetaDateRange",
+    "MetaUnit",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
 
-    level: Optional[int] = None
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+    """Metadata for the results."""
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
 
-    normalization: str
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-class Summary0(BaseModel):
-    noerror: str = FieldInfo(alias="NOERROR")
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    nxdomain: str = FieldInfo(alias="NXDOMAIN")
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class SummaryResponseCodesResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
-    summary_0: Summary0
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/as112/timeseries_group_dnssec_params.py b/src/cloudflare/types/radar/as112/timeseries_group_dnssec_params.py
index d818ce2ddf2..5c07e2f6ef6 100644
--- a/src/cloudflare/types/radar/as112/timeseries_group_dnssec_params.py
+++ b/src/cloudflare/types/radar/as112/timeseries_group_dnssec_params.py
@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import List, Union, Optional
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupDNSSECParams"]
@@ -13,48 +14,174 @@
 
 class TimeseriesGroupDNSSECParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
-    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
-    """
-
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
diff --git a/src/cloudflare/types/radar/as112/timeseries_group_dnssec_response.py b/src/cloudflare/types/radar/as112/timeseries_group_dnssec_response.py
index dc3bd4beb57..9afeebe79ed 100644
--- a/src/cloudflare/types/radar/as112/timeseries_group_dnssec_response.py
+++ b/src/cloudflare/types/radar/as112/timeseries_group_dnssec_response.py
@@ -1,12 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TimeseriesGroupDNSSECResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupDNSSECResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -16,6 +135,7 @@ class Serie0(BaseModel):
 
 
 class TimeseriesGroupDNSSECResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/as112/timeseries_group_edns_params.py b/src/cloudflare/types/radar/as112/timeseries_group_edns_params.py
index cde360d1e43..7430ffddab8 100644
--- a/src/cloudflare/types/radar/as112/timeseries_group_edns_params.py
+++ b/src/cloudflare/types/radar/as112/timeseries_group_edns_params.py
@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import List, Union, Optional
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupEdnsParams"]
@@ -13,48 +14,174 @@
 
 class TimeseriesGroupEdnsParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
-    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
-    """
-
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
diff --git a/src/cloudflare/types/radar/as112/timeseries_group_edns_response.py b/src/cloudflare/types/radar/as112/timeseries_group_edns_response.py
index b40d292d6b3..5ee42c158d4 100644
--- a/src/cloudflare/types/radar/as112/timeseries_group_edns_response.py
+++ b/src/cloudflare/types/radar/as112/timeseries_group_edns_response.py
@@ -1,12 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TimeseriesGroupEdnsResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupEdnsResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -16,6 +135,7 @@ class Serie0(BaseModel):
 
 
 class TimeseriesGroupEdnsResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/as112/timeseries_group_ip_version_params.py b/src/cloudflare/types/radar/as112/timeseries_group_ip_version_params.py
index 54f655692fb..7f004cdde6b 100644
--- a/src/cloudflare/types/radar/as112/timeseries_group_ip_version_params.py
+++ b/src/cloudflare/types/radar/as112/timeseries_group_ip_version_params.py
@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import List, Union, Optional
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupIPVersionParams"]
@@ -13,48 +14,174 @@
 
 class TimeseriesGroupIPVersionParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
-    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
-    """
-
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
diff --git a/src/cloudflare/types/radar/as112/timeseries_group_ip_version_response.py b/src/cloudflare/types/radar/as112/timeseries_group_ip_version_response.py
index 4e9128d1c2f..6f047f9a1e4 100644
--- a/src/cloudflare/types/radar/as112/timeseries_group_ip_version_response.py
+++ b/src/cloudflare/types/radar/as112/timeseries_group_ip_version_response.py
@@ -1,12 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TimeseriesGroupIPVersionResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupIPVersionResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -16,6 +135,7 @@ class Serie0(BaseModel):
 
 
 class TimeseriesGroupIPVersionResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/as112/timeseries_group_protocol_params.py b/src/cloudflare/types/radar/as112/timeseries_group_protocol_params.py
index deb737e61b1..5bfff9195e4 100644
--- a/src/cloudflare/types/radar/as112/timeseries_group_protocol_params.py
+++ b/src/cloudflare/types/radar/as112/timeseries_group_protocol_params.py
@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import List, Union, Optional
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupProtocolParams"]
@@ -13,48 +14,171 @@
 
 class TimeseriesGroupProtocolParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
-    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
-    """
-
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
diff --git a/src/cloudflare/types/radar/as112/timeseries_group_protocol_response.py b/src/cloudflare/types/radar/as112/timeseries_group_protocol_response.py
index dbbce1e4eea..25cdf9ccc54 100644
--- a/src/cloudflare/types/radar/as112/timeseries_group_protocol_response.py
+++ b/src/cloudflare/types/radar/as112/timeseries_group_protocol_response.py
@@ -1,19 +1,145 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TimeseriesGroupProtocolResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupProtocolResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
-    tcp: List[str]
+    https: List[str] = FieldInfo(alias="HTTPS")
+
+    tcp: List[str] = FieldInfo(alias="TCP")
+
+    tls: List[str] = FieldInfo(alias="TLS")
 
-    udp: List[str]
+    udp: List[str] = FieldInfo(alias="UDP")
 
 
 class TimeseriesGroupProtocolResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/as112/timeseries_group_query_type_params.py b/src/cloudflare/types/radar/as112/timeseries_group_query_type_params.py
index d83568fe1d3..8c9a8eb9869 100644
--- a/src/cloudflare/types/radar/as112/timeseries_group_query_type_params.py
+++ b/src/cloudflare/types/radar/as112/timeseries_group_query_type_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupQueryTypeParams"]
@@ -13,48 +14,82 @@
 
 class TimeseriesGroupQueryTypeParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
-    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
-    """
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
-
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
diff --git a/src/cloudflare/types/radar/as112/timeseries_group_query_type_response.py b/src/cloudflare/types/radar/as112/timeseries_group_query_type_response.py
index 5cf5ed0abd4..34bd30918f0 100644
--- a/src/cloudflare/types/radar/as112/timeseries_group_query_type_response.py
+++ b/src/cloudflare/types/radar/as112/timeseries_group_query_type_response.py
@@ -1,27 +1,151 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TimeseriesGroupQueryTypeResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupQueryTypeResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
 
 
-class Serie0(BaseModel):
-    a: List[str] = FieldInfo(alias="A")
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    aaaa: List[str] = FieldInfo(alias="AAAA")
 
-    ptr: List[str] = FieldInfo(alias="PTR")
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
 
-    soa: List[str] = FieldInfo(alias="SOA")
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
 
-    srv: List[str] = FieldInfo(alias="SRV")
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
 
 
 class TimeseriesGroupQueryTypeResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/as112/timeseries_group_response_codes_params.py b/src/cloudflare/types/radar/as112/timeseries_group_response_codes_params.py
index 05cf4ac7fab..7c783c58812 100644
--- a/src/cloudflare/types/radar/as112/timeseries_group_response_codes_params.py
+++ b/src/cloudflare/types/radar/as112/timeseries_group_response_codes_params.py
@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import List, Union, Optional
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupResponseCodesParams"]
@@ -13,48 +14,153 @@
 
 class TimeseriesGroupResponseCodesParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
-    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
-    """
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
-
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
diff --git a/src/cloudflare/types/radar/as112/timeseries_group_response_codes_response.py b/src/cloudflare/types/radar/as112/timeseries_group_response_codes_response.py
index e2bd1783d83..ddedbbe5aa9 100644
--- a/src/cloudflare/types/radar/as112/timeseries_group_response_codes_response.py
+++ b/src/cloudflare/types/radar/as112/timeseries_group_response_codes_response.py
@@ -1,21 +1,151 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TimeseriesGroupResponseCodesResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupResponseCodesResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
-    noerror: List[str] = FieldInfo(alias="NOERROR")
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
 
-    nxdomain: List[str] = FieldInfo(alias="NXDOMAIN")
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
 
 
 class TimeseriesGroupResponseCodesResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/as112/top_dnssec_params.py b/src/cloudflare/types/radar/as112/top_dnssec_params.py
index 9f46b8ec011..9cd12dfb425 100644
--- a/src/cloudflare/types/radar/as112/top_dnssec_params.py
+++ b/src/cloudflare/types/radar/as112/top_dnssec_params.py
@@ -2,55 +2,52 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TopDNSSECParams"]
 
 
 class TopDNSSECParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
-
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
-    """
-
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/as112/top_dnssec_response.py b/src/cloudflare/types/radar/as112/top_dnssec_response.py
index a911d0d50b3..12bc24271e3 100644
--- a/src/cloudflare/types/radar/as112/top_dnssec_response.py
+++ b/src/cloudflare/types/radar/as112/top_dnssec_response.py
@@ -2,50 +2,121 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TopDNSSECResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation", "Top0"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "TopDNSSECResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
 
-    level: Optional[int] = None
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -54,9 +125,11 @@ class Top0(BaseModel):
     client_country_name: str = FieldInfo(alias="clientCountryName")
 
     value: str
+    """A numeric string."""
 
 
 class TopDNSSECResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/as112/top_edns_params.py b/src/cloudflare/types/radar/as112/top_edns_params.py
index 046c0d251b6..a0cd0ee723e 100644
--- a/src/cloudflare/types/radar/as112/top_edns_params.py
+++ b/src/cloudflare/types/radar/as112/top_edns_params.py
@@ -2,55 +2,52 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TopEdnsParams"]
 
 
 class TopEdnsParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
-
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
-    """
-
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/as112/top_edns_response.py b/src/cloudflare/types/radar/as112/top_edns_response.py
index 208c881c579..be94fa8c5f9 100644
--- a/src/cloudflare/types/radar/as112/top_edns_response.py
+++ b/src/cloudflare/types/radar/as112/top_edns_response.py
@@ -2,50 +2,121 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TopEdnsResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation", "Top0"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "TopEdnsResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
 
-    level: Optional[int] = None
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -54,9 +125,11 @@ class Top0(BaseModel):
     client_country_name: str = FieldInfo(alias="clientCountryName")
 
     value: str
+    """A numeric string."""
 
 
 class TopEdnsResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/as112/top_ip_version_params.py b/src/cloudflare/types/radar/as112/top_ip_version_params.py
index 18ff8eb6a9b..d4b1742a1ad 100644
--- a/src/cloudflare/types/radar/as112/top_ip_version_params.py
+++ b/src/cloudflare/types/radar/as112/top_ip_version_params.py
@@ -2,55 +2,52 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TopIPVersionParams"]
 
 
 class TopIPVersionParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
-
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
-    """
-
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/as112/top_ip_version_response.py b/src/cloudflare/types/radar/as112/top_ip_version_response.py
index 3b48dfa0ca0..344444fc533 100644
--- a/src/cloudflare/types/radar/as112/top_ip_version_response.py
+++ b/src/cloudflare/types/radar/as112/top_ip_version_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "TopIPVersionResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -61,9 +125,11 @@ class Top0(BaseModel):
     client_country_name: str = FieldInfo(alias="clientCountryName")
 
     value: str
+    """A numeric string."""
 
 
 class TopIPVersionResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/as112/top_locations_params.py b/src/cloudflare/types/radar/as112/top_locations_params.py
index 74b6631d0b9..e270286c21c 100644
--- a/src/cloudflare/types/radar/as112/top_locations_params.py
+++ b/src/cloudflare/types/radar/as112/top_locations_params.py
@@ -2,55 +2,52 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TopLocationsParams"]
 
 
 class TopLocationsParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
-
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
-    """
-
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/as112/top_locations_response.py b/src/cloudflare/types/radar/as112/top_locations_response.py
index 671c3284576..769fffedb1a 100644
--- a/src/cloudflare/types/radar/as112/top_locations_response.py
+++ b/src/cloudflare/types/radar/as112/top_locations_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "TopLocationsResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -61,9 +125,11 @@ class Top0(BaseModel):
     client_country_name: str = FieldInfo(alias="clientCountryName")
 
     value: str
+    """A numeric string."""
 
 
 class TopLocationsResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/as112_summary_v2_params.py b/src/cloudflare/types/radar/as112_summary_v2_params.py
new file mode 100644
index 00000000000..43829efe9a6
--- /dev/null
+++ b/src/cloudflare/types/radar/as112_summary_v2_params.py
@@ -0,0 +1,187 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["AS112SummaryV2Params"]
+
+
+class AS112SummaryV2Params(TypedDict, total=False):
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
diff --git a/src/cloudflare/types/radar/as112_summary_v2_response.py b/src/cloudflare/types/radar/as112_summary_v2_response.py
new file mode 100644
index 00000000000..78c5ce93993
--- /dev/null
+++ b/src/cloudflare/types/radar/as112_summary_v2_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "AS112SummaryV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class AS112SummaryV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/as112_timeseries_groups_v2_params.py b/src/cloudflare/types/radar/as112_timeseries_groups_v2_params.py
new file mode 100644
index 00000000000..b93f5083d51
--- /dev/null
+++ b/src/cloudflare/types/radar/as112_timeseries_groups_v2_params.py
@@ -0,0 +1,194 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["AS112TimeseriesGroupsV2Params"]
+
+
+class AS112TimeseriesGroupsV2Params(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
diff --git a/src/cloudflare/types/radar/as112_timeseries_groups_v2_response.py b/src/cloudflare/types/radar/as112_timeseries_groups_v2_response.py
new file mode 100644
index 00000000000..db41246e6c9
--- /dev/null
+++ b/src/cloudflare/types/radar/as112_timeseries_groups_v2_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "AS112TimeseriesGroupsV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class AS112TimeseriesGroupsV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/as112_timeseries_params.py b/src/cloudflare/types/radar/as112_timeseries_params.py
index c2e37c6ce35..634b13e95b1 100644
--- a/src/cloudflare/types/radar/as112_timeseries_params.py
+++ b/src/cloudflare/types/radar/as112_timeseries_params.py
@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import List, Union, Optional
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 
 __all__ = ["AS112TimeseriesParams"]
@@ -13,48 +14,174 @@
 
 class AS112TimeseriesParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
-    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
-    """
-
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
diff --git a/src/cloudflare/types/radar/as112_timeseries_response.py b/src/cloudflare/types/radar/as112_timeseries_response.py
index 3664bedad75..7f2c4e07cac 100644
--- a/src/cloudflare/types/radar/as112_timeseries_response.py
+++ b/src/cloudflare/types/radar/as112_timeseries_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import TYPE_CHECKING, Dict, List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,54 +11,124 @@
 __all__ = [
     "AS112TimeseriesResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
-    "Serie0",
+    "MetaDateRange",
+    "MetaUnit",
+    "AS112TimeseriesResponseItem",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
 
-    level: Optional[int] = None
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
-    agg_interval: str = FieldInfo(alias="aggInterval")
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
 
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
     last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-class Serie0(BaseModel):
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class AS112TimeseriesResponseItem(BaseModel):
     timestamps: List[datetime]
 
     values: List[str]
@@ -65,5 +136,16 @@ class Serie0(BaseModel):
 
 class AS112TimeseriesResponse(BaseModel):
     meta: Meta
-
-    serie_0: Serie0
+    """Metadata for the results."""
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, AS112TimeseriesResponseItem] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> AS112TimeseriesResponseItem: ...
+    else:
+        __pydantic_extra__: Dict[str, AS112TimeseriesResponseItem]
diff --git a/src/cloudflare/types/radar/attacks/__init__.py b/src/cloudflare/types/radar/attacks/__init__.py
index a4c50214fb2..69e604914b8 100644
--- a/src/cloudflare/types/radar/attacks/__init__.py
+++ b/src/cloudflare/types/radar/attacks/__init__.py
@@ -2,7 +2,15 @@
 
 from __future__ import annotations
 
+from .layer3_summary_v2_params import Layer3SummaryV2Params as Layer3SummaryV2Params
 from .layer3_timeseries_params import Layer3TimeseriesParams as Layer3TimeseriesParams
+from .layer7_summary_v2_params import Layer7SummaryV2Params as Layer7SummaryV2Params
 from .layer7_timeseries_params import Layer7TimeseriesParams as Layer7TimeseriesParams
+from .layer3_summary_v2_response import Layer3SummaryV2Response as Layer3SummaryV2Response
 from .layer3_timeseries_response import Layer3TimeseriesResponse as Layer3TimeseriesResponse
+from .layer7_summary_v2_response import Layer7SummaryV2Response as Layer7SummaryV2Response
 from .layer7_timeseries_response import Layer7TimeseriesResponse as Layer7TimeseriesResponse
+from .layer3_timeseries_groups_v2_params import Layer3TimeseriesGroupsV2Params as Layer3TimeseriesGroupsV2Params
+from .layer7_timeseries_groups_v2_params import Layer7TimeseriesGroupsV2Params as Layer7TimeseriesGroupsV2Params
+from .layer3_timeseries_groups_v2_response import Layer3TimeseriesGroupsV2Response as Layer3TimeseriesGroupsV2Response
+from .layer7_timeseries_groups_v2_response import Layer7TimeseriesGroupsV2Response as Layer7TimeseriesGroupsV2Response
diff --git a/src/cloudflare/types/radar/attacks/layer3/__init__.py b/src/cloudflare/types/radar/attacks/layer3/__init__.py
index a0a2f946d4f..f2324093590 100644
--- a/src/cloudflare/types/radar/attacks/layer3/__init__.py
+++ b/src/cloudflare/types/radar/attacks/layer3/__init__.py
@@ -2,26 +2,26 @@
 
 from __future__ import annotations
 
-from .summary_get_params import SummaryGetParams as SummaryGetParams
 from .top_attacks_params import TopAttacksParams as TopAttacksParams
 from .top_industry_params import TopIndustryParams as TopIndustryParams
 from .top_vertical_params import TopVerticalParams as TopVerticalParams
-from .summary_get_response import SummaryGetResponse as SummaryGetResponse
 from .top_attacks_response import TopAttacksResponse as TopAttacksResponse
 from .summary_vector_params import SummaryVectorParams as SummaryVectorParams
 from .top_industry_response import TopIndustryResponse as TopIndustryResponse
 from .top_vertical_response import TopVerticalResponse as TopVerticalResponse
 from .summary_bitrate_params import SummaryBitrateParams as SummaryBitrateParams
 from .summary_duration_params import SummaryDurationParams as SummaryDurationParams
+from .summary_industry_params import SummaryIndustryParams as SummaryIndustryParams
 from .summary_protocol_params import SummaryProtocolParams as SummaryProtocolParams
 from .summary_vector_response import SummaryVectorResponse as SummaryVectorResponse
+from .summary_vertical_params import SummaryVerticalParams as SummaryVerticalParams
 from .summary_bitrate_response import SummaryBitrateResponse as SummaryBitrateResponse
 from .summary_duration_response import SummaryDurationResponse as SummaryDurationResponse
+from .summary_industry_response import SummaryIndustryResponse as SummaryIndustryResponse
 from .summary_ip_version_params import SummaryIPVersionParams as SummaryIPVersionParams
 from .summary_protocol_response import SummaryProtocolResponse as SummaryProtocolResponse
+from .summary_vertical_response import SummaryVerticalResponse as SummaryVerticalResponse
 from .summary_ip_version_response import SummaryIPVersionResponse as SummaryIPVersionResponse
-from .timeseries_group_get_params import TimeseriesGroupGetParams as TimeseriesGroupGetParams
-from .timeseries_group_get_response import TimeseriesGroupGetResponse as TimeseriesGroupGetResponse
 from .timeseries_group_vector_params import TimeseriesGroupVectorParams as TimeseriesGroupVectorParams
 from .timeseries_group_bitrate_params import TimeseriesGroupBitrateParams as TimeseriesGroupBitrateParams
 from .timeseries_group_duration_params import TimeseriesGroupDurationParams as TimeseriesGroupDurationParams
diff --git a/src/cloudflare/types/radar/attacks/layer3/summary_bitrate_params.py b/src/cloudflare/types/radar/attacks/layer3/summary_bitrate_params.py
index b4d0b88d8fb..8e4627ab38b 100644
--- a/src/cloudflare/types/radar/attacks/layer3/summary_bitrate_params.py
+++ b/src/cloudflare/types/radar/attacks/layer3/summary_bitrate_params.py
@@ -6,53 +6,57 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryBitrateParams"]
 
 
 class SummaryBitrateParams(TypedDict, total=False):
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     direction: Literal["ORIGIN", "TARGET"]
     """
-    Together with the `location` parameter, will apply the filter to origin or
-    target location.
+    Specifies whether the `location` filter applies to the source or target
+    location.
     """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
-    """Array of L3/4 attack types."""
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/summary_bitrate_response.py b/src/cloudflare/types/radar/attacks/layer3/summary_bitrate_response.py
index b04e158c215..6a6d4c493fe 100644
--- a/src/cloudflare/types/radar/attacks/layer3/summary_bitrate_response.py
+++ b/src/cloudflare/types/radar/attacks/layer3/summary_bitrate_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,66 +11,133 @@
 __all__ = [
     "SummaryBitrateResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     one_gbps_to_ten_gbps: str = FieldInfo(alias="_1_GBPS_TO_10_GBPS")
+    """A numeric string."""
 
     ten_gbps_to_one_hundred_gbps: str = FieldInfo(alias="_10_GBPS_TO_100_GBPS")
+    """A numeric string."""
 
     five_hundred_mbps_to_one_gbps: str = FieldInfo(alias="_500_MBPS_TO_1_GBPS")
+    """A numeric string."""
 
     over_100_gbps: str = FieldInfo(alias="OVER_100_GBPS")
+    """A numeric string."""
 
     under_500_mbps: str = FieldInfo(alias="UNDER_500_MBPS")
+    """A numeric string."""
 
 
 class SummaryBitrateResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/attacks/layer3/summary_duration_params.py b/src/cloudflare/types/radar/attacks/layer3/summary_duration_params.py
index 615fe97285f..b01f2c1ceb0 100644
--- a/src/cloudflare/types/radar/attacks/layer3/summary_duration_params.py
+++ b/src/cloudflare/types/radar/attacks/layer3/summary_duration_params.py
@@ -6,53 +6,57 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryDurationParams"]
 
 
 class SummaryDurationParams(TypedDict, total=False):
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     direction: Literal["ORIGIN", "TARGET"]
     """
-    Together with the `location` parameter, will apply the filter to origin or
-    target location.
+    Specifies whether the `location` filter applies to the source or target
+    location.
     """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
-    """Array of L3/4 attack types."""
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/summary_duration_response.py b/src/cloudflare/types/radar/attacks/layer3/summary_duration_response.py
index a08fb88a43b..85661847a79 100644
--- a/src/cloudflare/types/radar/attacks/layer3/summary_duration_response.py
+++ b/src/cloudflare/types/radar/attacks/layer3/summary_duration_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,68 +11,136 @@
 __all__ = [
     "SummaryDurationResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     one_hour_to_three_hours: str = FieldInfo(alias="_1_HOUR_TO_3_HOURS")
+    """A numeric string."""
 
     ten_mins_to_twenty_mins: str = FieldInfo(alias="_10_MINS_TO_20_MINS")
+    """A numeric string."""
 
     twenty_mins_to_forty_mins: str = FieldInfo(alias="_20_MINS_TO_40_MINS")
+    """A numeric string."""
 
     forty_mins_to_one_hour: str = FieldInfo(alias="_40_MINS_TO_1_HOUR")
+    """A numeric string."""
 
     over_3_hours: str = FieldInfo(alias="OVER_3_HOURS")
+    """A numeric string."""
 
     under_10_mins: str = FieldInfo(alias="UNDER_10_MINS")
+    """A numeric string."""
 
 
 class SummaryDurationResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/attacks/layer3/summary_get_params.py b/src/cloudflare/types/radar/attacks/layer3/summary_get_params.py
deleted file mode 100644
index fe1dae91b19..00000000000
--- a/src/cloudflare/types/radar/attacks/layer3/summary_get_params.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List, Union
-from datetime import datetime
-from typing_extensions import Literal, Annotated, TypedDict
-
-from ....._utils import PropertyInfo
-
-__all__ = ["SummaryGetParams"]
-
-
-class SummaryGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
-
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
-    """
-
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
-
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
-    """
-
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
-    """End of the date range (inclusive)."""
-
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
-    week. Use this parameter or set specific start and end dates (`dateStart` and
-    `dateEnd` parameters).
-    """
-
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
-
-    format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
-
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
-
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
-    """
-
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/summary_get_response.py b/src/cloudflare/types/radar/attacks/layer3/summary_get_response.py
deleted file mode 100644
index e332260ec8e..00000000000
--- a/src/cloudflare/types/radar/attacks/layer3/summary_get_response.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from datetime import datetime
-
-from pydantic import Field as FieldInfo
-
-from ....._models import BaseModel
-
-__all__ = [
-    "SummaryGetResponse",
-    "Meta",
-    "MetaDateRange",
-    "MetaConfidenceInfo",
-    "MetaConfidenceInfoAnnotation",
-    "Summary0",
-]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
-class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
-
-    description: str
-
-    event_type: str = FieldInfo(alias="eventType")
-
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
-
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
-
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
-
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
-
-
-class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
-
-    level: Optional[int] = None
-
-
-class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
-
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
-
-
-class Summary0(BaseModel):
-    gre: str
-
-    icmp: str
-
-    tcp: str
-
-    udp: str
-
-
-class SummaryGetResponse(BaseModel):
-    meta: Meta
-
-    summary_0: Summary0
diff --git a/src/cloudflare/types/radar/attacks/layer3/summary_industry_params.py b/src/cloudflare/types/radar/attacks/layer3/summary_industry_params.py
new file mode 100644
index 00000000000..80df5169d62
--- /dev/null
+++ b/src/cloudflare/types/radar/attacks/layer3/summary_industry_params.py
@@ -0,0 +1,69 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ....._types import SequenceNotStr
+from ....._utils import PropertyInfo
+
+__all__ = ["SummaryIndustryParams"]
+
+
+class SummaryIndustryParams(TypedDict, total=False):
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    direction: Literal["ORIGIN", "TARGET"]
+    """
+    Specifies whether the `location` filter applies to the source or target
+    location.
+    """
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/summary_industry_response.py b/src/cloudflare/types/radar/attacks/layer3/summary_industry_response.py
new file mode 100644
index 00000000000..50d2b9b6fdb
--- /dev/null
+++ b/src/cloudflare/types/radar/attacks/layer3/summary_industry_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = [
+    "SummaryIndustryResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class SummaryIndustryResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/attacks/layer3/summary_ip_version_params.py b/src/cloudflare/types/radar/attacks/layer3/summary_ip_version_params.py
index b1ab3c41730..4460fd2cf9c 100644
--- a/src/cloudflare/types/radar/attacks/layer3/summary_ip_version_params.py
+++ b/src/cloudflare/types/radar/attacks/layer3/summary_ip_version_params.py
@@ -6,50 +6,54 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryIPVersionParams"]
 
 
 class SummaryIPVersionParams(TypedDict, total=False):
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     direction: Literal["ORIGIN", "TARGET"]
     """
-    Together with the `location` parameter, will apply the filter to origin or
-    target location.
+    Specifies whether the `location` filter applies to the source or target
+    location.
     """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
-    """Array of L3/4 attack types."""
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/summary_ip_version_response.py b/src/cloudflare/types/radar/attacks/layer3/summary_ip_version_response.py
index e1a3995c7e5..63a07734f7b 100644
--- a/src/cloudflare/types/radar/attacks/layer3/summary_ip_version_response.py
+++ b/src/cloudflare/types/radar/attacks/layer3/summary_ip_version_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,124 @@
 __all__ = [
     "SummaryIPVersionResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     i_pv4: str = FieldInfo(alias="IPv4")
+    """A numeric string."""
 
     i_pv6: str = FieldInfo(alias="IPv6")
+    """A numeric string."""
 
 
 class SummaryIPVersionResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/attacks/layer3/summary_protocol_params.py b/src/cloudflare/types/radar/attacks/layer3/summary_protocol_params.py
index f3c6e1f2d4e..bebfcbe44d7 100644
--- a/src/cloudflare/types/radar/attacks/layer3/summary_protocol_params.py
+++ b/src/cloudflare/types/radar/attacks/layer3/summary_protocol_params.py
@@ -6,50 +6,54 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryProtocolParams"]
 
 
 class SummaryProtocolParams(TypedDict, total=False):
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     direction: Literal["ORIGIN", "TARGET"]
     """
-    Together with the `location` parameter, will apply the filter to origin or
-    target location.
+    Specifies whether the `location` filter applies to the source or target
+    location.
     """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/summary_protocol_response.py b/src/cloudflare/types/radar/attacks/layer3/summary_protocol_response.py
index 7d749df3a2a..02e0a65aa27 100644
--- a/src/cloudflare/types/radar/attacks/layer3/summary_protocol_response.py
+++ b/src/cloudflare/types/radar/attacks/layer3/summary_protocol_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,64 +11,130 @@
 __all__ = [
     "SummaryProtocolResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     gre: str = FieldInfo(alias="GRE")
+    """A numeric string."""
 
     icmp: str = FieldInfo(alias="ICMP")
+    """A numeric string."""
 
     tcp: str = FieldInfo(alias="TCP")
+    """A numeric string."""
 
     udp: str = FieldInfo(alias="UDP")
+    """A numeric string."""
 
 
 class SummaryProtocolResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/attacks/layer3/summary_vector_params.py b/src/cloudflare/types/radar/attacks/layer3/summary_vector_params.py
index 3da6f2912a7..e05a68b066a 100644
--- a/src/cloudflare/types/radar/attacks/layer3/summary_vector_params.py
+++ b/src/cloudflare/types/radar/attacks/layer3/summary_vector_params.py
@@ -6,53 +6,64 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryVectorParams"]
 
 
 class SummaryVectorParams(TypedDict, total=False):
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     direction: Literal["ORIGIN", "TARGET"]
     """
-    Together with the `location` parameter, will apply the filter to origin or
-    target location.
+    Specifies whether the `location` filter applies to the source or target
+    location.
     """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
-    """Array of L3/4 attack types."""
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/summary_vector_response.py b/src/cloudflare/types/radar/attacks/layer3/summary_vector_response.py
index cf21e355719..1ddbd33ae39 100644
--- a/src/cloudflare/types/radar/attacks/layer3/summary_vector_response.py
+++ b/src/cloudflare/types/radar/attacks/layer3/summary_vector_response.py
@@ -1,56 +1,125 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Dict, List, Optional
+from typing import Dict, List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["SummaryVectorResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "SummaryVectorResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
 
-    level: Optional[int] = None
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class SummaryVectorResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
-    summary_0: Dict[str, List[str]]
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/attacks/layer3/summary_vertical_params.py b/src/cloudflare/types/radar/attacks/layer3/summary_vertical_params.py
new file mode 100644
index 00000000000..fb87b541860
--- /dev/null
+++ b/src/cloudflare/types/radar/attacks/layer3/summary_vertical_params.py
@@ -0,0 +1,69 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ....._types import SequenceNotStr
+from ....._utils import PropertyInfo
+
+__all__ = ["SummaryVerticalParams"]
+
+
+class SummaryVerticalParams(TypedDict, total=False):
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    direction: Literal["ORIGIN", "TARGET"]
+    """
+    Specifies whether the `location` filter applies to the source or target
+    location.
+    """
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/summary_vertical_response.py b/src/cloudflare/types/radar/attacks/layer3/summary_vertical_response.py
new file mode 100644
index 00000000000..ceab1b2728f
--- /dev/null
+++ b/src/cloudflare/types/radar/attacks/layer3/summary_vertical_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = [
+    "SummaryVerticalResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class SummaryVerticalResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_bitrate_params.py b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_bitrate_params.py
index 9ef70e178ad..c578983178f 100644
--- a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_bitrate_params.py
+++ b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_bitrate_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupBitrateParams"]
@@ -13,60 +14,63 @@
 
 class TimeseriesGroupBitrateParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     direction: Literal["ORIGIN", "TARGET"]
     """
-    Together with the `location` parameter, will apply the filter to origin or
-    target location.
+    Specifies whether the `location` filter applies to the source or target
+    location.
     """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     normalization: Literal["PERCENTAGE", "MIN0_MAX"]
-    """Normalization method applied.
+    """Normalization method applied to the results.
 
     Refer to
     [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
     """
 
     protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
-    """Array of L3/4 attack types."""
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_bitrate_response.py b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_bitrate_response.py
index 0e8f9525a54..6f7e17fa15e 100644
--- a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_bitrate_response.py
+++ b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_bitrate_response.py
@@ -1,12 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupBitrateResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupBitrateResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -18,12 +137,13 @@ class Serie0(BaseModel):
 
     over_100_gbps: List[str] = FieldInfo(alias="OVER_100_GBPS")
 
-    timestamps: List[str]
+    timestamps: List[datetime]
 
     under_500_mbps: List[str] = FieldInfo(alias="UNDER_500_MBPS")
 
 
 class TimeseriesGroupBitrateResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_duration_params.py b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_duration_params.py
index 0ac1f04ea12..48bb9b099d2 100644
--- a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_duration_params.py
+++ b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_duration_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupDurationParams"]
@@ -13,60 +14,63 @@
 
 class TimeseriesGroupDurationParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     direction: Literal["ORIGIN", "TARGET"]
     """
-    Together with the `location` parameter, will apply the filter to origin or
-    target location.
+    Specifies whether the `location` filter applies to the source or target
+    location.
     """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     normalization: Literal["PERCENTAGE", "MIN0_MAX"]
-    """Normalization method applied.
+    """Normalization method applied to the results.
 
     Refer to
     [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
     """
 
     protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
-    """Array of L3/4 attack types."""
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_duration_response.py b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_duration_response.py
index 21149a347e9..2f69edbd7e8 100644
--- a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_duration_response.py
+++ b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_duration_response.py
@@ -1,12 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupDurationResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupDurationResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -20,12 +139,13 @@ class Serie0(BaseModel):
 
     over_3_hours: List[str] = FieldInfo(alias="OVER_3_HOURS")
 
-    timestamps: List[str]
+    timestamps: List[datetime]
 
     under_10_mins: List[str] = FieldInfo(alias="UNDER_10_MINS")
 
 
 class TimeseriesGroupDurationResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_get_params.py b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_get_params.py
deleted file mode 100644
index 9ab69b16b82..00000000000
--- a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_get_params.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List, Union
-from datetime import datetime
-from typing_extensions import Literal, Annotated, TypedDict
-
-from ....._utils import PropertyInfo
-
-__all__ = ["TimeseriesGroupGetParams"]
-
-
-class TimeseriesGroupGetParams(TypedDict, total=False):
-    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
-    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
-    """
-
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
-
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
-    """
-
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
-
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
-    """
-
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
-    """End of the date range (inclusive)."""
-
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
-    week. Use this parameter or set specific start and end dates (`dateStart` and
-    `dateEnd` parameters).
-    """
-
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
-
-    format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
-
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
-
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
-    """
-
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_get_response.py b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_get_response.py
deleted file mode 100644
index ea55dbde517..00000000000
--- a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_get_response.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from datetime import datetime
-
-from pydantic import Field as FieldInfo
-
-from ....._models import BaseModel
-
-__all__ = [
-    "TimeseriesGroupGetResponse",
-    "Meta",
-    "MetaDateRange",
-    "MetaConfidenceInfo",
-    "MetaConfidenceInfoAnnotation",
-    "Serie0",
-]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
-class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
-
-    description: str
-
-    event_type: str = FieldInfo(alias="eventType")
-
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
-
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
-
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
-
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
-
-
-class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
-
-    level: Optional[int] = None
-
-
-class Meta(BaseModel):
-    agg_interval: str = FieldInfo(alias="aggInterval")
-
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
-
-    last_updated: datetime = FieldInfo(alias="lastUpdated")
-
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
-
-
-class Serie0(BaseModel):
-    gre: List[str]
-
-    icmp: List[str]
-
-    tcp: List[str]
-
-    timestamps: List[str]
-
-    udp: List[str]
-
-
-class TimeseriesGroupGetResponse(BaseModel):
-    meta: Meta
-
-    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_industry_params.py b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_industry_params.py
index b9474428b97..fe3629f72d9 100644
--- a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_industry_params.py
+++ b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_industry_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupIndustryParams"]
@@ -13,66 +14,70 @@
 
 class TimeseriesGroupIndustryParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     direction: Literal["ORIGIN", "TARGET"]
     """
-    Together with the `location` parameter, will apply the filter to origin or
-    target location.
+    Specifies whether the `location` filter applies to the source or target
+    location.
     """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
     """
-    Limit the number of objects (eg browsers, verticals, etc) to the top items over
-    the time range.
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
     """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     normalization: Literal["PERCENTAGE", "MIN0_MAX"]
-    """Normalization method applied.
+    """Normalization method applied to the results.
 
     Refer to
     [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
     """
 
     protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
-    """Array of L3/4 attack types."""
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_industry_response.py b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_industry_response.py
index eee79e8794f..61ecc717aa7 100644
--- a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_industry_response.py
+++ b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_industry_response.py
@@ -1,24 +1,151 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import TYPE_CHECKING, List
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupIndustryResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupIndustryResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
-    timestamps: List[str]
+    timestamps: List[datetime]
 
     if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
         # Stub to indicate that arbitrary properties are accepted.
         # To access properties that are not valid identifiers you can use `getattr`, e.g.
         # `getattr(obj, '$type')`
-        def __getattr__(self, attr: str) -> List[str]:
-            ...
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
 
 
 class TimeseriesGroupIndustryResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_ip_version_params.py b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_ip_version_params.py
index 5f8b50a1f23..7a1a7051cd4 100644
--- a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_ip_version_params.py
+++ b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_ip_version_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupIPVersionParams"]
@@ -13,57 +14,60 @@
 
 class TimeseriesGroupIPVersionParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     direction: Literal["ORIGIN", "TARGET"]
     """
-    Together with the `location` parameter, will apply the filter to origin or
-    target location.
+    Specifies whether the `location` filter applies to the source or target
+    location.
     """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     normalization: Literal["PERCENTAGE", "MIN0_MAX"]
-    """Normalization method applied.
+    """Normalization method applied to the results.
 
     Refer to
     [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
     """
 
     protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
-    """Array of L3/4 attack types."""
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_ip_version_response.py b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_ip_version_response.py
index 136fc4da363..712fa9458e8 100644
--- a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_ip_version_response.py
+++ b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_ip_version_response.py
@@ -1,12 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupIPVersionResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupIPVersionResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -14,10 +133,11 @@ class Serie0(BaseModel):
 
     i_pv6: List[str] = FieldInfo(alias="IPv6")
 
-    timestamps: List[str]
+    timestamps: List[datetime]
 
 
 class TimeseriesGroupIPVersionResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_protocol_params.py b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_protocol_params.py
index c96f496eb67..cbb984fb96c 100644
--- a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_protocol_params.py
+++ b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_protocol_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupProtocolParams"]
@@ -13,56 +14,59 @@
 
 class TimeseriesGroupProtocolParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     direction: Literal["ORIGIN", "TARGET"]
     """
-    Together with the `location` parameter, will apply the filter to origin or
-    target location.
+    Specifies whether the `location` filter applies to the source or target
+    location.
     """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     normalization: Literal["PERCENTAGE", "MIN0_MAX"]
-    """Normalization method applied.
+    """Normalization method applied to the results.
 
     Refer to
     [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
diff --git a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_protocol_response.py b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_protocol_response.py
index c667519f0ef..666ec57c4ef 100644
--- a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_protocol_response.py
+++ b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_protocol_response.py
@@ -1,12 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupProtocolResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupProtocolResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -16,12 +135,13 @@ class Serie0(BaseModel):
 
     tcp: List[str] = FieldInfo(alias="TCP")
 
-    timestamps: List[str]
+    timestamps: List[datetime]
 
     udp: List[str] = FieldInfo(alias="UDP")
 
 
 class TimeseriesGroupProtocolResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_vector_params.py b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_vector_params.py
index bdd8255a84a..de3cffd1a13 100644
--- a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_vector_params.py
+++ b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_vector_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupVectorParams"]
@@ -13,66 +14,70 @@
 
 class TimeseriesGroupVectorParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     direction: Literal["ORIGIN", "TARGET"]
     """
-    Together with the `location` parameter, will apply the filter to origin or
-    target location.
+    Specifies whether the `location` filter applies to the source or target
+    location.
     """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
     """
-    Limit the number of objects (eg browsers, verticals, etc) to the top items over
-    the time range.
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
     """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     normalization: Literal["PERCENTAGE", "MIN0_MAX"]
-    """Normalization method applied.
+    """Normalization method applied to the results.
 
     Refer to
     [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
     """
 
     protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
-    """Array of L3/4 attack types."""
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_vector_response.py b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_vector_response.py
index 0806dc76c9f..4370bd1b06b 100644
--- a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_vector_response.py
+++ b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_vector_response.py
@@ -1,24 +1,151 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import TYPE_CHECKING, List
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupVectorResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupVectorResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
-    timestamps: List[str]
+    timestamps: List[datetime]
 
     if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
         # Stub to indicate that arbitrary properties are accepted.
         # To access properties that are not valid identifiers you can use `getattr`, e.g.
         # `getattr(obj, '$type')`
-        def __getattr__(self, attr: str) -> List[str]:
-            ...
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
 
 
 class TimeseriesGroupVectorResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_vertical_params.py b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_vertical_params.py
index 4e20388b202..f461482ba6a 100644
--- a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_vertical_params.py
+++ b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_vertical_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupVerticalParams"]
@@ -13,66 +14,70 @@
 
 class TimeseriesGroupVerticalParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     direction: Literal["ORIGIN", "TARGET"]
     """
-    Together with the `location` parameter, will apply the filter to origin or
-    target location.
+    Specifies whether the `location` filter applies to the source or target
+    location.
     """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
     """
-    Limit the number of objects (eg browsers, verticals, etc) to the top items over
-    the time range.
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
     """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     normalization: Literal["PERCENTAGE", "MIN0_MAX"]
-    """Normalization method applied.
+    """Normalization method applied to the results.
 
     Refer to
     [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
     """
 
     protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
-    """Array of L3/4 attack types."""
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_vertical_response.py b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_vertical_response.py
index 5f3bb1a0608..165f50db0a4 100644
--- a/src/cloudflare/types/radar/attacks/layer3/timeseries_group_vertical_response.py
+++ b/src/cloudflare/types/radar/attacks/layer3/timeseries_group_vertical_response.py
@@ -1,24 +1,151 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import TYPE_CHECKING, List
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupVerticalResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupVerticalResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
-    timestamps: List[str]
+    timestamps: List[datetime]
 
     if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
         # Stub to indicate that arbitrary properties are accepted.
         # To access properties that are not valid identifiers you can use `getattr`, e.g.
         # `getattr(obj, '$type')`
-        def __getattr__(self, attr: str) -> List[str]:
-            ...
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
 
 
 class TimeseriesGroupVerticalResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/attacks/layer3/top/location_origin_params.py b/src/cloudflare/types/radar/attacks/layer3/top/location_origin_params.py
index 06ae05b878d..699d5112928 100644
--- a/src/cloudflare/types/radar/attacks/layer3/top/location_origin_params.py
+++ b/src/cloudflare/types/radar/attacks/layer3/top/location_origin_params.py
@@ -6,50 +6,54 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ......_types import SequenceNotStr
 from ......_utils import PropertyInfo
 
 __all__ = ["LocationOriginParams"]
 
 
 class LocationOriginParams(TypedDict, total=False):
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
-    """Array of L3/4 attack types."""
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/top/location_origin_response.py b/src/cloudflare/types/radar/attacks/layer3/top/location_origin_response.py
index 102661bf56a..ddf5ac81e7c 100644
--- a/src/cloudflare/types/radar/attacks/layer3/top/location_origin_response.py
+++ b/src/cloudflare/types/radar/attacks/layer3/top/location_origin_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "LocationOriginResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -67,5 +131,6 @@ class Top0(BaseModel):
 
 class LocationOriginResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/attacks/layer3/top/location_target_params.py b/src/cloudflare/types/radar/attacks/layer3/top/location_target_params.py
index 4b1f0a0e41d..c7257a4e4ed 100644
--- a/src/cloudflare/types/radar/attacks/layer3/top/location_target_params.py
+++ b/src/cloudflare/types/radar/attacks/layer3/top/location_target_params.py
@@ -6,50 +6,54 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ......_types import SequenceNotStr
 from ......_utils import PropertyInfo
 
 __all__ = ["LocationTargetParams"]
 
 
 class LocationTargetParams(TypedDict, total=False):
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
-    """Array of L3/4 attack types."""
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/top/location_target_response.py b/src/cloudflare/types/radar/attacks/layer3/top/location_target_response.py
index 4641eb271e6..751e2a5ad77 100644
--- a/src/cloudflare/types/radar/attacks/layer3/top/location_target_response.py
+++ b/src/cloudflare/types/radar/attacks/layer3/top/location_target_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "LocationTargetResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -67,5 +131,6 @@ class Top0(BaseModel):
 
 class LocationTargetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/attacks/layer3/top_attacks_params.py b/src/cloudflare/types/radar/attacks/layer3/top_attacks_params.py
index a93d37a6324..ec88a3a7ea3 100644
--- a/src/cloudflare/types/radar/attacks/layer3/top_attacks_params.py
+++ b/src/cloudflare/types/radar/attacks/layer3/top_attacks_params.py
@@ -6,70 +6,79 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TopAttacksParams"]
 
 
 class TopAttacksParams(TypedDict, total=False):
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
     limit_direction: Annotated[Literal["ORIGIN", "TARGET"], PropertyInfo(alias="limitDirection")]
-    """Array of attack origin/target location attack limits.
-
-    Together with `limitPerLocation`, limits how many objects will be fetched per
-    origin/target location.
+    """
+    Specifies whether the `limitPerLocation` applies to the source or target
+    location.
     """
 
     limit_per_location: Annotated[int, PropertyInfo(alias="limitPerLocation")]
     """
-    Limit the number of attacks per origin/target (refer to `limitDirection`
+    Limits the number of attacks per origin/target (refer to `limitDirection`
     parameter) location.
     """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    magnitude: Literal["MITIGATED_BYTES", "MITIGATED_ATTACKS"]
+    """
+    Orders results based on attack magnitude, defined by total mitigated bytes or
+    total mitigated attacks.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     normalization: Literal["PERCENTAGE", "MIN_MAX"]
-    """Normalization method applied.
+    """Normalization method applied to the results.
 
     Refer to
     [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
     """
 
     protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
-    """Array of L3/4 attack types."""
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/top_attacks_response.py b/src/cloudflare/types/radar/attacks/layer3/top_attacks_response.py
index 100bfdc7d49..a203bf565a2 100644
--- a/src/cloudflare/types/radar/attacks/layer3/top_attacks_response.py
+++ b/src/cloudflare/types/radar/attacks/layer3/top_attacks_response.py
@@ -2,50 +2,121 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TopAttacksResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation", "Top0"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "TopAttacksResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
 
-    level: Optional[int] = None
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -58,5 +129,6 @@ class Top0(BaseModel):
 
 class TopAttacksResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/attacks/layer3/top_industry_params.py b/src/cloudflare/types/radar/attacks/layer3/top_industry_params.py
index 41360260afa..2210361cb40 100644
--- a/src/cloudflare/types/radar/attacks/layer3/top_industry_params.py
+++ b/src/cloudflare/types/radar/attacks/layer3/top_industry_params.py
@@ -6,50 +6,54 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TopIndustryParams"]
 
 
 class TopIndustryParams(TypedDict, total=False):
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
-    """Array of L3/4 attack types."""
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/top_industry_response.py b/src/cloudflare/types/radar/attacks/layer3/top_industry_response.py
index 01b6e141308..33cc3a86267 100644
--- a/src/cloudflare/types/radar/attacks/layer3/top_industry_response.py
+++ b/src/cloudflare/types/radar/attacks/layer3/top_industry_response.py
@@ -2,13 +2,77 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
-from ...http.browser import Browser
 
-__all__ = ["TopIndustryResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
+__all__ = [
+    "TopIndustryResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
 
 class MetaDateRange(BaseModel):
@@ -19,37 +83,50 @@ class MetaDateRange(BaseModel):
     """Adjusted start of date range."""
 
 
-class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+class MetaUnit(BaseModel):
+    name: str
 
-    description: str
+    value: str
 
-    event_type: str = FieldInfo(alias="eventType")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
-
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+class Meta(BaseModel):
+    """Metadata for the results."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    level: Optional[int] = None
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
-class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+class Top0(BaseModel):
+    name: str
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    value: str
 
 
 class TopIndustryResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
-    top_0: List[Browser]
+    top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/attacks/layer3/top_vertical_params.py b/src/cloudflare/types/radar/attacks/layer3/top_vertical_params.py
index d04759c7af9..2782884c2ad 100644
--- a/src/cloudflare/types/radar/attacks/layer3/top_vertical_params.py
+++ b/src/cloudflare/types/radar/attacks/layer3/top_vertical_params.py
@@ -6,50 +6,54 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TopVerticalParams"]
 
 
 class TopVerticalParams(TypedDict, total=False):
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
-    """Array of L3/4 attack types."""
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3/top_vertical_response.py b/src/cloudflare/types/radar/attacks/layer3/top_vertical_response.py
index 83a240b3100..a097494189e 100644
--- a/src/cloudflare/types/radar/attacks/layer3/top_vertical_response.py
+++ b/src/cloudflare/types/radar/attacks/layer3/top_vertical_response.py
@@ -2,13 +2,77 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
-from ...http.browser import Browser
 
-__all__ = ["TopVerticalResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
+__all__ = [
+    "TopVerticalResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
 
 class MetaDateRange(BaseModel):
@@ -19,37 +83,50 @@ class MetaDateRange(BaseModel):
     """Adjusted start of date range."""
 
 
-class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+class MetaUnit(BaseModel):
+    name: str
 
-    description: str
+    value: str
 
-    event_type: str = FieldInfo(alias="eventType")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
-
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+class Meta(BaseModel):
+    """Metadata for the results."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    level: Optional[int] = None
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
-class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+class Top0(BaseModel):
+    name: str
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    value: str
 
 
 class TopVerticalResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
-    top_0: List[Browser]
+    top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/attacks/layer3_summary_v2_params.py b/src/cloudflare/types/radar/attacks/layer3_summary_v2_params.py
new file mode 100644
index 00000000000..68a400f8a70
--- /dev/null
+++ b/src/cloudflare/types/radar/attacks/layer3_summary_v2_params.py
@@ -0,0 +1,69 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["Layer3SummaryV2Params"]
+
+
+class Layer3SummaryV2Params(TypedDict, total=False):
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    direction: Literal["ORIGIN", "TARGET"]
+    """
+    Specifies whether the `location` filter applies to the source or target
+    location.
+    """
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3_summary_v2_response.py b/src/cloudflare/types/radar/attacks/layer3_summary_v2_response.py
new file mode 100644
index 00000000000..dfbe5f43621
--- /dev/null
+++ b/src/cloudflare/types/radar/attacks/layer3_summary_v2_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "Layer3SummaryV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Layer3SummaryV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/attacks/layer3_timeseries_groups_v2_params.py b/src/cloudflare/types/radar/attacks/layer3_timeseries_groups_v2_params.py
new file mode 100644
index 00000000000..0e727c1f912
--- /dev/null
+++ b/src/cloudflare/types/radar/attacks/layer3_timeseries_groups_v2_params.py
@@ -0,0 +1,83 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["Layer3TimeseriesGroupsV2Params"]
+
+
+class Layer3TimeseriesGroupsV2Params(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    direction: Literal["ORIGIN", "TARGET"]
+    """
+    Specifies whether the `location` filter applies to the source or target
+    location.
+    """
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    normalization: Literal["PERCENTAGE", "MIN0_MAX"]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3_timeseries_groups_v2_response.py b/src/cloudflare/types/radar/attacks/layer3_timeseries_groups_v2_response.py
new file mode 100644
index 00000000000..a26ca9f8867
--- /dev/null
+++ b/src/cloudflare/types/radar/attacks/layer3_timeseries_groups_v2_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "Layer3TimeseriesGroupsV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class Layer3TimeseriesGroupsV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/attacks/layer3_timeseries_params.py b/src/cloudflare/types/radar/attacks/layer3_timeseries_params.py
index 61c6eb22613..a94d34a15c0 100644
--- a/src/cloudflare/types/radar/attacks/layer3_timeseries_params.py
+++ b/src/cloudflare/types/radar/attacks/layer3_timeseries_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["Layer3TimeseriesParams"]
@@ -13,70 +14,74 @@
 
 class Layer3TimeseriesParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     direction: Literal["ORIGIN", "TARGET"]
     """
-    Together with the `location` parameter, will apply the filter to origin or
-    target location.
+    Specifies whether the `location` filter applies to the source or target
+    location.
     """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
     metric: Literal["BYTES", "BYTES_OLD"]
     """Measurement units, eg. bytes."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"]
-    """Normalization method applied.
+    """Normalization method applied to the results.
 
     Refer to
     [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
     """
 
     protocol: List[Literal["UDP", "TCP", "ICMP", "GRE"]]
-    """Array of L3/4 attack types."""
+    """Filters the results by layer 3/4 protocol."""
diff --git a/src/cloudflare/types/radar/attacks/layer3_timeseries_response.py b/src/cloudflare/types/radar/attacks/layer3_timeseries_response.py
index c83a6af9578..410a439c79b 100644
--- a/src/cloudflare/types/radar/attacks/layer3_timeseries_response.py
+++ b/src/cloudflare/types/radar/attacks/layer3_timeseries_response.py
@@ -1,20 +1,151 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import TYPE_CHECKING, Dict, List
 from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["Layer3TimeseriesResponse", "Serie0"]
+__all__ = [
+    "Layer3TimeseriesResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Layer3TimeseriesResponseItem",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
 
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-class Serie0(BaseModel):
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Layer3TimeseriesResponseItem(BaseModel):
     timestamps: List[datetime]
 
     values: List[str]
 
 
 class Layer3TimeseriesResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, Layer3TimeseriesResponseItem] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
 
-    serie_0: Serie0
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> Layer3TimeseriesResponseItem: ...
+    else:
+        __pydantic_extra__: Dict[str, Layer3TimeseriesResponseItem]
diff --git a/src/cloudflare/types/radar/attacks/layer7/__init__.py b/src/cloudflare/types/radar/attacks/layer7/__init__.py
index 1f41fbea269..e44f35ad755 100644
--- a/src/cloudflare/types/radar/attacks/layer7/__init__.py
+++ b/src/cloudflare/types/radar/attacks/layer7/__init__.py
@@ -2,23 +2,23 @@
 
 from __future__ import annotations
 
-from .summary_get_params import SummaryGetParams as SummaryGetParams
 from .top_attacks_params import TopAttacksParams as TopAttacksParams
 from .top_industry_params import TopIndustryParams as TopIndustryParams
 from .top_vertical_params import TopVerticalParams as TopVerticalParams
-from .summary_get_response import SummaryGetResponse as SummaryGetResponse
 from .top_attacks_response import TopAttacksResponse as TopAttacksResponse
 from .top_industry_response import TopIndustryResponse as TopIndustryResponse
 from .top_vertical_response import TopVerticalResponse as TopVerticalResponse
+from .summary_industry_params import SummaryIndustryParams as SummaryIndustryParams
+from .summary_vertical_params import SummaryVerticalParams as SummaryVerticalParams
+from .summary_industry_response import SummaryIndustryResponse as SummaryIndustryResponse
 from .summary_ip_version_params import SummaryIPVersionParams as SummaryIPVersionParams
+from .summary_vertical_response import SummaryVerticalResponse as SummaryVerticalResponse
 from .summary_http_method_params import SummaryHTTPMethodParams as SummaryHTTPMethodParams
 from .summary_http_version_params import SummaryHTTPVersionParams as SummaryHTTPVersionParams
 from .summary_ip_version_response import SummaryIPVersionResponse as SummaryIPVersionResponse
-from .timeseries_group_get_params import TimeseriesGroupGetParams as TimeseriesGroupGetParams
 from .summary_http_method_response import SummaryHTTPMethodResponse as SummaryHTTPMethodResponse
 from .summary_managed_rules_params import SummaryManagedRulesParams as SummaryManagedRulesParams
 from .summary_http_version_response import SummaryHTTPVersionResponse as SummaryHTTPVersionResponse
-from .timeseries_group_get_response import TimeseriesGroupGetResponse as TimeseriesGroupGetResponse
 from .summary_managed_rules_response import SummaryManagedRulesResponse as SummaryManagedRulesResponse
 from .timeseries_group_industry_params import TimeseriesGroupIndustryParams as TimeseriesGroupIndustryParams
 from .timeseries_group_vertical_params import TimeseriesGroupVerticalParams as TimeseriesGroupVerticalParams
diff --git a/src/cloudflare/types/radar/attacks/layer7/summary_get_params.py b/src/cloudflare/types/radar/attacks/layer7/summary_get_params.py
deleted file mode 100644
index fe1dae91b19..00000000000
--- a/src/cloudflare/types/radar/attacks/layer7/summary_get_params.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List, Union
-from datetime import datetime
-from typing_extensions import Literal, Annotated, TypedDict
-
-from ....._utils import PropertyInfo
-
-__all__ = ["SummaryGetParams"]
-
-
-class SummaryGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
-
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
-    """
-
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
-
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
-    """
-
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
-    """End of the date range (inclusive)."""
-
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
-    week. Use this parameter or set specific start and end dates (`dateStart` and
-    `dateEnd` parameters).
-    """
-
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
-
-    format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
-
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
-
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
-    """
-
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
diff --git a/src/cloudflare/types/radar/attacks/layer7/summary_get_response.py b/src/cloudflare/types/radar/attacks/layer7/summary_get_response.py
deleted file mode 100644
index 3830406025a..00000000000
--- a/src/cloudflare/types/radar/attacks/layer7/summary_get_response.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from datetime import datetime
-
-from pydantic import Field as FieldInfo
-
-from ....._models import BaseModel
-
-__all__ = [
-    "SummaryGetResponse",
-    "Meta",
-    "MetaDateRange",
-    "MetaConfidenceInfo",
-    "MetaConfidenceInfoAnnotation",
-    "Summary0",
-]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
-class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
-
-    description: str
-
-    event_type: str = FieldInfo(alias="eventType")
-
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
-
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
-
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
-
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
-
-
-class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
-
-    level: Optional[int] = None
-
-
-class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
-
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
-
-
-class Summary0(BaseModel):
-    access_rules: str = FieldInfo(alias="ACCESS_RULES")
-
-    api_shield: str = FieldInfo(alias="API_SHIELD")
-
-    bot_management: str = FieldInfo(alias="BOT_MANAGEMENT")
-
-    data_loss_prevention: str = FieldInfo(alias="DATA_LOSS_PREVENTION")
-
-    ddos: str = FieldInfo(alias="DDOS")
-
-    ip_reputation: str = FieldInfo(alias="IP_REPUTATION")
-
-    waf: str = FieldInfo(alias="WAF")
-
-
-class SummaryGetResponse(BaseModel):
-    meta: Meta
-
-    summary_0: Summary0
diff --git a/src/cloudflare/types/radar/attacks/layer7/summary_http_method_params.py b/src/cloudflare/types/radar/attacks/layer7/summary_http_method_params.py
index 6060fcfa603..b0cd303c16b 100644
--- a/src/cloudflare/types/radar/attacks/layer7/summary_http_method_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7/summary_http_method_params.py
@@ -6,53 +6,65 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryHTTPMethodParams"]
 
 
 class SummaryHTTPMethodParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
     mitigation_product: Annotated[
@@ -63,7 +75,7 @@ class SummaryHTTPMethodParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="mitigationProduct"),
     ]
-    """Array of L7 mitigation products."""
+    """Filters the results by layer 7 mitigation product."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/attacks/layer7/summary_http_method_response.py b/src/cloudflare/types/radar/attacks/layer7/summary_http_method_response.py
index 38203e4eb07..3e989b9f213 100644
--- a/src/cloudflare/types/radar/attacks/layer7/summary_http_method_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7/summary_http_method_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Dict, List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,115 @@
 __all__ = [
     "SummaryHTTPMethodResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
-    "Summary0",
+    "MetaDateRange",
+    "MetaUnit",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
 
-    level: Optional[int] = None
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+    """Metadata for the results."""
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
 
-    normalization: str
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-class Summary0(BaseModel):
-    get: str = FieldInfo(alias="GET")
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    post: str = FieldInfo(alias="POST")
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class SummaryHTTPMethodResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
-    summary_0: Summary0
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/attacks/layer7/summary_http_version_params.py b/src/cloudflare/types/radar/attacks/layer7/summary_http_version_params.py
index 7a900629d0f..e9b370866cf 100644
--- a/src/cloudflare/types/radar/attacks/layer7/summary_http_version_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7/summary_http_version_params.py
@@ -6,41 +6,45 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryHTTPVersionParams"]
 
 
 class SummaryHTTPVersionParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     http_method: Annotated[
         List[
@@ -95,16 +99,17 @@ class SummaryHTTPVersionParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="httpMethod"),
     ]
-    """Filter for http method."""
+    """Filters results by HTTP method."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
     mitigation_product: Annotated[
@@ -115,7 +120,7 @@ class SummaryHTTPVersionParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="mitigationProduct"),
     ]
-    """Array of L7 mitigation products."""
+    """Filters the results by layer 7 mitigation product."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/attacks/layer7/summary_http_version_response.py b/src/cloudflare/types/radar/attacks/layer7/summary_http_version_response.py
index f78c229daaa..af238297552 100644
--- a/src/cloudflare/types/radar/attacks/layer7/summary_http_version_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7/summary_http_version_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,51 +11,112 @@
 __all__ = [
     "SummaryHTTPVersionResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
@@ -67,5 +129,6 @@ class Summary0(BaseModel):
 
 class SummaryHTTPVersionResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/attacks/layer7/summary_industry_params.py b/src/cloudflare/types/radar/attacks/layer7/summary_industry_params.py
new file mode 100644
index 00000000000..b861da9062a
--- /dev/null
+++ b/src/cloudflare/types/radar/attacks/layer7/summary_industry_params.py
@@ -0,0 +1,136 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ....._types import SequenceNotStr
+from ....._utils import PropertyInfo
+
+__all__ = ["SummaryIndustryParams"]
+
+
+class SummaryIndustryParams(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    http_method: Annotated[
+        List[
+            Literal[
+                "GET",
+                "POST",
+                "DELETE",
+                "PUT",
+                "HEAD",
+                "PURGE",
+                "OPTIONS",
+                "PROPFIND",
+                "MKCOL",
+                "PATCH",
+                "ACL",
+                "BCOPY",
+                "BDELETE",
+                "BMOVE",
+                "BPROPFIND",
+                "BPROPPATCH",
+                "CHECKIN",
+                "CHECKOUT",
+                "CONNECT",
+                "COPY",
+                "LABEL",
+                "LOCK",
+                "MERGE",
+                "MKACTIVITY",
+                "MKWORKSPACE",
+                "MOVE",
+                "NOTIFY",
+                "ORDERPATCH",
+                "POLL",
+                "PROPPATCH",
+                "REPORT",
+                "SEARCH",
+                "SUBSCRIBE",
+                "TRACE",
+                "UNCHECKOUT",
+                "UNLOCK",
+                "UNSUBSCRIBE",
+                "UPDATE",
+                "VERSIONCONTROL",
+                "BASELINECONTROL",
+                "XMSENUMATTS",
+                "RPC_OUT_DATA",
+                "RPC_IN_DATA",
+                "JSON",
+                "COOK",
+                "TRACK",
+            ]
+        ],
+        PropertyInfo(alias="httpMethod"),
+    ]
+    """Filters results by HTTP method."""
+
+    http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
+    """Filters results by HTTP version."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    mitigation_product: Annotated[
+        List[
+            Literal[
+                "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
+            ]
+        ],
+        PropertyInfo(alias="mitigationProduct"),
+    ]
+    """Filters the results by layer 7 mitigation product."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/attacks/layer7/summary_industry_response.py b/src/cloudflare/types/radar/attacks/layer7/summary_industry_response.py
new file mode 100644
index 00000000000..50d2b9b6fdb
--- /dev/null
+++ b/src/cloudflare/types/radar/attacks/layer7/summary_industry_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = [
+    "SummaryIndustryResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class SummaryIndustryResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/attacks/layer7/summary_ip_version_params.py b/src/cloudflare/types/radar/attacks/layer7/summary_ip_version_params.py
index 9a7e6f3ccff..4c711fde247 100644
--- a/src/cloudflare/types/radar/attacks/layer7/summary_ip_version_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7/summary_ip_version_params.py
@@ -6,41 +6,45 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryIPVersionParams"]
 
 
 class SummaryIPVersionParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     http_method: Annotated[
         List[
@@ -95,16 +99,17 @@ class SummaryIPVersionParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="httpMethod"),
     ]
-    """Filter for http method."""
+    """Filters results by HTTP method."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
     mitigation_product: Annotated[
@@ -115,7 +120,7 @@ class SummaryIPVersionParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="mitigationProduct"),
     ]
-    """Array of L7 mitigation products."""
+    """Filters the results by layer 7 mitigation product."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/attacks/layer7/summary_ip_version_response.py b/src/cloudflare/types/radar/attacks/layer7/summary_ip_version_response.py
index e1a3995c7e5..275934ca339 100644
--- a/src/cloudflare/types/radar/attacks/layer7/summary_ip_version_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7/summary_ip_version_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,51 +11,112 @@
 __all__ = [
     "SummaryIPVersionResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
@@ -65,5 +127,6 @@ class Summary0(BaseModel):
 
 class SummaryIPVersionResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/attacks/layer7/summary_managed_rules_params.py b/src/cloudflare/types/radar/attacks/layer7/summary_managed_rules_params.py
index 5dfedbebd51..b1838fefeb6 100644
--- a/src/cloudflare/types/radar/attacks/layer7/summary_managed_rules_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7/summary_managed_rules_params.py
@@ -6,41 +6,45 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryManagedRulesParams"]
 
 
 class SummaryManagedRulesParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     http_method: Annotated[
         List[
@@ -95,19 +99,27 @@ class SummaryManagedRulesParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="httpMethod"),
     ]
-    """Filter for http method."""
+    """Filters results by HTTP method."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
     mitigation_product: Annotated[
@@ -118,7 +130,7 @@ class SummaryManagedRulesParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="mitigationProduct"),
     ]
-    """Array of L7 mitigation products."""
+    """Filters the results by layer 7 mitigation product."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/attacks/layer7/summary_managed_rules_response.py b/src/cloudflare/types/radar/attacks/layer7/summary_managed_rules_response.py
index c62312dffd7..634d53aa718 100644
--- a/src/cloudflare/types/radar/attacks/layer7/summary_managed_rules_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7/summary_managed_rules_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Dict, List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,115 @@
 __all__ = [
     "SummaryManagedRulesResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
-    "Summary0",
+    "MetaDateRange",
+    "MetaUnit",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
 
-    level: Optional[int] = None
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+    """Metadata for the results."""
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
 
-    normalization: str
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-class Summary0(BaseModel):
-    bot: str = FieldInfo(alias="Bot")
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    http_anomaly: str = FieldInfo(alias="HTTP Anomaly")
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class SummaryManagedRulesResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
-    summary_0: Summary0
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/attacks/layer7/summary_mitigation_product_params.py b/src/cloudflare/types/radar/attacks/layer7/summary_mitigation_product_params.py
index 4013e1ee425..100d37a0e69 100644
--- a/src/cloudflare/types/radar/attacks/layer7/summary_mitigation_product_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7/summary_mitigation_product_params.py
@@ -6,41 +6,45 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryMitigationProductParams"]
 
 
 class SummaryMitigationProductParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     http_method: Annotated[
         List[
@@ -95,20 +99,28 @@ class SummaryMitigationProductParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="httpMethod"),
     ]
-    """Filter for http method."""
+    """Filters results by HTTP method."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/attacks/layer7/summary_mitigation_product_response.py b/src/cloudflare/types/radar/attacks/layer7/summary_mitigation_product_response.py
index f815da2375a..03e39670de8 100644
--- a/src/cloudflare/types/radar/attacks/layer7/summary_mitigation_product_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7/summary_mitigation_product_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Dict, List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,115 @@
 __all__ = [
     "SummaryMitigationProductResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
-    "Summary0",
+    "MetaDateRange",
+    "MetaUnit",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
 
-    level: Optional[int] = None
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+    """Metadata for the results."""
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
 
-    normalization: str
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-class Summary0(BaseModel):
-    ddos: str = FieldInfo(alias="DDOS")
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    waf: str = FieldInfo(alias="WAF")
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class SummaryMitigationProductResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
-    summary_0: Summary0
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/attacks/layer7/summary_vertical_params.py b/src/cloudflare/types/radar/attacks/layer7/summary_vertical_params.py
new file mode 100644
index 00000000000..a6b4a5b7794
--- /dev/null
+++ b/src/cloudflare/types/radar/attacks/layer7/summary_vertical_params.py
@@ -0,0 +1,136 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ....._types import SequenceNotStr
+from ....._utils import PropertyInfo
+
+__all__ = ["SummaryVerticalParams"]
+
+
+class SummaryVerticalParams(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    http_method: Annotated[
+        List[
+            Literal[
+                "GET",
+                "POST",
+                "DELETE",
+                "PUT",
+                "HEAD",
+                "PURGE",
+                "OPTIONS",
+                "PROPFIND",
+                "MKCOL",
+                "PATCH",
+                "ACL",
+                "BCOPY",
+                "BDELETE",
+                "BMOVE",
+                "BPROPFIND",
+                "BPROPPATCH",
+                "CHECKIN",
+                "CHECKOUT",
+                "CONNECT",
+                "COPY",
+                "LABEL",
+                "LOCK",
+                "MERGE",
+                "MKACTIVITY",
+                "MKWORKSPACE",
+                "MOVE",
+                "NOTIFY",
+                "ORDERPATCH",
+                "POLL",
+                "PROPPATCH",
+                "REPORT",
+                "SEARCH",
+                "SUBSCRIBE",
+                "TRACE",
+                "UNCHECKOUT",
+                "UNLOCK",
+                "UNSUBSCRIBE",
+                "UPDATE",
+                "VERSIONCONTROL",
+                "BASELINECONTROL",
+                "XMSENUMATTS",
+                "RPC_OUT_DATA",
+                "RPC_IN_DATA",
+                "JSON",
+                "COOK",
+                "TRACK",
+            ]
+        ],
+        PropertyInfo(alias="httpMethod"),
+    ]
+    """Filters results by HTTP method."""
+
+    http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
+    """Filters results by HTTP version."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    mitigation_product: Annotated[
+        List[
+            Literal[
+                "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
+            ]
+        ],
+        PropertyInfo(alias="mitigationProduct"),
+    ]
+    """Filters the results by layer 7 mitigation product."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/attacks/layer7/summary_vertical_response.py b/src/cloudflare/types/radar/attacks/layer7/summary_vertical_response.py
new file mode 100644
index 00000000000..ceab1b2728f
--- /dev/null
+++ b/src/cloudflare/types/radar/attacks/layer7/summary_vertical_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = [
+    "SummaryVerticalResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class SummaryVerticalResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_get_params.py b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_get_params.py
deleted file mode 100644
index 9ab69b16b82..00000000000
--- a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_get_params.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List, Union
-from datetime import datetime
-from typing_extensions import Literal, Annotated, TypedDict
-
-from ....._utils import PropertyInfo
-
-__all__ = ["TimeseriesGroupGetParams"]
-
-
-class TimeseriesGroupGetParams(TypedDict, total=False):
-    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
-    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
-    """
-
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
-
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
-    """
-
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
-
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
-    """
-
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
-    """End of the date range (inclusive)."""
-
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
-    week. Use this parameter or set specific start and end dates (`dateStart` and
-    `dateEnd` parameters).
-    """
-
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
-
-    format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
-
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
-
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
-    """
-
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
diff --git a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_get_response.py b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_get_response.py
deleted file mode 100644
index 60c8a9d9117..00000000000
--- a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_get_response.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from datetime import datetime
-
-from pydantic import Field as FieldInfo
-
-from ....._models import BaseModel
-
-__all__ = [
-    "TimeseriesGroupGetResponse",
-    "Meta",
-    "MetaDateRange",
-    "MetaConfidenceInfo",
-    "MetaConfidenceInfoAnnotation",
-    "Serie0",
-]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
-class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
-
-    description: str
-
-    event_type: str = FieldInfo(alias="eventType")
-
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
-
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
-
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
-
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
-
-
-class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
-
-    level: Optional[int] = None
-
-
-class Meta(BaseModel):
-    agg_interval: str = FieldInfo(alias="aggInterval")
-
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
-
-    last_updated: datetime = FieldInfo(alias="lastUpdated")
-
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
-
-
-class Serie0(BaseModel):
-    access_rules: List[str] = FieldInfo(alias="ACCESS_RULES")
-
-    api_shield: List[str] = FieldInfo(alias="API_SHIELD")
-
-    bot_management: List[str] = FieldInfo(alias="BOT_MANAGEMENT")
-
-    data_loss_prevention: List[str] = FieldInfo(alias="DATA_LOSS_PREVENTION")
-
-    ddos: List[str] = FieldInfo(alias="DDOS")
-
-    ip_reputation: List[str] = FieldInfo(alias="IP_REPUTATION")
-
-    timestamps: List[datetime]
-
-    waf: List[str] = FieldInfo(alias="WAF")
-
-
-class TimeseriesGroupGetResponse(BaseModel):
-    meta: Meta
-
-    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_method_params.py b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_method_params.py
index d6ea3e4eec2..ac12f660eef 100644
--- a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_method_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_method_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupHTTPMethodParams"]
@@ -13,53 +14,64 @@
 
 class TimeseriesGroupHTTPMethodParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
     mitigation_product: Annotated[
@@ -70,13 +82,13 @@ class TimeseriesGroupHTTPMethodParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="mitigationProduct"),
     ]
-    """Array of L7 mitigation products."""
+    """Filters the results by layer 7 mitigation product."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     normalization: Literal["PERCENTAGE", "MIN0_MAX"]
-    """Normalization method applied.
+    """Normalization method applied to the results.
 
     Refer to
     [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
diff --git a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_method_response.py b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_method_response.py
index a0f6379a2c5..782976a9a3b 100644
--- a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_method_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_method_response.py
@@ -1,21 +1,151 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupHTTPMethodResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupHTTPMethodResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
-    get: List[str] = FieldInfo(alias="GET")
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
 
-    timestamps: List[str]
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
 
 
 class TimeseriesGroupHTTPMethodResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_version_params.py b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_version_params.py
index f2c435b5132..4532cea6393 100644
--- a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_version_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_version_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupHTTPVersionParams"]
@@ -13,41 +14,44 @@
 
 class TimeseriesGroupHTTPVersionParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     http_method: Annotated[
         List[
@@ -102,16 +106,17 @@ class TimeseriesGroupHTTPVersionParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="httpMethod"),
     ]
-    """Filter for http method."""
+    """Filters results by HTTP method."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
     mitigation_product: Annotated[
@@ -122,13 +127,13 @@ class TimeseriesGroupHTTPVersionParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="mitigationProduct"),
     ]
-    """Array of L7 mitigation products."""
+    """Filters the results by layer 7 mitigation product."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     normalization: Literal["PERCENTAGE", "MIN0_MAX"]
-    """Normalization method applied.
+    """Normalization method applied to the results.
 
     Refer to
     [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
diff --git a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_version_response.py b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_version_response.py
index f8085143fa2..60f4b3137ec 100644
--- a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_version_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_http_version_response.py
@@ -1,21 +1,145 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupHTTPVersionResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupHTTPVersionResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
     http_1_x: List[str] = FieldInfo(alias="HTTP/1.x")
 
-    timestamps: List[str]
+    http_2: List[str] = FieldInfo(alias="HTTP/2")
+
+    http_3: List[str] = FieldInfo(alias="HTTP/3")
+
+    timestamps: List[datetime]
 
 
 class TimeseriesGroupHTTPVersionResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_industry_params.py b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_industry_params.py
index 274b5be39b6..02a7c6c1182 100644
--- a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_industry_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_industry_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupIndustryParams"]
@@ -13,41 +14,44 @@
 
 class TimeseriesGroupIndustryParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     http_method: Annotated[
         List[
@@ -102,25 +106,27 @@ class TimeseriesGroupIndustryParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="httpMethod"),
     ]
-    """Filter for http method."""
+    """Filters results by HTTP method."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
     """
-    Limit the number of objects (eg browsers, verticals, etc) to the top items over
-    the time range.
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
     """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
     mitigation_product: Annotated[
@@ -131,13 +137,13 @@ class TimeseriesGroupIndustryParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="mitigationProduct"),
     ]
-    """Array of L7 mitigation products."""
+    """Filters the results by layer 7 mitigation product."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     normalization: Literal["PERCENTAGE", "MIN0_MAX"]
-    """Normalization method applied.
+    """Normalization method applied to the results.
 
     Refer to
     [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
diff --git a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_industry_response.py b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_industry_response.py
index eee79e8794f..61ecc717aa7 100644
--- a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_industry_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_industry_response.py
@@ -1,24 +1,151 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import TYPE_CHECKING, List
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupIndustryResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupIndustryResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
-    timestamps: List[str]
+    timestamps: List[datetime]
 
     if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
         # Stub to indicate that arbitrary properties are accepted.
         # To access properties that are not valid identifiers you can use `getattr`, e.g.
         # `getattr(obj, '$type')`
-        def __getattr__(self, attr: str) -> List[str]:
-            ...
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
 
 
 class TimeseriesGroupIndustryResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_ip_version_params.py b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_ip_version_params.py
index dfeee4f83b4..590503e4e00 100644
--- a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_ip_version_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_ip_version_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupIPVersionParams"]
@@ -13,41 +14,44 @@
 
 class TimeseriesGroupIPVersionParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     http_method: Annotated[
         List[
@@ -102,16 +106,17 @@ class TimeseriesGroupIPVersionParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="httpMethod"),
     ]
-    """Filter for http method."""
+    """Filters results by HTTP method."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
     mitigation_product: Annotated[
@@ -122,13 +127,13 @@ class TimeseriesGroupIPVersionParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="mitigationProduct"),
     ]
-    """Array of L7 mitigation products."""
+    """Filters the results by layer 7 mitigation product."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     normalization: Literal["PERCENTAGE", "MIN0_MAX"]
-    """Normalization method applied.
+    """Normalization method applied to the results.
 
     Refer to
     [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
diff --git a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_ip_version_response.py b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_ip_version_response.py
index 136fc4da363..712fa9458e8 100644
--- a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_ip_version_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_ip_version_response.py
@@ -1,12 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupIPVersionResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupIPVersionResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -14,10 +133,11 @@ class Serie0(BaseModel):
 
     i_pv6: List[str] = FieldInfo(alias="IPv6")
 
-    timestamps: List[str]
+    timestamps: List[datetime]
 
 
 class TimeseriesGroupIPVersionResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_managed_rules_params.py b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_managed_rules_params.py
index 7c26f5c6c64..74f6f4c3559 100644
--- a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_managed_rules_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_managed_rules_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupManagedRulesParams"]
@@ -13,41 +14,44 @@
 
 class TimeseriesGroupManagedRulesParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     http_method: Annotated[
         List[
@@ -102,19 +106,27 @@ class TimeseriesGroupManagedRulesParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="httpMethod"),
     ]
-    """Filter for http method."""
+    """Filters results by HTTP method."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
     mitigation_product: Annotated[
@@ -125,13 +137,13 @@ class TimeseriesGroupManagedRulesParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="mitigationProduct"),
     ]
-    """Array of L7 mitigation products."""
+    """Filters the results by layer 7 mitigation product."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     normalization: Literal["PERCENTAGE", "MIN0_MAX"]
-    """Normalization method applied.
+    """Normalization method applied to the results.
 
     Refer to
     [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
diff --git a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_managed_rules_response.py b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_managed_rules_response.py
index 73dcc4c22bc..79afb24771a 100644
--- a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_managed_rules_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_managed_rules_response.py
@@ -1,21 +1,151 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupManagedRulesResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupManagedRulesResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
-    bot: List[str] = FieldInfo(alias="Bot")
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
 
-    timestamps: List[str]
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
 
 
 class TimeseriesGroupManagedRulesResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_mitigation_product_params.py b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_mitigation_product_params.py
index 7dfb3741259..0b8ba20e7be 100644
--- a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_mitigation_product_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_mitigation_product_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupMitigationProductParams"]
@@ -13,41 +14,44 @@
 
 class TimeseriesGroupMitigationProductParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     http_method: Annotated[
         List[
@@ -102,26 +106,34 @@ class TimeseriesGroupMitigationProductParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="httpMethod"),
     ]
-    """Filter for http method."""
+    """Filters results by HTTP method."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     normalization: Literal["PERCENTAGE", "MIN0_MAX"]
-    """Normalization method applied.
+    """Normalization method applied to the results.
 
     Refer to
     [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
diff --git a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_mitigation_product_response.py b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_mitigation_product_response.py
index 7e598104c96..11a4129bdd1 100644
--- a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_mitigation_product_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_mitigation_product_response.py
@@ -1,21 +1,151 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupMitigationProductResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupMitigationProductResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
-    ddos: List[str] = FieldInfo(alias="DDOS")
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
 
-    timestamps: List[str]
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
 
 
 class TimeseriesGroupMitigationProductResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_vertical_params.py b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_vertical_params.py
index 97c91f53136..cb4e8815ec4 100644
--- a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_vertical_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_vertical_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupVerticalParams"]
@@ -13,41 +14,44 @@
 
 class TimeseriesGroupVerticalParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     http_method: Annotated[
         List[
@@ -102,25 +106,27 @@ class TimeseriesGroupVerticalParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="httpMethod"),
     ]
-    """Filter for http method."""
+    """Filters results by HTTP method."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
     """
-    Limit the number of objects (eg browsers, verticals, etc) to the top items over
-    the time range.
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
     """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
     mitigation_product: Annotated[
@@ -131,13 +137,13 @@ class TimeseriesGroupVerticalParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="mitigationProduct"),
     ]
-    """Array of L7 mitigation products."""
+    """Filters the results by layer 7 mitigation product."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     normalization: Literal["PERCENTAGE", "MIN0_MAX"]
-    """Normalization method applied.
+    """Normalization method applied to the results.
 
     Refer to
     [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
diff --git a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_vertical_response.py b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_vertical_response.py
index 5f3bb1a0608..165f50db0a4 100644
--- a/src/cloudflare/types/radar/attacks/layer7/timeseries_group_vertical_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7/timeseries_group_vertical_response.py
@@ -1,24 +1,151 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import TYPE_CHECKING, List
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupVerticalResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupVerticalResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
-    timestamps: List[str]
+    timestamps: List[datetime]
 
     if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
         # Stub to indicate that arbitrary properties are accepted.
         # To access properties that are not valid identifiers you can use `getattr`, e.g.
         # `getattr(obj, '$type')`
-        def __getattr__(self, attr: str) -> List[str]:
-            ...
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
 
 
 class TimeseriesGroupVerticalResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/attacks/layer7/top/ase_origin_params.py b/src/cloudflare/types/radar/attacks/layer7/top/ase_origin_params.py
index 17099f3e08c..c75703eb1a6 100644
--- a/src/cloudflare/types/radar/attacks/layer7/top/ase_origin_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7/top/ase_origin_params.py
@@ -6,34 +6,37 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ......_types import SequenceNotStr
 from ......_utils import PropertyInfo
 
 __all__ = ["AseOriginParams"]
 
 
 class AseOriginParams(TypedDict, total=False):
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     http_method: Annotated[
         List[
@@ -88,22 +91,23 @@ class AseOriginParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="httpMethod"),
     ]
-    """Filter for http method."""
+    """Filters results by HTTP method."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
     mitigation_product: Annotated[
@@ -114,7 +118,7 @@ class AseOriginParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="mitigationProduct"),
     ]
-    """Array of L7 mitigation products."""
+    """Filters the results by layer 7 mitigation product."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/attacks/layer7/top/ase_origin_response.py b/src/cloudflare/types/radar/attacks/layer7/top/ase_origin_response.py
index 7c7bdac68f6..fc2262e132e 100644
--- a/src/cloudflare/types/radar/attacks/layer7/top/ase_origin_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7/top/ase_origin_response.py
@@ -2,50 +2,121 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ......_models import BaseModel
 
-__all__ = ["AseOriginResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation", "Top0"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "AseOriginResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
 
-    level: Optional[int] = None
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -60,5 +131,6 @@ class Top0(BaseModel):
 
 class AseOriginResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/attacks/layer7/top/location_origin_params.py b/src/cloudflare/types/radar/attacks/layer7/top/location_origin_params.py
index 58aa33984ac..4b7e8db07ec 100644
--- a/src/cloudflare/types/radar/attacks/layer7/top/location_origin_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7/top/location_origin_params.py
@@ -6,41 +6,45 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ......_types import SequenceNotStr
 from ......_utils import PropertyInfo
 
 __all__ = ["LocationOriginParams"]
 
 
 class LocationOriginParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     http_method: Annotated[
         List[
@@ -95,16 +99,16 @@ class LocationOriginParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="httpMethod"),
     ]
-    """Filter for http method."""
+    """Filters results by HTTP method."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
     mitigation_product: Annotated[
         List[
@@ -114,7 +118,7 @@ class LocationOriginParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="mitigationProduct"),
     ]
-    """Array of L7 mitigation products."""
+    """Filters the results by layer 7 mitigation product."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/attacks/layer7/top/location_origin_response.py b/src/cloudflare/types/radar/attacks/layer7/top/location_origin_response.py
index 102661bf56a..ddf5ac81e7c 100644
--- a/src/cloudflare/types/radar/attacks/layer7/top/location_origin_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7/top/location_origin_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "LocationOriginResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -67,5 +131,6 @@ class Top0(BaseModel):
 
 class LocationOriginResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/attacks/layer7/top/location_target_params.py b/src/cloudflare/types/radar/attacks/layer7/top/location_target_params.py
index 50a57bfe056..201fb425cb5 100644
--- a/src/cloudflare/types/radar/attacks/layer7/top/location_target_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7/top/location_target_params.py
@@ -6,98 +6,40 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ......_types import SequenceNotStr
 from ......_utils import PropertyInfo
 
 __all__ = ["LocationTargetParams"]
 
 
 class LocationTargetParams(TypedDict, total=False):
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
-
-    http_method: Annotated[
-        List[
-            Literal[
-                "GET",
-                "POST",
-                "DELETE",
-                "PUT",
-                "HEAD",
-                "PURGE",
-                "OPTIONS",
-                "PROPFIND",
-                "MKCOL",
-                "PATCH",
-                "ACL",
-                "BCOPY",
-                "BDELETE",
-                "BMOVE",
-                "BPROPFIND",
-                "BPROPPATCH",
-                "CHECKIN",
-                "CHECKOUT",
-                "CONNECT",
-                "COPY",
-                "LABEL",
-                "LOCK",
-                "MERGE",
-                "MKACTIVITY",
-                "MKWORKSPACE",
-                "MOVE",
-                "NOTIFY",
-                "ORDERPATCH",
-                "POLL",
-                "PROPPATCH",
-                "REPORT",
-                "SEARCH",
-                "SUBSCRIBE",
-                "TRACE",
-                "UNCHECKOUT",
-                "UNLOCK",
-                "UNSUBSCRIBE",
-                "UPDATE",
-                "VERSIONCONTROL",
-                "BASELINECONTROL",
-                "XMSENUMATTS",
-                "RPC_OUT_DATA",
-                "RPC_IN_DATA",
-                "JSON",
-                "COOK",
-                "TRACK",
-            ]
-        ],
-        PropertyInfo(alias="httpMethod"),
-    ]
-    """Filter for http method."""
-
-    http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
-
-    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
     mitigation_product: Annotated[
         List[
@@ -107,7 +49,7 @@ class LocationTargetParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="mitigationProduct"),
     ]
-    """Array of L7 mitigation products."""
+    """Filters the results by layer 7 mitigation product."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/attacks/layer7/top/location_target_response.py b/src/cloudflare/types/radar/attacks/layer7/top/location_target_response.py
index 4641eb271e6..751e2a5ad77 100644
--- a/src/cloudflare/types/radar/attacks/layer7/top/location_target_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7/top/location_target_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "LocationTargetResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -67,5 +131,6 @@ class Top0(BaseModel):
 
 class LocationTargetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/attacks/layer7/top_attacks_params.py b/src/cloudflare/types/radar/attacks/layer7/top_attacks_params.py
index d735b60cb91..6666c02c8ec 100644
--- a/src/cloudflare/types/radar/attacks/layer7/top_attacks_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7/top_attacks_params.py
@@ -6,130 +6,67 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TopAttacksParams"]
 
 
 class TopAttacksParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
-
-    http_method: Annotated[
-        List[
-            Literal[
-                "GET",
-                "POST",
-                "DELETE",
-                "PUT",
-                "HEAD",
-                "PURGE",
-                "OPTIONS",
-                "PROPFIND",
-                "MKCOL",
-                "PATCH",
-                "ACL",
-                "BCOPY",
-                "BDELETE",
-                "BMOVE",
-                "BPROPFIND",
-                "BPROPPATCH",
-                "CHECKIN",
-                "CHECKOUT",
-                "CONNECT",
-                "COPY",
-                "LABEL",
-                "LOCK",
-                "MERGE",
-                "MKACTIVITY",
-                "MKWORKSPACE",
-                "MOVE",
-                "NOTIFY",
-                "ORDERPATCH",
-                "POLL",
-                "PROPPATCH",
-                "REPORT",
-                "SEARCH",
-                "SUBSCRIBE",
-                "TRACE",
-                "UNCHECKOUT",
-                "UNLOCK",
-                "UNSUBSCRIBE",
-                "UPDATE",
-                "VERSIONCONTROL",
-                "BASELINECONTROL",
-                "XMSENUMATTS",
-                "RPC_OUT_DATA",
-                "RPC_IN_DATA",
-                "JSON",
-                "COOK",
-                "TRACK",
-            ]
-        ],
-        PropertyInfo(alias="httpMethod"),
-    ]
-    """Filter for http method."""
-
-    http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
-
-    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
     limit_direction: Annotated[Literal["ORIGIN", "TARGET"], PropertyInfo(alias="limitDirection")]
-    """Array of attack origin/target location attack limits.
-
-    Together with `limitPerLocation`, limits how many objects will be fetched per
-    origin/target location.
+    """
+    Specifies whether the `limitPerLocation` applies to the source or target
+    location.
     """
 
     limit_per_location: Annotated[int, PropertyInfo(alias="limitPerLocation")]
     """
-    Limit the number of attacks per origin/target (refer to `limitDirection`
+    Limits the number of attacks per origin/target (refer to `limitDirection`
     parameter) location.
     """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
-    """
-
-    magnitude: Literal["AFFECTED_ZONES", "MITIGATED_REQUESTS"]
-    """
-    Attack magnitude can be defined by total requests mitigated or by total zones
-    attacked.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
     mitigation_product: Annotated[
@@ -140,13 +77,13 @@ class TopAttacksParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="mitigationProduct"),
     ]
-    """Array of L7 mitigation products."""
+    """Filters the results by layer 7 mitigation product."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     normalization: Literal["PERCENTAGE", "MIN_MAX"]
-    """Normalization method applied.
+    """Normalization method applied to the results.
 
     Refer to
     [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
diff --git a/src/cloudflare/types/radar/attacks/layer7/top_attacks_response.py b/src/cloudflare/types/radar/attacks/layer7/top_attacks_response.py
index 68577c2c62c..760ab2ff1a6 100644
--- a/src/cloudflare/types/radar/attacks/layer7/top_attacks_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7/top_attacks_response.py
@@ -2,50 +2,121 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TopAttacksResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation", "Top0"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "TopAttacksResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
 
-    level: Optional[int] = None
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -62,5 +133,6 @@ class Top0(BaseModel):
 
 class TopAttacksResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/attacks/layer7/top_industry_params.py b/src/cloudflare/types/radar/attacks/layer7/top_industry_params.py
index 54c26d71680..c0cf13b8c42 100644
--- a/src/cloudflare/types/radar/attacks/layer7/top_industry_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7/top_industry_params.py
@@ -6,41 +6,45 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TopIndustryParams"]
 
 
 class TopIndustryParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     http_method: Annotated[
         List[
@@ -95,22 +99,23 @@ class TopIndustryParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="httpMethod"),
     ]
-    """Filter for http method."""
+    """Filters results by HTTP method."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
     mitigation_product: Annotated[
@@ -121,7 +126,7 @@ class TopIndustryParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="mitigationProduct"),
     ]
-    """Array of L7 mitigation products."""
+    """Filters the results by layer 7 mitigation product."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/attacks/layer7/top_industry_response.py b/src/cloudflare/types/radar/attacks/layer7/top_industry_response.py
index 01b6e141308..33cc3a86267 100644
--- a/src/cloudflare/types/radar/attacks/layer7/top_industry_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7/top_industry_response.py
@@ -2,13 +2,77 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
-from ...http.browser import Browser
 
-__all__ = ["TopIndustryResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
+__all__ = [
+    "TopIndustryResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
 
 class MetaDateRange(BaseModel):
@@ -19,37 +83,50 @@ class MetaDateRange(BaseModel):
     """Adjusted start of date range."""
 
 
-class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+class MetaUnit(BaseModel):
+    name: str
 
-    description: str
+    value: str
 
-    event_type: str = FieldInfo(alias="eventType")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
-
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+class Meta(BaseModel):
+    """Metadata for the results."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    level: Optional[int] = None
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
-class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+class Top0(BaseModel):
+    name: str
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    value: str
 
 
 class TopIndustryResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
-    top_0: List[Browser]
+    top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/attacks/layer7/top_vertical_params.py b/src/cloudflare/types/radar/attacks/layer7/top_vertical_params.py
index cb941de5c43..bd43adb3965 100644
--- a/src/cloudflare/types/radar/attacks/layer7/top_vertical_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7/top_vertical_params.py
@@ -6,41 +6,45 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TopVerticalParams"]
 
 
 class TopVerticalParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     http_method: Annotated[
         List[
@@ -95,22 +99,23 @@ class TopVerticalParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="httpMethod"),
     ]
-    """Filter for http method."""
+    """Filters results by HTTP method."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
     mitigation_product: Annotated[
@@ -121,7 +126,7 @@ class TopVerticalParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="mitigationProduct"),
     ]
-    """Array of L7 mitigation products."""
+    """Filters the results by layer 7 mitigation product."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/attacks/layer7/top_vertical_response.py b/src/cloudflare/types/radar/attacks/layer7/top_vertical_response.py
index 83a240b3100..a097494189e 100644
--- a/src/cloudflare/types/radar/attacks/layer7/top_vertical_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7/top_vertical_response.py
@@ -2,13 +2,77 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
-from ...http.browser import Browser
 
-__all__ = ["TopVerticalResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
+__all__ = [
+    "TopVerticalResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
 
 class MetaDateRange(BaseModel):
@@ -19,37 +83,50 @@ class MetaDateRange(BaseModel):
     """Adjusted start of date range."""
 
 
-class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+class MetaUnit(BaseModel):
+    name: str
 
-    description: str
+    value: str
 
-    event_type: str = FieldInfo(alias="eventType")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
-
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+class Meta(BaseModel):
+    """Metadata for the results."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    level: Optional[int] = None
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
-class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+class Top0(BaseModel):
+    name: str
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    value: str
 
 
 class TopVerticalResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
-    top_0: List[Browser]
+    top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/attacks/layer7_summary_v2_params.py b/src/cloudflare/types/radar/attacks/layer7_summary_v2_params.py
new file mode 100644
index 00000000000..c931503d69f
--- /dev/null
+++ b/src/cloudflare/types/radar/attacks/layer7_summary_v2_params.py
@@ -0,0 +1,136 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["Layer7SummaryV2Params"]
+
+
+class Layer7SummaryV2Params(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    http_method: Annotated[
+        List[
+            Literal[
+                "GET",
+                "POST",
+                "DELETE",
+                "PUT",
+                "HEAD",
+                "PURGE",
+                "OPTIONS",
+                "PROPFIND",
+                "MKCOL",
+                "PATCH",
+                "ACL",
+                "BCOPY",
+                "BDELETE",
+                "BMOVE",
+                "BPROPFIND",
+                "BPROPPATCH",
+                "CHECKIN",
+                "CHECKOUT",
+                "CONNECT",
+                "COPY",
+                "LABEL",
+                "LOCK",
+                "MERGE",
+                "MKACTIVITY",
+                "MKWORKSPACE",
+                "MOVE",
+                "NOTIFY",
+                "ORDERPATCH",
+                "POLL",
+                "PROPPATCH",
+                "REPORT",
+                "SEARCH",
+                "SUBSCRIBE",
+                "TRACE",
+                "UNCHECKOUT",
+                "UNLOCK",
+                "UNSUBSCRIBE",
+                "UPDATE",
+                "VERSIONCONTROL",
+                "BASELINECONTROL",
+                "XMSENUMATTS",
+                "RPC_OUT_DATA",
+                "RPC_IN_DATA",
+                "JSON",
+                "COOK",
+                "TRACK",
+            ]
+        ],
+        PropertyInfo(alias="httpMethod"),
+    ]
+    """Filters results by HTTP method."""
+
+    http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
+    """Filters results by HTTP version."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    mitigation_product: Annotated[
+        List[
+            Literal[
+                "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
+            ]
+        ],
+        PropertyInfo(alias="mitigationProduct"),
+    ]
+    """Filters the results by layer 7 mitigation product."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/attacks/layer7_summary_v2_response.py b/src/cloudflare/types/radar/attacks/layer7_summary_v2_response.py
new file mode 100644
index 00000000000..be84e69d16d
--- /dev/null
+++ b/src/cloudflare/types/radar/attacks/layer7_summary_v2_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "Layer7SummaryV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Layer7SummaryV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/attacks/layer7_timeseries_groups_v2_params.py b/src/cloudflare/types/radar/attacks/layer7_timeseries_groups_v2_params.py
new file mode 100644
index 00000000000..1305a80200f
--- /dev/null
+++ b/src/cloudflare/types/radar/attacks/layer7_timeseries_groups_v2_params.py
@@ -0,0 +1,150 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["Layer7TimeseriesGroupsV2Params"]
+
+
+class Layer7TimeseriesGroupsV2Params(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    http_method: Annotated[
+        List[
+            Literal[
+                "GET",
+                "POST",
+                "DELETE",
+                "PUT",
+                "HEAD",
+                "PURGE",
+                "OPTIONS",
+                "PROPFIND",
+                "MKCOL",
+                "PATCH",
+                "ACL",
+                "BCOPY",
+                "BDELETE",
+                "BMOVE",
+                "BPROPFIND",
+                "BPROPPATCH",
+                "CHECKIN",
+                "CHECKOUT",
+                "CONNECT",
+                "COPY",
+                "LABEL",
+                "LOCK",
+                "MERGE",
+                "MKACTIVITY",
+                "MKWORKSPACE",
+                "MOVE",
+                "NOTIFY",
+                "ORDERPATCH",
+                "POLL",
+                "PROPPATCH",
+                "REPORT",
+                "SEARCH",
+                "SUBSCRIBE",
+                "TRACE",
+                "UNCHECKOUT",
+                "UNLOCK",
+                "UNSUBSCRIBE",
+                "UPDATE",
+                "VERSIONCONTROL",
+                "BASELINECONTROL",
+                "XMSENUMATTS",
+                "RPC_OUT_DATA",
+                "RPC_IN_DATA",
+                "JSON",
+                "COOK",
+                "TRACK",
+            ]
+        ],
+        PropertyInfo(alias="httpMethod"),
+    ]
+    """Filters results by HTTP method."""
+
+    http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
+    """Filters results by HTTP version."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    mitigation_product: Annotated[
+        List[
+            Literal[
+                "DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"
+            ]
+        ],
+        PropertyInfo(alias="mitigationProduct"),
+    ]
+    """Filters the results by layer 7 mitigation product."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    normalization: Literal["PERCENTAGE", "MIN0_MAX"]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
diff --git a/src/cloudflare/types/radar/attacks/layer7_timeseries_groups_v2_response.py b/src/cloudflare/types/radar/attacks/layer7_timeseries_groups_v2_response.py
new file mode 100644
index 00000000000..3c753ebcd11
--- /dev/null
+++ b/src/cloudflare/types/radar/attacks/layer7_timeseries_groups_v2_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "Layer7TimeseriesGroupsV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class Layer7TimeseriesGroupsV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/attacks/layer7_timeseries_params.py b/src/cloudflare/types/radar/attacks/layer7_timeseries_params.py
index 1808607d48b..51ffc4ab2a6 100644
--- a/src/cloudflare/types/radar/attacks/layer7_timeseries_params.py
+++ b/src/cloudflare/types/radar/attacks/layer7_timeseries_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["Layer7TimeseriesParams"]
@@ -13,46 +14,44 @@
 
 class Layer7TimeseriesParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    attack: List[
-        Literal["DDOS", "WAF", "BOT_MANAGEMENT", "ACCESS_RULES", "IP_REPUTATION", "API_SHIELD", "DATA_LOSS_PREVENTION"]
-    ]
-    """This field is deprecated, please use the new `mitigationProduct`."""
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
-
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     http_method: Annotated[
         List[
@@ -107,19 +106,20 @@ class Layer7TimeseriesParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="httpMethod"),
     ]
-    """Filter for http method."""
+    """Filters results by HTTP method."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
     mitigation_product: Annotated[
@@ -130,13 +130,13 @@ class Layer7TimeseriesParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="mitigationProduct"),
     ]
-    """Array of L7 mitigation products."""
+    """Filters the results by layer 7 mitigation product."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"]
-    """Normalization method applied.
+    """Normalization method applied to the results.
 
     Refer to
     [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
diff --git a/src/cloudflare/types/radar/attacks/layer7_timeseries_response.py b/src/cloudflare/types/radar/attacks/layer7_timeseries_response.py
index 355696d9df5..f3ddae2c5ac 100644
--- a/src/cloudflare/types/radar/attacks/layer7_timeseries_response.py
+++ b/src/cloudflare/types/radar/attacks/layer7_timeseries_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,51 +11,121 @@
 __all__ = [
     "Layer7TimeseriesResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Serie0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
-    agg_interval: str = FieldInfo(alias="aggInterval")
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
 
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
     last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -65,5 +136,6 @@ class Serie0(BaseModel):
 
 class Layer7TimeseriesResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/bgp/__init__.py b/src/cloudflare/types/radar/bgp/__init__.py
index fdbf378f666..eabcfa6c9bc 100644
--- a/src/cloudflare/types/radar/bgp/__init__.py
+++ b/src/cloudflare/types/radar/bgp/__init__.py
@@ -12,5 +12,7 @@
 from .ip_timeseries_params import IPTimeseriesParams as IPTimeseriesParams
 from .route_stats_response import RouteStatsResponse as RouteStatsResponse
 from .route_pfx2as_response import RoutePfx2asResponse as RoutePfx2asResponse
+from .route_realtime_params import RouteRealtimeParams as RouteRealtimeParams
 from .top_prefixes_response import TopPrefixesResponse as TopPrefixesResponse
 from .ip_timeseries_response import IPTimeseriesResponse as IPTimeseriesResponse
+from .route_realtime_response import RouteRealtimeResponse as RouteRealtimeResponse
diff --git a/src/cloudflare/types/radar/bgp/hijacks/event_list_params.py b/src/cloudflare/types/radar/bgp/hijacks/event_list_params.py
index 7433cf1aae5..74a1f6dab3c 100644
--- a/src/cloudflare/types/radar/bgp/hijacks/event_list_params.py
+++ b/src/cloudflare/types/radar/bgp/hijacks/event_list_params.py
@@ -16,49 +16,45 @@ class EventListParams(TypedDict, total=False):
     """End of the date range (inclusive)."""
 
     date_range: Annotated[str, PropertyInfo(alias="dateRange")]
-    """
-    Shorthand date ranges for the last X days - use when you don't need specific
-    start and end dates.
-    """
+    """Filters results by date range."""
 
     date_start: Annotated[Union[str, datetime], PropertyInfo(alias="dateStart", format="iso8601")]
     """Start of the date range (inclusive)."""
 
     event_id: Annotated[int, PropertyInfo(alias="eventId")]
-    """The unique identifier of a event"""
+    """The unique identifier of a event."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     hijacker_asn: Annotated[int, PropertyInfo(alias="hijackerAsn")]
-    """The potential hijacker AS of a BGP hijack event"""
+    """The potential hijacker AS of a BGP hijack event."""
 
     involved_asn: Annotated[int, PropertyInfo(alias="involvedAsn")]
-    """The potential hijacker or victim AS of a BGP hijack event"""
+    """The potential hijacker or victim AS of a BGP hijack event."""
 
     involved_country: Annotated[str, PropertyInfo(alias="involvedCountry")]
-    """The country code of the potential hijacker or victim AS of a BGP hijack event"""
+    """The country code of the potential hijacker or victim AS of a BGP hijack event."""
 
     max_confidence: Annotated[int, PropertyInfo(alias="maxConfidence")]
-    """The maximum confidence score to filter events (1-4 low, 5-7 mid, 8+ high)"""
+    """Filters events by maximum confidence score (1-4 low, 5-7 mid, 8+ high)."""
 
     min_confidence: Annotated[int, PropertyInfo(alias="minConfidence")]
-    """The minimum confidence score to filter events (1-4 low, 5-7 mid, 8+ high)"""
+    """Filters events by minimum confidence score (1-4 low, 5-7 mid, 8+ high)."""
 
     page: int
-    """Current page number, starting from 1"""
+    """Current page number, starting from 1."""
 
     per_page: int
-    """Number of entries per page"""
+    """Number of entries per page."""
 
     prefix: str
-    """Network prefix, IPv4 or IPv6."""
 
     sort_by: Annotated[Literal["ID", "TIME", "CONFIDENCE"], PropertyInfo(alias="sortBy")]
-    """Sort events by field"""
+    """Sorts results by the specified field."""
 
     sort_order: Annotated[Literal["ASC", "DESC"], PropertyInfo(alias="sortOrder")]
-    """Sort order"""
+    """Sort order."""
 
     victim_asn: Annotated[int, PropertyInfo(alias="victimAsn")]
-    """The potential victim AS of a BGP hijack event"""
+    """The potential victim AS of a BGP hijack event."""
diff --git a/src/cloudflare/types/radar/bgp/hijacks/event_list_response.py b/src/cloudflare/types/radar/bgp/hijacks/event_list_response.py
index 1d28e50b2f5..6e0b306c422 100644
--- a/src/cloudflare/types/radar/bgp/hijacks/event_list_response.py
+++ b/src/cloudflare/types/radar/bgp/hijacks/event_list_response.py
@@ -4,10 +4,10 @@
 
 from ....._models import BaseModel
 
-__all__ = ["EventListResponse", "Result", "ResultASNInfo", "ResultEvent", "ResultEventTag", "ResultInfo"]
+__all__ = ["EventListResponse", "ASNInfo", "Event", "EventTag"]
 
 
-class ResultASNInfo(BaseModel):
+class ASNInfo(BaseModel):
     asn: int
 
     country_code: str
@@ -15,13 +15,13 @@ class ResultASNInfo(BaseModel):
     org_name: str
 
 
-class ResultEventTag(BaseModel):
+class EventTag(BaseModel):
     name: str
 
     score: int
 
 
-class ResultEvent(BaseModel):
+class Event(BaseModel):
     id: int
 
     confidence_score: int
@@ -52,34 +52,16 @@ class ResultEvent(BaseModel):
 
     prefixes: List[str]
 
-    tags: List[ResultEventTag]
+    tags: List[EventTag]
 
     victim_asns: List[int]
 
     victim_countries: List[str]
 
 
-class Result(BaseModel):
-    asn_info: List[ResultASNInfo]
-
-    events: List[ResultEvent]
-
-    total_monitors: int
-
-
-class ResultInfo(BaseModel):
-    count: int
-
-    page: int
-
-    per_page: int
-
-    total_count: int
-
-
 class EventListResponse(BaseModel):
-    result: Result
+    asn_info: List[ASNInfo]
 
-    result_info: ResultInfo
+    events: List[Event]
 
-    success: bool
+    total_monitors: int
diff --git a/src/cloudflare/types/radar/bgp/ip_timeseries_params.py b/src/cloudflare/types/radar/bgp/ip_timeseries_params.py
index b5b47a19d65..aba283a1f38 100644
--- a/src/cloudflare/types/radar/bgp/ip_timeseries_params.py
+++ b/src/cloudflare/types/radar/bgp/ip_timeseries_params.py
@@ -6,35 +6,49 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["IPTimeseriesParams"]
 
 
 class IPTimeseriesParams(TypedDict, total=False):
-    asn: str
-    """Comma separated list of ASNs."""
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    date_end: Annotated[Union[str, datetime], PropertyInfo(alias="dateEnd", format="iso8601")]
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[str, PropertyInfo(alias="dateRange")]
-    """
-    Shorthand date ranges for the last X days - use when you don't need specific
-    start and end dates.
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
     """
 
-    date_start: Annotated[Union[str, datetime], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Start of the date range (inclusive)."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     include_delay: Annotated[bool, PropertyInfo(alias="includeDelay")]
-    """Include data delay meta information"""
+    """Includes data delay meta information."""
 
-    location: str
-    """Comma separated list of locations."""
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 location codes.
+    """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/bgp/ip_timeseries_response.py b/src/cloudflare/types/radar/bgp/ip_timeseries_response.py
index aeff238cfe0..eb6d764477e 100644
--- a/src/cloudflare/types/radar/bgp/ip_timeseries_response.py
+++ b/src/cloudflare/types/radar/bgp/ip_timeseries_response.py
@@ -1,13 +1,83 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["IPTimeseriesResponse", "Meta", "MetaDateRange", "Serie174", "SerieCn"]
+__all__ = [
+    "IPTimeseriesResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "MetaDelay",
+    "MetaDelayASNData",
+    "MetaDelayASNDataLatest",
+    "MetaDelayCountryData",
+    "MetaDelayCountryDataLatest",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
 
 class MetaDateRange(BaseModel):
@@ -18,19 +88,98 @@ class MetaDateRange(BaseModel):
     """Adjusted start of date range."""
 
 
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class MetaDelayASNDataLatest(BaseModel):
+    entries_count: float
+
+    path: str
+
+    timestamp: float
+
+
+class MetaDelayASNData(BaseModel):
+    delay_secs: float = FieldInfo(alias="delaySecs")
+
+    delay_str: str = FieldInfo(alias="delayStr")
+
+    healthy: bool
+
+    latest: MetaDelayASNDataLatest
+
+
+class MetaDelayCountryDataLatest(BaseModel):
+    count: float
+
+    timestamp: float
+
+
+class MetaDelayCountryData(BaseModel):
+    delay_secs: float = FieldInfo(alias="delaySecs")
+
+    delay_str: str = FieldInfo(alias="delayStr")
+
+    healthy: bool
+
+    latest: MetaDelayCountryDataLatest
+
+
+class MetaDelay(BaseModel):
+    asn_data: MetaDelayASNData
+
+    country_data: MetaDelayCountryData
+
+    healthy: bool
+
+    now_ts: float = FieldInfo(alias="nowTs")
+
+
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-class Serie174(BaseModel):
-    ipv4: List[str]
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    ipv6: List[str]
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    timestamps: List[datetime]
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
+    delay: Optional[MetaDelay] = None
 
-class SerieCn(BaseModel):
+
+class Serie0(BaseModel):
     ipv4: List[str]
 
     ipv6: List[str]
@@ -40,7 +189,6 @@ class SerieCn(BaseModel):
 
 class IPTimeseriesResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
-    serie_174: Serie174
-
-    serie_cn: SerieCn
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/bgp/leaks/event_list_params.py b/src/cloudflare/types/radar/bgp/leaks/event_list_params.py
index a9773f39dfa..c801d894556 100644
--- a/src/cloudflare/types/radar/bgp/leaks/event_list_params.py
+++ b/src/cloudflare/types/radar/bgp/leaks/event_list_params.py
@@ -16,37 +16,34 @@ class EventListParams(TypedDict, total=False):
     """End of the date range (inclusive)."""
 
     date_range: Annotated[str, PropertyInfo(alias="dateRange")]
-    """
-    Shorthand date ranges for the last X days - use when you don't need specific
-    start and end dates.
-    """
+    """Filters results by date range."""
 
     date_start: Annotated[Union[str, datetime], PropertyInfo(alias="dateStart", format="iso8601")]
     """Start of the date range (inclusive)."""
 
     event_id: Annotated[int, PropertyInfo(alias="eventId")]
-    """The unique identifier of a event"""
+    """The unique identifier of a event."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     involved_asn: Annotated[int, PropertyInfo(alias="involvedAsn")]
-    """ASN that is causing or affected by a route leak event"""
+    """ASN that is causing or affected by a route leak event."""
 
     involved_country: Annotated[str, PropertyInfo(alias="involvedCountry")]
-    """Country code of a involved ASN in a route leak event"""
+    """Country code of a involved ASN in a route leak event."""
 
     leak_asn: Annotated[int, PropertyInfo(alias="leakAsn")]
-    """The leaking AS of a route leak event"""
+    """The leaking AS of a route leak event."""
 
     page: int
-    """Current page number, starting from 1"""
+    """Current page number, starting from 1."""
 
     per_page: int
-    """Number of entries per page"""
+    """Number of entries per page."""
 
     sort_by: Annotated[Literal["ID", "LEAKS", "PEERS", "PREFIXES", "ORIGINS", "TIME"], PropertyInfo(alias="sortBy")]
-    """Sort events by field"""
+    """Sorts results by the specified field."""
 
     sort_order: Annotated[Literal["ASC", "DESC"], PropertyInfo(alias="sortOrder")]
-    """Sort order"""
+    """Sort order."""
diff --git a/src/cloudflare/types/radar/bgp/leaks/event_list_response.py b/src/cloudflare/types/radar/bgp/leaks/event_list_response.py
index 2a5447b0399..74f36728b13 100644
--- a/src/cloudflare/types/radar/bgp/leaks/event_list_response.py
+++ b/src/cloudflare/types/radar/bgp/leaks/event_list_response.py
@@ -4,10 +4,10 @@
 
 from ....._models import BaseModel
 
-__all__ = ["EventListResponse", "Result", "ResultASNInfo", "ResultEvent", "ResultInfo"]
+__all__ = ["EventListResponse", "ASNInfo", "Event"]
 
 
-class ResultASNInfo(BaseModel):
+class ASNInfo(BaseModel):
     asn: int
 
     country_code: str
@@ -15,7 +15,7 @@ class ResultASNInfo(BaseModel):
     org_name: str
 
 
-class ResultEvent(BaseModel):
+class Event(BaseModel):
     id: int
 
     countries: List[str]
@@ -43,25 +43,7 @@ class ResultEvent(BaseModel):
     prefix_count: int
 
 
-class Result(BaseModel):
-    asn_info: List[ResultASNInfo]
-
-    events: List[ResultEvent]
-
-
-class ResultInfo(BaseModel):
-    count: int
-
-    page: int
-
-    per_page: int
-
-    total_count: int
-
-
 class EventListResponse(BaseModel):
-    result: Result
-
-    result_info: ResultInfo
+    asn_info: List[ASNInfo]
 
-    success: bool
+    events: List[Event]
diff --git a/src/cloudflare/types/radar/bgp/route_ases_params.py b/src/cloudflare/types/radar/bgp/route_ases_params.py
index 734a74168f0..616dca6a21a 100644
--- a/src/cloudflare/types/radar/bgp/route_ases_params.py
+++ b/src/cloudflare/types/radar/bgp/route_ases_params.py
@@ -11,19 +11,19 @@
 
 class RouteAsesParams(TypedDict, total=False):
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
     location: str
-    """Location Alpha2 code."""
+    """Filters results by location. Specify an alpha-2 location code."""
 
     sort_by: Annotated[
         Literal["cone", "pfxs", "ipv4", "ipv6", "rpki_valid", "rpki_invalid", "rpki_unknown"],
         PropertyInfo(alias="sortBy"),
     ]
-    """Return order results by given type"""
+    """Sorts results by the specified field."""
 
-    sort_order: Annotated[Literal["asc", "desc"], PropertyInfo(alias="sortOrder")]
-    """Sort by value ascending or descending"""
+    sort_order: Annotated[Literal["ASC", "DESC"], PropertyInfo(alias="sortOrder")]
+    """Sort order."""
diff --git a/src/cloudflare/types/radar/bgp/route_ases_response.py b/src/cloudflare/types/radar/bgp/route_ases_response.py
index 56e851baf3d..7ef06651164 100644
--- a/src/cloudflare/types/radar/bgp/route_ases_response.py
+++ b/src/cloudflare/types/radar/bgp/route_ases_response.py
@@ -13,42 +13,42 @@ class ASN(BaseModel):
     asn: int
 
     cone_size: int = FieldInfo(alias="coneSize")
-    """AS's customer cone size"""
+    """AS's customer cone size."""
 
     country: str
-    """2-letter country code for the AS's registration country"""
+    """Alpha-2 code for the AS's registration country."""
 
     ipv4_count: int = FieldInfo(alias="ipv4Count")
-    """number of IPv4 addresses originated by the AS"""
+    """Number of IPv4 addresses originated by the AS."""
 
     ipv6_count: str = FieldInfo(alias="ipv6Count")
-    """number of IPv6 addresses originated by the AS"""
+    """Number of IPv6 addresses originated by the AS."""
 
     name: str
-    """name of the AS"""
+    """Name of the AS."""
 
     pfxs_count: int = FieldInfo(alias="pfxsCount")
-    """number of total IP prefixes originated by the AS"""
+    """Number of total IP prefixes originated by the AS."""
 
     rpki_invalid: int = FieldInfo(alias="rpkiInvalid")
-    """number of RPKI invalid prefixes originated by the AS"""
+    """Number of RPKI invalid prefixes originated by the AS."""
 
     rpki_unknown: int = FieldInfo(alias="rpkiUnknown")
-    """number of RPKI unknown prefixes originated by the AS"""
+    """Number of RPKI unknown prefixes originated by the AS."""
 
     rpki_valid: int = FieldInfo(alias="rpkiValid")
-    """number of RPKI valid prefixes originated by the AS"""
+    """Number of RPKI valid prefixes originated by the AS."""
 
 
 class Meta(BaseModel):
     data_time: str = FieldInfo(alias="dataTime")
-    """the timestamp of when the data is generated"""
+    """The timestamp of when the data is generated."""
 
     query_time: str = FieldInfo(alias="queryTime")
-    """the timestamp of the query"""
+    """The timestamp of the query."""
 
     total_peers: int = FieldInfo(alias="totalPeers")
-    """total number of route collector peers used to generate this data"""
+    """Total number of route collector peers used to generate this data."""
 
 
 class RouteAsesResponse(BaseModel):
diff --git a/src/cloudflare/types/radar/bgp/route_moas_params.py b/src/cloudflare/types/radar/bgp/route_moas_params.py
index 8bf9d86d6c6..f67930792b3 100644
--- a/src/cloudflare/types/radar/bgp/route_moas_params.py
+++ b/src/cloudflare/types/radar/bgp/route_moas_params.py
@@ -9,13 +9,12 @@
 
 class RouteMoasParams(TypedDict, total=False):
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     invalid_only: bool
-    """Lookup only RPKI invalid MOASes"""
+    """Lookup only RPKI invalid MOASes."""
 
     origin: int
-    """Lookup MOASes originated by the given ASN"""
+    """Lookup MOASes originated by the given ASN."""
 
     prefix: str
-    """Network prefix, IPv4 or IPv6."""
diff --git a/src/cloudflare/types/radar/bgp/route_pfx2as_params.py b/src/cloudflare/types/radar/bgp/route_pfx2as_params.py
index caa3a87e8b0..a606429132c 100644
--- a/src/cloudflare/types/radar/bgp/route_pfx2as_params.py
+++ b/src/cloudflare/types/radar/bgp/route_pfx2as_params.py
@@ -11,7 +11,7 @@
 
 class RoutePfx2asParams(TypedDict, total=False):
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     longest_prefix_match: Annotated[bool, PropertyInfo(alias="longestPrefixMatch")]
     """Return only results with the longest prefix match for the given prefix.
@@ -20,10 +20,9 @@ class RoutePfx2asParams(TypedDict, total=False):
     """
 
     origin: int
-    """Lookup prefixes originated by the given ASN"""
+    """Lookup prefixes originated by the given ASN."""
 
     prefix: str
-    """Network prefix, IPv4 or IPv6."""
 
     rpki_status: Annotated[Literal["VALID", "INVALID", "UNKNOWN"], PropertyInfo(alias="rpkiStatus")]
-    """Return only results with matching rpki status: valid, invalid or unknown"""
+    """Return only results with matching rpki status: valid, invalid or unknown."""
diff --git a/src/cloudflare/types/radar/bgp/route_realtime_params.py b/src/cloudflare/types/radar/bgp/route_realtime_params.py
new file mode 100644
index 00000000000..c3038bc0519
--- /dev/null
+++ b/src/cloudflare/types/radar/bgp/route_realtime_params.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["RouteRealtimeParams"]
+
+
+class RouteRealtimeParams(TypedDict, total=False):
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    prefix: str
diff --git a/src/cloudflare/types/radar/bgp/route_realtime_response.py b/src/cloudflare/types/radar/bgp/route_realtime_response.py
new file mode 100644
index 00000000000..03e831feffb
--- /dev/null
+++ b/src/cloudflare/types/radar/bgp/route_realtime_response.py
@@ -0,0 +1,104 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+
+from ...._models import BaseModel
+
+__all__ = ["RouteRealtimeResponse", "Meta", "MetaASNInfo", "MetaCollector", "MetaPrefixOrigin", "Route"]
+
+
+class MetaASNInfo(BaseModel):
+    as_name: str
+    """Name of the autonomous system."""
+
+    asn: int
+    """AS number."""
+
+    country_code: str
+    """Alpha-2 code for the AS's registration country."""
+
+    org_id: str
+    """Organization ID."""
+
+    org_name: str
+    """Organization name."""
+
+
+class MetaCollector(BaseModel):
+    collector: str
+    """Public route collector ID."""
+
+    latest_realtime_ts: str
+    """Latest real-time stream timestamp for this collector."""
+
+    latest_rib_ts: str
+    """Latest RIB dump MRT file timestamp for this collector."""
+
+    latest_updates_ts: str
+    """Latest BGP updates MRT file timestamp for this collector."""
+
+    peers_count: int
+    """Total number of collector peers used from this collector."""
+
+    peers_v4_count: int
+    """Total number of collector peers used from this collector for IPv4 prefixes."""
+
+    peers_v6_count: int
+    """Total number of collector peers used from this collector for IPv6 prefixes."""
+
+
+class MetaPrefixOrigin(BaseModel):
+    origin: int
+    """Origin ASN."""
+
+    prefix: str
+    """IP prefix of this query."""
+
+    rpki_validation: str
+    """Prefix-origin RPKI validation: valid, invalid, unknown."""
+
+    total_peers: int
+    """Total number of peers."""
+
+    total_visible: int
+    """Total number of peers seeing this prefix."""
+
+    visibility: float
+    """Ratio of peers seeing this prefix to total number of peers."""
+
+
+class Meta(BaseModel):
+    asn_info: List[MetaASNInfo]
+
+    collectors: List[MetaCollector]
+
+    data_time: str
+    """The most recent data timestamp for from the real-time sources."""
+
+    prefix_origins: List[MetaPrefixOrigin]
+
+    query_time: str
+    """The timestamp of this query."""
+
+
+class Route(BaseModel):
+    as_path: List[int]
+    """AS-level path for this route, from collector to origin."""
+
+    collector: str
+    """Public collector ID for this route."""
+
+    communities: List[str]
+    """BGP community values."""
+
+    prefix: str
+    """IP prefix of this query."""
+
+    timestamp: str
+    """Latest timestamp of change for this route."""
+
+
+class RouteRealtimeResponse(BaseModel):
+    meta: Meta
+
+    routes: List[Route]
diff --git a/src/cloudflare/types/radar/bgp/route_stats_params.py b/src/cloudflare/types/radar/bgp/route_stats_params.py
index 0cd7211c5b4..9bbe87d915f 100644
--- a/src/cloudflare/types/radar/bgp/route_stats_params.py
+++ b/src/cloudflare/types/radar/bgp/route_stats_params.py
@@ -9,10 +9,13 @@
 
 class RouteStatsParams(TypedDict, total=False):
     asn: int
-    """Single ASN as integer."""
+    """Filters results by Autonomous System.
+
+    Specify a single Autonomous System Number (ASN) as integer.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     location: str
-    """Location Alpha2 code."""
+    """Filters results by location. Specify an alpha-2 location code."""
diff --git a/src/cloudflare/types/radar/bgp/route_stats_response.py b/src/cloudflare/types/radar/bgp/route_stats_response.py
index a410062e4d5..7ccf3b286a2 100644
--- a/src/cloudflare/types/radar/bgp/route_stats_response.py
+++ b/src/cloudflare/types/radar/bgp/route_stats_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ...._models import BaseModel
 
 __all__ = ["RouteStatsResponse", "Meta", "Stats"]
diff --git a/src/cloudflare/types/radar/bgp/rpki/__init__.py b/src/cloudflare/types/radar/bgp/rpki/__init__.py
new file mode 100644
index 00000000000..c93307a5f29
--- /dev/null
+++ b/src/cloudflare/types/radar/bgp/rpki/__init__.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .aspa_changes_params import ASPAChangesParams as ASPAChangesParams
+from .aspa_snapshot_params import ASPASnapshotParams as ASPASnapshotParams
+from .aspa_changes_response import ASPAChangesResponse as ASPAChangesResponse
+from .aspa_snapshot_response import ASPASnapshotResponse as ASPASnapshotResponse
+from .aspa_timeseries_params import ASPATimeseriesParams as ASPATimeseriesParams
+from .aspa_timeseries_response import ASPATimeseriesResponse as ASPATimeseriesResponse
diff --git a/src/cloudflare/types/radar/bgp/rpki/aspa_changes_params.py b/src/cloudflare/types/radar/bgp/rpki/aspa_changes_params.py
new file mode 100644
index 00000000000..172fc6ed3bf
--- /dev/null
+++ b/src/cloudflare/types/radar/bgp/rpki/aspa_changes_params.py
@@ -0,0 +1,28 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ....._utils import PropertyInfo
+
+__all__ = ["ASPAChangesParams"]
+
+
+class ASPAChangesParams(TypedDict, total=False):
+    asn: int
+    """Filter changes involving this ASN (as customer or provider)."""
+
+    date_end: Annotated[Union[str, datetime], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_start: Annotated[Union[str, datetime], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range (inclusive)."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    include_asn_info: Annotated[bool, PropertyInfo(alias="includeAsnInfo")]
+    """Include ASN metadata (name, country) in response."""
diff --git a/src/cloudflare/types/radar/bgp/rpki/aspa_changes_response.py b/src/cloudflare/types/radar/bgp/rpki/aspa_changes_response.py
new file mode 100644
index 00000000000..d000338dd40
--- /dev/null
+++ b/src/cloudflare/types/radar/bgp/rpki/aspa_changes_response.py
@@ -0,0 +1,73 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = ["ASPAChangesResponse", "ASNInfo", "ASNInfo_13335", "Change", "ChangeEntry", "Meta"]
+
+
+class ASNInfo_13335(BaseModel):
+    asn: int
+    """ASN number."""
+
+    country: str
+    """Alpha-2 country code."""
+
+    name: str
+    """AS name."""
+
+
+class ASNInfo(BaseModel):
+    api_13335: ASNInfo_13335 = FieldInfo(alias="13335")
+
+
+class ChangeEntry(BaseModel):
+    customer_asn: int = FieldInfo(alias="customerAsn")
+    """The customer ASN affected."""
+
+    providers: List[int]
+
+    type: Literal["CustomerAdded", "CustomerRemoved", "ProvidersAdded", "ProvidersRemoved"]
+
+
+class Change(BaseModel):
+    customers_added: int = FieldInfo(alias="customersAdded")
+    """Number of new ASPA objects created."""
+
+    customers_removed: int = FieldInfo(alias="customersRemoved")
+    """Number of ASPA objects deleted."""
+
+    date: datetime
+    """Date of the changes in ISO 8601 format."""
+
+    entries: List[ChangeEntry]
+
+    providers_added: int = FieldInfo(alias="providersAdded")
+    """Number of providers added to existing objects."""
+
+    providers_removed: int = FieldInfo(alias="providersRemoved")
+    """Number of providers removed from existing objects."""
+
+    total_count: int = FieldInfo(alias="totalCount")
+    """Running total of active ASPA objects after this day."""
+
+
+class Meta(BaseModel):
+    data_time: datetime = FieldInfo(alias="dataTime")
+    """Timestamp of the underlying data."""
+
+    query_time: datetime = FieldInfo(alias="queryTime")
+    """Timestamp when the query was executed."""
+
+
+class ASPAChangesResponse(BaseModel):
+    asn_info: ASNInfo = FieldInfo(alias="asnInfo")
+
+    changes: List[Change]
+
+    meta: Meta
diff --git a/src/cloudflare/types/radar/bgp/rpki/aspa_snapshot_params.py b/src/cloudflare/types/radar/bgp/rpki/aspa_snapshot_params.py
new file mode 100644
index 00000000000..f7d04b5f1e4
--- /dev/null
+++ b/src/cloudflare/types/radar/bgp/rpki/aspa_snapshot_params.py
@@ -0,0 +1,28 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ....._utils import PropertyInfo
+
+__all__ = ["ASPASnapshotParams"]
+
+
+class ASPASnapshotParams(TypedDict, total=False):
+    customer_asn: Annotated[int, PropertyInfo(alias="customerAsn")]
+    """Filter by customer ASN (the ASN publishing the ASPA object)."""
+
+    date: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """Filters results by the specified datetime (ISO 8601)."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    include_asn_info: Annotated[bool, PropertyInfo(alias="includeAsnInfo")]
+    """Include ASN metadata (name, country) in response."""
+
+    provider_asn: Annotated[int, PropertyInfo(alias="providerAsn")]
+    """Filter by provider ASN (an authorized upstream provider in ASPA objects)."""
diff --git a/src/cloudflare/types/radar/bgp/rpki/aspa_snapshot_response.py b/src/cloudflare/types/radar/bgp/rpki/aspa_snapshot_response.py
new file mode 100644
index 00000000000..db5eb418e30
--- /dev/null
+++ b/src/cloudflare/types/radar/bgp/rpki/aspa_snapshot_response.py
@@ -0,0 +1,51 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = ["ASPASnapshotResponse", "ASNInfo", "ASNInfo_13335", "ASPAObject", "Meta"]
+
+
+class ASNInfo_13335(BaseModel):
+    asn: int
+    """ASN number."""
+
+    country: str
+    """Alpha-2 country code."""
+
+    name: str
+    """AS name."""
+
+
+class ASNInfo(BaseModel):
+    api_13335: ASNInfo_13335 = FieldInfo(alias="13335")
+
+
+class ASPAObject(BaseModel):
+    customer_asn: int = FieldInfo(alias="customerAsn")
+    """The customer ASN publishing the ASPA object."""
+
+    providers: List[int]
+
+
+class Meta(BaseModel):
+    data_time: datetime = FieldInfo(alias="dataTime")
+    """Timestamp of the underlying data."""
+
+    query_time: datetime = FieldInfo(alias="queryTime")
+    """Timestamp when the query was executed."""
+
+    total_count: int = FieldInfo(alias="totalCount")
+    """Total number of ASPA objects."""
+
+
+class ASPASnapshotResponse(BaseModel):
+    asn_info: ASNInfo = FieldInfo(alias="asnInfo")
+
+    aspa_objects: List[ASPAObject] = FieldInfo(alias="aspaObjects")
+
+    meta: Meta
diff --git a/src/cloudflare/types/radar/bgp/rpki/aspa_timeseries_params.py b/src/cloudflare/types/radar/bgp/rpki/aspa_timeseries_params.py
new file mode 100644
index 00000000000..0c430303d5c
--- /dev/null
+++ b/src/cloudflare/types/radar/bgp/rpki/aspa_timeseries_params.py
@@ -0,0 +1,38 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ....._types import SequenceNotStr
+from ....._utils import PropertyInfo
+
+__all__ = ["ASPATimeseriesParams"]
+
+
+class ASPATimeseriesParams(TypedDict, total=False):
+    date_end: Annotated[Union[str, datetime], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_start: Annotated[Union[str, datetime], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range (inclusive)."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 location codes.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    rir: List[Literal["RIPE_NCC", "ARIN", "APNIC", "LACNIC", "AFRINIC"]]
+    """Filter by Regional Internet Registry (RIR).
+
+    Multiple RIRs generate multiple series.
+    """
diff --git a/src/cloudflare/types/radar/bgp/rpki/aspa_timeseries_response.py b/src/cloudflare/types/radar/bgp/rpki/aspa_timeseries_response.py
new file mode 100644
index 00000000000..6a39e3d8475
--- /dev/null
+++ b/src/cloudflare/types/radar/bgp/rpki/aspa_timeseries_response.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = ["ASPATimeseriesResponse", "Meta", "Serie0"]
+
+
+class Meta(BaseModel):
+    data_time: datetime = FieldInfo(alias="dataTime")
+    """Timestamp of the underlying data."""
+
+    query_time: datetime = FieldInfo(alias="queryTime")
+    """Timestamp when the query was executed."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    values: List[str]
+
+
+class ASPATimeseriesResponse(BaseModel):
+    meta: Meta
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/bgp/top/ase_get_params.py b/src/cloudflare/types/radar/bgp/top/ase_get_params.py
index 0b3abb1528f..10e924bbe8b 100644
--- a/src/cloudflare/types/radar/bgp/top/ase_get_params.py
+++ b/src/cloudflare/types/radar/bgp/top/ase_get_params.py
@@ -2,65 +2,50 @@
 
 from __future__ import annotations
 
-from typing import List, Union, Iterable
+from typing import List, Union
 from datetime import datetime
-from typing_extensions import Literal, Required, Annotated, TypedDict
+from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
-__all__ = ["AseGetParams", "Prefix"]
+__all__ = ["AseGetParams"]
 
 
 class AseGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
-    prefix: Iterable[Prefix]
-    """Array of BGP network prefixes."""
+    prefix: SequenceNotStr[str]
+    """Filters results by BGP network prefix."""
 
     update_type: Annotated[List[Literal["ANNOUNCEMENT", "WITHDRAWAL"]], PropertyInfo(alias="updateType")]
-    """Array of BGP update types."""
-
-
-_PrefixReservedKeywords = TypedDict(
-    "_PrefixReservedKeywords",
-    {
-        "in": str,
-    },
-    total=False,
-)
-
-
-class Prefix(_PrefixReservedKeywords, total=False):
-    name: Required[str]
-
-    test: Required[float]
-
-    type: str
-    """Network prefix, IPv4 or IPv6."""
+    """Filters results by BGP update type."""
diff --git a/src/cloudflare/types/radar/bgp/top/ase_prefixes_params.py b/src/cloudflare/types/radar/bgp/top/ase_prefixes_params.py
index c9c9492ee5c..b54a76cf9bb 100644
--- a/src/cloudflare/types/radar/bgp/top/ase_prefixes_params.py
+++ b/src/cloudflare/types/radar/bgp/top/ase_prefixes_params.py
@@ -12,7 +12,7 @@ class AsePrefixesParams(TypedDict, total=False):
     """Alpha-2 country code."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Maximum number of ASes to return"""
+    """Maximum number of ASes to return."""
diff --git a/src/cloudflare/types/radar/bgp/top_prefixes_params.py b/src/cloudflare/types/radar/bgp/top_prefixes_params.py
index a73c20fb3c6..7e21901a746 100644
--- a/src/cloudflare/types/radar/bgp/top_prefixes_params.py
+++ b/src/cloudflare/types/radar/bgp/top_prefixes_params.py
@@ -6,40 +6,43 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TopPrefixesParams"]
 
 
 class TopPrefixesParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     update_type: Annotated[List[Literal["ANNOUNCEMENT", "WITHDRAWAL"]], PropertyInfo(alias="updateType")]
-    """Array of BGP update types."""
+    """Filters results by BGP update type."""
diff --git a/src/cloudflare/types/radar/bgp/top_prefixes_response.py b/src/cloudflare/types/radar/bgp/top_prefixes_response.py
index 9f5e92716b7..8565bf7da6f 100644
--- a/src/cloudflare/types/radar/bgp/top_prefixes_response.py
+++ b/src/cloudflare/types/radar/bgp/top_prefixes_response.py
@@ -26,6 +26,7 @@ class Top0(BaseModel):
     prefix: str
 
     value: str
+    """A numeric string."""
 
 
 class TopPrefixesResponse(BaseModel):
diff --git a/src/cloudflare/types/radar/bgp_timeseries_params.py b/src/cloudflare/types/radar/bgp_timeseries_params.py
index 2e6c49dd837..da5a219bdec 100644
--- a/src/cloudflare/types/radar/bgp_timeseries_params.py
+++ b/src/cloudflare/types/radar/bgp_timeseries_params.py
@@ -2,69 +2,54 @@
 
 from __future__ import annotations
 
-from typing import List, Union, Iterable
+from typing import List, Union
 from datetime import datetime
-from typing_extensions import Literal, Required, Annotated, TypedDict
+from typing_extensions import Literal, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 
-__all__ = ["BGPTimeseriesParams", "Prefix"]
+__all__ = ["BGPTimeseriesParams"]
 
 
 class BGPTimeseriesParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
-    prefix: Iterable[Prefix]
-    """Array of BGP network prefixes."""
+    prefix: SequenceNotStr[str]
+    """Filters results by BGP network prefix."""
 
     update_type: Annotated[List[Literal["ANNOUNCEMENT", "WITHDRAWAL"]], PropertyInfo(alias="updateType")]
-    """Array of BGP update types."""
-
-
-_PrefixReservedKeywords = TypedDict(
-    "_PrefixReservedKeywords",
-    {
-        "in": str,
-    },
-    total=False,
-)
-
-
-class Prefix(_PrefixReservedKeywords, total=False):
-    name: Required[str]
-
-    test: Required[float]
-
-    type: str
-    """Network prefix, IPv4 or IPv6."""
+    """Filters results by BGP update type."""
diff --git a/src/cloudflare/types/radar/bgp_timeseries_response.py b/src/cloudflare/types/radar/bgp_timeseries_response.py
index b3ca270daa5..3d1de097e18 100644
--- a/src/cloudflare/types/radar/bgp_timeseries_response.py
+++ b/src/cloudflare/types/radar/bgp_timeseries_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,52 +11,86 @@
 __all__ = [
     "BGPTimeseriesResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
     "Serie0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
 
 class Meta(BaseModel):
-    agg_interval: str = FieldInfo(alias="aggInterval")
+    agg_interval: Literal["15m", "1h", "1d", "1w"] = FieldInfo(alias="aggInterval")
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
 
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
     last_updated: datetime = FieldInfo(alias="lastUpdated")
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
-
 
 class Serie0(BaseModel):
     timestamps: List[datetime]
diff --git a/src/cloudflare/types/radar/bot_get_params.py b/src/cloudflare/types/radar/bot_get_params.py
new file mode 100644
index 00000000000..85b78dcff72
--- /dev/null
+++ b/src/cloudflare/types/radar/bot_get_params.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["BotGetParams"]
+
+
+class BotGetParams(TypedDict, total=False):
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
diff --git a/src/cloudflare/types/radar/bot_get_response.py b/src/cloudflare/types/radar/bot_get_response.py
new file mode 100644
index 00000000000..cfee620e343
--- /dev/null
+++ b/src/cloudflare/types/radar/bot_get_response.py
@@ -0,0 +1,40 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["BotGetResponse", "Bot"]
+
+
+class Bot(BaseModel):
+    category: str
+    """The category of the bot."""
+
+    description: str
+    """A summary for the bot (e.g., purpose)."""
+
+    kind: str
+    """The kind of the bot."""
+
+    name: str
+    """The name of the bot."""
+
+    operator: str
+    """The organization that owns and operates the bot."""
+
+    operator_url: str = FieldInfo(alias="operatorUrl")
+    """The link to the bot documentation."""
+
+    slug: str
+    """A kebab-case identifier derived from the bot name."""
+
+    user_agent_patterns: List[str] = FieldInfo(alias="userAgentPatterns")
+
+    user_agents: List[str] = FieldInfo(alias="userAgents")
+
+
+class BotGetResponse(BaseModel):
+    bot: Bot
diff --git a/src/cloudflare/types/radar/bot_list_params.py b/src/cloudflare/types/radar/bot_list_params.py
new file mode 100644
index 00000000000..5662e048da3
--- /dev/null
+++ b/src/cloudflare/types/radar/bot_list_params.py
@@ -0,0 +1,52 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["BotListParams"]
+
+
+class BotListParams(TypedDict, total=False):
+    bot_category: Annotated[
+        Literal[
+            "SEARCH_ENGINE_CRAWLER",
+            "SEARCH_ENGINE_OPTIMIZATION",
+            "MONITORING_AND_ANALYTICS",
+            "ADVERTISING_AND_MARKETING",
+            "SOCIAL_MEDIA_MARKETING",
+            "PAGE_PREVIEW",
+            "ACADEMIC_RESEARCH",
+            "SECURITY",
+            "ACCESSIBILITY",
+            "WEBHOOKS",
+            "FEED_FETCHER",
+            "AI_CRAWLER",
+            "AGGREGATOR",
+            "AI_ASSISTANT",
+            "AI_SEARCH",
+            "ARCHIVER",
+        ],
+        PropertyInfo(alias="botCategory"),
+    ]
+    """Filters results by bot category."""
+
+    bot_operator: Annotated[str, PropertyInfo(alias="botOperator")]
+    """Filters results by bot operator."""
+
+    bot_verification_status: Annotated[Literal["VERIFIED"], PropertyInfo(alias="botVerificationStatus")]
+    """Filters results by bot verification status."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    kind: Literal["AGENT", "BOT"]
+    """Filters results by bot kind."""
+
+    limit: int
+    """Limits the number of objects returned in the response."""
+
+    offset: int
+    """Skips the specified number of objects before fetching the results."""
diff --git a/src/cloudflare/types/radar/bot_list_response.py b/src/cloudflare/types/radar/bot_list_response.py
new file mode 100644
index 00000000000..ac0fad6ae8c
--- /dev/null
+++ b/src/cloudflare/types/radar/bot_list_response.py
@@ -0,0 +1,35 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["BotListResponse", "Bot"]
+
+
+class Bot(BaseModel):
+    category: str
+    """The category of the bot."""
+
+    description: str
+    """A summary for the bot (e.g., purpose)."""
+
+    kind: str
+    """The kind of the bot."""
+
+    name: str
+    """The name of the bot."""
+
+    operator: str
+    """The organization that owns and operates the bot."""
+
+    slug: str
+    """A kebab-case identifier derived from the bot name."""
+
+    user_agent_patterns: List[str] = FieldInfo(alias="userAgentPatterns")
+
+
+class BotListResponse(BaseModel):
+    bots: List[Bot]
diff --git a/src/cloudflare/types/radar/bot_summary_params.py b/src/cloudflare/types/radar/bot_summary_params.py
new file mode 100644
index 00000000000..3e502418601
--- /dev/null
+++ b/src/cloudflare/types/radar/bot_summary_params.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["BotSummaryParams"]
+
+
+class BotSummaryParams(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    bot: SequenceNotStr[str]
+    """Filters results by bot name."""
+
+    bot_category: Annotated[
+        List[
+            Literal[
+                "SEARCH_ENGINE_CRAWLER",
+                "SEARCH_ENGINE_OPTIMIZATION",
+                "MONITORING_AND_ANALYTICS",
+                "ADVERTISING_AND_MARKETING",
+                "SOCIAL_MEDIA_MARKETING",
+                "PAGE_PREVIEW",
+                "ACADEMIC_RESEARCH",
+                "SECURITY",
+                "ACCESSIBILITY",
+                "WEBHOOKS",
+                "FEED_FETCHER",
+                "AI_CRAWLER",
+                "AGGREGATOR",
+                "AI_ASSISTANT",
+                "AI_SEARCH",
+                "ARCHIVER",
+            ]
+        ],
+        PropertyInfo(alias="botCategory"),
+    ]
+    """Filters results by bot category."""
+
+    bot_kind: Annotated[List[Literal["AGENT", "BOT"]], PropertyInfo(alias="botKind")]
+    """Filters results by bot kind."""
+
+    bot_operator: Annotated[SequenceNotStr[str], PropertyInfo(alias="botOperator")]
+    """Filters results by bot operator."""
+
+    bot_verification_status: Annotated[List[Literal["VERIFIED"]], PropertyInfo(alias="botVerificationStatus")]
+    """Filters results by bot verification status (Verified vs. Unverified)."""
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/bot_summary_response.py b/src/cloudflare/types/radar/bot_summary_response.py
new file mode 100644
index 00000000000..6bccc521e67
--- /dev/null
+++ b/src/cloudflare/types/radar/bot_summary_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "BotSummaryResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class BotSummaryResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/bot_timeseries_groups_params.py b/src/cloudflare/types/radar/bot_timeseries_groups_params.py
new file mode 100644
index 00000000000..e7de5263708
--- /dev/null
+++ b/src/cloudflare/types/radar/bot_timeseries_groups_params.py
@@ -0,0 +1,109 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["BotTimeseriesGroupsParams"]
+
+
+class BotTimeseriesGroupsParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    bot: SequenceNotStr[str]
+    """Filters results by bot name."""
+
+    bot_category: Annotated[
+        List[
+            Literal[
+                "SEARCH_ENGINE_CRAWLER",
+                "SEARCH_ENGINE_OPTIMIZATION",
+                "MONITORING_AND_ANALYTICS",
+                "ADVERTISING_AND_MARKETING",
+                "SOCIAL_MEDIA_MARKETING",
+                "PAGE_PREVIEW",
+                "ACADEMIC_RESEARCH",
+                "SECURITY",
+                "ACCESSIBILITY",
+                "WEBHOOKS",
+                "FEED_FETCHER",
+                "AI_CRAWLER",
+                "AGGREGATOR",
+                "AI_ASSISTANT",
+                "AI_SEARCH",
+                "ARCHIVER",
+            ]
+        ],
+        PropertyInfo(alias="botCategory"),
+    ]
+    """Filters results by bot category."""
+
+    bot_kind: Annotated[List[Literal["AGENT", "BOT"]], PropertyInfo(alias="botKind")]
+    """Filters results by bot kind."""
+
+    bot_operator: Annotated[SequenceNotStr[str], PropertyInfo(alias="botOperator")]
+    """Filters results by bot operator."""
+
+    bot_verification_status: Annotated[List[Literal["VERIFIED"]], PropertyInfo(alias="botVerificationStatus")]
+    """Filters results by bot verification status (Verified vs. Unverified)."""
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/bot_timeseries_groups_response.py b/src/cloudflare/types/radar/bot_timeseries_groups_response.py
new file mode 100644
index 00000000000..5f485ac4752
--- /dev/null
+++ b/src/cloudflare/types/radar/bot_timeseries_groups_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "BotTimeseriesGroupsResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class BotTimeseriesGroupsResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/bot_timeseries_params.py b/src/cloudflare/types/radar/bot_timeseries_params.py
new file mode 100644
index 00000000000..b15c9d97b0d
--- /dev/null
+++ b/src/cloudflare/types/radar/bot_timeseries_params.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["BotTimeseriesParams"]
+
+
+class BotTimeseriesParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    bot: SequenceNotStr[str]
+    """Filters results by bot name."""
+
+    bot_category: Annotated[
+        List[
+            Literal[
+                "SEARCH_ENGINE_CRAWLER",
+                "SEARCH_ENGINE_OPTIMIZATION",
+                "MONITORING_AND_ANALYTICS",
+                "ADVERTISING_AND_MARKETING",
+                "SOCIAL_MEDIA_MARKETING",
+                "PAGE_PREVIEW",
+                "ACADEMIC_RESEARCH",
+                "SECURITY",
+                "ACCESSIBILITY",
+                "WEBHOOKS",
+                "FEED_FETCHER",
+                "AI_CRAWLER",
+                "AGGREGATOR",
+                "AI_ASSISTANT",
+                "AI_SEARCH",
+                "ARCHIVER",
+            ]
+        ],
+        PropertyInfo(alias="botCategory"),
+    ]
+    """Filters results by bot category."""
+
+    bot_kind: Annotated[List[Literal["AGENT", "BOT"]], PropertyInfo(alias="botKind")]
+    """Filters results by bot kind."""
+
+    bot_operator: Annotated[SequenceNotStr[str], PropertyInfo(alias="botOperator")]
+    """Filters results by bot operator."""
+
+    bot_verification_status: Annotated[List[Literal["VERIFIED"]], PropertyInfo(alias="botVerificationStatus")]
+    """Filters results by bot verification status (Verified vs. Unverified)."""
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/bot_timeseries_response.py b/src/cloudflare/types/radar/bot_timeseries_response.py
new file mode 100644
index 00000000000..a9bdd0830c1
--- /dev/null
+++ b/src/cloudflare/types/radar/bot_timeseries_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "BotTimeseriesResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "BotTimeseriesResponseItem",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class BotTimeseriesResponseItem(BaseModel):
+    timestamps: List[datetime]
+
+    values: List[str]
+
+
+class BotTimeseriesResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, BotTimeseriesResponseItem] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> BotTimeseriesResponseItem: ...
+    else:
+        __pydantic_extra__: Dict[str, BotTimeseriesResponseItem]
diff --git a/src/cloudflare/types/radar/bots/__init__.py b/src/cloudflare/types/radar/bots/__init__.py
new file mode 100644
index 00000000000..4dd0e4c99e7
--- /dev/null
+++ b/src/cloudflare/types/radar/bots/__init__.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .web_crawler_summary_params import WebCrawlerSummaryParams as WebCrawlerSummaryParams
+from .web_crawler_summary_response import WebCrawlerSummaryResponse as WebCrawlerSummaryResponse
+from .web_crawler_timeseries_groups_params import WebCrawlerTimeseriesGroupsParams as WebCrawlerTimeseriesGroupsParams
+from .web_crawler_timeseries_groups_response import (
+    WebCrawlerTimeseriesGroupsResponse as WebCrawlerTimeseriesGroupsResponse,
+)
diff --git a/src/cloudflare/types/radar/bots/web_crawler_summary_params.py b/src/cloudflare/types/radar/bots/web_crawler_summary_params.py
new file mode 100644
index 00000000000..e5656636e73
--- /dev/null
+++ b/src/cloudflare/types/radar/bots/web_crawler_summary_params.py
@@ -0,0 +1,55 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["WebCrawlerSummaryParams"]
+
+
+class WebCrawlerSummaryParams(TypedDict, total=False):
+    bot_operator: Annotated[SequenceNotStr[str], PropertyInfo(alias="botOperator")]
+    """Filters results by bot operator."""
+
+    client_type: Annotated[
+        List[Literal["HUMAN", "NON_AI_BOT", "AI_BOT", "MIXED_PURPOSE"]], PropertyInfo(alias="clientType")
+    ]
+    """Filters results by agent type."""
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    industry: SequenceNotStr[str]
+    """Filters results by industry."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    vertical: SequenceNotStr[str]
+    """Filters results by vertical."""
diff --git a/src/cloudflare/types/radar/bots/web_crawler_summary_response.py b/src/cloudflare/types/radar/bots/web_crawler_summary_response.py
new file mode 100644
index 00000000000..f096a53432f
--- /dev/null
+++ b/src/cloudflare/types/radar/bots/web_crawler_summary_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "WebCrawlerSummaryResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class WebCrawlerSummaryResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/bots/web_crawler_timeseries_groups_params.py b/src/cloudflare/types/radar/bots/web_crawler_timeseries_groups_params.py
new file mode 100644
index 00000000000..33ebec1e82f
--- /dev/null
+++ b/src/cloudflare/types/radar/bots/web_crawler_timeseries_groups_params.py
@@ -0,0 +1,62 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["WebCrawlerTimeseriesGroupsParams"]
+
+
+class WebCrawlerTimeseriesGroupsParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    bot_operator: Annotated[SequenceNotStr[str], PropertyInfo(alias="botOperator")]
+    """Filters results by bot operator."""
+
+    client_type: Annotated[
+        List[Literal["HUMAN", "NON_AI_BOT", "AI_BOT", "MIXED_PURPOSE"]], PropertyInfo(alias="clientType")
+    ]
+    """Filters results by agent type."""
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    industry: SequenceNotStr[str]
+    """Filters results by industry."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    vertical: SequenceNotStr[str]
+    """Filters results by vertical."""
diff --git a/src/cloudflare/types/radar/bots/web_crawler_timeseries_groups_response.py b/src/cloudflare/types/radar/bots/web_crawler_timeseries_groups_response.py
new file mode 100644
index 00000000000..1f581b30554
--- /dev/null
+++ b/src/cloudflare/types/radar/bots/web_crawler_timeseries_groups_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "WebCrawlerTimeseriesGroupsResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class WebCrawlerTimeseriesGroupsResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/ct/__init__.py b/src/cloudflare/types/radar/ct/__init__.py
new file mode 100644
index 00000000000..bde33ba58b3
--- /dev/null
+++ b/src/cloudflare/types/radar/ct/__init__.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .log_get_params import LogGetParams as LogGetParams
+from .log_list_params import LogListParams as LogListParams
+from .log_get_response import LogGetResponse as LogGetResponse
+from .log_list_response import LogListResponse as LogListResponse
+from .authority_get_params import AuthorityGetParams as AuthorityGetParams
+from .authority_list_params import AuthorityListParams as AuthorityListParams
+from .authority_get_response import AuthorityGetResponse as AuthorityGetResponse
+from .authority_list_response import AuthorityListResponse as AuthorityListResponse
diff --git a/src/cloudflare/types/radar/ct/authority_get_params.py b/src/cloudflare/types/radar/ct/authority_get_params.py
new file mode 100644
index 00000000000..556cc08bd9c
--- /dev/null
+++ b/src/cloudflare/types/radar/ct/authority_get_params.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["AuthorityGetParams"]
+
+
+class AuthorityGetParams(TypedDict, total=False):
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
diff --git a/src/cloudflare/types/radar/ct/authority_get_response.py b/src/cloudflare/types/radar/ct/authority_get_response.py
new file mode 100644
index 00000000000..6cfa20b18c5
--- /dev/null
+++ b/src/cloudflare/types/radar/ct/authority_get_response.py
@@ -0,0 +1,99 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["AuthorityGetResponse", "CertificateAuthority", "CertificateAuthorityRelated"]
+
+
+class CertificateAuthorityRelated(BaseModel):
+    certificate_record_type: Literal["ROOT_CERTIFICATE", "INTERMEDIATE_CERTIFICATE"] = FieldInfo(
+        alias="certificateRecordType"
+    )
+    """Specifies the type of certificate in the trust chain."""
+
+    name: str
+    """The full name of the certificate authority (CA)."""
+
+    revocation_status: Literal["NOT_REVOKED", "REVOKED", "PARENT_CERT_REVOKED"] = FieldInfo(alias="revocationStatus")
+    """The current revocation status of a Certificate Authority (CA) certificate."""
+
+    sha256_fingerprint: str = FieldInfo(alias="sha256Fingerprint")
+    """The SHA-256 fingerprint of the intermediate certificate."""
+
+
+class CertificateAuthority(BaseModel):
+    apple_status: Literal[
+        "INCLUDED", "NOT_YET_INCLUDED", "NOT_INCLUDED", "NOT_BEFORE", "REMOVED", "DISABLED", "BLOCKED"
+    ] = FieldInfo(alias="appleStatus")
+    """The inclusion status of a Certificate Authority (CA) in the trust store."""
+
+    authority_key_identifier: str = FieldInfo(alias="authorityKeyIdentifier")
+    """The authorityKeyIdentifier value extracted from the certificate PEM."""
+
+    certificate_record_type: Literal["ROOT_CERTIFICATE", "INTERMEDIATE_CERTIFICATE"] = FieldInfo(
+        alias="certificateRecordType"
+    )
+    """Specifies the type of certificate in the trust chain."""
+
+    chrome_status: Literal[
+        "INCLUDED", "NOT_YET_INCLUDED", "NOT_INCLUDED", "NOT_BEFORE", "REMOVED", "DISABLED", "BLOCKED"
+    ] = FieldInfo(alias="chromeStatus")
+    """The inclusion status of a Certificate Authority (CA) in the trust store."""
+
+    country: str
+    """The two-letter ISO country code where the CA organization is based."""
+
+    country_name: str = FieldInfo(alias="countryName")
+    """The full country name corresponding to the country code."""
+
+    microsoft_status: Literal[
+        "INCLUDED", "NOT_YET_INCLUDED", "NOT_INCLUDED", "NOT_BEFORE", "REMOVED", "DISABLED", "BLOCKED"
+    ] = FieldInfo(alias="microsoftStatus")
+    """The inclusion status of a Certificate Authority (CA) in the trust store."""
+
+    mozilla_status: Literal[
+        "INCLUDED", "NOT_YET_INCLUDED", "NOT_INCLUDED", "NOT_BEFORE", "REMOVED", "DISABLED", "BLOCKED"
+    ] = FieldInfo(alias="mozillaStatus")
+    """The inclusion status of a Certificate Authority (CA) in the trust store."""
+
+    name: str
+    """The full name of the certificate authority (CA)."""
+
+    owner: str
+    """The organization that owns and operates the CA."""
+
+    parent_name: str = FieldInfo(alias="parentName")
+    """
+    The name of the parent/root certificate authority that issued this intermediate
+    certificate.
+    """
+
+    parent_sha256_fingerprint: str = FieldInfo(alias="parentSha256Fingerprint")
+    """The SHA-256 fingerprint of the parent certificate."""
+
+    related: List[CertificateAuthorityRelated]
+    """CAs from the same owner."""
+
+    revocation_status: Literal["NOT_REVOKED", "REVOKED", "PARENT_CERT_REVOKED"] = FieldInfo(alias="revocationStatus")
+    """The current revocation status of a Certificate Authority (CA) certificate."""
+
+    sha256_fingerprint: str = FieldInfo(alias="sha256Fingerprint")
+    """The SHA-256 fingerprint of the intermediate certificate."""
+
+    subject_key_identifier: str = FieldInfo(alias="subjectKeyIdentifier")
+    """The subjectKeyIdentifier value extracted from the certificate PEM."""
+
+    valid_from: str = FieldInfo(alias="validFrom")
+    """The start date of the certificate’s validity period (ISO format)."""
+
+    valid_to: str = FieldInfo(alias="validTo")
+    """The end date of the certificate’s validity period (ISO format)."""
+
+
+class AuthorityGetResponse(BaseModel):
+    certificate_authority: CertificateAuthority = FieldInfo(alias="certificateAuthority")
diff --git a/src/cloudflare/types/radar/ct/authority_list_params.py b/src/cloudflare/types/radar/ct/authority_list_params.py
new file mode 100644
index 00000000000..c8f2f046527
--- /dev/null
+++ b/src/cloudflare/types/radar/ct/authority_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["AuthorityListParams"]
+
+
+class AuthorityListParams(TypedDict, total=False):
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit: int
+    """Limits the number of objects returned in the response."""
+
+    offset: int
+    """Skips the specified number of objects before fetching the results."""
diff --git a/src/cloudflare/types/radar/ct/authority_list_response.py b/src/cloudflare/types/radar/ct/authority_list_response.py
new file mode 100644
index 00000000000..af088f81185
--- /dev/null
+++ b/src/cloudflare/types/radar/ct/authority_list_response.py
@@ -0,0 +1,48 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["AuthorityListResponse", "CertificateAuthority"]
+
+
+class CertificateAuthority(BaseModel):
+    certificate_record_type: Literal["ROOT_CERTIFICATE", "INTERMEDIATE_CERTIFICATE"] = FieldInfo(
+        alias="certificateRecordType"
+    )
+    """Specifies the type of certificate in the trust chain."""
+
+    country: str
+    """The two-letter ISO country code where the CA organization is based."""
+
+    country_name: str = FieldInfo(alias="countryName")
+    """The full country name corresponding to the country code."""
+
+    name: str
+    """The full name of the certificate authority (CA)."""
+
+    owner: str
+    """The organization that owns and operates the CA."""
+
+    parent_name: str = FieldInfo(alias="parentName")
+    """
+    The name of the parent/root certificate authority that issued this intermediate
+    certificate.
+    """
+
+    parent_sha256_fingerprint: str = FieldInfo(alias="parentSha256Fingerprint")
+    """The SHA-256 fingerprint of the parent certificate."""
+
+    revocation_status: Literal["NOT_REVOKED", "REVOKED", "PARENT_CERT_REVOKED"] = FieldInfo(alias="revocationStatus")
+    """The current revocation status of a Certificate Authority (CA) certificate."""
+
+    sha256_fingerprint: str = FieldInfo(alias="sha256Fingerprint")
+    """The SHA-256 fingerprint of the intermediate certificate."""
+
+
+class AuthorityListResponse(BaseModel):
+    certificate_authorities: List[CertificateAuthority] = FieldInfo(alias="certificateAuthorities")
diff --git a/src/cloudflare/types/radar/ct/log_get_params.py b/src/cloudflare/types/radar/ct/log_get_params.py
new file mode 100644
index 00000000000..06b0cd1fe90
--- /dev/null
+++ b/src/cloudflare/types/radar/ct/log_get_params.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["LogGetParams"]
+
+
+class LogGetParams(TypedDict, total=False):
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
diff --git a/src/cloudflare/types/radar/ct/log_get_response.py b/src/cloudflare/types/radar/ct/log_get_response.py
new file mode 100644
index 00000000000..fa3e7e20cfa
--- /dev/null
+++ b/src/cloudflare/types/radar/ct/log_get_response.py
@@ -0,0 +1,127 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "LogGetResponse",
+    "CertificateLog",
+    "CertificateLogPerformance",
+    "CertificateLogPerformanceEndpoint",
+    "CertificateLogRelated",
+]
+
+
+class CertificateLogPerformanceEndpoint(BaseModel):
+    endpoint: Literal[
+        "add-chain (new)",
+        "add-chain (old)",
+        "add-pre-chain (new)",
+        "add-pre-chain (old)",
+        "get-entries",
+        "get-roots",
+        "get-sth",
+    ]
+    """The certificate log endpoint names used in performance metrics."""
+
+    response_time: float = FieldInfo(alias="responseTime")
+
+    uptime: float
+
+
+class CertificateLogPerformance(BaseModel):
+    """Log performance metrics, including averages and per-endpoint details."""
+
+    endpoints: List[CertificateLogPerformanceEndpoint]
+
+    response_time: float = FieldInfo(alias="responseTime")
+
+    uptime: float
+
+
+class CertificateLogRelated(BaseModel):
+    description: str
+    """A brief description of the certificate log."""
+
+    end_exclusive: datetime = FieldInfo(alias="endExclusive")
+    """The end date and time for when the log will stop accepting certificates."""
+
+    slug: str
+    """A URL-friendly, kebab-case identifier for the certificate log."""
+
+    start_inclusive: datetime = FieldInfo(alias="startInclusive")
+    """The start date and time for when the log starts accepting certificates."""
+
+    state: Literal["USABLE", "PENDING", "QUALIFIED", "READ_ONLY", "RETIRED", "REJECTED"]
+    """The current state of the certificate log.
+
+    More details about log states can be found here:
+    https://googlechrome.github.io/CertificateTransparency/log_states.html
+    """
+
+
+class CertificateLog(BaseModel):
+    api: Literal["RFC6962", "STATIC"]
+    """The API standard that the certificate log follows."""
+
+    avg_throughput: float = FieldInfo(alias="avgThroughput")
+    """
+    The average throughput of the CT log, measured in certificates per hour
+    (certs/hour).
+    """
+
+    description: str
+    """A brief description of the certificate log."""
+
+    end_exclusive: datetime = FieldInfo(alias="endExclusive")
+    """The end date and time for when the log will stop accepting certificates."""
+
+    last_update: datetime = FieldInfo(alias="lastUpdate")
+    """Timestamp of the most recent update to the CT log."""
+
+    operator: str
+    """The organization responsible for operating the certificate log."""
+
+    performance: Optional[CertificateLogPerformance] = None
+    """Log performance metrics, including averages and per-endpoint details."""
+
+    related: List[CertificateLogRelated]
+    """Logs from the same operator."""
+
+    slug: str
+    """A URL-friendly, kebab-case identifier for the certificate log."""
+
+    start_inclusive: datetime = FieldInfo(alias="startInclusive")
+    """The start date and time for when the log starts accepting certificates."""
+
+    state: Literal["USABLE", "PENDING", "QUALIFIED", "READ_ONLY", "RETIRED", "REJECTED"]
+    """The current state of the certificate log.
+
+    More details about log states can be found here:
+    https://googlechrome.github.io/CertificateTransparency/log_states.html
+    """
+
+    state_timestamp: datetime = FieldInfo(alias="stateTimestamp")
+    """Timestamp of when the log state was last updated."""
+
+    submittable_cert_count: Optional[str] = FieldInfo(alias="submittableCertCount", default=None)
+    """
+    Number of certificates that are eligible for inclusion to this log but have not
+    been included yet. Based on certificates signed by trusted root CAs within the
+    log's accepted date range.
+    """
+
+    submitted_cert_count: Optional[str] = FieldInfo(alias="submittedCertCount", default=None)
+    """Number of certificates already included in this CT log."""
+
+    url: str
+    """The URL for the certificate log."""
+
+
+class LogGetResponse(BaseModel):
+    certificate_log: CertificateLog = FieldInfo(alias="certificateLog")
diff --git a/src/cloudflare/types/radar/ct/log_list_params.py b/src/cloudflare/types/radar/ct/log_list_params.py
new file mode 100644
index 00000000000..6de36c7c562
--- /dev/null
+++ b/src/cloudflare/types/radar/ct/log_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["LogListParams"]
+
+
+class LogListParams(TypedDict, total=False):
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit: int
+    """Limits the number of objects returned in the response."""
+
+    offset: int
+    """Skips the specified number of objects before fetching the results."""
diff --git a/src/cloudflare/types/radar/ct/log_list_response.py b/src/cloudflare/types/radar/ct/log_list_response.py
new file mode 100644
index 00000000000..ad3bb790595
--- /dev/null
+++ b/src/cloudflare/types/radar/ct/log_list_response.py
@@ -0,0 +1,48 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["LogListResponse", "CertificateLog"]
+
+
+class CertificateLog(BaseModel):
+    api: Literal["RFC6962", "STATIC"]
+    """The API standard that the certificate log follows."""
+
+    description: str
+    """A brief description of the certificate log."""
+
+    end_exclusive: datetime = FieldInfo(alias="endExclusive")
+    """The end date and time for when the log will stop accepting certificates."""
+
+    operator: str
+    """The organization responsible for operating the certificate log."""
+
+    slug: str
+    """A URL-friendly, kebab-case identifier for the certificate log."""
+
+    start_inclusive: datetime = FieldInfo(alias="startInclusive")
+    """The start date and time for when the log starts accepting certificates."""
+
+    state: Literal["USABLE", "PENDING", "QUALIFIED", "READ_ONLY", "RETIRED", "REJECTED"]
+    """The current state of the certificate log.
+
+    More details about log states can be found here:
+    https://googlechrome.github.io/CertificateTransparency/log_states.html
+    """
+
+    state_timestamp: datetime = FieldInfo(alias="stateTimestamp")
+    """Timestamp of when the log state was last updated."""
+
+    url: str
+    """The URL for the certificate log."""
+
+
+class LogListResponse(BaseModel):
+    certificate_logs: List[CertificateLog] = FieldInfo(alias="certificateLogs")
diff --git a/src/cloudflare/types/radar/ct_summary_params.py b/src/cloudflare/types/radar/ct_summary_params.py
new file mode 100644
index 00000000000..a74fc5de436
--- /dev/null
+++ b/src/cloudflare/types/radar/ct_summary_params.py
@@ -0,0 +1,132 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["CTSummaryParams"]
+
+
+class CTSummaryParams(TypedDict, total=False):
+    ca: SequenceNotStr[str]
+    """Filters results by certificate authority."""
+
+    ca_owner: Annotated[SequenceNotStr[str], PropertyInfo(alias="caOwner")]
+    """Filters results by certificate authority owner."""
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    duration: List[
+        Literal[
+            "LTE_3D",
+            "GT_3D_LTE_7D",
+            "GT_7D_LTE_10D",
+            "GT_10D_LTE_47D",
+            "GT_47D_LTE_100D",
+            "GT_100D_LTE_200D",
+            "GT_200D",
+        ]
+    ]
+    """Filters results by certificate duration."""
+
+    entry_type: Annotated[List[Literal["PRECERTIFICATE", "CERTIFICATE"]], PropertyInfo(alias="entryType")]
+    """Filters results by entry type (certificate vs. pre-certificate)."""
+
+    expiration_status: Annotated[List[Literal["EXPIRED", "VALID"]], PropertyInfo(alias="expirationStatus")]
+    """Filters results by expiration status (expired vs. valid)."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    has_ips: Annotated[Iterable[bool], PropertyInfo(alias="hasIps")]
+    """
+    Filters results based on whether the certificates are bound to specific IP
+    addresses.
+    """
+
+    has_wildcards: Annotated[Iterable[bool], PropertyInfo(alias="hasWildcards")]
+    """Filters results based on whether the certificates contain wildcard domains."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    log: SequenceNotStr[str]
+    """Filters results by certificate log."""
+
+    log_api: Annotated[List[Literal["RFC6962", "STATIC"]], PropertyInfo(alias="logApi")]
+    """Filters results by certificate log API (RFC6962 vs. static)."""
+
+    log_operator: Annotated[SequenceNotStr[str], PropertyInfo(alias="logOperator")]
+    """Filters results by certificate log operator."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    normalization: Literal["RAW_VALUES", "PERCENTAGE"]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    public_key_algorithm: Annotated[List[Literal["DSA", "ECDSA", "RSA"]], PropertyInfo(alias="publicKeyAlgorithm")]
+    """Filters results by public key algorithm."""
+
+    signature_algorithm: Annotated[
+        List[
+            Literal[
+                "DSA_SHA_1",
+                "DSA_SHA_256",
+                "ECDSA_SHA_1",
+                "ECDSA_SHA_256",
+                "ECDSA_SHA_384",
+                "ECDSA_SHA_512",
+                "PSS_SHA_256",
+                "PSS_SHA_384",
+                "PSS_SHA_512",
+                "RSA_MD2",
+                "RSA_MD5",
+                "RSA_SHA_1",
+                "RSA_SHA_256",
+                "RSA_SHA_384",
+                "RSA_SHA_512",
+            ]
+        ],
+        PropertyInfo(alias="signatureAlgorithm"),
+    ]
+    """Filters results by signature algorithm."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
+
+    unique_entries: Annotated[List[Literal["true", "false"]], PropertyInfo(alias="uniqueEntries")]
+    """Specifies whether to filter out duplicate certificates and pre-certificates.
+
+    Set to true for unique entries only.
+    """
+
+    validation_level: Annotated[
+        List[Literal["DOMAIN", "ORGANIZATION", "EXTENDED"]], PropertyInfo(alias="validationLevel")
+    ]
+    """Filters results by validation level."""
diff --git a/src/cloudflare/types/radar/ct_summary_response.py b/src/cloudflare/types/radar/ct_summary_response.py
new file mode 100644
index 00000000000..3202682bc40
--- /dev/null
+++ b/src/cloudflare/types/radar/ct_summary_response.py
@@ -0,0 +1,201 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "CTSummaryResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Summary0",
+    "Summary0UnionMember1",
+    "Summary0UnionMember2",
+    "Summary0UnionMember3",
+    "Summary0UnionMember4",
+    "Summary0UnionMember5",
+    "Summary0UnionMember6",
+    "Summary0UnionMember7",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Summary0UnionMember1(BaseModel):
+    rfc6962: str
+
+    static: str
+
+
+class Summary0UnionMember2(BaseModel):
+    gt_121d: str
+
+    gt_16d_lte_31d: str
+
+    gt_31d_lte_91d: str
+
+    gt_3d_lte_16d: str
+
+    gt_91d_lte_121d: str
+
+    lte_3d: str
+
+
+class Summary0UnionMember3(BaseModel):
+    certificate: str = FieldInfo(alias="CERTIFICATE")
+
+    precertificate: str = FieldInfo(alias="PRECERTIFICATE")
+
+
+class Summary0UnionMember4(BaseModel):
+    expired: str = FieldInfo(alias="EXPIRED")
+
+    valid: str = FieldInfo(alias="VALID")
+
+
+class Summary0UnionMember5(BaseModel):
+    negative: str = FieldInfo(alias="NEGATIVE")
+
+    positive: str = FieldInfo(alias="POSITIVE")
+
+
+class Summary0UnionMember6(BaseModel):
+    dsa: str = FieldInfo(alias="DSA")
+
+    ecdsa: str = FieldInfo(alias="ECDSA")
+
+    rsa: str = FieldInfo(alias="RSA")
+
+
+class Summary0UnionMember7(BaseModel):
+    domain: str
+
+    extended: str
+
+    organization: str
+
+    unknown: str
+
+
+Summary0: TypeAlias = Union[
+    Dict[str, str],
+    Summary0UnionMember1,
+    Summary0UnionMember2,
+    Summary0UnionMember3,
+    Summary0UnionMember4,
+    Summary0UnionMember5,
+    Summary0UnionMember6,
+    Summary0UnionMember7,
+]
+
+
+class CTSummaryResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Summary0
diff --git a/src/cloudflare/types/radar/ct_timeseries_groups_params.py b/src/cloudflare/types/radar/ct_timeseries_groups_params.py
new file mode 100644
index 00000000000..95cfc094bc8
--- /dev/null
+++ b/src/cloudflare/types/radar/ct_timeseries_groups_params.py
@@ -0,0 +1,139 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["CTTimeseriesGroupsParams"]
+
+
+class CTTimeseriesGroupsParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    ca: SequenceNotStr[str]
+    """Filters results by certificate authority."""
+
+    ca_owner: Annotated[SequenceNotStr[str], PropertyInfo(alias="caOwner")]
+    """Filters results by certificate authority owner."""
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    duration: List[
+        Literal[
+            "LTE_3D",
+            "GT_3D_LTE_7D",
+            "GT_7D_LTE_10D",
+            "GT_10D_LTE_47D",
+            "GT_47D_LTE_100D",
+            "GT_100D_LTE_200D",
+            "GT_200D",
+        ]
+    ]
+    """Filters results by certificate duration."""
+
+    entry_type: Annotated[List[Literal["PRECERTIFICATE", "CERTIFICATE"]], PropertyInfo(alias="entryType")]
+    """Filters results by entry type (certificate vs. pre-certificate)."""
+
+    expiration_status: Annotated[List[Literal["EXPIRED", "VALID"]], PropertyInfo(alias="expirationStatus")]
+    """Filters results by expiration status (expired vs. valid)."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    has_ips: Annotated[Iterable[bool], PropertyInfo(alias="hasIps")]
+    """
+    Filters results based on whether the certificates are bound to specific IP
+    addresses.
+    """
+
+    has_wildcards: Annotated[Iterable[bool], PropertyInfo(alias="hasWildcards")]
+    """Filters results based on whether the certificates contain wildcard domains."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    log: SequenceNotStr[str]
+    """Filters results by certificate log."""
+
+    log_api: Annotated[List[Literal["RFC6962", "STATIC"]], PropertyInfo(alias="logApi")]
+    """Filters results by certificate log API (RFC6962 vs. static)."""
+
+    log_operator: Annotated[SequenceNotStr[str], PropertyInfo(alias="logOperator")]
+    """Filters results by certificate log operator."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    normalization: Literal["RAW_VALUES", "PERCENTAGE"]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    public_key_algorithm: Annotated[List[Literal["DSA", "ECDSA", "RSA"]], PropertyInfo(alias="publicKeyAlgorithm")]
+    """Filters results by public key algorithm."""
+
+    signature_algorithm: Annotated[
+        List[
+            Literal[
+                "DSA_SHA_1",
+                "DSA_SHA_256",
+                "ECDSA_SHA_1",
+                "ECDSA_SHA_256",
+                "ECDSA_SHA_384",
+                "ECDSA_SHA_512",
+                "PSS_SHA_256",
+                "PSS_SHA_384",
+                "PSS_SHA_512",
+                "RSA_MD2",
+                "RSA_MD5",
+                "RSA_SHA_1",
+                "RSA_SHA_256",
+                "RSA_SHA_384",
+                "RSA_SHA_512",
+            ]
+        ],
+        PropertyInfo(alias="signatureAlgorithm"),
+    ]
+    """Filters results by signature algorithm."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
+
+    unique_entries: Annotated[List[Literal["true", "false"]], PropertyInfo(alias="uniqueEntries")]
+    """Specifies whether to filter out duplicate certificates and pre-certificates.
+
+    Set to true for unique entries only.
+    """
+
+    validation_level: Annotated[
+        List[Literal["DOMAIN", "ORGANIZATION", "EXTENDED"]], PropertyInfo(alias="validationLevel")
+    ]
+    """Filters results by validation level."""
diff --git a/src/cloudflare/types/radar/ct_timeseries_groups_response.py b/src/cloudflare/types/radar/ct_timeseries_groups_response.py
new file mode 100644
index 00000000000..93cfd543c43
--- /dev/null
+++ b/src/cloudflare/types/radar/ct_timeseries_groups_response.py
@@ -0,0 +1,227 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List, Union
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "CTTimeseriesGroupsResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+    "Serie0UnnamedSchemaRef7826220e105d84352ba1108d9ed88e55",
+    "Serie0UnionMember1",
+    "Serie0UnionMember2",
+    "Serie0UnionMember3",
+    "Serie0UnionMember4",
+    "Serie0UnionMember5",
+    "Serie0UnionMember6",
+    "Serie0UnionMember7",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0UnnamedSchemaRef7826220e105d84352ba1108d9ed88e55(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class Serie0UnionMember1(BaseModel):
+    rfc6962: List[str]
+
+    static: List[str]
+
+
+class Serie0UnionMember2(BaseModel):
+    gt_121d: List[str]
+
+    gt_16d_lte_31d: List[str]
+
+    gt_31d_lte_91d: List[str]
+
+    gt_3d_lte_16d: List[str]
+
+    gt_91d_lte_121d: List[str]
+
+    lte_3d: List[str]
+
+
+class Serie0UnionMember3(BaseModel):
+    certificate: List[str] = FieldInfo(alias="CERTIFICATE")
+
+    precertificate: List[str] = FieldInfo(alias="PRECERTIFICATE")
+
+
+class Serie0UnionMember4(BaseModel):
+    expired: List[str] = FieldInfo(alias="EXPIRED")
+
+    valid: List[str] = FieldInfo(alias="VALID")
+
+
+class Serie0UnionMember5(BaseModel):
+    negative: List[str] = FieldInfo(alias="NEGATIVE")
+
+    positive: List[str] = FieldInfo(alias="POSITIVE")
+
+
+class Serie0UnionMember6(BaseModel):
+    dsa: List[str] = FieldInfo(alias="DSA")
+
+    ecdsa: List[str] = FieldInfo(alias="ECDSA")
+
+    rsa: List[str] = FieldInfo(alias="RSA")
+
+
+class Serie0UnionMember7(BaseModel):
+    domain: List[str]
+
+    extended: List[str]
+
+    organization: List[str]
+
+    unknown: List[str]
+
+
+Serie0: TypeAlias = Union[
+    Serie0UnnamedSchemaRef7826220e105d84352ba1108d9ed88e55,
+    Serie0UnionMember1,
+    Serie0UnionMember2,
+    Serie0UnionMember3,
+    Serie0UnionMember4,
+    Serie0UnionMember5,
+    Serie0UnionMember6,
+    Serie0UnionMember7,
+]
+
+
+class CTTimeseriesGroupsResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/ct_timeseries_params.py b/src/cloudflare/types/radar/ct_timeseries_params.py
new file mode 100644
index 00000000000..f555941ca0d
--- /dev/null
+++ b/src/cloudflare/types/radar/ct_timeseries_params.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["CTTimeseriesParams"]
+
+
+class CTTimeseriesParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    ca: SequenceNotStr[str]
+    """Filters results by certificate authority."""
+
+    ca_owner: Annotated[SequenceNotStr[str], PropertyInfo(alias="caOwner")]
+    """Filters results by certificate authority owner."""
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    duration: List[
+        Literal[
+            "LTE_3D",
+            "GT_3D_LTE_7D",
+            "GT_7D_LTE_10D",
+            "GT_10D_LTE_47D",
+            "GT_47D_LTE_100D",
+            "GT_100D_LTE_200D",
+            "GT_200D",
+        ]
+    ]
+    """Filters results by certificate duration."""
+
+    entry_type: Annotated[List[Literal["PRECERTIFICATE", "CERTIFICATE"]], PropertyInfo(alias="entryType")]
+    """Filters results by entry type (certificate vs. pre-certificate)."""
+
+    expiration_status: Annotated[List[Literal["EXPIRED", "VALID"]], PropertyInfo(alias="expirationStatus")]
+    """Filters results by expiration status (expired vs. valid)."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    has_ips: Annotated[Iterable[bool], PropertyInfo(alias="hasIps")]
+    """
+    Filters results based on whether the certificates are bound to specific IP
+    addresses.
+    """
+
+    has_wildcards: Annotated[Iterable[bool], PropertyInfo(alias="hasWildcards")]
+    """Filters results based on whether the certificates contain wildcard domains."""
+
+    log: SequenceNotStr[str]
+    """Filters results by certificate log."""
+
+    log_api: Annotated[List[Literal["RFC6962", "STATIC"]], PropertyInfo(alias="logApi")]
+    """Filters results by certificate log API (RFC6962 vs. static)."""
+
+    log_operator: Annotated[SequenceNotStr[str], PropertyInfo(alias="logOperator")]
+    """Filters results by certificate log operator."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    public_key_algorithm: Annotated[List[Literal["DSA", "ECDSA", "RSA"]], PropertyInfo(alias="publicKeyAlgorithm")]
+    """Filters results by public key algorithm."""
+
+    signature_algorithm: Annotated[
+        List[
+            Literal[
+                "DSA_SHA_1",
+                "DSA_SHA_256",
+                "ECDSA_SHA_1",
+                "ECDSA_SHA_256",
+                "ECDSA_SHA_384",
+                "ECDSA_SHA_512",
+                "PSS_SHA_256",
+                "PSS_SHA_384",
+                "PSS_SHA_512",
+                "RSA_MD2",
+                "RSA_MD5",
+                "RSA_SHA_1",
+                "RSA_SHA_256",
+                "RSA_SHA_384",
+                "RSA_SHA_512",
+            ]
+        ],
+        PropertyInfo(alias="signatureAlgorithm"),
+    ]
+    """Filters results by signature algorithm."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
+
+    unique_entries: Annotated[List[Literal["true", "false"]], PropertyInfo(alias="uniqueEntries")]
+    """Specifies whether to filter out duplicate certificates and pre-certificates.
+
+    Set to true for unique entries only.
+    """
+
+    validation_level: Annotated[
+        List[Literal["DOMAIN", "ORGANIZATION", "EXTENDED"]], PropertyInfo(alias="validationLevel")
+    ]
+    """Filters results by validation level."""
diff --git a/src/cloudflare/types/radar/ct_timeseries_response.py b/src/cloudflare/types/radar/ct_timeseries_response.py
new file mode 100644
index 00000000000..7d2768fea7c
--- /dev/null
+++ b/src/cloudflare/types/radar/ct_timeseries_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "CTTimeseriesResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "CTTimeseriesResponseItem",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class CTTimeseriesResponseItem(BaseModel):
+    timestamps: List[datetime]
+
+    values: List[str]
+
+
+class CTTimeseriesResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, CTTimeseriesResponseItem] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> CTTimeseriesResponseItem: ...
+    else:
+        __pydantic_extra__: Dict[str, CTTimeseriesResponseItem]
diff --git a/src/cloudflare/types/radar/dataset_download_params.py b/src/cloudflare/types/radar/dataset_download_params.py
index 6921739ca44..40aaab98d01 100644
--- a/src/cloudflare/types/radar/dataset_download_params.py
+++ b/src/cloudflare/types/radar/dataset_download_params.py
@@ -13,4 +13,4 @@ class DatasetDownloadParams(TypedDict, total=False):
     dataset_id: Required[Annotated[int, PropertyInfo(alias="datasetId")]]
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
diff --git a/src/cloudflare/types/radar/dataset_download_response.py b/src/cloudflare/types/radar/dataset_download_response.py
index e228f866343..d745ddc13ae 100644
--- a/src/cloudflare/types/radar/dataset_download_response.py
+++ b/src/cloudflare/types/radar/dataset_download_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ..._models import BaseModel
 
 __all__ = ["DatasetDownloadResponse", "Dataset"]
diff --git a/src/cloudflare/types/radar/dataset_get_response.py b/src/cloudflare/types/radar/dataset_get_response.py
index 560b7347b24..fc3329cd524 100644
--- a/src/cloudflare/types/radar/dataset_get_response.py
+++ b/src/cloudflare/types/radar/dataset_get_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["DatasetGetResponse"]
 
-DatasetGetResponse = str
+DatasetGetResponse: TypeAlias = str
diff --git a/src/cloudflare/types/radar/dataset_list_params.py b/src/cloudflare/types/radar/dataset_list_params.py
index 9e2a161f36f..5d30cecda59 100644
--- a/src/cloudflare/types/radar/dataset_list_params.py
+++ b/src/cloudflare/types/radar/dataset_list_params.py
@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import datetime
+from typing import Union
 from typing_extensions import Literal, Annotated, TypedDict
 
 from ..._utils import PropertyInfo
@@ -11,13 +13,16 @@
 
 class DatasetListParams(TypedDict, total=False):
     dataset_type: Annotated[Literal["RANKING_BUCKET", "REPORT"], PropertyInfo(alias="datasetType")]
-    """Dataset type."""
+    """Filters results by dataset type."""
+
+    date: Annotated[Union[str, datetime.date], PropertyInfo(format="iso8601")]
+    """Filters results by the specified date."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
     offset: int
-    """Number of objects to skip before grabbing results."""
+    """Skips the specified number of objects before fetching the results."""
diff --git a/src/cloudflare/types/radar/dns/__init__.py b/src/cloudflare/types/radar/dns/__init__.py
index 4bc84848b71..365ed97b1e0 100644
--- a/src/cloudflare/types/radar/dns/__init__.py
+++ b/src/cloudflare/types/radar/dns/__init__.py
@@ -5,4 +5,56 @@
 from .top_ases_params import TopAsesParams as TopAsesParams
 from .top_ases_response import TopAsesResponse as TopAsesResponse
 from .top_locations_params import TopLocationsParams as TopLocationsParams
+from .summary_dnssec_params import SummaryDNSSECParams as SummaryDNSSECParams
 from .top_locations_response import TopLocationsResponse as TopLocationsResponse
+from .summary_dnssec_response import SummaryDNSSECResponse as SummaryDNSSECResponse
+from .summary_protocol_params import SummaryProtocolParams as SummaryProtocolParams
+from .summary_cache_hit_params import SummaryCacheHitParams as SummaryCacheHitParams
+from .summary_dnssec_e2e_params import SummaryDNSSECE2EParams as SummaryDNSSECE2EParams
+from .summary_ip_version_params import SummaryIPVersionParams as SummaryIPVersionParams
+from .summary_protocol_response import SummaryProtocolResponse as SummaryProtocolResponse
+from .summary_query_type_params import SummaryQueryTypeParams as SummaryQueryTypeParams
+from .summary_cache_hit_response import SummaryCacheHitResponse as SummaryCacheHitResponse
+from .summary_dnssec_aware_params import SummaryDNSSECAwareParams as SummaryDNSSECAwareParams
+from .summary_dnssec_e2e_response import SummaryDNSSECE2EResponse as SummaryDNSSECE2EResponse
+from .summary_ip_version_response import SummaryIPVersionResponse as SummaryIPVersionResponse
+from .summary_query_type_response import SummaryQueryTypeResponse as SummaryQueryTypeResponse
+from .summary_response_ttl_params import SummaryResponseTTLParams as SummaryResponseTTLParams
+from .summary_response_code_params import SummaryResponseCodeParams as SummaryResponseCodeParams
+from .summary_dnssec_aware_response import SummaryDNSSECAwareResponse as SummaryDNSSECAwareResponse
+from .summary_response_ttl_response import SummaryResponseTTLResponse as SummaryResponseTTLResponse
+from .summary_matching_answer_params import SummaryMatchingAnswerParams as SummaryMatchingAnswerParams
+from .summary_response_code_response import SummaryResponseCodeResponse as SummaryResponseCodeResponse
+from .timeseries_group_dnssec_params import TimeseriesGroupDNSSECParams as TimeseriesGroupDNSSECParams
+from .summary_matching_answer_response import SummaryMatchingAnswerResponse as SummaryMatchingAnswerResponse
+from .timeseries_group_dnssec_response import TimeseriesGroupDNSSECResponse as TimeseriesGroupDNSSECResponse
+from .timeseries_group_protocol_params import TimeseriesGroupProtocolParams as TimeseriesGroupProtocolParams
+from .timeseries_group_cache_hit_params import TimeseriesGroupCacheHitParams as TimeseriesGroupCacheHitParams
+from .timeseries_group_dnssec_e2e_params import TimeseriesGroupDNSSECE2EParams as TimeseriesGroupDNSSECE2EParams
+from .timeseries_group_ip_version_params import TimeseriesGroupIPVersionParams as TimeseriesGroupIPVersionParams
+from .timeseries_group_protocol_response import TimeseriesGroupProtocolResponse as TimeseriesGroupProtocolResponse
+from .timeseries_group_query_type_params import TimeseriesGroupQueryTypeParams as TimeseriesGroupQueryTypeParams
+from .timeseries_group_cache_hit_response import TimeseriesGroupCacheHitResponse as TimeseriesGroupCacheHitResponse
+from .timeseries_group_dnssec_aware_params import TimeseriesGroupDNSSECAwareParams as TimeseriesGroupDNSSECAwareParams
+from .timeseries_group_dnssec_e2e_response import TimeseriesGroupDNSSECE2EResponse as TimeseriesGroupDNSSECE2EResponse
+from .timeseries_group_ip_version_response import TimeseriesGroupIPVersionResponse as TimeseriesGroupIPVersionResponse
+from .timeseries_group_query_type_response import TimeseriesGroupQueryTypeResponse as TimeseriesGroupQueryTypeResponse
+from .timeseries_group_response_ttl_params import TimeseriesGroupResponseTTLParams as TimeseriesGroupResponseTTLParams
+from .timeseries_group_response_code_params import (
+    TimeseriesGroupResponseCodeParams as TimeseriesGroupResponseCodeParams,
+)
+from .timeseries_group_dnssec_aware_response import (
+    TimeseriesGroupDNSSECAwareResponse as TimeseriesGroupDNSSECAwareResponse,
+)
+from .timeseries_group_response_ttl_response import (
+    TimeseriesGroupResponseTTLResponse as TimeseriesGroupResponseTTLResponse,
+)
+from .timeseries_group_matching_answer_params import (
+    TimeseriesGroupMatchingAnswerParams as TimeseriesGroupMatchingAnswerParams,
+)
+from .timeseries_group_response_code_response import (
+    TimeseriesGroupResponseCodeResponse as TimeseriesGroupResponseCodeResponse,
+)
+from .timeseries_group_matching_answer_response import (
+    TimeseriesGroupMatchingAnswerResponse as TimeseriesGroupMatchingAnswerResponse,
+)
diff --git a/src/cloudflare/types/radar/dns/summary_cache_hit_params.py b/src/cloudflare/types/radar/dns/summary_cache_hit_params.py
new file mode 100644
index 00000000000..0e1a5051c2c
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_cache_hit_params.py
@@ -0,0 +1,194 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["SummaryCacheHitParams"]
+
+
+class SummaryCacheHitParams(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/summary_cache_hit_response.py b/src/cloudflare/types/radar/dns/summary_cache_hit_response.py
new file mode 100644
index 00000000000..2c8af1b6e95
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_cache_hit_response.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "SummaryCacheHitResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Summary0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Summary0(BaseModel):
+    negative: str = FieldInfo(alias="NEGATIVE")
+    """A numeric string."""
+
+    positive: str = FieldInfo(alias="POSITIVE")
+    """A numeric string."""
+
+
+class SummaryCacheHitResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Summary0
diff --git a/src/cloudflare/types/radar/dns/summary_dnssec_aware_params.py b/src/cloudflare/types/radar/dns/summary_dnssec_aware_params.py
new file mode 100644
index 00000000000..0a43a450681
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_dnssec_aware_params.py
@@ -0,0 +1,194 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["SummaryDNSSECAwareParams"]
+
+
+class SummaryDNSSECAwareParams(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/summary_dnssec_aware_response.py b/src/cloudflare/types/radar/dns/summary_dnssec_aware_response.py
new file mode 100644
index 00000000000..6bcd072b66d
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_dnssec_aware_response.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "SummaryDNSSECAwareResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Summary0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Summary0(BaseModel):
+    not_supported: str = FieldInfo(alias="NOT_SUPPORTED")
+    """A numeric string."""
+
+    supported: str = FieldInfo(alias="SUPPORTED")
+    """A numeric string."""
+
+
+class SummaryDNSSECAwareResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Summary0
diff --git a/src/cloudflare/types/radar/dns/summary_dnssec_e2e_params.py b/src/cloudflare/types/radar/dns/summary_dnssec_e2e_params.py
new file mode 100644
index 00000000000..1734f0cad93
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_dnssec_e2e_params.py
@@ -0,0 +1,194 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["SummaryDNSSECE2EParams"]
+
+
+class SummaryDNSSECE2EParams(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/summary_dnssec_e2e_response.py b/src/cloudflare/types/radar/dns/summary_dnssec_e2e_response.py
new file mode 100644
index 00000000000..5cdcff8148c
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_dnssec_e2e_response.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "SummaryDNSSECE2EResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Summary0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Summary0(BaseModel):
+    negative: str = FieldInfo(alias="NEGATIVE")
+    """A numeric string."""
+
+    positive: str = FieldInfo(alias="POSITIVE")
+    """A numeric string."""
+
+
+class SummaryDNSSECE2EResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Summary0
diff --git a/src/cloudflare/types/radar/dns/summary_dnssec_params.py b/src/cloudflare/types/radar/dns/summary_dnssec_params.py
new file mode 100644
index 00000000000..d40e220040a
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_dnssec_params.py
@@ -0,0 +1,194 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["SummaryDNSSECParams"]
+
+
+class SummaryDNSSECParams(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/summary_dnssec_response.py b/src/cloudflare/types/radar/dns/summary_dnssec_response.py
new file mode 100644
index 00000000000..a8a517edc9c
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_dnssec_response.py
@@ -0,0 +1,140 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "SummaryDNSSECResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Summary0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Summary0(BaseModel):
+    insecure: str = FieldInfo(alias="INSECURE")
+    """A numeric string."""
+
+    invalid: str = FieldInfo(alias="INVALID")
+    """A numeric string."""
+
+    other: str = FieldInfo(alias="OTHER")
+    """A numeric string."""
+
+    secure: str = FieldInfo(alias="SECURE")
+    """A numeric string."""
+
+
+class SummaryDNSSECResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Summary0
diff --git a/src/cloudflare/types/radar/dns/summary_ip_version_params.py b/src/cloudflare/types/radar/dns/summary_ip_version_params.py
new file mode 100644
index 00000000000..117b8f62043
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_ip_version_params.py
@@ -0,0 +1,194 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["SummaryIPVersionParams"]
+
+
+class SummaryIPVersionParams(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/summary_ip_version_response.py b/src/cloudflare/types/radar/dns/summary_ip_version_response.py
new file mode 100644
index 00000000000..c73c7cf94ab
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_ip_version_response.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "SummaryIPVersionResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Summary0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Summary0(BaseModel):
+    i_pv4: str = FieldInfo(alias="IPv4")
+    """A numeric string."""
+
+    i_pv6: str = FieldInfo(alias="IPv6")
+    """A numeric string."""
+
+
+class SummaryIPVersionResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Summary0
diff --git a/src/cloudflare/types/radar/dns/summary_matching_answer_params.py b/src/cloudflare/types/radar/dns/summary_matching_answer_params.py
new file mode 100644
index 00000000000..b247ad09435
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_matching_answer_params.py
@@ -0,0 +1,194 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["SummaryMatchingAnswerParams"]
+
+
+class SummaryMatchingAnswerParams(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/summary_matching_answer_response.py b/src/cloudflare/types/radar/dns/summary_matching_answer_response.py
new file mode 100644
index 00000000000..fe26eaf7b38
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_matching_answer_response.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "SummaryMatchingAnswerResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Summary0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Summary0(BaseModel):
+    negative: str = FieldInfo(alias="NEGATIVE")
+    """A numeric string."""
+
+    positive: str = FieldInfo(alias="POSITIVE")
+    """A numeric string."""
+
+
+class SummaryMatchingAnswerResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Summary0
diff --git a/src/cloudflare/types/radar/dns/summary_protocol_params.py b/src/cloudflare/types/radar/dns/summary_protocol_params.py
new file mode 100644
index 00000000000..e051eca6c90
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_protocol_params.py
@@ -0,0 +1,191 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["SummaryProtocolParams"]
+
+
+class SummaryProtocolParams(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/summary_protocol_response.py b/src/cloudflare/types/radar/dns/summary_protocol_response.py
new file mode 100644
index 00000000000..ffa0f33760b
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_protocol_response.py
@@ -0,0 +1,140 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "SummaryProtocolResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Summary0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Summary0(BaseModel):
+    https: str = FieldInfo(alias="HTTPS")
+    """A numeric string."""
+
+    tcp: str = FieldInfo(alias="TCP")
+    """A numeric string."""
+
+    tls: str = FieldInfo(alias="TLS")
+    """A numeric string."""
+
+    udp: str = FieldInfo(alias="UDP")
+    """A numeric string."""
+
+
+class SummaryProtocolResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Summary0
diff --git a/src/cloudflare/types/radar/dns/summary_query_type_params.py b/src/cloudflare/types/radar/dns/summary_query_type_params.py
new file mode 100644
index 00000000000..9ff7668ac55
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_query_type_params.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["SummaryQueryTypeParams"]
+
+
+class SummaryQueryTypeParams(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/summary_query_type_response.py b/src/cloudflare/types/radar/dns/summary_query_type_response.py
new file mode 100644
index 00000000000..ae1ab1c7571
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_query_type_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "SummaryQueryTypeResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class SummaryQueryTypeResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/dns/summary_response_code_params.py b/src/cloudflare/types/radar/dns/summary_response_code_params.py
new file mode 100644
index 00000000000..169907aaf0c
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_response_code_params.py
@@ -0,0 +1,173 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["SummaryResponseCodeParams"]
+
+
+class SummaryResponseCodeParams(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/summary_response_code_response.py b/src/cloudflare/types/radar/dns/summary_response_code_response.py
new file mode 100644
index 00000000000..6b9439caef4
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_response_code_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "SummaryResponseCodeResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class SummaryResponseCodeResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/dns/summary_response_ttl_params.py b/src/cloudflare/types/radar/dns/summary_response_ttl_params.py
new file mode 100644
index 00000000000..7d095f11679
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_response_ttl_params.py
@@ -0,0 +1,194 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["SummaryResponseTTLParams"]
+
+
+class SummaryResponseTTLParams(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/summary_response_ttl_response.py b/src/cloudflare/types/radar/dns/summary_response_ttl_response.py
new file mode 100644
index 00000000000..9bb7e3c1ce4
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/summary_response_ttl_response.py
@@ -0,0 +1,149 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "SummaryResponseTTLResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Summary0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Summary0(BaseModel):
+    gt_15m_lte_1h: str
+    """A numeric string."""
+
+    gt_1d_lte_1w: str
+    """A numeric string."""
+
+    gt_1h_lte_1d: str
+    """A numeric string."""
+
+    gt_1m_lte_5m: str
+    """A numeric string."""
+
+    gt_1w: str
+    """A numeric string."""
+
+    gt_5m_lte_15m: str
+    """A numeric string."""
+
+    lte_1m: str
+    """A numeric string."""
+
+
+class SummaryResponseTTLResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Summary0
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_cache_hit_params.py b/src/cloudflare/types/radar/dns/timeseries_group_cache_hit_params.py
new file mode 100644
index 00000000000..fe8fe4e6092
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_cache_hit_params.py
@@ -0,0 +1,201 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TimeseriesGroupCacheHitParams"]
+
+
+class TimeseriesGroupCacheHitParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_cache_hit_response.py b/src/cloudflare/types/radar/dns/timeseries_group_cache_hit_response.py
new file mode 100644
index 00000000000..9befda91fc2
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_cache_hit_response.py
@@ -0,0 +1,141 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TimeseriesGroupCacheHitResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    negative: List[str] = FieldInfo(alias="NEGATIVE")
+
+    positive: List[str] = FieldInfo(alias="POSITIVE")
+
+
+class TimeseriesGroupCacheHitResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_dnssec_aware_params.py b/src/cloudflare/types/radar/dns/timeseries_group_dnssec_aware_params.py
new file mode 100644
index 00000000000..6a17140eb94
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_dnssec_aware_params.py
@@ -0,0 +1,201 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TimeseriesGroupDNSSECAwareParams"]
+
+
+class TimeseriesGroupDNSSECAwareParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_dnssec_aware_response.py b/src/cloudflare/types/radar/dns/timeseries_group_dnssec_aware_response.py
new file mode 100644
index 00000000000..6ad939335f7
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_dnssec_aware_response.py
@@ -0,0 +1,141 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TimeseriesGroupDNSSECAwareResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    not_supported: List[str] = FieldInfo(alias="NOT_SUPPORTED")
+
+    supported: List[str] = FieldInfo(alias="SUPPORTED")
+
+
+class TimeseriesGroupDNSSECAwareResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_dnssec_e2e_params.py b/src/cloudflare/types/radar/dns/timeseries_group_dnssec_e2e_params.py
new file mode 100644
index 00000000000..b5331bd114b
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_dnssec_e2e_params.py
@@ -0,0 +1,201 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TimeseriesGroupDNSSECE2EParams"]
+
+
+class TimeseriesGroupDNSSECE2EParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_dnssec_e2e_response.py b/src/cloudflare/types/radar/dns/timeseries_group_dnssec_e2e_response.py
new file mode 100644
index 00000000000..3c2aa8ffa5f
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_dnssec_e2e_response.py
@@ -0,0 +1,141 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TimeseriesGroupDNSSECE2EResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    negative: List[str] = FieldInfo(alias="NEGATIVE")
+
+    positive: List[str] = FieldInfo(alias="POSITIVE")
+
+
+class TimeseriesGroupDNSSECE2EResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_dnssec_params.py b/src/cloudflare/types/radar/dns/timeseries_group_dnssec_params.py
new file mode 100644
index 00000000000..92527cab67e
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_dnssec_params.py
@@ -0,0 +1,201 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TimeseriesGroupDNSSECParams"]
+
+
+class TimeseriesGroupDNSSECParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_dnssec_response.py b/src/cloudflare/types/radar/dns/timeseries_group_dnssec_response.py
new file mode 100644
index 00000000000..a2566d2a450
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_dnssec_response.py
@@ -0,0 +1,145 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TimeseriesGroupDNSSECResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    insecure: List[str] = FieldInfo(alias="INSECURE")
+
+    invalid: List[str] = FieldInfo(alias="INVALID")
+
+    other: List[str] = FieldInfo(alias="OTHER")
+
+    secure: List[str] = FieldInfo(alias="SECURE")
+
+
+class TimeseriesGroupDNSSECResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_ip_version_params.py b/src/cloudflare/types/radar/dns/timeseries_group_ip_version_params.py
new file mode 100644
index 00000000000..d73666a10ac
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_ip_version_params.py
@@ -0,0 +1,201 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TimeseriesGroupIPVersionParams"]
+
+
+class TimeseriesGroupIPVersionParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_ip_version_response.py b/src/cloudflare/types/radar/dns/timeseries_group_ip_version_response.py
new file mode 100644
index 00000000000..6f047f9a1e4
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_ip_version_response.py
@@ -0,0 +1,141 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TimeseriesGroupIPVersionResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    i_pv4: List[str] = FieldInfo(alias="IPv4")
+
+    i_pv6: List[str] = FieldInfo(alias="IPv6")
+
+
+class TimeseriesGroupIPVersionResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_matching_answer_params.py b/src/cloudflare/types/radar/dns/timeseries_group_matching_answer_params.py
new file mode 100644
index 00000000000..dce215f8ab8
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_matching_answer_params.py
@@ -0,0 +1,201 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TimeseriesGroupMatchingAnswerParams"]
+
+
+class TimeseriesGroupMatchingAnswerParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_matching_answer_response.py b/src/cloudflare/types/radar/dns/timeseries_group_matching_answer_response.py
new file mode 100644
index 00000000000..ed4960305b1
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_matching_answer_response.py
@@ -0,0 +1,141 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TimeseriesGroupMatchingAnswerResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    negative: List[str] = FieldInfo(alias="NEGATIVE")
+
+    positive: List[str] = FieldInfo(alias="POSITIVE")
+
+
+class TimeseriesGroupMatchingAnswerResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_protocol_params.py b/src/cloudflare/types/radar/dns/timeseries_group_protocol_params.py
new file mode 100644
index 00000000000..f607bda0fae
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_protocol_params.py
@@ -0,0 +1,198 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TimeseriesGroupProtocolParams"]
+
+
+class TimeseriesGroupProtocolParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_protocol_response.py b/src/cloudflare/types/radar/dns/timeseries_group_protocol_response.py
new file mode 100644
index 00000000000..25cdf9ccc54
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_protocol_response.py
@@ -0,0 +1,145 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TimeseriesGroupProtocolResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    https: List[str] = FieldInfo(alias="HTTPS")
+
+    tcp: List[str] = FieldInfo(alias="TCP")
+
+    tls: List[str] = FieldInfo(alias="TLS")
+
+    udp: List[str] = FieldInfo(alias="UDP")
+
+
+class TimeseriesGroupProtocolResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_query_type_params.py b/src/cloudflare/types/radar/dns/timeseries_group_query_type_params.py
new file mode 100644
index 00000000000..b20f9c7ed56
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_query_type_params.py
@@ -0,0 +1,109 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TimeseriesGroupQueryTypeParams"]
+
+
+class TimeseriesGroupQueryTypeParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_query_type_response.py b/src/cloudflare/types/radar/dns/timeseries_group_query_type_response.py
new file mode 100644
index 00000000000..34bd30918f0
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_query_type_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TimeseriesGroupQueryTypeResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class TimeseriesGroupQueryTypeResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_response_code_params.py b/src/cloudflare/types/radar/dns/timeseries_group_response_code_params.py
new file mode 100644
index 00000000000..d55243c84b5
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_response_code_params.py
@@ -0,0 +1,180 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TimeseriesGroupResponseCodeParams"]
+
+
+class TimeseriesGroupResponseCodeParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_response_code_response.py b/src/cloudflare/types/radar/dns/timeseries_group_response_code_response.py
new file mode 100644
index 00000000000..b7a24af12e9
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_response_code_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TimeseriesGroupResponseCodeResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class TimeseriesGroupResponseCodeResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_response_ttl_params.py b/src/cloudflare/types/radar/dns/timeseries_group_response_ttl_params.py
new file mode 100644
index 00000000000..2b52b29d585
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_response_ttl_params.py
@@ -0,0 +1,201 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TimeseriesGroupResponseTTLParams"]
+
+
+class TimeseriesGroupResponseTTLParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/timeseries_group_response_ttl_response.py b/src/cloudflare/types/radar/dns/timeseries_group_response_ttl_response.py
new file mode 100644
index 00000000000..8c0ac7038d8
--- /dev/null
+++ b/src/cloudflare/types/radar/dns/timeseries_group_response_ttl_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TimeseriesGroupResponseTTLResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    gt_15m_lte_1h: List[str]
+
+    gt_1d_lte_1w: List[str]
+
+    gt_1h_lte_1d: List[str]
+
+    gt_1m_lte_5m: List[str]
+
+    gt_1w: List[str]
+
+    gt_5m_lte_15m: List[str]
+
+    lte_1m: List[str]
+
+
+class TimeseriesGroupResponseTTLResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/dns/top_ases_params.py b/src/cloudflare/types/radar/dns/top_ases_params.py
index fed6e043884..ebd9612b7fd 100644
--- a/src/cloudflare/types/radar/dns/top_ases_params.py
+++ b/src/cloudflare/types/radar/dns/top_ases_params.py
@@ -2,58 +2,224 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import List, Union, Iterable, Optional
 from datetime import datetime
-from typing_extensions import Literal, Required, Annotated, TypedDict
+from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TopAsesParams"]
 
 
 class TopAsesParams(TypedDict, total=False):
-    domain: Required[List[str]]
-    """Array of domain names."""
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
-
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    cache_hit: Annotated[Iterable[bool], PropertyInfo(alias="cacheHit")]
+    """Filters results based on cache status."""
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    dnssec: List[Literal["INVALID", "INSECURE", "SECURE", "OTHER"]]
+    """Filters results based on DNSSEC (DNS Security Extensions) support."""
+
+    dnssec_aware: Annotated[List[Literal["SUPPORTED", "NOT_SUPPORTED"]], PropertyInfo(alias="dnssecAware")]
+    """Filters results based on DNSSEC (DNS Security Extensions) client awareness."""
+
+    dnssec_e2e: Annotated[Iterable[bool], PropertyInfo(alias="dnssecE2e")]
+    """
+    Filters results based on DNSSEC-validated answers by end-to-end security status.
+    """
+
+    domain: SequenceNotStr[str]
+    """Filters results by domain name."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    matching_answer: Annotated[Iterable[bool], PropertyInfo(alias="matchingAnswer")]
+    """Filters results based on whether the queries have a matching answer."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    response_ttl: Annotated[
+        List[
+            Literal["LTE_1M", "GT_1M_LTE_5M", "GT_5M_LTE_15M", "GT_15M_LTE_1H", "GT_1H_LTE_1D", "GT_1D_LTE_1W", "GT_1W"]
+        ],
+        PropertyInfo(alias="responseTtl"),
+    ]
+    """Filters results by DNS response TTL."""
diff --git a/src/cloudflare/types/radar/dns/top_ases_response.py b/src/cloudflare/types/radar/dns/top_ases_response.py
index e87c9d659f0..f685c56c0b2 100644
--- a/src/cloudflare/types/radar/dns/top_ases_response.py
+++ b/src/cloudflare/types/radar/dns/top_ases_response.py
@@ -2,49 +2,122 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TopAsesResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation", "Top0"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "TopAsesResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
 
-    level: Optional[int] = None
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+    """Metadata for the results."""
 
     confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
 
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
 
 class Top0(BaseModel):
     client_asn: int = FieldInfo(alias="clientASN")
@@ -52,9 +125,11 @@ class Top0(BaseModel):
     client_as_name: str = FieldInfo(alias="clientASName")
 
     value: str
+    """A numeric string."""
 
 
 class TopAsesResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/dns/top_locations_params.py b/src/cloudflare/types/radar/dns/top_locations_params.py
index a0f8a46d7d3..fee6d6cd0e9 100644
--- a/src/cloudflare/types/radar/dns/top_locations_params.py
+++ b/src/cloudflare/types/radar/dns/top_locations_params.py
@@ -2,58 +2,227 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import List, Union, Iterable, Optional
 from datetime import datetime
-from typing_extensions import Literal, Required, Annotated, TypedDict
+from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TopLocationsParams"]
 
 
 class TopLocationsParams(TypedDict, total=False):
-    domain: Required[List[str]]
-    """Array of domain names."""
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
-
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    cache_hit: Annotated[Iterable[bool], PropertyInfo(alias="cacheHit")]
+    """Filters results based on cache status."""
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    dnssec: List[Literal["INVALID", "INSECURE", "SECURE", "OTHER"]]
+    """Filters results based on DNSSEC (DNS Security Extensions) support."""
+
+    dnssec_aware: Annotated[List[Literal["SUPPORTED", "NOT_SUPPORTED"]], PropertyInfo(alias="dnssecAware")]
+    """Filters results based on DNSSEC (DNS Security Extensions) client awareness."""
+
+    dnssec_e2e: Annotated[Iterable[bool], PropertyInfo(alias="dnssecE2e")]
+    """
+    Filters results based on DNSSEC-validated answers by end-to-end security status.
+    """
+
+    domain: SequenceNotStr[str]
+    """Filters results by domain name."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    matching_answer: Annotated[Iterable[bool], PropertyInfo(alias="matchingAnswer")]
+    """Filters results based on whether the queries have a matching answer."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    response_ttl: Annotated[
+        List[
+            Literal["LTE_1M", "GT_1M_LTE_5M", "GT_5M_LTE_15M", "GT_15M_LTE_1H", "GT_1H_LTE_1D", "GT_1D_LTE_1W", "GT_1W"]
+        ],
+        PropertyInfo(alias="responseTtl"),
+    ]
+    """Filters results by DNS response TTL."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns/top_locations_response.py b/src/cloudflare/types/radar/dns/top_locations_response.py
index 4be71f2a029..769fffedb1a 100644
--- a/src/cloudflare/types/radar/dns/top_locations_response.py
+++ b/src/cloudflare/types/radar/dns/top_locations_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,48 +11,113 @@
 __all__ = [
     "TopLocationsResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
 
-    level: Optional[int] = None
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+    """Metadata for the results."""
 
     confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
 
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
 
 class Top0(BaseModel):
     client_country_alpha2: str = FieldInfo(alias="clientCountryAlpha2")
@@ -59,9 +125,11 @@ class Top0(BaseModel):
     client_country_name: str = FieldInfo(alias="clientCountryName")
 
     value: str
+    """A numeric string."""
 
 
 class TopLocationsResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/dns_summary_v2_params.py b/src/cloudflare/types/radar/dns_summary_v2_params.py
new file mode 100644
index 00000000000..b6e2de364d7
--- /dev/null
+++ b/src/cloudflare/types/radar/dns_summary_v2_params.py
@@ -0,0 +1,229 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["DNSSummaryV2Params"]
+
+
+class DNSSummaryV2Params(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    cache_hit: Annotated[Iterable[bool], PropertyInfo(alias="cacheHit")]
+    """Filters results based on cache status."""
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    dnssec: List[Literal["INVALID", "INSECURE", "SECURE", "OTHER"]]
+    """Filters results based on DNSSEC (DNS Security Extensions) support."""
+
+    dnssec_aware: Annotated[List[Literal["SUPPORTED", "NOT_SUPPORTED"]], PropertyInfo(alias="dnssecAware")]
+    """Filters results based on DNSSEC (DNS Security Extensions) client awareness."""
+
+    dnssec_e2e: Annotated[Iterable[bool], PropertyInfo(alias="dnssecE2e")]
+    """
+    Filters results based on DNSSEC-validated answers by end-to-end security status.
+    """
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    matching_answer: Annotated[Iterable[bool], PropertyInfo(alias="matchingAnswer")]
+    """Filters results based on whether the queries have a matching answer."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    response_ttl: Annotated[
+        List[
+            Literal["LTE_1M", "GT_1M_LTE_5M", "GT_5M_LTE_15M", "GT_15M_LTE_1H", "GT_1H_LTE_1D", "GT_1D_LTE_1W", "GT_1W"]
+        ],
+        PropertyInfo(alias="responseTtl"),
+    ]
+    """Filters results by DNS response TTL."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns_summary_v2_response.py b/src/cloudflare/types/radar/dns_summary_v2_response.py
new file mode 100644
index 00000000000..1037878f611
--- /dev/null
+++ b/src/cloudflare/types/radar/dns_summary_v2_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "DNSSummaryV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class DNSSummaryV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/dns_timeseries_groups_v2_params.py b/src/cloudflare/types/radar/dns_timeseries_groups_v2_params.py
new file mode 100644
index 00000000000..34262ad0cdd
--- /dev/null
+++ b/src/cloudflare/types/radar/dns_timeseries_groups_v2_params.py
@@ -0,0 +1,243 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["DNSTimeseriesGroupsV2Params"]
+
+
+class DNSTimeseriesGroupsV2Params(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    cache_hit: Annotated[Iterable[bool], PropertyInfo(alias="cacheHit")]
+    """Filters results based on cache status."""
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    dnssec: List[Literal["INVALID", "INSECURE", "SECURE", "OTHER"]]
+    """Filters results based on DNSSEC (DNS Security Extensions) support."""
+
+    dnssec_aware: Annotated[List[Literal["SUPPORTED", "NOT_SUPPORTED"]], PropertyInfo(alias="dnssecAware")]
+    """Filters results based on DNSSEC (DNS Security Extensions) client awareness."""
+
+    dnssec_e2e: Annotated[Iterable[bool], PropertyInfo(alias="dnssecE2e")]
+    """
+    Filters results based on DNSSEC-validated answers by end-to-end security status.
+    """
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    matching_answer: Annotated[Iterable[bool], PropertyInfo(alias="matchingAnswer")]
+    """Filters results based on whether the queries have a matching answer."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    normalization: Literal["PERCENTAGE", "MIN0_MAX"]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    response_ttl: Annotated[
+        List[
+            Literal["LTE_1M", "GT_1M_LTE_5M", "GT_5M_LTE_15M", "GT_15M_LTE_1H", "GT_1H_LTE_1D", "GT_1D_LTE_1W", "GT_1W"]
+        ],
+        PropertyInfo(alias="responseTtl"),
+    ]
+    """Filters results by DNS response TTL."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns_timeseries_groups_v2_response.py b/src/cloudflare/types/radar/dns_timeseries_groups_v2_response.py
new file mode 100644
index 00000000000..a0010f5494b
--- /dev/null
+++ b/src/cloudflare/types/radar/dns_timeseries_groups_v2_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "DNSTimeseriesGroupsV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class DNSTimeseriesGroupsV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/dns_timeseries_params.py b/src/cloudflare/types/radar/dns_timeseries_params.py
new file mode 100644
index 00000000000..3937b0ae11c
--- /dev/null
+++ b/src/cloudflare/types/radar/dns_timeseries_params.py
@@ -0,0 +1,229 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["DNSTimeseriesParams"]
+
+
+class DNSTimeseriesParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    cache_hit: Annotated[Iterable[bool], PropertyInfo(alias="cacheHit")]
+    """Filters results based on cache status."""
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    dnssec: List[Literal["INVALID", "INSECURE", "SECURE", "OTHER"]]
+    """Filters results based on DNSSEC (DNS Security Extensions) support."""
+
+    dnssec_aware: Annotated[List[Literal["SUPPORTED", "NOT_SUPPORTED"]], PropertyInfo(alias="dnssecAware")]
+    """Filters results based on DNSSEC (DNS Security Extensions) client awareness."""
+
+    dnssec_e2e: Annotated[Iterable[bool], PropertyInfo(alias="dnssecE2e")]
+    """
+    Filters results based on DNSSEC-validated answers by end-to-end security status.
+    """
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    matching_answer: Annotated[Iterable[bool], PropertyInfo(alias="matchingAnswer")]
+    """Filters results based on whether the queries have a matching answer."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    nodata: Iterable[bool]
+    """Specifies whether the response includes empty DNS responses (NODATA)."""
+
+    protocol: List[Literal["UDP", "TCP", "HTTPS", "TLS"]]
+    """Filters results by DNS transport protocol."""
+
+    query_type: Annotated[
+        List[
+            Optional[
+                Literal[
+                    "A",
+                    "AAAA",
+                    "A6",
+                    "AFSDB",
+                    "ANY",
+                    "APL",
+                    "ATMA",
+                    "AXFR",
+                    "CAA",
+                    "CDNSKEY",
+                    "CDS",
+                    "CERT",
+                    "CNAME",
+                    "CSYNC",
+                    "DHCID",
+                    "DLV",
+                    "DNAME",
+                    "DNSKEY",
+                    "DOA",
+                    "DS",
+                    "EID",
+                    "EUI48",
+                    "EUI64",
+                    "GPOS",
+                    "GID",
+                    "HINFO",
+                    "HIP",
+                    "HTTPS",
+                    "IPSECKEY",
+                    "ISDN",
+                    "IXFR",
+                    "KEY",
+                    "KX",
+                    "L32",
+                    "L64",
+                    "LOC",
+                    "LP",
+                    "MAILA",
+                    "MAILB",
+                    "MB",
+                    "MD",
+                    "MF",
+                    "MG",
+                    "MINFO",
+                    "MR",
+                    "MX",
+                    "NAPTR",
+                    "NB",
+                    "NBSTAT",
+                    "NID",
+                    "NIMLOC",
+                    "NINFO",
+                    "NS",
+                    "NSAP",
+                    "NSEC",
+                    "NSEC3",
+                    "NSEC3PARAM",
+                    "NULL",
+                    "NXT",
+                    "OPENPGPKEY",
+                    "OPT",
+                    "PTR",
+                    "PX",
+                    "RKEY",
+                    "RP",
+                    "RRSIG",
+                    "RT",
+                    "SIG",
+                    "SINK",
+                    "SMIMEA",
+                    "SOA",
+                    "SPF",
+                    "SRV",
+                    "SSHFP",
+                    "SVCB",
+                    "TA",
+                    "TALINK",
+                    "TKEY",
+                    "TLSA",
+                    "TSIG",
+                    "TXT",
+                    "UINFO",
+                    "UID",
+                    "UNSPEC",
+                    "URI",
+                    "WKS",
+                    "X25",
+                    "ZONEMD",
+                ]
+            ]
+        ],
+        PropertyInfo(alias="queryType"),
+    ]
+    """Filters results by DNS query type."""
+
+    response_code: Annotated[
+        List[
+            Literal[
+                "NOERROR",
+                "FORMERR",
+                "SERVFAIL",
+                "NXDOMAIN",
+                "NOTIMP",
+                "REFUSED",
+                "YXDOMAIN",
+                "YXRRSET",
+                "NXRRSET",
+                "NOTAUTH",
+                "NOTZONE",
+                "BADSIG",
+                "BADKEY",
+                "BADTIME",
+                "BADMODE",
+                "BADNAME",
+                "BADALG",
+                "BADTRUNC",
+                "BADCOOKIE",
+            ]
+        ],
+        PropertyInfo(alias="responseCode"),
+    ]
+    """Filters results by DNS response code."""
+
+    response_ttl: Annotated[
+        List[
+            Literal["LTE_1M", "GT_1M_LTE_5M", "GT_5M_LTE_15M", "GT_15M_LTE_1H", "GT_1H_LTE_1D", "GT_1D_LTE_1W", "GT_1W"]
+        ],
+        PropertyInfo(alias="responseTtl"),
+    ]
+    """Filters results by DNS response TTL."""
+
+    tld: SequenceNotStr[str]
+    """Filters results by top-level domain."""
diff --git a/src/cloudflare/types/radar/dns_timeseries_response.py b/src/cloudflare/types/radar/dns_timeseries_response.py
new file mode 100644
index 00000000000..49dd2738272
--- /dev/null
+++ b/src/cloudflare/types/radar/dns_timeseries_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "DNSTimeseriesResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "DNSTimeseriesResponseItem",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class DNSTimeseriesResponseItem(BaseModel):
+    timestamps: List[datetime]
+
+    values: List[str]
+
+
+class DNSTimeseriesResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, DNSTimeseriesResponseItem] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> DNSTimeseriesResponseItem: ...
+    else:
+        __pydantic_extra__: Dict[str, DNSTimeseriesResponseItem]
diff --git a/src/cloudflare/types/radar/email/__init__.py b/src/cloudflare/types/radar/email/__init__.py
index f8ee8b14b1c..4b3b02bc437 100644
--- a/src/cloudflare/types/radar/email/__init__.py
+++ b/src/cloudflare/types/radar/email/__init__.py
@@ -1,3 +1,16 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from __future__ import annotations
+
+from .routing_summary_v2_params import RoutingSummaryV2Params as RoutingSummaryV2Params
+from .security_summary_v2_params import SecuritySummaryV2Params as SecuritySummaryV2Params
+from .routing_summary_v2_response import RoutingSummaryV2Response as RoutingSummaryV2Response
+from .security_summary_v2_response import SecuritySummaryV2Response as SecuritySummaryV2Response
+from .routing_timeseries_groups_v2_params import RoutingTimeseriesGroupsV2Params as RoutingTimeseriesGroupsV2Params
+from .security_timeseries_groups_v2_params import SecurityTimeseriesGroupsV2Params as SecurityTimeseriesGroupsV2Params
+from .routing_timeseries_groups_v2_response import (
+    RoutingTimeseriesGroupsV2Response as RoutingTimeseriesGroupsV2Response,
+)
+from .security_timeseries_groups_v2_response import (
+    SecurityTimeseriesGroupsV2Response as SecurityTimeseriesGroupsV2Response,
+)
diff --git a/src/cloudflare/types/radar/email/routing/summary_arc_params.py b/src/cloudflare/types/radar/email/routing/summary_arc_params.py
index 58c3c121836..cf099a6863a 100644
--- a/src/cloudflare/types/radar/email/routing/summary_arc_params.py
+++ b/src/cloudflare/types/radar/email/routing/summary_arc_params.py
@@ -6,42 +6,47 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryARCParams"]
 
 
 class SummaryARCParams(TypedDict, total=False):
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]]
-    """Filter for encrypted emails."""
+    """Filters results by encryption status (encrypted vs. not-encrypted)."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
diff --git a/src/cloudflare/types/radar/email/routing/summary_arc_response.py b/src/cloudflare/types/radar/email/routing/summary_arc_response.py
index 274e9a535ba..4d69d4b99d9 100644
--- a/src/cloudflare/types/radar/email/routing/summary_arc_response.py
+++ b/src/cloudflare/types/radar/email/routing/summary_arc_response.py
@@ -1,57 +1,126 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 from ...radar_email_summary import RadarEmailSummary
 
-__all__ = ["SummaryARCResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "SummaryARCResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
 
-    level: Optional[int] = None
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class SummaryARCResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: RadarEmailSummary
diff --git a/src/cloudflare/types/radar/email/routing/summary_dkim_params.py b/src/cloudflare/types/radar/email/routing/summary_dkim_params.py
index 19be324942f..60260080bd9 100644
--- a/src/cloudflare/types/radar/email/routing/summary_dkim_params.py
+++ b/src/cloudflare/types/radar/email/routing/summary_dkim_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryDKIMParams"]
@@ -13,35 +14,39 @@
 
 class SummaryDKIMParams(TypedDict, total=False):
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]]
-    """Filter for encrypted emails."""
+    """Filters results by encryption status (encrypted vs. not-encrypted)."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
diff --git a/src/cloudflare/types/radar/email/routing/summary_dkim_response.py b/src/cloudflare/types/radar/email/routing/summary_dkim_response.py
index df8a79048cd..29cb4c47445 100644
--- a/src/cloudflare/types/radar/email/routing/summary_dkim_response.py
+++ b/src/cloudflare/types/radar/email/routing/summary_dkim_response.py
@@ -1,57 +1,126 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 from ...radar_email_summary import RadarEmailSummary
 
-__all__ = ["SummaryDKIMResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "SummaryDKIMResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
 
-    level: Optional[int] = None
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class SummaryDKIMResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: RadarEmailSummary
diff --git a/src/cloudflare/types/radar/email/routing/summary_dmarc_params.py b/src/cloudflare/types/radar/email/routing/summary_dmarc_params.py
index f356077e043..85aa51431b2 100644
--- a/src/cloudflare/types/radar/email/routing/summary_dmarc_params.py
+++ b/src/cloudflare/types/radar/email/routing/summary_dmarc_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryDMARCParams"]
@@ -13,35 +14,36 @@
 
 class SummaryDMARCParams(TypedDict, total=False):
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]]
-    """Filter for encrypted emails."""
+    """Filters results by encryption status (encrypted vs. not-encrypted)."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
diff --git a/src/cloudflare/types/radar/email/routing/summary_dmarc_response.py b/src/cloudflare/types/radar/email/routing/summary_dmarc_response.py
index 0563a742286..f0068fdc733 100644
--- a/src/cloudflare/types/radar/email/routing/summary_dmarc_response.py
+++ b/src/cloudflare/types/radar/email/routing/summary_dmarc_response.py
@@ -1,57 +1,126 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 from ...radar_email_summary import RadarEmailSummary
 
-__all__ = ["SummaryDMARCResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "SummaryDMARCResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
 
-    level: Optional[int] = None
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class SummaryDMARCResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: RadarEmailSummary
diff --git a/src/cloudflare/types/radar/email/routing/summary_encrypted_params.py b/src/cloudflare/types/radar/email/routing/summary_encrypted_params.py
index b6553448171..17cfc691b5e 100644
--- a/src/cloudflare/types/radar/email/routing/summary_encrypted_params.py
+++ b/src/cloudflare/types/radar/email/routing/summary_encrypted_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryEncryptedParams"]
@@ -13,35 +14,39 @@
 
 class SummaryEncryptedParams(TypedDict, total=False):
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
diff --git a/src/cloudflare/types/radar/email/routing/summary_encrypted_response.py b/src/cloudflare/types/radar/email/routing/summary_encrypted_response.py
index 5461181d3de..7839185cdd3 100644
--- a/src/cloudflare/types/radar/email/routing/summary_encrypted_response.py
+++ b/src/cloudflare/types/radar/email/routing/summary_encrypted_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,124 @@
 __all__ = [
     "SummaryEncryptedResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     encrypted: str = FieldInfo(alias="ENCRYPTED")
+    """A numeric string."""
 
     not_encrypted: str = FieldInfo(alias="NOT_ENCRYPTED")
+    """A numeric string."""
 
 
 class SummaryEncryptedResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/email/routing/summary_ip_version_params.py b/src/cloudflare/types/radar/email/routing/summary_ip_version_params.py
index a1e7d6396f4..c80a56a4024 100644
--- a/src/cloudflare/types/radar/email/routing/summary_ip_version_params.py
+++ b/src/cloudflare/types/radar/email/routing/summary_ip_version_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryIPVersionParams"]
@@ -13,35 +14,39 @@
 
 class SummaryIPVersionParams(TypedDict, total=False):
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]]
-    """Filter for encrypted emails."""
+    """Filters results by encryption status (encrypted vs. not-encrypted)."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
diff --git a/src/cloudflare/types/radar/email/routing/summary_ip_version_response.py b/src/cloudflare/types/radar/email/routing/summary_ip_version_response.py
index e1a3995c7e5..63a07734f7b 100644
--- a/src/cloudflare/types/radar/email/routing/summary_ip_version_response.py
+++ b/src/cloudflare/types/radar/email/routing/summary_ip_version_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,124 @@
 __all__ = [
     "SummaryIPVersionResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     i_pv4: str = FieldInfo(alias="IPv4")
+    """A numeric string."""
 
     i_pv6: str = FieldInfo(alias="IPv6")
+    """A numeric string."""
 
 
 class SummaryIPVersionResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/email/routing/summary_spf_params.py b/src/cloudflare/types/radar/email/routing/summary_spf_params.py
index f594b1931b7..a1277ce17e3 100644
--- a/src/cloudflare/types/radar/email/routing/summary_spf_params.py
+++ b/src/cloudflare/types/radar/email/routing/summary_spf_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummarySPFParams"]
@@ -13,35 +14,39 @@
 
 class SummarySPFParams(TypedDict, total=False):
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]]
-    """Filter for encrypted emails."""
+    """Filters results by encryption status (encrypted vs. not-encrypted)."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/email/routing/summary_spf_response.py b/src/cloudflare/types/radar/email/routing/summary_spf_response.py
index 9cd062e392f..f052a467858 100644
--- a/src/cloudflare/types/radar/email/routing/summary_spf_response.py
+++ b/src/cloudflare/types/radar/email/routing/summary_spf_response.py
@@ -1,57 +1,126 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 from ...radar_email_summary import RadarEmailSummary
 
-__all__ = ["SummarySPFResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "SummarySPFResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
 
-    level: Optional[int] = None
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class SummarySPFResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: RadarEmailSummary
diff --git a/src/cloudflare/types/radar/email/routing/timeseries_group_arc_params.py b/src/cloudflare/types/radar/email/routing/timeseries_group_arc_params.py
index 2c950448fe6..a6867c29b1b 100644
--- a/src/cloudflare/types/radar/email/routing/timeseries_group_arc_params.py
+++ b/src/cloudflare/types/radar/email/routing/timeseries_group_arc_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupARCParams"]
@@ -13,42 +14,46 @@
 
 class TimeseriesGroupARCParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]]
-    """Filter for encrypted emails."""
+    """Filters results by encryption status (encrypted vs. not-encrypted)."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
diff --git a/src/cloudflare/types/radar/email/routing/timeseries_group_arc_response.py b/src/cloudflare/types/radar/email/routing/timeseries_group_arc_response.py
index d3f31f162dd..f794bc222d9 100644
--- a/src/cloudflare/types/radar/email/routing/timeseries_group_arc_response.py
+++ b/src/cloudflare/types/radar/email/routing/timeseries_group_arc_response.py
@@ -1,13 +1,135 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 from ...radar_email_series import RadarEmailSeries
 
-__all__ = ["TimeseriesGroupARCResponse"]
+__all__ = [
+    "TimeseriesGroupARCResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class TimeseriesGroupARCResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: RadarEmailSeries
diff --git a/src/cloudflare/types/radar/email/routing/timeseries_group_dkim_params.py b/src/cloudflare/types/radar/email/routing/timeseries_group_dkim_params.py
index 28c98ab3c92..346d22ee326 100644
--- a/src/cloudflare/types/radar/email/routing/timeseries_group_dkim_params.py
+++ b/src/cloudflare/types/radar/email/routing/timeseries_group_dkim_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupDKIMParams"]
@@ -13,42 +14,46 @@
 
 class TimeseriesGroupDKIMParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]]
-    """Filter for encrypted emails."""
+    """Filters results by encryption status (encrypted vs. not-encrypted)."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
diff --git a/src/cloudflare/types/radar/email/routing/timeseries_group_dkim_response.py b/src/cloudflare/types/radar/email/routing/timeseries_group_dkim_response.py
index 7326ae59341..2175032f6df 100644
--- a/src/cloudflare/types/radar/email/routing/timeseries_group_dkim_response.py
+++ b/src/cloudflare/types/radar/email/routing/timeseries_group_dkim_response.py
@@ -1,13 +1,135 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 from ...radar_email_series import RadarEmailSeries
 
-__all__ = ["TimeseriesGroupDKIMResponse"]
+__all__ = [
+    "TimeseriesGroupDKIMResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class TimeseriesGroupDKIMResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: RadarEmailSeries
diff --git a/src/cloudflare/types/radar/email/routing/timeseries_group_dmarc_params.py b/src/cloudflare/types/radar/email/routing/timeseries_group_dmarc_params.py
index 71271e551db..e345a6ecbc5 100644
--- a/src/cloudflare/types/radar/email/routing/timeseries_group_dmarc_params.py
+++ b/src/cloudflare/types/radar/email/routing/timeseries_group_dmarc_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupDMARCParams"]
@@ -13,42 +14,43 @@
 
 class TimeseriesGroupDMARCParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]]
-    """Filter for encrypted emails."""
+    """Filters results by encryption status (encrypted vs. not-encrypted)."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
diff --git a/src/cloudflare/types/radar/email/routing/timeseries_group_dmarc_response.py b/src/cloudflare/types/radar/email/routing/timeseries_group_dmarc_response.py
index a27240408df..af824448ea3 100644
--- a/src/cloudflare/types/radar/email/routing/timeseries_group_dmarc_response.py
+++ b/src/cloudflare/types/radar/email/routing/timeseries_group_dmarc_response.py
@@ -1,13 +1,135 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 from ...radar_email_series import RadarEmailSeries
 
-__all__ = ["TimeseriesGroupDMARCResponse"]
+__all__ = [
+    "TimeseriesGroupDMARCResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class TimeseriesGroupDMARCResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: RadarEmailSeries
diff --git a/src/cloudflare/types/radar/email/routing/timeseries_group_encrypted_params.py b/src/cloudflare/types/radar/email/routing/timeseries_group_encrypted_params.py
index 093524f3bbd..ceadff96e83 100644
--- a/src/cloudflare/types/radar/email/routing/timeseries_group_encrypted_params.py
+++ b/src/cloudflare/types/radar/email/routing/timeseries_group_encrypted_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupEncryptedParams"]
@@ -13,42 +14,46 @@
 
 class TimeseriesGroupEncryptedParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
diff --git a/src/cloudflare/types/radar/email/routing/timeseries_group_encrypted_response.py b/src/cloudflare/types/radar/email/routing/timeseries_group_encrypted_response.py
index e6d73b1a0bf..5d7425073da 100644
--- a/src/cloudflare/types/radar/email/routing/timeseries_group_encrypted_response.py
+++ b/src/cloudflare/types/radar/email/routing/timeseries_group_encrypted_response.py
@@ -1,12 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupEncryptedResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupEncryptedResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -16,6 +135,7 @@ class Serie0(BaseModel):
 
 
 class TimeseriesGroupEncryptedResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/email/routing/timeseries_group_ip_version_params.py b/src/cloudflare/types/radar/email/routing/timeseries_group_ip_version_params.py
index f264feafdc3..61c77c9316b 100644
--- a/src/cloudflare/types/radar/email/routing/timeseries_group_ip_version_params.py
+++ b/src/cloudflare/types/radar/email/routing/timeseries_group_ip_version_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupIPVersionParams"]
@@ -13,42 +14,46 @@
 
 class TimeseriesGroupIPVersionParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]]
-    """Filter for encrypted emails."""
+    """Filters results by encryption status (encrypted vs. not-encrypted)."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
diff --git a/src/cloudflare/types/radar/email/routing/timeseries_group_ip_version_response.py b/src/cloudflare/types/radar/email/routing/timeseries_group_ip_version_response.py
index 613041d358d..5edd0161517 100644
--- a/src/cloudflare/types/radar/email/routing/timeseries_group_ip_version_response.py
+++ b/src/cloudflare/types/radar/email/routing/timeseries_group_ip_version_response.py
@@ -1,12 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupIPVersionResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupIPVersionResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -16,6 +135,7 @@ class Serie0(BaseModel):
 
 
 class TimeseriesGroupIPVersionResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/email/routing/timeseries_group_spf_params.py b/src/cloudflare/types/radar/email/routing/timeseries_group_spf_params.py
index 22168b70e9f..16481310fc7 100644
--- a/src/cloudflare/types/radar/email/routing/timeseries_group_spf_params.py
+++ b/src/cloudflare/types/radar/email/routing/timeseries_group_spf_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupSPFParams"]
@@ -13,42 +14,46 @@
 
 class TimeseriesGroupSPFParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]]
-    """Filter for encrypted emails."""
+    """Filters results by encryption status (encrypted vs. not-encrypted)."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/email/routing/timeseries_group_spf_response.py b/src/cloudflare/types/radar/email/routing/timeseries_group_spf_response.py
index 4e520fda2fa..6c8e5d03f39 100644
--- a/src/cloudflare/types/radar/email/routing/timeseries_group_spf_response.py
+++ b/src/cloudflare/types/radar/email/routing/timeseries_group_spf_response.py
@@ -1,13 +1,135 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 from ...radar_email_series import RadarEmailSeries
 
-__all__ = ["TimeseriesGroupSPFResponse"]
+__all__ = [
+    "TimeseriesGroupSPFResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class TimeseriesGroupSPFResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: RadarEmailSeries
diff --git a/src/cloudflare/types/radar/email/routing_summary_v2_params.py b/src/cloudflare/types/radar/email/routing_summary_v2_params.py
new file mode 100644
index 00000000000..5c0e6664ea4
--- /dev/null
+++ b/src/cloudflare/types/radar/email/routing_summary_v2_params.py
@@ -0,0 +1,62 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["RoutingSummaryV2Params"]
+
+
+class RoutingSummaryV2Params(TypedDict, total=False):
+    arc: List[Literal["PASS", "NONE", "FAIL"]]
+    """Filters results by ARC (Authenticated Received Chain) validation."""
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    dkim: List[Literal["PASS", "NONE", "FAIL"]]
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
+
+    dmarc: List[Literal["PASS", "NONE", "FAIL"]]
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
+
+    encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]]
+    """Filters results by encryption status (encrypted vs. not-encrypted)."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    spf: List[Literal["PASS", "NONE", "FAIL"]]
+    """Filters results by SPF (Sender Policy Framework) validation status."""
diff --git a/src/cloudflare/types/radar/email/routing_summary_v2_response.py b/src/cloudflare/types/radar/email/routing_summary_v2_response.py
new file mode 100644
index 00000000000..63b7bf4be63
--- /dev/null
+++ b/src/cloudflare/types/radar/email/routing_summary_v2_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "RoutingSummaryV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class RoutingSummaryV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/email/routing_timeseries_groups_v2_params.py b/src/cloudflare/types/radar/email/routing_timeseries_groups_v2_params.py
new file mode 100644
index 00000000000..6e36e07188d
--- /dev/null
+++ b/src/cloudflare/types/radar/email/routing_timeseries_groups_v2_params.py
@@ -0,0 +1,69 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["RoutingTimeseriesGroupsV2Params"]
+
+
+class RoutingTimeseriesGroupsV2Params(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    arc: List[Literal["PASS", "NONE", "FAIL"]]
+    """Filters results by ARC (Authenticated Received Chain) validation."""
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    dkim: List[Literal["PASS", "NONE", "FAIL"]]
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
+
+    dmarc: List[Literal["PASS", "NONE", "FAIL"]]
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
+
+    encrypted: List[Literal["ENCRYPTED", "NOT_ENCRYPTED"]]
+    """Filters results by encryption status (encrypted vs. not-encrypted)."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    spf: List[Literal["PASS", "NONE", "FAIL"]]
+    """Filters results by SPF (Sender Policy Framework) validation status."""
diff --git a/src/cloudflare/types/radar/email/routing_timeseries_groups_v2_response.py b/src/cloudflare/types/radar/email/routing_timeseries_groups_v2_response.py
new file mode 100644
index 00000000000..1b064a0ccc6
--- /dev/null
+++ b/src/cloudflare/types/radar/email/routing_timeseries_groups_v2_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "RoutingTimeseriesGroupsV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class RoutingTimeseriesGroupsV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/email/security/summary_arc_params.py b/src/cloudflare/types/radar/email/security/summary_arc_params.py
index b141a65af14..e007936b041 100644
--- a/src/cloudflare/types/radar/email/security/summary_arc_params.py
+++ b/src/cloudflare/types/radar/email/security/summary_arc_params.py
@@ -6,39 +6,44 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryARCParams"]
 
 
 class SummaryARCParams(TypedDict, total=False):
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/summary_arc_response.py b/src/cloudflare/types/radar/email/security/summary_arc_response.py
index 274e9a535ba..4d69d4b99d9 100644
--- a/src/cloudflare/types/radar/email/security/summary_arc_response.py
+++ b/src/cloudflare/types/radar/email/security/summary_arc_response.py
@@ -1,57 +1,126 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 from ...radar_email_summary import RadarEmailSummary
 
-__all__ = ["SummaryARCResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "SummaryARCResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
 
-    level: Optional[int] = None
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class SummaryARCResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: RadarEmailSummary
diff --git a/src/cloudflare/types/radar/email/security/summary_dkim_params.py b/src/cloudflare/types/radar/email/security/summary_dkim_params.py
index f92d7545793..3403d0dba75 100644
--- a/src/cloudflare/types/radar/email/security/summary_dkim_params.py
+++ b/src/cloudflare/types/radar/email/security/summary_dkim_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryDKIMParams"]
@@ -13,32 +14,36 @@
 
 class SummaryDKIMParams(TypedDict, total=False):
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/summary_dkim_response.py b/src/cloudflare/types/radar/email/security/summary_dkim_response.py
index df8a79048cd..29cb4c47445 100644
--- a/src/cloudflare/types/radar/email/security/summary_dkim_response.py
+++ b/src/cloudflare/types/radar/email/security/summary_dkim_response.py
@@ -1,57 +1,126 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 from ...radar_email_summary import RadarEmailSummary
 
-__all__ = ["SummaryDKIMResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "SummaryDKIMResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
 
-    level: Optional[int] = None
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class SummaryDKIMResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: RadarEmailSummary
diff --git a/src/cloudflare/types/radar/email/security/summary_dmarc_params.py b/src/cloudflare/types/radar/email/security/summary_dmarc_params.py
index f31a3218ce0..01d4a5661ac 100644
--- a/src/cloudflare/types/radar/email/security/summary_dmarc_params.py
+++ b/src/cloudflare/types/radar/email/security/summary_dmarc_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryDMARCParams"]
@@ -13,32 +14,33 @@
 
 class SummaryDMARCParams(TypedDict, total=False):
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/summary_dmarc_response.py b/src/cloudflare/types/radar/email/security/summary_dmarc_response.py
index 0563a742286..f0068fdc733 100644
--- a/src/cloudflare/types/radar/email/security/summary_dmarc_response.py
+++ b/src/cloudflare/types/radar/email/security/summary_dmarc_response.py
@@ -1,57 +1,126 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 from ...radar_email_summary import RadarEmailSummary
 
-__all__ = ["SummaryDMARCResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "SummaryDMARCResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
 
-    level: Optional[int] = None
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class SummaryDMARCResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: RadarEmailSummary
diff --git a/src/cloudflare/types/radar/email/security/summary_malicious_params.py b/src/cloudflare/types/radar/email/security/summary_malicious_params.py
index 432685036f3..0bb44bc19ed 100644
--- a/src/cloudflare/types/radar/email/security/summary_malicious_params.py
+++ b/src/cloudflare/types/radar/email/security/summary_malicious_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryMaliciousParams"]
@@ -13,35 +14,39 @@
 
 class SummaryMaliciousParams(TypedDict, total=False):
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/summary_malicious_response.py b/src/cloudflare/types/radar/email/security/summary_malicious_response.py
index 44426a6e84e..992e40274f6 100644
--- a/src/cloudflare/types/radar/email/security/summary_malicious_response.py
+++ b/src/cloudflare/types/radar/email/security/summary_malicious_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,124 @@
 __all__ = [
     "SummaryMaliciousResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     malicious: str = FieldInfo(alias="MALICIOUS")
+    """A numeric string."""
 
     not_malicious: str = FieldInfo(alias="NOT_MALICIOUS")
+    """A numeric string."""
 
 
 class SummaryMaliciousResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/email/security/summary_spam_params.py b/src/cloudflare/types/radar/email/security/summary_spam_params.py
index bc535bf3aae..199f2a8ea4f 100644
--- a/src/cloudflare/types/radar/email/security/summary_spam_params.py
+++ b/src/cloudflare/types/radar/email/security/summary_spam_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummarySpamParams"]
@@ -13,35 +14,39 @@
 
 class SummarySpamParams(TypedDict, total=False):
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/summary_spam_response.py b/src/cloudflare/types/radar/email/security/summary_spam_response.py
index 4fe4f3c5172..d1887a06c06 100644
--- a/src/cloudflare/types/radar/email/security/summary_spam_response.py
+++ b/src/cloudflare/types/radar/email/security/summary_spam_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,124 @@
 __all__ = [
     "SummarySpamResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     not_spam: str = FieldInfo(alias="NOT_SPAM")
+    """A numeric string."""
 
     spam: str = FieldInfo(alias="SPAM")
+    """A numeric string."""
 
 
 class SummarySpamResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/email/security/summary_spf_params.py b/src/cloudflare/types/radar/email/security/summary_spf_params.py
index 43e4ba10cc7..b836b5e9236 100644
--- a/src/cloudflare/types/radar/email/security/summary_spf_params.py
+++ b/src/cloudflare/types/radar/email/security/summary_spf_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummarySPFParams"]
@@ -13,32 +14,36 @@
 
 class SummarySPFParams(TypedDict, total=False):
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/summary_spf_response.py b/src/cloudflare/types/radar/email/security/summary_spf_response.py
index 9cd062e392f..f052a467858 100644
--- a/src/cloudflare/types/radar/email/security/summary_spf_response.py
+++ b/src/cloudflare/types/radar/email/security/summary_spf_response.py
@@ -1,57 +1,126 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 from ...radar_email_summary import RadarEmailSummary
 
-__all__ = ["SummarySPFResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "SummarySPFResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
 
-    level: Optional[int] = None
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class SummarySPFResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: RadarEmailSummary
diff --git a/src/cloudflare/types/radar/email/security/summary_spoof_params.py b/src/cloudflare/types/radar/email/security/summary_spoof_params.py
index f82a3b58522..3ab812ddd3c 100644
--- a/src/cloudflare/types/radar/email/security/summary_spoof_params.py
+++ b/src/cloudflare/types/radar/email/security/summary_spoof_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummarySpoofParams"]
@@ -13,35 +14,39 @@
 
 class SummarySpoofParams(TypedDict, total=False):
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/summary_spoof_response.py b/src/cloudflare/types/radar/email/security/summary_spoof_response.py
index b9e738ea0e1..9865f46d642 100644
--- a/src/cloudflare/types/radar/email/security/summary_spoof_response.py
+++ b/src/cloudflare/types/radar/email/security/summary_spoof_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,124 @@
 __all__ = [
     "SummarySpoofResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     not_spoof: str = FieldInfo(alias="NOT_SPOOF")
+    """A numeric string."""
 
     spoof: str = FieldInfo(alias="SPOOF")
+    """A numeric string."""
 
 
 class SummarySpoofResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/email/security/summary_threat_category_params.py b/src/cloudflare/types/radar/email/security/summary_threat_category_params.py
index c38e50ac6b3..ca7259f8fb5 100644
--- a/src/cloudflare/types/radar/email/security/summary_threat_category_params.py
+++ b/src/cloudflare/types/radar/email/security/summary_threat_category_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryThreatCategoryParams"]
@@ -13,35 +14,39 @@
 
 class SummaryThreatCategoryParams(TypedDict, total=False):
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/summary_threat_category_response.py b/src/cloudflare/types/radar/email/security/summary_threat_category_response.py
index 36e2d29bbdf..d0fa7a7a84d 100644
--- a/src/cloudflare/types/radar/email/security/summary_threat_category_response.py
+++ b/src/cloudflare/types/radar/email/security/summary_threat_category_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,64 +11,130 @@
 __all__ = [
     "SummaryThreatCategoryResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     brand_impersonation: str = FieldInfo(alias="BrandImpersonation")
+    """A numeric string."""
 
     credential_harvester: str = FieldInfo(alias="CredentialHarvester")
+    """A numeric string."""
 
     identity_deception: str = FieldInfo(alias="IdentityDeception")
+    """A numeric string."""
 
     link: str = FieldInfo(alias="Link")
+    """A numeric string."""
 
 
 class SummaryThreatCategoryResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/email/security/summary_tls_version_params.py b/src/cloudflare/types/radar/email/security/summary_tls_version_params.py
index 4d7362e138e..c87394b8899 100644
--- a/src/cloudflare/types/radar/email/security/summary_tls_version_params.py
+++ b/src/cloudflare/types/radar/email/security/summary_tls_version_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["SummaryTLSVersionParams"]
@@ -13,32 +14,36 @@
 
 class SummaryTLSVersionParams(TypedDict, total=False):
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
diff --git a/src/cloudflare/types/radar/email/security/summary_tls_version_response.py b/src/cloudflare/types/radar/email/security/summary_tls_version_response.py
index f9ea5ad0711..2370529a831 100644
--- a/src/cloudflare/types/radar/email/security/summary_tls_version_response.py
+++ b/src/cloudflare/types/radar/email/security/summary_tls_version_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,64 +11,130 @@
 __all__ = [
     "SummaryTLSVersionResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     tls_1_0: str = FieldInfo(alias="TLS 1.0")
+    """A numeric string."""
 
     tls_1_1: str = FieldInfo(alias="TLS 1.1")
+    """A numeric string."""
 
     tls_1_2: str = FieldInfo(alias="TLS 1.2")
+    """A numeric string."""
 
     tls_1_3: str = FieldInfo(alias="TLS 1.3")
+    """A numeric string."""
 
 
 class SummaryTLSVersionResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/email/security/timeseries_group_arc_params.py b/src/cloudflare/types/radar/email/security/timeseries_group_arc_params.py
index abc50a0d1c2..a08ed2d7172 100644
--- a/src/cloudflare/types/radar/email/security/timeseries_group_arc_params.py
+++ b/src/cloudflare/types/radar/email/security/timeseries_group_arc_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupARCParams"]
@@ -13,39 +14,43 @@
 
 class TimeseriesGroupARCParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/timeseries_group_arc_response.py b/src/cloudflare/types/radar/email/security/timeseries_group_arc_response.py
index d3f31f162dd..f794bc222d9 100644
--- a/src/cloudflare/types/radar/email/security/timeseries_group_arc_response.py
+++ b/src/cloudflare/types/radar/email/security/timeseries_group_arc_response.py
@@ -1,13 +1,135 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 from ...radar_email_series import RadarEmailSeries
 
-__all__ = ["TimeseriesGroupARCResponse"]
+__all__ = [
+    "TimeseriesGroupARCResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class TimeseriesGroupARCResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: RadarEmailSeries
diff --git a/src/cloudflare/types/radar/email/security/timeseries_group_dkim_params.py b/src/cloudflare/types/radar/email/security/timeseries_group_dkim_params.py
index 25f67103fbc..54a4979b5e9 100644
--- a/src/cloudflare/types/radar/email/security/timeseries_group_dkim_params.py
+++ b/src/cloudflare/types/radar/email/security/timeseries_group_dkim_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupDKIMParams"]
@@ -13,39 +14,43 @@
 
 class TimeseriesGroupDKIMParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/timeseries_group_dkim_response.py b/src/cloudflare/types/radar/email/security/timeseries_group_dkim_response.py
index 7326ae59341..2175032f6df 100644
--- a/src/cloudflare/types/radar/email/security/timeseries_group_dkim_response.py
+++ b/src/cloudflare/types/radar/email/security/timeseries_group_dkim_response.py
@@ -1,13 +1,135 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 from ...radar_email_series import RadarEmailSeries
 
-__all__ = ["TimeseriesGroupDKIMResponse"]
+__all__ = [
+    "TimeseriesGroupDKIMResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class TimeseriesGroupDKIMResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: RadarEmailSeries
diff --git a/src/cloudflare/types/radar/email/security/timeseries_group_dmarc_params.py b/src/cloudflare/types/radar/email/security/timeseries_group_dmarc_params.py
index b6c44355beb..031417b4141 100644
--- a/src/cloudflare/types/radar/email/security/timeseries_group_dmarc_params.py
+++ b/src/cloudflare/types/radar/email/security/timeseries_group_dmarc_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupDMARCParams"]
@@ -13,39 +14,40 @@
 
 class TimeseriesGroupDMARCParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/timeseries_group_dmarc_response.py b/src/cloudflare/types/radar/email/security/timeseries_group_dmarc_response.py
index a27240408df..af824448ea3 100644
--- a/src/cloudflare/types/radar/email/security/timeseries_group_dmarc_response.py
+++ b/src/cloudflare/types/radar/email/security/timeseries_group_dmarc_response.py
@@ -1,13 +1,135 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 from ...radar_email_series import RadarEmailSeries
 
-__all__ = ["TimeseriesGroupDMARCResponse"]
+__all__ = [
+    "TimeseriesGroupDMARCResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class TimeseriesGroupDMARCResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: RadarEmailSeries
diff --git a/src/cloudflare/types/radar/email/security/timeseries_group_malicious_params.py b/src/cloudflare/types/radar/email/security/timeseries_group_malicious_params.py
index 4fadea1473b..940ba7af75d 100644
--- a/src/cloudflare/types/radar/email/security/timeseries_group_malicious_params.py
+++ b/src/cloudflare/types/radar/email/security/timeseries_group_malicious_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupMaliciousParams"]
@@ -13,42 +14,46 @@
 
 class TimeseriesGroupMaliciousParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/timeseries_group_malicious_response.py b/src/cloudflare/types/radar/email/security/timeseries_group_malicious_response.py
index ad00ede30b2..259eecd2e1f 100644
--- a/src/cloudflare/types/radar/email/security/timeseries_group_malicious_response.py
+++ b/src/cloudflare/types/radar/email/security/timeseries_group_malicious_response.py
@@ -1,12 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupMaliciousResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupMaliciousResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -16,6 +135,7 @@ class Serie0(BaseModel):
 
 
 class TimeseriesGroupMaliciousResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/email/security/timeseries_group_spam_params.py b/src/cloudflare/types/radar/email/security/timeseries_group_spam_params.py
index cf290efb92d..4382aaf058e 100644
--- a/src/cloudflare/types/radar/email/security/timeseries_group_spam_params.py
+++ b/src/cloudflare/types/radar/email/security/timeseries_group_spam_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupSpamParams"]
@@ -13,42 +14,46 @@
 
 class TimeseriesGroupSpamParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/timeseries_group_spam_response.py b/src/cloudflare/types/radar/email/security/timeseries_group_spam_response.py
index 2ef1a477591..7b97ba85120 100644
--- a/src/cloudflare/types/radar/email/security/timeseries_group_spam_response.py
+++ b/src/cloudflare/types/radar/email/security/timeseries_group_spam_response.py
@@ -1,12 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupSpamResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupSpamResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -16,6 +135,7 @@ class Serie0(BaseModel):
 
 
 class TimeseriesGroupSpamResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/email/security/timeseries_group_spf_params.py b/src/cloudflare/types/radar/email/security/timeseries_group_spf_params.py
index 02c8899e043..3687869fdb2 100644
--- a/src/cloudflare/types/radar/email/security/timeseries_group_spf_params.py
+++ b/src/cloudflare/types/radar/email/security/timeseries_group_spf_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupSPFParams"]
@@ -13,39 +14,43 @@
 
 class TimeseriesGroupSPFParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/timeseries_group_spf_response.py b/src/cloudflare/types/radar/email/security/timeseries_group_spf_response.py
index 4e520fda2fa..6c8e5d03f39 100644
--- a/src/cloudflare/types/radar/email/security/timeseries_group_spf_response.py
+++ b/src/cloudflare/types/radar/email/security/timeseries_group_spf_response.py
@@ -1,13 +1,135 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 from ...radar_email_series import RadarEmailSeries
 
-__all__ = ["TimeseriesGroupSPFResponse"]
+__all__ = [
+    "TimeseriesGroupSPFResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class TimeseriesGroupSPFResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: RadarEmailSeries
diff --git a/src/cloudflare/types/radar/email/security/timeseries_group_spoof_params.py b/src/cloudflare/types/radar/email/security/timeseries_group_spoof_params.py
index 7192baec686..5bf39820681 100644
--- a/src/cloudflare/types/radar/email/security/timeseries_group_spoof_params.py
+++ b/src/cloudflare/types/radar/email/security/timeseries_group_spoof_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupSpoofParams"]
@@ -13,42 +14,46 @@
 
 class TimeseriesGroupSpoofParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/timeseries_group_spoof_response.py b/src/cloudflare/types/radar/email/security/timeseries_group_spoof_response.py
index e5df9bebbd6..04fe2c4b789 100644
--- a/src/cloudflare/types/radar/email/security/timeseries_group_spoof_response.py
+++ b/src/cloudflare/types/radar/email/security/timeseries_group_spoof_response.py
@@ -1,12 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupSpoofResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupSpoofResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -16,6 +135,7 @@ class Serie0(BaseModel):
 
 
 class TimeseriesGroupSpoofResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/email/security/timeseries_group_threat_category_params.py b/src/cloudflare/types/radar/email/security/timeseries_group_threat_category_params.py
index 2db3534a333..4e9b7188386 100644
--- a/src/cloudflare/types/radar/email/security/timeseries_group_threat_category_params.py
+++ b/src/cloudflare/types/radar/email/security/timeseries_group_threat_category_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupThreatCategoryParams"]
@@ -13,42 +14,46 @@
 
 class TimeseriesGroupThreatCategoryParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/timeseries_group_threat_category_response.py b/src/cloudflare/types/radar/email/security/timeseries_group_threat_category_response.py
index 001546718bb..61b82e6df48 100644
--- a/src/cloudflare/types/radar/email/security/timeseries_group_threat_category_response.py
+++ b/src/cloudflare/types/radar/email/security/timeseries_group_threat_category_response.py
@@ -1,12 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupThreatCategoryResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupThreatCategoryResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -20,6 +139,7 @@ class Serie0(BaseModel):
 
 
 class TimeseriesGroupThreatCategoryResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/email/security/timeseries_group_tls_version_params.py b/src/cloudflare/types/radar/email/security/timeseries_group_tls_version_params.py
index 84a9ada0097..4b701fc9145 100644
--- a/src/cloudflare/types/radar/email/security/timeseries_group_tls_version_params.py
+++ b/src/cloudflare/types/radar/email/security/timeseries_group_tls_version_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupTLSVersionParams"]
@@ -13,39 +14,43 @@
 
 class TimeseriesGroupTLSVersionParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
diff --git a/src/cloudflare/types/radar/email/security/timeseries_group_tls_version_response.py b/src/cloudflare/types/radar/email/security/timeseries_group_tls_version_response.py
index 8e41a81157a..d5edabd5367 100644
--- a/src/cloudflare/types/radar/email/security/timeseries_group_tls_version_response.py
+++ b/src/cloudflare/types/radar/email/security/timeseries_group_tls_version_response.py
@@ -1,12 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TimeseriesGroupTLSVersionResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupTLSVersionResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -20,6 +139,7 @@ class Serie0(BaseModel):
 
 
 class TimeseriesGroupTLSVersionResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/email/security/top/__init__.py b/src/cloudflare/types/radar/email/security/top/__init__.py
index 99d37f10936..dc25a1d35bd 100644
--- a/src/cloudflare/types/radar/email/security/top/__init__.py
+++ b/src/cloudflare/types/radar/email/security/top/__init__.py
@@ -2,5 +2,5 @@
 
 from __future__ import annotations
 
-from .tld_get_params import TldGetParams as TldGetParams
-from .tld_get_response import TldGetResponse as TldGetResponse
+from .tld_get_params import TLDGetParams as TLDGetParams
+from .tld_get_response import TLDGetResponse as TLDGetResponse
diff --git a/src/cloudflare/types/radar/email/security/top/tld_get_params.py b/src/cloudflare/types/radar/email/security/top/tld_get_params.py
index 3921a4e597d..f7da6919205 100644
--- a/src/cloudflare/types/radar/email/security/top/tld_get_params.py
+++ b/src/cloudflare/types/radar/email/security/top/tld_get_params.py
@@ -6,48 +6,53 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ......_types import SequenceNotStr
 from ......_utils import PropertyInfo
 
-__all__ = ["TldGetParams"]
+__all__ = ["TLDGetParams"]
 
 
-class TldGetParams(TypedDict, total=False):
+class TLDGetParams(TypedDict, total=False):
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
 
     tld_category: Annotated[Literal["CLASSIC", "COUNTRY"], PropertyInfo(alias="tldCategory")]
-    """Filter for TLDs by category."""
+    """Filters results by TLD category."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/top/tld_get_response.py b/src/cloudflare/types/radar/email/security/top/tld_get_response.py
index f9c3e48d916..97395a5f335 100644
--- a/src/cloudflare/types/radar/email/security/top/tld_get_response.py
+++ b/src/cloudflare/types/radar/email/security/top/tld_get_response.py
@@ -2,13 +2,77 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ......_models import BaseModel
-from ....http.browser import Browser
 
-__all__ = ["TldGetResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
+__all__ = [
+    "TLDGetResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
 
 class MetaDateRange(BaseModel):
@@ -19,37 +83,51 @@ class MetaDateRange(BaseModel):
     """Adjusted start of date range."""
 
 
-class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+class MetaUnit(BaseModel):
+    name: str
 
-    description: str
+    value: str
 
-    event_type: str = FieldInfo(alias="eventType")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
-
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+class Meta(BaseModel):
+    """Metadata for the results."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    level: Optional[int] = None
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
-class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+class Top0(BaseModel):
+    name: str
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    value: str
+    """A numeric string."""
 
 
-class TldGetResponse(BaseModel):
+class TLDGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
-    top_0: List[Browser]
+    top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/email/security/top/tlds/malicious_get_params.py b/src/cloudflare/types/radar/email/security/top/tlds/malicious_get_params.py
index e1cc9a0218f..4ca4c9d5e7a 100644
--- a/src/cloudflare/types/radar/email/security/top/tlds/malicious_get_params.py
+++ b/src/cloudflare/types/radar/email/security/top/tlds/malicious_get_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ......._types import SequenceNotStr
 from ......._utils import PropertyInfo
 
 __all__ = ["MaliciousGetParams"]
@@ -13,41 +14,45 @@
 
 class MaliciousGetParams(TypedDict, total=False):
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
 
     tld_category: Annotated[Literal["CLASSIC", "COUNTRY"], PropertyInfo(alias="tldCategory")]
-    """Filter for TLDs by category."""
+    """Filters results by TLD category."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/top/tlds/malicious_get_response.py b/src/cloudflare/types/radar/email/security/top/tlds/malicious_get_response.py
index 1ad92077064..897c38f61ce 100644
--- a/src/cloudflare/types/radar/email/security/top/tlds/malicious_get_response.py
+++ b/src/cloudflare/types/radar/email/security/top/tlds/malicious_get_response.py
@@ -2,13 +2,77 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ......._models import BaseModel
-from .....http.browser import Browser
 
-__all__ = ["MaliciousGetResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
+__all__ = [
+    "MaliciousGetResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
 
 class MetaDateRange(BaseModel):
@@ -19,37 +83,51 @@ class MetaDateRange(BaseModel):
     """Adjusted start of date range."""
 
 
-class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+class MetaUnit(BaseModel):
+    name: str
 
-    description: str
+    value: str
 
-    event_type: str = FieldInfo(alias="eventType")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
-
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+class Meta(BaseModel):
+    """Metadata for the results."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    level: Optional[int] = None
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
-class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+class Top0(BaseModel):
+    name: str
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    value: str
+    """A numeric string."""
 
 
 class MaliciousGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
-    top_0: List[Browser]
+    top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/email/security/top/tlds/spam_get_params.py b/src/cloudflare/types/radar/email/security/top/tlds/spam_get_params.py
index 69fbfba03d0..b1a9fb7b342 100644
--- a/src/cloudflare/types/radar/email/security/top/tlds/spam_get_params.py
+++ b/src/cloudflare/types/radar/email/security/top/tlds/spam_get_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ......._types import SequenceNotStr
 from ......._utils import PropertyInfo
 
 __all__ = ["SpamGetParams"]
@@ -13,41 +14,45 @@
 
 class SpamGetParams(TypedDict, total=False):
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
 
     tld_category: Annotated[Literal["CLASSIC", "COUNTRY"], PropertyInfo(alias="tldCategory")]
-    """Filter for TLDs by category."""
+    """Filters results by TLD category."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/top/tlds/spam_get_response.py b/src/cloudflare/types/radar/email/security/top/tlds/spam_get_response.py
index a2bf953b472..4d2b2c90b5f 100644
--- a/src/cloudflare/types/radar/email/security/top/tlds/spam_get_response.py
+++ b/src/cloudflare/types/radar/email/security/top/tlds/spam_get_response.py
@@ -2,13 +2,77 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ......._models import BaseModel
-from .....http.browser import Browser
 
-__all__ = ["SpamGetResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
+__all__ = [
+    "SpamGetResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
 
 class MetaDateRange(BaseModel):
@@ -19,37 +83,51 @@ class MetaDateRange(BaseModel):
     """Adjusted start of date range."""
 
 
-class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+class MetaUnit(BaseModel):
+    name: str
 
-    description: str
+    value: str
 
-    event_type: str = FieldInfo(alias="eventType")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
-
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+class Meta(BaseModel):
+    """Metadata for the results."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    level: Optional[int] = None
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
-class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+class Top0(BaseModel):
+    name: str
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    value: str
+    """A numeric string."""
 
 
 class SpamGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
-    top_0: List[Browser]
+    top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/email/security/top/tlds/spoof_get_params.py b/src/cloudflare/types/radar/email/security/top/tlds/spoof_get_params.py
index 5750c343985..474601767dd 100644
--- a/src/cloudflare/types/radar/email/security/top/tlds/spoof_get_params.py
+++ b/src/cloudflare/types/radar/email/security/top/tlds/spoof_get_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ......._types import SequenceNotStr
 from ......._utils import PropertyInfo
 
 __all__ = ["SpoofGetParams"]
@@ -13,41 +14,45 @@
 
 class SpoofGetParams(TypedDict, total=False):
     arc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for arc (Authenticated Received Chain)."""
+    """Filters results by ARC (Authenticated Received Chain) validation."""
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     dkim: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dkim."""
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
 
     dmarc: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for dmarc."""
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     spf: List[Literal["PASS", "NONE", "FAIL"]]
-    """Filter for spf."""
+    """Filters results by SPF (Sender Policy Framework) validation status."""
 
     tld_category: Annotated[Literal["CLASSIC", "COUNTRY"], PropertyInfo(alias="tldCategory")]
-    """Filter for TLDs by category."""
+    """Filters results by TLD category."""
 
     tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security/top/tlds/spoof_get_response.py b/src/cloudflare/types/radar/email/security/top/tlds/spoof_get_response.py
index 18a319011be..e6c0777a185 100644
--- a/src/cloudflare/types/radar/email/security/top/tlds/spoof_get_response.py
+++ b/src/cloudflare/types/radar/email/security/top/tlds/spoof_get_response.py
@@ -2,13 +2,77 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ......._models import BaseModel
-from .....http.browser import Browser
 
-__all__ = ["SpoofGetResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
+__all__ = [
+    "SpoofGetResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
 
 class MetaDateRange(BaseModel):
@@ -19,37 +83,51 @@ class MetaDateRange(BaseModel):
     """Adjusted start of date range."""
 
 
-class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+class MetaUnit(BaseModel):
+    name: str
 
-    description: str
+    value: str
 
-    event_type: str = FieldInfo(alias="eventType")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
-
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+class Meta(BaseModel):
+    """Metadata for the results."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    level: Optional[int] = None
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
-class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+class Top0(BaseModel):
+    name: str
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    value: str
+    """A numeric string."""
 
 
 class SpoofGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
-    top_0: List[Browser]
+    top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/email/security_summary_v2_params.py b/src/cloudflare/types/radar/email/security_summary_v2_params.py
new file mode 100644
index 00000000000..6221f1d3558
--- /dev/null
+++ b/src/cloudflare/types/radar/email/security_summary_v2_params.py
@@ -0,0 +1,59 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["SecuritySummaryV2Params"]
+
+
+class SecuritySummaryV2Params(TypedDict, total=False):
+    arc: List[Literal["PASS", "NONE", "FAIL"]]
+    """Filters results by ARC (Authenticated Received Chain) validation."""
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    dkim: List[Literal["PASS", "NONE", "FAIL"]]
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
+
+    dmarc: List[Literal["PASS", "NONE", "FAIL"]]
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    spf: List[Literal["PASS", "NONE", "FAIL"]]
+    """Filters results by SPF (Sender Policy Framework) validation status."""
+
+    tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security_summary_v2_response.py b/src/cloudflare/types/radar/email/security_summary_v2_response.py
new file mode 100644
index 00000000000..53cdb0bb538
--- /dev/null
+++ b/src/cloudflare/types/radar/email/security_summary_v2_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "SecuritySummaryV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class SecuritySummaryV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/email/security_timeseries_groups_v2_params.py b/src/cloudflare/types/radar/email/security_timeseries_groups_v2_params.py
new file mode 100644
index 00000000000..3027311c181
--- /dev/null
+++ b/src/cloudflare/types/radar/email/security_timeseries_groups_v2_params.py
@@ -0,0 +1,66 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["SecurityTimeseriesGroupsV2Params"]
+
+
+class SecurityTimeseriesGroupsV2Params(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    arc: List[Literal["PASS", "NONE", "FAIL"]]
+    """Filters results by ARC (Authenticated Received Chain) validation."""
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    dkim: List[Literal["PASS", "NONE", "FAIL"]]
+    """Filters results by DKIM (DomainKeys Identified Mail) validation status."""
+
+    dmarc: List[Literal["PASS", "NONE", "FAIL"]]
+    """
+    Filters results by DMARC (Domain-based Message Authentication, Reporting and
+    Conformance) validation status.
+    """
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    spf: List[Literal["PASS", "NONE", "FAIL"]]
+    """Filters results by SPF (Sender Policy Framework) validation status."""
+
+    tls_version: Annotated[List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3"]], PropertyInfo(alias="tlsVersion")]
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/email/security_timeseries_groups_v2_response.py b/src/cloudflare/types/radar/email/security_timeseries_groups_v2_response.py
new file mode 100644
index 00000000000..2248365b971
--- /dev/null
+++ b/src/cloudflare/types/radar/email/security_timeseries_groups_v2_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "SecurityTimeseriesGroupsV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class SecurityTimeseriesGroupsV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/entities/__init__.py b/src/cloudflare/types/radar/entities/__init__.py
index 4d86141ffd1..6c5003d8aab 100644
--- a/src/cloudflare/types/radar/entities/__init__.py
+++ b/src/cloudflare/types/radar/entities/__init__.py
@@ -9,7 +9,9 @@
 from .asn_list_params import ASNListParams as ASNListParams
 from .asn_get_response import ASNGetResponse as ASNGetResponse
 from .asn_rel_response import ASNRelResponse as ASNRelResponse
+from .asn_as_set_params import ASNAsSetParams as ASNAsSetParams
 from .asn_list_response import ASNListResponse as ASNListResponse
+from .asn_as_set_response import ASNAsSetResponse as ASNAsSetResponse
 from .location_get_params import LocationGetParams as LocationGetParams
 from .location_list_params import LocationListParams as LocationListParams
 from .location_get_response import LocationGetResponse as LocationGetResponse
diff --git a/src/cloudflare/types/radar/entities/asn_as_set_params.py b/src/cloudflare/types/radar/entities/asn_as_set_params.py
new file mode 100644
index 00000000000..f9e0a359024
--- /dev/null
+++ b/src/cloudflare/types/radar/entities/asn_as_set_params.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["ASNAsSetParams"]
+
+
+class ASNAsSetParams(TypedDict, total=False):
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
diff --git a/src/cloudflare/types/radar/entities/asn_as_set_response.py b/src/cloudflare/types/radar/entities/asn_as_set_response.py
new file mode 100644
index 00000000000..6d4224c8814
--- /dev/null
+++ b/src/cloudflare/types/radar/entities/asn_as_set_response.py
@@ -0,0 +1,43 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ...._models import BaseModel
+
+__all__ = ["ASNAsSetResponse", "AsSet"]
+
+
+class AsSet(BaseModel):
+    as_members_count: int
+    """The number of AS members in the AS-SET"""
+
+    as_set_members_count: int
+    """The number of AS-SET members in the AS-SET"""
+
+    as_set_upstreams_count: int
+    """The number of recursive upstream AS-SETs"""
+
+    asn_cone_size: int
+    """The number of unique ASNs in the AS-SETs recursive downstream"""
+
+    irr_sources: List[str]
+    """The IRR sources of the AS-SET"""
+
+    name: str
+    """The name of the AS-SET"""
+
+    hierarchical_asn: Optional[int] = None
+    """The AS number following hierarchical AS-SET name"""
+
+    inferred_asn: Optional[int] = None
+    """The inferred AS number of the AS-SET"""
+
+    peeringdb_asn: Optional[int] = None
+    """The AS number matching PeeringDB record"""
+
+
+class ASNAsSetResponse(BaseModel):
+    as_sets: List[AsSet]
+
+    paths: List[List[str]]
+    """Paths from the AS-SET that include the given AS to its upstreams recursively"""
diff --git a/src/cloudflare/types/radar/entities/asn_get_params.py b/src/cloudflare/types/radar/entities/asn_get_params.py
index c74a42d2517..9d039842992 100644
--- a/src/cloudflare/types/radar/entities/asn_get_params.py
+++ b/src/cloudflare/types/radar/entities/asn_get_params.py
@@ -9,4 +9,4 @@
 
 class ASNGetParams(TypedDict, total=False):
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
diff --git a/src/cloudflare/types/radar/entities/asn_get_response.py b/src/cloudflare/types/radar/entities/asn_get_response.py
index 37662d3be55..91682548ba1 100644
--- a/src/cloudflare/types/radar/entities/asn_get_response.py
+++ b/src/cloudflare/types/radar/entities/asn_get_response.py
@@ -15,14 +15,14 @@ class ASNEstimatedUsersLocation(BaseModel):
     location_name: str = FieldInfo(alias="locationName")
 
     estimated_users: Optional[int] = FieldInfo(alias="estimatedUsers", default=None)
-    """Estimated users per location"""
+    """Estimated users per location."""
 
 
 class ASNEstimatedUsers(BaseModel):
     locations: List[ASNEstimatedUsersLocation]
 
     estimated_users: Optional[int] = FieldInfo(alias="estimatedUsers", default=None)
-    """Total estimated users"""
+    """Total estimated users."""
 
 
 class ASNRelated(BaseModel):
@@ -33,7 +33,7 @@ class ASNRelated(BaseModel):
     aka: Optional[str] = None
 
     estimated_users: Optional[int] = FieldInfo(alias="estimatedUsers", default=None)
-    """Total estimated users"""
+    """Total estimated users."""
 
 
 class ASN(BaseModel):
@@ -54,15 +54,12 @@ class ASN(BaseModel):
     related: List[ASNRelated]
 
     source: str
-    """Regional Internet Registry"""
+    """Regional Internet Registry."""
 
     website: str
 
     aka: Optional[str] = None
 
-    name_long: Optional[str] = FieldInfo(alias="nameLong", default=None)
-    """Deprecated field. Please use 'aka'."""
-
 
 class ASNGetResponse(BaseModel):
     asn: ASN
diff --git a/src/cloudflare/types/radar/entities/asn_ip_params.py b/src/cloudflare/types/radar/entities/asn_ip_params.py
index 11d8bfa9dd0..ff2e2207073 100644
--- a/src/cloudflare/types/radar/entities/asn_ip_params.py
+++ b/src/cloudflare/types/radar/entities/asn_ip_params.py
@@ -12,4 +12,4 @@ class ASNIPParams(TypedDict, total=False):
     """IP address."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
diff --git a/src/cloudflare/types/radar/entities/asn_ip_response.py b/src/cloudflare/types/radar/entities/asn_ip_response.py
index 3e4337e7756..6a26dc3d92c 100644
--- a/src/cloudflare/types/radar/entities/asn_ip_response.py
+++ b/src/cloudflare/types/radar/entities/asn_ip_response.py
@@ -15,14 +15,14 @@ class ASNEstimatedUsersLocation(BaseModel):
     location_name: str = FieldInfo(alias="locationName")
 
     estimated_users: Optional[int] = FieldInfo(alias="estimatedUsers", default=None)
-    """Estimated users per location"""
+    """Estimated users per location."""
 
 
 class ASNEstimatedUsers(BaseModel):
     locations: List[ASNEstimatedUsersLocation]
 
     estimated_users: Optional[int] = FieldInfo(alias="estimatedUsers", default=None)
-    """Total estimated users"""
+    """Total estimated users."""
 
 
 class ASNRelated(BaseModel):
@@ -33,7 +33,7 @@ class ASNRelated(BaseModel):
     aka: Optional[str] = None
 
     estimated_users: Optional[int] = FieldInfo(alias="estimatedUsers", default=None)
-    """Total estimated users"""
+    """Total estimated users."""
 
 
 class ASN(BaseModel):
@@ -52,15 +52,12 @@ class ASN(BaseModel):
     related: List[ASNRelated]
 
     source: str
-    """Regional Internet Registry"""
+    """Regional Internet Registry."""
 
     website: str
 
     aka: Optional[str] = None
 
-    name_long: Optional[str] = FieldInfo(alias="nameLong", default=None)
-    """Deprecated field. Please use 'aka'."""
-
 
 class ASNIPResponse(BaseModel):
     asn: ASN
diff --git a/src/cloudflare/types/radar/entities/asn_list_params.py b/src/cloudflare/types/radar/entities/asn_list_params.py
index 7c327f0ff78..9e7d5fab1bd 100644
--- a/src/cloudflare/types/radar/entities/asn_list_params.py
+++ b/src/cloudflare/types/radar/entities/asn_list_params.py
@@ -11,19 +11,22 @@
 
 class ASNListParams(TypedDict, total=False):
     asn: str
-    """Comma separated list of ASNs."""
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    """
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
     location: str
-    """Location Alpha2 to filter results."""
+    """Filters results by location. Specify an alpha-2 location code."""
 
     offset: int
-    """Number of objects to skip before grabbing results."""
+    """Skips the specified number of objects before fetching the results."""
 
     order_by: Annotated[Literal["ASN", "POPULATION"], PropertyInfo(alias="orderBy")]
-    """Order asn list."""
+    """Specifies the metric to order the ASNs by."""
diff --git a/src/cloudflare/types/radar/entities/asn_list_response.py b/src/cloudflare/types/radar/entities/asn_list_response.py
index 8ab3d93b80b..9a6d5b811ca 100644
--- a/src/cloudflare/types/radar/entities/asn_list_response.py
+++ b/src/cloudflare/types/radar/entities/asn_list_response.py
@@ -20,9 +20,6 @@ class ASN(BaseModel):
 
     aka: Optional[str] = None
 
-    name_long: Optional[str] = FieldInfo(alias="nameLong", default=None)
-    """Deprecated field. Please use 'aka'."""
-
     org_name: Optional[str] = FieldInfo(alias="orgName", default=None)
 
     website: Optional[str] = None
diff --git a/src/cloudflare/types/radar/entities/asn_rel_params.py b/src/cloudflare/types/radar/entities/asn_rel_params.py
index 500ad9c46a1..d4c89b89f13 100644
--- a/src/cloudflare/types/radar/entities/asn_rel_params.py
+++ b/src/cloudflare/types/radar/entities/asn_rel_params.py
@@ -9,7 +9,7 @@
 
 class ASNRelParams(TypedDict, total=False):
     asn2: int
-    """Get the AS relationship of ASN2 with respect to the given ASN"""
+    """Retrieves the AS relationship of ASN2 with respect to the given ASN."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
diff --git a/src/cloudflare/types/radar/entities/location_get_params.py b/src/cloudflare/types/radar/entities/location_get_params.py
index 7b90d15cbe3..f8b945c2fda 100644
--- a/src/cloudflare/types/radar/entities/location_get_params.py
+++ b/src/cloudflare/types/radar/entities/location_get_params.py
@@ -9,4 +9,4 @@
 
 class LocationGetParams(TypedDict, total=False):
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
diff --git a/src/cloudflare/types/radar/entities/location_get_response.py b/src/cloudflare/types/radar/entities/location_get_response.py
index 99c28d7fbb4..0341e6df340 100644
--- a/src/cloudflare/types/radar/entities/location_get_response.py
+++ b/src/cloudflare/types/radar/entities/location_get_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
@@ -14,8 +13,10 @@ class Location(BaseModel):
     confidence_level: int = FieldInfo(alias="confidenceLevel")
 
     latitude: str
+    """A numeric string."""
 
     longitude: str
+    """A numeric string."""
 
     name: str
 
diff --git a/src/cloudflare/types/radar/entities/location_list_params.py b/src/cloudflare/types/radar/entities/location_list_params.py
index 89e77d5625a..b276685eb71 100644
--- a/src/cloudflare/types/radar/entities/location_list_params.py
+++ b/src/cloudflare/types/radar/entities/location_list_params.py
@@ -9,13 +9,16 @@
 
 class LocationListParams(TypedDict, total=False):
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
     location: str
-    """Comma separated list of locations."""
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 location codes.
+    """
 
     offset: int
-    """Number of objects to skip before grabbing results."""
+    """Skips the specified number of objects before fetching the results."""
diff --git a/src/cloudflare/types/radar/entities/location_list_response.py b/src/cloudflare/types/radar/entities/location_list_response.py
index 0141afd4295..11030b01b7a 100644
--- a/src/cloudflare/types/radar/entities/location_list_response.py
+++ b/src/cloudflare/types/radar/entities/location_list_response.py
@@ -11,8 +11,10 @@ class Location(BaseModel):
     alpha2: str
 
     latitude: str
+    """A numeric string."""
 
     longitude: str
+    """A numeric string."""
 
     name: str
 
diff --git a/src/cloudflare/types/radar/entity_get_params.py b/src/cloudflare/types/radar/entity_get_params.py
index 1bd5c38fabe..cea577975c4 100644
--- a/src/cloudflare/types/radar/entity_get_params.py
+++ b/src/cloudflare/types/radar/entity_get_params.py
@@ -12,4 +12,4 @@ class EntityGetParams(TypedDict, total=False):
     """IP address."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
diff --git a/src/cloudflare/types/radar/entity_get_response.py b/src/cloudflare/types/radar/entity_get_response.py
index ad27e10b1a7..77d1bfa5084 100644
--- a/src/cloudflare/types/radar/entity_get_response.py
+++ b/src/cloudflare/types/radar/entity_get_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from pydantic import Field as FieldInfo
 
 from ..._models import BaseModel
diff --git a/src/cloudflare/types/radar/geolocation_get_params.py b/src/cloudflare/types/radar/geolocation_get_params.py
new file mode 100644
index 00000000000..e42135d36b2
--- /dev/null
+++ b/src/cloudflare/types/radar/geolocation_get_params.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["GeolocationGetParams"]
+
+
+class GeolocationGetParams(TypedDict, total=False):
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
diff --git a/src/cloudflare/types/radar/geolocation_get_response.py b/src/cloudflare/types/radar/geolocation_get_response.py
new file mode 100644
index 00000000000..bc5aaecc88d
--- /dev/null
+++ b/src/cloudflare/types/radar/geolocation_get_response.py
@@ -0,0 +1,62 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["GeolocationGetResponse", "Geolocation", "GeolocationParent", "GeolocationParentParent"]
+
+
+class GeolocationParentParent(BaseModel):
+    geo_id: str = FieldInfo(alias="geoId")
+
+    latitude: str
+    """A numeric string."""
+
+    longitude: str
+    """A numeric string."""
+
+    name: str
+
+    type: Literal["CONTINENT", "COUNTRY", "ADM1"]
+    """The type of the geolocation."""
+
+
+class GeolocationParent(BaseModel):
+    geo_id: str = FieldInfo(alias="geoId")
+
+    latitude: str
+    """A numeric string."""
+
+    longitude: str
+    """A numeric string."""
+
+    name: str
+
+    parent: GeolocationParentParent
+
+    type: Literal["CONTINENT", "COUNTRY", "ADM1"]
+    """The type of the geolocation."""
+
+
+class Geolocation(BaseModel):
+    geo_id: str = FieldInfo(alias="geoId")
+
+    latitude: str
+    """A numeric string."""
+
+    longitude: str
+    """A numeric string."""
+
+    name: str
+
+    parent: GeolocationParent
+
+    type: Literal["CONTINENT", "COUNTRY", "ADM1"]
+    """The type of the geolocation."""
+
+
+class GeolocationGetResponse(BaseModel):
+    geolocation: Geolocation
diff --git a/src/cloudflare/types/radar/geolocation_list_params.py b/src/cloudflare/types/radar/geolocation_list_params.py
new file mode 100644
index 00000000000..33ef800e28f
--- /dev/null
+++ b/src/cloudflare/types/radar/geolocation_list_params.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["GeolocationListParams"]
+
+
+class GeolocationListParams(TypedDict, total=False):
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[str, PropertyInfo(alias="geoId")]
+    """Filters results by geolocation. Specify a comma-separated list of GeoNames IDs."""
+
+    limit: int
+    """Limits the number of objects returned in the response."""
+
+    location: str
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 location codes.
+    """
+
+    offset: int
+    """Skips the specified number of objects before fetching the results."""
diff --git a/src/cloudflare/types/radar/geolocation_list_response.py b/src/cloudflare/types/radar/geolocation_list_response.py
new file mode 100644
index 00000000000..5dbd2bc4ebc
--- /dev/null
+++ b/src/cloudflare/types/radar/geolocation_list_response.py
@@ -0,0 +1,63 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["GeolocationListResponse", "Geolocation", "GeolocationParent", "GeolocationParentParent"]
+
+
+class GeolocationParentParent(BaseModel):
+    geo_id: str = FieldInfo(alias="geoId")
+
+    latitude: str
+    """A numeric string."""
+
+    longitude: str
+    """A numeric string."""
+
+    name: str
+
+    type: Literal["CONTINENT", "COUNTRY", "ADM1"]
+    """The type of the geolocation."""
+
+
+class GeolocationParent(BaseModel):
+    geo_id: str = FieldInfo(alias="geoId")
+
+    latitude: str
+    """A numeric string."""
+
+    longitude: str
+    """A numeric string."""
+
+    name: str
+
+    parent: GeolocationParentParent
+
+    type: Literal["CONTINENT", "COUNTRY", "ADM1"]
+    """The type of the geolocation."""
+
+
+class Geolocation(BaseModel):
+    geo_id: str = FieldInfo(alias="geoId")
+
+    latitude: str
+    """A numeric string."""
+
+    longitude: str
+    """A numeric string."""
+
+    name: str
+
+    parent: GeolocationParent
+
+    type: Literal["CONTINENT", "COUNTRY", "ADM1"]
+    """The type of the geolocation."""
+
+
+class GeolocationListResponse(BaseModel):
+    geolocations: List[Geolocation]
diff --git a/src/cloudflare/types/radar/http/__init__.py b/src/cloudflare/types/radar/http/__init__.py
index 16be548d604..ecf8325cb12 100644
--- a/src/cloudflare/types/radar/http/__init__.py
+++ b/src/cloudflare/types/radar/http/__init__.py
@@ -2,17 +2,17 @@
 
 from __future__ import annotations
 
-from .browser import Browser as Browser
 from .ase_get_params import AseGetParams as AseGetParams
 from .ase_get_response import AseGetResponse as AseGetResponse
 from .summary_os_params import SummaryOSParams as SummaryOSParams
+from .top_browser_params import TopBrowserParams as TopBrowserParams
 from .location_get_params import LocationGetParams as LocationGetParams
 from .summary_os_response import SummaryOSResponse as SummaryOSResponse
-from .top_browsers_params import TopBrowsersParams as TopBrowsersParams
+from .top_browser_response import TopBrowserResponse as TopBrowserResponse
 from .location_get_response import LocationGetResponse as LocationGetResponse
-from .top_browsers_response import TopBrowsersResponse as TopBrowsersResponse
 from .summary_bot_class_params import SummaryBotClassParams as SummaryBotClassParams
 from .summary_ip_version_params import SummaryIPVersionParams as SummaryIPVersionParams
+from .top_browser_family_params import TopBrowserFamilyParams as TopBrowserFamilyParams
 from .summary_bot_class_response import SummaryBotClassResponse as SummaryBotClassResponse
 from .summary_device_type_params import SummaryDeviceTypeParams as SummaryDeviceTypeParams
 from .summary_tls_version_params import SummaryTLSVersionParams as SummaryTLSVersionParams
@@ -20,14 +20,13 @@
 from .summary_http_version_params import SummaryHTTPVersionParams as SummaryHTTPVersionParams
 from .summary_ip_version_response import SummaryIPVersionResponse as SummaryIPVersionResponse
 from .summary_post_quantum_params import SummaryPostQuantumParams as SummaryPostQuantumParams
-from .top_browser_families_params import TopBrowserFamiliesParams as TopBrowserFamiliesParams
+from .top_browser_family_response import TopBrowserFamilyResponse as TopBrowserFamilyResponse
 from .summary_device_type_response import SummaryDeviceTypeResponse as SummaryDeviceTypeResponse
 from .summary_http_protocol_params import SummaryHTTPProtocolParams as SummaryHTTPProtocolParams
 from .summary_tls_version_response import SummaryTLSVersionResponse as SummaryTLSVersionResponse
 from .timeseries_group_os_response import TimeseriesGroupOSResponse as TimeseriesGroupOSResponse
 from .summary_http_version_response import SummaryHTTPVersionResponse as SummaryHTTPVersionResponse
 from .summary_post_quantum_response import SummaryPostQuantumResponse as SummaryPostQuantumResponse
-from .top_browser_families_response import TopBrowserFamiliesResponse as TopBrowserFamiliesResponse
 from .summary_http_protocol_response import SummaryHTTPProtocolResponse as SummaryHTTPProtocolResponse
 from .timeseries_group_browser_params import TimeseriesGroupBrowserParams as TimeseriesGroupBrowserParams
 from .timeseries_group_bot_class_params import TimeseriesGroupBotClassParams as TimeseriesGroupBotClassParams
diff --git a/src/cloudflare/types/radar/http/ase_get_params.py b/src/cloudflare/types/radar/http/ase_get_params.py
index 811464b10b0..c7294610443 100644
--- a/src/cloudflare/types/radar/http/ase_get_params.py
+++ b/src/cloudflare/types/radar/http/ase_get_params.py
@@ -6,81 +6,94 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["AseGetParams"]
 
 
 class AseGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
     browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
-    """Filter for browser family."""
+    """Filters results by browser family."""
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/ase_get_response.py b/src/cloudflare/types/radar/http/ase_get_response.py
index a606c25f81c..057053085ad 100644
--- a/src/cloudflare/types/radar/http/ase_get_response.py
+++ b/src/cloudflare/types/radar/http/ase_get_response.py
@@ -2,50 +2,121 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["AseGetResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation", "Top0"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "AseGetResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
 
-    level: Optional[int] = None
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -54,9 +125,11 @@ class Top0(BaseModel):
     client_as_name: str = FieldInfo(alias="clientASName")
 
     value: str
+    """A numeric string."""
 
 
 class AseGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/ases/bot_class_get_params.py b/src/cloudflare/types/radar/http/ases/bot_class_get_params.py
index 59a823a180a..69838f219a1 100644
--- a/src/cloudflare/types/radar/http/ases/bot_class_get_params.py
+++ b/src/cloudflare/types/radar/http/ases/bot_class_get_params.py
@@ -6,74 +6,87 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["BotClassGetParams"]
 
 
 class BotClassGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
-    """Filter for browser family."""
+    """Filters results by browser family."""
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/ases/bot_class_get_response.py b/src/cloudflare/types/radar/http/ases/bot_class_get_response.py
index c48362beaed..e466ffacad6 100644
--- a/src/cloudflare/types/radar/http/ases/bot_class_get_response.py
+++ b/src/cloudflare/types/radar/http/ases/bot_class_get_response.py
@@ -2,50 +2,121 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["BotClassGetResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation", "Top0"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "BotClassGetResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
 
-    level: Optional[int] = None
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -54,9 +125,11 @@ class Top0(BaseModel):
     client_as_name: str = FieldInfo(alias="clientASName")
 
     value: str
+    """A numeric string."""
 
 
 class BotClassGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/ases/browser_family_get_params.py b/src/cloudflare/types/radar/http/ases/browser_family_get_params.py
index ed19fdee421..f84775c43b3 100644
--- a/src/cloudflare/types/radar/http/ases/browser_family_get_params.py
+++ b/src/cloudflare/types/radar/http/ases/browser_family_get_params.py
@@ -6,78 +6,91 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["BrowserFamilyGetParams"]
 
 
 class BrowserFamilyGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/ases/browser_family_get_response.py b/src/cloudflare/types/radar/http/ases/browser_family_get_response.py
index f4d2f1fc2be..8f204c5a612 100644
--- a/src/cloudflare/types/radar/http/ases/browser_family_get_response.py
+++ b/src/cloudflare/types/radar/http/ases/browser_family_get_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "BrowserFamilyGetResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -61,9 +125,11 @@ class Top0(BaseModel):
     client_as_name: str = FieldInfo(alias="clientASName")
 
     value: str
+    """A numeric string."""
 
 
 class BrowserFamilyGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/ases/device_type_get_params.py b/src/cloudflare/types/radar/http/ases/device_type_get_params.py
index 43e1b06c821..0ef72788cae 100644
--- a/src/cloudflare/types/radar/http/ases/device_type_get_params.py
+++ b/src/cloudflare/types/radar/http/ases/device_type_get_params.py
@@ -6,78 +6,91 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["DeviceTypeGetParams"]
 
 
 class DeviceTypeGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
     browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
-    """Filter for browser family."""
+    """Filters results by browser family."""
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/ases/device_type_get_response.py b/src/cloudflare/types/radar/http/ases/device_type_get_response.py
index a619785971d..6e5b7f161d0 100644
--- a/src/cloudflare/types/radar/http/ases/device_type_get_response.py
+++ b/src/cloudflare/types/radar/http/ases/device_type_get_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "DeviceTypeGetResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -61,9 +125,11 @@ class Top0(BaseModel):
     client_as_name: str = FieldInfo(alias="clientASName")
 
     value: str
+    """A numeric string."""
 
 
 class DeviceTypeGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/ases/http_method_get_params.py b/src/cloudflare/types/radar/http/ases/http_method_get_params.py
index fb227592965..c47be9e2a98 100644
--- a/src/cloudflare/types/radar/http/ases/http_method_get_params.py
+++ b/src/cloudflare/types/radar/http/ases/http_method_get_params.py
@@ -6,78 +6,91 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["HTTPMethodGetParams"]
 
 
 class HTTPMethodGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
     browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
-    """Filter for browser family."""
+    """Filters results by browser family."""
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/ases/http_method_get_response.py b/src/cloudflare/types/radar/http/ases/http_method_get_response.py
index d4e4622fe36..da88f7cf95f 100644
--- a/src/cloudflare/types/radar/http/ases/http_method_get_response.py
+++ b/src/cloudflare/types/radar/http/ases/http_method_get_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "HTTPMethodGetResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -61,9 +125,11 @@ class Top0(BaseModel):
     client_as_name: str = FieldInfo(alias="clientASName")
 
     value: str
+    """A numeric string."""
 
 
 class HTTPMethodGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/ases/http_protocol_get_params.py b/src/cloudflare/types/radar/http/ases/http_protocol_get_params.py
index 629a3b8d8c0..1b3c31c30d2 100644
--- a/src/cloudflare/types/radar/http/ases/http_protocol_get_params.py
+++ b/src/cloudflare/types/radar/http/ases/http_protocol_get_params.py
@@ -6,75 +6,91 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["HTTPProtocolGetParams"]
 
 
 class HTTPProtocolGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
     browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
-    """Filter for browser family."""
+    """Filters results by browser family."""
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
+
+    http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/ases/http_protocol_get_response.py b/src/cloudflare/types/radar/http/ases/http_protocol_get_response.py
index 3552fc7cad0..aeb2833d011 100644
--- a/src/cloudflare/types/radar/http/ases/http_protocol_get_response.py
+++ b/src/cloudflare/types/radar/http/ases/http_protocol_get_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "HTTPProtocolGetResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -61,9 +125,11 @@ class Top0(BaseModel):
     client_as_name: str = FieldInfo(alias="clientASName")
 
     value: str
+    """A numeric string."""
 
 
 class HTTPProtocolGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/ases/ip_version_get_params.py b/src/cloudflare/types/radar/http/ases/ip_version_get_params.py
index 86ababaa79a..615c7d3cdea 100644
--- a/src/cloudflare/types/radar/http/ases/ip_version_get_params.py
+++ b/src/cloudflare/types/radar/http/ases/ip_version_get_params.py
@@ -6,78 +6,91 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["IPVersionGetParams"]
 
 
 class IPVersionGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
     browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
-    """Filter for browser family."""
+    """Filters results by browser family."""
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/ases/ip_version_get_response.py b/src/cloudflare/types/radar/http/ases/ip_version_get_response.py
index cb714fbcdf2..267488f6431 100644
--- a/src/cloudflare/types/radar/http/ases/ip_version_get_response.py
+++ b/src/cloudflare/types/radar/http/ases/ip_version_get_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "IPVersionGetResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -61,9 +125,11 @@ class Top0(BaseModel):
     client_as_name: str = FieldInfo(alias="clientASName")
 
     value: str
+    """A numeric string."""
 
 
 class IPVersionGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/ases/os_get_params.py b/src/cloudflare/types/radar/http/ases/os_get_params.py
index 12ac2d093b7..78e46ec4251 100644
--- a/src/cloudflare/types/radar/http/ases/os_get_params.py
+++ b/src/cloudflare/types/radar/http/ases/os_get_params.py
@@ -6,78 +6,91 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["OSGetParams"]
 
 
 class OSGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
     browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
-    """Filter for browser family."""
+    """Filters results by browser family."""
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/ases/os_get_response.py b/src/cloudflare/types/radar/http/ases/os_get_response.py
index a8777949f24..b1b43b9a4ee 100644
--- a/src/cloudflare/types/radar/http/ases/os_get_response.py
+++ b/src/cloudflare/types/radar/http/ases/os_get_response.py
@@ -2,50 +2,121 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["OSGetResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation", "Top0"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "OSGetResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
 
-    level: Optional[int] = None
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -54,9 +125,11 @@ class Top0(BaseModel):
     client_as_name: str = FieldInfo(alias="clientASName")
 
     value: str
+    """A numeric string."""
 
 
 class OSGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/ases/tls_version_get_params.py b/src/cloudflare/types/radar/http/ases/tls_version_get_params.py
index 050045d800f..9c31106c666 100644
--- a/src/cloudflare/types/radar/http/ases/tls_version_get_params.py
+++ b/src/cloudflare/types/radar/http/ases/tls_version_get_params.py
@@ -6,76 +6,89 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TLSVersionGetParams"]
 
 
 class TLSVersionGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
     browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
-    """Filter for browser family."""
+    """Filters results by browser family."""
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
diff --git a/src/cloudflare/types/radar/http/ases/tls_version_get_response.py b/src/cloudflare/types/radar/http/ases/tls_version_get_response.py
index 1ffc7b6c327..e3ba28601d7 100644
--- a/src/cloudflare/types/radar/http/ases/tls_version_get_response.py
+++ b/src/cloudflare/types/radar/http/ases/tls_version_get_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "TLSVersionGetResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -61,9 +125,11 @@ class Top0(BaseModel):
     client_as_name: str = FieldInfo(alias="clientASName")
 
     value: str
+    """A numeric string."""
 
 
 class TLSVersionGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/browser.py b/src/cloudflare/types/radar/http/browser.py
deleted file mode 100644
index a227def8dd5..00000000000
--- a/src/cloudflare/types/radar/http/browser.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-from ...._models import BaseModel
-
-__all__ = ["Browser"]
-
-
-class Browser(BaseModel):
-    name: str
-
-    value: str
diff --git a/src/cloudflare/types/radar/http/location_get_params.py b/src/cloudflare/types/radar/http/location_get_params.py
index 1459dbe0e58..5646318c49c 100644
--- a/src/cloudflare/types/radar/http/location_get_params.py
+++ b/src/cloudflare/types/radar/http/location_get_params.py
@@ -6,81 +6,94 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["LocationGetParams"]
 
 
 class LocationGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
     browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
-    """Filter for browser family."""
+    """Filters results by browser family."""
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/location_get_response.py b/src/cloudflare/types/radar/http/location_get_response.py
index 95a4c526fe3..dd7c049b11d 100644
--- a/src/cloudflare/types/radar/http/location_get_response.py
+++ b/src/cloudflare/types/radar/http/location_get_response.py
@@ -2,50 +2,121 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["LocationGetResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation", "Top0"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "LocationGetResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
 
-    level: Optional[int] = None
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -54,9 +125,11 @@ class Top0(BaseModel):
     client_country_name: str = FieldInfo(alias="clientCountryName")
 
     value: str
+    """A numeric string."""
 
 
 class LocationGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/locations/bot_class_get_params.py b/src/cloudflare/types/radar/http/locations/bot_class_get_params.py
index 59a823a180a..69838f219a1 100644
--- a/src/cloudflare/types/radar/http/locations/bot_class_get_params.py
+++ b/src/cloudflare/types/radar/http/locations/bot_class_get_params.py
@@ -6,74 +6,87 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["BotClassGetParams"]
 
 
 class BotClassGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
-    """Filter for browser family."""
+    """Filters results by browser family."""
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/locations/bot_class_get_response.py b/src/cloudflare/types/radar/http/locations/bot_class_get_response.py
index 9b7d9f6c23d..0443c0b2f78 100644
--- a/src/cloudflare/types/radar/http/locations/bot_class_get_response.py
+++ b/src/cloudflare/types/radar/http/locations/bot_class_get_response.py
@@ -2,50 +2,121 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["BotClassGetResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation", "Top0"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "BotClassGetResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
 
-    level: Optional[int] = None
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -54,9 +125,11 @@ class Top0(BaseModel):
     client_country_name: str = FieldInfo(alias="clientCountryName")
 
     value: str
+    """A numeric string."""
 
 
 class BotClassGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/locations/browser_family_get_params.py b/src/cloudflare/types/radar/http/locations/browser_family_get_params.py
index ed19fdee421..f84775c43b3 100644
--- a/src/cloudflare/types/radar/http/locations/browser_family_get_params.py
+++ b/src/cloudflare/types/radar/http/locations/browser_family_get_params.py
@@ -6,78 +6,91 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["BrowserFamilyGetParams"]
 
 
 class BrowserFamilyGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/locations/browser_family_get_response.py b/src/cloudflare/types/radar/http/locations/browser_family_get_response.py
index 5f161c3903e..1d28b93a506 100644
--- a/src/cloudflare/types/radar/http/locations/browser_family_get_response.py
+++ b/src/cloudflare/types/radar/http/locations/browser_family_get_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "BrowserFamilyGetResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -61,9 +125,11 @@ class Top0(BaseModel):
     client_country_name: str = FieldInfo(alias="clientCountryName")
 
     value: str
+    """A numeric string."""
 
 
 class BrowserFamilyGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/locations/device_type_get_params.py b/src/cloudflare/types/radar/http/locations/device_type_get_params.py
index 43e1b06c821..0ef72788cae 100644
--- a/src/cloudflare/types/radar/http/locations/device_type_get_params.py
+++ b/src/cloudflare/types/radar/http/locations/device_type_get_params.py
@@ -6,78 +6,91 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["DeviceTypeGetParams"]
 
 
 class DeviceTypeGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
     browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
-    """Filter for browser family."""
+    """Filters results by browser family."""
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/locations/device_type_get_response.py b/src/cloudflare/types/radar/http/locations/device_type_get_response.py
index ed2f568faad..61781eede93 100644
--- a/src/cloudflare/types/radar/http/locations/device_type_get_response.py
+++ b/src/cloudflare/types/radar/http/locations/device_type_get_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "DeviceTypeGetResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -61,9 +125,11 @@ class Top0(BaseModel):
     client_country_name: str = FieldInfo(alias="clientCountryName")
 
     value: str
+    """A numeric string."""
 
 
 class DeviceTypeGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/locations/http_method_get_params.py b/src/cloudflare/types/radar/http/locations/http_method_get_params.py
index fb227592965..c47be9e2a98 100644
--- a/src/cloudflare/types/radar/http/locations/http_method_get_params.py
+++ b/src/cloudflare/types/radar/http/locations/http_method_get_params.py
@@ -6,78 +6,91 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["HTTPMethodGetParams"]
 
 
 class HTTPMethodGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
     browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
-    """Filter for browser family."""
+    """Filters results by browser family."""
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/locations/http_method_get_response.py b/src/cloudflare/types/radar/http/locations/http_method_get_response.py
index ed56bfd057f..626ee155c1d 100644
--- a/src/cloudflare/types/radar/http/locations/http_method_get_response.py
+++ b/src/cloudflare/types/radar/http/locations/http_method_get_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "HTTPMethodGetResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -61,9 +125,11 @@ class Top0(BaseModel):
     client_country_name: str = FieldInfo(alias="clientCountryName")
 
     value: str
+    """A numeric string."""
 
 
 class HTTPMethodGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/locations/http_protocol_get_params.py b/src/cloudflare/types/radar/http/locations/http_protocol_get_params.py
index 629a3b8d8c0..1b3c31c30d2 100644
--- a/src/cloudflare/types/radar/http/locations/http_protocol_get_params.py
+++ b/src/cloudflare/types/radar/http/locations/http_protocol_get_params.py
@@ -6,75 +6,91 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["HTTPProtocolGetParams"]
 
 
 class HTTPProtocolGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
     browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
-    """Filter for browser family."""
+    """Filters results by browser family."""
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
+
+    http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/locations/http_protocol_get_response.py b/src/cloudflare/types/radar/http/locations/http_protocol_get_response.py
index 6d9b31aad62..c03b70ca252 100644
--- a/src/cloudflare/types/radar/http/locations/http_protocol_get_response.py
+++ b/src/cloudflare/types/radar/http/locations/http_protocol_get_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "HTTPProtocolGetResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -61,9 +125,11 @@ class Top0(BaseModel):
     client_country_name: str = FieldInfo(alias="clientCountryName")
 
     value: str
+    """A numeric string."""
 
 
 class HTTPProtocolGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/locations/ip_version_get_params.py b/src/cloudflare/types/radar/http/locations/ip_version_get_params.py
index 86ababaa79a..615c7d3cdea 100644
--- a/src/cloudflare/types/radar/http/locations/ip_version_get_params.py
+++ b/src/cloudflare/types/radar/http/locations/ip_version_get_params.py
@@ -6,78 +6,91 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["IPVersionGetParams"]
 
 
 class IPVersionGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
     browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
-    """Filter for browser family."""
+    """Filters results by browser family."""
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/locations/ip_version_get_response.py b/src/cloudflare/types/radar/http/locations/ip_version_get_response.py
index bb30d89b81e..17a28152528 100644
--- a/src/cloudflare/types/radar/http/locations/ip_version_get_response.py
+++ b/src/cloudflare/types/radar/http/locations/ip_version_get_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "IPVersionGetResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -61,9 +125,11 @@ class Top0(BaseModel):
     client_country_name: str = FieldInfo(alias="clientCountryName")
 
     value: str
+    """A numeric string."""
 
 
 class IPVersionGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/locations/os_get_params.py b/src/cloudflare/types/radar/http/locations/os_get_params.py
index 12ac2d093b7..78e46ec4251 100644
--- a/src/cloudflare/types/radar/http/locations/os_get_params.py
+++ b/src/cloudflare/types/radar/http/locations/os_get_params.py
@@ -6,78 +6,91 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["OSGetParams"]
 
 
 class OSGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
     browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
-    """Filter for browser family."""
+    """Filters results by browser family."""
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/locations/os_get_response.py b/src/cloudflare/types/radar/http/locations/os_get_response.py
index 31e24633774..b4eadc435ef 100644
--- a/src/cloudflare/types/radar/http/locations/os_get_response.py
+++ b/src/cloudflare/types/radar/http/locations/os_get_response.py
@@ -2,50 +2,121 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["OSGetResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation", "Top0"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "OSGetResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
 
-    level: Optional[int] = None
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -54,9 +125,11 @@ class Top0(BaseModel):
     client_country_name: str = FieldInfo(alias="clientCountryName")
 
     value: str
+    """A numeric string."""
 
 
 class OSGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/locations/tls_version_get_params.py b/src/cloudflare/types/radar/http/locations/tls_version_get_params.py
index 050045d800f..9c31106c666 100644
--- a/src/cloudflare/types/radar/http/locations/tls_version_get_params.py
+++ b/src/cloudflare/types/radar/http/locations/tls_version_get_params.py
@@ -6,76 +6,89 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TLSVersionGetParams"]
 
 
 class TLSVersionGetParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
     browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
-    """Filter for browser family."""
+    """Filters results by browser family."""
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
diff --git a/src/cloudflare/types/radar/http/locations/tls_version_get_response.py b/src/cloudflare/types/radar/http/locations/tls_version_get_response.py
index 82d4b85eec7..002f26143fc 100644
--- a/src/cloudflare/types/radar/http/locations/tls_version_get_response.py
+++ b/src/cloudflare/types/radar/http/locations/tls_version_get_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "TLSVersionGetResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
 
-    level: Optional[int] = None
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -61,9 +125,11 @@ class Top0(BaseModel):
     client_country_name: str = FieldInfo(alias="clientCountryName")
 
     value: str
+    """A numeric string."""
 
 
 class TLSVersionGetResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/summary_bot_class_params.py b/src/cloudflare/types/radar/http/summary_bot_class_params.py
index fcd244197a8..2ccb15f1277 100644
--- a/src/cloudflare/types/radar/http/summary_bot_class_params.py
+++ b/src/cloudflare/types/radar/http/summary_bot_class_params.py
@@ -6,68 +6,84 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["SummaryBotClassParams"]
 
 
 class SummaryBotClassParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/summary_bot_class_response.py b/src/cloudflare/types/radar/http/summary_bot_class_response.py
index d4c5847ae8d..afbd3010507 100644
--- a/src/cloudflare/types/radar/http/summary_bot_class_response.py
+++ b/src/cloudflare/types/radar/http/summary_bot_class_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,124 @@
 __all__ = [
     "SummaryBotClassResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     bot: str
+    """A numeric string."""
 
     human: str
+    """A numeric string."""
 
 
 class SummaryBotClassResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/http/summary_device_type_params.py b/src/cloudflare/types/radar/http/summary_device_type_params.py
index c0a7a7664f2..73605b450e1 100644
--- a/src/cloudflare/types/radar/http/summary_device_type_params.py
+++ b/src/cloudflare/types/radar/http/summary_device_type_params.py
@@ -6,72 +6,88 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["SummaryDeviceTypeParams"]
 
 
 class SummaryDeviceTypeParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/summary_device_type_response.py b/src/cloudflare/types/radar/http/summary_device_type_response.py
index 7aa1bbd9fd7..698f161ed2b 100644
--- a/src/cloudflare/types/radar/http/summary_device_type_response.py
+++ b/src/cloudflare/types/radar/http/summary_device_type_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,62 +11,127 @@
 __all__ = [
     "SummaryDeviceTypeResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     desktop: str
+    """A numeric string."""
 
     mobile: str
+    """A numeric string."""
 
     other: str
+    """A numeric string."""
 
 
 class SummaryDeviceTypeResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/http/summary_http_protocol_params.py b/src/cloudflare/types/radar/http/summary_http_protocol_params.py
index ca05adc80b4..96d9b84c6cb 100644
--- a/src/cloudflare/types/radar/http/summary_http_protocol_params.py
+++ b/src/cloudflare/types/radar/http/summary_http_protocol_params.py
@@ -6,72 +6,88 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["SummaryHTTPProtocolParams"]
 
 
 class SummaryHTTPProtocolParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/summary_http_protocol_response.py b/src/cloudflare/types/radar/http/summary_http_protocol_response.py
index 3ee6ffef02f..175ee7a636c 100644
--- a/src/cloudflare/types/radar/http/summary_http_protocol_response.py
+++ b/src/cloudflare/types/radar/http/summary_http_protocol_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,124 @@
 __all__ = [
     "SummaryHTTPProtocolResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     http: str
+    """A numeric string."""
 
     https: str
+    """A numeric string."""
 
 
 class SummaryHTTPProtocolResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/http/summary_http_version_params.py b/src/cloudflare/types/radar/http/summary_http_version_params.py
index f103dfb0592..ed33170d180 100644
--- a/src/cloudflare/types/radar/http/summary_http_version_params.py
+++ b/src/cloudflare/types/radar/http/summary_http_version_params.py
@@ -6,72 +6,88 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["SummaryHTTPVersionParams"]
 
 
 class SummaryHTTPVersionParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/summary_http_version_response.py b/src/cloudflare/types/radar/http/summary_http_version_response.py
index 7c3c97a3d57..ae82c2137b4 100644
--- a/src/cloudflare/types/radar/http/summary_http_version_response.py
+++ b/src/cloudflare/types/radar/http/summary_http_version_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,62 +11,127 @@
 __all__ = [
     "SummaryHTTPVersionResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     http_1_x: str = FieldInfo(alias="HTTP/1.x")
+    """A numeric string."""
 
     http_2: str = FieldInfo(alias="HTTP/2")
+    """A numeric string."""
 
     http_3: str = FieldInfo(alias="HTTP/3")
+    """A numeric string."""
 
 
 class SummaryHTTPVersionResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/http/summary_ip_version_params.py b/src/cloudflare/types/radar/http/summary_ip_version_params.py
index 5d135a39310..bafdb480ed4 100644
--- a/src/cloudflare/types/radar/http/summary_ip_version_params.py
+++ b/src/cloudflare/types/radar/http/summary_ip_version_params.py
@@ -6,72 +6,88 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["SummaryIPVersionParams"]
 
 
 class SummaryIPVersionParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/summary_ip_version_response.py b/src/cloudflare/types/radar/http/summary_ip_version_response.py
index 6286c80dc1d..c73c7cf94ab 100644
--- a/src/cloudflare/types/radar/http/summary_ip_version_response.py
+++ b/src/cloudflare/types/radar/http/summary_ip_version_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,124 @@
 __all__ = [
     "SummaryIPVersionResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     i_pv4: str = FieldInfo(alias="IPv4")
+    """A numeric string."""
 
     i_pv6: str = FieldInfo(alias="IPv6")
+    """A numeric string."""
 
 
 class SummaryIPVersionResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/http/summary_os_params.py b/src/cloudflare/types/radar/http/summary_os_params.py
index f475ca9335f..88ce1a21586 100644
--- a/src/cloudflare/types/radar/http/summary_os_params.py
+++ b/src/cloudflare/types/radar/http/summary_os_params.py
@@ -6,72 +6,88 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["SummaryOSParams"]
 
 
 class SummaryOSParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/summary_os_response.py b/src/cloudflare/types/radar/http/summary_os_response.py
index b9737a2dcf9..ee1fa00b9c0 100644
--- a/src/cloudflare/types/radar/http/summary_os_response.py
+++ b/src/cloudflare/types/radar/http/summary_os_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,124 @@
 __all__ = [
     "SummaryOSResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     android: str = FieldInfo(alias="ANDROID")
+    """A numeric string."""
 
     ios: str = FieldInfo(alias="IOS")
+    """A numeric string."""
 
 
 class SummaryOSResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/http/summary_post_quantum_params.py b/src/cloudflare/types/radar/http/summary_post_quantum_params.py
index e9c7b6195d3..2ca0428c008 100644
--- a/src/cloudflare/types/radar/http/summary_post_quantum_params.py
+++ b/src/cloudflare/types/radar/http/summary_post_quantum_params.py
@@ -6,75 +6,91 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["SummaryPostQuantumParams"]
 
 
 class SummaryPostQuantumParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/summary_post_quantum_response.py b/src/cloudflare/types/radar/http/summary_post_quantum_response.py
index f244b9910b7..5153ef3c945 100644
--- a/src/cloudflare/types/radar/http/summary_post_quantum_response.py
+++ b/src/cloudflare/types/radar/http/summary_post_quantum_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,60 +11,124 @@
 __all__ = [
     "SummaryPostQuantumResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     not_supported: str = FieldInfo(alias="NOT_SUPPORTED")
+    """A numeric string."""
 
     supported: str = FieldInfo(alias="SUPPORTED")
+    """A numeric string."""
 
 
 class SummaryPostQuantumResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/http/summary_tls_version_params.py b/src/cloudflare/types/radar/http/summary_tls_version_params.py
index d158f1f43a6..92e891853a3 100644
--- a/src/cloudflare/types/radar/http/summary_tls_version_params.py
+++ b/src/cloudflare/types/radar/http/summary_tls_version_params.py
@@ -6,70 +6,86 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["SummaryTLSVersionParams"]
 
 
 class SummaryTLSVersionParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
diff --git a/src/cloudflare/types/radar/http/summary_tls_version_response.py b/src/cloudflare/types/radar/http/summary_tls_version_response.py
index 1a8ffeb3e19..78bac27a4cf 100644
--- a/src/cloudflare/types/radar/http/summary_tls_version_response.py
+++ b/src/cloudflare/types/radar/http/summary_tls_version_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,66 +11,133 @@
 __all__ = [
     "SummaryTLSVersionResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
     tls_1_0: str = FieldInfo(alias="TLS 1.0")
+    """A numeric string."""
 
     tls_1_1: str = FieldInfo(alias="TLS 1.1")
+    """A numeric string."""
 
     tls_1_2: str = FieldInfo(alias="TLS 1.2")
+    """A numeric string."""
 
     tls_1_3: str = FieldInfo(alias="TLS 1.3")
+    """A numeric string."""
 
     tls_quic: str = FieldInfo(alias="TLS QUIC")
+    """A numeric string."""
 
 
 class SummaryTLSVersionResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/http/timeseries_group_bot_class_params.py b/src/cloudflare/types/radar/http/timeseries_group_bot_class_params.py
index c356954fbc4..2758bd3a732 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_bot_class_params.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_bot_class_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupBotClassParams"]
@@ -13,68 +14,83 @@
 
 class TimeseriesGroupBotClassParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/timeseries_group_bot_class_response.py b/src/cloudflare/types/radar/http/timeseries_group_bot_class_response.py
index 8e2d5aa1a80..25f6571e89f 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_bot_class_response.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_bot_class_response.py
@@ -1,10 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TimeseriesGroupBotClassResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupBotClassResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -12,10 +133,11 @@ class Serie0(BaseModel):
 
     human: List[str]
 
-    timestamps: List[str]
+    timestamps: List[datetime]
 
 
 class TimeseriesGroupBotClassResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/http/timeseries_group_browser_family_params.py b/src/cloudflare/types/radar/http/timeseries_group_browser_family_params.py
index df17101636c..93110920aa5 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_browser_family_params.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_browser_family_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupBrowserFamilyParams"]
@@ -13,75 +14,94 @@
 
 class TimeseriesGroupBrowserFamilyParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/timeseries_group_browser_family_response.py b/src/cloudflare/types/radar/http/timeseries_group_browser_family_response.py
index 57758e6ca14..cb0dc1360fb 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_browser_family_response.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_browser_family_response.py
@@ -1,24 +1,151 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import TYPE_CHECKING, List
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TimeseriesGroupBrowserFamilyResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupBrowserFamilyResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
-    timestamps: List[str]
+    timestamps: List[datetime]
 
     if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
         # Stub to indicate that arbitrary properties are accepted.
         # To access properties that are not valid identifiers you can use `getattr`, e.g.
         # `getattr(obj, '$type')`
-        def __getattr__(self, attr: str) -> List[str]:
-            ...
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
 
 
 class TimeseriesGroupBrowserFamilyResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/http/timeseries_group_browser_params.py b/src/cloudflare/types/radar/http/timeseries_group_browser_params.py
index 7b2bdbd2ab0..1923b0ecc8c 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_browser_params.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_browser_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupBrowserParams"]
@@ -13,81 +14,97 @@
 
 class TimeseriesGroupBrowserParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
     limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
     """
-    Limit the number of objects (eg browsers, verticals, etc) to the top items over
-    the time range.
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
     """
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/timeseries_group_browser_response.py b/src/cloudflare/types/radar/http/timeseries_group_browser_response.py
index fd39b292fe3..3331f836452 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_browser_response.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_browser_response.py
@@ -1,24 +1,151 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import TYPE_CHECKING, List
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TimeseriesGroupBrowserResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupBrowserResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
-    timestamps: List[str]
+    timestamps: List[datetime]
 
     if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
         # Stub to indicate that arbitrary properties are accepted.
         # To access properties that are not valid identifiers you can use `getattr`, e.g.
         # `getattr(obj, '$type')`
-        def __getattr__(self, attr: str) -> List[str]:
-            ...
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
 
 
 class TimeseriesGroupBrowserResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/http/timeseries_group_device_type_params.py b/src/cloudflare/types/radar/http/timeseries_group_device_type_params.py
index 4e44b25d6cb..5c86f47010d 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_device_type_params.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_device_type_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupDeviceTypeParams"]
@@ -13,72 +14,87 @@
 
 class TimeseriesGroupDeviceTypeParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/timeseries_group_device_type_response.py b/src/cloudflare/types/radar/http/timeseries_group_device_type_response.py
index d053d647fd3..473b5c8d9a7 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_device_type_response.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_device_type_response.py
@@ -1,10 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TimeseriesGroupDeviceTypeResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupDeviceTypeResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -14,10 +135,11 @@ class Serie0(BaseModel):
 
     other: List[str]
 
-    timestamps: List[str]
+    timestamps: List[datetime]
 
 
 class TimeseriesGroupDeviceTypeResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/http/timeseries_group_http_protocol_params.py b/src/cloudflare/types/radar/http/timeseries_group_http_protocol_params.py
index ba7ee2c31aa..dd52be3d613 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_http_protocol_params.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_http_protocol_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupHTTPProtocolParams"]
@@ -13,72 +14,87 @@
 
 class TimeseriesGroupHTTPProtocolParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/timeseries_group_http_protocol_response.py b/src/cloudflare/types/radar/http/timeseries_group_http_protocol_response.py
index 62628a00588..a2461f21c09 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_http_protocol_response.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_http_protocol_response.py
@@ -1,10 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TimeseriesGroupHTTPProtocolResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupHTTPProtocolResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -12,10 +133,11 @@ class Serie0(BaseModel):
 
     https: List[str]
 
-    timestamps: List[str]
+    timestamps: List[datetime]
 
 
 class TimeseriesGroupHTTPProtocolResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/http/timeseries_group_http_version_params.py b/src/cloudflare/types/radar/http/timeseries_group_http_version_params.py
index 97e2dbca21e..6f913cd511d 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_http_version_params.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_http_version_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupHTTPVersionParams"]
@@ -13,72 +14,87 @@
 
 class TimeseriesGroupHTTPVersionParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/timeseries_group_http_version_response.py b/src/cloudflare/types/radar/http/timeseries_group_http_version_response.py
index 0bde713e070..b3a4f0fcfb1 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_http_version_response.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_http_version_response.py
@@ -1,12 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TimeseriesGroupHTTPVersionResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupHTTPVersionResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -16,10 +135,11 @@ class Serie0(BaseModel):
 
     http_3: List[str] = FieldInfo(alias="HTTP/3")
 
-    timestamps: List[str]
+    timestamps: List[datetime]
 
 
 class TimeseriesGroupHTTPVersionResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/http/timeseries_group_ip_version_params.py b/src/cloudflare/types/radar/http/timeseries_group_ip_version_params.py
index 6c5aa48d095..8dbe9d69ab8 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_ip_version_params.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_ip_version_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupIPVersionParams"]
@@ -13,72 +14,87 @@
 
 class TimeseriesGroupIPVersionParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/timeseries_group_ip_version_response.py b/src/cloudflare/types/radar/http/timeseries_group_ip_version_response.py
index 560271c2fd8..f248fede91f 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_ip_version_response.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_ip_version_response.py
@@ -1,12 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TimeseriesGroupIPVersionResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupIPVersionResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -14,10 +133,11 @@ class Serie0(BaseModel):
 
     i_pv6: List[str] = FieldInfo(alias="IPv6")
 
-    timestamps: List[str]
+    timestamps: List[datetime]
 
 
 class TimeseriesGroupIPVersionResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/http/timeseries_group_os_params.py b/src/cloudflare/types/radar/http/timeseries_group_os_params.py
index 229e0d9ff31..94e189e005b 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_os_params.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_os_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupOSParams"]
@@ -13,72 +14,87 @@
 
 class TimeseriesGroupOSParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/timeseries_group_os_response.py b/src/cloudflare/types/radar/http/timeseries_group_os_response.py
index 502c0a8a249..980d4f9487c 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_os_response.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_os_response.py
@@ -1,24 +1,151 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import TYPE_CHECKING, List
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TimeseriesGroupOSResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupOSResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
-    timestamps: List[str]
+    timestamps: List[datetime]
 
     if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
         # Stub to indicate that arbitrary properties are accepted.
         # To access properties that are not valid identifiers you can use `getattr`, e.g.
         # `getattr(obj, '$type')`
-        def __getattr__(self, attr: str) -> List[str]:
-            ...
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
 
 
 class TimeseriesGroupOSResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/http/timeseries_group_post_quantum_params.py b/src/cloudflare/types/radar/http/timeseries_group_post_quantum_params.py
index 486a7428ed3..9435668a9f4 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_post_quantum_params.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_post_quantum_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupPostQuantumParams"]
@@ -13,75 +14,90 @@
 
 class TimeseriesGroupPostQuantumParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
 
     tls_version: Annotated[
         List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
     ]
-    """Filter for tls version."""
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/timeseries_group_post_quantum_response.py b/src/cloudflare/types/radar/http/timeseries_group_post_quantum_response.py
index 17c145551b4..b31bc2c0424 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_post_quantum_response.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_post_quantum_response.py
@@ -1,12 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TimeseriesGroupPostQuantumResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupPostQuantumResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -14,10 +133,11 @@ class Serie0(BaseModel):
 
     supported: List[str] = FieldInfo(alias="SUPPORTED")
 
-    timestamps: List[str]
+    timestamps: List[datetime]
 
 
 class TimeseriesGroupPostQuantumResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/http/timeseries_group_tls_version_params.py b/src/cloudflare/types/radar/http/timeseries_group_tls_version_params.py
index 8fef3fd1627..f129d42eaf3 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_tls_version_params.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_tls_version_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TimeseriesGroupTLSVersionParams"]
@@ -13,70 +14,85 @@
 
 class TimeseriesGroupTLSVersionParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
+    """Filters results by bot class.
 
     Refer to
     [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
 
     http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
+    """Filters results by HTTP version."""
 
     ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
+    """Filters results by operating system."""
diff --git a/src/cloudflare/types/radar/http/timeseries_group_tls_version_response.py b/src/cloudflare/types/radar/http/timeseries_group_tls_version_response.py
index 5f79831e6cc..9396994db09 100644
--- a/src/cloudflare/types/radar/http/timeseries_group_tls_version_response.py
+++ b/src/cloudflare/types/radar/http/timeseries_group_tls_version_response.py
@@ -1,16 +1,135 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TimeseriesGroupTLSVersionResponse", "Serie0"]
+__all__ = [
+    "TimeseriesGroupTLSVersionResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
-    timestamps: List[str]
+    timestamps: List[datetime]
 
     tls_1_0: List[str] = FieldInfo(alias="TLS 1.0")
 
@@ -24,6 +143,7 @@ class Serie0(BaseModel):
 
 
 class TimeseriesGroupTLSVersionResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/http/top_browser_families_params.py b/src/cloudflare/types/radar/http/top_browser_families_params.py
deleted file mode 100644
index 24900559bc1..00000000000
--- a/src/cloudflare/types/radar/http/top_browser_families_params.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List, Union
-from datetime import datetime
-from typing_extensions import Literal, Annotated, TypedDict
-
-from ...._utils import PropertyInfo
-
-__all__ = ["TopBrowserFamiliesParams"]
-
-
-class TopBrowserFamiliesParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
-
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
-    """
-
-    bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
-
-    Refer to
-    [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
-    """
-
-    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
-    """Filter for browser family."""
-
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
-
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
-    """
-
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
-    """End of the date range (inclusive)."""
-
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
-    week. Use this parameter or set specific start and end dates (`dateStart` and
-    `dateEnd` parameters).
-    """
-
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
-
-    device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
-
-    format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
-
-    http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
-
-    http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
-
-    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
-
-    limit: int
-    """Limit the number of objects in the response."""
-
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
-
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
-    """
-
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
-
-    os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
-
-    tls_version: Annotated[
-        List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
-    ]
-    """Filter for tls version."""
diff --git a/src/cloudflare/types/radar/http/top_browser_families_response.py b/src/cloudflare/types/radar/http/top_browser_families_response.py
deleted file mode 100644
index 34575a1c574..00000000000
--- a/src/cloudflare/types/radar/http/top_browser_families_response.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from datetime import datetime
-
-from pydantic import Field as FieldInfo
-
-from .browser import Browser
-from ...._models import BaseModel
-
-__all__ = ["TopBrowserFamiliesResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
-class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
-
-    description: str
-
-    event_type: str = FieldInfo(alias="eventType")
-
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
-
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
-
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
-
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
-
-
-class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
-
-    level: Optional[int] = None
-
-
-class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
-
-    last_updated: str = FieldInfo(alias="lastUpdated")
-
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
-
-
-class TopBrowserFamiliesResponse(BaseModel):
-    meta: Meta
-
-    top_0: List[Browser]
diff --git a/src/cloudflare/types/radar/http/top_browser_family_params.py b/src/cloudflare/types/radar/http/top_browser_family_params.py
new file mode 100644
index 00000000000..cf0bd886713
--- /dev/null
+++ b/src/cloudflare/types/radar/http/top_browser_family_params.py
@@ -0,0 +1,96 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TopBrowserFamilyParams"]
+
+
+class TopBrowserFamilyParams(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
+    """Filters results by bot class.
+
+    Refer to
+    [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
+    """Filters results by device type."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
+
+    http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
+
+    http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
+    """Filters results by HTTP version."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit: int
+    """Limits the number of objects returned in the response."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
+    """Filters results by operating system."""
+
+    tls_version: Annotated[
+        List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
+    ]
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/top_browser_family_response.py b/src/cloudflare/types/radar/http/top_browser_family_response.py
new file mode 100644
index 00000000000..f895cf7d0b9
--- /dev/null
+++ b/src/cloudflare/types/radar/http/top_browser_family_response.py
@@ -0,0 +1,132 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TopBrowserFamilyResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Top0(BaseModel):
+    name: str
+
+    value: str
+
+
+class TopBrowserFamilyResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/top_browser_params.py b/src/cloudflare/types/radar/http/top_browser_params.py
new file mode 100644
index 00000000000..575c5a93a60
--- /dev/null
+++ b/src/cloudflare/types/radar/http/top_browser_params.py
@@ -0,0 +1,99 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TopBrowserParams"]
+
+
+class TopBrowserParams(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
+    """Filters results by bot class.
+
+    Refer to
+    [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+    """
+
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
+    """Filters results by device type."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
+
+    http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
+
+    http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
+    """Filters results by HTTP version."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit: int
+    """Limits the number of objects returned in the response."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
+    """Filters results by operating system."""
+
+    tls_version: Annotated[
+        List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
+    ]
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http/top_browser_response.py b/src/cloudflare/types/radar/http/top_browser_response.py
new file mode 100644
index 00000000000..74712c28078
--- /dev/null
+++ b/src/cloudflare/types/radar/http/top_browser_response.py
@@ -0,0 +1,132 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TopBrowserResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Top0(BaseModel):
+    name: str
+
+    value: str
+
+
+class TopBrowserResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/http/top_browsers_params.py b/src/cloudflare/types/radar/http/top_browsers_params.py
deleted file mode 100644
index 3f5e1bf9caf..00000000000
--- a/src/cloudflare/types/radar/http/top_browsers_params.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List, Union
-from datetime import datetime
-from typing_extensions import Literal, Annotated, TypedDict
-
-from ...._utils import PropertyInfo
-
-__all__ = ["TopBrowsersParams"]
-
-
-class TopBrowsersParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
-
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
-    """
-
-    bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
-    """Filter for bot class.
-
-    Refer to
-    [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
-    """
-
-    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
-    """Filter for browser family."""
-
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
-
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
-    """
-
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
-    """End of the date range (inclusive)."""
-
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
-    week. Use this parameter or set specific start and end dates (`dateStart` and
-    `dateEnd` parameters).
-    """
-
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
-
-    device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
-    """Filter for device type."""
-
-    format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
-
-    http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
-    """Filter for http protocol."""
-
-    http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
-    """Filter for http version."""
-
-    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
-    """Filter for ip version."""
-
-    limit: int
-    """Limit the number of objects in the response."""
-
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
-
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
-    """
-
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
-
-    os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
-    """Filter for os name."""
-
-    tls_version: Annotated[
-        List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
-    ]
-    """Filter for tls version."""
diff --git a/src/cloudflare/types/radar/http/top_browsers_response.py b/src/cloudflare/types/radar/http/top_browsers_response.py
deleted file mode 100644
index 5f75affe2d0..00000000000
--- a/src/cloudflare/types/radar/http/top_browsers_response.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from datetime import datetime
-
-from pydantic import Field as FieldInfo
-
-from .browser import Browser
-from ...._models import BaseModel
-
-__all__ = ["TopBrowsersResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
-class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
-
-    description: str
-
-    event_type: str = FieldInfo(alias="eventType")
-
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
-
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
-
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
-
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
-
-
-class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
-
-    level: Optional[int] = None
-
-
-class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
-
-    last_updated: str = FieldInfo(alias="lastUpdated")
-
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
-
-
-class TopBrowsersResponse(BaseModel):
-    meta: Meta
-
-    top_0: List[Browser]
diff --git a/src/cloudflare/types/radar/http_summary_v2_params.py b/src/cloudflare/types/radar/http_summary_v2_params.py
new file mode 100644
index 00000000000..579e47514af
--- /dev/null
+++ b/src/cloudflare/types/radar/http_summary_v2_params.py
@@ -0,0 +1,100 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["HTTPSummaryV2Params"]
+
+
+class HTTPSummaryV2Params(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
+    """Filters results by bot class.
+
+    Refer to
+    [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
+    """Filters results by device type."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
+
+    http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
+
+    http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
+    """Filters results by HTTP version."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
+    """Filters results by operating system."""
+
+    tls_version: Annotated[
+        List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
+    ]
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http_summary_v2_response.py b/src/cloudflare/types/radar/http_summary_v2_response.py
new file mode 100644
index 00000000000..8b9c31f296c
--- /dev/null
+++ b/src/cloudflare/types/radar/http_summary_v2_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "HTTPSummaryV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class HTTPSummaryV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/http_timeseries_groups_v2_params.py b/src/cloudflare/types/radar/http_timeseries_groups_v2_params.py
new file mode 100644
index 00000000000..b95903f17f4
--- /dev/null
+++ b/src/cloudflare/types/radar/http_timeseries_groups_v2_params.py
@@ -0,0 +1,114 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["HTTPTimeseriesGroupsV2Params"]
+
+
+class HTTPTimeseriesGroupsV2Params(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
+    """Filters results by bot class.
+
+    Refer to
+    [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
+    """Filters results by device type."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
+
+    http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
+
+    http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
+    """Filters results by HTTP version."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    normalization: Literal["PERCENTAGE", "MIN0_MAX"]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
+    """Filters results by operating system."""
+
+    tls_version: Annotated[
+        List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
+    ]
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http_timeseries_groups_v2_response.py b/src/cloudflare/types/radar/http_timeseries_groups_v2_response.py
new file mode 100644
index 00000000000..197ea50ecbe
--- /dev/null
+++ b/src/cloudflare/types/radar/http_timeseries_groups_v2_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "HTTPTimeseriesGroupsV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class HTTPTimeseriesGroupsV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/http_timeseries_params.py b/src/cloudflare/types/radar/http_timeseries_params.py
index d498561809b..36075255f54 100644
--- a/src/cloudflare/types/radar/http_timeseries_params.py
+++ b/src/cloudflare/types/radar/http_timeseries_params.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 
 __all__ = ["HTTPTimeseriesParams"]
@@ -13,48 +14,97 @@
 
 class HTTPTimeseriesParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
+    """Filters results by bot class.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Refer to
+    [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
-    """End of the date range (inclusive)."""
+    browser_family: Annotated[List[Literal["CHROME", "EDGE", "FIREFOX", "SAFARI"]], PropertyInfo(alias="browserFamily")]
+    """Filters results by browser family."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    device_type: Annotated[List[Literal["DESKTOP", "MOBILE", "OTHER"]], PropertyInfo(alias="deviceType")]
+    """Filters results by device type."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
+
+    http_protocol: Annotated[List[Literal["HTTP", "HTTPS"]], PropertyInfo(alias="httpProtocol")]
+    """Filters results by HTTP protocol (HTTP vs. HTTPS)."""
+
+    http_version: Annotated[List[Literal["HTTPv1", "HTTPv2", "HTTPv3"]], PropertyInfo(alias="httpVersion")]
+    """Filters results by HTTP version."""
+
+    ip_version: Annotated[List[Literal["IPv4", "IPv6"]], PropertyInfo(alias="ipVersion")]
+    """Filters results by IP version (Ipv4 vs. IPv6)."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    os: List[Literal["WINDOWS", "MACOSX", "IOS", "ANDROID", "CHROMEOS", "LINUX", "SMART_TV"]]
+    """Filters results by operating system."""
+
+    tls_version: Annotated[
+        List[Literal["TLSv1_0", "TLSv1_1", "TLSv1_2", "TLSv1_3", "TLSvQUIC"]], PropertyInfo(alias="tlsVersion")
+    ]
+    """Filters results by TLS version."""
diff --git a/src/cloudflare/types/radar/http_timeseries_response.py b/src/cloudflare/types/radar/http_timeseries_response.py
index 6b45e4c117c..32ef330631d 100644
--- a/src/cloudflare/types/radar/http_timeseries_response.py
+++ b/src/cloudflare/types/radar/http_timeseries_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import TYPE_CHECKING, Dict, List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,54 +11,124 @@
 __all__ = [
     "HTTPTimeseriesResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
-    "Serie0",
+    "MetaDateRange",
+    "MetaUnit",
+    "HTTPTimeseriesResponseItem",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
 
-    level: Optional[int] = None
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
-    agg_interval: str = FieldInfo(alias="aggInterval")
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
 
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
     last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-class Serie0(BaseModel):
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class HTTPTimeseriesResponseItem(BaseModel):
     timestamps: List[datetime]
 
     values: List[str]
@@ -65,5 +136,16 @@ class Serie0(BaseModel):
 
 class HTTPTimeseriesResponse(BaseModel):
     meta: Meta
-
-    serie_0: Serie0
+    """Metadata for the results."""
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, HTTPTimeseriesResponseItem] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> HTTPTimeseriesResponseItem: ...
+    else:
+        __pydantic_extra__: Dict[str, HTTPTimeseriesResponseItem]
diff --git a/src/cloudflare/types/radar/leaked_credential_summary_v2_params.py b/src/cloudflare/types/radar/leaked_credential_summary_v2_params.py
new file mode 100644
index 00000000000..ce29ea856a6
--- /dev/null
+++ b/src/cloudflare/types/radar/leaked_credential_summary_v2_params.py
@@ -0,0 +1,75 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["LeakedCredentialSummaryV2Params"]
+
+
+class LeakedCredentialSummaryV2Params(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
+    """Filters results by bot class.
+
+    Refer to
+    [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+    """
+
+    compromised: List[Literal["CLEAN", "COMPROMISED"]]
+    """Filters results by compromised credential status (clean vs. compromised)."""
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/leaked_credential_summary_v2_response.py b/src/cloudflare/types/radar/leaked_credential_summary_v2_response.py
new file mode 100644
index 00000000000..66addb9b232
--- /dev/null
+++ b/src/cloudflare/types/radar/leaked_credential_summary_v2_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "LeakedCredentialSummaryV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class LeakedCredentialSummaryV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/leaked_credential_timeseries_groups_v2_params.py b/src/cloudflare/types/radar/leaked_credential_timeseries_groups_v2_params.py
new file mode 100644
index 00000000000..2765f530ef4
--- /dev/null
+++ b/src/cloudflare/types/radar/leaked_credential_timeseries_groups_v2_params.py
@@ -0,0 +1,103 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["LeakedCredentialTimeseriesGroupsV2Params"]
+
+
+class LeakedCredentialTimeseriesGroupsV2Params(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
+    """Filters results by bot class.
+
+    Refer to
+    [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+    """
+
+    check_result: Annotated[
+        List[
+            Literal[
+                "CLEAN",
+                "USERNAME_LEAKED",
+                "USERNAME_PASSWORD_SIMILAR",
+                "USERNAME_AND_PASSWORD_LEAKED",
+                "PASSWORD_LEAKED",
+            ]
+        ],
+        PropertyInfo(alias="checkResult"),
+    ]
+    """Filters results by leaked credential check result."""
+
+    compromised: List[Literal["CLEAN", "COMPROMISED"]]
+    """Filters results by compromised credential status (clean vs. compromised)."""
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
diff --git a/src/cloudflare/types/radar/leaked_credential_timeseries_groups_v2_response.py b/src/cloudflare/types/radar/leaked_credential_timeseries_groups_v2_response.py
new file mode 100644
index 00000000000..14bf74a6c4a
--- /dev/null
+++ b/src/cloudflare/types/radar/leaked_credential_timeseries_groups_v2_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "LeakedCredentialTimeseriesGroupsV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class LeakedCredentialTimeseriesGroupsV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/leaked_credentials/__init__.py b/src/cloudflare/types/radar/leaked_credentials/__init__.py
new file mode 100644
index 00000000000..175ebc5ba57
--- /dev/null
+++ b/src/cloudflare/types/radar/leaked_credentials/__init__.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .summary_bot_class_params import SummaryBotClassParams as SummaryBotClassParams
+from .summary_bot_class_response import SummaryBotClassResponse as SummaryBotClassResponse
+from .summary_compromised_params import SummaryCompromisedParams as SummaryCompromisedParams
+from .summary_compromised_response import SummaryCompromisedResponse as SummaryCompromisedResponse
+from .timeseries_group_bot_class_params import TimeseriesGroupBotClassParams as TimeseriesGroupBotClassParams
+from .timeseries_group_bot_class_response import TimeseriesGroupBotClassResponse as TimeseriesGroupBotClassResponse
+from .timeseries_group_compromised_params import TimeseriesGroupCompromisedParams as TimeseriesGroupCompromisedParams
+from .timeseries_group_compromised_response import (
+    TimeseriesGroupCompromisedResponse as TimeseriesGroupCompromisedResponse,
+)
diff --git a/src/cloudflare/types/radar/leaked_credentials/summary_bot_class_params.py b/src/cloudflare/types/radar/leaked_credentials/summary_bot_class_params.py
new file mode 100644
index 00000000000..bc0aa142ec2
--- /dev/null
+++ b/src/cloudflare/types/radar/leaked_credentials/summary_bot_class_params.py
@@ -0,0 +1,37 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["SummaryBotClassParams"]
+
+
+class SummaryBotClassParams(TypedDict, total=False):
+    compromised: List[Literal["CLEAN", "COMPROMISED"]]
+    """Filters results by compromised credential status (clean vs. compromised)."""
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/leaked_credentials/summary_bot_class_response.py b/src/cloudflare/types/radar/leaked_credentials/summary_bot_class_response.py
new file mode 100644
index 00000000000..afbd3010507
--- /dev/null
+++ b/src/cloudflare/types/radar/leaked_credentials/summary_bot_class_response.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "SummaryBotClassResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Summary0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Summary0(BaseModel):
+    bot: str
+    """A numeric string."""
+
+    human: str
+    """A numeric string."""
+
+
+class SummaryBotClassResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Summary0
diff --git a/src/cloudflare/types/radar/leaked_credentials/summary_compromised_params.py b/src/cloudflare/types/radar/leaked_credentials/summary_compromised_params.py
new file mode 100644
index 00000000000..28c2b82bc9a
--- /dev/null
+++ b/src/cloudflare/types/radar/leaked_credentials/summary_compromised_params.py
@@ -0,0 +1,41 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["SummaryCompromisedParams"]
+
+
+class SummaryCompromisedParams(TypedDict, total=False):
+    bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
+    """Filters results by bot class.
+
+    Refer to
+    [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/leaked_credentials/summary_compromised_response.py b/src/cloudflare/types/radar/leaked_credentials/summary_compromised_response.py
new file mode 100644
index 00000000000..1164daca230
--- /dev/null
+++ b/src/cloudflare/types/radar/leaked_credentials/summary_compromised_response.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "SummaryCompromisedResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Summary0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Summary0(BaseModel):
+    clean: str = FieldInfo(alias="CLEAN")
+    """A numeric string."""
+
+    compromised: str = FieldInfo(alias="COMPROMISED")
+    """A numeric string."""
+
+
+class SummaryCompromisedResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Summary0
diff --git a/src/cloudflare/types/radar/leaked_credentials/timeseries_group_bot_class_params.py b/src/cloudflare/types/radar/leaked_credentials/timeseries_group_bot_class_params.py
new file mode 100644
index 00000000000..76def348a14
--- /dev/null
+++ b/src/cloudflare/types/radar/leaked_credentials/timeseries_group_bot_class_params.py
@@ -0,0 +1,44 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TimeseriesGroupBotClassParams"]
+
+
+class TimeseriesGroupBotClassParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    compromised: List[Literal["CLEAN", "COMPROMISED"]]
+    """Filters results by compromised credential status (clean vs. compromised)."""
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/leaked_credentials/timeseries_group_bot_class_response.py b/src/cloudflare/types/radar/leaked_credentials/timeseries_group_bot_class_response.py
new file mode 100644
index 00000000000..25f6571e89f
--- /dev/null
+++ b/src/cloudflare/types/radar/leaked_credentials/timeseries_group_bot_class_response.py
@@ -0,0 +1,143 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TimeseriesGroupBotClassResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    bot: List[str]
+
+    human: List[str]
+
+    timestamps: List[datetime]
+
+
+class TimeseriesGroupBotClassResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/leaked_credentials/timeseries_group_compromised_params.py b/src/cloudflare/types/radar/leaked_credentials/timeseries_group_compromised_params.py
new file mode 100644
index 00000000000..4c560f465f2
--- /dev/null
+++ b/src/cloudflare/types/radar/leaked_credentials/timeseries_group_compromised_params.py
@@ -0,0 +1,48 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TimeseriesGroupCompromisedParams"]
+
+
+class TimeseriesGroupCompromisedParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    bot_class: Annotated[List[Literal["LIKELY_AUTOMATED", "LIKELY_HUMAN"]], PropertyInfo(alias="botClass")]
+    """Filters results by bot class.
+
+    Refer to
+    [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/leaked_credentials/timeseries_group_compromised_response.py b/src/cloudflare/types/radar/leaked_credentials/timeseries_group_compromised_response.py
new file mode 100644
index 00000000000..d2198c39168
--- /dev/null
+++ b/src/cloudflare/types/radar/leaked_credentials/timeseries_group_compromised_response.py
@@ -0,0 +1,143 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TimeseriesGroupCompromisedResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    clean: List[str] = FieldInfo(alias="CLEAN")
+
+    compromised: List[str] = FieldInfo(alias="COMPROMISED")
+
+    timestamps: List[datetime]
+
+
+class TimeseriesGroupCompromisedResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/netflow_timeseries_params.py b/src/cloudflare/types/radar/netflow_timeseries_params.py
deleted file mode 100644
index 4b0bc3ba324..00000000000
--- a/src/cloudflare/types/radar/netflow_timeseries_params.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List, Union
-from datetime import datetime
-from typing_extensions import Literal, Annotated, TypedDict
-
-from ..._utils import PropertyInfo
-
-__all__ = ["NetflowTimeseriesParams"]
-
-
-class NetflowTimeseriesParams(TypedDict, total=False):
-    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
-    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
-    """
-
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
-
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
-    """
-
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
-
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
-    """
-
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
-    """End of the date range (inclusive)."""
-
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
-    week. Use this parameter or set specific start and end dates (`dateStart` and
-    `dateEnd` parameters).
-    """
-
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
-
-    format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
-
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
-
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
-    """
-
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
-
-    normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"]
-    """Normalization method applied.
-
-    Refer to
-    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
-    """
-
-    product: List[Literal["HTTP", "ALL"]]
-    """Array of network traffic product types."""
diff --git a/src/cloudflare/types/radar/netflow_timeseries_response.py b/src/cloudflare/types/radar/netflow_timeseries_response.py
deleted file mode 100644
index 99701458c4d..00000000000
--- a/src/cloudflare/types/radar/netflow_timeseries_response.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from datetime import datetime
-
-from pydantic import Field as FieldInfo
-
-from ..._models import BaseModel
-
-__all__ = [
-    "NetflowTimeseriesResponse",
-    "Meta",
-    "MetaDateRange",
-    "MetaConfidenceInfo",
-    "MetaConfidenceInfoAnnotation",
-    "Serie0",
-]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
-class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
-
-    description: str
-
-    event_type: str = FieldInfo(alias="eventType")
-
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
-
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
-
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
-
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
-
-
-class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
-
-    level: Optional[int] = None
-
-
-class Meta(BaseModel):
-    agg_interval: str = FieldInfo(alias="aggInterval")
-
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
-
-    last_updated: datetime = FieldInfo(alias="lastUpdated")
-
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
-
-
-class Serie0(BaseModel):
-    timestamps: List[datetime]
-
-    values: List[str]
-
-
-class NetflowTimeseriesResponse(BaseModel):
-    meta: Meta
-
-    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/netflows/top_ases_params.py b/src/cloudflare/types/radar/netflows/top_ases_params.py
index 951cd0fb34e..fc58f6c2f1e 100644
--- a/src/cloudflare/types/radar/netflows/top_ases_params.py
+++ b/src/cloudflare/types/radar/netflows/top_ases_params.py
@@ -2,55 +2,68 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TopAsesParams"]
 
 
 class TopAsesParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/netflows/top_ases_response.py b/src/cloudflare/types/radar/netflows/top_ases_response.py
index 90b022f899f..a17dfa3dfc6 100644
--- a/src/cloudflare/types/radar/netflows/top_ases_response.py
+++ b/src/cloudflare/types/radar/netflows/top_ases_response.py
@@ -1,12 +1,122 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TopAsesResponse", "Top0"]
+__all__ = [
+    "TopAsesResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -15,7 +125,11 @@ class Top0(BaseModel):
     client_as_name: str = FieldInfo(alias="clientASName")
 
     value: str
+    """A numeric string."""
 
 
 class TopAsesResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/netflows/top_locations_params.py b/src/cloudflare/types/radar/netflows/top_locations_params.py
index 74b6631d0b9..c57229b3504 100644
--- a/src/cloudflare/types/radar/netflows/top_locations_params.py
+++ b/src/cloudflare/types/radar/netflows/top_locations_params.py
@@ -2,55 +2,68 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TopLocationsParams"]
 
 
 class TopLocationsParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/netflows/top_locations_response.py b/src/cloudflare/types/radar/netflows/top_locations_response.py
index fc168e7c58a..769fffedb1a 100644
--- a/src/cloudflare/types/radar/netflows/top_locations_response.py
+++ b/src/cloudflare/types/radar/netflows/top_locations_response.py
@@ -1,12 +1,122 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TopLocationsResponse", "Top0"]
+__all__ = [
+    "TopLocationsResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -15,7 +125,11 @@ class Top0(BaseModel):
     client_country_name: str = FieldInfo(alias="clientCountryName")
 
     value: str
+    """A numeric string."""
 
 
 class TopLocationsResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/netflows_summary_params.py b/src/cloudflare/types/radar/netflows_summary_params.py
new file mode 100644
index 00000000000..e046f4129b7
--- /dev/null
+++ b/src/cloudflare/types/radar/netflows_summary_params.py
@@ -0,0 +1,66 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["NetFlowsSummaryParams"]
+
+
+class NetFlowsSummaryParams(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/netflows_summary_response.py b/src/cloudflare/types/radar/netflows_summary_response.py
new file mode 100644
index 00000000000..0a16fe93b0a
--- /dev/null
+++ b/src/cloudflare/types/radar/netflows_summary_response.py
@@ -0,0 +1,134 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "NetFlowsSummaryResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Summary0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Summary0(BaseModel):
+    http: str = FieldInfo(alias="HTTP")
+    """A numeric string."""
+
+    other: str = FieldInfo(alias="OTHER")
+    """A numeric string."""
+
+
+class NetFlowsSummaryResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Summary0
diff --git a/src/cloudflare/types/radar/netflows_summary_v2_params.py b/src/cloudflare/types/radar/netflows_summary_v2_params.py
new file mode 100644
index 00000000000..a64fbb679e4
--- /dev/null
+++ b/src/cloudflare/types/radar/netflows_summary_v2_params.py
@@ -0,0 +1,76 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["NetFlowsSummaryV2Params"]
+
+
+class NetFlowsSummaryV2Params(TypedDict, total=False):
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    product: List[Literal["HTTP", "ALL"]]
+    """Filters the results by network traffic product types."""
diff --git a/src/cloudflare/types/radar/netflows_summary_v2_response.py b/src/cloudflare/types/radar/netflows_summary_v2_response.py
new file mode 100644
index 00000000000..f01f57d71f1
--- /dev/null
+++ b/src/cloudflare/types/radar/netflows_summary_v2_response.py
@@ -0,0 +1,125 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "NetFlowsSummaryV2Response",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class NetFlowsSummaryV2Response(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    summary_0: Dict[str, str]
diff --git a/src/cloudflare/types/radar/netflows_timeseries_groups_params.py b/src/cloudflare/types/radar/netflows_timeseries_groups_params.py
new file mode 100644
index 00000000000..1a96ee73c78
--- /dev/null
+++ b/src/cloudflare/types/radar/netflows_timeseries_groups_params.py
@@ -0,0 +1,90 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["NetFlowsTimeseriesGroupsParams"]
+
+
+class NetFlowsTimeseriesGroupsParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
+
+    limit_per_group: Annotated[int, PropertyInfo(alias="limitPerGroup")]
+    """
+    Limits the number of objects per group to the top items within the specified
+    time range. When item count exceeds the limit, extra items appear grouped under
+    an "other" category.
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    normalization: Literal["PERCENTAGE", "MIN0_MAX"]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    product: List[Literal["HTTP", "ALL"]]
+    """Filters the results by network traffic product types."""
diff --git a/src/cloudflare/types/radar/netflows_timeseries_groups_response.py b/src/cloudflare/types/radar/netflows_timeseries_groups_response.py
new file mode 100644
index 00000000000..d34b9e51e3c
--- /dev/null
+++ b/src/cloudflare/types/radar/netflows_timeseries_groups_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "NetFlowsTimeseriesGroupsResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[str]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[str]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[str]]
+
+
+class NetFlowsTimeseriesGroupsResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/netflows_timeseries_params.py b/src/cloudflare/types/radar/netflows_timeseries_params.py
new file mode 100644
index 00000000000..caf7224d20c
--- /dev/null
+++ b/src/cloudflare/types/radar/netflows_timeseries_params.py
@@ -0,0 +1,83 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["NetFlowsTimeseriesParams"]
+
+
+class NetFlowsTimeseriesParams(TypedDict, total=False):
+    agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
+
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
+    """
+
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
+    """
+
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    geo_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="geoId")]
+    """Filters results by Geolocation.
+
+    Specify a comma-separated list of GeoNames IDs. Prefix with `-` to exclude
+    geoIds from results. For example, `-2267056,360689` excludes results from the
+    2267056 (Lisbon), but includes results from 5128638 (New York).
+    """
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
+    """
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    normalization: Literal["PERCENTAGE_CHANGE", "MIN0_MAX"]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    product: List[Literal["HTTP", "ALL"]]
+    """Filters the results by network traffic product types."""
diff --git a/src/cloudflare/types/radar/netflows_timeseries_response.py b/src/cloudflare/types/radar/netflows_timeseries_response.py
new file mode 100644
index 00000000000..4bfadcc6b39
--- /dev/null
+++ b/src/cloudflare/types/radar/netflows_timeseries_response.py
@@ -0,0 +1,141 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "NetFlowsTimeseriesResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    values: List[str]
+
+
+class NetFlowsTimeseriesResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/quality/iqi_summary_params.py b/src/cloudflare/types/radar/quality/iqi_summary_params.py
index 1de09c36ab0..4ce12672bf2 100644
--- a/src/cloudflare/types/radar/quality/iqi_summary_params.py
+++ b/src/cloudflare/types/radar/quality/iqi_summary_params.py
@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["IQISummaryParams"]
@@ -13,44 +14,48 @@
 
 class IQISummaryParams(TypedDict, total=False):
     metric: Required[Literal["BANDWIDTH", "DNS", "LATENCY"]]
-    """Which metric to return: bandwidth, latency or DNS response time."""
+    """Defines which metric to return (bandwidth, latency, or DNS response time)."""
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/quality/iqi_summary_response.py b/src/cloudflare/types/radar/quality/iqi_summary_response.py
index 3e241c1ed90..6a10397cc29 100644
--- a/src/cloudflare/types/radar/quality/iqi_summary_response.py
+++ b/src/cloudflare/types/radar/quality/iqi_summary_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,51 +11,112 @@
 __all__ = [
     "IQISummaryResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
@@ -67,5 +129,6 @@ class Summary0(BaseModel):
 
 class IQISummaryResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/quality/iqi_timeseries_groups_params.py b/src/cloudflare/types/radar/quality/iqi_timeseries_groups_params.py
index 6923ba58c7c..e36fca1c1df 100644
--- a/src/cloudflare/types/radar/quality/iqi_timeseries_groups_params.py
+++ b/src/cloudflare/types/radar/quality/iqi_timeseries_groups_params.py
@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["IQITimeseriesGroupsParams"]
@@ -13,54 +14,58 @@
 
 class IQITimeseriesGroupsParams(TypedDict, total=False):
     metric: Required[Literal["BANDWIDTH", "DNS", "LATENCY"]]
-    """Which metric to return: bandwidth, latency or DNS response time."""
+    """Defines which metric to return (bandwidth, latency, or DNS response time)."""
 
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     interpolation: bool
-    """Enable interpolation for all series (using the average)."""
+    """Enables interpolation for all series (using the average)."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/quality/iqi_timeseries_groups_response.py b/src/cloudflare/types/radar/quality/iqi_timeseries_groups_response.py
index 1f4fca310a9..f8d7985eacd 100644
--- a/src/cloudflare/types/radar/quality/iqi_timeseries_groups_response.py
+++ b/src/cloudflare/types/radar/quality/iqi_timeseries_groups_response.py
@@ -1,10 +1,131 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["IQITimeseriesGroupsResponse", "Serie0"]
+__all__ = [
+    "IQITimeseriesGroupsResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
@@ -18,6 +139,7 @@ class Serie0(BaseModel):
 
 
 class IQITimeseriesGroupsResponse(BaseModel):
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/quality/speed/top_ases_params.py b/src/cloudflare/types/radar/quality/speed/top_ases_params.py
index d6d3e12b718..891cf8270a6 100644
--- a/src/cloudflare/types/radar/quality/speed/top_ases_params.py
+++ b/src/cloudflare/types/radar/quality/speed/top_ases_params.py
@@ -2,48 +2,52 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TopAsesParams"]
 
 
 class TopAsesParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     order_by: Annotated[
         Literal[
@@ -51,7 +55,7 @@ class TopAsesParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="orderBy"),
     ]
-    """Metric to order the results by."""
+    """Specifies the metric to order the results by."""
 
     reverse: bool
-    """Reverse the order of results."""
+    """Reverses the order of results."""
diff --git a/src/cloudflare/types/radar/quality/speed/top_ases_response.py b/src/cloudflare/types/radar/quality/speed/top_ases_response.py
index a67ff9d1ba8..486d34026cc 100644
--- a/src/cloudflare/types/radar/quality/speed/top_ases_response.py
+++ b/src/cloudflare/types/radar/quality/speed/top_ases_response.py
@@ -2,50 +2,121 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["TopAsesResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation", "Top0"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "TopAsesResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -72,5 +143,6 @@ class Top0(BaseModel):
 
 class TopAsesResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/quality/speed/top_locations_params.py b/src/cloudflare/types/radar/quality/speed/top_locations_params.py
index 89adc5a9988..d4b7bd9a88a 100644
--- a/src/cloudflare/types/radar/quality/speed/top_locations_params.py
+++ b/src/cloudflare/types/radar/quality/speed/top_locations_params.py
@@ -2,48 +2,52 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["TopLocationsParams"]
 
 
 class TopLocationsParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     order_by: Annotated[
         Literal[
@@ -51,7 +55,7 @@ class TopLocationsParams(TypedDict, total=False):
         ],
         PropertyInfo(alias="orderBy"),
     ]
-    """Metric to order the results by."""
+    """Specifies the metric to order the results by."""
 
     reverse: bool
-    """Reverse the order of results."""
+    """Reverses the order of results."""
diff --git a/src/cloudflare/types/radar/quality/speed/top_locations_response.py b/src/cloudflare/types/radar/quality/speed/top_locations_response.py
index 37420438e16..9818f6086d2 100644
--- a/src/cloudflare/types/radar/quality/speed/top_locations_response.py
+++ b/src/cloudflare/types/radar/quality/speed/top_locations_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,49 +11,112 @@
 __all__ = [
     "TopLocationsResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
 
-    level: Optional[int] = None
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0(BaseModel):
@@ -79,5 +143,6 @@ class Top0(BaseModel):
 
 class TopLocationsResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/quality/speed_histogram_params.py b/src/cloudflare/types/radar/quality/speed_histogram_params.py
index 489717a60e2..c29017c15ce 100644
--- a/src/cloudflare/types/radar/quality/speed_histogram_params.py
+++ b/src/cloudflare/types/radar/quality/speed_histogram_params.py
@@ -2,48 +2,52 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["SpeedHistogramParams"]
 
 
 class SpeedHistogramParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
     bucket_size: Annotated[int, PropertyInfo(alias="bucketSize")]
-    """The width for every bucket in the histogram."""
+    """Specifies the width for every bucket in the histogram."""
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
     metric_group: Annotated[Literal["BANDWIDTH", "LATENCY", "JITTER"], PropertyInfo(alias="metricGroup")]
     """Metrics to be returned."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/quality/speed_histogram_response.py b/src/cloudflare/types/radar/quality/speed_histogram_response.py
index 61d0fbc669e..ffd09307396 100644
--- a/src/cloudflare/types/radar/quality/speed_histogram_response.py
+++ b/src/cloudflare/types/radar/quality/speed_histogram_response.py
@@ -1,12 +1,22 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["SpeedHistogramResponse", "Histogram0"]
+__all__ = [
+    "SpeedHistogramResponse",
+    "Histogram0",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+]
 
 
 class Histogram0(BaseModel):
@@ -17,7 +27,113 @@ class Histogram0(BaseModel):
     bucket_min: List[str] = FieldInfo(alias="bucketMin")
 
 
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    bucket_size: int = FieldInfo(alias="bucketSize")
+    """The width for every bucket in the histogram."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    total_tests: List[int] = FieldInfo(alias="totalTests")
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
 class SpeedHistogramResponse(BaseModel):
     histogram_0: Histogram0
 
-    meta: object
+    meta: Meta
+    """Metadata for the results."""
diff --git a/src/cloudflare/types/radar/quality/speed_summary_params.py b/src/cloudflare/types/radar/quality/speed_summary_params.py
index 8cf97078bf9..b295031b160 100644
--- a/src/cloudflare/types/radar/quality/speed_summary_params.py
+++ b/src/cloudflare/types/radar/quality/speed_summary_params.py
@@ -2,42 +2,46 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["SpeedSummaryParams"]
 
 
 class SpeedSummaryParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/quality/speed_summary_response.py b/src/cloudflare/types/radar/quality/speed_summary_response.py
index af59a84fb16..c2dd186e3f7 100644
--- a/src/cloudflare/types/radar/quality/speed_summary_response.py
+++ b/src/cloudflare/types/radar/quality/speed_summary_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,51 +11,112 @@
 __all__ = [
     "SpeedSummaryResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
-    level: Optional[int] = None
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    last_updated: str = FieldInfo(alias="lastUpdated")
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
 
-    normalization: str
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
@@ -75,5 +137,6 @@ class Summary0(BaseModel):
 
 class SpeedSummaryResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/radar_email_summary.py b/src/cloudflare/types/radar/radar_email_summary.py
index d98b19527cb..762f810b5d5 100644
--- a/src/cloudflare/types/radar/radar_email_summary.py
+++ b/src/cloudflare/types/radar/radar_email_summary.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from pydantic import Field as FieldInfo
 
 from ..._models import BaseModel
@@ -10,7 +9,10 @@
 
 class RadarEmailSummary(BaseModel):
     fail: str = FieldInfo(alias="FAIL")
+    """A numeric string."""
 
     none: str = FieldInfo(alias="NONE")
+    """A numeric string."""
 
     pass_: str = FieldInfo(alias="PASS")
+    """A numeric string."""
diff --git a/src/cloudflare/types/radar/ranking/__init__.py b/src/cloudflare/types/radar/ranking/__init__.py
index 14589db42ec..def9d7d4fc0 100644
--- a/src/cloudflare/types/radar/ranking/__init__.py
+++ b/src/cloudflare/types/radar/ranking/__init__.py
@@ -4,3 +4,13 @@
 
 from .domain_get_params import DomainGetParams as DomainGetParams
 from .domain_get_response import DomainGetResponse as DomainGetResponse
+from .internet_service_top_params import InternetServiceTopParams as InternetServiceTopParams
+from .internet_service_top_response import InternetServiceTopResponse as InternetServiceTopResponse
+from .internet_service_categories_params import InternetServiceCategoriesParams as InternetServiceCategoriesParams
+from .internet_service_categories_response import InternetServiceCategoriesResponse as InternetServiceCategoriesResponse
+from .internet_service_timeseries_groups_params import (
+    InternetServiceTimeseriesGroupsParams as InternetServiceTimeseriesGroupsParams,
+)
+from .internet_service_timeseries_groups_response import (
+    InternetServiceTimeseriesGroupsResponse as InternetServiceTimeseriesGroupsResponse,
+)
diff --git a/src/cloudflare/types/radar/ranking/domain_get_params.py b/src/cloudflare/types/radar/ranking/domain_get_params.py
index 98bbbaf27da..f8481accde7 100644
--- a/src/cloudflare/types/radar/ranking/domain_get_params.py
+++ b/src/cloudflare/types/radar/ranking/domain_get_params.py
@@ -2,26 +2,31 @@
 
 from __future__ import annotations
 
-from typing import List
+import datetime
+from typing import Union
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["DomainGetParams"]
 
 
 class DomainGetParams(TypedDict, total=False):
-    date: List[str]
-    """Array of dates to filter the ranking."""
+    date: Annotated[SequenceNotStr[Union[str, datetime.date]], PropertyInfo(format="iso8601")]
+    """Filters results by the specified array of dates."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
+
+    include_top_locations: Annotated[bool, PropertyInfo(alias="includeTopLocations")]
+    """Includes top locations in the response."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     ranking_type: Annotated[Literal["POPULAR", "TRENDING_RISE", "TRENDING_STEADY"], PropertyInfo(alias="rankingType")]
     """The ranking type."""
diff --git a/src/cloudflare/types/radar/ranking/domain_get_response.py b/src/cloudflare/types/radar/ranking/domain_get_response.py
index 1f2feba60f3..c577ec3c1d3 100644
--- a/src/cloudflare/types/radar/ranking/domain_get_response.py
+++ b/src/cloudflare/types/radar/ranking/domain_get_response.py
@@ -1,20 +1,21 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
+from datetime import datetime
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["DomainGetResponse", "Details0", "Details0Category", "Details0TopLocation"]
+__all__ = ["DomainGetResponse", "Details0", "Details0Category", "Details0TopLocation", "Meta", "MetaDateRange"]
 
 
 class Details0Category(BaseModel):
-    id: float
+    id: int
 
     name: str
 
-    super_category_id: float = FieldInfo(alias="superCategoryId")
+    super_category_id: int = FieldInfo(alias="superCategoryId")
 
 
 class Details0TopLocation(BaseModel):
@@ -28,13 +29,27 @@ class Details0TopLocation(BaseModel):
 class Details0(BaseModel):
     categories: List[Details0Category]
 
-    top_locations: List[Details0TopLocation]
-
     bucket: Optional[str] = None
     """Only available in POPULAR ranking for the most recent ranking."""
 
     rank: Optional[int] = None
 
+    top_locations: Optional[List[Details0TopLocation]] = None
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class Meta(BaseModel):
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
 
 class DomainGetResponse(BaseModel):
     details_0: Details0
+
+    meta: Meta
diff --git a/src/cloudflare/types/radar/ranking/internet_service_categories_params.py b/src/cloudflare/types/radar/ranking/internet_service_categories_params.py
new file mode 100644
index 00000000000..ecdc2bc5c74
--- /dev/null
+++ b/src/cloudflare/types/radar/ranking/internet_service_categories_params.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import datetime
+from typing import Union
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["InternetServiceCategoriesParams"]
+
+
+class InternetServiceCategoriesParams(TypedDict, total=False):
+    date: Annotated[SequenceNotStr[Union[str, datetime.date]], PropertyInfo(format="iso8601")]
+    """Filters results by the specified array of dates."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit: int
+    """Limits the number of objects returned in the response."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/ranking/internet_service_categories_response.py b/src/cloudflare/types/radar/ranking/internet_service_categories_response.py
new file mode 100644
index 00000000000..60a0c7facc2
--- /dev/null
+++ b/src/cloudflare/types/radar/ranking/internet_service_categories_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+
+from ...._models import BaseModel
+
+__all__ = ["InternetServiceCategoriesResponse", "Categories0"]
+
+
+class Categories0(BaseModel):
+    name: str
+
+
+class InternetServiceCategoriesResponse(BaseModel):
+    categories_0: List[Categories0]
diff --git a/src/cloudflare/types/radar/ranking/internet_service_timeseries_groups_params.py b/src/cloudflare/types/radar/ranking/internet_service_timeseries_groups_params.py
new file mode 100644
index 00000000000..d5ae996a7c4
--- /dev/null
+++ b/src/cloudflare/types/radar/ranking/internet_service_timeseries_groups_params.py
@@ -0,0 +1,40 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["InternetServiceTimeseriesGroupsParams"]
+
+
+class InternetServiceTimeseriesGroupsParams(TypedDict, total=False):
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    """End of the date range (inclusive)."""
+
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
+    week. Use this parameter or set specific start and end dates (`dateStart` and
+    `dateEnd` parameters).
+    """
+
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit: int
+    """Limits the number of objects returned in the response."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    service_category: Annotated[SequenceNotStr[str], PropertyInfo(alias="serviceCategory")]
+    """Filters results by Internet service category."""
diff --git a/src/cloudflare/types/radar/ranking/internet_service_timeseries_groups_response.py b/src/cloudflare/types/radar/ranking/internet_service_timeseries_groups_response.py
new file mode 100644
index 00000000000..ef30aa8a860
--- /dev/null
+++ b/src/cloudflare/types/radar/ranking/internet_service_timeseries_groups_response.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import TYPE_CHECKING, Dict, List, Union
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "InternetServiceTimeseriesGroupsResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Serie0(BaseModel):
+    timestamps: List[datetime]
+
+    if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[Union[str, float]]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        # Stub to indicate that arbitrary properties are accepted.
+        # To access properties that are not valid identifiers you can use `getattr`, e.g.
+        # `getattr(obj, '$type')`
+        def __getattr__(self, attr: str) -> List[Union[str, float]]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[Union[str, float]]]
+
+
+class InternetServiceTimeseriesGroupsResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    serie_0: Serie0
diff --git a/src/cloudflare/types/radar/ranking/internet_service_top_params.py b/src/cloudflare/types/radar/ranking/internet_service_top_params.py
new file mode 100644
index 00000000000..a37371e0251
--- /dev/null
+++ b/src/cloudflare/types/radar/ranking/internet_service_top_params.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import datetime
+from typing import Union
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["InternetServiceTopParams"]
+
+
+class InternetServiceTopParams(TypedDict, total=False):
+    date: Annotated[SequenceNotStr[Union[str, datetime.date]], PropertyInfo(format="iso8601")]
+    """Filters results by the specified array of dates."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit: int
+    """Limits the number of objects returned in the response."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    service_category: Annotated[SequenceNotStr[str], PropertyInfo(alias="serviceCategory")]
+    """Filters results by Internet service category."""
diff --git a/src/cloudflare/types/radar/ranking/internet_service_top_response.py b/src/cloudflare/types/radar/ranking/internet_service_top_response.py
new file mode 100644
index 00000000000..b8f52279a08
--- /dev/null
+++ b/src/cloudflare/types/radar/ranking/internet_service_top_response.py
@@ -0,0 +1,129 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "InternetServiceTopResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Top0(BaseModel):
+    rank: int
+
+    service: str
+
+
+class InternetServiceTopResponse(BaseModel):
+    meta: Meta
+
+    top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/ranking_timeseries_groups_params.py b/src/cloudflare/types/radar/ranking_timeseries_groups_params.py
index f9f165cc336..ca38ebc4725 100644
--- a/src/cloudflare/types/radar/ranking_timeseries_groups_params.py
+++ b/src/cloudflare/types/radar/ranking_timeseries_groups_params.py
@@ -2,43 +2,51 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 
 __all__ = ["RankingTimeseriesGroupsParams"]
 
 
 class RankingTimeseriesGroupsParams(TypedDict, total=False):
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
+
+    domain_category: Annotated[SequenceNotStr[str], PropertyInfo(alias="domainCategory")]
+    """Filters results by domain category."""
 
-    domains: List[str]
-    """Array of comma separated list of domains names."""
+    domains: SequenceNotStr[str]
+    """Filters results by domain name. Specify a comma-separated list of domain names."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of locations (alpha-2 country codes)."""
+    location: SequenceNotStr[str]
+    """Filters results by location.
+
+    Specify a comma-separated list of alpha-2 location codes.
+    """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     ranking_type: Annotated[Literal["POPULAR", "TRENDING_RISE", "TRENDING_STEADY"], PropertyInfo(alias="rankingType")]
     """The ranking type."""
diff --git a/src/cloudflare/types/radar/ranking_timeseries_groups_response.py b/src/cloudflare/types/radar/ranking_timeseries_groups_response.py
index 7b5aeecff77..29e55b96554 100644
--- a/src/cloudflare/types/radar/ranking_timeseries_groups_response.py
+++ b/src/cloudflare/types/radar/ranking_timeseries_groups_response.py
@@ -1,13 +1,78 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import TYPE_CHECKING, List, Union
+from typing import TYPE_CHECKING, Dict, List, Union
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ..._models import BaseModel
 
-__all__ = ["RankingTimeseriesGroupsResponse", "Meta", "MetaDateRange", "Serie0"]
+__all__ = [
+    "RankingTimeseriesGroupsResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Serie0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
 
 
 class MetaDateRange(BaseModel):
@@ -18,22 +83,69 @@ class MetaDateRange(BaseModel):
     """Adjusted start of date range."""
 
 
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
 
 class Serie0(BaseModel):
-    timestamps: List[str]
+    timestamps: List[datetime]
 
     if TYPE_CHECKING:
+        # Some versions of Pydantic <2.8.0 have a bug and don’t allow assigning a
+        # value to this field, so for compatibility we avoid doing it at runtime.
+        __pydantic_extra__: Dict[str, List[Union[str, float]]] = FieldInfo(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
         # Stub to indicate that arbitrary properties are accepted.
         # To access properties that are not valid identifiers you can use `getattr`, e.g.
         # `getattr(obj, '$type')`
-        def __getattr__(self, attr: str) -> List[Union[str, float]]:
-            ...
+        def __getattr__(self, attr: str) -> List[Union[str, float]]: ...
+    else:
+        __pydantic_extra__: Dict[str, List[Union[str, float]]]
 
 
 class RankingTimeseriesGroupsResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/ranking_top_params.py b/src/cloudflare/types/radar/ranking_top_params.py
index e482e6f9f96..d15add7d04a 100644
--- a/src/cloudflare/types/radar/ranking_top_params.py
+++ b/src/cloudflare/types/radar/ranking_top_params.py
@@ -2,29 +2,37 @@
 
 from __future__ import annotations
 
-from typing import List
+import datetime
+from typing import Union
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 
 __all__ = ["RankingTopParams"]
 
 
 class RankingTopParams(TypedDict, total=False):
-    date: List[str]
-    """Array of dates to filter the ranking."""
+    date: Annotated[SequenceNotStr[Union[str, datetime.date]], PropertyInfo(format="iso8601")]
+    """Filters results by the specified array of dates."""
+
+    domain_category: Annotated[SequenceNotStr[str], PropertyInfo(alias="domainCategory")]
+    """Filters results by domain category."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
+
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    location: List[str]
-    """Array of locations (alpha-2 country codes)."""
+    Specify a comma-separated list of alpha-2 location codes.
+    """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
 
     ranking_type: Annotated[Literal["POPULAR", "TRENDING_RISE", "TRENDING_STEADY"], PropertyInfo(alias="rankingType")]
     """The ranking type."""
diff --git a/src/cloudflare/types/radar/ranking_top_response.py b/src/cloudflare/types/radar/ranking_top_response.py
index 83c7e56dfd1..5d15a40c37e 100644
--- a/src/cloudflare/types/radar/ranking_top_response.py
+++ b/src/cloudflare/types/radar/ranking_top_response.py
@@ -1,20 +1,121 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ..._models import BaseModel
 
-__all__ = ["RankingTopResponse", "Meta", "MetaTop0", "Top0", "Top0Category"]
-
+__all__ = [
+    "RankingTopResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+    "Top0Category",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
 
-class MetaTop0(BaseModel):
-    date: str
+    value: str
 
 
 class Meta(BaseModel):
-    top_0: MetaTop0
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Top0Category(BaseModel):
diff --git a/src/cloudflare/types/radar/robots_txt/__init__.py b/src/cloudflare/types/radar/robots_txt/__init__.py
new file mode 100644
index 00000000000..949681d3232
--- /dev/null
+++ b/src/cloudflare/types/radar/robots_txt/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .top_domain_categories_params import TopDomainCategoriesParams as TopDomainCategoriesParams
+from .top_domain_categories_response import TopDomainCategoriesResponse as TopDomainCategoriesResponse
diff --git a/src/cloudflare/types/radar/robots_txt/top/__init__.py b/src/cloudflare/types/radar/robots_txt/top/__init__.py
new file mode 100644
index 00000000000..6a26799ff66
--- /dev/null
+++ b/src/cloudflare/types/radar/robots_txt/top/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .user_agent_directive_params import UserAgentDirectiveParams as UserAgentDirectiveParams
+from .user_agent_directive_response import UserAgentDirectiveResponse as UserAgentDirectiveResponse
diff --git a/src/cloudflare/types/radar/robots_txt/top/user_agent_directive_params.py b/src/cloudflare/types/radar/robots_txt/top/user_agent_directive_params.py
new file mode 100644
index 00000000000..23defc02fc8
--- /dev/null
+++ b/src/cloudflare/types/radar/robots_txt/top/user_agent_directive_params.py
@@ -0,0 +1,35 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import datetime
+from typing import Union
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ....._types import SequenceNotStr
+from ....._utils import PropertyInfo
+
+__all__ = ["UserAgentDirectiveParams"]
+
+
+class UserAgentDirectiveParams(TypedDict, total=False):
+    date: Annotated[SequenceNotStr[Union[str, datetime.date]], PropertyInfo(format="iso8601")]
+    """Filters results by the specified array of dates."""
+
+    directive: Literal["ALLOW", "DISALLOW"]
+    """Filters results by robots.txt directive."""
+
+    domain_category: Annotated[SequenceNotStr[str], PropertyInfo(alias="domainCategory")]
+    """Filters results by domain category."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit: int
+    """Limits the number of objects returned in the response."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    user_agent_category: Annotated[Literal["AI"], PropertyInfo(alias="userAgentCategory")]
+    """Filters results by user agent category."""
diff --git a/src/cloudflare/types/radar/robots_txt/top/user_agent_directive_response.py b/src/cloudflare/types/radar/robots_txt/top/user_agent_directive_response.py
new file mode 100644
index 00000000000..9db786ab97f
--- /dev/null
+++ b/src/cloudflare/types/radar/robots_txt/top/user_agent_directive_response.py
@@ -0,0 +1,136 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = [
+    "UserAgentDirectiveResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Top0(BaseModel):
+    name: str
+
+    value: int
+
+    fully: Optional[int] = None
+
+    partially: Optional[int] = None
+
+
+class UserAgentDirectiveResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/robots_txt/top_domain_categories_params.py b/src/cloudflare/types/radar/robots_txt/top_domain_categories_params.py
new file mode 100644
index 00000000000..dfd9b5215e3
--- /dev/null
+++ b/src/cloudflare/types/radar/robots_txt/top_domain_categories_params.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import datetime
+from typing import Union
+from typing_extensions import Literal, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TopDomainCategoriesParams"]
+
+
+class TopDomainCategoriesParams(TypedDict, total=False):
+    date: Annotated[SequenceNotStr[Union[str, datetime.date]], PropertyInfo(format="iso8601")]
+    """Filters results by the specified array of dates."""
+
+    format: Literal["JSON", "CSV"]
+    """Format in which results will be returned."""
+
+    limit: int
+    """Limits the number of objects returned in the response."""
+
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
+
+    user_agent_category: Annotated[Literal["AI"], PropertyInfo(alias="userAgentCategory")]
+    """Filters results by user agent category."""
diff --git a/src/cloudflare/types/radar/robots_txt/top_domain_categories_response.py b/src/cloudflare/types/radar/robots_txt/top_domain_categories_response.py
new file mode 100644
index 00000000000..c0e570715bf
--- /dev/null
+++ b/src/cloudflare/types/radar/robots_txt/top_domain_categories_response.py
@@ -0,0 +1,132 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TopDomainCategoriesResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
+
+
+class MetaConfidenceInfoAnnotation(BaseModel):
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
+
+    description: str
+
+    end_date: datetime = FieldInfo(alias="endDate")
+
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
+
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
+
+    linked_url: str = FieldInfo(alias="linkedUrl")
+
+    start_date: datetime = FieldInfo(alias="startDate")
+
+
+class MetaConfidenceInfo(BaseModel):
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
+
+
+class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
+
+class Top0(BaseModel):
+    name: str
+
+    value: int
+
+
+class TopDomainCategoriesResponse(BaseModel):
+    meta: Meta
+    """Metadata for the results."""
+
+    top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/search_global_params.py b/src/cloudflare/types/radar/search_global_params.py
index a819d17e12f..f85c303f533 100644
--- a/src/cloudflare/types/radar/search_global_params.py
+++ b/src/cloudflare/types/radar/search_global_params.py
@@ -12,19 +12,49 @@
 
 class SearchGlobalParams(TypedDict, total=False):
     query: Required[str]
-    """Search for locations, AS and reports."""
-
-    exclude: List[Literal["SPECIAL_EVENTS", "NOTEBOOKS", "LOCATIONS", "ASNS"]]
-    """Search types to be excluded from results."""
+    """String used to perform the search operation."""
+
+    exclude: List[
+        Literal[
+            "ADM1S",
+            "ASNS",
+            "BOTS",
+            "CERTIFICATE_AUTHORITIES",
+            "CERTIFICATE_LOGS",
+            "ORIGINS",
+            "ORIGIN_REGIONS",
+            "INDUSTRIES",
+            "LOCATIONS",
+            "NOTEBOOKS",
+            "TLDS",
+            "VERTICALS",
+        ]
+    ]
+    """Search types excluded from results."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
-
-    include: List[Literal["SPECIAL_EVENTS", "NOTEBOOKS", "LOCATIONS", "ASNS"]]
-    """Search types to be included in results."""
+    """Format in which results will be returned."""
+
+    include: List[
+        Literal[
+            "ADM1S",
+            "ASNS",
+            "BOTS",
+            "CERTIFICATE_AUTHORITIES",
+            "CERTIFICATE_LOGS",
+            "ORIGINS",
+            "ORIGIN_REGIONS",
+            "INDUSTRIES",
+            "LOCATIONS",
+            "NOTEBOOKS",
+            "TLDS",
+            "VERTICALS",
+        ]
+    ]
+    """Search types included in results."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
     limit_per_group: Annotated[float, PropertyInfo(alias="limitPerGroup")]
-    """Limit the number of objects per search category."""
+    """Limits the number of objects per search category."""
diff --git a/src/cloudflare/types/radar/tcp_resets_timeout_summary_params.py b/src/cloudflare/types/radar/tcp_resets_timeout_summary_params.py
index a278b500c38..8f6e8a78a27 100644
--- a/src/cloudflare/types/radar/tcp_resets_timeout_summary_params.py
+++ b/src/cloudflare/types/radar/tcp_resets_timeout_summary_params.py
@@ -2,52 +2,57 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 
 __all__ = ["TCPResetsTimeoutSummaryParams"]
 
 
 class TCPResetsTimeoutSummaryParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/tcp_resets_timeout_summary_response.py b/src/cloudflare/types/radar/tcp_resets_timeout_summary_response.py
index f38a9c7df46..0b9f3fde2b4 100644
--- a/src/cloudflare/types/radar/tcp_resets_timeout_summary_response.py
+++ b/src/cloudflare/types/radar/tcp_resets_timeout_summary_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,47 +11,112 @@
 __all__ = [
     "TCPResetsTimeoutSummaryResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Summary0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
 
-    level: Optional[int] = None
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
+    """Metadata for the results."""
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
+
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Summary0(BaseModel):
@@ -84,5 +150,6 @@ class Summary0(BaseModel):
 
 class TCPResetsTimeoutSummaryResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     summary_0: Summary0
diff --git a/src/cloudflare/types/radar/tcp_resets_timeout_timeseries_groups_params.py b/src/cloudflare/types/radar/tcp_resets_timeout_timeseries_groups_params.py
index 81d83b0cdc2..442d85b15af 100644
--- a/src/cloudflare/types/radar/tcp_resets_timeout_timeseries_groups_params.py
+++ b/src/cloudflare/types/radar/tcp_resets_timeout_timeseries_groups_params.py
@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 
 __all__ = ["TCPResetsTimeoutTimeseriesGroupsParams"]
@@ -13,48 +14,52 @@
 
 class TCPResetsTimeoutTimeseriesGroupsParams(TypedDict, total=False):
     agg_interval: Annotated[Literal["15m", "1h", "1d", "1w"], PropertyInfo(alias="aggInterval")]
-    """
-    Aggregation interval results should be returned in (for example, in 15 minutes
-    or 1 hour intervals). Refer to
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
     [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
     """
 
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/tcp_resets_timeout_timeseries_groups_response.py b/src/cloudflare/types/radar/tcp_resets_timeout_timeseries_groups_response.py
index 84e1ce0e8ea..708465f5c15 100644
--- a/src/cloudflare/types/radar/tcp_resets_timeout_timeseries_groups_response.py
+++ b/src/cloudflare/types/radar/tcp_resets_timeout_timeseries_groups_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,85 +11,139 @@
 __all__ = [
     "TCPResetsTimeoutTimeseriesGroupsResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Serie0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
+
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
 
-    level: Optional[int] = None
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
-    agg_interval: str = FieldInfo(alias="aggInterval")
+    """Metadata for the results."""
+
+    agg_interval: Literal["FIFTEEN_MINUTES", "ONE_HOUR", "ONE_DAY", "ONE_WEEK", "ONE_MONTH"] = FieldInfo(
+        alias="aggInterval"
+    )
+    """Aggregation interval of the results (e.g., in 15 minutes or 1 hour intervals).
+
+    Refer to
+    [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+    """
+
+    confidence_info: MetaConfidenceInfo = FieldInfo(alias="confidenceInfo")
 
     date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
 
     last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
 
-    confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
+    units: List[MetaUnit]
+    """Measurement units for the results."""
 
 
 class Serie0(BaseModel):
     later_in_flow: List[str]
-    """
-    Connection resets within the first 10 packets from the client, but after the
-    server has received multiple data packets.
-    """
 
     no_match: List[str]
-    """All other connections."""
 
     post_ack: List[str]
-    """
-    Connection resets or timeouts after the server received both a SYN packet and an
-    ACK packet, meaning the connection was successfully established.
-    """
 
     post_psh: List[str]
-    """
-    Connection resets or timeouts after the server received a packet with PSH flag
-    set, following connection establishment.
-    """
 
     post_syn: List[str]
-    """
-    Connection resets or timeouts after the server received only a single SYN
-    packet.
-    """
 
     timestamps: List[datetime]
 
 
 class TCPResetsTimeoutTimeseriesGroupsResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     serie_0: Serie0
diff --git a/src/cloudflare/types/radar/traffic_anomalies/location_get_params.py b/src/cloudflare/types/radar/traffic_anomalies/location_get_params.py
index bd0ebc748dd..1228133abf4 100644
--- a/src/cloudflare/types/radar/traffic_anomalies/location_get_params.py
+++ b/src/cloudflare/types/radar/traffic_anomalies/location_get_params.py
@@ -16,18 +16,15 @@ class LocationGetParams(TypedDict, total=False):
     """End of the date range (inclusive)."""
 
     date_range: Annotated[str, PropertyInfo(alias="dateRange")]
-    """
-    Shorthand date ranges for the last X days - use when you don't need specific
-    start and end dates.
-    """
+    """Filters results by date range."""
 
     date_start: Annotated[Union[str, datetime], PropertyInfo(alias="dateStart", format="iso8601")]
     """Start of the date range (inclusive)."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
     status: Literal["VERIFIED", "UNVERIFIED"]
diff --git a/src/cloudflare/types/radar/traffic_anomalies/location_get_response.py b/src/cloudflare/types/radar/traffic_anomalies/location_get_response.py
index 3cf6ca01da7..fdc6a2ff010 100644
--- a/src/cloudflare/types/radar/traffic_anomalies/location_get_response.py
+++ b/src/cloudflare/types/radar/traffic_anomalies/location_get_response.py
@@ -15,6 +15,7 @@ class TrafficAnomaly(BaseModel):
     client_country_name: str = FieldInfo(alias="clientCountryName")
 
     value: str
+    """A numeric string."""
 
 
 class LocationGetResponse(BaseModel):
diff --git a/src/cloudflare/types/radar/traffic_anomaly_get_params.py b/src/cloudflare/types/radar/traffic_anomaly_get_params.py
index 0fae350c54c..84a6aeaa916 100644
--- a/src/cloudflare/types/radar/traffic_anomaly_get_params.py
+++ b/src/cloudflare/types/radar/traffic_anomaly_get_params.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Union
+from typing import List, Union
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
@@ -13,30 +13,36 @@
 
 class TrafficAnomalyGetParams(TypedDict, total=False):
     asn: int
-    """Single ASN as integer."""
+    """Filters results by Autonomous System.
+
+    Specify a single Autonomous System Number (ASN) as integer.
+    """
 
     date_end: Annotated[Union[str, datetime], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
     date_range: Annotated[str, PropertyInfo(alias="dateRange")]
-    """
-    Shorthand date ranges for the last X days - use when you don't need specific
-    start and end dates.
-    """
+    """Filters results by date range."""
 
     date_start: Annotated[Union[str, datetime], PropertyInfo(alias="dateStart", format="iso8601")]
     """Start of the date range (inclusive)."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
     location: str
-    """Location Alpha2 code."""
+    """Filters results by location. Specify an alpha-2 location code."""
 
     offset: int
-    """Number of objects to skip before grabbing results."""
+    """Skips the specified number of objects before fetching the results."""
+
+    origin: str
+    """Filters results by origin."""
 
     status: Literal["VERIFIED", "UNVERIFIED"]
+
+    type: List[Literal["LOCATION", "AS", "ORIGIN"]]
+    """Filters results by entity type (LOCATION, AS, or ORIGIN)."""
diff --git a/src/cloudflare/types/radar/traffic_anomaly_get_response.py b/src/cloudflare/types/radar/traffic_anomaly_get_response.py
index ba231bfa22c..95e1892a058 100644
--- a/src/cloudflare/types/radar/traffic_anomaly_get_response.py
+++ b/src/cloudflare/types/radar/traffic_anomaly_get_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
+from datetime import datetime
 
 from pydantic import Field as FieldInfo
 
@@ -12,6 +13,7 @@
     "TrafficAnomalyASNDetails",
     "TrafficAnomalyASNDetailsLocations",
     "TrafficAnomalyLocationDetails",
+    "TrafficAnomalyOriginDetails",
 ]
 
 
@@ -35,6 +37,12 @@ class TrafficAnomalyLocationDetails(BaseModel):
     name: str
 
 
+class TrafficAnomalyOriginDetails(BaseModel):
+    name: str
+
+    origin: str
+
+
 class TrafficAnomaly(BaseModel):
     start_date: str = FieldInfo(alias="startDate")
 
@@ -46,10 +54,12 @@ class TrafficAnomaly(BaseModel):
 
     asn_details: Optional[TrafficAnomalyASNDetails] = FieldInfo(alias="asnDetails", default=None)
 
-    end_date: Optional[str] = FieldInfo(alias="endDate", default=None)
+    end_date: Optional[datetime] = FieldInfo(alias="endDate", default=None)
 
     location_details: Optional[TrafficAnomalyLocationDetails] = FieldInfo(alias="locationDetails", default=None)
 
+    origin_details: Optional[TrafficAnomalyOriginDetails] = FieldInfo(alias="originDetails", default=None)
+
     visible_in_data_sources: Optional[List[str]] = FieldInfo(alias="visibleInDataSources", default=None)
 
 
diff --git a/src/cloudflare/types/radar/verified_bots/top_bots_params.py b/src/cloudflare/types/radar/verified_bots/top_bots_params.py
index 5eb7fcda9cc..6747c72e7c6 100644
--- a/src/cloudflare/types/radar/verified_bots/top_bots_params.py
+++ b/src/cloudflare/types/radar/verified_bots/top_bots_params.py
@@ -2,55 +2,60 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TopBotsParams"]
 
 
 class TopBotsParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/verified_bots/top_bots_response.py b/src/cloudflare/types/radar/verified_bots/top_bots_response.py
index 2e3ffc6a653..cbb12a5b287 100644
--- a/src/cloudflare/types/radar/verified_bots/top_bots_response.py
+++ b/src/cloudflare/types/radar/verified_bots/top_bots_response.py
@@ -2,49 +2,122 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["TopBotsResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation", "Top0"]
-
-
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
+__all__ = [
+    "TopBotsResponse",
+    "Meta",
+    "MetaConfidenceInfo",
+    "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
+    "Top0",
+]
 
 
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
 
-    level: Optional[int] = None
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+    """Metadata for the results."""
 
     confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
 
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
 
 class Top0(BaseModel):
     bot_category: str = FieldInfo(alias="botCategory")
@@ -54,9 +127,11 @@ class Top0(BaseModel):
     bot_owner: str = FieldInfo(alias="botOwner")
 
     value: str
+    """A numeric string."""
 
 
 class TopBotsResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/radar/verified_bots/top_categories_params.py b/src/cloudflare/types/radar/verified_bots/top_categories_params.py
index 70f3ced1ddc..7d053fd6f12 100644
--- a/src/cloudflare/types/radar/verified_bots/top_categories_params.py
+++ b/src/cloudflare/types/radar/verified_bots/top_categories_params.py
@@ -2,55 +2,60 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TopCategoriesParams"]
 
 
 class TopCategoriesParams(TypedDict, total=False):
-    asn: List[str]
-    """Array of comma separated list of ASNs, start with `-` to exclude from results.
+    asn: SequenceNotStr[str]
+    """Filters results by Autonomous System.
 
-    For example, `-174, 3356` excludes results from AS174, but includes results from
-    AS3356.
+    Specify one or more Autonomous System Numbers (ASNs) as a comma-separated list.
+    Prefix with `-` to exclude ASNs from results. For example, `-174, 3356` excludes
+    results from AS174, but includes results from AS3356.
     """
 
-    continent: List[str]
-    """Array of comma separated list of continents (alpha-2 continent codes).
+    continent: SequenceNotStr[str]
+    """Filters results by continent.
 
-    Start with `-` to exclude from results. For example, `-EU,NA` excludes results
-    from Europe, but includes results from North America.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    continents from results. For example, `-EU,NA` excludes results from EU, but
+    includes results from NA.
     """
 
-    date_end: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
+    date_end: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateEnd", format="iso8601")]
     """End of the date range (inclusive)."""
 
-    date_range: Annotated[List[str], PropertyInfo(alias="dateRange")]
-    """
-    For example, use `7d` and `7dControl` to compare this week with the previous
+    date_range: Annotated[SequenceNotStr[str], PropertyInfo(alias="dateRange")]
+    """Filters results by date range.
+
+    For example, use `7d` and `7dcontrol` to compare this week with the previous
     week. Use this parameter or set specific start and end dates (`dateStart` and
     `dateEnd` parameters).
     """
 
-    date_start: Annotated[List[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
-    """Array of datetimes to filter the start of a series."""
+    date_start: Annotated[SequenceNotStr[Union[str, datetime]], PropertyInfo(alias="dateStart", format="iso8601")]
+    """Start of the date range."""
 
     format: Literal["JSON", "CSV"]
-    """Format results are returned in."""
+    """Format in which results will be returned."""
 
     limit: int
-    """Limit the number of objects in the response."""
+    """Limits the number of objects returned in the response."""
 
-    location: List[str]
-    """Array of comma separated list of locations (alpha-2 country codes).
+    location: SequenceNotStr[str]
+    """Filters results by location.
 
-    Start with `-` to exclude from results. For example, `-US,PT` excludes results
-    from the US, but includes results from PT.
+    Specify a comma-separated list of alpha-2 codes. Prefix with `-` to exclude
+    locations from results. For example, `-US,PT` excludes results from the US, but
+    includes results from PT.
     """
 
-    name: List[str]
-    """Array of names that will be used to name the series in responses."""
+    name: SequenceNotStr[str]
+    """Array of names used to label the series in the response."""
diff --git a/src/cloudflare/types/radar/verified_bots/top_categories_response.py b/src/cloudflare/types/radar/verified_bots/top_categories_response.py
index 46260e454ca..ad4643077d2 100644
--- a/src/cloudflare/types/radar/verified_bots/top_categories_response.py
+++ b/src/cloudflare/types/radar/verified_bots/top_categories_response.py
@@ -2,6 +2,7 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
@@ -10,56 +11,123 @@
 __all__ = [
     "TopCategoriesResponse",
     "Meta",
-    "MetaDateRange",
     "MetaConfidenceInfo",
     "MetaConfidenceInfoAnnotation",
+    "MetaDateRange",
+    "MetaUnit",
     "Top0",
 ]
 
 
-class MetaDateRange(BaseModel):
-    end_time: datetime = FieldInfo(alias="endTime")
-    """Adjusted end of date range."""
-
-    start_time: datetime = FieldInfo(alias="startTime")
-    """Adjusted start of date range."""
-
-
 class MetaConfidenceInfoAnnotation(BaseModel):
-    data_source: str = FieldInfo(alias="dataSource")
+    """Annotation associated with the result (e.g. outage or other type of event)."""
+
+    data_source: Literal[
+        "ALL",
+        "AI_BOTS",
+        "AI_GATEWAY",
+        "BGP",
+        "BOTS",
+        "CONNECTION_ANOMALY",
+        "CT",
+        "DNS",
+        "DNS_MAGNITUDE",
+        "DNS_AS112",
+        "DOS",
+        "EMAIL_ROUTING",
+        "EMAIL_SECURITY",
+        "FW",
+        "FW_PG",
+        "HTTP",
+        "HTTP_CONTROL",
+        "HTTP_CRAWLER_REFERER",
+        "HTTP_ORIGINS",
+        "IQI",
+        "LEAKED_CREDENTIALS",
+        "NET",
+        "ROBOTS_TXT",
+        "SPEED",
+        "WORKERS_AI",
+    ] = FieldInfo(alias="dataSource")
+    """Data source for annotations."""
 
     description: str
 
-    event_type: str = FieldInfo(alias="eventType")
+    end_date: datetime = FieldInfo(alias="endDate")
 
-    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    event_type: Literal["EVENT", "GENERAL", "OUTAGE", "PARTIAL_PROJECTION", "PIPELINE", "TRAFFIC_ANOMALY"] = FieldInfo(
+        alias="eventType"
+    )
+    """Event type for annotations."""
 
-    end_time: Optional[datetime] = FieldInfo(alias="endTime", default=None)
+    is_instantaneous: bool = FieldInfo(alias="isInstantaneous")
+    """Whether event is a single point in time or a time range."""
 
-    linked_url: Optional[str] = FieldInfo(alias="linkedUrl", default=None)
+    linked_url: str = FieldInfo(alias="linkedUrl")
 
-    start_time: Optional[datetime] = FieldInfo(alias="startTime", default=None)
+    start_date: datetime = FieldInfo(alias="startDate")
 
 
 class MetaConfidenceInfo(BaseModel):
-    annotations: Optional[List[MetaConfidenceInfoAnnotation]] = None
+    annotations: List[MetaConfidenceInfoAnnotation]
 
-    level: Optional[int] = None
+    level: int
+    """Provides an indication of how much confidence Cloudflare has in the data."""
+
+
+class MetaDateRange(BaseModel):
+    end_time: datetime = FieldInfo(alias="endTime")
+    """Adjusted end of date range."""
+
+    start_time: datetime = FieldInfo(alias="startTime")
+    """Adjusted start of date range."""
+
+
+class MetaUnit(BaseModel):
+    name: str
+
+    value: str
 
 
 class Meta(BaseModel):
-    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+    """Metadata for the results."""
 
     confidence_info: Optional[MetaConfidenceInfo] = FieldInfo(alias="confidenceInfo", default=None)
 
+    date_range: List[MetaDateRange] = FieldInfo(alias="dateRange")
+
+    last_updated: datetime = FieldInfo(alias="lastUpdated")
+    """Timestamp of the last dataset update."""
+
+    normalization: Literal[
+        "PERCENTAGE",
+        "MIN0_MAX",
+        "MIN_MAX",
+        "RAW_VALUES",
+        "PERCENTAGE_CHANGE",
+        "ROLLING_AVERAGE",
+        "OVERLAPPED_PERCENTAGE",
+        "RATIO",
+    ]
+    """Normalization method applied to the results.
+
+    Refer to
+    [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+    """
+
+    units: List[MetaUnit]
+    """Measurement units for the results."""
+
 
 class Top0(BaseModel):
     bot_category: str = FieldInfo(alias="botCategory")
 
     value: str
+    """A numeric string."""
 
 
 class TopCategoriesResponse(BaseModel):
     meta: Meta
+    """Metadata for the results."""
 
     top_0: List[Top0]
diff --git a/src/cloudflare/types/rate_limits/__init__.py b/src/cloudflare/types/rate_limits/__init__.py
index ac12490e28a..37c5bbf55dc 100644
--- a/src/cloudflare/types/rate_limits/__init__.py
+++ b/src/cloudflare/types/rate_limits/__init__.py
@@ -3,12 +3,8 @@
 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_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/rate_limits/action.py b/src/cloudflare/types/rate_limits/action.py
index ca936bce016..56a4942ddb9 100644
--- a/src/cloudflare/types/rate_limits/action.py
+++ b/src/cloudflare/types/rate_limits/action.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["Action"]
 
-Action = Literal["block", "challenge", "js_challenge", "managed_challenge", "allow", "log", "bypass"]
+Action: TypeAlias = Literal["block", "challenge", "js_challenge", "managed_challenge", "allow", "log", "bypass"]
diff --git a/src/cloudflare/types/rate_limits/methods.py b/src/cloudflare/types/rate_limits/methods.py
deleted file mode 100644
index a2ecc01f286..00000000000
--- a/src/cloudflare/types/rate_limits/methods.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing_extensions import Literal
-
-__all__ = ["Methods"]
-
-Methods = Literal["GET", "POST", "PUT", "DELETE", "PATCH", "HEAD", "_ALL_"]
diff --git a/src/cloudflare/types/rate_limits/rate_limit.py b/src/cloudflare/types/rate_limits/rate_limit.py
index 9fa5741af1a..acb4b91b511 100644
--- a/src/cloudflare/types/rate_limits/rate_limit.py
+++ b/src/cloudflare/types/rate_limits/rate_limit.py
@@ -3,13 +3,18 @@
 from typing import List, Optional
 from typing_extensions import Literal
 
-from .methods import Methods
 from ..._models import BaseModel
 
 __all__ = ["RateLimit", "Action", "ActionResponse", "Bypass", "Match", "MatchHeader", "MatchRequest", "MatchResponse"]
 
 
 class ActionResponse(BaseModel):
+    """A custom content type and reponse to return when the threshold is exceeded.
+
+    The custom response configured in this object will override the custom error for the zone. This object is optional.
+    Notes: If you omit this object, Cloudflare will use the default HTML error page. If "mode" is "challenge", "managed_challenge", or "js_challenge", Cloudflare will use the zone challenge pages and you should not provide the "response" object.
+    """
+
     body: Optional[str] = None
     """The response body to return.
 
@@ -24,6 +29,10 @@ class ActionResponse(BaseModel):
 
 
 class Action(BaseModel):
+    """
+    The action to perform when the threshold of matched traffic within the configured period is exceeded.
+    """
+
     mode: Optional[Literal["simulate", "ban", "challenge", "js_challenge", "managed_challenge"]] = None
     """The action to perform."""
 
@@ -65,7 +74,7 @@ class MatchHeader(BaseModel):
 
 
 class MatchRequest(BaseModel):
-    methods: Optional[List[Methods]] = None
+    methods: Optional[List[Literal["GET", "POST", "PUT", "DELETE", "PATCH", "HEAD", "_ALL_"]]] = None
     """The HTTP methods to match.
 
     You can specify a subset (for example, `['POST','PUT']`) or all methods
@@ -100,6 +109,8 @@ class MatchResponse(BaseModel):
 
 
 class Match(BaseModel):
+    """Determines which traffic the rate limit counts towards the threshold."""
+
     headers: Optional[List[MatchHeader]] = None
 
     request: Optional[MatchRequest] = None
@@ -124,7 +135,7 @@ class RateLimit(BaseModel):
     """
 
     description: Optional[str] = None
-    """An informative summary of the rate limit.
+    """An informative summary of the rule.
 
     This value is sanitized and any tags will be removed.
     """
diff --git a/src/cloudflare/types/rate_limits/rate_limit_create_params.py b/src/cloudflare/types/rate_limits/rate_limit_create_params.py
index 7d4d0cb61f2..447c2b8b56e 100644
--- a/src/cloudflare/types/rate_limits/rate_limit_create_params.py
+++ b/src/cloudflare/types/rate_limits/rate_limit_create_params.py
@@ -2,10 +2,140 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import List, Iterable
+from typing_extensions import Literal, Required, TypedDict
 
-__all__ = ["RateLimitCreateParams"]
+from ..._types import SequenceNotStr
+
+__all__ = ["RateLimitCreateParams", "Action", "ActionResponse", "Match", "MatchHeader", "MatchRequest", "MatchResponse"]
 
 
 class RateLimitCreateParams(TypedDict, total=False):
-    body: Required[object]
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    action: Required[Action]
+    """
+    The action to perform when the threshold of matched traffic within the
+    configured period is exceeded.
+    """
+
+    match: Required[Match]
+    """Determines which traffic the rate limit counts towards the threshold."""
+
+    period: Required[float]
+    """The time in seconds (an integer value) to count matching traffic.
+
+    If the count exceeds the configured threshold within this period, Cloudflare
+    will perform the configured action.
+    """
+
+    threshold: Required[float]
+    """The threshold that will trigger the configured mitigation action.
+
+    Configure this value along with the `period` property to establish a threshold
+    per period.
+    """
+
+
+class ActionResponse(TypedDict, total=False):
+    """A custom content type and reponse to return when the threshold is exceeded.
+
+    The custom response configured in this object will override the custom error for the zone. This object is optional.
+    Notes: If you omit this object, Cloudflare will use the default HTML error page. If "mode" is "challenge", "managed_challenge", or "js_challenge", Cloudflare will use the zone challenge pages and you should not provide the "response" object.
+    """
+
+    body: str
+    """The response body to return.
+
+    The value must conform to the configured content type.
+    """
+
+    content_type: str
+    """The content type of the body.
+
+    Must be one of the following: `text/plain`, `text/xml`, or `application/json`.
+    """
+
+
+class Action(TypedDict, total=False):
+    """
+    The action to perform when the threshold of matched traffic within the configured period is exceeded.
+    """
+
+    mode: Literal["simulate", "ban", "challenge", "js_challenge", "managed_challenge"]
+    """The action to perform."""
+
+    response: ActionResponse
+    """A custom content type and reponse to return when the threshold is exceeded.
+
+    The custom response configured in this object will override the custom error for
+    the zone. This object is optional. Notes: If you omit this object, Cloudflare
+    will use the default HTML error page. If "mode" is "challenge",
+    "managed_challenge", or "js_challenge", Cloudflare will use the zone challenge
+    pages and you should not provide the "response" object.
+    """
+
+    timeout: float
+    """The time in seconds during which Cloudflare will perform the mitigation action.
+
+    Must be an integer value greater than or equal to the period. Notes: If "mode"
+    is "challenge", "managed_challenge", or "js_challenge", Cloudflare will use the
+    zone's Challenge Passage time and you should not provide this value.
+    """
+
+
+class MatchHeader(TypedDict, total=False):
+    name: str
+    """The name of the response header to match."""
+
+    op: Literal["eq", "ne"]
+    """The operator used when matching: `eq` means "equal" and `ne` means "not equal"."""
+
+    value: str
+    """The value of the response header, which must match exactly."""
+
+
+class MatchRequest(TypedDict, total=False):
+    methods: List[Literal["GET", "POST", "PUT", "DELETE", "PATCH", "HEAD", "_ALL_"]]
+    """The HTTP methods to match.
+
+    You can specify a subset (for example, `['POST','PUT']`) or all methods
+    (`['_ALL_']`). This field is optional when creating a rate limit.
+    """
+
+    schemes: SequenceNotStr[str]
+    """The HTTP schemes to match.
+
+    You can specify one scheme (`['HTTPS']`), both schemes (`['HTTP','HTTPS']`), or
+    all schemes (`['_ALL_']`). This field is optional.
+    """
+
+    url: str
+    """
+    The URL pattern to match, composed of a host and a path such as
+    `example.org/path*`. Normalization is applied before the pattern is matched. `*`
+    wildcards are expanded to match applicable traffic. Query strings are not
+    matched. Set the value to `*` to match all traffic to your zone.
+    """
+
+
+class MatchResponse(TypedDict, total=False):
+    origin_traffic: bool
+    """
+    When true, only the uncached traffic served from your origin servers will count
+    towards rate limiting. In this case, any cached traffic served by Cloudflare
+    will not count towards rate limiting. This field is optional. Notes: This field
+    is deprecated. Instead, use response headers and set "origin_traffic" to "false"
+    to avoid legacy behaviour interacting with the "response_headers" property.
+    """
+
+
+class Match(TypedDict, total=False):
+    """Determines which traffic the rate limit counts towards the threshold."""
+
+    headers: Iterable[MatchHeader]
+
+    request: MatchRequest
+
+    response: MatchResponse
diff --git a/src/cloudflare/types/rate_limits/rate_limit_create_response.py b/src/cloudflare/types/rate_limits/rate_limit_create_response.py
deleted file mode 100644
index f5db0f69aaa..00000000000
--- a/src/cloudflare/types/rate_limits/rate_limit_create_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["RateLimitCreateResponse"]
-
-RateLimitCreateResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/rate_limits/rate_limit_delete_response.py b/src/cloudflare/types/rate_limits/rate_limit_delete_response.py
index 779d2147231..8c0d69a61a6 100644
--- a/src/cloudflare/types/rate_limits/rate_limit_delete_response.py
+++ b/src/cloudflare/types/rate_limits/rate_limit_delete_response.py
@@ -1,12 +1,170 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import List, Optional
+from typing_extensions import Literal
 
 from ..._models import BaseModel
 
-__all__ = ["RateLimitDeleteResponse"]
+__all__ = [
+    "RateLimitDeleteResponse",
+    "Action",
+    "ActionResponse",
+    "Bypass",
+    "Match",
+    "MatchHeader",
+    "MatchRequest",
+    "MatchResponse",
+]
+
+
+class ActionResponse(BaseModel):
+    """A custom content type and reponse to return when the threshold is exceeded.
+
+    The custom response configured in this object will override the custom error for the zone. This object is optional.
+    Notes: If you omit this object, Cloudflare will use the default HTML error page. If "mode" is "challenge", "managed_challenge", or "js_challenge", Cloudflare will use the zone challenge pages and you should not provide the "response" object.
+    """
+
+    body: Optional[str] = None
+    """The response body to return.
+
+    The value must conform to the configured content type.
+    """
+
+    content_type: Optional[str] = None
+    """The content type of the body.
+
+    Must be one of the following: `text/plain`, `text/xml`, or `application/json`.
+    """
+
+
+class Action(BaseModel):
+    """
+    The action to perform when the threshold of matched traffic within the configured period is exceeded.
+    """
+
+    mode: Optional[Literal["simulate", "ban", "challenge", "js_challenge", "managed_challenge"]] = None
+    """The action to perform."""
+
+    response: Optional[ActionResponse] = None
+    """A custom content type and reponse to return when the threshold is exceeded.
+
+    The custom response configured in this object will override the custom error for
+    the zone. This object is optional. Notes: If you omit this object, Cloudflare
+    will use the default HTML error page. If "mode" is "challenge",
+    "managed_challenge", or "js_challenge", Cloudflare will use the zone challenge
+    pages and you should not provide the "response" object.
+    """
+
+    timeout: Optional[float] = None
+    """The time in seconds during which Cloudflare will perform the mitigation action.
+
+    Must be an integer value greater than or equal to the period. Notes: If "mode"
+    is "challenge", "managed_challenge", or "js_challenge", Cloudflare will use the
+    zone's Challenge Passage time and you should not provide this value.
+    """
+
+
+class Bypass(BaseModel):
+    name: Optional[Literal["url"]] = None
+
+    value: Optional[str] = None
+    """The URL to bypass."""
+
+
+class MatchHeader(BaseModel):
+    name: Optional[str] = None
+    """The name of the response header to match."""
+
+    op: Optional[Literal["eq", "ne"]] = None
+    """The operator used when matching: `eq` means "equal" and `ne` means "not equal"."""
+
+    value: Optional[str] = None
+    """The value of the response header, which must match exactly."""
+
+
+class MatchRequest(BaseModel):
+    methods: Optional[List[Literal["GET", "POST", "PUT", "DELETE", "PATCH", "HEAD", "_ALL_"]]] = None
+    """The HTTP methods to match.
+
+    You can specify a subset (for example, `['POST','PUT']`) or all methods
+    (`['_ALL_']`). This field is optional when creating a rate limit.
+    """
+
+    schemes: Optional[List[str]] = None
+    """The HTTP schemes to match.
+
+    You can specify one scheme (`['HTTPS']`), both schemes (`['HTTP','HTTPS']`), or
+    all schemes (`['_ALL_']`). This field is optional.
+    """
+
+    url: Optional[str] = None
+    """
+    The URL pattern to match, composed of a host and a path such as
+    `example.org/path*`. Normalization is applied before the pattern is matched. `*`
+    wildcards are expanded to match applicable traffic. Query strings are not
+    matched. Set the value to `*` to match all traffic to your zone.
+    """
+
+
+class MatchResponse(BaseModel):
+    origin_traffic: Optional[bool] = None
+    """
+    When true, only the uncached traffic served from your origin servers will count
+    towards rate limiting. In this case, any cached traffic served by Cloudflare
+    will not count towards rate limiting. This field is optional. Notes: This field
+    is deprecated. Instead, use response headers and set "origin_traffic" to "false"
+    to avoid legacy behaviour interacting with the "response_headers" property.
+    """
+
+
+class Match(BaseModel):
+    """Determines which traffic the rate limit counts towards the threshold."""
+
+    headers: Optional[List[MatchHeader]] = None
+
+    request: Optional[MatchRequest] = None
+
+    response: Optional[MatchResponse] = None
 
 
 class RateLimitDeleteResponse(BaseModel):
     id: Optional[str] = None
     """The unique identifier of the rate limit."""
+
+    action: Optional[Action] = None
+    """
+    The action to perform when the threshold of matched traffic within the
+    configured period is exceeded.
+    """
+
+    bypass: Optional[List[Bypass]] = None
+    """Criteria specifying when the current rate limit should be bypassed.
+
+    You can specify that the rate limit should not apply to one or more URLs.
+    """
+
+    description: Optional[str] = None
+    """An informative summary of the rule.
+
+    This value is sanitized and any tags will be removed.
+    """
+
+    disabled: Optional[bool] = None
+    """When true, indicates that the rate limit is currently disabled."""
+
+    match: Optional[Match] = None
+    """Determines which traffic the rate limit counts towards the threshold."""
+
+    period: Optional[float] = None
+    """The time in seconds (an integer value) to count matching traffic.
+
+    If the count exceeds the configured threshold within this period, Cloudflare
+    will perform the configured action.
+    """
+
+    threshold: Optional[float] = None
+    """The threshold that will trigger the configured mitigation action.
+
+    Configure this value along with the `period` property to establish a threshold
+    per period.
+    """
diff --git a/src/cloudflare/types/rate_limits/rate_limit_edit_params.py b/src/cloudflare/types/rate_limits/rate_limit_edit_params.py
index 207781741f7..e91233331b1 100644
--- a/src/cloudflare/types/rate_limits/rate_limit_edit_params.py
+++ b/src/cloudflare/types/rate_limits/rate_limit_edit_params.py
@@ -2,13 +2,140 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import List, Iterable
+from typing_extensions import Literal, Required, TypedDict
 
-__all__ = ["RateLimitEditParams"]
+from ..._types import SequenceNotStr
+
+__all__ = ["RateLimitEditParams", "Action", "ActionResponse", "Match", "MatchHeader", "MatchRequest", "MatchResponse"]
 
 
 class RateLimitEditParams(TypedDict, total=False):
-    zone_identifier: Required[str]
-    """Identifier"""
+    zone_id: Required[str]
+    """Defines an identifier."""
+
+    action: Required[Action]
+    """
+    The action to perform when the threshold of matched traffic within the
+    configured period is exceeded.
+    """
+
+    match: Required[Match]
+    """Determines which traffic the rate limit counts towards the threshold."""
+
+    period: Required[float]
+    """The time in seconds (an integer value) to count matching traffic.
+
+    If the count exceeds the configured threshold within this period, Cloudflare
+    will perform the configured action.
+    """
+
+    threshold: Required[float]
+    """The threshold that will trigger the configured mitigation action.
+
+    Configure this value along with the `period` property to establish a threshold
+    per period.
+    """
+
+
+class ActionResponse(TypedDict, total=False):
+    """A custom content type and reponse to return when the threshold is exceeded.
+
+    The custom response configured in this object will override the custom error for the zone. This object is optional.
+    Notes: If you omit this object, Cloudflare will use the default HTML error page. If "mode" is "challenge", "managed_challenge", or "js_challenge", Cloudflare will use the zone challenge pages and you should not provide the "response" object.
+    """
+
+    body: str
+    """The response body to return.
+
+    The value must conform to the configured content type.
+    """
+
+    content_type: str
+    """The content type of the body.
+
+    Must be one of the following: `text/plain`, `text/xml`, or `application/json`.
+    """
+
+
+class Action(TypedDict, total=False):
+    """
+    The action to perform when the threshold of matched traffic within the configured period is exceeded.
+    """
+
+    mode: Literal["simulate", "ban", "challenge", "js_challenge", "managed_challenge"]
+    """The action to perform."""
+
+    response: ActionResponse
+    """A custom content type and reponse to return when the threshold is exceeded.
+
+    The custom response configured in this object will override the custom error for
+    the zone. This object is optional. Notes: If you omit this object, Cloudflare
+    will use the default HTML error page. If "mode" is "challenge",
+    "managed_challenge", or "js_challenge", Cloudflare will use the zone challenge
+    pages and you should not provide the "response" object.
+    """
+
+    timeout: float
+    """The time in seconds during which Cloudflare will perform the mitigation action.
+
+    Must be an integer value greater than or equal to the period. Notes: If "mode"
+    is "challenge", "managed_challenge", or "js_challenge", Cloudflare will use the
+    zone's Challenge Passage time and you should not provide this value.
+    """
+
+
+class MatchHeader(TypedDict, total=False):
+    name: str
+    """The name of the response header to match."""
+
+    op: Literal["eq", "ne"]
+    """The operator used when matching: `eq` means "equal" and `ne` means "not equal"."""
+
+    value: str
+    """The value of the response header, which must match exactly."""
+
+
+class MatchRequest(TypedDict, total=False):
+    methods: List[Literal["GET", "POST", "PUT", "DELETE", "PATCH", "HEAD", "_ALL_"]]
+    """The HTTP methods to match.
+
+    You can specify a subset (for example, `['POST','PUT']`) or all methods
+    (`['_ALL_']`). This field is optional when creating a rate limit.
+    """
+
+    schemes: SequenceNotStr[str]
+    """The HTTP schemes to match.
+
+    You can specify one scheme (`['HTTPS']`), both schemes (`['HTTP','HTTPS']`), or
+    all schemes (`['_ALL_']`). This field is optional.
+    """
+
+    url: str
+    """
+    The URL pattern to match, composed of a host and a path such as
+    `example.org/path*`. Normalization is applied before the pattern is matched. `*`
+    wildcards are expanded to match applicable traffic. Query strings are not
+    matched. Set the value to `*` to match all traffic to your zone.
+    """
+
+
+class MatchResponse(TypedDict, total=False):
+    origin_traffic: bool
+    """
+    When true, only the uncached traffic served from your origin servers will count
+    towards rate limiting. In this case, any cached traffic served by Cloudflare
+    will not count towards rate limiting. This field is optional. Notes: This field
+    is deprecated. Instead, use response headers and set "origin_traffic" to "false"
+    to avoid legacy behaviour interacting with the "response_headers" property.
+    """
+
+
+class Match(TypedDict, total=False):
+    """Determines which traffic the rate limit counts towards the threshold."""
+
+    headers: Iterable[MatchHeader]
+
+    request: MatchRequest
 
-    body: Required[object]
+    response: MatchResponse
diff --git a/src/cloudflare/types/rate_limits/rate_limit_edit_response.py b/src/cloudflare/types/rate_limits/rate_limit_edit_response.py
deleted file mode 100644
index 0ab401c3f13..00000000000
--- a/src/cloudflare/types/rate_limits/rate_limit_edit_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["RateLimitEditResponse"]
-
-RateLimitEditResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/rate_limits/rate_limit_get_response.py b/src/cloudflare/types/rate_limits/rate_limit_get_response.py
deleted file mode 100644
index ea395191218..00000000000
--- a/src/cloudflare/types/rate_limits/rate_limit_get_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["RateLimitGetResponse"]
-
-RateLimitGetResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/rate_limits/rate_limit_list_params.py b/src/cloudflare/types/rate_limits/rate_limit_list_params.py
index de7ce430a3f..b4de31ed657 100644
--- a/src/cloudflare/types/rate_limits/rate_limit_list_params.py
+++ b/src/cloudflare/types/rate_limits/rate_limit_list_params.py
@@ -2,17 +2,20 @@
 
 from __future__ import annotations
 
-from typing_extensions import TypedDict
+from typing_extensions import Required, TypedDict
 
 __all__ = ["RateLimitListParams"]
 
 
 class RateLimitListParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Defines an identifier."""
+
     page: float
-    """The page number of paginated results."""
+    """Defines the page number of paginated results."""
 
     per_page: float
-    """The maximum number of results per page.
+    """Defines the maximum number of results per page.
 
     You can only set the value to `1` or to a multiple of 5 such as `5`, `10`, `15`,
     or `20`.
diff --git a/src/cloudflare/types/rate_plans/__init__.py b/src/cloudflare/types/rate_plans/__init__.py
deleted file mode 100644
index f491d32afb3..00000000000
--- a/src/cloudflare/types/rate_plans/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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_get_response import RatePlanGetResponse as RatePlanGetResponse
diff --git a/src/cloudflare/types/rate_plans/rate_plan.py b/src/cloudflare/types/rate_plans/rate_plan.py
deleted file mode 100644
index b903fed0ff6..00000000000
--- a/src/cloudflare/types/rate_plans/rate_plan.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = ["RatePlan", "Component"]
-
-
-class Component(BaseModel):
-    default: Optional[float] = None
-    """The default amount allocated."""
-
-    name: Optional[Literal["zones", "page_rules", "dedicated_certificates", "dedicated_certificates_custom"]] = None
-    """The unique component."""
-
-    unit_price: Optional[float] = None
-    """The unit price of the addon."""
-
-
-class RatePlan(BaseModel):
-    id: Optional[str] = None
-    """Plan identifier tag."""
-
-    components: Optional[List[Component]] = None
-    """Array of available components values for the plan."""
-
-    currency: Optional[str] = None
-    """The monetary unit in which pricing information is displayed."""
-
-    duration: Optional[float] = None
-    """The duration of the plan subscription."""
-
-    frequency: Optional[Literal["weekly", "monthly", "quarterly", "yearly"]] = None
-    """The frequency at which you will be billed for this plan."""
-
-    name: Optional[str] = None
-    """The plan name."""
diff --git a/src/cloudflare/types/rate_plans/rate_plan_get_response.py b/src/cloudflare/types/rate_plans/rate_plan_get_response.py
deleted file mode 100644
index 727b482778e..00000000000
--- a/src/cloudflare/types/rate_plans/rate_plan_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .rate_plan import RatePlan
-
-__all__ = ["RatePlanGetResponse"]
-
-RatePlanGetResponse = List[RatePlan]
diff --git a/src/cloudflare/types/realtime_kit/__init__.py b/src/cloudflare/types/realtime_kit/__init__.py
new file mode 100644
index 00000000000..fd473f2c343
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/__init__.py
@@ -0,0 +1,161 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .app_post_params import AppPostParams as AppPostParams
+from .app_get_response import AppGetResponse as AppGetResponse
+from .app_post_response import AppPostResponse as AppPostResponse
+from .preset_get_params import PresetGetParams as PresetGetParams
+from .meeting_get_params import MeetingGetParams as MeetingGetParams
+from .preset_get_response import PresetGetResponse as PresetGetResponse
+from .meeting_get_response import MeetingGetResponse as MeetingGetResponse
+from .preset_create_params import PresetCreateParams as PresetCreateParams
+from .preset_update_params import PresetUpdateParams as PresetUpdateParams
+from .meeting_create_params import MeetingCreateParams as MeetingCreateParams
+from .preset_create_response import PresetCreateResponse as PresetCreateResponse
+from .preset_delete_response import PresetDeleteResponse as PresetDeleteResponse
+from .preset_update_response import PresetUpdateResponse as PresetUpdateResponse
+from .meeting_create_response import MeetingCreateResponse as MeetingCreateResponse
+from .session_get_sessions_params import SessionGetSessionsParams as SessionGetSessionsParams
+from .webhook_edit_webhook_params import WebhookEditWebhookParams as WebhookEditWebhookParams
+from .session_get_sessions_response import SessionGetSessionsResponse as SessionGetSessionsResponse
+from .webhook_create_webhook_params import WebhookCreateWebhookParams as WebhookCreateWebhookParams
+from .webhook_edit_webhook_response import WebhookEditWebhookResponse as WebhookEditWebhookResponse
+from .webhook_get_webhooks_response import WebhookGetWebhooksResponse as WebhookGetWebhooksResponse
+from .meeting_add_participant_params import MeetingAddParticipantParams as MeetingAddParticipantParams
+from .webhook_replace_webhook_params import WebhookReplaceWebhookParams as WebhookReplaceWebhookParams
+from .meeting_edit_participant_params import MeetingEditParticipantParams as MeetingEditParticipantParams
+from .recording_get_recordings_params import RecordingGetRecordingsParams as RecordingGetRecordingsParams
+from .webhook_create_webhook_response import WebhookCreateWebhookResponse as WebhookCreateWebhookResponse
+from .webhook_delete_webhook_response import WebhookDeleteWebhookResponse as WebhookDeleteWebhookResponse
+from .meeting_add_participant_response import MeetingAddParticipantResponse as MeetingAddParticipantResponse
+from .meeting_get_meeting_by_id_params import MeetingGetMeetingByIDParams as MeetingGetMeetingByIDParams
+from .preset_get_preset_by_id_response import PresetGetPresetByIDResponse as PresetGetPresetByIDResponse
+from .webhook_replace_webhook_response import WebhookReplaceWebhookResponse as WebhookReplaceWebhookResponse
+from .active_session_create_poll_params import ActiveSessionCreatePollParams as ActiveSessionCreatePollParams
+from .meeting_edit_participant_response import MeetingEditParticipantResponse as MeetingEditParticipantResponse
+from .recording_get_recordings_response import RecordingGetRecordingsResponse as RecordingGetRecordingsResponse
+from .recording_start_recordings_params import RecordingStartRecordingsParams as RecordingStartRecordingsParams
+from .session_get_session_chat_response import SessionGetSessionChatResponse as SessionGetSessionChatResponse
+from .analytics_get_org_analytics_params import AnalyticsGetOrgAnalyticsParams as AnalyticsGetOrgAnalyticsParams
+from .meeting_get_meeting_by_id_response import MeetingGetMeetingByIDResponse as MeetingGetMeetingByIDResponse
+from .session_get_session_details_params import SessionGetSessionDetailsParams as SessionGetSessionDetailsParams
+from .webhook_get_webhook_by_id_response import WebhookGetWebhookByIDResponse as WebhookGetWebhookByIDResponse
+from .active_session_create_poll_response import ActiveSessionCreatePollResponse as ActiveSessionCreatePollResponse
+from .livestream_get_org_analytics_params import LivestreamGetOrgAnalyticsParams as LivestreamGetOrgAnalyticsParams
+from .meeting_update_meeting_by_id_params import MeetingUpdateMeetingByIDParams as MeetingUpdateMeetingByIDParams
+from .recording_start_recordings_response import RecordingStartRecordingsResponse as RecordingStartRecordingsResponse
+from .analytics_get_org_analytics_response import AnalyticsGetOrgAnalyticsResponse as AnalyticsGetOrgAnalyticsResponse
+from .meeting_replace_meeting_by_id_params import MeetingReplaceMeetingByIDParams as MeetingReplaceMeetingByIDParams
+from .recording_get_one_recording_response import RecordingGetOneRecordingResponse as RecordingGetOneRecordingResponse
+from .session_get_session_details_response import SessionGetSessionDetailsResponse as SessionGetSessionDetailsResponse
+from .session_get_session_summary_response import SessionGetSessionSummaryResponse as SessionGetSessionSummaryResponse
+from .livestream_get_all_livestreams_params import (
+    LivestreamGetAllLivestreamsParams as LivestreamGetAllLivestreamsParams,
+)
+from .livestream_get_org_analytics_response import (
+    LivestreamGetOrgAnalyticsResponse as LivestreamGetOrgAnalyticsResponse,
+)
+from .meeting_update_meeting_by_id_response import MeetingUpdateMeetingByIDResponse as MeetingUpdateMeetingByIDResponse
+from .meeting_replace_meeting_by_id_response import (
+    MeetingReplaceMeetingByIDResponse as MeetingReplaceMeetingByIDResponse,
+)
+from .recording_start_track_recording_params import (
+    RecordingStartTrackRecordingParams as RecordingStartTrackRecordingParams,
+)
+from .active_session_kick_participants_params import (
+    ActiveSessionKickParticipantsParams as ActiveSessionKickParticipantsParams,
+)
+from .livestream_get_all_livestreams_response import (
+    LivestreamGetAllLivestreamsResponse as LivestreamGetAllLivestreamsResponse,
+)
+from .meeting_get_meeting_participants_params import (
+    MeetingGetMeetingParticipantsParams as MeetingGetMeetingParticipantsParams,
+)
+from .session_get_session_participants_params import (
+    SessionGetSessionParticipantsParams as SessionGetSessionParticipantsParams,
+)
+from .meeting_get_meeting_participant_response import (
+    MeetingGetMeetingParticipantResponse as MeetingGetMeetingParticipantResponse,
+)
+from .recording_get_active_recordings_response import (
+    RecordingGetActiveRecordingsResponse as RecordingGetActiveRecordingsResponse,
+)
+from .session_get_session_transcripts_response import (
+    SessionGetSessionTranscriptsResponse as SessionGetSessionTranscriptsResponse,
+)
+from .active_session_kick_participants_response import (
+    ActiveSessionKickParticipantsResponse as ActiveSessionKickParticipantsResponse,
+)
+from .meeting_get_meeting_participants_response import (
+    MeetingGetMeetingParticipantsResponse as MeetingGetMeetingParticipantsResponse,
+)
+from .session_get_session_participants_response import (
+    SessionGetSessionParticipantsResponse as SessionGetSessionParticipantsResponse,
+)
+from .active_session_get_active_session_response import (
+    ActiveSessionGetActiveSessionResponse as ActiveSessionGetActiveSessionResponse,
+)
+from .meeting_refresh_participant_token_response import (
+    MeetingRefreshParticipantTokenResponse as MeetingRefreshParticipantTokenResponse,
+)
+from .meeting_delete_meeting_participant_response import (
+    MeetingDeleteMeetingParticipantResponse as MeetingDeleteMeetingParticipantResponse,
+)
+from .recording_pause_resume_stop_recording_params import (
+    RecordingPauseResumeStopRecordingParams as RecordingPauseResumeStopRecordingParams,
+)
+from .active_session_kick_all_participants_response import (
+    ActiveSessionKickAllParticipantsResponse as ActiveSessionKickAllParticipantsResponse,
+)
+from .recording_pause_resume_stop_recording_response import (
+    RecordingPauseResumeStopRecordingResponse as RecordingPauseResumeStopRecordingResponse,
+)
+from .session_get_session_participant_details_params import (
+    SessionGetSessionParticipantDetailsParams as SessionGetSessionParticipantDetailsParams,
+)
+from .livestream_create_independent_livestream_params import (
+    LivestreamCreateIndependentLivestreamParams as LivestreamCreateIndependentLivestreamParams,
+)
+from .livestream_start_livestreaming_a_meeting_params import (
+    LivestreamStartLivestreamingAMeetingParams as LivestreamStartLivestreamingAMeetingParams,
+)
+from .livestream_stop_livestreaming_a_meeting_response import (
+    LivestreamStopLivestreamingAMeetingResponse as LivestreamStopLivestreamingAMeetingResponse,
+)
+from .session_get_participant_data_from_peer_id_params import (
+    SessionGetParticipantDataFromPeerIDParams as SessionGetParticipantDataFromPeerIDParams,
+)
+from .session_get_session_participant_details_response import (
+    SessionGetSessionParticipantDetailsResponse as SessionGetSessionParticipantDetailsResponse,
+)
+from .livestream_create_independent_livestream_response import (
+    LivestreamCreateIndependentLivestreamResponse as LivestreamCreateIndependentLivestreamResponse,
+)
+from .livestream_start_livestreaming_a_meeting_response import (
+    LivestreamStartLivestreamingAMeetingResponse as LivestreamStartLivestreamingAMeetingResponse,
+)
+from .livestream_get_meeting_active_livestreams_response import (
+    LivestreamGetMeetingActiveLivestreamsResponse as LivestreamGetMeetingActiveLivestreamsResponse,
+)
+from .session_get_participant_data_from_peer_id_response import (
+    SessionGetParticipantDataFromPeerIDResponse as SessionGetParticipantDataFromPeerIDResponse,
+)
+from .livestream_get_livestream_analytics_complete_params import (
+    LivestreamGetLivestreamAnalyticsCompleteParams as LivestreamGetLivestreamAnalyticsCompleteParams,
+)
+from .livestream_get_livestream_analytics_complete_response import (
+    LivestreamGetLivestreamAnalyticsCompleteResponse as LivestreamGetLivestreamAnalyticsCompleteResponse,
+)
+from .livestream_get_livestream_session_for_livestream_id_params import (
+    LivestreamGetLivestreamSessionForLivestreamIDParams as LivestreamGetLivestreamSessionForLivestreamIDParams,
+)
+from .livestream_get_active_livestreams_for_livestream_id_response import (
+    LivestreamGetActiveLivestreamsForLivestreamIDResponse as LivestreamGetActiveLivestreamsForLivestreamIDResponse,
+)
+from .livestream_get_livestream_session_for_livestream_id_response import (
+    LivestreamGetLivestreamSessionForLivestreamIDResponse as LivestreamGetLivestreamSessionForLivestreamIDResponse,
+)
+from .livestream_get_livestream_session_details_for_session_id_response import (
+    LivestreamGetLivestreamSessionDetailsForSessionIDResponse as LivestreamGetLivestreamSessionDetailsForSessionIDResponse,
+)
diff --git a/src/cloudflare/types/realtime_kit/active_session_create_poll_params.py b/src/cloudflare/types/realtime_kit/active_session_create_poll_params.py
new file mode 100644
index 00000000000..45cdf76f14e
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/active_session_create_poll_params.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["ActiveSessionCreatePollParams"]
+
+
+class ActiveSessionCreatePollParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    app_id: Required[str]
+    """The app identifier tag."""
+
+    options: Required[SequenceNotStr[str]]
+    """Different options for the question"""
+
+    question: Required[str]
+    """Question of the poll"""
+
+    anonymous: bool
+    """if voters on a poll are anonymous"""
+
+    hide_votes: bool
+    """if votes on an option are visible before a person votes"""
diff --git a/src/cloudflare/types/realtime_kit/active_session_create_poll_response.py b/src/cloudflare/types/realtime_kit/active_session_create_poll_response.py
new file mode 100644
index 00000000000..ea3d0714bf1
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/active_session_create_poll_response.py
@@ -0,0 +1,53 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["ActiveSessionCreatePollResponse", "Data", "DataPoll", "DataPollOption", "DataPollOptionVote"]
+
+
+class DataPollOptionVote(BaseModel):
+    id: str
+
+    name: str
+
+
+class DataPollOption(BaseModel):
+    count: float
+
+    text: str
+    """Text of the answer option"""
+
+    votes: List[DataPollOptionVote]
+
+
+class DataPoll(BaseModel):
+    id: str
+    """ID of the poll"""
+
+    options: List[DataPollOption]
+    """Answer options"""
+
+    question: str
+    """Question asked by the poll"""
+
+    anonymous: Optional[bool] = None
+
+    created_by: Optional[str] = None
+
+    hide_votes: Optional[bool] = None
+
+    voted: Optional[List[str]] = None
+
+
+class Data(BaseModel):
+    action: Optional[str] = None
+
+    poll: Optional[DataPoll] = None
+
+
+class ActiveSessionCreatePollResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/active_session_get_active_session_response.py b/src/cloudflare/types/realtime_kit/active_session_get_active_session_response.py
new file mode 100644
index 00000000000..a47228f1e2a
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/active_session_get_active_session_response.py
@@ -0,0 +1,64 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["ActiveSessionGetActiveSessionResponse", "Data"]
+
+
+class Data(BaseModel):
+    id: str
+    """ID of the session"""
+
+    associated_id: str
+    """ID of the meeting this session is associated with.
+
+    In the case of V2 meetings, it is always a UUID. In V1 meetings, it is a room
+    name of the form `abcdef-ghijkl`
+    """
+
+    created_at: str
+    """timestamp when session created"""
+
+    live_participants: float
+    """number of participants currently in the session"""
+
+    max_concurrent_participants: float
+    """number of maximum participants that were in the session"""
+
+    meeting_display_name: str
+    """Title of the meeting this session belongs to"""
+
+    minutes_consumed: float
+    """number of minutes consumed since the session started"""
+
+    organization_id: str
+    """App id that hosted this session"""
+
+    started_at: str
+    """timestamp when session started"""
+
+    status: Literal["LIVE", "ENDED"]
+    """current status of session"""
+
+    type: Literal["meeting", "livestream", "participant"]
+    """type of session"""
+
+    updated_at: str
+    """timestamp when session was last updated"""
+
+    breakout_rooms: Optional[List[object]] = None
+
+    ended_at: Optional[str] = None
+    """timestamp when session ended"""
+
+    meta: Optional[object] = None
+    """Any meta data about session."""
+
+
+class ActiveSessionGetActiveSessionResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/active_session_kick_all_participants_response.py b/src/cloudflare/types/realtime_kit/active_session_kick_all_participants_response.py
new file mode 100644
index 00000000000..abad897209c
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/active_session_kick_all_participants_response.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["ActiveSessionKickAllParticipantsResponse", "Data"]
+
+
+class Data(BaseModel):
+    action: Optional[str] = None
+
+    kicked_participants_count: Optional[float] = None
+
+
+class ActiveSessionKickAllParticipantsResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/active_session_kick_participants_params.py b/src/cloudflare/types/realtime_kit/active_session_kick_participants_params.py
new file mode 100644
index 00000000000..afd4df8c824
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/active_session_kick_participants_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["ActiveSessionKickParticipantsParams"]
+
+
+class ActiveSessionKickParticipantsParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    app_id: Required[str]
+    """The app identifier tag."""
+
+    custom_participant_ids: Required[SequenceNotStr[str]]
+
+    participant_ids: Required[SequenceNotStr[str]]
diff --git a/src/cloudflare/types/realtime_kit/active_session_kick_participants_response.py b/src/cloudflare/types/realtime_kit/active_session_kick_participants_response.py
new file mode 100644
index 00000000000..c9254798fe7
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/active_session_kick_participants_response.py
@@ -0,0 +1,37 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["ActiveSessionKickParticipantsResponse", "Data", "DataParticipant"]
+
+
+class DataParticipant(BaseModel):
+    id: str
+    """ID of the session participant"""
+
+    created_at: str
+
+    updated_at: str
+
+    email: Optional[str] = None
+    """Email of the session participant."""
+
+    name: Optional[str] = None
+    """Name of the session participant."""
+
+    picture: Optional[str] = None
+    """A URL pointing to a picture of the participant."""
+
+
+class Data(BaseModel):
+    action: Optional[str] = None
+
+    participants: Optional[List[DataParticipant]] = None
+
+
+class ActiveSessionKickParticipantsResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/analytics_get_org_analytics_params.py b/src/cloudflare/types/realtime_kit/analytics_get_org_analytics_params.py
new file mode 100644
index 00000000000..208d478907d
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/analytics_get_org_analytics_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["AnalyticsGetOrgAnalyticsParams"]
+
+
+class AnalyticsGetOrgAnalyticsParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    end_date: str
+    """end date in YYYY-MM-DD format"""
+
+    start_date: str
+    """start date in YYYY-MM-DD format"""
diff --git a/src/cloudflare/types/realtime_kit/analytics_get_org_analytics_response.py b/src/cloudflare/types/realtime_kit/analytics_get_org_analytics_response.py
new file mode 100644
index 00000000000..d2ae8ec0e5d
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/analytics_get_org_analytics_response.py
@@ -0,0 +1,74 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = [
+    "AnalyticsGetOrgAnalyticsResponse",
+    "Data",
+    "DataRecordingStats",
+    "DataRecordingStatsDayStat",
+    "DataSessionStats",
+    "DataSessionStatsDayStat",
+]
+
+
+class DataRecordingStatsDayStat(BaseModel):
+    day: Optional[str] = None
+
+    total_recording_minutes: Optional[int] = None
+    """Total recording minutes for a specific day"""
+
+    total_recordings: Optional[int] = None
+    """Total number of recordings for a specific day"""
+
+
+class DataRecordingStats(BaseModel):
+    """Recording statistics of an App during the range specified"""
+
+    day_stats: Optional[List[DataRecordingStatsDayStat]] = None
+    """Day wise recording stats"""
+
+    recording_count: Optional[int] = None
+    """Total number of recordings during the range specified"""
+
+    recording_minutes_consumed: Optional[float] = None
+    """Total recording minutes during the range specified"""
+
+
+class DataSessionStatsDayStat(BaseModel):
+    day: Optional[str] = None
+
+    total_session_minutes: Optional[float] = None
+    """Total session minutes for a specific day"""
+
+    total_sessions: Optional[int] = None
+    """Total number of sessions for a specific day"""
+
+
+class DataSessionStats(BaseModel):
+    """Session statistics of an App during the range specified"""
+
+    day_stats: Optional[List[DataSessionStatsDayStat]] = None
+    """Day wise session stats"""
+
+    sessions_count: Optional[int] = None
+    """Total number of sessions during the range specified"""
+
+    sessions_minutes_consumed: Optional[float] = None
+    """Total session minutes during the range specified"""
+
+
+class Data(BaseModel):
+    recording_stats: Optional[DataRecordingStats] = None
+    """Recording statistics of an App during the range specified"""
+
+    session_stats: Optional[DataSessionStats] = None
+    """Session statistics of an App during the range specified"""
+
+
+class AnalyticsGetOrgAnalyticsResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/app_get_response.py b/src/cloudflare/types/realtime_kit/app_get_response.py
new file mode 100644
index 00000000000..878f990f8de
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/app_get_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["AppGetResponse", "Data"]
+
+
+class Data(BaseModel):
+    id: Optional[str] = None
+
+    created_at: Optional[str] = None
+
+    name: Optional[str] = None
+
+
+class AppGetResponse(BaseModel):
+    data: Optional[List[Data]] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/app_post_params.py b/src/cloudflare/types/realtime_kit/app_post_params.py
new file mode 100644
index 00000000000..1bb8921ab6e
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/app_post_params.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["AppPostParams"]
+
+
+class AppPostParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    name: Required[str]
diff --git a/src/cloudflare/types/realtime_kit/app_post_response.py b/src/cloudflare/types/realtime_kit/app_post_response.py
new file mode 100644
index 00000000000..134ed6e93ba
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/app_post_response.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["AppPostResponse", "Data", "DataApp"]
+
+
+class DataApp(BaseModel):
+    id: Optional[str] = None
+
+    created_at: Optional[str] = None
+
+    name: Optional[str] = None
+
+
+class Data(BaseModel):
+    app: Optional[DataApp] = None
+
+
+class AppPostResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/livestream_create_independent_livestream_params.py b/src/cloudflare/types/realtime_kit/livestream_create_independent_livestream_params.py
new file mode 100644
index 00000000000..8991dc929c3
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/livestream_create_independent_livestream_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Required, TypedDict
+
+__all__ = ["LivestreamCreateIndependentLivestreamParams"]
+
+
+class LivestreamCreateIndependentLivestreamParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    name: Optional[str]
+    """Name of the livestream"""
diff --git a/src/cloudflare/types/realtime_kit/livestream_create_independent_livestream_response.py b/src/cloudflare/types/realtime_kit/livestream_create_independent_livestream_response.py
new file mode 100644
index 00000000000..b1294abbb54
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/livestream_create_independent_livestream_response.py
@@ -0,0 +1,37 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["LivestreamCreateIndependentLivestreamResponse", "Data"]
+
+
+class Data(BaseModel):
+    id: Optional[str] = None
+    """The livestream ID."""
+
+    disabled: Optional[bool] = None
+    """Specifies if the livestream was disabled."""
+
+    ingest_server: Optional[str] = None
+    """The server URL to which the RTMP encoder should send the video and audio data."""
+
+    meeting_id: Optional[str] = None
+
+    name: Optional[str] = None
+
+    playback_url: Optional[str] = None
+    """The web address that viewers can use to watch the livestream."""
+
+    status: Optional[Literal["LIVE", "IDLE", "ERRORED", "INVOKED"]] = None
+
+    stream_key: Optional[str] = None
+    """Unique key for accessing each livestream."""
+
+
+class LivestreamCreateIndependentLivestreamResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/livestream_get_active_livestreams_for_livestream_id_response.py b/src/cloudflare/types/realtime_kit/livestream_get_active_livestreams_for_livestream_id_response.py
new file mode 100644
index 00000000000..facb7c18daf
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/livestream_get_active_livestreams_for_livestream_id_response.py
@@ -0,0 +1,80 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["LivestreamGetActiveLivestreamsForLivestreamIDResponse", "Data", "DataLivestream", "DataSession"]
+
+
+class DataLivestream(BaseModel):
+    id: Optional[str] = None
+
+    created_at: Optional[datetime] = None
+    """Timestamp the object was created at. The time is returned in ISO format."""
+
+    disabled: Optional[str] = None
+    """Specifies if the livestream was disabled."""
+
+    ingest_server: Optional[str] = None
+    """The server URL to which the RTMP encoder sends the video and audio data."""
+
+    meeting_id: Optional[str] = None
+    """ID of the meeting."""
+
+    name: Optional[str] = None
+    """Name of the livestream."""
+
+    playback_url: Optional[str] = None
+    """The web address that viewers can use to watch the livestream."""
+
+    status: Optional[Literal["LIVE", "IDLE", "ERRORED", "INVOKED"]] = None
+
+    stream_key: Optional[str] = None
+    """Unique key for accessing each livestream."""
+
+    updated_at: Optional[datetime] = None
+    """Timestamp the object was updated at. The time is returned in ISO format."""
+
+
+class DataSession(BaseModel):
+    id: Optional[str] = None
+
+    created_at: Optional[datetime] = None
+    """Timestamp the object was created at. The time is returned in ISO format."""
+
+    err_message: Optional[str] = None
+
+    ingest_seconds: Optional[str] = None
+    """The time duration for which the input was given or the meeting was streamed."""
+
+    invoked_time: Optional[datetime] = None
+    """Timestamp the object was invoked. The time is returned in ISO format."""
+
+    livestream_id: Optional[str] = None
+
+    started_time: Optional[datetime] = None
+    """Timestamp the object was started. The time is returned in ISO format."""
+
+    stopped_time: Optional[datetime] = None
+    """Timestamp the object was stopped. The time is returned in ISO format."""
+
+    updated_at: Optional[datetime] = None
+    """Timestamp the object was updated at. The time is returned in ISO format."""
+
+    viewer_seconds: Optional[str] = None
+    """The total view time for which the viewers watched the stream."""
+
+
+class Data(BaseModel):
+    livestream: Optional[DataLivestream] = None
+
+    session: Optional[DataSession] = None
+
+
+class LivestreamGetActiveLivestreamsForLivestreamIDResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/livestream_get_all_livestreams_params.py b/src/cloudflare/types/realtime_kit/livestream_get_all_livestreams_params.py
new file mode 100644
index 00000000000..a72b62a0fb2
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/livestream_get_all_livestreams_params.py
@@ -0,0 +1,37 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["LivestreamGetAllLivestreamsParams"]
+
+
+class LivestreamGetAllLivestreamsParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    end_time: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """Specify the end time range in ISO format to access the live stream."""
+
+    exclude_meetings: bool
+    """Exclude the RealtimeKit meetings that are livestreamed."""
+
+    page_no: int
+    """The page number from which you want your page search results to be displayed."""
+
+    per_page: int
+    """Number of results per page."""
+
+    sort_order: Literal["ASC", "DSC"]
+    """Specifies the sorting order for the results."""
+
+    start_time: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """Specify the start time range in ISO format to access the live stream."""
+
+    status: Literal["LIVE", "IDLE", "ERRORED", "INVOKED"]
+    """Specifies the status of the operation."""
diff --git a/src/cloudflare/types/realtime_kit/livestream_get_all_livestreams_response.py b/src/cloudflare/types/realtime_kit/livestream_get_all_livestreams_response.py
new file mode 100644
index 00000000000..0ad5351d655
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/livestream_get_all_livestreams_response.py
@@ -0,0 +1,56 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["LivestreamGetAllLivestreamsResponse", "Data", "DataPaging"]
+
+
+class DataPaging(BaseModel):
+    end_offset: Optional[int] = None
+
+    start_offset: Optional[int] = None
+
+    total_count: Optional[int] = None
+
+
+class Data(BaseModel):
+    id: Optional[str] = None
+    """The ID of the livestream."""
+
+    created_at: Optional[datetime] = None
+    """Timestamp the object was created at. The time is returned in ISO format."""
+
+    disabled: Optional[str] = None
+    """Specifies if the livestream was disabled."""
+
+    ingest_server: Optional[str] = None
+    """The server URL to which the RTMP encoder sends the video and audio data."""
+
+    meeting_id: Optional[str] = None
+    """ID of the meeting."""
+
+    name: Optional[str] = None
+    """Name of the livestream."""
+
+    paging: Optional[DataPaging] = None
+
+    playback_url: Optional[str] = None
+    """The web address that viewers can use to watch the livestream."""
+
+    status: Optional[Literal["LIVE", "IDLE", "ERRORED", "INVOKED"]] = None
+
+    stream_key: Optional[str] = None
+    """Unique key for accessing each livestream."""
+
+    updated_at: Optional[datetime] = None
+    """Timestamp the object was updated at. The time is returned in ISO format."""
+
+
+class LivestreamGetAllLivestreamsResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/livestream_get_livestream_analytics_complete_params.py b/src/cloudflare/types/realtime_kit/livestream_get_livestream_analytics_complete_params.py
new file mode 100644
index 00000000000..132726bf720
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/livestream_get_livestream_analytics_complete_params.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["LivestreamGetLivestreamAnalyticsCompleteParams"]
+
+
+class LivestreamGetLivestreamAnalyticsCompleteParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    end_time: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """Specify the end time range in ISO format to access the livestream analytics."""
+
+    start_time: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """Specify the start time range in ISO format to access the livestream analytics."""
diff --git a/src/cloudflare/types/realtime_kit/livestream_get_livestream_analytics_complete_response.py b/src/cloudflare/types/realtime_kit/livestream_get_livestream_analytics_complete_response.py
new file mode 100644
index 00000000000..6d1f075e225
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/livestream_get_livestream_analytics_complete_response.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["LivestreamGetLivestreamAnalyticsCompleteResponse", "Data"]
+
+
+class Data(BaseModel):
+    count: Optional[int] = None
+    """Count of total livestreams."""
+
+    total_ingest_seconds: Optional[int] = None
+    """Total time duration for which the input was given or the meeting was streamed."""
+
+    total_viewer_seconds: Optional[int] = None
+    """Total view time for which the viewers watched the stream."""
+
+
+class LivestreamGetLivestreamAnalyticsCompleteResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/livestream_get_livestream_session_details_for_session_id_response.py b/src/cloudflare/types/realtime_kit/livestream_get_livestream_session_details_for_session_id_response.py
new file mode 100644
index 00000000000..905735b6428
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/livestream_get_livestream_session_details_for_session_id_response.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["LivestreamGetLivestreamSessionDetailsForSessionIDResponse", "Data"]
+
+
+class Data(BaseModel):
+    id: Optional[str] = None
+    """The livestream ID."""
+
+    created_at: Optional[datetime] = None
+    """Timestamp the object was created at. The time is returned in ISO format."""
+
+    err_message: Optional[str] = None
+    """The server URL to which the RTMP encoder sends the video and audio data."""
+
+    ingest_seconds: Optional[int] = None
+    """Name of the livestream."""
+
+    livestream_id: Optional[str] = None
+
+    started_time: Optional[str] = None
+    """Unique key for accessing each livestream."""
+
+    stopped_time: Optional[str] = None
+    """The web address that viewers can use to watch the livestream."""
+
+    updated_at: Optional[str] = None
+    """Timestamp the object was updated at. The time is returned in ISO format."""
+
+    viewer_seconds: Optional[int] = None
+    """Specifies if the livestream was disabled."""
+
+
+class LivestreamGetLivestreamSessionDetailsForSessionIDResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/livestream_get_livestream_session_for_livestream_id_params.py b/src/cloudflare/types/realtime_kit/livestream_get_livestream_session_for_livestream_id_params.py
new file mode 100644
index 00000000000..edf7e5f092a
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/livestream_get_livestream_session_for_livestream_id_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["LivestreamGetLivestreamSessionForLivestreamIDParams"]
+
+
+class LivestreamGetLivestreamSessionForLivestreamIDParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    app_id: Required[str]
+    """The app identifier tag."""
+
+    page_no: int
+    """The page number from which you want your page search results to be displayed."""
+
+    per_page: int
+    """Number of results per page."""
diff --git a/src/cloudflare/types/realtime_kit/livestream_get_livestream_session_for_livestream_id_response.py b/src/cloudflare/types/realtime_kit/livestream_get_livestream_session_for_livestream_id_response.py
new file mode 100644
index 00000000000..76018eb6795
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/livestream_get_livestream_session_for_livestream_id_response.py
@@ -0,0 +1,98 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "LivestreamGetLivestreamSessionForLivestreamIDResponse",
+    "Data",
+    "DataLivestream",
+    "DataPaging",
+    "DataSession",
+]
+
+
+class DataLivestream(BaseModel):
+    id: Optional[str] = None
+    """ID of the livestream."""
+
+    created_at: Optional[str] = None
+    """Timestamp the object was created at. The time is returned in ISO format."""
+
+    disabled: Optional[str] = None
+    """Specifies if the livestream was disabled."""
+
+    ingest_server: Optional[str] = None
+    """The server URL to which the RTMP encoder sends the video and audio data."""
+
+    meeting_id: Optional[str] = None
+    """The ID of the meeting."""
+
+    name: Optional[str] = None
+    """Name of the livestream."""
+
+    playback_url: Optional[str] = None
+    """The web address that viewers can use to watch the livestream."""
+
+    status: Optional[Literal["LIVE", "IDLE", "ERRORED", "INVOKED"]] = None
+
+    stream_key: Optional[str] = None
+    """Unique key for accessing each livestream."""
+
+    updated_at: Optional[str] = None
+    """Timestamp the object was updated at. The time is returned in ISO format."""
+
+
+class DataPaging(BaseModel):
+    end_offset: Optional[int] = None
+
+    start_offset: Optional[int] = None
+
+    total_count: Optional[int] = None
+
+
+class DataSession(BaseModel):
+    id: Optional[str] = None
+    """ID of the session."""
+
+    created_at: Optional[datetime] = None
+    """Timestamp the object was created at. The time is returned in ISO format."""
+
+    err_message: Optional[str] = None
+
+    ingest_seconds: Optional[float] = None
+    """The time duration for which the input was given or the meeting was streamed."""
+
+    invoked_time: Optional[datetime] = None
+    """Timestamp the object was invoked. The time is returned in ISO format."""
+
+    livestream_id: Optional[str] = None
+
+    started_time: Optional[datetime] = None
+    """Timestamp the object was started. The time is returned in ISO format."""
+
+    stopped_time: Optional[datetime] = None
+    """Timestamp the object was stopped. The time is returned in ISO format."""
+
+    updated_at: Optional[datetime] = None
+    """Timestamp the object was updated at. The time is returned in ISO format."""
+
+    viewer_seconds: Optional[float] = None
+    """The total view time for which the viewers watched the stream."""
+
+
+class Data(BaseModel):
+    livestream: Optional[DataLivestream] = None
+
+    paging: Optional[DataPaging] = None
+
+    session: Optional[DataSession] = None
+
+
+class LivestreamGetLivestreamSessionForLivestreamIDResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/livestream_get_meeting_active_livestreams_response.py b/src/cloudflare/types/realtime_kit/livestream_get_meeting_active_livestreams_response.py
new file mode 100644
index 00000000000..dbeec9a6161
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/livestream_get_meeting_active_livestreams_response.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["LivestreamGetMeetingActiveLivestreamsResponse", "Data"]
+
+
+class Data(BaseModel):
+    id: Optional[str] = None
+    """The livestream ID."""
+
+    created_at: Optional[datetime] = None
+    """Timestamp the object was created at. The time is returned in ISO format."""
+
+    disabled: Optional[str] = None
+    """Specifies if the livestream was disabled."""
+
+    ingest_server: Optional[str] = None
+    """The server URL to which the RTMP encoder sends the video and audio data."""
+
+    meeting_id: Optional[str] = None
+
+    name: Optional[str] = None
+    """Name of the livestream."""
+
+    playback_url: Optional[str] = None
+    """The web address that viewers can use to watch the livestream."""
+
+    status: Optional[Literal["LIVE", "IDLE", "ERRORED", "INVOKED"]] = None
+
+    stream_key: Optional[str] = None
+    """Unique key for accessing each livestream."""
+
+    updated_at: Optional[datetime] = None
+    """Timestamp the object was updated at. The time is returned in ISO format."""
+
+
+class LivestreamGetMeetingActiveLivestreamsResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/livestream_get_org_analytics_params.py b/src/cloudflare/types/realtime_kit/livestream_get_org_analytics_params.py
new file mode 100644
index 00000000000..63730dcc0e2
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/livestream_get_org_analytics_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["LivestreamGetOrgAnalyticsParams"]
+
+
+class LivestreamGetOrgAnalyticsParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    end_date: str
+    """end date in YYYY-MM-DD format"""
+
+    start_date: str
+    """start date in YYYY-MM-DD format"""
diff --git a/src/cloudflare/types/realtime_kit/livestream_get_org_analytics_response.py b/src/cloudflare/types/realtime_kit/livestream_get_org_analytics_response.py
new file mode 100644
index 00000000000..9623557b700
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/livestream_get_org_analytics_response.py
@@ -0,0 +1,74 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = [
+    "LivestreamGetOrgAnalyticsResponse",
+    "Data",
+    "DataRecordingStats",
+    "DataRecordingStatsDayStat",
+    "DataSessionStats",
+    "DataSessionStatsDayStat",
+]
+
+
+class DataRecordingStatsDayStat(BaseModel):
+    day: Optional[str] = None
+
+    total_recording_minutes: Optional[int] = None
+    """Total recording minutes for a specific day"""
+
+    total_recordings: Optional[int] = None
+    """Total number of recordings for a specific day"""
+
+
+class DataRecordingStats(BaseModel):
+    """Recording statistics of an App during the range specified"""
+
+    day_stats: Optional[List[DataRecordingStatsDayStat]] = None
+    """Day wise recording stats"""
+
+    recording_count: Optional[int] = None
+    """Total number of recordings during the range specified"""
+
+    recording_minutes_consumed: Optional[float] = None
+    """Total recording minutes during the range specified"""
+
+
+class DataSessionStatsDayStat(BaseModel):
+    day: Optional[str] = None
+
+    total_session_minutes: Optional[float] = None
+    """Total session minutes for a specific day"""
+
+    total_sessions: Optional[int] = None
+    """Total number of sessions for a specific day"""
+
+
+class DataSessionStats(BaseModel):
+    """Session statistics of an App during the range specified"""
+
+    day_stats: Optional[List[DataSessionStatsDayStat]] = None
+    """Day wise session stats"""
+
+    sessions_count: Optional[int] = None
+    """Total number of sessions during the range specified"""
+
+    sessions_minutes_consumed: Optional[float] = None
+    """Total session minutes during the range specified"""
+
+
+class Data(BaseModel):
+    recording_stats: Optional[DataRecordingStats] = None
+    """Recording statistics of an App during the range specified"""
+
+    session_stats: Optional[DataSessionStats] = None
+    """Session statistics of an App during the range specified"""
+
+
+class LivestreamGetOrgAnalyticsResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/livestream_start_livestreaming_a_meeting_params.py b/src/cloudflare/types/realtime_kit/livestream_start_livestreaming_a_meeting_params.py
new file mode 100644
index 00000000000..8a34a6d8d2d
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/livestream_start_livestreaming_a_meeting_params.py
@@ -0,0 +1,28 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Required, TypedDict
+
+__all__ = ["LivestreamStartLivestreamingAMeetingParams", "VideoConfig"]
+
+
+class LivestreamStartLivestreamingAMeetingParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    app_id: Required[str]
+    """The app identifier tag."""
+
+    name: Optional[str]
+
+    video_config: VideoConfig
+
+
+class VideoConfig(TypedDict, total=False):
+    height: int
+    """Height of the livestreaming video in pixels"""
+
+    width: int
+    """Width of the livestreaming video in pixels"""
diff --git a/src/cloudflare/types/realtime_kit/livestream_start_livestreaming_a_meeting_response.py b/src/cloudflare/types/realtime_kit/livestream_start_livestreaming_a_meeting_response.py
new file mode 100644
index 00000000000..c28cc784585
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/livestream_start_livestreaming_a_meeting_response.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["LivestreamStartLivestreamingAMeetingResponse", "Data"]
+
+
+class Data(BaseModel):
+    id: Optional[str] = None
+    """The livestream ID."""
+
+    ingest_server: Optional[str] = None
+    """The server URL to which the RTMP encoder sends the video and audio data."""
+
+    playback_url: Optional[str] = None
+    """The web address that viewers can use to watch the livestream."""
+
+    status: Optional[Literal["LIVE", "IDLE", "ERRORED", "INVOKED"]] = None
+
+    stream_key: Optional[str] = None
+    """Unique key for accessing each livestream."""
+
+
+class LivestreamStartLivestreamingAMeetingResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/livestream_stop_livestreaming_a_meeting_response.py b/src/cloudflare/types/realtime_kit/livestream_stop_livestreaming_a_meeting_response.py
new file mode 100644
index 00000000000..b308f9b2055
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/livestream_stop_livestreaming_a_meeting_response.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["LivestreamStopLivestreamingAMeetingResponse", "Data"]
+
+
+class Data(BaseModel):
+    message: Optional[str] = None
+
+
+class LivestreamStopLivestreamingAMeetingResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/meeting_add_participant_params.py b/src/cloudflare/types/realtime_kit/meeting_add_participant_params.py
new file mode 100644
index 00000000000..111b281d294
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_add_participant_params.py
@@ -0,0 +1,32 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Required, TypedDict
+
+__all__ = ["MeetingAddParticipantParams"]
+
+
+class MeetingAddParticipantParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    app_id: Required[str]
+    """The app identifier tag."""
+
+    custom_participant_id: Required[str]
+    """A unique participant ID.
+
+    You must specify a unique ID for the participant, for example, UUID, email
+    address, and so on.
+    """
+
+    preset_name: Required[str]
+    """Name of the preset to apply to this participant."""
+
+    name: Optional[str]
+    """(Optional) Name of the participant."""
+
+    picture: Optional[str]
+    """(Optional) A URL to a picture to be used for the participant."""
diff --git a/src/cloudflare/types/realtime_kit/meeting_add_participant_response.py b/src/cloudflare/types/realtime_kit/meeting_add_participant_response.py
new file mode 100644
index 00000000000..9ea59e5585d
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_add_participant_response.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["MeetingAddParticipantResponse", "Data"]
+
+
+class Data(BaseModel):
+    """Represents a participant."""
+
+    id: str
+    """ID of the participant."""
+
+    token: str
+    """
+    The participant's auth token that can be used for joining a meeting from the
+    client side.
+    """
+
+    created_at: datetime
+    """When this object was created. The time is returned in ISO format."""
+
+    custom_participant_id: str
+    """A unique participant ID generated by the client."""
+
+    preset_name: str
+    """Preset applied to the participant."""
+
+    updated_at: datetime
+    """When this object was updated. The time is returned in ISO format."""
+
+    name: Optional[str] = None
+    """Name of the participant."""
+
+    picture: Optional[str] = None
+    """URL to a picture of the participant."""
+
+
+class MeetingAddParticipantResponse(BaseModel):
+    success: bool
+    """Success status of the operation"""
+
+    data: Optional[Data] = None
+    """Represents a participant."""
diff --git a/src/cloudflare/types/realtime_kit/meeting_create_params.py b/src/cloudflare/types/realtime_kit/meeting_create_params.py
new file mode 100644
index 00000000000..7cf8980aa09
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_create_params.py
@@ -0,0 +1,271 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = [
+    "MeetingCreateParams",
+    "AIConfig",
+    "AIConfigSummarization",
+    "AIConfigTranscription",
+    "RecordingConfig",
+    "RecordingConfigAudioConfig",
+    "RecordingConfigLiveStreamingConfig",
+    "RecordingConfigRealtimekitBucketConfig",
+    "RecordingConfigStorageConfig",
+    "RecordingConfigVideoConfig",
+    "RecordingConfigVideoConfigWatermark",
+    "RecordingConfigVideoConfigWatermarkSize",
+]
+
+
+class MeetingCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    ai_config: AIConfig
+    """
+    The AI Config allows you to customize the behavior of meeting transcriptions and
+    summaries
+    """
+
+    live_stream_on_start: Optional[bool]
+    """Specifies if the meeting should start getting livestreamed on start."""
+
+    persist_chat: bool
+    """
+    If a meeting is set to persist_chat, meeting chat would remain for a week within
+    the meeting space.
+    """
+
+    record_on_start: Optional[bool]
+    """
+    Specifies if the meeting should start getting recorded as soon as someone joins
+    the meeting.
+    """
+
+    recording_config: RecordingConfig
+    """Recording Configurations to be used for this meeting.
+
+    This level of configs takes higher preference over App level configs on the
+    RealtimeKit developer portal.
+    """
+
+    session_keep_alive_time_in_secs: float
+    """
+    Time in seconds, for which a session remains active, after the last participant
+    has left the meeting.
+    """
+
+    summarize_on_end: bool
+    """Automatically generate summary of meetings using transcripts.
+
+    Requires Transcriptions to be enabled, and can be retrieved via Webhooks or
+    summary API.
+    """
+
+    title: Optional[str]
+    """Title of the meeting"""
+
+
+class AIConfigSummarization(TypedDict, total=False):
+    """Summary Config"""
+
+    summary_type: Literal[
+        "general",
+        "team_meeting",
+        "sales_call",
+        "client_check_in",
+        "interview",
+        "daily_standup",
+        "one_on_one_meeting",
+        "lecture",
+        "code_review",
+    ]
+    """Defines the style of the summary, such as general, team meeting, or sales call."""
+
+    text_format: Literal["plain_text", "markdown"]
+    """Determines the text format of the summary, such as plain text or markdown."""
+
+    word_limit: int
+    """Sets the maximum number of words in the meeting summary."""
+
+
+class AIConfigTranscription(TypedDict, total=False):
+    """Transcription Configurations"""
+
+    keywords: SequenceNotStr[str]
+    """Adds specific terms to improve accurate detection during transcription."""
+
+    language: Literal["en-US", "en-IN", "de", "hi", "sv", "ru", "pl", "el", "fr", "nl"]
+    """Specifies the language code for transcription to ensure accurate results."""
+
+    profanity_filter: bool
+    """Control the inclusion of offensive language in transcriptions."""
+
+
+class AIConfig(TypedDict, total=False):
+    """
+    The AI Config allows you to customize the behavior of meeting transcriptions and summaries
+    """
+
+    summarization: AIConfigSummarization
+    """Summary Config"""
+
+    transcription: AIConfigTranscription
+    """Transcription Configurations"""
+
+
+class RecordingConfigAudioConfig(TypedDict, total=False):
+    """Object containing configuration regarding the audio that is being recorded."""
+
+    channel: Literal["mono", "stereo"]
+    """Audio signal pathway within an audio file that carries a specific sound source."""
+
+    codec: Literal["MP3", "AAC"]
+    """Codec using which the recording will be encoded.
+
+    If VP8/VP9 is selected for videoConfig, changing audioConfig is not allowed. In
+    this case, the codec in the audioConfig is automatically set to vorbis.
+    """
+
+    export_file: bool
+    """Controls whether to export audio file seperately"""
+
+
+class RecordingConfigLiveStreamingConfig(TypedDict, total=False):
+    rtmp_url: str
+    """RTMP URL to stream to"""
+
+
+class RecordingConfigRealtimekitBucketConfig(TypedDict, total=False):
+    enabled: Required[bool]
+    """Controls whether recordings are uploaded to RealtimeKit's bucket.
+
+    If set to false, `download_url`, `audio_download_url`, `download_url_expiry`
+    won't be generated for a recording.
+    """
+
+
+class RecordingConfigStorageConfig(TypedDict, total=False):
+    type: Required[Literal["aws", "azure", "digitalocean", "gcs", "sftp"]]
+    """Type of storage media."""
+
+    access_key: str
+    """Access key of the storage medium.
+
+    Access key is not required for the `gcs` storage media type.
+
+    Note that this field is not readable by clients, only writeable.
+    """
+
+    auth_method: Literal["KEY", "PASSWORD"]
+    """Authentication method used for "sftp" type storage medium"""
+
+    bucket: str
+    """Name of the storage medium's bucket."""
+
+    host: str
+    """SSH destination server host for SFTP type storage medium"""
+
+    password: str
+    """
+    SSH destination server password for SFTP type storage medium when auth_method is
+    "PASSWORD". If auth_method is "KEY", this specifies the password for the ssh
+    private key.
+    """
+
+    path: str
+    """Path relative to the bucket root at which the recording will be placed."""
+
+    port: float
+    """SSH destination server port for SFTP type storage medium"""
+
+    private_key: str
+    """
+    Private key used to login to destination SSH server for SFTP type storage
+    medium, when auth_method used is "KEY"
+    """
+
+    region: str
+    """Region of the storage medium."""
+
+    secret: str
+    """Secret key of the storage medium.
+
+    Similar to `access_key`, it is only writeable by clients, not readable.
+    """
+
+    username: str
+    """SSH destination server username for SFTP type storage medium"""
+
+
+class RecordingConfigVideoConfigWatermarkSize(TypedDict, total=False):
+    """Size of the watermark"""
+
+    height: int
+    """Height of the watermark in px"""
+
+    width: int
+    """Width of the watermark in px"""
+
+
+class RecordingConfigVideoConfigWatermark(TypedDict, total=False):
+    """Watermark to be added to the recording"""
+
+    position: Literal["left top", "right top", "left bottom", "right bottom"]
+    """Position of the watermark"""
+
+    size: RecordingConfigVideoConfigWatermarkSize
+    """Size of the watermark"""
+
+    url: str
+    """URL of the watermark image"""
+
+
+class RecordingConfigVideoConfig(TypedDict, total=False):
+    codec: Literal["H264", "VP8"]
+    """Codec using which the recording will be encoded."""
+
+    export_file: bool
+    """Controls whether to export video file seperately"""
+
+    height: int
+    """Height of the recording video in pixels"""
+
+    watermark: RecordingConfigVideoConfigWatermark
+    """Watermark to be added to the recording"""
+
+    width: int
+    """Width of the recording video in pixels"""
+
+
+class RecordingConfig(TypedDict, total=False):
+    """Recording Configurations to be used for this meeting.
+
+    This level of configs takes higher preference over App level configs on the RealtimeKit developer portal.
+    """
+
+    audio_config: RecordingConfigAudioConfig
+    """Object containing configuration regarding the audio that is being recorded."""
+
+    file_name_prefix: str
+    """Adds a prefix to the beginning of the file name of the recording."""
+
+    live_streaming_config: RecordingConfigLiveStreamingConfig
+
+    max_seconds: float
+    """
+    Specifies the maximum duration for recording in seconds, ranging from a minimum
+    of 60 seconds to a maximum of 24 hours.
+    """
+
+    realtimekit_bucket_config: RecordingConfigRealtimekitBucketConfig
+
+    storage_config: Optional[RecordingConfigStorageConfig]
+
+    video_config: RecordingConfigVideoConfig
diff --git a/src/cloudflare/types/realtime_kit/meeting_create_response.py b/src/cloudflare/types/realtime_kit/meeting_create_response.py
new file mode 100644
index 00000000000..db769a9f994
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_create_response.py
@@ -0,0 +1,284 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "MeetingCreateResponse",
+    "Data",
+    "DataAIConfig",
+    "DataAIConfigSummarization",
+    "DataAIConfigTranscription",
+    "DataRecordingConfig",
+    "DataRecordingConfigAudioConfig",
+    "DataRecordingConfigLiveStreamingConfig",
+    "DataRecordingConfigRealtimekitBucketConfig",
+    "DataRecordingConfigStorageConfig",
+    "DataRecordingConfigVideoConfig",
+    "DataRecordingConfigVideoConfigWatermark",
+    "DataRecordingConfigVideoConfigWatermarkSize",
+]
+
+
+class DataAIConfigSummarization(BaseModel):
+    """Summary Config"""
+
+    summary_type: Optional[
+        Literal[
+            "general",
+            "team_meeting",
+            "sales_call",
+            "client_check_in",
+            "interview",
+            "daily_standup",
+            "one_on_one_meeting",
+            "lecture",
+            "code_review",
+        ]
+    ] = None
+    """Defines the style of the summary, such as general, team meeting, or sales call."""
+
+    text_format: Optional[Literal["plain_text", "markdown"]] = None
+    """Determines the text format of the summary, such as plain text or markdown."""
+
+    word_limit: Optional[int] = None
+    """Sets the maximum number of words in the meeting summary."""
+
+
+class DataAIConfigTranscription(BaseModel):
+    """Transcription Configurations"""
+
+    keywords: Optional[List[str]] = None
+    """Adds specific terms to improve accurate detection during transcription."""
+
+    language: Optional[Literal["en-US", "en-IN", "de", "hi", "sv", "ru", "pl", "el", "fr", "nl"]] = None
+    """Specifies the language code for transcription to ensure accurate results."""
+
+    profanity_filter: Optional[bool] = None
+    """Control the inclusion of offensive language in transcriptions."""
+
+
+class DataAIConfig(BaseModel):
+    """
+    The AI Config allows you to customize the behavior of meeting transcriptions and summaries
+    """
+
+    summarization: Optional[DataAIConfigSummarization] = None
+    """Summary Config"""
+
+    transcription: Optional[DataAIConfigTranscription] = None
+    """Transcription Configurations"""
+
+
+class DataRecordingConfigAudioConfig(BaseModel):
+    """Object containing configuration regarding the audio that is being recorded."""
+
+    channel: Optional[Literal["mono", "stereo"]] = None
+    """Audio signal pathway within an audio file that carries a specific sound source."""
+
+    codec: Optional[Literal["MP3", "AAC"]] = None
+    """Codec using which the recording will be encoded.
+
+    If VP8/VP9 is selected for videoConfig, changing audioConfig is not allowed. In
+    this case, the codec in the audioConfig is automatically set to vorbis.
+    """
+
+    export_file: Optional[bool] = None
+    """Controls whether to export audio file seperately"""
+
+
+class DataRecordingConfigLiveStreamingConfig(BaseModel):
+    rtmp_url: Optional[str] = None
+    """RTMP URL to stream to"""
+
+
+class DataRecordingConfigRealtimekitBucketConfig(BaseModel):
+    enabled: bool
+    """Controls whether recordings are uploaded to RealtimeKit's bucket.
+
+    If set to false, `download_url`, `audio_download_url`, `download_url_expiry`
+    won't be generated for a recording.
+    """
+
+
+class DataRecordingConfigStorageConfig(BaseModel):
+    type: Literal["aws", "azure", "digitalocean", "gcs", "sftp"]
+    """Type of storage media."""
+
+    auth_method: Optional[Literal["KEY", "PASSWORD"]] = None
+    """Authentication method used for "sftp" type storage medium"""
+
+    bucket: Optional[str] = None
+    """Name of the storage medium's bucket."""
+
+    host: Optional[str] = None
+    """SSH destination server host for SFTP type storage medium"""
+
+    password: Optional[str] = None
+    """
+    SSH destination server password for SFTP type storage medium when auth_method is
+    "PASSWORD". If auth_method is "KEY", this specifies the password for the ssh
+    private key.
+    """
+
+    path: Optional[str] = None
+    """Path relative to the bucket root at which the recording will be placed."""
+
+    port: Optional[float] = None
+    """SSH destination server port for SFTP type storage medium"""
+
+    private_key: Optional[str] = None
+    """
+    Private key used to login to destination SSH server for SFTP type storage
+    medium, when auth_method used is "KEY"
+    """
+
+    region: Optional[str] = None
+    """Region of the storage medium."""
+
+    secret: Optional[str] = None
+    """Secret key of the storage medium.
+
+    Similar to `access_key`, it is only writeable by clients, not readable.
+    """
+
+    username: Optional[str] = None
+    """SSH destination server username for SFTP type storage medium"""
+
+
+class DataRecordingConfigVideoConfigWatermarkSize(BaseModel):
+    """Size of the watermark"""
+
+    height: Optional[int] = None
+    """Height of the watermark in px"""
+
+    width: Optional[int] = None
+    """Width of the watermark in px"""
+
+
+class DataRecordingConfigVideoConfigWatermark(BaseModel):
+    """Watermark to be added to the recording"""
+
+    position: Optional[Literal["left top", "right top", "left bottom", "right bottom"]] = None
+    """Position of the watermark"""
+
+    size: Optional[DataRecordingConfigVideoConfigWatermarkSize] = None
+    """Size of the watermark"""
+
+    url: Optional[str] = None
+    """URL of the watermark image"""
+
+
+class DataRecordingConfigVideoConfig(BaseModel):
+    codec: Optional[Literal["H264", "VP8"]] = None
+    """Codec using which the recording will be encoded."""
+
+    export_file: Optional[bool] = None
+    """Controls whether to export video file seperately"""
+
+    height: Optional[int] = None
+    """Height of the recording video in pixels"""
+
+    watermark: Optional[DataRecordingConfigVideoConfigWatermark] = None
+    """Watermark to be added to the recording"""
+
+    width: Optional[int] = None
+    """Width of the recording video in pixels"""
+
+
+class DataRecordingConfig(BaseModel):
+    """Recording Configurations to be used for this meeting.
+
+    This level of configs takes higher preference over App level configs on the RealtimeKit developer portal.
+    """
+
+    audio_config: Optional[DataRecordingConfigAudioConfig] = None
+    """Object containing configuration regarding the audio that is being recorded."""
+
+    file_name_prefix: Optional[str] = None
+    """Adds a prefix to the beginning of the file name of the recording."""
+
+    live_streaming_config: Optional[DataRecordingConfigLiveStreamingConfig] = None
+
+    max_seconds: Optional[float] = None
+    """
+    Specifies the maximum duration for recording in seconds, ranging from a minimum
+    of 60 seconds to a maximum of 24 hours.
+    """
+
+    realtimekit_bucket_config: Optional[DataRecordingConfigRealtimekitBucketConfig] = None
+
+    storage_config: Optional[DataRecordingConfigStorageConfig] = None
+
+    video_config: Optional[DataRecordingConfigVideoConfig] = None
+
+
+class Data(BaseModel):
+    """Data returned by the operation"""
+
+    id: str
+    """ID of the meeting."""
+
+    created_at: datetime
+    """Timestamp the object was created at. The time is returned in ISO format."""
+
+    updated_at: datetime
+    """Timestamp the object was updated at. The time is returned in ISO format."""
+
+    ai_config: Optional[DataAIConfig] = None
+    """
+    The AI Config allows you to customize the behavior of meeting transcriptions and
+    summaries
+    """
+
+    live_stream_on_start: Optional[bool] = None
+    """Specifies if the meeting should start getting livestreamed on start."""
+
+    persist_chat: Optional[bool] = None
+    """Specifies if Chat within a meeting should persist for a week."""
+
+    record_on_start: Optional[bool] = None
+    """
+    Specifies if the meeting should start getting recorded as soon as someone joins
+    the meeting.
+    """
+
+    recording_config: Optional[DataRecordingConfig] = None
+    """Recording Configurations to be used for this meeting.
+
+    This level of configs takes higher preference over App level configs on the
+    RealtimeKit developer portal.
+    """
+
+    session_keep_alive_time_in_secs: Optional[float] = None
+    """
+    Time in seconds, for which a session remains active, after the last participant
+    has left the meeting.
+    """
+
+    status: Optional[Literal["ACTIVE", "INACTIVE"]] = None
+    """Whether the meeting is `ACTIVE` or `INACTIVE`.
+
+    Users will not be able to join an `INACTIVE` meeting.
+    """
+
+    summarize_on_end: Optional[bool] = None
+    """Automatically generate summary of meetings using transcripts.
+
+    Requires Transcriptions to be enabled, and can be retrieved via Webhooks or
+    summary API.
+    """
+
+    title: Optional[str] = None
+    """Title of the meeting."""
+
+
+class MeetingCreateResponse(BaseModel):
+    success: bool
+    """Success status of the operation"""
+
+    data: Optional[Data] = None
+    """Data returned by the operation"""
diff --git a/src/cloudflare/types/realtime_kit/meeting_delete_meeting_participant_response.py b/src/cloudflare/types/realtime_kit/meeting_delete_meeting_participant_response.py
new file mode 100644
index 00000000000..8bdf5b36874
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_delete_meeting_participant_response.py
@@ -0,0 +1,32 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["MeetingDeleteMeetingParticipantResponse", "Data"]
+
+
+class Data(BaseModel):
+    """Data returned by the operation"""
+
+    created_at: datetime
+    """Timestamp this object was created at. The time is returned in ISO format."""
+
+    custom_participant_id: str
+    """A unique participant ID generated by the client."""
+
+    preset_id: str
+    """ID of the preset applied to this participant."""
+
+    updated_at: datetime
+    """Timestamp this object was updated at. The time is returned in ISO format."""
+
+
+class MeetingDeleteMeetingParticipantResponse(BaseModel):
+    success: bool
+    """Success status of the operation"""
+
+    data: Optional[Data] = None
+    """Data returned by the operation"""
diff --git a/src/cloudflare/types/realtime_kit/meeting_edit_participant_params.py b/src/cloudflare/types/realtime_kit/meeting_edit_participant_params.py
new file mode 100644
index 00000000000..2b36ce4b14a
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_edit_participant_params.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Required, TypedDict
+
+__all__ = ["MeetingEditParticipantParams"]
+
+
+class MeetingEditParticipantParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    app_id: Required[str]
+    """The app identifier tag."""
+
+    meeting_id: Required[str]
+
+    name: Optional[str]
+    """(Optional) Name of the participant."""
+
+    picture: Optional[str]
+    """(Optional) A URL to a picture to be used for the participant."""
+
+    preset_name: Optional[str]
+    """(Optional) Name of the preset to apply to this participant."""
diff --git a/src/cloudflare/types/realtime_kit/meeting_edit_participant_response.py b/src/cloudflare/types/realtime_kit/meeting_edit_participant_response.py
new file mode 100644
index 00000000000..f32a3bae56d
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_edit_participant_response.py
@@ -0,0 +1,47 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["MeetingEditParticipantResponse", "Data"]
+
+
+class Data(BaseModel):
+    """Represents a participant."""
+
+    id: str
+    """ID of the participant."""
+
+    token: str
+    """
+    The participant's auth token that can be used for joining a meeting from the
+    client side.
+    """
+
+    created_at: datetime
+    """When this object was created. The time is returned in ISO format."""
+
+    custom_participant_id: str
+    """A unique participant ID generated by the client."""
+
+    preset_name: str
+    """Preset applied to the participant."""
+
+    updated_at: datetime
+    """When this object was updated. The time is returned in ISO format."""
+
+    name: Optional[str] = None
+    """Name of the participant."""
+
+    picture: Optional[str] = None
+    """URL to a picture of the participant."""
+
+
+class MeetingEditParticipantResponse(BaseModel):
+    success: bool
+    """Success status of the operation"""
+
+    data: Optional[Data] = None
+    """Represents a participant."""
diff --git a/src/cloudflare/types/realtime_kit/meeting_get_meeting_by_id_params.py b/src/cloudflare/types/realtime_kit/meeting_get_meeting_by_id_params.py
new file mode 100644
index 00000000000..76dc134732c
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_get_meeting_by_id_params.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["MeetingGetMeetingByIDParams"]
+
+
+class MeetingGetMeetingByIDParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    app_id: Required[str]
+    """The app identifier tag."""
+
+    name: str
diff --git a/src/cloudflare/types/realtime_kit/meeting_get_meeting_by_id_response.py b/src/cloudflare/types/realtime_kit/meeting_get_meeting_by_id_response.py
new file mode 100644
index 00000000000..aa4cab9e127
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_get_meeting_by_id_response.py
@@ -0,0 +1,284 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "MeetingGetMeetingByIDResponse",
+    "Data",
+    "DataAIConfig",
+    "DataAIConfigSummarization",
+    "DataAIConfigTranscription",
+    "DataRecordingConfig",
+    "DataRecordingConfigAudioConfig",
+    "DataRecordingConfigLiveStreamingConfig",
+    "DataRecordingConfigRealtimekitBucketConfig",
+    "DataRecordingConfigStorageConfig",
+    "DataRecordingConfigVideoConfig",
+    "DataRecordingConfigVideoConfigWatermark",
+    "DataRecordingConfigVideoConfigWatermarkSize",
+]
+
+
+class DataAIConfigSummarization(BaseModel):
+    """Summary Config"""
+
+    summary_type: Optional[
+        Literal[
+            "general",
+            "team_meeting",
+            "sales_call",
+            "client_check_in",
+            "interview",
+            "daily_standup",
+            "one_on_one_meeting",
+            "lecture",
+            "code_review",
+        ]
+    ] = None
+    """Defines the style of the summary, such as general, team meeting, or sales call."""
+
+    text_format: Optional[Literal["plain_text", "markdown"]] = None
+    """Determines the text format of the summary, such as plain text or markdown."""
+
+    word_limit: Optional[int] = None
+    """Sets the maximum number of words in the meeting summary."""
+
+
+class DataAIConfigTranscription(BaseModel):
+    """Transcription Configurations"""
+
+    keywords: Optional[List[str]] = None
+    """Adds specific terms to improve accurate detection during transcription."""
+
+    language: Optional[Literal["en-US", "en-IN", "de", "hi", "sv", "ru", "pl", "el", "fr", "nl"]] = None
+    """Specifies the language code for transcription to ensure accurate results."""
+
+    profanity_filter: Optional[bool] = None
+    """Control the inclusion of offensive language in transcriptions."""
+
+
+class DataAIConfig(BaseModel):
+    """
+    The AI Config allows you to customize the behavior of meeting transcriptions and summaries
+    """
+
+    summarization: Optional[DataAIConfigSummarization] = None
+    """Summary Config"""
+
+    transcription: Optional[DataAIConfigTranscription] = None
+    """Transcription Configurations"""
+
+
+class DataRecordingConfigAudioConfig(BaseModel):
+    """Object containing configuration regarding the audio that is being recorded."""
+
+    channel: Optional[Literal["mono", "stereo"]] = None
+    """Audio signal pathway within an audio file that carries a specific sound source."""
+
+    codec: Optional[Literal["MP3", "AAC"]] = None
+    """Codec using which the recording will be encoded.
+
+    If VP8/VP9 is selected for videoConfig, changing audioConfig is not allowed. In
+    this case, the codec in the audioConfig is automatically set to vorbis.
+    """
+
+    export_file: Optional[bool] = None
+    """Controls whether to export audio file seperately"""
+
+
+class DataRecordingConfigLiveStreamingConfig(BaseModel):
+    rtmp_url: Optional[str] = None
+    """RTMP URL to stream to"""
+
+
+class DataRecordingConfigRealtimekitBucketConfig(BaseModel):
+    enabled: bool
+    """Controls whether recordings are uploaded to RealtimeKit's bucket.
+
+    If set to false, `download_url`, `audio_download_url`, `download_url_expiry`
+    won't be generated for a recording.
+    """
+
+
+class DataRecordingConfigStorageConfig(BaseModel):
+    type: Literal["aws", "azure", "digitalocean", "gcs", "sftp"]
+    """Type of storage media."""
+
+    auth_method: Optional[Literal["KEY", "PASSWORD"]] = None
+    """Authentication method used for "sftp" type storage medium"""
+
+    bucket: Optional[str] = None
+    """Name of the storage medium's bucket."""
+
+    host: Optional[str] = None
+    """SSH destination server host for SFTP type storage medium"""
+
+    password: Optional[str] = None
+    """
+    SSH destination server password for SFTP type storage medium when auth_method is
+    "PASSWORD". If auth_method is "KEY", this specifies the password for the ssh
+    private key.
+    """
+
+    path: Optional[str] = None
+    """Path relative to the bucket root at which the recording will be placed."""
+
+    port: Optional[float] = None
+    """SSH destination server port for SFTP type storage medium"""
+
+    private_key: Optional[str] = None
+    """
+    Private key used to login to destination SSH server for SFTP type storage
+    medium, when auth_method used is "KEY"
+    """
+
+    region: Optional[str] = None
+    """Region of the storage medium."""
+
+    secret: Optional[str] = None
+    """Secret key of the storage medium.
+
+    Similar to `access_key`, it is only writeable by clients, not readable.
+    """
+
+    username: Optional[str] = None
+    """SSH destination server username for SFTP type storage medium"""
+
+
+class DataRecordingConfigVideoConfigWatermarkSize(BaseModel):
+    """Size of the watermark"""
+
+    height: Optional[int] = None
+    """Height of the watermark in px"""
+
+    width: Optional[int] = None
+    """Width of the watermark in px"""
+
+
+class DataRecordingConfigVideoConfigWatermark(BaseModel):
+    """Watermark to be added to the recording"""
+
+    position: Optional[Literal["left top", "right top", "left bottom", "right bottom"]] = None
+    """Position of the watermark"""
+
+    size: Optional[DataRecordingConfigVideoConfigWatermarkSize] = None
+    """Size of the watermark"""
+
+    url: Optional[str] = None
+    """URL of the watermark image"""
+
+
+class DataRecordingConfigVideoConfig(BaseModel):
+    codec: Optional[Literal["H264", "VP8"]] = None
+    """Codec using which the recording will be encoded."""
+
+    export_file: Optional[bool] = None
+    """Controls whether to export video file seperately"""
+
+    height: Optional[int] = None
+    """Height of the recording video in pixels"""
+
+    watermark: Optional[DataRecordingConfigVideoConfigWatermark] = None
+    """Watermark to be added to the recording"""
+
+    width: Optional[int] = None
+    """Width of the recording video in pixels"""
+
+
+class DataRecordingConfig(BaseModel):
+    """Recording Configurations to be used for this meeting.
+
+    This level of configs takes higher preference over App level configs on the RealtimeKit developer portal.
+    """
+
+    audio_config: Optional[DataRecordingConfigAudioConfig] = None
+    """Object containing configuration regarding the audio that is being recorded."""
+
+    file_name_prefix: Optional[str] = None
+    """Adds a prefix to the beginning of the file name of the recording."""
+
+    live_streaming_config: Optional[DataRecordingConfigLiveStreamingConfig] = None
+
+    max_seconds: Optional[float] = None
+    """
+    Specifies the maximum duration for recording in seconds, ranging from a minimum
+    of 60 seconds to a maximum of 24 hours.
+    """
+
+    realtimekit_bucket_config: Optional[DataRecordingConfigRealtimekitBucketConfig] = None
+
+    storage_config: Optional[DataRecordingConfigStorageConfig] = None
+
+    video_config: Optional[DataRecordingConfigVideoConfig] = None
+
+
+class Data(BaseModel):
+    """Data returned by the operation"""
+
+    id: str
+    """ID of the meeting."""
+
+    created_at: datetime
+    """Timestamp the object was created at. The time is returned in ISO format."""
+
+    updated_at: datetime
+    """Timestamp the object was updated at. The time is returned in ISO format."""
+
+    ai_config: Optional[DataAIConfig] = None
+    """
+    The AI Config allows you to customize the behavior of meeting transcriptions and
+    summaries
+    """
+
+    live_stream_on_start: Optional[bool] = None
+    """Specifies if the meeting should start getting livestreamed on start."""
+
+    persist_chat: Optional[bool] = None
+    """Specifies if Chat within a meeting should persist for a week."""
+
+    record_on_start: Optional[bool] = None
+    """
+    Specifies if the meeting should start getting recorded as soon as someone joins
+    the meeting.
+    """
+
+    recording_config: Optional[DataRecordingConfig] = None
+    """Recording Configurations to be used for this meeting.
+
+    This level of configs takes higher preference over App level configs on the
+    RealtimeKit developer portal.
+    """
+
+    session_keep_alive_time_in_secs: Optional[float] = None
+    """
+    Time in seconds, for which a session remains active, after the last participant
+    has left the meeting.
+    """
+
+    status: Optional[Literal["ACTIVE", "INACTIVE"]] = None
+    """Whether the meeting is `ACTIVE` or `INACTIVE`.
+
+    Users will not be able to join an `INACTIVE` meeting.
+    """
+
+    summarize_on_end: Optional[bool] = None
+    """Automatically generate summary of meetings using transcripts.
+
+    Requires Transcriptions to be enabled, and can be retrieved via Webhooks or
+    summary API.
+    """
+
+    title: Optional[str] = None
+    """Title of the meeting."""
+
+
+class MeetingGetMeetingByIDResponse(BaseModel):
+    success: bool
+    """Success status of the operation"""
+
+    data: Optional[Data] = None
+    """Data returned by the operation"""
diff --git a/src/cloudflare/types/realtime_kit/meeting_get_meeting_participant_response.py b/src/cloudflare/types/realtime_kit/meeting_get_meeting_participant_response.py
new file mode 100644
index 00000000000..138ee19240e
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_get_meeting_participant_response.py
@@ -0,0 +1,41 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["MeetingGetMeetingParticipantResponse", "Data"]
+
+
+class Data(BaseModel):
+    """Data returned by the operation"""
+
+    id: str
+    """ID of the participant."""
+
+    created_at: datetime
+    """When this object was created. The time is returned in ISO format."""
+
+    custom_participant_id: str
+    """A unique participant ID generated by the client."""
+
+    preset_name: str
+    """Preset applied to the participant."""
+
+    updated_at: datetime
+    """When this object was updated. The time is returned in ISO format."""
+
+    name: Optional[str] = None
+    """Name of the participant."""
+
+    picture: Optional[str] = None
+    """URL to a picture of the participant."""
+
+
+class MeetingGetMeetingParticipantResponse(BaseModel):
+    data: Data
+    """Data returned by the operation"""
+
+    success: bool
+    """Success status of the operation"""
diff --git a/src/cloudflare/types/realtime_kit/meeting_get_meeting_participants_params.py b/src/cloudflare/types/realtime_kit/meeting_get_meeting_participants_params.py
new file mode 100644
index 00000000000..a7476985b95
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_get_meeting_participants_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["MeetingGetMeetingParticipantsParams"]
+
+
+class MeetingGetMeetingParticipantsParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    app_id: Required[str]
+    """The app identifier tag."""
+
+    page_no: float
+    """The page number from which you want your page search results to be displayed."""
+
+    per_page: float
+    """Number of results per page"""
diff --git a/src/cloudflare/types/realtime_kit/meeting_get_meeting_participants_response.py b/src/cloudflare/types/realtime_kit/meeting_get_meeting_participants_response.py
new file mode 100644
index 00000000000..c1f6635dbb9
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_get_meeting_participants_response.py
@@ -0,0 +1,49 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["MeetingGetMeetingParticipantsResponse", "Data", "Paging"]
+
+
+class Data(BaseModel):
+    """Represents a participant."""
+
+    id: str
+    """ID of the participant."""
+
+    created_at: datetime
+    """When this object was created. The time is returned in ISO format."""
+
+    custom_participant_id: str
+    """A unique participant ID generated by the client."""
+
+    preset_name: str
+    """Preset applied to the participant."""
+
+    updated_at: datetime
+    """When this object was updated. The time is returned in ISO format."""
+
+    name: Optional[str] = None
+    """Name of the participant."""
+
+    picture: Optional[str] = None
+    """URL to a picture of the participant."""
+
+
+class Paging(BaseModel):
+    end_offset: float
+
+    start_offset: float
+
+    total_count: float
+
+
+class MeetingGetMeetingParticipantsResponse(BaseModel):
+    data: List[Data]
+
+    paging: Paging
+
+    success: bool
diff --git a/src/cloudflare/types/realtime_kit/meeting_get_params.py b/src/cloudflare/types/realtime_kit/meeting_get_params.py
new file mode 100644
index 00000000000..4cf938f1ed9
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_get_params.py
@@ -0,0 +1,37 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["MeetingGetParams"]
+
+
+class MeetingGetParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    end_time: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """The end time range for which you want to retrieve the meetings.
+
+    The time must be specified in ISO format.
+    """
+
+    page_no: float
+    """The page number from which you want your page search results to be displayed."""
+
+    per_page: float
+    """Number of results per page"""
+
+    search: str
+    """The search query string. You can search using the meeting ID or title."""
+
+    start_time: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """The start time range for which you want to retrieve the meetings.
+
+    The time must be specified in ISO format.
+    """
diff --git a/src/cloudflare/types/realtime_kit/meeting_get_response.py b/src/cloudflare/types/realtime_kit/meeting_get_response.py
new file mode 100644
index 00000000000..d94a2a14a4a
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_get_response.py
@@ -0,0 +1,70 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["MeetingGetResponse", "Data", "Paging"]
+
+
+class Data(BaseModel):
+    id: str
+    """ID of the meeting."""
+
+    created_at: datetime
+    """Timestamp the object was created at. The time is returned in ISO format."""
+
+    updated_at: datetime
+    """Timestamp the object was updated at. The time is returned in ISO format."""
+
+    live_stream_on_start: Optional[bool] = None
+    """Specifies if the meeting should start getting livestreamed on start."""
+
+    persist_chat: Optional[bool] = None
+    """Specifies if Chat within a meeting should persist for a week."""
+
+    record_on_start: Optional[bool] = None
+    """
+    Specifies if the meeting should start getting recorded as soon as someone joins
+    the meeting.
+    """
+
+    session_keep_alive_time_in_secs: Optional[float] = None
+    """
+    Time in seconds, for which a session remains active, after the last participant
+    has left the meeting.
+    """
+
+    status: Optional[Literal["ACTIVE", "INACTIVE"]] = None
+    """Whether the meeting is `ACTIVE` or `INACTIVE`.
+
+    Users will not be able to join an `INACTIVE` meeting.
+    """
+
+    summarize_on_end: Optional[bool] = None
+    """Automatically generate summary of meetings using transcripts.
+
+    Requires Transcriptions to be enabled, and can be retrieved via Webhooks or
+    summary API.
+    """
+
+    title: Optional[str] = None
+    """Title of the meeting."""
+
+
+class Paging(BaseModel):
+    end_offset: float
+
+    start_offset: float
+
+    total_count: float
+
+
+class MeetingGetResponse(BaseModel):
+    data: List[Data]
+
+    paging: Paging
+
+    success: bool
diff --git a/src/cloudflare/types/realtime_kit/meeting_refresh_participant_token_response.py b/src/cloudflare/types/realtime_kit/meeting_refresh_participant_token_response.py
new file mode 100644
index 00000000000..a1658fb5f1a
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_refresh_participant_token_response.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["MeetingRefreshParticipantTokenResponse", "Data"]
+
+
+class Data(BaseModel):
+    """Data returned by the operation"""
+
+    token: str
+    """Regenerated participant's authentication token."""
+
+
+class MeetingRefreshParticipantTokenResponse(BaseModel):
+    data: Data
+    """Data returned by the operation"""
+
+    success: bool
+    """Success status of the operation"""
diff --git a/src/cloudflare/types/realtime_kit/meeting_replace_meeting_by_id_params.py b/src/cloudflare/types/realtime_kit/meeting_replace_meeting_by_id_params.py
new file mode 100644
index 00000000000..ddc84a3ef07
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_replace_meeting_by_id_params.py
@@ -0,0 +1,274 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = [
+    "MeetingReplaceMeetingByIDParams",
+    "AIConfig",
+    "AIConfigSummarization",
+    "AIConfigTranscription",
+    "RecordingConfig",
+    "RecordingConfigAudioConfig",
+    "RecordingConfigLiveStreamingConfig",
+    "RecordingConfigRealtimekitBucketConfig",
+    "RecordingConfigStorageConfig",
+    "RecordingConfigVideoConfig",
+    "RecordingConfigVideoConfigWatermark",
+    "RecordingConfigVideoConfigWatermarkSize",
+]
+
+
+class MeetingReplaceMeetingByIDParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    app_id: Required[str]
+    """The app identifier tag."""
+
+    ai_config: AIConfig
+    """
+    The AI Config allows you to customize the behavior of meeting transcriptions and
+    summaries
+    """
+
+    live_stream_on_start: Optional[bool]
+    """Specifies if the meeting should start getting livestreamed on start."""
+
+    persist_chat: bool
+    """
+    If a meeting is set to persist_chat, meeting chat would remain for a week within
+    the meeting space.
+    """
+
+    record_on_start: Optional[bool]
+    """
+    Specifies if the meeting should start getting recorded as soon as someone joins
+    the meeting.
+    """
+
+    recording_config: RecordingConfig
+    """Recording Configurations to be used for this meeting.
+
+    This level of configs takes higher preference over App level configs on the
+    RealtimeKit developer portal.
+    """
+
+    session_keep_alive_time_in_secs: float
+    """
+    Time in seconds, for which a session remains active, after the last participant
+    has left the meeting.
+    """
+
+    summarize_on_end: bool
+    """Automatically generate summary of meetings using transcripts.
+
+    Requires Transcriptions to be enabled, and can be retrieved via Webhooks or
+    summary API.
+    """
+
+    title: Optional[str]
+    """Title of the meeting"""
+
+
+class AIConfigSummarization(TypedDict, total=False):
+    """Summary Config"""
+
+    summary_type: Literal[
+        "general",
+        "team_meeting",
+        "sales_call",
+        "client_check_in",
+        "interview",
+        "daily_standup",
+        "one_on_one_meeting",
+        "lecture",
+        "code_review",
+    ]
+    """Defines the style of the summary, such as general, team meeting, or sales call."""
+
+    text_format: Literal["plain_text", "markdown"]
+    """Determines the text format of the summary, such as plain text or markdown."""
+
+    word_limit: int
+    """Sets the maximum number of words in the meeting summary."""
+
+
+class AIConfigTranscription(TypedDict, total=False):
+    """Transcription Configurations"""
+
+    keywords: SequenceNotStr[str]
+    """Adds specific terms to improve accurate detection during transcription."""
+
+    language: Literal["en-US", "en-IN", "de", "hi", "sv", "ru", "pl", "el", "fr", "nl"]
+    """Specifies the language code for transcription to ensure accurate results."""
+
+    profanity_filter: bool
+    """Control the inclusion of offensive language in transcriptions."""
+
+
+class AIConfig(TypedDict, total=False):
+    """
+    The AI Config allows you to customize the behavior of meeting transcriptions and summaries
+    """
+
+    summarization: AIConfigSummarization
+    """Summary Config"""
+
+    transcription: AIConfigTranscription
+    """Transcription Configurations"""
+
+
+class RecordingConfigAudioConfig(TypedDict, total=False):
+    """Object containing configuration regarding the audio that is being recorded."""
+
+    channel: Literal["mono", "stereo"]
+    """Audio signal pathway within an audio file that carries a specific sound source."""
+
+    codec: Literal["MP3", "AAC"]
+    """Codec using which the recording will be encoded.
+
+    If VP8/VP9 is selected for videoConfig, changing audioConfig is not allowed. In
+    this case, the codec in the audioConfig is automatically set to vorbis.
+    """
+
+    export_file: bool
+    """Controls whether to export audio file seperately"""
+
+
+class RecordingConfigLiveStreamingConfig(TypedDict, total=False):
+    rtmp_url: str
+    """RTMP URL to stream to"""
+
+
+class RecordingConfigRealtimekitBucketConfig(TypedDict, total=False):
+    enabled: Required[bool]
+    """Controls whether recordings are uploaded to RealtimeKit's bucket.
+
+    If set to false, `download_url`, `audio_download_url`, `download_url_expiry`
+    won't be generated for a recording.
+    """
+
+
+class RecordingConfigStorageConfig(TypedDict, total=False):
+    type: Required[Literal["aws", "azure", "digitalocean", "gcs", "sftp"]]
+    """Type of storage media."""
+
+    access_key: str
+    """Access key of the storage medium.
+
+    Access key is not required for the `gcs` storage media type.
+
+    Note that this field is not readable by clients, only writeable.
+    """
+
+    auth_method: Literal["KEY", "PASSWORD"]
+    """Authentication method used for "sftp" type storage medium"""
+
+    bucket: str
+    """Name of the storage medium's bucket."""
+
+    host: str
+    """SSH destination server host for SFTP type storage medium"""
+
+    password: str
+    """
+    SSH destination server password for SFTP type storage medium when auth_method is
+    "PASSWORD". If auth_method is "KEY", this specifies the password for the ssh
+    private key.
+    """
+
+    path: str
+    """Path relative to the bucket root at which the recording will be placed."""
+
+    port: float
+    """SSH destination server port for SFTP type storage medium"""
+
+    private_key: str
+    """
+    Private key used to login to destination SSH server for SFTP type storage
+    medium, when auth_method used is "KEY"
+    """
+
+    region: str
+    """Region of the storage medium."""
+
+    secret: str
+    """Secret key of the storage medium.
+
+    Similar to `access_key`, it is only writeable by clients, not readable.
+    """
+
+    username: str
+    """SSH destination server username for SFTP type storage medium"""
+
+
+class RecordingConfigVideoConfigWatermarkSize(TypedDict, total=False):
+    """Size of the watermark"""
+
+    height: int
+    """Height of the watermark in px"""
+
+    width: int
+    """Width of the watermark in px"""
+
+
+class RecordingConfigVideoConfigWatermark(TypedDict, total=False):
+    """Watermark to be added to the recording"""
+
+    position: Literal["left top", "right top", "left bottom", "right bottom"]
+    """Position of the watermark"""
+
+    size: RecordingConfigVideoConfigWatermarkSize
+    """Size of the watermark"""
+
+    url: str
+    """URL of the watermark image"""
+
+
+class RecordingConfigVideoConfig(TypedDict, total=False):
+    codec: Literal["H264", "VP8"]
+    """Codec using which the recording will be encoded."""
+
+    export_file: bool
+    """Controls whether to export video file seperately"""
+
+    height: int
+    """Height of the recording video in pixels"""
+
+    watermark: RecordingConfigVideoConfigWatermark
+    """Watermark to be added to the recording"""
+
+    width: int
+    """Width of the recording video in pixels"""
+
+
+class RecordingConfig(TypedDict, total=False):
+    """Recording Configurations to be used for this meeting.
+
+    This level of configs takes higher preference over App level configs on the RealtimeKit developer portal.
+    """
+
+    audio_config: RecordingConfigAudioConfig
+    """Object containing configuration regarding the audio that is being recorded."""
+
+    file_name_prefix: str
+    """Adds a prefix to the beginning of the file name of the recording."""
+
+    live_streaming_config: RecordingConfigLiveStreamingConfig
+
+    max_seconds: float
+    """
+    Specifies the maximum duration for recording in seconds, ranging from a minimum
+    of 60 seconds to a maximum of 24 hours.
+    """
+
+    realtimekit_bucket_config: RecordingConfigRealtimekitBucketConfig
+
+    storage_config: Optional[RecordingConfigStorageConfig]
+
+    video_config: RecordingConfigVideoConfig
diff --git a/src/cloudflare/types/realtime_kit/meeting_replace_meeting_by_id_response.py b/src/cloudflare/types/realtime_kit/meeting_replace_meeting_by_id_response.py
new file mode 100644
index 00000000000..4b511873637
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_replace_meeting_by_id_response.py
@@ -0,0 +1,284 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "MeetingReplaceMeetingByIDResponse",
+    "Data",
+    "DataAIConfig",
+    "DataAIConfigSummarization",
+    "DataAIConfigTranscription",
+    "DataRecordingConfig",
+    "DataRecordingConfigAudioConfig",
+    "DataRecordingConfigLiveStreamingConfig",
+    "DataRecordingConfigRealtimekitBucketConfig",
+    "DataRecordingConfigStorageConfig",
+    "DataRecordingConfigVideoConfig",
+    "DataRecordingConfigVideoConfigWatermark",
+    "DataRecordingConfigVideoConfigWatermarkSize",
+]
+
+
+class DataAIConfigSummarization(BaseModel):
+    """Summary Config"""
+
+    summary_type: Optional[
+        Literal[
+            "general",
+            "team_meeting",
+            "sales_call",
+            "client_check_in",
+            "interview",
+            "daily_standup",
+            "one_on_one_meeting",
+            "lecture",
+            "code_review",
+        ]
+    ] = None
+    """Defines the style of the summary, such as general, team meeting, or sales call."""
+
+    text_format: Optional[Literal["plain_text", "markdown"]] = None
+    """Determines the text format of the summary, such as plain text or markdown."""
+
+    word_limit: Optional[int] = None
+    """Sets the maximum number of words in the meeting summary."""
+
+
+class DataAIConfigTranscription(BaseModel):
+    """Transcription Configurations"""
+
+    keywords: Optional[List[str]] = None
+    """Adds specific terms to improve accurate detection during transcription."""
+
+    language: Optional[Literal["en-US", "en-IN", "de", "hi", "sv", "ru", "pl", "el", "fr", "nl"]] = None
+    """Specifies the language code for transcription to ensure accurate results."""
+
+    profanity_filter: Optional[bool] = None
+    """Control the inclusion of offensive language in transcriptions."""
+
+
+class DataAIConfig(BaseModel):
+    """
+    The AI Config allows you to customize the behavior of meeting transcriptions and summaries
+    """
+
+    summarization: Optional[DataAIConfigSummarization] = None
+    """Summary Config"""
+
+    transcription: Optional[DataAIConfigTranscription] = None
+    """Transcription Configurations"""
+
+
+class DataRecordingConfigAudioConfig(BaseModel):
+    """Object containing configuration regarding the audio that is being recorded."""
+
+    channel: Optional[Literal["mono", "stereo"]] = None
+    """Audio signal pathway within an audio file that carries a specific sound source."""
+
+    codec: Optional[Literal["MP3", "AAC"]] = None
+    """Codec using which the recording will be encoded.
+
+    If VP8/VP9 is selected for videoConfig, changing audioConfig is not allowed. In
+    this case, the codec in the audioConfig is automatically set to vorbis.
+    """
+
+    export_file: Optional[bool] = None
+    """Controls whether to export audio file seperately"""
+
+
+class DataRecordingConfigLiveStreamingConfig(BaseModel):
+    rtmp_url: Optional[str] = None
+    """RTMP URL to stream to"""
+
+
+class DataRecordingConfigRealtimekitBucketConfig(BaseModel):
+    enabled: bool
+    """Controls whether recordings are uploaded to RealtimeKit's bucket.
+
+    If set to false, `download_url`, `audio_download_url`, `download_url_expiry`
+    won't be generated for a recording.
+    """
+
+
+class DataRecordingConfigStorageConfig(BaseModel):
+    type: Literal["aws", "azure", "digitalocean", "gcs", "sftp"]
+    """Type of storage media."""
+
+    auth_method: Optional[Literal["KEY", "PASSWORD"]] = None
+    """Authentication method used for "sftp" type storage medium"""
+
+    bucket: Optional[str] = None
+    """Name of the storage medium's bucket."""
+
+    host: Optional[str] = None
+    """SSH destination server host for SFTP type storage medium"""
+
+    password: Optional[str] = None
+    """
+    SSH destination server password for SFTP type storage medium when auth_method is
+    "PASSWORD". If auth_method is "KEY", this specifies the password for the ssh
+    private key.
+    """
+
+    path: Optional[str] = None
+    """Path relative to the bucket root at which the recording will be placed."""
+
+    port: Optional[float] = None
+    """SSH destination server port for SFTP type storage medium"""
+
+    private_key: Optional[str] = None
+    """
+    Private key used to login to destination SSH server for SFTP type storage
+    medium, when auth_method used is "KEY"
+    """
+
+    region: Optional[str] = None
+    """Region of the storage medium."""
+
+    secret: Optional[str] = None
+    """Secret key of the storage medium.
+
+    Similar to `access_key`, it is only writeable by clients, not readable.
+    """
+
+    username: Optional[str] = None
+    """SSH destination server username for SFTP type storage medium"""
+
+
+class DataRecordingConfigVideoConfigWatermarkSize(BaseModel):
+    """Size of the watermark"""
+
+    height: Optional[int] = None
+    """Height of the watermark in px"""
+
+    width: Optional[int] = None
+    """Width of the watermark in px"""
+
+
+class DataRecordingConfigVideoConfigWatermark(BaseModel):
+    """Watermark to be added to the recording"""
+
+    position: Optional[Literal["left top", "right top", "left bottom", "right bottom"]] = None
+    """Position of the watermark"""
+
+    size: Optional[DataRecordingConfigVideoConfigWatermarkSize] = None
+    """Size of the watermark"""
+
+    url: Optional[str] = None
+    """URL of the watermark image"""
+
+
+class DataRecordingConfigVideoConfig(BaseModel):
+    codec: Optional[Literal["H264", "VP8"]] = None
+    """Codec using which the recording will be encoded."""
+
+    export_file: Optional[bool] = None
+    """Controls whether to export video file seperately"""
+
+    height: Optional[int] = None
+    """Height of the recording video in pixels"""
+
+    watermark: Optional[DataRecordingConfigVideoConfigWatermark] = None
+    """Watermark to be added to the recording"""
+
+    width: Optional[int] = None
+    """Width of the recording video in pixels"""
+
+
+class DataRecordingConfig(BaseModel):
+    """Recording Configurations to be used for this meeting.
+
+    This level of configs takes higher preference over App level configs on the RealtimeKit developer portal.
+    """
+
+    audio_config: Optional[DataRecordingConfigAudioConfig] = None
+    """Object containing configuration regarding the audio that is being recorded."""
+
+    file_name_prefix: Optional[str] = None
+    """Adds a prefix to the beginning of the file name of the recording."""
+
+    live_streaming_config: Optional[DataRecordingConfigLiveStreamingConfig] = None
+
+    max_seconds: Optional[float] = None
+    """
+    Specifies the maximum duration for recording in seconds, ranging from a minimum
+    of 60 seconds to a maximum of 24 hours.
+    """
+
+    realtimekit_bucket_config: Optional[DataRecordingConfigRealtimekitBucketConfig] = None
+
+    storage_config: Optional[DataRecordingConfigStorageConfig] = None
+
+    video_config: Optional[DataRecordingConfigVideoConfig] = None
+
+
+class Data(BaseModel):
+    """Data returned by the operation"""
+
+    id: str
+    """ID of the meeting."""
+
+    created_at: datetime
+    """Timestamp the object was created at. The time is returned in ISO format."""
+
+    updated_at: datetime
+    """Timestamp the object was updated at. The time is returned in ISO format."""
+
+    ai_config: Optional[DataAIConfig] = None
+    """
+    The AI Config allows you to customize the behavior of meeting transcriptions and
+    summaries
+    """
+
+    live_stream_on_start: Optional[bool] = None
+    """Specifies if the meeting should start getting livestreamed on start."""
+
+    persist_chat: Optional[bool] = None
+    """Specifies if Chat within a meeting should persist for a week."""
+
+    record_on_start: Optional[bool] = None
+    """
+    Specifies if the meeting should start getting recorded as soon as someone joins
+    the meeting.
+    """
+
+    recording_config: Optional[DataRecordingConfig] = None
+    """Recording Configurations to be used for this meeting.
+
+    This level of configs takes higher preference over App level configs on the
+    RealtimeKit developer portal.
+    """
+
+    session_keep_alive_time_in_secs: Optional[float] = None
+    """
+    Time in seconds, for which a session remains active, after the last participant
+    has left the meeting.
+    """
+
+    status: Optional[Literal["ACTIVE", "INACTIVE"]] = None
+    """Whether the meeting is `ACTIVE` or `INACTIVE`.
+
+    Users will not be able to join an `INACTIVE` meeting.
+    """
+
+    summarize_on_end: Optional[bool] = None
+    """Automatically generate summary of meetings using transcripts.
+
+    Requires Transcriptions to be enabled, and can be retrieved via Webhooks or
+    summary API.
+    """
+
+    title: Optional[str] = None
+    """Title of the meeting."""
+
+
+class MeetingReplaceMeetingByIDResponse(BaseModel):
+    success: bool
+    """Success status of the operation"""
+
+    data: Optional[Data] = None
+    """Data returned by the operation"""
diff --git a/src/cloudflare/types/realtime_kit/meeting_update_meeting_by_id_params.py b/src/cloudflare/types/realtime_kit/meeting_update_meeting_by_id_params.py
new file mode 100644
index 00000000000..f58ca68b842
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_update_meeting_by_id_params.py
@@ -0,0 +1,108 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["MeetingUpdateMeetingByIDParams", "AIConfig", "AIConfigSummarization", "AIConfigTranscription"]
+
+
+class MeetingUpdateMeetingByIDParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    app_id: Required[str]
+    """The app identifier tag."""
+
+    ai_config: AIConfig
+    """
+    The AI Config allows you to customize the behavior of meeting transcriptions and
+    summaries
+    """
+
+    live_stream_on_start: bool
+    """Specifies if the meeting should start getting livestreamed on start."""
+
+    persist_chat: bool
+    """
+    If a meeting is updated to persist_chat, meeting chat would remain for a week
+    within the meeting space.
+    """
+
+    record_on_start: bool
+    """
+    Specifies if the meeting should start getting recorded as soon as someone joins
+    the meeting.
+    """
+
+    session_keep_alive_time_in_secs: float
+    """
+    Time in seconds, for which a session remains active, after the last participant
+    has left the meeting.
+    """
+
+    status: Literal["ACTIVE", "INACTIVE"]
+    """Whether the meeting is `ACTIVE` or `INACTIVE`.
+
+    Users will not be able to join an `INACTIVE` meeting.
+    """
+
+    summarize_on_end: bool
+    """Automatically generate summary of meetings using transcripts.
+
+    Requires Transcriptions to be enabled, and can be retrieved via Webhooks or
+    summary API.
+    """
+
+    title: str
+    """Title of the meeting"""
+
+
+class AIConfigSummarization(TypedDict, total=False):
+    """Summary Config"""
+
+    summary_type: Literal[
+        "general",
+        "team_meeting",
+        "sales_call",
+        "client_check_in",
+        "interview",
+        "daily_standup",
+        "one_on_one_meeting",
+        "lecture",
+        "code_review",
+    ]
+    """Defines the style of the summary, such as general, team meeting, or sales call."""
+
+    text_format: Literal["plain_text", "markdown"]
+    """Determines the text format of the summary, such as plain text or markdown."""
+
+    word_limit: int
+    """Sets the maximum number of words in the meeting summary."""
+
+
+class AIConfigTranscription(TypedDict, total=False):
+    """Transcription Configurations"""
+
+    keywords: SequenceNotStr[str]
+    """Adds specific terms to improve accurate detection during transcription."""
+
+    language: Literal["en-US", "en-IN", "de", "hi", "sv", "ru", "pl", "el", "fr", "nl"]
+    """Specifies the language code for transcription to ensure accurate results."""
+
+    profanity_filter: bool
+    """Control the inclusion of offensive language in transcriptions."""
+
+
+class AIConfig(TypedDict, total=False):
+    """
+    The AI Config allows you to customize the behavior of meeting transcriptions and summaries
+    """
+
+    summarization: AIConfigSummarization
+    """Summary Config"""
+
+    transcription: AIConfigTranscription
+    """Transcription Configurations"""
diff --git a/src/cloudflare/types/realtime_kit/meeting_update_meeting_by_id_response.py b/src/cloudflare/types/realtime_kit/meeting_update_meeting_by_id_response.py
new file mode 100644
index 00000000000..fd1fcb89f80
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/meeting_update_meeting_by_id_response.py
@@ -0,0 +1,284 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = [
+    "MeetingUpdateMeetingByIDResponse",
+    "Data",
+    "DataAIConfig",
+    "DataAIConfigSummarization",
+    "DataAIConfigTranscription",
+    "DataRecordingConfig",
+    "DataRecordingConfigAudioConfig",
+    "DataRecordingConfigLiveStreamingConfig",
+    "DataRecordingConfigRealtimekitBucketConfig",
+    "DataRecordingConfigStorageConfig",
+    "DataRecordingConfigVideoConfig",
+    "DataRecordingConfigVideoConfigWatermark",
+    "DataRecordingConfigVideoConfigWatermarkSize",
+]
+
+
+class DataAIConfigSummarization(BaseModel):
+    """Summary Config"""
+
+    summary_type: Optional[
+        Literal[
+            "general",
+            "team_meeting",
+            "sales_call",
+            "client_check_in",
+            "interview",
+            "daily_standup",
+            "one_on_one_meeting",
+            "lecture",
+            "code_review",
+        ]
+    ] = None
+    """Defines the style of the summary, such as general, team meeting, or sales call."""
+
+    text_format: Optional[Literal["plain_text", "markdown"]] = None
+    """Determines the text format of the summary, such as plain text or markdown."""
+
+    word_limit: Optional[int] = None
+    """Sets the maximum number of words in the meeting summary."""
+
+
+class DataAIConfigTranscription(BaseModel):
+    """Transcription Configurations"""
+
+    keywords: Optional[List[str]] = None
+    """Adds specific terms to improve accurate detection during transcription."""
+
+    language: Optional[Literal["en-US", "en-IN", "de", "hi", "sv", "ru", "pl", "el", "fr", "nl"]] = None
+    """Specifies the language code for transcription to ensure accurate results."""
+
+    profanity_filter: Optional[bool] = None
+    """Control the inclusion of offensive language in transcriptions."""
+
+
+class DataAIConfig(BaseModel):
+    """
+    The AI Config allows you to customize the behavior of meeting transcriptions and summaries
+    """
+
+    summarization: Optional[DataAIConfigSummarization] = None
+    """Summary Config"""
+
+    transcription: Optional[DataAIConfigTranscription] = None
+    """Transcription Configurations"""
+
+
+class DataRecordingConfigAudioConfig(BaseModel):
+    """Object containing configuration regarding the audio that is being recorded."""
+
+    channel: Optional[Literal["mono", "stereo"]] = None
+    """Audio signal pathway within an audio file that carries a specific sound source."""
+
+    codec: Optional[Literal["MP3", "AAC"]] = None
+    """Codec using which the recording will be encoded.
+
+    If VP8/VP9 is selected for videoConfig, changing audioConfig is not allowed. In
+    this case, the codec in the audioConfig is automatically set to vorbis.
+    """
+
+    export_file: Optional[bool] = None
+    """Controls whether to export audio file seperately"""
+
+
+class DataRecordingConfigLiveStreamingConfig(BaseModel):
+    rtmp_url: Optional[str] = None
+    """RTMP URL to stream to"""
+
+
+class DataRecordingConfigRealtimekitBucketConfig(BaseModel):
+    enabled: bool
+    """Controls whether recordings are uploaded to RealtimeKit's bucket.
+
+    If set to false, `download_url`, `audio_download_url`, `download_url_expiry`
+    won't be generated for a recording.
+    """
+
+
+class DataRecordingConfigStorageConfig(BaseModel):
+    type: Literal["aws", "azure", "digitalocean", "gcs", "sftp"]
+    """Type of storage media."""
+
+    auth_method: Optional[Literal["KEY", "PASSWORD"]] = None
+    """Authentication method used for "sftp" type storage medium"""
+
+    bucket: Optional[str] = None
+    """Name of the storage medium's bucket."""
+
+    host: Optional[str] = None
+    """SSH destination server host for SFTP type storage medium"""
+
+    password: Optional[str] = None
+    """
+    SSH destination server password for SFTP type storage medium when auth_method is
+    "PASSWORD". If auth_method is "KEY", this specifies the password for the ssh
+    private key.
+    """
+
+    path: Optional[str] = None
+    """Path relative to the bucket root at which the recording will be placed."""
+
+    port: Optional[float] = None
+    """SSH destination server port for SFTP type storage medium"""
+
+    private_key: Optional[str] = None
+    """
+    Private key used to login to destination SSH server for SFTP type storage
+    medium, when auth_method used is "KEY"
+    """
+
+    region: Optional[str] = None
+    """Region of the storage medium."""
+
+    secret: Optional[str] = None
+    """Secret key of the storage medium.
+
+    Similar to `access_key`, it is only writeable by clients, not readable.
+    """
+
+    username: Optional[str] = None
+    """SSH destination server username for SFTP type storage medium"""
+
+
+class DataRecordingConfigVideoConfigWatermarkSize(BaseModel):
+    """Size of the watermark"""
+
+    height: Optional[int] = None
+    """Height of the watermark in px"""
+
+    width: Optional[int] = None
+    """Width of the watermark in px"""
+
+
+class DataRecordingConfigVideoConfigWatermark(BaseModel):
+    """Watermark to be added to the recording"""
+
+    position: Optional[Literal["left top", "right top", "left bottom", "right bottom"]] = None
+    """Position of the watermark"""
+
+    size: Optional[DataRecordingConfigVideoConfigWatermarkSize] = None
+    """Size of the watermark"""
+
+    url: Optional[str] = None
+    """URL of the watermark image"""
+
+
+class DataRecordingConfigVideoConfig(BaseModel):
+    codec: Optional[Literal["H264", "VP8"]] = None
+    """Codec using which the recording will be encoded."""
+
+    export_file: Optional[bool] = None
+    """Controls whether to export video file seperately"""
+
+    height: Optional[int] = None
+    """Height of the recording video in pixels"""
+
+    watermark: Optional[DataRecordingConfigVideoConfigWatermark] = None
+    """Watermark to be added to the recording"""
+
+    width: Optional[int] = None
+    """Width of the recording video in pixels"""
+
+
+class DataRecordingConfig(BaseModel):
+    """Recording Configurations to be used for this meeting.
+
+    This level of configs takes higher preference over App level configs on the RealtimeKit developer portal.
+    """
+
+    audio_config: Optional[DataRecordingConfigAudioConfig] = None
+    """Object containing configuration regarding the audio that is being recorded."""
+
+    file_name_prefix: Optional[str] = None
+    """Adds a prefix to the beginning of the file name of the recording."""
+
+    live_streaming_config: Optional[DataRecordingConfigLiveStreamingConfig] = None
+
+    max_seconds: Optional[float] = None
+    """
+    Specifies the maximum duration for recording in seconds, ranging from a minimum
+    of 60 seconds to a maximum of 24 hours.
+    """
+
+    realtimekit_bucket_config: Optional[DataRecordingConfigRealtimekitBucketConfig] = None
+
+    storage_config: Optional[DataRecordingConfigStorageConfig] = None
+
+    video_config: Optional[DataRecordingConfigVideoConfig] = None
+
+
+class Data(BaseModel):
+    """Data returned by the operation"""
+
+    id: str
+    """ID of the meeting."""
+
+    created_at: datetime
+    """Timestamp the object was created at. The time is returned in ISO format."""
+
+    updated_at: datetime
+    """Timestamp the object was updated at. The time is returned in ISO format."""
+
+    ai_config: Optional[DataAIConfig] = None
+    """
+    The AI Config allows you to customize the behavior of meeting transcriptions and
+    summaries
+    """
+
+    live_stream_on_start: Optional[bool] = None
+    """Specifies if the meeting should start getting livestreamed on start."""
+
+    persist_chat: Optional[bool] = None
+    """Specifies if Chat within a meeting should persist for a week."""
+
+    record_on_start: Optional[bool] = None
+    """
+    Specifies if the meeting should start getting recorded as soon as someone joins
+    the meeting.
+    """
+
+    recording_config: Optional[DataRecordingConfig] = None
+    """Recording Configurations to be used for this meeting.
+
+    This level of configs takes higher preference over App level configs on the
+    RealtimeKit developer portal.
+    """
+
+    session_keep_alive_time_in_secs: Optional[float] = None
+    """
+    Time in seconds, for which a session remains active, after the last participant
+    has left the meeting.
+    """
+
+    status: Optional[Literal["ACTIVE", "INACTIVE"]] = None
+    """Whether the meeting is `ACTIVE` or `INACTIVE`.
+
+    Users will not be able to join an `INACTIVE` meeting.
+    """
+
+    summarize_on_end: Optional[bool] = None
+    """Automatically generate summary of meetings using transcripts.
+
+    Requires Transcriptions to be enabled, and can be retrieved via Webhooks or
+    summary API.
+    """
+
+    title: Optional[str] = None
+    """Title of the meeting."""
+
+
+class MeetingUpdateMeetingByIDResponse(BaseModel):
+    success: bool
+    """Success status of the operation"""
+
+    data: Optional[Data] = None
+    """Data returned by the operation"""
diff --git a/src/cloudflare/types/realtime_kit/preset_create_params.py b/src/cloudflare/types/realtime_kit/preset_create_params.py
new file mode 100644
index 00000000000..23fb7761a88
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/preset_create_params.py
@@ -0,0 +1,341 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = [
+    "PresetCreateParams",
+    "Config",
+    "ConfigMaxVideoStreams",
+    "ConfigMedia",
+    "ConfigMediaScreenshare",
+    "ConfigMediaVideo",
+    "ConfigMediaAudio",
+    "UI",
+    "UIDesignTokens",
+    "UIDesignTokensColors",
+    "UIDesignTokensColorsBackground",
+    "UIDesignTokensColorsBrand",
+    "Permissions",
+    "PermissionsChat",
+    "PermissionsChatPrivate",
+    "PermissionsChatPublic",
+    "PermissionsConnectedMeetings",
+    "PermissionsMedia",
+    "PermissionsMediaAudio",
+    "PermissionsMediaScreenshare",
+    "PermissionsMediaVideo",
+    "PermissionsPlugins",
+    "PermissionsPluginsConfig",
+    "PermissionsPluginsConfigUnionMember1",
+    "PermissionsPolls",
+]
+
+
+class PresetCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    config: Required[Config]
+
+    name: Required[str]
+    """Name of the preset"""
+
+    ui: Required[UI]
+
+    permissions: Permissions
+
+
+class ConfigMaxVideoStreams(TypedDict, total=False):
+    """Maximum number of streams that are visible on a device"""
+
+    desktop: Required[int]
+    """Maximum number of video streams visible on desktop devices"""
+
+    mobile: Required[int]
+    """Maximum number of streams visible on mobile devices"""
+
+
+class ConfigMediaScreenshare(TypedDict, total=False):
+    """Configuration options for participant screen shares"""
+
+    frame_rate: Required[int]
+    """Frame rate of screen share"""
+
+    quality: Required[Literal["hd", "vga", "qvga"]]
+    """Quality of screen share"""
+
+
+class ConfigMediaVideo(TypedDict, total=False):
+    """Configuration options for participant videos"""
+
+    frame_rate: Required[int]
+    """Frame rate of participants' video"""
+
+    quality: Required[Literal["hd", "vga", "qvga"]]
+    """Video quality of participants"""
+
+
+class ConfigMediaAudio(TypedDict, total=False):
+    """Control options for Audio quality."""
+
+    enable_high_bitrate: bool
+    """Enable High Quality Audio for your meetings"""
+
+    enable_stereo: bool
+    """Enable Stereo for your meetings"""
+
+
+class ConfigMedia(TypedDict, total=False):
+    """Media configuration options. eg: Video quality"""
+
+    screenshare: Required[ConfigMediaScreenshare]
+    """Configuration options for participant screen shares"""
+
+    video: Required[ConfigMediaVideo]
+    """Configuration options for participant videos"""
+
+    audio: ConfigMediaAudio
+    """Control options for Audio quality."""
+
+
+class Config(TypedDict, total=False):
+    max_screenshare_count: Required[int]
+    """Maximum number of screen shares that can be active at a given time"""
+
+    max_video_streams: Required[ConfigMaxVideoStreams]
+    """Maximum number of streams that are visible on a device"""
+
+    media: Required[ConfigMedia]
+    """Media configuration options. eg: Video quality"""
+
+    view_type: Required[Literal["GROUP_CALL", "WEBINAR", "AUDIO_ROOM"]]
+    """Type of the meeting"""
+
+
+class UIDesignTokensColorsBackground(TypedDict, total=False):
+    _1000: Required[Annotated[str, PropertyInfo(alias="1000")]]
+
+    _600: Required[Annotated[str, PropertyInfo(alias="600")]]
+
+    _700: Required[Annotated[str, PropertyInfo(alias="700")]]
+
+    _800: Required[Annotated[str, PropertyInfo(alias="800")]]
+
+    _900: Required[Annotated[str, PropertyInfo(alias="900")]]
+
+
+class UIDesignTokensColorsBrand(TypedDict, total=False):
+    _300: Required[Annotated[str, PropertyInfo(alias="300")]]
+
+    _400: Required[Annotated[str, PropertyInfo(alias="400")]]
+
+    _500: Required[Annotated[str, PropertyInfo(alias="500")]]
+
+    _600: Required[Annotated[str, PropertyInfo(alias="600")]]
+
+    _700: Required[Annotated[str, PropertyInfo(alias="700")]]
+
+
+class UIDesignTokensColors(TypedDict, total=False):
+    background: Required[UIDesignTokensColorsBackground]
+
+    brand: Required[UIDesignTokensColorsBrand]
+
+    danger: Required[str]
+
+    success: Required[str]
+
+    text: Required[str]
+
+    text_on_brand: Required[str]
+
+    video_bg: Required[str]
+
+    warning: Required[str]
+
+
+class UIDesignTokens(TypedDict, total=False):
+    border_radius: Required[Literal["rounded"]]
+
+    border_width: Required[Literal["thin"]]
+
+    colors: Required[UIDesignTokensColors]
+
+    logo: Required[str]
+
+    spacing_base: Required[float]
+
+    theme: Required[Literal["dark"]]
+
+
+class UI(TypedDict, total=False):
+    design_tokens: Required[UIDesignTokens]
+
+    config_diff: object
+
+
+class PermissionsChatPrivate(TypedDict, total=False):
+    can_receive: Required[bool]
+
+    can_send: Required[bool]
+
+    files: Required[bool]
+
+    text: Required[bool]
+
+
+class PermissionsChatPublic(TypedDict, total=False):
+    can_send: Required[bool]
+    """Can send messages in general"""
+
+    files: Required[bool]
+    """Can send file messages"""
+
+    text: Required[bool]
+    """Can send text messages"""
+
+
+class PermissionsChat(TypedDict, total=False):
+    """Chat permissions"""
+
+    private: Required[PermissionsChatPrivate]
+
+    public: Required[PermissionsChatPublic]
+
+
+class PermissionsConnectedMeetings(TypedDict, total=False):
+    can_alter_connected_meetings: Required[bool]
+
+    can_switch_connected_meetings: Required[bool]
+
+    can_switch_to_parent_meeting: Required[bool]
+
+
+class PermissionsMediaAudio(TypedDict, total=False):
+    """Audio permissions"""
+
+    can_produce: Required[Literal["ALLOWED", "NOT_ALLOWED", "CAN_REQUEST"]]
+    """Can produce audio"""
+
+
+class PermissionsMediaScreenshare(TypedDict, total=False):
+    """Screenshare permissions"""
+
+    can_produce: Required[Literal["ALLOWED", "NOT_ALLOWED", "CAN_REQUEST"]]
+    """Can produce screen share video"""
+
+
+class PermissionsMediaVideo(TypedDict, total=False):
+    """Video permissions"""
+
+    can_produce: Required[Literal["ALLOWED", "NOT_ALLOWED", "CAN_REQUEST"]]
+    """Can produce video"""
+
+
+class PermissionsMedia(TypedDict, total=False):
+    """Media permissions"""
+
+    audio: Required[PermissionsMediaAudio]
+    """Audio permissions"""
+
+    screenshare: Required[PermissionsMediaScreenshare]
+    """Screenshare permissions"""
+
+    video: Required[PermissionsMediaVideo]
+    """Video permissions"""
+
+
+class PermissionsPluginsConfigUnionMember1(TypedDict, total=False):
+    access_control: Required[Literal["FULL_ACCESS", "VIEW_ONLY"]]
+
+    handles_view_only: Required[bool]
+
+
+PermissionsPluginsConfig: TypeAlias = Union[str, PermissionsPluginsConfigUnionMember1]
+
+
+class PermissionsPlugins(TypedDict, total=False):
+    """Plugin permissions"""
+
+    can_close: Required[bool]
+    """Can close plugins that are already open"""
+
+    can_edit_config: Required[bool]
+    """Can edit plugin config"""
+
+    can_start: Required[bool]
+    """Can start plugins"""
+
+    config: Required[PermissionsPluginsConfig]
+
+
+class PermissionsPolls(TypedDict, total=False):
+    """Poll permissions"""
+
+    can_create: Required[bool]
+    """Can create polls"""
+
+    can_view: Required[bool]
+    """Can view polls"""
+
+    can_vote: Required[bool]
+    """Can vote on polls"""
+
+
+class Permissions(TypedDict, total=False):
+    accept_waiting_requests: Required[bool]
+    """Whether this participant can accept waiting requests"""
+
+    can_accept_production_requests: Required[bool]
+
+    can_change_participant_permissions: Required[bool]
+
+    can_edit_display_name: Required[bool]
+
+    can_livestream: Required[bool]
+
+    can_record: Required[bool]
+
+    can_spotlight: Required[bool]
+
+    chat: Required[PermissionsChat]
+    """Chat permissions"""
+
+    connected_meetings: Required[PermissionsConnectedMeetings]
+
+    disable_participant_audio: Required[bool]
+
+    disable_participant_screensharing: Required[bool]
+
+    disable_participant_video: Required[bool]
+
+    hidden_participant: Required[bool]
+    """Whether this participant is visible to others or not"""
+
+    kick_participant: Required[bool]
+
+    media: Required[PermissionsMedia]
+    """Media permissions"""
+
+    pin_participant: Required[bool]
+
+    plugins: Required[PermissionsPlugins]
+    """Plugin permissions"""
+
+    polls: Required[PermissionsPolls]
+    """Poll permissions"""
+
+    recorder_type: Required[Literal["RECORDER", "LIVESTREAMER", "NONE"]]
+    """Type of the recording peer"""
+
+    show_participant_list: Required[bool]
+
+    waiting_room_type: Required[Literal["SKIP", "ON_PRIVILEGED_USER_ENTRY", "SKIP_ON_ACCEPT"]]
+    """Waiting room type"""
+
+    is_recorder: bool
diff --git a/src/cloudflare/types/realtime_kit/preset_create_response.py b/src/cloudflare/types/realtime_kit/preset_create_response.py
new file mode 100644
index 00000000000..fe6ba28c7d0
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/preset_create_response.py
@@ -0,0 +1,352 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Union, Optional
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "PresetCreateResponse",
+    "Data",
+    "DataConfig",
+    "DataConfigMaxVideoStreams",
+    "DataConfigMedia",
+    "DataConfigMediaScreenshare",
+    "DataConfigMediaVideo",
+    "DataConfigMediaAudio",
+    "DataUI",
+    "DataUIDesignTokens",
+    "DataUIDesignTokensColors",
+    "DataUIDesignTokensColorsBackground",
+    "DataUIDesignTokensColorsBrand",
+    "DataPermissions",
+    "DataPermissionsChat",
+    "DataPermissionsChatPrivate",
+    "DataPermissionsChatPublic",
+    "DataPermissionsConnectedMeetings",
+    "DataPermissionsMedia",
+    "DataPermissionsMediaAudio",
+    "DataPermissionsMediaScreenshare",
+    "DataPermissionsMediaVideo",
+    "DataPermissionsPlugins",
+    "DataPermissionsPluginsConfig",
+    "DataPermissionsPluginsConfigUnionMember1",
+    "DataPermissionsPolls",
+]
+
+
+class DataConfigMaxVideoStreams(BaseModel):
+    """Maximum number of streams that are visible on a device"""
+
+    desktop: int
+    """Maximum number of video streams visible on desktop devices"""
+
+    mobile: int
+    """Maximum number of streams visible on mobile devices"""
+
+
+class DataConfigMediaScreenshare(BaseModel):
+    """Configuration options for participant screen shares"""
+
+    frame_rate: int
+    """Frame rate of screen share"""
+
+    quality: Literal["hd", "vga", "qvga"]
+    """Quality of screen share"""
+
+
+class DataConfigMediaVideo(BaseModel):
+    """Configuration options for participant videos"""
+
+    frame_rate: int
+    """Frame rate of participants' video"""
+
+    quality: Literal["hd", "vga", "qvga"]
+    """Video quality of participants"""
+
+
+class DataConfigMediaAudio(BaseModel):
+    """Control options for Audio quality."""
+
+    enable_high_bitrate: Optional[bool] = None
+    """Enable High Quality Audio for your meetings"""
+
+    enable_stereo: Optional[bool] = None
+    """Enable Stereo for your meetings"""
+
+
+class DataConfigMedia(BaseModel):
+    """Media configuration options. eg: Video quality"""
+
+    screenshare: DataConfigMediaScreenshare
+    """Configuration options for participant screen shares"""
+
+    video: DataConfigMediaVideo
+    """Configuration options for participant videos"""
+
+    audio: Optional[DataConfigMediaAudio] = None
+    """Control options for Audio quality."""
+
+
+class DataConfig(BaseModel):
+    max_screenshare_count: int
+    """Maximum number of screen shares that can be active at a given time"""
+
+    max_video_streams: DataConfigMaxVideoStreams
+    """Maximum number of streams that are visible on a device"""
+
+    media: DataConfigMedia
+    """Media configuration options. eg: Video quality"""
+
+    view_type: Literal["GROUP_CALL", "WEBINAR", "AUDIO_ROOM"]
+    """Type of the meeting"""
+
+
+class DataUIDesignTokensColorsBackground(BaseModel):
+    api_1000: str = FieldInfo(alias="1000")
+
+    api_600: str = FieldInfo(alias="600")
+
+    api_700: str = FieldInfo(alias="700")
+
+    api_800: str = FieldInfo(alias="800")
+
+    api_900: str = FieldInfo(alias="900")
+
+
+class DataUIDesignTokensColorsBrand(BaseModel):
+    api_300: str = FieldInfo(alias="300")
+
+    api_400: str = FieldInfo(alias="400")
+
+    api_500: str = FieldInfo(alias="500")
+
+    api_600: str = FieldInfo(alias="600")
+
+    api_700: str = FieldInfo(alias="700")
+
+
+class DataUIDesignTokensColors(BaseModel):
+    background: DataUIDesignTokensColorsBackground
+
+    brand: DataUIDesignTokensColorsBrand
+
+    danger: str
+
+    success: str
+
+    text: str
+
+    text_on_brand: str
+
+    video_bg: str
+
+    warning: str
+
+
+class DataUIDesignTokens(BaseModel):
+    border_radius: Literal["rounded"]
+
+    border_width: Literal["thin"]
+
+    colors: DataUIDesignTokensColors
+
+    logo: str
+
+    spacing_base: float
+
+    theme: Literal["dark"]
+
+
+class DataUI(BaseModel):
+    design_tokens: DataUIDesignTokens
+
+    config_diff: Optional[object] = None
+
+
+class DataPermissionsChatPrivate(BaseModel):
+    can_receive: bool
+
+    can_send: bool
+
+    files: bool
+
+    text: bool
+
+
+class DataPermissionsChatPublic(BaseModel):
+    can_send: bool
+    """Can send messages in general"""
+
+    files: bool
+    """Can send file messages"""
+
+    text: bool
+    """Can send text messages"""
+
+
+class DataPermissionsChat(BaseModel):
+    """Chat permissions"""
+
+    private: DataPermissionsChatPrivate
+
+    public: DataPermissionsChatPublic
+
+
+class DataPermissionsConnectedMeetings(BaseModel):
+    can_alter_connected_meetings: bool
+
+    can_switch_connected_meetings: bool
+
+    can_switch_to_parent_meeting: bool
+
+
+class DataPermissionsMediaAudio(BaseModel):
+    """Audio permissions"""
+
+    can_produce: Literal["ALLOWED", "NOT_ALLOWED", "CAN_REQUEST"]
+    """Can produce audio"""
+
+
+class DataPermissionsMediaScreenshare(BaseModel):
+    """Screenshare permissions"""
+
+    can_produce: Literal["ALLOWED", "NOT_ALLOWED", "CAN_REQUEST"]
+    """Can produce screen share video"""
+
+
+class DataPermissionsMediaVideo(BaseModel):
+    """Video permissions"""
+
+    can_produce: Literal["ALLOWED", "NOT_ALLOWED", "CAN_REQUEST"]
+    """Can produce video"""
+
+
+class DataPermissionsMedia(BaseModel):
+    """Media permissions"""
+
+    audio: DataPermissionsMediaAudio
+    """Audio permissions"""
+
+    screenshare: DataPermissionsMediaScreenshare
+    """Screenshare permissions"""
+
+    video: DataPermissionsMediaVideo
+    """Video permissions"""
+
+
+class DataPermissionsPluginsConfigUnionMember1(BaseModel):
+    access_control: Literal["FULL_ACCESS", "VIEW_ONLY"]
+
+    handles_view_only: bool
+
+
+DataPermissionsPluginsConfig: TypeAlias = Union[str, DataPermissionsPluginsConfigUnionMember1]
+
+
+class DataPermissionsPlugins(BaseModel):
+    """Plugin permissions"""
+
+    can_close: bool
+    """Can close plugins that are already open"""
+
+    can_edit_config: bool
+    """Can edit plugin config"""
+
+    can_start: bool
+    """Can start plugins"""
+
+    config: DataPermissionsPluginsConfig
+
+
+class DataPermissionsPolls(BaseModel):
+    """Poll permissions"""
+
+    can_create: bool
+    """Can create polls"""
+
+    can_view: bool
+    """Can view polls"""
+
+    can_vote: bool
+    """Can vote on polls"""
+
+
+class DataPermissions(BaseModel):
+    accept_waiting_requests: bool
+    """Whether this participant can accept waiting requests"""
+
+    can_accept_production_requests: bool
+
+    can_change_participant_permissions: bool
+
+    can_edit_display_name: bool
+
+    can_livestream: bool
+
+    can_record: bool
+
+    can_spotlight: bool
+
+    chat: DataPermissionsChat
+    """Chat permissions"""
+
+    connected_meetings: DataPermissionsConnectedMeetings
+
+    disable_participant_audio: bool
+
+    disable_participant_screensharing: bool
+
+    disable_participant_video: bool
+
+    hidden_participant: bool
+    """Whether this participant is visible to others or not"""
+
+    kick_participant: bool
+
+    media: DataPermissionsMedia
+    """Media permissions"""
+
+    pin_participant: bool
+
+    plugins: DataPermissionsPlugins
+    """Plugin permissions"""
+
+    polls: DataPermissionsPolls
+    """Poll permissions"""
+
+    recorder_type: Literal["RECORDER", "LIVESTREAMER", "NONE"]
+    """Type of the recording peer"""
+
+    show_participant_list: bool
+
+    waiting_room_type: Literal["SKIP", "ON_PRIVILEGED_USER_ENTRY", "SKIP_ON_ACCEPT"]
+    """Waiting room type"""
+
+    is_recorder: Optional[bool] = None
+
+
+class Data(BaseModel):
+    """Data returned by the operation"""
+
+    id: str
+    """ID of the preset"""
+
+    config: DataConfig
+
+    name: str
+    """Name of the preset"""
+
+    ui: DataUI
+
+    permissions: Optional[DataPermissions] = None
+
+
+class PresetCreateResponse(BaseModel):
+    data: Data
+    """Data returned by the operation"""
+
+    success: bool
+    """Success status of the operation"""
diff --git a/src/cloudflare/types/realtime_kit/preset_delete_response.py b/src/cloudflare/types/realtime_kit/preset_delete_response.py
new file mode 100644
index 00000000000..6682cdc5628
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/preset_delete_response.py
@@ -0,0 +1,352 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Union, Optional
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "PresetDeleteResponse",
+    "Data",
+    "DataConfig",
+    "DataConfigMaxVideoStreams",
+    "DataConfigMedia",
+    "DataConfigMediaScreenshare",
+    "DataConfigMediaVideo",
+    "DataConfigMediaAudio",
+    "DataUI",
+    "DataUIDesignTokens",
+    "DataUIDesignTokensColors",
+    "DataUIDesignTokensColorsBackground",
+    "DataUIDesignTokensColorsBrand",
+    "DataPermissions",
+    "DataPermissionsChat",
+    "DataPermissionsChatPrivate",
+    "DataPermissionsChatPublic",
+    "DataPermissionsConnectedMeetings",
+    "DataPermissionsMedia",
+    "DataPermissionsMediaAudio",
+    "DataPermissionsMediaScreenshare",
+    "DataPermissionsMediaVideo",
+    "DataPermissionsPlugins",
+    "DataPermissionsPluginsConfig",
+    "DataPermissionsPluginsConfigUnionMember1",
+    "DataPermissionsPolls",
+]
+
+
+class DataConfigMaxVideoStreams(BaseModel):
+    """Maximum number of streams that are visible on a device"""
+
+    desktop: int
+    """Maximum number of video streams visible on desktop devices"""
+
+    mobile: int
+    """Maximum number of streams visible on mobile devices"""
+
+
+class DataConfigMediaScreenshare(BaseModel):
+    """Configuration options for participant screen shares"""
+
+    frame_rate: int
+    """Frame rate of screen share"""
+
+    quality: Literal["hd", "vga", "qvga"]
+    """Quality of screen share"""
+
+
+class DataConfigMediaVideo(BaseModel):
+    """Configuration options for participant videos"""
+
+    frame_rate: int
+    """Frame rate of participants' video"""
+
+    quality: Literal["hd", "vga", "qvga"]
+    """Video quality of participants"""
+
+
+class DataConfigMediaAudio(BaseModel):
+    """Control options for Audio quality."""
+
+    enable_high_bitrate: Optional[bool] = None
+    """Enable High Quality Audio for your meetings"""
+
+    enable_stereo: Optional[bool] = None
+    """Enable Stereo for your meetings"""
+
+
+class DataConfigMedia(BaseModel):
+    """Media configuration options. eg: Video quality"""
+
+    screenshare: DataConfigMediaScreenshare
+    """Configuration options for participant screen shares"""
+
+    video: DataConfigMediaVideo
+    """Configuration options for participant videos"""
+
+    audio: Optional[DataConfigMediaAudio] = None
+    """Control options for Audio quality."""
+
+
+class DataConfig(BaseModel):
+    max_screenshare_count: int
+    """Maximum number of screen shares that can be active at a given time"""
+
+    max_video_streams: DataConfigMaxVideoStreams
+    """Maximum number of streams that are visible on a device"""
+
+    media: DataConfigMedia
+    """Media configuration options. eg: Video quality"""
+
+    view_type: Literal["GROUP_CALL", "WEBINAR", "AUDIO_ROOM"]
+    """Type of the meeting"""
+
+
+class DataUIDesignTokensColorsBackground(BaseModel):
+    api_1000: str = FieldInfo(alias="1000")
+
+    api_600: str = FieldInfo(alias="600")
+
+    api_700: str = FieldInfo(alias="700")
+
+    api_800: str = FieldInfo(alias="800")
+
+    api_900: str = FieldInfo(alias="900")
+
+
+class DataUIDesignTokensColorsBrand(BaseModel):
+    api_300: str = FieldInfo(alias="300")
+
+    api_400: str = FieldInfo(alias="400")
+
+    api_500: str = FieldInfo(alias="500")
+
+    api_600: str = FieldInfo(alias="600")
+
+    api_700: str = FieldInfo(alias="700")
+
+
+class DataUIDesignTokensColors(BaseModel):
+    background: DataUIDesignTokensColorsBackground
+
+    brand: DataUIDesignTokensColorsBrand
+
+    danger: str
+
+    success: str
+
+    text: str
+
+    text_on_brand: str
+
+    video_bg: str
+
+    warning: str
+
+
+class DataUIDesignTokens(BaseModel):
+    border_radius: Literal["rounded"]
+
+    border_width: Literal["thin"]
+
+    colors: DataUIDesignTokensColors
+
+    logo: str
+
+    spacing_base: float
+
+    theme: Literal["dark"]
+
+
+class DataUI(BaseModel):
+    design_tokens: DataUIDesignTokens
+
+    config_diff: Optional[object] = None
+
+
+class DataPermissionsChatPrivate(BaseModel):
+    can_receive: bool
+
+    can_send: bool
+
+    files: bool
+
+    text: bool
+
+
+class DataPermissionsChatPublic(BaseModel):
+    can_send: bool
+    """Can send messages in general"""
+
+    files: bool
+    """Can send file messages"""
+
+    text: bool
+    """Can send text messages"""
+
+
+class DataPermissionsChat(BaseModel):
+    """Chat permissions"""
+
+    private: DataPermissionsChatPrivate
+
+    public: DataPermissionsChatPublic
+
+
+class DataPermissionsConnectedMeetings(BaseModel):
+    can_alter_connected_meetings: bool
+
+    can_switch_connected_meetings: bool
+
+    can_switch_to_parent_meeting: bool
+
+
+class DataPermissionsMediaAudio(BaseModel):
+    """Audio permissions"""
+
+    can_produce: Literal["ALLOWED", "NOT_ALLOWED", "CAN_REQUEST"]
+    """Can produce audio"""
+
+
+class DataPermissionsMediaScreenshare(BaseModel):
+    """Screenshare permissions"""
+
+    can_produce: Literal["ALLOWED", "NOT_ALLOWED", "CAN_REQUEST"]
+    """Can produce screen share video"""
+
+
+class DataPermissionsMediaVideo(BaseModel):
+    """Video permissions"""
+
+    can_produce: Literal["ALLOWED", "NOT_ALLOWED", "CAN_REQUEST"]
+    """Can produce video"""
+
+
+class DataPermissionsMedia(BaseModel):
+    """Media permissions"""
+
+    audio: DataPermissionsMediaAudio
+    """Audio permissions"""
+
+    screenshare: DataPermissionsMediaScreenshare
+    """Screenshare permissions"""
+
+    video: DataPermissionsMediaVideo
+    """Video permissions"""
+
+
+class DataPermissionsPluginsConfigUnionMember1(BaseModel):
+    access_control: Literal["FULL_ACCESS", "VIEW_ONLY"]
+
+    handles_view_only: bool
+
+
+DataPermissionsPluginsConfig: TypeAlias = Union[str, DataPermissionsPluginsConfigUnionMember1]
+
+
+class DataPermissionsPlugins(BaseModel):
+    """Plugin permissions"""
+
+    can_close: bool
+    """Can close plugins that are already open"""
+
+    can_edit_config: bool
+    """Can edit plugin config"""
+
+    can_start: bool
+    """Can start plugins"""
+
+    config: DataPermissionsPluginsConfig
+
+
+class DataPermissionsPolls(BaseModel):
+    """Poll permissions"""
+
+    can_create: bool
+    """Can create polls"""
+
+    can_view: bool
+    """Can view polls"""
+
+    can_vote: bool
+    """Can vote on polls"""
+
+
+class DataPermissions(BaseModel):
+    accept_waiting_requests: bool
+    """Whether this participant can accept waiting requests"""
+
+    can_accept_production_requests: bool
+
+    can_change_participant_permissions: bool
+
+    can_edit_display_name: bool
+
+    can_livestream: bool
+
+    can_record: bool
+
+    can_spotlight: bool
+
+    chat: DataPermissionsChat
+    """Chat permissions"""
+
+    connected_meetings: DataPermissionsConnectedMeetings
+
+    disable_participant_audio: bool
+
+    disable_participant_screensharing: bool
+
+    disable_participant_video: bool
+
+    hidden_participant: bool
+    """Whether this participant is visible to others or not"""
+
+    kick_participant: bool
+
+    media: DataPermissionsMedia
+    """Media permissions"""
+
+    pin_participant: bool
+
+    plugins: DataPermissionsPlugins
+    """Plugin permissions"""
+
+    polls: DataPermissionsPolls
+    """Poll permissions"""
+
+    recorder_type: Literal["RECORDER", "LIVESTREAMER", "NONE"]
+    """Type of the recording peer"""
+
+    show_participant_list: bool
+
+    waiting_room_type: Literal["SKIP", "ON_PRIVILEGED_USER_ENTRY", "SKIP_ON_ACCEPT"]
+    """Waiting room type"""
+
+    is_recorder: Optional[bool] = None
+
+
+class Data(BaseModel):
+    """Data returned by the operation"""
+
+    id: str
+    """ID of the preset"""
+
+    config: DataConfig
+
+    name: str
+    """Name of the preset"""
+
+    ui: DataUI
+
+    permissions: Optional[DataPermissions] = None
+
+
+class PresetDeleteResponse(BaseModel):
+    data: Data
+    """Data returned by the operation"""
+
+    success: bool
+    """Success status of the operation"""
diff --git a/src/cloudflare/types/realtime_kit/preset_get_params.py b/src/cloudflare/types/realtime_kit/preset_get_params.py
new file mode 100644
index 00000000000..c83295c7a61
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/preset_get_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["PresetGetParams"]
+
+
+class PresetGetParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    page_no: float
+    """The page number from which you want your page search results to be displayed."""
+
+    per_page: float
+    """Number of results per page"""
diff --git a/src/cloudflare/types/realtime_kit/preset_get_preset_by_id_response.py b/src/cloudflare/types/realtime_kit/preset_get_preset_by_id_response.py
new file mode 100644
index 00000000000..42624b70061
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/preset_get_preset_by_id_response.py
@@ -0,0 +1,352 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Union, Optional
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "PresetGetPresetByIDResponse",
+    "Data",
+    "DataConfig",
+    "DataConfigMaxVideoStreams",
+    "DataConfigMedia",
+    "DataConfigMediaScreenshare",
+    "DataConfigMediaVideo",
+    "DataConfigMediaAudio",
+    "DataUI",
+    "DataUIDesignTokens",
+    "DataUIDesignTokensColors",
+    "DataUIDesignTokensColorsBackground",
+    "DataUIDesignTokensColorsBrand",
+    "DataPermissions",
+    "DataPermissionsChat",
+    "DataPermissionsChatPrivate",
+    "DataPermissionsChatPublic",
+    "DataPermissionsConnectedMeetings",
+    "DataPermissionsMedia",
+    "DataPermissionsMediaAudio",
+    "DataPermissionsMediaScreenshare",
+    "DataPermissionsMediaVideo",
+    "DataPermissionsPlugins",
+    "DataPermissionsPluginsConfig",
+    "DataPermissionsPluginsConfigUnionMember1",
+    "DataPermissionsPolls",
+]
+
+
+class DataConfigMaxVideoStreams(BaseModel):
+    """Maximum number of streams that are visible on a device"""
+
+    desktop: int
+    """Maximum number of video streams visible on desktop devices"""
+
+    mobile: int
+    """Maximum number of streams visible on mobile devices"""
+
+
+class DataConfigMediaScreenshare(BaseModel):
+    """Configuration options for participant screen shares"""
+
+    frame_rate: int
+    """Frame rate of screen share"""
+
+    quality: Literal["hd", "vga", "qvga"]
+    """Quality of screen share"""
+
+
+class DataConfigMediaVideo(BaseModel):
+    """Configuration options for participant videos"""
+
+    frame_rate: int
+    """Frame rate of participants' video"""
+
+    quality: Literal["hd", "vga", "qvga"]
+    """Video quality of participants"""
+
+
+class DataConfigMediaAudio(BaseModel):
+    """Control options for Audio quality."""
+
+    enable_high_bitrate: Optional[bool] = None
+    """Enable High Quality Audio for your meetings"""
+
+    enable_stereo: Optional[bool] = None
+    """Enable Stereo for your meetings"""
+
+
+class DataConfigMedia(BaseModel):
+    """Media configuration options. eg: Video quality"""
+
+    screenshare: DataConfigMediaScreenshare
+    """Configuration options for participant screen shares"""
+
+    video: DataConfigMediaVideo
+    """Configuration options for participant videos"""
+
+    audio: Optional[DataConfigMediaAudio] = None
+    """Control options for Audio quality."""
+
+
+class DataConfig(BaseModel):
+    max_screenshare_count: int
+    """Maximum number of screen shares that can be active at a given time"""
+
+    max_video_streams: DataConfigMaxVideoStreams
+    """Maximum number of streams that are visible on a device"""
+
+    media: DataConfigMedia
+    """Media configuration options. eg: Video quality"""
+
+    view_type: Literal["GROUP_CALL", "WEBINAR", "AUDIO_ROOM"]
+    """Type of the meeting"""
+
+
+class DataUIDesignTokensColorsBackground(BaseModel):
+    api_1000: str = FieldInfo(alias="1000")
+
+    api_600: str = FieldInfo(alias="600")
+
+    api_700: str = FieldInfo(alias="700")
+
+    api_800: str = FieldInfo(alias="800")
+
+    api_900: str = FieldInfo(alias="900")
+
+
+class DataUIDesignTokensColorsBrand(BaseModel):
+    api_300: str = FieldInfo(alias="300")
+
+    api_400: str = FieldInfo(alias="400")
+
+    api_500: str = FieldInfo(alias="500")
+
+    api_600: str = FieldInfo(alias="600")
+
+    api_700: str = FieldInfo(alias="700")
+
+
+class DataUIDesignTokensColors(BaseModel):
+    background: DataUIDesignTokensColorsBackground
+
+    brand: DataUIDesignTokensColorsBrand
+
+    danger: str
+
+    success: str
+
+    text: str
+
+    text_on_brand: str
+
+    video_bg: str
+
+    warning: str
+
+
+class DataUIDesignTokens(BaseModel):
+    border_radius: Literal["rounded"]
+
+    border_width: Literal["thin"]
+
+    colors: DataUIDesignTokensColors
+
+    logo: str
+
+    spacing_base: float
+
+    theme: Literal["dark"]
+
+
+class DataUI(BaseModel):
+    design_tokens: DataUIDesignTokens
+
+    config_diff: Optional[object] = None
+
+
+class DataPermissionsChatPrivate(BaseModel):
+    can_receive: bool
+
+    can_send: bool
+
+    files: bool
+
+    text: bool
+
+
+class DataPermissionsChatPublic(BaseModel):
+    can_send: bool
+    """Can send messages in general"""
+
+    files: bool
+    """Can send file messages"""
+
+    text: bool
+    """Can send text messages"""
+
+
+class DataPermissionsChat(BaseModel):
+    """Chat permissions"""
+
+    private: DataPermissionsChatPrivate
+
+    public: DataPermissionsChatPublic
+
+
+class DataPermissionsConnectedMeetings(BaseModel):
+    can_alter_connected_meetings: bool
+
+    can_switch_connected_meetings: bool
+
+    can_switch_to_parent_meeting: bool
+
+
+class DataPermissionsMediaAudio(BaseModel):
+    """Audio permissions"""
+
+    can_produce: Literal["ALLOWED", "NOT_ALLOWED", "CAN_REQUEST"]
+    """Can produce audio"""
+
+
+class DataPermissionsMediaScreenshare(BaseModel):
+    """Screenshare permissions"""
+
+    can_produce: Literal["ALLOWED", "NOT_ALLOWED", "CAN_REQUEST"]
+    """Can produce screen share video"""
+
+
+class DataPermissionsMediaVideo(BaseModel):
+    """Video permissions"""
+
+    can_produce: Literal["ALLOWED", "NOT_ALLOWED", "CAN_REQUEST"]
+    """Can produce video"""
+
+
+class DataPermissionsMedia(BaseModel):
+    """Media permissions"""
+
+    audio: DataPermissionsMediaAudio
+    """Audio permissions"""
+
+    screenshare: DataPermissionsMediaScreenshare
+    """Screenshare permissions"""
+
+    video: DataPermissionsMediaVideo
+    """Video permissions"""
+
+
+class DataPermissionsPluginsConfigUnionMember1(BaseModel):
+    access_control: Literal["FULL_ACCESS", "VIEW_ONLY"]
+
+    handles_view_only: bool
+
+
+DataPermissionsPluginsConfig: TypeAlias = Union[str, DataPermissionsPluginsConfigUnionMember1]
+
+
+class DataPermissionsPlugins(BaseModel):
+    """Plugin permissions"""
+
+    can_close: bool
+    """Can close plugins that are already open"""
+
+    can_edit_config: bool
+    """Can edit plugin config"""
+
+    can_start: bool
+    """Can start plugins"""
+
+    config: DataPermissionsPluginsConfig
+
+
+class DataPermissionsPolls(BaseModel):
+    """Poll permissions"""
+
+    can_create: bool
+    """Can create polls"""
+
+    can_view: bool
+    """Can view polls"""
+
+    can_vote: bool
+    """Can vote on polls"""
+
+
+class DataPermissions(BaseModel):
+    accept_waiting_requests: bool
+    """Whether this participant can accept waiting requests"""
+
+    can_accept_production_requests: bool
+
+    can_change_participant_permissions: bool
+
+    can_edit_display_name: bool
+
+    can_livestream: bool
+
+    can_record: bool
+
+    can_spotlight: bool
+
+    chat: DataPermissionsChat
+    """Chat permissions"""
+
+    connected_meetings: DataPermissionsConnectedMeetings
+
+    disable_participant_audio: bool
+
+    disable_participant_screensharing: bool
+
+    disable_participant_video: bool
+
+    hidden_participant: bool
+    """Whether this participant is visible to others or not"""
+
+    kick_participant: bool
+
+    media: DataPermissionsMedia
+    """Media permissions"""
+
+    pin_participant: bool
+
+    plugins: DataPermissionsPlugins
+    """Plugin permissions"""
+
+    polls: DataPermissionsPolls
+    """Poll permissions"""
+
+    recorder_type: Literal["RECORDER", "LIVESTREAMER", "NONE"]
+    """Type of the recording peer"""
+
+    show_participant_list: bool
+
+    waiting_room_type: Literal["SKIP", "ON_PRIVILEGED_USER_ENTRY", "SKIP_ON_ACCEPT"]
+    """Waiting room type"""
+
+    is_recorder: Optional[bool] = None
+
+
+class Data(BaseModel):
+    """Data returned by the operation"""
+
+    id: str
+    """ID of the preset"""
+
+    config: DataConfig
+
+    name: str
+    """Name of the preset"""
+
+    ui: DataUI
+
+    permissions: Optional[DataPermissions] = None
+
+
+class PresetGetPresetByIDResponse(BaseModel):
+    data: Data
+    """Data returned by the operation"""
+
+    success: bool
+    """Success status of the operation"""
diff --git a/src/cloudflare/types/realtime_kit/preset_get_response.py b/src/cloudflare/types/realtime_kit/preset_get_response.py
new file mode 100644
index 00000000000..ba30cb8fb35
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/preset_get_response.py
@@ -0,0 +1,40 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["PresetGetResponse", "Data", "Paging"]
+
+
+class Data(BaseModel):
+    """Returned by Get All Presets route"""
+
+    id: Optional[str] = None
+    """ID of the preset"""
+
+    created_at: Optional[datetime] = None
+    """Timestamp this preset was created at"""
+
+    name: Optional[str] = None
+    """Name of the preset"""
+
+    updated_at: Optional[datetime] = None
+    """Timestamp this preset was last updated"""
+
+
+class Paging(BaseModel):
+    end_offset: float
+
+    start_offset: float
+
+    total_count: float
+
+
+class PresetGetResponse(BaseModel):
+    data: List[Data]
+
+    paging: Paging
+
+    success: bool
diff --git a/src/cloudflare/types/realtime_kit/preset_update_params.py b/src/cloudflare/types/realtime_kit/preset_update_params.py
new file mode 100644
index 00000000000..87da10b488f
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/preset_update_params.py
@@ -0,0 +1,330 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = [
+    "PresetUpdateParams",
+    "Config",
+    "ConfigMaxVideoStreams",
+    "ConfigMedia",
+    "ConfigMediaScreenshare",
+    "ConfigMediaVideo",
+    "Permissions",
+    "PermissionsChat",
+    "PermissionsChatPrivate",
+    "PermissionsChatPublic",
+    "PermissionsConnectedMeetings",
+    "PermissionsMedia",
+    "PermissionsMediaAudio",
+    "PermissionsMediaScreenshare",
+    "PermissionsMediaVideo",
+    "PermissionsPlugins",
+    "PermissionsPluginsConfig",
+    "PermissionsPluginsConfigUnionMember1",
+    "PermissionsPolls",
+    "UI",
+    "UIDesignTokens",
+    "UIDesignTokensColors",
+    "UIDesignTokensColorsBackground",
+    "UIDesignTokensColorsBrand",
+]
+
+
+class PresetUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    app_id: Required[str]
+    """The app identifier tag."""
+
+    config: Config
+
+    name: str
+    """Name of the preset"""
+
+    permissions: Permissions
+
+    ui: UI
+
+
+class ConfigMaxVideoStreams(TypedDict, total=False):
+    """Maximum number of streams that are visible on a device"""
+
+    desktop: int
+    """Maximum number of video streams visible on desktop devices"""
+
+    mobile: int
+    """Maximum number of streams visible on mobile devices"""
+
+
+class ConfigMediaScreenshare(TypedDict, total=False):
+    """Configuration options for participant screen shares"""
+
+    frame_rate: int
+    """Frame rate of screen share"""
+
+    quality: Literal["hd", "vga", "qvga"]
+    """Quality of screen share"""
+
+
+class ConfigMediaVideo(TypedDict, total=False):
+    """Configuration options for participant videos"""
+
+    frame_rate: int
+    """Frame rate of participants' video"""
+
+    quality: Literal["hd", "vga", "qvga"]
+    """Video quality of participants"""
+
+
+class ConfigMedia(TypedDict, total=False):
+    """Media configuration options. eg: Video quality"""
+
+    screenshare: ConfigMediaScreenshare
+    """Configuration options for participant screen shares"""
+
+    video: ConfigMediaVideo
+    """Configuration options for participant videos"""
+
+
+class Config(TypedDict, total=False):
+    max_screenshare_count: int
+    """Maximum number of screen shares that can be active at a given time"""
+
+    max_video_streams: ConfigMaxVideoStreams
+    """Maximum number of streams that are visible on a device"""
+
+    media: ConfigMedia
+    """Media configuration options. eg: Video quality"""
+
+    view_type: Literal["GROUP_CALL", "WEBINAR", "AUDIO_ROOM"]
+    """Type of the meeting"""
+
+
+class PermissionsChatPrivate(TypedDict, total=False):
+    can_receive: bool
+
+    can_send: bool
+
+    files: bool
+
+    text: bool
+
+
+class PermissionsChatPublic(TypedDict, total=False):
+    can_send: bool
+    """Can send messages in general"""
+
+    files: bool
+    """Can send file messages"""
+
+    text: bool
+    """Can send text messages"""
+
+
+class PermissionsChat(TypedDict, total=False):
+    """Chat permissions"""
+
+    private: PermissionsChatPrivate
+
+    public: PermissionsChatPublic
+
+
+class PermissionsConnectedMeetings(TypedDict, total=False):
+    can_alter_connected_meetings: bool
+
+    can_switch_connected_meetings: bool
+
+    can_switch_to_parent_meeting: bool
+
+
+class PermissionsMediaAudio(TypedDict, total=False):
+    """Audio permissions"""
+
+    can_produce: Literal["ALLOWED", "NOT_ALLOWED", "CAN_REQUEST"]
+    """Can produce audio"""
+
+
+class PermissionsMediaScreenshare(TypedDict, total=False):
+    """Screenshare permissions"""
+
+    can_produce: Literal["ALLOWED", "NOT_ALLOWED", "CAN_REQUEST"]
+    """Can produce screen share video"""
+
+
+class PermissionsMediaVideo(TypedDict, total=False):
+    """Video permissions"""
+
+    can_produce: Literal["ALLOWED", "NOT_ALLOWED", "CAN_REQUEST"]
+    """Can produce video"""
+
+
+class PermissionsMedia(TypedDict, total=False):
+    """Media permissions"""
+
+    audio: PermissionsMediaAudio
+    """Audio permissions"""
+
+    screenshare: PermissionsMediaScreenshare
+    """Screenshare permissions"""
+
+    video: PermissionsMediaVideo
+    """Video permissions"""
+
+
+class PermissionsPluginsConfigUnionMember1(TypedDict, total=False):
+    access_control: Literal["FULL_ACCESS", "VIEW_ONLY"]
+
+    handles_view_only: bool
+
+
+PermissionsPluginsConfig: TypeAlias = Union[str, PermissionsPluginsConfigUnionMember1]
+
+
+class PermissionsPlugins(TypedDict, total=False):
+    """Plugin permissions"""
+
+    can_close: bool
+    """Can close plugins that are already open"""
+
+    can_edit_config: bool
+    """Can edit plugin config"""
+
+    can_start: bool
+    """Can start plugins"""
+
+    config: PermissionsPluginsConfig
+
+
+class PermissionsPolls(TypedDict, total=False):
+    """Poll permissions"""
+
+    can_create: bool
+    """Can create polls"""
+
+    can_view: bool
+    """Can view polls"""
+
+    can_vote: bool
+    """Can vote on polls"""
+
+
+class Permissions(TypedDict, total=False):
+    accept_waiting_requests: bool
+    """Whether this participant can accept waiting requests"""
+
+    can_accept_production_requests: bool
+
+    can_change_participant_permissions: bool
+
+    can_edit_display_name: bool
+
+    can_livestream: bool
+
+    can_record: bool
+
+    can_spotlight: bool
+
+    chat: PermissionsChat
+    """Chat permissions"""
+
+    connected_meetings: PermissionsConnectedMeetings
+
+    disable_participant_audio: bool
+
+    disable_participant_screensharing: bool
+
+    disable_participant_video: bool
+
+    hidden_participant: bool
+    """Whether this participant is visible to others or not"""
+
+    is_recorder: bool
+
+    kick_participant: bool
+
+    media: PermissionsMedia
+    """Media permissions"""
+
+    pin_participant: bool
+
+    plugins: PermissionsPlugins
+    """Plugin permissions"""
+
+    polls: PermissionsPolls
+    """Poll permissions"""
+
+    recorder_type: Literal["RECORDER", "LIVESTREAMER", "NONE"]
+    """Type of the recording peer"""
+
+    show_participant_list: bool
+
+    waiting_room_type: Literal["SKIP", "ON_PRIVILEGED_USER_ENTRY", "SKIP_ON_ACCEPT"]
+    """Waiting room type"""
+
+
+class UIDesignTokensColorsBackground(TypedDict, total=False):
+    _1000: Annotated[str, PropertyInfo(alias="1000")]
+
+    _600: Annotated[str, PropertyInfo(alias="600")]
+
+    _700: Annotated[str, PropertyInfo(alias="700")]
+
+    _800: Annotated[str, PropertyInfo(alias="800")]
+
+    _900: Annotated[str, PropertyInfo(alias="900")]
+
+
+class UIDesignTokensColorsBrand(TypedDict, total=False):
+    _300: Annotated[str, PropertyInfo(alias="300")]
+
+    _400: Annotated[str, PropertyInfo(alias="400")]
+
+    _500: Annotated[str, PropertyInfo(alias="500")]
+
+    _600: Annotated[str, PropertyInfo(alias="600")]
+
+    _700: Annotated[str, PropertyInfo(alias="700")]
+
+
+class UIDesignTokensColors(TypedDict, total=False):
+    background: UIDesignTokensColorsBackground
+
+    brand: UIDesignTokensColorsBrand
+
+    danger: str
+
+    success: str
+
+    text: str
+
+    text_on_brand: str
+
+    video_bg: str
+
+    warning: str
+
+
+class UIDesignTokens(TypedDict, total=False):
+    border_radius: Literal["rounded"]
+
+    border_width: Literal["thin"]
+
+    colors: UIDesignTokensColors
+
+    logo: str
+
+    spacing_base: float
+
+    theme: Literal["dark"]
+
+
+class UI(TypedDict, total=False):
+    config_diff: object
+
+    design_tokens: UIDesignTokens
diff --git a/src/cloudflare/types/realtime_kit/preset_update_response.py b/src/cloudflare/types/realtime_kit/preset_update_response.py
new file mode 100644
index 00000000000..85f7e7982a0
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/preset_update_response.py
@@ -0,0 +1,352 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Union, Optional
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "PresetUpdateResponse",
+    "Data",
+    "DataConfig",
+    "DataConfigMaxVideoStreams",
+    "DataConfigMedia",
+    "DataConfigMediaScreenshare",
+    "DataConfigMediaVideo",
+    "DataConfigMediaAudio",
+    "DataUI",
+    "DataUIDesignTokens",
+    "DataUIDesignTokensColors",
+    "DataUIDesignTokensColorsBackground",
+    "DataUIDesignTokensColorsBrand",
+    "DataPermissions",
+    "DataPermissionsChat",
+    "DataPermissionsChatPrivate",
+    "DataPermissionsChatPublic",
+    "DataPermissionsConnectedMeetings",
+    "DataPermissionsMedia",
+    "DataPermissionsMediaAudio",
+    "DataPermissionsMediaScreenshare",
+    "DataPermissionsMediaVideo",
+    "DataPermissionsPlugins",
+    "DataPermissionsPluginsConfig",
+    "DataPermissionsPluginsConfigUnionMember1",
+    "DataPermissionsPolls",
+]
+
+
+class DataConfigMaxVideoStreams(BaseModel):
+    """Maximum number of streams that are visible on a device"""
+
+    desktop: int
+    """Maximum number of video streams visible on desktop devices"""
+
+    mobile: int
+    """Maximum number of streams visible on mobile devices"""
+
+
+class DataConfigMediaScreenshare(BaseModel):
+    """Configuration options for participant screen shares"""
+
+    frame_rate: int
+    """Frame rate of screen share"""
+
+    quality: Literal["hd", "vga", "qvga"]
+    """Quality of screen share"""
+
+
+class DataConfigMediaVideo(BaseModel):
+    """Configuration options for participant videos"""
+
+    frame_rate: int
+    """Frame rate of participants' video"""
+
+    quality: Literal["hd", "vga", "qvga"]
+    """Video quality of participants"""
+
+
+class DataConfigMediaAudio(BaseModel):
+    """Control options for Audio quality."""
+
+    enable_high_bitrate: Optional[bool] = None
+    """Enable High Quality Audio for your meetings"""
+
+    enable_stereo: Optional[bool] = None
+    """Enable Stereo for your meetings"""
+
+
+class DataConfigMedia(BaseModel):
+    """Media configuration options. eg: Video quality"""
+
+    screenshare: DataConfigMediaScreenshare
+    """Configuration options for participant screen shares"""
+
+    video: DataConfigMediaVideo
+    """Configuration options for participant videos"""
+
+    audio: Optional[DataConfigMediaAudio] = None
+    """Control options for Audio quality."""
+
+
+class DataConfig(BaseModel):
+    max_screenshare_count: int
+    """Maximum number of screen shares that can be active at a given time"""
+
+    max_video_streams: DataConfigMaxVideoStreams
+    """Maximum number of streams that are visible on a device"""
+
+    media: DataConfigMedia
+    """Media configuration options. eg: Video quality"""
+
+    view_type: Literal["GROUP_CALL", "WEBINAR", "AUDIO_ROOM"]
+    """Type of the meeting"""
+
+
+class DataUIDesignTokensColorsBackground(BaseModel):
+    api_1000: str = FieldInfo(alias="1000")
+
+    api_600: str = FieldInfo(alias="600")
+
+    api_700: str = FieldInfo(alias="700")
+
+    api_800: str = FieldInfo(alias="800")
+
+    api_900: str = FieldInfo(alias="900")
+
+
+class DataUIDesignTokensColorsBrand(BaseModel):
+    api_300: str = FieldInfo(alias="300")
+
+    api_400: str = FieldInfo(alias="400")
+
+    api_500: str = FieldInfo(alias="500")
+
+    api_600: str = FieldInfo(alias="600")
+
+    api_700: str = FieldInfo(alias="700")
+
+
+class DataUIDesignTokensColors(BaseModel):
+    background: DataUIDesignTokensColorsBackground
+
+    brand: DataUIDesignTokensColorsBrand
+
+    danger: str
+
+    success: str
+
+    text: str
+
+    text_on_brand: str
+
+    video_bg: str
+
+    warning: str
+
+
+class DataUIDesignTokens(BaseModel):
+    border_radius: Literal["rounded"]
+
+    border_width: Literal["thin"]
+
+    colors: DataUIDesignTokensColors
+
+    logo: str
+
+    spacing_base: float
+
+    theme: Literal["dark"]
+
+
+class DataUI(BaseModel):
+    design_tokens: DataUIDesignTokens
+
+    config_diff: Optional[object] = None
+
+
+class DataPermissionsChatPrivate(BaseModel):
+    can_receive: bool
+
+    can_send: bool
+
+    files: bool
+
+    text: bool
+
+
+class DataPermissionsChatPublic(BaseModel):
+    can_send: bool
+    """Can send messages in general"""
+
+    files: bool
+    """Can send file messages"""
+
+    text: bool
+    """Can send text messages"""
+
+
+class DataPermissionsChat(BaseModel):
+    """Chat permissions"""
+
+    private: DataPermissionsChatPrivate
+
+    public: DataPermissionsChatPublic
+
+
+class DataPermissionsConnectedMeetings(BaseModel):
+    can_alter_connected_meetings: bool
+
+    can_switch_connected_meetings: bool
+
+    can_switch_to_parent_meeting: bool
+
+
+class DataPermissionsMediaAudio(BaseModel):
+    """Audio permissions"""
+
+    can_produce: Literal["ALLOWED", "NOT_ALLOWED", "CAN_REQUEST"]
+    """Can produce audio"""
+
+
+class DataPermissionsMediaScreenshare(BaseModel):
+    """Screenshare permissions"""
+
+    can_produce: Literal["ALLOWED", "NOT_ALLOWED", "CAN_REQUEST"]
+    """Can produce screen share video"""
+
+
+class DataPermissionsMediaVideo(BaseModel):
+    """Video permissions"""
+
+    can_produce: Literal["ALLOWED", "NOT_ALLOWED", "CAN_REQUEST"]
+    """Can produce video"""
+
+
+class DataPermissionsMedia(BaseModel):
+    """Media permissions"""
+
+    audio: DataPermissionsMediaAudio
+    """Audio permissions"""
+
+    screenshare: DataPermissionsMediaScreenshare
+    """Screenshare permissions"""
+
+    video: DataPermissionsMediaVideo
+    """Video permissions"""
+
+
+class DataPermissionsPluginsConfigUnionMember1(BaseModel):
+    access_control: Literal["FULL_ACCESS", "VIEW_ONLY"]
+
+    handles_view_only: bool
+
+
+DataPermissionsPluginsConfig: TypeAlias = Union[str, DataPermissionsPluginsConfigUnionMember1]
+
+
+class DataPermissionsPlugins(BaseModel):
+    """Plugin permissions"""
+
+    can_close: bool
+    """Can close plugins that are already open"""
+
+    can_edit_config: bool
+    """Can edit plugin config"""
+
+    can_start: bool
+    """Can start plugins"""
+
+    config: DataPermissionsPluginsConfig
+
+
+class DataPermissionsPolls(BaseModel):
+    """Poll permissions"""
+
+    can_create: bool
+    """Can create polls"""
+
+    can_view: bool
+    """Can view polls"""
+
+    can_vote: bool
+    """Can vote on polls"""
+
+
+class DataPermissions(BaseModel):
+    accept_waiting_requests: bool
+    """Whether this participant can accept waiting requests"""
+
+    can_accept_production_requests: bool
+
+    can_change_participant_permissions: bool
+
+    can_edit_display_name: bool
+
+    can_livestream: bool
+
+    can_record: bool
+
+    can_spotlight: bool
+
+    chat: DataPermissionsChat
+    """Chat permissions"""
+
+    connected_meetings: DataPermissionsConnectedMeetings
+
+    disable_participant_audio: bool
+
+    disable_participant_screensharing: bool
+
+    disable_participant_video: bool
+
+    hidden_participant: bool
+    """Whether this participant is visible to others or not"""
+
+    kick_participant: bool
+
+    media: DataPermissionsMedia
+    """Media permissions"""
+
+    pin_participant: bool
+
+    plugins: DataPermissionsPlugins
+    """Plugin permissions"""
+
+    polls: DataPermissionsPolls
+    """Poll permissions"""
+
+    recorder_type: Literal["RECORDER", "LIVESTREAMER", "NONE"]
+    """Type of the recording peer"""
+
+    show_participant_list: bool
+
+    waiting_room_type: Literal["SKIP", "ON_PRIVILEGED_USER_ENTRY", "SKIP_ON_ACCEPT"]
+    """Waiting room type"""
+
+    is_recorder: Optional[bool] = None
+
+
+class Data(BaseModel):
+    """Data returned by the operation"""
+
+    id: str
+    """ID of the preset"""
+
+    config: DataConfig
+
+    name: str
+    """Name of the preset"""
+
+    ui: DataUI
+
+    permissions: Optional[DataPermissions] = None
+
+
+class PresetUpdateResponse(BaseModel):
+    data: Data
+    """Data returned by the operation"""
+
+    success: bool
+    """Success status of the operation"""
diff --git a/src/cloudflare/types/realtime_kit/recording_get_active_recordings_response.py b/src/cloudflare/types/realtime_kit/recording_get_active_recordings_response.py
new file mode 100644
index 00000000000..b3d47c42b9b
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/recording_get_active_recordings_response.py
@@ -0,0 +1,66 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["RecordingGetActiveRecordingsResponse", "Data"]
+
+
+class Data(BaseModel):
+    """Data returned by the operation"""
+
+    id: str
+    """ID of the recording"""
+
+    audio_download_url: Optional[str] = None
+    """
+    If the audio_config is passed, the URL for downloading the audio recording is
+    returned.
+    """
+
+    download_url: Optional[str] = None
+    """URL where the recording can be downloaded."""
+
+    download_url_expiry: Optional[datetime] = None
+    """Timestamp when the download URL expires."""
+
+    file_size: Optional[float] = None
+    """File size of the recording, in bytes."""
+
+    invoked_time: datetime
+    """Timestamp when this recording was invoked."""
+
+    output_file_name: str
+    """File name of the recording."""
+
+    session_id: Optional[str] = None
+    """ID of the meeting session this recording is for."""
+
+    started_time: Optional[datetime] = None
+    """Timestamp when this recording actually started after being invoked.
+
+    Usually a few seconds after `invoked_time`.
+    """
+
+    status: Literal["INVOKED", "RECORDING", "UPLOADING", "UPLOADED", "ERRORED", "PAUSED"]
+    """Current status of the recording."""
+
+    stopped_time: Optional[datetime] = None
+    """Timestamp when this recording was stopped.
+
+    Optional; is present only when the recording has actually been stopped.
+    """
+
+    recording_duration: Optional[int] = None
+    """Total recording time in seconds."""
+
+
+class RecordingGetActiveRecordingsResponse(BaseModel):
+    data: Data
+    """Data returned by the operation"""
+
+    success: bool
+    """Success status of the operation"""
diff --git a/src/cloudflare/types/realtime_kit/recording_get_one_recording_response.py b/src/cloudflare/types/realtime_kit/recording_get_one_recording_response.py
new file mode 100644
index 00000000000..d8f6e75105e
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/recording_get_one_recording_response.py
@@ -0,0 +1,175 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "RecordingGetOneRecordingResponse",
+    "Data",
+    "DataStartReason",
+    "DataStartReasonCaller",
+    "DataStopReason",
+    "DataStopReasonCaller",
+    "DataStorageConfig",
+]
+
+
+class DataStartReasonCaller(BaseModel):
+    name: Optional[str] = None
+    """Name of the user who started the recording."""
+
+    type: Optional[Literal["ORGANIZATION", "USER"]] = None
+    """The type can be an App or a user.
+
+    If the type is `user`, then only the `user_Id` and `name` are returned.
+    """
+
+    user_id: Optional[str] = FieldInfo(alias="user_Id", default=None)
+    """The user ID of the person who started the recording."""
+
+
+class DataStartReason(BaseModel):
+    caller: Optional[DataStartReasonCaller] = None
+
+    reason: Optional[Literal["API_CALL", "RECORD_ON_START"]] = None
+    """
+    Specifies if the recording was started using the "Start a Recording"API or using
+    the parameter RECORD_ON_START in the "Create a meeting" API.
+
+    If the recording is initiated using the "RECORD_ON_START" parameter, the user
+    details will not be populated.
+    """
+
+
+class DataStopReasonCaller(BaseModel):
+    name: Optional[str] = None
+    """Name of the user who stopped the recording."""
+
+    type: Optional[Literal["ORGANIZATION", "USER"]] = None
+    """The type can be an App or a user.
+
+    If the type is `user`, then only the `user_Id` and `name` are returned.
+    """
+
+    user_id: Optional[str] = FieldInfo(alias="user_Id", default=None)
+    """The user ID of the person who stopped the recording."""
+
+
+class DataStopReason(BaseModel):
+    caller: Optional[DataStopReasonCaller] = None
+
+    reason: Optional[Literal["API_CALL", "INTERNAL_ERROR", "ALL_PEERS_LEFT"]] = None
+    """Specifies the reason why the recording stopped."""
+
+
+class DataStorageConfig(BaseModel):
+    type: Literal["aws", "azure", "digitalocean", "gcs", "sftp"]
+    """Type of storage media."""
+
+    auth_method: Optional[Literal["KEY", "PASSWORD"]] = None
+    """Authentication method used for "sftp" type storage medium"""
+
+    bucket: Optional[str] = None
+    """Name of the storage medium's bucket."""
+
+    host: Optional[str] = None
+    """SSH destination server host for SFTP type storage medium"""
+
+    password: Optional[str] = None
+    """
+    SSH destination server password for SFTP type storage medium when auth_method is
+    "PASSWORD". If auth_method is "KEY", this specifies the password for the ssh
+    private key.
+    """
+
+    path: Optional[str] = None
+    """Path relative to the bucket root at which the recording will be placed."""
+
+    port: Optional[float] = None
+    """SSH destination server port for SFTP type storage medium"""
+
+    private_key: Optional[str] = None
+    """
+    Private key used to login to destination SSH server for SFTP type storage
+    medium, when auth_method used is "KEY"
+    """
+
+    region: Optional[str] = None
+    """Region of the storage medium."""
+
+    secret: Optional[str] = None
+    """Secret key of the storage medium.
+
+    Similar to `access_key`, it is only writeable by clients, not readable.
+    """
+
+    username: Optional[str] = None
+    """SSH destination server username for SFTP type storage medium"""
+
+
+class Data(BaseModel):
+    """Data returned by the operation"""
+
+    id: str
+    """ID of the recording"""
+
+    audio_download_url: Optional[str] = None
+    """
+    If the audio_config is passed, the URL for downloading the audio recording is
+    returned.
+    """
+
+    download_url: Optional[str] = None
+    """URL where the recording can be downloaded."""
+
+    download_url_expiry: Optional[datetime] = None
+    """Timestamp when the download URL expires."""
+
+    file_size: Optional[float] = None
+    """File size of the recording, in bytes."""
+
+    invoked_time: datetime
+    """Timestamp when this recording was invoked."""
+
+    output_file_name: str
+    """File name of the recording."""
+
+    session_id: Optional[str] = None
+    """ID of the meeting session this recording is for."""
+
+    started_time: Optional[datetime] = None
+    """Timestamp when this recording actually started after being invoked.
+
+    Usually a few seconds after `invoked_time`.
+    """
+
+    status: Literal["INVOKED", "RECORDING", "UPLOADING", "UPLOADED", "ERRORED", "PAUSED"]
+    """Current status of the recording."""
+
+    stopped_time: Optional[datetime] = None
+    """Timestamp when this recording was stopped.
+
+    Optional; is present only when the recording has actually been stopped.
+    """
+
+    recording_duration: Optional[int] = None
+    """Total recording time in seconds."""
+
+    start_reason: Optional[DataStartReason] = None
+
+    stop_reason: Optional[DataStopReason] = None
+
+    storage_config: Optional[DataStorageConfig] = None
+
+
+class RecordingGetOneRecordingResponse(BaseModel):
+    success: bool
+    """Success status of the operation"""
+
+    data: Optional[Data] = None
+    """Data returned by the operation"""
diff --git a/src/cloudflare/types/realtime_kit/recording_get_recordings_params.py b/src/cloudflare/types/realtime_kit/recording_get_recordings_params.py
new file mode 100644
index 00000000000..e6f658309f7
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/recording_get_recordings_params.py
@@ -0,0 +1,50 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["RecordingGetRecordingsParams"]
+
+
+class RecordingGetRecordingsParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    end_time: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """The end time range for which you want to retrieve the meetings.
+
+    The time must be specified in ISO format.
+    """
+
+    expired: bool
+    """If passed, only shows expired/non-expired recordings on RealtimeKit's bucket"""
+
+    meeting_id: str
+    """ID of a meeting. Optional. Will limit results to only this meeting if passed."""
+
+    page_no: float
+    """The page number from which you want your page search results to be displayed."""
+
+    per_page: float
+    """Number of results per page"""
+
+    search: str
+    """The search query string. You can search using the meeting ID or title."""
+
+    sort_by: Literal["invokedTime"]
+
+    sort_order: Literal["ASC", "DESC"]
+
+    start_time: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """The start time range for which you want to retrieve the meetings.
+
+    The time must be specified in ISO format.
+    """
+
+    status: List[Literal["INVOKED", "RECORDING", "UPLOADING", "UPLOADED"]]
+    """Filter by one or more recording status"""
diff --git a/src/cloudflare/types/realtime_kit/recording_get_recordings_response.py b/src/cloudflare/types/realtime_kit/recording_get_recordings_response.py
new file mode 100644
index 00000000000..e8b1db95dcc
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/recording_get_recordings_response.py
@@ -0,0 +1,166 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["RecordingGetRecordingsResponse", "Data", "DataMeeting", "DataStorageConfig", "Paging"]
+
+
+class DataMeeting(BaseModel):
+    id: str
+    """ID of the meeting."""
+
+    created_at: datetime
+    """Timestamp the object was created at. The time is returned in ISO format."""
+
+    updated_at: datetime
+    """Timestamp the object was updated at. The time is returned in ISO format."""
+
+    live_stream_on_start: Optional[bool] = None
+    """Specifies if the meeting should start getting livestreamed on start."""
+
+    persist_chat: Optional[bool] = None
+    """Specifies if Chat within a meeting should persist for a week."""
+
+    record_on_start: Optional[bool] = None
+    """
+    Specifies if the meeting should start getting recorded as soon as someone joins
+    the meeting.
+    """
+
+    session_keep_alive_time_in_secs: Optional[float] = None
+    """
+    Time in seconds, for which a session remains active, after the last participant
+    has left the meeting.
+    """
+
+    status: Optional[Literal["ACTIVE", "INACTIVE"]] = None
+    """Whether the meeting is `ACTIVE` or `INACTIVE`.
+
+    Users will not be able to join an `INACTIVE` meeting.
+    """
+
+    summarize_on_end: Optional[bool] = None
+    """Automatically generate summary of meetings using transcripts.
+
+    Requires Transcriptions to be enabled, and can be retrieved via Webhooks or
+    summary API.
+    """
+
+    title: Optional[str] = None
+    """Title of the meeting."""
+
+
+class DataStorageConfig(BaseModel):
+    type: Literal["aws", "azure", "digitalocean", "gcs", "sftp"]
+    """Type of storage media."""
+
+    auth_method: Optional[Literal["KEY", "PASSWORD"]] = None
+    """Authentication method used for "sftp" type storage medium"""
+
+    bucket: Optional[str] = None
+    """Name of the storage medium's bucket."""
+
+    host: Optional[str] = None
+    """SSH destination server host for SFTP type storage medium"""
+
+    password: Optional[str] = None
+    """
+    SSH destination server password for SFTP type storage medium when auth_method is
+    "PASSWORD". If auth_method is "KEY", this specifies the password for the ssh
+    private key.
+    """
+
+    path: Optional[str] = None
+    """Path relative to the bucket root at which the recording will be placed."""
+
+    port: Optional[float] = None
+    """SSH destination server port for SFTP type storage medium"""
+
+    private_key: Optional[str] = None
+    """
+    Private key used to login to destination SSH server for SFTP type storage
+    medium, when auth_method used is "KEY"
+    """
+
+    region: Optional[str] = None
+    """Region of the storage medium."""
+
+    secret: Optional[str] = None
+    """Secret key of the storage medium.
+
+    Similar to `access_key`, it is only writeable by clients, not readable.
+    """
+
+    username: Optional[str] = None
+    """SSH destination server username for SFTP type storage medium"""
+
+
+class Data(BaseModel):
+    id: str
+    """ID of the recording"""
+
+    audio_download_url: Optional[str] = None
+    """
+    If the audio_config is passed, the URL for downloading the audio recording is
+    returned.
+    """
+
+    download_url: Optional[str] = None
+    """URL where the recording can be downloaded."""
+
+    download_url_expiry: Optional[datetime] = None
+    """Timestamp when the download URL expires."""
+
+    file_size: Optional[float] = None
+    """File size of the recording, in bytes."""
+
+    invoked_time: datetime
+    """Timestamp when this recording was invoked."""
+
+    output_file_name: str
+    """File name of the recording."""
+
+    session_id: Optional[str] = None
+    """ID of the meeting session this recording is for."""
+
+    started_time: Optional[datetime] = None
+    """Timestamp when this recording actually started after being invoked.
+
+    Usually a few seconds after `invoked_time`.
+    """
+
+    status: Literal["INVOKED", "RECORDING", "UPLOADING", "UPLOADED", "ERRORED", "PAUSED"]
+    """Current status of the recording."""
+
+    stopped_time: Optional[datetime] = None
+    """Timestamp when this recording was stopped.
+
+    Optional; is present only when the recording has actually been stopped.
+    """
+
+    meeting: Optional[DataMeeting] = None
+
+    recording_duration: Optional[int] = None
+    """Total recording time in seconds."""
+
+    storage_config: Optional[DataStorageConfig] = None
+
+
+class Paging(BaseModel):
+    end_offset: float
+
+    start_offset: float
+
+    total_count: float
+
+
+class RecordingGetRecordingsResponse(BaseModel):
+    data: List[Data]
+
+    paging: Paging
+
+    success: bool
diff --git a/src/cloudflare/types/realtime_kit/recording_pause_resume_stop_recording_params.py b/src/cloudflare/types/realtime_kit/recording_pause_resume_stop_recording_params.py
new file mode 100644
index 00000000000..5d1e37a20ff
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/recording_pause_resume_stop_recording_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["RecordingPauseResumeStopRecordingParams"]
+
+
+class RecordingPauseResumeStopRecordingParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    app_id: Required[str]
+
+    action: Required[Literal["stop", "pause", "resume"]]
diff --git a/src/cloudflare/types/realtime_kit/recording_pause_resume_stop_recording_response.py b/src/cloudflare/types/realtime_kit/recording_pause_resume_stop_recording_response.py
new file mode 100644
index 00000000000..ca32b68bac5
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/recording_pause_resume_stop_recording_response.py
@@ -0,0 +1,175 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "RecordingPauseResumeStopRecordingResponse",
+    "Data",
+    "DataStartReason",
+    "DataStartReasonCaller",
+    "DataStopReason",
+    "DataStopReasonCaller",
+    "DataStorageConfig",
+]
+
+
+class DataStartReasonCaller(BaseModel):
+    name: Optional[str] = None
+    """Name of the user who started the recording."""
+
+    type: Optional[Literal["ORGANIZATION", "USER"]] = None
+    """The type can be an App or a user.
+
+    If the type is `user`, then only the `user_Id` and `name` are returned.
+    """
+
+    user_id: Optional[str] = FieldInfo(alias="user_Id", default=None)
+    """The user ID of the person who started the recording."""
+
+
+class DataStartReason(BaseModel):
+    caller: Optional[DataStartReasonCaller] = None
+
+    reason: Optional[Literal["API_CALL", "RECORD_ON_START"]] = None
+    """
+    Specifies if the recording was started using the "Start a Recording"API or using
+    the parameter RECORD_ON_START in the "Create a meeting" API.
+
+    If the recording is initiated using the "RECORD_ON_START" parameter, the user
+    details will not be populated.
+    """
+
+
+class DataStopReasonCaller(BaseModel):
+    name: Optional[str] = None
+    """Name of the user who stopped the recording."""
+
+    type: Optional[Literal["ORGANIZATION", "USER"]] = None
+    """The type can be an App or a user.
+
+    If the type is `user`, then only the `user_Id` and `name` are returned.
+    """
+
+    user_id: Optional[str] = FieldInfo(alias="user_Id", default=None)
+    """The user ID of the person who stopped the recording."""
+
+
+class DataStopReason(BaseModel):
+    caller: Optional[DataStopReasonCaller] = None
+
+    reason: Optional[Literal["API_CALL", "INTERNAL_ERROR", "ALL_PEERS_LEFT"]] = None
+    """Specifies the reason why the recording stopped."""
+
+
+class DataStorageConfig(BaseModel):
+    type: Literal["aws", "azure", "digitalocean", "gcs", "sftp"]
+    """Type of storage media."""
+
+    auth_method: Optional[Literal["KEY", "PASSWORD"]] = None
+    """Authentication method used for "sftp" type storage medium"""
+
+    bucket: Optional[str] = None
+    """Name of the storage medium's bucket."""
+
+    host: Optional[str] = None
+    """SSH destination server host for SFTP type storage medium"""
+
+    password: Optional[str] = None
+    """
+    SSH destination server password for SFTP type storage medium when auth_method is
+    "PASSWORD". If auth_method is "KEY", this specifies the password for the ssh
+    private key.
+    """
+
+    path: Optional[str] = None
+    """Path relative to the bucket root at which the recording will be placed."""
+
+    port: Optional[float] = None
+    """SSH destination server port for SFTP type storage medium"""
+
+    private_key: Optional[str] = None
+    """
+    Private key used to login to destination SSH server for SFTP type storage
+    medium, when auth_method used is "KEY"
+    """
+
+    region: Optional[str] = None
+    """Region of the storage medium."""
+
+    secret: Optional[str] = None
+    """Secret key of the storage medium.
+
+    Similar to `access_key`, it is only writeable by clients, not readable.
+    """
+
+    username: Optional[str] = None
+    """SSH destination server username for SFTP type storage medium"""
+
+
+class Data(BaseModel):
+    """Data returned by the operation"""
+
+    id: str
+    """ID of the recording"""
+
+    audio_download_url: Optional[str] = None
+    """
+    If the audio_config is passed, the URL for downloading the audio recording is
+    returned.
+    """
+
+    download_url: Optional[str] = None
+    """URL where the recording can be downloaded."""
+
+    download_url_expiry: Optional[datetime] = None
+    """Timestamp when the download URL expires."""
+
+    file_size: Optional[float] = None
+    """File size of the recording, in bytes."""
+
+    invoked_time: datetime
+    """Timestamp when this recording was invoked."""
+
+    output_file_name: str
+    """File name of the recording."""
+
+    session_id: Optional[str] = None
+    """ID of the meeting session this recording is for."""
+
+    started_time: Optional[datetime] = None
+    """Timestamp when this recording actually started after being invoked.
+
+    Usually a few seconds after `invoked_time`.
+    """
+
+    status: Literal["INVOKED", "RECORDING", "UPLOADING", "UPLOADED", "ERRORED", "PAUSED"]
+    """Current status of the recording."""
+
+    stopped_time: Optional[datetime] = None
+    """Timestamp when this recording was stopped.
+
+    Optional; is present only when the recording has actually been stopped.
+    """
+
+    recording_duration: Optional[int] = None
+    """Total recording time in seconds."""
+
+    start_reason: Optional[DataStartReason] = None
+
+    stop_reason: Optional[DataStopReason] = None
+
+    storage_config: Optional[DataStorageConfig] = None
+
+
+class RecordingPauseResumeStopRecordingResponse(BaseModel):
+    success: bool
+    """Success status of the operation"""
+
+    data: Optional[Data] = None
+    """Data returned by the operation"""
diff --git a/src/cloudflare/types/realtime_kit/recording_start_recordings_params.py b/src/cloudflare/types/realtime_kit/recording_start_recordings_params.py
new file mode 100644
index 00000000000..550a5b31e79
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/recording_start_recordings_params.py
@@ -0,0 +1,200 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = [
+    "RecordingStartRecordingsParams",
+    "AudioConfig",
+    "InteractiveConfig",
+    "RealtimekitBucketConfig",
+    "RtmpOutConfig",
+    "StorageConfig",
+    "VideoConfig",
+    "VideoConfigWatermark",
+    "VideoConfigWatermarkSize",
+]
+
+
+class RecordingStartRecordingsParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    allow_multiple_recordings: bool
+    """By default, a meeting allows only one recording to run at a time.
+
+    Enabling the `allow_multiple_recordings` parameter to true allows you to
+    initiate multiple recordings concurrently in the same meeting. This allows you
+    to record separate videos of the same meeting with different configurations,
+    such as portrait mode or landscape mode.
+    """
+
+    audio_config: AudioConfig
+    """Object containing configuration regarding the audio that is being recorded."""
+
+    file_name_prefix: str
+    """Update the recording file name."""
+
+    interactive_config: InteractiveConfig
+    """
+    Allows you to add timed metadata to your recordings, which are digital markers
+    inserted into a video file to provide contextual information at specific points
+    in the content range. The ID3 tags containing this information are available to
+    clients on the playback timeline in HLS format. The output files are generated
+    in a compressed .tar format.
+    """
+
+    max_seconds: int
+    """
+    Specifies the maximum duration for recording in seconds, ranging from a minimum
+    of 60 seconds to a maximum of 24 hours.
+    """
+
+    meeting_id: str
+    """ID of the meeting to record."""
+
+    realtimekit_bucket_config: RealtimekitBucketConfig
+
+    rtmp_out_config: RtmpOutConfig
+
+    storage_config: Optional[StorageConfig]
+
+    url: str
+    """Pass a custom url to record arbitary screen"""
+
+    video_config: VideoConfig
+
+
+class AudioConfig(TypedDict, total=False):
+    """Object containing configuration regarding the audio that is being recorded."""
+
+    channel: Literal["mono", "stereo"]
+    """Audio signal pathway within an audio file that carries a specific sound source."""
+
+    codec: Literal["MP3", "AAC"]
+    """Codec using which the recording will be encoded.
+
+    If VP8/VP9 is selected for videoConfig, changing audioConfig is not allowed. In
+    this case, the codec in the audioConfig is automatically set to vorbis.
+    """
+
+    export_file: bool
+    """Controls whether to export audio file seperately"""
+
+
+class InteractiveConfig(TypedDict, total=False):
+    """
+    Allows you to add timed metadata to your recordings, which are digital markers inserted into a video file to provide contextual information at specific points in the content range. The ID3 tags containing this information are available to clients on the playback timeline in HLS format. The output files are generated in a compressed .tar format.
+    """
+
+    type: Literal["ID3"]
+    """The metadata is presented in the form of ID3 tags."""
+
+
+class RealtimekitBucketConfig(TypedDict, total=False):
+    enabled: Required[bool]
+    """Controls whether recordings are uploaded to RealtimeKit's bucket.
+
+    If set to false, `download_url`, `audio_download_url`, `download_url_expiry`
+    won't be generated for a recording.
+    """
+
+
+class RtmpOutConfig(TypedDict, total=False):
+    rtmp_url: str
+    """RTMP URL to stream to"""
+
+
+class StorageConfig(TypedDict, total=False):
+    type: Required[Literal["aws", "azure", "digitalocean", "gcs", "sftp"]]
+    """Type of storage media."""
+
+    access_key: str
+    """Access key of the storage medium.
+
+    Access key is not required for the `gcs` storage media type.
+
+    Note that this field is not readable by clients, only writeable.
+    """
+
+    auth_method: Literal["KEY", "PASSWORD"]
+    """Authentication method used for "sftp" type storage medium"""
+
+    bucket: str
+    """Name of the storage medium's bucket."""
+
+    host: str
+    """SSH destination server host for SFTP type storage medium"""
+
+    password: str
+    """
+    SSH destination server password for SFTP type storage medium when auth_method is
+    "PASSWORD". If auth_method is "KEY", this specifies the password for the ssh
+    private key.
+    """
+
+    path: str
+    """Path relative to the bucket root at which the recording will be placed."""
+
+    port: float
+    """SSH destination server port for SFTP type storage medium"""
+
+    private_key: str
+    """
+    Private key used to login to destination SSH server for SFTP type storage
+    medium, when auth_method used is "KEY"
+    """
+
+    region: str
+    """Region of the storage medium."""
+
+    secret: str
+    """Secret key of the storage medium.
+
+    Similar to `access_key`, it is only writeable by clients, not readable.
+    """
+
+    username: str
+    """SSH destination server username for SFTP type storage medium"""
+
+
+class VideoConfigWatermarkSize(TypedDict, total=False):
+    """Size of the watermark"""
+
+    height: int
+    """Height of the watermark in px"""
+
+    width: int
+    """Width of the watermark in px"""
+
+
+class VideoConfigWatermark(TypedDict, total=False):
+    """Watermark to be added to the recording"""
+
+    position: Literal["left top", "right top", "left bottom", "right bottom"]
+    """Position of the watermark"""
+
+    size: VideoConfigWatermarkSize
+    """Size of the watermark"""
+
+    url: str
+    """URL of the watermark image"""
+
+
+class VideoConfig(TypedDict, total=False):
+    codec: Literal["H264", "VP8"]
+    """Codec using which the recording will be encoded."""
+
+    export_file: bool
+    """Controls whether to export video file seperately"""
+
+    height: int
+    """Height of the recording video in pixels"""
+
+    watermark: VideoConfigWatermark
+    """Watermark to be added to the recording"""
+
+    width: int
+    """Width of the recording video in pixels"""
diff --git a/src/cloudflare/types/realtime_kit/recording_start_recordings_response.py b/src/cloudflare/types/realtime_kit/recording_start_recordings_response.py
new file mode 100644
index 00000000000..8297665aa2b
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/recording_start_recordings_response.py
@@ -0,0 +1,175 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "RecordingStartRecordingsResponse",
+    "Data",
+    "DataStartReason",
+    "DataStartReasonCaller",
+    "DataStopReason",
+    "DataStopReasonCaller",
+    "DataStorageConfig",
+]
+
+
+class DataStartReasonCaller(BaseModel):
+    name: Optional[str] = None
+    """Name of the user who started the recording."""
+
+    type: Optional[Literal["ORGANIZATION", "USER"]] = None
+    """The type can be an App or a user.
+
+    If the type is `user`, then only the `user_Id` and `name` are returned.
+    """
+
+    user_id: Optional[str] = FieldInfo(alias="user_Id", default=None)
+    """The user ID of the person who started the recording."""
+
+
+class DataStartReason(BaseModel):
+    caller: Optional[DataStartReasonCaller] = None
+
+    reason: Optional[Literal["API_CALL", "RECORD_ON_START"]] = None
+    """
+    Specifies if the recording was started using the "Start a Recording"API or using
+    the parameter RECORD_ON_START in the "Create a meeting" API.
+
+    If the recording is initiated using the "RECORD_ON_START" parameter, the user
+    details will not be populated.
+    """
+
+
+class DataStopReasonCaller(BaseModel):
+    name: Optional[str] = None
+    """Name of the user who stopped the recording."""
+
+    type: Optional[Literal["ORGANIZATION", "USER"]] = None
+    """The type can be an App or a user.
+
+    If the type is `user`, then only the `user_Id` and `name` are returned.
+    """
+
+    user_id: Optional[str] = FieldInfo(alias="user_Id", default=None)
+    """The user ID of the person who stopped the recording."""
+
+
+class DataStopReason(BaseModel):
+    caller: Optional[DataStopReasonCaller] = None
+
+    reason: Optional[Literal["API_CALL", "INTERNAL_ERROR", "ALL_PEERS_LEFT"]] = None
+    """Specifies the reason why the recording stopped."""
+
+
+class DataStorageConfig(BaseModel):
+    type: Literal["aws", "azure", "digitalocean", "gcs", "sftp"]
+    """Type of storage media."""
+
+    auth_method: Optional[Literal["KEY", "PASSWORD"]] = None
+    """Authentication method used for "sftp" type storage medium"""
+
+    bucket: Optional[str] = None
+    """Name of the storage medium's bucket."""
+
+    host: Optional[str] = None
+    """SSH destination server host for SFTP type storage medium"""
+
+    password: Optional[str] = None
+    """
+    SSH destination server password for SFTP type storage medium when auth_method is
+    "PASSWORD". If auth_method is "KEY", this specifies the password for the ssh
+    private key.
+    """
+
+    path: Optional[str] = None
+    """Path relative to the bucket root at which the recording will be placed."""
+
+    port: Optional[float] = None
+    """SSH destination server port for SFTP type storage medium"""
+
+    private_key: Optional[str] = None
+    """
+    Private key used to login to destination SSH server for SFTP type storage
+    medium, when auth_method used is "KEY"
+    """
+
+    region: Optional[str] = None
+    """Region of the storage medium."""
+
+    secret: Optional[str] = None
+    """Secret key of the storage medium.
+
+    Similar to `access_key`, it is only writeable by clients, not readable.
+    """
+
+    username: Optional[str] = None
+    """SSH destination server username for SFTP type storage medium"""
+
+
+class Data(BaseModel):
+    """Data returned by the operation"""
+
+    id: str
+    """ID of the recording"""
+
+    audio_download_url: Optional[str] = None
+    """
+    If the audio_config is passed, the URL for downloading the audio recording is
+    returned.
+    """
+
+    download_url: Optional[str] = None
+    """URL where the recording can be downloaded."""
+
+    download_url_expiry: Optional[datetime] = None
+    """Timestamp when the download URL expires."""
+
+    file_size: Optional[float] = None
+    """File size of the recording, in bytes."""
+
+    invoked_time: datetime
+    """Timestamp when this recording was invoked."""
+
+    output_file_name: str
+    """File name of the recording."""
+
+    session_id: Optional[str] = None
+    """ID of the meeting session this recording is for."""
+
+    started_time: Optional[datetime] = None
+    """Timestamp when this recording actually started after being invoked.
+
+    Usually a few seconds after `invoked_time`.
+    """
+
+    status: Literal["INVOKED", "RECORDING", "UPLOADING", "UPLOADED", "ERRORED", "PAUSED"]
+    """Current status of the recording."""
+
+    stopped_time: Optional[datetime] = None
+    """Timestamp when this recording was stopped.
+
+    Optional; is present only when the recording has actually been stopped.
+    """
+
+    recording_duration: Optional[int] = None
+    """Total recording time in seconds."""
+
+    start_reason: Optional[DataStartReason] = None
+
+    stop_reason: Optional[DataStopReason] = None
+
+    storage_config: Optional[DataStorageConfig] = None
+
+
+class RecordingStartRecordingsResponse(BaseModel):
+    success: bool
+    """Success status of the operation"""
+
+    data: Optional[Data] = None
+    """Data returned by the operation"""
diff --git a/src/cloudflare/types/realtime_kit/recording_start_track_recording_params.py b/src/cloudflare/types/realtime_kit/recording_start_track_recording_params.py
new file mode 100644
index 00000000000..0b0de90f89a
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/recording_start_track_recording_params.py
@@ -0,0 +1,88 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Iterable, Optional
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["RecordingStartTrackRecordingParams", "Layers", "LayersOutput", "LayersOutputStorageConfig"]
+
+
+class RecordingStartTrackRecordingParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    layers: Required[Dict[str, Layers]]
+
+    meeting_id: Required[str]
+    """ID of the meeting to record."""
+
+    max_seconds: float
+    """Maximum seconds this recording should be active for (beta)"""
+
+
+class LayersOutputStorageConfig(TypedDict, total=False):
+    type: Required[Literal["aws", "azure", "digitalocean", "gcs", "sftp"]]
+    """Type of storage media."""
+
+    access_key: str
+    """Access key of the storage medium.
+
+    Access key is not required for the `gcs` storage media type.
+
+    Note that this field is not readable by clients, only writeable.
+    """
+
+    auth_method: Literal["KEY", "PASSWORD"]
+    """Authentication method used for "sftp" type storage medium"""
+
+    bucket: str
+    """Name of the storage medium's bucket."""
+
+    host: str
+    """SSH destination server host for SFTP type storage medium"""
+
+    password: str
+    """
+    SSH destination server password for SFTP type storage medium when auth_method is
+    "PASSWORD". If auth_method is "KEY", this specifies the password for the ssh
+    private key.
+    """
+
+    path: str
+    """Path relative to the bucket root at which the recording will be placed."""
+
+    port: float
+    """SSH destination server port for SFTP type storage medium"""
+
+    private_key: str
+    """
+    Private key used to login to destination SSH server for SFTP type storage
+    medium, when auth_method used is "KEY"
+    """
+
+    region: str
+    """Region of the storage medium."""
+
+    secret: str
+    """Secret key of the storage medium.
+
+    Similar to `access_key`, it is only writeable by clients, not readable.
+    """
+
+    username: str
+    """SSH destination server username for SFTP type storage medium"""
+
+
+class LayersOutput(TypedDict, total=False):
+    storage_config: Optional[LayersOutputStorageConfig]
+
+    type: Literal["REALTIMEKIT_BUCKET", "STORAGE_CONFIG"]
+    """The type of output destination this layer is being exported to."""
+
+
+class Layers(TypedDict, total=False):
+    file_name_prefix: str
+    """A file name prefix to apply for files generated from this layer"""
+
+    outputs: Iterable[LayersOutput]
diff --git a/src/cloudflare/types/realtime_kit/session_get_participant_data_from_peer_id_params.py b/src/cloudflare/types/realtime_kit/session_get_participant_data_from_peer_id_params.py
new file mode 100644
index 00000000000..b0976a7a812
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/session_get_participant_data_from_peer_id_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["SessionGetParticipantDataFromPeerIDParams"]
+
+
+class SessionGetParticipantDataFromPeerIDParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    app_id: Required[str]
+    """The app identifier tag."""
+
+    filters: Literal["device_info", "ip_information", "precall_network_information", "events", "quality_stats"]
+    """Comma separated list of filters to apply.
+
+    Note that there must be no spaces between the filters.
+    """
diff --git a/src/cloudflare/types/realtime_kit/session_get_participant_data_from_peer_id_response.py b/src/cloudflare/types/realtime_kit/session_get_participant_data_from_peer_id_response.py
new file mode 100644
index 00000000000..5bc5df6e7b1
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/session_get_participant_data_from_peer_id_response.py
@@ -0,0 +1,517 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "SessionGetParticipantDataFromPeerIDResponse",
+    "Data",
+    "DataParticipant",
+    "DataParticipantPeerReport",
+    "DataParticipantPeerReportMetadata",
+    "DataParticipantPeerReportMetadataBrowserMetadata",
+    "DataParticipantPeerReportMetadataCandidatePairs",
+    "DataParticipantPeerReportMetadataCandidatePairsProducingTransport",
+    "DataParticipantPeerReportMetadataDeviceInfo",
+    "DataParticipantPeerReportMetadataEvent",
+    "DataParticipantPeerReportMetadataIPInformation",
+    "DataParticipantPeerReportMetadataIPInformationASN",
+    "DataParticipantPeerReportMetadataPcMetadata",
+    "DataParticipantPeerReportQuality",
+    "DataParticipantPeerReportQualityAudioProducer",
+    "DataParticipantPeerReportQualityAudioProducerCumulative",
+    "DataParticipantPeerReportQualityAudioProducerCumulativePacketLoss",
+    "DataParticipantPeerReportQualityAudioProducerCumulativeQualityMos",
+    "DataParticipantPeerReportQualityAudioProducerCumulativeRTT",
+    "DataParticipantPeerStats",
+    "DataParticipantPeerStatsDeviceInfo",
+    "DataParticipantPeerStatsEvent",
+    "DataParticipantPeerStatsEventMetadata",
+    "DataParticipantPeerStatsEventMetadataConnectionInfo",
+    "DataParticipantPeerStatsEventMetadataConnectionInfoConnectivity",
+    "DataParticipantPeerStatsEventMetadataConnectionInfoIPDetails",
+    "DataParticipantPeerStatsEventMetadataConnectionInfoIPDetailsASN",
+    "DataParticipantPeerStatsEventMetadataConnectionInfoLocation",
+    "DataParticipantPeerStatsEventMetadataConnectionInfoLocationCoords",
+    "DataParticipantPeerStatsIPInformation",
+    "DataParticipantPeerStatsIPInformationASN",
+    "DataParticipantPeerStatsPrecallNetworkInformation",
+    "DataParticipantQualityStats",
+]
+
+
+class DataParticipantPeerReportMetadataBrowserMetadata(BaseModel):
+    browser: Optional[str] = None
+
+    browser_version: Optional[str] = None
+
+    engine: Optional[str] = None
+
+    user_agent: Optional[str] = None
+
+    webgl_support: Optional[str] = None
+
+
+class DataParticipantPeerReportMetadataCandidatePairsProducingTransport(BaseModel):
+    available_outgoing_bitrate: Optional[int] = None
+
+    bytes_discarded_on_send: Optional[int] = None
+
+    bytes_received: Optional[int] = None
+
+    bytes_sent: Optional[int] = None
+
+    current_round_trip_time: Optional[float] = None
+
+    last_packet_received_timestamp: Optional[int] = None
+
+    last_packet_sent_timestamp: Optional[int] = None
+
+    local_candidate_address: Optional[str] = None
+
+    local_candidate_id: Optional[str] = None
+
+    local_candidate_network_type: Optional[str] = None
+
+    local_candidate_port: Optional[int] = None
+
+    local_candidate_protocol: Optional[str] = None
+
+    local_candidate_related_address: Optional[str] = None
+
+    local_candidate_related_port: Optional[int] = None
+
+    local_candidate_type: Optional[str] = None
+
+    nominated: Optional[bool] = None
+
+    packets_discarded_on_send: Optional[int] = None
+
+    packets_received: Optional[int] = None
+
+    packets_sent: Optional[int] = None
+
+    remote_candidate_address: Optional[str] = None
+
+    remote_candidate_id: Optional[str] = None
+
+    remote_candidate_port: Optional[int] = None
+
+    remote_candidate_protocol: Optional[str] = None
+
+    remote_candidate_type: Optional[str] = None
+
+    total_round_trip_time: Optional[float] = None
+
+
+class DataParticipantPeerReportMetadataCandidatePairs(BaseModel):
+    consuming_transport: Optional[List[object]] = None
+
+    producing_transport: Optional[List[DataParticipantPeerReportMetadataCandidatePairsProducingTransport]] = None
+
+
+class DataParticipantPeerReportMetadataDeviceInfo(BaseModel):
+    cpus: Optional[int] = None
+
+    is_mobile: Optional[bool] = None
+
+    os: Optional[str] = None
+
+    os_version: Optional[str] = None
+
+
+class DataParticipantPeerReportMetadataEvent(BaseModel):
+    name: Optional[str] = None
+
+    timestamp: Optional[str] = None
+
+
+class DataParticipantPeerReportMetadataIPInformationASN(BaseModel):
+    asn: Optional[str] = None
+
+
+class DataParticipantPeerReportMetadataIPInformation(BaseModel):
+    asn: Optional[DataParticipantPeerReportMetadataIPInformationASN] = None
+
+    city: Optional[str] = None
+
+    country: Optional[str] = None
+
+    ipv4: Optional[str] = None
+
+    region: Optional[str] = None
+
+    timezone: Optional[str] = None
+
+
+class DataParticipantPeerReportMetadataPcMetadata(BaseModel):
+    effective_network_type: Optional[str] = None
+
+    reflexive_connectivity: Optional[bool] = None
+
+    relay_connectivity: Optional[bool] = None
+
+    timestamp: Optional[str] = None
+
+    turn_connectivity: Optional[bool] = None
+
+
+class DataParticipantPeerReportMetadata(BaseModel):
+    audio_devices_updates: Optional[List[object]] = None
+
+    browser_metadata: Optional[DataParticipantPeerReportMetadataBrowserMetadata] = None
+
+    candidate_pairs: Optional[DataParticipantPeerReportMetadataCandidatePairs] = None
+
+    device_info: Optional[DataParticipantPeerReportMetadataDeviceInfo] = None
+
+    events: Optional[List[DataParticipantPeerReportMetadataEvent]] = None
+
+    ip_information: Optional[DataParticipantPeerReportMetadataIPInformation] = None
+
+    pc_metadata: Optional[List[DataParticipantPeerReportMetadataPcMetadata]] = None
+
+    room_view_type: Optional[str] = None
+
+    sdk_name: Optional[str] = None
+
+    sdk_version: Optional[str] = None
+
+    selected_device_updates: Optional[List[object]] = None
+
+    speaker_devices_updates: Optional[List[object]] = None
+
+    video_devices_updates: Optional[List[object]] = None
+
+
+class DataParticipantPeerReportQualityAudioProducer(BaseModel):
+    bytes_sent: Optional[int] = None
+
+    jitter: Optional[int] = None
+
+    mid: Optional[str] = None
+
+    mos_quality: Optional[int] = None
+
+    packets_lost: Optional[int] = None
+
+    packets_sent: Optional[int] = None
+
+    producer_id: Optional[str] = None
+
+    rtt: Optional[float] = None
+
+    ssrc: Optional[int] = None
+
+    timestamp: Optional[str] = None
+
+
+class DataParticipantPeerReportQualityAudioProducerCumulativePacketLoss(BaseModel):
+    api_10_or_greater_event_fraction: Optional[int] = FieldInfo(alias="10_or_greater_event_fraction", default=None)
+
+    api_25_or_greater_event_fraction: Optional[int] = FieldInfo(alias="25_or_greater_event_fraction", default=None)
+
+    api_5_or_greater_event_fraction: Optional[int] = FieldInfo(alias="5_or_greater_event_fraction", default=None)
+
+    api_50_or_greater_event_fraction: Optional[int] = FieldInfo(alias="50_or_greater_event_fraction", default=None)
+
+    avg: Optional[int] = None
+
+
+class DataParticipantPeerReportQualityAudioProducerCumulativeQualityMos(BaseModel):
+    avg: Optional[int] = None
+
+    p50: Optional[int] = None
+
+    p75: Optional[int] = None
+
+    p90: Optional[int] = None
+
+
+class DataParticipantPeerReportQualityAudioProducerCumulativeRTT(BaseModel):
+    api_100ms_or_greater_event_fraction: Optional[float] = FieldInfo(
+        alias="100ms_or_greater_event_fraction", default=None
+    )
+
+    api_250ms_or_greater_event_fraction: Optional[float] = FieldInfo(
+        alias="250ms_or_greater_event_fraction", default=None
+    )
+
+    api_500ms_or_greater_event_fraction: Optional[float] = FieldInfo(
+        alias="500ms_or_greater_event_fraction", default=None
+    )
+
+    avg: Optional[float] = None
+
+
+class DataParticipantPeerReportQualityAudioProducerCumulative(BaseModel):
+    packet_loss: Optional[DataParticipantPeerReportQualityAudioProducerCumulativePacketLoss] = None
+
+    quality_mos: Optional[DataParticipantPeerReportQualityAudioProducerCumulativeQualityMos] = None
+
+    rtt: Optional[DataParticipantPeerReportQualityAudioProducerCumulativeRTT] = None
+
+
+class DataParticipantPeerReportQuality(BaseModel):
+    audio_consumer: Optional[List[object]] = None
+
+    audio_consumer_cumulative: Optional[object] = None
+
+    audio_producer: Optional[List[DataParticipantPeerReportQualityAudioProducer]] = None
+
+    audio_producer_cumulative: Optional[DataParticipantPeerReportQualityAudioProducerCumulative] = None
+
+    screenshare_audio_consumer: Optional[List[object]] = None
+
+    screenshare_audio_consumer_cumulative: Optional[object] = None
+
+    screenshare_audio_producer: Optional[List[object]] = None
+
+    screenshare_audio_producer_cumulative: Optional[object] = None
+
+    screenshare_video_consumer: Optional[List[object]] = None
+
+    screenshare_video_consumer_cumulative: Optional[object] = None
+
+    screenshare_video_producer: Optional[List[object]] = None
+
+    screenshare_video_producer_cumulative: Optional[object] = None
+
+    video_consumer: Optional[List[object]] = None
+
+    video_consumer_cumulative: Optional[object] = None
+
+    video_producer: Optional[List[object]] = None
+
+    video_producer_cumulative: Optional[object] = None
+
+
+class DataParticipantPeerReport(BaseModel):
+    metadata: Optional[DataParticipantPeerReportMetadata] = None
+
+    quality: Optional[DataParticipantPeerReportQuality] = None
+
+
+class DataParticipantPeerStatsDeviceInfo(BaseModel):
+    browser: Optional[str] = None
+
+    browser_version: Optional[str] = None
+
+    cpus: Optional[int] = None
+
+    engine: Optional[str] = None
+
+    is_mobile: Optional[bool] = None
+
+    os: Optional[str] = None
+
+    os_version: Optional[str] = None
+
+    sdk_name: Optional[str] = None
+
+    sdk_version: Optional[str] = None
+
+    user_agent: Optional[str] = None
+
+    webgl_support: Optional[str] = None
+
+
+class DataParticipantPeerStatsEventMetadataConnectionInfoConnectivity(BaseModel):
+    host: Optional[bool] = None
+
+    reflexive: Optional[bool] = None
+
+    relay: Optional[bool] = None
+
+
+class DataParticipantPeerStatsEventMetadataConnectionInfoIPDetailsASN(BaseModel):
+    asn: Optional[str] = None
+
+
+class DataParticipantPeerStatsEventMetadataConnectionInfoIPDetails(BaseModel):
+    asn: Optional[DataParticipantPeerStatsEventMetadataConnectionInfoIPDetailsASN] = None
+
+    city: Optional[str] = None
+
+    country: Optional[str] = None
+
+    ip: Optional[str] = None
+
+    loc: Optional[str] = None
+
+    postal: Optional[str] = None
+
+    region: Optional[str] = None
+
+    timezone: Optional[str] = None
+
+
+class DataParticipantPeerStatsEventMetadataConnectionInfoLocationCoords(BaseModel):
+    latitude: Optional[float] = None
+
+    longitude: Optional[float] = None
+
+
+class DataParticipantPeerStatsEventMetadataConnectionInfoLocation(BaseModel):
+    coords: Optional[DataParticipantPeerStatsEventMetadataConnectionInfoLocationCoords] = None
+
+
+class DataParticipantPeerStatsEventMetadataConnectionInfo(BaseModel):
+    backend_r_t_t: Optional[float] = None
+
+    connectivity: Optional[DataParticipantPeerStatsEventMetadataConnectionInfoConnectivity] = None
+
+    effective_network_type: Optional[str] = None
+
+    fractional_loss: Optional[int] = None
+
+    ip_details: Optional[DataParticipantPeerStatsEventMetadataConnectionInfoIPDetails] = None
+
+    jitter: Optional[int] = None
+
+    location: Optional[DataParticipantPeerStatsEventMetadataConnectionInfoLocation] = None
+
+    r_t_t: Optional[float] = None
+
+    throughput: Optional[int] = None
+
+    turn_connectivity: Optional[bool] = None
+
+
+class DataParticipantPeerStatsEventMetadata(BaseModel):
+    connection_info: Optional[DataParticipantPeerStatsEventMetadataConnectionInfo] = None
+
+
+class DataParticipantPeerStatsEvent(BaseModel):
+    metadata: Optional[DataParticipantPeerStatsEventMetadata] = None
+
+    timestamp: Optional[str] = None
+
+    type: Optional[str] = None
+
+
+class DataParticipantPeerStatsIPInformationASN(BaseModel):
+    asn: Optional[str] = None
+
+
+class DataParticipantPeerStatsIPInformation(BaseModel):
+    asn: Optional[DataParticipantPeerStatsIPInformationASN] = None
+
+    city: Optional[str] = None
+
+    country: Optional[str] = None
+
+    ip_location: Optional[str] = None
+
+    ipv4: Optional[str] = None
+
+    org: Optional[str] = None
+
+    region: Optional[str] = None
+
+    timezone: Optional[str] = None
+
+
+class DataParticipantPeerStatsPrecallNetworkInformation(BaseModel):
+    backend_rtt: Optional[float] = None
+
+    effective_networktype: Optional[str] = None
+
+    fractional_loss: Optional[int] = None
+
+    jitter: Optional[int] = None
+
+    reflexive_connectivity: Optional[bool] = None
+
+    relay_connectivity: Optional[bool] = None
+
+    rtt: Optional[float] = None
+
+    throughput: Optional[int] = None
+
+    turn_connectivity: Optional[bool] = None
+
+
+class DataParticipantPeerStats(BaseModel):
+    device_info: Optional[DataParticipantPeerStatsDeviceInfo] = None
+
+    events: Optional[List[DataParticipantPeerStatsEvent]] = None
+
+    ip_information: Optional[DataParticipantPeerStatsIPInformation] = None
+
+    precall_network_information: Optional[DataParticipantPeerStatsPrecallNetworkInformation] = None
+
+
+class DataParticipantQualityStats(BaseModel):
+    audio_bandwidth: Optional[int] = None
+
+    audio_stats: Optional[List[object]] = None
+
+    average_quality: Optional[int] = None
+
+    end: Optional[str] = None
+
+    first_audio_packet_received: Optional[str] = None
+
+    first_video_packet_received: Optional[str] = None
+
+    last_audio_packet_received: Optional[str] = None
+
+    last_video_packet_received: Optional[str] = None
+
+    peer_ids: Optional[List[str]] = None
+
+    start: Optional[str] = None
+
+    total_audio_packets: Optional[int] = None
+
+    total_audio_packets_lost: Optional[int] = None
+
+    total_video_packets: Optional[int] = None
+
+    total_video_packets_lost: Optional[int] = None
+
+    video_bandwidth: Optional[int] = None
+
+    video_stats: Optional[List[object]] = None
+
+
+class DataParticipant(BaseModel):
+    id: Optional[str] = None
+
+    created_at: Optional[str] = None
+
+    custom_participant_id: Optional[str] = None
+
+    display_name: Optional[str] = None
+
+    duration: Optional[float] = None
+
+    joined_at: Optional[str] = None
+
+    left_at: Optional[str] = None
+
+    peer_report: Optional[DataParticipantPeerReport] = None
+
+    peer_stats: Optional[DataParticipantPeerStats] = None
+
+    quality_stats: Optional[DataParticipantQualityStats] = None
+
+    role: Optional[str] = None
+
+    updated_at: Optional[str] = None
+
+    user_id: Optional[str] = None
+
+
+class Data(BaseModel):
+    participant: Optional[DataParticipant] = None
+
+
+class SessionGetParticipantDataFromPeerIDResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/session_get_session_chat_response.py b/src/cloudflare/types/realtime_kit/session_get_session_chat_response.py
new file mode 100644
index 00000000000..395ea1548f9
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/session_get_session_chat_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["SessionGetSessionChatResponse", "Data"]
+
+
+class Data(BaseModel):
+    chat_download_url: str
+    """URL where the chat logs can be downloaded"""
+
+    chat_download_url_expiry: str
+    """Time when the download URL will expire"""
+
+
+class SessionGetSessionChatResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/session_get_session_details_params.py b/src/cloudflare/types/realtime_kit/session_get_session_details_params.py
new file mode 100644
index 00000000000..daea87d18b7
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/session_get_session_details_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SessionGetSessionDetailsParams"]
+
+
+class SessionGetSessionDetailsParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    app_id: Required[str]
+    """The app identifier tag."""
+
+    include_breakout_rooms: bool
+    """List all breakout rooms"""
diff --git a/src/cloudflare/types/realtime_kit/session_get_session_details_response.py b/src/cloudflare/types/realtime_kit/session_get_session_details_response.py
new file mode 100644
index 00000000000..9a0c1ea83c8
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/session_get_session_details_response.py
@@ -0,0 +1,68 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["SessionGetSessionDetailsResponse", "Data", "DataSession"]
+
+
+class DataSession(BaseModel):
+    id: str
+    """ID of the session"""
+
+    associated_id: str
+    """ID of the meeting this session is associated with.
+
+    In the case of V2 meetings, it is always a UUID. In V1 meetings, it is a room
+    name of the form `abcdef-ghijkl`
+    """
+
+    created_at: str
+    """timestamp when session created"""
+
+    live_participants: float
+    """number of participants currently in the session"""
+
+    max_concurrent_participants: float
+    """number of maximum participants that were in the session"""
+
+    meeting_display_name: str
+    """Title of the meeting this session belongs to"""
+
+    minutes_consumed: float
+    """number of minutes consumed since the session started"""
+
+    organization_id: str
+    """App id that hosted this session"""
+
+    started_at: str
+    """timestamp when session started"""
+
+    status: Literal["LIVE", "ENDED"]
+    """current status of session"""
+
+    type: Literal["meeting", "livestream", "participant"]
+    """type of session"""
+
+    updated_at: str
+    """timestamp when session was last updated"""
+
+    breakout_rooms: Optional[List[object]] = None
+
+    ended_at: Optional[str] = None
+    """timestamp when session ended"""
+
+    meta: Optional[object] = None
+    """Any meta data about session."""
+
+
+class Data(BaseModel):
+    session: Optional[DataSession] = None
+
+
+class SessionGetSessionDetailsResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/session_get_session_participant_details_params.py b/src/cloudflare/types/realtime_kit/session_get_session_participant_details_params.py
new file mode 100644
index 00000000000..6cc600c7bca
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/session_get_session_participant_details_params.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["SessionGetSessionParticipantDetailsParams"]
+
+
+class SessionGetSessionParticipantDetailsParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    app_id: Required[str]
+    """The app identifier tag."""
+
+    session_id: Required[str]
+
+    filters: Literal["device_info", "ip_information", "precall_network_information", "events", "quality_stats"]
+    """Comma separated list of filters to apply.
+
+    Note that there must be no spaces between the filters.
+    """
+
+    include_peer_events: bool
+    """if true, response includes all the peer events of participant."""
diff --git a/src/cloudflare/types/realtime_kit/session_get_session_participant_details_response.py b/src/cloudflare/types/realtime_kit/session_get_session_participant_details_response.py
new file mode 100644
index 00000000000..76ce78d7f94
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/session_get_session_participant_details_response.py
@@ -0,0 +1,201 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = [
+    "SessionGetSessionParticipantDetailsResponse",
+    "Data",
+    "DataParticipant",
+    "DataParticipantPeerStats",
+    "DataParticipantPeerStatsDeviceInfo",
+    "DataParticipantPeerStatsEvent",
+    "DataParticipantPeerStatsIPInformation",
+    "DataParticipantPeerStatsPrecallNetworkInformation",
+    "DataParticipantQualityStat",
+    "DataParticipantQualityStatAudioStat",
+    "DataParticipantQualityStatVideoStat",
+]
+
+
+class DataParticipantPeerStatsDeviceInfo(BaseModel):
+    browser: Optional[str] = None
+
+    browser_version: Optional[str] = None
+
+    cpus: Optional[float] = None
+
+    engine: Optional[str] = None
+
+    is_mobile: Optional[bool] = None
+
+    memory: Optional[float] = None
+
+    os: Optional[str] = None
+
+    os_version: Optional[str] = None
+
+    sdk_name: Optional[str] = None
+
+    sdk_version: Optional[str] = None
+
+    user_agent: Optional[str] = None
+
+    webgl_support: Optional[str] = None
+
+
+class DataParticipantPeerStatsEvent(BaseModel):
+    timestamp: Optional[str] = None
+
+    type: Optional[str] = None
+
+
+class DataParticipantPeerStatsIPInformation(BaseModel):
+    city: Optional[str] = None
+
+    country: Optional[str] = None
+
+    ip_location: Optional[str] = None
+
+    ipv4: Optional[str] = None
+
+    org: Optional[str] = None
+
+    portal: Optional[str] = None
+
+    region: Optional[str] = None
+
+    timezone: Optional[str] = None
+
+
+class DataParticipantPeerStatsPrecallNetworkInformation(BaseModel):
+    backend_rtt: Optional[float] = None
+
+    effective_networktype: Optional[str] = None
+
+    fractional_loss: Optional[float] = None
+
+    jitter: Optional[float] = None
+
+    reflexive_connectivity: Optional[bool] = None
+
+    relay_connectivity: Optional[bool] = None
+
+    rtt: Optional[float] = None
+
+    throughtput: Optional[float] = None
+
+    turn_connectivity: Optional[bool] = None
+
+
+class DataParticipantPeerStats(BaseModel):
+    config: Optional[str] = None
+
+    device_info: Optional[DataParticipantPeerStatsDeviceInfo] = None
+
+    events: Optional[List[DataParticipantPeerStatsEvent]] = None
+
+    ip_information: Optional[DataParticipantPeerStatsIPInformation] = None
+
+    precall_network_information: Optional[DataParticipantPeerStatsPrecallNetworkInformation] = None
+
+    status: Optional[str] = None
+
+
+class DataParticipantQualityStatAudioStat(BaseModel):
+    concealment_events: Optional[float] = None
+
+    jitter: Optional[float] = None
+
+    packets_lost: Optional[float] = None
+
+    quality: Optional[float] = None
+
+    timestamp: Optional[str] = None
+
+
+class DataParticipantQualityStatVideoStat(BaseModel):
+    frame_height: Optional[float] = None
+
+    frame_width: Optional[float] = None
+
+    frames_dropped: Optional[float] = None
+
+    frames_per_second: Optional[float] = None
+
+    jitter: Optional[float] = None
+
+    packets_lost: Optional[float] = None
+
+    quality: Optional[float] = None
+
+    timestamp: Optional[str] = None
+
+
+class DataParticipantQualityStat(BaseModel):
+    audio_bandwidth: Optional[float] = None
+
+    audio_packet_loss: Optional[float] = None
+
+    audio_stats: Optional[List[DataParticipantQualityStatAudioStat]] = None
+
+    average_quality: Optional[float] = None
+
+    end: Optional[str] = None
+
+    peer_id: Optional[str] = None
+
+    start: Optional[str] = None
+
+    video_bandwidth: Optional[float] = None
+
+    video_packet_loss: Optional[float] = None
+
+    video_stats: Optional[List[DataParticipantQualityStatVideoStat]] = None
+
+
+class DataParticipant(BaseModel):
+    id: Optional[str] = None
+    """Participant ID. This maps to the corresponding peerId."""
+
+    created_at: Optional[str] = None
+    """timestamp when this participant was created."""
+
+    custom_participant_id: Optional[str] = None
+    """ID passed by client to create this participant."""
+
+    display_name: Optional[str] = None
+    """Display name of participant when joining the session."""
+
+    duration: Optional[float] = None
+    """number of minutes for which the participant was in the session."""
+
+    joined_at: Optional[str] = None
+    """timestamp at which participant joined the session."""
+
+    left_at: Optional[str] = None
+    """timestamp at which participant left the session."""
+
+    peer_stats: Optional[DataParticipantPeerStats] = None
+
+    preset_name: Optional[str] = None
+    """Name of the preset associated with the participant."""
+
+    quality_stats: Optional[List[DataParticipantQualityStat]] = None
+
+    updated_at: Optional[str] = None
+    """timestamp when this participant's data was last updated."""
+
+    user_id: Optional[str] = None
+    """User id for this participant."""
+
+
+class Data(BaseModel):
+    participant: Optional[DataParticipant] = None
+
+
+class SessionGetSessionParticipantDetailsResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/session_get_session_participants_params.py b/src/cloudflare/types/realtime_kit/session_get_session_participants_params.py
new file mode 100644
index 00000000000..7cee9e192e5
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/session_get_session_participants_params.py
@@ -0,0 +1,38 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["SessionGetSessionParticipantsParams"]
+
+
+class SessionGetSessionParticipantsParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    app_id: Required[str]
+    """The app identifier tag."""
+
+    include_peer_events: bool
+    """if true, response includes all the peer events of participants."""
+
+    page_no: float
+    """The page number from which you want your page search results to be displayed."""
+
+    per_page: float
+    """Number of results per page"""
+
+    search: str
+    """The search query string. You can search using the meeting ID or title."""
+
+    sort_by: Literal["joinedAt", "duration"]
+
+    sort_order: Literal["ASC", "DESC"]
+
+    view: Literal["raw", "consolidated"]
+    """
+    In breakout room sessions, the view parameter can be set to `raw` for session
+    specific duration for participants or `consolidated` to accumulate breakout room
+    durations.
+    """
diff --git a/src/cloudflare/types/realtime_kit/session_get_session_participants_response.py b/src/cloudflare/types/realtime_kit/session_get_session_participants_response.py
new file mode 100644
index 00000000000..4f49b10d3ca
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/session_get_session_participants_response.py
@@ -0,0 +1,49 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["SessionGetSessionParticipantsResponse", "Data", "DataParticipant"]
+
+
+class DataParticipant(BaseModel):
+    id: Optional[str] = None
+    """Participant ID. This maps to the corresponding peerId."""
+
+    created_at: Optional[str] = None
+    """timestamp when this participant was created."""
+
+    custom_participant_id: Optional[str] = None
+    """ID passed by client to create this participant."""
+
+    display_name: Optional[str] = None
+    """Display name of participant when joining the session."""
+
+    duration: Optional[float] = None
+    """number of minutes for which the participant was in the session."""
+
+    joined_at: Optional[str] = None
+    """timestamp at which participant joined the session."""
+
+    left_at: Optional[str] = None
+    """timestamp at which participant left the session."""
+
+    preset_name: Optional[str] = None
+    """Name of the preset associated with the participant."""
+
+    updated_at: Optional[str] = None
+    """timestamp when this participant's data was last updated."""
+
+    user_id: Optional[str] = None
+    """User id for this participant."""
+
+
+class Data(BaseModel):
+    participants: Optional[List[DataParticipant]] = None
+
+
+class SessionGetSessionParticipantsResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/session_get_session_summary_response.py b/src/cloudflare/types/realtime_kit/session_get_session_summary_response.py
new file mode 100644
index 00000000000..26880462f1c
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/session_get_session_summary_response.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["SessionGetSessionSummaryResponse", "Data"]
+
+
+class Data(BaseModel):
+    session_id: str = FieldInfo(alias="sessionId")
+
+    summary_download_url: str = FieldInfo(alias="summaryDownloadUrl")
+    """URL where the summary of transcripts can be downloaded"""
+
+    summary_download_url_expiry: str = FieldInfo(alias="summaryDownloadUrlExpiry")
+    """Time of Expiry before when you need to download the csv file."""
+
+
+class SessionGetSessionSummaryResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/session_get_session_transcripts_response.py b/src/cloudflare/types/realtime_kit/session_get_session_transcripts_response.py
new file mode 100644
index 00000000000..ec7bc9eb7a1
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/session_get_session_transcripts_response.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["SessionGetSessionTranscriptsResponse", "Data"]
+
+
+class Data(BaseModel):
+    session_id: str = FieldInfo(alias="sessionId")
+
+    transcript_download_url: str
+    """URL where the transcript can be downloaded"""
+
+    transcript_download_url_expiry: str
+    """Time when the download URL will expire"""
+
+
+class SessionGetSessionTranscriptsResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/session_get_sessions_params.py b/src/cloudflare/types/realtime_kit/session_get_sessions_params.py
new file mode 100644
index 00000000000..8978b5d43da
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/session_get_sessions_params.py
@@ -0,0 +1,51 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["SessionGetSessionsParams"]
+
+
+class SessionGetSessionsParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    associated_id: str
+    """ID of the meeting that sessions should be associated with"""
+
+    end_time: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """The end time range for which you want to retrieve the meetings.
+
+    The time must be specified in ISO format.
+    """
+
+    page_no: float
+    """The page number from which you want your page search results to be displayed."""
+
+    participants: str
+
+    per_page: float
+    """Number of results per page"""
+
+    search: str
+    """
+    Search string that matches sessions based on meeting title, meeting ID, and
+    session ID
+    """
+
+    sort_by: Literal["minutesConsumed", "createdAt"]
+
+    sort_order: Literal["ASC", "DESC"]
+
+    start_time: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """The start time range for which you want to retrieve the meetings.
+
+    The time must be specified in ISO format.
+    """
+
+    status: Literal["LIVE", "ENDED"]
diff --git a/src/cloudflare/types/realtime_kit/session_get_sessions_response.py b/src/cloudflare/types/realtime_kit/session_get_sessions_response.py
new file mode 100644
index 00000000000..da895acab39
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/session_get_sessions_response.py
@@ -0,0 +1,68 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["SessionGetSessionsResponse", "Data", "DataSession"]
+
+
+class DataSession(BaseModel):
+    id: str
+    """ID of the session"""
+
+    associated_id: str
+    """ID of the meeting this session is associated with.
+
+    In the case of V2 meetings, it is always a UUID. In V1 meetings, it is a room
+    name of the form `abcdef-ghijkl`
+    """
+
+    created_at: str
+    """timestamp when session created"""
+
+    live_participants: float
+    """number of participants currently in the session"""
+
+    max_concurrent_participants: float
+    """number of maximum participants that were in the session"""
+
+    meeting_display_name: str
+    """Title of the meeting this session belongs to"""
+
+    minutes_consumed: float
+    """number of minutes consumed since the session started"""
+
+    organization_id: str
+    """App id that hosted this session"""
+
+    started_at: str
+    """timestamp when session started"""
+
+    status: Literal["LIVE", "ENDED"]
+    """current status of session"""
+
+    type: Literal["meeting", "livestream", "participant"]
+    """type of session"""
+
+    updated_at: str
+    """timestamp when session was last updated"""
+
+    breakout_rooms: Optional[List[object]] = None
+
+    ended_at: Optional[str] = None
+    """timestamp when session ended"""
+
+    meta: Optional[object] = None
+    """Any meta data about session."""
+
+
+class Data(BaseModel):
+    sessions: Optional[List[DataSession]] = None
+
+
+class SessionGetSessionsResponse(BaseModel):
+    data: Optional[Data] = None
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/realtime_kit/webhook_create_webhook_params.py b/src/cloudflare/types/realtime_kit/webhook_create_webhook_params.py
new file mode 100644
index 00000000000..c16f99a451c
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/webhook_create_webhook_params.py
@@ -0,0 +1,39 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["WebhookCreateWebhookParams"]
+
+
+class WebhookCreateWebhookParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    events: Required[
+        List[
+            Literal[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ]
+        ]
+    ]
+    """Events that this webhook will get triggered by"""
+
+    name: Required[str]
+    """Name of the webhook"""
+
+    url: Required[str]
+    """URL this webhook will send events to"""
+
+    enabled: bool
+    """Set whether or not the webhook should be active when created"""
diff --git a/src/cloudflare/types/realtime_kit/webhook_create_webhook_response.py b/src/cloudflare/types/realtime_kit/webhook_create_webhook_response.py
new file mode 100644
index 00000000000..a5e4832728f
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/webhook_create_webhook_response.py
@@ -0,0 +1,50 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["WebhookCreateWebhookResponse", "Data"]
+
+
+class Data(BaseModel):
+    id: str
+    """ID of the webhook"""
+
+    created_at: datetime
+    """Timestamp when this webhook was created"""
+
+    enabled: bool
+    """Set to true if the webhook is active"""
+
+    events: List[
+        Literal[
+            "meeting.started",
+            "meeting.ended",
+            "meeting.participantJoined",
+            "meeting.participantLeft",
+            "meeting.chatSynced",
+            "recording.statusUpdate",
+            "livestreaming.statusUpdate",
+            "meeting.transcript",
+            "meeting.summary",
+        ]
+    ]
+    """Events this webhook will send updates for"""
+
+    name: str
+    """Name of the webhook"""
+
+    updated_at: datetime
+    """Timestamp when this webhook was updated"""
+
+    url: str
+    """URL the webhook will send events to"""
+
+
+class WebhookCreateWebhookResponse(BaseModel):
+    data: Data
+
+    success: bool
diff --git a/src/cloudflare/types/realtime_kit/webhook_delete_webhook_response.py b/src/cloudflare/types/realtime_kit/webhook_delete_webhook_response.py
new file mode 100644
index 00000000000..0d9b96e273f
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/webhook_delete_webhook_response.py
@@ -0,0 +1,50 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["WebhookDeleteWebhookResponse", "Data"]
+
+
+class Data(BaseModel):
+    id: str
+    """ID of the webhook"""
+
+    created_at: datetime
+    """Timestamp when this webhook was created"""
+
+    enabled: bool
+    """Set to true if the webhook is active"""
+
+    events: List[
+        Literal[
+            "meeting.started",
+            "meeting.ended",
+            "meeting.participantJoined",
+            "meeting.participantLeft",
+            "meeting.chatSynced",
+            "recording.statusUpdate",
+            "livestreaming.statusUpdate",
+            "meeting.transcript",
+            "meeting.summary",
+        ]
+    ]
+    """Events this webhook will send updates for"""
+
+    name: str
+    """Name of the webhook"""
+
+    updated_at: datetime
+    """Timestamp when this webhook was updated"""
+
+    url: str
+    """URL the webhook will send events to"""
+
+
+class WebhookDeleteWebhookResponse(BaseModel):
+    data: Data
+
+    success: bool
diff --git a/src/cloudflare/types/realtime_kit/webhook_edit_webhook_params.py b/src/cloudflare/types/realtime_kit/webhook_edit_webhook_params.py
new file mode 100644
index 00000000000..5b4e7ded101
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/webhook_edit_webhook_params.py
@@ -0,0 +1,39 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["WebhookEditWebhookParams"]
+
+
+class WebhookEditWebhookParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    app_id: Required[str]
+    """The app identifier tag."""
+
+    enabled: bool
+
+    events: List[
+        Literal[
+            "meeting.started",
+            "meeting.ended",
+            "meeting.participantJoined",
+            "meeting.participantLeft",
+            "recording.statusUpdate",
+            "livestreaming.statusUpdate",
+            "meeting.chatSynced",
+            "meeting.transcript",
+            "meeting.summary",
+        ]
+    ]
+    """Events that the webhook will get triggered by"""
+
+    name: str
+    """Name of the webhook"""
+
+    url: str
+    """URL the webhook will send events to"""
diff --git a/src/cloudflare/types/realtime_kit/webhook_edit_webhook_response.py b/src/cloudflare/types/realtime_kit/webhook_edit_webhook_response.py
new file mode 100644
index 00000000000..c2948bc7ba6
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/webhook_edit_webhook_response.py
@@ -0,0 +1,50 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["WebhookEditWebhookResponse", "Data"]
+
+
+class Data(BaseModel):
+    id: str
+    """ID of the webhook"""
+
+    created_at: datetime
+    """Timestamp when this webhook was created"""
+
+    enabled: bool
+    """Set to true if the webhook is active"""
+
+    events: List[
+        Literal[
+            "meeting.started",
+            "meeting.ended",
+            "meeting.participantJoined",
+            "meeting.participantLeft",
+            "meeting.chatSynced",
+            "recording.statusUpdate",
+            "livestreaming.statusUpdate",
+            "meeting.transcript",
+            "meeting.summary",
+        ]
+    ]
+    """Events this webhook will send updates for"""
+
+    name: str
+    """Name of the webhook"""
+
+    updated_at: datetime
+    """Timestamp when this webhook was updated"""
+
+    url: str
+    """URL the webhook will send events to"""
+
+
+class WebhookEditWebhookResponse(BaseModel):
+    data: Data
+
+    success: bool
diff --git a/src/cloudflare/types/realtime_kit/webhook_get_webhook_by_id_response.py b/src/cloudflare/types/realtime_kit/webhook_get_webhook_by_id_response.py
new file mode 100644
index 00000000000..d0ec55253b2
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/webhook_get_webhook_by_id_response.py
@@ -0,0 +1,50 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["WebhookGetWebhookByIDResponse", "Data"]
+
+
+class Data(BaseModel):
+    id: str
+    """ID of the webhook"""
+
+    created_at: datetime
+    """Timestamp when this webhook was created"""
+
+    enabled: bool
+    """Set to true if the webhook is active"""
+
+    events: List[
+        Literal[
+            "meeting.started",
+            "meeting.ended",
+            "meeting.participantJoined",
+            "meeting.participantLeft",
+            "meeting.chatSynced",
+            "recording.statusUpdate",
+            "livestreaming.statusUpdate",
+            "meeting.transcript",
+            "meeting.summary",
+        ]
+    ]
+    """Events this webhook will send updates for"""
+
+    name: str
+    """Name of the webhook"""
+
+    updated_at: datetime
+    """Timestamp when this webhook was updated"""
+
+    url: str
+    """URL the webhook will send events to"""
+
+
+class WebhookGetWebhookByIDResponse(BaseModel):
+    data: Data
+
+    success: bool
diff --git a/src/cloudflare/types/realtime_kit/webhook_get_webhooks_response.py b/src/cloudflare/types/realtime_kit/webhook_get_webhooks_response.py
new file mode 100644
index 00000000000..58575908111
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/webhook_get_webhooks_response.py
@@ -0,0 +1,50 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["WebhookGetWebhooksResponse", "Data"]
+
+
+class Data(BaseModel):
+    id: str
+    """ID of the webhook"""
+
+    created_at: datetime
+    """Timestamp when this webhook was created"""
+
+    enabled: bool
+    """Set to true if the webhook is active"""
+
+    events: List[
+        Literal[
+            "meeting.started",
+            "meeting.ended",
+            "meeting.participantJoined",
+            "meeting.participantLeft",
+            "meeting.chatSynced",
+            "recording.statusUpdate",
+            "livestreaming.statusUpdate",
+            "meeting.transcript",
+            "meeting.summary",
+        ]
+    ]
+    """Events this webhook will send updates for"""
+
+    name: str
+    """Name of the webhook"""
+
+    updated_at: datetime
+    """Timestamp when this webhook was updated"""
+
+    url: str
+    """URL the webhook will send events to"""
+
+
+class WebhookGetWebhooksResponse(BaseModel):
+    data: List[Data]
+
+    success: bool
diff --git a/src/cloudflare/types/realtime_kit/webhook_replace_webhook_params.py b/src/cloudflare/types/realtime_kit/webhook_replace_webhook_params.py
new file mode 100644
index 00000000000..74732bdbf45
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/webhook_replace_webhook_params.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["WebhookReplaceWebhookParams"]
+
+
+class WebhookReplaceWebhookParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    app_id: Required[str]
+    """The app identifier tag."""
+
+    events: Required[
+        List[
+            Literal[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ]
+        ]
+    ]
+    """Events that this webhook will get triggered by"""
+
+    name: Required[str]
+    """Name of the webhook"""
+
+    url: Required[str]
+    """URL this webhook will send events to"""
+
+    enabled: bool
+    """Set whether or not the webhook should be active when created"""
diff --git a/src/cloudflare/types/realtime_kit/webhook_replace_webhook_response.py b/src/cloudflare/types/realtime_kit/webhook_replace_webhook_response.py
new file mode 100644
index 00000000000..ff71e548f46
--- /dev/null
+++ b/src/cloudflare/types/realtime_kit/webhook_replace_webhook_response.py
@@ -0,0 +1,50 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["WebhookReplaceWebhookResponse", "Data"]
+
+
+class Data(BaseModel):
+    id: str
+    """ID of the webhook"""
+
+    created_at: datetime
+    """Timestamp when this webhook was created"""
+
+    enabled: bool
+    """Set to true if the webhook is active"""
+
+    events: List[
+        Literal[
+            "meeting.started",
+            "meeting.ended",
+            "meeting.participantJoined",
+            "meeting.participantLeft",
+            "meeting.chatSynced",
+            "recording.statusUpdate",
+            "livestreaming.statusUpdate",
+            "meeting.transcript",
+            "meeting.summary",
+        ]
+    ]
+    """Events this webhook will send updates for"""
+
+    name: str
+    """Name of the webhook"""
+
+    updated_at: datetime
+    """Timestamp when this webhook was updated"""
+
+    url: str
+    """URL the webhook will send events to"""
+
+
+class WebhookReplaceWebhookResponse(BaseModel):
+    data: Data
+
+    success: bool
diff --git a/src/cloudflare/types/registrar/__init__.py b/src/cloudflare/types/registrar/__init__.py
index 8d08ad33d41..d6102a096f4 100644
--- a/src/cloudflare/types/registrar/__init__.py
+++ b/src/cloudflare/types/registrar/__init__.py
@@ -3,6 +3,4 @@
 from __future__ import annotations
 
 from .domain import Domain as Domain
-from .domain_get_response import DomainGetResponse as DomainGetResponse
 from .domain_update_params import DomainUpdateParams as DomainUpdateParams
-from .domain_update_response import DomainUpdateResponse as DomainUpdateResponse
diff --git a/src/cloudflare/types/registrar/domain.py b/src/cloudflare/types/registrar/domain.py
index 90b0ed07a47..3c54f566370 100644
--- a/src/cloudflare/types/registrar/domain.py
+++ b/src/cloudflare/types/registrar/domain.py
@@ -2,6 +2,7 @@
 
 from typing import Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from ..._models import BaseModel
 
@@ -9,6 +10,8 @@
 
 
 class RegistrantContact(BaseModel):
+    """Shows contact information for domain registrant."""
+
     address: str
     """Address."""
 
@@ -50,22 +53,24 @@ class RegistrantContact(BaseModel):
 
 
 class TransferIn(BaseModel):
-    accept_foa: Optional[str] = None
+    """Statuses for domain transfers into Cloudflare Registrar."""
+
+    accept_foa: Optional[Literal["needed", "ok"]] = None
     """Form of authorization has been accepted by the registrant."""
 
-    approve_transfer: Optional[str] = None
+    approve_transfer: Optional[Literal["needed", "ok", "pending", "trying", "rejected", "unknown"]] = None
     """Shows transfer status with the registry."""
 
     can_cancel_transfer: Optional[bool] = None
     """Indicates if cancellation is still possible."""
 
-    disable_privacy: Optional[object] = None
+    disable_privacy: Optional[Literal["needed", "ok", "unknown"]] = None
     """Privacy guards are disabled at the foreign registrar."""
 
-    enter_auth_code: Optional[str] = None
+    enter_auth_code: Optional[Literal["needed", "ok", "pending", "trying", "rejected"]] = None
     """Auth code has been entered and verified."""
 
-    unlock_domain: Optional[object] = None
+    unlock_domain: Optional[Literal["needed", "ok", "pending", "trying", "unknown"]] = None
     """Domain is unlocked at the foreign registrar."""
 
 
diff --git a/src/cloudflare/types/registrar/domain_get_response.py b/src/cloudflare/types/registrar/domain_get_response.py
deleted file mode 100644
index 31cc6350778..00000000000
--- a/src/cloudflare/types/registrar/domain_get_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union
-
-__all__ = ["DomainGetResponse"]
-
-DomainGetResponse = Union[List[object], str, object, None]
diff --git a/src/cloudflare/types/registrar/domain_update_response.py b/src/cloudflare/types/registrar/domain_update_response.py
deleted file mode 100644
index eda77709047..00000000000
--- a/src/cloudflare/types/registrar/domain_update_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union
-
-__all__ = ["DomainUpdateResponse"]
-
-DomainUpdateResponse = Union[List[object], str, object, None]
diff --git a/src/cloudflare/types/request_tracers/trace.py b/src/cloudflare/types/request_tracers/trace.py
index 4687762c7f8..118984f10b7 100644
--- a/src/cloudflare/types/request_tracers/trace.py
+++ b/src/cloudflare/types/request_tracers/trace.py
@@ -2,10 +2,16 @@
 
 from __future__ import annotations
 
-from typing import List
+from typing import TYPE_CHECKING, List
+from typing_extensions import TypeAlias, TypeAliasType
+
+from ..._compat import PYDANTIC_V1
 
 __all__ = ["Trace"]
 
-Trace = List["TraceItem"]
+if TYPE_CHECKING or not PYDANTIC_V1:
+    Trace = TypeAliasType("Trace", List["TraceItem"])
+else:
+    Trace: TypeAlias = List["TraceItem"]
 
 from .trace_item import TraceItem
diff --git a/src/cloudflare/types/request_tracers/trace_create_params.py b/src/cloudflare/types/request_tracers/trace_create_params.py
index 6acca264b84..184d290a90a 100644
--- a/src/cloudflare/types/request_tracers/trace_create_params.py
+++ b/src/cloudflare/types/request_tracers/trace_create_params.py
@@ -10,7 +10,7 @@
 
 class TraceCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     method: Required[str]
     """HTTP Method of tracing request"""
@@ -48,6 +48,8 @@ class Body(TypedDict, total=False):
 
 
 class ContextGeoloc(TypedDict, total=False):
+    """Geodata for tracing request"""
+
     city: str
 
     continent: str
@@ -70,6 +72,8 @@ class ContextGeoloc(TypedDict, total=False):
 
 
 class Context(TypedDict, total=False):
+    """Additional request parameters"""
+
     bot_score: int
     """Bot score used for evaluating tracing request processing"""
 
diff --git a/src/cloudflare/types/request_tracers/trace_create_response.py b/src/cloudflare/types/request_tracers/trace_create_response.py
index 3e72c080e9a..9b81d6f74e9 100644
--- a/src/cloudflare/types/request_tracers/trace_create_response.py
+++ b/src/cloudflare/types/request_tracers/trace_create_response.py
@@ -4,13 +4,14 @@
 
 from typing import Optional
 
-from ..._compat import PYDANTIC_V2
 from ..._models import BaseModel
 
 __all__ = ["TraceCreateResponse"]
 
 
 class TraceCreateResponse(BaseModel):
+    """Trace result with an origin status code"""
+
     status_code: Optional[int] = None
     """HTTP Status code of zone response"""
 
@@ -18,8 +19,3 @@ class TraceCreateResponse(BaseModel):
 
 
 from .trace import Trace
-
-if PYDANTIC_V2:
-    TraceCreateResponse.model_rebuild()
-else:
-    TraceCreateResponse.update_forward_refs()  # type: ignore
diff --git a/src/cloudflare/types/request_tracers/trace_item.py b/src/cloudflare/types/request_tracers/trace_item.py
index 2830764115e..c8fa55a3f8a 100644
--- a/src/cloudflare/types/request_tracers/trace_item.py
+++ b/src/cloudflare/types/request_tracers/trace_item.py
@@ -4,13 +4,14 @@
 
 from typing import Optional
 
-from ..._compat import PYDANTIC_V2
 from ..._models import BaseModel
 
 __all__ = ["TraceItem"]
 
 
 class TraceItem(BaseModel):
+    """List of steps acting on request/response"""
+
     action: Optional[str] = None
     """If step type is rule, then action performed by this rule"""
 
@@ -42,8 +43,3 @@ class TraceItem(BaseModel):
 
 
 from .trace import Trace
-
-if PYDANTIC_V2:
-    TraceItem.model_rebuild()
-else:
-    TraceItem.update_forward_refs()  # type: ignore
diff --git a/src/cloudflare/types/resource_sharing/__init__.py b/src/cloudflare/types/resource_sharing/__init__.py
new file mode 100644
index 00000000000..7655008fc78
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/__init__.py
@@ -0,0 +1,28 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .recipient_get_params import RecipientGetParams as RecipientGetParams
+from .resource_list_params import ResourceListParams as ResourceListParams
+from .recipient_list_params import RecipientListParams as RecipientListParams
+from .resource_get_response import ResourceGetResponse as ResourceGetResponse
+from .recipient_get_response import RecipientGetResponse as RecipientGetResponse
+from .resource_create_params import ResourceCreateParams as ResourceCreateParams
+from .resource_list_response import ResourceListResponse as ResourceListResponse
+from .resource_update_params import ResourceUpdateParams as ResourceUpdateParams
+from .recipient_create_params import RecipientCreateParams as RecipientCreateParams
+from .recipient_list_response import RecipientListResponse as RecipientListResponse
+from .resource_create_response import ResourceCreateResponse as ResourceCreateResponse
+from .resource_delete_response import ResourceDeleteResponse as ResourceDeleteResponse
+from .resource_update_response import ResourceUpdateResponse as ResourceUpdateResponse
+from .recipient_create_response import RecipientCreateResponse as RecipientCreateResponse
+from .recipient_delete_response import RecipientDeleteResponse as RecipientDeleteResponse
+from .resource_sharing_get_params import ResourceSharingGetParams as ResourceSharingGetParams
+from .resource_sharing_list_params import ResourceSharingListParams as ResourceSharingListParams
+from .resource_sharing_get_response import ResourceSharingGetResponse as ResourceSharingGetResponse
+from .resource_sharing_create_params import ResourceSharingCreateParams as ResourceSharingCreateParams
+from .resource_sharing_list_response import ResourceSharingListResponse as ResourceSharingListResponse
+from .resource_sharing_update_params import ResourceSharingUpdateParams as ResourceSharingUpdateParams
+from .resource_sharing_create_response import ResourceSharingCreateResponse as ResourceSharingCreateResponse
+from .resource_sharing_delete_response import ResourceSharingDeleteResponse as ResourceSharingDeleteResponse
+from .resource_sharing_update_response import ResourceSharingUpdateResponse as ResourceSharingUpdateResponse
diff --git a/src/cloudflare/types/resource_sharing/recipient_create_params.py b/src/cloudflare/types/resource_sharing/recipient_create_params.py
new file mode 100644
index 00000000000..58b143bcada
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/recipient_create_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["RecipientCreateParams"]
+
+
+class RecipientCreateParams(TypedDict, total=False):
+    path_account_id: Required[Annotated[str, PropertyInfo(alias="account_id")]]
+    """Account identifier."""
+
+    body_account_id: Annotated[str, PropertyInfo(alias="account_id")]
+    """Account identifier."""
+
+    organization_id: str
+    """Organization identifier."""
diff --git a/src/cloudflare/types/resource_sharing/recipient_create_response.py b/src/cloudflare/types/resource_sharing/recipient_create_response.py
new file mode 100644
index 00000000000..42768b89f7e
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/recipient_create_response.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["RecipientCreateResponse", "Resource"]
+
+
+class Resource(BaseModel):
+    error: str
+    """Share Recipient error message."""
+
+    resource_id: str
+    """Share Resource identifier."""
+
+    resource_version: int
+    """Resource Version."""
+
+    terminal: bool
+    """Whether the error is terminal or will be continually retried."""
+
+
+class RecipientCreateResponse(BaseModel):
+    id: str
+    """Share Recipient identifier tag."""
+
+    account_id: str
+    """Account identifier."""
+
+    association_status: Literal["associating", "associated", "disassociating", "disassociated"]
+    """Share Recipient association status."""
+
+    created: datetime
+    """When the share was created."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    resources: Optional[List[Resource]] = None
diff --git a/src/cloudflare/types/resource_sharing/recipient_delete_response.py b/src/cloudflare/types/resource_sharing/recipient_delete_response.py
new file mode 100644
index 00000000000..84305ee7c62
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/recipient_delete_response.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["RecipientDeleteResponse", "Resource"]
+
+
+class Resource(BaseModel):
+    error: str
+    """Share Recipient error message."""
+
+    resource_id: str
+    """Share Resource identifier."""
+
+    resource_version: int
+    """Resource Version."""
+
+    terminal: bool
+    """Whether the error is terminal or will be continually retried."""
+
+
+class RecipientDeleteResponse(BaseModel):
+    id: str
+    """Share Recipient identifier tag."""
+
+    account_id: str
+    """Account identifier."""
+
+    association_status: Literal["associating", "associated", "disassociating", "disassociated"]
+    """Share Recipient association status."""
+
+    created: datetime
+    """When the share was created."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    resources: Optional[List[Resource]] = None
diff --git a/src/cloudflare/types/resource_sharing/recipient_get_params.py b/src/cloudflare/types/resource_sharing/recipient_get_params.py
new file mode 100644
index 00000000000..beaa5c36c21
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/recipient_get_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["RecipientGetParams"]
+
+
+class RecipientGetParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier."""
+
+    share_id: Required[str]
+    """Share identifier tag."""
+
+    include_resources: bool
+    """Include resources in the response."""
diff --git a/src/cloudflare/types/resource_sharing/recipient_get_response.py b/src/cloudflare/types/resource_sharing/recipient_get_response.py
new file mode 100644
index 00000000000..7ff7a164034
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/recipient_get_response.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["RecipientGetResponse", "Resource"]
+
+
+class Resource(BaseModel):
+    error: str
+    """Share Recipient error message."""
+
+    resource_id: str
+    """Share Resource identifier."""
+
+    resource_version: int
+    """Resource Version."""
+
+    terminal: bool
+    """Whether the error is terminal or will be continually retried."""
+
+
+class RecipientGetResponse(BaseModel):
+    id: str
+    """Share Recipient identifier tag."""
+
+    account_id: str
+    """Account identifier."""
+
+    association_status: Literal["associating", "associated", "disassociating", "disassociated"]
+    """Share Recipient association status."""
+
+    created: datetime
+    """When the share was created."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    resources: Optional[List[Resource]] = None
diff --git a/src/cloudflare/types/resource_sharing/recipient_list_params.py b/src/cloudflare/types/resource_sharing/recipient_list_params.py
new file mode 100644
index 00000000000..81723455101
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/recipient_list_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["RecipientListParams"]
+
+
+class RecipientListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier."""
+
+    include_resources: bool
+    """Include resources in the response."""
+
+    page: int
+    """Page number."""
+
+    per_page: int
+    """Number of objects to return per page."""
diff --git a/src/cloudflare/types/resource_sharing/recipient_list_response.py b/src/cloudflare/types/resource_sharing/recipient_list_response.py
new file mode 100644
index 00000000000..8fb99736839
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/recipient_list_response.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["RecipientListResponse", "Resource"]
+
+
+class Resource(BaseModel):
+    error: str
+    """Share Recipient error message."""
+
+    resource_id: str
+    """Share Resource identifier."""
+
+    resource_version: int
+    """Resource Version."""
+
+    terminal: bool
+    """Whether the error is terminal or will be continually retried."""
+
+
+class RecipientListResponse(BaseModel):
+    id: str
+    """Share Recipient identifier tag."""
+
+    account_id: str
+    """Account identifier."""
+
+    association_status: Literal["associating", "associated", "disassociating", "disassociated"]
+    """Share Recipient association status."""
+
+    created: datetime
+    """When the share was created."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    resources: Optional[List[Resource]] = None
diff --git a/src/cloudflare/types/resource_sharing/resource_create_params.py b/src/cloudflare/types/resource_sharing/resource_create_params.py
new file mode 100644
index 00000000000..7af68bcd22e
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/resource_create_params.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["ResourceCreateParams"]
+
+
+class ResourceCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier."""
+
+    meta: Required[object]
+    """Resource Metadata."""
+
+    resource_account_id: Required[str]
+    """Account identifier."""
+
+    resource_id: Required[str]
+    """Share Resource identifier."""
+
+    resource_type: Required[
+        Literal[
+            "custom-ruleset",
+            "widget",
+            "gateway-policy",
+            "gateway-destination-ip",
+            "gateway-block-page-settings",
+            "gateway-extended-email-matching",
+        ]
+    ]
+    """Resource Type."""
diff --git a/src/cloudflare/types/resource_sharing/resource_create_response.py b/src/cloudflare/types/resource_sharing/resource_create_response.py
new file mode 100644
index 00000000000..9f873832a6a
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/resource_create_response.py
@@ -0,0 +1,44 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["ResourceCreateResponse"]
+
+
+class ResourceCreateResponse(BaseModel):
+    id: str
+    """Share Resource identifier."""
+
+    created: datetime
+    """When the share was created."""
+
+    meta: object
+    """Resource Metadata."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    resource_account_id: str
+    """Account identifier."""
+
+    resource_id: str
+    """Share Resource identifier."""
+
+    resource_type: Literal[
+        "custom-ruleset",
+        "widget",
+        "gateway-policy",
+        "gateway-destination-ip",
+        "gateway-block-page-settings",
+        "gateway-extended-email-matching",
+    ]
+    """Resource Type."""
+
+    resource_version: int
+    """Resource Version."""
+
+    status: Literal["active", "deleting", "deleted"]
+    """Resource Status."""
diff --git a/src/cloudflare/types/resource_sharing/resource_delete_response.py b/src/cloudflare/types/resource_sharing/resource_delete_response.py
new file mode 100644
index 00000000000..5e2f119697b
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/resource_delete_response.py
@@ -0,0 +1,44 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["ResourceDeleteResponse"]
+
+
+class ResourceDeleteResponse(BaseModel):
+    id: str
+    """Share Resource identifier."""
+
+    created: datetime
+    """When the share was created."""
+
+    meta: object
+    """Resource Metadata."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    resource_account_id: str
+    """Account identifier."""
+
+    resource_id: str
+    """Share Resource identifier."""
+
+    resource_type: Literal[
+        "custom-ruleset",
+        "widget",
+        "gateway-policy",
+        "gateway-destination-ip",
+        "gateway-block-page-settings",
+        "gateway-extended-email-matching",
+    ]
+    """Resource Type."""
+
+    resource_version: int
+    """Resource Version."""
+
+    status: Literal["active", "deleting", "deleted"]
+    """Resource Status."""
diff --git a/src/cloudflare/types/resource_sharing/resource_get_response.py b/src/cloudflare/types/resource_sharing/resource_get_response.py
new file mode 100644
index 00000000000..f161e8cd9cb
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/resource_get_response.py
@@ -0,0 +1,44 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["ResourceGetResponse"]
+
+
+class ResourceGetResponse(BaseModel):
+    id: str
+    """Share Resource identifier."""
+
+    created: datetime
+    """When the share was created."""
+
+    meta: object
+    """Resource Metadata."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    resource_account_id: str
+    """Account identifier."""
+
+    resource_id: str
+    """Share Resource identifier."""
+
+    resource_type: Literal[
+        "custom-ruleset",
+        "widget",
+        "gateway-policy",
+        "gateway-destination-ip",
+        "gateway-block-page-settings",
+        "gateway-extended-email-matching",
+    ]
+    """Resource Type."""
+
+    resource_version: int
+    """Resource Version."""
+
+    status: Literal["active", "deleting", "deleted"]
+    """Resource Status."""
diff --git a/src/cloudflare/types/resource_sharing/resource_list_params.py b/src/cloudflare/types/resource_sharing/resource_list_params.py
new file mode 100644
index 00000000000..02e586eb9c4
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/resource_list_params.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["ResourceListParams"]
+
+
+class ResourceListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier."""
+
+    page: int
+    """Page number."""
+
+    per_page: int
+    """Number of objects to return per page."""
+
+    resource_type: Literal[
+        "custom-ruleset",
+        "widget",
+        "gateway-policy",
+        "gateway-destination-ip",
+        "gateway-block-page-settings",
+        "gateway-extended-email-matching",
+    ]
+    """Filter share resources by resource_type."""
+
+    status: Literal["active", "deleting", "deleted"]
+    """Filter share resources by status."""
diff --git a/src/cloudflare/types/resource_sharing/resource_list_response.py b/src/cloudflare/types/resource_sharing/resource_list_response.py
new file mode 100644
index 00000000000..7fd2ef4ec7c
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/resource_list_response.py
@@ -0,0 +1,44 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["ResourceListResponse"]
+
+
+class ResourceListResponse(BaseModel):
+    id: str
+    """Share Resource identifier."""
+
+    created: datetime
+    """When the share was created."""
+
+    meta: object
+    """Resource Metadata."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    resource_account_id: str
+    """Account identifier."""
+
+    resource_id: str
+    """Share Resource identifier."""
+
+    resource_type: Literal[
+        "custom-ruleset",
+        "widget",
+        "gateway-policy",
+        "gateway-destination-ip",
+        "gateway-block-page-settings",
+        "gateway-extended-email-matching",
+    ]
+    """Resource Type."""
+
+    resource_version: int
+    """Resource Version."""
+
+    status: Literal["active", "deleting", "deleted"]
+    """Resource Status."""
diff --git a/src/cloudflare/types/resource_sharing/resource_sharing_create_params.py b/src/cloudflare/types/resource_sharing/resource_sharing_create_params.py
new file mode 100644
index 00000000000..d548d0941f9
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/resource_sharing_create_params.py
@@ -0,0 +1,53 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["ResourceSharingCreateParams", "Recipient", "Resource"]
+
+
+class ResourceSharingCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier."""
+
+    name: Required[str]
+    """The name of the share."""
+
+    recipients: Required[Iterable[Recipient]]
+
+    resources: Required[Iterable[Resource]]
+
+
+class Recipient(TypedDict, total=False):
+    """Account or organization ID must be provided."""
+
+    account_id: str
+    """Account identifier."""
+
+    organization_id: str
+    """Organization identifier."""
+
+
+class Resource(TypedDict, total=False):
+    meta: Required[object]
+    """Resource Metadata."""
+
+    resource_account_id: Required[str]
+    """Account identifier."""
+
+    resource_id: Required[str]
+    """Share Resource identifier."""
+
+    resource_type: Required[
+        Literal[
+            "custom-ruleset",
+            "widget",
+            "gateway-policy",
+            "gateway-destination-ip",
+            "gateway-block-page-settings",
+            "gateway-extended-email-matching",
+        ]
+    ]
+    """Resource Type."""
diff --git a/src/cloudflare/types/resource_sharing/resource_sharing_create_response.py b/src/cloudflare/types/resource_sharing/resource_sharing_create_response.py
new file mode 100644
index 00000000000..d8821d70438
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/resource_sharing_create_response.py
@@ -0,0 +1,109 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["ResourceSharingCreateResponse", "Resource"]
+
+
+class Resource(BaseModel):
+    id: str
+    """Share Resource identifier."""
+
+    created: datetime
+    """When the share was created."""
+
+    meta: object
+    """Resource Metadata."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    resource_account_id: str
+    """Account identifier."""
+
+    resource_id: str
+    """Share Resource identifier."""
+
+    resource_type: Literal[
+        "custom-ruleset",
+        "widget",
+        "gateway-policy",
+        "gateway-destination-ip",
+        "gateway-block-page-settings",
+        "gateway-extended-email-matching",
+    ]
+    """Resource Type."""
+
+    resource_version: int
+    """Resource Version."""
+
+    status: Literal["active", "deleting", "deleted"]
+    """Resource Status."""
+
+
+class ResourceSharingCreateResponse(BaseModel):
+    id: str
+    """Share identifier tag."""
+
+    account_id: str
+    """Account identifier."""
+
+    account_name: str
+    """The display name of an account."""
+
+    created: datetime
+    """When the share was created."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    name: str
+    """The name of the share."""
+
+    organization_id: str
+    """Organization identifier."""
+
+    status: Literal["active", "deleting", "deleted"]
+
+    target_type: Literal["account", "organization"]
+
+    associated_recipient_count: Optional[int] = None
+    """The number of recipients in the 'associated' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    associating_recipient_count: Optional[int] = None
+    """The number of recipients in the 'associating' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    disassociated_recipient_count: Optional[int] = None
+    """The number of recipients in the 'disassociated' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    disassociating_recipient_count: Optional[int] = None
+    """The number of recipients in the 'disassociating' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    kind: Optional[Literal["sent", "received"]] = None
+
+    resources: Optional[List[Resource]] = None
+    """A list of resources that are part of the share.
+
+    This field is only included when requested via the 'include_resources'
+    parameter.
+    """
diff --git a/src/cloudflare/types/resource_sharing/resource_sharing_delete_response.py b/src/cloudflare/types/resource_sharing/resource_sharing_delete_response.py
new file mode 100644
index 00000000000..764c032b5a9
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/resource_sharing_delete_response.py
@@ -0,0 +1,109 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["ResourceSharingDeleteResponse", "Resource"]
+
+
+class Resource(BaseModel):
+    id: str
+    """Share Resource identifier."""
+
+    created: datetime
+    """When the share was created."""
+
+    meta: object
+    """Resource Metadata."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    resource_account_id: str
+    """Account identifier."""
+
+    resource_id: str
+    """Share Resource identifier."""
+
+    resource_type: Literal[
+        "custom-ruleset",
+        "widget",
+        "gateway-policy",
+        "gateway-destination-ip",
+        "gateway-block-page-settings",
+        "gateway-extended-email-matching",
+    ]
+    """Resource Type."""
+
+    resource_version: int
+    """Resource Version."""
+
+    status: Literal["active", "deleting", "deleted"]
+    """Resource Status."""
+
+
+class ResourceSharingDeleteResponse(BaseModel):
+    id: str
+    """Share identifier tag."""
+
+    account_id: str
+    """Account identifier."""
+
+    account_name: str
+    """The display name of an account."""
+
+    created: datetime
+    """When the share was created."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    name: str
+    """The name of the share."""
+
+    organization_id: str
+    """Organization identifier."""
+
+    status: Literal["active", "deleting", "deleted"]
+
+    target_type: Literal["account", "organization"]
+
+    associated_recipient_count: Optional[int] = None
+    """The number of recipients in the 'associated' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    associating_recipient_count: Optional[int] = None
+    """The number of recipients in the 'associating' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    disassociated_recipient_count: Optional[int] = None
+    """The number of recipients in the 'disassociated' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    disassociating_recipient_count: Optional[int] = None
+    """The number of recipients in the 'disassociating' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    kind: Optional[Literal["sent", "received"]] = None
+
+    resources: Optional[List[Resource]] = None
+    """A list of resources that are part of the share.
+
+    This field is only included when requested via the 'include_resources'
+    parameter.
+    """
diff --git a/src/cloudflare/types/resource_sharing/resource_sharing_get_params.py b/src/cloudflare/types/resource_sharing/resource_sharing_get_params.py
new file mode 100644
index 00000000000..a84c94c5892
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/resource_sharing_get_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ResourceSharingGetParams"]
+
+
+class ResourceSharingGetParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier."""
+
+    include_recipient_counts: bool
+    """Include recipient counts in the response."""
+
+    include_resources: bool
+    """Include resources in the response."""
diff --git a/src/cloudflare/types/resource_sharing/resource_sharing_get_response.py b/src/cloudflare/types/resource_sharing/resource_sharing_get_response.py
new file mode 100644
index 00000000000..ee3d93457ec
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/resource_sharing_get_response.py
@@ -0,0 +1,109 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["ResourceSharingGetResponse", "Resource"]
+
+
+class Resource(BaseModel):
+    id: str
+    """Share Resource identifier."""
+
+    created: datetime
+    """When the share was created."""
+
+    meta: object
+    """Resource Metadata."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    resource_account_id: str
+    """Account identifier."""
+
+    resource_id: str
+    """Share Resource identifier."""
+
+    resource_type: Literal[
+        "custom-ruleset",
+        "widget",
+        "gateway-policy",
+        "gateway-destination-ip",
+        "gateway-block-page-settings",
+        "gateway-extended-email-matching",
+    ]
+    """Resource Type."""
+
+    resource_version: int
+    """Resource Version."""
+
+    status: Literal["active", "deleting", "deleted"]
+    """Resource Status."""
+
+
+class ResourceSharingGetResponse(BaseModel):
+    id: str
+    """Share identifier tag."""
+
+    account_id: str
+    """Account identifier."""
+
+    account_name: str
+    """The display name of an account."""
+
+    created: datetime
+    """When the share was created."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    name: str
+    """The name of the share."""
+
+    organization_id: str
+    """Organization identifier."""
+
+    status: Literal["active", "deleting", "deleted"]
+
+    target_type: Literal["account", "organization"]
+
+    associated_recipient_count: Optional[int] = None
+    """The number of recipients in the 'associated' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    associating_recipient_count: Optional[int] = None
+    """The number of recipients in the 'associating' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    disassociated_recipient_count: Optional[int] = None
+    """The number of recipients in the 'disassociated' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    disassociating_recipient_count: Optional[int] = None
+    """The number of recipients in the 'disassociating' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    kind: Optional[Literal["sent", "received"]] = None
+
+    resources: Optional[List[Resource]] = None
+    """A list of resources that are part of the share.
+
+    This field is only included when requested via the 'include_resources'
+    parameter.
+    """
diff --git a/src/cloudflare/types/resource_sharing/resource_sharing_list_params.py b/src/cloudflare/types/resource_sharing/resource_sharing_list_params.py
new file mode 100644
index 00000000000..fc18c2f88d5
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/resource_sharing_list_params.py
@@ -0,0 +1,52 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["ResourceSharingListParams"]
+
+
+class ResourceSharingListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier."""
+
+    direction: Literal["asc", "desc"]
+    """Direction to sort objects."""
+
+    include_recipient_counts: bool
+    """Include recipient counts in the response."""
+
+    include_resources: bool
+    """Include resources in the response."""
+
+    kind: Literal["sent", "received"]
+    """Filter shares by kind."""
+
+    order: Literal["name", "created"]
+    """Order shares by values in the given field."""
+
+    page: int
+    """Page number."""
+
+    per_page: int
+    """Number of objects to return per page."""
+
+    resource_types: List[
+        Literal[
+            "custom-ruleset",
+            "widget",
+            "gateway-policy",
+            "gateway-destination-ip",
+            "gateway-block-page-settings",
+            "gateway-extended-email-matching",
+        ]
+    ]
+    """Filter share resources by resource_types."""
+
+    status: Literal["active", "deleting", "deleted"]
+    """Filter shares by status."""
+
+    target_type: Literal["account", "organization"]
+    """Filter shares by target_type."""
diff --git a/src/cloudflare/types/resource_sharing/resource_sharing_list_response.py b/src/cloudflare/types/resource_sharing/resource_sharing_list_response.py
new file mode 100644
index 00000000000..6f5e2e494b7
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/resource_sharing_list_response.py
@@ -0,0 +1,109 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["ResourceSharingListResponse", "Resource"]
+
+
+class Resource(BaseModel):
+    id: str
+    """Share Resource identifier."""
+
+    created: datetime
+    """When the share was created."""
+
+    meta: object
+    """Resource Metadata."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    resource_account_id: str
+    """Account identifier."""
+
+    resource_id: str
+    """Share Resource identifier."""
+
+    resource_type: Literal[
+        "custom-ruleset",
+        "widget",
+        "gateway-policy",
+        "gateway-destination-ip",
+        "gateway-block-page-settings",
+        "gateway-extended-email-matching",
+    ]
+    """Resource Type."""
+
+    resource_version: int
+    """Resource Version."""
+
+    status: Literal["active", "deleting", "deleted"]
+    """Resource Status."""
+
+
+class ResourceSharingListResponse(BaseModel):
+    id: str
+    """Share identifier tag."""
+
+    account_id: str
+    """Account identifier."""
+
+    account_name: str
+    """The display name of an account."""
+
+    created: datetime
+    """When the share was created."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    name: str
+    """The name of the share."""
+
+    organization_id: str
+    """Organization identifier."""
+
+    status: Literal["active", "deleting", "deleted"]
+
+    target_type: Literal["account", "organization"]
+
+    associated_recipient_count: Optional[int] = None
+    """The number of recipients in the 'associated' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    associating_recipient_count: Optional[int] = None
+    """The number of recipients in the 'associating' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    disassociated_recipient_count: Optional[int] = None
+    """The number of recipients in the 'disassociated' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    disassociating_recipient_count: Optional[int] = None
+    """The number of recipients in the 'disassociating' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    kind: Optional[Literal["sent", "received"]] = None
+
+    resources: Optional[List[Resource]] = None
+    """A list of resources that are part of the share.
+
+    This field is only included when requested via the 'include_resources'
+    parameter.
+    """
diff --git a/src/cloudflare/types/resource_sharing/resource_sharing_update_params.py b/src/cloudflare/types/resource_sharing/resource_sharing_update_params.py
new file mode 100644
index 00000000000..6d796532f5a
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/resource_sharing_update_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ResourceSharingUpdateParams"]
+
+
+class ResourceSharingUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier."""
+
+    name: Required[str]
+    """The name of the share."""
diff --git a/src/cloudflare/types/resource_sharing/resource_sharing_update_response.py b/src/cloudflare/types/resource_sharing/resource_sharing_update_response.py
new file mode 100644
index 00000000000..09ce8b67436
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/resource_sharing_update_response.py
@@ -0,0 +1,109 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["ResourceSharingUpdateResponse", "Resource"]
+
+
+class Resource(BaseModel):
+    id: str
+    """Share Resource identifier."""
+
+    created: datetime
+    """When the share was created."""
+
+    meta: object
+    """Resource Metadata."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    resource_account_id: str
+    """Account identifier."""
+
+    resource_id: str
+    """Share Resource identifier."""
+
+    resource_type: Literal[
+        "custom-ruleset",
+        "widget",
+        "gateway-policy",
+        "gateway-destination-ip",
+        "gateway-block-page-settings",
+        "gateway-extended-email-matching",
+    ]
+    """Resource Type."""
+
+    resource_version: int
+    """Resource Version."""
+
+    status: Literal["active", "deleting", "deleted"]
+    """Resource Status."""
+
+
+class ResourceSharingUpdateResponse(BaseModel):
+    id: str
+    """Share identifier tag."""
+
+    account_id: str
+    """Account identifier."""
+
+    account_name: str
+    """The display name of an account."""
+
+    created: datetime
+    """When the share was created."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    name: str
+    """The name of the share."""
+
+    organization_id: str
+    """Organization identifier."""
+
+    status: Literal["active", "deleting", "deleted"]
+
+    target_type: Literal["account", "organization"]
+
+    associated_recipient_count: Optional[int] = None
+    """The number of recipients in the 'associated' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    associating_recipient_count: Optional[int] = None
+    """The number of recipients in the 'associating' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    disassociated_recipient_count: Optional[int] = None
+    """The number of recipients in the 'disassociated' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    disassociating_recipient_count: Optional[int] = None
+    """The number of recipients in the 'disassociating' state.
+
+    This field is only included when requested via the 'include_recipient_counts'
+    parameter.
+    """
+
+    kind: Optional[Literal["sent", "received"]] = None
+
+    resources: Optional[List[Resource]] = None
+    """A list of resources that are part of the share.
+
+    This field is only included when requested via the 'include_resources'
+    parameter.
+    """
diff --git a/src/cloudflare/types/resource_sharing/resource_update_params.py b/src/cloudflare/types/resource_sharing/resource_update_params.py
new file mode 100644
index 00000000000..d69bbdc0eb0
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/resource_update_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ResourceUpdateParams"]
+
+
+class ResourceUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier."""
+
+    share_id: Required[str]
+    """Share identifier tag."""
+
+    meta: Required[object]
+    """Resource Metadata."""
diff --git a/src/cloudflare/types/resource_sharing/resource_update_response.py b/src/cloudflare/types/resource_sharing/resource_update_response.py
new file mode 100644
index 00000000000..4d8f24e508b
--- /dev/null
+++ b/src/cloudflare/types/resource_sharing/resource_update_response.py
@@ -0,0 +1,44 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["ResourceUpdateResponse"]
+
+
+class ResourceUpdateResponse(BaseModel):
+    id: str
+    """Share Resource identifier."""
+
+    created: datetime
+    """When the share was created."""
+
+    meta: object
+    """Resource Metadata."""
+
+    modified: datetime
+    """When the share was modified."""
+
+    resource_account_id: str
+    """Account identifier."""
+
+    resource_id: str
+    """Share Resource identifier."""
+
+    resource_type: Literal[
+        "custom-ruleset",
+        "widget",
+        "gateway-policy",
+        "gateway-destination-ip",
+        "gateway-block-page-settings",
+        "gateway-extended-email-matching",
+    ]
+    """Resource Type."""
+
+    resource_version: int
+    """Resource Version."""
+
+    status: Literal["active", "deleting", "deleted"]
+    """Resource Status."""
diff --git a/src/cloudflare/types/rules/__init__.py b/src/cloudflare/types/rules/__init__.py
index f1b0f21a485..7dc2efb5d9b 100644
--- a/src/cloudflare/types/rules/__init__.py
+++ b/src/cloudflare/types/rules/__init__.py
@@ -7,6 +7,9 @@
 from .lists_list import ListsList as ListsList
 from .hostname_param import HostnameParam as HostnameParam
 from .redirect_param import RedirectParam as RedirectParam
+from .list_get_response import ListGetResponse as ListGetResponse
 from .list_create_params import ListCreateParams as ListCreateParams
 from .list_update_params import ListUpdateParams as ListUpdateParams
+from .list_create_response import ListCreateResponse as ListCreateResponse
 from .list_delete_response import ListDeleteResponse as ListDeleteResponse
+from .list_update_response import ListUpdateResponse as ListUpdateResponse
diff --git a/src/cloudflare/types/rules/hostname.py b/src/cloudflare/types/rules/hostname.py
index f08bcc8a39e..94737e1ceb7 100644
--- a/src/cloudflare/types/rules/hostname.py
+++ b/src/cloudflare/types/rules/hostname.py
@@ -1,5 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import Optional
 
 from ..._models import BaseModel
 
@@ -7,4 +8,15 @@
 
 
 class Hostname(BaseModel):
+    """
+    Valid characters for hostnames are ASCII(7) letters from a to z, the digits from 0 to 9, wildcards (*), and the hyphen (-).
+    """
+
     url_hostname: str
+
+    exclude_exact_hostname: Optional[bool] = None
+    """Only applies to wildcard hostnames (e.g., \\**.example.com).
+
+    When true (default), only subdomains are blocked. When false, both the root
+    domain and subdomains are blocked.
+    """
diff --git a/src/cloudflare/types/rules/hostname_param.py b/src/cloudflare/types/rules/hostname_param.py
index 280651700b2..86c3bddae0e 100644
--- a/src/cloudflare/types/rules/hostname_param.py
+++ b/src/cloudflare/types/rules/hostname_param.py
@@ -8,4 +8,15 @@
 
 
 class HostnameParam(TypedDict, total=False):
+    """
+    Valid characters for hostnames are ASCII(7) letters from a to z, the digits from 0 to 9, wildcards (*), and the hyphen (-).
+    """
+
     url_hostname: Required[str]
+
+    exclude_exact_hostname: bool
+    """Only applies to wildcard hostnames (e.g., \\**.example.com).
+
+    When true (default), only subdomains are blocked. When false, both the root
+    domain and subdomains are blocked.
+    """
diff --git a/src/cloudflare/types/rules/list_create_params.py b/src/cloudflare/types/rules/list_create_params.py
index 31bf0a666a6..a0ecda97394 100644
--- a/src/cloudflare/types/rules/list_create_params.py
+++ b/src/cloudflare/types/rules/list_create_params.py
@@ -9,7 +9,7 @@
 
 class ListCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """The Account ID for this resource."""
 
     kind: Required[Literal["ip", "redirect", "hostname", "asn"]]
     """The type of the list.
diff --git a/src/cloudflare/types/rules/list_create_response.py b/src/cloudflare/types/rules/list_create_response.py
new file mode 100644
index 00000000000..de16c3a9099
--- /dev/null
+++ b/src/cloudflare/types/rules/list_create_response.py
@@ -0,0 +1,38 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["ListCreateResponse"]
+
+
+class ListCreateResponse(BaseModel):
+    id: str
+    """The unique ID of the list."""
+
+    created_on: str
+    """The RFC 3339 timestamp of when the list was created."""
+
+    kind: Literal["ip", "redirect", "hostname", "asn"]
+    """The type of the list.
+
+    Each type supports specific list items (IP addresses, ASNs, hostnames or
+    redirects).
+    """
+
+    modified_on: str
+    """The RFC 3339 timestamp of when the list was last modified."""
+
+    name: str
+    """An informative name for the list. Use this name in filter and rule expressions."""
+
+    num_items: float
+    """The number of items in the list."""
+
+    num_referencing_filters: float
+    """The number of [filters](/api/resources/filters/) referencing the list."""
+
+    description: Optional[str] = None
+    """An informative summary of the list."""
diff --git a/src/cloudflare/types/rules/list_delete_response.py b/src/cloudflare/types/rules/list_delete_response.py
index eb08d0c7f40..eab287e168d 100644
--- a/src/cloudflare/types/rules/list_delete_response.py
+++ b/src/cloudflare/types/rules/list_delete_response.py
@@ -1,12 +1,10 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
-
 from ..._models import BaseModel
 
 __all__ = ["ListDeleteResponse"]
 
 
 class ListDeleteResponse(BaseModel):
-    id: Optional[str] = None
-    """The unique ID of the item in the List."""
+    id: str
+    """The unique ID of the list."""
diff --git a/src/cloudflare/types/rules/list_get_response.py b/src/cloudflare/types/rules/list_get_response.py
new file mode 100644
index 00000000000..7ae2c6a849b
--- /dev/null
+++ b/src/cloudflare/types/rules/list_get_response.py
@@ -0,0 +1,38 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["ListGetResponse"]
+
+
+class ListGetResponse(BaseModel):
+    id: str
+    """The unique ID of the list."""
+
+    created_on: str
+    """The RFC 3339 timestamp of when the list was created."""
+
+    kind: Literal["ip", "redirect", "hostname", "asn"]
+    """The type of the list.
+
+    Each type supports specific list items (IP addresses, ASNs, hostnames or
+    redirects).
+    """
+
+    modified_on: str
+    """The RFC 3339 timestamp of when the list was last modified."""
+
+    name: str
+    """An informative name for the list. Use this name in filter and rule expressions."""
+
+    num_items: float
+    """The number of items in the list."""
+
+    num_referencing_filters: float
+    """The number of [filters](/api/resources/filters/) referencing the list."""
+
+    description: Optional[str] = None
+    """An informative summary of the list."""
diff --git a/src/cloudflare/types/rules/list_update_params.py b/src/cloudflare/types/rules/list_update_params.py
index 055a88fca84..1b37842360b 100644
--- a/src/cloudflare/types/rules/list_update_params.py
+++ b/src/cloudflare/types/rules/list_update_params.py
@@ -9,7 +9,7 @@
 
 class ListUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """The Account ID for this resource."""
 
     description: str
     """An informative summary of the list."""
diff --git a/src/cloudflare/types/rules/list_update_response.py b/src/cloudflare/types/rules/list_update_response.py
new file mode 100644
index 00000000000..5339175eb58
--- /dev/null
+++ b/src/cloudflare/types/rules/list_update_response.py
@@ -0,0 +1,38 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["ListUpdateResponse"]
+
+
+class ListUpdateResponse(BaseModel):
+    id: str
+    """The unique ID of the list."""
+
+    created_on: str
+    """The RFC 3339 timestamp of when the list was created."""
+
+    kind: Literal["ip", "redirect", "hostname", "asn"]
+    """The type of the list.
+
+    Each type supports specific list items (IP addresses, ASNs, hostnames or
+    redirects).
+    """
+
+    modified_on: str
+    """The RFC 3339 timestamp of when the list was last modified."""
+
+    name: str
+    """An informative name for the list. Use this name in filter and rule expressions."""
+
+    num_items: float
+    """The number of items in the list."""
+
+    num_referencing_filters: float
+    """The number of [filters](/api/resources/filters/) referencing the list."""
+
+    description: Optional[str] = None
+    """An informative summary of the list."""
diff --git a/src/cloudflare/types/rules/lists/__init__.py b/src/cloudflare/types/rules/lists/__init__.py
index 00311bac0d6..0208e605acf 100644
--- a/src/cloudflare/types/rules/lists/__init__.py
+++ b/src/cloudflare/types/rules/lists/__init__.py
@@ -4,9 +4,10 @@
 
 from .list_cursor import ListCursor as ListCursor
 from .item_list_params import ItemListParams as ItemListParams
-from .operation_status import OperationStatus as OperationStatus
 from .item_get_response import ItemGetResponse as ItemGetResponse
 from .item_create_params import ItemCreateParams as ItemCreateParams
+from .item_delete_params import ItemDeleteParams as ItemDeleteParams
+from .item_list_response import ItemListResponse as ItemListResponse
 from .item_update_params import ItemUpdateParams as ItemUpdateParams
 from .item_create_response import ItemCreateResponse as ItemCreateResponse
 from .item_delete_response import ItemDeleteResponse as ItemDeleteResponse
diff --git a/src/cloudflare/types/rules/lists/bulk_operation_get_response.py b/src/cloudflare/types/rules/lists/bulk_operation_get_response.py
index 1ef00dc67c4..47b595ff560 100644
--- a/src/cloudflare/types/rules/lists/bulk_operation_get_response.py
+++ b/src/cloudflare/types/rules/lists/bulk_operation_get_response.py
@@ -1,7 +1,51 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import Union
+from typing_extensions import Literal, TypeAlias
 
-__all__ = ["BulkOperationGetResponse"]
+from ...._models import BaseModel
 
-BulkOperationGetResponse = List[object]
+__all__ = [
+    "BulkOperationGetResponse",
+    "ListsBulkOperationPendingOrRunning",
+    "ListsBulkOperationCompleted",
+    "ListsBulkOperationFailed",
+]
+
+
+class ListsBulkOperationPendingOrRunning(BaseModel):
+    id: str
+    """The unique operation ID of the asynchronous action."""
+
+    status: Literal["pending", "running"]
+    """The current status of the asynchronous operation."""
+
+
+class ListsBulkOperationCompleted(BaseModel):
+    id: str
+    """The unique operation ID of the asynchronous action."""
+
+    completed: str
+    """The RFC 3339 timestamp of when the operation was completed."""
+
+    status: Literal["completed"]
+    """The current status of the asynchronous operation."""
+
+
+class ListsBulkOperationFailed(BaseModel):
+    id: str
+    """The unique operation ID of the asynchronous action."""
+
+    completed: str
+    """The RFC 3339 timestamp of when the operation was completed."""
+
+    error: str
+    """A message describing the error when the status is `failed`."""
+
+    status: Literal["failed"]
+    """The current status of the asynchronous operation."""
+
+
+BulkOperationGetResponse: TypeAlias = Union[
+    ListsBulkOperationPendingOrRunning, ListsBulkOperationCompleted, ListsBulkOperationFailed
+]
diff --git a/src/cloudflare/types/rules/lists/item_create_params.py b/src/cloudflare/types/rules/lists/item_create_params.py
index 8db16c19fcf..d8d4e8646eb 100644
--- a/src/cloudflare/types/rules/lists/item_create_params.py
+++ b/src/cloudflare/types/rules/lists/item_create_params.py
@@ -2,40 +2,67 @@
 
 from __future__ import annotations
 
-from typing import Iterable
-from typing_extensions import Required, TypedDict
+from typing import Union, Iterable
+from typing_extensions import Required, TypeAlias, TypedDict
 
 from ..hostname_param import HostnameParam
 from ..redirect_param import RedirectParam
 
-__all__ = ["ItemCreateParams", "Body"]
+__all__ = [
+    "ItemCreateParams",
+    "Body",
+    "BodyListsListItemIPComment",
+    "BodyListsListItemRedirectComment",
+    "BodyListsListItemHostnameComment",
+    "BodyListsListItemASNComment",
+]
 
 
 class ItemCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """The Account ID for this resource."""
 
     body: Required[Iterable[Body]]
 
 
-class Body(TypedDict, total=False):
-    asn: int
-    """A non-negative 32 bit integer"""
+class BodyListsListItemIPComment(TypedDict, total=False):
+    ip: Required[str]
+    """An IPv4 address, an IPv4 CIDR, an IPv6 address, or an IPv6 CIDR."""
 
     comment: str
-    """An informative summary of the list item."""
+    """Defines an informative summary of the list item."""
 
-    hostname: HostnameParam
+
+class BodyListsListItemRedirectComment(TypedDict, total=False):
+    redirect: Required[RedirectParam]
+    """The definition of the redirect."""
+
+    comment: str
+    """Defines an informative summary of the list item."""
+
+
+class BodyListsListItemHostnameComment(TypedDict, total=False):
+    hostname: Required[HostnameParam]
     """
     Valid characters for hostnames are ASCII(7) letters from a to z, the digits from
     0 to 9, wildcards (\\**), and the hyphen (-).
     """
 
-    ip: str
-    """An IPv4 address, an IPv4 CIDR, or an IPv6 CIDR.
+    comment: str
+    """Defines an informative summary of the list item."""
 
-    IPv6 CIDRs are limited to a maximum of /64.
-    """
 
-    redirect: RedirectParam
-    """The definition of the redirect."""
+class BodyListsListItemASNComment(TypedDict, total=False):
+    asn: Required[int]
+    """Defines a non-negative 32 bit integer."""
+
+    comment: str
+    """Defines an informative summary of the list item."""
+
+
+Body: TypeAlias = Union[
+    BodyListsListItemIPComment,
+    BodyListsListItemRedirectComment,
+    BodyListsListItemHostnameComment,
+    BodyListsListItemASNComment,
+]
diff --git a/src/cloudflare/types/rules/lists/item_create_response.py b/src/cloudflare/types/rules/lists/item_create_response.py
index 4f22d14d393..6598e73dba3 100644
--- a/src/cloudflare/types/rules/lists/item_create_response.py
+++ b/src/cloudflare/types/rules/lists/item_create_response.py
@@ -1,12 +1,10 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
-
 from ...._models import BaseModel
 
 __all__ = ["ItemCreateResponse"]
 
 
 class ItemCreateResponse(BaseModel):
-    operation_id: Optional[str] = None
+    operation_id: str
     """The unique operation ID of the asynchronous action."""
diff --git a/src/cloudflare/types/rules/lists/item_delete_params.py b/src/cloudflare/types/rules/lists/item_delete_params.py
new file mode 100644
index 00000000000..9ab6856dad9
--- /dev/null
+++ b/src/cloudflare/types/rules/lists/item_delete_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ItemDeleteParams", "Item"]
+
+
+class ItemDeleteParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The Account ID for this resource."""
+
+    items: Iterable[Item]
+
+
+class Item(TypedDict, total=False):
+    id: Required[str]
+    """Defines the unique ID of the item in the List."""
diff --git a/src/cloudflare/types/rules/lists/item_delete_response.py b/src/cloudflare/types/rules/lists/item_delete_response.py
index 3b0bf9835a9..dd46b738ce3 100644
--- a/src/cloudflare/types/rules/lists/item_delete_response.py
+++ b/src/cloudflare/types/rules/lists/item_delete_response.py
@@ -1,12 +1,10 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
-
 from ...._models import BaseModel
 
 __all__ = ["ItemDeleteResponse"]
 
 
 class ItemDeleteResponse(BaseModel):
-    operation_id: Optional[str] = None
+    operation_id: str
     """The unique operation ID of the asynchronous action."""
diff --git a/src/cloudflare/types/rules/lists/item_get_response.py b/src/cloudflare/types/rules/lists/item_get_response.py
index 8d3a3426193..d29cc63ef6c 100644
--- a/src/cloudflare/types/rules/lists/item_get_response.py
+++ b/src/cloudflare/types/rules/lists/item_get_response.py
@@ -1,10 +1,92 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union
+from typing import Union, Optional
+from typing_extensions import TypeAlias
 
 from ..hostname import Hostname
 from ..redirect import Redirect
+from ...._models import BaseModel
 
-__all__ = ["ItemGetResponse"]
+__all__ = [
+    "ItemGetResponse",
+    "ListsListItemIPFull",
+    "ListsListItemHostnameFull",
+    "ListsListItemRedirectFull",
+    "ListsListItemASNFull",
+]
 
-ItemGetResponse = Union[str, Redirect, Hostname, int, None]
+
+class ListsListItemIPFull(BaseModel):
+    id: str
+    """Defines the unique ID of the item in the List."""
+
+    created_on: str
+    """The RFC 3339 timestamp of when the list was created."""
+
+    ip: str
+    """An IPv4 address, an IPv4 CIDR, an IPv6 address, or an IPv6 CIDR."""
+
+    modified_on: str
+    """The RFC 3339 timestamp of when the list was last modified."""
+
+    comment: Optional[str] = None
+    """Defines an informative summary of the list item."""
+
+
+class ListsListItemHostnameFull(BaseModel):
+    id: str
+    """Defines the unique ID of the item in the List."""
+
+    created_on: str
+    """The RFC 3339 timestamp of when the list was created."""
+
+    hostname: Hostname
+    """
+    Valid characters for hostnames are ASCII(7) letters from a to z, the digits from
+    0 to 9, wildcards (\\**), and the hyphen (-).
+    """
+
+    modified_on: str
+    """The RFC 3339 timestamp of when the list was last modified."""
+
+    comment: Optional[str] = None
+    """Defines an informative summary of the list item."""
+
+
+class ListsListItemRedirectFull(BaseModel):
+    id: str
+    """Defines the unique ID of the item in the List."""
+
+    created_on: str
+    """The RFC 3339 timestamp of when the list was created."""
+
+    modified_on: str
+    """The RFC 3339 timestamp of when the list was last modified."""
+
+    redirect: Redirect
+    """The definition of the redirect."""
+
+    comment: Optional[str] = None
+    """Defines an informative summary of the list item."""
+
+
+class ListsListItemASNFull(BaseModel):
+    id: str
+    """Defines the unique ID of the item in the List."""
+
+    asn: int
+    """Defines a non-negative 32 bit integer."""
+
+    created_on: str
+    """The RFC 3339 timestamp of when the list was created."""
+
+    modified_on: str
+    """The RFC 3339 timestamp of when the list was last modified."""
+
+    comment: Optional[str] = None
+    """Defines an informative summary of the list item."""
+
+
+ItemGetResponse: TypeAlias = Union[
+    ListsListItemIPFull, ListsListItemHostnameFull, ListsListItemRedirectFull, ListsListItemASNFull
+]
diff --git a/src/cloudflare/types/rules/lists/item_list_params.py b/src/cloudflare/types/rules/lists/item_list_params.py
index a62860229aa..55374a19c0b 100644
--- a/src/cloudflare/types/rules/lists/item_list_params.py
+++ b/src/cloudflare/types/rules/lists/item_list_params.py
@@ -9,7 +9,7 @@
 
 class ItemListParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """The Account ID for this resource."""
 
     cursor: str
     """The pagination cursor.
diff --git a/src/cloudflare/types/rules/lists/item_list_response.py b/src/cloudflare/types/rules/lists/item_list_response.py
new file mode 100644
index 00000000000..18bb74d98c8
--- /dev/null
+++ b/src/cloudflare/types/rules/lists/item_list_response.py
@@ -0,0 +1,92 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Union, Optional
+from typing_extensions import TypeAlias
+
+from ..hostname import Hostname
+from ..redirect import Redirect
+from ...._models import BaseModel
+
+__all__ = [
+    "ItemListResponse",
+    "ListsListItemIPFull",
+    "ListsListItemHostnameFull",
+    "ListsListItemRedirectFull",
+    "ListsListItemASNFull",
+]
+
+
+class ListsListItemIPFull(BaseModel):
+    id: str
+    """Defines the unique ID of the item in the List."""
+
+    created_on: str
+    """The RFC 3339 timestamp of when the list was created."""
+
+    ip: str
+    """An IPv4 address, an IPv4 CIDR, an IPv6 address, or an IPv6 CIDR."""
+
+    modified_on: str
+    """The RFC 3339 timestamp of when the list was last modified."""
+
+    comment: Optional[str] = None
+    """Defines an informative summary of the list item."""
+
+
+class ListsListItemHostnameFull(BaseModel):
+    id: str
+    """Defines the unique ID of the item in the List."""
+
+    created_on: str
+    """The RFC 3339 timestamp of when the list was created."""
+
+    hostname: Hostname
+    """
+    Valid characters for hostnames are ASCII(7) letters from a to z, the digits from
+    0 to 9, wildcards (\\**), and the hyphen (-).
+    """
+
+    modified_on: str
+    """The RFC 3339 timestamp of when the list was last modified."""
+
+    comment: Optional[str] = None
+    """Defines an informative summary of the list item."""
+
+
+class ListsListItemRedirectFull(BaseModel):
+    id: str
+    """Defines the unique ID of the item in the List."""
+
+    created_on: str
+    """The RFC 3339 timestamp of when the list was created."""
+
+    modified_on: str
+    """The RFC 3339 timestamp of when the list was last modified."""
+
+    redirect: Redirect
+    """The definition of the redirect."""
+
+    comment: Optional[str] = None
+    """Defines an informative summary of the list item."""
+
+
+class ListsListItemASNFull(BaseModel):
+    id: str
+    """Defines the unique ID of the item in the List."""
+
+    asn: int
+    """Defines a non-negative 32 bit integer."""
+
+    created_on: str
+    """The RFC 3339 timestamp of when the list was created."""
+
+    modified_on: str
+    """The RFC 3339 timestamp of when the list was last modified."""
+
+    comment: Optional[str] = None
+    """Defines an informative summary of the list item."""
+
+
+ItemListResponse: TypeAlias = Union[
+    ListsListItemIPFull, ListsListItemHostnameFull, ListsListItemRedirectFull, ListsListItemASNFull
+]
diff --git a/src/cloudflare/types/rules/lists/item_update_params.py b/src/cloudflare/types/rules/lists/item_update_params.py
index eeec3b2a70d..f61262a02c8 100644
--- a/src/cloudflare/types/rules/lists/item_update_params.py
+++ b/src/cloudflare/types/rules/lists/item_update_params.py
@@ -2,40 +2,67 @@
 
 from __future__ import annotations
 
-from typing import Iterable
-from typing_extensions import Required, TypedDict
+from typing import Union, Iterable
+from typing_extensions import Required, TypeAlias, TypedDict
 
 from ..hostname_param import HostnameParam
 from ..redirect_param import RedirectParam
 
-__all__ = ["ItemUpdateParams", "Body"]
+__all__ = [
+    "ItemUpdateParams",
+    "Body",
+    "BodyListsListItemIPComment",
+    "BodyListsListItemRedirectComment",
+    "BodyListsListItemHostnameComment",
+    "BodyListsListItemASNComment",
+]
 
 
 class ItemUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """The Account ID for this resource."""
 
     body: Required[Iterable[Body]]
 
 
-class Body(TypedDict, total=False):
-    asn: int
-    """A non-negative 32 bit integer"""
+class BodyListsListItemIPComment(TypedDict, total=False):
+    ip: Required[str]
+    """An IPv4 address, an IPv4 CIDR, an IPv6 address, or an IPv6 CIDR."""
 
     comment: str
-    """An informative summary of the list item."""
+    """Defines an informative summary of the list item."""
 
-    hostname: HostnameParam
+
+class BodyListsListItemRedirectComment(TypedDict, total=False):
+    redirect: Required[RedirectParam]
+    """The definition of the redirect."""
+
+    comment: str
+    """Defines an informative summary of the list item."""
+
+
+class BodyListsListItemHostnameComment(TypedDict, total=False):
+    hostname: Required[HostnameParam]
     """
     Valid characters for hostnames are ASCII(7) letters from a to z, the digits from
     0 to 9, wildcards (\\**), and the hyphen (-).
     """
 
-    ip: str
-    """An IPv4 address, an IPv4 CIDR, or an IPv6 CIDR.
+    comment: str
+    """Defines an informative summary of the list item."""
 
-    IPv6 CIDRs are limited to a maximum of /64.
-    """
 
-    redirect: RedirectParam
-    """The definition of the redirect."""
+class BodyListsListItemASNComment(TypedDict, total=False):
+    asn: Required[int]
+    """Defines a non-negative 32 bit integer."""
+
+    comment: str
+    """Defines an informative summary of the list item."""
+
+
+Body: TypeAlias = Union[
+    BodyListsListItemIPComment,
+    BodyListsListItemRedirectComment,
+    BodyListsListItemHostnameComment,
+    BodyListsListItemASNComment,
+]
diff --git a/src/cloudflare/types/rules/lists/item_update_response.py b/src/cloudflare/types/rules/lists/item_update_response.py
index afd2fa83b57..9cf29ab1c84 100644
--- a/src/cloudflare/types/rules/lists/item_update_response.py
+++ b/src/cloudflare/types/rules/lists/item_update_response.py
@@ -1,12 +1,10 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
-
 from ...._models import BaseModel
 
 __all__ = ["ItemUpdateResponse"]
 
 
 class ItemUpdateResponse(BaseModel):
-    operation_id: Optional[str] = None
+    operation_id: str
     """The unique operation ID of the asynchronous action."""
diff --git a/src/cloudflare/types/rules/lists/operation_status.py b/src/cloudflare/types/rules/lists/operation_status.py
deleted file mode 100644
index bf394155fed..00000000000
--- a/src/cloudflare/types/rules/lists/operation_status.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing_extensions import Literal
-
-__all__ = ["OperationStatus"]
-
-OperationStatus = Literal["pending", "running", "completed", "failed"]
diff --git a/src/cloudflare/types/rules/lists_list.py b/src/cloudflare/types/rules/lists_list.py
index 17255b5fa7d..9c2b7edb8e9 100644
--- a/src/cloudflare/types/rules/lists_list.py
+++ b/src/cloudflare/types/rules/lists_list.py
@@ -9,30 +9,30 @@
 
 
 class ListsList(BaseModel):
-    id: Optional[str] = None
+    id: str
     """The unique ID of the list."""
 
-    created_on: Optional[str] = None
+    created_on: str
     """The RFC 3339 timestamp of when the list was created."""
 
-    description: Optional[str] = None
-    """An informative summary of the list."""
-
-    kind: Optional[Literal["ip", "redirect", "hostname", "asn"]] = None
+    kind: Literal["ip", "redirect", "hostname", "asn"]
     """The type of the list.
 
     Each type supports specific list items (IP addresses, ASNs, hostnames or
     redirects).
     """
 
-    modified_on: Optional[str] = None
+    modified_on: str
     """The RFC 3339 timestamp of when the list was last modified."""
 
-    name: Optional[str] = None
+    name: str
     """An informative name for the list. Use this name in filter and rule expressions."""
 
-    num_items: Optional[float] = None
+    num_items: float
     """The number of items in the list."""
 
-    num_referencing_filters: Optional[float] = None
-    """The number of [filters](/operations/filters-list-filters) referencing the list."""
+    num_referencing_filters: float
+    """The number of [filters](/api/resources/filters/) referencing the list."""
+
+    description: Optional[str] = None
+    """An informative summary of the list."""
diff --git a/src/cloudflare/types/rules/redirect.py b/src/cloudflare/types/rules/redirect.py
index e52def9115b..d6d2746824f 100644
--- a/src/cloudflare/types/rules/redirect.py
+++ b/src/cloudflare/types/rules/redirect.py
@@ -9,6 +9,8 @@
 
 
 class Redirect(BaseModel):
+    """The definition of the redirect."""
+
     source_url: str
 
     target_url: str
diff --git a/src/cloudflare/types/rules/redirect_param.py b/src/cloudflare/types/rules/redirect_param.py
index 570fd1d90f7..01f0b356b30 100644
--- a/src/cloudflare/types/rules/redirect_param.py
+++ b/src/cloudflare/types/rules/redirect_param.py
@@ -8,6 +8,8 @@
 
 
 class RedirectParam(TypedDict, total=False):
+    """The definition of the redirect."""
+
     source_url: Required[str]
 
     target_url: Required[str]
diff --git a/src/cloudflare/types/rulesets/__init__.py b/src/cloudflare/types/rulesets/__init__.py
index 8b6885eb3fd..933d9d20abc 100644
--- a/src/cloudflare/types/rulesets/__init__.py
+++ b/src/cloudflare/types/rulesets/__init__.py
@@ -14,17 +14,15 @@
 from .rewrite_rule import RewriteRule as RewriteRule
 from .logging_param import LoggingParam as LoggingParam
 from .redirect_rule import RedirectRule as RedirectRule
-from .challenge_rule import ChallengeRule as ChallengeRule
 from .log_rule_param import LogRuleParam as LogRuleParam
 from .set_config_rule import SetConfigRule as SetConfigRule
 from .skip_rule_param import SkipRuleParam as SkipRuleParam
 from .block_rule_param import BlockRuleParam as BlockRuleParam
-from .rewrite_uri_part import RewriteURIPart as RewriteURIPart
 from .route_rule_param import RouteRuleParam as RouteRuleParam
 from .rule_edit_params import RuleEditParams as RuleEditParams
 from .score_rule_param import ScoreRuleParam as ScoreRuleParam
 from .serve_error_rule import ServeErrorRule as ServeErrorRule
-from .js_challenge_rule import JSChallengeRule as JSChallengeRule
+from .ddos_dynamic_rule import DDoSDynamicRule as DDoSDynamicRule
 from .execute_rule_param import ExecuteRuleParam as ExecuteRuleParam
 from .phase_get_response import PhaseGetResponse as PhaseGetResponse
 from .rewrite_rule_param import RewriteRuleParam as RewriteRuleParam
@@ -32,11 +30,12 @@
 from .rule_edit_response import RuleEditResponse as RuleEditResponse
 from .phase_update_params import PhaseUpdateParams as PhaseUpdateParams
 from .redirect_rule_param import RedirectRuleParam as RedirectRuleParam
-from .challenge_rule_param import ChallengeRuleParam as ChallengeRuleParam
+from .ruleset_list_params import RulesetListParams as RulesetListParams
 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 .log_custom_field_rule import LogCustomFieldRule as LogCustomFieldRule
 from .phase_update_response import PhaseUpdateResponse as PhaseUpdateResponse
 from .ruleset_create_params import RulesetCreateParams as RulesetCreateParams
 from .ruleset_list_response import RulesetListResponse as RulesetListResponse
@@ -45,12 +44,14 @@
 from .version_list_response import VersionListResponse as VersionListResponse
 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 .ddos_dynamic_rule_param import DDoSDynamicRuleParam as DDoSDynamicRuleParam
 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 .force_connection_close_rule import ForceConnectionCloseRule as ForceConnectionCloseRule
+from .log_custom_field_rule_param import LogCustomFieldRuleParam as LogCustomFieldRuleParam
 from .compress_response_rule_param import CompressResponseRuleParam as CompressResponseRuleParam
 from .managed_challenge_rule_param import ManagedChallengeRuleParam as ManagedChallengeRuleParam
 from .set_cache_settings_rule_param import SetCacheSettingsRuleParam as SetCacheSettingsRuleParam
+from .force_connection_close_rule_param import ForceConnectionCloseRuleParam as ForceConnectionCloseRuleParam
diff --git a/src/cloudflare/types/rulesets/block_rule.py b/src/cloudflare/types/rulesets/block_rule.py
index 2efc89a4e2d..61fa89b2bf7 100644
--- a/src/cloudflare/types/rulesets/block_rule.py
+++ b/src/cloudflare/types/rulesets/block_rule.py
@@ -7,10 +7,12 @@
 from .logging import Logging
 from ..._models import BaseModel
 
-__all__ = ["BlockRule", "ActionParameters", "ActionParametersResponse"]
+__all__ = ["BlockRule", "ActionParameters", "ActionParametersResponse", "ExposedCredentialCheck", "Ratelimit"]
 
 
 class ActionParametersResponse(BaseModel):
+    """The response to show when the block is applied."""
+
     content: str
     """The content to return."""
 
@@ -22,10 +24,68 @@ class ActionParametersResponse(BaseModel):
 
 
 class ActionParameters(BaseModel):
+    """The parameters configuring the rule's action."""
+
     response: Optional[ActionParametersResponse] = None
     """The response to show when the block is applied."""
 
 
+class ExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
+
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
 class BlockRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
@@ -51,11 +111,17 @@ class BlockRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[ExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[Ratelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/block_rule_param.py b/src/cloudflare/types/rulesets/block_rule_param.py
index c1ff6a627cf..7eff7a06dc0 100644
--- a/src/cloudflare/types/rulesets/block_rule_param.py
+++ b/src/cloudflare/types/rulesets/block_rule_param.py
@@ -4,12 +4,15 @@
 
 from typing_extensions import Literal, Required, TypedDict
 
+from ..._types import SequenceNotStr
 from .logging_param import LoggingParam
 
-__all__ = ["BlockRuleParam", "ActionParameters", "ActionParametersResponse"]
+__all__ = ["BlockRuleParam", "ActionParameters", "ActionParametersResponse", "ExposedCredentialCheck", "Ratelimit"]
 
 
 class ActionParametersResponse(TypedDict, total=False):
+    """The response to show when the block is applied."""
+
     content: Required[str]
     """The content to return."""
 
@@ -21,10 +24,68 @@ class ActionParametersResponse(TypedDict, total=False):
 
 
 class ActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
     response: ActionParametersResponse
     """The response to show when the block is applied."""
 
 
+class ExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
 class BlockRuleParam(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
@@ -41,11 +102,17 @@ class BlockRuleParam(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Ratelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/challenge_rule.py b/src/cloudflare/types/rulesets/challenge_rule.py
deleted file mode 100644
index 5443d8298e5..00000000000
--- a/src/cloudflare/types/rulesets/challenge_rule.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from datetime import datetime
-from typing_extensions import Literal
-
-from .logging import Logging
-from ..._models import BaseModel
-
-__all__ = ["ChallengeRule"]
-
-
-class ChallengeRule(BaseModel):
-    last_updated: datetime
-    """The timestamp of when the rule was last modified."""
-
-    version: str
-    """The version of the rule."""
-
-    id: Optional[str] = None
-    """The unique ID of the rule."""
-
-    action: Optional[Literal["challenge"]] = None
-    """The action to perform when the rule matches."""
-
-    action_parameters: Optional[object] = None
-    """The parameters configuring the rule's action."""
-
-    categories: Optional[List[str]] = None
-    """The categories of the rule."""
-
-    description: Optional[str] = None
-    """An informative description of the rule."""
-
-    enabled: Optional[bool] = None
-    """Whether the rule should be executed."""
-
-    expression: Optional[str] = None
-    """The expression defining which traffic will match the rule."""
-
-    logging: Optional[Logging] = None
-    """An object configuring the rule's logging behavior."""
-
-    ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
diff --git a/src/cloudflare/types/rulesets/challenge_rule_param.py b/src/cloudflare/types/rulesets/challenge_rule_param.py
deleted file mode 100644
index d430a95a678..00000000000
--- a/src/cloudflare/types/rulesets/challenge_rule_param.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, TypedDict
-
-from .logging_param import LoggingParam
-
-__all__ = ["ChallengeRuleParam"]
-
-
-class ChallengeRuleParam(TypedDict, total=False):
-    id: str
-    """The unique ID of the rule."""
-
-    action: Literal["challenge"]
-    """The action to perform when the rule matches."""
-
-    action_parameters: object
-    """The parameters configuring the rule's action."""
-
-    description: str
-    """An informative description of the rule."""
-
-    enabled: bool
-    """Whether the rule should be executed."""
-
-    expression: str
-    """The expression defining which traffic will match the rule."""
-
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
-
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
diff --git a/src/cloudflare/types/rulesets/compress_response_rule.py b/src/cloudflare/types/rulesets/compress_response_rule.py
index cfadff08d90..8f6125645c7 100644
--- a/src/cloudflare/types/rulesets/compress_response_rule.py
+++ b/src/cloudflare/types/rulesets/compress_response_rule.py
@@ -7,19 +7,85 @@
 from .logging import Logging
 from ..._models import BaseModel
 
-__all__ = ["CompressResponseRule", "ActionParameters", "ActionParametersAlgorithm"]
+__all__ = [
+    "CompressResponseRule",
+    "ActionParameters",
+    "ActionParametersAlgorithm",
+    "ExposedCredentialCheck",
+    "Ratelimit",
+]
 
 
 class ActionParametersAlgorithm(BaseModel):
-    name: Optional[Literal["none", "auto", "default", "gzip", "brotli"]] = None
-    """Name of compression algorithm to enable."""
+    """Compression algorithm to enable."""
+
+    name: Optional[Literal["none", "auto", "default", "gzip", "brotli", "zstd"]] = None
+    """Name of the compression algorithm to enable."""
 
 
 class ActionParameters(BaseModel):
-    algorithms: Optional[List[ActionParametersAlgorithm]] = None
+    """The parameters configuring the rule's action."""
+
+    algorithms: List[ActionParametersAlgorithm]
     """Custom order for compression algorithms."""
 
 
+class ExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
+
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
 class CompressResponseRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
@@ -45,11 +111,17 @@ class CompressResponseRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[ExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[Ratelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/compress_response_rule_param.py b/src/cloudflare/types/rulesets/compress_response_rule_param.py
index 79c4ef44957..2caf924b41d 100644
--- a/src/cloudflare/types/rulesets/compress_response_rule_param.py
+++ b/src/cloudflare/types/rulesets/compress_response_rule_param.py
@@ -3,23 +3,90 @@
 from __future__ import annotations
 
 from typing import Iterable
-from typing_extensions import Literal, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
+from ..._types import SequenceNotStr
 from .logging_param import LoggingParam
 
-__all__ = ["CompressResponseRuleParam", "ActionParameters", "ActionParametersAlgorithm"]
+__all__ = [
+    "CompressResponseRuleParam",
+    "ActionParameters",
+    "ActionParametersAlgorithm",
+    "ExposedCredentialCheck",
+    "Ratelimit",
+]
 
 
 class ActionParametersAlgorithm(TypedDict, total=False):
-    name: Literal["none", "auto", "default", "gzip", "brotli"]
-    """Name of compression algorithm to enable."""
+    """Compression algorithm to enable."""
+
+    name: Literal["none", "auto", "default", "gzip", "brotli", "zstd"]
+    """Name of the compression algorithm to enable."""
 
 
 class ActionParameters(TypedDict, total=False):
-    algorithms: Iterable[ActionParametersAlgorithm]
+    """The parameters configuring the rule's action."""
+
+    algorithms: Required[Iterable[ActionParametersAlgorithm]]
     """Custom order for compression algorithms."""
 
 
+class ExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
 class CompressResponseRuleParam(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
@@ -36,11 +103,17 @@ class CompressResponseRuleParam(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Ratelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/ddos_dynamic_rule.py b/src/cloudflare/types/rulesets/ddos_dynamic_rule.py
new file mode 100644
index 00000000000..f20ca932ab1
--- /dev/null
+++ b/src/cloudflare/types/rulesets/ddos_dynamic_rule.py
@@ -0,0 +1,107 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from .logging import Logging
+from ..._models import BaseModel
+
+__all__ = ["DDoSDynamicRule", "ExposedCredentialCheck", "Ratelimit"]
+
+
+class ExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
+
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class DDoSDynamicRule(BaseModel):
+    last_updated: datetime
+    """The timestamp of when the rule was last modified."""
+
+    version: str
+    """The version of the rule."""
+
+    id: Optional[str] = None
+    """The unique ID of the rule."""
+
+    action: Optional[Literal["ddos_dynamic"]] = None
+    """The action to perform when the rule matches."""
+
+    action_parameters: Optional[object] = None
+    """The parameters configuring the rule's action."""
+
+    categories: Optional[List[str]] = None
+    """The categories of the rule."""
+
+    description: Optional[str] = None
+    """An informative description of the rule."""
+
+    enabled: Optional[bool] = None
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: Optional[ExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
+    expression: Optional[str] = None
+    """The expression defining which traffic will match the rule."""
+
+    logging: Optional[Logging] = None
+    """An object configuring the rule's logging behavior."""
+
+    ratelimit: Optional[Ratelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: Optional[str] = None
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/ddos_dynamic_rule_param.py b/src/cloudflare/types/rulesets/ddos_dynamic_rule_param.py
new file mode 100644
index 00000000000..d150078bb63
--- /dev/null
+++ b/src/cloudflare/types/rulesets/ddos_dynamic_rule_param.py
@@ -0,0 +1,98 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .logging_param import LoggingParam
+
+__all__ = ["DDoSDynamicRuleParam", "ExposedCredentialCheck", "Ratelimit"]
+
+
+class ExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class DDoSDynamicRuleParam(TypedDict, total=False):
+    id: str
+    """The unique ID of the rule."""
+
+    action: Literal["ddos_dynamic"]
+    """The action to perform when the rule matches."""
+
+    action_parameters: object
+    """The parameters configuring the rule's action."""
+
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: ExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    logging: LoggingParam
+    """An object configuring the rule's logging behavior."""
+
+    ratelimit: Ratelimit
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/execute_rule.py b/src/cloudflare/types/rulesets/execute_rule.py
index fc82785cd1a..83dc8ed46e8 100644
--- a/src/cloudflare/types/rulesets/execute_rule.py
+++ b/src/cloudflare/types/rulesets/execute_rule.py
@@ -14,15 +14,21 @@
     "ActionParametersOverrides",
     "ActionParametersOverridesCategory",
     "ActionParametersOverridesRule",
+    "ExposedCredentialCheck",
+    "Ratelimit",
 ]
 
 
 class ActionParametersMatchedData(BaseModel):
+    """The configuration to use for matched data logging."""
+
     public_key: str
     """The public key to encrypt matched data logs with."""
 
 
 class ActionParametersOverridesCategory(BaseModel):
+    """A category-level override."""
+
     category: str
     """The name of the category to override."""
 
@@ -33,10 +39,15 @@ class ActionParametersOverridesCategory(BaseModel):
     """Whether to enable execution of rules in the category."""
 
     sensitivity_level: Optional[Literal["default", "medium", "low", "eoff"]] = None
-    """The sensitivity level to use for rules in the category."""
+    """The sensitivity level to use for rules in the category.
+
+    This option is only applicable for DDoS phases.
+    """
 
 
 class ActionParametersOverridesRule(BaseModel):
+    """A rule-level override."""
+
     id: str
     """The ID of the rule to override."""
 
@@ -50,10 +61,15 @@ class ActionParametersOverridesRule(BaseModel):
     """The score threshold to use for the rule."""
 
     sensitivity_level: Optional[Literal["default", "medium", "low", "eoff"]] = None
-    """The sensitivity level to use for the rule."""
+    """The sensitivity level to use for the rule.
+
+    This option is only applicable for DDoS phases.
+    """
 
 
 class ActionParametersOverrides(BaseModel):
+    """A set of overrides to apply to the target ruleset."""
+
     action: Optional[str] = None
     """An action to override all rules with.
 
@@ -84,6 +100,8 @@ class ActionParametersOverrides(BaseModel):
 
 
 class ActionParameters(BaseModel):
+    """The parameters configuring the rule's action."""
+
     id: str
     """The ID of the ruleset to execute."""
 
@@ -94,6 +112,62 @@ class ActionParameters(BaseModel):
     """A set of overrides to apply to the target ruleset."""
 
 
+class ExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
+
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
 class ExecuteRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
@@ -119,11 +193,17 @@ class ExecuteRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[ExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[Ratelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/execute_rule_param.py b/src/cloudflare/types/rulesets/execute_rule_param.py
index e720f682577..e9ba2dd6941 100644
--- a/src/cloudflare/types/rulesets/execute_rule_param.py
+++ b/src/cloudflare/types/rulesets/execute_rule_param.py
@@ -5,6 +5,7 @@
 from typing import Iterable
 from typing_extensions import Literal, Required, TypedDict
 
+from ..._types import SequenceNotStr
 from .logging_param import LoggingParam
 
 __all__ = [
@@ -14,15 +15,21 @@
     "ActionParametersOverrides",
     "ActionParametersOverridesCategory",
     "ActionParametersOverridesRule",
+    "ExposedCredentialCheck",
+    "Ratelimit",
 ]
 
 
 class ActionParametersMatchedData(TypedDict, total=False):
+    """The configuration to use for matched data logging."""
+
     public_key: Required[str]
     """The public key to encrypt matched data logs with."""
 
 
 class ActionParametersOverridesCategory(TypedDict, total=False):
+    """A category-level override."""
+
     category: Required[str]
     """The name of the category to override."""
 
@@ -33,10 +40,15 @@ class ActionParametersOverridesCategory(TypedDict, total=False):
     """Whether to enable execution of rules in the category."""
 
     sensitivity_level: Literal["default", "medium", "low", "eoff"]
-    """The sensitivity level to use for rules in the category."""
+    """The sensitivity level to use for rules in the category.
+
+    This option is only applicable for DDoS phases.
+    """
 
 
 class ActionParametersOverridesRule(TypedDict, total=False):
+    """A rule-level override."""
+
     id: Required[str]
     """The ID of the rule to override."""
 
@@ -50,10 +62,15 @@ class ActionParametersOverridesRule(TypedDict, total=False):
     """The score threshold to use for the rule."""
 
     sensitivity_level: Literal["default", "medium", "low", "eoff"]
-    """The sensitivity level to use for the rule."""
+    """The sensitivity level to use for the rule.
+
+    This option is only applicable for DDoS phases.
+    """
 
 
 class ActionParametersOverrides(TypedDict, total=False):
+    """A set of overrides to apply to the target ruleset."""
+
     action: str
     """An action to override all rules with.
 
@@ -84,6 +101,8 @@ class ActionParametersOverrides(TypedDict, total=False):
 
 
 class ActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
     id: Required[str]
     """The ID of the ruleset to execute."""
 
@@ -94,6 +113,62 @@ class ActionParameters(TypedDict, total=False):
     """A set of overrides to apply to the target ruleset."""
 
 
+class ExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
 class ExecuteRuleParam(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
@@ -110,11 +185,17 @@ class ExecuteRuleParam(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Ratelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/force_connection_close_rule.py b/src/cloudflare/types/rulesets/force_connection_close_rule.py
new file mode 100644
index 00000000000..230d272aa4a
--- /dev/null
+++ b/src/cloudflare/types/rulesets/force_connection_close_rule.py
@@ -0,0 +1,107 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from .logging import Logging
+from ..._models import BaseModel
+
+__all__ = ["ForceConnectionCloseRule", "ExposedCredentialCheck", "Ratelimit"]
+
+
+class ExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
+
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class ForceConnectionCloseRule(BaseModel):
+    last_updated: datetime
+    """The timestamp of when the rule was last modified."""
+
+    version: str
+    """The version of the rule."""
+
+    id: Optional[str] = None
+    """The unique ID of the rule."""
+
+    action: Optional[Literal["force_connection_close"]] = None
+    """The action to perform when the rule matches."""
+
+    action_parameters: Optional[object] = None
+    """The parameters configuring the rule's action."""
+
+    categories: Optional[List[str]] = None
+    """The categories of the rule."""
+
+    description: Optional[str] = None
+    """An informative description of the rule."""
+
+    enabled: Optional[bool] = None
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: Optional[ExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
+    expression: Optional[str] = None
+    """The expression defining which traffic will match the rule."""
+
+    logging: Optional[Logging] = None
+    """An object configuring the rule's logging behavior."""
+
+    ratelimit: Optional[Ratelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: Optional[str] = None
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/force_connection_close_rule_param.py b/src/cloudflare/types/rulesets/force_connection_close_rule_param.py
new file mode 100644
index 00000000000..9460ef34feb
--- /dev/null
+++ b/src/cloudflare/types/rulesets/force_connection_close_rule_param.py
@@ -0,0 +1,98 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .logging_param import LoggingParam
+
+__all__ = ["ForceConnectionCloseRuleParam", "ExposedCredentialCheck", "Ratelimit"]
+
+
+class ExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class ForceConnectionCloseRuleParam(TypedDict, total=False):
+    id: str
+    """The unique ID of the rule."""
+
+    action: Literal["force_connection_close"]
+    """The action to perform when the rule matches."""
+
+    action_parameters: object
+    """The parameters configuring the rule's action."""
+
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: ExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    logging: LoggingParam
+    """An object configuring the rule's logging behavior."""
+
+    ratelimit: Ratelimit
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/js_challenge_rule.py b/src/cloudflare/types/rulesets/js_challenge_rule.py
deleted file mode 100644
index 7e1325ba2e3..00000000000
--- a/src/cloudflare/types/rulesets/js_challenge_rule.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from datetime import datetime
-from typing_extensions import Literal
-
-from .logging import Logging
-from ..._models import BaseModel
-
-__all__ = ["JSChallengeRule"]
-
-
-class JSChallengeRule(BaseModel):
-    last_updated: datetime
-    """The timestamp of when the rule was last modified."""
-
-    version: str
-    """The version of the rule."""
-
-    id: Optional[str] = None
-    """The unique ID of the rule."""
-
-    action: Optional[Literal["js_challenge"]] = None
-    """The action to perform when the rule matches."""
-
-    action_parameters: Optional[object] = None
-    """The parameters configuring the rule's action."""
-
-    categories: Optional[List[str]] = None
-    """The categories of the rule."""
-
-    description: Optional[str] = None
-    """An informative description of the rule."""
-
-    enabled: Optional[bool] = None
-    """Whether the rule should be executed."""
-
-    expression: Optional[str] = None
-    """The expression defining which traffic will match the rule."""
-
-    logging: Optional[Logging] = None
-    """An object configuring the rule's logging behavior."""
-
-    ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
diff --git a/src/cloudflare/types/rulesets/js_challenge_rule_param.py b/src/cloudflare/types/rulesets/js_challenge_rule_param.py
deleted file mode 100644
index ded155dfeb2..00000000000
--- a/src/cloudflare/types/rulesets/js_challenge_rule_param.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, TypedDict
-
-from .logging_param import LoggingParam
-
-__all__ = ["JSChallengeRuleParam"]
-
-
-class JSChallengeRuleParam(TypedDict, total=False):
-    id: str
-    """The unique ID of the rule."""
-
-    action: Literal["js_challenge"]
-    """The action to perform when the rule matches."""
-
-    action_parameters: object
-    """The parameters configuring the rule's action."""
-
-    description: str
-    """An informative description of the rule."""
-
-    enabled: bool
-    """Whether the rule should be executed."""
-
-    expression: str
-    """The expression defining which traffic will match the rule."""
-
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
-
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
diff --git a/src/cloudflare/types/rulesets/kind.py b/src/cloudflare/types/rulesets/kind.py
index d738a069920..cb07932d7e0 100644
--- a/src/cloudflare/types/rulesets/kind.py
+++ b/src/cloudflare/types/rulesets/kind.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["Kind"]
 
-Kind = Literal["managed", "custom", "root", "zone"]
+Kind: TypeAlias = Literal["managed", "custom", "root", "zone"]
diff --git a/src/cloudflare/types/rulesets/log_custom_field_rule.py b/src/cloudflare/types/rulesets/log_custom_field_rule.py
new file mode 100644
index 00000000000..e66dcc3c0f9
--- /dev/null
+++ b/src/cloudflare/types/rulesets/log_custom_field_rule.py
@@ -0,0 +1,177 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from .logging import Logging
+from ..._models import BaseModel
+
+__all__ = [
+    "LogCustomFieldRule",
+    "ActionParameters",
+    "ActionParametersCookieField",
+    "ActionParametersRawResponseField",
+    "ActionParametersRequestField",
+    "ActionParametersResponseField",
+    "ActionParametersTransformedRequestField",
+    "ExposedCredentialCheck",
+    "Ratelimit",
+]
+
+
+class ActionParametersCookieField(BaseModel):
+    """The cookie field to log."""
+
+    name: str
+    """The name of the cookie."""
+
+
+class ActionParametersRawResponseField(BaseModel):
+    """The raw response field to log."""
+
+    name: str
+    """The name of the response header."""
+
+    preserve_duplicates: Optional[bool] = None
+    """Whether to log duplicate values of the same header."""
+
+
+class ActionParametersRequestField(BaseModel):
+    """The raw request field to log."""
+
+    name: str
+    """The name of the header."""
+
+
+class ActionParametersResponseField(BaseModel):
+    """The transformed response field to log."""
+
+    name: str
+    """The name of the response header."""
+
+    preserve_duplicates: Optional[bool] = None
+    """Whether to log duplicate values of the same header."""
+
+
+class ActionParametersTransformedRequestField(BaseModel):
+    """The transformed request field to log."""
+
+    name: str
+    """The name of the header."""
+
+
+class ActionParameters(BaseModel):
+    """The parameters configuring the rule's action."""
+
+    cookie_fields: Optional[List[ActionParametersCookieField]] = None
+    """The cookie fields to log."""
+
+    raw_response_fields: Optional[List[ActionParametersRawResponseField]] = None
+    """The raw response fields to log."""
+
+    request_fields: Optional[List[ActionParametersRequestField]] = None
+    """The raw request fields to log."""
+
+    response_fields: Optional[List[ActionParametersResponseField]] = None
+    """The transformed response fields to log."""
+
+    transformed_request_fields: Optional[List[ActionParametersTransformedRequestField]] = None
+    """The transformed request fields to log."""
+
+
+class ExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
+
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class LogCustomFieldRule(BaseModel):
+    last_updated: datetime
+    """The timestamp of when the rule was last modified."""
+
+    version: str
+    """The version of the rule."""
+
+    id: Optional[str] = None
+    """The unique ID of the rule."""
+
+    action: Optional[Literal["log_custom_field"]] = None
+    """The action to perform when the rule matches."""
+
+    action_parameters: Optional[ActionParameters] = None
+    """The parameters configuring the rule's action."""
+
+    categories: Optional[List[str]] = None
+    """The categories of the rule."""
+
+    description: Optional[str] = None
+    """An informative description of the rule."""
+
+    enabled: Optional[bool] = None
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: Optional[ExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
+    expression: Optional[str] = None
+    """The expression defining which traffic will match the rule."""
+
+    logging: Optional[Logging] = None
+    """An object configuring the rule's logging behavior."""
+
+    ratelimit: Optional[Ratelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: Optional[str] = None
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/log_custom_field_rule_param.py b/src/cloudflare/types/rulesets/log_custom_field_rule_param.py
new file mode 100644
index 00000000000..b6cdbaaf767
--- /dev/null
+++ b/src/cloudflare/types/rulesets/log_custom_field_rule_param.py
@@ -0,0 +1,169 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .logging_param import LoggingParam
+
+__all__ = [
+    "LogCustomFieldRuleParam",
+    "ActionParameters",
+    "ActionParametersCookieField",
+    "ActionParametersRawResponseField",
+    "ActionParametersRequestField",
+    "ActionParametersResponseField",
+    "ActionParametersTransformedRequestField",
+    "ExposedCredentialCheck",
+    "Ratelimit",
+]
+
+
+class ActionParametersCookieField(TypedDict, total=False):
+    """The cookie field to log."""
+
+    name: Required[str]
+    """The name of the cookie."""
+
+
+class ActionParametersRawResponseField(TypedDict, total=False):
+    """The raw response field to log."""
+
+    name: Required[str]
+    """The name of the response header."""
+
+    preserve_duplicates: bool
+    """Whether to log duplicate values of the same header."""
+
+
+class ActionParametersRequestField(TypedDict, total=False):
+    """The raw request field to log."""
+
+    name: Required[str]
+    """The name of the header."""
+
+
+class ActionParametersResponseField(TypedDict, total=False):
+    """The transformed response field to log."""
+
+    name: Required[str]
+    """The name of the response header."""
+
+    preserve_duplicates: bool
+    """Whether to log duplicate values of the same header."""
+
+
+class ActionParametersTransformedRequestField(TypedDict, total=False):
+    """The transformed request field to log."""
+
+    name: Required[str]
+    """The name of the header."""
+
+
+class ActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
+    cookie_fields: Iterable[ActionParametersCookieField]
+    """The cookie fields to log."""
+
+    raw_response_fields: Iterable[ActionParametersRawResponseField]
+    """The raw response fields to log."""
+
+    request_fields: Iterable[ActionParametersRequestField]
+    """The raw request fields to log."""
+
+    response_fields: Iterable[ActionParametersResponseField]
+    """The transformed response fields to log."""
+
+    transformed_request_fields: Iterable[ActionParametersTransformedRequestField]
+    """The transformed request fields to log."""
+
+
+class ExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class LogCustomFieldRuleParam(TypedDict, total=False):
+    id: str
+    """The unique ID of the rule."""
+
+    action: Literal["log_custom_field"]
+    """The action to perform when the rule matches."""
+
+    action_parameters: ActionParameters
+    """The parameters configuring the rule's action."""
+
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: ExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    logging: LoggingParam
+    """An object configuring the rule's logging behavior."""
+
+    ratelimit: Ratelimit
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/log_rule.py b/src/cloudflare/types/rulesets/log_rule.py
index 2f0ae1804b8..8248a6299cb 100644
--- a/src/cloudflare/types/rulesets/log_rule.py
+++ b/src/cloudflare/types/rulesets/log_rule.py
@@ -7,7 +7,63 @@
 from .logging import Logging
 from ..._models import BaseModel
 
-__all__ = ["LogRule"]
+__all__ = ["LogRule", "ExposedCredentialCheck", "Ratelimit"]
+
+
+class ExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
+
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
 class LogRule(BaseModel):
@@ -35,11 +91,17 @@ class LogRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[ExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[Ratelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/log_rule_param.py b/src/cloudflare/types/rulesets/log_rule_param.py
index ef0c1e455ca..ed168f80dda 100644
--- a/src/cloudflare/types/rulesets/log_rule_param.py
+++ b/src/cloudflare/types/rulesets/log_rule_param.py
@@ -2,11 +2,68 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
+from ..._types import SequenceNotStr
 from .logging_param import LoggingParam
 
-__all__ = ["LogRuleParam"]
+__all__ = ["LogRuleParam", "ExposedCredentialCheck", "Ratelimit"]
+
+
+class ExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
 class LogRuleParam(TypedDict, total=False):
@@ -25,11 +82,17 @@ class LogRuleParam(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Ratelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/logging.py b/src/cloudflare/types/rulesets/logging.py
index 30288f7c3a9..4394ddda28b 100644
--- a/src/cloudflare/types/rulesets/logging.py
+++ b/src/cloudflare/types/rulesets/logging.py
@@ -1,11 +1,12 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ..._models import BaseModel
 
 __all__ = ["Logging"]
 
 
 class Logging(BaseModel):
+    """An object configuring the rule's logging behavior."""
+
     enabled: bool
     """Whether to generate a log when the rule matches."""
diff --git a/src/cloudflare/types/rulesets/logging_param.py b/src/cloudflare/types/rulesets/logging_param.py
index 7ffdd5a2f4d..44483e01871 100644
--- a/src/cloudflare/types/rulesets/logging_param.py
+++ b/src/cloudflare/types/rulesets/logging_param.py
@@ -8,5 +8,7 @@
 
 
 class LoggingParam(TypedDict, total=False):
+    """An object configuring the rule's logging behavior."""
+
     enabled: Required[bool]
     """Whether to generate a log when the rule matches."""
diff --git a/src/cloudflare/types/rulesets/managed_challenge_rule.py b/src/cloudflare/types/rulesets/managed_challenge_rule.py
index 6c2772bd14d..9cdd21ea69c 100644
--- a/src/cloudflare/types/rulesets/managed_challenge_rule.py
+++ b/src/cloudflare/types/rulesets/managed_challenge_rule.py
@@ -7,7 +7,63 @@
 from .logging import Logging
 from ..._models import BaseModel
 
-__all__ = ["ManagedChallengeRule"]
+__all__ = ["ManagedChallengeRule", "ExposedCredentialCheck", "Ratelimit"]
+
+
+class ExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
+
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
 class ManagedChallengeRule(BaseModel):
@@ -35,11 +91,17 @@ class ManagedChallengeRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[ExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[Ratelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/managed_challenge_rule_param.py b/src/cloudflare/types/rulesets/managed_challenge_rule_param.py
index 63ccee1f4a2..60986b78886 100644
--- a/src/cloudflare/types/rulesets/managed_challenge_rule_param.py
+++ b/src/cloudflare/types/rulesets/managed_challenge_rule_param.py
@@ -2,11 +2,68 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
+from ..._types import SequenceNotStr
 from .logging_param import LoggingParam
 
-__all__ = ["ManagedChallengeRuleParam"]
+__all__ = ["ManagedChallengeRuleParam", "ExposedCredentialCheck", "Ratelimit"]
+
+
+class ExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
 class ManagedChallengeRuleParam(TypedDict, total=False):
@@ -25,11 +82,17 @@ class ManagedChallengeRuleParam(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Ratelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/phase.py b/src/cloudflare/types/rulesets/phase.py
index 2c762c89ddb..f7918ae46f6 100644
--- a/src/cloudflare/types/rulesets/phase.py
+++ b/src/cloudflare/types/rulesets/phase.py
@@ -1,10 +1,10 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["Phase"]
 
-Phase = Literal[
+Phase: TypeAlias = Literal[
     "ddos_l4",
     "ddos_l7",
     "http_config_settings",
@@ -20,7 +20,6 @@
     "http_request_redirect",
     "http_request_sanitize",
     "http_request_sbfm",
-    "http_request_select_configuration",
     "http_request_transform",
     "http_response_compression",
     "http_response_firewall_managed",
@@ -28,4 +27,5 @@
     "magic_transit",
     "magic_transit_ids_managed",
     "magic_transit_managed",
+    "magic_transit_ratelimit",
 ]
diff --git a/src/cloudflare/types/rulesets/phase_get_response.py b/src/cloudflare/types/rulesets/phase_get_response.py
index d88c9679596..3b3e517d373 100644
--- a/src/cloudflare/types/rulesets/phase_get_response.py
+++ b/src/cloudflare/types/rulesets/phase_get_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal, Annotated
+from typing_extensions import Literal, Annotated, TypeAlias
 
 from .kind import Kind
 from .phase import Phase
@@ -17,54 +17,84 @@
 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 .ddos_dynamic_rule import DDoSDynamicRule
+from .log_custom_field_rule import LogCustomFieldRule
 from .compress_response_rule import CompressResponseRule
 from .managed_challenge_rule import ManagedChallengeRule
 from .set_cache_settings_rule import SetCacheSettingsRule
+from .force_connection_close_rule import ForceConnectionCloseRule
 
 __all__ = [
     "PhaseGetResponse",
     "Rule",
-    "RuleRulesetsLogCustomFieldRule",
-    "RuleRulesetsLogCustomFieldRuleActionParameters",
-    "RuleRulesetsLogCustomFieldRuleActionParametersCookieField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersRequestField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersResponseField",
-    "RuleRulesetsDDoSDynamicRule",
-    "RuleRulesetsForceConnectionCloseRule",
+    "RuleRulesetsChallengeRule",
+    "RuleRulesetsChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsChallengeRuleRatelimit",
+    "RuleRulesetsJSChallengeRule",
+    "RuleRulesetsJSChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsJSChallengeRuleRatelimit",
 ]
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersCookieField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-class RuleRulesetsLogCustomFieldRuleActionParametersRequestField(BaseModel):
-    name: str
-    """The name of the field."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersResponseField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-class RuleRulesetsLogCustomFieldRuleActionParameters(BaseModel):
-    cookie_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersCookieField]] = None
-    """The cookie fields to log."""
+    It defaults to the same as the rule's expression.
+    """
 
-    request_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersRequestField]] = None
-    """The request fields to log."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    response_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersResponseField]] = None
-    """The response fields to log."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
 
-class RuleRulesetsLogCustomFieldRule(BaseModel):
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class RuleRulesetsChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -74,10 +104,10 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["log_custom_field"]] = None
+    action: Optional[Literal["challenge"]] = None
     """The action to perform when the rule matches."""
 
-    action_parameters: Optional[RuleRulesetsLogCustomFieldRuleActionParameters] = None
+    action_parameters: Optional[object] = None
     """The parameters configuring the rule's action."""
 
     categories: Optional[List[str]] = None
@@ -89,52 +119,79 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class RuleRulesetsDDoSDynamicRule(BaseModel):
-    last_updated: datetime
-    """The timestamp of when the rule was last modified."""
+class RuleRulesetsJSChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
-    version: str
-    """The version of the rule."""
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-    id: Optional[str] = None
-    """The unique ID of the rule."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
-    action: Optional[Literal["ddos_dynamic"]] = None
-    """The action to perform when the rule matches."""
 
-    action_parameters: Optional[object] = None
-    """The parameters configuring the rule's action."""
+class RuleRulesetsJSChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
 
-    categories: Optional[List[str]] = None
-    """The categories of the rule."""
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-    description: Optional[str] = None
-    """An informative description of the rule."""
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
-    enabled: Optional[bool] = None
-    """Whether the rule should be executed."""
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-    expression: Optional[str] = None
-    """The expression defining which traffic will match the rule."""
+    It defaults to the same as the rule's expression.
+    """
 
-    logging: Optional[Logging] = None
-    """An object configuring the rule's logging behavior."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
-class RuleRulesetsForceConnectionCloseRule(BaseModel):
+
+class RuleRulesetsJSChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -144,7 +201,7 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["force_connection_close"]] = None
+    action: Optional[Literal["js_challenge"]] = None
     """The action to perform when the rule matches."""
 
     action_parameters: Optional[object] = None
@@ -159,42 +216,50 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsJSChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsJSChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-Rule = Annotated[
+Rule: TypeAlias = Annotated[
     Union[
         BlockRule,
-        ChallengeRule,
+        RuleRulesetsChallengeRule,
         CompressResponseRule,
+        DDoSDynamicRule,
         ExecuteRule,
-        JSChallengeRule,
+        ForceConnectionCloseRule,
+        RuleRulesetsJSChallengeRule,
         LogRule,
+        LogCustomFieldRule,
         ManagedChallengeRule,
         RedirectRule,
         RewriteRule,
         RouteRule,
         ScoreRule,
         ServeErrorRule,
+        SetCacheSettingsRule,
         SetConfigRule,
         SkipRule,
-        SetCacheSettingsRule,
-        RuleRulesetsLogCustomFieldRule,
-        RuleRulesetsDDoSDynamicRule,
-        RuleRulesetsForceConnectionCloseRule,
     ],
     PropertyInfo(discriminator="action"),
 ]
 
 
 class PhaseGetResponse(BaseModel):
+    """A ruleset object."""
+
     id: str
     """The unique ID of the ruleset."""
 
diff --git a/src/cloudflare/types/rulesets/phase_update_params.py b/src/cloudflare/types/rulesets/phase_update_params.py
index 972c5295f31..84e20caaf86 100644
--- a/src/cloudflare/types/rulesets/phase_update_params.py
+++ b/src/cloudflare/types/rulesets/phase_update_params.py
@@ -3,8 +3,9 @@
 from __future__ import annotations
 
 from typing import Union, Iterable
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
+from ..._types import SequenceNotStr
 from .logging_param import LoggingParam
 from .log_rule_param import LogRuleParam
 from .skip_rule_param import SkipRuleParam
@@ -14,31 +15,28 @@
 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 .ddos_dynamic_rule_param import DDoSDynamicRuleParam
+from .log_custom_field_rule_param import LogCustomFieldRuleParam
 from .compress_response_rule_param import CompressResponseRuleParam
 from .managed_challenge_rule_param import ManagedChallengeRuleParam
 from .set_cache_settings_rule_param import SetCacheSettingsRuleParam
+from .force_connection_close_rule_param import ForceConnectionCloseRuleParam
 
 __all__ = [
     "PhaseUpdateParams",
     "Rule",
-    "RuleRulesetsLogCustomFieldRule",
-    "RuleRulesetsLogCustomFieldRuleActionParameters",
-    "RuleRulesetsLogCustomFieldRuleActionParametersCookieField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersRequestField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersResponseField",
-    "RuleRulesetsDDoSDynamicRule",
-    "RuleRulesetsForceConnectionCloseRule",
+    "RuleRulesetsChallengeRule",
+    "RuleRulesetsChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsChallengeRuleRatelimit",
+    "RuleRulesetsJSChallengeRule",
+    "RuleRulesetsJSChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsJSChallengeRuleRatelimit",
 ]
 
 
 class PhaseUpdateParams(TypedDict, total=False):
-    rules: Required[Iterable[Rule]]
-    """The list of rules in the ruleset."""
-
     account_id: str
     """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
 
@@ -51,41 +49,74 @@ class PhaseUpdateParams(TypedDict, total=False):
     name: str
     """The human-readable name of the ruleset."""
 
+    rules: Iterable[Rule]
+    """The list of rules in the ruleset."""
+
+
+class RuleRulesetsChallengeRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class RuleRulesetsChallengeRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
 
-class RuleRulesetsLogCustomFieldRuleActionParametersCookieField(TypedDict, total=False):
-    name: Required[str]
-    """The name of the field."""
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
 
-class RuleRulesetsLogCustomFieldRuleActionParametersRequestField(TypedDict, total=False):
-    name: Required[str]
-    """The name of the field."""
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
 
+    It defaults to the same as the rule's expression.
+    """
 
-class RuleRulesetsLogCustomFieldRuleActionParametersResponseField(TypedDict, total=False):
-    name: Required[str]
-    """The name of the field."""
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
-class RuleRulesetsLogCustomFieldRuleActionParameters(TypedDict, total=False):
-    cookie_fields: Iterable[RuleRulesetsLogCustomFieldRuleActionParametersCookieField]
-    """The cookie fields to log."""
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
 
-    request_fields: Iterable[RuleRulesetsLogCustomFieldRuleActionParametersRequestField]
-    """The request fields to log."""
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
-    response_fields: Iterable[RuleRulesetsLogCustomFieldRuleActionParametersResponseField]
-    """The response fields to log."""
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
-class RuleRulesetsLogCustomFieldRule(TypedDict, total=False):
+class RuleRulesetsChallengeRule(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
 
-    action: Literal["log_custom_field"]
+    action: Literal["challenge"]
     """The action to perform when the rule matches."""
 
-    action_parameters: RuleRulesetsLogCustomFieldRuleActionParameters
+    action_parameters: object
     """The parameters configuring the rule's action."""
 
     description: str
@@ -94,47 +125,83 @@ class RuleRulesetsLogCustomFieldRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: RuleRulesetsChallengeRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: RuleRulesetsChallengeRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class RuleRulesetsDDoSDynamicRule(TypedDict, total=False):
-    id: str
-    """The unique ID of the rule."""
+class RuleRulesetsJSChallengeRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
 
-    action: Literal["ddos_dynamic"]
-    """The action to perform when the rule matches."""
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
 
-    action_parameters: object
-    """The parameters configuring the rule's action."""
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
 
-    description: str
-    """An informative description of the rule."""
 
-    enabled: bool
-    """Whether the rule should be executed."""
+class RuleRulesetsJSChallengeRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
 
-    expression: str
-    """The expression defining which traffic will match the rule."""
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
 
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-class RuleRulesetsForceConnectionCloseRule(TypedDict, total=False):
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class RuleRulesetsJSChallengeRule(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
 
-    action: Literal["force_connection_close"]
+    action: Literal["js_challenge"]
     """The action to perform when the rule matches."""
 
     action_parameters: object
@@ -146,33 +213,39 @@ class RuleRulesetsForceConnectionCloseRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: RuleRulesetsJSChallengeRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: RuleRulesetsJSChallengeRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-Rule = Union[
+Rule: TypeAlias = Union[
     BlockRuleParam,
-    ChallengeRuleParam,
+    RuleRulesetsChallengeRule,
     CompressResponseRuleParam,
+    DDoSDynamicRuleParam,
     ExecuteRuleParam,
-    JSChallengeRuleParam,
+    ForceConnectionCloseRuleParam,
+    RuleRulesetsJSChallengeRule,
     LogRuleParam,
+    LogCustomFieldRuleParam,
     ManagedChallengeRuleParam,
     RedirectRuleParam,
     RewriteRuleParam,
     RouteRuleParam,
     ScoreRuleParam,
     ServeErrorRuleParam,
+    SetCacheSettingsRuleParam,
     SetConfigRuleParam,
     SkipRuleParam,
-    SetCacheSettingsRuleParam,
-    RuleRulesetsLogCustomFieldRule,
-    RuleRulesetsDDoSDynamicRule,
-    RuleRulesetsForceConnectionCloseRule,
 ]
diff --git a/src/cloudflare/types/rulesets/phase_update_response.py b/src/cloudflare/types/rulesets/phase_update_response.py
index 3e00524ec11..bae558d023c 100644
--- a/src/cloudflare/types/rulesets/phase_update_response.py
+++ b/src/cloudflare/types/rulesets/phase_update_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal, Annotated
+from typing_extensions import Literal, Annotated, TypeAlias
 
 from .kind import Kind
 from .phase import Phase
@@ -17,54 +17,84 @@
 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 .ddos_dynamic_rule import DDoSDynamicRule
+from .log_custom_field_rule import LogCustomFieldRule
 from .compress_response_rule import CompressResponseRule
 from .managed_challenge_rule import ManagedChallengeRule
 from .set_cache_settings_rule import SetCacheSettingsRule
+from .force_connection_close_rule import ForceConnectionCloseRule
 
 __all__ = [
     "PhaseUpdateResponse",
     "Rule",
-    "RuleRulesetsLogCustomFieldRule",
-    "RuleRulesetsLogCustomFieldRuleActionParameters",
-    "RuleRulesetsLogCustomFieldRuleActionParametersCookieField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersRequestField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersResponseField",
-    "RuleRulesetsDDoSDynamicRule",
-    "RuleRulesetsForceConnectionCloseRule",
+    "RuleRulesetsChallengeRule",
+    "RuleRulesetsChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsChallengeRuleRatelimit",
+    "RuleRulesetsJSChallengeRule",
+    "RuleRulesetsJSChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsJSChallengeRuleRatelimit",
 ]
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersCookieField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-class RuleRulesetsLogCustomFieldRuleActionParametersRequestField(BaseModel):
-    name: str
-    """The name of the field."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersResponseField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-class RuleRulesetsLogCustomFieldRuleActionParameters(BaseModel):
-    cookie_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersCookieField]] = None
-    """The cookie fields to log."""
+    It defaults to the same as the rule's expression.
+    """
 
-    request_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersRequestField]] = None
-    """The request fields to log."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    response_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersResponseField]] = None
-    """The response fields to log."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
 
-class RuleRulesetsLogCustomFieldRule(BaseModel):
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class RuleRulesetsChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -74,10 +104,10 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["log_custom_field"]] = None
+    action: Optional[Literal["challenge"]] = None
     """The action to perform when the rule matches."""
 
-    action_parameters: Optional[RuleRulesetsLogCustomFieldRuleActionParameters] = None
+    action_parameters: Optional[object] = None
     """The parameters configuring the rule's action."""
 
     categories: Optional[List[str]] = None
@@ -89,52 +119,79 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class RuleRulesetsDDoSDynamicRule(BaseModel):
-    last_updated: datetime
-    """The timestamp of when the rule was last modified."""
+class RuleRulesetsJSChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
-    version: str
-    """The version of the rule."""
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-    id: Optional[str] = None
-    """The unique ID of the rule."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
-    action: Optional[Literal["ddos_dynamic"]] = None
-    """The action to perform when the rule matches."""
 
-    action_parameters: Optional[object] = None
-    """The parameters configuring the rule's action."""
+class RuleRulesetsJSChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
 
-    categories: Optional[List[str]] = None
-    """The categories of the rule."""
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-    description: Optional[str] = None
-    """An informative description of the rule."""
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
-    enabled: Optional[bool] = None
-    """Whether the rule should be executed."""
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-    expression: Optional[str] = None
-    """The expression defining which traffic will match the rule."""
+    It defaults to the same as the rule's expression.
+    """
 
-    logging: Optional[Logging] = None
-    """An object configuring the rule's logging behavior."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
-class RuleRulesetsForceConnectionCloseRule(BaseModel):
+
+class RuleRulesetsJSChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -144,7 +201,7 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["force_connection_close"]] = None
+    action: Optional[Literal["js_challenge"]] = None
     """The action to perform when the rule matches."""
 
     action_parameters: Optional[object] = None
@@ -159,42 +216,50 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsJSChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsJSChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-Rule = Annotated[
+Rule: TypeAlias = Annotated[
     Union[
         BlockRule,
-        ChallengeRule,
+        RuleRulesetsChallengeRule,
         CompressResponseRule,
+        DDoSDynamicRule,
         ExecuteRule,
-        JSChallengeRule,
+        ForceConnectionCloseRule,
+        RuleRulesetsJSChallengeRule,
         LogRule,
+        LogCustomFieldRule,
         ManagedChallengeRule,
         RedirectRule,
         RewriteRule,
         RouteRule,
         ScoreRule,
         ServeErrorRule,
+        SetCacheSettingsRule,
         SetConfigRule,
         SkipRule,
-        SetCacheSettingsRule,
-        RuleRulesetsLogCustomFieldRule,
-        RuleRulesetsDDoSDynamicRule,
-        RuleRulesetsForceConnectionCloseRule,
     ],
     PropertyInfo(discriminator="action"),
 ]
 
 
 class PhaseUpdateResponse(BaseModel):
+    """A ruleset object."""
+
     id: str
     """The unique ID of the ruleset."""
 
diff --git a/src/cloudflare/types/rulesets/phases/version_get_response.py b/src/cloudflare/types/rulesets/phases/version_get_response.py
index 3c7d7b05653..1f7a8e398c8 100644
--- a/src/cloudflare/types/rulesets/phases/version_get_response.py
+++ b/src/cloudflare/types/rulesets/phases/version_get_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal, Annotated
+from typing_extensions import Literal, Annotated, TypeAlias
 
 from ..kind import Kind
 from ..phase import Phase
@@ -17,54 +17,84 @@
 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 ..ddos_dynamic_rule import DDoSDynamicRule
+from ..log_custom_field_rule import LogCustomFieldRule
 from ..compress_response_rule import CompressResponseRule
 from ..managed_challenge_rule import ManagedChallengeRule
 from ..set_cache_settings_rule import SetCacheSettingsRule
+from ..force_connection_close_rule import ForceConnectionCloseRule
 
 __all__ = [
     "VersionGetResponse",
     "Rule",
-    "RuleRulesetsLogCustomFieldRule",
-    "RuleRulesetsLogCustomFieldRuleActionParameters",
-    "RuleRulesetsLogCustomFieldRuleActionParametersCookieField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersRequestField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersResponseField",
-    "RuleRulesetsDDoSDynamicRule",
-    "RuleRulesetsForceConnectionCloseRule",
+    "RuleRulesetsChallengeRule",
+    "RuleRulesetsChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsChallengeRuleRatelimit",
+    "RuleRulesetsJSChallengeRule",
+    "RuleRulesetsJSChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsJSChallengeRuleRatelimit",
 ]
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersCookieField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-class RuleRulesetsLogCustomFieldRuleActionParametersRequestField(BaseModel):
-    name: str
-    """The name of the field."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersResponseField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-class RuleRulesetsLogCustomFieldRuleActionParameters(BaseModel):
-    cookie_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersCookieField]] = None
-    """The cookie fields to log."""
+    It defaults to the same as the rule's expression.
+    """
 
-    request_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersRequestField]] = None
-    """The request fields to log."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    response_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersResponseField]] = None
-    """The response fields to log."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
 
-class RuleRulesetsLogCustomFieldRule(BaseModel):
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class RuleRulesetsChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -74,10 +104,10 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["log_custom_field"]] = None
+    action: Optional[Literal["challenge"]] = None
     """The action to perform when the rule matches."""
 
-    action_parameters: Optional[RuleRulesetsLogCustomFieldRuleActionParameters] = None
+    action_parameters: Optional[object] = None
     """The parameters configuring the rule's action."""
 
     categories: Optional[List[str]] = None
@@ -89,52 +119,79 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class RuleRulesetsDDoSDynamicRule(BaseModel):
-    last_updated: datetime
-    """The timestamp of when the rule was last modified."""
+class RuleRulesetsJSChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
-    version: str
-    """The version of the rule."""
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-    id: Optional[str] = None
-    """The unique ID of the rule."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
-    action: Optional[Literal["ddos_dynamic"]] = None
-    """The action to perform when the rule matches."""
 
-    action_parameters: Optional[object] = None
-    """The parameters configuring the rule's action."""
+class RuleRulesetsJSChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
 
-    categories: Optional[List[str]] = None
-    """The categories of the rule."""
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-    description: Optional[str] = None
-    """An informative description of the rule."""
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
-    enabled: Optional[bool] = None
-    """Whether the rule should be executed."""
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-    expression: Optional[str] = None
-    """The expression defining which traffic will match the rule."""
+    It defaults to the same as the rule's expression.
+    """
 
-    logging: Optional[Logging] = None
-    """An object configuring the rule's logging behavior."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
-class RuleRulesetsForceConnectionCloseRule(BaseModel):
+
+class RuleRulesetsJSChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -144,7 +201,7 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["force_connection_close"]] = None
+    action: Optional[Literal["js_challenge"]] = None
     """The action to perform when the rule matches."""
 
     action_parameters: Optional[object] = None
@@ -159,42 +216,50 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsJSChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsJSChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-Rule = Annotated[
+Rule: TypeAlias = Annotated[
     Union[
         BlockRule,
-        ChallengeRule,
+        RuleRulesetsChallengeRule,
         CompressResponseRule,
+        DDoSDynamicRule,
         ExecuteRule,
-        JSChallengeRule,
+        ForceConnectionCloseRule,
+        RuleRulesetsJSChallengeRule,
         LogRule,
+        LogCustomFieldRule,
         ManagedChallengeRule,
         RedirectRule,
         RewriteRule,
         RouteRule,
         ScoreRule,
         ServeErrorRule,
+        SetCacheSettingsRule,
         SetConfigRule,
         SkipRule,
-        SetCacheSettingsRule,
-        RuleRulesetsLogCustomFieldRule,
-        RuleRulesetsDDoSDynamicRule,
-        RuleRulesetsForceConnectionCloseRule,
     ],
     PropertyInfo(discriminator="action"),
 ]
 
 
 class VersionGetResponse(BaseModel):
+    """A ruleset object."""
+
     id: str
     """The unique ID of the ruleset."""
 
diff --git a/src/cloudflare/types/rulesets/phases/version_list_response.py b/src/cloudflare/types/rulesets/phases/version_list_response.py
index 921e1de8c40..fbdd2b8b4cf 100644
--- a/src/cloudflare/types/rulesets/phases/version_list_response.py
+++ b/src/cloudflare/types/rulesets/phases/version_list_response.py
@@ -11,6 +11,8 @@
 
 
 class VersionListResponse(BaseModel):
+    """A ruleset object."""
+
     id: str
     """The unique ID of the ruleset."""
 
diff --git a/src/cloudflare/types/rulesets/redirect_rule.py b/src/cloudflare/types/rulesets/redirect_rule.py
index 9c8d6246760..22fa69bc894 100644
--- a/src/cloudflare/types/rulesets/redirect_rule.py
+++ b/src/cloudflare/types/rulesets/redirect_rule.py
@@ -1,6 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Union, Optional
+from typing import List, Optional
 from datetime import datetime
 from typing_extensions import Literal
 
@@ -13,51 +13,108 @@
     "ActionParametersFromList",
     "ActionParametersFromValue",
     "ActionParametersFromValueTargetURL",
-    "ActionParametersFromValueTargetURLStaticURLRedirect",
-    "ActionParametersFromValueTargetURLDynamicURLRedirect",
+    "ExposedCredentialCheck",
+    "Ratelimit",
 ]
 
 
 class ActionParametersFromList(BaseModel):
-    key: Optional[str] = None
-    """Expression that evaluates to the list lookup key."""
+    """A redirect based on a bulk list lookup."""
 
-    name: Optional[str] = None
-    """The name of the list to match against."""
+    key: str
+    """An expression that evaluates to the list lookup key."""
 
+    name: str
+    """The name of the list to match against."""
 
-class ActionParametersFromValueTargetURLStaticURLRedirect(BaseModel):
-    value: Optional[str] = None
-    """The URL to redirect the request to."""
 
+class ActionParametersFromValueTargetURL(BaseModel):
+    """A URL to redirect the request to."""
 
-class ActionParametersFromValueTargetURLDynamicURLRedirect(BaseModel):
     expression: Optional[str] = None
-    """An expression to evaluate to get the URL to redirect the request to."""
-
+    """An expression that evaluates to a URL to redirect the request to."""
 
-ActionParametersFromValueTargetURL = Union[
-    ActionParametersFromValueTargetURLStaticURLRedirect, ActionParametersFromValueTargetURLDynamicURLRedirect
-]
+    value: Optional[str] = None
+    """A URL to redirect the request to."""
 
 
 class ActionParametersFromValue(BaseModel):
+    """A redirect based on the request properties."""
+
+    target_url: ActionParametersFromValueTargetURL
+    """A URL to redirect the request to."""
+
     preserve_query_string: Optional[bool] = None
-    """Keep the query string of the original request."""
+    """Whether to keep the query string of the original request."""
 
     status_code: Optional[Literal[301, 302, 303, 307, 308]] = None
-    """The status code to be used for the redirect."""
-
-    target_url: Optional[ActionParametersFromValueTargetURL] = None
-    """The URL to redirect the request to."""
+    """The status code to use for the redirect."""
 
 
 class ActionParameters(BaseModel):
+    """The parameters configuring the rule's action."""
+
     from_list: Optional[ActionParametersFromList] = None
-    """Serve a redirect based on a bulk list lookup."""
+    """A redirect based on a bulk list lookup."""
 
     from_value: Optional[ActionParametersFromValue] = None
-    """Serve a redirect based on the request properties."""
+    """A redirect based on the request properties."""
+
+
+class ExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
+
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
 class RedirectRule(BaseModel):
@@ -85,11 +142,17 @@ class RedirectRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[ExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[Ratelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/redirect_rule_param.py b/src/cloudflare/types/rulesets/redirect_rule_param.py
index ef67a8411f7..3e23bfaf78c 100644
--- a/src/cloudflare/types/rulesets/redirect_rule_param.py
+++ b/src/cloudflare/types/rulesets/redirect_rule_param.py
@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import Union
-from typing_extensions import Literal, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
+from ..._types import SequenceNotStr
 from .logging_param import LoggingParam
 
 __all__ = [
@@ -13,51 +13,108 @@
     "ActionParametersFromList",
     "ActionParametersFromValue",
     "ActionParametersFromValueTargetURL",
-    "ActionParametersFromValueTargetURLStaticURLRedirect",
-    "ActionParametersFromValueTargetURLDynamicURLRedirect",
+    "ExposedCredentialCheck",
+    "Ratelimit",
 ]
 
 
 class ActionParametersFromList(TypedDict, total=False):
-    key: str
-    """Expression that evaluates to the list lookup key."""
+    """A redirect based on a bulk list lookup."""
 
-    name: str
-    """The name of the list to match against."""
+    key: Required[str]
+    """An expression that evaluates to the list lookup key."""
 
+    name: Required[str]
+    """The name of the list to match against."""
 
-class ActionParametersFromValueTargetURLStaticURLRedirect(TypedDict, total=False):
-    value: str
-    """The URL to redirect the request to."""
 
+class ActionParametersFromValueTargetURL(TypedDict, total=False):
+    """A URL to redirect the request to."""
 
-class ActionParametersFromValueTargetURLDynamicURLRedirect(TypedDict, total=False):
     expression: str
-    """An expression to evaluate to get the URL to redirect the request to."""
-
+    """An expression that evaluates to a URL to redirect the request to."""
 
-ActionParametersFromValueTargetURL = Union[
-    ActionParametersFromValueTargetURLStaticURLRedirect, ActionParametersFromValueTargetURLDynamicURLRedirect
-]
+    value: str
+    """A URL to redirect the request to."""
 
 
 class ActionParametersFromValue(TypedDict, total=False):
+    """A redirect based on the request properties."""
+
+    target_url: Required[ActionParametersFromValueTargetURL]
+    """A URL to redirect the request to."""
+
     preserve_query_string: bool
-    """Keep the query string of the original request."""
+    """Whether to keep the query string of the original request."""
 
     status_code: Literal[301, 302, 303, 307, 308]
-    """The status code to be used for the redirect."""
-
-    target_url: ActionParametersFromValueTargetURL
-    """The URL to redirect the request to."""
+    """The status code to use for the redirect."""
 
 
 class ActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
     from_list: ActionParametersFromList
-    """Serve a redirect based on a bulk list lookup."""
+    """A redirect based on a bulk list lookup."""
 
     from_value: ActionParametersFromValue
-    """Serve a redirect based on the request properties."""
+    """A redirect based on the request properties."""
+
+
+class ExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
 class RedirectRuleParam(TypedDict, total=False):
@@ -76,11 +133,17 @@ class RedirectRuleParam(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Ratelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/rewrite_rule.py b/src/cloudflare/types/rulesets/rewrite_rule.py
index aa76c3d0894..4071d1b1cff 100644
--- a/src/cloudflare/types/rulesets/rewrite_rule.py
+++ b/src/cloudflare/types/rulesets/rewrite_rule.py
@@ -2,60 +2,193 @@
 
 from typing import Dict, List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from .logging import Logging
 from ..._models import BaseModel
-from .rewrite_uri_part import RewriteURIPart
 
 __all__ = [
     "RewriteRule",
     "ActionParameters",
     "ActionParametersHeaders",
+    "ActionParametersHeadersAddStaticHeader",
+    "ActionParametersHeadersAddDynamicHeader",
+    "ActionParametersHeadersSetStaticHeader",
+    "ActionParametersHeadersSetDynamicHeader",
     "ActionParametersHeadersRemoveHeader",
-    "ActionParametersHeadersStaticHeader",
-    "ActionParametersHeadersDynamicHeader",
     "ActionParametersURI",
+    "ActionParametersURIURIPath",
+    "ActionParametersURIURIPathPath",
+    "ActionParametersURIURIQuery",
+    "ActionParametersURIURIQueryQuery",
+    "ExposedCredentialCheck",
+    "Ratelimit",
 ]
 
 
-class ActionParametersHeadersRemoveHeader(BaseModel):
-    operation: Literal["remove"]
+class ActionParametersHeadersAddStaticHeader(BaseModel):
+    """A header with a static value to add."""
+
+    operation: Literal["add"]
+    """The operation to perform on the header."""
+
+    value: str
+    """A static value for the header."""
+
+
+class ActionParametersHeadersAddDynamicHeader(BaseModel):
+    """A header with a dynamic value to add."""
 
+    expression: str
+    """An expression that evaluates to a value for the header."""
+
+    operation: Literal["add"]
+    """The operation to perform on the header."""
+
+
+class ActionParametersHeadersSetStaticHeader(BaseModel):
+    """A header with a static value to set."""
 
-class ActionParametersHeadersStaticHeader(BaseModel):
     operation: Literal["set"]
+    """The operation to perform on the header."""
 
     value: str
-    """Static value for the header."""
+    """A static value for the header."""
 
 
-class ActionParametersHeadersDynamicHeader(BaseModel):
+class ActionParametersHeadersSetDynamicHeader(BaseModel):
+    """A header with a dynamic value to set."""
+
     expression: str
-    """Expression for the header value."""
+    """An expression that evaluates to a value for the header."""
 
     operation: Literal["set"]
+    """The operation to perform on the header."""
+
 
+class ActionParametersHeadersRemoveHeader(BaseModel):
+    """A header to remove."""
 
-ActionParametersHeaders = Union[
-    ActionParametersHeadersRemoveHeader, ActionParametersHeadersStaticHeader, ActionParametersHeadersDynamicHeader
+    operation: Literal["remove"]
+    """The operation to perform on the header."""
+
+
+ActionParametersHeaders: TypeAlias = Union[
+    ActionParametersHeadersAddStaticHeader,
+    ActionParametersHeadersAddDynamicHeader,
+    ActionParametersHeadersSetStaticHeader,
+    ActionParametersHeadersSetDynamicHeader,
+    ActionParametersHeadersRemoveHeader,
 ]
 
 
-class ActionParametersURI(BaseModel):
-    path: Optional[RewriteURIPart] = None
-    """Path portion rewrite."""
+class ActionParametersURIURIPathPath(BaseModel):
+    """A URI path rewrite."""
+
+    expression: Optional[str] = None
+    """An expression that evaluates to a value to rewrite the URI path to."""
+
+    value: Optional[str] = None
+    """A value to rewrite the URI path to."""
+
 
-    query: Optional[RewriteURIPart] = None
-    """Query portion rewrite."""
+class ActionParametersURIURIPath(BaseModel):
+    """A URI path rewrite."""
+
+    path: ActionParametersURIURIPathPath
+    """A URI path rewrite."""
+
+    origin: Optional[bool] = None
+    """Whether to propagate the rewritten URI to origin."""
+
+
+class ActionParametersURIURIQueryQuery(BaseModel):
+    """A URI query rewrite."""
+
+    expression: Optional[str] = None
+    """An expression that evaluates to a value to rewrite the URI query to."""
+
+    value: Optional[str] = None
+    """A value to rewrite the URI query to."""
+
+
+class ActionParametersURIURIQuery(BaseModel):
+    """A URI query rewrite."""
+
+    query: ActionParametersURIURIQueryQuery
+    """A URI query rewrite."""
+
+    origin: Optional[bool] = None
+    """Whether to propagate the rewritten URI to origin."""
+
+
+ActionParametersURI: TypeAlias = Union[ActionParametersURIURIPath, ActionParametersURIURIQuery]
 
 
 class ActionParameters(BaseModel):
+    """The parameters configuring the rule's action."""
+
     headers: Optional[Dict[str, ActionParametersHeaders]] = None
-    """Map of request headers to modify."""
+    """A map of headers to rewrite."""
 
     uri: Optional[ActionParametersURI] = None
-    """URI to rewrite the request to."""
+    """A URI path rewrite."""
+
+
+class ExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
+
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
 class RewriteRule(BaseModel):
@@ -83,11 +216,17 @@ class RewriteRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[ExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[Ratelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/rewrite_rule_param.py b/src/cloudflare/types/rulesets/rewrite_rule_param.py
index 0b0e5617f65..75e18c4787d 100644
--- a/src/cloudflare/types/rulesets/rewrite_rule_param.py
+++ b/src/cloudflare/types/rulesets/rewrite_rule_param.py
@@ -3,59 +3,187 @@
 from __future__ import annotations
 
 from typing import Dict, Union
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
+from ..._types import SequenceNotStr
 from .logging_param import LoggingParam
-from .rewrite_uri_part_param import RewriteURIPartParam
 
 __all__ = [
     "RewriteRuleParam",
     "ActionParameters",
     "ActionParametersHeaders",
+    "ActionParametersHeadersAddStaticHeader",
+    "ActionParametersHeadersAddDynamicHeader",
+    "ActionParametersHeadersSetStaticHeader",
+    "ActionParametersHeadersSetDynamicHeader",
     "ActionParametersHeadersRemoveHeader",
-    "ActionParametersHeadersStaticHeader",
-    "ActionParametersHeadersDynamicHeader",
     "ActionParametersURI",
+    "ActionParametersURIURIPath",
+    "ActionParametersURIURIPathPath",
+    "ActionParametersURIURIQuery",
+    "ActionParametersURIURIQueryQuery",
+    "ExposedCredentialCheck",
+    "Ratelimit",
 ]
 
 
-class ActionParametersHeadersRemoveHeader(TypedDict, total=False):
-    operation: Required[Literal["remove"]]
+class ActionParametersHeadersAddStaticHeader(TypedDict, total=False):
+    """A header with a static value to add."""
 
+    operation: Required[Literal["add"]]
+    """The operation to perform on the header."""
+
+    value: Required[str]
+    """A static value for the header."""
+
+
+class ActionParametersHeadersAddDynamicHeader(TypedDict, total=False):
+    """A header with a dynamic value to add."""
+
+    expression: Required[str]
+    """An expression that evaluates to a value for the header."""
+
+    operation: Required[Literal["add"]]
+    """The operation to perform on the header."""
+
+
+class ActionParametersHeadersSetStaticHeader(TypedDict, total=False):
+    """A header with a static value to set."""
 
-class ActionParametersHeadersStaticHeader(TypedDict, total=False):
     operation: Required[Literal["set"]]
+    """The operation to perform on the header."""
 
     value: Required[str]
-    """Static value for the header."""
+    """A static value for the header."""
+
 
+class ActionParametersHeadersSetDynamicHeader(TypedDict, total=False):
+    """A header with a dynamic value to set."""
 
-class ActionParametersHeadersDynamicHeader(TypedDict, total=False):
     expression: Required[str]
-    """Expression for the header value."""
+    """An expression that evaluates to a value for the header."""
 
     operation: Required[Literal["set"]]
+    """The operation to perform on the header."""
+
+
+class ActionParametersHeadersRemoveHeader(TypedDict, total=False):
+    """A header to remove."""
+
+    operation: Required[Literal["remove"]]
+    """The operation to perform on the header."""
 
 
-ActionParametersHeaders = Union[
-    ActionParametersHeadersRemoveHeader, ActionParametersHeadersStaticHeader, ActionParametersHeadersDynamicHeader
+ActionParametersHeaders: TypeAlias = Union[
+    ActionParametersHeadersAddStaticHeader,
+    ActionParametersHeadersAddDynamicHeader,
+    ActionParametersHeadersSetStaticHeader,
+    ActionParametersHeadersSetDynamicHeader,
+    ActionParametersHeadersRemoveHeader,
 ]
 
 
-class ActionParametersURI(TypedDict, total=False):
-    path: RewriteURIPartParam
-    """Path portion rewrite."""
+class ActionParametersURIURIPathPath(TypedDict, total=False):
+    """A URI path rewrite."""
+
+    expression: str
+    """An expression that evaluates to a value to rewrite the URI path to."""
+
+    value: str
+    """A value to rewrite the URI path to."""
 
-    query: RewriteURIPartParam
-    """Query portion rewrite."""
+
+class ActionParametersURIURIPath(TypedDict, total=False):
+    """A URI path rewrite."""
+
+    path: Required[ActionParametersURIURIPathPath]
+    """A URI path rewrite."""
+
+
+class ActionParametersURIURIQueryQuery(TypedDict, total=False):
+    """A URI query rewrite."""
+
+    expression: str
+    """An expression that evaluates to a value to rewrite the URI query to."""
+
+    value: str
+    """A value to rewrite the URI query to."""
+
+
+class ActionParametersURIURIQuery(TypedDict, total=False):
+    """A URI query rewrite."""
+
+    query: Required[ActionParametersURIURIQueryQuery]
+    """A URI query rewrite."""
+
+
+ActionParametersURI: TypeAlias = Union[ActionParametersURIURIPath, ActionParametersURIURIQuery]
 
 
 class ActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
     headers: Dict[str, ActionParametersHeaders]
-    """Map of request headers to modify."""
+    """A map of headers to rewrite."""
 
     uri: ActionParametersURI
-    """URI to rewrite the request to."""
+    """A URI path rewrite."""
+
+
+class ExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
 class RewriteRuleParam(TypedDict, total=False):
@@ -74,11 +202,17 @@ class RewriteRuleParam(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Ratelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/rewrite_uri_part.py b/src/cloudflare/types/rulesets/rewrite_uri_part.py
deleted file mode 100644
index b8620330c13..00000000000
--- a/src/cloudflare/types/rulesets/rewrite_uri_part.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union
-
-from ..._models import BaseModel
-
-__all__ = ["RewriteURIPart", "StaticValue", "DynamicValue"]
-
-
-class StaticValue(BaseModel):
-    value: str
-    """Predefined replacement value."""
-
-
-class DynamicValue(BaseModel):
-    expression: str
-    """Expression to evaluate for the replacement value."""
-
-
-RewriteURIPart = Union[StaticValue, DynamicValue]
diff --git a/src/cloudflare/types/rulesets/rewrite_uri_part_param.py b/src/cloudflare/types/rulesets/rewrite_uri_part_param.py
deleted file mode 100644
index 32d4397ceee..00000000000
--- a/src/cloudflare/types/rulesets/rewrite_uri_part_param.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Union
-from typing_extensions import Required, TypedDict
-
-__all__ = ["RewriteURIPartParam", "StaticValue", "DynamicValue"]
-
-
-class StaticValue(TypedDict, total=False):
-    value: Required[str]
-    """Predefined replacement value."""
-
-
-class DynamicValue(TypedDict, total=False):
-    expression: Required[str]
-    """Expression to evaluate for the replacement value."""
-
-
-RewriteURIPartParam = Union[StaticValue, DynamicValue]
diff --git a/src/cloudflare/types/rulesets/route_rule.py b/src/cloudflare/types/rulesets/route_rule.py
index ee9647c2ca9..41f3a739d56 100644
--- a/src/cloudflare/types/rulesets/route_rule.py
+++ b/src/cloudflare/types/rulesets/route_rule.py
@@ -7,31 +7,100 @@
 from .logging import Logging
 from ..._models import BaseModel
 
-__all__ = ["RouteRule", "ActionParameters", "ActionParametersOrigin", "ActionParametersSNI"]
+__all__ = [
+    "RouteRule",
+    "ActionParameters",
+    "ActionParametersOrigin",
+    "ActionParametersSNI",
+    "ExposedCredentialCheck",
+    "Ratelimit",
+]
 
 
 class ActionParametersOrigin(BaseModel):
+    """An origin to route to."""
+
     host: Optional[str] = None
-    """Override the resolved hostname."""
+    """A resolved host to route to."""
 
-    port: Optional[float] = None
-    """Override the destination port."""
+    port: Optional[int] = None
+    """A destination port to route to."""
 
 
 class ActionParametersSNI(BaseModel):
+    """A Server Name Indication (SNI) override."""
+
     value: str
-    """The SNI override."""
+    """A value to override the SNI to."""
 
 
 class ActionParameters(BaseModel):
+    """The parameters configuring the rule's action."""
+
     host_header: Optional[str] = None
-    """Rewrite the HTTP Host header."""
+    """A value to rewrite the HTTP host header to."""
 
     origin: Optional[ActionParametersOrigin] = None
-    """Override the IP/TCP destination."""
+    """An origin to route to."""
 
     sni: Optional[ActionParametersSNI] = None
-    """Override the Server Name Indication (SNI)."""
+    """A Server Name Indication (SNI) override."""
+
+
+class ExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
+
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
 class RouteRule(BaseModel):
@@ -59,11 +128,17 @@ class RouteRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[ExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[Ratelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/route_rule_param.py b/src/cloudflare/types/rulesets/route_rule_param.py
index 13738c29b68..33cc97c8e86 100644
--- a/src/cloudflare/types/rulesets/route_rule_param.py
+++ b/src/cloudflare/types/rulesets/route_rule_param.py
@@ -4,33 +4,103 @@
 
 from typing_extensions import Literal, Required, TypedDict
 
+from ..._types import SequenceNotStr
 from .logging_param import LoggingParam
 
-__all__ = ["RouteRuleParam", "ActionParameters", "ActionParametersOrigin", "ActionParametersSNI"]
+__all__ = [
+    "RouteRuleParam",
+    "ActionParameters",
+    "ActionParametersOrigin",
+    "ActionParametersSNI",
+    "ExposedCredentialCheck",
+    "Ratelimit",
+]
 
 
 class ActionParametersOrigin(TypedDict, total=False):
+    """An origin to route to."""
+
     host: str
-    """Override the resolved hostname."""
+    """A resolved host to route to."""
 
-    port: float
-    """Override the destination port."""
+    port: int
+    """A destination port to route to."""
 
 
 class ActionParametersSNI(TypedDict, total=False):
+    """A Server Name Indication (SNI) override."""
+
     value: Required[str]
-    """The SNI override."""
+    """A value to override the SNI to."""
 
 
 class ActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
     host_header: str
-    """Rewrite the HTTP Host header."""
+    """A value to rewrite the HTTP host header to."""
 
     origin: ActionParametersOrigin
-    """Override the IP/TCP destination."""
+    """An origin to route to."""
 
     sni: ActionParametersSNI
-    """Override the Server Name Indication (SNI)."""
+    """A Server Name Indication (SNI) override."""
+
+
+class ExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
 class RouteRuleParam(TypedDict, total=False):
@@ -49,11 +119,17 @@ class RouteRuleParam(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Ratelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/rule_create_params.py b/src/cloudflare/types/rulesets/rule_create_params.py
index 47c65186555..f563df717d4 100644
--- a/src/cloudflare/types/rulesets/rule_create_params.py
+++ b/src/cloudflare/types/rulesets/rule_create_params.py
@@ -3,57 +3,157 @@
 from __future__ import annotations
 
 from typing import Dict, List, Union, Iterable
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
 from .phase import Phase
+from ..._types import SequenceNotStr
 from .logging_param import LoggingParam
-from .rewrite_uri_part_param import RewriteURIPartParam
 
 __all__ = [
     "RuleCreateParams",
     "BlockRule",
     "BlockRuleActionParameters",
     "BlockRuleActionParametersResponse",
+    "BlockRuleExposedCredentialCheck",
+    "BlockRulePosition",
+    "BlockRulePositionBeforePosition",
+    "BlockRulePositionAfterPosition",
+    "BlockRulePositionIndexPosition",
+    "BlockRuleRatelimit",
     "ChallengeRule",
-    "CompressResponseRule",
-    "CompressResponseRuleActionParameters",
-    "CompressResponseRuleActionParametersAlgorithm",
+    "ChallengeRuleExposedCredentialCheck",
+    "ChallengeRulePosition",
+    "ChallengeRulePositionBeforePosition",
+    "ChallengeRulePositionAfterPosition",
+    "ChallengeRulePositionIndexPosition",
+    "ChallengeRuleRatelimit",
+    "ResponseCompressionRule",
+    "ResponseCompressionRuleActionParameters",
+    "ResponseCompressionRuleActionParametersAlgorithm",
+    "ResponseCompressionRuleExposedCredentialCheck",
+    "ResponseCompressionRulePosition",
+    "ResponseCompressionRulePositionBeforePosition",
+    "ResponseCompressionRulePositionAfterPosition",
+    "ResponseCompressionRulePositionIndexPosition",
+    "ResponseCompressionRuleRatelimit",
+    "DDoSDynamicRule",
+    "DDoSDynamicRuleExposedCredentialCheck",
+    "DDoSDynamicRulePosition",
+    "DDoSDynamicRulePositionBeforePosition",
+    "DDoSDynamicRulePositionAfterPosition",
+    "DDoSDynamicRulePositionIndexPosition",
+    "DDoSDynamicRuleRatelimit",
     "ExecuteRule",
     "ExecuteRuleActionParameters",
     "ExecuteRuleActionParametersMatchedData",
     "ExecuteRuleActionParametersOverrides",
     "ExecuteRuleActionParametersOverridesCategory",
     "ExecuteRuleActionParametersOverridesRule",
-    "JSChallengeRule",
+    "ExecuteRuleExposedCredentialCheck",
+    "ExecuteRulePosition",
+    "ExecuteRulePositionBeforePosition",
+    "ExecuteRulePositionAfterPosition",
+    "ExecuteRulePositionIndexPosition",
+    "ExecuteRuleRatelimit",
+    "ForceConnectionCloseRule",
+    "ForceConnectionCloseRuleExposedCredentialCheck",
+    "ForceConnectionCloseRulePosition",
+    "ForceConnectionCloseRulePositionBeforePosition",
+    "ForceConnectionCloseRulePositionAfterPosition",
+    "ForceConnectionCloseRulePositionIndexPosition",
+    "ForceConnectionCloseRuleRatelimit",
+    "JavaScriptChallengeRule",
+    "JavaScriptChallengeRuleExposedCredentialCheck",
+    "JavaScriptChallengeRulePosition",
+    "JavaScriptChallengeRulePositionBeforePosition",
+    "JavaScriptChallengeRulePositionAfterPosition",
+    "JavaScriptChallengeRulePositionIndexPosition",
+    "JavaScriptChallengeRuleRatelimit",
     "LogRule",
+    "LogRuleExposedCredentialCheck",
+    "LogRulePosition",
+    "LogRulePositionBeforePosition",
+    "LogRulePositionAfterPosition",
+    "LogRulePositionIndexPosition",
+    "LogRuleRatelimit",
+    "LogCustomFieldRule",
+    "LogCustomFieldRuleActionParameters",
+    "LogCustomFieldRuleActionParametersCookieField",
+    "LogCustomFieldRuleActionParametersRawResponseField",
+    "LogCustomFieldRuleActionParametersRequestField",
+    "LogCustomFieldRuleActionParametersResponseField",
+    "LogCustomFieldRuleActionParametersTransformedRequestField",
+    "LogCustomFieldRuleExposedCredentialCheck",
+    "LogCustomFieldRulePosition",
+    "LogCustomFieldRulePositionBeforePosition",
+    "LogCustomFieldRulePositionAfterPosition",
+    "LogCustomFieldRulePositionIndexPosition",
+    "LogCustomFieldRuleRatelimit",
     "ManagedChallengeRule",
+    "ManagedChallengeRuleExposedCredentialCheck",
+    "ManagedChallengeRulePosition",
+    "ManagedChallengeRulePositionBeforePosition",
+    "ManagedChallengeRulePositionAfterPosition",
+    "ManagedChallengeRulePositionIndexPosition",
+    "ManagedChallengeRuleRatelimit",
     "RedirectRule",
     "RedirectRuleActionParameters",
     "RedirectRuleActionParametersFromList",
     "RedirectRuleActionParametersFromValue",
     "RedirectRuleActionParametersFromValueTargetURL",
-    "RedirectRuleActionParametersFromValueTargetURLStaticURLRedirect",
-    "RedirectRuleActionParametersFromValueTargetURLDynamicURLRedirect",
+    "RedirectRuleExposedCredentialCheck",
+    "RedirectRulePosition",
+    "RedirectRulePositionBeforePosition",
+    "RedirectRulePositionAfterPosition",
+    "RedirectRulePositionIndexPosition",
+    "RedirectRuleRatelimit",
     "RewriteRule",
     "RewriteRuleActionParameters",
     "RewriteRuleActionParametersHeaders",
+    "RewriteRuleActionParametersHeadersAddStaticHeader",
+    "RewriteRuleActionParametersHeadersAddDynamicHeader",
+    "RewriteRuleActionParametersHeadersSetStaticHeader",
+    "RewriteRuleActionParametersHeadersSetDynamicHeader",
     "RewriteRuleActionParametersHeadersRemoveHeader",
-    "RewriteRuleActionParametersHeadersStaticHeader",
-    "RewriteRuleActionParametersHeadersDynamicHeader",
     "RewriteRuleActionParametersURI",
+    "RewriteRuleActionParametersURIURIPath",
+    "RewriteRuleActionParametersURIURIPathPath",
+    "RewriteRuleActionParametersURIURIQuery",
+    "RewriteRuleActionParametersURIURIQueryQuery",
+    "RewriteRuleExposedCredentialCheck",
+    "RewriteRulePosition",
+    "RewriteRulePositionBeforePosition",
+    "RewriteRulePositionAfterPosition",
+    "RewriteRulePositionIndexPosition",
+    "RewriteRuleRatelimit",
     "RouteRule",
     "RouteRuleActionParameters",
     "RouteRuleActionParametersOrigin",
     "RouteRuleActionParametersSNI",
+    "RouteRuleExposedCredentialCheck",
+    "RouteRulePosition",
+    "RouteRulePositionBeforePosition",
+    "RouteRulePositionAfterPosition",
+    "RouteRulePositionIndexPosition",
+    "RouteRuleRatelimit",
     "ScoreRule",
     "ScoreRuleActionParameters",
+    "ScoreRuleExposedCredentialCheck",
+    "ScoreRulePosition",
+    "ScoreRulePositionBeforePosition",
+    "ScoreRulePositionAfterPosition",
+    "ScoreRulePositionIndexPosition",
+    "ScoreRuleRatelimit",
     "ServeErrorRule",
     "ServeErrorRuleActionParameters",
-    "SetConfigRule",
-    "SetConfigRuleActionParameters",
-    "SetConfigRuleActionParametersAutominify",
-    "SkipRule",
-    "SkipRuleActionParameters",
+    "ServeErrorRuleActionParametersActionParametersContent",
+    "ServeErrorRuleActionParametersActionParametersAsset",
+    "ServeErrorRuleExposedCredentialCheck",
+    "ServeErrorRulePosition",
+    "ServeErrorRulePositionBeforePosition",
+    "ServeErrorRulePositionAfterPosition",
+    "ServeErrorRulePositionIndexPosition",
+    "ServeErrorRuleRatelimit",
     "SetCacheSettingsRule",
     "SetCacheSettingsRuleActionParameters",
     "SetCacheSettingsRuleActionParametersBrowserTTL",
@@ -71,13 +171,29 @@
     "SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTL",
     "SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTLStatusCodeRange",
     "SetCacheSettingsRuleActionParametersServeStale",
-    "RulesetsLogCustomFieldRule",
-    "RulesetsLogCustomFieldRuleActionParameters",
-    "RulesetsLogCustomFieldRuleActionParametersCookieField",
-    "RulesetsLogCustomFieldRuleActionParametersRequestField",
-    "RulesetsLogCustomFieldRuleActionParametersResponseField",
-    "RulesetsDDoSDynamicRule",
-    "RulesetsForceConnectionCloseRule",
+    "SetCacheSettingsRuleExposedCredentialCheck",
+    "SetCacheSettingsRulePosition",
+    "SetCacheSettingsRulePositionBeforePosition",
+    "SetCacheSettingsRulePositionAfterPosition",
+    "SetCacheSettingsRulePositionIndexPosition",
+    "SetCacheSettingsRuleRatelimit",
+    "SetConfigurationRule",
+    "SetConfigurationRuleActionParameters",
+    "SetConfigurationRuleActionParametersAutominify",
+    "SetConfigurationRuleExposedCredentialCheck",
+    "SetConfigurationRulePosition",
+    "SetConfigurationRulePositionBeforePosition",
+    "SetConfigurationRulePositionAfterPosition",
+    "SetConfigurationRulePositionIndexPosition",
+    "SetConfigurationRuleRatelimit",
+    "SkipRule",
+    "SkipRuleActionParameters",
+    "SkipRuleExposedCredentialCheck",
+    "SkipRulePosition",
+    "SkipRulePositionBeforePosition",
+    "SkipRulePositionAfterPosition",
+    "SkipRulePositionIndexPosition",
+    "SkipRuleRatelimit",
 ]
 
 
@@ -103,17 +219,28 @@ class BlockRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: BlockRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    position: BlockRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: BlockRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
 class BlockRuleActionParametersResponse(TypedDict, total=False):
+    """The response to show when the block is applied."""
+
     content: Required[str]
     """The content to return."""
 
@@ -125,85 +252,101 @@ class BlockRuleActionParametersResponse(TypedDict, total=False):
 
 
 class BlockRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
     response: BlockRuleActionParametersResponse
     """The response to show when the block is applied."""
 
 
-class ChallengeRule(TypedDict, total=False):
-    account_id: str
-    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+class BlockRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
 
-    zone_id: str
-    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
 
-    id: str
-    """The unique ID of the rule."""
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
 
-    action: Literal["challenge"]
-    """The action to perform when the rule matches."""
 
-    action_parameters: object
-    """The parameters configuring the rule's action."""
+class BlockRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    description: str
-    """An informative description of the rule."""
+    before: str
+    """The ID of another rule to place the rule before.
 
-    enabled: bool
-    """Whether the rule should be executed."""
+    An empty value causes the rule to be placed at the top.
+    """
 
-    expression: str
-    """The expression defining which traffic will match the rule."""
 
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
+class BlockRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    after: str
+    """The ID of another rule to place the rule after.
 
+    An empty value causes the rule to be placed at the bottom.
+    """
 
-class CompressResponseRule(TypedDict, total=False):
-    account_id: str
-    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
 
-    zone_id: str
-    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+class BlockRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    id: str
-    """The unique ID of the rule."""
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
 
-    action: Literal["compress_response"]
-    """The action to perform when the rule matches."""
 
-    action_parameters: CompressResponseRuleActionParameters
-    """The parameters configuring the rule's action."""
+BlockRulePosition: TypeAlias = Union[
+    BlockRulePositionBeforePosition, BlockRulePositionAfterPosition, BlockRulePositionIndexPosition
+]
 
-    description: str
-    """An informative description of the rule."""
 
-    enabled: bool
-    """Whether the rule should be executed."""
+class BlockRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
 
-    expression: str
-    """The expression defining which traffic will match the rule."""
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
 
+    It defaults to the same as the rule's expression.
+    """
 
-class CompressResponseRuleActionParametersAlgorithm(TypedDict, total=False):
-    name: Literal["none", "auto", "default", "gzip", "brotli"]
-    """Name of compression algorithm to enable."""
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
-class CompressResponseRuleActionParameters(TypedDict, total=False):
-    algorithms: Iterable[CompressResponseRuleActionParametersAlgorithm]
-    """Custom order for compression algorithms."""
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
 
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
-class ExecuteRule(TypedDict, total=False):
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class ChallengeRule(TypedDict, total=False):
     account_id: str
     """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
 
@@ -213,10 +356,10 @@ class ExecuteRule(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
 
-    action: Literal["execute"]
+    action: Literal["challenge"]
     """The action to perform when the rule matches."""
 
-    action_parameters: ExecuteRuleActionParameters
+    action_parameters: object
     """The parameters configuring the rule's action."""
 
     description: str
@@ -225,126 +368,114 @@ class ExecuteRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ChallengeRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
-
-
-class ExecuteRuleActionParametersMatchedData(TypedDict, total=False):
-    public_key: Required[str]
-    """The public key to encrypt matched data logs with."""
-
+    position: ChallengeRulePosition
+    """An object configuring where the rule will be placed."""
 
-class ExecuteRuleActionParametersOverridesCategory(TypedDict, total=False):
-    category: Required[str]
-    """The name of the category to override."""
-
-    action: str
-    """The action to override rules in the category with."""
-
-    enabled: bool
-    """Whether to enable execution of rules in the category."""
-
-    sensitivity_level: Literal["default", "medium", "low", "eoff"]
-    """The sensitivity level to use for rules in the category."""
+    ratelimit: ChallengeRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
 
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
 
-class ExecuteRuleActionParametersOverridesRule(TypedDict, total=False):
-    id: Required[str]
-    """The ID of the rule to override."""
 
-    action: str
-    """The action to override the rule with."""
+class ChallengeRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
 
-    enabled: bool
-    """Whether to enable execution of the rule."""
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
 
-    score_threshold: int
-    """The score threshold to use for the rule."""
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
 
-    sensitivity_level: Literal["default", "medium", "low", "eoff"]
-    """The sensitivity level to use for the rule."""
 
+class ChallengeRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-class ExecuteRuleActionParametersOverrides(TypedDict, total=False):
-    action: str
-    """An action to override all rules with.
+    before: str
+    """The ID of another rule to place the rule before.
 
-    This option has lower precedence than rule and category overrides.
+    An empty value causes the rule to be placed at the top.
     """
 
-    categories: Iterable[ExecuteRuleActionParametersOverridesCategory]
-    """A list of category-level overrides.
 
-    This option has the second-highest precedence after rule-level overrides.
-    """
+class ChallengeRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    enabled: bool
-    """Whether to enable execution of all rules.
+    after: str
+    """The ID of another rule to place the rule after.
 
-    This option has lower precedence than rule and category overrides.
+    An empty value causes the rule to be placed at the bottom.
     """
 
-    rules: Iterable[ExecuteRuleActionParametersOverridesRule]
-    """A list of rule-level overrides. This option has the highest precedence."""
-
-    sensitivity_level: Literal["default", "medium", "low", "eoff"]
-    """A sensitivity level to set for all rules.
-
-    This option has lower precedence than rule and category overrides and is only
-    applicable for DDoS phases.
-    """
 
+class ChallengeRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-class ExecuteRuleActionParameters(TypedDict, total=False):
-    id: Required[str]
-    """The ID of the ruleset to execute."""
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
 
-    matched_data: ExecuteRuleActionParametersMatchedData
-    """The configuration to use for matched data logging."""
 
-    overrides: ExecuteRuleActionParametersOverrides
-    """A set of overrides to apply to the target ruleset."""
+ChallengeRulePosition: TypeAlias = Union[
+    ChallengeRulePositionBeforePosition, ChallengeRulePositionAfterPosition, ChallengeRulePositionIndexPosition
+]
 
 
-class JSChallengeRule(TypedDict, total=False):
-    account_id: str
-    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+class ChallengeRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
 
-    zone_id: str
-    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-    id: str
-    """The unique ID of the rule."""
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
 
-    action: Literal["js_challenge"]
-    """The action to perform when the rule matches."""
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
 
-    action_parameters: object
-    """The parameters configuring the rule's action."""
+    It defaults to the same as the rule's expression.
+    """
 
-    description: str
-    """An informative description of the rule."""
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    enabled: bool
-    """Whether the rule should be executed."""
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
-    expression: str
-    """The expression defining which traffic will match the rule."""
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
 
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
-class LogRule(TypedDict, total=False):
+class ResponseCompressionRule(TypedDict, total=False):
     account_id: str
     """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
 
@@ -354,10 +485,10 @@ class LogRule(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
 
-    action: Literal["log"]
+    action: Literal["compress_response"]
     """The action to perform when the rule matches."""
 
-    action_parameters: object
+    action_parameters: ResponseCompressionRuleActionParameters
     """The parameters configuring the rule's action."""
 
     description: str
@@ -366,124 +497,130 @@ class LogRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ResponseCompressionRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
-
-
-class ManagedChallengeRule(TypedDict, total=False):
-    account_id: str
-    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+    position: ResponseCompressionRulePosition
+    """An object configuring where the rule will be placed."""
 
-    zone_id: str
-    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+    ratelimit: ResponseCompressionRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
 
-    id: str
-    """The unique ID of the rule."""
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
 
-    action: Literal["managed_challenge"]
-    """The action to perform when the rule matches."""
 
-    action_parameters: object
-    """The parameters configuring the rule's action."""
+class ResponseCompressionRuleActionParametersAlgorithm(TypedDict, total=False):
+    """Compression algorithm to enable."""
 
-    description: str
-    """An informative description of the rule."""
+    name: Literal["none", "auto", "default", "gzip", "brotli", "zstd"]
+    """Name of the compression algorithm to enable."""
 
-    enabled: bool
-    """Whether the rule should be executed."""
 
-    expression: str
-    """The expression defining which traffic will match the rule."""
+class ResponseCompressionRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
 
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
+    algorithms: Required[Iterable[ResponseCompressionRuleActionParametersAlgorithm]]
+    """Custom order for compression algorithms."""
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
 
+class ResponseCompressionRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
 
-class RedirectRule(TypedDict, total=False):
-    account_id: str
-    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
 
-    zone_id: str
-    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
 
-    id: str
-    """The unique ID of the rule."""
 
-    action: Literal["redirect"]
-    """The action to perform when the rule matches."""
+class ResponseCompressionRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    action_parameters: RedirectRuleActionParameters
-    """The parameters configuring the rule's action."""
+    before: str
+    """The ID of another rule to place the rule before.
 
-    description: str
-    """An informative description of the rule."""
+    An empty value causes the rule to be placed at the top.
+    """
 
-    enabled: bool
-    """Whether the rule should be executed."""
 
-    expression: str
-    """The expression defining which traffic will match the rule."""
+class ResponseCompressionRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
+    after: str
+    """The ID of another rule to place the rule after.
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    An empty value causes the rule to be placed at the bottom.
+    """
 
 
-class RedirectRuleActionParametersFromList(TypedDict, total=False):
-    key: str
-    """Expression that evaluates to the list lookup key."""
+class ResponseCompressionRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    name: str
-    """The name of the list to match against."""
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
 
 
-class RedirectRuleActionParametersFromValueTargetURLStaticURLRedirect(TypedDict, total=False):
-    value: str
-    """The URL to redirect the request to."""
+ResponseCompressionRulePosition: TypeAlias = Union[
+    ResponseCompressionRulePositionBeforePosition,
+    ResponseCompressionRulePositionAfterPosition,
+    ResponseCompressionRulePositionIndexPosition,
+]
 
 
-class RedirectRuleActionParametersFromValueTargetURLDynamicURLRedirect(TypedDict, total=False):
-    expression: str
-    """An expression to evaluate to get the URL to redirect the request to."""
+class ResponseCompressionRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
 
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-RedirectRuleActionParametersFromValueTargetURL = Union[
-    RedirectRuleActionParametersFromValueTargetURLStaticURLRedirect,
-    RedirectRuleActionParametersFromValueTargetURLDynamicURLRedirect,
-]
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
 
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
 
-class RedirectRuleActionParametersFromValue(TypedDict, total=False):
-    preserve_query_string: bool
-    """Keep the query string of the original request."""
+    It defaults to the same as the rule's expression.
+    """
 
-    status_code: Literal[301, 302, 303, 307, 308]
-    """The status code to be used for the redirect."""
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    target_url: RedirectRuleActionParametersFromValueTargetURL
-    """The URL to redirect the request to."""
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
 
-class RedirectRuleActionParameters(TypedDict, total=False):
-    from_list: RedirectRuleActionParametersFromList
-    """Serve a redirect based on a bulk list lookup."""
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
-    from_value: RedirectRuleActionParametersFromValue
-    """Serve a redirect based on the request properties."""
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
-class RewriteRule(TypedDict, total=False):
+class DDoSDynamicRule(TypedDict, total=False):
     account_id: str
     """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
 
@@ -493,10 +630,10 @@ class RewriteRule(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
 
-    action: Literal["rewrite"]
+    action: Literal["ddos_dynamic"]
     """The action to perform when the rule matches."""
 
-    action_parameters: RewriteRuleActionParameters
+    action_parameters: object
     """The parameters configuring the rule's action."""
 
     description: str
@@ -505,55 +642,1452 @@ class RewriteRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: DDoSDynamicRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    position: DDoSDynamicRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: DDoSDynamicRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class RewriteRuleActionParametersHeadersRemoveHeader(TypedDict, total=False):
-    operation: Required[Literal["remove"]]
+class DDoSDynamicRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
 
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
 
-class RewriteRuleActionParametersHeadersStaticHeader(TypedDict, total=False):
-    operation: Required[Literal["set"]]
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
 
-    value: Required[str]
-    """Static value for the header."""
 
+class DDoSDynamicRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-class RewriteRuleActionParametersHeadersDynamicHeader(TypedDict, total=False):
-    expression: Required[str]
-    """Expression for the header value."""
+    before: str
+    """The ID of another rule to place the rule before.
 
-    operation: Required[Literal["set"]]
+    An empty value causes the rule to be placed at the top.
+    """
 
 
-RewriteRuleActionParametersHeaders = Union[
-    RewriteRuleActionParametersHeadersRemoveHeader,
-    RewriteRuleActionParametersHeadersStaticHeader,
-    RewriteRuleActionParametersHeadersDynamicHeader,
-]
+class DDoSDynamicRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
+    after: str
+    """The ID of another rule to place the rule after.
 
-class RewriteRuleActionParametersURI(TypedDict, total=False):
-    path: RewriteURIPartParam
-    """Path portion rewrite."""
+    An empty value causes the rule to be placed at the bottom.
+    """
 
-    query: RewriteURIPartParam
-    """Query portion rewrite."""
 
+class DDoSDynamicRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-class RewriteRuleActionParameters(TypedDict, total=False):
-    headers: Dict[str, RewriteRuleActionParametersHeaders]
-    """Map of request headers to modify."""
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+DDoSDynamicRulePosition: TypeAlias = Union[
+    DDoSDynamicRulePositionBeforePosition, DDoSDynamicRulePositionAfterPosition, DDoSDynamicRulePositionIndexPosition
+]
+
+
+class DDoSDynamicRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class ExecuteRule(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    id: str
+    """The unique ID of the rule."""
+
+    action: Literal["execute"]
+    """The action to perform when the rule matches."""
+
+    action_parameters: ExecuteRuleActionParameters
+    """The parameters configuring the rule's action."""
+
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: ExecuteRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    logging: LoggingParam
+    """An object configuring the rule's logging behavior."""
+
+    position: ExecuteRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: ExecuteRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
+
+
+class ExecuteRuleActionParametersMatchedData(TypedDict, total=False):
+    """The configuration to use for matched data logging."""
+
+    public_key: Required[str]
+    """The public key to encrypt matched data logs with."""
+
+
+class ExecuteRuleActionParametersOverridesCategory(TypedDict, total=False):
+    """A category-level override."""
+
+    category: Required[str]
+    """The name of the category to override."""
+
+    action: str
+    """The action to override rules in the category with."""
+
+    enabled: bool
+    """Whether to enable execution of rules in the category."""
+
+    sensitivity_level: Literal["default", "medium", "low", "eoff"]
+    """The sensitivity level to use for rules in the category.
+
+    This option is only applicable for DDoS phases.
+    """
+
+
+class ExecuteRuleActionParametersOverridesRule(TypedDict, total=False):
+    """A rule-level override."""
+
+    id: Required[str]
+    """The ID of the rule to override."""
+
+    action: str
+    """The action to override the rule with."""
+
+    enabled: bool
+    """Whether to enable execution of the rule."""
+
+    score_threshold: int
+    """The score threshold to use for the rule."""
+
+    sensitivity_level: Literal["default", "medium", "low", "eoff"]
+    """The sensitivity level to use for the rule.
+
+    This option is only applicable for DDoS phases.
+    """
+
+
+class ExecuteRuleActionParametersOverrides(TypedDict, total=False):
+    """A set of overrides to apply to the target ruleset."""
+
+    action: str
+    """An action to override all rules with.
+
+    This option has lower precedence than rule and category overrides.
+    """
+
+    categories: Iterable[ExecuteRuleActionParametersOverridesCategory]
+    """A list of category-level overrides.
+
+    This option has the second-highest precedence after rule-level overrides.
+    """
+
+    enabled: bool
+    """Whether to enable execution of all rules.
+
+    This option has lower precedence than rule and category overrides.
+    """
+
+    rules: Iterable[ExecuteRuleActionParametersOverridesRule]
+    """A list of rule-level overrides. This option has the highest precedence."""
+
+    sensitivity_level: Literal["default", "medium", "low", "eoff"]
+    """A sensitivity level to set for all rules.
+
+    This option has lower precedence than rule and category overrides and is only
+    applicable for DDoS phases.
+    """
+
+
+class ExecuteRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
+    id: Required[str]
+    """The ID of the ruleset to execute."""
+
+    matched_data: ExecuteRuleActionParametersMatchedData
+    """The configuration to use for matched data logging."""
+
+    overrides: ExecuteRuleActionParametersOverrides
+    """A set of overrides to apply to the target ruleset."""
+
+
+class ExecuteRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class ExecuteRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class ExecuteRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class ExecuteRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+ExecuteRulePosition: TypeAlias = Union[
+    ExecuteRulePositionBeforePosition, ExecuteRulePositionAfterPosition, ExecuteRulePositionIndexPosition
+]
+
+
+class ExecuteRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class ForceConnectionCloseRule(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    id: str
+    """The unique ID of the rule."""
+
+    action: Literal["force_connection_close"]
+    """The action to perform when the rule matches."""
+
+    action_parameters: object
+    """The parameters configuring the rule's action."""
+
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: ForceConnectionCloseRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    logging: LoggingParam
+    """An object configuring the rule's logging behavior."""
+
+    position: ForceConnectionCloseRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: ForceConnectionCloseRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
+
+
+class ForceConnectionCloseRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class ForceConnectionCloseRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class ForceConnectionCloseRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class ForceConnectionCloseRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+ForceConnectionCloseRulePosition: TypeAlias = Union[
+    ForceConnectionCloseRulePositionBeforePosition,
+    ForceConnectionCloseRulePositionAfterPosition,
+    ForceConnectionCloseRulePositionIndexPosition,
+]
+
+
+class ForceConnectionCloseRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class JavaScriptChallengeRule(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    id: str
+    """The unique ID of the rule."""
+
+    action: Literal["js_challenge"]
+    """The action to perform when the rule matches."""
+
+    action_parameters: object
+    """The parameters configuring the rule's action."""
+
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: JavaScriptChallengeRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    logging: LoggingParam
+    """An object configuring the rule's logging behavior."""
+
+    position: JavaScriptChallengeRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: JavaScriptChallengeRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
+
+
+class JavaScriptChallengeRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class JavaScriptChallengeRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class JavaScriptChallengeRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class JavaScriptChallengeRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+JavaScriptChallengeRulePosition: TypeAlias = Union[
+    JavaScriptChallengeRulePositionBeforePosition,
+    JavaScriptChallengeRulePositionAfterPosition,
+    JavaScriptChallengeRulePositionIndexPosition,
+]
+
+
+class JavaScriptChallengeRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class LogRule(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    id: str
+    """The unique ID of the rule."""
+
+    action: Literal["log"]
+    """The action to perform when the rule matches."""
+
+    action_parameters: object
+    """The parameters configuring the rule's action."""
+
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: LogRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    logging: LoggingParam
+    """An object configuring the rule's logging behavior."""
+
+    position: LogRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: LogRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
+
+
+class LogRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class LogRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class LogRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class LogRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+LogRulePosition: TypeAlias = Union[
+    LogRulePositionBeforePosition, LogRulePositionAfterPosition, LogRulePositionIndexPosition
+]
+
+
+class LogRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class LogCustomFieldRule(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    id: str
+    """The unique ID of the rule."""
+
+    action: Literal["log_custom_field"]
+    """The action to perform when the rule matches."""
+
+    action_parameters: LogCustomFieldRuleActionParameters
+    """The parameters configuring the rule's action."""
+
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: LogCustomFieldRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    logging: LoggingParam
+    """An object configuring the rule's logging behavior."""
+
+    position: LogCustomFieldRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: LogCustomFieldRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
+
+
+class LogCustomFieldRuleActionParametersCookieField(TypedDict, total=False):
+    """The cookie field to log."""
+
+    name: Required[str]
+    """The name of the cookie."""
+
+
+class LogCustomFieldRuleActionParametersRawResponseField(TypedDict, total=False):
+    """The raw response field to log."""
+
+    name: Required[str]
+    """The name of the response header."""
+
+    preserve_duplicates: bool
+    """Whether to log duplicate values of the same header."""
+
+
+class LogCustomFieldRuleActionParametersRequestField(TypedDict, total=False):
+    """The raw request field to log."""
+
+    name: Required[str]
+    """The name of the header."""
+
+
+class LogCustomFieldRuleActionParametersResponseField(TypedDict, total=False):
+    """The transformed response field to log."""
+
+    name: Required[str]
+    """The name of the response header."""
+
+    preserve_duplicates: bool
+    """Whether to log duplicate values of the same header."""
+
+
+class LogCustomFieldRuleActionParametersTransformedRequestField(TypedDict, total=False):
+    """The transformed request field to log."""
+
+    name: Required[str]
+    """The name of the header."""
+
+
+class LogCustomFieldRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
+    cookie_fields: Iterable[LogCustomFieldRuleActionParametersCookieField]
+    """The cookie fields to log."""
+
+    raw_response_fields: Iterable[LogCustomFieldRuleActionParametersRawResponseField]
+    """The raw response fields to log."""
+
+    request_fields: Iterable[LogCustomFieldRuleActionParametersRequestField]
+    """The raw request fields to log."""
+
+    response_fields: Iterable[LogCustomFieldRuleActionParametersResponseField]
+    """The transformed response fields to log."""
+
+    transformed_request_fields: Iterable[LogCustomFieldRuleActionParametersTransformedRequestField]
+    """The transformed request fields to log."""
+
+
+class LogCustomFieldRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class LogCustomFieldRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class LogCustomFieldRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class LogCustomFieldRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+LogCustomFieldRulePosition: TypeAlias = Union[
+    LogCustomFieldRulePositionBeforePosition,
+    LogCustomFieldRulePositionAfterPosition,
+    LogCustomFieldRulePositionIndexPosition,
+]
+
+
+class LogCustomFieldRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class ManagedChallengeRule(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    id: str
+    """The unique ID of the rule."""
+
+    action: Literal["managed_challenge"]
+    """The action to perform when the rule matches."""
+
+    action_parameters: object
+    """The parameters configuring the rule's action."""
+
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: ManagedChallengeRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    logging: LoggingParam
+    """An object configuring the rule's logging behavior."""
+
+    position: ManagedChallengeRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: ManagedChallengeRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
+
+
+class ManagedChallengeRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class ManagedChallengeRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class ManagedChallengeRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class ManagedChallengeRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+ManagedChallengeRulePosition: TypeAlias = Union[
+    ManagedChallengeRulePositionBeforePosition,
+    ManagedChallengeRulePositionAfterPosition,
+    ManagedChallengeRulePositionIndexPosition,
+]
+
+
+class ManagedChallengeRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class RedirectRule(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    id: str
+    """The unique ID of the rule."""
+
+    action: Literal["redirect"]
+    """The action to perform when the rule matches."""
+
+    action_parameters: RedirectRuleActionParameters
+    """The parameters configuring the rule's action."""
+
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: RedirectRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    logging: LoggingParam
+    """An object configuring the rule's logging behavior."""
+
+    position: RedirectRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: RedirectRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
+
+
+class RedirectRuleActionParametersFromList(TypedDict, total=False):
+    """A redirect based on a bulk list lookup."""
+
+    key: Required[str]
+    """An expression that evaluates to the list lookup key."""
+
+    name: Required[str]
+    """The name of the list to match against."""
+
+
+class RedirectRuleActionParametersFromValueTargetURL(TypedDict, total=False):
+    """A URL to redirect the request to."""
+
+    expression: str
+    """An expression that evaluates to a URL to redirect the request to."""
+
+    value: str
+    """A URL to redirect the request to."""
+
+
+class RedirectRuleActionParametersFromValue(TypedDict, total=False):
+    """A redirect based on the request properties."""
+
+    target_url: Required[RedirectRuleActionParametersFromValueTargetURL]
+    """A URL to redirect the request to."""
+
+    preserve_query_string: bool
+    """Whether to keep the query string of the original request."""
+
+    status_code: Literal[301, 302, 303, 307, 308]
+    """The status code to use for the redirect."""
+
+
+class RedirectRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
+    from_list: RedirectRuleActionParametersFromList
+    """A redirect based on a bulk list lookup."""
+
+    from_value: RedirectRuleActionParametersFromValue
+    """A redirect based on the request properties."""
+
+
+class RedirectRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class RedirectRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class RedirectRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class RedirectRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+RedirectRulePosition: TypeAlias = Union[
+    RedirectRulePositionBeforePosition, RedirectRulePositionAfterPosition, RedirectRulePositionIndexPosition
+]
+
+
+class RedirectRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class RewriteRule(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    id: str
+    """The unique ID of the rule."""
+
+    action: Literal["rewrite"]
+    """The action to perform when the rule matches."""
+
+    action_parameters: RewriteRuleActionParameters
+    """The parameters configuring the rule's action."""
+
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: RewriteRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    logging: LoggingParam
+    """An object configuring the rule's logging behavior."""
+
+    position: RewriteRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: RewriteRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
+
+
+class RewriteRuleActionParametersHeadersAddStaticHeader(TypedDict, total=False):
+    """A header with a static value to add."""
+
+    operation: Required[Literal["add"]]
+    """The operation to perform on the header."""
+
+    value: Required[str]
+    """A static value for the header."""
+
+
+class RewriteRuleActionParametersHeadersAddDynamicHeader(TypedDict, total=False):
+    """A header with a dynamic value to add."""
+
+    expression: Required[str]
+    """An expression that evaluates to a value for the header."""
+
+    operation: Required[Literal["add"]]
+    """The operation to perform on the header."""
+
+
+class RewriteRuleActionParametersHeadersSetStaticHeader(TypedDict, total=False):
+    """A header with a static value to set."""
+
+    operation: Required[Literal["set"]]
+    """The operation to perform on the header."""
+
+    value: Required[str]
+    """A static value for the header."""
+
+
+class RewriteRuleActionParametersHeadersSetDynamicHeader(TypedDict, total=False):
+    """A header with a dynamic value to set."""
+
+    expression: Required[str]
+    """An expression that evaluates to a value for the header."""
+
+    operation: Required[Literal["set"]]
+    """The operation to perform on the header."""
+
+
+class RewriteRuleActionParametersHeadersRemoveHeader(TypedDict, total=False):
+    """A header to remove."""
+
+    operation: Required[Literal["remove"]]
+    """The operation to perform on the header."""
+
+
+RewriteRuleActionParametersHeaders: TypeAlias = Union[
+    RewriteRuleActionParametersHeadersAddStaticHeader,
+    RewriteRuleActionParametersHeadersAddDynamicHeader,
+    RewriteRuleActionParametersHeadersSetStaticHeader,
+    RewriteRuleActionParametersHeadersSetDynamicHeader,
+    RewriteRuleActionParametersHeadersRemoveHeader,
+]
+
+
+class RewriteRuleActionParametersURIURIPathPath(TypedDict, total=False):
+    """A URI path rewrite."""
+
+    expression: str
+    """An expression that evaluates to a value to rewrite the URI path to."""
+
+    value: str
+    """A value to rewrite the URI path to."""
+
+
+class RewriteRuleActionParametersURIURIPath(TypedDict, total=False):
+    """A URI path rewrite."""
+
+    path: Required[RewriteRuleActionParametersURIURIPathPath]
+    """A URI path rewrite."""
+
+
+class RewriteRuleActionParametersURIURIQueryQuery(TypedDict, total=False):
+    """A URI query rewrite."""
+
+    expression: str
+    """An expression that evaluates to a value to rewrite the URI query to."""
+
+    value: str
+    """A value to rewrite the URI query to."""
+
+
+class RewriteRuleActionParametersURIURIQuery(TypedDict, total=False):
+    """A URI query rewrite."""
+
+    query: Required[RewriteRuleActionParametersURIURIQueryQuery]
+    """A URI query rewrite."""
+
+
+RewriteRuleActionParametersURI: TypeAlias = Union[
+    RewriteRuleActionParametersURIURIPath, RewriteRuleActionParametersURIURIQuery
+]
+
+
+class RewriteRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
+    headers: Dict[str, RewriteRuleActionParametersHeaders]
+    """A map of headers to rewrite."""
 
     uri: RewriteRuleActionParametersURI
-    """URI to rewrite the request to."""
+    """A URI path rewrite."""
+
+
+class RewriteRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class RewriteRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class RewriteRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class RewriteRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+RewriteRulePosition: TypeAlias = Union[
+    RewriteRulePositionBeforePosition, RewriteRulePositionAfterPosition, RewriteRulePositionIndexPosition
+]
+
+
+class RewriteRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
 class RouteRule(TypedDict, total=False):
@@ -578,38 +2112,141 @@ class RouteRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: RouteRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    position: RouteRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: RouteRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
 class RouteRuleActionParametersOrigin(TypedDict, total=False):
+    """An origin to route to."""
+
     host: str
-    """Override the resolved hostname."""
+    """A resolved host to route to."""
 
-    port: float
-    """Override the destination port."""
+    port: int
+    """A destination port to route to."""
 
 
 class RouteRuleActionParametersSNI(TypedDict, total=False):
+    """A Server Name Indication (SNI) override."""
+
     value: Required[str]
-    """The SNI override."""
+    """A value to override the SNI to."""
 
 
 class RouteRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
     host_header: str
-    """Rewrite the HTTP Host header."""
+    """A value to rewrite the HTTP host header to."""
 
     origin: RouteRuleActionParametersOrigin
-    """Override the IP/TCP destination."""
+    """An origin to route to."""
 
     sni: RouteRuleActionParametersSNI
-    """Override the Server Name Indication (SNI)."""
+    """A Server Name Indication (SNI) override."""
+
+
+class RouteRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class RouteRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class RouteRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class RouteRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+RouteRulePosition: TypeAlias = Union[
+    RouteRulePositionBeforePosition, RouteRulePositionAfterPosition, RouteRulePositionIndexPosition
+]
+
+
+class RouteRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
 class ScoreRule(TypedDict, total=False):
@@ -634,68 +2271,121 @@ class ScoreRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ScoreRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    position: ScoreRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: ScoreRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
 class ScoreRuleActionParameters(TypedDict, total=False):
-    increment: int
+    """The parameters configuring the rule's action."""
+
+    increment: Required[int]
+    """A delta to change the score by, which can be either positive or negative."""
+
+
+class ScoreRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class ScoreRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
     """
-    Increment contains the delta to change the score and can be either positive or
-    negative.
+
+
+class ScoreRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
     """
 
 
-class ServeErrorRule(TypedDict, total=False):
-    account_id: str
-    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+class ScoreRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    zone_id: str
-    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
 
-    id: str
-    """The unique ID of the rule."""
 
-    action: Literal["serve_error"]
-    """The action to perform when the rule matches."""
+ScoreRulePosition: TypeAlias = Union[
+    ScoreRulePositionBeforePosition, ScoreRulePositionAfterPosition, ScoreRulePositionIndexPosition
+]
 
-    action_parameters: ServeErrorRuleActionParameters
-    """The parameters configuring the rule's action."""
 
-    description: str
-    """An informative description of the rule."""
+class ScoreRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
 
-    enabled: bool
-    """Whether the rule should be executed."""
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-    expression: str
-    """The expression defining which traffic will match the rule."""
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
 
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
-class ServeErrorRuleActionParameters(TypedDict, total=False):
-    content: str
-    """Error response content."""
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
 
-    content_type: Literal["application/json", "text/xml", "text/plain", "text/html"]
-    """Content-type header to set with the response."""
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
-    status_code: float
-    """The status code to use for the error."""
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
-class SetConfigRule(TypedDict, total=False):
+class ServeErrorRule(TypedDict, total=False):
     account_id: str
     """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
 
@@ -705,10 +2395,10 @@ class SetConfigRule(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
 
-    action: Literal["set_config"]
+    action: Literal["serve_error"]
     """The action to perform when the rule matches."""
 
-    action_parameters: SetConfigRuleActionParameters
+    action_parameters: ServeErrorRuleActionParameters
     """The parameters configuring the rule's action."""
 
     description: str
@@ -717,138 +2407,137 @@ class SetConfigRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ServeErrorRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
-
+    position: ServeErrorRulePosition
+    """An object configuring where the rule will be placed."""
 
-class SetConfigRuleActionParametersAutominify(TypedDict, total=False):
-    css: bool
-    """Minify CSS files."""
+    ratelimit: ServeErrorRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
 
-    html: bool
-    """Minify HTML files."""
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
 
-    js: bool
-    """Minify JS files."""
 
+class ServeErrorRuleActionParametersActionParametersContent(TypedDict, total=False):
+    content: Required[str]
+    """The response content."""
 
-class SetConfigRuleActionParameters(TypedDict, total=False):
-    automatic_https_rewrites: bool
-    """Turn on or off Automatic HTTPS Rewrites."""
+    content_type: Literal["application/json", "text/html", "text/plain", "text/xml"]
+    """The content type header to set with the error response."""
 
-    autominify: SetConfigRuleActionParametersAutominify
-    """Select which file extensions to minify automatically."""
+    status_code: int
+    """The status code to use for the error."""
 
-    bic: bool
-    """Turn on or off Browser Integrity Check."""
 
-    disable_apps: Literal[True]
-    """Turn off all active Cloudflare Apps."""
+class ServeErrorRuleActionParametersActionParametersAsset(TypedDict, total=False):
+    asset_name: Required[str]
+    """The name of a custom asset to serve as the error response."""
 
-    disable_rum: Literal[True]
-    """Turn off Real User Monitoring (RUM)."""
+    content_type: Literal["application/json", "text/html", "text/plain", "text/xml"]
+    """The content type header to set with the error response."""
 
-    disable_zaraz: Literal[True]
-    """Turn off Zaraz."""
+    status_code: int
+    """The status code to use for the error."""
 
-    email_obfuscation: bool
-    """Turn on or off Email Obfuscation."""
 
-    fonts: bool
-    """Turn on or off Cloudflare Fonts."""
+ServeErrorRuleActionParameters: TypeAlias = Union[
+    ServeErrorRuleActionParametersActionParametersContent, ServeErrorRuleActionParametersActionParametersAsset
+]
 
-    hotlink_protection: bool
-    """Turn on or off the Hotlink Protection."""
 
-    mirage: bool
-    """Turn on or off Mirage."""
+class ServeErrorRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
 
-    opportunistic_encryption: bool
-    """Turn on or off Opportunistic Encryption."""
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
 
-    polish: Literal["off", "lossless", "lossy"]
-    """Configure the Polish level."""
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
 
-    rocket_loader: bool
-    """Turn on or off Rocket Loader"""
 
-    security_level: Literal["off", "essentially_off", "low", "medium", "high", "under_attack"]
-    """Configure the Security Level."""
+class ServeErrorRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    server_side_excludes: bool
-    """Turn on or off Server Side Excludes."""
+    before: str
+    """The ID of another rule to place the rule before.
 
-    ssl: Literal["off", "flexible", "full", "strict", "origin_pull"]
-    """Configure the SSL level."""
+    An empty value causes the rule to be placed at the top.
+    """
 
-    sxg: bool
-    """Turn on or off Signed Exchanges (SXG)."""
 
+class ServeErrorRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-class SkipRule(TypedDict, total=False):
-    account_id: str
-    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+    after: str
+    """The ID of another rule to place the rule after.
 
-    zone_id: str
-    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+    An empty value causes the rule to be placed at the bottom.
+    """
 
-    id: str
-    """The unique ID of the rule."""
 
-    action: Literal["skip"]
-    """The action to perform when the rule matches."""
+class ServeErrorRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    action_parameters: SkipRuleActionParameters
-    """The parameters configuring the rule's action."""
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
 
-    description: str
-    """An informative description of the rule."""
 
-    enabled: bool
-    """Whether the rule should be executed."""
+ServeErrorRulePosition: TypeAlias = Union[
+    ServeErrorRulePositionBeforePosition, ServeErrorRulePositionAfterPosition, ServeErrorRulePositionIndexPosition
+]
 
-    expression: str
-    """The expression defining which traffic will match the rule."""
 
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
+class ServeErrorRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
 
-class SkipRuleActionParameters(TypedDict, total=False):
-    phases: List[Phase]
-    """A list of phases to skip the execution of.
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
 
-    This option is incompatible with the ruleset and rulesets options.
+    It defaults to the same as the rule's expression.
     """
 
-    products: List[Literal["bic", "hot", "rateLimit", "securityLevel", "uaBlock", "waf", "zoneLockdown"]]
-    """A list of legacy security products to skip the execution of."""
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    rules: Dict[str, List[str]]
+    requests_per_period: int
     """
-    A mapping of ruleset IDs to a list of rule IDs in that ruleset to skip the
-    execution of. This option is incompatible with the ruleset option.
+    The threshold of requests per period after which the action will be executed for
+    the first time.
     """
 
-    ruleset: Literal["current"]
-    """A ruleset to skip the execution of.
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
 
-    This option is incompatible with the rulesets, rules and phases options.
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
     """
 
-    rulesets: List[str]
-    """A list of ruleset IDs to skip the execution of.
-
-    This option is incompatible with the ruleset and phases options.
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
     """
 
 
@@ -874,167 +2563,181 @@ class SetCacheSettingsRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: SetCacheSettingsRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    position: SetCacheSettingsRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: SetCacheSettingsRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
 class SetCacheSettingsRuleActionParametersBrowserTTL(TypedDict, total=False):
-    mode: Required[Literal["respect_origin", "bypass_by_default", "override_origin"]]
-    """Determines which browser ttl mode to use."""
+    """How long client browsers should cache the response.
+
+    Cloudflare cache purge will not purge content cached on client browsers, so high browser TTLs may lead to stale content.
+    """
+
+    mode: Required[Literal["respect_origin", "bypass_by_default", "override_origin", "bypass"]]
+    """The browser TTL mode."""
 
     default: int
-    """The TTL (in seconds) if you choose override_origin mode."""
+    """The browser TTL (in seconds) if you choose the "override_origin" mode."""
 
 
 class SetCacheSettingsRuleActionParametersCacheKeyCustomKeyCookie(TypedDict, total=False):
-    check_presence: List[str]
-    """Checks for the presence of these cookie names.
+    """Which cookies to include in the cache key."""
+
+    check_presence: SequenceNotStr[str]
+    """A list of cookies to check for the presence of.
 
-    The presence of these cookies is used in building the cache key.
+    The presence of these cookies is included in the cache key.
     """
 
-    include: List[str]
-    """Include these cookies' names and their values."""
+    include: SequenceNotStr[str]
+    """A list of cookies to include in the cache key."""
 
 
 class SetCacheSettingsRuleActionParametersCacheKeyCustomKeyHeader(TypedDict, total=False):
-    check_presence: List[str]
-    """Checks for the presence of these header names.
+    """Which headers to include in the cache key."""
 
-    The presence of these headers is used in building the cache key.
-    """
+    check_presence: SequenceNotStr[str]
+    """A list of headers to check for the presence of.
 
-    contains: Dict[str, List[str]]
-    """
-    For each header name and list of values combination, check if the request header
-    contains any of the values provided. The presence of the request header and
-    whether any of the values provided are contained in the request header value is
-    used in building the cache key.
+    The presence of these headers is included in the cache key.
     """
 
-    exclude_origin: bool
-    """Whether or not to include the origin header.
+    contains: Dict[str, SequenceNotStr[str]]
+    """A mapping of header names to a list of values.
 
-    A value of true will exclude the origin header in the cache key.
+    If a header is present in the request and contains any of the values provided,
+    its value is included in the cache key.
     """
 
-    include: List[str]
-    """Include these headers' names and their values."""
+    exclude_origin: bool
+    """Whether to exclude the origin header in the cache key."""
+
+    include: SequenceNotStr[str]
+    """A list of headers to include in the cache key."""
 
 
 class SetCacheSettingsRuleActionParametersCacheKeyCustomKeyHost(TypedDict, total=False):
-    resolved: bool
-    """Use the resolved host in the cache key.
+    """How to use the host in the cache key."""
 
-    A value of true will use the resolved host, while a value or false will use the
-    original host.
-    """
+    resolved: bool
+    """Whether to use the resolved host in the cache key."""
 
 
 class SetCacheSettingsRuleActionParametersCacheKeyCustomKeyQueryStringExclude(TypedDict, total=False):
-    all: bool
-    """Exclude all query string parameters from use in building the cache key."""
+    """Which query string parameters to exclude from the cache key."""
 
-    list: List[str]
-    """A list of query string parameters NOT used to build the cache key.
+    all: Literal[True]
+    """Whether to exclude all query string parameters from the cache key."""
 
-    All parameters present in the request but missing in this list will be used to
-    build the cache key.
-    """
+    list: SequenceNotStr[str]
+    """A list of query string parameters to exclude from the cache key."""
 
 
 class SetCacheSettingsRuleActionParametersCacheKeyCustomKeyQueryStringInclude(TypedDict, total=False):
-    all: bool
-    """Use all query string parameters in the cache key."""
+    """Which query string parameters to include in the cache key."""
+
+    all: Literal[True]
+    """Whether to include all query string parameters in the cache key."""
 
-    list: List[str]
-    """A list of query string parameters used to build the cache key."""
+    list: SequenceNotStr[str]
+    """A list of query string parameters to include in the cache key."""
 
 
 class SetCacheSettingsRuleActionParametersCacheKeyCustomKeyQueryString(TypedDict, total=False):
+    """Which query string parameters to include in or exclude from the cache key."""
+
     exclude: SetCacheSettingsRuleActionParametersCacheKeyCustomKeyQueryStringExclude
-    """
-    build the cache key using all query string parameters EXCECPT these excluded
-    parameters
-    """
+    """Which query string parameters to exclude from the cache key."""
 
     include: SetCacheSettingsRuleActionParametersCacheKeyCustomKeyQueryStringInclude
-    """
-    build the cache key using a list of query string parameters that ARE in the
-    request.
-    """
+    """Which query string parameters to include in the cache key."""
 
 
 class SetCacheSettingsRuleActionParametersCacheKeyCustomKeyUser(TypedDict, total=False):
+    """How to use characteristics of the request user agent in the cache key."""
+
     device_type: bool
-    """Use the user agent's device type in the cache key."""
+    """Whether to use the user agent's device type in the cache key."""
 
     geo: bool
-    """Use the user agents's country in the cache key."""
+    """Whether to use the user agents's country in the cache key."""
 
     lang: bool
-    """Use the user agent's language in the cache key."""
+    """Whether to use the user agent's language in the cache key."""
 
 
 class SetCacheSettingsRuleActionParametersCacheKeyCustomKey(TypedDict, total=False):
+    """Which components of the request are included or excluded from the cache key."""
+
     cookie: SetCacheSettingsRuleActionParametersCacheKeyCustomKeyCookie
-    """The cookies to include in building the cache key."""
+    """Which cookies to include in the cache key."""
 
     header: SetCacheSettingsRuleActionParametersCacheKeyCustomKeyHeader
-    """The header names and values to include in building the cache key."""
+    """Which headers to include in the cache key."""
 
     host: SetCacheSettingsRuleActionParametersCacheKeyCustomKeyHost
-    """Whether to use the original host or the resolved host in the cache key."""
+    """How to use the host in the cache key."""
 
     query_string: SetCacheSettingsRuleActionParametersCacheKeyCustomKeyQueryString
-    """
-    Use the presence or absence of parameters in the query string to build the cache
-    key.
-    """
+    """Which query string parameters to include in or exclude from the cache key."""
 
     user: SetCacheSettingsRuleActionParametersCacheKeyCustomKeyUser
-    """Characteristics of the request user agent used in building the cache key."""
+    """How to use characteristics of the request user agent in the cache key."""
 
 
 class SetCacheSettingsRuleActionParametersCacheKey(TypedDict, total=False):
+    """
+    Which components of the request are included in or excluded from the cache key Cloudflare uses to store the response in cache.
+    """
+
     cache_by_device_type: bool
-    """Separate cached content based on the visitor’s device type"""
+    """Whether to separate cached content based on the visitor's device type."""
 
     cache_deception_armor: bool
     """
-    Protect from web cache deception attacks while allowing static assets to be
-    cached
+    Whether to protect from web cache deception attacks, while allowing static
+    assets to be cached.
     """
 
     custom_key: SetCacheSettingsRuleActionParametersCacheKeyCustomKey
-    """
-    Customize which components of the request are included or excluded from the
-    cache key.
-    """
+    """Which components of the request are included or excluded from the cache key."""
 
     ignore_query_strings_order: bool
     """
-    Treat requests with the same query parameters the same, regardless of the order
-    those query parameters are in. A value of true ignores the query strings' order.
+    Whether to treat requests with the same query parameters the same, regardless of
+    the order those query parameters are in.
     """
 
 
 class SetCacheSettingsRuleActionParametersCacheReserve(TypedDict, total=False):
+    """
+    Settings to determine whether the request's response from origin is eligible for Cache Reserve (requires a Cache Reserve add-on plan).
+    """
+
     eligible: Required[bool]
-    """Determines whether cache reserve is enabled.
+    """Whether Cache Reserve is enabled.
 
     If this is true and a request meets eligibility criteria, Cloudflare will write
-    the resource to cache reserve.
+    the resource to Cache Reserve.
     """
 
-    min_file_size: Required[int]
-    """The minimum file size eligible for store in cache reserve."""
+    minimum_file_size: int
+    """The minimum file size eligible for storage in Cache Reserve."""
 
 
 _SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTLStatusCodeRangeReservedKeywords = TypedDict(
@@ -1049,94 +2752,95 @@ class SetCacheSettingsRuleActionParametersCacheReserve(TypedDict, total=False):
 class SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTLStatusCodeRange(
     _SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTLStatusCodeRangeReservedKeywords, total=False
 ):
-    to: Required[int]
-    """response status code upper bound"""
+    """A range of status codes to apply the TTL to."""
+
+    to: int
+    """The upper bound of the range."""
 
 
 class SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTL(TypedDict, total=False):
     value: Required[int]
-    """Time to cache a response (in seconds).
+    """The time to cache the response for (in seconds).
 
-    A value of 0 is equivalent to setting the Cache-Control header with the value
-    "no-cache". A value of -1 is equivalent to setting Cache-Control header with the
-    value of "no-store".
+    A value of 0 is equivalent to setting the cache control header with the value
+    "no-cache". A value of -1 is equivalent to setting the cache control header with
+    the value of "no-store".
     """
 
-    status_code_range: SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTLStatusCodeRange
-    """The range of status codes used to apply the selected mode."""
+    status_code: int
+    """A single status code to apply the TTL to."""
 
-    status_code_value: int
-    """Set the ttl for responses with this specific status code"""
+    status_code_range: SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTLStatusCodeRange
+    """A range of status codes to apply the TTL to."""
 
 
 class SetCacheSettingsRuleActionParametersEdgeTTL(TypedDict, total=False):
-    default: Required[int]
-    """The TTL (in seconds) if you choose override_origin mode."""
+    """How long the Cloudflare edge network should cache the response."""
 
     mode: Required[Literal["respect_origin", "bypass_by_default", "override_origin"]]
-    """edge ttl options"""
+    """The edge TTL mode."""
 
-    status_code_ttl: Required[Iterable[SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTL]]
-    """List of single status codes, or status code ranges to apply the selected mode"""
+    default: int
+    """The edge TTL (in seconds) if you choose the "override_origin" mode."""
+
+    status_code_ttl: Iterable[SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTL]
+    """A list of TTLs to apply to specific status codes or status code ranges."""
 
 
 class SetCacheSettingsRuleActionParametersServeStale(TypedDict, total=False):
-    disable_stale_while_updating: Required[bool]
-    """Defines whether Cloudflare should serve stale content while updating.
+    """When to serve stale content from cache."""
 
-    If true, Cloudflare will not serve stale content while getting the latest
+    disable_stale_while_updating: bool
+    """
+    Whether Cloudflare should disable serving stale content while getting the latest
     content from the origin.
     """
 
 
 class SetCacheSettingsRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
     additional_cacheable_ports: Iterable[int]
-    """List of additional ports that caching can be enabled on."""
+    """A list of additional ports that caching should be enabled on."""
 
     browser_ttl: SetCacheSettingsRuleActionParametersBrowserTTL
-    """Specify how long client browsers should cache the response.
+    """How long client browsers should cache the response.
 
     Cloudflare cache purge will not purge content cached on client browsers, so high
     browser TTLs may lead to stale content.
     """
 
     cache: bool
-    """Mark whether the request’s response from origin is eligible for caching.
+    """Whether the request's response from the origin is eligible for caching.
 
-    Caching itself will still depend on the cache-control header and your other
+    Caching itself will still depend on the cache control header and your other
     caching configurations.
     """
 
     cache_key: SetCacheSettingsRuleActionParametersCacheKey
     """
-    Define which components of the request are included or excluded from the cache
-    key Cloudflare uses to store the response in cache.
+    Which components of the request are included in or excluded from the cache key
+    Cloudflare uses to store the response in cache.
     """
 
     cache_reserve: SetCacheSettingsRuleActionParametersCacheReserve
     """
-    Mark whether the request's response from origin is eligible for Cache Reserve
-    (requires a Cache Reserve add-on plan).
+    Settings to determine whether the request's response from origin is eligible for
+    Cache Reserve (requires a Cache Reserve add-on plan).
     """
 
     edge_ttl: SetCacheSettingsRuleActionParametersEdgeTTL
-    """
-    TTL (Time to Live) specifies the maximum time to cache a resource in the
-    Cloudflare edge network.
-    """
+    """How long the Cloudflare edge network should cache the response."""
 
     origin_cache_control: bool
-    """When enabled, Cloudflare will aim to strictly adhere to RFC 7234."""
+    """Whether Cloudflare will aim to strictly adhere to RFC 7234."""
 
     origin_error_page_passthru: bool
-    """Generate Cloudflare error pages from issues sent from the origin server.
-
-    When on, error pages will trigger for issues from the origin
-    """
+    """Whether to generate Cloudflare error pages for issues from the origin server."""
 
     read_timeout: int
     """
-    Define a timeout value between two successive read operations to your origin
+    A timeout value between two successive read operations to use for your origin
     server. Historically, the timeout value between two read options from Cloudflare
     to an origin server is 100 seconds. If you are attempting to reduce HTTP 524
     errors because of timeouts from an origin server, try increasing this timeout
@@ -1144,20 +2848,106 @@ class SetCacheSettingsRuleActionParameters(TypedDict, total=False):
     """
 
     respect_strong_etags: bool
-    """
-    Specify whether or not Cloudflare should respect strong ETag (entity tag)
-    headers. When off, Cloudflare converts strong ETag headers to weak ETag headers.
+    """Whether Cloudflare should respect strong ETag (entity tag) headers.
+
+    If false, Cloudflare converts strong ETag headers to weak ETag headers.
     """
 
     serve_stale: SetCacheSettingsRuleActionParametersServeStale
+    """When to serve stale content from cache."""
+
+
+class SetCacheSettingsRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class SetCacheSettingsRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class SetCacheSettingsRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class SetCacheSettingsRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+SetCacheSettingsRulePosition: TypeAlias = Union[
+    SetCacheSettingsRulePositionBeforePosition,
+    SetCacheSettingsRulePositionAfterPosition,
+    SetCacheSettingsRulePositionIndexPosition,
+]
+
+
+class SetCacheSettingsRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
     """
-    Define if Cloudflare should serve stale content while getting the latest content
-    from the origin. If on, Cloudflare will not serve stale content while getting
-    the latest content from the origin.
+    The threshold of requests per period after which the action will be executed for
+    the first time.
     """
 
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
 
-class RulesetsLogCustomFieldRule(TypedDict, total=False):
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class SetConfigurationRule(TypedDict, total=False):
     account_id: str
     """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
 
@@ -1167,10 +2957,10 @@ class RulesetsLogCustomFieldRule(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
 
-    action: Literal["log_custom_field"]
+    action: Literal["set_config"]
     """The action to perform when the rule matches."""
 
-    action_parameters: RulesetsLogCustomFieldRuleActionParameters
+    action_parameters: SetConfigurationRuleActionParameters
     """The parameters configuring the rule's action."""
 
     description: str
@@ -1179,75 +2969,193 @@ class RulesetsLogCustomFieldRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: SetConfigurationRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    position: SetConfigurationRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: SetConfigurationRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class RulesetsLogCustomFieldRuleActionParametersCookieField(TypedDict, total=False):
-    name: Required[str]
-    """The name of the field."""
+class SetConfigurationRuleActionParametersAutominify(TypedDict, total=False):
+    """Which file extensions to minify automatically."""
 
+    css: bool
+    """Whether to minify CSS files."""
 
-class RulesetsLogCustomFieldRuleActionParametersRequestField(TypedDict, total=False):
-    name: Required[str]
-    """The name of the field."""
+    html: bool
+    """Whether to minify HTML files."""
 
+    js: bool
+    """Whether to minify JavaScript files."""
 
-class RulesetsLogCustomFieldRuleActionParametersResponseField(TypedDict, total=False):
-    name: Required[str]
-    """The name of the field."""
 
+class SetConfigurationRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
 
-class RulesetsLogCustomFieldRuleActionParameters(TypedDict, total=False):
-    cookie_fields: Iterable[RulesetsLogCustomFieldRuleActionParametersCookieField]
-    """The cookie fields to log."""
+    automatic_https_rewrites: bool
+    """Whether to enable Automatic HTTPS Rewrites."""
 
-    request_fields: Iterable[RulesetsLogCustomFieldRuleActionParametersRequestField]
-    """The request fields to log."""
+    autominify: SetConfigurationRuleActionParametersAutominify
+    """Which file extensions to minify automatically."""
 
-    response_fields: Iterable[RulesetsLogCustomFieldRuleActionParametersResponseField]
-    """The response fields to log."""
+    bic: bool
+    """Whether to enable Browser Integrity Check (BIC)."""
 
+    disable_apps: Literal[True]
+    """Whether to disable Cloudflare Apps."""
 
-class RulesetsDDoSDynamicRule(TypedDict, total=False):
-    account_id: str
-    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+    disable_pay_per_crawl: Literal[True]
+    """Whether to disable Pay Per Crawl."""
 
-    zone_id: str
-    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+    disable_rum: Literal[True]
+    """Whether to disable Real User Monitoring (RUM)."""
 
-    id: str
-    """The unique ID of the rule."""
+    disable_zaraz: Literal[True]
+    """Whether to disable Zaraz."""
 
-    action: Literal["ddos_dynamic"]
-    """The action to perform when the rule matches."""
+    email_obfuscation: bool
+    """Whether to enable Email Obfuscation."""
 
-    action_parameters: object
-    """The parameters configuring the rule's action."""
+    fonts: bool
+    """Whether to enable Cloudflare Fonts."""
 
-    description: str
-    """An informative description of the rule."""
+    hotlink_protection: bool
+    """Whether to enable Hotlink Protection."""
 
-    enabled: bool
-    """Whether the rule should be executed."""
+    mirage: bool
+    """Whether to enable Mirage."""
 
-    expression: str
-    """The expression defining which traffic will match the rule."""
+    opportunistic_encryption: bool
+    """Whether to enable Opportunistic Encryption."""
 
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
+    polish: Literal["off", "lossless", "lossy", "webp"]
+    """The Polish level to configure."""
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    request_body_buffering: Literal["none", "standard", "full"]
+    """The request body buffering mode."""
+
+    response_body_buffering: Literal["none", "standard"]
+    """The response body buffering mode."""
+
+    rocket_loader: bool
+    """Whether to enable Rocket Loader."""
+
+    security_level: Literal["off", "essentially_off", "low", "medium", "high", "under_attack"]
+    """The Security Level to configure."""
+
+    server_side_excludes: bool
+    """Whether to enable Server-Side Excludes."""
 
+    ssl: Literal["off", "flexible", "full", "strict", "origin_pull"]
+    """The SSL level to configure."""
+
+    sxg: bool
+    """Whether to enable Signed Exchanges (SXG)."""
+
+
+class SetConfigurationRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class SetConfigurationRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class SetConfigurationRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class SetConfigurationRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+SetConfigurationRulePosition: TypeAlias = Union[
+    SetConfigurationRulePositionBeforePosition,
+    SetConfigurationRulePositionAfterPosition,
+    SetConfigurationRulePositionIndexPosition,
+]
+
+
+class SetConfigurationRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
 
-class RulesetsForceConnectionCloseRule(TypedDict, total=False):
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class SkipRule(TypedDict, total=False):
     account_id: str
     """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
 
@@ -1257,10 +3165,10 @@ class RulesetsForceConnectionCloseRule(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
 
-    action: Literal["force_connection_close"]
+    action: Literal["skip"]
     """The action to perform when the rule matches."""
 
-    action_parameters: object
+    action_parameters: SkipRuleActionParameters
     """The parameters configuring the rule's action."""
 
     description: str
@@ -1269,33 +3177,167 @@ class RulesetsForceConnectionCloseRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: SkipRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    position: SkipRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: SkipRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
+
+
+class SkipRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
+    phase: Literal["current"]
+    """A phase to skip the execution of.
+
+    This option is only compatible with the products option.
+    """
+
+    phases: List[Phase]
+    """A list of phases to skip the execution of.
 
+    This option is incompatible with the rulesets option.
+    """
+
+    products: List[Literal["bic", "hot", "rateLimit", "securityLevel", "uaBlock", "waf", "zoneLockdown"]]
+    """A list of legacy security products to skip the execution of."""
+
+    rules: Dict[str, SequenceNotStr[str]]
+    """
+    A mapping of ruleset IDs to a list of rule IDs in that ruleset to skip the
+    execution of. This option is incompatible with the ruleset option.
+    """
+
+    ruleset: Literal["current"]
+    """A ruleset to skip the execution of.
+
+    This option is incompatible with the rulesets option.
+    """
+
+    rulesets: SequenceNotStr[str]
+    """A list of ruleset IDs to skip the execution of.
+
+    This option is incompatible with the ruleset and phases options.
+    """
+
+
+class SkipRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class SkipRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class SkipRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class SkipRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+SkipRulePosition: TypeAlias = Union[
+    SkipRulePositionBeforePosition, SkipRulePositionAfterPosition, SkipRulePositionIndexPosition
+]
+
+
+class SkipRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
 
-RuleCreateParams = Union[
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+RuleCreateParams: TypeAlias = Union[
     BlockRule,
     ChallengeRule,
-    CompressResponseRule,
+    ResponseCompressionRule,
+    DDoSDynamicRule,
     ExecuteRule,
-    JSChallengeRule,
+    ForceConnectionCloseRule,
+    JavaScriptChallengeRule,
     LogRule,
+    LogCustomFieldRule,
     ManagedChallengeRule,
     RedirectRule,
     RewriteRule,
     RouteRule,
     ScoreRule,
     ServeErrorRule,
-    SetConfigRule,
-    SkipRule,
     SetCacheSettingsRule,
-    RulesetsLogCustomFieldRule,
-    RulesetsDDoSDynamicRule,
-    RulesetsForceConnectionCloseRule,
+    SetConfigurationRule,
+    SkipRule,
 ]
diff --git a/src/cloudflare/types/rulesets/rule_create_response.py b/src/cloudflare/types/rulesets/rule_create_response.py
index 04e3457f902..0490e4d9ed9 100644
--- a/src/cloudflare/types/rulesets/rule_create_response.py
+++ b/src/cloudflare/types/rulesets/rule_create_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal, Annotated
+from typing_extensions import Literal, Annotated, TypeAlias
 
 from .kind import Kind
 from .phase import Phase
@@ -17,54 +17,84 @@
 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 .ddos_dynamic_rule import DDoSDynamicRule
+from .log_custom_field_rule import LogCustomFieldRule
 from .compress_response_rule import CompressResponseRule
 from .managed_challenge_rule import ManagedChallengeRule
 from .set_cache_settings_rule import SetCacheSettingsRule
+from .force_connection_close_rule import ForceConnectionCloseRule
 
 __all__ = [
     "RuleCreateResponse",
     "Rule",
-    "RuleRulesetsLogCustomFieldRule",
-    "RuleRulesetsLogCustomFieldRuleActionParameters",
-    "RuleRulesetsLogCustomFieldRuleActionParametersCookieField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersRequestField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersResponseField",
-    "RuleRulesetsDDoSDynamicRule",
-    "RuleRulesetsForceConnectionCloseRule",
+    "RuleRulesetsChallengeRule",
+    "RuleRulesetsChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsChallengeRuleRatelimit",
+    "RuleRulesetsJSChallengeRule",
+    "RuleRulesetsJSChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsJSChallengeRuleRatelimit",
 ]
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersCookieField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-class RuleRulesetsLogCustomFieldRuleActionParametersRequestField(BaseModel):
-    name: str
-    """The name of the field."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersResponseField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-class RuleRulesetsLogCustomFieldRuleActionParameters(BaseModel):
-    cookie_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersCookieField]] = None
-    """The cookie fields to log."""
+    It defaults to the same as the rule's expression.
+    """
 
-    request_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersRequestField]] = None
-    """The request fields to log."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    response_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersResponseField]] = None
-    """The response fields to log."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
 
-class RuleRulesetsLogCustomFieldRule(BaseModel):
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class RuleRulesetsChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -74,10 +104,10 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["log_custom_field"]] = None
+    action: Optional[Literal["challenge"]] = None
     """The action to perform when the rule matches."""
 
-    action_parameters: Optional[RuleRulesetsLogCustomFieldRuleActionParameters] = None
+    action_parameters: Optional[object] = None
     """The parameters configuring the rule's action."""
 
     categories: Optional[List[str]] = None
@@ -89,52 +119,79 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class RuleRulesetsDDoSDynamicRule(BaseModel):
-    last_updated: datetime
-    """The timestamp of when the rule was last modified."""
+class RuleRulesetsJSChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
-    version: str
-    """The version of the rule."""
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-    id: Optional[str] = None
-    """The unique ID of the rule."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
-    action: Optional[Literal["ddos_dynamic"]] = None
-    """The action to perform when the rule matches."""
 
-    action_parameters: Optional[object] = None
-    """The parameters configuring the rule's action."""
+class RuleRulesetsJSChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
 
-    categories: Optional[List[str]] = None
-    """The categories of the rule."""
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-    description: Optional[str] = None
-    """An informative description of the rule."""
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
-    enabled: Optional[bool] = None
-    """Whether the rule should be executed."""
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-    expression: Optional[str] = None
-    """The expression defining which traffic will match the rule."""
+    It defaults to the same as the rule's expression.
+    """
 
-    logging: Optional[Logging] = None
-    """An object configuring the rule's logging behavior."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
-class RuleRulesetsForceConnectionCloseRule(BaseModel):
+
+class RuleRulesetsJSChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -144,7 +201,7 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["force_connection_close"]] = None
+    action: Optional[Literal["js_challenge"]] = None
     """The action to perform when the rule matches."""
 
     action_parameters: Optional[object] = None
@@ -159,42 +216,50 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsJSChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsJSChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-Rule = Annotated[
+Rule: TypeAlias = Annotated[
     Union[
         BlockRule,
-        ChallengeRule,
+        RuleRulesetsChallengeRule,
         CompressResponseRule,
+        DDoSDynamicRule,
         ExecuteRule,
-        JSChallengeRule,
+        ForceConnectionCloseRule,
+        RuleRulesetsJSChallengeRule,
         LogRule,
+        LogCustomFieldRule,
         ManagedChallengeRule,
         RedirectRule,
         RewriteRule,
         RouteRule,
         ScoreRule,
         ServeErrorRule,
+        SetCacheSettingsRule,
         SetConfigRule,
         SkipRule,
-        SetCacheSettingsRule,
-        RuleRulesetsLogCustomFieldRule,
-        RuleRulesetsDDoSDynamicRule,
-        RuleRulesetsForceConnectionCloseRule,
     ],
     PropertyInfo(discriminator="action"),
 ]
 
 
 class RuleCreateResponse(BaseModel):
+    """A ruleset object."""
+
     id: str
     """The unique ID of the ruleset."""
 
diff --git a/src/cloudflare/types/rulesets/rule_delete_response.py b/src/cloudflare/types/rulesets/rule_delete_response.py
index 25d801cd5aa..a4524c6c260 100644
--- a/src/cloudflare/types/rulesets/rule_delete_response.py
+++ b/src/cloudflare/types/rulesets/rule_delete_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal, Annotated
+from typing_extensions import Literal, Annotated, TypeAlias
 
 from .kind import Kind
 from .phase import Phase
@@ -17,54 +17,84 @@
 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 .ddos_dynamic_rule import DDoSDynamicRule
+from .log_custom_field_rule import LogCustomFieldRule
 from .compress_response_rule import CompressResponseRule
 from .managed_challenge_rule import ManagedChallengeRule
 from .set_cache_settings_rule import SetCacheSettingsRule
+from .force_connection_close_rule import ForceConnectionCloseRule
 
 __all__ = [
     "RuleDeleteResponse",
     "Rule",
-    "RuleRulesetsLogCustomFieldRule",
-    "RuleRulesetsLogCustomFieldRuleActionParameters",
-    "RuleRulesetsLogCustomFieldRuleActionParametersCookieField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersRequestField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersResponseField",
-    "RuleRulesetsDDoSDynamicRule",
-    "RuleRulesetsForceConnectionCloseRule",
+    "RuleRulesetsChallengeRule",
+    "RuleRulesetsChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsChallengeRuleRatelimit",
+    "RuleRulesetsJSChallengeRule",
+    "RuleRulesetsJSChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsJSChallengeRuleRatelimit",
 ]
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersCookieField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-class RuleRulesetsLogCustomFieldRuleActionParametersRequestField(BaseModel):
-    name: str
-    """The name of the field."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersResponseField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-class RuleRulesetsLogCustomFieldRuleActionParameters(BaseModel):
-    cookie_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersCookieField]] = None
-    """The cookie fields to log."""
+    It defaults to the same as the rule's expression.
+    """
 
-    request_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersRequestField]] = None
-    """The request fields to log."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    response_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersResponseField]] = None
-    """The response fields to log."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
 
-class RuleRulesetsLogCustomFieldRule(BaseModel):
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class RuleRulesetsChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -74,10 +104,10 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["log_custom_field"]] = None
+    action: Optional[Literal["challenge"]] = None
     """The action to perform when the rule matches."""
 
-    action_parameters: Optional[RuleRulesetsLogCustomFieldRuleActionParameters] = None
+    action_parameters: Optional[object] = None
     """The parameters configuring the rule's action."""
 
     categories: Optional[List[str]] = None
@@ -89,52 +119,79 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class RuleRulesetsDDoSDynamicRule(BaseModel):
-    last_updated: datetime
-    """The timestamp of when the rule was last modified."""
+class RuleRulesetsJSChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
-    version: str
-    """The version of the rule."""
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-    id: Optional[str] = None
-    """The unique ID of the rule."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
-    action: Optional[Literal["ddos_dynamic"]] = None
-    """The action to perform when the rule matches."""
 
-    action_parameters: Optional[object] = None
-    """The parameters configuring the rule's action."""
+class RuleRulesetsJSChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
 
-    categories: Optional[List[str]] = None
-    """The categories of the rule."""
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-    description: Optional[str] = None
-    """An informative description of the rule."""
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
-    enabled: Optional[bool] = None
-    """Whether the rule should be executed."""
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-    expression: Optional[str] = None
-    """The expression defining which traffic will match the rule."""
+    It defaults to the same as the rule's expression.
+    """
 
-    logging: Optional[Logging] = None
-    """An object configuring the rule's logging behavior."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
-class RuleRulesetsForceConnectionCloseRule(BaseModel):
+
+class RuleRulesetsJSChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -144,7 +201,7 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["force_connection_close"]] = None
+    action: Optional[Literal["js_challenge"]] = None
     """The action to perform when the rule matches."""
 
     action_parameters: Optional[object] = None
@@ -159,42 +216,50 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsJSChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsJSChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-Rule = Annotated[
+Rule: TypeAlias = Annotated[
     Union[
         BlockRule,
-        ChallengeRule,
+        RuleRulesetsChallengeRule,
         CompressResponseRule,
+        DDoSDynamicRule,
         ExecuteRule,
-        JSChallengeRule,
+        ForceConnectionCloseRule,
+        RuleRulesetsJSChallengeRule,
         LogRule,
+        LogCustomFieldRule,
         ManagedChallengeRule,
         RedirectRule,
         RewriteRule,
         RouteRule,
         ScoreRule,
         ServeErrorRule,
+        SetCacheSettingsRule,
         SetConfigRule,
         SkipRule,
-        SetCacheSettingsRule,
-        RuleRulesetsLogCustomFieldRule,
-        RuleRulesetsDDoSDynamicRule,
-        RuleRulesetsForceConnectionCloseRule,
     ],
     PropertyInfo(discriminator="action"),
 ]
 
 
 class RuleDeleteResponse(BaseModel):
+    """A ruleset object."""
+
     id: str
     """The unique ID of the ruleset."""
 
diff --git a/src/cloudflare/types/rulesets/rule_edit_params.py b/src/cloudflare/types/rulesets/rule_edit_params.py
index 5cfda3cca5d..717b3e108cd 100644
--- a/src/cloudflare/types/rulesets/rule_edit_params.py
+++ b/src/cloudflare/types/rulesets/rule_edit_params.py
@@ -3,57 +3,157 @@
 from __future__ import annotations
 
 from typing import Dict, List, Union, Iterable
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
 from .phase import Phase
+from ..._types import SequenceNotStr
 from .logging_param import LoggingParam
-from .rewrite_uri_part_param import RewriteURIPartParam
 
 __all__ = [
     "RuleEditParams",
     "BlockRule",
     "BlockRuleActionParameters",
     "BlockRuleActionParametersResponse",
+    "BlockRuleExposedCredentialCheck",
+    "BlockRulePosition",
+    "BlockRulePositionBeforePosition",
+    "BlockRulePositionAfterPosition",
+    "BlockRulePositionIndexPosition",
+    "BlockRuleRatelimit",
     "ChallengeRule",
-    "CompressResponseRule",
-    "CompressResponseRuleActionParameters",
-    "CompressResponseRuleActionParametersAlgorithm",
+    "ChallengeRuleExposedCredentialCheck",
+    "ChallengeRulePosition",
+    "ChallengeRulePositionBeforePosition",
+    "ChallengeRulePositionAfterPosition",
+    "ChallengeRulePositionIndexPosition",
+    "ChallengeRuleRatelimit",
+    "ResponseCompressionRule",
+    "ResponseCompressionRuleActionParameters",
+    "ResponseCompressionRuleActionParametersAlgorithm",
+    "ResponseCompressionRuleExposedCredentialCheck",
+    "ResponseCompressionRulePosition",
+    "ResponseCompressionRulePositionBeforePosition",
+    "ResponseCompressionRulePositionAfterPosition",
+    "ResponseCompressionRulePositionIndexPosition",
+    "ResponseCompressionRuleRatelimit",
+    "DDoSDynamicRule",
+    "DDoSDynamicRuleExposedCredentialCheck",
+    "DDoSDynamicRulePosition",
+    "DDoSDynamicRulePositionBeforePosition",
+    "DDoSDynamicRulePositionAfterPosition",
+    "DDoSDynamicRulePositionIndexPosition",
+    "DDoSDynamicRuleRatelimit",
     "ExecuteRule",
     "ExecuteRuleActionParameters",
     "ExecuteRuleActionParametersMatchedData",
     "ExecuteRuleActionParametersOverrides",
     "ExecuteRuleActionParametersOverridesCategory",
     "ExecuteRuleActionParametersOverridesRule",
-    "JSChallengeRule",
+    "ExecuteRuleExposedCredentialCheck",
+    "ExecuteRulePosition",
+    "ExecuteRulePositionBeforePosition",
+    "ExecuteRulePositionAfterPosition",
+    "ExecuteRulePositionIndexPosition",
+    "ExecuteRuleRatelimit",
+    "ForceConnectionCloseRule",
+    "ForceConnectionCloseRuleExposedCredentialCheck",
+    "ForceConnectionCloseRulePosition",
+    "ForceConnectionCloseRulePositionBeforePosition",
+    "ForceConnectionCloseRulePositionAfterPosition",
+    "ForceConnectionCloseRulePositionIndexPosition",
+    "ForceConnectionCloseRuleRatelimit",
+    "JavaScriptChallengeRule",
+    "JavaScriptChallengeRuleExposedCredentialCheck",
+    "JavaScriptChallengeRulePosition",
+    "JavaScriptChallengeRulePositionBeforePosition",
+    "JavaScriptChallengeRulePositionAfterPosition",
+    "JavaScriptChallengeRulePositionIndexPosition",
+    "JavaScriptChallengeRuleRatelimit",
     "LogRule",
+    "LogRuleExposedCredentialCheck",
+    "LogRulePosition",
+    "LogRulePositionBeforePosition",
+    "LogRulePositionAfterPosition",
+    "LogRulePositionIndexPosition",
+    "LogRuleRatelimit",
+    "LogCustomFieldRule",
+    "LogCustomFieldRuleActionParameters",
+    "LogCustomFieldRuleActionParametersCookieField",
+    "LogCustomFieldRuleActionParametersRawResponseField",
+    "LogCustomFieldRuleActionParametersRequestField",
+    "LogCustomFieldRuleActionParametersResponseField",
+    "LogCustomFieldRuleActionParametersTransformedRequestField",
+    "LogCustomFieldRuleExposedCredentialCheck",
+    "LogCustomFieldRulePosition",
+    "LogCustomFieldRulePositionBeforePosition",
+    "LogCustomFieldRulePositionAfterPosition",
+    "LogCustomFieldRulePositionIndexPosition",
+    "LogCustomFieldRuleRatelimit",
     "ManagedChallengeRule",
+    "ManagedChallengeRuleExposedCredentialCheck",
+    "ManagedChallengeRulePosition",
+    "ManagedChallengeRulePositionBeforePosition",
+    "ManagedChallengeRulePositionAfterPosition",
+    "ManagedChallengeRulePositionIndexPosition",
+    "ManagedChallengeRuleRatelimit",
     "RedirectRule",
     "RedirectRuleActionParameters",
     "RedirectRuleActionParametersFromList",
     "RedirectRuleActionParametersFromValue",
     "RedirectRuleActionParametersFromValueTargetURL",
-    "RedirectRuleActionParametersFromValueTargetURLStaticURLRedirect",
-    "RedirectRuleActionParametersFromValueTargetURLDynamicURLRedirect",
+    "RedirectRuleExposedCredentialCheck",
+    "RedirectRulePosition",
+    "RedirectRulePositionBeforePosition",
+    "RedirectRulePositionAfterPosition",
+    "RedirectRulePositionIndexPosition",
+    "RedirectRuleRatelimit",
     "RewriteRule",
     "RewriteRuleActionParameters",
     "RewriteRuleActionParametersHeaders",
+    "RewriteRuleActionParametersHeadersAddStaticHeader",
+    "RewriteRuleActionParametersHeadersAddDynamicHeader",
+    "RewriteRuleActionParametersHeadersSetStaticHeader",
+    "RewriteRuleActionParametersHeadersSetDynamicHeader",
     "RewriteRuleActionParametersHeadersRemoveHeader",
-    "RewriteRuleActionParametersHeadersStaticHeader",
-    "RewriteRuleActionParametersHeadersDynamicHeader",
     "RewriteRuleActionParametersURI",
+    "RewriteRuleActionParametersURIURIPath",
+    "RewriteRuleActionParametersURIURIPathPath",
+    "RewriteRuleActionParametersURIURIQuery",
+    "RewriteRuleActionParametersURIURIQueryQuery",
+    "RewriteRuleExposedCredentialCheck",
+    "RewriteRulePosition",
+    "RewriteRulePositionBeforePosition",
+    "RewriteRulePositionAfterPosition",
+    "RewriteRulePositionIndexPosition",
+    "RewriteRuleRatelimit",
     "RouteRule",
     "RouteRuleActionParameters",
     "RouteRuleActionParametersOrigin",
     "RouteRuleActionParametersSNI",
+    "RouteRuleExposedCredentialCheck",
+    "RouteRulePosition",
+    "RouteRulePositionBeforePosition",
+    "RouteRulePositionAfterPosition",
+    "RouteRulePositionIndexPosition",
+    "RouteRuleRatelimit",
     "ScoreRule",
     "ScoreRuleActionParameters",
+    "ScoreRuleExposedCredentialCheck",
+    "ScoreRulePosition",
+    "ScoreRulePositionBeforePosition",
+    "ScoreRulePositionAfterPosition",
+    "ScoreRulePositionIndexPosition",
+    "ScoreRuleRatelimit",
     "ServeErrorRule",
     "ServeErrorRuleActionParameters",
-    "SetConfigRule",
-    "SetConfigRuleActionParameters",
-    "SetConfigRuleActionParametersAutominify",
-    "SkipRule",
-    "SkipRuleActionParameters",
+    "ServeErrorRuleActionParametersActionParametersContent",
+    "ServeErrorRuleActionParametersActionParametersAsset",
+    "ServeErrorRuleExposedCredentialCheck",
+    "ServeErrorRulePosition",
+    "ServeErrorRulePositionBeforePosition",
+    "ServeErrorRulePositionAfterPosition",
+    "ServeErrorRulePositionIndexPosition",
+    "ServeErrorRuleRatelimit",
     "SetCacheSettingsRule",
     "SetCacheSettingsRuleActionParameters",
     "SetCacheSettingsRuleActionParametersBrowserTTL",
@@ -71,13 +171,29 @@
     "SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTL",
     "SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTLStatusCodeRange",
     "SetCacheSettingsRuleActionParametersServeStale",
-    "RulesetsLogCustomFieldRule",
-    "RulesetsLogCustomFieldRuleActionParameters",
-    "RulesetsLogCustomFieldRuleActionParametersCookieField",
-    "RulesetsLogCustomFieldRuleActionParametersRequestField",
-    "RulesetsLogCustomFieldRuleActionParametersResponseField",
-    "RulesetsDDoSDynamicRule",
-    "RulesetsForceConnectionCloseRule",
+    "SetCacheSettingsRuleExposedCredentialCheck",
+    "SetCacheSettingsRulePosition",
+    "SetCacheSettingsRulePositionBeforePosition",
+    "SetCacheSettingsRulePositionAfterPosition",
+    "SetCacheSettingsRulePositionIndexPosition",
+    "SetCacheSettingsRuleRatelimit",
+    "SetConfigurationRule",
+    "SetConfigurationRuleActionParameters",
+    "SetConfigurationRuleActionParametersAutominify",
+    "SetConfigurationRuleExposedCredentialCheck",
+    "SetConfigurationRulePosition",
+    "SetConfigurationRulePositionBeforePosition",
+    "SetConfigurationRulePositionAfterPosition",
+    "SetConfigurationRulePositionIndexPosition",
+    "SetConfigurationRuleRatelimit",
+    "SkipRule",
+    "SkipRuleActionParameters",
+    "SkipRuleExposedCredentialCheck",
+    "SkipRulePosition",
+    "SkipRulePositionBeforePosition",
+    "SkipRulePositionAfterPosition",
+    "SkipRulePositionIndexPosition",
+    "SkipRuleRatelimit",
 ]
 
 
@@ -106,17 +222,28 @@ class BlockRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: BlockRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    position: BlockRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: BlockRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
 class BlockRuleActionParametersResponse(TypedDict, total=False):
+    """The response to show when the block is applied."""
+
     content: Required[str]
     """The content to return."""
 
@@ -128,10 +255,100 @@ class BlockRuleActionParametersResponse(TypedDict, total=False):
 
 
 class BlockRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
     response: BlockRuleActionParametersResponse
     """The response to show when the block is applied."""
 
 
+class BlockRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class BlockRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class BlockRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class BlockRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+BlockRulePosition: TypeAlias = Union[
+    BlockRulePositionBeforePosition, BlockRulePositionAfterPosition, BlockRulePositionIndexPosition
+]
+
+
+class BlockRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
 class ChallengeRule(TypedDict, total=False):
     ruleset_id: Required[str]
     """The unique ID of the ruleset."""
@@ -157,62 +374,114 @@ class ChallengeRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ChallengeRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    position: ChallengeRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: ChallengeRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class CompressResponseRule(TypedDict, total=False):
-    ruleset_id: Required[str]
-    """The unique ID of the ruleset."""
+class ChallengeRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
 
-    account_id: str
-    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
 
-    zone_id: str
-    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
 
-    id: str
-    """The unique ID of the rule."""
 
-    action: Literal["compress_response"]
-    """The action to perform when the rule matches."""
+class ChallengeRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    action_parameters: CompressResponseRuleActionParameters
-    """The parameters configuring the rule's action."""
+    before: str
+    """The ID of another rule to place the rule before.
 
-    description: str
-    """An informative description of the rule."""
+    An empty value causes the rule to be placed at the top.
+    """
 
-    enabled: bool
-    """Whether the rule should be executed."""
 
-    expression: str
-    """The expression defining which traffic will match the rule."""
+class ChallengeRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
+    after: str
+    """The ID of another rule to place the rule after.
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    An empty value causes the rule to be placed at the bottom.
+    """
 
 
-class CompressResponseRuleActionParametersAlgorithm(TypedDict, total=False):
-    name: Literal["none", "auto", "default", "gzip", "brotli"]
-    """Name of compression algorithm to enable."""
+class ChallengeRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
 
-class CompressResponseRuleActionParameters(TypedDict, total=False):
-    algorithms: Iterable[CompressResponseRuleActionParametersAlgorithm]
-    """Custom order for compression algorithms."""
+
+ChallengeRulePosition: TypeAlias = Union[
+    ChallengeRulePositionBeforePosition, ChallengeRulePositionAfterPosition, ChallengeRulePositionIndexPosition
+]
 
 
-class ExecuteRule(TypedDict, total=False):
+class ChallengeRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class ResponseCompressionRule(TypedDict, total=False):
     ruleset_id: Required[str]
     """The unique ID of the ruleset."""
 
@@ -225,10 +494,10 @@ class ExecuteRule(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
 
-    action: Literal["execute"]
+    action: Literal["compress_response"]
     """The action to perform when the rule matches."""
 
-    action_parameters: ExecuteRuleActionParameters
+    action_parameters: ResponseCompressionRuleActionParameters
     """The parameters configuring the rule's action."""
 
     description: str
@@ -237,94 +506,130 @@ class ExecuteRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ResponseCompressionRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    position: ResponseCompressionRulePosition
+    """An object configuring where the rule will be placed."""
 
+    ratelimit: ResponseCompressionRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
 
-class ExecuteRuleActionParametersMatchedData(TypedDict, total=False):
-    public_key: Required[str]
-    """The public key to encrypt matched data logs with."""
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class ExecuteRuleActionParametersOverridesCategory(TypedDict, total=False):
-    category: Required[str]
-    """The name of the category to override."""
+class ResponseCompressionRuleActionParametersAlgorithm(TypedDict, total=False):
+    """Compression algorithm to enable."""
 
-    action: str
-    """The action to override rules in the category with."""
+    name: Literal["none", "auto", "default", "gzip", "brotli", "zstd"]
+    """Name of the compression algorithm to enable."""
 
-    enabled: bool
-    """Whether to enable execution of rules in the category."""
 
-    sensitivity_level: Literal["default", "medium", "low", "eoff"]
-    """The sensitivity level to use for rules in the category."""
+class ResponseCompressionRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
 
+    algorithms: Required[Iterable[ResponseCompressionRuleActionParametersAlgorithm]]
+    """Custom order for compression algorithms."""
 
-class ExecuteRuleActionParametersOverridesRule(TypedDict, total=False):
-    id: Required[str]
-    """The ID of the rule to override."""
 
-    action: str
-    """The action to override the rule with."""
+class ResponseCompressionRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
 
-    enabled: bool
-    """Whether to enable execution of the rule."""
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
 
-    score_threshold: int
-    """The score threshold to use for the rule."""
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
 
-    sensitivity_level: Literal["default", "medium", "low", "eoff"]
-    """The sensitivity level to use for the rule."""
 
+class ResponseCompressionRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-class ExecuteRuleActionParametersOverrides(TypedDict, total=False):
-    action: str
-    """An action to override all rules with.
+    before: str
+    """The ID of another rule to place the rule before.
 
-    This option has lower precedence than rule and category overrides.
+    An empty value causes the rule to be placed at the top.
     """
 
-    categories: Iterable[ExecuteRuleActionParametersOverridesCategory]
-    """A list of category-level overrides.
 
-    This option has the second-highest precedence after rule-level overrides.
+class ResponseCompressionRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
     """
 
-    enabled: bool
-    """Whether to enable execution of all rules.
 
-    This option has lower precedence than rule and category overrides.
+class ResponseCompressionRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+ResponseCompressionRulePosition: TypeAlias = Union[
+    ResponseCompressionRulePositionBeforePosition,
+    ResponseCompressionRulePositionAfterPosition,
+    ResponseCompressionRulePositionIndexPosition,
+]
+
+
+class ResponseCompressionRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
     """
 
-    rules: Iterable[ExecuteRuleActionParametersOverridesRule]
-    """A list of rule-level overrides. This option has the highest precedence."""
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
 
-    sensitivity_level: Literal["default", "medium", "low", "eoff"]
-    """A sensitivity level to set for all rules.
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
 
-    This option has lower precedence than rule and category overrides and is only
-    applicable for DDoS phases.
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
     """
 
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
-class ExecuteRuleActionParameters(TypedDict, total=False):
-    id: Required[str]
-    """The ID of the ruleset to execute."""
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
 
-    matched_data: ExecuteRuleActionParametersMatchedData
-    """The configuration to use for matched data logging."""
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
-    overrides: ExecuteRuleActionParametersOverrides
-    """A set of overrides to apply to the target ruleset."""
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
-class JSChallengeRule(TypedDict, total=False):
+class DDoSDynamicRule(TypedDict, total=False):
     ruleset_id: Required[str]
     """The unique ID of the ruleset."""
 
@@ -337,7 +642,7 @@ class JSChallengeRule(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
 
-    action: Literal["js_challenge"]
+    action: Literal["ddos_dynamic"]
     """The action to perform when the rule matches."""
 
     action_parameters: object
@@ -349,87 +654,114 @@ class JSChallengeRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: DDoSDynamicRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    position: DDoSDynamicRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: DDoSDynamicRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class LogRule(TypedDict, total=False):
-    ruleset_id: Required[str]
-    """The unique ID of the ruleset."""
+class DDoSDynamicRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
 
-    account_id: str
-    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
 
-    zone_id: str
-    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
 
-    id: str
-    """The unique ID of the rule."""
 
-    action: Literal["log"]
-    """The action to perform when the rule matches."""
+class DDoSDynamicRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    action_parameters: object
-    """The parameters configuring the rule's action."""
+    before: str
+    """The ID of another rule to place the rule before.
 
-    description: str
-    """An informative description of the rule."""
+    An empty value causes the rule to be placed at the top.
+    """
 
-    enabled: bool
-    """Whether the rule should be executed."""
 
-    expression: str
-    """The expression defining which traffic will match the rule."""
+class DDoSDynamicRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
+    after: str
+    """The ID of another rule to place the rule after.
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    An empty value causes the rule to be placed at the bottom.
+    """
 
 
-class ManagedChallengeRule(TypedDict, total=False):
-    ruleset_id: Required[str]
-    """The unique ID of the ruleset."""
+class DDoSDynamicRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    account_id: str
-    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
 
-    zone_id: str
-    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """The unique ID of the rule."""
+DDoSDynamicRulePosition: TypeAlias = Union[
+    DDoSDynamicRulePositionBeforePosition, DDoSDynamicRulePositionAfterPosition, DDoSDynamicRulePositionIndexPosition
+]
 
-    action: Literal["managed_challenge"]
-    """The action to perform when the rule matches."""
 
-    action_parameters: object
-    """The parameters configuring the rule's action."""
+class DDoSDynamicRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
 
-    description: str
-    """An informative description of the rule."""
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-    enabled: bool
-    """Whether the rule should be executed."""
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
 
-    expression: str
-    """The expression defining which traffic will match the rule."""
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
 
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
+    It defaults to the same as the rule's expression.
+    """
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
-class RedirectRule(TypedDict, total=False):
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class ExecuteRule(TypedDict, total=False):
     ruleset_id: Required[str]
     """The unique ID of the ruleset."""
 
@@ -442,10 +774,10 @@ class RedirectRule(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
 
-    action: Literal["redirect"]
+    action: Literal["execute"]
     """The action to perform when the rule matches."""
 
-    action_parameters: RedirectRuleActionParameters
+    action_parameters: ExecuteRuleActionParameters
     """The parameters configuring the rule's action."""
 
     description: str
@@ -454,133 +786,1344 @@ class RedirectRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ExecuteRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    position: ExecuteRulePosition
+    """An object configuring where the rule will be placed."""
 
+    ratelimit: ExecuteRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
 
-class RedirectRuleActionParametersFromList(TypedDict, total=False):
-    key: str
-    """Expression that evaluates to the list lookup key."""
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
 
-    name: str
-    """The name of the list to match against."""
 
+class ExecuteRuleActionParametersMatchedData(TypedDict, total=False):
+    """The configuration to use for matched data logging."""
 
-class RedirectRuleActionParametersFromValueTargetURLStaticURLRedirect(TypedDict, total=False):
-    value: str
-    """The URL to redirect the request to."""
+    public_key: Required[str]
+    """The public key to encrypt matched data logs with."""
+
+
+class ExecuteRuleActionParametersOverridesCategory(TypedDict, total=False):
+    """A category-level override."""
+
+    category: Required[str]
+    """The name of the category to override."""
+
+    action: str
+    """The action to override rules in the category with."""
+
+    enabled: bool
+    """Whether to enable execution of rules in the category."""
+
+    sensitivity_level: Literal["default", "medium", "low", "eoff"]
+    """The sensitivity level to use for rules in the category.
+
+    This option is only applicable for DDoS phases.
+    """
+
+
+class ExecuteRuleActionParametersOverridesRule(TypedDict, total=False):
+    """A rule-level override."""
+
+    id: Required[str]
+    """The ID of the rule to override."""
+
+    action: str
+    """The action to override the rule with."""
+
+    enabled: bool
+    """Whether to enable execution of the rule."""
+
+    score_threshold: int
+    """The score threshold to use for the rule."""
+
+    sensitivity_level: Literal["default", "medium", "low", "eoff"]
+    """The sensitivity level to use for the rule.
+
+    This option is only applicable for DDoS phases.
+    """
+
+
+class ExecuteRuleActionParametersOverrides(TypedDict, total=False):
+    """A set of overrides to apply to the target ruleset."""
+
+    action: str
+    """An action to override all rules with.
+
+    This option has lower precedence than rule and category overrides.
+    """
+
+    categories: Iterable[ExecuteRuleActionParametersOverridesCategory]
+    """A list of category-level overrides.
+
+    This option has the second-highest precedence after rule-level overrides.
+    """
+
+    enabled: bool
+    """Whether to enable execution of all rules.
+
+    This option has lower precedence than rule and category overrides.
+    """
+
+    rules: Iterable[ExecuteRuleActionParametersOverridesRule]
+    """A list of rule-level overrides. This option has the highest precedence."""
+
+    sensitivity_level: Literal["default", "medium", "low", "eoff"]
+    """A sensitivity level to set for all rules.
+
+    This option has lower precedence than rule and category overrides and is only
+    applicable for DDoS phases.
+    """
+
+
+class ExecuteRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
+    id: Required[str]
+    """The ID of the ruleset to execute."""
+
+    matched_data: ExecuteRuleActionParametersMatchedData
+    """The configuration to use for matched data logging."""
+
+    overrides: ExecuteRuleActionParametersOverrides
+    """A set of overrides to apply to the target ruleset."""
+
+
+class ExecuteRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class ExecuteRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class ExecuteRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class ExecuteRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+ExecuteRulePosition: TypeAlias = Union[
+    ExecuteRulePositionBeforePosition, ExecuteRulePositionAfterPosition, ExecuteRulePositionIndexPosition
+]
+
+
+class ExecuteRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class ForceConnectionCloseRule(TypedDict, total=False):
+    ruleset_id: Required[str]
+    """The unique ID of the ruleset."""
+
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    id: str
+    """The unique ID of the rule."""
+
+    action: Literal["force_connection_close"]
+    """The action to perform when the rule matches."""
+
+    action_parameters: object
+    """The parameters configuring the rule's action."""
+
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: ForceConnectionCloseRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    logging: LoggingParam
+    """An object configuring the rule's logging behavior."""
+
+    position: ForceConnectionCloseRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: ForceConnectionCloseRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
+
+
+class ForceConnectionCloseRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class ForceConnectionCloseRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class ForceConnectionCloseRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class ForceConnectionCloseRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+ForceConnectionCloseRulePosition: TypeAlias = Union[
+    ForceConnectionCloseRulePositionBeforePosition,
+    ForceConnectionCloseRulePositionAfterPosition,
+    ForceConnectionCloseRulePositionIndexPosition,
+]
+
+
+class ForceConnectionCloseRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class JavaScriptChallengeRule(TypedDict, total=False):
+    ruleset_id: Required[str]
+    """The unique ID of the ruleset."""
+
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    id: str
+    """The unique ID of the rule."""
+
+    action: Literal["js_challenge"]
+    """The action to perform when the rule matches."""
+
+    action_parameters: object
+    """The parameters configuring the rule's action."""
+
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: JavaScriptChallengeRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    logging: LoggingParam
+    """An object configuring the rule's logging behavior."""
+
+    position: JavaScriptChallengeRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: JavaScriptChallengeRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
+
+
+class JavaScriptChallengeRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class JavaScriptChallengeRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class JavaScriptChallengeRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class JavaScriptChallengeRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+JavaScriptChallengeRulePosition: TypeAlias = Union[
+    JavaScriptChallengeRulePositionBeforePosition,
+    JavaScriptChallengeRulePositionAfterPosition,
+    JavaScriptChallengeRulePositionIndexPosition,
+]
+
+
+class JavaScriptChallengeRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class LogRule(TypedDict, total=False):
+    ruleset_id: Required[str]
+    """The unique ID of the ruleset."""
+
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    id: str
+    """The unique ID of the rule."""
+
+    action: Literal["log"]
+    """The action to perform when the rule matches."""
+
+    action_parameters: object
+    """The parameters configuring the rule's action."""
+
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: LogRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    logging: LoggingParam
+    """An object configuring the rule's logging behavior."""
+
+    position: LogRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: LogRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
+
+
+class LogRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class LogRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class LogRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class LogRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+LogRulePosition: TypeAlias = Union[
+    LogRulePositionBeforePosition, LogRulePositionAfterPosition, LogRulePositionIndexPosition
+]
+
+
+class LogRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class LogCustomFieldRule(TypedDict, total=False):
+    ruleset_id: Required[str]
+    """The unique ID of the ruleset."""
+
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    id: str
+    """The unique ID of the rule."""
+
+    action: Literal["log_custom_field"]
+    """The action to perform when the rule matches."""
+
+    action_parameters: LogCustomFieldRuleActionParameters
+    """The parameters configuring the rule's action."""
+
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: LogCustomFieldRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    logging: LoggingParam
+    """An object configuring the rule's logging behavior."""
+
+    position: LogCustomFieldRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: LogCustomFieldRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
+
+
+class LogCustomFieldRuleActionParametersCookieField(TypedDict, total=False):
+    """The cookie field to log."""
+
+    name: Required[str]
+    """The name of the cookie."""
+
+
+class LogCustomFieldRuleActionParametersRawResponseField(TypedDict, total=False):
+    """The raw response field to log."""
+
+    name: Required[str]
+    """The name of the response header."""
+
+    preserve_duplicates: bool
+    """Whether to log duplicate values of the same header."""
+
+
+class LogCustomFieldRuleActionParametersRequestField(TypedDict, total=False):
+    """The raw request field to log."""
+
+    name: Required[str]
+    """The name of the header."""
+
+
+class LogCustomFieldRuleActionParametersResponseField(TypedDict, total=False):
+    """The transformed response field to log."""
+
+    name: Required[str]
+    """The name of the response header."""
+
+    preserve_duplicates: bool
+    """Whether to log duplicate values of the same header."""
+
+
+class LogCustomFieldRuleActionParametersTransformedRequestField(TypedDict, total=False):
+    """The transformed request field to log."""
+
+    name: Required[str]
+    """The name of the header."""
+
+
+class LogCustomFieldRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
+    cookie_fields: Iterable[LogCustomFieldRuleActionParametersCookieField]
+    """The cookie fields to log."""
+
+    raw_response_fields: Iterable[LogCustomFieldRuleActionParametersRawResponseField]
+    """The raw response fields to log."""
+
+    request_fields: Iterable[LogCustomFieldRuleActionParametersRequestField]
+    """The raw request fields to log."""
+
+    response_fields: Iterable[LogCustomFieldRuleActionParametersResponseField]
+    """The transformed response fields to log."""
+
+    transformed_request_fields: Iterable[LogCustomFieldRuleActionParametersTransformedRequestField]
+    """The transformed request fields to log."""
+
+
+class LogCustomFieldRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class LogCustomFieldRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class LogCustomFieldRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class LogCustomFieldRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+LogCustomFieldRulePosition: TypeAlias = Union[
+    LogCustomFieldRulePositionBeforePosition,
+    LogCustomFieldRulePositionAfterPosition,
+    LogCustomFieldRulePositionIndexPosition,
+]
+
+
+class LogCustomFieldRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class ManagedChallengeRule(TypedDict, total=False):
+    ruleset_id: Required[str]
+    """The unique ID of the ruleset."""
+
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    id: str
+    """The unique ID of the rule."""
+
+    action: Literal["managed_challenge"]
+    """The action to perform when the rule matches."""
+
+    action_parameters: object
+    """The parameters configuring the rule's action."""
+
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: ManagedChallengeRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    logging: LoggingParam
+    """An object configuring the rule's logging behavior."""
+
+    position: ManagedChallengeRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: ManagedChallengeRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
+
+
+class ManagedChallengeRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class ManagedChallengeRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class ManagedChallengeRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class ManagedChallengeRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+ManagedChallengeRulePosition: TypeAlias = Union[
+    ManagedChallengeRulePositionBeforePosition,
+    ManagedChallengeRulePositionAfterPosition,
+    ManagedChallengeRulePositionIndexPosition,
+]
+
+
+class ManagedChallengeRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class RedirectRule(TypedDict, total=False):
+    ruleset_id: Required[str]
+    """The unique ID of the ruleset."""
+
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    id: str
+    """The unique ID of the rule."""
+
+    action: Literal["redirect"]
+    """The action to perform when the rule matches."""
+
+    action_parameters: RedirectRuleActionParameters
+    """The parameters configuring the rule's action."""
+
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: RedirectRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    logging: LoggingParam
+    """An object configuring the rule's logging behavior."""
+
+    position: RedirectRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: RedirectRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
+
+
+class RedirectRuleActionParametersFromList(TypedDict, total=False):
+    """A redirect based on a bulk list lookup."""
+
+    key: Required[str]
+    """An expression that evaluates to the list lookup key."""
+
+    name: Required[str]
+    """The name of the list to match against."""
+
+
+class RedirectRuleActionParametersFromValueTargetURL(TypedDict, total=False):
+    """A URL to redirect the request to."""
+
+    expression: str
+    """An expression that evaluates to a URL to redirect the request to."""
+
+    value: str
+    """A URL to redirect the request to."""
+
+
+class RedirectRuleActionParametersFromValue(TypedDict, total=False):
+    """A redirect based on the request properties."""
+
+    target_url: Required[RedirectRuleActionParametersFromValueTargetURL]
+    """A URL to redirect the request to."""
+
+    preserve_query_string: bool
+    """Whether to keep the query string of the original request."""
+
+    status_code: Literal[301, 302, 303, 307, 308]
+    """The status code to use for the redirect."""
+
+
+class RedirectRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
+    from_list: RedirectRuleActionParametersFromList
+    """A redirect based on a bulk list lookup."""
+
+    from_value: RedirectRuleActionParametersFromValue
+    """A redirect based on the request properties."""
+
+
+class RedirectRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class RedirectRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class RedirectRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class RedirectRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+RedirectRulePosition: TypeAlias = Union[
+    RedirectRulePositionBeforePosition, RedirectRulePositionAfterPosition, RedirectRulePositionIndexPosition
+]
+
+
+class RedirectRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class RewriteRule(TypedDict, total=False):
+    ruleset_id: Required[str]
+    """The unique ID of the ruleset."""
+
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    id: str
+    """The unique ID of the rule."""
+
+    action: Literal["rewrite"]
+    """The action to perform when the rule matches."""
+
+    action_parameters: RewriteRuleActionParameters
+    """The parameters configuring the rule's action."""
+
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
+
+    exposed_credential_check: RewriteRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    logging: LoggingParam
+    """An object configuring the rule's logging behavior."""
+
+    position: RewriteRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: RewriteRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
+
+
+class RewriteRuleActionParametersHeadersAddStaticHeader(TypedDict, total=False):
+    """A header with a static value to add."""
+
+    operation: Required[Literal["add"]]
+    """The operation to perform on the header."""
+
+    value: Required[str]
+    """A static value for the header."""
+
+
+class RewriteRuleActionParametersHeadersAddDynamicHeader(TypedDict, total=False):
+    """A header with a dynamic value to add."""
+
+    expression: Required[str]
+    """An expression that evaluates to a value for the header."""
+
+    operation: Required[Literal["add"]]
+    """The operation to perform on the header."""
+
+
+class RewriteRuleActionParametersHeadersSetStaticHeader(TypedDict, total=False):
+    """A header with a static value to set."""
+
+    operation: Required[Literal["set"]]
+    """The operation to perform on the header."""
+
+    value: Required[str]
+    """A static value for the header."""
+
+
+class RewriteRuleActionParametersHeadersSetDynamicHeader(TypedDict, total=False):
+    """A header with a dynamic value to set."""
+
+    expression: Required[str]
+    """An expression that evaluates to a value for the header."""
+
+    operation: Required[Literal["set"]]
+    """The operation to perform on the header."""
+
+
+class RewriteRuleActionParametersHeadersRemoveHeader(TypedDict, total=False):
+    """A header to remove."""
+
+    operation: Required[Literal["remove"]]
+    """The operation to perform on the header."""
+
+
+RewriteRuleActionParametersHeaders: TypeAlias = Union[
+    RewriteRuleActionParametersHeadersAddStaticHeader,
+    RewriteRuleActionParametersHeadersAddDynamicHeader,
+    RewriteRuleActionParametersHeadersSetStaticHeader,
+    RewriteRuleActionParametersHeadersSetDynamicHeader,
+    RewriteRuleActionParametersHeadersRemoveHeader,
+]
 
 
-class RedirectRuleActionParametersFromValueTargetURLDynamicURLRedirect(TypedDict, total=False):
-    expression: str
-    """An expression to evaluate to get the URL to redirect the request to."""
+class RewriteRuleActionParametersURIURIPathPath(TypedDict, total=False):
+    """A URI path rewrite."""
 
+    expression: str
+    """An expression that evaluates to a value to rewrite the URI path to."""
 
-RedirectRuleActionParametersFromValueTargetURL = Union[
-    RedirectRuleActionParametersFromValueTargetURLStaticURLRedirect,
-    RedirectRuleActionParametersFromValueTargetURLDynamicURLRedirect,
-]
+    value: str
+    """A value to rewrite the URI path to."""
 
 
-class RedirectRuleActionParametersFromValue(TypedDict, total=False):
-    preserve_query_string: bool
-    """Keep the query string of the original request."""
+class RewriteRuleActionParametersURIURIPath(TypedDict, total=False):
+    """A URI path rewrite."""
 
-    status_code: Literal[301, 302, 303, 307, 308]
-    """The status code to be used for the redirect."""
+    path: Required[RewriteRuleActionParametersURIURIPathPath]
+    """A URI path rewrite."""
 
-    target_url: RedirectRuleActionParametersFromValueTargetURL
-    """The URL to redirect the request to."""
 
+class RewriteRuleActionParametersURIURIQueryQuery(TypedDict, total=False):
+    """A URI query rewrite."""
 
-class RedirectRuleActionParameters(TypedDict, total=False):
-    from_list: RedirectRuleActionParametersFromList
-    """Serve a redirect based on a bulk list lookup."""
+    expression: str
+    """An expression that evaluates to a value to rewrite the URI query to."""
 
-    from_value: RedirectRuleActionParametersFromValue
-    """Serve a redirect based on the request properties."""
+    value: str
+    """A value to rewrite the URI query to."""
 
 
-class RewriteRule(TypedDict, total=False):
-    ruleset_id: Required[str]
-    """The unique ID of the ruleset."""
+class RewriteRuleActionParametersURIURIQuery(TypedDict, total=False):
+    """A URI query rewrite."""
 
-    account_id: str
-    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+    query: Required[RewriteRuleActionParametersURIURIQueryQuery]
+    """A URI query rewrite."""
 
-    zone_id: str
-    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """The unique ID of the rule."""
+RewriteRuleActionParametersURI: TypeAlias = Union[
+    RewriteRuleActionParametersURIURIPath, RewriteRuleActionParametersURIURIQuery
+]
 
-    action: Literal["rewrite"]
-    """The action to perform when the rule matches."""
 
-    action_parameters: RewriteRuleActionParameters
+class RewriteRuleActionParameters(TypedDict, total=False):
     """The parameters configuring the rule's action."""
 
-    description: str
-    """An informative description of the rule."""
+    headers: Dict[str, RewriteRuleActionParametersHeaders]
+    """A map of headers to rewrite."""
 
-    enabled: bool
-    """Whether the rule should be executed."""
+    uri: RewriteRuleActionParametersURI
+    """A URI path rewrite."""
 
-    expression: str
-    """The expression defining which traffic will match the rule."""
 
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
+class RewriteRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
 
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
 
-class RewriteRuleActionParametersHeadersRemoveHeader(TypedDict, total=False):
-    operation: Required[Literal["remove"]]
 
+class RewriteRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-class RewriteRuleActionParametersHeadersStaticHeader(TypedDict, total=False):
-    operation: Required[Literal["set"]]
+    before: str
+    """The ID of another rule to place the rule before.
 
-    value: Required[str]
-    """Static value for the header."""
+    An empty value causes the rule to be placed at the top.
+    """
 
 
-class RewriteRuleActionParametersHeadersDynamicHeader(TypedDict, total=False):
-    expression: Required[str]
-    """Expression for the header value."""
+class RewriteRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    operation: Required[Literal["set"]]
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
 
 
-RewriteRuleActionParametersHeaders = Union[
-    RewriteRuleActionParametersHeadersRemoveHeader,
-    RewriteRuleActionParametersHeadersStaticHeader,
-    RewriteRuleActionParametersHeadersDynamicHeader,
+class RewriteRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+RewriteRulePosition: TypeAlias = Union[
+    RewriteRulePositionBeforePosition, RewriteRulePositionAfterPosition, RewriteRulePositionIndexPosition
 ]
 
 
-class RewriteRuleActionParametersURI(TypedDict, total=False):
-    path: RewriteURIPartParam
-    """Path portion rewrite."""
+class RewriteRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
 
-    query: RewriteURIPartParam
-    """Query portion rewrite."""
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
 
-class RewriteRuleActionParameters(TypedDict, total=False):
-    headers: Dict[str, RewriteRuleActionParametersHeaders]
-    """Map of request headers to modify."""
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
 
-    uri: RewriteRuleActionParametersURI
-    """URI to rewrite the request to."""
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
 class RouteRule(TypedDict, total=False):
@@ -608,38 +2151,141 @@ class RouteRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: RouteRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    position: RouteRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: RouteRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
 class RouteRuleActionParametersOrigin(TypedDict, total=False):
+    """An origin to route to."""
+
     host: str
-    """Override the resolved hostname."""
+    """A resolved host to route to."""
 
-    port: float
-    """Override the destination port."""
+    port: int
+    """A destination port to route to."""
 
 
 class RouteRuleActionParametersSNI(TypedDict, total=False):
+    """A Server Name Indication (SNI) override."""
+
     value: Required[str]
-    """The SNI override."""
+    """A value to override the SNI to."""
 
 
 class RouteRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
     host_header: str
-    """Rewrite the HTTP Host header."""
+    """A value to rewrite the HTTP host header to."""
 
     origin: RouteRuleActionParametersOrigin
-    """Override the IP/TCP destination."""
+    """An origin to route to."""
 
     sni: RouteRuleActionParametersSNI
-    """Override the Server Name Indication (SNI)."""
+    """A Server Name Indication (SNI) override."""
+
+
+class RouteRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class RouteRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class RouteRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class RouteRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+RouteRulePosition: TypeAlias = Union[
+    RouteRulePositionBeforePosition, RouteRulePositionAfterPosition, RouteRulePositionIndexPosition
+]
+
+
+class RouteRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
 class ScoreRule(TypedDict, total=False):
@@ -667,71 +2313,121 @@ class ScoreRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ScoreRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    position: ScoreRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: ScoreRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
 class ScoreRuleActionParameters(TypedDict, total=False):
-    increment: int
+    """The parameters configuring the rule's action."""
+
+    increment: Required[int]
+    """A delta to change the score by, which can be either positive or negative."""
+
+
+class ScoreRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class ScoreRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
     """
-    Increment contains the delta to change the score and can be either positive or
-    negative.
+
+
+class ScoreRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
     """
 
 
-class ServeErrorRule(TypedDict, total=False):
-    ruleset_id: Required[str]
-    """The unique ID of the ruleset."""
+class ScoreRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    account_id: str
-    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
 
-    zone_id: str
-    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """The unique ID of the rule."""
+ScoreRulePosition: TypeAlias = Union[
+    ScoreRulePositionBeforePosition, ScoreRulePositionAfterPosition, ScoreRulePositionIndexPosition
+]
 
-    action: Literal["serve_error"]
-    """The action to perform when the rule matches."""
 
-    action_parameters: ServeErrorRuleActionParameters
-    """The parameters configuring the rule's action."""
+class ScoreRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
 
-    description: str
-    """An informative description of the rule."""
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-    enabled: bool
-    """Whether the rule should be executed."""
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
 
-    expression: str
-    """The expression defining which traffic will match the rule."""
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
 
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
+    It defaults to the same as the rule's expression.
+    """
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
-class ServeErrorRuleActionParameters(TypedDict, total=False):
-    content: str
-    """Error response content."""
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
 
-    content_type: Literal["application/json", "text/xml", "text/plain", "text/html"]
-    """Content-type header to set with the response."""
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
-    status_code: float
-    """The status code to use for the error."""
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
-class SetConfigRule(TypedDict, total=False):
+class ServeErrorRule(TypedDict, total=False):
     ruleset_id: Required[str]
     """The unique ID of the ruleset."""
 
@@ -744,10 +2440,10 @@ class SetConfigRule(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
 
-    action: Literal["set_config"]
+    action: Literal["serve_error"]
     """The action to perform when the rule matches."""
 
-    action_parameters: SetConfigRuleActionParameters
+    action_parameters: ServeErrorRuleActionParameters
     """The parameters configuring the rule's action."""
 
     description: str
@@ -756,141 +2452,137 @@ class SetConfigRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ServeErrorRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
-
-
-class SetConfigRuleActionParametersAutominify(TypedDict, total=False):
-    css: bool
-    """Minify CSS files."""
+    position: ServeErrorRulePosition
+    """An object configuring where the rule will be placed."""
 
-    html: bool
-    """Minify HTML files."""
+    ratelimit: ServeErrorRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
 
-    js: bool
-    """Minify JS files."""
+    ref: str
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class SetConfigRuleActionParameters(TypedDict, total=False):
-    automatic_https_rewrites: bool
-    """Turn on or off Automatic HTTPS Rewrites."""
+class ServeErrorRuleActionParametersActionParametersContent(TypedDict, total=False):
+    content: Required[str]
+    """The response content."""
 
-    autominify: SetConfigRuleActionParametersAutominify
-    """Select which file extensions to minify automatically."""
+    content_type: Literal["application/json", "text/html", "text/plain", "text/xml"]
+    """The content type header to set with the error response."""
 
-    bic: bool
-    """Turn on or off Browser Integrity Check."""
+    status_code: int
+    """The status code to use for the error."""
 
-    disable_apps: Literal[True]
-    """Turn off all active Cloudflare Apps."""
 
-    disable_rum: Literal[True]
-    """Turn off Real User Monitoring (RUM)."""
+class ServeErrorRuleActionParametersActionParametersAsset(TypedDict, total=False):
+    asset_name: Required[str]
+    """The name of a custom asset to serve as the error response."""
 
-    disable_zaraz: Literal[True]
-    """Turn off Zaraz."""
+    content_type: Literal["application/json", "text/html", "text/plain", "text/xml"]
+    """The content type header to set with the error response."""
 
-    email_obfuscation: bool
-    """Turn on or off Email Obfuscation."""
+    status_code: int
+    """The status code to use for the error."""
 
-    fonts: bool
-    """Turn on or off Cloudflare Fonts."""
 
-    hotlink_protection: bool
-    """Turn on or off the Hotlink Protection."""
+ServeErrorRuleActionParameters: TypeAlias = Union[
+    ServeErrorRuleActionParametersActionParametersContent, ServeErrorRuleActionParametersActionParametersAsset
+]
 
-    mirage: bool
-    """Turn on or off Mirage."""
 
-    opportunistic_encryption: bool
-    """Turn on or off Opportunistic Encryption."""
+class ServeErrorRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
 
-    polish: Literal["off", "lossless", "lossy"]
-    """Configure the Polish level."""
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
 
-    rocket_loader: bool
-    """Turn on or off Rocket Loader"""
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
 
-    security_level: Literal["off", "essentially_off", "low", "medium", "high", "under_attack"]
-    """Configure the Security Level."""
 
-    server_side_excludes: bool
-    """Turn on or off Server Side Excludes."""
+class ServeErrorRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    ssl: Literal["off", "flexible", "full", "strict", "origin_pull"]
-    """Configure the SSL level."""
+    before: str
+    """The ID of another rule to place the rule before.
 
-    sxg: bool
-    """Turn on or off Signed Exchanges (SXG)."""
+    An empty value causes the rule to be placed at the top.
+    """
 
 
-class SkipRule(TypedDict, total=False):
-    ruleset_id: Required[str]
-    """The unique ID of the ruleset."""
+class ServeErrorRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    account_id: str
-    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+    after: str
+    """The ID of another rule to place the rule after.
 
-    zone_id: str
-    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+    An empty value causes the rule to be placed at the bottom.
+    """
 
-    id: str
-    """The unique ID of the rule."""
 
-    action: Literal["skip"]
-    """The action to perform when the rule matches."""
+class ServeErrorRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
 
-    action_parameters: SkipRuleActionParameters
-    """The parameters configuring the rule's action."""
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
 
-    description: str
-    """An informative description of the rule."""
 
-    enabled: bool
-    """Whether the rule should be executed."""
+ServeErrorRulePosition: TypeAlias = Union[
+    ServeErrorRulePositionBeforePosition, ServeErrorRulePositionAfterPosition, ServeErrorRulePositionIndexPosition
+]
 
-    expression: str
-    """The expression defining which traffic will match the rule."""
 
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
+class ServeErrorRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
 
-class SkipRuleActionParameters(TypedDict, total=False):
-    phases: List[Phase]
-    """A list of phases to skip the execution of.
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
 
-    This option is incompatible with the ruleset and rulesets options.
+    It defaults to the same as the rule's expression.
     """
 
-    products: List[Literal["bic", "hot", "rateLimit", "securityLevel", "uaBlock", "waf", "zoneLockdown"]]
-    """A list of legacy security products to skip the execution of."""
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    rules: Dict[str, List[str]]
+    requests_per_period: int
     """
-    A mapping of ruleset IDs to a list of rule IDs in that ruleset to skip the
-    execution of. This option is incompatible with the ruleset option.
+    The threshold of requests per period after which the action will be executed for
+    the first time.
     """
 
-    ruleset: Literal["current"]
-    """A ruleset to skip the execution of.
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
 
-    This option is incompatible with the rulesets, rules and phases options.
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
     """
 
-    rulesets: List[str]
-    """A list of ruleset IDs to skip the execution of.
-
-    This option is incompatible with the ruleset and phases options.
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
     """
 
 
@@ -919,167 +2611,181 @@ class SetCacheSettingsRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: SetCacheSettingsRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    position: SetCacheSettingsRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: SetCacheSettingsRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
 class SetCacheSettingsRuleActionParametersBrowserTTL(TypedDict, total=False):
-    mode: Required[Literal["respect_origin", "bypass_by_default", "override_origin"]]
-    """Determines which browser ttl mode to use."""
+    """How long client browsers should cache the response.
+
+    Cloudflare cache purge will not purge content cached on client browsers, so high browser TTLs may lead to stale content.
+    """
+
+    mode: Required[Literal["respect_origin", "bypass_by_default", "override_origin", "bypass"]]
+    """The browser TTL mode."""
 
     default: int
-    """The TTL (in seconds) if you choose override_origin mode."""
+    """The browser TTL (in seconds) if you choose the "override_origin" mode."""
 
 
 class SetCacheSettingsRuleActionParametersCacheKeyCustomKeyCookie(TypedDict, total=False):
-    check_presence: List[str]
-    """Checks for the presence of these cookie names.
+    """Which cookies to include in the cache key."""
 
-    The presence of these cookies is used in building the cache key.
+    check_presence: SequenceNotStr[str]
+    """A list of cookies to check for the presence of.
+
+    The presence of these cookies is included in the cache key.
     """
 
-    include: List[str]
-    """Include these cookies' names and their values."""
+    include: SequenceNotStr[str]
+    """A list of cookies to include in the cache key."""
 
 
 class SetCacheSettingsRuleActionParametersCacheKeyCustomKeyHeader(TypedDict, total=False):
-    check_presence: List[str]
-    """Checks for the presence of these header names.
+    """Which headers to include in the cache key."""
 
-    The presence of these headers is used in building the cache key.
-    """
+    check_presence: SequenceNotStr[str]
+    """A list of headers to check for the presence of.
 
-    contains: Dict[str, List[str]]
+    The presence of these headers is included in the cache key.
     """
-    For each header name and list of values combination, check if the request header
-    contains any of the values provided. The presence of the request header and
-    whether any of the values provided are contained in the request header value is
-    used in building the cache key.
+
+    contains: Dict[str, SequenceNotStr[str]]
+    """A mapping of header names to a list of values.
+
+    If a header is present in the request and contains any of the values provided,
+    its value is included in the cache key.
     """
 
     exclude_origin: bool
-    """Whether or not to include the origin header.
+    """Whether to exclude the origin header in the cache key."""
 
-    A value of true will exclude the origin header in the cache key.
-    """
-
-    include: List[str]
-    """Include these headers' names and their values."""
+    include: SequenceNotStr[str]
+    """A list of headers to include in the cache key."""
 
 
 class SetCacheSettingsRuleActionParametersCacheKeyCustomKeyHost(TypedDict, total=False):
-    resolved: bool
-    """Use the resolved host in the cache key.
+    """How to use the host in the cache key."""
 
-    A value of true will use the resolved host, while a value or false will use the
-    original host.
-    """
+    resolved: bool
+    """Whether to use the resolved host in the cache key."""
 
 
 class SetCacheSettingsRuleActionParametersCacheKeyCustomKeyQueryStringExclude(TypedDict, total=False):
-    all: bool
-    """Exclude all query string parameters from use in building the cache key."""
+    """Which query string parameters to exclude from the cache key."""
 
-    list: List[str]
-    """A list of query string parameters NOT used to build the cache key.
+    all: Literal[True]
+    """Whether to exclude all query string parameters from the cache key."""
 
-    All parameters present in the request but missing in this list will be used to
-    build the cache key.
-    """
+    list: SequenceNotStr[str]
+    """A list of query string parameters to exclude from the cache key."""
 
 
 class SetCacheSettingsRuleActionParametersCacheKeyCustomKeyQueryStringInclude(TypedDict, total=False):
-    all: bool
-    """Use all query string parameters in the cache key."""
+    """Which query string parameters to include in the cache key."""
 
-    list: List[str]
-    """A list of query string parameters used to build the cache key."""
+    all: Literal[True]
+    """Whether to include all query string parameters in the cache key."""
+
+    list: SequenceNotStr[str]
+    """A list of query string parameters to include in the cache key."""
 
 
 class SetCacheSettingsRuleActionParametersCacheKeyCustomKeyQueryString(TypedDict, total=False):
+    """Which query string parameters to include in or exclude from the cache key."""
+
     exclude: SetCacheSettingsRuleActionParametersCacheKeyCustomKeyQueryStringExclude
-    """
-    build the cache key using all query string parameters EXCECPT these excluded
-    parameters
-    """
+    """Which query string parameters to exclude from the cache key."""
 
     include: SetCacheSettingsRuleActionParametersCacheKeyCustomKeyQueryStringInclude
-    """
-    build the cache key using a list of query string parameters that ARE in the
-    request.
-    """
+    """Which query string parameters to include in the cache key."""
 
 
 class SetCacheSettingsRuleActionParametersCacheKeyCustomKeyUser(TypedDict, total=False):
+    """How to use characteristics of the request user agent in the cache key."""
+
     device_type: bool
-    """Use the user agent's device type in the cache key."""
+    """Whether to use the user agent's device type in the cache key."""
 
     geo: bool
-    """Use the user agents's country in the cache key."""
+    """Whether to use the user agents's country in the cache key."""
 
     lang: bool
-    """Use the user agent's language in the cache key."""
+    """Whether to use the user agent's language in the cache key."""
 
 
 class SetCacheSettingsRuleActionParametersCacheKeyCustomKey(TypedDict, total=False):
+    """Which components of the request are included or excluded from the cache key."""
+
     cookie: SetCacheSettingsRuleActionParametersCacheKeyCustomKeyCookie
-    """The cookies to include in building the cache key."""
+    """Which cookies to include in the cache key."""
 
     header: SetCacheSettingsRuleActionParametersCacheKeyCustomKeyHeader
-    """The header names and values to include in building the cache key."""
+    """Which headers to include in the cache key."""
 
     host: SetCacheSettingsRuleActionParametersCacheKeyCustomKeyHost
-    """Whether to use the original host or the resolved host in the cache key."""
+    """How to use the host in the cache key."""
 
     query_string: SetCacheSettingsRuleActionParametersCacheKeyCustomKeyQueryString
-    """
-    Use the presence or absence of parameters in the query string to build the cache
-    key.
-    """
+    """Which query string parameters to include in or exclude from the cache key."""
 
     user: SetCacheSettingsRuleActionParametersCacheKeyCustomKeyUser
-    """Characteristics of the request user agent used in building the cache key."""
+    """How to use characteristics of the request user agent in the cache key."""
 
 
 class SetCacheSettingsRuleActionParametersCacheKey(TypedDict, total=False):
+    """
+    Which components of the request are included in or excluded from the cache key Cloudflare uses to store the response in cache.
+    """
+
     cache_by_device_type: bool
-    """Separate cached content based on the visitor’s device type"""
+    """Whether to separate cached content based on the visitor's device type."""
 
     cache_deception_armor: bool
     """
-    Protect from web cache deception attacks while allowing static assets to be
-    cached
+    Whether to protect from web cache deception attacks, while allowing static
+    assets to be cached.
     """
 
     custom_key: SetCacheSettingsRuleActionParametersCacheKeyCustomKey
-    """
-    Customize which components of the request are included or excluded from the
-    cache key.
-    """
+    """Which components of the request are included or excluded from the cache key."""
 
     ignore_query_strings_order: bool
     """
-    Treat requests with the same query parameters the same, regardless of the order
-    those query parameters are in. A value of true ignores the query strings' order.
+    Whether to treat requests with the same query parameters the same, regardless of
+    the order those query parameters are in.
     """
 
 
 class SetCacheSettingsRuleActionParametersCacheReserve(TypedDict, total=False):
+    """
+    Settings to determine whether the request's response from origin is eligible for Cache Reserve (requires a Cache Reserve add-on plan).
+    """
+
     eligible: Required[bool]
-    """Determines whether cache reserve is enabled.
+    """Whether Cache Reserve is enabled.
 
     If this is true and a request meets eligibility criteria, Cloudflare will write
-    the resource to cache reserve.
+    the resource to Cache Reserve.
     """
 
-    min_file_size: Required[int]
-    """The minimum file size eligible for store in cache reserve."""
+    minimum_file_size: int
+    """The minimum file size eligible for storage in Cache Reserve."""
 
 
 _SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTLStatusCodeRangeReservedKeywords = TypedDict(
@@ -1094,94 +2800,95 @@ class SetCacheSettingsRuleActionParametersCacheReserve(TypedDict, total=False):
 class SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTLStatusCodeRange(
     _SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTLStatusCodeRangeReservedKeywords, total=False
 ):
-    to: Required[int]
-    """response status code upper bound"""
+    """A range of status codes to apply the TTL to."""
+
+    to: int
+    """The upper bound of the range."""
 
 
 class SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTL(TypedDict, total=False):
     value: Required[int]
-    """Time to cache a response (in seconds).
+    """The time to cache the response for (in seconds).
 
-    A value of 0 is equivalent to setting the Cache-Control header with the value
-    "no-cache". A value of -1 is equivalent to setting Cache-Control header with the
-    value of "no-store".
+    A value of 0 is equivalent to setting the cache control header with the value
+    "no-cache". A value of -1 is equivalent to setting the cache control header with
+    the value of "no-store".
     """
 
-    status_code_range: SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTLStatusCodeRange
-    """The range of status codes used to apply the selected mode."""
+    status_code: int
+    """A single status code to apply the TTL to."""
 
-    status_code_value: int
-    """Set the ttl for responses with this specific status code"""
+    status_code_range: SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTLStatusCodeRange
+    """A range of status codes to apply the TTL to."""
 
 
 class SetCacheSettingsRuleActionParametersEdgeTTL(TypedDict, total=False):
-    default: Required[int]
-    """The TTL (in seconds) if you choose override_origin mode."""
+    """How long the Cloudflare edge network should cache the response."""
 
     mode: Required[Literal["respect_origin", "bypass_by_default", "override_origin"]]
-    """edge ttl options"""
+    """The edge TTL mode."""
+
+    default: int
+    """The edge TTL (in seconds) if you choose the "override_origin" mode."""
 
-    status_code_ttl: Required[Iterable[SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTL]]
-    """List of single status codes, or status code ranges to apply the selected mode"""
+    status_code_ttl: Iterable[SetCacheSettingsRuleActionParametersEdgeTTLStatusCodeTTL]
+    """A list of TTLs to apply to specific status codes or status code ranges."""
 
 
 class SetCacheSettingsRuleActionParametersServeStale(TypedDict, total=False):
-    disable_stale_while_updating: Required[bool]
-    """Defines whether Cloudflare should serve stale content while updating.
+    """When to serve stale content from cache."""
 
-    If true, Cloudflare will not serve stale content while getting the latest
+    disable_stale_while_updating: bool
+    """
+    Whether Cloudflare should disable serving stale content while getting the latest
     content from the origin.
     """
 
 
 class SetCacheSettingsRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
     additional_cacheable_ports: Iterable[int]
-    """List of additional ports that caching can be enabled on."""
+    """A list of additional ports that caching should be enabled on."""
 
     browser_ttl: SetCacheSettingsRuleActionParametersBrowserTTL
-    """Specify how long client browsers should cache the response.
+    """How long client browsers should cache the response.
 
     Cloudflare cache purge will not purge content cached on client browsers, so high
     browser TTLs may lead to stale content.
     """
 
     cache: bool
-    """Mark whether the request’s response from origin is eligible for caching.
+    """Whether the request's response from the origin is eligible for caching.
 
-    Caching itself will still depend on the cache-control header and your other
+    Caching itself will still depend on the cache control header and your other
     caching configurations.
     """
 
     cache_key: SetCacheSettingsRuleActionParametersCacheKey
     """
-    Define which components of the request are included or excluded from the cache
-    key Cloudflare uses to store the response in cache.
+    Which components of the request are included in or excluded from the cache key
+    Cloudflare uses to store the response in cache.
     """
 
     cache_reserve: SetCacheSettingsRuleActionParametersCacheReserve
     """
-    Mark whether the request's response from origin is eligible for Cache Reserve
-    (requires a Cache Reserve add-on plan).
+    Settings to determine whether the request's response from origin is eligible for
+    Cache Reserve (requires a Cache Reserve add-on plan).
     """
 
     edge_ttl: SetCacheSettingsRuleActionParametersEdgeTTL
-    """
-    TTL (Time to Live) specifies the maximum time to cache a resource in the
-    Cloudflare edge network.
-    """
+    """How long the Cloudflare edge network should cache the response."""
 
     origin_cache_control: bool
-    """When enabled, Cloudflare will aim to strictly adhere to RFC 7234."""
+    """Whether Cloudflare will aim to strictly adhere to RFC 7234."""
 
     origin_error_page_passthru: bool
-    """Generate Cloudflare error pages from issues sent from the origin server.
-
-    When on, error pages will trigger for issues from the origin
-    """
+    """Whether to generate Cloudflare error pages for issues from the origin server."""
 
     read_timeout: int
     """
-    Define a timeout value between two successive read operations to your origin
+    A timeout value between two successive read operations to use for your origin
     server. Historically, the timeout value between two read options from Cloudflare
     to an origin server is 100 seconds. If you are attempting to reduce HTTP 524
     errors because of timeouts from an origin server, try increasing this timeout
@@ -1189,20 +2896,106 @@ class SetCacheSettingsRuleActionParameters(TypedDict, total=False):
     """
 
     respect_strong_etags: bool
-    """
-    Specify whether or not Cloudflare should respect strong ETag (entity tag)
-    headers. When off, Cloudflare converts strong ETag headers to weak ETag headers.
+    """Whether Cloudflare should respect strong ETag (entity tag) headers.
+
+    If false, Cloudflare converts strong ETag headers to weak ETag headers.
     """
 
     serve_stale: SetCacheSettingsRuleActionParametersServeStale
+    """When to serve stale content from cache."""
+
+
+class SetCacheSettingsRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class SetCacheSettingsRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class SetCacheSettingsRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class SetCacheSettingsRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+SetCacheSettingsRulePosition: TypeAlias = Union[
+    SetCacheSettingsRulePositionBeforePosition,
+    SetCacheSettingsRulePositionAfterPosition,
+    SetCacheSettingsRulePositionIndexPosition,
+]
+
+
+class SetCacheSettingsRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
     """
-    Define if Cloudflare should serve stale content while getting the latest content
-    from the origin. If on, Cloudflare will not serve stale content while getting
-    the latest content from the origin.
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
     """
 
 
-class RulesetsLogCustomFieldRule(TypedDict, total=False):
+class SetConfigurationRule(TypedDict, total=False):
     ruleset_id: Required[str]
     """The unique ID of the ruleset."""
 
@@ -1215,10 +3008,10 @@ class RulesetsLogCustomFieldRule(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
 
-    action: Literal["log_custom_field"]
+    action: Literal["set_config"]
     """The action to perform when the rule matches."""
 
-    action_parameters: RulesetsLogCustomFieldRuleActionParameters
+    action_parameters: SetConfigurationRuleActionParameters
     """The parameters configuring the rule's action."""
 
     description: str
@@ -1227,78 +3020,193 @@ class RulesetsLogCustomFieldRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: SetConfigurationRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    position: SetConfigurationRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: SetConfigurationRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class RulesetsLogCustomFieldRuleActionParametersCookieField(TypedDict, total=False):
-    name: Required[str]
-    """The name of the field."""
+class SetConfigurationRuleActionParametersAutominify(TypedDict, total=False):
+    """Which file extensions to minify automatically."""
 
+    css: bool
+    """Whether to minify CSS files."""
 
-class RulesetsLogCustomFieldRuleActionParametersRequestField(TypedDict, total=False):
-    name: Required[str]
-    """The name of the field."""
+    html: bool
+    """Whether to minify HTML files."""
 
+    js: bool
+    """Whether to minify JavaScript files."""
 
-class RulesetsLogCustomFieldRuleActionParametersResponseField(TypedDict, total=False):
-    name: Required[str]
-    """The name of the field."""
 
+class SetConfigurationRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
 
-class RulesetsLogCustomFieldRuleActionParameters(TypedDict, total=False):
-    cookie_fields: Iterable[RulesetsLogCustomFieldRuleActionParametersCookieField]
-    """The cookie fields to log."""
+    automatic_https_rewrites: bool
+    """Whether to enable Automatic HTTPS Rewrites."""
 
-    request_fields: Iterable[RulesetsLogCustomFieldRuleActionParametersRequestField]
-    """The request fields to log."""
+    autominify: SetConfigurationRuleActionParametersAutominify
+    """Which file extensions to minify automatically."""
 
-    response_fields: Iterable[RulesetsLogCustomFieldRuleActionParametersResponseField]
-    """The response fields to log."""
+    bic: bool
+    """Whether to enable Browser Integrity Check (BIC)."""
 
+    disable_apps: Literal[True]
+    """Whether to disable Cloudflare Apps."""
 
-class RulesetsDDoSDynamicRule(TypedDict, total=False):
-    ruleset_id: Required[str]
-    """The unique ID of the ruleset."""
+    disable_pay_per_crawl: Literal[True]
+    """Whether to disable Pay Per Crawl."""
 
-    account_id: str
-    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+    disable_rum: Literal[True]
+    """Whether to disable Real User Monitoring (RUM)."""
 
-    zone_id: str
-    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+    disable_zaraz: Literal[True]
+    """Whether to disable Zaraz."""
 
-    id: str
-    """The unique ID of the rule."""
+    email_obfuscation: bool
+    """Whether to enable Email Obfuscation."""
 
-    action: Literal["ddos_dynamic"]
-    """The action to perform when the rule matches."""
+    fonts: bool
+    """Whether to enable Cloudflare Fonts."""
 
-    action_parameters: object
-    """The parameters configuring the rule's action."""
+    hotlink_protection: bool
+    """Whether to enable Hotlink Protection."""
 
-    description: str
-    """An informative description of the rule."""
+    mirage: bool
+    """Whether to enable Mirage."""
 
-    enabled: bool
-    """Whether the rule should be executed."""
+    opportunistic_encryption: bool
+    """Whether to enable Opportunistic Encryption."""
 
-    expression: str
-    """The expression defining which traffic will match the rule."""
+    polish: Literal["off", "lossless", "lossy", "webp"]
+    """The Polish level to configure."""
 
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
+    request_body_buffering: Literal["none", "standard", "full"]
+    """The request body buffering mode."""
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    response_body_buffering: Literal["none", "standard"]
+    """The response body buffering mode."""
+
+    rocket_loader: bool
+    """Whether to enable Rocket Loader."""
+
+    security_level: Literal["off", "essentially_off", "low", "medium", "high", "under_attack"]
+    """The Security Level to configure."""
+
+    server_side_excludes: bool
+    """Whether to enable Server-Side Excludes."""
 
+    ssl: Literal["off", "flexible", "full", "strict", "origin_pull"]
+    """The SSL level to configure."""
+
+    sxg: bool
+    """Whether to enable Signed Exchanges (SXG)."""
+
+
+class SetConfigurationRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class SetConfigurationRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class SetConfigurationRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class SetConfigurationRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+SetConfigurationRulePosition: TypeAlias = Union[
+    SetConfigurationRulePositionBeforePosition,
+    SetConfigurationRulePositionAfterPosition,
+    SetConfigurationRulePositionIndexPosition,
+]
+
+
+class SetConfigurationRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
 
-class RulesetsForceConnectionCloseRule(TypedDict, total=False):
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class SkipRule(TypedDict, total=False):
     ruleset_id: Required[str]
     """The unique ID of the ruleset."""
 
@@ -1311,10 +3219,10 @@ class RulesetsForceConnectionCloseRule(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
 
-    action: Literal["force_connection_close"]
+    action: Literal["skip"]
     """The action to perform when the rule matches."""
 
-    action_parameters: object
+    action_parameters: SkipRuleActionParameters
     """The parameters configuring the rule's action."""
 
     description: str
@@ -1323,33 +3231,167 @@ class RulesetsForceConnectionCloseRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: SkipRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    position: SkipRulePosition
+    """An object configuring where the rule will be placed."""
+
+    ratelimit: SkipRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
+
+
+class SkipRuleActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
+    phase: Literal["current"]
+    """A phase to skip the execution of.
+
+    This option is only compatible with the products option.
+    """
+
+    phases: List[Phase]
+    """A list of phases to skip the execution of.
 
+    This option is incompatible with the rulesets option.
+    """
+
+    products: List[Literal["bic", "hot", "rateLimit", "securityLevel", "uaBlock", "waf", "zoneLockdown"]]
+    """A list of legacy security products to skip the execution of."""
+
+    rules: Dict[str, SequenceNotStr[str]]
+    """
+    A mapping of ruleset IDs to a list of rule IDs in that ruleset to skip the
+    execution of. This option is incompatible with the ruleset option.
+    """
+
+    ruleset: Literal["current"]
+    """A ruleset to skip the execution of.
+
+    This option is incompatible with the rulesets option.
+    """
+
+    rulesets: SequenceNotStr[str]
+    """A list of ruleset IDs to skip the execution of.
+
+    This option is incompatible with the ruleset and phases options.
+    """
+
+
+class SkipRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class SkipRulePositionBeforePosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    before: str
+    """The ID of another rule to place the rule before.
+
+    An empty value causes the rule to be placed at the top.
+    """
+
+
+class SkipRulePositionAfterPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    after: str
+    """The ID of another rule to place the rule after.
+
+    An empty value causes the rule to be placed at the bottom.
+    """
+
+
+class SkipRulePositionIndexPosition(TypedDict, total=False):
+    """An object configuring where the rule will be placed."""
+
+    index: int
+    """An index at which to place the rule, where index 1 is the first rule."""
+
+
+SkipRulePosition: TypeAlias = Union[
+    SkipRulePositionBeforePosition, SkipRulePositionAfterPosition, SkipRulePositionIndexPosition
+]
+
+
+class SkipRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
 
-RuleEditParams = Union[
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+RuleEditParams: TypeAlias = Union[
     BlockRule,
     ChallengeRule,
-    CompressResponseRule,
+    ResponseCompressionRule,
+    DDoSDynamicRule,
     ExecuteRule,
-    JSChallengeRule,
+    ForceConnectionCloseRule,
+    JavaScriptChallengeRule,
     LogRule,
+    LogCustomFieldRule,
     ManagedChallengeRule,
     RedirectRule,
     RewriteRule,
     RouteRule,
     ScoreRule,
     ServeErrorRule,
-    SetConfigRule,
-    SkipRule,
     SetCacheSettingsRule,
-    RulesetsLogCustomFieldRule,
-    RulesetsDDoSDynamicRule,
-    RulesetsForceConnectionCloseRule,
+    SetConfigurationRule,
+    SkipRule,
 ]
diff --git a/src/cloudflare/types/rulesets/rule_edit_response.py b/src/cloudflare/types/rulesets/rule_edit_response.py
index 47dd4534324..7de4cd9523e 100644
--- a/src/cloudflare/types/rulesets/rule_edit_response.py
+++ b/src/cloudflare/types/rulesets/rule_edit_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal, Annotated
+from typing_extensions import Literal, Annotated, TypeAlias
 
 from .kind import Kind
 from .phase import Phase
@@ -17,54 +17,84 @@
 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 .ddos_dynamic_rule import DDoSDynamicRule
+from .log_custom_field_rule import LogCustomFieldRule
 from .compress_response_rule import CompressResponseRule
 from .managed_challenge_rule import ManagedChallengeRule
 from .set_cache_settings_rule import SetCacheSettingsRule
+from .force_connection_close_rule import ForceConnectionCloseRule
 
 __all__ = [
     "RuleEditResponse",
     "Rule",
-    "RuleRulesetsLogCustomFieldRule",
-    "RuleRulesetsLogCustomFieldRuleActionParameters",
-    "RuleRulesetsLogCustomFieldRuleActionParametersCookieField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersRequestField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersResponseField",
-    "RuleRulesetsDDoSDynamicRule",
-    "RuleRulesetsForceConnectionCloseRule",
+    "RuleRulesetsChallengeRule",
+    "RuleRulesetsChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsChallengeRuleRatelimit",
+    "RuleRulesetsJSChallengeRule",
+    "RuleRulesetsJSChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsJSChallengeRuleRatelimit",
 ]
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersCookieField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-class RuleRulesetsLogCustomFieldRuleActionParametersRequestField(BaseModel):
-    name: str
-    """The name of the field."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersResponseField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-class RuleRulesetsLogCustomFieldRuleActionParameters(BaseModel):
-    cookie_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersCookieField]] = None
-    """The cookie fields to log."""
+    It defaults to the same as the rule's expression.
+    """
 
-    request_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersRequestField]] = None
-    """The request fields to log."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    response_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersResponseField]] = None
-    """The response fields to log."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
 
-class RuleRulesetsLogCustomFieldRule(BaseModel):
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class RuleRulesetsChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -74,10 +104,10 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["log_custom_field"]] = None
+    action: Optional[Literal["challenge"]] = None
     """The action to perform when the rule matches."""
 
-    action_parameters: Optional[RuleRulesetsLogCustomFieldRuleActionParameters] = None
+    action_parameters: Optional[object] = None
     """The parameters configuring the rule's action."""
 
     categories: Optional[List[str]] = None
@@ -89,52 +119,79 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class RuleRulesetsDDoSDynamicRule(BaseModel):
-    last_updated: datetime
-    """The timestamp of when the rule was last modified."""
+class RuleRulesetsJSChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
-    version: str
-    """The version of the rule."""
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-    id: Optional[str] = None
-    """The unique ID of the rule."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
-    action: Optional[Literal["ddos_dynamic"]] = None
-    """The action to perform when the rule matches."""
 
-    action_parameters: Optional[object] = None
-    """The parameters configuring the rule's action."""
+class RuleRulesetsJSChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
 
-    categories: Optional[List[str]] = None
-    """The categories of the rule."""
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-    description: Optional[str] = None
-    """An informative description of the rule."""
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
-    enabled: Optional[bool] = None
-    """Whether the rule should be executed."""
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-    expression: Optional[str] = None
-    """The expression defining which traffic will match the rule."""
+    It defaults to the same as the rule's expression.
+    """
 
-    logging: Optional[Logging] = None
-    """An object configuring the rule's logging behavior."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
-class RuleRulesetsForceConnectionCloseRule(BaseModel):
+
+class RuleRulesetsJSChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -144,7 +201,7 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["force_connection_close"]] = None
+    action: Optional[Literal["js_challenge"]] = None
     """The action to perform when the rule matches."""
 
     action_parameters: Optional[object] = None
@@ -159,42 +216,50 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsJSChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsJSChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-Rule = Annotated[
+Rule: TypeAlias = Annotated[
     Union[
         BlockRule,
-        ChallengeRule,
+        RuleRulesetsChallengeRule,
         CompressResponseRule,
+        DDoSDynamicRule,
         ExecuteRule,
-        JSChallengeRule,
+        ForceConnectionCloseRule,
+        RuleRulesetsJSChallengeRule,
         LogRule,
+        LogCustomFieldRule,
         ManagedChallengeRule,
         RedirectRule,
         RewriteRule,
         RouteRule,
         ScoreRule,
         ServeErrorRule,
+        SetCacheSettingsRule,
         SetConfigRule,
         SkipRule,
-        SetCacheSettingsRule,
-        RuleRulesetsLogCustomFieldRule,
-        RuleRulesetsDDoSDynamicRule,
-        RuleRulesetsForceConnectionCloseRule,
     ],
     PropertyInfo(discriminator="action"),
 ]
 
 
 class RuleEditResponse(BaseModel):
+    """A ruleset object."""
+
     id: str
     """The unique ID of the ruleset."""
 
diff --git a/src/cloudflare/types/rulesets/ruleset_create_params.py b/src/cloudflare/types/rulesets/ruleset_create_params.py
index 4e372271bef..d70cfb8f604 100644
--- a/src/cloudflare/types/rulesets/ruleset_create_params.py
+++ b/src/cloudflare/types/rulesets/ruleset_create_params.py
@@ -3,10 +3,11 @@
 from __future__ import annotations
 
 from typing import Union, Iterable
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
 from .kind import Kind
 from .phase import Phase
+from ..._types import SequenceNotStr
 from .logging_param import LoggingParam
 from .log_rule_param import LogRuleParam
 from .skip_rule_param import SkipRuleParam
@@ -16,24 +17,24 @@
 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 .ddos_dynamic_rule_param import DDoSDynamicRuleParam
+from .log_custom_field_rule_param import LogCustomFieldRuleParam
 from .compress_response_rule_param import CompressResponseRuleParam
 from .managed_challenge_rule_param import ManagedChallengeRuleParam
 from .set_cache_settings_rule_param import SetCacheSettingsRuleParam
+from .force_connection_close_rule_param import ForceConnectionCloseRuleParam
 
 __all__ = [
     "RulesetCreateParams",
     "Rule",
-    "RuleRulesetsLogCustomFieldRule",
-    "RuleRulesetsLogCustomFieldRuleActionParameters",
-    "RuleRulesetsLogCustomFieldRuleActionParametersCookieField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersRequestField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersResponseField",
-    "RuleRulesetsDDoSDynamicRule",
-    "RuleRulesetsForceConnectionCloseRule",
+    "RuleRulesetsChallengeRule",
+    "RuleRulesetsChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsChallengeRuleRatelimit",
+    "RuleRulesetsJSChallengeRule",
+    "RuleRulesetsJSChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsJSChallengeRuleRatelimit",
 ]
 
 
@@ -47,9 +48,6 @@ class RulesetCreateParams(TypedDict, total=False):
     phase: Required[Phase]
     """The phase of the ruleset."""
 
-    rules: Required[Iterable[Rule]]
-    """The list of rules in the ruleset."""
-
     account_id: str
     """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
 
@@ -59,41 +57,74 @@ class RulesetCreateParams(TypedDict, total=False):
     description: str
     """An informative description of the ruleset."""
 
+    rules: Iterable[Rule]
+    """The list of rules in the ruleset."""
 
-class RuleRulesetsLogCustomFieldRuleActionParametersCookieField(TypedDict, total=False):
-    name: Required[str]
-    """The name of the field."""
 
+class RuleRulesetsChallengeRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
 
-class RuleRulesetsLogCustomFieldRuleActionParametersRequestField(TypedDict, total=False):
-    name: Required[str]
-    """The name of the field."""
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
 
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
 
-class RuleRulesetsLogCustomFieldRuleActionParametersResponseField(TypedDict, total=False):
-    name: Required[str]
-    """The name of the field."""
 
+class RuleRulesetsChallengeRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
 
-class RuleRulesetsLogCustomFieldRuleActionParameters(TypedDict, total=False):
-    cookie_fields: Iterable[RuleRulesetsLogCustomFieldRuleActionParametersCookieField]
-    """The cookie fields to log."""
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    request_fields: Iterable[RuleRulesetsLogCustomFieldRuleActionParametersRequestField]
-    """The request fields to log."""
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
-    response_fields: Iterable[RuleRulesetsLogCustomFieldRuleActionParametersResponseField]
-    """The response fields to log."""
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
 
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
-class RuleRulesetsLogCustomFieldRule(TypedDict, total=False):
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class RuleRulesetsChallengeRule(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
 
-    action: Literal["log_custom_field"]
+    action: Literal["challenge"]
     """The action to perform when the rule matches."""
 
-    action_parameters: RuleRulesetsLogCustomFieldRuleActionParameters
+    action_parameters: object
     """The parameters configuring the rule's action."""
 
     description: str
@@ -102,47 +133,83 @@ class RuleRulesetsLogCustomFieldRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: RuleRulesetsChallengeRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: RuleRulesetsChallengeRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class RuleRulesetsDDoSDynamicRule(TypedDict, total=False):
-    id: str
-    """The unique ID of the rule."""
+class RuleRulesetsJSChallengeRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
 
-    action: Literal["ddos_dynamic"]
-    """The action to perform when the rule matches."""
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
 
-    action_parameters: object
-    """The parameters configuring the rule's action."""
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
 
-    description: str
-    """An informative description of the rule."""
 
-    enabled: bool
-    """Whether the rule should be executed."""
+class RuleRulesetsJSChallengeRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
 
-    expression: str
-    """The expression defining which traffic will match the rule."""
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
 
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-class RuleRulesetsForceConnectionCloseRule(TypedDict, total=False):
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class RuleRulesetsJSChallengeRule(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
 
-    action: Literal["force_connection_close"]
+    action: Literal["js_challenge"]
     """The action to perform when the rule matches."""
 
     action_parameters: object
@@ -154,33 +221,39 @@ class RuleRulesetsForceConnectionCloseRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: RuleRulesetsJSChallengeRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: RuleRulesetsJSChallengeRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-Rule = Union[
+Rule: TypeAlias = Union[
     BlockRuleParam,
-    ChallengeRuleParam,
+    RuleRulesetsChallengeRule,
     CompressResponseRuleParam,
+    DDoSDynamicRuleParam,
     ExecuteRuleParam,
-    JSChallengeRuleParam,
+    ForceConnectionCloseRuleParam,
+    RuleRulesetsJSChallengeRule,
     LogRuleParam,
+    LogCustomFieldRuleParam,
     ManagedChallengeRuleParam,
     RedirectRuleParam,
     RewriteRuleParam,
     RouteRuleParam,
     ScoreRuleParam,
     ServeErrorRuleParam,
+    SetCacheSettingsRuleParam,
     SetConfigRuleParam,
     SkipRuleParam,
-    SetCacheSettingsRuleParam,
-    RuleRulesetsLogCustomFieldRule,
-    RuleRulesetsDDoSDynamicRule,
-    RuleRulesetsForceConnectionCloseRule,
 ]
diff --git a/src/cloudflare/types/rulesets/ruleset_create_response.py b/src/cloudflare/types/rulesets/ruleset_create_response.py
index bfeacd5afd4..4b157ce0840 100644
--- a/src/cloudflare/types/rulesets/ruleset_create_response.py
+++ b/src/cloudflare/types/rulesets/ruleset_create_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal, Annotated
+from typing_extensions import Literal, Annotated, TypeAlias
 
 from .kind import Kind
 from .phase import Phase
@@ -17,54 +17,84 @@
 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 .ddos_dynamic_rule import DDoSDynamicRule
+from .log_custom_field_rule import LogCustomFieldRule
 from .compress_response_rule import CompressResponseRule
 from .managed_challenge_rule import ManagedChallengeRule
 from .set_cache_settings_rule import SetCacheSettingsRule
+from .force_connection_close_rule import ForceConnectionCloseRule
 
 __all__ = [
     "RulesetCreateResponse",
     "Rule",
-    "RuleRulesetsLogCustomFieldRule",
-    "RuleRulesetsLogCustomFieldRuleActionParameters",
-    "RuleRulesetsLogCustomFieldRuleActionParametersCookieField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersRequestField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersResponseField",
-    "RuleRulesetsDDoSDynamicRule",
-    "RuleRulesetsForceConnectionCloseRule",
+    "RuleRulesetsChallengeRule",
+    "RuleRulesetsChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsChallengeRuleRatelimit",
+    "RuleRulesetsJSChallengeRule",
+    "RuleRulesetsJSChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsJSChallengeRuleRatelimit",
 ]
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersCookieField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-class RuleRulesetsLogCustomFieldRuleActionParametersRequestField(BaseModel):
-    name: str
-    """The name of the field."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersResponseField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-class RuleRulesetsLogCustomFieldRuleActionParameters(BaseModel):
-    cookie_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersCookieField]] = None
-    """The cookie fields to log."""
+    It defaults to the same as the rule's expression.
+    """
 
-    request_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersRequestField]] = None
-    """The request fields to log."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    response_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersResponseField]] = None
-    """The response fields to log."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
 
-class RuleRulesetsLogCustomFieldRule(BaseModel):
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class RuleRulesetsChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -74,10 +104,10 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["log_custom_field"]] = None
+    action: Optional[Literal["challenge"]] = None
     """The action to perform when the rule matches."""
 
-    action_parameters: Optional[RuleRulesetsLogCustomFieldRuleActionParameters] = None
+    action_parameters: Optional[object] = None
     """The parameters configuring the rule's action."""
 
     categories: Optional[List[str]] = None
@@ -89,52 +119,79 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class RuleRulesetsDDoSDynamicRule(BaseModel):
-    last_updated: datetime
-    """The timestamp of when the rule was last modified."""
+class RuleRulesetsJSChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
-    version: str
-    """The version of the rule."""
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-    id: Optional[str] = None
-    """The unique ID of the rule."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
-    action: Optional[Literal["ddos_dynamic"]] = None
-    """The action to perform when the rule matches."""
 
-    action_parameters: Optional[object] = None
-    """The parameters configuring the rule's action."""
+class RuleRulesetsJSChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
 
-    categories: Optional[List[str]] = None
-    """The categories of the rule."""
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-    description: Optional[str] = None
-    """An informative description of the rule."""
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
-    enabled: Optional[bool] = None
-    """Whether the rule should be executed."""
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-    expression: Optional[str] = None
-    """The expression defining which traffic will match the rule."""
+    It defaults to the same as the rule's expression.
+    """
 
-    logging: Optional[Logging] = None
-    """An object configuring the rule's logging behavior."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
-class RuleRulesetsForceConnectionCloseRule(BaseModel):
+
+class RuleRulesetsJSChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -144,7 +201,7 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["force_connection_close"]] = None
+    action: Optional[Literal["js_challenge"]] = None
     """The action to perform when the rule matches."""
 
     action_parameters: Optional[object] = None
@@ -159,42 +216,50 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsJSChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsJSChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-Rule = Annotated[
+Rule: TypeAlias = Annotated[
     Union[
         BlockRule,
-        ChallengeRule,
+        RuleRulesetsChallengeRule,
         CompressResponseRule,
+        DDoSDynamicRule,
         ExecuteRule,
-        JSChallengeRule,
+        ForceConnectionCloseRule,
+        RuleRulesetsJSChallengeRule,
         LogRule,
+        LogCustomFieldRule,
         ManagedChallengeRule,
         RedirectRule,
         RewriteRule,
         RouteRule,
         ScoreRule,
         ServeErrorRule,
+        SetCacheSettingsRule,
         SetConfigRule,
         SkipRule,
-        SetCacheSettingsRule,
-        RuleRulesetsLogCustomFieldRule,
-        RuleRulesetsDDoSDynamicRule,
-        RuleRulesetsForceConnectionCloseRule,
     ],
     PropertyInfo(discriminator="action"),
 ]
 
 
 class RulesetCreateResponse(BaseModel):
+    """A ruleset object."""
+
     id: str
     """The unique ID of the ruleset."""
 
diff --git a/src/cloudflare/types/rulesets/ruleset_get_response.py b/src/cloudflare/types/rulesets/ruleset_get_response.py
index 328ba42b25a..fda4e4bf141 100644
--- a/src/cloudflare/types/rulesets/ruleset_get_response.py
+++ b/src/cloudflare/types/rulesets/ruleset_get_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal, Annotated
+from typing_extensions import Literal, Annotated, TypeAlias
 
 from .kind import Kind
 from .phase import Phase
@@ -17,54 +17,84 @@
 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 .ddos_dynamic_rule import DDoSDynamicRule
+from .log_custom_field_rule import LogCustomFieldRule
 from .compress_response_rule import CompressResponseRule
 from .managed_challenge_rule import ManagedChallengeRule
 from .set_cache_settings_rule import SetCacheSettingsRule
+from .force_connection_close_rule import ForceConnectionCloseRule
 
 __all__ = [
     "RulesetGetResponse",
     "Rule",
-    "RuleRulesetsLogCustomFieldRule",
-    "RuleRulesetsLogCustomFieldRuleActionParameters",
-    "RuleRulesetsLogCustomFieldRuleActionParametersCookieField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersRequestField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersResponseField",
-    "RuleRulesetsDDoSDynamicRule",
-    "RuleRulesetsForceConnectionCloseRule",
+    "RuleRulesetsChallengeRule",
+    "RuleRulesetsChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsChallengeRuleRatelimit",
+    "RuleRulesetsJSChallengeRule",
+    "RuleRulesetsJSChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsJSChallengeRuleRatelimit",
 ]
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersCookieField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-class RuleRulesetsLogCustomFieldRuleActionParametersRequestField(BaseModel):
-    name: str
-    """The name of the field."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersResponseField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-class RuleRulesetsLogCustomFieldRuleActionParameters(BaseModel):
-    cookie_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersCookieField]] = None
-    """The cookie fields to log."""
+    It defaults to the same as the rule's expression.
+    """
 
-    request_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersRequestField]] = None
-    """The request fields to log."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    response_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersResponseField]] = None
-    """The response fields to log."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
 
-class RuleRulesetsLogCustomFieldRule(BaseModel):
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class RuleRulesetsChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -74,10 +104,10 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["log_custom_field"]] = None
+    action: Optional[Literal["challenge"]] = None
     """The action to perform when the rule matches."""
 
-    action_parameters: Optional[RuleRulesetsLogCustomFieldRuleActionParameters] = None
+    action_parameters: Optional[object] = None
     """The parameters configuring the rule's action."""
 
     categories: Optional[List[str]] = None
@@ -89,52 +119,79 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class RuleRulesetsDDoSDynamicRule(BaseModel):
-    last_updated: datetime
-    """The timestamp of when the rule was last modified."""
+class RuleRulesetsJSChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
-    version: str
-    """The version of the rule."""
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-    id: Optional[str] = None
-    """The unique ID of the rule."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
-    action: Optional[Literal["ddos_dynamic"]] = None
-    """The action to perform when the rule matches."""
 
-    action_parameters: Optional[object] = None
-    """The parameters configuring the rule's action."""
+class RuleRulesetsJSChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
 
-    categories: Optional[List[str]] = None
-    """The categories of the rule."""
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-    description: Optional[str] = None
-    """An informative description of the rule."""
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
-    enabled: Optional[bool] = None
-    """Whether the rule should be executed."""
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-    expression: Optional[str] = None
-    """The expression defining which traffic will match the rule."""
+    It defaults to the same as the rule's expression.
+    """
 
-    logging: Optional[Logging] = None
-    """An object configuring the rule's logging behavior."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
-class RuleRulesetsForceConnectionCloseRule(BaseModel):
+
+class RuleRulesetsJSChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -144,7 +201,7 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["force_connection_close"]] = None
+    action: Optional[Literal["js_challenge"]] = None
     """The action to perform when the rule matches."""
 
     action_parameters: Optional[object] = None
@@ -159,42 +216,50 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsJSChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsJSChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-Rule = Annotated[
+Rule: TypeAlias = Annotated[
     Union[
         BlockRule,
-        ChallengeRule,
+        RuleRulesetsChallengeRule,
         CompressResponseRule,
+        DDoSDynamicRule,
         ExecuteRule,
-        JSChallengeRule,
+        ForceConnectionCloseRule,
+        RuleRulesetsJSChallengeRule,
         LogRule,
+        LogCustomFieldRule,
         ManagedChallengeRule,
         RedirectRule,
         RewriteRule,
         RouteRule,
         ScoreRule,
         ServeErrorRule,
+        SetCacheSettingsRule,
         SetConfigRule,
         SkipRule,
-        SetCacheSettingsRule,
-        RuleRulesetsLogCustomFieldRule,
-        RuleRulesetsDDoSDynamicRule,
-        RuleRulesetsForceConnectionCloseRule,
     ],
     PropertyInfo(discriminator="action"),
 ]
 
 
 class RulesetGetResponse(BaseModel):
+    """A ruleset object."""
+
     id: str
     """The unique ID of the ruleset."""
 
diff --git a/src/cloudflare/types/rulesets/ruleset_list_params.py b/src/cloudflare/types/rulesets/ruleset_list_params.py
new file mode 100644
index 00000000000..277016e47c6
--- /dev/null
+++ b/src/cloudflare/types/rulesets/ruleset_list_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import TypedDict
+
+__all__ = ["RulesetListParams"]
+
+
+class RulesetListParams(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    cursor: str
+    """The cursor to use for the next page."""
+
+    per_page: int
+    """The number of rulesets to return per page."""
diff --git a/src/cloudflare/types/rulesets/ruleset_list_response.py b/src/cloudflare/types/rulesets/ruleset_list_response.py
index 582742290a7..c892b62467f 100644
--- a/src/cloudflare/types/rulesets/ruleset_list_response.py
+++ b/src/cloudflare/types/rulesets/ruleset_list_response.py
@@ -11,6 +11,8 @@
 
 
 class RulesetListResponse(BaseModel):
+    """A ruleset object."""
+
     id: str
     """The unique ID of the ruleset."""
 
diff --git a/src/cloudflare/types/rulesets/ruleset_update_params.py b/src/cloudflare/types/rulesets/ruleset_update_params.py
index e2ff9a9fcb8..38af103d218 100644
--- a/src/cloudflare/types/rulesets/ruleset_update_params.py
+++ b/src/cloudflare/types/rulesets/ruleset_update_params.py
@@ -3,10 +3,11 @@
 from __future__ import annotations
 
 from typing import Union, Iterable
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
 from .kind import Kind
 from .phase import Phase
+from ..._types import SequenceNotStr
 from .logging_param import LoggingParam
 from .log_rule_param import LogRuleParam
 from .skip_rule_param import SkipRuleParam
@@ -16,31 +17,28 @@
 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 .ddos_dynamic_rule_param import DDoSDynamicRuleParam
+from .log_custom_field_rule_param import LogCustomFieldRuleParam
 from .compress_response_rule_param import CompressResponseRuleParam
 from .managed_challenge_rule_param import ManagedChallengeRuleParam
 from .set_cache_settings_rule_param import SetCacheSettingsRuleParam
+from .force_connection_close_rule_param import ForceConnectionCloseRuleParam
 
 __all__ = [
     "RulesetUpdateParams",
     "Rule",
-    "RuleRulesetsLogCustomFieldRule",
-    "RuleRulesetsLogCustomFieldRuleActionParameters",
-    "RuleRulesetsLogCustomFieldRuleActionParametersCookieField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersRequestField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersResponseField",
-    "RuleRulesetsDDoSDynamicRule",
-    "RuleRulesetsForceConnectionCloseRule",
+    "RuleRulesetsChallengeRule",
+    "RuleRulesetsChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsChallengeRuleRatelimit",
+    "RuleRulesetsJSChallengeRule",
+    "RuleRulesetsJSChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsJSChallengeRuleRatelimit",
 ]
 
 
 class RulesetUpdateParams(TypedDict, total=False):
-    rules: Required[Iterable[Rule]]
-    """The list of rules in the ruleset."""
-
     account_id: str
     """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
 
@@ -59,41 +57,74 @@ class RulesetUpdateParams(TypedDict, total=False):
     phase: Phase
     """The phase of the ruleset."""
 
+    rules: Iterable[Rule]
+    """The list of rules in the ruleset."""
+
+
+class RuleRulesetsChallengeRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class RuleRulesetsChallengeRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
 
-class RuleRulesetsLogCustomFieldRuleActionParametersCookieField(TypedDict, total=False):
-    name: Required[str]
-    """The name of the field."""
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
 
-class RuleRulesetsLogCustomFieldRuleActionParametersRequestField(TypedDict, total=False):
-    name: Required[str]
-    """The name of the field."""
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
 
+    It defaults to the same as the rule's expression.
+    """
 
-class RuleRulesetsLogCustomFieldRuleActionParametersResponseField(TypedDict, total=False):
-    name: Required[str]
-    """The name of the field."""
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
-class RuleRulesetsLogCustomFieldRuleActionParameters(TypedDict, total=False):
-    cookie_fields: Iterable[RuleRulesetsLogCustomFieldRuleActionParametersCookieField]
-    """The cookie fields to log."""
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
 
-    request_fields: Iterable[RuleRulesetsLogCustomFieldRuleActionParametersRequestField]
-    """The request fields to log."""
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
-    response_fields: Iterable[RuleRulesetsLogCustomFieldRuleActionParametersResponseField]
-    """The response fields to log."""
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
-class RuleRulesetsLogCustomFieldRule(TypedDict, total=False):
+class RuleRulesetsChallengeRule(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
 
-    action: Literal["log_custom_field"]
+    action: Literal["challenge"]
     """The action to perform when the rule matches."""
 
-    action_parameters: RuleRulesetsLogCustomFieldRuleActionParameters
+    action_parameters: object
     """The parameters configuring the rule's action."""
 
     description: str
@@ -102,47 +133,83 @@ class RuleRulesetsLogCustomFieldRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: RuleRulesetsChallengeRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: RuleRulesetsChallengeRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class RuleRulesetsDDoSDynamicRule(TypedDict, total=False):
-    id: str
-    """The unique ID of the rule."""
+class RuleRulesetsJSChallengeRuleExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
 
-    action: Literal["ddos_dynamic"]
-    """The action to perform when the rule matches."""
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
 
-    action_parameters: object
-    """The parameters configuring the rule's action."""
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
 
-    description: str
-    """An informative description of the rule."""
 
-    enabled: bool
-    """Whether the rule should be executed."""
+class RuleRulesetsJSChallengeRuleRatelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
 
-    expression: str
-    """The expression defining which traffic will match the rule."""
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-    logging: LoggingParam
-    """An object configuring the rule's logging behavior."""
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
 
-    ref: str
-    """The reference of the rule (the rule ID by default)."""
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
 
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-class RuleRulesetsForceConnectionCloseRule(TypedDict, total=False):
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class RuleRulesetsJSChallengeRule(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
 
-    action: Literal["force_connection_close"]
+    action: Literal["js_challenge"]
     """The action to perform when the rule matches."""
 
     action_parameters: object
@@ -154,33 +221,39 @@ class RuleRulesetsForceConnectionCloseRule(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: RuleRulesetsJSChallengeRuleExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: RuleRulesetsJSChallengeRuleRatelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-Rule = Union[
+Rule: TypeAlias = Union[
     BlockRuleParam,
-    ChallengeRuleParam,
+    RuleRulesetsChallengeRule,
     CompressResponseRuleParam,
+    DDoSDynamicRuleParam,
     ExecuteRuleParam,
-    JSChallengeRuleParam,
+    ForceConnectionCloseRuleParam,
+    RuleRulesetsJSChallengeRule,
     LogRuleParam,
+    LogCustomFieldRuleParam,
     ManagedChallengeRuleParam,
     RedirectRuleParam,
     RewriteRuleParam,
     RouteRuleParam,
     ScoreRuleParam,
     ServeErrorRuleParam,
+    SetCacheSettingsRuleParam,
     SetConfigRuleParam,
     SkipRuleParam,
-    SetCacheSettingsRuleParam,
-    RuleRulesetsLogCustomFieldRule,
-    RuleRulesetsDDoSDynamicRule,
-    RuleRulesetsForceConnectionCloseRule,
 ]
diff --git a/src/cloudflare/types/rulesets/ruleset_update_response.py b/src/cloudflare/types/rulesets/ruleset_update_response.py
index 9fb84d0d26a..19a203aa4de 100644
--- a/src/cloudflare/types/rulesets/ruleset_update_response.py
+++ b/src/cloudflare/types/rulesets/ruleset_update_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal, Annotated
+from typing_extensions import Literal, Annotated, TypeAlias
 
 from .kind import Kind
 from .phase import Phase
@@ -17,54 +17,84 @@
 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 .ddos_dynamic_rule import DDoSDynamicRule
+from .log_custom_field_rule import LogCustomFieldRule
 from .compress_response_rule import CompressResponseRule
 from .managed_challenge_rule import ManagedChallengeRule
 from .set_cache_settings_rule import SetCacheSettingsRule
+from .force_connection_close_rule import ForceConnectionCloseRule
 
 __all__ = [
     "RulesetUpdateResponse",
     "Rule",
-    "RuleRulesetsLogCustomFieldRule",
-    "RuleRulesetsLogCustomFieldRuleActionParameters",
-    "RuleRulesetsLogCustomFieldRuleActionParametersCookieField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersRequestField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersResponseField",
-    "RuleRulesetsDDoSDynamicRule",
-    "RuleRulesetsForceConnectionCloseRule",
+    "RuleRulesetsChallengeRule",
+    "RuleRulesetsChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsChallengeRuleRatelimit",
+    "RuleRulesetsJSChallengeRule",
+    "RuleRulesetsJSChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsJSChallengeRuleRatelimit",
 ]
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersCookieField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-class RuleRulesetsLogCustomFieldRuleActionParametersRequestField(BaseModel):
-    name: str
-    """The name of the field."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersResponseField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-class RuleRulesetsLogCustomFieldRuleActionParameters(BaseModel):
-    cookie_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersCookieField]] = None
-    """The cookie fields to log."""
+    It defaults to the same as the rule's expression.
+    """
 
-    request_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersRequestField]] = None
-    """The request fields to log."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    response_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersResponseField]] = None
-    """The response fields to log."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
 
-class RuleRulesetsLogCustomFieldRule(BaseModel):
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class RuleRulesetsChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -74,10 +104,10 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["log_custom_field"]] = None
+    action: Optional[Literal["challenge"]] = None
     """The action to perform when the rule matches."""
 
-    action_parameters: Optional[RuleRulesetsLogCustomFieldRuleActionParameters] = None
+    action_parameters: Optional[object] = None
     """The parameters configuring the rule's action."""
 
     categories: Optional[List[str]] = None
@@ -89,52 +119,79 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class RuleRulesetsDDoSDynamicRule(BaseModel):
-    last_updated: datetime
-    """The timestamp of when the rule was last modified."""
+class RuleRulesetsJSChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
-    version: str
-    """The version of the rule."""
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-    id: Optional[str] = None
-    """The unique ID of the rule."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
-    action: Optional[Literal["ddos_dynamic"]] = None
-    """The action to perform when the rule matches."""
 
-    action_parameters: Optional[object] = None
-    """The parameters configuring the rule's action."""
+class RuleRulesetsJSChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
 
-    categories: Optional[List[str]] = None
-    """The categories of the rule."""
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-    description: Optional[str] = None
-    """An informative description of the rule."""
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
-    enabled: Optional[bool] = None
-    """Whether the rule should be executed."""
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-    expression: Optional[str] = None
-    """The expression defining which traffic will match the rule."""
+    It defaults to the same as the rule's expression.
+    """
 
-    logging: Optional[Logging] = None
-    """An object configuring the rule's logging behavior."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
-class RuleRulesetsForceConnectionCloseRule(BaseModel):
+
+class RuleRulesetsJSChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -144,7 +201,7 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["force_connection_close"]] = None
+    action: Optional[Literal["js_challenge"]] = None
     """The action to perform when the rule matches."""
 
     action_parameters: Optional[object] = None
@@ -159,42 +216,50 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsJSChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsJSChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-Rule = Annotated[
+Rule: TypeAlias = Annotated[
     Union[
         BlockRule,
-        ChallengeRule,
+        RuleRulesetsChallengeRule,
         CompressResponseRule,
+        DDoSDynamicRule,
         ExecuteRule,
-        JSChallengeRule,
+        ForceConnectionCloseRule,
+        RuleRulesetsJSChallengeRule,
         LogRule,
+        LogCustomFieldRule,
         ManagedChallengeRule,
         RedirectRule,
         RewriteRule,
         RouteRule,
         ScoreRule,
         ServeErrorRule,
+        SetCacheSettingsRule,
         SetConfigRule,
         SkipRule,
-        SetCacheSettingsRule,
-        RuleRulesetsLogCustomFieldRule,
-        RuleRulesetsDDoSDynamicRule,
-        RuleRulesetsForceConnectionCloseRule,
     ],
     PropertyInfo(discriminator="action"),
 ]
 
 
 class RulesetUpdateResponse(BaseModel):
+    """A ruleset object."""
+
     id: str
     """The unique ID of the ruleset."""
 
diff --git a/src/cloudflare/types/rulesets/score_rule.py b/src/cloudflare/types/rulesets/score_rule.py
index 508adc8d594..db10d7f1e65 100644
--- a/src/cloudflare/types/rulesets/score_rule.py
+++ b/src/cloudflare/types/rulesets/score_rule.py
@@ -7,14 +7,69 @@
 from .logging import Logging
 from ..._models import BaseModel
 
-__all__ = ["ScoreRule", "ActionParameters"]
+__all__ = ["ScoreRule", "ActionParameters", "ExposedCredentialCheck", "Ratelimit"]
 
 
 class ActionParameters(BaseModel):
-    increment: Optional[int] = None
+    """The parameters configuring the rule's action."""
+
+    increment: int
+    """A delta to change the score by, which can be either positive or negative."""
+
+
+class ExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
+
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
     """
-    Increment contains the delta to change the score and can be either positive or
-    negative.
+
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
     """
 
 
@@ -43,11 +98,17 @@ class ScoreRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[ExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[Ratelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/score_rule_param.py b/src/cloudflare/types/rulesets/score_rule_param.py
index 9a1db280e51..8f429ddc7b4 100644
--- a/src/cloudflare/types/rulesets/score_rule_param.py
+++ b/src/cloudflare/types/rulesets/score_rule_param.py
@@ -2,18 +2,74 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
+from ..._types import SequenceNotStr
 from .logging_param import LoggingParam
 
-__all__ = ["ScoreRuleParam", "ActionParameters"]
+__all__ = ["ScoreRuleParam", "ActionParameters", "ExposedCredentialCheck", "Ratelimit"]
 
 
 class ActionParameters(TypedDict, total=False):
-    increment: int
+    """The parameters configuring the rule's action."""
+
+    increment: Required[int]
+    """A delta to change the score by, which can be either positive or negative."""
+
+
+class ExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
     """
-    Increment contains the delta to change the score and can be either positive or
-    negative.
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
     """
 
 
@@ -33,11 +89,17 @@ class ScoreRuleParam(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Ratelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/serve_error_rule.py b/src/cloudflare/types/rulesets/serve_error_rule.py
index 2713e5ec61d..6f201bc5b47 100644
--- a/src/cloudflare/types/rulesets/serve_error_rule.py
+++ b/src/cloudflare/types/rulesets/serve_error_rule.py
@@ -1,26 +1,103 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from .logging import Logging
 from ..._models import BaseModel
 
-__all__ = ["ServeErrorRule", "ActionParameters"]
+__all__ = [
+    "ServeErrorRule",
+    "ActionParameters",
+    "ActionParametersActionParametersContent",
+    "ActionParametersActionParametersAsset",
+    "ExposedCredentialCheck",
+    "Ratelimit",
+]
 
 
-class ActionParameters(BaseModel):
-    content: Optional[str] = None
-    """Error response content."""
+class ActionParametersActionParametersContent(BaseModel):
+    content: str
+    """The response content."""
 
-    content_type: Optional[Literal["application/json", "text/xml", "text/plain", "text/html"]] = None
-    """Content-type header to set with the response."""
+    content_type: Optional[Literal["application/json", "text/html", "text/plain", "text/xml"]] = None
+    """The content type header to set with the error response."""
 
-    status_code: Optional[float] = None
+    status_code: Optional[int] = None
     """The status code to use for the error."""
 
 
+class ActionParametersActionParametersAsset(BaseModel):
+    asset_name: str
+    """The name of a custom asset to serve as the error response."""
+
+    content_type: Optional[Literal["application/json", "text/html", "text/plain", "text/xml"]] = None
+    """The content type header to set with the error response."""
+
+    status_code: Optional[int] = None
+    """The status code to use for the error."""
+
+
+ActionParameters: TypeAlias = Union[ActionParametersActionParametersContent, ActionParametersActionParametersAsset]
+
+
+class ExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
+
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
 class ServeErrorRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
@@ -46,11 +123,17 @@ class ServeErrorRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[ExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[Ratelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/serve_error_rule_param.py b/src/cloudflare/types/rulesets/serve_error_rule_param.py
index d9d51bdbc08..95bfb90f76e 100644
--- a/src/cloudflare/types/rulesets/serve_error_rule_param.py
+++ b/src/cloudflare/types/rulesets/serve_error_rule_param.py
@@ -2,24 +2,103 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal, TypedDict
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
+from ..._types import SequenceNotStr
 from .logging_param import LoggingParam
 
-__all__ = ["ServeErrorRuleParam", "ActionParameters"]
+__all__ = [
+    "ServeErrorRuleParam",
+    "ActionParameters",
+    "ActionParametersActionParametersContent",
+    "ActionParametersActionParametersAsset",
+    "ExposedCredentialCheck",
+    "Ratelimit",
+]
 
 
-class ActionParameters(TypedDict, total=False):
-    content: str
-    """Error response content."""
+class ActionParametersActionParametersContent(TypedDict, total=False):
+    content: Required[str]
+    """The response content."""
 
-    content_type: Literal["application/json", "text/xml", "text/plain", "text/html"]
-    """Content-type header to set with the response."""
+    content_type: Literal["application/json", "text/html", "text/plain", "text/xml"]
+    """The content type header to set with the error response."""
 
-    status_code: float
+    status_code: int
     """The status code to use for the error."""
 
 
+class ActionParametersActionParametersAsset(TypedDict, total=False):
+    asset_name: Required[str]
+    """The name of a custom asset to serve as the error response."""
+
+    content_type: Literal["application/json", "text/html", "text/plain", "text/xml"]
+    """The content type header to set with the error response."""
+
+    status_code: int
+    """The status code to use for the error."""
+
+
+ActionParameters: TypeAlias = Union[ActionParametersActionParametersContent, ActionParametersActionParametersAsset]
+
+
+class ExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
 class ServeErrorRuleParam(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
@@ -36,11 +115,17 @@ class ServeErrorRuleParam(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Ratelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/set_cache_settings_rule.py b/src/cloudflare/types/rulesets/set_cache_settings_rule.py
index f23b607435f..afbc0d4af20 100644
--- a/src/cloudflare/types/rulesets/set_cache_settings_rule.py
+++ b/src/cloudflare/types/rulesets/set_cache_settings_rule.py
@@ -27,254 +27,262 @@
     "ActionParametersEdgeTTLStatusCodeTTL",
     "ActionParametersEdgeTTLStatusCodeTTLStatusCodeRange",
     "ActionParametersServeStale",
+    "ExposedCredentialCheck",
+    "Ratelimit",
 ]
 
 
 class ActionParametersBrowserTTL(BaseModel):
-    mode: Literal["respect_origin", "bypass_by_default", "override_origin"]
-    """Determines which browser ttl mode to use."""
+    """How long client browsers should cache the response.
+
+    Cloudflare cache purge will not purge content cached on client browsers, so high browser TTLs may lead to stale content.
+    """
+
+    mode: Literal["respect_origin", "bypass_by_default", "override_origin", "bypass"]
+    """The browser TTL mode."""
 
     default: Optional[int] = None
-    """The TTL (in seconds) if you choose override_origin mode."""
+    """The browser TTL (in seconds) if you choose the "override_origin" mode."""
 
 
 class ActionParametersCacheKeyCustomKeyCookie(BaseModel):
+    """Which cookies to include in the cache key."""
+
     check_presence: Optional[List[str]] = None
-    """Checks for the presence of these cookie names.
+    """A list of cookies to check for the presence of.
 
-    The presence of these cookies is used in building the cache key.
+    The presence of these cookies is included in the cache key.
     """
 
     include: Optional[List[str]] = None
-    """Include these cookies' names and their values."""
+    """A list of cookies to include in the cache key."""
 
 
 class ActionParametersCacheKeyCustomKeyHeader(BaseModel):
+    """Which headers to include in the cache key."""
+
     check_presence: Optional[List[str]] = None
-    """Checks for the presence of these header names.
+    """A list of headers to check for the presence of.
 
-    The presence of these headers is used in building the cache key.
+    The presence of these headers is included in the cache key.
     """
 
     contains: Optional[Dict[str, List[str]]] = None
-    """
-    For each header name and list of values combination, check if the request header
-    contains any of the values provided. The presence of the request header and
-    whether any of the values provided are contained in the request header value is
-    used in building the cache key.
+    """A mapping of header names to a list of values.
+
+    If a header is present in the request and contains any of the values provided,
+    its value is included in the cache key.
     """
 
     exclude_origin: Optional[bool] = None
-    """Whether or not to include the origin header.
-
-    A value of true will exclude the origin header in the cache key.
-    """
+    """Whether to exclude the origin header in the cache key."""
 
     include: Optional[List[str]] = None
-    """Include these headers' names and their values."""
+    """A list of headers to include in the cache key."""
 
 
 class ActionParametersCacheKeyCustomKeyHost(BaseModel):
-    resolved: Optional[bool] = None
-    """Use the resolved host in the cache key.
+    """How to use the host in the cache key."""
 
-    A value of true will use the resolved host, while a value or false will use the
-    original host.
-    """
+    resolved: Optional[bool] = None
+    """Whether to use the resolved host in the cache key."""
 
 
 class ActionParametersCacheKeyCustomKeyQueryStringExclude(BaseModel):
-    all: Optional[bool] = None
-    """Exclude all query string parameters from use in building the cache key."""
+    """Which query string parameters to exclude from the cache key."""
 
-    rule_list: Optional[List[str]] = FieldInfo(alias="list", default=None)
-    """A list of query string parameters NOT used to build the cache key.
+    all: Optional[Literal[True]] = None
+    """Whether to exclude all query string parameters from the cache key."""
 
-    All parameters present in the request but missing in this list will be used to
-    build the cache key.
-    """
+    rule_list: Optional[List[str]] = FieldInfo(alias="list", default=None)
+    """A list of query string parameters to exclude from the cache key."""
 
 
 class ActionParametersCacheKeyCustomKeyQueryStringInclude(BaseModel):
-    all: Optional[bool] = None
-    """Use all query string parameters in the cache key."""
+    """Which query string parameters to include in the cache key."""
+
+    all: Optional[Literal[True]] = None
+    """Whether to include all query string parameters in the cache key."""
 
     rule_list: Optional[List[str]] = FieldInfo(alias="list", default=None)
-    """A list of query string parameters used to build the cache key."""
+    """A list of query string parameters to include in the cache key."""
 
 
 class ActionParametersCacheKeyCustomKeyQueryString(BaseModel):
+    """Which query string parameters to include in or exclude from the cache key."""
+
     exclude: Optional[ActionParametersCacheKeyCustomKeyQueryStringExclude] = None
-    """
-    build the cache key using all query string parameters EXCECPT these excluded
-    parameters
-    """
+    """Which query string parameters to exclude from the cache key."""
 
     include: Optional[ActionParametersCacheKeyCustomKeyQueryStringInclude] = None
-    """
-    build the cache key using a list of query string parameters that ARE in the
-    request.
-    """
+    """Which query string parameters to include in the cache key."""
 
 
 class ActionParametersCacheKeyCustomKeyUser(BaseModel):
+    """How to use characteristics of the request user agent in the cache key."""
+
     device_type: Optional[bool] = None
-    """Use the user agent's device type in the cache key."""
+    """Whether to use the user agent's device type in the cache key."""
 
     geo: Optional[bool] = None
-    """Use the user agents's country in the cache key."""
+    """Whether to use the user agents's country in the cache key."""
 
     lang: Optional[bool] = None
-    """Use the user agent's language in the cache key."""
+    """Whether to use the user agent's language in the cache key."""
 
 
 class ActionParametersCacheKeyCustomKey(BaseModel):
+    """Which components of the request are included or excluded from the cache key."""
+
     cookie: Optional[ActionParametersCacheKeyCustomKeyCookie] = None
-    """The cookies to include in building the cache key."""
+    """Which cookies to include in the cache key."""
 
     header: Optional[ActionParametersCacheKeyCustomKeyHeader] = None
-    """The header names and values to include in building the cache key."""
+    """Which headers to include in the cache key."""
 
     host: Optional[ActionParametersCacheKeyCustomKeyHost] = None
-    """Whether to use the original host or the resolved host in the cache key."""
+    """How to use the host in the cache key."""
 
     query_string: Optional[ActionParametersCacheKeyCustomKeyQueryString] = None
-    """
-    Use the presence or absence of parameters in the query string to build the cache
-    key.
-    """
+    """Which query string parameters to include in or exclude from the cache key."""
 
     user: Optional[ActionParametersCacheKeyCustomKeyUser] = None
-    """Characteristics of the request user agent used in building the cache key."""
+    """How to use characteristics of the request user agent in the cache key."""
 
 
 class ActionParametersCacheKey(BaseModel):
+    """
+    Which components of the request are included in or excluded from the cache key Cloudflare uses to store the response in cache.
+    """
+
     cache_by_device_type: Optional[bool] = None
-    """Separate cached content based on the visitor’s device type"""
+    """Whether to separate cached content based on the visitor's device type."""
 
     cache_deception_armor: Optional[bool] = None
     """
-    Protect from web cache deception attacks while allowing static assets to be
-    cached
+    Whether to protect from web cache deception attacks, while allowing static
+    assets to be cached.
     """
 
     custom_key: Optional[ActionParametersCacheKeyCustomKey] = None
-    """
-    Customize which components of the request are included or excluded from the
-    cache key.
-    """
+    """Which components of the request are included or excluded from the cache key."""
 
     ignore_query_strings_order: Optional[bool] = None
     """
-    Treat requests with the same query parameters the same, regardless of the order
-    those query parameters are in. A value of true ignores the query strings' order.
+    Whether to treat requests with the same query parameters the same, regardless of
+    the order those query parameters are in.
     """
 
 
 class ActionParametersCacheReserve(BaseModel):
+    """
+    Settings to determine whether the request's response from origin is eligible for Cache Reserve (requires a Cache Reserve add-on plan).
+    """
+
     eligible: bool
-    """Determines whether cache reserve is enabled.
+    """Whether Cache Reserve is enabled.
 
     If this is true and a request meets eligibility criteria, Cloudflare will write
-    the resource to cache reserve.
+    the resource to Cache Reserve.
     """
 
-    min_file_size: int
-    """The minimum file size eligible for store in cache reserve."""
+    minimum_file_size: Optional[int] = None
+    """The minimum file size eligible for storage in Cache Reserve."""
 
 
 class ActionParametersEdgeTTLStatusCodeTTLStatusCodeRange(BaseModel):
-    from_: int = FieldInfo(alias="from")
-    """response status code lower bound"""
+    """A range of status codes to apply the TTL to."""
+
+    from_: Optional[int] = FieldInfo(alias="from", default=None)
+    """The lower bound of the range."""
 
-    to: int
-    """response status code upper bound"""
+    to: Optional[int] = None
+    """The upper bound of the range."""
 
 
 class ActionParametersEdgeTTLStatusCodeTTL(BaseModel):
     value: int
-    """Time to cache a response (in seconds).
+    """The time to cache the response for (in seconds).
 
-    A value of 0 is equivalent to setting the Cache-Control header with the value
-    "no-cache". A value of -1 is equivalent to setting Cache-Control header with the
-    value of "no-store".
+    A value of 0 is equivalent to setting the cache control header with the value
+    "no-cache". A value of -1 is equivalent to setting the cache control header with
+    the value of "no-store".
     """
 
-    status_code_range: Optional[ActionParametersEdgeTTLStatusCodeTTLStatusCodeRange] = None
-    """The range of status codes used to apply the selected mode."""
+    status_code: Optional[int] = None
+    """A single status code to apply the TTL to."""
 
-    status_code_value: Optional[int] = None
-    """Set the ttl for responses with this specific status code"""
+    status_code_range: Optional[ActionParametersEdgeTTLStatusCodeTTLStatusCodeRange] = None
+    """A range of status codes to apply the TTL to."""
 
 
 class ActionParametersEdgeTTL(BaseModel):
-    default: int
-    """The TTL (in seconds) if you choose override_origin mode."""
+    """How long the Cloudflare edge network should cache the response."""
 
     mode: Literal["respect_origin", "bypass_by_default", "override_origin"]
-    """edge ttl options"""
+    """The edge TTL mode."""
 
-    status_code_ttl: List[ActionParametersEdgeTTLStatusCodeTTL]
-    """List of single status codes, or status code ranges to apply the selected mode"""
+    default: Optional[int] = None
+    """The edge TTL (in seconds) if you choose the "override_origin" mode."""
+
+    status_code_ttl: Optional[List[ActionParametersEdgeTTLStatusCodeTTL]] = None
+    """A list of TTLs to apply to specific status codes or status code ranges."""
 
 
 class ActionParametersServeStale(BaseModel):
-    disable_stale_while_updating: bool
-    """Defines whether Cloudflare should serve stale content while updating.
+    """When to serve stale content from cache."""
 
-    If true, Cloudflare will not serve stale content while getting the latest
+    disable_stale_while_updating: Optional[bool] = None
+    """
+    Whether Cloudflare should disable serving stale content while getting the latest
     content from the origin.
     """
 
 
 class ActionParameters(BaseModel):
+    """The parameters configuring the rule's action."""
+
     additional_cacheable_ports: Optional[List[int]] = None
-    """List of additional ports that caching can be enabled on."""
+    """A list of additional ports that caching should be enabled on."""
 
     browser_ttl: Optional[ActionParametersBrowserTTL] = None
-    """Specify how long client browsers should cache the response.
+    """How long client browsers should cache the response.
 
     Cloudflare cache purge will not purge content cached on client browsers, so high
     browser TTLs may lead to stale content.
     """
 
     cache: Optional[bool] = None
-    """Mark whether the request’s response from origin is eligible for caching.
+    """Whether the request's response from the origin is eligible for caching.
 
-    Caching itself will still depend on the cache-control header and your other
+    Caching itself will still depend on the cache control header and your other
     caching configurations.
     """
 
     cache_key: Optional[ActionParametersCacheKey] = None
     """
-    Define which components of the request are included or excluded from the cache
-    key Cloudflare uses to store the response in cache.
+    Which components of the request are included in or excluded from the cache key
+    Cloudflare uses to store the response in cache.
     """
 
     cache_reserve: Optional[ActionParametersCacheReserve] = None
     """
-    Mark whether the request's response from origin is eligible for Cache Reserve
-    (requires a Cache Reserve add-on plan).
+    Settings to determine whether the request's response from origin is eligible for
+    Cache Reserve (requires a Cache Reserve add-on plan).
     """
 
     edge_ttl: Optional[ActionParametersEdgeTTL] = None
-    """
-    TTL (Time to Live) specifies the maximum time to cache a resource in the
-    Cloudflare edge network.
-    """
+    """How long the Cloudflare edge network should cache the response."""
 
     origin_cache_control: Optional[bool] = None
-    """When enabled, Cloudflare will aim to strictly adhere to RFC 7234."""
+    """Whether Cloudflare will aim to strictly adhere to RFC 7234."""
 
     origin_error_page_passthru: Optional[bool] = None
-    """Generate Cloudflare error pages from issues sent from the origin server.
-
-    When on, error pages will trigger for issues from the origin
-    """
+    """Whether to generate Cloudflare error pages for issues from the origin server."""
 
     read_timeout: Optional[int] = None
     """
-    Define a timeout value between two successive read operations to your origin
+    A timeout value between two successive read operations to use for your origin
     server. Historically, the timeout value between two read options from Cloudflare
     to an origin server is 100 seconds. If you are attempting to reduce HTTP 524
     errors because of timeouts from an origin server, try increasing this timeout
@@ -282,16 +290,68 @@ class ActionParameters(BaseModel):
     """
 
     respect_strong_etags: Optional[bool] = None
-    """
-    Specify whether or not Cloudflare should respect strong ETag (entity tag)
-    headers. When off, Cloudflare converts strong ETag headers to weak ETag headers.
+    """Whether Cloudflare should respect strong ETag (entity tag) headers.
+
+    If false, Cloudflare converts strong ETag headers to weak ETag headers.
     """
 
     serve_stale: Optional[ActionParametersServeStale] = None
+    """When to serve stale content from cache."""
+
+
+class ExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
+
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
     """
-    Define if Cloudflare should serve stale content while getting the latest content
-    from the origin. If on, Cloudflare will not serve stale content while getting
-    the latest content from the origin.
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
     """
 
 
@@ -320,11 +380,17 @@ class SetCacheSettingsRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[ExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[Ratelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/set_cache_settings_rule_param.py b/src/cloudflare/types/rulesets/set_cache_settings_rule_param.py
index cbfbc5c3a0d..302bf4ff9f9 100644
--- a/src/cloudflare/types/rulesets/set_cache_settings_rule_param.py
+++ b/src/cloudflare/types/rulesets/set_cache_settings_rule_param.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from typing import Dict, List, Iterable
+from typing import Dict, Iterable
 from typing_extensions import Literal, Required, TypedDict
 
+from ..._types import SequenceNotStr
 from .logging_param import LoggingParam
 
 __all__ = [
@@ -25,160 +26,167 @@
     "ActionParametersEdgeTTLStatusCodeTTL",
     "ActionParametersEdgeTTLStatusCodeTTLStatusCodeRange",
     "ActionParametersServeStale",
+    "ExposedCredentialCheck",
+    "Ratelimit",
 ]
 
 
 class ActionParametersBrowserTTL(TypedDict, total=False):
-    mode: Required[Literal["respect_origin", "bypass_by_default", "override_origin"]]
-    """Determines which browser ttl mode to use."""
+    """How long client browsers should cache the response.
+
+    Cloudflare cache purge will not purge content cached on client browsers, so high browser TTLs may lead to stale content.
+    """
+
+    mode: Required[Literal["respect_origin", "bypass_by_default", "override_origin", "bypass"]]
+    """The browser TTL mode."""
 
     default: int
-    """The TTL (in seconds) if you choose override_origin mode."""
+    """The browser TTL (in seconds) if you choose the "override_origin" mode."""
 
 
 class ActionParametersCacheKeyCustomKeyCookie(TypedDict, total=False):
-    check_presence: List[str]
-    """Checks for the presence of these cookie names.
+    """Which cookies to include in the cache key."""
+
+    check_presence: SequenceNotStr[str]
+    """A list of cookies to check for the presence of.
 
-    The presence of these cookies is used in building the cache key.
+    The presence of these cookies is included in the cache key.
     """
 
-    include: List[str]
-    """Include these cookies' names and their values."""
+    include: SequenceNotStr[str]
+    """A list of cookies to include in the cache key."""
 
 
 class ActionParametersCacheKeyCustomKeyHeader(TypedDict, total=False):
-    check_presence: List[str]
-    """Checks for the presence of these header names.
+    """Which headers to include in the cache key."""
 
-    The presence of these headers is used in building the cache key.
-    """
+    check_presence: SequenceNotStr[str]
+    """A list of headers to check for the presence of.
 
-    contains: Dict[str, List[str]]
-    """
-    For each header name and list of values combination, check if the request header
-    contains any of the values provided. The presence of the request header and
-    whether any of the values provided are contained in the request header value is
-    used in building the cache key.
+    The presence of these headers is included in the cache key.
     """
 
-    exclude_origin: bool
-    """Whether or not to include the origin header.
+    contains: Dict[str, SequenceNotStr[str]]
+    """A mapping of header names to a list of values.
 
-    A value of true will exclude the origin header in the cache key.
+    If a header is present in the request and contains any of the values provided,
+    its value is included in the cache key.
     """
 
-    include: List[str]
-    """Include these headers' names and their values."""
+    exclude_origin: bool
+    """Whether to exclude the origin header in the cache key."""
+
+    include: SequenceNotStr[str]
+    """A list of headers to include in the cache key."""
 
 
 class ActionParametersCacheKeyCustomKeyHost(TypedDict, total=False):
-    resolved: bool
-    """Use the resolved host in the cache key.
+    """How to use the host in the cache key."""
 
-    A value of true will use the resolved host, while a value or false will use the
-    original host.
-    """
+    resolved: bool
+    """Whether to use the resolved host in the cache key."""
 
 
 class ActionParametersCacheKeyCustomKeyQueryStringExclude(TypedDict, total=False):
-    all: bool
-    """Exclude all query string parameters from use in building the cache key."""
+    """Which query string parameters to exclude from the cache key."""
 
-    list: List[str]
-    """A list of query string parameters NOT used to build the cache key.
+    all: Literal[True]
+    """Whether to exclude all query string parameters from the cache key."""
 
-    All parameters present in the request but missing in this list will be used to
-    build the cache key.
-    """
+    list: SequenceNotStr[str]
+    """A list of query string parameters to exclude from the cache key."""
 
 
 class ActionParametersCacheKeyCustomKeyQueryStringInclude(TypedDict, total=False):
-    all: bool
-    """Use all query string parameters in the cache key."""
+    """Which query string parameters to include in the cache key."""
 
-    list: List[str]
-    """A list of query string parameters used to build the cache key."""
+    all: Literal[True]
+    """Whether to include all query string parameters in the cache key."""
+
+    list: SequenceNotStr[str]
+    """A list of query string parameters to include in the cache key."""
 
 
 class ActionParametersCacheKeyCustomKeyQueryString(TypedDict, total=False):
+    """Which query string parameters to include in or exclude from the cache key."""
+
     exclude: ActionParametersCacheKeyCustomKeyQueryStringExclude
-    """
-    build the cache key using all query string parameters EXCECPT these excluded
-    parameters
-    """
+    """Which query string parameters to exclude from the cache key."""
 
     include: ActionParametersCacheKeyCustomKeyQueryStringInclude
-    """
-    build the cache key using a list of query string parameters that ARE in the
-    request.
-    """
+    """Which query string parameters to include in the cache key."""
 
 
 class ActionParametersCacheKeyCustomKeyUser(TypedDict, total=False):
+    """How to use characteristics of the request user agent in the cache key."""
+
     device_type: bool
-    """Use the user agent's device type in the cache key."""
+    """Whether to use the user agent's device type in the cache key."""
 
     geo: bool
-    """Use the user agents's country in the cache key."""
+    """Whether to use the user agents's country in the cache key."""
 
     lang: bool
-    """Use the user agent's language in the cache key."""
+    """Whether to use the user agent's language in the cache key."""
 
 
 class ActionParametersCacheKeyCustomKey(TypedDict, total=False):
+    """Which components of the request are included or excluded from the cache key."""
+
     cookie: ActionParametersCacheKeyCustomKeyCookie
-    """The cookies to include in building the cache key."""
+    """Which cookies to include in the cache key."""
 
     header: ActionParametersCacheKeyCustomKeyHeader
-    """The header names and values to include in building the cache key."""
+    """Which headers to include in the cache key."""
 
     host: ActionParametersCacheKeyCustomKeyHost
-    """Whether to use the original host or the resolved host in the cache key."""
+    """How to use the host in the cache key."""
 
     query_string: ActionParametersCacheKeyCustomKeyQueryString
-    """
-    Use the presence or absence of parameters in the query string to build the cache
-    key.
-    """
+    """Which query string parameters to include in or exclude from the cache key."""
 
     user: ActionParametersCacheKeyCustomKeyUser
-    """Characteristics of the request user agent used in building the cache key."""
+    """How to use characteristics of the request user agent in the cache key."""
 
 
 class ActionParametersCacheKey(TypedDict, total=False):
+    """
+    Which components of the request are included in or excluded from the cache key Cloudflare uses to store the response in cache.
+    """
+
     cache_by_device_type: bool
-    """Separate cached content based on the visitor’s device type"""
+    """Whether to separate cached content based on the visitor's device type."""
 
     cache_deception_armor: bool
     """
-    Protect from web cache deception attacks while allowing static assets to be
-    cached
+    Whether to protect from web cache deception attacks, while allowing static
+    assets to be cached.
     """
 
     custom_key: ActionParametersCacheKeyCustomKey
-    """
-    Customize which components of the request are included or excluded from the
-    cache key.
-    """
+    """Which components of the request are included or excluded from the cache key."""
 
     ignore_query_strings_order: bool
     """
-    Treat requests with the same query parameters the same, regardless of the order
-    those query parameters are in. A value of true ignores the query strings' order.
+    Whether to treat requests with the same query parameters the same, regardless of
+    the order those query parameters are in.
     """
 
 
 class ActionParametersCacheReserve(TypedDict, total=False):
+    """
+    Settings to determine whether the request's response from origin is eligible for Cache Reserve (requires a Cache Reserve add-on plan).
+    """
+
     eligible: Required[bool]
-    """Determines whether cache reserve is enabled.
+    """Whether Cache Reserve is enabled.
 
     If this is true and a request meets eligibility criteria, Cloudflare will write
-    the resource to cache reserve.
+    the resource to Cache Reserve.
     """
 
-    min_file_size: Required[int]
-    """The minimum file size eligible for store in cache reserve."""
+    minimum_file_size: int
+    """The minimum file size eligible for storage in Cache Reserve."""
 
 
 _ActionParametersEdgeTTLStatusCodeTTLStatusCodeRangeReservedKeywords = TypedDict(
@@ -193,94 +201,95 @@ class ActionParametersCacheReserve(TypedDict, total=False):
 class ActionParametersEdgeTTLStatusCodeTTLStatusCodeRange(
     _ActionParametersEdgeTTLStatusCodeTTLStatusCodeRangeReservedKeywords, total=False
 ):
-    to: Required[int]
-    """response status code upper bound"""
+    """A range of status codes to apply the TTL to."""
+
+    to: int
+    """The upper bound of the range."""
 
 
 class ActionParametersEdgeTTLStatusCodeTTL(TypedDict, total=False):
     value: Required[int]
-    """Time to cache a response (in seconds).
+    """The time to cache the response for (in seconds).
 
-    A value of 0 is equivalent to setting the Cache-Control header with the value
-    "no-cache". A value of -1 is equivalent to setting Cache-Control header with the
-    value of "no-store".
+    A value of 0 is equivalent to setting the cache control header with the value
+    "no-cache". A value of -1 is equivalent to setting the cache control header with
+    the value of "no-store".
     """
 
-    status_code_range: ActionParametersEdgeTTLStatusCodeTTLStatusCodeRange
-    """The range of status codes used to apply the selected mode."""
+    status_code: int
+    """A single status code to apply the TTL to."""
 
-    status_code_value: int
-    """Set the ttl for responses with this specific status code"""
+    status_code_range: ActionParametersEdgeTTLStatusCodeTTLStatusCodeRange
+    """A range of status codes to apply the TTL to."""
 
 
 class ActionParametersEdgeTTL(TypedDict, total=False):
-    default: Required[int]
-    """The TTL (in seconds) if you choose override_origin mode."""
+    """How long the Cloudflare edge network should cache the response."""
 
     mode: Required[Literal["respect_origin", "bypass_by_default", "override_origin"]]
-    """edge ttl options"""
+    """The edge TTL mode."""
+
+    default: int
+    """The edge TTL (in seconds) if you choose the "override_origin" mode."""
 
-    status_code_ttl: Required[Iterable[ActionParametersEdgeTTLStatusCodeTTL]]
-    """List of single status codes, or status code ranges to apply the selected mode"""
+    status_code_ttl: Iterable[ActionParametersEdgeTTLStatusCodeTTL]
+    """A list of TTLs to apply to specific status codes or status code ranges."""
 
 
 class ActionParametersServeStale(TypedDict, total=False):
-    disable_stale_while_updating: Required[bool]
-    """Defines whether Cloudflare should serve stale content while updating.
+    """When to serve stale content from cache."""
 
-    If true, Cloudflare will not serve stale content while getting the latest
+    disable_stale_while_updating: bool
+    """
+    Whether Cloudflare should disable serving stale content while getting the latest
     content from the origin.
     """
 
 
 class ActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
     additional_cacheable_ports: Iterable[int]
-    """List of additional ports that caching can be enabled on."""
+    """A list of additional ports that caching should be enabled on."""
 
     browser_ttl: ActionParametersBrowserTTL
-    """Specify how long client browsers should cache the response.
+    """How long client browsers should cache the response.
 
     Cloudflare cache purge will not purge content cached on client browsers, so high
     browser TTLs may lead to stale content.
     """
 
     cache: bool
-    """Mark whether the request’s response from origin is eligible for caching.
+    """Whether the request's response from the origin is eligible for caching.
 
-    Caching itself will still depend on the cache-control header and your other
+    Caching itself will still depend on the cache control header and your other
     caching configurations.
     """
 
     cache_key: ActionParametersCacheKey
     """
-    Define which components of the request are included or excluded from the cache
-    key Cloudflare uses to store the response in cache.
+    Which components of the request are included in or excluded from the cache key
+    Cloudflare uses to store the response in cache.
     """
 
     cache_reserve: ActionParametersCacheReserve
     """
-    Mark whether the request's response from origin is eligible for Cache Reserve
-    (requires a Cache Reserve add-on plan).
+    Settings to determine whether the request's response from origin is eligible for
+    Cache Reserve (requires a Cache Reserve add-on plan).
     """
 
     edge_ttl: ActionParametersEdgeTTL
-    """
-    TTL (Time to Live) specifies the maximum time to cache a resource in the
-    Cloudflare edge network.
-    """
+    """How long the Cloudflare edge network should cache the response."""
 
     origin_cache_control: bool
-    """When enabled, Cloudflare will aim to strictly adhere to RFC 7234."""
+    """Whether Cloudflare will aim to strictly adhere to RFC 7234."""
 
     origin_error_page_passthru: bool
-    """Generate Cloudflare error pages from issues sent from the origin server.
-
-    When on, error pages will trigger for issues from the origin
-    """
+    """Whether to generate Cloudflare error pages for issues from the origin server."""
 
     read_timeout: int
     """
-    Define a timeout value between two successive read operations to your origin
+    A timeout value between two successive read operations to use for your origin
     server. Historically, the timeout value between two read options from Cloudflare
     to an origin server is 100 seconds. If you are attempting to reduce HTTP 524
     errors because of timeouts from an origin server, try increasing this timeout
@@ -288,16 +297,68 @@ class ActionParameters(TypedDict, total=False):
     """
 
     respect_strong_etags: bool
-    """
-    Specify whether or not Cloudflare should respect strong ETag (entity tag)
-    headers. When off, Cloudflare converts strong ETag headers to weak ETag headers.
+    """Whether Cloudflare should respect strong ETag (entity tag) headers.
+
+    If false, Cloudflare converts strong ETag headers to weak ETag headers.
     """
 
     serve_stale: ActionParametersServeStale
+    """When to serve stale content from cache."""
+
+
+class ExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
     """
-    Define if Cloudflare should serve stale content while getting the latest content
-    from the origin. If on, Cloudflare will not serve stale content while getting
-    the latest content from the origin.
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
     """
 
 
@@ -317,11 +378,17 @@ class SetCacheSettingsRuleParam(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Ratelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/set_config_rule.py b/src/cloudflare/types/rulesets/set_config_rule.py
index 8f09bbe8b99..b2f42a3957e 100644
--- a/src/cloudflare/types/rulesets/set_config_rule.py
+++ b/src/cloudflare/types/rulesets/set_config_rule.py
@@ -7,71 +7,140 @@
 from .logging import Logging
 from ..._models import BaseModel
 
-__all__ = ["SetConfigRule", "ActionParameters", "ActionParametersAutominify"]
+__all__ = ["SetConfigRule", "ActionParameters", "ActionParametersAutominify", "ExposedCredentialCheck", "Ratelimit"]
 
 
 class ActionParametersAutominify(BaseModel):
+    """Which file extensions to minify automatically."""
+
     css: Optional[bool] = None
-    """Minify CSS files."""
+    """Whether to minify CSS files."""
 
     html: Optional[bool] = None
-    """Minify HTML files."""
+    """Whether to minify HTML files."""
 
     js: Optional[bool] = None
-    """Minify JS files."""
+    """Whether to minify JavaScript files."""
 
 
 class ActionParameters(BaseModel):
+    """The parameters configuring the rule's action."""
+
     automatic_https_rewrites: Optional[bool] = None
-    """Turn on or off Automatic HTTPS Rewrites."""
+    """Whether to enable Automatic HTTPS Rewrites."""
 
     autominify: Optional[ActionParametersAutominify] = None
-    """Select which file extensions to minify automatically."""
+    """Which file extensions to minify automatically."""
 
     bic: Optional[bool] = None
-    """Turn on or off Browser Integrity Check."""
+    """Whether to enable Browser Integrity Check (BIC)."""
 
     disable_apps: Optional[Literal[True]] = None
-    """Turn off all active Cloudflare Apps."""
+    """Whether to disable Cloudflare Apps."""
+
+    disable_pay_per_crawl: Optional[Literal[True]] = None
+    """Whether to disable Pay Per Crawl."""
 
     disable_rum: Optional[Literal[True]] = None
-    """Turn off Real User Monitoring (RUM)."""
+    """Whether to disable Real User Monitoring (RUM)."""
 
     disable_zaraz: Optional[Literal[True]] = None
-    """Turn off Zaraz."""
+    """Whether to disable Zaraz."""
 
     email_obfuscation: Optional[bool] = None
-    """Turn on or off Email Obfuscation."""
+    """Whether to enable Email Obfuscation."""
 
     fonts: Optional[bool] = None
-    """Turn on or off Cloudflare Fonts."""
+    """Whether to enable Cloudflare Fonts."""
 
     hotlink_protection: Optional[bool] = None
-    """Turn on or off the Hotlink Protection."""
+    """Whether to enable Hotlink Protection."""
 
     mirage: Optional[bool] = None
-    """Turn on or off Mirage."""
+    """Whether to enable Mirage."""
 
     opportunistic_encryption: Optional[bool] = None
-    """Turn on or off Opportunistic Encryption."""
+    """Whether to enable Opportunistic Encryption."""
+
+    polish: Optional[Literal["off", "lossless", "lossy", "webp"]] = None
+    """The Polish level to configure."""
+
+    request_body_buffering: Optional[Literal["none", "standard", "full"]] = None
+    """The request body buffering mode."""
 
-    polish: Optional[Literal["off", "lossless", "lossy"]] = None
-    """Configure the Polish level."""
+    response_body_buffering: Optional[Literal["none", "standard"]] = None
+    """The response body buffering mode."""
 
     rocket_loader: Optional[bool] = None
-    """Turn on or off Rocket Loader"""
+    """Whether to enable Rocket Loader."""
 
     security_level: Optional[Literal["off", "essentially_off", "low", "medium", "high", "under_attack"]] = None
-    """Configure the Security Level."""
+    """The Security Level to configure."""
 
     server_side_excludes: Optional[bool] = None
-    """Turn on or off Server Side Excludes."""
+    """Whether to enable Server-Side Excludes."""
 
     ssl: Optional[Literal["off", "flexible", "full", "strict", "origin_pull"]] = None
-    """Configure the SSL level."""
+    """The SSL level to configure."""
 
     sxg: Optional[bool] = None
-    """Turn on or off Signed Exchanges (SXG)."""
+    """Whether to enable Signed Exchanges (SXG)."""
+
+
+class ExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
+
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
 class SetConfigRule(BaseModel):
@@ -99,11 +168,17 @@ class SetConfigRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[ExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[Ratelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/set_config_rule_param.py b/src/cloudflare/types/rulesets/set_config_rule_param.py
index 09ccc180461..b40b670d169 100644
--- a/src/cloudflare/types/rulesets/set_config_rule_param.py
+++ b/src/cloudflare/types/rulesets/set_config_rule_param.py
@@ -2,75 +2,151 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
+from ..._types import SequenceNotStr
 from .logging_param import LoggingParam
 
-__all__ = ["SetConfigRuleParam", "ActionParameters", "ActionParametersAutominify"]
+__all__ = [
+    "SetConfigRuleParam",
+    "ActionParameters",
+    "ActionParametersAutominify",
+    "ExposedCredentialCheck",
+    "Ratelimit",
+]
 
 
 class ActionParametersAutominify(TypedDict, total=False):
+    """Which file extensions to minify automatically."""
+
     css: bool
-    """Minify CSS files."""
+    """Whether to minify CSS files."""
 
     html: bool
-    """Minify HTML files."""
+    """Whether to minify HTML files."""
 
     js: bool
-    """Minify JS files."""
+    """Whether to minify JavaScript files."""
 
 
 class ActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
     automatic_https_rewrites: bool
-    """Turn on or off Automatic HTTPS Rewrites."""
+    """Whether to enable Automatic HTTPS Rewrites."""
 
     autominify: ActionParametersAutominify
-    """Select which file extensions to minify automatically."""
+    """Which file extensions to minify automatically."""
 
     bic: bool
-    """Turn on or off Browser Integrity Check."""
+    """Whether to enable Browser Integrity Check (BIC)."""
 
     disable_apps: Literal[True]
-    """Turn off all active Cloudflare Apps."""
+    """Whether to disable Cloudflare Apps."""
+
+    disable_pay_per_crawl: Literal[True]
+    """Whether to disable Pay Per Crawl."""
 
     disable_rum: Literal[True]
-    """Turn off Real User Monitoring (RUM)."""
+    """Whether to disable Real User Monitoring (RUM)."""
 
     disable_zaraz: Literal[True]
-    """Turn off Zaraz."""
+    """Whether to disable Zaraz."""
 
     email_obfuscation: bool
-    """Turn on or off Email Obfuscation."""
+    """Whether to enable Email Obfuscation."""
 
     fonts: bool
-    """Turn on or off Cloudflare Fonts."""
+    """Whether to enable Cloudflare Fonts."""
 
     hotlink_protection: bool
-    """Turn on or off the Hotlink Protection."""
+    """Whether to enable Hotlink Protection."""
 
     mirage: bool
-    """Turn on or off Mirage."""
+    """Whether to enable Mirage."""
 
     opportunistic_encryption: bool
-    """Turn on or off Opportunistic Encryption."""
+    """Whether to enable Opportunistic Encryption."""
+
+    polish: Literal["off", "lossless", "lossy", "webp"]
+    """The Polish level to configure."""
+
+    request_body_buffering: Literal["none", "standard", "full"]
+    """The request body buffering mode."""
 
-    polish: Literal["off", "lossless", "lossy"]
-    """Configure the Polish level."""
+    response_body_buffering: Literal["none", "standard"]
+    """The response body buffering mode."""
 
     rocket_loader: bool
-    """Turn on or off Rocket Loader"""
+    """Whether to enable Rocket Loader."""
 
     security_level: Literal["off", "essentially_off", "low", "medium", "high", "under_attack"]
-    """Configure the Security Level."""
+    """The Security Level to configure."""
 
     server_side_excludes: bool
-    """Turn on or off Server Side Excludes."""
+    """Whether to enable Server-Side Excludes."""
 
     ssl: Literal["off", "flexible", "full", "strict", "origin_pull"]
-    """Configure the SSL level."""
+    """The SSL level to configure."""
 
     sxg: bool
-    """Turn on or off Signed Exchanges (SXG)."""
+    """Whether to enable Signed Exchanges (SXG)."""
+
+
+class ExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
 
 class SetConfigRuleParam(TypedDict, total=False):
@@ -89,11 +165,17 @@ class SetConfigRuleParam(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Ratelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/skip_rule.py b/src/cloudflare/types/rulesets/skip_rule.py
index 6b01bf8efb3..e329edcd197 100644
--- a/src/cloudflare/types/rulesets/skip_rule.py
+++ b/src/cloudflare/types/rulesets/skip_rule.py
@@ -8,19 +8,27 @@
 from .logging import Logging
 from ..._models import BaseModel
 
-__all__ = ["SkipRule", "ActionParameters"]
+__all__ = ["SkipRule", "ActionParameters", "ExposedCredentialCheck", "Ratelimit"]
 
 
 class ActionParameters(BaseModel):
+    """The parameters configuring the rule's action."""
+
+    phase: Optional[Literal["current"]] = None
+    """A phase to skip the execution of.
+
+    This option is only compatible with the products option.
+    """
+
     phases: Optional[List[Phase]] = None
     """A list of phases to skip the execution of.
 
-    This option is incompatible with the ruleset and rulesets options.
+    This option is incompatible with the rulesets option.
     """
 
-    products: Optional[
-        List[Literal["bic", "hot", "rateLimit", "securityLevel", "uaBlock", "waf", "zoneLockdown"]]
-    ] = None
+    products: Optional[List[Literal["bic", "hot", "rateLimit", "securityLevel", "uaBlock", "waf", "zoneLockdown"]]] = (
+        None
+    )
     """A list of legacy security products to skip the execution of."""
 
     rules: Optional[Dict[str, List[str]]] = None
@@ -32,7 +40,7 @@ class ActionParameters(BaseModel):
     ruleset: Optional[Literal["current"]] = None
     """A ruleset to skip the execution of.
 
-    This option is incompatible with the rulesets, rules and phases options.
+    This option is incompatible with the rulesets option.
     """
 
     rulesets: Optional[List[str]] = None
@@ -42,6 +50,62 @@ class ActionParameters(BaseModel):
     """
 
 
+class ExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
+
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
 class SkipRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
@@ -67,11 +131,17 @@ class SkipRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[ExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[Ratelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/skip_rule_param.py b/src/cloudflare/types/rulesets/skip_rule_param.py
index abf557ff94a..70c01e5febc 100644
--- a/src/cloudflare/types/rulesets/skip_rule_param.py
+++ b/src/cloudflare/types/rulesets/skip_rule_param.py
@@ -3,25 +3,34 @@
 from __future__ import annotations
 
 from typing import Dict, List
-from typing_extensions import Literal, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
 from .phase import Phase
+from ..._types import SequenceNotStr
 from .logging_param import LoggingParam
 
-__all__ = ["SkipRuleParam", "ActionParameters"]
+__all__ = ["SkipRuleParam", "ActionParameters", "ExposedCredentialCheck", "Ratelimit"]
 
 
 class ActionParameters(TypedDict, total=False):
+    """The parameters configuring the rule's action."""
+
+    phase: Literal["current"]
+    """A phase to skip the execution of.
+
+    This option is only compatible with the products option.
+    """
+
     phases: List[Phase]
     """A list of phases to skip the execution of.
 
-    This option is incompatible with the ruleset and rulesets options.
+    This option is incompatible with the rulesets option.
     """
 
     products: List[Literal["bic", "hot", "rateLimit", "securityLevel", "uaBlock", "waf", "zoneLockdown"]]
     """A list of legacy security products to skip the execution of."""
 
-    rules: Dict[str, List[str]]
+    rules: Dict[str, SequenceNotStr[str]]
     """
     A mapping of ruleset IDs to a list of rule IDs in that ruleset to skip the
     execution of. This option is incompatible with the ruleset option.
@@ -30,16 +39,72 @@ class ActionParameters(TypedDict, total=False):
     ruleset: Literal["current"]
     """A ruleset to skip the execution of.
 
-    This option is incompatible with the rulesets, rules and phases options.
+    This option is incompatible with the rulesets option.
     """
 
-    rulesets: List[str]
+    rulesets: SequenceNotStr[str]
     """A list of ruleset IDs to skip the execution of.
 
     This option is incompatible with the ruleset and phases options.
     """
 
 
+class ExposedCredentialCheck(TypedDict, total=False):
+    """Configuration for exposed credential checking."""
+
+    password_expression: Required[str]
+    """An expression that selects the password used in the credentials check."""
+
+    username_expression: Required[str]
+    """An expression that selects the user ID used in the credentials check."""
+
+
+class Ratelimit(TypedDict, total=False):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: Required[SequenceNotStr[str]]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: Required[int]
+    """Period in seconds over which the counter is being incremented."""
+
+    counting_expression: str
+    """An expression that defines when the rate limit counter should be incremented.
+
+    It defaults to the same as the rule's expression.
+    """
+
+    mitigation_timeout: int
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
+
+    requests_per_period: int
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: bool
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: int
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: str
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
 class SkipRuleParam(TypedDict, total=False):
     id: str
     """The unique ID of the rule."""
@@ -56,11 +121,17 @@ class SkipRuleParam(TypedDict, total=False):
     enabled: bool
     """Whether the rule should be executed."""
 
+    exposed_credential_check: ExposedCredentialCheck
+    """Configuration for exposed credential checking."""
+
     expression: str
     """The expression defining which traffic will match the rule."""
 
     logging: LoggingParam
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Ratelimit
+    """An object configuring the rule's rate limit behavior."""
+
     ref: str
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
diff --git a/src/cloudflare/types/rulesets/version_get_response.py b/src/cloudflare/types/rulesets/version_get_response.py
index abb1cfae6c7..6e0536e009c 100644
--- a/src/cloudflare/types/rulesets/version_get_response.py
+++ b/src/cloudflare/types/rulesets/version_get_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal, Annotated
+from typing_extensions import Literal, Annotated, TypeAlias
 
 from .kind import Kind
 from .phase import Phase
@@ -17,54 +17,84 @@
 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 .ddos_dynamic_rule import DDoSDynamicRule
+from .log_custom_field_rule import LogCustomFieldRule
 from .compress_response_rule import CompressResponseRule
 from .managed_challenge_rule import ManagedChallengeRule
 from .set_cache_settings_rule import SetCacheSettingsRule
+from .force_connection_close_rule import ForceConnectionCloseRule
 
 __all__ = [
     "VersionGetResponse",
     "Rule",
-    "RuleRulesetsLogCustomFieldRule",
-    "RuleRulesetsLogCustomFieldRuleActionParameters",
-    "RuleRulesetsLogCustomFieldRuleActionParametersCookieField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersRequestField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersResponseField",
-    "RuleRulesetsDDoSDynamicRule",
-    "RuleRulesetsForceConnectionCloseRule",
+    "RuleRulesetsChallengeRule",
+    "RuleRulesetsChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsChallengeRuleRatelimit",
+    "RuleRulesetsJSChallengeRule",
+    "RuleRulesetsJSChallengeRuleExposedCredentialCheck",
+    "RuleRulesetsJSChallengeRuleRatelimit",
 ]
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersCookieField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-class RuleRulesetsLogCustomFieldRuleActionParametersRequestField(BaseModel):
-    name: str
-    """The name of the field."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
 
-class RuleRulesetsLogCustomFieldRuleActionParametersResponseField(BaseModel):
-    name: str
-    """The name of the field."""
+class RuleRulesetsChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
+
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
+
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-class RuleRulesetsLogCustomFieldRuleActionParameters(BaseModel):
-    cookie_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersCookieField]] = None
-    """The cookie fields to log."""
+    It defaults to the same as the rule's expression.
+    """
 
-    request_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersRequestField]] = None
-    """The request fields to log."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    response_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersResponseField]] = None
-    """The response fields to log."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
 
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
 
-class RuleRulesetsLogCustomFieldRule(BaseModel):
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
+
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
+
+
+class RuleRulesetsChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -74,10 +104,10 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["log_custom_field"]] = None
+    action: Optional[Literal["challenge"]] = None
     """The action to perform when the rule matches."""
 
-    action_parameters: Optional[RuleRulesetsLogCustomFieldRuleActionParameters] = None
+    action_parameters: Optional[object] = None
     """The parameters configuring the rule's action."""
 
     categories: Optional[List[str]] = None
@@ -89,52 +119,79 @@ class RuleRulesetsLogCustomFieldRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-class RuleRulesetsDDoSDynamicRule(BaseModel):
-    last_updated: datetime
-    """The timestamp of when the rule was last modified."""
+class RuleRulesetsJSChallengeRuleExposedCredentialCheck(BaseModel):
+    """Configuration for exposed credential checking."""
 
-    version: str
-    """The version of the rule."""
+    password_expression: str
+    """An expression that selects the password used in the credentials check."""
 
-    id: Optional[str] = None
-    """The unique ID of the rule."""
+    username_expression: str
+    """An expression that selects the user ID used in the credentials check."""
 
-    action: Optional[Literal["ddos_dynamic"]] = None
-    """The action to perform when the rule matches."""
 
-    action_parameters: Optional[object] = None
-    """The parameters configuring the rule's action."""
+class RuleRulesetsJSChallengeRuleRatelimit(BaseModel):
+    """An object configuring the rule's rate limit behavior."""
 
-    categories: Optional[List[str]] = None
-    """The categories of the rule."""
+    characteristics: List[str]
+    """
+    Characteristics of the request on which the rate limit counter will be
+    incremented.
+    """
 
-    description: Optional[str] = None
-    """An informative description of the rule."""
+    period: int
+    """Period in seconds over which the counter is being incremented."""
 
-    enabled: Optional[bool] = None
-    """Whether the rule should be executed."""
+    counting_expression: Optional[str] = None
+    """An expression that defines when the rate limit counter should be incremented.
 
-    expression: Optional[str] = None
-    """The expression defining which traffic will match the rule."""
+    It defaults to the same as the rule's expression.
+    """
 
-    logging: Optional[Logging] = None
-    """An object configuring the rule's logging behavior."""
+    mitigation_timeout: Optional[int] = None
+    """
+    Period of time in seconds after which the action will be disabled following its
+    first execution.
+    """
 
-    ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    requests_per_period: Optional[int] = None
+    """
+    The threshold of requests per period after which the action will be executed for
+    the first time.
+    """
+
+    requests_to_origin: Optional[bool] = None
+    """Whether counting is only performed when an origin is reached."""
+
+    score_per_period: Optional[int] = None
+    """
+    The score threshold per period for which the action will be executed the first
+    time.
+    """
 
+    score_response_header_name: Optional[str] = None
+    """
+    A response header name provided by the origin, which contains the score to
+    increment rate limit counter with.
+    """
 
-class RuleRulesetsForceConnectionCloseRule(BaseModel):
+
+class RuleRulesetsJSChallengeRule(BaseModel):
     last_updated: datetime
     """The timestamp of when the rule was last modified."""
 
@@ -144,7 +201,7 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     id: Optional[str] = None
     """The unique ID of the rule."""
 
-    action: Optional[Literal["force_connection_close"]] = None
+    action: Optional[Literal["js_challenge"]] = None
     """The action to perform when the rule matches."""
 
     action_parameters: Optional[object] = None
@@ -159,42 +216,50 @@ class RuleRulesetsForceConnectionCloseRule(BaseModel):
     enabled: Optional[bool] = None
     """Whether the rule should be executed."""
 
+    exposed_credential_check: Optional[RuleRulesetsJSChallengeRuleExposedCredentialCheck] = None
+    """Configuration for exposed credential checking."""
+
     expression: Optional[str] = None
     """The expression defining which traffic will match the rule."""
 
     logging: Optional[Logging] = None
     """An object configuring the rule's logging behavior."""
 
+    ratelimit: Optional[RuleRulesetsJSChallengeRuleRatelimit] = None
+    """An object configuring the rule's rate limit behavior."""
+
     ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
+    """The reference of the rule (the rule's ID by default)."""
 
 
-Rule = Annotated[
+Rule: TypeAlias = Annotated[
     Union[
         BlockRule,
-        ChallengeRule,
+        RuleRulesetsChallengeRule,
         CompressResponseRule,
+        DDoSDynamicRule,
         ExecuteRule,
-        JSChallengeRule,
+        ForceConnectionCloseRule,
+        RuleRulesetsJSChallengeRule,
         LogRule,
+        LogCustomFieldRule,
         ManagedChallengeRule,
         RedirectRule,
         RewriteRule,
         RouteRule,
         ScoreRule,
         ServeErrorRule,
+        SetCacheSettingsRule,
         SetConfigRule,
         SkipRule,
-        SetCacheSettingsRule,
-        RuleRulesetsLogCustomFieldRule,
-        RuleRulesetsDDoSDynamicRule,
-        RuleRulesetsForceConnectionCloseRule,
     ],
     PropertyInfo(discriminator="action"),
 ]
 
 
 class VersionGetResponse(BaseModel):
+    """A ruleset object."""
+
     id: str
     """The unique ID of the ruleset."""
 
diff --git a/src/cloudflare/types/rulesets/version_list_response.py b/src/cloudflare/types/rulesets/version_list_response.py
index bfc8b80491c..48c9c312b83 100644
--- a/src/cloudflare/types/rulesets/version_list_response.py
+++ b/src/cloudflare/types/rulesets/version_list_response.py
@@ -11,6 +11,8 @@
 
 
 class VersionListResponse(BaseModel):
+    """A ruleset object."""
+
     id: str
     """The unique ID of the ruleset."""
 
diff --git a/src/cloudflare/types/rulesets/versions/__init__.py b/src/cloudflare/types/rulesets/versions/__init__.py
deleted file mode 100644
index eedd7781951..00000000000
--- a/src/cloudflare/types/rulesets/versions/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from .by_tag_get_response import ByTagGetResponse as ByTagGetResponse
diff --git a/src/cloudflare/types/rulesets/versions/by_tag_get_response.py b/src/cloudflare/types/rulesets/versions/by_tag_get_response.py
deleted file mode 100644
index 058c549bc29..00000000000
--- a/src/cloudflare/types/rulesets/versions/by_tag_get_response.py
+++ /dev/null
@@ -1,220 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union, Optional
-from datetime import datetime
-from typing_extensions import Literal, Annotated
-
-from ..kind import Kind
-from ..phase import Phase
-from ..logging import Logging
-from ...._utils import PropertyInfo
-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__ = [
-    "ByTagGetResponse",
-    "Rule",
-    "RuleRulesetsLogCustomFieldRule",
-    "RuleRulesetsLogCustomFieldRuleActionParameters",
-    "RuleRulesetsLogCustomFieldRuleActionParametersCookieField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersRequestField",
-    "RuleRulesetsLogCustomFieldRuleActionParametersResponseField",
-    "RuleRulesetsDDoSDynamicRule",
-    "RuleRulesetsForceConnectionCloseRule",
-]
-
-
-class RuleRulesetsLogCustomFieldRuleActionParametersCookieField(BaseModel):
-    name: str
-    """The name of the field."""
-
-
-class RuleRulesetsLogCustomFieldRuleActionParametersRequestField(BaseModel):
-    name: str
-    """The name of the field."""
-
-
-class RuleRulesetsLogCustomFieldRuleActionParametersResponseField(BaseModel):
-    name: str
-    """The name of the field."""
-
-
-class RuleRulesetsLogCustomFieldRuleActionParameters(BaseModel):
-    cookie_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersCookieField]] = None
-    """The cookie fields to log."""
-
-    request_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersRequestField]] = None
-    """The request fields to log."""
-
-    response_fields: Optional[List[RuleRulesetsLogCustomFieldRuleActionParametersResponseField]] = None
-    """The response fields to log."""
-
-
-class RuleRulesetsLogCustomFieldRule(BaseModel):
-    last_updated: datetime
-    """The timestamp of when the rule was last modified."""
-
-    version: str
-    """The version of the rule."""
-
-    id: Optional[str] = None
-    """The unique ID of the rule."""
-
-    action: Optional[Literal["log_custom_field"]] = None
-    """The action to perform when the rule matches."""
-
-    action_parameters: Optional[RuleRulesetsLogCustomFieldRuleActionParameters] = None
-    """The parameters configuring the rule's action."""
-
-    categories: Optional[List[str]] = None
-    """The categories of the rule."""
-
-    description: Optional[str] = None
-    """An informative description of the rule."""
-
-    enabled: Optional[bool] = None
-    """Whether the rule should be executed."""
-
-    expression: Optional[str] = None
-    """The expression defining which traffic will match the rule."""
-
-    logging: Optional[Logging] = None
-    """An object configuring the rule's logging behavior."""
-
-    ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
-
-
-class RuleRulesetsDDoSDynamicRule(BaseModel):
-    last_updated: datetime
-    """The timestamp of when the rule was last modified."""
-
-    version: str
-    """The version of the rule."""
-
-    id: Optional[str] = None
-    """The unique ID of the rule."""
-
-    action: Optional[Literal["ddos_dynamic"]] = None
-    """The action to perform when the rule matches."""
-
-    action_parameters: Optional[object] = None
-    """The parameters configuring the rule's action."""
-
-    categories: Optional[List[str]] = None
-    """The categories of the rule."""
-
-    description: Optional[str] = None
-    """An informative description of the rule."""
-
-    enabled: Optional[bool] = None
-    """Whether the rule should be executed."""
-
-    expression: Optional[str] = None
-    """The expression defining which traffic will match the rule."""
-
-    logging: Optional[Logging] = None
-    """An object configuring the rule's logging behavior."""
-
-    ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
-
-
-class RuleRulesetsForceConnectionCloseRule(BaseModel):
-    last_updated: datetime
-    """The timestamp of when the rule was last modified."""
-
-    version: str
-    """The version of the rule."""
-
-    id: Optional[str] = None
-    """The unique ID of the rule."""
-
-    action: Optional[Literal["force_connection_close"]] = None
-    """The action to perform when the rule matches."""
-
-    action_parameters: Optional[object] = None
-    """The parameters configuring the rule's action."""
-
-    categories: Optional[List[str]] = None
-    """The categories of the rule."""
-
-    description: Optional[str] = None
-    """An informative description of the rule."""
-
-    enabled: Optional[bool] = None
-    """Whether the rule should be executed."""
-
-    expression: Optional[str] = None
-    """The expression defining which traffic will match the rule."""
-
-    logging: Optional[Logging] = None
-    """An object configuring the rule's logging behavior."""
-
-    ref: Optional[str] = None
-    """The reference of the rule (the rule ID by default)."""
-
-
-Rule = Annotated[
-    Union[
-        BlockRule,
-        ChallengeRule,
-        CompressResponseRule,
-        ExecuteRule,
-        JSChallengeRule,
-        LogRule,
-        ManagedChallengeRule,
-        RedirectRule,
-        RewriteRule,
-        RouteRule,
-        ScoreRule,
-        ServeErrorRule,
-        SetConfigRule,
-        SkipRule,
-        SetCacheSettingsRule,
-        RuleRulesetsLogCustomFieldRule,
-        RuleRulesetsDDoSDynamicRule,
-        RuleRulesetsForceConnectionCloseRule,
-    ],
-    PropertyInfo(discriminator="action"),
-]
-
-
-class ByTagGetResponse(BaseModel):
-    id: str
-    """The unique ID of the ruleset."""
-
-    kind: Kind
-    """The kind of the ruleset."""
-
-    last_updated: datetime
-    """The timestamp of when the ruleset was last modified."""
-
-    name: str
-    """The human-readable name of the ruleset."""
-
-    phase: Phase
-    """The phase of the ruleset."""
-
-    rules: List[Rule]
-    """The list of rules in the ruleset."""
-
-    version: str
-    """The version of the ruleset."""
-
-    description: Optional[str] = None
-    """An informative description of the ruleset."""
diff --git a/src/cloudflare/types/rum/__init__.py b/src/cloudflare/types/rum/__init__.py
index 870d7373122..31efc427c14 100644
--- a/src/cloudflare/types/rum/__init__.py
+++ b/src/cloudflare/types/rum/__init__.py
@@ -9,6 +9,8 @@
 from .rule_update_params import RuleUpdateParams as RuleUpdateParams
 from .rule_delete_response import RuleDeleteResponse as RuleDeleteResponse
 from .site_info_list_params import SiteInfoListParams as SiteInfoListParams
+from .rule_bulk_create_params import RuleBulkCreateParams as RuleBulkCreateParams
 from .site_info_create_params import SiteInfoCreateParams as SiteInfoCreateParams
 from .site_info_update_params import SiteInfoUpdateParams as SiteInfoUpdateParams
+from .rule_bulk_create_response import RuleBulkCreateResponse as RuleBulkCreateResponse
 from .site_info_delete_response import SiteInfoDeleteResponse as SiteInfoDeleteResponse
diff --git a/src/cloudflare/types/rum/rule_bulk_create_params.py b/src/cloudflare/types/rum/rule_bulk_create_params.py
new file mode 100644
index 00000000000..11ba2bfc19d
--- /dev/null
+++ b/src/cloudflare/types/rum/rule_bulk_create_params.py
@@ -0,0 +1,34 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["RuleBulkCreateParams", "Rule"]
+
+
+class RuleBulkCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    delete_rules: SequenceNotStr[str]
+    """A list of rule identifiers to delete."""
+
+    rules: Iterable[Rule]
+    """A list of rules to create or update."""
+
+
+class Rule(TypedDict, total=False):
+    id: str
+    """The Web Analytics rule identifier."""
+
+    host: str
+
+    inclusive: bool
+
+    is_paused: bool
+
+    paths: SequenceNotStr[str]
diff --git a/src/cloudflare/types/rum/rule_bulk_create_response.py b/src/cloudflare/types/rum/rule_bulk_create_response.py
new file mode 100644
index 00000000000..7370f98b684
--- /dev/null
+++ b/src/cloudflare/types/rum/rule_bulk_create_response.py
@@ -0,0 +1,28 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from .rum_rule import RUMRule
+from ..._models import BaseModel
+
+__all__ = ["RuleBulkCreateResponse", "Ruleset"]
+
+
+class Ruleset(BaseModel):
+    id: Optional[str] = None
+    """The Web Analytics ruleset identifier."""
+
+    enabled: Optional[bool] = None
+    """Whether the ruleset is enabled."""
+
+    zone_name: Optional[str] = None
+
+    zone_tag: Optional[str] = None
+    """The zone identifier."""
+
+
+class RuleBulkCreateResponse(BaseModel):
+    rules: Optional[List[RUMRule]] = None
+    """A list of rules."""
+
+    ruleset: Optional[Ruleset] = None
diff --git a/src/cloudflare/types/rum/rule_create_params.py b/src/cloudflare/types/rum/rule_create_params.py
index 999786186b4..45bf57b63b4 100644
--- a/src/cloudflare/types/rum/rule_create_params.py
+++ b/src/cloudflare/types/rum/rule_create_params.py
@@ -2,15 +2,16 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Required, TypedDict
 
+from ..._types import SequenceNotStr
+
 __all__ = ["RuleCreateParams"]
 
 
 class RuleCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     host: str
 
@@ -20,4 +21,4 @@ class RuleCreateParams(TypedDict, total=False):
     is_paused: bool
     """Whether the rule is paused or not."""
 
-    paths: List[str]
+    paths: SequenceNotStr[str]
diff --git a/src/cloudflare/types/rum/rule_update_params.py b/src/cloudflare/types/rum/rule_update_params.py
index 262f25205a0..cd16ad9cbc3 100644
--- a/src/cloudflare/types/rum/rule_update_params.py
+++ b/src/cloudflare/types/rum/rule_update_params.py
@@ -2,15 +2,16 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Required, TypedDict
 
+from ..._types import SequenceNotStr
+
 __all__ = ["RuleUpdateParams"]
 
 
 class RuleUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     ruleset_id: Required[str]
     """The Web Analytics ruleset identifier."""
@@ -23,4 +24,4 @@ class RuleUpdateParams(TypedDict, total=False):
     is_paused: bool
     """Whether the rule is paused or not."""
 
-    paths: List[str]
+    paths: SequenceNotStr[str]
diff --git a/src/cloudflare/types/rum/site_info_create_params.py b/src/cloudflare/types/rum/site_info_create_params.py
index 91186469f7b..1c5741fc7ba 100644
--- a/src/cloudflare/types/rum/site_info_create_params.py
+++ b/src/cloudflare/types/rum/site_info_create_params.py
@@ -9,7 +9,7 @@
 
 class SiteInfoCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     auto_install: bool
     """
diff --git a/src/cloudflare/types/rum/site_info_list_params.py b/src/cloudflare/types/rum/site_info_list_params.py
index 621eba190a1..5d20ee77a52 100644
--- a/src/cloudflare/types/rum/site_info_list_params.py
+++ b/src/cloudflare/types/rum/site_info_list_params.py
@@ -9,7 +9,7 @@
 
 class SiteInfoListParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     order_by: Literal["host", "created"]
     """The property used to sort the list of results."""
diff --git a/src/cloudflare/types/rum/site_info_update_params.py b/src/cloudflare/types/rum/site_info_update_params.py
index c829ad47b3b..8c46b5e3cb7 100644
--- a/src/cloudflare/types/rum/site_info_update_params.py
+++ b/src/cloudflare/types/rum/site_info_update_params.py
@@ -9,7 +9,7 @@
 
 class SiteInfoUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     auto_install: bool
     """
@@ -17,8 +17,20 @@ class SiteInfoUpdateParams(TypedDict, total=False):
     sites.
     """
 
+    enabled: bool
+    """Enables or disables RUM.
+
+    This option can be used only when auto_install is set to true.
+    """
+
     host: str
     """The hostname to use for gray-clouded sites."""
 
+    lite: bool
+    """
+    If enabled, the JavaScript snippet will not be injected for visitors from the
+    EU.
+    """
+
     zone_tag: str
     """The zone identifier."""
diff --git a/src/cloudflare/types/schema_validation/__init__.py b/src/cloudflare/types/schema_validation/__init__.py
new file mode 100644
index 00000000000..9e710c09d16
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/__init__.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .public_schema import PublicSchema as PublicSchema
+from .schema_get_params import SchemaGetParams as SchemaGetParams
+from .schema_edit_params import SchemaEditParams as SchemaEditParams
+from .schema_list_params import SchemaListParams as SchemaListParams
+from .setting_edit_params import SettingEditParams as SettingEditParams
+from .schema_create_params import SchemaCreateParams as SchemaCreateParams
+from .setting_get_response import SettingGetResponse as SettingGetResponse
+from .setting_edit_response import SettingEditResponse as SettingEditResponse
+from .setting_update_params import SettingUpdateParams as SettingUpdateParams
+from .schema_delete_response import SchemaDeleteResponse as SchemaDeleteResponse
+from .setting_update_response import SettingUpdateResponse as SettingUpdateResponse
diff --git a/src/cloudflare/types/schema_validation/public_schema.py b/src/cloudflare/types/schema_validation/public_schema.py
new file mode 100644
index 00000000000..ce666c36e65
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/public_schema.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["PublicSchema"]
+
+
+class PublicSchema(BaseModel):
+    """A schema used in schema validation"""
+
+    created_at: datetime
+
+    kind: Literal["openapi_v3"]
+    """The kind of the schema"""
+
+    name: str
+    """A human-readable name for the schema"""
+
+    schema_id: str
+    """A unique identifier of this schema"""
+
+    source: str
+    """The raw schema, e.g., the OpenAPI schema, either as JSON or YAML"""
+
+    validation_enabled: Optional[bool] = None
+    """An indicator if this schema is enabled"""
diff --git a/src/cloudflare/types/schema_validation/schema_create_params.py b/src/cloudflare/types/schema_validation/schema_create_params.py
new file mode 100644
index 00000000000..585316e7cf3
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/schema_create_params.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["SchemaCreateParams"]
+
+
+class SchemaCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    kind: Required[Literal["openapi_v3"]]
+    """The kind of the schema"""
+
+    name: Required[str]
+    """A human-readable name for the schema"""
+
+    source: Required[str]
+    """The raw schema, e.g., the OpenAPI schema, either as JSON or YAML"""
+
+    validation_enabled: Required[bool]
+    """An indicator if this schema is enabled"""
diff --git a/src/cloudflare/types/schema_validation/schema_delete_response.py b/src/cloudflare/types/schema_validation/schema_delete_response.py
new file mode 100644
index 00000000000..817ed421781
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/schema_delete_response.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["SchemaDeleteResponse"]
+
+
+class SchemaDeleteResponse(BaseModel):
+    id: str
+    """The ID of the schema that was just deleted"""
diff --git a/src/cloudflare/types/schema_validation/schema_edit_params.py b/src/cloudflare/types/schema_validation/schema_edit_params.py
new file mode 100644
index 00000000000..074e692fce5
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/schema_edit_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SchemaEditParams"]
+
+
+class SchemaEditParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    validation_enabled: bool
+    """Flag whether schema is enabled for validation."""
diff --git a/src/cloudflare/types/schema_validation/schema_get_params.py b/src/cloudflare/types/schema_validation/schema_get_params.py
new file mode 100644
index 00000000000..9da2522edf0
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/schema_get_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SchemaGetParams"]
+
+
+class SchemaGetParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    omit_source: bool
+    """Omit the source-files of schemas and only retrieve their meta-data."""
diff --git a/src/cloudflare/types/schema_validation/schema_list_params.py b/src/cloudflare/types/schema_validation/schema_list_params.py
new file mode 100644
index 00000000000..c286bdd8a5b
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/schema_list_params.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SchemaListParams"]
+
+
+class SchemaListParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    omit_source: bool
+    """Omit the source-files of schemas and only retrieve their meta-data."""
+
+    page: int
+    """Page number of paginated results."""
+
+    per_page: int
+    """Maximum number of results per page."""
+
+    validation_enabled: bool
+    """Filter for enabled schemas"""
diff --git a/src/cloudflare/types/schema_validation/setting_edit_params.py b/src/cloudflare/types/schema_validation/setting_edit_params.py
new file mode 100644
index 00000000000..81f3bd15537
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/setting_edit_params.py
@@ -0,0 +1,28 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["SettingEditParams"]
+
+
+class SettingEditParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    validation_default_mitigation_action: Literal["none", "log", "block"]
+    """The default mitigation action used Mitigation actions are as follows:
+
+    - `"log"` - log request when request does not conform to schema
+    - `"block"` - deny access to the site when request does not conform to schema
+    - `"none"` - skip running schema validation
+    """
+
+    validation_override_mitigation_action: Optional[Literal["none"]]
+    """When set, this overrides both zone level and operation level mitigation actions.
+
+    - `"none"` - skip running schema validation entirely for the request
+    - `null` - clears any existing override
+    """
diff --git a/src/cloudflare/types/schema_validation/setting_edit_response.py b/src/cloudflare/types/schema_validation/setting_edit_response.py
new file mode 100644
index 00000000000..9bde4c59278
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/setting_edit_response.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["SettingEditResponse"]
+
+
+class SettingEditResponse(BaseModel):
+    validation_default_mitigation_action: Literal["none", "log", "block"]
+    """The default mitigation action used
+
+    Mitigation actions are as follows:
+
+    - `log` - log request when request does not conform to schema
+    - `block` - deny access to the site when request does not conform to schema
+    - `none` - skip running schema validation
+    """
+
+    validation_override_mitigation_action: Optional[Literal["none"]] = None
+    """
+    When not null, this overrides global both zone level and operation level
+    mitigation actions. This can serve as a quick way to disable schema validation
+    for the whole zone.
+
+    - `"none"` will skip running schema validation entirely for the request
+    """
diff --git a/src/cloudflare/types/schema_validation/setting_get_response.py b/src/cloudflare/types/schema_validation/setting_get_response.py
new file mode 100644
index 00000000000..4fe8cb83d60
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/setting_get_response.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["SettingGetResponse"]
+
+
+class SettingGetResponse(BaseModel):
+    validation_default_mitigation_action: Literal["none", "log", "block"]
+    """The default mitigation action used
+
+    Mitigation actions are as follows:
+
+    - `log` - log request when request does not conform to schema
+    - `block` - deny access to the site when request does not conform to schema
+    - `none` - skip running schema validation
+    """
+
+    validation_override_mitigation_action: Optional[Literal["none"]] = None
+    """
+    When not null, this overrides global both zone level and operation level
+    mitigation actions. This can serve as a quick way to disable schema validation
+    for the whole zone.
+
+    - `"none"` will skip running schema validation entirely for the request
+    """
diff --git a/src/cloudflare/types/schema_validation/setting_update_params.py b/src/cloudflare/types/schema_validation/setting_update_params.py
new file mode 100644
index 00000000000..c6e641c373c
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/setting_update_params.py
@@ -0,0 +1,28 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["SettingUpdateParams"]
+
+
+class SettingUpdateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    validation_default_mitigation_action: Required[Literal["none", "log", "block"]]
+    """The default mitigation action used Mitigation actions are as follows:
+
+    - `"log"` - log request when request does not conform to schema
+    - `"block"` - deny access to the site when request does not conform to schema
+    - `"none"` - skip running schema validation
+    """
+
+    validation_override_mitigation_action: Optional[Literal["none"]]
+    """When set, this overrides both zone level and operation level mitigation actions.
+
+    - `"none"` - skip running schema validation entirely for the request
+    - `null` - clears any existing override
+    """
diff --git a/src/cloudflare/types/schema_validation/setting_update_response.py b/src/cloudflare/types/schema_validation/setting_update_response.py
new file mode 100644
index 00000000000..d66dec69db1
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/setting_update_response.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["SettingUpdateResponse"]
+
+
+class SettingUpdateResponse(BaseModel):
+    validation_default_mitigation_action: Literal["none", "log", "block"]
+    """The default mitigation action used
+
+    Mitigation actions are as follows:
+
+    - `log` - log request when request does not conform to schema
+    - `block` - deny access to the site when request does not conform to schema
+    - `none` - skip running schema validation
+    """
+
+    validation_override_mitigation_action: Optional[Literal["none"]] = None
+    """
+    When not null, this overrides global both zone level and operation level
+    mitigation actions. This can serve as a quick way to disable schema validation
+    for the whole zone.
+
+    - `"none"` will skip running schema validation entirely for the request
+    """
diff --git a/src/cloudflare/types/schema_validation/settings/__init__.py b/src/cloudflare/types/schema_validation/settings/__init__.py
new file mode 100644
index 00000000000..8700044fac9
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/settings/__init__.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .operation_list_params import OperationListParams as OperationListParams
+from .operation_get_response import OperationGetResponse as OperationGetResponse
+from .operation_list_response import OperationListResponse as OperationListResponse
+from .operation_update_params import OperationUpdateParams as OperationUpdateParams
+from .operation_delete_response import OperationDeleteResponse as OperationDeleteResponse
+from .operation_update_response import OperationUpdateResponse as OperationUpdateResponse
+from .operation_bulk_edit_params import OperationBulkEditParams as OperationBulkEditParams
+from .operation_bulk_edit_response import OperationBulkEditResponse as OperationBulkEditResponse
diff --git a/src/cloudflare/types/schema_validation/settings/operation_bulk_edit_params.py b/src/cloudflare/types/schema_validation/settings/operation_bulk_edit_params.py
new file mode 100644
index 00000000000..d1ce1c2c929
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/settings/operation_bulk_edit_params.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Optional
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["OperationBulkEditParams", "Body"]
+
+
+class OperationBulkEditParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    body: Required[Dict[str, Body]]
+
+
+class Body(TypedDict, total=False):
+    """Operation ID to mitigation action mappings"""
+
+    mitigation_action: Optional[Literal["none", "log", "block"]]
+    """Mitigation actions are as follows:
+
+    - `log` - log request when request does not conform to schema _ `block` - deny
+      access to the site when request does not conform to schema _ `none` - skip
+      running schema validation \\** null - clears any existing per-operation setting
+    """
diff --git a/src/cloudflare/types/schema_validation/settings/operation_bulk_edit_response.py b/src/cloudflare/types/schema_validation/settings/operation_bulk_edit_response.py
new file mode 100644
index 00000000000..f2b2a108cde
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/settings/operation_bulk_edit_response.py
@@ -0,0 +1,28 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict
+from typing_extensions import Literal, TypeAlias
+
+from ...._models import BaseModel
+
+__all__ = ["OperationBulkEditResponse", "OperationBulkEditResponseItem"]
+
+
+class OperationBulkEditResponseItem(BaseModel):
+    mitigation_action: Literal["log", "block", "none"]
+    """
+    When set, this applies a mitigation action to this operation which supersedes a
+    global schema validation setting just for this operation
+
+    - `"log"` - log request when request does not conform to schema for this
+      operation
+    - `"block"` - deny access to the site when request does not conform to schema
+      for this operation
+    - `"none"` - will skip mitigation for this operation
+    """
+
+    operation_id: str
+    """UUID."""
+
+
+OperationBulkEditResponse: TypeAlias = Dict[str, OperationBulkEditResponseItem]
diff --git a/src/cloudflare/types/schema_validation/settings/operation_delete_response.py b/src/cloudflare/types/schema_validation/settings/operation_delete_response.py
new file mode 100644
index 00000000000..3c75e5cdf78
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/settings/operation_delete_response.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ...._models import BaseModel
+
+__all__ = ["OperationDeleteResponse"]
+
+
+class OperationDeleteResponse(BaseModel):
+    operation_id: Optional[str] = None
+    """UUID."""
diff --git a/src/cloudflare/types/schema_validation/settings/operation_get_response.py b/src/cloudflare/types/schema_validation/settings/operation_get_response.py
new file mode 100644
index 00000000000..2c96342cfd3
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/settings/operation_get_response.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["OperationGetResponse"]
+
+
+class OperationGetResponse(BaseModel):
+    mitigation_action: Literal["log", "block", "none"]
+    """
+    When set, this applies a mitigation action to this operation which supersedes a
+    global schema validation setting just for this operation
+
+    - `"log"` - log request when request does not conform to schema for this
+      operation
+    - `"block"` - deny access to the site when request does not conform to schema
+      for this operation
+    - `"none"` - will skip mitigation for this operation
+    """
+
+    operation_id: str
+    """UUID."""
diff --git a/src/cloudflare/types/schema_validation/settings/operation_list_params.py b/src/cloudflare/types/schema_validation/settings/operation_list_params.py
new file mode 100644
index 00000000000..79851b36335
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/settings/operation_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["OperationListParams"]
+
+
+class OperationListParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    page: int
+    """Page number of paginated results."""
+
+    per_page: int
+    """Maximum number of results per page."""
diff --git a/src/cloudflare/types/schema_validation/settings/operation_list_response.py b/src/cloudflare/types/schema_validation/settings/operation_list_response.py
new file mode 100644
index 00000000000..ceee0bcb378
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/settings/operation_list_response.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["OperationListResponse"]
+
+
+class OperationListResponse(BaseModel):
+    mitigation_action: Literal["log", "block", "none"]
+    """
+    When set, this applies a mitigation action to this operation which supersedes a
+    global schema validation setting just for this operation
+
+    - `"log"` - log request when request does not conform to schema for this
+      operation
+    - `"block"` - deny access to the site when request does not conform to schema
+      for this operation
+    - `"none"` - will skip mitigation for this operation
+    """
+
+    operation_id: str
+    """UUID."""
diff --git a/src/cloudflare/types/schema_validation/settings/operation_update_params.py b/src/cloudflare/types/schema_validation/settings/operation_update_params.py
new file mode 100644
index 00000000000..34cd95b5fc1
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/settings/operation_update_params.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["OperationUpdateParams"]
+
+
+class OperationUpdateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    mitigation_action: Required[Optional[Literal["log", "block", "none"]]]
+    """When set, this applies a mitigation action to this operation
+
+    - `"log"` - log request when request does not conform to schema for this
+      operation
+    - `"block"` - deny access to the site when request does not conform to schema
+      for this operation
+    - `"none"` - will skip mitigation for this operation
+    - `null` - clears any mitigation action
+    """
diff --git a/src/cloudflare/types/schema_validation/settings/operation_update_response.py b/src/cloudflare/types/schema_validation/settings/operation_update_response.py
new file mode 100644
index 00000000000..54a0c098717
--- /dev/null
+++ b/src/cloudflare/types/schema_validation/settings/operation_update_response.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["OperationUpdateResponse"]
+
+
+class OperationUpdateResponse(BaseModel):
+    mitigation_action: Literal["log", "block", "none"]
+    """
+    When set, this applies a mitigation action to this operation which supersedes a
+    global schema validation setting just for this operation
+
+    - `"log"` - log request when request does not conform to schema for this
+      operation
+    - `"block"` - deny access to the site when request does not conform to schema
+      for this operation
+    - `"none"` - will skip mitigation for this operation
+    """
+
+    operation_id: str
+    """UUID."""
diff --git a/src/cloudflare/types/secondary_dns/acl_create_params.py b/src/cloudflare/types/secondary_dns/acl_create_params.py
deleted file mode 100644
index 9fdd713a6ac..00000000000
--- a/src/cloudflare/types/secondary_dns/acl_create_params.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["ACLCreateParams"]
-
-
-class ACLCreateParams(TypedDict, total=False):
-    account_id: Required[str]
-
-    body: Required[object]
diff --git a/src/cloudflare/types/secondary_dns/disable_transfer.py b/src/cloudflare/types/secondary_dns/disable_transfer.py
deleted file mode 100644
index 2fe723b6626..00000000000
--- a/src/cloudflare/types/secondary_dns/disable_transfer.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-__all__ = ["DisableTransfer"]
-
-DisableTransfer = str
diff --git a/src/cloudflare/types/secondary_dns/enable_transfer.py b/src/cloudflare/types/secondary_dns/enable_transfer.py
deleted file mode 100644
index a26d91b7bb8..00000000000
--- a/src/cloudflare/types/secondary_dns/enable_transfer.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-__all__ = ["EnableTransfer"]
-
-EnableTransfer = str
diff --git a/src/cloudflare/types/secondary_dns/force_axfr.py b/src/cloudflare/types/secondary_dns/force_axfr.py
deleted file mode 100644
index a70773f1b4e..00000000000
--- a/src/cloudflare/types/secondary_dns/force_axfr.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-__all__ = ["ForceAXFR"]
-
-ForceAXFR = str
diff --git a/src/cloudflare/types/secondary_dns/incoming.py b/src/cloudflare/types/secondary_dns/incoming.py
deleted file mode 100644
index 026e5c4c043..00000000000
--- a/src/cloudflare/types/secondary_dns/incoming.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from ..._models import BaseModel
-
-__all__ = ["Incoming"]
-
-
-class Incoming(BaseModel):
-    id: Optional[str] = None
-
-    auto_refresh_seconds: Optional[float] = None
-    """
-    How often should a secondary zone auto refresh regardless of DNS NOTIFY. Not
-    applicable for primary zones.
-    """
-
-    checked_time: Optional[str] = None
-    """The time for a specific event."""
-
-    created_time: Optional[str] = None
-    """The time for a specific event."""
-
-    modified_time: Optional[str] = None
-    """The time for a specific event."""
-
-    name: Optional[str] = None
-    """Zone name."""
-
-    peers: Optional[List[object]] = None
-    """A list of peer tags."""
-
-    soa_serial: Optional[float] = None
-    """The serial number of the SOA for the given zone."""
diff --git a/src/cloudflare/types/secondary_dns/outgoing/outgoing.py b/src/cloudflare/types/secondary_dns/outgoing/outgoing.py
deleted file mode 100644
index 59d9ef2378b..00000000000
--- a/src/cloudflare/types/secondary_dns/outgoing/outgoing.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from ...._models import BaseModel
-
-__all__ = ["Outgoing"]
-
-
-class Outgoing(BaseModel):
-    id: Optional[str] = None
-
-    checked_time: Optional[str] = None
-    """The time for a specific event."""
-
-    created_time: Optional[str] = None
-    """The time for a specific event."""
-
-    last_transferred_time: Optional[str] = None
-    """The time for a specific event."""
-
-    name: Optional[str] = None
-    """Zone name."""
-
-    peers: Optional[List[object]] = None
-    """A list of peer tags."""
-
-    soa_serial: Optional[float] = None
-    """The serial number of the SOA for the given zone."""
diff --git a/src/cloudflare/types/secondary_dns/outgoing_force_notify_response.py b/src/cloudflare/types/secondary_dns/outgoing_force_notify_response.py
deleted file mode 100644
index 8604fc2e9ec..00000000000
--- a/src/cloudflare/types/secondary_dns/outgoing_force_notify_response.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-__all__ = ["OutgoingForceNotifyResponse"]
-
-OutgoingForceNotifyResponse = str
diff --git a/src/cloudflare/types/secondary_dns/outgoing_status.py b/src/cloudflare/types/secondary_dns/outgoing_status.py
deleted file mode 100644
index df54f14d58a..00000000000
--- a/src/cloudflare/types/secondary_dns/outgoing_status.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-__all__ = ["OutgoingStatus"]
-
-OutgoingStatus = Optional[str]
diff --git a/src/cloudflare/types/secrets_store/__init__.py b/src/cloudflare/types/secrets_store/__init__.py
new file mode 100644
index 00000000000..a2143263a1a
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/__init__.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .store_list_params import StoreListParams as StoreListParams
+from .quota_get_response import QuotaGetResponse as QuotaGetResponse
+from .store_create_params import StoreCreateParams as StoreCreateParams
+from .store_list_response import StoreListResponse as StoreListResponse
+from .store_create_response import StoreCreateResponse as StoreCreateResponse
+from .store_delete_response import StoreDeleteResponse as StoreDeleteResponse
diff --git a/src/cloudflare/types/secrets_store/quota_get_response.py b/src/cloudflare/types/secrets_store/quota_get_response.py
new file mode 100644
index 00000000000..f0e1d9646e8
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/quota_get_response.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["QuotaGetResponse", "Secrets"]
+
+
+class Secrets(BaseModel):
+    quota: float
+    """The number of secrets the account is entitlted to use"""
+
+    usage: float
+    """The number of secrets the account is currently using"""
+
+
+class QuotaGetResponse(BaseModel):
+    secrets: Secrets
diff --git a/src/cloudflare/types/secrets_store/store_create_params.py b/src/cloudflare/types/secrets_store/store_create_params.py
new file mode 100644
index 00000000000..970a78399e1
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/store_create_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["StoreCreateParams", "Body"]
+
+
+class StoreCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    body: Required[Iterable[Body]]
+
+
+class Body(TypedDict, total=False):
+    name: Required[str]
+    """The name of the store"""
diff --git a/src/cloudflare/types/secrets_store/store_create_response.py b/src/cloudflare/types/secrets_store/store_create_response.py
new file mode 100644
index 00000000000..4f9313f0821
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/store_create_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["StoreCreateResponse"]
+
+
+class StoreCreateResponse(BaseModel):
+    id: str
+    """Store Identifier"""
+
+    created: datetime
+    """Whenthe secret was created."""
+
+    modified: datetime
+    """When the secret was modified."""
+
+    name: str
+    """The name of the store"""
diff --git a/src/cloudflare/types/secrets_store/store_delete_response.py b/src/cloudflare/types/secrets_store/store_delete_response.py
new file mode 100644
index 00000000000..62bb6be60eb
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/store_delete_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["StoreDeleteResponse"]
+
+
+class StoreDeleteResponse(BaseModel):
+    id: str
+    """Store Identifier"""
+
+    created: datetime
+    """Whenthe secret was created."""
+
+    modified: datetime
+    """When the secret was modified."""
+
+    name: str
+    """The name of the store"""
diff --git a/src/cloudflare/types/secrets_store/store_list_params.py b/src/cloudflare/types/secrets_store/store_list_params.py
new file mode 100644
index 00000000000..19d56210b25
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/store_list_params.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["StoreListParams"]
+
+
+class StoreListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    direction: Literal["asc", "desc"]
+    """Direction to sort objects"""
+
+    order: Literal["name", "comment", "created", "modified", "status"]
+    """Order secrets by values in the given field"""
+
+    page: int
+    """Page number"""
+
+    per_page: int
+    """Number of objects to return per page"""
diff --git a/src/cloudflare/types/secrets_store/store_list_response.py b/src/cloudflare/types/secrets_store/store_list_response.py
new file mode 100644
index 00000000000..b7636ffe092
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/store_list_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["StoreListResponse"]
+
+
+class StoreListResponse(BaseModel):
+    id: str
+    """Store Identifier"""
+
+    created: datetime
+    """Whenthe secret was created."""
+
+    modified: datetime
+    """When the secret was modified."""
+
+    name: str
+    """The name of the store"""
diff --git a/src/cloudflare/types/secrets_store/stores/__init__.py b/src/cloudflare/types/secrets_store/stores/__init__.py
new file mode 100644
index 00000000000..1d28c24db00
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/stores/__init__.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .secret_edit_params import SecretEditParams as SecretEditParams
+from .secret_list_params import SecretListParams as SecretListParams
+from .secret_get_response import SecretGetResponse as SecretGetResponse
+from .secret_create_params import SecretCreateParams as SecretCreateParams
+from .secret_edit_response import SecretEditResponse as SecretEditResponse
+from .secret_list_response import SecretListResponse as SecretListResponse
+from .secret_create_response import SecretCreateResponse as SecretCreateResponse
+from .secret_delete_response import SecretDeleteResponse as SecretDeleteResponse
+from .secret_duplicate_params import SecretDuplicateParams as SecretDuplicateParams
+from .secret_duplicate_response import SecretDuplicateResponse as SecretDuplicateResponse
+from .secret_bulk_delete_response import SecretBulkDeleteResponse as SecretBulkDeleteResponse
diff --git a/src/cloudflare/types/secrets_store/stores/secret_bulk_delete_response.py b/src/cloudflare/types/secrets_store/stores/secret_bulk_delete_response.py
new file mode 100644
index 00000000000..d7f8d685d3f
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/stores/secret_bulk_delete_response.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["SecretBulkDeleteResponse"]
+
+
+class SecretBulkDeleteResponse(BaseModel):
+    id: str
+    """Secret identifier tag."""
+
+    created: datetime
+    """Whenthe secret was created."""
+
+    modified: datetime
+    """When the secret was modified."""
+
+    name: str
+    """The name of the secret"""
+
+    status: Literal["pending", "active", "deleted"]
+
+    store_id: str
+    """Store Identifier"""
+
+    comment: Optional[str] = None
+    """Freeform text describing the secret"""
diff --git a/src/cloudflare/types/secrets_store/stores/secret_create_params.py b/src/cloudflare/types/secrets_store/stores/secret_create_params.py
new file mode 100644
index 00000000000..be39d5aa745
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/stores/secret_create_params.py
@@ -0,0 +1,35 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["SecretCreateParams", "Body"]
+
+
+class SecretCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    body: Required[Iterable[Body]]
+
+
+class Body(TypedDict, total=False):
+    name: Required[str]
+    """The name of the secret"""
+
+    scopes: Required[SequenceNotStr[str]]
+    """The list of services that can use this secret."""
+
+    value: Required[str]
+    """The value of the secret.
+
+    Note that this is 'write only' - no API reponse will provide this value, it is
+    only used to create/modify secrets.
+    """
+
+    comment: str
+    """Freeform text describing the secret"""
diff --git a/src/cloudflare/types/secrets_store/stores/secret_create_response.py b/src/cloudflare/types/secrets_store/stores/secret_create_response.py
new file mode 100644
index 00000000000..18e07afb972
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/stores/secret_create_response.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["SecretCreateResponse"]
+
+
+class SecretCreateResponse(BaseModel):
+    id: str
+    """Secret identifier tag."""
+
+    created: datetime
+    """Whenthe secret was created."""
+
+    modified: datetime
+    """When the secret was modified."""
+
+    name: str
+    """The name of the secret"""
+
+    status: Literal["pending", "active", "deleted"]
+
+    store_id: str
+    """Store Identifier"""
+
+    comment: Optional[str] = None
+    """Freeform text describing the secret"""
diff --git a/src/cloudflare/types/secrets_store/stores/secret_delete_response.py b/src/cloudflare/types/secrets_store/stores/secret_delete_response.py
new file mode 100644
index 00000000000..5b51feb670a
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/stores/secret_delete_response.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["SecretDeleteResponse"]
+
+
+class SecretDeleteResponse(BaseModel):
+    id: str
+    """Secret identifier tag."""
+
+    created: datetime
+    """Whenthe secret was created."""
+
+    modified: datetime
+    """When the secret was modified."""
+
+    name: str
+    """The name of the secret"""
+
+    status: Literal["pending", "active", "deleted"]
+
+    store_id: str
+    """Store Identifier"""
+
+    comment: Optional[str] = None
+    """Freeform text describing the secret"""
diff --git a/src/cloudflare/types/secrets_store/stores/secret_duplicate_params.py b/src/cloudflare/types/secrets_store/stores/secret_duplicate_params.py
new file mode 100644
index 00000000000..73a262b30a7
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/stores/secret_duplicate_params.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["SecretDuplicateParams"]
+
+
+class SecretDuplicateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    store_id: Required[str]
+    """Store Identifier"""
+
+    name: Required[str]
+    """The name of the secret"""
+
+    scopes: Required[SequenceNotStr[str]]
+    """The list of services that can use this secret."""
+
+    comment: str
+    """Freeform text describing the secret"""
diff --git a/src/cloudflare/types/secrets_store/stores/secret_duplicate_response.py b/src/cloudflare/types/secrets_store/stores/secret_duplicate_response.py
new file mode 100644
index 00000000000..93e4a79ab0b
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/stores/secret_duplicate_response.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["SecretDuplicateResponse"]
+
+
+class SecretDuplicateResponse(BaseModel):
+    id: str
+    """Secret identifier tag."""
+
+    created: datetime
+    """Whenthe secret was created."""
+
+    modified: datetime
+    """When the secret was modified."""
+
+    name: str
+    """The name of the secret"""
+
+    status: Literal["pending", "active", "deleted"]
+
+    store_id: str
+    """Store Identifier"""
+
+    comment: Optional[str] = None
+    """Freeform text describing the secret"""
diff --git a/src/cloudflare/types/secrets_store/stores/secret_edit_params.py b/src/cloudflare/types/secrets_store/stores/secret_edit_params.py
new file mode 100644
index 00000000000..b3913192626
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/stores/secret_edit_params.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["SecretEditParams"]
+
+
+class SecretEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    store_id: Required[str]
+    """Store Identifier"""
+
+    comment: str
+    """Freeform text describing the secret"""
+
+    scopes: SequenceNotStr[str]
+    """The list of services that can use this secret."""
diff --git a/src/cloudflare/types/secrets_store/stores/secret_edit_response.py b/src/cloudflare/types/secrets_store/stores/secret_edit_response.py
new file mode 100644
index 00000000000..b1e3825062a
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/stores/secret_edit_response.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["SecretEditResponse"]
+
+
+class SecretEditResponse(BaseModel):
+    id: str
+    """Secret identifier tag."""
+
+    created: datetime
+    """Whenthe secret was created."""
+
+    modified: datetime
+    """When the secret was modified."""
+
+    name: str
+    """The name of the secret"""
+
+    status: Literal["pending", "active", "deleted"]
+
+    store_id: str
+    """Store Identifier"""
+
+    comment: Optional[str] = None
+    """Freeform text describing the secret"""
diff --git a/src/cloudflare/types/secrets_store/stores/secret_get_response.py b/src/cloudflare/types/secrets_store/stores/secret_get_response.py
new file mode 100644
index 00000000000..b72fd09e907
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/stores/secret_get_response.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["SecretGetResponse"]
+
+
+class SecretGetResponse(BaseModel):
+    id: str
+    """Secret identifier tag."""
+
+    created: datetime
+    """Whenthe secret was created."""
+
+    modified: datetime
+    """When the secret was modified."""
+
+    name: str
+    """The name of the secret"""
+
+    status: Literal["pending", "active", "deleted"]
+
+    store_id: str
+    """Store Identifier"""
+
+    comment: Optional[str] = None
+    """Freeform text describing the secret"""
diff --git a/src/cloudflare/types/secrets_store/stores/secret_list_params.py b/src/cloudflare/types/secrets_store/stores/secret_list_params.py
new file mode 100644
index 00000000000..ad101503e83
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/stores/secret_list_params.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Literal, Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["SecretListParams"]
+
+
+class SecretListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account Identifier"""
+
+    direction: Literal["asc", "desc"]
+    """Direction to sort objects"""
+
+    order: Literal["name", "comment", "created", "modified", "status"]
+    """Order secrets by values in the given field"""
+
+    page: int
+    """Page number"""
+
+    per_page: int
+    """Number of objects to return per page"""
+
+    scopes: Iterable[SequenceNotStr[str]]
+    """Only secrets with the given scopes will be returned"""
+
+    search: str
+    """Search secrets using a filter string, filtering across name and comment"""
diff --git a/src/cloudflare/types/secrets_store/stores/secret_list_response.py b/src/cloudflare/types/secrets_store/stores/secret_list_response.py
new file mode 100644
index 00000000000..5d12145367e
--- /dev/null
+++ b/src/cloudflare/types/secrets_store/stores/secret_list_response.py
@@ -0,0 +1,31 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["SecretListResponse"]
+
+
+class SecretListResponse(BaseModel):
+    id: str
+    """Secret identifier tag."""
+
+    created: datetime
+    """Whenthe secret was created."""
+
+    modified: datetime
+    """When the secret was modified."""
+
+    name: str
+    """The name of the secret"""
+
+    status: Literal["pending", "active", "deleted"]
+
+    store_id: str
+    """Store Identifier"""
+
+    comment: Optional[str] = None
+    """Freeform text describing the secret"""
diff --git a/src/cloudflare/types/security_center/__init__.py b/src/cloudflare/types/security_center/__init__.py
new file mode 100644
index 00000000000..34e1627b271
--- /dev/null
+++ b/src/cloudflare/types/security_center/__init__.py
@@ -0,0 +1,8 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .insight_list_params import InsightListParams as InsightListParams
+from .insight_list_response import InsightListResponse as InsightListResponse
+from .insight_dismiss_params import InsightDismissParams as InsightDismissParams
+from .insight_dismiss_response import InsightDismissResponse as InsightDismissResponse
diff --git a/src/cloudflare/types/security_center/insight_dismiss_params.py b/src/cloudflare/types/security_center/insight_dismiss_params.py
new file mode 100644
index 00000000000..b4209f9bed2
--- /dev/null
+++ b/src/cloudflare/types/security_center/insight_dismiss_params.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import TypedDict
+
+__all__ = ["InsightDismissParams"]
+
+
+class InsightDismissParams(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    dismiss: bool
diff --git a/src/cloudflare/types/security_center/insight_dismiss_response.py b/src/cloudflare/types/security_center/insight_dismiss_response.py
new file mode 100644
index 00000000000..4d2beb819f9
--- /dev/null
+++ b/src/cloudflare/types/security_center/insight_dismiss_response.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["InsightDismissResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class InsightDismissResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/security_center/insight_list_params.py b/src/cloudflare/types/security_center/insight_list_params.py
new file mode 100644
index 00000000000..82b4735f192
--- /dev/null
+++ b/src/cloudflare/types/security_center/insight_list_params.py
@@ -0,0 +1,49 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List
+from typing_extensions import Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+from ..intel.attack_surface_report.issue_type import IssueType
+from ..intel.attack_surface_report.severity_query_param import SeverityQueryParam
+
+__all__ = ["InsightListParams"]
+
+
+class InsightListParams(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    dismissed: bool
+
+    issue_class: SequenceNotStr[str]
+
+    issue_class_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="issue_class~neq")]
+
+    issue_type: List[IssueType]
+
+    issue_type_neq: Annotated[List[IssueType], PropertyInfo(alias="issue_type~neq")]
+
+    page: int
+    """Specifies the current page within paginated list of results."""
+
+    per_page: int
+    """Sets the number of results per page of results."""
+
+    product: SequenceNotStr[str]
+
+    product_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="product~neq")]
+
+    severity: List[SeverityQueryParam]
+
+    severity_neq: Annotated[List[SeverityQueryParam], PropertyInfo(alias="severity~neq")]
+
+    subject: SequenceNotStr[str]
+
+    subject_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="subject~neq")]
diff --git a/src/cloudflare/types/security_center/insight_list_response.py b/src/cloudflare/types/security_center/insight_list_response.py
new file mode 100644
index 00000000000..5155f372745
--- /dev/null
+++ b/src/cloudflare/types/security_center/insight_list_response.py
@@ -0,0 +1,54 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+from ..intel.attack_surface_report.issue_type import IssueType
+
+__all__ = ["InsightListResponse", "Issue", "IssuePayload"]
+
+
+class IssuePayload(BaseModel):
+    detection_method: Optional[str] = None
+    """Describes the method used to detect insight."""
+
+    zone_tag: Optional[str] = None
+
+
+class Issue(BaseModel):
+    id: Optional[str] = None
+
+    dismissed: Optional[bool] = None
+
+    issue_class: Optional[str] = None
+
+    issue_type: Optional[IssueType] = None
+
+    payload: Optional[IssuePayload] = None
+
+    resolve_link: Optional[str] = None
+
+    resolve_text: Optional[str] = None
+
+    severity: Optional[Literal["Low", "Moderate", "Critical"]] = None
+
+    since: Optional[datetime] = None
+
+    subject: Optional[str] = None
+
+    timestamp: Optional[datetime] = None
+
+
+class InsightListResponse(BaseModel):
+    count: Optional[int] = None
+    """Indicates the total number of results."""
+
+    issues: Optional[List[Issue]] = None
+
+    page: Optional[int] = None
+    """Specifies the current page within paginated list of results."""
+
+    per_page: Optional[int] = None
+    """Sets the number of results per page of results."""
diff --git a/src/cloudflare/types/security_center/insights/__init__.py b/src/cloudflare/types/security_center/insights/__init__.py
new file mode 100644
index 00000000000..adb9484cde5
--- /dev/null
+++ b/src/cloudflare/types/security_center/insights/__init__.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .type_get_params import TypeGetParams as TypeGetParams
+from .class_get_params import ClassGetParams as ClassGetParams
+from .type_get_response import TypeGetResponse as TypeGetResponse
+from .class_get_response import ClassGetResponse as ClassGetResponse
+from .severity_get_params import SeverityGetParams as SeverityGetParams
+from .severity_get_response import SeverityGetResponse as SeverityGetResponse
diff --git a/src/cloudflare/types/security_center/insights/class_get_params.py b/src/cloudflare/types/security_center/insights/class_get_params.py
new file mode 100644
index 00000000000..39065fc0b7f
--- /dev/null
+++ b/src/cloudflare/types/security_center/insights/class_get_params.py
@@ -0,0 +1,43 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List
+from typing_extensions import Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+from ...intel.attack_surface_report.issue_type import IssueType
+from ...intel.attack_surface_report.severity_query_param import SeverityQueryParam
+
+__all__ = ["ClassGetParams"]
+
+
+class ClassGetParams(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    dismissed: bool
+
+    issue_class: SequenceNotStr[str]
+
+    issue_class_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="issue_class~neq")]
+
+    issue_type: List[IssueType]
+
+    issue_type_neq: Annotated[List[IssueType], PropertyInfo(alias="issue_type~neq")]
+
+    product: SequenceNotStr[str]
+
+    product_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="product~neq")]
+
+    severity: List[SeverityQueryParam]
+
+    severity_neq: Annotated[List[SeverityQueryParam], PropertyInfo(alias="severity~neq")]
+
+    subject: SequenceNotStr[str]
+
+    subject_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="subject~neq")]
diff --git a/src/cloudflare/types/security_center/insights/class_get_response.py b/src/cloudflare/types/security_center/insights/class_get_response.py
new file mode 100644
index 00000000000..b5c2898329f
--- /dev/null
+++ b/src/cloudflare/types/security_center/insights/class_get_response.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import TypeAlias
+
+from ...._models import BaseModel
+
+__all__ = ["ClassGetResponse", "ClassGetResponseItem"]
+
+
+class ClassGetResponseItem(BaseModel):
+    count: Optional[int] = None
+
+    value: Optional[str] = None
+
+
+ClassGetResponse: TypeAlias = List[ClassGetResponseItem]
diff --git a/src/cloudflare/types/security_center/insights/severity_get_params.py b/src/cloudflare/types/security_center/insights/severity_get_params.py
new file mode 100644
index 00000000000..bc3796c0d6d
--- /dev/null
+++ b/src/cloudflare/types/security_center/insights/severity_get_params.py
@@ -0,0 +1,43 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List
+from typing_extensions import Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+from ...intel.attack_surface_report.issue_type import IssueType
+from ...intel.attack_surface_report.severity_query_param import SeverityQueryParam
+
+__all__ = ["SeverityGetParams"]
+
+
+class SeverityGetParams(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    dismissed: bool
+
+    issue_class: SequenceNotStr[str]
+
+    issue_class_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="issue_class~neq")]
+
+    issue_type: List[IssueType]
+
+    issue_type_neq: Annotated[List[IssueType], PropertyInfo(alias="issue_type~neq")]
+
+    product: SequenceNotStr[str]
+
+    product_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="product~neq")]
+
+    severity: List[SeverityQueryParam]
+
+    severity_neq: Annotated[List[SeverityQueryParam], PropertyInfo(alias="severity~neq")]
+
+    subject: SequenceNotStr[str]
+
+    subject_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="subject~neq")]
diff --git a/src/cloudflare/types/security_center/insights/severity_get_response.py b/src/cloudflare/types/security_center/insights/severity_get_response.py
new file mode 100644
index 00000000000..a8148abb332
--- /dev/null
+++ b/src/cloudflare/types/security_center/insights/severity_get_response.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import TypeAlias
+
+from ...._models import BaseModel
+
+__all__ = ["SeverityGetResponse", "SeverityGetResponseItem"]
+
+
+class SeverityGetResponseItem(BaseModel):
+    count: Optional[int] = None
+
+    value: Optional[str] = None
+
+
+SeverityGetResponse: TypeAlias = List[SeverityGetResponseItem]
diff --git a/src/cloudflare/types/security_center/insights/type_get_params.py b/src/cloudflare/types/security_center/insights/type_get_params.py
new file mode 100644
index 00000000000..dd0853d0119
--- /dev/null
+++ b/src/cloudflare/types/security_center/insights/type_get_params.py
@@ -0,0 +1,43 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List
+from typing_extensions import Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+from ...intel.attack_surface_report.issue_type import IssueType
+from ...intel.attack_surface_report.severity_query_param import SeverityQueryParam
+
+__all__ = ["TypeGetParams"]
+
+
+class TypeGetParams(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    dismissed: bool
+
+    issue_class: SequenceNotStr[str]
+
+    issue_class_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="issue_class~neq")]
+
+    issue_type: List[IssueType]
+
+    issue_type_neq: Annotated[List[IssueType], PropertyInfo(alias="issue_type~neq")]
+
+    product: SequenceNotStr[str]
+
+    product_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="product~neq")]
+
+    severity: List[SeverityQueryParam]
+
+    severity_neq: Annotated[List[SeverityQueryParam], PropertyInfo(alias="severity~neq")]
+
+    subject: SequenceNotStr[str]
+
+    subject_neq: Annotated[SequenceNotStr[str], PropertyInfo(alias="subject~neq")]
diff --git a/src/cloudflare/types/security_center/insights/type_get_response.py b/src/cloudflare/types/security_center/insights/type_get_response.py
new file mode 100644
index 00000000000..eae4a597510
--- /dev/null
+++ b/src/cloudflare/types/security_center/insights/type_get_response.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import TypeAlias
+
+from ...._models import BaseModel
+
+__all__ = ["TypeGetResponse", "TypeGetResponseItem"]
+
+
+class TypeGetResponseItem(BaseModel):
+    count: Optional[int] = None
+
+    value: Optional[str] = None
+
+
+TypeGetResponse: TypeAlias = List[TypeGetResponseItem]
diff --git a/src/cloudflare/types/security_txt/__init__.py b/src/cloudflare/types/security_txt/__init__.py
new file mode 100644
index 00000000000..b21da777b26
--- /dev/null
+++ b/src/cloudflare/types/security_txt/__init__.py
@@ -0,0 +1,8 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .security_txt_get_response import SecurityTXTGetResponse as SecurityTXTGetResponse
+from .security_txt_update_params import SecurityTXTUpdateParams as SecurityTXTUpdateParams
+from .security_txt_delete_response import SecurityTXTDeleteResponse as SecurityTXTDeleteResponse
+from .security_txt_update_response import SecurityTXTUpdateResponse as SecurityTXTUpdateResponse
diff --git a/src/cloudflare/types/security_txt/security_txt_delete_response.py b/src/cloudflare/types/security_txt/security_txt_delete_response.py
new file mode 100644
index 00000000000..8c26f8a0cd3
--- /dev/null
+++ b/src/cloudflare/types/security_txt/security_txt_delete_response.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["SecurityTXTDeleteResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class SecurityTXTDeleteResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/security_txt/security_txt_get_response.py b/src/cloudflare/types/security_txt/security_txt_get_response.py
new file mode 100644
index 00000000000..21e896fb24a
--- /dev/null
+++ b/src/cloudflare/types/security_txt/security_txt_get_response.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["SecurityTXTGetResponse"]
+
+
+class SecurityTXTGetResponse(BaseModel):
+    acknowledgments: Optional[List[str]] = None
+
+    canonical: Optional[List[str]] = None
+
+    contact: Optional[List[str]] = None
+
+    enabled: Optional[bool] = None
+
+    encryption: Optional[List[str]] = None
+
+    expires: Optional[datetime] = None
+
+    hiring: Optional[List[str]] = None
+
+    policy: Optional[List[str]] = None
+
+    preferred_languages: Optional[str] = FieldInfo(alias="preferredLanguages", default=None)
diff --git a/src/cloudflare/types/security_txt/security_txt_update_params.py b/src/cloudflare/types/security_txt/security_txt_update_params.py
new file mode 100644
index 00000000000..cfd96dc16ac
--- /dev/null
+++ b/src/cloudflare/types/security_txt/security_txt_update_params.py
@@ -0,0 +1,35 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Required, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["SecurityTXTUpdateParams"]
+
+
+class SecurityTXTUpdateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    acknowledgments: SequenceNotStr[str]
+
+    canonical: SequenceNotStr[str]
+
+    contact: SequenceNotStr[str]
+
+    enabled: bool
+
+    encryption: SequenceNotStr[str]
+
+    expires: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+
+    hiring: SequenceNotStr[str]
+
+    policy: SequenceNotStr[str]
+
+    preferred_languages: Annotated[str, PropertyInfo(alias="preferredLanguages")]
diff --git a/src/cloudflare/types/security_txt/security_txt_update_response.py b/src/cloudflare/types/security_txt/security_txt_update_response.py
new file mode 100644
index 00000000000..07e99e8307e
--- /dev/null
+++ b/src/cloudflare/types/security_txt/security_txt_update_response.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["SecurityTXTUpdateResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class SecurityTXTUpdateResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/shared/__init__.py b/src/cloudflare/types/shared/__init__.py
index 51d5d9d5f14..7f78af40f62 100644
--- a/src/cloudflare/types/shared/__init__.py
+++ b/src/cloudflare/types/shared/__init__.py
@@ -2,17 +2,25 @@
 
 from .asn import ASN as ASN
 from .role import Role as Role
+from .token import Token as Token
 from .member import Member as Member
 from .result import Result as Result
 from .audit_log import AuditLog as AuditLog
+from .rate_plan import RatePlan as RatePlan
 from .error_data import ErrorData as ErrorData
 from .identifier import Identifier as Identifier
 from .permission import Permission as Permission
+from .token_value import TokenValue as TokenValue
+from .subscription import Subscription as Subscription
+from .token_policy import TokenPolicy as TokenPolicy
 from .response_info import ResponseInfo as ResponseInfo
 from .certificate_ca import CertificateCA as CertificateCA
 from .sort_direction import SortDirection as SortDirection
 from .pagination_info import PaginationInfo as PaginationInfo
 from .permission_grant import PermissionGrant as PermissionGrant
 from .cloudflare_tunnel import CloudflareTunnel as CloudflareTunnel
+from .subscription_zone import SubscriptionZone as SubscriptionZone
 from .load_balancer_preview import LoadBalancerPreview as LoadBalancerPreview
+from .subscription_component import SubscriptionComponent as SubscriptionComponent
 from .certificate_request_type import CertificateRequestType as CertificateRequestType
+from .token_condition_cidr_list import TokenConditionCIDRList as TokenConditionCIDRList
diff --git a/src/cloudflare/types/shared/asn.py b/src/cloudflare/types/shared/asn.py
index 6604efb8690..aaf595998ff 100644
--- a/src/cloudflare/types/shared/asn.py
+++ b/src/cloudflare/types/shared/asn.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["ASN"]
 
-ASN = int
+ASN: TypeAlias = int
diff --git a/src/cloudflare/types/shared/certificate_ca.py b/src/cloudflare/types/shared/certificate_ca.py
index bf610820022..469adf0af31 100644
--- a/src/cloudflare/types/shared/certificate_ca.py
+++ b/src/cloudflare/types/shared/certificate_ca.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["CertificateCA"]
 
-CertificateCA = Literal["digicert", "google", "lets_encrypt"]
+CertificateCA: TypeAlias = Literal["digicert", "google", "lets_encrypt", "ssl_com"]
diff --git a/src/cloudflare/types/shared/certificate_request_type.py b/src/cloudflare/types/shared/certificate_request_type.py
index dea937c3690..bfe03f42a2f 100644
--- a/src/cloudflare/types/shared/certificate_request_type.py
+++ b/src/cloudflare/types/shared/certificate_request_type.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["CertificateRequestType"]
 
-CertificateRequestType = Literal["origin-rsa", "origin-ecc", "keyless-certificate"]
+CertificateRequestType: TypeAlias = Literal["origin-rsa", "origin-ecc", "keyless-certificate"]
diff --git a/src/cloudflare/types/shared/cloudflare_tunnel.py b/src/cloudflare/types/shared/cloudflare_tunnel.py
index 9fbc6e6c16a..ed5105ddf09 100644
--- a/src/cloudflare/types/shared/cloudflare_tunnel.py
+++ b/src/cloudflare/types/shared/cloudflare_tunnel.py
@@ -41,12 +41,21 @@ class Connection(BaseModel):
 
 
 class CloudflareTunnel(BaseModel):
+    """A Cloudflare Tunnel that connects your origin to Cloudflare's edge."""
+
     id: Optional[str] = None
     """UUID of the tunnel."""
 
     account_tag: Optional[str] = None
     """Cloudflare account ID"""
 
+    config_src: Optional[Literal["local", "cloudflare"]] = None
+    """Indicates if this is a locally or remotely configured tunnel.
+
+    If `local`, manage the tunnel using a YAML file on the origin machine. If
+    `cloudflare`, manage the tunnel on the Zero Trust dashboard.
+    """
+
     connections: Optional[List[Connection]] = None
     """The Cloudflare Tunnel connections between your origin and Cloudflare's edge."""
 
@@ -92,5 +101,5 @@ class CloudflareTunnel(BaseModel):
     it has no connections to the Cloudflare Edge).
     """
 
-    tun_type: Optional[Literal["cfd_tunnel", "warp_connector", "ip_sec", "gre", "cni"]] = None
+    tun_type: Optional[Literal["cfd_tunnel", "warp_connector", "warp", "magic", "ip_sec", "gre", "cni"]] = None
     """The type of tunnel."""
diff --git a/src/cloudflare/types/shared/error_data.py b/src/cloudflare/types/shared/error_data.py
index e7621bcad3f..ad03d978862 100644
--- a/src/cloudflare/types/shared/error_data.py
+++ b/src/cloudflare/types/shared/error_data.py
@@ -4,10 +4,18 @@
 
 from ..._models import BaseModel
 
-__all__ = ["ErrorData"]
+__all__ = ["ErrorData", "Source"]
+
+
+class Source(BaseModel):
+    pointer: Optional[str] = None
 
 
 class ErrorData(BaseModel):
     code: Optional[int] = None
 
+    documentation_url: Optional[str] = None
+
     message: Optional[str] = None
+
+    source: Optional[Source] = None
diff --git a/src/cloudflare/types/shared/identifier.py b/src/cloudflare/types/shared/identifier.py
index f45e7984c3f..579d20e6d39 100644
--- a/src/cloudflare/types/shared/identifier.py
+++ b/src/cloudflare/types/shared/identifier.py
@@ -9,4 +9,4 @@
 
 class Identifier(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
diff --git a/src/cloudflare/types/shared/member.py b/src/cloudflare/types/shared/member.py
index c4282582d50..1beb3b0bac2 100644
--- a/src/cloudflare/types/shared/member.py
+++ b/src/cloudflare/types/shared/member.py
@@ -3,52 +3,111 @@
 from typing import List, Optional
 from typing_extensions import Literal
 
+from .role import Role
 from ..._models import BaseModel
-from .permission_grant import PermissionGrant
 
-__all__ = ["Member", "Role", "RolePermissions", "User"]
+__all__ = [
+    "Member",
+    "Policy",
+    "PolicyPermissionGroup",
+    "PolicyPermissionGroupMeta",
+    "PolicyResourceGroup",
+    "PolicyResourceGroupScope",
+    "PolicyResourceGroupScopeObject",
+    "PolicyResourceGroupMeta",
+    "User",
+]
 
 
-class RolePermissions(BaseModel):
-    analytics: Optional[PermissionGrant] = None
+class PolicyPermissionGroupMeta(BaseModel):
+    """Attributes associated to the permission group."""
 
-    billing: Optional[PermissionGrant] = None
+    key: Optional[str] = None
 
-    cache_purge: Optional[PermissionGrant] = None
+    value: Optional[str] = None
 
-    dns: Optional[PermissionGrant] = None
 
-    dns_records: Optional[PermissionGrant] = None
+class PolicyPermissionGroup(BaseModel):
+    """
+    A named group of permissions that map to a group of operations against resources.
+    """
+
+    id: str
+    """Identifier of the permission group."""
+
+    meta: Optional[PolicyPermissionGroupMeta] = None
+    """Attributes associated to the permission group."""
+
+    name: Optional[str] = None
+    """Name of the permission group."""
+
+
+class PolicyResourceGroupScopeObject(BaseModel):
+    """
+    A scope object represents any resource that can have actions applied against invite.
+    """
+
+    key: str
+    """
+    This is a combination of pre-defined resource name and identifier (like Zone ID
+    etc.)
+    """
+
 
-    lb: Optional[PermissionGrant] = None
+class PolicyResourceGroupScope(BaseModel):
+    """A scope is a combination of scope objects which provides additional context."""
 
-    logs: Optional[PermissionGrant] = None
+    key: str
+    """
+    This is a combination of pre-defined resource name and identifier (like Account
+    ID etc.)
+    """
 
-    organization: Optional[PermissionGrant] = None
+    objects: List[PolicyResourceGroupScopeObject]
+    """A list of scope objects for additional context."""
 
-    ssl: Optional[PermissionGrant] = None
 
-    waf: Optional[PermissionGrant] = None
+class PolicyResourceGroupMeta(BaseModel):
+    """Attributes associated to the resource group."""
 
-    zone_settings: Optional[PermissionGrant] = None
+    key: Optional[str] = None
 
-    zones: Optional[PermissionGrant] = None
+    value: Optional[str] = None
 
 
-class Role(BaseModel):
+class PolicyResourceGroup(BaseModel):
+    """A group of scoped resources."""
+
     id: str
-    """Role identifier tag."""
+    """Identifier of the resource group."""
+
+    scope: List[PolicyResourceGroupScope]
+    """The scope associated to the resource group"""
+
+    meta: Optional[PolicyResourceGroupMeta] = None
+    """Attributes associated to the resource group."""
+
+    name: Optional[str] = None
+    """Name of the resource group."""
+
 
-    description: str
-    """Description of role's permissions."""
+class Policy(BaseModel):
+    id: Optional[str] = None
+    """Policy identifier."""
+
+    access: Optional[Literal["allow", "deny"]] = None
+    """Allow or deny operations against the resources."""
 
-    name: str
-    """Role name."""
+    permission_groups: Optional[List[PolicyPermissionGroup]] = None
+    """A set of permission groups that are specified to the policy."""
 
-    permissions: RolePermissions
+    resource_groups: Optional[List[PolicyResourceGroup]] = None
+    """A list of resource groups that the policy applies to."""
 
 
 class User(BaseModel):
+    """Details of the user associated to the membership."""
+
     email: str
     """The contact email address of the user."""
 
@@ -72,8 +131,14 @@ class Member(BaseModel):
     id: Optional[str] = None
     """Membership identifier tag."""
 
+    email: Optional[str] = None
+    """The contact email address of the user."""
+
+    policies: Optional[List[Policy]] = None
+    """Access policy for the membership"""
+
     roles: Optional[List[Role]] = None
-    """Roles assigned to this member."""
+    """Roles assigned to this Member."""
 
     status: Optional[Literal["accepted", "pending"]] = None
     """A member's status in the account."""
diff --git a/src/cloudflare/types/shared/permission.py b/src/cloudflare/types/shared/permission.py
index ccaf9fcdf5e..bf2dbf7f39c 100644
--- a/src/cloudflare/types/shared/permission.py
+++ b/src/cloudflare/types/shared/permission.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["Permission"]
 
-Permission = str
+Permission: TypeAlias = str
diff --git a/src/cloudflare/types/shared/rate_plan.py b/src/cloudflare/types/shared/rate_plan.py
new file mode 100644
index 00000000000..fcb65d021b8
--- /dev/null
+++ b/src/cloudflare/types/shared/rate_plan.py
@@ -0,0 +1,46 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["RatePlan"]
+
+
+class RatePlan(BaseModel):
+    """The rate plan applied to the subscription."""
+
+    id: Optional[
+        Literal[
+            "free",
+            "lite",
+            "pro",
+            "pro_plus",
+            "business",
+            "enterprise",
+            "partners_free",
+            "partners_pro",
+            "partners_business",
+            "partners_enterprise",
+        ]
+    ] = None
+    """The ID of the rate plan."""
+
+    currency: Optional[str] = None
+    """The currency applied to the rate plan subscription."""
+
+    externally_managed: Optional[bool] = None
+    """Whether this rate plan is managed externally from Cloudflare."""
+
+    is_contract: Optional[bool] = None
+    """Whether a rate plan is enterprise-based (or newly adopted term contract)."""
+
+    public_name: Optional[str] = None
+    """The full name of the rate plan."""
+
+    scope: Optional[str] = None
+    """The scope that this rate plan applies to."""
+
+    sets: Optional[List[str]] = None
+    """The list of sets this rate plan applies to. Returns array of strings."""
diff --git a/src/cloudflare/types/shared/response_info.py b/src/cloudflare/types/shared/response_info.py
index 2124a5abb4d..e93cc9b8e6b 100644
--- a/src/cloudflare/types/shared/response_info.py
+++ b/src/cloudflare/types/shared/response_info.py
@@ -1,12 +1,21 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing import Optional
 
 from ..._models import BaseModel
 
-__all__ = ["ResponseInfo"]
+__all__ = ["ResponseInfo", "Source"]
+
+
+class Source(BaseModel):
+    pointer: Optional[str] = None
 
 
 class ResponseInfo(BaseModel):
     code: int
 
     message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[Source] = None
diff --git a/src/cloudflare/types/shared/result.py b/src/cloudflare/types/shared/result.py
index 5923de2e012..0e67a79f24a 100644
--- a/src/cloudflare/types/shared/result.py
+++ b/src/cloudflare/types/shared/result.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Union, Optional
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
 from .audit_log import AuditLog
@@ -29,4 +29,4 @@ class AaaAPIResponseCommon(BaseModel):
     """Whether the API call was successful"""
 
 
-Result = Union[UnionMember0, AaaAPIResponseCommon]
+Result: TypeAlias = Union[UnionMember0, AaaAPIResponseCommon]
diff --git a/src/cloudflare/types/shared/role.py b/src/cloudflare/types/shared/role.py
index 8bfd1f8f6ae..24ee969f825 100644
--- a/src/cloudflare/types/shared/role.py
+++ b/src/cloudflare/types/shared/role.py
@@ -1,11 +1,37 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import Optional
 
 from ..._models import BaseModel
-from .permission import Permission
+from .permission_grant import PermissionGrant
 
-__all__ = ["Role"]
+__all__ = ["Role", "Permissions"]
+
+
+class Permissions(BaseModel):
+    analytics: Optional[PermissionGrant] = None
+
+    billing: Optional[PermissionGrant] = None
+
+    cache_purge: Optional[PermissionGrant] = None
+
+    dns: Optional[PermissionGrant] = None
+
+    dns_records: Optional[PermissionGrant] = None
+
+    lb: Optional[PermissionGrant] = None
+
+    logs: Optional[PermissionGrant] = None
+
+    organization: Optional[PermissionGrant] = None
+
+    ssl: Optional[PermissionGrant] = None
+
+    waf: Optional[PermissionGrant] = None
+
+    zone_settings: Optional[PermissionGrant] = None
+
+    zones: Optional[PermissionGrant] = None
 
 
 class Role(BaseModel):
@@ -16,7 +42,6 @@ class Role(BaseModel):
     """Description of role's permissions."""
 
     name: str
-    """Role Name."""
+    """Role name."""
 
-    permissions: List[Permission]
-    """Access permissions for this User."""
+    permissions: Permissions
diff --git a/src/cloudflare/types/shared/sort_direction.py b/src/cloudflare/types/shared/sort_direction.py
index abc1f5dd8e0..ba2e7c84034 100644
--- a/src/cloudflare/types/shared/sort_direction.py
+++ b/src/cloudflare/types/shared/sort_direction.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["SortDirection"]
 
-SortDirection = Literal["asc", "desc"]
+SortDirection: TypeAlias = Literal["asc", "desc"]
diff --git a/src/cloudflare/types/shared/subscription.py b/src/cloudflare/types/shared/subscription.py
new file mode 100644
index 00000000000..fc77df03dee
--- /dev/null
+++ b/src/cloudflare/types/shared/subscription.py
@@ -0,0 +1,39 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+from .rate_plan import RatePlan
+
+__all__ = ["Subscription"]
+
+
+class Subscription(BaseModel):
+    id: Optional[str] = None
+    """Subscription identifier tag."""
+
+    currency: Optional[str] = None
+    """The monetary unit in which pricing information is displayed."""
+
+    current_period_end: Optional[datetime] = None
+    """The end of the current period and also when the next billing is due."""
+
+    current_period_start: Optional[datetime] = None
+    """When the current billing period started.
+
+    May match initial_period_start if this is the first period.
+    """
+
+    frequency: Optional[Literal["weekly", "monthly", "quarterly", "yearly"]] = None
+    """How often the subscription is renewed automatically."""
+
+    price: Optional[float] = None
+    """The price of the subscription that will be billed, in US dollars."""
+
+    rate_plan: Optional[RatePlan] = None
+    """The rate plan applied to the subscription."""
+
+    state: Optional[Literal["Trial", "Provisioned", "Paid", "AwaitingPayment", "Cancelled", "Failed", "Expired"]] = None
+    """The state that the subscription is in."""
diff --git a/src/cloudflare/types/user/subscription_component.py b/src/cloudflare/types/shared/subscription_component.py
similarity index 91%
rename from src/cloudflare/types/user/subscription_component.py
rename to src/cloudflare/types/shared/subscription_component.py
index 3bfb3faf7b6..b2a55ac118e 100644
--- a/src/cloudflare/types/user/subscription_component.py
+++ b/src/cloudflare/types/shared/subscription_component.py
@@ -8,6 +8,8 @@
 
 
 class SubscriptionComponent(BaseModel):
+    """A component value for a subscription."""
+
     default: Optional[float] = None
     """The default amount assigned."""
 
diff --git a/src/cloudflare/types/user/subscription_zone.py b/src/cloudflare/types/shared/subscription_zone.py
similarity index 79%
rename from src/cloudflare/types/user/subscription_zone.py
rename to src/cloudflare/types/shared/subscription_zone.py
index 353d7100d9b..49c5161dc4c 100644
--- a/src/cloudflare/types/user/subscription_zone.py
+++ b/src/cloudflare/types/shared/subscription_zone.py
@@ -8,6 +8,8 @@
 
 
 class SubscriptionZone(BaseModel):
+    """A simple zone object. May have null properties if not a zone subscription."""
+
     id: Optional[str] = None
     """Identifier"""
 
diff --git a/src/cloudflare/types/shared/token.py b/src/cloudflare/types/shared/token.py
new file mode 100644
index 00000000000..02eee636709
--- /dev/null
+++ b/src/cloudflare/types/shared/token.py
@@ -0,0 +1,62 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+from .token_policy import TokenPolicy
+from .token_condition_cidr_list import TokenConditionCIDRList
+
+__all__ = ["Token", "Condition", "ConditionRequestIP"]
+
+
+class ConditionRequestIP(BaseModel):
+    """Client IP restrictions."""
+
+    in_: Optional[List[TokenConditionCIDRList]] = FieldInfo(alias="in", default=None)
+    """List of IPv4/IPv6 CIDR addresses."""
+
+    not_in: Optional[List[TokenConditionCIDRList]] = None
+    """List of IPv4/IPv6 CIDR addresses."""
+
+
+class Condition(BaseModel):
+    request_ip: Optional[ConditionRequestIP] = None
+    """Client IP restrictions."""
+
+
+class Token(BaseModel):
+    id: Optional[str] = None
+    """Token identifier tag."""
+
+    condition: Optional[Condition] = None
+
+    expires_on: Optional[datetime] = None
+    """
+    The expiration time on or after which the JWT MUST NOT be accepted for
+    processing.
+    """
+
+    issued_on: Optional[datetime] = None
+    """The time on which the token was created."""
+
+    last_used_on: Optional[datetime] = None
+    """Last time the token was used."""
+
+    modified_on: Optional[datetime] = None
+    """Last time the token was modified."""
+
+    name: Optional[str] = None
+    """Token name."""
+
+    not_before: Optional[datetime] = None
+    """The time before which the token MUST NOT be accepted for processing."""
+
+    policies: Optional[List[TokenPolicy]] = None
+    """List of access policies assigned to the token."""
+
+    status: Optional[Literal["active", "disabled", "expired"]] = None
+    """Status of the token."""
diff --git a/src/cloudflare/types/shared/token_condition_cidr_list.py b/src/cloudflare/types/shared/token_condition_cidr_list.py
new file mode 100644
index 00000000000..6c29ec3cfe9
--- /dev/null
+++ b/src/cloudflare/types/shared/token_condition_cidr_list.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["TokenConditionCIDRList"]
+
+TokenConditionCIDRList: TypeAlias = str
diff --git a/src/cloudflare/types/shared/token_policy.py b/src/cloudflare/types/shared/token_policy.py
new file mode 100644
index 00000000000..52a92e5a558
--- /dev/null
+++ b/src/cloudflare/types/shared/token_policy.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["TokenPolicy", "PermissionGroup", "PermissionGroupMeta"]
+
+
+class PermissionGroupMeta(BaseModel):
+    """Attributes associated to the permission group."""
+
+    key: Optional[str] = None
+
+    value: Optional[str] = None
+
+
+class PermissionGroup(BaseModel):
+    """
+    A named group of permissions that map to a group of operations against resources.
+    """
+
+    id: str
+    """Identifier of the permission group."""
+
+    meta: Optional[PermissionGroupMeta] = None
+    """Attributes associated to the permission group."""
+
+    name: Optional[str] = None
+    """Name of the permission group."""
+
+
+class TokenPolicy(BaseModel):
+    id: str
+    """Policy identifier."""
+
+    effect: Literal["allow", "deny"]
+    """Allow or deny operations against the resources."""
+
+    permission_groups: List[PermissionGroup]
+    """A set of permission groups that are specified to the policy."""
+
+    resources: Union[Dict[str, str], Dict[str, Dict[str, str]]]
+    """A list of resource names that the policy applies to."""
diff --git a/src/cloudflare/types/shared/token_value.py b/src/cloudflare/types/shared/token_value.py
new file mode 100644
index 00000000000..051fa9147df
--- /dev/null
+++ b/src/cloudflare/types/shared/token_value.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["TokenValue"]
+
+TokenValue: TypeAlias = str
diff --git a/src/cloudflare/types/shared_params/__init__.py b/src/cloudflare/types/shared_params/__init__.py
index 6a6befd7e33..3f06c28772b 100644
--- a/src/cloudflare/types/shared_params/__init__.py
+++ b/src/cloudflare/types/shared_params/__init__.py
@@ -1,7 +1,11 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from .asn import ASN as ASN
+from .role import Role as Role
+from .rate_plan import RatePlan as RatePlan
+from .token_policy import TokenPolicy as TokenPolicy
 from .certificate_ca import CertificateCA as CertificateCA
 from .sort_direction import SortDirection as SortDirection
 from .permission_grant import PermissionGrant as PermissionGrant
 from .certificate_request_type import CertificateRequestType as CertificateRequestType
+from .token_condition_cidr_list import TokenConditionCIDRList as TokenConditionCIDRList
diff --git a/src/cloudflare/types/shared_params/asn.py b/src/cloudflare/types/shared_params/asn.py
index ade2d504bf0..a5096a7fa2e 100644
--- a/src/cloudflare/types/shared_params/asn.py
+++ b/src/cloudflare/types/shared_params/asn.py
@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from typing_extensions import TypeAlias
+
 __all__ = ["ASN"]
 
-ASN = int
+ASN: TypeAlias = int
diff --git a/src/cloudflare/types/shared_params/certificate_ca.py b/src/cloudflare/types/shared_params/certificate_ca.py
index 6c04765d842..539a000d3ad 100644
--- a/src/cloudflare/types/shared_params/certificate_ca.py
+++ b/src/cloudflare/types/shared_params/certificate_ca.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["CertificateCA"]
 
-CertificateCA = Literal["digicert", "google", "lets_encrypt"]
+CertificateCA: TypeAlias = Literal["digicert", "google", "lets_encrypt", "ssl_com"]
diff --git a/src/cloudflare/types/shared_params/certificate_request_type.py b/src/cloudflare/types/shared_params/certificate_request_type.py
index 4366cc3dd96..47834144977 100644
--- a/src/cloudflare/types/shared_params/certificate_request_type.py
+++ b/src/cloudflare/types/shared_params/certificate_request_type.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["CertificateRequestType"]
 
-CertificateRequestType = Literal["origin-rsa", "origin-ecc", "keyless-certificate"]
+CertificateRequestType: TypeAlias = Literal["origin-rsa", "origin-ecc", "keyless-certificate"]
diff --git a/src/cloudflare/types/shared_params/rate_plan.py b/src/cloudflare/types/shared_params/rate_plan.py
new file mode 100644
index 00000000000..ccfbfaa0188
--- /dev/null
+++ b/src/cloudflare/types/shared_params/rate_plan.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["RatePlan"]
+
+
+class RatePlan(TypedDict, total=False):
+    """The rate plan applied to the subscription."""
+
+    id: Literal[
+        "free",
+        "lite",
+        "pro",
+        "pro_plus",
+        "business",
+        "enterprise",
+        "partners_free",
+        "partners_pro",
+        "partners_business",
+        "partners_enterprise",
+    ]
+    """The ID of the rate plan."""
+
+    currency: str
+    """The currency applied to the rate plan subscription."""
+
+    externally_managed: bool
+    """Whether this rate plan is managed externally from Cloudflare."""
+
+    is_contract: bool
+    """Whether a rate plan is enterprise-based (or newly adopted term contract)."""
+
+    public_name: str
+    """The full name of the rate plan."""
+
+    scope: str
+    """The scope that this rate plan applies to."""
+
+    sets: SequenceNotStr[str]
+    """The list of sets this rate plan applies to. Returns array of strings."""
diff --git a/src/cloudflare/types/shared_params/role.py b/src/cloudflare/types/shared_params/role.py
new file mode 100644
index 00000000000..87cc37b52b8
--- /dev/null
+++ b/src/cloudflare/types/shared_params/role.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["Role"]
+
+
+class Role(TypedDict, total=False):
+    id: Required[str]
+    """Role identifier tag."""
diff --git a/src/cloudflare/types/shared_params/sort_direction.py b/src/cloudflare/types/shared_params/sort_direction.py
index 083d4b43165..fe303d3faaa 100644
--- a/src/cloudflare/types/shared_params/sort_direction.py
+++ b/src/cloudflare/types/shared_params/sort_direction.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["SortDirection"]
 
-SortDirection = Literal["asc", "desc"]
+SortDirection: TypeAlias = Literal["asc", "desc"]
diff --git a/src/cloudflare/types/shared_params/token_condition_cidr_list.py b/src/cloudflare/types/shared_params/token_condition_cidr_list.py
new file mode 100644
index 00000000000..331bc566009
--- /dev/null
+++ b/src/cloudflare/types/shared_params/token_condition_cidr_list.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import TypeAlias
+
+__all__ = ["TokenConditionCIDRList"]
+
+TokenConditionCIDRList: TypeAlias = str
diff --git a/src/cloudflare/types/shared_params/token_policy.py b/src/cloudflare/types/shared_params/token_policy.py
new file mode 100644
index 00000000000..d5621409cb3
--- /dev/null
+++ b/src/cloudflare/types/shared_params/token_policy.py
@@ -0,0 +1,39 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Union, Iterable
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["TokenPolicy", "PermissionGroup", "PermissionGroupMeta"]
+
+
+class PermissionGroupMeta(TypedDict, total=False):
+    """Attributes associated to the permission group."""
+
+    key: str
+
+    value: str
+
+
+class PermissionGroup(TypedDict, total=False):
+    """
+    A named group of permissions that map to a group of operations against resources.
+    """
+
+    id: Required[str]
+    """Identifier of the permission group."""
+
+    meta: PermissionGroupMeta
+    """Attributes associated to the permission group."""
+
+
+class TokenPolicy(TypedDict, total=False):
+    effect: Required[Literal["allow", "deny"]]
+    """Allow or deny operations against the resources."""
+
+    permission_groups: Required[Iterable[PermissionGroup]]
+    """A set of permission groups that are specified to the policy."""
+
+    resources: Required[Union[Dict[str, str], Dict[str, Dict[str, str]]]]
+    """A list of resource names that the policy applies to."""
diff --git a/src/cloudflare/types/snippets/__init__.py b/src/cloudflare/types/snippets/__init__.py
index 2084aa6e7bb..380f54adfbb 100644
--- a/src/cloudflare/types/snippets/__init__.py
+++ b/src/cloudflare/types/snippets/__init__.py
@@ -2,9 +2,13 @@
 
 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 .snippet_list_params import SnippetListParams as SnippetListParams
+from .rule_delete_response import RuleDeleteResponse as RuleDeleteResponse
 from .rule_update_response import RuleUpdateResponse as RuleUpdateResponse
+from .snippet_get_response import SnippetGetResponse as SnippetGetResponse
+from .snippet_list_response import SnippetListResponse as SnippetListResponse
 from .snippet_update_params import SnippetUpdateParams as SnippetUpdateParams
 from .snippet_delete_response import SnippetDeleteResponse as SnippetDeleteResponse
+from .snippet_update_response import SnippetUpdateResponse as SnippetUpdateResponse
diff --git a/src/cloudflare/types/snippets/rule_delete_response.py b/src/cloudflare/types/snippets/rule_delete_response.py
new file mode 100644
index 00000000000..82daad343b7
--- /dev/null
+++ b/src/cloudflare/types/snippets/rule_delete_response.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["RuleDeleteResponse"]
+
+
+class RuleDeleteResponse(BaseModel):
+    """A snippet rule."""
+
+    id: str
+    """The unique ID of the rule."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    last_updated: datetime
+    """The timestamp of when the rule was last modified."""
+
+    snippet_name: str
+    """The identifying name of the snippet."""
+
+    description: Optional[str] = None
+    """An informative description of the rule."""
+
+    enabled: Optional[bool] = None
+    """Whether the rule should be executed."""
diff --git a/src/cloudflare/types/snippets/rule_list_response.py b/src/cloudflare/types/snippets/rule_list_response.py
index 63c540e55c7..580009e8c7b 100644
--- a/src/cloudflare/types/snippets/rule_list_response.py
+++ b/src/cloudflare/types/snippets/rule_list_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from datetime import datetime
 
 from ..._models import BaseModel
 
@@ -8,11 +9,22 @@
 
 
 class RuleListResponse(BaseModel):
-    description: Optional[str] = None
+    """A snippet rule."""
 
-    enabled: Optional[bool] = None
+    id: str
+    """The unique ID of the rule."""
+
+    expression: str
+    """The expression defining which traffic will match the rule."""
+
+    last_updated: datetime
+    """The timestamp of when the rule was last modified."""
 
-    expression: Optional[str] = None
+    snippet_name: str
+    """The identifying name of the snippet."""
 
-    snippet_name: Optional[str] = None
-    """Snippet identifying name"""
+    description: Optional[str] = None
+    """An informative description of the rule."""
+
+    enabled: Optional[bool] = None
+    """Whether the rule should be executed."""
diff --git a/src/cloudflare/types/snippets/rule_update_params.py b/src/cloudflare/types/snippets/rule_update_params.py
index a539ccf8213..cb9b6928438 100644
--- a/src/cloudflare/types/snippets/rule_update_params.py
+++ b/src/cloudflare/types/snippets/rule_update_params.py
@@ -10,18 +10,23 @@
 
 class RuleUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """The unique ID of the zone."""
 
-    rules: Iterable[Rule]
-    """List of snippet rules"""
+    rules: Required[Iterable[Rule]]
+    """A list of snippet rules."""
 
 
 class Rule(TypedDict, total=False):
-    description: str
+    """A snippet rule."""
 
-    enabled: bool
+    expression: Required[str]
+    """The expression defining which traffic will match the rule."""
 
-    expression: str
+    snippet_name: Required[str]
+    """The identifying name of the snippet."""
 
-    snippet_name: str
-    """Snippet identifying name"""
+    description: str
+    """An informative description of the rule."""
+
+    enabled: bool
+    """Whether the rule should be executed."""
diff --git a/src/cloudflare/types/snippets/rule_update_response.py b/src/cloudflare/types/snippets/rule_update_response.py
index 2abc8f16900..df082807a5b 100644
--- a/src/cloudflare/types/snippets/rule_update_response.py
+++ b/src/cloudflare/types/snippets/rule_update_response.py
@@ -1,21 +1,30 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Optional
+from datetime import datetime
 
 from ..._models import BaseModel
 
-__all__ = ["RuleUpdateResponse", "RuleUpdateResponseItem"]
+__all__ = ["RuleUpdateResponse"]
 
 
-class RuleUpdateResponseItem(BaseModel):
-    description: Optional[str] = None
+class RuleUpdateResponse(BaseModel):
+    """A snippet rule."""
 
-    enabled: Optional[bool] = None
+    id: str
+    """The unique ID of the rule."""
 
-    expression: Optional[str] = None
+    expression: str
+    """The expression defining which traffic will match the rule."""
 
-    snippet_name: Optional[str] = None
-    """Snippet identifying name"""
+    last_updated: datetime
+    """The timestamp of when the rule was last modified."""
 
+    snippet_name: str
+    """The identifying name of the snippet."""
 
-RuleUpdateResponse = List[RuleUpdateResponseItem]
+    description: Optional[str] = None
+    """An informative description of the rule."""
+
+    enabled: Optional[bool] = None
+    """Whether the rule should be executed."""
diff --git a/src/cloudflare/types/snippets/snippet.py b/src/cloudflare/types/snippets/snippet.py
deleted file mode 100644
index 69dc660896e..00000000000
--- a/src/cloudflare/types/snippets/snippet.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ..._models import BaseModel
-
-__all__ = ["Snippet"]
-
-
-class Snippet(BaseModel):
-    created_on: Optional[str] = None
-    """Creation time of the snippet"""
-
-    modified_on: Optional[str] = None
-    """Modification time of the snippet"""
-
-    snippet_name: Optional[str] = None
-    """Snippet identifying name"""
diff --git a/src/cloudflare/types/snippets/snippet_delete_response.py b/src/cloudflare/types/snippets/snippet_delete_response.py
index 6a1b4806d1b..df12b7993ea 100644
--- a/src/cloudflare/types/snippets/snippet_delete_response.py
+++ b/src/cloudflare/types/snippets/snippet_delete_response.py
@@ -1,18 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-from ..shared.response_info import ResponseInfo
+from typing import Optional
+from typing_extensions import TypeAlias
 
 __all__ = ["SnippetDeleteResponse"]
 
-
-class SnippetDeleteResponse(BaseModel):
-    errors: List[ResponseInfo]
-
-    messages: List[ResponseInfo]
-
-    success: Literal[True]
-    """Whether the API call was successful"""
+SnippetDeleteResponse: TypeAlias = Optional[str]
diff --git a/src/cloudflare/types/snippets/snippet_get_response.py b/src/cloudflare/types/snippets/snippet_get_response.py
new file mode 100644
index 00000000000..bc87585db18
--- /dev/null
+++ b/src/cloudflare/types/snippets/snippet_get_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["SnippetGetResponse"]
+
+
+class SnippetGetResponse(BaseModel):
+    """A result."""
+
+    created_on: datetime
+    """The timestamp of when the snippet was created."""
+
+    snippet_name: str
+    """The identifying name of the snippet."""
+
+    modified_on: Optional[datetime] = None
+    """The timestamp of when the snippet was last modified."""
diff --git a/src/cloudflare/types/snippets/snippet_list_params.py b/src/cloudflare/types/snippets/snippet_list_params.py
new file mode 100644
index 00000000000..2415136e4e5
--- /dev/null
+++ b/src/cloudflare/types/snippets/snippet_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SnippetListParams"]
+
+
+class SnippetListParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """The unique ID of the zone."""
+
+    page: int
+    """The current page number."""
+
+    per_page: int
+    """The number of results to return per page."""
diff --git a/src/cloudflare/types/snippets/snippet_list_response.py b/src/cloudflare/types/snippets/snippet_list_response.py
new file mode 100644
index 00000000000..5ef8813a826
--- /dev/null
+++ b/src/cloudflare/types/snippets/snippet_list_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["SnippetListResponse"]
+
+
+class SnippetListResponse(BaseModel):
+    """A snippet object."""
+
+    created_on: datetime
+    """The timestamp of when the snippet was created."""
+
+    snippet_name: str
+    """The identifying name of the snippet."""
+
+    modified_on: Optional[datetime] = None
+    """The timestamp of when the snippet was last modified."""
diff --git a/src/cloudflare/types/snippets/snippet_update_params.py b/src/cloudflare/types/snippets/snippet_update_params.py
index 7f1e3894a00..cf18ba62793 100644
--- a/src/cloudflare/types/snippets/snippet_update_params.py
+++ b/src/cloudflare/types/snippets/snippet_update_params.py
@@ -9,14 +9,14 @@
 
 class SnippetUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """The unique ID of the zone."""
 
-    files: str
-    """Content files of uploaded snippet"""
-
-    metadata: Metadata
+    metadata: Required[Metadata]
+    """Metadata about the snippet."""
 
 
 class Metadata(TypedDict, total=False):
-    main_module: str
-    """Main module name of uploaded snippet"""
+    """Metadata about the snippet."""
+
+    main_module: Required[str]
+    """Name of the file that contains the main module of the snippet."""
diff --git a/src/cloudflare/types/snippets/snippet_update_response.py b/src/cloudflare/types/snippets/snippet_update_response.py
new file mode 100644
index 00000000000..1b9b6734aaf
--- /dev/null
+++ b/src/cloudflare/types/snippets/snippet_update_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["SnippetUpdateResponse"]
+
+
+class SnippetUpdateResponse(BaseModel):
+    """A result."""
+
+    created_on: datetime
+    """The timestamp of when the snippet was created."""
+
+    snippet_name: str
+    """The identifying name of the snippet."""
+
+    modified_on: Optional[datetime] = None
+    """The timestamp of when the snippet was last modified."""
diff --git a/src/cloudflare/types/spectrum/__init__.py b/src/cloudflare/types/spectrum/__init__.py
index 3d53e86df56..c4193ff8499 100644
--- a/src/cloudflare/types/spectrum/__init__.py
+++ b/src/cloudflare/types/spectrum/__init__.py
@@ -12,6 +12,7 @@
 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_list_response import AppListResponse as AppListResponse
 from .app_update_params import AppUpdateParams as AppUpdateParams
 from .origin_port_param import OriginPortParam as OriginPortParam
 from .app_create_response import AppCreateResponse as AppCreateResponse
diff --git a/src/cloudflare/types/spectrum/analytics/aggregates/current_get_params.py b/src/cloudflare/types/spectrum/analytics/aggregates/current_get_params.py
index f111e94540f..62e4567343d 100644
--- a/src/cloudflare/types/spectrum/analytics/aggregates/current_get_params.py
+++ b/src/cloudflare/types/spectrum/analytics/aggregates/current_get_params.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing_extensions import Annotated, TypedDict
+from typing_extensions import Required, Annotated, TypedDict
 
 from ....._utils import PropertyInfo
 
@@ -10,12 +10,8 @@
 
 
 class CurrentGetParams(TypedDict, total=False):
-    app_id_param: str
-    """Comma-delimited list of Spectrum Application Id(s).
-
-    If provided, the response will be limited to Spectrum Application Id(s) that
-    match.
-    """
+    zone_id: Required[str]
+    """Identifier."""
 
     app_id: Annotated[str, PropertyInfo(alias="appID")]
     """Comma-delimited list of Spectrum Application Id(s).
diff --git a/src/cloudflare/types/spectrum/analytics/aggregates/current_get_response.py b/src/cloudflare/types/spectrum/analytics/aggregates/current_get_response.py
index c4b1459d71c..9a69755ef7a 100644
--- a/src/cloudflare/types/spectrum/analytics/aggregates/current_get_response.py
+++ b/src/cloudflare/types/spectrum/analytics/aggregates/current_get_response.py
@@ -1,7 +1,30 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from typing_extensions import TypeAlias
 
-__all__ = ["CurrentGetResponse"]
+from pydantic import Field as FieldInfo
 
-CurrentGetResponse = List[object]
+from ....._models import BaseModel
+
+__all__ = ["CurrentGetResponse", "CurrentGetResponseItem"]
+
+
+class CurrentGetResponseItem(BaseModel):
+    app_id: str = FieldInfo(alias="appID")
+    """Application identifier."""
+
+    bytes_egress: float = FieldInfo(alias="bytesEgress")
+    """Number of bytes sent"""
+
+    bytes_ingress: float = FieldInfo(alias="bytesIngress")
+    """Number of bytes received"""
+
+    connections: float
+    """Number of connections"""
+
+    duration_avg: float = FieldInfo(alias="durationAvg")
+    """Average duration of connections"""
+
+
+CurrentGetResponse: TypeAlias = List[CurrentGetResponseItem]
diff --git a/src/cloudflare/types/spectrum/analytics/dimension.py b/src/cloudflare/types/spectrum/analytics/dimension.py
index 0b53b87214b..76be1866f2c 100644
--- a/src/cloudflare/types/spectrum/analytics/dimension.py
+++ b/src/cloudflare/types/spectrum/analytics/dimension.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["Dimension"]
 
-Dimension = Literal["event", "appID", "coloName", "ipVersion"]
+Dimension: TypeAlias = Literal["event", "appID", "coloName", "ipVersion"]
diff --git a/src/cloudflare/types/spectrum/analytics/events/bytime_get_params.py b/src/cloudflare/types/spectrum/analytics/events/bytime_get_params.py
index 2f9fde1b5a1..d0093aefdcc 100644
--- a/src/cloudflare/types/spectrum/analytics/events/bytime_get_params.py
+++ b/src/cloudflare/types/spectrum/analytics/events/bytime_get_params.py
@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
-from typing import List, Union, Iterable
+from typing import List, Union
 from datetime import datetime
-from typing_extensions import Literal, Annotated, TypedDict
+from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 from ..dimension import Dimension
 
@@ -13,6 +14,12 @@
 
 
 class BytimeGetParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    time_delta: Required[Literal["year", "quarter", "month", "week", "day", "hour", "dekaminute", "minute"]]
+    """Used to select time series resolution."""
+
     dimensions: List[Dimension]
     """Can be used to break down the data by given attributes. Options are:
 
@@ -38,10 +45,10 @@ class BytimeGetParams(TypedDict, total=False):
     | -------- | ------------------------ | ----------- |
     | ==       | Equals                   | %3D%3D      |
     | !=       | Does not equals          | !%3D        |
-    | >        | Greater Than             | %3E         |
-    | <        | Less Than                | %3C         |
-    | >=       | Greater than or equal to | %3E%3D      |
-    | <=       | Less than or equal to    | %3C%3D .    |
+    | \\>>       | Greater Than             | %3E         |
+    | \\<<       | Less Than                | %3C         |
+    | \\>>=      | Greater than or equal to | %3E%3D      |
+    | \\<<=      | Less than or equal to    | %3C%3D      |
     """
 
     metrics: List[
@@ -66,15 +73,12 @@ class BytimeGetParams(TypedDict, total=False):
     Timestamp must be in RFC3339 format and uses UTC unless otherwise specified.
     """
 
-    sort: Iterable[object]
+    sort: SequenceNotStr[str]
     """
     The sort order for the result set; sort fields must be included in `metrics` or
     `dimensions`.
     """
 
-    time_delta: Literal["year", "quarter", "month", "week", "day", "hour", "dekaminute", "minute"]
-    """Used to select time series resolution."""
-
     until: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
     """End of time interval to query, defaults to current time.
 
diff --git a/src/cloudflare/types/spectrum/analytics/events/bytime_get_response.py b/src/cloudflare/types/spectrum/analytics/events/bytime_get_response.py
index 66bf70649f0..9920bd395a4 100644
--- a/src/cloudflare/types/spectrum/analytics/events/bytime_get_response.py
+++ b/src/cloudflare/types/spectrum/analytics/events/bytime_get_response.py
@@ -1,7 +1,118 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union
+from typing import Dict, List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal
 
-__all__ = ["BytimeGetResponse"]
+from ..dimension import Dimension
+from ....._models import BaseModel
 
-BytimeGetResponse = Union[str, object, None]
+__all__ = ["BytimeGetResponse", "Data", "Query"]
+
+
+class Data(BaseModel):
+    dimensions: Optional[List[str]] = None
+
+    metrics: Union[List[float], List[List[float]], None] = None
+
+
+class Query(BaseModel):
+    dimensions: Optional[List[Dimension]] = None
+    """Can be used to break down the data by given attributes. Options are:
+
+    | Dimension | Name                          | Example                                                    |
+    | --------- | ----------------------------- | ---------------------------------------------------------- |
+    | event     | Connection Event              | connect, progress, disconnect, originError, clientFiltered |
+    | appID     | Application ID                | 40d67c87c6cd4b889a4fd57805225e85                           |
+    | coloName  | Colo Name                     | SFO                                                        |
+    | ipVersion | IP version used by the client | 4, 6.                                                      |
+    """
+
+    filters: Optional[str] = None
+    """Used to filter rows by one or more dimensions.
+
+    Filters can be combined using OR and AND boolean logic. AND takes precedence
+    over OR in all the expressions. The OR operator is defined using a comma (,) or
+    OR keyword surrounded by whitespace. The AND operator is defined using a
+    semicolon (;) or AND keyword surrounded by whitespace. Note that the semicolon
+    is a reserved character in URLs (rfc1738) and needs to be percent-encoded as
+    %3B. Comparison options are:
+
+    | Operator | Name                     | URL Encoded |
+    | -------- | ------------------------ | ----------- |
+    | ==       | Equals                   | %3D%3D      |
+    | !=       | Does not equals          | !%3D        |
+    | \\>>       | Greater Than             | %3E         |
+    | \\<<       | Less Than                | %3C         |
+    | \\>>=      | Greater than or equal to | %3E%3D      |
+    | \\<<=      | Less than or equal to    | %3C%3D      |
+    """
+
+    limit: Optional[float] = None
+    """Limit number of returned metrics."""
+
+    metrics: Optional[
+        List[
+            Literal[
+                "count", "bytesIngress", "bytesEgress", "durationAvg", "durationMedian", "duration90th", "duration99th"
+            ]
+        ]
+    ] = None
+    """One or more metrics to compute. Options are:
+
+    | Metric         | Name                                | Example | Unit                  |
+    | -------------- | ----------------------------------- | ------- | --------------------- |
+    | count          | Count of total events               | 1000    | Count                 |
+    | bytesIngress   | Sum of ingress bytes                | 1000    | Sum                   |
+    | bytesEgress    | Sum of egress bytes                 | 1000    | Sum                   |
+    | durationAvg    | Average connection duration         | 1.0     | Time in milliseconds  |
+    | durationMedian | Median connection duration          | 1.0     | Time in milliseconds  |
+    | duration90th   | 90th percentile connection duration | 1.0     | Time in milliseconds  |
+    | duration99th   | 99th percentile connection duration | 1.0     | Time in milliseconds. |
+    """
+
+    since: Optional[datetime] = None
+    """Start of time interval to query, defaults to `until` - 6 hours.
+
+    Timestamp must be in RFC3339 format and uses UTC unless otherwise specified.
+    """
+
+    sort: Optional[List[str]] = None
+    """
+    The sort order for the result set; sort fields must be included in `metrics` or
+    `dimensions`.
+    """
+
+    until: Optional[datetime] = None
+    """End of time interval to query, defaults to current time.
+
+    Timestamp must be in RFC3339 format and uses UTC unless otherwise specified.
+    """
+
+
+class BytimeGetResponse(BaseModel):
+    data: List[Data]
+    """List of columns returned by the analytics query."""
+
+    data_lag: float
+    """Number of seconds between current time and last processed event, i.e.
+
+    how many seconds of data could be missing.
+    """
+
+    max: Dict[str, float]
+    """Maximum result for each selected metrics across all data."""
+
+    min: Dict[str, float]
+    """Minimum result for each selected metrics across all data."""
+
+    query: Query
+
+    rows: float
+    """Total number of rows in the result."""
+
+    totals: Dict[str, float]
+    """Total result for each selected metrics across all data."""
+
+    time_intervals: Optional[List[List[datetime]]] = None
+    """List of time interval buckets: [start, end]"""
diff --git a/src/cloudflare/types/spectrum/analytics/events/summary_get_params.py b/src/cloudflare/types/spectrum/analytics/events/summary_get_params.py
index 0fc955c44fb..49158c5ae50 100644
--- a/src/cloudflare/types/spectrum/analytics/events/summary_get_params.py
+++ b/src/cloudflare/types/spectrum/analytics/events/summary_get_params.py
@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
-from typing import List, Union, Iterable
+from typing import List, Union
 from datetime import datetime
-from typing_extensions import Literal, Annotated, TypedDict
+from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 from ..dimension import Dimension
 
@@ -13,6 +14,9 @@
 
 
 class SummaryGetParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
     dimensions: List[Dimension]
     """Can be used to break down the data by given attributes. Options are:
 
@@ -38,10 +42,10 @@ class SummaryGetParams(TypedDict, total=False):
     | -------- | ------------------------ | ----------- |
     | ==       | Equals                   | %3D%3D      |
     | !=       | Does not equals          | !%3D        |
-    | >        | Greater Than             | %3E         |
-    | <        | Less Than                | %3C         |
-    | >=       | Greater than or equal to | %3E%3D      |
-    | <=       | Less than or equal to    | %3C%3D .    |
+    | \\>>       | Greater Than             | %3E         |
+    | \\<<       | Less Than                | %3C         |
+    | \\>>=      | Greater than or equal to | %3E%3D      |
+    | \\<<=      | Less than or equal to    | %3C%3D      |
     """
 
     metrics: List[
@@ -66,7 +70,7 @@ class SummaryGetParams(TypedDict, total=False):
     Timestamp must be in RFC3339 format and uses UTC unless otherwise specified.
     """
 
-    sort: Iterable[object]
+    sort: SequenceNotStr[str]
     """
     The sort order for the result set; sort fields must be included in `metrics` or
     `dimensions`.
diff --git a/src/cloudflare/types/spectrum/analytics/events/summary_get_response.py b/src/cloudflare/types/spectrum/analytics/events/summary_get_response.py
index 1702aa67226..b6e48698e47 100644
--- a/src/cloudflare/types/spectrum/analytics/events/summary_get_response.py
+++ b/src/cloudflare/types/spectrum/analytics/events/summary_get_response.py
@@ -1,7 +1,118 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union
+from typing import Dict, List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal
 
-__all__ = ["SummaryGetResponse"]
+from ..dimension import Dimension
+from ....._models import BaseModel
 
-SummaryGetResponse = Union[str, object, None]
+__all__ = ["SummaryGetResponse", "Data", "Query"]
+
+
+class Data(BaseModel):
+    dimensions: Optional[List[str]] = None
+
+    metrics: Union[List[float], List[List[float]], None] = None
+
+
+class Query(BaseModel):
+    dimensions: Optional[List[Dimension]] = None
+    """Can be used to break down the data by given attributes. Options are:
+
+    | Dimension | Name                          | Example                                                    |
+    | --------- | ----------------------------- | ---------------------------------------------------------- |
+    | event     | Connection Event              | connect, progress, disconnect, originError, clientFiltered |
+    | appID     | Application ID                | 40d67c87c6cd4b889a4fd57805225e85                           |
+    | coloName  | Colo Name                     | SFO                                                        |
+    | ipVersion | IP version used by the client | 4, 6.                                                      |
+    """
+
+    filters: Optional[str] = None
+    """Used to filter rows by one or more dimensions.
+
+    Filters can be combined using OR and AND boolean logic. AND takes precedence
+    over OR in all the expressions. The OR operator is defined using a comma (,) or
+    OR keyword surrounded by whitespace. The AND operator is defined using a
+    semicolon (;) or AND keyword surrounded by whitespace. Note that the semicolon
+    is a reserved character in URLs (rfc1738) and needs to be percent-encoded as
+    %3B. Comparison options are:
+
+    | Operator | Name                     | URL Encoded |
+    | -------- | ------------------------ | ----------- |
+    | ==       | Equals                   | %3D%3D      |
+    | !=       | Does not equals          | !%3D        |
+    | \\>>       | Greater Than             | %3E         |
+    | \\<<       | Less Than                | %3C         |
+    | \\>>=      | Greater than or equal to | %3E%3D      |
+    | \\<<=      | Less than or equal to    | %3C%3D      |
+    """
+
+    limit: Optional[float] = None
+    """Limit number of returned metrics."""
+
+    metrics: Optional[
+        List[
+            Literal[
+                "count", "bytesIngress", "bytesEgress", "durationAvg", "durationMedian", "duration90th", "duration99th"
+            ]
+        ]
+    ] = None
+    """One or more metrics to compute. Options are:
+
+    | Metric         | Name                                | Example | Unit                  |
+    | -------------- | ----------------------------------- | ------- | --------------------- |
+    | count          | Count of total events               | 1000    | Count                 |
+    | bytesIngress   | Sum of ingress bytes                | 1000    | Sum                   |
+    | bytesEgress    | Sum of egress bytes                 | 1000    | Sum                   |
+    | durationAvg    | Average connection duration         | 1.0     | Time in milliseconds  |
+    | durationMedian | Median connection duration          | 1.0     | Time in milliseconds  |
+    | duration90th   | 90th percentile connection duration | 1.0     | Time in milliseconds  |
+    | duration99th   | 99th percentile connection duration | 1.0     | Time in milliseconds. |
+    """
+
+    since: Optional[datetime] = None
+    """Start of time interval to query, defaults to `until` - 6 hours.
+
+    Timestamp must be in RFC3339 format and uses UTC unless otherwise specified.
+    """
+
+    sort: Optional[List[str]] = None
+    """
+    The sort order for the result set; sort fields must be included in `metrics` or
+    `dimensions`.
+    """
+
+    until: Optional[datetime] = None
+    """End of time interval to query, defaults to current time.
+
+    Timestamp must be in RFC3339 format and uses UTC unless otherwise specified.
+    """
+
+
+class SummaryGetResponse(BaseModel):
+    data: List[Data]
+    """List of columns returned by the analytics query."""
+
+    data_lag: float
+    """Number of seconds between current time and last processed event, i.e.
+
+    how many seconds of data could be missing.
+    """
+
+    max: Dict[str, float]
+    """Maximum result for each selected metrics across all data."""
+
+    min: Dict[str, float]
+    """Minimum result for each selected metrics across all data."""
+
+    query: Query
+
+    rows: float
+    """Total number of rows in the result."""
+
+    totals: Dict[str, float]
+    """Total result for each selected metrics across all data."""
+
+    time_intervals: Optional[List[List[datetime]]] = None
+    """List of time interval buckets: [start, end]"""
diff --git a/src/cloudflare/types/spectrum/app_create_params.py b/src/cloudflare/types/spectrum/app_create_params.py
index dbd9189a007..8927bec1bf7 100644
--- a/src/cloudflare/types/spectrum/app_create_params.py
+++ b/src/cloudflare/types/spectrum/app_create_params.py
@@ -2,40 +2,41 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal, Required, TypedDict
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
+from ..._types import SequenceNotStr
 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"]
+__all__ = ["AppCreateParams", "SpectrumConfigAppConfig", "SpectrumConfigPaygoAppConfig"]
 
 
-class AppCreateParams(TypedDict, total=False):
-    dns: Required[DNSParam]
-    """The name and type of DNS record for the Spectrum application."""
+class SpectrumConfigAppConfig(TypedDict, total=False):
+    zone_id: Required[str]
+    """Zone identifier."""
 
-    origin_dns: Required[OriginDNSParam]
+    dns: Required[DNSParam]
     """The name and type of DNS record for the Spectrum application."""
 
-    origin_port: Required[OriginPortParam]
-    """The destination port at the origin.
-
-    Only specified in conjunction with origin_dns. May use an integer to specify a
-    single origin port, for example `1000`, or a string to specify a range of origin
-    ports, for example `"1000-2000"`. Notes: If specifying a port range, the number
-    of ports in the range must match the number of ports specified in the "protocol"
-    field.
-    """
-
     protocol: Required[str]
-    """The port configuration at Cloudflare’s edge.
+    """The port configuration at Cloudflare's edge.
 
     May specify a single port, for example `"tcp/1000"`, or a range of ports, for
     example `"tcp/1000-2000"`.
     """
 
+    traffic_type: Required[Literal["direct", "http", "https"]]
+    """Determines how data travels from the edge to your origin.
+
+    When set to "direct", Spectrum will send traffic directly to your origin, and
+    the application's type is derived from the `protocol`. When set to "http" or
+    "https", Spectrum will apply Cloudflare's HTTP/HTTPS features as it sends
+    traffic to your origin, and the application type matches this property exactly.
+    """
+
     argo_smart_routing: bool
     """
     Enables Argo Smart Routing for this application. Notes: Only available for TCP
@@ -51,6 +52,25 @@ class AppCreateParams(TypedDict, total=False):
     applications.
     """
 
+    origin_direct: SequenceNotStr[str]
+    """List of origin IP addresses.
+
+    Array may contain multiple IP addresses for load balancing.
+    """
+
+    origin_dns: OriginDNSParam
+    """The name and type of DNS record for the Spectrum application."""
+
+    origin_port: OriginPortParam
+    """The destination port at the origin.
+
+    Only specified in conjunction with origin_dns. May use an integer to specify a
+    single origin port, for example `1000`, or a string to specify a range of origin
+    ports, for example `"1000-2000"`. Notes: If specifying a port range, the number
+    of ports in the range must match the number of ports specified in the "protocol"
+    field.
+    """
+
     proxy_protocol: Literal["off", "v1", "v2", "simple"]
     """Enables Proxy Protocol to the origin.
 
@@ -63,11 +83,26 @@ class AppCreateParams(TypedDict, total=False):
     tls: Literal["off", "flexible", "full", "strict"]
     """The type of TLS termination associated with the application."""
 
-    traffic_type: Literal["direct", "http", "https"]
-    """Determines how data travels from the edge to your origin.
 
-    When set to "direct", Spectrum will send traffic directly to your origin, and
-    the application's type is derived from the `protocol`. When set to "http" or
-    "https", Spectrum will apply Cloudflare's HTTP/HTTPS features as it sends
-    traffic to your origin, and the application type matches this property exactly.
+class SpectrumConfigPaygoAppConfig(TypedDict, total=False):
+    zone_id: Required[str]
+    """Zone identifier."""
+
+    dns: Required[DNSParam]
+    """The name and type of DNS record for the Spectrum application."""
+
+    protocol: Required[str]
+    """The port configuration at Cloudflare's edge.
+
+    May specify a single port, for example `"tcp/1000"`, or a range of ports, for
+    example `"tcp/1000-2000"`.
+    """
+
+    origin_direct: SequenceNotStr[str]
+    """List of origin IP addresses.
+
+    Array may contain multiple IP addresses for load balancing.
     """
+
+
+AppCreateParams: TypeAlias = Union[SpectrumConfigAppConfig, SpectrumConfigPaygoAppConfig]
diff --git a/src/cloudflare/types/spectrum/app_create_response.py b/src/cloudflare/types/spectrum/app_create_response.py
index 4b3530730e1..b6cad2c1eda 100644
--- a/src/cloudflare/types/spectrum/app_create_response.py
+++ b/src/cloudflare/types/spectrum/app_create_response.py
@@ -1,8 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from .dns import DNS
 from .edge_ips import EdgeIPs
@@ -10,12 +10,37 @@
 from .origin_dns import OriginDNS
 from .origin_port import OriginPort
 
-__all__ = ["AppCreateResponse"]
+__all__ = ["AppCreateResponse", "SpectrumConfigAppConfig", "SpectrumConfigPaygoAppConfig"]
 
 
-class AppCreateResponse(BaseModel):
-    id: Optional[str] = None
-    """Application identifier."""
+class SpectrumConfigAppConfig(BaseModel):
+    id: str
+    """App identifier."""
+
+    created_on: datetime
+    """When the Application was created."""
+
+    dns: DNS
+    """The name and type of DNS record for the Spectrum application."""
+
+    modified_on: datetime
+    """When the Application was last modified."""
+
+    protocol: str
+    """The port configuration at Cloudflare's edge.
+
+    May specify a single port, for example `"tcp/1000"`, or a range of ports, for
+    example `"tcp/1000-2000"`.
+    """
+
+    traffic_type: Literal["direct", "http", "https"]
+    """Determines how data travels from the edge to your origin.
+
+    When set to "direct", Spectrum will send traffic directly to your origin, and
+    the application's type is derived from the `protocol`. When set to "http" or
+    "https", Spectrum will apply Cloudflare's HTTP/HTTPS features as it sends
+    traffic to your origin, and the application type matches this property exactly.
+    """
 
     argo_smart_routing: Optional[bool] = None
     """
@@ -23,12 +48,6 @@ class AppCreateResponse(BaseModel):
     applications with traffic_type set to "direct".
     """
 
-    created_on: Optional[datetime] = None
-    """When the Application was created."""
-
-    dns: Optional[DNS] = None
-    """The name and type of DNS record for the Spectrum application."""
-
     edge_ips: Optional[EdgeIPs] = None
     """The anycast edge IP configuration for the hostname of this application."""
 
@@ -38,8 +57,11 @@ class AppCreateResponse(BaseModel):
     applications.
     """
 
-    modified_on: Optional[datetime] = None
-    """When the Application was last modified."""
+    origin_direct: Optional[List[str]] = None
+    """List of origin IP addresses.
+
+    Array may contain multiple IP addresses for load balancing.
+    """
 
     origin_dns: Optional[OriginDNS] = None
     """The name and type of DNS record for the Spectrum application."""
@@ -54,13 +76,6 @@ class AppCreateResponse(BaseModel):
     field.
     """
 
-    protocol: Optional[str] = None
-    """The port configuration at Cloudflare’s edge.
-
-    May specify a single port, for example `"tcp/1000"`, or a range of ports, for
-    example `"tcp/1000-2000"`.
-    """
-
     proxy_protocol: Optional[Literal["off", "v1", "v2", "simple"]] = None
     """Enables Proxy Protocol to the origin.
 
@@ -73,11 +88,32 @@ class AppCreateResponse(BaseModel):
     tls: Optional[Literal["off", "flexible", "full", "strict"]] = None
     """The type of TLS termination associated with the application."""
 
-    traffic_type: Optional[Literal["direct", "http", "https"]] = None
-    """Determines how data travels from the edge to your origin.
 
-    When set to "direct", Spectrum will send traffic directly to your origin, and
-    the application's type is derived from the `protocol`. When set to "http" or
-    "https", Spectrum will apply Cloudflare's HTTP/HTTPS features as it sends
-    traffic to your origin, and the application type matches this property exactly.
+class SpectrumConfigPaygoAppConfig(BaseModel):
+    id: str
+    """App identifier."""
+
+    created_on: datetime
+    """When the Application was created."""
+
+    dns: DNS
+    """The name and type of DNS record for the Spectrum application."""
+
+    modified_on: datetime
+    """When the Application was last modified."""
+
+    protocol: str
+    """The port configuration at Cloudflare's edge.
+
+    May specify a single port, for example `"tcp/1000"`, or a range of ports, for
+    example `"tcp/1000-2000"`.
+    """
+
+    origin_direct: Optional[List[str]] = None
+    """List of origin IP addresses.
+
+    Array may contain multiple IP addresses for load balancing.
     """
+
+
+AppCreateResponse: TypeAlias = Union[SpectrumConfigAppConfig, SpectrumConfigPaygoAppConfig]
diff --git a/src/cloudflare/types/spectrum/app_delete_response.py b/src/cloudflare/types/spectrum/app_delete_response.py
index 38b3012b69f..b94ff086846 100644
--- a/src/cloudflare/types/spectrum/app_delete_response.py
+++ b/src/cloudflare/types/spectrum/app_delete_response.py
@@ -1,12 +1,10 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
-
 from ..._models import BaseModel
 
 __all__ = ["AppDeleteResponse"]
 
 
 class AppDeleteResponse(BaseModel):
-    id: Optional[str] = None
-    """Application identifier."""
+    id: str
+    """Identifier."""
diff --git a/src/cloudflare/types/spectrum/app_get_response.py b/src/cloudflare/types/spectrum/app_get_response.py
index 67e2aa1f173..d8471c0eae5 100644
--- a/src/cloudflare/types/spectrum/app_get_response.py
+++ b/src/cloudflare/types/spectrum/app_get_response.py
@@ -1,7 +1,119 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
-__all__ = ["AppGetResponse"]
+from .dns import DNS
+from .edge_ips import EdgeIPs
+from ..._models import BaseModel
+from .origin_dns import OriginDNS
+from .origin_port import OriginPort
 
-AppGetResponse = Union[Optional[str], Optional[object]]
+__all__ = ["AppGetResponse", "SpectrumConfigAppConfig", "SpectrumConfigPaygoAppConfig"]
+
+
+class SpectrumConfigAppConfig(BaseModel):
+    id: str
+    """App identifier."""
+
+    created_on: datetime
+    """When the Application was created."""
+
+    dns: DNS
+    """The name and type of DNS record for the Spectrum application."""
+
+    modified_on: datetime
+    """When the Application was last modified."""
+
+    protocol: str
+    """The port configuration at Cloudflare's edge.
+
+    May specify a single port, for example `"tcp/1000"`, or a range of ports, for
+    example `"tcp/1000-2000"`.
+    """
+
+    traffic_type: Literal["direct", "http", "https"]
+    """Determines how data travels from the edge to your origin.
+
+    When set to "direct", Spectrum will send traffic directly to your origin, and
+    the application's type is derived from the `protocol`. When set to "http" or
+    "https", Spectrum will apply Cloudflare's HTTP/HTTPS features as it sends
+    traffic to your origin, and the application type matches this property exactly.
+    """
+
+    argo_smart_routing: Optional[bool] = None
+    """
+    Enables Argo Smart Routing for this application. Notes: Only available for TCP
+    applications with traffic_type set to "direct".
+    """
+
+    edge_ips: Optional[EdgeIPs] = None
+    """The anycast edge IP configuration for the hostname of this application."""
+
+    ip_firewall: Optional[bool] = None
+    """
+    Enables IP Access Rules for this application. Notes: Only available for TCP
+    applications.
+    """
+
+    origin_direct: Optional[List[str]] = None
+    """List of origin IP addresses.
+
+    Array may contain multiple IP addresses for load balancing.
+    """
+
+    origin_dns: Optional[OriginDNS] = None
+    """The name and type of DNS record for the Spectrum application."""
+
+    origin_port: Optional[OriginPort] = None
+    """The destination port at the origin.
+
+    Only specified in conjunction with origin_dns. May use an integer to specify a
+    single origin port, for example `1000`, or a string to specify a range of origin
+    ports, for example `"1000-2000"`. Notes: If specifying a port range, the number
+    of ports in the range must match the number of ports specified in the "protocol"
+    field.
+    """
+
+    proxy_protocol: Optional[Literal["off", "v1", "v2", "simple"]] = None
+    """Enables Proxy Protocol to the origin.
+
+    Refer to
+    [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/)
+    for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple
+    Proxy Protocol.
+    """
+
+    tls: Optional[Literal["off", "flexible", "full", "strict"]] = None
+    """The type of TLS termination associated with the application."""
+
+
+class SpectrumConfigPaygoAppConfig(BaseModel):
+    id: str
+    """App identifier."""
+
+    created_on: datetime
+    """When the Application was created."""
+
+    dns: DNS
+    """The name and type of DNS record for the Spectrum application."""
+
+    modified_on: datetime
+    """When the Application was last modified."""
+
+    protocol: str
+    """The port configuration at Cloudflare's edge.
+
+    May specify a single port, for example `"tcp/1000"`, or a range of ports, for
+    example `"tcp/1000-2000"`.
+    """
+
+    origin_direct: Optional[List[str]] = None
+    """List of origin IP addresses.
+
+    Array may contain multiple IP addresses for load balancing.
+    """
+
+
+AppGetResponse: TypeAlias = Union[SpectrumConfigAppConfig, SpectrumConfigPaygoAppConfig]
diff --git a/src/cloudflare/types/spectrum/app_list_params.py b/src/cloudflare/types/spectrum/app_list_params.py
index 99ec45b291f..84e5876649c 100644
--- a/src/cloudflare/types/spectrum/app_list_params.py
+++ b/src/cloudflare/types/spectrum/app_list_params.py
@@ -2,12 +2,15 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
 __all__ = ["AppListParams"]
 
 
 class AppListParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Zone identifier."""
+
     direction: Literal["asc", "desc"]
     """Sets the direction by which results are ordered."""
 
diff --git a/src/cloudflare/types/spectrum/app_list_response.py b/src/cloudflare/types/spectrum/app_list_response.py
new file mode 100644
index 00000000000..1291f24d57b
--- /dev/null
+++ b/src/cloudflare/types/spectrum/app_list_response.py
@@ -0,0 +1,119 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from .dns import DNS
+from .edge_ips import EdgeIPs
+from ..._models import BaseModel
+from .origin_dns import OriginDNS
+from .origin_port import OriginPort
+
+__all__ = ["AppListResponse", "SpectrumConfigAppConfig", "SpectrumConfigPaygoAppConfig"]
+
+
+class SpectrumConfigAppConfig(BaseModel):
+    id: str
+    """App identifier."""
+
+    created_on: datetime
+    """When the Application was created."""
+
+    dns: DNS
+    """The name and type of DNS record for the Spectrum application."""
+
+    modified_on: datetime
+    """When the Application was last modified."""
+
+    protocol: str
+    """The port configuration at Cloudflare's edge.
+
+    May specify a single port, for example `"tcp/1000"`, or a range of ports, for
+    example `"tcp/1000-2000"`.
+    """
+
+    traffic_type: Literal["direct", "http", "https"]
+    """Determines how data travels from the edge to your origin.
+
+    When set to "direct", Spectrum will send traffic directly to your origin, and
+    the application's type is derived from the `protocol`. When set to "http" or
+    "https", Spectrum will apply Cloudflare's HTTP/HTTPS features as it sends
+    traffic to your origin, and the application type matches this property exactly.
+    """
+
+    argo_smart_routing: Optional[bool] = None
+    """
+    Enables Argo Smart Routing for this application. Notes: Only available for TCP
+    applications with traffic_type set to "direct".
+    """
+
+    edge_ips: Optional[EdgeIPs] = None
+    """The anycast edge IP configuration for the hostname of this application."""
+
+    ip_firewall: Optional[bool] = None
+    """
+    Enables IP Access Rules for this application. Notes: Only available for TCP
+    applications.
+    """
+
+    origin_direct: Optional[List[str]] = None
+    """List of origin IP addresses.
+
+    Array may contain multiple IP addresses for load balancing.
+    """
+
+    origin_dns: Optional[OriginDNS] = None
+    """The name and type of DNS record for the Spectrum application."""
+
+    origin_port: Optional[OriginPort] = None
+    """The destination port at the origin.
+
+    Only specified in conjunction with origin_dns. May use an integer to specify a
+    single origin port, for example `1000`, or a string to specify a range of origin
+    ports, for example `"1000-2000"`. Notes: If specifying a port range, the number
+    of ports in the range must match the number of ports specified in the "protocol"
+    field.
+    """
+
+    proxy_protocol: Optional[Literal["off", "v1", "v2", "simple"]] = None
+    """Enables Proxy Protocol to the origin.
+
+    Refer to
+    [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/)
+    for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple
+    Proxy Protocol.
+    """
+
+    tls: Optional[Literal["off", "flexible", "full", "strict"]] = None
+    """The type of TLS termination associated with the application."""
+
+
+class SpectrumConfigPaygoAppConfig(BaseModel):
+    id: str
+    """App identifier."""
+
+    created_on: datetime
+    """When the Application was created."""
+
+    dns: DNS
+    """The name and type of DNS record for the Spectrum application."""
+
+    modified_on: datetime
+    """When the Application was last modified."""
+
+    protocol: str
+    """The port configuration at Cloudflare's edge.
+
+    May specify a single port, for example `"tcp/1000"`, or a range of ports, for
+    example `"tcp/1000-2000"`.
+    """
+
+    origin_direct: Optional[List[str]] = None
+    """List of origin IP addresses.
+
+    Array may contain multiple IP addresses for load balancing.
+    """
+
+
+AppListResponse: TypeAlias = Union[SpectrumConfigAppConfig, SpectrumConfigPaygoAppConfig]
diff --git a/src/cloudflare/types/spectrum/app_update_params.py b/src/cloudflare/types/spectrum/app_update_params.py
index 9a19d2453da..1c51cd912d6 100644
--- a/src/cloudflare/types/spectrum/app_update_params.py
+++ b/src/cloudflare/types/spectrum/app_update_params.py
@@ -2,43 +2,41 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal, Required, TypedDict
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
+from ..._types import SequenceNotStr
 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"]
+__all__ = ["AppUpdateParams", "SpectrumConfigAppConfig", "SpectrumConfigPaygoAppConfig"]
 
 
-class AppUpdateParams(TypedDict, total=False):
-    zone: Required[str]
-    """Identifier"""
+class SpectrumConfigAppConfig(TypedDict, total=False):
+    zone_id: Required[str]
+    """Zone identifier."""
 
     dns: Required[DNSParam]
     """The name and type of DNS record for the Spectrum application."""
 
-    origin_dns: Required[OriginDNSParam]
-    """The name and type of DNS record for the Spectrum application."""
-
-    origin_port: Required[OriginPortParam]
-    """The destination port at the origin.
-
-    Only specified in conjunction with origin_dns. May use an integer to specify a
-    single origin port, for example `1000`, or a string to specify a range of origin
-    ports, for example `"1000-2000"`. Notes: If specifying a port range, the number
-    of ports in the range must match the number of ports specified in the "protocol"
-    field.
-    """
-
     protocol: Required[str]
-    """The port configuration at Cloudflare’s edge.
+    """The port configuration at Cloudflare's edge.
 
     May specify a single port, for example `"tcp/1000"`, or a range of ports, for
     example `"tcp/1000-2000"`.
     """
 
+    traffic_type: Required[Literal["direct", "http", "https"]]
+    """Determines how data travels from the edge to your origin.
+
+    When set to "direct", Spectrum will send traffic directly to your origin, and
+    the application's type is derived from the `protocol`. When set to "http" or
+    "https", Spectrum will apply Cloudflare's HTTP/HTTPS features as it sends
+    traffic to your origin, and the application type matches this property exactly.
+    """
+
     argo_smart_routing: bool
     """
     Enables Argo Smart Routing for this application. Notes: Only available for TCP
@@ -54,6 +52,25 @@ class AppUpdateParams(TypedDict, total=False):
     applications.
     """
 
+    origin_direct: SequenceNotStr[str]
+    """List of origin IP addresses.
+
+    Array may contain multiple IP addresses for load balancing.
+    """
+
+    origin_dns: OriginDNSParam
+    """The name and type of DNS record for the Spectrum application."""
+
+    origin_port: OriginPortParam
+    """The destination port at the origin.
+
+    Only specified in conjunction with origin_dns. May use an integer to specify a
+    single origin port, for example `1000`, or a string to specify a range of origin
+    ports, for example `"1000-2000"`. Notes: If specifying a port range, the number
+    of ports in the range must match the number of ports specified in the "protocol"
+    field.
+    """
+
     proxy_protocol: Literal["off", "v1", "v2", "simple"]
     """Enables Proxy Protocol to the origin.
 
@@ -66,11 +83,26 @@ class AppUpdateParams(TypedDict, total=False):
     tls: Literal["off", "flexible", "full", "strict"]
     """The type of TLS termination associated with the application."""
 
-    traffic_type: Literal["direct", "http", "https"]
-    """Determines how data travels from the edge to your origin.
 
-    When set to "direct", Spectrum will send traffic directly to your origin, and
-    the application's type is derived from the `protocol`. When set to "http" or
-    "https", Spectrum will apply Cloudflare's HTTP/HTTPS features as it sends
-    traffic to your origin, and the application type matches this property exactly.
+class SpectrumConfigPaygoAppConfig(TypedDict, total=False):
+    zone_id: Required[str]
+    """Zone identifier."""
+
+    dns: Required[DNSParam]
+    """The name and type of DNS record for the Spectrum application."""
+
+    protocol: Required[str]
+    """The port configuration at Cloudflare's edge.
+
+    May specify a single port, for example `"tcp/1000"`, or a range of ports, for
+    example `"tcp/1000-2000"`.
+    """
+
+    origin_direct: SequenceNotStr[str]
+    """List of origin IP addresses.
+
+    Array may contain multiple IP addresses for load balancing.
     """
+
+
+AppUpdateParams: TypeAlias = Union[SpectrumConfigAppConfig, SpectrumConfigPaygoAppConfig]
diff --git a/src/cloudflare/types/spectrum/app_update_response.py b/src/cloudflare/types/spectrum/app_update_response.py
index 9f16609934f..b541c6d8c3c 100644
--- a/src/cloudflare/types/spectrum/app_update_response.py
+++ b/src/cloudflare/types/spectrum/app_update_response.py
@@ -1,8 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from .dns import DNS
 from .edge_ips import EdgeIPs
@@ -10,12 +10,37 @@
 from .origin_dns import OriginDNS
 from .origin_port import OriginPort
 
-__all__ = ["AppUpdateResponse"]
+__all__ = ["AppUpdateResponse", "SpectrumConfigAppConfig", "SpectrumConfigPaygoAppConfig"]
 
 
-class AppUpdateResponse(BaseModel):
-    id: Optional[str] = None
-    """Application identifier."""
+class SpectrumConfigAppConfig(BaseModel):
+    id: str
+    """App identifier."""
+
+    created_on: datetime
+    """When the Application was created."""
+
+    dns: DNS
+    """The name and type of DNS record for the Spectrum application."""
+
+    modified_on: datetime
+    """When the Application was last modified."""
+
+    protocol: str
+    """The port configuration at Cloudflare's edge.
+
+    May specify a single port, for example `"tcp/1000"`, or a range of ports, for
+    example `"tcp/1000-2000"`.
+    """
+
+    traffic_type: Literal["direct", "http", "https"]
+    """Determines how data travels from the edge to your origin.
+
+    When set to "direct", Spectrum will send traffic directly to your origin, and
+    the application's type is derived from the `protocol`. When set to "http" or
+    "https", Spectrum will apply Cloudflare's HTTP/HTTPS features as it sends
+    traffic to your origin, and the application type matches this property exactly.
+    """
 
     argo_smart_routing: Optional[bool] = None
     """
@@ -23,12 +48,6 @@ class AppUpdateResponse(BaseModel):
     applications with traffic_type set to "direct".
     """
 
-    created_on: Optional[datetime] = None
-    """When the Application was created."""
-
-    dns: Optional[DNS] = None
-    """The name and type of DNS record for the Spectrum application."""
-
     edge_ips: Optional[EdgeIPs] = None
     """The anycast edge IP configuration for the hostname of this application."""
 
@@ -38,8 +57,11 @@ class AppUpdateResponse(BaseModel):
     applications.
     """
 
-    modified_on: Optional[datetime] = None
-    """When the Application was last modified."""
+    origin_direct: Optional[List[str]] = None
+    """List of origin IP addresses.
+
+    Array may contain multiple IP addresses for load balancing.
+    """
 
     origin_dns: Optional[OriginDNS] = None
     """The name and type of DNS record for the Spectrum application."""
@@ -54,13 +76,6 @@ class AppUpdateResponse(BaseModel):
     field.
     """
 
-    protocol: Optional[str] = None
-    """The port configuration at Cloudflare’s edge.
-
-    May specify a single port, for example `"tcp/1000"`, or a range of ports, for
-    example `"tcp/1000-2000"`.
-    """
-
     proxy_protocol: Optional[Literal["off", "v1", "v2", "simple"]] = None
     """Enables Proxy Protocol to the origin.
 
@@ -73,11 +88,32 @@ class AppUpdateResponse(BaseModel):
     tls: Optional[Literal["off", "flexible", "full", "strict"]] = None
     """The type of TLS termination associated with the application."""
 
-    traffic_type: Optional[Literal["direct", "http", "https"]] = None
-    """Determines how data travels from the edge to your origin.
 
-    When set to "direct", Spectrum will send traffic directly to your origin, and
-    the application's type is derived from the `protocol`. When set to "http" or
-    "https", Spectrum will apply Cloudflare's HTTP/HTTPS features as it sends
-    traffic to your origin, and the application type matches this property exactly.
+class SpectrumConfigPaygoAppConfig(BaseModel):
+    id: str
+    """App identifier."""
+
+    created_on: datetime
+    """When the Application was created."""
+
+    dns: DNS
+    """The name and type of DNS record for the Spectrum application."""
+
+    modified_on: datetime
+    """When the Application was last modified."""
+
+    protocol: str
+    """The port configuration at Cloudflare's edge.
+
+    May specify a single port, for example `"tcp/1000"`, or a range of ports, for
+    example `"tcp/1000-2000"`.
+    """
+
+    origin_direct: Optional[List[str]] = None
+    """List of origin IP addresses.
+
+    Array may contain multiple IP addresses for load balancing.
     """
+
+
+AppUpdateResponse: TypeAlias = Union[SpectrumConfigAppConfig, SpectrumConfigPaygoAppConfig]
diff --git a/src/cloudflare/types/spectrum/dns.py b/src/cloudflare/types/spectrum/dns.py
index 6b21157c6f6..737cb845ce7 100644
--- a/src/cloudflare/types/spectrum/dns.py
+++ b/src/cloudflare/types/spectrum/dns.py
@@ -9,6 +9,8 @@
 
 
 class DNS(BaseModel):
+    """The name and type of DNS record for the Spectrum application."""
+
     name: Optional[str] = None
     """The name of the DNS record associated with the application."""
 
diff --git a/src/cloudflare/types/spectrum/dns_param.py b/src/cloudflare/types/spectrum/dns_param.py
index ef8fdee11b5..55f18a776ed 100644
--- a/src/cloudflare/types/spectrum/dns_param.py
+++ b/src/cloudflare/types/spectrum/dns_param.py
@@ -8,6 +8,8 @@
 
 
 class DNSParam(TypedDict, total=False):
+    """The name and type of DNS record for the Spectrum application."""
+
     name: str
     """The name of the DNS record associated with the application."""
 
diff --git a/src/cloudflare/types/spectrum/edge_ips.py b/src/cloudflare/types/spectrum/edge_ips.py
index 2b789322dfe..4cd5c450300 100644
--- a/src/cloudflare/types/spectrum/edge_ips.py
+++ b/src/cloudflare/types/spectrum/edge_ips.py
@@ -1,14 +1,14 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Union, Optional
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
 
-__all__ = ["EdgeIPs", "EyeballIPs", "CustomerOwnedIPs"]
+__all__ = ["EdgeIPs", "Dynamic", "Static"]
 
 
-class EyeballIPs(BaseModel):
+class Dynamic(BaseModel):
     connectivity: Optional[Literal["all", "ipv4", "ipv6"]] = None
     """The IP versions supported for inbound connections on Spectrum anycast IPs."""
 
@@ -20,7 +20,7 @@ class EyeballIPs(BaseModel):
     """
 
 
-class CustomerOwnedIPs(BaseModel):
+class Static(BaseModel):
     ips: Optional[List[str]] = None
     """
     The array of customer owned IPs we broadcast via anycast for this hostname and
@@ -35,4 +35,4 @@ class CustomerOwnedIPs(BaseModel):
     """
 
 
-EdgeIPs = Union[EyeballIPs, CustomerOwnedIPs]
+EdgeIPs: TypeAlias = Union[Dynamic, Static]
diff --git a/src/cloudflare/types/spectrum/edge_ips_param.py b/src/cloudflare/types/spectrum/edge_ips_param.py
index 54e00328eea..672cc6bdcfc 100644
--- a/src/cloudflare/types/spectrum/edge_ips_param.py
+++ b/src/cloudflare/types/spectrum/edge_ips_param.py
@@ -2,13 +2,15 @@
 
 from __future__ import annotations
 
-from typing import List, Union
-from typing_extensions import Literal, TypedDict
+from typing import Union
+from typing_extensions import Literal, TypeAlias, TypedDict
 
-__all__ = ["EdgeIPsParam", "EyeballIPs", "CustomerOwnedIPs"]
+from ..._types import SequenceNotStr
 
+__all__ = ["EdgeIPsParam", "Dynamic", "Static"]
 
-class EyeballIPs(TypedDict, total=False):
+
+class Dynamic(TypedDict, total=False):
     connectivity: Literal["all", "ipv4", "ipv6"]
     """The IP versions supported for inbound connections on Spectrum anycast IPs."""
 
@@ -20,8 +22,8 @@ class EyeballIPs(TypedDict, total=False):
     """
 
 
-class CustomerOwnedIPs(TypedDict, total=False):
-    ips: List[str]
+class Static(TypedDict, total=False):
+    ips: SequenceNotStr[str]
     """
     The array of customer owned IPs we broadcast via anycast for this hostname and
     application.
@@ -35,4 +37,4 @@ class CustomerOwnedIPs(TypedDict, total=False):
     """
 
 
-EdgeIPsParam = Union[EyeballIPs, CustomerOwnedIPs]
+EdgeIPsParam: TypeAlias = Union[Dynamic, Static]
diff --git a/src/cloudflare/types/spectrum/origin_dns.py b/src/cloudflare/types/spectrum/origin_dns.py
index 09bb671aef6..f5d636c5dca 100644
--- a/src/cloudflare/types/spectrum/origin_dns.py
+++ b/src/cloudflare/types/spectrum/origin_dns.py
@@ -9,6 +9,8 @@
 
 
 class OriginDNS(BaseModel):
+    """The name and type of DNS record for the Spectrum application."""
+
     name: Optional[str] = None
     """The name of the DNS record associated with the origin."""
 
diff --git a/src/cloudflare/types/spectrum/origin_dns_param.py b/src/cloudflare/types/spectrum/origin_dns_param.py
index 7549c967f1b..7bff3a0427c 100644
--- a/src/cloudflare/types/spectrum/origin_dns_param.py
+++ b/src/cloudflare/types/spectrum/origin_dns_param.py
@@ -8,6 +8,8 @@
 
 
 class OriginDNSParam(TypedDict, total=False):
+    """The name and type of DNS record for the Spectrum application."""
+
     name: str
     """The name of the DNS record associated with the origin."""
 
diff --git a/src/cloudflare/types/spectrum/origin_port.py b/src/cloudflare/types/spectrum/origin_port.py
index 8079b9b3479..774ceca5f36 100644
--- a/src/cloudflare/types/spectrum/origin_port.py
+++ b/src/cloudflare/types/spectrum/origin_port.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Union
+from typing_extensions import TypeAlias
 
 __all__ = ["OriginPort"]
 
-OriginPort = Union[int, str]
+OriginPort: TypeAlias = Union[int, str]
diff --git a/src/cloudflare/types/spectrum/origin_port_param.py b/src/cloudflare/types/spectrum/origin_port_param.py
index ce64ccbc3d1..0573c681c88 100644
--- a/src/cloudflare/types/spectrum/origin_port_param.py
+++ b/src/cloudflare/types/spectrum/origin_port_param.py
@@ -3,7 +3,8 @@
 from __future__ import annotations
 
 from typing import Union
+from typing_extensions import TypeAlias
 
 __all__ = ["OriginPortParam"]
 
-OriginPortParam = Union[int, str]
+OriginPortParam: TypeAlias = Union[int, str]
diff --git a/src/cloudflare/types/speed/availability.py b/src/cloudflare/types/speed/availability.py
index 96562a49349..d21b0a33c0e 100644
--- a/src/cloudflare/types/speed/availability.py
+++ b/src/cloudflare/types/speed/availability.py
@@ -1,20 +1,66 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Dict, List, Optional
+from typing import List, Optional
 
 from pydantic import Field as FieldInfo
 
 from ..._models import BaseModel
 from .labeled_region import LabeledRegion
 
-__all__ = ["Availability", "Quota"]
+__all__ = [
+    "Availability",
+    "Quota",
+    "QuotaQuotasPerPlan",
+    "QuotaQuotasPerPlanValue",
+    "QuotaScheduleQuotasPerPlan",
+    "QuotaScheduleQuotasPerPlanValue",
+    "RegionsPerPlan",
+]
+
+
+class QuotaQuotasPerPlanValue(BaseModel):
+    """Counts per account plan."""
+
+    business: Optional[int] = None
+
+    enterprise: Optional[int] = None
+
+    free: Optional[int] = None
+
+    pro: Optional[int] = None
+
+
+class QuotaQuotasPerPlan(BaseModel):
+    """The number of tests available per plan."""
+
+    value: Optional[QuotaQuotasPerPlanValue] = None
+    """Counts per account plan."""
+
+
+class QuotaScheduleQuotasPerPlanValue(BaseModel):
+    """Counts per account plan."""
+
+    business: Optional[int] = None
+
+    enterprise: Optional[int] = None
+
+    free: Optional[int] = None
+
+    pro: Optional[int] = None
+
+
+class QuotaScheduleQuotasPerPlan(BaseModel):
+    """The number of schedules available per plan."""
+
+    value: Optional[QuotaScheduleQuotasPerPlanValue] = None
+    """Counts per account plan."""
 
 
 class Quota(BaseModel):
     plan: Optional[str] = None
     """Cloudflare plan."""
 
-    quotas_per_plan: Optional[Dict[str, float]] = FieldInfo(alias="quotasPerPlan", default=None)
+    quotas_per_plan: Optional[QuotaQuotasPerPlan] = FieldInfo(alias="quotasPerPlan", default=None)
     """The number of tests available per plan."""
 
     remaining_schedules: Optional[float] = FieldInfo(alias="remainingSchedules", default=None)
@@ -23,13 +69,28 @@ class Quota(BaseModel):
     remaining_tests: Optional[float] = FieldInfo(alias="remainingTests", default=None)
     """The number of remaining tests available."""
 
-    schedule_quotas_per_plan: Optional[Dict[str, float]] = FieldInfo(alias="scheduleQuotasPerPlan", default=None)
+    schedule_quotas_per_plan: Optional[QuotaScheduleQuotasPerPlan] = FieldInfo(
+        alias="scheduleQuotasPerPlan", default=None
+    )
     """The number of schedules available per plan."""
 
 
+class RegionsPerPlan(BaseModel):
+    """Available regions."""
+
+    business: Optional[List[LabeledRegion]] = None
+
+    enterprise: Optional[List[LabeledRegion]] = None
+
+    free: Optional[List[LabeledRegion]] = None
+
+    pro: Optional[List[LabeledRegion]] = None
+
+
 class Availability(BaseModel):
     quota: Optional[Quota] = None
 
     regions: Optional[List[LabeledRegion]] = None
 
-    regions_per_plan: Optional[object] = FieldInfo(alias="regionsPerPlan", default=None)
+    regions_per_plan: Optional[RegionsPerPlan] = FieldInfo(alias="regionsPerPlan", default=None)
+    """Available regions."""
diff --git a/src/cloudflare/types/speed/labeled_region.py b/src/cloudflare/types/speed/labeled_region.py
index a6d8ab6a7bd..7a6eff4456d 100644
--- a/src/cloudflare/types/speed/labeled_region.py
+++ b/src/cloudflare/types/speed/labeled_region.py
@@ -9,6 +9,8 @@
 
 
 class LabeledRegion(BaseModel):
+    """A test region with a label."""
+
     label: Optional[str] = None
 
     value: Optional[
diff --git a/src/cloudflare/types/speed/lighthouse_report.py b/src/cloudflare/types/speed/lighthouse_report.py
index 95948430129..5e508d1b6ca 100644
--- a/src/cloudflare/types/speed/lighthouse_report.py
+++ b/src/cloudflare/types/speed/lighthouse_report.py
@@ -22,6 +22,8 @@ class Error(BaseModel):
 
 
 class LighthouseReport(BaseModel):
+    """The Lighthouse report."""
+
     cls: Optional[float] = None
     """Cumulative Layout Shift."""
 
diff --git a/src/cloudflare/types/speed/page_trend_params.py b/src/cloudflare/types/speed/page_trend_params.py
index c3df698ca13..b459824cc20 100644
--- a/src/cloudflare/types/speed/page_trend_params.py
+++ b/src/cloudflare/types/speed/page_trend_params.py
@@ -13,7 +13,7 @@
 
 class PageTrendParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     device_type: Required[Annotated[Literal["DESKTOP", "MOBILE"], PropertyInfo(alias="deviceType")]]
     """The type of device."""
diff --git a/src/cloudflare/types/speed/pages/__init__.py b/src/cloudflare/types/speed/pages/__init__.py
index 870ef29d6d4..21be79f68ee 100644
--- a/src/cloudflare/types/speed/pages/__init__.py
+++ b/src/cloudflare/types/speed/pages/__init__.py
@@ -6,5 +6,4 @@
 from .test_list_params import TestListParams as TestListParams
 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 .test_delete_response import TestDeleteResponse as TestDeleteResponse
diff --git a/src/cloudflare/types/speed/pages/test.py b/src/cloudflare/types/speed/pages/test.py
index 11667f87e5d..7b2cc133d71 100644
--- a/src/cloudflare/types/speed/pages/test.py
+++ b/src/cloudflare/types/speed/pages/test.py
@@ -16,7 +16,7 @@
 class Test(BaseModel):
     __test__ = False
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     date: Optional[datetime] = None
 
diff --git a/src/cloudflare/types/speed/pages/test_create_params.py b/src/cloudflare/types/speed/pages/test_create_params.py
index c61cee932ef..59d1d27a61c 100644
--- a/src/cloudflare/types/speed/pages/test_create_params.py
+++ b/src/cloudflare/types/speed/pages/test_create_params.py
@@ -9,7 +9,7 @@
 
 class TestCreateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     region: Literal[
         "asia-east1",
diff --git a/src/cloudflare/types/speed/pages/test_delete_params.py b/src/cloudflare/types/speed/pages/test_delete_params.py
index 2fbda2c48a2..7481c7403dd 100644
--- a/src/cloudflare/types/speed/pages/test_delete_params.py
+++ b/src/cloudflare/types/speed/pages/test_delete_params.py
@@ -9,7 +9,7 @@
 
 class TestDeleteParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     region: Literal[
         "asia-east1",
diff --git a/src/cloudflare/types/speed/pages/test_list_params.py b/src/cloudflare/types/speed/pages/test_list_params.py
index b26496e0bd7..d6dc3167860 100644
--- a/src/cloudflare/types/speed/pages/test_list_params.py
+++ b/src/cloudflare/types/speed/pages/test_list_params.py
@@ -9,7 +9,7 @@
 
 class TestListParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     page: int
 
diff --git a/src/cloudflare/types/speed/pages/test_list_response.py b/src/cloudflare/types/speed/pages/test_list_response.py
deleted file mode 100644
index 7433af9070e..00000000000
--- a/src/cloudflare/types/speed/pages/test_list_response.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from ...._models import BaseModel
-from ...shared.response_info import ResponseInfo
-
-__all__ = ["TestListResponse", "ResultInfo"]
-
-
-class ResultInfo(BaseModel):
-    count: Optional[int] = None
-
-    page: Optional[int] = None
-
-    per_page: Optional[int] = None
-
-    total_count: Optional[int] = None
-
-
-class TestListResponse(BaseModel):
-    __test__ = False
-    errors: List[ResponseInfo]
-
-    messages: List[ResponseInfo]
-
-    success: bool
-    """Whether the API call was successful."""
-
-    result_info: Optional[ResultInfo] = None
diff --git a/src/cloudflare/types/speed/schedule.py b/src/cloudflare/types/speed/schedule.py
index 42ae4c52008..98e0c777089 100644
--- a/src/cloudflare/types/speed/schedule.py
+++ b/src/cloudflare/types/speed/schedule.py
@@ -9,6 +9,8 @@
 
 
 class Schedule(BaseModel):
+    """The test schedule."""
+
     frequency: Optional[Literal["DAILY", "WEEKLY"]] = None
     """The frequency of the test."""
 
diff --git a/src/cloudflare/types/speed/schedule_create_params.py b/src/cloudflare/types/speed/schedule_create_params.py
index 94102af3706..e776e4255d6 100644
--- a/src/cloudflare/types/speed/schedule_create_params.py
+++ b/src/cloudflare/types/speed/schedule_create_params.py
@@ -9,7 +9,7 @@
 
 class ScheduleCreateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     region: Literal[
         "asia-east1",
diff --git a/src/cloudflare/types/speed/schedule_delete_params.py b/src/cloudflare/types/speed/schedule_delete_params.py
index 4ac243958a3..3248601fc2a 100644
--- a/src/cloudflare/types/speed/schedule_delete_params.py
+++ b/src/cloudflare/types/speed/schedule_delete_params.py
@@ -9,7 +9,7 @@
 
 class ScheduleDeleteParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     region: Literal[
         "asia-east1",
diff --git a/src/cloudflare/types/speed/schedule_get_params.py b/src/cloudflare/types/speed/schedule_get_params.py
index e9c75fdf435..7f3e96ab293 100644
--- a/src/cloudflare/types/speed/schedule_get_params.py
+++ b/src/cloudflare/types/speed/schedule_get_params.py
@@ -9,7 +9,7 @@
 
 class ScheduleGetParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     region: Literal[
         "asia-east1",
diff --git a/src/cloudflare/types/ssl/__init__.py b/src/cloudflare/types/ssl/__init__.py
index 6734fbac734..bc5ae8a0736 100644
--- a/src/cloudflare/types/ssl/__init__.py
+++ b/src/cloudflare/types/ssl/__init__.py
@@ -8,7 +8,6 @@
 from .request_validity import RequestValidity as RequestValidity
 from .validation_method import ValidationMethod as ValidationMethod
 from .analyze_create_params import AnalyzeCreateParams as AnalyzeCreateParams
-from .analyze_create_response import AnalyzeCreateResponse as AnalyzeCreateResponse
 from .verification_get_params import VerificationGetParams as VerificationGetParams
 from .verification_edit_params import VerificationEditParams as VerificationEditParams
 from .verification_get_response import VerificationGetResponse as VerificationGetResponse
@@ -17,5 +16,8 @@
 from .certificate_pack_edit_params import CertificatePackEditParams as CertificatePackEditParams
 from .certificate_pack_list_params import CertificatePackListParams as CertificatePackListParams
 from .certificate_pack_get_response import CertificatePackGetResponse as CertificatePackGetResponse
+from .certificate_pack_create_params import CertificatePackCreateParams as CertificatePackCreateParams
 from .certificate_pack_edit_response import CertificatePackEditResponse as CertificatePackEditResponse
+from .certificate_pack_list_response import CertificatePackListResponse as CertificatePackListResponse
+from .certificate_pack_create_response import CertificatePackCreateResponse as CertificatePackCreateResponse
 from .certificate_pack_delete_response import CertificatePackDeleteResponse as CertificatePackDeleteResponse
diff --git a/src/cloudflare/types/ssl/analyze_create_params.py b/src/cloudflare/types/ssl/analyze_create_params.py
index eb06d135711..cc33f00c9cc 100644
--- a/src/cloudflare/types/ssl/analyze_create_params.py
+++ b/src/cloudflare/types/ssl/analyze_create_params.py
@@ -11,7 +11,7 @@
 
 class AnalyzeCreateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     bundle_method: BundleMethod
     """
diff --git a/src/cloudflare/types/ssl/analyze_create_response.py b/src/cloudflare/types/ssl/analyze_create_response.py
deleted file mode 100644
index 7f3bb40cf1f..00000000000
--- a/src/cloudflare/types/ssl/analyze_create_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["AnalyzeCreateResponse"]
-
-AnalyzeCreateResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/ssl/certificate_pack_create_params.py b/src/cloudflare/types/ssl/certificate_pack_create_params.py
new file mode 100644
index 00000000000..1b52c52d05f
--- /dev/null
+++ b/src/cloudflare/types/ssl/certificate_pack_create_params.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from .host import Host
+from ..._types import SequenceNotStr
+
+__all__ = ["CertificatePackCreateParams"]
+
+
+class CertificatePackCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    certificate_authority: Required[Literal["google", "lets_encrypt", "ssl_com"]]
+    """Certificate Authority selected for the order.
+
+    For information on any certificate authority specific details or restrictions
+    [see this page for more details.](https://developers.cloudflare.com/ssl/reference/certificate-authorities)
+    """
+
+    hosts: Required[SequenceNotStr[Host]]
+    """Comma separated list of valid host names for the certificate packs.
+
+    Must contain the zone apex, may not contain more than 50 hosts, and may not be
+    empty.
+    """
+
+    type: Required[Literal["advanced"]]
+    """Type of certificate pack."""
+
+    validation_method: Required[Literal["txt", "http", "email"]]
+    """Validation Method selected for the order."""
+
+    validity_days: Required[Literal[14, 30, 90, 365]]
+    """Validity Days selected for the order."""
+
+    cloudflare_branding: bool
+    """Whether or not to add Cloudflare Branding for the order.
+
+    This will add a subdomain of sni.cloudflaressl.com as the Common Name if set to
+    true.
+    """
diff --git a/src/cloudflare/types/ssl/certificate_pack_create_response.py b/src/cloudflare/types/ssl/certificate_pack_create_response.py
new file mode 100644
index 00000000000..7e8b4a2e3b4
--- /dev/null
+++ b/src/cloudflare/types/ssl/certificate_pack_create_response.py
@@ -0,0 +1,156 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from .host import Host
+from .status import Status
+from ..._models import BaseModel
+
+__all__ = [
+    "CertificatePackCreateResponse",
+    "Certificate",
+    "CertificateGeoRestrictions",
+    "ValidationError",
+    "ValidationRecord",
+]
+
+
+class CertificateGeoRestrictions(BaseModel):
+    """Specify the region where your private key can be held locally."""
+
+    label: Optional[Literal["us", "eu", "highest_security"]] = None
+
+
+class Certificate(BaseModel):
+    """An individual certificate within a certificate pack."""
+
+    id: str
+    """Certificate identifier."""
+
+    hosts: List[str]
+    """Hostnames covered by this certificate."""
+
+    status: str
+    """Certificate status."""
+
+    bundle_method: Optional[str] = None
+    """Certificate bundle method."""
+
+    expires_on: Optional[datetime] = None
+    """When the certificate from the authority expires."""
+
+    geo_restrictions: Optional[CertificateGeoRestrictions] = None
+    """Specify the region where your private key can be held locally."""
+
+    issuer: Optional[str] = None
+    """The certificate authority that issued the certificate."""
+
+    modified_on: Optional[datetime] = None
+    """When the certificate was last modified."""
+
+    priority: Optional[float] = None
+    """The order/priority in which the certificate will be used."""
+
+    signature: Optional[str] = None
+    """The type of hash used for the certificate."""
+
+    uploaded_on: Optional[datetime] = None
+    """When the certificate was uploaded to Cloudflare."""
+
+    zone_id: Optional[str] = None
+    """Identifier."""
+
+
+class ValidationError(BaseModel):
+    message: Optional[str] = None
+    """A domain validation error."""
+
+
+class ValidationRecord(BaseModel):
+    """Certificate's required validation record."""
+
+    emails: Optional[List[str]] = None
+    """
+    The set of email addresses that the certificate authority (CA) will use to
+    complete domain validation.
+    """
+
+    http_body: Optional[str] = None
+    """
+    The content that the certificate authority (CA) will expect to find at the
+    http_url during the domain validation.
+    """
+
+    http_url: Optional[str] = None
+    """The url that will be checked during domain validation."""
+
+    txt_name: Optional[str] = None
+    """
+    The hostname that the certificate authority (CA) will check for a TXT record
+    during domain validation .
+    """
+
+    txt_value: Optional[str] = None
+    """
+    The TXT record that the certificate authority (CA) will check during domain
+    validation.
+    """
+
+
+class CertificatePackCreateResponse(BaseModel):
+    """A certificate pack with all its properties."""
+
+    id: str
+    """Identifier."""
+
+    certificates: List[Certificate]
+    """Array of certificates in this pack."""
+
+    hosts: List[Host]
+    """Comma separated list of valid host names for the certificate packs.
+
+    Must contain the zone apex, may not contain more than 50 hosts, and may not be
+    empty.
+    """
+
+    status: Status
+    """Status of certificate pack."""
+
+    type: Literal[
+        "mh_custom", "managed_hostname", "sni_custom", "universal", "advanced", "total_tls", "keyless", "legacy_custom"
+    ]
+    """Type of certificate pack."""
+
+    certificate_authority: Optional[Literal["google", "lets_encrypt", "ssl_com"]] = None
+    """Certificate Authority selected for the order.
+
+    For information on any certificate authority specific details or restrictions
+    [see this page for more details.](https://developers.cloudflare.com/ssl/reference/certificate-authorities)
+    """
+
+    cloudflare_branding: Optional[bool] = None
+    """Whether or not to add Cloudflare Branding for the order.
+
+    This will add a subdomain of sni.cloudflaressl.com as the Common Name if set to
+    true.
+    """
+
+    primary_certificate: Optional[str] = None
+    """Identifier of the primary certificate in a pack."""
+
+    validation_errors: Optional[List[ValidationError]] = None
+    """
+    Domain validation errors that have been received by the certificate authority
+    (CA).
+    """
+
+    validation_method: Optional[Literal["txt", "http", "email"]] = None
+    """Validation Method selected for the order."""
+
+    validation_records: Optional[List[ValidationRecord]] = None
+    """Certificates' validation records."""
+
+    validity_days: Optional[Literal[14, 30, 90, 365]] = None
+    """Validity Days selected for the order."""
diff --git a/src/cloudflare/types/ssl/certificate_pack_delete_response.py b/src/cloudflare/types/ssl/certificate_pack_delete_response.py
index 20f9fa49401..20b25c85b49 100644
--- a/src/cloudflare/types/ssl/certificate_pack_delete_response.py
+++ b/src/cloudflare/types/ssl/certificate_pack_delete_response.py
@@ -9,4 +9,4 @@
 
 class CertificatePackDeleteResponse(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
diff --git a/src/cloudflare/types/ssl/certificate_pack_edit_params.py b/src/cloudflare/types/ssl/certificate_pack_edit_params.py
index 3ca3b845dda..ac1eb503f9b 100644
--- a/src/cloudflare/types/ssl/certificate_pack_edit_params.py
+++ b/src/cloudflare/types/ssl/certificate_pack_edit_params.py
@@ -9,6 +9,11 @@
 
 class CertificatePackEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    body: Required[object]
+    cloudflare_branding: bool
+    """Whether or not to add Cloudflare Branding for the order.
+
+    This will add a subdomain of sni.cloudflaressl.com as the Common Name if set to
+    true.
+    """
diff --git a/src/cloudflare/types/ssl/certificate_pack_edit_response.py b/src/cloudflare/types/ssl/certificate_pack_edit_response.py
index 545348d5b33..bbfa664c5da 100644
--- a/src/cloudflare/types/ssl/certificate_pack_edit_response.py
+++ b/src/cloudflare/types/ssl/certificate_pack_edit_response.py
@@ -1,47 +1,156 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
+from datetime import datetime
 from typing_extensions import Literal
 
 from .host import Host
 from .status import Status
 from ..._models import BaseModel
 
-__all__ = ["CertificatePackEditResponse"]
+__all__ = [
+    "CertificatePackEditResponse",
+    "Certificate",
+    "CertificateGeoRestrictions",
+    "ValidationError",
+    "ValidationRecord",
+]
 
 
-class CertificatePackEditResponse(BaseModel):
-    id: Optional[str] = None
-    """Identifier"""
+class CertificateGeoRestrictions(BaseModel):
+    """Specify the region where your private key can be held locally."""
 
-    certificate_authority: Optional[Literal["google", "lets_encrypt"]] = None
-    """Certificate Authority selected for the order.
+    label: Optional[Literal["us", "eu", "highest_security"]] = None
 
-    For information on any certificate authority specific details or restrictions
-    [see this page for more details.](https://developers.cloudflare.com/ssl/reference/certificate-authorities)
+
+class Certificate(BaseModel):
+    """An individual certificate within a certificate pack."""
+
+    id: str
+    """Certificate identifier."""
+
+    hosts: List[str]
+    """Hostnames covered by this certificate."""
+
+    status: str
+    """Certificate status."""
+
+    bundle_method: Optional[str] = None
+    """Certificate bundle method."""
+
+    expires_on: Optional[datetime] = None
+    """When the certificate from the authority expires."""
+
+    geo_restrictions: Optional[CertificateGeoRestrictions] = None
+    """Specify the region where your private key can be held locally."""
+
+    issuer: Optional[str] = None
+    """The certificate authority that issued the certificate."""
+
+    modified_on: Optional[datetime] = None
+    """When the certificate was last modified."""
+
+    priority: Optional[float] = None
+    """The order/priority in which the certificate will be used."""
+
+    signature: Optional[str] = None
+    """The type of hash used for the certificate."""
+
+    uploaded_on: Optional[datetime] = None
+    """When the certificate was uploaded to Cloudflare."""
+
+    zone_id: Optional[str] = None
+    """Identifier."""
+
+
+class ValidationError(BaseModel):
+    message: Optional[str] = None
+    """A domain validation error."""
+
+
+class ValidationRecord(BaseModel):
+    """Certificate's required validation record."""
+
+    emails: Optional[List[str]] = None
+    """
+    The set of email addresses that the certificate authority (CA) will use to
+    complete domain validation.
     """
 
-    cloudflare_branding: Optional[bool] = None
-    """Whether or not to add Cloudflare Branding for the order.
+    http_body: Optional[str] = None
+    """
+    The content that the certificate authority (CA) will expect to find at the
+    http_url during the domain validation.
+    """
 
-    This will add sni.cloudflaressl.com as the Common Name if set true.
+    http_url: Optional[str] = None
+    """The url that will be checked during domain validation."""
+
+    txt_name: Optional[str] = None
+    """
+    The hostname that the certificate authority (CA) will check for a TXT record
+    during domain validation .
     """
 
-    hosts: Optional[List[Host]] = None
+    txt_value: Optional[str] = None
+    """
+    The TXT record that the certificate authority (CA) will check during domain
+    validation.
+    """
+
+
+class CertificatePackEditResponse(BaseModel):
+    """A certificate pack with all its properties."""
+
+    id: str
+    """Identifier."""
+
+    certificates: List[Certificate]
+    """Array of certificates in this pack."""
+
+    hosts: List[Host]
     """Comma separated list of valid host names for the certificate packs.
 
     Must contain the zone apex, may not contain more than 50 hosts, and may not be
     empty.
     """
 
-    status: Optional[Status] = None
+    status: Status
     """Status of certificate pack."""
 
-    type: Optional[Literal["advanced"]] = None
+    type: Literal[
+        "mh_custom", "managed_hostname", "sni_custom", "universal", "advanced", "total_tls", "keyless", "legacy_custom"
+    ]
     """Type of certificate pack."""
 
+    certificate_authority: Optional[Literal["google", "lets_encrypt", "ssl_com"]] = None
+    """Certificate Authority selected for the order.
+
+    For information on any certificate authority specific details or restrictions
+    [see this page for more details.](https://developers.cloudflare.com/ssl/reference/certificate-authorities)
+    """
+
+    cloudflare_branding: Optional[bool] = None
+    """Whether or not to add Cloudflare Branding for the order.
+
+    This will add a subdomain of sni.cloudflaressl.com as the Common Name if set to
+    true.
+    """
+
+    primary_certificate: Optional[str] = None
+    """Identifier of the primary certificate in a pack."""
+
+    validation_errors: Optional[List[ValidationError]] = None
+    """
+    Domain validation errors that have been received by the certificate authority
+    (CA).
+    """
+
     validation_method: Optional[Literal["txt", "http", "email"]] = None
     """Validation Method selected for the order."""
 
+    validation_records: Optional[List[ValidationRecord]] = None
+    """Certificates' validation records."""
+
     validity_days: Optional[Literal[14, 30, 90, 365]] = None
     """Validity Days selected for the order."""
diff --git a/src/cloudflare/types/ssl/certificate_pack_get_response.py b/src/cloudflare/types/ssl/certificate_pack_get_response.py
index 3623b6ab5af..126119249fc 100644
--- a/src/cloudflare/types/ssl/certificate_pack_get_response.py
+++ b/src/cloudflare/types/ssl/certificate_pack_get_response.py
@@ -1,7 +1,156 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
 
-__all__ = ["CertificatePackGetResponse"]
+from .host import Host
+from .status import Status
+from ..._models import BaseModel
 
-CertificatePackGetResponse = Union[Optional[str], Optional[object]]
+__all__ = [
+    "CertificatePackGetResponse",
+    "Certificate",
+    "CertificateGeoRestrictions",
+    "ValidationError",
+    "ValidationRecord",
+]
+
+
+class CertificateGeoRestrictions(BaseModel):
+    """Specify the region where your private key can be held locally."""
+
+    label: Optional[Literal["us", "eu", "highest_security"]] = None
+
+
+class Certificate(BaseModel):
+    """An individual certificate within a certificate pack."""
+
+    id: str
+    """Certificate identifier."""
+
+    hosts: List[str]
+    """Hostnames covered by this certificate."""
+
+    status: str
+    """Certificate status."""
+
+    bundle_method: Optional[str] = None
+    """Certificate bundle method."""
+
+    expires_on: Optional[datetime] = None
+    """When the certificate from the authority expires."""
+
+    geo_restrictions: Optional[CertificateGeoRestrictions] = None
+    """Specify the region where your private key can be held locally."""
+
+    issuer: Optional[str] = None
+    """The certificate authority that issued the certificate."""
+
+    modified_on: Optional[datetime] = None
+    """When the certificate was last modified."""
+
+    priority: Optional[float] = None
+    """The order/priority in which the certificate will be used."""
+
+    signature: Optional[str] = None
+    """The type of hash used for the certificate."""
+
+    uploaded_on: Optional[datetime] = None
+    """When the certificate was uploaded to Cloudflare."""
+
+    zone_id: Optional[str] = None
+    """Identifier."""
+
+
+class ValidationError(BaseModel):
+    message: Optional[str] = None
+    """A domain validation error."""
+
+
+class ValidationRecord(BaseModel):
+    """Certificate's required validation record."""
+
+    emails: Optional[List[str]] = None
+    """
+    The set of email addresses that the certificate authority (CA) will use to
+    complete domain validation.
+    """
+
+    http_body: Optional[str] = None
+    """
+    The content that the certificate authority (CA) will expect to find at the
+    http_url during the domain validation.
+    """
+
+    http_url: Optional[str] = None
+    """The url that will be checked during domain validation."""
+
+    txt_name: Optional[str] = None
+    """
+    The hostname that the certificate authority (CA) will check for a TXT record
+    during domain validation .
+    """
+
+    txt_value: Optional[str] = None
+    """
+    The TXT record that the certificate authority (CA) will check during domain
+    validation.
+    """
+
+
+class CertificatePackGetResponse(BaseModel):
+    """A certificate pack with all its properties."""
+
+    id: str
+    """Identifier."""
+
+    certificates: List[Certificate]
+    """Array of certificates in this pack."""
+
+    hosts: List[Host]
+    """Comma separated list of valid host names for the certificate packs.
+
+    Must contain the zone apex, may not contain more than 50 hosts, and may not be
+    empty.
+    """
+
+    status: Status
+    """Status of certificate pack."""
+
+    type: Literal[
+        "mh_custom", "managed_hostname", "sni_custom", "universal", "advanced", "total_tls", "keyless", "legacy_custom"
+    ]
+    """Type of certificate pack."""
+
+    certificate_authority: Optional[Literal["google", "lets_encrypt", "ssl_com"]] = None
+    """Certificate Authority selected for the order.
+
+    For information on any certificate authority specific details or restrictions
+    [see this page for more details.](https://developers.cloudflare.com/ssl/reference/certificate-authorities)
+    """
+
+    cloudflare_branding: Optional[bool] = None
+    """Whether or not to add Cloudflare Branding for the order.
+
+    This will add a subdomain of sni.cloudflaressl.com as the Common Name if set to
+    true.
+    """
+
+    primary_certificate: Optional[str] = None
+    """Identifier of the primary certificate in a pack."""
+
+    validation_errors: Optional[List[ValidationError]] = None
+    """
+    Domain validation errors that have been received by the certificate authority
+    (CA).
+    """
+
+    validation_method: Optional[Literal["txt", "http", "email"]] = None
+    """Validation Method selected for the order."""
+
+    validation_records: Optional[List[ValidationRecord]] = None
+    """Certificates' validation records."""
+
+    validity_days: Optional[Literal[14, 30, 90, 365]] = None
+    """Validity Days selected for the order."""
diff --git a/src/cloudflare/types/ssl/certificate_pack_list_params.py b/src/cloudflare/types/ssl/certificate_pack_list_params.py
index 65532eead27..60e4ed1a7ec 100644
--- a/src/cloudflare/types/ssl/certificate_pack_list_params.py
+++ b/src/cloudflare/types/ssl/certificate_pack_list_params.py
@@ -9,7 +9,7 @@
 
 class CertificatePackListParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     status: Literal["all"]
     """Include Certificate Packs of all statuses, not just active ones."""
diff --git a/src/cloudflare/types/ssl/certificate_pack_list_response.py b/src/cloudflare/types/ssl/certificate_pack_list_response.py
new file mode 100644
index 00000000000..f189cc048b0
--- /dev/null
+++ b/src/cloudflare/types/ssl/certificate_pack_list_response.py
@@ -0,0 +1,156 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from .host import Host
+from .status import Status
+from ..._models import BaseModel
+
+__all__ = [
+    "CertificatePackListResponse",
+    "Certificate",
+    "CertificateGeoRestrictions",
+    "ValidationError",
+    "ValidationRecord",
+]
+
+
+class CertificateGeoRestrictions(BaseModel):
+    """Specify the region where your private key can be held locally."""
+
+    label: Optional[Literal["us", "eu", "highest_security"]] = None
+
+
+class Certificate(BaseModel):
+    """An individual certificate within a certificate pack."""
+
+    id: str
+    """Certificate identifier."""
+
+    hosts: List[str]
+    """Hostnames covered by this certificate."""
+
+    status: str
+    """Certificate status."""
+
+    bundle_method: Optional[str] = None
+    """Certificate bundle method."""
+
+    expires_on: Optional[datetime] = None
+    """When the certificate from the authority expires."""
+
+    geo_restrictions: Optional[CertificateGeoRestrictions] = None
+    """Specify the region where your private key can be held locally."""
+
+    issuer: Optional[str] = None
+    """The certificate authority that issued the certificate."""
+
+    modified_on: Optional[datetime] = None
+    """When the certificate was last modified."""
+
+    priority: Optional[float] = None
+    """The order/priority in which the certificate will be used."""
+
+    signature: Optional[str] = None
+    """The type of hash used for the certificate."""
+
+    uploaded_on: Optional[datetime] = None
+    """When the certificate was uploaded to Cloudflare."""
+
+    zone_id: Optional[str] = None
+    """Identifier."""
+
+
+class ValidationError(BaseModel):
+    message: Optional[str] = None
+    """A domain validation error."""
+
+
+class ValidationRecord(BaseModel):
+    """Certificate's required validation record."""
+
+    emails: Optional[List[str]] = None
+    """
+    The set of email addresses that the certificate authority (CA) will use to
+    complete domain validation.
+    """
+
+    http_body: Optional[str] = None
+    """
+    The content that the certificate authority (CA) will expect to find at the
+    http_url during the domain validation.
+    """
+
+    http_url: Optional[str] = None
+    """The url that will be checked during domain validation."""
+
+    txt_name: Optional[str] = None
+    """
+    The hostname that the certificate authority (CA) will check for a TXT record
+    during domain validation .
+    """
+
+    txt_value: Optional[str] = None
+    """
+    The TXT record that the certificate authority (CA) will check during domain
+    validation.
+    """
+
+
+class CertificatePackListResponse(BaseModel):
+    """A certificate pack with all its properties."""
+
+    id: str
+    """Identifier."""
+
+    certificates: List[Certificate]
+    """Array of certificates in this pack."""
+
+    hosts: List[Host]
+    """Comma separated list of valid host names for the certificate packs.
+
+    Must contain the zone apex, may not contain more than 50 hosts, and may not be
+    empty.
+    """
+
+    status: Status
+    """Status of certificate pack."""
+
+    type: Literal[
+        "mh_custom", "managed_hostname", "sni_custom", "universal", "advanced", "total_tls", "keyless", "legacy_custom"
+    ]
+    """Type of certificate pack."""
+
+    certificate_authority: Optional[Literal["google", "lets_encrypt", "ssl_com"]] = None
+    """Certificate Authority selected for the order.
+
+    For information on any certificate authority specific details or restrictions
+    [see this page for more details.](https://developers.cloudflare.com/ssl/reference/certificate-authorities)
+    """
+
+    cloudflare_branding: Optional[bool] = None
+    """Whether or not to add Cloudflare Branding for the order.
+
+    This will add a subdomain of sni.cloudflaressl.com as the Common Name if set to
+    true.
+    """
+
+    primary_certificate: Optional[str] = None
+    """Identifier of the primary certificate in a pack."""
+
+    validation_errors: Optional[List[ValidationError]] = None
+    """
+    Domain validation errors that have been received by the certificate authority
+    (CA).
+    """
+
+    validation_method: Optional[Literal["txt", "http", "email"]] = None
+    """Validation Method selected for the order."""
+
+    validation_records: Optional[List[ValidationRecord]] = None
+    """Certificates' validation records."""
+
+    validity_days: Optional[Literal[14, 30, 90, 365]] = None
+    """Validity Days selected for the order."""
diff --git a/src/cloudflare/types/ssl/certificate_packs/__init__.py b/src/cloudflare/types/ssl/certificate_packs/__init__.py
index 9251bdda1e4..83304891f5e 100644
--- a/src/cloudflare/types/ssl/certificate_packs/__init__.py
+++ b/src/cloudflare/types/ssl/certificate_packs/__init__.py
@@ -3,5 +3,3 @@
 from __future__ import annotations
 
 from .quota_get_response import QuotaGetResponse as QuotaGetResponse
-from .order_create_params import OrderCreateParams as OrderCreateParams
-from .order_create_response import OrderCreateResponse as OrderCreateResponse
diff --git a/src/cloudflare/types/ssl/certificate_packs/order_create_params.py b/src/cloudflare/types/ssl/certificate_packs/order_create_params.py
deleted file mode 100644
index 103bd5658af..00000000000
--- a/src/cloudflare/types/ssl/certificate_packs/order_create_params.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List
-from typing_extensions import Literal, Required, TypedDict
-
-from ..host import Host
-
-__all__ = ["OrderCreateParams"]
-
-
-class OrderCreateParams(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    certificate_authority: Required[Literal["google", "lets_encrypt"]]
-    """Certificate Authority selected for the order.
-
-    For information on any certificate authority specific details or restrictions
-    [see this page for more details.](https://developers.cloudflare.com/ssl/reference/certificate-authorities)
-    """
-
-    hosts: Required[List[Host]]
-    """Comma separated list of valid host names for the certificate packs.
-
-    Must contain the zone apex, may not contain more than 50 hosts, and may not be
-    empty.
-    """
-
-    type: Required[Literal["advanced"]]
-    """Type of certificate pack."""
-
-    validation_method: Required[Literal["txt", "http", "email"]]
-    """Validation Method selected for the order."""
-
-    validity_days: Required[Literal[14, 30, 90, 365]]
-    """Validity Days selected for the order."""
-
-    cloudflare_branding: bool
-    """Whether or not to add Cloudflare Branding for the order.
-
-    This will add sni.cloudflaressl.com as the Common Name if set true.
-    """
diff --git a/src/cloudflare/types/ssl/certificate_packs/order_create_response.py b/src/cloudflare/types/ssl/certificate_packs/order_create_response.py
deleted file mode 100644
index 2f95bb27fc1..00000000000
--- a/src/cloudflare/types/ssl/certificate_packs/order_create_response.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from typing_extensions import Literal
-
-from ..host import Host
-from ..status import Status
-from ...._models import BaseModel
-
-__all__ = ["OrderCreateResponse"]
-
-
-class OrderCreateResponse(BaseModel):
-    id: Optional[str] = None
-    """Identifier"""
-
-    certificate_authority: Optional[Literal["google", "lets_encrypt"]] = None
-    """Certificate Authority selected for the order.
-
-    For information on any certificate authority specific details or restrictions
-    [see this page for more details.](https://developers.cloudflare.com/ssl/reference/certificate-authorities)
-    """
-
-    cloudflare_branding: Optional[bool] = None
-    """Whether or not to add Cloudflare Branding for the order.
-
-    This will add sni.cloudflaressl.com as the Common Name if set true.
-    """
-
-    hosts: Optional[List[Host]] = None
-    """Comma separated list of valid host names for the certificate packs.
-
-    Must contain the zone apex, may not contain more than 50 hosts, and may not be
-    empty.
-    """
-
-    status: Optional[Status] = None
-    """Status of certificate pack."""
-
-    type: Optional[Literal["advanced"]] = None
-    """Type of certificate pack."""
-
-    validation_method: Optional[Literal["txt", "http", "email"]] = None
-    """Validation Method selected for the order."""
-
-    validity_days: Optional[Literal[14, 30, 90, 365]] = None
-    """Validity Days selected for the order."""
diff --git a/src/cloudflare/types/ssl/host.py b/src/cloudflare/types/ssl/host.py
index f5b05acf1c6..c294bcb2e2f 100644
--- a/src/cloudflare/types/ssl/host.py
+++ b/src/cloudflare/types/ssl/host.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["Host"]
 
-Host = str
+Host: TypeAlias = str
diff --git a/src/cloudflare/types/ssl/recommendation_get_response.py b/src/cloudflare/types/ssl/recommendation_get_response.py
index 1f7fa47d239..9a9d74b7e27 100644
--- a/src/cloudflare/types/ssl/recommendation_get_response.py
+++ b/src/cloudflare/types/ssl/recommendation_get_response.py
@@ -10,9 +10,16 @@
 
 
 class RecommendationGetResponse(BaseModel):
-    id: Optional[str] = None
-    """Identifier of a recommedation result."""
+    id: str
 
-    modified_on: Optional[datetime] = None
+    editable: bool
+    """Whether this setting can be updated or not."""
 
-    value: Optional[Literal["flexible", "full", "strict"]] = None
+    modified_on: datetime
+    """Last time this setting was modified."""
+
+    value: Literal["auto", "custom"]
+    """Current setting of the automatic SSL/TLS."""
+
+    next_scheduled_scan: Optional[datetime] = None
+    """Next time this zone will be scanned by the Automatic SSL/TLS."""
diff --git a/src/cloudflare/types/ssl/request_validity.py b/src/cloudflare/types/ssl/request_validity.py
index bbacbc27cd1..03fcdbf3cb9 100644
--- a/src/cloudflare/types/ssl/request_validity.py
+++ b/src/cloudflare/types/ssl/request_validity.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["RequestValidity"]
 
-RequestValidity = Literal[7, 30, 90, 365, 730, 1095, 5475]
+RequestValidity: TypeAlias = Literal[7, 30, 90, 365, 730, 1095, 5475]
diff --git a/src/cloudflare/types/ssl/status.py b/src/cloudflare/types/ssl/status.py
index aac3d6b759b..5fa807b7baa 100644
--- a/src/cloudflare/types/ssl/status.py
+++ b/src/cloudflare/types/ssl/status.py
@@ -1,10 +1,10 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["Status"]
 
-Status = Literal[
+Status: TypeAlias = Literal[
     "initializing",
     "pending_validation",
     "deleted",
diff --git a/src/cloudflare/types/ssl/universal/setting_edit_params.py b/src/cloudflare/types/ssl/universal/setting_edit_params.py
index ab4f62f07e8..e7e19a63085 100644
--- a/src/cloudflare/types/ssl/universal/setting_edit_params.py
+++ b/src/cloudflare/types/ssl/universal/setting_edit_params.py
@@ -9,7 +9,7 @@
 
 class SettingEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     enabled: bool
     """
diff --git a/src/cloudflare/types/ssl/validation_method.py b/src/cloudflare/types/ssl/validation_method.py
index f7aae0fdcd3..27faa5fbaaf 100644
--- a/src/cloudflare/types/ssl/validation_method.py
+++ b/src/cloudflare/types/ssl/validation_method.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["ValidationMethod"]
 
-ValidationMethod = Literal["http", "cname", "txt"]
+ValidationMethod: TypeAlias = Literal["http", "cname", "txt"]
diff --git a/src/cloudflare/types/ssl/verification.py b/src/cloudflare/types/ssl/verification.py
index 3c917bd9955..1594b9b0731 100644
--- a/src/cloudflare/types/ssl/verification.py
+++ b/src/cloudflare/types/ssl/verification.py
@@ -10,6 +10,8 @@
 
 
 class VerificationInfo(BaseModel):
+    """Certificate's required verification information."""
+
     record_name: Optional[Literal["record_name", "http_url", "cname", "txt_name"]] = None
     """Name of CNAME record."""
 
diff --git a/src/cloudflare/types/ssl/verification_edit_params.py b/src/cloudflare/types/ssl/verification_edit_params.py
index a561f45caf3..2ec2389f68b 100644
--- a/src/cloudflare/types/ssl/verification_edit_params.py
+++ b/src/cloudflare/types/ssl/verification_edit_params.py
@@ -9,7 +9,7 @@
 
 class VerificationEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     validation_method: Required[Literal["http", "cname", "txt", "email"]]
     """Desired validation method."""
diff --git a/src/cloudflare/types/ssl/verification_get_params.py b/src/cloudflare/types/ssl/verification_get_params.py
index cf66987e41f..1f33b183f83 100644
--- a/src/cloudflare/types/ssl/verification_get_params.py
+++ b/src/cloudflare/types/ssl/verification_get_params.py
@@ -9,7 +9,7 @@
 
 class VerificationGetParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     retry: Literal[True]
     """Immediately retry SSL Verification."""
diff --git a/src/cloudflare/types/ssl/verification_get_response.py b/src/cloudflare/types/ssl/verification_get_response.py
index d273404bc2f..b099ce4d0c4 100644
--- a/src/cloudflare/types/ssl/verification_get_response.py
+++ b/src/cloudflare/types/ssl/verification_get_response.py
@@ -1,9 +1,10 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from typing_extensions import TypeAlias
 
 from .verification import Verification
 
 __all__ = ["VerificationGetResponse"]
 
-VerificationGetResponse = List[Verification]
+VerificationGetResponse: TypeAlias = List[Verification]
diff --git a/src/cloudflare/types/storage/__init__.py b/src/cloudflare/types/storage/__init__.py
deleted file mode 100644
index 003dd49ba66..00000000000
--- a/src/cloudflare/types/storage/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from .schema import Schema as Schema
-from .components import Components as Components
-from .analytics_list_params import AnalyticsListParams as AnalyticsListParams
-from .analytics_stored_params import AnalyticsStoredParams as AnalyticsStoredParams
diff --git a/src/cloudflare/types/storage/analytics_list_params.py b/src/cloudflare/types/storage/analytics_list_params.py
deleted file mode 100644
index 989096be015..00000000000
--- a/src/cloudflare/types/storage/analytics_list_params.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List, Union, Iterable
-from datetime import datetime
-from typing_extensions import Literal, Required, Annotated, TypedDict
-
-from ..._utils import PropertyInfo
-
-__all__ = ["AnalyticsListParams", "Query"]
-
-
-class AnalyticsListParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    query: Query
-    """For specifying result metrics."""
-
-
-class Query(TypedDict, total=False):
-    dimensions: List[Literal["accountId", "responseCode", "requestType"]]
-    """Can be used to break down the data by given attributes."""
-
-    filters: str
-    """Used to filter rows by one or more dimensions.
-
-    Filters can be combined using OR and AND boolean logic. AND takes precedence
-    over OR in all the expressions. The OR operator is defined using a comma (,) or
-    OR keyword surrounded by whitespace. The AND operator is defined using a
-    semicolon (;) or AND keyword surrounded by whitespace. Note that the semicolon
-    is a reserved character in URLs (rfc1738) and needs to be percent-encoded as
-    %3B. Comparison options are:
-
-    | Operator | Name                     | URL Encoded |
-    | -------- | ------------------------ | ----------- |
-    | ==       | Equals                   | %3D%3D      |
-    | !=       | Does not equals          | !%3D        |
-    | >        | Greater Than             | %3E         |
-    | <        | Less Than                | %3C         |
-    | >=       | Greater than or equal to | %3E%3D      |
-    | <=       | Less than or equal to    | %3C%3D .    |
-    """
-
-    limit: int
-    """Limit number of returned metrics."""
-
-    metrics: List[Literal["requests", "writeKiB", "readKiB"]]
-    """One or more metrics to compute."""
-
-    since: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-    """Start of time interval to query, defaults to 6 hours before request received."""
-
-    sort: Iterable[object]
-    """
-    Array of dimensions or metrics to sort by, each dimension/metric may be prefixed
-    by - (descending) or + (ascending).
-    """
-
-    until: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-    """End of time interval to query, defaults to current time."""
diff --git a/src/cloudflare/types/storage/analytics_stored_params.py b/src/cloudflare/types/storage/analytics_stored_params.py
deleted file mode 100644
index f104e70081e..00000000000
--- a/src/cloudflare/types/storage/analytics_stored_params.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List, Union, Iterable
-from datetime import datetime
-from typing_extensions import Literal, Required, Annotated, TypedDict
-
-from ..._utils import PropertyInfo
-
-__all__ = ["AnalyticsStoredParams", "Query"]
-
-
-class AnalyticsStoredParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    query: Query
-    """For specifying result metrics."""
-
-
-class Query(TypedDict, total=False):
-    dimensions: List[Literal["namespaceId"]]
-    """Can be used to break down the data by given attributes."""
-
-    filters: str
-    """Used to filter rows by one or more dimensions.
-
-    Filters can be combined using OR and AND boolean logic. AND takes precedence
-    over OR in all the expressions. The OR operator is defined using a comma (,) or
-    OR keyword surrounded by whitespace. The AND operator is defined using a
-    semicolon (;) or AND keyword surrounded by whitespace. Note that the semicolon
-    is a reserved character in URLs (rfc1738) and needs to be percent-encoded as
-    %3B. Comparison options are:
-
-    | Operator | Name                     | URL Encoded |
-    | -------- | ------------------------ | ----------- |
-    | ==       | Equals                   | %3D%3D      |
-    | !=       | Does not equals          | !%3D        |
-    | >        | Greater Than             | %3E         |
-    | <        | Less Than                | %3C         |
-    | >=       | Greater than or equal to | %3E%3D      |
-    | <=       | Less than or equal to    | %3C%3D .    |
-    """
-
-    limit: int
-    """Limit number of returned metrics."""
-
-    metrics: List[Literal["storedBytes", "storedKeys"]]
-    """One or more metrics to compute."""
-
-    since: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-    """Start of time interval to query, defaults to 6 hours before request received."""
-
-    sort: Iterable[object]
-    """
-    Array of dimensions or metrics to sort by, each dimension/metric may be prefixed
-    by - (descending) or + (ascending).
-    """
-
-    until: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-    """End of time interval to query, defaults to current time."""
diff --git a/src/cloudflare/types/storage/components.py b/src/cloudflare/types/storage/components.py
deleted file mode 100644
index 301f41ede27..00000000000
--- a/src/cloudflare/types/storage/components.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from datetime import datetime
-
-from ..._models import BaseModel
-
-__all__ = ["Components", "Data", "Query"]
-
-
-class Data(BaseModel):
-    metrics: List[object]
-    """List of metrics returned by the query."""
-
-
-class Query(BaseModel):
-    dimensions: Optional[List[str]] = None
-    """Can be used to break down the data by given attributes."""
-
-    filters: Optional[str] = None
-    """Used to filter rows by one or more dimensions.
-
-    Filters can be combined using OR and AND boolean logic. AND takes precedence
-    over OR in all the expressions. The OR operator is defined using a comma (,) or
-    OR keyword surrounded by whitespace. The AND operator is defined using a
-    semicolon (;) or AND keyword surrounded by whitespace. Note that the semicolon
-    is a reserved character in URLs (rfc1738) and needs to be percent-encoded as
-    %3B. Comparison options are:
-
-    | Operator | Name                     | URL Encoded |
-    | -------- | ------------------------ | ----------- |
-    | ==       | Equals                   | %3D%3D      |
-    | !=       | Does not equals          | !%3D        |
-    | >        | Greater Than             | %3E         |
-    | <        | Less Than                | %3C         |
-    | >=       | Greater than or equal to | %3E%3D      |
-    | <=       | Less than or equal to    | %3C%3D .    |
-    """
-
-    limit: Optional[int] = None
-    """Limit number of returned metrics."""
-
-    metrics: Optional[List[str]] = None
-    """One or more metrics to compute."""
-
-    since: Optional[datetime] = None
-    """Start of time interval to query, defaults to 6 hours before request received."""
-
-    sort: Optional[List[object]] = None
-    """
-    Array of dimensions or metrics to sort by, each dimension/metric may be prefixed
-    by - (descending) or + (ascending).
-    """
-
-    until: Optional[datetime] = None
-    """End of time interval to query, defaults to current time."""
-
-
-class Components(BaseModel):
-    data: Optional[List[Data]] = None
-
-    data_lag: float
-    """Number of seconds between current time and last processed event, i.e.
-
-    how many seconds of data could be missing.
-    """
-
-    max: object
-    """Maximum results for each metric."""
-
-    min: object
-    """Minimum results for each metric."""
-
-    query: Query
-    """For specifying result metrics."""
-
-    rows: float
-    """Total number of rows in the result."""
-
-    totals: object
-    """Total results for metrics across all data."""
diff --git a/src/cloudflare/types/storage/schema.py b/src/cloudflare/types/storage/schema.py
deleted file mode 100644
index 2e1c5743d29..00000000000
--- a/src/cloudflare/types/storage/schema.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from datetime import datetime
-
-from ..._models import BaseModel
-
-__all__ = ["Schema", "Data", "Query"]
-
-
-class Data(BaseModel):
-    metrics: List[object]
-    """List of metrics returned by the query."""
-
-
-class Query(BaseModel):
-    dimensions: Optional[List[str]] = None
-    """Can be used to break down the data by given attributes."""
-
-    filters: Optional[str] = None
-    """Used to filter rows by one or more dimensions.
-
-    Filters can be combined using OR and AND boolean logic. AND takes precedence
-    over OR in all the expressions. The OR operator is defined using a comma (,) or
-    OR keyword surrounded by whitespace. The AND operator is defined using a
-    semicolon (;) or AND keyword surrounded by whitespace. Note that the semicolon
-    is a reserved character in URLs (rfc1738) and needs to be percent-encoded as
-    %3B. Comparison options are:
-
-    | Operator | Name                     | URL Encoded |
-    | -------- | ------------------------ | ----------- |
-    | ==       | Equals                   | %3D%3D      |
-    | !=       | Does not equals          | !%3D        |
-    | >        | Greater Than             | %3E         |
-    | <        | Less Than                | %3C         |
-    | >=       | Greater than or equal to | %3E%3D      |
-    | <=       | Less than or equal to    | %3C%3D .    |
-    """
-
-    limit: Optional[int] = None
-    """Limit number of returned metrics."""
-
-    metrics: Optional[List[str]] = None
-    """One or more metrics to compute."""
-
-    since: Optional[datetime] = None
-    """Start of time interval to query, defaults to 6 hours before request received."""
-
-    sort: Optional[List[object]] = None
-    """
-    Array of dimensions or metrics to sort by, each dimension/metric may be prefixed
-    by - (descending) or + (ascending).
-    """
-
-    until: Optional[datetime] = None
-    """End of time interval to query, defaults to current time."""
-
-
-class Schema(BaseModel):
-    data: Optional[List[Data]] = None
-
-    data_lag: float
-    """Number of seconds between current time and last processed event, i.e.
-
-    how many seconds of data could be missing.
-    """
-
-    max: object
-    """Maximum results for each metric."""
-
-    min: object
-    """Minimum results for each metric."""
-
-    query: Query
-    """For specifying result metrics."""
-
-    rows: float
-    """Total number of rows in the result."""
-
-    totals: object
-    """Total results for metrics across all data."""
diff --git a/src/cloudflare/types/stream/__init__.py b/src/cloudflare/types/stream/__init__.py
index d2cc2a2aed1..0442bd09268 100644
--- a/src/cloudflare/types/stream/__init__.py
+++ b/src/cloudflare/types/stream/__init__.py
@@ -15,12 +15,11 @@
 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_edit_params import StreamEditParams as StreamEditParams
 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 .webhook_get_response import WebhookGetResponse as WebhookGetResponse
 from .download_get_response import DownloadGetResponse as DownloadGetResponse
 from .token_create_response import TokenCreateResponse as TokenCreateResponse
 from .webhook_update_params import WebhookUpdateParams as WebhookUpdateParams
@@ -30,8 +29,6 @@
 from .audio_track_edit_params import AudioTrackEditParams as AudioTrackEditParams
 from .watermark_create_params import WatermarkCreateParams as WatermarkCreateParams
 from .webhook_delete_response import WebhookDeleteResponse as WebhookDeleteResponse
-from .webhook_update_response import WebhookUpdateResponse as WebhookUpdateResponse
-from .audio_track_get_response import AudioTrackGetResponse as AudioTrackGetResponse
 from .download_create_response import DownloadCreateResponse as DownloadCreateResponse
 from .download_delete_response import DownloadDeleteResponse as DownloadDeleteResponse
 from .live_input_create_params import LiveInputCreateParams as LiveInputCreateParams
diff --git a/src/cloudflare/types/stream/allowed_origins.py b/src/cloudflare/types/stream/allowed_origins.py
index d18558e3958..7976c73d920 100644
--- a/src/cloudflare/types/stream/allowed_origins.py
+++ b/src/cloudflare/types/stream/allowed_origins.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["AllowedOrigins"]
 
-AllowedOrigins = str
+AllowedOrigins: TypeAlias = str
diff --git a/src/cloudflare/types/stream/audio_track_delete_response.py b/src/cloudflare/types/stream/audio_track_delete_response.py
index 24406bb13e7..62c62a89d92 100644
--- a/src/cloudflare/types/stream/audio_track_delete_response.py
+++ b/src/cloudflare/types/stream/audio_track_delete_response.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union
+from typing_extensions import TypeAlias
 
 __all__ = ["AudioTrackDeleteResponse"]
 
-AudioTrackDeleteResponse = Union[str, object]
+AudioTrackDeleteResponse: TypeAlias = str
diff --git a/src/cloudflare/types/stream/audio_track_get_response.py b/src/cloudflare/types/stream/audio_track_get_response.py
deleted file mode 100644
index 63d138912a2..00000000000
--- a/src/cloudflare/types/stream/audio_track_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .audio import Audio
-
-__all__ = ["AudioTrackGetResponse"]
-
-AudioTrackGetResponse = List[Audio]
diff --git a/src/cloudflare/types/stream/caption_get_response.py b/src/cloudflare/types/stream/caption_get_response.py
deleted file mode 100644
index dac0ff81d99..00000000000
--- a/src/cloudflare/types/stream/caption_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .caption import Caption
-
-__all__ = ["CaptionGetResponse"]
-
-CaptionGetResponse = List[Caption]
diff --git a/src/cloudflare/types/stream/captions/language/vtt_get_response.py b/src/cloudflare/types/stream/captions/language/vtt_get_response.py
index b4f2213435c..af12da86164 100644
--- a/src/cloudflare/types/stream/captions/language/vtt_get_response.py
+++ b/src/cloudflare/types/stream/captions/language/vtt_get_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["VttGetResponse"]
 
-VttGetResponse = str
+VttGetResponse: TypeAlias = str
diff --git a/src/cloudflare/types/stream/captions/language_delete_response.py b/src/cloudflare/types/stream/captions/language_delete_response.py
index 4c79b0573b6..72f283a44ae 100644
--- a/src/cloudflare/types/stream/captions/language_delete_response.py
+++ b/src/cloudflare/types/stream/captions/language_delete_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["LanguageDeleteResponse"]
 
-LanguageDeleteResponse = str
+LanguageDeleteResponse: TypeAlias = str
diff --git a/src/cloudflare/types/stream/captions/language_update_params.py b/src/cloudflare/types/stream/captions/language_update_params.py
index 66f85180bf2..5c9b702792b 100644
--- a/src/cloudflare/types/stream/captions/language_update_params.py
+++ b/src/cloudflare/types/stream/captions/language_update_params.py
@@ -9,7 +9,7 @@
 
 class LanguageUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     identifier: Required[str]
     """A Cloudflare-generated unique identifier for a media item."""
diff --git a/src/cloudflare/types/stream/clip.py b/src/cloudflare/types/stream/clip.py
index 9c6197aec52..4f3ef0f4fd0 100644
--- a/src/cloudflare/types/stream/clip.py
+++ b/src/cloudflare/types/stream/clip.py
@@ -77,7 +77,9 @@ class Clip(BaseModel):
     start_time_seconds: Optional[int] = FieldInfo(alias="startTimeSeconds", default=None)
     """Specifies the start time for the video clip in seconds."""
 
-    status: Optional[Literal["pendingupload", "downloading", "queued", "inprogress", "ready", "error"]] = None
+    status: Optional[
+        Literal["pendingupload", "downloading", "queued", "inprogress", "ready", "error", "live-inprogress"]
+    ] = None
     """Specifies the processing status for all quality levels for a video."""
 
     thumbnail_timestamp_pct: Optional[float] = FieldInfo(alias="thumbnailTimestampPct", default=None)
diff --git a/src/cloudflare/types/stream/clip_create_params.py b/src/cloudflare/types/stream/clip_create_params.py
index b3a5e5d5526..970ff08699f 100644
--- a/src/cloudflare/types/stream/clip_create_params.py
+++ b/src/cloudflare/types/stream/clip_create_params.py
@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Required, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 from .allowed_origins import AllowedOrigins
 
@@ -24,7 +24,7 @@ class ClipCreateParams(TypedDict, total=False):
     start_time_seconds: Required[Annotated[int, PropertyInfo(alias="startTimeSeconds")]]
     """Specifies the start time for the video clip in seconds."""
 
-    allowed_origins: Annotated[List[AllowedOrigins], PropertyInfo(alias="allowedOrigins")]
+    allowed_origins: Annotated[SequenceNotStr[AllowedOrigins], PropertyInfo(alias="allowedOrigins")]
     """Lists the origins allowed to display the video.
 
     Enter allowed origin domains in an array and use `*` for wildcard subdomains.
diff --git a/src/cloudflare/types/stream/copy_create_params.py b/src/cloudflare/types/stream/copy_create_params.py
index 94338a1f17b..97dcff886c7 100644
--- a/src/cloudflare/types/stream/copy_create_params.py
+++ b/src/cloudflare/types/stream/copy_create_params.py
@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Required, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 from .allowed_origins import AllowedOrigins
 
@@ -24,7 +25,7 @@ class CopyCreateParams(TypedDict, total=False):
     with a `content-range` header that includes the size of the file.
     """
 
-    allowed_origins: Annotated[List[AllowedOrigins], PropertyInfo(alias="allowedOrigins")]
+    allowed_origins: Annotated[SequenceNotStr[AllowedOrigins], PropertyInfo(alias="allowedOrigins")]
     """Lists the origins allowed to display the video.
 
     Enter allowed origin domains in an array and use `*` for wildcard subdomains.
@@ -68,13 +69,6 @@ class CopyCreateParams(TypedDict, total=False):
     upload_creator: Annotated[str, PropertyInfo(alias="Upload-Creator")]
     """A user-defined identifier for the media creator."""
 
-    upload_metadata: Annotated[str, PropertyInfo(alias="Upload-Metadata")]
-    """Comma-separated key-value pairs following the TUS protocol specification.
-
-    Values are Base-64 encoded. Supported keys: `name`, `requiresignedurls`,
-    `allowedorigins`, `thumbnailtimestamppct`, `watermark`, `scheduleddeletion`.
-    """
-
 
 class Watermark(TypedDict, total=False):
     uid: str
diff --git a/src/cloudflare/types/stream/direct_upload_create_params.py b/src/cloudflare/types/stream/direct_upload_create_params.py
index 7b4354993a1..196794ac8cd 100644
--- a/src/cloudflare/types/stream/direct_upload_create_params.py
+++ b/src/cloudflare/types/stream/direct_upload_create_params.py
@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 from datetime import datetime
 from typing_extensions import Required, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 from .allowed_origins import AllowedOrigins
 
@@ -24,7 +25,7 @@ class DirectUploadCreateParams(TypedDict, total=False):
     means the value is unknown.
     """
 
-    allowed_origins: Annotated[List[AllowedOrigins], PropertyInfo(alias="allowedOrigins")]
+    allowed_origins: Annotated[SequenceNotStr[AllowedOrigins], PropertyInfo(alias="allowedOrigins")]
     """Lists the origins allowed to display the video.
 
     Enter allowed origin domains in an array and use `*` for wildcard subdomains.
diff --git a/src/cloudflare/types/stream/download_create_params.py b/src/cloudflare/types/stream/download_create_params.py
index ba0fb74b32c..cfeb789d9cd 100644
--- a/src/cloudflare/types/stream/download_create_params.py
+++ b/src/cloudflare/types/stream/download_create_params.py
@@ -9,6 +9,6 @@
 
 class DownloadCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     body: Required[object]
diff --git a/src/cloudflare/types/stream/download_create_response.py b/src/cloudflare/types/stream/download_create_response.py
index 814ff089c4a..ed7db2ce7ef 100644
--- a/src/cloudflare/types/stream/download_create_response.py
+++ b/src/cloudflare/types/stream/download_create_response.py
@@ -1,7 +1,21 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
 
 __all__ = ["DownloadCreateResponse"]
 
-DownloadCreateResponse = Union[Optional[str], Optional[object]]
+
+class DownloadCreateResponse(BaseModel):
+    percent_complete: Optional[float] = FieldInfo(alias="percentComplete", default=None)
+    """Indicates the progress as a percentage between 0 and 100."""
+
+    status: Optional[Literal["ready", "inprogress", "error"]] = None
+    """The status of a generated download."""
+
+    url: Optional[str] = None
+    """The URL to access the generated download."""
diff --git a/src/cloudflare/types/stream/download_delete_response.py b/src/cloudflare/types/stream/download_delete_response.py
index 5cc7b88881b..0da50997b4a 100644
--- a/src/cloudflare/types/stream/download_delete_response.py
+++ b/src/cloudflare/types/stream/download_delete_response.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union
+from typing_extensions import TypeAlias
 
 __all__ = ["DownloadDeleteResponse"]
 
-DownloadDeleteResponse = Union[str, object]
+DownloadDeleteResponse: TypeAlias = str
diff --git a/src/cloudflare/types/stream/download_get_response.py b/src/cloudflare/types/stream/download_get_response.py
index 59e574ca9de..c2a679f42ba 100644
--- a/src/cloudflare/types/stream/download_get_response.py
+++ b/src/cloudflare/types/stream/download_get_response.py
@@ -1,7 +1,55 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Optional
+from typing_extensions import Literal
 
-__all__ = ["DownloadGetResponse"]
+from pydantic import Field as FieldInfo
 
-DownloadGetResponse = Union[Optional[str], Optional[object]]
+from ..._models import BaseModel
+
+__all__ = ["DownloadGetResponse", "Audio", "Default"]
+
+
+class Audio(BaseModel):
+    """The audio-only download. Only present if this download type has been created."""
+
+    percent_complete: Optional[float] = FieldInfo(alias="percentComplete", default=None)
+    """Indicates the progress as a percentage between 0 and 100."""
+
+    status: Optional[Literal["ready", "inprogress", "error"]] = None
+    """The status of a generated download."""
+
+    url: Optional[str] = None
+    """The URL to access the generated download."""
+
+
+class Default(BaseModel):
+    """The default video download.
+
+    Only present if this download type has been created.
+    """
+
+    percent_complete: Optional[float] = FieldInfo(alias="percentComplete", default=None)
+    """Indicates the progress as a percentage between 0 and 100."""
+
+    status: Optional[Literal["ready", "inprogress", "error"]] = None
+    """The status of a generated download."""
+
+    url: Optional[str] = None
+    """The URL to access the generated download."""
+
+
+class DownloadGetResponse(BaseModel):
+    """An object with download type keys.
+
+    Each key is optional and only present if that download type has been created.
+    """
+
+    audio: Optional[Audio] = None
+    """The audio-only download. Only present if this download type has been created."""
+
+    default: Optional[Default] = None
+    """The default video download.
+
+    Only present if this download type has been created.
+    """
diff --git a/src/cloudflare/types/stream/embed_get_response.py b/src/cloudflare/types/stream/embed_get_response.py
index 36c1c958379..9ef17b17e24 100644
--- a/src/cloudflare/types/stream/embed_get_response.py
+++ b/src/cloudflare/types/stream/embed_get_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["EmbedGetResponse"]
 
-EmbedGetResponse = str
+EmbedGetResponse: TypeAlias = str
diff --git a/src/cloudflare/types/stream/key_create_params.py b/src/cloudflare/types/stream/key_create_params.py
index 3f1891d27e3..0e48b1613bb 100644
--- a/src/cloudflare/types/stream/key_create_params.py
+++ b/src/cloudflare/types/stream/key_create_params.py
@@ -9,6 +9,6 @@
 
 class KeyCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     body: Required[object]
diff --git a/src/cloudflare/types/stream/key_delete_response.py b/src/cloudflare/types/stream/key_delete_response.py
index 3ce3eb0cdf6..c22e3c78ff7 100644
--- a/src/cloudflare/types/stream/key_delete_response.py
+++ b/src/cloudflare/types/stream/key_delete_response.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union
+from typing_extensions import TypeAlias
 
 __all__ = ["KeyDeleteResponse"]
 
-KeyDeleteResponse = Union[str, object]
+KeyDeleteResponse: TypeAlias = str
diff --git a/src/cloudflare/types/stream/key_get_response.py b/src/cloudflare/types/stream/key_get_response.py
index 30a4a30f704..ab9e514bcd4 100644
--- a/src/cloudflare/types/stream/key_get_response.py
+++ b/src/cloudflare/types/stream/key_get_response.py
@@ -1,19 +1,16 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Optional
 from datetime import datetime
 
 from ..._models import BaseModel
 
-__all__ = ["KeyGetResponse", "KeyGetResponseItem"]
+__all__ = ["KeyGetResponse"]
 
 
-class KeyGetResponseItem(BaseModel):
+class KeyGetResponse(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
 
     created: Optional[datetime] = None
     """The date and time a signing key was created."""
-
-
-KeyGetResponse = List[KeyGetResponseItem]
diff --git a/src/cloudflare/types/stream/keys.py b/src/cloudflare/types/stream/keys.py
index f638edbc213..8cc68885bae 100644
--- a/src/cloudflare/types/stream/keys.py
+++ b/src/cloudflare/types/stream/keys.py
@@ -10,7 +10,7 @@
 
 class Keys(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
 
     created: Optional[datetime] = None
     """The date and time a signing key was created."""
diff --git a/src/cloudflare/types/stream/live_input.py b/src/cloudflare/types/stream/live_input.py
index 9d9834cec1a..34cac4b8421 100644
--- a/src/cloudflare/types/stream/live_input.py
+++ b/src/cloudflare/types/stream/live_input.py
@@ -12,6 +12,11 @@
 
 
 class Recording(BaseModel):
+    """Records the input to a Cloudflare Stream video.
+
+    Behavior depends on the mode. In most cases, the video will initially be viewable as a live video and transition to on-demand after a condition is satisfied.
+    """
+
     allowed_origins: Optional[List[str]] = FieldInfo(alias="allowedOrigins", default=None)
     """Lists the origins allowed to display videos created with this input.
 
@@ -19,6 +24,12 @@ class Recording(BaseModel):
     empty array allows videos to be viewed on any origin.
     """
 
+    hide_live_viewer_count: Optional[bool] = FieldInfo(alias="hideLiveViewerCount", default=None)
+    """
+    Disables reporting the number of live viewers when this property is set to
+    `true`.
+    """
+
     mode: Optional[Literal["off", "automatic"]] = None
     """Specifies the recording behavior for the live input.
 
@@ -43,6 +54,8 @@ class Recording(BaseModel):
 
 
 class Rtmps(BaseModel):
+    """Details for streaming to an live input using RTMPS."""
+
     stream_key: Optional[str] = FieldInfo(alias="streamKey", default=None)
     """The secret key to use when streaming via RTMPS to a live input."""
 
@@ -51,6 +64,8 @@ class Rtmps(BaseModel):
 
 
 class RtmpsPlayback(BaseModel):
+    """Details for playback from an live input using RTMPS."""
+
     stream_key: Optional[str] = FieldInfo(alias="streamKey", default=None)
     """The secret key to use for playback via RTMPS."""
 
@@ -59,6 +74,8 @@ class RtmpsPlayback(BaseModel):
 
 
 class Srt(BaseModel):
+    """Details for streaming to a live input using SRT."""
+
     passphrase: Optional[str] = None
     """The secret key to use when streaming via SRT to a live input."""
 
@@ -70,6 +87,8 @@ class Srt(BaseModel):
 
 
 class SrtPlayback(BaseModel):
+    """Details for playback from an live input using SRT."""
+
     passphrase: Optional[str] = None
     """The secret key to use for playback via SRT."""
 
@@ -81,16 +100,22 @@ class SrtPlayback(BaseModel):
 
 
 class WebRtc(BaseModel):
+    """Details for streaming to a live input using WebRTC."""
+
     url: Optional[str] = None
     """The WebRTC URL you provide to the broadcaster, which they stream live video to."""
 
 
 class WebRtcPlayback(BaseModel):
+    """Details for playback from a live input using WebRTC."""
+
     url: Optional[str] = None
     """The URL used to play live video over WebRTC."""
 
 
 class LiveInput(BaseModel):
+    """Details about a live input."""
+
     created: Optional[datetime] = None
     """The date and time the live input was created."""
 
diff --git a/src/cloudflare/types/stream/live_input_create_params.py b/src/cloudflare/types/stream/live_input_create_params.py
index 4c491aa85e4..8605ec007cf 100644
--- a/src/cloudflare/types/stream/live_input_create_params.py
+++ b/src/cloudflare/types/stream/live_input_create_params.py
@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 
 __all__ = ["LiveInputCreateParams", "Recording"]
@@ -12,7 +12,7 @@
 
 class LiveInputCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     default_creator: Annotated[str, PropertyInfo(alias="defaultCreator")]
     """Sets the creator ID asssociated with this live input."""
@@ -42,13 +42,24 @@ class LiveInputCreateParams(TypedDict, total=False):
 
 
 class Recording(TypedDict, total=False):
-    allowed_origins: Annotated[List[str], PropertyInfo(alias="allowedOrigins")]
+    """Records the input to a Cloudflare Stream video.
+
+    Behavior depends on the mode. In most cases, the video will initially be viewable as a live video and transition to on-demand after a condition is satisfied.
+    """
+
+    allowed_origins: Annotated[SequenceNotStr[str], PropertyInfo(alias="allowedOrigins")]
     """Lists the origins allowed to display videos created with this input.
 
     Enter allowed origin domains in an array and use `*` for wildcard subdomains. An
     empty array allows videos to be viewed on any origin.
     """
 
+    hide_live_viewer_count: Annotated[bool, PropertyInfo(alias="hideLiveViewerCount")]
+    """
+    Disables reporting the number of live viewers when this property is set to
+    `true`.
+    """
+
     mode: Literal["off", "automatic"]
     """Specifies the recording behavior for the live input.
 
diff --git a/src/cloudflare/types/stream/live_input_list_params.py b/src/cloudflare/types/stream/live_input_list_params.py
index 7bec34b8e21..7daa7840150 100644
--- a/src/cloudflare/types/stream/live_input_list_params.py
+++ b/src/cloudflare/types/stream/live_input_list_params.py
@@ -9,7 +9,7 @@
 
 class LiveInputListParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     include_counts: bool
     """
diff --git a/src/cloudflare/types/stream/live_input_update_params.py b/src/cloudflare/types/stream/live_input_update_params.py
index 4dd1324e8a0..c75146f9fbb 100644
--- a/src/cloudflare/types/stream/live_input_update_params.py
+++ b/src/cloudflare/types/stream/live_input_update_params.py
@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 
 __all__ = ["LiveInputUpdateParams", "Recording"]
@@ -12,7 +12,7 @@
 
 class LiveInputUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     default_creator: Annotated[str, PropertyInfo(alias="defaultCreator")]
     """Sets the creator ID asssociated with this live input."""
@@ -42,13 +42,24 @@ class LiveInputUpdateParams(TypedDict, total=False):
 
 
 class Recording(TypedDict, total=False):
-    allowed_origins: Annotated[List[str], PropertyInfo(alias="allowedOrigins")]
+    """Records the input to a Cloudflare Stream video.
+
+    Behavior depends on the mode. In most cases, the video will initially be viewable as a live video and transition to on-demand after a condition is satisfied.
+    """
+
+    allowed_origins: Annotated[SequenceNotStr[str], PropertyInfo(alias="allowedOrigins")]
     """Lists the origins allowed to display videos created with this input.
 
     Enter allowed origin domains in an array and use `*` for wildcard subdomains. An
     empty array allows videos to be viewed on any origin.
     """
 
+    hide_live_viewer_count: Annotated[bool, PropertyInfo(alias="hideLiveViewerCount")]
+    """
+    Disables reporting the number of live viewers when this property is set to
+    `true`.
+    """
+
     mode: Literal["off", "automatic"]
     """Specifies the recording behavior for the live input.
 
diff --git a/src/cloudflare/types/stream/live_inputs/output_create_params.py b/src/cloudflare/types/stream/live_inputs/output_create_params.py
index b90217b2b62..a07db015a54 100644
--- a/src/cloudflare/types/stream/live_inputs/output_create_params.py
+++ b/src/cloudflare/types/stream/live_inputs/output_create_params.py
@@ -11,7 +11,7 @@
 
 class OutputCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     stream_key: Required[Annotated[str, PropertyInfo(alias="streamKey")]]
     """The streamKey used to authenticate against an output's target."""
diff --git a/src/cloudflare/types/stream/live_inputs/output_update_params.py b/src/cloudflare/types/stream/live_inputs/output_update_params.py
index e61e5779d3c..f364723888d 100644
--- a/src/cloudflare/types/stream/live_inputs/output_update_params.py
+++ b/src/cloudflare/types/stream/live_inputs/output_update_params.py
@@ -9,7 +9,7 @@
 
 class OutputUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     live_input_identifier: Required[str]
     """A unique identifier for a live input."""
diff --git a/src/cloudflare/types/stream/stream_create_params.py b/src/cloudflare/types/stream/stream_create_params.py
index 9585b05ec41..b81859c0fbd 100644
--- a/src/cloudflare/types/stream/stream_create_params.py
+++ b/src/cloudflare/types/stream/stream_create_params.py
@@ -28,6 +28,12 @@ class StreamCreateParams(TypedDict, total=False):
     The value must be a non-negative integer.
     """
 
+    direct_user: bool
+    """
+    Provisions a URL to let your end users upload videos directly to Cloudflare
+    Stream without exposing your API token to clients.
+    """
+
     upload_creator: Annotated[str, PropertyInfo(alias="Upload-Creator")]
     """A user-defined identifier for the media creator."""
 
@@ -35,5 +41,6 @@ class StreamCreateParams(TypedDict, total=False):
     """Comma-separated key-value pairs following the TUS protocol specification.
 
     Values are Base-64 encoded. Supported keys: `name`, `requiresignedurls`,
-    `allowedorigins`, `thumbnailtimestamppct`, `watermark`, `scheduleddeletion`.
+    `allowedorigins`, `thumbnailtimestamppct`, `watermark`, `scheduleddeletion`,
+    `maxdurationseconds`.
     """
diff --git a/src/cloudflare/types/stream/stream_edit_params.py b/src/cloudflare/types/stream/stream_edit_params.py
new file mode 100644
index 00000000000..f08f78c607d
--- /dev/null
+++ b/src/cloudflare/types/stream/stream_edit_params.py
@@ -0,0 +1,71 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Required, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+from .allowed_origins import AllowedOrigins
+
+__all__ = ["StreamEditParams"]
+
+
+class StreamEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """The account identifier tag."""
+
+    allowed_origins: Annotated[SequenceNotStr[AllowedOrigins], PropertyInfo(alias="allowedOrigins")]
+    """Lists the origins allowed to display the video.
+
+    Enter allowed origin domains in an array and use `*` for wildcard subdomains.
+    Empty arrays allow the video to be viewed on any origin.
+    """
+
+    creator: str
+    """A user-defined identifier for the media creator."""
+
+    max_duration_seconds: Annotated[int, PropertyInfo(alias="maxDurationSeconds")]
+    """The maximum duration in seconds for a video upload.
+
+    Can be set for a video that is not yet uploaded to limit its duration. Uploads
+    that exceed the specified duration will fail during processing. A value of `-1`
+    means the value is unknown.
+    """
+
+    meta: object
+    """
+    A user modifiable key-value store used to reference other systems of record for
+    managing videos.
+    """
+
+    require_signed_urls: Annotated[bool, PropertyInfo(alias="requireSignedURLs")]
+    """Indicates whether the video can be a accessed using the UID.
+
+    When set to `true`, a signed token must be generated with a signing key to view
+    the video.
+    """
+
+    scheduled_deletion: Annotated[Union[str, datetime], PropertyInfo(alias="scheduledDeletion", format="iso8601")]
+    """Indicates the date and time at which the video will be deleted.
+
+    Omit the field to indicate no change, or include with a `null` value to remove
+    an existing scheduled deletion. If specified, must be at least 30 days from
+    upload time.
+    """
+
+    thumbnail_timestamp_pct: Annotated[float, PropertyInfo(alias="thumbnailTimestampPct")]
+    """
+    The timestamp for a thumbnail image calculated as a percentage value of the
+    video's duration. To convert from a second-wise timestamp to a percentage,
+    divide the desired timestamp by the total duration of the video. If this value
+    is not set, the default thumbnail image is taken from 0s of the video.
+    """
+
+    upload_expiry: Annotated[Union[str, datetime], PropertyInfo(alias="uploadExpiry", format="iso8601")]
+    """
+    The date and time when the video upload URL is no longer valid for direct user
+    uploads.
+    """
diff --git a/src/cloudflare/types/stream/stream_list_params.py b/src/cloudflare/types/stream/stream_list_params.py
index 5d9ed520774..508a23c3d70 100644
--- a/src/cloudflare/types/stream/stream_list_params.py
+++ b/src/cloudflare/types/stream/stream_list_params.py
@@ -31,16 +31,20 @@ class StreamListParams(TypedDict, total=False):
     """
 
     search: str
-    """Searches over the `name` key in the `meta` field.
+    """Provides a partial word match of the `name` key in the `meta` field.
 
-    This field can be set with or after the upload request.
+    Slow for medium to large video libraries. May be unavailable for very large
+    libraries.
     """
 
     start: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
     """Lists videos created after the specified date."""
 
-    status: Literal["pendingupload", "downloading", "queued", "inprogress", "ready", "error"]
+    status: Literal["pendingupload", "downloading", "queued", "inprogress", "ready", "error", "live-inprogress"]
     """Specifies the processing status for all quality levels for a video."""
 
     type: str
     """Specifies whether the video is `vod` or `live`."""
+
+    video_name: str
+    """Provides a fast, exact string match on the `name` key in the `meta` field."""
diff --git a/src/cloudflare/types/stream/token_create_params.py b/src/cloudflare/types/stream/token_create_params.py
index 40fce13adbf..876c4700203 100644
--- a/src/cloudflare/types/stream/token_create_params.py
+++ b/src/cloudflare/types/stream/token_create_params.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from typing import List, Iterable
+from typing import Iterable
 from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
 
 __all__ = ["TokenCreateParams", "AccessRule"]
@@ -55,6 +56,11 @@ class TokenCreateParams(TypedDict, total=False):
 
 
 class AccessRule(TypedDict, total=False):
+    """Defines rules for fine-grained control over content than signed URL tokens alone.
+
+    Access rules primarily make tokens conditionally valid based on user information. Access Rules are specified on token payloads as the `accessRules` property containing an array of Rule objects.
+    """
+
     action: Literal["allow", "block"]
     """The action to take when a request matches a rule.
 
@@ -62,13 +68,13 @@ class AccessRule(TypedDict, total=False):
     rule.
     """
 
-    country: List[str]
+    country: SequenceNotStr[str]
     """
     An array of 2-letter country codes in ISO 3166-1 Alpha-2 format used to match
     requests.
     """
 
-    ip: List[str]
+    ip: SequenceNotStr[str]
     """An array of IPv4 or IPV6 addresses or CIDRs used to match requests."""
 
     type: Literal["any", "ip.src", "ip.geoip.country"]
diff --git a/src/cloudflare/types/stream/video.py b/src/cloudflare/types/stream/video.py
index d53fad7387f..48d5b4afdae 100644
--- a/src/cloudflare/types/stream/video.py
+++ b/src/cloudflare/types/stream/video.py
@@ -38,6 +38,11 @@ class Playback(BaseModel):
 
 
 class Status(BaseModel):
+    """Specifies a detailed status for a video.
+
+    If the `state` is `inprogress` or `error`, the `step` field returns `encoding` or `manifest`. If the `state` is `inprogress`, `pctComplete` returns a number between 0 and 100 to indicate the approximate percent of completion. If the `state` is `error`, `errorReasonCode` and `errorReasonText` provide additional details.
+    """
+
     error_reason_code: Optional[str] = FieldInfo(alias="errorReasonCode", default=None)
     """Specifies why the video failed to encode.
 
@@ -52,12 +57,11 @@ class Status(BaseModel):
     """
 
     pct_complete: Optional[str] = FieldInfo(alias="pctComplete", default=None)
-    """Indicates the size of the entire upload in bytes.
-
-    The value must be a non-negative integer.
-    """
+    """Indicates the progress as a percentage between 0 and 100."""
 
-    state: Optional[Literal["pendingupload", "downloading", "queued", "inprogress", "ready", "error"]] = None
+    state: Optional[
+        Literal["pendingupload", "downloading", "queued", "inprogress", "ready", "error", "live-inprogress"]
+    ] = None
     """Specifies the processing status for all quality levels for a video."""
 
 
diff --git a/src/cloudflare/types/stream/watermark_delete_response.py b/src/cloudflare/types/stream/watermark_delete_response.py
index 64af4554a0f..77604cb363d 100644
--- a/src/cloudflare/types/stream/watermark_delete_response.py
+++ b/src/cloudflare/types/stream/watermark_delete_response.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union
+from typing_extensions import TypeAlias
 
 __all__ = ["WatermarkDeleteResponse"]
 
-WatermarkDeleteResponse = Union[str, object]
+WatermarkDeleteResponse: TypeAlias = str
diff --git a/src/cloudflare/types/stream/webhook_delete_response.py b/src/cloudflare/types/stream/webhook_delete_response.py
index a8193942fa5..b152d31e5de 100644
--- a/src/cloudflare/types/stream/webhook_delete_response.py
+++ b/src/cloudflare/types/stream/webhook_delete_response.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union
+from typing_extensions import TypeAlias
 
 __all__ = ["WebhookDeleteResponse"]
 
-WebhookDeleteResponse = Union[str, object]
+WebhookDeleteResponse: TypeAlias = str
diff --git a/src/cloudflare/types/stream/webhook_get_response.py b/src/cloudflare/types/stream/webhook_get_response.py
deleted file mode 100644
index bc96795077e..00000000000
--- a/src/cloudflare/types/stream/webhook_get_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["WebhookGetResponse"]
-
-WebhookGetResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/stream/webhook_update_response.py b/src/cloudflare/types/stream/webhook_update_response.py
deleted file mode 100644
index d313dbcbd1e..00000000000
--- a/src/cloudflare/types/stream/webhook_update_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["WebhookUpdateResponse"]
-
-WebhookUpdateResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/subscriptions/__init__.py b/src/cloudflare/types/subscriptions/__init__.py
deleted file mode 100644
index 82a9f1efdb6..00000000000
--- a/src/cloudflare/types/subscriptions/__init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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_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/subscriptions/subscription_create_params.py b/src/cloudflare/types/subscriptions/subscription_create_params.py
deleted file mode 100644
index 362a204da34..00000000000
--- a/src/cloudflare/types/subscriptions/subscription_create_params.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Iterable
-from typing_extensions import Literal, TypedDict
-
-from ..user.rate_plan_param import RatePlanParam
-from ..user.subscription_zone_param import SubscriptionZoneParam
-from ..user.subscription_component_param import SubscriptionComponentParam
-
-__all__ = ["SubscriptionCreateParams", "App"]
-
-
-class SubscriptionCreateParams(TypedDict, total=False):
-    app: App
-
-    component_values: Iterable[SubscriptionComponentParam]
-    """The list of add-ons subscribed to."""
-
-    frequency: Literal["weekly", "monthly", "quarterly", "yearly"]
-    """How often the subscription is renewed automatically."""
-
-    rate_plan: RatePlanParam
-    """The rate plan applied to the subscription."""
-
-    zone: SubscriptionZoneParam
-    """A simple zone object. May have null properties if not a zone subscription."""
-
-
-class App(TypedDict, total=False):
-    install_id: str
-    """app install id."""
diff --git a/src/cloudflare/types/subscriptions/subscription_create_response.py b/src/cloudflare/types/subscriptions/subscription_create_response.py
deleted file mode 100644
index 4b0efa12663..00000000000
--- a/src/cloudflare/types/subscriptions/subscription_create_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["SubscriptionCreateResponse"]
-
-SubscriptionCreateResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/subscriptions/subscription_get_response.py b/src/cloudflare/types/subscriptions/subscription_get_response.py
deleted file mode 100644
index 6f4b5754077..00000000000
--- a/src/cloudflare/types/subscriptions/subscription_get_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["SubscriptionGetResponse"]
-
-SubscriptionGetResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/subscriptions/subscription_update_params.py b/src/cloudflare/types/subscriptions/subscription_update_params.py
deleted file mode 100644
index c68cf10cca6..00000000000
--- a/src/cloudflare/types/subscriptions/subscription_update_params.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Iterable
-from typing_extensions import Literal, Required, TypedDict
-
-from ..user.rate_plan_param import RatePlanParam
-from ..user.subscription_zone_param import SubscriptionZoneParam
-from ..user.subscription_component_param import SubscriptionComponentParam
-
-__all__ = ["SubscriptionUpdateParams", "App"]
-
-
-class SubscriptionUpdateParams(TypedDict, total=False):
-    account_identifier: Required[str]
-    """Identifier"""
-
-    app: App
-
-    component_values: Iterable[SubscriptionComponentParam]
-    """The list of add-ons subscribed to."""
-
-    frequency: Literal["weekly", "monthly", "quarterly", "yearly"]
-    """How often the subscription is renewed automatically."""
-
-    rate_plan: RatePlanParam
-    """The rate plan applied to the subscription."""
-
-    zone: SubscriptionZoneParam
-    """A simple zone object. May have null properties if not a zone subscription."""
-
-
-class App(TypedDict, total=False):
-    install_id: str
-    """app install id."""
diff --git a/src/cloudflare/types/subscriptions/subscription_update_response.py b/src/cloudflare/types/subscriptions/subscription_update_response.py
deleted file mode 100644
index 12cf6aa283a..00000000000
--- a/src/cloudflare/types/subscriptions/subscription_update_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["SubscriptionUpdateResponse"]
-
-SubscriptionUpdateResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/token_validation/__init__.py b/src/cloudflare/types/token_validation/__init__.py
new file mode 100644
index 00000000000..b2ca7080003
--- /dev/null
+++ b/src/cloudflare/types/token_validation/__init__.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .token_config import TokenConfig as TokenConfig
+from .rule_edit_params import RuleEditParams as RuleEditParams
+from .rule_list_params import RuleListParams as RuleListParams
+from .rule_create_params import RuleCreateParams as RuleCreateParams
+from .rule_bulk_edit_params import RuleBulkEditParams as RuleBulkEditParams
+from .token_validation_rule import TokenValidationRule as TokenValidationRule
+from .rule_bulk_create_params import RuleBulkCreateParams as RuleBulkCreateParams
+from .configuration_edit_params import ConfigurationEditParams as ConfigurationEditParams
+from .configuration_list_params import ConfigurationListParams as ConfigurationListParams
+from .configuration_create_params import ConfigurationCreateParams as ConfigurationCreateParams
+from .configuration_edit_response import ConfigurationEditResponse as ConfigurationEditResponse
+from .configuration_delete_response import ConfigurationDeleteResponse as ConfigurationDeleteResponse
diff --git a/src/cloudflare/types/token_validation/configuration/__init__.py b/src/cloudflare/types/token_validation/configuration/__init__.py
new file mode 100644
index 00000000000..0b170d5f6ba
--- /dev/null
+++ b/src/cloudflare/types/token_validation/configuration/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .credential_update_params import CredentialUpdateParams as CredentialUpdateParams
+from .credential_update_response import CredentialUpdateResponse as CredentialUpdateResponse
diff --git a/src/cloudflare/types/token_validation/configuration/credential_update_params.py b/src/cloudflare/types/token_validation/configuration/credential_update_params.py
new file mode 100644
index 00000000000..98896d37d1b
--- /dev/null
+++ b/src/cloudflare/types/token_validation/configuration/credential_update_params.py
@@ -0,0 +1,89 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+__all__ = [
+    "CredentialUpdateParams",
+    "Key",
+    "KeyAPIShieldCredentialsJWTKeyRSA",
+    "KeyAPIShieldCredentialsJWTKeyEcEs256",
+    "KeyAPIShieldCredentialsJWTKeyEcEs384",
+]
+
+
+class CredentialUpdateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    keys: Required[Iterable[Key]]
+
+
+class KeyAPIShieldCredentialsJWTKeyRSA(TypedDict, total=False):
+    """JSON representation of an RSA key."""
+
+    alg: Required[Literal["RS256", "RS384", "RS512", "PS256", "PS384", "PS512"]]
+    """Algorithm"""
+
+    e: Required[str]
+    """RSA exponent"""
+
+    kid: Required[str]
+    """Key ID"""
+
+    kty: Required[Literal["RSA"]]
+    """Key Type"""
+
+    n: Required[str]
+    """RSA modulus"""
+
+
+class KeyAPIShieldCredentialsJWTKeyEcEs256(TypedDict, total=False):
+    """JSON representation of an ES256 key"""
+
+    alg: Required[Literal["ES256"]]
+    """Algorithm"""
+
+    crv: Required[Literal["P-256"]]
+    """Curve"""
+
+    kid: Required[str]
+    """Key ID"""
+
+    kty: Required[Literal["EC"]]
+    """Key Type"""
+
+    x: Required[str]
+    """X EC coordinate"""
+
+    y: Required[str]
+    """Y EC coordinate"""
+
+
+class KeyAPIShieldCredentialsJWTKeyEcEs384(TypedDict, total=False):
+    """JSON representation of an ES384 key"""
+
+    alg: Required[Literal["ES384"]]
+    """Algorithm"""
+
+    crv: Required[Literal["P-384"]]
+    """Curve"""
+
+    kid: Required[str]
+    """Key ID"""
+
+    kty: Required[Literal["EC"]]
+    """Key Type"""
+
+    x: Required[str]
+    """X EC coordinate"""
+
+    y: Required[str]
+    """Y EC coordinate"""
+
+
+Key: TypeAlias = Union[
+    KeyAPIShieldCredentialsJWTKeyRSA, KeyAPIShieldCredentialsJWTKeyEcEs256, KeyAPIShieldCredentialsJWTKeyEcEs384
+]
diff --git a/src/cloudflare/types/token_validation/configuration/credential_update_response.py b/src/cloudflare/types/token_validation/configuration/credential_update_response.py
new file mode 100644
index 00000000000..be1cb8d7d6c
--- /dev/null
+++ b/src/cloudflare/types/token_validation/configuration/credential_update_response.py
@@ -0,0 +1,94 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union
+from typing_extensions import Literal, TypeAlias
+
+from ...._models import BaseModel
+from ...api_gateway.message import Message
+
+__all__ = [
+    "CredentialUpdateResponse",
+    "Key",
+    "KeyAPIShieldCredentialsJWTKeyRSA",
+    "KeyAPIShieldCredentialsJWTKeyEcEs256",
+    "KeyAPIShieldCredentialsJWTKeyEcEs384",
+]
+
+
+class KeyAPIShieldCredentialsJWTKeyRSA(BaseModel):
+    """JSON representation of an RSA key."""
+
+    alg: Literal["RS256", "RS384", "RS512", "PS256", "PS384", "PS512"]
+    """Algorithm"""
+
+    e: str
+    """RSA exponent"""
+
+    kid: str
+    """Key ID"""
+
+    kty: Literal["RSA"]
+    """Key Type"""
+
+    n: str
+    """RSA modulus"""
+
+
+class KeyAPIShieldCredentialsJWTKeyEcEs256(BaseModel):
+    """JSON representation of an ES256 key"""
+
+    alg: Literal["ES256"]
+    """Algorithm"""
+
+    crv: Literal["P-256"]
+    """Curve"""
+
+    kid: str
+    """Key ID"""
+
+    kty: Literal["EC"]
+    """Key Type"""
+
+    x: str
+    """X EC coordinate"""
+
+    y: str
+    """Y EC coordinate"""
+
+
+class KeyAPIShieldCredentialsJWTKeyEcEs384(BaseModel):
+    """JSON representation of an ES384 key"""
+
+    alg: Literal["ES384"]
+    """Algorithm"""
+
+    crv: Literal["P-384"]
+    """Curve"""
+
+    kid: str
+    """Key ID"""
+
+    kty: Literal["EC"]
+    """Key Type"""
+
+    x: str
+    """X EC coordinate"""
+
+    y: str
+    """Y EC coordinate"""
+
+
+Key: TypeAlias = Union[
+    KeyAPIShieldCredentialsJWTKeyRSA, KeyAPIShieldCredentialsJWTKeyEcEs256, KeyAPIShieldCredentialsJWTKeyEcEs384
+]
+
+
+class CredentialUpdateResponse(BaseModel):
+    errors: Message
+
+    keys: List[Key]
+
+    messages: Message
+
+    success: Literal[True]
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/token_validation/configuration_create_params.py b/src/cloudflare/types/token_validation/configuration_create_params.py
new file mode 100644
index 00000000000..e1dc1cbe588
--- /dev/null
+++ b/src/cloudflare/types/token_validation/configuration_create_params.py
@@ -0,0 +1,106 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = [
+    "ConfigurationCreateParams",
+    "Credentials",
+    "CredentialsKey",
+    "CredentialsKeyAPIShieldCredentialsJWTKeyRSA",
+    "CredentialsKeyAPIShieldCredentialsJWTKeyEcEs256",
+    "CredentialsKeyAPIShieldCredentialsJWTKeyEcEs384",
+]
+
+
+class ConfigurationCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    credentials: Required[Credentials]
+
+    description: Required[str]
+
+    title: Required[str]
+
+    token_sources: Required[SequenceNotStr[str]]
+
+    token_type: Required[Literal["JWT"]]
+
+
+class CredentialsKeyAPIShieldCredentialsJWTKeyRSA(TypedDict, total=False):
+    """JSON representation of an RSA key."""
+
+    alg: Required[Literal["RS256", "RS384", "RS512", "PS256", "PS384", "PS512"]]
+    """Algorithm"""
+
+    e: Required[str]
+    """RSA exponent"""
+
+    kid: Required[str]
+    """Key ID"""
+
+    kty: Required[Literal["RSA"]]
+    """Key Type"""
+
+    n: Required[str]
+    """RSA modulus"""
+
+
+class CredentialsKeyAPIShieldCredentialsJWTKeyEcEs256(TypedDict, total=False):
+    """JSON representation of an ES256 key"""
+
+    alg: Required[Literal["ES256"]]
+    """Algorithm"""
+
+    crv: Required[Literal["P-256"]]
+    """Curve"""
+
+    kid: Required[str]
+    """Key ID"""
+
+    kty: Required[Literal["EC"]]
+    """Key Type"""
+
+    x: Required[str]
+    """X EC coordinate"""
+
+    y: Required[str]
+    """Y EC coordinate"""
+
+
+class CredentialsKeyAPIShieldCredentialsJWTKeyEcEs384(TypedDict, total=False):
+    """JSON representation of an ES384 key"""
+
+    alg: Required[Literal["ES384"]]
+    """Algorithm"""
+
+    crv: Required[Literal["P-384"]]
+    """Curve"""
+
+    kid: Required[str]
+    """Key ID"""
+
+    kty: Required[Literal["EC"]]
+    """Key Type"""
+
+    x: Required[str]
+    """X EC coordinate"""
+
+    y: Required[str]
+    """Y EC coordinate"""
+
+
+CredentialsKey: TypeAlias = Union[
+    CredentialsKeyAPIShieldCredentialsJWTKeyRSA,
+    CredentialsKeyAPIShieldCredentialsJWTKeyEcEs256,
+    CredentialsKeyAPIShieldCredentialsJWTKeyEcEs384,
+]
+
+
+class Credentials(TypedDict, total=False):
+    keys: Required[Iterable[CredentialsKey]]
diff --git a/src/cloudflare/types/token_validation/configuration_delete_response.py b/src/cloudflare/types/token_validation/configuration_delete_response.py
new file mode 100644
index 00000000000..d0f0554a46b
--- /dev/null
+++ b/src/cloudflare/types/token_validation/configuration_delete_response.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["ConfigurationDeleteResponse"]
+
+
+class ConfigurationDeleteResponse(BaseModel):
+    id: Optional[str] = None
+    """UUID."""
diff --git a/src/cloudflare/types/token_validation/configuration_edit_params.py b/src/cloudflare/types/token_validation/configuration_edit_params.py
new file mode 100644
index 00000000000..8bfeca4a151
--- /dev/null
+++ b/src/cloudflare/types/token_validation/configuration_edit_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["ConfigurationEditParams"]
+
+
+class ConfigurationEditParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    description: str
+
+    title: str
+
+    token_sources: SequenceNotStr[str]
diff --git a/src/cloudflare/types/token_validation/configuration_edit_response.py b/src/cloudflare/types/token_validation/configuration_edit_response.py
new file mode 100644
index 00000000000..662c55edd12
--- /dev/null
+++ b/src/cloudflare/types/token_validation/configuration_edit_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["ConfigurationEditResponse"]
+
+
+class ConfigurationEditResponse(BaseModel):
+    description: Optional[str] = None
+
+    title: Optional[str] = None
+
+    token_sources: Optional[List[str]] = None
diff --git a/src/cloudflare/types/token_validation/configuration_list_params.py b/src/cloudflare/types/token_validation/configuration_list_params.py
new file mode 100644
index 00000000000..5c5a00f5242
--- /dev/null
+++ b/src/cloudflare/types/token_validation/configuration_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ConfigurationListParams"]
+
+
+class ConfigurationListParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    page: int
+    """Page number of paginated results."""
+
+    per_page: int
+    """Maximum number of results per page."""
diff --git a/src/cloudflare/types/token_validation/rule_bulk_create_params.py b/src/cloudflare/types/token_validation/rule_bulk_create_params.py
new file mode 100644
index 00000000000..36b178812c9
--- /dev/null
+++ b/src/cloudflare/types/token_validation/rule_bulk_create_params.py
@@ -0,0 +1,75 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable, Optional
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["RuleBulkCreateParams", "Body", "BodySelector", "BodySelectorExclude", "BodySelectorInclude"]
+
+
+class RuleBulkCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    body: Required[Iterable[Body]]
+
+
+class BodySelectorExclude(TypedDict, total=False):
+    operation_ids: SequenceNotStr[str]
+    """Excluded operation IDs."""
+
+
+class BodySelectorInclude(TypedDict, total=False):
+    host: SequenceNotStr[str]
+    """Included hostnames."""
+
+
+class BodySelector(TypedDict, total=False):
+    """Select operations covered by this rule.
+
+    For details on selectors, see the [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+    """
+
+    exclude: Optional[Iterable[BodySelectorExclude]]
+    """Ignore operations that were otherwise included by `include`."""
+
+    include: Optional[Iterable[BodySelectorInclude]]
+    """Select all matching operations."""
+
+
+class Body(TypedDict, total=False):
+    """A Token Validation rule that can enforce security policies using JWT Tokens."""
+
+    action: Required[Literal["log", "block"]]
+    """
+    Action to take on requests that match operations included in `selector` and fail
+    `expression`.
+    """
+
+    description: Required[str]
+    """A human-readable description that gives more details than `title`."""
+
+    enabled: Required[bool]
+    """Toggle rule on or off."""
+
+    expression: Required[str]
+    """Rule expression.
+
+    Requests that fail to match this expression will be subject to `action`.
+
+    For details on expressions, see the
+    [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+    """
+
+    selector: Required[BodySelector]
+    """Select operations covered by this rule.
+
+    For details on selectors, see the
+    [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+    """
+
+    title: Required[str]
+    """A human-readable name for the rule."""
diff --git a/src/cloudflare/types/token_validation/rule_bulk_edit_params.py b/src/cloudflare/types/token_validation/rule_bulk_edit_params.py
new file mode 100644
index 00000000000..7f68d7806b4
--- /dev/null
+++ b/src/cloudflare/types/token_validation/rule_bulk_edit_params.py
@@ -0,0 +1,111 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable, Optional
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = [
+    "RuleBulkEditParams",
+    "Body",
+    "BodyPosition",
+    "BodyPositionAPIShieldIndex",
+    "BodyPositionAPIShieldBefore",
+    "BodyPositionAPIShieldAfter",
+    "BodySelector",
+    "BodySelectorExclude",
+    "BodySelectorInclude",
+]
+
+
+class RuleBulkEditParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    body: Required[Iterable[Body]]
+
+
+class BodyPositionAPIShieldIndex(TypedDict, total=False):
+    index: Required[int]
+    """Move rule to this position"""
+
+
+class BodyPositionAPIShieldBefore(TypedDict, total=False):
+    """Move rule to after rule with ID."""
+
+    before: str
+    """Move rule to before rule with this ID."""
+
+
+class BodyPositionAPIShieldAfter(TypedDict, total=False):
+    """Move rule to before rule with ID."""
+
+    after: str
+    """Move rule to after rule with this ID."""
+
+
+BodyPosition: TypeAlias = Union[BodyPositionAPIShieldIndex, BodyPositionAPIShieldBefore, BodyPositionAPIShieldAfter]
+
+
+class BodySelectorExclude(TypedDict, total=False):
+    operation_ids: SequenceNotStr[str]
+    """Excluded operation IDs."""
+
+
+class BodySelectorInclude(TypedDict, total=False):
+    host: SequenceNotStr[str]
+    """Included hostnames."""
+
+
+class BodySelector(TypedDict, total=False):
+    """Select operations covered by this rule.
+
+    For details on selectors, see the [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+    """
+
+    exclude: Optional[Iterable[BodySelectorExclude]]
+    """Ignore operations that were otherwise included by `include`."""
+
+    include: Optional[Iterable[BodySelectorInclude]]
+    """Select all matching operations."""
+
+
+class Body(TypedDict, total=False):
+    id: Required[str]
+    """Rule ID this patch applies to"""
+
+    action: Literal["log", "block"]
+    """
+    Action to take on requests that match operations included in `selector` and fail
+    `expression`.
+    """
+
+    description: str
+    """A human-readable description that gives more details than `title`."""
+
+    enabled: bool
+    """Toggle rule on or off."""
+
+    expression: str
+    """Rule expression.
+
+    Requests that fail to match this expression will be subject to `action`.
+
+    For details on expressions, see the
+    [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+    """
+
+    position: BodyPosition
+    """Update rule order among zone rules."""
+
+    selector: BodySelector
+    """Select operations covered by this rule.
+
+    For details on selectors, see the
+    [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+    """
+
+    title: str
+    """A human-readable name for the rule."""
diff --git a/src/cloudflare/types/token_validation/rule_create_params.py b/src/cloudflare/types/token_validation/rule_create_params.py
new file mode 100644
index 00000000000..f92cb7d21be
--- /dev/null
+++ b/src/cloudflare/types/token_validation/rule_create_params.py
@@ -0,0 +1,69 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable, Optional
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["RuleCreateParams", "Selector", "SelectorExclude", "SelectorInclude"]
+
+
+class RuleCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    action: Required[Literal["log", "block"]]
+    """
+    Action to take on requests that match operations included in `selector` and fail
+    `expression`.
+    """
+
+    description: Required[str]
+    """A human-readable description that gives more details than `title`."""
+
+    enabled: Required[bool]
+    """Toggle rule on or off."""
+
+    expression: Required[str]
+    """Rule expression.
+
+    Requests that fail to match this expression will be subject to `action`.
+
+    For details on expressions, see the
+    [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+    """
+
+    selector: Required[Selector]
+    """Select operations covered by this rule.
+
+    For details on selectors, see the
+    [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+    """
+
+    title: Required[str]
+    """A human-readable name for the rule."""
+
+
+class SelectorExclude(TypedDict, total=False):
+    operation_ids: SequenceNotStr[str]
+    """Excluded operation IDs."""
+
+
+class SelectorInclude(TypedDict, total=False):
+    host: SequenceNotStr[str]
+    """Included hostnames."""
+
+
+class Selector(TypedDict, total=False):
+    """Select operations covered by this rule.
+
+    For details on selectors, see the [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+    """
+
+    exclude: Optional[Iterable[SelectorExclude]]
+    """Ignore operations that were otherwise included by `include`."""
+
+    include: Optional[Iterable[SelectorInclude]]
+    """Select all matching operations."""
diff --git a/src/cloudflare/types/token_validation/rule_edit_params.py b/src/cloudflare/types/token_validation/rule_edit_params.py
new file mode 100644
index 00000000000..c59c6da7155
--- /dev/null
+++ b/src/cloudflare/types/token_validation/rule_edit_params.py
@@ -0,0 +1,103 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable, Optional
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = [
+    "RuleEditParams",
+    "Position",
+    "PositionAPIShieldIndex",
+    "PositionAPIShieldBefore",
+    "PositionAPIShieldAfter",
+    "Selector",
+    "SelectorExclude",
+    "SelectorInclude",
+]
+
+
+class RuleEditParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    action: Literal["log", "block"]
+    """
+    Action to take on requests that match operations included in `selector` and fail
+    `expression`.
+    """
+
+    description: str
+    """A human-readable description that gives more details than `title`."""
+
+    enabled: bool
+    """Toggle rule on or off."""
+
+    expression: str
+    """Rule expression.
+
+    Requests that fail to match this expression will be subject to `action`.
+
+    For details on expressions, see the
+    [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+    """
+
+    position: Position
+    """Update rule order among zone rules."""
+
+    selector: Selector
+    """Select operations covered by this rule.
+
+    For details on selectors, see the
+    [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+    """
+
+    title: str
+    """A human-readable name for the rule."""
+
+
+class PositionAPIShieldIndex(TypedDict, total=False):
+    index: Required[int]
+    """Move rule to this position"""
+
+
+class PositionAPIShieldBefore(TypedDict, total=False):
+    """Move rule to after rule with ID."""
+
+    before: str
+    """Move rule to before rule with this ID."""
+
+
+class PositionAPIShieldAfter(TypedDict, total=False):
+    """Move rule to before rule with ID."""
+
+    after: str
+    """Move rule to after rule with this ID."""
+
+
+Position: TypeAlias = Union[PositionAPIShieldIndex, PositionAPIShieldBefore, PositionAPIShieldAfter]
+
+
+class SelectorExclude(TypedDict, total=False):
+    operation_ids: SequenceNotStr[str]
+    """Excluded operation IDs."""
+
+
+class SelectorInclude(TypedDict, total=False):
+    host: SequenceNotStr[str]
+    """Included hostnames."""
+
+
+class Selector(TypedDict, total=False):
+    """Select operations covered by this rule.
+
+    For details on selectors, see the [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+    """
+
+    exclude: Optional[Iterable[SelectorExclude]]
+    """Ignore operations that were otherwise included by `include`."""
+
+    include: Optional[Iterable[SelectorInclude]]
+    """Select all matching operations."""
diff --git a/src/cloudflare/types/token_validation/rule_list_params.py b/src/cloudflare/types/token_validation/rule_list_params.py
new file mode 100644
index 00000000000..a241d61c90c
--- /dev/null
+++ b/src/cloudflare/types/token_validation/rule_list_params.py
@@ -0,0 +1,44 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+
+__all__ = ["RuleListParams"]
+
+
+class RuleListParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    id: str
+    """Select rules with these IDs."""
+
+    action: Literal["log", "block"]
+    """
+    Action to take on requests that match operations included in `selector` and fail
+    `expression`.
+    """
+
+    enabled: bool
+    """Toggle rule on or off."""
+
+    host: str
+    """Select rules with this host in `include`."""
+
+    hostname: str
+    """Select rules with this host in `include`."""
+
+    page: int
+    """Page number of paginated results."""
+
+    per_page: int
+    """Maximum number of results per page."""
+
+    rule_id: str
+    """Select rules with these IDs."""
+
+    token_configuration: SequenceNotStr[str]
+    """Select rules using any of these token configurations."""
diff --git a/src/cloudflare/types/token_validation/token_config.py b/src/cloudflare/types/token_validation/token_config.py
new file mode 100644
index 00000000000..268461a30d5
--- /dev/null
+++ b/src/cloudflare/types/token_validation/token_config.py
@@ -0,0 +1,109 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ..._models import BaseModel
+
+__all__ = [
+    "TokenConfig",
+    "Credentials",
+    "CredentialsKey",
+    "CredentialsKeyAPIShieldCredentialsJWTKeyRSA",
+    "CredentialsKeyAPIShieldCredentialsJWTKeyEcEs256",
+    "CredentialsKeyAPIShieldCredentialsJWTKeyEcEs384",
+]
+
+
+class CredentialsKeyAPIShieldCredentialsJWTKeyRSA(BaseModel):
+    """JSON representation of an RSA key."""
+
+    alg: Literal["RS256", "RS384", "RS512", "PS256", "PS384", "PS512"]
+    """Algorithm"""
+
+    e: str
+    """RSA exponent"""
+
+    kid: str
+    """Key ID"""
+
+    kty: Literal["RSA"]
+    """Key Type"""
+
+    n: str
+    """RSA modulus"""
+
+
+class CredentialsKeyAPIShieldCredentialsJWTKeyEcEs256(BaseModel):
+    """JSON representation of an ES256 key"""
+
+    alg: Literal["ES256"]
+    """Algorithm"""
+
+    crv: Literal["P-256"]
+    """Curve"""
+
+    kid: str
+    """Key ID"""
+
+    kty: Literal["EC"]
+    """Key Type"""
+
+    x: str
+    """X EC coordinate"""
+
+    y: str
+    """Y EC coordinate"""
+
+
+class CredentialsKeyAPIShieldCredentialsJWTKeyEcEs384(BaseModel):
+    """JSON representation of an ES384 key"""
+
+    alg: Literal["ES384"]
+    """Algorithm"""
+
+    crv: Literal["P-384"]
+    """Curve"""
+
+    kid: str
+    """Key ID"""
+
+    kty: Literal["EC"]
+    """Key Type"""
+
+    x: str
+    """X EC coordinate"""
+
+    y: str
+    """Y EC coordinate"""
+
+
+CredentialsKey: TypeAlias = Union[
+    CredentialsKeyAPIShieldCredentialsJWTKeyRSA,
+    CredentialsKeyAPIShieldCredentialsJWTKeyEcEs256,
+    CredentialsKeyAPIShieldCredentialsJWTKeyEcEs384,
+]
+
+
+class Credentials(BaseModel):
+    keys: List[CredentialsKey]
+
+
+class TokenConfig(BaseModel):
+    id: str
+    """UUID."""
+
+    created_at: datetime
+
+    credentials: Credentials
+
+    description: str
+
+    last_updated: datetime
+
+    title: str
+
+    token_sources: List[str]
+
+    token_type: Literal["JWT"]
diff --git a/src/cloudflare/types/token_validation/token_validation_rule.py b/src/cloudflare/types/token_validation/token_validation_rule.py
new file mode 100644
index 00000000000..3aeb1f19e5e
--- /dev/null
+++ b/src/cloudflare/types/token_validation/token_validation_rule.py
@@ -0,0 +1,74 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["TokenValidationRule", "Selector", "SelectorExclude", "SelectorInclude"]
+
+
+class SelectorExclude(BaseModel):
+    operation_ids: Optional[List[str]] = None
+    """Excluded operation IDs."""
+
+
+class SelectorInclude(BaseModel):
+    host: Optional[List[str]] = None
+    """Included hostnames."""
+
+
+class Selector(BaseModel):
+    """Select operations covered by this rule.
+
+    For details on selectors, see the [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+    """
+
+    exclude: Optional[List[SelectorExclude]] = None
+    """Ignore operations that were otherwise included by `include`."""
+
+    include: Optional[List[SelectorInclude]] = None
+    """Select all matching operations."""
+
+
+class TokenValidationRule(BaseModel):
+    """A Token Validation rule that can enforce security policies using JWT Tokens."""
+
+    action: Literal["log", "block"]
+    """
+    Action to take on requests that match operations included in `selector` and fail
+    `expression`.
+    """
+
+    description: str
+    """A human-readable description that gives more details than `title`."""
+
+    enabled: bool
+    """Toggle rule on or off."""
+
+    expression: str
+    """Rule expression.
+
+    Requests that fail to match this expression will be subject to `action`.
+
+    For details on expressions, see the
+    [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+    """
+
+    selector: Selector
+    """Select operations covered by this rule.
+
+    For details on selectors, see the
+    [Cloudflare Docs](https://developers.cloudflare.com/api-shield/security/jwt-validation/).
+    """
+
+    title: str
+    """A human-readable name for the rule."""
+
+    id: Optional[str] = None
+    """UUID."""
+
+    created_at: Optional[datetime] = None
+
+    last_updated: Optional[datetime] = None
diff --git a/src/cloudflare/types/challenges/__init__.py b/src/cloudflare/types/turnstile/__init__.py
similarity index 100%
rename from src/cloudflare/types/challenges/__init__.py
rename to src/cloudflare/types/turnstile/__init__.py
diff --git a/src/cloudflare/types/challenges/widget.py b/src/cloudflare/types/turnstile/widget.py
similarity index 84%
rename from src/cloudflare/types/challenges/widget.py
rename to src/cloudflare/types/turnstile/widget.py
index 2666b31af83..91619ee5e19 100644
--- a/src/cloudflare/types/challenges/widget.py
+++ b/src/cloudflare/types/turnstile/widget.py
@@ -11,6 +11,8 @@
 
 
 class Widget(BaseModel):
+    """A Turnstile widget's detailed configuration"""
+
     bot_fight_mode: bool
     """
     If bot_fight_mode is set to `true`, Cloudflare issues computationally expensive
@@ -28,6 +30,9 @@ class Widget(BaseModel):
 
     domains: List[WidgetDomain]
 
+    ephemeral_id: bool
+    """Return the Ephemeral ID in /siteverify (ENT only)."""
+
     mode: Literal["non-interactive", "invisible", "managed"]
     """Widget Mode"""
 
@@ -44,8 +49,8 @@ class Widget(BaseModel):
     offlabel: bool
     """Do not show any Cloudflare branding on the widget (ENT only)."""
 
-    region: Literal["world"]
-    """Region where this widget can be used."""
+    region: Literal["world", "china"]
+    """Region where this widget can be used. This cannot be changed after creation."""
 
     secret: str
     """Secret key for this widget."""
diff --git a/src/cloudflare/types/turnstile/widget_create_params.py b/src/cloudflare/types/turnstile/widget_create_params.py
new file mode 100644
index 00000000000..61de9dba0d4
--- /dev/null
+++ b/src/cloudflare/types/turnstile/widget_create_params.py
@@ -0,0 +1,74 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .widget_domain import WidgetDomain
+
+__all__ = ["WidgetCreateParams"]
+
+
+class WidgetCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier"""
+
+    domains: Required[SequenceNotStr[WidgetDomain]]
+
+    mode: Required[Literal["non-interactive", "invisible", "managed"]]
+    """Widget Mode"""
+
+    name: Required[str]
+    """Human readable widget name.
+
+    Not unique. Cloudflare suggests that you set this to a meaningful string to make
+    it easier to identify your widget, and where it is used.
+    """
+
+    direction: Literal["asc", "desc"]
+    """Direction to order widgets."""
+
+    filter: str
+    """
+    Filter widgets by field using case-insensitive substring matching. Format:
+    `field:value`
+
+    Supported fields:
+
+    - `name` - Filter by widget name (e.g., `filter=name:login-form`)
+    - `sitekey` - Filter by sitekey (e.g., `filter=sitekey:0x4AAA`)
+
+    Returns 400 Bad Request if the field is unsupported or format is invalid. An
+    empty filter value returns all results.
+    """
+
+    order: Literal["id", "sitekey", "name", "created_on", "modified_on"]
+    """Field to order widgets by."""
+
+    page: float
+    """Page number of paginated results."""
+
+    per_page: float
+    """Number of items per page."""
+
+    bot_fight_mode: bool
+    """
+    If bot_fight_mode is set to `true`, Cloudflare issues computationally expensive
+    challenges in response to malicious bots (ENT only).
+    """
+
+    clearance_level: Literal["no_clearance", "jschallenge", "managed", "interactive"]
+    """
+    If Turnstile is embedded on a Cloudflare site and the widget should grant
+    challenge clearance, this setting can determine the clearance level to be set
+    """
+
+    ephemeral_id: bool
+    """Return the Ephemeral ID in /siteverify (ENT only)."""
+
+    offlabel: bool
+    """Do not show any Cloudflare branding on the widget (ENT only)."""
+
+    region: Literal["world", "china"]
+    """Region where this widget can be used. This cannot be changed after creation."""
diff --git a/src/cloudflare/types/turnstile/widget_domain.py b/src/cloudflare/types/turnstile/widget_domain.py
new file mode 100644
index 00000000000..1098fc82e5d
--- /dev/null
+++ b/src/cloudflare/types/turnstile/widget_domain.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["WidgetDomain"]
+
+WidgetDomain: TypeAlias = str
diff --git a/src/cloudflare/types/turnstile/widget_list_params.py b/src/cloudflare/types/turnstile/widget_list_params.py
new file mode 100644
index 00000000000..a66438ade2e
--- /dev/null
+++ b/src/cloudflare/types/turnstile/widget_list_params.py
@@ -0,0 +1,38 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["WidgetListParams"]
+
+
+class WidgetListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier"""
+
+    direction: Literal["asc", "desc"]
+    """Direction to order widgets."""
+
+    filter: str
+    """
+    Filter widgets by field using case-insensitive substring matching. Format:
+    `field:value`
+
+    Supported fields:
+
+    - `name` - Filter by widget name (e.g., `filter=name:login-form`)
+    - `sitekey` - Filter by sitekey (e.g., `filter=sitekey:0x4AAA`)
+
+    Returns 400 Bad Request if the field is unsupported or format is invalid. An
+    empty filter value returns all results.
+    """
+
+    order: Literal["id", "sitekey", "name", "created_on", "modified_on"]
+    """Field to order widgets by."""
+
+    page: float
+    """Page number of paginated results."""
+
+    per_page: float
+    """Number of items per page."""
diff --git a/src/cloudflare/types/challenges/widget_list_response.py b/src/cloudflare/types/turnstile/widget_list_response.py
similarity index 83%
rename from src/cloudflare/types/challenges/widget_list_response.py
rename to src/cloudflare/types/turnstile/widget_list_response.py
index 0dabcb0bc91..23b81629fd0 100644
--- a/src/cloudflare/types/challenges/widget_list_response.py
+++ b/src/cloudflare/types/turnstile/widget_list_response.py
@@ -11,6 +11,8 @@
 
 
 class WidgetListResponse(BaseModel):
+    """A Turnstile Widgets configuration as it appears in listings"""
+
     bot_fight_mode: bool
     """
     If bot_fight_mode is set to `true`, Cloudflare issues computationally expensive
@@ -28,6 +30,9 @@ class WidgetListResponse(BaseModel):
 
     domains: List[WidgetDomain]
 
+    ephemeral_id: bool
+    """Return the Ephemeral ID in /siteverify (ENT only)."""
+
     mode: Literal["non-interactive", "invisible", "managed"]
     """Widget Mode"""
 
@@ -44,8 +49,8 @@ class WidgetListResponse(BaseModel):
     offlabel: bool
     """Do not show any Cloudflare branding on the widget (ENT only)."""
 
-    region: Literal["world"]
-    """Region where this widget can be used."""
+    region: Literal["world", "china"]
+    """Region where this widget can be used. This cannot be changed after creation."""
 
     sitekey: str
     """Widget item identifier tag."""
diff --git a/src/cloudflare/types/challenges/widget_rotate_secret_params.py b/src/cloudflare/types/turnstile/widget_rotate_secret_params.py
similarity index 100%
rename from src/cloudflare/types/challenges/widget_rotate_secret_params.py
rename to src/cloudflare/types/turnstile/widget_rotate_secret_params.py
diff --git a/src/cloudflare/types/challenges/widget_update_params.py b/src/cloudflare/types/turnstile/widget_update_params.py
similarity index 80%
rename from src/cloudflare/types/challenges/widget_update_params.py
rename to src/cloudflare/types/turnstile/widget_update_params.py
index 748121528bf..ac0255a3a42 100644
--- a/src/cloudflare/types/challenges/widget_update_params.py
+++ b/src/cloudflare/types/turnstile/widget_update_params.py
@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Literal, Required, TypedDict
 
+from ..._types import SequenceNotStr
 from .widget_domain import WidgetDomain
 
 __all__ = ["WidgetUpdateParams"]
@@ -14,7 +14,7 @@ class WidgetUpdateParams(TypedDict, total=False):
     account_id: Required[str]
     """Identifier"""
 
-    domains: Required[List[WidgetDomain]]
+    domains: Required[SequenceNotStr[WidgetDomain]]
 
     mode: Required[Literal["non-interactive", "invisible", "managed"]]
     """Widget Mode"""
@@ -38,5 +38,11 @@ class WidgetUpdateParams(TypedDict, total=False):
     challenge clearance, this setting can determine the clearance level to be set
     """
 
+    ephemeral_id: bool
+    """Return the Ephemeral ID in /siteverify (ENT only)."""
+
     offlabel: bool
     """Do not show any Cloudflare branding on the widget (ENT only)."""
+
+    region: Literal["world", "china"]
+    """Region where this widget can be used. This cannot be changed after creation."""
diff --git a/src/cloudflare/types/url_normalization/url_normalization_get_response.py b/src/cloudflare/types/url_normalization/url_normalization_get_response.py
index 0bebaa4413c..88bda09951c 100644
--- a/src/cloudflare/types/url_normalization/url_normalization_get_response.py
+++ b/src/cloudflare/types/url_normalization/url_normalization_get_response.py
@@ -1,6 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing_extensions import Literal
 
 from ..._models import BaseModel
 
@@ -8,8 +8,10 @@
 
 
 class URLNormalizationGetResponse(BaseModel):
-    scope: Optional[str] = None
+    """A result."""
+
+    scope: Literal["incoming", "both", "none"]
     """The scope of the URL normalization."""
 
-    type: Optional[str] = None
+    type: Literal["cloudflare", "rfc3986"]
     """The type of URL normalization performed by Cloudflare."""
diff --git a/src/cloudflare/types/url_normalization/url_normalization_update_params.py b/src/cloudflare/types/url_normalization/url_normalization_update_params.py
index fb2b4551fa4..06b9f4e31c5 100644
--- a/src/cloudflare/types/url_normalization/url_normalization_update_params.py
+++ b/src/cloudflare/types/url_normalization/url_normalization_update_params.py
@@ -2,17 +2,17 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
 __all__ = ["URLNormalizationUpdateParams"]
 
 
 class URLNormalizationUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """The unique ID of the zone."""
 
-    scope: str
+    scope: Required[Literal["incoming", "both", "none"]]
     """The scope of the URL normalization."""
 
-    type: str
+    type: Required[Literal["cloudflare", "rfc3986"]]
     """The type of URL normalization performed by Cloudflare."""
diff --git a/src/cloudflare/types/url_normalization/url_normalization_update_response.py b/src/cloudflare/types/url_normalization/url_normalization_update_response.py
index b7d70096ced..d1c1fd7a88c 100644
--- a/src/cloudflare/types/url_normalization/url_normalization_update_response.py
+++ b/src/cloudflare/types/url_normalization/url_normalization_update_response.py
@@ -1,6 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing_extensions import Literal
 
 from ..._models import BaseModel
 
@@ -8,8 +8,10 @@
 
 
 class URLNormalizationUpdateResponse(BaseModel):
-    scope: Optional[str] = None
+    """A result."""
+
+    scope: Literal["incoming", "both", "none"]
     """The scope of the URL normalization."""
 
-    type: Optional[str] = None
+    type: Literal["cloudflare", "rfc3986"]
     """The type of URL normalization performed by Cloudflare."""
diff --git a/src/cloudflare/types/url_scanner/__init__.py b/src/cloudflare/types/url_scanner/__init__.py
index a533b1cdeb9..988295382a6 100644
--- a/src/cloudflare/types/url_scanner/__init__.py
+++ b/src/cloudflare/types/url_scanner/__init__.py
@@ -2,12 +2,14 @@
 
 from __future__ import annotations
 
-from .scan_get_params import ScanGetParams as ScanGetParams
+from .scan_list_params import ScanListParams as ScanListParams
+from .scan_dom_response import ScanDOMResponse as ScanDOMResponse
 from .scan_get_response import ScanGetResponse as ScanGetResponse
-from .scan_har_response import ScanHarResponse as ScanHarResponse
+from .scan_har_response import ScanHARResponse as ScanHARResponse
 from .scan_create_params import ScanCreateParams as ScanCreateParams
-from .url_scanner_domain import URLScannerDomain as URLScannerDomain
+from .scan_list_response import ScanListResponse as ScanListResponse
 from .scan_create_response import ScanCreateResponse as ScanCreateResponse
+from .response_get_response import ResponseGetResponse as ResponseGetResponse
 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
+from .scan_bulk_create_params import ScanBulkCreateParams as ScanBulkCreateParams
+from .scan_bulk_create_response import ScanBulkCreateResponse as ScanBulkCreateResponse
diff --git a/src/cloudflare/types/url_scanner/response_get_response.py b/src/cloudflare/types/url_scanner/response_get_response.py
new file mode 100644
index 00000000000..c2215a79037
--- /dev/null
+++ b/src/cloudflare/types/url_scanner/response_get_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["ResponseGetResponse"]
+
+ResponseGetResponse: TypeAlias = str
diff --git a/src/cloudflare/types/url_scanner/scan_bulk_create_params.py b/src/cloudflare/types/url_scanner/scan_bulk_create_params.py
new file mode 100644
index 00000000000..f02ccc3ebee
--- /dev/null
+++ b/src/cloudflare/types/url_scanner/scan_bulk_create_params.py
@@ -0,0 +1,43 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Iterable
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["ScanBulkCreateParams", "Body"]
+
+
+class ScanBulkCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    body: Iterable[Body]
+    """List of urls to scan (up to a 100)."""
+
+
+class Body(TypedDict, total=False):
+    url: Required[str]
+
+    customagent: str
+
+    custom_headers: Annotated[Dict[str, str], PropertyInfo(alias="customHeaders")]
+    """Set custom headers."""
+
+    referer: str
+
+    screenshots_resolutions: Annotated[
+        List[Literal["desktop", "mobile", "tablet"]], PropertyInfo(alias="screenshotsResolutions")
+    ]
+    """Take multiple screenshots targeting different device types."""
+
+    visibility: Literal["Public", "Unlisted"]
+    """
+    The option `Public` means it will be included in listings like recent scans and
+    search results. `Unlisted` means it will not be included in the aforementioned
+    listings, users will need to have the scan's ID to access it. A a scan will be
+    automatically marked as unlisted if it fails, if it contains potential PII or
+    other sensitive material.
+    """
diff --git a/src/cloudflare/types/url_scanner/scan_bulk_create_response.py b/src/cloudflare/types/url_scanner/scan_bulk_create_response.py
new file mode 100644
index 00000000000..99df85a1881
--- /dev/null
+++ b/src/cloudflare/types/url_scanner/scan_bulk_create_response.py
@@ -0,0 +1,34 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal, TypeAlias
+
+from ..._models import BaseModel
+
+__all__ = ["ScanBulkCreateResponse", "ScanBulkCreateResponseItem", "ScanBulkCreateResponseItemOptions"]
+
+
+class ScanBulkCreateResponseItemOptions(BaseModel):
+    useragent: Optional[str] = None
+
+
+class ScanBulkCreateResponseItem(BaseModel):
+    api: str
+    """URL to api report."""
+
+    result: str
+    """URL to report."""
+
+    url: str
+    """Submitted URL"""
+
+    uuid: str
+    """Scan ID."""
+
+    visibility: Literal["public", "unlisted"]
+    """Submitted visibility status."""
+
+    options: Optional[ScanBulkCreateResponseItemOptions] = None
+
+
+ScanBulkCreateResponse: TypeAlias = List[ScanBulkCreateResponseItem]
diff --git a/src/cloudflare/types/url_scanner/scan_create_params.py b/src/cloudflare/types/url_scanner/scan_create_params.py
index f6268cebd51..a53306462fb 100644
--- a/src/cloudflare/types/url_scanner/scan_create_params.py
+++ b/src/cloudflare/types/url_scanner/scan_create_params.py
@@ -11,15 +11,221 @@
 
 
 class ScanCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
     url: Required[str]
 
+    country: Literal[
+        "AF",
+        "AL",
+        "DZ",
+        "AD",
+        "AO",
+        "AG",
+        "AR",
+        "AM",
+        "AU",
+        "AT",
+        "AZ",
+        "BH",
+        "BD",
+        "BB",
+        "BY",
+        "BE",
+        "BZ",
+        "BJ",
+        "BM",
+        "BT",
+        "BO",
+        "BA",
+        "BW",
+        "BR",
+        "BN",
+        "BG",
+        "BF",
+        "BI",
+        "KH",
+        "CM",
+        "CA",
+        "CV",
+        "KY",
+        "CF",
+        "TD",
+        "CL",
+        "CN",
+        "CO",
+        "KM",
+        "CG",
+        "CR",
+        "CI",
+        "HR",
+        "CU",
+        "CY",
+        "CZ",
+        "CD",
+        "DK",
+        "DJ",
+        "DM",
+        "DO",
+        "EC",
+        "EG",
+        "SV",
+        "GQ",
+        "ER",
+        "EE",
+        "SZ",
+        "ET",
+        "FJ",
+        "FI",
+        "FR",
+        "GA",
+        "GE",
+        "DE",
+        "GH",
+        "GR",
+        "GL",
+        "GD",
+        "GT",
+        "GN",
+        "GW",
+        "GY",
+        "HT",
+        "HN",
+        "HU",
+        "IS",
+        "IN",
+        "ID",
+        "IR",
+        "IQ",
+        "IE",
+        "IL",
+        "IT",
+        "JM",
+        "JP",
+        "JO",
+        "KZ",
+        "KE",
+        "KI",
+        "KW",
+        "KG",
+        "LA",
+        "LV",
+        "LB",
+        "LS",
+        "LR",
+        "LY",
+        "LI",
+        "LT",
+        "LU",
+        "MO",
+        "MG",
+        "MW",
+        "MY",
+        "MV",
+        "ML",
+        "MR",
+        "MU",
+        "MX",
+        "FM",
+        "MD",
+        "MC",
+        "MN",
+        "MS",
+        "MA",
+        "MZ",
+        "MM",
+        "NA",
+        "NR",
+        "NP",
+        "NL",
+        "NZ",
+        "NI",
+        "NE",
+        "NG",
+        "KP",
+        "MK",
+        "NO",
+        "OM",
+        "PK",
+        "PS",
+        "PA",
+        "PG",
+        "PY",
+        "PE",
+        "PH",
+        "PL",
+        "PT",
+        "QA",
+        "RO",
+        "RU",
+        "RW",
+        "SH",
+        "KN",
+        "LC",
+        "VC",
+        "WS",
+        "SM",
+        "ST",
+        "SA",
+        "SN",
+        "RS",
+        "SC",
+        "SL",
+        "SK",
+        "SI",
+        "SB",
+        "SO",
+        "ZA",
+        "KR",
+        "SS",
+        "ES",
+        "LK",
+        "SD",
+        "SR",
+        "SE",
+        "CH",
+        "SY",
+        "TW",
+        "TJ",
+        "TZ",
+        "TH",
+        "BS",
+        "GM",
+        "TL",
+        "TG",
+        "TO",
+        "TT",
+        "TN",
+        "TR",
+        "TM",
+        "UG",
+        "UA",
+        "AE",
+        "GB",
+        "US",
+        "UY",
+        "UZ",
+        "VU",
+        "VE",
+        "VN",
+        "YE",
+        "ZM",
+        "ZW",
+    ]
+    """Country to geo egress from"""
+
+    customagent: str
+
     custom_headers: Annotated[Dict[str, str], PropertyInfo(alias="customHeaders")]
-    """Set custom headers"""
+    """Set custom headers."""
+
+    referer: str
 
     screenshots_resolutions: Annotated[
         List[Literal["desktop", "mobile", "tablet"]], PropertyInfo(alias="screenshotsResolutions")
     ]
-    """Take multiple screenshots targeting different device types"""
+    """Take multiple screenshots targeting different device types."""
 
     visibility: Literal["Public", "Unlisted"]
     """
diff --git a/src/cloudflare/types/url_scanner/scan_create_response.py b/src/cloudflare/types/url_scanner/scan_create_response.py
index df5609b4ebe..ba4e034191b 100644
--- a/src/cloudflare/types/url_scanner/scan_create_response.py
+++ b/src/cloudflare/types/url_scanner/scan_create_response.py
@@ -1,15 +1,25 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from datetime import datetime
+from typing import Optional
+from typing_extensions import Literal
 
 from ..._models import BaseModel
 
-__all__ = ["ScanCreateResponse"]
+__all__ = ["ScanCreateResponse", "Options"]
+
+
+class Options(BaseModel):
+    useragent: Optional[str] = None
 
 
 class ScanCreateResponse(BaseModel):
-    time: datetime
-    """Time when url was submitted for scanning."""
+    api: str
+    """URL to api report."""
+
+    message: str
+
+    result: str
+    """Public URL to report."""
 
     url: str
     """Canonical form of submitted URL. Use this if you want to later search by URL."""
@@ -17,5 +27,7 @@ class ScanCreateResponse(BaseModel):
     uuid: str
     """Scan ID."""
 
-    visibility: str
+    visibility: Literal["public", "unlisted"]
     """Submitted visibility status."""
+
+    options: Optional[Options] = None
diff --git a/src/cloudflare/types/url_scanner/scan_dom_response.py b/src/cloudflare/types/url_scanner/scan_dom_response.py
new file mode 100644
index 00000000000..3d53cb81dbf
--- /dev/null
+++ b/src/cloudflare/types/url_scanner/scan_dom_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["ScanDOMResponse"]
+
+ScanDOMResponse: TypeAlias = str
diff --git a/src/cloudflare/types/url_scanner/scan_get_params.py b/src/cloudflare/types/url_scanner/scan_get_params.py
deleted file mode 100644
index 3e19b2920f1..00000000000
--- a/src/cloudflare/types/url_scanner/scan_get_params.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, Annotated, TypedDict
-
-from ..._utils import PropertyInfo
-
-__all__ = ["ScanGetParams"]
-
-
-class ScanGetParams(TypedDict, total=False):
-    account_id: Required[Annotated[str, PropertyInfo(alias="accountId")]]
-    """Account Id"""
-
-    full: bool
-    """Whether to return full report (scan summary and network log)."""
diff --git a/src/cloudflare/types/url_scanner/scan_get_response.py b/src/cloudflare/types/url_scanner/scan_get_response.py
index dc384e7a7b8..c2acc8e9ffa 100644
--- a/src/cloudflare/types/url_scanner/scan_get_response.py
+++ b/src/cloudflare/types/url_scanner/scan_get_response.py
@@ -1,365 +1,536 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
-from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ..._models import BaseModel
-from .url_scanner_domain import URLScannerDomain
-from ..radar.http.browser import Browser
 
 __all__ = [
     "ScanGetResponse",
-    "Scan",
-    "ScanCertificate",
-    "ScanGeo",
-    "ScanMeta",
-    "ScanMetaProcessors",
-    "ScanMetaProcessorsCategories",
-    "ScanMetaProcessorsCategoriesRisk",
-    "ScanMetaProcessorsRank",
-    "ScanMetaProcessorsTech",
-    "ScanMetaProcessorsTechCategory",
-    "ScanMetaProcessorsTechEvidence",
-    "ScanMetaProcessorsTechEvidencePattern",
-    "ScanPage",
-    "ScanPageConsole",
-    "ScanPageCookie",
-    "ScanPageJS",
-    "ScanPageJSVariable",
-    "ScanPageSecurityViolation",
-    "ScanPerformance",
-    "ScanTask",
-    "ScanTaskError",
-    "ScanTaskScannedFrom",
-    "ScanVerdicts",
-    "ScanVerdictsOverall",
-    "ScanVerdictsOverallCategory",
-    "ScanASNs",
-    "ScanASNsASN",
-    "ScanDomains",
-    "ScanDomainsExampleCom",
-    "ScanDomainsExampleComCategories",
-    "ScanDomainsExampleComCategoriesInherited",
-    "ScanDomainsExampleComDNS",
-    "ScanDomainsExampleComRank",
-    "ScanIPs",
-    "ScanIPsIP",
-    "ScanLinks",
-    "ScanLinksLink",
+    "Data",
+    "DataConsole",
+    "DataConsoleMessage",
+    "DataCookie",
+    "DataGlobal",
+    "DataLink",
+    "DataPerformance",
+    "DataRequest",
+    "DataRequestRequest",
+    "DataRequestRequestInitiator",
+    "DataRequestRequestRequest",
+    "DataRequestRequestRedirectResponse",
+    "DataRequestRequestRedirectResponseSecurityHeader",
+    "DataRequestResponse",
+    "DataRequestResponseASN",
+    "DataRequestResponseGeoip",
+    "DataRequestResponseResponse",
+    "DataRequestResponseResponseSecurityDetails",
+    "DataRequestResponseResponseSecurityHeader",
+    "Lists",
+    "ListsCertificate",
+    "Meta",
+    "MetaProcessors",
+    "MetaProcessorsASN",
+    "MetaProcessorsASNData",
+    "MetaProcessorsDNS",
+    "MetaProcessorsDNSData",
+    "MetaProcessorsDomainCategories",
+    "MetaProcessorsDomainCategoriesData",
+    "MetaProcessorsGeoip",
+    "MetaProcessorsGeoipData",
+    "MetaProcessorsGeoipDataGeoip",
+    "MetaProcessorsPhishing",
+    "MetaProcessorsRadarRank",
+    "MetaProcessorsRadarRankData",
+    "MetaProcessorsWappa",
+    "MetaProcessorsWappaData",
+    "MetaProcessorsWappaDataCategory",
+    "MetaProcessorsWappaDataConfidence",
+    "MetaProcessorsURLCategories",
+    "MetaProcessorsURLCategoriesData",
+    "MetaProcessorsURLCategoriesDataContent",
+    "MetaProcessorsURLCategoriesDataInherited",
+    "MetaProcessorsURLCategoriesDataInheritedContent",
+    "MetaProcessorsURLCategoriesDataInheritedRisk",
+    "MetaProcessorsURLCategoriesDataRisk",
+    "Page",
+    "PageScreenshot",
+    "Scanner",
+    "Stats",
+    "StatsDomainStat",
+    "StatsIPStat",
+    "StatsIPStatASN",
+    "StatsIPStatGeoip",
+    "StatsProtocolStat",
+    "StatsResourceStat",
+    "StatsServerStat",
+    "StatsTLSStat",
+    "StatsTLSStatProtocols",
+    "Task",
+    "TaskOptions",
+    "Verdicts",
+    "VerdictsOverall",
 ]
 
 
-class ScanCertificate(BaseModel):
-    issuer: str
+class DataConsoleMessage(BaseModel):
+    level: str
 
-    subject_name: str = FieldInfo(alias="subjectName")
+    source: str
 
-    valid_from: float = FieldInfo(alias="validFrom")
+    text: str
 
-    valid_to: float = FieldInfo(alias="validTo")
+    url: str
 
 
-class ScanGeo(BaseModel):
-    continents: List[str]
-    """GeoIP continent location"""
+class DataConsole(BaseModel):
+    message: DataConsoleMessage
 
-    locations: List[str]
-    """GeoIP country location"""
 
+class DataCookie(BaseModel):
+    domain: str
+
+    expires: float
 
-class ScanMetaProcessorsCategoriesRisk(BaseModel):
-    id: int
+    http_only: bool = FieldInfo(alias="httpOnly")
 
     name: str
 
-    super_category_id: int
+    path: str
 
+    priority: str
 
-class ScanMetaProcessorsCategories(BaseModel):
-    content: List[URLScannerDomain]
+    same_party: bool = FieldInfo(alias="sameParty")
 
-    risks: List[ScanMetaProcessorsCategoriesRisk]
+    secure: bool
 
+    session: bool
 
-class ScanMetaProcessorsRank(BaseModel):
-    bucket: str
+    size: float
 
-    name: str
+    source_port: float = FieldInfo(alias="sourcePort")
 
-    rank: Optional[int] = None
-    """Rank in the Global Radar Rank, if set.
+    source_scheme: str = FieldInfo(alias="sourceScheme")
 
-    See more at https://blog.cloudflare.com/radar-domain-rankings/
-    """
+    value: str
 
 
-class ScanMetaProcessorsTechCategory(BaseModel):
-    id: int
+class DataGlobal(BaseModel):
+    prop: str
 
-    groups: List[int]
+    type: str
 
-    name: str
 
-    priority: int
+class DataLink(BaseModel):
+    href: str
 
-    slug: str
+    text: str
 
 
-class ScanMetaProcessorsTechEvidencePattern(BaseModel):
-    confidence: int
+class DataPerformance(BaseModel):
+    duration: float
 
-    excludes: List[str]
+    entry_type: str = FieldInfo(alias="entryType")
 
-    implies: List[str]
+    name: str
 
-    match: str
+    start_time: float = FieldInfo(alias="startTime")
 
-    name: str
-    """Header or Cookie name when set"""
 
-    regex: str
+class DataRequestRequestInitiator(BaseModel):
+    host: str
 
     type: str
 
-    value: str
+    url: str
 
-    version: str
 
+class DataRequestRequestRequest(BaseModel):
+    initial_priority: str = FieldInfo(alias="initialPriority")
 
-class ScanMetaProcessorsTechEvidence(BaseModel):
-    implied_by: List[str] = FieldInfo(alias="impliedBy")
+    is_same_site: bool = FieldInfo(alias="isSameSite")
 
-    patterns: List[ScanMetaProcessorsTechEvidencePattern]
+    method: str
 
+    mixed_content_type: str = FieldInfo(alias="mixedContentType")
 
-class ScanMetaProcessorsTech(BaseModel):
-    categories: List[ScanMetaProcessorsTechCategory]
+    referrer_policy: str = FieldInfo(alias="referrerPolicy")
 
-    confidence: int
+    url: str
 
-    evidence: ScanMetaProcessorsTechEvidence
+    headers: Optional[object] = None
 
-    icon: str
 
+class DataRequestRequestRedirectResponseSecurityHeader(BaseModel):
     name: str
 
-    slug: str
+    value: str
 
-    website: str
 
-    description: Optional[str] = None
+class DataRequestRequestRedirectResponse(BaseModel):
+    charset: str
 
+    mime_type: str = FieldInfo(alias="mimeType")
 
-class ScanMetaProcessors(BaseModel):
-    categories: ScanMetaProcessorsCategories
+    protocol: str
 
-    phishing: List[str]
+    remote_ip_address: str = FieldInfo(alias="remoteIPAddress")
 
-    rank: ScanMetaProcessorsRank
+    remote_port: float = FieldInfo(alias="remotePort")
 
-    tech: List[ScanMetaProcessorsTech]
+    security_headers: List[DataRequestRequestRedirectResponseSecurityHeader] = FieldInfo(alias="securityHeaders")
 
+    security_state: str = FieldInfo(alias="securityState")
 
-class ScanMeta(BaseModel):
-    processors: ScanMetaProcessors
+    status: float
 
+    status_text: str = FieldInfo(alias="statusText")
 
-class ScanPageConsole(BaseModel):
-    category: str
+    url: str
 
-    text: str
+    headers: Optional[object] = None
+
+
+class DataRequestRequest(BaseModel):
+    document_url: str = FieldInfo(alias="documentURL")
+
+    has_user_gesture: bool = FieldInfo(alias="hasUserGesture")
+
+    initiator: DataRequestRequestInitiator
+
+    redirect_has_extra_info: bool = FieldInfo(alias="redirectHasExtraInfo")
+
+    request: DataRequestRequestRequest
+
+    request_id: str = FieldInfo(alias="requestId")
 
     type: str
 
-    url: Optional[str] = None
+    wall_time: float = FieldInfo(alias="wallTime")
 
+    frame_id: Optional[str] = FieldInfo(alias="frameId", default=None)
 
-class ScanPageCookie(BaseModel):
-    domain: str
+    loader_id: Optional[str] = FieldInfo(alias="loaderId", default=None)
 
-    expires: float
+    primary_request: Optional[bool] = FieldInfo(alias="primaryRequest", default=None)
 
-    http_only: bool = FieldInfo(alias="httpOnly")
+    redirect_response: Optional[DataRequestRequestRedirectResponse] = FieldInfo(alias="redirectResponse", default=None)
+
+
+class DataRequestResponseASN(BaseModel):
+    asn: str
+
+    country: str
+
+    description: str
+
+    ip: str
 
     name: str
 
-    path: str
+    org: str
 
-    same_party: bool = FieldInfo(alias="sameParty")
 
-    secure: bool
+class DataRequestResponseGeoip(BaseModel):
+    city: str
 
-    session: bool
+    country: str
 
-    size: float
+    country_name: str
 
-    source_port: float = FieldInfo(alias="sourcePort")
+    geoname_id: str = FieldInfo(alias="geonameId")
 
-    source_scheme: str = FieldInfo(alias="sourceScheme")
+    ll: List[float]
 
-    value: str
+    region: str
+
+
+class DataRequestResponseResponseSecurityDetails(BaseModel):
+    certificate_id: float = FieldInfo(alias="certificateId")
+
+    certificate_transparency_compliance: str = FieldInfo(alias="certificateTransparencyCompliance")
+
+    cipher: str
+
+    encrypted_client_hello: bool = FieldInfo(alias="encryptedClientHello")
+
+    issuer: str
+
+    key_exchange: str = FieldInfo(alias="keyExchange")
+
+    key_exchange_group: str = FieldInfo(alias="keyExchangeGroup")
+
+    protocol: str
 
-    priority: Optional[str] = None
+    san_list: List[str] = FieldInfo(alias="sanList")
 
+    server_signature_algorithm: float = FieldInfo(alias="serverSignatureAlgorithm")
 
-class ScanPageJSVariable(BaseModel):
+    subject_name: str = FieldInfo(alias="subjectName")
+
+    valid_from: float = FieldInfo(alias="validFrom")
+
+    valid_to: float = FieldInfo(alias="validTo")
+
+
+class DataRequestResponseResponseSecurityHeader(BaseModel):
     name: str
 
-    type: str
+    value: str
 
 
-class ScanPageJS(BaseModel):
-    variables: List[ScanPageJSVariable]
+class DataRequestResponseResponse(BaseModel):
+    charset: str
 
+    mime_type: str = FieldInfo(alias="mimeType")
 
-class ScanPageSecurityViolation(BaseModel):
-    category: str
+    protocol: str
 
-    text: str
+    remote_ip_address: str = FieldInfo(alias="remoteIPAddress")
+
+    remote_port: float = FieldInfo(alias="remotePort")
+
+    security_details: DataRequestResponseResponseSecurityDetails = FieldInfo(alias="securityDetails")
+
+    security_headers: List[DataRequestResponseResponseSecurityHeader] = FieldInfo(alias="securityHeaders")
+
+    security_state: str = FieldInfo(alias="securityState")
+
+    status: float
+
+    status_text: str = FieldInfo(alias="statusText")
 
     url: str
 
+    headers: Optional[object] = None
 
-class ScanPage(BaseModel):
-    asn: str
 
-    asn_location_alpha2: str = FieldInfo(alias="asnLocationAlpha2")
+class DataRequestResponse(BaseModel):
+    asn: DataRequestResponseASN
 
-    asnname: str
+    data_length: float = FieldInfo(alias="dataLength")
 
-    console: List[ScanPageConsole]
+    encoded_data_length: float = FieldInfo(alias="encodedDataLength")
 
-    cookies: List[ScanPageCookie]
+    geoip: DataRequestResponseGeoip
 
-    country: str
+    has_extra_info: bool = FieldInfo(alias="hasExtraInfo")
 
-    country_location_alpha2: str = FieldInfo(alias="countryLocationAlpha2")
+    request_id: str = FieldInfo(alias="requestId")
+
+    response: DataRequestResponseResponse
+
+    size: float
+
+    type: str
+
+    content_available: Optional[bool] = FieldInfo(alias="contentAvailable", default=None)
+
+    hash: Optional[str] = None
+
+
+class DataRequest(BaseModel):
+    request: DataRequestRequest
+
+    response: DataRequestResponse
+
+    requests: Optional[List[DataRequestRequest]] = None
+
+
+class Data(BaseModel):
+    console: List[DataConsole]
+
+    cookies: List[DataCookie]
+
+    globals: List[DataGlobal]
+
+    links: List[DataLink]
+
+    performance: List[DataPerformance]
+
+    requests: List[DataRequest]
 
-    domain: str
 
-    headers: List[Browser]
+class ListsCertificate(BaseModel):
+    issuer: str
+
+    subject_name: str = FieldInfo(alias="subjectName")
+
+    valid_from: float = FieldInfo(alias="validFrom")
+
+    valid_to: float = FieldInfo(alias="validTo")
+
+
+class Lists(BaseModel):
+    asns: List[str]
+
+    certificates: List[ListsCertificate]
+
+    continents: List[str]
+
+    countries: List[str]
+
+    domains: List[str]
+
+    hashes: List[str]
+
+    ips: List[str]
+
+    link_domains: List[str] = FieldInfo(alias="linkDomains")
+
+    servers: List[str]
+
+    urls: List[str]
+
+
+class MetaProcessorsASNData(BaseModel):
+    asn: str
+
+    country: str
+
+    description: str
 
     ip: str
 
-    js: ScanPageJS
+    name: str
 
-    security_violations: List[ScanPageSecurityViolation] = FieldInfo(alias="securityViolations")
 
-    status: float
+class MetaProcessorsASN(BaseModel):
+    data: List[MetaProcessorsASNData]
 
-    subdivision1_name: str = FieldInfo(alias="subdivision1Name")
 
-    subdivision2name: str
+class MetaProcessorsDNSData(BaseModel):
+    address: str
 
-    url: str
+    dnssec_valid: bool
 
+    name: str
 
-class ScanPerformance(BaseModel):
-    connect_end: float = FieldInfo(alias="connectEnd")
+    type: str
 
-    connect_start: float = FieldInfo(alias="connectStart")
 
-    decoded_body_size: float = FieldInfo(alias="decodedBodySize")
+class MetaProcessorsDNS(BaseModel):
+    data: List[MetaProcessorsDNSData]
 
-    domain_lookup_end: float = FieldInfo(alias="domainLookupEnd")
 
-    domain_lookup_start: float = FieldInfo(alias="domainLookupStart")
+class MetaProcessorsDomainCategoriesData(BaseModel):
+    inherited: object
 
-    dom_complete: float = FieldInfo(alias="domComplete")
+    is_primary: bool = FieldInfo(alias="isPrimary")
 
-    dom_content_loaded_event_end: float = FieldInfo(alias="domContentLoadedEventEnd")
+    name: str
 
-    dom_content_loaded_event_start: float = FieldInfo(alias="domContentLoadedEventStart")
 
-    dom_interactive: float = FieldInfo(alias="domInteractive")
+class MetaProcessorsDomainCategories(BaseModel):
+    data: List[MetaProcessorsDomainCategoriesData]
 
-    duration: float
 
-    encoded_body_size: float = FieldInfo(alias="encodedBodySize")
+class MetaProcessorsGeoipDataGeoip(BaseModel):
+    city: str
 
-    entry_type: str = FieldInfo(alias="entryType")
+    country: str
 
-    fetch_start: float = FieldInfo(alias="fetchStart")
+    country_name: str
 
-    initiator_type: str = FieldInfo(alias="initiatorType")
+    ll: List[float]
 
-    load_event_end: float = FieldInfo(alias="loadEventEnd")
+    region: str
 
-    load_event_start: float = FieldInfo(alias="loadEventStart")
 
+class MetaProcessorsGeoipData(BaseModel):
+    geoip: MetaProcessorsGeoipDataGeoip
+
+    ip: str
+
+
+class MetaProcessorsGeoip(BaseModel):
+    data: List[MetaProcessorsGeoipData]
+
+
+class MetaProcessorsPhishing(BaseModel):
+    data: List[str]
+
+
+class MetaProcessorsRadarRankData(BaseModel):
+    bucket: str
+
+    hostname: str
+
+    rank: Optional[float] = None
+
+
+class MetaProcessorsRadarRank(BaseModel):
+    data: List[MetaProcessorsRadarRankData]
+
+
+class MetaProcessorsWappaDataCategory(BaseModel):
     name: str
 
-    next_hop_protocol: str = FieldInfo(alias="nextHopProtocol")
+    priority: float
 
-    redirect_count: float = FieldInfo(alias="redirectCount")
 
-    redirect_end: float = FieldInfo(alias="redirectEnd")
+class MetaProcessorsWappaDataConfidence(BaseModel):
+    confidence: float
 
-    redirect_start: float = FieldInfo(alias="redirectStart")
+    name: str
 
-    request_start: float = FieldInfo(alias="requestStart")
+    pattern: str
 
-    response_end: float = FieldInfo(alias="responseEnd")
+    pattern_type: str = FieldInfo(alias="patternType")
 
-    response_start: float = FieldInfo(alias="responseStart")
 
-    secure_connection_start: float = FieldInfo(alias="secureConnectionStart")
+class MetaProcessorsWappaData(BaseModel):
+    app: str
 
-    start_time: float = FieldInfo(alias="startTime")
+    categories: List[MetaProcessorsWappaDataCategory]
 
-    transfer_size: float = FieldInfo(alias="transferSize")
+    confidence: List[MetaProcessorsWappaDataConfidence]
 
-    type: str
+    confidence_total: float = FieldInfo(alias="confidenceTotal")
 
-    unload_event_end: float = FieldInfo(alias="unloadEventEnd")
+    icon: str
 
-    unload_event_start: float = FieldInfo(alias="unloadEventStart")
+    website: str
 
-    worker_start: float = FieldInfo(alias="workerStart")
 
+class MetaProcessorsWappa(BaseModel):
+    data: List[MetaProcessorsWappaData]
 
-class ScanTaskError(BaseModel):
-    message: str
 
+class MetaProcessorsURLCategoriesDataContent(BaseModel):
+    id: float
 
-class ScanTaskScannedFrom(BaseModel):
-    colo: str
-    """IATA code of Cloudflare datacenter"""
+    name: str
 
+    super_category_id: float
 
-class ScanTask(BaseModel):
-    client_location: str = FieldInfo(alias="clientLocation")
-    """Submitter location"""
 
-    client_type: Literal["Site", "Automatic", "Api"] = FieldInfo(alias="clientType")
+class MetaProcessorsURLCategoriesDataInheritedContent(BaseModel):
+    id: float
 
-    effective_url: str = FieldInfo(alias="effectiveUrl")
-    """URL of the primary request, after all HTTP redirects"""
+    name: str
 
-    errors: List[ScanTaskError]
+    super_category_id: float
 
-    scanned_from: ScanTaskScannedFrom = FieldInfo(alias="scannedFrom")
 
-    status: Literal["Queued", "InProgress", "InPostProcessing", "Finished"]
+class MetaProcessorsURLCategoriesDataInheritedRisk(BaseModel):
+    id: float
 
-    success: bool
+    name: str
 
-    time: str
+    super_category_id: float
 
-    time_end: str = FieldInfo(alias="timeEnd")
 
-    url: str
-    """Submitted URL"""
+class MetaProcessorsURLCategoriesDataInherited(BaseModel):
+    content: List[MetaProcessorsURLCategoriesDataInheritedContent]
 
-    uuid: str
-    """Scan ID"""
+    from_: str = FieldInfo(alias="from")
 
-    visibility: Literal["Public", "Unlisted"]
+    risks: List[MetaProcessorsURLCategoriesDataInheritedRisk]
 
 
-class ScanVerdictsOverallCategory(BaseModel):
+class MetaProcessorsURLCategoriesDataRisk(BaseModel):
     id: float
 
     name: str
@@ -367,164 +538,322 @@ class ScanVerdictsOverallCategory(BaseModel):
     super_category_id: float
 
 
-class ScanVerdictsOverall(BaseModel):
-    categories: List[ScanVerdictsOverallCategory]
+class MetaProcessorsURLCategoriesData(BaseModel):
+    content: List[MetaProcessorsURLCategoriesDataContent]
+
+    inherited: MetaProcessorsURLCategoriesDataInherited
+
+    name: str
+
+    risks: List[MetaProcessorsURLCategoriesDataRisk]
+
+
+class MetaProcessorsURLCategories(BaseModel):
+    data: List[MetaProcessorsURLCategoriesData]
 
-    malicious: bool
-    """
-    At least one of our subsystems marked the site as potentially malicious at the
-    time of the scan.
-    """
 
-    phishing: List[str]
+class MetaProcessors(BaseModel):
+    asn: MetaProcessorsASN
 
+    dns: MetaProcessorsDNS
 
-class ScanVerdicts(BaseModel):
-    overall: ScanVerdictsOverall
+    domain_categories: MetaProcessorsDomainCategories = FieldInfo(alias="domainCategories")
 
+    geoip: MetaProcessorsGeoip
+
+    phishing: MetaProcessorsPhishing
+
+    radar_rank: MetaProcessorsRadarRank = FieldInfo(alias="radarRank")
+
+    wappa: MetaProcessorsWappa
+
+    url_categories: Optional[MetaProcessorsURLCategories] = FieldInfo(alias="urlCategories", default=None)
+
+
+class Meta(BaseModel):
+    processors: MetaProcessors
+
+
+class PageScreenshot(BaseModel):
+    dhash: str
+
+    mm3_hash: float = FieldInfo(alias="mm3Hash")
+
+    name: str
+
+    phash: str
+
+
+class Page(BaseModel):
+    apex_domain: str = FieldInfo(alias="apexDomain")
 
-class ScanASNsASN(BaseModel):
     asn: str
 
+    asnname: str
+
+    city: str
+
+    country: str
+
+    domain: str
+
+    ip: str
+
+    mime_type: str = FieldInfo(alias="mimeType")
+
+    server: str
+
+    status: str
+
+    title: str
+
+    tls_age_days: float = FieldInfo(alias="tlsAgeDays")
+
+    tls_issuer: str = FieldInfo(alias="tlsIssuer")
+
+    tls_valid_days: float = FieldInfo(alias="tlsValidDays")
+
+    tls_valid_from: str = FieldInfo(alias="tlsValidFrom")
+
+    url: str
+
+    screenshot: Optional[PageScreenshot] = None
+
+
+class Scanner(BaseModel):
+    colo: str
+
+    country: str
+
+
+class StatsDomainStat(BaseModel):
+    count: float
+
+    countries: List[str]
+
+    domain: str
+
+    encoded_size: float = FieldInfo(alias="encodedSize")
+
+    index: float
+
+    initiators: List[str]
+
+    ips: List[str]
+
+    redirects: float
+
+    size: float
+
+
+class StatsIPStatASN(BaseModel):
+    asn: str
+
+    country: str
+
     description: str
 
-    location_alpha2: str
+    ip: str
 
     name: str
 
-    org_name: str
+    org: str
 
 
-class ScanASNs(BaseModel):
-    asn: Optional[ScanASNsASN] = None
-    """ASN's contacted"""
+class StatsIPStatGeoip(BaseModel):
+    city: str
 
+    country: str
 
-class ScanDomainsExampleComCategoriesInherited(BaseModel):
-    content: Optional[List[URLScannerDomain]] = None
+    country_name: str
 
-    from_: Optional[str] = FieldInfo(alias="from", default=None)
+    ll: List[float]
 
-    risks: Optional[List[URLScannerDomain]] = None
+    region: str
 
 
-class ScanDomainsExampleComCategories(BaseModel):
-    inherited: ScanDomainsExampleComCategoriesInherited
+class StatsIPStat(BaseModel):
+    asn: StatsIPStatASN
 
-    content: Optional[List[URLScannerDomain]] = None
+    countries: List[str]
 
-    risks: Optional[List[URLScannerDomain]] = None
+    domains: List[str]
 
+    encoded_size: float = FieldInfo(alias="encodedSize")
 
-class ScanDomainsExampleComDNS(BaseModel):
-    address: str
+    geoip: StatsIPStatGeoip
 
-    dnssec_valid: bool
+    index: float
 
-    name: str
+    ip: str
 
-    type: str
+    ipv6: bool
 
+    redirects: float
 
-class ScanDomainsExampleComRank(BaseModel):
-    bucket: str
+    requests: float
 
-    name: str
+    size: float
 
-    rank: Optional[int] = None
-    """Rank in the Global Radar Rank, if set.
+    count: Optional[float] = None
 
-    See more at https://blog.cloudflare.com/radar-domain-rankings/
-    """
 
+class StatsProtocolStat(BaseModel):
+    count: float
 
-class ScanDomainsExampleCom(BaseModel):
-    categories: ScanDomainsExampleComCategories
+    countries: List[str]
 
-    dns: List[ScanDomainsExampleComDNS]
+    encoded_size: float = FieldInfo(alias="encodedSize")
 
-    name: str
+    ips: List[str]
 
-    rank: ScanDomainsExampleComRank
+    protocol: str
+
+    size: float
+
+
+class StatsResourceStat(BaseModel):
+    compression: float
+
+    count: float
+
+    countries: List[str]
+
+    encoded_size: float = FieldInfo(alias="encodedSize")
+
+    ips: List[str]
+
+    percentage: float
+
+    size: float
 
     type: str
 
 
-class ScanDomains(BaseModel):
-    example_com: Optional[ScanDomainsExampleCom] = FieldInfo(alias="example.com", default=None)
+class StatsServerStat(BaseModel):
+    count: float
 
+    countries: List[str]
 
-class ScanIPsIP(BaseModel):
-    asn: str
+    encoded_size: float = FieldInfo(alias="encodedSize")
 
-    asn_description: str = FieldInfo(alias="asnDescription")
+    ips: List[str]
 
-    asn_location_alpha2: str = FieldInfo(alias="asnLocationAlpha2")
+    server: str
 
-    asn_name: str = FieldInfo(alias="asnName")
+    size: float
 
-    asn_org_name: str = FieldInfo(alias="asnOrgName")
 
-    continent: str
+class StatsTLSStatProtocols(BaseModel):
+    tls_1_3_aes_128_gcm: float = FieldInfo(alias="TLS 1.3 / AES_128_GCM")
 
-    geoname_id: str = FieldInfo(alias="geonameId")
 
-    ip: str
+class StatsTLSStat(BaseModel):
+    count: float
+
+    countries: List[str]
 
-    ip_version: str = FieldInfo(alias="ipVersion")
+    encoded_size: float = FieldInfo(alias="encodedSize")
 
-    latitude: str
+    ips: List[str]
 
-    location_alpha2: str = FieldInfo(alias="locationAlpha2")
+    protocols: StatsTLSStatProtocols
 
-    location_name: str = FieldInfo(alias="locationName")
+    security_state: str = FieldInfo(alias="securityState")
 
-    longitude: str
+    size: float
 
-    subdivision1_name: str = FieldInfo(alias="subdivision1Name")
 
-    subdivision2_name: str = FieldInfo(alias="subdivision2Name")
+class Stats(BaseModel):
+    domain_stats: List[StatsDomainStat] = FieldInfo(alias="domainStats")
 
+    ip_stats: List[StatsIPStat] = FieldInfo(alias="ipStats")
 
-class ScanIPs(BaseModel):
-    ip: Optional[ScanIPsIP] = None
+    i_pv6_percentage: float = FieldInfo(alias="IPv6Percentage")
 
+    malicious: float
 
-class ScanLinksLink(BaseModel):
-    href: str
-    """Outgoing link detected in the DOM"""
+    protocol_stats: List[StatsProtocolStat] = FieldInfo(alias="protocolStats")
+
+    resource_stats: List[StatsResourceStat] = FieldInfo(alias="resourceStats")
+
+    secure_percentage: float = FieldInfo(alias="securePercentage")
+
+    secure_requests: float = FieldInfo(alias="secureRequests")
+
+    server_stats: List[StatsServerStat] = FieldInfo(alias="serverStats")
+
+    tls_stats: List[StatsTLSStat] = FieldInfo(alias="tlsStats")
+
+    total_links: float = FieldInfo(alias="totalLinks")
+
+    uniq_asns: float = FieldInfo(alias="uniqASNs")
+
+    uniq_countries: float = FieldInfo(alias="uniqCountries")
+
+
+class TaskOptions(BaseModel):
+    custom_headers: Optional[object] = FieldInfo(alias="customHeaders", default=None)
+    """Custom headers set."""
+
+    screenshots_resolutions: Optional[List[str]] = FieldInfo(alias="screenshotsResolutions", default=None)
 
-    text: str
 
+class Task(BaseModel):
+    apex_domain: str = FieldInfo(alias="apexDomain")
 
-class ScanLinks(BaseModel):
-    link: Optional[ScanLinksLink] = None
+    domain: str
+
+    dom_url: str = FieldInfo(alias="domURL")
+
+    method: str
+
+    options: TaskOptions
+
+    report_url: str = FieldInfo(alias="reportURL")
 
+    screenshot_url: str = FieldInfo(alias="screenshotURL")
 
-class Scan(BaseModel):
-    certificates: List[ScanCertificate]
+    source: str
 
-    geo: ScanGeo
+    success: bool
 
-    meta: ScanMeta
+    time: str
 
-    page: ScanPage
+    url: str
 
-    performance: List[ScanPerformance]
+    uuid: str
 
-    task: ScanTask
+    visibility: str
 
-    verdicts: ScanVerdicts
 
-    asns: Optional[ScanASNs] = None
-    """Dictionary of Autonomous System Numbers where ASN's are the keys"""
+class VerdictsOverall(BaseModel):
+    categories: List[str]
 
-    domains: Optional[ScanDomains] = None
+    has_verdicts: bool = FieldInfo(alias="hasVerdicts")
 
-    ips: Optional[ScanIPs] = None
+    malicious: bool
 
-    links: Optional[ScanLinks] = None
+    tags: List[str]
+
+
+class Verdicts(BaseModel):
+    overall: VerdictsOverall
 
 
 class ScanGetResponse(BaseModel):
-    scan: Scan
+    data: Data
+
+    lists: Lists
+
+    meta: Meta
+
+    page: Page
+
+    scanner: Scanner
+
+    stats: Stats
+
+    task: Task
+
+    verdicts: Verdicts
diff --git a/src/cloudflare/types/url_scanner/scan_har_response.py b/src/cloudflare/types/url_scanner/scan_har_response.py
index c6bae2fc9fa..2a4f344de77 100644
--- a/src/cloudflare/types/url_scanner/scan_har_response.py
+++ b/src/cloudflare/types/url_scanner/scan_har_response.py
@@ -5,23 +5,23 @@
 from pydantic import Field as FieldInfo
 
 from ..._models import BaseModel
-from ..radar.http.browser import Browser
 
 __all__ = [
-    "ScanHarResponse",
-    "Har",
-    "HarLog",
-    "HarLogCreator",
-    "HarLogEntry",
-    "HarLogEntryRequest",
-    "HarLogEntryResponse",
-    "HarLogEntryResponseContent",
-    "HarLogPage",
-    "HarLogPagePageTimings",
+    "ScanHARResponse",
+    "Log",
+    "LogCreator",
+    "LogEntry",
+    "LogEntryRequest",
+    "LogEntryRequestHeader",
+    "LogEntryResponse",
+    "LogEntryResponseContent",
+    "LogEntryResponseHeader",
+    "LogPage",
+    "LogPagePageTimings",
 ]
 
 
-class HarLogCreator(BaseModel):
+class LogCreator(BaseModel):
     comment: str
 
     name: str
@@ -29,10 +29,16 @@ class HarLogCreator(BaseModel):
     version: str
 
 
-class HarLogEntryRequest(BaseModel):
+class LogEntryRequestHeader(BaseModel):
+    name: str
+
+    value: str
+
+
+class LogEntryRequest(BaseModel):
     body_size: float = FieldInfo(alias="bodySize")
 
-    headers: List[Browser]
+    headers: List[LogEntryRequestHeader]
 
     headers_size: float = FieldInfo(alias="headersSize")
 
@@ -43,7 +49,7 @@ class HarLogEntryRequest(BaseModel):
     url: str
 
 
-class HarLogEntryResponseContent(BaseModel):
+class LogEntryResponseContent(BaseModel):
     mime_type: str = FieldInfo(alias="mimeType")
 
     size: float
@@ -51,14 +57,20 @@ class HarLogEntryResponseContent(BaseModel):
     compression: Optional[int] = None
 
 
-class HarLogEntryResponse(BaseModel):
+class LogEntryResponseHeader(BaseModel):
+    name: str
+
+    value: str
+
+
+class LogEntryResponse(BaseModel):
     transfer_size: float = FieldInfo(alias="_transferSize")
 
     body_size: float = FieldInfo(alias="bodySize")
 
-    content: HarLogEntryResponseContent
+    content: LogEntryResponseContent
 
-    headers: List[Browser]
+    headers: List[LogEntryResponseHeader]
 
     headers_size: float = FieldInfo(alias="headersSize")
 
@@ -71,7 +83,7 @@ class HarLogEntryResponse(BaseModel):
     status_text: str = FieldInfo(alias="statusText")
 
 
-class HarLogEntry(BaseModel):
+class LogEntry(BaseModel):
     initial_priority: str = FieldInfo(alias="_initialPriority")
 
     initiator_type: str = FieldInfo(alias="_initiator_type")
@@ -90,9 +102,9 @@ class HarLogEntry(BaseModel):
 
     pageref: str
 
-    request: HarLogEntryRequest
+    request: LogEntryRequest
 
-    response: HarLogEntryResponse
+    response: LogEntryResponse
 
     server_ip_address: str = FieldInfo(alias="serverIPAddress")
 
@@ -101,35 +113,31 @@ class HarLogEntry(BaseModel):
     time: float
 
 
-class HarLogPagePageTimings(BaseModel):
+class LogPagePageTimings(BaseModel):
     on_content_load: float = FieldInfo(alias="onContentLoad")
 
     on_load: float = FieldInfo(alias="onLoad")
 
 
-class HarLogPage(BaseModel):
+class LogPage(BaseModel):
     id: str
 
-    page_timings: HarLogPagePageTimings = FieldInfo(alias="pageTimings")
+    page_timings: LogPagePageTimings = FieldInfo(alias="pageTimings")
 
     started_date_time: str = FieldInfo(alias="startedDateTime")
 
     title: str
 
 
-class HarLog(BaseModel):
-    creator: HarLogCreator
+class Log(BaseModel):
+    creator: LogCreator
 
-    entries: List[HarLogEntry]
+    entries: List[LogEntry]
 
-    pages: List[HarLogPage]
+    pages: List[LogPage]
 
     version: str
 
 
-class Har(BaseModel):
-    log: HarLog
-
-
-class ScanHarResponse(BaseModel):
-    har: Har
+class ScanHARResponse(BaseModel):
+    log: Log
diff --git a/src/cloudflare/types/url_scanner/scan_list_params.py b/src/cloudflare/types/url_scanner/scan_list_params.py
new file mode 100644
index 00000000000..97421b92ccc
--- /dev/null
+++ b/src/cloudflare/types/url_scanner/scan_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ScanListParams"]
+
+
+class ScanListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account ID."""
+
+    q: str
+    """Filter scans"""
+
+    size: int
+    """Limit the number of objects in the response."""
diff --git a/src/cloudflare/types/url_scanner/scan_list_response.py b/src/cloudflare/types/url_scanner/scan_list_response.py
new file mode 100644
index 00000000000..7cb1be617a4
--- /dev/null
+++ b/src/cloudflare/types/url_scanner/scan_list_response.py
@@ -0,0 +1,61 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["ScanListResponse", "Result", "ResultPage", "ResultStats", "ResultTask", "ResultVerdicts"]
+
+
+class ResultPage(BaseModel):
+    asn: str
+
+    country: str
+
+    ip: str
+
+    url: str
+
+
+class ResultStats(BaseModel):
+    data_length: float = FieldInfo(alias="dataLength")
+
+    requests: float
+
+    uniq_countries: float = FieldInfo(alias="uniqCountries")
+
+    uniq_ips: float = FieldInfo(alias="uniqIPs")
+
+
+class ResultTask(BaseModel):
+    time: str
+
+    url: str
+
+    uuid: str
+
+    visibility: str
+
+
+class ResultVerdicts(BaseModel):
+    malicious: bool
+
+
+class Result(BaseModel):
+    api_id: str = FieldInfo(alias="_id")
+
+    page: ResultPage
+
+    result: str
+
+    stats: ResultStats
+
+    task: ResultTask
+
+    verdicts: ResultVerdicts
+
+
+class ScanListResponse(BaseModel):
+    results: List[Result]
diff --git a/src/cloudflare/types/url_scanner/scan_screenshot_params.py b/src/cloudflare/types/url_scanner/scan_screenshot_params.py
index d7be50aa81f..263a003363f 100644
--- a/src/cloudflare/types/url_scanner/scan_screenshot_params.py
+++ b/src/cloudflare/types/url_scanner/scan_screenshot_params.py
@@ -2,16 +2,14 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal, Required, Annotated, TypedDict
-
-from ..._utils import PropertyInfo
+from typing_extensions import Literal, Required, TypedDict
 
 __all__ = ["ScanScreenshotParams"]
 
 
 class ScanScreenshotParams(TypedDict, total=False):
-    account_id: Required[Annotated[str, PropertyInfo(alias="accountId")]]
-    """Account Id"""
+    account_id: Required[str]
+    """Account ID."""
 
     resolution: Literal["desktop", "mobile", "tablet"]
-    """Target device type"""
+    """Target device type."""
diff --git a/src/cloudflare/types/url_scanner/url_scanner_domain.py b/src/cloudflare/types/url_scanner/url_scanner_domain.py
deleted file mode 100644
index d9f0f7479ab..00000000000
--- a/src/cloudflare/types/url_scanner/url_scanner_domain.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ..._models import BaseModel
-
-__all__ = ["URLScannerDomain"]
-
-
-class URLScannerDomain(BaseModel):
-    id: int
-
-    name: str
-
-    super_category_id: Optional[int] = None
diff --git a/src/cloudflare/types/url_scanner/url_scanner_scan_params.py b/src/cloudflare/types/url_scanner/url_scanner_scan_params.py
deleted file mode 100644
index faa55bf906b..00000000000
--- a/src/cloudflare/types/url_scanner/url_scanner_scan_params.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Union
-from datetime import datetime
-from typing_extensions import Annotated, TypedDict
-
-from ..._utils import PropertyInfo
-
-__all__ = ["URLScannerScanParams"]
-
-
-class URLScannerScanParams(TypedDict, total=False):
-    account_scans: bool
-    """Return only scans created by account."""
-
-    asn: str
-    """
-    Filter scans by Autonomous System Number (ASN) of _any_ request made by the
-    webpage.
-    """
-
-    date_end: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-    """Filter scans requested before date (inclusive)."""
-
-    date_start: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-    """Filter scans requested after date (inclusive)."""
-
-    hash: str
-    """Filter scans by hash of any html/js/css request made by the webpage."""
-
-    hostname: str
-    """Filter scans by hostname of _any_ request made by the webpage."""
-
-    ip: str
-    """Filter scans by IP address (IPv4 or IPv6) of _any_ request made by the webpage."""
-
-    is_malicious: bool
-    """Filter scans by malicious verdict."""
-
-    limit: int
-    """Limit the number of objects in the response."""
-
-    next_cursor: str
-    """Pagination cursor to get the next set of results."""
-
-    page_asn: str
-    """Filter scans by main page Autonomous System Number (ASN)."""
-
-    page_hostname: str
-    """Filter scans by main page hostname (domain of effective URL)."""
-
-    page_ip: str
-    """Filter scans by main page IP address (IPv4 or IPv6)."""
-
-    page_path: str
-    """
-    Filter scans by exact match of effective URL path (also supports suffix search).
-    """
-
-    page_url: str
-    """Filter scans by submitted or scanned URL"""
-
-    path: str
-    """Filter scans by url path of _any_ request made by the webpage."""
-
-    scan_id: Annotated[str, PropertyInfo(alias="scanId")]
-    """Scan uuid"""
-
-    url: str
-    """Filter scans by URL of _any_ request made by the webpage"""
diff --git a/src/cloudflare/types/url_scanner/url_scanner_scan_response.py b/src/cloudflare/types/url_scanner/url_scanner_scan_response.py
deleted file mode 100644
index cf576f43774..00000000000
--- a/src/cloudflare/types/url_scanner/url_scanner_scan_response.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-from datetime import datetime
-
-from ..._models import BaseModel
-
-__all__ = ["URLScannerScanResponse", "Task"]
-
-
-class Task(BaseModel):
-    country: str
-    """Alpha-2 country code"""
-
-    success: bool
-    """Whether scan was successful or not"""
-
-    time: datetime
-    """When scan was submitted (UTC)"""
-
-    url: str
-    """Scan url (after redirects)"""
-
-    uuid: str
-    """Scan id"""
-
-    visibility: str
-    """Visibility status."""
-
-
-class URLScannerScanResponse(BaseModel):
-    tasks: List[Task]
diff --git a/src/cloudflare/types/user/__init__.py b/src/cloudflare/types/user/__init__.py
index fa5f8dd0d13..315f9a5d47b 100644
--- a/src/cloudflare/types/user/__init__.py
+++ b/src/cloudflare/types/user/__init__.py
@@ -3,30 +3,20 @@
 from __future__ import annotations
 
 from .invite import Invite as Invite
-from .cidr_list import CIDRList as CIDRList
-from .rate_plan import RatePlan as RatePlan
 from .organization import Organization as Organization
-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 .user_edit_response import UserEditResponse as UserEditResponse
 from .token_create_params import TokenCreateParams as TokenCreateParams
 from .token_update_params import TokenUpdateParams as TokenUpdateParams
 from .audit_log_list_params import AuditLogListParams as AuditLogListParams
 from .token_create_response import TokenCreateResponse as TokenCreateResponse
 from .token_delete_response import TokenDeleteResponse as TokenDeleteResponse
 from .token_verify_response import TokenVerifyResponse as TokenVerifyResponse
-from .subscription_component import SubscriptionComponent as SubscriptionComponent
-from .subscription_zone_param import SubscriptionZoneParam as SubscriptionZoneParam
 from .organization_list_params import OrganizationListParams as OrganizationListParams
-from .subscription_edit_params import SubscriptionEditParams as SubscriptionEditParams
-from .subscription_get_response import SubscriptionGetResponse as SubscriptionGetResponse
-from .subscription_edit_response import SubscriptionEditResponse as SubscriptionEditResponse
 from .subscription_update_params import SubscriptionUpdateParams as SubscriptionUpdateParams
 from .organization_delete_response import OrganizationDeleteResponse as OrganizationDeleteResponse
-from .subscription_component_param import SubscriptionComponentParam as SubscriptionComponentParam
 from .subscription_delete_response import SubscriptionDeleteResponse as SubscriptionDeleteResponse
 from .subscription_update_response import SubscriptionUpdateResponse as SubscriptionUpdateResponse
diff --git a/src/cloudflare/types/user/audit_log_list_params.py b/src/cloudflare/types/user/audit_log_list_params.py
index 4b8dc754828..bd4dcc42254 100644
--- a/src/cloudflare/types/user/audit_log_list_params.py
+++ b/src/cloudflare/types/user/audit_log_list_params.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from typing import Union
-from datetime import datetime
+from datetime import date, datetime
 from typing_extensions import Literal, Annotated, TypedDict
 
 from ..._utils import PropertyInfo
@@ -19,11 +19,10 @@ class AuditLogListParams(TypedDict, total=False):
 
     actor: Actor
 
-    before: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    before: Annotated[Union[Union[str, date], Union[str, datetime]], PropertyInfo(format="iso8601")]
     """Limits the returned results to logs older than the specified date.
 
-    This can be a date string `2019-04-30` or an absolute timestamp that conforms to
-    RFC3339.
+    A `full-date` that conforms to RFC3339.
     """
 
     direction: Literal["desc", "asc"]
@@ -41,11 +40,10 @@ class AuditLogListParams(TypedDict, total=False):
     per_page: float
     """Sets the number of results to return per page."""
 
-    since: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    since: Annotated[Union[Union[str, date], Union[str, datetime]], PropertyInfo(format="iso8601")]
     """Limits the returned results to logs newer than the specified date.
 
-    This can be a date string `2019-04-30` or an absolute timestamp that conforms to
-    RFC3339.
+    A `full-date` that conforms to RFC3339.
     """
 
     zone: Zone
diff --git a/src/cloudflare/types/user/billing/billing_history.py b/src/cloudflare/types/user/billing/billing_history.py
index 443be2603c1..a21c658a18a 100644
--- a/src/cloudflare/types/user/billing/billing_history.py
+++ b/src/cloudflare/types/user/billing/billing_history.py
@@ -9,7 +9,7 @@
 
 
 class Zone(BaseModel):
-    name: Optional[object] = None
+    name: Optional[str] = None
 
 
 class BillingHistory(BaseModel):
diff --git a/src/cloudflare/types/user/billing/history_list_params.py b/src/cloudflare/types/user/billing/history_list_params.py
index fa4ce0d1076..04d1d0ba81a 100644
--- a/src/cloudflare/types/user/billing/history_list_params.py
+++ b/src/cloudflare/types/user/billing/history_list_params.py
@@ -15,13 +15,10 @@ class HistoryListParams(TypedDict, total=False):
     action: str
     """The billing item action."""
 
-    occured_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-    """When the billing item was created."""
-
     occurred_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
     """When the billing item was created."""
 
-    order: Literal["type", "occured_at", "action"]
+    order: Literal["type", "occurred_at", "action"]
     """Field to order billing history by."""
 
     page: float
diff --git a/src/cloudflare/types/user/billing/profile_get_response.py b/src/cloudflare/types/user/billing/profile_get_response.py
index 29d6d78c949..82189001b4c 100644
--- a/src/cloudflare/types/user/billing/profile_get_response.py
+++ b/src/cloudflare/types/user/billing/profile_get_response.py
@@ -1,7 +1,89 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
 
 __all__ = ["ProfileGetResponse"]
 
-ProfileGetResponse = Union[Optional[str], Optional[object]]
+
+class ProfileGetResponse(BaseModel):
+    id: Optional[str] = None
+    """Billing item identifier tag."""
+
+    account_type: Optional[str] = None
+
+    address: Optional[str] = None
+
+    address2: Optional[str] = None
+
+    balance: Optional[str] = None
+
+    card_expiry_month: Optional[int] = None
+
+    card_expiry_year: Optional[int] = None
+
+    card_number: Optional[str] = None
+
+    city: Optional[str] = None
+
+    company: Optional[str] = None
+
+    country: Optional[str] = None
+
+    created_on: Optional[datetime] = None
+
+    device_data: Optional[str] = None
+
+    edited_on: Optional[datetime] = None
+
+    enterprise_billing_email: Optional[str] = None
+
+    enterprise_primary_email: Optional[str] = None
+
+    first_name: Optional[str] = None
+
+    is_partner: Optional[bool] = None
+
+    last_name: Optional[str] = None
+
+    next_bill_date: Optional[datetime] = None
+
+    payment_address: Optional[str] = None
+
+    payment_address2: Optional[str] = None
+
+    payment_city: Optional[str] = None
+
+    payment_country: Optional[str] = None
+
+    payment_email: Optional[str] = None
+
+    payment_first_name: Optional[str] = None
+
+    payment_gateway: Optional[str] = None
+
+    payment_last_name: Optional[str] = None
+
+    payment_nonce: Optional[str] = None
+
+    payment_state: Optional[str] = None
+
+    payment_zipcode: Optional[str] = None
+
+    primary_email: Optional[str] = None
+
+    state: Optional[str] = None
+
+    tax_id_type: Optional[str] = None
+
+    telephone: Optional[str] = None
+
+    use_legacy: Optional[bool] = None
+
+    validation_code: Optional[str] = None
+
+    vat: Optional[str] = None
+
+    zipcode: Optional[str] = None
diff --git a/src/cloudflare/types/user/cidr_list.py b/src/cloudflare/types/user/cidr_list.py
deleted file mode 100644
index f0adf1151fe..00000000000
--- a/src/cloudflare/types/user/cidr_list.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-__all__ = ["CIDRList"]
-
-CIDRList = str
diff --git a/src/cloudflare/types/user/invite.py b/src/cloudflare/types/user/invite.py
index 00c7cf5ce22..e671d8edb03 100644
--- a/src/cloudflare/types/user/invite.py
+++ b/src/cloudflare/types/user/invite.py
@@ -5,7 +5,6 @@
 from typing_extensions import Literal
 
 from ..._models import BaseModel
-from ..shared.role import Role
 
 __all__ = ["Invite"]
 
@@ -32,11 +31,13 @@ class Invite(BaseModel):
     invited_on: Optional[datetime] = None
     """When the invite was sent."""
 
+    organization_is_enforcing_twofactor: Optional[bool] = None
+
     organization_name: Optional[str] = None
     """Organization name."""
 
-    roles: Optional[List[Role]] = None
-    """Roles to be assigned to this user."""
+    roles: Optional[List[str]] = None
+    """List of role names the membership has for this account."""
 
     status: Optional[Literal["pending", "accepted", "rejected", "expired"]] = None
     """Current status of the invitation."""
diff --git a/src/cloudflare/types/user/policy_param.py b/src/cloudflare/types/user/policy_param.py
deleted file mode 100644
index f6b62435dfe..00000000000
--- a/src/cloudflare/types/user/policy_param.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Iterable
-from typing_extensions import Literal, Required, TypedDict
-
-__all__ = ["PolicyParam", "PermissionGroup"]
-
-
-class PermissionGroup(TypedDict, total=False):
-    meta: object
-    """Attributes associated to the permission group."""
-
-
-class PolicyParam(TypedDict, total=False):
-    effect: Required[Literal["allow", "deny"]]
-    """Allow or deny operations against the resources."""
-
-    permission_groups: Required[Iterable[PermissionGroup]]
-    """A set of permission groups that are specified to the policy."""
-
-    resources: Required[object]
-    """A list of resource names that the policy applies to."""
diff --git a/src/cloudflare/types/user/rate_plan.py b/src/cloudflare/types/user/rate_plan.py
deleted file mode 100644
index deab37dc61c..00000000000
--- a/src/cloudflare/types/user/rate_plan.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from ..._models import BaseModel
-
-__all__ = ["RatePlan"]
-
-
-class RatePlan(BaseModel):
-    id: Optional[str] = None
-    """The ID of the rate plan."""
-
-    currency: Optional[str] = None
-    """The currency applied to the rate plan subscription."""
-
-    externally_managed: Optional[bool] = None
-    """Whether this rate plan is managed externally from Cloudflare."""
-
-    is_contract: Optional[bool] = None
-    """Whether a rate plan is enterprise-based (or newly adopted term contract)."""
-
-    public_name: Optional[str] = None
-    """The full name of the rate plan."""
-
-    scope: Optional[str] = None
-    """The scope that this rate plan applies to."""
-
-    sets: Optional[List[str]] = None
-    """The list of sets this rate plan applies to."""
diff --git a/src/cloudflare/types/user/rate_plan_param.py b/src/cloudflare/types/user/rate_plan_param.py
deleted file mode 100644
index a937bcdf0f0..00000000000
--- a/src/cloudflare/types/user/rate_plan_param.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List
-from typing_extensions import TypedDict
-
-__all__ = ["RatePlanParam"]
-
-
-class RatePlanParam(TypedDict, total=False):
-    id: str
-    """The ID of the rate plan."""
-
-    currency: str
-    """The currency applied to the rate plan subscription."""
-
-    externally_managed: bool
-    """Whether this rate plan is managed externally from Cloudflare."""
-
-    is_contract: bool
-    """Whether a rate plan is enterprise-based (or newly adopted term contract)."""
-
-    public_name: str
-    """The full name of the rate plan."""
-
-    scope: str
-    """The scope that this rate plan applies to."""
-
-    sets: List[str]
-    """The list of sets this rate plan applies to."""
diff --git a/src/cloudflare/types/user/subscription.py b/src/cloudflare/types/user/subscription.py
deleted file mode 100644
index 1265c4f04cc..00000000000
--- a/src/cloudflare/types/user/subscription.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from datetime import datetime
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-from .rate_plan import RatePlan
-from .subscription_zone import SubscriptionZone
-from .subscription_component import SubscriptionComponent
-
-__all__ = ["Subscription", "App"]
-
-
-class App(BaseModel):
-    install_id: Optional[str] = None
-    """app install id."""
-
-
-class Subscription(BaseModel):
-    id: Optional[str] = None
-    """Subscription identifier tag."""
-
-    app: Optional[App] = None
-
-    component_values: Optional[List[SubscriptionComponent]] = None
-    """The list of add-ons subscribed to."""
-
-    currency: Optional[str] = None
-    """The monetary unit in which pricing information is displayed."""
-
-    current_period_end: Optional[datetime] = None
-    """The end of the current period and also when the next billing is due."""
-
-    current_period_start: Optional[datetime] = None
-    """When the current billing period started.
-
-    May match initial_period_start if this is the first period.
-    """
-
-    frequency: Optional[Literal["weekly", "monthly", "quarterly", "yearly"]] = None
-    """How often the subscription is renewed automatically."""
-
-    price: Optional[float] = None
-    """The price of the subscription that will be billed, in US dollars."""
-
-    rate_plan: Optional[RatePlan] = None
-    """The rate plan applied to the subscription."""
-
-    state: Optional[Literal["Trial", "Provisioned", "Paid", "AwaitingPayment", "Cancelled", "Failed", "Expired"]] = None
-    """The state that the subscription is in."""
-
-    zone: Optional[SubscriptionZone] = None
-    """A simple zone object. May have null properties if not a zone subscription."""
diff --git a/src/cloudflare/types/user/subscription_component_param.py b/src/cloudflare/types/user/subscription_component_param.py
deleted file mode 100644
index 958846faedd..00000000000
--- a/src/cloudflare/types/user/subscription_component_param.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import TypedDict
-
-__all__ = ["SubscriptionComponentParam"]
-
-
-class SubscriptionComponentParam(TypedDict, total=False):
-    default: float
-    """The default amount assigned."""
-
-    name: str
-    """The name of the component value."""
-
-    price: float
-    """The unit price for the component value."""
-
-    value: float
-    """The amount of the component value assigned."""
diff --git a/src/cloudflare/types/user/subscription_edit_params.py b/src/cloudflare/types/user/subscription_edit_params.py
deleted file mode 100644
index 42587341cbe..00000000000
--- a/src/cloudflare/types/user/subscription_edit_params.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Iterable
-from typing_extensions import Literal, TypedDict
-
-from .rate_plan_param import RatePlanParam
-from .subscription_zone_param import SubscriptionZoneParam
-from .subscription_component_param import SubscriptionComponentParam
-
-__all__ = ["SubscriptionEditParams", "App"]
-
-
-class SubscriptionEditParams(TypedDict, total=False):
-    app: App
-
-    component_values: Iterable[SubscriptionComponentParam]
-    """The list of add-ons subscribed to."""
-
-    frequency: Literal["weekly", "monthly", "quarterly", "yearly"]
-    """How often the subscription is renewed automatically."""
-
-    rate_plan: RatePlanParam
-    """The rate plan applied to the subscription."""
-
-    zone: SubscriptionZoneParam
-    """A simple zone object. May have null properties if not a zone subscription."""
-
-
-class App(TypedDict, total=False):
-    install_id: str
-    """app install id."""
diff --git a/src/cloudflare/types/user/subscription_edit_response.py b/src/cloudflare/types/user/subscription_edit_response.py
deleted file mode 100644
index b83f60ab65b..00000000000
--- a/src/cloudflare/types/user/subscription_edit_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["SubscriptionEditResponse"]
-
-SubscriptionEditResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/user/subscription_get_response.py b/src/cloudflare/types/user/subscription_get_response.py
deleted file mode 100644
index fa83d5ed88c..00000000000
--- a/src/cloudflare/types/user/subscription_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .subscription import Subscription
-
-__all__ = ["SubscriptionGetResponse"]
-
-SubscriptionGetResponse = List[Subscription]
diff --git a/src/cloudflare/types/user/subscription_update_params.py b/src/cloudflare/types/user/subscription_update_params.py
index e0114c776e4..88ee258388f 100644
--- a/src/cloudflare/types/user/subscription_update_params.py
+++ b/src/cloudflare/types/user/subscription_update_params.py
@@ -2,32 +2,16 @@
 
 from __future__ import annotations
 
-from typing import Iterable
 from typing_extensions import Literal, TypedDict
 
-from .rate_plan_param import RatePlanParam
-from .subscription_zone_param import SubscriptionZoneParam
-from .subscription_component_param import SubscriptionComponentParam
+from ..shared_params.rate_plan import RatePlan
 
-__all__ = ["SubscriptionUpdateParams", "App"]
+__all__ = ["SubscriptionUpdateParams"]
 
 
 class SubscriptionUpdateParams(TypedDict, total=False):
-    app: App
-
-    component_values: Iterable[SubscriptionComponentParam]
-    """The list of add-ons subscribed to."""
-
     frequency: Literal["weekly", "monthly", "quarterly", "yearly"]
     """How often the subscription is renewed automatically."""
 
-    rate_plan: RatePlanParam
+    rate_plan: RatePlan
     """The rate plan applied to the subscription."""
-
-    zone: SubscriptionZoneParam
-    """A simple zone object. May have null properties if not a zone subscription."""
-
-
-class App(TypedDict, total=False):
-    install_id: str
-    """app install id."""
diff --git a/src/cloudflare/types/user/subscription_update_response.py b/src/cloudflare/types/user/subscription_update_response.py
index 12cf6aa283a..71628cdb370 100644
--- a/src/cloudflare/types/user/subscription_update_response.py
+++ b/src/cloudflare/types/user/subscription_update_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Union, Optional
+from typing_extensions import TypeAlias
 
 __all__ = ["SubscriptionUpdateResponse"]
 
-SubscriptionUpdateResponse = Union[Optional[str], Optional[object]]
+SubscriptionUpdateResponse: TypeAlias = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/user/subscription_zone_param.py b/src/cloudflare/types/user/subscription_zone_param.py
deleted file mode 100644
index 5cc2fcb6b0c..00000000000
--- a/src/cloudflare/types/user/subscription_zone_param.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import TypedDict
-
-__all__ = ["SubscriptionZoneParam"]
-
-
-class SubscriptionZoneParam(TypedDict, total=False):
-    pass
diff --git a/src/cloudflare/types/user/token_create_params.py b/src/cloudflare/types/user/token_create_params.py
index 4ab228c06c6..d6c80caa9fb 100644
--- a/src/cloudflare/types/user/token_create_params.py
+++ b/src/cloudflare/types/user/token_create_params.py
@@ -2,13 +2,14 @@
 
 from __future__ import annotations
 
-from typing import List, Union, Iterable
+from typing import Union, Iterable
 from datetime import datetime
 from typing_extensions import Required, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
-from .cidr_list import CIDRList
-from .policy_param import PolicyParam
+from ..shared_params.token_policy import TokenPolicy
+from ..shared.token_condition_cidr_list import TokenConditionCIDRList
 
 __all__ = ["TokenCreateParams", "Condition", "ConditionRequestIP"]
 
@@ -17,7 +18,7 @@ class TokenCreateParams(TypedDict, total=False):
     name: Required[str]
     """Token name."""
 
-    policies: Required[Iterable[PolicyParam]]
+    policies: Required[Iterable[TokenPolicy]]
     """List of access policies assigned to the token."""
 
     condition: Condition
@@ -35,14 +36,16 @@ class TokenCreateParams(TypedDict, total=False):
 _ConditionRequestIPReservedKeywords = TypedDict(
     "_ConditionRequestIPReservedKeywords",
     {
-        "in": List[CIDRList],
+        "in": SequenceNotStr[TokenConditionCIDRList],
     },
     total=False,
 )
 
 
 class ConditionRequestIP(_ConditionRequestIPReservedKeywords, total=False):
-    not_in: List[CIDRList]
+    """Client IP restrictions."""
+
+    not_in: SequenceNotStr[TokenConditionCIDRList]
     """List of IPv4/IPv6 CIDR addresses."""
 
 
diff --git a/src/cloudflare/types/user/token_create_response.py b/src/cloudflare/types/user/token_create_response.py
index 4d68a326873..7185c9bfb4c 100644
--- a/src/cloudflare/types/user/token_create_response.py
+++ b/src/cloudflare/types/user/token_create_response.py
@@ -1,13 +1,66 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ..._models import BaseModel
-from .tokens.value import Value
+from ..shared.token_value import TokenValue
+from ..shared.token_policy import TokenPolicy
+from ..shared.token_condition_cidr_list import TokenConditionCIDRList
+
+__all__ = ["TokenCreateResponse", "Condition", "ConditionRequestIP"]
+
+
+class ConditionRequestIP(BaseModel):
+    """Client IP restrictions."""
+
+    in_: Optional[List[TokenConditionCIDRList]] = FieldInfo(alias="in", default=None)
+    """List of IPv4/IPv6 CIDR addresses."""
 
-__all__ = ["TokenCreateResponse"]
+    not_in: Optional[List[TokenConditionCIDRList]] = None
+    """List of IPv4/IPv6 CIDR addresses."""
+
+
+class Condition(BaseModel):
+    request_ip: Optional[ConditionRequestIP] = None
+    """Client IP restrictions."""
 
 
 class TokenCreateResponse(BaseModel):
-    value: Optional[Value] = None
+    id: Optional[str] = None
+    """Token identifier tag."""
+
+    condition: Optional[Condition] = None
+
+    expires_on: Optional[datetime] = None
+    """
+    The expiration time on or after which the JWT MUST NOT be accepted for
+    processing.
+    """
+
+    issued_on: Optional[datetime] = None
+    """The time on which the token was created."""
+
+    last_used_on: Optional[datetime] = None
+    """Last time the token was used."""
+
+    modified_on: Optional[datetime] = None
+    """Last time the token was modified."""
+
+    name: Optional[str] = None
+    """Token name."""
+
+    not_before: Optional[datetime] = None
+    """The time before which the token MUST NOT be accepted for processing."""
+
+    policies: Optional[List[TokenPolicy]] = None
+    """List of access policies assigned to the token."""
+
+    status: Optional[Literal["active", "disabled", "expired"]] = None
+    """Status of the token."""
+
+    value: Optional[TokenValue] = None
     """The token value."""
diff --git a/src/cloudflare/types/user/token_delete_response.py b/src/cloudflare/types/user/token_delete_response.py
index fbc713c6a5f..2229135e433 100644
--- a/src/cloudflare/types/user/token_delete_response.py
+++ b/src/cloudflare/types/user/token_delete_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ..._models import BaseModel
 
 __all__ = ["TokenDeleteResponse"]
diff --git a/src/cloudflare/types/user/token_update_params.py b/src/cloudflare/types/user/token_update_params.py
index d564213465b..0961eb3d5e0 100644
--- a/src/cloudflare/types/user/token_update_params.py
+++ b/src/cloudflare/types/user/token_update_params.py
@@ -2,13 +2,14 @@
 
 from __future__ import annotations
 
-from typing import List, Union, Iterable
+from typing import Union, Iterable
 from datetime import datetime
 from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ..._types import SequenceNotStr
 from ..._utils import PropertyInfo
-from .cidr_list import CIDRList
-from .policy_param import PolicyParam
+from ..shared_params.token_policy import TokenPolicy
+from ..shared.token_condition_cidr_list import TokenConditionCIDRList
 
 __all__ = ["TokenUpdateParams", "Condition", "ConditionRequestIP"]
 
@@ -17,12 +18,9 @@ class TokenUpdateParams(TypedDict, total=False):
     name: Required[str]
     """Token name."""
 
-    policies: Required[Iterable[PolicyParam]]
+    policies: Required[Iterable[TokenPolicy]]
     """List of access policies assigned to the token."""
 
-    status: Required[Literal["active", "disabled", "expired"]]
-    """Status of the token."""
-
     condition: Condition
 
     expires_on: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
@@ -34,18 +32,23 @@ class TokenUpdateParams(TypedDict, total=False):
     not_before: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
     """The time before which the token MUST NOT be accepted for processing."""
 
+    status: Literal["active", "disabled", "expired"]
+    """Status of the token."""
+
 
 _ConditionRequestIPReservedKeywords = TypedDict(
     "_ConditionRequestIPReservedKeywords",
     {
-        "in": List[CIDRList],
+        "in": SequenceNotStr[TokenConditionCIDRList],
     },
     total=False,
 )
 
 
 class ConditionRequestIP(_ConditionRequestIPReservedKeywords, total=False):
-    not_in: List[CIDRList]
+    """Client IP restrictions."""
+
+    not_in: SequenceNotStr[TokenConditionCIDRList]
     """List of IPv4/IPv6 CIDR addresses."""
 
 
diff --git a/src/cloudflare/types/user/tokens/__init__.py b/src/cloudflare/types/user/tokens/__init__.py
index b2609995ed7..1f7905cdafa 100644
--- a/src/cloudflare/types/user/tokens/__init__.py
+++ b/src/cloudflare/types/user/tokens/__init__.py
@@ -2,5 +2,6 @@
 
 from __future__ import annotations
 
-from .value import Value as Value
 from .value_update_params import ValueUpdateParams as ValueUpdateParams
+from .permission_group_list_params import PermissionGroupListParams as PermissionGroupListParams
+from .permission_group_list_response import PermissionGroupListResponse as PermissionGroupListResponse
diff --git a/src/cloudflare/types/user/tokens/permission_group_list_params.py b/src/cloudflare/types/user/tokens/permission_group_list_params.py
new file mode 100644
index 00000000000..da8fb1f0cf7
--- /dev/null
+++ b/src/cloudflare/types/user/tokens/permission_group_list_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import TypedDict
+
+__all__ = ["PermissionGroupListParams"]
+
+
+class PermissionGroupListParams(TypedDict, total=False):
+    name: str
+    """Filter by the name of the permission group. The value must be URL-encoded."""
+
+    scope: str
+    """Filter by the scope of the permission group. The value must be URL-encoded."""
diff --git a/src/cloudflare/types/user/tokens/permission_group_list_response.py b/src/cloudflare/types/user/tokens/permission_group_list_response.py
new file mode 100644
index 00000000000..b34b7ff89c2
--- /dev/null
+++ b/src/cloudflare/types/user/tokens/permission_group_list_response.py
@@ -0,0 +1,28 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["PermissionGroupListResponse"]
+
+
+class PermissionGroupListResponse(BaseModel):
+    id: Optional[str] = None
+    """Public ID."""
+
+    name: Optional[str] = None
+    """Permission Group Name"""
+
+    scopes: Optional[
+        List[
+            Literal[
+                "com.cloudflare.api.account",
+                "com.cloudflare.api.account.zone",
+                "com.cloudflare.api.user",
+                "com.cloudflare.edge.r2.bucket",
+            ]
+        ]
+    ] = None
+    """Resources to which the Permission Group is scoped"""
diff --git a/src/cloudflare/types/user/tokens/value.py b/src/cloudflare/types/user/tokens/value.py
deleted file mode 100644
index 669b0678918..00000000000
--- a/src/cloudflare/types/user/tokens/value.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-__all__ = ["Value"]
-
-Value = str
diff --git a/src/cloudflare/types/user/user_edit_response.py b/src/cloudflare/types/user/user_edit_response.py
new file mode 100644
index 00000000000..c273145becf
--- /dev/null
+++ b/src/cloudflare/types/user/user_edit_response.py
@@ -0,0 +1,57 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+from .organization import Organization
+
+__all__ = ["UserEditResponse"]
+
+
+class UserEditResponse(BaseModel):
+    id: Optional[str] = None
+    """Identifier of the user."""
+
+    betas: Optional[List[str]] = None
+    """Lists the betas that the user is participating in."""
+
+    country: Optional[str] = None
+    """The country in which the user lives."""
+
+    first_name: Optional[str] = None
+    """User's first name"""
+
+    has_business_zones: Optional[bool] = None
+    """Indicates whether user has any business zones"""
+
+    has_enterprise_zones: Optional[bool] = None
+    """Indicates whether user has any enterprise zones"""
+
+    has_pro_zones: Optional[bool] = None
+    """Indicates whether user has any pro zones"""
+
+    last_name: Optional[str] = None
+    """User's last name"""
+
+    organizations: Optional[List[Organization]] = None
+
+    suspended: Optional[bool] = None
+    """Indicates whether user has been suspended"""
+
+    telephone: Optional[str] = None
+    """User's telephone number"""
+
+    two_factor_authentication_enabled: Optional[bool] = None
+    """Indicates whether two-factor authentication is enabled for the user account.
+
+    Does not apply to API authentication.
+    """
+
+    two_factor_authentication_locked: Optional[bool] = None
+    """
+    Indicates whether two-factor authentication is required by one of the accounts
+    that the user is a member of.
+    """
+
+    zipcode: Optional[str] = None
+    """The zipcode or postal code where the user lives."""
diff --git a/src/cloudflare/types/user/user_get_response.py b/src/cloudflare/types/user/user_get_response.py
new file mode 100644
index 00000000000..dae3cff17b6
--- /dev/null
+++ b/src/cloudflare/types/user/user_get_response.py
@@ -0,0 +1,57 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+from .organization import Organization
+
+__all__ = ["UserGetResponse"]
+
+
+class UserGetResponse(BaseModel):
+    id: Optional[str] = None
+    """Identifier of the user."""
+
+    betas: Optional[List[str]] = None
+    """Lists the betas that the user is participating in."""
+
+    country: Optional[str] = None
+    """The country in which the user lives."""
+
+    first_name: Optional[str] = None
+    """User's first name"""
+
+    has_business_zones: Optional[bool] = None
+    """Indicates whether user has any business zones"""
+
+    has_enterprise_zones: Optional[bool] = None
+    """Indicates whether user has any enterprise zones"""
+
+    has_pro_zones: Optional[bool] = None
+    """Indicates whether user has any pro zones"""
+
+    last_name: Optional[str] = None
+    """User's last name"""
+
+    organizations: Optional[List[Organization]] = None
+
+    suspended: Optional[bool] = None
+    """Indicates whether user has been suspended"""
+
+    telephone: Optional[str] = None
+    """User's telephone number"""
+
+    two_factor_authentication_enabled: Optional[bool] = None
+    """Indicates whether two-factor authentication is enabled for the user account.
+
+    Does not apply to API authentication.
+    """
+
+    two_factor_authentication_locked: Optional[bool] = None
+    """
+    Indicates whether two-factor authentication is required by one of the accounts
+    that the user is a member of.
+    """
+
+    zipcode: Optional[str] = None
+    """The zipcode or postal code where the user lives."""
diff --git a/src/cloudflare/types/vectorize/__init__.py b/src/cloudflare/types/vectorize/__init__.py
index 756fca55ae5..13ead76027a 100644
--- a/src/cloudflare/types/vectorize/__init__.py
+++ b/src/cloudflare/types/vectorize/__init__.py
@@ -2,18 +2,20 @@
 
 from __future__ import annotations
 
-from .index_query import IndexQuery as IndexQuery
 from .create_index import CreateIndex as CreateIndex
-from .index_insert import IndexInsert as IndexInsert
-from .index_upsert import IndexUpsert as IndexUpsert
 from .index_query_params import IndexQueryParams as IndexQueryParams
 from .index_create_params import IndexCreateParams as IndexCreateParams
+from .index_info_response import IndexInfoResponse as IndexInfoResponse
 from .index_insert_params import IndexInsertParams as IndexInsertParams
-from .index_update_params import IndexUpdateParams as IndexUpdateParams
 from .index_upsert_params import IndexUpsertParams as IndexUpsertParams
+from .index_query_response import IndexQueryResponse as IndexQueryResponse
 from .index_delete_response import IndexDeleteResponse as IndexDeleteResponse
+from .index_insert_response import IndexInsertResponse as IndexInsertResponse
+from .index_upsert_response import IndexUpsertResponse as IndexUpsertResponse
 from .index_get_by_ids_params import IndexGetByIDsParams as IndexGetByIDsParams
+from .index_list_vectors_params import IndexListVectorsParams as IndexListVectorsParams
 from .index_delete_by_ids_params import IndexDeleteByIDsParams as IndexDeleteByIDsParams
-from .index_delete_vectors_by_id import IndexDeleteVectorsByID as IndexDeleteVectorsByID
+from .index_list_vectors_response import IndexListVectorsResponse as IndexListVectorsResponse
+from .index_delete_by_ids_response import IndexDeleteByIDsResponse as IndexDeleteByIDsResponse
 from .index_dimension_configuration import IndexDimensionConfiguration as IndexDimensionConfiguration
 from .index_dimension_configuration_param import IndexDimensionConfigurationParam as IndexDimensionConfigurationParam
diff --git a/src/cloudflare/types/vectorize/create_index.py b/src/cloudflare/types/vectorize/create_index.py
index e28d4e352d4..a79a286e7f5 100644
--- a/src/cloudflare/types/vectorize/create_index.py
+++ b/src/cloudflare/types/vectorize/create_index.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from datetime import datetime
 
 from ..._models import BaseModel
 from .index_dimension_configuration import IndexDimensionConfiguration
@@ -11,13 +12,13 @@
 class CreateIndex(BaseModel):
     config: Optional[IndexDimensionConfiguration] = None
 
-    created_on: Optional[str] = None
+    created_on: Optional[datetime] = None
     """Specifies the timestamp the resource was created as an ISO8601 string."""
 
     description: Optional[str] = None
     """Specifies the description of the index."""
 
-    modified_on: Optional[str] = None
+    modified_on: Optional[datetime] = None
     """Specifies the timestamp the resource was modified as an ISO8601 string."""
 
     name: Optional[str] = None
diff --git a/src/cloudflare/types/vectorize/index_create_params.py b/src/cloudflare/types/vectorize/index_create_params.py
index cd89ecd2673..1754ce05d18 100644
--- a/src/cloudflare/types/vectorize/index_create_params.py
+++ b/src/cloudflare/types/vectorize/index_create_params.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from typing import Union
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
 from .index_dimension_configuration_param import IndexDimensionConfigurationParam
 
@@ -36,4 +36,4 @@ class ConfigVectorizeIndexPresetConfiguration(TypedDict, total=False):
     """Specifies the preset to use for the index."""
 
 
-Config = Union[IndexDimensionConfigurationParam, ConfigVectorizeIndexPresetConfiguration]
+Config: TypeAlias = Union[IndexDimensionConfigurationParam, ConfigVectorizeIndexPresetConfiguration]
diff --git a/src/cloudflare/types/vectorize/index_delete_by_ids_params.py b/src/cloudflare/types/vectorize/index_delete_by_ids_params.py
index 606c8b152f2..4595f5458f3 100644
--- a/src/cloudflare/types/vectorize/index_delete_by_ids_params.py
+++ b/src/cloudflare/types/vectorize/index_delete_by_ids_params.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Required, TypedDict
 
+from ..._types import SequenceNotStr
+
 __all__ = ["IndexDeleteByIDsParams"]
 
 
@@ -12,5 +13,5 @@ class IndexDeleteByIDsParams(TypedDict, total=False):
     account_id: Required[str]
     """Identifier"""
 
-    ids: List[str]
+    ids: SequenceNotStr[str]
     """A list of vector identifiers to delete from the index indicated by the path."""
diff --git a/src/cloudflare/types/vectorize/index_delete_by_ids_response.py b/src/cloudflare/types/vectorize/index_delete_by_ids_response.py
new file mode 100644
index 00000000000..488b845a894
--- /dev/null
+++ b/src/cloudflare/types/vectorize/index_delete_by_ids_response.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["IndexDeleteByIDsResponse"]
+
+
+class IndexDeleteByIDsResponse(BaseModel):
+    mutation_id: Optional[str] = FieldInfo(alias="mutationId", default=None)
+    """
+    The unique identifier for the async mutation operation containing the changeset.
+    """
diff --git a/src/cloudflare/types/vectorize/index_delete_response.py b/src/cloudflare/types/vectorize/index_delete_response.py
index b64904cdd6e..04ceee6b545 100644
--- a/src/cloudflare/types/vectorize/index_delete_response.py
+++ b/src/cloudflare/types/vectorize/index_delete_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Union
+from typing_extensions import TypeAlias
 
 __all__ = ["IndexDeleteResponse"]
 
-IndexDeleteResponse = Union[Optional[str], Optional[object]]
+IndexDeleteResponse: TypeAlias = Union[str, object, None]
diff --git a/src/cloudflare/types/vectorize/index_delete_vectors_by_id.py b/src/cloudflare/types/vectorize/index_delete_vectors_by_id.py
deleted file mode 100644
index b06650b76cb..00000000000
--- a/src/cloudflare/types/vectorize/index_delete_vectors_by_id.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from ..._models import BaseModel
-
-__all__ = ["IndexDeleteVectorsByID"]
-
-
-class IndexDeleteVectorsByID(BaseModel):
-    count: Optional[int] = None
-    """The count of the vectors successfully deleted."""
-
-    ids: Optional[List[str]] = None
-    """
-    Array of vector identifiers of the vectors that were successfully processed for
-    deletion.
-    """
diff --git a/src/cloudflare/types/vectorize/index_get_by_ids_params.py b/src/cloudflare/types/vectorize/index_get_by_ids_params.py
index 89fdd20578e..8024b367604 100644
--- a/src/cloudflare/types/vectorize/index_get_by_ids_params.py
+++ b/src/cloudflare/types/vectorize/index_get_by_ids_params.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Required, TypedDict
 
+from ..._types import SequenceNotStr
+
 __all__ = ["IndexGetByIDsParams"]
 
 
@@ -12,5 +13,5 @@ class IndexGetByIDsParams(TypedDict, total=False):
     account_id: Required[str]
     """Identifier"""
 
-    ids: List[str]
+    ids: SequenceNotStr[str]
     """A list of vector identifiers to retrieve from the index indicated by the path."""
diff --git a/src/cloudflare/types/vectorize/index_info_response.py b/src/cloudflare/types/vectorize/index_info_response.py
new file mode 100644
index 00000000000..b96008295e5
--- /dev/null
+++ b/src/cloudflare/types/vectorize/index_info_response.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["IndexInfoResponse"]
+
+
+class IndexInfoResponse(BaseModel):
+    dimensions: Optional[int] = None
+    """Specifies the number of dimensions for the index"""
+
+    processed_up_to_datetime: Optional[datetime] = FieldInfo(alias="processedUpToDatetime", default=None)
+    """
+    Specifies the timestamp the last mutation batch was processed as an ISO8601
+    string.
+    """
+
+    processed_up_to_mutation: Optional[str] = FieldInfo(alias="processedUpToMutation", default=None)
+    """
+    The unique identifier for the async mutation operation containing the changeset.
+    """
+
+    vector_count: Optional[int] = FieldInfo(alias="vectorCount", default=None)
+    """Specifies the number of vectors present in the index"""
diff --git a/src/cloudflare/types/vectorize/index_insert.py b/src/cloudflare/types/vectorize/index_insert.py
deleted file mode 100644
index 17cc6ecbe4b..00000000000
--- a/src/cloudflare/types/vectorize/index_insert.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from ..._models import BaseModel
-
-__all__ = ["IndexInsert"]
-
-
-class IndexInsert(BaseModel):
-    count: Optional[int] = None
-    """Specifies the count of the vectors successfully inserted."""
-
-    ids: Optional[List[str]] = None
-    """Array of vector identifiers of the vectors successfully inserted."""
diff --git a/src/cloudflare/types/vectorize/index_insert_params.py b/src/cloudflare/types/vectorize/index_insert_params.py
index 5498a47074e..2a793667035 100644
--- a/src/cloudflare/types/vectorize/index_insert_params.py
+++ b/src/cloudflare/types/vectorize/index_insert_params.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing_extensions import Literal, Required, Annotated, TypedDict
 
 from ..._types import FileTypes
+from ..._utils import PropertyInfo
 
 __all__ = ["IndexInsertParams"]
 
@@ -15,3 +16,6 @@ class IndexInsertParams(TypedDict, total=False):
 
     body: Required[FileTypes]
     """ndjson file containing vectors to insert."""
+
+    unparsable_behavior: Annotated[Literal["error", "discard"], PropertyInfo(alias="unparsable-behavior")]
+    """Behavior for ndjson parse failures."""
diff --git a/src/cloudflare/types/vectorize/index_insert_response.py b/src/cloudflare/types/vectorize/index_insert_response.py
new file mode 100644
index 00000000000..8761ee87e3a
--- /dev/null
+++ b/src/cloudflare/types/vectorize/index_insert_response.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["IndexInsertResponse"]
+
+
+class IndexInsertResponse(BaseModel):
+    mutation_id: Optional[str] = FieldInfo(alias="mutationId", default=None)
+    """
+    The unique identifier for the async mutation operation containing the changeset.
+    """
diff --git a/src/cloudflare/types/vectorize/index_list_vectors_params.py b/src/cloudflare/types/vectorize/index_list_vectors_params.py
new file mode 100644
index 00000000000..5f913ede275
--- /dev/null
+++ b/src/cloudflare/types/vectorize/index_list_vectors_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["IndexListVectorsParams"]
+
+
+class IndexListVectorsParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier"""
+
+    count: int
+    """Maximum number of vectors to return"""
+
+    cursor: str
+    """Cursor for pagination to get the next page of results"""
diff --git a/src/cloudflare/types/vectorize/index_list_vectors_response.py b/src/cloudflare/types/vectorize/index_list_vectors_response.py
new file mode 100644
index 00000000000..d91ddaf8512
--- /dev/null
+++ b/src/cloudflare/types/vectorize/index_list_vectors_response.py
@@ -0,0 +1,35 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["IndexListVectorsResponse", "Vector"]
+
+
+class Vector(BaseModel):
+    id: str
+    """Identifier for a Vector"""
+
+
+class IndexListVectorsResponse(BaseModel):
+    count: int
+    """Number of vectors returned in this response"""
+
+    is_truncated: bool = FieldInfo(alias="isTruncated")
+    """Whether there are more vectors available beyond this response"""
+
+    total_count: int = FieldInfo(alias="totalCount")
+    """Total number of vectors in the index"""
+
+    vectors: List[Vector]
+    """Array of vector items"""
+
+    cursor_expiration_timestamp: Optional[datetime] = FieldInfo(alias="cursorExpirationTimestamp", default=None)
+    """When the cursor expires as an ISO8601 string"""
+
+    next_cursor: Optional[str] = FieldInfo(alias="nextCursor", default=None)
+    """Cursor for the next page of results"""
diff --git a/src/cloudflare/types/vectorize/index_query.py b/src/cloudflare/types/vectorize/index_query.py
deleted file mode 100644
index 11de5c950e0..00000000000
--- a/src/cloudflare/types/vectorize/index_query.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from ..._models import BaseModel
-
-__all__ = ["IndexQuery", "Match"]
-
-
-class Match(BaseModel):
-    id: Optional[str] = None
-    """Identifier"""
-
-    metadata: Optional[object] = None
-
-    score: Optional[float] = None
-    """The score of the vector according to the index's distance metric"""
-
-    values: Optional[List[float]] = None
-
-
-class IndexQuery(BaseModel):
-    count: Optional[int] = None
-    """Specifies the count of vectors returned by the search"""
-
-    matches: Optional[List[Match]] = None
-    """Array of vectors matched by the search"""
diff --git a/src/cloudflare/types/vectorize/index_query_params.py b/src/cloudflare/types/vectorize/index_query_params.py
index 97fe6efc32d..c0c488a2ccf 100644
--- a/src/cloudflare/types/vectorize/index_query_params.py
+++ b/src/cloudflare/types/vectorize/index_query_params.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from typing import Iterable
-from typing_extensions import Required, Annotated, TypedDict
+from typing_extensions import Literal, Required, Annotated, TypedDict
 
 from ..._utils import PropertyInfo
 
@@ -20,8 +20,11 @@ class IndexQueryParams(TypedDict, total=False):
     filter: object
     """A metadata filter expression used to limit nearest neighbor results."""
 
-    return_metadata: Annotated[bool, PropertyInfo(alias="returnMetadata")]
-    """Whether to return the metadata associated with the closest vectors."""
+    return_metadata: Annotated[Literal["none", "indexed", "all"], PropertyInfo(alias="returnMetadata")]
+    """
+    Whether to return no metadata, indexed metadata or all metadata associated with
+    the closest vectors.
+    """
 
     return_values: Annotated[bool, PropertyInfo(alias="returnValues")]
     """Whether to return the values associated with the closest vectors."""
diff --git a/src/cloudflare/types/vectorize/index_query_response.py b/src/cloudflare/types/vectorize/index_query_response.py
new file mode 100644
index 00000000000..95c4b0dd826
--- /dev/null
+++ b/src/cloudflare/types/vectorize/index_query_response.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ..._models import BaseModel
+
+__all__ = ["IndexQueryResponse", "Match"]
+
+
+class Match(BaseModel):
+    id: Optional[str] = None
+    """Identifier for a Vector"""
+
+    metadata: Optional[object] = None
+
+    namespace: Optional[str] = None
+
+    score: Optional[float] = None
+    """The score of the vector according to the index's distance metric"""
+
+    values: Optional[List[float]] = None
+
+
+class IndexQueryResponse(BaseModel):
+    count: Optional[int] = None
+    """Specifies the count of vectors returned by the search"""
+
+    matches: Optional[List[Match]] = None
+    """Array of vectors matched by the search"""
diff --git a/src/cloudflare/types/vectorize/index_update_params.py b/src/cloudflare/types/vectorize/index_update_params.py
deleted file mode 100644
index 2cb1ad85804..00000000000
--- a/src/cloudflare/types/vectorize/index_update_params.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["IndexUpdateParams"]
-
-
-class IndexUpdateParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    description: Required[str]
-    """Specifies the description of the index."""
diff --git a/src/cloudflare/types/vectorize/index_upsert.py b/src/cloudflare/types/vectorize/index_upsert.py
deleted file mode 100644
index 400b88324fa..00000000000
--- a/src/cloudflare/types/vectorize/index_upsert.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from ..._models import BaseModel
-
-__all__ = ["IndexUpsert"]
-
-
-class IndexUpsert(BaseModel):
-    count: Optional[int] = None
-    """Specifies the count of the vectors successfully inserted."""
-
-    ids: Optional[List[str]] = None
-    """Array of vector identifiers of the vectors successfully inserted."""
diff --git a/src/cloudflare/types/vectorize/index_upsert_params.py b/src/cloudflare/types/vectorize/index_upsert_params.py
index f9cd3161b36..5e7dc3f3b55 100644
--- a/src/cloudflare/types/vectorize/index_upsert_params.py
+++ b/src/cloudflare/types/vectorize/index_upsert_params.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing_extensions import Literal, Required, Annotated, TypedDict
 
 from ..._types import FileTypes
+from ..._utils import PropertyInfo
 
 __all__ = ["IndexUpsertParams"]
 
@@ -15,3 +16,6 @@ class IndexUpsertParams(TypedDict, total=False):
 
     body: Required[FileTypes]
     """ndjson file containing vectors to upsert."""
+
+    unparsable_behavior: Annotated[Literal["error", "discard"], PropertyInfo(alias="unparsable-behavior")]
+    """Behavior for ndjson parse failures."""
diff --git a/src/cloudflare/types/vectorize/index_upsert_response.py b/src/cloudflare/types/vectorize/index_upsert_response.py
new file mode 100644
index 00000000000..dcbb266ae7c
--- /dev/null
+++ b/src/cloudflare/types/vectorize/index_upsert_response.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["IndexUpsertResponse"]
+
+
+class IndexUpsertResponse(BaseModel):
+    mutation_id: Optional[str] = FieldInfo(alias="mutationId", default=None)
+    """
+    The unique identifier for the async mutation operation containing the changeset.
+    """
diff --git a/src/cloudflare/types/vectorize/indexes/__init__.py b/src/cloudflare/types/vectorize/indexes/__init__.py
new file mode 100644
index 00000000000..fb8f20b487b
--- /dev/null
+++ b/src/cloudflare/types/vectorize/indexes/__init__.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .metadata_index_create_params import MetadataIndexCreateParams as MetadataIndexCreateParams
+from .metadata_index_delete_params import MetadataIndexDeleteParams as MetadataIndexDeleteParams
+from .metadata_index_list_response import MetadataIndexListResponse as MetadataIndexListResponse
+from .metadata_index_create_response import MetadataIndexCreateResponse as MetadataIndexCreateResponse
+from .metadata_index_delete_response import MetadataIndexDeleteResponse as MetadataIndexDeleteResponse
diff --git a/src/cloudflare/types/vectorize/indexes/metadata_index_create_params.py b/src/cloudflare/types/vectorize/indexes/metadata_index_create_params.py
new file mode 100644
index 00000000000..248cd1ceca6
--- /dev/null
+++ b/src/cloudflare/types/vectorize/indexes/metadata_index_create_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ...._utils import PropertyInfo
+
+__all__ = ["MetadataIndexCreateParams"]
+
+
+class MetadataIndexCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier"""
+
+    index_type: Required[Annotated[Literal["string", "number", "boolean"], PropertyInfo(alias="indexType")]]
+    """Specifies the type of metadata property to index."""
+
+    property_name: Required[Annotated[str, PropertyInfo(alias="propertyName")]]
+    """Specifies the metadata property to index."""
diff --git a/src/cloudflare/types/vectorize/indexes/metadata_index_create_response.py b/src/cloudflare/types/vectorize/indexes/metadata_index_create_response.py
new file mode 100644
index 00000000000..c4ae2f0eb52
--- /dev/null
+++ b/src/cloudflare/types/vectorize/indexes/metadata_index_create_response.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["MetadataIndexCreateResponse"]
+
+
+class MetadataIndexCreateResponse(BaseModel):
+    mutation_id: Optional[str] = FieldInfo(alias="mutationId", default=None)
+    """
+    The unique identifier for the async mutation operation containing the changeset.
+    """
diff --git a/src/cloudflare/types/vectorize/indexes/metadata_index_delete_params.py b/src/cloudflare/types/vectorize/indexes/metadata_index_delete_params.py
new file mode 100644
index 00000000000..f9783b5a394
--- /dev/null
+++ b/src/cloudflare/types/vectorize/indexes/metadata_index_delete_params.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ...._utils import PropertyInfo
+
+__all__ = ["MetadataIndexDeleteParams"]
+
+
+class MetadataIndexDeleteParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier"""
+
+    property_name: Required[Annotated[str, PropertyInfo(alias="propertyName")]]
+    """Specifies the metadata property for which the index must be deleted."""
diff --git a/src/cloudflare/types/vectorize/indexes/metadata_index_delete_response.py b/src/cloudflare/types/vectorize/indexes/metadata_index_delete_response.py
new file mode 100644
index 00000000000..3f8c9b78b50
--- /dev/null
+++ b/src/cloudflare/types/vectorize/indexes/metadata_index_delete_response.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["MetadataIndexDeleteResponse"]
+
+
+class MetadataIndexDeleteResponse(BaseModel):
+    mutation_id: Optional[str] = FieldInfo(alias="mutationId", default=None)
+    """
+    The unique identifier for the async mutation operation containing the changeset.
+    """
diff --git a/src/cloudflare/types/vectorize/indexes/metadata_index_list_response.py b/src/cloudflare/types/vectorize/indexes/metadata_index_list_response.py
new file mode 100644
index 00000000000..e5cc5e3e605
--- /dev/null
+++ b/src/cloudflare/types/vectorize/indexes/metadata_index_list_response.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["MetadataIndexListResponse", "MetadataIndex"]
+
+
+class MetadataIndex(BaseModel):
+    index_type: Optional[Literal["string", "number", "boolean"]] = FieldInfo(alias="indexType", default=None)
+    """Specifies the type of indexed metadata property."""
+
+    property_name: Optional[str] = FieldInfo(alias="propertyName", default=None)
+    """Specifies the indexed metadata property."""
+
+
+class MetadataIndexListResponse(BaseModel):
+    metadata_indexes: Optional[List[MetadataIndex]] = FieldInfo(alias="metadataIndexes", default=None)
+    """Array of indexed metadata properties."""
diff --git a/src/cloudflare/types/waiting_rooms/__init__.py b/src/cloudflare/types/waiting_rooms/__init__.py
index c6c280c212e..63ac8eb3b82 100644
--- a/src/cloudflare/types/waiting_rooms/__init__.py
+++ b/src/cloudflare/types/waiting_rooms/__init__.py
@@ -11,16 +11,12 @@
 from .event_list_params import EventListParams as EventListParams
 from .waiting_room_rule import WaitingRoomRule as WaitingRoomRule
 from .rule_create_params import RuleCreateParams as RuleCreateParams
-from .rule_edit_response import RuleEditResponse as RuleEditResponse
 from .rule_update_params import RuleUpdateParams as RuleUpdateParams
 from .event_create_params import EventCreateParams as EventCreateParams
 from .event_update_params import EventUpdateParams as EventUpdateParams
 from .page_preview_params import PagePreviewParams as PagePreviewParams
 from .setting_edit_params import SettingEditParams as SettingEditParams
 from .status_get_response import StatusGetResponse as StatusGetResponse
-from .rule_create_response import RuleCreateResponse as RuleCreateResponse
-from .rule_delete_response import RuleDeleteResponse as RuleDeleteResponse
-from .rule_update_response import RuleUpdateResponse as RuleUpdateResponse
 from .setting_get_response import SettingGetResponse as SettingGetResponse
 from .event_delete_response import EventDeleteResponse as EventDeleteResponse
 from .page_preview_response import PagePreviewResponse as PagePreviewResponse
diff --git a/src/cloudflare/types/waiting_rooms/cookie_attributes.py b/src/cloudflare/types/waiting_rooms/cookie_attributes.py
index d757eb26275..09690413c3d 100644
--- a/src/cloudflare/types/waiting_rooms/cookie_attributes.py
+++ b/src/cloudflare/types/waiting_rooms/cookie_attributes.py
@@ -9,6 +9,11 @@
 
 
 class CookieAttributes(BaseModel):
+    """Configures cookie attributes for the waiting room cookie.
+
+    This encrypted cookie stores a user's status in the waiting room, such as queue position.
+    """
+
     samesite: Optional[Literal["auto", "lax", "none", "strict"]] = None
     """Configures the SameSite attribute on the waiting room cookie.
 
diff --git a/src/cloudflare/types/waiting_rooms/cookie_attributes_param.py b/src/cloudflare/types/waiting_rooms/cookie_attributes_param.py
index 2724c2105c7..b40751def32 100644
--- a/src/cloudflare/types/waiting_rooms/cookie_attributes_param.py
+++ b/src/cloudflare/types/waiting_rooms/cookie_attributes_param.py
@@ -8,6 +8,11 @@
 
 
 class CookieAttributesParam(TypedDict, total=False):
+    """Configures cookie attributes for the waiting room cookie.
+
+    This encrypted cookie stores a user's status in the waiting room, such as queue position.
+    """
+
     samesite: Literal["auto", "lax", "none", "strict"]
     """Configures the SameSite attribute on the waiting room cookie.
 
diff --git a/src/cloudflare/types/waiting_rooms/event.py b/src/cloudflare/types/waiting_rooms/event.py
index 682983566d1..5a8e9cea0f2 100644
--- a/src/cloudflare/types/waiting_rooms/event.py
+++ b/src/cloudflare/types/waiting_rooms/event.py
@@ -2,6 +2,7 @@
 
 from typing import Optional
 from datetime import datetime
+from typing_extensions import Literal
 
 from ..._models import BaseModel
 
@@ -95,3 +96,15 @@ class Event(BaseModel):
     while it is active. If null, the event will inherit it. This can only be set if
     the event's `new_users_per_minute` property is also set.
     """
+
+    turnstile_action: Optional[Literal["log", "infinite_queue"]] = None
+    """
+    If set, the event will override the waiting room's `turnstile_action` property
+    while it is active. If null, the event will inherit it.
+    """
+
+    turnstile_mode: Optional[Literal["off", "invisible", "visible_non_interactive", "visible_managed"]] = None
+    """
+    If set, the event will override the waiting room's `turnstile_mode` property
+    while it is active. If null, the event will inherit it.
+    """
diff --git a/src/cloudflare/types/waiting_rooms/event_create_params.py b/src/cloudflare/types/waiting_rooms/event_create_params.py
index b4da24a3fd9..06aa816b1f9 100644
--- a/src/cloudflare/types/waiting_rooms/event_create_params.py
+++ b/src/cloudflare/types/waiting_rooms/event_create_params.py
@@ -3,14 +3,14 @@
 from __future__ import annotations
 
 from typing import Optional
-from typing_extensions import Required, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
 __all__ = ["EventCreateParams"]
 
 
 class EventCreateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     event_end_time: Required[str]
     """An ISO 8601 timestamp that marks the end of the event."""
@@ -92,3 +92,15 @@ class EventCreateParams(TypedDict, total=False):
     while it is active. If null, the event will inherit it. This can only be set if
     the event's `new_users_per_minute` property is also set.
     """
+
+    turnstile_action: Optional[Literal["log", "infinite_queue"]]
+    """
+    If set, the event will override the waiting room's `turnstile_action` property
+    while it is active. If null, the event will inherit it.
+    """
+
+    turnstile_mode: Optional[Literal["off", "invisible", "visible_non_interactive", "visible_managed"]]
+    """
+    If set, the event will override the waiting room's `turnstile_mode` property
+    while it is active. If null, the event will inherit it.
+    """
diff --git a/src/cloudflare/types/waiting_rooms/event_edit_params.py b/src/cloudflare/types/waiting_rooms/event_edit_params.py
index 3078d7cc905..722535af1fe 100644
--- a/src/cloudflare/types/waiting_rooms/event_edit_params.py
+++ b/src/cloudflare/types/waiting_rooms/event_edit_params.py
@@ -3,14 +3,14 @@
 from __future__ import annotations
 
 from typing import Optional
-from typing_extensions import Required, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
 __all__ = ["EventEditParams"]
 
 
 class EventEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     waiting_room_id: Required[str]
 
@@ -94,3 +94,15 @@ class EventEditParams(TypedDict, total=False):
     while it is active. If null, the event will inherit it. This can only be set if
     the event's `new_users_per_minute` property is also set.
     """
+
+    turnstile_action: Optional[Literal["log", "infinite_queue"]]
+    """
+    If set, the event will override the waiting room's `turnstile_action` property
+    while it is active. If null, the event will inherit it.
+    """
+
+    turnstile_mode: Optional[Literal["off", "invisible", "visible_non_interactive", "visible_managed"]]
+    """
+    If set, the event will override the waiting room's `turnstile_mode` property
+    while it is active. If null, the event will inherit it.
+    """
diff --git a/src/cloudflare/types/waiting_rooms/event_list_params.py b/src/cloudflare/types/waiting_rooms/event_list_params.py
index 99ae24766eb..9e585437ce8 100644
--- a/src/cloudflare/types/waiting_rooms/event_list_params.py
+++ b/src/cloudflare/types/waiting_rooms/event_list_params.py
@@ -9,10 +9,10 @@
 
 class EventListParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    page: object
+    page: float
     """Page number of paginated results."""
 
-    per_page: object
+    per_page: float
     """Maximum number of results per page. Must be a multiple of 5."""
diff --git a/src/cloudflare/types/waiting_rooms/event_update_params.py b/src/cloudflare/types/waiting_rooms/event_update_params.py
index 50b5fda9b82..e56d04d1241 100644
--- a/src/cloudflare/types/waiting_rooms/event_update_params.py
+++ b/src/cloudflare/types/waiting_rooms/event_update_params.py
@@ -3,14 +3,14 @@
 from __future__ import annotations
 
 from typing import Optional
-from typing_extensions import Required, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
 __all__ = ["EventUpdateParams"]
 
 
 class EventUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     waiting_room_id: Required[str]
 
@@ -94,3 +94,15 @@ class EventUpdateParams(TypedDict, total=False):
     while it is active. If null, the event will inherit it. This can only be set if
     the event's `new_users_per_minute` property is also set.
     """
+
+    turnstile_action: Optional[Literal["log", "infinite_queue"]]
+    """
+    If set, the event will override the waiting room's `turnstile_action` property
+    while it is active. If null, the event will inherit it.
+    """
+
+    turnstile_mode: Optional[Literal["off", "invisible", "visible_non_interactive", "visible_managed"]]
+    """
+    If set, the event will override the waiting room's `turnstile_mode` property
+    while it is active. If null, the event will inherit it.
+    """
diff --git a/src/cloudflare/types/waiting_rooms/page_preview_params.py b/src/cloudflare/types/waiting_rooms/page_preview_params.py
index 79df9ba1d9f..b79d818e12e 100644
--- a/src/cloudflare/types/waiting_rooms/page_preview_params.py
+++ b/src/cloudflare/types/waiting_rooms/page_preview_params.py
@@ -9,7 +9,7 @@
 
 class PagePreviewParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     custom_html: Required[str]
     """Only available for the Waiting Room Advanced subscription.
diff --git a/src/cloudflare/types/waiting_rooms/rule_create_params.py b/src/cloudflare/types/waiting_rooms/rule_create_params.py
index d86f7db2a61..541d44450cd 100644
--- a/src/cloudflare/types/waiting_rooms/rule_create_params.py
+++ b/src/cloudflare/types/waiting_rooms/rule_create_params.py
@@ -4,13 +4,17 @@
 
 from typing_extensions import Literal, Required, TypedDict
 
-__all__ = ["RuleCreateParams"]
+__all__ = ["RuleCreateParams", "Rules"]
 
 
 class RuleCreateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
+    rules: Required[Rules]
+
+
+class Rules(TypedDict, total=False):
     action: Required[Literal["bypass_waiting_room"]]
     """The action to take when the expression matches."""
 
diff --git a/src/cloudflare/types/waiting_rooms/rule_create_response.py b/src/cloudflare/types/waiting_rooms/rule_create_response.py
deleted file mode 100644
index c9705035570..00000000000
--- a/src/cloudflare/types/waiting_rooms/rule_create_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .waiting_room_rule import WaitingRoomRule
-
-__all__ = ["RuleCreateResponse"]
-
-RuleCreateResponse = List[WaitingRoomRule]
diff --git a/src/cloudflare/types/waiting_rooms/rule_delete_response.py b/src/cloudflare/types/waiting_rooms/rule_delete_response.py
deleted file mode 100644
index 0dbcc72e87f..00000000000
--- a/src/cloudflare/types/waiting_rooms/rule_delete_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .waiting_room_rule import WaitingRoomRule
-
-__all__ = ["RuleDeleteResponse"]
-
-RuleDeleteResponse = List[WaitingRoomRule]
diff --git a/src/cloudflare/types/waiting_rooms/rule_edit_params.py b/src/cloudflare/types/waiting_rooms/rule_edit_params.py
index dc61762935d..b47af6b93f6 100644
--- a/src/cloudflare/types/waiting_rooms/rule_edit_params.py
+++ b/src/cloudflare/types/waiting_rooms/rule_edit_params.py
@@ -3,14 +3,14 @@
 from __future__ import annotations
 
 from typing import Union
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
 __all__ = ["RuleEditParams", "Position", "PositionIndex", "PositionBefore", "PositionAfter"]
 
 
 class RuleEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     waiting_room_id: Required[str]
 
@@ -58,4 +58,4 @@ class PositionAfter(TypedDict, total=False):
     """
 
 
-Position = Union[PositionIndex, PositionBefore, PositionAfter]
+Position: TypeAlias = Union[PositionIndex, PositionBefore, PositionAfter]
diff --git a/src/cloudflare/types/waiting_rooms/rule_edit_response.py b/src/cloudflare/types/waiting_rooms/rule_edit_response.py
deleted file mode 100644
index 0f5c77dfdbc..00000000000
--- a/src/cloudflare/types/waiting_rooms/rule_edit_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .waiting_room_rule import WaitingRoomRule
-
-__all__ = ["RuleEditResponse"]
-
-RuleEditResponse = List[WaitingRoomRule]
diff --git a/src/cloudflare/types/waiting_rooms/rule_update_params.py b/src/cloudflare/types/waiting_rooms/rule_update_params.py
index 57a22f8d87b..2f5cac8b5ba 100644
--- a/src/cloudflare/types/waiting_rooms/rule_update_params.py
+++ b/src/cloudflare/types/waiting_rooms/rule_update_params.py
@@ -5,17 +5,17 @@
 from typing import Iterable
 from typing_extensions import Literal, Required, TypedDict
 
-__all__ = ["RuleUpdateParams", "Body"]
+__all__ = ["RuleUpdateParams", "Rule"]
 
 
 class RuleUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    body: Required[Iterable[Body]]
+    rules: Required[Iterable[Rule]]
 
 
-class Body(TypedDict, total=False):
+class Rule(TypedDict, total=False):
     action: Required[Literal["bypass_waiting_room"]]
     """The action to take when the expression matches."""
 
diff --git a/src/cloudflare/types/waiting_rooms/rule_update_response.py b/src/cloudflare/types/waiting_rooms/rule_update_response.py
deleted file mode 100644
index 775cd3292e4..00000000000
--- a/src/cloudflare/types/waiting_rooms/rule_update_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .waiting_room_rule import WaitingRoomRule
-
-__all__ = ["RuleUpdateResponse"]
-
-RuleUpdateResponse = List[WaitingRoomRule]
diff --git a/src/cloudflare/types/waiting_rooms/setting_edit_params.py b/src/cloudflare/types/waiting_rooms/setting_edit_params.py
index e922cf94de5..e51589f9da3 100644
--- a/src/cloudflare/types/waiting_rooms/setting_edit_params.py
+++ b/src/cloudflare/types/waiting_rooms/setting_edit_params.py
@@ -9,7 +9,7 @@
 
 class SettingEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     search_engine_crawler_bypass: bool
     """
diff --git a/src/cloudflare/types/waiting_rooms/setting_edit_response.py b/src/cloudflare/types/waiting_rooms/setting_edit_response.py
index 08a546fea26..26f3670ed99 100644
--- a/src/cloudflare/types/waiting_rooms/setting_edit_response.py
+++ b/src/cloudflare/types/waiting_rooms/setting_edit_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ..._models import BaseModel
 
 __all__ = ["SettingEditResponse"]
diff --git a/src/cloudflare/types/waiting_rooms/setting_get_response.py b/src/cloudflare/types/waiting_rooms/setting_get_response.py
index 4142346dc99..098bb2df1ed 100644
--- a/src/cloudflare/types/waiting_rooms/setting_get_response.py
+++ b/src/cloudflare/types/waiting_rooms/setting_get_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ..._models import BaseModel
 
 __all__ = ["SettingGetResponse"]
diff --git a/src/cloudflare/types/waiting_rooms/setting_update_params.py b/src/cloudflare/types/waiting_rooms/setting_update_params.py
index eab75ef9b66..8893bea54c3 100644
--- a/src/cloudflare/types/waiting_rooms/setting_update_params.py
+++ b/src/cloudflare/types/waiting_rooms/setting_update_params.py
@@ -9,7 +9,7 @@
 
 class SettingUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     search_engine_crawler_bypass: bool
     """
diff --git a/src/cloudflare/types/waiting_rooms/setting_update_response.py b/src/cloudflare/types/waiting_rooms/setting_update_response.py
index 59efc139003..e613bcf0f93 100644
--- a/src/cloudflare/types/waiting_rooms/setting_update_response.py
+++ b/src/cloudflare/types/waiting_rooms/setting_update_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ..._models import BaseModel
 
 __all__ = ["SettingUpdateResponse"]
diff --git a/src/cloudflare/types/waiting_rooms/status_get_response.py b/src/cloudflare/types/waiting_rooms/status_get_response.py
index 6114ed2cad0..e9b44502c72 100644
--- a/src/cloudflare/types/waiting_rooms/status_get_response.py
+++ b/src/cloudflare/types/waiting_rooms/status_get_response.py
@@ -17,4 +17,4 @@ class StatusGetResponse(BaseModel):
 
     max_estimated_time_minutes: Optional[int] = None
 
-    status: Optional[Literal["event_prequeueing", "not_queueing", "queueing"]] = None
+    status: Optional[Literal["event_prequeueing", "not_queueing", "queueing", "suspended"]] = None
diff --git a/src/cloudflare/types/waiting_rooms/waiting_room.py b/src/cloudflare/types/waiting_rooms/waiting_room.py
index e78da6a6efc..c22e5ef163b 100644
--- a/src/cloudflare/types/waiting_rooms/waiting_room.py
+++ b/src/cloudflare/types/waiting_rooms/waiting_room.py
@@ -82,6 +82,27 @@ class WaitingRoom(BaseModel):
             "ar-EG",
             "ru-RU",
             "fa-IR",
+            "bg-BG",
+            "hr-HR",
+            "cs-CZ",
+            "da-DK",
+            "fi-FI",
+            "lt-LT",
+            "ms-MY",
+            "nb-NO",
+            "ro-RO",
+            "el-GR",
+            "he-IL",
+            "hi-IN",
+            "hu-HU",
+            "sr-BA",
+            "sk-SK",
+            "sl-SI",
+            "sv-SE",
+            "tl-PH",
+            "th-TH",
+            "uk-UA",
+            "vi-VN",
         ]
     ] = None
     """The language of the default page template.
@@ -102,6 +123,9 @@ class WaitingRoom(BaseModel):
     automatically renewed on every request.
     """
 
+    enabled_origin_commands: Optional[List[Literal["revoke"]]] = None
+    """A list of enabled origin commands."""
+
     host: Optional[str] = None
     """The host name to which the waiting room will be applied (no wildcards).
 
@@ -152,7 +176,7 @@ class WaitingRoom(BaseModel):
     11. `refreshIntervalSeconds`: Integer indicating the number of seconds after
         `lastUpdated` until the user is able to make another attempt to leave the
         waiting room and be let into the origin website. When the `queueingMethod`
-        is `reject`, there is no specified refresh time — it will always be
+        is `reject`, there is no specified refresh time —\\__it will always be
         **zero**.
     12. `queueingMethod`: The queueing method currently used by the waiting room. It
         is either **fifo**, **random**, **passthrough**, or **reject**.
@@ -188,6 +212,11 @@ class WaitingRoom(BaseModel):
     23. `shuffleAtEventStart`: Valid only when `isEventActive` is **true**. Boolean
         indicating if the users in the prequeue are shuffled randomly when the event
         starts.
+    24. `turnstile`: Empty when turnstile isn't enabled. String displaying an html
+        tag to display the Turnstile widget. Please add the `{{{turnstile}}}` tag to
+        the `custom_html` template to ensure the Turnstile widget appears.
+    25. `infiniteQueue`: Boolean indicating whether the response is for a user in
+        the infinite queue.
 
     An example cURL to a waiting room could be:
 
@@ -256,7 +285,7 @@ class WaitingRoom(BaseModel):
         		"timeUntilEventEndFormatted": "15 minutes",
         		"shuffleAtEventStart": true
         	}
-        }.
+        }
     """
 
     modified_on: Optional[datetime] = None
@@ -352,3 +381,22 @@ class WaitingRoom(BaseModel):
     active users sessions on the route based on the traffic patterns at that time
     around the world.
     """
+
+    turnstile_action: Optional[Literal["log", "infinite_queue"]] = None
+    """Which action to take when a bot is detected using Turnstile.
+
+    `log` will have no impact on queueing behavior, simply keeping track of how many
+    bots are detected in Waiting Room Analytics. `infinite_queue` will send bots to
+    a false queueing state, where they will never reach your origin.
+    `infinite_queue` requires Advanced Waiting Room.
+    """
+
+    turnstile_mode: Optional[Literal["off", "invisible", "visible_non_interactive", "visible_managed"]] = None
+    """Which Turnstile widget type to use for detecting bot traffic.
+
+    See
+    [the Turnstile documentation](https://developers.cloudflare.com/turnstile/concepts/widget/#widget-types)
+    for the definitions of these widget types. Set to `off` to disable the Turnstile
+    integration entirely. Setting this to anything other than `off` or `invisible`
+    requires Advanced Waiting Room.
+    """
diff --git a/src/cloudflare/types/waiting_rooms/waiting_room_create_params.py b/src/cloudflare/types/waiting_rooms/waiting_room_create_params.py
index a8c7ae9a694..fecbc179196 100644
--- a/src/cloudflare/types/waiting_rooms/waiting_room_create_params.py
+++ b/src/cloudflare/types/waiting_rooms/waiting_room_create_params.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Iterable
+from typing import List, Iterable
 from typing_extensions import Literal, Required, TypedDict
 
 from .additional_routes_param import AdditionalRoutesParam
@@ -13,7 +13,7 @@
 
 class WaitingRoomCreateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     host: Required[str]
     """The host name to which the waiting room will be applied (no wildcards).
@@ -111,6 +111,27 @@ class WaitingRoomCreateParams(TypedDict, total=False):
         "ar-EG",
         "ru-RU",
         "fa-IR",
+        "bg-BG",
+        "hr-HR",
+        "cs-CZ",
+        "da-DK",
+        "fi-FI",
+        "lt-LT",
+        "ms-MY",
+        "nb-NO",
+        "ro-RO",
+        "el-GR",
+        "he-IL",
+        "hi-IN",
+        "hu-HU",
+        "sr-BA",
+        "sk-SK",
+        "sl-SI",
+        "sv-SE",
+        "tl-PH",
+        "th-TH",
+        "uk-UA",
+        "vi-VN",
     ]
     """The language of the default page template.
 
@@ -130,6 +151,9 @@ class WaitingRoomCreateParams(TypedDict, total=False):
     automatically renewed on every request.
     """
 
+    enabled_origin_commands: List[Literal["revoke"]]
+    """A list of enabled origin commands."""
+
     json_response_enabled: bool
     """Only available for the Waiting Room Advanced subscription.
 
@@ -173,7 +197,7 @@ class WaitingRoomCreateParams(TypedDict, total=False):
     11. `refreshIntervalSeconds`: Integer indicating the number of seconds after
         `lastUpdated` until the user is able to make another attempt to leave the
         waiting room and be let into the origin website. When the `queueingMethod`
-        is `reject`, there is no specified refresh time — it will always be
+        is `reject`, there is no specified refresh time —\\__it will always be
         **zero**.
     12. `queueingMethod`: The queueing method currently used by the waiting room. It
         is either **fifo**, **random**, **passthrough**, or **reject**.
@@ -209,6 +233,11 @@ class WaitingRoomCreateParams(TypedDict, total=False):
     23. `shuffleAtEventStart`: Valid only when `isEventActive` is **true**. Boolean
         indicating if the users in the prequeue are shuffled randomly when the event
         starts.
+    24. `turnstile`: Empty when turnstile isn't enabled. String displaying an html
+        tag to display the Turnstile widget. Please add the `{{{turnstile}}}` tag to
+        the `custom_html` template to ensure the Turnstile widget appears.
+    25. `infiniteQueue`: Boolean indicating whether the response is for a user in
+        the infinite queue.
 
     An example cURL to a waiting room could be:
 
@@ -277,7 +306,7 @@ class WaitingRoomCreateParams(TypedDict, total=False):
         		"timeUntilEventEndFormatted": "15 minutes",
         		"shuffleAtEventStart": true
         	}
-        }.
+        }
     """
 
     path: str
@@ -341,3 +370,22 @@ class WaitingRoomCreateParams(TypedDict, total=False):
 
     If set to `true`, the traffic will not go to the waiting room.
     """
+
+    turnstile_action: Literal["log", "infinite_queue"]
+    """Which action to take when a bot is detected using Turnstile.
+
+    `log` will have no impact on queueing behavior, simply keeping track of how many
+    bots are detected in Waiting Room Analytics. `infinite_queue` will send bots to
+    a false queueing state, where they will never reach your origin.
+    `infinite_queue` requires Advanced Waiting Room.
+    """
+
+    turnstile_mode: Literal["off", "invisible", "visible_non_interactive", "visible_managed"]
+    """Which Turnstile widget type to use for detecting bot traffic.
+
+    See
+    [the Turnstile documentation](https://developers.cloudflare.com/turnstile/concepts/widget/#widget-types)
+    for the definitions of these widget types. Set to `off` to disable the Turnstile
+    integration entirely. Setting this to anything other than `off` or `invisible`
+    requires Advanced Waiting Room.
+    """
diff --git a/src/cloudflare/types/waiting_rooms/waiting_room_edit_params.py b/src/cloudflare/types/waiting_rooms/waiting_room_edit_params.py
index c3cc4b662ca..77126b1a0aa 100644
--- a/src/cloudflare/types/waiting_rooms/waiting_room_edit_params.py
+++ b/src/cloudflare/types/waiting_rooms/waiting_room_edit_params.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Iterable
+from typing import List, Iterable
 from typing_extensions import Literal, Required, TypedDict
 
 from .additional_routes_param import AdditionalRoutesParam
@@ -13,7 +13,7 @@
 
 class WaitingRoomEditParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     host: Required[str]
     """The host name to which the waiting room will be applied (no wildcards).
@@ -111,6 +111,27 @@ class WaitingRoomEditParams(TypedDict, total=False):
         "ar-EG",
         "ru-RU",
         "fa-IR",
+        "bg-BG",
+        "hr-HR",
+        "cs-CZ",
+        "da-DK",
+        "fi-FI",
+        "lt-LT",
+        "ms-MY",
+        "nb-NO",
+        "ro-RO",
+        "el-GR",
+        "he-IL",
+        "hi-IN",
+        "hu-HU",
+        "sr-BA",
+        "sk-SK",
+        "sl-SI",
+        "sv-SE",
+        "tl-PH",
+        "th-TH",
+        "uk-UA",
+        "vi-VN",
     ]
     """The language of the default page template.
 
@@ -130,6 +151,9 @@ class WaitingRoomEditParams(TypedDict, total=False):
     automatically renewed on every request.
     """
 
+    enabled_origin_commands: List[Literal["revoke"]]
+    """A list of enabled origin commands."""
+
     json_response_enabled: bool
     """Only available for the Waiting Room Advanced subscription.
 
@@ -173,7 +197,7 @@ class WaitingRoomEditParams(TypedDict, total=False):
     11. `refreshIntervalSeconds`: Integer indicating the number of seconds after
         `lastUpdated` until the user is able to make another attempt to leave the
         waiting room and be let into the origin website. When the `queueingMethod`
-        is `reject`, there is no specified refresh time — it will always be
+        is `reject`, there is no specified refresh time —\\__it will always be
         **zero**.
     12. `queueingMethod`: The queueing method currently used by the waiting room. It
         is either **fifo**, **random**, **passthrough**, or **reject**.
@@ -209,6 +233,11 @@ class WaitingRoomEditParams(TypedDict, total=False):
     23. `shuffleAtEventStart`: Valid only when `isEventActive` is **true**. Boolean
         indicating if the users in the prequeue are shuffled randomly when the event
         starts.
+    24. `turnstile`: Empty when turnstile isn't enabled. String displaying an html
+        tag to display the Turnstile widget. Please add the `{{{turnstile}}}` tag to
+        the `custom_html` template to ensure the Turnstile widget appears.
+    25. `infiniteQueue`: Boolean indicating whether the response is for a user in
+        the infinite queue.
 
     An example cURL to a waiting room could be:
 
@@ -277,7 +306,7 @@ class WaitingRoomEditParams(TypedDict, total=False):
         		"timeUntilEventEndFormatted": "15 minutes",
         		"shuffleAtEventStart": true
         	}
-        }.
+        }
     """
 
     path: str
@@ -341,3 +370,22 @@ class WaitingRoomEditParams(TypedDict, total=False):
 
     If set to `true`, the traffic will not go to the waiting room.
     """
+
+    turnstile_action: Literal["log", "infinite_queue"]
+    """Which action to take when a bot is detected using Turnstile.
+
+    `log` will have no impact on queueing behavior, simply keeping track of how many
+    bots are detected in Waiting Room Analytics. `infinite_queue` will send bots to
+    a false queueing state, where they will never reach your origin.
+    `infinite_queue` requires Advanced Waiting Room.
+    """
+
+    turnstile_mode: Literal["off", "invisible", "visible_non_interactive", "visible_managed"]
+    """Which Turnstile widget type to use for detecting bot traffic.
+
+    See
+    [the Turnstile documentation](https://developers.cloudflare.com/turnstile/concepts/widget/#widget-types)
+    for the definitions of these widget types. Set to `off` to disable the Turnstile
+    integration entirely. Setting this to anything other than `off` or `invisible`
+    requires Advanced Waiting Room.
+    """
diff --git a/src/cloudflare/types/waiting_rooms/waiting_room_list_params.py b/src/cloudflare/types/waiting_rooms/waiting_room_list_params.py
index d601612834c..cc9bc3ad63e 100644
--- a/src/cloudflare/types/waiting_rooms/waiting_room_list_params.py
+++ b/src/cloudflare/types/waiting_rooms/waiting_room_list_params.py
@@ -2,17 +2,20 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing_extensions import TypedDict
 
 __all__ = ["WaitingRoomListParams"]
 
 
 class WaitingRoomListParams(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
 
-    page: object
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    page: float
     """Page number of paginated results."""
 
-    per_page: object
+    per_page: float
     """Maximum number of results per page. Must be a multiple of 5."""
diff --git a/src/cloudflare/types/waiting_rooms/waiting_room_update_params.py b/src/cloudflare/types/waiting_rooms/waiting_room_update_params.py
index 9f494bbcd82..6e02d3de918 100644
--- a/src/cloudflare/types/waiting_rooms/waiting_room_update_params.py
+++ b/src/cloudflare/types/waiting_rooms/waiting_room_update_params.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Iterable
+from typing import List, Iterable
 from typing_extensions import Literal, Required, TypedDict
 
 from .additional_routes_param import AdditionalRoutesParam
@@ -13,7 +13,7 @@
 
 class WaitingRoomUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     host: Required[str]
     """The host name to which the waiting room will be applied (no wildcards).
@@ -111,6 +111,27 @@ class WaitingRoomUpdateParams(TypedDict, total=False):
         "ar-EG",
         "ru-RU",
         "fa-IR",
+        "bg-BG",
+        "hr-HR",
+        "cs-CZ",
+        "da-DK",
+        "fi-FI",
+        "lt-LT",
+        "ms-MY",
+        "nb-NO",
+        "ro-RO",
+        "el-GR",
+        "he-IL",
+        "hi-IN",
+        "hu-HU",
+        "sr-BA",
+        "sk-SK",
+        "sl-SI",
+        "sv-SE",
+        "tl-PH",
+        "th-TH",
+        "uk-UA",
+        "vi-VN",
     ]
     """The language of the default page template.
 
@@ -130,6 +151,9 @@ class WaitingRoomUpdateParams(TypedDict, total=False):
     automatically renewed on every request.
     """
 
+    enabled_origin_commands: List[Literal["revoke"]]
+    """A list of enabled origin commands."""
+
     json_response_enabled: bool
     """Only available for the Waiting Room Advanced subscription.
 
@@ -173,7 +197,7 @@ class WaitingRoomUpdateParams(TypedDict, total=False):
     11. `refreshIntervalSeconds`: Integer indicating the number of seconds after
         `lastUpdated` until the user is able to make another attempt to leave the
         waiting room and be let into the origin website. When the `queueingMethod`
-        is `reject`, there is no specified refresh time — it will always be
+        is `reject`, there is no specified refresh time —\\__it will always be
         **zero**.
     12. `queueingMethod`: The queueing method currently used by the waiting room. It
         is either **fifo**, **random**, **passthrough**, or **reject**.
@@ -209,6 +233,11 @@ class WaitingRoomUpdateParams(TypedDict, total=False):
     23. `shuffleAtEventStart`: Valid only when `isEventActive` is **true**. Boolean
         indicating if the users in the prequeue are shuffled randomly when the event
         starts.
+    24. `turnstile`: Empty when turnstile isn't enabled. String displaying an html
+        tag to display the Turnstile widget. Please add the `{{{turnstile}}}` tag to
+        the `custom_html` template to ensure the Turnstile widget appears.
+    25. `infiniteQueue`: Boolean indicating whether the response is for a user in
+        the infinite queue.
 
     An example cURL to a waiting room could be:
 
@@ -277,7 +306,7 @@ class WaitingRoomUpdateParams(TypedDict, total=False):
         		"timeUntilEventEndFormatted": "15 minutes",
         		"shuffleAtEventStart": true
         	}
-        }.
+        }
     """
 
     path: str
@@ -341,3 +370,22 @@ class WaitingRoomUpdateParams(TypedDict, total=False):
 
     If set to `true`, the traffic will not go to the waiting room.
     """
+
+    turnstile_action: Literal["log", "infinite_queue"]
+    """Which action to take when a bot is detected using Turnstile.
+
+    `log` will have no impact on queueing behavior, simply keeping track of how many
+    bots are detected in Waiting Room Analytics. `infinite_queue` will send bots to
+    a false queueing state, where they will never reach your origin.
+    `infinite_queue` requires Advanced Waiting Room.
+    """
+
+    turnstile_mode: Literal["off", "invisible", "visible_non_interactive", "visible_managed"]
+    """Which Turnstile widget type to use for detecting bot traffic.
+
+    See
+    [the Turnstile documentation](https://developers.cloudflare.com/turnstile/concepts/widget/#widget-types)
+    for the definitions of these widget types. Set to `off` to disable the Turnstile
+    integration entirely. Setting this to anything other than `off` or `invisible`
+    requires Advanced Waiting Room.
+    """
diff --git a/src/cloudflare/types/warp_connector/__init__.py b/src/cloudflare/types/warp_connector/__init__.py
deleted file mode 100644
index 26ce695dbce..00000000000
--- a/src/cloudflare/types/warp_connector/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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_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/warp_connector_token_response.py b/src/cloudflare/types/warp_connector/warp_connector_token_response.py
deleted file mode 100644
index 7dae0ccbd32..00000000000
--- a/src/cloudflare/types/warp_connector/warp_connector_token_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union
-
-__all__ = ["WARPConnectorTokenResponse"]
-
-WARPConnectorTokenResponse = Union[List[object], str, object]
diff --git a/src/cloudflare/types/web3/hostname.py b/src/cloudflare/types/web3/hostname.py
index befb6b79bf1..d6bd0296975 100644
--- a/src/cloudflare/types/web3/hostname.py
+++ b/src/cloudflare/types/web3/hostname.py
@@ -11,23 +11,23 @@
 
 class Hostname(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Specify the identifier of the hostname."""
 
     created_on: Optional[datetime] = None
 
     description: Optional[str] = None
-    """An optional description of the hostname."""
+    """Specify an optional description of the hostname."""
 
     dnslink: Optional[str] = None
-    """DNSLink value used if the target is ipfs."""
+    """Specify the DNSLink value used if the target is ipfs."""
 
     modified_on: Optional[datetime] = None
 
     name: Optional[str] = None
-    """The hostname that will point to the target gateway via CNAME."""
+    """Specify the hostname that points to the target gateway via CNAME."""
 
     status: Optional[Literal["active", "pending", "deleting", "error"]] = None
-    """Status of the hostname's activation."""
+    """Specifies the status of the hostname's activation."""
 
     target: Optional[Literal["ethereum", "ipfs", "ipfs_universal_path"]] = None
-    """Target gateway of the hostname."""
+    """Specify the target gateway of the hostname."""
diff --git a/src/cloudflare/types/web3/hostname_create_params.py b/src/cloudflare/types/web3/hostname_create_params.py
index f396024967d..9bba7e142b7 100644
--- a/src/cloudflare/types/web3/hostname_create_params.py
+++ b/src/cloudflare/types/web3/hostname_create_params.py
@@ -8,11 +8,17 @@
 
 
 class HostnameCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Specify the identifier of the hostname."""
+
+    name: Required[str]
+    """Specify the hostname that points to the target gateway via CNAME."""
+
     target: Required[Literal["ethereum", "ipfs", "ipfs_universal_path"]]
-    """Target gateway of the hostname."""
+    """Specify the target gateway of the hostname."""
 
     description: str
-    """An optional description of the hostname."""
+    """Specify an optional description of the hostname."""
 
     dnslink: str
-    """DNSLink value used if the target is ipfs."""
+    """Specify the DNSLink value used if the target is ipfs."""
diff --git a/src/cloudflare/types/web3/hostname_delete_response.py b/src/cloudflare/types/web3/hostname_delete_response.py
index 4d2f971c072..2b33e117af3 100644
--- a/src/cloudflare/types/web3/hostname_delete_response.py
+++ b/src/cloudflare/types/web3/hostname_delete_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ..._models import BaseModel
 
 __all__ = ["HostnameDeleteResponse"]
@@ -8,4 +7,4 @@
 
 class HostnameDeleteResponse(BaseModel):
     id: str
-    """Identifier"""
+    """Specify the identifier of the hostname."""
diff --git a/src/cloudflare/types/web3/hostname_edit_params.py b/src/cloudflare/types/web3/hostname_edit_params.py
index eeeb1a553cf..48150e8906a 100644
--- a/src/cloudflare/types/web3/hostname_edit_params.py
+++ b/src/cloudflare/types/web3/hostname_edit_params.py
@@ -8,11 +8,11 @@
 
 
 class HostnameEditParams(TypedDict, total=False):
-    zone_identifier: Required[str]
-    """Identifier"""
+    zone_id: Required[str]
+    """Specify the identifier of the hostname."""
 
     description: str
-    """An optional description of the hostname."""
+    """Specify an optional description of the hostname."""
 
     dnslink: str
-    """DNSLink value used if the target is ipfs."""
+    """Specify the DNSLink value used if the target is ipfs."""
diff --git a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_list_update_params.py b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_list_update_params.py
index a7758805219..034933f46f6 100644
--- a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_list_update_params.py
+++ b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_list_update_params.py
@@ -9,22 +9,24 @@
 
 
 class ContentListUpdateParams(TypedDict, total=False):
-    zone_identifier: Required[str]
-    """Identifier"""
+    zone_id: Required[str]
+    """Specify the identifier of the hostname."""
 
     action: Required[Literal["block"]]
     """Behavior of the content list."""
 
     entries: Required[Iterable[Entry]]
-    """Content list entries."""
+    """Provides content list entries."""
 
 
 class Entry(TypedDict, total=False):
+    """Specify a content list entry to block."""
+
     content: str
-    """CID or content path of content to block."""
+    """Specify the CID or content path of content to block."""
 
     description: str
-    """An optional description of the content list entry."""
+    """Specify an optional description of the content list entry."""
 
     type: Literal["cid", "content_path"]
-    """Type of content list entry to block."""
+    """Specify the type of content list entry to block."""
diff --git a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_create_params.py b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_create_params.py
index 7a1c7f5d19c..d405fc9ebe5 100644
--- a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_create_params.py
+++ b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_create_params.py
@@ -8,14 +8,14 @@
 
 
 class EntryCreateParams(TypedDict, total=False):
-    zone_identifier: Required[str]
-    """Identifier"""
+    zone_id: Required[str]
+    """Specify the identifier of the hostname."""
 
     content: Required[str]
-    """CID or content path of content to block."""
+    """Specify the CID or content path of content to block."""
 
     type: Required[Literal["cid", "content_path"]]
-    """Type of content list entry to block."""
+    """Specify the type of content list entry to block."""
 
     description: str
-    """An optional description of the content list entry."""
+    """Specify an optional description of the content list entry."""
diff --git a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_create_response.py b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_create_response.py
index 429847809f0..8a5972253de 100644
--- a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_create_response.py
+++ b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_create_response.py
@@ -10,18 +10,20 @@
 
 
 class EntryCreateResponse(BaseModel):
+    """Specify a content list entry to block."""
+
     id: Optional[str] = None
-    """Identifier"""
+    """Specify the identifier of the hostname."""
 
     content: Optional[str] = None
-    """CID or content path of content to block."""
+    """Specify the CID or content path of content to block."""
 
     created_on: Optional[datetime] = None
 
     description: Optional[str] = None
-    """An optional description of the content list entry."""
+    """Specify an optional description of the content list entry."""
 
     modified_on: Optional[datetime] = None
 
     type: Optional[Literal["cid", "content_path"]] = None
-    """Type of content list entry to block."""
+    """Specify the type of content list entry to block."""
diff --git a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_delete_response.py b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_delete_response.py
index 40a1f3c70aa..386389ce31f 100644
--- a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_delete_response.py
+++ b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_delete_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ......_models import BaseModel
 
 __all__ = ["EntryDeleteResponse"]
@@ -8,4 +7,4 @@
 
 class EntryDeleteResponse(BaseModel):
     id: str
-    """Identifier"""
+    """Specify the identifier of the hostname."""
diff --git a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_get_response.py b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_get_response.py
index 90c70bb7c57..90746beba13 100644
--- a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_get_response.py
+++ b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_get_response.py
@@ -10,18 +10,20 @@
 
 
 class EntryGetResponse(BaseModel):
+    """Specify a content list entry to block."""
+
     id: Optional[str] = None
-    """Identifier"""
+    """Specify the identifier of the hostname."""
 
     content: Optional[str] = None
-    """CID or content path of content to block."""
+    """Specify the CID or content path of content to block."""
 
     created_on: Optional[datetime] = None
 
     description: Optional[str] = None
-    """An optional description of the content list entry."""
+    """Specify an optional description of the content list entry."""
 
     modified_on: Optional[datetime] = None
 
     type: Optional[Literal["cid", "content_path"]] = None
-    """Type of content list entry to block."""
+    """Specify the type of content list entry to block."""
diff --git a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_list_response.py b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_list_response.py
index b1de50eaf73..c78707b572b 100644
--- a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_list_response.py
+++ b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_list_response.py
@@ -10,23 +10,25 @@
 
 
 class Entry(BaseModel):
+    """Specify a content list entry to block."""
+
     id: Optional[str] = None
-    """Identifier"""
+    """Specify the identifier of the hostname."""
 
     content: Optional[str] = None
-    """CID or content path of content to block."""
+    """Specify the CID or content path of content to block."""
 
     created_on: Optional[datetime] = None
 
     description: Optional[str] = None
-    """An optional description of the content list entry."""
+    """Specify an optional description of the content list entry."""
 
     modified_on: Optional[datetime] = None
 
     type: Optional[Literal["cid", "content_path"]] = None
-    """Type of content list entry to block."""
+    """Specify the type of content list entry to block."""
 
 
 class EntryListResponse(BaseModel):
     entries: Optional[List[Entry]] = None
-    """Content list entries."""
+    """Provides content list entries."""
diff --git a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_update_params.py b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_update_params.py
index 08d41b65c29..e48b25bd067 100644
--- a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_update_params.py
+++ b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_update_params.py
@@ -8,17 +8,17 @@
 
 
 class EntryUpdateParams(TypedDict, total=False):
-    zone_identifier: Required[str]
-    """Identifier"""
+    zone_id: Required[str]
+    """Specify the identifier of the hostname."""
 
     identifier: Required[str]
-    """Identifier"""
+    """Specify the identifier of the hostname."""
 
     content: Required[str]
-    """CID or content path of content to block."""
+    """Specify the CID or content path of content to block."""
 
     type: Required[Literal["cid", "content_path"]]
-    """Type of content list entry to block."""
+    """Specify the type of content list entry to block."""
 
     description: str
-    """An optional description of the content list entry."""
+    """Specify an optional description of the content list entry."""
diff --git a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_update_response.py b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_update_response.py
index e61fc00ffee..7d0cf75bca9 100644
--- a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_update_response.py
+++ b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_update_response.py
@@ -10,18 +10,20 @@
 
 
 class EntryUpdateResponse(BaseModel):
+    """Specify a content list entry to block."""
+
     id: Optional[str] = None
-    """Identifier"""
+    """Specify the identifier of the hostname."""
 
     content: Optional[str] = None
-    """CID or content path of content to block."""
+    """Specify the CID or content path of content to block."""
 
     created_on: Optional[datetime] = None
 
     description: Optional[str] = None
-    """An optional description of the content list entry."""
+    """Specify an optional description of the content list entry."""
 
     modified_on: Optional[datetime] = None
 
     type: Optional[Literal["cid", "content_path"]] = None
-    """Type of content list entry to block."""
+    """Specify the type of content list entry to block."""
diff --git a/src/cloudflare/types/workers/__init__.py b/src/cloudflare/types/workers/__init__.py
index 6e066a47460..1c2260884ee 100644
--- a/src/cloudflare/types/workers/__init__.py
+++ b/src/cloudflare/types/workers/__init__.py
@@ -4,41 +4,32 @@
 
 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 .route_get_response import RouteGetResponse as RouteGetResponse
+from .script_list_params import ScriptListParams as ScriptListParams
+from .route_create_params import RouteCreateParams as RouteCreateParams
+from .route_list_response import RouteListResponse as RouteListResponse
+from .route_update_params import RouteUpdateParams as RouteUpdateParams
+from .script_get_response import ScriptGetResponse as ScriptGetResponse
 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_list_response import ScriptListResponse as ScriptListResponse
+from .script_search_params import ScriptSearchParams as ScriptSearchParams
 from .script_update_params import ScriptUpdateParams as ScriptUpdateParams
-from .service_binding_param import ServiceBindingParam as ServiceBindingParam
+from .route_create_response import RouteCreateResponse as RouteCreateResponse
+from .route_delete_response import RouteDeleteResponse as RouteDeleteResponse
+from .route_update_response import RouteUpdateResponse as RouteUpdateResponse
 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 .script_search_response import ScriptSearchResponse as ScriptSearchResponse
+from .script_update_response import ScriptUpdateResponse as ScriptUpdateResponse
 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/workers/account_setting_get_response.py b/src/cloudflare/types/workers/account_setting_get_response.py
index eddf77ee2f9..66029dc4e14 100644
--- a/src/cloudflare/types/workers/account_setting_get_response.py
+++ b/src/cloudflare/types/workers/account_setting_get_response.py
@@ -8,6 +8,6 @@
 
 
 class AccountSettingGetResponse(BaseModel):
-    default_usage_model: Optional[object] = None
+    default_usage_model: Optional[str] = None
 
-    green_compute: Optional[object] = None
+    green_compute: Optional[bool] = None
diff --git a/src/cloudflare/types/workers/account_setting_update_params.py b/src/cloudflare/types/workers/account_setting_update_params.py
index 70dce27872b..9dd07e89cf4 100644
--- a/src/cloudflare/types/workers/account_setting_update_params.py
+++ b/src/cloudflare/types/workers/account_setting_update_params.py
@@ -9,6 +9,8 @@
 
 class AccountSettingUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    body: Required[str]
+    default_usage_model: str
+
+    green_compute: bool
diff --git a/src/cloudflare/types/workers/account_setting_update_response.py b/src/cloudflare/types/workers/account_setting_update_response.py
index 1a97c16fb0c..f9f93fa56de 100644
--- a/src/cloudflare/types/workers/account_setting_update_response.py
+++ b/src/cloudflare/types/workers/account_setting_update_response.py
@@ -8,6 +8,6 @@
 
 
 class AccountSettingUpdateResponse(BaseModel):
-    default_usage_model: Optional[object] = None
+    default_usage_model: Optional[str] = None
 
-    green_compute: Optional[object] = None
+    green_compute: Optional[bool] = None
diff --git a/src/cloudflare/types/workers/ai_run_params.py b/src/cloudflare/types/workers/ai_run_params.py
deleted file mode 100644
index 788ee5867fb..00000000000
--- a/src/cloudflare/types/workers/ai_run_params.py
+++ /dev/null
@@ -1,230 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Dict, List, Union, Iterable
-from typing_extensions import Required, TypedDict
-
-__all__ = [
-    "AIRunParams",
-    "TextClassification",
-    "TextToImage",
-    "TextEmbeddings",
-    "AutomaticSpeechRecognition",
-    "ImageClassification",
-    "ObjectDetection",
-    "Variant6",
-    "Variant7",
-    "Variant7Message",
-    "Variant7Tool",
-    "Variant7ToolFunction",
-    "Variant7ToolFunctionParameters",
-    "Variant7ToolFunctionParametersProperties",
-    "Translation",
-    "Summarization",
-    "ImageToText",
-    "ImageToTextMessage",
-]
-
-
-class TextClassification(TypedDict, total=False):
-    account_id: Required[str]
-
-    text: Required[str]
-
-
-class TextToImage(TypedDict, total=False):
-    account_id: Required[str]
-
-    prompt: Required[str]
-
-    guidance: float
-
-    height: int
-
-    image: Iterable[float]
-
-    image_b64: str
-
-    lora_weights: Iterable[float]
-
-    loras: List[str]
-
-    mask: Iterable[float]
-
-    negative_prompt: str
-
-    num_steps: int
-
-    seed: int
-
-    strength: float
-
-    width: int
-
-
-class TextEmbeddings(TypedDict, total=False):
-    account_id: Required[str]
-
-    text: Required[Union[str, List[str]]]
-
-
-class AutomaticSpeechRecognition(TypedDict, total=False):
-    account_id: Required[str]
-
-    audio: Required[Iterable[float]]
-
-
-class ImageClassification(TypedDict, total=False):
-    account_id: Required[str]
-
-    image: Required[Iterable[float]]
-
-
-class ObjectDetection(TypedDict, total=False):
-    account_id: Required[str]
-
-    image: Iterable[float]
-
-
-class Variant6(TypedDict, total=False):
-    account_id: Required[str]
-
-    prompt: Required[str]
-
-    frequency_penalty: float
-
-    lora: str
-
-    max_tokens: int
-
-    presence_penalty: float
-
-    raw: bool
-
-    repetition_penalty: float
-
-    seed: int
-
-    stream: bool
-
-    temperature: float
-
-    top_k: int
-
-    top_p: float
-
-
-class Variant7(TypedDict, total=False):
-    account_id: Required[str]
-
-    messages: Required[Iterable[Variant7Message]]
-
-    frequency_penalty: float
-
-    max_tokens: int
-
-    presence_penalty: float
-
-    repetition_penalty: float
-
-    seed: int
-
-    stream: bool
-
-    temperature: float
-
-    tools: Iterable[Variant7Tool]
-
-    top_k: int
-
-    top_p: float
-
-
-class Variant7Message(TypedDict, total=False):
-    content: Required[str]
-
-    role: Required[str]
-
-
-class Variant7ToolFunctionParametersProperties(TypedDict, total=False):
-    description: str
-
-    type: str
-
-
-class Variant7ToolFunctionParameters(TypedDict, total=False):
-    properties: Dict[str, Variant7ToolFunctionParametersProperties]
-
-    required: List[str]
-
-    type: str
-
-
-class Variant7ToolFunction(TypedDict, total=False):
-    description: str
-
-    name: str
-
-    parameters: Variant7ToolFunctionParameters
-
-
-class Variant7Tool(TypedDict, total=False):
-    function: Variant7ToolFunction
-
-    type: str
-
-
-class Translation(TypedDict, total=False):
-    account_id: Required[str]
-
-    target_lang: Required[str]
-
-    text: Required[str]
-
-    source_lang: str
-
-
-class Summarization(TypedDict, total=False):
-    account_id: Required[str]
-
-    input_text: Required[str]
-
-    max_length: int
-
-
-class ImageToText(TypedDict, total=False):
-    account_id: Required[str]
-
-    image: Required[Iterable[float]]
-
-    max_tokens: int
-
-    messages: Iterable[ImageToTextMessage]
-
-    prompt: str
-
-    raw: bool
-
-    temperature: float
-
-
-class ImageToTextMessage(TypedDict, total=False):
-    content: Required[str]
-
-    role: Required[str]
-
-
-AIRunParams = Union[
-    TextClassification,
-    TextToImage,
-    TextEmbeddings,
-    AutomaticSpeechRecognition,
-    ImageClassification,
-    ObjectDetection,
-    Variant6,
-    Variant7,
-    Translation,
-    Summarization,
-    ImageToText,
-]
diff --git a/src/cloudflare/types/workers/ai_run_response.py b/src/cloudflare/types/workers/ai_run_response.py
deleted file mode 100644
index 953b41873a5..00000000000
--- a/src/cloudflare/types/workers/ai_run_response.py
+++ /dev/null
@@ -1,114 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union, Optional
-
-from ..._models import BaseModel
-
-__all__ = [
-    "AIRunResponse",
-    "TextClassification",
-    "TextEmbeddings",
-    "AutomaticSpeechRecognition",
-    "AutomaticSpeechRecognitionWord",
-    "ImageClassification",
-    "ObjectDetection",
-    "ObjectDetectionBox",
-    "UnionMember6",
-    "UnionMember6ToolCall",
-    "Translation",
-    "Summarization",
-    "ImageToText",
-]
-
-
-class TextClassification(BaseModel):
-    label: Optional[str] = None
-
-    score: Optional[float] = None
-
-
-class TextEmbeddings(BaseModel):
-    data: Optional[List[List[float]]] = None
-
-    shape: Optional[List[float]] = None
-
-
-class AutomaticSpeechRecognitionWord(BaseModel):
-    end: Optional[float] = None
-
-    start: Optional[float] = None
-
-    word: Optional[str] = None
-
-
-class AutomaticSpeechRecognition(BaseModel):
-    text: str
-
-    vtt: Optional[str] = None
-
-    word_count: Optional[float] = None
-
-    words: Optional[List[AutomaticSpeechRecognitionWord]] = None
-
-
-class ImageClassification(BaseModel):
-    label: Optional[str] = None
-
-    score: Optional[float] = None
-
-
-class ObjectDetectionBox(BaseModel):
-    xmax: Optional[float] = None
-
-    xmin: Optional[float] = None
-
-    ymax: Optional[float] = None
-
-    ymin: Optional[float] = None
-
-
-class ObjectDetection(BaseModel):
-    box: Optional[ObjectDetectionBox] = None
-
-    label: Optional[str] = None
-
-    score: Optional[float] = None
-
-
-class UnionMember6ToolCall(BaseModel):
-    arguments: Optional[object] = None
-
-    name: Optional[str] = None
-
-
-class UnionMember6(BaseModel):
-    response: Optional[str] = None
-
-    tool_calls: Optional[List[UnionMember6ToolCall]] = None
-
-
-class Translation(BaseModel):
-    translated_text: Optional[str] = None
-
-
-class Summarization(BaseModel):
-    summary: Optional[str] = None
-
-
-class ImageToText(BaseModel):
-    description: Optional[str] = None
-
-
-AIRunResponse = Union[
-    List[TextClassification],
-    object,
-    TextEmbeddings,
-    AutomaticSpeechRecognition,
-    List[ImageClassification],
-    List[ObjectDetection],
-    UnionMember6,
-    object,
-    Translation,
-    Summarization,
-    ImageToText,
-]
diff --git a/src/cloudflare/types/workers/assets/__init__.py b/src/cloudflare/types/workers/assets/__init__.py
new file mode 100644
index 00000000000..3ec0c84c4dd
--- /dev/null
+++ b/src/cloudflare/types/workers/assets/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .upload_create_params import UploadCreateParams as UploadCreateParams
+from .upload_create_response import UploadCreateResponse as UploadCreateResponse
diff --git a/src/cloudflare/types/workers/assets/upload_create_params.py b/src/cloudflare/types/workers/assets/upload_create_params.py
new file mode 100644
index 00000000000..9e1388f5e55
--- /dev/null
+++ b/src/cloudflare/types/workers/assets/upload_create_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["UploadCreateParams"]
+
+
+class UploadCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    base64: Required[Literal[True]]
+    """Whether the file contents are base64-encoded. Must be `true`."""
+
+    body: Required[Dict[str, str]]
diff --git a/src/cloudflare/types/workers/assets/upload_create_response.py b/src/cloudflare/types/workers/assets/upload_create_response.py
new file mode 100644
index 00000000000..96e01db3335
--- /dev/null
+++ b/src/cloudflare/types/workers/assets/upload_create_response.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ...._models import BaseModel
+
+__all__ = ["UploadCreateResponse"]
+
+
+class UploadCreateResponse(BaseModel):
+    jwt: Optional[str] = None
+    """A "completion" JWT which can be redeemed when creating a Worker version."""
diff --git a/src/cloudflare/types/workers/beta/__init__.py b/src/cloudflare/types/workers/beta/__init__.py
new file mode 100644
index 00000000000..e70179ecda9
--- /dev/null
+++ b/src/cloudflare/types/workers/beta/__init__.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .worker import Worker as Worker
+from .worker_edit_params import WorkerEditParams as WorkerEditParams
+from .worker_list_params import WorkerListParams as WorkerListParams
+from .worker_create_params import WorkerCreateParams as WorkerCreateParams
+from .worker_update_params import WorkerUpdateParams as WorkerUpdateParams
+from .worker_delete_response import WorkerDeleteResponse as WorkerDeleteResponse
diff --git a/src/cloudflare/types/workers/beta/worker.py b/src/cloudflare/types/workers/beta/worker.py
new file mode 100644
index 00000000000..fb126cccc42
--- /dev/null
+++ b/src/cloudflare/types/workers/beta/worker.py
@@ -0,0 +1,189 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = [
+    "Worker",
+    "Observability",
+    "ObservabilityLogs",
+    "References",
+    "ReferencesDispatchNamespaceOutbound",
+    "ReferencesDomain",
+    "ReferencesDurableObject",
+    "ReferencesQueue",
+    "ReferencesWorker",
+    "Subdomain",
+    "TailConsumer",
+]
+
+
+class ObservabilityLogs(BaseModel):
+    """Log settings for the Worker."""
+
+    enabled: Optional[bool] = None
+    """Whether logs are enabled for the Worker."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for logs. From 0 to 1 (1 = 100%, 0.1 = 10%)."""
+
+    invocation_logs: Optional[bool] = None
+    """
+    Whether
+    [invocation logs](https://developers.cloudflare.com/workers/observability/logs/workers-logs/#invocation-logs)
+    are enabled for the Worker.
+    """
+
+
+class Observability(BaseModel):
+    """Observability settings for the Worker."""
+
+    enabled: Optional[bool] = None
+    """Whether observability is enabled for the Worker."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for observability. From 0 to 1 (1 = 100%, 0.1 = 10%)."""
+
+    logs: Optional[ObservabilityLogs] = None
+    """Log settings for the Worker."""
+
+
+class ReferencesDispatchNamespaceOutbound(BaseModel):
+    namespace_id: str
+    """ID of the dispatch namespace."""
+
+    namespace_name: str
+    """Name of the dispatch namespace."""
+
+    worker_id: str
+    """ID of the Worker using the dispatch namespace."""
+
+    worker_name: str
+    """Name of the Worker using the dispatch namespace."""
+
+
+class ReferencesDomain(BaseModel):
+    id: str
+    """ID of the custom domain."""
+
+    certificate_id: str
+    """ID of the TLS certificate issued for the custom domain."""
+
+    hostname: str
+    """Full hostname of the custom domain, including the zone name."""
+
+    zone_id: str
+    """ID of the zone."""
+
+    zone_name: str
+    """Name of the zone."""
+
+
+class ReferencesDurableObject(BaseModel):
+    namespace_id: str
+    """ID of the Durable Object namespace being used."""
+
+    namespace_name: str
+    """Name of the Durable Object namespace being used."""
+
+    worker_id: str
+    """ID of the Worker using the Durable Object implementation."""
+
+    worker_name: str
+    """Name of the Worker using the Durable Object implementation."""
+
+
+class ReferencesQueue(BaseModel):
+    queue_consumer_id: str
+    """ID of the queue consumer configuration."""
+
+    queue_id: str
+    """ID of the queue."""
+
+    queue_name: str
+    """Name of the queue."""
+
+
+class ReferencesWorker(BaseModel):
+    id: str
+    """ID of the referencing Worker."""
+
+    name: str
+    """Name of the referencing Worker."""
+
+
+class References(BaseModel):
+    """Other resources that reference the Worker and depend on it existing."""
+
+    dispatch_namespace_outbounds: List[ReferencesDispatchNamespaceOutbound]
+    """
+    Other Workers that reference the Worker as an outbound for a dispatch namespace.
+    """
+
+    domains: List[ReferencesDomain]
+    """Custom domains connected to the Worker."""
+
+    durable_objects: List[ReferencesDurableObject]
+    """Other Workers that reference Durable Object classes implemented by the Worker."""
+
+    queues: List[ReferencesQueue]
+    """Queues that send messages to the Worker."""
+
+    workers: List[ReferencesWorker]
+    """
+    Other Workers that reference the Worker using
+    [service bindings](https://developers.cloudflare.com/workers/runtime-apis/bindings/service-bindings/).
+    """
+
+
+class Subdomain(BaseModel):
+    """Subdomain settings for the Worker."""
+
+    enabled: Optional[bool] = None
+    """Whether the \\**.workers.dev subdomain is enabled for the Worker."""
+
+    previews_enabled: Optional[bool] = None
+    """
+    Whether
+    [preview URLs](https://developers.cloudflare.com/workers/configuration/previews/)
+    are enabled for the Worker.
+    """
+
+
+class TailConsumer(BaseModel):
+    name: str
+    """Name of the consumer Worker."""
+
+
+class Worker(BaseModel):
+    id: str
+    """Immutable ID of the Worker."""
+
+    created_on: datetime
+    """When the Worker was created."""
+
+    logpush: bool
+    """Whether logpush is enabled for the Worker."""
+
+    name: str
+    """Name of the Worker."""
+
+    observability: Observability
+    """Observability settings for the Worker."""
+
+    references: References
+    """Other resources that reference the Worker and depend on it existing."""
+
+    subdomain: Subdomain
+    """Subdomain settings for the Worker."""
+
+    tags: List[str]
+    """Tags associated with the Worker."""
+
+    tail_consumers: List[TailConsumer]
+    """Other Workers that should consume logs from the Worker."""
+
+    updated_on: datetime
+    """When the Worker was most recently updated."""
diff --git a/src/cloudflare/types/workers/beta/worker_create_params.py b/src/cloudflare/types/workers/beta/worker_create_params.py
new file mode 100644
index 00000000000..74a64b41224
--- /dev/null
+++ b/src/cloudflare/types/workers/beta/worker_create_params.py
@@ -0,0 +1,82 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["WorkerCreateParams", "Observability", "ObservabilityLogs", "Subdomain", "TailConsumer"]
+
+
+class WorkerCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Name of the Worker."""
+
+    logpush: bool
+    """Whether logpush is enabled for the Worker."""
+
+    observability: Observability
+    """Observability settings for the Worker."""
+
+    subdomain: Subdomain
+    """Subdomain settings for the Worker."""
+
+    tags: SequenceNotStr[str]
+    """Tags associated with the Worker."""
+
+    tail_consumers: Iterable[TailConsumer]
+    """Other Workers that should consume logs from the Worker."""
+
+
+class ObservabilityLogs(TypedDict, total=False):
+    """Log settings for the Worker."""
+
+    enabled: bool
+    """Whether logs are enabled for the Worker."""
+
+    head_sampling_rate: float
+    """The sampling rate for logs. From 0 to 1 (1 = 100%, 0.1 = 10%)."""
+
+    invocation_logs: bool
+    """
+    Whether
+    [invocation logs](https://developers.cloudflare.com/workers/observability/logs/workers-logs/#invocation-logs)
+    are enabled for the Worker.
+    """
+
+
+class Observability(TypedDict, total=False):
+    """Observability settings for the Worker."""
+
+    enabled: bool
+    """Whether observability is enabled for the Worker."""
+
+    head_sampling_rate: float
+    """The sampling rate for observability. From 0 to 1 (1 = 100%, 0.1 = 10%)."""
+
+    logs: ObservabilityLogs
+    """Log settings for the Worker."""
+
+
+class Subdomain(TypedDict, total=False):
+    """Subdomain settings for the Worker."""
+
+    enabled: bool
+    """Whether the \\**.workers.dev subdomain is enabled for the Worker."""
+
+    previews_enabled: bool
+    """
+    Whether
+    [preview URLs](https://developers.cloudflare.com/workers/configuration/previews/)
+    are enabled for the Worker.
+    """
+
+
+class TailConsumer(TypedDict, total=False):
+    name: Required[str]
+    """Name of the consumer Worker."""
diff --git a/src/cloudflare/types/workers/beta/worker_delete_response.py b/src/cloudflare/types/workers/beta/worker_delete_response.py
new file mode 100644
index 00000000000..e099c476176
--- /dev/null
+++ b/src/cloudflare/types/workers/beta/worker_delete_response.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["WorkerDeleteResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class WorkerDeleteResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/workers/beta/worker_edit_params.py b/src/cloudflare/types/workers/beta/worker_edit_params.py
new file mode 100644
index 00000000000..682b17cead8
--- /dev/null
+++ b/src/cloudflare/types/workers/beta/worker_edit_params.py
@@ -0,0 +1,82 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["WorkerEditParams", "Observability", "ObservabilityLogs", "Subdomain", "TailConsumer"]
+
+
+class WorkerEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    logpush: Required[bool]
+    """Whether logpush is enabled for the Worker."""
+
+    name: Required[str]
+    """Name of the Worker."""
+
+    observability: Required[Observability]
+    """Observability settings for the Worker."""
+
+    subdomain: Required[Subdomain]
+    """Subdomain settings for the Worker."""
+
+    tags: Required[SequenceNotStr[str]]
+    """Tags associated with the Worker."""
+
+    tail_consumers: Required[Iterable[TailConsumer]]
+    """Other Workers that should consume logs from the Worker."""
+
+
+class ObservabilityLogs(TypedDict, total=False):
+    """Log settings for the Worker."""
+
+    enabled: bool
+    """Whether logs are enabled for the Worker."""
+
+    head_sampling_rate: float
+    """The sampling rate for logs. From 0 to 1 (1 = 100%, 0.1 = 10%)."""
+
+    invocation_logs: bool
+    """
+    Whether
+    [invocation logs](https://developers.cloudflare.com/workers/observability/logs/workers-logs/#invocation-logs)
+    are enabled for the Worker.
+    """
+
+
+class Observability(TypedDict, total=False):
+    """Observability settings for the Worker."""
+
+    enabled: bool
+    """Whether observability is enabled for the Worker."""
+
+    head_sampling_rate: float
+    """The sampling rate for observability. From 0 to 1 (1 = 100%, 0.1 = 10%)."""
+
+    logs: ObservabilityLogs
+    """Log settings for the Worker."""
+
+
+class Subdomain(TypedDict, total=False):
+    """Subdomain settings for the Worker."""
+
+    enabled: bool
+    """Whether the \\**.workers.dev subdomain is enabled for the Worker."""
+
+    previews_enabled: bool
+    """
+    Whether
+    [preview URLs](https://developers.cloudflare.com/workers/configuration/previews/)
+    are enabled for the Worker.
+    """
+
+
+class TailConsumer(TypedDict, total=False):
+    name: Required[str]
+    """Name of the consumer Worker."""
diff --git a/src/cloudflare/types/workers/beta/worker_list_params.py b/src/cloudflare/types/workers/beta/worker_list_params.py
new file mode 100644
index 00000000000..d92d9c624cc
--- /dev/null
+++ b/src/cloudflare/types/workers/beta/worker_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["WorkerListParams"]
+
+
+class WorkerListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    page: int
+    """Current page."""
+
+    per_page: int
+    """Items per-page."""
diff --git a/src/cloudflare/types/workers/beta/worker_update_params.py b/src/cloudflare/types/workers/beta/worker_update_params.py
new file mode 100644
index 00000000000..0db9f1b5aab
--- /dev/null
+++ b/src/cloudflare/types/workers/beta/worker_update_params.py
@@ -0,0 +1,82 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["WorkerUpdateParams", "Observability", "ObservabilityLogs", "Subdomain", "TailConsumer"]
+
+
+class WorkerUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """Name of the Worker."""
+
+    logpush: bool
+    """Whether logpush is enabled for the Worker."""
+
+    observability: Observability
+    """Observability settings for the Worker."""
+
+    subdomain: Subdomain
+    """Subdomain settings for the Worker."""
+
+    tags: SequenceNotStr[str]
+    """Tags associated with the Worker."""
+
+    tail_consumers: Iterable[TailConsumer]
+    """Other Workers that should consume logs from the Worker."""
+
+
+class ObservabilityLogs(TypedDict, total=False):
+    """Log settings for the Worker."""
+
+    enabled: bool
+    """Whether logs are enabled for the Worker."""
+
+    head_sampling_rate: float
+    """The sampling rate for logs. From 0 to 1 (1 = 100%, 0.1 = 10%)."""
+
+    invocation_logs: bool
+    """
+    Whether
+    [invocation logs](https://developers.cloudflare.com/workers/observability/logs/workers-logs/#invocation-logs)
+    are enabled for the Worker.
+    """
+
+
+class Observability(TypedDict, total=False):
+    """Observability settings for the Worker."""
+
+    enabled: bool
+    """Whether observability is enabled for the Worker."""
+
+    head_sampling_rate: float
+    """The sampling rate for observability. From 0 to 1 (1 = 100%, 0.1 = 10%)."""
+
+    logs: ObservabilityLogs
+    """Log settings for the Worker."""
+
+
+class Subdomain(TypedDict, total=False):
+    """Subdomain settings for the Worker."""
+
+    enabled: bool
+    """Whether the \\**.workers.dev subdomain is enabled for the Worker."""
+
+    previews_enabled: bool
+    """
+    Whether
+    [preview URLs](https://developers.cloudflare.com/workers/configuration/previews/)
+    are enabled for the Worker.
+    """
+
+
+class TailConsumer(TypedDict, total=False):
+    name: Required[str]
+    """Name of the consumer Worker."""
diff --git a/src/cloudflare/types/workers/beta/workers/__init__.py b/src/cloudflare/types/workers/beta/workers/__init__.py
new file mode 100644
index 00000000000..b8520d99e05
--- /dev/null
+++ b/src/cloudflare/types/workers/beta/workers/__init__.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .version import Version as Version
+from .version_get_params import VersionGetParams as VersionGetParams
+from .version_list_params import VersionListParams as VersionListParams
+from .version_create_params import VersionCreateParams as VersionCreateParams
+from .version_delete_response import VersionDeleteResponse as VersionDeleteResponse
diff --git a/src/cloudflare/types/workers/beta/workers/version.py b/src/cloudflare/types/workers/beta/workers/version.py
new file mode 100644
index 00000000000..f8b606eff70
--- /dev/null
+++ b/src/cloudflare/types/workers/beta/workers/version.py
@@ -0,0 +1,777 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ....._utils import PropertyInfo
+from ....._models import BaseModel
+from ...single_step_migration import SingleStepMigration
+
+__all__ = [
+    "Version",
+    "Annotations",
+    "Assets",
+    "AssetsConfig",
+    "Binding",
+    "BindingWorkersBindingKindAI",
+    "BindingWorkersBindingKindAnalyticsEngine",
+    "BindingWorkersBindingKindAssets",
+    "BindingWorkersBindingKindBrowser",
+    "BindingWorkersBindingKindD1",
+    "BindingWorkersBindingKindDataBlob",
+    "BindingWorkersBindingKindDispatchNamespace",
+    "BindingWorkersBindingKindDispatchNamespaceOutbound",
+    "BindingWorkersBindingKindDispatchNamespaceOutboundWorker",
+    "BindingWorkersBindingKindDurableObjectNamespace",
+    "BindingWorkersBindingKindHyperdrive",
+    "BindingWorkersBindingKindInherit",
+    "BindingWorkersBindingKindImages",
+    "BindingWorkersBindingKindJson",
+    "BindingWorkersBindingKindKVNamespace",
+    "BindingWorkersBindingKindMTLSCertificate",
+    "BindingWorkersBindingKindPlainText",
+    "BindingWorkersBindingKindPipelines",
+    "BindingWorkersBindingKindQueue",
+    "BindingWorkersBindingKindRatelimit",
+    "BindingWorkersBindingKindRatelimitSimple",
+    "BindingWorkersBindingKindR2Bucket",
+    "BindingWorkersBindingKindSecretText",
+    "BindingWorkersBindingKindSendEmail",
+    "BindingWorkersBindingKindService",
+    "BindingWorkersBindingKindTextBlob",
+    "BindingWorkersBindingKindVectorize",
+    "BindingWorkersBindingKindVersionMetadata",
+    "BindingWorkersBindingKindSecretsStoreSecret",
+    "BindingWorkersBindingKindSecretKey",
+    "BindingWorkersBindingKindWorkflow",
+    "BindingWorkersBindingKindWasmModule",
+    "Limits",
+    "Migrations",
+    "MigrationsWorkersMultipleStepMigrations",
+    "Module",
+    "Placement",
+    "PlacementMode",
+    "PlacementRegion",
+    "PlacementHostname",
+    "PlacementHost",
+    "PlacementUnionMember4",
+    "PlacementUnionMember5",
+    "PlacementUnionMember6",
+    "PlacementUnionMember7",
+    "PlacementUnionMember7Target",
+    "PlacementUnionMember7TargetRegion",
+    "PlacementUnionMember7TargetHostname",
+    "PlacementUnionMember7TargetHost",
+]
+
+
+class Annotations(BaseModel):
+    """Metadata about the version."""
+
+    workers_message: Optional[str] = FieldInfo(alias="workers/message", default=None)
+    """Human-readable message about the version."""
+
+    workers_tag: Optional[str] = FieldInfo(alias="workers/tag", default=None)
+    """User-provided identifier for the version."""
+
+    workers_triggered_by: Optional[str] = FieldInfo(alias="workers/triggered_by", default=None)
+    """Operation that triggered the creation of the version."""
+
+
+class AssetsConfig(BaseModel):
+    """Configuration for assets within a Worker."""
+
+    html_handling: Optional[Literal["auto-trailing-slash", "force-trailing-slash", "drop-trailing-slash", "none"]] = (
+        None
+    )
+    """Determines the redirects and rewrites of requests for HTML content."""
+
+    not_found_handling: Optional[Literal["none", "404-page", "single-page-application"]] = None
+    """
+    Determines the response when a request does not match a static asset, and there
+    is no Worker script.
+    """
+
+    run_worker_first: Union[List[str], bool, None] = None
+    """Contains a list path rules to control routing to either the Worker or assets.
+
+    Glob (\\**) and negative (!) rules are supported. Rules must start with either '/'
+    or '!/'. At least one non-negative rule must be provided, and negative rules
+    have higher precedence than non-negative rules.
+    """
+
+
+class Assets(BaseModel):
+    """Configuration for assets within a Worker.
+
+    [`_headers`](https://developers.cloudflare.com/workers/static-assets/headers/#custom-headers) and
+    [`_redirects`](https://developers.cloudflare.com/workers/static-assets/redirects/) files should be
+    included as modules named `_headers` and `_redirects` with content type `text/plain`.
+    """
+
+    config: Optional[AssetsConfig] = None
+    """Configuration for assets within a Worker."""
+
+    jwt: Optional[str] = None
+    """Token provided upon successful upload of all files from a registered manifest."""
+
+
+class BindingWorkersBindingKindAI(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["ai"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindAnalyticsEngine(BaseModel):
+    dataset: str
+    """The name of the dataset to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["analytics_engine"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindAssets(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["assets"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindBrowser(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["browser"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindD1(BaseModel):
+    id: str
+    """Identifier of the D1 database to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["d1"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindDataBlob(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the data content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["data_blob"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindDispatchNamespaceOutboundWorker(BaseModel):
+    """Outbound worker."""
+
+    environment: Optional[str] = None
+    """Environment of the outbound worker."""
+
+    service: Optional[str] = None
+    """Name of the outbound worker."""
+
+
+class BindingWorkersBindingKindDispatchNamespaceOutbound(BaseModel):
+    """Outbound worker."""
+
+    params: Optional[List[str]] = None
+    """
+    Pass information from the Dispatch Worker to the Outbound Worker through the
+    parameters.
+    """
+
+    worker: Optional[BindingWorkersBindingKindDispatchNamespaceOutboundWorker] = None
+    """Outbound worker."""
+
+
+class BindingWorkersBindingKindDispatchNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace: str
+    """The name of the dispatch namespace."""
+
+    type: Literal["dispatch_namespace"]
+    """The kind of resource that the binding provides."""
+
+    outbound: Optional[BindingWorkersBindingKindDispatchNamespaceOutbound] = None
+    """Outbound worker."""
+
+
+class BindingWorkersBindingKindDurableObjectNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["durable_object_namespace"]
+    """The kind of resource that the binding provides."""
+
+    class_name: Optional[str] = None
+    """The exported class name of the Durable Object."""
+
+    environment: Optional[str] = None
+    """The environment of the script_name to bind to."""
+
+    namespace_id: Optional[str] = None
+    """Namespace identifier tag."""
+
+    script_name: Optional[str] = None
+    """
+    The script where the Durable Object is defined, if it is external to this
+    Worker.
+    """
+
+
+class BindingWorkersBindingKindHyperdrive(BaseModel):
+    id: str
+    """Identifier of the Hyperdrive connection to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["hyperdrive"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindInherit(BaseModel):
+    name: str
+    """The name of the inherited binding."""
+
+    type: Literal["inherit"]
+    """The kind of resource that the binding provides."""
+
+    old_name: Optional[str] = None
+    """The old name of the inherited binding.
+
+    If set, the binding will be renamed from `old_name` to `name` in the new
+    version. If not set, the binding will keep the same name between versions.
+    """
+
+    version_id: Optional[str] = None
+    """
+    Identifier for the version to inherit the binding from, which can be the version
+    ID or the literal "latest" to inherit from the latest version. Defaults to
+    inheriting the binding from the latest version.
+    """
+
+
+class BindingWorkersBindingKindImages(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["images"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindJson(BaseModel):
+    json_: str = FieldInfo(alias="json")
+    """JSON data to use."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["json"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindKVNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: str
+    """Namespace identifier tag."""
+
+    type: Literal["kv_namespace"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindMTLSCertificate(BaseModel):
+    certificate_id: str
+    """Identifier of the certificate to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["mtls_certificate"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindPlainText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    text: str
+    """The text value to use."""
+
+    type: Literal["plain_text"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindPipelines(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    pipeline: str
+    """Name of the Pipeline to bind to."""
+
+    type: Literal["pipelines"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindQueue(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    queue_name: str
+    """Name of the Queue to bind to."""
+
+    type: Literal["queue"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindRatelimitSimple(BaseModel):
+    """The rate limit configuration."""
+
+    limit: float
+    """The limit (requests per period)."""
+
+    period: int
+    """The period in seconds."""
+
+
+class BindingWorkersBindingKindRatelimit(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: str
+    """Identifier of the rate limit namespace to bind to."""
+
+    simple: BindingWorkersBindingKindRatelimitSimple
+    """The rate limit configuration."""
+
+    type: Literal["ratelimit"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindR2Bucket(BaseModel):
+    bucket_name: str
+    """R2 bucket to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["r2_bucket"]
+    """The kind of resource that the binding provides."""
+
+    jurisdiction: Optional[Literal["eu", "fedramp"]] = None
+    """
+    The
+    [jurisdiction](https://developers.cloudflare.com/r2/reference/data-location/#jurisdictional-restrictions)
+    of the R2 bucket.
+    """
+
+
+class BindingWorkersBindingKindSecretText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_text"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindSendEmail(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["send_email"]
+    """The kind of resource that the binding provides."""
+
+    allowed_destination_addresses: Optional[List[str]] = None
+    """List of allowed destination addresses."""
+
+    allowed_sender_addresses: Optional[List[str]] = None
+    """List of allowed sender addresses."""
+
+    destination_address: Optional[str] = None
+    """Destination address for the email."""
+
+
+class BindingWorkersBindingKindService(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    service: str
+    """Name of Worker to bind to."""
+
+    type: Literal["service"]
+    """The kind of resource that the binding provides."""
+
+    environment: Optional[str] = None
+    """Optional environment if the Worker utilizes one."""
+
+
+class BindingWorkersBindingKindTextBlob(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the text content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["text_blob"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindVectorize(BaseModel):
+    index_name: str
+    """Name of the Vectorize index to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["vectorize"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindVersionMetadata(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["version_metadata"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindSecretsStoreSecret(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    secret_name: str
+    """Name of the secret in the store."""
+
+    store_id: str
+    """ID of the store containing the secret."""
+
+    type: Literal["secrets_store_secret"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindSecretKey(BaseModel):
+    algorithm: object
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Literal["raw", "pkcs8", "spki", "jwk"]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_key"]
+    """The kind of resource that the binding provides."""
+
+    usages: List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+
+class BindingWorkersBindingKindWorkflow(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["workflow"]
+    """The kind of resource that the binding provides."""
+
+    workflow_name: str
+    """Name of the Workflow to bind to."""
+
+    class_name: Optional[str] = None
+    """Class name of the Workflow.
+
+    Should only be provided if the Workflow belongs to this script.
+    """
+
+    script_name: Optional[str] = None
+    """Script name that contains the Workflow.
+
+    If not provided, defaults to this script name.
+    """
+
+
+class BindingWorkersBindingKindWasmModule(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the WebAssembly module content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["wasm_module"]
+    """The kind of resource that the binding provides."""
+
+
+Binding: TypeAlias = Annotated[
+    Union[
+        BindingWorkersBindingKindAI,
+        BindingWorkersBindingKindAnalyticsEngine,
+        BindingWorkersBindingKindAssets,
+        BindingWorkersBindingKindBrowser,
+        BindingWorkersBindingKindD1,
+        BindingWorkersBindingKindDataBlob,
+        BindingWorkersBindingKindDispatchNamespace,
+        BindingWorkersBindingKindDurableObjectNamespace,
+        BindingWorkersBindingKindHyperdrive,
+        BindingWorkersBindingKindInherit,
+        BindingWorkersBindingKindImages,
+        BindingWorkersBindingKindJson,
+        BindingWorkersBindingKindKVNamespace,
+        BindingWorkersBindingKindMTLSCertificate,
+        BindingWorkersBindingKindPlainText,
+        BindingWorkersBindingKindPipelines,
+        BindingWorkersBindingKindQueue,
+        BindingWorkersBindingKindRatelimit,
+        BindingWorkersBindingKindR2Bucket,
+        BindingWorkersBindingKindSecretText,
+        BindingWorkersBindingKindSendEmail,
+        BindingWorkersBindingKindService,
+        BindingWorkersBindingKindTextBlob,
+        BindingWorkersBindingKindVectorize,
+        BindingWorkersBindingKindVersionMetadata,
+        BindingWorkersBindingKindSecretsStoreSecret,
+        BindingWorkersBindingKindSecretKey,
+        BindingWorkersBindingKindWorkflow,
+        BindingWorkersBindingKindWasmModule,
+    ],
+    PropertyInfo(discriminator="type"),
+]
+
+
+class Limits(BaseModel):
+    """Resource limits enforced at runtime."""
+
+    cpu_ms: int
+    """CPU time limit in milliseconds."""
+
+
+class MigrationsWorkersMultipleStepMigrations(BaseModel):
+    pass
+
+
+Migrations: TypeAlias = Union[SingleStepMigration, MigrationsWorkersMultipleStepMigrations]
+
+
+class Module(BaseModel):
+    content_base64: str
+    """The base64-encoded module content."""
+
+    content_type: str
+    """The content type of the module."""
+
+    name: str
+    """The name of the module."""
+
+
+class PlacementMode(BaseModel):
+    mode: Literal["smart"]
+    """
+    Enables
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementRegion(BaseModel):
+    region: str
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class PlacementHostname(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+
+class PlacementHost(BaseModel):
+    host: str
+    """TCP host and port for targeted placement."""
+
+
+class PlacementUnionMember4(BaseModel):
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    region: str
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class PlacementUnionMember5(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+
+class PlacementUnionMember6(BaseModel):
+    host: str
+    """TCP host and port for targeted placement."""
+
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+
+class PlacementUnionMember7TargetRegion(BaseModel):
+    region: str
+    """Cloud region in format 'provider:region'."""
+
+
+class PlacementUnionMember7TargetHostname(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+
+class PlacementUnionMember7TargetHost(BaseModel):
+    host: str
+    """TCP host:port for targeted placement."""
+
+
+PlacementUnionMember7Target: TypeAlias = Union[
+    PlacementUnionMember7TargetRegion, PlacementUnionMember7TargetHostname, PlacementUnionMember7TargetHost
+]
+
+
+class PlacementUnionMember7(BaseModel):
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    target: List[PlacementUnionMember7Target]
+    """Array of placement targets (currently limited to single target)."""
+
+
+Placement: TypeAlias = Union[
+    PlacementMode,
+    PlacementRegion,
+    PlacementHostname,
+    PlacementHost,
+    PlacementUnionMember4,
+    PlacementUnionMember5,
+    PlacementUnionMember6,
+    PlacementUnionMember7,
+]
+
+
+class Version(BaseModel):
+    id: str
+    """Version identifier."""
+
+    created_on: datetime
+    """When the version was created."""
+
+    number: int
+    """The integer version number, starting from one."""
+
+    annotations: Optional[Annotations] = None
+    """Metadata about the version."""
+
+    assets: Optional[Assets] = None
+    """Configuration for assets within a Worker.
+
+    [`_headers`](https://developers.cloudflare.com/workers/static-assets/headers/#custom-headers)
+    and
+    [`_redirects`](https://developers.cloudflare.com/workers/static-assets/redirects/)
+    files should be included as modules named `_headers` and `_redirects` with
+    content type `text/plain`.
+    """
+
+    bindings: Optional[List[Binding]] = None
+    """List of bindings attached to a Worker.
+
+    You can find more about bindings on our docs:
+    https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
+    """
+
+    compatibility_date: Optional[str] = None
+    """Date indicating targeted support in the Workers runtime.
+
+    Backwards incompatible fixes to the runtime following this date will not affect
+    this Worker.
+    """
+
+    compatibility_flags: Optional[List[str]] = None
+    """Flags that enable or disable certain features in the Workers runtime.
+
+    Used to enable upcoming features or opt in or out of specific changes not
+    included in a `compatibility_date`.
+    """
+
+    limits: Optional[Limits] = None
+    """Resource limits enforced at runtime."""
+
+    main_module: Optional[str] = None
+    """The name of the main module in the `modules` array (e.g.
+
+    the name of the module that exports a `fetch` handler).
+    """
+
+    migrations: Optional[Migrations] = None
+    """Migrations for Durable Objects associated with the version.
+
+    Migrations are applied when the version is deployed.
+    """
+
+    modules: Optional[List[Module]] = None
+    """Code, sourcemaps, and other content used at runtime.
+
+    This includes
+    [`_headers`](https://developers.cloudflare.com/workers/static-assets/headers/#custom-headers)
+    and
+    [`_redirects`](https://developers.cloudflare.com/workers/static-assets/redirects/)
+    files used to configure
+    [Static Assets](https://developers.cloudflare.com/workers/static-assets/).
+    `_headers` and `_redirects` files should be included as modules named `_headers`
+    and `_redirects` with content type `text/plain`.
+    """
+
+    placement: Optional[Placement] = None
+    """
+    Configuration for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    Specify mode='smart' for Smart Placement, or one of region/hostname/host.
+    """
+
+    source: Optional[str] = None
+    """The client used to create the version."""
+
+    startup_time_ms: Optional[int] = None
+    """
+    Time in milliseconds spent on
+    [Worker startup](https://developers.cloudflare.com/workers/platform/limits/#worker-startup-time).
+    """
+
+    usage_model: Optional[Literal["standard", "bundled", "unbound"]] = None
+    """Usage model for the version."""
diff --git a/src/cloudflare/types/workers/beta/workers/version_create_params.py b/src/cloudflare/types/workers/beta/workers/version_create_params.py
new file mode 100644
index 00000000000..0bf4f7ed8bd
--- /dev/null
+++ b/src/cloudflare/types/workers/beta/workers/version_create_params.py
@@ -0,0 +1,789 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ....._types import SequenceNotStr, Base64FileInput
+from ....._utils import PropertyInfo
+from ....._models import set_pydantic_config
+from ...migration_step_param import MigrationStepParam
+from ...single_step_migration_param import SingleStepMigrationParam
+
+__all__ = [
+    "VersionCreateParams",
+    "Annotations",
+    "Assets",
+    "AssetsConfig",
+    "Binding",
+    "BindingWorkersBindingKindAI",
+    "BindingWorkersBindingKindAnalyticsEngine",
+    "BindingWorkersBindingKindAssets",
+    "BindingWorkersBindingKindBrowser",
+    "BindingWorkersBindingKindD1",
+    "BindingWorkersBindingKindDataBlob",
+    "BindingWorkersBindingKindDispatchNamespace",
+    "BindingWorkersBindingKindDispatchNamespaceOutbound",
+    "BindingWorkersBindingKindDispatchNamespaceOutboundWorker",
+    "BindingWorkersBindingKindDurableObjectNamespace",
+    "BindingWorkersBindingKindHyperdrive",
+    "BindingWorkersBindingKindInherit",
+    "BindingWorkersBindingKindImages",
+    "BindingWorkersBindingKindJson",
+    "BindingWorkersBindingKindKVNamespace",
+    "BindingWorkersBindingKindMTLSCertificate",
+    "BindingWorkersBindingKindPlainText",
+    "BindingWorkersBindingKindPipelines",
+    "BindingWorkersBindingKindQueue",
+    "BindingWorkersBindingKindRatelimit",
+    "BindingWorkersBindingKindRatelimitSimple",
+    "BindingWorkersBindingKindR2Bucket",
+    "BindingWorkersBindingKindSecretText",
+    "BindingWorkersBindingKindSendEmail",
+    "BindingWorkersBindingKindService",
+    "BindingWorkersBindingKindTextBlob",
+    "BindingWorkersBindingKindVectorize",
+    "BindingWorkersBindingKindVersionMetadata",
+    "BindingWorkersBindingKindSecretsStoreSecret",
+    "BindingWorkersBindingKindSecretKey",
+    "BindingWorkersBindingKindWorkflow",
+    "BindingWorkersBindingKindWasmModule",
+    "Limits",
+    "Migrations",
+    "MigrationsWorkersMultipleStepMigrations",
+    "Module",
+    "Placement",
+    "PlacementMode",
+    "PlacementRegion",
+    "PlacementHostname",
+    "PlacementHost",
+    "PlacementUnionMember4",
+    "PlacementUnionMember5",
+    "PlacementUnionMember6",
+    "PlacementUnionMember7",
+    "PlacementUnionMember7Target",
+    "PlacementUnionMember7TargetRegion",
+    "PlacementUnionMember7TargetHostname",
+    "PlacementUnionMember7TargetHost",
+]
+
+
+class VersionCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    deploy: bool
+    """
+    If true, a deployment will be created that sends 100% of traffic to the new
+    version.
+    """
+
+    annotations: Annotations
+    """Metadata about the version."""
+
+    assets: Assets
+    """Configuration for assets within a Worker.
+
+    [`_headers`](https://developers.cloudflare.com/workers/static-assets/headers/#custom-headers)
+    and
+    [`_redirects`](https://developers.cloudflare.com/workers/static-assets/redirects/)
+    files should be included as modules named `_headers` and `_redirects` with
+    content type `text/plain`.
+    """
+
+    bindings: Iterable[Binding]
+    """List of bindings attached to a Worker.
+
+    You can find more about bindings on our docs:
+    https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
+    """
+
+    compatibility_date: str
+    """Date indicating targeted support in the Workers runtime.
+
+    Backwards incompatible fixes to the runtime following this date will not affect
+    this Worker.
+    """
+
+    compatibility_flags: SequenceNotStr[str]
+    """Flags that enable or disable certain features in the Workers runtime.
+
+    Used to enable upcoming features or opt in or out of specific changes not
+    included in a `compatibility_date`.
+    """
+
+    limits: Limits
+    """Resource limits enforced at runtime."""
+
+    main_module: str
+    """The name of the main module in the `modules` array (e.g.
+
+    the name of the module that exports a `fetch` handler).
+    """
+
+    migrations: Migrations
+    """Migrations for Durable Objects associated with the version.
+
+    Migrations are applied when the version is deployed.
+    """
+
+    modules: Iterable[Module]
+    """Code, sourcemaps, and other content used at runtime.
+
+    This includes
+    [`_headers`](https://developers.cloudflare.com/workers/static-assets/headers/#custom-headers)
+    and
+    [`_redirects`](https://developers.cloudflare.com/workers/static-assets/redirects/)
+    files used to configure
+    [Static Assets](https://developers.cloudflare.com/workers/static-assets/).
+    `_headers` and `_redirects` files should be included as modules named `_headers`
+    and `_redirects` with content type `text/plain`.
+    """
+
+    placement: Placement
+    """
+    Configuration for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    Specify mode='smart' for Smart Placement, or one of region/hostname/host.
+    """
+
+    usage_model: Literal["standard", "bundled", "unbound"]
+    """Usage model for the version."""
+
+
+class Annotations(TypedDict, total=False):
+    """Metadata about the version."""
+
+    workers_message: Annotated[str, PropertyInfo(alias="workers/message")]
+    """Human-readable message about the version."""
+
+    workers_tag: Annotated[str, PropertyInfo(alias="workers/tag")]
+    """User-provided identifier for the version."""
+
+
+class AssetsConfig(TypedDict, total=False):
+    """Configuration for assets within a Worker."""
+
+    html_handling: Literal["auto-trailing-slash", "force-trailing-slash", "drop-trailing-slash", "none"]
+    """Determines the redirects and rewrites of requests for HTML content."""
+
+    not_found_handling: Literal["none", "404-page", "single-page-application"]
+    """
+    Determines the response when a request does not match a static asset, and there
+    is no Worker script.
+    """
+
+    run_worker_first: Union[SequenceNotStr[str], bool]
+    """Contains a list path rules to control routing to either the Worker or assets.
+
+    Glob (\\**) and negative (!) rules are supported. Rules must start with either '/'
+    or '!/'. At least one non-negative rule must be provided, and negative rules
+    have higher precedence than non-negative rules.
+    """
+
+
+class Assets(TypedDict, total=False):
+    """Configuration for assets within a Worker.
+
+    [`_headers`](https://developers.cloudflare.com/workers/static-assets/headers/#custom-headers) and
+    [`_redirects`](https://developers.cloudflare.com/workers/static-assets/redirects/) files should be
+    included as modules named `_headers` and `_redirects` with content type `text/plain`.
+    """
+
+    config: AssetsConfig
+    """Configuration for assets within a Worker."""
+
+    jwt: str
+    """Token provided upon successful upload of all files from a registered manifest."""
+
+
+class BindingWorkersBindingKindAI(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["ai"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindAnalyticsEngine(TypedDict, total=False):
+    dataset: Required[str]
+    """The name of the dataset to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["analytics_engine"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindAssets(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["assets"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindBrowser(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["browser"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindD1(TypedDict, total=False):
+    id: Required[str]
+    """Identifier of the D1 database to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["d1"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindDataBlob(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    part: Required[str]
+    """The name of the file containing the data content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Required[Literal["data_blob"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindDispatchNamespaceOutboundWorker(TypedDict, total=False):
+    """Outbound worker."""
+
+    environment: str
+    """Environment of the outbound worker."""
+
+    service: str
+    """Name of the outbound worker."""
+
+
+class BindingWorkersBindingKindDispatchNamespaceOutbound(TypedDict, total=False):
+    """Outbound worker."""
+
+    params: SequenceNotStr[str]
+    """
+    Pass information from the Dispatch Worker to the Outbound Worker through the
+    parameters.
+    """
+
+    worker: BindingWorkersBindingKindDispatchNamespaceOutboundWorker
+    """Outbound worker."""
+
+
+class BindingWorkersBindingKindDispatchNamespace(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    namespace: Required[str]
+    """The name of the dispatch namespace."""
+
+    type: Required[Literal["dispatch_namespace"]]
+    """The kind of resource that the binding provides."""
+
+    outbound: BindingWorkersBindingKindDispatchNamespaceOutbound
+    """Outbound worker."""
+
+
+class BindingWorkersBindingKindDurableObjectNamespace(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["durable_object_namespace"]]
+    """The kind of resource that the binding provides."""
+
+    class_name: str
+    """The exported class name of the Durable Object."""
+
+    environment: str
+    """The environment of the script_name to bind to."""
+
+    namespace_id: str
+    """Namespace identifier tag."""
+
+    script_name: str
+    """
+    The script where the Durable Object is defined, if it is external to this
+    Worker.
+    """
+
+
+class BindingWorkersBindingKindHyperdrive(TypedDict, total=False):
+    id: Required[str]
+    """Identifier of the Hyperdrive connection to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["hyperdrive"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindInherit(TypedDict, total=False):
+    name: Required[str]
+    """The name of the inherited binding."""
+
+    type: Required[Literal["inherit"]]
+    """The kind of resource that the binding provides."""
+
+    old_name: str
+    """The old name of the inherited binding.
+
+    If set, the binding will be renamed from `old_name` to `name` in the new
+    version. If not set, the binding will keep the same name between versions.
+    """
+
+    version_id: str
+    """
+    Identifier for the version to inherit the binding from, which can be the version
+    ID or the literal "latest" to inherit from the latest version. Defaults to
+    inheriting the binding from the latest version.
+    """
+
+
+class BindingWorkersBindingKindImages(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["images"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindJson(TypedDict, total=False):
+    json: Required[str]
+    """JSON data to use."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["json"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindKVNamespace(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: Required[str]
+    """Namespace identifier tag."""
+
+    type: Required[Literal["kv_namespace"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindMTLSCertificate(TypedDict, total=False):
+    certificate_id: Required[str]
+    """Identifier of the certificate to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["mtls_certificate"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindPlainText(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    text: Required[str]
+    """The text value to use."""
+
+    type: Required[Literal["plain_text"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindPipelines(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    pipeline: Required[str]
+    """Name of the Pipeline to bind to."""
+
+    type: Required[Literal["pipelines"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindQueue(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    queue_name: Required[str]
+    """Name of the Queue to bind to."""
+
+    type: Required[Literal["queue"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindRatelimitSimple(TypedDict, total=False):
+    """The rate limit configuration."""
+
+    limit: Required[float]
+    """The limit (requests per period)."""
+
+    period: Required[int]
+    """The period in seconds."""
+
+
+class BindingWorkersBindingKindRatelimit(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: Required[str]
+    """Identifier of the rate limit namespace to bind to."""
+
+    simple: Required[BindingWorkersBindingKindRatelimitSimple]
+    """The rate limit configuration."""
+
+    type: Required[Literal["ratelimit"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindR2Bucket(TypedDict, total=False):
+    bucket_name: Required[str]
+    """R2 bucket to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["r2_bucket"]]
+    """The kind of resource that the binding provides."""
+
+    jurisdiction: Literal["eu", "fedramp"]
+    """
+    The
+    [jurisdiction](https://developers.cloudflare.com/r2/reference/data-location/#jurisdictional-restrictions)
+    of the R2 bucket.
+    """
+
+
+class BindingWorkersBindingKindSecretText(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    text: Required[str]
+    """The secret value to use."""
+
+    type: Required[Literal["secret_text"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindSendEmail(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["send_email"]]
+    """The kind of resource that the binding provides."""
+
+    allowed_destination_addresses: SequenceNotStr[str]
+    """List of allowed destination addresses."""
+
+    allowed_sender_addresses: SequenceNotStr[str]
+    """List of allowed sender addresses."""
+
+    destination_address: str
+    """Destination address for the email."""
+
+
+class BindingWorkersBindingKindService(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    service: Required[str]
+    """Name of Worker to bind to."""
+
+    type: Required[Literal["service"]]
+    """The kind of resource that the binding provides."""
+
+    environment: str
+    """Optional environment if the Worker utilizes one."""
+
+
+class BindingWorkersBindingKindTextBlob(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    part: Required[str]
+    """The name of the file containing the text content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Required[Literal["text_blob"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindVectorize(TypedDict, total=False):
+    index_name: Required[str]
+    """Name of the Vectorize index to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["vectorize"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindVersionMetadata(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["version_metadata"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindSecretsStoreSecret(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    secret_name: Required[str]
+    """Name of the secret in the store."""
+
+    store_id: Required[str]
+    """ID of the store containing the secret."""
+
+    type: Required[Literal["secrets_store_secret"]]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindSecretKey(TypedDict, total=False):
+    algorithm: Required[object]
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Required[Literal["raw", "pkcs8", "spki", "jwk"]]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["secret_key"]]
+    """The kind of resource that the binding provides."""
+
+    usages: Required[
+        List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    ]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+    key_base64: str
+    """Base64-encoded key data. Required if `format` is "raw", "pkcs8", or "spki"."""
+
+    key_jwk: object
+    """
+    Key data in
+    [JSON Web Key](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#json_web_key)
+    format. Required if `format` is "jwk".
+    """
+
+
+class BindingWorkersBindingKindWorkflow(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["workflow"]]
+    """The kind of resource that the binding provides."""
+
+    workflow_name: Required[str]
+    """Name of the Workflow to bind to."""
+
+    class_name: str
+    """Class name of the Workflow.
+
+    Should only be provided if the Workflow belongs to this script.
+    """
+
+    script_name: str
+    """Script name that contains the Workflow.
+
+    If not provided, defaults to this script name.
+    """
+
+
+class BindingWorkersBindingKindWasmModule(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    part: Required[str]
+    """The name of the file containing the WebAssembly module content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Required[Literal["wasm_module"]]
+    """The kind of resource that the binding provides."""
+
+
+Binding: TypeAlias = Union[
+    BindingWorkersBindingKindAI,
+    BindingWorkersBindingKindAnalyticsEngine,
+    BindingWorkersBindingKindAssets,
+    BindingWorkersBindingKindBrowser,
+    BindingWorkersBindingKindD1,
+    BindingWorkersBindingKindDataBlob,
+    BindingWorkersBindingKindDispatchNamespace,
+    BindingWorkersBindingKindDurableObjectNamespace,
+    BindingWorkersBindingKindHyperdrive,
+    BindingWorkersBindingKindInherit,
+    BindingWorkersBindingKindImages,
+    BindingWorkersBindingKindJson,
+    BindingWorkersBindingKindKVNamespace,
+    BindingWorkersBindingKindMTLSCertificate,
+    BindingWorkersBindingKindPlainText,
+    BindingWorkersBindingKindPipelines,
+    BindingWorkersBindingKindQueue,
+    BindingWorkersBindingKindRatelimit,
+    BindingWorkersBindingKindR2Bucket,
+    BindingWorkersBindingKindSecretText,
+    BindingWorkersBindingKindSendEmail,
+    BindingWorkersBindingKindService,
+    BindingWorkersBindingKindTextBlob,
+    BindingWorkersBindingKindVectorize,
+    BindingWorkersBindingKindVersionMetadata,
+    BindingWorkersBindingKindSecretsStoreSecret,
+    BindingWorkersBindingKindSecretKey,
+    BindingWorkersBindingKindWorkflow,
+    BindingWorkersBindingKindWasmModule,
+]
+
+
+class Limits(TypedDict, total=False):
+    """Resource limits enforced at runtime."""
+
+    cpu_ms: Required[int]
+    """CPU time limit in milliseconds."""
+
+
+class MigrationsWorkersMultipleStepMigrations(TypedDict, total=False):
+    new_tag: str
+    """Tag to set as the latest migration tag."""
+
+    old_tag: str
+    """Tag used to verify against the latest migration tag for this Worker.
+
+    If they don't match, the upload is rejected.
+    """
+
+    steps: Iterable[MigrationStepParam]
+    """Migrations to apply in order."""
+
+
+Migrations: TypeAlias = Union[SingleStepMigrationParam, MigrationsWorkersMultipleStepMigrations]
+
+
+class Module(TypedDict, total=False):
+    content_base64: Required[Annotated[Union[str, Base64FileInput], PropertyInfo(format="base64")]]
+    """The base64-encoded module content."""
+
+    content_type: Required[str]
+    """The content type of the module."""
+
+    name: Required[str]
+    """The name of the module."""
+
+
+set_pydantic_config(Module, {"arbitrary_types_allowed": True})
+
+
+class PlacementMode(TypedDict, total=False):
+    mode: Required[Literal["smart"]]
+    """
+    Enables
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementRegion(TypedDict, total=False):
+    region: Required[str]
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class PlacementHostname(TypedDict, total=False):
+    hostname: Required[str]
+    """HTTP hostname for targeted placement."""
+
+
+class PlacementHost(TypedDict, total=False):
+    host: Required[str]
+    """TCP host and port for targeted placement."""
+
+
+class PlacementUnionMember4(TypedDict, total=False):
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+    region: Required[str]
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class PlacementUnionMember5(TypedDict, total=False):
+    hostname: Required[str]
+    """HTTP hostname for targeted placement."""
+
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+
+class PlacementUnionMember6(TypedDict, total=False):
+    host: Required[str]
+    """TCP host and port for targeted placement."""
+
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+
+class PlacementUnionMember7TargetRegion(TypedDict, total=False):
+    region: Required[str]
+    """Cloud region in format 'provider:region'."""
+
+
+class PlacementUnionMember7TargetHostname(TypedDict, total=False):
+    hostname: Required[str]
+    """HTTP hostname for targeted placement."""
+
+
+class PlacementUnionMember7TargetHost(TypedDict, total=False):
+    host: Required[str]
+    """TCP host:port for targeted placement."""
+
+
+PlacementUnionMember7Target: TypeAlias = Union[
+    PlacementUnionMember7TargetRegion, PlacementUnionMember7TargetHostname, PlacementUnionMember7TargetHost
+]
+
+
+class PlacementUnionMember7(TypedDict, total=False):
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+    target: Required[Iterable[PlacementUnionMember7Target]]
+    """Array of placement targets (currently limited to single target)."""
+
+
+Placement: TypeAlias = Union[
+    PlacementMode,
+    PlacementRegion,
+    PlacementHostname,
+    PlacementHost,
+    PlacementUnionMember4,
+    PlacementUnionMember5,
+    PlacementUnionMember6,
+    PlacementUnionMember7,
+]
diff --git a/src/cloudflare/types/workers/beta/workers/version_delete_response.py b/src/cloudflare/types/workers/beta/workers/version_delete_response.py
new file mode 100644
index 00000000000..56345d51ae1
--- /dev/null
+++ b/src/cloudflare/types/workers/beta/workers/version_delete_response.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ....._models import BaseModel
+
+__all__ = ["VersionDeleteResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class VersionDeleteResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/workers/beta/workers/version_get_params.py b/src/cloudflare/types/workers/beta/workers/version_get_params.py
new file mode 100644
index 00000000000..e2030664541
--- /dev/null
+++ b/src/cloudflare/types/workers/beta/workers/version_get_params.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["VersionGetParams"]
+
+
+class VersionGetParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    worker_id: Required[str]
+    """Identifier for the Worker, which can be ID or name."""
+
+    include: Literal["modules"]
+    """
+    Whether to include the `modules` property of the version in the response, which
+    contains code and sourcemap content and may add several megabytes to the
+    response size.
+    """
diff --git a/src/cloudflare/types/workers/beta/workers/version_list_params.py b/src/cloudflare/types/workers/beta/workers/version_list_params.py
new file mode 100644
index 00000000000..d891cd5e824
--- /dev/null
+++ b/src/cloudflare/types/workers/beta/workers/version_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["VersionListParams"]
+
+
+class VersionListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    page: int
+    """Current page."""
+
+    per_page: int
+    """Items per-page."""
diff --git a/src/cloudflare/types/workers/binding.py b/src/cloudflare/types/workers/binding.py
deleted file mode 100644
index e2bf21c1be4..00000000000
--- a/src/cloudflare/types/workers/binding.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-from .d1_binding import D1Binding
-from .r2_binding import R2Binding
-from .service_binding import ServiceBinding
-from .mtls_cert_binding import MTLSCERTBinding
-from .kv_namespace_binding import KVNamespaceBinding
-from .durable_object_binding import DurableObjectBinding
-from .dispatch_namespace_binding import DispatchNamespaceBinding
-
-__all__ = ["Binding", "WorkersQueueBinding"]
-
-
-class WorkersQueueBinding(BaseModel):
-    name: str
-    """A JavaScript variable name for the binding."""
-
-    queue_name: str
-    """Name of the Queue to bind to"""
-
-    type: Literal["queue"]
-    """The class of resource that the binding provides."""
-
-
-Binding = Union[
-    KVNamespaceBinding,
-    ServiceBinding,
-    DurableObjectBinding,
-    R2Binding,
-    WorkersQueueBinding,
-    D1Binding,
-    DispatchNamespaceBinding,
-    MTLSCERTBinding,
-]
diff --git a/src/cloudflare/types/workers/binding_param.py b/src/cloudflare/types/workers/binding_param.py
deleted file mode 100644
index 478be46927b..00000000000
--- a/src/cloudflare/types/workers/binding_param.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Union
-from typing_extensions import Literal, Required, TypedDict
-
-from .d1_binding_param import D1BindingParam
-from .r2_binding_param import R2BindingParam
-from .service_binding_param import ServiceBindingParam
-from .mtls_cert_binding_param import MTLSCERTBindingParam
-from .kv_namespace_binding_param import KVNamespaceBindingParam
-from .durable_object_binding_param import DurableObjectBindingParam
-from .dispatch_namespace_binding_param import DispatchNamespaceBindingParam
-
-__all__ = ["BindingParam", "WorkersQueueBinding"]
-
-
-class WorkersQueueBinding(TypedDict, total=False):
-    queue_name: Required[str]
-    """Name of the Queue to bind to"""
-
-    type: Required[Literal["queue"]]
-    """The class of resource that the binding provides."""
-
-
-BindingParam = Union[
-    KVNamespaceBindingParam,
-    ServiceBindingParam,
-    DurableObjectBindingParam,
-    R2BindingParam,
-    WorkersQueueBinding,
-    D1BindingParam,
-    DispatchNamespaceBindingParam,
-    MTLSCERTBindingParam,
-]
diff --git a/src/cloudflare/types/workers/d1_binding.py b/src/cloudflare/types/workers/d1_binding.py
deleted file mode 100644
index 7010fcfa068..00000000000
--- a/src/cloudflare/types/workers/d1_binding.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = ["D1Binding"]
-
-
-class D1Binding(BaseModel):
-    id: str
-    """ID of the D1 database to bind to"""
-
-    binding: str
-    """A JavaScript variable name for the binding."""
-
-    name: str
-    """The name of the D1 database associated with the 'id' provided."""
-
-    type: Literal["d1"]
-    """The class of resource that the binding provides."""
diff --git a/src/cloudflare/types/workers/d1_binding_param.py b/src/cloudflare/types/workers/d1_binding_param.py
deleted file mode 100644
index 74face1628f..00000000000
--- a/src/cloudflare/types/workers/d1_binding_param.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, Required, TypedDict
-
-__all__ = ["D1BindingParam"]
-
-
-class D1BindingParam(TypedDict, total=False):
-    id: Required[str]
-    """ID of the D1 database to bind to"""
-
-    name: Required[str]
-    """The name of the D1 database associated with the 'id' provided."""
-
-    type: Required[Literal["d1"]]
-    """The class of resource that the binding provides."""
diff --git a/src/cloudflare/types/workers/dispatch_namespace_binding.py b/src/cloudflare/types/workers/dispatch_namespace_binding.py
deleted file mode 100644
index 7211e0a0dbb..00000000000
--- a/src/cloudflare/types/workers/dispatch_namespace_binding.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = ["DispatchNamespaceBinding", "Outbound", "OutboundWorker"]
-
-
-class OutboundWorker(BaseModel):
-    environment: Optional[str] = None
-    """Environment of the outbound worker"""
-
-    service: Optional[str] = None
-    """Name of the outbound worker"""
-
-
-class Outbound(BaseModel):
-    params: Optional[List[str]] = None
-    """
-    Pass information from the Dispatch Worker to the Outbound Worker through the
-    parameters
-    """
-
-    worker: Optional[OutboundWorker] = None
-    """Outbound worker"""
-
-
-class DispatchNamespaceBinding(BaseModel):
-    name: str
-    """A JavaScript variable name for the binding."""
-
-    namespace: str
-    """Namespace to bind to"""
-
-    type: Literal["dispatch_namespace"]
-    """The class of resource that the binding provides."""
-
-    outbound: Optional[Outbound] = None
-    """Outbound worker"""
diff --git a/src/cloudflare/types/workers/dispatch_namespace_binding_param.py b/src/cloudflare/types/workers/dispatch_namespace_binding_param.py
deleted file mode 100644
index 584c5d86e15..00000000000
--- a/src/cloudflare/types/workers/dispatch_namespace_binding_param.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List
-from typing_extensions import Literal, Required, TypedDict
-
-__all__ = ["DispatchNamespaceBindingParam", "Outbound", "OutboundWorker"]
-
-
-class OutboundWorker(TypedDict, total=False):
-    environment: str
-    """Environment of the outbound worker"""
-
-    service: str
-    """Name of the outbound worker"""
-
-
-class Outbound(TypedDict, total=False):
-    params: List[str]
-    """
-    Pass information from the Dispatch Worker to the Outbound Worker through the
-    parameters
-    """
-
-    worker: OutboundWorker
-    """Outbound worker"""
-
-
-class DispatchNamespaceBindingParam(TypedDict, total=False):
-    namespace: Required[str]
-    """Namespace to bind to"""
-
-    type: Required[Literal["dispatch_namespace"]]
-    """The class of resource that the binding provides."""
-
-    outbound: Outbound
-    """Outbound worker"""
diff --git a/src/cloudflare/types/workers/domain_list_params.py b/src/cloudflare/types/workers/domain_list_params.py
index 19231707825..651db09c1d1 100644
--- a/src/cloudflare/types/workers/domain_list_params.py
+++ b/src/cloudflare/types/workers/domain_list_params.py
@@ -9,6 +9,7 @@
 
 class DomainListParams(TypedDict, total=False):
     account_id: Required[str]
+    """Identifer of the account."""
 
     environment: str
     """Worker environment associated with the zone and hostname."""
diff --git a/src/cloudflare/types/workers/domain_update_params.py b/src/cloudflare/types/workers/domain_update_params.py
index 697c2d8db1e..14a5a7aa1a2 100644
--- a/src/cloudflare/types/workers/domain_update_params.py
+++ b/src/cloudflare/types/workers/domain_update_params.py
@@ -9,9 +9,7 @@
 
 class DomainUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-
-    environment: Required[str]
-    """Worker environment associated with the zone and hostname."""
+    """Identifer of the account."""
 
     hostname: Required[str]
     """Hostname of the Worker Domain."""
@@ -21,3 +19,6 @@ class DomainUpdateParams(TypedDict, total=False):
 
     zone_id: Required[str]
     """Identifier of the zone."""
+
+    environment: str
+    """Worker environment associated with the zone and hostname."""
diff --git a/src/cloudflare/types/workers/durable_object_binding.py b/src/cloudflare/types/workers/durable_object_binding.py
deleted file mode 100644
index acef5a67aae..00000000000
--- a/src/cloudflare/types/workers/durable_object_binding.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = ["DurableObjectBinding"]
-
-
-class DurableObjectBinding(BaseModel):
-    class_name: str
-    """The exported class name of the Durable Object"""
-
-    name: str
-    """A JavaScript variable name for the binding."""
-
-    type: Literal["durable_object_namespace"]
-    """The class of resource that the binding provides."""
-
-    environment: Optional[str] = None
-    """The environment of the script_name to bind to"""
-
-    namespace_id: Optional[str] = None
-    """Namespace identifier tag."""
-
-    script_name: Optional[str] = None
-    """
-    The script where the Durable Object is defined, if it is external to this Worker
-    """
diff --git a/src/cloudflare/types/workers/durable_object_binding_param.py b/src/cloudflare/types/workers/durable_object_binding_param.py
deleted file mode 100644
index 6c00bbd63a9..00000000000
--- a/src/cloudflare/types/workers/durable_object_binding_param.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, Required, TypedDict
-
-__all__ = ["DurableObjectBindingParam"]
-
-
-class DurableObjectBindingParam(TypedDict, total=False):
-    class_name: Required[str]
-    """The exported class name of the Durable Object"""
-
-    type: Required[Literal["durable_object_namespace"]]
-    """The class of resource that the binding provides."""
-
-    environment: str
-    """The environment of the script_name to bind to"""
-
-    script_name: str
-    """
-    The script where the Durable Object is defined, if it is external to this Worker
-    """
diff --git a/src/cloudflare/types/workers/kv_namespace_binding.py b/src/cloudflare/types/workers/kv_namespace_binding.py
deleted file mode 100644
index bf28ce9caac..00000000000
--- a/src/cloudflare/types/workers/kv_namespace_binding.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = ["KVNamespaceBinding"]
-
-
-class KVNamespaceBinding(BaseModel):
-    name: str
-    """A JavaScript variable name for the binding."""
-
-    namespace_id: str
-    """Namespace identifier tag."""
-
-    type: Literal["kv_namespace"]
-    """The class of resource that the binding provides."""
diff --git a/src/cloudflare/types/workers/kv_namespace_binding_param.py b/src/cloudflare/types/workers/kv_namespace_binding_param.py
deleted file mode 100644
index 7dc97bab2a6..00000000000
--- a/src/cloudflare/types/workers/kv_namespace_binding_param.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, Required, TypedDict
-
-__all__ = ["KVNamespaceBindingParam"]
-
-
-class KVNamespaceBindingParam(TypedDict, total=False):
-    type: Required[Literal["kv_namespace"]]
-    """The class of resource that the binding provides."""
diff --git a/src/cloudflare/types/workers/migration_step.py b/src/cloudflare/types/workers/migration_step.py
index c345d2027b6..c2c0bbdc905 100644
--- a/src/cloudflare/types/workers/migration_step.py
+++ b/src/cloudflare/types/workers/migration_step.py
@@ -1,40 +1,17 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
-
-from pydantic import Field as FieldInfo
-
 from ..._models import BaseModel
 
 __all__ = ["MigrationStep", "RenamedClass", "TransferredClass"]
 
 
 class RenamedClass(BaseModel):
-    from_: Optional[str] = FieldInfo(alias="from", default=None)
-
-    to: Optional[str] = None
+    pass
 
 
 class TransferredClass(BaseModel):
-    from_: Optional[str] = FieldInfo(alias="from", default=None)
-
-    from_script: Optional[str] = None
-
-    to: Optional[str] = None
+    pass
 
 
 class MigrationStep(BaseModel):
-    deleted_classes: Optional[List[str]] = None
-    """A list of classes to delete Durable Object namespaces from."""
-
-    new_classes: Optional[List[str]] = None
-    """A list of classes to create Durable Object namespaces from."""
-
-    renamed_classes: Optional[List[RenamedClass]] = None
-    """A list of classes with Durable Object namespaces that were renamed."""
-
-    transferred_classes: Optional[List[TransferredClass]] = None
-    """
-    A list of transfers for Durable Object namespaces from a different Worker and
-    class to a class defined in this Worker.
-    """
+    pass
diff --git a/src/cloudflare/types/workers/migration_step_param.py b/src/cloudflare/types/workers/migration_step_param.py
index 87c80f048fc..828ae33f79b 100644
--- a/src/cloudflare/types/workers/migration_step_param.py
+++ b/src/cloudflare/types/workers/migration_step_param.py
@@ -2,9 +2,11 @@
 
 from __future__ import annotations
 
-from typing import List, Iterable
+from typing import Iterable
 from typing_extensions import TypedDict
 
+from ..._types import SequenceNotStr
+
 __all__ = ["MigrationStepParam", "RenamedClass", "TransferredClass"]
 
 _RenamedClassReservedKeywords = TypedDict(
@@ -36,12 +38,15 @@ class TransferredClass(_TransferredClassReservedKeywords, total=False):
 
 
 class MigrationStepParam(TypedDict, total=False):
-    deleted_classes: List[str]
+    deleted_classes: SequenceNotStr[str]
     """A list of classes to delete Durable Object namespaces from."""
 
-    new_classes: List[str]
+    new_classes: SequenceNotStr[str]
     """A list of classes to create Durable Object namespaces from."""
 
+    new_sqlite_classes: SequenceNotStr[str]
+    """A list of classes to create Durable Object namespaces with SQLite from."""
+
     renamed_classes: Iterable[RenamedClass]
     """A list of classes with Durable Object namespaces that were renamed."""
 
diff --git a/src/cloudflare/types/workers/mtls_cert_binding.py b/src/cloudflare/types/workers/mtls_cert_binding.py
deleted file mode 100644
index cdc8618cefb..00000000000
--- a/src/cloudflare/types/workers/mtls_cert_binding.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = ["MTLSCERTBinding"]
-
-
-class MTLSCERTBinding(BaseModel):
-    name: str
-    """A JavaScript variable name for the binding."""
-
-    type: Literal["mtls_certificate"]
-    """The class of resource that the binding provides."""
-
-    certificate_id: Optional[str] = None
-    """ID of the certificate to bind to"""
diff --git a/src/cloudflare/types/workers/mtls_cert_binding_param.py b/src/cloudflare/types/workers/mtls_cert_binding_param.py
deleted file mode 100644
index 945050492c8..00000000000
--- a/src/cloudflare/types/workers/mtls_cert_binding_param.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, Required, TypedDict
-
-__all__ = ["MTLSCERTBindingParam"]
-
-
-class MTLSCERTBindingParam(TypedDict, total=False):
-    type: Required[Literal["mtls_certificate"]]
-    """The class of resource that the binding provides."""
-
-    certificate_id: str
-    """ID of the certificate to bind to"""
diff --git a/src/cloudflare/types/workers/observability/__init__.py b/src/cloudflare/types/workers/observability/__init__.py
new file mode 100644
index 00000000000..0aaa1d0adea
--- /dev/null
+++ b/src/cloudflare/types/workers/observability/__init__.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .telemetry_keys_params import TelemetryKeysParams as TelemetryKeysParams
+from .telemetry_query_params import TelemetryQueryParams as TelemetryQueryParams
+from .telemetry_keys_response import TelemetryKeysResponse as TelemetryKeysResponse
+from .telemetry_values_params import TelemetryValuesParams as TelemetryValuesParams
+from .telemetry_query_response import TelemetryQueryResponse as TelemetryQueryResponse
+from .telemetry_values_response import TelemetryValuesResponse as TelemetryValuesResponse
diff --git a/src/cloudflare/types/workers/observability/telemetry_keys_params.py b/src/cloudflare/types/workers/observability/telemetry_keys_params.py
new file mode 100644
index 00000000000..df515b7c392
--- /dev/null
+++ b/src/cloudflare/types/workers/observability/telemetry_keys_params.py
@@ -0,0 +1,92 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TelemetryKeysParams", "Filter", "KeyNeedle", "Needle"]
+
+
+class TelemetryKeysParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    datasets: SequenceNotStr[str]
+
+    filters: Iterable[Filter]
+
+    from_: Annotated[float, PropertyInfo(alias="from")]
+
+    key_needle: Annotated[KeyNeedle, PropertyInfo(alias="keyNeedle")]
+    """Search for a specific substring in the keys."""
+
+    limit: float
+
+    needle: Needle
+    """Search for a specific substring in any of the events"""
+
+    to: float
+
+
+class Filter(TypedDict, total=False):
+    key: Required[str]
+
+    operation: Required[
+        Literal[
+            "includes",
+            "not_includes",
+            "starts_with",
+            "regex",
+            "exists",
+            "is_null",
+            "in",
+            "not_in",
+            "eq",
+            "neq",
+            "gt",
+            "gte",
+            "lt",
+            "lte",
+            "=",
+            "!=",
+            ">",
+            ">=",
+            "<",
+            "<=",
+            "INCLUDES",
+            "DOES_NOT_INCLUDE",
+            "MATCH_REGEX",
+            "EXISTS",
+            "DOES_NOT_EXIST",
+            "IN",
+            "NOT_IN",
+            "STARTS_WITH",
+        ]
+    ]
+
+    type: Required[Literal["string", "number", "boolean"]]
+
+    value: Union[str, float, bool]
+
+
+class KeyNeedle(TypedDict, total=False):
+    """Search for a specific substring in the keys."""
+
+    value: Required[Union[str, float, bool]]
+
+    is_regex: Annotated[bool, PropertyInfo(alias="isRegex")]
+
+    match_case: Annotated[bool, PropertyInfo(alias="matchCase")]
+
+
+class Needle(TypedDict, total=False):
+    """Search for a specific substring in any of the events"""
+
+    value: Required[Union[str, float, bool]]
+
+    is_regex: Annotated[bool, PropertyInfo(alias="isRegex")]
+
+    match_case: Annotated[bool, PropertyInfo(alias="matchCase")]
diff --git a/src/cloudflare/types/workers/observability/telemetry_keys_response.py b/src/cloudflare/types/workers/observability/telemetry_keys_response.py
new file mode 100644
index 00000000000..ebe8e775743
--- /dev/null
+++ b/src/cloudflare/types/workers/observability/telemetry_keys_response.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["TelemetryKeysResponse"]
+
+
+class TelemetryKeysResponse(BaseModel):
+    key: str
+
+    last_seen_at: float = FieldInfo(alias="lastSeenAt")
+
+    type: Literal["string", "boolean", "number"]
diff --git a/src/cloudflare/types/workers/observability/telemetry_query_params.py b/src/cloudflare/types/workers/observability/telemetry_query_params.py
new file mode 100644
index 00000000000..7b81dadee5e
--- /dev/null
+++ b/src/cloudflare/types/workers/observability/telemetry_query_params.py
@@ -0,0 +1,249 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = [
+    "TelemetryQueryParams",
+    "Timeframe",
+    "Parameters",
+    "ParametersCalculation",
+    "ParametersFilter",
+    "ParametersGroupBy",
+    "ParametersHaving",
+    "ParametersNeedle",
+    "ParametersOrderBy",
+]
+
+
+class TelemetryQueryParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    query_id: Required[Annotated[str, PropertyInfo(alias="queryId")]]
+    """Unique identifier for the query to execute"""
+
+    timeframe: Required[Timeframe]
+    """Time range for the query execution"""
+
+    chart: bool
+    """Whether to include timeseties data in the response"""
+
+    compare: bool
+    """Whether to include comparison data with previous time periods"""
+
+    dry: bool
+    """Whether to perform a dry run without saving the results of the query.
+
+    Useful for validation
+    """
+
+    granularity: float
+    """Time granularity for aggregating results (in milliseconds).
+
+    Controls the bucketing of time-series data
+    """
+
+    ignore_series: Annotated[bool, PropertyInfo(alias="ignoreSeries")]
+    """
+    Whether to ignore time-series data in the results and return only aggregated
+    values
+    """
+
+    limit: float
+    """Maximum number of events to return."""
+
+    offset: str
+    """Cursor for pagination to retrieve the next set of results"""
+
+    offset_by: Annotated[float, PropertyInfo(alias="offsetBy")]
+    """Number of events to skip for pagination. Used in conjunction with offset"""
+
+    offset_direction: Annotated[str, PropertyInfo(alias="offsetDirection")]
+    """Direction for offset-based pagination (e.g., 'next', 'prev')"""
+
+    parameters: Parameters
+    """Optional parameters to pass to the query execution"""
+
+    pattern_type: Annotated[Literal["message", "error"], PropertyInfo(alias="patternType")]
+    """Type of pattern to search for when using pattern-based views"""
+
+    view: Literal["traces", "events", "calculations", "invocations", "requests", "patterns"]
+    """View type for presenting the query results."""
+
+
+_TimeframeReservedKeywords = TypedDict(
+    "_TimeframeReservedKeywords",
+    {
+        "from": float,
+    },
+    total=False,
+)
+
+
+class Timeframe(_TimeframeReservedKeywords, total=False):
+    """Time range for the query execution"""
+
+    to: Required[float]
+    """End timestamp for the query timeframe (Unix timestamp in milliseconds)"""
+
+
+class ParametersCalculation(TypedDict, total=False):
+    operator: Required[
+        Literal[
+            "uniq",
+            "count",
+            "max",
+            "min",
+            "sum",
+            "avg",
+            "median",
+            "p001",
+            "p01",
+            "p05",
+            "p10",
+            "p25",
+            "p75",
+            "p90",
+            "p95",
+            "p99",
+            "p999",
+            "stddev",
+            "variance",
+            "COUNT_DISTINCT",
+            "COUNT",
+            "MAX",
+            "MIN",
+            "SUM",
+            "AVG",
+            "MEDIAN",
+            "P001",
+            "P01",
+            "P05",
+            "P10",
+            "P25",
+            "P75",
+            "P90",
+            "P95",
+            "P99",
+            "P999",
+            "STDDEV",
+            "VARIANCE",
+        ]
+    ]
+
+    alias: str
+
+    key: str
+
+    key_type: Annotated[Literal["string", "number", "boolean"], PropertyInfo(alias="keyType")]
+
+
+class ParametersFilter(TypedDict, total=False):
+    key: Required[str]
+
+    operation: Required[
+        Literal[
+            "includes",
+            "not_includes",
+            "starts_with",
+            "regex",
+            "exists",
+            "is_null",
+            "in",
+            "not_in",
+            "eq",
+            "neq",
+            "gt",
+            "gte",
+            "lt",
+            "lte",
+            "=",
+            "!=",
+            ">",
+            ">=",
+            "<",
+            "<=",
+            "INCLUDES",
+            "DOES_NOT_INCLUDE",
+            "MATCH_REGEX",
+            "EXISTS",
+            "DOES_NOT_EXIST",
+            "IN",
+            "NOT_IN",
+            "STARTS_WITH",
+        ]
+    ]
+
+    type: Required[Literal["string", "number", "boolean"]]
+
+    value: Union[str, float, bool]
+
+
+class ParametersGroupBy(TypedDict, total=False):
+    type: Required[Literal["string", "number", "boolean"]]
+
+    value: Required[str]
+
+
+class ParametersHaving(TypedDict, total=False):
+    key: Required[str]
+
+    operation: Required[Literal["eq", "neq", "gt", "gte", "lt", "lte"]]
+
+    value: Required[float]
+
+
+class ParametersNeedle(TypedDict, total=False):
+    """Define an expression to search using full-text search."""
+
+    value: Required[Union[str, float, bool]]
+
+    is_regex: Annotated[bool, PropertyInfo(alias="isRegex")]
+
+    match_case: Annotated[bool, PropertyInfo(alias="matchCase")]
+
+
+class ParametersOrderBy(TypedDict, total=False):
+    """Configure the order of the results returned by the query."""
+
+    value: Required[str]
+    """Configure which Calculation to order the results by."""
+
+    order: Literal["asc", "desc"]
+    """Set the order of the results"""
+
+
+class Parameters(TypedDict, total=False):
+    """Optional parameters to pass to the query execution"""
+
+    calculations: Iterable[ParametersCalculation]
+    """Create Calculations to compute as part of the query."""
+
+    datasets: SequenceNotStr[str]
+    """Set the Datasets to query. Leave it empty to query all the datasets."""
+
+    filter_combination: Annotated[Literal["and", "or", "AND", "OR"], PropertyInfo(alias="filterCombination")]
+    """Set a Flag to describe how to combine the filters on the query."""
+
+    filters: Iterable[ParametersFilter]
+    """Configure the Filters to apply to the query."""
+
+    group_bys: Annotated[Iterable[ParametersGroupBy], PropertyInfo(alias="groupBys")]
+    """Define how to group the results of the query."""
+
+    havings: Iterable[ParametersHaving]
+    """Configure the Having clauses that filter on calculations in the query result."""
+
+    limit: int
+    """Set a limit on the number of results / records returned by the query"""
+
+    needle: ParametersNeedle
+    """Define an expression to search using full-text search."""
+
+    order_by: Annotated[ParametersOrderBy, PropertyInfo(alias="orderBy")]
+    """Configure the order of the results returned by the query."""
diff --git a/src/cloudflare/types/workers/observability/telemetry_query_response.py b/src/cloudflare/types/workers/observability/telemetry_query_response.py
new file mode 100644
index 00000000000..6b147257fd0
--- /dev/null
+++ b/src/cloudflare/types/workers/observability/telemetry_query_response.py
@@ -0,0 +1,931 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "TelemetryQueryResponse",
+    "Run",
+    "RunQuery",
+    "RunQueryParameters",
+    "RunQueryParametersCalculation",
+    "RunQueryParametersFilter",
+    "RunQueryParametersGroupBy",
+    "RunQueryParametersHaving",
+    "RunQueryParametersNeedle",
+    "RunQueryParametersOrderBy",
+    "RunTimeframe",
+    "RunStatistics",
+    "Statistics",
+    "Calculation",
+    "CalculationAggregate",
+    "CalculationAggregateGroup",
+    "CalculationSeries",
+    "CalculationSeriesData",
+    "CalculationSeriesDataGroup",
+    "Compare",
+    "CompareAggregate",
+    "CompareAggregateGroup",
+    "CompareSeries",
+    "CompareSeriesData",
+    "CompareSeriesDataGroup",
+    "Events",
+    "EventsEvent",
+    "EventsEventMetadata",
+    "EventsEventWorkers",
+    "EventsEventWorkersUnionMember0",
+    "EventsEventWorkersUnionMember0ScriptVersion",
+    "EventsEventWorkersUnionMember1",
+    "EventsEventWorkersUnionMember1DiagnosticsChannelEvent",
+    "EventsEventWorkersUnionMember1ScriptVersion",
+    "EventsField",
+    "EventsSeries",
+    "EventsSeriesData",
+    "EventsSeriesDataAggregates",
+    "Invocation",
+    "InvocationMetadata",
+    "InvocationWorkers",
+    "InvocationWorkersUnionMember0",
+    "InvocationWorkersUnionMember0ScriptVersion",
+    "InvocationWorkersUnionMember1",
+    "InvocationWorkersUnionMember1DiagnosticsChannelEvent",
+    "InvocationWorkersUnionMember1ScriptVersion",
+    "Pattern",
+    "PatternSeries",
+    "PatternSeriesData",
+    "PatternSeriesDataGroup",
+    "Trace",
+]
+
+
+class RunQueryParametersCalculation(BaseModel):
+    operator: Literal[
+        "uniq",
+        "count",
+        "max",
+        "min",
+        "sum",
+        "avg",
+        "median",
+        "p001",
+        "p01",
+        "p05",
+        "p10",
+        "p25",
+        "p75",
+        "p90",
+        "p95",
+        "p99",
+        "p999",
+        "stddev",
+        "variance",
+        "COUNT_DISTINCT",
+        "COUNT",
+        "MAX",
+        "MIN",
+        "SUM",
+        "AVG",
+        "MEDIAN",
+        "P001",
+        "P01",
+        "P05",
+        "P10",
+        "P25",
+        "P75",
+        "P90",
+        "P95",
+        "P99",
+        "P999",
+        "STDDEV",
+        "VARIANCE",
+    ]
+
+    alias: Optional[str] = None
+
+    key: Optional[str] = None
+
+    key_type: Optional[Literal["string", "number", "boolean"]] = FieldInfo(alias="keyType", default=None)
+
+
+class RunQueryParametersFilter(BaseModel):
+    key: str
+
+    operation: Literal[
+        "includes",
+        "not_includes",
+        "starts_with",
+        "regex",
+        "exists",
+        "is_null",
+        "in",
+        "not_in",
+        "eq",
+        "neq",
+        "gt",
+        "gte",
+        "lt",
+        "lte",
+        "=",
+        "!=",
+        ">",
+        ">=",
+        "<",
+        "<=",
+        "INCLUDES",
+        "DOES_NOT_INCLUDE",
+        "MATCH_REGEX",
+        "EXISTS",
+        "DOES_NOT_EXIST",
+        "IN",
+        "NOT_IN",
+        "STARTS_WITH",
+    ]
+
+    type: Literal["string", "number", "boolean"]
+
+    value: Union[str, float, bool, None] = None
+
+
+class RunQueryParametersGroupBy(BaseModel):
+    type: Literal["string", "number", "boolean"]
+
+    value: str
+
+
+class RunQueryParametersHaving(BaseModel):
+    key: str
+
+    operation: Literal["eq", "neq", "gt", "gte", "lt", "lte"]
+
+    value: float
+
+
+class RunQueryParametersNeedle(BaseModel):
+    """Define an expression to search using full-text search."""
+
+    value: Union[str, float, bool]
+
+    is_regex: Optional[bool] = FieldInfo(alias="isRegex", default=None)
+
+    match_case: Optional[bool] = FieldInfo(alias="matchCase", default=None)
+
+
+class RunQueryParametersOrderBy(BaseModel):
+    """Configure the order of the results returned by the query."""
+
+    value: str
+    """Configure which Calculation to order the results by."""
+
+    order: Optional[Literal["asc", "desc"]] = None
+    """Set the order of the results"""
+
+
+class RunQueryParameters(BaseModel):
+    calculations: Optional[List[RunQueryParametersCalculation]] = None
+    """Create Calculations to compute as part of the query."""
+
+    datasets: Optional[List[str]] = None
+    """Set the Datasets to query. Leave it empty to query all the datasets."""
+
+    filter_combination: Optional[Literal["and", "or", "AND", "OR"]] = FieldInfo(alias="filterCombination", default=None)
+    """Set a Flag to describe how to combine the filters on the query."""
+
+    filters: Optional[List[RunQueryParametersFilter]] = None
+    """Configure the Filters to apply to the query."""
+
+    group_bys: Optional[List[RunQueryParametersGroupBy]] = FieldInfo(alias="groupBys", default=None)
+    """Define how to group the results of the query."""
+
+    havings: Optional[List[RunQueryParametersHaving]] = None
+    """Configure the Having clauses that filter on calculations in the query result."""
+
+    limit: Optional[int] = None
+    """Set a limit on the number of results / records returned by the query"""
+
+    needle: Optional[RunQueryParametersNeedle] = None
+    """Define an expression to search using full-text search."""
+
+    order_by: Optional[RunQueryParametersOrderBy] = FieldInfo(alias="orderBy", default=None)
+    """Configure the order of the results returned by the query."""
+
+
+class RunQuery(BaseModel):
+    id: str
+    """ID of the query"""
+
+    created: str
+
+    description: Optional[str] = None
+
+    environment_id: str = FieldInfo(alias="environmentId")
+    """ID of your environment"""
+
+    generated: Optional[bool] = None
+    """Flag for alerts automatically created"""
+
+    name: Optional[str] = None
+    """Query name"""
+
+    parameters: RunQueryParameters
+
+    updated: str
+
+    user_id: str = FieldInfo(alias="userId")
+
+    workspace_id: str = FieldInfo(alias="workspaceId")
+    """ID of your workspace"""
+
+
+class RunTimeframe(BaseModel):
+    """Time range for the query execution"""
+
+    from_: float = FieldInfo(alias="from")
+    """Start timestamp for the query timeframe (Unix timestamp in milliseconds)"""
+
+    to: float
+    """End timestamp for the query timeframe (Unix timestamp in milliseconds)"""
+
+
+class RunStatistics(BaseModel):
+    bytes_read: float
+    """Number of uncompressed bytes read from the table."""
+
+    elapsed: float
+    """Time in seconds for the query to run."""
+
+    rows_read: float
+    """Number of rows scanned from the table."""
+
+    abr_level: Optional[float] = None
+    """The level of Adaptive Bit Rate (ABR) sampling used for the query.
+
+    If empty the ABR level is 1
+    """
+
+
+class Run(BaseModel):
+    """A Workers Observability Query Object"""
+
+    id: str
+
+    account_id: str = FieldInfo(alias="accountId")
+
+    dry: bool
+
+    environment_id: str = FieldInfo(alias="environmentId")
+
+    granularity: float
+
+    query: RunQuery
+
+    status: Literal["STARTED", "COMPLETED"]
+
+    timeframe: RunTimeframe
+    """Time range for the query execution"""
+
+    user_id: str = FieldInfo(alias="userId")
+
+    workspace_id: str = FieldInfo(alias="workspaceId")
+
+    created: Optional[str] = None
+
+    statistics: Optional[RunStatistics] = None
+
+    updated: Optional[str] = None
+
+
+class Statistics(BaseModel):
+    """
+    The statistics object contains information about query performance from the database, it does not include any network latency
+    """
+
+    bytes_read: float
+    """Number of uncompressed bytes read from the table."""
+
+    elapsed: float
+    """Time in seconds for the query to run."""
+
+    rows_read: float
+    """Number of rows scanned from the table."""
+
+    abr_level: Optional[float] = None
+    """The level of Adaptive Bit Rate (ABR) sampling used for the query.
+
+    If empty the ABR level is 1
+    """
+
+
+class CalculationAggregateGroup(BaseModel):
+    key: str
+
+    value: Union[str, float, bool]
+
+
+class CalculationAggregate(BaseModel):
+    count: float
+
+    interval: float
+
+    sample_interval: float = FieldInfo(alias="sampleInterval")
+
+    value: float
+
+    groups: Optional[List[CalculationAggregateGroup]] = None
+
+
+class CalculationSeriesDataGroup(BaseModel):
+    key: str
+
+    value: Union[str, float, bool]
+
+
+class CalculationSeriesData(BaseModel):
+    count: float
+
+    first_seen: str = FieldInfo(alias="firstSeen")
+
+    interval: float
+
+    last_seen: str = FieldInfo(alias="lastSeen")
+
+    sample_interval: float = FieldInfo(alias="sampleInterval")
+
+    value: float
+
+    groups: Optional[List[CalculationSeriesDataGroup]] = None
+
+
+class CalculationSeries(BaseModel):
+    data: List[CalculationSeriesData]
+
+    time: str
+
+
+class Calculation(BaseModel):
+    aggregates: List[CalculationAggregate]
+
+    calculation: str
+
+    series: List[CalculationSeries]
+
+    alias: Optional[str] = None
+
+
+class CompareAggregateGroup(BaseModel):
+    key: str
+
+    value: Union[str, float, bool]
+
+
+class CompareAggregate(BaseModel):
+    count: float
+
+    interval: float
+
+    sample_interval: float = FieldInfo(alias="sampleInterval")
+
+    value: float
+
+    groups: Optional[List[CompareAggregateGroup]] = None
+
+
+class CompareSeriesDataGroup(BaseModel):
+    key: str
+
+    value: Union[str, float, bool]
+
+
+class CompareSeriesData(BaseModel):
+    count: float
+
+    first_seen: str = FieldInfo(alias="firstSeen")
+
+    interval: float
+
+    last_seen: str = FieldInfo(alias="lastSeen")
+
+    sample_interval: float = FieldInfo(alias="sampleInterval")
+
+    value: float
+
+    groups: Optional[List[CompareSeriesDataGroup]] = None
+
+
+class CompareSeries(BaseModel):
+    data: List[CompareSeriesData]
+
+    time: str
+
+
+class Compare(BaseModel):
+    aggregates: List[CompareAggregate]
+
+    calculation: str
+
+    series: List[CompareSeries]
+
+    alias: Optional[str] = None
+
+
+class EventsEventMetadata(BaseModel):
+    id: str
+
+    account: Optional[str] = None
+
+    cloud_service: Optional[str] = FieldInfo(alias="cloudService", default=None)
+
+    cold_start: Optional[int] = FieldInfo(alias="coldStart", default=None)
+
+    cost: Optional[int] = None
+
+    duration: Optional[int] = None
+
+    end_time: Optional[int] = FieldInfo(alias="endTime", default=None)
+
+    error: Optional[str] = None
+
+    error_template: Optional[str] = FieldInfo(alias="errorTemplate", default=None)
+
+    fingerprint: Optional[str] = None
+
+    level: Optional[str] = None
+
+    message: Optional[str] = None
+
+    message_template: Optional[str] = FieldInfo(alias="messageTemplate", default=None)
+
+    metric_name: Optional[str] = FieldInfo(alias="metricName", default=None)
+
+    origin: Optional[str] = None
+
+    parent_span_id: Optional[str] = FieldInfo(alias="parentSpanId", default=None)
+
+    provider: Optional[str] = None
+
+    region: Optional[str] = None
+
+    request_id: Optional[str] = FieldInfo(alias="requestId", default=None)
+
+    service: Optional[str] = None
+
+    span_id: Optional[str] = FieldInfo(alias="spanId", default=None)
+
+    span_name: Optional[str] = FieldInfo(alias="spanName", default=None)
+
+    stack_id: Optional[str] = FieldInfo(alias="stackId", default=None)
+
+    start_time: Optional[int] = FieldInfo(alias="startTime", default=None)
+
+    status_code: Optional[int] = FieldInfo(alias="statusCode", default=None)
+
+    trace_duration: Optional[int] = FieldInfo(alias="traceDuration", default=None)
+
+    trace_id: Optional[str] = FieldInfo(alias="traceId", default=None)
+
+    transaction_name: Optional[str] = FieldInfo(alias="transactionName", default=None)
+
+    trigger: Optional[str] = None
+
+    type: Optional[str] = None
+
+    url: Optional[str] = None
+
+
+class EventsEventWorkersUnionMember0ScriptVersion(BaseModel):
+    id: Optional[str] = None
+
+    message: Optional[str] = None
+
+    tag: Optional[str] = None
+
+
+class EventsEventWorkersUnionMember0(BaseModel):
+    event_type: Literal[
+        "fetch", "scheduled", "alarm", "cron", "queue", "email", "tail", "rpc", "websocket", "unknown"
+    ] = FieldInfo(alias="eventType")
+
+    request_id: str = FieldInfo(alias="requestId")
+
+    script_name: str = FieldInfo(alias="scriptName")
+
+    durable_object_id: Optional[str] = FieldInfo(alias="durableObjectId", default=None)
+
+    entrypoint: Optional[str] = None
+
+    event: Optional[
+        Dict[
+            str,
+            Union[
+                str,
+                float,
+                bool,
+                Dict[str, Union[str, float, bool, Dict[str, Union[List[Union[str, float, bool]], str, float, bool]]]],
+            ],
+        ]
+    ] = None
+
+    execution_model: Optional[Literal["durableObject", "stateless"]] = FieldInfo(alias="executionModel", default=None)
+
+    outcome: Optional[str] = None
+
+    script_version: Optional[EventsEventWorkersUnionMember0ScriptVersion] = FieldInfo(
+        alias="scriptVersion", default=None
+    )
+
+    truncated: Optional[bool] = None
+
+
+class EventsEventWorkersUnionMember1DiagnosticsChannelEvent(BaseModel):
+    channel: str
+
+    message: str
+
+    timestamp: float
+
+
+class EventsEventWorkersUnionMember1ScriptVersion(BaseModel):
+    id: Optional[str] = None
+
+    message: Optional[str] = None
+
+    tag: Optional[str] = None
+
+
+class EventsEventWorkersUnionMember1(BaseModel):
+    cpu_time_ms: float = FieldInfo(alias="cpuTimeMs")
+
+    event_type: Literal[
+        "fetch", "scheduled", "alarm", "cron", "queue", "email", "tail", "rpc", "websocket", "unknown"
+    ] = FieldInfo(alias="eventType")
+
+    outcome: str
+
+    request_id: str = FieldInfo(alias="requestId")
+
+    script_name: str = FieldInfo(alias="scriptName")
+
+    wall_time_ms: float = FieldInfo(alias="wallTimeMs")
+
+    diagnostics_channel_events: Optional[List[EventsEventWorkersUnionMember1DiagnosticsChannelEvent]] = FieldInfo(
+        alias="diagnosticsChannelEvents", default=None
+    )
+
+    dispatch_namespace: Optional[str] = FieldInfo(alias="dispatchNamespace", default=None)
+
+    durable_object_id: Optional[str] = FieldInfo(alias="durableObjectId", default=None)
+
+    entrypoint: Optional[str] = None
+
+    event: Optional[Dict[str, Union[str, float, bool]]] = None
+
+    execution_model: Optional[Literal["durableObject", "stateless"]] = FieldInfo(alias="executionModel", default=None)
+
+    script_version: Optional[EventsEventWorkersUnionMember1ScriptVersion] = FieldInfo(
+        alias="scriptVersion", default=None
+    )
+
+    truncated: Optional[bool] = None
+
+
+EventsEventWorkers: TypeAlias = Union[EventsEventWorkersUnionMember0, EventsEventWorkersUnionMember1]
+
+
+class EventsEvent(BaseModel):
+    """The data structure of a telemetry event"""
+
+    metadata: EventsEventMetadata = FieldInfo(alias="$metadata")
+
+    dataset: str
+
+    source: Union[str, object]
+
+    timestamp: int
+
+    containers: Optional[object] = FieldInfo(alias="$containers", default=None)
+    """
+    Cloudflare Containers event information enriches your logs so you can easily
+    identify and debug issues.
+    """
+
+    workers: Optional[EventsEventWorkers] = FieldInfo(alias="$workers", default=None)
+    """
+    Cloudflare Workers event information enriches your logs so you can easily
+    identify and debug issues.
+    """
+
+
+class EventsField(BaseModel):
+    key: str
+
+    type: str
+
+
+class EventsSeriesDataAggregates(BaseModel):
+    api_count: int = FieldInfo(alias="_count")
+
+    api_first_seen: str = FieldInfo(alias="_firstSeen")
+
+    api_interval: int = FieldInfo(alias="_interval")
+
+    api_last_seen: str = FieldInfo(alias="_lastSeen")
+
+    bin: Optional[object] = None
+
+
+class EventsSeriesData(BaseModel):
+    aggregates: EventsSeriesDataAggregates
+
+    count: float
+
+    interval: float
+
+    sample_interval: float = FieldInfo(alias="sampleInterval")
+
+    errors: Optional[float] = None
+
+    groups: Optional[Dict[str, Union[str, float, bool]]] = None
+    """Groups in the query results."""
+
+
+class EventsSeries(BaseModel):
+    data: List[EventsSeriesData]
+
+    time: str
+
+
+class Events(BaseModel):
+    count: Optional[float] = None
+
+    events: Optional[List[EventsEvent]] = None
+
+    fields: Optional[List[EventsField]] = None
+
+    series: Optional[List[EventsSeries]] = None
+
+
+class InvocationMetadata(BaseModel):
+    id: str
+
+    account: Optional[str] = None
+
+    cloud_service: Optional[str] = FieldInfo(alias="cloudService", default=None)
+
+    cold_start: Optional[int] = FieldInfo(alias="coldStart", default=None)
+
+    cost: Optional[int] = None
+
+    duration: Optional[int] = None
+
+    end_time: Optional[int] = FieldInfo(alias="endTime", default=None)
+
+    error: Optional[str] = None
+
+    error_template: Optional[str] = FieldInfo(alias="errorTemplate", default=None)
+
+    fingerprint: Optional[str] = None
+
+    level: Optional[str] = None
+
+    message: Optional[str] = None
+
+    message_template: Optional[str] = FieldInfo(alias="messageTemplate", default=None)
+
+    metric_name: Optional[str] = FieldInfo(alias="metricName", default=None)
+
+    origin: Optional[str] = None
+
+    parent_span_id: Optional[str] = FieldInfo(alias="parentSpanId", default=None)
+
+    provider: Optional[str] = None
+
+    region: Optional[str] = None
+
+    request_id: Optional[str] = FieldInfo(alias="requestId", default=None)
+
+    service: Optional[str] = None
+
+    span_id: Optional[str] = FieldInfo(alias="spanId", default=None)
+
+    span_name: Optional[str] = FieldInfo(alias="spanName", default=None)
+
+    stack_id: Optional[str] = FieldInfo(alias="stackId", default=None)
+
+    start_time: Optional[int] = FieldInfo(alias="startTime", default=None)
+
+    status_code: Optional[int] = FieldInfo(alias="statusCode", default=None)
+
+    trace_duration: Optional[int] = FieldInfo(alias="traceDuration", default=None)
+
+    trace_id: Optional[str] = FieldInfo(alias="traceId", default=None)
+
+    transaction_name: Optional[str] = FieldInfo(alias="transactionName", default=None)
+
+    trigger: Optional[str] = None
+
+    type: Optional[str] = None
+
+    url: Optional[str] = None
+
+
+class InvocationWorkersUnionMember0ScriptVersion(BaseModel):
+    id: Optional[str] = None
+
+    message: Optional[str] = None
+
+    tag: Optional[str] = None
+
+
+class InvocationWorkersUnionMember0(BaseModel):
+    event_type: Literal[
+        "fetch", "scheduled", "alarm", "cron", "queue", "email", "tail", "rpc", "websocket", "unknown"
+    ] = FieldInfo(alias="eventType")
+
+    request_id: str = FieldInfo(alias="requestId")
+
+    script_name: str = FieldInfo(alias="scriptName")
+
+    durable_object_id: Optional[str] = FieldInfo(alias="durableObjectId", default=None)
+
+    entrypoint: Optional[str] = None
+
+    event: Optional[
+        Dict[
+            str,
+            Union[
+                str,
+                float,
+                bool,
+                Dict[str, Union[str, float, bool, Dict[str, Union[List[Union[str, float, bool]], str, float, bool]]]],
+            ],
+        ]
+    ] = None
+
+    execution_model: Optional[Literal["durableObject", "stateless"]] = FieldInfo(alias="executionModel", default=None)
+
+    outcome: Optional[str] = None
+
+    script_version: Optional[InvocationWorkersUnionMember0ScriptVersion] = FieldInfo(
+        alias="scriptVersion", default=None
+    )
+
+    truncated: Optional[bool] = None
+
+
+class InvocationWorkersUnionMember1DiagnosticsChannelEvent(BaseModel):
+    channel: str
+
+    message: str
+
+    timestamp: float
+
+
+class InvocationWorkersUnionMember1ScriptVersion(BaseModel):
+    id: Optional[str] = None
+
+    message: Optional[str] = None
+
+    tag: Optional[str] = None
+
+
+class InvocationWorkersUnionMember1(BaseModel):
+    cpu_time_ms: float = FieldInfo(alias="cpuTimeMs")
+
+    event_type: Literal[
+        "fetch", "scheduled", "alarm", "cron", "queue", "email", "tail", "rpc", "websocket", "unknown"
+    ] = FieldInfo(alias="eventType")
+
+    outcome: str
+
+    request_id: str = FieldInfo(alias="requestId")
+
+    script_name: str = FieldInfo(alias="scriptName")
+
+    wall_time_ms: float = FieldInfo(alias="wallTimeMs")
+
+    diagnostics_channel_events: Optional[List[InvocationWorkersUnionMember1DiagnosticsChannelEvent]] = FieldInfo(
+        alias="diagnosticsChannelEvents", default=None
+    )
+
+    dispatch_namespace: Optional[str] = FieldInfo(alias="dispatchNamespace", default=None)
+
+    durable_object_id: Optional[str] = FieldInfo(alias="durableObjectId", default=None)
+
+    entrypoint: Optional[str] = None
+
+    event: Optional[Dict[str, Union[str, float, bool]]] = None
+
+    execution_model: Optional[Literal["durableObject", "stateless"]] = FieldInfo(alias="executionModel", default=None)
+
+    script_version: Optional[InvocationWorkersUnionMember1ScriptVersion] = FieldInfo(
+        alias="scriptVersion", default=None
+    )
+
+    truncated: Optional[bool] = None
+
+
+InvocationWorkers: TypeAlias = Union[InvocationWorkersUnionMember0, InvocationWorkersUnionMember1]
+
+
+class Invocation(BaseModel):
+    """The data structure of a telemetry event"""
+
+    metadata: InvocationMetadata = FieldInfo(alias="$metadata")
+
+    dataset: str
+
+    source: Union[str, object]
+
+    timestamp: int
+
+    containers: Optional[object] = FieldInfo(alias="$containers", default=None)
+    """
+    Cloudflare Containers event information enriches your logs so you can easily
+    identify and debug issues.
+    """
+
+    workers: Optional[InvocationWorkers] = FieldInfo(alias="$workers", default=None)
+    """
+    Cloudflare Workers event information enriches your logs so you can easily
+    identify and debug issues.
+    """
+
+
+class PatternSeriesDataGroup(BaseModel):
+    key: str
+
+    value: Union[str, float, bool]
+
+
+class PatternSeriesData(BaseModel):
+    count: float
+
+    interval: float
+
+    sample_interval: float = FieldInfo(alias="sampleInterval")
+
+    value: float
+
+    groups: Optional[List[PatternSeriesDataGroup]] = None
+
+
+class PatternSeries(BaseModel):
+    data: PatternSeriesData
+
+    time: str
+
+
+class Pattern(BaseModel):
+    count: float
+
+    pattern: str
+
+    series: List[PatternSeries]
+
+    service: str
+
+
+class Trace(BaseModel):
+    root_span_name: str = FieldInfo(alias="rootSpanName")
+
+    root_transaction_name: str = FieldInfo(alias="rootTransactionName")
+
+    service: List[str]
+
+    spans: float
+
+    trace_duration_ms: float = FieldInfo(alias="traceDurationMs")
+
+    trace_end_ms: float = FieldInfo(alias="traceEndMs")
+
+    trace_id: str = FieldInfo(alias="traceId")
+
+    trace_start_ms: float = FieldInfo(alias="traceStartMs")
+
+    errors: Optional[List[str]] = None
+
+
+class TelemetryQueryResponse(BaseModel):
+    run: Run
+    """A Workers Observability Query Object"""
+
+    statistics: Statistics
+    """
+    The statistics object contains information about query performance from the
+    database, it does not include any network latency
+    """
+
+    calculations: Optional[List[Calculation]] = None
+
+    compare: Optional[List[Compare]] = None
+
+    events: Optional[Events] = None
+
+    invocations: Optional[Dict[str, List[Invocation]]] = None
+
+    patterns: Optional[List[Pattern]] = None
+
+    traces: Optional[List[Trace]] = None
diff --git a/src/cloudflare/types/workers/observability/telemetry_values_params.py b/src/cloudflare/types/workers/observability/telemetry_values_params.py
new file mode 100644
index 00000000000..8c5e881ddff
--- /dev/null
+++ b/src/cloudflare/types/workers/observability/telemetry_values_params.py
@@ -0,0 +1,94 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ...._types import SequenceNotStr
+from ...._utils import PropertyInfo
+
+__all__ = ["TelemetryValuesParams", "Timeframe", "Filter", "Needle"]
+
+
+class TelemetryValuesParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    datasets: Required[SequenceNotStr[str]]
+
+    key: Required[str]
+
+    timeframe: Required[Timeframe]
+
+    type: Required[Literal["string", "boolean", "number"]]
+
+    filters: Iterable[Filter]
+
+    limit: float
+
+    needle: Needle
+    """Search for a specific substring in the event."""
+
+
+_TimeframeReservedKeywords = TypedDict(
+    "_TimeframeReservedKeywords",
+    {
+        "from": float,
+    },
+    total=False,
+)
+
+
+class Timeframe(_TimeframeReservedKeywords, total=False):
+    to: Required[float]
+
+
+class Filter(TypedDict, total=False):
+    key: Required[str]
+
+    operation: Required[
+        Literal[
+            "includes",
+            "not_includes",
+            "starts_with",
+            "regex",
+            "exists",
+            "is_null",
+            "in",
+            "not_in",
+            "eq",
+            "neq",
+            "gt",
+            "gte",
+            "lt",
+            "lte",
+            "=",
+            "!=",
+            ">",
+            ">=",
+            "<",
+            "<=",
+            "INCLUDES",
+            "DOES_NOT_INCLUDE",
+            "MATCH_REGEX",
+            "EXISTS",
+            "DOES_NOT_EXIST",
+            "IN",
+            "NOT_IN",
+            "STARTS_WITH",
+        ]
+    ]
+
+    type: Required[Literal["string", "number", "boolean"]]
+
+    value: Union[str, float, bool]
+
+
+class Needle(TypedDict, total=False):
+    """Search for a specific substring in the event."""
+
+    value: Required[Union[str, float, bool]]
+
+    is_regex: Annotated[bool, PropertyInfo(alias="isRegex")]
+
+    match_case: Annotated[bool, PropertyInfo(alias="matchCase")]
diff --git a/src/cloudflare/types/workers/observability/telemetry_values_response.py b/src/cloudflare/types/workers/observability/telemetry_values_response.py
new file mode 100644
index 00000000000..1d7d431f350
--- /dev/null
+++ b/src/cloudflare/types/workers/observability/telemetry_values_response.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Union
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["TelemetryValuesResponse"]
+
+
+class TelemetryValuesResponse(BaseModel):
+    dataset: str
+
+    key: str
+
+    type: Literal["string", "boolean", "number"]
+
+    value: Union[str, float, bool]
diff --git a/src/cloudflare/types/workers/placement_configuration.py b/src/cloudflare/types/workers/placement_configuration.py
deleted file mode 100644
index 0eb2b9eec7d..00000000000
--- a/src/cloudflare/types/workers/placement_configuration.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = ["PlacementConfiguration"]
-
-
-class PlacementConfiguration(BaseModel):
-    mode: Optional[Literal["smart"]] = None
-    """
-    Enables
-    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
-    Only `"smart"` is currently supported
-    """
diff --git a/src/cloudflare/types/workers/placement_configuration_param.py b/src/cloudflare/types/workers/placement_configuration_param.py
deleted file mode 100644
index f6ef4c070fd..00000000000
--- a/src/cloudflare/types/workers/placement_configuration_param.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, TypedDict
-
-__all__ = ["PlacementConfigurationParam"]
-
-
-class PlacementConfigurationParam(TypedDict, total=False):
-    mode: Literal["smart"]
-    """
-    Enables
-    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
-    Only `"smart"` is currently supported
-    """
diff --git a/src/cloudflare/types/workers/r2_binding.py b/src/cloudflare/types/workers/r2_binding.py
deleted file mode 100644
index 523844ac272..00000000000
--- a/src/cloudflare/types/workers/r2_binding.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = ["R2Binding"]
-
-
-class R2Binding(BaseModel):
-    bucket_name: str
-    """R2 bucket to bind to"""
-
-    name: str
-    """A JavaScript variable name for the binding."""
-
-    type: Literal["r2_bucket"]
-    """The class of resource that the binding provides."""
diff --git a/src/cloudflare/types/workers/r2_binding_param.py b/src/cloudflare/types/workers/r2_binding_param.py
deleted file mode 100644
index 559667ded10..00000000000
--- a/src/cloudflare/types/workers/r2_binding_param.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, Required, TypedDict
-
-__all__ = ["R2BindingParam"]
-
-
-class R2BindingParam(TypedDict, total=False):
-    bucket_name: Required[str]
-    """R2 bucket to bind to"""
-
-    type: Required[Literal["r2_bucket"]]
-    """The class of resource that the binding provides."""
diff --git a/src/cloudflare/types/workers/route_create_params.py b/src/cloudflare/types/workers/route_create_params.py
new file mode 100644
index 00000000000..d6972417d59
--- /dev/null
+++ b/src/cloudflare/types/workers/route_create_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["RouteCreateParams"]
+
+
+class RouteCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    pattern: Required[str]
+    """Pattern to match incoming requests against.
+
+    [Learn more](https://developers.cloudflare.com/workers/configuration/routing/routes/#matching-behavior).
+    """
+
+    script: str
+    """Name of the script to run if the route matches."""
diff --git a/src/cloudflare/types/workers/route_create_response.py b/src/cloudflare/types/workers/route_create_response.py
new file mode 100644
index 00000000000..a09ab7fdca0
--- /dev/null
+++ b/src/cloudflare/types/workers/route_create_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["RouteCreateResponse"]
+
+
+class RouteCreateResponse(BaseModel):
+    id: str
+    """Identifier."""
+
+    pattern: str
+    """Pattern to match incoming requests against.
+
+    [Learn more](https://developers.cloudflare.com/workers/configuration/routing/routes/#matching-behavior).
+    """
+
+    script: Optional[str] = None
+    """Name of the script to run if the route matches."""
diff --git a/src/cloudflare/types/workers/route_delete_response.py b/src/cloudflare/types/workers/route_delete_response.py
new file mode 100644
index 00000000000..0a75d8d2884
--- /dev/null
+++ b/src/cloudflare/types/workers/route_delete_response.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["RouteDeleteResponse"]
+
+
+class RouteDeleteResponse(BaseModel):
+    id: Optional[str] = None
+    """Identifier."""
diff --git a/src/cloudflare/types/workers/route_get_response.py b/src/cloudflare/types/workers/route_get_response.py
new file mode 100644
index 00000000000..7e9a7c7de3a
--- /dev/null
+++ b/src/cloudflare/types/workers/route_get_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["RouteGetResponse"]
+
+
+class RouteGetResponse(BaseModel):
+    id: str
+    """Identifier."""
+
+    pattern: str
+    """Pattern to match incoming requests against.
+
+    [Learn more](https://developers.cloudflare.com/workers/configuration/routing/routes/#matching-behavior).
+    """
+
+    script: Optional[str] = None
+    """Name of the script to run if the route matches."""
diff --git a/src/cloudflare/types/workers/route_list_response.py b/src/cloudflare/types/workers/route_list_response.py
new file mode 100644
index 00000000000..0770cb85c3e
--- /dev/null
+++ b/src/cloudflare/types/workers/route_list_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["RouteListResponse"]
+
+
+class RouteListResponse(BaseModel):
+    id: str
+    """Identifier."""
+
+    pattern: str
+    """Pattern to match incoming requests against.
+
+    [Learn more](https://developers.cloudflare.com/workers/configuration/routing/routes/#matching-behavior).
+    """
+
+    script: Optional[str] = None
+    """Name of the script to run if the route matches."""
diff --git a/src/cloudflare/types/workers/route_update_params.py b/src/cloudflare/types/workers/route_update_params.py
new file mode 100644
index 00000000000..79a2b2a593f
--- /dev/null
+++ b/src/cloudflare/types/workers/route_update_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["RouteUpdateParams"]
+
+
+class RouteUpdateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    pattern: Required[str]
+    """Pattern to match incoming requests against.
+
+    [Learn more](https://developers.cloudflare.com/workers/configuration/routing/routes/#matching-behavior).
+    """
+
+    script: str
+    """Name of the script to run if the route matches."""
diff --git a/src/cloudflare/types/workers/route_update_response.py b/src/cloudflare/types/workers/route_update_response.py
new file mode 100644
index 00000000000..38f00c3d807
--- /dev/null
+++ b/src/cloudflare/types/workers/route_update_response.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ..._models import BaseModel
+
+__all__ = ["RouteUpdateResponse"]
+
+
+class RouteUpdateResponse(BaseModel):
+    id: str
+    """Identifier."""
+
+    pattern: str
+    """Pattern to match incoming requests against.
+
+    [Learn more](https://developers.cloudflare.com/workers/configuration/routing/routes/#matching-behavior).
+    """
+
+    script: Optional[str] = None
+    """Name of the script to run if the route matches."""
diff --git a/src/cloudflare/types/workers/script.py b/src/cloudflare/types/workers/script.py
index 233187b23ec..92e76f58d07 100644
--- a/src/cloudflare/types/workers/script.py
+++ b/src/cloudflare/types/workers/script.py
@@ -1,17 +1,280 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List, Union, Optional
 from datetime import datetime
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
 from .scripts.consumer_script import ConsumerScript
 
-__all__ = ["Script"]
+__all__ = [
+    "Script",
+    "NamedHandler",
+    "Observability",
+    "ObservabilityLogs",
+    "Placement",
+    "PlacementUnionMember0",
+    "PlacementUnionMember1",
+    "PlacementUnionMember2",
+    "PlacementUnionMember3",
+    "PlacementUnionMember4",
+    "PlacementUnionMember5",
+    "PlacementUnionMember6",
+    "PlacementUnionMember7",
+    "PlacementUnionMember7Target",
+    "PlacementUnionMember7TargetRegion",
+    "PlacementUnionMember7TargetHostname",
+    "PlacementUnionMember7TargetHost",
+]
+
+
+class NamedHandler(BaseModel):
+    handlers: Optional[List[str]] = None
+    """The names of handlers exported as part of the named export."""
+
+    name: Optional[str] = None
+    """The name of the export."""
+
+
+class ObservabilityLogs(BaseModel):
+    """Log settings for the Worker."""
+
+    enabled: bool
+    """Whether logs are enabled for the Worker."""
+
+    invocation_logs: bool
+    """
+    Whether
+    [invocation logs](https://developers.cloudflare.com/workers/observability/logs/workers-logs/#invocation-logs)
+    are enabled for the Worker.
+    """
+
+    destinations: Optional[List[str]] = None
+    """A list of destinations where logs will be exported to."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for logs. From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1."""
+
+    persist: Optional[bool] = None
+    """Whether log persistence is enabled for the Worker."""
+
+
+class Observability(BaseModel):
+    """Observability settings for the Worker."""
+
+    enabled: bool
+    """Whether observability is enabled for the Worker."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for incoming requests.
+
+    From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1.
+    """
+
+    logs: Optional[ObservabilityLogs] = None
+    """Log settings for the Worker."""
+
+
+class PlacementUnionMember0(BaseModel):
+    mode: Literal["smart"]
+    """
+    Enables
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember1(BaseModel):
+    region: str
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember2(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember3(BaseModel):
+    host: str
+    """TCP host and port for targeted placement."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember4(BaseModel):
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    region: str
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember5(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember6(BaseModel):
+    host: str
+    """TCP host and port for targeted placement."""
+
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember7TargetRegion(BaseModel):
+    region: str
+    """Cloud region in format 'provider:region'."""
+
+
+class PlacementUnionMember7TargetHostname(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+
+class PlacementUnionMember7TargetHost(BaseModel):
+    host: str
+    """TCP host:port for targeted placement."""
+
+
+PlacementUnionMember7Target: TypeAlias = Union[
+    PlacementUnionMember7TargetRegion, PlacementUnionMember7TargetHostname, PlacementUnionMember7TargetHost
+]
+
+
+class PlacementUnionMember7(BaseModel):
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    target: List[PlacementUnionMember7Target]
+    """Array of placement targets (currently limited to single target)."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+Placement: TypeAlias = Union[
+    PlacementUnionMember0,
+    PlacementUnionMember1,
+    PlacementUnionMember2,
+    PlacementUnionMember3,
+    PlacementUnionMember4,
+    PlacementUnionMember5,
+    PlacementUnionMember6,
+    PlacementUnionMember7,
+]
 
 
 class Script(BaseModel):
     id: Optional[str] = None
-    """The id of the script in the Workers system. Usually the script name."""
+    """The name used to identify the script."""
+
+    compatibility_date: Optional[str] = None
+    """Date indicating targeted support in the Workers runtime.
+
+    Backwards incompatible fixes to the runtime following this date will not affect
+    this Worker.
+    """
+
+    compatibility_flags: Optional[List[str]] = None
+    """Flags that enable or disable certain features in the Workers runtime.
+
+    Used to enable upcoming features or opt in or out of specific changes not
+    included in a `compatibility_date`.
+    """
 
     created_on: Optional[datetime] = None
     """When the script was created."""
@@ -19,17 +282,67 @@ class Script(BaseModel):
     etag: Optional[str] = None
     """Hashed script content, can be used in a If-None-Match header when updating."""
 
+    handlers: Optional[List[str]] = None
+    """The names of handlers exported as part of the default export."""
+
+    has_assets: Optional[bool] = None
+    """Whether a Worker contains assets."""
+
+    has_modules: Optional[bool] = None
+    """Whether a Worker contains modules."""
+
+    last_deployed_from: Optional[str] = None
+    """The client most recently used to deploy this Worker."""
+
     logpush: Optional[bool] = None
     """Whether Logpush is turned on for the Worker."""
 
+    migration_tag: Optional[str] = None
+    """
+    The tag of the Durable Object migration that was most recently applied for this
+    Worker.
+    """
+
     modified_on: Optional[datetime] = None
     """When the script was last modified."""
 
-    placement_mode: Optional[str] = None
-    """Specifies the placement mode for the Worker (e.g. 'smart')."""
+    named_handlers: Optional[List[NamedHandler]] = None
+    """
+    Named exports, such as Durable Object class implementations and named
+    entrypoints.
+    """
+
+    observability: Optional[Observability] = None
+    """Observability settings for the Worker."""
+
+    placement: Optional[Placement] = None
+    """
+    Configuration for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    Specify mode='smart' for Smart Placement, or one of region/hostname/host.
+    """
+
+    placement_mode: Optional[Literal["smart", "targeted"]] = None
+    """
+    Configuration for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    Specify mode='smart' for Smart Placement, or one of region/hostname/host.
+    """
+
+    placement_status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    tag: Optional[str] = None
+    """The immutable ID of the script."""
+
+    tags: Optional[List[str]] = None
+    """Tags associated with the Worker."""
 
     tail_consumers: Optional[List[ConsumerScript]] = None
     """List of Workers that will consume logs from the attached Worker."""
 
-    usage_model: Optional[str] = None
-    """Specifies the usage model for the Worker (e.g. 'bundled' or 'unbound')."""
+    usage_model: Optional[Literal["standard", "bundled", "unbound"]] = None
+    """Usage model for the Worker invocations."""
diff --git a/src/cloudflare/types/workers/script_delete_params.py b/src/cloudflare/types/workers/script_delete_params.py
index 1d8d872feca..adbccee67d4 100644
--- a/src/cloudflare/types/workers/script_delete_params.py
+++ b/src/cloudflare/types/workers/script_delete_params.py
@@ -9,7 +9,7 @@
 
 class ScriptDeleteParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     force: bool
     """
diff --git a/src/cloudflare/types/workers/script_get_response.py b/src/cloudflare/types/workers/script_get_response.py
new file mode 100644
index 00000000000..7d789c074c7
--- /dev/null
+++ b/src/cloudflare/types/workers/script_get_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["ScriptGetResponse"]
+
+ScriptGetResponse: TypeAlias = str
diff --git a/src/cloudflare/types/workers/script_list_params.py b/src/cloudflare/types/workers/script_list_params.py
new file mode 100644
index 00000000000..61341782f60
--- /dev/null
+++ b/src/cloudflare/types/workers/script_list_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ScriptListParams"]
+
+
+class ScriptListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    tags: str
+    """Filter scripts by tags.
+
+    Format: comma-separated list of tag:allowed pairs where allowed is 'yes' or
+    'no'.
+    """
diff --git a/src/cloudflare/types/workers/script_list_response.py b/src/cloudflare/types/workers/script_list_response.py
new file mode 100644
index 00000000000..90214c57df8
--- /dev/null
+++ b/src/cloudflare/types/workers/script_list_response.py
@@ -0,0 +1,357 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ..._models import BaseModel
+from .scripts.consumer_script import ConsumerScript
+
+__all__ = [
+    "ScriptListResponse",
+    "NamedHandler",
+    "Observability",
+    "ObservabilityLogs",
+    "Placement",
+    "PlacementUnionMember0",
+    "PlacementUnionMember1",
+    "PlacementUnionMember2",
+    "PlacementUnionMember3",
+    "PlacementUnionMember4",
+    "PlacementUnionMember5",
+    "PlacementUnionMember6",
+    "PlacementUnionMember7",
+    "PlacementUnionMember7Target",
+    "PlacementUnionMember7TargetRegion",
+    "PlacementUnionMember7TargetHostname",
+    "PlacementUnionMember7TargetHost",
+    "Route",
+]
+
+
+class NamedHandler(BaseModel):
+    handlers: Optional[List[str]] = None
+    """The names of handlers exported as part of the named export."""
+
+    name: Optional[str] = None
+    """The name of the export."""
+
+
+class ObservabilityLogs(BaseModel):
+    """Log settings for the Worker."""
+
+    enabled: bool
+    """Whether logs are enabled for the Worker."""
+
+    invocation_logs: bool
+    """
+    Whether
+    [invocation logs](https://developers.cloudflare.com/workers/observability/logs/workers-logs/#invocation-logs)
+    are enabled for the Worker.
+    """
+
+    destinations: Optional[List[str]] = None
+    """A list of destinations where logs will be exported to."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for logs. From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1."""
+
+    persist: Optional[bool] = None
+    """Whether log persistence is enabled for the Worker."""
+
+
+class Observability(BaseModel):
+    """Observability settings for the Worker."""
+
+    enabled: bool
+    """Whether observability is enabled for the Worker."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for incoming requests.
+
+    From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1.
+    """
+
+    logs: Optional[ObservabilityLogs] = None
+    """Log settings for the Worker."""
+
+
+class PlacementUnionMember0(BaseModel):
+    mode: Literal["smart"]
+    """
+    Enables
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember1(BaseModel):
+    region: str
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember2(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember3(BaseModel):
+    host: str
+    """TCP host and port for targeted placement."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember4(BaseModel):
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    region: str
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember5(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember6(BaseModel):
+    host: str
+    """TCP host and port for targeted placement."""
+
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember7TargetRegion(BaseModel):
+    region: str
+    """Cloud region in format 'provider:region'."""
+
+
+class PlacementUnionMember7TargetHostname(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+
+class PlacementUnionMember7TargetHost(BaseModel):
+    host: str
+    """TCP host:port for targeted placement."""
+
+
+PlacementUnionMember7Target: TypeAlias = Union[
+    PlacementUnionMember7TargetRegion, PlacementUnionMember7TargetHostname, PlacementUnionMember7TargetHost
+]
+
+
+class PlacementUnionMember7(BaseModel):
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    target: List[PlacementUnionMember7Target]
+    """Array of placement targets (currently limited to single target)."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+Placement: TypeAlias = Union[
+    PlacementUnionMember0,
+    PlacementUnionMember1,
+    PlacementUnionMember2,
+    PlacementUnionMember3,
+    PlacementUnionMember4,
+    PlacementUnionMember5,
+    PlacementUnionMember6,
+    PlacementUnionMember7,
+]
+
+
+class Route(BaseModel):
+    id: str
+    """Identifier."""
+
+    pattern: str
+    """Pattern to match incoming requests against.
+
+    [Learn more](https://developers.cloudflare.com/workers/configuration/routing/routes/#matching-behavior).
+    """
+
+    script: Optional[str] = None
+    """Name of the script to run if the route matches."""
+
+
+class ScriptListResponse(BaseModel):
+    id: Optional[str] = None
+    """The name used to identify the script."""
+
+    compatibility_date: Optional[str] = None
+    """Date indicating targeted support in the Workers runtime.
+
+    Backwards incompatible fixes to the runtime following this date will not affect
+    this Worker.
+    """
+
+    compatibility_flags: Optional[List[str]] = None
+    """Flags that enable or disable certain features in the Workers runtime.
+
+    Used to enable upcoming features or opt in or out of specific changes not
+    included in a `compatibility_date`.
+    """
+
+    created_on: Optional[datetime] = None
+    """When the script was created."""
+
+    etag: Optional[str] = None
+    """Hashed script content, can be used in a If-None-Match header when updating."""
+
+    handlers: Optional[List[str]] = None
+    """The names of handlers exported as part of the default export."""
+
+    has_assets: Optional[bool] = None
+    """Whether a Worker contains assets."""
+
+    has_modules: Optional[bool] = None
+    """Whether a Worker contains modules."""
+
+    last_deployed_from: Optional[str] = None
+    """The client most recently used to deploy this Worker."""
+
+    logpush: Optional[bool] = None
+    """Whether Logpush is turned on for the Worker."""
+
+    migration_tag: Optional[str] = None
+    """
+    The tag of the Durable Object migration that was most recently applied for this
+    Worker.
+    """
+
+    modified_on: Optional[datetime] = None
+    """When the script was last modified."""
+
+    named_handlers: Optional[List[NamedHandler]] = None
+    """
+    Named exports, such as Durable Object class implementations and named
+    entrypoints.
+    """
+
+    observability: Optional[Observability] = None
+    """Observability settings for the Worker."""
+
+    placement: Optional[Placement] = None
+    """
+    Configuration for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    Specify mode='smart' for Smart Placement, or one of region/hostname/host.
+    """
+
+    placement_mode: Optional[Literal["smart", "targeted"]] = None
+
+    placement_status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+
+    routes: Optional[List[Route]] = None
+    """Routes associated with the Worker."""
+
+    tag: Optional[str] = None
+    """The immutable ID of the script."""
+
+    tags: Optional[List[str]] = None
+    """Tags associated with the Worker."""
+
+    tail_consumers: Optional[List[ConsumerScript]] = None
+    """List of Workers that will consume logs from the attached Worker."""
+
+    usage_model: Optional[Literal["standard", "bundled", "unbound"]] = None
+    """Usage model for the Worker invocations."""
diff --git a/src/cloudflare/types/workers/script_search_params.py b/src/cloudflare/types/workers/script_search_params.py
new file mode 100644
index 00000000000..001d332e90e
--- /dev/null
+++ b/src/cloudflare/types/workers/script_search_params.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["ScriptSearchParams"]
+
+
+class ScriptSearchParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    id: str
+    """Worker ID (also called tag) to search for. Only exact matches are returned."""
+
+    name: str
+    """Worker name to search for. Both exact and partial matches are returned."""
+
+    order_by: Literal["created_on", "modified_on", "name"]
+    """Property to sort results by. Results are sorted in ascending order."""
+
+    page: int
+    """Current page."""
+
+    per_page: int
+    """Items per page."""
diff --git a/src/cloudflare/types/workers/script_search_response.py b/src/cloudflare/types/workers/script_search_response.py
new file mode 100644
index 00000000000..465f360a0d3
--- /dev/null
+++ b/src/cloudflare/types/workers/script_search_response.py
@@ -0,0 +1,35 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import TypeAlias
+
+from ..._models import BaseModel
+
+__all__ = ["ScriptSearchResponse", "ScriptSearchResponseItem"]
+
+
+class ScriptSearchResponseItem(BaseModel):
+    created_on: datetime
+    """When the script was created."""
+
+    modified_on: datetime
+    """When the script was last modified."""
+
+    script_name: str
+    """Name of the script, used in URLs and route configuration."""
+
+    script_tag: str
+    """Identifier."""
+
+    environment_is_default: Optional[bool] = None
+    """Whether the environment is the default environment."""
+
+    environment_name: Optional[str] = None
+    """Name of the environment."""
+
+    service_name: Optional[str] = None
+    """Name of the service."""
+
+
+ScriptSearchResponse: TypeAlias = List[ScriptSearchResponseItem]
diff --git a/src/cloudflare/types/workers/script_setting.py b/src/cloudflare/types/workers/script_setting.py
index 9b0b43d6364..ebbd413d908 100644
--- a/src/cloudflare/types/workers/script_setting.py
+++ b/src/cloudflare/types/workers/script_setting.py
@@ -5,12 +5,57 @@
 from ..._models import BaseModel
 from .scripts.consumer_script import ConsumerScript
 
-__all__ = ["ScriptSetting"]
+__all__ = ["ScriptSetting", "Observability", "ObservabilityLogs"]
+
+
+class ObservabilityLogs(BaseModel):
+    """Log settings for the Worker."""
+
+    enabled: bool
+    """Whether logs are enabled for the Worker."""
+
+    invocation_logs: bool
+    """
+    Whether
+    [invocation logs](https://developers.cloudflare.com/workers/observability/logs/workers-logs/#invocation-logs)
+    are enabled for the Worker.
+    """
+
+    destinations: Optional[List[str]] = None
+    """A list of destinations where logs will be exported to."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for logs. From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1."""
+
+    persist: Optional[bool] = None
+    """Whether log persistence is enabled for the Worker."""
+
+
+class Observability(BaseModel):
+    """Observability settings for the Worker."""
+
+    enabled: bool
+    """Whether observability is enabled for the Worker."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for incoming requests.
+
+    From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1.
+    """
+
+    logs: Optional[ObservabilityLogs] = None
+    """Log settings for the Worker."""
 
 
 class ScriptSetting(BaseModel):
     logpush: Optional[bool] = None
     """Whether Logpush is turned on for the Worker."""
 
+    observability: Optional[Observability] = None
+    """Observability settings for the Worker."""
+
+    tags: Optional[List[str]] = None
+    """Tags associated with the Worker."""
+
     tail_consumers: Optional[List[ConsumerScript]] = None
     """List of Workers that will consume logs from the attached Worker."""
diff --git a/src/cloudflare/types/workers/script_update_params.py b/src/cloudflare/types/workers/script_update_params.py
index 5f85fd04e21..82434e03ee1 100644
--- a/src/cloudflare/types/workers/script_update_params.py
+++ b/src/cloudflare/types/workers/script_update_params.py
@@ -2,53 +2,775 @@
 
 from __future__ import annotations
 
-from typing import List, Union, Iterable
-from typing_extensions import Literal, Required, Annotated, TypedDict
+from typing import List, Union, Iterable, Optional
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
-from ..._types import FileTypes
-from ..._utils import PropertyInfo
-from .stepped_migration_param import SteppedMigrationParam
+from ..._types import FileTypes, SequenceNotStr
+from .migration_step_param import MigrationStepParam
 from .single_step_migration_param import SingleStepMigrationParam
-from .placement_configuration_param import PlacementConfigurationParam
 from .scripts.consumer_script_param import ConsumerScriptParam
 
-__all__ = ["ScriptUpdateParams", "Variant0", "Variant0Metadata", "Variant0MetadataMigrations", "Variant1"]
+__all__ = [
+    "ScriptUpdateParams",
+    "Metadata",
+    "MetadataAssets",
+    "MetadataAssetsConfig",
+    "MetadataBinding",
+    "MetadataBindingWorkersBindingKindAI",
+    "MetadataBindingWorkersBindingKindAnalyticsEngine",
+    "MetadataBindingWorkersBindingKindAssets",
+    "MetadataBindingWorkersBindingKindBrowser",
+    "MetadataBindingWorkersBindingKindD1",
+    "MetadataBindingWorkersBindingKindDataBlob",
+    "MetadataBindingWorkersBindingKindDispatchNamespace",
+    "MetadataBindingWorkersBindingKindDispatchNamespaceOutbound",
+    "MetadataBindingWorkersBindingKindDispatchNamespaceOutboundWorker",
+    "MetadataBindingWorkersBindingKindDurableObjectNamespace",
+    "MetadataBindingWorkersBindingKindHyperdrive",
+    "MetadataBindingWorkersBindingKindInherit",
+    "MetadataBindingWorkersBindingKindImages",
+    "MetadataBindingWorkersBindingKindJson",
+    "MetadataBindingWorkersBindingKindKVNamespace",
+    "MetadataBindingWorkersBindingKindMTLSCertificate",
+    "MetadataBindingWorkersBindingKindPlainText",
+    "MetadataBindingWorkersBindingKindPipelines",
+    "MetadataBindingWorkersBindingKindQueue",
+    "MetadataBindingWorkersBindingKindRatelimit",
+    "MetadataBindingWorkersBindingKindRatelimitSimple",
+    "MetadataBindingWorkersBindingKindR2Bucket",
+    "MetadataBindingWorkersBindingKindSecretText",
+    "MetadataBindingWorkersBindingKindSendEmail",
+    "MetadataBindingWorkersBindingKindService",
+    "MetadataBindingWorkersBindingKindTextBlob",
+    "MetadataBindingWorkersBindingKindVectorize",
+    "MetadataBindingWorkersBindingKindVersionMetadata",
+    "MetadataBindingWorkersBindingKindSecretsStoreSecret",
+    "MetadataBindingWorkersBindingKindSecretKey",
+    "MetadataBindingWorkersBindingKindWorkflow",
+    "MetadataBindingWorkersBindingKindWasmModule",
+    "MetadataLimits",
+    "MetadataMigrations",
+    "MetadataMigrationsWorkersMultipleStepMigrations",
+    "MetadataObservability",
+    "MetadataObservabilityLogs",
+    "MetadataPlacement",
+    "MetadataPlacementUnionMember0",
+    "MetadataPlacementUnionMember1",
+    "MetadataPlacementUnionMember2",
+    "MetadataPlacementUnionMember3",
+    "MetadataPlacementUnionMember4",
+    "MetadataPlacementUnionMember5",
+    "MetadataPlacementUnionMember6",
+    "MetadataPlacementUnionMember7",
+    "MetadataPlacementUnionMember7Target",
+    "MetadataPlacementUnionMember7TargetRegion",
+    "MetadataPlacementUnionMember7TargetHostname",
+    "MetadataPlacementUnionMember7TargetHost",
+]
+
+
+class ScriptUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
 
+    metadata: Required[Metadata]
+    """JSON-encoded metadata about the uploaded parts and Worker configuration."""
 
-class Variant0(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
+    files: SequenceNotStr[FileTypes]
+    """An array of modules (often JavaScript files) comprising a Worker script.
+
+    At least one module must be present and referenced in the metadata as
+    `main_module` or `body_part` by filename.<br/>Possible Content-Type(s) are:
+    `application/javascript+module`, `text/javascript+module`,
+    `application/javascript`, `text/javascript`, `text/x-python`,
+    `text/x-python-requirement`, `application/wasm`, `text/plain`,
+    `application/octet-stream`, `application/source-map`.
+    """
+
+
+class MetadataAssetsConfig(TypedDict, total=False):
+    """Configuration for assets within a Worker."""
+
+    _headers: str
+    """
+    The contents of a \\__headers file (used to attach custom headers on asset
+    responses).
+    """
+
+    _redirects: str
+    """
+    The contents of a \\__redirects file (used to apply redirects or proxy paths ahead
+    of asset serving).
+    """
+
+    html_handling: Literal["auto-trailing-slash", "force-trailing-slash", "drop-trailing-slash", "none"]
+    """Determines the redirects and rewrites of requests for HTML content."""
+
+    not_found_handling: Literal["none", "404-page", "single-page-application"]
+    """
+    Determines the response when a request does not match a static asset, and there
+    is no Worker script.
+    """
+
+    run_worker_first: Union[SequenceNotStr[str], bool]
+    """Contains a list path rules to control routing to either the Worker or assets.
+
+    Glob (\\**) and negative (!) rules are supported. Rules must start with either '/'
+    or '!/'. At least one non-negative rule must be provided, and negative rules
+    have higher precedence than non-negative rules.
+    """
+
+    serve_directly: bool
+    """
+    When true and the incoming request matches an asset, that will be served instead
+    of invoking the Worker script. When false, requests will always invoke the
+    Worker script.
+    """
+
+
+class MetadataAssets(TypedDict, total=False):
+    """Configuration for assets within a Worker."""
+
+    config: MetadataAssetsConfig
+    """Configuration for assets within a Worker."""
+
+    jwt: str
+    """Token provided upon successful upload of all files from a registered manifest."""
+
+
+class MetadataBindingWorkersBindingKindAI(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["ai"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindAnalyticsEngine(TypedDict, total=False):
+    dataset: Required[str]
+    """The name of the dataset to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["analytics_engine"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindAssets(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["assets"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindBrowser(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["browser"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindD1(TypedDict, total=False):
+    id: Required[str]
+    """Identifier of the D1 database to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["d1"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindDataBlob(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    part: Required[str]
+    """The name of the file containing the data content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Required[Literal["data_blob"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindDispatchNamespaceOutboundWorker(TypedDict, total=False):
+    """Outbound worker."""
+
+    environment: str
+    """Environment of the outbound worker."""
+
+    service: str
+    """Name of the outbound worker."""
+
+
+class MetadataBindingWorkersBindingKindDispatchNamespaceOutbound(TypedDict, total=False):
+    """Outbound worker."""
+
+    params: SequenceNotStr[str]
+    """
+    Pass information from the Dispatch Worker to the Outbound Worker through the
+    parameters.
+    """
+
+    worker: MetadataBindingWorkersBindingKindDispatchNamespaceOutboundWorker
+    """Outbound worker."""
+
+
+class MetadataBindingWorkersBindingKindDispatchNamespace(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    namespace: Required[str]
+    """The name of the dispatch namespace."""
+
+    type: Required[Literal["dispatch_namespace"]]
+    """The kind of resource that the binding provides."""
+
+    outbound: MetadataBindingWorkersBindingKindDispatchNamespaceOutbound
+    """Outbound worker."""
+
+
+class MetadataBindingWorkersBindingKindDurableObjectNamespace(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["durable_object_namespace"]]
+    """The kind of resource that the binding provides."""
+
+    class_name: str
+    """The exported class name of the Durable Object."""
+
+    environment: str
+    """The environment of the script_name to bind to."""
+
+    namespace_id: str
+    """Namespace identifier tag."""
+
+    script_name: str
+    """
+    The script where the Durable Object is defined, if it is external to this
+    Worker.
+    """
+
+
+class MetadataBindingWorkersBindingKindHyperdrive(TypedDict, total=False):
+    id: Required[str]
+    """Identifier of the Hyperdrive connection to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["hyperdrive"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindInherit(TypedDict, total=False):
+    name: Required[str]
+    """The name of the inherited binding."""
+
+    type: Required[Literal["inherit"]]
+    """The kind of resource that the binding provides."""
+
+    old_name: str
+    """The old name of the inherited binding.
+
+    If set, the binding will be renamed from `old_name` to `name` in the new
+    version. If not set, the binding will keep the same name between versions.
+    """
+
+    version_id: str
+    """
+    Identifier for the version to inherit the binding from, which can be the version
+    ID or the literal "latest" to inherit from the latest version. Defaults to
+    inheriting the binding from the latest version.
+    """
+
+
+class MetadataBindingWorkersBindingKindImages(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["images"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindJson(TypedDict, total=False):
+    json: Required[str]
+    """JSON data to use."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["json"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindKVNamespace(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: Required[str]
+    """Namespace identifier tag."""
+
+    type: Required[Literal["kv_namespace"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindMTLSCertificate(TypedDict, total=False):
+    certificate_id: Required[str]
+    """Identifier of the certificate to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["mtls_certificate"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindPlainText(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    text: Required[str]
+    """The text value to use."""
+
+    type: Required[Literal["plain_text"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindPipelines(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    pipeline: Required[str]
+    """Name of the Pipeline to bind to."""
+
+    type: Required[Literal["pipelines"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindQueue(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    queue_name: Required[str]
+    """Name of the Queue to bind to."""
+
+    type: Required[Literal["queue"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindRatelimitSimple(TypedDict, total=False):
+    """The rate limit configuration."""
+
+    limit: Required[float]
+    """The limit (requests per period)."""
+
+    period: Required[int]
+    """The period in seconds."""
+
+
+class MetadataBindingWorkersBindingKindRatelimit(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: Required[str]
+    """Identifier of the rate limit namespace to bind to."""
+
+    simple: Required[MetadataBindingWorkersBindingKindRatelimitSimple]
+    """The rate limit configuration."""
+
+    type: Required[Literal["ratelimit"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindR2Bucket(TypedDict, total=False):
+    bucket_name: Required[str]
+    """R2 bucket to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["r2_bucket"]]
+    """The kind of resource that the binding provides."""
+
+    jurisdiction: Literal["eu", "fedramp"]
+    """
+    The
+    [jurisdiction](https://developers.cloudflare.com/r2/reference/data-location/#jurisdictional-restrictions)
+    of the R2 bucket.
+    """
 
-    rollback_to: str
-    """Rollback to provided deployment based on deployment ID.
 
-    Request body will only parse a "message" part. You can learn more about
-    deployments
-    [here](https://developers.cloudflare.com/workers/platform/deployments/).
+class MetadataBindingWorkersBindingKindSecretText(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    text: Required[str]
+    """The secret value to use."""
+
+    type: Required[Literal["secret_text"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindSendEmail(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["send_email"]]
+    """The kind of resource that the binding provides."""
+
+    allowed_destination_addresses: SequenceNotStr[str]
+    """List of allowed destination addresses."""
+
+    allowed_sender_addresses: SequenceNotStr[str]
+    """List of allowed sender addresses."""
+
+    destination_address: str
+    """Destination address for the email."""
+
+
+class MetadataBindingWorkersBindingKindService(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    service: Required[str]
+    """Name of Worker to bind to."""
+
+    type: Required[Literal["service"]]
+    """The kind of resource that the binding provides."""
+
+    environment: str
+    """Optional environment if the Worker utilizes one."""
+
+
+class MetadataBindingWorkersBindingKindTextBlob(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    part: Required[str]
+    """The name of the file containing the text content.
+
+    Only accepted for `service worker syntax` Workers.
     """
 
-    any_part_name: Annotated[List[FileTypes], PropertyInfo(alias="<any part name>")]
-    """A module comprising a Worker script, often a javascript file.
+    type: Required[Literal["text_blob"]]
+    """The kind of resource that the binding provides."""
 
-    Multiple modules may be provided as separate named parts, but at least one
-    module must be present and referenced in the metadata as `main_module` or
-    `body_part` by part name. Source maps may also be included using the
-    `application/source-map` content type.
+
+class MetadataBindingWorkersBindingKindVectorize(TypedDict, total=False):
+    index_name: Required[str]
+    """Name of the Vectorize index to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["vectorize"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindVersionMetadata(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["version_metadata"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindSecretsStoreSecret(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    secret_name: Required[str]
+    """Name of the secret in the store."""
+
+    store_id: Required[str]
+    """ID of the store containing the secret."""
+
+    type: Required[Literal["secrets_store_secret"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindSecretKey(TypedDict, total=False):
+    algorithm: Required[object]
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
     """
 
-    metadata: Variant0Metadata
-    """JSON encoded metadata about the uploaded parts and Worker configuration."""
+    format: Required[Literal["raw", "pkcs8", "spki", "jwk"]]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
 
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
 
-Variant0MetadataMigrations = Union[SingleStepMigrationParam, SteppedMigrationParam]
+    type: Required[Literal["secret_key"]]
+    """The kind of resource that the binding provides."""
 
+    usages: Required[
+        List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    ]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+    key_base64: str
+    """Base64-encoded key data. Required if `format` is "raw", "pkcs8", or "spki"."""
+
+    key_jwk: object
+    """
+    Key data in
+    [JSON Web Key](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#json_web_key)
+    format. Required if `format` is "jwk".
+    """
+
+
+class MetadataBindingWorkersBindingKindWorkflow(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["workflow"]]
+    """The kind of resource that the binding provides."""
+
+    workflow_name: Required[str]
+    """Name of the Workflow to bind to."""
+
+    class_name: str
+    """Class name of the Workflow.
+
+    Should only be provided if the Workflow belongs to this script.
+    """
+
+    script_name: str
+    """Script name that contains the Workflow.
+
+    If not provided, defaults to this script name.
+    """
+
+
+class MetadataBindingWorkersBindingKindWasmModule(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    part: Required[str]
+    """The name of the file containing the WebAssembly module content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Required[Literal["wasm_module"]]
+    """The kind of resource that the binding provides."""
+
+
+MetadataBinding: TypeAlias = Union[
+    MetadataBindingWorkersBindingKindAI,
+    MetadataBindingWorkersBindingKindAnalyticsEngine,
+    MetadataBindingWorkersBindingKindAssets,
+    MetadataBindingWorkersBindingKindBrowser,
+    MetadataBindingWorkersBindingKindD1,
+    MetadataBindingWorkersBindingKindDataBlob,
+    MetadataBindingWorkersBindingKindDispatchNamespace,
+    MetadataBindingWorkersBindingKindDurableObjectNamespace,
+    MetadataBindingWorkersBindingKindHyperdrive,
+    MetadataBindingWorkersBindingKindInherit,
+    MetadataBindingWorkersBindingKindImages,
+    MetadataBindingWorkersBindingKindJson,
+    MetadataBindingWorkersBindingKindKVNamespace,
+    MetadataBindingWorkersBindingKindMTLSCertificate,
+    MetadataBindingWorkersBindingKindPlainText,
+    MetadataBindingWorkersBindingKindPipelines,
+    MetadataBindingWorkersBindingKindQueue,
+    MetadataBindingWorkersBindingKindRatelimit,
+    MetadataBindingWorkersBindingKindR2Bucket,
+    MetadataBindingWorkersBindingKindSecretText,
+    MetadataBindingWorkersBindingKindSendEmail,
+    MetadataBindingWorkersBindingKindService,
+    MetadataBindingWorkersBindingKindTextBlob,
+    MetadataBindingWorkersBindingKindVectorize,
+    MetadataBindingWorkersBindingKindVersionMetadata,
+    MetadataBindingWorkersBindingKindSecretsStoreSecret,
+    MetadataBindingWorkersBindingKindSecretKey,
+    MetadataBindingWorkersBindingKindWorkflow,
+    MetadataBindingWorkersBindingKindWasmModule,
+]
+
+
+class MetadataLimits(TypedDict, total=False):
+    """Limits to apply for this Worker."""
+
+    cpu_ms: int
+    """The amount of CPU time this Worker can use in milliseconds."""
+
+
+class MetadataMigrationsWorkersMultipleStepMigrations(TypedDict, total=False):
+    new_tag: str
+    """Tag to set as the latest migration tag."""
+
+    old_tag: str
+    """Tag used to verify against the latest migration tag for this Worker.
+
+    If they don't match, the upload is rejected.
+    """
+
+    steps: Iterable[MigrationStepParam]
+    """Migrations to apply in order."""
+
+
+MetadataMigrations: TypeAlias = Union[SingleStepMigrationParam, MetadataMigrationsWorkersMultipleStepMigrations]
+
+
+class MetadataObservabilityLogs(TypedDict, total=False):
+    """Log settings for the Worker."""
+
+    enabled: Required[bool]
+    """Whether logs are enabled for the Worker."""
+
+    invocation_logs: Required[bool]
+    """
+    Whether
+    [invocation logs](https://developers.cloudflare.com/workers/observability/logs/workers-logs/#invocation-logs)
+    are enabled for the Worker.
+    """
 
-class Variant0Metadata(TypedDict, total=False):
-    bindings: Iterable[object]
-    """List of bindings available to the worker."""
+    destinations: SequenceNotStr[str]
+    """A list of destinations where logs will be exported to."""
+
+    head_sampling_rate: Optional[float]
+    """The sampling rate for logs. From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1."""
+
+    persist: bool
+    """Whether log persistence is enabled for the Worker."""
+
+
+class MetadataObservability(TypedDict, total=False):
+    """Observability settings for the Worker."""
+
+    enabled: Required[bool]
+    """Whether observability is enabled for the Worker."""
+
+    head_sampling_rate: Optional[float]
+    """The sampling rate for incoming requests.
+
+    From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1.
+    """
+
+    logs: Optional[MetadataObservabilityLogs]
+    """Log settings for the Worker."""
+
+
+class MetadataPlacementUnionMember0(TypedDict, total=False):
+    mode: Required[Literal["smart"]]
+    """
+    Enables
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class MetadataPlacementUnionMember1(TypedDict, total=False):
+    region: Required[str]
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class MetadataPlacementUnionMember2(TypedDict, total=False):
+    hostname: Required[str]
+    """HTTP hostname for targeted placement."""
+
+
+class MetadataPlacementUnionMember3(TypedDict, total=False):
+    host: Required[str]
+    """TCP host and port for targeted placement."""
+
+
+class MetadataPlacementUnionMember4(TypedDict, total=False):
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+    region: Required[str]
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class MetadataPlacementUnionMember5(TypedDict, total=False):
+    hostname: Required[str]
+    """HTTP hostname for targeted placement."""
+
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+
+class MetadataPlacementUnionMember6(TypedDict, total=False):
+    host: Required[str]
+    """TCP host and port for targeted placement."""
+
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+
+class MetadataPlacementUnionMember7TargetRegion(TypedDict, total=False):
+    region: Required[str]
+    """Cloud region in format 'provider:region'."""
+
+
+class MetadataPlacementUnionMember7TargetHostname(TypedDict, total=False):
+    hostname: Required[str]
+    """HTTP hostname for targeted placement."""
+
+
+class MetadataPlacementUnionMember7TargetHost(TypedDict, total=False):
+    host: Required[str]
+    """TCP host:port for targeted placement."""
+
+
+MetadataPlacementUnionMember7Target: TypeAlias = Union[
+    MetadataPlacementUnionMember7TargetRegion,
+    MetadataPlacementUnionMember7TargetHostname,
+    MetadataPlacementUnionMember7TargetHost,
+]
+
+
+class MetadataPlacementUnionMember7(TypedDict, total=False):
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+    target: Required[Iterable[MetadataPlacementUnionMember7Target]]
+    """Array of placement targets (currently limited to single target)."""
+
+
+MetadataPlacement: TypeAlias = Union[
+    MetadataPlacementUnionMember0,
+    MetadataPlacementUnionMember1,
+    MetadataPlacementUnionMember2,
+    MetadataPlacementUnionMember3,
+    MetadataPlacementUnionMember4,
+    MetadataPlacementUnionMember5,
+    MetadataPlacementUnionMember6,
+    MetadataPlacementUnionMember7,
+]
+
+
+class Metadata(TypedDict, total=False):
+    """JSON-encoded metadata about the uploaded parts and Worker configuration."""
+
+    assets: MetadataAssets
+    """Configuration for assets within a Worker."""
+
+    bindings: Iterable[MetadataBinding]
+    """List of bindings attached to a Worker.
+
+    You can find more about bindings on our docs:
+    https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
+    """
 
     body_part: str
-    """Name of the part in the multipart request that contains the script (e.g.
+    """Name of the uploaded file that contains the script (e.g.
 
     the file adding a listener to the `fetch` event). Indicates a
     `service worker syntax` Worker.
@@ -61,60 +783,52 @@ class Variant0Metadata(TypedDict, total=False):
     this Worker.
     """
 
-    compatibility_flags: List[str]
+    compatibility_flags: SequenceNotStr[str]
     """Flags that enable or disable certain features in the Workers runtime.
 
     Used to enable upcoming features or opt in or out of specific changes not
     included in a `compatibility_date`.
     """
 
-    keep_bindings: List[str]
+    keep_assets: bool
+    """
+    Retain assets which exist for a previously uploaded Worker version; used in lieu
+    of providing a completion token.
+    """
+
+    keep_bindings: SequenceNotStr[str]
     """List of binding types to keep from previous_upload."""
 
+    limits: MetadataLimits
+    """Limits to apply for this Worker."""
+
     logpush: bool
     """Whether Logpush is turned on for the Worker."""
 
     main_module: str
-    """Name of the part in the multipart request that contains the main module (e.g.
+    """Name of the uploaded file that contains the main module (e.g.
 
     the file exporting a `fetch` handler). Indicates a `module syntax` Worker.
     """
 
-    migrations: Variant0MetadataMigrations
+    migrations: MetadataMigrations
     """Migrations to apply for Durable Objects associated with this Worker."""
 
-    placement: PlacementConfigurationParam
-
-    tags: List[str]
-    """List of strings to use as tags for this Worker"""
-
-    tail_consumers: Iterable[ConsumerScriptParam]
-    """List of Workers that will consume logs from the attached Worker."""
-
-    usage_model: Literal["bundled", "unbound"]
-    """Usage model to apply to invocations."""
-
-    version_tags: object
-    """Key-value pairs to use as tags for this version of this Worker"""
+    observability: MetadataObservability
+    """Observability settings for the Worker."""
 
-
-class Variant1(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    rollback_to: str
-    """Rollback to provided deployment based on deployment ID.
-
-    Request body will only parse a "message" part. You can learn more about
-    deployments
-    [here](https://developers.cloudflare.com/workers/platform/deployments/).
+    placement: MetadataPlacement
     """
-
-    message: str
-    """Rollback message to be associated with this deployment.
-
-    Only parsed when query param `"rollback_to"` is present.
+    Configuration for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    Specify mode='smart' for Smart Placement, or one of region/hostname/host.
     """
 
+    tags: SequenceNotStr[str]
+    """List of strings to use as tags for this Worker."""
+
+    tail_consumers: Optional[Iterable[ConsumerScriptParam]]
+    """List of Workers that will consume logs from the attached Worker."""
 
-ScriptUpdateParams = Union[Variant0, Variant1]
+    usage_model: Literal["standard", "bundled", "unbound"]
+    """Usage model for the Worker invocations."""
diff --git a/src/cloudflare/types/workers/script_update_response.py b/src/cloudflare/types/workers/script_update_response.py
new file mode 100644
index 00000000000..3a3f01dc816
--- /dev/null
+++ b/src/cloudflare/types/workers/script_update_response.py
@@ -0,0 +1,344 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ..._models import BaseModel
+from .scripts.consumer_script import ConsumerScript
+
+__all__ = [
+    "ScriptUpdateResponse",
+    "NamedHandler",
+    "Observability",
+    "ObservabilityLogs",
+    "Placement",
+    "PlacementUnionMember0",
+    "PlacementUnionMember1",
+    "PlacementUnionMember2",
+    "PlacementUnionMember3",
+    "PlacementUnionMember4",
+    "PlacementUnionMember5",
+    "PlacementUnionMember6",
+    "PlacementUnionMember7",
+    "PlacementUnionMember7Target",
+    "PlacementUnionMember7TargetRegion",
+    "PlacementUnionMember7TargetHostname",
+    "PlacementUnionMember7TargetHost",
+]
+
+
+class NamedHandler(BaseModel):
+    handlers: Optional[List[str]] = None
+    """The names of handlers exported as part of the named export."""
+
+    name: Optional[str] = None
+    """The name of the export."""
+
+
+class ObservabilityLogs(BaseModel):
+    """Log settings for the Worker."""
+
+    enabled: bool
+    """Whether logs are enabled for the Worker."""
+
+    invocation_logs: bool
+    """
+    Whether
+    [invocation logs](https://developers.cloudflare.com/workers/observability/logs/workers-logs/#invocation-logs)
+    are enabled for the Worker.
+    """
+
+    destinations: Optional[List[str]] = None
+    """A list of destinations where logs will be exported to."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for logs. From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1."""
+
+    persist: Optional[bool] = None
+    """Whether log persistence is enabled for the Worker."""
+
+
+class Observability(BaseModel):
+    """Observability settings for the Worker."""
+
+    enabled: bool
+    """Whether observability is enabled for the Worker."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for incoming requests.
+
+    From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1.
+    """
+
+    logs: Optional[ObservabilityLogs] = None
+    """Log settings for the Worker."""
+
+
+class PlacementUnionMember0(BaseModel):
+    mode: Literal["smart"]
+    """
+    Enables
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember1(BaseModel):
+    region: str
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember2(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember3(BaseModel):
+    host: str
+    """TCP host and port for targeted placement."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember4(BaseModel):
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    region: str
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember5(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember6(BaseModel):
+    host: str
+    """TCP host and port for targeted placement."""
+
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember7TargetRegion(BaseModel):
+    region: str
+    """Cloud region in format 'provider:region'."""
+
+
+class PlacementUnionMember7TargetHostname(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+
+class PlacementUnionMember7TargetHost(BaseModel):
+    host: str
+    """TCP host:port for targeted placement."""
+
+
+PlacementUnionMember7Target: TypeAlias = Union[
+    PlacementUnionMember7TargetRegion, PlacementUnionMember7TargetHostname, PlacementUnionMember7TargetHost
+]
+
+
+class PlacementUnionMember7(BaseModel):
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    target: List[PlacementUnionMember7Target]
+    """Array of placement targets (currently limited to single target)."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+Placement: TypeAlias = Union[
+    PlacementUnionMember0,
+    PlacementUnionMember1,
+    PlacementUnionMember2,
+    PlacementUnionMember3,
+    PlacementUnionMember4,
+    PlacementUnionMember5,
+    PlacementUnionMember6,
+    PlacementUnionMember7,
+]
+
+
+class ScriptUpdateResponse(BaseModel):
+    startup_time_ms: int
+
+    id: Optional[str] = None
+    """The name used to identify the script."""
+
+    compatibility_date: Optional[str] = None
+    """Date indicating targeted support in the Workers runtime.
+
+    Backwards incompatible fixes to the runtime following this date will not affect
+    this Worker.
+    """
+
+    compatibility_flags: Optional[List[str]] = None
+    """Flags that enable or disable certain features in the Workers runtime.
+
+    Used to enable upcoming features or opt in or out of specific changes not
+    included in a `compatibility_date`.
+    """
+
+    created_on: Optional[datetime] = None
+    """When the script was created."""
+
+    entry_point: Optional[str] = None
+    """The entry point for the script."""
+
+    etag: Optional[str] = None
+    """Hashed script content, can be used in a If-None-Match header when updating."""
+
+    handlers: Optional[List[str]] = None
+    """The names of handlers exported as part of the default export."""
+
+    has_assets: Optional[bool] = None
+    """Whether a Worker contains assets."""
+
+    has_modules: Optional[bool] = None
+    """Whether a Worker contains modules."""
+
+    last_deployed_from: Optional[str] = None
+    """The client most recently used to deploy this Worker."""
+
+    logpush: Optional[bool] = None
+    """Whether Logpush is turned on for the Worker."""
+
+    migration_tag: Optional[str] = None
+    """
+    The tag of the Durable Object migration that was most recently applied for this
+    Worker.
+    """
+
+    modified_on: Optional[datetime] = None
+    """When the script was last modified."""
+
+    named_handlers: Optional[List[NamedHandler]] = None
+    """
+    Named exports, such as Durable Object class implementations and named
+    entrypoints.
+    """
+
+    observability: Optional[Observability] = None
+    """Observability settings for the Worker."""
+
+    placement: Optional[Placement] = None
+    """
+    Configuration for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    Specify mode='smart' for Smart Placement, or one of region/hostname/host.
+    """
+
+    placement_mode: Optional[Literal["smart", "targeted"]] = None
+
+    placement_status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+
+    tag: Optional[str] = None
+    """The immutable ID of the script."""
+
+    tags: Optional[List[str]] = None
+    """Tags associated with the Worker."""
+
+    tail_consumers: Optional[List[ConsumerScript]] = None
+    """List of Workers that will consume logs from the attached Worker."""
+
+    usage_model: Optional[Literal["standard", "bundled", "unbound"]] = None
+    """Usage model for the Worker invocations."""
diff --git a/src/cloudflare/types/workers/scripts/__init__.py b/src/cloudflare/types/workers/scripts/__init__.py
index 64f34786b7c..0f5dacf8f0d 100644
--- a/src/cloudflare/types/workers/scripts/__init__.py
+++ b/src/cloudflare/types/workers/scripts/__init__.py
@@ -2,14 +2,17 @@
 
 from __future__ import annotations
 
-from .schedule import Schedule as Schedule
 from .deployment import Deployment as Deployment
 from .consumer_script import ConsumerScript as ConsumerScript
-from .deployment_param import DeploymentParam as DeploymentParam
+from .secret_get_params import SecretGetParams as SecretGetParams
 from .tail_get_response import TailGetResponse as TailGetResponse
 from .tail_create_params import TailCreateParams as TailCreateParams
+from .secret_get_response import SecretGetResponse as SecretGetResponse
 from .setting_edit_params import SettingEditParams as SettingEditParams
 from .version_list_params import VersionListParams as VersionListParams
+from .secret_delete_params import SecretDeleteParams as SecretDeleteParams
+from .secret_list_response import SecretListResponse as SecretListResponse
+from .secret_update_params import SecretUpdateParams as SecretUpdateParams
 from .tail_create_response import TailCreateResponse as TailCreateResponse
 from .tail_delete_response import TailDeleteResponse as TailDeleteResponse
 from .version_get_response import VersionGetResponse as VersionGetResponse
@@ -19,8 +22,22 @@
 from .version_create_params import VersionCreateParams as VersionCreateParams
 from .version_list_response import VersionListResponse as VersionListResponse
 from .schedule_update_params import ScheduleUpdateParams as ScheduleUpdateParams
-from .deployment_get_response import DeploymentGetResponse as DeploymentGetResponse
+from .secret_update_response import SecretUpdateResponse as SecretUpdateResponse
+from .subdomain_get_response import SubdomainGetResponse as SubdomainGetResponse
+from .subdomain_create_params import SubdomainCreateParams as SubdomainCreateParams
 from .version_create_response import VersionCreateResponse as VersionCreateResponse
 from .deployment_create_params import DeploymentCreateParams as DeploymentCreateParams
+from .deployment_list_response import DeploymentListResponse as DeploymentListResponse
 from .schedule_update_response import ScheduleUpdateResponse as ScheduleUpdateResponse
-from .deployment_create_response import DeploymentCreateResponse as DeploymentCreateResponse
+from .subdomain_create_response import SubdomainCreateResponse as SubdomainCreateResponse
+from .subdomain_delete_response import SubdomainDeleteResponse as SubdomainDeleteResponse
+from .deployment_delete_response import DeploymentDeleteResponse as DeploymentDeleteResponse
+from .script_and_version_setting_edit_params import (
+    ScriptAndVersionSettingEditParams as ScriptAndVersionSettingEditParams,
+)
+from .script_and_version_setting_get_response import (
+    ScriptAndVersionSettingGetResponse as ScriptAndVersionSettingGetResponse,
+)
+from .script_and_version_setting_edit_response import (
+    ScriptAndVersionSettingEditResponse as ScriptAndVersionSettingEditResponse,
+)
diff --git a/src/cloudflare/types/workers/scripts/assets/__init__.py b/src/cloudflare/types/workers/scripts/assets/__init__.py
new file mode 100644
index 00000000000..3ec0c84c4dd
--- /dev/null
+++ b/src/cloudflare/types/workers/scripts/assets/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .upload_create_params import UploadCreateParams as UploadCreateParams
+from .upload_create_response import UploadCreateResponse as UploadCreateResponse
diff --git a/src/cloudflare/types/workers/scripts/assets/upload_create_params.py b/src/cloudflare/types/workers/scripts/assets/upload_create_params.py
new file mode 100644
index 00000000000..ee02d35a3ee
--- /dev/null
+++ b/src/cloudflare/types/workers/scripts/assets/upload_create_params.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict
+from typing_extensions import Required, TypedDict
+
+__all__ = ["UploadCreateParams", "Manifest"]
+
+
+class UploadCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    manifest: Required[Dict[str, Manifest]]
+    """A manifest ([path]: {hash, size}) map of files to upload.
+
+    As an example, `/blog/hello-world.html` would be a valid path key.
+    """
+
+
+class Manifest(TypedDict, total=False):
+    hash: Required[str]
+    """The hash of the file."""
+
+    size: Required[int]
+    """The size of the file in bytes."""
diff --git a/src/cloudflare/types/workers/scripts/assets/upload_create_response.py b/src/cloudflare/types/workers/scripts/assets/upload_create_response.py
new file mode 100644
index 00000000000..1f4e57e5ad5
--- /dev/null
+++ b/src/cloudflare/types/workers/scripts/assets/upload_create_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ....._models import BaseModel
+
+__all__ = ["UploadCreateResponse"]
+
+
+class UploadCreateResponse(BaseModel):
+    buckets: Optional[List[List[str]]] = None
+    """The requests to make to upload assets."""
+
+    jwt: Optional[str] = None
+    """A JWT to use as authentication for uploading assets."""
diff --git a/src/cloudflare/types/workers/scripts/consumer_script.py b/src/cloudflare/types/workers/scripts/consumer_script.py
index 6d933e952fc..fde1a1717c5 100644
--- a/src/cloudflare/types/workers/scripts/consumer_script.py
+++ b/src/cloudflare/types/workers/scripts/consumer_script.py
@@ -8,6 +8,8 @@
 
 
 class ConsumerScript(BaseModel):
+    """A reference to a script that will consume logs from the attached Worker."""
+
     service: str
     """Name of Worker that is to be the consumer."""
 
diff --git a/src/cloudflare/types/workers/scripts/consumer_script_param.py b/src/cloudflare/types/workers/scripts/consumer_script_param.py
index 2d7996c8449..116ffa678a0 100644
--- a/src/cloudflare/types/workers/scripts/consumer_script_param.py
+++ b/src/cloudflare/types/workers/scripts/consumer_script_param.py
@@ -8,6 +8,8 @@
 
 
 class ConsumerScriptParam(TypedDict, total=False):
+    """A reference to a script that will consume logs from the attached Worker."""
+
     service: Required[str]
     """Name of Worker that is to be the consumer."""
 
diff --git a/src/cloudflare/types/workers/scripts/content_update_params.py b/src/cloudflare/types/workers/scripts/content_update_params.py
index f5c5e96e343..f24e76e9522 100644
--- a/src/cloudflare/types/workers/scripts/content_update_params.py
+++ b/src/cloudflare/types/workers/scripts/content_update_params.py
@@ -2,34 +2,49 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Required, Annotated, TypedDict
 
-from ...._types import FileTypes
+from ...._types import FileTypes, SequenceNotStr
 from ...._utils import PropertyInfo
-from ..worker_metadata_param import WorkerMetadataParam
 
-__all__ = ["ContentUpdateParams"]
+__all__ = ["ContentUpdateParams", "Metadata"]
 
 
 class ContentUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    any_part_name: Annotated[List[FileTypes], PropertyInfo(alias="<any part name>")]
-    """A module comprising a Worker script, often a javascript file.
+    metadata: Required[Metadata]
+    """JSON-encoded metadata about the uploaded parts and Worker configuration."""
 
-    Multiple modules may be provided as separate named parts, but at least one
-    module must be present. This should be referenced either in the metadata as
-    `main_module` (esm)/`body_part` (service worker) or as a header
-    `CF-WORKER-MAIN-MODULE-PART` (esm) /`CF-WORKER-BODY-PART` (service worker) by
-    part name. Source maps may also be included using the `application/source-map`
-    content type.
-    """
+    files: SequenceNotStr[FileTypes]
+    """An array of modules (often JavaScript files) comprising a Worker script.
 
-    metadata: WorkerMetadataParam
-    """JSON encoded metadata about the uploaded parts and Worker configuration."""
+    At least one module must be present and referenced in the metadata as
+    `main_module` or `body_part` by filename.<br/>Possible Content-Type(s) are:
+    `application/javascript+module`, `text/javascript+module`,
+    `application/javascript`, `text/javascript`, `text/x-python`,
+    `text/x-python-requirement`, `application/wasm`, `text/plain`,
+    `application/octet-stream`, `application/source-map`.
+    """
 
     cf_worker_body_part: Annotated[str, PropertyInfo(alias="CF-WORKER-BODY-PART")]
 
     cf_worker_main_module_part: Annotated[str, PropertyInfo(alias="CF-WORKER-MAIN-MODULE-PART")]
+
+
+class Metadata(TypedDict, total=False):
+    """JSON-encoded metadata about the uploaded parts and Worker configuration."""
+
+    body_part: str
+    """Name of the uploaded file that contains the Worker script (e.g.
+
+    the file adding a listener to the `fetch` event). Indicates a
+    `service worker syntax` Worker.
+    """
+
+    main_module: str
+    """Name of the uploaded file that contains the main module (e.g.
+
+    the file exporting a `fetch` handler). Indicates a `module syntax` Worker.
+    """
diff --git a/src/cloudflare/types/workers/scripts/deployment.py b/src/cloudflare/types/workers/scripts/deployment.py
index a07f4231c28..4e1b46b056d 100644
--- a/src/cloudflare/types/workers/scripts/deployment.py
+++ b/src/cloudflare/types/workers/scripts/deployment.py
@@ -1,14 +1,41 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["Deployment"]
+__all__ = ["Deployment", "Version", "Annotations"]
 
 
-class Deployment(BaseModel):
+class Version(BaseModel):
+    percentage: float
+
+    version_id: str
+
+
+class Annotations(BaseModel):
     workers_message: Optional[str] = FieldInfo(alias="workers/message", default=None)
-    """Human-readable message about the deployment."""
+    """Human-readable message about the deployment. Truncated to 100 bytes."""
+
+    workers_triggered_by: Optional[str] = FieldInfo(alias="workers/triggered_by", default=None)
+    """Operation that triggered the creation of the deployment."""
+
+
+class Deployment(BaseModel):
+    id: str
+
+    created_on: datetime
+
+    source: str
+
+    strategy: Literal["percentage"]
+
+    versions: List[Version]
+
+    annotations: Optional[Annotations] = None
+
+    author_email: Optional[str] = None
diff --git a/src/cloudflare/types/workers/scripts/deployment_create_params.py b/src/cloudflare/types/workers/scripts/deployment_create_params.py
index e9f1f6b7a17..24b8431b0b9 100644
--- a/src/cloudflare/types/workers/scripts/deployment_create_params.py
+++ b/src/cloudflare/types/workers/scripts/deployment_create_params.py
@@ -2,17 +2,37 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import Iterable
+from typing_extensions import Literal, Required, Annotated, TypedDict
 
-from .deployment_param import DeploymentParam
+from ...._utils import PropertyInfo
 
-__all__ = ["DeploymentCreateParams"]
+__all__ = ["DeploymentCreateParams", "Version", "Annotations"]
 
 
 class DeploymentCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    annotations: DeploymentParam
+    strategy: Required[Literal["percentage"]]
 
-    strategy: str
+    versions: Required[Iterable[Version]]
+
+    force: bool
+    """
+    If set to true, the deployment will be created even if normally blocked by
+    something such rolling back to an older version when a secret has changed.
+    """
+
+    annotations: Annotations
+
+
+class Version(TypedDict, total=False):
+    percentage: Required[float]
+
+    version_id: Required[str]
+
+
+class Annotations(TypedDict, total=False):
+    workers_message: Annotated[str, PropertyInfo(alias="workers/message")]
+    """Human-readable message about the deployment. Truncated to 100 bytes."""
diff --git a/src/cloudflare/types/workers/scripts/deployment_create_response.py b/src/cloudflare/types/workers/scripts/deployment_create_response.py
deleted file mode 100644
index 8625732c33c..00000000000
--- a/src/cloudflare/types/workers/scripts/deployment_create_response.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ...._models import BaseModel
-from .deployment import Deployment
-
-__all__ = ["DeploymentCreateResponse"]
-
-
-class DeploymentCreateResponse(BaseModel):
-    id: Optional[str] = None
-
-    annotations: Optional[Deployment] = None
-
-    author_email: Optional[str] = None
-
-    created_on: Optional[str] = None
-
-    source: Optional[str] = None
-
-    strategy: Optional[str] = None
diff --git a/src/cloudflare/types/workers/scripts/deployment_delete_response.py b/src/cloudflare/types/workers/scripts/deployment_delete_response.py
new file mode 100644
index 00000000000..f1eec442f82
--- /dev/null
+++ b/src/cloudflare/types/workers/scripts/deployment_delete_response.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["DeploymentDeleteResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class DeploymentDeleteResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/workers/scripts/deployment_get_response.py b/src/cloudflare/types/workers/scripts/deployment_get_response.py
deleted file mode 100644
index 9224f4034cc..00000000000
--- a/src/cloudflare/types/workers/scripts/deployment_get_response.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from . import deployment
-from ...._models import BaseModel
-
-__all__ = ["DeploymentGetResponse", "Deployment"]
-
-
-class Deployment(BaseModel):
-    id: Optional[str] = None
-
-    annotations: Optional[deployment.Deployment] = None
-
-    author_email: Optional[str] = None
-
-    created_on: Optional[str] = None
-
-    source: Optional[str] = None
-
-    strategy: Optional[str] = None
-
-
-class DeploymentGetResponse(BaseModel):
-    deployments: Optional[List[Deployment]] = None
diff --git a/src/cloudflare/types/workers/scripts/deployment_list_response.py b/src/cloudflare/types/workers/scripts/deployment_list_response.py
new file mode 100644
index 00000000000..36a2f2ae7fd
--- /dev/null
+++ b/src/cloudflare/types/workers/scripts/deployment_list_response.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+
+from ...._models import BaseModel
+from .deployment import Deployment
+
+__all__ = ["DeploymentListResponse"]
+
+
+class DeploymentListResponse(BaseModel):
+    deployments: List[Deployment]
diff --git a/src/cloudflare/types/workers/scripts/deployment_param.py b/src/cloudflare/types/workers/scripts/deployment_param.py
deleted file mode 100644
index c25292cba40..00000000000
--- a/src/cloudflare/types/workers/scripts/deployment_param.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Annotated, TypedDict
-
-from ...._utils import PropertyInfo
-
-__all__ = ["DeploymentParam"]
-
-
-class DeploymentParam(TypedDict, total=False):
-    workers_message: Annotated[str, PropertyInfo(alias="workers/message")]
-    """Human-readable message about the deployment."""
diff --git a/src/cloudflare/types/workers/scripts/schedule.py b/src/cloudflare/types/workers/scripts/schedule.py
deleted file mode 100644
index 28b027a0796..00000000000
--- a/src/cloudflare/types/workers/scripts/schedule.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ...._models import BaseModel
-
-__all__ = ["Schedule"]
-
-
-class Schedule(BaseModel):
-    created_on: Optional[object] = None
-
-    cron: Optional[object] = None
-
-    modified_on: Optional[object] = None
diff --git a/src/cloudflare/types/workers/scripts/schedule_get_response.py b/src/cloudflare/types/workers/scripts/schedule_get_response.py
index 5d430c7ce85..89bc80e0a88 100644
--- a/src/cloudflare/types/workers/scripts/schedule_get_response.py
+++ b/src/cloudflare/types/workers/scripts/schedule_get_response.py
@@ -2,11 +2,18 @@
 
 from typing import List, Optional
 
-from .schedule import Schedule
 from ...._models import BaseModel
 
-__all__ = ["ScheduleGetResponse"]
+__all__ = ["ScheduleGetResponse", "Schedule"]
+
+
+class Schedule(BaseModel):
+    cron: str
+
+    created_on: Optional[str] = None
+
+    modified_on: Optional[str] = None
 
 
 class ScheduleGetResponse(BaseModel):
-    schedules: Optional[List[Schedule]] = None
+    schedules: List[Schedule]
diff --git a/src/cloudflare/types/workers/scripts/schedule_update_params.py b/src/cloudflare/types/workers/scripts/schedule_update_params.py
index 369978b29eb..3f4e21c6d60 100644
--- a/src/cloudflare/types/workers/scripts/schedule_update_params.py
+++ b/src/cloudflare/types/workers/scripts/schedule_update_params.py
@@ -2,13 +2,18 @@
 
 from __future__ import annotations
 
+from typing import Iterable
 from typing_extensions import Required, TypedDict
 
-__all__ = ["ScheduleUpdateParams"]
+__all__ = ["ScheduleUpdateParams", "Body"]
 
 
 class ScheduleUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    body: Required[str]
+    body: Required[Iterable[Body]]
+
+
+class Body(TypedDict, total=False):
+    cron: Required[str]
diff --git a/src/cloudflare/types/workers/scripts/schedule_update_response.py b/src/cloudflare/types/workers/scripts/schedule_update_response.py
index 0024bf49131..c65552fc308 100644
--- a/src/cloudflare/types/workers/scripts/schedule_update_response.py
+++ b/src/cloudflare/types/workers/scripts/schedule_update_response.py
@@ -2,11 +2,18 @@
 
 from typing import List, Optional
 
-from .schedule import Schedule
 from ...._models import BaseModel
 
-__all__ = ["ScheduleUpdateResponse"]
+__all__ = ["ScheduleUpdateResponse", "Schedule"]
+
+
+class Schedule(BaseModel):
+    cron: str
+
+    created_on: Optional[str] = None
+
+    modified_on: Optional[str] = None
 
 
 class ScheduleUpdateResponse(BaseModel):
-    schedules: Optional[List[Schedule]] = None
+    schedules: List[Schedule]
diff --git a/src/cloudflare/types/workers/scripts/script_and_version_setting_edit_params.py b/src/cloudflare/types/workers/scripts/script_and_version_setting_edit_params.py
new file mode 100644
index 00000000000..0f547f8a0ff
--- /dev/null
+++ b/src/cloudflare/types/workers/scripts/script_and_version_setting_edit_params.py
@@ -0,0 +1,743 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union, Iterable, Optional
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ...._types import SequenceNotStr
+from ..migration_step_param import MigrationStepParam
+from .consumer_script_param import ConsumerScriptParam
+from ..single_step_migration_param import SingleStepMigrationParam
+
+__all__ = [
+    "ScriptAndVersionSettingEditParams",
+    "Settings",
+    "SettingsBinding",
+    "SettingsBindingWorkersBindingKindAI",
+    "SettingsBindingWorkersBindingKindAnalyticsEngine",
+    "SettingsBindingWorkersBindingKindAssets",
+    "SettingsBindingWorkersBindingKindBrowser",
+    "SettingsBindingWorkersBindingKindD1",
+    "SettingsBindingWorkersBindingKindDataBlob",
+    "SettingsBindingWorkersBindingKindDispatchNamespace",
+    "SettingsBindingWorkersBindingKindDispatchNamespaceOutbound",
+    "SettingsBindingWorkersBindingKindDispatchNamespaceOutboundWorker",
+    "SettingsBindingWorkersBindingKindDurableObjectNamespace",
+    "SettingsBindingWorkersBindingKindHyperdrive",
+    "SettingsBindingWorkersBindingKindInherit",
+    "SettingsBindingWorkersBindingKindImages",
+    "SettingsBindingWorkersBindingKindJson",
+    "SettingsBindingWorkersBindingKindKVNamespace",
+    "SettingsBindingWorkersBindingKindMTLSCertificate",
+    "SettingsBindingWorkersBindingKindPlainText",
+    "SettingsBindingWorkersBindingKindPipelines",
+    "SettingsBindingWorkersBindingKindQueue",
+    "SettingsBindingWorkersBindingKindRatelimit",
+    "SettingsBindingWorkersBindingKindRatelimitSimple",
+    "SettingsBindingWorkersBindingKindR2Bucket",
+    "SettingsBindingWorkersBindingKindSecretText",
+    "SettingsBindingWorkersBindingKindSendEmail",
+    "SettingsBindingWorkersBindingKindService",
+    "SettingsBindingWorkersBindingKindTextBlob",
+    "SettingsBindingWorkersBindingKindVectorize",
+    "SettingsBindingWorkersBindingKindVersionMetadata",
+    "SettingsBindingWorkersBindingKindSecretsStoreSecret",
+    "SettingsBindingWorkersBindingKindSecretKey",
+    "SettingsBindingWorkersBindingKindWorkflow",
+    "SettingsBindingWorkersBindingKindWasmModule",
+    "SettingsLimits",
+    "SettingsMigrations",
+    "SettingsMigrationsWorkersMultipleStepMigrations",
+    "SettingsObservability",
+    "SettingsObservabilityLogs",
+    "SettingsPlacement",
+    "SettingsPlacementMode",
+    "SettingsPlacementRegion",
+    "SettingsPlacementHostname",
+    "SettingsPlacementHost",
+    "SettingsPlacementUnionMember4",
+    "SettingsPlacementUnionMember5",
+    "SettingsPlacementUnionMember6",
+    "SettingsPlacementUnionMember7",
+    "SettingsPlacementUnionMember7Target",
+    "SettingsPlacementUnionMember7TargetRegion",
+    "SettingsPlacementUnionMember7TargetHostname",
+    "SettingsPlacementUnionMember7TargetHost",
+]
+
+
+class ScriptAndVersionSettingEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    settings: Settings
+
+
+class SettingsBindingWorkersBindingKindAI(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["ai"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindAnalyticsEngine(TypedDict, total=False):
+    dataset: Required[str]
+    """The name of the dataset to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["analytics_engine"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindAssets(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["assets"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindBrowser(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["browser"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindD1(TypedDict, total=False):
+    id: Required[str]
+    """Identifier of the D1 database to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["d1"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindDataBlob(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    part: Required[str]
+    """The name of the file containing the data content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Required[Literal["data_blob"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindDispatchNamespaceOutboundWorker(TypedDict, total=False):
+    """Outbound worker."""
+
+    environment: str
+    """Environment of the outbound worker."""
+
+    service: str
+    """Name of the outbound worker."""
+
+
+class SettingsBindingWorkersBindingKindDispatchNamespaceOutbound(TypedDict, total=False):
+    """Outbound worker."""
+
+    params: SequenceNotStr[str]
+    """
+    Pass information from the Dispatch Worker to the Outbound Worker through the
+    parameters.
+    """
+
+    worker: SettingsBindingWorkersBindingKindDispatchNamespaceOutboundWorker
+    """Outbound worker."""
+
+
+class SettingsBindingWorkersBindingKindDispatchNamespace(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    namespace: Required[str]
+    """The name of the dispatch namespace."""
+
+    type: Required[Literal["dispatch_namespace"]]
+    """The kind of resource that the binding provides."""
+
+    outbound: SettingsBindingWorkersBindingKindDispatchNamespaceOutbound
+    """Outbound worker."""
+
+
+class SettingsBindingWorkersBindingKindDurableObjectNamespace(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["durable_object_namespace"]]
+    """The kind of resource that the binding provides."""
+
+    class_name: str
+    """The exported class name of the Durable Object."""
+
+    environment: str
+    """The environment of the script_name to bind to."""
+
+    namespace_id: str
+    """Namespace identifier tag."""
+
+    script_name: str
+    """
+    The script where the Durable Object is defined, if it is external to this
+    Worker.
+    """
+
+
+class SettingsBindingWorkersBindingKindHyperdrive(TypedDict, total=False):
+    id: Required[str]
+    """Identifier of the Hyperdrive connection to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["hyperdrive"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindInherit(TypedDict, total=False):
+    name: Required[str]
+    """The name of the inherited binding."""
+
+    type: Required[Literal["inherit"]]
+    """The kind of resource that the binding provides."""
+
+    old_name: str
+    """The old name of the inherited binding.
+
+    If set, the binding will be renamed from `old_name` to `name` in the new
+    version. If not set, the binding will keep the same name between versions.
+    """
+
+    version_id: str
+    """
+    Identifier for the version to inherit the binding from, which can be the version
+    ID or the literal "latest" to inherit from the latest version. Defaults to
+    inheriting the binding from the latest version.
+    """
+
+
+class SettingsBindingWorkersBindingKindImages(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["images"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindJson(TypedDict, total=False):
+    json: Required[str]
+    """JSON data to use."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["json"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindKVNamespace(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: Required[str]
+    """Namespace identifier tag."""
+
+    type: Required[Literal["kv_namespace"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindMTLSCertificate(TypedDict, total=False):
+    certificate_id: Required[str]
+    """Identifier of the certificate to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["mtls_certificate"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindPlainText(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    text: Required[str]
+    """The text value to use."""
+
+    type: Required[Literal["plain_text"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindPipelines(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    pipeline: Required[str]
+    """Name of the Pipeline to bind to."""
+
+    type: Required[Literal["pipelines"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindQueue(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    queue_name: Required[str]
+    """Name of the Queue to bind to."""
+
+    type: Required[Literal["queue"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindRatelimitSimple(TypedDict, total=False):
+    """The rate limit configuration."""
+
+    limit: Required[float]
+    """The limit (requests per period)."""
+
+    period: Required[int]
+    """The period in seconds."""
+
+
+class SettingsBindingWorkersBindingKindRatelimit(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: Required[str]
+    """Identifier of the rate limit namespace to bind to."""
+
+    simple: Required[SettingsBindingWorkersBindingKindRatelimitSimple]
+    """The rate limit configuration."""
+
+    type: Required[Literal["ratelimit"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindR2Bucket(TypedDict, total=False):
+    bucket_name: Required[str]
+    """R2 bucket to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["r2_bucket"]]
+    """The kind of resource that the binding provides."""
+
+    jurisdiction: Literal["eu", "fedramp"]
+    """
+    The
+    [jurisdiction](https://developers.cloudflare.com/r2/reference/data-location/#jurisdictional-restrictions)
+    of the R2 bucket.
+    """
+
+
+class SettingsBindingWorkersBindingKindSecretText(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    text: Required[str]
+    """The secret value to use."""
+
+    type: Required[Literal["secret_text"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindSendEmail(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["send_email"]]
+    """The kind of resource that the binding provides."""
+
+    allowed_destination_addresses: SequenceNotStr[str]
+    """List of allowed destination addresses."""
+
+    allowed_sender_addresses: SequenceNotStr[str]
+    """List of allowed sender addresses."""
+
+    destination_address: str
+    """Destination address for the email."""
+
+
+class SettingsBindingWorkersBindingKindService(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    service: Required[str]
+    """Name of Worker to bind to."""
+
+    type: Required[Literal["service"]]
+    """The kind of resource that the binding provides."""
+
+    environment: str
+    """Optional environment if the Worker utilizes one."""
+
+
+class SettingsBindingWorkersBindingKindTextBlob(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    part: Required[str]
+    """The name of the file containing the text content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Required[Literal["text_blob"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindVectorize(TypedDict, total=False):
+    index_name: Required[str]
+    """Name of the Vectorize index to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["vectorize"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindVersionMetadata(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["version_metadata"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindSecretsStoreSecret(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    secret_name: Required[str]
+    """Name of the secret in the store."""
+
+    store_id: Required[str]
+    """ID of the store containing the secret."""
+
+    type: Required[Literal["secrets_store_secret"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindSecretKey(TypedDict, total=False):
+    algorithm: Required[object]
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Required[Literal["raw", "pkcs8", "spki", "jwk"]]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["secret_key"]]
+    """The kind of resource that the binding provides."""
+
+    usages: Required[
+        List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    ]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+    key_base64: str
+    """Base64-encoded key data. Required if `format` is "raw", "pkcs8", or "spki"."""
+
+    key_jwk: object
+    """
+    Key data in
+    [JSON Web Key](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#json_web_key)
+    format. Required if `format` is "jwk".
+    """
+
+
+class SettingsBindingWorkersBindingKindWorkflow(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["workflow"]]
+    """The kind of resource that the binding provides."""
+
+    workflow_name: Required[str]
+    """Name of the Workflow to bind to."""
+
+    class_name: str
+    """Class name of the Workflow.
+
+    Should only be provided if the Workflow belongs to this script.
+    """
+
+    script_name: str
+    """Script name that contains the Workflow.
+
+    If not provided, defaults to this script name.
+    """
+
+
+class SettingsBindingWorkersBindingKindWasmModule(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    part: Required[str]
+    """The name of the file containing the WebAssembly module content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Required[Literal["wasm_module"]]
+    """The kind of resource that the binding provides."""
+
+
+SettingsBinding: TypeAlias = Union[
+    SettingsBindingWorkersBindingKindAI,
+    SettingsBindingWorkersBindingKindAnalyticsEngine,
+    SettingsBindingWorkersBindingKindAssets,
+    SettingsBindingWorkersBindingKindBrowser,
+    SettingsBindingWorkersBindingKindD1,
+    SettingsBindingWorkersBindingKindDataBlob,
+    SettingsBindingWorkersBindingKindDispatchNamespace,
+    SettingsBindingWorkersBindingKindDurableObjectNamespace,
+    SettingsBindingWorkersBindingKindHyperdrive,
+    SettingsBindingWorkersBindingKindInherit,
+    SettingsBindingWorkersBindingKindImages,
+    SettingsBindingWorkersBindingKindJson,
+    SettingsBindingWorkersBindingKindKVNamespace,
+    SettingsBindingWorkersBindingKindMTLSCertificate,
+    SettingsBindingWorkersBindingKindPlainText,
+    SettingsBindingWorkersBindingKindPipelines,
+    SettingsBindingWorkersBindingKindQueue,
+    SettingsBindingWorkersBindingKindRatelimit,
+    SettingsBindingWorkersBindingKindR2Bucket,
+    SettingsBindingWorkersBindingKindSecretText,
+    SettingsBindingWorkersBindingKindSendEmail,
+    SettingsBindingWorkersBindingKindService,
+    SettingsBindingWorkersBindingKindTextBlob,
+    SettingsBindingWorkersBindingKindVectorize,
+    SettingsBindingWorkersBindingKindVersionMetadata,
+    SettingsBindingWorkersBindingKindSecretsStoreSecret,
+    SettingsBindingWorkersBindingKindSecretKey,
+    SettingsBindingWorkersBindingKindWorkflow,
+    SettingsBindingWorkersBindingKindWasmModule,
+]
+
+
+class SettingsLimits(TypedDict, total=False):
+    """Limits to apply for this Worker."""
+
+    cpu_ms: int
+    """The amount of CPU time this Worker can use in milliseconds."""
+
+
+class SettingsMigrationsWorkersMultipleStepMigrations(TypedDict, total=False):
+    new_tag: str
+    """Tag to set as the latest migration tag."""
+
+    old_tag: str
+    """Tag used to verify against the latest migration tag for this Worker.
+
+    If they don't match, the upload is rejected.
+    """
+
+    steps: Iterable[MigrationStepParam]
+    """Migrations to apply in order."""
+
+
+SettingsMigrations: TypeAlias = Union[SingleStepMigrationParam, SettingsMigrationsWorkersMultipleStepMigrations]
+
+
+class SettingsObservabilityLogs(TypedDict, total=False):
+    """Log settings for the Worker."""
+
+    enabled: Required[bool]
+    """Whether logs are enabled for the Worker."""
+
+    invocation_logs: Required[bool]
+    """
+    Whether
+    [invocation logs](https://developers.cloudflare.com/workers/observability/logs/workers-logs/#invocation-logs)
+    are enabled for the Worker.
+    """
+
+    destinations: SequenceNotStr[str]
+    """A list of destinations where logs will be exported to."""
+
+    head_sampling_rate: Optional[float]
+    """The sampling rate for logs. From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1."""
+
+    persist: bool
+    """Whether log persistence is enabled for the Worker."""
+
+
+class SettingsObservability(TypedDict, total=False):
+    """Observability settings for the Worker."""
+
+    enabled: Required[bool]
+    """Whether observability is enabled for the Worker."""
+
+    head_sampling_rate: Optional[float]
+    """The sampling rate for incoming requests.
+
+    From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1.
+    """
+
+    logs: Optional[SettingsObservabilityLogs]
+    """Log settings for the Worker."""
+
+
+class SettingsPlacementMode(TypedDict, total=False):
+    mode: Required[Literal["smart"]]
+    """
+    Enables
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class SettingsPlacementRegion(TypedDict, total=False):
+    region: Required[str]
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class SettingsPlacementHostname(TypedDict, total=False):
+    hostname: Required[str]
+    """HTTP hostname for targeted placement."""
+
+
+class SettingsPlacementHost(TypedDict, total=False):
+    host: Required[str]
+    """TCP host and port for targeted placement."""
+
+
+class SettingsPlacementUnionMember4(TypedDict, total=False):
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+    region: Required[str]
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class SettingsPlacementUnionMember5(TypedDict, total=False):
+    hostname: Required[str]
+    """HTTP hostname for targeted placement."""
+
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+
+class SettingsPlacementUnionMember6(TypedDict, total=False):
+    host: Required[str]
+    """TCP host and port for targeted placement."""
+
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+
+class SettingsPlacementUnionMember7TargetRegion(TypedDict, total=False):
+    region: Required[str]
+    """Cloud region in format 'provider:region'."""
+
+
+class SettingsPlacementUnionMember7TargetHostname(TypedDict, total=False):
+    hostname: Required[str]
+    """HTTP hostname for targeted placement."""
+
+
+class SettingsPlacementUnionMember7TargetHost(TypedDict, total=False):
+    host: Required[str]
+    """TCP host:port for targeted placement."""
+
+
+SettingsPlacementUnionMember7Target: TypeAlias = Union[
+    SettingsPlacementUnionMember7TargetRegion,
+    SettingsPlacementUnionMember7TargetHostname,
+    SettingsPlacementUnionMember7TargetHost,
+]
+
+
+class SettingsPlacementUnionMember7(TypedDict, total=False):
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+    target: Required[Iterable[SettingsPlacementUnionMember7Target]]
+    """Array of placement targets (currently limited to single target)."""
+
+
+SettingsPlacement: TypeAlias = Union[
+    SettingsPlacementMode,
+    SettingsPlacementRegion,
+    SettingsPlacementHostname,
+    SettingsPlacementHost,
+    SettingsPlacementUnionMember4,
+    SettingsPlacementUnionMember5,
+    SettingsPlacementUnionMember6,
+    SettingsPlacementUnionMember7,
+]
+
+
+class Settings(TypedDict, total=False):
+    bindings: Iterable[SettingsBinding]
+    """List of bindings attached to a Worker.
+
+    You can find more about bindings on our docs:
+    https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
+    """
+
+    compatibility_date: str
+    """Date indicating targeted support in the Workers runtime.
+
+    Backwards incompatible fixes to the runtime following this date will not affect
+    this Worker.
+    """
+
+    compatibility_flags: SequenceNotStr[str]
+    """Flags that enable or disable certain features in the Workers runtime.
+
+    Used to enable upcoming features or opt in or out of specific changes not
+    included in a `compatibility_date`.
+    """
+
+    limits: SettingsLimits
+    """Limits to apply for this Worker."""
+
+    logpush: bool
+    """Whether Logpush is turned on for the Worker."""
+
+    migrations: SettingsMigrations
+    """Migrations to apply for Durable Objects associated with this Worker."""
+
+    observability: SettingsObservability
+    """Observability settings for the Worker."""
+
+    placement: SettingsPlacement
+    """
+    Configuration for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    Specify mode='smart' for Smart Placement, or one of region/hostname/host.
+    """
+
+    tags: Optional[SequenceNotStr[str]]
+    """Tags associated with the Worker."""
+
+    tail_consumers: Optional[Iterable[ConsumerScriptParam]]
+    """List of Workers that will consume logs from the attached Worker."""
+
+    usage_model: Literal["standard", "bundled", "unbound"]
+    """Usage model for the Worker invocations."""
diff --git a/src/cloudflare/types/workers/scripts/script_and_version_setting_edit_response.py b/src/cloudflare/types/workers/scripts/script_and_version_setting_edit_response.py
new file mode 100644
index 00000000000..b0ef793ee26
--- /dev/null
+++ b/src/cloudflare/types/workers/scripts/script_and_version_setting_edit_response.py
@@ -0,0 +1,708 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ...._utils import PropertyInfo
+from ...._models import BaseModel
+from .consumer_script import ConsumerScript
+from ..single_step_migration import SingleStepMigration
+
+__all__ = [
+    "ScriptAndVersionSettingEditResponse",
+    "Binding",
+    "BindingWorkersBindingKindAI",
+    "BindingWorkersBindingKindAnalyticsEngine",
+    "BindingWorkersBindingKindAssets",
+    "BindingWorkersBindingKindBrowser",
+    "BindingWorkersBindingKindD1",
+    "BindingWorkersBindingKindDataBlob",
+    "BindingWorkersBindingKindDispatchNamespace",
+    "BindingWorkersBindingKindDispatchNamespaceOutbound",
+    "BindingWorkersBindingKindDispatchNamespaceOutboundWorker",
+    "BindingWorkersBindingKindDurableObjectNamespace",
+    "BindingWorkersBindingKindHyperdrive",
+    "BindingWorkersBindingKindInherit",
+    "BindingWorkersBindingKindImages",
+    "BindingWorkersBindingKindJson",
+    "BindingWorkersBindingKindKVNamespace",
+    "BindingWorkersBindingKindMTLSCertificate",
+    "BindingWorkersBindingKindPlainText",
+    "BindingWorkersBindingKindPipelines",
+    "BindingWorkersBindingKindQueue",
+    "BindingWorkersBindingKindRatelimit",
+    "BindingWorkersBindingKindRatelimitSimple",
+    "BindingWorkersBindingKindR2Bucket",
+    "BindingWorkersBindingKindSecretText",
+    "BindingWorkersBindingKindSendEmail",
+    "BindingWorkersBindingKindService",
+    "BindingWorkersBindingKindTextBlob",
+    "BindingWorkersBindingKindVectorize",
+    "BindingWorkersBindingKindVersionMetadata",
+    "BindingWorkersBindingKindSecretsStoreSecret",
+    "BindingWorkersBindingKindSecretKey",
+    "BindingWorkersBindingKindWorkflow",
+    "BindingWorkersBindingKindWasmModule",
+    "Limits",
+    "Migrations",
+    "MigrationsWorkersMultipleStepMigrations",
+    "Observability",
+    "ObservabilityLogs",
+    "Placement",
+    "PlacementMode",
+    "PlacementRegion",
+    "PlacementHostname",
+    "PlacementHost",
+    "PlacementUnionMember4",
+    "PlacementUnionMember5",
+    "PlacementUnionMember6",
+    "PlacementUnionMember7",
+    "PlacementUnionMember7Target",
+    "PlacementUnionMember7TargetRegion",
+    "PlacementUnionMember7TargetHostname",
+    "PlacementUnionMember7TargetHost",
+]
+
+
+class BindingWorkersBindingKindAI(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["ai"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindAnalyticsEngine(BaseModel):
+    dataset: str
+    """The name of the dataset to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["analytics_engine"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindAssets(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["assets"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindBrowser(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["browser"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindD1(BaseModel):
+    id: str
+    """Identifier of the D1 database to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["d1"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindDataBlob(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the data content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["data_blob"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindDispatchNamespaceOutboundWorker(BaseModel):
+    """Outbound worker."""
+
+    environment: Optional[str] = None
+    """Environment of the outbound worker."""
+
+    service: Optional[str] = None
+    """Name of the outbound worker."""
+
+
+class BindingWorkersBindingKindDispatchNamespaceOutbound(BaseModel):
+    """Outbound worker."""
+
+    params: Optional[List[str]] = None
+    """
+    Pass information from the Dispatch Worker to the Outbound Worker through the
+    parameters.
+    """
+
+    worker: Optional[BindingWorkersBindingKindDispatchNamespaceOutboundWorker] = None
+    """Outbound worker."""
+
+
+class BindingWorkersBindingKindDispatchNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace: str
+    """The name of the dispatch namespace."""
+
+    type: Literal["dispatch_namespace"]
+    """The kind of resource that the binding provides."""
+
+    outbound: Optional[BindingWorkersBindingKindDispatchNamespaceOutbound] = None
+    """Outbound worker."""
+
+
+class BindingWorkersBindingKindDurableObjectNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["durable_object_namespace"]
+    """The kind of resource that the binding provides."""
+
+    class_name: Optional[str] = None
+    """The exported class name of the Durable Object."""
+
+    environment: Optional[str] = None
+    """The environment of the script_name to bind to."""
+
+    namespace_id: Optional[str] = None
+    """Namespace identifier tag."""
+
+    script_name: Optional[str] = None
+    """
+    The script where the Durable Object is defined, if it is external to this
+    Worker.
+    """
+
+
+class BindingWorkersBindingKindHyperdrive(BaseModel):
+    id: str
+    """Identifier of the Hyperdrive connection to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["hyperdrive"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindInherit(BaseModel):
+    name: str
+    """The name of the inherited binding."""
+
+    type: Literal["inherit"]
+    """The kind of resource that the binding provides."""
+
+    old_name: Optional[str] = None
+    """The old name of the inherited binding.
+
+    If set, the binding will be renamed from `old_name` to `name` in the new
+    version. If not set, the binding will keep the same name between versions.
+    """
+
+    version_id: Optional[str] = None
+    """
+    Identifier for the version to inherit the binding from, which can be the version
+    ID or the literal "latest" to inherit from the latest version. Defaults to
+    inheriting the binding from the latest version.
+    """
+
+
+class BindingWorkersBindingKindImages(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["images"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindJson(BaseModel):
+    json_: str = FieldInfo(alias="json")
+    """JSON data to use."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["json"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindKVNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: str
+    """Namespace identifier tag."""
+
+    type: Literal["kv_namespace"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindMTLSCertificate(BaseModel):
+    certificate_id: str
+    """Identifier of the certificate to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["mtls_certificate"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindPlainText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    text: str
+    """The text value to use."""
+
+    type: Literal["plain_text"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindPipelines(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    pipeline: str
+    """Name of the Pipeline to bind to."""
+
+    type: Literal["pipelines"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindQueue(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    queue_name: str
+    """Name of the Queue to bind to."""
+
+    type: Literal["queue"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindRatelimitSimple(BaseModel):
+    """The rate limit configuration."""
+
+    limit: float
+    """The limit (requests per period)."""
+
+    period: int
+    """The period in seconds."""
+
+
+class BindingWorkersBindingKindRatelimit(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: str
+    """Identifier of the rate limit namespace to bind to."""
+
+    simple: BindingWorkersBindingKindRatelimitSimple
+    """The rate limit configuration."""
+
+    type: Literal["ratelimit"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindR2Bucket(BaseModel):
+    bucket_name: str
+    """R2 bucket to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["r2_bucket"]
+    """The kind of resource that the binding provides."""
+
+    jurisdiction: Optional[Literal["eu", "fedramp"]] = None
+    """
+    The
+    [jurisdiction](https://developers.cloudflare.com/r2/reference/data-location/#jurisdictional-restrictions)
+    of the R2 bucket.
+    """
+
+
+class BindingWorkersBindingKindSecretText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_text"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindSendEmail(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["send_email"]
+    """The kind of resource that the binding provides."""
+
+    allowed_destination_addresses: Optional[List[str]] = None
+    """List of allowed destination addresses."""
+
+    allowed_sender_addresses: Optional[List[str]] = None
+    """List of allowed sender addresses."""
+
+    destination_address: Optional[str] = None
+    """Destination address for the email."""
+
+
+class BindingWorkersBindingKindService(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    service: str
+    """Name of Worker to bind to."""
+
+    type: Literal["service"]
+    """The kind of resource that the binding provides."""
+
+    environment: Optional[str] = None
+    """Optional environment if the Worker utilizes one."""
+
+
+class BindingWorkersBindingKindTextBlob(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the text content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["text_blob"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindVectorize(BaseModel):
+    index_name: str
+    """Name of the Vectorize index to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["vectorize"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindVersionMetadata(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["version_metadata"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindSecretsStoreSecret(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    secret_name: str
+    """Name of the secret in the store."""
+
+    store_id: str
+    """ID of the store containing the secret."""
+
+    type: Literal["secrets_store_secret"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindSecretKey(BaseModel):
+    algorithm: object
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Literal["raw", "pkcs8", "spki", "jwk"]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_key"]
+    """The kind of resource that the binding provides."""
+
+    usages: List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+
+class BindingWorkersBindingKindWorkflow(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["workflow"]
+    """The kind of resource that the binding provides."""
+
+    workflow_name: str
+    """Name of the Workflow to bind to."""
+
+    class_name: Optional[str] = None
+    """Class name of the Workflow.
+
+    Should only be provided if the Workflow belongs to this script.
+    """
+
+    script_name: Optional[str] = None
+    """Script name that contains the Workflow.
+
+    If not provided, defaults to this script name.
+    """
+
+
+class BindingWorkersBindingKindWasmModule(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the WebAssembly module content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["wasm_module"]
+    """The kind of resource that the binding provides."""
+
+
+Binding: TypeAlias = Annotated[
+    Union[
+        BindingWorkersBindingKindAI,
+        BindingWorkersBindingKindAnalyticsEngine,
+        BindingWorkersBindingKindAssets,
+        BindingWorkersBindingKindBrowser,
+        BindingWorkersBindingKindD1,
+        BindingWorkersBindingKindDataBlob,
+        BindingWorkersBindingKindDispatchNamespace,
+        BindingWorkersBindingKindDurableObjectNamespace,
+        BindingWorkersBindingKindHyperdrive,
+        BindingWorkersBindingKindInherit,
+        BindingWorkersBindingKindImages,
+        BindingWorkersBindingKindJson,
+        BindingWorkersBindingKindKVNamespace,
+        BindingWorkersBindingKindMTLSCertificate,
+        BindingWorkersBindingKindPlainText,
+        BindingWorkersBindingKindPipelines,
+        BindingWorkersBindingKindQueue,
+        BindingWorkersBindingKindRatelimit,
+        BindingWorkersBindingKindR2Bucket,
+        BindingWorkersBindingKindSecretText,
+        BindingWorkersBindingKindSendEmail,
+        BindingWorkersBindingKindService,
+        BindingWorkersBindingKindTextBlob,
+        BindingWorkersBindingKindVectorize,
+        BindingWorkersBindingKindVersionMetadata,
+        BindingWorkersBindingKindSecretsStoreSecret,
+        BindingWorkersBindingKindSecretKey,
+        BindingWorkersBindingKindWorkflow,
+        BindingWorkersBindingKindWasmModule,
+    ],
+    PropertyInfo(discriminator="type"),
+]
+
+
+class Limits(BaseModel):
+    """Limits to apply for this Worker."""
+
+    cpu_ms: Optional[int] = None
+    """The amount of CPU time this Worker can use in milliseconds."""
+
+
+class MigrationsWorkersMultipleStepMigrations(BaseModel):
+    pass
+
+
+Migrations: TypeAlias = Union[SingleStepMigration, MigrationsWorkersMultipleStepMigrations]
+
+
+class ObservabilityLogs(BaseModel):
+    """Log settings for the Worker."""
+
+    enabled: bool
+    """Whether logs are enabled for the Worker."""
+
+    invocation_logs: bool
+    """
+    Whether
+    [invocation logs](https://developers.cloudflare.com/workers/observability/logs/workers-logs/#invocation-logs)
+    are enabled for the Worker.
+    """
+
+    destinations: Optional[List[str]] = None
+    """A list of destinations where logs will be exported to."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for logs. From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1."""
+
+    persist: Optional[bool] = None
+    """Whether log persistence is enabled for the Worker."""
+
+
+class Observability(BaseModel):
+    """Observability settings for the Worker."""
+
+    enabled: bool
+    """Whether observability is enabled for the Worker."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for incoming requests.
+
+    From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1.
+    """
+
+    logs: Optional[ObservabilityLogs] = None
+    """Log settings for the Worker."""
+
+
+class PlacementMode(BaseModel):
+    mode: Literal["smart"]
+    """
+    Enables
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementRegion(BaseModel):
+    region: str
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class PlacementHostname(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+
+class PlacementHost(BaseModel):
+    host: str
+    """TCP host and port for targeted placement."""
+
+
+class PlacementUnionMember4(BaseModel):
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    region: str
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class PlacementUnionMember5(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+
+class PlacementUnionMember6(BaseModel):
+    host: str
+    """TCP host and port for targeted placement."""
+
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+
+class PlacementUnionMember7TargetRegion(BaseModel):
+    region: str
+    """Cloud region in format 'provider:region'."""
+
+
+class PlacementUnionMember7TargetHostname(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+
+class PlacementUnionMember7TargetHost(BaseModel):
+    host: str
+    """TCP host:port for targeted placement."""
+
+
+PlacementUnionMember7Target: TypeAlias = Union[
+    PlacementUnionMember7TargetRegion, PlacementUnionMember7TargetHostname, PlacementUnionMember7TargetHost
+]
+
+
+class PlacementUnionMember7(BaseModel):
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    target: List[PlacementUnionMember7Target]
+    """Array of placement targets (currently limited to single target)."""
+
+
+Placement: TypeAlias = Union[
+    PlacementMode,
+    PlacementRegion,
+    PlacementHostname,
+    PlacementHost,
+    PlacementUnionMember4,
+    PlacementUnionMember5,
+    PlacementUnionMember6,
+    PlacementUnionMember7,
+]
+
+
+class ScriptAndVersionSettingEditResponse(BaseModel):
+    bindings: Optional[List[Binding]] = None
+    """List of bindings attached to a Worker.
+
+    You can find more about bindings on our docs:
+    https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
+    """
+
+    compatibility_date: Optional[str] = None
+    """Date indicating targeted support in the Workers runtime.
+
+    Backwards incompatible fixes to the runtime following this date will not affect
+    this Worker.
+    """
+
+    compatibility_flags: Optional[List[str]] = None
+    """Flags that enable or disable certain features in the Workers runtime.
+
+    Used to enable upcoming features or opt in or out of specific changes not
+    included in a `compatibility_date`.
+    """
+
+    limits: Optional[Limits] = None
+    """Limits to apply for this Worker."""
+
+    logpush: Optional[bool] = None
+    """Whether Logpush is turned on for the Worker."""
+
+    observability: Optional[Observability] = None
+    """Observability settings for the Worker."""
+
+    placement: Optional[Placement] = None
+    """
+    Configuration for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    Specify mode='smart' for Smart Placement, or one of region/hostname/host.
+    """
+
+    tags: Optional[List[str]] = None
+    """Tags associated with the Worker."""
+
+    tail_consumers: Optional[List[ConsumerScript]] = None
+    """List of Workers that will consume logs from the attached Worker."""
+
+    usage_model: Optional[Literal["standard", "bundled", "unbound"]] = None
+    """Usage model for the Worker invocations."""
diff --git a/src/cloudflare/types/workers/scripts/script_and_version_setting_get_response.py b/src/cloudflare/types/workers/scripts/script_and_version_setting_get_response.py
new file mode 100644
index 00000000000..f869dcb6f3c
--- /dev/null
+++ b/src/cloudflare/types/workers/scripts/script_and_version_setting_get_response.py
@@ -0,0 +1,708 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ...._utils import PropertyInfo
+from ...._models import BaseModel
+from .consumer_script import ConsumerScript
+from ..single_step_migration import SingleStepMigration
+
+__all__ = [
+    "ScriptAndVersionSettingGetResponse",
+    "Binding",
+    "BindingWorkersBindingKindAI",
+    "BindingWorkersBindingKindAnalyticsEngine",
+    "BindingWorkersBindingKindAssets",
+    "BindingWorkersBindingKindBrowser",
+    "BindingWorkersBindingKindD1",
+    "BindingWorkersBindingKindDataBlob",
+    "BindingWorkersBindingKindDispatchNamespace",
+    "BindingWorkersBindingKindDispatchNamespaceOutbound",
+    "BindingWorkersBindingKindDispatchNamespaceOutboundWorker",
+    "BindingWorkersBindingKindDurableObjectNamespace",
+    "BindingWorkersBindingKindHyperdrive",
+    "BindingWorkersBindingKindInherit",
+    "BindingWorkersBindingKindImages",
+    "BindingWorkersBindingKindJson",
+    "BindingWorkersBindingKindKVNamespace",
+    "BindingWorkersBindingKindMTLSCertificate",
+    "BindingWorkersBindingKindPlainText",
+    "BindingWorkersBindingKindPipelines",
+    "BindingWorkersBindingKindQueue",
+    "BindingWorkersBindingKindRatelimit",
+    "BindingWorkersBindingKindRatelimitSimple",
+    "BindingWorkersBindingKindR2Bucket",
+    "BindingWorkersBindingKindSecretText",
+    "BindingWorkersBindingKindSendEmail",
+    "BindingWorkersBindingKindService",
+    "BindingWorkersBindingKindTextBlob",
+    "BindingWorkersBindingKindVectorize",
+    "BindingWorkersBindingKindVersionMetadata",
+    "BindingWorkersBindingKindSecretsStoreSecret",
+    "BindingWorkersBindingKindSecretKey",
+    "BindingWorkersBindingKindWorkflow",
+    "BindingWorkersBindingKindWasmModule",
+    "Limits",
+    "Migrations",
+    "MigrationsWorkersMultipleStepMigrations",
+    "Observability",
+    "ObservabilityLogs",
+    "Placement",
+    "PlacementMode",
+    "PlacementRegion",
+    "PlacementHostname",
+    "PlacementHost",
+    "PlacementUnionMember4",
+    "PlacementUnionMember5",
+    "PlacementUnionMember6",
+    "PlacementUnionMember7",
+    "PlacementUnionMember7Target",
+    "PlacementUnionMember7TargetRegion",
+    "PlacementUnionMember7TargetHostname",
+    "PlacementUnionMember7TargetHost",
+]
+
+
+class BindingWorkersBindingKindAI(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["ai"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindAnalyticsEngine(BaseModel):
+    dataset: str
+    """The name of the dataset to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["analytics_engine"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindAssets(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["assets"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindBrowser(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["browser"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindD1(BaseModel):
+    id: str
+    """Identifier of the D1 database to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["d1"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindDataBlob(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the data content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["data_blob"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindDispatchNamespaceOutboundWorker(BaseModel):
+    """Outbound worker."""
+
+    environment: Optional[str] = None
+    """Environment of the outbound worker."""
+
+    service: Optional[str] = None
+    """Name of the outbound worker."""
+
+
+class BindingWorkersBindingKindDispatchNamespaceOutbound(BaseModel):
+    """Outbound worker."""
+
+    params: Optional[List[str]] = None
+    """
+    Pass information from the Dispatch Worker to the Outbound Worker through the
+    parameters.
+    """
+
+    worker: Optional[BindingWorkersBindingKindDispatchNamespaceOutboundWorker] = None
+    """Outbound worker."""
+
+
+class BindingWorkersBindingKindDispatchNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace: str
+    """The name of the dispatch namespace."""
+
+    type: Literal["dispatch_namespace"]
+    """The kind of resource that the binding provides."""
+
+    outbound: Optional[BindingWorkersBindingKindDispatchNamespaceOutbound] = None
+    """Outbound worker."""
+
+
+class BindingWorkersBindingKindDurableObjectNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["durable_object_namespace"]
+    """The kind of resource that the binding provides."""
+
+    class_name: Optional[str] = None
+    """The exported class name of the Durable Object."""
+
+    environment: Optional[str] = None
+    """The environment of the script_name to bind to."""
+
+    namespace_id: Optional[str] = None
+    """Namespace identifier tag."""
+
+    script_name: Optional[str] = None
+    """
+    The script where the Durable Object is defined, if it is external to this
+    Worker.
+    """
+
+
+class BindingWorkersBindingKindHyperdrive(BaseModel):
+    id: str
+    """Identifier of the Hyperdrive connection to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["hyperdrive"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindInherit(BaseModel):
+    name: str
+    """The name of the inherited binding."""
+
+    type: Literal["inherit"]
+    """The kind of resource that the binding provides."""
+
+    old_name: Optional[str] = None
+    """The old name of the inherited binding.
+
+    If set, the binding will be renamed from `old_name` to `name` in the new
+    version. If not set, the binding will keep the same name between versions.
+    """
+
+    version_id: Optional[str] = None
+    """
+    Identifier for the version to inherit the binding from, which can be the version
+    ID or the literal "latest" to inherit from the latest version. Defaults to
+    inheriting the binding from the latest version.
+    """
+
+
+class BindingWorkersBindingKindImages(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["images"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindJson(BaseModel):
+    json_: str = FieldInfo(alias="json")
+    """JSON data to use."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["json"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindKVNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: str
+    """Namespace identifier tag."""
+
+    type: Literal["kv_namespace"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindMTLSCertificate(BaseModel):
+    certificate_id: str
+    """Identifier of the certificate to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["mtls_certificate"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindPlainText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    text: str
+    """The text value to use."""
+
+    type: Literal["plain_text"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindPipelines(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    pipeline: str
+    """Name of the Pipeline to bind to."""
+
+    type: Literal["pipelines"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindQueue(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    queue_name: str
+    """Name of the Queue to bind to."""
+
+    type: Literal["queue"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindRatelimitSimple(BaseModel):
+    """The rate limit configuration."""
+
+    limit: float
+    """The limit (requests per period)."""
+
+    period: int
+    """The period in seconds."""
+
+
+class BindingWorkersBindingKindRatelimit(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: str
+    """Identifier of the rate limit namespace to bind to."""
+
+    simple: BindingWorkersBindingKindRatelimitSimple
+    """The rate limit configuration."""
+
+    type: Literal["ratelimit"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindR2Bucket(BaseModel):
+    bucket_name: str
+    """R2 bucket to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["r2_bucket"]
+    """The kind of resource that the binding provides."""
+
+    jurisdiction: Optional[Literal["eu", "fedramp"]] = None
+    """
+    The
+    [jurisdiction](https://developers.cloudflare.com/r2/reference/data-location/#jurisdictional-restrictions)
+    of the R2 bucket.
+    """
+
+
+class BindingWorkersBindingKindSecretText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_text"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindSendEmail(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["send_email"]
+    """The kind of resource that the binding provides."""
+
+    allowed_destination_addresses: Optional[List[str]] = None
+    """List of allowed destination addresses."""
+
+    allowed_sender_addresses: Optional[List[str]] = None
+    """List of allowed sender addresses."""
+
+    destination_address: Optional[str] = None
+    """Destination address for the email."""
+
+
+class BindingWorkersBindingKindService(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    service: str
+    """Name of Worker to bind to."""
+
+    type: Literal["service"]
+    """The kind of resource that the binding provides."""
+
+    environment: Optional[str] = None
+    """Optional environment if the Worker utilizes one."""
+
+
+class BindingWorkersBindingKindTextBlob(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the text content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["text_blob"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindVectorize(BaseModel):
+    index_name: str
+    """Name of the Vectorize index to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["vectorize"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindVersionMetadata(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["version_metadata"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindSecretsStoreSecret(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    secret_name: str
+    """Name of the secret in the store."""
+
+    store_id: str
+    """ID of the store containing the secret."""
+
+    type: Literal["secrets_store_secret"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindSecretKey(BaseModel):
+    algorithm: object
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Literal["raw", "pkcs8", "spki", "jwk"]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_key"]
+    """The kind of resource that the binding provides."""
+
+    usages: List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+
+class BindingWorkersBindingKindWorkflow(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["workflow"]
+    """The kind of resource that the binding provides."""
+
+    workflow_name: str
+    """Name of the Workflow to bind to."""
+
+    class_name: Optional[str] = None
+    """Class name of the Workflow.
+
+    Should only be provided if the Workflow belongs to this script.
+    """
+
+    script_name: Optional[str] = None
+    """Script name that contains the Workflow.
+
+    If not provided, defaults to this script name.
+    """
+
+
+class BindingWorkersBindingKindWasmModule(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the WebAssembly module content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["wasm_module"]
+    """The kind of resource that the binding provides."""
+
+
+Binding: TypeAlias = Annotated[
+    Union[
+        BindingWorkersBindingKindAI,
+        BindingWorkersBindingKindAnalyticsEngine,
+        BindingWorkersBindingKindAssets,
+        BindingWorkersBindingKindBrowser,
+        BindingWorkersBindingKindD1,
+        BindingWorkersBindingKindDataBlob,
+        BindingWorkersBindingKindDispatchNamespace,
+        BindingWorkersBindingKindDurableObjectNamespace,
+        BindingWorkersBindingKindHyperdrive,
+        BindingWorkersBindingKindInherit,
+        BindingWorkersBindingKindImages,
+        BindingWorkersBindingKindJson,
+        BindingWorkersBindingKindKVNamespace,
+        BindingWorkersBindingKindMTLSCertificate,
+        BindingWorkersBindingKindPlainText,
+        BindingWorkersBindingKindPipelines,
+        BindingWorkersBindingKindQueue,
+        BindingWorkersBindingKindRatelimit,
+        BindingWorkersBindingKindR2Bucket,
+        BindingWorkersBindingKindSecretText,
+        BindingWorkersBindingKindSendEmail,
+        BindingWorkersBindingKindService,
+        BindingWorkersBindingKindTextBlob,
+        BindingWorkersBindingKindVectorize,
+        BindingWorkersBindingKindVersionMetadata,
+        BindingWorkersBindingKindSecretsStoreSecret,
+        BindingWorkersBindingKindSecretKey,
+        BindingWorkersBindingKindWorkflow,
+        BindingWorkersBindingKindWasmModule,
+    ],
+    PropertyInfo(discriminator="type"),
+]
+
+
+class Limits(BaseModel):
+    """Limits to apply for this Worker."""
+
+    cpu_ms: Optional[int] = None
+    """The amount of CPU time this Worker can use in milliseconds."""
+
+
+class MigrationsWorkersMultipleStepMigrations(BaseModel):
+    pass
+
+
+Migrations: TypeAlias = Union[SingleStepMigration, MigrationsWorkersMultipleStepMigrations]
+
+
+class ObservabilityLogs(BaseModel):
+    """Log settings for the Worker."""
+
+    enabled: bool
+    """Whether logs are enabled for the Worker."""
+
+    invocation_logs: bool
+    """
+    Whether
+    [invocation logs](https://developers.cloudflare.com/workers/observability/logs/workers-logs/#invocation-logs)
+    are enabled for the Worker.
+    """
+
+    destinations: Optional[List[str]] = None
+    """A list of destinations where logs will be exported to."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for logs. From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1."""
+
+    persist: Optional[bool] = None
+    """Whether log persistence is enabled for the Worker."""
+
+
+class Observability(BaseModel):
+    """Observability settings for the Worker."""
+
+    enabled: bool
+    """Whether observability is enabled for the Worker."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for incoming requests.
+
+    From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1.
+    """
+
+    logs: Optional[ObservabilityLogs] = None
+    """Log settings for the Worker."""
+
+
+class PlacementMode(BaseModel):
+    mode: Literal["smart"]
+    """
+    Enables
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementRegion(BaseModel):
+    region: str
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class PlacementHostname(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+
+class PlacementHost(BaseModel):
+    host: str
+    """TCP host and port for targeted placement."""
+
+
+class PlacementUnionMember4(BaseModel):
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    region: str
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class PlacementUnionMember5(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+
+class PlacementUnionMember6(BaseModel):
+    host: str
+    """TCP host and port for targeted placement."""
+
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+
+class PlacementUnionMember7TargetRegion(BaseModel):
+    region: str
+    """Cloud region in format 'provider:region'."""
+
+
+class PlacementUnionMember7TargetHostname(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+
+class PlacementUnionMember7TargetHost(BaseModel):
+    host: str
+    """TCP host:port for targeted placement."""
+
+
+PlacementUnionMember7Target: TypeAlias = Union[
+    PlacementUnionMember7TargetRegion, PlacementUnionMember7TargetHostname, PlacementUnionMember7TargetHost
+]
+
+
+class PlacementUnionMember7(BaseModel):
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    target: List[PlacementUnionMember7Target]
+    """Array of placement targets (currently limited to single target)."""
+
+
+Placement: TypeAlias = Union[
+    PlacementMode,
+    PlacementRegion,
+    PlacementHostname,
+    PlacementHost,
+    PlacementUnionMember4,
+    PlacementUnionMember5,
+    PlacementUnionMember6,
+    PlacementUnionMember7,
+]
+
+
+class ScriptAndVersionSettingGetResponse(BaseModel):
+    bindings: Optional[List[Binding]] = None
+    """List of bindings attached to a Worker.
+
+    You can find more about bindings on our docs:
+    https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
+    """
+
+    compatibility_date: Optional[str] = None
+    """Date indicating targeted support in the Workers runtime.
+
+    Backwards incompatible fixes to the runtime following this date will not affect
+    this Worker.
+    """
+
+    compatibility_flags: Optional[List[str]] = None
+    """Flags that enable or disable certain features in the Workers runtime.
+
+    Used to enable upcoming features or opt in or out of specific changes not
+    included in a `compatibility_date`.
+    """
+
+    limits: Optional[Limits] = None
+    """Limits to apply for this Worker."""
+
+    logpush: Optional[bool] = None
+    """Whether Logpush is turned on for the Worker."""
+
+    observability: Optional[Observability] = None
+    """Observability settings for the Worker."""
+
+    placement: Optional[Placement] = None
+    """
+    Configuration for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    Specify mode='smart' for Smart Placement, or one of region/hostname/host.
+    """
+
+    tags: Optional[List[str]] = None
+    """Tags associated with the Worker."""
+
+    tail_consumers: Optional[List[ConsumerScript]] = None
+    """List of Workers that will consume logs from the attached Worker."""
+
+    usage_model: Optional[Literal["standard", "bundled", "unbound"]] = None
+    """Usage model for the Worker invocations."""
diff --git a/src/cloudflare/types/workers/scripts/secret_delete_params.py b/src/cloudflare/types/workers/scripts/secret_delete_params.py
new file mode 100644
index 00000000000..072856d75f3
--- /dev/null
+++ b/src/cloudflare/types/workers/scripts/secret_delete_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SecretDeleteParams"]
+
+
+class SecretDeleteParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    script_name: Required[str]
+    """Name of the script, used in URLs and route configuration."""
+
+    url_encoded: bool
+    """Flag that indicates whether the secret name is URL encoded."""
diff --git a/src/cloudflare/types/workers/scripts/secret_get_params.py b/src/cloudflare/types/workers/scripts/secret_get_params.py
new file mode 100644
index 00000000000..ec1372cc8a0
--- /dev/null
+++ b/src/cloudflare/types/workers/scripts/secret_get_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SecretGetParams"]
+
+
+class SecretGetParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    script_name: Required[str]
+    """Name of the script, used in URLs and route configuration."""
+
+    url_encoded: bool
+    """Flag that indicates whether the secret name is URL encoded."""
diff --git a/src/cloudflare/types/workers/scripts/secret_get_response.py b/src/cloudflare/types/workers/scripts/secret_get_response.py
new file mode 100644
index 00000000000..b5b694a518a
--- /dev/null
+++ b/src/cloudflare/types/workers/scripts/secret_get_response.py
@@ -0,0 +1,48 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from ...._utils import PropertyInfo
+from ...._models import BaseModel
+
+__all__ = ["SecretGetResponse", "WorkersBindingKindSecretText", "WorkersBindingKindSecretKey"]
+
+
+class WorkersBindingKindSecretText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_text"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindSecretKey(BaseModel):
+    algorithm: object
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Literal["raw", "pkcs8", "spki", "jwk"]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_key"]
+    """The kind of resource that the binding provides."""
+
+    usages: List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+
+SecretGetResponse: TypeAlias = Annotated[
+    Union[WorkersBindingKindSecretText, WorkersBindingKindSecretKey], PropertyInfo(discriminator="type")
+]
diff --git a/src/cloudflare/types/workers/scripts/secret_list_response.py b/src/cloudflare/types/workers/scripts/secret_list_response.py
new file mode 100644
index 00000000000..d338edc7dfe
--- /dev/null
+++ b/src/cloudflare/types/workers/scripts/secret_list_response.py
@@ -0,0 +1,48 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from ...._utils import PropertyInfo
+from ...._models import BaseModel
+
+__all__ = ["SecretListResponse", "WorkersBindingKindSecretText", "WorkersBindingKindSecretKey"]
+
+
+class WorkersBindingKindSecretText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_text"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindSecretKey(BaseModel):
+    algorithm: object
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Literal["raw", "pkcs8", "spki", "jwk"]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_key"]
+    """The kind of resource that the binding provides."""
+
+    usages: List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+
+SecretListResponse: TypeAlias = Annotated[
+    Union[WorkersBindingKindSecretText, WorkersBindingKindSecretKey], PropertyInfo(discriminator="type")
+]
diff --git a/src/cloudflare/types/workers/scripts/secret_update_params.py b/src/cloudflare/types/workers/scripts/secret_update_params.py
new file mode 100644
index 00000000000..50a322f91ee
--- /dev/null
+++ b/src/cloudflare/types/workers/scripts/secret_update_params.py
@@ -0,0 +1,66 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+__all__ = ["SecretUpdateParams", "WorkersBindingKindSecretText", "WorkersBindingKindSecretKey"]
+
+
+class WorkersBindingKindSecretText(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    text: Required[str]
+    """The secret value to use."""
+
+    type: Required[Literal["secret_text"]]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindSecretKey(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    algorithm: Required[object]
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Required[Literal["raw", "pkcs8", "spki", "jwk"]]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["secret_key"]]
+    """The kind of resource that the binding provides."""
+
+    usages: Required[
+        List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    ]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+    key_base64: str
+    """Base64-encoded key data. Required if `format` is "raw", "pkcs8", or "spki"."""
+
+    key_jwk: object
+    """
+    Key data in
+    [JSON Web Key](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#json_web_key)
+    format. Required if `format` is "jwk".
+    """
+
+
+SecretUpdateParams: TypeAlias = Union[WorkersBindingKindSecretText, WorkersBindingKindSecretKey]
diff --git a/src/cloudflare/types/workers/scripts/secret_update_response.py b/src/cloudflare/types/workers/scripts/secret_update_response.py
new file mode 100644
index 00000000000..ee6c5aa2f05
--- /dev/null
+++ b/src/cloudflare/types/workers/scripts/secret_update_response.py
@@ -0,0 +1,48 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from ...._utils import PropertyInfo
+from ...._models import BaseModel
+
+__all__ = ["SecretUpdateResponse", "WorkersBindingKindSecretText", "WorkersBindingKindSecretKey"]
+
+
+class WorkersBindingKindSecretText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_text"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindSecretKey(BaseModel):
+    algorithm: object
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Literal["raw", "pkcs8", "spki", "jwk"]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_key"]
+    """The kind of resource that the binding provides."""
+
+    usages: List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+
+SecretUpdateResponse: TypeAlias = Annotated[
+    Union[WorkersBindingKindSecretText, WorkersBindingKindSecretKey], PropertyInfo(discriminator="type")
+]
diff --git a/src/cloudflare/types/workers/scripts/setting_edit_params.py b/src/cloudflare/types/workers/scripts/setting_edit_params.py
index 760ce3ac226..2dd0ac9d8ab 100644
--- a/src/cloudflare/types/workers/scripts/setting_edit_params.py
+++ b/src/cloudflare/types/workers/scripts/setting_edit_params.py
@@ -2,20 +2,66 @@
 
 from __future__ import annotations
 
-from typing import Iterable
+from typing import Iterable, Optional
 from typing_extensions import Required, TypedDict
 
+from ...._types import SequenceNotStr
 from .consumer_script_param import ConsumerScriptParam
 
-__all__ = ["SettingEditParams"]
+__all__ = ["SettingEditParams", "Observability", "ObservabilityLogs"]
 
 
 class SettingEditParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     logpush: bool
     """Whether Logpush is turned on for the Worker."""
 
-    tail_consumers: Iterable[ConsumerScriptParam]
+    observability: Optional[Observability]
+    """Observability settings for the Worker."""
+
+    tags: Optional[SequenceNotStr[str]]
+    """Tags associated with the Worker."""
+
+    tail_consumers: Optional[Iterable[ConsumerScriptParam]]
     """List of Workers that will consume logs from the attached Worker."""
+
+
+class ObservabilityLogs(TypedDict, total=False):
+    """Log settings for the Worker."""
+
+    enabled: Required[bool]
+    """Whether logs are enabled for the Worker."""
+
+    invocation_logs: Required[bool]
+    """
+    Whether
+    [invocation logs](https://developers.cloudflare.com/workers/observability/logs/workers-logs/#invocation-logs)
+    are enabled for the Worker.
+    """
+
+    destinations: SequenceNotStr[str]
+    """A list of destinations where logs will be exported to."""
+
+    head_sampling_rate: Optional[float]
+    """The sampling rate for logs. From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1."""
+
+    persist: bool
+    """Whether log persistence is enabled for the Worker."""
+
+
+class Observability(TypedDict, total=False):
+    """Observability settings for the Worker."""
+
+    enabled: Required[bool]
+    """Whether observability is enabled for the Worker."""
+
+    head_sampling_rate: Optional[float]
+    """The sampling rate for incoming requests.
+
+    From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1.
+    """
+
+    logs: Optional[ObservabilityLogs]
+    """Log settings for the Worker."""
diff --git a/src/cloudflare/types/workers/scripts/subdomain_create_params.py b/src/cloudflare/types/workers/scripts/subdomain_create_params.py
new file mode 100644
index 00000000000..eaa360b970f
--- /dev/null
+++ b/src/cloudflare/types/workers/scripts/subdomain_create_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SubdomainCreateParams"]
+
+
+class SubdomainCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    enabled: Required[bool]
+    """Whether the Worker should be available on the workers.dev subdomain."""
+
+    previews_enabled: bool
+    """
+    Whether the Worker's Preview URLs should be available on the workers.dev
+    subdomain.
+    """
diff --git a/src/cloudflare/types/workers/scripts/subdomain_create_response.py b/src/cloudflare/types/workers/scripts/subdomain_create_response.py
new file mode 100644
index 00000000000..d7d77ec9ec2
--- /dev/null
+++ b/src/cloudflare/types/workers/scripts/subdomain_create_response.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["SubdomainCreateResponse"]
+
+
+class SubdomainCreateResponse(BaseModel):
+    enabled: bool
+    """Whether the Worker is available on the workers.dev subdomain."""
+
+    previews_enabled: bool
+    """Whether the Worker's Preview URLs are available on the workers.dev subdomain."""
diff --git a/src/cloudflare/types/workers/scripts/subdomain_delete_response.py b/src/cloudflare/types/workers/scripts/subdomain_delete_response.py
new file mode 100644
index 00000000000..d3572cdb2bc
--- /dev/null
+++ b/src/cloudflare/types/workers/scripts/subdomain_delete_response.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["SubdomainDeleteResponse"]
+
+
+class SubdomainDeleteResponse(BaseModel):
+    enabled: bool
+    """Whether the Worker is available on the workers.dev subdomain."""
+
+    previews_enabled: bool
+    """Whether the Worker's Preview URLs are available on the workers.dev subdomain."""
diff --git a/src/cloudflare/types/workers/scripts/subdomain_get_response.py b/src/cloudflare/types/workers/scripts/subdomain_get_response.py
new file mode 100644
index 00000000000..692170cdb0b
--- /dev/null
+++ b/src/cloudflare/types/workers/scripts/subdomain_get_response.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["SubdomainGetResponse"]
+
+
+class SubdomainGetResponse(BaseModel):
+    enabled: bool
+    """Whether the Worker is available on the workers.dev subdomain."""
+
+    previews_enabled: bool
+    """Whether the Worker's Preview URLs are available on the workers.dev subdomain."""
diff --git a/src/cloudflare/types/workers/scripts/tail_create_params.py b/src/cloudflare/types/workers/scripts/tail_create_params.py
index 5fd1875c6ee..b139916d2e4 100644
--- a/src/cloudflare/types/workers/scripts/tail_create_params.py
+++ b/src/cloudflare/types/workers/scripts/tail_create_params.py
@@ -9,6 +9,6 @@
 
 class TailCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     body: Required[object]
diff --git a/src/cloudflare/types/workers/scripts/tail_create_response.py b/src/cloudflare/types/workers/scripts/tail_create_response.py
index 44f89c77cc6..157a5ac4241 100644
--- a/src/cloudflare/types/workers/scripts/tail_create_response.py
+++ b/src/cloudflare/types/workers/scripts/tail_create_response.py
@@ -1,15 +1,14 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
-
 from ...._models import BaseModel
 
 __all__ = ["TailCreateResponse"]
 
 
 class TailCreateResponse(BaseModel):
-    id: Optional[object] = None
+    id: str
+    """Identifier."""
 
-    expires_at: Optional[object] = None
+    expires_at: str
 
-    url: Optional[object] = None
+    url: str
diff --git a/src/cloudflare/types/workers/scripts/tail_delete_response.py b/src/cloudflare/types/workers/scripts/tail_delete_response.py
index a1947aaa697..6e299dffcf0 100644
--- a/src/cloudflare/types/workers/scripts/tail_delete_response.py
+++ b/src/cloudflare/types/workers/scripts/tail_delete_response.py
@@ -1,18 +1,45 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
 from typing_extensions import Literal
 
 from ...._models import BaseModel
-from ...shared.response_info import ResponseInfo
 
-__all__ = ["TailDeleteResponse"]
+__all__ = ["TailDeleteResponse", "Error", "ErrorSource", "Message", "MessageSource"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
 
 
 class TailDeleteResponse(BaseModel):
-    errors: List[ResponseInfo]
+    errors: List[Error]
 
-    messages: List[ResponseInfo]
+    messages: List[Message]
 
     success: Literal[True]
-    """Whether the API call was successful"""
+    """Whether the API call was successful."""
diff --git a/src/cloudflare/types/workers/scripts/tail_get_response.py b/src/cloudflare/types/workers/scripts/tail_get_response.py
index 181092598c8..5d0c4b7f38f 100644
--- a/src/cloudflare/types/workers/scripts/tail_get_response.py
+++ b/src/cloudflare/types/workers/scripts/tail_get_response.py
@@ -1,15 +1,14 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
-
 from ...._models import BaseModel
 
 __all__ = ["TailGetResponse"]
 
 
 class TailGetResponse(BaseModel):
-    id: Optional[object] = None
+    id: str
+    """Identifier."""
 
-    expires_at: Optional[object] = None
+    expires_at: str
 
-    url: Optional[object] = None
+    url: str
diff --git a/src/cloudflare/types/workers/scripts/version_create_params.py b/src/cloudflare/types/workers/scripts/version_create_params.py
index 3a488701355..32e676a20bc 100644
--- a/src/cloudflare/types/workers/scripts/version_create_params.py
+++ b/src/cloudflare/types/workers/scripts/version_create_params.py
@@ -2,43 +2,566 @@
 
 from __future__ import annotations
 
-from typing import List, Iterable
-from typing_extensions import Literal, Required, Annotated, TypedDict
+from typing import List, Union, Iterable
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
 
-from ...._types import FileTypes
+from ...._types import FileTypes, SequenceNotStr
 from ...._utils import PropertyInfo
 
-__all__ = ["VersionCreateParams", "Metadata", "MetadataAnnotations"]
+__all__ = [
+    "VersionCreateParams",
+    "Metadata",
+    "MetadataAnnotations",
+    "MetadataBinding",
+    "MetadataBindingWorkersBindingKindAI",
+    "MetadataBindingWorkersBindingKindAnalyticsEngine",
+    "MetadataBindingWorkersBindingKindAssets",
+    "MetadataBindingWorkersBindingKindBrowser",
+    "MetadataBindingWorkersBindingKindD1",
+    "MetadataBindingWorkersBindingKindDataBlob",
+    "MetadataBindingWorkersBindingKindDispatchNamespace",
+    "MetadataBindingWorkersBindingKindDispatchNamespaceOutbound",
+    "MetadataBindingWorkersBindingKindDispatchNamespaceOutboundWorker",
+    "MetadataBindingWorkersBindingKindDurableObjectNamespace",
+    "MetadataBindingWorkersBindingKindHyperdrive",
+    "MetadataBindingWorkersBindingKindInherit",
+    "MetadataBindingWorkersBindingKindImages",
+    "MetadataBindingWorkersBindingKindJson",
+    "MetadataBindingWorkersBindingKindKVNamespace",
+    "MetadataBindingWorkersBindingKindMTLSCertificate",
+    "MetadataBindingWorkersBindingKindPlainText",
+    "MetadataBindingWorkersBindingKindPipelines",
+    "MetadataBindingWorkersBindingKindQueue",
+    "MetadataBindingWorkersBindingKindRatelimit",
+    "MetadataBindingWorkersBindingKindRatelimitSimple",
+    "MetadataBindingWorkersBindingKindR2Bucket",
+    "MetadataBindingWorkersBindingKindSecretText",
+    "MetadataBindingWorkersBindingKindSendEmail",
+    "MetadataBindingWorkersBindingKindService",
+    "MetadataBindingWorkersBindingKindTextBlob",
+    "MetadataBindingWorkersBindingKindVectorize",
+    "MetadataBindingWorkersBindingKindVersionMetadata",
+    "MetadataBindingWorkersBindingKindSecretsStoreSecret",
+    "MetadataBindingWorkersBindingKindSecretKey",
+    "MetadataBindingWorkersBindingKindWorkflow",
+    "MetadataBindingWorkersBindingKindWasmModule",
+]
 
 
 class VersionCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    any_part_name: Annotated[List[FileTypes], PropertyInfo(alias="<any part name>")]
-    """A module comprising a Worker script, often a javascript file.
+    metadata: Required[Metadata]
+    """JSON-encoded metadata about the uploaded parts and Worker configuration."""
 
-    Multiple modules may be provided as separate named parts, but at least one
-    module must be present and referenced in the metadata as `main_module`.
-    """
+    files: SequenceNotStr[FileTypes]
+    """An array of modules (often JavaScript files) comprising a Worker script.
 
-    metadata: Metadata
-    """JSON encoded metadata about the uploaded parts and Worker configuration."""
+    At least one module must be present and referenced in the metadata as
+    `main_module` or `body_part` by filename.<br/>Possible Content-Type(s) are:
+    `application/javascript+module`, `text/javascript+module`,
+    `application/javascript`, `text/javascript`, `text/x-python`,
+    `text/x-python-requirement`, `application/wasm`, `text/plain`,
+    `application/octet-stream`, `application/source-map`.
+    """
 
 
 class MetadataAnnotations(TypedDict, total=False):
+    workers_alias: Annotated[str, PropertyInfo(alias="workers/alias")]
+    """Associated alias for a version."""
+
     workers_message: Annotated[str, PropertyInfo(alias="workers/message")]
-    """Human-readable message about the version."""
+    """Human-readable message about the version. Truncated to 100 bytes."""
 
     workers_tag: Annotated[str, PropertyInfo(alias="workers/tag")]
     """User-provided identifier for the version."""
 
 
+class MetadataBindingWorkersBindingKindAI(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["ai"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindAnalyticsEngine(TypedDict, total=False):
+    dataset: Required[str]
+    """The name of the dataset to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["analytics_engine"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindAssets(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["assets"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindBrowser(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["browser"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindD1(TypedDict, total=False):
+    id: Required[str]
+    """Identifier of the D1 database to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["d1"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindDataBlob(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    part: Required[str]
+    """The name of the file containing the data content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Required[Literal["data_blob"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindDispatchNamespaceOutboundWorker(TypedDict, total=False):
+    """Outbound worker."""
+
+    environment: str
+    """Environment of the outbound worker."""
+
+    service: str
+    """Name of the outbound worker."""
+
+
+class MetadataBindingWorkersBindingKindDispatchNamespaceOutbound(TypedDict, total=False):
+    """Outbound worker."""
+
+    params: SequenceNotStr[str]
+    """
+    Pass information from the Dispatch Worker to the Outbound Worker through the
+    parameters.
+    """
+
+    worker: MetadataBindingWorkersBindingKindDispatchNamespaceOutboundWorker
+    """Outbound worker."""
+
+
+class MetadataBindingWorkersBindingKindDispatchNamespace(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    namespace: Required[str]
+    """The name of the dispatch namespace."""
+
+    type: Required[Literal["dispatch_namespace"]]
+    """The kind of resource that the binding provides."""
+
+    outbound: MetadataBindingWorkersBindingKindDispatchNamespaceOutbound
+    """Outbound worker."""
+
+
+class MetadataBindingWorkersBindingKindDurableObjectNamespace(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["durable_object_namespace"]]
+    """The kind of resource that the binding provides."""
+
+    class_name: str
+    """The exported class name of the Durable Object."""
+
+    environment: str
+    """The environment of the script_name to bind to."""
+
+    namespace_id: str
+    """Namespace identifier tag."""
+
+    script_name: str
+    """
+    The script where the Durable Object is defined, if it is external to this
+    Worker.
+    """
+
+
+class MetadataBindingWorkersBindingKindHyperdrive(TypedDict, total=False):
+    id: Required[str]
+    """Identifier of the Hyperdrive connection to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["hyperdrive"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindInherit(TypedDict, total=False):
+    name: Required[str]
+    """The name of the inherited binding."""
+
+    type: Required[Literal["inherit"]]
+    """The kind of resource that the binding provides."""
+
+    old_name: str
+    """The old name of the inherited binding.
+
+    If set, the binding will be renamed from `old_name` to `name` in the new
+    version. If not set, the binding will keep the same name between versions.
+    """
+
+    version_id: str
+    """
+    Identifier for the version to inherit the binding from, which can be the version
+    ID or the literal "latest" to inherit from the latest version. Defaults to
+    inheriting the binding from the latest version.
+    """
+
+
+class MetadataBindingWorkersBindingKindImages(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["images"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindJson(TypedDict, total=False):
+    json: Required[str]
+    """JSON data to use."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["json"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindKVNamespace(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: Required[str]
+    """Namespace identifier tag."""
+
+    type: Required[Literal["kv_namespace"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindMTLSCertificate(TypedDict, total=False):
+    certificate_id: Required[str]
+    """Identifier of the certificate to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["mtls_certificate"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindPlainText(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    text: Required[str]
+    """The text value to use."""
+
+    type: Required[Literal["plain_text"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindPipelines(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    pipeline: Required[str]
+    """Name of the Pipeline to bind to."""
+
+    type: Required[Literal["pipelines"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindQueue(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    queue_name: Required[str]
+    """Name of the Queue to bind to."""
+
+    type: Required[Literal["queue"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindRatelimitSimple(TypedDict, total=False):
+    """The rate limit configuration."""
+
+    limit: Required[float]
+    """The limit (requests per period)."""
+
+    period: Required[int]
+    """The period in seconds."""
+
+
+class MetadataBindingWorkersBindingKindRatelimit(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: Required[str]
+    """Identifier of the rate limit namespace to bind to."""
+
+    simple: Required[MetadataBindingWorkersBindingKindRatelimitSimple]
+    """The rate limit configuration."""
+
+    type: Required[Literal["ratelimit"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindR2Bucket(TypedDict, total=False):
+    bucket_name: Required[str]
+    """R2 bucket to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["r2_bucket"]]
+    """The kind of resource that the binding provides."""
+
+    jurisdiction: Literal["eu", "fedramp"]
+    """
+    The
+    [jurisdiction](https://developers.cloudflare.com/r2/reference/data-location/#jurisdictional-restrictions)
+    of the R2 bucket.
+    """
+
+
+class MetadataBindingWorkersBindingKindSecretText(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    text: Required[str]
+    """The secret value to use."""
+
+    type: Required[Literal["secret_text"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindSendEmail(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["send_email"]]
+    """The kind of resource that the binding provides."""
+
+    allowed_destination_addresses: SequenceNotStr[str]
+    """List of allowed destination addresses."""
+
+    allowed_sender_addresses: SequenceNotStr[str]
+    """List of allowed sender addresses."""
+
+    destination_address: str
+    """Destination address for the email."""
+
+
+class MetadataBindingWorkersBindingKindService(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    service: Required[str]
+    """Name of Worker to bind to."""
+
+    type: Required[Literal["service"]]
+    """The kind of resource that the binding provides."""
+
+    environment: str
+    """Optional environment if the Worker utilizes one."""
+
+
+class MetadataBindingWorkersBindingKindTextBlob(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    part: Required[str]
+    """The name of the file containing the text content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Required[Literal["text_blob"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindVectorize(TypedDict, total=False):
+    index_name: Required[str]
+    """Name of the Vectorize index to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["vectorize"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindVersionMetadata(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["version_metadata"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindSecretsStoreSecret(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    secret_name: Required[str]
+    """Name of the secret in the store."""
+
+    store_id: Required[str]
+    """ID of the store containing the secret."""
+
+    type: Required[Literal["secrets_store_secret"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindSecretKey(TypedDict, total=False):
+    algorithm: Required[object]
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Required[Literal["raw", "pkcs8", "spki", "jwk"]]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["secret_key"]]
+    """The kind of resource that the binding provides."""
+
+    usages: Required[
+        List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    ]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+    key_base64: str
+    """Base64-encoded key data. Required if `format` is "raw", "pkcs8", or "spki"."""
+
+    key_jwk: object
+    """
+    Key data in
+    [JSON Web Key](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#json_web_key)
+    format. Required if `format` is "jwk".
+    """
+
+
+class MetadataBindingWorkersBindingKindWorkflow(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["workflow"]]
+    """The kind of resource that the binding provides."""
+
+    workflow_name: Required[str]
+    """Name of the Workflow to bind to."""
+
+    class_name: str
+    """Class name of the Workflow.
+
+    Should only be provided if the Workflow belongs to this script.
+    """
+
+    script_name: str
+    """Script name that contains the Workflow.
+
+    If not provided, defaults to this script name.
+    """
+
+
+class MetadataBindingWorkersBindingKindWasmModule(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    part: Required[str]
+    """The name of the file containing the WebAssembly module content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Required[Literal["wasm_module"]]
+    """The kind of resource that the binding provides."""
+
+
+MetadataBinding: TypeAlias = Union[
+    MetadataBindingWorkersBindingKindAI,
+    MetadataBindingWorkersBindingKindAnalyticsEngine,
+    MetadataBindingWorkersBindingKindAssets,
+    MetadataBindingWorkersBindingKindBrowser,
+    MetadataBindingWorkersBindingKindD1,
+    MetadataBindingWorkersBindingKindDataBlob,
+    MetadataBindingWorkersBindingKindDispatchNamespace,
+    MetadataBindingWorkersBindingKindDurableObjectNamespace,
+    MetadataBindingWorkersBindingKindHyperdrive,
+    MetadataBindingWorkersBindingKindInherit,
+    MetadataBindingWorkersBindingKindImages,
+    MetadataBindingWorkersBindingKindJson,
+    MetadataBindingWorkersBindingKindKVNamespace,
+    MetadataBindingWorkersBindingKindMTLSCertificate,
+    MetadataBindingWorkersBindingKindPlainText,
+    MetadataBindingWorkersBindingKindPipelines,
+    MetadataBindingWorkersBindingKindQueue,
+    MetadataBindingWorkersBindingKindRatelimit,
+    MetadataBindingWorkersBindingKindR2Bucket,
+    MetadataBindingWorkersBindingKindSecretText,
+    MetadataBindingWorkersBindingKindSendEmail,
+    MetadataBindingWorkersBindingKindService,
+    MetadataBindingWorkersBindingKindTextBlob,
+    MetadataBindingWorkersBindingKindVectorize,
+    MetadataBindingWorkersBindingKindVersionMetadata,
+    MetadataBindingWorkersBindingKindSecretsStoreSecret,
+    MetadataBindingWorkersBindingKindSecretKey,
+    MetadataBindingWorkersBindingKindWorkflow,
+    MetadataBindingWorkersBindingKindWasmModule,
+]
+
+
 class Metadata(TypedDict, total=False):
+    """JSON-encoded metadata about the uploaded parts and Worker configuration."""
+
+    main_module: Required[str]
+    """Name of the uploaded file that contains the main module (e.g.
+
+    the file exporting a `fetch` handler). Indicates a `module syntax` Worker, which
+    is required for Version Upload.
+    """
+
     annotations: MetadataAnnotations
 
-    bindings: Iterable[object]
-    """List of bindings available to the worker."""
+    bindings: Iterable[MetadataBinding]
+    """List of bindings attached to a Worker.
+
+    You can find more about bindings on our docs:
+    https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
+    """
 
     compatibility_date: str
     """Date indicating targeted support in the Workers runtime.
@@ -47,21 +570,15 @@ class Metadata(TypedDict, total=False):
     this Worker.
     """
 
-    compatibility_flags: List[str]
+    compatibility_flags: SequenceNotStr[str]
     """Flags that enable or disable certain features in the Workers runtime.
 
     Used to enable upcoming features or opt in or out of specific changes not
     included in a `compatibility_date`.
     """
 
-    keep_bindings: List[str]
+    keep_bindings: SequenceNotStr[str]
     """List of binding types to keep from previous_upload."""
 
-    main_module: str
-    """Name of the part in the multipart request that contains the main module (e.g.
-
-    the file exporting a `fetch` handler). Indicates a `module syntax` Worker.
-    """
-
-    usage_model: Literal["standard"]
-    """Usage model to apply to invocations."""
+    usage_model: Literal["standard", "bundled", "unbound"]
+    """Usage model for the Worker invocations."""
diff --git a/src/cloudflare/types/workers/scripts/version_create_response.py b/src/cloudflare/types/workers/scripts/version_create_response.py
index 75e17d7f44f..69a14dd8aa7 100644
--- a/src/cloudflare/types/workers/scripts/version_create_response.py
+++ b/src/cloudflare/types/workers/scripts/version_create_response.py
@@ -1,17 +1,629 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import List, Union, Optional
+from typing_extensions import Literal, Annotated, TypeAlias
 
+from pydantic import Field as FieldInfo
+
+from ...._utils import PropertyInfo
 from ...._models import BaseModel
 
-__all__ = ["VersionCreateResponse"]
+__all__ = [
+    "VersionCreateResponse",
+    "Resources",
+    "ResourcesBinding",
+    "ResourcesBindingWorkersBindingKindAI",
+    "ResourcesBindingWorkersBindingKindAnalyticsEngine",
+    "ResourcesBindingWorkersBindingKindAssets",
+    "ResourcesBindingWorkersBindingKindBrowser",
+    "ResourcesBindingWorkersBindingKindD1",
+    "ResourcesBindingWorkersBindingKindDataBlob",
+    "ResourcesBindingWorkersBindingKindDispatchNamespace",
+    "ResourcesBindingWorkersBindingKindDispatchNamespaceOutbound",
+    "ResourcesBindingWorkersBindingKindDispatchNamespaceOutboundWorker",
+    "ResourcesBindingWorkersBindingKindDurableObjectNamespace",
+    "ResourcesBindingWorkersBindingKindHyperdrive",
+    "ResourcesBindingWorkersBindingKindInherit",
+    "ResourcesBindingWorkersBindingKindImages",
+    "ResourcesBindingWorkersBindingKindJson",
+    "ResourcesBindingWorkersBindingKindKVNamespace",
+    "ResourcesBindingWorkersBindingKindMTLSCertificate",
+    "ResourcesBindingWorkersBindingKindPlainText",
+    "ResourcesBindingWorkersBindingKindPipelines",
+    "ResourcesBindingWorkersBindingKindQueue",
+    "ResourcesBindingWorkersBindingKindRatelimit",
+    "ResourcesBindingWorkersBindingKindRatelimitSimple",
+    "ResourcesBindingWorkersBindingKindR2Bucket",
+    "ResourcesBindingWorkersBindingKindSecretText",
+    "ResourcesBindingWorkersBindingKindSendEmail",
+    "ResourcesBindingWorkersBindingKindService",
+    "ResourcesBindingWorkersBindingKindTextBlob",
+    "ResourcesBindingWorkersBindingKindVectorize",
+    "ResourcesBindingWorkersBindingKindVersionMetadata",
+    "ResourcesBindingWorkersBindingKindSecretsStoreSecret",
+    "ResourcesBindingWorkersBindingKindSecretKey",
+    "ResourcesBindingWorkersBindingKindWorkflow",
+    "ResourcesBindingWorkersBindingKindWasmModule",
+    "ResourcesScript",
+    "ResourcesScriptNamedHandler",
+    "ResourcesScriptRuntime",
+    "ResourcesScriptRuntimeLimits",
+    "Metadata",
+]
+
+
+class ResourcesBindingWorkersBindingKindAI(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["ai"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindAnalyticsEngine(BaseModel):
+    dataset: str
+    """The name of the dataset to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["analytics_engine"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindAssets(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["assets"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindBrowser(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["browser"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindD1(BaseModel):
+    id: str
+    """Identifier of the D1 database to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["d1"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindDataBlob(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the data content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["data_blob"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindDispatchNamespaceOutboundWorker(BaseModel):
+    """Outbound worker."""
+
+    environment: Optional[str] = None
+    """Environment of the outbound worker."""
+
+    service: Optional[str] = None
+    """Name of the outbound worker."""
+
+
+class ResourcesBindingWorkersBindingKindDispatchNamespaceOutbound(BaseModel):
+    """Outbound worker."""
+
+    params: Optional[List[str]] = None
+    """
+    Pass information from the Dispatch Worker to the Outbound Worker through the
+    parameters.
+    """
+
+    worker: Optional[ResourcesBindingWorkersBindingKindDispatchNamespaceOutboundWorker] = None
+    """Outbound worker."""
+
+
+class ResourcesBindingWorkersBindingKindDispatchNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace: str
+    """The name of the dispatch namespace."""
+
+    type: Literal["dispatch_namespace"]
+    """The kind of resource that the binding provides."""
+
+    outbound: Optional[ResourcesBindingWorkersBindingKindDispatchNamespaceOutbound] = None
+    """Outbound worker."""
+
+
+class ResourcesBindingWorkersBindingKindDurableObjectNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["durable_object_namespace"]
+    """The kind of resource that the binding provides."""
+
+    class_name: Optional[str] = None
+    """The exported class name of the Durable Object."""
+
+    environment: Optional[str] = None
+    """The environment of the script_name to bind to."""
+
+    namespace_id: Optional[str] = None
+    """Namespace identifier tag."""
+
+    script_name: Optional[str] = None
+    """
+    The script where the Durable Object is defined, if it is external to this
+    Worker.
+    """
+
+
+class ResourcesBindingWorkersBindingKindHyperdrive(BaseModel):
+    id: str
+    """Identifier of the Hyperdrive connection to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["hyperdrive"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindInherit(BaseModel):
+    name: str
+    """The name of the inherited binding."""
+
+    type: Literal["inherit"]
+    """The kind of resource that the binding provides."""
+
+    old_name: Optional[str] = None
+    """The old name of the inherited binding.
+
+    If set, the binding will be renamed from `old_name` to `name` in the new
+    version. If not set, the binding will keep the same name between versions.
+    """
+
+    version_id: Optional[str] = None
+    """
+    Identifier for the version to inherit the binding from, which can be the version
+    ID or the literal "latest" to inherit from the latest version. Defaults to
+    inheriting the binding from the latest version.
+    """
+
+
+class ResourcesBindingWorkersBindingKindImages(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["images"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindJson(BaseModel):
+    json_: str = FieldInfo(alias="json")
+    """JSON data to use."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["json"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindKVNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: str
+    """Namespace identifier tag."""
+
+    type: Literal["kv_namespace"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindMTLSCertificate(BaseModel):
+    certificate_id: str
+    """Identifier of the certificate to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["mtls_certificate"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindPlainText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    text: str
+    """The text value to use."""
+
+    type: Literal["plain_text"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindPipelines(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    pipeline: str
+    """Name of the Pipeline to bind to."""
+
+    type: Literal["pipelines"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindQueue(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    queue_name: str
+    """Name of the Queue to bind to."""
+
+    type: Literal["queue"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindRatelimitSimple(BaseModel):
+    """The rate limit configuration."""
+
+    limit: float
+    """The limit (requests per period)."""
+
+    period: int
+    """The period in seconds."""
+
+
+class ResourcesBindingWorkersBindingKindRatelimit(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: str
+    """Identifier of the rate limit namespace to bind to."""
+
+    simple: ResourcesBindingWorkersBindingKindRatelimitSimple
+    """The rate limit configuration."""
+
+    type: Literal["ratelimit"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindR2Bucket(BaseModel):
+    bucket_name: str
+    """R2 bucket to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["r2_bucket"]
+    """The kind of resource that the binding provides."""
+
+    jurisdiction: Optional[Literal["eu", "fedramp"]] = None
+    """
+    The
+    [jurisdiction](https://developers.cloudflare.com/r2/reference/data-location/#jurisdictional-restrictions)
+    of the R2 bucket.
+    """
+
+
+class ResourcesBindingWorkersBindingKindSecretText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_text"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindSendEmail(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["send_email"]
+    """The kind of resource that the binding provides."""
+
+    allowed_destination_addresses: Optional[List[str]] = None
+    """List of allowed destination addresses."""
+
+    allowed_sender_addresses: Optional[List[str]] = None
+    """List of allowed sender addresses."""
+
+    destination_address: Optional[str] = None
+    """Destination address for the email."""
+
+
+class ResourcesBindingWorkersBindingKindService(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    service: str
+    """Name of Worker to bind to."""
+
+    type: Literal["service"]
+    """The kind of resource that the binding provides."""
+
+    environment: Optional[str] = None
+    """Optional environment if the Worker utilizes one."""
+
+
+class ResourcesBindingWorkersBindingKindTextBlob(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the text content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["text_blob"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindVectorize(BaseModel):
+    index_name: str
+    """Name of the Vectorize index to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["vectorize"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindVersionMetadata(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["version_metadata"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindSecretsStoreSecret(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    secret_name: str
+    """Name of the secret in the store."""
+
+    store_id: str
+    """ID of the store containing the secret."""
+
+    type: Literal["secrets_store_secret"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindSecretKey(BaseModel):
+    algorithm: object
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Literal["raw", "pkcs8", "spki", "jwk"]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_key"]
+    """The kind of resource that the binding provides."""
+
+    usages: List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+
+class ResourcesBindingWorkersBindingKindWorkflow(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["workflow"]
+    """The kind of resource that the binding provides."""
+
+    workflow_name: str
+    """Name of the Workflow to bind to."""
+
+    class_name: Optional[str] = None
+    """Class name of the Workflow.
+
+    Should only be provided if the Workflow belongs to this script.
+    """
+
+    script_name: Optional[str] = None
+    """Script name that contains the Workflow.
+
+    If not provided, defaults to this script name.
+    """
+
+
+class ResourcesBindingWorkersBindingKindWasmModule(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the WebAssembly module content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["wasm_module"]
+    """The kind of resource that the binding provides."""
+
+
+ResourcesBinding: TypeAlias = Annotated[
+    Union[
+        ResourcesBindingWorkersBindingKindAI,
+        ResourcesBindingWorkersBindingKindAnalyticsEngine,
+        ResourcesBindingWorkersBindingKindAssets,
+        ResourcesBindingWorkersBindingKindBrowser,
+        ResourcesBindingWorkersBindingKindD1,
+        ResourcesBindingWorkersBindingKindDataBlob,
+        ResourcesBindingWorkersBindingKindDispatchNamespace,
+        ResourcesBindingWorkersBindingKindDurableObjectNamespace,
+        ResourcesBindingWorkersBindingKindHyperdrive,
+        ResourcesBindingWorkersBindingKindInherit,
+        ResourcesBindingWorkersBindingKindImages,
+        ResourcesBindingWorkersBindingKindJson,
+        ResourcesBindingWorkersBindingKindKVNamespace,
+        ResourcesBindingWorkersBindingKindMTLSCertificate,
+        ResourcesBindingWorkersBindingKindPlainText,
+        ResourcesBindingWorkersBindingKindPipelines,
+        ResourcesBindingWorkersBindingKindQueue,
+        ResourcesBindingWorkersBindingKindRatelimit,
+        ResourcesBindingWorkersBindingKindR2Bucket,
+        ResourcesBindingWorkersBindingKindSecretText,
+        ResourcesBindingWorkersBindingKindSendEmail,
+        ResourcesBindingWorkersBindingKindService,
+        ResourcesBindingWorkersBindingKindTextBlob,
+        ResourcesBindingWorkersBindingKindVectorize,
+        ResourcesBindingWorkersBindingKindVersionMetadata,
+        ResourcesBindingWorkersBindingKindSecretsStoreSecret,
+        ResourcesBindingWorkersBindingKindSecretKey,
+        ResourcesBindingWorkersBindingKindWorkflow,
+        ResourcesBindingWorkersBindingKindWasmModule,
+    ],
+    PropertyInfo(discriminator="type"),
+]
+
+
+class ResourcesScriptNamedHandler(BaseModel):
+    handlers: Optional[List[str]] = None
+    """The names of handlers exported as part of the named export."""
+
+    name: Optional[str] = None
+    """The name of the exported class or entrypoint."""
+
+
+class ResourcesScript(BaseModel):
+    etag: Optional[str] = None
+    """Hashed script content"""
+
+    handlers: Optional[List[str]] = None
+    """The names of handlers exported as part of the default export."""
+
+    last_deployed_from: Optional[str] = None
+    """The client most recently used to deploy this Worker."""
+
+    named_handlers: Optional[List[ResourcesScriptNamedHandler]] = None
+    """
+    Named exports, such as Durable Object class implementations and named
+    entrypoints.
+    """
+
+
+class ResourcesScriptRuntimeLimits(BaseModel):
+    """Resource limits for the Worker."""
+
+    cpu_ms: Optional[int] = None
+    """The amount of CPU time this Worker can use in milliseconds."""
+
+
+class ResourcesScriptRuntime(BaseModel):
+    """Runtime configuration for the Worker."""
+
+    compatibility_date: Optional[str] = None
+    """Date indicating targeted support in the Workers runtime.
+
+    Backwards incompatible fixes to the runtime following this date will not affect
+    this Worker.
+    """
+
+    compatibility_flags: Optional[List[str]] = None
+    """Flags that enable or disable certain features in the Workers runtime."""
+
+    limits: Optional[ResourcesScriptRuntimeLimits] = None
+    """Resource limits for the Worker."""
+
+    migration_tag: Optional[str] = None
+    """
+    The tag of the Durable Object migration that was most recently applied for this
+    Worker.
+    """
+
+    usage_model: Optional[Literal["bundled", "unbound", "standard"]] = None
+    """Usage model for the Worker invocations."""
+
+
+class Resources(BaseModel):
+    bindings: Optional[List[ResourcesBinding]] = None
+    """List of bindings attached to a Worker.
+
+    You can find more about bindings on our docs:
+    https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
+    """
+
+    script: Optional[ResourcesScript] = None
+
+    script_runtime: Optional[ResourcesScriptRuntime] = None
+    """Runtime configuration for the Worker."""
+
+
+class Metadata(BaseModel):
+    author_email: Optional[str] = None
+    """Email of the user who created the version."""
+
+    author_id: Optional[str] = None
+    """Identifier of the user who created the version."""
+
+    created_on: Optional[str] = None
+    """When the version was created."""
+
+    has_preview: Optional[bool] = FieldInfo(alias="hasPreview", default=None)
+    """Whether the version can be previewed."""
+
+    modified_on: Optional[str] = None
+    """When the version was last modified."""
+
+    source: Optional[
+        Literal[
+            "unknown",
+            "api",
+            "wrangler",
+            "terraform",
+            "dash",
+            "dash_template",
+            "integration",
+            "quick_editor",
+            "playground",
+            "workersci",
+        ]
+    ] = None
+    """The source of the version upload."""
 
 
 class VersionCreateResponse(BaseModel):
-    resources: object
+    resources: Resources
 
     id: Optional[str] = None
+    """Unique identifier for the version."""
 
-    metadata: Optional[object] = None
+    metadata: Optional[Metadata] = None
 
     number: Optional[float] = None
+    """Sequential version number."""
+
+    startup_time_ms: Optional[int] = None
+    """
+    Time in milliseconds spent on
+    [Worker startup](https://developers.cloudflare.com/workers/platform/limits/#worker-startup-time).
+    """
diff --git a/src/cloudflare/types/workers/scripts/version_get_response.py b/src/cloudflare/types/workers/scripts/version_get_response.py
index 9a0dbd121eb..f84756c8d41 100644
--- a/src/cloudflare/types/workers/scripts/version_get_response.py
+++ b/src/cloudflare/types/workers/scripts/version_get_response.py
@@ -1,17 +1,623 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import List, Union, Optional
+from typing_extensions import Literal, Annotated, TypeAlias
 
+from pydantic import Field as FieldInfo
+
+from ...._utils import PropertyInfo
 from ...._models import BaseModel
 
-__all__ = ["VersionGetResponse"]
+__all__ = [
+    "VersionGetResponse",
+    "Resources",
+    "ResourcesBinding",
+    "ResourcesBindingWorkersBindingKindAI",
+    "ResourcesBindingWorkersBindingKindAnalyticsEngine",
+    "ResourcesBindingWorkersBindingKindAssets",
+    "ResourcesBindingWorkersBindingKindBrowser",
+    "ResourcesBindingWorkersBindingKindD1",
+    "ResourcesBindingWorkersBindingKindDataBlob",
+    "ResourcesBindingWorkersBindingKindDispatchNamespace",
+    "ResourcesBindingWorkersBindingKindDispatchNamespaceOutbound",
+    "ResourcesBindingWorkersBindingKindDispatchNamespaceOutboundWorker",
+    "ResourcesBindingWorkersBindingKindDurableObjectNamespace",
+    "ResourcesBindingWorkersBindingKindHyperdrive",
+    "ResourcesBindingWorkersBindingKindInherit",
+    "ResourcesBindingWorkersBindingKindImages",
+    "ResourcesBindingWorkersBindingKindJson",
+    "ResourcesBindingWorkersBindingKindKVNamespace",
+    "ResourcesBindingWorkersBindingKindMTLSCertificate",
+    "ResourcesBindingWorkersBindingKindPlainText",
+    "ResourcesBindingWorkersBindingKindPipelines",
+    "ResourcesBindingWorkersBindingKindQueue",
+    "ResourcesBindingWorkersBindingKindRatelimit",
+    "ResourcesBindingWorkersBindingKindRatelimitSimple",
+    "ResourcesBindingWorkersBindingKindR2Bucket",
+    "ResourcesBindingWorkersBindingKindSecretText",
+    "ResourcesBindingWorkersBindingKindSendEmail",
+    "ResourcesBindingWorkersBindingKindService",
+    "ResourcesBindingWorkersBindingKindTextBlob",
+    "ResourcesBindingWorkersBindingKindVectorize",
+    "ResourcesBindingWorkersBindingKindVersionMetadata",
+    "ResourcesBindingWorkersBindingKindSecretsStoreSecret",
+    "ResourcesBindingWorkersBindingKindSecretKey",
+    "ResourcesBindingWorkersBindingKindWorkflow",
+    "ResourcesBindingWorkersBindingKindWasmModule",
+    "ResourcesScript",
+    "ResourcesScriptNamedHandler",
+    "ResourcesScriptRuntime",
+    "ResourcesScriptRuntimeLimits",
+    "Metadata",
+]
+
+
+class ResourcesBindingWorkersBindingKindAI(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["ai"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindAnalyticsEngine(BaseModel):
+    dataset: str
+    """The name of the dataset to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["analytics_engine"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindAssets(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["assets"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindBrowser(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["browser"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindD1(BaseModel):
+    id: str
+    """Identifier of the D1 database to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["d1"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindDataBlob(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the data content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["data_blob"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindDispatchNamespaceOutboundWorker(BaseModel):
+    """Outbound worker."""
+
+    environment: Optional[str] = None
+    """Environment of the outbound worker."""
+
+    service: Optional[str] = None
+    """Name of the outbound worker."""
+
+
+class ResourcesBindingWorkersBindingKindDispatchNamespaceOutbound(BaseModel):
+    """Outbound worker."""
+
+    params: Optional[List[str]] = None
+    """
+    Pass information from the Dispatch Worker to the Outbound Worker through the
+    parameters.
+    """
+
+    worker: Optional[ResourcesBindingWorkersBindingKindDispatchNamespaceOutboundWorker] = None
+    """Outbound worker."""
+
+
+class ResourcesBindingWorkersBindingKindDispatchNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace: str
+    """The name of the dispatch namespace."""
+
+    type: Literal["dispatch_namespace"]
+    """The kind of resource that the binding provides."""
+
+    outbound: Optional[ResourcesBindingWorkersBindingKindDispatchNamespaceOutbound] = None
+    """Outbound worker."""
+
+
+class ResourcesBindingWorkersBindingKindDurableObjectNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["durable_object_namespace"]
+    """The kind of resource that the binding provides."""
+
+    class_name: Optional[str] = None
+    """The exported class name of the Durable Object."""
+
+    environment: Optional[str] = None
+    """The environment of the script_name to bind to."""
+
+    namespace_id: Optional[str] = None
+    """Namespace identifier tag."""
+
+    script_name: Optional[str] = None
+    """
+    The script where the Durable Object is defined, if it is external to this
+    Worker.
+    """
+
+
+class ResourcesBindingWorkersBindingKindHyperdrive(BaseModel):
+    id: str
+    """Identifier of the Hyperdrive connection to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["hyperdrive"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindInherit(BaseModel):
+    name: str
+    """The name of the inherited binding."""
+
+    type: Literal["inherit"]
+    """The kind of resource that the binding provides."""
+
+    old_name: Optional[str] = None
+    """The old name of the inherited binding.
+
+    If set, the binding will be renamed from `old_name` to `name` in the new
+    version. If not set, the binding will keep the same name between versions.
+    """
+
+    version_id: Optional[str] = None
+    """
+    Identifier for the version to inherit the binding from, which can be the version
+    ID or the literal "latest" to inherit from the latest version. Defaults to
+    inheriting the binding from the latest version.
+    """
+
+
+class ResourcesBindingWorkersBindingKindImages(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["images"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindJson(BaseModel):
+    json_: str = FieldInfo(alias="json")
+    """JSON data to use."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["json"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindKVNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: str
+    """Namespace identifier tag."""
+
+    type: Literal["kv_namespace"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindMTLSCertificate(BaseModel):
+    certificate_id: str
+    """Identifier of the certificate to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["mtls_certificate"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindPlainText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    text: str
+    """The text value to use."""
+
+    type: Literal["plain_text"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindPipelines(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    pipeline: str
+    """Name of the Pipeline to bind to."""
+
+    type: Literal["pipelines"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindQueue(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    queue_name: str
+    """Name of the Queue to bind to."""
+
+    type: Literal["queue"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindRatelimitSimple(BaseModel):
+    """The rate limit configuration."""
+
+    limit: float
+    """The limit (requests per period)."""
+
+    period: int
+    """The period in seconds."""
+
+
+class ResourcesBindingWorkersBindingKindRatelimit(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: str
+    """Identifier of the rate limit namespace to bind to."""
+
+    simple: ResourcesBindingWorkersBindingKindRatelimitSimple
+    """The rate limit configuration."""
+
+    type: Literal["ratelimit"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindR2Bucket(BaseModel):
+    bucket_name: str
+    """R2 bucket to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["r2_bucket"]
+    """The kind of resource that the binding provides."""
+
+    jurisdiction: Optional[Literal["eu", "fedramp"]] = None
+    """
+    The
+    [jurisdiction](https://developers.cloudflare.com/r2/reference/data-location/#jurisdictional-restrictions)
+    of the R2 bucket.
+    """
+
+
+class ResourcesBindingWorkersBindingKindSecretText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_text"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindSendEmail(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["send_email"]
+    """The kind of resource that the binding provides."""
+
+    allowed_destination_addresses: Optional[List[str]] = None
+    """List of allowed destination addresses."""
+
+    allowed_sender_addresses: Optional[List[str]] = None
+    """List of allowed sender addresses."""
+
+    destination_address: Optional[str] = None
+    """Destination address for the email."""
+
+
+class ResourcesBindingWorkersBindingKindService(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    service: str
+    """Name of Worker to bind to."""
+
+    type: Literal["service"]
+    """The kind of resource that the binding provides."""
+
+    environment: Optional[str] = None
+    """Optional environment if the Worker utilizes one."""
+
+
+class ResourcesBindingWorkersBindingKindTextBlob(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the text content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["text_blob"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindVectorize(BaseModel):
+    index_name: str
+    """Name of the Vectorize index to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["vectorize"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindVersionMetadata(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["version_metadata"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindSecretsStoreSecret(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    secret_name: str
+    """Name of the secret in the store."""
+
+    store_id: str
+    """ID of the store containing the secret."""
+
+    type: Literal["secrets_store_secret"]
+    """The kind of resource that the binding provides."""
+
+
+class ResourcesBindingWorkersBindingKindSecretKey(BaseModel):
+    algorithm: object
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Literal["raw", "pkcs8", "spki", "jwk"]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_key"]
+    """The kind of resource that the binding provides."""
+
+    usages: List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+
+class ResourcesBindingWorkersBindingKindWorkflow(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["workflow"]
+    """The kind of resource that the binding provides."""
+
+    workflow_name: str
+    """Name of the Workflow to bind to."""
+
+    class_name: Optional[str] = None
+    """Class name of the Workflow.
+
+    Should only be provided if the Workflow belongs to this script.
+    """
+
+    script_name: Optional[str] = None
+    """Script name that contains the Workflow.
+
+    If not provided, defaults to this script name.
+    """
+
+
+class ResourcesBindingWorkersBindingKindWasmModule(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the WebAssembly module content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["wasm_module"]
+    """The kind of resource that the binding provides."""
+
+
+ResourcesBinding: TypeAlias = Annotated[
+    Union[
+        ResourcesBindingWorkersBindingKindAI,
+        ResourcesBindingWorkersBindingKindAnalyticsEngine,
+        ResourcesBindingWorkersBindingKindAssets,
+        ResourcesBindingWorkersBindingKindBrowser,
+        ResourcesBindingWorkersBindingKindD1,
+        ResourcesBindingWorkersBindingKindDataBlob,
+        ResourcesBindingWorkersBindingKindDispatchNamespace,
+        ResourcesBindingWorkersBindingKindDurableObjectNamespace,
+        ResourcesBindingWorkersBindingKindHyperdrive,
+        ResourcesBindingWorkersBindingKindInherit,
+        ResourcesBindingWorkersBindingKindImages,
+        ResourcesBindingWorkersBindingKindJson,
+        ResourcesBindingWorkersBindingKindKVNamespace,
+        ResourcesBindingWorkersBindingKindMTLSCertificate,
+        ResourcesBindingWorkersBindingKindPlainText,
+        ResourcesBindingWorkersBindingKindPipelines,
+        ResourcesBindingWorkersBindingKindQueue,
+        ResourcesBindingWorkersBindingKindRatelimit,
+        ResourcesBindingWorkersBindingKindR2Bucket,
+        ResourcesBindingWorkersBindingKindSecretText,
+        ResourcesBindingWorkersBindingKindSendEmail,
+        ResourcesBindingWorkersBindingKindService,
+        ResourcesBindingWorkersBindingKindTextBlob,
+        ResourcesBindingWorkersBindingKindVectorize,
+        ResourcesBindingWorkersBindingKindVersionMetadata,
+        ResourcesBindingWorkersBindingKindSecretsStoreSecret,
+        ResourcesBindingWorkersBindingKindSecretKey,
+        ResourcesBindingWorkersBindingKindWorkflow,
+        ResourcesBindingWorkersBindingKindWasmModule,
+    ],
+    PropertyInfo(discriminator="type"),
+]
+
+
+class ResourcesScriptNamedHandler(BaseModel):
+    handlers: Optional[List[str]] = None
+    """The names of handlers exported as part of the named export."""
+
+    name: Optional[str] = None
+    """The name of the exported class or entrypoint."""
+
+
+class ResourcesScript(BaseModel):
+    etag: Optional[str] = None
+    """Hashed script content"""
+
+    handlers: Optional[List[str]] = None
+    """The names of handlers exported as part of the default export."""
+
+    last_deployed_from: Optional[str] = None
+    """The client most recently used to deploy this Worker."""
+
+    named_handlers: Optional[List[ResourcesScriptNamedHandler]] = None
+    """
+    Named exports, such as Durable Object class implementations and named
+    entrypoints.
+    """
+
+
+class ResourcesScriptRuntimeLimits(BaseModel):
+    """Resource limits for the Worker."""
+
+    cpu_ms: Optional[int] = None
+    """The amount of CPU time this Worker can use in milliseconds."""
+
+
+class ResourcesScriptRuntime(BaseModel):
+    """Runtime configuration for the Worker."""
+
+    compatibility_date: Optional[str] = None
+    """Date indicating targeted support in the Workers runtime.
+
+    Backwards incompatible fixes to the runtime following this date will not affect
+    this Worker.
+    """
+
+    compatibility_flags: Optional[List[str]] = None
+    """Flags that enable or disable certain features in the Workers runtime."""
+
+    limits: Optional[ResourcesScriptRuntimeLimits] = None
+    """Resource limits for the Worker."""
+
+    migration_tag: Optional[str] = None
+    """
+    The tag of the Durable Object migration that was most recently applied for this
+    Worker.
+    """
+
+    usage_model: Optional[Literal["bundled", "unbound", "standard"]] = None
+    """Usage model for the Worker invocations."""
+
+
+class Resources(BaseModel):
+    bindings: Optional[List[ResourcesBinding]] = None
+    """List of bindings attached to a Worker.
+
+    You can find more about bindings on our docs:
+    https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
+    """
+
+    script: Optional[ResourcesScript] = None
+
+    script_runtime: Optional[ResourcesScriptRuntime] = None
+    """Runtime configuration for the Worker."""
+
+
+class Metadata(BaseModel):
+    author_email: Optional[str] = None
+    """Email of the user who created the version."""
+
+    author_id: Optional[str] = None
+    """Identifier of the user who created the version."""
+
+    created_on: Optional[str] = None
+    """When the version was created."""
+
+    has_preview: Optional[bool] = FieldInfo(alias="hasPreview", default=None)
+    """Whether the version can be previewed."""
+
+    modified_on: Optional[str] = None
+    """When the version was last modified."""
+
+    source: Optional[
+        Literal[
+            "unknown",
+            "api",
+            "wrangler",
+            "terraform",
+            "dash",
+            "dash_template",
+            "integration",
+            "quick_editor",
+            "playground",
+            "workersci",
+        ]
+    ] = None
+    """The source of the version upload."""
 
 
 class VersionGetResponse(BaseModel):
-    resources: object
+    resources: Resources
 
     id: Optional[str] = None
+    """Unique identifier for the version."""
 
-    metadata: Optional[object] = None
+    metadata: Optional[Metadata] = None
 
     number: Optional[float] = None
+    """Sequential version number."""
diff --git a/src/cloudflare/types/workers/scripts/version_list_params.py b/src/cloudflare/types/workers/scripts/version_list_params.py
index b5c0dd9481e..8ec395b7c57 100644
--- a/src/cloudflare/types/workers/scripts/version_list_params.py
+++ b/src/cloudflare/types/workers/scripts/version_list_params.py
@@ -9,7 +9,7 @@
 
 class VersionListParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     deployable: bool
     """Only return versions that can be used in a deployment. Ignores pagination."""
diff --git a/src/cloudflare/types/workers/scripts/version_list_response.py b/src/cloudflare/types/workers/scripts/version_list_response.py
index b992e3fab59..c26d4c3b53f 100644
--- a/src/cloudflare/types/workers/scripts/version_list_response.py
+++ b/src/cloudflare/types/workers/scripts/version_list_response.py
@@ -1,15 +1,53 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
 
-__all__ = ["VersionListResponse"]
+__all__ = ["VersionListResponse", "Metadata"]
+
+
+class Metadata(BaseModel):
+    author_email: Optional[str] = None
+    """Email of the user who created the version."""
+
+    author_id: Optional[str] = None
+    """Identifier of the user who created the version."""
+
+    created_on: Optional[str] = None
+    """When the version was created."""
+
+    has_preview: Optional[bool] = FieldInfo(alias="hasPreview", default=None)
+    """Whether the version can be previewed."""
+
+    modified_on: Optional[str] = None
+    """When the version was last modified."""
+
+    source: Optional[
+        Literal[
+            "unknown",
+            "api",
+            "wrangler",
+            "terraform",
+            "dash",
+            "dash_template",
+            "integration",
+            "quick_editor",
+            "playground",
+            "workersci",
+        ]
+    ] = None
+    """The source of the version upload."""
 
 
 class VersionListResponse(BaseModel):
     id: Optional[str] = None
+    """Unique identifier for the version."""
 
-    metadata: Optional[object] = None
+    metadata: Optional[Metadata] = None
 
     number: Optional[float] = None
+    """Sequential version number."""
diff --git a/src/cloudflare/types/workers/service_binding.py b/src/cloudflare/types/workers/service_binding.py
deleted file mode 100644
index ffd0c7b07f5..00000000000
--- a/src/cloudflare/types/workers/service_binding.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = ["ServiceBinding"]
-
-
-class ServiceBinding(BaseModel):
-    environment: str
-    """Optional environment if the Worker utilizes one."""
-
-    name: str
-    """A JavaScript variable name for the binding."""
-
-    service: str
-    """Name of Worker to bind to"""
-
-    type: Literal["service"]
-    """The class of resource that the binding provides."""
diff --git a/src/cloudflare/types/workers/service_binding_param.py b/src/cloudflare/types/workers/service_binding_param.py
deleted file mode 100644
index 52ecb335075..00000000000
--- a/src/cloudflare/types/workers/service_binding_param.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, Required, TypedDict
-
-__all__ = ["ServiceBindingParam"]
-
-
-class ServiceBindingParam(TypedDict, total=False):
-    environment: Required[str]
-    """Optional environment if the Worker utilizes one."""
-
-    service: Required[str]
-    """Name of Worker to bind to"""
-
-    type: Required[Literal["service"]]
-    """The class of resource that the binding provides."""
diff --git a/src/cloudflare/types/workers/single_step_migration.py b/src/cloudflare/types/workers/single_step_migration.py
index 2c07c2f4a22..54d500988b6 100644
--- a/src/cloudflare/types/workers/single_step_migration.py
+++ b/src/cloudflare/types/workers/single_step_migration.py
@@ -1,49 +1,19 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
-
-from pydantic import Field as FieldInfo
-
 from ..._models import BaseModel
 
 __all__ = ["SingleStepMigration", "RenamedClass", "TransferredClass"]
 
 
 class RenamedClass(BaseModel):
-    from_: Optional[str] = FieldInfo(alias="from", default=None)
-
-    to: Optional[str] = None
+    pass
 
 
 class TransferredClass(BaseModel):
-    from_: Optional[str] = FieldInfo(alias="from", default=None)
-
-    from_script: Optional[str] = None
-
-    to: Optional[str] = None
+    pass
 
 
 class SingleStepMigration(BaseModel):
-    deleted_classes: Optional[List[str]] = None
-    """A list of classes to delete Durable Object namespaces from."""
-
-    new_classes: Optional[List[str]] = None
-    """A list of classes to create Durable Object namespaces from."""
-
-    new_tag: Optional[str] = None
-    """Tag to set as the latest migration tag."""
-
-    old_tag: Optional[str] = None
-    """Tag used to verify against the latest migration tag for this Worker.
-
-    If they don't match, the upload is rejected.
-    """
-
-    renamed_classes: Optional[List[RenamedClass]] = None
-    """A list of classes with Durable Object namespaces that were renamed."""
+    """A single set of migrations to apply."""
 
-    transferred_classes: Optional[List[TransferredClass]] = None
-    """
-    A list of transfers for Durable Object namespaces from a different Worker and
-    class to a class defined in this Worker.
-    """
+    pass
diff --git a/src/cloudflare/types/workers/single_step_migration_param.py b/src/cloudflare/types/workers/single_step_migration_param.py
index 0c831efe8af..af9f0d45f7a 100644
--- a/src/cloudflare/types/workers/single_step_migration_param.py
+++ b/src/cloudflare/types/workers/single_step_migration_param.py
@@ -2,9 +2,11 @@
 
 from __future__ import annotations
 
-from typing import List, Iterable
+from typing import Iterable
 from typing_extensions import TypedDict
 
+from ..._types import SequenceNotStr
+
 __all__ = ["SingleStepMigrationParam", "RenamedClass", "TransferredClass"]
 
 _RenamedClassReservedKeywords = TypedDict(
@@ -36,12 +38,17 @@ class TransferredClass(_TransferredClassReservedKeywords, total=False):
 
 
 class SingleStepMigrationParam(TypedDict, total=False):
-    deleted_classes: List[str]
+    """A single set of migrations to apply."""
+
+    deleted_classes: SequenceNotStr[str]
     """A list of classes to delete Durable Object namespaces from."""
 
-    new_classes: List[str]
+    new_classes: SequenceNotStr[str]
     """A list of classes to create Durable Object namespaces from."""
 
+    new_sqlite_classes: SequenceNotStr[str]
+    """A list of classes to create Durable Object namespaces with SQLite from."""
+
     new_tag: str
     """Tag to set as the latest migration tag."""
 
diff --git a/src/cloudflare/types/workers/stepped_migration.py b/src/cloudflare/types/workers/stepped_migration.py
deleted file mode 100644
index 3383a9a473f..00000000000
--- a/src/cloudflare/types/workers/stepped_migration.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from ..._models import BaseModel
-from .migration_step import MigrationStep
-
-__all__ = ["SteppedMigration"]
-
-
-class SteppedMigration(BaseModel):
-    new_tag: Optional[str] = None
-    """Tag to set as the latest migration tag."""
-
-    old_tag: Optional[str] = None
-    """Tag used to verify against the latest migration tag for this Worker.
-
-    If they don't match, the upload is rejected.
-    """
-
-    steps: Optional[List[MigrationStep]] = None
-    """Migrations to apply in order."""
diff --git a/src/cloudflare/types/workers/stepped_migration_param.py b/src/cloudflare/types/workers/stepped_migration_param.py
deleted file mode 100644
index 2465041142b..00000000000
--- a/src/cloudflare/types/workers/stepped_migration_param.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Iterable
-from typing_extensions import TypedDict
-
-from .migration_step_param import MigrationStepParam
-
-__all__ = ["SteppedMigrationParam"]
-
-
-class SteppedMigrationParam(TypedDict, total=False):
-    new_tag: str
-    """Tag to set as the latest migration tag."""
-
-    old_tag: str
-    """Tag used to verify against the latest migration tag for this Worker.
-
-    If they don't match, the upload is rejected.
-    """
-
-    steps: Iterable[MigrationStepParam]
-    """Migrations to apply in order."""
diff --git a/src/cloudflare/types/workers/subdomain_get_response.py b/src/cloudflare/types/workers/subdomain_get_response.py
index c3b3a31146a..6911605016a 100644
--- a/src/cloudflare/types/workers/subdomain_get_response.py
+++ b/src/cloudflare/types/workers/subdomain_get_response.py
@@ -1,11 +1,9 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
-
 from ..._models import BaseModel
 
 __all__ = ["SubdomainGetResponse"]
 
 
 class SubdomainGetResponse(BaseModel):
-    name: Optional[object] = None
+    subdomain: str
diff --git a/src/cloudflare/types/workers/subdomain_update_params.py b/src/cloudflare/types/workers/subdomain_update_params.py
index 21b41390a10..e9c859e2742 100644
--- a/src/cloudflare/types/workers/subdomain_update_params.py
+++ b/src/cloudflare/types/workers/subdomain_update_params.py
@@ -9,6 +9,6 @@
 
 class SubdomainUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    body: Required[str]
+    subdomain: Required[str]
diff --git a/src/cloudflare/types/workers/subdomain_update_response.py b/src/cloudflare/types/workers/subdomain_update_response.py
index d3e08984e1e..803c7670690 100644
--- a/src/cloudflare/types/workers/subdomain_update_response.py
+++ b/src/cloudflare/types/workers/subdomain_update_response.py
@@ -1,11 +1,9 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
-
 from ..._models import BaseModel
 
 __all__ = ["SubdomainUpdateResponse"]
 
 
 class SubdomainUpdateResponse(BaseModel):
-    name: Optional[object] = None
+    subdomain: str
diff --git a/src/cloudflare/types/workers/worker_metadata_param.py b/src/cloudflare/types/workers/worker_metadata_param.py
index dbfae3cd26d..f42f560da68 100644
--- a/src/cloudflare/types/workers/worker_metadata_param.py
+++ b/src/cloudflare/types/workers/worker_metadata_param.py
@@ -8,6 +8,8 @@
 
 
 class WorkerMetadataParam(TypedDict, total=False):
+    """JSON-encoded metadata about the uploaded parts and Worker configuration."""
+
     body_part: str
     """Name of the part in the multipart request that contains the script (e.g.
 
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespace_create_params.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespace_create_params.py
index 77d7f35b54f..cda0173ef7b 100644
--- a/src/cloudflare/types/workers_for_platforms/dispatch/namespace_create_params.py
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespace_create_params.py
@@ -9,7 +9,7 @@
 
 class NamespaceCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     name: str
-    """The name of the dispatch namespace"""
+    """The name of the dispatch namespace."""
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespace_create_response.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespace_create_response.py
index 6c5fb1979de..baab51ab039 100644
--- a/src/cloudflare/types/workers_for_platforms/dispatch/namespace_create_response.py
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespace_create_response.py
@@ -10,13 +10,13 @@
 
 class NamespaceCreateResponse(BaseModel):
     created_by: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
 
     created_on: Optional[datetime] = None
     """When the script was created."""
 
     modified_by: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
 
     modified_on: Optional[datetime] = None
     """When the script was last modified."""
@@ -28,4 +28,13 @@ class NamespaceCreateResponse(BaseModel):
     """Name of the Workers for Platforms dispatch namespace."""
 
     script_count: Optional[int] = None
-    """The current number of scripts in this Dispatch Namespace"""
+    """The current number of scripts in this Dispatch Namespace."""
+
+    trusted_workers: Optional[bool] = None
+    """Whether the Workers in the namespace are executed in a "trusted" manner.
+
+    When a Worker is trusted, it has access to the shared caches for the zone in the
+    Cache API, and has access to the `request.cf` object on incoming Requests. When
+    a Worker is untrusted, caches are not shared across the zone, and `request.cf`
+    is undefined. By default, Workers in a namespace are "untrusted".
+    """
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespace_get_response.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespace_get_response.py
index 504ece0a83f..f379aff6c03 100644
--- a/src/cloudflare/types/workers_for_platforms/dispatch/namespace_get_response.py
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespace_get_response.py
@@ -10,13 +10,13 @@
 
 class NamespaceGetResponse(BaseModel):
     created_by: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
 
     created_on: Optional[datetime] = None
     """When the script was created."""
 
     modified_by: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
 
     modified_on: Optional[datetime] = None
     """When the script was last modified."""
@@ -28,4 +28,13 @@ class NamespaceGetResponse(BaseModel):
     """Name of the Workers for Platforms dispatch namespace."""
 
     script_count: Optional[int] = None
-    """The current number of scripts in this Dispatch Namespace"""
+    """The current number of scripts in this Dispatch Namespace."""
+
+    trusted_workers: Optional[bool] = None
+    """Whether the Workers in the namespace are executed in a "trusted" manner.
+
+    When a Worker is trusted, it has access to the shared caches for the zone in the
+    Cache API, and has access to the `request.cf` object on incoming Requests. When
+    a Worker is untrusted, caches are not shared across the zone, and `request.cf`
+    is undefined. By default, Workers in a namespace are "untrusted".
+    """
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespace_list_response.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespace_list_response.py
index afd2b614ddc..36657161068 100644
--- a/src/cloudflare/types/workers_for_platforms/dispatch/namespace_list_response.py
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespace_list_response.py
@@ -10,13 +10,13 @@
 
 class NamespaceListResponse(BaseModel):
     created_by: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
 
     created_on: Optional[datetime] = None
     """When the script was created."""
 
     modified_by: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
 
     modified_on: Optional[datetime] = None
     """When the script was last modified."""
@@ -28,4 +28,13 @@ class NamespaceListResponse(BaseModel):
     """Name of the Workers for Platforms dispatch namespace."""
 
     script_count: Optional[int] = None
-    """The current number of scripts in this Dispatch Namespace"""
+    """The current number of scripts in this Dispatch Namespace."""
+
+    trusted_workers: Optional[bool] = None
+    """Whether the Workers in the namespace are executed in a "trusted" manner.
+
+    When a Worker is trusted, it has access to the shared caches for the zone in the
+    Cache API, and has access to the `request.cf` object on incoming Requests. When
+    a Worker is untrusted, caches are not shared across the zone, and `request.cf`
+    is undefined. By default, Workers in a namespace are "untrusted".
+    """
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/__init__.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/__init__.py
index ce0b9cc9fcd..6cb01babbf2 100644
--- a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/__init__.py
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/__init__.py
@@ -5,3 +5,4 @@
 from .script import Script as Script
 from .script_delete_params import ScriptDeleteParams as ScriptDeleteParams
 from .script_update_params import ScriptUpdateParams as ScriptUpdateParams
+from .script_update_response import ScriptUpdateResponse as ScriptUpdateResponse
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script.py
index 8cdabbbabf3..dbcb42da1c3 100644
--- a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script.py
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script.py
@@ -10,6 +10,8 @@
 
 
 class Script(BaseModel):
+    """Details about a worker uploaded to a Workers for Platforms namespace."""
+
     created_on: Optional[datetime] = None
     """When the script was created."""
 
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script_delete_params.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script_delete_params.py
index 4ab2a41fd37..e319bb4dd06 100644
--- a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script_delete_params.py
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script_delete_params.py
@@ -9,7 +9,7 @@
 
 class ScriptDeleteParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     dispatch_namespace: Required[str]
     """Name of the Workers for Platforms dispatch namespace."""
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 53bb144df7d..59cd806ed41 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
@@ -2,48 +2,778 @@
 
 from __future__ import annotations
 
-from typing import List, Union, Iterable
-from typing_extensions import Literal, Required, Annotated, TypedDict
+from typing import List, Union, Iterable, Optional
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
-from ....._types import FileTypes
-from ....._utils import PropertyInfo
-from ....workers.stepped_migration_param import SteppedMigrationParam
+from ....._types import FileTypes, SequenceNotStr
+from ....workers.migration_step_param import MigrationStepParam
 from ....workers.single_step_migration_param import SingleStepMigrationParam
-from ....workers.placement_configuration_param import PlacementConfigurationParam
 from ....workers.scripts.consumer_script_param import ConsumerScriptParam
 
-__all__ = ["ScriptUpdateParams", "Variant0", "Variant0Metadata", "Variant0MetadataMigrations", "Variant1"]
-
-
-class Variant0(TypedDict, total=False):
+__all__ = [
+    "ScriptUpdateParams",
+    "Metadata",
+    "MetadataAssets",
+    "MetadataAssetsConfig",
+    "MetadataBinding",
+    "MetadataBindingWorkersBindingKindAI",
+    "MetadataBindingWorkersBindingKindAnalyticsEngine",
+    "MetadataBindingWorkersBindingKindAssets",
+    "MetadataBindingWorkersBindingKindBrowser",
+    "MetadataBindingWorkersBindingKindD1",
+    "MetadataBindingWorkersBindingKindDataBlob",
+    "MetadataBindingWorkersBindingKindDispatchNamespace",
+    "MetadataBindingWorkersBindingKindDispatchNamespaceOutbound",
+    "MetadataBindingWorkersBindingKindDispatchNamespaceOutboundWorker",
+    "MetadataBindingWorkersBindingKindDurableObjectNamespace",
+    "MetadataBindingWorkersBindingKindHyperdrive",
+    "MetadataBindingWorkersBindingKindInherit",
+    "MetadataBindingWorkersBindingKindImages",
+    "MetadataBindingWorkersBindingKindJson",
+    "MetadataBindingWorkersBindingKindKVNamespace",
+    "MetadataBindingWorkersBindingKindMTLSCertificate",
+    "MetadataBindingWorkersBindingKindPlainText",
+    "MetadataBindingWorkersBindingKindPipelines",
+    "MetadataBindingWorkersBindingKindQueue",
+    "MetadataBindingWorkersBindingKindRatelimit",
+    "MetadataBindingWorkersBindingKindRatelimitSimple",
+    "MetadataBindingWorkersBindingKindR2Bucket",
+    "MetadataBindingWorkersBindingKindSecretText",
+    "MetadataBindingWorkersBindingKindSendEmail",
+    "MetadataBindingWorkersBindingKindService",
+    "MetadataBindingWorkersBindingKindTextBlob",
+    "MetadataBindingWorkersBindingKindVectorize",
+    "MetadataBindingWorkersBindingKindVersionMetadata",
+    "MetadataBindingWorkersBindingKindSecretsStoreSecret",
+    "MetadataBindingWorkersBindingKindSecretKey",
+    "MetadataBindingWorkersBindingKindWorkflow",
+    "MetadataBindingWorkersBindingKindWasmModule",
+    "MetadataLimits",
+    "MetadataMigrations",
+    "MetadataMigrationsWorkersMultipleStepMigrations",
+    "MetadataObservability",
+    "MetadataObservabilityLogs",
+    "MetadataPlacement",
+    "MetadataPlacementUnionMember0",
+    "MetadataPlacementUnionMember1",
+    "MetadataPlacementUnionMember2",
+    "MetadataPlacementUnionMember3",
+    "MetadataPlacementUnionMember4",
+    "MetadataPlacementUnionMember5",
+    "MetadataPlacementUnionMember6",
+    "MetadataPlacementUnionMember7",
+    "MetadataPlacementUnionMember7Target",
+    "MetadataPlacementUnionMember7TargetRegion",
+    "MetadataPlacementUnionMember7TargetHostname",
+    "MetadataPlacementUnionMember7TargetHost",
+]
+
+
+class ScriptUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     dispatch_namespace: Required[str]
     """Name of the Workers for Platforms dispatch namespace."""
 
-    any_part_name: Annotated[List[FileTypes], PropertyInfo(alias="<any part name>")]
-    """A module comprising a Worker script, often a javascript file.
+    metadata: Required[Metadata]
+    """JSON-encoded metadata about the uploaded parts and Worker configuration."""
+
+    files: SequenceNotStr[FileTypes]
+    """An array of modules (often JavaScript files) comprising a Worker script.
+
+    At least one module must be present and referenced in the metadata as
+    `main_module` or `body_part` by filename.<br/>Possible Content-Type(s) are:
+    `application/javascript+module`, `text/javascript+module`,
+    `application/javascript`, `text/javascript`, `text/x-python`,
+    `text/x-python-requirement`, `application/wasm`, `text/plain`,
+    `application/octet-stream`, `application/source-map`.
+    """
+
+
+class MetadataAssetsConfig(TypedDict, total=False):
+    """Configuration for assets within a Worker."""
+
+    _headers: str
+    """
+    The contents of a \\__headers file (used to attach custom headers on asset
+    responses).
+    """
+
+    _redirects: str
+    """
+    The contents of a \\__redirects file (used to apply redirects or proxy paths ahead
+    of asset serving).
+    """
+
+    html_handling: Literal["auto-trailing-slash", "force-trailing-slash", "drop-trailing-slash", "none"]
+    """Determines the redirects and rewrites of requests for HTML content."""
+
+    not_found_handling: Literal["none", "404-page", "single-page-application"]
+    """
+    Determines the response when a request does not match a static asset, and there
+    is no Worker script.
+    """
+
+    run_worker_first: Union[SequenceNotStr[str], bool]
+    """Contains a list path rules to control routing to either the Worker or assets.
+
+    Glob (\\**) and negative (!) rules are supported. Rules must start with either '/'
+    or '!/'. At least one non-negative rule must be provided, and negative rules
+    have higher precedence than non-negative rules.
+    """
 
-    Multiple modules may be provided as separate named parts, but at least one
-    module must be present and referenced in the metadata as `main_module` or
-    `body_part` by part name. Source maps may also be included using the
-    `application/source-map` content type.
+    serve_directly: bool
     """
+    When true and the incoming request matches an asset, that will be served instead
+    of invoking the Worker script. When false, requests will always invoke the
+    Worker script.
+    """
+
+
+class MetadataAssets(TypedDict, total=False):
+    """Configuration for assets within a Worker."""
+
+    config: MetadataAssetsConfig
+    """Configuration for assets within a Worker."""
+
+    jwt: str
+    """Token provided upon successful upload of all files from a registered manifest."""
+
+
+class MetadataBindingWorkersBindingKindAI(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["ai"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindAnalyticsEngine(TypedDict, total=False):
+    dataset: Required[str]
+    """The name of the dataset to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["analytics_engine"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindAssets(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["assets"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindBrowser(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["browser"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindD1(TypedDict, total=False):
+    id: Required[str]
+    """Identifier of the D1 database to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["d1"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindDataBlob(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    part: Required[str]
+    """The name of the file containing the data content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Required[Literal["data_blob"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindDispatchNamespaceOutboundWorker(TypedDict, total=False):
+    """Outbound worker."""
+
+    environment: str
+    """Environment of the outbound worker."""
+
+    service: str
+    """Name of the outbound worker."""
+
+
+class MetadataBindingWorkersBindingKindDispatchNamespaceOutbound(TypedDict, total=False):
+    """Outbound worker."""
+
+    params: SequenceNotStr[str]
+    """
+    Pass information from the Dispatch Worker to the Outbound Worker through the
+    parameters.
+    """
+
+    worker: MetadataBindingWorkersBindingKindDispatchNamespaceOutboundWorker
+    """Outbound worker."""
+
+
+class MetadataBindingWorkersBindingKindDispatchNamespace(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    namespace: Required[str]
+    """The name of the dispatch namespace."""
+
+    type: Required[Literal["dispatch_namespace"]]
+    """The kind of resource that the binding provides."""
+
+    outbound: MetadataBindingWorkersBindingKindDispatchNamespaceOutbound
+    """Outbound worker."""
+
+
+class MetadataBindingWorkersBindingKindDurableObjectNamespace(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["durable_object_namespace"]]
+    """The kind of resource that the binding provides."""
+
+    class_name: str
+    """The exported class name of the Durable Object."""
+
+    environment: str
+    """The environment of the script_name to bind to."""
+
+    namespace_id: str
+    """Namespace identifier tag."""
+
+    script_name: str
+    """
+    The script where the Durable Object is defined, if it is external to this
+    Worker.
+    """
+
+
+class MetadataBindingWorkersBindingKindHyperdrive(TypedDict, total=False):
+    id: Required[str]
+    """Identifier of the Hyperdrive connection to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["hyperdrive"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindInherit(TypedDict, total=False):
+    name: Required[str]
+    """The name of the inherited binding."""
+
+    type: Required[Literal["inherit"]]
+    """The kind of resource that the binding provides."""
+
+    old_name: str
+    """The old name of the inherited binding.
+
+    If set, the binding will be renamed from `old_name` to `name` in the new
+    version. If not set, the binding will keep the same name between versions.
+    """
+
+    version_id: str
+    """
+    Identifier for the version to inherit the binding from, which can be the version
+    ID or the literal "latest" to inherit from the latest version. Defaults to
+    inheriting the binding from the latest version.
+    """
+
+
+class MetadataBindingWorkersBindingKindImages(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["images"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindJson(TypedDict, total=False):
+    json: Required[str]
+    """JSON data to use."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["json"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindKVNamespace(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: Required[str]
+    """Namespace identifier tag."""
+
+    type: Required[Literal["kv_namespace"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindMTLSCertificate(TypedDict, total=False):
+    certificate_id: Required[str]
+    """Identifier of the certificate to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["mtls_certificate"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindPlainText(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    text: Required[str]
+    """The text value to use."""
+
+    type: Required[Literal["plain_text"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindPipelines(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    pipeline: Required[str]
+    """Name of the Pipeline to bind to."""
+
+    type: Required[Literal["pipelines"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindQueue(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    queue_name: Required[str]
+    """Name of the Queue to bind to."""
+
+    type: Required[Literal["queue"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindRatelimitSimple(TypedDict, total=False):
+    """The rate limit configuration."""
+
+    limit: Required[float]
+    """The limit (requests per period)."""
+
+    period: Required[int]
+    """The period in seconds."""
+
+
+class MetadataBindingWorkersBindingKindRatelimit(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: Required[str]
+    """Identifier of the rate limit namespace to bind to."""
+
+    simple: Required[MetadataBindingWorkersBindingKindRatelimitSimple]
+    """The rate limit configuration."""
+
+    type: Required[Literal["ratelimit"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindR2Bucket(TypedDict, total=False):
+    bucket_name: Required[str]
+    """R2 bucket to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["r2_bucket"]]
+    """The kind of resource that the binding provides."""
+
+    jurisdiction: Literal["eu", "fedramp"]
+    """
+    The
+    [jurisdiction](https://developers.cloudflare.com/r2/reference/data-location/#jurisdictional-restrictions)
+    of the R2 bucket.
+    """
+
+
+class MetadataBindingWorkersBindingKindSecretText(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    text: Required[str]
+    """The secret value to use."""
+
+    type: Required[Literal["secret_text"]]
+    """The kind of resource that the binding provides."""
+
 
-    metadata: Variant0Metadata
-    """JSON encoded metadata about the uploaded parts and Worker configuration."""
+class MetadataBindingWorkersBindingKindSendEmail(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
 
+    type: Required[Literal["send_email"]]
+    """The kind of resource that the binding provides."""
 
-Variant0MetadataMigrations = Union[SingleStepMigrationParam, SteppedMigrationParam]
+    allowed_destination_addresses: SequenceNotStr[str]
+    """List of allowed destination addresses."""
 
+    allowed_sender_addresses: SequenceNotStr[str]
+    """List of allowed sender addresses."""
 
-class Variant0Metadata(TypedDict, total=False):
-    bindings: Iterable[object]
-    """List of bindings available to the worker."""
+    destination_address: str
+    """Destination address for the email."""
+
+
+class MetadataBindingWorkersBindingKindService(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    service: Required[str]
+    """Name of Worker to bind to."""
+
+    type: Required[Literal["service"]]
+    """The kind of resource that the binding provides."""
+
+    environment: str
+    """Optional environment if the Worker utilizes one."""
+
+
+class MetadataBindingWorkersBindingKindTextBlob(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    part: Required[str]
+    """The name of the file containing the text content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Required[Literal["text_blob"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindVectorize(TypedDict, total=False):
+    index_name: Required[str]
+    """Name of the Vectorize index to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["vectorize"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindVersionMetadata(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["version_metadata"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindSecretsStoreSecret(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    secret_name: Required[str]
+    """Name of the secret in the store."""
+
+    store_id: Required[str]
+    """ID of the store containing the secret."""
+
+    type: Required[Literal["secrets_store_secret"]]
+    """The kind of resource that the binding provides."""
+
+
+class MetadataBindingWorkersBindingKindSecretKey(TypedDict, total=False):
+    algorithm: Required[object]
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Required[Literal["raw", "pkcs8", "spki", "jwk"]]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["secret_key"]]
+    """The kind of resource that the binding provides."""
+
+    usages: Required[
+        List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    ]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+    key_base64: str
+    """Base64-encoded key data. Required if `format` is "raw", "pkcs8", or "spki"."""
+
+    key_jwk: object
+    """
+    Key data in
+    [JSON Web Key](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#json_web_key)
+    format. Required if `format` is "jwk".
+    """
+
+
+class MetadataBindingWorkersBindingKindWorkflow(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["workflow"]]
+    """The kind of resource that the binding provides."""
+
+    workflow_name: Required[str]
+    """Name of the Workflow to bind to."""
+
+    class_name: str
+    """Class name of the Workflow.
+
+    Should only be provided if the Workflow belongs to this script.
+    """
+
+    script_name: str
+    """Script name that contains the Workflow.
+
+    If not provided, defaults to this script name.
+    """
+
+
+class MetadataBindingWorkersBindingKindWasmModule(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    part: Required[str]
+    """The name of the file containing the WebAssembly module content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Required[Literal["wasm_module"]]
+    """The kind of resource that the binding provides."""
+
+
+MetadataBinding: TypeAlias = Union[
+    MetadataBindingWorkersBindingKindAI,
+    MetadataBindingWorkersBindingKindAnalyticsEngine,
+    MetadataBindingWorkersBindingKindAssets,
+    MetadataBindingWorkersBindingKindBrowser,
+    MetadataBindingWorkersBindingKindD1,
+    MetadataBindingWorkersBindingKindDataBlob,
+    MetadataBindingWorkersBindingKindDispatchNamespace,
+    MetadataBindingWorkersBindingKindDurableObjectNamespace,
+    MetadataBindingWorkersBindingKindHyperdrive,
+    MetadataBindingWorkersBindingKindInherit,
+    MetadataBindingWorkersBindingKindImages,
+    MetadataBindingWorkersBindingKindJson,
+    MetadataBindingWorkersBindingKindKVNamespace,
+    MetadataBindingWorkersBindingKindMTLSCertificate,
+    MetadataBindingWorkersBindingKindPlainText,
+    MetadataBindingWorkersBindingKindPipelines,
+    MetadataBindingWorkersBindingKindQueue,
+    MetadataBindingWorkersBindingKindRatelimit,
+    MetadataBindingWorkersBindingKindR2Bucket,
+    MetadataBindingWorkersBindingKindSecretText,
+    MetadataBindingWorkersBindingKindSendEmail,
+    MetadataBindingWorkersBindingKindService,
+    MetadataBindingWorkersBindingKindTextBlob,
+    MetadataBindingWorkersBindingKindVectorize,
+    MetadataBindingWorkersBindingKindVersionMetadata,
+    MetadataBindingWorkersBindingKindSecretsStoreSecret,
+    MetadataBindingWorkersBindingKindSecretKey,
+    MetadataBindingWorkersBindingKindWorkflow,
+    MetadataBindingWorkersBindingKindWasmModule,
+]
+
+
+class MetadataLimits(TypedDict, total=False):
+    """Limits to apply for this Worker."""
+
+    cpu_ms: int
+    """The amount of CPU time this Worker can use in milliseconds."""
+
+
+class MetadataMigrationsWorkersMultipleStepMigrations(TypedDict, total=False):
+    new_tag: str
+    """Tag to set as the latest migration tag."""
+
+    old_tag: str
+    """Tag used to verify against the latest migration tag for this Worker.
+
+    If they don't match, the upload is rejected.
+    """
+
+    steps: Iterable[MigrationStepParam]
+    """Migrations to apply in order."""
+
+
+MetadataMigrations: TypeAlias = Union[SingleStepMigrationParam, MetadataMigrationsWorkersMultipleStepMigrations]
+
+
+class MetadataObservabilityLogs(TypedDict, total=False):
+    """Log settings for the Worker."""
+
+    enabled: Required[bool]
+    """Whether logs are enabled for the Worker."""
+
+    invocation_logs: Required[bool]
+    """
+    Whether
+    [invocation logs](https://developers.cloudflare.com/workers/observability/logs/workers-logs/#invocation-logs)
+    are enabled for the Worker.
+    """
+
+    destinations: SequenceNotStr[str]
+    """A list of destinations where logs will be exported to."""
+
+    head_sampling_rate: Optional[float]
+    """The sampling rate for logs. From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1."""
+
+    persist: bool
+    """Whether log persistence is enabled for the Worker."""
+
+
+class MetadataObservability(TypedDict, total=False):
+    """Observability settings for the Worker."""
+
+    enabled: Required[bool]
+    """Whether observability is enabled for the Worker."""
+
+    head_sampling_rate: Optional[float]
+    """The sampling rate for incoming requests.
+
+    From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1.
+    """
+
+    logs: Optional[MetadataObservabilityLogs]
+    """Log settings for the Worker."""
+
+
+class MetadataPlacementUnionMember0(TypedDict, total=False):
+    mode: Required[Literal["smart"]]
+    """
+    Enables
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class MetadataPlacementUnionMember1(TypedDict, total=False):
+    region: Required[str]
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class MetadataPlacementUnionMember2(TypedDict, total=False):
+    hostname: Required[str]
+    """HTTP hostname for targeted placement."""
+
+
+class MetadataPlacementUnionMember3(TypedDict, total=False):
+    host: Required[str]
+    """TCP host and port for targeted placement."""
+
+
+class MetadataPlacementUnionMember4(TypedDict, total=False):
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+    region: Required[str]
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class MetadataPlacementUnionMember5(TypedDict, total=False):
+    hostname: Required[str]
+    """HTTP hostname for targeted placement."""
+
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+
+class MetadataPlacementUnionMember6(TypedDict, total=False):
+    host: Required[str]
+    """TCP host and port for targeted placement."""
+
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+
+class MetadataPlacementUnionMember7TargetRegion(TypedDict, total=False):
+    region: Required[str]
+    """Cloud region in format 'provider:region'."""
+
+
+class MetadataPlacementUnionMember7TargetHostname(TypedDict, total=False):
+    hostname: Required[str]
+    """HTTP hostname for targeted placement."""
+
+
+class MetadataPlacementUnionMember7TargetHost(TypedDict, total=False):
+    host: Required[str]
+    """TCP host:port for targeted placement."""
+
+
+MetadataPlacementUnionMember7Target: TypeAlias = Union[
+    MetadataPlacementUnionMember7TargetRegion,
+    MetadataPlacementUnionMember7TargetHostname,
+    MetadataPlacementUnionMember7TargetHost,
+]
+
+
+class MetadataPlacementUnionMember7(TypedDict, total=False):
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+    target: Required[Iterable[MetadataPlacementUnionMember7Target]]
+    """Array of placement targets (currently limited to single target)."""
+
+
+MetadataPlacement: TypeAlias = Union[
+    MetadataPlacementUnionMember0,
+    MetadataPlacementUnionMember1,
+    MetadataPlacementUnionMember2,
+    MetadataPlacementUnionMember3,
+    MetadataPlacementUnionMember4,
+    MetadataPlacementUnionMember5,
+    MetadataPlacementUnionMember6,
+    MetadataPlacementUnionMember7,
+]
+
+
+class Metadata(TypedDict, total=False):
+    """JSON-encoded metadata about the uploaded parts and Worker configuration."""
+
+    assets: MetadataAssets
+    """Configuration for assets within a Worker."""
+
+    bindings: Iterable[MetadataBinding]
+    """List of bindings attached to a Worker.
+
+    You can find more about bindings on our docs:
+    https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
+    """
 
     body_part: str
-    """Name of the part in the multipart request that contains the script (e.g.
+    """Name of the uploaded file that contains the script (e.g.
 
     the file adding a listener to the `fetch` event). Indicates a
     `service worker syntax` Worker.
@@ -56,55 +786,52 @@ class Variant0Metadata(TypedDict, total=False):
     this Worker.
     """
 
-    compatibility_flags: List[str]
+    compatibility_flags: SequenceNotStr[str]
     """Flags that enable or disable certain features in the Workers runtime.
 
     Used to enable upcoming features or opt in or out of specific changes not
     included in a `compatibility_date`.
     """
 
-    keep_bindings: List[str]
+    keep_assets: bool
+    """
+    Retain assets which exist for a previously uploaded Worker version; used in lieu
+    of providing a completion token.
+    """
+
+    keep_bindings: SequenceNotStr[str]
     """List of binding types to keep from previous_upload."""
 
+    limits: MetadataLimits
+    """Limits to apply for this Worker."""
+
     logpush: bool
     """Whether Logpush is turned on for the Worker."""
 
     main_module: str
-    """Name of the part in the multipart request that contains the main module (e.g.
+    """Name of the uploaded file that contains the main module (e.g.
 
     the file exporting a `fetch` handler). Indicates a `module syntax` Worker.
     """
 
-    migrations: Variant0MetadataMigrations
+    migrations: MetadataMigrations
     """Migrations to apply for Durable Objects associated with this Worker."""
 
-    placement: PlacementConfigurationParam
-
-    tags: List[str]
-    """List of strings to use as tags for this Worker"""
-
-    tail_consumers: Iterable[ConsumerScriptParam]
-    """List of Workers that will consume logs from the attached Worker."""
-
-    usage_model: Literal["bundled", "unbound"]
-    """Usage model to apply to invocations."""
-
-    version_tags: object
-    """Key-value pairs to use as tags for this version of this Worker"""
-
-
-class Variant1(TypedDict, total=False):
-    account_id: Required[str]
-    """Identifier"""
-
-    dispatch_namespace: Required[str]
-    """Name of the Workers for Platforms dispatch namespace."""
+    observability: MetadataObservability
+    """Observability settings for the Worker."""
 
-    message: str
-    """Rollback message to be associated with this deployment.
-
-    Only parsed when query param `"rollback_to"` is present.
+    placement: MetadataPlacement
+    """
+    Configuration for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    Specify mode='smart' for Smart Placement, or one of region/hostname/host.
     """
 
+    tags: SequenceNotStr[str]
+    """List of strings to use as tags for this Worker."""
+
+    tail_consumers: Optional[Iterable[ConsumerScriptParam]]
+    """List of Workers that will consume logs from the attached Worker."""
 
-ScriptUpdateParams = Union[Variant0, Variant1]
+    usage_model: Literal["standard", "bundled", "unbound"]
+    """Usage model for the Worker invocations."""
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script_update_response.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script_update_response.py
new file mode 100644
index 00000000000..29083bf528a
--- /dev/null
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script_update_response.py
@@ -0,0 +1,344 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ....._models import BaseModel
+from ....workers.scripts.consumer_script import ConsumerScript
+
+__all__ = [
+    "ScriptUpdateResponse",
+    "NamedHandler",
+    "Observability",
+    "ObservabilityLogs",
+    "Placement",
+    "PlacementUnionMember0",
+    "PlacementUnionMember1",
+    "PlacementUnionMember2",
+    "PlacementUnionMember3",
+    "PlacementUnionMember4",
+    "PlacementUnionMember5",
+    "PlacementUnionMember6",
+    "PlacementUnionMember7",
+    "PlacementUnionMember7Target",
+    "PlacementUnionMember7TargetRegion",
+    "PlacementUnionMember7TargetHostname",
+    "PlacementUnionMember7TargetHost",
+]
+
+
+class NamedHandler(BaseModel):
+    handlers: Optional[List[str]] = None
+    """The names of handlers exported as part of the named export."""
+
+    name: Optional[str] = None
+    """The name of the export."""
+
+
+class ObservabilityLogs(BaseModel):
+    """Log settings for the Worker."""
+
+    enabled: bool
+    """Whether logs are enabled for the Worker."""
+
+    invocation_logs: bool
+    """
+    Whether
+    [invocation logs](https://developers.cloudflare.com/workers/observability/logs/workers-logs/#invocation-logs)
+    are enabled for the Worker.
+    """
+
+    destinations: Optional[List[str]] = None
+    """A list of destinations where logs will be exported to."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for logs. From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1."""
+
+    persist: Optional[bool] = None
+    """Whether log persistence is enabled for the Worker."""
+
+
+class Observability(BaseModel):
+    """Observability settings for the Worker."""
+
+    enabled: bool
+    """Whether observability is enabled for the Worker."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for incoming requests.
+
+    From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1.
+    """
+
+    logs: Optional[ObservabilityLogs] = None
+    """Log settings for the Worker."""
+
+
+class PlacementUnionMember0(BaseModel):
+    mode: Literal["smart"]
+    """
+    Enables
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember1(BaseModel):
+    region: str
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember2(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember3(BaseModel):
+    host: str
+    """TCP host and port for targeted placement."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember4(BaseModel):
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    region: str
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember5(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember6(BaseModel):
+    host: str
+    """TCP host and port for targeted placement."""
+
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementUnionMember7TargetRegion(BaseModel):
+    region: str
+    """Cloud region in format 'provider:region'."""
+
+
+class PlacementUnionMember7TargetHostname(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+
+class PlacementUnionMember7TargetHost(BaseModel):
+    host: str
+    """TCP host:port for targeted placement."""
+
+
+PlacementUnionMember7Target: TypeAlias = Union[
+    PlacementUnionMember7TargetRegion, PlacementUnionMember7TargetHostname, PlacementUnionMember7TargetHost
+]
+
+
+class PlacementUnionMember7(BaseModel):
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    target: List[PlacementUnionMember7Target]
+    """Array of placement targets (currently limited to single target)."""
+
+    last_analyzed_at: Optional[datetime] = None
+    """
+    The last time the script was analyzed for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+    status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+    """
+    Status of
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+Placement: TypeAlias = Union[
+    PlacementUnionMember0,
+    PlacementUnionMember1,
+    PlacementUnionMember2,
+    PlacementUnionMember3,
+    PlacementUnionMember4,
+    PlacementUnionMember5,
+    PlacementUnionMember6,
+    PlacementUnionMember7,
+]
+
+
+class ScriptUpdateResponse(BaseModel):
+    startup_time_ms: int
+
+    id: Optional[str] = None
+    """The name used to identify the script."""
+
+    compatibility_date: Optional[str] = None
+    """Date indicating targeted support in the Workers runtime.
+
+    Backwards incompatible fixes to the runtime following this date will not affect
+    this Worker.
+    """
+
+    compatibility_flags: Optional[List[str]] = None
+    """Flags that enable or disable certain features in the Workers runtime.
+
+    Used to enable upcoming features or opt in or out of specific changes not
+    included in a `compatibility_date`.
+    """
+
+    created_on: Optional[datetime] = None
+    """When the script was created."""
+
+    entry_point: Optional[str] = None
+    """The entry point for the script."""
+
+    etag: Optional[str] = None
+    """Hashed script content, can be used in a If-None-Match header when updating."""
+
+    handlers: Optional[List[str]] = None
+    """The names of handlers exported as part of the default export."""
+
+    has_assets: Optional[bool] = None
+    """Whether a Worker contains assets."""
+
+    has_modules: Optional[bool] = None
+    """Whether a Worker contains modules."""
+
+    last_deployed_from: Optional[str] = None
+    """The client most recently used to deploy this Worker."""
+
+    logpush: Optional[bool] = None
+    """Whether Logpush is turned on for the Worker."""
+
+    migration_tag: Optional[str] = None
+    """
+    The tag of the Durable Object migration that was most recently applied for this
+    Worker.
+    """
+
+    modified_on: Optional[datetime] = None
+    """When the script was last modified."""
+
+    named_handlers: Optional[List[NamedHandler]] = None
+    """
+    Named exports, such as Durable Object class implementations and named
+    entrypoints.
+    """
+
+    observability: Optional[Observability] = None
+    """Observability settings for the Worker."""
+
+    placement: Optional[Placement] = None
+    """
+    Configuration for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    Specify mode='smart' for Smart Placement, or one of region/hostname/host.
+    """
+
+    placement_mode: Optional[Literal["smart", "targeted"]] = None
+
+    placement_status: Optional[Literal["SUCCESS", "UNSUPPORTED_APPLICATION", "INSUFFICIENT_INVOCATIONS"]] = None
+
+    tag: Optional[str] = None
+    """The immutable ID of the script."""
+
+    tags: Optional[List[str]] = None
+    """Tags associated with the Worker."""
+
+    tail_consumers: Optional[List[ConsumerScript]] = None
+    """List of Workers that will consume logs from the attached Worker."""
+
+    usage_model: Optional[Literal["standard", "bundled", "unbound"]] = None
+    """Usage model for the Worker invocations."""
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/__init__.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/__init__.py
index 0aa7d524060..9f57d52e7ee 100644
--- a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/__init__.py
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/__init__.py
@@ -2,14 +2,19 @@
 
 from __future__ import annotations
 
+from .secret_get_params import SecretGetParams as SecretGetParams
 from .tag_list_response import TagListResponse as TagListResponse
 from .tag_update_params import TagUpdateParams as TagUpdateParams
+from .secret_get_response import SecretGetResponse as SecretGetResponse
 from .setting_edit_params import SettingEditParams as SettingEditParams
 from .tag_update_response import TagUpdateResponse as TagUpdateResponse
 from .binding_get_response import BindingGetResponse as BindingGetResponse
+from .secret_delete_params import SecretDeleteParams as SecretDeleteParams
 from .secret_list_response import SecretListResponse as SecretListResponse
 from .secret_update_params import SecretUpdateParams as SecretUpdateParams
 from .setting_get_response import SettingGetResponse as SettingGetResponse
 from .content_update_params import ContentUpdateParams as ContentUpdateParams
 from .setting_edit_response import SettingEditResponse as SettingEditResponse
 from .secret_update_response import SecretUpdateResponse as SecretUpdateResponse
+from .asset_upload_create_params import AssetUploadCreateParams as AssetUploadCreateParams
+from .asset_upload_create_response import AssetUploadCreateResponse as AssetUploadCreateResponse
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/asset_upload_create_params.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/asset_upload_create_params.py
new file mode 100644
index 00000000000..9371d50af54
--- /dev/null
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/asset_upload_create_params.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict
+from typing_extensions import Required, TypedDict
+
+__all__ = ["AssetUploadCreateParams", "Manifest"]
+
+
+class AssetUploadCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    dispatch_namespace: Required[str]
+    """Name of the Workers for Platforms dispatch namespace."""
+
+    manifest: Required[Dict[str, Manifest]]
+    """A manifest ([path]: {hash, size}) map of files to upload.
+
+    As an example, `/blog/hello-world.html` would be a valid path key.
+    """
+
+
+class Manifest(TypedDict, total=False):
+    hash: Required[str]
+    """The hash of the file."""
+
+    size: Required[int]
+    """The size of the file in bytes."""
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/asset_upload_create_response.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/asset_upload_create_response.py
new file mode 100644
index 00000000000..e25a814291a
--- /dev/null
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/asset_upload_create_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ......_models import BaseModel
+
+__all__ = ["AssetUploadCreateResponse"]
+
+
+class AssetUploadCreateResponse(BaseModel):
+    buckets: Optional[List[List[str]]] = None
+    """The requests to make to upload assets."""
+
+    jwt: Optional[str] = None
+    """A JWT to use as authentication for uploading assets."""
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 9d8efdf1f7b..f718e803a1f 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
@@ -1,9 +1,499 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Union, Optional
+from typing_extensions import Literal, Annotated, TypeAlias
 
-from .....workers.binding import Binding
+from pydantic import Field as FieldInfo
 
-__all__ = ["BindingGetResponse"]
+from ......_utils import PropertyInfo
+from ......_models import BaseModel
 
-BindingGetResponse = List[Binding]
+__all__ = [
+    "BindingGetResponse",
+    "WorkersBindingKindAI",
+    "WorkersBindingKindAnalyticsEngine",
+    "WorkersBindingKindAssets",
+    "WorkersBindingKindBrowser",
+    "WorkersBindingKindD1",
+    "WorkersBindingKindDataBlob",
+    "WorkersBindingKindDispatchNamespace",
+    "WorkersBindingKindDispatchNamespaceOutbound",
+    "WorkersBindingKindDispatchNamespaceOutboundWorker",
+    "WorkersBindingKindDurableObjectNamespace",
+    "WorkersBindingKindHyperdrive",
+    "WorkersBindingKindInherit",
+    "WorkersBindingKindImages",
+    "WorkersBindingKindJson",
+    "WorkersBindingKindKVNamespace",
+    "WorkersBindingKindMTLSCertificate",
+    "WorkersBindingKindPlainText",
+    "WorkersBindingKindPipelines",
+    "WorkersBindingKindQueue",
+    "WorkersBindingKindRatelimit",
+    "WorkersBindingKindRatelimitSimple",
+    "WorkersBindingKindR2Bucket",
+    "WorkersBindingKindSecretText",
+    "WorkersBindingKindSendEmail",
+    "WorkersBindingKindService",
+    "WorkersBindingKindTextBlob",
+    "WorkersBindingKindVectorize",
+    "WorkersBindingKindVersionMetadata",
+    "WorkersBindingKindSecretsStoreSecret",
+    "WorkersBindingKindSecretKey",
+    "WorkersBindingKindWorkflow",
+    "WorkersBindingKindWasmModule",
+]
+
+
+class WorkersBindingKindAI(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["ai"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindAnalyticsEngine(BaseModel):
+    dataset: str
+    """The name of the dataset to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["analytics_engine"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindAssets(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["assets"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindBrowser(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["browser"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindD1(BaseModel):
+    id: str
+    """Identifier of the D1 database to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["d1"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindDataBlob(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the data content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["data_blob"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindDispatchNamespaceOutboundWorker(BaseModel):
+    """Outbound worker."""
+
+    environment: Optional[str] = None
+    """Environment of the outbound worker."""
+
+    service: Optional[str] = None
+    """Name of the outbound worker."""
+
+
+class WorkersBindingKindDispatchNamespaceOutbound(BaseModel):
+    """Outbound worker."""
+
+    params: Optional[List[str]] = None
+    """
+    Pass information from the Dispatch Worker to the Outbound Worker through the
+    parameters.
+    """
+
+    worker: Optional[WorkersBindingKindDispatchNamespaceOutboundWorker] = None
+    """Outbound worker."""
+
+
+class WorkersBindingKindDispatchNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace: str
+    """The name of the dispatch namespace."""
+
+    type: Literal["dispatch_namespace"]
+    """The kind of resource that the binding provides."""
+
+    outbound: Optional[WorkersBindingKindDispatchNamespaceOutbound] = None
+    """Outbound worker."""
+
+
+class WorkersBindingKindDurableObjectNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["durable_object_namespace"]
+    """The kind of resource that the binding provides."""
+
+    class_name: Optional[str] = None
+    """The exported class name of the Durable Object."""
+
+    environment: Optional[str] = None
+    """The environment of the script_name to bind to."""
+
+    namespace_id: Optional[str] = None
+    """Namespace identifier tag."""
+
+    script_name: Optional[str] = None
+    """
+    The script where the Durable Object is defined, if it is external to this
+    Worker.
+    """
+
+
+class WorkersBindingKindHyperdrive(BaseModel):
+    id: str
+    """Identifier of the Hyperdrive connection to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["hyperdrive"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindInherit(BaseModel):
+    name: str
+    """The name of the inherited binding."""
+
+    type: Literal["inherit"]
+    """The kind of resource that the binding provides."""
+
+    old_name: Optional[str] = None
+    """The old name of the inherited binding.
+
+    If set, the binding will be renamed from `old_name` to `name` in the new
+    version. If not set, the binding will keep the same name between versions.
+    """
+
+    version_id: Optional[str] = None
+    """
+    Identifier for the version to inherit the binding from, which can be the version
+    ID or the literal "latest" to inherit from the latest version. Defaults to
+    inheriting the binding from the latest version.
+    """
+
+
+class WorkersBindingKindImages(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["images"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindJson(BaseModel):
+    json_: str = FieldInfo(alias="json")
+    """JSON data to use."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["json"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindKVNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: str
+    """Namespace identifier tag."""
+
+    type: Literal["kv_namespace"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindMTLSCertificate(BaseModel):
+    certificate_id: str
+    """Identifier of the certificate to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["mtls_certificate"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindPlainText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    text: str
+    """The text value to use."""
+
+    type: Literal["plain_text"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindPipelines(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    pipeline: str
+    """Name of the Pipeline to bind to."""
+
+    type: Literal["pipelines"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindQueue(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    queue_name: str
+    """Name of the Queue to bind to."""
+
+    type: Literal["queue"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindRatelimitSimple(BaseModel):
+    """The rate limit configuration."""
+
+    limit: float
+    """The limit (requests per period)."""
+
+    period: int
+    """The period in seconds."""
+
+
+class WorkersBindingKindRatelimit(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: str
+    """Identifier of the rate limit namespace to bind to."""
+
+    simple: WorkersBindingKindRatelimitSimple
+    """The rate limit configuration."""
+
+    type: Literal["ratelimit"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindR2Bucket(BaseModel):
+    bucket_name: str
+    """R2 bucket to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["r2_bucket"]
+    """The kind of resource that the binding provides."""
+
+    jurisdiction: Optional[Literal["eu", "fedramp"]] = None
+    """
+    The
+    [jurisdiction](https://developers.cloudflare.com/r2/reference/data-location/#jurisdictional-restrictions)
+    of the R2 bucket.
+    """
+
+
+class WorkersBindingKindSecretText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_text"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindSendEmail(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["send_email"]
+    """The kind of resource that the binding provides."""
+
+    allowed_destination_addresses: Optional[List[str]] = None
+    """List of allowed destination addresses."""
+
+    allowed_sender_addresses: Optional[List[str]] = None
+    """List of allowed sender addresses."""
+
+    destination_address: Optional[str] = None
+    """Destination address for the email."""
+
+
+class WorkersBindingKindService(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    service: str
+    """Name of Worker to bind to."""
+
+    type: Literal["service"]
+    """The kind of resource that the binding provides."""
+
+    environment: Optional[str] = None
+    """Optional environment if the Worker utilizes one."""
+
+
+class WorkersBindingKindTextBlob(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the text content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["text_blob"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindVectorize(BaseModel):
+    index_name: str
+    """Name of the Vectorize index to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["vectorize"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindVersionMetadata(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["version_metadata"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindSecretsStoreSecret(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    secret_name: str
+    """Name of the secret in the store."""
+
+    store_id: str
+    """ID of the store containing the secret."""
+
+    type: Literal["secrets_store_secret"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindSecretKey(BaseModel):
+    algorithm: object
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Literal["raw", "pkcs8", "spki", "jwk"]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_key"]
+    """The kind of resource that the binding provides."""
+
+    usages: List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+
+class WorkersBindingKindWorkflow(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["workflow"]
+    """The kind of resource that the binding provides."""
+
+    workflow_name: str
+    """Name of the Workflow to bind to."""
+
+    class_name: Optional[str] = None
+    """Class name of the Workflow.
+
+    Should only be provided if the Workflow belongs to this script.
+    """
+
+    script_name: Optional[str] = None
+    """Script name that contains the Workflow.
+
+    If not provided, defaults to this script name.
+    """
+
+
+class WorkersBindingKindWasmModule(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the WebAssembly module content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["wasm_module"]
+    """The kind of resource that the binding provides."""
+
+
+BindingGetResponse: TypeAlias = Annotated[
+    Union[
+        WorkersBindingKindAI,
+        WorkersBindingKindAnalyticsEngine,
+        WorkersBindingKindAssets,
+        WorkersBindingKindBrowser,
+        WorkersBindingKindD1,
+        WorkersBindingKindDataBlob,
+        WorkersBindingKindDispatchNamespace,
+        WorkersBindingKindDurableObjectNamespace,
+        WorkersBindingKindHyperdrive,
+        WorkersBindingKindInherit,
+        WorkersBindingKindImages,
+        WorkersBindingKindJson,
+        WorkersBindingKindKVNamespace,
+        WorkersBindingKindMTLSCertificate,
+        WorkersBindingKindPlainText,
+        WorkersBindingKindPipelines,
+        WorkersBindingKindQueue,
+        WorkersBindingKindRatelimit,
+        WorkersBindingKindR2Bucket,
+        WorkersBindingKindSecretText,
+        WorkersBindingKindSendEmail,
+        WorkersBindingKindService,
+        WorkersBindingKindTextBlob,
+        WorkersBindingKindVectorize,
+        WorkersBindingKindVersionMetadata,
+        WorkersBindingKindSecretsStoreSecret,
+        WorkersBindingKindSecretKey,
+        WorkersBindingKindWorkflow,
+        WorkersBindingKindWasmModule,
+    ],
+    PropertyInfo(discriminator="type"),
+]
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 9f4d3118469..a9e37d435a5 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
@@ -2,10 +2,9 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Required, Annotated, TypedDict
 
-from ......_types import FileTypes
+from ......_types import FileTypes, SequenceNotStr
 from ......_utils import PropertyInfo
 from .....workers.worker_metadata_param import WorkerMetadataParam
 
@@ -14,24 +13,24 @@
 
 class ContentUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     dispatch_namespace: Required[str]
     """Name of the Workers for Platforms dispatch namespace."""
 
-    any_part_name: Annotated[List[FileTypes], PropertyInfo(alias="<any part name>")]
-    """A module comprising a Worker script, often a javascript file.
+    metadata: Required[WorkerMetadataParam]
+    """JSON-encoded metadata about the uploaded parts and Worker configuration."""
 
-    Multiple modules may be provided as separate named parts, but at least one
-    module must be present. This should be referenced either in the metadata as
-    `main_module` (esm)/`body_part` (service worker) or as a header
-    `CF-WORKER-MAIN-MODULE-PART` (esm) /`CF-WORKER-BODY-PART` (service worker) by
-    part name. Source maps may also be included using the `application/source-map`
-    content type.
-    """
+    files: SequenceNotStr[FileTypes]
+    """An array of modules (often JavaScript files) comprising a Worker script.
 
-    metadata: WorkerMetadataParam
-    """JSON encoded metadata about the uploaded parts and Worker configuration."""
+    At least one module must be present and referenced in the metadata as
+    `main_module` or `body_part` by filename.<br/>Possible Content-Type(s) are:
+    `application/javascript+module`, `text/javascript+module`,
+    `application/javascript`, `text/javascript`, `text/x-python`,
+    `text/x-python-requirement`, `application/wasm`, `text/plain`,
+    `application/octet-stream`, `application/source-map`.
+    """
 
     cf_worker_body_part: Annotated[str, PropertyInfo(alias="CF-WORKER-BODY-PART")]
 
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_delete_params.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_delete_params.py
new file mode 100644
index 00000000000..4ab02ea8f63
--- /dev/null
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_delete_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SecretDeleteParams"]
+
+
+class SecretDeleteParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    dispatch_namespace: Required[str]
+    """Name of the Workers for Platforms dispatch namespace."""
+
+    script_name: Required[str]
+    """Name of the script, used in URLs and route configuration."""
+
+    url_encoded: bool
+    """Flag that indicates whether the secret name is URL encoded."""
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_get_params.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_get_params.py
new file mode 100644
index 00000000000..f80e8635077
--- /dev/null
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_get_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SecretGetParams"]
+
+
+class SecretGetParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    dispatch_namespace: Required[str]
+    """Name of the Workers for Platforms dispatch namespace."""
+
+    script_name: Required[str]
+    """Name of the script, used in URLs and route configuration."""
+
+    url_encoded: bool
+    """Flag that indicates whether the secret name is URL encoded."""
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_get_response.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_get_response.py
new file mode 100755
index 00000000000..0d065fc7164
--- /dev/null
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_get_response.py
@@ -0,0 +1,48 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from ......_utils import PropertyInfo
+from ......_models import BaseModel
+
+__all__ = ["SecretGetResponse", "WorkersBindingKindSecretText", "WorkersBindingKindSecretKey"]
+
+
+class WorkersBindingKindSecretText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_text"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindSecretKey(BaseModel):
+    algorithm: object
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Literal["raw", "pkcs8", "spki", "jwk"]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_key"]
+    """The kind of resource that the binding provides."""
+
+    usages: List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+
+SecretGetResponse: TypeAlias = Annotated[
+    Union[WorkersBindingKindSecretText, WorkersBindingKindSecretKey], PropertyInfo(discriminator="type")
+]
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_list_response.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_list_response.py
index 86ea1859cb1..a262a5fe85f 100644
--- a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_list_response.py
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_list_response.py
@@ -1,16 +1,48 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
-from typing_extensions import Literal
+from typing import List, Union
+from typing_extensions import Literal, Annotated, TypeAlias
 
+from ......_utils import PropertyInfo
 from ......_models import BaseModel
 
-__all__ = ["SecretListResponse"]
+__all__ = ["SecretListResponse", "WorkersBindingKindSecretText", "WorkersBindingKindSecretKey"]
 
 
-class SecretListResponse(BaseModel):
-    name: Optional[str] = None
-    """The name of this secret, this is what will be to access it inside the Worker."""
+class WorkersBindingKindSecretText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
 
-    type: Optional[Literal["secret_text"]] = None
-    """The type of secret to put."""
+    type: Literal["secret_text"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindSecretKey(BaseModel):
+    algorithm: object
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Literal["raw", "pkcs8", "spki", "jwk"]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_key"]
+    """The kind of resource that the binding provides."""
+
+    usages: List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+
+SecretListResponse: TypeAlias = Annotated[
+    Union[WorkersBindingKindSecretText, WorkersBindingKindSecretKey], PropertyInfo(discriminator="type")
+]
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_update_params.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_update_params.py
index 572b6f5e008..546fbeb728d 100644
--- a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_update_params.py
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_update_params.py
@@ -2,23 +2,71 @@
 
 from __future__ import annotations
 
-from typing_extensions import Literal, Required, TypedDict
+from typing import List, Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
-__all__ = ["SecretUpdateParams"]
+__all__ = ["SecretUpdateParams", "WorkersBindingKindSecretText", "WorkersBindingKindSecretKey"]
 
 
-class SecretUpdateParams(TypedDict, total=False):
+class WorkersBindingKindSecretText(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     dispatch_namespace: Required[str]
     """Name of the Workers for Platforms dispatch namespace."""
 
-    name: str
-    """The name of this secret, this is what will be to access it inside the Worker."""
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
 
-    text: str
-    """The value of the secret."""
+    text: Required[str]
+    """The secret value to use."""
 
-    type: Literal["secret_text"]
-    """The type of secret to put."""
+    type: Required[Literal["secret_text"]]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindSecretKey(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    dispatch_namespace: Required[str]
+    """Name of the Workers for Platforms dispatch namespace."""
+
+    algorithm: Required[object]
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Required[Literal["raw", "pkcs8", "spki", "jwk"]]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["secret_key"]]
+    """The kind of resource that the binding provides."""
+
+    usages: Required[
+        List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    ]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+    key_base64: str
+    """Base64-encoded key data. Required if `format` is "raw", "pkcs8", or "spki"."""
+
+    key_jwk: object
+    """
+    Key data in
+    [JSON Web Key](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#json_web_key)
+    format. Required if `format` is "jwk".
+    """
+
+
+SecretUpdateParams: TypeAlias = Union[WorkersBindingKindSecretText, WorkersBindingKindSecretKey]
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_update_response.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_update_response.py
index df496e500d8..8aebdf36bb3 100644
--- a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_update_response.py
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/secret_update_response.py
@@ -1,16 +1,48 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
-from typing_extensions import Literal
+from typing import List, Union
+from typing_extensions import Literal, Annotated, TypeAlias
 
+from ......_utils import PropertyInfo
 from ......_models import BaseModel
 
-__all__ = ["SecretUpdateResponse"]
+__all__ = ["SecretUpdateResponse", "WorkersBindingKindSecretText", "WorkersBindingKindSecretKey"]
 
 
-class SecretUpdateResponse(BaseModel):
-    name: Optional[str] = None
-    """The name of this secret, this is what will be to access it inside the Worker."""
+class WorkersBindingKindSecretText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
 
-    type: Optional[Literal["secret_text"]] = None
-    """The type of secret to put."""
+    type: Literal["secret_text"]
+    """The kind of resource that the binding provides."""
+
+
+class WorkersBindingKindSecretKey(BaseModel):
+    algorithm: object
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Literal["raw", "pkcs8", "spki", "jwk"]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_key"]
+    """The kind of resource that the binding provides."""
+
+    usages: List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+
+SecretUpdateResponse: TypeAlias = Annotated[
+    Union[WorkersBindingKindSecretText, WorkersBindingKindSecretKey], PropertyInfo(discriminator="type")
+]
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 1d4c53175c3..09373ffb1c6 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
@@ -2,21 +2,74 @@
 
 from __future__ import annotations
 
-from typing import List, Union, Iterable
-from typing_extensions import Required, TypedDict
+from typing import List, Union, Iterable, Optional
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
-from .....workers.binding_param import BindingParam
-from .....workers.stepped_migration_param import SteppedMigrationParam
+from ......_types import SequenceNotStr
+from .....workers.migration_step_param import MigrationStepParam
 from .....workers.single_step_migration_param import SingleStepMigrationParam
-from .....workers.placement_configuration_param import PlacementConfigurationParam
 from .....workers.scripts.consumer_script_param import ConsumerScriptParam
 
-__all__ = ["SettingEditParams", "Settings", "SettingsLimits", "SettingsMigrations"]
+__all__ = [
+    "SettingEditParams",
+    "Settings",
+    "SettingsBinding",
+    "SettingsBindingWorkersBindingKindAI",
+    "SettingsBindingWorkersBindingKindAnalyticsEngine",
+    "SettingsBindingWorkersBindingKindAssets",
+    "SettingsBindingWorkersBindingKindBrowser",
+    "SettingsBindingWorkersBindingKindD1",
+    "SettingsBindingWorkersBindingKindDataBlob",
+    "SettingsBindingWorkersBindingKindDispatchNamespace",
+    "SettingsBindingWorkersBindingKindDispatchNamespaceOutbound",
+    "SettingsBindingWorkersBindingKindDispatchNamespaceOutboundWorker",
+    "SettingsBindingWorkersBindingKindDurableObjectNamespace",
+    "SettingsBindingWorkersBindingKindHyperdrive",
+    "SettingsBindingWorkersBindingKindInherit",
+    "SettingsBindingWorkersBindingKindImages",
+    "SettingsBindingWorkersBindingKindJson",
+    "SettingsBindingWorkersBindingKindKVNamespace",
+    "SettingsBindingWorkersBindingKindMTLSCertificate",
+    "SettingsBindingWorkersBindingKindPlainText",
+    "SettingsBindingWorkersBindingKindPipelines",
+    "SettingsBindingWorkersBindingKindQueue",
+    "SettingsBindingWorkersBindingKindRatelimit",
+    "SettingsBindingWorkersBindingKindRatelimitSimple",
+    "SettingsBindingWorkersBindingKindR2Bucket",
+    "SettingsBindingWorkersBindingKindSecretText",
+    "SettingsBindingWorkersBindingKindSendEmail",
+    "SettingsBindingWorkersBindingKindService",
+    "SettingsBindingWorkersBindingKindTextBlob",
+    "SettingsBindingWorkersBindingKindVectorize",
+    "SettingsBindingWorkersBindingKindVersionMetadata",
+    "SettingsBindingWorkersBindingKindSecretsStoreSecret",
+    "SettingsBindingWorkersBindingKindSecretKey",
+    "SettingsBindingWorkersBindingKindWorkflow",
+    "SettingsBindingWorkersBindingKindWasmModule",
+    "SettingsLimits",
+    "SettingsMigrations",
+    "SettingsMigrationsWorkersMultipleStepMigrations",
+    "SettingsObservability",
+    "SettingsObservabilityLogs",
+    "SettingsPlacement",
+    "SettingsPlacementMode",
+    "SettingsPlacementRegion",
+    "SettingsPlacementHostname",
+    "SettingsPlacementHost",
+    "SettingsPlacementUnionMember4",
+    "SettingsPlacementUnionMember5",
+    "SettingsPlacementUnionMember6",
+    "SettingsPlacementUnionMember7",
+    "SettingsPlacementUnionMember7Target",
+    "SettingsPlacementUnionMember7TargetRegion",
+    "SettingsPlacementUnionMember7TargetHostname",
+    "SettingsPlacementUnionMember7TargetHost",
+]
 
 
 class SettingEditParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     dispatch_namespace: Required[str]
     """Name of the Workers for Platforms dispatch namespace."""
@@ -24,23 +77,645 @@ class SettingEditParams(TypedDict, total=False):
     settings: Settings
 
 
+class SettingsBindingWorkersBindingKindAI(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["ai"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindAnalyticsEngine(TypedDict, total=False):
+    dataset: Required[str]
+    """The name of the dataset to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["analytics_engine"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindAssets(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["assets"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindBrowser(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["browser"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindD1(TypedDict, total=False):
+    id: Required[str]
+    """Identifier of the D1 database to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["d1"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindDataBlob(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    part: Required[str]
+    """The name of the file containing the data content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Required[Literal["data_blob"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindDispatchNamespaceOutboundWorker(TypedDict, total=False):
+    """Outbound worker."""
+
+    environment: str
+    """Environment of the outbound worker."""
+
+    service: str
+    """Name of the outbound worker."""
+
+
+class SettingsBindingWorkersBindingKindDispatchNamespaceOutbound(TypedDict, total=False):
+    """Outbound worker."""
+
+    params: SequenceNotStr[str]
+    """
+    Pass information from the Dispatch Worker to the Outbound Worker through the
+    parameters.
+    """
+
+    worker: SettingsBindingWorkersBindingKindDispatchNamespaceOutboundWorker
+    """Outbound worker."""
+
+
+class SettingsBindingWorkersBindingKindDispatchNamespace(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    namespace: Required[str]
+    """The name of the dispatch namespace."""
+
+    type: Required[Literal["dispatch_namespace"]]
+    """The kind of resource that the binding provides."""
+
+    outbound: SettingsBindingWorkersBindingKindDispatchNamespaceOutbound
+    """Outbound worker."""
+
+
+class SettingsBindingWorkersBindingKindDurableObjectNamespace(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["durable_object_namespace"]]
+    """The kind of resource that the binding provides."""
+
+    class_name: str
+    """The exported class name of the Durable Object."""
+
+    environment: str
+    """The environment of the script_name to bind to."""
+
+    namespace_id: str
+    """Namespace identifier tag."""
+
+    script_name: str
+    """
+    The script where the Durable Object is defined, if it is external to this
+    Worker.
+    """
+
+
+class SettingsBindingWorkersBindingKindHyperdrive(TypedDict, total=False):
+    id: Required[str]
+    """Identifier of the Hyperdrive connection to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["hyperdrive"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindInherit(TypedDict, total=False):
+    name: Required[str]
+    """The name of the inherited binding."""
+
+    type: Required[Literal["inherit"]]
+    """The kind of resource that the binding provides."""
+
+    old_name: str
+    """The old name of the inherited binding.
+
+    If set, the binding will be renamed from `old_name` to `name` in the new
+    version. If not set, the binding will keep the same name between versions.
+    """
+
+    version_id: str
+    """
+    Identifier for the version to inherit the binding from, which can be the version
+    ID or the literal "latest" to inherit from the latest version. Defaults to
+    inheriting the binding from the latest version.
+    """
+
+
+class SettingsBindingWorkersBindingKindImages(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["images"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindJson(TypedDict, total=False):
+    json: Required[str]
+    """JSON data to use."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["json"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindKVNamespace(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: Required[str]
+    """Namespace identifier tag."""
+
+    type: Required[Literal["kv_namespace"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindMTLSCertificate(TypedDict, total=False):
+    certificate_id: Required[str]
+    """Identifier of the certificate to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["mtls_certificate"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindPlainText(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    text: Required[str]
+    """The text value to use."""
+
+    type: Required[Literal["plain_text"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindPipelines(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    pipeline: Required[str]
+    """Name of the Pipeline to bind to."""
+
+    type: Required[Literal["pipelines"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindQueue(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    queue_name: Required[str]
+    """Name of the Queue to bind to."""
+
+    type: Required[Literal["queue"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindRatelimitSimple(TypedDict, total=False):
+    """The rate limit configuration."""
+
+    limit: Required[float]
+    """The limit (requests per period)."""
+
+    period: Required[int]
+    """The period in seconds."""
+
+
+class SettingsBindingWorkersBindingKindRatelimit(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: Required[str]
+    """Identifier of the rate limit namespace to bind to."""
+
+    simple: Required[SettingsBindingWorkersBindingKindRatelimitSimple]
+    """The rate limit configuration."""
+
+    type: Required[Literal["ratelimit"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindR2Bucket(TypedDict, total=False):
+    bucket_name: Required[str]
+    """R2 bucket to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["r2_bucket"]]
+    """The kind of resource that the binding provides."""
+
+    jurisdiction: Literal["eu", "fedramp"]
+    """
+    The
+    [jurisdiction](https://developers.cloudflare.com/r2/reference/data-location/#jurisdictional-restrictions)
+    of the R2 bucket.
+    """
+
+
+class SettingsBindingWorkersBindingKindSecretText(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    text: Required[str]
+    """The secret value to use."""
+
+    type: Required[Literal["secret_text"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindSendEmail(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["send_email"]]
+    """The kind of resource that the binding provides."""
+
+    allowed_destination_addresses: SequenceNotStr[str]
+    """List of allowed destination addresses."""
+
+    allowed_sender_addresses: SequenceNotStr[str]
+    """List of allowed sender addresses."""
+
+    destination_address: str
+    """Destination address for the email."""
+
+
+class SettingsBindingWorkersBindingKindService(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    service: Required[str]
+    """Name of Worker to bind to."""
+
+    type: Required[Literal["service"]]
+    """The kind of resource that the binding provides."""
+
+    environment: str
+    """Optional environment if the Worker utilizes one."""
+
+
+class SettingsBindingWorkersBindingKindTextBlob(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    part: Required[str]
+    """The name of the file containing the text content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Required[Literal["text_blob"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindVectorize(TypedDict, total=False):
+    index_name: Required[str]
+    """Name of the Vectorize index to bind to."""
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["vectorize"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindVersionMetadata(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["version_metadata"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindSecretsStoreSecret(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    secret_name: Required[str]
+    """Name of the secret in the store."""
+
+    store_id: Required[str]
+    """ID of the store containing the secret."""
+
+    type: Required[Literal["secrets_store_secret"]]
+    """The kind of resource that the binding provides."""
+
+
+class SettingsBindingWorkersBindingKindSecretKey(TypedDict, total=False):
+    algorithm: Required[object]
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Required[Literal["raw", "pkcs8", "spki", "jwk"]]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["secret_key"]]
+    """The kind of resource that the binding provides."""
+
+    usages: Required[
+        List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    ]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+    key_base64: str
+    """Base64-encoded key data. Required if `format` is "raw", "pkcs8", or "spki"."""
+
+    key_jwk: object
+    """
+    Key data in
+    [JSON Web Key](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#json_web_key)
+    format. Required if `format` is "jwk".
+    """
+
+
+class SettingsBindingWorkersBindingKindWorkflow(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    type: Required[Literal["workflow"]]
+    """The kind of resource that the binding provides."""
+
+    workflow_name: Required[str]
+    """Name of the Workflow to bind to."""
+
+    class_name: str
+    """Class name of the Workflow.
+
+    Should only be provided if the Workflow belongs to this script.
+    """
+
+    script_name: str
+    """Script name that contains the Workflow.
+
+    If not provided, defaults to this script name.
+    """
+
+
+class SettingsBindingWorkersBindingKindWasmModule(TypedDict, total=False):
+    name: Required[str]
+    """A JavaScript variable name for the binding."""
+
+    part: Required[str]
+    """The name of the file containing the WebAssembly module content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Required[Literal["wasm_module"]]
+    """The kind of resource that the binding provides."""
+
+
+SettingsBinding: TypeAlias = Union[
+    SettingsBindingWorkersBindingKindAI,
+    SettingsBindingWorkersBindingKindAnalyticsEngine,
+    SettingsBindingWorkersBindingKindAssets,
+    SettingsBindingWorkersBindingKindBrowser,
+    SettingsBindingWorkersBindingKindD1,
+    SettingsBindingWorkersBindingKindDataBlob,
+    SettingsBindingWorkersBindingKindDispatchNamespace,
+    SettingsBindingWorkersBindingKindDurableObjectNamespace,
+    SettingsBindingWorkersBindingKindHyperdrive,
+    SettingsBindingWorkersBindingKindInherit,
+    SettingsBindingWorkersBindingKindImages,
+    SettingsBindingWorkersBindingKindJson,
+    SettingsBindingWorkersBindingKindKVNamespace,
+    SettingsBindingWorkersBindingKindMTLSCertificate,
+    SettingsBindingWorkersBindingKindPlainText,
+    SettingsBindingWorkersBindingKindPipelines,
+    SettingsBindingWorkersBindingKindQueue,
+    SettingsBindingWorkersBindingKindRatelimit,
+    SettingsBindingWorkersBindingKindR2Bucket,
+    SettingsBindingWorkersBindingKindSecretText,
+    SettingsBindingWorkersBindingKindSendEmail,
+    SettingsBindingWorkersBindingKindService,
+    SettingsBindingWorkersBindingKindTextBlob,
+    SettingsBindingWorkersBindingKindVectorize,
+    SettingsBindingWorkersBindingKindVersionMetadata,
+    SettingsBindingWorkersBindingKindSecretsStoreSecret,
+    SettingsBindingWorkersBindingKindSecretKey,
+    SettingsBindingWorkersBindingKindWorkflow,
+    SettingsBindingWorkersBindingKindWasmModule,
+]
+
+
 class SettingsLimits(TypedDict, total=False):
+    """Limits to apply for this Worker."""
+
     cpu_ms: int
     """The amount of CPU time this Worker can use in milliseconds."""
 
 
-SettingsMigrations = Union[SingleStepMigrationParam, SteppedMigrationParam]
+class SettingsMigrationsWorkersMultipleStepMigrations(TypedDict, total=False):
+    new_tag: str
+    """Tag to set as the latest migration tag."""
+
+    old_tag: str
+    """Tag used to verify against the latest migration tag for this Worker.
+
+    If they don't match, the upload is rejected.
+    """
+
+    steps: Iterable[MigrationStepParam]
+    """Migrations to apply in order."""
+
+
+SettingsMigrations: TypeAlias = Union[SingleStepMigrationParam, SettingsMigrationsWorkersMultipleStepMigrations]
+
+
+class SettingsObservabilityLogs(TypedDict, total=False):
+    """Log settings for the Worker."""
+
+    enabled: Required[bool]
+    """Whether logs are enabled for the Worker."""
+
+    invocation_logs: Required[bool]
+    """
+    Whether
+    [invocation logs](https://developers.cloudflare.com/workers/observability/logs/workers-logs/#invocation-logs)
+    are enabled for the Worker.
+    """
+
+    destinations: SequenceNotStr[str]
+    """A list of destinations where logs will be exported to."""
+
+    head_sampling_rate: Optional[float]
+    """The sampling rate for logs. From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1."""
+
+    persist: bool
+    """Whether log persistence is enabled for the Worker."""
+
+
+class SettingsObservability(TypedDict, total=False):
+    """Observability settings for the Worker."""
+
+    enabled: Required[bool]
+    """Whether observability is enabled for the Worker."""
+
+    head_sampling_rate: Optional[float]
+    """The sampling rate for incoming requests.
+
+    From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1.
+    """
+
+    logs: Optional[SettingsObservabilityLogs]
+    """Log settings for the Worker."""
+
+
+class SettingsPlacementMode(TypedDict, total=False):
+    mode: Required[Literal["smart"]]
+    """
+    Enables
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class SettingsPlacementRegion(TypedDict, total=False):
+    region: Required[str]
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class SettingsPlacementHostname(TypedDict, total=False):
+    hostname: Required[str]
+    """HTTP hostname for targeted placement."""
+
+
+class SettingsPlacementHost(TypedDict, total=False):
+    host: Required[str]
+    """TCP host and port for targeted placement."""
+
+
+class SettingsPlacementUnionMember4(TypedDict, total=False):
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+    region: Required[str]
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class SettingsPlacementUnionMember5(TypedDict, total=False):
+    hostname: Required[str]
+    """HTTP hostname for targeted placement."""
+
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+
+class SettingsPlacementUnionMember6(TypedDict, total=False):
+    host: Required[str]
+    """TCP host and port for targeted placement."""
+
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+
+class SettingsPlacementUnionMember7TargetRegion(TypedDict, total=False):
+    region: Required[str]
+    """Cloud region in format 'provider:region'."""
+
+
+class SettingsPlacementUnionMember7TargetHostname(TypedDict, total=False):
+    hostname: Required[str]
+    """HTTP hostname for targeted placement."""
+
+
+class SettingsPlacementUnionMember7TargetHost(TypedDict, total=False):
+    host: Required[str]
+    """TCP host:port for targeted placement."""
+
+
+SettingsPlacementUnionMember7Target: TypeAlias = Union[
+    SettingsPlacementUnionMember7TargetRegion,
+    SettingsPlacementUnionMember7TargetHostname,
+    SettingsPlacementUnionMember7TargetHost,
+]
+
+
+class SettingsPlacementUnionMember7(TypedDict, total=False):
+    mode: Required[Literal["targeted"]]
+    """Targeted placement mode."""
+
+    target: Required[Iterable[SettingsPlacementUnionMember7Target]]
+    """Array of placement targets (currently limited to single target)."""
+
+
+SettingsPlacement: TypeAlias = Union[
+    SettingsPlacementMode,
+    SettingsPlacementRegion,
+    SettingsPlacementHostname,
+    SettingsPlacementHost,
+    SettingsPlacementUnionMember4,
+    SettingsPlacementUnionMember5,
+    SettingsPlacementUnionMember6,
+    SettingsPlacementUnionMember7,
+]
 
 
 class Settings(TypedDict, total=False):
-    bindings: Iterable[BindingParam]
-    """List of bindings attached to this Worker"""
+    bindings: Iterable[SettingsBinding]
+    """List of bindings attached to a Worker.
+
+    You can find more about bindings on our docs:
+    https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
+    """
 
     compatibility_date: str
-    """Opt your Worker into changes after this date"""
+    """Date indicating targeted support in the Workers runtime.
 
-    compatibility_flags: List[str]
-    """Opt your Worker into specific changes"""
+    Backwards incompatible fixes to the runtime following this date will not affect
+    this Worker.
+    """
+
+    compatibility_flags: SequenceNotStr[str]
+    """Flags that enable or disable certain features in the Workers runtime.
+
+    Used to enable upcoming features or opt in or out of specific changes not
+    included in a `compatibility_date`.
+    """
 
     limits: SettingsLimits
     """Limits to apply for this Worker."""
@@ -51,13 +726,21 @@ class Settings(TypedDict, total=False):
     migrations: SettingsMigrations
     """Migrations to apply for Durable Objects associated with this Worker."""
 
-    placement: PlacementConfigurationParam
+    observability: SettingsObservability
+    """Observability settings for the Worker."""
+
+    placement: SettingsPlacement
+    """
+    Configuration for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    Specify mode='smart' for Smart Placement, or one of region/hostname/host.
+    """
 
-    tags: List[str]
-    """Tags to help you manage your Workers"""
+    tags: Optional[SequenceNotStr[str]]
+    """Tags associated with the Worker."""
 
-    tail_consumers: Iterable[ConsumerScriptParam]
+    tail_consumers: Optional[Iterable[ConsumerScriptParam]]
     """List of Workers that will consume logs from the attached Worker."""
 
-    usage_model: str
-    """Specifies the usage model for the Worker (e.g. 'bundled' or 'unbound')."""
+    usage_model: Literal["standard", "bundled", "unbound"]
+    """Usage model for the Worker invocations."""
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 e25777737a2..27fe9432dbe 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
@@ -1,34 +1,686 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Union, Optional
+from typing_extensions import Literal, Annotated, TypeAlias
 
+from pydantic import Field as FieldInfo
+
+from ......_utils import PropertyInfo
 from ......_models import BaseModel
-from .....workers.binding import Binding
-from .....workers.stepped_migration import SteppedMigration
 from .....workers.single_step_migration import SingleStepMigration
-from .....workers.placement_configuration import PlacementConfiguration
 from .....workers.scripts.consumer_script import ConsumerScript
 
-__all__ = ["SettingEditResponse", "Limits", "Migrations"]
+__all__ = [
+    "SettingEditResponse",
+    "Binding",
+    "BindingWorkersBindingKindAI",
+    "BindingWorkersBindingKindAnalyticsEngine",
+    "BindingWorkersBindingKindAssets",
+    "BindingWorkersBindingKindBrowser",
+    "BindingWorkersBindingKindD1",
+    "BindingWorkersBindingKindDataBlob",
+    "BindingWorkersBindingKindDispatchNamespace",
+    "BindingWorkersBindingKindDispatchNamespaceOutbound",
+    "BindingWorkersBindingKindDispatchNamespaceOutboundWorker",
+    "BindingWorkersBindingKindDurableObjectNamespace",
+    "BindingWorkersBindingKindHyperdrive",
+    "BindingWorkersBindingKindInherit",
+    "BindingWorkersBindingKindImages",
+    "BindingWorkersBindingKindJson",
+    "BindingWorkersBindingKindKVNamespace",
+    "BindingWorkersBindingKindMTLSCertificate",
+    "BindingWorkersBindingKindPlainText",
+    "BindingWorkersBindingKindPipelines",
+    "BindingWorkersBindingKindQueue",
+    "BindingWorkersBindingKindRatelimit",
+    "BindingWorkersBindingKindRatelimitSimple",
+    "BindingWorkersBindingKindR2Bucket",
+    "BindingWorkersBindingKindSecretText",
+    "BindingWorkersBindingKindSendEmail",
+    "BindingWorkersBindingKindService",
+    "BindingWorkersBindingKindTextBlob",
+    "BindingWorkersBindingKindVectorize",
+    "BindingWorkersBindingKindVersionMetadata",
+    "BindingWorkersBindingKindSecretsStoreSecret",
+    "BindingWorkersBindingKindSecretKey",
+    "BindingWorkersBindingKindWorkflow",
+    "BindingWorkersBindingKindWasmModule",
+    "Limits",
+    "Migrations",
+    "MigrationsWorkersMultipleStepMigrations",
+    "Observability",
+    "ObservabilityLogs",
+    "Placement",
+    "PlacementMode",
+    "PlacementRegion",
+    "PlacementHostname",
+    "PlacementHost",
+    "PlacementUnionMember4",
+    "PlacementUnionMember5",
+    "PlacementUnionMember6",
+    "PlacementUnionMember7",
+    "PlacementUnionMember7Target",
+    "PlacementUnionMember7TargetRegion",
+    "PlacementUnionMember7TargetHostname",
+    "PlacementUnionMember7TargetHost",
+]
+
+
+class BindingWorkersBindingKindAI(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["ai"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindAnalyticsEngine(BaseModel):
+    dataset: str
+    """The name of the dataset to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["analytics_engine"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindAssets(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["assets"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindBrowser(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["browser"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindD1(BaseModel):
+    id: str
+    """Identifier of the D1 database to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["d1"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindDataBlob(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the data content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["data_blob"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindDispatchNamespaceOutboundWorker(BaseModel):
+    """Outbound worker."""
+
+    environment: Optional[str] = None
+    """Environment of the outbound worker."""
+
+    service: Optional[str] = None
+    """Name of the outbound worker."""
+
+
+class BindingWorkersBindingKindDispatchNamespaceOutbound(BaseModel):
+    """Outbound worker."""
+
+    params: Optional[List[str]] = None
+    """
+    Pass information from the Dispatch Worker to the Outbound Worker through the
+    parameters.
+    """
+
+    worker: Optional[BindingWorkersBindingKindDispatchNamespaceOutboundWorker] = None
+    """Outbound worker."""
+
+
+class BindingWorkersBindingKindDispatchNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace: str
+    """The name of the dispatch namespace."""
+
+    type: Literal["dispatch_namespace"]
+    """The kind of resource that the binding provides."""
+
+    outbound: Optional[BindingWorkersBindingKindDispatchNamespaceOutbound] = None
+    """Outbound worker."""
+
+
+class BindingWorkersBindingKindDurableObjectNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["durable_object_namespace"]
+    """The kind of resource that the binding provides."""
+
+    class_name: Optional[str] = None
+    """The exported class name of the Durable Object."""
+
+    environment: Optional[str] = None
+    """The environment of the script_name to bind to."""
+
+    namespace_id: Optional[str] = None
+    """Namespace identifier tag."""
+
+    script_name: Optional[str] = None
+    """
+    The script where the Durable Object is defined, if it is external to this
+    Worker.
+    """
+
+
+class BindingWorkersBindingKindHyperdrive(BaseModel):
+    id: str
+    """Identifier of the Hyperdrive connection to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["hyperdrive"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindInherit(BaseModel):
+    name: str
+    """The name of the inherited binding."""
+
+    type: Literal["inherit"]
+    """The kind of resource that the binding provides."""
+
+    old_name: Optional[str] = None
+    """The old name of the inherited binding.
+
+    If set, the binding will be renamed from `old_name` to `name` in the new
+    version. If not set, the binding will keep the same name between versions.
+    """
+
+    version_id: Optional[str] = None
+    """
+    Identifier for the version to inherit the binding from, which can be the version
+    ID or the literal "latest" to inherit from the latest version. Defaults to
+    inheriting the binding from the latest version.
+    """
+
+
+class BindingWorkersBindingKindImages(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["images"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindJson(BaseModel):
+    json_: str = FieldInfo(alias="json")
+    """JSON data to use."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["json"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindKVNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: str
+    """Namespace identifier tag."""
+
+    type: Literal["kv_namespace"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindMTLSCertificate(BaseModel):
+    certificate_id: str
+    """Identifier of the certificate to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["mtls_certificate"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindPlainText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    text: str
+    """The text value to use."""
+
+    type: Literal["plain_text"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindPipelines(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    pipeline: str
+    """Name of the Pipeline to bind to."""
+
+    type: Literal["pipelines"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindQueue(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    queue_name: str
+    """Name of the Queue to bind to."""
+
+    type: Literal["queue"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindRatelimitSimple(BaseModel):
+    """The rate limit configuration."""
+
+    limit: float
+    """The limit (requests per period)."""
+
+    period: int
+    """The period in seconds."""
+
+
+class BindingWorkersBindingKindRatelimit(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: str
+    """Identifier of the rate limit namespace to bind to."""
+
+    simple: BindingWorkersBindingKindRatelimitSimple
+    """The rate limit configuration."""
+
+    type: Literal["ratelimit"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindR2Bucket(BaseModel):
+    bucket_name: str
+    """R2 bucket to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["r2_bucket"]
+    """The kind of resource that the binding provides."""
+
+    jurisdiction: Optional[Literal["eu", "fedramp"]] = None
+    """
+    The
+    [jurisdiction](https://developers.cloudflare.com/r2/reference/data-location/#jurisdictional-restrictions)
+    of the R2 bucket.
+    """
+
+
+class BindingWorkersBindingKindSecretText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_text"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindSendEmail(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["send_email"]
+    """The kind of resource that the binding provides."""
+
+    allowed_destination_addresses: Optional[List[str]] = None
+    """List of allowed destination addresses."""
+
+    allowed_sender_addresses: Optional[List[str]] = None
+    """List of allowed sender addresses."""
+
+    destination_address: Optional[str] = None
+    """Destination address for the email."""
+
+
+class BindingWorkersBindingKindService(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    service: str
+    """Name of Worker to bind to."""
+
+    type: Literal["service"]
+    """The kind of resource that the binding provides."""
+
+    environment: Optional[str] = None
+    """Optional environment if the Worker utilizes one."""
+
+
+class BindingWorkersBindingKindTextBlob(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the text content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["text_blob"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindVectorize(BaseModel):
+    index_name: str
+    """Name of the Vectorize index to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["vectorize"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindVersionMetadata(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["version_metadata"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindSecretsStoreSecret(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    secret_name: str
+    """Name of the secret in the store."""
+
+    store_id: str
+    """ID of the store containing the secret."""
+
+    type: Literal["secrets_store_secret"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindSecretKey(BaseModel):
+    algorithm: object
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Literal["raw", "pkcs8", "spki", "jwk"]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_key"]
+    """The kind of resource that the binding provides."""
+
+    usages: List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+
+class BindingWorkersBindingKindWorkflow(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["workflow"]
+    """The kind of resource that the binding provides."""
+
+    workflow_name: str
+    """Name of the Workflow to bind to."""
+
+    class_name: Optional[str] = None
+    """Class name of the Workflow.
+
+    Should only be provided if the Workflow belongs to this script.
+    """
+
+    script_name: Optional[str] = None
+    """Script name that contains the Workflow.
+
+    If not provided, defaults to this script name.
+    """
+
+
+class BindingWorkersBindingKindWasmModule(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the WebAssembly module content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["wasm_module"]
+    """The kind of resource that the binding provides."""
+
+
+Binding: TypeAlias = Annotated[
+    Union[
+        BindingWorkersBindingKindAI,
+        BindingWorkersBindingKindAnalyticsEngine,
+        BindingWorkersBindingKindAssets,
+        BindingWorkersBindingKindBrowser,
+        BindingWorkersBindingKindD1,
+        BindingWorkersBindingKindDataBlob,
+        BindingWorkersBindingKindDispatchNamespace,
+        BindingWorkersBindingKindDurableObjectNamespace,
+        BindingWorkersBindingKindHyperdrive,
+        BindingWorkersBindingKindInherit,
+        BindingWorkersBindingKindImages,
+        BindingWorkersBindingKindJson,
+        BindingWorkersBindingKindKVNamespace,
+        BindingWorkersBindingKindMTLSCertificate,
+        BindingWorkersBindingKindPlainText,
+        BindingWorkersBindingKindPipelines,
+        BindingWorkersBindingKindQueue,
+        BindingWorkersBindingKindRatelimit,
+        BindingWorkersBindingKindR2Bucket,
+        BindingWorkersBindingKindSecretText,
+        BindingWorkersBindingKindSendEmail,
+        BindingWorkersBindingKindService,
+        BindingWorkersBindingKindTextBlob,
+        BindingWorkersBindingKindVectorize,
+        BindingWorkersBindingKindVersionMetadata,
+        BindingWorkersBindingKindSecretsStoreSecret,
+        BindingWorkersBindingKindSecretKey,
+        BindingWorkersBindingKindWorkflow,
+        BindingWorkersBindingKindWasmModule,
+    ],
+    PropertyInfo(discriminator="type"),
+]
 
 
 class Limits(BaseModel):
+    """Limits to apply for this Worker."""
+
     cpu_ms: Optional[int] = None
     """The amount of CPU time this Worker can use in milliseconds."""
 
 
-Migrations = Union[SingleStepMigration, SteppedMigration]
+class MigrationsWorkersMultipleStepMigrations(BaseModel):
+    pass
+
+
+Migrations: TypeAlias = Union[SingleStepMigration, MigrationsWorkersMultipleStepMigrations]
+
+
+class ObservabilityLogs(BaseModel):
+    """Log settings for the Worker."""
+
+    enabled: bool
+    """Whether logs are enabled for the Worker."""
+
+    invocation_logs: bool
+    """
+    Whether
+    [invocation logs](https://developers.cloudflare.com/workers/observability/logs/workers-logs/#invocation-logs)
+    are enabled for the Worker.
+    """
+
+    destinations: Optional[List[str]] = None
+    """A list of destinations where logs will be exported to."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for logs. From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1."""
+
+    persist: Optional[bool] = None
+    """Whether log persistence is enabled for the Worker."""
+
+
+class Observability(BaseModel):
+    """Observability settings for the Worker."""
+
+    enabled: bool
+    """Whether observability is enabled for the Worker."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for incoming requests.
+
+    From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1.
+    """
+
+    logs: Optional[ObservabilityLogs] = None
+    """Log settings for the Worker."""
+
+
+class PlacementMode(BaseModel):
+    mode: Literal["smart"]
+    """
+    Enables
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementRegion(BaseModel):
+    region: str
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class PlacementHostname(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+
+class PlacementHost(BaseModel):
+    host: str
+    """TCP host and port for targeted placement."""
+
+
+class PlacementUnionMember4(BaseModel):
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    region: str
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class PlacementUnionMember5(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+
+class PlacementUnionMember6(BaseModel):
+    host: str
+    """TCP host and port for targeted placement."""
+
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+
+class PlacementUnionMember7TargetRegion(BaseModel):
+    region: str
+    """Cloud region in format 'provider:region'."""
+
+
+class PlacementUnionMember7TargetHostname(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+
+class PlacementUnionMember7TargetHost(BaseModel):
+    host: str
+    """TCP host:port for targeted placement."""
+
+
+PlacementUnionMember7Target: TypeAlias = Union[
+    PlacementUnionMember7TargetRegion, PlacementUnionMember7TargetHostname, PlacementUnionMember7TargetHost
+]
+
+
+class PlacementUnionMember7(BaseModel):
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    target: List[PlacementUnionMember7Target]
+    """Array of placement targets (currently limited to single target)."""
+
+
+Placement: TypeAlias = Union[
+    PlacementMode,
+    PlacementRegion,
+    PlacementHostname,
+    PlacementHost,
+    PlacementUnionMember4,
+    PlacementUnionMember5,
+    PlacementUnionMember6,
+    PlacementUnionMember7,
+]
 
 
 class SettingEditResponse(BaseModel):
     bindings: Optional[List[Binding]] = None
-    """List of bindings attached to this Worker"""
+    """List of bindings attached to a Worker.
+
+    You can find more about bindings on our docs:
+    https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
+    """
 
     compatibility_date: Optional[str] = None
-    """Opt your Worker into changes after this date"""
+    """Date indicating targeted support in the Workers runtime.
+
+    Backwards incompatible fixes to the runtime following this date will not affect
+    this Worker.
+    """
 
     compatibility_flags: Optional[List[str]] = None
-    """Opt your Worker into specific changes"""
+    """Flags that enable or disable certain features in the Workers runtime.
+
+    Used to enable upcoming features or opt in or out of specific changes not
+    included in a `compatibility_date`.
+    """
 
     limits: Optional[Limits] = None
     """Limits to apply for this Worker."""
@@ -36,16 +688,21 @@ class SettingEditResponse(BaseModel):
     logpush: Optional[bool] = None
     """Whether Logpush is turned on for the Worker."""
 
-    migrations: Optional[Migrations] = None
-    """Migrations to apply for Durable Objects associated with this Worker."""
+    observability: Optional[Observability] = None
+    """Observability settings for the Worker."""
 
-    placement: Optional[PlacementConfiguration] = None
+    placement: Optional[Placement] = None
+    """
+    Configuration for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    Specify mode='smart' for Smart Placement, or one of region/hostname/host.
+    """
 
     tags: Optional[List[str]] = None
-    """Tags to help you manage your Workers"""
+    """Tags associated with the Worker."""
 
     tail_consumers: Optional[List[ConsumerScript]] = None
     """List of Workers that will consume logs from the attached Worker."""
 
-    usage_model: Optional[str] = None
-    """Specifies the usage model for the Worker (e.g. 'bundled' or 'unbound')."""
+    usage_model: Optional[Literal["standard", "bundled", "unbound"]] = None
+    """Usage model for the Worker invocations."""
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 da7cf1eb242..9a2aefb205a 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
@@ -1,34 +1,686 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Union, Optional
+from typing_extensions import Literal, Annotated, TypeAlias
 
+from pydantic import Field as FieldInfo
+
+from ......_utils import PropertyInfo
 from ......_models import BaseModel
-from .....workers.binding import Binding
-from .....workers.stepped_migration import SteppedMigration
 from .....workers.single_step_migration import SingleStepMigration
-from .....workers.placement_configuration import PlacementConfiguration
 from .....workers.scripts.consumer_script import ConsumerScript
 
-__all__ = ["SettingGetResponse", "Limits", "Migrations"]
+__all__ = [
+    "SettingGetResponse",
+    "Binding",
+    "BindingWorkersBindingKindAI",
+    "BindingWorkersBindingKindAnalyticsEngine",
+    "BindingWorkersBindingKindAssets",
+    "BindingWorkersBindingKindBrowser",
+    "BindingWorkersBindingKindD1",
+    "BindingWorkersBindingKindDataBlob",
+    "BindingWorkersBindingKindDispatchNamespace",
+    "BindingWorkersBindingKindDispatchNamespaceOutbound",
+    "BindingWorkersBindingKindDispatchNamespaceOutboundWorker",
+    "BindingWorkersBindingKindDurableObjectNamespace",
+    "BindingWorkersBindingKindHyperdrive",
+    "BindingWorkersBindingKindInherit",
+    "BindingWorkersBindingKindImages",
+    "BindingWorkersBindingKindJson",
+    "BindingWorkersBindingKindKVNamespace",
+    "BindingWorkersBindingKindMTLSCertificate",
+    "BindingWorkersBindingKindPlainText",
+    "BindingWorkersBindingKindPipelines",
+    "BindingWorkersBindingKindQueue",
+    "BindingWorkersBindingKindRatelimit",
+    "BindingWorkersBindingKindRatelimitSimple",
+    "BindingWorkersBindingKindR2Bucket",
+    "BindingWorkersBindingKindSecretText",
+    "BindingWorkersBindingKindSendEmail",
+    "BindingWorkersBindingKindService",
+    "BindingWorkersBindingKindTextBlob",
+    "BindingWorkersBindingKindVectorize",
+    "BindingWorkersBindingKindVersionMetadata",
+    "BindingWorkersBindingKindSecretsStoreSecret",
+    "BindingWorkersBindingKindSecretKey",
+    "BindingWorkersBindingKindWorkflow",
+    "BindingWorkersBindingKindWasmModule",
+    "Limits",
+    "Migrations",
+    "MigrationsWorkersMultipleStepMigrations",
+    "Observability",
+    "ObservabilityLogs",
+    "Placement",
+    "PlacementMode",
+    "PlacementRegion",
+    "PlacementHostname",
+    "PlacementHost",
+    "PlacementUnionMember4",
+    "PlacementUnionMember5",
+    "PlacementUnionMember6",
+    "PlacementUnionMember7",
+    "PlacementUnionMember7Target",
+    "PlacementUnionMember7TargetRegion",
+    "PlacementUnionMember7TargetHostname",
+    "PlacementUnionMember7TargetHost",
+]
+
+
+class BindingWorkersBindingKindAI(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["ai"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindAnalyticsEngine(BaseModel):
+    dataset: str
+    """The name of the dataset to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["analytics_engine"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindAssets(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["assets"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindBrowser(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["browser"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindD1(BaseModel):
+    id: str
+    """Identifier of the D1 database to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["d1"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindDataBlob(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the data content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["data_blob"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindDispatchNamespaceOutboundWorker(BaseModel):
+    """Outbound worker."""
+
+    environment: Optional[str] = None
+    """Environment of the outbound worker."""
+
+    service: Optional[str] = None
+    """Name of the outbound worker."""
+
+
+class BindingWorkersBindingKindDispatchNamespaceOutbound(BaseModel):
+    """Outbound worker."""
+
+    params: Optional[List[str]] = None
+    """
+    Pass information from the Dispatch Worker to the Outbound Worker through the
+    parameters.
+    """
+
+    worker: Optional[BindingWorkersBindingKindDispatchNamespaceOutboundWorker] = None
+    """Outbound worker."""
+
+
+class BindingWorkersBindingKindDispatchNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace: str
+    """The name of the dispatch namespace."""
+
+    type: Literal["dispatch_namespace"]
+    """The kind of resource that the binding provides."""
+
+    outbound: Optional[BindingWorkersBindingKindDispatchNamespaceOutbound] = None
+    """Outbound worker."""
+
+
+class BindingWorkersBindingKindDurableObjectNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["durable_object_namespace"]
+    """The kind of resource that the binding provides."""
+
+    class_name: Optional[str] = None
+    """The exported class name of the Durable Object."""
+
+    environment: Optional[str] = None
+    """The environment of the script_name to bind to."""
+
+    namespace_id: Optional[str] = None
+    """Namespace identifier tag."""
+
+    script_name: Optional[str] = None
+    """
+    The script where the Durable Object is defined, if it is external to this
+    Worker.
+    """
+
+
+class BindingWorkersBindingKindHyperdrive(BaseModel):
+    id: str
+    """Identifier of the Hyperdrive connection to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["hyperdrive"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindInherit(BaseModel):
+    name: str
+    """The name of the inherited binding."""
+
+    type: Literal["inherit"]
+    """The kind of resource that the binding provides."""
+
+    old_name: Optional[str] = None
+    """The old name of the inherited binding.
+
+    If set, the binding will be renamed from `old_name` to `name` in the new
+    version. If not set, the binding will keep the same name between versions.
+    """
+
+    version_id: Optional[str] = None
+    """
+    Identifier for the version to inherit the binding from, which can be the version
+    ID or the literal "latest" to inherit from the latest version. Defaults to
+    inheriting the binding from the latest version.
+    """
+
+
+class BindingWorkersBindingKindImages(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["images"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindJson(BaseModel):
+    json_: str = FieldInfo(alias="json")
+    """JSON data to use."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["json"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindKVNamespace(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: str
+    """Namespace identifier tag."""
+
+    type: Literal["kv_namespace"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindMTLSCertificate(BaseModel):
+    certificate_id: str
+    """Identifier of the certificate to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["mtls_certificate"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindPlainText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    text: str
+    """The text value to use."""
+
+    type: Literal["plain_text"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindPipelines(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    pipeline: str
+    """Name of the Pipeline to bind to."""
+
+    type: Literal["pipelines"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindQueue(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    queue_name: str
+    """Name of the Queue to bind to."""
+
+    type: Literal["queue"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindRatelimitSimple(BaseModel):
+    """The rate limit configuration."""
+
+    limit: float
+    """The limit (requests per period)."""
+
+    period: int
+    """The period in seconds."""
+
+
+class BindingWorkersBindingKindRatelimit(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    namespace_id: str
+    """Identifier of the rate limit namespace to bind to."""
+
+    simple: BindingWorkersBindingKindRatelimitSimple
+    """The rate limit configuration."""
+
+    type: Literal["ratelimit"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindR2Bucket(BaseModel):
+    bucket_name: str
+    """R2 bucket to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["r2_bucket"]
+    """The kind of resource that the binding provides."""
+
+    jurisdiction: Optional[Literal["eu", "fedramp"]] = None
+    """
+    The
+    [jurisdiction](https://developers.cloudflare.com/r2/reference/data-location/#jurisdictional-restrictions)
+    of the R2 bucket.
+    """
+
+
+class BindingWorkersBindingKindSecretText(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_text"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindSendEmail(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["send_email"]
+    """The kind of resource that the binding provides."""
+
+    allowed_destination_addresses: Optional[List[str]] = None
+    """List of allowed destination addresses."""
+
+    allowed_sender_addresses: Optional[List[str]] = None
+    """List of allowed sender addresses."""
+
+    destination_address: Optional[str] = None
+    """Destination address for the email."""
+
+
+class BindingWorkersBindingKindService(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    service: str
+    """Name of Worker to bind to."""
+
+    type: Literal["service"]
+    """The kind of resource that the binding provides."""
+
+    environment: Optional[str] = None
+    """Optional environment if the Worker utilizes one."""
+
+
+class BindingWorkersBindingKindTextBlob(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the text content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["text_blob"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindVectorize(BaseModel):
+    index_name: str
+    """Name of the Vectorize index to bind to."""
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["vectorize"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindVersionMetadata(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["version_metadata"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindSecretsStoreSecret(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    secret_name: str
+    """Name of the secret in the store."""
+
+    store_id: str
+    """ID of the store containing the secret."""
+
+    type: Literal["secrets_store_secret"]
+    """The kind of resource that the binding provides."""
+
+
+class BindingWorkersBindingKindSecretKey(BaseModel):
+    algorithm: object
+    """Algorithm-specific key parameters.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#algorithm).
+    """
+
+    format: Literal["raw", "pkcs8", "spki", "jwk"]
+    """Data format of the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#format).
+    """
+
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["secret_key"]
+    """The kind of resource that the binding provides."""
+
+    usages: List[Literal["encrypt", "decrypt", "sign", "verify", "deriveKey", "deriveBits", "wrapKey", "unwrapKey"]]
+    """Allowed operations with the key.
+
+    [Learn more](https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#keyUsages).
+    """
+
+
+class BindingWorkersBindingKindWorkflow(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    type: Literal["workflow"]
+    """The kind of resource that the binding provides."""
+
+    workflow_name: str
+    """Name of the Workflow to bind to."""
+
+    class_name: Optional[str] = None
+    """Class name of the Workflow.
+
+    Should only be provided if the Workflow belongs to this script.
+    """
+
+    script_name: Optional[str] = None
+    """Script name that contains the Workflow.
+
+    If not provided, defaults to this script name.
+    """
+
+
+class BindingWorkersBindingKindWasmModule(BaseModel):
+    name: str
+    """A JavaScript variable name for the binding."""
+
+    part: str
+    """The name of the file containing the WebAssembly module content.
+
+    Only accepted for `service worker syntax` Workers.
+    """
+
+    type: Literal["wasm_module"]
+    """The kind of resource that the binding provides."""
+
+
+Binding: TypeAlias = Annotated[
+    Union[
+        BindingWorkersBindingKindAI,
+        BindingWorkersBindingKindAnalyticsEngine,
+        BindingWorkersBindingKindAssets,
+        BindingWorkersBindingKindBrowser,
+        BindingWorkersBindingKindD1,
+        BindingWorkersBindingKindDataBlob,
+        BindingWorkersBindingKindDispatchNamespace,
+        BindingWorkersBindingKindDurableObjectNamespace,
+        BindingWorkersBindingKindHyperdrive,
+        BindingWorkersBindingKindInherit,
+        BindingWorkersBindingKindImages,
+        BindingWorkersBindingKindJson,
+        BindingWorkersBindingKindKVNamespace,
+        BindingWorkersBindingKindMTLSCertificate,
+        BindingWorkersBindingKindPlainText,
+        BindingWorkersBindingKindPipelines,
+        BindingWorkersBindingKindQueue,
+        BindingWorkersBindingKindRatelimit,
+        BindingWorkersBindingKindR2Bucket,
+        BindingWorkersBindingKindSecretText,
+        BindingWorkersBindingKindSendEmail,
+        BindingWorkersBindingKindService,
+        BindingWorkersBindingKindTextBlob,
+        BindingWorkersBindingKindVectorize,
+        BindingWorkersBindingKindVersionMetadata,
+        BindingWorkersBindingKindSecretsStoreSecret,
+        BindingWorkersBindingKindSecretKey,
+        BindingWorkersBindingKindWorkflow,
+        BindingWorkersBindingKindWasmModule,
+    ],
+    PropertyInfo(discriminator="type"),
+]
 
 
 class Limits(BaseModel):
+    """Limits to apply for this Worker."""
+
     cpu_ms: Optional[int] = None
     """The amount of CPU time this Worker can use in milliseconds."""
 
 
-Migrations = Union[SingleStepMigration, SteppedMigration]
+class MigrationsWorkersMultipleStepMigrations(BaseModel):
+    pass
+
+
+Migrations: TypeAlias = Union[SingleStepMigration, MigrationsWorkersMultipleStepMigrations]
+
+
+class ObservabilityLogs(BaseModel):
+    """Log settings for the Worker."""
+
+    enabled: bool
+    """Whether logs are enabled for the Worker."""
+
+    invocation_logs: bool
+    """
+    Whether
+    [invocation logs](https://developers.cloudflare.com/workers/observability/logs/workers-logs/#invocation-logs)
+    are enabled for the Worker.
+    """
+
+    destinations: Optional[List[str]] = None
+    """A list of destinations where logs will be exported to."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for logs. From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1."""
+
+    persist: Optional[bool] = None
+    """Whether log persistence is enabled for the Worker."""
+
+
+class Observability(BaseModel):
+    """Observability settings for the Worker."""
+
+    enabled: bool
+    """Whether observability is enabled for the Worker."""
+
+    head_sampling_rate: Optional[float] = None
+    """The sampling rate for incoming requests.
+
+    From 0 to 1 (1 = 100%, 0.1 = 10%). Default is 1.
+    """
+
+    logs: Optional[ObservabilityLogs] = None
+    """Log settings for the Worker."""
+
+
+class PlacementMode(BaseModel):
+    mode: Literal["smart"]
+    """
+    Enables
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    """
+
+
+class PlacementRegion(BaseModel):
+    region: str
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class PlacementHostname(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+
+class PlacementHost(BaseModel):
+    host: str
+    """TCP host and port for targeted placement."""
+
+
+class PlacementUnionMember4(BaseModel):
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    region: str
+    """Cloud region for targeted placement in format 'provider:region'."""
+
+
+class PlacementUnionMember5(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+
+class PlacementUnionMember6(BaseModel):
+    host: str
+    """TCP host and port for targeted placement."""
+
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+
+class PlacementUnionMember7TargetRegion(BaseModel):
+    region: str
+    """Cloud region in format 'provider:region'."""
+
+
+class PlacementUnionMember7TargetHostname(BaseModel):
+    hostname: str
+    """HTTP hostname for targeted placement."""
+
+
+class PlacementUnionMember7TargetHost(BaseModel):
+    host: str
+    """TCP host:port for targeted placement."""
+
+
+PlacementUnionMember7Target: TypeAlias = Union[
+    PlacementUnionMember7TargetRegion, PlacementUnionMember7TargetHostname, PlacementUnionMember7TargetHost
+]
+
+
+class PlacementUnionMember7(BaseModel):
+    mode: Literal["targeted"]
+    """Targeted placement mode."""
+
+    target: List[PlacementUnionMember7Target]
+    """Array of placement targets (currently limited to single target)."""
+
+
+Placement: TypeAlias = Union[
+    PlacementMode,
+    PlacementRegion,
+    PlacementHostname,
+    PlacementHost,
+    PlacementUnionMember4,
+    PlacementUnionMember5,
+    PlacementUnionMember6,
+    PlacementUnionMember7,
+]
 
 
 class SettingGetResponse(BaseModel):
     bindings: Optional[List[Binding]] = None
-    """List of bindings attached to this Worker"""
+    """List of bindings attached to a Worker.
+
+    You can find more about bindings on our docs:
+    https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
+    """
 
     compatibility_date: Optional[str] = None
-    """Opt your Worker into changes after this date"""
+    """Date indicating targeted support in the Workers runtime.
+
+    Backwards incompatible fixes to the runtime following this date will not affect
+    this Worker.
+    """
 
     compatibility_flags: Optional[List[str]] = None
-    """Opt your Worker into specific changes"""
+    """Flags that enable or disable certain features in the Workers runtime.
+
+    Used to enable upcoming features or opt in or out of specific changes not
+    included in a `compatibility_date`.
+    """
 
     limits: Optional[Limits] = None
     """Limits to apply for this Worker."""
@@ -36,16 +688,21 @@ class SettingGetResponse(BaseModel):
     logpush: Optional[bool] = None
     """Whether Logpush is turned on for the Worker."""
 
-    migrations: Optional[Migrations] = None
-    """Migrations to apply for Durable Objects associated with this Worker."""
+    observability: Optional[Observability] = None
+    """Observability settings for the Worker."""
 
-    placement: Optional[PlacementConfiguration] = None
+    placement: Optional[Placement] = None
+    """
+    Configuration for
+    [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+    Specify mode='smart' for Smart Placement, or one of region/hostname/host.
+    """
 
     tags: Optional[List[str]] = None
-    """Tags to help you manage your Workers"""
+    """Tags associated with the Worker."""
 
     tail_consumers: Optional[List[ConsumerScript]] = None
     """List of Workers that will consume logs from the attached Worker."""
 
-    usage_model: Optional[str] = None
-    """Specifies the usage model for the Worker (e.g. 'bundled' or 'unbound')."""
+    usage_model: Optional[Literal["standard", "bundled", "unbound"]] = None
+    """Usage model for the Worker invocations."""
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_list_response.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_list_response.py
index f26fb51fb7e..9ed0283b77f 100644
--- a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_list_response.py
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_list_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["TagListResponse"]
 
-TagListResponse = str
+TagListResponse: TypeAlias = str
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_update_params.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_update_params.py
index e423cd8440d..d7ec6256208 100644
--- a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_update_params.py
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_update_params.py
@@ -2,18 +2,20 @@
 
 from __future__ import annotations
 
-from typing import List
+from typing import Optional
 from typing_extensions import Required, TypedDict
 
+from ......_types import SequenceNotStr
+
 __all__ = ["TagUpdateParams"]
 
 
 class TagUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     dispatch_namespace: Required[str]
     """Name of the Workers for Platforms dispatch namespace."""
 
-    body: Required[List[str]]
-    """Tags to help you manage your Workers"""
+    body: Required[Optional[SequenceNotStr[str]]]
+    """Tags associated with the Worker."""
diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_update_response.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_update_response.py
index 52678a8e0b8..4f80d1ed6da 100644
--- a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_update_response.py
+++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/tag_update_response.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing_extensions import TypeAlias
 
 __all__ = ["TagUpdateResponse"]
 
-TagUpdateResponse = List[str]
+TagUpdateResponse: TypeAlias = str
diff --git a/src/cloudflare/types/workflows/__init__.py b/src/cloudflare/types/workflows/__init__.py
new file mode 100644
index 00000000000..7ddd6aefea8
--- /dev/null
+++ b/src/cloudflare/types/workflows/__init__.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .version_list_params import VersionListParams as VersionListParams
+from .instance_bulk_params import InstanceBulkParams as InstanceBulkParams
+from .instance_list_params import InstanceListParams as InstanceListParams
+from .version_get_response import VersionGetResponse as VersionGetResponse
+from .workflow_list_params import WorkflowListParams as WorkflowListParams
+from .instance_get_response import InstanceGetResponse as InstanceGetResponse
+from .version_list_response import VersionListResponse as VersionListResponse
+from .workflow_get_response import WorkflowGetResponse as WorkflowGetResponse
+from .instance_bulk_response import InstanceBulkResponse as InstanceBulkResponse
+from .instance_create_params import InstanceCreateParams as InstanceCreateParams
+from .instance_list_response import InstanceListResponse as InstanceListResponse
+from .workflow_list_response import WorkflowListResponse as WorkflowListResponse
+from .workflow_update_params import WorkflowUpdateParams as WorkflowUpdateParams
+from .instance_create_response import InstanceCreateResponse as InstanceCreateResponse
+from .workflow_delete_response import WorkflowDeleteResponse as WorkflowDeleteResponse
+from .workflow_update_response import WorkflowUpdateResponse as WorkflowUpdateResponse
diff --git a/src/cloudflare/types/workflows/instance_bulk_params.py b/src/cloudflare/types/workflows/instance_bulk_params.py
new file mode 100644
index 00000000000..6e306f00583
--- /dev/null
+++ b/src/cloudflare/types/workflows/instance_bulk_params.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["InstanceBulkParams", "Body", "BodyInstanceRetention"]
+
+
+class InstanceBulkParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    body: Iterable[Body]
+
+
+class BodyInstanceRetention(TypedDict, total=False):
+    error_retention: Union[int, str]
+    """Specifies the duration in milliseconds or as a string like '5 minutes'."""
+
+    success_retention: Union[int, str]
+    """Specifies the duration in milliseconds or as a string like '5 minutes'."""
+
+
+class Body(TypedDict, total=False):
+    instance_id: str
+
+    instance_retention: BodyInstanceRetention
+
+    params: object
diff --git a/src/cloudflare/types/workflows/instance_bulk_response.py b/src/cloudflare/types/workflows/instance_bulk_response.py
new file mode 100644
index 00000000000..8a46397258c
--- /dev/null
+++ b/src/cloudflare/types/workflows/instance_bulk_response.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["InstanceBulkResponse"]
+
+
+class InstanceBulkResponse(BaseModel):
+    id: str
+
+    status: Literal["queued", "running", "paused", "errored", "terminated", "complete", "waitingForPause", "waiting"]
+
+    version_id: str
+
+    workflow_id: str
diff --git a/src/cloudflare/types/workflows/instance_create_params.py b/src/cloudflare/types/workflows/instance_create_params.py
new file mode 100644
index 00000000000..15d684fa37e
--- /dev/null
+++ b/src/cloudflare/types/workflows/instance_create_params.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from typing_extensions import Required, TypedDict
+
+__all__ = ["InstanceCreateParams", "InstanceRetention"]
+
+
+class InstanceCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    instance_id: str
+
+    instance_retention: InstanceRetention
+
+    params: object
+
+
+class InstanceRetention(TypedDict, total=False):
+    error_retention: Union[int, str]
+    """Specifies the duration in milliseconds or as a string like '5 minutes'."""
+
+    success_retention: Union[int, str]
+    """Specifies the duration in milliseconds or as a string like '5 minutes'."""
diff --git a/src/cloudflare/types/workflows/instance_create_response.py b/src/cloudflare/types/workflows/instance_create_response.py
new file mode 100644
index 00000000000..0b12616c27a
--- /dev/null
+++ b/src/cloudflare/types/workflows/instance_create_response.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["InstanceCreateResponse"]
+
+
+class InstanceCreateResponse(BaseModel):
+    id: str
+
+    status: Literal["queued", "running", "paused", "errored", "terminated", "complete", "waitingForPause", "waiting"]
+
+    version_id: str
+
+    workflow_id: str
diff --git a/src/cloudflare/types/workflows/instance_get_response.py b/src/cloudflare/types/workflows/instance_get_response.py
new file mode 100644
index 00000000000..e75ee1e2c6f
--- /dev/null
+++ b/src/cloudflare/types/workflows/instance_get_response.py
@@ -0,0 +1,166 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = [
+    "InstanceGetResponse",
+    "Error",
+    "Step",
+    "StepUnionMember0",
+    "StepUnionMember0Attempt",
+    "StepUnionMember0AttemptError",
+    "StepUnionMember0Config",
+    "StepUnionMember0ConfigRetries",
+    "StepUnionMember1",
+    "StepUnionMember1Error",
+    "StepUnionMember2",
+    "StepUnionMember2Trigger",
+    "StepUnionMember3",
+    "StepUnionMember3Error",
+    "Trigger",
+]
+
+
+class Error(BaseModel):
+    message: str
+
+    name: str
+
+
+class StepUnionMember0AttemptError(BaseModel):
+    message: str
+
+    name: str
+
+
+class StepUnionMember0Attempt(BaseModel):
+    end: Optional[datetime] = None
+
+    error: Optional[StepUnionMember0AttemptError] = None
+
+    start: datetime
+
+    success: Optional[bool] = None
+
+
+class StepUnionMember0ConfigRetries(BaseModel):
+    delay: Union[str, float]
+    """Specifies the delay duration."""
+
+    limit: float
+
+    backoff: Optional[Literal["constant", "linear", "exponential"]] = None
+
+
+class StepUnionMember0Config(BaseModel):
+    retries: StepUnionMember0ConfigRetries
+
+    timeout: Union[str, float]
+    """Specifies the timeout duration."""
+
+
+class StepUnionMember0(BaseModel):
+    attempts: List[StepUnionMember0Attempt]
+
+    config: StepUnionMember0Config
+
+    end: Optional[datetime] = None
+
+    name: str
+
+    output: object
+
+    start: datetime
+
+    success: Optional[bool] = None
+
+    type: Literal["step"]
+
+
+class StepUnionMember1Error(BaseModel):
+    message: str
+
+    name: str
+
+
+class StepUnionMember1(BaseModel):
+    end: datetime
+
+    error: Optional[StepUnionMember1Error] = None
+
+    finished: bool
+
+    name: str
+
+    start: datetime
+
+    type: Literal["sleep"]
+
+
+class StepUnionMember2Trigger(BaseModel):
+    source: str
+
+
+class StepUnionMember2(BaseModel):
+    trigger: StepUnionMember2Trigger
+
+    type: Literal["termination"]
+
+
+class StepUnionMember3Error(BaseModel):
+    message: str
+
+    name: str
+
+
+class StepUnionMember3(BaseModel):
+    end: datetime
+
+    error: Optional[StepUnionMember3Error] = None
+
+    finished: bool
+
+    name: str
+
+    output: Union[str, float, bool, object]
+
+    start: datetime
+
+    type: Literal["waitForEvent"]
+
+
+Step: TypeAlias = Union[StepUnionMember0, StepUnionMember1, StepUnionMember2, StepUnionMember3]
+
+
+class Trigger(BaseModel):
+    source: Literal["unknown", "api", "binding", "event", "cron"]
+
+
+class InstanceGetResponse(BaseModel):
+    end: Optional[datetime] = None
+
+    error: Optional[Error] = None
+
+    output: Union[str, float]
+
+    params: object
+
+    queued: datetime
+
+    start: Optional[datetime] = None
+
+    status: Literal["queued", "running", "paused", "errored", "terminated", "complete", "waitingForPause", "waiting"]
+
+    steps: List[Step]
+
+    success: Optional[bool] = None
+
+    trigger: Trigger
+
+    version_id: str = FieldInfo(alias="versionId")
diff --git a/src/cloudflare/types/workflows/instance_list_params.py b/src/cloudflare/types/workflows/instance_list_params.py
new file mode 100644
index 00000000000..d9089e1c690
--- /dev/null
+++ b/src/cloudflare/types/workflows/instance_list_params.py
@@ -0,0 +1,37 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["InstanceListParams"]
+
+
+class InstanceListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    cursor: str
+    """`page` and `cursor` are mutually exclusive, use one or the other."""
+
+    date_end: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """Accepts ISO 8601 with no timezone offsets and in UTC."""
+
+    date_start: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """Accepts ISO 8601 with no timezone offsets and in UTC."""
+
+    direction: Literal["asc", "desc"]
+    """
+    should only be used when `cursor` is used, defines a new direction for the
+    cursor
+    """
+
+    page: float
+    """`page` and `cursor` are mutually exclusive, use one or the other."""
+
+    per_page: float
+
+    status: Literal["queued", "running", "paused", "errored", "terminated", "complete", "waitingForPause", "waiting"]
diff --git a/src/cloudflare/types/workflows/instance_list_response.py b/src/cloudflare/types/workflows/instance_list_response.py
new file mode 100644
index 00000000000..55cd8725f13
--- /dev/null
+++ b/src/cloudflare/types/workflows/instance_list_response.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["InstanceListResponse"]
+
+
+class InstanceListResponse(BaseModel):
+    id: str
+
+    created_on: datetime
+
+    ended_on: Optional[datetime] = None
+
+    modified_on: datetime
+
+    started_on: Optional[datetime] = None
+
+    status: Literal["queued", "running", "paused", "errored", "terminated", "complete", "waitingForPause", "waiting"]
+
+    version_id: str
+
+    workflow_id: str
diff --git a/src/cloudflare/types/workflows/instances/__init__.py b/src/cloudflare/types/workflows/instances/__init__.py
new file mode 100644
index 00000000000..66347d6448a
--- /dev/null
+++ b/src/cloudflare/types/workflows/instances/__init__.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .status_edit_params import StatusEditParams as StatusEditParams
+from .event_create_params import EventCreateParams as EventCreateParams
+from .status_edit_response import StatusEditResponse as StatusEditResponse
diff --git a/src/cloudflare/types/workflows/instances/event_create_params.py b/src/cloudflare/types/workflows/instances/event_create_params.py
new file mode 100644
index 00000000000..52118424ae5
--- /dev/null
+++ b/src/cloudflare/types/workflows/instances/event_create_params.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["EventCreateParams"]
+
+
+class EventCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    workflow_name: Required[str]
+
+    instance_id: Required[str]
+
+    body: object
diff --git a/src/cloudflare/types/workflows/instances/status_edit_params.py b/src/cloudflare/types/workflows/instances/status_edit_params.py
new file mode 100644
index 00000000000..d70d048a1ee
--- /dev/null
+++ b/src/cloudflare/types/workflows/instances/status_edit_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["StatusEditParams"]
+
+
+class StatusEditParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    workflow_name: Required[str]
+
+    status: Required[Literal["resume", "pause", "terminate", "restart"]]
+    """Apply action to instance."""
diff --git a/src/cloudflare/types/workflows/instances/status_edit_response.py b/src/cloudflare/types/workflows/instances/status_edit_response.py
new file mode 100644
index 00000000000..67d6f6e98c2
--- /dev/null
+++ b/src/cloudflare/types/workflows/instances/status_edit_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["StatusEditResponse"]
+
+
+class StatusEditResponse(BaseModel):
+    status: Literal["queued", "running", "paused", "errored", "terminated", "complete", "waitingForPause", "waiting"]
+
+    timestamp: datetime
+    """Accepts ISO 8601 with no timezone offsets and in UTC."""
diff --git a/src/cloudflare/types/workflows/version_get_response.py b/src/cloudflare/types/workflows/version_get_response.py
new file mode 100644
index 00000000000..e0c679c5704
--- /dev/null
+++ b/src/cloudflare/types/workflows/version_get_response.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["VersionGetResponse"]
+
+
+class VersionGetResponse(BaseModel):
+    id: str
+
+    class_name: str
+
+    created_on: datetime
+
+    modified_on: datetime
+
+    workflow_id: str
diff --git a/src/cloudflare/types/workflows/version_list_params.py b/src/cloudflare/types/workflows/version_list_params.py
new file mode 100644
index 00000000000..05e3c443227
--- /dev/null
+++ b/src/cloudflare/types/workflows/version_list_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["VersionListParams"]
+
+
+class VersionListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    page: float
+
+    per_page: float
diff --git a/src/cloudflare/types/workflows/version_list_response.py b/src/cloudflare/types/workflows/version_list_response.py
new file mode 100644
index 00000000000..573299922a3
--- /dev/null
+++ b/src/cloudflare/types/workflows/version_list_response.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["VersionListResponse"]
+
+
+class VersionListResponse(BaseModel):
+    id: str
+
+    class_name: str
+
+    created_on: datetime
+
+    modified_on: datetime
+
+    workflow_id: str
diff --git a/src/cloudflare/types/workflows/workflow_delete_response.py b/src/cloudflare/types/workflows/workflow_delete_response.py
new file mode 100644
index 00000000000..f007188a89e
--- /dev/null
+++ b/src/cloudflare/types/workflows/workflow_delete_response.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["WorkflowDeleteResponse"]
+
+
+class WorkflowDeleteResponse(BaseModel):
+    status: Literal["ok"]
+
+    success: Optional[bool] = None
diff --git a/src/cloudflare/types/workflows/workflow_get_response.py b/src/cloudflare/types/workflows/workflow_get_response.py
new file mode 100644
index 00000000000..8f3a4dd7da4
--- /dev/null
+++ b/src/cloudflare/types/workflows/workflow_get_response.py
@@ -0,0 +1,46 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["WorkflowGetResponse", "Instances"]
+
+
+class Instances(BaseModel):
+    complete: Optional[float] = None
+
+    errored: Optional[float] = None
+
+    paused: Optional[float] = None
+
+    queued: Optional[float] = None
+
+    running: Optional[float] = None
+
+    terminated: Optional[float] = None
+
+    waiting: Optional[float] = None
+
+    waiting_for_pause: Optional[float] = FieldInfo(alias="waitingForPause", default=None)
+
+
+class WorkflowGetResponse(BaseModel):
+    id: str
+
+    class_name: str
+
+    created_on: datetime
+
+    instances: Instances
+
+    modified_on: datetime
+
+    name: str
+
+    script_name: str
+
+    triggered_on: Optional[datetime] = None
diff --git a/src/cloudflare/types/workflows/workflow_list_params.py b/src/cloudflare/types/workflows/workflow_list_params.py
new file mode 100644
index 00000000000..8c5c598864e
--- /dev/null
+++ b/src/cloudflare/types/workflows/workflow_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["WorkflowListParams"]
+
+
+class WorkflowListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    page: float
+
+    per_page: float
+
+    search: str
+    """Allows filtering workflows` name."""
diff --git a/src/cloudflare/types/workflows/workflow_list_response.py b/src/cloudflare/types/workflows/workflow_list_response.py
new file mode 100644
index 00000000000..0e088079fae
--- /dev/null
+++ b/src/cloudflare/types/workflows/workflow_list_response.py
@@ -0,0 +1,46 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["WorkflowListResponse", "Instances"]
+
+
+class Instances(BaseModel):
+    complete: Optional[float] = None
+
+    errored: Optional[float] = None
+
+    paused: Optional[float] = None
+
+    queued: Optional[float] = None
+
+    running: Optional[float] = None
+
+    terminated: Optional[float] = None
+
+    waiting: Optional[float] = None
+
+    waiting_for_pause: Optional[float] = FieldInfo(alias="waitingForPause", default=None)
+
+
+class WorkflowListResponse(BaseModel):
+    id: str
+
+    class_name: str
+
+    created_on: datetime
+
+    instances: Instances
+
+    modified_on: datetime
+
+    name: str
+
+    script_name: str
+
+    triggered_on: Optional[datetime] = None
diff --git a/src/cloudflare/types/workflows/workflow_update_params.py b/src/cloudflare/types/workflows/workflow_update_params.py
new file mode 100644
index 00000000000..3cc22a14961
--- /dev/null
+++ b/src/cloudflare/types/workflows/workflow_update_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["WorkflowUpdateParams"]
+
+
+class WorkflowUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    class_name: Required[str]
+
+    script_name: Required[str]
diff --git a/src/cloudflare/types/workflows/workflow_update_response.py b/src/cloudflare/types/workflows/workflow_update_response.py
new file mode 100644
index 00000000000..efbe8df575a
--- /dev/null
+++ b/src/cloudflare/types/workflows/workflow_update_response.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ..._models import BaseModel
+
+__all__ = ["WorkflowUpdateResponse"]
+
+
+class WorkflowUpdateResponse(BaseModel):
+    id: str
+
+    class_name: str
+
+    created_on: datetime
+
+    is_deleted: float
+
+    modified_on: datetime
+
+    name: str
+
+    script_name: str
+
+    terminator_running: float
+
+    triggered_on: Optional[datetime] = None
+
+    version_id: str
diff --git a/src/cloudflare/types/zaraz/__init__.py b/src/cloudflare/types/zaraz/__init__.py
new file mode 100644
index 00000000000..7d3831e23ce
--- /dev/null
+++ b/src/cloudflare/types/zaraz/__init__.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .workflow import Workflow as Workflow
+from .neo_event import NeoEvent as NeoEvent
+from .configuration import Configuration as Configuration
+from .neo_event_param import NeoEventParam as NeoEventParam
+from .history_list_params import HistoryListParams as HistoryListParams
+from .zaraz_update_params import ZarazUpdateParams as ZarazUpdateParams
+from .config_update_params import ConfigUpdateParams as ConfigUpdateParams
+from .history_list_response import HistoryListResponse as HistoryListResponse
+from .history_update_params import HistoryUpdateParams as HistoryUpdateParams
+from .publish_create_params import PublishCreateParams as PublishCreateParams
+from .button_text_translation import ButtonTextTranslation as ButtonTextTranslation
+from .publish_create_response import PublishCreateResponse as PublishCreateResponse
+from .button_text_translation_param import ButtonTextTranslationParam as ButtonTextTranslationParam
diff --git a/src/cloudflare/types/zaraz/button_text_translation.py b/src/cloudflare/types/zaraz/button_text_translation.py
new file mode 100644
index 00000000000..975accd91f8
--- /dev/null
+++ b/src/cloudflare/types/zaraz/button_text_translation.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict
+
+from ..._models import BaseModel
+
+__all__ = ["ButtonTextTranslation"]
+
+
+class ButtonTextTranslation(BaseModel):
+    accept_all: Dict[str, str]
+    """Object where keys are language codes"""
+
+    confirm_my_choices: Dict[str, str]
+    """Object where keys are language codes"""
+
+    reject_all: Dict[str, str]
+    """Object where keys are language codes"""
diff --git a/src/cloudflare/types/zaraz/button_text_translation_param.py b/src/cloudflare/types/zaraz/button_text_translation_param.py
new file mode 100644
index 00000000000..5458fbecd65
--- /dev/null
+++ b/src/cloudflare/types/zaraz/button_text_translation_param.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ButtonTextTranslationParam"]
+
+
+class ButtonTextTranslationParam(TypedDict, total=False):
+    accept_all: Required[Dict[str, str]]
+    """Object where keys are language codes"""
+
+    confirm_my_choices: Required[Dict[str, str]]
+    """Object where keys are language codes"""
+
+    reject_all: Required[Dict[str, str]]
+    """Object where keys are language codes"""
diff --git a/src/cloudflare/types/zaraz/config_update_params.py b/src/cloudflare/types/zaraz/config_update_params.py
new file mode 100644
index 00000000000..23c30f8c52f
--- /dev/null
+++ b/src/cloudflare/types/zaraz/config_update_params.py
@@ -0,0 +1,623 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, Union, Iterable
+from typing_extensions import Literal, Required, Annotated, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+from .neo_event_param import NeoEventParam
+from .button_text_translation_param import ButtonTextTranslationParam
+
+__all__ = [
+    "ConfigUpdateParams",
+    "Settings",
+    "SettingsContextEnricher",
+    "Tools",
+    "ToolsZarazManagedComponent",
+    "ToolsWorker",
+    "ToolsWorkerWorker",
+    "Triggers",
+    "TriggersExcludeRule",
+    "TriggersExcludeRuleZarazLoadRule",
+    "TriggersExcludeRuleZarazClickListenerRule",
+    "TriggersExcludeRuleZarazClickListenerRuleSettings",
+    "TriggersExcludeRuleZarazTimerRule",
+    "TriggersExcludeRuleZarazTimerRuleSettings",
+    "TriggersExcludeRuleZarazFormSubmissionRule",
+    "TriggersExcludeRuleZarazFormSubmissionRuleSettings",
+    "TriggersExcludeRuleZarazVariableMatchRule",
+    "TriggersExcludeRuleZarazVariableMatchRuleSettings",
+    "TriggersExcludeRuleZarazScrollDepthRule",
+    "TriggersExcludeRuleZarazScrollDepthRuleSettings",
+    "TriggersExcludeRuleZarazElementVisibilityRule",
+    "TriggersExcludeRuleZarazElementVisibilityRuleSettings",
+    "TriggersLoadRule",
+    "TriggersLoadRuleZarazLoadRule",
+    "TriggersLoadRuleZarazClickListenerRule",
+    "TriggersLoadRuleZarazClickListenerRuleSettings",
+    "TriggersLoadRuleZarazTimerRule",
+    "TriggersLoadRuleZarazTimerRuleSettings",
+    "TriggersLoadRuleZarazFormSubmissionRule",
+    "TriggersLoadRuleZarazFormSubmissionRuleSettings",
+    "TriggersLoadRuleZarazVariableMatchRule",
+    "TriggersLoadRuleZarazVariableMatchRuleSettings",
+    "TriggersLoadRuleZarazScrollDepthRule",
+    "TriggersLoadRuleZarazScrollDepthRuleSettings",
+    "TriggersLoadRuleZarazElementVisibilityRule",
+    "TriggersLoadRuleZarazElementVisibilityRuleSettings",
+    "Variables",
+    "VariablesZarazStringVariable",
+    "VariablesZarazSecretVariable",
+    "VariablesZarazWorkerVariable",
+    "VariablesZarazWorkerVariableValue",
+    "Analytics",
+    "Consent",
+    "ConsentPurposes",
+    "ConsentPurposesWithTranslations",
+]
+
+
+class ConfigUpdateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    data_layer: Required[Annotated[bool, PropertyInfo(alias="dataLayer")]]
+    """Data layer compatibility mode enabled."""
+
+    debug_key: Required[Annotated[str, PropertyInfo(alias="debugKey")]]
+    """The key for Zaraz debug mode."""
+
+    settings: Required[Settings]
+    """General Zaraz settings."""
+
+    tools: Required[Dict[str, Tools]]
+    """
+    Tools set up under Zaraz configuration, where key is the alpha-numeric tool ID
+    and value is the tool configuration object.
+    """
+
+    triggers: Required[Dict[str, Triggers]]
+    """
+    Triggers set up under Zaraz configuration, where key is the trigger
+    alpha-numeric ID and value is the trigger configuration.
+    """
+
+    variables: Required[Dict[str, Variables]]
+    """
+    Variables set up under Zaraz configuration, where key is the variable
+    alpha-numeric ID and value is the variable configuration. Values of variables of
+    type secret are not included.
+    """
+
+    zaraz_version: Required[Annotated[int, PropertyInfo(alias="zarazVersion")]]
+    """Zaraz internal version of the config."""
+
+    analytics: Analytics
+    """Cloudflare Monitoring settings."""
+
+    consent: Consent
+    """Consent management configuration."""
+
+    history_change: Annotated[bool, PropertyInfo(alias="historyChange")]
+    """Single Page Application support enabled."""
+
+
+class SettingsContextEnricher(TypedDict, total=False):
+    """Details of the worker that receives and edits Zaraz Context object."""
+
+    escaped_worker_name: Required[Annotated[str, PropertyInfo(alias="escapedWorkerName")]]
+
+    worker_tag: Required[Annotated[str, PropertyInfo(alias="workerTag")]]
+
+
+class Settings(TypedDict, total=False):
+    """General Zaraz settings."""
+
+    auto_inject_script: Required[Annotated[bool, PropertyInfo(alias="autoInjectScript")]]
+    """Automatic injection of Zaraz scripts enabled."""
+
+    context_enricher: Annotated[SettingsContextEnricher, PropertyInfo(alias="contextEnricher")]
+    """Details of the worker that receives and edits Zaraz Context object."""
+
+    cookie_domain: Annotated[str, PropertyInfo(alias="cookieDomain")]
+    """The domain Zaraz will use for writing and reading its cookies."""
+
+    ecommerce: bool
+    """Ecommerce API enabled."""
+
+    events_api_path: Annotated[str, PropertyInfo(alias="eventsApiPath")]
+    """Custom endpoint for server-side track events."""
+
+    hide_external_referer: Annotated[bool, PropertyInfo(alias="hideExternalReferer")]
+    """Hiding external referrer URL enabled."""
+
+    hide_ip_address: Annotated[bool, PropertyInfo(alias="hideIPAddress")]
+    """Trimming IP address enabled."""
+
+    hide_query_params: Annotated[bool, PropertyInfo(alias="hideQueryParams")]
+    """Removing URL query params enabled."""
+
+    hide_user_agent: Annotated[bool, PropertyInfo(alias="hideUserAgent")]
+    """Removing sensitive data from User Aagent string enabled."""
+
+    init_path: Annotated[str, PropertyInfo(alias="initPath")]
+    """Custom endpoint for Zaraz init script."""
+
+    inject_iframes: Annotated[bool, PropertyInfo(alias="injectIframes")]
+    """Injection of Zaraz scripts into iframes enabled."""
+
+    mc_root_path: Annotated[str, PropertyInfo(alias="mcRootPath")]
+    """Custom path for Managed Components server functionalities."""
+
+    script_path: Annotated[str, PropertyInfo(alias="scriptPath")]
+    """Custom endpoint for Zaraz main script."""
+
+    track_path: Annotated[str, PropertyInfo(alias="trackPath")]
+    """Custom endpoint for Zaraz tracking requests."""
+
+
+class ToolsZarazManagedComponent(TypedDict, total=False):
+    blocking_triggers: Required[Annotated[SequenceNotStr[str], PropertyInfo(alias="blockingTriggers")]]
+    """List of blocking trigger IDs"""
+
+    component: Required[str]
+    """Tool's internal name"""
+
+    default_fields: Required[Annotated[Dict[str, Union[str, bool]], PropertyInfo(alias="defaultFields")]]
+    """Default fields for tool's actions"""
+
+    enabled: Required[bool]
+    """Whether tool is enabled"""
+
+    name: Required[str]
+    """Tool's name defined by the user"""
+
+    permissions: Required[SequenceNotStr[str]]
+    """List of permissions granted to the component"""
+
+    settings: Required[Dict[str, Union[str, bool]]]
+    """Tool's settings"""
+
+    type: Required[Literal["component"]]
+
+    actions: Dict[str, NeoEventParam]
+    """Actions configured on a tool. Either this or neoEvents field is required."""
+
+    default_purpose: Annotated[str, PropertyInfo(alias="defaultPurpose")]
+    """Default consent purpose ID"""
+
+    neo_events: Annotated[Iterable[NeoEventParam], PropertyInfo(alias="neoEvents")]
+    """DEPRECATED - List of actions configured on a tool.
+
+    Either this or actions field is required. If both are present, actions field
+    will take precedence.
+    """
+
+    vendor_name: Annotated[str, PropertyInfo(alias="vendorName")]
+    """
+    Vendor name for TCF compliant consent modal, required for Custom Managed
+    Components and Custom HTML tool with a defaultPurpose assigned
+    """
+
+    vendor_policy_url: Annotated[str, PropertyInfo(alias="vendorPolicyUrl")]
+    """
+    Vendor's Privacy Policy URL for TCF compliant consent modal, required for Custom
+    Managed Components and Custom HTML tool with a defaultPurpose assigned
+    """
+
+
+class ToolsWorkerWorker(TypedDict, total=False):
+    """Cloudflare worker that acts as a managed component"""
+
+    escaped_worker_name: Required[Annotated[str, PropertyInfo(alias="escapedWorkerName")]]
+
+    worker_tag: Required[Annotated[str, PropertyInfo(alias="workerTag")]]
+
+
+class ToolsWorker(TypedDict, total=False):
+    blocking_triggers: Required[Annotated[SequenceNotStr[str], PropertyInfo(alias="blockingTriggers")]]
+    """List of blocking trigger IDs"""
+
+    component: Required[str]
+    """Tool's internal name"""
+
+    default_fields: Required[Annotated[Dict[str, Union[str, bool]], PropertyInfo(alias="defaultFields")]]
+    """Default fields for tool's actions"""
+
+    enabled: Required[bool]
+    """Whether tool is enabled"""
+
+    name: Required[str]
+    """Tool's name defined by the user"""
+
+    permissions: Required[SequenceNotStr[str]]
+    """List of permissions granted to the component"""
+
+    settings: Required[Dict[str, Union[str, bool]]]
+    """Tool's settings"""
+
+    type: Required[Literal["custom-mc"]]
+
+    worker: Required[ToolsWorkerWorker]
+    """Cloudflare worker that acts as a managed component"""
+
+    actions: Dict[str, NeoEventParam]
+    """Actions configured on a tool. Either this or neoEvents field is required."""
+
+    default_purpose: Annotated[str, PropertyInfo(alias="defaultPurpose")]
+    """Default consent purpose ID"""
+
+    neo_events: Annotated[Iterable[NeoEventParam], PropertyInfo(alias="neoEvents")]
+    """DEPRECATED - List of actions configured on a tool.
+
+    Either this or actions field is required. If both are present, actions field
+    will take precedence.
+    """
+
+    vendor_name: Annotated[str, PropertyInfo(alias="vendorName")]
+    """
+    Vendor name for TCF compliant consent modal, required for Custom Managed
+    Components and Custom HTML tool with a defaultPurpose assigned
+    """
+
+    vendor_policy_url: Annotated[str, PropertyInfo(alias="vendorPolicyUrl")]
+    """
+    Vendor's Privacy Policy URL for TCF compliant consent modal, required for Custom
+    Managed Components and Custom HTML tool with a defaultPurpose assigned
+    """
+
+
+Tools: TypeAlias = Union[ToolsZarazManagedComponent, ToolsWorker]
+
+
+class TriggersExcludeRuleZarazLoadRule(TypedDict, total=False):
+    id: Required[str]
+
+    match: Required[str]
+
+    op: Required[
+        Literal[
+            "CONTAINS",
+            "EQUALS",
+            "STARTS_WITH",
+            "ENDS_WITH",
+            "MATCH_REGEX",
+            "NOT_MATCH_REGEX",
+            "GREATER_THAN",
+            "GREATER_THAN_OR_EQUAL",
+            "LESS_THAN",
+            "LESS_THAN_OR_EQUAL",
+        ]
+    ]
+
+    value: Required[str]
+
+
+class TriggersExcludeRuleZarazClickListenerRuleSettings(TypedDict, total=False):
+    selector: Required[str]
+
+    type: Required[Literal["xpath", "css"]]
+
+    wait_for_tags: Required[Annotated[int, PropertyInfo(alias="waitForTags")]]
+
+
+class TriggersExcludeRuleZarazClickListenerRule(TypedDict, total=False):
+    id: Required[str]
+
+    action: Required[Literal["clickListener"]]
+
+    settings: Required[TriggersExcludeRuleZarazClickListenerRuleSettings]
+
+
+class TriggersExcludeRuleZarazTimerRuleSettings(TypedDict, total=False):
+    interval: Required[int]
+
+    limit: Required[int]
+
+
+class TriggersExcludeRuleZarazTimerRule(TypedDict, total=False):
+    id: Required[str]
+
+    action: Required[Literal["timer"]]
+
+    settings: Required[TriggersExcludeRuleZarazTimerRuleSettings]
+
+
+class TriggersExcludeRuleZarazFormSubmissionRuleSettings(TypedDict, total=False):
+    selector: Required[str]
+
+    validate: Required[bool]
+
+
+class TriggersExcludeRuleZarazFormSubmissionRule(TypedDict, total=False):
+    id: Required[str]
+
+    action: Required[Literal["formSubmission"]]
+
+    settings: Required[TriggersExcludeRuleZarazFormSubmissionRuleSettings]
+
+
+class TriggersExcludeRuleZarazVariableMatchRuleSettings(TypedDict, total=False):
+    match: Required[str]
+
+    variable: Required[str]
+
+
+class TriggersExcludeRuleZarazVariableMatchRule(TypedDict, total=False):
+    id: Required[str]
+
+    action: Required[Literal["variableMatch"]]
+
+    settings: Required[TriggersExcludeRuleZarazVariableMatchRuleSettings]
+
+
+class TriggersExcludeRuleZarazScrollDepthRuleSettings(TypedDict, total=False):
+    positions: Required[str]
+
+
+class TriggersExcludeRuleZarazScrollDepthRule(TypedDict, total=False):
+    id: Required[str]
+
+    action: Required[Literal["scrollDepth"]]
+
+    settings: Required[TriggersExcludeRuleZarazScrollDepthRuleSettings]
+
+
+class TriggersExcludeRuleZarazElementVisibilityRuleSettings(TypedDict, total=False):
+    selector: Required[str]
+
+
+class TriggersExcludeRuleZarazElementVisibilityRule(TypedDict, total=False):
+    id: Required[str]
+
+    action: Required[Literal["elementVisibility"]]
+
+    settings: Required[TriggersExcludeRuleZarazElementVisibilityRuleSettings]
+
+
+TriggersExcludeRule: TypeAlias = Union[
+    TriggersExcludeRuleZarazLoadRule,
+    TriggersExcludeRuleZarazClickListenerRule,
+    TriggersExcludeRuleZarazTimerRule,
+    TriggersExcludeRuleZarazFormSubmissionRule,
+    TriggersExcludeRuleZarazVariableMatchRule,
+    TriggersExcludeRuleZarazScrollDepthRule,
+    TriggersExcludeRuleZarazElementVisibilityRule,
+]
+
+
+class TriggersLoadRuleZarazLoadRule(TypedDict, total=False):
+    id: Required[str]
+
+    match: Required[str]
+
+    op: Required[
+        Literal[
+            "CONTAINS",
+            "EQUALS",
+            "STARTS_WITH",
+            "ENDS_WITH",
+            "MATCH_REGEX",
+            "NOT_MATCH_REGEX",
+            "GREATER_THAN",
+            "GREATER_THAN_OR_EQUAL",
+            "LESS_THAN",
+            "LESS_THAN_OR_EQUAL",
+        ]
+    ]
+
+    value: Required[str]
+
+
+class TriggersLoadRuleZarazClickListenerRuleSettings(TypedDict, total=False):
+    selector: Required[str]
+
+    type: Required[Literal["xpath", "css"]]
+
+    wait_for_tags: Required[Annotated[int, PropertyInfo(alias="waitForTags")]]
+
+
+class TriggersLoadRuleZarazClickListenerRule(TypedDict, total=False):
+    id: Required[str]
+
+    action: Required[Literal["clickListener"]]
+
+    settings: Required[TriggersLoadRuleZarazClickListenerRuleSettings]
+
+
+class TriggersLoadRuleZarazTimerRuleSettings(TypedDict, total=False):
+    interval: Required[int]
+
+    limit: Required[int]
+
+
+class TriggersLoadRuleZarazTimerRule(TypedDict, total=False):
+    id: Required[str]
+
+    action: Required[Literal["timer"]]
+
+    settings: Required[TriggersLoadRuleZarazTimerRuleSettings]
+
+
+class TriggersLoadRuleZarazFormSubmissionRuleSettings(TypedDict, total=False):
+    selector: Required[str]
+
+    validate: Required[bool]
+
+
+class TriggersLoadRuleZarazFormSubmissionRule(TypedDict, total=False):
+    id: Required[str]
+
+    action: Required[Literal["formSubmission"]]
+
+    settings: Required[TriggersLoadRuleZarazFormSubmissionRuleSettings]
+
+
+class TriggersLoadRuleZarazVariableMatchRuleSettings(TypedDict, total=False):
+    match: Required[str]
+
+    variable: Required[str]
+
+
+class TriggersLoadRuleZarazVariableMatchRule(TypedDict, total=False):
+    id: Required[str]
+
+    action: Required[Literal["variableMatch"]]
+
+    settings: Required[TriggersLoadRuleZarazVariableMatchRuleSettings]
+
+
+class TriggersLoadRuleZarazScrollDepthRuleSettings(TypedDict, total=False):
+    positions: Required[str]
+
+
+class TriggersLoadRuleZarazScrollDepthRule(TypedDict, total=False):
+    id: Required[str]
+
+    action: Required[Literal["scrollDepth"]]
+
+    settings: Required[TriggersLoadRuleZarazScrollDepthRuleSettings]
+
+
+class TriggersLoadRuleZarazElementVisibilityRuleSettings(TypedDict, total=False):
+    selector: Required[str]
+
+
+class TriggersLoadRuleZarazElementVisibilityRule(TypedDict, total=False):
+    id: Required[str]
+
+    action: Required[Literal["elementVisibility"]]
+
+    settings: Required[TriggersLoadRuleZarazElementVisibilityRuleSettings]
+
+
+TriggersLoadRule: TypeAlias = Union[
+    TriggersLoadRuleZarazLoadRule,
+    TriggersLoadRuleZarazClickListenerRule,
+    TriggersLoadRuleZarazTimerRule,
+    TriggersLoadRuleZarazFormSubmissionRule,
+    TriggersLoadRuleZarazVariableMatchRule,
+    TriggersLoadRuleZarazScrollDepthRule,
+    TriggersLoadRuleZarazElementVisibilityRule,
+]
+
+
+class Triggers(TypedDict, total=False):
+    exclude_rules: Required[Annotated[Iterable[TriggersExcludeRule], PropertyInfo(alias="excludeRules")]]
+    """Rules defining when the trigger is not fired."""
+
+    load_rules: Required[Annotated[Iterable[TriggersLoadRule], PropertyInfo(alias="loadRules")]]
+    """Rules defining when the trigger is fired."""
+
+    name: Required[str]
+    """Trigger name."""
+
+    description: str
+    """Trigger description."""
+
+    system: Literal["pageload"]
+
+
+class VariablesZarazStringVariable(TypedDict, total=False):
+    name: Required[str]
+
+    type: Required[Literal["string"]]
+
+    value: Required[str]
+
+
+class VariablesZarazSecretVariable(TypedDict, total=False):
+    name: Required[str]
+
+    type: Required[Literal["secret"]]
+
+    value: Required[str]
+
+
+class VariablesZarazWorkerVariableValue(TypedDict, total=False):
+    escaped_worker_name: Required[Annotated[str, PropertyInfo(alias="escapedWorkerName")]]
+
+    worker_tag: Required[Annotated[str, PropertyInfo(alias="workerTag")]]
+
+
+class VariablesZarazWorkerVariable(TypedDict, total=False):
+    name: Required[str]
+
+    type: Required[Literal["worker"]]
+
+    value: Required[VariablesZarazWorkerVariableValue]
+
+
+Variables: TypeAlias = Union[VariablesZarazStringVariable, VariablesZarazSecretVariable, VariablesZarazWorkerVariable]
+
+
+class Analytics(TypedDict, total=False):
+    """Cloudflare Monitoring settings."""
+
+    default_purpose: Annotated[str, PropertyInfo(alias="defaultPurpose")]
+    """Consent purpose assigned to Monitoring."""
+
+    enabled: bool
+    """Whether Advanced Monitoring reports are enabled."""
+
+    session_exp_time: Annotated[int, PropertyInfo(alias="sessionExpTime")]
+    """Session expiration time (seconds)."""
+
+
+class ConsentPurposes(TypedDict, total=False):
+    description: Required[str]
+
+    name: Required[str]
+
+
+class ConsentPurposesWithTranslations(TypedDict, total=False):
+    description: Required[Dict[str, str]]
+    """Object where keys are language codes"""
+
+    name: Required[Dict[str, str]]
+    """Object where keys are language codes"""
+
+    order: Required[int]
+
+
+class Consent(TypedDict, total=False):
+    """Consent management configuration."""
+
+    enabled: Required[bool]
+
+    button_text_translations: Annotated[ButtonTextTranslationParam, PropertyInfo(alias="buttonTextTranslations")]
+
+    company_email: Annotated[str, PropertyInfo(alias="companyEmail")]
+
+    company_name: Annotated[str, PropertyInfo(alias="companyName")]
+
+    company_street_address: Annotated[str, PropertyInfo(alias="companyStreetAddress")]
+
+    consent_modal_intro_html: Annotated[str, PropertyInfo(alias="consentModalIntroHTML")]
+
+    consent_modal_intro_html_with_translations: Annotated[
+        Dict[str, str], PropertyInfo(alias="consentModalIntroHTMLWithTranslations")
+    ]
+    """Object where keys are language codes"""
+
+    cookie_name: Annotated[str, PropertyInfo(alias="cookieName")]
+
+    custom_css: Annotated[str, PropertyInfo(alias="customCSS")]
+
+    custom_intro_disclaimer_dismissed: Annotated[bool, PropertyInfo(alias="customIntroDisclaimerDismissed")]
+
+    default_language: Annotated[str, PropertyInfo(alias="defaultLanguage")]
+
+    hide_modal: Annotated[bool, PropertyInfo(alias="hideModal")]
+
+    purposes: Dict[str, ConsentPurposes]
+    """Object where keys are purpose alpha-numeric IDs"""
+
+    purposes_with_translations: Annotated[
+        Dict[str, ConsentPurposesWithTranslations], PropertyInfo(alias="purposesWithTranslations")
+    ]
+    """Object where keys are purpose alpha-numeric IDs"""
+
+    tcf_compliant: Annotated[bool, PropertyInfo(alias="tcfCompliant")]
diff --git a/src/cloudflare/types/zaraz/configuration.py b/src/cloudflare/types/zaraz/configuration.py
new file mode 100644
index 00000000000..a23ddca1138
--- /dev/null
+++ b/src/cloudflare/types/zaraz/configuration.py
@@ -0,0 +1,621 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ..._utils import PropertyInfo
+from ..._models import BaseModel
+from .neo_event import NeoEvent
+from .button_text_translation import ButtonTextTranslation
+
+__all__ = [
+    "Configuration",
+    "Settings",
+    "SettingsContextEnricher",
+    "Tools",
+    "ToolsZarazManagedComponent",
+    "ToolsWorker",
+    "ToolsWorkerWorker",
+    "Triggers",
+    "TriggersExcludeRule",
+    "TriggersExcludeRuleZarazLoadRule",
+    "TriggersExcludeRuleZarazClickListenerRule",
+    "TriggersExcludeRuleZarazClickListenerRuleSettings",
+    "TriggersExcludeRuleZarazTimerRule",
+    "TriggersExcludeRuleZarazTimerRuleSettings",
+    "TriggersExcludeRuleZarazFormSubmissionRule",
+    "TriggersExcludeRuleZarazFormSubmissionRuleSettings",
+    "TriggersExcludeRuleZarazVariableMatchRule",
+    "TriggersExcludeRuleZarazVariableMatchRuleSettings",
+    "TriggersExcludeRuleZarazScrollDepthRule",
+    "TriggersExcludeRuleZarazScrollDepthRuleSettings",
+    "TriggersExcludeRuleZarazElementVisibilityRule",
+    "TriggersExcludeRuleZarazElementVisibilityRuleSettings",
+    "TriggersLoadRule",
+    "TriggersLoadRuleZarazLoadRule",
+    "TriggersLoadRuleZarazClickListenerRule",
+    "TriggersLoadRuleZarazClickListenerRuleSettings",
+    "TriggersLoadRuleZarazTimerRule",
+    "TriggersLoadRuleZarazTimerRuleSettings",
+    "TriggersLoadRuleZarazFormSubmissionRule",
+    "TriggersLoadRuleZarazFormSubmissionRuleSettings",
+    "TriggersLoadRuleZarazVariableMatchRule",
+    "TriggersLoadRuleZarazVariableMatchRuleSettings",
+    "TriggersLoadRuleZarazScrollDepthRule",
+    "TriggersLoadRuleZarazScrollDepthRuleSettings",
+    "TriggersLoadRuleZarazElementVisibilityRule",
+    "TriggersLoadRuleZarazElementVisibilityRuleSettings",
+    "Variables",
+    "VariablesZarazStringVariable",
+    "VariablesZarazSecretVariable",
+    "VariablesZarazWorkerVariable",
+    "VariablesZarazWorkerVariableValue",
+    "Analytics",
+    "Consent",
+    "ConsentPurposes",
+    "ConsentPurposesWithTranslations",
+]
+
+
+class SettingsContextEnricher(BaseModel):
+    """Details of the worker that receives and edits Zaraz Context object."""
+
+    escaped_worker_name: str = FieldInfo(alias="escapedWorkerName")
+
+    worker_tag: str = FieldInfo(alias="workerTag")
+
+
+class Settings(BaseModel):
+    """General Zaraz settings."""
+
+    auto_inject_script: bool = FieldInfo(alias="autoInjectScript")
+    """Automatic injection of Zaraz scripts enabled."""
+
+    context_enricher: Optional[SettingsContextEnricher] = FieldInfo(alias="contextEnricher", default=None)
+    """Details of the worker that receives and edits Zaraz Context object."""
+
+    cookie_domain: Optional[str] = FieldInfo(alias="cookieDomain", default=None)
+    """The domain Zaraz will use for writing and reading its cookies."""
+
+    ecommerce: Optional[bool] = None
+    """Ecommerce API enabled."""
+
+    events_api_path: Optional[str] = FieldInfo(alias="eventsApiPath", default=None)
+    """Custom endpoint for server-side track events."""
+
+    hide_external_referer: Optional[bool] = FieldInfo(alias="hideExternalReferer", default=None)
+    """Hiding external referrer URL enabled."""
+
+    hide_ip_address: Optional[bool] = FieldInfo(alias="hideIPAddress", default=None)
+    """Trimming IP address enabled."""
+
+    hide_query_params: Optional[bool] = FieldInfo(alias="hideQueryParams", default=None)
+    """Removing URL query params enabled."""
+
+    hide_user_agent: Optional[bool] = FieldInfo(alias="hideUserAgent", default=None)
+    """Removing sensitive data from User Aagent string enabled."""
+
+    init_path: Optional[str] = FieldInfo(alias="initPath", default=None)
+    """Custom endpoint for Zaraz init script."""
+
+    inject_iframes: Optional[bool] = FieldInfo(alias="injectIframes", default=None)
+    """Injection of Zaraz scripts into iframes enabled."""
+
+    mc_root_path: Optional[str] = FieldInfo(alias="mcRootPath", default=None)
+    """Custom path for Managed Components server functionalities."""
+
+    script_path: Optional[str] = FieldInfo(alias="scriptPath", default=None)
+    """Custom endpoint for Zaraz main script."""
+
+    track_path: Optional[str] = FieldInfo(alias="trackPath", default=None)
+    """Custom endpoint for Zaraz tracking requests."""
+
+
+class ToolsZarazManagedComponent(BaseModel):
+    blocking_triggers: List[str] = FieldInfo(alias="blockingTriggers")
+    """List of blocking trigger IDs"""
+
+    component: str
+    """Tool's internal name"""
+
+    default_fields: Dict[str, Union[str, bool]] = FieldInfo(alias="defaultFields")
+    """Default fields for tool's actions"""
+
+    enabled: bool
+    """Whether tool is enabled"""
+
+    name: str
+    """Tool's name defined by the user"""
+
+    permissions: List[str]
+    """List of permissions granted to the component"""
+
+    settings: Dict[str, Union[str, bool]]
+    """Tool's settings"""
+
+    type: Literal["component"]
+
+    actions: Optional[Dict[str, NeoEvent]] = None
+    """Actions configured on a tool. Either this or neoEvents field is required."""
+
+    default_purpose: Optional[str] = FieldInfo(alias="defaultPurpose", default=None)
+    """Default consent purpose ID"""
+
+    neo_events: Optional[List[NeoEvent]] = FieldInfo(alias="neoEvents", default=None)
+    """DEPRECATED - List of actions configured on a tool.
+
+    Either this or actions field is required. If both are present, actions field
+    will take precedence.
+    """
+
+    vendor_name: Optional[str] = FieldInfo(alias="vendorName", default=None)
+    """
+    Vendor name for TCF compliant consent modal, required for Custom Managed
+    Components and Custom HTML tool with a defaultPurpose assigned
+    """
+
+    vendor_policy_url: Optional[str] = FieldInfo(alias="vendorPolicyUrl", default=None)
+    """
+    Vendor's Privacy Policy URL for TCF compliant consent modal, required for Custom
+    Managed Components and Custom HTML tool with a defaultPurpose assigned
+    """
+
+
+class ToolsWorkerWorker(BaseModel):
+    """Cloudflare worker that acts as a managed component"""
+
+    escaped_worker_name: str = FieldInfo(alias="escapedWorkerName")
+
+    worker_tag: str = FieldInfo(alias="workerTag")
+
+
+class ToolsWorker(BaseModel):
+    blocking_triggers: List[str] = FieldInfo(alias="blockingTriggers")
+    """List of blocking trigger IDs"""
+
+    component: str
+    """Tool's internal name"""
+
+    default_fields: Dict[str, Union[str, bool]] = FieldInfo(alias="defaultFields")
+    """Default fields for tool's actions"""
+
+    enabled: bool
+    """Whether tool is enabled"""
+
+    name: str
+    """Tool's name defined by the user"""
+
+    permissions: List[str]
+    """List of permissions granted to the component"""
+
+    settings: Dict[str, Union[str, bool]]
+    """Tool's settings"""
+
+    type: Literal["custom-mc"]
+
+    worker: ToolsWorkerWorker
+    """Cloudflare worker that acts as a managed component"""
+
+    actions: Optional[Dict[str, NeoEvent]] = None
+    """Actions configured on a tool. Either this or neoEvents field is required."""
+
+    default_purpose: Optional[str] = FieldInfo(alias="defaultPurpose", default=None)
+    """Default consent purpose ID"""
+
+    neo_events: Optional[List[NeoEvent]] = FieldInfo(alias="neoEvents", default=None)
+    """DEPRECATED - List of actions configured on a tool.
+
+    Either this or actions field is required. If both are present, actions field
+    will take precedence.
+    """
+
+    vendor_name: Optional[str] = FieldInfo(alias="vendorName", default=None)
+    """
+    Vendor name for TCF compliant consent modal, required for Custom Managed
+    Components and Custom HTML tool with a defaultPurpose assigned
+    """
+
+    vendor_policy_url: Optional[str] = FieldInfo(alias="vendorPolicyUrl", default=None)
+    """
+    Vendor's Privacy Policy URL for TCF compliant consent modal, required for Custom
+    Managed Components and Custom HTML tool with a defaultPurpose assigned
+    """
+
+
+Tools: TypeAlias = Union[ToolsZarazManagedComponent, ToolsWorker]
+
+
+class TriggersExcludeRuleZarazLoadRule(BaseModel):
+    id: str
+
+    match: str
+
+    op: Literal[
+        "CONTAINS",
+        "EQUALS",
+        "STARTS_WITH",
+        "ENDS_WITH",
+        "MATCH_REGEX",
+        "NOT_MATCH_REGEX",
+        "GREATER_THAN",
+        "GREATER_THAN_OR_EQUAL",
+        "LESS_THAN",
+        "LESS_THAN_OR_EQUAL",
+    ]
+
+    value: str
+
+
+class TriggersExcludeRuleZarazClickListenerRuleSettings(BaseModel):
+    selector: str
+
+    type: Literal["xpath", "css"]
+
+    wait_for_tags: int = FieldInfo(alias="waitForTags")
+
+
+class TriggersExcludeRuleZarazClickListenerRule(BaseModel):
+    id: str
+
+    action: Literal["clickListener"]
+
+    settings: TriggersExcludeRuleZarazClickListenerRuleSettings
+
+
+class TriggersExcludeRuleZarazTimerRuleSettings(BaseModel):
+    interval: int
+
+    limit: int
+
+
+class TriggersExcludeRuleZarazTimerRule(BaseModel):
+    id: str
+
+    action: Literal["timer"]
+
+    settings: TriggersExcludeRuleZarazTimerRuleSettings
+
+
+class TriggersExcludeRuleZarazFormSubmissionRuleSettings(BaseModel):
+    selector: str
+
+    validate_: bool = FieldInfo(alias="validate")
+
+
+class TriggersExcludeRuleZarazFormSubmissionRule(BaseModel):
+    id: str
+
+    action: Literal["formSubmission"]
+
+    settings: TriggersExcludeRuleZarazFormSubmissionRuleSettings
+
+
+class TriggersExcludeRuleZarazVariableMatchRuleSettings(BaseModel):
+    match: str
+
+    variable: str
+
+
+class TriggersExcludeRuleZarazVariableMatchRule(BaseModel):
+    id: str
+
+    action: Literal["variableMatch"]
+
+    settings: TriggersExcludeRuleZarazVariableMatchRuleSettings
+
+
+class TriggersExcludeRuleZarazScrollDepthRuleSettings(BaseModel):
+    positions: str
+
+
+class TriggersExcludeRuleZarazScrollDepthRule(BaseModel):
+    id: str
+
+    action: Literal["scrollDepth"]
+
+    settings: TriggersExcludeRuleZarazScrollDepthRuleSettings
+
+
+class TriggersExcludeRuleZarazElementVisibilityRuleSettings(BaseModel):
+    selector: str
+
+
+class TriggersExcludeRuleZarazElementVisibilityRule(BaseModel):
+    id: str
+
+    action: Literal["elementVisibility"]
+
+    settings: TriggersExcludeRuleZarazElementVisibilityRuleSettings
+
+
+TriggersExcludeRule: TypeAlias = Union[
+    TriggersExcludeRuleZarazLoadRule,
+    TriggersExcludeRuleZarazClickListenerRule,
+    TriggersExcludeRuleZarazTimerRule,
+    TriggersExcludeRuleZarazFormSubmissionRule,
+    TriggersExcludeRuleZarazVariableMatchRule,
+    TriggersExcludeRuleZarazScrollDepthRule,
+    TriggersExcludeRuleZarazElementVisibilityRule,
+]
+
+
+class TriggersLoadRuleZarazLoadRule(BaseModel):
+    id: str
+
+    match: str
+
+    op: Literal[
+        "CONTAINS",
+        "EQUALS",
+        "STARTS_WITH",
+        "ENDS_WITH",
+        "MATCH_REGEX",
+        "NOT_MATCH_REGEX",
+        "GREATER_THAN",
+        "GREATER_THAN_OR_EQUAL",
+        "LESS_THAN",
+        "LESS_THAN_OR_EQUAL",
+    ]
+
+    value: str
+
+
+class TriggersLoadRuleZarazClickListenerRuleSettings(BaseModel):
+    selector: str
+
+    type: Literal["xpath", "css"]
+
+    wait_for_tags: int = FieldInfo(alias="waitForTags")
+
+
+class TriggersLoadRuleZarazClickListenerRule(BaseModel):
+    id: str
+
+    action: Literal["clickListener"]
+
+    settings: TriggersLoadRuleZarazClickListenerRuleSettings
+
+
+class TriggersLoadRuleZarazTimerRuleSettings(BaseModel):
+    interval: int
+
+    limit: int
+
+
+class TriggersLoadRuleZarazTimerRule(BaseModel):
+    id: str
+
+    action: Literal["timer"]
+
+    settings: TriggersLoadRuleZarazTimerRuleSettings
+
+
+class TriggersLoadRuleZarazFormSubmissionRuleSettings(BaseModel):
+    selector: str
+
+    validate_: bool = FieldInfo(alias="validate")
+
+
+class TriggersLoadRuleZarazFormSubmissionRule(BaseModel):
+    id: str
+
+    action: Literal["formSubmission"]
+
+    settings: TriggersLoadRuleZarazFormSubmissionRuleSettings
+
+
+class TriggersLoadRuleZarazVariableMatchRuleSettings(BaseModel):
+    match: str
+
+    variable: str
+
+
+class TriggersLoadRuleZarazVariableMatchRule(BaseModel):
+    id: str
+
+    action: Literal["variableMatch"]
+
+    settings: TriggersLoadRuleZarazVariableMatchRuleSettings
+
+
+class TriggersLoadRuleZarazScrollDepthRuleSettings(BaseModel):
+    positions: str
+
+
+class TriggersLoadRuleZarazScrollDepthRule(BaseModel):
+    id: str
+
+    action: Literal["scrollDepth"]
+
+    settings: TriggersLoadRuleZarazScrollDepthRuleSettings
+
+
+class TriggersLoadRuleZarazElementVisibilityRuleSettings(BaseModel):
+    selector: str
+
+
+class TriggersLoadRuleZarazElementVisibilityRule(BaseModel):
+    id: str
+
+    action: Literal["elementVisibility"]
+
+    settings: TriggersLoadRuleZarazElementVisibilityRuleSettings
+
+
+TriggersLoadRule: TypeAlias = Union[
+    TriggersLoadRuleZarazLoadRule,
+    TriggersLoadRuleZarazClickListenerRule,
+    TriggersLoadRuleZarazTimerRule,
+    TriggersLoadRuleZarazFormSubmissionRule,
+    TriggersLoadRuleZarazVariableMatchRule,
+    TriggersLoadRuleZarazScrollDepthRule,
+    TriggersLoadRuleZarazElementVisibilityRule,
+]
+
+
+class Triggers(BaseModel):
+    exclude_rules: List[TriggersExcludeRule] = FieldInfo(alias="excludeRules")
+    """Rules defining when the trigger is not fired."""
+
+    load_rules: List[TriggersLoadRule] = FieldInfo(alias="loadRules")
+    """Rules defining when the trigger is fired."""
+
+    name: str
+    """Trigger name."""
+
+    description: Optional[str] = None
+    """Trigger description."""
+
+    system: Optional[Literal["pageload"]] = None
+
+
+class VariablesZarazStringVariable(BaseModel):
+    name: str
+
+    type: Literal["string"]
+
+    value: str
+
+
+class VariablesZarazSecretVariable(BaseModel):
+    name: str
+
+    type: Literal["secret"]
+
+    value: str
+
+
+class VariablesZarazWorkerVariableValue(BaseModel):
+    escaped_worker_name: str = FieldInfo(alias="escapedWorkerName")
+
+    worker_tag: str = FieldInfo(alias="workerTag")
+
+
+class VariablesZarazWorkerVariable(BaseModel):
+    name: str
+
+    type: Literal["worker"]
+
+    value: VariablesZarazWorkerVariableValue
+
+
+Variables: TypeAlias = Annotated[
+    Union[VariablesZarazStringVariable, VariablesZarazSecretVariable, VariablesZarazWorkerVariable],
+    PropertyInfo(discriminator="type"),
+]
+
+
+class Analytics(BaseModel):
+    """Cloudflare Monitoring settings."""
+
+    default_purpose: Optional[str] = FieldInfo(alias="defaultPurpose", default=None)
+    """Consent purpose assigned to Monitoring."""
+
+    enabled: Optional[bool] = None
+    """Whether Advanced Monitoring reports are enabled."""
+
+    session_exp_time: Optional[int] = FieldInfo(alias="sessionExpTime", default=None)
+    """Session expiration time (seconds)."""
+
+
+class ConsentPurposes(BaseModel):
+    description: str
+
+    name: str
+
+
+class ConsentPurposesWithTranslations(BaseModel):
+    description: Dict[str, str]
+    """Object where keys are language codes"""
+
+    name: Dict[str, str]
+    """Object where keys are language codes"""
+
+    order: int
+
+
+class Consent(BaseModel):
+    """Consent management configuration."""
+
+    enabled: bool
+
+    button_text_translations: Optional[ButtonTextTranslation] = FieldInfo(alias="buttonTextTranslations", default=None)
+
+    company_email: Optional[str] = FieldInfo(alias="companyEmail", default=None)
+
+    company_name: Optional[str] = FieldInfo(alias="companyName", default=None)
+
+    company_street_address: Optional[str] = FieldInfo(alias="companyStreetAddress", default=None)
+
+    consent_modal_intro_html: Optional[str] = FieldInfo(alias="consentModalIntroHTML", default=None)
+
+    consent_modal_intro_html_with_translations: Optional[Dict[str, str]] = FieldInfo(
+        alias="consentModalIntroHTMLWithTranslations", default=None
+    )
+    """Object where keys are language codes"""
+
+    cookie_name: Optional[str] = FieldInfo(alias="cookieName", default=None)
+
+    custom_css: Optional[str] = FieldInfo(alias="customCSS", default=None)
+
+    custom_intro_disclaimer_dismissed: Optional[bool] = FieldInfo(alias="customIntroDisclaimerDismissed", default=None)
+
+    default_language: Optional[str] = FieldInfo(alias="defaultLanguage", default=None)
+
+    hide_modal: Optional[bool] = FieldInfo(alias="hideModal", default=None)
+
+    purposes: Optional[Dict[str, ConsentPurposes]] = None
+    """Object where keys are purpose alpha-numeric IDs"""
+
+    purposes_with_translations: Optional[Dict[str, ConsentPurposesWithTranslations]] = FieldInfo(
+        alias="purposesWithTranslations", default=None
+    )
+    """Object where keys are purpose alpha-numeric IDs"""
+
+    tcf_compliant: Optional[bool] = FieldInfo(alias="tcfCompliant", default=None)
+
+
+class Configuration(BaseModel):
+    """Zaraz configuration"""
+
+    data_layer: bool = FieldInfo(alias="dataLayer")
+    """Data layer compatibility mode enabled."""
+
+    debug_key: str = FieldInfo(alias="debugKey")
+    """The key for Zaraz debug mode."""
+
+    settings: Settings
+    """General Zaraz settings."""
+
+    tools: Dict[str, Tools]
+    """
+    Tools set up under Zaraz configuration, where key is the alpha-numeric tool ID
+    and value is the tool configuration object.
+    """
+
+    triggers: Dict[str, Triggers]
+    """
+    Triggers set up under Zaraz configuration, where key is the trigger
+    alpha-numeric ID and value is the trigger configuration.
+    """
+
+    variables: Dict[str, Variables]
+    """
+    Variables set up under Zaraz configuration, where key is the variable
+    alpha-numeric ID and value is the variable configuration. Values of variables of
+    type secret are not included.
+    """
+
+    zaraz_version: int = FieldInfo(alias="zarazVersion")
+    """Zaraz internal version of the config."""
+
+    analytics: Optional[Analytics] = None
+    """Cloudflare Monitoring settings."""
+
+    consent: Optional[Consent] = None
+    """Consent management configuration."""
+
+    history_change: Optional[bool] = FieldInfo(alias="historyChange", default=None)
+    """Single Page Application support enabled."""
diff --git a/src/cloudflare/types/zaraz/history/__init__.py b/src/cloudflare/types/zaraz/history/__init__.py
new file mode 100644
index 00000000000..9437a1aa751
--- /dev/null
+++ b/src/cloudflare/types/zaraz/history/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .config_get_params import ConfigGetParams as ConfigGetParams
+from .config_get_response import ConfigGetResponse as ConfigGetResponse
diff --git a/src/cloudflare/types/zaraz/history/config_get_params.py b/src/cloudflare/types/zaraz/history/config_get_params.py
new file mode 100644
index 00000000000..5cdff0e7b1c
--- /dev/null
+++ b/src/cloudflare/types/zaraz/history/config_get_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ConfigGetParams"]
+
+
+class ConfigGetParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    ids: Required[Iterable[int]]
+    """Comma separated list of Zaraz configuration IDs"""
diff --git a/src/cloudflare/types/zaraz/history/config_get_response.py b/src/cloudflare/types/zaraz/history/config_get_response.py
new file mode 100644
index 00000000000..9223c2922d8
--- /dev/null
+++ b/src/cloudflare/types/zaraz/history/config_get_response.py
@@ -0,0 +1,32 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict
+from datetime import datetime
+from typing_extensions import TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+from ..configuration import Configuration
+
+__all__ = ["ConfigGetResponse", "ConfigGetResponseItem"]
+
+
+class ConfigGetResponseItem(BaseModel):
+    id: int
+    """ID of the configuration"""
+
+    config: Configuration
+    """Zaraz configuration"""
+
+    created_at: datetime = FieldInfo(alias="createdAt")
+    """Date and time the configuration was created"""
+
+    updated_at: datetime = FieldInfo(alias="updatedAt")
+    """Date and time the configuration was last updated"""
+
+    user_id: str = FieldInfo(alias="userId")
+    """Alpha-numeric ID of the account user who published the configuration"""
+
+
+ConfigGetResponse: TypeAlias = Dict[str, ConfigGetResponseItem]
diff --git a/src/cloudflare/types/zaraz/history_list_params.py b/src/cloudflare/types/zaraz/history_list_params.py
new file mode 100644
index 00000000000..c7b5fb731e6
--- /dev/null
+++ b/src/cloudflare/types/zaraz/history_list_params.py
@@ -0,0 +1,28 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
+
+__all__ = ["HistoryListParams"]
+
+
+class HistoryListParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    limit: int
+    """Maximum amount of results to list. Default value is 10."""
+
+    offset: int
+    """Ordinal number to start listing the results with. Default value is 0."""
+
+    sort_field: Annotated[
+        Literal["id", "user_id", "description", "created_at", "updated_at"], PropertyInfo(alias="sortField")
+    ]
+    """The field to sort by. Default is updated_at."""
+
+    sort_order: Annotated[Literal["DESC", "ASC"], PropertyInfo(alias="sortOrder")]
+    """Sorting order. Default is DESC."""
diff --git a/src/cloudflare/types/zaraz/history_list_response.py b/src/cloudflare/types/zaraz/history_list_response.py
new file mode 100644
index 00000000000..0cec64478b9
--- /dev/null
+++ b/src/cloudflare/types/zaraz/history_list_response.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from datetime import datetime
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["HistoryListResponse"]
+
+
+class HistoryListResponse(BaseModel):
+    id: int
+    """ID of the configuration"""
+
+    created_at: datetime = FieldInfo(alias="createdAt")
+    """Date and time the configuration was created"""
+
+    description: str
+    """Configuration description provided by the user who published this configuration"""
+
+    updated_at: datetime = FieldInfo(alias="updatedAt")
+    """Date and time the configuration was last updated"""
+
+    user_id: str = FieldInfo(alias="userId")
+    """Alpha-numeric ID of the account user who published the configuration"""
diff --git a/src/cloudflare/types/zaraz/history_update_params.py b/src/cloudflare/types/zaraz/history_update_params.py
new file mode 100644
index 00000000000..7f6f60d5cff
--- /dev/null
+++ b/src/cloudflare/types/zaraz/history_update_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["HistoryUpdateParams"]
+
+
+class HistoryUpdateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    body: Required[int]
+    """ID of the Zaraz configuration to restore."""
diff --git a/src/cloudflare/types/zaraz/neo_event.py b/src/cloudflare/types/zaraz/neo_event.py
new file mode 100644
index 00000000000..deef96e304d
--- /dev/null
+++ b/src/cloudflare/types/zaraz/neo_event.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List
+
+from pydantic import Field as FieldInfo
+
+from ..._models import BaseModel
+
+__all__ = ["NeoEvent"]
+
+
+class NeoEvent(BaseModel):
+    action_type: str = FieldInfo(alias="actionType")
+    """Tool event type"""
+
+    blocking_triggers: List[str] = FieldInfo(alias="blockingTriggers")
+    """List of blocking triggers IDs"""
+
+    data: object
+    """Event payload"""
+
+    firing_triggers: List[str] = FieldInfo(alias="firingTriggers")
+    """List of firing triggers IDs"""
diff --git a/src/cloudflare/types/zaraz/neo_event_param.py b/src/cloudflare/types/zaraz/neo_event_param.py
new file mode 100644
index 00000000000..1141212cc28
--- /dev/null
+++ b/src/cloudflare/types/zaraz/neo_event_param.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ..._types import SequenceNotStr
+from ..._utils import PropertyInfo
+
+__all__ = ["NeoEventParam"]
+
+
+class NeoEventParam(TypedDict, total=False):
+    action_type: Required[Annotated[str, PropertyInfo(alias="actionType")]]
+    """Tool event type"""
+
+    blocking_triggers: Required[Annotated[SequenceNotStr[str], PropertyInfo(alias="blockingTriggers")]]
+    """List of blocking triggers IDs"""
+
+    data: Required[object]
+    """Event payload"""
+
+    firing_triggers: Required[Annotated[SequenceNotStr[str], PropertyInfo(alias="firingTriggers")]]
+    """List of firing triggers IDs"""
diff --git a/src/cloudflare/types/zaraz/publish_create_params.py b/src/cloudflare/types/zaraz/publish_create_params.py
new file mode 100644
index 00000000000..574d851996f
--- /dev/null
+++ b/src/cloudflare/types/zaraz/publish_create_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["PublishCreateParams"]
+
+
+class PublishCreateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    body: str
+    """Zaraz configuration description."""
diff --git a/src/cloudflare/types/zaraz/publish_create_response.py b/src/cloudflare/types/zaraz/publish_create_response.py
new file mode 100644
index 00000000000..a599dfc09d8
--- /dev/null
+++ b/src/cloudflare/types/zaraz/publish_create_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["PublishCreateResponse"]
+
+PublishCreateResponse: TypeAlias = str
diff --git a/src/cloudflare/types/zaraz/workflow.py b/src/cloudflare/types/zaraz/workflow.py
new file mode 100644
index 00000000000..d31e94cb893
--- /dev/null
+++ b/src/cloudflare/types/zaraz/workflow.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import Literal, TypeAlias
+
+__all__ = ["Workflow"]
+
+Workflow: TypeAlias = Literal["realtime", "preview"]
diff --git a/src/cloudflare/types/zaraz/zaraz_update_params.py b/src/cloudflare/types/zaraz/zaraz_update_params.py
new file mode 100644
index 00000000000..171ceaa428b
--- /dev/null
+++ b/src/cloudflare/types/zaraz/zaraz_update_params.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from .workflow import Workflow
+
+__all__ = ["ZarazUpdateParams"]
+
+
+class ZarazUpdateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    workflow: Required[Workflow]
+    """Zaraz workflow"""
diff --git a/src/cloudflare/types/zero_trust/__init__.py b/src/cloudflare/types/zero_trust/__init__.py
index 8981ad5974d..d273fdf3bb4 100644
--- a/src/cloudflare/types/zero_trust/__init__.py
+++ b/src/cloudflare/types/zero_trust/__init__.py
@@ -4,85 +4,38 @@
 
 from .seat import Seat as Seat
 from .device import Device as Device
-from .ip_rule import IPRule as IPRule
 from .azure_ad import AzureAD as AzureAD
-from .connection import Connection as Connection
-from .email_rule import EmailRule as EmailRule
-from .group_rule import GroupRule as GroupRule
-from .access_rule import AccessRule as AccessRule
-from .domain_rule import DomainRule as DomainRule
 from .percentiles import Percentiles as Percentiles
-from .scim_config import SCIMConfig as SCIMConfig
-from .country_rule import CountryRule as CountryRule
-from .ip_list_rule import IPListRule as IPListRule
 from .login_design import LoginDesign as LoginDesign
 from .network_path import NetworkPath as NetworkPath
 from .organization import Organization as Organization
-from .everyone_rule import EveryoneRule as EveryoneRule
-from .ip_rule_param import IPRuleParam as IPRuleParam
-from .email_list_rule import EmailListRule as EmailListRule
-from .okta_group_rule import OktaGroupRule as OktaGroupRule
-from .saml_group_rule import SAMLGroupRule as SAMLGroupRule
-from .azure_group_rule import AzureGroupRule as AzureGroupRule
-from .certificate_rule import CertificateRule as CertificateRule
-from .email_rule_param import EmailRuleParam as EmailRuleParam
-from .group_rule_param import GroupRuleParam as GroupRuleParam
+from .azure_ad_param import AzureADParam as AzureADParam
 from .seat_edit_params import SeatEditParams as SeatEditParams
-from .access_rule_param import AccessRuleParam as AccessRuleParam
-from .domain_rule_param import DomainRuleParam as DomainRuleParam
-from .gsuite_group_rule import GSuiteGroupRule as GSuiteGroupRule
 from .identity_provider import IdentityProvider as IdentityProvider
-from .scim_config_param import SCIMConfigParam as SCIMConfigParam
-from .country_rule_param import CountryRuleParam as CountryRuleParam
-from .ip_list_rule_param import IPListRuleParam as IPListRuleParam
 from .login_design_param import LoginDesignParam as LoginDesignParam
-from .seat_edit_response import SeatEditResponse as SeatEditResponse
-from .service_token_rule import ServiceTokenRule as ServiceTokenRule
-from .tunnel_edit_params import TunnelEditParams as TunnelEditParams
 from .tunnel_list_params import TunnelListParams as TunnelListParams
 from .device_get_response import DeviceGetResponse as DeviceGetResponse
-from .everyone_rule_param import EveryoneRuleParam as EveryoneRuleParam
-from .tunnel_get_response import TunnelGetResponse as TunnelGetResponse
 from .generic_oauth_config import GenericOAuthConfig as GenericOAuthConfig
-from .tunnel_create_params import TunnelCreateParams as TunnelCreateParams
-from .tunnel_edit_response import TunnelEditResponse as TunnelEditResponse
 from .tunnel_list_response import TunnelListResponse as TunnelListResponse
-from .email_list_rule_param import EmailListRuleParam as EmailListRuleParam
 from .gateway_list_response import GatewayListResponse as GatewayListResponse
 from .network_path_response import NetworkPathResponse as NetworkPathResponse
-from .okta_group_rule_param import OktaGroupRuleParam as OktaGroupRuleParam
-from .saml_group_rule_param import SAMLGroupRuleParam as SAMLGroupRuleParam
-from .azure_group_rule_param import AzureGroupRuleParam as AzureGroupRuleParam
-from .certificate_rule_param import CertificateRuleParam as CertificateRuleParam
 from .identity_provider_type import IdentityProviderType as IdentityProviderType
-from .tunnel_create_response import TunnelCreateResponse as TunnelCreateResponse
-from .tunnel_delete_response import TunnelDeleteResponse as TunnelDeleteResponse
 from .gateway_create_response import GatewayCreateResponse as GatewayCreateResponse
-from .gsuite_group_rule_param import GSuiteGroupRuleParam as GSuiteGroupRuleParam
-from .risk_scoring_get_params import RiskScoringGetParams as RiskScoringGetParams
-from .external_evaluation_rule import ExternalEvaluationRule as ExternalEvaluationRule
-from .github_organization_rule import GitHubOrganizationRule as GitHubOrganizationRule
-from .service_token_rule_param import ServiceTokenRuleParam as ServiceTokenRuleParam
-from .device_experience_monitor import DeviceExperienceMonitor as DeviceExperienceMonitor
+from .identity_provider_param import IdentityProviderParam as IdentityProviderParam
 from .risk_scoring_get_response import RiskScoringGetResponse as RiskScoringGetResponse
-from .access_device_posture_rule import AccessDevicePostureRule as AccessDevicePostureRule
-from .authentication_method_rule import AuthenticationMethodRule as AuthenticationMethodRule
+from .digital_experience_monitor import DigitalExperienceMonitor as DigitalExperienceMonitor
 from .generic_oauth_config_param import GenericOAuthConfigParam as GenericOAuthConfigParam
 from .organization_create_params import OrganizationCreateParams as OrganizationCreateParams
 from .organization_update_params import OrganizationUpdateParams as OrganizationUpdateParams
-from .risk_scoring_reset_response import RiskScoringResetResponse as RiskScoringResetResponse
-from .any_valid_service_token_rule import AnyValidServiceTokenRule as AnyValidServiceTokenRule
-from .external_evaluation_rule_param import ExternalEvaluationRuleParam as ExternalEvaluationRuleParam
-from .github_organization_rule_param import GitHubOrganizationRuleParam as GitHubOrganizationRuleParam
+from .identity_provider_list_params import IdentityProviderListParams as IdentityProviderListParams
+from .identity_provider_scim_config import IdentityProviderSCIMConfig as IdentityProviderSCIMConfig
 from .identity_provider_create_params import IdentityProviderCreateParams as IdentityProviderCreateParams
 from .identity_provider_list_response import IdentityProviderListResponse as IdentityProviderListResponse
 from .identity_provider_update_params import IdentityProviderUpdateParams as IdentityProviderUpdateParams
-from .access_device_posture_rule_param import AccessDevicePostureRuleParam as AccessDevicePostureRuleParam
-from .authentication_method_rule_param import AuthenticationMethodRuleParam as AuthenticationMethodRuleParam
 from .connectivity_setting_edit_params import ConnectivitySettingEditParams as ConnectivitySettingEditParams
 from .organization_revoke_users_params import OrganizationRevokeUsersParams as OrganizationRevokeUsersParams
 from .connectivity_setting_get_response import ConnectivitySettingGetResponse as ConnectivitySettingGetResponse
 from .identity_provider_delete_response import IdentityProviderDeleteResponse as IdentityProviderDeleteResponse
-from .any_valid_service_token_rule_param import AnyValidServiceTokenRuleParam as AnyValidServiceTokenRuleParam
 from .connectivity_setting_edit_response import ConnectivitySettingEditResponse as ConnectivitySettingEditResponse
 from .organization_revoke_users_response import OrganizationRevokeUsersResponse as OrganizationRevokeUsersResponse
+from .identity_provider_scim_config_param import IdentityProviderSCIMConfigParam as IdentityProviderSCIMConfigParam
diff --git a/src/cloudflare/types/zero_trust/access/__init__.py b/src/cloudflare/types/zero_trust/access/__init__.py
index 16436e0e937..beac853e2ff 100644
--- a/src/cloudflare/types/zero_trust/access/__init__.py
+++ b/src/cloudflare/types/zero_trust/access/__init__.py
@@ -3,51 +3,66 @@
 from __future__ import annotations
 
 from .tag import Tag as Tag
+from .app_id import AppID as AppID
 from .bookmark import Bookmark as Bookmark
 from .decision import Decision as Decision
 from .access_user import AccessUser as AccessUser
 from .certificate import Certificate as Certificate
 from .custom_page import CustomPage as CustomPage
 from .allowed_idps import AllowedIdPs as AllowedIdPs
-from .app_id_param import AppIDParam as AppIDParam
 from .cors_headers import CORSHeaders as CORSHeaders
+from .oidc_saas_app import OIDCSaaSApp as OIDCSaaSApp
 from .saml_saas_app import SAMLSaaSApp as SAMLSaaSApp
 from .service_token import ServiceToken as ServiceToken
+from .approval_group import ApprovalGroup as ApprovalGroup
 from .allowed_headers import AllowedHeaders as AllowedHeaders
 from .allowed_methods import AllowedMethods as AllowedMethods
 from .allowed_origins import AllowedOrigins as AllowedOrigins
-from .saas_app_source import SaaSAppSource as SaaSAppSource
+from .tag_list_params import TagListParams as TagListParams
 from .application_type import ApplicationType as ApplicationType
 from .key_get_response import KeyGetResponse as KeyGetResponse
+from .user_list_params import UserListParams as UserListParams
 from .zero_trust_group import ZeroTrustGroup as ZeroTrustGroup
+from .group_list_params import GroupListParams as GroupListParams
 from .key_update_params import KeyUpdateParams as KeyUpdateParams
 from .tag_create_params import TagCreateParams as TagCreateParams
 from .tag_update_params import TagUpdateParams as TagUpdateParams
 from .cors_headers_param import CORSHeadersParam as CORSHeadersParam
+from .group_get_response import GroupGetResponse as GroupGetResponse
+from .policy_list_params import PolicyListParams as PolicyListParams
+from .user_list_response import UserListResponse as UserListResponse
 from .group_create_params import GroupCreateParams as GroupCreateParams
+from .group_list_response import GroupListResponse as GroupListResponse
 from .group_update_params import GroupUpdateParams as GroupUpdateParams
 from .key_rotate_response import KeyRotateResponse as KeyRotateResponse
 from .key_update_response import KeyUpdateResponse as KeyUpdateResponse
+from .oidc_saas_app_param import OIDCSaaSAppParam as OIDCSaaSAppParam
 from .policy_get_response import PolicyGetResponse as PolicyGetResponse
 from .saml_saas_app_param import SAMLSaaSAppParam as SAMLSaaSAppParam
+from .scim_config_mapping import SCIMConfigMapping as SCIMConfigMapping
 from .self_hosted_domains import SelfHostedDomains as SelfHostedDomains
 from .tag_delete_response import TagDeleteResponse as TagDeleteResponse
+from .approval_group_param import ApprovalGroupParam as ApprovalGroupParam
 from .associated_hostnames import AssociatedHostnames as AssociatedHostnames
 from .policy_create_params import PolicyCreateParams as PolicyCreateParams
 from .policy_list_response import PolicyListResponse as PolicyListResponse
 from .policy_update_params import PolicyUpdateParams as PolicyUpdateParams
-from .saas_app_name_format import SaaSAppNameFormat as SaaSAppNameFormat
+from .group_create_response import GroupCreateResponse as GroupCreateResponse
 from .group_delete_response import GroupDeleteResponse as GroupDeleteResponse
-from .saas_app_source_param import SaaSAppSourceParam as SaaSAppSourceParam
+from .group_update_response import GroupUpdateResponse as GroupUpdateResponse
 from .bookmark_create_params import BookmarkCreateParams as BookmarkCreateParams
 from .bookmark_update_params import BookmarkUpdateParams as BookmarkUpdateParams
 from .policy_create_response import PolicyCreateResponse as PolicyCreateResponse
 from .policy_delete_response import PolicyDeleteResponse as PolicyDeleteResponse
 from .policy_update_response import PolicyUpdateResponse as PolicyUpdateResponse
+from .application_list_params import ApplicationListParams as ApplicationListParams
+from .certificate_list_params import CertificateListParams as CertificateListParams
+from .custom_page_list_params import CustomPageListParams as CustomPageListParams
 from .saas_app_name_id_format import SaaSAppNameIDFormat as SaaSAppNameIDFormat
 from .application_get_response import ApplicationGetResponse as ApplicationGetResponse
 from .bookmark_delete_response import BookmarkDeleteResponse as BookmarkDeleteResponse
 from .custom_page_without_html import CustomPageWithoutHTML as CustomPageWithoutHTML
+from .gateway_ca_list_response import GatewayCAListResponse as GatewayCAListResponse
 from .application_create_params import ApplicationCreateParams as ApplicationCreateParams
 from .application_list_response import ApplicationListResponse as ApplicationListResponse
 from .application_update_params import ApplicationUpdateParams as ApplicationUpdateParams
@@ -55,12 +70,33 @@
 from .certificate_update_params import CertificateUpdateParams as CertificateUpdateParams
 from .custom_page_create_params import CustomPageCreateParams as CustomPageCreateParams
 from .custom_page_update_params import CustomPageUpdateParams as CustomPageUpdateParams
+from .scim_config_mapping_param import SCIMConfigMappingParam as SCIMConfigMappingParam
+from .service_token_list_params import ServiceTokenListParams as ServiceTokenListParams
+from .gateway_ca_create_response import GatewayCACreateResponse as GatewayCACreateResponse
+from .gateway_ca_delete_response import GatewayCADeleteResponse as GatewayCADeleteResponse
 from .application_create_response import ApplicationCreateResponse as ApplicationCreateResponse
 from .application_delete_response import ApplicationDeleteResponse as ApplicationDeleteResponse
 from .application_update_response import ApplicationUpdateResponse as ApplicationUpdateResponse
 from .certificate_delete_response import CertificateDeleteResponse as CertificateDeleteResponse
 from .custom_page_delete_response import CustomPageDeleteResponse as CustomPageDeleteResponse
 from .service_token_create_params import ServiceTokenCreateParams as ServiceTokenCreateParams
+from .service_token_rotate_params import ServiceTokenRotateParams as ServiceTokenRotateParams
 from .service_token_update_params import ServiceTokenUpdateParams as ServiceTokenUpdateParams
 from .service_token_create_response import ServiceTokenCreateResponse as ServiceTokenCreateResponse
 from .service_token_rotate_response import ServiceTokenRotateResponse as ServiceTokenRotateResponse
+from .scim_config_authentication_oauth2 import SCIMConfigAuthenticationOauth2 as SCIMConfigAuthenticationOauth2
+from .scim_config_authentication_http_basic import (
+    SCIMConfigAuthenticationHTTPBasic as SCIMConfigAuthenticationHTTPBasic,
+)
+from .scim_config_authentication_oauth2_param import (
+    SCIMConfigAuthenticationOauth2Param as SCIMConfigAuthenticationOauth2Param,
+)
+from .scim_config_authentication_http_basic_param import (
+    SCIMConfigAuthenticationHTTPBasicParam as SCIMConfigAuthenticationHTTPBasicParam,
+)
+from .scim_config_authentication_oauth_bearer_token import (
+    SCIMConfigAuthenticationOAuthBearerToken as SCIMConfigAuthenticationOAuthBearerToken,
+)
+from .scim_config_authentication_oauth_bearer_token_param import (
+    SCIMConfigAuthenticationOAuthBearerTokenParam as SCIMConfigAuthenticationOAuthBearerTokenParam,
+)
diff --git a/src/cloudflare/types/zero_trust/access/access_user.py b/src/cloudflare/types/zero_trust/access/access_user.py
index 2430d721cf2..6bb654e25fa 100644
--- a/src/cloudflare/types/zero_trust/access/access_user.py
+++ b/src/cloudflare/types/zero_trust/access/access_user.py
@@ -1,41 +1,58 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import List, Optional
 from datetime import datetime
 
+from pydantic import Field as FieldInfo
+
 from ...._models import BaseModel
 
-__all__ = ["AccessUser"]
+__all__ = ["AccessUser", "Email", "Meta"]
 
 
-class AccessUser(BaseModel):
-    id: Optional[str] = None
-    """UUID"""
+class Email(BaseModel):
+    primary: Optional[bool] = None
+    """
+    Indicates if the email address is the primary email belonging to the SCIM User
+    resource.
+    """
+
+    type: Optional[str] = None
+    """Indicates the type of the email address."""
+
+    value: Optional[str] = None
+    """The email address of the SCIM User resource."""
 
-    access_seat: Optional[bool] = None
-    """True if the user has authenticated with Cloudflare Access."""
 
-    active_device_count: Optional[float] = None
-    """The number of active devices registered to the user."""
+class Meta(BaseModel):
+    """The metadata of the SCIM resource."""
 
-    created_at: Optional[datetime] = None
+    created: Optional[datetime] = None
+    """The timestamp of when the SCIM resource was created."""
 
-    email: Optional[str] = None
-    """The email of the user."""
+    last_modified: Optional[datetime] = FieldInfo(alias="lastModified", default=None)
+    """The timestamp of when the SCIM resource was last modified."""
+
+
+class AccessUser(BaseModel):
+    id: Optional[str] = None
+    """The unique Cloudflare-generated Id of the SCIM resource."""
 
-    gateway_seat: Optional[bool] = None
-    """True if the user has logged into the WARP client."""
+    active: Optional[bool] = None
+    """Determines the status of the SCIM User resource."""
 
-    last_successful_login: Optional[datetime] = None
-    """The time at which the user last successfully logged in."""
+    display_name: Optional[str] = FieldInfo(alias="displayName", default=None)
+    """The name of the SCIM User resource."""
 
-    name: Optional[str] = None
-    """The name of the user."""
+    emails: Optional[List[Email]] = None
 
-    seat_uid: Optional[str] = None
-    """The unique API identifier for the Zero Trust seat."""
+    external_id: Optional[str] = FieldInfo(alias="externalId", default=None)
+    """The IdP-generated Id of the SCIM resource."""
 
-    uid: Optional[str] = None
-    """The unique API identifier for the user."""
+    meta: Optional[Meta] = None
+    """The metadata of the SCIM resource."""
 
-    updated_at: Optional[datetime] = None
+    schemas: Optional[List[str]] = None
+    """
+    The list of URIs which indicate the attributes contained within a SCIM resource.
+    """
diff --git a/src/cloudflare/types/workers/ai/__init__.py b/src/cloudflare/types/zero_trust/access/ai_controls/__init__.py
similarity index 100%
rename from src/cloudflare/types/workers/ai/__init__.py
rename to src/cloudflare/types/zero_trust/access/ai_controls/__init__.py
diff --git a/src/cloudflare/types/zero_trust/access/ai_controls/mcp/__init__.py b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/__init__.py
new file mode 100644
index 00000000000..e44bd3633a5
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/__init__.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .portal_list_params import PortalListParams as PortalListParams
+from .server_list_params import ServerListParams as ServerListParams
+from .portal_create_params import PortalCreateParams as PortalCreateParams
+from .portal_list_response import PortalListResponse as PortalListResponse
+from .portal_read_response import PortalReadResponse as PortalReadResponse
+from .portal_update_params import PortalUpdateParams as PortalUpdateParams
+from .server_create_params import ServerCreateParams as ServerCreateParams
+from .server_list_response import ServerListResponse as ServerListResponse
+from .server_read_response import ServerReadResponse as ServerReadResponse
+from .server_update_params import ServerUpdateParams as ServerUpdateParams
+from .portal_create_response import PortalCreateResponse as PortalCreateResponse
+from .portal_delete_response import PortalDeleteResponse as PortalDeleteResponse
+from .portal_update_response import PortalUpdateResponse as PortalUpdateResponse
+from .server_create_response import ServerCreateResponse as ServerCreateResponse
+from .server_delete_response import ServerDeleteResponse as ServerDeleteResponse
+from .server_update_response import ServerUpdateResponse as ServerUpdateResponse
diff --git a/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_create_params.py b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_create_params.py
new file mode 100644
index 00000000000..bfdf8e5ec07
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_create_params.py
@@ -0,0 +1,55 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["PortalCreateParams", "Server", "ServerUpdatedPrompt", "ServerUpdatedTool"]
+
+
+class PortalCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    id: Required[str]
+    """portal id"""
+
+    hostname: Required[str]
+
+    name: Required[str]
+
+    description: str
+
+    secure_web_gateway: bool
+    """Route outbound MCP traffic through Zero Trust Secure Web Gateway"""
+
+    servers: Iterable[Server]
+
+
+class ServerUpdatedPrompt(TypedDict, total=False):
+    name: Required[str]
+
+    description: str
+
+    enabled: bool
+
+
+class ServerUpdatedTool(TypedDict, total=False):
+    name: Required[str]
+
+    description: str
+
+    enabled: bool
+
+
+class Server(TypedDict, total=False):
+    server_id: Required[str]
+    """server id"""
+
+    default_disabled: bool
+
+    on_behalf: bool
+
+    updated_prompts: Iterable[ServerUpdatedPrompt]
+
+    updated_tools: Iterable[ServerUpdatedTool]
diff --git a/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_create_response.py b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_create_response.py
new file mode 100644
index 00000000000..b2f8685627e
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_create_response.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ......_models import BaseModel
+
+__all__ = ["PortalCreateResponse"]
+
+
+class PortalCreateResponse(BaseModel):
+    id: str
+    """portal id"""
+
+    hostname: str
+
+    name: str
+
+    created_at: Optional[datetime] = None
+
+    created_by: Optional[str] = None
+
+    description: Optional[str] = None
+
+    modified_at: Optional[datetime] = None
+
+    modified_by: Optional[str] = None
+
+    secure_web_gateway: Optional[bool] = None
+    """Route outbound MCP traffic through Zero Trust Secure Web Gateway"""
diff --git a/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_delete_response.py b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_delete_response.py
new file mode 100644
index 00000000000..9ecead31172
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_delete_response.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ......_models import BaseModel
+
+__all__ = ["PortalDeleteResponse"]
+
+
+class PortalDeleteResponse(BaseModel):
+    id: str
+    """portal id"""
+
+    hostname: str
+
+    name: str
+
+    created_at: Optional[datetime] = None
+
+    created_by: Optional[str] = None
+
+    description: Optional[str] = None
+
+    modified_at: Optional[datetime] = None
+
+    modified_by: Optional[str] = None
+
+    secure_web_gateway: Optional[bool] = None
+    """Route outbound MCP traffic through Zero Trust Secure Web Gateway"""
diff --git a/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_list_params.py b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_list_params.py
new file mode 100644
index 00000000000..33f5100d91a
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["PortalListParams"]
+
+
+class PortalListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    page: int
+
+    per_page: int
+
+    search: str
+    """Search by id, name, hostname"""
diff --git a/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_list_response.py b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_list_response.py
new file mode 100644
index 00000000000..21103bd9b08
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_list_response.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ......_models import BaseModel
+
+__all__ = ["PortalListResponse"]
+
+
+class PortalListResponse(BaseModel):
+    id: str
+    """portal id"""
+
+    hostname: str
+
+    name: str
+
+    created_at: Optional[datetime] = None
+
+    created_by: Optional[str] = None
+
+    description: Optional[str] = None
+
+    modified_at: Optional[datetime] = None
+
+    modified_by: Optional[str] = None
+
+    secure_web_gateway: Optional[bool] = None
+    """Route outbound MCP traffic through Zero Trust Secure Web Gateway"""
diff --git a/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_read_response.py b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_read_response.py
new file mode 100644
index 00000000000..b4a6414a609
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_read_response.py
@@ -0,0 +1,74 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ......_models import BaseModel
+
+__all__ = ["PortalReadResponse", "Server"]
+
+
+class Server(BaseModel):
+    id: str
+    """server id"""
+
+    auth_type: Literal["oauth", "bearer", "unauthenticated"]
+
+    hostname: str
+
+    name: str
+
+    prompts: List[Dict[str, object]]
+
+    tools: List[Dict[str, object]]
+
+    updated_prompts: List[Dict[str, Union[float, str]]]
+
+    updated_tools: List[Dict[str, Union[float, str]]]
+
+    created_at: Optional[datetime] = None
+
+    created_by: Optional[str] = None
+
+    default_disabled: Optional[bool] = None
+
+    description: Optional[str] = None
+
+    error: Optional[str] = None
+
+    last_successful_sync: Optional[datetime] = None
+
+    last_synced: Optional[datetime] = None
+
+    modified_at: Optional[datetime] = None
+
+    modified_by: Optional[str] = None
+
+    on_behalf: Optional[bool] = None
+
+    status: Optional[str] = None
+
+
+class PortalReadResponse(BaseModel):
+    id: str
+    """portal id"""
+
+    hostname: str
+
+    name: str
+
+    servers: List[Server]
+
+    created_at: Optional[datetime] = None
+
+    created_by: Optional[str] = None
+
+    description: Optional[str] = None
+
+    modified_at: Optional[datetime] = None
+
+    modified_by: Optional[str] = None
+
+    secure_web_gateway: Optional[bool] = None
+    """Route outbound MCP traffic through Zero Trust Secure Web Gateway"""
diff --git a/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_update_params.py b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_update_params.py
new file mode 100644
index 00000000000..0475074903c
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_update_params.py
@@ -0,0 +1,52 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["PortalUpdateParams", "Server", "ServerUpdatedPrompt", "ServerUpdatedTool"]
+
+
+class PortalUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    description: str
+
+    hostname: str
+
+    name: str
+
+    secure_web_gateway: bool
+    """Route outbound MCP traffic through Zero Trust Secure Web Gateway"""
+
+    servers: Iterable[Server]
+
+
+class ServerUpdatedPrompt(TypedDict, total=False):
+    name: Required[str]
+
+    description: str
+
+    enabled: bool
+
+
+class ServerUpdatedTool(TypedDict, total=False):
+    name: Required[str]
+
+    description: str
+
+    enabled: bool
+
+
+class Server(TypedDict, total=False):
+    server_id: Required[str]
+    """server id"""
+
+    default_disabled: bool
+
+    on_behalf: bool
+
+    updated_prompts: Iterable[ServerUpdatedPrompt]
+
+    updated_tools: Iterable[ServerUpdatedTool]
diff --git a/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_update_response.py b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_update_response.py
new file mode 100644
index 00000000000..8be6bcca410
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/portal_update_response.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ......_models import BaseModel
+
+__all__ = ["PortalUpdateResponse"]
+
+
+class PortalUpdateResponse(BaseModel):
+    id: str
+    """portal id"""
+
+    hostname: str
+
+    name: str
+
+    created_at: Optional[datetime] = None
+
+    created_by: Optional[str] = None
+
+    description: Optional[str] = None
+
+    modified_at: Optional[datetime] = None
+
+    modified_by: Optional[str] = None
+
+    secure_web_gateway: Optional[bool] = None
+    """Route outbound MCP traffic through Zero Trust Secure Web Gateway"""
diff --git a/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_create_params.py b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_create_params.py
new file mode 100644
index 00000000000..d38e60e7248
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_create_params.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["ServerCreateParams"]
+
+
+class ServerCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    id: Required[str]
+    """server id"""
+
+    auth_type: Required[Literal["oauth", "bearer", "unauthenticated"]]
+
+    hostname: Required[str]
+
+    name: Required[str]
+
+    auth_credentials: str
+
+    description: Optional[str]
diff --git a/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_create_response.py b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_create_response.py
new file mode 100644
index 00000000000..daad443eed5
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_create_response.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ......_models import BaseModel
+
+__all__ = ["ServerCreateResponse"]
+
+
+class ServerCreateResponse(BaseModel):
+    id: str
+    """server id"""
+
+    auth_type: Literal["oauth", "bearer", "unauthenticated"]
+
+    hostname: str
+
+    name: str
+
+    prompts: List[Dict[str, object]]
+
+    tools: List[Dict[str, object]]
+
+    created_at: Optional[datetime] = None
+
+    created_by: Optional[str] = None
+
+    description: Optional[str] = None
+
+    error: Optional[str] = None
+
+    last_successful_sync: Optional[datetime] = None
+
+    last_synced: Optional[datetime] = None
+
+    modified_at: Optional[datetime] = None
+
+    modified_by: Optional[str] = None
+
+    status: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_delete_response.py b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_delete_response.py
new file mode 100644
index 00000000000..830028cf6e9
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_delete_response.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ......_models import BaseModel
+
+__all__ = ["ServerDeleteResponse"]
+
+
+class ServerDeleteResponse(BaseModel):
+    id: str
+    """server id"""
+
+    auth_type: Literal["oauth", "bearer", "unauthenticated"]
+
+    hostname: str
+
+    name: str
+
+    prompts: List[Dict[str, object]]
+
+    tools: List[Dict[str, object]]
+
+    created_at: Optional[datetime] = None
+
+    created_by: Optional[str] = None
+
+    description: Optional[str] = None
+
+    error: Optional[str] = None
+
+    last_successful_sync: Optional[datetime] = None
+
+    last_synced: Optional[datetime] = None
+
+    modified_at: Optional[datetime] = None
+
+    modified_by: Optional[str] = None
+
+    status: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_list_params.py b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_list_params.py
new file mode 100644
index 00000000000..139f6ab9bad
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ServerListParams"]
+
+
+class ServerListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    page: int
+
+    per_page: int
+
+    search: str
+    """Search by id, name"""
diff --git a/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_list_response.py b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_list_response.py
new file mode 100644
index 00000000000..4fcba5cb98e
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_list_response.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ......_models import BaseModel
+
+__all__ = ["ServerListResponse"]
+
+
+class ServerListResponse(BaseModel):
+    id: str
+    """server id"""
+
+    auth_type: Literal["oauth", "bearer", "unauthenticated"]
+
+    hostname: str
+
+    name: str
+
+    prompts: List[Dict[str, object]]
+
+    tools: List[Dict[str, object]]
+
+    created_at: Optional[datetime] = None
+
+    created_by: Optional[str] = None
+
+    description: Optional[str] = None
+
+    error: Optional[str] = None
+
+    last_successful_sync: Optional[datetime] = None
+
+    last_synced: Optional[datetime] = None
+
+    modified_at: Optional[datetime] = None
+
+    modified_by: Optional[str] = None
+
+    status: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_read_response.py b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_read_response.py
new file mode 100644
index 00000000000..d7e5ecf77d3
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_read_response.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ......_models import BaseModel
+
+__all__ = ["ServerReadResponse"]
+
+
+class ServerReadResponse(BaseModel):
+    id: str
+    """server id"""
+
+    auth_type: Literal["oauth", "bearer", "unauthenticated"]
+
+    hostname: str
+
+    name: str
+
+    prompts: List[Dict[str, object]]
+
+    tools: List[Dict[str, object]]
+
+    created_at: Optional[datetime] = None
+
+    created_by: Optional[str] = None
+
+    description: Optional[str] = None
+
+    error: Optional[str] = None
+
+    last_successful_sync: Optional[datetime] = None
+
+    last_synced: Optional[datetime] = None
+
+    modified_at: Optional[datetime] = None
+
+    modified_by: Optional[str] = None
+
+    status: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_update_params.py b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_update_params.py
new file mode 100644
index 00000000000..808d16ae75a
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_update_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ServerUpdateParams"]
+
+
+class ServerUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    auth_credentials: str
+
+    description: Optional[str]
+
+    name: str
diff --git a/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_update_response.py b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_update_response.py
new file mode 100644
index 00000000000..74317d3fff4
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/ai_controls/mcp/server_update_response.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ......_models import BaseModel
+
+__all__ = ["ServerUpdateResponse"]
+
+
+class ServerUpdateResponse(BaseModel):
+    id: str
+    """server id"""
+
+    auth_type: Literal["oauth", "bearer", "unauthenticated"]
+
+    hostname: str
+
+    name: str
+
+    prompts: List[Dict[str, object]]
+
+    tools: List[Dict[str, object]]
+
+    created_at: Optional[datetime] = None
+
+    created_by: Optional[str] = None
+
+    description: Optional[str] = None
+
+    error: Optional[str] = None
+
+    last_successful_sync: Optional[datetime] = None
+
+    last_synced: Optional[datetime] = None
+
+    modified_at: Optional[datetime] = None
+
+    modified_by: Optional[str] = None
+
+    status: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/access/allowed_headers.py b/src/cloudflare/types/zero_trust/access/allowed_headers.py
index 4eeff39570c..b01102b161f 100644
--- a/src/cloudflare/types/zero_trust/access/allowed_headers.py
+++ b/src/cloudflare/types/zero_trust/access/allowed_headers.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["AllowedHeaders"]
 
-AllowedHeaders = str
+AllowedHeaders: TypeAlias = str
diff --git a/src/cloudflare/types/zero_trust/access/allowed_idps.py b/src/cloudflare/types/zero_trust/access/allowed_idps.py
index 79c7e1af7e3..4c562183e14 100644
--- a/src/cloudflare/types/zero_trust/access/allowed_idps.py
+++ b/src/cloudflare/types/zero_trust/access/allowed_idps.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["AllowedIdPs"]
 
-AllowedIdPs = str
+AllowedIdPs: TypeAlias = str
diff --git a/src/cloudflare/types/zero_trust/access/allowed_methods.py b/src/cloudflare/types/zero_trust/access/allowed_methods.py
index c1c9e45b63b..89801a33a16 100644
--- a/src/cloudflare/types/zero_trust/access/allowed_methods.py
+++ b/src/cloudflare/types/zero_trust/access/allowed_methods.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["AllowedMethods"]
 
-AllowedMethods = Literal["GET", "POST", "HEAD", "PUT", "DELETE", "CONNECT", "OPTIONS", "TRACE", "PATCH"]
+AllowedMethods: TypeAlias = Literal["GET", "POST", "HEAD", "PUT", "DELETE", "CONNECT", "OPTIONS", "TRACE", "PATCH"]
diff --git a/src/cloudflare/types/zero_trust/access/allowed_origins.py b/src/cloudflare/types/zero_trust/access/allowed_origins.py
index d18558e3958..7976c73d920 100644
--- a/src/cloudflare/types/zero_trust/access/allowed_origins.py
+++ b/src/cloudflare/types/zero_trust/access/allowed_origins.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["AllowedOrigins"]
 
-AllowedOrigins = str
+AllowedOrigins: TypeAlias = str
diff --git a/src/cloudflare/types/zero_trust/access/app_id.py b/src/cloudflare/types/zero_trust/access/app_id.py
new file mode 100644
index 00000000000..e2392cbb677
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/app_id.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["AppID"]
+
+AppID: TypeAlias = str
diff --git a/src/cloudflare/types/zero_trust/access/app_id_param.py b/src/cloudflare/types/zero_trust/access/app_id_param.py
deleted file mode 100644
index a0db766c1c1..00000000000
--- a/src/cloudflare/types/zero_trust/access/app_id_param.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Union
-
-__all__ = ["AppIDParam"]
-
-AppIDParam = Union[str, str]
diff --git a/src/cloudflare/types/zero_trust/access/application_create_params.py b/src/cloudflare/types/zero_trust/access/application_create_params.py
index c904e9e8f11..499a81de9f2 100644
--- a/src/cloudflare/types/zero_trust/access/application_create_params.py
+++ b/src/cloudflare/types/zero_trust/access/application_create_params.py
@@ -2,125 +2,127 @@
 
 from __future__ import annotations
 
-from typing import Dict, List, Union, Iterable
-from datetime import datetime
-from typing_extensions import Literal, Required, Annotated, TypedDict
+from typing import Dict, Union, Iterable
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
 from .decision import Decision
-from ...._utils import PropertyInfo
+from ...._types import SequenceNotStr
 from .allowed_idps import AllowedIdPs
 from .application_type import ApplicationType
-from ..access_rule_param import AccessRuleParam
 from .cors_headers_param import CORSHeadersParam
+from .oidc_saas_app_param import OIDCSaaSAppParam
 from .saml_saas_app_param import SAMLSaaSAppParam
 from .self_hosted_domains import SelfHostedDomains
-from .applications.approval_group_param import ApprovalGroupParam
+from .approval_group_param import ApprovalGroupParam
+from .scim_config_mapping_param import SCIMConfigMappingParam
+from .applications.access_rule_param import AccessRuleParam
+from .scim_config_authentication_oauth2_param import SCIMConfigAuthenticationOauth2Param
+from .scim_config_authentication_http_basic_param import SCIMConfigAuthenticationHTTPBasicParam
+from .scim_config_authentication_oauth_bearer_token_param import SCIMConfigAuthenticationOAuthBearerTokenParam
 
 __all__ = [
     "ApplicationCreateParams",
     "SelfHostedApplication",
+    "SelfHostedApplicationDestination",
+    "SelfHostedApplicationDestinationPublicDestination",
+    "SelfHostedApplicationDestinationPrivateDestination",
+    "SelfHostedApplicationDestinationViaMcpServerPortalDestination",
     "SelfHostedApplicationPolicy",
     "SelfHostedApplicationPolicyAccessAppPolicyLink",
     "SelfHostedApplicationPolicyUnionMember2",
     "SelfHostedApplicationSCIMConfig",
     "SelfHostedApplicationSCIMConfigAuthentication",
-    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "SelfHostedApplicationSCIMConfigMapping",
-    "SelfHostedApplicationSCIMConfigMappingOperations",
+    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
     "SaaSApplication",
     "SaaSApplicationPolicy",
     "SaaSApplicationPolicyAccessAppPolicyLink",
     "SaaSApplicationPolicyUnionMember2",
     "SaaSApplicationSaaSApp",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSApp",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaims",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaimsSource",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppHybridAndImplicitOptions",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppRefreshTokenOptions",
     "SaaSApplicationSCIMConfig",
     "SaaSApplicationSCIMConfigAuthentication",
-    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "SaaSApplicationSCIMConfigMapping",
-    "SaaSApplicationSCIMConfigMappingOperations",
+    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
     "BrowserSSHApplication",
+    "BrowserSSHApplicationDestination",
+    "BrowserSSHApplicationDestinationPublicDestination",
+    "BrowserSSHApplicationDestinationPrivateDestination",
+    "BrowserSSHApplicationDestinationViaMcpServerPortalDestination",
     "BrowserSSHApplicationPolicy",
     "BrowserSSHApplicationPolicyAccessAppPolicyLink",
     "BrowserSSHApplicationPolicyUnionMember2",
     "BrowserSSHApplicationSCIMConfig",
     "BrowserSSHApplicationSCIMConfigAuthentication",
-    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BrowserSSHApplicationSCIMConfigMapping",
-    "BrowserSSHApplicationSCIMConfigMappingOperations",
-    "BrowserVncApplication",
-    "BrowserVncApplicationPolicy",
-    "BrowserVncApplicationPolicyAccessAppPolicyLink",
-    "BrowserVncApplicationPolicyUnionMember2",
-    "BrowserVncApplicationSCIMConfig",
-    "BrowserVncApplicationSCIMConfigAuthentication",
-    "BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BrowserVncApplicationSCIMConfigMapping",
-    "BrowserVncApplicationSCIMConfigMappingOperations",
+    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserVNCApplication",
+    "BrowserVNCApplicationDestination",
+    "BrowserVNCApplicationDestinationPublicDestination",
+    "BrowserVNCApplicationDestinationPrivateDestination",
+    "BrowserVNCApplicationDestinationViaMcpServerPortalDestination",
+    "BrowserVNCApplicationPolicy",
+    "BrowserVNCApplicationPolicyAccessAppPolicyLink",
+    "BrowserVNCApplicationPolicyUnionMember2",
+    "BrowserVNCApplicationSCIMConfig",
+    "BrowserVNCApplicationSCIMConfigAuthentication",
+    "BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
     "AppLauncherApplication",
+    "AppLauncherApplicationFooterLink",
+    "AppLauncherApplicationLandingPageDesign",
     "AppLauncherApplicationPolicy",
     "AppLauncherApplicationPolicyAccessAppPolicyLink",
     "AppLauncherApplicationPolicyUnionMember2",
-    "AppLauncherApplicationSCIMConfig",
-    "AppLauncherApplicationSCIMConfigAuthentication",
-    "AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "AppLauncherApplicationSCIMConfigMapping",
-    "AppLauncherApplicationSCIMConfigMappingOperations",
     "DeviceEnrollmentPermissionsApplication",
     "DeviceEnrollmentPermissionsApplicationPolicy",
     "DeviceEnrollmentPermissionsApplicationPolicyAccessAppPolicyLink",
     "DeviceEnrollmentPermissionsApplicationPolicyUnionMember2",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfig",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthentication",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigMapping",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigMappingOperations",
     "BrowserIsolationPermissionsApplication",
     "BrowserIsolationPermissionsApplicationPolicy",
     "BrowserIsolationPermissionsApplicationPolicyAccessAppPolicyLink",
     "BrowserIsolationPermissionsApplicationPolicyUnionMember2",
-    "BrowserIsolationPermissionsApplicationSCIMConfig",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthentication",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BrowserIsolationPermissionsApplicationSCIMConfigMapping",
-    "BrowserIsolationPermissionsApplicationSCIMConfigMappingOperations",
+    "GatewayIdentityProxyEndpointApplication",
+    "GatewayIdentityProxyEndpointApplicationPolicy",
+    "GatewayIdentityProxyEndpointApplicationPolicyAccessAppPolicyLink",
+    "GatewayIdentityProxyEndpointApplicationPolicyUnionMember2",
     "BookmarkApplication",
-    "BookmarkApplicationSCIMConfig",
-    "BookmarkApplicationSCIMConfigAuthentication",
-    "BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BookmarkApplicationSCIMConfigMapping",
-    "BookmarkApplicationSCIMConfigMappingOperations",
+    "BookmarkApplicationPolicy",
+    "BookmarkApplicationPolicyAccessAppPolicyLink",
+    "BookmarkApplicationPolicyUnionMember2",
+    "InfrastructureApplication",
+    "InfrastructureApplicationTargetCriterion",
+    "InfrastructureApplicationPolicy",
+    "InfrastructureApplicationPolicyConnectionRules",
+    "InfrastructureApplicationPolicyConnectionRulesSSH",
+    "BrowserRdpApplication",
+    "BrowserRdpApplicationTargetCriterion",
+    "BrowserRdpApplicationDestination",
+    "BrowserRdpApplicationDestinationPublicDestination",
+    "BrowserRdpApplicationDestinationPrivateDestination",
+    "BrowserRdpApplicationDestinationViaMcpServerPortalDestination",
+    "BrowserRdpApplicationPolicy",
+    "BrowserRdpApplicationPolicyAccessAppPolicyLink",
+    "BrowserRdpApplicationPolicyUnionMember2",
+    "BrowserRdpApplicationSCIMConfig",
+    "BrowserRdpApplicationSCIMConfigAuthentication",
+    "BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
 ]
 
 
 class SelfHostedApplication(TypedDict, total=False):
     domain: Required[str]
-    """The primary hostname and path that Access will secure.
+    """The primary hostname and path secured by Access.
 
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
+    This domain will be displayed if the app is visible in the App Launcher.
     """
 
-    type: Required[str]
+    type: Required[ApplicationType]
     """The application type."""
 
     account_id: str
@@ -137,7 +139,10 @@ class SelfHostedApplication(TypedDict, total=False):
     authentication.
     """
 
-    allowed_idps: List[AllowedIdPs]
+    allow_iframe: bool
+    """Enables loading application content in an iFrame."""
+
+    allowed_idps: SequenceNotStr[AllowedIdPs]
     """The identity providers your users can select when connecting to this
     application.
 
@@ -174,9 +179,17 @@ class SelfHostedApplication(TypedDict, total=False):
     application when failing non-identity rules.
     """
 
-    custom_pages: List[str]
+    custom_pages: SequenceNotStr[str]
     """The custom pages that will be displayed when applicable for this application"""
 
+    destinations: Iterable[SelfHostedApplicationDestination]
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
     enable_binding_cookie: bool
     """
     Enables the binding cookie, which increases security against compromised
@@ -207,13 +220,24 @@ class SelfHostedApplication(TypedDict, total=False):
     If disabled, the JWT will scope to the hostname by default
     """
 
-    policies: List[SelfHostedApplicationPolicy]
+    policies: SequenceNotStr[SelfHostedApplicationPolicy]
     """
-    The policies that will apply to the application, in ascending order of
+    The policies that Access applies to the application, in ascending order of
     precedence. Items can reference existing policies or create new policies
     exclusive to the application.
     """
 
+    read_service_tokens_from_header: str
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
     same_site_cookie_attribute: str
     """
     Sets the SameSite cookie setting, which provides increased security against CSRF
@@ -226,8 +250,13 @@ class SelfHostedApplication(TypedDict, total=False):
     This is currently in closed beta.
     """
 
-    self_hosted_domains: List[SelfHostedDomains]
-    """List of domains that Access will secure."""
+    self_hosted_domains: SequenceNotStr[SelfHostedDomains]
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
 
     service_auth_401_redirect: bool
     """Returns a 401 status code when the request is blocked by a Service Auth policy."""
@@ -236,20 +265,90 @@ class SelfHostedApplication(TypedDict, total=False):
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
     skip_interstitial: bool
     """Enables automatic authentication through cloudflared."""
 
-    tags: List[str]
+    tags: SequenceNotStr[str]
     """The tags you want assigned to an application.
 
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
+    use_clientless_isolation_app_launcher_url: bool
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
+
+
+class SelfHostedApplicationDestinationPublicDestination(TypedDict, total=False):
+    """A public hostname that Access will secure.
+
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
+    """
+
+    type: Literal["public"]
+
+    uri: str
+    """The URI of the destination.
+
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
+    """
+
+
+class SelfHostedApplicationDestinationPrivateDestination(TypedDict, total=False):
+    cidr: str
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
+
+    hostname: str
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
+
+    l4_protocol: Literal["tcp", "udp"]
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
+    """
+
+    port_range: str
+    """The port range of the destination.
+
+    Can be a single port or a range of ports. When omitted, all ports will match.
+    """
+
+    type: Literal["private"]
+
+    vnet_id: str
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class SelfHostedApplicationDestinationViaMcpServerPortalDestination(TypedDict, total=False):
+    """A MCP server id configured in ai-controls.
+
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
+
+    mcp_server_id: str
+    """The MCP server id configured in ai-controls."""
+
+    type: Literal["via_mcp_server_portal"]
+
+
+SelfHostedApplicationDestination: TypeAlias = Union[
+    SelfHostedApplicationDestinationPublicDestination,
+    SelfHostedApplicationDestinationPrivateDestination,
+    SelfHostedApplicationDestinationViaMcpServerPortalDestination,
+]
+
 
 class SelfHostedApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
     id: str
     """The UUID of the policy"""
 
@@ -261,18 +360,6 @@ class SelfHostedApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
 
 
 class SelfHostedApplicationPolicyUnionMember2(TypedDict, total=False):
-    decision: Required[Decision]
-    """The action Access will take if a user matches this policy."""
-
-    include: Required[Iterable[AccessRuleParam]]
-    """Rules evaluated with an OR logical operator.
-
-    A user needs to meet only one of the Include rules.
-    """
-
-    name: Required[str]
-    """The name of the Access policy."""
-
     id: str
     """The UUID of the policy"""
 
@@ -285,12 +372,6 @@ class SelfHostedApplicationPolicyUnionMember2(TypedDict, total=False):
     session.
     """
 
-    exclude: Iterable[AccessRuleParam]
-    """Rules evaluated with a NOT logical operator.
-
-    To match the policy, a user cannot meet any of the Exclude rules.
-    """
-
     isolation_required: bool
     """
     Require this application to be served in an isolated browser for users matching
@@ -310,12 +391,6 @@ class SelfHostedApplicationPolicyUnionMember2(TypedDict, total=False):
     purpose_justification_required: bool
     """Require users to enter a justification when they log in to the application."""
 
-    require: Iterable[AccessRuleParam]
-    """Rules evaluated with an AND logical operator.
-
-    To match the policy, a user must meet all of the Require rules.
-    """
-
     session_duration: str
     """The amount of time that tokens issued for the application will be valid.
 
@@ -324,107 +399,79 @@ class SelfHostedApplicationPolicyUnionMember2(TypedDict, total=False):
     """
 
 
-SelfHostedApplicationPolicy = Union[
+SelfHostedApplicationPolicy: TypeAlias = Union[
     SelfHostedApplicationPolicyAccessAppPolicyLink, str, SelfHostedApplicationPolicyUnionMember2
 ]
 
 
-class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(TypedDict, total=False):
-    password: Required[str]
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["httpbasic"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: Required[str]
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
+class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
     TypedDict, total=False
 ):
-    token: Required[str]
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["oauthbearertoken"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(TypedDict, total=False):
-    authorization_url: Required[str]
-    """URL used to generate the auth code used during token generation."""
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
     client_id: Required[str]
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
     client_secret: Required[str]
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Required[Literal["oauth2"]]
+    scheme: Required[Literal["access_service_token"]]
     """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: Required[str]
+
+class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    TypedDict, total=False
+):
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    scopes: List[str]
+    client_id: Required[str]
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
+    client_secret: Required[str]
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-SelfHostedApplicationSCIMConfigAuthentication = Union[
-    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class SelfHostedApplicationSCIMConfigMappingOperations(TypedDict, total=False):
-    create: bool
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: bool
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: bool
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    scheme: Required[Literal["access_service_token"]]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class SelfHostedApplicationSCIMConfigMapping(TypedDict, total=False):
-    schema: Required[str]
-    """Which SCIM resource type this mapping applies to."""
+SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
 
-    enabled: bool
-    """Whether or not this mapping is enabled."""
+SelfHostedApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    Iterable[SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-    filter: str
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: SelfHostedApplicationSCIMConfigMappingOperations
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class SelfHostedApplicationSCIMConfig(TypedDict, total=False):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: str
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class SelfHostedApplicationSCIMConfig(TypedDict, total=False):
     idp_uid: Required[str]
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -450,7 +497,7 @@ class SelfHostedApplicationSCIMConfig(TypedDict, total=False):
     enabled: bool
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Iterable[SelfHostedApplicationSCIMConfigMapping]
+    mappings: Iterable[SCIMConfigMappingParam]
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
@@ -464,7 +511,7 @@ class SaaSApplication(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    allowed_idps: List[AllowedIdPs]
+    allowed_idps: SequenceNotStr[AllowedIdPs]
     """The identity providers your users can select when connecting to this
     application.
 
@@ -481,7 +528,7 @@ class SaaSApplication(TypedDict, total=False):
     You must specify only one identity provider in allowed_idps.
     """
 
-    custom_pages: List[str]
+    custom_pages: SequenceNotStr[str]
     """The custom pages that will be displayed when applicable for this application"""
 
     logo_url: str
@@ -490,9 +537,9 @@ class SaaSApplication(TypedDict, total=False):
     name: str
     """The name of the application."""
 
-    policies: List[SaaSApplicationPolicy]
+    policies: SequenceNotStr[SaaSApplicationPolicy]
     """
-    The policies that will apply to the application, in ascending order of
+    The policies that Access applies to the application, in ascending order of
     precedence. Items can reference existing policies or create new policies
     exclusive to the application.
     """
@@ -505,17 +552,19 @@ class SaaSApplication(TypedDict, total=False):
     This is currently in closed beta.
     """
 
-    tags: List[str]
+    tags: SequenceNotStr[str]
     """The tags you want assigned to an application.
 
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    type: str
+    type: ApplicationType
     """The application type."""
 
 
 class SaaSApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
     id: str
     """The UUID of the policy"""
 
@@ -527,18 +576,6 @@ class SaaSApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
 
 
 class SaaSApplicationPolicyUnionMember2(TypedDict, total=False):
-    decision: Required[Decision]
-    """The action Access will take if a user matches this policy."""
-
-    include: Required[Iterable[AccessRuleParam]]
-    """Rules evaluated with an OR logical operator.
-
-    A user needs to meet only one of the Include rules.
-    """
-
-    name: Required[str]
-    """The name of the Access policy."""
-
     id: str
     """The UUID of the policy"""
 
@@ -551,12 +588,6 @@ class SaaSApplicationPolicyUnionMember2(TypedDict, total=False):
     session.
     """
 
-    exclude: Iterable[AccessRuleParam]
-    """Rules evaluated with a NOT logical operator.
-
-    To match the policy, a user cannot meet any of the Exclude rules.
-    """
-
     isolation_required: bool
     """
     Require this application to be served in an isolated browser for users matching
@@ -576,12 +607,6 @@ class SaaSApplicationPolicyUnionMember2(TypedDict, total=False):
     purpose_justification_required: bool
     """Require users to enter a justification when they log in to the application."""
 
-    require: Iterable[AccessRuleParam]
-    """Rules evaluated with an AND logical operator.
-
-    To match the policy, a user must meet all of the Require rules.
-    """
-
     session_duration: str
     """The amount of time that tokens issued for the application will be valid.
 
@@ -590,206 +615,79 @@ class SaaSApplicationPolicyUnionMember2(TypedDict, total=False):
     """
 
 
-SaaSApplicationPolicy = Union[SaaSApplicationPolicyAccessAppPolicyLink, str, SaaSApplicationPolicyUnionMember2]
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaimsSource(TypedDict, total=False):
-    name: str
-    """The name of the IdP claim."""
-
-    name_by_idp: Dict[str, str]
-    """A mapping from IdP ID to claim name."""
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaims(TypedDict, total=False):
-    name: str
-    """The name of the claim."""
-
-    required: bool
-    """If the claim is required when building an OIDC token."""
-
-    scope: Literal["groups", "profile", "email", "openid"]
-    """The scope of the claim."""
-
-    source: SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaimsSource
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppHybridAndImplicitOptions(TypedDict, total=False):
-    return_access_token_from_authorization_endpoint: bool
-    """If an Access Token should be returned from the OIDC Authorization endpoint"""
-
-    return_id_token_from_authorization_endpoint: bool
-    """If an ID Token should be returned from the OIDC Authorization endpoint"""
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppRefreshTokenOptions(TypedDict, total=False):
-    lifetime: str
-    """How long a refresh token will be valid for after creation.
-
-    Valid units are m,h,d. Must be longer than 1m.
-    """
-
+SaaSApplicationPolicy: TypeAlias = Union[
+    SaaSApplicationPolicyAccessAppPolicyLink, str, SaaSApplicationPolicyUnionMember2
+]
 
-class SaaSApplicationSaaSAppAccessOIDCSaaSApp(TypedDict, total=False):
-    access_token_lifetime: str
-    """The lifetime of the OIDC Access Token after creation.
+SaaSApplicationSaaSApp: TypeAlias = Union[SAMLSaaSAppParam, OIDCSaaSAppParam]
 
-    Valid units are m,h. Must be greater than or equal to 1m and less than or equal
-    to 24h.
-    """
 
-    allow_pkce_without_client_secret: bool
+class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(TypedDict, total=False):
     """
-    If client secret should be required on the token endpoint when
-    authorization_code_with_pkce grant is used.
-    """
-
-    app_launcher_url: str
-    """The URL where this applications tile redirects users"""
-
-    auth_type: Literal["saml", "oidc"]
-    """Identifier of the authentication protocol used for the saas app.
-
-    Required for OIDC.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    client_id: str
-    """The application client id"""
-
-    client_secret: str
-    """The application client secret, only returned on POST request."""
-
-    created_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-
-    custom_claims: SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaims
-
-    grant_types: List[
-        Literal["authorization_code", "authorization_code_with_pkce", "refresh_tokens", "hybrid", "implicit"]
-    ]
-    """The OIDC flows supported by this application"""
-
-    group_filter_regex: str
-    """A regex to filter Cloudflare groups returned in ID token and userinfo endpoint"""
-
-    hybrid_and_implicit_options: SaaSApplicationSaaSAppAccessOIDCSaaSAppHybridAndImplicitOptions
-
-    public_key: str
-    """The Access public certificate that will be used to verify your identity."""
-
-    redirect_uris: List[str]
+    client_id: Required[str]
     """
-    The permitted URL's for Cloudflare to return Authorization codes and Access/ID
-    tokens
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
-    refresh_token_options: SaaSApplicationSaaSAppAccessOIDCSaaSAppRefreshTokenOptions
-
-    scopes: List[Literal["openid", "groups", "email", "profile"]]
+    client_secret: Required[str]
     """
-    Define the user information shared with access, "offline_access" scope will be
-    automatically enabled if refresh tokens are enabled
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    updated_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-
-
-SaaSApplicationSaaSApp = Union[SAMLSaaSAppParam, SaaSApplicationSaaSAppAccessOIDCSaaSApp]
-
-
-class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(TypedDict, total=False):
-    password: Required[str]
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["httpbasic"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: Required[str]
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(TypedDict, total=False):
-    token: Required[str]
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["oauthbearertoken"]]
+    scheme: Required[Literal["access_service_token"]]
     """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(TypedDict, total=False):
-    authorization_url: Required[str]
-    """URL used to generate the auth code used during token generation."""
-
-    client_id: Required[str]
+class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    TypedDict, total=False
+):
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    client_secret: Required[str]
+    client_id: Required[str]
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Required[Literal["oauth2"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    token_url: Required[str]
+    client_secret: Required[str]
     """
-    URL used to generate the token used to authenticate with the remote SCIM
+    Client secret of the Access service token used to authenticate with the remote
     service.
     """
 
-    scopes: List[str]
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
-    """
+    scheme: Required[Literal["access_service_token"]]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-SaaSApplicationSCIMConfigAuthentication = Union[
-    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
+SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
 ]
 
+SaaSApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    Iterable[SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-class SaaSApplicationSCIMConfigMappingOperations(TypedDict, total=False):
-    create: bool
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: bool
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: bool
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
-
-
-class SaaSApplicationSCIMConfigMapping(TypedDict, total=False):
-    schema: Required[str]
-    """Which SCIM resource type this mapping applies to."""
-
-    enabled: bool
-    """Whether or not this mapping is enabled."""
-
-    filter: str
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: SaaSApplicationSCIMConfigMappingOperations
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class SaaSApplicationSCIMConfig(TypedDict, total=False):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: str
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class SaaSApplicationSCIMConfig(TypedDict, total=False):
     idp_uid: Required[str]
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -815,7 +713,7 @@ class SaaSApplicationSCIMConfig(TypedDict, total=False):
     enabled: bool
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Iterable[SaaSApplicationSCIMConfigMapping]
+    mappings: Iterable[SCIMConfigMappingParam]
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
@@ -824,13 +722,29 @@ class SaaSApplicationSCIMConfig(TypedDict, total=False):
 
 class BrowserSSHApplication(TypedDict, total=False):
     domain: Required[str]
-    """The primary hostname and path that Access will secure.
-
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
-    """
-
-    type: Required[str]
+    """The primary hostname and path secured by Access.
+
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
+
+    type: Required[
+        Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ]
+    ]
     """The application type."""
 
     account_id: str
@@ -847,7 +761,10 @@ class BrowserSSHApplication(TypedDict, total=False):
     authentication.
     """
 
-    allowed_idps: List[AllowedIdPs]
+    allow_iframe: bool
+    """Enables loading application content in an iFrame."""
+
+    allowed_idps: SequenceNotStr[AllowedIdPs]
     """The identity providers your users can select when connecting to this
     application.
 
@@ -884,9 +801,17 @@ class BrowserSSHApplication(TypedDict, total=False):
     application when failing non-identity rules.
     """
 
-    custom_pages: List[str]
+    custom_pages: SequenceNotStr[str]
     """The custom pages that will be displayed when applicable for this application"""
 
+    destinations: Iterable[BrowserSSHApplicationDestination]
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
     enable_binding_cookie: bool
     """
     Enables the binding cookie, which increases security against compromised
@@ -917,13 +842,24 @@ class BrowserSSHApplication(TypedDict, total=False):
     If disabled, the JWT will scope to the hostname by default
     """
 
-    policies: List[BrowserSSHApplicationPolicy]
+    policies: SequenceNotStr[BrowserSSHApplicationPolicy]
     """
-    The policies that will apply to the application, in ascending order of
+    The policies that Access applies to the application, in ascending order of
     precedence. Items can reference existing policies or create new policies
     exclusive to the application.
     """
 
+    read_service_tokens_from_header: str
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
     same_site_cookie_attribute: str
     """
     Sets the SameSite cookie setting, which provides increased security against CSRF
@@ -936,8 +872,13 @@ class BrowserSSHApplication(TypedDict, total=False):
     This is currently in closed beta.
     """
 
-    self_hosted_domains: List[SelfHostedDomains]
-    """List of domains that Access will secure."""
+    self_hosted_domains: SequenceNotStr[SelfHostedDomains]
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
 
     service_auth_401_redirect: bool
     """Returns a 401 status code when the request is blocked by a Service Auth policy."""
@@ -946,69 +887,121 @@ class BrowserSSHApplication(TypedDict, total=False):
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
     skip_interstitial: bool
     """Enables automatic authentication through cloudflared."""
 
-    tags: List[str]
+    tags: SequenceNotStr[str]
     """The tags you want assigned to an application.
 
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
+    use_clientless_isolation_app_launcher_url: bool
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
 
-class BrowserSSHApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
-    id: str
-    """The UUID of the policy"""
 
-    precedence: int
-    """The order of execution for this policy.
+class BrowserSSHApplicationDestinationPublicDestination(TypedDict, total=False):
+    """A public hostname that Access will secure.
 
-    Must be unique for each policy within an app.
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
     """
 
+    type: Literal["public"]
 
-class BrowserSSHApplicationPolicyUnionMember2(TypedDict, total=False):
-    decision: Required[Decision]
-    """The action Access will take if a user matches this policy."""
-
-    include: Required[Iterable[AccessRuleParam]]
-    """Rules evaluated with an OR logical operator.
+    uri: str
+    """The URI of the destination.
 
-    A user needs to meet only one of the Include rules.
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
     """
 
-    name: Required[str]
-    """The name of the Access policy."""
 
-    id: str
-    """The UUID of the policy"""
+class BrowserSSHApplicationDestinationPrivateDestination(TypedDict, total=False):
+    cidr: str
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
 
-    approval_groups: Iterable[ApprovalGroupParam]
-    """Administrators who can approve a temporary authentication request."""
+    hostname: str
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
 
-    approval_required: bool
-    """
-    Requires the user to request access from an administrator at the start of each
-    session.
+    l4_protocol: Literal["tcp", "udp"]
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
     """
 
-    exclude: Iterable[AccessRuleParam]
-    """Rules evaluated with a NOT logical operator.
+    port_range: str
+    """The port range of the destination.
 
-    To match the policy, a user cannot meet any of the Exclude rules.
+    Can be a single port or a range of ports. When omitted, all ports will match.
     """
 
-    isolation_required: bool
-    """
-    Require this application to be served in an isolated browser for users matching
-    this policy. 'Client Web Isolation' must be on for the account in order to use
-    this feature.
-    """
+    type: Literal["private"]
 
-    precedence: int
+    vnet_id: str
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class BrowserSSHApplicationDestinationViaMcpServerPortalDestination(TypedDict, total=False):
+    """A MCP server id configured in ai-controls.
+
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
+
+    mcp_server_id: str
+    """The MCP server id configured in ai-controls."""
+
+    type: Literal["via_mcp_server_portal"]
+
+
+BrowserSSHApplicationDestination: TypeAlias = Union[
+    BrowserSSHApplicationDestinationPublicDestination,
+    BrowserSSHApplicationDestinationPrivateDestination,
+    BrowserSSHApplicationDestinationViaMcpServerPortalDestination,
+]
+
+
+class BrowserSSHApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
+    id: str
+    """The UUID of the policy"""
+
+    precedence: int
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
+
+class BrowserSSHApplicationPolicyUnionMember2(TypedDict, total=False):
+    id: str
+    """The UUID of the policy"""
+
+    approval_groups: Iterable[ApprovalGroupParam]
+    """Administrators who can approve a temporary authentication request."""
+
+    approval_required: bool
+    """
+    Requires the user to request access from an administrator at the start of each
+    session.
+    """
+
+    isolation_required: bool
+    """
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
+    """
+
+    precedence: int
     """The order of execution for this policy.
 
     Must be unique for each policy within an app.
@@ -1020,12 +1013,6 @@ class BrowserSSHApplicationPolicyUnionMember2(TypedDict, total=False):
     purpose_justification_required: bool
     """Require users to enter a justification when they log in to the application."""
 
-    require: Iterable[AccessRuleParam]
-    """Rules evaluated with an AND logical operator.
-
-    To match the policy, a user must meet all of the Require rules.
-    """
-
     session_duration: str
     """The amount of time that tokens issued for the application will be valid.
 
@@ -1034,107 +1021,79 @@ class BrowserSSHApplicationPolicyUnionMember2(TypedDict, total=False):
     """
 
 
-BrowserSSHApplicationPolicy = Union[
+BrowserSSHApplicationPolicy: TypeAlias = Union[
     BrowserSSHApplicationPolicyAccessAppPolicyLink, str, BrowserSSHApplicationPolicyUnionMember2
 ]
 
 
-class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(TypedDict, total=False):
-    password: Required[str]
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["httpbasic"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: Required[str]
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
+class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
     TypedDict, total=False
 ):
-    token: Required[str]
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["oauthbearertoken"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(TypedDict, total=False):
-    authorization_url: Required[str]
-    """URL used to generate the auth code used during token generation."""
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
     client_id: Required[str]
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
     client_secret: Required[str]
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Required[Literal["oauth2"]]
+    scheme: Required[Literal["access_service_token"]]
     """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: Required[str]
+
+class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    TypedDict, total=False
+):
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    scopes: List[str]
+    client_id: Required[str]
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
+    client_secret: Required[str]
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-BrowserSSHApplicationSCIMConfigAuthentication = Union[
-    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class BrowserSSHApplicationSCIMConfigMappingOperations(TypedDict, total=False):
-    create: bool
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: bool
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: bool
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    scheme: Required[Literal["access_service_token"]]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class BrowserSSHApplicationSCIMConfigMapping(TypedDict, total=False):
-    schema: Required[str]
-    """Which SCIM resource type this mapping applies to."""
+BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
 
-    enabled: bool
-    """Whether or not this mapping is enabled."""
+BrowserSSHApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    Iterable[BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-    filter: str
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: BrowserSSHApplicationSCIMConfigMappingOperations
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class BrowserSSHApplicationSCIMConfig(TypedDict, total=False):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: str
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class BrowserSSHApplicationSCIMConfig(TypedDict, total=False):
     idp_uid: Required[str]
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -1160,22 +1119,38 @@ class BrowserSSHApplicationSCIMConfig(TypedDict, total=False):
     enabled: bool
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Iterable[BrowserSSHApplicationSCIMConfigMapping]
+    mappings: Iterable[SCIMConfigMappingParam]
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
     """
 
 
-class BrowserVncApplication(TypedDict, total=False):
+class BrowserVNCApplication(TypedDict, total=False):
     domain: Required[str]
-    """The primary hostname and path that Access will secure.
-
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
-    """
-
-    type: Required[str]
+    """The primary hostname and path secured by Access.
+
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
+
+    type: Required[
+        Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ]
+    ]
     """The application type."""
 
     account_id: str
@@ -1192,7 +1167,10 @@ class BrowserVncApplication(TypedDict, total=False):
     authentication.
     """
 
-    allowed_idps: List[AllowedIdPs]
+    allow_iframe: bool
+    """Enables loading application content in an iFrame."""
+
+    allowed_idps: SequenceNotStr[AllowedIdPs]
     """The identity providers your users can select when connecting to this
     application.
 
@@ -1229,9 +1207,17 @@ class BrowserVncApplication(TypedDict, total=False):
     application when failing non-identity rules.
     """
 
-    custom_pages: List[str]
+    custom_pages: SequenceNotStr[str]
     """The custom pages that will be displayed when applicable for this application"""
 
+    destinations: Iterable[BrowserVNCApplicationDestination]
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
     enable_binding_cookie: bool
     """
     Enables the binding cookie, which increases security against compromised
@@ -1262,27 +1248,43 @@ class BrowserVncApplication(TypedDict, total=False):
     If disabled, the JWT will scope to the hostname by default
     """
 
-    policies: List[BrowserVncApplicationPolicy]
+    policies: SequenceNotStr[BrowserVNCApplicationPolicy]
     """
-    The policies that will apply to the application, in ascending order of
+    The policies that Access applies to the application, in ascending order of
     precedence. Items can reference existing policies or create new policies
     exclusive to the application.
     """
 
+    read_service_tokens_from_header: str
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
     same_site_cookie_attribute: str
     """
     Sets the SameSite cookie setting, which provides increased security against CSRF
     attacks.
     """
 
-    scim_config: BrowserVncApplicationSCIMConfig
+    scim_config: BrowserVNCApplicationSCIMConfig
     """Configuration for provisioning to this application via SCIM.
 
     This is currently in closed beta.
     """
 
-    self_hosted_domains: List[SelfHostedDomains]
-    """List of domains that Access will secure."""
+    self_hosted_domains: SequenceNotStr[SelfHostedDomains]
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
 
     service_auth_401_redirect: bool
     """Returns a 401 status code when the request is blocked by a Service Auth policy."""
@@ -1291,43 +1293,101 @@ class BrowserVncApplication(TypedDict, total=False):
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
     skip_interstitial: bool
     """Enables automatic authentication through cloudflared."""
 
-    tags: List[str]
+    tags: SequenceNotStr[str]
     """The tags you want assigned to an application.
 
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
+    use_clientless_isolation_app_launcher_url: bool
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
 
-class BrowserVncApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
-    id: str
-    """The UUID of the policy"""
 
-    precedence: int
-    """The order of execution for this policy.
+class BrowserVNCApplicationDestinationPublicDestination(TypedDict, total=False):
+    """A public hostname that Access will secure.
 
-    Must be unique for each policy within an app.
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
     """
 
+    type: Literal["public"]
 
-class BrowserVncApplicationPolicyUnionMember2(TypedDict, total=False):
-    decision: Required[Decision]
-    """The action Access will take if a user matches this policy."""
+    uri: str
+    """The URI of the destination.
 
-    include: Required[Iterable[AccessRuleParam]]
-    """Rules evaluated with an OR logical operator.
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
+    """
 
-    A user needs to meet only one of the Include rules.
+
+class BrowserVNCApplicationDestinationPrivateDestination(TypedDict, total=False):
+    cidr: str
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
+
+    hostname: str
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
+
+    l4_protocol: Literal["tcp", "udp"]
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
     """
 
-    name: Required[str]
-    """The name of the Access policy."""
+    port_range: str
+    """The port range of the destination.
+
+    Can be a single port or a range of ports. When omitted, all ports will match.
+    """
+
+    type: Literal["private"]
+
+    vnet_id: str
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class BrowserVNCApplicationDestinationViaMcpServerPortalDestination(TypedDict, total=False):
+    """A MCP server id configured in ai-controls.
 
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
+
+    mcp_server_id: str
+    """The MCP server id configured in ai-controls."""
+
+    type: Literal["via_mcp_server_portal"]
+
+
+BrowserVNCApplicationDestination: TypeAlias = Union[
+    BrowserVNCApplicationDestinationPublicDestination,
+    BrowserVNCApplicationDestinationPrivateDestination,
+    BrowserVNCApplicationDestinationViaMcpServerPortalDestination,
+]
+
+
+class BrowserVNCApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
+    id: str
+    """The UUID of the policy"""
+
+    precedence: int
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
+
+class BrowserVNCApplicationPolicyUnionMember2(TypedDict, total=False):
     id: str
     """The UUID of the policy"""
 
@@ -1340,12 +1400,6 @@ class BrowserVncApplicationPolicyUnionMember2(TypedDict, total=False):
     session.
     """
 
-    exclude: Iterable[AccessRuleParam]
-    """Rules evaluated with a NOT logical operator.
-
-    To match the policy, a user cannot meet any of the Exclude rules.
-    """
-
     isolation_required: bool
     """
     Require this application to be served in an isolated browser for users matching
@@ -1365,12 +1419,6 @@ class BrowserVncApplicationPolicyUnionMember2(TypedDict, total=False):
     purpose_justification_required: bool
     """Require users to enter a justification when they log in to the application."""
 
-    require: Iterable[AccessRuleParam]
-    """Rules evaluated with an AND logical operator.
-
-    To match the policy, a user must meet all of the Require rules.
-    """
-
     session_duration: str
     """The amount of time that tokens issued for the application will be valid.
 
@@ -1379,107 +1427,79 @@ class BrowserVncApplicationPolicyUnionMember2(TypedDict, total=False):
     """
 
 
-BrowserVncApplicationPolicy = Union[
-    BrowserVncApplicationPolicyAccessAppPolicyLink, str, BrowserVncApplicationPolicyUnionMember2
+BrowserVNCApplicationPolicy: TypeAlias = Union[
+    BrowserVNCApplicationPolicyAccessAppPolicyLink, str, BrowserVNCApplicationPolicyUnionMember2
 ]
 
 
-class BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(TypedDict, total=False):
-    password: Required[str]
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["httpbasic"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: Required[str]
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
+class BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
     TypedDict, total=False
 ):
-    token: Required[str]
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["oauthbearertoken"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(TypedDict, total=False):
-    authorization_url: Required[str]
-    """URL used to generate the auth code used during token generation."""
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
     client_id: Required[str]
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
     client_secret: Required[str]
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Required[Literal["oauth2"]]
+    scheme: Required[Literal["access_service_token"]]
     """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: Required[str]
+
+class BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    TypedDict, total=False
+):
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    scopes: List[str]
+    client_id: Required[str]
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
+    client_secret: Required[str]
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-BrowserVncApplicationSCIMConfigAuthentication = Union[
-    BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class BrowserVncApplicationSCIMConfigMappingOperations(TypedDict, total=False):
-    create: bool
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: bool
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: bool
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    scheme: Required[Literal["access_service_token"]]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class BrowserVncApplicationSCIMConfigMapping(TypedDict, total=False):
-    schema: Required[str]
-    """Which SCIM resource type this mapping applies to."""
+BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
 
-    enabled: bool
-    """Whether or not this mapping is enabled."""
+BrowserVNCApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    Iterable[BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-    filter: str
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: BrowserVncApplicationSCIMConfigMappingOperations
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class BrowserVNCApplicationSCIMConfig(TypedDict, total=False):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: str
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class BrowserVncApplicationSCIMConfig(TypedDict, total=False):
     idp_uid: Required[str]
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -1489,7 +1509,7 @@ class BrowserVncApplicationSCIMConfig(TypedDict, total=False):
     remote_uri: Required[str]
     """The base URI for the application's SCIM-compatible API."""
 
-    authentication: BrowserVncApplicationSCIMConfigAuthentication
+    authentication: BrowserVNCApplicationSCIMConfigAuthentication
     """
     Attributes for configuring HTTP Basic authentication scheme for SCIM
     provisioning to an application.
@@ -1505,7 +1525,7 @@ class BrowserVncApplicationSCIMConfig(TypedDict, total=False):
     enabled: bool
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Iterable[BrowserVncApplicationSCIMConfigMapping]
+    mappings: Iterable[SCIMConfigMappingParam]
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
@@ -1513,7 +1533,24 @@ class BrowserVncApplicationSCIMConfig(TypedDict, total=False):
 
 
 class AppLauncherApplication(TypedDict, total=False):
-    type: Required[ApplicationType]
+    type: Required[
+        Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ]
+    ]
     """The application type."""
 
     account_id: str
@@ -1522,13 +1559,16 @@ class AppLauncherApplication(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    allowed_idps: List[AllowedIdPs]
+    allowed_idps: SequenceNotStr[AllowedIdPs]
     """The identity providers your users can select when connecting to this
     application.
 
     Defaults to all IdPs configured in your account.
     """
 
+    app_launcher_logo_url: str
+    """The image URL of the logo shown in the App Launcher header."""
+
     auto_redirect_to_identity: bool
     """When set to `true`, users skip the identity provider selection step during
     login.
@@ -1536,28 +1576,81 @@ class AppLauncherApplication(TypedDict, total=False):
     You must specify only one identity provider in allowed_idps.
     """
 
-    policies: List[AppLauncherApplicationPolicy]
+    bg_color: str
+    """The background color of the App Launcher page."""
+
+    custom_deny_url: str
     """
-    The policies that will apply to the application, in ascending order of
-    precedence. Items can reference existing policies or create new policies
-    exclusive to the application.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
     """
 
-    scim_config: AppLauncherApplicationSCIMConfig
-    """Configuration for provisioning to this application via SCIM.
+    custom_non_identity_deny_url: str
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
 
-    This is currently in closed beta.
+    custom_pages: SequenceNotStr[str]
+    """The custom pages that will be displayed when applicable for this application"""
+
+    footer_links: Iterable[AppLauncherApplicationFooterLink]
+    """The links in the App Launcher footer."""
+
+    header_bg_color: str
+    """The background color of the App Launcher header."""
+
+    landing_page_design: AppLauncherApplicationLandingPageDesign
+    """The design of the App Launcher landing page shown to users when they log in."""
+
+    policies: SequenceNotStr[AppLauncherApplicationPolicy]
+    """
+    The policies that Access applies to the application, in ascending order of
+    precedence. Items can reference existing policies or create new policies
+    exclusive to the application.
     """
 
     session_duration: str
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
+    skip_app_launcher_login_page: bool
+    """Determines when to skip the App Launcher landing page."""
+
+
+class AppLauncherApplicationFooterLink(TypedDict, total=False):
+    name: Required[str]
+    """The hypertext in the footer link."""
+
+    url: Required[str]
+    """the hyperlink in the footer link."""
+
+
+class AppLauncherApplicationLandingPageDesign(TypedDict, total=False):
+    """The design of the App Launcher landing page shown to users when they log in."""
+
+    button_color: str
+    """The background color of the log in button on the landing page."""
+
+    button_text_color: str
+    """The color of the text in the log in button on the landing page."""
+
+    image_url: str
+    """The URL of the image shown on the landing page."""
+
+    message: str
+    """The message shown on the landing page."""
+
+    title: str
+    """The title shown on the landing page."""
+
 
 class AppLauncherApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
     id: str
     """The UUID of the policy"""
 
@@ -1569,18 +1662,6 @@ class AppLauncherApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
 
 
 class AppLauncherApplicationPolicyUnionMember2(TypedDict, total=False):
-    decision: Required[Decision]
-    """The action Access will take if a user matches this policy."""
-
-    include: Required[Iterable[AccessRuleParam]]
-    """Rules evaluated with an OR logical operator.
-
-    A user needs to meet only one of the Include rules.
-    """
-
-    name: Required[str]
-    """The name of the Access policy."""
-
     id: str
     """The UUID of the policy"""
 
@@ -1593,12 +1674,6 @@ class AppLauncherApplicationPolicyUnionMember2(TypedDict, total=False):
     session.
     """
 
-    exclude: Iterable[AccessRuleParam]
-    """Rules evaluated with a NOT logical operator.
-
-    To match the policy, a user cannot meet any of the Exclude rules.
-    """
-
     isolation_required: bool
     """
     Require this application to be served in an isolated browser for users matching
@@ -1618,153 +1693,19 @@ class AppLauncherApplicationPolicyUnionMember2(TypedDict, total=False):
     purpose_justification_required: bool
     """Require users to enter a justification when they log in to the application."""
 
-    require: Iterable[AccessRuleParam]
-    """Rules evaluated with an AND logical operator.
-
-    To match the policy, a user must meet all of the Require rules.
-    """
-
-    session_duration: str
-    """The amount of time that tokens issued for the application will be valid.
+    session_duration: str
+    """The amount of time that tokens issued for the application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
     ms, s, m, h.
     """
 
 
-AppLauncherApplicationPolicy = Union[
+AppLauncherApplicationPolicy: TypeAlias = Union[
     AppLauncherApplicationPolicyAccessAppPolicyLink, str, AppLauncherApplicationPolicyUnionMember2
 ]
 
 
-class AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(TypedDict, total=False):
-    password: Required[str]
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["httpbasic"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: Required[str]
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
-    TypedDict, total=False
-):
-    token: Required[str]
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["oauthbearertoken"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(TypedDict, total=False):
-    authorization_url: Required[str]
-    """URL used to generate the auth code used during token generation."""
-
-    client_id: Required[str]
-    """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
-    """
-
-    client_secret: Required[str]
-    """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
-    """
-
-    scheme: Required[Literal["oauth2"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    token_url: Required[str]
-    """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
-    """
-
-    scopes: List[str]
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
-    """
-
-
-AppLauncherApplicationSCIMConfigAuthentication = Union[
-    AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class AppLauncherApplicationSCIMConfigMappingOperations(TypedDict, total=False):
-    create: bool
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: bool
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: bool
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
-
-
-class AppLauncherApplicationSCIMConfigMapping(TypedDict, total=False):
-    schema: Required[str]
-    """Which SCIM resource type this mapping applies to."""
-
-    enabled: bool
-    """Whether or not this mapping is enabled."""
-
-    filter: str
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
-
-    operations: AppLauncherApplicationSCIMConfigMappingOperations
-    """Whether or not this mapping applies to creates, updates, or deletes."""
-
-    transform_jsonata: str
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
-    """
-
-
-class AppLauncherApplicationSCIMConfig(TypedDict, total=False):
-    idp_uid: Required[str]
-    """
-    The UID of the IdP to use as the source for SCIM resources to provision to this
-    application.
-    """
-
-    remote_uri: Required[str]
-    """The base URI for the application's SCIM-compatible API."""
-
-    authentication: AppLauncherApplicationSCIMConfigAuthentication
-    """
-    Attributes for configuring HTTP Basic authentication scheme for SCIM
-    provisioning to an application.
-    """
-
-    deactivate_on_delete: bool
-    """
-    If false, propagates DELETE requests to the target application for SCIM
-    resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-    targets do not support DELETE operations.
-    """
-
-    enabled: bool
-    """Whether SCIM provisioning is turned on for this application."""
-
-    mappings: Iterable[AppLauncherApplicationSCIMConfigMapping]
-    """
-    A list of mappings to apply to SCIM resources before provisioning them in this
-    application. These can transform or filter the resources to be provisioned.
-    """
-
-
 class DeviceEnrollmentPermissionsApplication(TypedDict, total=False):
     type: Required[ApplicationType]
     """The application type."""
@@ -1775,7 +1716,7 @@ class DeviceEnrollmentPermissionsApplication(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    allowed_idps: List[AllowedIdPs]
+    allowed_idps: SequenceNotStr[AllowedIdPs]
     """The identity providers your users can select when connecting to this
     application.
 
@@ -1789,28 +1730,39 @@ class DeviceEnrollmentPermissionsApplication(TypedDict, total=False):
     You must specify only one identity provider in allowed_idps.
     """
 
-    policies: List[DeviceEnrollmentPermissionsApplicationPolicy]
+    custom_deny_url: str
     """
-    The policies that will apply to the application, in ascending order of
-    precedence. Items can reference existing policies or create new policies
-    exclusive to the application.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
     """
 
-    scim_config: DeviceEnrollmentPermissionsApplicationSCIMConfig
-    """Configuration for provisioning to this application via SCIM.
+    custom_non_identity_deny_url: str
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
 
-    This is currently in closed beta.
+    custom_pages: SequenceNotStr[str]
+    """The custom pages that will be displayed when applicable for this application"""
+
+    policies: SequenceNotStr[DeviceEnrollmentPermissionsApplicationPolicy]
+    """
+    The policies that Access applies to the application, in ascending order of
+    precedence. Items can reference existing policies or create new policies
+    exclusive to the application.
     """
 
     session_duration: str
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
 
 class DeviceEnrollmentPermissionsApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
     id: str
     """The UUID of the policy"""
 
@@ -1822,18 +1774,6 @@ class DeviceEnrollmentPermissionsApplicationPolicyAccessAppPolicyLink(TypedDict,
 
 
 class DeviceEnrollmentPermissionsApplicationPolicyUnionMember2(TypedDict, total=False):
-    decision: Required[Decision]
-    """The action Access will take if a user matches this policy."""
-
-    include: Required[Iterable[AccessRuleParam]]
-    """Rules evaluated with an OR logical operator.
-
-    A user needs to meet only one of the Include rules.
-    """
-
-    name: Required[str]
-    """The name of the Access policy."""
-
     id: str
     """The UUID of the policy"""
 
@@ -1846,12 +1786,6 @@ class DeviceEnrollmentPermissionsApplicationPolicyUnionMember2(TypedDict, total=
     session.
     """
 
-    exclude: Iterable[AccessRuleParam]
-    """Rules evaluated with a NOT logical operator.
-
-    To match the policy, a user cannot meet any of the Exclude rules.
-    """
-
     isolation_required: bool
     """
     Require this application to be served in an isolated browser for users matching
@@ -1871,12 +1805,6 @@ class DeviceEnrollmentPermissionsApplicationPolicyUnionMember2(TypedDict, total=
     purpose_justification_required: bool
     """Require users to enter a justification when they log in to the application."""
 
-    require: Iterable[AccessRuleParam]
-    """Rules evaluated with an AND logical operator.
-
-    To match the policy, a user must meet all of the Require rules.
-    """
-
     session_duration: str
     """The amount of time that tokens issued for the application will be valid.
 
@@ -1885,145 +1813,13 @@ class DeviceEnrollmentPermissionsApplicationPolicyUnionMember2(TypedDict, total=
     """
 
 
-DeviceEnrollmentPermissionsApplicationPolicy = Union[
+DeviceEnrollmentPermissionsApplicationPolicy: TypeAlias = Union[
     DeviceEnrollmentPermissionsApplicationPolicyAccessAppPolicyLink,
     str,
     DeviceEnrollmentPermissionsApplicationPolicyUnionMember2,
 ]
 
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(
-    TypedDict, total=False
-):
-    password: Required[str]
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["httpbasic"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: Required[str]
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
-    TypedDict, total=False
-):
-    token: Required[str]
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["oauthbearertoken"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(
-    TypedDict, total=False
-):
-    authorization_url: Required[str]
-    """URL used to generate the auth code used during token generation."""
-
-    client_id: Required[str]
-    """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
-    """
-
-    client_secret: Required[str]
-    """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
-    """
-
-    scheme: Required[Literal["oauth2"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    token_url: Required[str]
-    """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
-    """
-
-    scopes: List[str]
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
-    """
-
-
-DeviceEnrollmentPermissionsApplicationSCIMConfigAuthentication = Union[
-    DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class DeviceEnrollmentPermissionsApplicationSCIMConfigMappingOperations(TypedDict, total=False):
-    create: bool
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: bool
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: bool
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
-
-
-class DeviceEnrollmentPermissionsApplicationSCIMConfigMapping(TypedDict, total=False):
-    schema: Required[str]
-    """Which SCIM resource type this mapping applies to."""
-
-    enabled: bool
-    """Whether or not this mapping is enabled."""
-
-    filter: str
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
-
-    operations: DeviceEnrollmentPermissionsApplicationSCIMConfigMappingOperations
-    """Whether or not this mapping applies to creates, updates, or deletes."""
-
-    transform_jsonata: str
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
-    """
-
-
-class DeviceEnrollmentPermissionsApplicationSCIMConfig(TypedDict, total=False):
-    idp_uid: Required[str]
-    """
-    The UID of the IdP to use as the source for SCIM resources to provision to this
-    application.
-    """
-
-    remote_uri: Required[str]
-    """The base URI for the application's SCIM-compatible API."""
-
-    authentication: DeviceEnrollmentPermissionsApplicationSCIMConfigAuthentication
-    """
-    Attributes for configuring HTTP Basic authentication scheme for SCIM
-    provisioning to an application.
-    """
-
-    deactivate_on_delete: bool
-    """
-    If false, propagates DELETE requests to the target application for SCIM
-    resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-    targets do not support DELETE operations.
-    """
-
-    enabled: bool
-    """Whether SCIM provisioning is turned on for this application."""
-
-    mappings: Iterable[DeviceEnrollmentPermissionsApplicationSCIMConfigMapping]
-    """
-    A list of mappings to apply to SCIM resources before provisioning them in this
-    application. These can transform or filter the resources to be provisioned.
-    """
-
-
 class BrowserIsolationPermissionsApplication(TypedDict, total=False):
     type: Required[ApplicationType]
     """The application type."""
@@ -2034,7 +1830,7 @@ class BrowserIsolationPermissionsApplication(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    allowed_idps: List[AllowedIdPs]
+    allowed_idps: SequenceNotStr[AllowedIdPs]
     """The identity providers your users can select when connecting to this
     application.
 
@@ -2048,28 +1844,39 @@ class BrowserIsolationPermissionsApplication(TypedDict, total=False):
     You must specify only one identity provider in allowed_idps.
     """
 
-    policies: List[BrowserIsolationPermissionsApplicationPolicy]
+    custom_deny_url: str
     """
-    The policies that will apply to the application, in ascending order of
-    precedence. Items can reference existing policies or create new policies
-    exclusive to the application.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
     """
 
-    scim_config: BrowserIsolationPermissionsApplicationSCIMConfig
-    """Configuration for provisioning to this application via SCIM.
+    custom_non_identity_deny_url: str
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
 
-    This is currently in closed beta.
+    custom_pages: SequenceNotStr[str]
+    """The custom pages that will be displayed when applicable for this application"""
+
+    policies: SequenceNotStr[BrowserIsolationPermissionsApplicationPolicy]
+    """
+    The policies that Access applies to the application, in ascending order of
+    precedence. Items can reference existing policies or create new policies
+    exclusive to the application.
     """
 
     session_duration: str
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
 
 class BrowserIsolationPermissionsApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
     id: str
     """The UUID of the policy"""
 
@@ -2081,18 +1888,6 @@ class BrowserIsolationPermissionsApplicationPolicyAccessAppPolicyLink(TypedDict,
 
 
 class BrowserIsolationPermissionsApplicationPolicyUnionMember2(TypedDict, total=False):
-    decision: Required[Decision]
-    """The action Access will take if a user matches this policy."""
-
-    include: Required[Iterable[AccessRuleParam]]
-    """Rules evaluated with an OR logical operator.
-
-    A user needs to meet only one of the Include rules.
-    """
-
-    name: Required[str]
-    """The name of the Access policy."""
-
     id: str
     """The UUID of the policy"""
 
@@ -2105,12 +1900,6 @@ class BrowserIsolationPermissionsApplicationPolicyUnionMember2(TypedDict, total=
     session.
     """
 
-    exclude: Iterable[AccessRuleParam]
-    """Rules evaluated with a NOT logical operator.
-
-    To match the policy, a user cannot meet any of the Exclude rules.
-    """
-
     isolation_required: bool
     """
     Require this application to be served in an isolated browser for users matching
@@ -2130,12 +1919,6 @@ class BrowserIsolationPermissionsApplicationPolicyUnionMember2(TypedDict, total=
     purpose_justification_required: bool
     """Require users to enter a justification when they log in to the application."""
 
-    require: Iterable[AccessRuleParam]
-    """Rules evaluated with an AND logical operator.
-
-    To match the policy, a user must meet all of the Require rules.
-    """
-
     session_duration: str
     """The amount of time that tokens issued for the application will be valid.
 
@@ -2144,157 +1927,410 @@ class BrowserIsolationPermissionsApplicationPolicyUnionMember2(TypedDict, total=
     """
 
 
-BrowserIsolationPermissionsApplicationPolicy = Union[
+BrowserIsolationPermissionsApplicationPolicy: TypeAlias = Union[
     BrowserIsolationPermissionsApplicationPolicyAccessAppPolicyLink,
     str,
     BrowserIsolationPermissionsApplicationPolicyUnionMember2,
 ]
 
 
-class BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(
-    TypedDict, total=False
-):
-    password: Required[str]
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["httpbasic"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
+class GatewayIdentityProxyEndpointApplication(TypedDict, total=False):
+    type: Required[ApplicationType]
+    """The application type."""
 
-    user: Required[str]
-    """User name used to authenticate with the remote SCIM service."""
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
 
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-class BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
-    TypedDict, total=False
-):
-    token: Required[str]
-    """Token used to authenticate with the remote SCIM service."""
+    allowed_idps: SequenceNotStr[AllowedIdPs]
+    """The identity providers your users can select when connecting to this
+    application.
 
-    scheme: Required[Literal["oauthbearertoken"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    Defaults to all IdPs configured in your account.
+    """
 
+    auto_redirect_to_identity: bool
+    """When set to `true`, users skip the identity provider selection step during
+    login.
 
-class BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(
-    TypedDict, total=False
-):
-    authorization_url: Required[str]
-    """URL used to generate the auth code used during token generation."""
+    You must specify only one identity provider in allowed_idps.
+    """
 
-    client_id: Required[str]
+    custom_deny_url: str
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
     """
 
-    client_secret: Required[str]
+    custom_non_identity_deny_url: str
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
     """
 
-    scheme: Required[Literal["oauth2"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    custom_pages: SequenceNotStr[str]
+    """The custom pages that will be displayed when applicable for this application"""
 
-    token_url: Required[str]
+    domain: str
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    The proxy endpoint domain in the format: 10 alphanumeric characters followed by
+    .proxy.cloudflare-gateway.com
+    """
+
+    name: str
+    """The name of the application."""
+
+    policies: SequenceNotStr[GatewayIdentityProxyEndpointApplicationPolicy]
+    """
+    The policies that Access applies to the application, in ascending order of
+    precedence. Items can reference existing policies or create new policies
+    exclusive to the application.
     """
 
-    scopes: List[str]
+    session_duration: str
+    """The amount of time that tokens issued for this application will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+
+
+class GatewayIdentityProxyEndpointApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
+    id: str
+    """The UUID of the policy"""
+
+    precedence: int
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
     """
 
 
-BrowserIsolationPermissionsApplicationSCIMConfigAuthentication = Union[
-    BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
+class GatewayIdentityProxyEndpointApplicationPolicyUnionMember2(TypedDict, total=False):
+    id: str
+    """The UUID of the policy"""
+
+    approval_groups: Iterable[ApprovalGroupParam]
+    """Administrators who can approve a temporary authentication request."""
+
+    approval_required: bool
+    """
+    Requires the user to request access from an administrator at the start of each
+    session.
+    """
+
+    isolation_required: bool
+    """
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
+    """
+
+    precedence: int
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
+    purpose_justification_prompt: str
+    """A custom message that will appear on the purpose justification screen."""
+
+    purpose_justification_required: bool
+    """Require users to enter a justification when they log in to the application."""
+
+    session_duration: str
+    """The amount of time that tokens issued for the application will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
+    """
+
+
+GatewayIdentityProxyEndpointApplicationPolicy: TypeAlias = Union[
+    GatewayIdentityProxyEndpointApplicationPolicyAccessAppPolicyLink,
+    str,
+    GatewayIdentityProxyEndpointApplicationPolicyUnionMember2,
 ]
 
 
-class BrowserIsolationPermissionsApplicationSCIMConfigMappingOperations(TypedDict, total=False):
-    create: bool
-    """Whether or not this mapping applies to create (POST) operations."""
+class BookmarkApplication(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
 
-    delete: bool
-    """Whether or not this mapping applies to DELETE operations."""
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    update: bool
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    app_launcher_visible: bool
+    """Displays the application in the App Launcher."""
 
+    domain: str
+    """The URL or domain of the bookmark."""
 
-class BrowserIsolationPermissionsApplicationSCIMConfigMapping(TypedDict, total=False):
-    schema: Required[str]
-    """Which SCIM resource type this mapping applies to."""
+    logo_url: str
+    """The image URL for the logo shown in the App Launcher dashboard."""
 
-    enabled: bool
-    """Whether or not this mapping is enabled."""
+    name: str
+    """The name of the application."""
+
+    policies: SequenceNotStr[BookmarkApplicationPolicy]
+    """
+    The policies that Access applies to the application, in ascending order of
+    precedence. Items can reference existing policies or create new policies
+    exclusive to the application.
+    """
 
-    filter: str
+    tags: SequenceNotStr[str]
+    """The tags you want assigned to an application.
+
+    Tags are used to filter applications in the App Launcher dashboard.
     """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
+
+    type: ApplicationType
+    """The application type."""
+
+
+class BookmarkApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
+    id: str
+    """The UUID of the policy"""
+
+    precedence: int
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
     """
 
-    operations: BrowserIsolationPermissionsApplicationSCIMConfigMappingOperations
-    """Whether or not this mapping applies to creates, updates, or deletes."""
 
-    transform_jsonata: str
+class BookmarkApplicationPolicyUnionMember2(TypedDict, total=False):
+    id: str
+    """The UUID of the policy"""
+
+    approval_groups: Iterable[ApprovalGroupParam]
+    """Administrators who can approve a temporary authentication request."""
+
+    approval_required: bool
+    """
+    Requires the user to request access from an administrator at the start of each
+    session.
+    """
+
+    isolation_required: bool
     """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
     """
 
+    precedence: int
+    """The order of execution for this policy.
 
-class BrowserIsolationPermissionsApplicationSCIMConfig(TypedDict, total=False):
-    idp_uid: Required[str]
+    Must be unique for each policy within an app.
     """
-    The UID of the IdP to use as the source for SCIM resources to provision to this
-    application.
+
+    purpose_justification_prompt: str
+    """A custom message that will appear on the purpose justification screen."""
+
+    purpose_justification_required: bool
+    """Require users to enter a justification when they log in to the application."""
+
+    session_duration: str
+    """The amount of time that tokens issued for the application will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
     """
 
-    remote_uri: Required[str]
-    """The base URI for the application's SCIM-compatible API."""
 
-    authentication: BrowserIsolationPermissionsApplicationSCIMConfigAuthentication
+BookmarkApplicationPolicy: TypeAlias = Union[
+    BookmarkApplicationPolicyAccessAppPolicyLink, str, BookmarkApplicationPolicyUnionMember2
+]
+
+
+class InfrastructureApplication(TypedDict, total=False):
+    target_criteria: Required[Iterable[InfrastructureApplicationTargetCriterion]]
+
+    type: Required[ApplicationType]
+    """The application type."""
+
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    name: str
+    """The name of the application."""
+
+    policies: Iterable[InfrastructureApplicationPolicy]
+    """The policies that Access applies to the application."""
+
+
+class InfrastructureApplicationTargetCriterion(TypedDict, total=False):
+    port: Required[int]
+    """The port that the targets use for the chosen communication protocol.
+
+    A port cannot be assigned to multiple protocols.
     """
-    Attributes for configuring HTTP Basic authentication scheme for SCIM
-    provisioning to an application.
+
+    protocol: Required[Literal["SSH"]]
+    """The communication protocol your application secures."""
+
+    target_attributes: Required[Dict[str, SequenceNotStr[str]]]
+    """Contains a map of target attribute keys to target attribute values."""
+
+
+class InfrastructureApplicationPolicyConnectionRulesSSH(TypedDict, total=False):
+    """
+    The SSH-specific rules that define how users may connect to the targets secured by your application.
     """
 
-    deactivate_on_delete: bool
+    usernames: Required[SequenceNotStr[str]]
+    """Contains the Unix usernames that may be used when connecting over SSH."""
+
+    allow_email_alias: bool
+    """Enables using Identity Provider email alias as SSH username."""
+
+
+class InfrastructureApplicationPolicyConnectionRules(TypedDict, total=False):
     """
-    If false, propagates DELETE requests to the target application for SCIM
-    resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-    targets do not support DELETE operations.
+    The rules that define how users may connect to the targets secured by your application.
     """
 
-    enabled: bool
-    """Whether SCIM provisioning is turned on for this application."""
+    ssh: InfrastructureApplicationPolicyConnectionRulesSSH
+    """
+    The SSH-specific rules that define how users may connect to the targets secured
+    by your application.
+    """
+
+
+class InfrastructureApplicationPolicy(TypedDict, total=False):
+    decision: Required[Decision]
+    """The action Access will take if a user matches this policy.
 
-    mappings: Iterable[BrowserIsolationPermissionsApplicationSCIMConfigMapping]
+    Infrastructure application policies can only use the Allow action.
     """
-    A list of mappings to apply to SCIM resources before provisioning them in this
-    application. These can transform or filter the resources to be provisioned.
+
+    include: Required[Iterable[AccessRuleParam]]
+    """Rules evaluated with an OR logical operator.
+
+    A user needs to meet only one of the Include rules.
     """
 
+    name: Required[str]
+    """The name of the Access policy."""
+
+    connection_rules: InfrastructureApplicationPolicyConnectionRules
+    """
+    The rules that define how users may connect to the targets secured by your
+    application.
+    """
+
+    exclude: Iterable[AccessRuleParam]
+    """Rules evaluated with a NOT logical operator.
+
+    To match the policy, a user cannot meet any of the Exclude rules.
+    """
+
+    require: Iterable[AccessRuleParam]
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
+    """
+
+
+class BrowserRdpApplication(TypedDict, total=False):
+    domain: Required[str]
+    """The primary hostname and path secured by Access.
+
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
+
+    target_criteria: Required[Iterable[BrowserRdpApplicationTargetCriterion]]
+
+    type: Required[ApplicationType]
+    """The application type."""
 
-class BookmarkApplication(TypedDict, total=False):
     account_id: str
     """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
 
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
+    allow_authenticate_via_warp: bool
+    """
+    When set to true, users can authenticate to this application using their WARP
+    session. When set to false this application will always require direct IdP
+    authentication. This setting always overrides the organization setting for WARP
+    authentication.
+    """
+
+    allow_iframe: bool
+    """Enables loading application content in an iFrame."""
+
+    allowed_idps: SequenceNotStr[AllowedIdPs]
+    """The identity providers your users can select when connecting to this
+    application.
+
+    Defaults to all IdPs configured in your account.
+    """
+
     app_launcher_visible: bool
     """Displays the application in the App Launcher."""
 
-    domain: str
-    """The URL or domain of the bookmark."""
+    auto_redirect_to_identity: bool
+    """When set to `true`, users skip the identity provider selection step during
+    login.
+
+    You must specify only one identity provider in allowed_idps.
+    """
+
+    cors_headers: CORSHeadersParam
+
+    custom_deny_message: str
+    """
+    The custom error message shown to a user when they are denied access to the
+    application.
+    """
+
+    custom_deny_url: str
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
+    """
+
+    custom_non_identity_deny_url: str
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
+
+    custom_pages: SequenceNotStr[str]
+    """The custom pages that will be displayed when applicable for this application"""
+
+    destinations: Iterable[BrowserRdpApplicationDestination]
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
+    enable_binding_cookie: bool
+    """
+    Enables the binding cookie, which increases security against compromised
+    authorization tokens and CSRF attacks.
+    """
+
+    http_only_cookie_attribute: bool
+    """
+    Enables the HttpOnly cookie attribute, which increases security against XSS
+    attacks.
+    """
 
     logo_url: str
     """The image URL for the logo shown in the App Launcher dashboard."""
@@ -2302,116 +2338,284 @@ class BookmarkApplication(TypedDict, total=False):
     name: str
     """The name of the application."""
 
-    scim_config: BookmarkApplicationSCIMConfig
+    options_preflight_bypass: bool
+    """
+    Allows options preflight requests to bypass Access authentication and go
+    directly to the origin. Cannot turn on if cors_headers is set.
+    """
+
+    path_cookie_attribute: bool
+    """Enables cookie paths to scope an application's JWT to the application path.
+
+    If disabled, the JWT will scope to the hostname by default
+    """
+
+    policies: SequenceNotStr[BrowserRdpApplicationPolicy]
+    """
+    The policies that Access applies to the application, in ascending order of
+    precedence. Items can reference existing policies or create new policies
+    exclusive to the application.
+    """
+
+    read_service_tokens_from_header: str
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
+    same_site_cookie_attribute: str
+    """
+    Sets the SameSite cookie setting, which provides increased security against CSRF
+    attacks.
+    """
+
+    scim_config: BrowserRdpApplicationSCIMConfig
     """Configuration for provisioning to this application via SCIM.
 
     This is currently in closed beta.
     """
 
-    tags: List[str]
+    self_hosted_domains: SequenceNotStr[SelfHostedDomains]
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
+    service_auth_401_redirect: bool
+    """Returns a 401 status code when the request is blocked by a Service Auth policy."""
+
+    session_duration: str
+    """The amount of time that tokens issued for this application will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
+    """
+
+    skip_interstitial: bool
+    """Enables automatic authentication through cloudflared."""
+
+    tags: SequenceNotStr[str]
     """The tags you want assigned to an application.
 
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    type: str
-    """The application type."""
+    use_clientless_isolation_app_launcher_url: bool
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
 
 
-class BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(TypedDict, total=False):
-    password: Required[str]
-    """Password used to authenticate with the remote SCIM service."""
+class BrowserRdpApplicationTargetCriterion(TypedDict, total=False):
+    port: Required[int]
+    """The port that the targets use for the chosen communication protocol.
 
-    scheme: Required[Literal["httpbasic"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    A port cannot be assigned to multiple protocols.
+    """
 
-    user: Required[str]
-    """User name used to authenticate with the remote SCIM service."""
+    protocol: Required[Literal["RDP"]]
+    """The communication protocol your application secures."""
 
+    target_attributes: Required[Dict[str, SequenceNotStr[str]]]
+    """Contains a map of target attribute keys to target attribute values."""
 
-class BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(TypedDict, total=False):
-    token: Required[str]
-    """Token used to authenticate with the remote SCIM service."""
 
-    scheme: Required[Literal["oauthbearertoken"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
+class BrowserRdpApplicationDestinationPublicDestination(TypedDict, total=False):
+    """A public hostname that Access will secure.
 
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
+    """
 
-class BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(TypedDict, total=False):
-    authorization_url: Required[str]
-    """URL used to generate the auth code used during token generation."""
+    type: Literal["public"]
 
-    client_id: Required[str]
+    uri: str
+    """The URI of the destination.
+
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+
+
+class BrowserRdpApplicationDestinationPrivateDestination(TypedDict, total=False):
+    cidr: str
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
+
+    hostname: str
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
+
+    l4_protocol: Literal["tcp", "udp"]
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
     """
 
-    client_secret: Required[str]
+    port_range: str
+    """The port range of the destination.
+
+    Can be a single port or a range of ports. When omitted, all ports will match.
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+
+    type: Literal["private"]
+
+    vnet_id: str
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class BrowserRdpApplicationDestinationViaMcpServerPortalDestination(TypedDict, total=False):
+    """A MCP server id configured in ai-controls.
+
+    Access will secure the MCP server if accessed through a MCP portal.
     """
 
-    scheme: Required[Literal["oauth2"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    mcp_server_id: str
+    """The MCP server id configured in ai-controls."""
+
+    type: Literal["via_mcp_server_portal"]
 
-    token_url: Required[str]
+
+BrowserRdpApplicationDestination: TypeAlias = Union[
+    BrowserRdpApplicationDestinationPublicDestination,
+    BrowserRdpApplicationDestinationPrivateDestination,
+    BrowserRdpApplicationDestinationViaMcpServerPortalDestination,
+]
+
+
+class BrowserRdpApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
+    id: str
+    """The UUID of the policy"""
+
+    precedence: int
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+
+
+class BrowserRdpApplicationPolicyUnionMember2(TypedDict, total=False):
+    id: str
+    """The UUID of the policy"""
+
+    approval_groups: Iterable[ApprovalGroupParam]
+    """Administrators who can approve a temporary authentication request."""
+
+    approval_required: bool
+    """
+    Requires the user to request access from an administrator at the start of each
+    session.
     """
 
-    scopes: List[str]
+    isolation_required: bool
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
     """
 
+    precedence: int
+    """The order of execution for this policy.
 
-BookmarkApplicationSCIMConfigAuthentication = Union[
-    BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
+    Must be unique for each policy within an app.
+    """
 
+    purpose_justification_prompt: str
+    """A custom message that will appear on the purpose justification screen."""
 
-class BookmarkApplicationSCIMConfigMappingOperations(TypedDict, total=False):
-    create: bool
-    """Whether or not this mapping applies to create (POST) operations."""
+    purpose_justification_required: bool
+    """Require users to enter a justification when they log in to the application."""
 
-    delete: bool
-    """Whether or not this mapping applies to DELETE operations."""
+    session_duration: str
+    """The amount of time that tokens issued for the application will be valid.
 
-    update: bool
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
+    """
 
 
-class BookmarkApplicationSCIMConfigMapping(TypedDict, total=False):
-    schema: Required[str]
-    """Which SCIM resource type this mapping applies to."""
+BrowserRdpApplicationPolicy: TypeAlias = Union[
+    BrowserRdpApplicationPolicyAccessAppPolicyLink, str, BrowserRdpApplicationPolicyUnionMember2
+]
 
-    enabled: bool
-    """Whether or not this mapping is enabled."""
 
-    filter: str
+class BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    TypedDict, total=False
+):
     """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    operations: BookmarkApplicationSCIMConfigMappingOperations
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+    client_id: Required[str]
+    """
+    Client ID of the Access service token used to authenticate with the remote
+    service.
+    """
 
-    transform_jsonata: str
+    client_secret: Required[str]
     """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
+    scheme: Required[Literal["access_service_token"]]
+    """The authentication scheme to use when making SCIM requests to this application."""
+
+
+class BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    TypedDict, total=False
+):
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
+
+    client_id: Required[str]
+    """
+    Client ID of the Access service token used to authenticate with the remote
+    service.
+    """
+
+    client_secret: Required[str]
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
+
+    scheme: Required[Literal["access_service_token"]]
+    """The authentication scheme to use when making SCIM requests to this application."""
+
+
+BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
+
+BrowserRdpApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    Iterable[BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
+
+
+class BrowserRdpApplicationSCIMConfig(TypedDict, total=False):
+    """Configuration for provisioning to this application via SCIM.
+
+    This is currently in closed beta.
+    """
 
-class BookmarkApplicationSCIMConfig(TypedDict, total=False):
     idp_uid: Required[str]
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -2421,7 +2625,7 @@ class BookmarkApplicationSCIMConfig(TypedDict, total=False):
     remote_uri: Required[str]
     """The base URI for the application's SCIM-compatible API."""
 
-    authentication: BookmarkApplicationSCIMConfigAuthentication
+    authentication: BrowserRdpApplicationSCIMConfigAuthentication
     """
     Attributes for configuring HTTP Basic authentication scheme for SCIM
     provisioning to an application.
@@ -2437,20 +2641,23 @@ class BookmarkApplicationSCIMConfig(TypedDict, total=False):
     enabled: bool
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Iterable[BookmarkApplicationSCIMConfigMapping]
+    mappings: Iterable[SCIMConfigMappingParam]
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
     """
 
 
-ApplicationCreateParams = Union[
+ApplicationCreateParams: TypeAlias = Union[
     SelfHostedApplication,
     SaaSApplication,
     BrowserSSHApplication,
-    BrowserVncApplication,
+    BrowserVNCApplication,
     AppLauncherApplication,
     DeviceEnrollmentPermissionsApplication,
     BrowserIsolationPermissionsApplication,
+    GatewayIdentityProxyEndpointApplication,
     BookmarkApplication,
+    InfrastructureApplication,
+    BrowserRdpApplication,
 ]
diff --git a/src/cloudflare/types/zero_trust/access/application_create_response.py b/src/cloudflare/types/zero_trust/access/application_create_response.py
index af4a28bfba5..6b51726834d 100644
--- a/src/cloudflare/types/zero_trust/access/application_create_response.py
+++ b/src/cloudflare/types/zero_trust/access/application_create_response.py
@@ -2,99 +2,155 @@
 
 from typing import Dict, List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
-
-from pydantic import Field as FieldInfo
+from typing_extensions import Literal, TypeAlias
 
 from .decision import Decision
 from ...._models import BaseModel
-from ..access_rule import AccessRule
 from .allowed_idps import AllowedIdPs
 from .cors_headers import CORSHeaders
+from .oidc_saas_app import OIDCSaaSApp
 from .saml_saas_app import SAMLSaaSApp
+from .approval_group import ApprovalGroup
 from .application_type import ApplicationType
+from .scim_config_mapping import SCIMConfigMapping
 from .self_hosted_domains import SelfHostedDomains
-from .applications.approval_group import ApprovalGroup
+from .applications.access_rule import AccessRule
+from .scim_config_authentication_oauth2 import SCIMConfigAuthenticationOauth2
+from .scim_config_authentication_http_basic import SCIMConfigAuthenticationHTTPBasic
+from .scim_config_authentication_oauth_bearer_token import SCIMConfigAuthenticationOAuthBearerToken
 
 __all__ = [
     "ApplicationCreateResponse",
     "SelfHostedApplication",
+    "SelfHostedApplicationDestination",
+    "SelfHostedApplicationDestinationPublicDestination",
+    "SelfHostedApplicationDestinationPrivateDestination",
+    "SelfHostedApplicationDestinationViaMcpServerPortalDestination",
     "SelfHostedApplicationPolicy",
     "SelfHostedApplicationSCIMConfig",
     "SelfHostedApplicationSCIMConfigAuthentication",
-    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "SelfHostedApplicationSCIMConfigMapping",
-    "SelfHostedApplicationSCIMConfigMappingOperations",
+    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
     "SaaSApplication",
     "SaaSApplicationPolicy",
     "SaaSApplicationSaaSApp",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSApp",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaims",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaimsSource",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppHybridAndImplicitOptions",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppRefreshTokenOptions",
     "SaaSApplicationSCIMConfig",
     "SaaSApplicationSCIMConfigAuthentication",
-    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "SaaSApplicationSCIMConfigMapping",
-    "SaaSApplicationSCIMConfigMappingOperations",
+    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
     "BrowserSSHApplication",
+    "BrowserSSHApplicationDestination",
+    "BrowserSSHApplicationDestinationPublicDestination",
+    "BrowserSSHApplicationDestinationPrivateDestination",
+    "BrowserSSHApplicationDestinationViaMcpServerPortalDestination",
     "BrowserSSHApplicationPolicy",
     "BrowserSSHApplicationSCIMConfig",
     "BrowserSSHApplicationSCIMConfigAuthentication",
-    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BrowserSSHApplicationSCIMConfigMapping",
-    "BrowserSSHApplicationSCIMConfigMappingOperations",
-    "BrowserVncApplication",
-    "BrowserVncApplicationPolicy",
-    "BrowserVncApplicationSCIMConfig",
-    "BrowserVncApplicationSCIMConfigAuthentication",
-    "BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BrowserVncApplicationSCIMConfigMapping",
-    "BrowserVncApplicationSCIMConfigMappingOperations",
+    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserVNCApplication",
+    "BrowserVNCApplicationDestination",
+    "BrowserVNCApplicationDestinationPublicDestination",
+    "BrowserVNCApplicationDestinationPrivateDestination",
+    "BrowserVNCApplicationDestinationViaMcpServerPortalDestination",
+    "BrowserVNCApplicationPolicy",
+    "BrowserVNCApplicationSCIMConfig",
+    "BrowserVNCApplicationSCIMConfigAuthentication",
+    "BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
     "AppLauncherApplication",
+    "AppLauncherApplicationFooterLink",
+    "AppLauncherApplicationLandingPageDesign",
     "AppLauncherApplicationPolicy",
-    "AppLauncherApplicationSCIMConfig",
-    "AppLauncherApplicationSCIMConfigAuthentication",
-    "AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "AppLauncherApplicationSCIMConfigMapping",
-    "AppLauncherApplicationSCIMConfigMappingOperations",
     "DeviceEnrollmentPermissionsApplication",
     "DeviceEnrollmentPermissionsApplicationPolicy",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfig",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthentication",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigMapping",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigMappingOperations",
     "BrowserIsolationPermissionsApplication",
     "BrowserIsolationPermissionsApplicationPolicy",
-    "BrowserIsolationPermissionsApplicationSCIMConfig",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthentication",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BrowserIsolationPermissionsApplicationSCIMConfigMapping",
-    "BrowserIsolationPermissionsApplicationSCIMConfigMappingOperations",
+    "GatewayIdentityProxyEndpointApplication",
+    "GatewayIdentityProxyEndpointApplicationPolicy",
     "BookmarkApplication",
-    "BookmarkApplicationSCIMConfig",
-    "BookmarkApplicationSCIMConfigAuthentication",
-    "BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BookmarkApplicationSCIMConfigMapping",
-    "BookmarkApplicationSCIMConfigMappingOperations",
+    "BookmarkApplicationPolicy",
+    "InfrastructureApplication",
+    "InfrastructureApplicationTargetCriterion",
+    "InfrastructureApplicationPolicy",
+    "InfrastructureApplicationPolicyConnectionRules",
+    "InfrastructureApplicationPolicyConnectionRulesSSH",
+    "BrowserRdpApplication",
+    "BrowserRdpApplicationTargetCriterion",
+    "BrowserRdpApplicationDestination",
+    "BrowserRdpApplicationDestinationPublicDestination",
+    "BrowserRdpApplicationDestinationPrivateDestination",
+    "BrowserRdpApplicationDestinationViaMcpServerPortalDestination",
+    "BrowserRdpApplicationPolicy",
+    "BrowserRdpApplicationSCIMConfig",
+    "BrowserRdpApplicationSCIMConfigAuthentication",
+    "BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+]
+
+
+class SelfHostedApplicationDestinationPublicDestination(BaseModel):
+    """A public hostname that Access will secure.
+
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
+    """
+
+    type: Optional[Literal["public"]] = None
+
+    uri: Optional[str] = None
+    """The URI of the destination.
+
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
+    """
+
+
+class SelfHostedApplicationDestinationPrivateDestination(BaseModel):
+    cidr: Optional[str] = None
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
+
+    hostname: Optional[str] = None
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
+
+    l4_protocol: Optional[Literal["tcp", "udp"]] = None
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
+    """
+
+    port_range: Optional[str] = None
+    """The port range of the destination.
+
+    Can be a single port or a range of ports. When omitted, all ports will match.
+    """
+
+    type: Optional[Literal["private"]] = None
+
+    vnet_id: Optional[str] = None
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class SelfHostedApplicationDestinationViaMcpServerPortalDestination(BaseModel):
+    """A MCP server id configured in ai-controls.
+
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
+
+    mcp_server_id: Optional[str] = None
+    """The MCP server id configured in ai-controls."""
+
+    type: Optional[Literal["via_mcp_server_portal"]] = None
+
+
+SelfHostedApplicationDestination: TypeAlias = Union[
+    SelfHostedApplicationDestinationPublicDestination,
+    SelfHostedApplicationDestinationPrivateDestination,
+    SelfHostedApplicationDestinationViaMcpServerPortalDestination,
 ]
 
 
@@ -114,7 +170,10 @@ class SelfHostedApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -138,6 +197,12 @@ class SelfHostedApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -160,100 +225,72 @@ class SelfHostedApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
     client_id: str
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
     client_secret: str
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Literal["oauth2"]
+    scheme: Literal["access_service_token"]
     """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: str
+
+class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    scopes: Optional[List[str]] = None
+    client_id: str
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
+    client_secret: str
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-SelfHostedApplicationSCIMConfigAuthentication = Union[
-    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class SelfHostedApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class SelfHostedApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
+SelfHostedApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: Optional[SelfHostedApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class SelfHostedApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class SelfHostedApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -279,7 +316,7 @@ class SelfHostedApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[SelfHostedApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
@@ -288,17 +325,16 @@ class SelfHostedApplicationSCIMConfig(BaseModel):
 
 class SelfHostedApplication(BaseModel):
     domain: str
-    """The primary hostname and path that Access will secure.
+    """The primary hostname and path secured by Access.
 
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
+    This domain will be displayed if the app is visible in the App Launcher.
     """
 
-    type: str
+    type: ApplicationType
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allow_authenticate_via_warp: Optional[bool] = None
     """
@@ -308,6 +344,9 @@ class SelfHostedApplication(BaseModel):
     authentication.
     """
 
+    allow_iframe: Optional[bool] = None
+    """Enables loading application content in an iFrame."""
+
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
     application.
@@ -330,8 +369,6 @@ class SelfHostedApplication(BaseModel):
 
     cors_headers: Optional[CORSHeaders] = None
 
-    created_at: Optional[datetime] = None
-
     custom_deny_message: Optional[str] = None
     """
     The custom error message shown to a user when they are denied access to the
@@ -353,6 +390,14 @@ class SelfHostedApplication(BaseModel):
     custom_pages: Optional[List[str]] = None
     """The custom pages that will be displayed when applicable for this application"""
 
+    destinations: Optional[List[SelfHostedApplicationDestination]] = None
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
     enable_binding_cookie: Optional[bool] = None
     """
     Enables the binding cookie, which increases security against compromised
@@ -385,6 +430,17 @@ class SelfHostedApplication(BaseModel):
 
     policies: Optional[List[SelfHostedApplicationPolicy]] = None
 
+    read_service_tokens_from_header: Optional[str] = None
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
     same_site_cookie_attribute: Optional[str] = None
     """
     Sets the SameSite cookie setting, which provides increased security against CSRF
@@ -398,7 +454,12 @@ class SelfHostedApplication(BaseModel):
     """
 
     self_hosted_domains: Optional[List[SelfHostedDomains]] = None
-    """List of domains that Access will secure."""
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
 
     service_auth_401_redirect: Optional[bool] = None
     """Returns a 401 status code when the request is blocked by a Service Auth policy."""
@@ -407,7 +468,7 @@ class SelfHostedApplication(BaseModel):
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
     skip_interstitial: Optional[bool] = None
@@ -419,7 +480,13 @@ class SelfHostedApplication(BaseModel):
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    updated_at: Optional[datetime] = None
+    use_clientless_isolation_app_launcher_url: Optional[bool] = None
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
 
 
 class SaaSApplicationPolicy(BaseModel):
@@ -438,7 +505,10 @@ class SaaSApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -462,6 +532,12 @@ class SaaSApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -484,203 +560,75 @@ class SaaSApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaimsSource(BaseModel):
-    name: Optional[str] = None
-    """The name of the IdP claim."""
-
-    name_by_idp: Optional[Dict[str, str]] = None
-    """A mapping from IdP ID to claim name."""
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaims(BaseModel):
-    name: Optional[str] = None
-    """The name of the claim."""
-
-    required: Optional[bool] = None
-    """If the claim is required when building an OIDC token."""
-
-    scope: Optional[Literal["groups", "profile", "email", "openid"]] = None
-    """The scope of the claim."""
-
-    source: Optional[SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaimsSource] = None
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppHybridAndImplicitOptions(BaseModel):
-    return_access_token_from_authorization_endpoint: Optional[bool] = None
-    """If an Access Token should be returned from the OIDC Authorization endpoint"""
-
-    return_id_token_from_authorization_endpoint: Optional[bool] = None
-    """If an ID Token should be returned from the OIDC Authorization endpoint"""
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppRefreshTokenOptions(BaseModel):
-    lifetime: Optional[str] = None
-    """How long a refresh token will be valid for after creation.
-
-    Valid units are m,h,d. Must be longer than 1m.
-    """
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSApp(BaseModel):
-    access_token_lifetime: Optional[str] = None
-    """The lifetime of the OIDC Access Token after creation.
+SaaSApplicationSaaSApp: TypeAlias = Union[SAMLSaaSApp, OIDCSaaSApp]
 
-    Valid units are m,h. Must be greater than or equal to 1m and less than or equal
-    to 24h.
-    """
 
-    allow_pkce_without_client_secret: Optional[bool] = None
-    """
-    If client secret should be required on the token endpoint when
-    authorization_code_with_pkce grant is used.
+class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
     """
-
-    app_launcher_url: Optional[str] = None
-    """The URL where this applications tile redirects users"""
-
-    auth_type: Optional[Literal["saml", "oidc"]] = None
-    """Identifier of the authentication protocol used for the saas app.
-
-    Required for OIDC.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    client_id: Optional[str] = None
-    """The application client id"""
-
-    client_secret: Optional[str] = None
-    """The application client secret, only returned on POST request."""
-
-    created_at: Optional[datetime] = None
-
-    custom_claims: Optional[SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaims] = None
-
-    grant_types: Optional[
-        List[Literal["authorization_code", "authorization_code_with_pkce", "refresh_tokens", "hybrid", "implicit"]]
-    ] = None
-    """The OIDC flows supported by this application"""
-
-    group_filter_regex: Optional[str] = None
-    """A regex to filter Cloudflare groups returned in ID token and userinfo endpoint"""
-
-    hybrid_and_implicit_options: Optional[SaaSApplicationSaaSAppAccessOIDCSaaSAppHybridAndImplicitOptions] = None
-
-    public_key: Optional[str] = None
-    """The Access public certificate that will be used to verify your identity."""
-
-    redirect_uris: Optional[List[str]] = None
+    client_id: str
     """
-    The permitted URL's for Cloudflare to return Authorization codes and Access/ID
-    tokens
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
-    refresh_token_options: Optional[SaaSApplicationSaaSAppAccessOIDCSaaSAppRefreshTokenOptions] = None
-
-    scopes: Optional[List[Literal["openid", "groups", "email", "profile"]]] = None
+    client_secret: str
     """
-    Define the user information shared with access, "offline_access" scope will be
-    automatically enabled if refresh tokens are enabled
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    updated_at: Optional[datetime] = None
-
-
-SaaSApplicationSaaSApp = Union[SAMLSaaSApp, SaaSApplicationSaaSAppAccessOIDCSaaSApp]
-
-
-class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["oauthbearertoken"]
+    scheme: Literal["access_service_token"]
     """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
-
-    client_id: str
+class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    client_secret: str
+    client_id: str
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    token_url: str
+    client_secret: str
     """
-    URL used to generate the token used to authenticate with the remote SCIM
+    Client secret of the Access service token used to authenticate with the remote
     service.
     """
 
-    scopes: Optional[List[str]] = None
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
-    """
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-SaaSApplicationSCIMConfigAuthentication = Union[
-    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
+SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
 ]
 
+SaaSApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-class SaaSApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
-
-
-class SaaSApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
-
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
-
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: Optional[SaaSApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class SaaSApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class SaaSApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -706,7 +654,7 @@ class SaaSApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[SaaSApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
@@ -715,7 +663,7 @@ class SaaSApplicationSCIMConfig(BaseModel):
 
 class SaaSApplication(BaseModel):
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
@@ -737,8 +685,6 @@ class SaaSApplication(BaseModel):
     You must specify only one identity provider in allowed_idps.
     """
 
-    created_at: Optional[datetime] = None
-
     custom_pages: Optional[List[str]] = None
     """The custom pages that will be displayed when applicable for this application"""
 
@@ -764,10 +710,68 @@ class SaaSApplication(BaseModel):
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    type: Optional[str] = None
+    type: Optional[ApplicationType] = None
     """The application type."""
 
-    updated_at: Optional[datetime] = None
+
+class BrowserSSHApplicationDestinationPublicDestination(BaseModel):
+    """A public hostname that Access will secure.
+
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
+    """
+
+    type: Optional[Literal["public"]] = None
+
+    uri: Optional[str] = None
+    """The URI of the destination.
+
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
+    """
+
+
+class BrowserSSHApplicationDestinationPrivateDestination(BaseModel):
+    cidr: Optional[str] = None
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
+
+    hostname: Optional[str] = None
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
+
+    l4_protocol: Optional[Literal["tcp", "udp"]] = None
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
+    """
+
+    port_range: Optional[str] = None
+    """The port range of the destination.
+
+    Can be a single port or a range of ports. When omitted, all ports will match.
+    """
+
+    type: Optional[Literal["private"]] = None
+
+    vnet_id: Optional[str] = None
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class BrowserSSHApplicationDestinationViaMcpServerPortalDestination(BaseModel):
+    """A MCP server id configured in ai-controls.
+
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
+
+    mcp_server_id: Optional[str] = None
+    """The MCP server id configured in ai-controls."""
+
+    type: Optional[Literal["via_mcp_server_portal"]] = None
+
+
+BrowserSSHApplicationDestination: TypeAlias = Union[
+    BrowserSSHApplicationDestinationPublicDestination,
+    BrowserSSHApplicationDestinationPrivateDestination,
+    BrowserSSHApplicationDestinationViaMcpServerPortalDestination,
+]
 
 
 class BrowserSSHApplicationPolicy(BaseModel):
@@ -786,7 +790,10 @@ class BrowserSSHApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -810,6 +817,12 @@ class BrowserSSHApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -832,100 +845,72 @@ class BrowserSSHApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
     client_id: str
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
     client_secret: str
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Literal["oauth2"]
+    scheme: Literal["access_service_token"]
     """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: str
+
+class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    scopes: Optional[List[str]] = None
+    client_id: str
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
+    client_secret: str
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-BrowserSSHApplicationSCIMConfigAuthentication = Union[
-    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class BrowserSSHApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class BrowserSSHApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
+BrowserSSHApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: Optional[BrowserSSHApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class BrowserSSHApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class BrowserSSHApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -951,7 +936,7 @@ class BrowserSSHApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[BrowserSSHApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
@@ -960,17 +945,31 @@ class BrowserSSHApplicationSCIMConfig(BaseModel):
 
 class BrowserSSHApplication(BaseModel):
     domain: str
-    """The primary hostname and path that Access will secure.
-
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
-    """
-
-    type: str
+    """The primary hostname and path secured by Access.
+
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
+
+    type: Literal[
+        "self_hosted",
+        "saas",
+        "ssh",
+        "vnc",
+        "app_launcher",
+        "warp",
+        "biso",
+        "bookmark",
+        "dash_sso",
+        "infrastructure",
+        "rdp",
+        "mcp",
+        "mcp_portal",
+        "proxy_endpoint",
+    ]
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allow_authenticate_via_warp: Optional[bool] = None
     """
@@ -980,6 +979,9 @@ class BrowserSSHApplication(BaseModel):
     authentication.
     """
 
+    allow_iframe: Optional[bool] = None
+    """Enables loading application content in an iFrame."""
+
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
     application.
@@ -1002,8 +1004,6 @@ class BrowserSSHApplication(BaseModel):
 
     cors_headers: Optional[CORSHeaders] = None
 
-    created_at: Optional[datetime] = None
-
     custom_deny_message: Optional[str] = None
     """
     The custom error message shown to a user when they are denied access to the
@@ -1025,6 +1025,14 @@ class BrowserSSHApplication(BaseModel):
     custom_pages: Optional[List[str]] = None
     """The custom pages that will be displayed when applicable for this application"""
 
+    destinations: Optional[List[BrowserSSHApplicationDestination]] = None
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
     enable_binding_cookie: Optional[bool] = None
     """
     Enables the binding cookie, which increases security against compromised
@@ -1057,7 +1065,18 @@ class BrowserSSHApplication(BaseModel):
 
     policies: Optional[List[BrowserSSHApplicationPolicy]] = None
 
-    same_site_cookie_attribute: Optional[str] = None
+    read_service_tokens_from_header: Optional[str] = None
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
+    same_site_cookie_attribute: Optional[str] = None
     """
     Sets the SameSite cookie setting, which provides increased security against CSRF
     attacks.
@@ -1070,7 +1089,12 @@ class BrowserSSHApplication(BaseModel):
     """
 
     self_hosted_domains: Optional[List[SelfHostedDomains]] = None
-    """List of domains that Access will secure."""
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
 
     service_auth_401_redirect: Optional[bool] = None
     """Returns a 401 status code when the request is blocked by a Service Auth policy."""
@@ -1079,7 +1103,7 @@ class BrowserSSHApplication(BaseModel):
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
     skip_interstitial: Optional[bool] = None
@@ -1091,10 +1115,76 @@ class BrowserSSHApplication(BaseModel):
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    updated_at: Optional[datetime] = None
+    use_clientless_isolation_app_launcher_url: Optional[bool] = None
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
+
+
+class BrowserVNCApplicationDestinationPublicDestination(BaseModel):
+    """A public hostname that Access will secure.
+
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
+    """
+
+    type: Optional[Literal["public"]] = None
+
+    uri: Optional[str] = None
+    """The URI of the destination.
+
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
+    """
+
+
+class BrowserVNCApplicationDestinationPrivateDestination(BaseModel):
+    cidr: Optional[str] = None
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
+
+    hostname: Optional[str] = None
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
+
+    l4_protocol: Optional[Literal["tcp", "udp"]] = None
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
+    """
+
+    port_range: Optional[str] = None
+    """The port range of the destination.
+
+    Can be a single port or a range of ports. When omitted, all ports will match.
+    """
+
+    type: Optional[Literal["private"]] = None
+
+    vnet_id: Optional[str] = None
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class BrowserVNCApplicationDestinationViaMcpServerPortalDestination(BaseModel):
+    """A MCP server id configured in ai-controls.
+
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
+
+    mcp_server_id: Optional[str] = None
+    """The MCP server id configured in ai-controls."""
+
+    type: Optional[Literal["via_mcp_server_portal"]] = None
+
+
+BrowserVNCApplicationDestination: TypeAlias = Union[
+    BrowserVNCApplicationDestinationPublicDestination,
+    BrowserVNCApplicationDestinationPrivateDestination,
+    BrowserVNCApplicationDestinationViaMcpServerPortalDestination,
+]
 
 
-class BrowserVncApplicationPolicy(BaseModel):
+class BrowserVNCApplicationPolicy(BaseModel):
     id: Optional[str] = None
     """The UUID of the policy"""
 
@@ -1110,7 +1200,10 @@ class BrowserVncApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -1134,6 +1227,12 @@ class BrowserVncApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -1156,100 +1255,72 @@ class BrowserVncApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+class BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
     client_id: str
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
     client_secret: str
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Literal["oauth2"]
+    scheme: Literal["access_service_token"]
     """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: str
+
+class BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    scopes: Optional[List[str]] = None
+    client_id: str
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
+    client_secret: str
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-BrowserVncApplicationSCIMConfigAuthentication = Union[
-    BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class BrowserVncApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class BrowserVncApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
+BrowserVNCApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: Optional[BrowserVncApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class BrowserVNCApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class BrowserVncApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -1259,7 +1330,7 @@ class BrowserVncApplicationSCIMConfig(BaseModel):
     remote_uri: str
     """The base URI for the application's SCIM-compatible API."""
 
-    authentication: Optional[BrowserVncApplicationSCIMConfigAuthentication] = None
+    authentication: Optional[BrowserVNCApplicationSCIMConfigAuthentication] = None
     """
     Attributes for configuring HTTP Basic authentication scheme for SCIM
     provisioning to an application.
@@ -1275,26 +1346,40 @@ class BrowserVncApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[BrowserVncApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
     """
 
 
-class BrowserVncApplication(BaseModel):
+class BrowserVNCApplication(BaseModel):
     domain: str
-    """The primary hostname and path that Access will secure.
-
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
-    """
-
-    type: str
+    """The primary hostname and path secured by Access.
+
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
+
+    type: Literal[
+        "self_hosted",
+        "saas",
+        "ssh",
+        "vnc",
+        "app_launcher",
+        "warp",
+        "biso",
+        "bookmark",
+        "dash_sso",
+        "infrastructure",
+        "rdp",
+        "mcp",
+        "mcp_portal",
+        "proxy_endpoint",
+    ]
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allow_authenticate_via_warp: Optional[bool] = None
     """
@@ -1304,6 +1389,9 @@ class BrowserVncApplication(BaseModel):
     authentication.
     """
 
+    allow_iframe: Optional[bool] = None
+    """Enables loading application content in an iFrame."""
+
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
     application.
@@ -1326,8 +1414,6 @@ class BrowserVncApplication(BaseModel):
 
     cors_headers: Optional[CORSHeaders] = None
 
-    created_at: Optional[datetime] = None
-
     custom_deny_message: Optional[str] = None
     """
     The custom error message shown to a user when they are denied access to the
@@ -1349,6 +1435,14 @@ class BrowserVncApplication(BaseModel):
     custom_pages: Optional[List[str]] = None
     """The custom pages that will be displayed when applicable for this application"""
 
+    destinations: Optional[List[BrowserVNCApplicationDestination]] = None
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
     enable_binding_cookie: Optional[bool] = None
     """
     Enables the binding cookie, which increases security against compromised
@@ -1379,7 +1473,18 @@ class BrowserVncApplication(BaseModel):
     If disabled, the JWT will scope to the hostname by default
     """
 
-    policies: Optional[List[BrowserVncApplicationPolicy]] = None
+    policies: Optional[List[BrowserVNCApplicationPolicy]] = None
+
+    read_service_tokens_from_header: Optional[str] = None
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
 
     same_site_cookie_attribute: Optional[str] = None
     """
@@ -1387,14 +1492,19 @@ class BrowserVncApplication(BaseModel):
     attacks.
     """
 
-    scim_config: Optional[BrowserVncApplicationSCIMConfig] = None
+    scim_config: Optional[BrowserVNCApplicationSCIMConfig] = None
     """Configuration for provisioning to this application via SCIM.
 
     This is currently in closed beta.
     """
 
     self_hosted_domains: Optional[List[SelfHostedDomains]] = None
-    """List of domains that Access will secure."""
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
 
     service_auth_401_redirect: Optional[bool] = None
     """Returns a 401 status code when the request is blocked by a Service Auth policy."""
@@ -1403,7 +1513,7 @@ class BrowserVncApplication(BaseModel):
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
     skip_interstitial: Optional[bool] = None
@@ -1415,7 +1525,40 @@ class BrowserVncApplication(BaseModel):
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    updated_at: Optional[datetime] = None
+    use_clientless_isolation_app_launcher_url: Optional[bool] = None
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
+
+
+class AppLauncherApplicationFooterLink(BaseModel):
+    name: str
+    """The hypertext in the footer link."""
+
+    url: str
+    """the hyperlink in the footer link."""
+
+
+class AppLauncherApplicationLandingPageDesign(BaseModel):
+    """The design of the App Launcher landing page shown to users when they log in."""
+
+    button_color: Optional[str] = None
+    """The background color of the log in button on the landing page."""
+
+    button_text_color: Optional[str] = None
+    """The color of the text in the log in button on the landing page."""
+
+    image_url: Optional[str] = None
+    """The URL of the image shown on the landing page."""
+
+    message: Optional[str] = None
+    """The message shown on the landing page."""
+
+    title: Optional[str] = None
+    """The title shown on the landing page."""
 
 
 class AppLauncherApplicationPolicy(BaseModel):
@@ -1434,7 +1577,10 @@ class AppLauncherApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -1458,6 +1604,12 @@ class AppLauncherApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -1480,138 +1632,174 @@ class AppLauncherApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
+class AppLauncherApplication(BaseModel):
+    type: Literal[
+        "self_hosted",
+        "saas",
+        "ssh",
+        "vnc",
+        "app_launcher",
+        "warp",
+        "biso",
+        "bookmark",
+        "dash_sso",
+        "infrastructure",
+        "rdp",
+        "mcp",
+        "mcp_portal",
+        "proxy_endpoint",
+    ]
+    """The application type."""
+
+    id: Optional[str] = None
+    """UUID."""
 
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    allowed_idps: Optional[List[AllowedIdPs]] = None
+    """The identity providers your users can select when connecting to this
+    application.
 
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
+    Defaults to all IdPs configured in your account.
+    """
 
+    app_launcher_logo_url: Optional[str] = None
+    """The image URL of the logo shown in the App Launcher header."""
 
-class AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
+    aud: Optional[str] = None
+    """Audience tag."""
 
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    auto_redirect_to_identity: Optional[bool] = None
+    """When set to `true`, users skip the identity provider selection step during
+    login.
 
+    You must specify only one identity provider in allowed_idps.
+    """
 
-class AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+    bg_color: Optional[str] = None
+    """The background color of the App Launcher page."""
 
-    client_id: str
+    custom_deny_url: Optional[str] = None
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
     """
 
-    client_secret: str
+    custom_non_identity_deny_url: Optional[str] = None
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
     """
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
 
-    token_url: str
-    """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
-    """
+    domain: Optional[str] = None
+    """The primary hostname and path secured by Access.
 
-    scopes: Optional[List[str]] = None
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    This domain will be displayed if the app is visible in the App Launcher.
     """
 
+    footer_links: Optional[List[AppLauncherApplicationFooterLink]] = None
+    """The links in the App Launcher footer."""
 
-AppLauncherApplicationSCIMConfigAuthentication = Union[
-    AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
+    header_bg_color: Optional[str] = None
+    """The background color of the App Launcher header."""
 
+    landing_page_design: Optional[AppLauncherApplicationLandingPageDesign] = None
+    """The design of the App Launcher landing page shown to users when they log in."""
 
-class AppLauncherApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
+    name: Optional[str] = None
+    """The name of the application."""
 
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
+    policies: Optional[List[AppLauncherApplicationPolicy]] = None
 
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for this application will be valid.
 
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
+    """
 
-class AppLauncherApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+    skip_app_launcher_login_page: Optional[bool] = None
+    """Determines when to skip the App Launcher landing page."""
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
 
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
+class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the policy"""
 
-    operations: Optional[AppLauncherApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+    approval_groups: Optional[List[ApprovalGroup]] = None
+    """Administrators who can approve a temporary authentication request."""
 
-    transform_jsonata: Optional[str] = None
+    approval_required: Optional[bool] = None
     """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    Requires the user to request access from an administrator at the start of each
+    session.
     """
 
+    created_at: Optional[datetime] = None
+
+    decision: Optional[Decision] = None
+    """The action Access will take if a user matches this policy.
 
-class AppLauncherApplicationSCIMConfig(BaseModel):
-    idp_uid: str
-    """
-    The UID of the IdP to use as the source for SCIM resources to provision to this
-    application.
+    Infrastructure application policies can only use the Allow action.
     """
 
-    remote_uri: str
-    """The base URI for the application's SCIM-compatible API."""
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
 
-    authentication: Optional[AppLauncherApplicationSCIMConfigAuthentication] = None
+    To match the policy, a user cannot meet any of the Exclude rules.
     """
-    Attributes for configuring HTTP Basic authentication scheme for SCIM
-    provisioning to an application.
+
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
+
+    A user needs to meet only one of the Include rules.
     """
 
-    deactivate_on_delete: Optional[bool] = None
+    isolation_required: Optional[bool] = None
     """
-    If false, propagates DELETE requests to the target application for SCIM
-    resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-    targets do not support DELETE operations.
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
     """
 
-    enabled: Optional[bool] = None
-    """Whether SCIM provisioning is turned on for this application."""
+    name: Optional[str] = None
+    """The name of the Access policy."""
 
-    mappings: Optional[List[AppLauncherApplicationSCIMConfigMapping]] = None
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
     """
-    A list of mappings to apply to SCIM resources before provisioning them in this
-    application. These can transform or filter the resources to be provisioned.
+
+    purpose_justification_prompt: Optional[str] = None
+    """A custom message that will appear on the purpose justification screen."""
+
+    purpose_justification_required: Optional[bool] = None
+    """Require users to enter a justification when they log in to the application."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
     """
 
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for the application will be valid.
 
-class AppLauncherApplication(BaseModel):
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
+    """
+
+    updated_at: Optional[datetime] = None
+
+
+class DeviceEnrollmentPermissionsApplication(BaseModel):
     type: ApplicationType
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
@@ -1630,37 +1818,41 @@ class AppLauncherApplication(BaseModel):
     You must specify only one identity provider in allowed_idps.
     """
 
-    created_at: Optional[datetime] = None
+    custom_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
+    """
+
+    custom_non_identity_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
+
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
 
     domain: Optional[str] = None
-    """The primary hostname and path that Access will secure.
+    """The primary hostname and path secured by Access.
 
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
+    This domain will be displayed if the app is visible in the App Launcher.
     """
 
     name: Optional[str] = None
     """The name of the application."""
 
-    policies: Optional[List[AppLauncherApplicationPolicy]] = None
-
-    scim_config: Optional[AppLauncherApplicationSCIMConfig] = None
-    """Configuration for provisioning to this application via SCIM.
-
-    This is currently in closed beta.
-    """
+    policies: Optional[List[DeviceEnrollmentPermissionsApplicationPolicy]] = None
 
     session_duration: Optional[str] = None
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
-    updated_at: Optional[datetime] = None
-
 
-class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
+class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
     id: Optional[str] = None
     """The UUID of the policy"""
 
@@ -1676,7 +1868,10 @@ class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -1700,6 +1895,12 @@ class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -1722,140 +1923,141 @@ class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
+class BrowserIsolationPermissionsApplication(BaseModel):
+    type: ApplicationType
+    """The application type."""
 
+    id: Optional[str] = None
+    """UUID."""
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
-    BaseModel
-):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
+    allowed_idps: Optional[List[AllowedIdPs]] = None
+    """The identity providers your users can select when connecting to this
+    application.
 
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    Defaults to all IdPs configured in your account.
+    """
 
+    aud: Optional[str] = None
+    """Audience tag."""
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+    auto_redirect_to_identity: Optional[bool] = None
+    """When set to `true`, users skip the identity provider selection step during
+    login.
 
-    client_id: str
-    """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    You must specify only one identity provider in allowed_idps.
     """
 
-    client_secret: str
+    custom_deny_url: Optional[str] = None
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
     """
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    token_url: str
+    custom_non_identity_deny_url: Optional[str] = None
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
     """
 
-    scopes: Optional[List[str]] = None
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
-    """
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
 
+    domain: Optional[str] = None
+    """The primary hostname and path secured by Access.
 
-DeviceEnrollmentPermissionsApplicationSCIMConfigAuthentication = Union[
-    DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
 
+    name: Optional[str] = None
+    """The name of the application."""
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
+    policies: Optional[List[BrowserIsolationPermissionsApplicationPolicy]] = None
 
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for this application will be valid.
 
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
+    """
 
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+class GatewayIdentityProxyEndpointApplicationPolicy(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the policy"""
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
+    approval_groups: Optional[List[ApprovalGroup]] = None
+    """Administrators who can approve a temporary authentication request."""
 
-    filter: Optional[str] = None
+    approval_required: Optional[bool] = None
     """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
+    Requires the user to request access from an administrator at the start of each
+    session.
     """
 
-    operations: Optional[DeviceEnrollmentPermissionsApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+    created_at: Optional[datetime] = None
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    decision: Optional[Decision] = None
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
     """
 
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfig(BaseModel):
-    idp_uid: str
-    """
-    The UID of the IdP to use as the source for SCIM resources to provision to this
-    application.
+    To match the policy, a user cannot meet any of the Exclude rules.
     """
 
-    remote_uri: str
-    """The base URI for the application's SCIM-compatible API."""
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
 
-    authentication: Optional[DeviceEnrollmentPermissionsApplicationSCIMConfigAuthentication] = None
-    """
-    Attributes for configuring HTTP Basic authentication scheme for SCIM
-    provisioning to an application.
+    A user needs to meet only one of the Include rules.
     """
 
-    deactivate_on_delete: Optional[bool] = None
+    isolation_required: Optional[bool] = None
     """
-    If false, propagates DELETE requests to the target application for SCIM
-    resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-    targets do not support DELETE operations.
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
     """
 
-    enabled: Optional[bool] = None
-    """Whether SCIM provisioning is turned on for this application."""
+    name: Optional[str] = None
+    """The name of the Access policy."""
+
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
 
-    mappings: Optional[List[DeviceEnrollmentPermissionsApplicationSCIMConfigMapping]] = None
+    Must be unique for each policy within an app.
     """
-    A list of mappings to apply to SCIM resources before provisioning them in this
-    application. These can transform or filter the resources to be provisioned.
+
+    purpose_justification_prompt: Optional[str] = None
+    """A custom message that will appear on the purpose justification screen."""
+
+    purpose_justification_required: Optional[bool] = None
+    """Require users to enter a justification when they log in to the application."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
+    """
+
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for the application will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
     """
 
+    updated_at: Optional[datetime] = None
+
 
-class DeviceEnrollmentPermissionsApplication(BaseModel):
+class GatewayIdentityProxyEndpointApplication(BaseModel):
     type: ApplicationType
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
@@ -1874,37 +2076,41 @@ class DeviceEnrollmentPermissionsApplication(BaseModel):
     You must specify only one identity provider in allowed_idps.
     """
 
-    created_at: Optional[datetime] = None
+    custom_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
+    """
 
-    domain: Optional[str] = None
-    """The primary hostname and path that Access will secure.
+    custom_non_identity_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
 
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
+
+    domain: Optional[str] = None
+    """
+    The proxy endpoint domain in the format: 10 alphanumeric characters followed by
+    .proxy.cloudflare-gateway.com
     """
 
     name: Optional[str] = None
     """The name of the application."""
 
-    policies: Optional[List[DeviceEnrollmentPermissionsApplicationPolicy]] = None
-
-    scim_config: Optional[DeviceEnrollmentPermissionsApplicationSCIMConfig] = None
-    """Configuration for provisioning to this application via SCIM.
-
-    This is currently in closed beta.
-    """
+    policies: Optional[List[GatewayIdentityProxyEndpointApplicationPolicy]] = None
 
     session_duration: Optional[str] = None
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
-    updated_at: Optional[datetime] = None
-
 
-class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
+class BookmarkApplicationPolicy(BaseModel):
     id: Optional[str] = None
     """The UUID of the policy"""
 
@@ -1920,7 +2126,10 @@ class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -1944,6 +2153,12 @@ class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -1966,282 +2181,346 @@ class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
+class BookmarkApplication(BaseModel):
+    id: Optional[str] = None
+    """UUID."""
 
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    app_launcher_visible: Optional[bool] = None
+    """Displays the application in the App Launcher."""
 
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
+    aud: Optional[str] = None
+    """Audience tag."""
 
+    domain: Optional[str] = None
+    """The URL or domain of the bookmark."""
 
-class BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
-    BaseModel
-):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
+    logo_url: Optional[str] = None
+    """The image URL for the logo shown in the App Launcher dashboard."""
 
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    name: Optional[str] = None
+    """The name of the application."""
 
+    policies: Optional[List[BookmarkApplicationPolicy]] = None
 
-class BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+    tags: Optional[List[str]] = None
+    """The tags you want assigned to an application.
 
-    client_id: str
-    """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    client_secret: str
-    """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
-    """
+    type: Optional[ApplicationType] = None
+    """The application type."""
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: str
-    """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
-    """
+class InfrastructureApplicationTargetCriterion(BaseModel):
+    port: int
+    """The port that the targets use for the chosen communication protocol.
 
-    scopes: Optional[List[str]] = None
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    A port cannot be assigned to multiple protocols.
     """
 
+    protocol: Literal["SSH"]
+    """The communication protocol your application secures."""
 
-BrowserIsolationPermissionsApplicationSCIMConfigAuthentication = Union[
-    BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
+    target_attributes: Dict[str, List[str]]
+    """Contains a map of target attribute keys to target attribute values."""
 
-class BrowserIsolationPermissionsApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
 
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+class InfrastructureApplicationPolicyConnectionRulesSSH(BaseModel):
+    """
+    The SSH-specific rules that define how users may connect to the targets secured by your application.
+    """
 
+    usernames: List[str]
+    """Contains the Unix usernames that may be used when connecting over SSH."""
 
-class BrowserIsolationPermissionsApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+    allow_email_alias: Optional[bool] = None
+    """Enables using Identity Provider email alias as SSH username."""
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
 
-    filter: Optional[str] = None
+class InfrastructureApplicationPolicyConnectionRules(BaseModel):
     """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
+    The rules that define how users may connect to the targets secured by your application.
     """
 
-    operations: Optional[BrowserIsolationPermissionsApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
-
-    transform_jsonata: Optional[str] = None
+    ssh: Optional[InfrastructureApplicationPolicyConnectionRulesSSH] = None
     """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    The SSH-specific rules that define how users may connect to the targets secured
+    by your application.
     """
 
 
-class BrowserIsolationPermissionsApplicationSCIMConfig(BaseModel):
-    idp_uid: str
+class InfrastructureApplicationPolicy(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the policy"""
+
+    connection_rules: Optional[InfrastructureApplicationPolicyConnectionRules] = None
     """
-    The UID of the IdP to use as the source for SCIM resources to provision to this
+    The rules that define how users may connect to the targets secured by your
     application.
     """
 
-    remote_uri: str
-    """The base URI for the application's SCIM-compatible API."""
+    created_at: Optional[datetime] = None
 
-    authentication: Optional[BrowserIsolationPermissionsApplicationSCIMConfigAuthentication] = None
-    """
-    Attributes for configuring HTTP Basic authentication scheme for SCIM
-    provisioning to an application.
-    """
+    decision: Optional[Decision] = None
+    """The action Access will take if a user matches this policy.
 
-    deactivate_on_delete: Optional[bool] = None
+    Infrastructure application policies can only use the Allow action.
     """
-    If false, propagates DELETE requests to the target application for SCIM
-    resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-    targets do not support DELETE operations.
+
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
+
+    To match the policy, a user cannot meet any of the Exclude rules.
     """
 
-    enabled: Optional[bool] = None
-    """Whether SCIM provisioning is turned on for this application."""
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
 
-    mappings: Optional[List[BrowserIsolationPermissionsApplicationSCIMConfigMapping]] = None
+    A user needs to meet only one of the Include rules.
     """
-    A list of mappings to apply to SCIM resources before provisioning them in this
-    application. These can transform or filter the resources to be provisioned.
+
+    name: Optional[str] = None
+    """The name of the Access policy."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
     """
 
+    updated_at: Optional[datetime] = None
+
+
+class InfrastructureApplication(BaseModel):
+    target_criteria: List[InfrastructureApplicationTargetCriterion]
 
-class BrowserIsolationPermissionsApplication(BaseModel):
     type: ApplicationType
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    allowed_idps: Optional[List[AllowedIdPs]] = None
-    """The identity providers your users can select when connecting to this
-    application.
+    aud: Optional[str] = None
+    """Audience tag."""
 
-    Defaults to all IdPs configured in your account.
+    name: Optional[str] = None
+    """The name of the application."""
+
+    policies: Optional[List[InfrastructureApplicationPolicy]] = None
+
+
+class BrowserRdpApplicationTargetCriterion(BaseModel):
+    port: int
+    """The port that the targets use for the chosen communication protocol.
+
+    A port cannot be assigned to multiple protocols.
     """
 
-    aud: Optional[str] = None
-    """Audience tag."""
+    protocol: Literal["RDP"]
+    """The communication protocol your application secures."""
 
-    auto_redirect_to_identity: Optional[bool] = None
-    """When set to `true`, users skip the identity provider selection step during
-    login.
+    target_attributes: Dict[str, List[str]]
+    """Contains a map of target attribute keys to target attribute values."""
 
-    You must specify only one identity provider in allowed_idps.
+
+class BrowserRdpApplicationDestinationPublicDestination(BaseModel):
+    """A public hostname that Access will secure.
+
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
     """
 
-    created_at: Optional[datetime] = None
+    type: Optional[Literal["public"]] = None
 
-    domain: Optional[str] = None
-    """The primary hostname and path that Access will secure.
+    uri: Optional[str] = None
+    """The URI of the destination.
 
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
     """
 
-    name: Optional[str] = None
-    """The name of the application."""
 
-    policies: Optional[List[BrowserIsolationPermissionsApplicationPolicy]] = None
+class BrowserRdpApplicationDestinationPrivateDestination(BaseModel):
+    cidr: Optional[str] = None
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
 
-    scim_config: Optional[BrowserIsolationPermissionsApplicationSCIMConfig] = None
-    """Configuration for provisioning to this application via SCIM.
+    hostname: Optional[str] = None
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
 
-    This is currently in closed beta.
+    l4_protocol: Optional[Literal["tcp", "udp"]] = None
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
     """
 
-    session_duration: Optional[str] = None
-    """The amount of time that tokens issued for this application will be valid.
+    port_range: Optional[str] = None
+    """The port range of the destination.
 
-    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    Can be a single port or a range of ports. When omitted, all ports will match.
     """
 
-    updated_at: Optional[datetime] = None
+    type: Optional[Literal["private"]] = None
 
+    vnet_id: Optional[str] = None
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
 
-class BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
 
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+class BrowserRdpApplicationDestinationViaMcpServerPortalDestination(BaseModel):
+    """A MCP server id configured in ai-controls.
 
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
 
+    mcp_server_id: Optional[str] = None
+    """The MCP server id configured in ai-controls."""
 
-class BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
+    type: Optional[Literal["via_mcp_server_portal"]] = None
 
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
 
+BrowserRdpApplicationDestination: TypeAlias = Union[
+    BrowserRdpApplicationDestinationPublicDestination,
+    BrowserRdpApplicationDestinationPrivateDestination,
+    BrowserRdpApplicationDestinationViaMcpServerPortalDestination,
+]
 
-class BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
 
-    client_id: str
+class BrowserRdpApplicationPolicy(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the policy"""
+
+    approval_groups: Optional[List[ApprovalGroup]] = None
+    """Administrators who can approve a temporary authentication request."""
+
+    approval_required: Optional[bool] = None
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Requires the user to request access from an administrator at the start of each
+    session.
     """
 
-    client_secret: str
+    created_at: Optional[datetime] = None
+
+    decision: Optional[Decision] = None
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
+
+    To match the policy, a user cannot meet any of the Exclude rules.
     """
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
 
-    token_url: str
+    A user needs to meet only one of the Include rules.
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+
+    isolation_required: Optional[bool] = None
+    """
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
     """
 
-    scopes: Optional[List[str]] = None
+    name: Optional[str] = None
+    """The name of the Access policy."""
+
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+
+    purpose_justification_prompt: Optional[str] = None
+    """A custom message that will appear on the purpose justification screen."""
+
+    purpose_justification_required: Optional[bool] = None
+    """Require users to enter a justification when they log in to the application."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
     """
 
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for the application will be valid.
 
-BookmarkApplicationSCIMConfigAuthentication = Union[
-    BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
+    """
 
+    updated_at: Optional[datetime] = None
 
-class BookmarkApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
 
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
+class BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    client_id: str
+    """
+    Client ID of the Access service token used to authenticate with the remote
+    service.
+    """
 
+    client_secret: str
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-class BookmarkApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
 
-    filter: Optional[str] = None
+class BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    operations: Optional[BookmarkApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+    client_id: str
+    """
+    Client ID of the Access service token used to authenticate with the remote
+    service.
+    """
 
-    transform_jsonata: Optional[str] = None
+    client_secret: str
     """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
+
+
+BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
+
+BrowserRdpApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
+
+
+class BrowserRdpApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
+
+    This is currently in closed beta.
+    """
 
-class BookmarkApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -2251,7 +2530,7 @@ class BookmarkApplicationSCIMConfig(BaseModel):
     remote_uri: str
     """The base URI for the application's SCIM-compatible API."""
 
-    authentication: Optional[BookmarkApplicationSCIMConfigAuthentication] = None
+    authentication: Optional[BrowserRdpApplicationSCIMConfigAuthentication] = None
     """
     Attributes for configuring HTTP Basic authentication scheme for SCIM
     provisioning to an application.
@@ -2267,16 +2546,45 @@ class BookmarkApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[BookmarkApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
     """
 
 
-class BookmarkApplication(BaseModel):
+class BrowserRdpApplication(BaseModel):
+    domain: str
+    """The primary hostname and path secured by Access.
+
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
+
+    target_criteria: List[BrowserRdpApplicationTargetCriterion]
+
+    type: ApplicationType
+    """The application type."""
+
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
+
+    allow_authenticate_via_warp: Optional[bool] = None
+    """
+    When set to true, users can authenticate to this application using their WARP
+    session. When set to false this application will always require direct IdP
+    authentication. This setting always overrides the organization setting for WARP
+    authentication.
+    """
+
+    allow_iframe: Optional[bool] = None
+    """Enables loading application content in an iFrame."""
+
+    allowed_idps: Optional[List[AllowedIdPs]] = None
+    """The identity providers your users can select when connecting to this
+    application.
+
+    Defaults to all IdPs configured in your account.
+    """
 
     app_launcher_visible: Optional[bool] = None
     """Displays the application in the App Launcher."""
@@ -2284,10 +2592,55 @@ class BookmarkApplication(BaseModel):
     aud: Optional[str] = None
     """Audience tag."""
 
-    created_at: Optional[datetime] = None
+    auto_redirect_to_identity: Optional[bool] = None
+    """When set to `true`, users skip the identity provider selection step during
+    login.
 
-    domain: Optional[str] = None
-    """The URL or domain of the bookmark."""
+    You must specify only one identity provider in allowed_idps.
+    """
+
+    cors_headers: Optional[CORSHeaders] = None
+
+    custom_deny_message: Optional[str] = None
+    """
+    The custom error message shown to a user when they are denied access to the
+    application.
+    """
+
+    custom_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
+    """
+
+    custom_non_identity_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
+
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
+
+    destinations: Optional[List[BrowserRdpApplicationDestination]] = None
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
+    enable_binding_cookie: Optional[bool] = None
+    """
+    Enables the binding cookie, which increases security against compromised
+    authorization tokens and CSRF attacks.
+    """
+
+    http_only_cookie_attribute: Optional[bool] = None
+    """
+    Enables the HttpOnly cookie attribute, which increases security against XSS
+    attacks.
+    """
 
     logo_url: Optional[str] = None
     """The image URL for the logo shown in the App Launcher dashboard."""
@@ -2295,31 +2648,89 @@ class BookmarkApplication(BaseModel):
     name: Optional[str] = None
     """The name of the application."""
 
-    scim_config: Optional[BookmarkApplicationSCIMConfig] = None
+    options_preflight_bypass: Optional[bool] = None
+    """
+    Allows options preflight requests to bypass Access authentication and go
+    directly to the origin. Cannot turn on if cors_headers is set.
+    """
+
+    path_cookie_attribute: Optional[bool] = None
+    """Enables cookie paths to scope an application's JWT to the application path.
+
+    If disabled, the JWT will scope to the hostname by default
+    """
+
+    policies: Optional[List[BrowserRdpApplicationPolicy]] = None
+
+    read_service_tokens_from_header: Optional[str] = None
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
+    same_site_cookie_attribute: Optional[str] = None
+    """
+    Sets the SameSite cookie setting, which provides increased security against CSRF
+    attacks.
+    """
+
+    scim_config: Optional[BrowserRdpApplicationSCIMConfig] = None
     """Configuration for provisioning to this application via SCIM.
 
     This is currently in closed beta.
     """
 
+    self_hosted_domains: Optional[List[SelfHostedDomains]] = None
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
+    service_auth_401_redirect: Optional[bool] = None
+    """Returns a 401 status code when the request is blocked by a Service Auth policy."""
+
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for this application will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
+    """
+
+    skip_interstitial: Optional[bool] = None
+    """Enables automatic authentication through cloudflared."""
+
     tags: Optional[List[str]] = None
     """The tags you want assigned to an application.
 
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    type: Optional[str] = None
-    """The application type."""
-
-    updated_at: Optional[datetime] = None
+    use_clientless_isolation_app_launcher_url: Optional[bool] = None
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
 
 
-ApplicationCreateResponse = Union[
+ApplicationCreateResponse: TypeAlias = Union[
     SelfHostedApplication,
     SaaSApplication,
     BrowserSSHApplication,
-    BrowserVncApplication,
+    BrowserVNCApplication,
     AppLauncherApplication,
     DeviceEnrollmentPermissionsApplication,
     BrowserIsolationPermissionsApplication,
+    GatewayIdentityProxyEndpointApplication,
     BookmarkApplication,
+    InfrastructureApplication,
+    BrowserRdpApplication,
 ]
diff --git a/src/cloudflare/types/zero_trust/access/application_delete_response.py b/src/cloudflare/types/zero_trust/access/application_delete_response.py
index 002b0bf6b77..537ce219740 100644
--- a/src/cloudflare/types/zero_trust/access/application_delete_response.py
+++ b/src/cloudflare/types/zero_trust/access/application_delete_response.py
@@ -9,4 +9,4 @@
 
 class ApplicationDeleteResponse(BaseModel):
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
diff --git a/src/cloudflare/types/zero_trust/access/application_get_response.py b/src/cloudflare/types/zero_trust/access/application_get_response.py
index a633b9174c1..b4e1ccce576 100644
--- a/src/cloudflare/types/zero_trust/access/application_get_response.py
+++ b/src/cloudflare/types/zero_trust/access/application_get_response.py
@@ -2,99 +2,155 @@
 
 from typing import Dict, List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
-
-from pydantic import Field as FieldInfo
+from typing_extensions import Literal, TypeAlias
 
 from .decision import Decision
 from ...._models import BaseModel
-from ..access_rule import AccessRule
 from .allowed_idps import AllowedIdPs
 from .cors_headers import CORSHeaders
+from .oidc_saas_app import OIDCSaaSApp
 from .saml_saas_app import SAMLSaaSApp
+from .approval_group import ApprovalGroup
 from .application_type import ApplicationType
+from .scim_config_mapping import SCIMConfigMapping
 from .self_hosted_domains import SelfHostedDomains
-from .applications.approval_group import ApprovalGroup
+from .applications.access_rule import AccessRule
+from .scim_config_authentication_oauth2 import SCIMConfigAuthenticationOauth2
+from .scim_config_authentication_http_basic import SCIMConfigAuthenticationHTTPBasic
+from .scim_config_authentication_oauth_bearer_token import SCIMConfigAuthenticationOAuthBearerToken
 
 __all__ = [
     "ApplicationGetResponse",
     "SelfHostedApplication",
+    "SelfHostedApplicationDestination",
+    "SelfHostedApplicationDestinationPublicDestination",
+    "SelfHostedApplicationDestinationPrivateDestination",
+    "SelfHostedApplicationDestinationViaMcpServerPortalDestination",
     "SelfHostedApplicationPolicy",
     "SelfHostedApplicationSCIMConfig",
     "SelfHostedApplicationSCIMConfigAuthentication",
-    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "SelfHostedApplicationSCIMConfigMapping",
-    "SelfHostedApplicationSCIMConfigMappingOperations",
+    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
     "SaaSApplication",
     "SaaSApplicationPolicy",
     "SaaSApplicationSaaSApp",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSApp",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaims",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaimsSource",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppHybridAndImplicitOptions",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppRefreshTokenOptions",
     "SaaSApplicationSCIMConfig",
     "SaaSApplicationSCIMConfigAuthentication",
-    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "SaaSApplicationSCIMConfigMapping",
-    "SaaSApplicationSCIMConfigMappingOperations",
+    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
     "BrowserSSHApplication",
+    "BrowserSSHApplicationDestination",
+    "BrowserSSHApplicationDestinationPublicDestination",
+    "BrowserSSHApplicationDestinationPrivateDestination",
+    "BrowserSSHApplicationDestinationViaMcpServerPortalDestination",
     "BrowserSSHApplicationPolicy",
     "BrowserSSHApplicationSCIMConfig",
     "BrowserSSHApplicationSCIMConfigAuthentication",
-    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BrowserSSHApplicationSCIMConfigMapping",
-    "BrowserSSHApplicationSCIMConfigMappingOperations",
-    "BrowserVncApplication",
-    "BrowserVncApplicationPolicy",
-    "BrowserVncApplicationSCIMConfig",
-    "BrowserVncApplicationSCIMConfigAuthentication",
-    "BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BrowserVncApplicationSCIMConfigMapping",
-    "BrowserVncApplicationSCIMConfigMappingOperations",
+    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserVNCApplication",
+    "BrowserVNCApplicationDestination",
+    "BrowserVNCApplicationDestinationPublicDestination",
+    "BrowserVNCApplicationDestinationPrivateDestination",
+    "BrowserVNCApplicationDestinationViaMcpServerPortalDestination",
+    "BrowserVNCApplicationPolicy",
+    "BrowserVNCApplicationSCIMConfig",
+    "BrowserVNCApplicationSCIMConfigAuthentication",
+    "BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
     "AppLauncherApplication",
+    "AppLauncherApplicationFooterLink",
+    "AppLauncherApplicationLandingPageDesign",
     "AppLauncherApplicationPolicy",
-    "AppLauncherApplicationSCIMConfig",
-    "AppLauncherApplicationSCIMConfigAuthentication",
-    "AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "AppLauncherApplicationSCIMConfigMapping",
-    "AppLauncherApplicationSCIMConfigMappingOperations",
     "DeviceEnrollmentPermissionsApplication",
     "DeviceEnrollmentPermissionsApplicationPolicy",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfig",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthentication",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigMapping",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigMappingOperations",
     "BrowserIsolationPermissionsApplication",
     "BrowserIsolationPermissionsApplicationPolicy",
-    "BrowserIsolationPermissionsApplicationSCIMConfig",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthentication",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BrowserIsolationPermissionsApplicationSCIMConfigMapping",
-    "BrowserIsolationPermissionsApplicationSCIMConfigMappingOperations",
+    "GatewayIdentityProxyEndpointApplication",
+    "GatewayIdentityProxyEndpointApplicationPolicy",
     "BookmarkApplication",
-    "BookmarkApplicationSCIMConfig",
-    "BookmarkApplicationSCIMConfigAuthentication",
-    "BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BookmarkApplicationSCIMConfigMapping",
-    "BookmarkApplicationSCIMConfigMappingOperations",
+    "BookmarkApplicationPolicy",
+    "InfrastructureApplication",
+    "InfrastructureApplicationTargetCriterion",
+    "InfrastructureApplicationPolicy",
+    "InfrastructureApplicationPolicyConnectionRules",
+    "InfrastructureApplicationPolicyConnectionRulesSSH",
+    "BrowserRdpApplication",
+    "BrowserRdpApplicationTargetCriterion",
+    "BrowserRdpApplicationDestination",
+    "BrowserRdpApplicationDestinationPublicDestination",
+    "BrowserRdpApplicationDestinationPrivateDestination",
+    "BrowserRdpApplicationDestinationViaMcpServerPortalDestination",
+    "BrowserRdpApplicationPolicy",
+    "BrowserRdpApplicationSCIMConfig",
+    "BrowserRdpApplicationSCIMConfigAuthentication",
+    "BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+]
+
+
+class SelfHostedApplicationDestinationPublicDestination(BaseModel):
+    """A public hostname that Access will secure.
+
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
+    """
+
+    type: Optional[Literal["public"]] = None
+
+    uri: Optional[str] = None
+    """The URI of the destination.
+
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
+    """
+
+
+class SelfHostedApplicationDestinationPrivateDestination(BaseModel):
+    cidr: Optional[str] = None
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
+
+    hostname: Optional[str] = None
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
+
+    l4_protocol: Optional[Literal["tcp", "udp"]] = None
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
+    """
+
+    port_range: Optional[str] = None
+    """The port range of the destination.
+
+    Can be a single port or a range of ports. When omitted, all ports will match.
+    """
+
+    type: Optional[Literal["private"]] = None
+
+    vnet_id: Optional[str] = None
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class SelfHostedApplicationDestinationViaMcpServerPortalDestination(BaseModel):
+    """A MCP server id configured in ai-controls.
+
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
+
+    mcp_server_id: Optional[str] = None
+    """The MCP server id configured in ai-controls."""
+
+    type: Optional[Literal["via_mcp_server_portal"]] = None
+
+
+SelfHostedApplicationDestination: TypeAlias = Union[
+    SelfHostedApplicationDestinationPublicDestination,
+    SelfHostedApplicationDestinationPrivateDestination,
+    SelfHostedApplicationDestinationViaMcpServerPortalDestination,
 ]
 
 
@@ -114,7 +170,10 @@ class SelfHostedApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -138,6 +197,12 @@ class SelfHostedApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -160,100 +225,72 @@ class SelfHostedApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
     client_id: str
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
     client_secret: str
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Literal["oauth2"]
+    scheme: Literal["access_service_token"]
     """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: str
+
+class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    scopes: Optional[List[str]] = None
+    client_id: str
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
+    client_secret: str
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-SelfHostedApplicationSCIMConfigAuthentication = Union[
-    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class SelfHostedApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class SelfHostedApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
+SelfHostedApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: Optional[SelfHostedApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class SelfHostedApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class SelfHostedApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -279,7 +316,7 @@ class SelfHostedApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[SelfHostedApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
@@ -288,17 +325,16 @@ class SelfHostedApplicationSCIMConfig(BaseModel):
 
 class SelfHostedApplication(BaseModel):
     domain: str
-    """The primary hostname and path that Access will secure.
+    """The primary hostname and path secured by Access.
 
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
+    This domain will be displayed if the app is visible in the App Launcher.
     """
 
-    type: str
+    type: ApplicationType
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allow_authenticate_via_warp: Optional[bool] = None
     """
@@ -308,6 +344,9 @@ class SelfHostedApplication(BaseModel):
     authentication.
     """
 
+    allow_iframe: Optional[bool] = None
+    """Enables loading application content in an iFrame."""
+
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
     application.
@@ -330,8 +369,6 @@ class SelfHostedApplication(BaseModel):
 
     cors_headers: Optional[CORSHeaders] = None
 
-    created_at: Optional[datetime] = None
-
     custom_deny_message: Optional[str] = None
     """
     The custom error message shown to a user when they are denied access to the
@@ -353,6 +390,14 @@ class SelfHostedApplication(BaseModel):
     custom_pages: Optional[List[str]] = None
     """The custom pages that will be displayed when applicable for this application"""
 
+    destinations: Optional[List[SelfHostedApplicationDestination]] = None
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
     enable_binding_cookie: Optional[bool] = None
     """
     Enables the binding cookie, which increases security against compromised
@@ -385,6 +430,17 @@ class SelfHostedApplication(BaseModel):
 
     policies: Optional[List[SelfHostedApplicationPolicy]] = None
 
+    read_service_tokens_from_header: Optional[str] = None
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
     same_site_cookie_attribute: Optional[str] = None
     """
     Sets the SameSite cookie setting, which provides increased security against CSRF
@@ -398,7 +454,12 @@ class SelfHostedApplication(BaseModel):
     """
 
     self_hosted_domains: Optional[List[SelfHostedDomains]] = None
-    """List of domains that Access will secure."""
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
 
     service_auth_401_redirect: Optional[bool] = None
     """Returns a 401 status code when the request is blocked by a Service Auth policy."""
@@ -407,7 +468,7 @@ class SelfHostedApplication(BaseModel):
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
     skip_interstitial: Optional[bool] = None
@@ -419,7 +480,13 @@ class SelfHostedApplication(BaseModel):
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    updated_at: Optional[datetime] = None
+    use_clientless_isolation_app_launcher_url: Optional[bool] = None
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
 
 
 class SaaSApplicationPolicy(BaseModel):
@@ -438,7 +505,10 @@ class SaaSApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -462,6 +532,12 @@ class SaaSApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -484,203 +560,75 @@ class SaaSApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaimsSource(BaseModel):
-    name: Optional[str] = None
-    """The name of the IdP claim."""
-
-    name_by_idp: Optional[Dict[str, str]] = None
-    """A mapping from IdP ID to claim name."""
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaims(BaseModel):
-    name: Optional[str] = None
-    """The name of the claim."""
-
-    required: Optional[bool] = None
-    """If the claim is required when building an OIDC token."""
-
-    scope: Optional[Literal["groups", "profile", "email", "openid"]] = None
-    """The scope of the claim."""
-
-    source: Optional[SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaimsSource] = None
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppHybridAndImplicitOptions(BaseModel):
-    return_access_token_from_authorization_endpoint: Optional[bool] = None
-    """If an Access Token should be returned from the OIDC Authorization endpoint"""
-
-    return_id_token_from_authorization_endpoint: Optional[bool] = None
-    """If an ID Token should be returned from the OIDC Authorization endpoint"""
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppRefreshTokenOptions(BaseModel):
-    lifetime: Optional[str] = None
-    """How long a refresh token will be valid for after creation.
-
-    Valid units are m,h,d. Must be longer than 1m.
-    """
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSApp(BaseModel):
-    access_token_lifetime: Optional[str] = None
-    """The lifetime of the OIDC Access Token after creation.
+SaaSApplicationSaaSApp: TypeAlias = Union[SAMLSaaSApp, OIDCSaaSApp]
 
-    Valid units are m,h. Must be greater than or equal to 1m and less than or equal
-    to 24h.
-    """
 
-    allow_pkce_without_client_secret: Optional[bool] = None
-    """
-    If client secret should be required on the token endpoint when
-    authorization_code_with_pkce grant is used.
+class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
     """
-
-    app_launcher_url: Optional[str] = None
-    """The URL where this applications tile redirects users"""
-
-    auth_type: Optional[Literal["saml", "oidc"]] = None
-    """Identifier of the authentication protocol used for the saas app.
-
-    Required for OIDC.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    client_id: Optional[str] = None
-    """The application client id"""
-
-    client_secret: Optional[str] = None
-    """The application client secret, only returned on POST request."""
-
-    created_at: Optional[datetime] = None
-
-    custom_claims: Optional[SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaims] = None
-
-    grant_types: Optional[
-        List[Literal["authorization_code", "authorization_code_with_pkce", "refresh_tokens", "hybrid", "implicit"]]
-    ] = None
-    """The OIDC flows supported by this application"""
-
-    group_filter_regex: Optional[str] = None
-    """A regex to filter Cloudflare groups returned in ID token and userinfo endpoint"""
-
-    hybrid_and_implicit_options: Optional[SaaSApplicationSaaSAppAccessOIDCSaaSAppHybridAndImplicitOptions] = None
-
-    public_key: Optional[str] = None
-    """The Access public certificate that will be used to verify your identity."""
-
-    redirect_uris: Optional[List[str]] = None
+    client_id: str
     """
-    The permitted URL's for Cloudflare to return Authorization codes and Access/ID
-    tokens
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
-    refresh_token_options: Optional[SaaSApplicationSaaSAppAccessOIDCSaaSAppRefreshTokenOptions] = None
-
-    scopes: Optional[List[Literal["openid", "groups", "email", "profile"]]] = None
+    client_secret: str
     """
-    Define the user information shared with access, "offline_access" scope will be
-    automatically enabled if refresh tokens are enabled
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    updated_at: Optional[datetime] = None
-
-
-SaaSApplicationSaaSApp = Union[SAMLSaaSApp, SaaSApplicationSaaSAppAccessOIDCSaaSApp]
-
-
-class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["oauthbearertoken"]
+    scheme: Literal["access_service_token"]
     """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
-
-    client_id: str
+class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    client_secret: str
+    client_id: str
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    token_url: str
+    client_secret: str
     """
-    URL used to generate the token used to authenticate with the remote SCIM
+    Client secret of the Access service token used to authenticate with the remote
     service.
     """
 
-    scopes: Optional[List[str]] = None
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
-    """
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-SaaSApplicationSCIMConfigAuthentication = Union[
-    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
+SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
 ]
 
+SaaSApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-class SaaSApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
-
-
-class SaaSApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
-
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
-
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: Optional[SaaSApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class SaaSApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class SaaSApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -706,7 +654,7 @@ class SaaSApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[SaaSApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
@@ -715,7 +663,7 @@ class SaaSApplicationSCIMConfig(BaseModel):
 
 class SaaSApplication(BaseModel):
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
@@ -737,8 +685,6 @@ class SaaSApplication(BaseModel):
     You must specify only one identity provider in allowed_idps.
     """
 
-    created_at: Optional[datetime] = None
-
     custom_pages: Optional[List[str]] = None
     """The custom pages that will be displayed when applicable for this application"""
 
@@ -764,10 +710,68 @@ class SaaSApplication(BaseModel):
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    type: Optional[str] = None
+    type: Optional[ApplicationType] = None
     """The application type."""
 
-    updated_at: Optional[datetime] = None
+
+class BrowserSSHApplicationDestinationPublicDestination(BaseModel):
+    """A public hostname that Access will secure.
+
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
+    """
+
+    type: Optional[Literal["public"]] = None
+
+    uri: Optional[str] = None
+    """The URI of the destination.
+
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
+    """
+
+
+class BrowserSSHApplicationDestinationPrivateDestination(BaseModel):
+    cidr: Optional[str] = None
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
+
+    hostname: Optional[str] = None
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
+
+    l4_protocol: Optional[Literal["tcp", "udp"]] = None
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
+    """
+
+    port_range: Optional[str] = None
+    """The port range of the destination.
+
+    Can be a single port or a range of ports. When omitted, all ports will match.
+    """
+
+    type: Optional[Literal["private"]] = None
+
+    vnet_id: Optional[str] = None
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class BrowserSSHApplicationDestinationViaMcpServerPortalDestination(BaseModel):
+    """A MCP server id configured in ai-controls.
+
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
+
+    mcp_server_id: Optional[str] = None
+    """The MCP server id configured in ai-controls."""
+
+    type: Optional[Literal["via_mcp_server_portal"]] = None
+
+
+BrowserSSHApplicationDestination: TypeAlias = Union[
+    BrowserSSHApplicationDestinationPublicDestination,
+    BrowserSSHApplicationDestinationPrivateDestination,
+    BrowserSSHApplicationDestinationViaMcpServerPortalDestination,
+]
 
 
 class BrowserSSHApplicationPolicy(BaseModel):
@@ -786,7 +790,10 @@ class BrowserSSHApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -810,6 +817,12 @@ class BrowserSSHApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -832,100 +845,72 @@ class BrowserSSHApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
     client_id: str
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
     client_secret: str
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Literal["oauth2"]
+    scheme: Literal["access_service_token"]
     """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: str
+
+class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    scopes: Optional[List[str]] = None
+    client_id: str
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
+    client_secret: str
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-BrowserSSHApplicationSCIMConfigAuthentication = Union[
-    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class BrowserSSHApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class BrowserSSHApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
+BrowserSSHApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: Optional[BrowserSSHApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class BrowserSSHApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class BrowserSSHApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -951,7 +936,7 @@ class BrowserSSHApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[BrowserSSHApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
@@ -960,17 +945,31 @@ class BrowserSSHApplicationSCIMConfig(BaseModel):
 
 class BrowserSSHApplication(BaseModel):
     domain: str
-    """The primary hostname and path that Access will secure.
-
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
-    """
-
-    type: str
+    """The primary hostname and path secured by Access.
+
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
+
+    type: Literal[
+        "self_hosted",
+        "saas",
+        "ssh",
+        "vnc",
+        "app_launcher",
+        "warp",
+        "biso",
+        "bookmark",
+        "dash_sso",
+        "infrastructure",
+        "rdp",
+        "mcp",
+        "mcp_portal",
+        "proxy_endpoint",
+    ]
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allow_authenticate_via_warp: Optional[bool] = None
     """
@@ -980,6 +979,9 @@ class BrowserSSHApplication(BaseModel):
     authentication.
     """
 
+    allow_iframe: Optional[bool] = None
+    """Enables loading application content in an iFrame."""
+
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
     application.
@@ -1002,8 +1004,6 @@ class BrowserSSHApplication(BaseModel):
 
     cors_headers: Optional[CORSHeaders] = None
 
-    created_at: Optional[datetime] = None
-
     custom_deny_message: Optional[str] = None
     """
     The custom error message shown to a user when they are denied access to the
@@ -1025,6 +1025,14 @@ class BrowserSSHApplication(BaseModel):
     custom_pages: Optional[List[str]] = None
     """The custom pages that will be displayed when applicable for this application"""
 
+    destinations: Optional[List[BrowserSSHApplicationDestination]] = None
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
     enable_binding_cookie: Optional[bool] = None
     """
     Enables the binding cookie, which increases security against compromised
@@ -1057,7 +1065,18 @@ class BrowserSSHApplication(BaseModel):
 
     policies: Optional[List[BrowserSSHApplicationPolicy]] = None
 
-    same_site_cookie_attribute: Optional[str] = None
+    read_service_tokens_from_header: Optional[str] = None
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
+    same_site_cookie_attribute: Optional[str] = None
     """
     Sets the SameSite cookie setting, which provides increased security against CSRF
     attacks.
@@ -1070,7 +1089,12 @@ class BrowserSSHApplication(BaseModel):
     """
 
     self_hosted_domains: Optional[List[SelfHostedDomains]] = None
-    """List of domains that Access will secure."""
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
 
     service_auth_401_redirect: Optional[bool] = None
     """Returns a 401 status code when the request is blocked by a Service Auth policy."""
@@ -1079,7 +1103,7 @@ class BrowserSSHApplication(BaseModel):
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
     skip_interstitial: Optional[bool] = None
@@ -1091,10 +1115,76 @@ class BrowserSSHApplication(BaseModel):
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    updated_at: Optional[datetime] = None
+    use_clientless_isolation_app_launcher_url: Optional[bool] = None
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
+
+
+class BrowserVNCApplicationDestinationPublicDestination(BaseModel):
+    """A public hostname that Access will secure.
+
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
+    """
+
+    type: Optional[Literal["public"]] = None
+
+    uri: Optional[str] = None
+    """The URI of the destination.
+
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
+    """
+
+
+class BrowserVNCApplicationDestinationPrivateDestination(BaseModel):
+    cidr: Optional[str] = None
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
+
+    hostname: Optional[str] = None
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
+
+    l4_protocol: Optional[Literal["tcp", "udp"]] = None
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
+    """
+
+    port_range: Optional[str] = None
+    """The port range of the destination.
+
+    Can be a single port or a range of ports. When omitted, all ports will match.
+    """
+
+    type: Optional[Literal["private"]] = None
+
+    vnet_id: Optional[str] = None
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class BrowserVNCApplicationDestinationViaMcpServerPortalDestination(BaseModel):
+    """A MCP server id configured in ai-controls.
+
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
+
+    mcp_server_id: Optional[str] = None
+    """The MCP server id configured in ai-controls."""
+
+    type: Optional[Literal["via_mcp_server_portal"]] = None
+
+
+BrowserVNCApplicationDestination: TypeAlias = Union[
+    BrowserVNCApplicationDestinationPublicDestination,
+    BrowserVNCApplicationDestinationPrivateDestination,
+    BrowserVNCApplicationDestinationViaMcpServerPortalDestination,
+]
 
 
-class BrowserVncApplicationPolicy(BaseModel):
+class BrowserVNCApplicationPolicy(BaseModel):
     id: Optional[str] = None
     """The UUID of the policy"""
 
@@ -1110,7 +1200,10 @@ class BrowserVncApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -1134,6 +1227,12 @@ class BrowserVncApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -1156,100 +1255,72 @@ class BrowserVncApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+class BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
     client_id: str
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
     client_secret: str
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Literal["oauth2"]
+    scheme: Literal["access_service_token"]
     """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: str
+
+class BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    scopes: Optional[List[str]] = None
+    client_id: str
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
+    client_secret: str
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-BrowserVncApplicationSCIMConfigAuthentication = Union[
-    BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class BrowserVncApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class BrowserVncApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
+BrowserVNCApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: Optional[BrowserVncApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class BrowserVNCApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class BrowserVncApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -1259,7 +1330,7 @@ class BrowserVncApplicationSCIMConfig(BaseModel):
     remote_uri: str
     """The base URI for the application's SCIM-compatible API."""
 
-    authentication: Optional[BrowserVncApplicationSCIMConfigAuthentication] = None
+    authentication: Optional[BrowserVNCApplicationSCIMConfigAuthentication] = None
     """
     Attributes for configuring HTTP Basic authentication scheme for SCIM
     provisioning to an application.
@@ -1275,26 +1346,40 @@ class BrowserVncApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[BrowserVncApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
     """
 
 
-class BrowserVncApplication(BaseModel):
+class BrowserVNCApplication(BaseModel):
     domain: str
-    """The primary hostname and path that Access will secure.
-
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
-    """
-
-    type: str
+    """The primary hostname and path secured by Access.
+
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
+
+    type: Literal[
+        "self_hosted",
+        "saas",
+        "ssh",
+        "vnc",
+        "app_launcher",
+        "warp",
+        "biso",
+        "bookmark",
+        "dash_sso",
+        "infrastructure",
+        "rdp",
+        "mcp",
+        "mcp_portal",
+        "proxy_endpoint",
+    ]
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allow_authenticate_via_warp: Optional[bool] = None
     """
@@ -1304,6 +1389,9 @@ class BrowserVncApplication(BaseModel):
     authentication.
     """
 
+    allow_iframe: Optional[bool] = None
+    """Enables loading application content in an iFrame."""
+
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
     application.
@@ -1326,8 +1414,6 @@ class BrowserVncApplication(BaseModel):
 
     cors_headers: Optional[CORSHeaders] = None
 
-    created_at: Optional[datetime] = None
-
     custom_deny_message: Optional[str] = None
     """
     The custom error message shown to a user when they are denied access to the
@@ -1349,6 +1435,14 @@ class BrowserVncApplication(BaseModel):
     custom_pages: Optional[List[str]] = None
     """The custom pages that will be displayed when applicable for this application"""
 
+    destinations: Optional[List[BrowserVNCApplicationDestination]] = None
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
     enable_binding_cookie: Optional[bool] = None
     """
     Enables the binding cookie, which increases security against compromised
@@ -1379,7 +1473,18 @@ class BrowserVncApplication(BaseModel):
     If disabled, the JWT will scope to the hostname by default
     """
 
-    policies: Optional[List[BrowserVncApplicationPolicy]] = None
+    policies: Optional[List[BrowserVNCApplicationPolicy]] = None
+
+    read_service_tokens_from_header: Optional[str] = None
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
 
     same_site_cookie_attribute: Optional[str] = None
     """
@@ -1387,14 +1492,19 @@ class BrowserVncApplication(BaseModel):
     attacks.
     """
 
-    scim_config: Optional[BrowserVncApplicationSCIMConfig] = None
+    scim_config: Optional[BrowserVNCApplicationSCIMConfig] = None
     """Configuration for provisioning to this application via SCIM.
 
     This is currently in closed beta.
     """
 
     self_hosted_domains: Optional[List[SelfHostedDomains]] = None
-    """List of domains that Access will secure."""
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
 
     service_auth_401_redirect: Optional[bool] = None
     """Returns a 401 status code when the request is blocked by a Service Auth policy."""
@@ -1403,7 +1513,7 @@ class BrowserVncApplication(BaseModel):
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
     skip_interstitial: Optional[bool] = None
@@ -1415,7 +1525,40 @@ class BrowserVncApplication(BaseModel):
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    updated_at: Optional[datetime] = None
+    use_clientless_isolation_app_launcher_url: Optional[bool] = None
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
+
+
+class AppLauncherApplicationFooterLink(BaseModel):
+    name: str
+    """The hypertext in the footer link."""
+
+    url: str
+    """the hyperlink in the footer link."""
+
+
+class AppLauncherApplicationLandingPageDesign(BaseModel):
+    """The design of the App Launcher landing page shown to users when they log in."""
+
+    button_color: Optional[str] = None
+    """The background color of the log in button on the landing page."""
+
+    button_text_color: Optional[str] = None
+    """The color of the text in the log in button on the landing page."""
+
+    image_url: Optional[str] = None
+    """The URL of the image shown on the landing page."""
+
+    message: Optional[str] = None
+    """The message shown on the landing page."""
+
+    title: Optional[str] = None
+    """The title shown on the landing page."""
 
 
 class AppLauncherApplicationPolicy(BaseModel):
@@ -1434,7 +1577,10 @@ class AppLauncherApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -1458,6 +1604,12 @@ class AppLauncherApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -1480,138 +1632,174 @@ class AppLauncherApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
+class AppLauncherApplication(BaseModel):
+    type: Literal[
+        "self_hosted",
+        "saas",
+        "ssh",
+        "vnc",
+        "app_launcher",
+        "warp",
+        "biso",
+        "bookmark",
+        "dash_sso",
+        "infrastructure",
+        "rdp",
+        "mcp",
+        "mcp_portal",
+        "proxy_endpoint",
+    ]
+    """The application type."""
+
+    id: Optional[str] = None
+    """UUID."""
 
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    allowed_idps: Optional[List[AllowedIdPs]] = None
+    """The identity providers your users can select when connecting to this
+    application.
 
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
+    Defaults to all IdPs configured in your account.
+    """
 
+    app_launcher_logo_url: Optional[str] = None
+    """The image URL of the logo shown in the App Launcher header."""
 
-class AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
+    aud: Optional[str] = None
+    """Audience tag."""
 
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    auto_redirect_to_identity: Optional[bool] = None
+    """When set to `true`, users skip the identity provider selection step during
+    login.
 
+    You must specify only one identity provider in allowed_idps.
+    """
 
-class AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+    bg_color: Optional[str] = None
+    """The background color of the App Launcher page."""
 
-    client_id: str
+    custom_deny_url: Optional[str] = None
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
     """
 
-    client_secret: str
+    custom_non_identity_deny_url: Optional[str] = None
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
     """
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
 
-    token_url: str
-    """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
-    """
+    domain: Optional[str] = None
+    """The primary hostname and path secured by Access.
 
-    scopes: Optional[List[str]] = None
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    This domain will be displayed if the app is visible in the App Launcher.
     """
 
+    footer_links: Optional[List[AppLauncherApplicationFooterLink]] = None
+    """The links in the App Launcher footer."""
 
-AppLauncherApplicationSCIMConfigAuthentication = Union[
-    AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
+    header_bg_color: Optional[str] = None
+    """The background color of the App Launcher header."""
 
+    landing_page_design: Optional[AppLauncherApplicationLandingPageDesign] = None
+    """The design of the App Launcher landing page shown to users when they log in."""
 
-class AppLauncherApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
+    name: Optional[str] = None
+    """The name of the application."""
 
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
+    policies: Optional[List[AppLauncherApplicationPolicy]] = None
 
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for this application will be valid.
 
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
+    """
 
-class AppLauncherApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+    skip_app_launcher_login_page: Optional[bool] = None
+    """Determines when to skip the App Launcher landing page."""
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
 
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
+class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the policy"""
 
-    operations: Optional[AppLauncherApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+    approval_groups: Optional[List[ApprovalGroup]] = None
+    """Administrators who can approve a temporary authentication request."""
 
-    transform_jsonata: Optional[str] = None
+    approval_required: Optional[bool] = None
     """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    Requires the user to request access from an administrator at the start of each
+    session.
     """
 
+    created_at: Optional[datetime] = None
+
+    decision: Optional[Decision] = None
+    """The action Access will take if a user matches this policy.
 
-class AppLauncherApplicationSCIMConfig(BaseModel):
-    idp_uid: str
-    """
-    The UID of the IdP to use as the source for SCIM resources to provision to this
-    application.
+    Infrastructure application policies can only use the Allow action.
     """
 
-    remote_uri: str
-    """The base URI for the application's SCIM-compatible API."""
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
 
-    authentication: Optional[AppLauncherApplicationSCIMConfigAuthentication] = None
+    To match the policy, a user cannot meet any of the Exclude rules.
     """
-    Attributes for configuring HTTP Basic authentication scheme for SCIM
-    provisioning to an application.
+
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
+
+    A user needs to meet only one of the Include rules.
     """
 
-    deactivate_on_delete: Optional[bool] = None
+    isolation_required: Optional[bool] = None
     """
-    If false, propagates DELETE requests to the target application for SCIM
-    resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-    targets do not support DELETE operations.
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
     """
 
-    enabled: Optional[bool] = None
-    """Whether SCIM provisioning is turned on for this application."""
+    name: Optional[str] = None
+    """The name of the Access policy."""
 
-    mappings: Optional[List[AppLauncherApplicationSCIMConfigMapping]] = None
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
     """
-    A list of mappings to apply to SCIM resources before provisioning them in this
-    application. These can transform or filter the resources to be provisioned.
+
+    purpose_justification_prompt: Optional[str] = None
+    """A custom message that will appear on the purpose justification screen."""
+
+    purpose_justification_required: Optional[bool] = None
+    """Require users to enter a justification when they log in to the application."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
     """
 
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for the application will be valid.
 
-class AppLauncherApplication(BaseModel):
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
+    """
+
+    updated_at: Optional[datetime] = None
+
+
+class DeviceEnrollmentPermissionsApplication(BaseModel):
     type: ApplicationType
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
@@ -1630,37 +1818,41 @@ class AppLauncherApplication(BaseModel):
     You must specify only one identity provider in allowed_idps.
     """
 
-    created_at: Optional[datetime] = None
+    custom_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
+    """
+
+    custom_non_identity_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
+
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
 
     domain: Optional[str] = None
-    """The primary hostname and path that Access will secure.
+    """The primary hostname and path secured by Access.
 
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
+    This domain will be displayed if the app is visible in the App Launcher.
     """
 
     name: Optional[str] = None
     """The name of the application."""
 
-    policies: Optional[List[AppLauncherApplicationPolicy]] = None
-
-    scim_config: Optional[AppLauncherApplicationSCIMConfig] = None
-    """Configuration for provisioning to this application via SCIM.
-
-    This is currently in closed beta.
-    """
+    policies: Optional[List[DeviceEnrollmentPermissionsApplicationPolicy]] = None
 
     session_duration: Optional[str] = None
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
-    updated_at: Optional[datetime] = None
-
 
-class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
+class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
     id: Optional[str] = None
     """The UUID of the policy"""
 
@@ -1676,7 +1868,10 @@ class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -1700,6 +1895,12 @@ class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -1722,140 +1923,141 @@ class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
+class BrowserIsolationPermissionsApplication(BaseModel):
+    type: ApplicationType
+    """The application type."""
 
+    id: Optional[str] = None
+    """UUID."""
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
-    BaseModel
-):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
+    allowed_idps: Optional[List[AllowedIdPs]] = None
+    """The identity providers your users can select when connecting to this
+    application.
 
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    Defaults to all IdPs configured in your account.
+    """
 
+    aud: Optional[str] = None
+    """Audience tag."""
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+    auto_redirect_to_identity: Optional[bool] = None
+    """When set to `true`, users skip the identity provider selection step during
+    login.
 
-    client_id: str
-    """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    You must specify only one identity provider in allowed_idps.
     """
 
-    client_secret: str
+    custom_deny_url: Optional[str] = None
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
     """
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    token_url: str
+    custom_non_identity_deny_url: Optional[str] = None
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
     """
 
-    scopes: Optional[List[str]] = None
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
-    """
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
 
+    domain: Optional[str] = None
+    """The primary hostname and path secured by Access.
 
-DeviceEnrollmentPermissionsApplicationSCIMConfigAuthentication = Union[
-    DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
 
+    name: Optional[str] = None
+    """The name of the application."""
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
+    policies: Optional[List[BrowserIsolationPermissionsApplicationPolicy]] = None
 
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for this application will be valid.
 
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
+    """
 
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+class GatewayIdentityProxyEndpointApplicationPolicy(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the policy"""
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
+    approval_groups: Optional[List[ApprovalGroup]] = None
+    """Administrators who can approve a temporary authentication request."""
 
-    filter: Optional[str] = None
+    approval_required: Optional[bool] = None
     """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
+    Requires the user to request access from an administrator at the start of each
+    session.
     """
 
-    operations: Optional[DeviceEnrollmentPermissionsApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+    created_at: Optional[datetime] = None
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    decision: Optional[Decision] = None
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
     """
 
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfig(BaseModel):
-    idp_uid: str
-    """
-    The UID of the IdP to use as the source for SCIM resources to provision to this
-    application.
+    To match the policy, a user cannot meet any of the Exclude rules.
     """
 
-    remote_uri: str
-    """The base URI for the application's SCIM-compatible API."""
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
 
-    authentication: Optional[DeviceEnrollmentPermissionsApplicationSCIMConfigAuthentication] = None
-    """
-    Attributes for configuring HTTP Basic authentication scheme for SCIM
-    provisioning to an application.
+    A user needs to meet only one of the Include rules.
     """
 
-    deactivate_on_delete: Optional[bool] = None
+    isolation_required: Optional[bool] = None
     """
-    If false, propagates DELETE requests to the target application for SCIM
-    resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-    targets do not support DELETE operations.
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
     """
 
-    enabled: Optional[bool] = None
-    """Whether SCIM provisioning is turned on for this application."""
+    name: Optional[str] = None
+    """The name of the Access policy."""
+
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
 
-    mappings: Optional[List[DeviceEnrollmentPermissionsApplicationSCIMConfigMapping]] = None
+    Must be unique for each policy within an app.
     """
-    A list of mappings to apply to SCIM resources before provisioning them in this
-    application. These can transform or filter the resources to be provisioned.
+
+    purpose_justification_prompt: Optional[str] = None
+    """A custom message that will appear on the purpose justification screen."""
+
+    purpose_justification_required: Optional[bool] = None
+    """Require users to enter a justification when they log in to the application."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
+    """
+
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for the application will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
     """
 
+    updated_at: Optional[datetime] = None
+
 
-class DeviceEnrollmentPermissionsApplication(BaseModel):
+class GatewayIdentityProxyEndpointApplication(BaseModel):
     type: ApplicationType
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
@@ -1874,37 +2076,41 @@ class DeviceEnrollmentPermissionsApplication(BaseModel):
     You must specify only one identity provider in allowed_idps.
     """
 
-    created_at: Optional[datetime] = None
+    custom_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
+    """
 
-    domain: Optional[str] = None
-    """The primary hostname and path that Access will secure.
+    custom_non_identity_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
 
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
+
+    domain: Optional[str] = None
+    """
+    The proxy endpoint domain in the format: 10 alphanumeric characters followed by
+    .proxy.cloudflare-gateway.com
     """
 
     name: Optional[str] = None
     """The name of the application."""
 
-    policies: Optional[List[DeviceEnrollmentPermissionsApplicationPolicy]] = None
-
-    scim_config: Optional[DeviceEnrollmentPermissionsApplicationSCIMConfig] = None
-    """Configuration for provisioning to this application via SCIM.
-
-    This is currently in closed beta.
-    """
+    policies: Optional[List[GatewayIdentityProxyEndpointApplicationPolicy]] = None
 
     session_duration: Optional[str] = None
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
-    updated_at: Optional[datetime] = None
-
 
-class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
+class BookmarkApplicationPolicy(BaseModel):
     id: Optional[str] = None
     """The UUID of the policy"""
 
@@ -1920,7 +2126,10 @@ class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -1944,6 +2153,12 @@ class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -1966,282 +2181,346 @@ class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
+class BookmarkApplication(BaseModel):
+    id: Optional[str] = None
+    """UUID."""
 
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    app_launcher_visible: Optional[bool] = None
+    """Displays the application in the App Launcher."""
 
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
+    aud: Optional[str] = None
+    """Audience tag."""
 
+    domain: Optional[str] = None
+    """The URL or domain of the bookmark."""
 
-class BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
-    BaseModel
-):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
+    logo_url: Optional[str] = None
+    """The image URL for the logo shown in the App Launcher dashboard."""
 
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    name: Optional[str] = None
+    """The name of the application."""
 
+    policies: Optional[List[BookmarkApplicationPolicy]] = None
 
-class BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+    tags: Optional[List[str]] = None
+    """The tags you want assigned to an application.
 
-    client_id: str
-    """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    client_secret: str
-    """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
-    """
+    type: Optional[ApplicationType] = None
+    """The application type."""
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: str
-    """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
-    """
+class InfrastructureApplicationTargetCriterion(BaseModel):
+    port: int
+    """The port that the targets use for the chosen communication protocol.
 
-    scopes: Optional[List[str]] = None
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    A port cannot be assigned to multiple protocols.
     """
 
+    protocol: Literal["SSH"]
+    """The communication protocol your application secures."""
 
-BrowserIsolationPermissionsApplicationSCIMConfigAuthentication = Union[
-    BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
+    target_attributes: Dict[str, List[str]]
+    """Contains a map of target attribute keys to target attribute values."""
 
-class BrowserIsolationPermissionsApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
 
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+class InfrastructureApplicationPolicyConnectionRulesSSH(BaseModel):
+    """
+    The SSH-specific rules that define how users may connect to the targets secured by your application.
+    """
 
+    usernames: List[str]
+    """Contains the Unix usernames that may be used when connecting over SSH."""
 
-class BrowserIsolationPermissionsApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+    allow_email_alias: Optional[bool] = None
+    """Enables using Identity Provider email alias as SSH username."""
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
 
-    filter: Optional[str] = None
+class InfrastructureApplicationPolicyConnectionRules(BaseModel):
     """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
+    The rules that define how users may connect to the targets secured by your application.
     """
 
-    operations: Optional[BrowserIsolationPermissionsApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
-
-    transform_jsonata: Optional[str] = None
+    ssh: Optional[InfrastructureApplicationPolicyConnectionRulesSSH] = None
     """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    The SSH-specific rules that define how users may connect to the targets secured
+    by your application.
     """
 
 
-class BrowserIsolationPermissionsApplicationSCIMConfig(BaseModel):
-    idp_uid: str
+class InfrastructureApplicationPolicy(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the policy"""
+
+    connection_rules: Optional[InfrastructureApplicationPolicyConnectionRules] = None
     """
-    The UID of the IdP to use as the source for SCIM resources to provision to this
+    The rules that define how users may connect to the targets secured by your
     application.
     """
 
-    remote_uri: str
-    """The base URI for the application's SCIM-compatible API."""
+    created_at: Optional[datetime] = None
 
-    authentication: Optional[BrowserIsolationPermissionsApplicationSCIMConfigAuthentication] = None
-    """
-    Attributes for configuring HTTP Basic authentication scheme for SCIM
-    provisioning to an application.
-    """
+    decision: Optional[Decision] = None
+    """The action Access will take if a user matches this policy.
 
-    deactivate_on_delete: Optional[bool] = None
+    Infrastructure application policies can only use the Allow action.
     """
-    If false, propagates DELETE requests to the target application for SCIM
-    resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-    targets do not support DELETE operations.
+
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
+
+    To match the policy, a user cannot meet any of the Exclude rules.
     """
 
-    enabled: Optional[bool] = None
-    """Whether SCIM provisioning is turned on for this application."""
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
 
-    mappings: Optional[List[BrowserIsolationPermissionsApplicationSCIMConfigMapping]] = None
+    A user needs to meet only one of the Include rules.
     """
-    A list of mappings to apply to SCIM resources before provisioning them in this
-    application. These can transform or filter the resources to be provisioned.
+
+    name: Optional[str] = None
+    """The name of the Access policy."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
     """
 
+    updated_at: Optional[datetime] = None
+
+
+class InfrastructureApplication(BaseModel):
+    target_criteria: List[InfrastructureApplicationTargetCriterion]
 
-class BrowserIsolationPermissionsApplication(BaseModel):
     type: ApplicationType
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    allowed_idps: Optional[List[AllowedIdPs]] = None
-    """The identity providers your users can select when connecting to this
-    application.
+    aud: Optional[str] = None
+    """Audience tag."""
 
-    Defaults to all IdPs configured in your account.
+    name: Optional[str] = None
+    """The name of the application."""
+
+    policies: Optional[List[InfrastructureApplicationPolicy]] = None
+
+
+class BrowserRdpApplicationTargetCriterion(BaseModel):
+    port: int
+    """The port that the targets use for the chosen communication protocol.
+
+    A port cannot be assigned to multiple protocols.
     """
 
-    aud: Optional[str] = None
-    """Audience tag."""
+    protocol: Literal["RDP"]
+    """The communication protocol your application secures."""
 
-    auto_redirect_to_identity: Optional[bool] = None
-    """When set to `true`, users skip the identity provider selection step during
-    login.
+    target_attributes: Dict[str, List[str]]
+    """Contains a map of target attribute keys to target attribute values."""
 
-    You must specify only one identity provider in allowed_idps.
+
+class BrowserRdpApplicationDestinationPublicDestination(BaseModel):
+    """A public hostname that Access will secure.
+
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
     """
 
-    created_at: Optional[datetime] = None
+    type: Optional[Literal["public"]] = None
 
-    domain: Optional[str] = None
-    """The primary hostname and path that Access will secure.
+    uri: Optional[str] = None
+    """The URI of the destination.
 
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
     """
 
-    name: Optional[str] = None
-    """The name of the application."""
 
-    policies: Optional[List[BrowserIsolationPermissionsApplicationPolicy]] = None
+class BrowserRdpApplicationDestinationPrivateDestination(BaseModel):
+    cidr: Optional[str] = None
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
 
-    scim_config: Optional[BrowserIsolationPermissionsApplicationSCIMConfig] = None
-    """Configuration for provisioning to this application via SCIM.
+    hostname: Optional[str] = None
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
 
-    This is currently in closed beta.
+    l4_protocol: Optional[Literal["tcp", "udp"]] = None
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
     """
 
-    session_duration: Optional[str] = None
-    """The amount of time that tokens issued for this application will be valid.
+    port_range: Optional[str] = None
+    """The port range of the destination.
 
-    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    Can be a single port or a range of ports. When omitted, all ports will match.
     """
 
-    updated_at: Optional[datetime] = None
+    type: Optional[Literal["private"]] = None
 
+    vnet_id: Optional[str] = None
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
 
-class BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
 
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+class BrowserRdpApplicationDestinationViaMcpServerPortalDestination(BaseModel):
+    """A MCP server id configured in ai-controls.
 
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
 
+    mcp_server_id: Optional[str] = None
+    """The MCP server id configured in ai-controls."""
 
-class BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
+    type: Optional[Literal["via_mcp_server_portal"]] = None
 
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
 
+BrowserRdpApplicationDestination: TypeAlias = Union[
+    BrowserRdpApplicationDestinationPublicDestination,
+    BrowserRdpApplicationDestinationPrivateDestination,
+    BrowserRdpApplicationDestinationViaMcpServerPortalDestination,
+]
 
-class BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
 
-    client_id: str
+class BrowserRdpApplicationPolicy(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the policy"""
+
+    approval_groups: Optional[List[ApprovalGroup]] = None
+    """Administrators who can approve a temporary authentication request."""
+
+    approval_required: Optional[bool] = None
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Requires the user to request access from an administrator at the start of each
+    session.
     """
 
-    client_secret: str
+    created_at: Optional[datetime] = None
+
+    decision: Optional[Decision] = None
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
+
+    To match the policy, a user cannot meet any of the Exclude rules.
     """
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
 
-    token_url: str
+    A user needs to meet only one of the Include rules.
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+
+    isolation_required: Optional[bool] = None
+    """
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
     """
 
-    scopes: Optional[List[str]] = None
+    name: Optional[str] = None
+    """The name of the Access policy."""
+
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+
+    purpose_justification_prompt: Optional[str] = None
+    """A custom message that will appear on the purpose justification screen."""
+
+    purpose_justification_required: Optional[bool] = None
+    """Require users to enter a justification when they log in to the application."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
     """
 
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for the application will be valid.
 
-BookmarkApplicationSCIMConfigAuthentication = Union[
-    BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
+    """
 
+    updated_at: Optional[datetime] = None
 
-class BookmarkApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
 
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
+class BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    client_id: str
+    """
+    Client ID of the Access service token used to authenticate with the remote
+    service.
+    """
 
+    client_secret: str
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-class BookmarkApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
 
-    filter: Optional[str] = None
+class BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    operations: Optional[BookmarkApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+    client_id: str
+    """
+    Client ID of the Access service token used to authenticate with the remote
+    service.
+    """
 
-    transform_jsonata: Optional[str] = None
+    client_secret: str
     """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
+
+
+BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
+
+BrowserRdpApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
+
+
+class BrowserRdpApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
+
+    This is currently in closed beta.
+    """
 
-class BookmarkApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -2251,7 +2530,7 @@ class BookmarkApplicationSCIMConfig(BaseModel):
     remote_uri: str
     """The base URI for the application's SCIM-compatible API."""
 
-    authentication: Optional[BookmarkApplicationSCIMConfigAuthentication] = None
+    authentication: Optional[BrowserRdpApplicationSCIMConfigAuthentication] = None
     """
     Attributes for configuring HTTP Basic authentication scheme for SCIM
     provisioning to an application.
@@ -2267,16 +2546,45 @@ class BookmarkApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[BookmarkApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
     """
 
 
-class BookmarkApplication(BaseModel):
+class BrowserRdpApplication(BaseModel):
+    domain: str
+    """The primary hostname and path secured by Access.
+
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
+
+    target_criteria: List[BrowserRdpApplicationTargetCriterion]
+
+    type: ApplicationType
+    """The application type."""
+
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
+
+    allow_authenticate_via_warp: Optional[bool] = None
+    """
+    When set to true, users can authenticate to this application using their WARP
+    session. When set to false this application will always require direct IdP
+    authentication. This setting always overrides the organization setting for WARP
+    authentication.
+    """
+
+    allow_iframe: Optional[bool] = None
+    """Enables loading application content in an iFrame."""
+
+    allowed_idps: Optional[List[AllowedIdPs]] = None
+    """The identity providers your users can select when connecting to this
+    application.
+
+    Defaults to all IdPs configured in your account.
+    """
 
     app_launcher_visible: Optional[bool] = None
     """Displays the application in the App Launcher."""
@@ -2284,10 +2592,55 @@ class BookmarkApplication(BaseModel):
     aud: Optional[str] = None
     """Audience tag."""
 
-    created_at: Optional[datetime] = None
+    auto_redirect_to_identity: Optional[bool] = None
+    """When set to `true`, users skip the identity provider selection step during
+    login.
 
-    domain: Optional[str] = None
-    """The URL or domain of the bookmark."""
+    You must specify only one identity provider in allowed_idps.
+    """
+
+    cors_headers: Optional[CORSHeaders] = None
+
+    custom_deny_message: Optional[str] = None
+    """
+    The custom error message shown to a user when they are denied access to the
+    application.
+    """
+
+    custom_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
+    """
+
+    custom_non_identity_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
+
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
+
+    destinations: Optional[List[BrowserRdpApplicationDestination]] = None
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
+    enable_binding_cookie: Optional[bool] = None
+    """
+    Enables the binding cookie, which increases security against compromised
+    authorization tokens and CSRF attacks.
+    """
+
+    http_only_cookie_attribute: Optional[bool] = None
+    """
+    Enables the HttpOnly cookie attribute, which increases security against XSS
+    attacks.
+    """
 
     logo_url: Optional[str] = None
     """The image URL for the logo shown in the App Launcher dashboard."""
@@ -2295,31 +2648,89 @@ class BookmarkApplication(BaseModel):
     name: Optional[str] = None
     """The name of the application."""
 
-    scim_config: Optional[BookmarkApplicationSCIMConfig] = None
+    options_preflight_bypass: Optional[bool] = None
+    """
+    Allows options preflight requests to bypass Access authentication and go
+    directly to the origin. Cannot turn on if cors_headers is set.
+    """
+
+    path_cookie_attribute: Optional[bool] = None
+    """Enables cookie paths to scope an application's JWT to the application path.
+
+    If disabled, the JWT will scope to the hostname by default
+    """
+
+    policies: Optional[List[BrowserRdpApplicationPolicy]] = None
+
+    read_service_tokens_from_header: Optional[str] = None
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
+    same_site_cookie_attribute: Optional[str] = None
+    """
+    Sets the SameSite cookie setting, which provides increased security against CSRF
+    attacks.
+    """
+
+    scim_config: Optional[BrowserRdpApplicationSCIMConfig] = None
     """Configuration for provisioning to this application via SCIM.
 
     This is currently in closed beta.
     """
 
+    self_hosted_domains: Optional[List[SelfHostedDomains]] = None
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
+    service_auth_401_redirect: Optional[bool] = None
+    """Returns a 401 status code when the request is blocked by a Service Auth policy."""
+
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for this application will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
+    """
+
+    skip_interstitial: Optional[bool] = None
+    """Enables automatic authentication through cloudflared."""
+
     tags: Optional[List[str]] = None
     """The tags you want assigned to an application.
 
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    type: Optional[str] = None
-    """The application type."""
-
-    updated_at: Optional[datetime] = None
+    use_clientless_isolation_app_launcher_url: Optional[bool] = None
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
 
 
-ApplicationGetResponse = Union[
+ApplicationGetResponse: TypeAlias = Union[
     SelfHostedApplication,
     SaaSApplication,
     BrowserSSHApplication,
-    BrowserVncApplication,
+    BrowserVNCApplication,
     AppLauncherApplication,
     DeviceEnrollmentPermissionsApplication,
     BrowserIsolationPermissionsApplication,
+    GatewayIdentityProxyEndpointApplication,
     BookmarkApplication,
+    InfrastructureApplication,
+    BrowserRdpApplication,
 ]
diff --git a/src/cloudflare/types/zero_trust/access/application_list_params.py b/src/cloudflare/types/zero_trust/access/application_list_params.py
new file mode 100644
index 00000000000..7aa24f460f9
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/application_list_params.py
@@ -0,0 +1,39 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import TypedDict
+
+__all__ = ["ApplicationListParams"]
+
+
+class ApplicationListParams(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    aud: str
+    """The aud of the app."""
+
+    domain: str
+    """The domain of the app."""
+
+    exact: bool
+    """True for only exact string matches against passed name/domain query parameters."""
+
+    name: str
+    """The name of the app."""
+
+    page: int
+    """Page number of results."""
+
+    per_page: int
+    """Number of results per page."""
+
+    search: str
+    """Search for apps by other listed query parameters."""
+
+    target_attributes: str
+    """Target Criteria attributes in key=value format."""
diff --git a/src/cloudflare/types/zero_trust/access/application_list_response.py b/src/cloudflare/types/zero_trust/access/application_list_response.py
index 2b7457c8e75..7878a02cfd8 100644
--- a/src/cloudflare/types/zero_trust/access/application_list_response.py
+++ b/src/cloudflare/types/zero_trust/access/application_list_response.py
@@ -2,99 +2,155 @@
 
 from typing import Dict, List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
-
-from pydantic import Field as FieldInfo
+from typing_extensions import Literal, TypeAlias
 
 from .decision import Decision
 from ...._models import BaseModel
-from ..access_rule import AccessRule
 from .allowed_idps import AllowedIdPs
 from .cors_headers import CORSHeaders
+from .oidc_saas_app import OIDCSaaSApp
 from .saml_saas_app import SAMLSaaSApp
+from .approval_group import ApprovalGroup
 from .application_type import ApplicationType
+from .scim_config_mapping import SCIMConfigMapping
 from .self_hosted_domains import SelfHostedDomains
-from .applications.approval_group import ApprovalGroup
+from .applications.access_rule import AccessRule
+from .scim_config_authentication_oauth2 import SCIMConfigAuthenticationOauth2
+from .scim_config_authentication_http_basic import SCIMConfigAuthenticationHTTPBasic
+from .scim_config_authentication_oauth_bearer_token import SCIMConfigAuthenticationOAuthBearerToken
 
 __all__ = [
     "ApplicationListResponse",
     "SelfHostedApplication",
+    "SelfHostedApplicationDestination",
+    "SelfHostedApplicationDestinationPublicDestination",
+    "SelfHostedApplicationDestinationPrivateDestination",
+    "SelfHostedApplicationDestinationViaMcpServerPortalDestination",
     "SelfHostedApplicationPolicy",
     "SelfHostedApplicationSCIMConfig",
     "SelfHostedApplicationSCIMConfigAuthentication",
-    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "SelfHostedApplicationSCIMConfigMapping",
-    "SelfHostedApplicationSCIMConfigMappingOperations",
+    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
     "SaaSApplication",
     "SaaSApplicationPolicy",
     "SaaSApplicationSaaSApp",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSApp",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaims",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaimsSource",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppHybridAndImplicitOptions",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppRefreshTokenOptions",
     "SaaSApplicationSCIMConfig",
     "SaaSApplicationSCIMConfigAuthentication",
-    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "SaaSApplicationSCIMConfigMapping",
-    "SaaSApplicationSCIMConfigMappingOperations",
+    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
     "BrowserSSHApplication",
+    "BrowserSSHApplicationDestination",
+    "BrowserSSHApplicationDestinationPublicDestination",
+    "BrowserSSHApplicationDestinationPrivateDestination",
+    "BrowserSSHApplicationDestinationViaMcpServerPortalDestination",
     "BrowserSSHApplicationPolicy",
     "BrowserSSHApplicationSCIMConfig",
     "BrowserSSHApplicationSCIMConfigAuthentication",
-    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BrowserSSHApplicationSCIMConfigMapping",
-    "BrowserSSHApplicationSCIMConfigMappingOperations",
-    "BrowserVncApplication",
-    "BrowserVncApplicationPolicy",
-    "BrowserVncApplicationSCIMConfig",
-    "BrowserVncApplicationSCIMConfigAuthentication",
-    "BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BrowserVncApplicationSCIMConfigMapping",
-    "BrowserVncApplicationSCIMConfigMappingOperations",
+    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserVNCApplication",
+    "BrowserVNCApplicationDestination",
+    "BrowserVNCApplicationDestinationPublicDestination",
+    "BrowserVNCApplicationDestinationPrivateDestination",
+    "BrowserVNCApplicationDestinationViaMcpServerPortalDestination",
+    "BrowserVNCApplicationPolicy",
+    "BrowserVNCApplicationSCIMConfig",
+    "BrowserVNCApplicationSCIMConfigAuthentication",
+    "BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
     "AppLauncherApplication",
+    "AppLauncherApplicationFooterLink",
+    "AppLauncherApplicationLandingPageDesign",
     "AppLauncherApplicationPolicy",
-    "AppLauncherApplicationSCIMConfig",
-    "AppLauncherApplicationSCIMConfigAuthentication",
-    "AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "AppLauncherApplicationSCIMConfigMapping",
-    "AppLauncherApplicationSCIMConfigMappingOperations",
     "DeviceEnrollmentPermissionsApplication",
     "DeviceEnrollmentPermissionsApplicationPolicy",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfig",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthentication",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigMapping",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigMappingOperations",
     "BrowserIsolationPermissionsApplication",
     "BrowserIsolationPermissionsApplicationPolicy",
-    "BrowserIsolationPermissionsApplicationSCIMConfig",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthentication",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BrowserIsolationPermissionsApplicationSCIMConfigMapping",
-    "BrowserIsolationPermissionsApplicationSCIMConfigMappingOperations",
+    "GatewayIdentityProxyEndpointApplication",
+    "GatewayIdentityProxyEndpointApplicationPolicy",
     "BookmarkApplication",
-    "BookmarkApplicationSCIMConfig",
-    "BookmarkApplicationSCIMConfigAuthentication",
-    "BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BookmarkApplicationSCIMConfigMapping",
-    "BookmarkApplicationSCIMConfigMappingOperations",
+    "BookmarkApplicationPolicy",
+    "InfrastructureApplication",
+    "InfrastructureApplicationTargetCriterion",
+    "InfrastructureApplicationPolicy",
+    "InfrastructureApplicationPolicyConnectionRules",
+    "InfrastructureApplicationPolicyConnectionRulesSSH",
+    "BrowserRdpApplication",
+    "BrowserRdpApplicationTargetCriterion",
+    "BrowserRdpApplicationDestination",
+    "BrowserRdpApplicationDestinationPublicDestination",
+    "BrowserRdpApplicationDestinationPrivateDestination",
+    "BrowserRdpApplicationDestinationViaMcpServerPortalDestination",
+    "BrowserRdpApplicationPolicy",
+    "BrowserRdpApplicationSCIMConfig",
+    "BrowserRdpApplicationSCIMConfigAuthentication",
+    "BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+]
+
+
+class SelfHostedApplicationDestinationPublicDestination(BaseModel):
+    """A public hostname that Access will secure.
+
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
+    """
+
+    type: Optional[Literal["public"]] = None
+
+    uri: Optional[str] = None
+    """The URI of the destination.
+
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
+    """
+
+
+class SelfHostedApplicationDestinationPrivateDestination(BaseModel):
+    cidr: Optional[str] = None
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
+
+    hostname: Optional[str] = None
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
+
+    l4_protocol: Optional[Literal["tcp", "udp"]] = None
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
+    """
+
+    port_range: Optional[str] = None
+    """The port range of the destination.
+
+    Can be a single port or a range of ports. When omitted, all ports will match.
+    """
+
+    type: Optional[Literal["private"]] = None
+
+    vnet_id: Optional[str] = None
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class SelfHostedApplicationDestinationViaMcpServerPortalDestination(BaseModel):
+    """A MCP server id configured in ai-controls.
+
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
+
+    mcp_server_id: Optional[str] = None
+    """The MCP server id configured in ai-controls."""
+
+    type: Optional[Literal["via_mcp_server_portal"]] = None
+
+
+SelfHostedApplicationDestination: TypeAlias = Union[
+    SelfHostedApplicationDestinationPublicDestination,
+    SelfHostedApplicationDestinationPrivateDestination,
+    SelfHostedApplicationDestinationViaMcpServerPortalDestination,
 ]
 
 
@@ -114,7 +170,10 @@ class SelfHostedApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -138,6 +197,12 @@ class SelfHostedApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -160,100 +225,72 @@ class SelfHostedApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
     client_id: str
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
     client_secret: str
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Literal["oauth2"]
+    scheme: Literal["access_service_token"]
     """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: str
+
+class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    scopes: Optional[List[str]] = None
+    client_id: str
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
+    client_secret: str
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-SelfHostedApplicationSCIMConfigAuthentication = Union[
-    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class SelfHostedApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class SelfHostedApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
+SelfHostedApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: Optional[SelfHostedApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class SelfHostedApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class SelfHostedApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -279,7 +316,7 @@ class SelfHostedApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[SelfHostedApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
@@ -288,17 +325,16 @@ class SelfHostedApplicationSCIMConfig(BaseModel):
 
 class SelfHostedApplication(BaseModel):
     domain: str
-    """The primary hostname and path that Access will secure.
+    """The primary hostname and path secured by Access.
 
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
+    This domain will be displayed if the app is visible in the App Launcher.
     """
 
-    type: str
+    type: ApplicationType
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allow_authenticate_via_warp: Optional[bool] = None
     """
@@ -308,6 +344,9 @@ class SelfHostedApplication(BaseModel):
     authentication.
     """
 
+    allow_iframe: Optional[bool] = None
+    """Enables loading application content in an iFrame."""
+
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
     application.
@@ -330,8 +369,6 @@ class SelfHostedApplication(BaseModel):
 
     cors_headers: Optional[CORSHeaders] = None
 
-    created_at: Optional[datetime] = None
-
     custom_deny_message: Optional[str] = None
     """
     The custom error message shown to a user when they are denied access to the
@@ -353,6 +390,14 @@ class SelfHostedApplication(BaseModel):
     custom_pages: Optional[List[str]] = None
     """The custom pages that will be displayed when applicable for this application"""
 
+    destinations: Optional[List[SelfHostedApplicationDestination]] = None
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
     enable_binding_cookie: Optional[bool] = None
     """
     Enables the binding cookie, which increases security against compromised
@@ -385,6 +430,17 @@ class SelfHostedApplication(BaseModel):
 
     policies: Optional[List[SelfHostedApplicationPolicy]] = None
 
+    read_service_tokens_from_header: Optional[str] = None
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
     same_site_cookie_attribute: Optional[str] = None
     """
     Sets the SameSite cookie setting, which provides increased security against CSRF
@@ -398,7 +454,12 @@ class SelfHostedApplication(BaseModel):
     """
 
     self_hosted_domains: Optional[List[SelfHostedDomains]] = None
-    """List of domains that Access will secure."""
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
 
     service_auth_401_redirect: Optional[bool] = None
     """Returns a 401 status code when the request is blocked by a Service Auth policy."""
@@ -407,7 +468,7 @@ class SelfHostedApplication(BaseModel):
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
     skip_interstitial: Optional[bool] = None
@@ -419,7 +480,13 @@ class SelfHostedApplication(BaseModel):
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    updated_at: Optional[datetime] = None
+    use_clientless_isolation_app_launcher_url: Optional[bool] = None
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
 
 
 class SaaSApplicationPolicy(BaseModel):
@@ -438,7 +505,10 @@ class SaaSApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -462,6 +532,12 @@ class SaaSApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -484,203 +560,75 @@ class SaaSApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaimsSource(BaseModel):
-    name: Optional[str] = None
-    """The name of the IdP claim."""
-
-    name_by_idp: Optional[Dict[str, str]] = None
-    """A mapping from IdP ID to claim name."""
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaims(BaseModel):
-    name: Optional[str] = None
-    """The name of the claim."""
-
-    required: Optional[bool] = None
-    """If the claim is required when building an OIDC token."""
-
-    scope: Optional[Literal["groups", "profile", "email", "openid"]] = None
-    """The scope of the claim."""
-
-    source: Optional[SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaimsSource] = None
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppHybridAndImplicitOptions(BaseModel):
-    return_access_token_from_authorization_endpoint: Optional[bool] = None
-    """If an Access Token should be returned from the OIDC Authorization endpoint"""
-
-    return_id_token_from_authorization_endpoint: Optional[bool] = None
-    """If an ID Token should be returned from the OIDC Authorization endpoint"""
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppRefreshTokenOptions(BaseModel):
-    lifetime: Optional[str] = None
-    """How long a refresh token will be valid for after creation.
-
-    Valid units are m,h,d. Must be longer than 1m.
-    """
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSApp(BaseModel):
-    access_token_lifetime: Optional[str] = None
-    """The lifetime of the OIDC Access Token after creation.
+SaaSApplicationSaaSApp: TypeAlias = Union[SAMLSaaSApp, OIDCSaaSApp]
 
-    Valid units are m,h. Must be greater than or equal to 1m and less than or equal
-    to 24h.
-    """
 
-    allow_pkce_without_client_secret: Optional[bool] = None
-    """
-    If client secret should be required on the token endpoint when
-    authorization_code_with_pkce grant is used.
+class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
     """
-
-    app_launcher_url: Optional[str] = None
-    """The URL where this applications tile redirects users"""
-
-    auth_type: Optional[Literal["saml", "oidc"]] = None
-    """Identifier of the authentication protocol used for the saas app.
-
-    Required for OIDC.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    client_id: Optional[str] = None
-    """The application client id"""
-
-    client_secret: Optional[str] = None
-    """The application client secret, only returned on POST request."""
-
-    created_at: Optional[datetime] = None
-
-    custom_claims: Optional[SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaims] = None
-
-    grant_types: Optional[
-        List[Literal["authorization_code", "authorization_code_with_pkce", "refresh_tokens", "hybrid", "implicit"]]
-    ] = None
-    """The OIDC flows supported by this application"""
-
-    group_filter_regex: Optional[str] = None
-    """A regex to filter Cloudflare groups returned in ID token and userinfo endpoint"""
-
-    hybrid_and_implicit_options: Optional[SaaSApplicationSaaSAppAccessOIDCSaaSAppHybridAndImplicitOptions] = None
-
-    public_key: Optional[str] = None
-    """The Access public certificate that will be used to verify your identity."""
-
-    redirect_uris: Optional[List[str]] = None
+    client_id: str
     """
-    The permitted URL's for Cloudflare to return Authorization codes and Access/ID
-    tokens
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
-    refresh_token_options: Optional[SaaSApplicationSaaSAppAccessOIDCSaaSAppRefreshTokenOptions] = None
-
-    scopes: Optional[List[Literal["openid", "groups", "email", "profile"]]] = None
+    client_secret: str
     """
-    Define the user information shared with access, "offline_access" scope will be
-    automatically enabled if refresh tokens are enabled
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    updated_at: Optional[datetime] = None
-
-
-SaaSApplicationSaaSApp = Union[SAMLSaaSApp, SaaSApplicationSaaSAppAccessOIDCSaaSApp]
-
-
-class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["oauthbearertoken"]
+    scheme: Literal["access_service_token"]
     """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
-
-    client_id: str
+class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    client_secret: str
+    client_id: str
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    token_url: str
+    client_secret: str
     """
-    URL used to generate the token used to authenticate with the remote SCIM
+    Client secret of the Access service token used to authenticate with the remote
     service.
     """
 
-    scopes: Optional[List[str]] = None
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
-    """
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-SaaSApplicationSCIMConfigAuthentication = Union[
-    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
+SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
 ]
 
+SaaSApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-class SaaSApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
-
-
-class SaaSApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
-
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
-
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: Optional[SaaSApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class SaaSApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class SaaSApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -706,7 +654,7 @@ class SaaSApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[SaaSApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
@@ -715,7 +663,7 @@ class SaaSApplicationSCIMConfig(BaseModel):
 
 class SaaSApplication(BaseModel):
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
@@ -737,8 +685,6 @@ class SaaSApplication(BaseModel):
     You must specify only one identity provider in allowed_idps.
     """
 
-    created_at: Optional[datetime] = None
-
     custom_pages: Optional[List[str]] = None
     """The custom pages that will be displayed when applicable for this application"""
 
@@ -764,10 +710,68 @@ class SaaSApplication(BaseModel):
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    type: Optional[str] = None
+    type: Optional[ApplicationType] = None
     """The application type."""
 
-    updated_at: Optional[datetime] = None
+
+class BrowserSSHApplicationDestinationPublicDestination(BaseModel):
+    """A public hostname that Access will secure.
+
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
+    """
+
+    type: Optional[Literal["public"]] = None
+
+    uri: Optional[str] = None
+    """The URI of the destination.
+
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
+    """
+
+
+class BrowserSSHApplicationDestinationPrivateDestination(BaseModel):
+    cidr: Optional[str] = None
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
+
+    hostname: Optional[str] = None
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
+
+    l4_protocol: Optional[Literal["tcp", "udp"]] = None
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
+    """
+
+    port_range: Optional[str] = None
+    """The port range of the destination.
+
+    Can be a single port or a range of ports. When omitted, all ports will match.
+    """
+
+    type: Optional[Literal["private"]] = None
+
+    vnet_id: Optional[str] = None
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class BrowserSSHApplicationDestinationViaMcpServerPortalDestination(BaseModel):
+    """A MCP server id configured in ai-controls.
+
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
+
+    mcp_server_id: Optional[str] = None
+    """The MCP server id configured in ai-controls."""
+
+    type: Optional[Literal["via_mcp_server_portal"]] = None
+
+
+BrowserSSHApplicationDestination: TypeAlias = Union[
+    BrowserSSHApplicationDestinationPublicDestination,
+    BrowserSSHApplicationDestinationPrivateDestination,
+    BrowserSSHApplicationDestinationViaMcpServerPortalDestination,
+]
 
 
 class BrowserSSHApplicationPolicy(BaseModel):
@@ -786,7 +790,10 @@ class BrowserSSHApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -810,6 +817,12 @@ class BrowserSSHApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -832,100 +845,72 @@ class BrowserSSHApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
     client_id: str
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
     client_secret: str
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Literal["oauth2"]
+    scheme: Literal["access_service_token"]
     """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: str
+
+class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    scopes: Optional[List[str]] = None
+    client_id: str
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
+    client_secret: str
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-BrowserSSHApplicationSCIMConfigAuthentication = Union[
-    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class BrowserSSHApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class BrowserSSHApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
+BrowserSSHApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: Optional[BrowserSSHApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class BrowserSSHApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class BrowserSSHApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -951,7 +936,7 @@ class BrowserSSHApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[BrowserSSHApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
@@ -960,17 +945,31 @@ class BrowserSSHApplicationSCIMConfig(BaseModel):
 
 class BrowserSSHApplication(BaseModel):
     domain: str
-    """The primary hostname and path that Access will secure.
-
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
-    """
-
-    type: str
+    """The primary hostname and path secured by Access.
+
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
+
+    type: Literal[
+        "self_hosted",
+        "saas",
+        "ssh",
+        "vnc",
+        "app_launcher",
+        "warp",
+        "biso",
+        "bookmark",
+        "dash_sso",
+        "infrastructure",
+        "rdp",
+        "mcp",
+        "mcp_portal",
+        "proxy_endpoint",
+    ]
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allow_authenticate_via_warp: Optional[bool] = None
     """
@@ -980,6 +979,9 @@ class BrowserSSHApplication(BaseModel):
     authentication.
     """
 
+    allow_iframe: Optional[bool] = None
+    """Enables loading application content in an iFrame."""
+
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
     application.
@@ -1002,8 +1004,6 @@ class BrowserSSHApplication(BaseModel):
 
     cors_headers: Optional[CORSHeaders] = None
 
-    created_at: Optional[datetime] = None
-
     custom_deny_message: Optional[str] = None
     """
     The custom error message shown to a user when they are denied access to the
@@ -1025,6 +1025,14 @@ class BrowserSSHApplication(BaseModel):
     custom_pages: Optional[List[str]] = None
     """The custom pages that will be displayed when applicable for this application"""
 
+    destinations: Optional[List[BrowserSSHApplicationDestination]] = None
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
     enable_binding_cookie: Optional[bool] = None
     """
     Enables the binding cookie, which increases security against compromised
@@ -1057,7 +1065,18 @@ class BrowserSSHApplication(BaseModel):
 
     policies: Optional[List[BrowserSSHApplicationPolicy]] = None
 
-    same_site_cookie_attribute: Optional[str] = None
+    read_service_tokens_from_header: Optional[str] = None
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
+    same_site_cookie_attribute: Optional[str] = None
     """
     Sets the SameSite cookie setting, which provides increased security against CSRF
     attacks.
@@ -1070,7 +1089,12 @@ class BrowserSSHApplication(BaseModel):
     """
 
     self_hosted_domains: Optional[List[SelfHostedDomains]] = None
-    """List of domains that Access will secure."""
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
 
     service_auth_401_redirect: Optional[bool] = None
     """Returns a 401 status code when the request is blocked by a Service Auth policy."""
@@ -1079,7 +1103,7 @@ class BrowserSSHApplication(BaseModel):
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
     skip_interstitial: Optional[bool] = None
@@ -1091,10 +1115,76 @@ class BrowserSSHApplication(BaseModel):
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    updated_at: Optional[datetime] = None
+    use_clientless_isolation_app_launcher_url: Optional[bool] = None
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
+
+
+class BrowserVNCApplicationDestinationPublicDestination(BaseModel):
+    """A public hostname that Access will secure.
+
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
+    """
+
+    type: Optional[Literal["public"]] = None
+
+    uri: Optional[str] = None
+    """The URI of the destination.
+
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
+    """
+
+
+class BrowserVNCApplicationDestinationPrivateDestination(BaseModel):
+    cidr: Optional[str] = None
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
+
+    hostname: Optional[str] = None
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
+
+    l4_protocol: Optional[Literal["tcp", "udp"]] = None
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
+    """
+
+    port_range: Optional[str] = None
+    """The port range of the destination.
+
+    Can be a single port or a range of ports. When omitted, all ports will match.
+    """
+
+    type: Optional[Literal["private"]] = None
+
+    vnet_id: Optional[str] = None
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class BrowserVNCApplicationDestinationViaMcpServerPortalDestination(BaseModel):
+    """A MCP server id configured in ai-controls.
+
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
+
+    mcp_server_id: Optional[str] = None
+    """The MCP server id configured in ai-controls."""
+
+    type: Optional[Literal["via_mcp_server_portal"]] = None
+
+
+BrowserVNCApplicationDestination: TypeAlias = Union[
+    BrowserVNCApplicationDestinationPublicDestination,
+    BrowserVNCApplicationDestinationPrivateDestination,
+    BrowserVNCApplicationDestinationViaMcpServerPortalDestination,
+]
 
 
-class BrowserVncApplicationPolicy(BaseModel):
+class BrowserVNCApplicationPolicy(BaseModel):
     id: Optional[str] = None
     """The UUID of the policy"""
 
@@ -1110,7 +1200,10 @@ class BrowserVncApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -1134,6 +1227,12 @@ class BrowserVncApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -1156,100 +1255,72 @@ class BrowserVncApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+class BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
     client_id: str
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
     client_secret: str
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Literal["oauth2"]
+    scheme: Literal["access_service_token"]
     """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: str
+
+class BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    scopes: Optional[List[str]] = None
+    client_id: str
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
+    client_secret: str
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-BrowserVncApplicationSCIMConfigAuthentication = Union[
-    BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class BrowserVncApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class BrowserVncApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
+BrowserVNCApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: Optional[BrowserVncApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class BrowserVNCApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class BrowserVncApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -1259,7 +1330,7 @@ class BrowserVncApplicationSCIMConfig(BaseModel):
     remote_uri: str
     """The base URI for the application's SCIM-compatible API."""
 
-    authentication: Optional[BrowserVncApplicationSCIMConfigAuthentication] = None
+    authentication: Optional[BrowserVNCApplicationSCIMConfigAuthentication] = None
     """
     Attributes for configuring HTTP Basic authentication scheme for SCIM
     provisioning to an application.
@@ -1275,26 +1346,40 @@ class BrowserVncApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[BrowserVncApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
     """
 
 
-class BrowserVncApplication(BaseModel):
+class BrowserVNCApplication(BaseModel):
     domain: str
-    """The primary hostname and path that Access will secure.
-
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
-    """
-
-    type: str
+    """The primary hostname and path secured by Access.
+
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
+
+    type: Literal[
+        "self_hosted",
+        "saas",
+        "ssh",
+        "vnc",
+        "app_launcher",
+        "warp",
+        "biso",
+        "bookmark",
+        "dash_sso",
+        "infrastructure",
+        "rdp",
+        "mcp",
+        "mcp_portal",
+        "proxy_endpoint",
+    ]
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allow_authenticate_via_warp: Optional[bool] = None
     """
@@ -1304,6 +1389,9 @@ class BrowserVncApplication(BaseModel):
     authentication.
     """
 
+    allow_iframe: Optional[bool] = None
+    """Enables loading application content in an iFrame."""
+
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
     application.
@@ -1326,8 +1414,6 @@ class BrowserVncApplication(BaseModel):
 
     cors_headers: Optional[CORSHeaders] = None
 
-    created_at: Optional[datetime] = None
-
     custom_deny_message: Optional[str] = None
     """
     The custom error message shown to a user when they are denied access to the
@@ -1349,6 +1435,14 @@ class BrowserVncApplication(BaseModel):
     custom_pages: Optional[List[str]] = None
     """The custom pages that will be displayed when applicable for this application"""
 
+    destinations: Optional[List[BrowserVNCApplicationDestination]] = None
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
     enable_binding_cookie: Optional[bool] = None
     """
     Enables the binding cookie, which increases security against compromised
@@ -1379,7 +1473,18 @@ class BrowserVncApplication(BaseModel):
     If disabled, the JWT will scope to the hostname by default
     """
 
-    policies: Optional[List[BrowserVncApplicationPolicy]] = None
+    policies: Optional[List[BrowserVNCApplicationPolicy]] = None
+
+    read_service_tokens_from_header: Optional[str] = None
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
 
     same_site_cookie_attribute: Optional[str] = None
     """
@@ -1387,14 +1492,19 @@ class BrowserVncApplication(BaseModel):
     attacks.
     """
 
-    scim_config: Optional[BrowserVncApplicationSCIMConfig] = None
+    scim_config: Optional[BrowserVNCApplicationSCIMConfig] = None
     """Configuration for provisioning to this application via SCIM.
 
     This is currently in closed beta.
     """
 
     self_hosted_domains: Optional[List[SelfHostedDomains]] = None
-    """List of domains that Access will secure."""
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
 
     service_auth_401_redirect: Optional[bool] = None
     """Returns a 401 status code when the request is blocked by a Service Auth policy."""
@@ -1403,7 +1513,7 @@ class BrowserVncApplication(BaseModel):
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
     skip_interstitial: Optional[bool] = None
@@ -1415,7 +1525,40 @@ class BrowserVncApplication(BaseModel):
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    updated_at: Optional[datetime] = None
+    use_clientless_isolation_app_launcher_url: Optional[bool] = None
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
+
+
+class AppLauncherApplicationFooterLink(BaseModel):
+    name: str
+    """The hypertext in the footer link."""
+
+    url: str
+    """the hyperlink in the footer link."""
+
+
+class AppLauncherApplicationLandingPageDesign(BaseModel):
+    """The design of the App Launcher landing page shown to users when they log in."""
+
+    button_color: Optional[str] = None
+    """The background color of the log in button on the landing page."""
+
+    button_text_color: Optional[str] = None
+    """The color of the text in the log in button on the landing page."""
+
+    image_url: Optional[str] = None
+    """The URL of the image shown on the landing page."""
+
+    message: Optional[str] = None
+    """The message shown on the landing page."""
+
+    title: Optional[str] = None
+    """The title shown on the landing page."""
 
 
 class AppLauncherApplicationPolicy(BaseModel):
@@ -1434,7 +1577,10 @@ class AppLauncherApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -1458,6 +1604,12 @@ class AppLauncherApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -1480,138 +1632,174 @@ class AppLauncherApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
+class AppLauncherApplication(BaseModel):
+    type: Literal[
+        "self_hosted",
+        "saas",
+        "ssh",
+        "vnc",
+        "app_launcher",
+        "warp",
+        "biso",
+        "bookmark",
+        "dash_sso",
+        "infrastructure",
+        "rdp",
+        "mcp",
+        "mcp_portal",
+        "proxy_endpoint",
+    ]
+    """The application type."""
+
+    id: Optional[str] = None
+    """UUID."""
 
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    allowed_idps: Optional[List[AllowedIdPs]] = None
+    """The identity providers your users can select when connecting to this
+    application.
 
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
+    Defaults to all IdPs configured in your account.
+    """
 
+    app_launcher_logo_url: Optional[str] = None
+    """The image URL of the logo shown in the App Launcher header."""
 
-class AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
+    aud: Optional[str] = None
+    """Audience tag."""
 
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    auto_redirect_to_identity: Optional[bool] = None
+    """When set to `true`, users skip the identity provider selection step during
+    login.
 
+    You must specify only one identity provider in allowed_idps.
+    """
 
-class AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+    bg_color: Optional[str] = None
+    """The background color of the App Launcher page."""
 
-    client_id: str
+    custom_deny_url: Optional[str] = None
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
     """
 
-    client_secret: str
+    custom_non_identity_deny_url: Optional[str] = None
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
     """
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
 
-    token_url: str
-    """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
-    """
+    domain: Optional[str] = None
+    """The primary hostname and path secured by Access.
 
-    scopes: Optional[List[str]] = None
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    This domain will be displayed if the app is visible in the App Launcher.
     """
 
+    footer_links: Optional[List[AppLauncherApplicationFooterLink]] = None
+    """The links in the App Launcher footer."""
 
-AppLauncherApplicationSCIMConfigAuthentication = Union[
-    AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
+    header_bg_color: Optional[str] = None
+    """The background color of the App Launcher header."""
 
+    landing_page_design: Optional[AppLauncherApplicationLandingPageDesign] = None
+    """The design of the App Launcher landing page shown to users when they log in."""
 
-class AppLauncherApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
+    name: Optional[str] = None
+    """The name of the application."""
 
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
+    policies: Optional[List[AppLauncherApplicationPolicy]] = None
 
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for this application will be valid.
 
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
+    """
 
-class AppLauncherApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+    skip_app_launcher_login_page: Optional[bool] = None
+    """Determines when to skip the App Launcher landing page."""
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
 
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
+class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the policy"""
 
-    operations: Optional[AppLauncherApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+    approval_groups: Optional[List[ApprovalGroup]] = None
+    """Administrators who can approve a temporary authentication request."""
 
-    transform_jsonata: Optional[str] = None
+    approval_required: Optional[bool] = None
     """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    Requires the user to request access from an administrator at the start of each
+    session.
     """
 
+    created_at: Optional[datetime] = None
+
+    decision: Optional[Decision] = None
+    """The action Access will take if a user matches this policy.
 
-class AppLauncherApplicationSCIMConfig(BaseModel):
-    idp_uid: str
-    """
-    The UID of the IdP to use as the source for SCIM resources to provision to this
-    application.
+    Infrastructure application policies can only use the Allow action.
     """
 
-    remote_uri: str
-    """The base URI for the application's SCIM-compatible API."""
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
 
-    authentication: Optional[AppLauncherApplicationSCIMConfigAuthentication] = None
+    To match the policy, a user cannot meet any of the Exclude rules.
     """
-    Attributes for configuring HTTP Basic authentication scheme for SCIM
-    provisioning to an application.
+
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
+
+    A user needs to meet only one of the Include rules.
     """
 
-    deactivate_on_delete: Optional[bool] = None
+    isolation_required: Optional[bool] = None
     """
-    If false, propagates DELETE requests to the target application for SCIM
-    resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-    targets do not support DELETE operations.
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
     """
 
-    enabled: Optional[bool] = None
-    """Whether SCIM provisioning is turned on for this application."""
+    name: Optional[str] = None
+    """The name of the Access policy."""
 
-    mappings: Optional[List[AppLauncherApplicationSCIMConfigMapping]] = None
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
     """
-    A list of mappings to apply to SCIM resources before provisioning them in this
-    application. These can transform or filter the resources to be provisioned.
+
+    purpose_justification_prompt: Optional[str] = None
+    """A custom message that will appear on the purpose justification screen."""
+
+    purpose_justification_required: Optional[bool] = None
+    """Require users to enter a justification when they log in to the application."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
     """
 
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for the application will be valid.
 
-class AppLauncherApplication(BaseModel):
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
+    """
+
+    updated_at: Optional[datetime] = None
+
+
+class DeviceEnrollmentPermissionsApplication(BaseModel):
     type: ApplicationType
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
@@ -1630,37 +1818,41 @@ class AppLauncherApplication(BaseModel):
     You must specify only one identity provider in allowed_idps.
     """
 
-    created_at: Optional[datetime] = None
+    custom_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
+    """
+
+    custom_non_identity_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
+
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
 
     domain: Optional[str] = None
-    """The primary hostname and path that Access will secure.
+    """The primary hostname and path secured by Access.
 
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
+    This domain will be displayed if the app is visible in the App Launcher.
     """
 
     name: Optional[str] = None
     """The name of the application."""
 
-    policies: Optional[List[AppLauncherApplicationPolicy]] = None
-
-    scim_config: Optional[AppLauncherApplicationSCIMConfig] = None
-    """Configuration for provisioning to this application via SCIM.
-
-    This is currently in closed beta.
-    """
+    policies: Optional[List[DeviceEnrollmentPermissionsApplicationPolicy]] = None
 
     session_duration: Optional[str] = None
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
-    updated_at: Optional[datetime] = None
-
 
-class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
+class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
     id: Optional[str] = None
     """The UUID of the policy"""
 
@@ -1676,7 +1868,10 @@ class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -1700,6 +1895,12 @@ class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -1722,140 +1923,141 @@ class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
+class BrowserIsolationPermissionsApplication(BaseModel):
+    type: ApplicationType
+    """The application type."""
 
+    id: Optional[str] = None
+    """UUID."""
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
-    BaseModel
-):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
+    allowed_idps: Optional[List[AllowedIdPs]] = None
+    """The identity providers your users can select when connecting to this
+    application.
 
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    Defaults to all IdPs configured in your account.
+    """
 
+    aud: Optional[str] = None
+    """Audience tag."""
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+    auto_redirect_to_identity: Optional[bool] = None
+    """When set to `true`, users skip the identity provider selection step during
+    login.
 
-    client_id: str
-    """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    You must specify only one identity provider in allowed_idps.
     """
 
-    client_secret: str
+    custom_deny_url: Optional[str] = None
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
     """
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    token_url: str
+    custom_non_identity_deny_url: Optional[str] = None
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
     """
 
-    scopes: Optional[List[str]] = None
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
-    """
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
 
+    domain: Optional[str] = None
+    """The primary hostname and path secured by Access.
 
-DeviceEnrollmentPermissionsApplicationSCIMConfigAuthentication = Union[
-    DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
 
+    name: Optional[str] = None
+    """The name of the application."""
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
+    policies: Optional[List[BrowserIsolationPermissionsApplicationPolicy]] = None
 
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for this application will be valid.
 
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
+    """
 
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+class GatewayIdentityProxyEndpointApplicationPolicy(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the policy"""
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
+    approval_groups: Optional[List[ApprovalGroup]] = None
+    """Administrators who can approve a temporary authentication request."""
 
-    filter: Optional[str] = None
+    approval_required: Optional[bool] = None
     """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
+    Requires the user to request access from an administrator at the start of each
+    session.
     """
 
-    operations: Optional[DeviceEnrollmentPermissionsApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+    created_at: Optional[datetime] = None
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    decision: Optional[Decision] = None
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
     """
 
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfig(BaseModel):
-    idp_uid: str
-    """
-    The UID of the IdP to use as the source for SCIM resources to provision to this
-    application.
+    To match the policy, a user cannot meet any of the Exclude rules.
     """
 
-    remote_uri: str
-    """The base URI for the application's SCIM-compatible API."""
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
 
-    authentication: Optional[DeviceEnrollmentPermissionsApplicationSCIMConfigAuthentication] = None
-    """
-    Attributes for configuring HTTP Basic authentication scheme for SCIM
-    provisioning to an application.
+    A user needs to meet only one of the Include rules.
     """
 
-    deactivate_on_delete: Optional[bool] = None
+    isolation_required: Optional[bool] = None
     """
-    If false, propagates DELETE requests to the target application for SCIM
-    resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-    targets do not support DELETE operations.
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
     """
 
-    enabled: Optional[bool] = None
-    """Whether SCIM provisioning is turned on for this application."""
+    name: Optional[str] = None
+    """The name of the Access policy."""
+
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
 
-    mappings: Optional[List[DeviceEnrollmentPermissionsApplicationSCIMConfigMapping]] = None
+    Must be unique for each policy within an app.
     """
-    A list of mappings to apply to SCIM resources before provisioning them in this
-    application. These can transform or filter the resources to be provisioned.
+
+    purpose_justification_prompt: Optional[str] = None
+    """A custom message that will appear on the purpose justification screen."""
+
+    purpose_justification_required: Optional[bool] = None
+    """Require users to enter a justification when they log in to the application."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
+    """
+
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for the application will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
     """
 
+    updated_at: Optional[datetime] = None
+
 
-class DeviceEnrollmentPermissionsApplication(BaseModel):
+class GatewayIdentityProxyEndpointApplication(BaseModel):
     type: ApplicationType
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
@@ -1874,37 +2076,41 @@ class DeviceEnrollmentPermissionsApplication(BaseModel):
     You must specify only one identity provider in allowed_idps.
     """
 
-    created_at: Optional[datetime] = None
+    custom_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
+    """
 
-    domain: Optional[str] = None
-    """The primary hostname and path that Access will secure.
+    custom_non_identity_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
 
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
+
+    domain: Optional[str] = None
+    """
+    The proxy endpoint domain in the format: 10 alphanumeric characters followed by
+    .proxy.cloudflare-gateway.com
     """
 
     name: Optional[str] = None
     """The name of the application."""
 
-    policies: Optional[List[DeviceEnrollmentPermissionsApplicationPolicy]] = None
-
-    scim_config: Optional[DeviceEnrollmentPermissionsApplicationSCIMConfig] = None
-    """Configuration for provisioning to this application via SCIM.
-
-    This is currently in closed beta.
-    """
+    policies: Optional[List[GatewayIdentityProxyEndpointApplicationPolicy]] = None
 
     session_duration: Optional[str] = None
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
-    updated_at: Optional[datetime] = None
-
 
-class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
+class BookmarkApplicationPolicy(BaseModel):
     id: Optional[str] = None
     """The UUID of the policy"""
 
@@ -1920,7 +2126,10 @@ class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -1944,6 +2153,12 @@ class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -1966,282 +2181,346 @@ class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
+class BookmarkApplication(BaseModel):
+    id: Optional[str] = None
+    """UUID."""
 
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    app_launcher_visible: Optional[bool] = None
+    """Displays the application in the App Launcher."""
 
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
+    aud: Optional[str] = None
+    """Audience tag."""
 
+    domain: Optional[str] = None
+    """The URL or domain of the bookmark."""
 
-class BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
-    BaseModel
-):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
+    logo_url: Optional[str] = None
+    """The image URL for the logo shown in the App Launcher dashboard."""
 
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    name: Optional[str] = None
+    """The name of the application."""
 
+    policies: Optional[List[BookmarkApplicationPolicy]] = None
 
-class BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+    tags: Optional[List[str]] = None
+    """The tags you want assigned to an application.
 
-    client_id: str
-    """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    client_secret: str
-    """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
-    """
+    type: Optional[ApplicationType] = None
+    """The application type."""
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: str
-    """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
-    """
+class InfrastructureApplicationTargetCriterion(BaseModel):
+    port: int
+    """The port that the targets use for the chosen communication protocol.
 
-    scopes: Optional[List[str]] = None
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    A port cannot be assigned to multiple protocols.
     """
 
+    protocol: Literal["SSH"]
+    """The communication protocol your application secures."""
 
-BrowserIsolationPermissionsApplicationSCIMConfigAuthentication = Union[
-    BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
+    target_attributes: Dict[str, List[str]]
+    """Contains a map of target attribute keys to target attribute values."""
 
-class BrowserIsolationPermissionsApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
 
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+class InfrastructureApplicationPolicyConnectionRulesSSH(BaseModel):
+    """
+    The SSH-specific rules that define how users may connect to the targets secured by your application.
+    """
 
+    usernames: List[str]
+    """Contains the Unix usernames that may be used when connecting over SSH."""
 
-class BrowserIsolationPermissionsApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+    allow_email_alias: Optional[bool] = None
+    """Enables using Identity Provider email alias as SSH username."""
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
 
-    filter: Optional[str] = None
+class InfrastructureApplicationPolicyConnectionRules(BaseModel):
     """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
+    The rules that define how users may connect to the targets secured by your application.
     """
 
-    operations: Optional[BrowserIsolationPermissionsApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
-
-    transform_jsonata: Optional[str] = None
+    ssh: Optional[InfrastructureApplicationPolicyConnectionRulesSSH] = None
     """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    The SSH-specific rules that define how users may connect to the targets secured
+    by your application.
     """
 
 
-class BrowserIsolationPermissionsApplicationSCIMConfig(BaseModel):
-    idp_uid: str
+class InfrastructureApplicationPolicy(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the policy"""
+
+    connection_rules: Optional[InfrastructureApplicationPolicyConnectionRules] = None
     """
-    The UID of the IdP to use as the source for SCIM resources to provision to this
+    The rules that define how users may connect to the targets secured by your
     application.
     """
 
-    remote_uri: str
-    """The base URI for the application's SCIM-compatible API."""
+    created_at: Optional[datetime] = None
 
-    authentication: Optional[BrowserIsolationPermissionsApplicationSCIMConfigAuthentication] = None
-    """
-    Attributes for configuring HTTP Basic authentication scheme for SCIM
-    provisioning to an application.
-    """
+    decision: Optional[Decision] = None
+    """The action Access will take if a user matches this policy.
 
-    deactivate_on_delete: Optional[bool] = None
+    Infrastructure application policies can only use the Allow action.
     """
-    If false, propagates DELETE requests to the target application for SCIM
-    resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-    targets do not support DELETE operations.
+
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
+
+    To match the policy, a user cannot meet any of the Exclude rules.
     """
 
-    enabled: Optional[bool] = None
-    """Whether SCIM provisioning is turned on for this application."""
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
 
-    mappings: Optional[List[BrowserIsolationPermissionsApplicationSCIMConfigMapping]] = None
+    A user needs to meet only one of the Include rules.
     """
-    A list of mappings to apply to SCIM resources before provisioning them in this
-    application. These can transform or filter the resources to be provisioned.
+
+    name: Optional[str] = None
+    """The name of the Access policy."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
     """
 
+    updated_at: Optional[datetime] = None
+
+
+class InfrastructureApplication(BaseModel):
+    target_criteria: List[InfrastructureApplicationTargetCriterion]
 
-class BrowserIsolationPermissionsApplication(BaseModel):
     type: ApplicationType
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    allowed_idps: Optional[List[AllowedIdPs]] = None
-    """The identity providers your users can select when connecting to this
-    application.
+    aud: Optional[str] = None
+    """Audience tag."""
 
-    Defaults to all IdPs configured in your account.
+    name: Optional[str] = None
+    """The name of the application."""
+
+    policies: Optional[List[InfrastructureApplicationPolicy]] = None
+
+
+class BrowserRdpApplicationTargetCriterion(BaseModel):
+    port: int
+    """The port that the targets use for the chosen communication protocol.
+
+    A port cannot be assigned to multiple protocols.
     """
 
-    aud: Optional[str] = None
-    """Audience tag."""
+    protocol: Literal["RDP"]
+    """The communication protocol your application secures."""
 
-    auto_redirect_to_identity: Optional[bool] = None
-    """When set to `true`, users skip the identity provider selection step during
-    login.
+    target_attributes: Dict[str, List[str]]
+    """Contains a map of target attribute keys to target attribute values."""
 
-    You must specify only one identity provider in allowed_idps.
+
+class BrowserRdpApplicationDestinationPublicDestination(BaseModel):
+    """A public hostname that Access will secure.
+
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
     """
 
-    created_at: Optional[datetime] = None
+    type: Optional[Literal["public"]] = None
 
-    domain: Optional[str] = None
-    """The primary hostname and path that Access will secure.
+    uri: Optional[str] = None
+    """The URI of the destination.
 
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
     """
 
-    name: Optional[str] = None
-    """The name of the application."""
 
-    policies: Optional[List[BrowserIsolationPermissionsApplicationPolicy]] = None
+class BrowserRdpApplicationDestinationPrivateDestination(BaseModel):
+    cidr: Optional[str] = None
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
 
-    scim_config: Optional[BrowserIsolationPermissionsApplicationSCIMConfig] = None
-    """Configuration for provisioning to this application via SCIM.
+    hostname: Optional[str] = None
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
 
-    This is currently in closed beta.
+    l4_protocol: Optional[Literal["tcp", "udp"]] = None
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
     """
 
-    session_duration: Optional[str] = None
-    """The amount of time that tokens issued for this application will be valid.
+    port_range: Optional[str] = None
+    """The port range of the destination.
 
-    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    Can be a single port or a range of ports. When omitted, all ports will match.
     """
 
-    updated_at: Optional[datetime] = None
+    type: Optional[Literal["private"]] = None
 
+    vnet_id: Optional[str] = None
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
 
-class BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
 
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+class BrowserRdpApplicationDestinationViaMcpServerPortalDestination(BaseModel):
+    """A MCP server id configured in ai-controls.
 
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
 
+    mcp_server_id: Optional[str] = None
+    """The MCP server id configured in ai-controls."""
 
-class BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
+    type: Optional[Literal["via_mcp_server_portal"]] = None
 
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
 
+BrowserRdpApplicationDestination: TypeAlias = Union[
+    BrowserRdpApplicationDestinationPublicDestination,
+    BrowserRdpApplicationDestinationPrivateDestination,
+    BrowserRdpApplicationDestinationViaMcpServerPortalDestination,
+]
 
-class BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
 
-    client_id: str
+class BrowserRdpApplicationPolicy(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the policy"""
+
+    approval_groups: Optional[List[ApprovalGroup]] = None
+    """Administrators who can approve a temporary authentication request."""
+
+    approval_required: Optional[bool] = None
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Requires the user to request access from an administrator at the start of each
+    session.
     """
 
-    client_secret: str
+    created_at: Optional[datetime] = None
+
+    decision: Optional[Decision] = None
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
+
+    To match the policy, a user cannot meet any of the Exclude rules.
     """
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
 
-    token_url: str
+    A user needs to meet only one of the Include rules.
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+
+    isolation_required: Optional[bool] = None
+    """
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
     """
 
-    scopes: Optional[List[str]] = None
+    name: Optional[str] = None
+    """The name of the Access policy."""
+
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+
+    purpose_justification_prompt: Optional[str] = None
+    """A custom message that will appear on the purpose justification screen."""
+
+    purpose_justification_required: Optional[bool] = None
+    """Require users to enter a justification when they log in to the application."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
     """
 
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for the application will be valid.
 
-BookmarkApplicationSCIMConfigAuthentication = Union[
-    BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
+    """
 
+    updated_at: Optional[datetime] = None
 
-class BookmarkApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
 
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
+class BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    client_id: str
+    """
+    Client ID of the Access service token used to authenticate with the remote
+    service.
+    """
 
+    client_secret: str
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-class BookmarkApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
 
-    filter: Optional[str] = None
+class BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    operations: Optional[BookmarkApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+    client_id: str
+    """
+    Client ID of the Access service token used to authenticate with the remote
+    service.
+    """
 
-    transform_jsonata: Optional[str] = None
+    client_secret: str
     """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
+
+
+BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
+
+BrowserRdpApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
+
+
+class BrowserRdpApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
+
+    This is currently in closed beta.
+    """
 
-class BookmarkApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -2251,7 +2530,7 @@ class BookmarkApplicationSCIMConfig(BaseModel):
     remote_uri: str
     """The base URI for the application's SCIM-compatible API."""
 
-    authentication: Optional[BookmarkApplicationSCIMConfigAuthentication] = None
+    authentication: Optional[BrowserRdpApplicationSCIMConfigAuthentication] = None
     """
     Attributes for configuring HTTP Basic authentication scheme for SCIM
     provisioning to an application.
@@ -2267,16 +2546,45 @@ class BookmarkApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[BookmarkApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
     """
 
 
-class BookmarkApplication(BaseModel):
+class BrowserRdpApplication(BaseModel):
+    domain: str
+    """The primary hostname and path secured by Access.
+
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
+
+    target_criteria: List[BrowserRdpApplicationTargetCriterion]
+
+    type: ApplicationType
+    """The application type."""
+
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
+
+    allow_authenticate_via_warp: Optional[bool] = None
+    """
+    When set to true, users can authenticate to this application using their WARP
+    session. When set to false this application will always require direct IdP
+    authentication. This setting always overrides the organization setting for WARP
+    authentication.
+    """
+
+    allow_iframe: Optional[bool] = None
+    """Enables loading application content in an iFrame."""
+
+    allowed_idps: Optional[List[AllowedIdPs]] = None
+    """The identity providers your users can select when connecting to this
+    application.
+
+    Defaults to all IdPs configured in your account.
+    """
 
     app_launcher_visible: Optional[bool] = None
     """Displays the application in the App Launcher."""
@@ -2284,10 +2592,55 @@ class BookmarkApplication(BaseModel):
     aud: Optional[str] = None
     """Audience tag."""
 
-    created_at: Optional[datetime] = None
+    auto_redirect_to_identity: Optional[bool] = None
+    """When set to `true`, users skip the identity provider selection step during
+    login.
 
-    domain: Optional[str] = None
-    """The URL or domain of the bookmark."""
+    You must specify only one identity provider in allowed_idps.
+    """
+
+    cors_headers: Optional[CORSHeaders] = None
+
+    custom_deny_message: Optional[str] = None
+    """
+    The custom error message shown to a user when they are denied access to the
+    application.
+    """
+
+    custom_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
+    """
+
+    custom_non_identity_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
+
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
+
+    destinations: Optional[List[BrowserRdpApplicationDestination]] = None
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
+    enable_binding_cookie: Optional[bool] = None
+    """
+    Enables the binding cookie, which increases security against compromised
+    authorization tokens and CSRF attacks.
+    """
+
+    http_only_cookie_attribute: Optional[bool] = None
+    """
+    Enables the HttpOnly cookie attribute, which increases security against XSS
+    attacks.
+    """
 
     logo_url: Optional[str] = None
     """The image URL for the logo shown in the App Launcher dashboard."""
@@ -2295,31 +2648,89 @@ class BookmarkApplication(BaseModel):
     name: Optional[str] = None
     """The name of the application."""
 
-    scim_config: Optional[BookmarkApplicationSCIMConfig] = None
+    options_preflight_bypass: Optional[bool] = None
+    """
+    Allows options preflight requests to bypass Access authentication and go
+    directly to the origin. Cannot turn on if cors_headers is set.
+    """
+
+    path_cookie_attribute: Optional[bool] = None
+    """Enables cookie paths to scope an application's JWT to the application path.
+
+    If disabled, the JWT will scope to the hostname by default
+    """
+
+    policies: Optional[List[BrowserRdpApplicationPolicy]] = None
+
+    read_service_tokens_from_header: Optional[str] = None
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
+    same_site_cookie_attribute: Optional[str] = None
+    """
+    Sets the SameSite cookie setting, which provides increased security against CSRF
+    attacks.
+    """
+
+    scim_config: Optional[BrowserRdpApplicationSCIMConfig] = None
     """Configuration for provisioning to this application via SCIM.
 
     This is currently in closed beta.
     """
 
+    self_hosted_domains: Optional[List[SelfHostedDomains]] = None
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
+    service_auth_401_redirect: Optional[bool] = None
+    """Returns a 401 status code when the request is blocked by a Service Auth policy."""
+
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for this application will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
+    """
+
+    skip_interstitial: Optional[bool] = None
+    """Enables automatic authentication through cloudflared."""
+
     tags: Optional[List[str]] = None
     """The tags you want assigned to an application.
 
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    type: Optional[str] = None
-    """The application type."""
-
-    updated_at: Optional[datetime] = None
+    use_clientless_isolation_app_launcher_url: Optional[bool] = None
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
 
 
-ApplicationListResponse = Union[
+ApplicationListResponse: TypeAlias = Union[
     SelfHostedApplication,
     SaaSApplication,
     BrowserSSHApplication,
-    BrowserVncApplication,
+    BrowserVNCApplication,
     AppLauncherApplication,
     DeviceEnrollmentPermissionsApplication,
     BrowserIsolationPermissionsApplication,
+    GatewayIdentityProxyEndpointApplication,
     BookmarkApplication,
+    InfrastructureApplication,
+    BrowserRdpApplication,
 ]
diff --git a/src/cloudflare/types/zero_trust/access/application_type.py b/src/cloudflare/types/zero_trust/access/application_type.py
index a15d52f3b44..bacee5f7300 100644
--- a/src/cloudflare/types/zero_trust/access/application_type.py
+++ b/src/cloudflare/types/zero_trust/access/application_type.py
@@ -1,7 +1,22 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["ApplicationType"]
 
-ApplicationType = Literal["self_hosted", "saas", "ssh", "vnc", "app_launcher", "warp", "biso", "bookmark", "dash_sso"]
+ApplicationType: TypeAlias = Literal[
+    "self_hosted",
+    "saas",
+    "ssh",
+    "vnc",
+    "app_launcher",
+    "warp",
+    "biso",
+    "bookmark",
+    "dash_sso",
+    "infrastructure",
+    "rdp",
+    "mcp",
+    "mcp_portal",
+    "proxy_endpoint",
+]
diff --git a/src/cloudflare/types/zero_trust/access/application_update_params.py b/src/cloudflare/types/zero_trust/access/application_update_params.py
index 29a947b02b6..3c113e23f22 100644
--- a/src/cloudflare/types/zero_trust/access/application_update_params.py
+++ b/src/cloudflare/types/zero_trust/access/application_update_params.py
@@ -2,125 +2,127 @@
 
 from __future__ import annotations
 
-from typing import Dict, List, Union, Iterable
-from datetime import datetime
-from typing_extensions import Literal, Required, Annotated, TypedDict
+from typing import Dict, Union, Iterable
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
 from .decision import Decision
-from ...._utils import PropertyInfo
+from ...._types import SequenceNotStr
 from .allowed_idps import AllowedIdPs
 from .application_type import ApplicationType
-from ..access_rule_param import AccessRuleParam
 from .cors_headers_param import CORSHeadersParam
+from .oidc_saas_app_param import OIDCSaaSAppParam
 from .saml_saas_app_param import SAMLSaaSAppParam
 from .self_hosted_domains import SelfHostedDomains
-from .applications.approval_group_param import ApprovalGroupParam
+from .approval_group_param import ApprovalGroupParam
+from .scim_config_mapping_param import SCIMConfigMappingParam
+from .applications.access_rule_param import AccessRuleParam
+from .scim_config_authentication_oauth2_param import SCIMConfigAuthenticationOauth2Param
+from .scim_config_authentication_http_basic_param import SCIMConfigAuthenticationHTTPBasicParam
+from .scim_config_authentication_oauth_bearer_token_param import SCIMConfigAuthenticationOAuthBearerTokenParam
 
 __all__ = [
     "ApplicationUpdateParams",
     "SelfHostedApplication",
+    "SelfHostedApplicationDestination",
+    "SelfHostedApplicationDestinationPublicDestination",
+    "SelfHostedApplicationDestinationPrivateDestination",
+    "SelfHostedApplicationDestinationViaMcpServerPortalDestination",
     "SelfHostedApplicationPolicy",
     "SelfHostedApplicationPolicyAccessAppPolicyLink",
     "SelfHostedApplicationPolicyUnionMember2",
     "SelfHostedApplicationSCIMConfig",
     "SelfHostedApplicationSCIMConfigAuthentication",
-    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "SelfHostedApplicationSCIMConfigMapping",
-    "SelfHostedApplicationSCIMConfigMappingOperations",
+    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
     "SaaSApplication",
     "SaaSApplicationPolicy",
     "SaaSApplicationPolicyAccessAppPolicyLink",
     "SaaSApplicationPolicyUnionMember2",
     "SaaSApplicationSaaSApp",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSApp",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaims",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaimsSource",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppHybridAndImplicitOptions",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppRefreshTokenOptions",
     "SaaSApplicationSCIMConfig",
     "SaaSApplicationSCIMConfigAuthentication",
-    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "SaaSApplicationSCIMConfigMapping",
-    "SaaSApplicationSCIMConfigMappingOperations",
+    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
     "BrowserSSHApplication",
+    "BrowserSSHApplicationDestination",
+    "BrowserSSHApplicationDestinationPublicDestination",
+    "BrowserSSHApplicationDestinationPrivateDestination",
+    "BrowserSSHApplicationDestinationViaMcpServerPortalDestination",
     "BrowserSSHApplicationPolicy",
     "BrowserSSHApplicationPolicyAccessAppPolicyLink",
     "BrowserSSHApplicationPolicyUnionMember2",
     "BrowserSSHApplicationSCIMConfig",
     "BrowserSSHApplicationSCIMConfigAuthentication",
-    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BrowserSSHApplicationSCIMConfigMapping",
-    "BrowserSSHApplicationSCIMConfigMappingOperations",
-    "BrowserVncApplication",
-    "BrowserVncApplicationPolicy",
-    "BrowserVncApplicationPolicyAccessAppPolicyLink",
-    "BrowserVncApplicationPolicyUnionMember2",
-    "BrowserVncApplicationSCIMConfig",
-    "BrowserVncApplicationSCIMConfigAuthentication",
-    "BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BrowserVncApplicationSCIMConfigMapping",
-    "BrowserVncApplicationSCIMConfigMappingOperations",
+    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserVNCApplication",
+    "BrowserVNCApplicationDestination",
+    "BrowserVNCApplicationDestinationPublicDestination",
+    "BrowserVNCApplicationDestinationPrivateDestination",
+    "BrowserVNCApplicationDestinationViaMcpServerPortalDestination",
+    "BrowserVNCApplicationPolicy",
+    "BrowserVNCApplicationPolicyAccessAppPolicyLink",
+    "BrowserVNCApplicationPolicyUnionMember2",
+    "BrowserVNCApplicationSCIMConfig",
+    "BrowserVNCApplicationSCIMConfigAuthentication",
+    "BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
     "AppLauncherApplication",
+    "AppLauncherApplicationFooterLink",
+    "AppLauncherApplicationLandingPageDesign",
     "AppLauncherApplicationPolicy",
     "AppLauncherApplicationPolicyAccessAppPolicyLink",
     "AppLauncherApplicationPolicyUnionMember2",
-    "AppLauncherApplicationSCIMConfig",
-    "AppLauncherApplicationSCIMConfigAuthentication",
-    "AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "AppLauncherApplicationSCIMConfigMapping",
-    "AppLauncherApplicationSCIMConfigMappingOperations",
     "DeviceEnrollmentPermissionsApplication",
     "DeviceEnrollmentPermissionsApplicationPolicy",
     "DeviceEnrollmentPermissionsApplicationPolicyAccessAppPolicyLink",
     "DeviceEnrollmentPermissionsApplicationPolicyUnionMember2",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfig",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthentication",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigMapping",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigMappingOperations",
     "BrowserIsolationPermissionsApplication",
     "BrowserIsolationPermissionsApplicationPolicy",
     "BrowserIsolationPermissionsApplicationPolicyAccessAppPolicyLink",
     "BrowserIsolationPermissionsApplicationPolicyUnionMember2",
-    "BrowserIsolationPermissionsApplicationSCIMConfig",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthentication",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BrowserIsolationPermissionsApplicationSCIMConfigMapping",
-    "BrowserIsolationPermissionsApplicationSCIMConfigMappingOperations",
+    "GatewayIdentityProxyEndpointApplication",
+    "GatewayIdentityProxyEndpointApplicationPolicy",
+    "GatewayIdentityProxyEndpointApplicationPolicyAccessAppPolicyLink",
+    "GatewayIdentityProxyEndpointApplicationPolicyUnionMember2",
     "BookmarkApplication",
-    "BookmarkApplicationSCIMConfig",
-    "BookmarkApplicationSCIMConfigAuthentication",
-    "BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BookmarkApplicationSCIMConfigMapping",
-    "BookmarkApplicationSCIMConfigMappingOperations",
+    "BookmarkApplicationPolicy",
+    "BookmarkApplicationPolicyAccessAppPolicyLink",
+    "BookmarkApplicationPolicyUnionMember2",
+    "InfrastructureApplication",
+    "InfrastructureApplicationTargetCriterion",
+    "InfrastructureApplicationPolicy",
+    "InfrastructureApplicationPolicyConnectionRules",
+    "InfrastructureApplicationPolicyConnectionRulesSSH",
+    "BrowserRdpApplication",
+    "BrowserRdpApplicationTargetCriterion",
+    "BrowserRdpApplicationDestination",
+    "BrowserRdpApplicationDestinationPublicDestination",
+    "BrowserRdpApplicationDestinationPrivateDestination",
+    "BrowserRdpApplicationDestinationViaMcpServerPortalDestination",
+    "BrowserRdpApplicationPolicy",
+    "BrowserRdpApplicationPolicyAccessAppPolicyLink",
+    "BrowserRdpApplicationPolicyUnionMember2",
+    "BrowserRdpApplicationSCIMConfig",
+    "BrowserRdpApplicationSCIMConfigAuthentication",
+    "BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
 ]
 
 
 class SelfHostedApplication(TypedDict, total=False):
     domain: Required[str]
-    """The primary hostname and path that Access will secure.
+    """The primary hostname and path secured by Access.
 
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
+    This domain will be displayed if the app is visible in the App Launcher.
     """
 
-    type: Required[str]
+    type: Required[ApplicationType]
     """The application type."""
 
     account_id: str
@@ -137,7 +139,10 @@ class SelfHostedApplication(TypedDict, total=False):
     authentication.
     """
 
-    allowed_idps: List[AllowedIdPs]
+    allow_iframe: bool
+    """Enables loading application content in an iFrame."""
+
+    allowed_idps: SequenceNotStr[AllowedIdPs]
     """The identity providers your users can select when connecting to this
     application.
 
@@ -174,9 +179,17 @@ class SelfHostedApplication(TypedDict, total=False):
     application when failing non-identity rules.
     """
 
-    custom_pages: List[str]
+    custom_pages: SequenceNotStr[str]
     """The custom pages that will be displayed when applicable for this application"""
 
+    destinations: Iterable[SelfHostedApplicationDestination]
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
     enable_binding_cookie: bool
     """
     Enables the binding cookie, which increases security against compromised
@@ -207,13 +220,24 @@ class SelfHostedApplication(TypedDict, total=False):
     If disabled, the JWT will scope to the hostname by default
     """
 
-    policies: List[SelfHostedApplicationPolicy]
+    policies: SequenceNotStr[SelfHostedApplicationPolicy]
     """
-    The policies that will apply to the application, in ascending order of
+    The policies that Access applies to the application, in ascending order of
     precedence. Items can reference existing policies or create new policies
     exclusive to the application.
     """
 
+    read_service_tokens_from_header: str
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
     same_site_cookie_attribute: str
     """
     Sets the SameSite cookie setting, which provides increased security against CSRF
@@ -226,8 +250,13 @@ class SelfHostedApplication(TypedDict, total=False):
     This is currently in closed beta.
     """
 
-    self_hosted_domains: List[SelfHostedDomains]
-    """List of domains that Access will secure."""
+    self_hosted_domains: SequenceNotStr[SelfHostedDomains]
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
 
     service_auth_401_redirect: bool
     """Returns a 401 status code when the request is blocked by a Service Auth policy."""
@@ -236,20 +265,90 @@ class SelfHostedApplication(TypedDict, total=False):
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
     skip_interstitial: bool
     """Enables automatic authentication through cloudflared."""
 
-    tags: List[str]
+    tags: SequenceNotStr[str]
     """The tags you want assigned to an application.
 
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
+    use_clientless_isolation_app_launcher_url: bool
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
+
+
+class SelfHostedApplicationDestinationPublicDestination(TypedDict, total=False):
+    """A public hostname that Access will secure.
+
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
+    """
+
+    type: Literal["public"]
+
+    uri: str
+    """The URI of the destination.
+
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
+    """
+
+
+class SelfHostedApplicationDestinationPrivateDestination(TypedDict, total=False):
+    cidr: str
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
+
+    hostname: str
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
+
+    l4_protocol: Literal["tcp", "udp"]
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
+    """
+
+    port_range: str
+    """The port range of the destination.
+
+    Can be a single port or a range of ports. When omitted, all ports will match.
+    """
+
+    type: Literal["private"]
+
+    vnet_id: str
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class SelfHostedApplicationDestinationViaMcpServerPortalDestination(TypedDict, total=False):
+    """A MCP server id configured in ai-controls.
+
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
+
+    mcp_server_id: str
+    """The MCP server id configured in ai-controls."""
+
+    type: Literal["via_mcp_server_portal"]
+
+
+SelfHostedApplicationDestination: TypeAlias = Union[
+    SelfHostedApplicationDestinationPublicDestination,
+    SelfHostedApplicationDestinationPrivateDestination,
+    SelfHostedApplicationDestinationViaMcpServerPortalDestination,
+]
+
 
 class SelfHostedApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
     id: str
     """The UUID of the policy"""
 
@@ -261,18 +360,6 @@ class SelfHostedApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
 
 
 class SelfHostedApplicationPolicyUnionMember2(TypedDict, total=False):
-    decision: Required[Decision]
-    """The action Access will take if a user matches this policy."""
-
-    include: Required[Iterable[AccessRuleParam]]
-    """Rules evaluated with an OR logical operator.
-
-    A user needs to meet only one of the Include rules.
-    """
-
-    name: Required[str]
-    """The name of the Access policy."""
-
     id: str
     """The UUID of the policy"""
 
@@ -285,12 +372,6 @@ class SelfHostedApplicationPolicyUnionMember2(TypedDict, total=False):
     session.
     """
 
-    exclude: Iterable[AccessRuleParam]
-    """Rules evaluated with a NOT logical operator.
-
-    To match the policy, a user cannot meet any of the Exclude rules.
-    """
-
     isolation_required: bool
     """
     Require this application to be served in an isolated browser for users matching
@@ -310,12 +391,6 @@ class SelfHostedApplicationPolicyUnionMember2(TypedDict, total=False):
     purpose_justification_required: bool
     """Require users to enter a justification when they log in to the application."""
 
-    require: Iterable[AccessRuleParam]
-    """Rules evaluated with an AND logical operator.
-
-    To match the policy, a user must meet all of the Require rules.
-    """
-
     session_duration: str
     """The amount of time that tokens issued for the application will be valid.
 
@@ -324,107 +399,79 @@ class SelfHostedApplicationPolicyUnionMember2(TypedDict, total=False):
     """
 
 
-SelfHostedApplicationPolicy = Union[
+SelfHostedApplicationPolicy: TypeAlias = Union[
     SelfHostedApplicationPolicyAccessAppPolicyLink, str, SelfHostedApplicationPolicyUnionMember2
 ]
 
 
-class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(TypedDict, total=False):
-    password: Required[str]
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["httpbasic"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: Required[str]
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
+class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
     TypedDict, total=False
 ):
-    token: Required[str]
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["oauthbearertoken"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(TypedDict, total=False):
-    authorization_url: Required[str]
-    """URL used to generate the auth code used during token generation."""
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
     client_id: Required[str]
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
     client_secret: Required[str]
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Required[Literal["oauth2"]]
+    scheme: Required[Literal["access_service_token"]]
     """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: Required[str]
+
+class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    TypedDict, total=False
+):
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    scopes: List[str]
+    client_id: Required[str]
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
+    client_secret: Required[str]
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-SelfHostedApplicationSCIMConfigAuthentication = Union[
-    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class SelfHostedApplicationSCIMConfigMappingOperations(TypedDict, total=False):
-    create: bool
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: bool
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: bool
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    scheme: Required[Literal["access_service_token"]]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class SelfHostedApplicationSCIMConfigMapping(TypedDict, total=False):
-    schema: Required[str]
-    """Which SCIM resource type this mapping applies to."""
+SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
 
-    enabled: bool
-    """Whether or not this mapping is enabled."""
+SelfHostedApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    Iterable[SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-    filter: str
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: SelfHostedApplicationSCIMConfigMappingOperations
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class SelfHostedApplicationSCIMConfig(TypedDict, total=False):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: str
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class SelfHostedApplicationSCIMConfig(TypedDict, total=False):
     idp_uid: Required[str]
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -450,7 +497,7 @@ class SelfHostedApplicationSCIMConfig(TypedDict, total=False):
     enabled: bool
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Iterable[SelfHostedApplicationSCIMConfigMapping]
+    mappings: Iterable[SCIMConfigMappingParam]
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
@@ -464,7 +511,7 @@ class SaaSApplication(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    allowed_idps: List[AllowedIdPs]
+    allowed_idps: SequenceNotStr[AllowedIdPs]
     """The identity providers your users can select when connecting to this
     application.
 
@@ -481,7 +528,7 @@ class SaaSApplication(TypedDict, total=False):
     You must specify only one identity provider in allowed_idps.
     """
 
-    custom_pages: List[str]
+    custom_pages: SequenceNotStr[str]
     """The custom pages that will be displayed when applicable for this application"""
 
     logo_url: str
@@ -490,9 +537,9 @@ class SaaSApplication(TypedDict, total=False):
     name: str
     """The name of the application."""
 
-    policies: List[SaaSApplicationPolicy]
+    policies: SequenceNotStr[SaaSApplicationPolicy]
     """
-    The policies that will apply to the application, in ascending order of
+    The policies that Access applies to the application, in ascending order of
     precedence. Items can reference existing policies or create new policies
     exclusive to the application.
     """
@@ -505,17 +552,19 @@ class SaaSApplication(TypedDict, total=False):
     This is currently in closed beta.
     """
 
-    tags: List[str]
+    tags: SequenceNotStr[str]
     """The tags you want assigned to an application.
 
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    type: str
+    type: ApplicationType
     """The application type."""
 
 
 class SaaSApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
     id: str
     """The UUID of the policy"""
 
@@ -527,18 +576,6 @@ class SaaSApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
 
 
 class SaaSApplicationPolicyUnionMember2(TypedDict, total=False):
-    decision: Required[Decision]
-    """The action Access will take if a user matches this policy."""
-
-    include: Required[Iterable[AccessRuleParam]]
-    """Rules evaluated with an OR logical operator.
-
-    A user needs to meet only one of the Include rules.
-    """
-
-    name: Required[str]
-    """The name of the Access policy."""
-
     id: str
     """The UUID of the policy"""
 
@@ -551,12 +588,6 @@ class SaaSApplicationPolicyUnionMember2(TypedDict, total=False):
     session.
     """
 
-    exclude: Iterable[AccessRuleParam]
-    """Rules evaluated with a NOT logical operator.
-
-    To match the policy, a user cannot meet any of the Exclude rules.
-    """
-
     isolation_required: bool
     """
     Require this application to be served in an isolated browser for users matching
@@ -576,12 +607,6 @@ class SaaSApplicationPolicyUnionMember2(TypedDict, total=False):
     purpose_justification_required: bool
     """Require users to enter a justification when they log in to the application."""
 
-    require: Iterable[AccessRuleParam]
-    """Rules evaluated with an AND logical operator.
-
-    To match the policy, a user must meet all of the Require rules.
-    """
-
     session_duration: str
     """The amount of time that tokens issued for the application will be valid.
 
@@ -590,206 +615,79 @@ class SaaSApplicationPolicyUnionMember2(TypedDict, total=False):
     """
 
 
-SaaSApplicationPolicy = Union[SaaSApplicationPolicyAccessAppPolicyLink, str, SaaSApplicationPolicyUnionMember2]
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaimsSource(TypedDict, total=False):
-    name: str
-    """The name of the IdP claim."""
-
-    name_by_idp: Dict[str, str]
-    """A mapping from IdP ID to claim name."""
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaims(TypedDict, total=False):
-    name: str
-    """The name of the claim."""
-
-    required: bool
-    """If the claim is required when building an OIDC token."""
-
-    scope: Literal["groups", "profile", "email", "openid"]
-    """The scope of the claim."""
-
-    source: SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaimsSource
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppHybridAndImplicitOptions(TypedDict, total=False):
-    return_access_token_from_authorization_endpoint: bool
-    """If an Access Token should be returned from the OIDC Authorization endpoint"""
-
-    return_id_token_from_authorization_endpoint: bool
-    """If an ID Token should be returned from the OIDC Authorization endpoint"""
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppRefreshTokenOptions(TypedDict, total=False):
-    lifetime: str
-    """How long a refresh token will be valid for after creation.
-
-    Valid units are m,h,d. Must be longer than 1m.
-    """
-
+SaaSApplicationPolicy: TypeAlias = Union[
+    SaaSApplicationPolicyAccessAppPolicyLink, str, SaaSApplicationPolicyUnionMember2
+]
 
-class SaaSApplicationSaaSAppAccessOIDCSaaSApp(TypedDict, total=False):
-    access_token_lifetime: str
-    """The lifetime of the OIDC Access Token after creation.
+SaaSApplicationSaaSApp: TypeAlias = Union[SAMLSaaSAppParam, OIDCSaaSAppParam]
 
-    Valid units are m,h. Must be greater than or equal to 1m and less than or equal
-    to 24h.
-    """
 
-    allow_pkce_without_client_secret: bool
+class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(TypedDict, total=False):
     """
-    If client secret should be required on the token endpoint when
-    authorization_code_with_pkce grant is used.
-    """
-
-    app_launcher_url: str
-    """The URL where this applications tile redirects users"""
-
-    auth_type: Literal["saml", "oidc"]
-    """Identifier of the authentication protocol used for the saas app.
-
-    Required for OIDC.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    client_id: str
-    """The application client id"""
-
-    client_secret: str
-    """The application client secret, only returned on POST request."""
-
-    created_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-
-    custom_claims: SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaims
-
-    grant_types: List[
-        Literal["authorization_code", "authorization_code_with_pkce", "refresh_tokens", "hybrid", "implicit"]
-    ]
-    """The OIDC flows supported by this application"""
-
-    group_filter_regex: str
-    """A regex to filter Cloudflare groups returned in ID token and userinfo endpoint"""
-
-    hybrid_and_implicit_options: SaaSApplicationSaaSAppAccessOIDCSaaSAppHybridAndImplicitOptions
-
-    public_key: str
-    """The Access public certificate that will be used to verify your identity."""
-
-    redirect_uris: List[str]
+    client_id: Required[str]
     """
-    The permitted URL's for Cloudflare to return Authorization codes and Access/ID
-    tokens
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
-    refresh_token_options: SaaSApplicationSaaSAppAccessOIDCSaaSAppRefreshTokenOptions
-
-    scopes: List[Literal["openid", "groups", "email", "profile"]]
+    client_secret: Required[str]
     """
-    Define the user information shared with access, "offline_access" scope will be
-    automatically enabled if refresh tokens are enabled
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    updated_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-
-
-SaaSApplicationSaaSApp = Union[SAMLSaaSAppParam, SaaSApplicationSaaSAppAccessOIDCSaaSApp]
-
-
-class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(TypedDict, total=False):
-    password: Required[str]
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["httpbasic"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: Required[str]
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(TypedDict, total=False):
-    token: Required[str]
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["oauthbearertoken"]]
+    scheme: Required[Literal["access_service_token"]]
     """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(TypedDict, total=False):
-    authorization_url: Required[str]
-    """URL used to generate the auth code used during token generation."""
-
-    client_id: Required[str]
+class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    TypedDict, total=False
+):
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    client_secret: Required[str]
+    client_id: Required[str]
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Required[Literal["oauth2"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    token_url: Required[str]
+    client_secret: Required[str]
     """
-    URL used to generate the token used to authenticate with the remote SCIM
+    Client secret of the Access service token used to authenticate with the remote
     service.
     """
 
-    scopes: List[str]
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
-    """
+    scheme: Required[Literal["access_service_token"]]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-SaaSApplicationSCIMConfigAuthentication = Union[
-    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
+SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
 ]
 
+SaaSApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    Iterable[SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-class SaaSApplicationSCIMConfigMappingOperations(TypedDict, total=False):
-    create: bool
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: bool
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: bool
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
-
-
-class SaaSApplicationSCIMConfigMapping(TypedDict, total=False):
-    schema: Required[str]
-    """Which SCIM resource type this mapping applies to."""
-
-    enabled: bool
-    """Whether or not this mapping is enabled."""
-
-    filter: str
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: SaaSApplicationSCIMConfigMappingOperations
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class SaaSApplicationSCIMConfig(TypedDict, total=False):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: str
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class SaaSApplicationSCIMConfig(TypedDict, total=False):
     idp_uid: Required[str]
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -815,7 +713,7 @@ class SaaSApplicationSCIMConfig(TypedDict, total=False):
     enabled: bool
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Iterable[SaaSApplicationSCIMConfigMapping]
+    mappings: Iterable[SCIMConfigMappingParam]
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
@@ -824,13 +722,29 @@ class SaaSApplicationSCIMConfig(TypedDict, total=False):
 
 class BrowserSSHApplication(TypedDict, total=False):
     domain: Required[str]
-    """The primary hostname and path that Access will secure.
-
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
-    """
-
-    type: Required[str]
+    """The primary hostname and path secured by Access.
+
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
+
+    type: Required[
+        Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ]
+    ]
     """The application type."""
 
     account_id: str
@@ -847,7 +761,10 @@ class BrowserSSHApplication(TypedDict, total=False):
     authentication.
     """
 
-    allowed_idps: List[AllowedIdPs]
+    allow_iframe: bool
+    """Enables loading application content in an iFrame."""
+
+    allowed_idps: SequenceNotStr[AllowedIdPs]
     """The identity providers your users can select when connecting to this
     application.
 
@@ -884,9 +801,17 @@ class BrowserSSHApplication(TypedDict, total=False):
     application when failing non-identity rules.
     """
 
-    custom_pages: List[str]
+    custom_pages: SequenceNotStr[str]
     """The custom pages that will be displayed when applicable for this application"""
 
+    destinations: Iterable[BrowserSSHApplicationDestination]
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
     enable_binding_cookie: bool
     """
     Enables the binding cookie, which increases security against compromised
@@ -917,13 +842,24 @@ class BrowserSSHApplication(TypedDict, total=False):
     If disabled, the JWT will scope to the hostname by default
     """
 
-    policies: List[BrowserSSHApplicationPolicy]
+    policies: SequenceNotStr[BrowserSSHApplicationPolicy]
     """
-    The policies that will apply to the application, in ascending order of
+    The policies that Access applies to the application, in ascending order of
     precedence. Items can reference existing policies or create new policies
     exclusive to the application.
     """
 
+    read_service_tokens_from_header: str
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
     same_site_cookie_attribute: str
     """
     Sets the SameSite cookie setting, which provides increased security against CSRF
@@ -936,8 +872,13 @@ class BrowserSSHApplication(TypedDict, total=False):
     This is currently in closed beta.
     """
 
-    self_hosted_domains: List[SelfHostedDomains]
-    """List of domains that Access will secure."""
+    self_hosted_domains: SequenceNotStr[SelfHostedDomains]
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
 
     service_auth_401_redirect: bool
     """Returns a 401 status code when the request is blocked by a Service Auth policy."""
@@ -946,69 +887,121 @@ class BrowserSSHApplication(TypedDict, total=False):
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
     skip_interstitial: bool
     """Enables automatic authentication through cloudflared."""
 
-    tags: List[str]
+    tags: SequenceNotStr[str]
     """The tags you want assigned to an application.
 
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
+    use_clientless_isolation_app_launcher_url: bool
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
 
-class BrowserSSHApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
-    id: str
-    """The UUID of the policy"""
 
-    precedence: int
-    """The order of execution for this policy.
+class BrowserSSHApplicationDestinationPublicDestination(TypedDict, total=False):
+    """A public hostname that Access will secure.
 
-    Must be unique for each policy within an app.
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
     """
 
+    type: Literal["public"]
 
-class BrowserSSHApplicationPolicyUnionMember2(TypedDict, total=False):
-    decision: Required[Decision]
-    """The action Access will take if a user matches this policy."""
-
-    include: Required[Iterable[AccessRuleParam]]
-    """Rules evaluated with an OR logical operator.
+    uri: str
+    """The URI of the destination.
 
-    A user needs to meet only one of the Include rules.
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
     """
 
-    name: Required[str]
-    """The name of the Access policy."""
 
-    id: str
-    """The UUID of the policy"""
+class BrowserSSHApplicationDestinationPrivateDestination(TypedDict, total=False):
+    cidr: str
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
 
-    approval_groups: Iterable[ApprovalGroupParam]
-    """Administrators who can approve a temporary authentication request."""
+    hostname: str
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
 
-    approval_required: bool
-    """
-    Requires the user to request access from an administrator at the start of each
-    session.
+    l4_protocol: Literal["tcp", "udp"]
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
     """
 
-    exclude: Iterable[AccessRuleParam]
-    """Rules evaluated with a NOT logical operator.
+    port_range: str
+    """The port range of the destination.
 
-    To match the policy, a user cannot meet any of the Exclude rules.
+    Can be a single port or a range of ports. When omitted, all ports will match.
     """
 
-    isolation_required: bool
-    """
-    Require this application to be served in an isolated browser for users matching
-    this policy. 'Client Web Isolation' must be on for the account in order to use
-    this feature.
-    """
+    type: Literal["private"]
 
-    precedence: int
+    vnet_id: str
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class BrowserSSHApplicationDestinationViaMcpServerPortalDestination(TypedDict, total=False):
+    """A MCP server id configured in ai-controls.
+
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
+
+    mcp_server_id: str
+    """The MCP server id configured in ai-controls."""
+
+    type: Literal["via_mcp_server_portal"]
+
+
+BrowserSSHApplicationDestination: TypeAlias = Union[
+    BrowserSSHApplicationDestinationPublicDestination,
+    BrowserSSHApplicationDestinationPrivateDestination,
+    BrowserSSHApplicationDestinationViaMcpServerPortalDestination,
+]
+
+
+class BrowserSSHApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
+    id: str
+    """The UUID of the policy"""
+
+    precedence: int
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
+
+class BrowserSSHApplicationPolicyUnionMember2(TypedDict, total=False):
+    id: str
+    """The UUID of the policy"""
+
+    approval_groups: Iterable[ApprovalGroupParam]
+    """Administrators who can approve a temporary authentication request."""
+
+    approval_required: bool
+    """
+    Requires the user to request access from an administrator at the start of each
+    session.
+    """
+
+    isolation_required: bool
+    """
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
+    """
+
+    precedence: int
     """The order of execution for this policy.
 
     Must be unique for each policy within an app.
@@ -1020,12 +1013,6 @@ class BrowserSSHApplicationPolicyUnionMember2(TypedDict, total=False):
     purpose_justification_required: bool
     """Require users to enter a justification when they log in to the application."""
 
-    require: Iterable[AccessRuleParam]
-    """Rules evaluated with an AND logical operator.
-
-    To match the policy, a user must meet all of the Require rules.
-    """
-
     session_duration: str
     """The amount of time that tokens issued for the application will be valid.
 
@@ -1034,107 +1021,79 @@ class BrowserSSHApplicationPolicyUnionMember2(TypedDict, total=False):
     """
 
 
-BrowserSSHApplicationPolicy = Union[
+BrowserSSHApplicationPolicy: TypeAlias = Union[
     BrowserSSHApplicationPolicyAccessAppPolicyLink, str, BrowserSSHApplicationPolicyUnionMember2
 ]
 
 
-class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(TypedDict, total=False):
-    password: Required[str]
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["httpbasic"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: Required[str]
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
+class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
     TypedDict, total=False
 ):
-    token: Required[str]
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["oauthbearertoken"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(TypedDict, total=False):
-    authorization_url: Required[str]
-    """URL used to generate the auth code used during token generation."""
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
     client_id: Required[str]
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
     client_secret: Required[str]
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Required[Literal["oauth2"]]
+    scheme: Required[Literal["access_service_token"]]
     """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: Required[str]
+
+class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    TypedDict, total=False
+):
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    scopes: List[str]
+    client_id: Required[str]
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
+    client_secret: Required[str]
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-BrowserSSHApplicationSCIMConfigAuthentication = Union[
-    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class BrowserSSHApplicationSCIMConfigMappingOperations(TypedDict, total=False):
-    create: bool
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: bool
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: bool
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    scheme: Required[Literal["access_service_token"]]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class BrowserSSHApplicationSCIMConfigMapping(TypedDict, total=False):
-    schema: Required[str]
-    """Which SCIM resource type this mapping applies to."""
+BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
 
-    enabled: bool
-    """Whether or not this mapping is enabled."""
+BrowserSSHApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    Iterable[BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-    filter: str
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: BrowserSSHApplicationSCIMConfigMappingOperations
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class BrowserSSHApplicationSCIMConfig(TypedDict, total=False):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: str
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class BrowserSSHApplicationSCIMConfig(TypedDict, total=False):
     idp_uid: Required[str]
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -1160,22 +1119,38 @@ class BrowserSSHApplicationSCIMConfig(TypedDict, total=False):
     enabled: bool
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Iterable[BrowserSSHApplicationSCIMConfigMapping]
+    mappings: Iterable[SCIMConfigMappingParam]
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
     """
 
 
-class BrowserVncApplication(TypedDict, total=False):
+class BrowserVNCApplication(TypedDict, total=False):
     domain: Required[str]
-    """The primary hostname and path that Access will secure.
-
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
-    """
-
-    type: Required[str]
+    """The primary hostname and path secured by Access.
+
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
+
+    type: Required[
+        Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ]
+    ]
     """The application type."""
 
     account_id: str
@@ -1192,7 +1167,10 @@ class BrowserVncApplication(TypedDict, total=False):
     authentication.
     """
 
-    allowed_idps: List[AllowedIdPs]
+    allow_iframe: bool
+    """Enables loading application content in an iFrame."""
+
+    allowed_idps: SequenceNotStr[AllowedIdPs]
     """The identity providers your users can select when connecting to this
     application.
 
@@ -1229,9 +1207,17 @@ class BrowserVncApplication(TypedDict, total=False):
     application when failing non-identity rules.
     """
 
-    custom_pages: List[str]
+    custom_pages: SequenceNotStr[str]
     """The custom pages that will be displayed when applicable for this application"""
 
+    destinations: Iterable[BrowserVNCApplicationDestination]
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
     enable_binding_cookie: bool
     """
     Enables the binding cookie, which increases security against compromised
@@ -1262,27 +1248,43 @@ class BrowserVncApplication(TypedDict, total=False):
     If disabled, the JWT will scope to the hostname by default
     """
 
-    policies: List[BrowserVncApplicationPolicy]
+    policies: SequenceNotStr[BrowserVNCApplicationPolicy]
     """
-    The policies that will apply to the application, in ascending order of
+    The policies that Access applies to the application, in ascending order of
     precedence. Items can reference existing policies or create new policies
     exclusive to the application.
     """
 
+    read_service_tokens_from_header: str
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
     same_site_cookie_attribute: str
     """
     Sets the SameSite cookie setting, which provides increased security against CSRF
     attacks.
     """
 
-    scim_config: BrowserVncApplicationSCIMConfig
+    scim_config: BrowserVNCApplicationSCIMConfig
     """Configuration for provisioning to this application via SCIM.
 
     This is currently in closed beta.
     """
 
-    self_hosted_domains: List[SelfHostedDomains]
-    """List of domains that Access will secure."""
+    self_hosted_domains: SequenceNotStr[SelfHostedDomains]
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
 
     service_auth_401_redirect: bool
     """Returns a 401 status code when the request is blocked by a Service Auth policy."""
@@ -1291,43 +1293,101 @@ class BrowserVncApplication(TypedDict, total=False):
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
     skip_interstitial: bool
     """Enables automatic authentication through cloudflared."""
 
-    tags: List[str]
+    tags: SequenceNotStr[str]
     """The tags you want assigned to an application.
 
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
+    use_clientless_isolation_app_launcher_url: bool
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
 
-class BrowserVncApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
-    id: str
-    """The UUID of the policy"""
 
-    precedence: int
-    """The order of execution for this policy.
+class BrowserVNCApplicationDestinationPublicDestination(TypedDict, total=False):
+    """A public hostname that Access will secure.
 
-    Must be unique for each policy within an app.
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
     """
 
+    type: Literal["public"]
 
-class BrowserVncApplicationPolicyUnionMember2(TypedDict, total=False):
-    decision: Required[Decision]
-    """The action Access will take if a user matches this policy."""
+    uri: str
+    """The URI of the destination.
 
-    include: Required[Iterable[AccessRuleParam]]
-    """Rules evaluated with an OR logical operator.
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
+    """
 
-    A user needs to meet only one of the Include rules.
+
+class BrowserVNCApplicationDestinationPrivateDestination(TypedDict, total=False):
+    cidr: str
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
+
+    hostname: str
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
+
+    l4_protocol: Literal["tcp", "udp"]
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
     """
 
-    name: Required[str]
-    """The name of the Access policy."""
+    port_range: str
+    """The port range of the destination.
+
+    Can be a single port or a range of ports. When omitted, all ports will match.
+    """
+
+    type: Literal["private"]
+
+    vnet_id: str
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class BrowserVNCApplicationDestinationViaMcpServerPortalDestination(TypedDict, total=False):
+    """A MCP server id configured in ai-controls.
 
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
+
+    mcp_server_id: str
+    """The MCP server id configured in ai-controls."""
+
+    type: Literal["via_mcp_server_portal"]
+
+
+BrowserVNCApplicationDestination: TypeAlias = Union[
+    BrowserVNCApplicationDestinationPublicDestination,
+    BrowserVNCApplicationDestinationPrivateDestination,
+    BrowserVNCApplicationDestinationViaMcpServerPortalDestination,
+]
+
+
+class BrowserVNCApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
+    id: str
+    """The UUID of the policy"""
+
+    precedence: int
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
+
+class BrowserVNCApplicationPolicyUnionMember2(TypedDict, total=False):
     id: str
     """The UUID of the policy"""
 
@@ -1340,12 +1400,6 @@ class BrowserVncApplicationPolicyUnionMember2(TypedDict, total=False):
     session.
     """
 
-    exclude: Iterable[AccessRuleParam]
-    """Rules evaluated with a NOT logical operator.
-
-    To match the policy, a user cannot meet any of the Exclude rules.
-    """
-
     isolation_required: bool
     """
     Require this application to be served in an isolated browser for users matching
@@ -1365,12 +1419,6 @@ class BrowserVncApplicationPolicyUnionMember2(TypedDict, total=False):
     purpose_justification_required: bool
     """Require users to enter a justification when they log in to the application."""
 
-    require: Iterable[AccessRuleParam]
-    """Rules evaluated with an AND logical operator.
-
-    To match the policy, a user must meet all of the Require rules.
-    """
-
     session_duration: str
     """The amount of time that tokens issued for the application will be valid.
 
@@ -1379,107 +1427,79 @@ class BrowserVncApplicationPolicyUnionMember2(TypedDict, total=False):
     """
 
 
-BrowserVncApplicationPolicy = Union[
-    BrowserVncApplicationPolicyAccessAppPolicyLink, str, BrowserVncApplicationPolicyUnionMember2
+BrowserVNCApplicationPolicy: TypeAlias = Union[
+    BrowserVNCApplicationPolicyAccessAppPolicyLink, str, BrowserVNCApplicationPolicyUnionMember2
 ]
 
 
-class BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(TypedDict, total=False):
-    password: Required[str]
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["httpbasic"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: Required[str]
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
+class BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
     TypedDict, total=False
 ):
-    token: Required[str]
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["oauthbearertoken"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(TypedDict, total=False):
-    authorization_url: Required[str]
-    """URL used to generate the auth code used during token generation."""
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
     client_id: Required[str]
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
     client_secret: Required[str]
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Required[Literal["oauth2"]]
+    scheme: Required[Literal["access_service_token"]]
     """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: Required[str]
+
+class BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    TypedDict, total=False
+):
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    scopes: List[str]
+    client_id: Required[str]
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
+    client_secret: Required[str]
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-BrowserVncApplicationSCIMConfigAuthentication = Union[
-    BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class BrowserVncApplicationSCIMConfigMappingOperations(TypedDict, total=False):
-    create: bool
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: bool
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: bool
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    scheme: Required[Literal["access_service_token"]]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class BrowserVncApplicationSCIMConfigMapping(TypedDict, total=False):
-    schema: Required[str]
-    """Which SCIM resource type this mapping applies to."""
+BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
 
-    enabled: bool
-    """Whether or not this mapping is enabled."""
+BrowserVNCApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    Iterable[BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-    filter: str
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: BrowserVncApplicationSCIMConfigMappingOperations
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class BrowserVNCApplicationSCIMConfig(TypedDict, total=False):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: str
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class BrowserVncApplicationSCIMConfig(TypedDict, total=False):
     idp_uid: Required[str]
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -1489,7 +1509,7 @@ class BrowserVncApplicationSCIMConfig(TypedDict, total=False):
     remote_uri: Required[str]
     """The base URI for the application's SCIM-compatible API."""
 
-    authentication: BrowserVncApplicationSCIMConfigAuthentication
+    authentication: BrowserVNCApplicationSCIMConfigAuthentication
     """
     Attributes for configuring HTTP Basic authentication scheme for SCIM
     provisioning to an application.
@@ -1505,7 +1525,7 @@ class BrowserVncApplicationSCIMConfig(TypedDict, total=False):
     enabled: bool
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Iterable[BrowserVncApplicationSCIMConfigMapping]
+    mappings: Iterable[SCIMConfigMappingParam]
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
@@ -1513,7 +1533,24 @@ class BrowserVncApplicationSCIMConfig(TypedDict, total=False):
 
 
 class AppLauncherApplication(TypedDict, total=False):
-    type: Required[ApplicationType]
+    type: Required[
+        Literal[
+            "self_hosted",
+            "saas",
+            "ssh",
+            "vnc",
+            "app_launcher",
+            "warp",
+            "biso",
+            "bookmark",
+            "dash_sso",
+            "infrastructure",
+            "rdp",
+            "mcp",
+            "mcp_portal",
+            "proxy_endpoint",
+        ]
+    ]
     """The application type."""
 
     account_id: str
@@ -1522,13 +1559,16 @@ class AppLauncherApplication(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    allowed_idps: List[AllowedIdPs]
+    allowed_idps: SequenceNotStr[AllowedIdPs]
     """The identity providers your users can select when connecting to this
     application.
 
     Defaults to all IdPs configured in your account.
     """
 
+    app_launcher_logo_url: str
+    """The image URL of the logo shown in the App Launcher header."""
+
     auto_redirect_to_identity: bool
     """When set to `true`, users skip the identity provider selection step during
     login.
@@ -1536,28 +1576,81 @@ class AppLauncherApplication(TypedDict, total=False):
     You must specify only one identity provider in allowed_idps.
     """
 
-    policies: List[AppLauncherApplicationPolicy]
+    bg_color: str
+    """The background color of the App Launcher page."""
+
+    custom_deny_url: str
     """
-    The policies that will apply to the application, in ascending order of
-    precedence. Items can reference existing policies or create new policies
-    exclusive to the application.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
     """
 
-    scim_config: AppLauncherApplicationSCIMConfig
-    """Configuration for provisioning to this application via SCIM.
+    custom_non_identity_deny_url: str
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
 
-    This is currently in closed beta.
+    custom_pages: SequenceNotStr[str]
+    """The custom pages that will be displayed when applicable for this application"""
+
+    footer_links: Iterable[AppLauncherApplicationFooterLink]
+    """The links in the App Launcher footer."""
+
+    header_bg_color: str
+    """The background color of the App Launcher header."""
+
+    landing_page_design: AppLauncherApplicationLandingPageDesign
+    """The design of the App Launcher landing page shown to users when they log in."""
+
+    policies: SequenceNotStr[AppLauncherApplicationPolicy]
+    """
+    The policies that Access applies to the application, in ascending order of
+    precedence. Items can reference existing policies or create new policies
+    exclusive to the application.
     """
 
     session_duration: str
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
+    skip_app_launcher_login_page: bool
+    """Determines when to skip the App Launcher landing page."""
+
+
+class AppLauncherApplicationFooterLink(TypedDict, total=False):
+    name: Required[str]
+    """The hypertext in the footer link."""
+
+    url: Required[str]
+    """the hyperlink in the footer link."""
+
+
+class AppLauncherApplicationLandingPageDesign(TypedDict, total=False):
+    """The design of the App Launcher landing page shown to users when they log in."""
+
+    button_color: str
+    """The background color of the log in button on the landing page."""
+
+    button_text_color: str
+    """The color of the text in the log in button on the landing page."""
+
+    image_url: str
+    """The URL of the image shown on the landing page."""
+
+    message: str
+    """The message shown on the landing page."""
+
+    title: str
+    """The title shown on the landing page."""
+
 
 class AppLauncherApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
     id: str
     """The UUID of the policy"""
 
@@ -1569,18 +1662,6 @@ class AppLauncherApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
 
 
 class AppLauncherApplicationPolicyUnionMember2(TypedDict, total=False):
-    decision: Required[Decision]
-    """The action Access will take if a user matches this policy."""
-
-    include: Required[Iterable[AccessRuleParam]]
-    """Rules evaluated with an OR logical operator.
-
-    A user needs to meet only one of the Include rules.
-    """
-
-    name: Required[str]
-    """The name of the Access policy."""
-
     id: str
     """The UUID of the policy"""
 
@@ -1593,12 +1674,6 @@ class AppLauncherApplicationPolicyUnionMember2(TypedDict, total=False):
     session.
     """
 
-    exclude: Iterable[AccessRuleParam]
-    """Rules evaluated with a NOT logical operator.
-
-    To match the policy, a user cannot meet any of the Exclude rules.
-    """
-
     isolation_required: bool
     """
     Require this application to be served in an isolated browser for users matching
@@ -1618,153 +1693,19 @@ class AppLauncherApplicationPolicyUnionMember2(TypedDict, total=False):
     purpose_justification_required: bool
     """Require users to enter a justification when they log in to the application."""
 
-    require: Iterable[AccessRuleParam]
-    """Rules evaluated with an AND logical operator.
-
-    To match the policy, a user must meet all of the Require rules.
-    """
-
-    session_duration: str
-    """The amount of time that tokens issued for the application will be valid.
+    session_duration: str
+    """The amount of time that tokens issued for the application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
     ms, s, m, h.
     """
 
 
-AppLauncherApplicationPolicy = Union[
+AppLauncherApplicationPolicy: TypeAlias = Union[
     AppLauncherApplicationPolicyAccessAppPolicyLink, str, AppLauncherApplicationPolicyUnionMember2
 ]
 
 
-class AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(TypedDict, total=False):
-    password: Required[str]
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["httpbasic"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: Required[str]
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
-    TypedDict, total=False
-):
-    token: Required[str]
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["oauthbearertoken"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(TypedDict, total=False):
-    authorization_url: Required[str]
-    """URL used to generate the auth code used during token generation."""
-
-    client_id: Required[str]
-    """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
-    """
-
-    client_secret: Required[str]
-    """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
-    """
-
-    scheme: Required[Literal["oauth2"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    token_url: Required[str]
-    """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
-    """
-
-    scopes: List[str]
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
-    """
-
-
-AppLauncherApplicationSCIMConfigAuthentication = Union[
-    AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class AppLauncherApplicationSCIMConfigMappingOperations(TypedDict, total=False):
-    create: bool
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: bool
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: bool
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
-
-
-class AppLauncherApplicationSCIMConfigMapping(TypedDict, total=False):
-    schema: Required[str]
-    """Which SCIM resource type this mapping applies to."""
-
-    enabled: bool
-    """Whether or not this mapping is enabled."""
-
-    filter: str
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
-
-    operations: AppLauncherApplicationSCIMConfigMappingOperations
-    """Whether or not this mapping applies to creates, updates, or deletes."""
-
-    transform_jsonata: str
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
-    """
-
-
-class AppLauncherApplicationSCIMConfig(TypedDict, total=False):
-    idp_uid: Required[str]
-    """
-    The UID of the IdP to use as the source for SCIM resources to provision to this
-    application.
-    """
-
-    remote_uri: Required[str]
-    """The base URI for the application's SCIM-compatible API."""
-
-    authentication: AppLauncherApplicationSCIMConfigAuthentication
-    """
-    Attributes for configuring HTTP Basic authentication scheme for SCIM
-    provisioning to an application.
-    """
-
-    deactivate_on_delete: bool
-    """
-    If false, propagates DELETE requests to the target application for SCIM
-    resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-    targets do not support DELETE operations.
-    """
-
-    enabled: bool
-    """Whether SCIM provisioning is turned on for this application."""
-
-    mappings: Iterable[AppLauncherApplicationSCIMConfigMapping]
-    """
-    A list of mappings to apply to SCIM resources before provisioning them in this
-    application. These can transform or filter the resources to be provisioned.
-    """
-
-
 class DeviceEnrollmentPermissionsApplication(TypedDict, total=False):
     type: Required[ApplicationType]
     """The application type."""
@@ -1775,7 +1716,7 @@ class DeviceEnrollmentPermissionsApplication(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    allowed_idps: List[AllowedIdPs]
+    allowed_idps: SequenceNotStr[AllowedIdPs]
     """The identity providers your users can select when connecting to this
     application.
 
@@ -1789,28 +1730,39 @@ class DeviceEnrollmentPermissionsApplication(TypedDict, total=False):
     You must specify only one identity provider in allowed_idps.
     """
 
-    policies: List[DeviceEnrollmentPermissionsApplicationPolicy]
+    custom_deny_url: str
     """
-    The policies that will apply to the application, in ascending order of
-    precedence. Items can reference existing policies or create new policies
-    exclusive to the application.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
     """
 
-    scim_config: DeviceEnrollmentPermissionsApplicationSCIMConfig
-    """Configuration for provisioning to this application via SCIM.
+    custom_non_identity_deny_url: str
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
 
-    This is currently in closed beta.
+    custom_pages: SequenceNotStr[str]
+    """The custom pages that will be displayed when applicable for this application"""
+
+    policies: SequenceNotStr[DeviceEnrollmentPermissionsApplicationPolicy]
+    """
+    The policies that Access applies to the application, in ascending order of
+    precedence. Items can reference existing policies or create new policies
+    exclusive to the application.
     """
 
     session_duration: str
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
 
 class DeviceEnrollmentPermissionsApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
     id: str
     """The UUID of the policy"""
 
@@ -1822,18 +1774,6 @@ class DeviceEnrollmentPermissionsApplicationPolicyAccessAppPolicyLink(TypedDict,
 
 
 class DeviceEnrollmentPermissionsApplicationPolicyUnionMember2(TypedDict, total=False):
-    decision: Required[Decision]
-    """The action Access will take if a user matches this policy."""
-
-    include: Required[Iterable[AccessRuleParam]]
-    """Rules evaluated with an OR logical operator.
-
-    A user needs to meet only one of the Include rules.
-    """
-
-    name: Required[str]
-    """The name of the Access policy."""
-
     id: str
     """The UUID of the policy"""
 
@@ -1846,12 +1786,6 @@ class DeviceEnrollmentPermissionsApplicationPolicyUnionMember2(TypedDict, total=
     session.
     """
 
-    exclude: Iterable[AccessRuleParam]
-    """Rules evaluated with a NOT logical operator.
-
-    To match the policy, a user cannot meet any of the Exclude rules.
-    """
-
     isolation_required: bool
     """
     Require this application to be served in an isolated browser for users matching
@@ -1871,12 +1805,6 @@ class DeviceEnrollmentPermissionsApplicationPolicyUnionMember2(TypedDict, total=
     purpose_justification_required: bool
     """Require users to enter a justification when they log in to the application."""
 
-    require: Iterable[AccessRuleParam]
-    """Rules evaluated with an AND logical operator.
-
-    To match the policy, a user must meet all of the Require rules.
-    """
-
     session_duration: str
     """The amount of time that tokens issued for the application will be valid.
 
@@ -1885,145 +1813,13 @@ class DeviceEnrollmentPermissionsApplicationPolicyUnionMember2(TypedDict, total=
     """
 
 
-DeviceEnrollmentPermissionsApplicationPolicy = Union[
+DeviceEnrollmentPermissionsApplicationPolicy: TypeAlias = Union[
     DeviceEnrollmentPermissionsApplicationPolicyAccessAppPolicyLink,
     str,
     DeviceEnrollmentPermissionsApplicationPolicyUnionMember2,
 ]
 
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(
-    TypedDict, total=False
-):
-    password: Required[str]
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["httpbasic"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: Required[str]
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
-    TypedDict, total=False
-):
-    token: Required[str]
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["oauthbearertoken"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(
-    TypedDict, total=False
-):
-    authorization_url: Required[str]
-    """URL used to generate the auth code used during token generation."""
-
-    client_id: Required[str]
-    """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
-    """
-
-    client_secret: Required[str]
-    """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
-    """
-
-    scheme: Required[Literal["oauth2"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    token_url: Required[str]
-    """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
-    """
-
-    scopes: List[str]
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
-    """
-
-
-DeviceEnrollmentPermissionsApplicationSCIMConfigAuthentication = Union[
-    DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class DeviceEnrollmentPermissionsApplicationSCIMConfigMappingOperations(TypedDict, total=False):
-    create: bool
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: bool
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: bool
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
-
-
-class DeviceEnrollmentPermissionsApplicationSCIMConfigMapping(TypedDict, total=False):
-    schema: Required[str]
-    """Which SCIM resource type this mapping applies to."""
-
-    enabled: bool
-    """Whether or not this mapping is enabled."""
-
-    filter: str
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
-
-    operations: DeviceEnrollmentPermissionsApplicationSCIMConfigMappingOperations
-    """Whether or not this mapping applies to creates, updates, or deletes."""
-
-    transform_jsonata: str
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
-    """
-
-
-class DeviceEnrollmentPermissionsApplicationSCIMConfig(TypedDict, total=False):
-    idp_uid: Required[str]
-    """
-    The UID of the IdP to use as the source for SCIM resources to provision to this
-    application.
-    """
-
-    remote_uri: Required[str]
-    """The base URI for the application's SCIM-compatible API."""
-
-    authentication: DeviceEnrollmentPermissionsApplicationSCIMConfigAuthentication
-    """
-    Attributes for configuring HTTP Basic authentication scheme for SCIM
-    provisioning to an application.
-    """
-
-    deactivate_on_delete: bool
-    """
-    If false, propagates DELETE requests to the target application for SCIM
-    resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-    targets do not support DELETE operations.
-    """
-
-    enabled: bool
-    """Whether SCIM provisioning is turned on for this application."""
-
-    mappings: Iterable[DeviceEnrollmentPermissionsApplicationSCIMConfigMapping]
-    """
-    A list of mappings to apply to SCIM resources before provisioning them in this
-    application. These can transform or filter the resources to be provisioned.
-    """
-
-
 class BrowserIsolationPermissionsApplication(TypedDict, total=False):
     type: Required[ApplicationType]
     """The application type."""
@@ -2034,7 +1830,7 @@ class BrowserIsolationPermissionsApplication(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    allowed_idps: List[AllowedIdPs]
+    allowed_idps: SequenceNotStr[AllowedIdPs]
     """The identity providers your users can select when connecting to this
     application.
 
@@ -2048,28 +1844,39 @@ class BrowserIsolationPermissionsApplication(TypedDict, total=False):
     You must specify only one identity provider in allowed_idps.
     """
 
-    policies: List[BrowserIsolationPermissionsApplicationPolicy]
+    custom_deny_url: str
     """
-    The policies that will apply to the application, in ascending order of
-    precedence. Items can reference existing policies or create new policies
-    exclusive to the application.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
     """
 
-    scim_config: BrowserIsolationPermissionsApplicationSCIMConfig
-    """Configuration for provisioning to this application via SCIM.
+    custom_non_identity_deny_url: str
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
 
-    This is currently in closed beta.
+    custom_pages: SequenceNotStr[str]
+    """The custom pages that will be displayed when applicable for this application"""
+
+    policies: SequenceNotStr[BrowserIsolationPermissionsApplicationPolicy]
+    """
+    The policies that Access applies to the application, in ascending order of
+    precedence. Items can reference existing policies or create new policies
+    exclusive to the application.
     """
 
     session_duration: str
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
 
 class BrowserIsolationPermissionsApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
     id: str
     """The UUID of the policy"""
 
@@ -2081,18 +1888,6 @@ class BrowserIsolationPermissionsApplicationPolicyAccessAppPolicyLink(TypedDict,
 
 
 class BrowserIsolationPermissionsApplicationPolicyUnionMember2(TypedDict, total=False):
-    decision: Required[Decision]
-    """The action Access will take if a user matches this policy."""
-
-    include: Required[Iterable[AccessRuleParam]]
-    """Rules evaluated with an OR logical operator.
-
-    A user needs to meet only one of the Include rules.
-    """
-
-    name: Required[str]
-    """The name of the Access policy."""
-
     id: str
     """The UUID of the policy"""
 
@@ -2105,12 +1900,6 @@ class BrowserIsolationPermissionsApplicationPolicyUnionMember2(TypedDict, total=
     session.
     """
 
-    exclude: Iterable[AccessRuleParam]
-    """Rules evaluated with a NOT logical operator.
-
-    To match the policy, a user cannot meet any of the Exclude rules.
-    """
-
     isolation_required: bool
     """
     Require this application to be served in an isolated browser for users matching
@@ -2130,12 +1919,6 @@ class BrowserIsolationPermissionsApplicationPolicyUnionMember2(TypedDict, total=
     purpose_justification_required: bool
     """Require users to enter a justification when they log in to the application."""
 
-    require: Iterable[AccessRuleParam]
-    """Rules evaluated with an AND logical operator.
-
-    To match the policy, a user must meet all of the Require rules.
-    """
-
     session_duration: str
     """The amount of time that tokens issued for the application will be valid.
 
@@ -2144,157 +1927,410 @@ class BrowserIsolationPermissionsApplicationPolicyUnionMember2(TypedDict, total=
     """
 
 
-BrowserIsolationPermissionsApplicationPolicy = Union[
+BrowserIsolationPermissionsApplicationPolicy: TypeAlias = Union[
     BrowserIsolationPermissionsApplicationPolicyAccessAppPolicyLink,
     str,
     BrowserIsolationPermissionsApplicationPolicyUnionMember2,
 ]
 
 
-class BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(
-    TypedDict, total=False
-):
-    password: Required[str]
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Required[Literal["httpbasic"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
+class GatewayIdentityProxyEndpointApplication(TypedDict, total=False):
+    type: Required[ApplicationType]
+    """The application type."""
 
-    user: Required[str]
-    """User name used to authenticate with the remote SCIM service."""
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
 
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-class BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
-    TypedDict, total=False
-):
-    token: Required[str]
-    """Token used to authenticate with the remote SCIM service."""
+    allowed_idps: SequenceNotStr[AllowedIdPs]
+    """The identity providers your users can select when connecting to this
+    application.
 
-    scheme: Required[Literal["oauthbearertoken"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    Defaults to all IdPs configured in your account.
+    """
 
+    auto_redirect_to_identity: bool
+    """When set to `true`, users skip the identity provider selection step during
+    login.
 
-class BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(
-    TypedDict, total=False
-):
-    authorization_url: Required[str]
-    """URL used to generate the auth code used during token generation."""
+    You must specify only one identity provider in allowed_idps.
+    """
 
-    client_id: Required[str]
+    custom_deny_url: str
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
     """
 
-    client_secret: Required[str]
+    custom_non_identity_deny_url: str
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
     """
 
-    scheme: Required[Literal["oauth2"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    custom_pages: SequenceNotStr[str]
+    """The custom pages that will be displayed when applicable for this application"""
 
-    token_url: Required[str]
+    domain: str
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    The proxy endpoint domain in the format: 10 alphanumeric characters followed by
+    .proxy.cloudflare-gateway.com
+    """
+
+    name: str
+    """The name of the application."""
+
+    policies: SequenceNotStr[GatewayIdentityProxyEndpointApplicationPolicy]
+    """
+    The policies that Access applies to the application, in ascending order of
+    precedence. Items can reference existing policies or create new policies
+    exclusive to the application.
     """
 
-    scopes: List[str]
+    session_duration: str
+    """The amount of time that tokens issued for this application will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+
+
+class GatewayIdentityProxyEndpointApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
+    id: str
+    """The UUID of the policy"""
+
+    precedence: int
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
     """
 
 
-BrowserIsolationPermissionsApplicationSCIMConfigAuthentication = Union[
-    BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
+class GatewayIdentityProxyEndpointApplicationPolicyUnionMember2(TypedDict, total=False):
+    id: str
+    """The UUID of the policy"""
+
+    approval_groups: Iterable[ApprovalGroupParam]
+    """Administrators who can approve a temporary authentication request."""
+
+    approval_required: bool
+    """
+    Requires the user to request access from an administrator at the start of each
+    session.
+    """
+
+    isolation_required: bool
+    """
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
+    """
+
+    precedence: int
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
+    purpose_justification_prompt: str
+    """A custom message that will appear on the purpose justification screen."""
+
+    purpose_justification_required: bool
+    """Require users to enter a justification when they log in to the application."""
+
+    session_duration: str
+    """The amount of time that tokens issued for the application will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
+    """
+
+
+GatewayIdentityProxyEndpointApplicationPolicy: TypeAlias = Union[
+    GatewayIdentityProxyEndpointApplicationPolicyAccessAppPolicyLink,
+    str,
+    GatewayIdentityProxyEndpointApplicationPolicyUnionMember2,
 ]
 
 
-class BrowserIsolationPermissionsApplicationSCIMConfigMappingOperations(TypedDict, total=False):
-    create: bool
-    """Whether or not this mapping applies to create (POST) operations."""
+class BookmarkApplication(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
 
-    delete: bool
-    """Whether or not this mapping applies to DELETE operations."""
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    update: bool
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    app_launcher_visible: bool
+    """Displays the application in the App Launcher."""
 
+    domain: str
+    """The URL or domain of the bookmark."""
 
-class BrowserIsolationPermissionsApplicationSCIMConfigMapping(TypedDict, total=False):
-    schema: Required[str]
-    """Which SCIM resource type this mapping applies to."""
+    logo_url: str
+    """The image URL for the logo shown in the App Launcher dashboard."""
 
-    enabled: bool
-    """Whether or not this mapping is enabled."""
+    name: str
+    """The name of the application."""
+
+    policies: SequenceNotStr[BookmarkApplicationPolicy]
+    """
+    The policies that Access applies to the application, in ascending order of
+    precedence. Items can reference existing policies or create new policies
+    exclusive to the application.
+    """
 
-    filter: str
+    tags: SequenceNotStr[str]
+    """The tags you want assigned to an application.
+
+    Tags are used to filter applications in the App Launcher dashboard.
     """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
+
+    type: ApplicationType
+    """The application type."""
+
+
+class BookmarkApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
+    id: str
+    """The UUID of the policy"""
+
+    precedence: int
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
     """
 
-    operations: BrowserIsolationPermissionsApplicationSCIMConfigMappingOperations
-    """Whether or not this mapping applies to creates, updates, or deletes."""
 
-    transform_jsonata: str
+class BookmarkApplicationPolicyUnionMember2(TypedDict, total=False):
+    id: str
+    """The UUID of the policy"""
+
+    approval_groups: Iterable[ApprovalGroupParam]
+    """Administrators who can approve a temporary authentication request."""
+
+    approval_required: bool
+    """
+    Requires the user to request access from an administrator at the start of each
+    session.
+    """
+
+    isolation_required: bool
     """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
     """
 
+    precedence: int
+    """The order of execution for this policy.
 
-class BrowserIsolationPermissionsApplicationSCIMConfig(TypedDict, total=False):
-    idp_uid: Required[str]
+    Must be unique for each policy within an app.
     """
-    The UID of the IdP to use as the source for SCIM resources to provision to this
-    application.
+
+    purpose_justification_prompt: str
+    """A custom message that will appear on the purpose justification screen."""
+
+    purpose_justification_required: bool
+    """Require users to enter a justification when they log in to the application."""
+
+    session_duration: str
+    """The amount of time that tokens issued for the application will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
     """
 
-    remote_uri: Required[str]
-    """The base URI for the application's SCIM-compatible API."""
 
-    authentication: BrowserIsolationPermissionsApplicationSCIMConfigAuthentication
+BookmarkApplicationPolicy: TypeAlias = Union[
+    BookmarkApplicationPolicyAccessAppPolicyLink, str, BookmarkApplicationPolicyUnionMember2
+]
+
+
+class InfrastructureApplication(TypedDict, total=False):
+    target_criteria: Required[Iterable[InfrastructureApplicationTargetCriterion]]
+
+    type: Required[ApplicationType]
+    """The application type."""
+
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    name: str
+    """The name of the application."""
+
+    policies: Iterable[InfrastructureApplicationPolicy]
+    """The policies that Access applies to the application."""
+
+
+class InfrastructureApplicationTargetCriterion(TypedDict, total=False):
+    port: Required[int]
+    """The port that the targets use for the chosen communication protocol.
+
+    A port cannot be assigned to multiple protocols.
     """
-    Attributes for configuring HTTP Basic authentication scheme for SCIM
-    provisioning to an application.
+
+    protocol: Required[Literal["SSH"]]
+    """The communication protocol your application secures."""
+
+    target_attributes: Required[Dict[str, SequenceNotStr[str]]]
+    """Contains a map of target attribute keys to target attribute values."""
+
+
+class InfrastructureApplicationPolicyConnectionRulesSSH(TypedDict, total=False):
+    """
+    The SSH-specific rules that define how users may connect to the targets secured by your application.
     """
 
-    deactivate_on_delete: bool
+    usernames: Required[SequenceNotStr[str]]
+    """Contains the Unix usernames that may be used when connecting over SSH."""
+
+    allow_email_alias: bool
+    """Enables using Identity Provider email alias as SSH username."""
+
+
+class InfrastructureApplicationPolicyConnectionRules(TypedDict, total=False):
     """
-    If false, propagates DELETE requests to the target application for SCIM
-    resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-    targets do not support DELETE operations.
+    The rules that define how users may connect to the targets secured by your application.
     """
 
-    enabled: bool
-    """Whether SCIM provisioning is turned on for this application."""
+    ssh: InfrastructureApplicationPolicyConnectionRulesSSH
+    """
+    The SSH-specific rules that define how users may connect to the targets secured
+    by your application.
+    """
+
+
+class InfrastructureApplicationPolicy(TypedDict, total=False):
+    decision: Required[Decision]
+    """The action Access will take if a user matches this policy.
 
-    mappings: Iterable[BrowserIsolationPermissionsApplicationSCIMConfigMapping]
+    Infrastructure application policies can only use the Allow action.
     """
-    A list of mappings to apply to SCIM resources before provisioning them in this
-    application. These can transform or filter the resources to be provisioned.
+
+    include: Required[Iterable[AccessRuleParam]]
+    """Rules evaluated with an OR logical operator.
+
+    A user needs to meet only one of the Include rules.
     """
 
+    name: Required[str]
+    """The name of the Access policy."""
+
+    connection_rules: InfrastructureApplicationPolicyConnectionRules
+    """
+    The rules that define how users may connect to the targets secured by your
+    application.
+    """
+
+    exclude: Iterable[AccessRuleParam]
+    """Rules evaluated with a NOT logical operator.
+
+    To match the policy, a user cannot meet any of the Exclude rules.
+    """
+
+    require: Iterable[AccessRuleParam]
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
+    """
+
+
+class BrowserRdpApplication(TypedDict, total=False):
+    domain: Required[str]
+    """The primary hostname and path secured by Access.
+
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
+
+    target_criteria: Required[Iterable[BrowserRdpApplicationTargetCriterion]]
+
+    type: Required[ApplicationType]
+    """The application type."""
 
-class BookmarkApplication(TypedDict, total=False):
     account_id: str
     """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
 
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
+    allow_authenticate_via_warp: bool
+    """
+    When set to true, users can authenticate to this application using their WARP
+    session. When set to false this application will always require direct IdP
+    authentication. This setting always overrides the organization setting for WARP
+    authentication.
+    """
+
+    allow_iframe: bool
+    """Enables loading application content in an iFrame."""
+
+    allowed_idps: SequenceNotStr[AllowedIdPs]
+    """The identity providers your users can select when connecting to this
+    application.
+
+    Defaults to all IdPs configured in your account.
+    """
+
     app_launcher_visible: bool
     """Displays the application in the App Launcher."""
 
-    domain: str
-    """The URL or domain of the bookmark."""
+    auto_redirect_to_identity: bool
+    """When set to `true`, users skip the identity provider selection step during
+    login.
+
+    You must specify only one identity provider in allowed_idps.
+    """
+
+    cors_headers: CORSHeadersParam
+
+    custom_deny_message: str
+    """
+    The custom error message shown to a user when they are denied access to the
+    application.
+    """
+
+    custom_deny_url: str
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
+    """
+
+    custom_non_identity_deny_url: str
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
+
+    custom_pages: SequenceNotStr[str]
+    """The custom pages that will be displayed when applicable for this application"""
+
+    destinations: Iterable[BrowserRdpApplicationDestination]
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
+    enable_binding_cookie: bool
+    """
+    Enables the binding cookie, which increases security against compromised
+    authorization tokens and CSRF attacks.
+    """
+
+    http_only_cookie_attribute: bool
+    """
+    Enables the HttpOnly cookie attribute, which increases security against XSS
+    attacks.
+    """
 
     logo_url: str
     """The image URL for the logo shown in the App Launcher dashboard."""
@@ -2302,116 +2338,284 @@ class BookmarkApplication(TypedDict, total=False):
     name: str
     """The name of the application."""
 
-    scim_config: BookmarkApplicationSCIMConfig
+    options_preflight_bypass: bool
+    """
+    Allows options preflight requests to bypass Access authentication and go
+    directly to the origin. Cannot turn on if cors_headers is set.
+    """
+
+    path_cookie_attribute: bool
+    """Enables cookie paths to scope an application's JWT to the application path.
+
+    If disabled, the JWT will scope to the hostname by default
+    """
+
+    policies: SequenceNotStr[BrowserRdpApplicationPolicy]
+    """
+    The policies that Access applies to the application, in ascending order of
+    precedence. Items can reference existing policies or create new policies
+    exclusive to the application.
+    """
+
+    read_service_tokens_from_header: str
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
+    same_site_cookie_attribute: str
+    """
+    Sets the SameSite cookie setting, which provides increased security against CSRF
+    attacks.
+    """
+
+    scim_config: BrowserRdpApplicationSCIMConfig
     """Configuration for provisioning to this application via SCIM.
 
     This is currently in closed beta.
     """
 
-    tags: List[str]
+    self_hosted_domains: SequenceNotStr[SelfHostedDomains]
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
+    service_auth_401_redirect: bool
+    """Returns a 401 status code when the request is blocked by a Service Auth policy."""
+
+    session_duration: str
+    """The amount of time that tokens issued for this application will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
+    """
+
+    skip_interstitial: bool
+    """Enables automatic authentication through cloudflared."""
+
+    tags: SequenceNotStr[str]
     """The tags you want assigned to an application.
 
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    type: str
-    """The application type."""
+    use_clientless_isolation_app_launcher_url: bool
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
 
 
-class BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(TypedDict, total=False):
-    password: Required[str]
-    """Password used to authenticate with the remote SCIM service."""
+class BrowserRdpApplicationTargetCriterion(TypedDict, total=False):
+    port: Required[int]
+    """The port that the targets use for the chosen communication protocol.
 
-    scheme: Required[Literal["httpbasic"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    A port cannot be assigned to multiple protocols.
+    """
 
-    user: Required[str]
-    """User name used to authenticate with the remote SCIM service."""
+    protocol: Required[Literal["RDP"]]
+    """The communication protocol your application secures."""
 
+    target_attributes: Required[Dict[str, SequenceNotStr[str]]]
+    """Contains a map of target attribute keys to target attribute values."""
 
-class BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(TypedDict, total=False):
-    token: Required[str]
-    """Token used to authenticate with the remote SCIM service."""
 
-    scheme: Required[Literal["oauthbearertoken"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
+class BrowserRdpApplicationDestinationPublicDestination(TypedDict, total=False):
+    """A public hostname that Access will secure.
 
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
+    """
 
-class BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(TypedDict, total=False):
-    authorization_url: Required[str]
-    """URL used to generate the auth code used during token generation."""
+    type: Literal["public"]
 
-    client_id: Required[str]
+    uri: str
+    """The URI of the destination.
+
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+
+
+class BrowserRdpApplicationDestinationPrivateDestination(TypedDict, total=False):
+    cidr: str
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
+
+    hostname: str
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
+
+    l4_protocol: Literal["tcp", "udp"]
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
     """
 
-    client_secret: Required[str]
+    port_range: str
+    """The port range of the destination.
+
+    Can be a single port or a range of ports. When omitted, all ports will match.
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+
+    type: Literal["private"]
+
+    vnet_id: str
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class BrowserRdpApplicationDestinationViaMcpServerPortalDestination(TypedDict, total=False):
+    """A MCP server id configured in ai-controls.
+
+    Access will secure the MCP server if accessed through a MCP portal.
     """
 
-    scheme: Required[Literal["oauth2"]]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    mcp_server_id: str
+    """The MCP server id configured in ai-controls."""
+
+    type: Literal["via_mcp_server_portal"]
 
-    token_url: Required[str]
+
+BrowserRdpApplicationDestination: TypeAlias = Union[
+    BrowserRdpApplicationDestinationPublicDestination,
+    BrowserRdpApplicationDestinationPrivateDestination,
+    BrowserRdpApplicationDestinationViaMcpServerPortalDestination,
+]
+
+
+class BrowserRdpApplicationPolicyAccessAppPolicyLink(TypedDict, total=False):
+    """A JSON that links a reusable policy to an application."""
+
+    id: str
+    """The UUID of the policy"""
+
+    precedence: int
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+
+
+class BrowserRdpApplicationPolicyUnionMember2(TypedDict, total=False):
+    id: str
+    """The UUID of the policy"""
+
+    approval_groups: Iterable[ApprovalGroupParam]
+    """Administrators who can approve a temporary authentication request."""
+
+    approval_required: bool
+    """
+    Requires the user to request access from an administrator at the start of each
+    session.
     """
 
-    scopes: List[str]
+    isolation_required: bool
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
     """
 
+    precedence: int
+    """The order of execution for this policy.
 
-BookmarkApplicationSCIMConfigAuthentication = Union[
-    BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
+    Must be unique for each policy within an app.
+    """
 
+    purpose_justification_prompt: str
+    """A custom message that will appear on the purpose justification screen."""
 
-class BookmarkApplicationSCIMConfigMappingOperations(TypedDict, total=False):
-    create: bool
-    """Whether or not this mapping applies to create (POST) operations."""
+    purpose_justification_required: bool
+    """Require users to enter a justification when they log in to the application."""
 
-    delete: bool
-    """Whether or not this mapping applies to DELETE operations."""
+    session_duration: str
+    """The amount of time that tokens issued for the application will be valid.
 
-    update: bool
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
+    """
 
 
-class BookmarkApplicationSCIMConfigMapping(TypedDict, total=False):
-    schema: Required[str]
-    """Which SCIM resource type this mapping applies to."""
+BrowserRdpApplicationPolicy: TypeAlias = Union[
+    BrowserRdpApplicationPolicyAccessAppPolicyLink, str, BrowserRdpApplicationPolicyUnionMember2
+]
 
-    enabled: bool
-    """Whether or not this mapping is enabled."""
 
-    filter: str
+class BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    TypedDict, total=False
+):
     """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    operations: BookmarkApplicationSCIMConfigMappingOperations
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+    client_id: Required[str]
+    """
+    Client ID of the Access service token used to authenticate with the remote
+    service.
+    """
 
-    transform_jsonata: str
+    client_secret: Required[str]
     """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
+    scheme: Required[Literal["access_service_token"]]
+    """The authentication scheme to use when making SCIM requests to this application."""
+
+
+class BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    TypedDict, total=False
+):
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
+
+    client_id: Required[str]
+    """
+    Client ID of the Access service token used to authenticate with the remote
+    service.
+    """
+
+    client_secret: Required[str]
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
+
+    scheme: Required[Literal["access_service_token"]]
+    """The authentication scheme to use when making SCIM requests to this application."""
+
+
+BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
+
+BrowserRdpApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasicParam,
+    SCIMConfigAuthenticationOAuthBearerTokenParam,
+    SCIMConfigAuthenticationOauth2Param,
+    BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    Iterable[BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
+
+
+class BrowserRdpApplicationSCIMConfig(TypedDict, total=False):
+    """Configuration for provisioning to this application via SCIM.
+
+    This is currently in closed beta.
+    """
 
-class BookmarkApplicationSCIMConfig(TypedDict, total=False):
     idp_uid: Required[str]
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -2421,7 +2625,7 @@ class BookmarkApplicationSCIMConfig(TypedDict, total=False):
     remote_uri: Required[str]
     """The base URI for the application's SCIM-compatible API."""
 
-    authentication: BookmarkApplicationSCIMConfigAuthentication
+    authentication: BrowserRdpApplicationSCIMConfigAuthentication
     """
     Attributes for configuring HTTP Basic authentication scheme for SCIM
     provisioning to an application.
@@ -2437,20 +2641,23 @@ class BookmarkApplicationSCIMConfig(TypedDict, total=False):
     enabled: bool
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Iterable[BookmarkApplicationSCIMConfigMapping]
+    mappings: Iterable[SCIMConfigMappingParam]
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
     """
 
 
-ApplicationUpdateParams = Union[
+ApplicationUpdateParams: TypeAlias = Union[
     SelfHostedApplication,
     SaaSApplication,
     BrowserSSHApplication,
-    BrowserVncApplication,
+    BrowserVNCApplication,
     AppLauncherApplication,
     DeviceEnrollmentPermissionsApplication,
     BrowserIsolationPermissionsApplication,
+    GatewayIdentityProxyEndpointApplication,
     BookmarkApplication,
+    InfrastructureApplication,
+    BrowserRdpApplication,
 ]
diff --git a/src/cloudflare/types/zero_trust/access/application_update_response.py b/src/cloudflare/types/zero_trust/access/application_update_response.py
index 9c96a2d760d..f5fed2c82a5 100644
--- a/src/cloudflare/types/zero_trust/access/application_update_response.py
+++ b/src/cloudflare/types/zero_trust/access/application_update_response.py
@@ -2,99 +2,155 @@
 
 from typing import Dict, List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
-
-from pydantic import Field as FieldInfo
+from typing_extensions import Literal, TypeAlias
 
 from .decision import Decision
 from ...._models import BaseModel
-from ..access_rule import AccessRule
 from .allowed_idps import AllowedIdPs
 from .cors_headers import CORSHeaders
+from .oidc_saas_app import OIDCSaaSApp
 from .saml_saas_app import SAMLSaaSApp
+from .approval_group import ApprovalGroup
 from .application_type import ApplicationType
+from .scim_config_mapping import SCIMConfigMapping
 from .self_hosted_domains import SelfHostedDomains
-from .applications.approval_group import ApprovalGroup
+from .applications.access_rule import AccessRule
+from .scim_config_authentication_oauth2 import SCIMConfigAuthenticationOauth2
+from .scim_config_authentication_http_basic import SCIMConfigAuthenticationHTTPBasic
+from .scim_config_authentication_oauth_bearer_token import SCIMConfigAuthenticationOAuthBearerToken
 
 __all__ = [
     "ApplicationUpdateResponse",
     "SelfHostedApplication",
+    "SelfHostedApplicationDestination",
+    "SelfHostedApplicationDestinationPublicDestination",
+    "SelfHostedApplicationDestinationPrivateDestination",
+    "SelfHostedApplicationDestinationViaMcpServerPortalDestination",
     "SelfHostedApplicationPolicy",
     "SelfHostedApplicationSCIMConfig",
     "SelfHostedApplicationSCIMConfigAuthentication",
-    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "SelfHostedApplicationSCIMConfigMapping",
-    "SelfHostedApplicationSCIMConfigMappingOperations",
+    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
     "SaaSApplication",
     "SaaSApplicationPolicy",
     "SaaSApplicationSaaSApp",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSApp",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaims",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaimsSource",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppHybridAndImplicitOptions",
-    "SaaSApplicationSaaSAppAccessOIDCSaaSAppRefreshTokenOptions",
     "SaaSApplicationSCIMConfig",
     "SaaSApplicationSCIMConfigAuthentication",
-    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "SaaSApplicationSCIMConfigMapping",
-    "SaaSApplicationSCIMConfigMappingOperations",
+    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
     "BrowserSSHApplication",
+    "BrowserSSHApplicationDestination",
+    "BrowserSSHApplicationDestinationPublicDestination",
+    "BrowserSSHApplicationDestinationPrivateDestination",
+    "BrowserSSHApplicationDestinationViaMcpServerPortalDestination",
     "BrowserSSHApplicationPolicy",
     "BrowserSSHApplicationSCIMConfig",
     "BrowserSSHApplicationSCIMConfigAuthentication",
-    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BrowserSSHApplicationSCIMConfigMapping",
-    "BrowserSSHApplicationSCIMConfigMappingOperations",
-    "BrowserVncApplication",
-    "BrowserVncApplicationPolicy",
-    "BrowserVncApplicationSCIMConfig",
-    "BrowserVncApplicationSCIMConfigAuthentication",
-    "BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BrowserVncApplicationSCIMConfigMapping",
-    "BrowserVncApplicationSCIMConfigMappingOperations",
+    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserVNCApplication",
+    "BrowserVNCApplicationDestination",
+    "BrowserVNCApplicationDestinationPublicDestination",
+    "BrowserVNCApplicationDestinationPrivateDestination",
+    "BrowserVNCApplicationDestinationViaMcpServerPortalDestination",
+    "BrowserVNCApplicationPolicy",
+    "BrowserVNCApplicationSCIMConfig",
+    "BrowserVNCApplicationSCIMConfigAuthentication",
+    "BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
     "AppLauncherApplication",
+    "AppLauncherApplicationFooterLink",
+    "AppLauncherApplicationLandingPageDesign",
     "AppLauncherApplicationPolicy",
-    "AppLauncherApplicationSCIMConfig",
-    "AppLauncherApplicationSCIMConfigAuthentication",
-    "AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "AppLauncherApplicationSCIMConfigMapping",
-    "AppLauncherApplicationSCIMConfigMappingOperations",
     "DeviceEnrollmentPermissionsApplication",
     "DeviceEnrollmentPermissionsApplicationPolicy",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfig",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthentication",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigMapping",
-    "DeviceEnrollmentPermissionsApplicationSCIMConfigMappingOperations",
     "BrowserIsolationPermissionsApplication",
     "BrowserIsolationPermissionsApplicationPolicy",
-    "BrowserIsolationPermissionsApplicationSCIMConfig",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthentication",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BrowserIsolationPermissionsApplicationSCIMConfigMapping",
-    "BrowserIsolationPermissionsApplicationSCIMConfigMappingOperations",
+    "GatewayIdentityProxyEndpointApplication",
+    "GatewayIdentityProxyEndpointApplicationPolicy",
     "BookmarkApplication",
-    "BookmarkApplicationSCIMConfig",
-    "BookmarkApplicationSCIMConfigAuthentication",
-    "BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic",
-    "BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken",
-    "BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2",
-    "BookmarkApplicationSCIMConfigMapping",
-    "BookmarkApplicationSCIMConfigMappingOperations",
+    "BookmarkApplicationPolicy",
+    "InfrastructureApplication",
+    "InfrastructureApplicationTargetCriterion",
+    "InfrastructureApplicationPolicy",
+    "InfrastructureApplicationPolicyConnectionRules",
+    "InfrastructureApplicationPolicyConnectionRulesSSH",
+    "BrowserRdpApplication",
+    "BrowserRdpApplicationTargetCriterion",
+    "BrowserRdpApplicationDestination",
+    "BrowserRdpApplicationDestinationPublicDestination",
+    "BrowserRdpApplicationDestinationPrivateDestination",
+    "BrowserRdpApplicationDestinationViaMcpServerPortalDestination",
+    "BrowserRdpApplicationPolicy",
+    "BrowserRdpApplicationSCIMConfig",
+    "BrowserRdpApplicationSCIMConfigAuthentication",
+    "BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+    "BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication",
+    "BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken",
+]
+
+
+class SelfHostedApplicationDestinationPublicDestination(BaseModel):
+    """A public hostname that Access will secure.
+
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
+    """
+
+    type: Optional[Literal["public"]] = None
+
+    uri: Optional[str] = None
+    """The URI of the destination.
+
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
+    """
+
+
+class SelfHostedApplicationDestinationPrivateDestination(BaseModel):
+    cidr: Optional[str] = None
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
+
+    hostname: Optional[str] = None
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
+
+    l4_protocol: Optional[Literal["tcp", "udp"]] = None
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
+    """
+
+    port_range: Optional[str] = None
+    """The port range of the destination.
+
+    Can be a single port or a range of ports. When omitted, all ports will match.
+    """
+
+    type: Optional[Literal["private"]] = None
+
+    vnet_id: Optional[str] = None
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class SelfHostedApplicationDestinationViaMcpServerPortalDestination(BaseModel):
+    """A MCP server id configured in ai-controls.
+
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
+
+    mcp_server_id: Optional[str] = None
+    """The MCP server id configured in ai-controls."""
+
+    type: Optional[Literal["via_mcp_server_portal"]] = None
+
+
+SelfHostedApplicationDestination: TypeAlias = Union[
+    SelfHostedApplicationDestinationPublicDestination,
+    SelfHostedApplicationDestinationPrivateDestination,
+    SelfHostedApplicationDestinationViaMcpServerPortalDestination,
 ]
 
 
@@ -114,7 +170,10 @@ class SelfHostedApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -138,6 +197,12 @@ class SelfHostedApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -160,100 +225,72 @@ class SelfHostedApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
     client_id: str
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
     client_secret: str
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Literal["oauth2"]
+    scheme: Literal["access_service_token"]
     """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: str
+
+class SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    scopes: Optional[List[str]] = None
+    client_id: str
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
+    client_secret: str
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-SelfHostedApplicationSCIMConfigAuthentication = Union[
-    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class SelfHostedApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class SelfHostedApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
+SelfHostedApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[SelfHostedApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: Optional[SelfHostedApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class SelfHostedApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class SelfHostedApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -279,7 +316,7 @@ class SelfHostedApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[SelfHostedApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
@@ -288,17 +325,16 @@ class SelfHostedApplicationSCIMConfig(BaseModel):
 
 class SelfHostedApplication(BaseModel):
     domain: str
-    """The primary hostname and path that Access will secure.
+    """The primary hostname and path secured by Access.
 
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
+    This domain will be displayed if the app is visible in the App Launcher.
     """
 
-    type: str
+    type: ApplicationType
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allow_authenticate_via_warp: Optional[bool] = None
     """
@@ -308,6 +344,9 @@ class SelfHostedApplication(BaseModel):
     authentication.
     """
 
+    allow_iframe: Optional[bool] = None
+    """Enables loading application content in an iFrame."""
+
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
     application.
@@ -330,8 +369,6 @@ class SelfHostedApplication(BaseModel):
 
     cors_headers: Optional[CORSHeaders] = None
 
-    created_at: Optional[datetime] = None
-
     custom_deny_message: Optional[str] = None
     """
     The custom error message shown to a user when they are denied access to the
@@ -353,6 +390,14 @@ class SelfHostedApplication(BaseModel):
     custom_pages: Optional[List[str]] = None
     """The custom pages that will be displayed when applicable for this application"""
 
+    destinations: Optional[List[SelfHostedApplicationDestination]] = None
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
     enable_binding_cookie: Optional[bool] = None
     """
     Enables the binding cookie, which increases security against compromised
@@ -385,6 +430,17 @@ class SelfHostedApplication(BaseModel):
 
     policies: Optional[List[SelfHostedApplicationPolicy]] = None
 
+    read_service_tokens_from_header: Optional[str] = None
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
     same_site_cookie_attribute: Optional[str] = None
     """
     Sets the SameSite cookie setting, which provides increased security against CSRF
@@ -398,7 +454,12 @@ class SelfHostedApplication(BaseModel):
     """
 
     self_hosted_domains: Optional[List[SelfHostedDomains]] = None
-    """List of domains that Access will secure."""
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
 
     service_auth_401_redirect: Optional[bool] = None
     """Returns a 401 status code when the request is blocked by a Service Auth policy."""
@@ -407,7 +468,7 @@ class SelfHostedApplication(BaseModel):
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
     skip_interstitial: Optional[bool] = None
@@ -419,7 +480,13 @@ class SelfHostedApplication(BaseModel):
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    updated_at: Optional[datetime] = None
+    use_clientless_isolation_app_launcher_url: Optional[bool] = None
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
 
 
 class SaaSApplicationPolicy(BaseModel):
@@ -438,7 +505,10 @@ class SaaSApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -462,6 +532,12 @@ class SaaSApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -484,203 +560,75 @@ class SaaSApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaimsSource(BaseModel):
-    name: Optional[str] = None
-    """The name of the IdP claim."""
-
-    name_by_idp: Optional[Dict[str, str]] = None
-    """A mapping from IdP ID to claim name."""
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaims(BaseModel):
-    name: Optional[str] = None
-    """The name of the claim."""
-
-    required: Optional[bool] = None
-    """If the claim is required when building an OIDC token."""
-
-    scope: Optional[Literal["groups", "profile", "email", "openid"]] = None
-    """The scope of the claim."""
-
-    source: Optional[SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaimsSource] = None
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppHybridAndImplicitOptions(BaseModel):
-    return_access_token_from_authorization_endpoint: Optional[bool] = None
-    """If an Access Token should be returned from the OIDC Authorization endpoint"""
-
-    return_id_token_from_authorization_endpoint: Optional[bool] = None
-    """If an ID Token should be returned from the OIDC Authorization endpoint"""
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSAppRefreshTokenOptions(BaseModel):
-    lifetime: Optional[str] = None
-    """How long a refresh token will be valid for after creation.
-
-    Valid units are m,h,d. Must be longer than 1m.
-    """
-
-
-class SaaSApplicationSaaSAppAccessOIDCSaaSApp(BaseModel):
-    access_token_lifetime: Optional[str] = None
-    """The lifetime of the OIDC Access Token after creation.
+SaaSApplicationSaaSApp: TypeAlias = Union[SAMLSaaSApp, OIDCSaaSApp]
 
-    Valid units are m,h. Must be greater than or equal to 1m and less than or equal
-    to 24h.
-    """
 
-    allow_pkce_without_client_secret: Optional[bool] = None
-    """
-    If client secret should be required on the token endpoint when
-    authorization_code_with_pkce grant is used.
+class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
     """
-
-    app_launcher_url: Optional[str] = None
-    """The URL where this applications tile redirects users"""
-
-    auth_type: Optional[Literal["saml", "oidc"]] = None
-    """Identifier of the authentication protocol used for the saas app.
-
-    Required for OIDC.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    client_id: Optional[str] = None
-    """The application client id"""
-
-    client_secret: Optional[str] = None
-    """The application client secret, only returned on POST request."""
-
-    created_at: Optional[datetime] = None
-
-    custom_claims: Optional[SaaSApplicationSaaSAppAccessOIDCSaaSAppCustomClaims] = None
-
-    grant_types: Optional[
-        List[Literal["authorization_code", "authorization_code_with_pkce", "refresh_tokens", "hybrid", "implicit"]]
-    ] = None
-    """The OIDC flows supported by this application"""
-
-    group_filter_regex: Optional[str] = None
-    """A regex to filter Cloudflare groups returned in ID token and userinfo endpoint"""
-
-    hybrid_and_implicit_options: Optional[SaaSApplicationSaaSAppAccessOIDCSaaSAppHybridAndImplicitOptions] = None
-
-    public_key: Optional[str] = None
-    """The Access public certificate that will be used to verify your identity."""
-
-    redirect_uris: Optional[List[str]] = None
+    client_id: str
     """
-    The permitted URL's for Cloudflare to return Authorization codes and Access/ID
-    tokens
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
-    refresh_token_options: Optional[SaaSApplicationSaaSAppAccessOIDCSaaSAppRefreshTokenOptions] = None
-
-    scopes: Optional[List[Literal["openid", "groups", "email", "profile"]]] = None
+    client_secret: str
     """
-    Define the user information shared with access, "offline_access" scope will be
-    automatically enabled if refresh tokens are enabled
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    updated_at: Optional[datetime] = None
-
-
-SaaSApplicationSaaSApp = Union[SAMLSaaSApp, SaaSApplicationSaaSAppAccessOIDCSaaSApp]
-
-
-class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["oauthbearertoken"]
+    scheme: Literal["access_service_token"]
     """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
-
-    client_id: str
+class SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    client_secret: str
+    client_id: str
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    token_url: str
+    client_secret: str
     """
-    URL used to generate the token used to authenticate with the remote SCIM
+    Client secret of the Access service token used to authenticate with the remote
     service.
     """
 
-    scopes: Optional[List[str]] = None
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
-    """
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-SaaSApplicationSCIMConfigAuthentication = Union[
-    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
+SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
 ]
 
+SaaSApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[SaaSApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-class SaaSApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
-
-
-class SaaSApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
-
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
-
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: Optional[SaaSApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class SaaSApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class SaaSApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -706,7 +654,7 @@ class SaaSApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[SaaSApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
@@ -715,7 +663,7 @@ class SaaSApplicationSCIMConfig(BaseModel):
 
 class SaaSApplication(BaseModel):
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
@@ -737,8 +685,6 @@ class SaaSApplication(BaseModel):
     You must specify only one identity provider in allowed_idps.
     """
 
-    created_at: Optional[datetime] = None
-
     custom_pages: Optional[List[str]] = None
     """The custom pages that will be displayed when applicable for this application"""
 
@@ -764,10 +710,68 @@ class SaaSApplication(BaseModel):
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    type: Optional[str] = None
+    type: Optional[ApplicationType] = None
     """The application type."""
 
-    updated_at: Optional[datetime] = None
+
+class BrowserSSHApplicationDestinationPublicDestination(BaseModel):
+    """A public hostname that Access will secure.
+
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
+    """
+
+    type: Optional[Literal["public"]] = None
+
+    uri: Optional[str] = None
+    """The URI of the destination.
+
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
+    """
+
+
+class BrowserSSHApplicationDestinationPrivateDestination(BaseModel):
+    cidr: Optional[str] = None
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
+
+    hostname: Optional[str] = None
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
+
+    l4_protocol: Optional[Literal["tcp", "udp"]] = None
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
+    """
+
+    port_range: Optional[str] = None
+    """The port range of the destination.
+
+    Can be a single port or a range of ports. When omitted, all ports will match.
+    """
+
+    type: Optional[Literal["private"]] = None
+
+    vnet_id: Optional[str] = None
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class BrowserSSHApplicationDestinationViaMcpServerPortalDestination(BaseModel):
+    """A MCP server id configured in ai-controls.
+
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
+
+    mcp_server_id: Optional[str] = None
+    """The MCP server id configured in ai-controls."""
+
+    type: Optional[Literal["via_mcp_server_portal"]] = None
+
+
+BrowserSSHApplicationDestination: TypeAlias = Union[
+    BrowserSSHApplicationDestinationPublicDestination,
+    BrowserSSHApplicationDestinationPrivateDestination,
+    BrowserSSHApplicationDestinationViaMcpServerPortalDestination,
+]
 
 
 class BrowserSSHApplicationPolicy(BaseModel):
@@ -786,7 +790,10 @@ class BrowserSSHApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -810,6 +817,12 @@ class BrowserSSHApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -832,100 +845,72 @@ class BrowserSSHApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
     client_id: str
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
     client_secret: str
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Literal["oauth2"]
+    scheme: Literal["access_service_token"]
     """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: str
+
+class BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    scopes: Optional[List[str]] = None
+    client_id: str
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
+    client_secret: str
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-BrowserSSHApplicationSCIMConfigAuthentication = Union[
-    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class BrowserSSHApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class BrowserSSHApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
+BrowserSSHApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[BrowserSSHApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: Optional[BrowserSSHApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class BrowserSSHApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class BrowserSSHApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -951,7 +936,7 @@ class BrowserSSHApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[BrowserSSHApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
@@ -960,17 +945,31 @@ class BrowserSSHApplicationSCIMConfig(BaseModel):
 
 class BrowserSSHApplication(BaseModel):
     domain: str
-    """The primary hostname and path that Access will secure.
-
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
-    """
-
-    type: str
+    """The primary hostname and path secured by Access.
+
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
+
+    type: Literal[
+        "self_hosted",
+        "saas",
+        "ssh",
+        "vnc",
+        "app_launcher",
+        "warp",
+        "biso",
+        "bookmark",
+        "dash_sso",
+        "infrastructure",
+        "rdp",
+        "mcp",
+        "mcp_portal",
+        "proxy_endpoint",
+    ]
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allow_authenticate_via_warp: Optional[bool] = None
     """
@@ -980,6 +979,9 @@ class BrowserSSHApplication(BaseModel):
     authentication.
     """
 
+    allow_iframe: Optional[bool] = None
+    """Enables loading application content in an iFrame."""
+
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
     application.
@@ -1002,8 +1004,6 @@ class BrowserSSHApplication(BaseModel):
 
     cors_headers: Optional[CORSHeaders] = None
 
-    created_at: Optional[datetime] = None
-
     custom_deny_message: Optional[str] = None
     """
     The custom error message shown to a user when they are denied access to the
@@ -1025,6 +1025,14 @@ class BrowserSSHApplication(BaseModel):
     custom_pages: Optional[List[str]] = None
     """The custom pages that will be displayed when applicable for this application"""
 
+    destinations: Optional[List[BrowserSSHApplicationDestination]] = None
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
     enable_binding_cookie: Optional[bool] = None
     """
     Enables the binding cookie, which increases security against compromised
@@ -1057,7 +1065,18 @@ class BrowserSSHApplication(BaseModel):
 
     policies: Optional[List[BrowserSSHApplicationPolicy]] = None
 
-    same_site_cookie_attribute: Optional[str] = None
+    read_service_tokens_from_header: Optional[str] = None
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
+    same_site_cookie_attribute: Optional[str] = None
     """
     Sets the SameSite cookie setting, which provides increased security against CSRF
     attacks.
@@ -1070,7 +1089,12 @@ class BrowserSSHApplication(BaseModel):
     """
 
     self_hosted_domains: Optional[List[SelfHostedDomains]] = None
-    """List of domains that Access will secure."""
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
 
     service_auth_401_redirect: Optional[bool] = None
     """Returns a 401 status code when the request is blocked by a Service Auth policy."""
@@ -1079,7 +1103,7 @@ class BrowserSSHApplication(BaseModel):
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
     skip_interstitial: Optional[bool] = None
@@ -1091,10 +1115,76 @@ class BrowserSSHApplication(BaseModel):
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    updated_at: Optional[datetime] = None
+    use_clientless_isolation_app_launcher_url: Optional[bool] = None
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
+
+
+class BrowserVNCApplicationDestinationPublicDestination(BaseModel):
+    """A public hostname that Access will secure.
+
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
+    """
+
+    type: Optional[Literal["public"]] = None
+
+    uri: Optional[str] = None
+    """The URI of the destination.
+
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
+    """
+
+
+class BrowserVNCApplicationDestinationPrivateDestination(BaseModel):
+    cidr: Optional[str] = None
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
+
+    hostname: Optional[str] = None
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
+
+    l4_protocol: Optional[Literal["tcp", "udp"]] = None
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
+    """
+
+    port_range: Optional[str] = None
+    """The port range of the destination.
+
+    Can be a single port or a range of ports. When omitted, all ports will match.
+    """
+
+    type: Optional[Literal["private"]] = None
+
+    vnet_id: Optional[str] = None
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
+
+
+class BrowserVNCApplicationDestinationViaMcpServerPortalDestination(BaseModel):
+    """A MCP server id configured in ai-controls.
+
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
+
+    mcp_server_id: Optional[str] = None
+    """The MCP server id configured in ai-controls."""
+
+    type: Optional[Literal["via_mcp_server_portal"]] = None
+
+
+BrowserVNCApplicationDestination: TypeAlias = Union[
+    BrowserVNCApplicationDestinationPublicDestination,
+    BrowserVNCApplicationDestinationPrivateDestination,
+    BrowserVNCApplicationDestinationViaMcpServerPortalDestination,
+]
 
 
-class BrowserVncApplicationPolicy(BaseModel):
+class BrowserVNCApplicationPolicy(BaseModel):
     id: Optional[str] = None
     """The UUID of the policy"""
 
@@ -1110,7 +1200,10 @@ class BrowserVncApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -1134,6 +1227,12 @@ class BrowserVncApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -1156,100 +1255,72 @@ class BrowserVncApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
-
-
-class BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-
-class BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+class BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
     client_id: str
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
     client_secret: str
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
-    scheme: Literal["oauth2"]
+    scheme: Literal["access_service_token"]
     """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: str
+
+class BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    scopes: Optional[List[str]] = None
+    client_id: str
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    Client ID of the Access service token used to authenticate with the remote
+    service.
     """
 
+    client_secret: str
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-BrowserVncApplicationSCIMConfigAuthentication = Union[
-    BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BrowserVncApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
-
-class BrowserVncApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
-
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
 
-class BrowserVncApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
+BrowserVNCApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[BrowserVNCApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
 
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
 
-    operations: Optional[BrowserVncApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+class BrowserVNCApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    This is currently in closed beta.
     """
 
-
-class BrowserVncApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -1259,7 +1330,7 @@ class BrowserVncApplicationSCIMConfig(BaseModel):
     remote_uri: str
     """The base URI for the application's SCIM-compatible API."""
 
-    authentication: Optional[BrowserVncApplicationSCIMConfigAuthentication] = None
+    authentication: Optional[BrowserVNCApplicationSCIMConfigAuthentication] = None
     """
     Attributes for configuring HTTP Basic authentication scheme for SCIM
     provisioning to an application.
@@ -1275,26 +1346,40 @@ class BrowserVncApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[BrowserVncApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
     """
 
 
-class BrowserVncApplication(BaseModel):
+class BrowserVNCApplication(BaseModel):
     domain: str
-    """The primary hostname and path that Access will secure.
-
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
-    """
-
-    type: str
+    """The primary hostname and path secured by Access.
+
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
+
+    type: Literal[
+        "self_hosted",
+        "saas",
+        "ssh",
+        "vnc",
+        "app_launcher",
+        "warp",
+        "biso",
+        "bookmark",
+        "dash_sso",
+        "infrastructure",
+        "rdp",
+        "mcp",
+        "mcp_portal",
+        "proxy_endpoint",
+    ]
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allow_authenticate_via_warp: Optional[bool] = None
     """
@@ -1304,6 +1389,9 @@ class BrowserVncApplication(BaseModel):
     authentication.
     """
 
+    allow_iframe: Optional[bool] = None
+    """Enables loading application content in an iFrame."""
+
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
     application.
@@ -1326,8 +1414,6 @@ class BrowserVncApplication(BaseModel):
 
     cors_headers: Optional[CORSHeaders] = None
 
-    created_at: Optional[datetime] = None
-
     custom_deny_message: Optional[str] = None
     """
     The custom error message shown to a user when they are denied access to the
@@ -1349,6 +1435,14 @@ class BrowserVncApplication(BaseModel):
     custom_pages: Optional[List[str]] = None
     """The custom pages that will be displayed when applicable for this application"""
 
+    destinations: Optional[List[BrowserVNCApplicationDestination]] = None
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
     enable_binding_cookie: Optional[bool] = None
     """
     Enables the binding cookie, which increases security against compromised
@@ -1379,7 +1473,18 @@ class BrowserVncApplication(BaseModel):
     If disabled, the JWT will scope to the hostname by default
     """
 
-    policies: Optional[List[BrowserVncApplicationPolicy]] = None
+    policies: Optional[List[BrowserVNCApplicationPolicy]] = None
+
+    read_service_tokens_from_header: Optional[str] = None
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
 
     same_site_cookie_attribute: Optional[str] = None
     """
@@ -1387,14 +1492,19 @@ class BrowserVncApplication(BaseModel):
     attacks.
     """
 
-    scim_config: Optional[BrowserVncApplicationSCIMConfig] = None
+    scim_config: Optional[BrowserVNCApplicationSCIMConfig] = None
     """Configuration for provisioning to this application via SCIM.
 
     This is currently in closed beta.
     """
 
     self_hosted_domains: Optional[List[SelfHostedDomains]] = None
-    """List of domains that Access will secure."""
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
 
     service_auth_401_redirect: Optional[bool] = None
     """Returns a 401 status code when the request is blocked by a Service Auth policy."""
@@ -1403,7 +1513,7 @@ class BrowserVncApplication(BaseModel):
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
     skip_interstitial: Optional[bool] = None
@@ -1415,7 +1525,40 @@ class BrowserVncApplication(BaseModel):
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    updated_at: Optional[datetime] = None
+    use_clientless_isolation_app_launcher_url: Optional[bool] = None
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
+
+
+class AppLauncherApplicationFooterLink(BaseModel):
+    name: str
+    """The hypertext in the footer link."""
+
+    url: str
+    """the hyperlink in the footer link."""
+
+
+class AppLauncherApplicationLandingPageDesign(BaseModel):
+    """The design of the App Launcher landing page shown to users when they log in."""
+
+    button_color: Optional[str] = None
+    """The background color of the log in button on the landing page."""
+
+    button_text_color: Optional[str] = None
+    """The color of the text in the log in button on the landing page."""
+
+    image_url: Optional[str] = None
+    """The URL of the image shown on the landing page."""
+
+    message: Optional[str] = None
+    """The message shown on the landing page."""
+
+    title: Optional[str] = None
+    """The title shown on the landing page."""
 
 
 class AppLauncherApplicationPolicy(BaseModel):
@@ -1434,7 +1577,10 @@ class AppLauncherApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -1458,6 +1604,12 @@ class AppLauncherApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -1480,138 +1632,174 @@ class AppLauncherApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
+class AppLauncherApplication(BaseModel):
+    type: Literal[
+        "self_hosted",
+        "saas",
+        "ssh",
+        "vnc",
+        "app_launcher",
+        "warp",
+        "biso",
+        "bookmark",
+        "dash_sso",
+        "infrastructure",
+        "rdp",
+        "mcp",
+        "mcp_portal",
+        "proxy_endpoint",
+    ]
+    """The application type."""
+
+    id: Optional[str] = None
+    """UUID."""
 
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    allowed_idps: Optional[List[AllowedIdPs]] = None
+    """The identity providers your users can select when connecting to this
+    application.
 
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
+    Defaults to all IdPs configured in your account.
+    """
 
+    app_launcher_logo_url: Optional[str] = None
+    """The image URL of the logo shown in the App Launcher header."""
 
-class AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
+    aud: Optional[str] = None
+    """Audience tag."""
 
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    auto_redirect_to_identity: Optional[bool] = None
+    """When set to `true`, users skip the identity provider selection step during
+    login.
 
+    You must specify only one identity provider in allowed_idps.
+    """
 
-class AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+    bg_color: Optional[str] = None
+    """The background color of the App Launcher page."""
 
-    client_id: str
+    custom_deny_url: Optional[str] = None
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
     """
 
-    client_secret: str
+    custom_non_identity_deny_url: Optional[str] = None
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
     """
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
 
-    token_url: str
-    """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
-    """
+    domain: Optional[str] = None
+    """The primary hostname and path secured by Access.
 
-    scopes: Optional[List[str]] = None
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    This domain will be displayed if the app is visible in the App Launcher.
     """
 
+    footer_links: Optional[List[AppLauncherApplicationFooterLink]] = None
+    """The links in the App Launcher footer."""
 
-AppLauncherApplicationSCIMConfigAuthentication = Union[
-    AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    AppLauncherApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
+    header_bg_color: Optional[str] = None
+    """The background color of the App Launcher header."""
 
+    landing_page_design: Optional[AppLauncherApplicationLandingPageDesign] = None
+    """The design of the App Launcher landing page shown to users when they log in."""
 
-class AppLauncherApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
+    name: Optional[str] = None
+    """The name of the application."""
 
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
+    policies: Optional[List[AppLauncherApplicationPolicy]] = None
 
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for this application will be valid.
 
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
+    """
 
-class AppLauncherApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+    skip_app_launcher_login_page: Optional[bool] = None
+    """Determines when to skip the App Launcher landing page."""
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
 
-    filter: Optional[str] = None
-    """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
-    """
+class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the policy"""
 
-    operations: Optional[AppLauncherApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+    approval_groups: Optional[List[ApprovalGroup]] = None
+    """Administrators who can approve a temporary authentication request."""
 
-    transform_jsonata: Optional[str] = None
+    approval_required: Optional[bool] = None
     """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    Requires the user to request access from an administrator at the start of each
+    session.
     """
 
+    created_at: Optional[datetime] = None
+
+    decision: Optional[Decision] = None
+    """The action Access will take if a user matches this policy.
 
-class AppLauncherApplicationSCIMConfig(BaseModel):
-    idp_uid: str
-    """
-    The UID of the IdP to use as the source for SCIM resources to provision to this
-    application.
+    Infrastructure application policies can only use the Allow action.
     """
 
-    remote_uri: str
-    """The base URI for the application's SCIM-compatible API."""
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
 
-    authentication: Optional[AppLauncherApplicationSCIMConfigAuthentication] = None
+    To match the policy, a user cannot meet any of the Exclude rules.
     """
-    Attributes for configuring HTTP Basic authentication scheme for SCIM
-    provisioning to an application.
+
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
+
+    A user needs to meet only one of the Include rules.
     """
 
-    deactivate_on_delete: Optional[bool] = None
+    isolation_required: Optional[bool] = None
     """
-    If false, propagates DELETE requests to the target application for SCIM
-    resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-    targets do not support DELETE operations.
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
     """
 
-    enabled: Optional[bool] = None
-    """Whether SCIM provisioning is turned on for this application."""
+    name: Optional[str] = None
+    """The name of the Access policy."""
 
-    mappings: Optional[List[AppLauncherApplicationSCIMConfigMapping]] = None
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
     """
-    A list of mappings to apply to SCIM resources before provisioning them in this
-    application. These can transform or filter the resources to be provisioned.
+
+    purpose_justification_prompt: Optional[str] = None
+    """A custom message that will appear on the purpose justification screen."""
+
+    purpose_justification_required: Optional[bool] = None
+    """Require users to enter a justification when they log in to the application."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
     """
 
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for the application will be valid.
 
-class AppLauncherApplication(BaseModel):
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
+    """
+
+    updated_at: Optional[datetime] = None
+
+
+class DeviceEnrollmentPermissionsApplication(BaseModel):
     type: ApplicationType
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
@@ -1630,37 +1818,41 @@ class AppLauncherApplication(BaseModel):
     You must specify only one identity provider in allowed_idps.
     """
 
-    created_at: Optional[datetime] = None
+    custom_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
+    """
+
+    custom_non_identity_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
+
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
 
     domain: Optional[str] = None
-    """The primary hostname and path that Access will secure.
+    """The primary hostname and path secured by Access.
 
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
+    This domain will be displayed if the app is visible in the App Launcher.
     """
 
     name: Optional[str] = None
     """The name of the application."""
 
-    policies: Optional[List[AppLauncherApplicationPolicy]] = None
-
-    scim_config: Optional[AppLauncherApplicationSCIMConfig] = None
-    """Configuration for provisioning to this application via SCIM.
-
-    This is currently in closed beta.
-    """
+    policies: Optional[List[DeviceEnrollmentPermissionsApplicationPolicy]] = None
 
     session_duration: Optional[str] = None
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
-    updated_at: Optional[datetime] = None
-
 
-class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
+class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
     id: Optional[str] = None
     """The UUID of the policy"""
 
@@ -1676,7 +1868,10 @@ class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -1700,6 +1895,12 @@ class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -1722,140 +1923,141 @@ class DeviceEnrollmentPermissionsApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
-
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
+class BrowserIsolationPermissionsApplication(BaseModel):
+    type: ApplicationType
+    """The application type."""
 
+    id: Optional[str] = None
+    """UUID."""
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
-    BaseModel
-):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
+    allowed_idps: Optional[List[AllowedIdPs]] = None
+    """The identity providers your users can select when connecting to this
+    application.
 
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    Defaults to all IdPs configured in your account.
+    """
 
+    aud: Optional[str] = None
+    """Audience tag."""
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+    auto_redirect_to_identity: Optional[bool] = None
+    """When set to `true`, users skip the identity provider selection step during
+    login.
 
-    client_id: str
-    """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    You must specify only one identity provider in allowed_idps.
     """
 
-    client_secret: str
+    custom_deny_url: Optional[str] = None
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
     """
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
-
-    token_url: str
+    custom_non_identity_deny_url: Optional[str] = None
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
     """
 
-    scopes: Optional[List[str]] = None
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
-    """
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
 
+    domain: Optional[str] = None
+    """The primary hostname and path secured by Access.
 
-DeviceEnrollmentPermissionsApplicationSCIMConfigAuthentication = Union[
-    DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    DeviceEnrollmentPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
 
+    name: Optional[str] = None
+    """The name of the application."""
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
+    policies: Optional[List[BrowserIsolationPermissionsApplicationPolicy]] = None
 
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for this application will be valid.
 
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
+    """
 
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+class GatewayIdentityProxyEndpointApplicationPolicy(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the policy"""
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
+    approval_groups: Optional[List[ApprovalGroup]] = None
+    """Administrators who can approve a temporary authentication request."""
 
-    filter: Optional[str] = None
+    approval_required: Optional[bool] = None
     """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
+    Requires the user to request access from an administrator at the start of each
+    session.
     """
 
-    operations: Optional[DeviceEnrollmentPermissionsApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+    created_at: Optional[datetime] = None
 
-    transform_jsonata: Optional[str] = None
-    """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    decision: Optional[Decision] = None
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
     """
 
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
 
-class DeviceEnrollmentPermissionsApplicationSCIMConfig(BaseModel):
-    idp_uid: str
-    """
-    The UID of the IdP to use as the source for SCIM resources to provision to this
-    application.
+    To match the policy, a user cannot meet any of the Exclude rules.
     """
 
-    remote_uri: str
-    """The base URI for the application's SCIM-compatible API."""
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
 
-    authentication: Optional[DeviceEnrollmentPermissionsApplicationSCIMConfigAuthentication] = None
-    """
-    Attributes for configuring HTTP Basic authentication scheme for SCIM
-    provisioning to an application.
+    A user needs to meet only one of the Include rules.
     """
 
-    deactivate_on_delete: Optional[bool] = None
+    isolation_required: Optional[bool] = None
     """
-    If false, propagates DELETE requests to the target application for SCIM
-    resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-    targets do not support DELETE operations.
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
     """
 
-    enabled: Optional[bool] = None
-    """Whether SCIM provisioning is turned on for this application."""
+    name: Optional[str] = None
+    """The name of the Access policy."""
+
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
 
-    mappings: Optional[List[DeviceEnrollmentPermissionsApplicationSCIMConfigMapping]] = None
+    Must be unique for each policy within an app.
     """
-    A list of mappings to apply to SCIM resources before provisioning them in this
-    application. These can transform or filter the resources to be provisioned.
+
+    purpose_justification_prompt: Optional[str] = None
+    """A custom message that will appear on the purpose justification screen."""
+
+    purpose_justification_required: Optional[bool] = None
+    """Require users to enter a justification when they log in to the application."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
+    """
+
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for the application will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
     """
 
+    updated_at: Optional[datetime] = None
+
 
-class DeviceEnrollmentPermissionsApplication(BaseModel):
+class GatewayIdentityProxyEndpointApplication(BaseModel):
     type: ApplicationType
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     allowed_idps: Optional[List[AllowedIdPs]] = None
     """The identity providers your users can select when connecting to this
@@ -1874,37 +2076,41 @@ class DeviceEnrollmentPermissionsApplication(BaseModel):
     You must specify only one identity provider in allowed_idps.
     """
 
-    created_at: Optional[datetime] = None
+    custom_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
+    """
 
-    domain: Optional[str] = None
-    """The primary hostname and path that Access will secure.
+    custom_non_identity_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
 
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
+
+    domain: Optional[str] = None
+    """
+    The proxy endpoint domain in the format: 10 alphanumeric characters followed by
+    .proxy.cloudflare-gateway.com
     """
 
     name: Optional[str] = None
     """The name of the application."""
 
-    policies: Optional[List[DeviceEnrollmentPermissionsApplicationPolicy]] = None
-
-    scim_config: Optional[DeviceEnrollmentPermissionsApplicationSCIMConfig] = None
-    """Configuration for provisioning to this application via SCIM.
-
-    This is currently in closed beta.
-    """
+    policies: Optional[List[GatewayIdentityProxyEndpointApplicationPolicy]] = None
 
     session_duration: Optional[str] = None
     """The amount of time that tokens issued for this application will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
     """
 
-    updated_at: Optional[datetime] = None
-
 
-class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
+class BookmarkApplicationPolicy(BaseModel):
     id: Optional[str] = None
     """The UUID of the policy"""
 
@@ -1920,7 +2126,10 @@ class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -1944,6 +2153,12 @@ class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
@@ -1966,282 +2181,346 @@ class BrowserIsolationPermissionsApplicationPolicy(BaseModel):
     updated_at: Optional[datetime] = None
 
 
-class BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
+class BookmarkApplication(BaseModel):
+    id: Optional[str] = None
+    """UUID."""
 
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    app_launcher_visible: Optional[bool] = None
+    """Displays the application in the App Launcher."""
 
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
+    aud: Optional[str] = None
+    """Audience tag."""
 
+    domain: Optional[str] = None
+    """The URL or domain of the bookmark."""
 
-class BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(
-    BaseModel
-):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
+    logo_url: Optional[str] = None
+    """The image URL for the logo shown in the App Launcher dashboard."""
 
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    name: Optional[str] = None
+    """The name of the application."""
 
+    policies: Optional[List[BookmarkApplicationPolicy]] = None
 
-class BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
+    tags: Optional[List[str]] = None
+    """The tags you want assigned to an application.
 
-    client_id: str
-    """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    client_secret: str
-    """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
-    """
+    type: Optional[ApplicationType] = None
+    """The application type."""
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
 
-    token_url: str
-    """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
-    """
+class InfrastructureApplicationTargetCriterion(BaseModel):
+    port: int
+    """The port that the targets use for the chosen communication protocol.
 
-    scopes: Optional[List[str]] = None
-    """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+    A port cannot be assigned to multiple protocols.
     """
 
+    protocol: Literal["SSH"]
+    """The communication protocol your application secures."""
 
-BrowserIsolationPermissionsApplicationSCIMConfigAuthentication = Union[
-    BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BrowserIsolationPermissionsApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
-
+    target_attributes: Dict[str, List[str]]
+    """Contains a map of target attribute keys to target attribute values."""
 
-class BrowserIsolationPermissionsApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
 
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
-
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+class InfrastructureApplicationPolicyConnectionRulesSSH(BaseModel):
+    """
+    The SSH-specific rules that define how users may connect to the targets secured by your application.
+    """
 
+    usernames: List[str]
+    """Contains the Unix usernames that may be used when connecting over SSH."""
 
-class BrowserIsolationPermissionsApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+    allow_email_alias: Optional[bool] = None
+    """Enables using Identity Provider email alias as SSH username."""
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
 
-    filter: Optional[str] = None
+class InfrastructureApplicationPolicyConnectionRules(BaseModel):
     """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
+    The rules that define how users may connect to the targets secured by your application.
     """
 
-    operations: Optional[BrowserIsolationPermissionsApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
-
-    transform_jsonata: Optional[str] = None
+    ssh: Optional[InfrastructureApplicationPolicyConnectionRulesSSH] = None
     """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    The SSH-specific rules that define how users may connect to the targets secured
+    by your application.
     """
 
 
-class BrowserIsolationPermissionsApplicationSCIMConfig(BaseModel):
-    idp_uid: str
+class InfrastructureApplicationPolicy(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the policy"""
+
+    connection_rules: Optional[InfrastructureApplicationPolicyConnectionRules] = None
     """
-    The UID of the IdP to use as the source for SCIM resources to provision to this
+    The rules that define how users may connect to the targets secured by your
     application.
     """
 
-    remote_uri: str
-    """The base URI for the application's SCIM-compatible API."""
+    created_at: Optional[datetime] = None
 
-    authentication: Optional[BrowserIsolationPermissionsApplicationSCIMConfigAuthentication] = None
-    """
-    Attributes for configuring HTTP Basic authentication scheme for SCIM
-    provisioning to an application.
-    """
+    decision: Optional[Decision] = None
+    """The action Access will take if a user matches this policy.
 
-    deactivate_on_delete: Optional[bool] = None
+    Infrastructure application policies can only use the Allow action.
     """
-    If false, propagates DELETE requests to the target application for SCIM
-    resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-    targets do not support DELETE operations.
+
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
+
+    To match the policy, a user cannot meet any of the Exclude rules.
     """
 
-    enabled: Optional[bool] = None
-    """Whether SCIM provisioning is turned on for this application."""
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
 
-    mappings: Optional[List[BrowserIsolationPermissionsApplicationSCIMConfigMapping]] = None
+    A user needs to meet only one of the Include rules.
     """
-    A list of mappings to apply to SCIM resources before provisioning them in this
-    application. These can transform or filter the resources to be provisioned.
+
+    name: Optional[str] = None
+    """The name of the Access policy."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
     """
 
+    updated_at: Optional[datetime] = None
+
+
+class InfrastructureApplication(BaseModel):
+    target_criteria: List[InfrastructureApplicationTargetCriterion]
 
-class BrowserIsolationPermissionsApplication(BaseModel):
     type: ApplicationType
     """The application type."""
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    allowed_idps: Optional[List[AllowedIdPs]] = None
-    """The identity providers your users can select when connecting to this
-    application.
+    aud: Optional[str] = None
+    """Audience tag."""
 
-    Defaults to all IdPs configured in your account.
+    name: Optional[str] = None
+    """The name of the application."""
+
+    policies: Optional[List[InfrastructureApplicationPolicy]] = None
+
+
+class BrowserRdpApplicationTargetCriterion(BaseModel):
+    port: int
+    """The port that the targets use for the chosen communication protocol.
+
+    A port cannot be assigned to multiple protocols.
     """
 
-    aud: Optional[str] = None
-    """Audience tag."""
+    protocol: Literal["RDP"]
+    """The communication protocol your application secures."""
 
-    auto_redirect_to_identity: Optional[bool] = None
-    """When set to `true`, users skip the identity provider selection step during
-    login.
+    target_attributes: Dict[str, List[str]]
+    """Contains a map of target attribute keys to target attribute values."""
 
-    You must specify only one identity provider in allowed_idps.
+
+class BrowserRdpApplicationDestinationPublicDestination(BaseModel):
+    """A public hostname that Access will secure.
+
+    Public destinations support sub-domain and path. Wildcard '*' can be used in the definition.
     """
 
-    created_at: Optional[datetime] = None
+    type: Optional[Literal["public"]] = None
 
-    domain: Optional[str] = None
-    """The primary hostname and path that Access will secure.
+    uri: Optional[str] = None
+    """The URI of the destination.
 
-    If the app is visible in the App Launcher dashboard, this is the domain that
-    will be displayed.
+    Public destinations' URIs can include a domain and path with
+    [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
     """
 
-    name: Optional[str] = None
-    """The name of the application."""
 
-    policies: Optional[List[BrowserIsolationPermissionsApplicationPolicy]] = None
+class BrowserRdpApplicationDestinationPrivateDestination(BaseModel):
+    cidr: Optional[str] = None
+    """The CIDR range of the destination. Single IPs will be computed as /32."""
 
-    scim_config: Optional[BrowserIsolationPermissionsApplicationSCIMConfig] = None
-    """Configuration for provisioning to this application via SCIM.
+    hostname: Optional[str] = None
+    """The hostname of the destination. Matches a valid SNI served by an HTTPS origin."""
 
-    This is currently in closed beta.
+    l4_protocol: Optional[Literal["tcp", "udp"]] = None
+    """The L4 protocol of the destination.
+
+    When omitted, both UDP and TCP traffic will match.
     """
 
-    session_duration: Optional[str] = None
-    """The amount of time that tokens issued for this application will be valid.
+    port_range: Optional[str] = None
+    """The port range of the destination.
 
-    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
-    ms, s, m, h.
+    Can be a single port or a range of ports. When omitted, all ports will match.
     """
 
-    updated_at: Optional[datetime] = None
+    type: Optional[Literal["private"]] = None
 
+    vnet_id: Optional[str] = None
+    """The VNET ID to match the destination. When omitted, all VNETs will match."""
 
-class BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic(BaseModel):
-    password: str
-    """Password used to authenticate with the remote SCIM service."""
 
-    scheme: Literal["httpbasic"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+class BrowserRdpApplicationDestinationViaMcpServerPortalDestination(BaseModel):
+    """A MCP server id configured in ai-controls.
 
-    user: str
-    """User name used to authenticate with the remote SCIM service."""
+    Access will secure the MCP server if accessed through a MCP portal.
+    """
 
+    mcp_server_id: Optional[str] = None
+    """The MCP server id configured in ai-controls."""
 
-class BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken(BaseModel):
-    token: str
-    """Token used to authenticate with the remote SCIM service."""
+    type: Optional[Literal["via_mcp_server_portal"]] = None
 
-    scheme: Literal["oauthbearertoken"]
-    """The authentication scheme to use when making SCIM requests to this application."""
 
+BrowserRdpApplicationDestination: TypeAlias = Union[
+    BrowserRdpApplicationDestinationPublicDestination,
+    BrowserRdpApplicationDestinationPrivateDestination,
+    BrowserRdpApplicationDestinationViaMcpServerPortalDestination,
+]
 
-class BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2(BaseModel):
-    authorization_url: str
-    """URL used to generate the auth code used during token generation."""
 
-    client_id: str
+class BrowserRdpApplicationPolicy(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the policy"""
+
+    approval_groups: Optional[List[ApprovalGroup]] = None
+    """Administrators who can approve a temporary authentication request."""
+
+    approval_required: Optional[bool] = None
     """
-    Client ID used to authenticate when generating a token for authenticating with
-    the remote SCIM service.
+    Requires the user to request access from an administrator at the start of each
+    session.
     """
 
-    client_secret: str
+    created_at: Optional[datetime] = None
+
+    decision: Optional[Decision] = None
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
     """
-    Secret used to authenticate when generating a token for authenticating with the
-    remove SCIM service.
+
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
+
+    To match the policy, a user cannot meet any of the Exclude rules.
     """
 
-    scheme: Literal["oauth2"]
-    """The authentication scheme to use when making SCIM requests to this application."""
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
 
-    token_url: str
+    A user needs to meet only one of the Include rules.
     """
-    URL used to generate the token used to authenticate with the remote SCIM
-    service.
+
+    isolation_required: Optional[bool] = None
+    """
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
     """
 
-    scopes: Optional[List[str]] = None
+    name: Optional[str] = None
+    """The name of the Access policy."""
+
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
     """
-    The authorization scopes to request when generating the token used to
-    authenticate with the remove SCIM service.
+
+    purpose_justification_prompt: Optional[str] = None
+    """A custom message that will appear on the purpose justification screen."""
+
+    purpose_justification_required: Optional[bool] = None
+    """Require users to enter a justification when they log in to the application."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
     """
 
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for the application will be valid.
 
-BookmarkApplicationSCIMConfigAuthentication = Union[
-    BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationHTTPBasic,
-    BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOAuthBearerToken,
-    BookmarkApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationOauth2,
-]
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
+    """
 
+    updated_at: Optional[datetime] = None
 
-class BookmarkApplicationSCIMConfigMappingOperations(BaseModel):
-    create: Optional[bool] = None
-    """Whether or not this mapping applies to create (POST) operations."""
 
-    delete: Optional[bool] = None
-    """Whether or not this mapping applies to DELETE operations."""
+class BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(BaseModel):
+    """
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
+    """
 
-    update: Optional[bool] = None
-    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+    client_id: str
+    """
+    Client ID of the Access service token used to authenticate with the remote
+    service.
+    """
 
+    client_secret: str
+    """
+    Client secret of the Access service token used to authenticate with the remote
+    service.
+    """
 
-class BookmarkApplicationSCIMConfigMapping(BaseModel):
-    schema_: str = FieldInfo(alias="schema")
-    """Which SCIM resource type this mapping applies to."""
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
 
-    enabled: Optional[bool] = None
-    """Whether or not this mapping is enabled."""
 
-    filter: Optional[str] = None
+class BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken(
+    BaseModel
+):
     """
-    A
-    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-    that matches resources that should be provisioned to this application.
+    Attributes for configuring Access Service Token authentication scheme for SCIM provisioning to an application.
     """
 
-    operations: Optional[BookmarkApplicationSCIMConfigMappingOperations] = None
-    """Whether or not this mapping applies to creates, updates, or deletes."""
+    client_id: str
+    """
+    Client ID of the Access service token used to authenticate with the remote
+    service.
+    """
 
-    transform_jsonata: Optional[str] = None
+    client_secret: str
     """
-    A [JSONata](https://jsonata.org/) expression that transforms the resource before
-    provisioning it in the application.
+    Client secret of the Access service token used to authenticate with the remote
+    service.
     """
 
+    scheme: Literal["access_service_token"]
+    """The authentication scheme to use when making SCIM requests to this application."""
+
+
+BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+]
+
+BrowserRdpApplicationSCIMConfigAuthentication: TypeAlias = Union[
+    SCIMConfigAuthenticationHTTPBasic,
+    SCIMConfigAuthenticationOAuthBearerToken,
+    SCIMConfigAuthenticationOauth2,
+    BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigAuthenticationAccessServiceToken,
+    List[BrowserRdpApplicationSCIMConfigAuthenticationAccessSCIMConfigMultiAuthentication],
+]
+
+
+class BrowserRdpApplicationSCIMConfig(BaseModel):
+    """Configuration for provisioning to this application via SCIM.
+
+    This is currently in closed beta.
+    """
 
-class BookmarkApplicationSCIMConfig(BaseModel):
     idp_uid: str
     """
     The UID of the IdP to use as the source for SCIM resources to provision to this
@@ -2251,7 +2530,7 @@ class BookmarkApplicationSCIMConfig(BaseModel):
     remote_uri: str
     """The base URI for the application's SCIM-compatible API."""
 
-    authentication: Optional[BookmarkApplicationSCIMConfigAuthentication] = None
+    authentication: Optional[BrowserRdpApplicationSCIMConfigAuthentication] = None
     """
     Attributes for configuring HTTP Basic authentication scheme for SCIM
     provisioning to an application.
@@ -2267,16 +2546,45 @@ class BookmarkApplicationSCIMConfig(BaseModel):
     enabled: Optional[bool] = None
     """Whether SCIM provisioning is turned on for this application."""
 
-    mappings: Optional[List[BookmarkApplicationSCIMConfigMapping]] = None
+    mappings: Optional[List[SCIMConfigMapping]] = None
     """
     A list of mappings to apply to SCIM resources before provisioning them in this
     application. These can transform or filter the resources to be provisioned.
     """
 
 
-class BookmarkApplication(BaseModel):
+class BrowserRdpApplication(BaseModel):
+    domain: str
+    """The primary hostname and path secured by Access.
+
+    This domain will be displayed if the app is visible in the App Launcher.
+    """
+
+    target_criteria: List[BrowserRdpApplicationTargetCriterion]
+
+    type: ApplicationType
+    """The application type."""
+
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
+
+    allow_authenticate_via_warp: Optional[bool] = None
+    """
+    When set to true, users can authenticate to this application using their WARP
+    session. When set to false this application will always require direct IdP
+    authentication. This setting always overrides the organization setting for WARP
+    authentication.
+    """
+
+    allow_iframe: Optional[bool] = None
+    """Enables loading application content in an iFrame."""
+
+    allowed_idps: Optional[List[AllowedIdPs]] = None
+    """The identity providers your users can select when connecting to this
+    application.
+
+    Defaults to all IdPs configured in your account.
+    """
 
     app_launcher_visible: Optional[bool] = None
     """Displays the application in the App Launcher."""
@@ -2284,10 +2592,55 @@ class BookmarkApplication(BaseModel):
     aud: Optional[str] = None
     """Audience tag."""
 
-    created_at: Optional[datetime] = None
+    auto_redirect_to_identity: Optional[bool] = None
+    """When set to `true`, users skip the identity provider selection step during
+    login.
 
-    domain: Optional[str] = None
-    """The URL or domain of the bookmark."""
+    You must specify only one identity provider in allowed_idps.
+    """
+
+    cors_headers: Optional[CORSHeaders] = None
+
+    custom_deny_message: Optional[str] = None
+    """
+    The custom error message shown to a user when they are denied access to the
+    application.
+    """
+
+    custom_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing identity-based rules.
+    """
+
+    custom_non_identity_deny_url: Optional[str] = None
+    """
+    The custom URL a user is redirected to when they are denied access to the
+    application when failing non-identity rules.
+    """
+
+    custom_pages: Optional[List[str]] = None
+    """The custom pages that will be displayed when applicable for this application"""
+
+    destinations: Optional[List[BrowserRdpApplicationDestination]] = None
+    """List of destinations secured by Access.
+
+    This supersedes `self_hosted_domains` to allow for more flexibility in defining
+    different types of domains. If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
+    enable_binding_cookie: Optional[bool] = None
+    """
+    Enables the binding cookie, which increases security against compromised
+    authorization tokens and CSRF attacks.
+    """
+
+    http_only_cookie_attribute: Optional[bool] = None
+    """
+    Enables the HttpOnly cookie attribute, which increases security against XSS
+    attacks.
+    """
 
     logo_url: Optional[str] = None
     """The image URL for the logo shown in the App Launcher dashboard."""
@@ -2295,31 +2648,89 @@ class BookmarkApplication(BaseModel):
     name: Optional[str] = None
     """The name of the application."""
 
-    scim_config: Optional[BookmarkApplicationSCIMConfig] = None
+    options_preflight_bypass: Optional[bool] = None
+    """
+    Allows options preflight requests to bypass Access authentication and go
+    directly to the origin. Cannot turn on if cors_headers is set.
+    """
+
+    path_cookie_attribute: Optional[bool] = None
+    """Enables cookie paths to scope an application's JWT to the application path.
+
+    If disabled, the JWT will scope to the hostname by default
+    """
+
+    policies: Optional[List[BrowserRdpApplicationPolicy]] = None
+
+    read_service_tokens_from_header: Optional[str] = None
+    """
+    Allows matching Access Service Tokens passed HTTP in a single header with this
+    name. This works as an alternative to the (CF-Access-Client-Id,
+    CF-Access-Client-Secret) pair of headers. The header value will be interpreted
+    as a json object similar to: { "cf-access-client-id":
+    "88bf3b6d86161464f6509f7219099e57.access.example.com",
+    "cf-access-client-secret":
+    "bdd31cbc4dec990953e39163fbbb194c93313ca9f0a6e420346af9d326b1d2a5" }
+    """
+
+    same_site_cookie_attribute: Optional[str] = None
+    """
+    Sets the SameSite cookie setting, which provides increased security against CSRF
+    attacks.
+    """
+
+    scim_config: Optional[BrowserRdpApplicationSCIMConfig] = None
     """Configuration for provisioning to this application via SCIM.
 
     This is currently in closed beta.
     """
 
+    self_hosted_domains: Optional[List[SelfHostedDomains]] = None
+    """List of public domains that Access will secure.
+
+    This field is deprecated in favor of `destinations` and will be supported until
+    **November 21, 2025.** If `destinations` are provided, then
+    `self_hosted_domains` will be ignored.
+    """
+
+    service_auth_401_redirect: Optional[bool] = None
+    """Returns a 401 status code when the request is blocked by a Service Auth policy."""
+
+    session_duration: Optional[str] = None
+    """The amount of time that tokens issued for this application will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note: unsupported for infrastructure type applications.
+    """
+
+    skip_interstitial: Optional[bool] = None
+    """Enables automatic authentication through cloudflared."""
+
     tags: Optional[List[str]] = None
     """The tags you want assigned to an application.
 
     Tags are used to filter applications in the App Launcher dashboard.
     """
 
-    type: Optional[str] = None
-    """The application type."""
-
-    updated_at: Optional[datetime] = None
+    use_clientless_isolation_app_launcher_url: Optional[bool] = None
+    """
+    Determines if users can access this application via a clientless browser
+    isolation URL. This allows users to access private domains without connecting to
+    Gateway. The option requires Clientless Browser Isolation to be set up with
+    policies that allow users of this application.
+    """
 
 
-ApplicationUpdateResponse = Union[
+ApplicationUpdateResponse: TypeAlias = Union[
     SelfHostedApplication,
     SaaSApplication,
     BrowserSSHApplication,
-    BrowserVncApplication,
+    BrowserVNCApplication,
     AppLauncherApplication,
     DeviceEnrollmentPermissionsApplication,
     BrowserIsolationPermissionsApplication,
+    GatewayIdentityProxyEndpointApplication,
     BookmarkApplication,
+    InfrastructureApplication,
+    BrowserRdpApplication,
 ]
diff --git a/src/cloudflare/types/zero_trust/access/applications/__init__.py b/src/cloudflare/types/zero_trust/access/applications/__init__.py
index 206ec39071b..c8f697ba765 100644
--- a/src/cloudflare/types/zero_trust/access/applications/__init__.py
+++ b/src/cloudflare/types/zero_trust/access/applications/__init__.py
@@ -3,17 +3,62 @@
 from __future__ import annotations
 
 from .ca import CA as CA
-from .approval_group import ApprovalGroup as ApprovalGroup
-from .ca_get_response import CAGetResponse as CAGetResponse
-from .ca_create_response import CACreateResponse as CACreateResponse
+from .ip_rule import IPRule as IPRule
+from .email_rule import EmailRule as EmailRule
+from .group_rule import GroupRule as GroupRule
+from .access_rule import AccessRule as AccessRule
+from .domain_rule import DomainRule as DomainRule
+from .country_rule import CountryRule as CountryRule
+from .ip_list_rule import IPListRule as IPListRule
+from .everyone_rule import EveryoneRule as EveryoneRule
+from .ip_rule_param import IPRuleParam as IPRuleParam
+from .ca_list_params import CAListParams as CAListParams
+from .email_list_rule import EmailListRule as EmailListRule
+from .okta_group_rule import OktaGroupRule as OktaGroupRule
+from .saml_group_rule import SAMLGroupRule as SAMLGroupRule
+from .azure_group_rule import AzureGroupRule as AzureGroupRule
+from .certificate_rule import CertificateRule as CertificateRule
+from .email_rule_param import EmailRuleParam as EmailRuleParam
+from .group_rule_param import GroupRuleParam as GroupRuleParam
+from .access_rule_param import AccessRuleParam as AccessRuleParam
+from .domain_rule_param import DomainRuleParam as DomainRuleParam
+from .gsuite_group_rule import GSuiteGroupRule as GSuiteGroupRule
 from .ca_delete_response import CADeleteResponse as CADeleteResponse
+from .country_rule_param import CountryRuleParam as CountryRuleParam
+from .ip_list_rule_param import IPListRuleParam as IPListRuleParam
+from .policy_list_params import PolicyListParams as PolicyListParams
+from .service_token_rule import ServiceTokenRule as ServiceTokenRule
+from .everyone_rule_param import EveryoneRuleParam as EveryoneRuleParam
 from .policy_get_response import PolicyGetResponse as PolicyGetResponse
-from .approval_group_param import ApprovalGroupParam as ApprovalGroupParam
+from .setting_edit_params import SettingEditParams as SettingEditParams
 from .policy_create_params import PolicyCreateParams as PolicyCreateParams
 from .policy_list_response import PolicyListResponse as PolicyListResponse
 from .policy_update_params import PolicyUpdateParams as PolicyUpdateParams
+from .email_list_rule_param import EmailListRuleParam as EmailListRuleParam
+from .okta_group_rule_param import OktaGroupRuleParam as OktaGroupRuleParam
+from .saml_group_rule_param import SAMLGroupRuleParam as SAMLGroupRuleParam
+from .setting_edit_response import SettingEditResponse as SettingEditResponse
+from .setting_update_params import SettingUpdateParams as SettingUpdateParams
 from .user_policy_check_geo import UserPolicyCheckGeo as UserPolicyCheckGeo
+from .azure_group_rule_param import AzureGroupRuleParam as AzureGroupRuleParam
+from .certificate_rule_param import CertificateRuleParam as CertificateRuleParam
 from .policy_create_response import PolicyCreateResponse as PolicyCreateResponse
 from .policy_delete_response import PolicyDeleteResponse as PolicyDeleteResponse
 from .policy_update_response import PolicyUpdateResponse as PolicyUpdateResponse
+from .gsuite_group_rule_param import GSuiteGroupRuleParam as GSuiteGroupRuleParam
+from .setting_update_response import SettingUpdateResponse as SettingUpdateResponse
+from .external_evaluation_rule import ExternalEvaluationRule as ExternalEvaluationRule
+from .github_organization_rule import GitHubOrganizationRule as GitHubOrganizationRule
+from .policy_test_get_response import PolicyTestGetResponse as PolicyTestGetResponse
+from .service_token_rule_param import ServiceTokenRuleParam as ServiceTokenRuleParam
+from .policy_test_create_params import PolicyTestCreateParams as PolicyTestCreateParams
+from .access_device_posture_rule import AccessDevicePostureRule as AccessDevicePostureRule
+from .authentication_method_rule import AuthenticationMethodRule as AuthenticationMethodRule
+from .policy_test_create_response import PolicyTestCreateResponse as PolicyTestCreateResponse
+from .any_valid_service_token_rule import AnyValidServiceTokenRule as AnyValidServiceTokenRule
+from .external_evaluation_rule_param import ExternalEvaluationRuleParam as ExternalEvaluationRuleParam
+from .github_organization_rule_param import GitHubOrganizationRuleParam as GitHubOrganizationRuleParam
 from .user_policy_check_list_response import UserPolicyCheckListResponse as UserPolicyCheckListResponse
+from .access_device_posture_rule_param import AccessDevicePostureRuleParam as AccessDevicePostureRuleParam
+from .authentication_method_rule_param import AuthenticationMethodRuleParam as AuthenticationMethodRuleParam
+from .any_valid_service_token_rule_param import AnyValidServiceTokenRuleParam as AnyValidServiceTokenRuleParam
diff --git a/src/cloudflare/types/zero_trust/access_device_posture_rule.py b/src/cloudflare/types/zero_trust/access/applications/access_device_posture_rule.py
similarity index 77%
rename from src/cloudflare/types/zero_trust/access_device_posture_rule.py
rename to src/cloudflare/types/zero_trust/access/applications/access_device_posture_rule.py
index 52525a17f74..e69b4d29037 100644
--- a/src/cloudflare/types/zero_trust/access_device_posture_rule.py
+++ b/src/cloudflare/types/zero_trust/access/applications/access_device_posture_rule.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
-from ..._models import BaseModel
+from ....._models import BaseModel
 
 __all__ = ["AccessDevicePostureRule", "DevicePosture"]
 
@@ -12,4 +11,6 @@ class DevicePosture(BaseModel):
 
 
 class AccessDevicePostureRule(BaseModel):
+    """Enforces a device posture rule has run successfully"""
+
     device_posture: DevicePosture
diff --git a/src/cloudflare/types/zero_trust/access_device_posture_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/access_device_posture_rule_param.py
similarity index 88%
rename from src/cloudflare/types/zero_trust/access_device_posture_rule_param.py
rename to src/cloudflare/types/zero_trust/access/applications/access_device_posture_rule_param.py
index d67cc39b2c3..6f0621584f7 100644
--- a/src/cloudflare/types/zero_trust/access_device_posture_rule_param.py
+++ b/src/cloudflare/types/zero_trust/access/applications/access_device_posture_rule_param.py
@@ -13,4 +13,6 @@ class DevicePosture(TypedDict, total=False):
 
 
 class AccessDevicePostureRuleParam(TypedDict, total=False):
+    """Enforces a device posture rule has run successfully"""
+
     device_posture: Required[DevicePosture]
diff --git a/src/cloudflare/types/zero_trust/access/applications/access_rule.py b/src/cloudflare/types/zero_trust/access/applications/access_rule.py
new file mode 100644
index 00000000000..67f2997529e
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/access_rule.py
@@ -0,0 +1,142 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Union
+from typing_extensions import TypeAlias
+
+from .ip_rule import IPRule
+from .email_rule import EmailRule
+from .group_rule import GroupRule
+from ....._models import BaseModel
+from .domain_rule import DomainRule
+from .country_rule import CountryRule
+from .ip_list_rule import IPListRule
+from .everyone_rule import EveryoneRule
+from .email_list_rule import EmailListRule
+from .okta_group_rule import OktaGroupRule
+from .saml_group_rule import SAMLGroupRule
+from .azure_group_rule import AzureGroupRule
+from .certificate_rule import CertificateRule
+from .gsuite_group_rule import GSuiteGroupRule
+from .service_token_rule import ServiceTokenRule
+from .external_evaluation_rule import ExternalEvaluationRule
+from .github_organization_rule import GitHubOrganizationRule
+from .access_device_posture_rule import AccessDevicePostureRule
+from .authentication_method_rule import AuthenticationMethodRule
+from .any_valid_service_token_rule import AnyValidServiceTokenRule
+
+__all__ = [
+    "AccessRule",
+    "AccessAuthContextRule",
+    "AccessAuthContextRuleAuthContext",
+    "AccessCommonNameRule",
+    "AccessCommonNameRuleCommonName",
+    "AccessLoginMethodRule",
+    "AccessLoginMethodRuleLoginMethod",
+    "AccessOIDCClaimRule",
+    "AccessOIDCClaimRuleOIDC",
+    "AccessLinkedAppTokenRule",
+    "AccessLinkedAppTokenRuleLinkedAppToken",
+]
+
+
+class AccessAuthContextRuleAuthContext(BaseModel):
+    id: str
+    """The ID of an Authentication context."""
+
+    ac_id: str
+    """The ACID of an Authentication context."""
+
+    identity_provider_id: str
+    """The ID of your Azure identity provider."""
+
+
+class AccessAuthContextRule(BaseModel):
+    """
+    Matches an Azure Authentication Context.
+    Requires an Azure identity provider.
+    """
+
+    auth_context: AccessAuthContextRuleAuthContext
+
+
+class AccessCommonNameRuleCommonName(BaseModel):
+    common_name: str
+    """The common name to match."""
+
+
+class AccessCommonNameRule(BaseModel):
+    """Matches a specific common name."""
+
+    common_name: AccessCommonNameRuleCommonName
+
+
+class AccessLoginMethodRuleLoginMethod(BaseModel):
+    id: str
+    """The ID of an identity provider."""
+
+
+class AccessLoginMethodRule(BaseModel):
+    """Matches a specific identity provider id."""
+
+    login_method: AccessLoginMethodRuleLoginMethod
+
+
+class AccessOIDCClaimRuleOIDC(BaseModel):
+    claim_name: str
+    """The name of the OIDC claim."""
+
+    claim_value: str
+    """The OIDC claim value to look for."""
+
+    identity_provider_id: str
+    """The ID of your OIDC identity provider."""
+
+
+class AccessOIDCClaimRule(BaseModel):
+    """
+    Matches an OIDC claim.
+    Requires an OIDC identity provider.
+    """
+
+    oidc: AccessOIDCClaimRuleOIDC
+
+
+class AccessLinkedAppTokenRuleLinkedAppToken(BaseModel):
+    app_uid: str
+    """The ID of an Access OIDC SaaS application"""
+
+
+class AccessLinkedAppTokenRule(BaseModel):
+    """
+    Matches OAuth 2.0 access tokens issued by the specified Access OIDC SaaS application. Only compatible with non_identity and bypass decisions.
+    """
+
+    linked_app_token: AccessLinkedAppTokenRuleLinkedAppToken
+
+
+AccessRule: TypeAlias = Union[
+    GroupRule,
+    AnyValidServiceTokenRule,
+    AccessAuthContextRule,
+    AuthenticationMethodRule,
+    AzureGroupRule,
+    CertificateRule,
+    AccessCommonNameRule,
+    CountryRule,
+    AccessDevicePostureRule,
+    DomainRule,
+    EmailListRule,
+    EmailRule,
+    EveryoneRule,
+    ExternalEvaluationRule,
+    GitHubOrganizationRule,
+    GSuiteGroupRule,
+    AccessLoginMethodRule,
+    IPListRule,
+    IPRule,
+    OktaGroupRule,
+    SAMLGroupRule,
+    AccessOIDCClaimRule,
+    ServiceTokenRule,
+    AccessLinkedAppTokenRule,
+]
diff --git a/src/cloudflare/types/zero_trust/access/applications/access_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/access_rule_param.py
new file mode 100644
index 00000000000..ce3a266fe9f
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/access_rule_param.py
@@ -0,0 +1,143 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from typing_extensions import Required, TypeAlias, TypedDict
+
+from .ip_rule_param import IPRuleParam
+from .email_rule_param import EmailRuleParam
+from .group_rule_param import GroupRuleParam
+from .domain_rule_param import DomainRuleParam
+from .country_rule_param import CountryRuleParam
+from .ip_list_rule_param import IPListRuleParam
+from .everyone_rule_param import EveryoneRuleParam
+from .email_list_rule_param import EmailListRuleParam
+from .okta_group_rule_param import OktaGroupRuleParam
+from .saml_group_rule_param import SAMLGroupRuleParam
+from .azure_group_rule_param import AzureGroupRuleParam
+from .certificate_rule_param import CertificateRuleParam
+from .gsuite_group_rule_param import GSuiteGroupRuleParam
+from .service_token_rule_param import ServiceTokenRuleParam
+from .external_evaluation_rule_param import ExternalEvaluationRuleParam
+from .github_organization_rule_param import GitHubOrganizationRuleParam
+from .access_device_posture_rule_param import AccessDevicePostureRuleParam
+from .authentication_method_rule_param import AuthenticationMethodRuleParam
+from .any_valid_service_token_rule_param import AnyValidServiceTokenRuleParam
+
+__all__ = [
+    "AccessRuleParam",
+    "AccessAuthContextRule",
+    "AccessAuthContextRuleAuthContext",
+    "AccessCommonNameRule",
+    "AccessCommonNameRuleCommonName",
+    "AccessLoginMethodRule",
+    "AccessLoginMethodRuleLoginMethod",
+    "AccessOIDCClaimRule",
+    "AccessOIDCClaimRuleOIDC",
+    "AccessLinkedAppTokenRule",
+    "AccessLinkedAppTokenRuleLinkedAppToken",
+]
+
+
+class AccessAuthContextRuleAuthContext(TypedDict, total=False):
+    id: Required[str]
+    """The ID of an Authentication context."""
+
+    ac_id: Required[str]
+    """The ACID of an Authentication context."""
+
+    identity_provider_id: Required[str]
+    """The ID of your Azure identity provider."""
+
+
+class AccessAuthContextRule(TypedDict, total=False):
+    """
+    Matches an Azure Authentication Context.
+    Requires an Azure identity provider.
+    """
+
+    auth_context: Required[AccessAuthContextRuleAuthContext]
+
+
+class AccessCommonNameRuleCommonName(TypedDict, total=False):
+    common_name: Required[str]
+    """The common name to match."""
+
+
+class AccessCommonNameRule(TypedDict, total=False):
+    """Matches a specific common name."""
+
+    common_name: Required[AccessCommonNameRuleCommonName]
+
+
+class AccessLoginMethodRuleLoginMethod(TypedDict, total=False):
+    id: Required[str]
+    """The ID of an identity provider."""
+
+
+class AccessLoginMethodRule(TypedDict, total=False):
+    """Matches a specific identity provider id."""
+
+    login_method: Required[AccessLoginMethodRuleLoginMethod]
+
+
+class AccessOIDCClaimRuleOIDC(TypedDict, total=False):
+    claim_name: Required[str]
+    """The name of the OIDC claim."""
+
+    claim_value: Required[str]
+    """The OIDC claim value to look for."""
+
+    identity_provider_id: Required[str]
+    """The ID of your OIDC identity provider."""
+
+
+class AccessOIDCClaimRule(TypedDict, total=False):
+    """
+    Matches an OIDC claim.
+    Requires an OIDC identity provider.
+    """
+
+    oidc: Required[AccessOIDCClaimRuleOIDC]
+
+
+class AccessLinkedAppTokenRuleLinkedAppToken(TypedDict, total=False):
+    app_uid: Required[str]
+    """The ID of an Access OIDC SaaS application"""
+
+
+class AccessLinkedAppTokenRule(TypedDict, total=False):
+    """
+    Matches OAuth 2.0 access tokens issued by the specified Access OIDC SaaS application. Only compatible with non_identity and bypass decisions.
+    """
+
+    linked_app_token: Required[AccessLinkedAppTokenRuleLinkedAppToken]
+
+
+AccessRuleParam: TypeAlias = Union[
+    GroupRuleParam,
+    AnyValidServiceTokenRuleParam,
+    AccessAuthContextRule,
+    AuthenticationMethodRuleParam,
+    AzureGroupRuleParam,
+    CertificateRuleParam,
+    AccessCommonNameRule,
+    CountryRuleParam,
+    AccessDevicePostureRuleParam,
+    DomainRuleParam,
+    EmailListRuleParam,
+    EmailRuleParam,
+    EveryoneRuleParam,
+    ExternalEvaluationRuleParam,
+    GitHubOrganizationRuleParam,
+    GSuiteGroupRuleParam,
+    AccessLoginMethodRule,
+    IPListRuleParam,
+    IPRuleParam,
+    OktaGroupRuleParam,
+    SAMLGroupRuleParam,
+    AccessOIDCClaimRule,
+    ServiceTokenRuleParam,
+    AccessLinkedAppTokenRule,
+]
diff --git a/src/cloudflare/types/zero_trust/access/applications/any_valid_service_token_rule.py b/src/cloudflare/types/zero_trust/access/applications/any_valid_service_token_rule.py
new file mode 100644
index 00000000000..9d8321f263f
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/any_valid_service_token_rule.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ....._models import BaseModel
+
+__all__ = ["AnyValidServiceTokenRule", "AnyValidServiceToken"]
+
+
+class AnyValidServiceToken(BaseModel):
+    """An empty object which matches on all service tokens."""
+
+    pass
+
+
+class AnyValidServiceTokenRule(BaseModel):
+    """Matches any valid Access Service Token"""
+
+    any_valid_service_token: AnyValidServiceToken
+    """An empty object which matches on all service tokens."""
diff --git a/src/cloudflare/types/zero_trust/access/applications/any_valid_service_token_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/any_valid_service_token_rule_param.py
new file mode 100644
index 00000000000..251f33bc960
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/any_valid_service_token_rule_param.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["AnyValidServiceTokenRuleParam", "AnyValidServiceToken"]
+
+
+class AnyValidServiceToken(TypedDict, total=False):
+    """An empty object which matches on all service tokens."""
+
+    pass
+
+
+class AnyValidServiceTokenRuleParam(TypedDict, total=False):
+    """Matches any valid Access Service Token"""
+
+    any_valid_service_token: Required[AnyValidServiceToken]
+    """An empty object which matches on all service tokens."""
diff --git a/src/cloudflare/types/zero_trust/access/applications/approval_group_param.py b/src/cloudflare/types/zero_trust/access/applications/approval_group_param.py
deleted file mode 100644
index 8428aad8822..00000000000
--- a/src/cloudflare/types/zero_trust/access/applications/approval_group_param.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import List
-from typing_extensions import Required, TypedDict
-
-__all__ = ["ApprovalGroupParam"]
-
-
-class ApprovalGroupParam(TypedDict, total=False):
-    approvals_needed: Required[float]
-    """The number of approvals needed to obtain access."""
-
-    email_addresses: List[str]
-    """A list of emails that can approve the access request."""
-
-    email_list_uuid: str
-    """The UUID of an re-usable email list."""
diff --git a/src/cloudflare/types/zero_trust/access/applications/authentication_method_rule.py b/src/cloudflare/types/zero_trust/access/applications/authentication_method_rule.py
new file mode 100644
index 00000000000..47d9cf34119
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/authentication_method_rule.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ....._models import BaseModel
+
+__all__ = ["AuthenticationMethodRule", "AuthMethod"]
+
+
+class AuthMethod(BaseModel):
+    auth_method: str
+    """
+    The type of authentication method
+    https://datatracker.ietf.org/doc/html/rfc8176#section-2.
+    """
+
+
+class AuthenticationMethodRule(BaseModel):
+    """Enforce different MFA options"""
+
+    auth_method: AuthMethod
diff --git a/src/cloudflare/types/zero_trust/authentication_method_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/authentication_method_rule_param.py
similarity index 75%
rename from src/cloudflare/types/zero_trust/authentication_method_rule_param.py
rename to src/cloudflare/types/zero_trust/access/applications/authentication_method_rule_param.py
index 369c85cbe30..b1400b7c2c0 100644
--- a/src/cloudflare/types/zero_trust/authentication_method_rule_param.py
+++ b/src/cloudflare/types/zero_trust/access/applications/authentication_method_rule_param.py
@@ -10,9 +10,12 @@
 class AuthMethod(TypedDict, total=False):
     auth_method: Required[str]
     """
-    The type of authentication method https://datatracker.ietf.org/doc/html/rfc8176.
+    The type of authentication method
+    https://datatracker.ietf.org/doc/html/rfc8176#section-2.
     """
 
 
 class AuthenticationMethodRuleParam(TypedDict, total=False):
+    """Enforce different MFA options"""
+
     auth_method: Required[AuthMethod]
diff --git a/src/cloudflare/types/zero_trust/access/applications/azure_group_rule.py b/src/cloudflare/types/zero_trust/access/applications/azure_group_rule.py
new file mode 100644
index 00000000000..9d8751ad019
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/azure_group_rule.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = ["AzureGroupRule", "AzureAD"]
+
+
+class AzureAD(BaseModel):
+    id: str
+    """The ID of an Azure group."""
+
+    identity_provider_id: str
+    """The ID of your Azure identity provider."""
+
+
+class AzureGroupRule(BaseModel):
+    """
+    Matches an Azure group.
+    Requires an Azure identity provider.
+    """
+
+    azure_ad: AzureAD = FieldInfo(alias="azureAD")
diff --git a/src/cloudflare/types/zero_trust/azure_group_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/azure_group_rule_param.py
similarity index 75%
rename from src/cloudflare/types/zero_trust/azure_group_rule_param.py
rename to src/cloudflare/types/zero_trust/access/applications/azure_group_rule_param.py
index 93a64fab94e..3d57bc654f6 100644
--- a/src/cloudflare/types/zero_trust/azure_group_rule_param.py
+++ b/src/cloudflare/types/zero_trust/access/applications/azure_group_rule_param.py
@@ -4,7 +4,7 @@
 
 from typing_extensions import Required, Annotated, TypedDict
 
-from ..._utils import PropertyInfo
+from ....._utils import PropertyInfo
 
 __all__ = ["AzureGroupRuleParam", "AzureAD"]
 
@@ -13,9 +13,14 @@ class AzureAD(TypedDict, total=False):
     id: Required[str]
     """The ID of an Azure group."""
 
-    connection_id: Required[str]
+    identity_provider_id: Required[str]
     """The ID of your Azure identity provider."""
 
 
 class AzureGroupRuleParam(TypedDict, total=False):
+    """
+    Matches an Azure group.
+    Requires an Azure identity provider.
+    """
+
     azure_ad: Required[Annotated[AzureAD, PropertyInfo(alias="azureAD")]]
diff --git a/src/cloudflare/types/zero_trust/access/applications/ca_create_response.py b/src/cloudflare/types/zero_trust/access/applications/ca_create_response.py
deleted file mode 100644
index c0a4d7af889..00000000000
--- a/src/cloudflare/types/zero_trust/access/applications/ca_create_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["CACreateResponse"]
-
-CACreateResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/zero_trust/access/applications/ca_get_response.py b/src/cloudflare/types/zero_trust/access/applications/ca_get_response.py
deleted file mode 100644
index 8a2b05ffa92..00000000000
--- a/src/cloudflare/types/zero_trust/access/applications/ca_get_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["CAGetResponse"]
-
-CAGetResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/zero_trust/access/applications/ca_list_params.py b/src/cloudflare/types/zero_trust/access/applications/ca_list_params.py
new file mode 100644
index 00000000000..5a3a7a3541a
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/ca_list_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import TypedDict
+
+__all__ = ["CAListParams"]
+
+
+class CAListParams(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    page: int
+    """Page number of results."""
+
+    per_page: int
+    """Number of results per page."""
diff --git a/src/cloudflare/types/zero_trust/access/applications/certificate_rule.py b/src/cloudflare/types/zero_trust/access/applications/certificate_rule.py
new file mode 100644
index 00000000000..5cc4c633848
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/certificate_rule.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ....._models import BaseModel
+
+__all__ = ["CertificateRule", "Certificate"]
+
+
+class Certificate(BaseModel):
+    pass
+
+
+class CertificateRule(BaseModel):
+    """Matches any valid client certificate."""
+
+    certificate: Certificate
diff --git a/src/cloudflare/types/zero_trust/access/applications/certificate_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/certificate_rule_param.py
new file mode 100644
index 00000000000..0de142576c7
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/certificate_rule_param.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["CertificateRuleParam", "Certificate"]
+
+
+class Certificate(TypedDict, total=False):
+    pass
+
+
+class CertificateRuleParam(TypedDict, total=False):
+    """Matches any valid client certificate."""
+
+    certificate: Required[Certificate]
diff --git a/src/cloudflare/types/zero_trust/country_rule.py b/src/cloudflare/types/zero_trust/access/applications/country_rule.py
similarity index 78%
rename from src/cloudflare/types/zero_trust/country_rule.py
rename to src/cloudflare/types/zero_trust/access/applications/country_rule.py
index 060eda47066..8435305b18d 100644
--- a/src/cloudflare/types/zero_trust/country_rule.py
+++ b/src/cloudflare/types/zero_trust/access/applications/country_rule.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
-from ..._models import BaseModel
+from ....._models import BaseModel
 
 __all__ = ["CountryRule", "Geo"]
 
@@ -12,4 +11,6 @@ class Geo(BaseModel):
 
 
 class CountryRule(BaseModel):
+    """Matches a specific country"""
+
     geo: Geo
diff --git a/src/cloudflare/types/zero_trust/country_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/country_rule_param.py
similarity index 91%
rename from src/cloudflare/types/zero_trust/country_rule_param.py
rename to src/cloudflare/types/zero_trust/access/applications/country_rule_param.py
index f6cc5b28073..10b7ec7f6f9 100644
--- a/src/cloudflare/types/zero_trust/country_rule_param.py
+++ b/src/cloudflare/types/zero_trust/access/applications/country_rule_param.py
@@ -13,4 +13,6 @@ class Geo(TypedDict, total=False):
 
 
 class CountryRuleParam(TypedDict, total=False):
+    """Matches a specific country"""
+
     geo: Required[Geo]
diff --git a/src/cloudflare/types/zero_trust/domain_rule.py b/src/cloudflare/types/zero_trust/access/applications/domain_rule.py
similarity index 78%
rename from src/cloudflare/types/zero_trust/domain_rule.py
rename to src/cloudflare/types/zero_trust/access/applications/domain_rule.py
index 9bb961498ca..29091829edb 100644
--- a/src/cloudflare/types/zero_trust/domain_rule.py
+++ b/src/cloudflare/types/zero_trust/access/applications/domain_rule.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
-from ..._models import BaseModel
+from ....._models import BaseModel
 
 __all__ = ["DomainRule", "EmailDomain"]
 
@@ -12,4 +11,6 @@ class EmailDomain(BaseModel):
 
 
 class DomainRule(BaseModel):
+    """Match an entire email domain."""
+
     email_domain: EmailDomain
diff --git a/src/cloudflare/types/zero_trust/domain_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/domain_rule_param.py
similarity index 91%
rename from src/cloudflare/types/zero_trust/domain_rule_param.py
rename to src/cloudflare/types/zero_trust/access/applications/domain_rule_param.py
index e8bcab749fd..26d6690a705 100644
--- a/src/cloudflare/types/zero_trust/domain_rule_param.py
+++ b/src/cloudflare/types/zero_trust/access/applications/domain_rule_param.py
@@ -13,4 +13,6 @@ class EmailDomain(TypedDict, total=False):
 
 
 class DomainRuleParam(TypedDict, total=False):
+    """Match an entire email domain."""
+
     email_domain: Required[EmailDomain]
diff --git a/src/cloudflare/types/zero_trust/email_list_rule.py b/src/cloudflare/types/zero_trust/access/applications/email_list_rule.py
similarity index 77%
rename from src/cloudflare/types/zero_trust/email_list_rule.py
rename to src/cloudflare/types/zero_trust/access/applications/email_list_rule.py
index bda960c806a..0a5dfef6958 100644
--- a/src/cloudflare/types/zero_trust/email_list_rule.py
+++ b/src/cloudflare/types/zero_trust/access/applications/email_list_rule.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
-from ..._models import BaseModel
+from ....._models import BaseModel
 
 __all__ = ["EmailListRule", "EmailList"]
 
@@ -12,4 +11,6 @@ class EmailList(BaseModel):
 
 
 class EmailListRule(BaseModel):
+    """Matches an email address from a list."""
+
     email_list: EmailList
diff --git a/src/cloudflare/types/zero_trust/email_list_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/email_list_rule_param.py
similarity index 89%
rename from src/cloudflare/types/zero_trust/email_list_rule_param.py
rename to src/cloudflare/types/zero_trust/access/applications/email_list_rule_param.py
index 71b725e2fef..789f076cb70 100644
--- a/src/cloudflare/types/zero_trust/email_list_rule_param.py
+++ b/src/cloudflare/types/zero_trust/access/applications/email_list_rule_param.py
@@ -13,4 +13,6 @@ class EmailList(TypedDict, total=False):
 
 
 class EmailListRuleParam(TypedDict, total=False):
+    """Matches an email address from a list."""
+
     email_list: Required[EmailList]
diff --git a/src/cloudflare/types/zero_trust/email_rule.py b/src/cloudflare/types/zero_trust/access/applications/email_rule.py
similarity index 77%
rename from src/cloudflare/types/zero_trust/email_rule.py
rename to src/cloudflare/types/zero_trust/access/applications/email_rule.py
index 2333b69cb11..5f631d144fd 100644
--- a/src/cloudflare/types/zero_trust/email_rule.py
+++ b/src/cloudflare/types/zero_trust/access/applications/email_rule.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
-from ..._models import BaseModel
+from ....._models import BaseModel
 
 __all__ = ["EmailRule", "Email"]
 
@@ -12,4 +11,6 @@ class Email(BaseModel):
 
 
 class EmailRule(BaseModel):
+    """Matches a specific email."""
+
     email: Email
diff --git a/src/cloudflare/types/zero_trust/email_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/email_rule_param.py
similarity index 91%
rename from src/cloudflare/types/zero_trust/email_rule_param.py
rename to src/cloudflare/types/zero_trust/access/applications/email_rule_param.py
index b43061fe44f..86006c7c890 100644
--- a/src/cloudflare/types/zero_trust/email_rule_param.py
+++ b/src/cloudflare/types/zero_trust/access/applications/email_rule_param.py
@@ -13,4 +13,6 @@ class Email(TypedDict, total=False):
 
 
 class EmailRuleParam(TypedDict, total=False):
+    """Matches a specific email."""
+
     email: Required[Email]
diff --git a/src/cloudflare/types/zero_trust/access/applications/everyone_rule.py b/src/cloudflare/types/zero_trust/access/applications/everyone_rule.py
new file mode 100644
index 00000000000..a67dff5c59d
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/everyone_rule.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ....._models import BaseModel
+
+__all__ = ["EveryoneRule", "Everyone"]
+
+
+class Everyone(BaseModel):
+    """An empty object which matches on all users."""
+
+    pass
+
+
+class EveryoneRule(BaseModel):
+    """Matches everyone."""
+
+    everyone: Everyone
+    """An empty object which matches on all users."""
diff --git a/src/cloudflare/types/zero_trust/access/applications/everyone_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/everyone_rule_param.py
new file mode 100644
index 00000000000..57d7e377742
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/everyone_rule_param.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["EveryoneRuleParam", "Everyone"]
+
+
+class Everyone(TypedDict, total=False):
+    """An empty object which matches on all users."""
+
+    pass
+
+
+class EveryoneRuleParam(TypedDict, total=False):
+    """Matches everyone."""
+
+    everyone: Required[Everyone]
+    """An empty object which matches on all users."""
diff --git a/src/cloudflare/types/zero_trust/external_evaluation_rule.py b/src/cloudflare/types/zero_trust/access/applications/external_evaluation_rule.py
similarity index 78%
rename from src/cloudflare/types/zero_trust/external_evaluation_rule.py
rename to src/cloudflare/types/zero_trust/access/applications/external_evaluation_rule.py
index d951576746a..77734570fc5 100644
--- a/src/cloudflare/types/zero_trust/external_evaluation_rule.py
+++ b/src/cloudflare/types/zero_trust/access/applications/external_evaluation_rule.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
-from ..._models import BaseModel
+from ....._models import BaseModel
 
 __all__ = ["ExternalEvaluationRule", "ExternalEvaluation"]
 
@@ -18,4 +17,8 @@ class ExternalEvaluation(BaseModel):
 
 
 class ExternalEvaluationRule(BaseModel):
+    """
+    Create Allow or Block policies which evaluate the user based on custom criteria.
+    """
+
     external_evaluation: ExternalEvaluation
diff --git a/src/cloudflare/types/zero_trust/external_evaluation_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/external_evaluation_rule_param.py
similarity index 86%
rename from src/cloudflare/types/zero_trust/external_evaluation_rule_param.py
rename to src/cloudflare/types/zero_trust/access/applications/external_evaluation_rule_param.py
index df598ab7c8b..0a2d9f07492 100644
--- a/src/cloudflare/types/zero_trust/external_evaluation_rule_param.py
+++ b/src/cloudflare/types/zero_trust/access/applications/external_evaluation_rule_param.py
@@ -19,4 +19,8 @@ class ExternalEvaluation(TypedDict, total=False):
 
 
 class ExternalEvaluationRuleParam(TypedDict, total=False):
+    """
+    Create Allow or Block policies which evaluate the user based on custom criteria.
+    """
+
     external_evaluation: Required[ExternalEvaluation]
diff --git a/src/cloudflare/types/zero_trust/access/applications/github_organization_rule.py b/src/cloudflare/types/zero_trust/access/applications/github_organization_rule.py
new file mode 100644
index 00000000000..fbc41e6bde2
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/github_organization_rule.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = ["GitHubOrganizationRule", "GitHubOrganization"]
+
+
+class GitHubOrganization(BaseModel):
+    identity_provider_id: str
+    """The ID of your Github identity provider."""
+
+    name: str
+    """The name of the organization."""
+
+    team: Optional[str] = None
+    """The name of the team"""
+
+
+class GitHubOrganizationRule(BaseModel):
+    """
+    Matches a Github organization.
+    Requires a Github identity provider.
+    """
+
+    github_organization: GitHubOrganization = FieldInfo(alias="github-organization")
diff --git a/src/cloudflare/types/zero_trust/access/applications/github_organization_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/github_organization_rule_param.py
new file mode 100644
index 00000000000..c253b065bee
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/github_organization_rule_param.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, Annotated, TypedDict
+
+from ....._utils import PropertyInfo
+
+__all__ = ["GitHubOrganizationRuleParam", "GitHubOrganization"]
+
+
+class GitHubOrganization(TypedDict, total=False):
+    identity_provider_id: Required[str]
+    """The ID of your Github identity provider."""
+
+    name: Required[str]
+    """The name of the organization."""
+
+    team: str
+    """The name of the team"""
+
+
+class GitHubOrganizationRuleParam(TypedDict, total=False):
+    """
+    Matches a Github organization.
+    Requires a Github identity provider.
+    """
+
+    github_organization: Required[Annotated[GitHubOrganization, PropertyInfo(alias="github-organization")]]
diff --git a/src/cloudflare/types/zero_trust/group_rule.py b/src/cloudflare/types/zero_trust/access/applications/group_rule.py
similarity index 78%
rename from src/cloudflare/types/zero_trust/group_rule.py
rename to src/cloudflare/types/zero_trust/access/applications/group_rule.py
index 9813013c6a4..7f49f43cc79 100644
--- a/src/cloudflare/types/zero_trust/group_rule.py
+++ b/src/cloudflare/types/zero_trust/access/applications/group_rule.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
-from ..._models import BaseModel
+from ....._models import BaseModel
 
 __all__ = ["GroupRule", "Group"]
 
@@ -12,4 +11,6 @@ class Group(BaseModel):
 
 
 class GroupRule(BaseModel):
+    """Matches an Access group."""
+
     group: Group
diff --git a/src/cloudflare/types/zero_trust/group_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/group_rule_param.py
similarity index 91%
rename from src/cloudflare/types/zero_trust/group_rule_param.py
rename to src/cloudflare/types/zero_trust/access/applications/group_rule_param.py
index 54ce30e003e..31c42f81536 100644
--- a/src/cloudflare/types/zero_trust/group_rule_param.py
+++ b/src/cloudflare/types/zero_trust/access/applications/group_rule_param.py
@@ -13,4 +13,6 @@ class Group(TypedDict, total=False):
 
 
 class GroupRuleParam(TypedDict, total=False):
+    """Matches an Access group."""
+
     group: Required[Group]
diff --git a/src/cloudflare/types/zero_trust/access/applications/gsuite_group_rule.py b/src/cloudflare/types/zero_trust/access/applications/gsuite_group_rule.py
new file mode 100644
index 00000000000..7bd5c064017
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/gsuite_group_rule.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ....._models import BaseModel
+
+__all__ = ["GSuiteGroupRule", "GSuite"]
+
+
+class GSuite(BaseModel):
+    email: str
+    """The email of the Google Workspace group."""
+
+    identity_provider_id: str
+    """The ID of your Google Workspace identity provider."""
+
+
+class GSuiteGroupRule(BaseModel):
+    """
+    Matches a group in Google Workspace.
+    Requires a Google Workspace identity provider.
+    """
+
+    gsuite: GSuite
diff --git a/src/cloudflare/types/zero_trust/gsuite_group_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/gsuite_group_rule_param.py
similarity index 76%
rename from src/cloudflare/types/zero_trust/gsuite_group_rule_param.py
rename to src/cloudflare/types/zero_trust/access/applications/gsuite_group_rule_param.py
index fc29c250b86..c623384e749 100644
--- a/src/cloudflare/types/zero_trust/gsuite_group_rule_param.py
+++ b/src/cloudflare/types/zero_trust/access/applications/gsuite_group_rule_param.py
@@ -8,12 +8,17 @@
 
 
 class GSuite(TypedDict, total=False):
-    connection_id: Required[str]
-    """The ID of your Google Workspace identity provider."""
-
     email: Required[str]
     """The email of the Google Workspace group."""
 
+    identity_provider_id: Required[str]
+    """The ID of your Google Workspace identity provider."""
+
 
 class GSuiteGroupRuleParam(TypedDict, total=False):
+    """
+    Matches a group in Google Workspace.
+    Requires a Google Workspace identity provider.
+    """
+
     gsuite: Required[GSuite]
diff --git a/src/cloudflare/types/zero_trust/ip_list_rule.py b/src/cloudflare/types/zero_trust/access/applications/ip_list_rule.py
similarity index 76%
rename from src/cloudflare/types/zero_trust/ip_list_rule.py
rename to src/cloudflare/types/zero_trust/access/applications/ip_list_rule.py
index aac38b6a5af..3aad50bdc33 100644
--- a/src/cloudflare/types/zero_trust/ip_list_rule.py
+++ b/src/cloudflare/types/zero_trust/access/applications/ip_list_rule.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
-from ..._models import BaseModel
+from ....._models import BaseModel
 
 __all__ = ["IPListRule", "IPList"]
 
@@ -12,4 +11,6 @@ class IPList(BaseModel):
 
 
 class IPListRule(BaseModel):
+    """Matches an IP address from a list."""
+
     ip_list: IPList
diff --git a/src/cloudflare/types/zero_trust/ip_list_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/ip_list_rule_param.py
similarity index 89%
rename from src/cloudflare/types/zero_trust/ip_list_rule_param.py
rename to src/cloudflare/types/zero_trust/access/applications/ip_list_rule_param.py
index af094a8b74f..be9982a3972 100644
--- a/src/cloudflare/types/zero_trust/ip_list_rule_param.py
+++ b/src/cloudflare/types/zero_trust/access/applications/ip_list_rule_param.py
@@ -13,4 +13,6 @@ class IPList(TypedDict, total=False):
 
 
 class IPListRuleParam(TypedDict, total=False):
+    """Matches an IP address from a list."""
+
     ip_list: Required[IPList]
diff --git a/src/cloudflare/types/zero_trust/ip_rule.py b/src/cloudflare/types/zero_trust/access/applications/ip_rule.py
similarity index 75%
rename from src/cloudflare/types/zero_trust/ip_rule.py
rename to src/cloudflare/types/zero_trust/access/applications/ip_rule.py
index 9b471986a36..5a712a68256 100644
--- a/src/cloudflare/types/zero_trust/ip_rule.py
+++ b/src/cloudflare/types/zero_trust/access/applications/ip_rule.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
-from ..._models import BaseModel
+from ....._models import BaseModel
 
 __all__ = ["IPRule", "IP"]
 
@@ -12,4 +11,6 @@ class IP(BaseModel):
 
 
 class IPRule(BaseModel):
+    """Matches an IP address block."""
+
     ip: IP
diff --git a/src/cloudflare/types/zero_trust/ip_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/ip_rule_param.py
similarity index 90%
rename from src/cloudflare/types/zero_trust/ip_rule_param.py
rename to src/cloudflare/types/zero_trust/access/applications/ip_rule_param.py
index 57ad07219bb..3b9d94c2d92 100644
--- a/src/cloudflare/types/zero_trust/ip_rule_param.py
+++ b/src/cloudflare/types/zero_trust/access/applications/ip_rule_param.py
@@ -13,4 +13,6 @@ class IP(TypedDict, total=False):
 
 
 class IPRuleParam(TypedDict, total=False):
+    """Matches an IP address block."""
+
     ip: Required[IP]
diff --git a/src/cloudflare/types/zero_trust/access/applications/okta_group_rule.py b/src/cloudflare/types/zero_trust/access/applications/okta_group_rule.py
new file mode 100644
index 00000000000..53cc1f9effd
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/okta_group_rule.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ....._models import BaseModel
+
+__all__ = ["OktaGroupRule", "Okta"]
+
+
+class Okta(BaseModel):
+    identity_provider_id: str
+    """The ID of your Okta identity provider."""
+
+    name: str
+    """The name of the Okta group."""
+
+
+class OktaGroupRule(BaseModel):
+    """
+    Matches an Okta group.
+    Requires an Okta identity provider.
+    """
+
+    okta: Okta
diff --git a/src/cloudflare/types/zero_trust/access/applications/okta_group_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/okta_group_rule_param.py
new file mode 100644
index 00000000000..34d4bd2900e
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/okta_group_rule_param.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["OktaGroupRuleParam", "Okta"]
+
+
+class Okta(TypedDict, total=False):
+    identity_provider_id: Required[str]
+    """The ID of your Okta identity provider."""
+
+    name: Required[str]
+    """The name of the Okta group."""
+
+
+class OktaGroupRuleParam(TypedDict, total=False):
+    """
+    Matches an Okta group.
+    Requires an Okta identity provider.
+    """
+
+    okta: Required[Okta]
diff --git a/src/cloudflare/types/zero_trust/access/applications/policy_create_params.py b/src/cloudflare/types/zero_trust/access/applications/policy_create_params.py
index 358425ac3f4..cce9bcc3c24 100644
--- a/src/cloudflare/types/zero_trust/access/applications/policy_create_params.py
+++ b/src/cloudflare/types/zero_trust/access/applications/policy_create_params.py
@@ -3,28 +3,14 @@
 from __future__ import annotations
 
 from typing import Iterable
-from typing_extensions import Required, TypedDict
+from typing_extensions import TypedDict
 
-from ..decision import Decision
-from ...access_rule_param import AccessRuleParam
-from .approval_group_param import ApprovalGroupParam
+from ..approval_group_param import ApprovalGroupParam
 
 __all__ = ["PolicyCreateParams"]
 
 
 class PolicyCreateParams(TypedDict, total=False):
-    decision: Required[Decision]
-    """The action Access will take if a user matches this policy."""
-
-    include: Required[Iterable[AccessRuleParam]]
-    """Rules evaluated with an OR logical operator.
-
-    A user needs to meet only one of the Include rules.
-    """
-
-    name: Required[str]
-    """The name of the Access policy."""
-
     account_id: str
     """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
 
@@ -40,12 +26,6 @@ class PolicyCreateParams(TypedDict, total=False):
     session.
     """
 
-    exclude: Iterable[AccessRuleParam]
-    """Rules evaluated with a NOT logical operator.
-
-    To match the policy, a user cannot meet any of the Exclude rules.
-    """
-
     isolation_required: bool
     """
     Require this application to be served in an isolated browser for users matching
@@ -65,12 +45,6 @@ class PolicyCreateParams(TypedDict, total=False):
     purpose_justification_required: bool
     """Require users to enter a justification when they log in to the application."""
 
-    require: Iterable[AccessRuleParam]
-    """Rules evaluated with an AND logical operator.
-
-    To match the policy, a user must meet all of the Require rules.
-    """
-
     session_duration: str
     """The amount of time that tokens issued for the application will be valid.
 
diff --git a/src/cloudflare/types/zero_trust/access/applications/policy_create_response.py b/src/cloudflare/types/zero_trust/access/applications/policy_create_response.py
index 733932309f2..d96df3960f3 100644
--- a/src/cloudflare/types/zero_trust/access/applications/policy_create_response.py
+++ b/src/cloudflare/types/zero_trust/access/applications/policy_create_response.py
@@ -5,8 +5,8 @@
 
 from ..decision import Decision
 from ....._models import BaseModel
-from ...access_rule import AccessRule
-from .approval_group import ApprovalGroup
+from .access_rule import AccessRule
+from ..approval_group import ApprovalGroup
 
 __all__ = ["PolicyCreateResponse"]
 
@@ -27,7 +27,10 @@ class PolicyCreateResponse(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -51,6 +54,12 @@ class PolicyCreateResponse(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
diff --git a/src/cloudflare/types/zero_trust/access/applications/policy_delete_response.py b/src/cloudflare/types/zero_trust/access/applications/policy_delete_response.py
index 1d70dce656a..662f993e1fc 100644
--- a/src/cloudflare/types/zero_trust/access/applications/policy_delete_response.py
+++ b/src/cloudflare/types/zero_trust/access/applications/policy_delete_response.py
@@ -9,4 +9,4 @@
 
 class PolicyDeleteResponse(BaseModel):
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
diff --git a/src/cloudflare/types/zero_trust/access/applications/policy_get_response.py b/src/cloudflare/types/zero_trust/access/applications/policy_get_response.py
index 58009c55c07..7b27ed567d0 100644
--- a/src/cloudflare/types/zero_trust/access/applications/policy_get_response.py
+++ b/src/cloudflare/types/zero_trust/access/applications/policy_get_response.py
@@ -5,8 +5,8 @@
 
 from ..decision import Decision
 from ....._models import BaseModel
-from ...access_rule import AccessRule
-from .approval_group import ApprovalGroup
+from .access_rule import AccessRule
+from ..approval_group import ApprovalGroup
 
 __all__ = ["PolicyGetResponse"]
 
@@ -27,7 +27,10 @@ class PolicyGetResponse(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -51,6 +54,12 @@ class PolicyGetResponse(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
diff --git a/src/cloudflare/types/zero_trust/access/applications/policy_list_params.py b/src/cloudflare/types/zero_trust/access/applications/policy_list_params.py
new file mode 100644
index 00000000000..6cc6609d9d8
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/policy_list_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import TypedDict
+
+__all__ = ["PolicyListParams"]
+
+
+class PolicyListParams(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    page: int
+    """Page number of results."""
+
+    per_page: int
+    """Number of results per page."""
diff --git a/src/cloudflare/types/zero_trust/access/applications/policy_list_response.py b/src/cloudflare/types/zero_trust/access/applications/policy_list_response.py
index af894ba6981..1ff32096707 100644
--- a/src/cloudflare/types/zero_trust/access/applications/policy_list_response.py
+++ b/src/cloudflare/types/zero_trust/access/applications/policy_list_response.py
@@ -5,8 +5,8 @@
 
 from ..decision import Decision
 from ....._models import BaseModel
-from ...access_rule import AccessRule
-from .approval_group import ApprovalGroup
+from .access_rule import AccessRule
+from ..approval_group import ApprovalGroup
 
 __all__ = ["PolicyListResponse"]
 
@@ -27,7 +27,10 @@ class PolicyListResponse(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -51,6 +54,12 @@ class PolicyListResponse(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
diff --git a/src/cloudflare/types/zero_trust/access/applications/policy_test_create_params.py b/src/cloudflare/types/zero_trust/access/applications/policy_test_create_params.py
new file mode 100755
index 00000000000..48bcd3e185d
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/policy_test_create_params.py
@@ -0,0 +1,81 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from typing_extensions import Required, TypeAlias, TypedDict
+
+from ..decision import Decision
+from ....._types import SequenceNotStr
+from .access_rule_param import AccessRuleParam
+from ..approval_group_param import ApprovalGroupParam
+
+__all__ = ["PolicyTestCreateParams", "Policy", "PolicyUnionMember0"]
+
+
+class PolicyTestCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    policies: SequenceNotStr[Policy]
+
+
+class PolicyUnionMember0(TypedDict, total=False):
+    decision: Required[Decision]
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
+
+    include: Required[Iterable[AccessRuleParam]]
+    """Rules evaluated with an OR logical operator.
+
+    A user needs to meet only one of the Include rules.
+    """
+
+    name: Required[str]
+    """The name of the Access policy."""
+
+    approval_groups: Iterable[ApprovalGroupParam]
+    """Administrators who can approve a temporary authentication request."""
+
+    approval_required: bool
+    """
+    Requires the user to request access from an administrator at the start of each
+    session.
+    """
+
+    exclude: Iterable[AccessRuleParam]
+    """Rules evaluated with a NOT logical operator.
+
+    To match the policy, a user cannot meet any of the Exclude rules.
+    """
+
+    isolation_required: bool
+    """
+    Require this application to be served in an isolated browser for users matching
+    this policy. 'Client Web Isolation' must be on for the account in order to use
+    this feature.
+    """
+
+    purpose_justification_prompt: str
+    """A custom message that will appear on the purpose justification screen."""
+
+    purpose_justification_required: bool
+    """Require users to enter a justification when they log in to the application."""
+
+    require: Iterable[AccessRuleParam]
+    """Rules evaluated with an AND logical operator.
+
+    To match the policy, a user must meet all of the Require rules.
+    """
+
+    session_duration: str
+    """The amount of time that tokens issued for the application will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h.
+    """
+
+
+Policy: TypeAlias = Union[PolicyUnionMember0, str]
diff --git a/src/cloudflare/types/zero_trust/access/applications/policy_test_create_response.py b/src/cloudflare/types/zero_trust/access/applications/policy_test_create_response.py
new file mode 100755
index 00000000000..0adf47d6cb0
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/policy_test_create_response.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ....._models import BaseModel
+
+__all__ = ["PolicyTestCreateResponse"]
+
+
+class PolicyTestCreateResponse(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the policy test."""
+
+    status: Optional[Literal["success"]] = None
+    """The status of the policy test request."""
diff --git a/src/cloudflare/types/zero_trust/access/applications/policy_test_get_response.py b/src/cloudflare/types/zero_trust/access/applications/policy_test_get_response.py
new file mode 100755
index 00000000000..1a4effb3c03
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/policy_test_get_response.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ....._models import BaseModel
+
+__all__ = ["PolicyTestGetResponse"]
+
+
+class PolicyTestGetResponse(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the policy test."""
+
+    percent_approved: Optional[int] = None
+    """
+    The percentage of (processed) users approved based on policy evaluation results.
+    """
+
+    percent_blocked: Optional[int] = None
+    """The percentage of (processed) users blocked based on policy evaluation results."""
+
+    percent_errored: Optional[int] = None
+    """The percentage of (processed) users errored based on policy evaluation results."""
+
+    percent_users_processed: Optional[int] = None
+    """The percentage of users processed so far (of the entire user base)."""
+
+    status: Optional[Literal["blocked", "processing", "exceeded time", "complete"]] = None
+    """The status of the policy test."""
+
+    total_users: Optional[int] = None
+    """The total number of users in the user base."""
+
+    users_approved: Optional[int] = None
+    """The number of (processed) users approved based on policy evaluation results."""
+
+    users_blocked: Optional[int] = None
+    """The number of (processed) users blocked based on policy evaluation results."""
+
+    users_errored: Optional[int] = None
+    """The number of (processed) users errored based on policy evaluation results."""
diff --git a/src/cloudflare/types/zero_trust/access/applications/policy_tests/__init__.py b/src/cloudflare/types/zero_trust/access/applications/policy_tests/__init__.py
new file mode 100755
index 00000000000..b50e6a6cfa1
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/policy_tests/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .user_list_params import UserListParams as UserListParams
+from .user_list_response import UserListResponse as UserListResponse
diff --git a/src/cloudflare/types/zero_trust/access/applications/policy_tests/user_list_params.py b/src/cloudflare/types/zero_trust/access/applications/policy_tests/user_list_params.py
new file mode 100644
index 00000000000..a35a3e075c7
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/policy_tests/user_list_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["UserListParams"]
+
+
+class UserListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    page: int
+    """Page number of results."""
+
+    per_page: int
+
+    status: Literal["success", "fail", "error"]
+    """Filter users by their policy evaluation status."""
diff --git a/src/cloudflare/types/zero_trust/access/applications/policy_tests/user_list_response.py b/src/cloudflare/types/zero_trust/access/applications/policy_tests/user_list_response.py
new file mode 100755
index 00000000000..ff8cfd3ca93
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/policy_tests/user_list_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ......_models import BaseModel
+
+__all__ = ["UserListResponse"]
+
+
+class UserListResponse(BaseModel):
+    id: Optional[str] = None
+    """UUID."""
+
+    email: Optional[str] = None
+    """The email of the user."""
+
+    name: Optional[str] = None
+    """The name of the user."""
+
+    status: Optional[Literal["approved", "blocked", "error"]] = None
+    """Policy evaluation result for an individual user."""
diff --git a/src/cloudflare/types/zero_trust/access/applications/policy_update_params.py b/src/cloudflare/types/zero_trust/access/applications/policy_update_params.py
index 88019eb676e..20e48498060 100644
--- a/src/cloudflare/types/zero_trust/access/applications/policy_update_params.py
+++ b/src/cloudflare/types/zero_trust/access/applications/policy_update_params.py
@@ -5,28 +5,14 @@
 from typing import Iterable
 from typing_extensions import Required, TypedDict
 
-from ..decision import Decision
-from ...access_rule_param import AccessRuleParam
-from .approval_group_param import ApprovalGroupParam
+from ..approval_group_param import ApprovalGroupParam
 
 __all__ = ["PolicyUpdateParams"]
 
 
 class PolicyUpdateParams(TypedDict, total=False):
     app_id: Required[str]
-    """UUID"""
-
-    decision: Required[Decision]
-    """The action Access will take if a user matches this policy."""
-
-    include: Required[Iterable[AccessRuleParam]]
-    """Rules evaluated with an OR logical operator.
-
-    A user needs to meet only one of the Include rules.
-    """
-
-    name: Required[str]
-    """The name of the Access policy."""
+    """UUID."""
 
     account_id: str
     """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
@@ -43,12 +29,6 @@ class PolicyUpdateParams(TypedDict, total=False):
     session.
     """
 
-    exclude: Iterable[AccessRuleParam]
-    """Rules evaluated with a NOT logical operator.
-
-    To match the policy, a user cannot meet any of the Exclude rules.
-    """
-
     isolation_required: bool
     """
     Require this application to be served in an isolated browser for users matching
@@ -68,12 +48,6 @@ class PolicyUpdateParams(TypedDict, total=False):
     purpose_justification_required: bool
     """Require users to enter a justification when they log in to the application."""
 
-    require: Iterable[AccessRuleParam]
-    """Rules evaluated with an AND logical operator.
-
-    To match the policy, a user must meet all of the Require rules.
-    """
-
     session_duration: str
     """The amount of time that tokens issued for the application will be valid.
 
diff --git a/src/cloudflare/types/zero_trust/access/applications/policy_update_response.py b/src/cloudflare/types/zero_trust/access/applications/policy_update_response.py
index a3649ba0866..1956319b54e 100644
--- a/src/cloudflare/types/zero_trust/access/applications/policy_update_response.py
+++ b/src/cloudflare/types/zero_trust/access/applications/policy_update_response.py
@@ -5,8 +5,8 @@
 
 from ..decision import Decision
 from ....._models import BaseModel
-from ...access_rule import AccessRule
-from .approval_group import ApprovalGroup
+from .access_rule import AccessRule
+from ..approval_group import ApprovalGroup
 
 __all__ = ["PolicyUpdateResponse"]
 
@@ -27,7 +27,10 @@ class PolicyUpdateResponse(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
@@ -51,6 +54,12 @@ class PolicyUpdateResponse(BaseModel):
     name: Optional[str] = None
     """The name of the Access policy."""
 
+    precedence: Optional[int] = None
+    """The order of execution for this policy.
+
+    Must be unique for each policy within an app.
+    """
+
     purpose_justification_prompt: Optional[str] = None
     """A custom message that will appear on the purpose justification screen."""
 
diff --git a/src/cloudflare/types/zero_trust/access/applications/saml_group_rule.py b/src/cloudflare/types/zero_trust/access/applications/saml_group_rule.py
new file mode 100644
index 00000000000..7fc941b66e9
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/saml_group_rule.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ....._models import BaseModel
+
+__all__ = ["SAMLGroupRule", "SAML"]
+
+
+class SAML(BaseModel):
+    attribute_name: str
+    """The name of the SAML attribute."""
+
+    attribute_value: str
+    """The SAML attribute value to look for."""
+
+    identity_provider_id: str
+    """The ID of your SAML identity provider."""
+
+
+class SAMLGroupRule(BaseModel):
+    """
+    Matches a SAML group.
+    Requires a SAML identity provider.
+    """
+
+    saml: SAML
diff --git a/src/cloudflare/types/zero_trust/access/applications/saml_group_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/saml_group_rule_param.py
new file mode 100644
index 00000000000..441922d166a
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/saml_group_rule_param.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SAMLGroupRuleParam", "SAML"]
+
+
+class SAML(TypedDict, total=False):
+    attribute_name: Required[str]
+    """The name of the SAML attribute."""
+
+    attribute_value: Required[str]
+    """The SAML attribute value to look for."""
+
+    identity_provider_id: Required[str]
+    """The ID of your SAML identity provider."""
+
+
+class SAMLGroupRuleParam(TypedDict, total=False):
+    """
+    Matches a SAML group.
+    Requires a SAML identity provider.
+    """
+
+    saml: Required[SAML]
diff --git a/src/cloudflare/types/zero_trust/service_token_rule.py b/src/cloudflare/types/zero_trust/access/applications/service_token_rule.py
similarity index 77%
rename from src/cloudflare/types/zero_trust/service_token_rule.py
rename to src/cloudflare/types/zero_trust/access/applications/service_token_rule.py
index fcf7a8e36b0..499832e944d 100644
--- a/src/cloudflare/types/zero_trust/service_token_rule.py
+++ b/src/cloudflare/types/zero_trust/access/applications/service_token_rule.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
-from ..._models import BaseModel
+from ....._models import BaseModel
 
 __all__ = ["ServiceTokenRule", "ServiceToken"]
 
@@ -12,4 +11,6 @@ class ServiceToken(BaseModel):
 
 
 class ServiceTokenRule(BaseModel):
+    """Matches a specific Access Service Token"""
+
     service_token: ServiceToken
diff --git a/src/cloudflare/types/zero_trust/service_token_rule_param.py b/src/cloudflare/types/zero_trust/access/applications/service_token_rule_param.py
similarity index 89%
rename from src/cloudflare/types/zero_trust/service_token_rule_param.py
rename to src/cloudflare/types/zero_trust/access/applications/service_token_rule_param.py
index 1c51cea4168..bc67183b355 100644
--- a/src/cloudflare/types/zero_trust/service_token_rule_param.py
+++ b/src/cloudflare/types/zero_trust/access/applications/service_token_rule_param.py
@@ -13,4 +13,6 @@ class ServiceToken(TypedDict, total=False):
 
 
 class ServiceTokenRuleParam(TypedDict, total=False):
+    """Matches a specific Access Service Token"""
+
     service_token: Required[ServiceToken]
diff --git a/src/cloudflare/types/zero_trust/access/applications/setting_edit_params.py b/src/cloudflare/types/zero_trust/access/applications/setting_edit_params.py
new file mode 100644
index 00000000000..cfa52f91d1a
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/setting_edit_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import TypedDict
+
+__all__ = ["SettingEditParams"]
+
+
+class SettingEditParams(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    allow_iframe: bool
+    """Enables loading application content in an iFrame."""
+
+    skip_interstitial: bool
+    """Enables automatic authentication through cloudflared."""
diff --git a/src/cloudflare/types/zero_trust/access/applications/setting_edit_response.py b/src/cloudflare/types/zero_trust/access/applications/setting_edit_response.py
new file mode 100644
index 00000000000..cc98cffd0e7
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/setting_edit_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ....._models import BaseModel
+
+__all__ = ["SettingEditResponse"]
+
+
+class SettingEditResponse(BaseModel):
+    allow_iframe: Optional[bool] = None
+    """Enables loading application content in an iFrame."""
+
+    skip_interstitial: Optional[bool] = None
+    """Enables automatic authentication through cloudflared."""
diff --git a/src/cloudflare/types/zero_trust/access/applications/setting_update_params.py b/src/cloudflare/types/zero_trust/access/applications/setting_update_params.py
new file mode 100644
index 00000000000..5ce636d4dbb
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/setting_update_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import TypedDict
+
+__all__ = ["SettingUpdateParams"]
+
+
+class SettingUpdateParams(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    allow_iframe: bool
+    """Enables loading application content in an iFrame."""
+
+    skip_interstitial: bool
+    """Enables automatic authentication through cloudflared."""
diff --git a/src/cloudflare/types/zero_trust/access/applications/setting_update_response.py b/src/cloudflare/types/zero_trust/access/applications/setting_update_response.py
new file mode 100644
index 00000000000..b5d54392d38
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/applications/setting_update_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ....._models import BaseModel
+
+__all__ = ["SettingUpdateResponse"]
+
+
+class SettingUpdateResponse(BaseModel):
+    allow_iframe: Optional[bool] = None
+    """Enables loading application content in an iFrame."""
+
+    skip_interstitial: Optional[bool] = None
+    """Enables automatic authentication through cloudflared."""
diff --git a/src/cloudflare/types/zero_trust/access/applications/user_policy_check_list_response.py b/src/cloudflare/types/zero_trust/access/applications/user_policy_check_list_response.py
index 3622477b98e..d8c4d5f95a9 100644
--- a/src/cloudflare/types/zero_trust/access/applications/user_policy_check_list_response.py
+++ b/src/cloudflare/types/zero_trust/access/applications/user_policy_check_list_response.py
@@ -10,7 +10,7 @@
 
 class AppState(BaseModel):
     app_uid: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     aud: Optional[str] = None
 
@@ -43,7 +43,7 @@ class UserIdentity(BaseModel):
     name: Optional[str] = None
 
     user_uuid: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     version: Optional[int] = None
 
diff --git a/src/cloudflare/types/zero_trust/access/applications/approval_group.py b/src/cloudflare/types/zero_trust/access/approval_group.py
similarity index 79%
rename from src/cloudflare/types/zero_trust/access/applications/approval_group.py
rename to src/cloudflare/types/zero_trust/access/approval_group.py
index d9f57327b86..d1965371a43 100644
--- a/src/cloudflare/types/zero_trust/access/applications/approval_group.py
+++ b/src/cloudflare/types/zero_trust/access/approval_group.py
@@ -2,12 +2,14 @@
 
 from typing import List, Optional
 
-from ....._models import BaseModel
+from ...._models import BaseModel
 
 __all__ = ["ApprovalGroup"]
 
 
 class ApprovalGroup(BaseModel):
+    """A group of email addresses that can approve a temporary authentication request."""
+
     approvals_needed: float
     """The number of approvals needed to obtain access."""
 
diff --git a/src/cloudflare/types/zero_trust/access/approval_group_param.py b/src/cloudflare/types/zero_trust/access/approval_group_param.py
new file mode 100644
index 00000000000..a7ff8e1493d
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/approval_group_param.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["ApprovalGroupParam"]
+
+
+class ApprovalGroupParam(TypedDict, total=False):
+    """A group of email addresses that can approve a temporary authentication request."""
+
+    approvals_needed: Required[float]
+    """The number of approvals needed to obtain access."""
+
+    email_addresses: SequenceNotStr[str]
+    """A list of emails that can approve the access request."""
+
+    email_list_uuid: str
+    """The UUID of an re-usable email list."""
diff --git a/src/cloudflare/types/zero_trust/access/associated_hostnames.py b/src/cloudflare/types/zero_trust/access/associated_hostnames.py
index 2a772cfdd0f..1ca7f0c2824 100644
--- a/src/cloudflare/types/zero_trust/access/associated_hostnames.py
+++ b/src/cloudflare/types/zero_trust/access/associated_hostnames.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["AssociatedHostnames"]
 
-AssociatedHostnames = str
+AssociatedHostnames: TypeAlias = str
diff --git a/src/cloudflare/types/zero_trust/access/bookmark.py b/src/cloudflare/types/zero_trust/access/bookmark.py
index 5d20f8b964c..25e830e56e3 100644
--- a/src/cloudflare/types/zero_trust/access/bookmark.py
+++ b/src/cloudflare/types/zero_trust/access/bookmark.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 
 from ...._models import BaseModel
 
@@ -15,8 +14,6 @@ class Bookmark(BaseModel):
     app_launcher_visible: Optional[bool] = None
     """Displays the application in the App Launcher."""
 
-    created_at: Optional[datetime] = None
-
     domain: Optional[str] = None
     """The domain of the Bookmark application."""
 
@@ -25,5 +22,3 @@ class Bookmark(BaseModel):
 
     name: Optional[str] = None
     """The name of the Bookmark application."""
-
-    updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/access/bookmark_delete_response.py b/src/cloudflare/types/zero_trust/access/bookmark_delete_response.py
index 93d03aba051..3b0c1921c21 100644
--- a/src/cloudflare/types/zero_trust/access/bookmark_delete_response.py
+++ b/src/cloudflare/types/zero_trust/access/bookmark_delete_response.py
@@ -9,4 +9,4 @@
 
 class BookmarkDeleteResponse(BaseModel):
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
diff --git a/src/cloudflare/types/zero_trust/access/certificate.py b/src/cloudflare/types/zero_trust/access/certificate.py
index 6c05b85be1e..751e7cbc96c 100644
--- a/src/cloudflare/types/zero_trust/access/certificate.py
+++ b/src/cloudflare/types/zero_trust/access/certificate.py
@@ -16,8 +16,6 @@ class Certificate(BaseModel):
     associated_hostnames: Optional[List[AssociatedHostnames]] = None
     """The hostnames of the applications that will use this certificate."""
 
-    created_at: Optional[datetime] = None
-
     expires_on: Optional[datetime] = None
 
     fingerprint: Optional[str] = None
@@ -25,5 +23,3 @@ class Certificate(BaseModel):
 
     name: Optional[str] = None
     """The name of the certificate."""
-
-    updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/access/certificate_create_params.py b/src/cloudflare/types/zero_trust/access/certificate_create_params.py
index d98ff4df949..cd6718f724c 100644
--- a/src/cloudflare/types/zero_trust/access/certificate_create_params.py
+++ b/src/cloudflare/types/zero_trust/access/certificate_create_params.py
@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Required, TypedDict
 
+from ...._types import SequenceNotStr
 from .associated_hostnames import AssociatedHostnames
 
 __all__ = ["CertificateCreateParams"]
@@ -23,5 +23,5 @@ class CertificateCreateParams(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    associated_hostnames: List[AssociatedHostnames]
+    associated_hostnames: SequenceNotStr[AssociatedHostnames]
     """The hostnames of the applications that will use this certificate."""
diff --git a/src/cloudflare/types/zero_trust/access/certificate_delete_response.py b/src/cloudflare/types/zero_trust/access/certificate_delete_response.py
index 01177266648..f04406930a1 100644
--- a/src/cloudflare/types/zero_trust/access/certificate_delete_response.py
+++ b/src/cloudflare/types/zero_trust/access/certificate_delete_response.py
@@ -9,4 +9,4 @@
 
 class CertificateDeleteResponse(BaseModel):
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
diff --git a/src/cloudflare/types/zero_trust/access/certificate_list_params.py b/src/cloudflare/types/zero_trust/access/certificate_list_params.py
new file mode 100644
index 00000000000..6dae822e42d
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/certificate_list_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import TypedDict
+
+__all__ = ["CertificateListParams"]
+
+
+class CertificateListParams(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    page: int
+    """Page number of results."""
+
+    per_page: int
+    """Number of results per page."""
diff --git a/src/cloudflare/types/zero_trust/access/certificate_update_params.py b/src/cloudflare/types/zero_trust/access/certificate_update_params.py
index e546c333f21..de060855676 100644
--- a/src/cloudflare/types/zero_trust/access/certificate_update_params.py
+++ b/src/cloudflare/types/zero_trust/access/certificate_update_params.py
@@ -2,16 +2,16 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Required, TypedDict
 
+from ...._types import SequenceNotStr
 from .associated_hostnames import AssociatedHostnames
 
 __all__ = ["CertificateUpdateParams"]
 
 
 class CertificateUpdateParams(TypedDict, total=False):
-    associated_hostnames: Required[List[AssociatedHostnames]]
+    associated_hostnames: Required[SequenceNotStr[AssociatedHostnames]]
     """The hostnames of the applications that will use this certificate."""
 
     account_id: str
diff --git a/src/cloudflare/types/zero_trust/access/certificates/__init__.py b/src/cloudflare/types/zero_trust/access/certificates/__init__.py
index 2a8e492f5d5..d4cff2b0193 100644
--- a/src/cloudflare/types/zero_trust/access/certificates/__init__.py
+++ b/src/cloudflare/types/zero_trust/access/certificates/__init__.py
@@ -3,7 +3,5 @@
 from __future__ import annotations
 
 from .certificate_settings import CertificateSettings as CertificateSettings
-from .setting_get_response import SettingGetResponse as SettingGetResponse
 from .setting_update_params import SettingUpdateParams as SettingUpdateParams
-from .setting_update_response import SettingUpdateResponse as SettingUpdateResponse
 from .certificate_settings_param import CertificateSettingsParam as CertificateSettingsParam
diff --git a/src/cloudflare/types/zero_trust/access/certificates/certificate_settings.py b/src/cloudflare/types/zero_trust/access/certificates/certificate_settings.py
index 078403a29ef..f2307e896f0 100644
--- a/src/cloudflare/types/zero_trust/access/certificates/certificate_settings.py
+++ b/src/cloudflare/types/zero_trust/access/certificates/certificate_settings.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ....._models import BaseModel
 
 __all__ = ["CertificateSettings"]
diff --git a/src/cloudflare/types/zero_trust/access/certificates/setting_get_response.py b/src/cloudflare/types/zero_trust/access/certificates/setting_get_response.py
deleted file mode 100644
index 454c55986c2..00000000000
--- a/src/cloudflare/types/zero_trust/access/certificates/setting_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .certificate_settings import CertificateSettings
-
-__all__ = ["SettingGetResponse"]
-
-SettingGetResponse = List[CertificateSettings]
diff --git a/src/cloudflare/types/zero_trust/access/certificates/setting_update_response.py b/src/cloudflare/types/zero_trust/access/certificates/setting_update_response.py
deleted file mode 100644
index d3d17631972..00000000000
--- a/src/cloudflare/types/zero_trust/access/certificates/setting_update_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .certificate_settings import CertificateSettings
-
-__all__ = ["SettingUpdateResponse"]
-
-SettingUpdateResponse = List[CertificateSettings]
diff --git a/src/cloudflare/types/zero_trust/access/cors_headers_param.py b/src/cloudflare/types/zero_trust/access/cors_headers_param.py
index 2ddd6c8de42..ef9b94862bc 100644
--- a/src/cloudflare/types/zero_trust/access/cors_headers_param.py
+++ b/src/cloudflare/types/zero_trust/access/cors_headers_param.py
@@ -5,6 +5,7 @@
 from typing import List
 from typing_extensions import TypedDict
 
+from ...._types import SequenceNotStr
 from .allowed_headers import AllowedHeaders
 from .allowed_methods import AllowedMethods
 from .allowed_origins import AllowedOrigins
@@ -28,13 +29,13 @@ class CORSHeadersParam(TypedDict, total=False):
     client certificates) with requests.
     """
 
-    allowed_headers: List[AllowedHeaders]
+    allowed_headers: SequenceNotStr[AllowedHeaders]
     """Allowed HTTP request headers."""
 
     allowed_methods: List[AllowedMethods]
     """Allowed HTTP request methods."""
 
-    allowed_origins: List[AllowedOrigins]
+    allowed_origins: SequenceNotStr[AllowedOrigins]
     """Allowed origins."""
 
     max_age: float
diff --git a/src/cloudflare/types/zero_trust/access/custom_page.py b/src/cloudflare/types/zero_trust/access/custom_page.py
index 4593071d37a..d234043f1e4 100644
--- a/src/cloudflare/types/zero_trust/access/custom_page.py
+++ b/src/cloudflare/types/zero_trust/access/custom_page.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ...._models import BaseModel
@@ -19,12 +18,5 @@ class CustomPage(BaseModel):
     type: Literal["identity_denied", "forbidden"]
     """Custom page type."""
 
-    app_count: Optional[int] = None
-    """Number of apps the custom page is assigned to."""
-
-    created_at: Optional[datetime] = None
-
     uid: Optional[str] = None
-    """UUID"""
-
-    updated_at: Optional[datetime] = None
+    """UUID."""
diff --git a/src/cloudflare/types/zero_trust/access/custom_page_create_params.py b/src/cloudflare/types/zero_trust/access/custom_page_create_params.py
index efbeea447fb..ce8b80d12b5 100644
--- a/src/cloudflare/types/zero_trust/access/custom_page_create_params.py
+++ b/src/cloudflare/types/zero_trust/access/custom_page_create_params.py
@@ -2,18 +2,14 @@
 
 from __future__ import annotations
 
-from typing import Union
-from datetime import datetime
-from typing_extensions import Literal, Required, Annotated, TypedDict
-
-from ...._utils import PropertyInfo
+from typing_extensions import Literal, Required, TypedDict
 
 __all__ = ["CustomPageCreateParams"]
 
 
 class CustomPageCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     custom_html: Required[str]
     """Custom page HTML."""
@@ -23,13 +19,3 @@ class CustomPageCreateParams(TypedDict, total=False):
 
     type: Required[Literal["identity_denied", "forbidden"]]
     """Custom page type."""
-
-    app_count: int
-    """Number of apps the custom page is assigned to."""
-
-    created_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-
-    uid: str
-    """UUID"""
-
-    updated_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
diff --git a/src/cloudflare/types/zero_trust/access/custom_page_delete_response.py b/src/cloudflare/types/zero_trust/access/custom_page_delete_response.py
index bb6e38bee3b..17a63e5c56c 100644
--- a/src/cloudflare/types/zero_trust/access/custom_page_delete_response.py
+++ b/src/cloudflare/types/zero_trust/access/custom_page_delete_response.py
@@ -9,4 +9,4 @@
 
 class CustomPageDeleteResponse(BaseModel):
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
diff --git a/src/cloudflare/types/zero_trust/access/custom_page_list_params.py b/src/cloudflare/types/zero_trust/access/custom_page_list_params.py
new file mode 100644
index 00000000000..2cb0f7545b7
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/custom_page_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["CustomPageListParams"]
+
+
+class CustomPageListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    page: int
+    """Page number of results."""
+
+    per_page: int
+    """Number of results per page."""
diff --git a/src/cloudflare/types/zero_trust/access/custom_page_update_params.py b/src/cloudflare/types/zero_trust/access/custom_page_update_params.py
index 05ec96c1ac0..1b82f6cf05b 100644
--- a/src/cloudflare/types/zero_trust/access/custom_page_update_params.py
+++ b/src/cloudflare/types/zero_trust/access/custom_page_update_params.py
@@ -2,18 +2,14 @@
 
 from __future__ import annotations
 
-from typing import Union
-from datetime import datetime
-from typing_extensions import Literal, Required, Annotated, TypedDict
-
-from ...._utils import PropertyInfo
+from typing_extensions import Literal, Required, TypedDict
 
 __all__ = ["CustomPageUpdateParams"]
 
 
 class CustomPageUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     custom_html: Required[str]
     """Custom page HTML."""
@@ -23,13 +19,3 @@ class CustomPageUpdateParams(TypedDict, total=False):
 
     type: Required[Literal["identity_denied", "forbidden"]]
     """Custom page type."""
-
-    app_count: int
-    """Number of apps the custom page is assigned to."""
-
-    created_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-
-    uid: str
-    """UUID"""
-
-    updated_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
diff --git a/src/cloudflare/types/zero_trust/access/custom_page_without_html.py b/src/cloudflare/types/zero_trust/access/custom_page_without_html.py
index d0aecfa61f5..50e918ad5db 100644
--- a/src/cloudflare/types/zero_trust/access/custom_page_without_html.py
+++ b/src/cloudflare/types/zero_trust/access/custom_page_without_html.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ...._models import BaseModel
@@ -16,12 +15,5 @@ class CustomPageWithoutHTML(BaseModel):
     type: Literal["identity_denied", "forbidden"]
     """Custom page type."""
 
-    app_count: Optional[int] = None
-    """Number of apps the custom page is assigned to."""
-
-    created_at: Optional[datetime] = None
-
     uid: Optional[str] = None
-    """UUID"""
-
-    updated_at: Optional[datetime] = None
+    """UUID."""
diff --git a/src/cloudflare/types/zero_trust/access/decision.py b/src/cloudflare/types/zero_trust/access/decision.py
index 25de36df150..9a994691d3e 100644
--- a/src/cloudflare/types/zero_trust/access/decision.py
+++ b/src/cloudflare/types/zero_trust/access/decision.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["Decision"]
 
-Decision = Literal["allow", "deny", "non_identity", "bypass"]
+Decision: TypeAlias = Literal["allow", "deny", "non_identity", "bypass"]
diff --git a/src/cloudflare/types/zero_trust/access/gateway_ca_create_response.py b/src/cloudflare/types/zero_trust/access/gateway_ca_create_response.py
new file mode 100644
index 00000000000..42288b6edad
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/gateway_ca_create_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ...._models import BaseModel
+
+__all__ = ["GatewayCACreateResponse"]
+
+
+class GatewayCACreateResponse(BaseModel):
+    id: Optional[str] = None
+    """The key ID of this certificate."""
+
+    public_key: Optional[str] = None
+    """The public key of this certificate."""
diff --git a/src/cloudflare/types/zero_trust/access/gateway_ca_delete_response.py b/src/cloudflare/types/zero_trust/access/gateway_ca_delete_response.py
new file mode 100644
index 00000000000..70184fcd5c2
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/gateway_ca_delete_response.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ...._models import BaseModel
+
+__all__ = ["GatewayCADeleteResponse"]
+
+
+class GatewayCADeleteResponse(BaseModel):
+    id: Optional[str] = None
+    """UUID."""
diff --git a/src/cloudflare/types/zero_trust/access/gateway_ca_list_response.py b/src/cloudflare/types/zero_trust/access/gateway_ca_list_response.py
new file mode 100644
index 00000000000..4a1ebc3f0b2
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/gateway_ca_list_response.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ...._models import BaseModel
+
+__all__ = ["GatewayCAListResponse"]
+
+
+class GatewayCAListResponse(BaseModel):
+    id: Optional[str] = None
+    """The key ID of this certificate."""
+
+    public_key: Optional[str] = None
+    """The public key of this certificate."""
diff --git a/src/cloudflare/types/zero_trust/access/group_create_params.py b/src/cloudflare/types/zero_trust/access/group_create_params.py
index 04c7006d842..c507a5fc68f 100644
--- a/src/cloudflare/types/zero_trust/access/group_create_params.py
+++ b/src/cloudflare/types/zero_trust/access/group_create_params.py
@@ -5,7 +5,7 @@
 from typing import Iterable
 from typing_extensions import Required, TypedDict
 
-from ..access_rule_param import AccessRuleParam
+from .applications.access_rule_param import AccessRuleParam
 
 __all__ = ["GroupCreateParams"]
 
diff --git a/src/cloudflare/types/zero_trust/access/group_create_response.py b/src/cloudflare/types/zero_trust/access/group_create_response.py
new file mode 100644
index 00000000000..3f5433489f8
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/group_create_response.py
@@ -0,0 +1,40 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ...._models import BaseModel
+from .applications.access_rule import AccessRule
+
+__all__ = ["GroupCreateResponse"]
+
+
+class GroupCreateResponse(BaseModel):
+    id: Optional[str] = None
+    """UUID."""
+
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
+
+    To match a policy, a user cannot meet any of the Exclude rules.
+    """
+
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
+
+    A user needs to meet only one of the Include rules.
+    """
+
+    is_default: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match a policy, a user must meet all of the Require rules.
+    """
+
+    name: Optional[str] = None
+    """The name of the Access group."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match a policy, a user must meet all of the Require rules.
+    """
diff --git a/src/cloudflare/types/zero_trust/access/group_delete_response.py b/src/cloudflare/types/zero_trust/access/group_delete_response.py
index 4f17b96b793..1cca6cdc9d0 100644
--- a/src/cloudflare/types/zero_trust/access/group_delete_response.py
+++ b/src/cloudflare/types/zero_trust/access/group_delete_response.py
@@ -9,4 +9,4 @@
 
 class GroupDeleteResponse(BaseModel):
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
diff --git a/src/cloudflare/types/zero_trust/access/group_get_response.py b/src/cloudflare/types/zero_trust/access/group_get_response.py
new file mode 100644
index 00000000000..b91e1dbeb93
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/group_get_response.py
@@ -0,0 +1,40 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ...._models import BaseModel
+from .applications.access_rule import AccessRule
+
+__all__ = ["GroupGetResponse"]
+
+
+class GroupGetResponse(BaseModel):
+    id: Optional[str] = None
+    """UUID."""
+
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
+
+    To match a policy, a user cannot meet any of the Exclude rules.
+    """
+
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
+
+    A user needs to meet only one of the Include rules.
+    """
+
+    is_default: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match a policy, a user must meet all of the Require rules.
+    """
+
+    name: Optional[str] = None
+    """The name of the Access group."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match a policy, a user must meet all of the Require rules.
+    """
diff --git a/src/cloudflare/types/zero_trust/access/group_list_params.py b/src/cloudflare/types/zero_trust/access/group_list_params.py
new file mode 100644
index 00000000000..8d566be76c9
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/group_list_params.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import TypedDict
+
+__all__ = ["GroupListParams"]
+
+
+class GroupListParams(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    name: str
+    """The name of the group."""
+
+    page: int
+    """Page number of results."""
+
+    per_page: int
+    """Number of results per page."""
+
+    search: str
+    """Search for groups by other listed query parameters."""
diff --git a/src/cloudflare/types/zero_trust/access/group_list_response.py b/src/cloudflare/types/zero_trust/access/group_list_response.py
new file mode 100644
index 00000000000..7deb528a103
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/group_list_response.py
@@ -0,0 +1,40 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ...._models import BaseModel
+from .applications.access_rule import AccessRule
+
+__all__ = ["GroupListResponse"]
+
+
+class GroupListResponse(BaseModel):
+    id: Optional[str] = None
+    """UUID."""
+
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
+
+    To match a policy, a user cannot meet any of the Exclude rules.
+    """
+
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
+
+    A user needs to meet only one of the Include rules.
+    """
+
+    is_default: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match a policy, a user must meet all of the Require rules.
+    """
+
+    name: Optional[str] = None
+    """The name of the Access group."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match a policy, a user must meet all of the Require rules.
+    """
diff --git a/src/cloudflare/types/zero_trust/access/group_update_params.py b/src/cloudflare/types/zero_trust/access/group_update_params.py
index 68672edb40e..1550b17a52b 100644
--- a/src/cloudflare/types/zero_trust/access/group_update_params.py
+++ b/src/cloudflare/types/zero_trust/access/group_update_params.py
@@ -5,7 +5,7 @@
 from typing import Iterable
 from typing_extensions import Required, TypedDict
 
-from ..access_rule_param import AccessRuleParam
+from .applications.access_rule_param import AccessRuleParam
 
 __all__ = ["GroupUpdateParams"]
 
diff --git a/src/cloudflare/types/zero_trust/access/group_update_response.py b/src/cloudflare/types/zero_trust/access/group_update_response.py
new file mode 100644
index 00000000000..bca167ec64a
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/group_update_response.py
@@ -0,0 +1,40 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ...._models import BaseModel
+from .applications.access_rule import AccessRule
+
+__all__ = ["GroupUpdateResponse"]
+
+
+class GroupUpdateResponse(BaseModel):
+    id: Optional[str] = None
+    """UUID."""
+
+    exclude: Optional[List[AccessRule]] = None
+    """Rules evaluated with a NOT logical operator.
+
+    To match a policy, a user cannot meet any of the Exclude rules.
+    """
+
+    include: Optional[List[AccessRule]] = None
+    """Rules evaluated with an OR logical operator.
+
+    A user needs to meet only one of the Include rules.
+    """
+
+    is_default: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match a policy, a user must meet all of the Require rules.
+    """
+
+    name: Optional[str] = None
+    """The name of the Access group."""
+
+    require: Optional[List[AccessRule]] = None
+    """Rules evaluated with an AND logical operator.
+
+    To match a policy, a user must meet all of the Require rules.
+    """
diff --git a/src/cloudflare/types/zero_trust/access/infrastructure/__init__.py b/src/cloudflare/types/zero_trust/access/infrastructure/__init__.py
new file mode 100644
index 00000000000..d1c28a04c09
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/infrastructure/__init__.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .target_list_params import TargetListParams as TargetListParams
+from .target_get_response import TargetGetResponse as TargetGetResponse
+from .target_create_params import TargetCreateParams as TargetCreateParams
+from .target_list_response import TargetListResponse as TargetListResponse
+from .target_update_params import TargetUpdateParams as TargetUpdateParams
+from .target_create_response import TargetCreateResponse as TargetCreateResponse
+from .target_update_response import TargetUpdateResponse as TargetUpdateResponse
+from .target_bulk_update_params import TargetBulkUpdateParams as TargetBulkUpdateParams
+from .target_bulk_update_response import TargetBulkUpdateResponse as TargetBulkUpdateResponse
+from .target_bulk_delete_v2_params import TargetBulkDeleteV2Params as TargetBulkDeleteV2Params
diff --git a/src/cloudflare/types/zero_trust/access/infrastructure/target_bulk_delete_v2_params.py b/src/cloudflare/types/zero_trust/access/infrastructure/target_bulk_delete_v2_params.py
new file mode 100644
index 00000000000..645b0c9ac78
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/infrastructure/target_bulk_delete_v2_params.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ....._types import SequenceNotStr
+
+__all__ = ["TargetBulkDeleteV2Params"]
+
+
+class TargetBulkDeleteV2Params(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier"""
+
+    target_ids: Required[SequenceNotStr[str]]
+    """List of target IDs to bulk delete"""
diff --git a/src/cloudflare/types/zero_trust/access/infrastructure/target_bulk_update_params.py b/src/cloudflare/types/zero_trust/access/infrastructure/target_bulk_update_params.py
new file mode 100644
index 00000000000..df2dd331801
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/infrastructure/target_bulk_update_params.py
@@ -0,0 +1,64 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+__all__ = ["TargetBulkUpdateParams", "Body", "BodyIP", "BodyIPIPV4", "BodyIPIPV6"]
+
+
+class TargetBulkUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier"""
+
+    body: Required[Iterable[Body]]
+
+
+class BodyIPIPV4(TypedDict, total=False):
+    """The target's IPv4 address"""
+
+    ip_addr: str
+    """IP address of the target"""
+
+    virtual_network_id: str
+    """(optional) Private virtual network identifier for the target.
+
+    If omitted, the default virtual network ID will be used.
+    """
+
+
+class BodyIPIPV6(TypedDict, total=False):
+    """The target's IPv6 address"""
+
+    ip_addr: str
+    """IP address of the target"""
+
+    virtual_network_id: str
+    """(optional) Private virtual network identifier for the target.
+
+    If omitted, the default virtual network ID will be used.
+    """
+
+
+class BodyIP(TypedDict, total=False):
+    """The IPv4/IPv6 address that identifies where to reach a target"""
+
+    ipv4: BodyIPIPV4
+    """The target's IPv4 address"""
+
+    ipv6: BodyIPIPV6
+    """The target's IPv6 address"""
+
+
+class Body(TypedDict, total=False):
+    hostname: Required[str]
+    """A non-unique field that refers to a target.
+
+    Case insensitive, maximum length of 255 characters, supports the use of special
+    characters dash and period, does not support spaces, and must start and end with
+    an alphanumeric character.
+    """
+
+    ip: Required[BodyIP]
+    """The IPv4/IPv6 address that identifies where to reach a target"""
diff --git a/src/cloudflare/types/zero_trust/access/infrastructure/target_bulk_update_response.py b/src/cloudflare/types/zero_trust/access/infrastructure/target_bulk_update_response.py
new file mode 100644
index 00000000000..55f4e64b802
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/infrastructure/target_bulk_update_response.py
@@ -0,0 +1,61 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ....._models import BaseModel
+
+__all__ = ["TargetBulkUpdateResponse", "IP", "IPIPV4", "IPIPV6"]
+
+
+class IPIPV4(BaseModel):
+    """The target's IPv4 address"""
+
+    ip_addr: Optional[str] = None
+    """IP address of the target"""
+
+    virtual_network_id: Optional[str] = None
+    """(optional) Private virtual network identifier for the target.
+
+    If omitted, the default virtual network ID will be used.
+    """
+
+
+class IPIPV6(BaseModel):
+    """The target's IPv6 address"""
+
+    ip_addr: Optional[str] = None
+    """IP address of the target"""
+
+    virtual_network_id: Optional[str] = None
+    """(optional) Private virtual network identifier for the target.
+
+    If omitted, the default virtual network ID will be used.
+    """
+
+
+class IP(BaseModel):
+    """The IPv4/IPv6 address that identifies where to reach a target"""
+
+    ipv4: Optional[IPIPV4] = None
+    """The target's IPv4 address"""
+
+    ipv6: Optional[IPIPV6] = None
+    """The target's IPv6 address"""
+
+
+class TargetBulkUpdateResponse(BaseModel):
+    id: str
+    """Target identifier"""
+
+    created_at: datetime
+    """Date and time at which the target was created"""
+
+    hostname: str
+    """A non-unique field that refers to a target"""
+
+    ip: IP
+    """The IPv4/IPv6 address that identifies where to reach a target"""
+
+    modified_at: datetime
+    """Date and time at which the target was modified"""
diff --git a/src/cloudflare/types/zero_trust/access/infrastructure/target_create_params.py b/src/cloudflare/types/zero_trust/access/infrastructure/target_create_params.py
new file mode 100644
index 00000000000..465af47967d
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/infrastructure/target_create_params.py
@@ -0,0 +1,59 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["TargetCreateParams", "IP", "IPIPV4", "IPIPV6"]
+
+
+class TargetCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier"""
+
+    hostname: Required[str]
+    """A non-unique field that refers to a target.
+
+    Case insensitive, maximum length of 255 characters, supports the use of special
+    characters dash and period, does not support spaces, and must start and end with
+    an alphanumeric character.
+    """
+
+    ip: Required[IP]
+    """The IPv4/IPv6 address that identifies where to reach a target"""
+
+
+class IPIPV4(TypedDict, total=False):
+    """The target's IPv4 address"""
+
+    ip_addr: str
+    """IP address of the target"""
+
+    virtual_network_id: str
+    """(optional) Private virtual network identifier for the target.
+
+    If omitted, the default virtual network ID will be used.
+    """
+
+
+class IPIPV6(TypedDict, total=False):
+    """The target's IPv6 address"""
+
+    ip_addr: str
+    """IP address of the target"""
+
+    virtual_network_id: str
+    """(optional) Private virtual network identifier for the target.
+
+    If omitted, the default virtual network ID will be used.
+    """
+
+
+class IP(TypedDict, total=False):
+    """The IPv4/IPv6 address that identifies where to reach a target"""
+
+    ipv4: IPIPV4
+    """The target's IPv4 address"""
+
+    ipv6: IPIPV6
+    """The target's IPv6 address"""
diff --git a/src/cloudflare/types/zero_trust/access/infrastructure/target_create_response.py b/src/cloudflare/types/zero_trust/access/infrastructure/target_create_response.py
new file mode 100644
index 00000000000..74bd2cc9650
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/infrastructure/target_create_response.py
@@ -0,0 +1,61 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ....._models import BaseModel
+
+__all__ = ["TargetCreateResponse", "IP", "IPIPV4", "IPIPV6"]
+
+
+class IPIPV4(BaseModel):
+    """The target's IPv4 address"""
+
+    ip_addr: Optional[str] = None
+    """IP address of the target"""
+
+    virtual_network_id: Optional[str] = None
+    """(optional) Private virtual network identifier for the target.
+
+    If omitted, the default virtual network ID will be used.
+    """
+
+
+class IPIPV6(BaseModel):
+    """The target's IPv6 address"""
+
+    ip_addr: Optional[str] = None
+    """IP address of the target"""
+
+    virtual_network_id: Optional[str] = None
+    """(optional) Private virtual network identifier for the target.
+
+    If omitted, the default virtual network ID will be used.
+    """
+
+
+class IP(BaseModel):
+    """The IPv4/IPv6 address that identifies where to reach a target"""
+
+    ipv4: Optional[IPIPV4] = None
+    """The target's IPv4 address"""
+
+    ipv6: Optional[IPIPV6] = None
+    """The target's IPv6 address"""
+
+
+class TargetCreateResponse(BaseModel):
+    id: str
+    """Target identifier"""
+
+    created_at: datetime
+    """Date and time at which the target was created"""
+
+    hostname: str
+    """A non-unique field that refers to a target"""
+
+    ip: IP
+    """The IPv4/IPv6 address that identifies where to reach a target"""
+
+    modified_at: datetime
+    """Date and time at which the target was modified"""
diff --git a/src/cloudflare/types/zero_trust/access/infrastructure/target_get_response.py b/src/cloudflare/types/zero_trust/access/infrastructure/target_get_response.py
new file mode 100644
index 00000000000..442e8975813
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/infrastructure/target_get_response.py
@@ -0,0 +1,61 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ....._models import BaseModel
+
+__all__ = ["TargetGetResponse", "IP", "IPIPV4", "IPIPV6"]
+
+
+class IPIPV4(BaseModel):
+    """The target's IPv4 address"""
+
+    ip_addr: Optional[str] = None
+    """IP address of the target"""
+
+    virtual_network_id: Optional[str] = None
+    """(optional) Private virtual network identifier for the target.
+
+    If omitted, the default virtual network ID will be used.
+    """
+
+
+class IPIPV6(BaseModel):
+    """The target's IPv6 address"""
+
+    ip_addr: Optional[str] = None
+    """IP address of the target"""
+
+    virtual_network_id: Optional[str] = None
+    """(optional) Private virtual network identifier for the target.
+
+    If omitted, the default virtual network ID will be used.
+    """
+
+
+class IP(BaseModel):
+    """The IPv4/IPv6 address that identifies where to reach a target"""
+
+    ipv4: Optional[IPIPV4] = None
+    """The target's IPv4 address"""
+
+    ipv6: Optional[IPIPV6] = None
+    """The target's IPv6 address"""
+
+
+class TargetGetResponse(BaseModel):
+    id: str
+    """Target identifier"""
+
+    created_at: datetime
+    """Date and time at which the target was created"""
+
+    hostname: str
+    """A non-unique field that refers to a target"""
+
+    ip: IP
+    """The IPv4/IPv6 address that identifies where to reach a target"""
+
+    modified_at: datetime
+    """Date and time at which the target was modified"""
diff --git a/src/cloudflare/types/zero_trust/access/infrastructure/target_list_params.py b/src/cloudflare/types/zero_trust/access/infrastructure/target_list_params.py
new file mode 100644
index 00000000000..210b5e5fe2c
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/infrastructure/target_list_params.py
@@ -0,0 +1,99 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ....._types import SequenceNotStr
+from ....._utils import PropertyInfo
+
+__all__ = ["TargetListParams"]
+
+
+class TargetListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier"""
+
+    created_after: Annotated[Union[str, datetime, None], PropertyInfo(format="iso8601")]
+    """Date and time at which the target was created after (inclusive)"""
+
+    created_before: Annotated[Union[str, datetime, None], PropertyInfo(format="iso8601")]
+    """Date and time at which the target was created before (inclusive)"""
+
+    direction: Literal["asc", "desc"]
+    """The sorting direction."""
+
+    hostname: Optional[str]
+    """Hostname of a target"""
+
+    hostname_contains: Optional[str]
+    """Partial match to the hostname of a target"""
+
+    ip_like: Optional[str]
+    """
+    Filters for targets whose IP addresses look like the specified string. Supports
+    `*` as a wildcard character
+    """
+
+    ip_v4: Optional[str]
+    """IPv4 address of the target"""
+
+    ip_v6: Optional[str]
+    """IPv6 address of the target"""
+
+    ips: SequenceNotStr[str]
+    """Filters for targets that have any of the following IP addresses.
+
+    Specify `ips` multiple times in query parameter to build list of candidates.
+    """
+
+    ipv4_end: Optional[str]
+    """Defines an IPv4 filter range's ending value (inclusive).
+
+    Requires `ipv4_start` to be specified as well.
+    """
+
+    ipv4_start: Optional[str]
+    """Defines an IPv4 filter range's starting value (inclusive).
+
+    Requires `ipv4_end` to be specified as well.
+    """
+
+    ipv6_end: Optional[str]
+    """Defines an IPv6 filter range's ending value (inclusive).
+
+    Requires `ipv6_start` to be specified as well.
+    """
+
+    ipv6_start: Optional[str]
+    """Defines an IPv6 filter range's starting value (inclusive).
+
+    Requires `ipv6_end` to be specified as well.
+    """
+
+    modified_after: Annotated[Union[str, datetime, None], PropertyInfo(format="iso8601")]
+    """Date and time at which the target was modified after (inclusive)"""
+
+    modified_before: Annotated[Union[str, datetime, None], PropertyInfo(format="iso8601")]
+    """Date and time at which the target was modified before (inclusive)"""
+
+    order: Literal["hostname", "created_at"]
+    """The field to sort by."""
+
+    page: int
+    """Current page in the response"""
+
+    per_page: int
+    """Max amount of entries returned per page"""
+
+    target_ids: SequenceNotStr[str]
+    """Filters for targets that have any of the following UUIDs.
+
+    Specify `target_ids` multiple times in query parameter to build list of
+    candidates.
+    """
+
+    virtual_network_id: Optional[str]
+    """Private virtual network identifier of the target"""
diff --git a/src/cloudflare/types/zero_trust/access/infrastructure/target_list_response.py b/src/cloudflare/types/zero_trust/access/infrastructure/target_list_response.py
new file mode 100644
index 00000000000..4ceb74b12cc
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/infrastructure/target_list_response.py
@@ -0,0 +1,61 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ....._models import BaseModel
+
+__all__ = ["TargetListResponse", "IP", "IPIPV4", "IPIPV6"]
+
+
+class IPIPV4(BaseModel):
+    """The target's IPv4 address"""
+
+    ip_addr: Optional[str] = None
+    """IP address of the target"""
+
+    virtual_network_id: Optional[str] = None
+    """(optional) Private virtual network identifier for the target.
+
+    If omitted, the default virtual network ID will be used.
+    """
+
+
+class IPIPV6(BaseModel):
+    """The target's IPv6 address"""
+
+    ip_addr: Optional[str] = None
+    """IP address of the target"""
+
+    virtual_network_id: Optional[str] = None
+    """(optional) Private virtual network identifier for the target.
+
+    If omitted, the default virtual network ID will be used.
+    """
+
+
+class IP(BaseModel):
+    """The IPv4/IPv6 address that identifies where to reach a target"""
+
+    ipv4: Optional[IPIPV4] = None
+    """The target's IPv4 address"""
+
+    ipv6: Optional[IPIPV6] = None
+    """The target's IPv6 address"""
+
+
+class TargetListResponse(BaseModel):
+    id: str
+    """Target identifier"""
+
+    created_at: datetime
+    """Date and time at which the target was created"""
+
+    hostname: str
+    """A non-unique field that refers to a target"""
+
+    ip: IP
+    """The IPv4/IPv6 address that identifies where to reach a target"""
+
+    modified_at: datetime
+    """Date and time at which the target was modified"""
diff --git a/src/cloudflare/types/zero_trust/access/infrastructure/target_update_params.py b/src/cloudflare/types/zero_trust/access/infrastructure/target_update_params.py
new file mode 100644
index 00000000000..1728fcc15f3
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/infrastructure/target_update_params.py
@@ -0,0 +1,59 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["TargetUpdateParams", "IP", "IPIPV4", "IPIPV6"]
+
+
+class TargetUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Account identifier"""
+
+    hostname: Required[str]
+    """A non-unique field that refers to a target.
+
+    Case insensitive, maximum length of 255 characters, supports the use of special
+    characters dash and period, does not support spaces, and must start and end with
+    an alphanumeric character.
+    """
+
+    ip: Required[IP]
+    """The IPv4/IPv6 address that identifies where to reach a target"""
+
+
+class IPIPV4(TypedDict, total=False):
+    """The target's IPv4 address"""
+
+    ip_addr: str
+    """IP address of the target"""
+
+    virtual_network_id: str
+    """(optional) Private virtual network identifier for the target.
+
+    If omitted, the default virtual network ID will be used.
+    """
+
+
+class IPIPV6(TypedDict, total=False):
+    """The target's IPv6 address"""
+
+    ip_addr: str
+    """IP address of the target"""
+
+    virtual_network_id: str
+    """(optional) Private virtual network identifier for the target.
+
+    If omitted, the default virtual network ID will be used.
+    """
+
+
+class IP(TypedDict, total=False):
+    """The IPv4/IPv6 address that identifies where to reach a target"""
+
+    ipv4: IPIPV4
+    """The target's IPv4 address"""
+
+    ipv6: IPIPV6
+    """The target's IPv6 address"""
diff --git a/src/cloudflare/types/zero_trust/access/infrastructure/target_update_response.py b/src/cloudflare/types/zero_trust/access/infrastructure/target_update_response.py
new file mode 100644
index 00000000000..172014a402d
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/infrastructure/target_update_response.py
@@ -0,0 +1,61 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ....._models import BaseModel
+
+__all__ = ["TargetUpdateResponse", "IP", "IPIPV4", "IPIPV6"]
+
+
+class IPIPV4(BaseModel):
+    """The target's IPv4 address"""
+
+    ip_addr: Optional[str] = None
+    """IP address of the target"""
+
+    virtual_network_id: Optional[str] = None
+    """(optional) Private virtual network identifier for the target.
+
+    If omitted, the default virtual network ID will be used.
+    """
+
+
+class IPIPV6(BaseModel):
+    """The target's IPv6 address"""
+
+    ip_addr: Optional[str] = None
+    """IP address of the target"""
+
+    virtual_network_id: Optional[str] = None
+    """(optional) Private virtual network identifier for the target.
+
+    If omitted, the default virtual network ID will be used.
+    """
+
+
+class IP(BaseModel):
+    """The IPv4/IPv6 address that identifies where to reach a target"""
+
+    ipv4: Optional[IPIPV4] = None
+    """The target's IPv4 address"""
+
+    ipv6: Optional[IPIPV6] = None
+    """The target's IPv6 address"""
+
+
+class TargetUpdateResponse(BaseModel):
+    id: str
+    """Target identifier"""
+
+    created_at: datetime
+    """Date and time at which the target was created"""
+
+    hostname: str
+    """A non-unique field that refers to a target"""
+
+    ip: IP
+    """The IPv4/IPv6 address that identifies where to reach a target"""
+
+    modified_at: datetime
+    """Date and time at which the target was modified"""
diff --git a/src/cloudflare/types/zero_trust/access/key_get_response.py b/src/cloudflare/types/zero_trust/access/key_get_response.py
index 79cfd988d58..920d59e1dd5 100644
--- a/src/cloudflare/types/zero_trust/access/key_get_response.py
+++ b/src/cloudflare/types/zero_trust/access/key_get_response.py
@@ -1,7 +1,19 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
 
 __all__ = ["KeyGetResponse"]
 
-KeyGetResponse = Union[str, object]
+
+class KeyGetResponse(BaseModel):
+    days_until_next_rotation: Optional[float] = None
+    """The number of days until the next key rotation."""
+
+    key_rotation_interval_days: Optional[float] = None
+    """The number of days between key rotations."""
+
+    last_key_rotation_at: Optional[datetime] = None
+    """The timestamp of the previous key rotation."""
diff --git a/src/cloudflare/types/zero_trust/access/key_rotate_response.py b/src/cloudflare/types/zero_trust/access/key_rotate_response.py
index 1ababd82b3c..0797cb2d05e 100644
--- a/src/cloudflare/types/zero_trust/access/key_rotate_response.py
+++ b/src/cloudflare/types/zero_trust/access/key_rotate_response.py
@@ -1,7 +1,19 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
 
 __all__ = ["KeyRotateResponse"]
 
-KeyRotateResponse = Union[str, object]
+
+class KeyRotateResponse(BaseModel):
+    days_until_next_rotation: Optional[float] = None
+    """The number of days until the next key rotation."""
+
+    key_rotation_interval_days: Optional[float] = None
+    """The number of days between key rotations."""
+
+    last_key_rotation_at: Optional[datetime] = None
+    """The timestamp of the previous key rotation."""
diff --git a/src/cloudflare/types/zero_trust/access/key_update_params.py b/src/cloudflare/types/zero_trust/access/key_update_params.py
index b42e919649b..8eb5a1c7049 100644
--- a/src/cloudflare/types/zero_trust/access/key_update_params.py
+++ b/src/cloudflare/types/zero_trust/access/key_update_params.py
@@ -9,7 +9,7 @@
 
 class KeyUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     key_rotation_interval_days: Required[float]
     """The number of days between key rotations."""
diff --git a/src/cloudflare/types/zero_trust/access/key_update_response.py b/src/cloudflare/types/zero_trust/access/key_update_response.py
index a63396635f6..e3112c70730 100644
--- a/src/cloudflare/types/zero_trust/access/key_update_response.py
+++ b/src/cloudflare/types/zero_trust/access/key_update_response.py
@@ -1,7 +1,19 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
 
 __all__ = ["KeyUpdateResponse"]
 
-KeyUpdateResponse = Union[str, object]
+
+class KeyUpdateResponse(BaseModel):
+    days_until_next_rotation: Optional[float] = None
+    """The number of days until the next key rotation."""
+
+    key_rotation_interval_days: Optional[float] = None
+    """The number of days between key rotations."""
+
+    last_key_rotation_at: Optional[datetime] = None
+    """The timestamp of the previous key rotation."""
diff --git a/src/cloudflare/types/zero_trust/access/logs/__init__.py b/src/cloudflare/types/zero_trust/access/logs/__init__.py
index 6054daa920f..a6057a5095f 100644
--- a/src/cloudflare/types/zero_trust/access/logs/__init__.py
+++ b/src/cloudflare/types/zero_trust/access/logs/__init__.py
@@ -2,6 +2,6 @@
 
 from __future__ import annotations
 
-from .access_requests import AccessRequests as AccessRequests
+from .access_request import AccessRequest as AccessRequest
 from .access_request_list_params import AccessRequestListParams as AccessRequestListParams
 from .access_request_list_response import AccessRequestListResponse as AccessRequestListResponse
diff --git a/src/cloudflare/types/zero_trust/access/logs/access_request.py b/src/cloudflare/types/zero_trust/access/logs/access_request.py
new file mode 100644
index 00000000000..196239befc8
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/logs/access_request.py
@@ -0,0 +1,38 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = ["AccessRequest"]
+
+
+class AccessRequest(BaseModel):
+    action: Optional[str] = None
+    """The event that occurred, such as a login attempt."""
+
+    allowed: Optional[bool] = None
+    """The result of the authentication event."""
+
+    app_domain: Optional[str] = None
+    """The URL of the Access application."""
+
+    app_uid: Optional[str] = None
+    """The unique identifier for the Access application."""
+
+    connection: Optional[str] = None
+    """The IdP used to authenticate."""
+
+    created_at: Optional[datetime] = None
+
+    ip_address: Optional[str] = None
+    """The IP address of the authenticating user."""
+
+    rayid: Optional[str] = FieldInfo(alias="ray_id", default=None)
+    """The unique identifier for the request to Cloudflare."""
+
+    user_email: Optional[str] = None
+    """The email address of the authenticating user."""
diff --git a/src/cloudflare/types/zero_trust/access/logs/access_request_list_params.py b/src/cloudflare/types/zero_trust/access/logs/access_request_list_params.py
index 13be0a7d46b..feec9798fb7 100644
--- a/src/cloudflare/types/zero_trust/access/logs/access_request_list_params.py
+++ b/src/cloudflare/types/zero_trust/access/logs/access_request_list_params.py
@@ -13,16 +13,37 @@
 
 class AccessRequestListParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     direction: Literal["desc", "asc"]
     """The chronological sorting order for the logs."""
 
+    email: str
+    """Filter by user email.
+
+    Defaults to substring matching. To force exact matching, set `email_exact=true`.
+    Example (default): `email=@example.com` returns all events with that domain.
+    Example (exact): `email=user@example.com&email_exact=true` returns only that
+    user.
+    """
+
+    email_exact: bool
+    """When true, `email` is matched exactly instead of substring matching."""
+
     limit: int
     """The maximum number of log entries to retrieve."""
 
+    page: int
+    """Page number of results."""
+
+    per_page: int
+    """Number of results per page."""
+
     since: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
     """The earliest event timestamp to query."""
 
     until: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
     """The latest event timestamp to query."""
+
+    user_id: str
+    """Filter by user UUID."""
diff --git a/src/cloudflare/types/zero_trust/access/logs/access_request_list_response.py b/src/cloudflare/types/zero_trust/access/logs/access_request_list_response.py
index b48a60046d9..1baf2a06331 100644
--- a/src/cloudflare/types/zero_trust/access/logs/access_request_list_response.py
+++ b/src/cloudflare/types/zero_trust/access/logs/access_request_list_response.py
@@ -1,9 +1,10 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from typing_extensions import TypeAlias
 
-from .access_requests import AccessRequests
+from .access_request import AccessRequest
 
 __all__ = ["AccessRequestListResponse"]
 
-AccessRequestListResponse = List[AccessRequests]
+AccessRequestListResponse: TypeAlias = List[AccessRequest]
diff --git a/src/cloudflare/types/zero_trust/access/logs/access_requests.py b/src/cloudflare/types/zero_trust/access/logs/access_requests.py
deleted file mode 100644
index 7baca33ef79..00000000000
--- a/src/cloudflare/types/zero_trust/access/logs/access_requests.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from datetime import datetime
-
-from pydantic import Field as FieldInfo
-
-from ....._models import BaseModel
-
-__all__ = ["AccessRequests"]
-
-
-class AccessRequests(BaseModel):
-    action: Optional[str] = None
-    """The event that occurred, such as a login attempt."""
-
-    allowed: Optional[bool] = None
-    """The result of the authentication event."""
-
-    app_domain: Optional[str] = None
-    """The URL of the Access application."""
-
-    app_uid: Optional[str] = None
-    """The unique identifier for the Access application."""
-
-    connection: Optional[str] = None
-    """The IdP used to authenticate."""
-
-    created_at: Optional[datetime] = None
-
-    ip_address: Optional[str] = None
-    """The IP address of the authenticating user."""
-
-    rayid: Optional[str] = FieldInfo(alias="ray_id", default=None)
-    """The unique identifier for the request to Cloudflare."""
-
-    user_email: Optional[str] = None
-    """The email address of the authenticating user."""
diff --git a/src/cloudflare/types/zero_trust/access/logs/scim/__init__.py b/src/cloudflare/types/zero_trust/access/logs/scim/__init__.py
new file mode 100644
index 00000000000..4082ace4688
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/logs/scim/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .update_list_params import UpdateListParams as UpdateListParams
+from .update_list_response import UpdateListResponse as UpdateListResponse
diff --git a/src/cloudflare/types/zero_trust/access/logs/scim/update_list_params.py b/src/cloudflare/types/zero_trust/access/logs/scim/update_list_params.py
new file mode 100644
index 00000000000..6ef5bb55bb5
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/logs/scim/update_list_params.py
@@ -0,0 +1,59 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Union
+from datetime import datetime
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ......_types import SequenceNotStr
+from ......_utils import PropertyInfo
+
+__all__ = ["UpdateListParams"]
+
+
+class UpdateListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    idp_id: Required[SequenceNotStr[str]]
+    """The unique Id of the IdP that has SCIM enabled."""
+
+    cf_resource_id: str
+    """The unique Cloudflare-generated Id of the SCIM resource."""
+
+    direction: Literal["desc", "asc"]
+    """The chronological order used to sort the logs."""
+
+    idp_resource_id: str
+    """The IdP-generated Id of the SCIM resource."""
+
+    limit: int
+    """The maximum number of update logs to retrieve."""
+
+    page: int
+    """Page number of results."""
+
+    per_page: int
+    """Number of results per page."""
+
+    request_method: List[Literal["DELETE", "PATCH", "POST", "PUT"]]
+    """The request method of the SCIM request."""
+
+    resource_group_name: str
+    """The display name of the SCIM Group resource."""
+
+    resource_type: List[Literal["USER", "GROUP"]]
+    """The resource type of the SCIM request."""
+
+    resource_user_email: str
+    """The email address of the SCIM User resource."""
+
+    since: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """the timestamp of the earliest update log."""
+
+    status: List[Literal["FAILURE", "SUCCESS"]]
+    """The status of the SCIM request."""
+
+    until: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """the timestamp of the most-recent update log."""
diff --git a/src/cloudflare/types/zero_trust/access/logs/scim/update_list_response.py b/src/cloudflare/types/zero_trust/access/logs/scim/update_list_response.py
new file mode 100644
index 00000000000..f01d78e7e4f
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/logs/scim/update_list_response.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ......_models import BaseModel
+
+__all__ = ["UpdateListResponse"]
+
+
+class UpdateListResponse(BaseModel):
+    cf_resource_id: Optional[str] = None
+    """The unique Cloudflare-generated Id of the SCIM resource."""
+
+    error_description: Optional[str] = None
+    """
+    The error message which is generated when the status of the SCIM request is
+    'FAILURE'.
+    """
+
+    idp_id: Optional[str] = None
+    """The unique Id of the IdP that has SCIM enabled."""
+
+    idp_resource_id: Optional[str] = None
+    """The IdP-generated Id of the SCIM resource."""
+
+    logged_at: Optional[datetime] = None
+
+    request_body: Optional[str] = None
+    """The JSON-encoded string body of the SCIM request."""
+
+    request_method: Optional[str] = None
+    """The request method of the SCIM request."""
+
+    resource_group_name: Optional[str] = None
+    """The display name of the SCIM Group resource if it exists."""
+
+    resource_type: Optional[str] = None
+    """The resource type of the SCIM request."""
+
+    resource_user_email: Optional[str] = None
+    """The email address of the SCIM User resource if it exists."""
+
+    status: Optional[str] = None
+    """The status of the SCIM request."""
diff --git a/src/cloudflare/types/zero_trust/access/oidc_saas_app.py b/src/cloudflare/types/zero_trust/access/oidc_saas_app.py
new file mode 100644
index 00000000000..1e0c58caa96
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/oidc_saas_app.py
@@ -0,0 +1,104 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["OIDCSaaSApp", "CustomClaim", "CustomClaimSource", "HybridAndImplicitOptions", "RefreshTokenOptions"]
+
+
+class CustomClaimSource(BaseModel):
+    name: Optional[str] = None
+    """The name of the IdP claim."""
+
+    name_by_idp: Optional[Dict[str, str]] = None
+    """A mapping from IdP ID to claim name."""
+
+
+class CustomClaim(BaseModel):
+    name: Optional[str] = None
+    """The name of the claim."""
+
+    required: Optional[bool] = None
+    """If the claim is required when building an OIDC token."""
+
+    scope: Optional[Literal["groups", "profile", "email", "openid"]] = None
+    """The scope of the claim."""
+
+    source: Optional[CustomClaimSource] = None
+
+
+class HybridAndImplicitOptions(BaseModel):
+    return_access_token_from_authorization_endpoint: Optional[bool] = None
+    """If an Access Token should be returned from the OIDC Authorization endpoint"""
+
+    return_id_token_from_authorization_endpoint: Optional[bool] = None
+    """If an ID Token should be returned from the OIDC Authorization endpoint"""
+
+
+class RefreshTokenOptions(BaseModel):
+    lifetime: Optional[str] = None
+    """How long a refresh token will be valid for after creation.
+
+    Valid units are m,h,d. Must be longer than 1m.
+    """
+
+
+class OIDCSaaSApp(BaseModel):
+    access_token_lifetime: Optional[str] = None
+    """The lifetime of the OIDC Access Token after creation.
+
+    Valid units are m,h. Must be greater than or equal to 1m and less than or equal
+    to 24h.
+    """
+
+    allow_pkce_without_client_secret: Optional[bool] = None
+    """
+    If client secret should be required on the token endpoint when
+    authorization_code_with_pkce grant is used.
+    """
+
+    app_launcher_url: Optional[str] = None
+    """The URL where this applications tile redirects users"""
+
+    auth_type: Optional[Literal["saml", "oidc"]] = None
+    """Identifier of the authentication protocol used for the saas app.
+
+    Required for OIDC.
+    """
+
+    client_id: Optional[str] = None
+    """The application client id"""
+
+    client_secret: Optional[str] = None
+    """The application client secret, only returned on POST request."""
+
+    custom_claims: Optional[List[CustomClaim]] = None
+
+    grant_types: Optional[
+        List[Literal["authorization_code", "authorization_code_with_pkce", "refresh_tokens", "hybrid", "implicit"]]
+    ] = None
+    """The OIDC flows supported by this application"""
+
+    group_filter_regex: Optional[str] = None
+    """A regex to filter Cloudflare groups returned in ID token and userinfo endpoint"""
+
+    hybrid_and_implicit_options: Optional[HybridAndImplicitOptions] = None
+
+    public_key: Optional[str] = None
+    """The Access public certificate that will be used to verify your identity."""
+
+    redirect_uris: Optional[List[str]] = None
+    """
+    The permitted URL's for Cloudflare to return Authorization codes and Access/ID
+    tokens
+    """
+
+    refresh_token_options: Optional[RefreshTokenOptions] = None
+
+    scopes: Optional[List[Literal["openid", "groups", "email", "profile"]]] = None
+    """
+    Define the user information shared with access, "offline_access" scope will be
+    automatically enabled if refresh tokens are enabled
+    """
diff --git a/src/cloudflare/types/zero_trust/access/oidc_saas_app_param.py b/src/cloudflare/types/zero_trust/access/oidc_saas_app_param.py
new file mode 100644
index 00000000000..bb0dad5740b
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/oidc_saas_app_param.py
@@ -0,0 +1,106 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict, List, Iterable
+from typing_extensions import Literal, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["OIDCSaaSAppParam", "CustomClaim", "CustomClaimSource", "HybridAndImplicitOptions", "RefreshTokenOptions"]
+
+
+class CustomClaimSource(TypedDict, total=False):
+    name: str
+    """The name of the IdP claim."""
+
+    name_by_idp: Dict[str, str]
+    """A mapping from IdP ID to claim name."""
+
+
+class CustomClaim(TypedDict, total=False):
+    name: str
+    """The name of the claim."""
+
+    required: bool
+    """If the claim is required when building an OIDC token."""
+
+    scope: Literal["groups", "profile", "email", "openid"]
+    """The scope of the claim."""
+
+    source: CustomClaimSource
+
+
+class HybridAndImplicitOptions(TypedDict, total=False):
+    return_access_token_from_authorization_endpoint: bool
+    """If an Access Token should be returned from the OIDC Authorization endpoint"""
+
+    return_id_token_from_authorization_endpoint: bool
+    """If an ID Token should be returned from the OIDC Authorization endpoint"""
+
+
+class RefreshTokenOptions(TypedDict, total=False):
+    lifetime: str
+    """How long a refresh token will be valid for after creation.
+
+    Valid units are m,h,d. Must be longer than 1m.
+    """
+
+
+class OIDCSaaSAppParam(TypedDict, total=False):
+    access_token_lifetime: str
+    """The lifetime of the OIDC Access Token after creation.
+
+    Valid units are m,h. Must be greater than or equal to 1m and less than or equal
+    to 24h.
+    """
+
+    allow_pkce_without_client_secret: bool
+    """
+    If client secret should be required on the token endpoint when
+    authorization_code_with_pkce grant is used.
+    """
+
+    app_launcher_url: str
+    """The URL where this applications tile redirects users"""
+
+    auth_type: Literal["saml", "oidc"]
+    """Identifier of the authentication protocol used for the saas app.
+
+    Required for OIDC.
+    """
+
+    client_id: str
+    """The application client id"""
+
+    client_secret: str
+    """The application client secret, only returned on POST request."""
+
+    custom_claims: Iterable[CustomClaim]
+
+    grant_types: List[
+        Literal["authorization_code", "authorization_code_with_pkce", "refresh_tokens", "hybrid", "implicit"]
+    ]
+    """The OIDC flows supported by this application"""
+
+    group_filter_regex: str
+    """A regex to filter Cloudflare groups returned in ID token and userinfo endpoint"""
+
+    hybrid_and_implicit_options: HybridAndImplicitOptions
+
+    public_key: str
+    """The Access public certificate that will be used to verify your identity."""
+
+    redirect_uris: SequenceNotStr[str]
+    """
+    The permitted URL's for Cloudflare to return Authorization codes and Access/ID
+    tokens
+    """
+
+    refresh_token_options: RefreshTokenOptions
+
+    scopes: List[Literal["openid", "groups", "email", "profile"]]
+    """
+    Define the user information shared with access, "offline_access" scope will be
+    automatically enabled if refresh tokens are enabled
+    """
diff --git a/src/cloudflare/types/zero_trust/access/policy_create_params.py b/src/cloudflare/types/zero_trust/access/policy_create_params.py
index a575b5e16a6..abeceb70ae1 100644
--- a/src/cloudflare/types/zero_trust/access/policy_create_params.py
+++ b/src/cloudflare/types/zero_trust/access/policy_create_params.py
@@ -6,18 +6,21 @@
 from typing_extensions import Required, TypedDict
 
 from .decision import Decision
-from ..access_rule_param import AccessRuleParam
-from .applications.approval_group_param import ApprovalGroupParam
+from .approval_group_param import ApprovalGroupParam
+from .applications.access_rule_param import AccessRuleParam
 
 __all__ = ["PolicyCreateParams"]
 
 
 class PolicyCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     decision: Required[Decision]
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     include: Required[Iterable[AccessRuleParam]]
     """Rules evaluated with an OR logical operator.
diff --git a/src/cloudflare/types/zero_trust/access/policy_create_response.py b/src/cloudflare/types/zero_trust/access/policy_create_response.py
index 767b4f9bc18..0b3aed6220d 100644
--- a/src/cloudflare/types/zero_trust/access/policy_create_response.py
+++ b/src/cloudflare/types/zero_trust/access/policy_create_response.py
@@ -6,8 +6,8 @@
 
 from .decision import Decision
 from ...._models import BaseModel
-from ..access_rule import AccessRule
-from .applications.approval_group import ApprovalGroup
+from .approval_group import ApprovalGroup
+from .applications.access_rule import AccessRule
 
 __all__ = ["PolicyCreateResponse"]
 
@@ -31,7 +31,10 @@ class PolicyCreateResponse(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
diff --git a/src/cloudflare/types/zero_trust/access/policy_get_response.py b/src/cloudflare/types/zero_trust/access/policy_get_response.py
index b4476baf1d0..0c51e5cca00 100644
--- a/src/cloudflare/types/zero_trust/access/policy_get_response.py
+++ b/src/cloudflare/types/zero_trust/access/policy_get_response.py
@@ -6,8 +6,8 @@
 
 from .decision import Decision
 from ...._models import BaseModel
-from ..access_rule import AccessRule
-from .applications.approval_group import ApprovalGroup
+from .approval_group import ApprovalGroup
+from .applications.access_rule import AccessRule
 
 __all__ = ["PolicyGetResponse"]
 
@@ -31,7 +31,10 @@ class PolicyGetResponse(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
diff --git a/src/cloudflare/types/zero_trust/access/policy_list_params.py b/src/cloudflare/types/zero_trust/access/policy_list_params.py
new file mode 100644
index 00000000000..81043b62ad6
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/policy_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["PolicyListParams"]
+
+
+class PolicyListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    page: int
+    """Page number of results."""
+
+    per_page: int
+    """Number of results per page."""
diff --git a/src/cloudflare/types/zero_trust/access/policy_list_response.py b/src/cloudflare/types/zero_trust/access/policy_list_response.py
index 2a2272663c7..af20dea0f36 100644
--- a/src/cloudflare/types/zero_trust/access/policy_list_response.py
+++ b/src/cloudflare/types/zero_trust/access/policy_list_response.py
@@ -6,8 +6,8 @@
 
 from .decision import Decision
 from ...._models import BaseModel
-from ..access_rule import AccessRule
-from .applications.approval_group import ApprovalGroup
+from .approval_group import ApprovalGroup
+from .applications.access_rule import AccessRule
 
 __all__ = ["PolicyListResponse"]
 
@@ -31,7 +31,10 @@ class PolicyListResponse(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
diff --git a/src/cloudflare/types/zero_trust/access/policy_update_params.py b/src/cloudflare/types/zero_trust/access/policy_update_params.py
index 7ac64eebe4c..0d21a28107b 100644
--- a/src/cloudflare/types/zero_trust/access/policy_update_params.py
+++ b/src/cloudflare/types/zero_trust/access/policy_update_params.py
@@ -6,18 +6,21 @@
 from typing_extensions import Required, TypedDict
 
 from .decision import Decision
-from ..access_rule_param import AccessRuleParam
-from .applications.approval_group_param import ApprovalGroupParam
+from .approval_group_param import ApprovalGroupParam
+from .applications.access_rule_param import AccessRuleParam
 
 __all__ = ["PolicyUpdateParams"]
 
 
 class PolicyUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     decision: Required[Decision]
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     include: Required[Iterable[AccessRuleParam]]
     """Rules evaluated with an OR logical operator.
diff --git a/src/cloudflare/types/zero_trust/access/policy_update_response.py b/src/cloudflare/types/zero_trust/access/policy_update_response.py
index 8582785d404..bbd9d8cb480 100644
--- a/src/cloudflare/types/zero_trust/access/policy_update_response.py
+++ b/src/cloudflare/types/zero_trust/access/policy_update_response.py
@@ -6,8 +6,8 @@
 
 from .decision import Decision
 from ...._models import BaseModel
-from ..access_rule import AccessRule
-from .applications.approval_group import ApprovalGroup
+from .approval_group import ApprovalGroup
+from .applications.access_rule import AccessRule
 
 __all__ = ["PolicyUpdateResponse"]
 
@@ -31,7 +31,10 @@ class PolicyUpdateResponse(BaseModel):
     created_at: Optional[datetime] = None
 
     decision: Optional[Decision] = None
-    """The action Access will take if a user matches this policy."""
+    """The action Access will take if a user matches this policy.
+
+    Infrastructure application policies can only use the Allow action.
+    """
 
     exclude: Optional[List[AccessRule]] = None
     """Rules evaluated with a NOT logical operator.
diff --git a/src/cloudflare/types/zero_trust/access/saas_app_name_format.py b/src/cloudflare/types/zero_trust/access/saas_app_name_format.py
deleted file mode 100644
index 07f7e79cfae..00000000000
--- a/src/cloudflare/types/zero_trust/access/saas_app_name_format.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing_extensions import Literal
-
-__all__ = ["SaaSAppNameFormat"]
-
-SaaSAppNameFormat = Literal[
-    "urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified",
-    "urn:oasis:names:tc:SAML:2.0:attrname-format:basic",
-    "urn:oasis:names:tc:SAML:2.0:attrname-format:uri",
-]
diff --git a/src/cloudflare/types/zero_trust/access/saas_app_name_id_format.py b/src/cloudflare/types/zero_trust/access/saas_app_name_id_format.py
index 15af2a15b16..e527a9d8c7e 100644
--- a/src/cloudflare/types/zero_trust/access/saas_app_name_id_format.py
+++ b/src/cloudflare/types/zero_trust/access/saas_app_name_id_format.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["SaaSAppNameIDFormat"]
 
-SaaSAppNameIDFormat = Literal["id", "email"]
+SaaSAppNameIDFormat: TypeAlias = Literal["id", "email"]
diff --git a/src/cloudflare/types/zero_trust/access/saas_app_source.py b/src/cloudflare/types/zero_trust/access/saas_app_source.py
deleted file mode 100644
index 5a4e157c195..00000000000
--- a/src/cloudflare/types/zero_trust/access/saas_app_source.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Dict, Optional
-
-from ...._models import BaseModel
-
-__all__ = ["SaaSAppSource"]
-
-
-class SaaSAppSource(BaseModel):
-    name: Optional[str] = None
-    """The name of the IdP attribute."""
-
-    name_by_idp: Optional[Dict[str, str]] = None
-    """A mapping from IdP ID to attribute name."""
diff --git a/src/cloudflare/types/zero_trust/access/saas_app_source_param.py b/src/cloudflare/types/zero_trust/access/saas_app_source_param.py
deleted file mode 100644
index 12b4abc2d05..00000000000
--- a/src/cloudflare/types/zero_trust/access/saas_app_source_param.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Dict
-from typing_extensions import TypedDict
-
-__all__ = ["SaaSAppSourceParam"]
-
-
-class SaaSAppSourceParam(TypedDict, total=False):
-    name: str
-    """The name of the IdP attribute."""
-
-    name_by_idp: Dict[str, str]
-    """A mapping from IdP ID to attribute name."""
diff --git a/src/cloudflare/types/zero_trust/access/saml_saas_app.py b/src/cloudflare/types/zero_trust/access/saml_saas_app.py
index 495e76604aa..126c46fa08f 100644
--- a/src/cloudflare/types/zero_trust/access/saml_saas_app.py
+++ b/src/cloudflare/types/zero_trust/access/saml_saas_app.py
@@ -1,31 +1,50 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
-from datetime import datetime
+from typing import List, Optional
 from typing_extensions import Literal
 
 from ...._models import BaseModel
-from .saas_app_source import SaaSAppSource
-from .saas_app_name_format import SaaSAppNameFormat
 from .saas_app_name_id_format import SaaSAppNameIDFormat
 
-__all__ = ["SAMLSaaSApp", "CustomAttributes"]
+__all__ = ["SAMLSaaSApp", "CustomAttribute", "CustomAttributeSource", "CustomAttributeSourceNameByIdP"]
 
 
-class CustomAttributes(BaseModel):
+class CustomAttributeSourceNameByIdP(BaseModel):
+    idp_id: Optional[str] = None
+    """The UID of the IdP."""
+
+    source_name: Optional[str] = None
+    """The name of the IdP provided attribute."""
+
+
+class CustomAttributeSource(BaseModel):
+    name: Optional[str] = None
+    """The name of the IdP attribute."""
+
+    name_by_idp: Optional[List[CustomAttributeSourceNameByIdP]] = None
+    """A mapping from IdP ID to attribute name."""
+
+
+class CustomAttribute(BaseModel):
     friendly_name: Optional[str] = None
     """The SAML FriendlyName of the attribute."""
 
     name: Optional[str] = None
     """The name of the attribute."""
 
-    name_format: Optional[SaaSAppNameFormat] = None
+    name_format: Optional[
+        Literal[
+            "urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified",
+            "urn:oasis:names:tc:SAML:2.0:attrname-format:basic",
+            "urn:oasis:names:tc:SAML:2.0:attrname-format:uri",
+        ]
+    ] = None
     """A globally unique name for an identity or service provider."""
 
     required: Optional[bool] = None
     """If the attribute is required when building a SAML assertion."""
 
-    source: Optional[SaaSAppSource] = None
+    source: Optional[CustomAttributeSource] = None
 
 
 class SAMLSaaSApp(BaseModel):
@@ -42,9 +61,7 @@ class SAMLSaaSApp(BaseModel):
     SAML assertion.
     """
 
-    created_at: Optional[datetime] = None
-
-    custom_attributes: Optional[CustomAttributes] = None
+    custom_attributes: Optional[List[CustomAttribute]] = None
 
     default_relay_state: Optional[str] = None
     """
@@ -83,5 +100,3 @@ class SAMLSaaSApp(BaseModel):
 
     sso_endpoint: Optional[str] = None
     """The endpoint where your SaaS application will send login requests."""
-
-    updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/access/saml_saas_app_param.py b/src/cloudflare/types/zero_trust/access/saml_saas_app_param.py
index 835baee2235..41c8bf72677 100644
--- a/src/cloudflare/types/zero_trust/access/saml_saas_app_param.py
+++ b/src/cloudflare/types/zero_trust/access/saml_saas_app_param.py
@@ -2,32 +2,48 @@
 
 from __future__ import annotations
 
-from typing import Union
-from datetime import datetime
-from typing_extensions import Literal, Annotated, TypedDict
+from typing import Iterable
+from typing_extensions import Literal, TypedDict
 
-from ...._utils import PropertyInfo
-from .saas_app_name_format import SaaSAppNameFormat
-from .saas_app_source_param import SaaSAppSourceParam
 from .saas_app_name_id_format import SaaSAppNameIDFormat
 
-__all__ = ["SAMLSaaSAppParam", "CustomAttributes"]
+__all__ = ["SAMLSaaSAppParam", "CustomAttribute", "CustomAttributeSource", "CustomAttributeSourceNameByIdP"]
 
 
-class CustomAttributes(TypedDict, total=False):
+class CustomAttributeSourceNameByIdP(TypedDict, total=False):
+    idp_id: str
+    """The UID of the IdP."""
+
+    source_name: str
+    """The name of the IdP provided attribute."""
+
+
+class CustomAttributeSource(TypedDict, total=False):
+    name: str
+    """The name of the IdP attribute."""
+
+    name_by_idp: Iterable[CustomAttributeSourceNameByIdP]
+    """A mapping from IdP ID to attribute name."""
+
+
+class CustomAttribute(TypedDict, total=False):
     friendly_name: str
     """The SAML FriendlyName of the attribute."""
 
     name: str
     """The name of the attribute."""
 
-    name_format: SaaSAppNameFormat
+    name_format: Literal[
+        "urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified",
+        "urn:oasis:names:tc:SAML:2.0:attrname-format:basic",
+        "urn:oasis:names:tc:SAML:2.0:attrname-format:uri",
+    ]
     """A globally unique name for an identity or service provider."""
 
     required: bool
     """If the attribute is required when building a SAML assertion."""
 
-    source: SaaSAppSourceParam
+    source: CustomAttributeSource
 
 
 class SAMLSaaSAppParam(TypedDict, total=False):
@@ -44,9 +60,7 @@ class SAMLSaaSAppParam(TypedDict, total=False):
     SAML assertion.
     """
 
-    created_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-
-    custom_attributes: CustomAttributes
+    custom_attributes: Iterable[CustomAttribute]
 
     default_relay_state: str
     """
@@ -85,5 +99,3 @@ class SAMLSaaSAppParam(TypedDict, total=False):
 
     sso_endpoint: str
     """The endpoint where your SaaS application will send login requests."""
-
-    updated_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
diff --git a/src/cloudflare/types/zero_trust/access/scim_config_authentication_http_basic.py b/src/cloudflare/types/zero_trust/access/scim_config_authentication_http_basic.py
new file mode 100644
index 00000000000..b5ceb300723
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/scim_config_authentication_http_basic.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["SCIMConfigAuthenticationHTTPBasic"]
+
+
+class SCIMConfigAuthenticationHTTPBasic(BaseModel):
+    """
+    Attributes for configuring HTTP Basic authentication scheme for SCIM provisioning to an application.
+    """
+
+    password: str
+    """Password used to authenticate with the remote SCIM service."""
+
+    scheme: Literal["httpbasic"]
+    """The authentication scheme to use when making SCIM requests to this application."""
+
+    user: str
+    """User name used to authenticate with the remote SCIM service."""
diff --git a/src/cloudflare/types/zero_trust/access/scim_config_authentication_http_basic_param.py b/src/cloudflare/types/zero_trust/access/scim_config_authentication_http_basic_param.py
new file mode 100644
index 00000000000..579b3e46798
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/scim_config_authentication_http_basic_param.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["SCIMConfigAuthenticationHTTPBasicParam"]
+
+
+class SCIMConfigAuthenticationHTTPBasicParam(TypedDict, total=False):
+    """
+    Attributes for configuring HTTP Basic authentication scheme for SCIM provisioning to an application.
+    """
+
+    password: Required[str]
+    """Password used to authenticate with the remote SCIM service."""
+
+    scheme: Required[Literal["httpbasic"]]
+    """The authentication scheme to use when making SCIM requests to this application."""
+
+    user: Required[str]
+    """User name used to authenticate with the remote SCIM service."""
diff --git a/src/cloudflare/types/zero_trust/access/scim_config_authentication_oauth2.py b/src/cloudflare/types/zero_trust/access/scim_config_authentication_oauth2.py
new file mode 100644
index 00000000000..61f54035f48
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/scim_config_authentication_oauth2.py
@@ -0,0 +1,44 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["SCIMConfigAuthenticationOauth2"]
+
+
+class SCIMConfigAuthenticationOauth2(BaseModel):
+    """
+    Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning to an application.
+    """
+
+    authorization_url: str
+    """URL used to generate the auth code used during token generation."""
+
+    client_id: str
+    """
+    Client ID used to authenticate when generating a token for authenticating with
+    the remote SCIM service.
+    """
+
+    client_secret: str
+    """
+    Secret used to authenticate when generating a token for authenticating with the
+    remove SCIM service.
+    """
+
+    scheme: Literal["oauth2"]
+    """The authentication scheme to use when making SCIM requests to this application."""
+
+    token_url: str
+    """
+    URL used to generate the token used to authenticate with the remote SCIM
+    service.
+    """
+
+    scopes: Optional[List[str]] = None
+    """
+    The authorization scopes to request when generating the token used to
+    authenticate with the remove SCIM service.
+    """
diff --git a/src/cloudflare/types/zero_trust/access/scim_config_authentication_oauth2_param.py b/src/cloudflare/types/zero_trust/access/scim_config_authentication_oauth2_param.py
new file mode 100644
index 00000000000..37b421ff139
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/scim_config_authentication_oauth2_param.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["SCIMConfigAuthenticationOauth2Param"]
+
+
+class SCIMConfigAuthenticationOauth2Param(TypedDict, total=False):
+    """
+    Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning to an application.
+    """
+
+    authorization_url: Required[str]
+    """URL used to generate the auth code used during token generation."""
+
+    client_id: Required[str]
+    """
+    Client ID used to authenticate when generating a token for authenticating with
+    the remote SCIM service.
+    """
+
+    client_secret: Required[str]
+    """
+    Secret used to authenticate when generating a token for authenticating with the
+    remove SCIM service.
+    """
+
+    scheme: Required[Literal["oauth2"]]
+    """The authentication scheme to use when making SCIM requests to this application."""
+
+    token_url: Required[str]
+    """
+    URL used to generate the token used to authenticate with the remote SCIM
+    service.
+    """
+
+    scopes: SequenceNotStr[str]
+    """
+    The authorization scopes to request when generating the token used to
+    authenticate with the remove SCIM service.
+    """
diff --git a/src/cloudflare/types/zero_trust/access/scim_config_authentication_oauth_bearer_token.py b/src/cloudflare/types/zero_trust/access/scim_config_authentication_oauth_bearer_token.py
new file mode 100644
index 00000000000..ecd4ba1c116
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/scim_config_authentication_oauth_bearer_token.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["SCIMConfigAuthenticationOAuthBearerToken"]
+
+
+class SCIMConfigAuthenticationOAuthBearerToken(BaseModel):
+    """
+    Attributes for configuring OAuth Bearer Token authentication scheme for SCIM provisioning to an application.
+    """
+
+    token: str
+    """Token used to authenticate with the remote SCIM service."""
+
+    scheme: Literal["oauthbearertoken"]
+    """The authentication scheme to use when making SCIM requests to this application."""
diff --git a/src/cloudflare/types/zero_trust/access/scim_config_authentication_oauth_bearer_token_param.py b/src/cloudflare/types/zero_trust/access/scim_config_authentication_oauth_bearer_token_param.py
new file mode 100644
index 00000000000..cc169a5ce12
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/scim_config_authentication_oauth_bearer_token_param.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["SCIMConfigAuthenticationOAuthBearerTokenParam"]
+
+
+class SCIMConfigAuthenticationOAuthBearerTokenParam(TypedDict, total=False):
+    """
+    Attributes for configuring OAuth Bearer Token authentication scheme for SCIM provisioning to an application.
+    """
+
+    token: Required[str]
+    """Token used to authenticate with the remote SCIM service."""
+
+    scheme: Required[Literal["oauthbearertoken"]]
+    """The authentication scheme to use when making SCIM requests to this application."""
diff --git a/src/cloudflare/types/zero_trust/access/scim_config_mapping.py b/src/cloudflare/types/zero_trust/access/scim_config_mapping.py
new file mode 100644
index 00000000000..73336be9768
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/scim_config_mapping.py
@@ -0,0 +1,58 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["SCIMConfigMapping", "Operations"]
+
+
+class Operations(BaseModel):
+    """Whether or not this mapping applies to creates, updates, or deletes."""
+
+    create: Optional[bool] = None
+    """Whether or not this mapping applies to create (POST) operations."""
+
+    delete: Optional[bool] = None
+    """Whether or not this mapping applies to DELETE operations."""
+
+    update: Optional[bool] = None
+    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+
+
+class SCIMConfigMapping(BaseModel):
+    """
+    Transformations and filters applied to resources before they are provisioned in the remote SCIM service.
+    """
+
+    schema_: str = FieldInfo(alias="schema")
+    """Which SCIM resource type this mapping applies to."""
+
+    enabled: Optional[bool] = None
+    """Whether or not this mapping is enabled."""
+
+    filter: Optional[str] = None
+    """
+    A
+    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
+    that matches resources that should be provisioned to this application.
+    """
+
+    operations: Optional[Operations] = None
+    """Whether or not this mapping applies to creates, updates, or deletes."""
+
+    strictness: Optional[Literal["strict", "passthrough"]] = None
+    """
+    The level of adherence to outbound resource schemas when provisioning to this
+    mapping. ‘Strict’ removes unknown values, while ‘passthrough’ passes unknown
+    values to the target.
+    """
+
+    transform_jsonata: Optional[str] = None
+    """
+    A [JSONata](https://jsonata.org/) expression that transforms the resource before
+    provisioning it in the application.
+    """
diff --git a/src/cloudflare/types/zero_trust/access/scim_config_mapping_param.py b/src/cloudflare/types/zero_trust/access/scim_config_mapping_param.py
new file mode 100644
index 00000000000..043dac5203c
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/scim_config_mapping_param.py
@@ -0,0 +1,55 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["SCIMConfigMappingParam", "Operations"]
+
+
+class Operations(TypedDict, total=False):
+    """Whether or not this mapping applies to creates, updates, or deletes."""
+
+    create: bool
+    """Whether or not this mapping applies to create (POST) operations."""
+
+    delete: bool
+    """Whether or not this mapping applies to DELETE operations."""
+
+    update: bool
+    """Whether or not this mapping applies to update (PATCH/PUT) operations."""
+
+
+class SCIMConfigMappingParam(TypedDict, total=False):
+    """
+    Transformations and filters applied to resources before they are provisioned in the remote SCIM service.
+    """
+
+    schema: Required[str]
+    """Which SCIM resource type this mapping applies to."""
+
+    enabled: bool
+    """Whether or not this mapping is enabled."""
+
+    filter: str
+    """
+    A
+    [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
+    that matches resources that should be provisioned to this application.
+    """
+
+    operations: Operations
+    """Whether or not this mapping applies to creates, updates, or deletes."""
+
+    strictness: Literal["strict", "passthrough"]
+    """
+    The level of adherence to outbound resource schemas when provisioning to this
+    mapping. ‘Strict’ removes unknown values, while ‘passthrough’ passes unknown
+    values to the target.
+    """
+
+    transform_jsonata: str
+    """
+    A [JSONata](https://jsonata.org/) expression that transforms the resource before
+    provisioning it in the application.
+    """
diff --git a/src/cloudflare/types/zero_trust/access/self_hosted_domains.py b/src/cloudflare/types/zero_trust/access/self_hosted_domains.py
index cadbea12ad3..196ba968bb1 100644
--- a/src/cloudflare/types/zero_trust/access/self_hosted_domains.py
+++ b/src/cloudflare/types/zero_trust/access/self_hosted_domains.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["SelfHostedDomains"]
 
-SelfHostedDomains = str
+SelfHostedDomains: TypeAlias = str
diff --git a/src/cloudflare/types/zero_trust/access/service_token.py b/src/cloudflare/types/zero_trust/access/service_token.py
index a1e4338cb6f..20dcb3945c6 100644
--- a/src/cloudflare/types/zero_trust/access/service_token.py
+++ b/src/cloudflare/types/zero_trust/access/service_token.py
@@ -18,8 +18,6 @@ class ServiceToken(BaseModel):
     Access will check for this value in the `CF-Access-Client-ID` request header.
     """
 
-    created_at: Optional[datetime] = None
-
     duration: Optional[str] = None
     """The duration for how long the service token will be valid.
 
@@ -27,7 +25,7 @@ class ServiceToken(BaseModel):
     ms, s, m, h. The default is 1 year in hours (8760h).
     """
 
+    expires_at: Optional[datetime] = None
+
     name: Optional[str] = None
     """The name of the service token."""
-
-    updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/access/service_token_create_params.py b/src/cloudflare/types/zero_trust/access/service_token_create_params.py
index 873816432d5..33ef25f0714 100644
--- a/src/cloudflare/types/zero_trust/access/service_token_create_params.py
+++ b/src/cloudflare/types/zero_trust/access/service_token_create_params.py
@@ -2,7 +2,11 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import Union
+from datetime import datetime
+from typing_extensions import Required, Annotated, TypedDict
+
+from ...._utils import PropertyInfo
 
 __all__ = ["ServiceTokenCreateParams"]
 
@@ -17,9 +21,26 @@ class ServiceTokenCreateParams(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
+    client_secret_version: float
+    """
+    A version number identifying the current `client_secret` associated with the
+    service token. Incrementing it triggers a rotation; the previous secret will
+    still be accepted until the time indicated by
+    `previous_client_secret_expires_at`.
+    """
+
     duration: str
     """The duration for how long the service token will be valid.
 
     Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
     ms, s, m, h. The default is 1 year in hours (8760h).
     """
+
+    previous_client_secret_expires_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """The expiration of the previous `client_secret`.
+
+    This can be modified at any point after a rotation. For example, you may extend
+    it further into the future if you need more time to update services with the new
+    secret; or move it into the past to immediately invalidate the previous token in
+    case of compromise.
+    """
diff --git a/src/cloudflare/types/zero_trust/access/service_token_create_response.py b/src/cloudflare/types/zero_trust/access/service_token_create_response.py
index e74b74cd80b..d6ce8c9eb1b 100644
--- a/src/cloudflare/types/zero_trust/access/service_token_create_response.py
+++ b/src/cloudflare/types/zero_trust/access/service_token_create_response.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 
 from ...._models import BaseModel
 
@@ -25,8 +24,6 @@ class ServiceTokenCreateResponse(BaseModel):
     header.
     """
 
-    created_at: Optional[datetime] = None
-
     duration: Optional[str] = None
     """The duration for how long the service token will be valid.
 
@@ -36,5 +33,3 @@ class ServiceTokenCreateResponse(BaseModel):
 
     name: Optional[str] = None
     """The name of the service token."""
-
-    updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/access/service_token_list_params.py b/src/cloudflare/types/zero_trust/access/service_token_list_params.py
new file mode 100644
index 00000000000..6697531d4c1
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/service_token_list_params.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import TypedDict
+
+__all__ = ["ServiceTokenListParams"]
+
+
+class ServiceTokenListParams(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    name: str
+    """The name of the service token."""
+
+    page: int
+    """Page number of results."""
+
+    per_page: int
+    """Number of results per page."""
+
+    search: str
+    """Search for service tokens by other listed query parameters."""
diff --git a/src/cloudflare/types/zero_trust/access/service_token_rotate_params.py b/src/cloudflare/types/zero_trust/access/service_token_rotate_params.py
new file mode 100644
index 00000000000..2fb1017ea1a
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/service_token_rotate_params.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Required, Annotated, TypedDict
+
+from ...._utils import PropertyInfo
+
+__all__ = ["ServiceTokenRotateParams"]
+
+
+class ServiceTokenRotateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    previous_client_secret_expires_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """The expiration of the previous `client_secret`.
+
+    If not provided, it defaults to the current timestamp in order to immediately
+    expire the previous secret.
+    """
diff --git a/src/cloudflare/types/zero_trust/access/service_token_rotate_response.py b/src/cloudflare/types/zero_trust/access/service_token_rotate_response.py
index b4a74bcfc69..7701bce78c1 100644
--- a/src/cloudflare/types/zero_trust/access/service_token_rotate_response.py
+++ b/src/cloudflare/types/zero_trust/access/service_token_rotate_response.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 
 from ...._models import BaseModel
 
@@ -25,8 +24,6 @@ class ServiceTokenRotateResponse(BaseModel):
     header.
     """
 
-    created_at: Optional[datetime] = None
-
     duration: Optional[str] = None
     """The duration for how long the service token will be valid.
 
@@ -36,5 +33,3 @@ class ServiceTokenRotateResponse(BaseModel):
 
     name: Optional[str] = None
     """The name of the service token."""
-
-    updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/access/service_token_update_params.py b/src/cloudflare/types/zero_trust/access/service_token_update_params.py
index 93dc5d1c5bc..fafedcacb5c 100644
--- a/src/cloudflare/types/zero_trust/access/service_token_update_params.py
+++ b/src/cloudflare/types/zero_trust/access/service_token_update_params.py
@@ -2,7 +2,11 @@
 
 from __future__ import annotations
 
-from typing_extensions import TypedDict
+from typing import Union
+from datetime import datetime
+from typing_extensions import Annotated, TypedDict
+
+from ...._utils import PropertyInfo
 
 __all__ = ["ServiceTokenUpdateParams"]
 
@@ -14,6 +18,14 @@ class ServiceTokenUpdateParams(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
+    client_secret_version: float
+    """
+    A version number identifying the current `client_secret` associated with the
+    service token. Incrementing it triggers a rotation; the previous secret will
+    still be accepted until the time indicated by
+    `previous_client_secret_expires_at`.
+    """
+
     duration: str
     """The duration for how long the service token will be valid.
 
@@ -23,3 +35,12 @@ class ServiceTokenUpdateParams(TypedDict, total=False):
 
     name: str
     """The name of the service token."""
+
+    previous_client_secret_expires_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """The expiration of the previous `client_secret`.
+
+    This can be modified at any point after a rotation. For example, you may extend
+    it further into the future if you need more time to update services with the new
+    secret; or move it into the past to immediately invalidate the previous token in
+    case of compromise.
+    """
diff --git a/src/cloudflare/types/zero_trust/access/tag.py b/src/cloudflare/types/zero_trust/access/tag.py
index bf386015544..150a712c584 100644
--- a/src/cloudflare/types/zero_trust/access/tag.py
+++ b/src/cloudflare/types/zero_trust/access/tag.py
@@ -1,20 +1,12 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
-from datetime import datetime
-
 from ...._models import BaseModel
 
 __all__ = ["Tag"]
 
 
 class Tag(BaseModel):
+    """A tag"""
+
     name: str
     """The name of the tag"""
-
-    app_count: Optional[int] = None
-    """The number of applications that have this tag"""
-
-    created_at: Optional[datetime] = None
-
-    updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/access/tag_create_params.py b/src/cloudflare/types/zero_trust/access/tag_create_params.py
index 6e4f6cb687a..91785c49db9 100644
--- a/src/cloudflare/types/zero_trust/access/tag_create_params.py
+++ b/src/cloudflare/types/zero_trust/access/tag_create_params.py
@@ -2,22 +2,14 @@
 
 from __future__ import annotations
 
-from typing import Union
-from datetime import datetime
-from typing_extensions import Required, Annotated, TypedDict
-
-from ...._utils import PropertyInfo
+from typing_extensions import Required, TypedDict
 
 __all__ = ["TagCreateParams"]
 
 
 class TagCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
-    name: Required[str]
+    name: str
     """The name of the tag"""
-
-    created_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-
-    updated_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
diff --git a/src/cloudflare/types/zero_trust/access/tag_list_params.py b/src/cloudflare/types/zero_trust/access/tag_list_params.py
new file mode 100644
index 00000000000..18e55a02101
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/tag_list_params.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["TagListParams"]
+
+
+class TagListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    page: int
+    """Page number of results."""
+
+    per_page: int
+    """Number of results per page."""
diff --git a/src/cloudflare/types/zero_trust/access/tag_update_params.py b/src/cloudflare/types/zero_trust/access/tag_update_params.py
index 2b8ba3b2bee..0a939594f6d 100644
--- a/src/cloudflare/types/zero_trust/access/tag_update_params.py
+++ b/src/cloudflare/types/zero_trust/access/tag_update_params.py
@@ -2,22 +2,14 @@
 
 from __future__ import annotations
 
-from typing import Union
-from datetime import datetime
-from typing_extensions import Required, Annotated, TypedDict
-
-from ...._utils import PropertyInfo
+from typing_extensions import Required, TypedDict
 
 __all__ = ["TagUpdateParams"]
 
 
 class TagUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     name: Required[str]
     """The name of the tag"""
-
-    created_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-
-    updated_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
diff --git a/src/cloudflare/types/zero_trust/access/user_list_params.py b/src/cloudflare/types/zero_trust/access/user_list_params.py
new file mode 100644
index 00000000000..98afd06454a
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/user_list_params.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["UserListParams"]
+
+
+class UserListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    email: str
+    """The email of the user."""
+
+    name: str
+    """The name of the user."""
+
+    page: int
+    """Page number of results."""
+
+    per_page: int
+    """Number of results per page."""
+
+    search: str
+    """Search for users by other listed query parameters."""
diff --git a/src/cloudflare/types/zero_trust/access/user_list_response.py b/src/cloudflare/types/zero_trust/access/user_list_response.py
new file mode 100644
index 00000000000..05770e7b74b
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/access/user_list_response.py
@@ -0,0 +1,41 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["UserListResponse"]
+
+
+class UserListResponse(BaseModel):
+    id: Optional[str] = None
+    """UUID."""
+
+    access_seat: Optional[bool] = None
+    """True if the user has authenticated with Cloudflare Access."""
+
+    active_device_count: Optional[float] = None
+    """The number of active devices registered to the user."""
+
+    created_at: Optional[datetime] = None
+
+    email: Optional[str] = None
+    """The email of the user."""
+
+    gateway_seat: Optional[bool] = None
+    """True if the user has logged into the WARP client."""
+
+    last_successful_login: Optional[datetime] = None
+    """The time at which the user last successfully logged in."""
+
+    name: Optional[str] = None
+    """The name of the user."""
+
+    seat_uid: Optional[str] = None
+    """The unique API identifier for the Zero Trust seat."""
+
+    uid: Optional[str] = None
+    """The unique API identifier for the user."""
+
+    updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/access/zero_trust_group.py b/src/cloudflare/types/zero_trust/access/zero_trust_group.py
index eae4f03b8f2..ae7bce865ca 100644
--- a/src/cloudflare/types/zero_trust/access/zero_trust_group.py
+++ b/src/cloudflare/types/zero_trust/access/zero_trust_group.py
@@ -3,43 +3,37 @@
 from typing import List, Optional
 from datetime import datetime
 
-from ...._models import BaseModel
-from ..access_rule import AccessRule
-
-__all__ = ["ZeroTrustGroup"]
+from pydantic import Field as FieldInfo
 
+from ...._models import BaseModel
 
-class ZeroTrustGroup(BaseModel):
-    id: Optional[str] = None
-    """UUID"""
+__all__ = ["ZeroTrustGroup", "Meta"]
 
-    created_at: Optional[datetime] = None
 
-    exclude: Optional[List[AccessRule]] = None
-    """Rules evaluated with a NOT logical operator.
+class Meta(BaseModel):
+    """The metadata of the SCIM resource."""
 
-    To match a policy, a user cannot meet any of the Exclude rules.
-    """
+    created: Optional[datetime] = None
+    """The timestamp of when the SCIM resource was created."""
 
-    include: Optional[List[AccessRule]] = None
-    """Rules evaluated with an OR logical operator.
+    last_modified: Optional[datetime] = FieldInfo(alias="lastModified", default=None)
+    """The timestamp of when the SCIM resource was last modified."""
 
-    A user needs to meet only one of the Include rules.
-    """
 
-    is_default: Optional[List[AccessRule]] = None
-    """Rules evaluated with an AND logical operator.
+class ZeroTrustGroup(BaseModel):
+    id: Optional[str] = None
+    """The unique Cloudflare-generated Id of the SCIM resource."""
 
-    To match a policy, a user must meet all of the Require rules.
-    """
+    display_name: Optional[str] = FieldInfo(alias="displayName", default=None)
+    """The display name of the SCIM Group resource."""
 
-    name: Optional[str] = None
-    """The name of the Access group."""
+    external_id: Optional[str] = FieldInfo(alias="externalId", default=None)
+    """The IdP-generated Id of the SCIM resource."""
 
-    require: Optional[List[AccessRule]] = None
-    """Rules evaluated with an AND logical operator.
+    meta: Optional[Meta] = None
+    """The metadata of the SCIM resource."""
 
-    To match a policy, a user must meet all of the Require rules.
+    schemas: Optional[List[str]] = None
+    """
+    The list of URIs which indicate the attributes contained within a SCIM resource.
     """
-
-    updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/access_rule.py b/src/cloudflare/types/zero_trust/access_rule.py
deleted file mode 100644
index 18ea411a51c..00000000000
--- a/src/cloudflare/types/zero_trust/access_rule.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union
-
-from .ip_rule import IPRule
-from .email_rule import EmailRule
-from .group_rule import GroupRule
-from .domain_rule import DomainRule
-from .country_rule import CountryRule
-from .ip_list_rule import IPListRule
-from .everyone_rule import EveryoneRule
-from .email_list_rule import EmailListRule
-from .okta_group_rule import OktaGroupRule
-from .saml_group_rule import SAMLGroupRule
-from .azure_group_rule import AzureGroupRule
-from .certificate_rule import CertificateRule
-from .gsuite_group_rule import GSuiteGroupRule
-from .service_token_rule import ServiceTokenRule
-from .external_evaluation_rule import ExternalEvaluationRule
-from .github_organization_rule import GitHubOrganizationRule
-from .access_device_posture_rule import AccessDevicePostureRule
-from .authentication_method_rule import AuthenticationMethodRule
-from .any_valid_service_token_rule import AnyValidServiceTokenRule
-
-__all__ = ["AccessRule"]
-
-AccessRule = Union[
-    EmailRule,
-    EmailListRule,
-    DomainRule,
-    EveryoneRule,
-    IPRule,
-    IPListRule,
-    CertificateRule,
-    GroupRule,
-    AzureGroupRule,
-    GitHubOrganizationRule,
-    GSuiteGroupRule,
-    OktaGroupRule,
-    SAMLGroupRule,
-    ServiceTokenRule,
-    AnyValidServiceTokenRule,
-    ExternalEvaluationRule,
-    CountryRule,
-    AuthenticationMethodRule,
-    AccessDevicePostureRule,
-]
diff --git a/src/cloudflare/types/zero_trust/access_rule_param.py b/src/cloudflare/types/zero_trust/access_rule_param.py
deleted file mode 100644
index 2aa7dfd4a41..00000000000
--- a/src/cloudflare/types/zero_trust/access_rule_param.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Union
-
-from .ip_rule_param import IPRuleParam
-from .email_rule_param import EmailRuleParam
-from .group_rule_param import GroupRuleParam
-from .domain_rule_param import DomainRuleParam
-from .country_rule_param import CountryRuleParam
-from .ip_list_rule_param import IPListRuleParam
-from .everyone_rule_param import EveryoneRuleParam
-from .email_list_rule_param import EmailListRuleParam
-from .okta_group_rule_param import OktaGroupRuleParam
-from .saml_group_rule_param import SAMLGroupRuleParam
-from .azure_group_rule_param import AzureGroupRuleParam
-from .certificate_rule_param import CertificateRuleParam
-from .gsuite_group_rule_param import GSuiteGroupRuleParam
-from .service_token_rule_param import ServiceTokenRuleParam
-from .external_evaluation_rule_param import ExternalEvaluationRuleParam
-from .github_organization_rule_param import GitHubOrganizationRuleParam
-from .access_device_posture_rule_param import AccessDevicePostureRuleParam
-from .authentication_method_rule_param import AuthenticationMethodRuleParam
-from .any_valid_service_token_rule_param import AnyValidServiceTokenRuleParam
-
-__all__ = ["AccessRuleParam"]
-
-AccessRuleParam = Union[
-    EmailRuleParam,
-    EmailListRuleParam,
-    DomainRuleParam,
-    EveryoneRuleParam,
-    IPRuleParam,
-    IPListRuleParam,
-    CertificateRuleParam,
-    GroupRuleParam,
-    AzureGroupRuleParam,
-    GitHubOrganizationRuleParam,
-    GSuiteGroupRuleParam,
-    OktaGroupRuleParam,
-    SAMLGroupRuleParam,
-    ServiceTokenRuleParam,
-    AnyValidServiceTokenRuleParam,
-    ExternalEvaluationRuleParam,
-    CountryRuleParam,
-    AuthenticationMethodRuleParam,
-    AccessDevicePostureRuleParam,
-]
diff --git a/src/cloudflare/types/zero_trust/any_valid_service_token_rule.py b/src/cloudflare/types/zero_trust/any_valid_service_token_rule.py
deleted file mode 100644
index 7f4f2b5344f..00000000000
--- a/src/cloudflare/types/zero_trust/any_valid_service_token_rule.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-from ..._models import BaseModel
-
-__all__ = ["AnyValidServiceTokenRule"]
-
-
-class AnyValidServiceTokenRule(BaseModel):
-    any_valid_service_token: object
-    """An empty object which matches on all service tokens."""
diff --git a/src/cloudflare/types/zero_trust/any_valid_service_token_rule_param.py b/src/cloudflare/types/zero_trust/any_valid_service_token_rule_param.py
deleted file mode 100644
index 462d4957f89..00000000000
--- a/src/cloudflare/types/zero_trust/any_valid_service_token_rule_param.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["AnyValidServiceTokenRuleParam"]
-
-
-class AnyValidServiceTokenRuleParam(TypedDict, total=False):
-    any_valid_service_token: Required[object]
-    """An empty object which matches on all service tokens."""
diff --git a/src/cloudflare/types/zero_trust/authentication_method_rule.py b/src/cloudflare/types/zero_trust/authentication_method_rule.py
deleted file mode 100644
index 8352714c076..00000000000
--- a/src/cloudflare/types/zero_trust/authentication_method_rule.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-from ..._models import BaseModel
-
-__all__ = ["AuthenticationMethodRule", "AuthMethod"]
-
-
-class AuthMethod(BaseModel):
-    auth_method: str
-    """
-    The type of authentication method https://datatracker.ietf.org/doc/html/rfc8176.
-    """
-
-
-class AuthenticationMethodRule(BaseModel):
-    auth_method: AuthMethod
diff --git a/src/cloudflare/types/zero_trust/azure_ad.py b/src/cloudflare/types/zero_trust/azure_ad.py
index 6b09f2c0581..7176dddcb82 100644
--- a/src/cloudflare/types/zero_trust/azure_ad.py
+++ b/src/cloudflare/types/zero_trust/azure_ad.py
@@ -4,13 +4,18 @@
 from typing_extensions import Literal
 
 from ..._models import BaseModel
-from .scim_config import SCIMConfig
 from .identity_provider_type import IdentityProviderType
+from .identity_provider_scim_config import IdentityProviderSCIMConfig
 
 __all__ = ["AzureAD", "Config"]
 
 
 class Config(BaseModel):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     claims: Optional[List[str]] = None
     """Custom claims"""
 
@@ -65,9 +70,9 @@ class AzureAD(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
diff --git a/src/cloudflare/types/zero_trust/azure_ad_param.py b/src/cloudflare/types/zero_trust/azure_ad_param.py
new file mode 100644
index 00000000000..8a2582523c8
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/azure_ad_param.py
@@ -0,0 +1,77 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..._types import SequenceNotStr
+from .identity_provider_type import IdentityProviderType
+from .identity_provider_scim_config_param import IdentityProviderSCIMConfigParam
+
+__all__ = ["AzureADParam", "Config"]
+
+
+class Config(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    claims: SequenceNotStr[str]
+    """Custom claims"""
+
+    client_id: str
+    """Your OAuth Client ID"""
+
+    client_secret: str
+    """Your OAuth Client Secret"""
+
+    conditional_access_enabled: bool
+    """Should Cloudflare try to load authentication contexts from your account"""
+
+    directory_id: str
+    """Your Azure directory uuid"""
+
+    email_claim_name: str
+    """The claim name for email in the id_token response."""
+
+    prompt: Literal["login", "select_account", "none"]
+    """Indicates the type of user interaction that is required.
+
+    prompt=login forces the user to enter their credentials on that request,
+    negating single-sign on. prompt=none is the opposite. It ensures that the user
+    isn't presented with any interactive prompt. If the request can't be completed
+    silently by using single-sign on, the Microsoft identity platform returns an
+    interaction_required error. prompt=select_account interrupts single sign-on
+    providing account selection experience listing all the accounts either in
+    session or any remembered account or an option to choose to use a different
+    account altogether.
+    """
+
+    support_groups: bool
+    """Should Cloudflare try to load groups from your account"""
+
+
+class AzureADParam(TypedDict, total=False):
+    config: Required[Config]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    name: Required[str]
+    """The name of the identity provider, shown to users on the login page."""
+
+    type: Required[IdentityProviderType]
+    """The type of identity provider.
+
+    To determine the value for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    scim_config: IdentityProviderSCIMConfigParam
+    """
+    The configuration settings for enabling a System for Cross-Domain Identity
+    Management (SCIM) with the identity provider.
+    """
diff --git a/src/cloudflare/types/zero_trust/azure_group_rule.py b/src/cloudflare/types/zero_trust/azure_group_rule.py
deleted file mode 100644
index 6df84aaf221..00000000000
--- a/src/cloudflare/types/zero_trust/azure_group_rule.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-from pydantic import Field as FieldInfo
-
-from ..._models import BaseModel
-
-__all__ = ["AzureGroupRule", "AzureAD"]
-
-
-class AzureAD(BaseModel):
-    id: str
-    """The ID of an Azure group."""
-
-    connection_id: str
-    """The ID of your Azure identity provider."""
-
-
-class AzureGroupRule(BaseModel):
-    azure_ad: AzureAD = FieldInfo(alias="azureAD")
diff --git a/src/cloudflare/types/zero_trust/certificate_rule.py b/src/cloudflare/types/zero_trust/certificate_rule.py
deleted file mode 100644
index 0e0ed3cff1f..00000000000
--- a/src/cloudflare/types/zero_trust/certificate_rule.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-from ..._models import BaseModel
-
-__all__ = ["CertificateRule"]
-
-
-class CertificateRule(BaseModel):
-    certificate: object
diff --git a/src/cloudflare/types/zero_trust/certificate_rule_param.py b/src/cloudflare/types/zero_trust/certificate_rule_param.py
deleted file mode 100644
index a93d12ae10b..00000000000
--- a/src/cloudflare/types/zero_trust/certificate_rule_param.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["CertificateRuleParam"]
-
-
-class CertificateRuleParam(TypedDict, total=False):
-    certificate: Required[object]
diff --git a/src/cloudflare/types/zero_trust/connection.py b/src/cloudflare/types/zero_trust/connection.py
deleted file mode 100644
index 9d1f58e7fe1..00000000000
--- a/src/cloudflare/types/zero_trust/connection.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ..._models import BaseModel
-
-__all__ = ["Connection"]
-
-
-class Connection(BaseModel):
-    colo_name: Optional[str] = None
-    """The Cloudflare data center used for this connection."""
-
-    is_pending_reconnect: Optional[bool] = None
-    """
-    Cloudflare continues to track connections for several minutes after they
-    disconnect. This is an optimization to improve latency and reliability of
-    reconnecting. If `true`, the connection has disconnected but is still being
-    tracked. If `false`, the connection is actively serving traffic.
-    """
-
-    uuid: Optional[str] = None
-    """UUID of the Cloudflare Tunnel connection."""
diff --git a/src/cloudflare/types/zero_trust/device.py b/src/cloudflare/types/zero_trust/device.py
index 41c7eba972d..67ce4f09e69 100644
--- a/src/cloudflare/types/zero_trust/device.py
+++ b/src/cloudflare/types/zero_trust/device.py
@@ -11,7 +11,7 @@
 
 class User(BaseModel):
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
     email: Optional[str] = None
     """The contact email address of the user."""
@@ -22,7 +22,11 @@ class User(BaseModel):
 
 class Device(BaseModel):
     id: Optional[str] = None
-    """Device ID."""
+    """Registration ID.
+
+    Equal to Device ID except for accounts which enabled
+    [multi-user mode](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-multiuser/).
+    """
 
     created: Optional[datetime] = None
     """When the device was created."""
@@ -30,7 +34,7 @@ class Device(BaseModel):
     deleted: Optional[bool] = None
     """True if the device was deleted."""
 
-    device_type: Optional[Literal["windows", "mac", "linux", "android", "ios"]] = None
+    device_type: Optional[Literal["windows", "mac", "linux", "android", "ios", "chromeos"]] = None
 
     ip: Optional[str] = None
     """IPv4 or IPv6 address."""
@@ -63,7 +67,11 @@ class Device(BaseModel):
     """The operating system version."""
 
     os_version_extra: Optional[str] = None
-    """The operating system version extra parameter."""
+    """Additional operating system version details.
+
+    For Windows, the UBR (Update Build Revision). For Mac or iOS, the Product
+    Version Extra. For Linux, the distribution name and version.
+    """
 
     revoked_at: Optional[datetime] = None
     """When the device was revoked."""
diff --git a/src/cloudflare/types/zero_trust/device_experience_monitor.py b/src/cloudflare/types/zero_trust/device_experience_monitor.py
deleted file mode 100644
index 2ee952e9caf..00000000000
--- a/src/cloudflare/types/zero_trust/device_experience_monitor.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-from ..._models import BaseModel
-
-__all__ = ["DeviceExperienceMonitor"]
-
-
-class DeviceExperienceMonitor(BaseModel):
-    id: str
-
-    default: bool
-    """Whether the policy is the default for the account"""
-
-    name: str
diff --git a/src/cloudflare/types/zero_trust/device_get_response.py b/src/cloudflare/types/zero_trust/device_get_response.py
index 8bc4c694795..b1fcdc2151d 100644
--- a/src/cloudflare/types/zero_trust/device_get_response.py
+++ b/src/cloudflare/types/zero_trust/device_get_response.py
@@ -1,7 +1,87 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Optional
+from datetime import datetime
 
-__all__ = ["DeviceGetResponse"]
+from ..._models import BaseModel
 
-DeviceGetResponse = Union[Optional[str], Optional[object]]
+__all__ = ["DeviceGetResponse", "Account", "User"]
+
+
+class Account(BaseModel):
+    id: Optional[str] = None
+
+    account_type: Optional[str] = None
+
+    name: Optional[str] = None
+    """The name of the enrolled account."""
+
+
+class User(BaseModel):
+    id: Optional[str] = None
+    """UUID."""
+
+    email: Optional[str] = None
+    """The contact email address of the user."""
+
+    name: Optional[str] = None
+    """The enrolled device user's name."""
+
+
+class DeviceGetResponse(BaseModel):
+    id: Optional[str] = None
+    """Registration ID.
+
+    Equal to Device ID except for accounts which enabled
+    [multi-user mode](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-multiuser/).
+    """
+
+    account: Optional[Account] = None
+
+    created: Optional[datetime] = None
+    """When the device was created."""
+
+    deleted: Optional[bool] = None
+    """True if the device was deleted."""
+
+    device_type: Optional[str] = None
+
+    gateway_device_id: Optional[str] = None
+
+    ip: Optional[str] = None
+    """IPv4 or IPv6 address."""
+
+    key: Optional[str] = None
+    """The device's public key."""
+
+    key_type: Optional[str] = None
+    """Type of the key."""
+
+    last_seen: Optional[datetime] = None
+    """When the device last connected to Cloudflare services."""
+
+    mac_address: Optional[str] = None
+    """The device mac address."""
+
+    model: Optional[str] = None
+    """The device model name."""
+
+    name: Optional[str] = None
+    """The device name."""
+
+    os_version: Optional[str] = None
+    """The operating system version."""
+
+    serial_number: Optional[str] = None
+    """The device serial number."""
+
+    tunnel_type: Optional[str] = None
+    """Type of the tunnel connection used."""
+
+    updated: Optional[datetime] = None
+    """When the device was updated."""
+
+    user: Optional[User] = None
+
+    version: Optional[str] = None
+    """The WARP client version."""
diff --git a/src/cloudflare/types/zero_trust/devices/__init__.py b/src/cloudflare/types/zero_trust/devices/__init__.py
index 629e4c5cec8..c6997f543e5 100644
--- a/src/cloudflare/types/zero_trust/devices/__init__.py
+++ b/src/cloudflare/types/zero_trust/devices/__init__.py
@@ -3,8 +3,6 @@
 from __future__ import annotations
 
 from .file_input import FileInput as FileInput
-from .schema_data import SchemaData as SchemaData
-from .schema_http import SchemaHTTP as SchemaHTTP
 from .device_input import DeviceInput as DeviceInput
 from .device_match import DeviceMatch as DeviceMatch
 from .intune_input import IntuneInput as IntuneInput
@@ -13,26 +11,34 @@
 from .device_network import DeviceNetwork as DeviceNetwork
 from .firewall_input import FirewallInput as FirewallInput
 from .device_settings import DeviceSettings as DeviceSettings
+from .fallback_domain import FallbackDomain as FallbackDomain
 from .settings_policy import SettingsPolicy as SettingsPolicy
 from .file_input_param import FileInputParam as FileInputParam
 from .os_version_input import OSVersionInput as OSVersionInput
 from .carbonblack_input import CarbonblackInput as CarbonblackInput
 from .crowdstrike_input import CrowdstrikeInput as CrowdstrikeInput
-from .schema_data_param import SchemaDataParam as SchemaDataParam
+from .device_get_params import DeviceGetParams as DeviceGetParams
 from .sentinelone_input import SentineloneInput as SentineloneInput
 from .device_input_param import DeviceInputParam as DeviceInputParam
+from .device_list_params import DeviceListParams as DeviceListParams
 from .device_match_param import DeviceMatchParam as DeviceMatchParam
 from .intune_input_param import IntuneInputParam as IntuneInputParam
 from .kolide_input_param import KolideInputParam as KolideInputParam
-from .policy_edit_params import PolicyEditParams as PolicyEditParams
 from .tanium_input_param import TaniumInputParam as TaniumInputParam
+from .device_get_response import DeviceGetResponse as DeviceGetResponse
 from .device_posture_rule import DevicePostureRule as DevicePostureRule
 from .domain_joined_input import DomainJoinedInput as DomainJoinedInput
+from .setting_edit_params import SettingEditParams as SettingEditParams
 from .workspace_one_input import WorkspaceOneInput as WorkspaceOneInput
+from .device_list_response import DeviceListResponse as DeviceListResponse
+from .dex_test_list_params import DEXTestListParams as DEXTestListParams
 from .firewall_input_param import FirewallInputParam as FirewallInputParam
-from .policy_create_params import PolicyCreateParams as PolicyCreateParams
 from .revoke_create_params import RevokeCreateParams as RevokeCreateParams
+from .split_tunnel_exclude import SplitTunnelExclude as SplitTunnelExclude
+from .split_tunnel_include import SplitTunnelInclude as SplitTunnelInclude
+from .dex_test_get_response import DEXTestGetResponse as DEXTestGetResponse
 from .disk_encryption_input import DiskEncryptionInput as DiskEncryptionInput
+from .fallback_domain_param import FallbackDomainParam as FallbackDomainParam
 from .network_create_params import NetworkCreateParams as NetworkCreateParams
 from .network_update_params import NetworkUpdateParams as NetworkUpdateParams
 from .posture_create_params import PostureCreateParams as PostureCreateParams
@@ -40,23 +46,36 @@
 from .sentinelone_s2s_input import SentineloneS2sInput as SentineloneS2sInput
 from .setting_update_params import SettingUpdateParams as SettingUpdateParams
 from .dex_test_create_params import DEXTestCreateParams as DEXTestCreateParams
+from .dex_test_list_response import DEXTestListResponse as DEXTestListResponse
 from .dex_test_update_params import DEXTestUpdateParams as DEXTestUpdateParams
 from .os_version_input_param import OSVersionInputParam as OSVersionInputParam
-from .policy_delete_response import PolicyDeleteResponse as PolicyDeleteResponse
 from .revoke_create_response import RevokeCreateResponse as RevokeCreateResponse
 from .unique_client_id_input import UniqueClientIDInput as UniqueClientIDInput
 from .unrevoke_create_params import UnrevokeCreateParams as UnrevokeCreateParams
 from .crowdstrike_input_param import CrowdstrikeInputParam as CrowdstrikeInputParam
-from .network_delete_response import NetworkDeleteResponse as NetworkDeleteResponse
+from .fleet_status_get_params import FleetStatusGetParams as FleetStatusGetParams
 from .posture_delete_response import PostureDeleteResponse as PostureDeleteResponse
+from .registration_get_params import RegistrationGetParams as RegistrationGetParams
 from .sentinelone_input_param import SentineloneInputParam as SentineloneInputParam
 from .client_certificate_input import ClientCertificateInput as ClientCertificateInput
+from .dex_test_create_response import DEXTestCreateResponse as DEXTestCreateResponse
 from .dex_test_delete_response import DEXTestDeleteResponse as DEXTestDeleteResponse
+from .dex_test_update_response import DEXTestUpdateResponse as DEXTestUpdateResponse
+from .registration_list_params import RegistrationListParams as RegistrationListParams
 from .unrevoke_create_response import UnrevokeCreateResponse as UnrevokeCreateResponse
 from .domain_joined_input_param import DomainJoinedInputParam as DomainJoinedInputParam
+from .fleet_status_get_response import FleetStatusGetResponse as FleetStatusGetResponse
+from .registration_get_response import RegistrationGetResponse as RegistrationGetResponse
 from .workspace_one_input_param import WorkspaceOneInputParam as WorkspaceOneInputParam
+from .device_policy_certificates import DevicePolicyCertificates as DevicePolicyCertificates
+from .override_code_get_response import OverrideCodeGetResponse as OverrideCodeGetResponse
+from .registration_list_response import RegistrationListResponse as RegistrationListResponse
+from .registration_revoke_params import RegistrationRevokeParams as RegistrationRevokeParams
+from .split_tunnel_exclude_param import SplitTunnelExcludeParam as SplitTunnelExcludeParam
+from .split_tunnel_include_param import SplitTunnelIncludeParam as SplitTunnelIncludeParam
 from .disk_encryption_input_param import DiskEncryptionInputParam as DiskEncryptionInputParam
-from .override_code_list_response import OverrideCodeListResponse as OverrideCodeListResponse
 from .sentinelone_s2s_input_param import SentineloneS2sInputParam as SentineloneS2sInputParam
+from .registration_unrevoke_params import RegistrationUnrevokeParams as RegistrationUnrevokeParams
 from .unique_client_id_input_param import UniqueClientIDInputParam as UniqueClientIDInputParam
 from .client_certificate_input_param import ClientCertificateInputParam as ClientCertificateInputParam
+from .registration_bulk_delete_params import RegistrationBulkDeleteParams as RegistrationBulkDeleteParams
diff --git a/src/cloudflare/types/zero_trust/devices/carbonblack_input.py b/src/cloudflare/types/zero_trust/devices/carbonblack_input.py
index d28931df22c..5872f0e21af 100644
--- a/src/cloudflare/types/zero_trust/devices/carbonblack_input.py
+++ b/src/cloudflare/types/zero_trust/devices/carbonblack_input.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["CarbonblackInput"]
 
-CarbonblackInput = str
+CarbonblackInput: TypeAlias = str
diff --git a/src/cloudflare/types/zero_trust/devices/client_certificate_input.py b/src/cloudflare/types/zero_trust/devices/client_certificate_input.py
index df018c97527..4cab0892bcf 100644
--- a/src/cloudflare/types/zero_trust/devices/client_certificate_input.py
+++ b/src/cloudflare/types/zero_trust/devices/client_certificate_input.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ...._models import BaseModel
 
 __all__ = ["ClientCertificateInput"]
@@ -11,4 +10,4 @@ class ClientCertificateInput(BaseModel):
     """UUID of Cloudflare managed certificate."""
 
     cn: str
-    """Common Name that is protected by the certificate"""
+    """Common Name that is protected by the certificate."""
diff --git a/src/cloudflare/types/zero_trust/devices/client_certificate_input_param.py b/src/cloudflare/types/zero_trust/devices/client_certificate_input_param.py
index 626f69e4a32..5feed2d5073 100644
--- a/src/cloudflare/types/zero_trust/devices/client_certificate_input_param.py
+++ b/src/cloudflare/types/zero_trust/devices/client_certificate_input_param.py
@@ -12,4 +12,4 @@ class ClientCertificateInputParam(TypedDict, total=False):
     """UUID of Cloudflare managed certificate."""
 
     cn: Required[str]
-    """Common Name that is protected by the certificate"""
+    """Common Name that is protected by the certificate."""
diff --git a/src/cloudflare/types/zero_trust/devices/crowdstrike_input.py b/src/cloudflare/types/zero_trust/devices/crowdstrike_input.py
index b46afbf4142..71747781baf 100644
--- a/src/cloudflare/types/zero_trust/devices/crowdstrike_input.py
+++ b/src/cloudflare/types/zero_trust/devices/crowdstrike_input.py
@@ -18,22 +18,22 @@ class CrowdstrikeInput(BaseModel):
     """For more details on last seen, please refer to the Crowdstrike documentation."""
 
     operator: Optional[Literal["<", "<=", ">", ">=", "=="]] = None
-    """operator"""
+    """Operator."""
 
     os: Optional[str] = None
-    """Os Version"""
+    """Os Version."""
 
     overall: Optional[str] = None
-    """overall"""
+    """Overall."""
 
     sensor_config: Optional[str] = None
-    """SensorConfig"""
+    """SensorConfig."""
 
     state: Optional[Literal["online", "offline", "unknown"]] = None
     """For more details on state, please refer to the Crowdstrike documentation."""
 
     version: Optional[str] = None
-    """Version"""
+    """Version."""
 
     version_operator: Optional[Literal["<", "<=", ">", ">=", "=="]] = FieldInfo(alias="versionOperator", default=None)
-    """Version Operator"""
+    """Version Operator."""
diff --git a/src/cloudflare/types/zero_trust/devices/crowdstrike_input_param.py b/src/cloudflare/types/zero_trust/devices/crowdstrike_input_param.py
index 7cc4fc7e593..029906104a4 100644
--- a/src/cloudflare/types/zero_trust/devices/crowdstrike_input_param.py
+++ b/src/cloudflare/types/zero_trust/devices/crowdstrike_input_param.py
@@ -17,22 +17,22 @@ class CrowdstrikeInputParam(TypedDict, total=False):
     """For more details on last seen, please refer to the Crowdstrike documentation."""
 
     operator: Literal["<", "<=", ">", ">=", "=="]
-    """operator"""
+    """Operator."""
 
     os: str
-    """Os Version"""
+    """Os Version."""
 
     overall: str
-    """overall"""
+    """Overall."""
 
     sensor_config: str
-    """SensorConfig"""
+    """SensorConfig."""
 
     state: Literal["online", "offline", "unknown"]
     """For more details on state, please refer to the Crowdstrike documentation."""
 
     version: str
-    """Version"""
+    """Version."""
 
     version_operator: Annotated[Literal["<", "<=", ">", ">=", "=="], PropertyInfo(alias="versionOperator")]
-    """Version Operator"""
+    """Version Operator."""
diff --git a/src/cloudflare/types/zero_trust/devices/device_get_params.py b/src/cloudflare/types/zero_trust/devices/device_get_params.py
new file mode 100644
index 00000000000..c81fa9ea02e
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/device_get_params.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["DeviceGetParams"]
+
+
+class DeviceGetParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    include: str
+    """
+    Comma-separated list of additional information that should be included in the
+    device response. Supported values are: "last_seen_registration.policy".
+    """
diff --git a/src/cloudflare/types/zero_trust/devices/device_get_response.py b/src/cloudflare/types/zero_trust/devices/device_get_response.py
new file mode 100644
index 00000000000..0ec3ac902f4
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/device_get_response.py
@@ -0,0 +1,120 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ...._models import BaseModel
+
+__all__ = ["DeviceGetResponse", "LastSeenRegistration", "LastSeenRegistrationPolicy", "LastSeenUser"]
+
+
+class LastSeenRegistrationPolicy(BaseModel):
+    """A summary of the device profile evaluated for the registration."""
+
+    id: str
+    """The ID of the device settings profile."""
+
+    default: bool
+    """Whether the device settings profile is the default profile for the account."""
+
+    deleted: bool
+    """Whether the device settings profile was deleted."""
+
+    name: str
+    """The name of the device settings profile."""
+
+    updated_at: str
+    """
+    The RFC3339 timestamp of when the device settings profile last changed for the
+    registration.
+    """
+
+
+class LastSeenRegistration(BaseModel):
+    """The last seen registration for the device."""
+
+    policy: Optional[LastSeenRegistrationPolicy] = None
+    """A summary of the device profile evaluated for the registration."""
+
+
+class LastSeenUser(BaseModel):
+    """The last user to use the WARP device."""
+
+    id: Optional[str] = None
+    """UUID."""
+
+    email: Optional[str] = None
+    """The contact email address of the user."""
+
+    name: Optional[str] = None
+    """The enrolled device user's name."""
+
+
+class DeviceGetResponse(BaseModel):
+    """A WARP Device."""
+
+    id: str
+    """The unique ID of the device."""
+
+    active_registrations: int
+    """The number of active registrations for the device.
+
+    Active registrations are those which haven't been revoked or deleted.
+    """
+
+    created_at: str
+    """The RFC3339 timestamp when the device was created."""
+
+    last_seen_at: Optional[str] = None
+    """The RFC3339 timestamp when the device was last seen."""
+
+    name: str
+    """The name of the device."""
+
+    updated_at: str
+    """The RFC3339 timestamp when the device was last updated."""
+
+    client_version: Optional[str] = None
+    """Version of the WARP client."""
+
+    deleted_at: Optional[str] = None
+    """The RFC3339 timestamp when the device was deleted."""
+
+    device_type: Optional[str] = None
+    """The device operating system."""
+
+    hardware_id: Optional[str] = None
+    """A string that uniquely identifies the hardware or virtual machine (VM)."""
+
+    last_seen_registration: Optional[LastSeenRegistration] = None
+    """The last seen registration for the device."""
+
+    last_seen_user: Optional[LastSeenUser] = None
+    """The last user to use the WARP device."""
+
+    mac_address: Optional[str] = None
+    """The device MAC address."""
+
+    manufacturer: Optional[str] = None
+    """The device manufacturer."""
+
+    model: Optional[str] = None
+    """The model name of the device."""
+
+    os_version: Optional[str] = None
+    """The device operating system version number."""
+
+    os_version_extra: Optional[str] = None
+    """Additional operating system version details.
+
+    For Windows, the UBR (Update Build Revision). For Mac or iOS, the Product
+    Version Extra. For Linux, the distribution name and version.
+    """
+
+    public_ip: Optional[str] = None
+    """
+    **Deprecated**: IP information is provided by DEX - see
+    https://developers.cloudflare.com/api/resources/zero_trust/subresources/dex/subresources/fleet_status/subresources/devices/methods/list/
+    """
+
+    serial_number: Optional[str] = None
+    """The device serial number."""
diff --git a/src/cloudflare/types/zero_trust/devices/device_input.py b/src/cloudflare/types/zero_trust/devices/device_input.py
index a6f97bd41f3..e2bd50ba6cd 100644
--- a/src/cloudflare/types/zero_trust/devices/device_input.py
+++ b/src/cloudflare/types/zero_trust/devices/device_input.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
-from typing_extensions import Literal
+from typing import List, Union, Optional
+from typing_extensions import Literal, TypeAlias
 
 from ...._models import BaseModel
 from .file_input import FileInput
@@ -19,12 +19,21 @@
 from .unique_client_id_input import UniqueClientIDInput
 from .client_certificate_input import ClientCertificateInput
 
-__all__ = ["DeviceInput", "TeamsDevicesCarbonblackInputRequest", "TeamsDevicesApplicationInputRequest"]
+__all__ = [
+    "DeviceInput",
+    "TeamsDevicesCarbonblackInputRequest",
+    "TeamsDevicesAccessSerialNumberListInputRequest",
+    "TeamsDevicesApplicationInputRequest",
+    "TeamsDevicesClientCertificateV2InputRequest",
+    "TeamsDevicesClientCertificateV2InputRequestLocations",
+    "TeamsDevicesAntivirusInputRequest",
+    "TeamsDevicesCustomS2sInputRequest",
+]
 
 
 class TeamsDevicesCarbonblackInputRequest(BaseModel):
     operating_system: Literal["windows", "linux", "mac"]
-    """Operating system"""
+    """Operating system."""
 
     path: str
     """File path."""
@@ -36,9 +45,14 @@ class TeamsDevicesCarbonblackInputRequest(BaseModel):
     """Signing certificate thumbprint."""
 
 
+class TeamsDevicesAccessSerialNumberListInputRequest(BaseModel):
+    id: str
+    """UUID of Access List."""
+
+
 class TeamsDevicesApplicationInputRequest(BaseModel):
     operating_system: Literal["windows", "linux", "mac"]
-    """Operating system"""
+    """Operating system."""
 
     path: str
     """Path for the application."""
@@ -50,7 +64,66 @@ class TeamsDevicesApplicationInputRequest(BaseModel):
     """Signing certificate thumbprint."""
 
 
-DeviceInput = Union[
+class TeamsDevicesClientCertificateV2InputRequestLocations(BaseModel):
+    paths: Optional[List[str]] = None
+    """List of paths to check for client certificate on linux."""
+
+    trust_stores: Optional[List[Literal["system", "user"]]] = None
+    """List of trust stores to check for client certificate."""
+
+
+class TeamsDevicesClientCertificateV2InputRequest(BaseModel):
+    certificate_id: str
+    """UUID of Cloudflare managed certificate."""
+
+    check_private_key: bool
+    """Confirm the certificate was not imported from another device.
+
+    We recommend keeping this enabled unless the certificate was deployed without a
+    private key.
+    """
+
+    operating_system: Literal["windows", "linux", "mac"]
+    """Operating system."""
+
+    cn: Optional[str] = None
+    """Certificate Common Name.
+
+    This may include one or more variables in the ${ } notation. Only
+    ${serial_number} and ${hostname} are valid variables.
+    """
+
+    extended_key_usage: Optional[List[Literal["clientAuth", "emailProtection"]]] = None
+    """
+    List of values indicating purposes for which the certificate public key can be
+    used.
+    """
+
+    locations: Optional[TeamsDevicesClientCertificateV2InputRequestLocations] = None
+
+    subject_alternative_names: Optional[List[str]] = None
+    """List of certificate Subject Alternative Names."""
+
+
+class TeamsDevicesAntivirusInputRequest(BaseModel):
+    update_window_days: Optional[float] = None
+    """Number of days that the antivirus should be updated within."""
+
+
+class TeamsDevicesCustomS2sInputRequest(BaseModel):
+    connection_id: str
+    """Posture Integration ID."""
+
+    operator: Literal["<", "<=", ">", ">=", "=="]
+    """Operator."""
+
+    score: float
+    """
+    A value between 0-100 assigned to devices set by the 3rd party posture provider.
+    """
+
+
+DeviceInput: TypeAlias = Union[
     FileInput,
     UniqueClientIDInput,
     DomainJoinedInput,
@@ -58,13 +131,17 @@ class TeamsDevicesApplicationInputRequest(BaseModel):
     FirewallInput,
     SentineloneInput,
     TeamsDevicesCarbonblackInputRequest,
+    TeamsDevicesAccessSerialNumberListInputRequest,
     DiskEncryptionInput,
     TeamsDevicesApplicationInputRequest,
     ClientCertificateInput,
+    TeamsDevicesClientCertificateV2InputRequest,
+    TeamsDevicesAntivirusInputRequest,
     WorkspaceOneInput,
     CrowdstrikeInput,
     IntuneInput,
     KolideInput,
     TaniumInput,
     SentineloneS2sInput,
+    TeamsDevicesCustomS2sInputRequest,
 ]
diff --git a/src/cloudflare/types/zero_trust/devices/device_input_param.py b/src/cloudflare/types/zero_trust/devices/device_input_param.py
index 9ec80edd418..3e82e59c191 100644
--- a/src/cloudflare/types/zero_trust/devices/device_input_param.py
+++ b/src/cloudflare/types/zero_trust/devices/device_input_param.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from typing import Union
-from typing_extensions import Literal, Required, TypedDict
+from typing import List, Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
+from ...._types import SequenceNotStr
 from .file_input_param import FileInputParam
 from .intune_input_param import IntuneInputParam
 from .kolide_input_param import KolideInputParam
@@ -20,12 +21,21 @@
 from .unique_client_id_input_param import UniqueClientIDInputParam
 from .client_certificate_input_param import ClientCertificateInputParam
 
-__all__ = ["DeviceInputParam", "TeamsDevicesCarbonblackInputRequest", "TeamsDevicesApplicationInputRequest"]
+__all__ = [
+    "DeviceInputParam",
+    "TeamsDevicesCarbonblackInputRequest",
+    "TeamsDevicesAccessSerialNumberListInputRequest",
+    "TeamsDevicesApplicationInputRequest",
+    "TeamsDevicesClientCertificateV2InputRequest",
+    "TeamsDevicesClientCertificateV2InputRequestLocations",
+    "TeamsDevicesAntivirusInputRequest",
+    "TeamsDevicesCustomS2sInputRequest",
+]
 
 
 class TeamsDevicesCarbonblackInputRequest(TypedDict, total=False):
     operating_system: Required[Literal["windows", "linux", "mac"]]
-    """Operating system"""
+    """Operating system."""
 
     path: Required[str]
     """File path."""
@@ -37,9 +47,14 @@ class TeamsDevicesCarbonblackInputRequest(TypedDict, total=False):
     """Signing certificate thumbprint."""
 
 
+class TeamsDevicesAccessSerialNumberListInputRequest(TypedDict, total=False):
+    id: Required[str]
+    """UUID of Access List."""
+
+
 class TeamsDevicesApplicationInputRequest(TypedDict, total=False):
     operating_system: Required[Literal["windows", "linux", "mac"]]
-    """Operating system"""
+    """Operating system."""
 
     path: Required[str]
     """Path for the application."""
@@ -51,7 +66,66 @@ class TeamsDevicesApplicationInputRequest(TypedDict, total=False):
     """Signing certificate thumbprint."""
 
 
-DeviceInputParam = Union[
+class TeamsDevicesClientCertificateV2InputRequestLocations(TypedDict, total=False):
+    paths: SequenceNotStr[str]
+    """List of paths to check for client certificate on linux."""
+
+    trust_stores: List[Literal["system", "user"]]
+    """List of trust stores to check for client certificate."""
+
+
+class TeamsDevicesClientCertificateV2InputRequest(TypedDict, total=False):
+    certificate_id: Required[str]
+    """UUID of Cloudflare managed certificate."""
+
+    check_private_key: Required[bool]
+    """Confirm the certificate was not imported from another device.
+
+    We recommend keeping this enabled unless the certificate was deployed without a
+    private key.
+    """
+
+    operating_system: Required[Literal["windows", "linux", "mac"]]
+    """Operating system."""
+
+    cn: str
+    """Certificate Common Name.
+
+    This may include one or more variables in the ${ } notation. Only
+    ${serial_number} and ${hostname} are valid variables.
+    """
+
+    extended_key_usage: List[Literal["clientAuth", "emailProtection"]]
+    """
+    List of values indicating purposes for which the certificate public key can be
+    used.
+    """
+
+    locations: TeamsDevicesClientCertificateV2InputRequestLocations
+
+    subject_alternative_names: SequenceNotStr[str]
+    """List of certificate Subject Alternative Names."""
+
+
+class TeamsDevicesAntivirusInputRequest(TypedDict, total=False):
+    update_window_days: float
+    """Number of days that the antivirus should be updated within."""
+
+
+class TeamsDevicesCustomS2sInputRequest(TypedDict, total=False):
+    connection_id: Required[str]
+    """Posture Integration ID."""
+
+    operator: Required[Literal["<", "<=", ">", ">=", "=="]]
+    """Operator."""
+
+    score: Required[float]
+    """
+    A value between 0-100 assigned to devices set by the 3rd party posture provider.
+    """
+
+
+DeviceInputParam: TypeAlias = Union[
     FileInputParam,
     UniqueClientIDInputParam,
     DomainJoinedInputParam,
@@ -59,13 +133,17 @@ class TeamsDevicesApplicationInputRequest(TypedDict, total=False):
     FirewallInputParam,
     SentineloneInputParam,
     TeamsDevicesCarbonblackInputRequest,
+    TeamsDevicesAccessSerialNumberListInputRequest,
     DiskEncryptionInputParam,
     TeamsDevicesApplicationInputRequest,
     ClientCertificateInputParam,
+    TeamsDevicesClientCertificateV2InputRequest,
+    TeamsDevicesAntivirusInputRequest,
     WorkspaceOneInputParam,
     CrowdstrikeInputParam,
     IntuneInputParam,
     KolideInputParam,
     TaniumInputParam,
     SentineloneS2sInputParam,
+    TeamsDevicesCustomS2sInputRequest,
 ]
diff --git a/src/cloudflare/types/zero_trust/devices/device_list_params.py b/src/cloudflare/types/zero_trust/devices/device_list_params.py
new file mode 100644
index 00000000000..8e3b593f846
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/device_list_params.py
@@ -0,0 +1,68 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["DeviceListParams", "LastSeenUser"]
+
+
+class DeviceListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    id: SequenceNotStr[str]
+    """Filter by a one or more device IDs."""
+
+    active_registrations: Literal["include", "only", "exclude"]
+    """Include or exclude devices with active registrations.
+
+    The default is "only" - return only devices with active registrations.
+    """
+
+    cursor: str
+    """
+    Opaque token indicating the starting position when requesting the next set of
+    records. A cursor value can be obtained from the result_info.cursor field in the
+    response.
+    """
+
+    include: str
+    """
+    Comma-separated list of additional information that should be included in the
+    device response. Supported values are: "last_seen_registration.policy".
+    """
+
+    last_seen_user: LastSeenUser
+
+    per_page: int
+    """The maximum number of devices to return in a single response."""
+
+    search: str
+    """Search by device details."""
+
+    seen_after: str
+    """
+    Filter by the last_seen timestamp - returns only devices last seen after this
+    timestamp.
+    """
+
+    seen_before: str
+    """
+    Filter by the last_seen timestamp - returns only devices last seen before this
+    timestamp.
+    """
+
+    sort_by: Literal[
+        "name", "id", "client_version", "last_seen_user.email", "last_seen_at", "active_registrations", "created_at"
+    ]
+    """The device field to order results by."""
+
+    sort_order: Literal["asc", "desc"]
+    """Sort direction."""
+
+
+class LastSeenUser(TypedDict, total=False):
+    email: str
+    """Filter by the last seen user's email."""
diff --git a/src/cloudflare/types/zero_trust/devices/device_list_response.py b/src/cloudflare/types/zero_trust/devices/device_list_response.py
new file mode 100644
index 00000000000..3b8a82c89a7
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/device_list_response.py
@@ -0,0 +1,120 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ...._models import BaseModel
+
+__all__ = ["DeviceListResponse", "LastSeenRegistration", "LastSeenRegistrationPolicy", "LastSeenUser"]
+
+
+class LastSeenRegistrationPolicy(BaseModel):
+    """A summary of the device profile evaluated for the registration."""
+
+    id: str
+    """The ID of the device settings profile."""
+
+    default: bool
+    """Whether the device settings profile is the default profile for the account."""
+
+    deleted: bool
+    """Whether the device settings profile was deleted."""
+
+    name: str
+    """The name of the device settings profile."""
+
+    updated_at: str
+    """
+    The RFC3339 timestamp of when the device settings profile last changed for the
+    registration.
+    """
+
+
+class LastSeenRegistration(BaseModel):
+    """The last seen registration for the device."""
+
+    policy: Optional[LastSeenRegistrationPolicy] = None
+    """A summary of the device profile evaluated for the registration."""
+
+
+class LastSeenUser(BaseModel):
+    """The last user to use the WARP device."""
+
+    id: Optional[str] = None
+    """UUID."""
+
+    email: Optional[str] = None
+    """The contact email address of the user."""
+
+    name: Optional[str] = None
+    """The enrolled device user's name."""
+
+
+class DeviceListResponse(BaseModel):
+    """A WARP Device."""
+
+    id: str
+    """The unique ID of the device."""
+
+    active_registrations: int
+    """The number of active registrations for the device.
+
+    Active registrations are those which haven't been revoked or deleted.
+    """
+
+    created_at: str
+    """The RFC3339 timestamp when the device was created."""
+
+    last_seen_at: Optional[str] = None
+    """The RFC3339 timestamp when the device was last seen."""
+
+    name: str
+    """The name of the device."""
+
+    updated_at: str
+    """The RFC3339 timestamp when the device was last updated."""
+
+    client_version: Optional[str] = None
+    """Version of the WARP client."""
+
+    deleted_at: Optional[str] = None
+    """The RFC3339 timestamp when the device was deleted."""
+
+    device_type: Optional[str] = None
+    """The device operating system."""
+
+    hardware_id: Optional[str] = None
+    """A string that uniquely identifies the hardware or virtual machine (VM)."""
+
+    last_seen_registration: Optional[LastSeenRegistration] = None
+    """The last seen registration for the device."""
+
+    last_seen_user: Optional[LastSeenUser] = None
+    """The last user to use the WARP device."""
+
+    mac_address: Optional[str] = None
+    """The device MAC address."""
+
+    manufacturer: Optional[str] = None
+    """The device manufacturer."""
+
+    model: Optional[str] = None
+    """The model name of the device."""
+
+    os_version: Optional[str] = None
+    """The device operating system version number."""
+
+    os_version_extra: Optional[str] = None
+    """Additional operating system version details.
+
+    For Windows, the UBR (Update Build Revision). For Mac or iOS, the Product
+    Version Extra. For Linux, the distribution name and version.
+    """
+
+    public_ip: Optional[str] = None
+    """
+    **Deprecated**: IP information is provided by DEX - see
+    https://developers.cloudflare.com/api/resources/zero_trust/subresources/dex/subresources/fleet_status/subresources/devices/methods/list/
+    """
+
+    serial_number: Optional[str] = None
+    """The device serial number."""
diff --git a/src/cloudflare/types/zero_trust/devices/device_match.py b/src/cloudflare/types/zero_trust/devices/device_match.py
index 719a707d6f2..338a1431c67 100644
--- a/src/cloudflare/types/zero_trust/devices/device_match.py
+++ b/src/cloudflare/types/zero_trust/devices/device_match.py
@@ -9,4 +9,4 @@
 
 
 class DeviceMatch(BaseModel):
-    platform: Optional[Literal["windows", "mac", "linux", "android", "ios"]] = None
+    platform: Optional[Literal["windows", "mac", "linux", "android", "ios", "chromeos"]] = None
diff --git a/src/cloudflare/types/zero_trust/devices/device_match_param.py b/src/cloudflare/types/zero_trust/devices/device_match_param.py
index 8ecbc486e4f..128364eef40 100644
--- a/src/cloudflare/types/zero_trust/devices/device_match_param.py
+++ b/src/cloudflare/types/zero_trust/devices/device_match_param.py
@@ -8,4 +8,4 @@
 
 
 class DeviceMatchParam(TypedDict, total=False):
-    platform: Literal["windows", "mac", "linux", "android", "ios"]
+    platform: Literal["windows", "mac", "linux", "android", "ios", "chromeos"]
diff --git a/src/cloudflare/types/zero_trust/devices/device_network.py b/src/cloudflare/types/zero_trust/devices/device_network.py
index db154213768..decc4047674 100644
--- a/src/cloudflare/types/zero_trust/devices/device_network.py
+++ b/src/cloudflare/types/zero_trust/devices/device_network.py
@@ -9,6 +9,10 @@
 
 
 class Config(BaseModel):
+    """
+    The configuration object containing information for the WARP client to detect the managed network.
+    """
+
     tls_sockaddr: str
     """
     A network address of the form "host:port" that the WARP client will use to
diff --git a/src/cloudflare/types/zero_trust/devices/device_policy_certificates.py b/src/cloudflare/types/zero_trust/devices/device_policy_certificates.py
new file mode 100644
index 00000000000..af8cbbc68b2
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/device_policy_certificates.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["DevicePolicyCertificates"]
+
+
+class DevicePolicyCertificates(BaseModel):
+    enabled: bool
+    """
+    The current status of the device policy certificate provisioning feature for
+    WARP clients.
+    """
diff --git a/src/cloudflare/types/zero_trust/devices/device_posture_rule.py b/src/cloudflare/types/zero_trust/devices/device_posture_rule.py
index 1817b557e0b..0b424524f02 100644
--- a/src/cloudflare/types/zero_trust/devices/device_posture_rule.py
+++ b/src/cloudflare/types/zero_trust/devices/device_posture_rule.py
@@ -47,12 +47,15 @@ class DevicePostureRule(BaseModel):
             "gateway",
             "warp",
             "disk_encryption",
+            "serial_number",
             "sentinelone",
             "carbonblack",
             "firewall",
             "os_version",
             "domain_joined",
             "client_certificate",
+            "client_certificate_v2",
+            "antivirus",
             "unique_client_id",
             "kolide",
             "tanium_s2s",
@@ -60,6 +63,7 @@ class DevicePostureRule(BaseModel):
             "intune",
             "workspace_one",
             "sentinelone_s2s",
+            "custom_s2s",
         ]
     ] = None
     """The type of device posture rule."""
diff --git a/src/cloudflare/types/zero_trust/devices/device_settings.py b/src/cloudflare/types/zero_trust/devices/device_settings.py
index 6b737b04044..3f814b9f9f1 100644
--- a/src/cloudflare/types/zero_trust/devices/device_settings.py
+++ b/src/cloudflare/types/zero_trust/devices/device_settings.py
@@ -8,6 +8,36 @@
 
 
 class DeviceSettings(BaseModel):
+    disable_for_time: Optional[float] = None
+    """
+    Sets the time limit, in seconds, that a user can use an override code to bypass
+    WARP.
+    """
+
+    external_emergency_signal_enabled: Optional[bool] = None
+    """Controls whether the external emergency disconnect feature is enabled."""
+
+    external_emergency_signal_fingerprint: Optional[str] = None
+    """
+    The SHA256 fingerprint (64 hexadecimal characters) of the HTTPS server
+    certificate for the external_emergency_signal_url. If provided, the WARP client
+    will use this value to verify the server's identity. The device will ignore any
+    response if the server's certificate fingerprint does not exactly match this
+    value.
+    """
+
+    external_emergency_signal_interval: Optional[str] = None
+    """
+    The interval at which the WARP client fetches the emergency disconnect signal,
+    formatted as a duration string (e.g., "5m", "2m30s", "1h"). Minimum 30 seconds.
+    """
+
+    external_emergency_signal_url: Optional[str] = None
+    """The HTTPS URL from which to fetch the emergency disconnect signal.
+
+    Must use HTTPS and have an IPv4 or IPv6 address as the host.
+    """
+
     gateway_proxy_enabled: Optional[bool] = None
     """Enable gateway proxy filtering on TCP."""
 
diff --git a/src/cloudflare/types/zero_trust/devices/dex_test_create_params.py b/src/cloudflare/types/zero_trust/devices/dex_test_create_params.py
index 340d9d17999..8cb648370a6 100644
--- a/src/cloudflare/types/zero_trust/devices/dex_test_create_params.py
+++ b/src/cloudflare/types/zero_trust/devices/dex_test_create_params.py
@@ -3,17 +3,15 @@
 from __future__ import annotations
 
 from typing import Iterable
-from typing_extensions import Required, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
-from .schema_data_param import SchemaDataParam
-
-__all__ = ["DEXTestCreateParams", "TargetPolicy"]
+__all__ = ["DEXTestCreateParams", "Data", "TargetPolicy"]
 
 
 class DEXTestCreateParams(TypedDict, total=False):
     account_id: Required[str]
 
-    data: Required[SchemaDataParam]
+    data: Required[Data]
     """
     The configuration object which contains the details for the WARP client to
     conduct the test.
@@ -32,17 +30,32 @@ class DEXTestCreateParams(TypedDict, total=False):
     """Additional details about the test."""
 
     target_policies: Iterable[TargetPolicy]
-    """Device settings profiles targeted by this test"""
+    """DEX rules targeted by this test"""
 
     targeted: bool
 
 
+class Data(TypedDict, total=False):
+    """
+    The configuration object which contains the details for the WARP client to conduct the test.
+    """
+
+    host: Required[str]
+    """The desired endpoint to test."""
+
+    kind: Required[Literal["http", "traceroute"]]
+    """The type of test."""
+
+    method: Literal["GET"]
+    """The HTTP request method type."""
+
+
 class TargetPolicy(TypedDict, total=False):
-    id: str
-    """The id of the device settings profile"""
+    id: Required[str]
+    """API Resource UUID tag."""
 
     default: bool
-    """Whether the profile is the account default"""
+    """Whether the DEX rule is the account default"""
 
     name: str
-    """The name of the device settings profile"""
+    """The name of the DEX rule"""
diff --git a/src/cloudflare/types/zero_trust/devices/dex_test_create_response.py b/src/cloudflare/types/zero_trust/devices/dex_test_create_response.py
new file mode 100644
index 00000000000..e7b25b42ece
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/dex_test_create_response.py
@@ -0,0 +1,62 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["DEXTestCreateResponse", "Data", "TargetPolicy"]
+
+
+class Data(BaseModel):
+    """
+    The configuration object which contains the details for the WARP client to conduct the test.
+    """
+
+    host: str
+    """The desired endpoint to test."""
+
+    kind: Literal["http", "traceroute"]
+    """The type of test."""
+
+    method: Optional[Literal["GET"]] = None
+    """The HTTP request method type."""
+
+
+class TargetPolicy(BaseModel):
+    id: str
+    """API Resource UUID tag."""
+
+    default: Optional[bool] = None
+    """Whether the DEX rule is the account default"""
+
+    name: Optional[str] = None
+    """The name of the DEX rule"""
+
+
+class DEXTestCreateResponse(BaseModel):
+    data: Data
+    """
+    The configuration object which contains the details for the WARP client to
+    conduct the test.
+    """
+
+    enabled: bool
+    """Determines whether or not the test is active."""
+
+    interval: str
+    """How often the test will run."""
+
+    name: str
+    """The name of the DEX test. Must be unique."""
+
+    description: Optional[str] = None
+    """Additional details about the test."""
+
+    target_policies: Optional[List[TargetPolicy]] = None
+    """DEX rules targeted by this test"""
+
+    targeted: Optional[bool] = None
+
+    test_id: Optional[str] = None
+    """The unique identifier for the test."""
diff --git a/src/cloudflare/types/zero_trust/devices/dex_test_delete_response.py b/src/cloudflare/types/zero_trust/devices/dex_test_delete_response.py
index a096bb5f470..8c32a6e7c6a 100644
--- a/src/cloudflare/types/zero_trust/devices/dex_test_delete_response.py
+++ b/src/cloudflare/types/zero_trust/devices/dex_test_delete_response.py
@@ -1,9 +1,66 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
+from typing_extensions import Literal
 
-from .schema_http import SchemaHTTP
+from ...._models import BaseModel
 
-__all__ = ["DEXTestDeleteResponse"]
+__all__ = ["DEXTestDeleteResponse", "DEXTest", "DEXTestData", "DEXTestTargetPolicy"]
 
-DEXTestDeleteResponse = List[SchemaHTTP]
+
+class DEXTestData(BaseModel):
+    """
+    The configuration object which contains the details for the WARP client to conduct the test.
+    """
+
+    host: str
+    """The desired endpoint to test."""
+
+    kind: Literal["http", "traceroute"]
+    """The type of test."""
+
+    method: Optional[Literal["GET"]] = None
+    """The HTTP request method type."""
+
+
+class DEXTestTargetPolicy(BaseModel):
+    id: str
+    """API Resource UUID tag."""
+
+    default: Optional[bool] = None
+    """Whether the DEX rule is the account default"""
+
+    name: Optional[str] = None
+    """The name of the DEX rule"""
+
+
+class DEXTest(BaseModel):
+    data: DEXTestData
+    """
+    The configuration object which contains the details for the WARP client to
+    conduct the test.
+    """
+
+    enabled: bool
+    """Determines whether or not the test is active."""
+
+    interval: str
+    """How often the test will run."""
+
+    name: str
+    """The name of the DEX test. Must be unique."""
+
+    description: Optional[str] = None
+    """Additional details about the test."""
+
+    target_policies: Optional[List[DEXTestTargetPolicy]] = None
+    """DEX rules targeted by this test"""
+
+    targeted: Optional[bool] = None
+
+    test_id: Optional[str] = None
+    """The unique identifier for the test."""
+
+
+class DEXTestDeleteResponse(BaseModel):
+    dex_tests: Optional[List[DEXTest]] = None
diff --git a/src/cloudflare/types/zero_trust/devices/dex_test_get_response.py b/src/cloudflare/types/zero_trust/devices/dex_test_get_response.py
new file mode 100644
index 00000000000..32045cd3db6
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/dex_test_get_response.py
@@ -0,0 +1,62 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["DEXTestGetResponse", "Data", "TargetPolicy"]
+
+
+class Data(BaseModel):
+    """
+    The configuration object which contains the details for the WARP client to conduct the test.
+    """
+
+    host: str
+    """The desired endpoint to test."""
+
+    kind: Literal["http", "traceroute"]
+    """The type of test."""
+
+    method: Optional[Literal["GET"]] = None
+    """The HTTP request method type."""
+
+
+class TargetPolicy(BaseModel):
+    id: str
+    """API Resource UUID tag."""
+
+    default: Optional[bool] = None
+    """Whether the DEX rule is the account default"""
+
+    name: Optional[str] = None
+    """The name of the DEX rule"""
+
+
+class DEXTestGetResponse(BaseModel):
+    data: Data
+    """
+    The configuration object which contains the details for the WARP client to
+    conduct the test.
+    """
+
+    enabled: bool
+    """Determines whether or not the test is active."""
+
+    interval: str
+    """How often the test will run."""
+
+    name: str
+    """The name of the DEX test. Must be unique."""
+
+    description: Optional[str] = None
+    """Additional details about the test."""
+
+    target_policies: Optional[List[TargetPolicy]] = None
+    """DEX rules targeted by this test"""
+
+    targeted: Optional[bool] = None
+
+    test_id: Optional[str] = None
+    """The unique identifier for the test."""
diff --git a/src/cloudflare/types/zero_trust/devices/dex_test_list_params.py b/src/cloudflare/types/zero_trust/devices/dex_test_list_params.py
new file mode 100644
index 00000000000..6a0abe911f6
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/dex_test_list_params.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ...._utils import PropertyInfo
+
+__all__ = ["DEXTestListParams"]
+
+
+class DEXTestListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    kind: Literal["http", "traceroute"]
+    """Filter by test type"""
+
+    page: float
+    """Page number of paginated results"""
+
+    per_page: float
+    """Number of items per page"""
+
+    test_name: Annotated[str, PropertyInfo(alias="testName")]
+    """Filter by test name"""
diff --git a/src/cloudflare/types/zero_trust/devices/dex_test_list_response.py b/src/cloudflare/types/zero_trust/devices/dex_test_list_response.py
new file mode 100644
index 00000000000..a212ec3bf95
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/dex_test_list_response.py
@@ -0,0 +1,62 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["DEXTestListResponse", "Data", "TargetPolicy"]
+
+
+class Data(BaseModel):
+    """
+    The configuration object which contains the details for the WARP client to conduct the test.
+    """
+
+    host: str
+    """The desired endpoint to test."""
+
+    kind: Literal["http", "traceroute"]
+    """The type of test."""
+
+    method: Optional[Literal["GET"]] = None
+    """The HTTP request method type."""
+
+
+class TargetPolicy(BaseModel):
+    id: str
+    """API Resource UUID tag."""
+
+    default: Optional[bool] = None
+    """Whether the DEX rule is the account default"""
+
+    name: Optional[str] = None
+    """The name of the DEX rule"""
+
+
+class DEXTestListResponse(BaseModel):
+    data: Data
+    """
+    The configuration object which contains the details for the WARP client to
+    conduct the test.
+    """
+
+    enabled: bool
+    """Determines whether or not the test is active."""
+
+    interval: str
+    """How often the test will run."""
+
+    name: str
+    """The name of the DEX test. Must be unique."""
+
+    description: Optional[str] = None
+    """Additional details about the test."""
+
+    target_policies: Optional[List[TargetPolicy]] = None
+    """DEX rules targeted by this test"""
+
+    targeted: Optional[bool] = None
+
+    test_id: Optional[str] = None
+    """The unique identifier for the test."""
diff --git a/src/cloudflare/types/zero_trust/devices/dex_test_update_params.py b/src/cloudflare/types/zero_trust/devices/dex_test_update_params.py
index 1e09ce4d599..9f4c11b91f7 100644
--- a/src/cloudflare/types/zero_trust/devices/dex_test_update_params.py
+++ b/src/cloudflare/types/zero_trust/devices/dex_test_update_params.py
@@ -3,17 +3,15 @@
 from __future__ import annotations
 
 from typing import Iterable
-from typing_extensions import Required, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
-from .schema_data_param import SchemaDataParam
-
-__all__ = ["DEXTestUpdateParams", "TargetPolicy"]
+__all__ = ["DEXTestUpdateParams", "Data", "TargetPolicy"]
 
 
 class DEXTestUpdateParams(TypedDict, total=False):
     account_id: Required[str]
 
-    data: Required[SchemaDataParam]
+    data: Required[Data]
     """
     The configuration object which contains the details for the WARP client to
     conduct the test.
@@ -32,17 +30,32 @@ class DEXTestUpdateParams(TypedDict, total=False):
     """Additional details about the test."""
 
     target_policies: Iterable[TargetPolicy]
-    """Device settings profiles targeted by this test"""
+    """DEX rules targeted by this test"""
 
     targeted: bool
 
 
+class Data(TypedDict, total=False):
+    """
+    The configuration object which contains the details for the WARP client to conduct the test.
+    """
+
+    host: Required[str]
+    """The desired endpoint to test."""
+
+    kind: Required[Literal["http", "traceroute"]]
+    """The type of test."""
+
+    method: Literal["GET"]
+    """The HTTP request method type."""
+
+
 class TargetPolicy(TypedDict, total=False):
-    id: str
-    """The id of the device settings profile"""
+    id: Required[str]
+    """API Resource UUID tag."""
 
     default: bool
-    """Whether the profile is the account default"""
+    """Whether the DEX rule is the account default"""
 
     name: str
-    """The name of the device settings profile"""
+    """The name of the DEX rule"""
diff --git a/src/cloudflare/types/zero_trust/devices/dex_test_update_response.py b/src/cloudflare/types/zero_trust/devices/dex_test_update_response.py
new file mode 100644
index 00000000000..2234d118c68
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/dex_test_update_response.py
@@ -0,0 +1,62 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["DEXTestUpdateResponse", "Data", "TargetPolicy"]
+
+
+class Data(BaseModel):
+    """
+    The configuration object which contains the details for the WARP client to conduct the test.
+    """
+
+    host: str
+    """The desired endpoint to test."""
+
+    kind: Literal["http", "traceroute"]
+    """The type of test."""
+
+    method: Optional[Literal["GET"]] = None
+    """The HTTP request method type."""
+
+
+class TargetPolicy(BaseModel):
+    id: str
+    """API Resource UUID tag."""
+
+    default: Optional[bool] = None
+    """Whether the DEX rule is the account default"""
+
+    name: Optional[str] = None
+    """The name of the DEX rule"""
+
+
+class DEXTestUpdateResponse(BaseModel):
+    data: Data
+    """
+    The configuration object which contains the details for the WARP client to
+    conduct the test.
+    """
+
+    enabled: bool
+    """Determines whether or not the test is active."""
+
+    interval: str
+    """How often the test will run."""
+
+    name: str
+    """The name of the DEX test. Must be unique."""
+
+    description: Optional[str] = None
+    """Additional details about the test."""
+
+    target_policies: Optional[List[TargetPolicy]] = None
+    """DEX rules targeted by this test"""
+
+    targeted: Optional[bool] = None
+
+    test_id: Optional[str] = None
+    """The unique identifier for the test."""
diff --git a/src/cloudflare/types/zero_trust/devices/disk_encryption_input_param.py b/src/cloudflare/types/zero_trust/devices/disk_encryption_input_param.py
index 2bd2097cc3f..a4abc01ae47 100644
--- a/src/cloudflare/types/zero_trust/devices/disk_encryption_input_param.py
+++ b/src/cloudflare/types/zero_trust/devices/disk_encryption_input_param.py
@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 from .carbonblack_input import CarbonblackInput
 
@@ -12,7 +12,7 @@
 
 
 class DiskEncryptionInputParam(TypedDict, total=False):
-    check_disks: Annotated[List[CarbonblackInput], PropertyInfo(alias="checkDisks")]
+    check_disks: Annotated[SequenceNotStr[CarbonblackInput], PropertyInfo(alias="checkDisks")]
     """List of volume names to be checked for encryption."""
 
     require_all: Annotated[bool, PropertyInfo(alias="requireAll")]
diff --git a/src/cloudflare/types/zero_trust/devices/domain_joined_input.py b/src/cloudflare/types/zero_trust/devices/domain_joined_input.py
index 4788e81e662..4833374c522 100644
--- a/src/cloudflare/types/zero_trust/devices/domain_joined_input.py
+++ b/src/cloudflare/types/zero_trust/devices/domain_joined_input.py
@@ -10,7 +10,7 @@
 
 class DomainJoinedInput(BaseModel):
     operating_system: Literal["windows"]
-    """Operating System"""
+    """Operating System."""
 
     domain: Optional[str] = None
-    """Domain"""
+    """Domain."""
diff --git a/src/cloudflare/types/zero_trust/devices/domain_joined_input_param.py b/src/cloudflare/types/zero_trust/devices/domain_joined_input_param.py
index e105b58434c..75302307146 100644
--- a/src/cloudflare/types/zero_trust/devices/domain_joined_input_param.py
+++ b/src/cloudflare/types/zero_trust/devices/domain_joined_input_param.py
@@ -9,7 +9,7 @@
 
 class DomainJoinedInputParam(TypedDict, total=False):
     operating_system: Required[Literal["windows"]]
-    """Operating System"""
+    """Operating System."""
 
     domain: str
-    """Domain"""
+    """Domain."""
diff --git a/src/cloudflare/types/zero_trust/devices/policies/fallback_domain.py b/src/cloudflare/types/zero_trust/devices/fallback_domain.py
similarity index 84%
rename from src/cloudflare/types/zero_trust/devices/policies/fallback_domain.py
rename to src/cloudflare/types/zero_trust/devices/fallback_domain.py
index 41c5d376a14..4ae2c3f4f73 100644
--- a/src/cloudflare/types/zero_trust/devices/policies/fallback_domain.py
+++ b/src/cloudflare/types/zero_trust/devices/fallback_domain.py
@@ -2,7 +2,7 @@
 
 from typing import List, Optional
 
-from ....._models import BaseModel
+from ...._models import BaseModel
 
 __all__ = ["FallbackDomain"]
 
@@ -14,5 +14,5 @@ class FallbackDomain(BaseModel):
     description: Optional[str] = None
     """A description of the fallback domain, displayed in the client UI."""
 
-    dns_server: Optional[List[object]] = None
+    dns_server: Optional[List[str]] = None
     """A list of IP addresses to handle domain resolution."""
diff --git a/src/cloudflare/types/zero_trust/devices/policies/fallback_domain_param.py b/src/cloudflare/types/zero_trust/devices/fallback_domain_param.py
similarity index 87%
rename from src/cloudflare/types/zero_trust/devices/policies/fallback_domain_param.py
rename to src/cloudflare/types/zero_trust/devices/fallback_domain_param.py
index 67428e45afd..47d45c33bda 100644
--- a/src/cloudflare/types/zero_trust/devices/policies/fallback_domain_param.py
+++ b/src/cloudflare/types/zero_trust/devices/fallback_domain_param.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from typing import Iterable
 from typing_extensions import Required, TypedDict
 
+from ...._types import SequenceNotStr
+
 __all__ = ["FallbackDomainParam"]
 
 
@@ -15,5 +16,5 @@ class FallbackDomainParam(TypedDict, total=False):
     description: str
     """A description of the fallback domain, displayed in the client UI."""
 
-    dns_server: Iterable[object]
+    dns_server: SequenceNotStr[str]
     """A list of IP addresses to handle domain resolution."""
diff --git a/src/cloudflare/types/zero_trust/devices/file_input.py b/src/cloudflare/types/zero_trust/devices/file_input.py
index 214bf876ee0..58b2b71ee61 100644
--- a/src/cloudflare/types/zero_trust/devices/file_input.py
+++ b/src/cloudflare/types/zero_trust/devices/file_input.py
@@ -10,13 +10,13 @@
 
 class FileInput(BaseModel):
     operating_system: Literal["windows", "linux", "mac"]
-    """Operating system"""
+    """Operating system."""
 
     path: str
     """File path."""
 
     exists: Optional[bool] = None
-    """Whether or not file exists"""
+    """Whether or not file exists."""
 
     sha256: Optional[str] = None
     """SHA-256."""
diff --git a/src/cloudflare/types/zero_trust/devices/file_input_param.py b/src/cloudflare/types/zero_trust/devices/file_input_param.py
index d50a8f505d4..d1ea057e28a 100644
--- a/src/cloudflare/types/zero_trust/devices/file_input_param.py
+++ b/src/cloudflare/types/zero_trust/devices/file_input_param.py
@@ -9,13 +9,13 @@
 
 class FileInputParam(TypedDict, total=False):
     operating_system: Required[Literal["windows", "linux", "mac"]]
-    """Operating system"""
+    """Operating system."""
 
     path: Required[str]
     """File path."""
 
     exists: bool
-    """Whether or not file exists"""
+    """Whether or not file exists."""
 
     sha256: str
     """SHA-256."""
diff --git a/src/cloudflare/types/zero_trust/devices/firewall_input.py b/src/cloudflare/types/zero_trust/devices/firewall_input.py
index 022d78c05b8..adad3b36231 100644
--- a/src/cloudflare/types/zero_trust/devices/firewall_input.py
+++ b/src/cloudflare/types/zero_trust/devices/firewall_input.py
@@ -9,7 +9,7 @@
 
 class FirewallInput(BaseModel):
     enabled: bool
-    """Enabled"""
+    """Enabled."""
 
     operating_system: Literal["windows", "mac"]
-    """Operating System"""
+    """Operating System."""
diff --git a/src/cloudflare/types/zero_trust/devices/firewall_input_param.py b/src/cloudflare/types/zero_trust/devices/firewall_input_param.py
index aa4f2edd3d8..0c94ee511ea 100644
--- a/src/cloudflare/types/zero_trust/devices/firewall_input_param.py
+++ b/src/cloudflare/types/zero_trust/devices/firewall_input_param.py
@@ -9,7 +9,7 @@
 
 class FirewallInputParam(TypedDict, total=False):
     enabled: Required[bool]
-    """Enabled"""
+    """Enabled."""
 
     operating_system: Required[Literal["windows", "mac"]]
-    """Operating System"""
+    """Operating System."""
diff --git a/src/cloudflare/types/zero_trust/devices/fleet_status_get_params.py b/src/cloudflare/types/zero_trust/devices/fleet_status_get_params.py
new file mode 100644
index 00000000000..09a81b98c51
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/fleet_status_get_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["FleetStatusGetParams"]
+
+
+class FleetStatusGetParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    since_minutes: Required[float]
+    """Number of minutes before current time"""
+
+    colo: str
+    """List of data centers to filter results"""
+
+    time_now: str
+    """Number of minutes before current time"""
diff --git a/src/cloudflare/types/zero_trust/devices/fleet_status_get_response.py b/src/cloudflare/types/zero_trust/devices/fleet_status_get_response.py
new file mode 100644
index 00000000000..f4feee2cb0c
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/fleet_status_get_response.py
@@ -0,0 +1,268 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "FleetStatusGetResponse",
+    "CPUPctByApp",
+    "DeviceIPV4",
+    "DeviceIPV4Location",
+    "DeviceIPV6",
+    "DeviceIPV6Location",
+    "GatewayIPV4",
+    "GatewayIPV4Location",
+    "GatewayIPV6",
+    "GatewayIPV6Location",
+    "ISPIPV4",
+    "ISPIPV4Location",
+    "ISPIPV6",
+    "ISPIPV6Location",
+    "RamUsedPctByApp",
+]
+
+
+class CPUPctByApp(BaseModel):
+    cpu_pct: Optional[float] = None
+
+    name: Optional[str] = None
+
+
+class DeviceIPV4Location(BaseModel):
+    city: Optional[str] = None
+
+    country_iso: Optional[str] = None
+
+    state_iso: Optional[str] = None
+
+    zip: Optional[str] = None
+
+
+class DeviceIPV4(BaseModel):
+    address: Optional[str] = None
+
+    asn: Optional[int] = None
+
+    aso: Optional[str] = None
+
+    location: Optional[DeviceIPV4Location] = None
+
+    netmask: Optional[str] = None
+
+    version: Optional[str] = None
+
+
+class DeviceIPV6Location(BaseModel):
+    city: Optional[str] = None
+
+    country_iso: Optional[str] = None
+
+    state_iso: Optional[str] = None
+
+    zip: Optional[str] = None
+
+
+class DeviceIPV6(BaseModel):
+    address: Optional[str] = None
+
+    asn: Optional[int] = None
+
+    aso: Optional[str] = None
+
+    location: Optional[DeviceIPV6Location] = None
+
+    netmask: Optional[str] = None
+
+    version: Optional[str] = None
+
+
+class GatewayIPV4Location(BaseModel):
+    city: Optional[str] = None
+
+    country_iso: Optional[str] = None
+
+    state_iso: Optional[str] = None
+
+    zip: Optional[str] = None
+
+
+class GatewayIPV4(BaseModel):
+    address: Optional[str] = None
+
+    asn: Optional[int] = None
+
+    aso: Optional[str] = None
+
+    location: Optional[GatewayIPV4Location] = None
+
+    netmask: Optional[str] = None
+
+    version: Optional[str] = None
+
+
+class GatewayIPV6Location(BaseModel):
+    city: Optional[str] = None
+
+    country_iso: Optional[str] = None
+
+    state_iso: Optional[str] = None
+
+    zip: Optional[str] = None
+
+
+class GatewayIPV6(BaseModel):
+    address: Optional[str] = None
+
+    asn: Optional[int] = None
+
+    aso: Optional[str] = None
+
+    location: Optional[GatewayIPV6Location] = None
+
+    netmask: Optional[str] = None
+
+    version: Optional[str] = None
+
+
+class ISPIPV4Location(BaseModel):
+    city: Optional[str] = None
+
+    country_iso: Optional[str] = None
+
+    state_iso: Optional[str] = None
+
+    zip: Optional[str] = None
+
+
+class ISPIPV4(BaseModel):
+    address: Optional[str] = None
+
+    asn: Optional[int] = None
+
+    aso: Optional[str] = None
+
+    location: Optional[ISPIPV4Location] = None
+
+    netmask: Optional[str] = None
+
+    version: Optional[str] = None
+
+
+class ISPIPV6Location(BaseModel):
+    city: Optional[str] = None
+
+    country_iso: Optional[str] = None
+
+    state_iso: Optional[str] = None
+
+    zip: Optional[str] = None
+
+
+class ISPIPV6(BaseModel):
+    address: Optional[str] = None
+
+    asn: Optional[int] = None
+
+    aso: Optional[str] = None
+
+    location: Optional[ISPIPV6Location] = None
+
+    netmask: Optional[str] = None
+
+    version: Optional[str] = None
+
+
+class RamUsedPctByApp(BaseModel):
+    name: Optional[str] = None
+
+    ram_used_pct: Optional[float] = None
+
+
+class FleetStatusGetResponse(BaseModel):
+    colo: str
+    """Cloudflare colo"""
+
+    device_id: str = FieldInfo(alias="deviceId")
+    """Device identifier (UUID v4)"""
+
+    mode: str
+    """The mode under which the WARP client is run"""
+
+    platform: str
+    """Operating system"""
+
+    status: str
+    """Network status"""
+
+    timestamp: str
+    """Timestamp in ISO format"""
+
+    version: str
+    """WARP client version"""
+
+    always_on: Optional[bool] = FieldInfo(alias="alwaysOn", default=None)
+
+    battery_charging: Optional[bool] = FieldInfo(alias="batteryCharging", default=None)
+
+    battery_cycles: Optional[int] = FieldInfo(alias="batteryCycles", default=None)
+
+    battery_pct: Optional[float] = FieldInfo(alias="batteryPct", default=None)
+
+    connection_type: Optional[str] = FieldInfo(alias="connectionType", default=None)
+
+    cpu_pct: Optional[float] = FieldInfo(alias="cpuPct", default=None)
+
+    cpu_pct_by_app: Optional[List[List[CPUPctByApp]]] = FieldInfo(alias="cpuPctByApp", default=None)
+
+    device_ipv4: Optional[DeviceIPV4] = FieldInfo(alias="deviceIpv4", default=None)
+
+    device_ipv6: Optional[DeviceIPV6] = FieldInfo(alias="deviceIpv6", default=None)
+
+    device_name: Optional[str] = FieldInfo(alias="deviceName", default=None)
+    """Device identifier (human readable)"""
+
+    disk_read_bps: Optional[int] = FieldInfo(alias="diskReadBps", default=None)
+
+    disk_usage_pct: Optional[float] = FieldInfo(alias="diskUsagePct", default=None)
+
+    disk_write_bps: Optional[int] = FieldInfo(alias="diskWriteBps", default=None)
+
+    doh_subdomain: Optional[str] = FieldInfo(alias="dohSubdomain", default=None)
+
+    estimated_loss_pct: Optional[float] = FieldInfo(alias="estimatedLossPct", default=None)
+
+    firewall_enabled: Optional[bool] = FieldInfo(alias="firewallEnabled", default=None)
+
+    gateway_ipv4: Optional[GatewayIPV4] = FieldInfo(alias="gatewayIpv4", default=None)
+
+    gateway_ipv6: Optional[GatewayIPV6] = FieldInfo(alias="gatewayIpv6", default=None)
+
+    handshake_latency_ms: Optional[float] = FieldInfo(alias="handshakeLatencyMs", default=None)
+
+    isp_ipv4: Optional[ISPIPV4] = FieldInfo(alias="ispIpv4", default=None)
+
+    isp_ipv6: Optional[ISPIPV6] = FieldInfo(alias="ispIpv6", default=None)
+
+    metal: Optional[str] = None
+
+    network_rcvd_bps: Optional[int] = FieldInfo(alias="networkRcvdBps", default=None)
+
+    network_sent_bps: Optional[int] = FieldInfo(alias="networkSentBps", default=None)
+
+    network_ssid: Optional[str] = FieldInfo(alias="networkSsid", default=None)
+
+    person_email: Optional[str] = FieldInfo(alias="personEmail", default=None)
+    """User contact email address"""
+
+    ram_available_kb: Optional[int] = FieldInfo(alias="ramAvailableKb", default=None)
+
+    ram_used_pct: Optional[float] = FieldInfo(alias="ramUsedPct", default=None)
+
+    ram_used_pct_by_app: Optional[List[List[RamUsedPctByApp]]] = FieldInfo(alias="ramUsedPctByApp", default=None)
+
+    switch_locked: Optional[bool] = FieldInfo(alias="switchLocked", default=None)
+
+    wifi_strength_dbm: Optional[int] = FieldInfo(alias="wifiStrengthDbm", default=None)
diff --git a/src/cloudflare/types/zero_trust/devices/intune_input.py b/src/cloudflare/types/zero_trust/devices/intune_input.py
index 881e02ae00e..18bbec63f6b 100644
--- a/src/cloudflare/types/zero_trust/devices/intune_input.py
+++ b/src/cloudflare/types/zero_trust/devices/intune_input.py
@@ -9,7 +9,7 @@
 
 class IntuneInput(BaseModel):
     compliance_status: Literal["compliant", "noncompliant", "unknown", "notapplicable", "ingraceperiod", "error"]
-    """Compliance Status"""
+    """Compliance Status."""
 
     connection_id: str
     """Posture Integration ID."""
diff --git a/src/cloudflare/types/zero_trust/devices/intune_input_param.py b/src/cloudflare/types/zero_trust/devices/intune_input_param.py
index 938f5fdfef5..a794e928a37 100644
--- a/src/cloudflare/types/zero_trust/devices/intune_input_param.py
+++ b/src/cloudflare/types/zero_trust/devices/intune_input_param.py
@@ -11,7 +11,7 @@ class IntuneInputParam(TypedDict, total=False):
     compliance_status: Required[
         Literal["compliant", "noncompliant", "unknown", "notapplicable", "ingraceperiod", "error"]
     ]
-    """Compliance Status"""
+    """Compliance Status."""
 
     connection_id: Required[str]
     """Posture Integration ID."""
diff --git a/src/cloudflare/types/zero_trust/devices/kolide_input.py b/src/cloudflare/types/zero_trust/devices/kolide_input.py
index c61481d2b3e..a4ce2ef705f 100644
--- a/src/cloudflare/types/zero_trust/devices/kolide_input.py
+++ b/src/cloudflare/types/zero_trust/devices/kolide_input.py
@@ -14,7 +14,7 @@ class KolideInput(BaseModel):
     """Posture Integration ID."""
 
     count_operator: Literal["<", "<=", ">", ">=", "=="] = FieldInfo(alias="countOperator")
-    """Count Operator"""
+    """Count Operator."""
 
     issue_count: str
     """The Number of Issues."""
diff --git a/src/cloudflare/types/zero_trust/devices/kolide_input_param.py b/src/cloudflare/types/zero_trust/devices/kolide_input_param.py
index 134335be39f..250cfc62c3a 100644
--- a/src/cloudflare/types/zero_trust/devices/kolide_input_param.py
+++ b/src/cloudflare/types/zero_trust/devices/kolide_input_param.py
@@ -14,7 +14,7 @@ class KolideInputParam(TypedDict, total=False):
     """Posture Integration ID."""
 
     count_operator: Required[Annotated[Literal["<", "<=", ">", ">=", "=="], PropertyInfo(alias="countOperator")]]
-    """Count Operator"""
+    """Count Operator."""
 
     issue_count: Required[str]
     """The Number of Issues."""
diff --git a/src/cloudflare/types/zero_trust/devices/network_create_params.py b/src/cloudflare/types/zero_trust/devices/network_create_params.py
index 66c61f32f1b..482bde1c2e7 100644
--- a/src/cloudflare/types/zero_trust/devices/network_create_params.py
+++ b/src/cloudflare/types/zero_trust/devices/network_create_params.py
@@ -24,6 +24,10 @@ class NetworkCreateParams(TypedDict, total=False):
 
 
 class Config(TypedDict, total=False):
+    """
+    The configuration object containing information for the WARP client to detect the managed network.
+    """
+
     tls_sockaddr: Required[str]
     """
     A network address of the form "host:port" that the WARP client will use to
diff --git a/src/cloudflare/types/zero_trust/devices/network_delete_response.py b/src/cloudflare/types/zero_trust/devices/network_delete_response.py
deleted file mode 100644
index a849bc78a8a..00000000000
--- a/src/cloudflare/types/zero_trust/devices/network_delete_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .device_network import DeviceNetwork
-
-__all__ = ["NetworkDeleteResponse"]
-
-NetworkDeleteResponse = List[DeviceNetwork]
diff --git a/src/cloudflare/types/zero_trust/devices/network_update_params.py b/src/cloudflare/types/zero_trust/devices/network_update_params.py
index ff00a95df86..b85625ef578 100644
--- a/src/cloudflare/types/zero_trust/devices/network_update_params.py
+++ b/src/cloudflare/types/zero_trust/devices/network_update_params.py
@@ -24,6 +24,10 @@ class NetworkUpdateParams(TypedDict, total=False):
 
 
 class Config(TypedDict, total=False):
+    """
+    The configuration object containing information for the WARP client to detect the managed network.
+    """
+
     tls_sockaddr: Required[str]
     """
     A network address of the form "host:port" that the WARP client will use to
diff --git a/src/cloudflare/types/zero_trust/devices/os_version_input.py b/src/cloudflare/types/zero_trust/devices/os_version_input.py
index ae5e2019461..090d63cfd33 100644
--- a/src/cloudflare/types/zero_trust/devices/os_version_input.py
+++ b/src/cloudflare/types/zero_trust/devices/os_version_input.py
@@ -10,23 +10,23 @@
 
 class OSVersionInput(BaseModel):
     operating_system: Literal["windows"]
-    """Operating System"""
+    """Operating System."""
 
     operator: Literal["<", "<=", ">", ">=", "=="]
-    """operator"""
+    """Operator."""
 
     version: str
-    """Version of OS"""
+    """Version of OS."""
 
     os_distro_name: Optional[str] = None
-    """Operating System Distribution Name (linux only)"""
+    """Operating System Distribution Name (linux only)."""
 
     os_distro_revision: Optional[str] = None
-    """Version of OS Distribution (linux only)"""
+    """Version of OS Distribution (linux only)."""
 
     os_version_extra: Optional[str] = None
-    """Additional version data.
+    """Additional operating system version details.
 
-    For Mac or iOS, the Product Verison Extra. For Linux, the kernel release
-    version. (Mac, iOS, and Linux only)
+    For Windows, the UBR (Update Build Revision). For Mac or iOS, the Product
+    Version Extra. For Linux, the distribution name and version.
     """
diff --git a/src/cloudflare/types/zero_trust/devices/os_version_input_param.py b/src/cloudflare/types/zero_trust/devices/os_version_input_param.py
index 6bc8122e315..4bba0276e27 100644
--- a/src/cloudflare/types/zero_trust/devices/os_version_input_param.py
+++ b/src/cloudflare/types/zero_trust/devices/os_version_input_param.py
@@ -9,23 +9,23 @@
 
 class OSVersionInputParam(TypedDict, total=False):
     operating_system: Required[Literal["windows"]]
-    """Operating System"""
+    """Operating System."""
 
     operator: Required[Literal["<", "<=", ">", ">=", "=="]]
-    """operator"""
+    """Operator."""
 
     version: Required[str]
-    """Version of OS"""
+    """Version of OS."""
 
     os_distro_name: str
-    """Operating System Distribution Name (linux only)"""
+    """Operating System Distribution Name (linux only)."""
 
     os_distro_revision: str
-    """Version of OS Distribution (linux only)"""
+    """Version of OS Distribution (linux only)."""
 
     os_version_extra: str
-    """Additional version data.
+    """Additional operating system version details.
 
-    For Mac or iOS, the Product Verison Extra. For Linux, the kernel release
-    version. (Mac, iOS, and Linux only)
+    For Windows, the UBR (Update Build Revision). For Mac or iOS, the Product
+    Version Extra. For Linux, the distribution name and version.
     """
diff --git a/src/cloudflare/types/zero_trust/devices/override_code_get_response.py b/src/cloudflare/types/zero_trust/devices/override_code_get_response.py
new file mode 100644
index 00000000000..0b50916c4d3
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/override_code_get_response.py
@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, Optional
+
+from ...._models import BaseModel
+
+__all__ = ["OverrideCodeGetResponse"]
+
+
+class OverrideCodeGetResponse(BaseModel):
+    disable_for_time: Optional[Dict[str, str]] = None
diff --git a/src/cloudflare/types/zero_trust/devices/override_code_list_response.py b/src/cloudflare/types/zero_trust/devices/override_code_list_response.py
deleted file mode 100644
index fe8d8e21575..00000000000
--- a/src/cloudflare/types/zero_trust/devices/override_code_list_response.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from pydantic import Field as FieldInfo
-
-from ...._models import BaseModel
-
-__all__ = ["OverrideCodeListResponse", "DisableForTime"]
-
-
-class DisableForTime(BaseModel):
-    one: Optional[str] = FieldInfo(alias="1", default=None)
-    """Override code that is valid for 1 hour."""
-
-    twelve: Optional[str] = FieldInfo(alias="12", default=None)
-    """Override code that is valid for 12 hour2."""
-
-    twenty_four: Optional[str] = FieldInfo(alias="24", default=None)
-    """Override code that is valid for 24 hour.2."""
-
-    three: Optional[str] = FieldInfo(alias="3", default=None)
-    """Override code that is valid for 3 hours."""
-
-    six: Optional[str] = FieldInfo(alias="6", default=None)
-    """Override code that is valid for 6 hours."""
-
-
-class OverrideCodeListResponse(BaseModel):
-    disable_for_time: Optional[DisableForTime] = None
diff --git a/src/cloudflare/types/zero_trust/devices/policies/__init__.py b/src/cloudflare/types/zero_trust/devices/policies/__init__.py
index 1534f635ab8..28f05f45e3d 100644
--- a/src/cloudflare/types/zero_trust/devices/policies/__init__.py
+++ b/src/cloudflare/types/zero_trust/devices/policies/__init__.py
@@ -2,19 +2,8 @@
 
 from __future__ import annotations
 
-from .fallback_domain import FallbackDomain as FallbackDomain
-from .exclude_get_response import ExcludeGetResponse as ExcludeGetResponse
-from .include_get_response import IncludeGetResponse as IncludeGetResponse
-from .split_tunnel_exclude import SplitTunnelExclude as SplitTunnelExclude
-from .split_tunnel_include import SplitTunnelInclude as SplitTunnelInclude
-from .exclude_update_params import ExcludeUpdateParams as ExcludeUpdateParams
-from .fallback_domain_param import FallbackDomainParam as FallbackDomainParam
-from .include_update_params import IncludeUpdateParams as IncludeUpdateParams
-from .exclude_update_response import ExcludeUpdateResponse as ExcludeUpdateResponse
-from .include_update_response import IncludeUpdateResponse as IncludeUpdateResponse
-from .split_tunnel_exclude_param import SplitTunnelExcludeParam as SplitTunnelExcludeParam
-from .split_tunnel_include_param import SplitTunnelIncludeParam as SplitTunnelIncludeParam
-from .default_policy_get_response import DefaultPolicyGetResponse as DefaultPolicyGetResponse
-from .fallback_domain_get_response import FallbackDomainGetResponse as FallbackDomainGetResponse
-from .fallback_domain_update_params import FallbackDomainUpdateParams as FallbackDomainUpdateParams
-from .fallback_domain_update_response import FallbackDomainUpdateResponse as FallbackDomainUpdateResponse
+from .custom_edit_params import CustomEditParams as CustomEditParams
+from .default_edit_params import DefaultEditParams as DefaultEditParams
+from .custom_create_params import CustomCreateParams as CustomCreateParams
+from .default_get_response import DefaultGetResponse as DefaultGetResponse
+from .default_edit_response import DefaultEditResponse as DefaultEditResponse
diff --git a/src/cloudflare/types/zero_trust/devices/policies/custom/__init__.py b/src/cloudflare/types/zero_trust/devices/policies/custom/__init__.py
new file mode 100644
index 00000000000..1b194e18048
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/policies/custom/__init__.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .exclude_update_params import ExcludeUpdateParams as ExcludeUpdateParams
+from .include_update_params import IncludeUpdateParams as IncludeUpdateParams
+from .fallback_domain_update_params import FallbackDomainUpdateParams as FallbackDomainUpdateParams
diff --git a/src/cloudflare/types/zero_trust/devices/policies/custom/exclude_update_params.py b/src/cloudflare/types/zero_trust/devices/policies/custom/exclude_update_params.py
new file mode 100644
index 00000000000..3bdc54c4c9f
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/policies/custom/exclude_update_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+from ...split_tunnel_exclude_param import SplitTunnelExcludeParam
+
+__all__ = ["ExcludeUpdateParams"]
+
+
+class ExcludeUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    body: Required[Iterable[SplitTunnelExcludeParam]]
diff --git a/src/cloudflare/types/zero_trust/devices/policies/custom/fallback_domain_update_params.py b/src/cloudflare/types/zero_trust/devices/policies/custom/fallback_domain_update_params.py
new file mode 100644
index 00000000000..2c284e47aee
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/policies/custom/fallback_domain_update_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+from ...fallback_domain_param import FallbackDomainParam
+
+__all__ = ["FallbackDomainUpdateParams"]
+
+
+class FallbackDomainUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    domains: Required[Iterable[FallbackDomainParam]]
diff --git a/src/cloudflare/types/zero_trust/devices/policies/custom/include_update_params.py b/src/cloudflare/types/zero_trust/devices/policies/custom/include_update_params.py
new file mode 100644
index 00000000000..6568d4ef985
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/policies/custom/include_update_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+from ...split_tunnel_include_param import SplitTunnelIncludeParam
+
+__all__ = ["IncludeUpdateParams"]
+
+
+class IncludeUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    body: Required[Iterable[SplitTunnelIncludeParam]]
diff --git a/src/cloudflare/types/zero_trust/devices/policies/custom_create_params.py b/src/cloudflare/types/zero_trust/devices/policies/custom_create_params.py
new file mode 100644
index 00000000000..d2302201175
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/policies/custom_create_params.py
@@ -0,0 +1,126 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+from ..split_tunnel_exclude_param import SplitTunnelExcludeParam
+from ..split_tunnel_include_param import SplitTunnelIncludeParam
+
+__all__ = ["CustomCreateParams", "ServiceModeV2"]
+
+
+class CustomCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    match: Required[str]
+    """The wirefilter expression to match devices.
+
+    Available values: "identity.email", "identity.groups.id",
+    "identity.groups.name", "identity.groups.email", "identity.service_token_uuid",
+    "identity.saml_attributes", "network", "os.name", "os.version".
+    """
+
+    name: Required[str]
+    """The name of the device settings profile."""
+
+    precedence: Required[float]
+    """The precedence of the policy.
+
+    Lower values indicate higher precedence. Policies will be evaluated in ascending
+    order of this field.
+    """
+
+    allow_mode_switch: bool
+    """Whether to allow the user to switch WARP between modes."""
+
+    allow_updates: bool
+    """
+    Whether to receive update notifications when a new version of the client is
+    available.
+    """
+
+    allowed_to_leave: bool
+    """Whether to allow devices to leave the organization."""
+
+    auto_connect: float
+    """The amount of time in seconds to reconnect after having been disabled."""
+
+    captive_portal: float
+    """Turn on the captive portal after the specified amount of time."""
+
+    description: str
+    """A description of the policy."""
+
+    disable_auto_fallback: bool
+    """
+    If the `dns_server` field of a fallback domain is not present, the client will
+    fall back to a best guess of the default/system DNS resolvers unless this policy
+    option is set to `true`.
+    """
+
+    enabled: bool
+    """Whether the policy will be applied to matching devices."""
+
+    exclude: Iterable[SplitTunnelExcludeParam]
+    """List of routes excluded in the WARP client's tunnel.
+
+    Both 'exclude' and 'include' cannot be set in the same request.
+    """
+
+    exclude_office_ips: bool
+    """Whether to add Microsoft IPs to Split Tunnel exclusions."""
+
+    include: Iterable[SplitTunnelIncludeParam]
+    """List of routes included in the WARP client's tunnel.
+
+    Both 'exclude' and 'include' cannot be set in the same request.
+    """
+
+    lan_allow_minutes: float
+    """The amount of time in minutes a user is allowed access to their LAN.
+
+    A value of 0 will allow LAN access until the next WARP reconnection, such as a
+    reboot or a laptop waking from sleep. Note that this field is omitted from the
+    response if null or unset.
+    """
+
+    lan_allow_subnet_size: float
+    """The size of the subnet for the local access network.
+
+    Note that this field is omitted from the response if null or unset.
+    """
+
+    register_interface_ip_with_dns: bool
+    """
+    Determines if the operating system will register WARP's local interface IP with
+    your on-premises DNS server.
+    """
+
+    sccm_vpn_boundary_support: bool
+    """
+    Determines whether the WARP client indicates to SCCM that it is inside a VPN
+    boundary. (Windows only).
+    """
+
+    service_mode_v2: ServiceModeV2
+
+    support_url: str
+    """The URL to launch when the Send Feedback button is clicked."""
+
+    switch_locked: bool
+    """
+    Whether to allow the user to turn off the WARP switch and disconnect the client.
+    """
+
+    tunnel_protocol: str
+    """Determines which tunnel protocol to use."""
+
+
+class ServiceModeV2(TypedDict, total=False):
+    mode: str
+    """The mode to run the WARP client under."""
+
+    port: float
+    """The port number when used with proxy mode."""
diff --git a/src/cloudflare/types/zero_trust/devices/policies/custom_edit_params.py b/src/cloudflare/types/zero_trust/devices/policies/custom_edit_params.py
new file mode 100644
index 00000000000..85e7e19bd3c
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/policies/custom_edit_params.py
@@ -0,0 +1,126 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+from ..split_tunnel_exclude_param import SplitTunnelExcludeParam
+from ..split_tunnel_include_param import SplitTunnelIncludeParam
+
+__all__ = ["CustomEditParams", "ServiceModeV2"]
+
+
+class CustomEditParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    allow_mode_switch: bool
+    """Whether to allow the user to switch WARP between modes."""
+
+    allow_updates: bool
+    """
+    Whether to receive update notifications when a new version of the client is
+    available.
+    """
+
+    allowed_to_leave: bool
+    """Whether to allow devices to leave the organization."""
+
+    auto_connect: float
+    """The amount of time in seconds to reconnect after having been disabled."""
+
+    captive_portal: float
+    """Turn on the captive portal after the specified amount of time."""
+
+    description: str
+    """A description of the policy."""
+
+    disable_auto_fallback: bool
+    """
+    If the `dns_server` field of a fallback domain is not present, the client will
+    fall back to a best guess of the default/system DNS resolvers unless this policy
+    option is set to `true`.
+    """
+
+    enabled: bool
+    """Whether the policy will be applied to matching devices."""
+
+    exclude: Iterable[SplitTunnelExcludeParam]
+    """List of routes excluded in the WARP client's tunnel.
+
+    Both 'exclude' and 'include' cannot be set in the same request.
+    """
+
+    exclude_office_ips: bool
+    """Whether to add Microsoft IPs to Split Tunnel exclusions."""
+
+    include: Iterable[SplitTunnelIncludeParam]
+    """List of routes included in the WARP client's tunnel.
+
+    Both 'exclude' and 'include' cannot be set in the same request.
+    """
+
+    lan_allow_minutes: float
+    """The amount of time in minutes a user is allowed access to their LAN.
+
+    A value of 0 will allow LAN access until the next WARP reconnection, such as a
+    reboot or a laptop waking from sleep. Note that this field is omitted from the
+    response if null or unset.
+    """
+
+    lan_allow_subnet_size: float
+    """The size of the subnet for the local access network.
+
+    Note that this field is omitted from the response if null or unset.
+    """
+
+    match: str
+    """The wirefilter expression to match devices.
+
+    Available values: "identity.email", "identity.groups.id",
+    "identity.groups.name", "identity.groups.email", "identity.service_token_uuid",
+    "identity.saml_attributes", "network", "os.name", "os.version".
+    """
+
+    name: str
+    """The name of the device settings profile."""
+
+    precedence: float
+    """The precedence of the policy.
+
+    Lower values indicate higher precedence. Policies will be evaluated in ascending
+    order of this field.
+    """
+
+    register_interface_ip_with_dns: bool
+    """
+    Determines if the operating system will register WARP's local interface IP with
+    your on-premises DNS server.
+    """
+
+    sccm_vpn_boundary_support: bool
+    """
+    Determines whether the WARP client indicates to SCCM that it is inside a VPN
+    boundary. (Windows only).
+    """
+
+    service_mode_v2: ServiceModeV2
+
+    support_url: str
+    """The URL to launch when the Send Feedback button is clicked."""
+
+    switch_locked: bool
+    """
+    Whether to allow the user to turn off the WARP switch and disconnect the client.
+    """
+
+    tunnel_protocol: str
+    """Determines which tunnel protocol to use."""
+
+
+class ServiceModeV2(TypedDict, total=False):
+    mode: str
+    """The mode to run the WARP client under."""
+
+    port: float
+    """The port number when used with proxy mode."""
diff --git a/src/cloudflare/types/zero_trust/devices/policies/default/__init__.py b/src/cloudflare/types/zero_trust/devices/policies/default/__init__.py
new file mode 100644
index 00000000000..0dc1648462a
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/policies/default/__init__.py
@@ -0,0 +1,8 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .exclude_update_params import ExcludeUpdateParams as ExcludeUpdateParams
+from .include_update_params import IncludeUpdateParams as IncludeUpdateParams
+from .certificate_edit_params import CertificateEditParams as CertificateEditParams
+from .fallback_domain_update_params import FallbackDomainUpdateParams as FallbackDomainUpdateParams
diff --git a/src/cloudflare/types/zero_trust/devices/policies/default/certificate_edit_params.py b/src/cloudflare/types/zero_trust/devices/policies/default/certificate_edit_params.py
new file mode 100644
index 00000000000..5660da8891b
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/policies/default/certificate_edit_params.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["CertificateEditParams"]
+
+
+class CertificateEditParams(TypedDict, total=False):
+    zone_id: Required[str]
+
+    enabled: Required[bool]
+    """
+    The current status of the device policy certificate provisioning feature for
+    WARP clients.
+    """
diff --git a/src/cloudflare/types/zero_trust/devices/policies/default/exclude_update_params.py b/src/cloudflare/types/zero_trust/devices/policies/default/exclude_update_params.py
new file mode 100644
index 00000000000..3bdc54c4c9f
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/policies/default/exclude_update_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+from ...split_tunnel_exclude_param import SplitTunnelExcludeParam
+
+__all__ = ["ExcludeUpdateParams"]
+
+
+class ExcludeUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    body: Required[Iterable[SplitTunnelExcludeParam]]
diff --git a/src/cloudflare/types/zero_trust/devices/policies/default/fallback_domain_update_params.py b/src/cloudflare/types/zero_trust/devices/policies/default/fallback_domain_update_params.py
new file mode 100644
index 00000000000..2c284e47aee
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/policies/default/fallback_domain_update_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+from ...fallback_domain_param import FallbackDomainParam
+
+__all__ = ["FallbackDomainUpdateParams"]
+
+
+class FallbackDomainUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    domains: Required[Iterable[FallbackDomainParam]]
diff --git a/src/cloudflare/types/zero_trust/devices/policies/default/include_update_params.py b/src/cloudflare/types/zero_trust/devices/policies/default/include_update_params.py
new file mode 100644
index 00000000000..6568d4ef985
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/policies/default/include_update_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+from ...split_tunnel_include_param import SplitTunnelIncludeParam
+
+__all__ = ["IncludeUpdateParams"]
+
+
+class IncludeUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    body: Required[Iterable[SplitTunnelIncludeParam]]
diff --git a/src/cloudflare/types/zero_trust/devices/policies/default_edit_params.py b/src/cloudflare/types/zero_trust/devices/policies/default_edit_params.py
new file mode 100644
index 00000000000..9a6b533464c
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/policies/default_edit_params.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable
+from typing_extensions import Required, TypedDict
+
+from ..split_tunnel_exclude_param import SplitTunnelExcludeParam
+from ..split_tunnel_include_param import SplitTunnelIncludeParam
+
+__all__ = ["DefaultEditParams", "ServiceModeV2"]
+
+
+class DefaultEditParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    allow_mode_switch: bool
+    """Whether to allow the user to switch WARP between modes."""
+
+    allow_updates: bool
+    """
+    Whether to receive update notifications when a new version of the client is
+    available.
+    """
+
+    allowed_to_leave: bool
+    """Whether to allow devices to leave the organization."""
+
+    auto_connect: float
+    """The amount of time in seconds to reconnect after having been disabled."""
+
+    captive_portal: float
+    """Turn on the captive portal after the specified amount of time."""
+
+    disable_auto_fallback: bool
+    """
+    If the `dns_server` field of a fallback domain is not present, the client will
+    fall back to a best guess of the default/system DNS resolvers unless this policy
+    option is set to `true`.
+    """
+
+    exclude: Iterable[SplitTunnelExcludeParam]
+    """List of routes excluded in the WARP client's tunnel.
+
+    Both 'exclude' and 'include' cannot be set in the same request.
+    """
+
+    exclude_office_ips: bool
+    """Whether to add Microsoft IPs to Split Tunnel exclusions."""
+
+    include: Iterable[SplitTunnelIncludeParam]
+    """List of routes included in the WARP client's tunnel.
+
+    Both 'exclude' and 'include' cannot be set in the same request.
+    """
+
+    lan_allow_minutes: float
+    """The amount of time in minutes a user is allowed access to their LAN.
+
+    A value of 0 will allow LAN access until the next WARP reconnection, such as a
+    reboot or a laptop waking from sleep. Note that this field is omitted from the
+    response if null or unset.
+    """
+
+    lan_allow_subnet_size: float
+    """The size of the subnet for the local access network.
+
+    Note that this field is omitted from the response if null or unset.
+    """
+
+    register_interface_ip_with_dns: bool
+    """
+    Determines if the operating system will register WARP's local interface IP with
+    your on-premises DNS server.
+    """
+
+    sccm_vpn_boundary_support: bool
+    """
+    Determines whether the WARP client indicates to SCCM that it is inside a VPN
+    boundary. (Windows only).
+    """
+
+    service_mode_v2: ServiceModeV2
+
+    support_url: str
+    """The URL to launch when the Send Feedback button is clicked."""
+
+    switch_locked: bool
+    """
+    Whether to allow the user to turn off the WARP switch and disconnect the client.
+    """
+
+    tunnel_protocol: str
+    """Determines which tunnel protocol to use."""
+
+
+class ServiceModeV2(TypedDict, total=False):
+    mode: str
+    """The mode to run the WARP client under."""
+
+    port: float
+    """The port number when used with proxy mode."""
diff --git a/src/cloudflare/types/zero_trust/devices/policies/default_edit_response.py b/src/cloudflare/types/zero_trust/devices/policies/default_edit_response.py
new file mode 100644
index 00000000000..0607369e513
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/policies/default_edit_response.py
@@ -0,0 +1,89 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ....._models import BaseModel
+from ..fallback_domain import FallbackDomain
+from ..split_tunnel_exclude import SplitTunnelExclude
+from ..split_tunnel_include import SplitTunnelInclude
+
+__all__ = ["DefaultEditResponse", "ServiceModeV2"]
+
+
+class ServiceModeV2(BaseModel):
+    mode: Optional[str] = None
+    """The mode to run the WARP client under."""
+
+    port: Optional[float] = None
+    """The port number when used with proxy mode."""
+
+
+class DefaultEditResponse(BaseModel):
+    allow_mode_switch: Optional[bool] = None
+    """Whether to allow the user to switch WARP between modes."""
+
+    allow_updates: Optional[bool] = None
+    """
+    Whether to receive update notifications when a new version of the client is
+    available.
+    """
+
+    allowed_to_leave: Optional[bool] = None
+    """Whether to allow devices to leave the organization."""
+
+    auto_connect: Optional[float] = None
+    """The amount of time in seconds to reconnect after having been disabled."""
+
+    captive_portal: Optional[float] = None
+    """Turn on the captive portal after the specified amount of time."""
+
+    default: Optional[bool] = None
+    """Whether the policy will be applied to matching devices."""
+
+    disable_auto_fallback: Optional[bool] = None
+    """
+    If the `dns_server` field of a fallback domain is not present, the client will
+    fall back to a best guess of the default/system DNS resolvers unless this policy
+    option is set to `true`.
+    """
+
+    enabled: Optional[bool] = None
+    """Whether the policy will be applied to matching devices."""
+
+    exclude: Optional[List[SplitTunnelExclude]] = None
+    """List of routes excluded in the WARP client's tunnel."""
+
+    exclude_office_ips: Optional[bool] = None
+    """Whether to add Microsoft IPs to Split Tunnel exclusions."""
+
+    fallback_domains: Optional[List[FallbackDomain]] = None
+
+    gateway_unique_id: Optional[str] = None
+
+    include: Optional[List[SplitTunnelInclude]] = None
+    """List of routes included in the WARP client's tunnel."""
+
+    register_interface_ip_with_dns: Optional[bool] = None
+    """
+    Determines if the operating system will register WARP's local interface IP with
+    your on-premises DNS server.
+    """
+
+    sccm_vpn_boundary_support: Optional[bool] = None
+    """
+    Determines whether the WARP client indicates to SCCM that it is inside a VPN
+    boundary. (Windows only).
+    """
+
+    service_mode_v2: Optional[ServiceModeV2] = None
+
+    support_url: Optional[str] = None
+    """The URL to launch when the Send Feedback button is clicked."""
+
+    switch_locked: Optional[bool] = None
+    """
+    Whether to allow the user to turn off the WARP switch and disconnect the client.
+    """
+
+    tunnel_protocol: Optional[str] = None
+    """Determines which tunnel protocol to use."""
diff --git a/src/cloudflare/types/zero_trust/devices/policies/default_get_response.py b/src/cloudflare/types/zero_trust/devices/policies/default_get_response.py
new file mode 100644
index 00000000000..d08ddfd036a
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/policies/default_get_response.py
@@ -0,0 +1,89 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ....._models import BaseModel
+from ..fallback_domain import FallbackDomain
+from ..split_tunnel_exclude import SplitTunnelExclude
+from ..split_tunnel_include import SplitTunnelInclude
+
+__all__ = ["DefaultGetResponse", "ServiceModeV2"]
+
+
+class ServiceModeV2(BaseModel):
+    mode: Optional[str] = None
+    """The mode to run the WARP client under."""
+
+    port: Optional[float] = None
+    """The port number when used with proxy mode."""
+
+
+class DefaultGetResponse(BaseModel):
+    allow_mode_switch: Optional[bool] = None
+    """Whether to allow the user to switch WARP between modes."""
+
+    allow_updates: Optional[bool] = None
+    """
+    Whether to receive update notifications when a new version of the client is
+    available.
+    """
+
+    allowed_to_leave: Optional[bool] = None
+    """Whether to allow devices to leave the organization."""
+
+    auto_connect: Optional[float] = None
+    """The amount of time in seconds to reconnect after having been disabled."""
+
+    captive_portal: Optional[float] = None
+    """Turn on the captive portal after the specified amount of time."""
+
+    default: Optional[bool] = None
+    """Whether the policy will be applied to matching devices."""
+
+    disable_auto_fallback: Optional[bool] = None
+    """
+    If the `dns_server` field of a fallback domain is not present, the client will
+    fall back to a best guess of the default/system DNS resolvers unless this policy
+    option is set to `true`.
+    """
+
+    enabled: Optional[bool] = None
+    """Whether the policy will be applied to matching devices."""
+
+    exclude: Optional[List[SplitTunnelExclude]] = None
+    """List of routes excluded in the WARP client's tunnel."""
+
+    exclude_office_ips: Optional[bool] = None
+    """Whether to add Microsoft IPs to Split Tunnel exclusions."""
+
+    fallback_domains: Optional[List[FallbackDomain]] = None
+
+    gateway_unique_id: Optional[str] = None
+
+    include: Optional[List[SplitTunnelInclude]] = None
+    """List of routes included in the WARP client's tunnel."""
+
+    register_interface_ip_with_dns: Optional[bool] = None
+    """
+    Determines if the operating system will register WARP's local interface IP with
+    your on-premises DNS server.
+    """
+
+    sccm_vpn_boundary_support: Optional[bool] = None
+    """
+    Determines whether the WARP client indicates to SCCM that it is inside a VPN
+    boundary. (Windows only).
+    """
+
+    service_mode_v2: Optional[ServiceModeV2] = None
+
+    support_url: Optional[str] = None
+    """The URL to launch when the Send Feedback button is clicked."""
+
+    switch_locked: Optional[bool] = None
+    """
+    Whether to allow the user to turn off the WARP switch and disconnect the client.
+    """
+
+    tunnel_protocol: Optional[str] = None
+    """Determines which tunnel protocol to use."""
diff --git a/src/cloudflare/types/zero_trust/devices/policies/default_policy_get_response.py b/src/cloudflare/types/zero_trust/devices/policies/default_policy_get_response.py
deleted file mode 100644
index 04a8dd9fae2..00000000000
--- a/src/cloudflare/types/zero_trust/devices/policies/default_policy_get_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-__all__ = ["DefaultPolicyGetResponse"]
-
-DefaultPolicyGetResponse = List[object]
diff --git a/src/cloudflare/types/zero_trust/devices/policies/exclude_get_response.py b/src/cloudflare/types/zero_trust/devices/policies/exclude_get_response.py
deleted file mode 100644
index 98a5259c101..00000000000
--- a/src/cloudflare/types/zero_trust/devices/policies/exclude_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .split_tunnel_exclude import SplitTunnelExclude
-
-__all__ = ["ExcludeGetResponse"]
-
-ExcludeGetResponse = List[SplitTunnelExclude]
diff --git a/src/cloudflare/types/zero_trust/devices/policies/exclude_update_params.py b/src/cloudflare/types/zero_trust/devices/policies/exclude_update_params.py
deleted file mode 100644
index 21ac467a9eb..00000000000
--- a/src/cloudflare/types/zero_trust/devices/policies/exclude_update_params.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Iterable
-from typing_extensions import Required, TypedDict
-
-from .split_tunnel_exclude_param import SplitTunnelExcludeParam
-
-__all__ = ["ExcludeUpdateParams"]
-
-
-class ExcludeUpdateParams(TypedDict, total=False):
-    account_id: Required[str]
-
-    body: Required[Iterable[SplitTunnelExcludeParam]]
diff --git a/src/cloudflare/types/zero_trust/devices/policies/exclude_update_response.py b/src/cloudflare/types/zero_trust/devices/policies/exclude_update_response.py
deleted file mode 100644
index 1174ff1c3ed..00000000000
--- a/src/cloudflare/types/zero_trust/devices/policies/exclude_update_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .split_tunnel_exclude import SplitTunnelExclude
-
-__all__ = ["ExcludeUpdateResponse"]
-
-ExcludeUpdateResponse = List[SplitTunnelExclude]
diff --git a/src/cloudflare/types/zero_trust/devices/policies/fallback_domain_get_response.py b/src/cloudflare/types/zero_trust/devices/policies/fallback_domain_get_response.py
deleted file mode 100644
index a55049118d5..00000000000
--- a/src/cloudflare/types/zero_trust/devices/policies/fallback_domain_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .fallback_domain import FallbackDomain
-
-__all__ = ["FallbackDomainGetResponse"]
-
-FallbackDomainGetResponse = List[FallbackDomain]
diff --git a/src/cloudflare/types/zero_trust/devices/policies/fallback_domain_update_params.py b/src/cloudflare/types/zero_trust/devices/policies/fallback_domain_update_params.py
deleted file mode 100644
index d88155dca61..00000000000
--- a/src/cloudflare/types/zero_trust/devices/policies/fallback_domain_update_params.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Iterable
-from typing_extensions import Required, TypedDict
-
-from .fallback_domain_param import FallbackDomainParam
-
-__all__ = ["FallbackDomainUpdateParams"]
-
-
-class FallbackDomainUpdateParams(TypedDict, total=False):
-    account_id: Required[str]
-
-    body: Required[Iterable[FallbackDomainParam]]
diff --git a/src/cloudflare/types/zero_trust/devices/policies/fallback_domain_update_response.py b/src/cloudflare/types/zero_trust/devices/policies/fallback_domain_update_response.py
deleted file mode 100644
index 6a97b5caa93..00000000000
--- a/src/cloudflare/types/zero_trust/devices/policies/fallback_domain_update_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .fallback_domain import FallbackDomain
-
-__all__ = ["FallbackDomainUpdateResponse"]
-
-FallbackDomainUpdateResponse = List[FallbackDomain]
diff --git a/src/cloudflare/types/zero_trust/devices/policies/include_get_response.py b/src/cloudflare/types/zero_trust/devices/policies/include_get_response.py
deleted file mode 100644
index 1a09a0101a4..00000000000
--- a/src/cloudflare/types/zero_trust/devices/policies/include_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .split_tunnel_include import SplitTunnelInclude
-
-__all__ = ["IncludeGetResponse"]
-
-IncludeGetResponse = List[SplitTunnelInclude]
diff --git a/src/cloudflare/types/zero_trust/devices/policies/include_update_params.py b/src/cloudflare/types/zero_trust/devices/policies/include_update_params.py
deleted file mode 100644
index ac7f05b4141..00000000000
--- a/src/cloudflare/types/zero_trust/devices/policies/include_update_params.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Iterable
-from typing_extensions import Required, TypedDict
-
-from .split_tunnel_include_param import SplitTunnelIncludeParam
-
-__all__ = ["IncludeUpdateParams"]
-
-
-class IncludeUpdateParams(TypedDict, total=False):
-    account_id: Required[str]
-
-    body: Required[Iterable[SplitTunnelIncludeParam]]
diff --git a/src/cloudflare/types/zero_trust/devices/policies/include_update_response.py b/src/cloudflare/types/zero_trust/devices/policies/include_update_response.py
deleted file mode 100644
index c5e7d02c0d7..00000000000
--- a/src/cloudflare/types/zero_trust/devices/policies/include_update_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .split_tunnel_include import SplitTunnelInclude
-
-__all__ = ["IncludeUpdateResponse"]
-
-IncludeUpdateResponse = List[SplitTunnelInclude]
diff --git a/src/cloudflare/types/zero_trust/devices/policies/split_tunnel_exclude.py b/src/cloudflare/types/zero_trust/devices/policies/split_tunnel_exclude.py
deleted file mode 100644
index cd78772008c..00000000000
--- a/src/cloudflare/types/zero_trust/devices/policies/split_tunnel_exclude.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ....._models import BaseModel
-
-__all__ = ["SplitTunnelExclude"]
-
-
-class SplitTunnelExclude(BaseModel):
-    address: str
-    """The address in CIDR format to exclude from the tunnel.
-
-    If `address` is present, `host` must not be present.
-    """
-
-    description: str
-    """A description of the Split Tunnel item, displayed in the client UI."""
-
-    host: Optional[str] = None
-    """The domain name to exclude from the tunnel.
-
-    If `host` is present, `address` must not be present.
-    """
diff --git a/src/cloudflare/types/zero_trust/devices/policies/split_tunnel_exclude_param.py b/src/cloudflare/types/zero_trust/devices/policies/split_tunnel_exclude_param.py
deleted file mode 100644
index 99998a52335..00000000000
--- a/src/cloudflare/types/zero_trust/devices/policies/split_tunnel_exclude_param.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["SplitTunnelExcludeParam"]
-
-
-class SplitTunnelExcludeParam(TypedDict, total=False):
-    address: Required[str]
-    """The address in CIDR format to exclude from the tunnel.
-
-    If `address` is present, `host` must not be present.
-    """
-
-    description: Required[str]
-    """A description of the Split Tunnel item, displayed in the client UI."""
-
-    host: str
-    """The domain name to exclude from the tunnel.
-
-    If `host` is present, `address` must not be present.
-    """
diff --git a/src/cloudflare/types/zero_trust/devices/policies/split_tunnel_include.py b/src/cloudflare/types/zero_trust/devices/policies/split_tunnel_include.py
deleted file mode 100644
index 0791d7c0eda..00000000000
--- a/src/cloudflare/types/zero_trust/devices/policies/split_tunnel_include.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ....._models import BaseModel
-
-__all__ = ["SplitTunnelInclude"]
-
-
-class SplitTunnelInclude(BaseModel):
-    address: str
-    """The address in CIDR format to include in the tunnel.
-
-    If address is present, host must not be present.
-    """
-
-    description: str
-    """A description of the split tunnel item, displayed in the client UI."""
-
-    host: Optional[str] = None
-    """The domain name to include in the tunnel.
-
-    If host is present, address must not be present.
-    """
diff --git a/src/cloudflare/types/zero_trust/devices/policies/split_tunnel_include_param.py b/src/cloudflare/types/zero_trust/devices/policies/split_tunnel_include_param.py
deleted file mode 100644
index 70474cc5f5f..00000000000
--- a/src/cloudflare/types/zero_trust/devices/policies/split_tunnel_include_param.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["SplitTunnelIncludeParam"]
-
-
-class SplitTunnelIncludeParam(TypedDict, total=False):
-    address: Required[str]
-    """The address in CIDR format to include in the tunnel.
-
-    If address is present, host must not be present.
-    """
-
-    description: Required[str]
-    """A description of the split tunnel item, displayed in the client UI."""
-
-    host: str
-    """The domain name to include in the tunnel.
-
-    If host is present, address must not be present.
-    """
diff --git a/src/cloudflare/types/zero_trust/devices/policy_create_params.py b/src/cloudflare/types/zero_trust/devices/policy_create_params.py
deleted file mode 100644
index 1cf7536ddc5..00000000000
--- a/src/cloudflare/types/zero_trust/devices/policy_create_params.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["PolicyCreateParams", "ServiceModeV2"]
-
-
-class PolicyCreateParams(TypedDict, total=False):
-    account_id: Required[str]
-
-    match: Required[str]
-    """The wirefilter expression to match devices."""
-
-    name: Required[str]
-    """The name of the device settings profile."""
-
-    precedence: Required[float]
-    """The precedence of the policy.
-
-    Lower values indicate higher precedence. Policies will be evaluated in ascending
-    order of this field.
-    """
-
-    allow_mode_switch: bool
-    """Whether to allow the user to switch WARP between modes."""
-
-    allow_updates: bool
-    """
-    Whether to receive update notifications when a new version of the client is
-    available.
-    """
-
-    allowed_to_leave: bool
-    """Whether to allow devices to leave the organization."""
-
-    auto_connect: float
-    """The amount of time in minutes to reconnect after having been disabled."""
-
-    captive_portal: float
-    """Turn on the captive portal after the specified amount of time."""
-
-    description: str
-    """A description of the policy."""
-
-    disable_auto_fallback: bool
-    """
-    If the `dns_server` field of a fallback domain is not present, the client will
-    fall back to a best guess of the default/system DNS resolvers unless this policy
-    option is set to `true`.
-    """
-
-    enabled: bool
-    """Whether the policy will be applied to matching devices."""
-
-    exclude_office_ips: bool
-    """Whether to add Microsoft IPs to Split Tunnel exclusions."""
-
-    lan_allow_minutes: float
-    """The amount of time in minutes a user is allowed access to their LAN.
-
-    A value of 0 will allow LAN access until the next WARP reconnection, such as a
-    reboot or a laptop waking from sleep. Note that this field is omitted from the
-    response if null or unset.
-    """
-
-    lan_allow_subnet_size: float
-    """The size of the subnet for the local access network.
-
-    Note that this field is omitted from the response if null or unset.
-    """
-
-    service_mode_v2: ServiceModeV2
-
-    support_url: str
-    """The URL to launch when the Send Feedback button is clicked."""
-
-    switch_locked: bool
-    """
-    Whether to allow the user to turn off the WARP switch and disconnect the client.
-    """
-
-
-class ServiceModeV2(TypedDict, total=False):
-    mode: str
-    """The mode to run the WARP client under."""
-
-    port: float
-    """The port number when used with proxy mode."""
diff --git a/src/cloudflare/types/zero_trust/devices/policy_delete_response.py b/src/cloudflare/types/zero_trust/devices/policy_delete_response.py
deleted file mode 100644
index 1e4273f04e7..00000000000
--- a/src/cloudflare/types/zero_trust/devices/policy_delete_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .settings_policy import SettingsPolicy
-
-__all__ = ["PolicyDeleteResponse"]
-
-PolicyDeleteResponse = List[SettingsPolicy]
diff --git a/src/cloudflare/types/zero_trust/devices/policy_edit_params.py b/src/cloudflare/types/zero_trust/devices/policy_edit_params.py
deleted file mode 100644
index 7874833032e..00000000000
--- a/src/cloudflare/types/zero_trust/devices/policy_edit_params.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["PolicyEditParams", "ServiceModeV2"]
-
-
-class PolicyEditParams(TypedDict, total=False):
-    account_id: Required[str]
-
-    allow_mode_switch: bool
-    """Whether to allow the user to switch WARP between modes."""
-
-    allow_updates: bool
-    """
-    Whether to receive update notifications when a new version of the client is
-    available.
-    """
-
-    allowed_to_leave: bool
-    """Whether to allow devices to leave the organization."""
-
-    auto_connect: float
-    """The amount of time in minutes to reconnect after having been disabled."""
-
-    captive_portal: float
-    """Turn on the captive portal after the specified amount of time."""
-
-    description: str
-    """A description of the policy."""
-
-    disable_auto_fallback: bool
-    """
-    If the `dns_server` field of a fallback domain is not present, the client will
-    fall back to a best guess of the default/system DNS resolvers unless this policy
-    option is set to `true`.
-    """
-
-    enabled: bool
-    """Whether the policy will be applied to matching devices."""
-
-    exclude_office_ips: bool
-    """Whether to add Microsoft IPs to Split Tunnel exclusions."""
-
-    match: str
-    """The wirefilter expression to match devices."""
-
-    name: str
-    """The name of the device settings profile."""
-
-    precedence: float
-    """The precedence of the policy.
-
-    Lower values indicate higher precedence. Policies will be evaluated in ascending
-    order of this field.
-    """
-
-    service_mode_v2: ServiceModeV2
-
-    support_url: str
-    """The URL to launch when the Send Feedback button is clicked."""
-
-    switch_locked: bool
-    """
-    Whether to allow the user to turn off the WARP switch and disconnect the client.
-    """
-
-
-class ServiceModeV2(TypedDict, total=False):
-    mode: str
-    """The mode to run the WARP client under."""
-
-    port: float
-    """The port number when used with proxy mode."""
diff --git a/src/cloudflare/types/zero_trust/devices/posture/integration.py b/src/cloudflare/types/zero_trust/devices/posture/integration.py
index 505d151031f..9c1a1a6637f 100644
--- a/src/cloudflare/types/zero_trust/devices/posture/integration.py
+++ b/src/cloudflare/types/zero_trust/devices/posture/integration.py
@@ -9,6 +9,8 @@
 
 
 class Config(BaseModel):
+    """The configuration object containing third-party integration information."""
+
     api_url: str
     """The Workspace One API URL provided in the Workspace One Admin Dashboard."""
 
@@ -36,6 +38,15 @@ class Integration(BaseModel):
     """The name of the device posture integration."""
 
     type: Optional[
-        Literal["workspace_one", "crowdstrike_s2s", "uptycs", "intune", "kolide", "tanium", "sentinelone_s2s"]
+        Literal[
+            "workspace_one",
+            "crowdstrike_s2s",
+            "uptycs",
+            "intune",
+            "kolide",
+            "tanium_s2s",
+            "sentinelone_s2s",
+            "custom_s2s",
+        ]
     ] = None
     """The type of device posture integration."""
diff --git a/src/cloudflare/types/zero_trust/devices/posture/integration_create_params.py b/src/cloudflare/types/zero_trust/devices/posture/integration_create_params.py
index 541809528f6..00121f538be 100644
--- a/src/cloudflare/types/zero_trust/devices/posture/integration_create_params.py
+++ b/src/cloudflare/types/zero_trust/devices/posture/integration_create_params.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from typing import Union
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
 __all__ = [
     "IntegrationCreateParams",
@@ -15,6 +15,7 @@
     "ConfigTeamsDevicesKolideConfigRequest",
     "ConfigTeamsDevicesTaniumConfigRequest",
     "ConfigTeamsDevicesSentineloneS2sConfigRequest",
+    "ConfigTeamsDevicesCustomS2sConfigRequest",
 ]
 
 
@@ -34,7 +35,16 @@ class IntegrationCreateParams(TypedDict, total=False):
     """The name of the device posture integration."""
 
     type: Required[
-        Literal["workspace_one", "crowdstrike_s2s", "uptycs", "intune", "kolide", "tanium", "sentinelone_s2s"]
+        Literal[
+            "workspace_one",
+            "crowdstrike_s2s",
+            "uptycs",
+            "intune",
+            "kolide",
+            "tanium_s2s",
+            "sentinelone_s2s",
+            "custom_s2s",
+        ]
     ]
     """The type of device posture integration."""
 
@@ -110,13 +120,13 @@ class ConfigTeamsDevicesTaniumConfigRequest(TypedDict, total=False):
     access_client_id: str
     """
     If present, this id will be passed in the `CF-Access-Client-ID` header when
-    hitting the `api_url`
+    hitting the `api_url`.
     """
 
     access_client_secret: str
     """
     If present, this secret will be passed in the `CF-Access-Client-Secret` header
-    when hitting the `api_url`
+    when hitting the `api_url`.
     """
 
 
@@ -128,7 +138,24 @@ class ConfigTeamsDevicesSentineloneS2sConfigRequest(TypedDict, total=False):
     """The SentinelOne S2S client secret."""
 
 
-Config = Union[
+class ConfigTeamsDevicesCustomS2sConfigRequest(TypedDict, total=False):
+    access_client_id: Required[str]
+    """
+    This id will be passed in the `CF-Access-Client-ID` header when hitting the
+    `api_url`.
+    """
+
+    access_client_secret: Required[str]
+    """
+    This secret will be passed in the `CF-Access-Client-Secret` header when hitting
+    the `api_url`.
+    """
+
+    api_url: Required[str]
+    """The Custom Device Posture Integration API URL."""
+
+
+Config: TypeAlias = Union[
     ConfigTeamsDevicesWorkspaceOneConfigRequest,
     ConfigTeamsDevicesCrowdstrikeConfigRequest,
     ConfigTeamsDevicesUptycsConfigRequest,
@@ -136,4 +163,5 @@ class ConfigTeamsDevicesSentineloneS2sConfigRequest(TypedDict, total=False):
     ConfigTeamsDevicesKolideConfigRequest,
     ConfigTeamsDevicesTaniumConfigRequest,
     ConfigTeamsDevicesSentineloneS2sConfigRequest,
+    ConfigTeamsDevicesCustomS2sConfigRequest,
 ]
diff --git a/src/cloudflare/types/zero_trust/devices/posture/integration_delete_response.py b/src/cloudflare/types/zero_trust/devices/posture/integration_delete_response.py
index 6f19fa53620..5ad6c5cee94 100644
--- a/src/cloudflare/types/zero_trust/devices/posture/integration_delete_response.py
+++ b/src/cloudflare/types/zero_trust/devices/posture/integration_delete_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Union
+from typing_extensions import TypeAlias
 
 __all__ = ["IntegrationDeleteResponse"]
 
-IntegrationDeleteResponse = Union[Optional[str], Optional[object]]
+IntegrationDeleteResponse: TypeAlias = Union[str, object, None]
diff --git a/src/cloudflare/types/zero_trust/devices/posture/integration_edit_params.py b/src/cloudflare/types/zero_trust/devices/posture/integration_edit_params.py
index 134b563b9c6..c23e0af1787 100644
--- a/src/cloudflare/types/zero_trust/devices/posture/integration_edit_params.py
+++ b/src/cloudflare/types/zero_trust/devices/posture/integration_edit_params.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from typing import Union
-from typing_extensions import Literal, Required, TypedDict
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
 __all__ = [
     "IntegrationEditParams",
@@ -15,6 +15,7 @@
     "ConfigTeamsDevicesKolideConfigRequest",
     "ConfigTeamsDevicesTaniumConfigRequest",
     "ConfigTeamsDevicesSentineloneS2sConfigRequest",
+    "ConfigTeamsDevicesCustomS2sConfigRequest",
 ]
 
 
@@ -33,7 +34,9 @@ class IntegrationEditParams(TypedDict, total=False):
     name: str
     """The name of the device posture integration."""
 
-    type: Literal["workspace_one", "crowdstrike_s2s", "uptycs", "intune", "kolide", "tanium", "sentinelone_s2s"]
+    type: Literal[
+        "workspace_one", "crowdstrike_s2s", "uptycs", "intune", "kolide", "tanium_s2s", "sentinelone_s2s", "custom_s2s"
+    ]
     """The type of device posture integration."""
 
 
@@ -108,13 +111,13 @@ class ConfigTeamsDevicesTaniumConfigRequest(TypedDict, total=False):
     access_client_id: str
     """
     If present, this id will be passed in the `CF-Access-Client-ID` header when
-    hitting the `api_url`
+    hitting the `api_url`.
     """
 
     access_client_secret: str
     """
     If present, this secret will be passed in the `CF-Access-Client-Secret` header
-    when hitting the `api_url`
+    when hitting the `api_url`.
     """
 
 
@@ -126,7 +129,24 @@ class ConfigTeamsDevicesSentineloneS2sConfigRequest(TypedDict, total=False):
     """The SentinelOne S2S client secret."""
 
 
-Config = Union[
+class ConfigTeamsDevicesCustomS2sConfigRequest(TypedDict, total=False):
+    access_client_id: Required[str]
+    """
+    This id will be passed in the `CF-Access-Client-ID` header when hitting the
+    `api_url`.
+    """
+
+    access_client_secret: Required[str]
+    """
+    This secret will be passed in the `CF-Access-Client-Secret` header when hitting
+    the `api_url`.
+    """
+
+    api_url: Required[str]
+    """The Custom Device Posture Integration API URL."""
+
+
+Config: TypeAlias = Union[
     ConfigTeamsDevicesWorkspaceOneConfigRequest,
     ConfigTeamsDevicesCrowdstrikeConfigRequest,
     ConfigTeamsDevicesUptycsConfigRequest,
@@ -134,4 +154,5 @@ class ConfigTeamsDevicesSentineloneS2sConfigRequest(TypedDict, total=False):
     ConfigTeamsDevicesKolideConfigRequest,
     ConfigTeamsDevicesTaniumConfigRequest,
     ConfigTeamsDevicesSentineloneS2sConfigRequest,
+    ConfigTeamsDevicesCustomS2sConfigRequest,
 ]
diff --git a/src/cloudflare/types/zero_trust/devices/posture_create_params.py b/src/cloudflare/types/zero_trust/devices/posture_create_params.py
index 69c45532eed..1d923fd3fac 100644
--- a/src/cloudflare/types/zero_trust/devices/posture_create_params.py
+++ b/src/cloudflare/types/zero_trust/devices/posture_create_params.py
@@ -25,12 +25,15 @@ class PostureCreateParams(TypedDict, total=False):
             "gateway",
             "warp",
             "disk_encryption",
+            "serial_number",
             "sentinelone",
             "carbonblack",
             "firewall",
             "os_version",
             "domain_joined",
             "client_certificate",
+            "client_certificate_v2",
+            "antivirus",
             "unique_client_id",
             "kolide",
             "tanium_s2s",
@@ -38,6 +41,7 @@ class PostureCreateParams(TypedDict, total=False):
             "intune",
             "workspace_one",
             "sentinelone_s2s",
+            "custom_s2s",
         ]
     ]
     """The type of device posture rule."""
diff --git a/src/cloudflare/types/zero_trust/devices/posture_update_params.py b/src/cloudflare/types/zero_trust/devices/posture_update_params.py
index 7d32102d7dd..dbb5308e3a7 100644
--- a/src/cloudflare/types/zero_trust/devices/posture_update_params.py
+++ b/src/cloudflare/types/zero_trust/devices/posture_update_params.py
@@ -25,12 +25,15 @@ class PostureUpdateParams(TypedDict, total=False):
             "gateway",
             "warp",
             "disk_encryption",
+            "serial_number",
             "sentinelone",
             "carbonblack",
             "firewall",
             "os_version",
             "domain_joined",
             "client_certificate",
+            "client_certificate_v2",
+            "antivirus",
             "unique_client_id",
             "kolide",
             "tanium_s2s",
@@ -38,6 +41,7 @@ class PostureUpdateParams(TypedDict, total=False):
             "intune",
             "workspace_one",
             "sentinelone_s2s",
+            "custom_s2s",
         ]
     ]
     """The type of device posture rule."""
diff --git a/src/cloudflare/types/zero_trust/devices/registration_bulk_delete_params.py b/src/cloudflare/types/zero_trust/devices/registration_bulk_delete_params.py
new file mode 100644
index 00000000000..bcca1ca09a6
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/registration_bulk_delete_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["RegistrationBulkDeleteParams"]
+
+
+class RegistrationBulkDeleteParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    id: Required[SequenceNotStr[str]]
+    """A list of registration IDs to delete."""
diff --git a/src/cloudflare/types/zero_trust/devices/registration_get_params.py b/src/cloudflare/types/zero_trust/devices/registration_get_params.py
new file mode 100644
index 00000000000..fa02ad65420
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/registration_get_params.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["RegistrationGetParams"]
+
+
+class RegistrationGetParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    include: str
+    """
+    Comma-separated list of additional information that should be included in the
+    registration response. Supported values are: "policy".
+    """
diff --git a/src/cloudflare/types/zero_trust/devices/registration_get_response.py b/src/cloudflare/types/zero_trust/devices/registration_get_response.py
new file mode 100644
index 00000000000..1acdc113e53
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/registration_get_response.py
@@ -0,0 +1,98 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ...._models import BaseModel
+
+__all__ = ["RegistrationGetResponse", "Device", "Policy", "User"]
+
+
+class Device(BaseModel):
+    """Device details embedded inside of a registration."""
+
+    id: str
+    """The ID of the device."""
+
+    name: str
+    """The name of the device."""
+
+    client_version: Optional[str] = None
+    """Version of the WARP client."""
+
+
+class Policy(BaseModel):
+    """The device settings profile assigned to this registration."""
+
+    id: str
+    """The ID of the device settings profile."""
+
+    default: bool
+    """Whether the device settings profile is the default profile for the account."""
+
+    deleted: bool
+    """Whether the device settings profile was deleted."""
+
+    name: str
+    """The name of the device settings profile."""
+
+    updated_at: str
+    """
+    The RFC3339 timestamp of when the device settings profile last changed for the
+    registration.
+    """
+
+
+class User(BaseModel):
+    id: Optional[str] = None
+    """UUID."""
+
+    email: Optional[str] = None
+    """The contact email address of the user."""
+
+    name: Optional[str] = None
+    """The enrolled device user's name."""
+
+
+class RegistrationGetResponse(BaseModel):
+    """A WARP configuration tied to a single user.
+
+    Multiple registrations can be created from a single WARP device.
+    """
+
+    id: str
+    """The ID of the registration."""
+
+    created_at: str
+    """The RFC3339 timestamp when the registration was created."""
+
+    device: Device
+    """Device details embedded inside of a registration."""
+
+    key: str
+    """The public key used to connect to the Cloudflare network."""
+
+    last_seen_at: str
+    """The RFC3339 timestamp when the registration was last seen."""
+
+    updated_at: str
+    """The RFC3339 timestamp when the registration was last updated."""
+
+    deleted_at: Optional[str] = None
+    """The RFC3339 timestamp when the registration was deleted."""
+
+    key_type: Optional[str] = None
+    """The type of encryption key used by the WARP client for the active key.
+
+    Currently 'curve25519' for WireGuard and 'secp256r1' for MASQUE.
+    """
+
+    policy: Optional[Policy] = None
+    """The device settings profile assigned to this registration."""
+
+    revoked_at: Optional[str] = None
+    """The RFC3339 timestamp when the registration was revoked."""
+
+    tunnel_type: Optional[str] = None
+    """Type of the tunnel - wireguard or masque."""
+
+    user: Optional[User] = None
diff --git a/src/cloudflare/types/zero_trust/devices/registration_list_params.py b/src/cloudflare/types/zero_trust/devices/registration_list_params.py
new file mode 100644
index 00000000000..a8cc4ebe404
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/registration_list_params.py
@@ -0,0 +1,70 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["RegistrationListParams", "Device", "User"]
+
+
+class RegistrationListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    id: SequenceNotStr[str]
+    """Filter by registration ID."""
+
+    cursor: str
+    """
+    Opaque token indicating the starting position when requesting the next set of
+    records. A cursor value can be obtained from the result_info.cursor field in the
+    response.
+    """
+
+    device: Device
+
+    include: str
+    """
+    Comma-separated list of additional information that should be included in the
+    registration response. Supported values are: "policy".
+    """
+
+    per_page: int
+    """The maximum number of devices to return in a single response."""
+
+    search: str
+    """Filter by registration details."""
+
+    seen_after: str
+    """
+    Filter by the last_seen timestamp - returns only registrations last seen after
+    this timestamp.
+    """
+
+    seen_before: str
+    """
+    Filter by the last_seen timestamp - returns only registrations last seen before
+    this timestamp.
+    """
+
+    sort_by: Literal["id", "user.name", "user.email", "last_seen_at", "created_at"]
+    """The registration field to order results by."""
+
+    sort_order: Literal["asc", "desc"]
+    """Sort direction."""
+
+    status: Literal["active", "all", "revoked"]
+    """Filter by registration status. Defaults to 'active'."""
+
+    user: User
+
+
+class Device(TypedDict, total=False):
+    id: str
+    """Filter by WARP device ID."""
+
+
+class User(TypedDict, total=False):
+    id: SequenceNotStr[str]
+    """Filter by user ID."""
diff --git a/src/cloudflare/types/zero_trust/devices/registration_list_response.py b/src/cloudflare/types/zero_trust/devices/registration_list_response.py
new file mode 100644
index 00000000000..37fe8aedf48
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/registration_list_response.py
@@ -0,0 +1,98 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ...._models import BaseModel
+
+__all__ = ["RegistrationListResponse", "Device", "Policy", "User"]
+
+
+class Device(BaseModel):
+    """Device details embedded inside of a registration."""
+
+    id: str
+    """The ID of the device."""
+
+    name: str
+    """The name of the device."""
+
+    client_version: Optional[str] = None
+    """Version of the WARP client."""
+
+
+class Policy(BaseModel):
+    """The device settings profile assigned to this registration."""
+
+    id: str
+    """The ID of the device settings profile."""
+
+    default: bool
+    """Whether the device settings profile is the default profile for the account."""
+
+    deleted: bool
+    """Whether the device settings profile was deleted."""
+
+    name: str
+    """The name of the device settings profile."""
+
+    updated_at: str
+    """
+    The RFC3339 timestamp of when the device settings profile last changed for the
+    registration.
+    """
+
+
+class User(BaseModel):
+    id: Optional[str] = None
+    """UUID."""
+
+    email: Optional[str] = None
+    """The contact email address of the user."""
+
+    name: Optional[str] = None
+    """The enrolled device user's name."""
+
+
+class RegistrationListResponse(BaseModel):
+    """A WARP configuration tied to a single user.
+
+    Multiple registrations can be created from a single WARP device.
+    """
+
+    id: str
+    """The ID of the registration."""
+
+    created_at: str
+    """The RFC3339 timestamp when the registration was created."""
+
+    device: Device
+    """Device details embedded inside of a registration."""
+
+    key: str
+    """The public key used to connect to the Cloudflare network."""
+
+    last_seen_at: str
+    """The RFC3339 timestamp when the registration was last seen."""
+
+    updated_at: str
+    """The RFC3339 timestamp when the registration was last updated."""
+
+    deleted_at: Optional[str] = None
+    """The RFC3339 timestamp when the registration was deleted."""
+
+    key_type: Optional[str] = None
+    """The type of encryption key used by the WARP client for the active key.
+
+    Currently 'curve25519' for WireGuard and 'secp256r1' for MASQUE.
+    """
+
+    policy: Optional[Policy] = None
+    """The device settings profile assigned to this registration."""
+
+    revoked_at: Optional[str] = None
+    """The RFC3339 timestamp when the registration was revoked."""
+
+    tunnel_type: Optional[str] = None
+    """Type of the tunnel - wireguard or masque."""
+
+    user: Optional[User] = None
diff --git a/src/cloudflare/types/zero_trust/devices/registration_revoke_params.py b/src/cloudflare/types/zero_trust/devices/registration_revoke_params.py
new file mode 100644
index 00000000000..8f93798909d
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/registration_revoke_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["RegistrationRevokeParams"]
+
+
+class RegistrationRevokeParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    id: Required[SequenceNotStr[str]]
+    """A list of registration IDs to revoke."""
diff --git a/src/cloudflare/types/zero_trust/devices/registration_unrevoke_params.py b/src/cloudflare/types/zero_trust/devices/registration_unrevoke_params.py
new file mode 100644
index 00000000000..d94490cb4b6
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/registration_unrevoke_params.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ...._types import SequenceNotStr
+
+__all__ = ["RegistrationUnrevokeParams"]
+
+
+class RegistrationUnrevokeParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    id: Required[SequenceNotStr[str]]
+    """A list of registration IDs to unrevoke."""
diff --git a/src/cloudflare/types/zero_trust/devices/resilience/__init__.py b/src/cloudflare/types/zero_trust/devices/resilience/__init__.py
new file mode 100644
index 00000000000..fd77f25e768
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/resilience/__init__.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .global_warp_override_get_response import GlobalWARPOverrideGetResponse as GlobalWARPOverrideGetResponse
+from .global_warp_override_create_params import GlobalWARPOverrideCreateParams as GlobalWARPOverrideCreateParams
+from .global_warp_override_create_response import GlobalWARPOverrideCreateResponse as GlobalWARPOverrideCreateResponse
diff --git a/src/cloudflare/types/zero_trust/devices/resilience/global_warp_override_create_params.py b/src/cloudflare/types/zero_trust/devices/resilience/global_warp_override_create_params.py
new file mode 100644
index 00000000000..362f206b71e
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/resilience/global_warp_override_create_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["GlobalWARPOverrideCreateParams"]
+
+
+class GlobalWARPOverrideCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    disconnect: Required[bool]
+    """Disconnects all devices on the account using Global WARP override."""
+
+    justification: str
+    """Reasoning for setting the Global WARP override state.
+
+    This will be surfaced in the audit log.
+    """
diff --git a/src/cloudflare/types/zero_trust/devices/resilience/global_warp_override_create_response.py b/src/cloudflare/types/zero_trust/devices/resilience/global_warp_override_create_response.py
new file mode 100644
index 00000000000..06de4161276
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/resilience/global_warp_override_create_response.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ....._models import BaseModel
+
+__all__ = ["GlobalWARPOverrideCreateResponse"]
+
+
+class GlobalWARPOverrideCreateResponse(BaseModel):
+    disconnect: Optional[bool] = None
+    """Disconnects all devices on the account using Global WARP override."""
+
+    timestamp: Optional[datetime] = None
+    """When the Global WARP override state was updated."""
diff --git a/src/cloudflare/types/zero_trust/devices/resilience/global_warp_override_get_response.py b/src/cloudflare/types/zero_trust/devices/resilience/global_warp_override_get_response.py
new file mode 100644
index 00000000000..d8f955bb263
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/resilience/global_warp_override_get_response.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ....._models import BaseModel
+
+__all__ = ["GlobalWARPOverrideGetResponse"]
+
+
+class GlobalWARPOverrideGetResponse(BaseModel):
+    disconnect: Optional[bool] = None
+    """Disconnects all devices on the account using Global WARP override."""
+
+    timestamp: Optional[datetime] = None
+    """When the Global WARP override state was updated."""
diff --git a/src/cloudflare/types/zero_trust/devices/revoke_create_params.py b/src/cloudflare/types/zero_trust/devices/revoke_create_params.py
index ec49fd97998..c418c69dbd4 100644
--- a/src/cloudflare/types/zero_trust/devices/revoke_create_params.py
+++ b/src/cloudflare/types/zero_trust/devices/revoke_create_params.py
@@ -2,14 +2,15 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Required, TypedDict
 
+from ...._types import SequenceNotStr
+
 __all__ = ["RevokeCreateParams"]
 
 
 class RevokeCreateParams(TypedDict, total=False):
     account_id: Required[str]
 
-    body: Required[List[str]]
-    """A list of device ids to revoke."""
+    body: Required[SequenceNotStr[str]]
+    """A list of Registration IDs to revoke."""
diff --git a/src/cloudflare/types/zero_trust/devices/revoke_create_response.py b/src/cloudflare/types/zero_trust/devices/revoke_create_response.py
index 9eb7a16d7cf..42834980772 100644
--- a/src/cloudflare/types/zero_trust/devices/revoke_create_response.py
+++ b/src/cloudflare/types/zero_trust/devices/revoke_create_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Union
+from typing_extensions import TypeAlias
 
 __all__ = ["RevokeCreateResponse"]
 
-RevokeCreateResponse = Union[Optional[str], Optional[object]]
+RevokeCreateResponse: TypeAlias = Union[str, object, None]
diff --git a/src/cloudflare/types/zero_trust/devices/schema_data.py b/src/cloudflare/types/zero_trust/devices/schema_data.py
deleted file mode 100644
index 8d57277eba9..00000000000
--- a/src/cloudflare/types/zero_trust/devices/schema_data.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ...._models import BaseModel
-
-__all__ = ["SchemaData"]
-
-
-class SchemaData(BaseModel):
-    host: Optional[str] = None
-    """The desired endpoint to test."""
-
-    kind: Optional[str] = None
-    """The type of test."""
-
-    method: Optional[str] = None
-    """The HTTP request method type."""
diff --git a/src/cloudflare/types/zero_trust/devices/schema_data_param.py b/src/cloudflare/types/zero_trust/devices/schema_data_param.py
deleted file mode 100644
index b071470c9c9..00000000000
--- a/src/cloudflare/types/zero_trust/devices/schema_data_param.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import TypedDict
-
-__all__ = ["SchemaDataParam"]
-
-
-class SchemaDataParam(TypedDict, total=False):
-    host: str
-    """The desired endpoint to test."""
-
-    kind: str
-    """The type of test."""
-
-    method: str
-    """The HTTP request method type."""
diff --git a/src/cloudflare/types/zero_trust/devices/schema_http.py b/src/cloudflare/types/zero_trust/devices/schema_http.py
deleted file mode 100644
index 43e763610ff..00000000000
--- a/src/cloudflare/types/zero_trust/devices/schema_http.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-
-from ...._models import BaseModel
-from .schema_data import SchemaData
-
-__all__ = ["SchemaHTTP", "TargetPolicy"]
-
-
-class TargetPolicy(BaseModel):
-    id: Optional[str] = None
-    """The id of the device settings profile"""
-
-    default: Optional[bool] = None
-    """Whether the profile is the account default"""
-
-    name: Optional[str] = None
-    """The name of the device settings profile"""
-
-
-class SchemaHTTP(BaseModel):
-    data: SchemaData
-    """
-    The configuration object which contains the details for the WARP client to
-    conduct the test.
-    """
-
-    enabled: bool
-    """Determines whether or not the test is active."""
-
-    interval: str
-    """How often the test will run."""
-
-    name: str
-    """The name of the DEX test. Must be unique."""
-
-    description: Optional[str] = None
-    """Additional details about the test."""
-
-    target_policies: Optional[List[TargetPolicy]] = None
-    """Device settings profiles targeted by this test"""
-
-    targeted: Optional[bool] = None
diff --git a/src/cloudflare/types/zero_trust/devices/sentinelone_input.py b/src/cloudflare/types/zero_trust/devices/sentinelone_input.py
index cfe6b020f91..a141f155ee8 100644
--- a/src/cloudflare/types/zero_trust/devices/sentinelone_input.py
+++ b/src/cloudflare/types/zero_trust/devices/sentinelone_input.py
@@ -10,7 +10,7 @@
 
 class SentineloneInput(BaseModel):
     operating_system: Literal["windows", "linux", "mac"]
-    """Operating system"""
+    """Operating system."""
 
     path: str
     """File path."""
diff --git a/src/cloudflare/types/zero_trust/devices/sentinelone_input_param.py b/src/cloudflare/types/zero_trust/devices/sentinelone_input_param.py
index 062c2a5206d..5116a183c1c 100644
--- a/src/cloudflare/types/zero_trust/devices/sentinelone_input_param.py
+++ b/src/cloudflare/types/zero_trust/devices/sentinelone_input_param.py
@@ -9,7 +9,7 @@
 
 class SentineloneInputParam(TypedDict, total=False):
     operating_system: Required[Literal["windows", "linux", "mac"]]
-    """Operating system"""
+    """Operating system."""
 
     path: Required[str]
     """File path."""
diff --git a/src/cloudflare/types/zero_trust/devices/sentinelone_s2s_input.py b/src/cloudflare/types/zero_trust/devices/sentinelone_s2s_input.py
index fbd2d9ca1e2..fe3a26d22be 100644
--- a/src/cloudflare/types/zero_trust/devices/sentinelone_s2s_input.py
+++ b/src/cloudflare/types/zero_trust/devices/sentinelone_s2s_input.py
@@ -24,5 +24,18 @@ class SentineloneS2sInput(BaseModel):
     network_status: Optional[Literal["connected", "disconnected", "disconnecting", "connecting"]] = None
     """Network status of device."""
 
+    operational_state: Optional[
+        Literal[
+            "na",
+            "partially_disabled",
+            "auto_fully_disabled",
+            "fully_disabled",
+            "auto_partially_disabled",
+            "disabled_error",
+            "db_corruption",
+        ]
+    ] = None
+    """Agent operational state."""
+
     operator: Optional[Literal["<", "<=", ">", ">=", "=="]] = None
-    """operator"""
+    """Operator."""
diff --git a/src/cloudflare/types/zero_trust/devices/sentinelone_s2s_input_param.py b/src/cloudflare/types/zero_trust/devices/sentinelone_s2s_input_param.py
index 6b73f36f07e..a39ffe6600d 100644
--- a/src/cloudflare/types/zero_trust/devices/sentinelone_s2s_input_param.py
+++ b/src/cloudflare/types/zero_trust/devices/sentinelone_s2s_input_param.py
@@ -23,5 +23,16 @@ class SentineloneS2sInputParam(TypedDict, total=False):
     network_status: Literal["connected", "disconnected", "disconnecting", "connecting"]
     """Network status of device."""
 
+    operational_state: Literal[
+        "na",
+        "partially_disabled",
+        "auto_fully_disabled",
+        "fully_disabled",
+        "auto_partially_disabled",
+        "disabled_error",
+        "db_corruption",
+    ]
+    """Agent operational state."""
+
     operator: Literal["<", "<=", ">", ">=", "=="]
-    """operator"""
+    """Operator."""
diff --git a/src/cloudflare/types/zero_trust/devices/setting_edit_params.py b/src/cloudflare/types/zero_trust/devices/setting_edit_params.py
new file mode 100755
index 00000000000..2516e80cc9f
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/setting_edit_params.py
@@ -0,0 +1,53 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["SettingEditParams"]
+
+
+class SettingEditParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    disable_for_time: float
+    """
+    Sets the time limit, in seconds, that a user can use an override code to bypass
+    WARP.
+    """
+
+    external_emergency_signal_enabled: bool
+    """Controls whether the external emergency disconnect feature is enabled."""
+
+    external_emergency_signal_fingerprint: str
+    """
+    The SHA256 fingerprint (64 hexadecimal characters) of the HTTPS server
+    certificate for the external_emergency_signal_url. If provided, the WARP client
+    will use this value to verify the server's identity. The device will ignore any
+    response if the server's certificate fingerprint does not exactly match this
+    value.
+    """
+
+    external_emergency_signal_interval: str
+    """
+    The interval at which the WARP client fetches the emergency disconnect signal,
+    formatted as a duration string (e.g., "5m", "2m30s", "1h"). Minimum 30 seconds.
+    """
+
+    external_emergency_signal_url: str
+    """The HTTPS URL from which to fetch the emergency disconnect signal.
+
+    Must use HTTPS and have an IPv4 or IPv6 address as the host.
+    """
+
+    gateway_proxy_enabled: bool
+    """Enable gateway proxy filtering on TCP."""
+
+    gateway_udp_proxy_enabled: bool
+    """Enable gateway proxy filtering on UDP."""
+
+    root_certificate_installation_enabled: bool
+    """Enable installation of cloudflare managed root certificate."""
+
+    use_zt_virtual_ip: bool
+    """Enable using CGNAT virtual IPv4."""
diff --git a/src/cloudflare/types/zero_trust/devices/setting_update_params.py b/src/cloudflare/types/zero_trust/devices/setting_update_params.py
index e3d210e964b..2cb606e33b5 100644
--- a/src/cloudflare/types/zero_trust/devices/setting_update_params.py
+++ b/src/cloudflare/types/zero_trust/devices/setting_update_params.py
@@ -10,6 +10,36 @@
 class SettingUpdateParams(TypedDict, total=False):
     account_id: Required[str]
 
+    disable_for_time: float
+    """
+    Sets the time limit, in seconds, that a user can use an override code to bypass
+    WARP.
+    """
+
+    external_emergency_signal_enabled: bool
+    """Controls whether the external emergency disconnect feature is enabled."""
+
+    external_emergency_signal_fingerprint: str
+    """
+    The SHA256 fingerprint (64 hexadecimal characters) of the HTTPS server
+    certificate for the external_emergency_signal_url. If provided, the WARP client
+    will use this value to verify the server's identity. The device will ignore any
+    response if the server's certificate fingerprint does not exactly match this
+    value.
+    """
+
+    external_emergency_signal_interval: str
+    """
+    The interval at which the WARP client fetches the emergency disconnect signal,
+    formatted as a duration string (e.g., "5m", "2m30s", "1h"). Minimum 30 seconds.
+    """
+
+    external_emergency_signal_url: str
+    """The HTTPS URL from which to fetch the emergency disconnect signal.
+
+    Must use HTTPS and have an IPv4 or IPv6 address as the host.
+    """
+
     gateway_proxy_enabled: bool
     """Enable gateway proxy filtering on TCP."""
 
diff --git a/src/cloudflare/types/zero_trust/devices/settings_policy.py b/src/cloudflare/types/zero_trust/devices/settings_policy.py
index a670a4c8927..dfc7f7ae559 100644
--- a/src/cloudflare/types/zero_trust/devices/settings_policy.py
+++ b/src/cloudflare/types/zero_trust/devices/settings_policy.py
@@ -3,9 +3,9 @@
 from typing import List, Optional
 
 from ...._models import BaseModel
-from .policies.fallback_domain import FallbackDomain
-from .policies.split_tunnel_exclude import SplitTunnelExclude
-from .policies.split_tunnel_include import SplitTunnelInclude
+from .fallback_domain import FallbackDomain
+from .split_tunnel_exclude import SplitTunnelExclude
+from .split_tunnel_include import SplitTunnelInclude
 
 __all__ = ["SettingsPolicy", "ServiceModeV2", "TargetTest"]
 
@@ -20,10 +20,10 @@ class ServiceModeV2(BaseModel):
 
 class TargetTest(BaseModel):
     id: Optional[str] = None
-    """The id of the DEX test targeting this policy"""
+    """The id of the DEX test targeting this policy."""
 
     name: Optional[str] = None
-    """The name of the DEX test targeting this policy"""
+    """The name of the DEX test targeting this policy."""
 
 
 class SettingsPolicy(BaseModel):
@@ -40,7 +40,7 @@ class SettingsPolicy(BaseModel):
     """Whether to allow devices to leave the organization."""
 
     auto_connect: Optional[float] = None
-    """The amount of time in minutes to reconnect after having been disabled."""
+    """The amount of time in seconds to reconnect after having been disabled."""
 
     captive_portal: Optional[float] = None
     """Turn on the captive portal after the specified amount of time."""
@@ -62,6 +62,7 @@ class SettingsPolicy(BaseModel):
     """Whether the policy will be applied to matching devices."""
 
     exclude: Optional[List[SplitTunnelExclude]] = None
+    """List of routes excluded in the WARP client's tunnel."""
 
     exclude_office_ips: Optional[bool] = None
     """Whether to add Microsoft IPs to Split Tunnel exclusions."""
@@ -71,6 +72,7 @@ class SettingsPolicy(BaseModel):
     gateway_unique_id: Optional[str] = None
 
     include: Optional[List[SplitTunnelInclude]] = None
+    """List of routes included in the WARP client's tunnel."""
 
     lan_allow_minutes: Optional[float] = None
     """The amount of time in minutes a user is allowed access to their LAN.
@@ -87,13 +89,17 @@ class SettingsPolicy(BaseModel):
     """
 
     match: Optional[str] = None
-    """The wirefilter expression to match devices."""
+    """The wirefilter expression to match devices.
+
+    Available values: "identity.email", "identity.groups.id",
+    "identity.groups.name", "identity.groups.email", "identity.service_token_uuid",
+    "identity.saml_attributes", "network", "os.name", "os.version".
+    """
 
     name: Optional[str] = None
     """The name of the device settings profile."""
 
     policy_id: Optional[str] = None
-    """Device ID."""
 
     precedence: Optional[float] = None
     """The precedence of the policy.
@@ -102,6 +108,18 @@ class SettingsPolicy(BaseModel):
     order of this field.
     """
 
+    register_interface_ip_with_dns: Optional[bool] = None
+    """
+    Determines if the operating system will register WARP's local interface IP with
+    your on-premises DNS server.
+    """
+
+    sccm_vpn_boundary_support: Optional[bool] = None
+    """
+    Determines whether the WARP client indicates to SCCM that it is inside a VPN
+    boundary. (Windows only).
+    """
+
     service_mode_v2: Optional[ServiceModeV2] = None
 
     support_url: Optional[str] = None
@@ -113,3 +131,6 @@ class SettingsPolicy(BaseModel):
     """
 
     target_tests: Optional[List[TargetTest]] = None
+
+    tunnel_protocol: Optional[str] = None
+    """Determines which tunnel protocol to use."""
diff --git a/src/cloudflare/types/zero_trust/devices/split_tunnel_exclude.py b/src/cloudflare/types/zero_trust/devices/split_tunnel_exclude.py
new file mode 100644
index 00000000000..aa39cc11fad
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/split_tunnel_exclude.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Union, Optional
+from typing_extensions import TypeAlias
+
+from ...._models import BaseModel
+
+__all__ = ["SplitTunnelExclude", "TeamsDevicesExcludeSplitTunnelWithAddress", "TeamsDevicesExcludeSplitTunnelWithHost"]
+
+
+class TeamsDevicesExcludeSplitTunnelWithAddress(BaseModel):
+    address: str
+    """The address in CIDR format to exclude from the tunnel.
+
+    If `address` is present, `host` must not be present.
+    """
+
+    description: Optional[str] = None
+    """A description of the Split Tunnel item, displayed in the client UI."""
+
+
+class TeamsDevicesExcludeSplitTunnelWithHost(BaseModel):
+    host: str
+    """The domain name to exclude from the tunnel.
+
+    If `host` is present, `address` must not be present.
+    """
+
+    description: Optional[str] = None
+    """A description of the Split Tunnel item, displayed in the client UI."""
+
+
+SplitTunnelExclude: TypeAlias = Union[TeamsDevicesExcludeSplitTunnelWithAddress, TeamsDevicesExcludeSplitTunnelWithHost]
diff --git a/src/cloudflare/types/zero_trust/devices/split_tunnel_exclude_param.py b/src/cloudflare/types/zero_trust/devices/split_tunnel_exclude_param.py
new file mode 100644
index 00000000000..8410ad52990
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/split_tunnel_exclude_param.py
@@ -0,0 +1,39 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from typing_extensions import Required, TypeAlias, TypedDict
+
+__all__ = [
+    "SplitTunnelExcludeParam",
+    "TeamsDevicesExcludeSplitTunnelWithAddress",
+    "TeamsDevicesExcludeSplitTunnelWithHost",
+]
+
+
+class TeamsDevicesExcludeSplitTunnelWithAddress(TypedDict, total=False):
+    address: Required[str]
+    """The address in CIDR format to exclude from the tunnel.
+
+    If `address` is present, `host` must not be present.
+    """
+
+    description: str
+    """A description of the Split Tunnel item, displayed in the client UI."""
+
+
+class TeamsDevicesExcludeSplitTunnelWithHost(TypedDict, total=False):
+    host: Required[str]
+    """The domain name to exclude from the tunnel.
+
+    If `host` is present, `address` must not be present.
+    """
+
+    description: str
+    """A description of the Split Tunnel item, displayed in the client UI."""
+
+
+SplitTunnelExcludeParam: TypeAlias = Union[
+    TeamsDevicesExcludeSplitTunnelWithAddress, TeamsDevicesExcludeSplitTunnelWithHost
+]
diff --git a/src/cloudflare/types/zero_trust/devices/split_tunnel_include.py b/src/cloudflare/types/zero_trust/devices/split_tunnel_include.py
new file mode 100644
index 00000000000..a17856cf3d6
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/split_tunnel_include.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Union, Optional
+from typing_extensions import TypeAlias
+
+from ...._models import BaseModel
+
+__all__ = ["SplitTunnelInclude", "TeamsDevicesIncludeSplitTunnelWithAddress", "TeamsDevicesIncludeSplitTunnelWithHost"]
+
+
+class TeamsDevicesIncludeSplitTunnelWithAddress(BaseModel):
+    address: str
+    """The address in CIDR format to include in the tunnel.
+
+    If `address` is present, `host` must not be present.
+    """
+
+    description: Optional[str] = None
+    """A description of the Split Tunnel item, displayed in the client UI."""
+
+
+class TeamsDevicesIncludeSplitTunnelWithHost(BaseModel):
+    host: str
+    """The domain name to include in the tunnel.
+
+    If `host` is present, `address` must not be present.
+    """
+
+    description: Optional[str] = None
+    """A description of the Split Tunnel item, displayed in the client UI."""
+
+
+SplitTunnelInclude: TypeAlias = Union[TeamsDevicesIncludeSplitTunnelWithAddress, TeamsDevicesIncludeSplitTunnelWithHost]
diff --git a/src/cloudflare/types/zero_trust/devices/split_tunnel_include_param.py b/src/cloudflare/types/zero_trust/devices/split_tunnel_include_param.py
new file mode 100644
index 00000000000..6556f65d5f5
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/devices/split_tunnel_include_param.py
@@ -0,0 +1,39 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from typing_extensions import Required, TypeAlias, TypedDict
+
+__all__ = [
+    "SplitTunnelIncludeParam",
+    "TeamsDevicesIncludeSplitTunnelWithAddress",
+    "TeamsDevicesIncludeSplitTunnelWithHost",
+]
+
+
+class TeamsDevicesIncludeSplitTunnelWithAddress(TypedDict, total=False):
+    address: Required[str]
+    """The address in CIDR format to include in the tunnel.
+
+    If `address` is present, `host` must not be present.
+    """
+
+    description: str
+    """A description of the Split Tunnel item, displayed in the client UI."""
+
+
+class TeamsDevicesIncludeSplitTunnelWithHost(TypedDict, total=False):
+    host: Required[str]
+    """The domain name to include in the tunnel.
+
+    If `host` is present, `address` must not be present.
+    """
+
+    description: str
+    """A description of the Split Tunnel item, displayed in the client UI."""
+
+
+SplitTunnelIncludeParam: TypeAlias = Union[
+    TeamsDevicesIncludeSplitTunnelWithAddress, TeamsDevicesIncludeSplitTunnelWithHost
+]
diff --git a/src/cloudflare/types/zero_trust/devices/tanium_input.py b/src/cloudflare/types/zero_trust/devices/tanium_input.py
index 80f623cf50e..0737dc6324a 100644
--- a/src/cloudflare/types/zero_trust/devices/tanium_input.py
+++ b/src/cloudflare/types/zero_trust/devices/tanium_input.py
@@ -24,7 +24,7 @@ class TaniumInput(BaseModel):
     """For more details on risk level, refer to the Tanium documentation."""
 
     score_operator: Optional[Literal["<", "<=", ">", ">=", "=="]] = FieldInfo(alias="scoreOperator", default=None)
-    """Score Operator"""
+    """Score Operator."""
 
     total_score: Optional[float] = None
     """For more details on total score, refer to the Tanium documentation."""
diff --git a/src/cloudflare/types/zero_trust/devices/tanium_input_param.py b/src/cloudflare/types/zero_trust/devices/tanium_input_param.py
index e62ab115ef0..052c7c73339 100644
--- a/src/cloudflare/types/zero_trust/devices/tanium_input_param.py
+++ b/src/cloudflare/types/zero_trust/devices/tanium_input_param.py
@@ -23,7 +23,7 @@ class TaniumInputParam(TypedDict, total=False):
     """For more details on risk level, refer to the Tanium documentation."""
 
     score_operator: Annotated[Literal["<", "<=", ">", ">=", "=="], PropertyInfo(alias="scoreOperator")]
-    """Score Operator"""
+    """Score Operator."""
 
     total_score: float
     """For more details on total score, refer to the Tanium documentation."""
diff --git a/src/cloudflare/types/zero_trust/devices/unique_client_id_input.py b/src/cloudflare/types/zero_trust/devices/unique_client_id_input.py
index 524cfa7f3b8..aa345404452 100644
--- a/src/cloudflare/types/zero_trust/devices/unique_client_id_input.py
+++ b/src/cloudflare/types/zero_trust/devices/unique_client_id_input.py
@@ -12,4 +12,4 @@ class UniqueClientIDInput(BaseModel):
     """List ID."""
 
     operating_system: Literal["android", "ios", "chromeos"]
-    """Operating System"""
+    """Operating System."""
diff --git a/src/cloudflare/types/zero_trust/devices/unique_client_id_input_param.py b/src/cloudflare/types/zero_trust/devices/unique_client_id_input_param.py
index d6245c49c5a..4c310e0d88d 100644
--- a/src/cloudflare/types/zero_trust/devices/unique_client_id_input_param.py
+++ b/src/cloudflare/types/zero_trust/devices/unique_client_id_input_param.py
@@ -12,4 +12,4 @@ class UniqueClientIDInputParam(TypedDict, total=False):
     """List ID."""
 
     operating_system: Required[Literal["android", "ios", "chromeos"]]
-    """Operating System"""
+    """Operating System."""
diff --git a/src/cloudflare/types/zero_trust/devices/unrevoke_create_params.py b/src/cloudflare/types/zero_trust/devices/unrevoke_create_params.py
index 7a076ab0e56..bdb31360c3c 100644
--- a/src/cloudflare/types/zero_trust/devices/unrevoke_create_params.py
+++ b/src/cloudflare/types/zero_trust/devices/unrevoke_create_params.py
@@ -2,14 +2,15 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Required, TypedDict
 
+from ...._types import SequenceNotStr
+
 __all__ = ["UnrevokeCreateParams"]
 
 
 class UnrevokeCreateParams(TypedDict, total=False):
     account_id: Required[str]
 
-    body: Required[List[str]]
-    """A list of device ids to unrevoke."""
+    body: Required[SequenceNotStr[str]]
+    """A list of Registration IDs to unrevoke."""
diff --git a/src/cloudflare/types/zero_trust/devices/unrevoke_create_response.py b/src/cloudflare/types/zero_trust/devices/unrevoke_create_response.py
index 0abba62d03a..80dd27e6b84 100644
--- a/src/cloudflare/types/zero_trust/devices/unrevoke_create_response.py
+++ b/src/cloudflare/types/zero_trust/devices/unrevoke_create_response.py
@@ -1,7 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Union
+from typing_extensions import TypeAlias
 
 __all__ = ["UnrevokeCreateResponse"]
 
-UnrevokeCreateResponse = Union[Optional[str], Optional[object]]
+UnrevokeCreateResponse: TypeAlias = Union[str, object, None]
diff --git a/src/cloudflare/types/zero_trust/devices/workspace_one_input.py b/src/cloudflare/types/zero_trust/devices/workspace_one_input.py
index 4f532e33c1a..6e09aa59882 100644
--- a/src/cloudflare/types/zero_trust/devices/workspace_one_input.py
+++ b/src/cloudflare/types/zero_trust/devices/workspace_one_input.py
@@ -9,7 +9,7 @@
 
 class WorkspaceOneInput(BaseModel):
     compliance_status: Literal["compliant", "noncompliant", "unknown"]
-    """Compliance Status"""
+    """Compliance Status."""
 
     connection_id: str
     """Posture Integration ID."""
diff --git a/src/cloudflare/types/zero_trust/devices/workspace_one_input_param.py b/src/cloudflare/types/zero_trust/devices/workspace_one_input_param.py
index 1c82dfaf594..256e17e415d 100644
--- a/src/cloudflare/types/zero_trust/devices/workspace_one_input_param.py
+++ b/src/cloudflare/types/zero_trust/devices/workspace_one_input_param.py
@@ -9,7 +9,7 @@
 
 class WorkspaceOneInputParam(TypedDict, total=False):
     compliance_status: Required[Literal["compliant", "noncompliant", "unknown"]]
-    """Compliance Status"""
+    """Compliance Status."""
 
     connection_id: Required[str]
     """Posture Integration ID."""
diff --git a/src/cloudflare/types/zero_trust/dex/__init__.py b/src/cloudflare/types/zero_trust/dex/__init__.py
index efa573e206b..674d2cb7a06 100644
--- a/src/cloudflare/types/zero_trust/dex/__init__.py
+++ b/src/cloudflare/types/zero_trust/dex/__init__.py
@@ -8,13 +8,20 @@
 from .http_details import HTTPDetails as HTTPDetails
 from .colo_list_params import ColoListParams as ColoListParams
 from .test_list_params import TestListParams as TestListParams
-from .test_list_response import TestListResponse as TestListResponse
+from .colo_list_response import ColoListResponse as ColoListResponse
+from .command_list_params import CommandListParams as CommandListParams
 from .http_test_get_params import HTTPTestGetParams as HTTPTestGetParams
 from .aggregate_time_period import AggregateTimePeriod as AggregateTimePeriod
+from .command_create_params import CommandCreateParams as CommandCreateParams
+from .command_list_response import CommandListResponse as CommandListResponse
+from .command_create_response import CommandCreateResponse as CommandCreateResponse
 from .fleet_status_live_params import FleetStatusLiveParams as FleetStatusLiveParams
 from .fleet_status_live_response import FleetStatusLiveResponse as FleetStatusLiveResponse
 from .traceroute_test_get_params import TracerouteTestGetParams as TracerouteTestGetParams
+from .warp_change_event_get_params import WARPChangeEventGetParams as WARPChangeEventGetParams
 from .fleet_status_over_time_params import FleetStatusOverTimeParams as FleetStatusOverTimeParams
+from .warp_change_event_get_response import WARPChangeEventGetResponse as WARPChangeEventGetResponse
+from .fleet_status_over_time_response import FleetStatusOverTimeResponse as FleetStatusOverTimeResponse
 from .traceroute_test_percentiles_params import TracerouteTestPercentilesParams as TracerouteTestPercentilesParams
 from .traceroute_test_network_path_params import TracerouteTestNetworkPathParams as TracerouteTestNetworkPathParams
 from .traceroute_test_percentiles_response import TracerouteTestPercentilesResponse as TracerouteTestPercentilesResponse
diff --git a/src/cloudflare/types/zero_trust/dex/colo_list_params.py b/src/cloudflare/types/zero_trust/dex/colo_list_params.py
index 975e137ecac..c208fcae20f 100644
--- a/src/cloudflare/types/zero_trust/dex/colo_list_params.py
+++ b/src/cloudflare/types/zero_trust/dex/colo_list_params.py
@@ -13,10 +13,10 @@ class ColoListParams(TypedDict, total=False):
     account_id: Required[str]
 
     from_: Required[Annotated[str, PropertyInfo(alias="from")]]
-    """Start time for connection period in RFC3339 (ISO 8601) format."""
+    """Start time for connection period in ISO (RFC3339 - ISO 8601) format"""
 
     to: Required[str]
-    """End time for connection period in RFC3339 (ISO 8601) format."""
+    """End time for connection period in ISO (RFC3339 - ISO 8601) format"""
 
     sort_by: Annotated[Literal["fleet-status-usage", "application-tests-usage"], PropertyInfo(alias="sortBy")]
     """Type of usage that colos should be sorted by.
diff --git a/src/cloudflare/types/zero_trust/dex/colo_list_response.py b/src/cloudflare/types/zero_trust/dex/colo_list_response.py
new file mode 100644
index 00000000000..9f920358963
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dex/colo_list_response.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["ColoListResponse"]
+
+
+class ColoListResponse(BaseModel):
+    airport_code: str = FieldInfo(alias="airportCode")
+    """Airport code"""
+
+    city: str
+    """City"""
+
+    country_code: str = FieldInfo(alias="countryCode")
+    """Country code"""
diff --git a/src/cloudflare/types/zero_trust/dex/command_create_params.py b/src/cloudflare/types/zero_trust/dex/command_create_params.py
new file mode 100644
index 00000000000..cbab76ab1c1
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dex/command_create_params.py
@@ -0,0 +1,57 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import List, Iterable
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ...._utils import PropertyInfo
+
+__all__ = ["CommandCreateParams", "Command", "CommandCommandArgs"]
+
+
+class CommandCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    commands: Required[Iterable[Command]]
+    """List of device-level commands to execute"""
+
+
+class CommandCommandArgs(TypedDict, total=False):
+    interfaces: List[Literal["default", "tunnel"]]
+    """List of interfaces to capture packets on"""
+
+    max_file_size_mb: Annotated[float, PropertyInfo(alias="max-file-size-mb")]
+    """Maximum file size (in MB) for the capture file.
+
+    Specifies the maximum file size of the warp-diag zip artifact that can be
+    uploaded. If the zip artifact exceeds the specified max file size, it will NOT
+    be uploaded
+    """
+
+    packet_size_bytes: Annotated[float, PropertyInfo(alias="packet-size-bytes")]
+    """Maximum number of bytes to save for each packet"""
+
+    test_all_routes: Annotated[bool, PropertyInfo(alias="test-all-routes")]
+    """Test an IP address from all included or excluded ranges.
+
+    Tests an IP address from all included or excluded ranges. Essentially the same
+    as running 'route get <ip>'' and collecting the results. This option may
+    increase the time taken to collect the warp-diag
+    """
+
+    time_limit_min: Annotated[float, PropertyInfo(alias="time-limit-min")]
+    """Limit on capture duration (in minutes)"""
+
+
+class Command(TypedDict, total=False):
+    command_type: Required[Literal["pcap", "warp-diag"]]
+    """Type of command to execute on the device"""
+
+    device_id: Required[str]
+    """Unique identifier for the device"""
+
+    user_email: Required[str]
+    """Email tied to the device"""
+
+    command_args: CommandCommandArgs
diff --git a/src/cloudflare/types/zero_trust/dex/command_create_response.py b/src/cloudflare/types/zero_trust/dex/command_create_response.py
new file mode 100644
index 00000000000..e3a1e432678
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dex/command_create_response.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Dict, List, Optional
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["CommandCreateResponse", "Command"]
+
+
+class Command(BaseModel):
+    id: Optional[str] = None
+    """Unique identifier for the command"""
+
+    args: Optional[Dict[str, str]] = None
+    """Command arguments"""
+
+    device_id: Optional[str] = None
+    """Identifier for the device associated with the command"""
+
+    status: Optional[Literal["PENDING_EXEC", "PENDING_UPLOAD", "SUCCESS", "FAILED"]] = None
+    """Current status of the command"""
+
+    type: Optional[str] = None
+    """Type of the command (e.g., "pcap" or "warp-diag")"""
+
+
+class CommandCreateResponse(BaseModel):
+    commands: Optional[List[Command]] = None
+    """List of created commands"""
diff --git a/src/cloudflare/types/zero_trust/dex/command_list_params.py b/src/cloudflare/types/zero_trust/dex/command_list_params.py
new file mode 100644
index 00000000000..cbe58116f27
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dex/command_list_params.py
@@ -0,0 +1,39 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ...._utils import PropertyInfo
+
+__all__ = ["CommandListParams"]
+
+
+class CommandListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    page: Required[float]
+    """Page number for pagination"""
+
+    per_page: Required[float]
+    """Number of results per page"""
+
+    command_type: str
+    """Optionally filter executed commands by command type"""
+
+    device_id: str
+    """Unique identifier for a device"""
+
+    from_: Annotated[Union[str, datetime], PropertyInfo(alias="from", format="iso8601")]
+    """Start time for the query in ISO (RFC3339 - ISO 8601) format"""
+
+    status: Literal["PENDING_EXEC", "PENDING_UPLOAD", "SUCCESS", "FAILED"]
+    """Optionally filter executed commands by status"""
+
+    to: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    """End time for the query in ISO (RFC3339 - ISO 8601) format"""
+
+    user_email: str
+    """Email tied to the device"""
diff --git a/src/cloudflare/types/zero_trust/dex/command_list_response.py b/src/cloudflare/types/zero_trust/dex/command_list_response.py
new file mode 100644
index 00000000000..601cef906ce
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dex/command_list_response.py
@@ -0,0 +1,30 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["CommandListResponse", "Command"]
+
+
+class Command(BaseModel):
+    id: Optional[str] = None
+
+    completed_date: Optional[datetime] = None
+
+    created_date: Optional[datetime] = None
+
+    device_id: Optional[str] = None
+
+    filename: Optional[str] = None
+
+    status: Optional[str] = None
+
+    type: Optional[str] = None
+
+    user_email: Optional[str] = None
+
+
+class CommandListResponse(BaseModel):
+    commands: Optional[List[Command]] = None
diff --git a/src/cloudflare/types/zero_trust/dex/commands/__init__.py b/src/cloudflare/types/zero_trust/dex/commands/__init__.py
new file mode 100644
index 00000000000..325668bbdb3
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dex/commands/__init__.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .device_list_params import DeviceListParams as DeviceListParams
+from .quota_get_response import QuotaGetResponse as QuotaGetResponse
+from .device_list_response import DeviceListResponse as DeviceListResponse
diff --git a/src/cloudflare/types/zero_trust/dex/commands/device_list_params.py b/src/cloudflare/types/zero_trust/dex/commands/device_list_params.py
new file mode 100644
index 00000000000..126d1a8cb20
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dex/commands/device_list_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["DeviceListParams"]
+
+
+class DeviceListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    page: Required[float]
+    """Page number of paginated results"""
+
+    per_page: Required[float]
+    """Number of items per page"""
+
+    search: str
+    """Filter devices by name or email"""
diff --git a/src/cloudflare/types/zero_trust/dex/commands/device_list_response.py b/src/cloudflare/types/zero_trust/dex/commands/device_list_response.py
new file mode 100644
index 00000000000..0e85164ecb0
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dex/commands/device_list_response.py
@@ -0,0 +1,43 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = ["DeviceListResponse", "Device"]
+
+
+class Device(BaseModel):
+    device_id: Optional[str] = FieldInfo(alias="deviceId", default=None)
+    """Device identifier (UUID v4)"""
+
+    device_name: Optional[str] = FieldInfo(alias="deviceName", default=None)
+    """Device identifier (human readable)"""
+
+    eligible: Optional[bool] = None
+    """Whether the device is eligible for remote captures"""
+
+    ineligible_reason: Optional[str] = FieldInfo(alias="ineligibleReason", default=None)
+    """If the device is not eligible, the reason why."""
+
+    person_email: Optional[str] = FieldInfo(alias="personEmail", default=None)
+    """User contact email address"""
+
+    platform: Optional[str] = None
+    """Operating system"""
+
+    status: Optional[str] = None
+    """Network status"""
+
+    timestamp: Optional[str] = None
+    """Timestamp in ISO format"""
+
+    version: Optional[str] = None
+    """WARP client version"""
+
+
+class DeviceListResponse(BaseModel):
+    devices: Optional[List[Device]] = None
+    """List of eligible devices"""
diff --git a/src/cloudflare/types/zero_trust/dex/commands/quota_get_response.py b/src/cloudflare/types/zero_trust/dex/commands/quota_get_response.py
new file mode 100644
index 00000000000..df1cc7d0596
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dex/commands/quota_get_response.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from datetime import datetime
+
+from ....._models import BaseModel
+
+__all__ = ["QuotaGetResponse"]
+
+
+class QuotaGetResponse(BaseModel):
+    quota: float
+    """The remaining number of commands that can be initiated for an account"""
+
+    quota_usage: float
+    """The number of commands that have been initiated for an account"""
+
+    reset_time: datetime
+    """The time when the quota resets"""
diff --git a/src/cloudflare/types/zero_trust/dex/fleet_status/device_list_params.py b/src/cloudflare/types/zero_trust/dex/fleet_status/device_list_params.py
index f75de002a5a..d414a9c6826 100644
--- a/src/cloudflare/types/zero_trust/dex/fleet_status/device_list_params.py
+++ b/src/cloudflare/types/zero_trust/dex/fleet_status/device_list_params.py
@@ -13,24 +13,16 @@ class DeviceListParams(TypedDict, total=False):
     account_id: Required[str]
 
     from_: Required[Annotated[str, PropertyInfo(alias="from")]]
-    """Timestamp in ISO format"""
+    """Time range beginning in ISO format"""
 
     page: Required[float]
-    """Page number of paginated results"""
+    """Page number"""
 
     per_page: Required[float]
-    """Number of items per page"""
-
-    source: Required[Literal["last_seen", "hourly", "raw"]]
-    """Source:
-
-    - `hourly` - device details aggregated hourly, up to 7 days prior
-    - `last_seen` - device details, up to 24 hours prior
-    - `raw` - device details, up to 7 days prior
-    """
+    """Number of results per page"""
 
     to: Required[str]
-    """Timestamp in ISO format"""
+    """Time range end in ISO format"""
 
     colo: str
     """Cloudflare colo"""
@@ -47,6 +39,14 @@ class DeviceListParams(TypedDict, total=False):
     sort_by: Literal["colo", "device_id", "mode", "platform", "status", "timestamp", "version"]
     """Dimension to sort results by"""
 
+    source: Literal["last_seen", "hourly", "raw"]
+    """Source:
+
+    - `hourly` - device details aggregated hourly, up to 7 days prior
+    - `last_seen` - device details, up to 60 minutes prior
+    - `raw` - device details, up to 7 days prior
+    """
+
     status: str
     """Network status"""
 
diff --git a/src/cloudflare/types/zero_trust/dex/fleet_status/device_list_response.py b/src/cloudflare/types/zero_trust/dex/fleet_status/device_list_response.py
index 9d8697adeb4..2f6d85375c7 100644
--- a/src/cloudflare/types/zero_trust/dex/fleet_status/device_list_response.py
+++ b/src/cloudflare/types/zero_trust/dex/fleet_status/device_list_response.py
@@ -1,12 +1,184 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import List, Optional
 
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
 
-__all__ = ["DeviceListResponse"]
+__all__ = [
+    "DeviceListResponse",
+    "CPUPctByApp",
+    "DeviceIPV4",
+    "DeviceIPV4Location",
+    "DeviceIPV6",
+    "DeviceIPV6Location",
+    "GatewayIPV4",
+    "GatewayIPV4Location",
+    "GatewayIPV6",
+    "GatewayIPV6Location",
+    "ISPIPV4",
+    "ISPIPV4Location",
+    "ISPIPV6",
+    "ISPIPV6Location",
+    "RamUsedPctByApp",
+]
+
+
+class CPUPctByApp(BaseModel):
+    cpu_pct: Optional[float] = None
+
+    name: Optional[str] = None
+
+
+class DeviceIPV4Location(BaseModel):
+    city: Optional[str] = None
+
+    country_iso: Optional[str] = None
+
+    state_iso: Optional[str] = None
+
+    zip: Optional[str] = None
+
+
+class DeviceIPV4(BaseModel):
+    address: Optional[str] = None
+
+    asn: Optional[int] = None
+
+    aso: Optional[str] = None
+
+    location: Optional[DeviceIPV4Location] = None
+
+    netmask: Optional[str] = None
+
+    version: Optional[str] = None
+
+
+class DeviceIPV6Location(BaseModel):
+    city: Optional[str] = None
+
+    country_iso: Optional[str] = None
+
+    state_iso: Optional[str] = None
+
+    zip: Optional[str] = None
+
+
+class DeviceIPV6(BaseModel):
+    address: Optional[str] = None
+
+    asn: Optional[int] = None
+
+    aso: Optional[str] = None
+
+    location: Optional[DeviceIPV6Location] = None
+
+    netmask: Optional[str] = None
+
+    version: Optional[str] = None
+
+
+class GatewayIPV4Location(BaseModel):
+    city: Optional[str] = None
+
+    country_iso: Optional[str] = None
+
+    state_iso: Optional[str] = None
+
+    zip: Optional[str] = None
+
+
+class GatewayIPV4(BaseModel):
+    address: Optional[str] = None
+
+    asn: Optional[int] = None
+
+    aso: Optional[str] = None
+
+    location: Optional[GatewayIPV4Location] = None
+
+    netmask: Optional[str] = None
+
+    version: Optional[str] = None
+
+
+class GatewayIPV6Location(BaseModel):
+    city: Optional[str] = None
+
+    country_iso: Optional[str] = None
+
+    state_iso: Optional[str] = None
+
+    zip: Optional[str] = None
+
+
+class GatewayIPV6(BaseModel):
+    address: Optional[str] = None
+
+    asn: Optional[int] = None
+
+    aso: Optional[str] = None
+
+    location: Optional[GatewayIPV6Location] = None
+
+    netmask: Optional[str] = None
+
+    version: Optional[str] = None
+
+
+class ISPIPV4Location(BaseModel):
+    city: Optional[str] = None
+
+    country_iso: Optional[str] = None
+
+    state_iso: Optional[str] = None
+
+    zip: Optional[str] = None
+
+
+class ISPIPV4(BaseModel):
+    address: Optional[str] = None
+
+    asn: Optional[int] = None
+
+    aso: Optional[str] = None
+
+    location: Optional[ISPIPV4Location] = None
+
+    netmask: Optional[str] = None
+
+    version: Optional[str] = None
+
+
+class ISPIPV6Location(BaseModel):
+    city: Optional[str] = None
+
+    country_iso: Optional[str] = None
+
+    state_iso: Optional[str] = None
+
+    zip: Optional[str] = None
+
+
+class ISPIPV6(BaseModel):
+    address: Optional[str] = None
+
+    asn: Optional[int] = None
+
+    aso: Optional[str] = None
+
+    location: Optional[ISPIPV6Location] = None
+
+    netmask: Optional[str] = None
+
+    version: Optional[str] = None
+
+
+class RamUsedPctByApp(BaseModel):
+    name: Optional[str] = None
+
+    ram_used_pct: Optional[float] = None
 
 
 class DeviceListResponse(BaseModel):
@@ -16,17 +188,81 @@ class DeviceListResponse(BaseModel):
     device_id: str = FieldInfo(alias="deviceId")
     """Device identifier (UUID v4)"""
 
+    mode: str
+    """The mode under which the WARP client is run"""
+
     platform: str
     """Operating system"""
 
     status: str
     """Network status"""
 
+    timestamp: str
+    """Timestamp in ISO format"""
+
     version: str
     """WARP client version"""
 
+    always_on: Optional[bool] = FieldInfo(alias="alwaysOn", default=None)
+
+    battery_charging: Optional[bool] = FieldInfo(alias="batteryCharging", default=None)
+
+    battery_cycles: Optional[int] = FieldInfo(alias="batteryCycles", default=None)
+
+    battery_pct: Optional[float] = FieldInfo(alias="batteryPct", default=None)
+
+    connection_type: Optional[str] = FieldInfo(alias="connectionType", default=None)
+
+    cpu_pct: Optional[float] = FieldInfo(alias="cpuPct", default=None)
+
+    cpu_pct_by_app: Optional[List[List[CPUPctByApp]]] = FieldInfo(alias="cpuPctByApp", default=None)
+
+    device_ipv4: Optional[DeviceIPV4] = FieldInfo(alias="deviceIpv4", default=None)
+
+    device_ipv6: Optional[DeviceIPV6] = FieldInfo(alias="deviceIpv6", default=None)
+
     device_name: Optional[str] = FieldInfo(alias="deviceName", default=None)
     """Device identifier (human readable)"""
 
+    disk_read_bps: Optional[int] = FieldInfo(alias="diskReadBps", default=None)
+
+    disk_usage_pct: Optional[float] = FieldInfo(alias="diskUsagePct", default=None)
+
+    disk_write_bps: Optional[int] = FieldInfo(alias="diskWriteBps", default=None)
+
+    doh_subdomain: Optional[str] = FieldInfo(alias="dohSubdomain", default=None)
+
+    estimated_loss_pct: Optional[float] = FieldInfo(alias="estimatedLossPct", default=None)
+
+    firewall_enabled: Optional[bool] = FieldInfo(alias="firewallEnabled", default=None)
+
+    gateway_ipv4: Optional[GatewayIPV4] = FieldInfo(alias="gatewayIpv4", default=None)
+
+    gateway_ipv6: Optional[GatewayIPV6] = FieldInfo(alias="gatewayIpv6", default=None)
+
+    handshake_latency_ms: Optional[float] = FieldInfo(alias="handshakeLatencyMs", default=None)
+
+    isp_ipv4: Optional[ISPIPV4] = FieldInfo(alias="ispIpv4", default=None)
+
+    isp_ipv6: Optional[ISPIPV6] = FieldInfo(alias="ispIpv6", default=None)
+
+    metal: Optional[str] = None
+
+    network_rcvd_bps: Optional[int] = FieldInfo(alias="networkRcvdBps", default=None)
+
+    network_sent_bps: Optional[int] = FieldInfo(alias="networkSentBps", default=None)
+
+    network_ssid: Optional[str] = FieldInfo(alias="networkSsid", default=None)
+
     person_email: Optional[str] = FieldInfo(alias="personEmail", default=None)
     """User contact email address"""
+
+    ram_available_kb: Optional[int] = FieldInfo(alias="ramAvailableKb", default=None)
+
+    ram_used_pct: Optional[float] = FieldInfo(alias="ramUsedPct", default=None)
+
+    ram_used_pct_by_app: Optional[List[List[RamUsedPctByApp]]] = FieldInfo(alias="ramUsedPctByApp", default=None)
+
+    switch_locked: Optional[bool] = FieldInfo(alias="switchLocked", default=None)
+
+    wifi_strength_dbm: Optional[int] = FieldInfo(alias="wifiStrengthDbm", default=None)
diff --git a/src/cloudflare/types/zero_trust/dex/fleet_status_over_time_params.py b/src/cloudflare/types/zero_trust/dex/fleet_status_over_time_params.py
index 42bb856443c..662cf4e307c 100644
--- a/src/cloudflare/types/zero_trust/dex/fleet_status_over_time_params.py
+++ b/src/cloudflare/types/zero_trust/dex/fleet_status_over_time_params.py
@@ -13,10 +13,10 @@ class FleetStatusOverTimeParams(TypedDict, total=False):
     account_id: Required[str]
 
     from_: Required[Annotated[str, PropertyInfo(alias="from")]]
-    """Timestamp in ISO format"""
+    """Time range beginning in ISO format"""
 
     to: Required[str]
-    """Timestamp in ISO format"""
+    """Time range end in ISO format"""
 
     colo: str
     """Cloudflare colo"""
diff --git a/src/cloudflare/types/zero_trust/dex/fleet_status_over_time_response.py b/src/cloudflare/types/zero_trust/dex/fleet_status_over_time_response.py
new file mode 100644
index 00000000000..c7508a81750
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dex/fleet_status_over_time_response.py
@@ -0,0 +1,42 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = ["FleetStatusOverTimeResponse", "DeviceStats", "DeviceStatsByMode", "DeviceStatsByStatus"]
+
+
+class DeviceStatsByMode(BaseModel):
+    timestamp: Optional[str] = None
+    """Timestamp in ISO format"""
+
+    unique_devices_total: Optional[float] = FieldInfo(alias="uniqueDevicesTotal", default=None)
+    """Number of unique devices"""
+
+    value: Optional[str] = None
+
+
+class DeviceStatsByStatus(BaseModel):
+    timestamp: Optional[str] = None
+    """Timestamp in ISO format"""
+
+    unique_devices_total: Optional[float] = FieldInfo(alias="uniqueDevicesTotal", default=None)
+    """Number of unique devices"""
+
+    value: Optional[str] = None
+
+
+class DeviceStats(BaseModel):
+    by_mode: Optional[List[DeviceStatsByMode]] = FieldInfo(alias="byMode", default=None)
+
+    by_status: Optional[List[DeviceStatsByStatus]] = FieldInfo(alias="byStatus", default=None)
+
+    unique_devices_total: Optional[float] = FieldInfo(alias="uniqueDevicesTotal", default=None)
+    """Number of unique devices"""
+
+
+class FleetStatusOverTimeResponse(BaseModel):
+    device_stats: Optional[DeviceStats] = FieldInfo(alias="deviceStats", default=None)
diff --git a/src/cloudflare/types/zero_trust/dex/http_details.py b/src/cloudflare/types/zero_trust/dex/http_details.py
index a8f9463ddf0..ab4c28b811b 100644
--- a/src/cloudflare/types/zero_trust/dex/http_details.py
+++ b/src/cloudflare/types/zero_trust/dex/http_details.py
@@ -6,7 +6,7 @@
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
-from ..device_experience_monitor import DeviceExperienceMonitor
+from ..digital_experience_monitor import DigitalExperienceMonitor
 from .http_tests.test_stat_over_time import TestStatOverTime
 
 __all__ = [
@@ -135,6 +135,6 @@ class HTTPDetails(BaseModel):
     name: Optional[str] = None
     """The name of the HTTP synthetic application test"""
 
-    target_policies: Optional[List[DeviceExperienceMonitor]] = None
+    target_policies: Optional[List[DigitalExperienceMonitor]] = None
 
     targeted: Optional[bool] = None
diff --git a/src/cloudflare/types/zero_trust/dex/http_test_get_params.py b/src/cloudflare/types/zero_trust/dex/http_test_get_params.py
index dd57bbf6128..0ebbb588734 100644
--- a/src/cloudflare/types/zero_trust/dex/http_test_get_params.py
+++ b/src/cloudflare/types/zero_trust/dex/http_test_get_params.py
@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["HTTPTestGetParams"]
@@ -28,7 +28,7 @@ class HTTPTestGetParams(TypedDict, total=False):
     Cannot be used in combination with deviceId param.
     """
 
-    device_id: Annotated[List[str], PropertyInfo(alias="deviceId")]
+    device_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="deviceId")]
     """Optionally filter result stats to a specific device(s).
 
     Cannot be used in combination with colo param.
diff --git a/src/cloudflare/types/zero_trust/dex/http_tests/percentile_get_params.py b/src/cloudflare/types/zero_trust/dex/http_tests/percentile_get_params.py
index 78d1009603e..393e611ad5e 100644
--- a/src/cloudflare/types/zero_trust/dex/http_tests/percentile_get_params.py
+++ b/src/cloudflare/types/zero_trust/dex/http_tests/percentile_get_params.py
@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Required, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["PercentileGetParams"]
@@ -14,10 +14,10 @@ class PercentileGetParams(TypedDict, total=False):
     account_id: Required[str]
 
     from_: Required[Annotated[str, PropertyInfo(alias="from")]]
-    """Start time for aggregate metrics in ISO format"""
+    """Start time for the query in ISO (RFC3339 - ISO 8601) format"""
 
     to: Required[str]
-    """End time for aggregate metrics in ISO format"""
+    """End time for the query in ISO (RFC3339 - ISO 8601) format"""
 
     colo: str
     """Optionally filter result stats to a Cloudflare colo.
@@ -25,7 +25,7 @@ class PercentileGetParams(TypedDict, total=False):
     Cannot be used in combination with deviceId param.
     """
 
-    device_id: Annotated[List[str], PropertyInfo(alias="deviceId")]
+    device_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="deviceId")]
     """Optionally filter result stats to a specific device(s).
 
     Cannot be used in combination with colo param.
diff --git a/src/cloudflare/types/zero_trust/dex/test_list_params.py b/src/cloudflare/types/zero_trust/dex/test_list_params.py
index 73c1b985719..16b9c8f179f 100644
--- a/src/cloudflare/types/zero_trust/dex/test_list_params.py
+++ b/src/cloudflare/types/zero_trust/dex/test_list_params.py
@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import List
-from typing_extensions import Required, Annotated, TypedDict
+from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TestListParams"]
@@ -19,12 +19,15 @@ class TestListParams(TypedDict, total=False):
     Cannot be used in combination with deviceId param.
     """
 
-    device_id: Annotated[List[str], PropertyInfo(alias="deviceId")]
+    device_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="deviceId")]
     """Optionally filter result stats to a specific device(s).
 
     Cannot be used in combination with colo param.
     """
 
+    kind: Literal["http", "traceroute"]
+    """Filter by test type"""
+
     page: float
     """Page number of paginated results"""
 
diff --git a/src/cloudflare/types/zero_trust/dex/test_list_response.py b/src/cloudflare/types/zero_trust/dex/test_list_response.py
deleted file mode 100644
index 140ad36e45d..00000000000
--- a/src/cloudflare/types/zero_trust/dex/test_list_response.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from typing_extensions import Literal
-
-from ...._models import BaseModel
-from .tests.tests import Tests
-from ...shared.response_info import ResponseInfo
-
-__all__ = ["TestListResponse", "ResultInfo"]
-
-
-class ResultInfo(BaseModel):
-    count: Optional[float] = None
-    """Total number of results for the requested service"""
-
-    page: Optional[float] = None
-    """Current page within paginated list of results"""
-
-    per_page: Optional[float] = None
-    """Number of results per page of results"""
-
-    total_count: Optional[float] = None
-    """Total results available without any search parameters"""
-
-
-class TestListResponse(BaseModel):
-    __test__ = False
-    errors: List[ResponseInfo]
-
-    messages: List[ResponseInfo]
-
-    success: Literal[True]
-    """Whether the API call was successful"""
-
-    result: Optional[Tests] = None
-
-    result_info: Optional[ResultInfo] = None
diff --git a/src/cloudflare/types/zero_trust/dex/tests/tests.py b/src/cloudflare/types/zero_trust/dex/tests/tests.py
index 208a0f31c31..6e2a9b09e49 100644
--- a/src/cloudflare/types/zero_trust/dex/tests/tests.py
+++ b/src/cloudflare/types/zero_trust/dex/tests/tests.py
@@ -7,7 +7,7 @@
 
 from ....._models import BaseModel
 from ..aggregate_time_period import AggregateTimePeriod
-from ...device_experience_monitor import DeviceExperienceMonitor
+from ...digital_experience_monitor import DigitalExperienceMonitor
 
 __all__ = [
     "Tests",
@@ -238,7 +238,7 @@ class Test(BaseModel):
     method: Optional[str] = None
     """for HTTP, the method to use when running the test"""
 
-    target_policies: Optional[List[DeviceExperienceMonitor]] = None
+    target_policies: Optional[List[DigitalExperienceMonitor]] = None
 
     targeted: Optional[bool] = None
 
diff --git a/src/cloudflare/types/zero_trust/dex/tests/unique_device_list_params.py b/src/cloudflare/types/zero_trust/dex/tests/unique_device_list_params.py
index 922fbb1d55d..6aae8692406 100644
--- a/src/cloudflare/types/zero_trust/dex/tests/unique_device_list_params.py
+++ b/src/cloudflare/types/zero_trust/dex/tests/unique_device_list_params.py
@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Required, Annotated, TypedDict
 
+from ....._types import SequenceNotStr
 from ....._utils import PropertyInfo
 
 __all__ = ["UniqueDeviceListParams"]
@@ -13,7 +13,7 @@
 class UniqueDeviceListParams(TypedDict, total=False):
     account_id: Required[str]
 
-    device_id: Annotated[List[str], PropertyInfo(alias="deviceId")]
+    device_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="deviceId")]
     """Optionally filter result stats to a specific device(s).
 
     Cannot be used in combination with colo param.
diff --git a/src/cloudflare/types/zero_trust/dex/tests/unique_devices.py b/src/cloudflare/types/zero_trust/dex/tests/unique_devices.py
index 2b5472dbf8e..7c43e52888b 100644
--- a/src/cloudflare/types/zero_trust/dex/tests/unique_devices.py
+++ b/src/cloudflare/types/zero_trust/dex/tests/unique_devices.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from pydantic import Field as FieldInfo
 
 from ....._models import BaseModel
diff --git a/src/cloudflare/types/zero_trust/dex/traceroute.py b/src/cloudflare/types/zero_trust/dex/traceroute.py
index 3faa4dbcb9b..536fd47bc6f 100644
--- a/src/cloudflare/types/zero_trust/dex/traceroute.py
+++ b/src/cloudflare/types/zero_trust/dex/traceroute.py
@@ -6,7 +6,7 @@
 from pydantic import Field as FieldInfo
 
 from ...._models import BaseModel
-from ..device_experience_monitor import DeviceExperienceMonitor
+from ..digital_experience_monitor import DigitalExperienceMonitor
 from .http_tests.test_stat_over_time import TestStatOverTime
 
 __all__ = [
@@ -140,7 +140,7 @@ class Traceroute(BaseModel):
     name: str
     """The name of the Traceroute synthetic application test"""
 
-    target_policies: Optional[List[DeviceExperienceMonitor]] = None
+    target_policies: Optional[List[DigitalExperienceMonitor]] = None
 
     targeted: Optional[bool] = None
 
diff --git a/src/cloudflare/types/zero_trust/dex/traceroute_test_get_params.py b/src/cloudflare/types/zero_trust/dex/traceroute_test_get_params.py
index 54b4a51b5fb..912f057de27 100644
--- a/src/cloudflare/types/zero_trust/dex/traceroute_test_get_params.py
+++ b/src/cloudflare/types/zero_trust/dex/traceroute_test_get_params.py
@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TracerouteTestGetParams"]
@@ -28,7 +28,7 @@ class TracerouteTestGetParams(TypedDict, total=False):
     Cannot be used in combination with deviceId param.
     """
 
-    device_id: Annotated[List[str], PropertyInfo(alias="deviceId")]
+    device_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="deviceId")]
     """Optionally filter result stats to a specific device(s).
 
     Cannot be used in combination with colo param.
diff --git a/src/cloudflare/types/zero_trust/dex/traceroute_test_percentiles_params.py b/src/cloudflare/types/zero_trust/dex/traceroute_test_percentiles_params.py
index d6ada52d1d2..7c6a8511b34 100644
--- a/src/cloudflare/types/zero_trust/dex/traceroute_test_percentiles_params.py
+++ b/src/cloudflare/types/zero_trust/dex/traceroute_test_percentiles_params.py
@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Required, Annotated, TypedDict
 
+from ...._types import SequenceNotStr
 from ...._utils import PropertyInfo
 
 __all__ = ["TracerouteTestPercentilesParams"]
@@ -14,10 +14,10 @@ class TracerouteTestPercentilesParams(TypedDict, total=False):
     account_id: Required[str]
 
     from_: Required[Annotated[str, PropertyInfo(alias="from")]]
-    """Start time for aggregate metrics in ISO format"""
+    """Start time for the query in ISO (RFC3339 - ISO 8601) format"""
 
     to: Required[str]
-    """End time for aggregate metrics in ISO format"""
+    """End time for the query in ISO (RFC3339 - ISO 8601) format"""
 
     colo: str
     """Optionally filter result stats to a Cloudflare colo.
@@ -25,7 +25,7 @@ class TracerouteTestPercentilesParams(TypedDict, total=False):
     Cannot be used in combination with deviceId param.
     """
 
-    device_id: Annotated[List[str], PropertyInfo(alias="deviceId")]
+    device_id: Annotated[SequenceNotStr[str], PropertyInfo(alias="deviceId")]
     """Optionally filter result stats to a specific device(s).
 
     Cannot be used in combination with colo param.
diff --git a/src/cloudflare/types/zero_trust/dex/warp_change_event_get_params.py b/src/cloudflare/types/zero_trust/dex/warp_change_event_get_params.py
new file mode 100644
index 00000000000..33c691637a0
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dex/warp_change_event_get_params.py
@@ -0,0 +1,43 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ...._utils import PropertyInfo
+
+__all__ = ["WARPChangeEventGetParams"]
+
+
+class WARPChangeEventGetParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    from_: Required[Annotated[str, PropertyInfo(alias="from")]]
+    """Start time for the query in ISO (RFC3339 - ISO 8601) format"""
+
+    page: Required[float]
+    """Page number of paginated results"""
+
+    per_page: Required[float]
+    """Number of items per page"""
+
+    to: Required[str]
+    """End time for the query in ISO (RFC3339 - ISO 8601) format"""
+
+    account_name: str
+    """Filter events by account name."""
+
+    config_name: str
+    """Filter events by WARP configuration name changed from or to.
+
+    Applicable to type='config' events only.
+    """
+
+    sort_order: Literal["ASC", "DESC"]
+    """Sort response by event timestamp."""
+
+    toggle: Literal["on", "off"]
+    """Filter events by type toggle value. Applicable to type='toggle' events only."""
+
+    type: Literal["config", "toggle"]
+    """Filter events by type 'config' or 'toggle'"""
diff --git a/src/cloudflare/types/zero_trust/dex/warp_change_event_get_response.py b/src/cloudflare/types/zero_trust/dex/warp_change_event_get_response.py
new file mode 100644
index 00000000000..5341f285b73
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dex/warp_change_event_get_response.py
@@ -0,0 +1,102 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from typing_extensions import Literal, TypeAlias
+
+from pydantic import Field as FieldInfo
+
+from ...._models import BaseModel
+
+__all__ = [
+    "WARPChangeEventGetResponse",
+    "WARPChangeEventGetResponseItem",
+    "WARPChangeEventGetResponseItemDigitalExperienceMonitoringWARPToggleChangeEvent",
+    "WARPChangeEventGetResponseItemDigitalExperienceMonitoringWARPConfigChangeEvent",
+    "WARPChangeEventGetResponseItemDigitalExperienceMonitoringWARPConfigChangeEventFrom",
+    "WARPChangeEventGetResponseItemDigitalExperienceMonitoringWARPConfigChangeEventTo",
+]
+
+
+class WARPChangeEventGetResponseItemDigitalExperienceMonitoringWARPToggleChangeEvent(BaseModel):
+    account_name: Optional[str] = None
+    """The account name."""
+
+    account_tag: Optional[str] = None
+    """The public account identifier."""
+
+    device_id: Optional[str] = None
+    """API Resource UUID tag."""
+
+    device_registration: Optional[str] = None
+    """API Resource UUID tag."""
+
+    hostname: Optional[str] = None
+    """The hostname of the machine the event is from"""
+
+    serial_number: Optional[str] = None
+    """The serial number of the machine the event is from"""
+
+    timestamp: Optional[str] = None
+    """Timestamp in ISO format"""
+
+    toggle: Optional[Literal["on", "off"]] = None
+    """The state of the WARP toggle."""
+
+    user_email: Optional[str] = None
+    """Email tied to the device"""
+
+
+class WARPChangeEventGetResponseItemDigitalExperienceMonitoringWARPConfigChangeEventFrom(BaseModel):
+    account_name: Optional[str] = None
+    """The account name."""
+
+    account_tag: Optional[str] = None
+    """API Resource UUID tag."""
+
+    config_name: Optional[str] = None
+    """The name of the WARP configuration."""
+
+
+class WARPChangeEventGetResponseItemDigitalExperienceMonitoringWARPConfigChangeEventTo(BaseModel):
+    account_name: Optional[str] = None
+    """The account name."""
+
+    account_tag: Optional[str] = None
+    """API Resource UUID tag."""
+
+    config_name: Optional[str] = None
+    """The name of the WARP configuration."""
+
+
+class WARPChangeEventGetResponseItemDigitalExperienceMonitoringWARPConfigChangeEvent(BaseModel):
+    device_id: Optional[str] = None
+    """API Resource UUID tag."""
+
+    device_registration: Optional[str] = None
+    """API Resource UUID tag."""
+
+    from_: Optional[WARPChangeEventGetResponseItemDigitalExperienceMonitoringWARPConfigChangeEventFrom] = FieldInfo(
+        alias="from", default=None
+    )
+
+    hostname: Optional[str] = None
+    """The hostname of the machine the event is from"""
+
+    serial_number: Optional[str] = None
+    """The serial number of the machine the event is from"""
+
+    timestamp: Optional[str] = None
+    """Timestamp in ISO format"""
+
+    to: Optional[WARPChangeEventGetResponseItemDigitalExperienceMonitoringWARPConfigChangeEventTo] = None
+
+    user_email: Optional[str] = None
+    """Email tied to the device"""
+
+
+WARPChangeEventGetResponseItem: TypeAlias = Union[
+    WARPChangeEventGetResponseItemDigitalExperienceMonitoringWARPToggleChangeEvent,
+    WARPChangeEventGetResponseItemDigitalExperienceMonitoringWARPConfigChangeEvent,
+]
+
+WARPChangeEventGetResponse: TypeAlias = List[WARPChangeEventGetResponseItem]
diff --git a/src/cloudflare/types/zero_trust/digital_experience_monitor.py b/src/cloudflare/types/zero_trust/digital_experience_monitor.py
new file mode 100644
index 00000000000..4f9105218ce
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/digital_experience_monitor.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["DigitalExperienceMonitor"]
+
+
+class DigitalExperienceMonitor(BaseModel):
+    id: str
+    """API Resource UUID tag."""
+
+    default: bool
+    """Whether the policy is the default for the account"""
+
+    name: str
diff --git a/src/cloudflare/types/zero_trust/dlp/__init__.py b/src/cloudflare/types/zero_trust/dlp/__init__.py
index 15ad89dc639..1967c3f7f17 100644
--- a/src/cloudflare/types/zero_trust/dlp/__init__.py
+++ b/src/cloudflare/types/zero_trust/dlp/__init__.py
@@ -4,16 +4,26 @@
 
 from .dataset import Dataset as Dataset
 from .profile import Profile as Profile
-from .dataset_array import DatasetArray as DatasetArray
-from .dataset_creation import DatasetCreation as DatasetCreation
 from .context_awareness import ContextAwareness as ContextAwareness
+from .entry_get_response import EntryGetResponse as EntryGetResponse
 from .skip_configuration import SkipConfiguration as SkipConfiguration
+from .entry_create_params import EntryCreateParams as EntryCreateParams
+from .entry_list_response import EntryListResponse as EntryListResponse
+from .entry_update_params import EntryUpdateParams as EntryUpdateParams
+from .limit_list_response import LimitListResponse as LimitListResponse
+from .profile_list_params import ProfileListParams as ProfileListParams
+from .dataset_get_response import DatasetGetResponse as DatasetGetResponse
 from .profile_get_response import ProfileGetResponse as ProfileGetResponse
 from .dataset_create_params import DatasetCreateParams as DatasetCreateParams
 from .dataset_update_params import DatasetUpdateParams as DatasetUpdateParams
+from .entry_create_response import EntryCreateResponse as EntryCreateResponse
+from .entry_update_response import EntryUpdateResponse as EntryUpdateResponse
 from .context_awareness_param import ContextAwarenessParam as ContextAwarenessParam
+from .dataset_create_response import DatasetCreateResponse as DatasetCreateResponse
+from .dataset_update_response import DatasetUpdateResponse as DatasetUpdateResponse
 from .pattern_validate_params import PatternValidateParams as PatternValidateParams
 from .payload_log_get_response import PayloadLogGetResponse as PayloadLogGetResponse
 from .skip_configuration_param import SkipConfigurationParam as SkipConfigurationParam
+from .pattern_validate_response import PatternValidateResponse as PatternValidateResponse
 from .payload_log_update_params import PayloadLogUpdateParams as PayloadLogUpdateParams
 from .payload_log_update_response import PayloadLogUpdateResponse as PayloadLogUpdateResponse
diff --git a/src/cloudflare/types/zero_trust/dlp/context_awareness.py b/src/cloudflare/types/zero_trust/dlp/context_awareness.py
index 58ac38d0456..f1da130e553 100644
--- a/src/cloudflare/types/zero_trust/dlp/context_awareness.py
+++ b/src/cloudflare/types/zero_trust/dlp/context_awareness.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ...._models import BaseModel
 from .skip_configuration import SkipConfiguration
 
@@ -8,6 +7,10 @@
 
 
 class ContextAwareness(BaseModel):
+    """
+    Scan the context of predefined entries to only return matches surrounded by keywords.
+    """
+
     enabled: bool
     """
     If true, scan the context of predefined entries to only return matches
diff --git a/src/cloudflare/types/zero_trust/dlp/context_awareness_param.py b/src/cloudflare/types/zero_trust/dlp/context_awareness_param.py
index 9f9d92b1cc5..1e068a1075d 100644
--- a/src/cloudflare/types/zero_trust/dlp/context_awareness_param.py
+++ b/src/cloudflare/types/zero_trust/dlp/context_awareness_param.py
@@ -10,6 +10,10 @@
 
 
 class ContextAwarenessParam(TypedDict, total=False):
+    """
+    Scan the context of predefined entries to only return matches surrounded by keywords.
+    """
+
     enabled: Required[bool]
     """
     If true, scan the context of predefined entries to only return matches
diff --git a/src/cloudflare/types/zero_trust/dlp/dataset.py b/src/cloudflare/types/zero_trust/dlp/dataset.py
index 6654f6111af..61f0e00bd1f 100644
--- a/src/cloudflare/types/zero_trust/dlp/dataset.py
+++ b/src/cloudflare/types/zero_trust/dlp/dataset.py
@@ -6,13 +6,23 @@
 
 from ...._models import BaseModel
 
-__all__ = ["Dataset", "Upload"]
+__all__ = ["Dataset", "Column", "Upload"]
+
+
+class Column(BaseModel):
+    entry_id: str
+
+    header_name: str
+
+    num_cells: int
+
+    upload_status: Literal["empty", "uploading", "pending", "processing", "failed", "complete"]
 
 
 class Upload(BaseModel):
     num_cells: int
 
-    status: Literal["empty", "uploading", "failed", "complete"]
+    status: Literal["empty", "uploading", "pending", "processing", "failed", "complete"]
 
     version: int
 
@@ -20,18 +30,29 @@ class Upload(BaseModel):
 class Dataset(BaseModel):
     id: str
 
+    columns: List[Column]
+
     created_at: datetime
 
+    encoding_version: int
+
     name: str
 
     num_cells: int
 
     secret: bool
 
-    status: Literal["empty", "uploading", "failed", "complete"]
+    status: Literal["empty", "uploading", "pending", "processing", "failed", "complete"]
 
     updated_at: datetime
+    """Stores when the dataset was last updated.
+
+    This includes name or description changes as well as uploads.
+    """
 
     uploads: List[Upload]
 
+    case_sensitive: Optional[bool] = None
+
     description: Optional[str] = None
+    """The description of the dataset."""
diff --git a/src/cloudflare/types/zero_trust/dlp/dataset_array.py b/src/cloudflare/types/zero_trust/dlp/dataset_array.py
deleted file mode 100644
index c3ea24b0c36..00000000000
--- a/src/cloudflare/types/zero_trust/dlp/dataset_array.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .dataset import Dataset
-
-__all__ = ["DatasetArray"]
-
-DatasetArray = List[Dataset]
diff --git a/src/cloudflare/types/zero_trust/dlp/dataset_create_params.py b/src/cloudflare/types/zero_trust/dlp/dataset_create_params.py
index 2535c4a3120..ebf338df37d 100644
--- a/src/cloudflare/types/zero_trust/dlp/dataset_create_params.py
+++ b/src/cloudflare/types/zero_trust/dlp/dataset_create_params.py
@@ -13,7 +13,23 @@ class DatasetCreateParams(TypedDict, total=False):
 
     name: Required[str]
 
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if `secret` is true or undefined
+    """
+
     description: Optional[str]
+    """The description of the dataset."""
+
+    encoding_version: int
+    """Dataset encoding version
+
+    Non-secret custom word lists with no header are always version 1. Secret EDM
+    lists with no header are version 1. Multicolumn CSV with headers are version 2.
+    Omitting this field provides the default value 0, which is interpreted the same
+    as 1.
+    """
 
     secret: bool
     """Generate a secret dataset.
diff --git a/src/cloudflare/types/zero_trust/dlp/dataset_create_response.py b/src/cloudflare/types/zero_trust/dlp/dataset_create_response.py
new file mode 100644
index 00000000000..41c574f0e2d
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/dataset_create_response.py
@@ -0,0 +1,26 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from .dataset import Dataset
+from ...._models import BaseModel
+
+__all__ = ["DatasetCreateResponse"]
+
+
+class DatasetCreateResponse(BaseModel):
+    dataset: Dataset
+
+    encoding_version: int
+    """Encoding version to use for dataset."""
+
+    max_cells: int
+
+    version: int
+    """The version to use when uploading the dataset."""
+
+    secret: Optional[str] = None
+    """The secret to use for Exact Data Match datasets.
+
+    This is not present in Custom Wordlists.
+    """
diff --git a/src/cloudflare/types/zero_trust/dlp/dataset_creation.py b/src/cloudflare/types/zero_trust/dlp/dataset_creation.py
deleted file mode 100644
index c27598ed117..00000000000
--- a/src/cloudflare/types/zero_trust/dlp/dataset_creation.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from .dataset import Dataset
-from ...._models import BaseModel
-
-__all__ = ["DatasetCreation"]
-
-
-class DatasetCreation(BaseModel):
-    dataset: Dataset
-
-    max_cells: int
-
-    version: int
-    """The version to use when uploading the dataset."""
-
-    secret: Optional[str] = None
-    """The secret to use for Exact Data Match datasets.
-
-    This is not present in Custom Wordlists.
-    """
diff --git a/src/cloudflare/types/zero_trust/dlp/dataset_get_response.py b/src/cloudflare/types/zero_trust/dlp/dataset_get_response.py
new file mode 100644
index 00000000000..3d05e3ef4a3
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/dataset_get_response.py
@@ -0,0 +1,58 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["DatasetGetResponse", "Column", "Upload"]
+
+
+class Column(BaseModel):
+    entry_id: str
+
+    header_name: str
+
+    num_cells: int
+
+    upload_status: Literal["empty", "uploading", "pending", "processing", "failed", "complete"]
+
+
+class Upload(BaseModel):
+    num_cells: int
+
+    status: Literal["empty", "uploading", "pending", "processing", "failed", "complete"]
+
+    version: int
+
+
+class DatasetGetResponse(BaseModel):
+    id: str
+
+    columns: List[Column]
+
+    created_at: datetime
+
+    encoding_version: int
+
+    name: str
+
+    num_cells: int
+
+    secret: bool
+
+    status: Literal["empty", "uploading", "pending", "processing", "failed", "complete"]
+
+    updated_at: datetime
+    """Stores when the dataset was last updated.
+
+    This includes name or description changes as well as uploads.
+    """
+
+    uploads: List[Upload]
+
+    case_sensitive: Optional[bool] = None
+
+    description: Optional[str] = None
+    """The description of the dataset."""
diff --git a/src/cloudflare/types/zero_trust/dlp/dataset_update_params.py b/src/cloudflare/types/zero_trust/dlp/dataset_update_params.py
index 408bce393bb..e372f053cc5 100644
--- a/src/cloudflare/types/zero_trust/dlp/dataset_update_params.py
+++ b/src/cloudflare/types/zero_trust/dlp/dataset_update_params.py
@@ -11,6 +11,14 @@
 class DatasetUpdateParams(TypedDict, total=False):
     account_id: Required[str]
 
+    case_sensitive: bool
+    """Determines if the words should be matched in a case-sensitive manner.
+
+    Only required for custom word lists.
+    """
+
     description: Optional[str]
+    """The description of the dataset."""
 
     name: Optional[str]
+    """The name of the dataset, must be unique."""
diff --git a/src/cloudflare/types/zero_trust/dlp/dataset_update_response.py b/src/cloudflare/types/zero_trust/dlp/dataset_update_response.py
new file mode 100644
index 00000000000..04816f455dd
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/dataset_update_response.py
@@ -0,0 +1,58 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["DatasetUpdateResponse", "Column", "Upload"]
+
+
+class Column(BaseModel):
+    entry_id: str
+
+    header_name: str
+
+    num_cells: int
+
+    upload_status: Literal["empty", "uploading", "pending", "processing", "failed", "complete"]
+
+
+class Upload(BaseModel):
+    num_cells: int
+
+    status: Literal["empty", "uploading", "pending", "processing", "failed", "complete"]
+
+    version: int
+
+
+class DatasetUpdateResponse(BaseModel):
+    id: str
+
+    columns: List[Column]
+
+    created_at: datetime
+
+    encoding_version: int
+
+    name: str
+
+    num_cells: int
+
+    secret: bool
+
+    status: Literal["empty", "uploading", "pending", "processing", "failed", "complete"]
+
+    updated_at: datetime
+    """Stores when the dataset was last updated.
+
+    This includes name or description changes as well as uploads.
+    """
+
+    uploads: List[Upload]
+
+    case_sensitive: Optional[bool] = None
+
+    description: Optional[str] = None
+    """The description of the dataset."""
diff --git a/src/cloudflare/types/zero_trust/dlp/datasets/__init__.py b/src/cloudflare/types/zero_trust/dlp/datasets/__init__.py
index 05b90b2cbb8..bc1e3874a3a 100644
--- a/src/cloudflare/types/zero_trust/dlp/datasets/__init__.py
+++ b/src/cloudflare/types/zero_trust/dlp/datasets/__init__.py
@@ -2,5 +2,8 @@
 
 from __future__ import annotations
 
-from .new_version import NewVersion as NewVersion
 from .upload_edit_params import UploadEditParams as UploadEditParams
+from .upload_edit_response import UploadEditResponse as UploadEditResponse
+from .version_create_params import VersionCreateParams as VersionCreateParams
+from .upload_create_response import UploadCreateResponse as UploadCreateResponse
+from .version_create_response import VersionCreateResponse as VersionCreateResponse
diff --git a/src/cloudflare/types/zero_trust/dlp/datasets/new_version.py b/src/cloudflare/types/zero_trust/dlp/datasets/new_version.py
deleted file mode 100644
index fb8411a8cce..00000000000
--- a/src/cloudflare/types/zero_trust/dlp/datasets/new_version.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ....._models import BaseModel
-
-__all__ = ["NewVersion"]
-
-
-class NewVersion(BaseModel):
-    max_cells: int
-
-    version: int
-
-    secret: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/dlp/datasets/upload_create_response.py b/src/cloudflare/types/zero_trust/dlp/datasets/upload_create_response.py
new file mode 100644
index 00000000000..18728ec12d8
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/datasets/upload_create_response.py
@@ -0,0 +1,32 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ....._models import BaseModel
+
+__all__ = ["UploadCreateResponse", "Column"]
+
+
+class Column(BaseModel):
+    entry_id: str
+
+    header_name: str
+
+    num_cells: int
+
+    upload_status: Literal["empty", "uploading", "pending", "processing", "failed", "complete"]
+
+
+class UploadCreateResponse(BaseModel):
+    encoding_version: int
+
+    max_cells: int
+
+    version: int
+
+    case_sensitive: Optional[bool] = None
+
+    columns: Optional[List[Column]] = None
+
+    secret: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/dlp/datasets/upload_edit_params.py b/src/cloudflare/types/zero_trust/dlp/datasets/upload_edit_params.py
index 1a0500f09a4..d0dc07005e5 100644
--- a/src/cloudflare/types/zero_trust/dlp/datasets/upload_edit_params.py
+++ b/src/cloudflare/types/zero_trust/dlp/datasets/upload_edit_params.py
@@ -11,5 +11,3 @@ class UploadEditParams(TypedDict, total=False):
     account_id: Required[str]
 
     dataset_id: Required[str]
-
-    body: Required[str]
diff --git a/src/cloudflare/types/zero_trust/dlp/datasets/upload_edit_response.py b/src/cloudflare/types/zero_trust/dlp/datasets/upload_edit_response.py
new file mode 100644
index 00000000000..d61fc6dc4ac
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/datasets/upload_edit_response.py
@@ -0,0 +1,58 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ....._models import BaseModel
+
+__all__ = ["UploadEditResponse", "Column", "Upload"]
+
+
+class Column(BaseModel):
+    entry_id: str
+
+    header_name: str
+
+    num_cells: int
+
+    upload_status: Literal["empty", "uploading", "pending", "processing", "failed", "complete"]
+
+
+class Upload(BaseModel):
+    num_cells: int
+
+    status: Literal["empty", "uploading", "pending", "processing", "failed", "complete"]
+
+    version: int
+
+
+class UploadEditResponse(BaseModel):
+    id: str
+
+    columns: List[Column]
+
+    created_at: datetime
+
+    encoding_version: int
+
+    name: str
+
+    num_cells: int
+
+    secret: bool
+
+    status: Literal["empty", "uploading", "pending", "processing", "failed", "complete"]
+
+    updated_at: datetime
+    """Stores when the dataset was last updated.
+
+    This includes name or description changes as well as uploads.
+    """
+
+    uploads: List[Upload]
+
+    case_sensitive: Optional[bool] = None
+
+    description: Optional[str] = None
+    """The description of the dataset."""
diff --git a/src/cloudflare/types/zero_trust/dlp/datasets/version_create_params.py b/src/cloudflare/types/zero_trust/dlp/datasets/version_create_params.py
new file mode 100755
index 00000000000..f08ed008a8f
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/datasets/version_create_params.py
@@ -0,0 +1,35 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from typing_extensions import Required, TypeAlias, TypedDict
+
+__all__ = ["VersionCreateParams", "Body", "BodyExistingColumn", "BodyNewColumn"]
+
+
+class VersionCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    dataset_id: Required[str]
+
+    body: Required[Iterable[Body]]
+
+
+class BodyExistingColumn(TypedDict, total=False):
+    entry_id: Required[str]
+
+    header_name: str
+
+    num_cells: int
+
+
+class BodyNewColumn(TypedDict, total=False):
+    entry_name: Required[str]
+
+    header_name: str
+
+    num_cells: int
+
+
+Body: TypeAlias = Union[BodyExistingColumn, BodyNewColumn]
diff --git a/src/cloudflare/types/zero_trust/dlp/datasets/version_create_response.py b/src/cloudflare/types/zero_trust/dlp/datasets/version_create_response.py
new file mode 100755
index 00000000000..9b7eaed191e
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/datasets/version_create_response.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import Literal
+
+from ....._models import BaseModel
+
+__all__ = ["VersionCreateResponse"]
+
+
+class VersionCreateResponse(BaseModel):
+    entry_id: str
+
+    header_name: str
+
+    num_cells: int
+
+    upload_status: Literal["empty", "uploading", "pending", "processing", "failed", "complete"]
diff --git a/src/cloudflare/types/zero_trust/dlp/datasets/versions/__init__.py b/src/cloudflare/types/zero_trust/dlp/datasets/versions/__init__.py
new file mode 100755
index 00000000000..8e291f8ba06
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/datasets/versions/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .entry_create_params import EntryCreateParams as EntryCreateParams
+from .entry_create_response import EntryCreateResponse as EntryCreateResponse
diff --git a/src/cloudflare/types/zero_trust/dlp/datasets/versions/entry_create_params.py b/src/cloudflare/types/zero_trust/dlp/datasets/versions/entry_create_params.py
new file mode 100755
index 00000000000..cee7c6bbd09
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/datasets/versions/entry_create_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["EntryCreateParams"]
+
+
+class EntryCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    dataset_id: Required[str]
+
+    version: Required[int]
diff --git a/src/cloudflare/types/zero_trust/dlp/datasets/versions/entry_create_response.py b/src/cloudflare/types/zero_trust/dlp/datasets/versions/entry_create_response.py
new file mode 100755
index 00000000000..137d2d89d0e
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/datasets/versions/entry_create_response.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import Literal
+
+from ......_models import BaseModel
+
+__all__ = ["EntryCreateResponse"]
+
+
+class EntryCreateResponse(BaseModel):
+    entry_id: str
+
+    header_name: str
+
+    num_cells: int
+
+    upload_status: Literal["empty", "uploading", "pending", "processing", "failed", "complete"]
diff --git a/src/cloudflare/types/zero_trust/dlp/email/__init__.py b/src/cloudflare/types/zero_trust/dlp/email/__init__.py
new file mode 100644
index 00000000000..d6f82bc8871
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/email/__init__.py
@@ -0,0 +1,16 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .rule_get_response import RuleGetResponse as RuleGetResponse
+from .rule_create_params import RuleCreateParams as RuleCreateParams
+from .rule_list_response import RuleListResponse as RuleListResponse
+from .rule_update_params import RuleUpdateParams as RuleUpdateParams
+from .rule_create_response import RuleCreateResponse as RuleCreateResponse
+from .rule_delete_response import RuleDeleteResponse as RuleDeleteResponse
+from .rule_update_response import RuleUpdateResponse as RuleUpdateResponse
+from .rule_bulk_edit_params import RuleBulkEditParams as RuleBulkEditParams
+from .rule_bulk_edit_response import RuleBulkEditResponse as RuleBulkEditResponse
+from .account_mapping_get_response import AccountMappingGetResponse as AccountMappingGetResponse
+from .account_mapping_create_params import AccountMappingCreateParams as AccountMappingCreateParams
+from .account_mapping_create_response import AccountMappingCreateResponse as AccountMappingCreateResponse
diff --git a/src/cloudflare/types/zero_trust/dlp/email/account_mapping_create_params.py b/src/cloudflare/types/zero_trust/dlp/email/account_mapping_create_params.py
new file mode 100644
index 00000000000..a45d1167bd9
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/email/account_mapping_create_params.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from ....._types import SequenceNotStr
+
+__all__ = ["AccountMappingCreateParams", "AuthRequirements", "AuthRequirementsUnionMember0", "AuthRequirementsType"]
+
+
+class AccountMappingCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    auth_requirements: Required[AuthRequirements]
+
+
+class AuthRequirementsUnionMember0(TypedDict, total=False):
+    allowed_microsoft_organizations: Required[SequenceNotStr[str]]
+
+    type: Required[Literal["Org"]]
+
+
+class AuthRequirementsType(TypedDict, total=False):
+    type: Required[Literal["NoAuth"]]
+
+
+AuthRequirements: TypeAlias = Union[AuthRequirementsUnionMember0, AuthRequirementsType]
diff --git a/src/cloudflare/types/zero_trust/dlp/email/account_mapping_create_response.py b/src/cloudflare/types/zero_trust/dlp/email/account_mapping_create_response.py
new file mode 100644
index 00000000000..5be7c141a7d
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/email/account_mapping_create_response.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union
+from typing_extensions import Literal, TypeAlias
+
+from ....._models import BaseModel
+
+__all__ = ["AccountMappingCreateResponse", "AuthRequirements", "AuthRequirementsUnionMember0", "AuthRequirementsType"]
+
+
+class AuthRequirementsUnionMember0(BaseModel):
+    allowed_microsoft_organizations: List[str]
+
+    type: Literal["Org"]
+
+
+class AuthRequirementsType(BaseModel):
+    type: Literal["NoAuth"]
+
+
+AuthRequirements: TypeAlias = Union[AuthRequirementsUnionMember0, AuthRequirementsType]
+
+
+class AccountMappingCreateResponse(BaseModel):
+    addin_identifier_token: str
+
+    auth_requirements: AuthRequirements
diff --git a/src/cloudflare/types/zero_trust/dlp/email/account_mapping_get_response.py b/src/cloudflare/types/zero_trust/dlp/email/account_mapping_get_response.py
new file mode 100644
index 00000000000..2b3be1a1c92
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/email/account_mapping_get_response.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union
+from typing_extensions import Literal, TypeAlias
+
+from ....._models import BaseModel
+
+__all__ = ["AccountMappingGetResponse", "AuthRequirements", "AuthRequirementsUnionMember0", "AuthRequirementsType"]
+
+
+class AuthRequirementsUnionMember0(BaseModel):
+    allowed_microsoft_organizations: List[str]
+
+    type: Literal["Org"]
+
+
+class AuthRequirementsType(BaseModel):
+    type: Literal["NoAuth"]
+
+
+AuthRequirements: TypeAlias = Union[AuthRequirementsUnionMember0, AuthRequirementsType]
+
+
+class AccountMappingGetResponse(BaseModel):
+    addin_identifier_token: str
+
+    auth_requirements: AuthRequirements
diff --git a/src/cloudflare/types/zero_trust/dlp/email/rule_bulk_edit_params.py b/src/cloudflare/types/zero_trust/dlp/email/rule_bulk_edit_params.py
new file mode 100644
index 00000000000..bd76fa7aa29
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/email/rule_bulk_edit_params.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Dict
+from typing_extensions import Required, TypedDict
+
+__all__ = ["RuleBulkEditParams"]
+
+
+class RuleBulkEditParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    new_priorities: Required[Dict[str, int]]
diff --git a/src/cloudflare/types/zero_trust/dlp/email/rule_bulk_edit_response.py b/src/cloudflare/types/zero_trust/dlp/email/rule_bulk_edit_response.py
new file mode 100644
index 00000000000..3d34a86a60d
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/email/rule_bulk_edit_response.py
@@ -0,0 +1,44 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ....._models import BaseModel
+
+__all__ = ["RuleBulkEditResponse", "Action", "Condition"]
+
+
+class Action(BaseModel):
+    action: Literal["Block"]
+
+    message: Optional[str] = None
+
+
+class Condition(BaseModel):
+    operator: Literal["InList", "NotInList", "MatchRegex", "NotMatchRegex"]
+
+    selector: Literal["Recipients", "Sender", "DLPProfiles"]
+
+    value: Union[List[str], str]
+
+
+class RuleBulkEditResponse(BaseModel):
+    action: Action
+
+    conditions: List[Condition]
+    """Triggered if all conditions match."""
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    priority: int
+
+    rule_id: str
+
+    updated_at: datetime
+
+    description: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/dlp/email/rule_create_params.py b/src/cloudflare/types/zero_trust/dlp/email/rule_create_params.py
new file mode 100644
index 00000000000..0da93ecb30f
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/email/rule_create_params.py
@@ -0,0 +1,39 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable, Optional
+from typing_extensions import Literal, Required, TypedDict
+
+from ....._types import SequenceNotStr
+
+__all__ = ["RuleCreateParams", "Action", "Condition"]
+
+
+class RuleCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    action: Required[Action]
+
+    conditions: Required[Iterable[Condition]]
+    """Triggered if all conditions match."""
+
+    enabled: Required[bool]
+
+    name: Required[str]
+
+    description: Optional[str]
+
+
+class Action(TypedDict, total=False):
+    action: Required[Literal["Block"]]
+
+    message: Optional[str]
+
+
+class Condition(TypedDict, total=False):
+    operator: Required[Literal["InList", "NotInList", "MatchRegex", "NotMatchRegex"]]
+
+    selector: Required[Literal["Recipients", "Sender", "DLPProfiles"]]
+
+    value: Required[Union[SequenceNotStr[str], str]]
diff --git a/src/cloudflare/types/zero_trust/dlp/email/rule_create_response.py b/src/cloudflare/types/zero_trust/dlp/email/rule_create_response.py
new file mode 100644
index 00000000000..8437b7b7bde
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/email/rule_create_response.py
@@ -0,0 +1,44 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ....._models import BaseModel
+
+__all__ = ["RuleCreateResponse", "Action", "Condition"]
+
+
+class Action(BaseModel):
+    action: Literal["Block"]
+
+    message: Optional[str] = None
+
+
+class Condition(BaseModel):
+    operator: Literal["InList", "NotInList", "MatchRegex", "NotMatchRegex"]
+
+    selector: Literal["Recipients", "Sender", "DLPProfiles"]
+
+    value: Union[List[str], str]
+
+
+class RuleCreateResponse(BaseModel):
+    action: Action
+
+    conditions: List[Condition]
+    """Triggered if all conditions match."""
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    priority: int
+
+    rule_id: str
+
+    updated_at: datetime
+
+    description: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/dlp/email/rule_delete_response.py b/src/cloudflare/types/zero_trust/dlp/email/rule_delete_response.py
new file mode 100644
index 00000000000..58faf153704
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/email/rule_delete_response.py
@@ -0,0 +1,44 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ....._models import BaseModel
+
+__all__ = ["RuleDeleteResponse", "Action", "Condition"]
+
+
+class Action(BaseModel):
+    action: Literal["Block"]
+
+    message: Optional[str] = None
+
+
+class Condition(BaseModel):
+    operator: Literal["InList", "NotInList", "MatchRegex", "NotMatchRegex"]
+
+    selector: Literal["Recipients", "Sender", "DLPProfiles"]
+
+    value: Union[List[str], str]
+
+
+class RuleDeleteResponse(BaseModel):
+    action: Action
+
+    conditions: List[Condition]
+    """Triggered if all conditions match."""
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    priority: int
+
+    rule_id: str
+
+    updated_at: datetime
+
+    description: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/dlp/email/rule_get_response.py b/src/cloudflare/types/zero_trust/dlp/email/rule_get_response.py
new file mode 100644
index 00000000000..76c6f17eabe
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/email/rule_get_response.py
@@ -0,0 +1,44 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ....._models import BaseModel
+
+__all__ = ["RuleGetResponse", "Action", "Condition"]
+
+
+class Action(BaseModel):
+    action: Literal["Block"]
+
+    message: Optional[str] = None
+
+
+class Condition(BaseModel):
+    operator: Literal["InList", "NotInList", "MatchRegex", "NotMatchRegex"]
+
+    selector: Literal["Recipients", "Sender", "DLPProfiles"]
+
+    value: Union[List[str], str]
+
+
+class RuleGetResponse(BaseModel):
+    action: Action
+
+    conditions: List[Condition]
+    """Triggered if all conditions match."""
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    priority: int
+
+    rule_id: str
+
+    updated_at: datetime
+
+    description: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/dlp/email/rule_list_response.py b/src/cloudflare/types/zero_trust/dlp/email/rule_list_response.py
new file mode 100644
index 00000000000..1c0cca9080b
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/email/rule_list_response.py
@@ -0,0 +1,44 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ....._models import BaseModel
+
+__all__ = ["RuleListResponse", "Action", "Condition"]
+
+
+class Action(BaseModel):
+    action: Literal["Block"]
+
+    message: Optional[str] = None
+
+
+class Condition(BaseModel):
+    operator: Literal["InList", "NotInList", "MatchRegex", "NotMatchRegex"]
+
+    selector: Literal["Recipients", "Sender", "DLPProfiles"]
+
+    value: Union[List[str], str]
+
+
+class RuleListResponse(BaseModel):
+    action: Action
+
+    conditions: List[Condition]
+    """Triggered if all conditions match."""
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    priority: int
+
+    rule_id: str
+
+    updated_at: datetime
+
+    description: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/dlp/email/rule_update_params.py b/src/cloudflare/types/zero_trust/dlp/email/rule_update_params.py
new file mode 100644
index 00000000000..8f0da8d978b
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/email/rule_update_params.py
@@ -0,0 +1,39 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable, Optional
+from typing_extensions import Literal, Required, TypedDict
+
+from ....._types import SequenceNotStr
+
+__all__ = ["RuleUpdateParams", "Action", "Condition"]
+
+
+class RuleUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    action: Required[Action]
+
+    conditions: Required[Iterable[Condition]]
+    """Triggered if all conditions match."""
+
+    enabled: Required[bool]
+
+    name: Required[str]
+
+    description: Optional[str]
+
+
+class Action(TypedDict, total=False):
+    action: Required[Literal["Block"]]
+
+    message: Optional[str]
+
+
+class Condition(TypedDict, total=False):
+    operator: Required[Literal["InList", "NotInList", "MatchRegex", "NotMatchRegex"]]
+
+    selector: Required[Literal["Recipients", "Sender", "DLPProfiles"]]
+
+    value: Required[Union[SequenceNotStr[str], str]]
diff --git a/src/cloudflare/types/zero_trust/dlp/email/rule_update_response.py b/src/cloudflare/types/zero_trust/dlp/email/rule_update_response.py
new file mode 100644
index 00000000000..278dad6fe8d
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/email/rule_update_response.py
@@ -0,0 +1,44 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ....._models import BaseModel
+
+__all__ = ["RuleUpdateResponse", "Action", "Condition"]
+
+
+class Action(BaseModel):
+    action: Literal["Block"]
+
+    message: Optional[str] = None
+
+
+class Condition(BaseModel):
+    operator: Literal["InList", "NotInList", "MatchRegex", "NotMatchRegex"]
+
+    selector: Literal["Recipients", "Sender", "DLPProfiles"]
+
+    value: Union[List[str], str]
+
+
+class RuleUpdateResponse(BaseModel):
+    action: Action
+
+    conditions: List[Condition]
+    """Triggered if all conditions match."""
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    priority: int
+
+    rule_id: str
+
+    updated_at: datetime
+
+    description: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/__init__.py b/src/cloudflare/types/zero_trust/dlp/entries/__init__.py
new file mode 100644
index 00000000000..f24946eda4c
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/__init__.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .custom_get_response import CustomGetResponse as CustomGetResponse
+from .custom_create_params import CustomCreateParams as CustomCreateParams
+from .custom_list_response import CustomListResponse as CustomListResponse
+from .custom_update_params import CustomUpdateParams as CustomUpdateParams
+from .custom_create_response import CustomCreateResponse as CustomCreateResponse
+from .custom_update_response import CustomUpdateResponse as CustomUpdateResponse
+from .predefined_get_response import PredefinedGetResponse as PredefinedGetResponse
+from .integration_get_response import IntegrationGetResponse as IntegrationGetResponse
+from .predefined_create_params import PredefinedCreateParams as PredefinedCreateParams
+from .predefined_list_response import PredefinedListResponse as PredefinedListResponse
+from .predefined_update_params import PredefinedUpdateParams as PredefinedUpdateParams
+from .integration_create_params import IntegrationCreateParams as IntegrationCreateParams
+from .integration_list_response import IntegrationListResponse as IntegrationListResponse
+from .integration_update_params import IntegrationUpdateParams as IntegrationUpdateParams
+from .predefined_create_response import PredefinedCreateResponse as PredefinedCreateResponse
+from .predefined_update_response import PredefinedUpdateResponse as PredefinedUpdateResponse
+from .integration_create_response import IntegrationCreateResponse as IntegrationCreateResponse
+from .integration_update_response import IntegrationUpdateResponse as IntegrationUpdateResponse
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/custom_create_params.py b/src/cloudflare/types/zero_trust/dlp/entries/custom_create_params.py
new file mode 100644
index 00000000000..c96b0eaf370
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/custom_create_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ..profiles.pattern_param import PatternParam
+
+__all__ = ["CustomCreateParams"]
+
+
+class CustomCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    enabled: Required[bool]
+
+    name: Required[str]
+
+    pattern: Required[PatternParam]
+
+    profile_id: str
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/custom_create_response.py b/src/cloudflare/types/zero_trust/dlp/entries/custom_create_response.py
new file mode 100644
index 00000000000..5a695cc08f1
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/custom_create_response.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ....._models import BaseModel
+from ..profiles.pattern import Pattern
+
+__all__ = ["CustomCreateResponse"]
+
+
+class CustomCreateResponse(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/custom_get_response.py b/src/cloudflare/types/zero_trust/dlp/entries/custom_get_response.py
new file mode 100644
index 00000000000..d7357683446
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/custom_get_response.py
@@ -0,0 +1,224 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ....._models import BaseModel
+from ..profiles.pattern import Pattern
+
+__all__ = [
+    "CustomGetResponse",
+    "UnionMember0",
+    "UnionMember0Profile",
+    "UnionMember1",
+    "UnionMember1Confidence",
+    "UnionMember1Profile",
+    "UnionMember1Variant",
+    "UnionMember2",
+    "UnionMember2Profile",
+    "UnionMember3",
+    "UnionMember3Profile",
+    "UnionMember4",
+    "UnionMember4Profile",
+    "UnionMember5",
+    "UnionMember5Profile",
+]
+
+
+class UnionMember0Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember0(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+    profiles: Optional[List[UnionMember0Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class UnionMember1Confidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class UnionMember1Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember1Variant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class UnionMember1(BaseModel):
+    id: str
+
+    confidence: UnionMember1Confidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    profiles: Optional[List[UnionMember1Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+    variant: Optional[UnionMember1Variant] = None
+
+
+class UnionMember2Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember2(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+    profiles: Optional[List[UnionMember2Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class UnionMember3Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember3(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+    profiles: Optional[List[UnionMember3Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class UnionMember4Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember4(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+    profiles: Optional[List[UnionMember4Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class UnionMember5Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember5(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+    profiles: Optional[List[UnionMember5Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+CustomGetResponse: TypeAlias = Union[UnionMember0, UnionMember1, UnionMember2, UnionMember3, UnionMember4, UnionMember5]
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/custom_list_response.py b/src/cloudflare/types/zero_trust/dlp/entries/custom_list_response.py
new file mode 100644
index 00000000000..47f4b0a4d6d
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/custom_list_response.py
@@ -0,0 +1,160 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ....._models import BaseModel
+from ..profiles.pattern import Pattern
+
+__all__ = [
+    "CustomListResponse",
+    "CustomEntry",
+    "PredefinedEntry",
+    "PredefinedEntryConfidence",
+    "PredefinedEntryVariant",
+    "IntegrationEntry",
+    "ExactDataEntry",
+    "DocumentFingerprintEntry",
+    "WordListEntry",
+]
+
+
+class CustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class PredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class PredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class PredefinedEntry(BaseModel):
+    id: str
+
+    confidence: PredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+    variant: Optional[PredefinedEntryVariant] = None
+
+
+class IntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class ExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class DocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class WordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+CustomListResponse: TypeAlias = Union[
+    CustomEntry, PredefinedEntry, IntegrationEntry, ExactDataEntry, DocumentFingerprintEntry, WordListEntry
+]
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/custom_update_params.py b/src/cloudflare/types/zero_trust/dlp/entries/custom_update_params.py
new file mode 100644
index 00000000000..c773958695b
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/custom_update_params.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from ..profiles.pattern_param import PatternParam
+
+__all__ = ["CustomUpdateParams"]
+
+
+class CustomUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    enabled: Required[bool]
+
+    name: Required[str]
+
+    pattern: Required[PatternParam]
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/custom_update_response.py b/src/cloudflare/types/zero_trust/dlp/entries/custom_update_response.py
new file mode 100644
index 00000000000..6aa076e2a4e
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/custom_update_response.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ....._models import BaseModel
+from ..profiles.pattern import Pattern
+
+__all__ = ["CustomUpdateResponse"]
+
+
+class CustomUpdateResponse(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/integration_create_params.py b/src/cloudflare/types/zero_trust/dlp/entries/integration_create_params.py
new file mode 100644
index 00000000000..ad70062920b
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/integration_create_params.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Required, TypedDict
+
+__all__ = ["IntegrationCreateParams"]
+
+
+class IntegrationCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    enabled: Required[bool]
+
+    entry_id: Required[str]
+
+    profile_id: Optional[str]
+    """
+    This field is not used as the owning profile. For predefined entries it is
+    already set to a predefined profile.
+    """
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/integration_create_response.py b/src/cloudflare/types/zero_trust/dlp/entries/integration_create_response.py
new file mode 100644
index 00000000000..1ee434ffa96
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/integration_create_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ....._models import BaseModel
+
+__all__ = ["IntegrationCreateResponse"]
+
+
+class IntegrationCreateResponse(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/integration_get_response.py b/src/cloudflare/types/zero_trust/dlp/entries/integration_get_response.py
new file mode 100644
index 00000000000..2448e69c5d3
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/integration_get_response.py
@@ -0,0 +1,226 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ....._models import BaseModel
+from ..profiles.pattern import Pattern
+
+__all__ = [
+    "IntegrationGetResponse",
+    "UnionMember0",
+    "UnionMember0Profile",
+    "UnionMember1",
+    "UnionMember1Confidence",
+    "UnionMember1Profile",
+    "UnionMember1Variant",
+    "UnionMember2",
+    "UnionMember2Profile",
+    "UnionMember3",
+    "UnionMember3Profile",
+    "UnionMember4",
+    "UnionMember4Profile",
+    "UnionMember5",
+    "UnionMember5Profile",
+]
+
+
+class UnionMember0Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember0(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+    profiles: Optional[List[UnionMember0Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class UnionMember1Confidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class UnionMember1Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember1Variant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class UnionMember1(BaseModel):
+    id: str
+
+    confidence: UnionMember1Confidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    profiles: Optional[List[UnionMember1Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+    variant: Optional[UnionMember1Variant] = None
+
+
+class UnionMember2Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember2(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+    profiles: Optional[List[UnionMember2Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class UnionMember3Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember3(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+    profiles: Optional[List[UnionMember3Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class UnionMember4Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember4(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+    profiles: Optional[List[UnionMember4Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class UnionMember5Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember5(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+    profiles: Optional[List[UnionMember5Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+IntegrationGetResponse: TypeAlias = Union[
+    UnionMember0, UnionMember1, UnionMember2, UnionMember3, UnionMember4, UnionMember5
+]
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/integration_list_response.py b/src/cloudflare/types/zero_trust/dlp/entries/integration_list_response.py
new file mode 100644
index 00000000000..ec1f81c4592
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/integration_list_response.py
@@ -0,0 +1,160 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ....._models import BaseModel
+from ..profiles.pattern import Pattern
+
+__all__ = [
+    "IntegrationListResponse",
+    "CustomEntry",
+    "PredefinedEntry",
+    "PredefinedEntryConfidence",
+    "PredefinedEntryVariant",
+    "IntegrationEntry",
+    "ExactDataEntry",
+    "DocumentFingerprintEntry",
+    "WordListEntry",
+]
+
+
+class CustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class PredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class PredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class PredefinedEntry(BaseModel):
+    id: str
+
+    confidence: PredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+    variant: Optional[PredefinedEntryVariant] = None
+
+
+class IntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class ExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class DocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class WordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+IntegrationListResponse: TypeAlias = Union[
+    CustomEntry, PredefinedEntry, IntegrationEntry, ExactDataEntry, DocumentFingerprintEntry, WordListEntry
+]
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/integration_update_params.py b/src/cloudflare/types/zero_trust/dlp/entries/integration_update_params.py
new file mode 100644
index 00000000000..a17458b6ae0
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/integration_update_params.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["IntegrationUpdateParams"]
+
+
+class IntegrationUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    enabled: Required[bool]
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/integration_update_response.py b/src/cloudflare/types/zero_trust/dlp/entries/integration_update_response.py
new file mode 100644
index 00000000000..757686d7058
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/integration_update_response.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ....._models import BaseModel
+
+__all__ = ["IntegrationUpdateResponse"]
+
+
+class IntegrationUpdateResponse(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/predefined_create_params.py b/src/cloudflare/types/zero_trust/dlp/entries/predefined_create_params.py
new file mode 100644
index 00000000000..92446899f90
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/predefined_create_params.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing_extensions import Required, TypedDict
+
+__all__ = ["PredefinedCreateParams"]
+
+
+class PredefinedCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    enabled: Required[bool]
+
+    entry_id: Required[str]
+
+    profile_id: Optional[str]
+    """
+    This field is not used as the owning profile. For predefined entries it is
+    already set to a predefined profile.
+    """
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/predefined_create_response.py b/src/cloudflare/types/zero_trust/dlp/entries/predefined_create_response.py
new file mode 100644
index 00000000000..60864076dca
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/predefined_create_response.py
@@ -0,0 +1,41 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ....._models import BaseModel
+
+__all__ = ["PredefinedCreateResponse", "Confidence", "Variant"]
+
+
+class Confidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class Variant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class PredefinedCreateResponse(BaseModel):
+    id: str
+
+    confidence: Confidence
+
+    enabled: bool
+
+    name: str
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[Variant] = None
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/predefined_get_response.py b/src/cloudflare/types/zero_trust/dlp/entries/predefined_get_response.py
new file mode 100644
index 00000000000..7ea062b0886
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/predefined_get_response.py
@@ -0,0 +1,226 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ....._models import BaseModel
+from ..profiles.pattern import Pattern
+
+__all__ = [
+    "PredefinedGetResponse",
+    "UnionMember0",
+    "UnionMember0Profile",
+    "UnionMember1",
+    "UnionMember1Confidence",
+    "UnionMember1Profile",
+    "UnionMember1Variant",
+    "UnionMember2",
+    "UnionMember2Profile",
+    "UnionMember3",
+    "UnionMember3Profile",
+    "UnionMember4",
+    "UnionMember4Profile",
+    "UnionMember5",
+    "UnionMember5Profile",
+]
+
+
+class UnionMember0Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember0(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+    profiles: Optional[List[UnionMember0Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class UnionMember1Confidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class UnionMember1Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember1Variant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class UnionMember1(BaseModel):
+    id: str
+
+    confidence: UnionMember1Confidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    profiles: Optional[List[UnionMember1Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+    variant: Optional[UnionMember1Variant] = None
+
+
+class UnionMember2Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember2(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+    profiles: Optional[List[UnionMember2Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class UnionMember3Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember3(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+    profiles: Optional[List[UnionMember3Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class UnionMember4Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember4(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+    profiles: Optional[List[UnionMember4Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class UnionMember5Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember5(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+    profiles: Optional[List[UnionMember5Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+PredefinedGetResponse: TypeAlias = Union[
+    UnionMember0, UnionMember1, UnionMember2, UnionMember3, UnionMember4, UnionMember5
+]
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/predefined_list_response.py b/src/cloudflare/types/zero_trust/dlp/entries/predefined_list_response.py
new file mode 100644
index 00000000000..e8bd1dd0e62
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/predefined_list_response.py
@@ -0,0 +1,160 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ....._models import BaseModel
+from ..profiles.pattern import Pattern
+
+__all__ = [
+    "PredefinedListResponse",
+    "CustomEntry",
+    "PredefinedEntry",
+    "PredefinedEntryConfidence",
+    "PredefinedEntryVariant",
+    "IntegrationEntry",
+    "ExactDataEntry",
+    "DocumentFingerprintEntry",
+    "WordListEntry",
+]
+
+
+class CustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class PredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class PredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class PredefinedEntry(BaseModel):
+    id: str
+
+    confidence: PredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+    variant: Optional[PredefinedEntryVariant] = None
+
+
+class IntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class ExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class DocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class WordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+PredefinedListResponse: TypeAlias = Union[
+    CustomEntry, PredefinedEntry, IntegrationEntry, ExactDataEntry, DocumentFingerprintEntry, WordListEntry
+]
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/predefined_update_params.py b/src/cloudflare/types/zero_trust/dlp/entries/predefined_update_params.py
new file mode 100644
index 00000000000..d38e07163d7
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/predefined_update_params.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["PredefinedUpdateParams"]
+
+
+class PredefinedUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    enabled: Required[bool]
diff --git a/src/cloudflare/types/zero_trust/dlp/entries/predefined_update_response.py b/src/cloudflare/types/zero_trust/dlp/entries/predefined_update_response.py
new file mode 100644
index 00000000000..178470ad0a2
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entries/predefined_update_response.py
@@ -0,0 +1,41 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ....._models import BaseModel
+
+__all__ = ["PredefinedUpdateResponse", "Confidence", "Variant"]
+
+
+class Confidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class Variant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class PredefinedUpdateResponse(BaseModel):
+    id: str
+
+    confidence: Confidence
+
+    enabled: bool
+
+    name: str
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[Variant] = None
diff --git a/src/cloudflare/types/zero_trust/dlp/entry_create_params.py b/src/cloudflare/types/zero_trust/dlp/entry_create_params.py
new file mode 100644
index 00000000000..8aaaa65ea7f
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entry_create_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from .profiles.pattern_param import PatternParam
+
+__all__ = ["EntryCreateParams"]
+
+
+class EntryCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    enabled: Required[bool]
+
+    name: Required[str]
+
+    pattern: Required[PatternParam]
+
+    profile_id: str
diff --git a/src/cloudflare/types/zero_trust/dlp/entry_create_response.py b/src/cloudflare/types/zero_trust/dlp/entry_create_response.py
new file mode 100644
index 00000000000..a21a44fe06e
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entry_create_response.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+from .profiles.pattern import Pattern
+
+__all__ = ["EntryCreateResponse"]
+
+
+class EntryCreateResponse(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/dlp/entry_get_response.py b/src/cloudflare/types/zero_trust/dlp/entry_get_response.py
new file mode 100644
index 00000000000..0276d9da7b3
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entry_get_response.py
@@ -0,0 +1,224 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ...._models import BaseModel
+from .profiles.pattern import Pattern
+
+__all__ = [
+    "EntryGetResponse",
+    "UnionMember0",
+    "UnionMember0Profile",
+    "UnionMember1",
+    "UnionMember1Confidence",
+    "UnionMember1Profile",
+    "UnionMember1Variant",
+    "UnionMember2",
+    "UnionMember2Profile",
+    "UnionMember3",
+    "UnionMember3Profile",
+    "UnionMember4",
+    "UnionMember4Profile",
+    "UnionMember5",
+    "UnionMember5Profile",
+]
+
+
+class UnionMember0Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember0(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+    profiles: Optional[List[UnionMember0Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class UnionMember1Confidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class UnionMember1Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember1Variant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class UnionMember1(BaseModel):
+    id: str
+
+    confidence: UnionMember1Confidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    profiles: Optional[List[UnionMember1Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+    variant: Optional[UnionMember1Variant] = None
+
+
+class UnionMember2Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember2(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+    profiles: Optional[List[UnionMember2Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class UnionMember3Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember3(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+    profiles: Optional[List[UnionMember3Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class UnionMember4Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember4(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+    profiles: Optional[List[UnionMember4Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class UnionMember5Profile(BaseModel):
+    """Computed entry field for a profile that an entry is shared into."""
+
+    id: str
+
+    name: str
+
+
+class UnionMember5(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+    profiles: Optional[List[UnionMember5Profile]] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+EntryGetResponse: TypeAlias = Union[UnionMember0, UnionMember1, UnionMember2, UnionMember3, UnionMember4, UnionMember5]
diff --git a/src/cloudflare/types/zero_trust/dlp/entry_list_response.py b/src/cloudflare/types/zero_trust/dlp/entry_list_response.py
new file mode 100644
index 00000000000..95f6c9de362
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entry_list_response.py
@@ -0,0 +1,160 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from ...._models import BaseModel
+from .profiles.pattern import Pattern
+
+__all__ = [
+    "EntryListResponse",
+    "CustomEntry",
+    "PredefinedEntry",
+    "PredefinedEntryConfidence",
+    "PredefinedEntryVariant",
+    "IntegrationEntry",
+    "ExactDataEntry",
+    "DocumentFingerprintEntry",
+    "WordListEntry",
+]
+
+
+class CustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class PredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class PredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class PredefinedEntry(BaseModel):
+    id: str
+
+    confidence: PredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+    variant: Optional[PredefinedEntryVariant] = None
+
+
+class IntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class ExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class DocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+class WordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+    upload_status: Optional[Literal["empty", "uploading", "pending", "processing", "failed", "complete"]] = None
+
+
+EntryListResponse: TypeAlias = Union[
+    CustomEntry, PredefinedEntry, IntegrationEntry, ExactDataEntry, DocumentFingerprintEntry, WordListEntry
+]
diff --git a/src/cloudflare/types/zero_trust/dlp/entry_update_params.py b/src/cloudflare/types/zero_trust/dlp/entry_update_params.py
new file mode 100644
index 00000000000..7fc8706ca1e
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entry_update_params.py
@@ -0,0 +1,41 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
+
+from .profiles.pattern_param import PatternParam
+
+__all__ = ["EntryUpdateParams", "Variant0", "Variant1", "Variant2"]
+
+
+class Variant0(TypedDict, total=False):
+    account_id: Required[str]
+
+    name: Required[str]
+
+    pattern: Required[PatternParam]
+
+    type: Required[Literal["custom"]]
+
+    enabled: bool
+
+
+class Variant1(TypedDict, total=False):
+    account_id: Required[str]
+
+    type: Required[Literal["predefined"]]
+
+    enabled: bool
+
+
+class Variant2(TypedDict, total=False):
+    account_id: Required[str]
+
+    type: Required[Literal["integration"]]
+
+    enabled: bool
+
+
+EntryUpdateParams: TypeAlias = Union[Variant0, Variant1, Variant2]
diff --git a/src/cloudflare/types/zero_trust/dlp/entry_update_response.py b/src/cloudflare/types/zero_trust/dlp/entry_update_response.py
new file mode 100644
index 00000000000..ced93632cfb
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/entry_update_response.py
@@ -0,0 +1,149 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from ...._utils import PropertyInfo
+from ...._models import BaseModel
+from .profiles.pattern import Pattern
+
+__all__ = [
+    "EntryUpdateResponse",
+    "Custom",
+    "Predefined",
+    "PredefinedConfidence",
+    "PredefinedVariant",
+    "Integration",
+    "ExactData",
+    "DocumentFingerprint",
+    "WordList",
+]
+
+
+class Custom(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class PredefinedConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class PredefinedVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class Predefined(BaseModel):
+    id: str
+
+    confidence: PredefinedConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[PredefinedVariant] = None
+
+
+class Integration(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class ExactData(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+
+class DocumentFingerprint(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+
+class WordList(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+
+EntryUpdateResponse: TypeAlias = Annotated[
+    Union[Custom, Predefined, Integration, ExactData, DocumentFingerprint, WordList], PropertyInfo(discriminator="type")
+]
diff --git a/src/cloudflare/types/zero_trust/dlp/limit_list_response.py b/src/cloudflare/types/zero_trust/dlp/limit_list_response.py
new file mode 100755
index 00000000000..a878f22d6a4
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/limit_list_response.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["LimitListResponse"]
+
+
+class LimitListResponse(BaseModel):
+    max_dataset_cells: int
diff --git a/src/cloudflare/types/zero_trust/dlp/pattern_validate_params.py b/src/cloudflare/types/zero_trust/dlp/pattern_validate_params.py
index b686b09539b..edd77e78e03 100644
--- a/src/cloudflare/types/zero_trust/dlp/pattern_validate_params.py
+++ b/src/cloudflare/types/zero_trust/dlp/pattern_validate_params.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from typing import Optional
 from typing_extensions import Required, TypedDict
 
 __all__ = ["PatternValidateParams"]
@@ -9,7 +10,17 @@
 
 class PatternValidateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
 
     regex: Required[str]
-    """The regex pattern."""
+
+    max_match_bytes: Optional[int]
+    """Maximum number of bytes that the regular expression can match.
+
+    If this is `null` then there is no limit on the length. Patterns can use `*` and
+    `+`. Otherwise repeats should use a range `{m,n}` to restrict patterns to the
+    length. If this field is missing, then a default length limit is used.
+
+    Note that the length is specified in bytes. Since regular expressions use UTF-8
+    the pattern `.` can match up to 4 bytes. Hence `.{1,256}` has a maximum length
+    of 1024 bytes.
+    """
diff --git a/src/cloudflare/types/zero_trust/dlp/pattern_validate_response.py b/src/cloudflare/types/zero_trust/dlp/pattern_validate_response.py
new file mode 100644
index 00000000000..65bd39229c7
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/pattern_validate_response.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["PatternValidateResponse"]
+
+
+class PatternValidateResponse(BaseModel):
+    valid: bool
diff --git a/src/cloudflare/types/zero_trust/dlp/payload_log_get_response.py b/src/cloudflare/types/zero_trust/dlp/payload_log_get_response.py
index df752b6d9d3..648ba73dcb7 100644
--- a/src/cloudflare/types/zero_trust/dlp/payload_log_get_response.py
+++ b/src/cloudflare/types/zero_trust/dlp/payload_log_get_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from datetime import datetime
 
 from ...._models import BaseModel
 
@@ -8,4 +9,6 @@
 
 
 class PayloadLogGetResponse(BaseModel):
+    updated_at: datetime
+
     public_key: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/dlp/payload_log_update_params.py b/src/cloudflare/types/zero_trust/dlp/payload_log_update_params.py
index 793221b9b71..00ba11328ae 100644
--- a/src/cloudflare/types/zero_trust/dlp/payload_log_update_params.py
+++ b/src/cloudflare/types/zero_trust/dlp/payload_log_update_params.py
@@ -10,7 +10,5 @@
 
 class PayloadLogUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
 
-    public_key: Required[Optional[str]]
-    """The public key to use when encrypting extracted payloads, as a base64 string"""
+    public_key: Optional[str]
diff --git a/src/cloudflare/types/zero_trust/dlp/payload_log_update_response.py b/src/cloudflare/types/zero_trust/dlp/payload_log_update_response.py
index 5c5fcb53bc5..1a4e55436e3 100644
--- a/src/cloudflare/types/zero_trust/dlp/payload_log_update_response.py
+++ b/src/cloudflare/types/zero_trust/dlp/payload_log_update_response.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from datetime import datetime
 
 from ...._models import BaseModel
 
@@ -8,4 +9,6 @@
 
 
 class PayloadLogUpdateResponse(BaseModel):
+    updated_at: datetime
+
     public_key: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/dlp/profile.py b/src/cloudflare/types/zero_trust/dlp/profile.py
index ecc092685a0..e5b0b8f8ed1 100644
--- a/src/cloudflare/types/zero_trust/dlp/profile.py
+++ b/src/cloudflare/types/zero_trust/dlp/profile.py
@@ -1,53 +1,578 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from __future__ import annotations
+
 from typing import List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
+from ...._compat import (  # type: ignore[attr-defined]
+    PYDANTIC_V2,  # pyright: ignore[reportAttributeAccessIssue, reportUnknownVariableType]
+)
 from ...._models import BaseModel
-from .profiles.custom_profile import CustomProfile
-from .profiles.predefined_profile import PredefinedProfile
 
-__all__ = ["Profile", "DLPIntegrationProfile", "DLPIntegrationProfileEntry"]
+__all__ = [
+    "Profile",
+    "CustomProfile",
+    "CustomProfileEntry",
+    "CustomProfileEntryCustomEntry",
+    "CustomProfileEntryPredefinedEntry",
+    "CustomProfileEntryPredefinedEntryConfidence",
+    "CustomProfileEntryPredefinedEntryVariant",
+    "CustomProfileEntryIntegrationEntry",
+    "CustomProfileEntryExactDataEntry",
+    "CustomProfileEntryDocumentFingerprintEntry",
+    "CustomProfileEntryWordListEntry",
+    "PredefinedProfile",
+    "PredefinedProfileEntry",
+    "PredefinedProfileEntryCustomEntry",
+    "PredefinedProfileEntryPredefinedEntry",
+    "PredefinedProfileEntryPredefinedEntryConfidence",
+    "PredefinedProfileEntryPredefinedEntryVariant",
+    "PredefinedProfileEntryIntegrationEntry",
+    "PredefinedProfileEntryExactDataEntry",
+    "PredefinedProfileEntryDocumentFingerprintEntry",
+    "PredefinedProfileEntryWordListEntry",
+    "IntegrationProfile",
+    "IntegrationProfileEntry",
+    "IntegrationProfileEntryCustomEntry",
+    "IntegrationProfileEntryPredefinedEntry",
+    "IntegrationProfileEntryPredefinedEntryConfidence",
+    "IntegrationProfileEntryPredefinedEntryVariant",
+    "IntegrationProfileEntryIntegrationEntry",
+    "IntegrationProfileEntryExactDataEntry",
+    "IntegrationProfileEntryDocumentFingerprintEntry",
+    "IntegrationProfileEntryWordListEntry",
+]
+
+
+class CustomProfileEntryCustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
 
+    enabled: bool
 
-class DLPIntegrationProfileEntry(BaseModel):
-    id: Optional[str] = None
-    """The ID for this entry"""
+    name: str
 
-    created_at: Optional[datetime] = None
+    pattern: Pattern
 
-    enabled: Optional[bool] = None
-    """Whether the entry is enabled or not."""
+    type: Literal["custom"]
 
-    name: Optional[str] = None
-    """The name of the entry."""
+    updated_at: datetime
 
-    profile_id: Optional[object] = None
-    """ID of the parent profile"""
+    profile_id: Optional[str] = None
 
-    updated_at: Optional[datetime] = None
 
+class CustomProfileEntryPredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
 
-class DLPIntegrationProfile(BaseModel):
-    id: Optional[str] = None
-    """The ID for this profile"""
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
 
-    created_at: Optional[datetime] = None
+
+class CustomProfileEntryPredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
 
     description: Optional[str] = None
-    """The description of the profile."""
 
-    entries: Optional[List[DLPIntegrationProfileEntry]] = None
-    """The entries for this profile."""
 
-    name: Optional[str] = None
+class CustomProfileEntryPredefinedEntry(BaseModel):
+    id: str
+
+    confidence: CustomProfileEntryPredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[CustomProfileEntryPredefinedEntryVariant] = None
+
+
+class CustomProfileEntryIntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class CustomProfileEntryExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+
+class CustomProfileEntryDocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+
+class CustomProfileEntryWordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+
+CustomProfileEntry: TypeAlias = Union[
+    CustomProfileEntryCustomEntry,
+    CustomProfileEntryPredefinedEntry,
+    CustomProfileEntryIntegrationEntry,
+    CustomProfileEntryExactDataEntry,
+    CustomProfileEntryDocumentFingerprintEntry,
+    CustomProfileEntryWordListEntry,
+]
+
+
+class CustomProfile(BaseModel):
+    id: str
+    """The id of the profile (uuid)."""
+
+    allowed_match_count: int
+    """Related DLP policies will trigger when the match count exceeds the number set."""
+
+    created_at: datetime
+    """When the profile was created."""
+
+    name: str
     """The name of the profile."""
 
-    type: Optional[Literal["integration"]] = None
-    """The type of the profile."""
+    ocr_enabled: bool
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+    """When the profile was lasted updated."""
+
+    ai_context_enabled: Optional[bool] = None
+
+    confidence_threshold: Optional[Literal["low", "medium", "high", "very_high"]] = None
+
+    context_awareness: Optional[ContextAwareness] = None
+    """
+    Scan the context of predefined entries to only return matches surrounded by
+    keywords.
+    """
+
+    description: Optional[str] = None
+    """The description of the profile."""
+
+    entries: Optional[List[CustomProfileEntry]] = None
+
+
+class PredefinedProfileEntryCustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class PredefinedProfileEntryPredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class PredefinedProfileEntryPredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class PredefinedProfileEntryPredefinedEntry(BaseModel):
+    id: str
+
+    confidence: PredefinedProfileEntryPredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[PredefinedProfileEntryPredefinedEntryVariant] = None
+
+
+class PredefinedProfileEntryIntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class PredefinedProfileEntryExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+
+class PredefinedProfileEntryDocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+
+class PredefinedProfileEntryWordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+
+PredefinedProfileEntry: TypeAlias = Union[
+    PredefinedProfileEntryCustomEntry,
+    PredefinedProfileEntryPredefinedEntry,
+    PredefinedProfileEntryIntegrationEntry,
+    PredefinedProfileEntryExactDataEntry,
+    PredefinedProfileEntryDocumentFingerprintEntry,
+    PredefinedProfileEntryWordListEntry,
+]
+
+
+class PredefinedProfile(BaseModel):
+    id: str
+    """The id of the predefined profile (uuid)."""
+
+    allowed_match_count: int
+
+    entries: List[PredefinedProfileEntry]
+
+    name: str
+    """The name of the predefined profile."""
+
+    type: Literal["predefined"]
+
+    ai_context_enabled: Optional[bool] = None
+
+    confidence_threshold: Optional[Literal["low", "medium", "high", "very_high"]] = None
+
+    context_awareness: Optional[ContextAwareness] = None
+    """
+    Scan the context of predefined entries to only return matches surrounded by
+    keywords.
+    """
+
+    ocr_enabled: Optional[bool] = None
+
+    open_access: Optional[bool] = None
+    """Whether this profile can be accessed by anyone."""
+
+
+class IntegrationProfileEntryCustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class IntegrationProfileEntryPredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class IntegrationProfileEntryPredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class IntegrationProfileEntryPredefinedEntry(BaseModel):
+    id: str
+
+    confidence: IntegrationProfileEntryPredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[IntegrationProfileEntryPredefinedEntryVariant] = None
+
+
+class IntegrationProfileEntryIntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class IntegrationProfileEntryExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+
+class IntegrationProfileEntryDocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+
+class IntegrationProfileEntryWordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+
+IntegrationProfileEntry: TypeAlias = Union[
+    IntegrationProfileEntryCustomEntry,
+    IntegrationProfileEntryPredefinedEntry,
+    IntegrationProfileEntryIntegrationEntry,
+    IntegrationProfileEntryExactDataEntry,
+    IntegrationProfileEntryDocumentFingerprintEntry,
+    IntegrationProfileEntryWordListEntry,
+]
+
+
+class IntegrationProfile(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    entries: List[IntegrationProfileEntry]
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    description: Optional[str] = None
+    """The description of the profile."""
+
 
-    updated_at: Optional[datetime] = None
+Profile: TypeAlias = Union[CustomProfile, PredefinedProfile, IntegrationProfile]
 
+from .profiles.pattern import Pattern
+from .context_awareness import ContextAwareness
 
-Profile = Union[PredefinedProfile, CustomProfile, DLPIntegrationProfile]
+if PYDANTIC_V2:
+    CustomProfile.model_rebuild()
+    CustomProfileEntryCustomEntry.model_rebuild()
+    CustomProfileEntryPredefinedEntry.model_rebuild()
+    CustomProfileEntryPredefinedEntryConfidence.model_rebuild()
+    CustomProfileEntryIntegrationEntry.model_rebuild()
+    CustomProfileEntryExactDataEntry.model_rebuild()
+    CustomProfileEntryWordListEntry.model_rebuild()
+    PredefinedProfile.model_rebuild()
+    PredefinedProfileEntryCustomEntry.model_rebuild()
+    PredefinedProfileEntryPredefinedEntry.model_rebuild()
+    PredefinedProfileEntryPredefinedEntryConfidence.model_rebuild()
+    PredefinedProfileEntryIntegrationEntry.model_rebuild()
+    PredefinedProfileEntryExactDataEntry.model_rebuild()
+    PredefinedProfileEntryWordListEntry.model_rebuild()
+    IntegrationProfile.model_rebuild()
+    IntegrationProfileEntryCustomEntry.model_rebuild()
+    IntegrationProfileEntryPredefinedEntry.model_rebuild()
+    IntegrationProfileEntryPredefinedEntryConfidence.model_rebuild()
+    IntegrationProfileEntryIntegrationEntry.model_rebuild()
+    IntegrationProfileEntryExactDataEntry.model_rebuild()
+    IntegrationProfileEntryWordListEntry.model_rebuild()
+else:
+    CustomProfile.update_forward_refs()  # type: ignore
+    CustomProfileEntryCustomEntry.update_forward_refs()  # type: ignore
+    CustomProfileEntryPredefinedEntry.update_forward_refs()  # type: ignore
+    CustomProfileEntryPredefinedEntryConfidence.update_forward_refs()  # type: ignore
+    CustomProfileEntryIntegrationEntry.update_forward_refs()  # type: ignore
+    CustomProfileEntryExactDataEntry.update_forward_refs()  # type: ignore
+    CustomProfileEntryWordListEntry.update_forward_refs()  # type: ignore
+    PredefinedProfile.update_forward_refs()  # type: ignore
+    PredefinedProfileEntryCustomEntry.update_forward_refs()  # type: ignore
+    PredefinedProfileEntryPredefinedEntry.update_forward_refs()  # type: ignore
+    PredefinedProfileEntryPredefinedEntryConfidence.update_forward_refs()  # type: ignore
+    PredefinedProfileEntryIntegrationEntry.update_forward_refs()  # type: ignore
+    PredefinedProfileEntryExactDataEntry.update_forward_refs()  # type: ignore
+    PredefinedProfileEntryWordListEntry.update_forward_refs()  # type: ignore
+    IntegrationProfile.update_forward_refs()  # type: ignore
+    IntegrationProfileEntryCustomEntry.update_forward_refs()  # type: ignore
+    IntegrationProfileEntryPredefinedEntry.update_forward_refs()  # type: ignore
+    IntegrationProfileEntryPredefinedEntryConfidence.update_forward_refs()  # type: ignore
+    IntegrationProfileEntryIntegrationEntry.update_forward_refs()  # type: ignore
+    IntegrationProfileEntryExactDataEntry.update_forward_refs()  # type: ignore
+    IntegrationProfileEntryWordListEntry.update_forward_refs()  # type: ignore
diff --git a/src/cloudflare/types/zero_trust/dlp/profile_get_response.py b/src/cloudflare/types/zero_trust/dlp/profile_get_response.py
index c8e1a4e93ed..1732d21bee9 100644
--- a/src/cloudflare/types/zero_trust/dlp/profile_get_response.py
+++ b/src/cloudflare/types/zero_trust/dlp/profile_get_response.py
@@ -2,52 +2,527 @@
 
 from typing import List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
+from typing_extensions import Literal, Annotated, TypeAlias
 
+from ...._utils import PropertyInfo
 from ...._models import BaseModel
-from .profiles.custom_profile import CustomProfile
-from .profiles.predefined_profile import PredefinedProfile
+from .profiles.pattern import Pattern
+from .context_awareness import ContextAwareness
 
-__all__ = ["ProfileGetResponse", "DLPIntegrationProfile", "DLPIntegrationProfileEntry"]
+__all__ = [
+    "ProfileGetResponse",
+    "Custom",
+    "CustomEntry",
+    "CustomEntryCustomEntry",
+    "CustomEntryPredefinedEntry",
+    "CustomEntryPredefinedEntryConfidence",
+    "CustomEntryPredefinedEntryVariant",
+    "CustomEntryIntegrationEntry",
+    "CustomEntryExactDataEntry",
+    "CustomEntryDocumentFingerprintEntry",
+    "CustomEntryWordListEntry",
+    "Predefined",
+    "PredefinedEntry",
+    "PredefinedEntryCustomEntry",
+    "PredefinedEntryPredefinedEntry",
+    "PredefinedEntryPredefinedEntryConfidence",
+    "PredefinedEntryPredefinedEntryVariant",
+    "PredefinedEntryIntegrationEntry",
+    "PredefinedEntryExactDataEntry",
+    "PredefinedEntryDocumentFingerprintEntry",
+    "PredefinedEntryWordListEntry",
+    "Integration",
+    "IntegrationEntry",
+    "IntegrationEntryCustomEntry",
+    "IntegrationEntryPredefinedEntry",
+    "IntegrationEntryPredefinedEntryConfidence",
+    "IntegrationEntryPredefinedEntryVariant",
+    "IntegrationEntryIntegrationEntry",
+    "IntegrationEntryExactDataEntry",
+    "IntegrationEntryDocumentFingerprintEntry",
+    "IntegrationEntryWordListEntry",
+]
 
 
-class DLPIntegrationProfileEntry(BaseModel):
-    id: Optional[str] = None
-    """The ID for this entry"""
+class CustomEntryCustomEntry(BaseModel):
+    id: str
 
-    created_at: Optional[datetime] = None
+    created_at: datetime
 
-    enabled: Optional[bool] = None
-    """Whether the entry is enabled or not."""
+    enabled: bool
 
-    name: Optional[str] = None
-    """The name of the entry."""
+    name: str
 
-    profile_id: Optional[object] = None
-    """ID of the parent profile"""
+    pattern: Pattern
 
-    updated_at: Optional[datetime] = None
+    type: Literal["custom"]
 
+    updated_at: datetime
 
-class DLPIntegrationProfile(BaseModel):
-    id: Optional[str] = None
-    """The ID for this profile"""
+    profile_id: Optional[str] = None
 
-    created_at: Optional[datetime] = None
+
+class CustomEntryPredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class CustomEntryPredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
 
     description: Optional[str] = None
-    """The description of the profile."""
 
-    entries: Optional[List[DLPIntegrationProfileEntry]] = None
-    """The entries for this profile."""
 
-    name: Optional[str] = None
+class CustomEntryPredefinedEntry(BaseModel):
+    id: str
+
+    confidence: CustomEntryPredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[CustomEntryPredefinedEntryVariant] = None
+
+
+class CustomEntryIntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class CustomEntryExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+
+class CustomEntryDocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+
+class CustomEntryWordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+
+CustomEntry: TypeAlias = Union[
+    CustomEntryCustomEntry,
+    CustomEntryPredefinedEntry,
+    CustomEntryIntegrationEntry,
+    CustomEntryExactDataEntry,
+    CustomEntryDocumentFingerprintEntry,
+    CustomEntryWordListEntry,
+]
+
+
+class Custom(BaseModel):
+    id: str
+    """The id of the profile (uuid)."""
+
+    allowed_match_count: int
+    """Related DLP policies will trigger when the match count exceeds the number set."""
+
+    created_at: datetime
+    """When the profile was created."""
+
+    name: str
     """The name of the profile."""
 
-    type: Optional[Literal["integration"]] = None
-    """The type of the profile."""
+    ocr_enabled: bool
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+    """When the profile was lasted updated."""
+
+    ai_context_enabled: Optional[bool] = None
+
+    confidence_threshold: Optional[Literal["low", "medium", "high", "very_high"]] = None
+
+    context_awareness: Optional[ContextAwareness] = None
+    """
+    Scan the context of predefined entries to only return matches surrounded by
+    keywords.
+    """
+
+    description: Optional[str] = None
+    """The description of the profile."""
+
+    entries: Optional[List[CustomEntry]] = None
+
+
+class PredefinedEntryCustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class PredefinedEntryPredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class PredefinedEntryPredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class PredefinedEntryPredefinedEntry(BaseModel):
+    id: str
+
+    confidence: PredefinedEntryPredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[PredefinedEntryPredefinedEntryVariant] = None
+
+
+class PredefinedEntryIntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class PredefinedEntryExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
 
-    updated_at: Optional[datetime] = None
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+
+class PredefinedEntryDocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+
+class PredefinedEntryWordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+
+PredefinedEntry: TypeAlias = Union[
+    PredefinedEntryCustomEntry,
+    PredefinedEntryPredefinedEntry,
+    PredefinedEntryIntegrationEntry,
+    PredefinedEntryExactDataEntry,
+    PredefinedEntryDocumentFingerprintEntry,
+    PredefinedEntryWordListEntry,
+]
+
+
+class Predefined(BaseModel):
+    id: str
+    """The id of the predefined profile (uuid)."""
+
+    allowed_match_count: int
+
+    entries: List[PredefinedEntry]
+
+    name: str
+    """The name of the predefined profile."""
+
+    type: Literal["predefined"]
+
+    ai_context_enabled: Optional[bool] = None
+
+    confidence_threshold: Optional[Literal["low", "medium", "high", "very_high"]] = None
+
+    context_awareness: Optional[ContextAwareness] = None
+    """
+    Scan the context of predefined entries to only return matches surrounded by
+    keywords.
+    """
+
+    ocr_enabled: Optional[bool] = None
+
+    open_access: Optional[bool] = None
+    """Whether this profile can be accessed by anyone."""
+
+
+class IntegrationEntryCustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class IntegrationEntryPredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class IntegrationEntryPredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class IntegrationEntryPredefinedEntry(BaseModel):
+    id: str
+
+    confidence: IntegrationEntryPredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[IntegrationEntryPredefinedEntryVariant] = None
+
+
+class IntegrationEntryIntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class IntegrationEntryExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+
+class IntegrationEntryDocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+
+class IntegrationEntryWordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+
+IntegrationEntry: TypeAlias = Union[
+    IntegrationEntryCustomEntry,
+    IntegrationEntryPredefinedEntry,
+    IntegrationEntryIntegrationEntry,
+    IntegrationEntryExactDataEntry,
+    IntegrationEntryDocumentFingerprintEntry,
+    IntegrationEntryWordListEntry,
+]
+
+
+class Integration(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    entries: List[IntegrationEntry]
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    description: Optional[str] = None
+    """The description of the profile."""
 
 
-ProfileGetResponse = Union[PredefinedProfile, CustomProfile, DLPIntegrationProfile]
+ProfileGetResponse: TypeAlias = Annotated[Union[Custom, Predefined, Integration], PropertyInfo(discriminator="type")]
diff --git a/src/cloudflare/types/zero_trust/dlp/profile_list_params.py b/src/cloudflare/types/zero_trust/dlp/profile_list_params.py
new file mode 100755
index 00000000000..861653b1128
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/profile_list_params.py
@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ProfileListParams"]
+
+
+class ProfileListParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    all: bool
+    """
+    Return all profiles, including those that current account does not have access
+    to.
+    """
diff --git a/src/cloudflare/types/zero_trust/dlp/profiles/__init__.py b/src/cloudflare/types/zero_trust/dlp/profiles/__init__.py
index 0bc90b29380..79e08403dc0 100644
--- a/src/cloudflare/types/zero_trust/dlp/profiles/__init__.py
+++ b/src/cloudflare/types/zero_trust/dlp/profiles/__init__.py
@@ -4,10 +4,11 @@
 
 from .pattern import Pattern as Pattern
 from .pattern_param import PatternParam as PatternParam
-from .custom_profile import CustomProfile as CustomProfile
-from .predefined_profile import PredefinedProfile as PredefinedProfile
+from .custom_get_response import CustomGetResponse as CustomGetResponse
 from .custom_create_params import CustomCreateParams as CustomCreateParams
 from .custom_update_params import CustomUpdateParams as CustomUpdateParams
 from .custom_create_response import CustomCreateResponse as CustomCreateResponse
-from .custom_delete_response import CustomDeleteResponse as CustomDeleteResponse
+from .custom_update_response import CustomUpdateResponse as CustomUpdateResponse
+from .predefined_get_response import PredefinedGetResponse as PredefinedGetResponse
 from .predefined_update_params import PredefinedUpdateParams as PredefinedUpdateParams
+from .predefined_update_response import PredefinedUpdateResponse as PredefinedUpdateResponse
diff --git a/src/cloudflare/types/zero_trust/dlp/profiles/custom_create_params.py b/src/cloudflare/types/zero_trust/dlp/profiles/custom_create_params.py
index 08a716d502e..42b151cc13d 100644
--- a/src/cloudflare/types/zero_trust/dlp/profiles/custom_create_params.py
+++ b/src/cloudflare/types/zero_trust/dlp/profiles/custom_create_params.py
@@ -2,51 +2,69 @@
 
 from __future__ import annotations
 
-from typing import Iterable
-from typing_extensions import Required, TypedDict
+from typing import Union, Iterable, Optional
+from typing_extensions import Required, TypeAlias, TypedDict
 
+from ....._types import SequenceNotStr
 from .pattern_param import PatternParam
 from ..context_awareness_param import ContextAwarenessParam
 
-__all__ = ["CustomCreateParams", "Profile", "ProfileEntry"]
+__all__ = ["CustomCreateParams", "Entry", "EntryDLPNewCustomEntry", "EntryDLPNewWordListEntry", "SharedEntry"]
 
 
 class CustomCreateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
-
-    profiles: Required[Iterable[Profile]]
-
-
-class ProfileEntry(TypedDict, total=False):
-    enabled: Required[bool]
-    """Whether the entry is enabled or not."""
 
     name: Required[str]
-    """The name of the entry."""
-
-    pattern: Required[PatternParam]
-    """A pattern that matches an entry"""
 
+    ai_context_enabled: bool
 
-class Profile(TypedDict, total=False):
-    allowed_match_count: float
+    allowed_match_count: int
     """Related DLP policies will trigger when the match count exceeds the number set."""
 
+    confidence_threshold: Optional[str]
+
     context_awareness: ContextAwarenessParam
     """
     Scan the context of predefined entries to only return matches surrounded by
     keywords.
     """
 
-    description: str
+    description: Optional[str]
     """The description of the profile."""
 
-    entries: Iterable[ProfileEntry]
-    """The entries for this profile."""
-
-    name: str
-    """The name of the profile."""
+    entries: Iterable[Entry]
 
     ocr_enabled: bool
-    """If true, scan images via OCR to determine if any text present matches filters."""
+
+    shared_entries: Iterable[SharedEntry]
+    """Entries from other profiles (e.g.
+
+    pre-defined Cloudflare profiles, or your Microsoft Information Protection
+    profiles).
+    """
+
+
+class EntryDLPNewCustomEntry(TypedDict, total=False):
+    enabled: Required[bool]
+
+    name: Required[str]
+
+    pattern: Required[PatternParam]
+
+
+class EntryDLPNewWordListEntry(TypedDict, total=False):
+    enabled: Required[bool]
+
+    name: Required[str]
+
+    words: Required[SequenceNotStr[str]]
+
+
+Entry: TypeAlias = Union[EntryDLPNewCustomEntry, EntryDLPNewWordListEntry]
+
+
+class SharedEntry(TypedDict, total=False):
+    enabled: Required[bool]
+
+    entry_id: Required[str]
diff --git a/src/cloudflare/types/zero_trust/dlp/profiles/custom_create_response.py b/src/cloudflare/types/zero_trust/dlp/profiles/custom_create_response.py
index 7eedf697c45..5e9f63ca298 100644
--- a/src/cloudflare/types/zero_trust/dlp/profiles/custom_create_response.py
+++ b/src/cloudflare/types/zero_trust/dlp/profiles/custom_create_response.py
@@ -1,9 +1,528 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypeAlias
 
-from .custom_profile import CustomProfile
+from .pattern import Pattern
+from ....._utils import PropertyInfo
+from ....._models import BaseModel
+from ..context_awareness import ContextAwareness
 
-__all__ = ["CustomCreateResponse"]
+__all__ = [
+    "CustomCreateResponse",
+    "Custom",
+    "CustomEntry",
+    "CustomEntryCustomEntry",
+    "CustomEntryPredefinedEntry",
+    "CustomEntryPredefinedEntryConfidence",
+    "CustomEntryPredefinedEntryVariant",
+    "CustomEntryIntegrationEntry",
+    "CustomEntryExactDataEntry",
+    "CustomEntryDocumentFingerprintEntry",
+    "CustomEntryWordListEntry",
+    "Predefined",
+    "PredefinedEntry",
+    "PredefinedEntryCustomEntry",
+    "PredefinedEntryPredefinedEntry",
+    "PredefinedEntryPredefinedEntryConfidence",
+    "PredefinedEntryPredefinedEntryVariant",
+    "PredefinedEntryIntegrationEntry",
+    "PredefinedEntryExactDataEntry",
+    "PredefinedEntryDocumentFingerprintEntry",
+    "PredefinedEntryWordListEntry",
+    "Integration",
+    "IntegrationEntry",
+    "IntegrationEntryCustomEntry",
+    "IntegrationEntryPredefinedEntry",
+    "IntegrationEntryPredefinedEntryConfidence",
+    "IntegrationEntryPredefinedEntryVariant",
+    "IntegrationEntryIntegrationEntry",
+    "IntegrationEntryExactDataEntry",
+    "IntegrationEntryDocumentFingerprintEntry",
+    "IntegrationEntryWordListEntry",
+]
 
-CustomCreateResponse = List[CustomProfile]
+
+class CustomEntryCustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class CustomEntryPredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class CustomEntryPredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class CustomEntryPredefinedEntry(BaseModel):
+    id: str
+
+    confidence: CustomEntryPredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[CustomEntryPredefinedEntryVariant] = None
+
+
+class CustomEntryIntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class CustomEntryExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+
+class CustomEntryDocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+
+class CustomEntryWordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+
+CustomEntry: TypeAlias = Union[
+    CustomEntryCustomEntry,
+    CustomEntryPredefinedEntry,
+    CustomEntryIntegrationEntry,
+    CustomEntryExactDataEntry,
+    CustomEntryDocumentFingerprintEntry,
+    CustomEntryWordListEntry,
+]
+
+
+class Custom(BaseModel):
+    id: str
+    """The id of the profile (uuid)."""
+
+    allowed_match_count: int
+    """Related DLP policies will trigger when the match count exceeds the number set."""
+
+    created_at: datetime
+    """When the profile was created."""
+
+    name: str
+    """The name of the profile."""
+
+    ocr_enabled: bool
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+    """When the profile was lasted updated."""
+
+    ai_context_enabled: Optional[bool] = None
+
+    confidence_threshold: Optional[Literal["low", "medium", "high", "very_high"]] = None
+
+    context_awareness: Optional[ContextAwareness] = None
+    """
+    Scan the context of predefined entries to only return matches surrounded by
+    keywords.
+    """
+
+    description: Optional[str] = None
+    """The description of the profile."""
+
+    entries: Optional[List[CustomEntry]] = None
+
+
+class PredefinedEntryCustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class PredefinedEntryPredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class PredefinedEntryPredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class PredefinedEntryPredefinedEntry(BaseModel):
+    id: str
+
+    confidence: PredefinedEntryPredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[PredefinedEntryPredefinedEntryVariant] = None
+
+
+class PredefinedEntryIntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class PredefinedEntryExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+
+class PredefinedEntryDocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+
+class PredefinedEntryWordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+
+PredefinedEntry: TypeAlias = Union[
+    PredefinedEntryCustomEntry,
+    PredefinedEntryPredefinedEntry,
+    PredefinedEntryIntegrationEntry,
+    PredefinedEntryExactDataEntry,
+    PredefinedEntryDocumentFingerprintEntry,
+    PredefinedEntryWordListEntry,
+]
+
+
+class Predefined(BaseModel):
+    id: str
+    """The id of the predefined profile (uuid)."""
+
+    allowed_match_count: int
+
+    entries: List[PredefinedEntry]
+
+    name: str
+    """The name of the predefined profile."""
+
+    type: Literal["predefined"]
+
+    ai_context_enabled: Optional[bool] = None
+
+    confidence_threshold: Optional[Literal["low", "medium", "high", "very_high"]] = None
+
+    context_awareness: Optional[ContextAwareness] = None
+    """
+    Scan the context of predefined entries to only return matches surrounded by
+    keywords.
+    """
+
+    ocr_enabled: Optional[bool] = None
+
+    open_access: Optional[bool] = None
+    """Whether this profile can be accessed by anyone."""
+
+
+class IntegrationEntryCustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class IntegrationEntryPredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class IntegrationEntryPredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class IntegrationEntryPredefinedEntry(BaseModel):
+    id: str
+
+    confidence: IntegrationEntryPredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[IntegrationEntryPredefinedEntryVariant] = None
+
+
+class IntegrationEntryIntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class IntegrationEntryExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+
+class IntegrationEntryDocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+
+class IntegrationEntryWordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+
+IntegrationEntry: TypeAlias = Union[
+    IntegrationEntryCustomEntry,
+    IntegrationEntryPredefinedEntry,
+    IntegrationEntryIntegrationEntry,
+    IntegrationEntryExactDataEntry,
+    IntegrationEntryDocumentFingerprintEntry,
+    IntegrationEntryWordListEntry,
+]
+
+
+class Integration(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    entries: List[IntegrationEntry]
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    description: Optional[str] = None
+    """The description of the profile."""
+
+
+CustomCreateResponse: TypeAlias = Annotated[Union[Custom, Predefined, Integration], PropertyInfo(discriminator="type")]
diff --git a/src/cloudflare/types/zero_trust/dlp/profiles/custom_delete_response.py b/src/cloudflare/types/zero_trust/dlp/profiles/custom_delete_response.py
deleted file mode 100644
index 15f451c25c3..00000000000
--- a/src/cloudflare/types/zero_trust/dlp/profiles/custom_delete_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["CustomDeleteResponse"]
-
-CustomDeleteResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/zero_trust/dlp/profiles/custom_get_response.py b/src/cloudflare/types/zero_trust/dlp/profiles/custom_get_response.py
new file mode 100644
index 00000000000..05c7b9010cf
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/profiles/custom_get_response.py
@@ -0,0 +1,528 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from .pattern import Pattern
+from ....._utils import PropertyInfo
+from ....._models import BaseModel
+from ..context_awareness import ContextAwareness
+
+__all__ = [
+    "CustomGetResponse",
+    "Custom",
+    "CustomEntry",
+    "CustomEntryCustomEntry",
+    "CustomEntryPredefinedEntry",
+    "CustomEntryPredefinedEntryConfidence",
+    "CustomEntryPredefinedEntryVariant",
+    "CustomEntryIntegrationEntry",
+    "CustomEntryExactDataEntry",
+    "CustomEntryDocumentFingerprintEntry",
+    "CustomEntryWordListEntry",
+    "Predefined",
+    "PredefinedEntry",
+    "PredefinedEntryCustomEntry",
+    "PredefinedEntryPredefinedEntry",
+    "PredefinedEntryPredefinedEntryConfidence",
+    "PredefinedEntryPredefinedEntryVariant",
+    "PredefinedEntryIntegrationEntry",
+    "PredefinedEntryExactDataEntry",
+    "PredefinedEntryDocumentFingerprintEntry",
+    "PredefinedEntryWordListEntry",
+    "Integration",
+    "IntegrationEntry",
+    "IntegrationEntryCustomEntry",
+    "IntegrationEntryPredefinedEntry",
+    "IntegrationEntryPredefinedEntryConfidence",
+    "IntegrationEntryPredefinedEntryVariant",
+    "IntegrationEntryIntegrationEntry",
+    "IntegrationEntryExactDataEntry",
+    "IntegrationEntryDocumentFingerprintEntry",
+    "IntegrationEntryWordListEntry",
+]
+
+
+class CustomEntryCustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class CustomEntryPredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class CustomEntryPredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class CustomEntryPredefinedEntry(BaseModel):
+    id: str
+
+    confidence: CustomEntryPredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[CustomEntryPredefinedEntryVariant] = None
+
+
+class CustomEntryIntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class CustomEntryExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+
+class CustomEntryDocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+
+class CustomEntryWordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+
+CustomEntry: TypeAlias = Union[
+    CustomEntryCustomEntry,
+    CustomEntryPredefinedEntry,
+    CustomEntryIntegrationEntry,
+    CustomEntryExactDataEntry,
+    CustomEntryDocumentFingerprintEntry,
+    CustomEntryWordListEntry,
+]
+
+
+class Custom(BaseModel):
+    id: str
+    """The id of the profile (uuid)."""
+
+    allowed_match_count: int
+    """Related DLP policies will trigger when the match count exceeds the number set."""
+
+    created_at: datetime
+    """When the profile was created."""
+
+    name: str
+    """The name of the profile."""
+
+    ocr_enabled: bool
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+    """When the profile was lasted updated."""
+
+    ai_context_enabled: Optional[bool] = None
+
+    confidence_threshold: Optional[Literal["low", "medium", "high", "very_high"]] = None
+
+    context_awareness: Optional[ContextAwareness] = None
+    """
+    Scan the context of predefined entries to only return matches surrounded by
+    keywords.
+    """
+
+    description: Optional[str] = None
+    """The description of the profile."""
+
+    entries: Optional[List[CustomEntry]] = None
+
+
+class PredefinedEntryCustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class PredefinedEntryPredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class PredefinedEntryPredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class PredefinedEntryPredefinedEntry(BaseModel):
+    id: str
+
+    confidence: PredefinedEntryPredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[PredefinedEntryPredefinedEntryVariant] = None
+
+
+class PredefinedEntryIntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class PredefinedEntryExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+
+class PredefinedEntryDocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+
+class PredefinedEntryWordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+
+PredefinedEntry: TypeAlias = Union[
+    PredefinedEntryCustomEntry,
+    PredefinedEntryPredefinedEntry,
+    PredefinedEntryIntegrationEntry,
+    PredefinedEntryExactDataEntry,
+    PredefinedEntryDocumentFingerprintEntry,
+    PredefinedEntryWordListEntry,
+]
+
+
+class Predefined(BaseModel):
+    id: str
+    """The id of the predefined profile (uuid)."""
+
+    allowed_match_count: int
+
+    entries: List[PredefinedEntry]
+
+    name: str
+    """The name of the predefined profile."""
+
+    type: Literal["predefined"]
+
+    ai_context_enabled: Optional[bool] = None
+
+    confidence_threshold: Optional[Literal["low", "medium", "high", "very_high"]] = None
+
+    context_awareness: Optional[ContextAwareness] = None
+    """
+    Scan the context of predefined entries to only return matches surrounded by
+    keywords.
+    """
+
+    ocr_enabled: Optional[bool] = None
+
+    open_access: Optional[bool] = None
+    """Whether this profile can be accessed by anyone."""
+
+
+class IntegrationEntryCustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class IntegrationEntryPredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class IntegrationEntryPredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class IntegrationEntryPredefinedEntry(BaseModel):
+    id: str
+
+    confidence: IntegrationEntryPredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[IntegrationEntryPredefinedEntryVariant] = None
+
+
+class IntegrationEntryIntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class IntegrationEntryExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+
+class IntegrationEntryDocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+
+class IntegrationEntryWordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+
+IntegrationEntry: TypeAlias = Union[
+    IntegrationEntryCustomEntry,
+    IntegrationEntryPredefinedEntry,
+    IntegrationEntryIntegrationEntry,
+    IntegrationEntryExactDataEntry,
+    IntegrationEntryDocumentFingerprintEntry,
+    IntegrationEntryWordListEntry,
+]
+
+
+class Integration(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    entries: List[IntegrationEntry]
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    description: Optional[str] = None
+    """The description of the profile."""
+
+
+CustomGetResponse: TypeAlias = Annotated[Union[Custom, Predefined, Integration], PropertyInfo(discriminator="type")]
diff --git a/src/cloudflare/types/zero_trust/dlp/profiles/custom_profile.py b/src/cloudflare/types/zero_trust/dlp/profiles/custom_profile.py
deleted file mode 100644
index b098fae9766..00000000000
--- a/src/cloudflare/types/zero_trust/dlp/profiles/custom_profile.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from datetime import datetime
-from typing_extensions import Literal
-
-from .pattern import Pattern
-from ....._models import BaseModel
-from ..context_awareness import ContextAwareness
-
-__all__ = ["CustomProfile", "Entry"]
-
-
-class Entry(BaseModel):
-    id: Optional[str] = None
-    """The ID for this entry"""
-
-    created_at: Optional[datetime] = None
-
-    enabled: Optional[bool] = None
-    """Whether the entry is enabled or not."""
-
-    name: Optional[str] = None
-    """The name of the entry."""
-
-    pattern: Optional[Pattern] = None
-    """A pattern that matches an entry"""
-
-    profile_id: Optional[object] = None
-    """ID of the parent profile"""
-
-    updated_at: Optional[datetime] = None
-
-
-class CustomProfile(BaseModel):
-    id: Optional[str] = None
-    """The ID for this profile"""
-
-    allowed_match_count: Optional[float] = None
-    """Related DLP policies will trigger when the match count exceeds the number set."""
-
-    context_awareness: Optional[ContextAwareness] = None
-    """
-    Scan the context of predefined entries to only return matches surrounded by
-    keywords.
-    """
-
-    created_at: Optional[datetime] = None
-
-    description: Optional[str] = None
-    """The description of the profile."""
-
-    entries: Optional[List[Entry]] = None
-    """The entries for this profile."""
-
-    name: Optional[str] = None
-    """The name of the profile."""
-
-    ocr_enabled: Optional[bool] = None
-    """If true, scan images via OCR to determine if any text present matches filters."""
-
-    type: Optional[Literal["custom"]] = None
-    """The type of the profile."""
-
-    updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/dlp/profiles/custom_update_params.py b/src/cloudflare/types/zero_trust/dlp/profiles/custom_update_params.py
index cceb67fe6c8..30d00081f93 100644
--- a/src/cloudflare/types/zero_trust/dlp/profiles/custom_update_params.py
+++ b/src/cloudflare/types/zero_trust/dlp/profiles/custom_update_params.py
@@ -2,27 +2,25 @@
 
 from __future__ import annotations
 
-from typing import Union, Iterable
-from typing_extensions import Required, TypedDict
+from typing import Union, Iterable, Optional
+from typing_extensions import Required, TypeAlias, TypedDict
 
 from .pattern_param import PatternParam
 from ..context_awareness_param import ContextAwarenessParam
 
-__all__ = [
-    "CustomUpdateParams",
-    "Entry",
-    "SharedEntry",
-    "SharedEntryDLPSharedEntryUpdatePredefined",
-    "SharedEntryDLPSharedEntryUpdateIntegration",
-]
+__all__ = ["CustomUpdateParams", "Entry", "EntryDLPNewCustomEntryWithID", "EntryDLPNewCustomEntry", "SharedEntry"]
 
 
 class CustomUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
 
-    allowed_match_count: float
-    """Related DLP policies will trigger when the match count exceeds the number set."""
+    name: Required[str]
+
+    ai_context_enabled: bool
+
+    allowed_match_count: Optional[int]
+
+    confidence_threshold: Optional[str]
 
     context_awareness: ContextAwarenessParam
     """
@@ -30,52 +28,43 @@ class CustomUpdateParams(TypedDict, total=False):
     keywords.
     """
 
-    description: str
+    description: Optional[str]
     """The description of the profile."""
 
-    entries: Iterable[Entry]
-    """The custom entries for this profile.
-
-    Array elements with IDs are modifying the existing entry with that ID. Elements
-    without ID will create new entries. Any entry not in the list will be deleted.
+    entries: Optional[Iterable[Entry]]
+    """
+    Custom entries from this profile. If this field is omitted, entries owned by
+    this profile will not be changed.
     """
-
-    name: str
-    """The name of the profile."""
 
     ocr_enabled: bool
-    """If true, scan images via OCR to determine if any text present matches filters."""
 
     shared_entries: Iterable[SharedEntry]
-    """Entries from other profiles (e.g.
+    """Other entries, e.g. predefined or integration."""
 
-    pre-defined Cloudflare profiles, or your Microsoft Information Protection
-    profiles).
-    """
 
+class EntryDLPNewCustomEntryWithID(TypedDict, total=False):
+    enabled: Required[bool]
+
+    entry_id: Required[str]
+
+    name: Required[str]
 
-class Entry(TypedDict, total=False):
-    enabled: bool
-    """Whether the entry is enabled or not."""
+    pattern: Required[PatternParam]
 
-    name: str
-    """The name of the entry."""
 
-    pattern: PatternParam
-    """A pattern that matches an entry"""
+class EntryDLPNewCustomEntry(TypedDict, total=False):
+    enabled: Required[bool]
 
-    profile_id: object
-    """ID of the parent profile"""
+    name: Required[str]
 
+    pattern: Required[PatternParam]
 
-class SharedEntryDLPSharedEntryUpdatePredefined(TypedDict, total=False):
-    enabled: bool
-    """Whether the entry is enabled or not."""
 
+Entry: TypeAlias = Union[EntryDLPNewCustomEntryWithID, EntryDLPNewCustomEntry]
 
-class SharedEntryDLPSharedEntryUpdateIntegration(TypedDict, total=False):
-    enabled: bool
-    """Whether the entry is enabled or not."""
 
+class SharedEntry(TypedDict, total=False):
+    enabled: Required[bool]
 
-SharedEntry = Union[SharedEntryDLPSharedEntryUpdatePredefined, SharedEntryDLPSharedEntryUpdateIntegration]
+    entry_id: Required[str]
diff --git a/src/cloudflare/types/zero_trust/dlp/profiles/custom_update_response.py b/src/cloudflare/types/zero_trust/dlp/profiles/custom_update_response.py
new file mode 100644
index 00000000000..47443582e9c
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/profiles/custom_update_response.py
@@ -0,0 +1,528 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Annotated, TypeAlias
+
+from .pattern import Pattern
+from ....._utils import PropertyInfo
+from ....._models import BaseModel
+from ..context_awareness import ContextAwareness
+
+__all__ = [
+    "CustomUpdateResponse",
+    "Custom",
+    "CustomEntry",
+    "CustomEntryCustomEntry",
+    "CustomEntryPredefinedEntry",
+    "CustomEntryPredefinedEntryConfidence",
+    "CustomEntryPredefinedEntryVariant",
+    "CustomEntryIntegrationEntry",
+    "CustomEntryExactDataEntry",
+    "CustomEntryDocumentFingerprintEntry",
+    "CustomEntryWordListEntry",
+    "Predefined",
+    "PredefinedEntry",
+    "PredefinedEntryCustomEntry",
+    "PredefinedEntryPredefinedEntry",
+    "PredefinedEntryPredefinedEntryConfidence",
+    "PredefinedEntryPredefinedEntryVariant",
+    "PredefinedEntryIntegrationEntry",
+    "PredefinedEntryExactDataEntry",
+    "PredefinedEntryDocumentFingerprintEntry",
+    "PredefinedEntryWordListEntry",
+    "Integration",
+    "IntegrationEntry",
+    "IntegrationEntryCustomEntry",
+    "IntegrationEntryPredefinedEntry",
+    "IntegrationEntryPredefinedEntryConfidence",
+    "IntegrationEntryPredefinedEntryVariant",
+    "IntegrationEntryIntegrationEntry",
+    "IntegrationEntryExactDataEntry",
+    "IntegrationEntryDocumentFingerprintEntry",
+    "IntegrationEntryWordListEntry",
+]
+
+
+class CustomEntryCustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class CustomEntryPredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class CustomEntryPredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class CustomEntryPredefinedEntry(BaseModel):
+    id: str
+
+    confidence: CustomEntryPredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[CustomEntryPredefinedEntryVariant] = None
+
+
+class CustomEntryIntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class CustomEntryExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+
+class CustomEntryDocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+
+class CustomEntryWordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+
+CustomEntry: TypeAlias = Union[
+    CustomEntryCustomEntry,
+    CustomEntryPredefinedEntry,
+    CustomEntryIntegrationEntry,
+    CustomEntryExactDataEntry,
+    CustomEntryDocumentFingerprintEntry,
+    CustomEntryWordListEntry,
+]
+
+
+class Custom(BaseModel):
+    id: str
+    """The id of the profile (uuid)."""
+
+    allowed_match_count: int
+    """Related DLP policies will trigger when the match count exceeds the number set."""
+
+    created_at: datetime
+    """When the profile was created."""
+
+    name: str
+    """The name of the profile."""
+
+    ocr_enabled: bool
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+    """When the profile was lasted updated."""
+
+    ai_context_enabled: Optional[bool] = None
+
+    confidence_threshold: Optional[Literal["low", "medium", "high", "very_high"]] = None
+
+    context_awareness: Optional[ContextAwareness] = None
+    """
+    Scan the context of predefined entries to only return matches surrounded by
+    keywords.
+    """
+
+    description: Optional[str] = None
+    """The description of the profile."""
+
+    entries: Optional[List[CustomEntry]] = None
+
+
+class PredefinedEntryCustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class PredefinedEntryPredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class PredefinedEntryPredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class PredefinedEntryPredefinedEntry(BaseModel):
+    id: str
+
+    confidence: PredefinedEntryPredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[PredefinedEntryPredefinedEntryVariant] = None
+
+
+class PredefinedEntryIntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class PredefinedEntryExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+
+class PredefinedEntryDocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+
+class PredefinedEntryWordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+
+PredefinedEntry: TypeAlias = Union[
+    PredefinedEntryCustomEntry,
+    PredefinedEntryPredefinedEntry,
+    PredefinedEntryIntegrationEntry,
+    PredefinedEntryExactDataEntry,
+    PredefinedEntryDocumentFingerprintEntry,
+    PredefinedEntryWordListEntry,
+]
+
+
+class Predefined(BaseModel):
+    id: str
+    """The id of the predefined profile (uuid)."""
+
+    allowed_match_count: int
+
+    entries: List[PredefinedEntry]
+
+    name: str
+    """The name of the predefined profile."""
+
+    type: Literal["predefined"]
+
+    ai_context_enabled: Optional[bool] = None
+
+    confidence_threshold: Optional[Literal["low", "medium", "high", "very_high"]] = None
+
+    context_awareness: Optional[ContextAwareness] = None
+    """
+    Scan the context of predefined entries to only return matches surrounded by
+    keywords.
+    """
+
+    ocr_enabled: Optional[bool] = None
+
+    open_access: Optional[bool] = None
+    """Whether this profile can be accessed by anyone."""
+
+
+class IntegrationEntryCustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class IntegrationEntryPredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class IntegrationEntryPredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class IntegrationEntryPredefinedEntry(BaseModel):
+    id: str
+
+    confidence: IntegrationEntryPredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[IntegrationEntryPredefinedEntryVariant] = None
+
+
+class IntegrationEntryIntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class IntegrationEntryExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+
+class IntegrationEntryDocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+
+class IntegrationEntryWordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+
+IntegrationEntry: TypeAlias = Union[
+    IntegrationEntryCustomEntry,
+    IntegrationEntryPredefinedEntry,
+    IntegrationEntryIntegrationEntry,
+    IntegrationEntryExactDataEntry,
+    IntegrationEntryDocumentFingerprintEntry,
+    IntegrationEntryWordListEntry,
+]
+
+
+class Integration(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    entries: List[IntegrationEntry]
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    description: Optional[str] = None
+    """The description of the profile."""
+
+
+CustomUpdateResponse: TypeAlias = Annotated[Union[Custom, Predefined, Integration], PropertyInfo(discriminator="type")]
diff --git a/src/cloudflare/types/zero_trust/dlp/profiles/pattern.py b/src/cloudflare/types/zero_trust/dlp/profiles/pattern.py
index 3c4d074a92a..29aaba37e27 100644
--- a/src/cloudflare/types/zero_trust/dlp/profiles/pattern.py
+++ b/src/cloudflare/types/zero_trust/dlp/profiles/pattern.py
@@ -10,11 +10,5 @@
 
 class Pattern(BaseModel):
     regex: str
-    """The regex pattern."""
 
     validation: Optional[Literal["luhn"]] = None
-    """Validation algorithm for the pattern.
-
-    This algorithm will get run on potential matches, and if it returns false, the
-    entry will not be matched.
-    """
diff --git a/src/cloudflare/types/zero_trust/dlp/profiles/pattern_param.py b/src/cloudflare/types/zero_trust/dlp/profiles/pattern_param.py
index 300edd1ebf6..6f085ff60fb 100644
--- a/src/cloudflare/types/zero_trust/dlp/profiles/pattern_param.py
+++ b/src/cloudflare/types/zero_trust/dlp/profiles/pattern_param.py
@@ -9,11 +9,5 @@
 
 class PatternParam(TypedDict, total=False):
     regex: Required[str]
-    """The regex pattern."""
 
     validation: Literal["luhn"]
-    """Validation algorithm for the pattern.
-
-    This algorithm will get run on potential matches, and if it returns false, the
-    entry will not be matched.
-    """
diff --git a/src/cloudflare/types/zero_trust/dlp/profiles/predefined_get_response.py b/src/cloudflare/types/zero_trust/dlp/profiles/predefined_get_response.py
new file mode 100644
index 00000000000..e58ce4e7c97
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/profiles/predefined_get_response.py
@@ -0,0 +1,182 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from .pattern import Pattern
+from ....._models import BaseModel
+
+__all__ = [
+    "PredefinedGetResponse",
+    "Entry",
+    "EntryCustomEntry",
+    "EntryPredefinedEntry",
+    "EntryPredefinedEntryConfidence",
+    "EntryPredefinedEntryVariant",
+    "EntryIntegrationEntry",
+    "EntryExactDataEntry",
+    "EntryDocumentFingerprintEntry",
+    "EntryWordListEntry",
+]
+
+
+class EntryCustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class EntryPredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class EntryPredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class EntryPredefinedEntry(BaseModel):
+    id: str
+
+    confidence: EntryPredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[EntryPredefinedEntryVariant] = None
+
+
+class EntryIntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class EntryExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+
+class EntryDocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+
+class EntryWordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+
+Entry: TypeAlias = Union[
+    EntryCustomEntry,
+    EntryPredefinedEntry,
+    EntryIntegrationEntry,
+    EntryExactDataEntry,
+    EntryDocumentFingerprintEntry,
+    EntryWordListEntry,
+]
+
+
+class PredefinedGetResponse(BaseModel):
+    id: str
+    """The id of the predefined profile (uuid)."""
+
+    allowed_match_count: int
+
+    confidence_threshold: Optional[str] = None
+
+    enabled_entries: List[str]
+    """Entries to enable for this predefined profile.
+
+    Any entries not provided will be disabled.
+    """
+
+    entries: List[Entry]
+    """This field has been deprecated for `enabled_entries`."""
+
+    name: str
+    """The name of the predefined profile."""
+
+    ai_context_enabled: Optional[bool] = None
+
+    ocr_enabled: Optional[bool] = None
+
+    open_access: Optional[bool] = None
+    """Whether this profile can be accessed by anyone."""
diff --git a/src/cloudflare/types/zero_trust/dlp/profiles/predefined_profile.py b/src/cloudflare/types/zero_trust/dlp/profiles/predefined_profile.py
deleted file mode 100644
index 6796888383a..00000000000
--- a/src/cloudflare/types/zero_trust/dlp/profiles/predefined_profile.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from typing_extensions import Literal
-
-from ....._models import BaseModel
-from ..context_awareness import ContextAwareness
-
-__all__ = ["PredefinedProfile", "Entry"]
-
-
-class Entry(BaseModel):
-    id: Optional[str] = None
-    """The ID for this entry"""
-
-    enabled: Optional[bool] = None
-    """Whether the entry is enabled or not."""
-
-    name: Optional[str] = None
-    """The name of the entry."""
-
-    profile_id: Optional[object] = None
-    """ID of the parent profile"""
-
-
-class PredefinedProfile(BaseModel):
-    id: Optional[str] = None
-    """The ID for this profile"""
-
-    allowed_match_count: Optional[float] = None
-    """Related DLP policies will trigger when the match count exceeds the number set."""
-
-    context_awareness: Optional[ContextAwareness] = None
-    """
-    Scan the context of predefined entries to only return matches surrounded by
-    keywords.
-    """
-
-    entries: Optional[List[Entry]] = None
-    """The entries for this profile."""
-
-    name: Optional[str] = None
-    """The name of the profile."""
-
-    ocr_enabled: Optional[bool] = None
-    """If true, scan images via OCR to determine if any text present matches filters."""
-
-    type: Optional[Literal["predefined"]] = None
-    """The type of the profile."""
diff --git a/src/cloudflare/types/zero_trust/dlp/profiles/predefined_update_params.py b/src/cloudflare/types/zero_trust/dlp/profiles/predefined_update_params.py
index 6ba7ebccb4b..9b25d9eaef5 100644
--- a/src/cloudflare/types/zero_trust/dlp/profiles/predefined_update_params.py
+++ b/src/cloudflare/types/zero_trust/dlp/profiles/predefined_update_params.py
@@ -2,34 +2,31 @@
 
 from __future__ import annotations
 
-from typing import Iterable
+from typing import Iterable, Optional
 from typing_extensions import Required, TypedDict
 
-from ..context_awareness_param import ContextAwarenessParam
+from ....._types import SequenceNotStr
 
 __all__ = ["PredefinedUpdateParams", "Entry"]
 
 
 class PredefinedUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
 
-    allowed_match_count: float
-    """Related DLP policies will trigger when the match count exceeds the number set."""
+    ai_context_enabled: bool
 
-    context_awareness: ContextAwarenessParam
-    """
-    Scan the context of predefined entries to only return matches surrounded by
-    keywords.
-    """
+    allowed_match_count: Optional[int]
+
+    confidence_threshold: Optional[str]
+
+    enabled_entries: Optional[SequenceNotStr[str]]
 
     entries: Iterable[Entry]
-    """The entries for this profile."""
 
     ocr_enabled: bool
-    """If true, scan images via OCR to determine if any text present matches filters."""
 
 
 class Entry(TypedDict, total=False):
-    enabled: bool
-    """Whether the entry is enabled or not."""
+    id: Required[str]
+
+    enabled: Required[bool]
diff --git a/src/cloudflare/types/zero_trust/dlp/profiles/predefined_update_response.py b/src/cloudflare/types/zero_trust/dlp/profiles/predefined_update_response.py
new file mode 100644
index 00000000000..4f11f1de79d
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/dlp/profiles/predefined_update_response.py
@@ -0,0 +1,182 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, TypeAlias
+
+from .pattern import Pattern
+from ....._models import BaseModel
+
+__all__ = [
+    "PredefinedUpdateResponse",
+    "Entry",
+    "EntryCustomEntry",
+    "EntryPredefinedEntry",
+    "EntryPredefinedEntryConfidence",
+    "EntryPredefinedEntryVariant",
+    "EntryIntegrationEntry",
+    "EntryExactDataEntry",
+    "EntryDocumentFingerprintEntry",
+    "EntryWordListEntry",
+]
+
+
+class EntryCustomEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    pattern: Pattern
+
+    type: Literal["custom"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class EntryPredefinedEntryConfidence(BaseModel):
+    ai_context_available: bool
+    """Indicates whether this entry has AI remote service validation."""
+
+    available: bool
+    """
+    Indicates whether this entry has any form of validation that is not an AI remote
+    service.
+    """
+
+
+class EntryPredefinedEntryVariant(BaseModel):
+    topic_type: Literal["Intent", "Content"]
+
+    type: Literal["PromptTopic"]
+
+    description: Optional[str] = None
+
+
+class EntryPredefinedEntry(BaseModel):
+    id: str
+
+    confidence: EntryPredefinedEntryConfidence
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["predefined"]
+
+    profile_id: Optional[str] = None
+
+    variant: Optional[EntryPredefinedEntryVariant] = None
+
+
+class EntryIntegrationEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["integration"]
+
+    updated_at: datetime
+
+    profile_id: Optional[str] = None
+
+
+class EntryExactDataEntry(BaseModel):
+    id: str
+
+    case_sensitive: bool
+    """
+    Only applies to custom word lists. Determines if the words should be matched in
+    a case-sensitive manner Cannot be set to false if secret is true
+    """
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    secret: bool
+
+    type: Literal["exact_data"]
+
+    updated_at: datetime
+
+
+class EntryDocumentFingerprintEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["document_fingerprint"]
+
+    updated_at: datetime
+
+
+class EntryWordListEntry(BaseModel):
+    id: str
+
+    created_at: datetime
+
+    enabled: bool
+
+    name: str
+
+    type: Literal["word_list"]
+
+    updated_at: datetime
+
+    word_list: object
+
+    profile_id: Optional[str] = None
+
+
+Entry: TypeAlias = Union[
+    EntryCustomEntry,
+    EntryPredefinedEntry,
+    EntryIntegrationEntry,
+    EntryExactDataEntry,
+    EntryDocumentFingerprintEntry,
+    EntryWordListEntry,
+]
+
+
+class PredefinedUpdateResponse(BaseModel):
+    id: str
+    """The id of the predefined profile (uuid)."""
+
+    allowed_match_count: int
+
+    confidence_threshold: Optional[str] = None
+
+    enabled_entries: List[str]
+    """Entries to enable for this predefined profile.
+
+    Any entries not provided will be disabled.
+    """
+
+    entries: List[Entry]
+    """This field has been deprecated for `enabled_entries`."""
+
+    name: str
+    """The name of the predefined profile."""
+
+    ai_context_enabled: Optional[bool] = None
+
+    ocr_enabled: Optional[bool] = None
+
+    open_access: Optional[bool] = None
+    """Whether this profile can be accessed by anyone."""
diff --git a/src/cloudflare/types/zero_trust/dlp/skip_configuration.py b/src/cloudflare/types/zero_trust/dlp/skip_configuration.py
index 710f5e59ec2..78993298bb4 100644
--- a/src/cloudflare/types/zero_trust/dlp/skip_configuration.py
+++ b/src/cloudflare/types/zero_trust/dlp/skip_configuration.py
@@ -1,11 +1,12 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ...._models import BaseModel
 
 __all__ = ["SkipConfiguration"]
 
 
 class SkipConfiguration(BaseModel):
+    """Content types to exclude from context analysis and return all matches."""
+
     files: bool
     """If the content type is a file, skip context analysis and return all matches."""
diff --git a/src/cloudflare/types/zero_trust/dlp/skip_configuration_param.py b/src/cloudflare/types/zero_trust/dlp/skip_configuration_param.py
index e8d6c634eab..19676136962 100644
--- a/src/cloudflare/types/zero_trust/dlp/skip_configuration_param.py
+++ b/src/cloudflare/types/zero_trust/dlp/skip_configuration_param.py
@@ -8,5 +8,7 @@
 
 
 class SkipConfigurationParam(TypedDict, total=False):
+    """Content types to exclude from context analysis and return all matches."""
+
     files: Required[bool]
     """If the content type is a file, skip context analysis and return all matches."""
diff --git a/src/cloudflare/types/zero_trust/everyone_rule.py b/src/cloudflare/types/zero_trust/everyone_rule.py
deleted file mode 100644
index 24b0eeb68d1..00000000000
--- a/src/cloudflare/types/zero_trust/everyone_rule.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-from ..._models import BaseModel
-
-__all__ = ["EveryoneRule"]
-
-
-class EveryoneRule(BaseModel):
-    everyone: object
-    """An empty object which matches on all users."""
diff --git a/src/cloudflare/types/zero_trust/everyone_rule_param.py b/src/cloudflare/types/zero_trust/everyone_rule_param.py
deleted file mode 100644
index b026c3d21f0..00000000000
--- a/src/cloudflare/types/zero_trust/everyone_rule_param.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["EveryoneRuleParam"]
-
-
-class EveryoneRuleParam(TypedDict, total=False):
-    everyone: Required[object]
-    """An empty object which matches on all users."""
diff --git a/src/cloudflare/types/zero_trust/gateway/__init__.py b/src/cloudflare/types/zero_trust/gateway/__init__.py
index e9187691b1f..17c93d1d9b4 100644
--- a/src/cloudflare/types/zero_trust/gateway/__init__.py
+++ b/src/cloudflare/types/zero_trust/gateway/__init__.py
@@ -4,23 +4,34 @@
 
 from .app_type import AppType as AppType
 from .category import Category as Category
+from .endpoint import Endpoint as Endpoint
 from .location import Location as Location
 from .schedule import Schedule as Schedule
+from .ip_network import IPNetwork as IPNetwork
 from .gateway_ips import GatewayIPs as GatewayIPs
+from .doh_endpoint import DOHEndpoint as DOHEndpoint
+from .dot_endpoint import DOTEndpoint as DOTEndpoint
 from .gateway_item import GatewayItem as GatewayItem
 from .gateway_list import GatewayList as GatewayList
 from .gateway_rule import GatewayRule as GatewayRule
+from .ipv6_network import IPV6Network as IPV6Network
 from .rule_setting import RuleSetting as RuleSetting
 from .tls_settings import TLSSettings as TLSSettings
 from .fips_settings import FipsSettings as FipsSettings
+from .ipv4_endpoint import IPV4Endpoint as IPV4Endpoint
+from .ipv6_endpoint import IPV6Endpoint as IPV6Endpoint
+from .endpoint_param import EndpointParam as EndpointParam
 from .gateway_filter import GatewayFilter as GatewayFilter
 from .proxy_endpoint import ProxyEndpoint as ProxyEndpoint
 from .schedule_param import ScheduleParam as ScheduleParam
 from .logging_setting import LoggingSetting as LoggingSetting
 from .gateway_settings import GatewaySettings as GatewaySettings
+from .ip_network_param import IPNetworkParam as IPNetworkParam
 from .list_edit_params import ListEditParams as ListEditParams
 from .list_list_params import ListListParams as ListListParams
-from .gateway_item_param import GatewayItemParam as GatewayItemParam
+from .doh_endpoint_param import DOHEndpointParam as DOHEndpointParam
+from .dot_endpoint_param import DOTEndpointParam as DOTEndpointParam
+from .ipv6_network_param import IPV6NetworkParam as IPV6NetworkParam
 from .list_create_params import ListCreateParams as ListCreateParams
 from .list_update_params import ListUpdateParams as ListUpdateParams
 from .protocol_detection import ProtocolDetection as ProtocolDetection
@@ -31,9 +42,9 @@
 from .anti_virus_settings import AntiVirusSettings as AntiVirusSettings
 from .block_page_settings import BlockPageSettings as BlockPageSettings
 from .fips_settings_param import FipsSettingsParam as FipsSettingsParam
+from .ipv4_endpoint_param import IPV4EndpointParam as IPV4EndpointParam
+from .ipv6_endpoint_param import IPV6EndpointParam as IPV6EndpointParam
 from .list_create_response import ListCreateResponse as ListCreateResponse
-from .list_delete_response import ListDeleteResponse as ListDeleteResponse
-from .rule_delete_response import RuleDeleteResponse as RuleDeleteResponse
 from .activity_log_settings import ActivityLogSettings as ActivityLogSettings
 from .logging_update_params import LoggingUpdateParams as LoggingUpdateParams
 from .notification_settings import NotificationSettings as NotificationSettings
@@ -44,7 +55,6 @@
 from .certificate_get_response import CertificateGetResponse as CertificateGetResponse
 from .dns_resolver_settings_v4 import DNSResolverSettingsV4 as DNSResolverSettingsV4
 from .dns_resolver_settings_v6 import DNSResolverSettingsV6 as DNSResolverSettingsV6
-from .location_delete_response import LocationDeleteResponse as LocationDeleteResponse
 from .protocol_detection_param import ProtocolDetectionParam as ProtocolDetectionParam
 from .anti_virus_settings_param import AntiVirusSettingsParam as AntiVirusSettingsParam
 from .block_page_settings_param import BlockPageSettingsParam as BlockPageSettingsParam
@@ -55,22 +65,24 @@
 from .configuration_get_response import ConfigurationGetResponse as ConfigurationGetResponse
 from .proxy_endpoint_edit_params import ProxyEndpointEditParams as ProxyEndpointEditParams
 from .activity_log_settings_param import ActivityLogSettingsParam as ActivityLogSettingsParam
+from .certificate_activate_params import CertificateActivateParams as CertificateActivateParams
 from .certificate_create_response import CertificateCreateResponse as CertificateCreateResponse
 from .certificate_delete_response import CertificateDeleteResponse as CertificateDeleteResponse
 from .configuration_edit_response import ConfigurationEditResponse as ConfigurationEditResponse
 from .configuration_update_params import ConfigurationUpdateParams as ConfigurationUpdateParams
 from .custom_certificate_settings import CustomCertificateSettings as CustomCertificateSettings
 from .notification_settings_param import NotificationSettingsParam as NotificationSettingsParam
-from .proxy_endpoint_get_response import ProxyEndpointGetResponse as ProxyEndpointGetResponse
 from .body_scanning_settings_param import BodyScanningSettingsParam as BodyScanningSettingsParam
 from .proxy_endpoint_create_params import ProxyEndpointCreateParams as ProxyEndpointCreateParams
+from .certificate_activate_response import CertificateActivateResponse as CertificateActivateResponse
+from .certificate_deactivate_params import CertificateDeactivateParams as CertificateDeactivateParams
 from .configuration_update_response import ConfigurationUpdateResponse as ConfigurationUpdateResponse
 from .extended_email_matching_param import ExtendedEmailMatchingParam as ExtendedEmailMatchingParam
 from .dns_resolver_settings_v4_param import DNSResolverSettingsV4Param as DNSResolverSettingsV4Param
 from .dns_resolver_settings_v6_param import DNSResolverSettingsV6Param as DNSResolverSettingsV6Param
 from .gateway_configuration_settings import GatewayConfigurationSettings as GatewayConfigurationSettings
-from .proxy_endpoint_delete_response import ProxyEndpointDeleteResponse as ProxyEndpointDeleteResponse
 from .audit_ssh_setting_update_params import AuditSSHSettingUpdateParams as AuditSSHSettingUpdateParams
+from .certificate_deactivate_response import CertificateDeactivateResponse as CertificateDeactivateResponse
 from .browser_isolation_settings_param import BrowserIsolationSettingsParam as BrowserIsolationSettingsParam
 from .custom_certificate_settings_param import CustomCertificateSettingsParam as CustomCertificateSettingsParam
 from .gateway_configuration_settings_param import GatewayConfigurationSettingsParam as GatewayConfigurationSettingsParam
diff --git a/src/cloudflare/types/zero_trust/gateway/activity_log_settings.py b/src/cloudflare/types/zero_trust/gateway/activity_log_settings.py
index d17f765af7e..941eb77ff14 100644
--- a/src/cloudflare/types/zero_trust/gateway/activity_log_settings.py
+++ b/src/cloudflare/types/zero_trust/gateway/activity_log_settings.py
@@ -8,5 +8,7 @@
 
 
 class ActivityLogSettings(BaseModel):
+    """Specify activity log settings."""
+
     enabled: Optional[bool] = None
-    """Enable activity logging."""
+    """Specify whether to log activity."""
diff --git a/src/cloudflare/types/zero_trust/gateway/activity_log_settings_param.py b/src/cloudflare/types/zero_trust/gateway/activity_log_settings_param.py
index 5dcdd0e03b6..ae0d2fa393d 100644
--- a/src/cloudflare/types/zero_trust/gateway/activity_log_settings_param.py
+++ b/src/cloudflare/types/zero_trust/gateway/activity_log_settings_param.py
@@ -2,11 +2,14 @@
 
 from __future__ import annotations
 
+from typing import Optional
 from typing_extensions import TypedDict
 
 __all__ = ["ActivityLogSettingsParam"]
 
 
 class ActivityLogSettingsParam(TypedDict, total=False):
-    enabled: bool
-    """Enable activity logging."""
+    """Specify activity log settings."""
+
+    enabled: Optional[bool]
+    """Specify whether to log activity."""
diff --git a/src/cloudflare/types/zero_trust/gateway/anti_virus_settings.py b/src/cloudflare/types/zero_trust/gateway/anti_virus_settings.py
index 85cf41948ef..ccaf6dc0fca 100644
--- a/src/cloudflare/types/zero_trust/gateway/anti_virus_settings.py
+++ b/src/cloudflare/types/zero_trust/gateway/anti_virus_settings.py
@@ -9,17 +9,16 @@
 
 
 class AntiVirusSettings(BaseModel):
+    """Specify anti-virus settings."""
+
     enabled_download_phase: Optional[bool] = None
-    """Enable anti-virus scanning on downloads."""
+    """Specify whether to enable anti-virus scanning on downloads."""
 
     enabled_upload_phase: Optional[bool] = None
-    """Enable anti-virus scanning on uploads."""
+    """Specify whether to enable anti-virus scanning on uploads."""
 
     fail_closed: Optional[bool] = None
-    """Block requests for files that cannot be scanned."""
+    """Specify whether to block requests for unscannable files."""
 
     notification_settings: Optional[NotificationSettings] = None
-    """
-    Configure a message to display on the user's device when an antivirus search is
-    performed.
-    """
+    """Configure the message the user's device shows during an antivirus scan."""
diff --git a/src/cloudflare/types/zero_trust/gateway/anti_virus_settings_param.py b/src/cloudflare/types/zero_trust/gateway/anti_virus_settings_param.py
index ee88b2f890e..da89e01241e 100644
--- a/src/cloudflare/types/zero_trust/gateway/anti_virus_settings_param.py
+++ b/src/cloudflare/types/zero_trust/gateway/anti_virus_settings_param.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from typing import Optional
 from typing_extensions import TypedDict
 
 from .notification_settings_param import NotificationSettingsParam
@@ -10,17 +11,16 @@
 
 
 class AntiVirusSettingsParam(TypedDict, total=False):
-    enabled_download_phase: bool
-    """Enable anti-virus scanning on downloads."""
+    """Specify anti-virus settings."""
 
-    enabled_upload_phase: bool
-    """Enable anti-virus scanning on uploads."""
+    enabled_download_phase: Optional[bool]
+    """Specify whether to enable anti-virus scanning on downloads."""
 
-    fail_closed: bool
-    """Block requests for files that cannot be scanned."""
+    enabled_upload_phase: Optional[bool]
+    """Specify whether to enable anti-virus scanning on uploads."""
 
-    notification_settings: NotificationSettingsParam
-    """
-    Configure a message to display on the user's device when an antivirus search is
-    performed.
-    """
+    fail_closed: Optional[bool]
+    """Specify whether to block requests for unscannable files."""
+
+    notification_settings: Optional[NotificationSettingsParam]
+    """Configure the message the user's device shows during an antivirus scan."""
diff --git a/src/cloudflare/types/zero_trust/gateway/app_type.py b/src/cloudflare/types/zero_trust/gateway/app_type.py
index d3c9c4dee03..452c93e133f 100644
--- a/src/cloudflare/types/zero_trust/gateway/app_type.py
+++ b/src/cloudflare/types/zero_trust/gateway/app_type.py
@@ -2,6 +2,7 @@
 
 from typing import Union, Optional
 from datetime import datetime
+from typing_extensions import TypeAlias
 
 from ...._models import BaseModel
 
@@ -10,36 +11,36 @@
 
 class ZeroTrustGatewayApplication(BaseModel):
     id: Optional[int] = None
-    """The identifier for this application. There is only one application per ID."""
+    """Identify this application. Only one application per ID."""
 
     application_type_id: Optional[int] = None
-    """The identifier for the type of this application.
+    """Identify the type of this application.
 
-    There can be many applications with the same type. This refers to the `id` of a
-    returned application type.
+    Multiple applications can share the same type. Refers to the `id` of a returned
+    application type.
     """
 
     created_at: Optional[datetime] = None
 
     name: Optional[str] = None
-    """The name of the application or application type."""
+    """Specify the name of the application or application type."""
 
 
 class ZeroTrustGatewayApplicationType(BaseModel):
     id: Optional[int] = None
-    """The identifier for the type of this application.
+    """Identify the type of this application.
 
-    There can be many applications with the same type. This refers to the `id` of a
-    returned application type.
+    Multiple applications can share the same type. Refers to the `id` of a returned
+    application type.
     """
 
     created_at: Optional[datetime] = None
 
     description: Optional[str] = None
-    """A short summary of applications with this type."""
+    """Provide a short summary of applications with this type."""
 
     name: Optional[str] = None
-    """The name of the application or application type."""
+    """Specify the name of the application or application type."""
 
 
-AppType = Union[ZeroTrustGatewayApplication, ZeroTrustGatewayApplicationType]
+AppType: TypeAlias = Union[ZeroTrustGatewayApplication, ZeroTrustGatewayApplicationType]
diff --git a/src/cloudflare/types/zero_trust/gateway/audit_ssh_setting_update_params.py b/src/cloudflare/types/zero_trust/gateway/audit_ssh_setting_update_params.py
index fc6ef9b9a5a..2cf5b52ec81 100644
--- a/src/cloudflare/types/zero_trust/gateway/audit_ssh_setting_update_params.py
+++ b/src/cloudflare/types/zero_trust/gateway/audit_ssh_setting_update_params.py
@@ -11,7 +11,8 @@ class AuditSSHSettingUpdateParams(TypedDict, total=False):
     account_id: Required[str]
 
     public_key: Required[str]
-    """SSH encryption public key"""
+    """Provide the Base64-encoded HPKE public key that encrypts SSH session logs.
 
-    seed_id: str
-    """Seed ID"""
+    See
+    https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/use-cases/ssh/ssh-infrastructure-access/#enable-ssh-command-logging.
+    """
diff --git a/src/cloudflare/types/zero_trust/gateway/block_page_settings.py b/src/cloudflare/types/zero_trust/gateway/block_page_settings.py
index 403fbcbb70f..a9eea3d53f7 100644
--- a/src/cloudflare/types/zero_trust/gateway/block_page_settings.py
+++ b/src/cloudflare/types/zero_trust/gateway/block_page_settings.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from typing_extensions import Literal
 
 from ...._models import BaseModel
 
@@ -8,29 +9,70 @@
 
 
 class BlockPageSettings(BaseModel):
+    """Specify block page layout settings."""
+
     background_color: Optional[str] = None
-    """Block page background color in #rrggbb format."""
+    """
+    Specify the block page background color in `#rrggbb` format when the mode is
+    customized_block_page.
+    """
 
     enabled: Optional[bool] = None
-    """Enable only cipher suites and TLS versions compliant with FIPS 140-2."""
+    """Specify whether to enable the custom block page."""
 
     footer_text: Optional[str] = None
-    """Block page footer text."""
+    """Specify the block page footer text when the mode is customized_block_page."""
 
     header_text: Optional[str] = None
-    """Block page header text."""
+    """Specify the block page header text when the mode is customized_block_page."""
+
+    include_context: Optional[bool] = None
+    """Specify whether to append context to target_uri as query parameters.
+
+    This applies only when the mode is redirect_uri.
+    """
 
     logo_path: Optional[str] = None
-    """Full URL to the logo file."""
+    """Specify the full URL to the logo file when the mode is customized_block_page."""
 
     mailto_address: Optional[str] = None
-    """Admin email for users to contact."""
+    """
+    Specify the admin email for users to contact when the mode is
+    customized_block_page.
+    """
 
     mailto_subject: Optional[str] = None
-    """Subject line for emails created from block page."""
+    """
+    Specify the subject line for emails created from the block page when the mode is
+    customized_block_page.
+    """
+
+    mode: Optional[Literal["", "customized_block_page", "redirect_uri"]] = None
+    """
+    Specify whether to redirect users to a Cloudflare-hosted block page or a
+    customer-provided URI.
+    """
 
     name: Optional[str] = None
-    """Block page title."""
+    """Specify the block page title when the mode is customized_block_page."""
+
+    read_only: Optional[bool] = None
+    """
+    Indicate that this setting was shared via the Orgs API and read only for the
+    current account.
+    """
+
+    source_account: Optional[str] = None
+    """Indicate the account tag of the account that shared this setting."""
 
     suppress_footer: Optional[bool] = None
-    """Suppress detailed info at the bottom of the block page."""
+    """
+    Specify whether to suppress detailed information at the bottom of the block page
+    when the mode is customized_block_page.
+    """
+
+    target_uri: Optional[str] = None
+    """Specify the URI to redirect users to when the mode is redirect_uri."""
+
+    version: Optional[int] = None
+    """Indicate the version number of the setting."""
diff --git a/src/cloudflare/types/zero_trust/gateway/block_page_settings_param.py b/src/cloudflare/types/zero_trust/gateway/block_page_settings_param.py
index 8adca2cfdb0..c1ee69d9b37 100644
--- a/src/cloudflare/types/zero_trust/gateway/block_page_settings_param.py
+++ b/src/cloudflare/types/zero_trust/gateway/block_page_settings_param.py
@@ -2,35 +2,65 @@
 
 from __future__ import annotations
 
-from typing_extensions import TypedDict
+from typing import Optional
+from typing_extensions import Literal, TypedDict
 
 __all__ = ["BlockPageSettingsParam"]
 
 
 class BlockPageSettingsParam(TypedDict, total=False):
+    """Specify block page layout settings."""
+
     background_color: str
-    """Block page background color in #rrggbb format."""
+    """
+    Specify the block page background color in `#rrggbb` format when the mode is
+    customized_block_page.
+    """
 
-    enabled: bool
-    """Enable only cipher suites and TLS versions compliant with FIPS 140-2."""
+    enabled: Optional[bool]
+    """Specify whether to enable the custom block page."""
 
     footer_text: str
-    """Block page footer text."""
+    """Specify the block page footer text when the mode is customized_block_page."""
 
     header_text: str
-    """Block page header text."""
+    """Specify the block page header text when the mode is customized_block_page."""
+
+    include_context: bool
+    """Specify whether to append context to target_uri as query parameters.
+
+    This applies only when the mode is redirect_uri.
+    """
 
     logo_path: str
-    """Full URL to the logo file."""
+    """Specify the full URL to the logo file when the mode is customized_block_page."""
 
     mailto_address: str
-    """Admin email for users to contact."""
+    """
+    Specify the admin email for users to contact when the mode is
+    customized_block_page.
+    """
 
     mailto_subject: str
-    """Subject line for emails created from block page."""
+    """
+    Specify the subject line for emails created from the block page when the mode is
+    customized_block_page.
+    """
+
+    mode: Literal["", "customized_block_page", "redirect_uri"]
+    """
+    Specify whether to redirect users to a Cloudflare-hosted block page or a
+    customer-provided URI.
+    """
 
     name: str
-    """Block page title."""
+    """Specify the block page title when the mode is customized_block_page."""
 
     suppress_footer: bool
-    """Suppress detailed info at the bottom of the block page."""
+    """
+    Specify whether to suppress detailed information at the bottom of the block page
+    when the mode is customized_block_page.
+    """
+
+    target_uri: str
+    """Specify the URI to redirect users to when the mode is redirect_uri."""
diff --git a/src/cloudflare/types/zero_trust/gateway/body_scanning_settings.py b/src/cloudflare/types/zero_trust/gateway/body_scanning_settings.py
index 4d21ed246a6..375200f12d5 100644
--- a/src/cloudflare/types/zero_trust/gateway/body_scanning_settings.py
+++ b/src/cloudflare/types/zero_trust/gateway/body_scanning_settings.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from typing_extensions import Literal
 
 from ...._models import BaseModel
 
@@ -8,5 +9,7 @@
 
 
 class BodyScanningSettings(BaseModel):
-    inspection_mode: Optional[str] = None
-    """Set the inspection mode to either `deep` or `shallow`."""
+    """Specify the DLP inspection mode."""
+
+    inspection_mode: Optional[Literal["deep", "shallow"]] = None
+    """Specify the inspection mode as either `deep` or `shallow`."""
diff --git a/src/cloudflare/types/zero_trust/gateway/body_scanning_settings_param.py b/src/cloudflare/types/zero_trust/gateway/body_scanning_settings_param.py
index 3ffd6f9037e..85b6c66b1cc 100644
--- a/src/cloudflare/types/zero_trust/gateway/body_scanning_settings_param.py
+++ b/src/cloudflare/types/zero_trust/gateway/body_scanning_settings_param.py
@@ -2,11 +2,13 @@
 
 from __future__ import annotations
 
-from typing_extensions import TypedDict
+from typing_extensions import Literal, TypedDict
 
 __all__ = ["BodyScanningSettingsParam"]
 
 
 class BodyScanningSettingsParam(TypedDict, total=False):
-    inspection_mode: str
-    """Set the inspection mode to either `deep` or `shallow`."""
+    """Specify the DLP inspection mode."""
+
+    inspection_mode: Literal["deep", "shallow"]
+    """Specify the inspection mode as either `deep` or `shallow`."""
diff --git a/src/cloudflare/types/zero_trust/gateway/browser_isolation_settings.py b/src/cloudflare/types/zero_trust/gateway/browser_isolation_settings.py
index e55ca6ff780..3a69dc5dbce 100644
--- a/src/cloudflare/types/zero_trust/gateway/browser_isolation_settings.py
+++ b/src/cloudflare/types/zero_trust/gateway/browser_isolation_settings.py
@@ -8,8 +8,10 @@
 
 
 class BrowserIsolationSettings(BaseModel):
+    """Specify Clientless Browser Isolation settings."""
+
     non_identity_enabled: Optional[bool] = None
-    """Enable non-identity onramp support for Browser Isolation."""
+    """Specify whether to enable non-identity onramp support for Browser Isolation."""
 
     url_browser_isolation_enabled: Optional[bool] = None
-    """Enable Clientless Browser Isolation."""
+    """Specify whether to enable Clientless Browser Isolation."""
diff --git a/src/cloudflare/types/zero_trust/gateway/browser_isolation_settings_param.py b/src/cloudflare/types/zero_trust/gateway/browser_isolation_settings_param.py
index 3b43b6df009..57670f9cff2 100644
--- a/src/cloudflare/types/zero_trust/gateway/browser_isolation_settings_param.py
+++ b/src/cloudflare/types/zero_trust/gateway/browser_isolation_settings_param.py
@@ -8,8 +8,10 @@
 
 
 class BrowserIsolationSettingsParam(TypedDict, total=False):
+    """Specify Clientless Browser Isolation settings."""
+
     non_identity_enabled: bool
-    """Enable non-identity onramp support for Browser Isolation."""
+    """Specify whether to enable non-identity onramp support for Browser Isolation."""
 
     url_browser_isolation_enabled: bool
-    """Enable Clientless Browser Isolation."""
+    """Specify whether to enable Clientless Browser Isolation."""
diff --git a/src/cloudflare/types/zero_trust/gateway/category.py b/src/cloudflare/types/zero_trust/gateway/category.py
index 32ac136b133..92244d2f1ac 100644
--- a/src/cloudflare/types/zero_trust/gateway/category.py
+++ b/src/cloudflare/types/zero_trust/gateway/category.py
@@ -12,50 +12,48 @@
 
 class Subcategory(BaseModel):
     id: Optional[int] = None
-    """The identifier for this category. There is only one category per ID."""
+    """Identify this category. Only one category per ID."""
 
     beta: Optional[bool] = None
-    """True if the category is in beta and subject to change."""
+    """Indicate whether the category is in beta and subject to change."""
 
     class_: Optional[Literal["free", "premium", "blocked", "removalPending", "noBlock"]] = FieldInfo(
         alias="class", default=None
     )
-    """Which account types are allowed to create policies based on this category.
+    """Specify which account types can create policies for this category.
 
-    `blocked` categories are blocked unconditionally for all accounts.
-    `removalPending` categories can be removed from policies but not added.
-    `noBlock` categories cannot be blocked.
+    `blocked` Blocks unconditionally for all accounts. `removalPending` Allows
+    removal from policies but disables addition. `noBlock` Prevents blocking.
     """
 
     description: Optional[str] = None
-    """A short summary of domains in the category."""
+    """Provide a short summary of domains in the category."""
 
     name: Optional[str] = None
-    """The name of the category."""
+    """Specify the category name."""
 
 
 class Category(BaseModel):
     id: Optional[int] = None
-    """The identifier for this category. There is only one category per ID."""
+    """Identify this category. Only one category per ID."""
 
     beta: Optional[bool] = None
-    """True if the category is in beta and subject to change."""
+    """Indicate whether the category is in beta and subject to change."""
 
     class_: Optional[Literal["free", "premium", "blocked", "removalPending", "noBlock"]] = FieldInfo(
         alias="class", default=None
     )
-    """Which account types are allowed to create policies based on this category.
+    """Specify which account types can create policies for this category.
 
-    `blocked` categories are blocked unconditionally for all accounts.
-    `removalPending` categories can be removed from policies but not added.
-    `noBlock` categories cannot be blocked.
+    `blocked` Blocks unconditionally for all accounts. `removalPending` Allows
+    removal from policies but disables addition. `noBlock` Prevents blocking.
     """
 
     description: Optional[str] = None
-    """A short summary of domains in the category."""
+    """Provide a short summary of domains in the category."""
 
     name: Optional[str] = None
-    """The name of the category."""
+    """Specify the category name."""
 
     subcategories: Optional[List[Subcategory]] = None
-    """All subcategories for this category."""
+    """Provide all subcategories for this category."""
diff --git a/src/cloudflare/types/zero_trust/gateway/certificate_activate_params.py b/src/cloudflare/types/zero_trust/gateway/certificate_activate_params.py
new file mode 100644
index 00000000000..a3b1cfe0f98
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/certificate_activate_params.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["CertificateActivateParams"]
+
+
+class CertificateActivateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    body: Required[object]
diff --git a/src/cloudflare/types/zero_trust/gateway/certificate_activate_response.py b/src/cloudflare/types/zero_trust/gateway/certificate_activate_response.py
new file mode 100644
index 00000000000..6d37a9f8492
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/certificate_activate_response.py
@@ -0,0 +1,52 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["CertificateActivateResponse"]
+
+
+class CertificateActivateResponse(BaseModel):
+    id: Optional[str] = None
+    """Identify the certificate with a UUID."""
+
+    binding_status: Optional[Literal["pending_deployment", "available", "pending_deletion", "inactive"]] = None
+    """Indicate the read-only deployment status of the certificate on Cloudflare's
+    edge.
+
+    Gateway TLS interception can use certificates in the 'available' (previously
+    called 'active') state.
+    """
+
+    certificate: Optional[str] = None
+    """Provide the CA certificate (read-only)."""
+
+    created_at: Optional[datetime] = None
+
+    expires_on: Optional[datetime] = None
+
+    fingerprint: Optional[str] = None
+    """Provide the SHA256 fingerprint of the certificate (read-only)."""
+
+    in_use: Optional[bool] = None
+    """Indicate whether Gateway TLS interception uses this certificate (read-only).
+
+    You cannot set this value directly. To configure interception, use the Gateway
+    configuration setting named `certificate` (read-only).
+    """
+
+    issuer_org: Optional[str] = None
+    """Indicate the organization that issued the certificate (read-only)."""
+
+    issuer_raw: Optional[str] = None
+    """Provide the entire issuer field of the certificate (read-only)."""
+
+    type: Optional[Literal["custom", "gateway_managed"]] = None
+    """Indicate the read-only certificate type, BYO-PKI (custom) or Gateway-managed."""
+
+    updated_at: Optional[datetime] = None
+
+    uploaded_on: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/gateway/certificate_create_params.py b/src/cloudflare/types/zero_trust/gateway/certificate_create_params.py
index 1de699e498c..b88ce811bc9 100644
--- a/src/cloudflare/types/zero_trust/gateway/certificate_create_params.py
+++ b/src/cloudflare/types/zero_trust/gateway/certificate_create_params.py
@@ -11,7 +11,9 @@ class CertificateCreateParams(TypedDict, total=False):
     account_id: Required[str]
 
     validity_period_days: int
-    """
-    Number of days the generated certificate will be valid, minimum 1 day and
-    maximum 30 years. Defaults to 5 years.
+    """Sets the certificate validity period in days (range: 1-10,950 days / ~30 years).
+
+    Defaults to 1,825 days (5 years). **Important**: This field is only settable
+    during the certificate creation. Certificates becomes immutable after creation -
+    use the `/activate` and `/deactivate` endpoints to manage certificate lifecycle.
     """
diff --git a/src/cloudflare/types/zero_trust/gateway/certificate_create_response.py b/src/cloudflare/types/zero_trust/gateway/certificate_create_response.py
index f80dc62369e..0f02d529315 100644
--- a/src/cloudflare/types/zero_trust/gateway/certificate_create_response.py
+++ b/src/cloudflare/types/zero_trust/gateway/certificate_create_response.py
@@ -11,20 +11,41 @@
 
 class CertificateCreateResponse(BaseModel):
     id: Optional[str] = None
-    """Certificate UUID tag."""
+    """Identify the certificate with a UUID."""
 
-    binding_status: Optional[Literal["pending_deployment", "active", "pending_deletion", "inactive"]] = None
-    """The deployment status of the certificate on Cloudflare's edge."""
+    binding_status: Optional[Literal["pending_deployment", "available", "pending_deletion", "inactive"]] = None
+    """Indicate the read-only deployment status of the certificate on Cloudflare's
+    edge.
 
-    created_at: Optional[datetime] = None
+    Gateway TLS interception can use certificates in the 'available' (previously
+    called 'active') state.
+    """
+
+    certificate: Optional[str] = None
+    """Provide the CA certificate (read-only)."""
 
-    enabled: Optional[bool] = None
-    """Use this certificate for Gateway TLS interception"""
+    created_at: Optional[datetime] = None
 
     expires_on: Optional[datetime] = None
 
+    fingerprint: Optional[str] = None
+    """Provide the SHA256 fingerprint of the certificate (read-only)."""
+
+    in_use: Optional[bool] = None
+    """Indicate whether Gateway TLS interception uses this certificate (read-only).
+
+    You cannot set this value directly. To configure interception, use the Gateway
+    configuration setting named `certificate` (read-only).
+    """
+
+    issuer_org: Optional[str] = None
+    """Indicate the organization that issued the certificate (read-only)."""
+
+    issuer_raw: Optional[str] = None
+    """Provide the entire issuer field of the certificate (read-only)."""
+
     type: Optional[Literal["custom", "gateway_managed"]] = None
-    """The type of certificate, either BYO-PKI (custom) or Gateway-managed."""
+    """Indicate the read-only certificate type, BYO-PKI (custom) or Gateway-managed."""
 
     updated_at: Optional[datetime] = None
 
diff --git a/src/cloudflare/types/zero_trust/gateway/certificate_deactivate_params.py b/src/cloudflare/types/zero_trust/gateway/certificate_deactivate_params.py
new file mode 100644
index 00000000000..c938aee6c9b
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/certificate_deactivate_params.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["CertificateDeactivateParams"]
+
+
+class CertificateDeactivateParams(TypedDict, total=False):
+    account_id: Required[str]
+
+    body: Required[object]
diff --git a/src/cloudflare/types/zero_trust/gateway/certificate_deactivate_response.py b/src/cloudflare/types/zero_trust/gateway/certificate_deactivate_response.py
new file mode 100644
index 00000000000..6393425aedc
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/certificate_deactivate_response.py
@@ -0,0 +1,52 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["CertificateDeactivateResponse"]
+
+
+class CertificateDeactivateResponse(BaseModel):
+    id: Optional[str] = None
+    """Identify the certificate with a UUID."""
+
+    binding_status: Optional[Literal["pending_deployment", "available", "pending_deletion", "inactive"]] = None
+    """Indicate the read-only deployment status of the certificate on Cloudflare's
+    edge.
+
+    Gateway TLS interception can use certificates in the 'available' (previously
+    called 'active') state.
+    """
+
+    certificate: Optional[str] = None
+    """Provide the CA certificate (read-only)."""
+
+    created_at: Optional[datetime] = None
+
+    expires_on: Optional[datetime] = None
+
+    fingerprint: Optional[str] = None
+    """Provide the SHA256 fingerprint of the certificate (read-only)."""
+
+    in_use: Optional[bool] = None
+    """Indicate whether Gateway TLS interception uses this certificate (read-only).
+
+    You cannot set this value directly. To configure interception, use the Gateway
+    configuration setting named `certificate` (read-only).
+    """
+
+    issuer_org: Optional[str] = None
+    """Indicate the organization that issued the certificate (read-only)."""
+
+    issuer_raw: Optional[str] = None
+    """Provide the entire issuer field of the certificate (read-only)."""
+
+    type: Optional[Literal["custom", "gateway_managed"]] = None
+    """Indicate the read-only certificate type, BYO-PKI (custom) or Gateway-managed."""
+
+    updated_at: Optional[datetime] = None
+
+    uploaded_on: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/gateway/certificate_delete_response.py b/src/cloudflare/types/zero_trust/gateway/certificate_delete_response.py
index b8e44b1a35b..15674c552bd 100644
--- a/src/cloudflare/types/zero_trust/gateway/certificate_delete_response.py
+++ b/src/cloudflare/types/zero_trust/gateway/certificate_delete_response.py
@@ -11,20 +11,41 @@
 
 class CertificateDeleteResponse(BaseModel):
     id: Optional[str] = None
-    """Certificate UUID tag."""
+    """Identify the certificate with a UUID."""
 
-    binding_status: Optional[Literal["pending_deployment", "active", "pending_deletion", "inactive"]] = None
-    """The deployment status of the certificate on Cloudflare's edge."""
+    binding_status: Optional[Literal["pending_deployment", "available", "pending_deletion", "inactive"]] = None
+    """Indicate the read-only deployment status of the certificate on Cloudflare's
+    edge.
 
-    created_at: Optional[datetime] = None
+    Gateway TLS interception can use certificates in the 'available' (previously
+    called 'active') state.
+    """
+
+    certificate: Optional[str] = None
+    """Provide the CA certificate (read-only)."""
 
-    enabled: Optional[bool] = None
-    """Use this certificate for Gateway TLS interception"""
+    created_at: Optional[datetime] = None
 
     expires_on: Optional[datetime] = None
 
+    fingerprint: Optional[str] = None
+    """Provide the SHA256 fingerprint of the certificate (read-only)."""
+
+    in_use: Optional[bool] = None
+    """Indicate whether Gateway TLS interception uses this certificate (read-only).
+
+    You cannot set this value directly. To configure interception, use the Gateway
+    configuration setting named `certificate` (read-only).
+    """
+
+    issuer_org: Optional[str] = None
+    """Indicate the organization that issued the certificate (read-only)."""
+
+    issuer_raw: Optional[str] = None
+    """Provide the entire issuer field of the certificate (read-only)."""
+
     type: Optional[Literal["custom", "gateway_managed"]] = None
-    """The type of certificate, either BYO-PKI (custom) or Gateway-managed."""
+    """Indicate the read-only certificate type, BYO-PKI (custom) or Gateway-managed."""
 
     updated_at: Optional[datetime] = None
 
diff --git a/src/cloudflare/types/zero_trust/gateway/certificate_get_response.py b/src/cloudflare/types/zero_trust/gateway/certificate_get_response.py
index 6a702b1122f..506298f781a 100644
--- a/src/cloudflare/types/zero_trust/gateway/certificate_get_response.py
+++ b/src/cloudflare/types/zero_trust/gateway/certificate_get_response.py
@@ -11,20 +11,41 @@
 
 class CertificateGetResponse(BaseModel):
     id: Optional[str] = None
-    """Certificate UUID tag."""
+    """Identify the certificate with a UUID."""
 
-    binding_status: Optional[Literal["pending_deployment", "active", "pending_deletion", "inactive"]] = None
-    """The deployment status of the certificate on Cloudflare's edge."""
+    binding_status: Optional[Literal["pending_deployment", "available", "pending_deletion", "inactive"]] = None
+    """Indicate the read-only deployment status of the certificate on Cloudflare's
+    edge.
 
-    created_at: Optional[datetime] = None
+    Gateway TLS interception can use certificates in the 'available' (previously
+    called 'active') state.
+    """
+
+    certificate: Optional[str] = None
+    """Provide the CA certificate (read-only)."""
 
-    enabled: Optional[bool] = None
-    """Use this certificate for Gateway TLS interception"""
+    created_at: Optional[datetime] = None
 
     expires_on: Optional[datetime] = None
 
+    fingerprint: Optional[str] = None
+    """Provide the SHA256 fingerprint of the certificate (read-only)."""
+
+    in_use: Optional[bool] = None
+    """Indicate whether Gateway TLS interception uses this certificate (read-only).
+
+    You cannot set this value directly. To configure interception, use the Gateway
+    configuration setting named `certificate` (read-only).
+    """
+
+    issuer_org: Optional[str] = None
+    """Indicate the organization that issued the certificate (read-only)."""
+
+    issuer_raw: Optional[str] = None
+    """Provide the entire issuer field of the certificate (read-only)."""
+
     type: Optional[Literal["custom", "gateway_managed"]] = None
-    """The type of certificate, either BYO-PKI (custom) or Gateway-managed."""
+    """Indicate the read-only certificate type, BYO-PKI (custom) or Gateway-managed."""
 
     updated_at: Optional[datetime] = None
 
diff --git a/src/cloudflare/types/zero_trust/gateway/certificate_list_response.py b/src/cloudflare/types/zero_trust/gateway/certificate_list_response.py
index 322c092fcaf..a82d657d019 100644
--- a/src/cloudflare/types/zero_trust/gateway/certificate_list_response.py
+++ b/src/cloudflare/types/zero_trust/gateway/certificate_list_response.py
@@ -11,20 +11,41 @@
 
 class CertificateListResponse(BaseModel):
     id: Optional[str] = None
-    """Certificate UUID tag."""
+    """Identify the certificate with a UUID."""
 
-    binding_status: Optional[Literal["pending_deployment", "active", "pending_deletion", "inactive"]] = None
-    """The deployment status of the certificate on Cloudflare's edge."""
+    binding_status: Optional[Literal["pending_deployment", "available", "pending_deletion", "inactive"]] = None
+    """Indicate the read-only deployment status of the certificate on Cloudflare's
+    edge.
 
-    created_at: Optional[datetime] = None
+    Gateway TLS interception can use certificates in the 'available' (previously
+    called 'active') state.
+    """
+
+    certificate: Optional[str] = None
+    """Provide the CA certificate (read-only)."""
 
-    enabled: Optional[bool] = None
-    """Use this certificate for Gateway TLS interception"""
+    created_at: Optional[datetime] = None
 
     expires_on: Optional[datetime] = None
 
+    fingerprint: Optional[str] = None
+    """Provide the SHA256 fingerprint of the certificate (read-only)."""
+
+    in_use: Optional[bool] = None
+    """Indicate whether Gateway TLS interception uses this certificate (read-only).
+
+    You cannot set this value directly. To configure interception, use the Gateway
+    configuration setting named `certificate` (read-only).
+    """
+
+    issuer_org: Optional[str] = None
+    """Indicate the organization that issued the certificate (read-only)."""
+
+    issuer_raw: Optional[str] = None
+    """Provide the entire issuer field of the certificate (read-only)."""
+
     type: Optional[Literal["custom", "gateway_managed"]] = None
-    """The type of certificate, either BYO-PKI (custom) or Gateway-managed."""
+    """Indicate the read-only certificate type, BYO-PKI (custom) or Gateway-managed."""
 
     updated_at: Optional[datetime] = None
 
diff --git a/src/cloudflare/types/zero_trust/gateway/configuration_edit_params.py b/src/cloudflare/types/zero_trust/gateway/configuration_edit_params.py
index 9adb3f5ae01..a0c4d70d7aa 100644
--- a/src/cloudflare/types/zero_trust/gateway/configuration_edit_params.py
+++ b/src/cloudflare/types/zero_trust/gateway/configuration_edit_params.py
@@ -13,4 +13,4 @@ class ConfigurationEditParams(TypedDict, total=False):
     account_id: Required[str]
 
     settings: GatewayConfigurationSettingsParam
-    """account settings."""
+    """Specify account settings."""
diff --git a/src/cloudflare/types/zero_trust/gateway/configuration_edit_response.py b/src/cloudflare/types/zero_trust/gateway/configuration_edit_response.py
index e7659cf264e..2d2ccc0f040 100644
--- a/src/cloudflare/types/zero_trust/gateway/configuration_edit_response.py
+++ b/src/cloudflare/types/zero_trust/gateway/configuration_edit_response.py
@@ -10,9 +10,11 @@
 
 
 class ConfigurationEditResponse(BaseModel):
+    """Specify account settings."""
+
     created_at: Optional[datetime] = None
 
     settings: Optional[GatewayConfigurationSettings] = None
-    """account settings."""
+    """Specify account settings."""
 
     updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/gateway/configuration_get_response.py b/src/cloudflare/types/zero_trust/gateway/configuration_get_response.py
index ab5d764c721..b15f94c2788 100644
--- a/src/cloudflare/types/zero_trust/gateway/configuration_get_response.py
+++ b/src/cloudflare/types/zero_trust/gateway/configuration_get_response.py
@@ -10,9 +10,11 @@
 
 
 class ConfigurationGetResponse(BaseModel):
+    """Specify account settings."""
+
     created_at: Optional[datetime] = None
 
     settings: Optional[GatewayConfigurationSettings] = None
-    """account settings."""
+    """Specify account settings."""
 
     updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/gateway/configuration_update_params.py b/src/cloudflare/types/zero_trust/gateway/configuration_update_params.py
index 7fcc1d00377..8c3f25cf55e 100644
--- a/src/cloudflare/types/zero_trust/gateway/configuration_update_params.py
+++ b/src/cloudflare/types/zero_trust/gateway/configuration_update_params.py
@@ -13,4 +13,4 @@ class ConfigurationUpdateParams(TypedDict, total=False):
     account_id: Required[str]
 
     settings: GatewayConfigurationSettingsParam
-    """account settings."""
+    """Specify account settings."""
diff --git a/src/cloudflare/types/zero_trust/gateway/configuration_update_response.py b/src/cloudflare/types/zero_trust/gateway/configuration_update_response.py
index f88c116ea7e..22838a600b0 100644
--- a/src/cloudflare/types/zero_trust/gateway/configuration_update_response.py
+++ b/src/cloudflare/types/zero_trust/gateway/configuration_update_response.py
@@ -10,9 +10,11 @@
 
 
 class ConfigurationUpdateResponse(BaseModel):
+    """Specify account settings."""
+
     created_at: Optional[datetime] = None
 
     settings: Optional[GatewayConfigurationSettings] = None
-    """account settings."""
+    """Specify account settings."""
 
     updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/gateway/configurations/__init__.py b/src/cloudflare/types/zero_trust/gateway/configurations/__init__.py
new file mode 100755
index 00000000000..f8ee8b14b1c
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/configurations/__init__.py
@@ -0,0 +1,3 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
diff --git a/src/cloudflare/types/zero_trust/gateway/custom_certificate_settings.py b/src/cloudflare/types/zero_trust/gateway/custom_certificate_settings.py
index 95540254905..b14d2fd888c 100644
--- a/src/cloudflare/types/zero_trust/gateway/custom_certificate_settings.py
+++ b/src/cloudflare/types/zero_trust/gateway/custom_certificate_settings.py
@@ -9,13 +9,21 @@
 
 
 class CustomCertificateSettings(BaseModel):
-    enabled: bool
-    """Enable use of custom certificate authority for signing Gateway traffic."""
+    """Specify custom certificate settings for BYO-PKI.
+
+    This field is deprecated; use `certificate` instead.
+    """
+
+    enabled: Optional[bool] = None
+    """
+    Specify whether to enable a custom certificate authority for signing Gateway
+    traffic.
+    """
 
     id: Optional[str] = None
-    """UUID of certificate (ID from MTLS certificate store)."""
+    """Specify the UUID of the certificate (ID from MTLS certificate store)."""
 
     binding_status: Optional[str] = None
-    """Certificate status (internal)."""
+    """Indicate the internal certificate status."""
 
     updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/gateway/custom_certificate_settings_param.py b/src/cloudflare/types/zero_trust/gateway/custom_certificate_settings_param.py
index 60627d47117..b0538a1725b 100644
--- a/src/cloudflare/types/zero_trust/gateway/custom_certificate_settings_param.py
+++ b/src/cloudflare/types/zero_trust/gateway/custom_certificate_settings_param.py
@@ -2,14 +2,23 @@
 
 from __future__ import annotations
 
+from typing import Optional
 from typing_extensions import Required, TypedDict
 
 __all__ = ["CustomCertificateSettingsParam"]
 
 
 class CustomCertificateSettingsParam(TypedDict, total=False):
-    enabled: Required[bool]
-    """Enable use of custom certificate authority for signing Gateway traffic."""
+    """Specify custom certificate settings for BYO-PKI.
+
+    This field is deprecated; use `certificate` instead.
+    """
+
+    enabled: Required[Optional[bool]]
+    """
+    Specify whether to enable a custom certificate authority for signing Gateway
+    traffic.
+    """
 
     id: str
-    """UUID of certificate (ID from MTLS certificate store)."""
+    """Specify the UUID of the certificate (ID from MTLS certificate store)."""
diff --git a/src/cloudflare/types/zero_trust/gateway/dns_resolver_settings_v4.py b/src/cloudflare/types/zero_trust/gateway/dns_resolver_settings_v4.py
index 0d328be7c4c..473b77ba356 100644
--- a/src/cloudflare/types/zero_trust/gateway/dns_resolver_settings_v4.py
+++ b/src/cloudflare/types/zero_trust/gateway/dns_resolver_settings_v4.py
@@ -9,19 +9,22 @@
 
 class DNSResolverSettingsV4(BaseModel):
     ip: str
-    """IPv4 address of upstream resolver."""
+    """Specify the IPv4 address of the upstream resolver."""
 
     port: Optional[int] = None
-    """A port number to use for upstream resolver. Defaults to 53 if unspecified."""
+    """Specify a port number to use for the upstream resolver.
+
+    Defaults to 53 if unspecified.
+    """
 
     route_through_private_network: Optional[bool] = None
-    """Whether to connect to this resolver over a private network.
+    """Indicate whether to connect to this resolver over a private network.
 
-    Must be set when vnet_id is set.
+    Must set when vnet_id set.
     """
 
     vnet_id: Optional[str] = None
-    """Optionally specify a virtual network for this resolver.
+    """Specify an optional virtual network for this resolver.
 
     Uses default virtual network id if omitted.
     """
diff --git a/src/cloudflare/types/zero_trust/gateway/dns_resolver_settings_v4_param.py b/src/cloudflare/types/zero_trust/gateway/dns_resolver_settings_v4_param.py
index 4b6f3e0620b..1a640e52183 100644
--- a/src/cloudflare/types/zero_trust/gateway/dns_resolver_settings_v4_param.py
+++ b/src/cloudflare/types/zero_trust/gateway/dns_resolver_settings_v4_param.py
@@ -9,19 +9,22 @@
 
 class DNSResolverSettingsV4Param(TypedDict, total=False):
     ip: Required[str]
-    """IPv4 address of upstream resolver."""
+    """Specify the IPv4 address of the upstream resolver."""
 
     port: int
-    """A port number to use for upstream resolver. Defaults to 53 if unspecified."""
+    """Specify a port number to use for the upstream resolver.
+
+    Defaults to 53 if unspecified.
+    """
 
     route_through_private_network: bool
-    """Whether to connect to this resolver over a private network.
+    """Indicate whether to connect to this resolver over a private network.
 
-    Must be set when vnet_id is set.
+    Must set when vnet_id set.
     """
 
     vnet_id: str
-    """Optionally specify a virtual network for this resolver.
+    """Specify an optional virtual network for this resolver.
 
     Uses default virtual network id if omitted.
     """
diff --git a/src/cloudflare/types/zero_trust/gateway/dns_resolver_settings_v6.py b/src/cloudflare/types/zero_trust/gateway/dns_resolver_settings_v6.py
index 535616c4d1e..f52699aef11 100644
--- a/src/cloudflare/types/zero_trust/gateway/dns_resolver_settings_v6.py
+++ b/src/cloudflare/types/zero_trust/gateway/dns_resolver_settings_v6.py
@@ -9,19 +9,22 @@
 
 class DNSResolverSettingsV6(BaseModel):
     ip: str
-    """IPv6 address of upstream resolver."""
+    """Specify the IPv6 address of the upstream resolver."""
 
     port: Optional[int] = None
-    """A port number to use for upstream resolver. Defaults to 53 if unspecified."""
+    """Specify a port number to use for the upstream resolver.
+
+    Defaults to 53 if unspecified.
+    """
 
     route_through_private_network: Optional[bool] = None
-    """Whether to connect to this resolver over a private network.
+    """Indicate whether to connect to this resolver over a private network.
 
-    Must be set when vnet_id is set.
+    Must set when vnet_id set.
     """
 
     vnet_id: Optional[str] = None
-    """Optionally specify a virtual network for this resolver.
+    """Specify an optional virtual network for this resolver.
 
     Uses default virtual network id if omitted.
     """
diff --git a/src/cloudflare/types/zero_trust/gateway/dns_resolver_settings_v6_param.py b/src/cloudflare/types/zero_trust/gateway/dns_resolver_settings_v6_param.py
index a1f47e3691b..fbbcefb47b1 100644
--- a/src/cloudflare/types/zero_trust/gateway/dns_resolver_settings_v6_param.py
+++ b/src/cloudflare/types/zero_trust/gateway/dns_resolver_settings_v6_param.py
@@ -9,19 +9,22 @@
 
 class DNSResolverSettingsV6Param(TypedDict, total=False):
     ip: Required[str]
-    """IPv6 address of upstream resolver."""
+    """Specify the IPv6 address of the upstream resolver."""
 
     port: int
-    """A port number to use for upstream resolver. Defaults to 53 if unspecified."""
+    """Specify a port number to use for the upstream resolver.
+
+    Defaults to 53 if unspecified.
+    """
 
     route_through_private_network: bool
-    """Whether to connect to this resolver over a private network.
+    """Indicate whether to connect to this resolver over a private network.
 
-    Must be set when vnet_id is set.
+    Must set when vnet_id set.
     """
 
     vnet_id: str
-    """Optionally specify a virtual network for this resolver.
+    """Specify an optional virtual network for this resolver.
 
     Uses default virtual network id if omitted.
     """
diff --git a/src/cloudflare/types/zero_trust/gateway/doh_endpoint.py b/src/cloudflare/types/zero_trust/gateway/doh_endpoint.py
new file mode 100644
index 00000000000..851e2195d42
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/doh_endpoint.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ...._models import BaseModel
+from .ip_network import IPNetwork
+
+__all__ = ["DOHEndpoint"]
+
+
+class DOHEndpoint(BaseModel):
+    enabled: Optional[bool] = None
+    """Indicate whether the DOH endpoint is enabled for this location."""
+
+    networks: Optional[List[IPNetwork]] = None
+    """Specify the list of allowed source IP network ranges for this endpoint.
+
+    When the list is empty, the endpoint allows all source IPs. The list takes
+    effect only if the endpoint is enabled for this location.
+    """
+
+    require_token: Optional[bool] = None
+    """Specify whether the DOH endpoint requires user identity authentication."""
diff --git a/src/cloudflare/types/zero_trust/gateway/doh_endpoint_param.py b/src/cloudflare/types/zero_trust/gateway/doh_endpoint_param.py
new file mode 100644
index 00000000000..81e2e28d3fe
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/doh_endpoint_param.py
@@ -0,0 +1,25 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable, Optional
+from typing_extensions import TypedDict
+
+from .ip_network_param import IPNetworkParam
+
+__all__ = ["DOHEndpointParam"]
+
+
+class DOHEndpointParam(TypedDict, total=False):
+    enabled: bool
+    """Indicate whether the DOH endpoint is enabled for this location."""
+
+    networks: Optional[Iterable[IPNetworkParam]]
+    """Specify the list of allowed source IP network ranges for this endpoint.
+
+    When the list is empty, the endpoint allows all source IPs. The list takes
+    effect only if the endpoint is enabled for this location.
+    """
+
+    require_token: bool
+    """Specify whether the DOH endpoint requires user identity authentication."""
diff --git a/src/cloudflare/types/zero_trust/gateway/dot_endpoint.py b/src/cloudflare/types/zero_trust/gateway/dot_endpoint.py
new file mode 100644
index 00000000000..e9319f5545e
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/dot_endpoint.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ...._models import BaseModel
+from .ip_network import IPNetwork
+
+__all__ = ["DOTEndpoint"]
+
+
+class DOTEndpoint(BaseModel):
+    enabled: Optional[bool] = None
+    """Indicate whether the DOT endpoint is enabled for this location."""
+
+    networks: Optional[List[IPNetwork]] = None
+    """Specify the list of allowed source IP network ranges for this endpoint.
+
+    When the list is empty, the endpoint allows all source IPs. The list takes
+    effect only if the endpoint is enabled for this location.
+    """
diff --git a/src/cloudflare/types/zero_trust/gateway/dot_endpoint_param.py b/src/cloudflare/types/zero_trust/gateway/dot_endpoint_param.py
new file mode 100644
index 00000000000..8d4fec63c39
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/dot_endpoint_param.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable, Optional
+from typing_extensions import TypedDict
+
+from .ip_network_param import IPNetworkParam
+
+__all__ = ["DOTEndpointParam"]
+
+
+class DOTEndpointParam(TypedDict, total=False):
+    enabled: bool
+    """Indicate whether the DOT endpoint is enabled for this location."""
+
+    networks: Optional[Iterable[IPNetworkParam]]
+    """Specify the list of allowed source IP network ranges for this endpoint.
+
+    When the list is empty, the endpoint allows all source IPs. The list takes
+    effect only if the endpoint is enabled for this location.
+    """
diff --git a/src/cloudflare/types/zero_trust/gateway/endpoint.py b/src/cloudflare/types/zero_trust/gateway/endpoint.py
new file mode 100644
index 00000000000..6dc147d5775
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/endpoint.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+from .doh_endpoint import DOHEndpoint
+from .dot_endpoint import DOTEndpoint
+from .ipv4_endpoint import IPV4Endpoint
+from .ipv6_endpoint import IPV6Endpoint
+
+__all__ = ["Endpoint"]
+
+
+class Endpoint(BaseModel):
+    """Configure the destination endpoints for this location."""
+
+    doh: DOHEndpoint
+
+    dot: DOTEndpoint
+
+    ipv4: IPV4Endpoint
+
+    ipv6: IPV6Endpoint
diff --git a/src/cloudflare/types/zero_trust/gateway/endpoint_param.py b/src/cloudflare/types/zero_trust/gateway/endpoint_param.py
new file mode 100644
index 00000000000..986ca8b2b79
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/endpoint_param.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+from .doh_endpoint_param import DOHEndpointParam
+from .dot_endpoint_param import DOTEndpointParam
+from .ipv4_endpoint_param import IPV4EndpointParam
+from .ipv6_endpoint_param import IPV6EndpointParam
+
+__all__ = ["EndpointParam"]
+
+
+class EndpointParam(TypedDict, total=False):
+    """Configure the destination endpoints for this location."""
+
+    doh: Required[DOHEndpointParam]
+
+    dot: Required[DOTEndpointParam]
+
+    ipv4: Required[IPV4EndpointParam]
+
+    ipv6: Required[IPV6EndpointParam]
diff --git a/src/cloudflare/types/zero_trust/gateway/extended_email_matching.py b/src/cloudflare/types/zero_trust/gateway/extended_email_matching.py
index ff34962235c..e8bd5fd1b4a 100644
--- a/src/cloudflare/types/zero_trust/gateway/extended_email_matching.py
+++ b/src/cloudflare/types/zero_trust/gateway/extended_email_matching.py
@@ -8,8 +8,25 @@
 
 
 class ExtendedEmailMatching(BaseModel):
+    """Configures user email settings for firewall policies.
+
+    When you enable this, the system standardizes email addresses in the identity portion of the rule to match extended email variants in firewall policies. When you disable this setting, the system matches email addresses exactly as you provide them. Enable this setting if your email uses `.` or `+` modifiers.
+    """
+
     enabled: Optional[bool] = None
-    """Enable matching all variants of user emails (with + or .
+    """Specify whether to match all variants of user emails (with + or .
 
     modifiers) used as criteria in Firewall policies.
     """
+
+    read_only: Optional[bool] = None
+    """
+    Indicate that this setting was shared via the Orgs API and read only for the
+    current account.
+    """
+
+    source_account: Optional[str] = None
+    """Indicate the account tag of the account that shared this setting."""
+
+    version: Optional[int] = None
+    """Indicate the version number of the setting."""
diff --git a/src/cloudflare/types/zero_trust/gateway/extended_email_matching_param.py b/src/cloudflare/types/zero_trust/gateway/extended_email_matching_param.py
index cdf65749933..0e0cfd408a7 100644
--- a/src/cloudflare/types/zero_trust/gateway/extended_email_matching_param.py
+++ b/src/cloudflare/types/zero_trust/gateway/extended_email_matching_param.py
@@ -2,14 +2,20 @@
 
 from __future__ import annotations
 
+from typing import Optional
 from typing_extensions import TypedDict
 
 __all__ = ["ExtendedEmailMatchingParam"]
 
 
 class ExtendedEmailMatchingParam(TypedDict, total=False):
-    enabled: bool
-    """Enable matching all variants of user emails (with + or .
+    """Configures user email settings for firewall policies.
+
+    When you enable this, the system standardizes email addresses in the identity portion of the rule to match extended email variants in firewall policies. When you disable this setting, the system matches email addresses exactly as you provide them. Enable this setting if your email uses `.` or `+` modifiers.
+    """
+
+    enabled: Optional[bool]
+    """Specify whether to match all variants of user emails (with + or .
 
     modifiers) used as criteria in Firewall policies.
     """
diff --git a/src/cloudflare/types/zero_trust/gateway/fips_settings.py b/src/cloudflare/types/zero_trust/gateway/fips_settings.py
index 357e4b5c704..97624c9957d 100644
--- a/src/cloudflare/types/zero_trust/gateway/fips_settings.py
+++ b/src/cloudflare/types/zero_trust/gateway/fips_settings.py
@@ -8,5 +8,7 @@
 
 
 class FipsSettings(BaseModel):
+    """Specify FIPS settings."""
+
     tls: Optional[bool] = None
-    """Enable only cipher suites and TLS versions compliant with FIPS 140-2."""
+    """Enforce cipher suites and TLS versions compliant with FIPS 140-2."""
diff --git a/src/cloudflare/types/zero_trust/gateway/fips_settings_param.py b/src/cloudflare/types/zero_trust/gateway/fips_settings_param.py
index 4c344325f56..46cec7738b8 100644
--- a/src/cloudflare/types/zero_trust/gateway/fips_settings_param.py
+++ b/src/cloudflare/types/zero_trust/gateway/fips_settings_param.py
@@ -8,5 +8,7 @@
 
 
 class FipsSettingsParam(TypedDict, total=False):
+    """Specify FIPS settings."""
+
     tls: bool
-    """Enable only cipher suites and TLS versions compliant with FIPS 140-2."""
+    """Enforce cipher suites and TLS versions compliant with FIPS 140-2."""
diff --git a/src/cloudflare/types/zero_trust/gateway/gateway_configuration_settings.py b/src/cloudflare/types/zero_trust/gateway/gateway_configuration_settings.py
index 5504ecf870a..221f23408b4 100644
--- a/src/cloudflare/types/zero_trust/gateway/gateway_configuration_settings.py
+++ b/src/cloudflare/types/zero_trust/gateway/gateway_configuration_settings.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
+from typing_extensions import Literal
 
 from ...._models import BaseModel
 from .tls_settings import TLSSettings
@@ -14,50 +15,106 @@
 from .browser_isolation_settings import BrowserIsolationSettings
 from .custom_certificate_settings import CustomCertificateSettings
 
-__all__ = ["GatewayConfigurationSettings", "Certificate"]
+__all__ = ["GatewayConfigurationSettings", "Certificate", "HostSelector", "Inspection", "Sandbox"]
 
 
 class Certificate(BaseModel):
+    """Specify certificate settings for Gateway TLS interception.
+
+    If unset, the Cloudflare Root CA handles interception.
+    """
+
     id: str
-    """UUID of certificate to be used for interception."""
+    """Specify the UUID of the certificate used for interception.
+
+    Ensure the certificate is available at the edge(previously called 'active'). A
+    nil UUID directs Cloudflare to use the Root CA.
+    """
+
+
+class HostSelector(BaseModel):
+    """Enable host selection in egress policies."""
+
+    enabled: Optional[bool] = None
+    """Specify whether to enable filtering via hosts for egress policies."""
+
+
+class Inspection(BaseModel):
+    """Define the proxy inspection mode."""
+
+    mode: Optional[Literal["static", "dynamic"]] = None
+    """Define the proxy inspection mode.
+
+    1. static: Gateway applies static inspection to HTTP on TCP(80). With TLS
+       decryption on, Gateway inspects HTTPS traffic on TCP(443) and UDP(443). 2.
+       dynamic: Gateway applies protocol detection to inspect HTTP and HTTPS traffic
+       on any port. TLS decryption must remain on to inspect HTTPS traffic.
+    """
+
+
+class Sandbox(BaseModel):
+    """Specify whether to enable the sandbox."""
+
+    enabled: Optional[bool] = None
+    """Specify whether to enable the sandbox."""
+
+    fallback_action: Optional[Literal["allow", "block"]] = None
+    """Specify the action to take when the system cannot scan the file."""
 
 
 class GatewayConfigurationSettings(BaseModel):
+    """Specify account settings."""
+
     activity_log: Optional[ActivityLogSettings] = None
-    """Activity log settings."""
+    """Specify activity log settings."""
 
     antivirus: Optional[AntiVirusSettings] = None
-    """Anti-virus settings."""
+    """Specify anti-virus settings."""
 
     block_page: Optional[BlockPageSettings] = None
-    """Block page layout settings."""
+    """Specify block page layout settings."""
 
     body_scanning: Optional[BodyScanningSettings] = None
-    """DLP body scanning settings."""
+    """Specify the DLP inspection mode."""
 
     browser_isolation: Optional[BrowserIsolationSettings] = None
-    """Browser isolation settings."""
+    """Specify Clientless Browser Isolation settings."""
 
     certificate: Optional[Certificate] = None
-    """Certificate settings for Gateway TLS interception.
+    """Specify certificate settings for Gateway TLS interception.
 
-    If not specified, the Cloudflare Root CA will be used.
+    If unset, the Cloudflare Root CA handles interception.
     """
 
     custom_certificate: Optional[CustomCertificateSettings] = None
-    """Custom certificate settings for BYO-PKI.
+    """Specify custom certificate settings for BYO-PKI.
 
-    (deprecated and replaced by `certificate`)
+    This field is deprecated; use `certificate` instead.
     """
 
     extended_email_matching: Optional[ExtendedEmailMatching] = None
-    """Extended e-mail matching settings."""
+    """Configures user email settings for firewall policies.
+
+    When you enable this, the system standardizes email addresses in the identity
+    portion of the rule to match extended email variants in firewall policies. When
+    you disable this setting, the system matches email addresses exactly as you
+    provide them. Enable this setting if your email uses `.` or `+` modifiers.
+    """
 
     fips: Optional[FipsSettings] = None
-    """FIPS settings."""
+    """Specify FIPS settings."""
+
+    host_selector: Optional[HostSelector] = None
+    """Enable host selection in egress policies."""
+
+    inspection: Optional[Inspection] = None
+    """Define the proxy inspection mode."""
 
     protocol_detection: Optional[ProtocolDetection] = None
-    """Protocol Detection settings."""
+    """Specify whether to detect protocols from the initial bytes of client traffic."""
+
+    sandbox: Optional[Sandbox] = None
+    """Specify whether to enable the sandbox."""
 
     tls_decrypt: Optional[TLSSettings] = None
-    """TLS interception settings."""
+    """Specify whether to inspect encrypted HTTP traffic."""
diff --git a/src/cloudflare/types/zero_trust/gateway/gateway_configuration_settings_param.py b/src/cloudflare/types/zero_trust/gateway/gateway_configuration_settings_param.py
index 11cea789954..73a30f8203b 100644
--- a/src/cloudflare/types/zero_trust/gateway/gateway_configuration_settings_param.py
+++ b/src/cloudflare/types/zero_trust/gateway/gateway_configuration_settings_param.py
@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing import Optional
+from typing_extensions import Literal, Required, TypedDict
 
 from .tls_settings_param import TLSSettingsParam
 from .fips_settings_param import FipsSettingsParam
@@ -15,50 +16,106 @@
 from .browser_isolation_settings_param import BrowserIsolationSettingsParam
 from .custom_certificate_settings_param import CustomCertificateSettingsParam
 
-__all__ = ["GatewayConfigurationSettingsParam", "Certificate"]
+__all__ = ["GatewayConfigurationSettingsParam", "Certificate", "HostSelector", "Inspection", "Sandbox"]
 
 
 class Certificate(TypedDict, total=False):
+    """Specify certificate settings for Gateway TLS interception.
+
+    If unset, the Cloudflare Root CA handles interception.
+    """
+
     id: Required[str]
-    """UUID of certificate to be used for interception."""
+    """Specify the UUID of the certificate used for interception.
+
+    Ensure the certificate is available at the edge(previously called 'active'). A
+    nil UUID directs Cloudflare to use the Root CA.
+    """
+
+
+class HostSelector(TypedDict, total=False):
+    """Enable host selection in egress policies."""
+
+    enabled: Optional[bool]
+    """Specify whether to enable filtering via hosts for egress policies."""
+
+
+class Inspection(TypedDict, total=False):
+    """Define the proxy inspection mode."""
+
+    mode: Literal["static", "dynamic"]
+    """Define the proxy inspection mode.
+
+    1. static: Gateway applies static inspection to HTTP on TCP(80). With TLS
+       decryption on, Gateway inspects HTTPS traffic on TCP(443) and UDP(443). 2.
+       dynamic: Gateway applies protocol detection to inspect HTTP and HTTPS traffic
+       on any port. TLS decryption must remain on to inspect HTTPS traffic.
+    """
+
+
+class Sandbox(TypedDict, total=False):
+    """Specify whether to enable the sandbox."""
+
+    enabled: Optional[bool]
+    """Specify whether to enable the sandbox."""
+
+    fallback_action: Literal["allow", "block"]
+    """Specify the action to take when the system cannot scan the file."""
 
 
 class GatewayConfigurationSettingsParam(TypedDict, total=False):
-    activity_log: ActivityLogSettingsParam
-    """Activity log settings."""
+    """Specify account settings."""
+
+    activity_log: Optional[ActivityLogSettingsParam]
+    """Specify activity log settings."""
 
-    antivirus: AntiVirusSettingsParam
-    """Anti-virus settings."""
+    antivirus: Optional[AntiVirusSettingsParam]
+    """Specify anti-virus settings."""
 
-    block_page: BlockPageSettingsParam
-    """Block page layout settings."""
+    block_page: Optional[BlockPageSettingsParam]
+    """Specify block page layout settings."""
 
-    body_scanning: BodyScanningSettingsParam
-    """DLP body scanning settings."""
+    body_scanning: Optional[BodyScanningSettingsParam]
+    """Specify the DLP inspection mode."""
 
-    browser_isolation: BrowserIsolationSettingsParam
-    """Browser isolation settings."""
+    browser_isolation: Optional[BrowserIsolationSettingsParam]
+    """Specify Clientless Browser Isolation settings."""
 
-    certificate: Certificate
-    """Certificate settings for Gateway TLS interception.
+    certificate: Optional[Certificate]
+    """Specify certificate settings for Gateway TLS interception.
 
-    If not specified, the Cloudflare Root CA will be used.
+    If unset, the Cloudflare Root CA handles interception.
     """
 
-    custom_certificate: CustomCertificateSettingsParam
-    """Custom certificate settings for BYO-PKI.
+    custom_certificate: Optional[CustomCertificateSettingsParam]
+    """Specify custom certificate settings for BYO-PKI.
 
-    (deprecated and replaced by `certificate`)
+    This field is deprecated; use `certificate` instead.
     """
 
-    extended_email_matching: ExtendedEmailMatchingParam
-    """Extended e-mail matching settings."""
+    extended_email_matching: Optional[ExtendedEmailMatchingParam]
+    """Configures user email settings for firewall policies.
+
+    When you enable this, the system standardizes email addresses in the identity
+    portion of the rule to match extended email variants in firewall policies. When
+    you disable this setting, the system matches email addresses exactly as you
+    provide them. Enable this setting if your email uses `.` or `+` modifiers.
+    """
+
+    fips: Optional[FipsSettingsParam]
+    """Specify FIPS settings."""
+
+    host_selector: Optional[HostSelector]
+    """Enable host selection in egress policies."""
+
+    inspection: Optional[Inspection]
+    """Define the proxy inspection mode."""
 
-    fips: FipsSettingsParam
-    """FIPS settings."""
+    protocol_detection: Optional[ProtocolDetectionParam]
+    """Specify whether to detect protocols from the initial bytes of client traffic."""
 
-    protocol_detection: ProtocolDetectionParam
-    """Protocol Detection settings."""
+    sandbox: Optional[Sandbox]
+    """Specify whether to enable the sandbox."""
 
-    tls_decrypt: TLSSettingsParam
-    """TLS interception settings."""
+    tls_decrypt: Optional[TLSSettingsParam]
+    """Specify whether to inspect encrypted HTTP traffic."""
diff --git a/src/cloudflare/types/zero_trust/gateway/gateway_filter.py b/src/cloudflare/types/zero_trust/gateway/gateway_filter.py
index 3cf57f644ff..fbbc7cffc1c 100644
--- a/src/cloudflare/types/zero_trust/gateway/gateway_filter.py
+++ b/src/cloudflare/types/zero_trust/gateway/gateway_filter.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["GatewayFilter"]
 
-GatewayFilter = Literal["http", "dns", "l4", "egress"]
+GatewayFilter: TypeAlias = Literal["http", "dns", "l4", "egress", "dns_resolver"]
diff --git a/src/cloudflare/types/zero_trust/gateway/gateway_ips.py b/src/cloudflare/types/zero_trust/gateway/gateway_ips.py
index 269847dd2ef..ef828081018 100644
--- a/src/cloudflare/types/zero_trust/gateway/gateway_ips.py
+++ b/src/cloudflare/types/zero_trust/gateway/gateway_ips.py
@@ -1,6 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from typing_extensions import TypeAlias
 
 __all__ = ["GatewayIPs"]
 
-GatewayIPs = str
+GatewayIPs: TypeAlias = str
diff --git a/src/cloudflare/types/zero_trust/gateway/gateway_item.py b/src/cloudflare/types/zero_trust/gateway/gateway_item.py
index 7d6c7f3cdd1..63a34d96d78 100644
--- a/src/cloudflare/types/zero_trust/gateway/gateway_item.py
+++ b/src/cloudflare/types/zero_trust/gateway/gateway_item.py
@@ -12,7 +12,7 @@ class GatewayItem(BaseModel):
     created_at: Optional[datetime] = None
 
     description: Optional[str] = None
-    """The description of the list item, if present"""
+    """Provide the list item description (optional)."""
 
     value: Optional[str] = None
-    """The value of the item in a list."""
+    """Specify the item value."""
diff --git a/src/cloudflare/types/zero_trust/gateway/gateway_item_param.py b/src/cloudflare/types/zero_trust/gateway/gateway_item_param.py
deleted file mode 100644
index b9354f12b21..00000000000
--- a/src/cloudflare/types/zero_trust/gateway/gateway_item_param.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Union
-from datetime import datetime
-from typing_extensions import Annotated, TypedDict
-
-from ...._utils import PropertyInfo
-
-__all__ = ["GatewayItemParam"]
-
-
-class GatewayItemParam(TypedDict, total=False):
-    created_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
-
-    description: str
-    """The description of the list item, if present"""
-
-    value: str
-    """The value of the item in a list."""
diff --git a/src/cloudflare/types/zero_trust/gateway/gateway_list.py b/src/cloudflare/types/zero_trust/gateway/gateway_list.py
index f24abb3c84a..5051ff743cb 100644
--- a/src/cloudflare/types/zero_trust/gateway/gateway_list.py
+++ b/src/cloudflare/types/zero_trust/gateway/gateway_list.py
@@ -1,30 +1,34 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
+from typing import List, Optional
 from datetime import datetime
 from typing_extensions import Literal
 
 from ...._models import BaseModel
+from .gateway_item import GatewayItem
 
 __all__ = ["GatewayList"]
 
 
 class GatewayList(BaseModel):
     id: Optional[str] = None
-    """API Resource UUID tag."""
+    """Identify the API resource with a UUID."""
 
     count: Optional[float] = None
-    """The number of items in the list."""
+    """Indicate the number of items in the list."""
 
     created_at: Optional[datetime] = None
 
     description: Optional[str] = None
-    """The description of the list."""
+    """Provide the list description."""
+
+    items: Optional[List[GatewayItem]] = None
+    """Provide the list items."""
 
     name: Optional[str] = None
-    """The name of the list."""
+    """Specify the list name."""
 
-    type: Optional[Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"]] = None
-    """The type of list."""
+    type: Optional[Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP", "CATEGORY", "LOCATION", "DEVICE"]] = None
+    """Specify the list type."""
 
     updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/gateway/gateway_rule.py b/src/cloudflare/types/zero_trust/gateway/gateway_rule.py
index d0db3cbe8e9..4b4cec82e05 100644
--- a/src/cloudflare/types/zero_trust/gateway/gateway_rule.py
+++ b/src/cloudflare/types/zero_trust/gateway/gateway_rule.py
@@ -9,80 +9,149 @@
 from .rule_setting import RuleSetting
 from .gateway_filter import GatewayFilter
 
-__all__ = ["GatewayRule"]
+__all__ = ["GatewayRule", "Expiration"]
+
+
+class Expiration(BaseModel):
+    """Defines the expiration time stamp and default duration of a DNS policy.
+
+    Takes precedence over the policy's `schedule` configuration, if any. This  does not apply to HTTP or network policies. Settable only for `dns` rules.
+    """
+
+    expires_at: datetime
+    """Show the timestamp when the policy expires and stops applying.
+
+    The value must follow RFC 3339 and include a UTC offset. The system accepts
+    non-zero offsets but converts them to the equivalent UTC+00:00 value and returns
+    timestamps with a trailing Z. Expiration policies ignore client timezones and
+    expire globally at the specified expires_at time.
+    """
+
+    duration: Optional[int] = None
+    """Defines the default duration a policy active in minutes.
+
+    Must set in order to use the `reset_expiration` endpoint on this rule.
+    """
+
+    expired: Optional[bool] = None
+    """Indicates whether the policy is expired."""
 
 
 class GatewayRule(BaseModel):
-    id: Optional[str] = None
-    """The API resource UUID."""
-
-    action: Optional[
-        Literal[
-            "on",
-            "off",
-            "allow",
-            "block",
-            "scan",
-            "noscan",
-            "safesearch",
-            "ytrestricted",
-            "isolate",
-            "noisolate",
-            "override",
-            "l4_override",
-            "egress",
-            "audit_ssh",
-            "resolve",
-        ]
-    ] = None
+    action: Literal[
+        "on",
+        "off",
+        "allow",
+        "block",
+        "scan",
+        "noscan",
+        "safesearch",
+        "ytrestricted",
+        "isolate",
+        "noisolate",
+        "override",
+        "l4_override",
+        "egress",
+        "resolve",
+        "quarantine",
+        "redirect",
+    ]
+    """
+    Specify the action to perform when the associated traffic, identity, and device
+    posture expressions either absent or evaluate to `true`.
+    """
+
+    enabled: bool
+    """Specify whether the rule is enabled."""
+
+    filters: List[GatewayFilter]
+    """
+    Specify the protocol or layer to evaluate the traffic, identity, and device
+    posture expressions. Can only contain a single value.
+    """
+
+    name: str
+    """Specify the rule name."""
+
+    precedence: int
+    """Set the order of your rules.
+
+    Lower values indicate higher precedence. At each processing phase, evaluate
+    applicable rules in ascending order of this value. Refer to
+    [Order of enforcement](http://developers.cloudflare.com/learning-paths/secure-internet-traffic/understand-policies/order-of-enforcement/#manage-precedence-with-terraform)
+    to manage precedence via Terraform.
     """
-    The action to preform when the associated traffic, identity, and device posture
-    expressions are either absent or evaluate to `true`.
+
+    traffic: str
+    """Specify the wirefilter expression used for traffic matching.
+
+    The API automatically formats and sanitizes expressions before storing them. To
+    prevent Terraform state drift, use the formatted expression returned in the API
+    response.
     """
 
+    id: Optional[str] = None
+    """Identify the API resource with a UUID."""
+
     created_at: Optional[datetime] = None
 
     deleted_at: Optional[datetime] = None
-    """Date of deletion, if any."""
+    """Indicate the date of deletion, if any."""
 
     description: Optional[str] = None
-    """The description of the rule."""
+    """Specify the rule description."""
 
     device_posture: Optional[str] = None
-    """The wirefilter expression used for device posture check matching."""
+    """Specify the wirefilter expression used for device posture check.
 
-    enabled: Optional[bool] = None
-    """True if the rule is enabled."""
-
-    filters: Optional[List[GatewayFilter]] = None
-    """
-    The protocol or layer to evaluate the traffic, identity, and device posture
-    expressions.
+    The API automatically formats and sanitizes expressions before storing them. To
+    prevent Terraform state drift, use the formatted expression returned in the API
+    response.
     """
 
-    identity: Optional[str] = None
-    """The wirefilter expression used for identity matching."""
+    expiration: Optional[Expiration] = None
+    """Defines the expiration time stamp and default duration of a DNS policy.
 
-    name: Optional[str] = None
-    """The name of the rule."""
+    Takes precedence over the policy's `schedule` configuration, if any. This does
+    not apply to HTTP or network policies. Settable only for `dns` rules.
+    """
 
-    precedence: Optional[int] = None
-    """Precedence sets the order of your rules.
+    identity: Optional[str] = None
+    """Specify the wirefilter expression used for identity matching.
 
-    Lower values indicate higher precedence. At each processing phase, applicable
-    rules are evaluated in ascending order of this value.
+    The API automatically formats and sanitizes expressions before storing them. To
+    prevent Terraform state drift, use the formatted expression returned in the API
+    response.
     """
 
+    read_only: Optional[bool] = None
+    """Indicate that this rule is shared via the Orgs API and read only."""
+
     rule_settings: Optional[RuleSetting] = None
-    """Additional settings that modify the rule's action."""
+    """Defines settings for this rule.
+
+    Settings apply only to specific rule types and must use compatible selectors. If
+    Terraform detects drift, confirm the setting supports your rule type and check
+    whether the API modifies the value. Use API-returned values in your
+    configuration to prevent drift.
+    """
 
     schedule: Optional[Schedule] = None
-    """The schedule for activating DNS policies.
+    """Defines the schedule for activating DNS policies.
 
-    This does not apply to HTTP or network policies.
+    Settable only for `dns` and `dns_resolver` rules.
     """
 
-    traffic: Optional[str] = None
-    """The wirefilter expression used for traffic matching."""
+    sharable: Optional[bool] = None
+    """Indicate that this rule is sharable via the Orgs API."""
+
+    source_account: Optional[str] = None
+    """Provide the account tag of the account that created the rule."""
 
     updated_at: Optional[datetime] = None
+
+    version: Optional[int] = None
+    """Indicate the version number of the rule(read-only)."""
+
+    warning_status: Optional[str] = None
+    """Indicate a warning for a misconfigured rule, if any."""
diff --git a/src/cloudflare/types/zero_trust/gateway/gateway_settings.py b/src/cloudflare/types/zero_trust/gateway/gateway_settings.py
index 9b4982435da..36b7b9dc1a5 100644
--- a/src/cloudflare/types/zero_trust/gateway/gateway_settings.py
+++ b/src/cloudflare/types/zero_trust/gateway/gateway_settings.py
@@ -12,9 +12,13 @@ class GatewaySettings(BaseModel):
     created_at: Optional[datetime] = None
 
     public_key: Optional[str] = None
-    """SSH encryption public key"""
+    """Provide the Base64-encoded HPKE public key that encrypts SSH session logs.
+
+    See
+    https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/use-cases/ssh/ssh-infrastructure-access/#enable-ssh-command-logging.
+    """
 
     seed_id: Optional[str] = None
-    """Seed ID"""
+    """Identify the seed ID."""
 
     updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/gateway/ip_network.py b/src/cloudflare/types/zero_trust/gateway/ip_network.py
new file mode 100644
index 00000000000..ff448e3ffcf
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/ip_network.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["IPNetwork"]
+
+
+class IPNetwork(BaseModel):
+    network: str
+    """Specify the IP address or IP CIDR."""
diff --git a/src/cloudflare/types/zero_trust/gateway/ip_network_param.py b/src/cloudflare/types/zero_trust/gateway/ip_network_param.py
new file mode 100644
index 00000000000..8b28989c142
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/ip_network_param.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["IPNetworkParam"]
+
+
+class IPNetworkParam(TypedDict, total=False):
+    network: Required[str]
+    """Specify the IP address or IP CIDR."""
diff --git a/src/cloudflare/types/zero_trust/gateway/ipv4_endpoint.py b/src/cloudflare/types/zero_trust/gateway/ipv4_endpoint.py
new file mode 100644
index 00000000000..d6f8de5d99c
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/ipv4_endpoint.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+
+from ...._models import BaseModel
+
+__all__ = ["IPV4Endpoint"]
+
+
+class IPV4Endpoint(BaseModel):
+    enabled: Optional[bool] = None
+    """Indicate whether the IPv4 endpoint is enabled for this location."""
diff --git a/src/cloudflare/types/zero_trust/gateway/ipv4_endpoint_param.py b/src/cloudflare/types/zero_trust/gateway/ipv4_endpoint_param.py
new file mode 100644
index 00000000000..0c3ff33e030
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/ipv4_endpoint_param.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import TypedDict
+
+__all__ = ["IPV4EndpointParam"]
+
+
+class IPV4EndpointParam(TypedDict, total=False):
+    enabled: bool
+    """Indicate whether the IPv4 endpoint is enabled for this location."""
diff --git a/src/cloudflare/types/zero_trust/gateway/ipv6_endpoint.py b/src/cloudflare/types/zero_trust/gateway/ipv6_endpoint.py
new file mode 100644
index 00000000000..02766ebd199
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/ipv6_endpoint.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+
+from ...._models import BaseModel
+from .ipv6_network import IPV6Network
+
+__all__ = ["IPV6Endpoint"]
+
+
+class IPV6Endpoint(BaseModel):
+    enabled: Optional[bool] = None
+    """Indicate whether the IPV6 endpoint is enabled for this location."""
+
+    networks: Optional[List[IPV6Network]] = None
+    """Specify the list of allowed source IPv6 network ranges for this endpoint.
+
+    When the list is empty, the endpoint allows all source IPs. The list takes
+    effect only if the endpoint is enabled for this location.
+    """
diff --git a/src/cloudflare/types/zero_trust/gateway/ipv6_endpoint_param.py b/src/cloudflare/types/zero_trust/gateway/ipv6_endpoint_param.py
new file mode 100644
index 00000000000..049eb95faec
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/ipv6_endpoint_param.py
@@ -0,0 +1,22 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Iterable, Optional
+from typing_extensions import TypedDict
+
+from .ipv6_network_param import IPV6NetworkParam
+
+__all__ = ["IPV6EndpointParam"]
+
+
+class IPV6EndpointParam(TypedDict, total=False):
+    enabled: bool
+    """Indicate whether the IPV6 endpoint is enabled for this location."""
+
+    networks: Optional[Iterable[IPV6NetworkParam]]
+    """Specify the list of allowed source IPv6 network ranges for this endpoint.
+
+    When the list is empty, the endpoint allows all source IPs. The list takes
+    effect only if the endpoint is enabled for this location.
+    """
diff --git a/src/cloudflare/types/zero_trust/gateway/ipv6_network.py b/src/cloudflare/types/zero_trust/gateway/ipv6_network.py
new file mode 100644
index 00000000000..e27d87304e6
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/ipv6_network.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ...._models import BaseModel
+
+__all__ = ["IPV6Network"]
+
+
+class IPV6Network(BaseModel):
+    network: str
+    """Specify the IPv6 address or IPv6 CIDR."""
diff --git a/src/cloudflare/types/zero_trust/gateway/ipv6_network_param.py b/src/cloudflare/types/zero_trust/gateway/ipv6_network_param.py
new file mode 100644
index 00000000000..0116105d57a
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/gateway/ipv6_network_param.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["IPV6NetworkParam"]
+
+
+class IPV6NetworkParam(TypedDict, total=False):
+    network: Required[str]
+    """Specify the IPv6 address or IPv6 CIDR."""
diff --git a/src/cloudflare/types/zero_trust/gateway/list_create_params.py b/src/cloudflare/types/zero_trust/gateway/list_create_params.py
index c1d48ff069c..10c5bcf8675 100644
--- a/src/cloudflare/types/zero_trust/gateway/list_create_params.py
+++ b/src/cloudflare/types/zero_trust/gateway/list_create_params.py
@@ -5,22 +5,28 @@
 from typing import Iterable
 from typing_extensions import Literal, Required, TypedDict
 
-from .gateway_item_param import GatewayItemParam
-
-__all__ = ["ListCreateParams"]
+__all__ = ["ListCreateParams", "Item"]
 
 
 class ListCreateParams(TypedDict, total=False):
     account_id: Required[str]
 
     name: Required[str]
-    """The name of the list."""
+    """Specify the list name."""
+
+    type: Required[Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP", "CATEGORY", "LOCATION", "DEVICE"]]
+    """Specify the list type."""
+
+    description: str
+    """Provide the list description."""
+
+    items: Iterable[Item]
+    """Add items to the list."""
 
-    type: Required[Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"]]
-    """The type of list."""
 
+class Item(TypedDict, total=False):
     description: str
-    """The description of the list."""
+    """Provide the list item description (optional)."""
 
-    items: Iterable[GatewayItemParam]
-    """The items in the list."""
+    value: str
+    """Specify the item value."""
diff --git a/src/cloudflare/types/zero_trust/gateway/list_create_response.py b/src/cloudflare/types/zero_trust/gateway/list_create_response.py
index 5db7e9b6e86..0aa554d4b58 100644
--- a/src/cloudflare/types/zero_trust/gateway/list_create_response.py
+++ b/src/cloudflare/types/zero_trust/gateway/list_create_response.py
@@ -12,20 +12,20 @@
 
 class ListCreateResponse(BaseModel):
     id: Optional[str] = None
-    """API Resource UUID tag."""
+    """Identify the API resource with a UUID."""
 
     created_at: Optional[datetime] = None
 
     description: Optional[str] = None
-    """The description of the list."""
+    """Provide the list description."""
 
     items: Optional[List[GatewayItem]] = None
-    """The items in the list."""
+    """Provide the list items."""
 
     name: Optional[str] = None
-    """The name of the list."""
+    """Specify the list name."""
 
-    type: Optional[Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"]] = None
-    """The type of list."""
+    type: Optional[Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP", "CATEGORY", "LOCATION", "DEVICE"]] = None
+    """Specify the list type."""
 
     updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/gateway/list_delete_response.py b/src/cloudflare/types/zero_trust/gateway/list_delete_response.py
deleted file mode 100644
index a798b20e4ad..00000000000
--- a/src/cloudflare/types/zero_trust/gateway/list_delete_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["ListDeleteResponse"]
-
-ListDeleteResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/zero_trust/gateway/list_edit_params.py b/src/cloudflare/types/zero_trust/gateway/list_edit_params.py
index bdc08db33cc..7a5444a78cb 100644
--- a/src/cloudflare/types/zero_trust/gateway/list_edit_params.py
+++ b/src/cloudflare/types/zero_trust/gateway/list_edit_params.py
@@ -2,19 +2,27 @@
 
 from __future__ import annotations
 
-from typing import List, Iterable
+from typing import Iterable
 from typing_extensions import Required, TypedDict
 
-from .gateway_item_param import GatewayItemParam
+from ...._types import SequenceNotStr
 
-__all__ = ["ListEditParams"]
+__all__ = ["ListEditParams", "Append"]
 
 
 class ListEditParams(TypedDict, total=False):
     account_id: Required[str]
 
-    append: Iterable[GatewayItemParam]
-    """The items in the list."""
+    append: Iterable[Append]
+    """Add items to the list."""
 
-    remove: List[str]
-    """A list of the item values you want to remove."""
+    remove: SequenceNotStr[str]
+    """Lists of item values you want to remove."""
+
+
+class Append(TypedDict, total=False):
+    description: str
+    """Provide the list item description (optional)."""
+
+    value: str
+    """Specify the item value."""
diff --git a/src/cloudflare/types/zero_trust/gateway/list_list_params.py b/src/cloudflare/types/zero_trust/gateway/list_list_params.py
index 30c9d6123e6..c16707c6ffd 100644
--- a/src/cloudflare/types/zero_trust/gateway/list_list_params.py
+++ b/src/cloudflare/types/zero_trust/gateway/list_list_params.py
@@ -10,5 +10,5 @@
 class ListListParams(TypedDict, total=False):
     account_id: Required[str]
 
-    type: Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"]
-    """The type of list."""
+    type: Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP", "CATEGORY", "LOCATION", "DEVICE"]
+    """Specify the list type."""
diff --git a/src/cloudflare/types/zero_trust/gateway/list_update_params.py b/src/cloudflare/types/zero_trust/gateway/list_update_params.py
index 0177452d00e..bcca5a2f5fe 100644
--- a/src/cloudflare/types/zero_trust/gateway/list_update_params.py
+++ b/src/cloudflare/types/zero_trust/gateway/list_update_params.py
@@ -2,16 +2,28 @@
 
 from __future__ import annotations
 
+from typing import Iterable
 from typing_extensions import Required, TypedDict
 
-__all__ = ["ListUpdateParams"]
+__all__ = ["ListUpdateParams", "Item"]
 
 
 class ListUpdateParams(TypedDict, total=False):
     account_id: Required[str]
 
     name: Required[str]
-    """The name of the list."""
+    """Specify the list name."""
 
     description: str
-    """The description of the list."""
+    """Provide the list description."""
+
+    items: Iterable[Item]
+    """Add items to the list."""
+
+
+class Item(TypedDict, total=False):
+    description: str
+    """Provide the list item description (optional)."""
+
+    value: str
+    """Specify the item value."""
diff --git a/src/cloudflare/types/zero_trust/gateway/lists/item_list_response.py b/src/cloudflare/types/zero_trust/gateway/lists/item_list_response.py
index 5c1ec2f93af..4db5d15a508 100644
--- a/src/cloudflare/types/zero_trust/gateway/lists/item_list_response.py
+++ b/src/cloudflare/types/zero_trust/gateway/lists/item_list_response.py
@@ -1,9 +1,10 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List
+from typing_extensions import TypeAlias
 
 from ..gateway_item import GatewayItem
 
 __all__ = ["ItemListResponse"]
 
-ItemListResponse = List[GatewayItem]
+ItemListResponse: TypeAlias = List[GatewayItem]
diff --git a/src/cloudflare/types/zero_trust/gateway/location.py b/src/cloudflare/types/zero_trust/gateway/location.py
index ae5690f7331..b2b1b495220 100644
--- a/src/cloudflare/types/zero_trust/gateway/location.py
+++ b/src/cloudflare/types/zero_trust/gateway/location.py
@@ -3,154 +3,76 @@
 from typing import List, Optional
 from datetime import datetime
 
+from .endpoint import Endpoint
 from ...._models import BaseModel
 
-__all__ = [
-    "Location",
-    "Endpoints",
-    "EndpointsDOH",
-    "EndpointsDOHNetwork",
-    "EndpointsDOT",
-    "EndpointsDOTNetwork",
-    "EndpointsIPV4",
-    "EndpointsIPV6",
-    "EndpointsIPV6Network",
-    "Network",
-]
-
-
-class EndpointsDOHNetwork(BaseModel):
-    network: str
-    """The IP address or IP CIDR."""
-
-
-class EndpointsDOH(BaseModel):
-    enabled: Optional[bool] = None
-    """True if the endpoint is enabled for this location."""
-
-    networks: Optional[List[EndpointsDOHNetwork]] = None
-    """A list of allowed source IP network ranges for this endpoint.
-
-    When empty, all source IPs are allowed. A non-empty list is only effective if
-    the endpoint is enabled for this location.
-    """
-
-    require_token: Optional[bool] = None
-    """
-    True if the endpoint requires
-    [user identity](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/agentless/dns/dns-over-https/#filter-doh-requests-by-user)
-    authentication.
-    """
-
-
-class EndpointsDOTNetwork(BaseModel):
-    network: str
-    """The IP address or IP CIDR."""
-
-
-class EndpointsDOT(BaseModel):
-    enabled: Optional[bool] = None
-    """True if the endpoint is enabled for this location."""
-
-    networks: Optional[List[EndpointsDOTNetwork]] = None
-    """A list of allowed source IP network ranges for this endpoint.
-
-    When empty, all source IPs are allowed. A non-empty list is only effective if
-    the endpoint is enabled for this location.
-    """
-
-
-class EndpointsIPV4(BaseModel):
-    enabled: Optional[bool] = None
-    """True if the endpoint is enabled for this location."""
-
-
-class EndpointsIPV6Network(BaseModel):
-    network: str
-    """The IPv6 address or IPv6 CIDR."""
-
-
-class EndpointsIPV6(BaseModel):
-    enabled: Optional[bool] = None
-    """True if the endpoint is enabled for this location."""
-
-    networks: Optional[List[EndpointsIPV6Network]] = None
-    """A list of allowed source IPv6 network ranges for this endpoint.
-
-    When empty, all source IPs are allowed. A non-empty list is only effective if
-    the endpoint is enabled for this location.
-    """
-
-
-class Endpoints(BaseModel):
-    doh: Optional[EndpointsDOH] = None
-
-    dot: Optional[EndpointsDOT] = None
-
-    ipv4: Optional[EndpointsIPV4] = None
-
-    ipv6: Optional[EndpointsIPV6] = None
+__all__ = ["Location", "Network"]
 
 
 class Network(BaseModel):
     network: str
-    """The IPv4 address or IPv4 CIDR. IPv4 CIDRs are limited to a maximum of /24."""
+    """Specify the IPv4 address or IPv4 CIDR. Limit IPv4 CIDRs to a maximum of /24."""
 
 
 class Location(BaseModel):
     id: Optional[str] = None
 
     client_default: Optional[bool] = None
-    """True if the location is the default location."""
+    """Indicate whether this location is the default location."""
 
     created_at: Optional[datetime] = None
 
     dns_destination_ips_id: Optional[str] = None
-    """The identifier of the pair of IPv4 addresses assigned to this location."""
+    """
+    Indicate the identifier of the pair of IPv4 addresses assigned to this location.
+    """
+
+    dns_destination_ipv6_block_id: Optional[str] = None
+    """
+    Specify the UUID of the IPv6 block brought to the gateway so that this
+    location's IPv6 address is allocated from the Bring Your Own IPv6 (BYOIPv6)
+    block rather than the standard Cloudflare IPv6 block.
+    """
 
     doh_subdomain: Optional[str] = None
-    """The DNS over HTTPS domain to send DNS requests to.
+    """Specify the DNS over HTTPS domain that receives DNS requests.
 
-    This field is auto-generated by Gateway.
+    Gateway automatically generates this value.
     """
 
     ecs_support: Optional[bool] = None
-    """True if the location needs to resolve EDNS queries."""
+    """Indicate whether the location must resolve EDNS queries."""
 
-    endpoints: Optional[Endpoints] = None
-    """The destination endpoints configured for this location.
-
-    When updating a location, if this field is absent or set with null, the
-    endpoints configuration remains unchanged.
-    """
+    endpoints: Optional[Endpoint] = None
+    """Configure the destination endpoints for this location."""
 
     ip: Optional[str] = None
-    """IPV6 destination ip assigned to this location.
-
-    DNS requests sent to this IP will counted as the request under this location.
-    This field is auto-generated by Gateway.
+    """
+    Defines the automatically generated IPv6 destination IP assigned to this
+    location. Gateway counts all DNS requests sent to this IP as requests under this
+    location.
     """
 
     ipv4_destination: Optional[str] = None
     """
-    The primary destination IPv4 address from the pair identified by the
-    dns_destination_ips_id. This field is read-only.
+    Show the primary destination IPv4 address from the pair identified
+    dns_destination_ips_id. This field read-only.
     """
 
     ipv4_destination_backup: Optional[str] = None
     """
-    The backup destination IPv4 address from the pair identified by the
-    dns_destination_ips_id. This field is read-only.
+    Show the backup destination IPv4 address from the pair identified
+    dns_destination_ips_id. This field read-only.
     """
 
     name: Optional[str] = None
-    """The name of the location."""
+    """Specify the location name."""
 
     networks: Optional[List[Network]] = None
-    """A list of network ranges that requests from this location would originate from.
-
-    A non-empty list is only effective if the ipv4 endpoint is enabled for this
-    location.
+    """
+    Specify the list of network ranges from which requests at this location
+    originate. The list takes effect only if it is non-empty and the IPv4 endpoint
+    is enabled for this location.
     """
 
     updated_at: Optional[datetime] = None
diff --git a/src/cloudflare/types/zero_trust/gateway/location_create_params.py b/src/cloudflare/types/zero_trust/gateway/location_create_params.py
index 4fe3e12d541..f20f9f2845a 100644
--- a/src/cloudflare/types/zero_trust/gateway/location_create_params.py
+++ b/src/cloudflare/types/zero_trust/gateway/location_create_params.py
@@ -2,9 +2,11 @@
 
 from __future__ import annotations
 
-from typing import Iterable
+from typing import Iterable, Optional
 from typing_extensions import Required, TypedDict
 
+from .endpoint_param import EndpointParam
+
 __all__ = ["LocationCreateParams", "Network"]
 
 
@@ -12,31 +14,34 @@ class LocationCreateParams(TypedDict, total=False):
     account_id: Required[str]
 
     name: Required[str]
-    """The name of the location."""
+    """Specify the location name."""
 
     client_default: bool
-    """True if the location is the default location."""
+    """Indicate whether this location is the default location."""
 
     dns_destination_ips_id: str
-    """The identifier of the pair of IPv4 addresses assigned to this location.
+    """Specify the identifier of the pair of IPv4 addresses assigned to this location.
 
-    When creating a location, if this field is absent or set with null, the pair of
+    When creating a location, if this field is absent or set to null, the pair of
     shared IPv4 addresses (0e4a32c6-6fb8-4858-9296-98f51631e8e6) is auto-assigned.
-    When updating a location, if the field is absent or set with null, the
+    When updating a location, if this field is absent or set to null, the
     pre-assigned pair remains unchanged.
     """
 
     ecs_support: bool
-    """True if the location needs to resolve EDNS queries."""
+    """Indicate whether the location must resolve EDNS queries."""
 
-    networks: Iterable[Network]
-    """A list of network ranges that requests from this location would originate from.
+    endpoints: Optional[EndpointParam]
+    """Configure the destination endpoints for this location."""
 
-    A non-empty list is only effective if the ipv4 endpoint is enabled for this
-    location.
+    networks: Optional[Iterable[Network]]
+    """
+    Specify the list of network ranges from which requests at this location
+    originate. The list takes effect only if it is non-empty and the IPv4 endpoint
+    is enabled for this location.
     """
 
 
 class Network(TypedDict, total=False):
     network: Required[str]
-    """The IPv4 address or IPv4 CIDR. IPv4 CIDRs are limited to a maximum of /24."""
+    """Specify the IPv4 address or IPv4 CIDR. Limit IPv4 CIDRs to a maximum of /24."""
diff --git a/src/cloudflare/types/zero_trust/gateway/location_delete_response.py b/src/cloudflare/types/zero_trust/gateway/location_delete_response.py
deleted file mode 100644
index d152621d0fa..00000000000
--- a/src/cloudflare/types/zero_trust/gateway/location_delete_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["LocationDeleteResponse"]
-
-LocationDeleteResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/zero_trust/gateway/location_update_params.py b/src/cloudflare/types/zero_trust/gateway/location_update_params.py
index 5878d373749..b374d0096a0 100644
--- a/src/cloudflare/types/zero_trust/gateway/location_update_params.py
+++ b/src/cloudflare/types/zero_trust/gateway/location_update_params.py
@@ -2,9 +2,11 @@
 
 from __future__ import annotations
 
-from typing import Iterable
+from typing import Iterable, Optional
 from typing_extensions import Required, TypedDict
 
+from .endpoint_param import EndpointParam
+
 __all__ = ["LocationUpdateParams", "Network"]
 
 
@@ -12,31 +14,34 @@ class LocationUpdateParams(TypedDict, total=False):
     account_id: Required[str]
 
     name: Required[str]
-    """The name of the location."""
+    """Specify the location name."""
 
     client_default: bool
-    """True if the location is the default location."""
+    """Indicate whether this location is the default location."""
 
     dns_destination_ips_id: str
-    """The identifier of the pair of IPv4 addresses assigned to this location.
+    """Specify the identifier of the pair of IPv4 addresses assigned to this location.
 
-    When creating a location, if this field is absent or set with null, the pair of
+    When creating a location, if this field is absent or set to null, the pair of
     shared IPv4 addresses (0e4a32c6-6fb8-4858-9296-98f51631e8e6) is auto-assigned.
-    When updating a location, if the field is absent or set with null, the
+    When updating a location, if this field is absent or set to null, the
     pre-assigned pair remains unchanged.
     """
 
     ecs_support: bool
-    """True if the location needs to resolve EDNS queries."""
+    """Indicate whether the location must resolve EDNS queries."""
 
-    networks: Iterable[Network]
-    """A list of network ranges that requests from this location would originate from.
+    endpoints: Optional[EndpointParam]
+    """Configure the destination endpoints for this location."""
 
-    A non-empty list is only effective if the ipv4 endpoint is enabled for this
-    location.
+    networks: Optional[Iterable[Network]]
+    """
+    Specify the list of network ranges from which requests at this location
+    originate. The list takes effect only if it is non-empty and the IPv4 endpoint
+    is enabled for this location.
     """
 
 
 class Network(TypedDict, total=False):
     network: Required[str]
-    """The IPv4 address or IPv4 CIDR. IPv4 CIDRs are limited to a maximum of /24."""
+    """Specify the IPv4 address or IPv4 CIDR. Limit IPv4 CIDRs to a maximum of /24."""
diff --git a/src/cloudflare/types/zero_trust/gateway/logging_setting.py b/src/cloudflare/types/zero_trust/gateway/logging_setting.py
index 7fd32c437a6..74dfefd6ab4 100644
--- a/src/cloudflare/types/zero_trust/gateway/logging_setting.py
+++ b/src/cloudflare/types/zero_trust/gateway/logging_setting.py
@@ -4,26 +4,65 @@
 
 from ...._models import BaseModel
 
-__all__ = ["LoggingSetting", "SettingsByRuleType"]
+__all__ = [
+    "LoggingSetting",
+    "SettingsByRuleType",
+    "SettingsByRuleTypeDNS",
+    "SettingsByRuleTypeHTTP",
+    "SettingsByRuleTypeL4",
+]
+
+
+class SettingsByRuleTypeDNS(BaseModel):
+    """Configure logging settings for DNS firewall."""
+
+    log_all: Optional[bool] = None
+    """Specify whether to log all requests to this service."""
+
+    log_blocks: Optional[bool] = None
+    """Specify whether to log only blocking requests to this service."""
+
+
+class SettingsByRuleTypeHTTP(BaseModel):
+    """Configure logging settings for HTTP/HTTPS firewall."""
+
+    log_all: Optional[bool] = None
+    """Specify whether to log all requests to this service."""
+
+    log_blocks: Optional[bool] = None
+    """Specify whether to log only blocking requests to this service."""
+
+
+class SettingsByRuleTypeL4(BaseModel):
+    """Configure logging settings for Network firewall."""
+
+    log_all: Optional[bool] = None
+    """Specify whether to log all requests to this service."""
+
+    log_blocks: Optional[bool] = None
+    """Specify whether to log only blocking requests to this service."""
 
 
 class SettingsByRuleType(BaseModel):
-    dns: Optional[object] = None
-    """Logging settings for DNS firewall."""
+    """Configure logging settings for each rule type."""
+
+    dns: Optional[SettingsByRuleTypeDNS] = None
+    """Configure logging settings for DNS firewall."""
 
-    http: Optional[object] = None
-    """Logging settings for HTTP/HTTPS firewall."""
+    http: Optional[SettingsByRuleTypeHTTP] = None
+    """Configure logging settings for HTTP/HTTPS firewall."""
 
-    l4: Optional[object] = None
-    """Logging settings for Network firewall."""
+    l4: Optional[SettingsByRuleTypeL4] = None
+    """Configure logging settings for Network firewall."""
 
 
 class LoggingSetting(BaseModel):
     redact_pii: Optional[bool] = None
     """
-    Redact personally identifiable information from activity logging (PII fields
-    are: source IP, user email, user ID, device ID, URL, referrer, user agent).
+    Indicate whether to redact personally identifiable information from activity
+    logging (PII fields include source IP, user email, user ID, device ID, URL,
+    referrer, and user agent).
     """
 
     settings_by_rule_type: Optional[SettingsByRuleType] = None
-    """Logging settings by rule type."""
+    """Configure logging settings for each rule type."""
diff --git a/src/cloudflare/types/zero_trust/gateway/logging_update_params.py b/src/cloudflare/types/zero_trust/gateway/logging_update_params.py
index de1cb4dfeb6..9adfdbf29e4 100644
--- a/src/cloudflare/types/zero_trust/gateway/logging_update_params.py
+++ b/src/cloudflare/types/zero_trust/gateway/logging_update_params.py
@@ -4,7 +4,13 @@
 
 from typing_extensions import Required, TypedDict
 
-__all__ = ["LoggingUpdateParams", "SettingsByRuleType"]
+__all__ = [
+    "LoggingUpdateParams",
+    "SettingsByRuleType",
+    "SettingsByRuleTypeDNS",
+    "SettingsByRuleTypeHTTP",
+    "SettingsByRuleTypeL4",
+]
 
 
 class LoggingUpdateParams(TypedDict, total=False):
@@ -12,20 +18,53 @@ class LoggingUpdateParams(TypedDict, total=False):
 
     redact_pii: bool
     """
-    Redact personally identifiable information from activity logging (PII fields
-    are: source IP, user email, user ID, device ID, URL, referrer, user agent).
+    Indicate whether to redact personally identifiable information from activity
+    logging (PII fields include source IP, user email, user ID, device ID, URL,
+    referrer, and user agent).
     """
 
     settings_by_rule_type: SettingsByRuleType
-    """Logging settings by rule type."""
+    """Configure logging settings for each rule type."""
+
+
+class SettingsByRuleTypeDNS(TypedDict, total=False):
+    """Configure logging settings for DNS firewall."""
+
+    log_all: bool
+    """Specify whether to log all requests to this service."""
+
+    log_blocks: bool
+    """Specify whether to log only blocking requests to this service."""
+
+
+class SettingsByRuleTypeHTTP(TypedDict, total=False):
+    """Configure logging settings for HTTP/HTTPS firewall."""
+
+    log_all: bool
+    """Specify whether to log all requests to this service."""
+
+    log_blocks: bool
+    """Specify whether to log only blocking requests to this service."""
+
+
+class SettingsByRuleTypeL4(TypedDict, total=False):
+    """Configure logging settings for Network firewall."""
+
+    log_all: bool
+    """Specify whether to log all requests to this service."""
+
+    log_blocks: bool
+    """Specify whether to log only blocking requests to this service."""
 
 
 class SettingsByRuleType(TypedDict, total=False):
-    dns: object
-    """Logging settings for DNS firewall."""
+    """Configure logging settings for each rule type."""
+
+    dns: SettingsByRuleTypeDNS
+    """Configure logging settings for DNS firewall."""
 
-    http: object
-    """Logging settings for HTTP/HTTPS firewall."""
+    http: SettingsByRuleTypeHTTP
+    """Configure logging settings for HTTP/HTTPS firewall."""
 
-    l4: object
-    """Logging settings for Network firewall."""
+    l4: SettingsByRuleTypeL4
+    """Configure logging settings for Network firewall."""
diff --git a/src/cloudflare/types/zero_trust/gateway/notification_settings.py b/src/cloudflare/types/zero_trust/gateway/notification_settings.py
index 0a1be707f81..5c84e7c643f 100644
--- a/src/cloudflare/types/zero_trust/gateway/notification_settings.py
+++ b/src/cloudflare/types/zero_trust/gateway/notification_settings.py
@@ -8,14 +8,19 @@
 
 
 class NotificationSettings(BaseModel):
+    """Configure the message the user's device shows during an antivirus scan."""
+
     enabled: Optional[bool] = None
-    """Set notification on"""
+    """Specify whether to enable notifications."""
+
+    include_context: Optional[bool] = None
+    """Specify whether to include context information as query parameters."""
 
     msg: Optional[str] = None
-    """Customize the message shown in the notification."""
+    """Specify the message to show in the notification."""
 
     support_url: Optional[str] = None
-    """Optional URL to direct users to additional information.
+    """Specify a URL that directs users to more information.
 
-    If not set, the notification will open a block page.
+    If unset, the notification opens a block page.
     """
diff --git a/src/cloudflare/types/zero_trust/gateway/notification_settings_param.py b/src/cloudflare/types/zero_trust/gateway/notification_settings_param.py
index 96db4b9f3c9..37ab87dc492 100644
--- a/src/cloudflare/types/zero_trust/gateway/notification_settings_param.py
+++ b/src/cloudflare/types/zero_trust/gateway/notification_settings_param.py
@@ -8,14 +8,19 @@
 
 
 class NotificationSettingsParam(TypedDict, total=False):
+    """Configure the message the user's device shows during an antivirus scan."""
+
     enabled: bool
-    """Set notification on"""
+    """Specify whether to enable notifications."""
+
+    include_context: bool
+    """Specify whether to include context information as query parameters."""
 
     msg: str
-    """Customize the message shown in the notification."""
+    """Specify the message to show in the notification."""
 
     support_url: str
-    """Optional URL to direct users to additional information.
+    """Specify a URL that directs users to more information.
 
-    If not set, the notification will open a block page.
+    If unset, the notification opens a block page.
     """
diff --git a/src/cloudflare/types/zero_trust/gateway/protocol_detection.py b/src/cloudflare/types/zero_trust/gateway/protocol_detection.py
index 7d082eb6c2c..f937fa6fe96 100644
--- a/src/cloudflare/types/zero_trust/gateway/protocol_detection.py
+++ b/src/cloudflare/types/zero_trust/gateway/protocol_detection.py
@@ -8,5 +8,7 @@
 
 
 class ProtocolDetection(BaseModel):
+    """Specify whether to detect protocols from the initial bytes of client traffic."""
+
     enabled: Optional[bool] = None
-    """Enable detecting protocol on initial bytes of client traffic."""
+    """Specify whether to detect protocols from the initial bytes of client traffic."""
diff --git a/src/cloudflare/types/zero_trust/gateway/protocol_detection_param.py b/src/cloudflare/types/zero_trust/gateway/protocol_detection_param.py
index faece993406..6aea598b10f 100644
--- a/src/cloudflare/types/zero_trust/gateway/protocol_detection_param.py
+++ b/src/cloudflare/types/zero_trust/gateway/protocol_detection_param.py
@@ -2,11 +2,14 @@
 
 from __future__ import annotations
 
+from typing import Optional
 from typing_extensions import TypedDict
 
 __all__ = ["ProtocolDetectionParam"]
 
 
 class ProtocolDetectionParam(TypedDict, total=False):
-    enabled: bool
-    """Enable detecting protocol on initial bytes of client traffic."""
+    """Specify whether to detect protocols from the initial bytes of client traffic."""
+
+    enabled: Optional[bool]
+    """Specify whether to detect protocols from the initial bytes of client traffic."""
diff --git a/src/cloudflare/types/zero_trust/gateway/proxy_endpoint.py b/src/cloudflare/types/zero_trust/gateway/proxy_endpoint.py
index 8366853ea4e..69ee6392634 100644
--- a/src/cloudflare/types/zero_trust/gateway/proxy_endpoint.py
+++ b/src/cloudflare/types/zero_trust/gateway/proxy_endpoint.py
@@ -1,26 +1,53 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List, Union, Optional
 from datetime import datetime
+from typing_extensions import Literal, Annotated, TypeAlias
 
+from ...._utils import PropertyInfo
 from ...._models import BaseModel
 from .gateway_ips import GatewayIPs
 
-__all__ = ["ProxyEndpoint"]
+__all__ = ["ProxyEndpoint", "ZeroTrustGatewayProxyEndpointIP", "ZeroTrustGatewayProxyEndpointIdentity"]
 
 
-class ProxyEndpoint(BaseModel):
+class ZeroTrustGatewayProxyEndpointIP(BaseModel):
+    ips: List[GatewayIPs]
+    """Specify the list of CIDRs to restrict ingress connections."""
+
+    name: str
+    """Specify the name of the proxy endpoint."""
+
     id: Optional[str] = None
 
     created_at: Optional[datetime] = None
 
-    ips: Optional[List[GatewayIPs]] = None
-    """A list of CIDRs to restrict ingress connections."""
+    kind: Optional[Literal["ip"]] = None
+    """The proxy endpoint kind"""
+
+    subdomain: Optional[str] = None
+    """Specify the subdomain to use as the destination in the proxy client."""
+
+    updated_at: Optional[datetime] = None
+
 
-    name: Optional[str] = None
-    """The name of the proxy endpoint."""
+class ZeroTrustGatewayProxyEndpointIdentity(BaseModel):
+    kind: Literal["identity"]
+    """The proxy endpoint kind"""
+
+    name: str
+    """Specify the name of the proxy endpoint."""
+
+    id: Optional[str] = None
+
+    created_at: Optional[datetime] = None
 
     subdomain: Optional[str] = None
-    """The subdomain to be used as the destination in the proxy client."""
+    """Specify the subdomain to use as the destination in the proxy client."""
 
     updated_at: Optional[datetime] = None
+
+
+ProxyEndpoint: TypeAlias = Annotated[
+    Union[ZeroTrustGatewayProxyEndpointIP, ZeroTrustGatewayProxyEndpointIdentity], PropertyInfo(discriminator="kind")
+]
diff --git a/src/cloudflare/types/zero_trust/gateway/proxy_endpoint_create_params.py b/src/cloudflare/types/zero_trust/gateway/proxy_endpoint_create_params.py
index d7c6c6674e8..344ef9e7c9c 100644
--- a/src/cloudflare/types/zero_trust/gateway/proxy_endpoint_create_params.py
+++ b/src/cloudflare/types/zero_trust/gateway/proxy_endpoint_create_params.py
@@ -2,19 +2,36 @@
 
 from __future__ import annotations
 
-from typing import List
-from typing_extensions import Required, TypedDict
+from typing import Union
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
-from .gateway_ips import GatewayIPs
+__all__ = [
+    "ProxyEndpointCreateParams",
+    "ZeroTrustGatewayProxyEndpointIPCreate",
+    "ZeroTrustGatewayProxyEndpointIdentityCreate",
+]
 
-__all__ = ["ProxyEndpointCreateParams"]
 
+class ZeroTrustGatewayProxyEndpointIPCreate(TypedDict, total=False):
+    account_id: Required[str]
+
+    name: Required[str]
+    """Specify the name of the proxy endpoint."""
+
+    kind: Literal["ip"]
+    """The proxy endpoint kind"""
 
-class ProxyEndpointCreateParams(TypedDict, total=False):
+
+class ZeroTrustGatewayProxyEndpointIdentityCreate(TypedDict, total=False):
     account_id: Required[str]
 
-    ips: Required[List[GatewayIPs]]
-    """A list of CIDRs to restrict ingress connections."""
+    kind: Required[Literal["identity"]]
+    """The proxy endpoint kind"""
 
     name: Required[str]
-    """The name of the proxy endpoint."""
+    """Specify the name of the proxy endpoint."""
+
+
+ProxyEndpointCreateParams: TypeAlias = Union[
+    ZeroTrustGatewayProxyEndpointIPCreate, ZeroTrustGatewayProxyEndpointIdentityCreate
+]
diff --git a/src/cloudflare/types/zero_trust/gateway/proxy_endpoint_delete_response.py b/src/cloudflare/types/zero_trust/gateway/proxy_endpoint_delete_response.py
deleted file mode 100644
index 00e29cea0c4..00000000000
--- a/src/cloudflare/types/zero_trust/gateway/proxy_endpoint_delete_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["ProxyEndpointDeleteResponse"]
-
-ProxyEndpointDeleteResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/zero_trust/gateway/proxy_endpoint_edit_params.py b/src/cloudflare/types/zero_trust/gateway/proxy_endpoint_edit_params.py
index 9110c0529bb..b986f7f9480 100644
--- a/src/cloudflare/types/zero_trust/gateway/proxy_endpoint_edit_params.py
+++ b/src/cloudflare/types/zero_trust/gateway/proxy_endpoint_edit_params.py
@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Required, TypedDict
 
+from ...._types import SequenceNotStr
 from .gateway_ips import GatewayIPs
 
 __all__ = ["ProxyEndpointEditParams"]
@@ -13,8 +13,8 @@
 class ProxyEndpointEditParams(TypedDict, total=False):
     account_id: Required[str]
 
-    ips: List[GatewayIPs]
-    """A list of CIDRs to restrict ingress connections."""
+    ips: SequenceNotStr[GatewayIPs]
+    """Specify the list of CIDRs to restrict ingress connections."""
 
     name: str
-    """The name of the proxy endpoint."""
+    """Specify the name of the proxy endpoint."""
diff --git a/src/cloudflare/types/zero_trust/gateway/proxy_endpoint_get_response.py b/src/cloudflare/types/zero_trust/gateway/proxy_endpoint_get_response.py
deleted file mode 100644
index 225dd8730e2..00000000000
--- a/src/cloudflare/types/zero_trust/gateway/proxy_endpoint_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .proxy_endpoint import ProxyEndpoint
-
-__all__ = ["ProxyEndpointGetResponse"]
-
-ProxyEndpointGetResponse = List[ProxyEndpoint]
diff --git a/src/cloudflare/types/zero_trust/gateway/rule_create_params.py b/src/cloudflare/types/zero_trust/gateway/rule_create_params.py
index 72298b7f6df..f3bf649d539 100644
--- a/src/cloudflare/types/zero_trust/gateway/rule_create_params.py
+++ b/src/cloudflare/types/zero_trust/gateway/rule_create_params.py
@@ -2,14 +2,16 @@
 
 from __future__ import annotations
 
-from typing import List
-from typing_extensions import Literal, Required, TypedDict
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ...._utils import PropertyInfo
 from .gateway_filter import GatewayFilter
 from .schedule_param import ScheduleParam
 from .rule_setting_param import RuleSettingParam
 
-__all__ = ["RuleCreateParams"]
+__all__ = ["RuleCreateParams", "Expiration"]
 
 
 class RuleCreateParams(TypedDict, total=False):
@@ -30,51 +32,104 @@ class RuleCreateParams(TypedDict, total=False):
             "override",
             "l4_override",
             "egress",
-            "audit_ssh",
             "resolve",
+            "quarantine",
+            "redirect",
         ]
     ]
     """
-    The action to preform when the associated traffic, identity, and device posture
-    expressions are either absent or evaluate to `true`.
+    Specify the action to perform when the associated traffic, identity, and device
+    posture expressions either absent or evaluate to `true`.
     """
 
     name: Required[str]
-    """The name of the rule."""
+    """Specify the rule name."""
 
     description: str
-    """The description of the rule."""
+    """Specify the rule description."""
 
     device_posture: str
-    """The wirefilter expression used for device posture check matching."""
+    """Specify the wirefilter expression used for device posture check.
+
+    The API automatically formats and sanitizes expressions before storing them. To
+    prevent Terraform state drift, use the formatted expression returned in the API
+    response.
+    """
 
     enabled: bool
-    """True if the rule is enabled."""
+    """Specify whether the rule is enabled."""
+
+    expiration: Optional[Expiration]
+    """Defines the expiration time stamp and default duration of a DNS policy.
+
+    Takes precedence over the policy's `schedule` configuration, if any. This does
+    not apply to HTTP or network policies. Settable only for `dns` rules.
+    """
 
     filters: List[GatewayFilter]
     """
-    The protocol or layer to evaluate the traffic, identity, and device posture
-    expressions.
+    Specify the protocol or layer to evaluate the traffic, identity, and device
+    posture expressions. Can only contain a single value.
     """
 
     identity: str
-    """The wirefilter expression used for identity matching."""
+    """Specify the wirefilter expression used for identity matching.
+
+    The API automatically formats and sanitizes expressions before storing them. To
+    prevent Terraform state drift, use the formatted expression returned in the API
+    response.
+    """
 
     precedence: int
-    """Precedence sets the order of your rules.
+    """Set the order of your rules.
 
-    Lower values indicate higher precedence. At each processing phase, applicable
-    rules are evaluated in ascending order of this value.
+    Lower values indicate higher precedence. At each processing phase, evaluate
+    applicable rules in ascending order of this value. Refer to
+    [Order of enforcement](http://developers.cloudflare.com/learning-paths/secure-internet-traffic/understand-policies/order-of-enforcement/#manage-precedence-with-terraform)
+    to manage precedence via Terraform.
     """
 
     rule_settings: RuleSettingParam
-    """Additional settings that modify the rule's action."""
+    """Defines settings for this rule.
+
+    Settings apply only to specific rule types and must use compatible selectors. If
+    Terraform detects drift, confirm the setting supports your rule type and check
+    whether the API modifies the value. Use API-returned values in your
+    configuration to prevent drift.
+    """
 
-    schedule: ScheduleParam
-    """The schedule for activating DNS policies.
+    schedule: Optional[ScheduleParam]
+    """Defines the schedule for activating DNS policies.
 
-    This does not apply to HTTP or network policies.
+    Settable only for `dns` and `dns_resolver` rules.
     """
 
     traffic: str
-    """The wirefilter expression used for traffic matching."""
+    """Specify the wirefilter expression used for traffic matching.
+
+    The API automatically formats and sanitizes expressions before storing them. To
+    prevent Terraform state drift, use the formatted expression returned in the API
+    response.
+    """
+
+
+class Expiration(TypedDict, total=False):
+    """Defines the expiration time stamp and default duration of a DNS policy.
+
+    Takes precedence over the policy's `schedule` configuration, if any. This  does not apply to HTTP or network policies. Settable only for `dns` rules.
+    """
+
+    expires_at: Required[Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]]
+    """Show the timestamp when the policy expires and stops applying.
+
+    The value must follow RFC 3339 and include a UTC offset. The system accepts
+    non-zero offsets but converts them to the equivalent UTC+00:00 value and returns
+    timestamps with a trailing Z. Expiration policies ignore client timezones and
+    expire globally at the specified expires_at time.
+    """
+
+    duration: int
+    """Defines the default duration a policy active in minutes.
+
+    Must set in order to use the `reset_expiration` endpoint on this rule.
+    """
diff --git a/src/cloudflare/types/zero_trust/gateway/rule_delete_response.py b/src/cloudflare/types/zero_trust/gateway/rule_delete_response.py
deleted file mode 100644
index e26a4455b29..00000000000
--- a/src/cloudflare/types/zero_trust/gateway/rule_delete_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["RuleDeleteResponse"]
-
-RuleDeleteResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/zero_trust/gateway/rule_setting.py b/src/cloudflare/types/zero_trust/gateway/rule_setting.py
index 1e87ca2204e..4d9f97e1d55 100644
--- a/src/cloudflare/types/zero_trust/gateway/rule_setting.py
+++ b/src/cloudflare/types/zero_trust/gateway/rule_setting.py
@@ -1,8 +1,10 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import Dict, List, Optional
 from typing_extensions import Literal
 
+from pydantic import Field as FieldInfo
+
 from ...._models import BaseModel
 from .dns_resolver_settings_v4 import DNSResolverSettingsV4
 from .dns_resolver_settings_v6 import DNSResolverSettingsV6
@@ -10,195 +12,439 @@
 __all__ = [
     "RuleSetting",
     "AuditSSH",
-    "BisoAdminControls",
+    "BISOAdminControls",
+    "BlockPage",
     "CheckSession",
     "DNSResolvers",
     "Egress",
+    "ForensicCopy",
     "L4override",
     "NotificationSettings",
     "PayloadLog",
+    "Quarantine",
+    "Redirect",
+    "ResolveDNSInternally",
     "UntrustedCERT",
 ]
 
 
 class AuditSSH(BaseModel):
+    """Define the settings for the Audit SSH action.
+
+    Settable only for `l4` rules with `audit_ssh` action.
+    """
+
     command_logging: Optional[bool] = None
-    """Enable to turn on SSH command logging."""
+    """Enable SSH command logging."""
+
 
+class BISOAdminControls(BaseModel):
+    """Configure browser isolation behavior.
+
+    Settable only for `http` rules with the action set to `isolate`.
+    """
+
+    copy_: Optional[Literal["enabled", "disabled", "remote_only"]] = FieldInfo(alias="copy", default=None)
+    """Configure copy behavior.
+
+    If set to remote_only, users cannot copy isolated content from the remote
+    browser to the local clipboard. If this field is absent, copying remains
+    enabled. Applies only when version == "v2".
+    """
 
-class BisoAdminControls(BaseModel):
     dcp: Optional[bool] = None
-    """Set to false to enable copy-pasting."""
+    """Set to false to enable copy-pasting. Only applies when `version == "v1"`."""
 
     dd: Optional[bool] = None
-    """Set to false to enable downloading."""
+    """Set to false to enable downloading. Only applies when `version == "v1"`."""
 
     dk: Optional[bool] = None
-    """Set to false to enable keyboard usage."""
+    """Set to false to enable keyboard usage. Only applies when `version == "v1"`."""
+
+    download: Optional[Literal["enabled", "disabled", "remote_only"]] = None
+    """Configure download behavior.
+
+    When set to remote_only, users can view downloads but cannot save them. Applies
+    only when version == "v2".
+    """
 
     dp: Optional[bool] = None
-    """Set to false to enable printing."""
+    """Set to false to enable printing. Only applies when `version == "v1"`."""
 
     du: Optional[bool] = None
-    """Set to false to enable uploading."""
+    """Set to false to enable uploading. Only applies when `version == "v1"`."""
+
+    keyboard: Optional[Literal["enabled", "disabled"]] = None
+    """Configure keyboard usage behavior.
+
+    If this field is absent, keyboard usage remains enabled. Applies only when
+    version == "v2".
+    """
+
+    paste: Optional[Literal["enabled", "disabled", "remote_only"]] = None
+    """Configure paste behavior.
+
+    If set to remote_only, users cannot paste content from the local clipboard into
+    isolated pages. If this field is absent, pasting remains enabled. Applies only
+    when version == "v2".
+    """
+
+    printing: Optional[Literal["enabled", "disabled"]] = None
+    """Configure print behavior.
+
+    Default, Printing is enabled. Applies only when version == "v2".
+    """
+
+    upload: Optional[Literal["enabled", "disabled"]] = None
+    """Configure upload behavior.
+
+    If this field is absent, uploading remains enabled. Applies only when version ==
+    "v2".
+    """
+
+    version: Optional[Literal["v1", "v2"]] = None
+    """Indicate which version of the browser isolation controls should apply."""
+
+
+class BlockPage(BaseModel):
+    """Configure custom block page settings.
+
+    If missing or null, use the account settings. Settable only for `http` rules with the action set to `block`.
+    """
+
+    target_uri: str
+    """Specify the URI to which the user is redirected."""
+
+    include_context: Optional[bool] = None
+    """Specify whether to pass the context information as query parameters."""
 
 
 class CheckSession(BaseModel):
+    """Configure session check behavior.
+
+    Settable only for `l4` and `http` rules with the action set to `allow`.
+    """
+
     duration: Optional[str] = None
-    """Configure how fresh the session needs to be to be considered valid."""
+    """Sets the required session freshness threshold.
+
+    The API returns a normalized version of this value.
+    """
 
     enforce: Optional[bool] = None
-    """Set to true to enable session enforcement."""
+    """Enable session enforcement."""
 
 
 class DNSResolvers(BaseModel):
+    """Configure custom resolvers to route queries that match the resolver policy.
+
+    Unused with 'resolve_dns_through_cloudflare' or 'resolve_dns_internally' settings. DNS queries get routed to the address closest to their origin. Only valid when a rule's action set to 'resolve'. Settable only for `dns_resolver` rules.
+    """
+
     ipv4: Optional[List[DNSResolverSettingsV4]] = None
 
     ipv6: Optional[List[DNSResolverSettingsV6]] = None
 
 
 class Egress(BaseModel):
+    """Configure how Gateway Proxy traffic egresses.
+
+    You can enable this setting for rules with Egress actions and filters, or omit it to indicate local egress via WARP IPs. Settable only for `egress` rules.
+    """
+
     ipv4: Optional[str] = None
-    """The IPv4 address to be used for egress."""
+    """Specify the IPv4 address to use for egress."""
 
     ipv4_fallback: Optional[str] = None
-    """
-    The fallback IPv4 address to be used for egress in the event of an error
-    egressing with the primary IPv4. Can be '0.0.0.0' to indicate local egress via
-    WARP IPs.
+    """Specify the fallback IPv4 address to use for egress when the primary IPv4 fails.
+
+    Set '0.0.0.0' to indicate local egress via WARP IPs.
     """
 
     ipv6: Optional[str] = None
-    """The IPv6 range to be used for egress."""
+    """Specify the IPv6 range to use for egress."""
+
+
+class ForensicCopy(BaseModel):
+    """
+    Configure whether a copy of the HTTP request will be sent to storage when the rule matches.
+    """
+
+    enabled: Optional[bool] = None
+    """Enable sending the copy to storage."""
 
 
 class L4override(BaseModel):
+    """Send matching traffic to the supplied destination IP address and port.
+
+    Settable only for `l4` rules with the action set to `l4_override`.
+    """
+
     ip: Optional[str] = None
-    """IPv4 or IPv6 address."""
+    """Defines the IPv4 or IPv6 address."""
 
     port: Optional[int] = None
-    """A port number to use for TCP/UDP overrides."""
+    """Defines a port number to use for TCP/UDP overrides."""
 
 
 class NotificationSettings(BaseModel):
+    """Configure a notification to display on the user's device when this rule matched.
+
+    Settable for all types of rules with the action set to `block`.
+    """
+
     enabled: Optional[bool] = None
-    """Set notification on"""
+    """Enable notification."""
+
+    include_context: Optional[bool] = None
+    """Indicates whether to pass the context information as query parameters."""
 
     msg: Optional[str] = None
     """Customize the message shown in the notification."""
 
     support_url: Optional[str] = None
-    """Optional URL to direct users to additional information.
+    """Defines an optional URL to direct users to additional information.
 
-    If not set, the notification will open a block page.
+    If unset, the notification opens a block page.
     """
 
 
 class PayloadLog(BaseModel):
+    """Configure DLP payload logging. Settable only for `http` rules."""
+
     enabled: Optional[bool] = None
-    """Set to true to enable DLP payload logging for this rule."""
+    """Enable DLP payload logging for this rule."""
+
+
+class Quarantine(BaseModel):
+    """Configure settings that apply to quarantine rules.
+
+    Settable only for `http` rules.
+    """
+
+    file_types: Optional[
+        List[Literal["exe", "pdf", "doc", "docm", "docx", "rtf", "ppt", "pptx", "xls", "xlsm", "xlsx", "zip", "rar"]]
+    ] = None
+    """Specify the types of files to sandbox."""
+
+
+class Redirect(BaseModel):
+    """Apply settings to redirect rules.
+
+    Settable only for `http` rules with the action set to `redirect`.
+    """
+
+    target_uri: str
+    """Specify the URI to which the user is redirected."""
+
+    include_context: Optional[bool] = None
+    """Specify whether to pass the context information as query parameters."""
+
+    preserve_path_and_query: Optional[bool] = None
+    """
+    Specify whether to append the path and query parameters from the original
+    request to target_uri.
+    """
+
+
+class ResolveDNSInternally(BaseModel):
+    """
+    Configure to forward the query to the internal DNS service, passing the specified 'view_id' as input. Not used when 'dns_resolvers' is specified or 'resolve_dns_through_cloudflare' is set. Only valid when a rule's action set to 'resolve'. Settable only for `dns_resolver` rules.
+    """
+
+    fallback: Optional[Literal["none", "public_dns"]] = None
+    """
+    Specify the fallback behavior to apply when the internal DNS response code
+    differs from 'NOERROR' or when the response data contains only CNAME records for
+    'A' or 'AAAA' queries.
+    """
+
+    view_id: Optional[str] = None
+    """Specify the internal DNS view identifier to pass to the internal DNS service."""
 
 
 class UntrustedCERT(BaseModel):
+    """
+    Configure behavior when an upstream certificate is invalid or an SSL error occurs. Settable only for `http` rules with the action set to `allow`.
+    """
+
     action: Optional[Literal["pass_through", "block", "error"]] = None
-    """The action performed when an untrusted certificate is seen.
+    """Defines the action performed when an untrusted certificate seen.
 
-    The default action is an error with HTTP code 526.
+    The default action an error with HTTP code 526.
     """
 
 
 class RuleSetting(BaseModel):
-    add_headers: Optional[object] = None
-    """Add custom headers to allowed requests, in the form of key-value pairs.
+    """Defines settings for this rule.
 
-    Keys are header names, pointing to an array with its header value(s).
+    Settings apply only to specific rule types and must use compatible selectors. If Terraform detects drift, confirm the setting supports your rule type and check whether the API modifies the value. Use API-returned values in your configuration to prevent drift.
+    """
+
+    add_headers: Optional[Dict[str, List[str]]] = None
+    """Add custom headers to allowed requests as key-value pairs.
+
+    Use header names as keys that map to arrays of header values. Settable only for
+    `http` rules with the action set to `allow`.
     """
 
     allow_child_bypass: Optional[bool] = None
-    """Set by parent MSP accounts to enable their children to bypass this rule."""
+    """Set to enable MSP children to bypass this rule.
+
+    Only parent MSP accounts can set this. this rule. Settable for all types of
+    rules.
+    """
 
     audit_ssh: Optional[AuditSSH] = None
-    """Settings for the Audit SSH action."""
+    """Define the settings for the Audit SSH action.
+
+    Settable only for `l4` rules with `audit_ssh` action.
+    """
+
+    biso_admin_controls: Optional[BISOAdminControls] = None
+    """Configure browser isolation behavior.
 
-    biso_admin_controls: Optional[BisoAdminControls] = None
-    """Configure how browser isolation behaves."""
+    Settable only for `http` rules with the action set to `isolate`.
+    """
+
+    block_page: Optional[BlockPage] = None
+    """Configure custom block page settings.
+
+    If missing or null, use the account settings. Settable only for `http` rules
+    with the action set to `block`.
+    """
 
     block_page_enabled: Optional[bool] = None
-    """Enable the custom block page."""
+    """Enable the custom block page.
 
-    block_reason: Optional[str] = None
+    Settable only for `dns` rules with action `block`.
     """
-    The text describing why this block occurred, displayed on the custom block page
-    (if enabled).
+
+    block_reason: Optional[str] = None
+    """Explain why the rule blocks the request.
+
+    The custom block page shows this text (if enabled). Settable only for `dns`,
+    `l4`, and `http` rules when the action set to `block`.
     """
 
     bypass_parent_rule: Optional[bool] = None
-    """Set by children MSP accounts to bypass their parent's rules."""
+    """Set to enable MSP accounts to bypass their parent's rules.
+
+    Only MSP child accounts can set this. Settable for all types of rules.
+    """
 
     check_session: Optional[CheckSession] = None
-    """Configure how session check behaves."""
+    """Configure session check behavior.
+
+    Settable only for `l4` and `http` rules with the action set to `allow`.
+    """
 
     dns_resolvers: Optional[DNSResolvers] = None
-    """Add your own custom resolvers to route queries that match the resolver policy.
+    """Configure custom resolvers to route queries that match the resolver policy.
 
-    Cannot be used when resolve_dns_through_cloudflare is set. DNS queries will
-    route to the address closest to their origin. Only valid when a rule's action is
-    set to 'resolve'.
+    Unused with 'resolve_dns_through_cloudflare' or 'resolve_dns_internally'
+    settings. DNS queries get routed to the address closest to their origin. Only
+    valid when a rule's action set to 'resolve'. Settable only for `dns_resolver`
+    rules.
     """
 
     egress: Optional[Egress] = None
     """Configure how Gateway Proxy traffic egresses.
 
     You can enable this setting for rules with Egress actions and filters, or omit
-    it to indicate local egress via WARP IPs.
+    it to indicate local egress via WARP IPs. Settable only for `egress` rules.
+    """
+
+    forensic_copy: Optional[ForensicCopy] = None
+    """
+    Configure whether a copy of the HTTP request will be sent to storage when the
+    rule matches.
     """
 
     ignore_cname_category_matches: Optional[bool] = None
-    """Set to true, to ignore the category matches at CNAME domains in a response.
+    """Ignore category matches at CNAME domains in a response.
 
-    If unchecked, the categories in this rule will be checked against all the CNAME
-    domain categories in a response.
+    When off, evaluate categories in this rule against all CNAME domain categories
+    in the response. Settable only for `dns` and `dns_resolver` rules.
     """
 
     insecure_disable_dnssec_validation: Optional[bool] = None
-    """INSECURE - disable DNSSEC validation (for Allow actions)."""
+    """Specify whether to disable DNSSEC validation (for Allow actions) [INSECURE].
+
+    Settable only for `dns` rules.
+    """
 
     ip_categories: Optional[bool] = None
-    """Set to true to enable IPs in DNS resolver category blocks.
+    """Enable IPs in DNS resolver category blocks.
 
-    By default categories only block based on domain names.
+    The system blocks only domain name categories unless you enable this setting.
+    Settable only for `dns` and `dns_resolver` rules.
     """
 
     ip_indicator_feeds: Optional[bool] = None
-    """Set to true to include IPs in DNS resolver indicator feed blocks.
+    """Indicates whether to include IPs in DNS resolver indicator feed blocks.
 
-    By default indicator feeds only block based on domain names.
+    Default, indicator feeds block only domain names. Settable only for `dns` and
+    `dns_resolver` rules.
     """
 
     l4override: Optional[L4override] = None
-    """Send matching traffic to the supplied destination IP address and port."""
+    """Send matching traffic to the supplied destination IP address and port.
 
-    notification_settings: Optional[NotificationSettings] = None
+    Settable only for `l4` rules with the action set to `l4_override`.
     """
-    Configure a notification to display on the user's device when this rule is
-    matched.
+
+    notification_settings: Optional[NotificationSettings] = None
+    """Configure a notification to display on the user's device when this rule matched.
+
+    Settable for all types of rules with the action set to `block`.
     """
 
     override_host: Optional[str] = None
-    """Override matching DNS queries with a hostname."""
+    """Defines a hostname for override, for the matching DNS queries.
+
+    Settable only for `dns` rules with the action set to `override`.
+    """
 
     override_ips: Optional[List[str]] = None
-    """Override matching DNS queries with an IP or set of IPs."""
+    """Defines a an IP or set of IPs for overriding matched DNS queries.
+
+    Settable only for `dns` rules with the action set to `override`.
+    """
 
     payload_log: Optional[PayloadLog] = None
-    """Configure DLP payload logging."""
+    """Configure DLP payload logging. Settable only for `http` rules."""
+
+    quarantine: Optional[Quarantine] = None
+    """Configure settings that apply to quarantine rules.
+
+    Settable only for `http` rules.
+    """
+
+    redirect: Optional[Redirect] = None
+    """Apply settings to redirect rules.
+
+    Settable only for `http` rules with the action set to `redirect`.
+    """
+
+    resolve_dns_internally: Optional[ResolveDNSInternally] = None
+    """
+    Configure to forward the query to the internal DNS service, passing the
+    specified 'view_id' as input. Not used when 'dns_resolvers' is specified or
+    'resolve_dns_through_cloudflare' is set. Only valid when a rule's action set to
+    'resolve'. Settable only for `dns_resolver` rules.
+    """
 
     resolve_dns_through_cloudflare: Optional[bool] = None
     """
     Enable to send queries that match the policy to Cloudflare's default 1.1.1.1 DNS
-    resolver. Cannot be set when dns_resolvers are specified. Only valid when a
-    rule's action is set to 'resolve'.
+    resolver. Cannot set when 'dns_resolvers' specified or 'resolve_dns_internally'
+    is set. Only valid when a rule's action set to 'resolve'. Settable only for
+    `dns_resolver` rules.
     """
 
     untrusted_cert: Optional[UntrustedCERT] = None
-    """Configure behavior when an upstream cert is invalid or an SSL error occurs."""
+    """
+    Configure behavior when an upstream certificate is invalid or an SSL error
+    occurs. Settable only for `http` rules with the action set to `allow`.
+    """
diff --git a/src/cloudflare/types/zero_trust/gateway/rule_setting_param.py b/src/cloudflare/types/zero_trust/gateway/rule_setting_param.py
index 0992e550137..415870cae73 100644
--- a/src/cloudflare/types/zero_trust/gateway/rule_setting_param.py
+++ b/src/cloudflare/types/zero_trust/gateway/rule_setting_param.py
@@ -2,204 +2,449 @@
 
 from __future__ import annotations
 
-from typing import List, Iterable
-from typing_extensions import Literal, TypedDict
+from typing import Dict, List, Iterable, Optional
+from typing_extensions import Literal, Required, TypedDict
 
+from ...._types import SequenceNotStr
 from .dns_resolver_settings_v4_param import DNSResolverSettingsV4Param
 from .dns_resolver_settings_v6_param import DNSResolverSettingsV6Param
 
 __all__ = [
     "RuleSettingParam",
     "AuditSSH",
-    "BisoAdminControls",
+    "BISOAdminControls",
+    "BlockPage",
     "CheckSession",
     "DNSResolvers",
     "Egress",
+    "ForensicCopy",
     "L4override",
     "NotificationSettings",
     "PayloadLog",
+    "Quarantine",
+    "Redirect",
+    "ResolveDNSInternally",
     "UntrustedCERT",
 ]
 
 
 class AuditSSH(TypedDict, total=False):
+    """Define the settings for the Audit SSH action.
+
+    Settable only for `l4` rules with `audit_ssh` action.
+    """
+
     command_logging: bool
-    """Enable to turn on SSH command logging."""
+    """Enable SSH command logging."""
+
+
+class BISOAdminControls(TypedDict, total=False):
+    """Configure browser isolation behavior.
+
+    Settable only for `http` rules with the action set to `isolate`.
+    """
+
+    copy: Literal["enabled", "disabled", "remote_only"]
+    """Configure copy behavior.
 
+    If set to remote_only, users cannot copy isolated content from the remote
+    browser to the local clipboard. If this field is absent, copying remains
+    enabled. Applies only when version == "v2".
+    """
 
-class BisoAdminControls(TypedDict, total=False):
     dcp: bool
-    """Set to false to enable copy-pasting."""
+    """Set to false to enable copy-pasting. Only applies when `version == "v1"`."""
 
     dd: bool
-    """Set to false to enable downloading."""
+    """Set to false to enable downloading. Only applies when `version == "v1"`."""
 
     dk: bool
-    """Set to false to enable keyboard usage."""
+    """Set to false to enable keyboard usage. Only applies when `version == "v1"`."""
+
+    download: Literal["enabled", "disabled", "remote_only"]
+    """Configure download behavior.
+
+    When set to remote_only, users can view downloads but cannot save them. Applies
+    only when version == "v2".
+    """
 
     dp: bool
-    """Set to false to enable printing."""
+    """Set to false to enable printing. Only applies when `version == "v1"`."""
 
     du: bool
-    """Set to false to enable uploading."""
+    """Set to false to enable uploading. Only applies when `version == "v1"`."""
+
+    keyboard: Literal["enabled", "disabled"]
+    """Configure keyboard usage behavior.
+
+    If this field is absent, keyboard usage remains enabled. Applies only when
+    version == "v2".
+    """
+
+    paste: Literal["enabled", "disabled", "remote_only"]
+    """Configure paste behavior.
+
+    If set to remote_only, users cannot paste content from the local clipboard into
+    isolated pages. If this field is absent, pasting remains enabled. Applies only
+    when version == "v2".
+    """
+
+    printing: Literal["enabled", "disabled"]
+    """Configure print behavior.
+
+    Default, Printing is enabled. Applies only when version == "v2".
+    """
+
+    upload: Literal["enabled", "disabled"]
+    """Configure upload behavior.
+
+    If this field is absent, uploading remains enabled. Applies only when version ==
+    "v2".
+    """
+
+    version: Literal["v1", "v2"]
+    """Indicate which version of the browser isolation controls should apply."""
+
+
+class BlockPage(TypedDict, total=False):
+    """Configure custom block page settings.
+
+    If missing or null, use the account settings. Settable only for `http` rules with the action set to `block`.
+    """
+
+    target_uri: Required[str]
+    """Specify the URI to which the user is redirected."""
+
+    include_context: bool
+    """Specify whether to pass the context information as query parameters."""
 
 
 class CheckSession(TypedDict, total=False):
+    """Configure session check behavior.
+
+    Settable only for `l4` and `http` rules with the action set to `allow`.
+    """
+
     duration: str
-    """Configure how fresh the session needs to be to be considered valid."""
+    """Sets the required session freshness threshold.
+
+    The API returns a normalized version of this value.
+    """
 
     enforce: bool
-    """Set to true to enable session enforcement."""
+    """Enable session enforcement."""
 
 
 class DNSResolvers(TypedDict, total=False):
+    """Configure custom resolvers to route queries that match the resolver policy.
+
+    Unused with 'resolve_dns_through_cloudflare' or 'resolve_dns_internally' settings. DNS queries get routed to the address closest to their origin. Only valid when a rule's action set to 'resolve'. Settable only for `dns_resolver` rules.
+    """
+
     ipv4: Iterable[DNSResolverSettingsV4Param]
 
     ipv6: Iterable[DNSResolverSettingsV6Param]
 
 
 class Egress(TypedDict, total=False):
+    """Configure how Gateway Proxy traffic egresses.
+
+    You can enable this setting for rules with Egress actions and filters, or omit it to indicate local egress via WARP IPs. Settable only for `egress` rules.
+    """
+
     ipv4: str
-    """The IPv4 address to be used for egress."""
+    """Specify the IPv4 address to use for egress."""
 
     ipv4_fallback: str
-    """
-    The fallback IPv4 address to be used for egress in the event of an error
-    egressing with the primary IPv4. Can be '0.0.0.0' to indicate local egress via
-    WARP IPs.
+    """Specify the fallback IPv4 address to use for egress when the primary IPv4 fails.
+
+    Set '0.0.0.0' to indicate local egress via WARP IPs.
     """
 
     ipv6: str
-    """The IPv6 range to be used for egress."""
+    """Specify the IPv6 range to use for egress."""
+
+
+class ForensicCopy(TypedDict, total=False):
+    """
+    Configure whether a copy of the HTTP request will be sent to storage when the rule matches.
+    """
+
+    enabled: bool
+    """Enable sending the copy to storage."""
 
 
 class L4override(TypedDict, total=False):
+    """Send matching traffic to the supplied destination IP address and port.
+
+    Settable only for `l4` rules with the action set to `l4_override`.
+    """
+
     ip: str
-    """IPv4 or IPv6 address."""
+    """Defines the IPv4 or IPv6 address."""
 
     port: int
-    """A port number to use for TCP/UDP overrides."""
+    """Defines a port number to use for TCP/UDP overrides."""
 
 
 class NotificationSettings(TypedDict, total=False):
+    """Configure a notification to display on the user's device when this rule matched.
+
+    Settable for all types of rules with the action set to `block`.
+    """
+
     enabled: bool
-    """Set notification on"""
+    """Enable notification."""
+
+    include_context: bool
+    """Indicates whether to pass the context information as query parameters."""
 
     msg: str
     """Customize the message shown in the notification."""
 
     support_url: str
-    """Optional URL to direct users to additional information.
+    """Defines an optional URL to direct users to additional information.
 
-    If not set, the notification will open a block page.
+    If unset, the notification opens a block page.
     """
 
 
 class PayloadLog(TypedDict, total=False):
+    """Configure DLP payload logging. Settable only for `http` rules."""
+
     enabled: bool
-    """Set to true to enable DLP payload logging for this rule."""
+    """Enable DLP payload logging for this rule."""
+
+
+class Quarantine(TypedDict, total=False):
+    """Configure settings that apply to quarantine rules.
+
+    Settable only for `http` rules.
+    """
+
+    file_types: List[
+        Literal["exe", "pdf", "doc", "docm", "docx", "rtf", "ppt", "pptx", "xls", "xlsm", "xlsx", "zip", "rar"]
+    ]
+    """Specify the types of files to sandbox."""
+
+
+class Redirect(TypedDict, total=False):
+    """Apply settings to redirect rules.
+
+    Settable only for `http` rules with the action set to `redirect`.
+    """
+
+    target_uri: Required[str]
+    """Specify the URI to which the user is redirected."""
+
+    include_context: bool
+    """Specify whether to pass the context information as query parameters."""
+
+    preserve_path_and_query: bool
+    """
+    Specify whether to append the path and query parameters from the original
+    request to target_uri.
+    """
+
+
+class ResolveDNSInternally(TypedDict, total=False):
+    """
+    Configure to forward the query to the internal DNS service, passing the specified 'view_id' as input. Not used when 'dns_resolvers' is specified or 'resolve_dns_through_cloudflare' is set. Only valid when a rule's action set to 'resolve'. Settable only for `dns_resolver` rules.
+    """
+
+    fallback: Literal["none", "public_dns"]
+    """
+    Specify the fallback behavior to apply when the internal DNS response code
+    differs from 'NOERROR' or when the response data contains only CNAME records for
+    'A' or 'AAAA' queries.
+    """
+
+    view_id: str
+    """Specify the internal DNS view identifier to pass to the internal DNS service."""
 
 
 class UntrustedCERT(TypedDict, total=False):
+    """
+    Configure behavior when an upstream certificate is invalid or an SSL error occurs. Settable only for `http` rules with the action set to `allow`.
+    """
+
     action: Literal["pass_through", "block", "error"]
-    """The action performed when an untrusted certificate is seen.
+    """Defines the action performed when an untrusted certificate seen.
 
-    The default action is an error with HTTP code 526.
+    The default action an error with HTTP code 526.
     """
 
 
 class RuleSettingParam(TypedDict, total=False):
-    add_headers: object
-    """Add custom headers to allowed requests, in the form of key-value pairs.
+    """Defines settings for this rule.
+
+    Settings apply only to specific rule types and must use compatible selectors. If Terraform detects drift, confirm the setting supports your rule type and check whether the API modifies the value. Use API-returned values in your configuration to prevent drift.
+    """
+
+    add_headers: Optional[Dict[str, SequenceNotStr[str]]]
+    """Add custom headers to allowed requests as key-value pairs.
+
+    Use header names as keys that map to arrays of header values. Settable only for
+    `http` rules with the action set to `allow`.
+    """
+
+    allow_child_bypass: Optional[bool]
+    """Set to enable MSP children to bypass this rule.
+
+    Only parent MSP accounts can set this. this rule. Settable for all types of
+    rules.
+    """
+
+    audit_ssh: Optional[AuditSSH]
+    """Define the settings for the Audit SSH action.
 
-    Keys are header names, pointing to an array with its header value(s).
+    Settable only for `l4` rules with `audit_ssh` action.
     """
 
-    allow_child_bypass: bool
-    """Set by parent MSP accounts to enable their children to bypass this rule."""
+    biso_admin_controls: BISOAdminControls
+    """Configure browser isolation behavior.
 
-    audit_ssh: AuditSSH
-    """Settings for the Audit SSH action."""
+    Settable only for `http` rules with the action set to `isolate`.
+    """
+
+    block_page: Optional[BlockPage]
+    """Configure custom block page settings.
 
-    biso_admin_controls: BisoAdminControls
-    """Configure how browser isolation behaves."""
+    If missing or null, use the account settings. Settable only for `http` rules
+    with the action set to `block`.
+    """
 
     block_page_enabled: bool
-    """Enable the custom block page."""
+    """Enable the custom block page.
+
+    Settable only for `dns` rules with action `block`.
+    """
+
+    block_reason: Optional[str]
+    """Explain why the rule blocks the request.
 
-    block_reason: str
+    The custom block page shows this text (if enabled). Settable only for `dns`,
+    `l4`, and `http` rules when the action set to `block`.
     """
-    The text describing why this block occurred, displayed on the custom block page
-    (if enabled).
+
+    bypass_parent_rule: Optional[bool]
+    """Set to enable MSP accounts to bypass their parent's rules.
+
+    Only MSP child accounts can set this. Settable for all types of rules.
     """
 
-    bypass_parent_rule: bool
-    """Set by children MSP accounts to bypass their parent's rules."""
+    check_session: Optional[CheckSession]
+    """Configure session check behavior.
 
-    check_session: CheckSession
-    """Configure how session check behaves."""
+    Settable only for `l4` and `http` rules with the action set to `allow`.
+    """
 
-    dns_resolvers: DNSResolvers
-    """Add your own custom resolvers to route queries that match the resolver policy.
+    dns_resolvers: Optional[DNSResolvers]
+    """Configure custom resolvers to route queries that match the resolver policy.
 
-    Cannot be used when resolve_dns_through_cloudflare is set. DNS queries will
-    route to the address closest to their origin. Only valid when a rule's action is
-    set to 'resolve'.
+    Unused with 'resolve_dns_through_cloudflare' or 'resolve_dns_internally'
+    settings. DNS queries get routed to the address closest to their origin. Only
+    valid when a rule's action set to 'resolve'. Settable only for `dns_resolver`
+    rules.
     """
 
-    egress: Egress
+    egress: Optional[Egress]
     """Configure how Gateway Proxy traffic egresses.
 
     You can enable this setting for rules with Egress actions and filters, or omit
-    it to indicate local egress via WARP IPs.
+    it to indicate local egress via WARP IPs. Settable only for `egress` rules.
+    """
+
+    forensic_copy: Optional[ForensicCopy]
+    """
+    Configure whether a copy of the HTTP request will be sent to storage when the
+    rule matches.
     """
 
     ignore_cname_category_matches: bool
-    """Set to true, to ignore the category matches at CNAME domains in a response.
+    """Ignore category matches at CNAME domains in a response.
 
-    If unchecked, the categories in this rule will be checked against all the CNAME
-    domain categories in a response.
+    When off, evaluate categories in this rule against all CNAME domain categories
+    in the response. Settable only for `dns` and `dns_resolver` rules.
     """
 
     insecure_disable_dnssec_validation: bool
-    """INSECURE - disable DNSSEC validation (for Allow actions)."""
+    """Specify whether to disable DNSSEC validation (for Allow actions) [INSECURE].
+
+    Settable only for `dns` rules.
+    """
 
     ip_categories: bool
-    """Set to true to enable IPs in DNS resolver category blocks.
+    """Enable IPs in DNS resolver category blocks.
 
-    By default categories only block based on domain names.
+    The system blocks only domain name categories unless you enable this setting.
+    Settable only for `dns` and `dns_resolver` rules.
     """
 
     ip_indicator_feeds: bool
-    """Set to true to include IPs in DNS resolver indicator feed blocks.
+    """Indicates whether to include IPs in DNS resolver indicator feed blocks.
 
-    By default indicator feeds only block based on domain names.
+    Default, indicator feeds block only domain names. Settable only for `dns` and
+    `dns_resolver` rules.
     """
 
-    l4override: L4override
-    """Send matching traffic to the supplied destination IP address and port."""
+    l4override: Optional[L4override]
+    """Send matching traffic to the supplied destination IP address and port.
 
-    notification_settings: NotificationSettings
+    Settable only for `l4` rules with the action set to `l4_override`.
     """
-    Configure a notification to display on the user's device when this rule is
-    matched.
+
+    notification_settings: Optional[NotificationSettings]
+    """Configure a notification to display on the user's device when this rule matched.
+
+    Settable for all types of rules with the action set to `block`.
     """
 
     override_host: str
-    """Override matching DNS queries with a hostname."""
+    """Defines a hostname for override, for the matching DNS queries.
 
-    override_ips: List[str]
-    """Override matching DNS queries with an IP or set of IPs."""
+    Settable only for `dns` rules with the action set to `override`.
+    """
+
+    override_ips: Optional[SequenceNotStr[str]]
+    """Defines a an IP or set of IPs for overriding matched DNS queries.
+
+    Settable only for `dns` rules with the action set to `override`.
+    """
+
+    payload_log: Optional[PayloadLog]
+    """Configure DLP payload logging. Settable only for `http` rules."""
+
+    quarantine: Optional[Quarantine]
+    """Configure settings that apply to quarantine rules.
+
+    Settable only for `http` rules.
+    """
 
-    payload_log: PayloadLog
-    """Configure DLP payload logging."""
+    redirect: Optional[Redirect]
+    """Apply settings to redirect rules.
 
-    resolve_dns_through_cloudflare: bool
+    Settable only for `http` rules with the action set to `redirect`.
+    """
+
+    resolve_dns_internally: Optional[ResolveDNSInternally]
+    """
+    Configure to forward the query to the internal DNS service, passing the
+    specified 'view_id' as input. Not used when 'dns_resolvers' is specified or
+    'resolve_dns_through_cloudflare' is set. Only valid when a rule's action set to
+    'resolve'. Settable only for `dns_resolver` rules.
+    """
+
+    resolve_dns_through_cloudflare: Optional[bool]
     """
     Enable to send queries that match the policy to Cloudflare's default 1.1.1.1 DNS
-    resolver. Cannot be set when dns_resolvers are specified. Only valid when a
-    rule's action is set to 'resolve'.
+    resolver. Cannot set when 'dns_resolvers' specified or 'resolve_dns_internally'
+    is set. Only valid when a rule's action set to 'resolve'. Settable only for
+    `dns_resolver` rules.
     """
 
-    untrusted_cert: UntrustedCERT
-    """Configure behavior when an upstream cert is invalid or an SSL error occurs."""
+    untrusted_cert: Optional[UntrustedCERT]
+    """
+    Configure behavior when an upstream certificate is invalid or an SSL error
+    occurs. Settable only for `http` rules with the action set to `allow`.
+    """
diff --git a/src/cloudflare/types/zero_trust/gateway/rule_update_params.py b/src/cloudflare/types/zero_trust/gateway/rule_update_params.py
index eb1be8a66bf..cb1c5873581 100644
--- a/src/cloudflare/types/zero_trust/gateway/rule_update_params.py
+++ b/src/cloudflare/types/zero_trust/gateway/rule_update_params.py
@@ -2,14 +2,16 @@
 
 from __future__ import annotations
 
-from typing import List
-from typing_extensions import Literal, Required, TypedDict
+from typing import List, Union, Optional
+from datetime import datetime
+from typing_extensions import Literal, Required, Annotated, TypedDict
 
+from ...._utils import PropertyInfo
 from .gateway_filter import GatewayFilter
 from .schedule_param import ScheduleParam
 from .rule_setting_param import RuleSettingParam
 
-__all__ = ["RuleUpdateParams"]
+__all__ = ["RuleUpdateParams", "Expiration"]
 
 
 class RuleUpdateParams(TypedDict, total=False):
@@ -30,51 +32,104 @@ class RuleUpdateParams(TypedDict, total=False):
             "override",
             "l4_override",
             "egress",
-            "audit_ssh",
             "resolve",
+            "quarantine",
+            "redirect",
         ]
     ]
     """
-    The action to preform when the associated traffic, identity, and device posture
-    expressions are either absent or evaluate to `true`.
+    Specify the action to perform when the associated traffic, identity, and device
+    posture expressions either absent or evaluate to `true`.
     """
 
     name: Required[str]
-    """The name of the rule."""
+    """Specify the rule name."""
 
     description: str
-    """The description of the rule."""
+    """Specify the rule description."""
 
     device_posture: str
-    """The wirefilter expression used for device posture check matching."""
+    """Specify the wirefilter expression used for device posture check.
+
+    The API automatically formats and sanitizes expressions before storing them. To
+    prevent Terraform state drift, use the formatted expression returned in the API
+    response.
+    """
 
     enabled: bool
-    """True if the rule is enabled."""
+    """Specify whether the rule is enabled."""
+
+    expiration: Optional[Expiration]
+    """Defines the expiration time stamp and default duration of a DNS policy.
+
+    Takes precedence over the policy's `schedule` configuration, if any. This does
+    not apply to HTTP or network policies. Settable only for `dns` rules.
+    """
 
     filters: List[GatewayFilter]
     """
-    The protocol or layer to evaluate the traffic, identity, and device posture
-    expressions.
+    Specify the protocol or layer to evaluate the traffic, identity, and device
+    posture expressions. Can only contain a single value.
     """
 
     identity: str
-    """The wirefilter expression used for identity matching."""
+    """Specify the wirefilter expression used for identity matching.
+
+    The API automatically formats and sanitizes expressions before storing them. To
+    prevent Terraform state drift, use the formatted expression returned in the API
+    response.
+    """
 
     precedence: int
-    """Precedence sets the order of your rules.
+    """Set the order of your rules.
 
-    Lower values indicate higher precedence. At each processing phase, applicable
-    rules are evaluated in ascending order of this value.
+    Lower values indicate higher precedence. At each processing phase, evaluate
+    applicable rules in ascending order of this value. Refer to
+    [Order of enforcement](http://developers.cloudflare.com/learning-paths/secure-internet-traffic/understand-policies/order-of-enforcement/#manage-precedence-with-terraform)
+    to manage precedence via Terraform.
     """
 
     rule_settings: RuleSettingParam
-    """Additional settings that modify the rule's action."""
+    """Defines settings for this rule.
+
+    Settings apply only to specific rule types and must use compatible selectors. If
+    Terraform detects drift, confirm the setting supports your rule type and check
+    whether the API modifies the value. Use API-returned values in your
+    configuration to prevent drift.
+    """
 
-    schedule: ScheduleParam
-    """The schedule for activating DNS policies.
+    schedule: Optional[ScheduleParam]
+    """Defines the schedule for activating DNS policies.
 
-    This does not apply to HTTP or network policies.
+    Settable only for `dns` and `dns_resolver` rules.
     """
 
     traffic: str
-    """The wirefilter expression used for traffic matching."""
+    """Specify the wirefilter expression used for traffic matching.
+
+    The API automatically formats and sanitizes expressions before storing them. To
+    prevent Terraform state drift, use the formatted expression returned in the API
+    response.
+    """
+
+
+class Expiration(TypedDict, total=False):
+    """Defines the expiration time stamp and default duration of a DNS policy.
+
+    Takes precedence over the policy's `schedule` configuration, if any. This  does not apply to HTTP or network policies. Settable only for `dns` rules.
+    """
+
+    expires_at: Required[Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]]
+    """Show the timestamp when the policy expires and stops applying.
+
+    The value must follow RFC 3339 and include a UTC offset. The system accepts
+    non-zero offsets but converts them to the equivalent UTC+00:00 value and returns
+    timestamps with a trailing Z. Expiration policies ignore client timezones and
+    expire globally at the specified expires_at time.
+    """
+
+    duration: int
+    """Defines the default duration a policy active in minutes.
+
+    Must set in order to use the `reset_expiration` endpoint on this rule.
+    """
diff --git a/src/cloudflare/types/zero_trust/gateway/schedule.py b/src/cloudflare/types/zero_trust/gateway/schedule.py
index 2554002fa1b..445050f8ac3 100644
--- a/src/cloudflare/types/zero_trust/gateway/schedule.py
+++ b/src/cloudflare/types/zero_trust/gateway/schedule.py
@@ -8,63 +8,74 @@
 
 
 class Schedule(BaseModel):
+    """Defines the schedule for activating DNS policies.
+
+    Settable only for `dns` and `dns_resolver` rules.
+    """
+
     fri: Optional[str] = None
     """
-    The time intervals when the rule will be active on Fridays, in increasing order
-    from 00:00-24:00. If this parameter is omitted, the rule will be deactivated on
-    Fridays.
+    Specify the time intervals when the rule is active on Fridays, in the increasing
+    order from 00:00-24:00. If this parameter omitted, the rule is deactivated on
+    Fridays. API returns a formatted version of this string, which may cause
+    Terraform drift if a unformatted value is used.
     """
 
     mon: Optional[str] = None
     """
-    The time intervals when the rule will be active on Mondays, in increasing order
-    from 00:00-24:00. If this parameter is omitted, the rule will be deactivated on
-    Mondays.
+    Specify the time intervals when the rule is active on Mondays, in the increasing
+    order from 00:00-24:00(capped at maximum of 6 time splits). If this parameter
+    omitted, the rule is deactivated on Mondays. API returns a formatted version of
+    this string, which may cause Terraform drift if a unformatted value is used.
     """
 
     sat: Optional[str] = None
     """
-    The time intervals when the rule will be active on Saturdays, in increasing
-    order from 00:00-24:00. If this parameter is omitted, the rule will be
-    deactivated on Saturdays.
+    Specify the time intervals when the rule is active on Saturdays, in the
+    increasing order from 00:00-24:00. If this parameter omitted, the rule is
+    deactivated on Saturdays. API returns a formatted version of this string, which
+    may cause Terraform drift if a unformatted value is used.
     """
 
     sun: Optional[str] = None
     """
-    The time intervals when the rule will be active on Sundays, in increasing order
-    from 00:00-24:00. If this parameter is omitted, the rule will be deactivated on
-    Sundays.
+    Specify the time intervals when the rule is active on Sundays, in the increasing
+    order from 00:00-24:00. If this parameter omitted, the rule is deactivated on
+    Sundays. API returns a formatted version of this string, which may cause
+    Terraform drift if a unformatted value is used.
     """
 
     thu: Optional[str] = None
     """
-    The time intervals when the rule will be active on Thursdays, in increasing
-    order from 00:00-24:00. If this parameter is omitted, the rule will be
-    deactivated on Thursdays.
+    Specify the time intervals when the rule is active on Thursdays, in the
+    increasing order from 00:00-24:00. If this parameter omitted, the rule is
+    deactivated on Thursdays. API returns a formatted version of this string, which
+    may cause Terraform drift if a unformatted value is used.
     """
 
     time_zone: Optional[str] = None
-    """The time zone the rule will be evaluated against.
+    """Specify the time zone for rule evaluation.
 
-    If a
+    When a
     [valid time zone city name](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List)
-    is provided, Gateway will always use the current time at that time zone. If this
-    parameter is omitted, then Gateway will use the time zone inferred from the
-    user's source IP to evaluate the rule. If Gateway cannot determine the time zone
-    from the IP, we will fall back to the time zone of the user's connected data
-    center.
+    is provided, Gateway always uses the current time for that time zone. When this
+    parameter is omitted, Gateway uses the time zone determined from the user's IP
+    address. Colo time zone is used when the user's IP address does not resolve to a
+    location.
     """
 
     tue: Optional[str] = None
     """
-    The time intervals when the rule will be active on Tuesdays, in increasing order
-    from 00:00-24:00. If this parameter is omitted, the rule will be deactivated on
-    Tuesdays.
+    Specify the time intervals when the rule is active on Tuesdays, in the
+    increasing order from 00:00-24:00. If this parameter omitted, the rule is
+    deactivated on Tuesdays. API returns a formatted version of this string, which
+    may cause Terraform drift if a unformatted value is used.
     """
 
     wed: Optional[str] = None
     """
-    The time intervals when the rule will be active on Wednesdays, in increasing
-    order from 00:00-24:00. If this parameter is omitted, the rule will be
-    deactivated on Wednesdays.
+    Specify the time intervals when the rule is active on Wednesdays, in the
+    increasing order from 00:00-24:00. If this parameter omitted, the rule is
+    deactivated on Wednesdays. API returns a formatted version of this string, which
+    may cause Terraform drift if a unformatted value is used.
     """
diff --git a/src/cloudflare/types/zero_trust/gateway/schedule_param.py b/src/cloudflare/types/zero_trust/gateway/schedule_param.py
index 3fe65febb4d..82ed393e0fe 100644
--- a/src/cloudflare/types/zero_trust/gateway/schedule_param.py
+++ b/src/cloudflare/types/zero_trust/gateway/schedule_param.py
@@ -8,63 +8,74 @@
 
 
 class ScheduleParam(TypedDict, total=False):
+    """Defines the schedule for activating DNS policies.
+
+    Settable only for `dns` and `dns_resolver` rules.
+    """
+
     fri: str
     """
-    The time intervals when the rule will be active on Fridays, in increasing order
-    from 00:00-24:00. If this parameter is omitted, the rule will be deactivated on
-    Fridays.
+    Specify the time intervals when the rule is active on Fridays, in the increasing
+    order from 00:00-24:00. If this parameter omitted, the rule is deactivated on
+    Fridays. API returns a formatted version of this string, which may cause
+    Terraform drift if a unformatted value is used.
     """
 
     mon: str
     """
-    The time intervals when the rule will be active on Mondays, in increasing order
-    from 00:00-24:00. If this parameter is omitted, the rule will be deactivated on
-    Mondays.
+    Specify the time intervals when the rule is active on Mondays, in the increasing
+    order from 00:00-24:00(capped at maximum of 6 time splits). If this parameter
+    omitted, the rule is deactivated on Mondays. API returns a formatted version of
+    this string, which may cause Terraform drift if a unformatted value is used.
     """
 
     sat: str
     """
-    The time intervals when the rule will be active on Saturdays, in increasing
-    order from 00:00-24:00. If this parameter is omitted, the rule will be
-    deactivated on Saturdays.
+    Specify the time intervals when the rule is active on Saturdays, in the
+    increasing order from 00:00-24:00. If this parameter omitted, the rule is
+    deactivated on Saturdays. API returns a formatted version of this string, which
+    may cause Terraform drift if a unformatted value is used.
     """
 
     sun: str
     """
-    The time intervals when the rule will be active on Sundays, in increasing order
-    from 00:00-24:00. If this parameter is omitted, the rule will be deactivated on
-    Sundays.
+    Specify the time intervals when the rule is active on Sundays, in the increasing
+    order from 00:00-24:00. If this parameter omitted, the rule is deactivated on
+    Sundays. API returns a formatted version of this string, which may cause
+    Terraform drift if a unformatted value is used.
     """
 
     thu: str
     """
-    The time intervals when the rule will be active on Thursdays, in increasing
-    order from 00:00-24:00. If this parameter is omitted, the rule will be
-    deactivated on Thursdays.
+    Specify the time intervals when the rule is active on Thursdays, in the
+    increasing order from 00:00-24:00. If this parameter omitted, the rule is
+    deactivated on Thursdays. API returns a formatted version of this string, which
+    may cause Terraform drift if a unformatted value is used.
     """
 
     time_zone: str
-    """The time zone the rule will be evaluated against.
+    """Specify the time zone for rule evaluation.
 
-    If a
+    When a
     [valid time zone city name](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List)
-    is provided, Gateway will always use the current time at that time zone. If this
-    parameter is omitted, then Gateway will use the time zone inferred from the
-    user's source IP to evaluate the rule. If Gateway cannot determine the time zone
-    from the IP, we will fall back to the time zone of the user's connected data
-    center.
+    is provided, Gateway always uses the current time for that time zone. When this
+    parameter is omitted, Gateway uses the time zone determined from the user's IP
+    address. Colo time zone is used when the user's IP address does not resolve to a
+    location.
     """
 
     tue: str
     """
-    The time intervals when the rule will be active on Tuesdays, in increasing order
-    from 00:00-24:00. If this parameter is omitted, the rule will be deactivated on
-    Tuesdays.
+    Specify the time intervals when the rule is active on Tuesdays, in the
+    increasing order from 00:00-24:00. If this parameter omitted, the rule is
+    deactivated on Tuesdays. API returns a formatted version of this string, which
+    may cause Terraform drift if a unformatted value is used.
     """
 
     wed: str
     """
-    The time intervals when the rule will be active on Wednesdays, in increasing
-    order from 00:00-24:00. If this parameter is omitted, the rule will be
-    deactivated on Wednesdays.
+    Specify the time intervals when the rule is active on Wednesdays, in the
+    increasing order from 00:00-24:00. If this parameter omitted, the rule is
+    deactivated on Wednesdays. API returns a formatted version of this string, which
+    may cause Terraform drift if a unformatted value is used.
     """
diff --git a/src/cloudflare/types/zero_trust/gateway/tls_settings.py b/src/cloudflare/types/zero_trust/gateway/tls_settings.py
index e0a3fae4b5d..24c690fd85e 100644
--- a/src/cloudflare/types/zero_trust/gateway/tls_settings.py
+++ b/src/cloudflare/types/zero_trust/gateway/tls_settings.py
@@ -8,5 +8,7 @@
 
 
 class TLSSettings(BaseModel):
+    """Specify whether to inspect encrypted HTTP traffic."""
+
     enabled: Optional[bool] = None
-    """Enable inspecting encrypted HTTP traffic."""
+    """Specify whether to inspect encrypted HTTP traffic."""
diff --git a/src/cloudflare/types/zero_trust/gateway/tls_settings_param.py b/src/cloudflare/types/zero_trust/gateway/tls_settings_param.py
index ed0a04116aa..e63a018ada2 100644
--- a/src/cloudflare/types/zero_trust/gateway/tls_settings_param.py
+++ b/src/cloudflare/types/zero_trust/gateway/tls_settings_param.py
@@ -8,5 +8,7 @@
 
 
 class TLSSettingsParam(TypedDict, total=False):
+    """Specify whether to inspect encrypted HTTP traffic."""
+
     enabled: bool
-    """Enable inspecting encrypted HTTP traffic."""
+    """Specify whether to inspect encrypted HTTP traffic."""
diff --git a/src/cloudflare/types/zero_trust/gateway_create_response.py b/src/cloudflare/types/zero_trust/gateway_create_response.py
index 9f0ec4a0393..897c66d4d41 100644
--- a/src/cloudflare/types/zero_trust/gateway_create_response.py
+++ b/src/cloudflare/types/zero_trust/gateway_create_response.py
@@ -9,10 +9,10 @@
 
 class GatewayCreateResponse(BaseModel):
     id: Optional[str] = None
-    """Cloudflare account ID."""
+    """Specify the Cloudflare account ID."""
 
     gateway_tag: Optional[str] = None
-    """Gateway internal ID."""
+    """Specify the gateway internal ID."""
 
     provider_name: Optional[str] = None
-    """The name of the provider. Usually Cloudflare."""
+    """Specify the provider name (usually Cloudflare)."""
diff --git a/src/cloudflare/types/zero_trust/gateway_list_response.py b/src/cloudflare/types/zero_trust/gateway_list_response.py
index 94499db62b0..a3aa4abe575 100644
--- a/src/cloudflare/types/zero_trust/gateway_list_response.py
+++ b/src/cloudflare/types/zero_trust/gateway_list_response.py
@@ -9,10 +9,10 @@
 
 class GatewayListResponse(BaseModel):
     id: Optional[str] = None
-    """Cloudflare account ID."""
+    """Specify the Cloudflare account ID."""
 
     gateway_tag: Optional[str] = None
-    """Gateway internal ID."""
+    """Specify the gateway internal ID."""
 
     provider_name: Optional[str] = None
-    """The name of the provider. Usually Cloudflare."""
+    """Specify the provider name (usually Cloudflare)."""
diff --git a/src/cloudflare/types/zero_trust/github_organization_rule.py b/src/cloudflare/types/zero_trust/github_organization_rule.py
deleted file mode 100644
index b9b297ae08b..00000000000
--- a/src/cloudflare/types/zero_trust/github_organization_rule.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-from pydantic import Field as FieldInfo
-
-from ..._models import BaseModel
-
-__all__ = ["GitHubOrganizationRule", "GitHubOrganization"]
-
-
-class GitHubOrganization(BaseModel):
-    connection_id: str
-    """The ID of your Github identity provider."""
-
-    name: str
-    """The name of the organization."""
-
-
-class GitHubOrganizationRule(BaseModel):
-    github_organization: GitHubOrganization = FieldInfo(alias="github-organization")
diff --git a/src/cloudflare/types/zero_trust/github_organization_rule_param.py b/src/cloudflare/types/zero_trust/github_organization_rule_param.py
deleted file mode 100644
index 094533d5156..00000000000
--- a/src/cloudflare/types/zero_trust/github_organization_rule_param.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, Annotated, TypedDict
-
-from ..._utils import PropertyInfo
-
-__all__ = ["GitHubOrganizationRuleParam", "GitHubOrganization"]
-
-
-class GitHubOrganization(TypedDict, total=False):
-    connection_id: Required[str]
-    """The ID of your Github identity provider."""
-
-    name: Required[str]
-    """The name of the organization."""
-
-
-class GitHubOrganizationRuleParam(TypedDict, total=False):
-    github_organization: Required[Annotated[GitHubOrganization, PropertyInfo(alias="github-organization")]]
diff --git a/src/cloudflare/types/zero_trust/gsuite_group_rule.py b/src/cloudflare/types/zero_trust/gsuite_group_rule.py
deleted file mode 100644
index cdc3df15134..00000000000
--- a/src/cloudflare/types/zero_trust/gsuite_group_rule.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-from ..._models import BaseModel
-
-__all__ = ["GSuiteGroupRule", "GSuite"]
-
-
-class GSuite(BaseModel):
-    connection_id: str
-    """The ID of your Google Workspace identity provider."""
-
-    email: str
-    """The email of the Google Workspace group."""
-
-
-class GSuiteGroupRule(BaseModel):
-    gsuite: GSuite
diff --git a/src/cloudflare/types/zero_trust/identity_provider.py b/src/cloudflare/types/zero_trust/identity_provider.py
index 6820dd7db58..199553c6c25 100644
--- a/src/cloudflare/types/zero_trust/identity_provider.py
+++ b/src/cloudflare/types/zero_trust/identity_provider.py
@@ -1,12 +1,13 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Union, Optional
+from typing_extensions import TypeAlias
 
 from .azure_ad import AzureAD
 from ..._models import BaseModel
-from .scim_config import SCIMConfig
 from .generic_oauth_config import GenericOAuthConfig
 from .identity_provider_type import IdentityProviderType
+from .identity_provider_scim_config import IdentityProviderSCIMConfig
 
 __all__ = [
     "IdentityProvider",
@@ -32,10 +33,16 @@
     "AccessSAMLConfigHeaderAttribute",
     "AccessYandex",
     "AccessOnetimepin",
+    "AccessOnetimepinConfig",
 ]
 
 
 class AccessCentrifyConfig(BaseModel):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     centrify_account: Optional[str] = None
     """Your centrify account url"""
 
@@ -74,9 +81,9 @@ class AccessCentrify(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -102,9 +109,9 @@ class AccessFacebook(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -130,9 +137,9 @@ class AccessGitHub(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -140,6 +147,11 @@ class AccessGitHub(BaseModel):
 
 
 class AccessGoogleConfig(BaseModel):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     claims: Optional[List[str]] = None
     """Custom claims"""
 
@@ -172,9 +184,9 @@ class AccessGoogle(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -182,6 +194,11 @@ class AccessGoogle(BaseModel):
 
 
 class AccessGoogleAppsConfig(BaseModel):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     apps_domain: Optional[str] = None
     """Your companies TLD"""
 
@@ -217,9 +234,9 @@ class AccessGoogleApps(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -245,9 +262,9 @@ class AccessLinkedin(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -255,6 +272,11 @@ class AccessLinkedin(BaseModel):
 
 
 class AccessOIDCConfig(BaseModel):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     auth_url: Optional[str] = None
     """The authorization_endpoint URL of your IdP"""
 
@@ -273,6 +295,9 @@ class AccessOIDCConfig(BaseModel):
     email_claim_name: Optional[str] = None
     """The claim name for email in the id_token response."""
 
+    pkce_enabled: Optional[bool] = None
+    """Enable Proof Key for Code Exchange (PKCE)"""
+
     scopes: Optional[List[str]] = None
     """OAuth scopes"""
 
@@ -299,9 +324,9 @@ class AccessOIDC(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -309,6 +334,11 @@ class AccessOIDC(BaseModel):
 
 
 class AccessOktaConfig(BaseModel):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     authorization_server_id: Optional[str] = None
     """Your okta authorization server id"""
 
@@ -347,9 +377,9 @@ class AccessOkta(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -357,6 +387,11 @@ class AccessOkta(BaseModel):
 
 
 class AccessOneloginConfig(BaseModel):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     claims: Optional[List[str]] = None
     """Custom claims"""
 
@@ -392,9 +427,9 @@ class AccessOnelogin(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -402,6 +437,11 @@ class AccessOnelogin(BaseModel):
 
 
 class AccessPingoneConfig(BaseModel):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     claims: Optional[List[str]] = None
     """Custom claims"""
 
@@ -437,9 +477,9 @@ class AccessPingone(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -455,6 +495,11 @@ class AccessSAMLConfigHeaderAttribute(BaseModel):
 
 
 class AccessSAMLConfig(BaseModel):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     attributes: Optional[List[str]] = None
     """
     A list of SAML attribute names that will be added to your signed JWT token and
@@ -505,9 +550,9 @@ class AccessSAML(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -533,17 +578,26 @@ class AccessYandex(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
     """
 
 
+class AccessOnetimepinConfig(BaseModel):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    redirect_url: Optional[str] = None
+
+
 class AccessOnetimepin(BaseModel):
-    config: object
+    config: AccessOnetimepinConfig
     """The configuration parameters for the identity provider.
 
     To view the required parameters for a specific provider, refer to our
@@ -561,16 +615,16 @@ class AccessOnetimepin(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
     """
 
 
-IdentityProvider = Union[
+IdentityProvider: TypeAlias = Union[
     AzureAD,
     AccessCentrify,
     AccessFacebook,
diff --git a/src/cloudflare/types/zero_trust/identity_provider_create_params.py b/src/cloudflare/types/zero_trust/identity_provider_create_params.py
index e380a34e05c..03449819bf5 100644
--- a/src/cloudflare/types/zero_trust/identity_provider_create_params.py
+++ b/src/cloudflare/types/zero_trust/identity_provider_create_params.py
@@ -2,12 +2,13 @@
 
 from __future__ import annotations
 
-from typing import List, Union, Iterable
-from typing_extensions import Literal, Required, TypedDict
+from typing import Union, Iterable
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
-from .scim_config_param import SCIMConfigParam
+from ..._types import SequenceNotStr
 from .identity_provider_type import IdentityProviderType
 from .generic_oauth_config_param import GenericOAuthConfigParam
+from .identity_provider_scim_config_param import IdentityProviderSCIMConfigParam
 
 __all__ = [
     "IdentityProviderCreateParams",
@@ -35,6 +36,7 @@
     "AccessSAMLConfigHeaderAttribute",
     "AccessYandex",
     "AccessOnetimepin",
+    "AccessOnetimepinConfig",
 ]
 
 
@@ -62,10 +64,7 @@ class AzureAD(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -73,7 +72,12 @@ class AzureAD(TypedDict, total=False):
 
 
 class AzureADConfig(TypedDict, total=False):
-    claims: List[str]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    claims: SequenceNotStr[str]
     """Custom claims"""
 
     client_id: str
@@ -132,10 +136,7 @@ class AccessCentrify(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -143,13 +144,18 @@ class AccessCentrify(TypedDict, total=False):
 
 
 class AccessCentrifyConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     centrify_account: str
     """Your centrify account url"""
 
     centrify_app_id: str
     """Your centrify app id"""
 
-    claims: List[str]
+    claims: SequenceNotStr[str]
     """Custom claims"""
 
     client_id: str
@@ -186,10 +192,7 @@ class AccessFacebook(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -220,10 +223,7 @@ class AccessGitHub(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -254,10 +254,7 @@ class AccessGoogle(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -265,7 +262,12 @@ class AccessGoogle(TypedDict, total=False):
 
 
 class AccessGoogleConfig(TypedDict, total=False):
-    claims: List[str]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    claims: SequenceNotStr[str]
     """Custom claims"""
 
     client_id: str
@@ -302,10 +304,7 @@ class AccessGoogleApps(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -313,10 +312,15 @@ class AccessGoogleApps(TypedDict, total=False):
 
 
 class AccessGoogleAppsConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     apps_domain: str
     """Your companies TLD"""
 
-    claims: List[str]
+    claims: SequenceNotStr[str]
     """Custom claims"""
 
     client_id: str
@@ -353,10 +357,7 @@ class AccessLinkedin(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -387,10 +388,7 @@ class AccessOIDC(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -398,13 +396,18 @@ class AccessOIDC(TypedDict, total=False):
 
 
 class AccessOIDCConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     auth_url: str
     """The authorization_endpoint URL of your IdP"""
 
     certs_url: str
     """The jwks_uri endpoint of your IdP to allow the IdP keys to sign the tokens"""
 
-    claims: List[str]
+    claims: SequenceNotStr[str]
     """Custom claims"""
 
     client_id: str
@@ -416,7 +419,10 @@ class AccessOIDCConfig(TypedDict, total=False):
     email_claim_name: str
     """The claim name for email in the id_token response."""
 
-    scopes: List[str]
+    pkce_enabled: bool
+    """Enable Proof Key for Code Exchange (PKCE)"""
+
+    scopes: SequenceNotStr[str]
     """OAuth scopes"""
 
     token_url: str
@@ -447,10 +453,7 @@ class AccessOkta(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -458,10 +461,15 @@ class AccessOkta(TypedDict, total=False):
 
 
 class AccessOktaConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     authorization_server_id: str
     """Your okta authorization server id"""
 
-    claims: List[str]
+    claims: SequenceNotStr[str]
     """Custom claims"""
 
     client_id: str
@@ -501,10 +509,7 @@ class AccessOnelogin(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -512,7 +517,12 @@ class AccessOnelogin(TypedDict, total=False):
 
 
 class AccessOneloginConfig(TypedDict, total=False):
-    claims: List[str]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    claims: SequenceNotStr[str]
     """Custom claims"""
 
     client_id: str
@@ -552,10 +562,7 @@ class AccessPingone(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -563,7 +570,12 @@ class AccessPingone(TypedDict, total=False):
 
 
 class AccessPingoneConfig(TypedDict, total=False):
-    claims: List[str]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    claims: SequenceNotStr[str]
     """Custom claims"""
 
     client_id: str
@@ -603,10 +615,7 @@ class AccessSAML(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -622,7 +631,12 @@ class AccessSAMLConfigHeaderAttribute(TypedDict, total=False):
 
 
 class AccessSAMLConfig(TypedDict, total=False):
-    attributes: List[str]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    attributes: SequenceNotStr[str]
     """
     A list of SAML attribute names that will be added to your signed JWT token and
     can be used in SAML policy rules.
@@ -637,7 +651,7 @@ class AccessSAMLConfig(TypedDict, total=False):
     the Access callback.
     """
 
-    idp_public_certs: List[str]
+    idp_public_certs: SequenceNotStr[str]
     """X509 certificate to verify the signature in the SAML authentication response"""
 
     issuer_url: str
@@ -677,10 +691,7 @@ class AccessYandex(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -688,7 +699,7 @@ class AccessYandex(TypedDict, total=False):
 
 
 class AccessOnetimepin(TypedDict, total=False):
-    config: Required[object]
+    config: Required[AccessOnetimepinConfig]
     """The configuration parameters for the identity provider.
 
     To view the required parameters for a specific provider, refer to our
@@ -711,17 +722,23 @@ class AccessOnetimepin(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
     """
 
 
-IdentityProviderCreateParams = Union[
+class AccessOnetimepinConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    pass
+
+
+IdentityProviderCreateParams: TypeAlias = Union[
     AzureAD,
     AccessCentrify,
     AccessFacebook,
diff --git a/src/cloudflare/types/zero_trust/identity_provider_delete_response.py b/src/cloudflare/types/zero_trust/identity_provider_delete_response.py
index 4c84ce5d197..d62f6ad615a 100644
--- a/src/cloudflare/types/zero_trust/identity_provider_delete_response.py
+++ b/src/cloudflare/types/zero_trust/identity_provider_delete_response.py
@@ -9,4 +9,4 @@
 
 class IdentityProviderDeleteResponse(BaseModel):
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
diff --git a/src/cloudflare/types/zero_trust/identity_provider_list_params.py b/src/cloudflare/types/zero_trust/identity_provider_list_params.py
new file mode 100644
index 00000000000..c035181c866
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/identity_provider_list_params.py
@@ -0,0 +1,27 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import TypedDict
+
+__all__ = ["IdentityProviderListParams"]
+
+
+class IdentityProviderListParams(TypedDict, total=False):
+    account_id: str
+    """The Account ID to use for this endpoint. Mutually exclusive with the Zone ID."""
+
+    zone_id: str
+    """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    page: int
+    """Page number of results."""
+
+    per_page: int
+    """Number of results per page."""
+
+    scim_enabled: str
+    """
+    Indicates to Access to only retrieve identity providers that have the System for
+    Cross-Domain Identity Management (SCIM) enabled.
+    """
diff --git a/src/cloudflare/types/zero_trust/identity_provider_list_response.py b/src/cloudflare/types/zero_trust/identity_provider_list_response.py
index 59761e96afa..d4101c6466a 100644
--- a/src/cloudflare/types/zero_trust/identity_provider_list_response.py
+++ b/src/cloudflare/types/zero_trust/identity_provider_list_response.py
@@ -1,12 +1,13 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Union, Optional
+from typing_extensions import TypeAlias
 
 from .azure_ad import AzureAD
 from ..._models import BaseModel
-from .scim_config import SCIMConfig
 from .generic_oauth_config import GenericOAuthConfig
 from .identity_provider_type import IdentityProviderType
+from .identity_provider_scim_config import IdentityProviderSCIMConfig
 
 __all__ = [
     "IdentityProviderListResponse",
@@ -35,6 +36,11 @@
 
 
 class AccessCentrifyConfig(BaseModel):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     centrify_account: Optional[str] = None
     """Your centrify account url"""
 
@@ -73,9 +79,9 @@ class AccessCentrify(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -101,9 +107,9 @@ class AccessFacebook(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -129,9 +135,9 @@ class AccessGitHub(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -139,6 +145,11 @@ class AccessGitHub(BaseModel):
 
 
 class AccessGoogleConfig(BaseModel):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     claims: Optional[List[str]] = None
     """Custom claims"""
 
@@ -171,9 +182,9 @@ class AccessGoogle(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -181,6 +192,11 @@ class AccessGoogle(BaseModel):
 
 
 class AccessGoogleAppsConfig(BaseModel):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     apps_domain: Optional[str] = None
     """Your companies TLD"""
 
@@ -216,9 +232,9 @@ class AccessGoogleApps(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -244,9 +260,9 @@ class AccessLinkedin(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -254,6 +270,11 @@ class AccessLinkedin(BaseModel):
 
 
 class AccessOIDCConfig(BaseModel):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     auth_url: Optional[str] = None
     """The authorization_endpoint URL of your IdP"""
 
@@ -272,6 +293,9 @@ class AccessOIDCConfig(BaseModel):
     email_claim_name: Optional[str] = None
     """The claim name for email in the id_token response."""
 
+    pkce_enabled: Optional[bool] = None
+    """Enable Proof Key for Code Exchange (PKCE)"""
+
     scopes: Optional[List[str]] = None
     """OAuth scopes"""
 
@@ -298,9 +322,9 @@ class AccessOIDC(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -308,6 +332,11 @@ class AccessOIDC(BaseModel):
 
 
 class AccessOktaConfig(BaseModel):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     authorization_server_id: Optional[str] = None
     """Your okta authorization server id"""
 
@@ -346,9 +375,9 @@ class AccessOkta(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -356,6 +385,11 @@ class AccessOkta(BaseModel):
 
 
 class AccessOneloginConfig(BaseModel):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     claims: Optional[List[str]] = None
     """Custom claims"""
 
@@ -391,9 +425,9 @@ class AccessOnelogin(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -401,6 +435,11 @@ class AccessOnelogin(BaseModel):
 
 
 class AccessPingoneConfig(BaseModel):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     claims: Optional[List[str]] = None
     """Custom claims"""
 
@@ -436,9 +475,9 @@ class AccessPingone(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -454,6 +493,11 @@ class AccessSAMLConfigHeaderAttribute(BaseModel):
 
 
 class AccessSAMLConfig(BaseModel):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     attributes: Optional[List[str]] = None
     """
     A list of SAML attribute names that will be added to your signed JWT token and
@@ -504,9 +548,9 @@ class AccessSAML(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -532,16 +576,16 @@ class AccessYandex(BaseModel):
     """
 
     id: Optional[str] = None
-    """UUID"""
+    """UUID."""
 
-    scim_config: Optional[SCIMConfig] = None
+    scim_config: Optional[IdentityProviderSCIMConfig] = None
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
     """
 
 
-IdentityProviderListResponse = Union[
+IdentityProviderListResponse: TypeAlias = Union[
     AzureAD,
     AccessCentrify,
     AccessFacebook,
diff --git a/src/cloudflare/types/zero_trust/identity_provider_param.py b/src/cloudflare/types/zero_trust/identity_provider_param.py
new file mode 100644
index 00000000000..f7ab6bc8795
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/identity_provider_param.py
@@ -0,0 +1,605 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from typing_extensions import Required, TypeAlias, TypedDict
+
+from ..._types import SequenceNotStr
+from .azure_ad_param import AzureADParam
+from .identity_provider_type import IdentityProviderType
+from .generic_oauth_config_param import GenericOAuthConfigParam
+from .identity_provider_scim_config_param import IdentityProviderSCIMConfigParam
+
+__all__ = [
+    "IdentityProviderParam",
+    "AccessCentrify",
+    "AccessCentrifyConfig",
+    "AccessFacebook",
+    "AccessGitHub",
+    "AccessGoogle",
+    "AccessGoogleConfig",
+    "AccessGoogleApps",
+    "AccessGoogleAppsConfig",
+    "AccessLinkedin",
+    "AccessOIDC",
+    "AccessOIDCConfig",
+    "AccessOkta",
+    "AccessOktaConfig",
+    "AccessOnelogin",
+    "AccessOneloginConfig",
+    "AccessPingone",
+    "AccessPingoneConfig",
+    "AccessSAML",
+    "AccessSAMLConfig",
+    "AccessSAMLConfigHeaderAttribute",
+    "AccessYandex",
+    "AccessOnetimepin",
+    "AccessOnetimepinConfig",
+]
+
+
+class AccessCentrifyConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    centrify_account: str
+    """Your centrify account url"""
+
+    centrify_app_id: str
+    """Your centrify app id"""
+
+    claims: SequenceNotStr[str]
+    """Custom claims"""
+
+    client_id: str
+    """Your OAuth Client ID"""
+
+    client_secret: str
+    """Your OAuth Client Secret"""
+
+    email_claim_name: str
+    """The claim name for email in the id_token response."""
+
+
+class AccessCentrify(TypedDict, total=False):
+    config: Required[AccessCentrifyConfig]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    name: Required[str]
+    """The name of the identity provider, shown to users on the login page."""
+
+    type: Required[IdentityProviderType]
+    """The type of identity provider.
+
+    To determine the value for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    scim_config: IdentityProviderSCIMConfigParam
+    """
+    The configuration settings for enabling a System for Cross-Domain Identity
+    Management (SCIM) with the identity provider.
+    """
+
+
+class AccessFacebook(TypedDict, total=False):
+    config: Required[GenericOAuthConfigParam]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    name: Required[str]
+    """The name of the identity provider, shown to users on the login page."""
+
+    type: Required[IdentityProviderType]
+    """The type of identity provider.
+
+    To determine the value for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    scim_config: IdentityProviderSCIMConfigParam
+    """
+    The configuration settings for enabling a System for Cross-Domain Identity
+    Management (SCIM) with the identity provider.
+    """
+
+
+class AccessGitHub(TypedDict, total=False):
+    config: Required[GenericOAuthConfigParam]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    name: Required[str]
+    """The name of the identity provider, shown to users on the login page."""
+
+    type: Required[IdentityProviderType]
+    """The type of identity provider.
+
+    To determine the value for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    scim_config: IdentityProviderSCIMConfigParam
+    """
+    The configuration settings for enabling a System for Cross-Domain Identity
+    Management (SCIM) with the identity provider.
+    """
+
+
+class AccessGoogleConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    claims: SequenceNotStr[str]
+    """Custom claims"""
+
+    client_id: str
+    """Your OAuth Client ID"""
+
+    client_secret: str
+    """Your OAuth Client Secret"""
+
+    email_claim_name: str
+    """The claim name for email in the id_token response."""
+
+
+class AccessGoogle(TypedDict, total=False):
+    config: Required[AccessGoogleConfig]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    name: Required[str]
+    """The name of the identity provider, shown to users on the login page."""
+
+    type: Required[IdentityProviderType]
+    """The type of identity provider.
+
+    To determine the value for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    scim_config: IdentityProviderSCIMConfigParam
+    """
+    The configuration settings for enabling a System for Cross-Domain Identity
+    Management (SCIM) with the identity provider.
+    """
+
+
+class AccessGoogleAppsConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    apps_domain: str
+    """Your companies TLD"""
+
+    claims: SequenceNotStr[str]
+    """Custom claims"""
+
+    client_id: str
+    """Your OAuth Client ID"""
+
+    client_secret: str
+    """Your OAuth Client Secret"""
+
+    email_claim_name: str
+    """The claim name for email in the id_token response."""
+
+
+class AccessGoogleApps(TypedDict, total=False):
+    config: Required[AccessGoogleAppsConfig]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    name: Required[str]
+    """The name of the identity provider, shown to users on the login page."""
+
+    type: Required[IdentityProviderType]
+    """The type of identity provider.
+
+    To determine the value for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    scim_config: IdentityProviderSCIMConfigParam
+    """
+    The configuration settings for enabling a System for Cross-Domain Identity
+    Management (SCIM) with the identity provider.
+    """
+
+
+class AccessLinkedin(TypedDict, total=False):
+    config: Required[GenericOAuthConfigParam]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    name: Required[str]
+    """The name of the identity provider, shown to users on the login page."""
+
+    type: Required[IdentityProviderType]
+    """The type of identity provider.
+
+    To determine the value for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    scim_config: IdentityProviderSCIMConfigParam
+    """
+    The configuration settings for enabling a System for Cross-Domain Identity
+    Management (SCIM) with the identity provider.
+    """
+
+
+class AccessOIDCConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    auth_url: str
+    """The authorization_endpoint URL of your IdP"""
+
+    certs_url: str
+    """The jwks_uri endpoint of your IdP to allow the IdP keys to sign the tokens"""
+
+    claims: SequenceNotStr[str]
+    """Custom claims"""
+
+    client_id: str
+    """Your OAuth Client ID"""
+
+    client_secret: str
+    """Your OAuth Client Secret"""
+
+    email_claim_name: str
+    """The claim name for email in the id_token response."""
+
+    pkce_enabled: bool
+    """Enable Proof Key for Code Exchange (PKCE)"""
+
+    scopes: SequenceNotStr[str]
+    """OAuth scopes"""
+
+    token_url: str
+    """The token_endpoint URL of your IdP"""
+
+
+class AccessOIDC(TypedDict, total=False):
+    config: Required[AccessOIDCConfig]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    name: Required[str]
+    """The name of the identity provider, shown to users on the login page."""
+
+    type: Required[IdentityProviderType]
+    """The type of identity provider.
+
+    To determine the value for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    scim_config: IdentityProviderSCIMConfigParam
+    """
+    The configuration settings for enabling a System for Cross-Domain Identity
+    Management (SCIM) with the identity provider.
+    """
+
+
+class AccessOktaConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    authorization_server_id: str
+    """Your okta authorization server id"""
+
+    claims: SequenceNotStr[str]
+    """Custom claims"""
+
+    client_id: str
+    """Your OAuth Client ID"""
+
+    client_secret: str
+    """Your OAuth Client Secret"""
+
+    email_claim_name: str
+    """The claim name for email in the id_token response."""
+
+    okta_account: str
+    """Your okta account url"""
+
+
+class AccessOkta(TypedDict, total=False):
+    config: Required[AccessOktaConfig]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    name: Required[str]
+    """The name of the identity provider, shown to users on the login page."""
+
+    type: Required[IdentityProviderType]
+    """The type of identity provider.
+
+    To determine the value for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    scim_config: IdentityProviderSCIMConfigParam
+    """
+    The configuration settings for enabling a System for Cross-Domain Identity
+    Management (SCIM) with the identity provider.
+    """
+
+
+class AccessOneloginConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    claims: SequenceNotStr[str]
+    """Custom claims"""
+
+    client_id: str
+    """Your OAuth Client ID"""
+
+    client_secret: str
+    """Your OAuth Client Secret"""
+
+    email_claim_name: str
+    """The claim name for email in the id_token response."""
+
+    onelogin_account: str
+    """Your OneLogin account url"""
+
+
+class AccessOnelogin(TypedDict, total=False):
+    config: Required[AccessOneloginConfig]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    name: Required[str]
+    """The name of the identity provider, shown to users on the login page."""
+
+    type: Required[IdentityProviderType]
+    """The type of identity provider.
+
+    To determine the value for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    scim_config: IdentityProviderSCIMConfigParam
+    """
+    The configuration settings for enabling a System for Cross-Domain Identity
+    Management (SCIM) with the identity provider.
+    """
+
+
+class AccessPingoneConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    claims: SequenceNotStr[str]
+    """Custom claims"""
+
+    client_id: str
+    """Your OAuth Client ID"""
+
+    client_secret: str
+    """Your OAuth Client Secret"""
+
+    email_claim_name: str
+    """The claim name for email in the id_token response."""
+
+    ping_env_id: str
+    """Your PingOne environment identifier"""
+
+
+class AccessPingone(TypedDict, total=False):
+    config: Required[AccessPingoneConfig]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    name: Required[str]
+    """The name of the identity provider, shown to users on the login page."""
+
+    type: Required[IdentityProviderType]
+    """The type of identity provider.
+
+    To determine the value for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    scim_config: IdentityProviderSCIMConfigParam
+    """
+    The configuration settings for enabling a System for Cross-Domain Identity
+    Management (SCIM) with the identity provider.
+    """
+
+
+class AccessSAMLConfigHeaderAttribute(TypedDict, total=False):
+    attribute_name: str
+    """attribute name from the IDP"""
+
+    header_name: str
+    """header that will be added on the request to the origin"""
+
+
+class AccessSAMLConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    attributes: SequenceNotStr[str]
+    """
+    A list of SAML attribute names that will be added to your signed JWT token and
+    can be used in SAML policy rules.
+    """
+
+    email_attribute_name: str
+    """The attribute name for email in the SAML response."""
+
+    header_attributes: Iterable[AccessSAMLConfigHeaderAttribute]
+    """
+    Add a list of attribute names that will be returned in the response header from
+    the Access callback.
+    """
+
+    idp_public_certs: SequenceNotStr[str]
+    """X509 certificate to verify the signature in the SAML authentication response"""
+
+    issuer_url: str
+    """IdP Entity ID or Issuer URL"""
+
+    sign_request: bool
+    """Sign the SAML authentication request with Access credentials.
+
+    To verify the signature, use the public key from the Access certs endpoints.
+    """
+
+    sso_target_url: str
+    """URL to send the SAML authentication requests to"""
+
+
+class AccessSAML(TypedDict, total=False):
+    config: Required[AccessSAMLConfig]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    name: Required[str]
+    """The name of the identity provider, shown to users on the login page."""
+
+    type: Required[IdentityProviderType]
+    """The type of identity provider.
+
+    To determine the value for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    scim_config: IdentityProviderSCIMConfigParam
+    """
+    The configuration settings for enabling a System for Cross-Domain Identity
+    Management (SCIM) with the identity provider.
+    """
+
+
+class AccessYandex(TypedDict, total=False):
+    config: Required[GenericOAuthConfigParam]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    name: Required[str]
+    """The name of the identity provider, shown to users on the login page."""
+
+    type: Required[IdentityProviderType]
+    """The type of identity provider.
+
+    To determine the value for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    scim_config: IdentityProviderSCIMConfigParam
+    """
+    The configuration settings for enabling a System for Cross-Domain Identity
+    Management (SCIM) with the identity provider.
+    """
+
+
+class AccessOnetimepinConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    pass
+
+
+class AccessOnetimepin(TypedDict, total=False):
+    config: Required[AccessOnetimepinConfig]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    name: Required[str]
+    """The name of the identity provider, shown to users on the login page."""
+
+    type: Required[IdentityProviderType]
+    """The type of identity provider.
+
+    To determine the value for a specific provider, refer to our
+    [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    scim_config: IdentityProviderSCIMConfigParam
+    """
+    The configuration settings for enabling a System for Cross-Domain Identity
+    Management (SCIM) with the identity provider.
+    """
+
+
+IdentityProviderParam: TypeAlias = Union[
+    AzureADParam,
+    AccessCentrify,
+    AccessFacebook,
+    AccessGitHub,
+    AccessGoogle,
+    AccessGoogleApps,
+    AccessLinkedin,
+    AccessOIDC,
+    AccessOkta,
+    AccessOnelogin,
+    AccessPingone,
+    AccessSAML,
+    AccessYandex,
+    AccessOnetimepin,
+]
diff --git a/src/cloudflare/types/zero_trust/identity_provider_scim_config.py b/src/cloudflare/types/zero_trust/identity_provider_scim_config.py
new file mode 100644
index 00000000000..53b3020df40
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/identity_provider_scim_config.py
@@ -0,0 +1,51 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["IdentityProviderSCIMConfig"]
+
+
+class IdentityProviderSCIMConfig(BaseModel):
+    """
+    The configuration settings for enabling a System for Cross-Domain Identity Management (SCIM) with the identity provider.
+    """
+
+    enabled: Optional[bool] = None
+    """A flag to enable or disable SCIM for the identity provider."""
+
+    identity_update_behavior: Optional[Literal["automatic", "reauth", "no_action"]] = None
+    """Indicates how a SCIM event updates a user identity used for policy evaluation.
+
+    Use "automatic" to automatically update a user's identity and augment it with
+    fields from the SCIM user resource. Use "reauth" to force re-authentication on
+    group membership updates, user identity update will only occur after successful
+    re-authentication. With "reauth" identities will not contain fields from the
+    SCIM user resource. With "no_action" identities will not be changed by SCIM
+    updates in any way and users will not be prompted to reauthenticate.
+    """
+
+    scim_base_url: Optional[str] = None
+    """The base URL of Cloudflare's SCIM V2.0 API endpoint."""
+
+    seat_deprovision: Optional[bool] = None
+    """
+    A flag to remove a user's seat in Zero Trust when they have been deprovisioned
+    in the Identity Provider. This cannot be enabled unless user_deprovision is also
+    enabled.
+    """
+
+    secret: Optional[str] = None
+    """
+    A read-only token generated when the SCIM integration is enabled for the first
+    time. It is redacted on subsequent requests. If you lose this you will need to
+    refresh it at /access/identity_providers/:idpID/refresh_scim_secret.
+    """
+
+    user_deprovision: Optional[bool] = None
+    """
+    A flag to enable revoking a user's session in Access and Gateway when they have
+    been deprovisioned in the Identity Provider.
+    """
diff --git a/src/cloudflare/types/zero_trust/identity_provider_scim_config_param.py b/src/cloudflare/types/zero_trust/identity_provider_scim_config_param.py
new file mode 100644
index 00000000000..91921aa77bf
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/identity_provider_scim_config_param.py
@@ -0,0 +1,40 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["IdentityProviderSCIMConfigParam"]
+
+
+class IdentityProviderSCIMConfigParam(TypedDict, total=False):
+    """
+    The configuration settings for enabling a System for Cross-Domain Identity Management (SCIM) with the identity provider.
+    """
+
+    enabled: bool
+    """A flag to enable or disable SCIM for the identity provider."""
+
+    identity_update_behavior: Literal["automatic", "reauth", "no_action"]
+    """Indicates how a SCIM event updates a user identity used for policy evaluation.
+
+    Use "automatic" to automatically update a user's identity and augment it with
+    fields from the SCIM user resource. Use "reauth" to force re-authentication on
+    group membership updates, user identity update will only occur after successful
+    re-authentication. With "reauth" identities will not contain fields from the
+    SCIM user resource. With "no_action" identities will not be changed by SCIM
+    updates in any way and users will not be prompted to reauthenticate.
+    """
+
+    seat_deprovision: bool
+    """
+    A flag to remove a user's seat in Zero Trust when they have been deprovisioned
+    in the Identity Provider. This cannot be enabled unless user_deprovision is also
+    enabled.
+    """
+
+    user_deprovision: bool
+    """
+    A flag to enable revoking a user's session in Access and Gateway when they have
+    been deprovisioned in the Identity Provider.
+    """
diff --git a/src/cloudflare/types/zero_trust/identity_provider_type.py b/src/cloudflare/types/zero_trust/identity_provider_type.py
index 8435e951d8d..13dba5ce2c5 100644
--- a/src/cloudflare/types/zero_trust/identity_provider_type.py
+++ b/src/cloudflare/types/zero_trust/identity_provider_type.py
@@ -1,10 +1,10 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["IdentityProviderType"]
 
-IdentityProviderType = Literal[
+IdentityProviderType: TypeAlias = Literal[
     "onetimepin",
     "azureAD",
     "saml",
diff --git a/src/cloudflare/types/zero_trust/identity_provider_update_params.py b/src/cloudflare/types/zero_trust/identity_provider_update_params.py
index cd6dc52cff8..c03081fea98 100644
--- a/src/cloudflare/types/zero_trust/identity_provider_update_params.py
+++ b/src/cloudflare/types/zero_trust/identity_provider_update_params.py
@@ -2,12 +2,13 @@
 
 from __future__ import annotations
 
-from typing import List, Union, Iterable
-from typing_extensions import Literal, Required, TypedDict
+from typing import Union, Iterable
+from typing_extensions import Literal, Required, TypeAlias, TypedDict
 
-from .scim_config_param import SCIMConfigParam
+from ..._types import SequenceNotStr
 from .identity_provider_type import IdentityProviderType
 from .generic_oauth_config_param import GenericOAuthConfigParam
+from .identity_provider_scim_config_param import IdentityProviderSCIMConfigParam
 
 __all__ = [
     "IdentityProviderUpdateParams",
@@ -35,6 +36,7 @@
     "AccessSAMLConfigHeaderAttribute",
     "AccessYandex",
     "AccessOnetimepin",
+    "AccessOnetimepinConfig",
 ]
 
 
@@ -62,10 +64,7 @@ class AzureAD(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -73,7 +72,12 @@ class AzureAD(TypedDict, total=False):
 
 
 class AzureADConfig(TypedDict, total=False):
-    claims: List[str]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    claims: SequenceNotStr[str]
     """Custom claims"""
 
     client_id: str
@@ -132,10 +136,7 @@ class AccessCentrify(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -143,13 +144,18 @@ class AccessCentrify(TypedDict, total=False):
 
 
 class AccessCentrifyConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     centrify_account: str
     """Your centrify account url"""
 
     centrify_app_id: str
     """Your centrify app id"""
 
-    claims: List[str]
+    claims: SequenceNotStr[str]
     """Custom claims"""
 
     client_id: str
@@ -186,10 +192,7 @@ class AccessFacebook(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -220,10 +223,7 @@ class AccessGitHub(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -254,10 +254,7 @@ class AccessGoogle(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -265,7 +262,12 @@ class AccessGoogle(TypedDict, total=False):
 
 
 class AccessGoogleConfig(TypedDict, total=False):
-    claims: List[str]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    claims: SequenceNotStr[str]
     """Custom claims"""
 
     client_id: str
@@ -302,10 +304,7 @@ class AccessGoogleApps(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -313,10 +312,15 @@ class AccessGoogleApps(TypedDict, total=False):
 
 
 class AccessGoogleAppsConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     apps_domain: str
     """Your companies TLD"""
 
-    claims: List[str]
+    claims: SequenceNotStr[str]
     """Custom claims"""
 
     client_id: str
@@ -353,10 +357,7 @@ class AccessLinkedin(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -387,10 +388,7 @@ class AccessOIDC(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -398,13 +396,18 @@ class AccessOIDC(TypedDict, total=False):
 
 
 class AccessOIDCConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     auth_url: str
     """The authorization_endpoint URL of your IdP"""
 
     certs_url: str
     """The jwks_uri endpoint of your IdP to allow the IdP keys to sign the tokens"""
 
-    claims: List[str]
+    claims: SequenceNotStr[str]
     """Custom claims"""
 
     client_id: str
@@ -416,7 +419,10 @@ class AccessOIDCConfig(TypedDict, total=False):
     email_claim_name: str
     """The claim name for email in the id_token response."""
 
-    scopes: List[str]
+    pkce_enabled: bool
+    """Enable Proof Key for Code Exchange (PKCE)"""
+
+    scopes: SequenceNotStr[str]
     """OAuth scopes"""
 
     token_url: str
@@ -447,10 +453,7 @@ class AccessOkta(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -458,10 +461,15 @@ class AccessOkta(TypedDict, total=False):
 
 
 class AccessOktaConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
     authorization_server_id: str
     """Your okta authorization server id"""
 
-    claims: List[str]
+    claims: SequenceNotStr[str]
     """Custom claims"""
 
     client_id: str
@@ -501,10 +509,7 @@ class AccessOnelogin(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -512,7 +517,12 @@ class AccessOnelogin(TypedDict, total=False):
 
 
 class AccessOneloginConfig(TypedDict, total=False):
-    claims: List[str]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    claims: SequenceNotStr[str]
     """Custom claims"""
 
     client_id: str
@@ -552,10 +562,7 @@ class AccessPingone(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -563,7 +570,12 @@ class AccessPingone(TypedDict, total=False):
 
 
 class AccessPingoneConfig(TypedDict, total=False):
-    claims: List[str]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    claims: SequenceNotStr[str]
     """Custom claims"""
 
     client_id: str
@@ -603,10 +615,7 @@ class AccessSAML(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -622,7 +631,12 @@ class AccessSAMLConfigHeaderAttribute(TypedDict, total=False):
 
 
 class AccessSAMLConfig(TypedDict, total=False):
-    attributes: List[str]
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    attributes: SequenceNotStr[str]
     """
     A list of SAML attribute names that will be added to your signed JWT token and
     can be used in SAML policy rules.
@@ -637,7 +651,7 @@ class AccessSAMLConfig(TypedDict, total=False):
     the Access callback.
     """
 
-    idp_public_certs: List[str]
+    idp_public_certs: SequenceNotStr[str]
     """X509 certificate to verify the signature in the SAML authentication response"""
 
     issuer_url: str
@@ -677,10 +691,7 @@ class AccessYandex(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
@@ -688,7 +699,7 @@ class AccessYandex(TypedDict, total=False):
 
 
 class AccessOnetimepin(TypedDict, total=False):
-    config: Required[object]
+    config: Required[AccessOnetimepinConfig]
     """The configuration parameters for the identity provider.
 
     To view the required parameters for a specific provider, refer to our
@@ -711,17 +722,23 @@ class AccessOnetimepin(TypedDict, total=False):
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
 
-    id: str
-    """UUID"""
-
-    scim_config: SCIMConfigParam
+    scim_config: IdentityProviderSCIMConfigParam
     """
     The configuration settings for enabling a System for Cross-Domain Identity
     Management (SCIM) with the identity provider.
     """
 
 
-IdentityProviderUpdateParams = Union[
+class AccessOnetimepinConfig(TypedDict, total=False):
+    """The configuration parameters for the identity provider.
+
+    To view the required parameters for a specific provider, refer to our [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+    """
+
+    pass
+
+
+IdentityProviderUpdateParams: TypeAlias = Union[
     AzureAD,
     AccessCentrify,
     AccessFacebook,
diff --git a/src/cloudflare/types/zero_trust/identity_providers/__init__.py b/src/cloudflare/types/zero_trust/identity_providers/__init__.py
new file mode 100644
index 00000000000..f8ee8b14b1c
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/identity_providers/__init__.py
@@ -0,0 +1,3 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
diff --git a/src/cloudflare/types/zero_trust/identity_providers/scim/__init__.py b/src/cloudflare/types/zero_trust/identity_providers/scim/__init__.py
new file mode 100644
index 00000000000..f050b879af4
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/identity_providers/scim/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .user_list_params import UserListParams as UserListParams
+from .group_list_params import GroupListParams as GroupListParams
diff --git a/src/cloudflare/types/zero_trust/identity_providers/scim/group_list_params.py b/src/cloudflare/types/zero_trust/identity_providers/scim/group_list_params.py
new file mode 100644
index 00000000000..c94b4b175b1
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/identity_providers/scim/group_list_params.py
@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["GroupListParams"]
+
+
+class GroupListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    cf_resource_id: str
+    """
+    The unique Cloudflare-generated Id of the SCIM Group resource; also known as the
+    "Id".
+    """
+
+    idp_resource_id: str
+    """
+    The IdP-generated Id of the SCIM Group resource; also known as the "external
+    Id".
+    """
+
+    name: str
+    """The display name of the SCIM Group resource."""
+
+    page: int
+    """Page number of results."""
+
+    per_page: int
+    """Number of results per page."""
diff --git a/src/cloudflare/types/zero_trust/identity_providers/scim/user_list_params.py b/src/cloudflare/types/zero_trust/identity_providers/scim/user_list_params.py
new file mode 100644
index 00000000000..6ce2445eec1
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/identity_providers/scim/user_list_params.py
@@ -0,0 +1,38 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["UserListParams"]
+
+
+class UserListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    cf_resource_id: str
+    """
+    The unique Cloudflare-generated Id of the SCIM User resource; also known as the
+    "Id".
+    """
+
+    email: str
+    """The email address of the SCIM User resource."""
+
+    idp_resource_id: str
+    """
+    The IdP-generated Id of the SCIM User resource; also known as the "external Id".
+    """
+
+    name: str
+    """The name of the SCIM User resource."""
+
+    page: int
+    """Page number of results."""
+
+    per_page: int
+    """Number of results per page."""
+
+    username: str
+    """The username of the SCIM User resource."""
diff --git a/src/cloudflare/types/zero_trust/network_path.py b/src/cloudflare/types/zero_trust/network_path.py
index 7eb7ac7912c..7db7d521cfa 100644
--- a/src/cloudflare/types/zero_trust/network_path.py
+++ b/src/cloudflare/types/zero_trust/network_path.py
@@ -30,6 +30,11 @@ class Slot(BaseModel):
 
 
 class Sampling(BaseModel):
+    """Specifies the sampling applied, if any, to the slots response.
+
+    When sampled, results shown represent the first test run to the start of each sampling interval.
+    """
+
     unit: Literal["hours"]
 
     value: int
diff --git a/src/cloudflare/types/zero_trust/networks/__init__.py b/src/cloudflare/types/zero_trust/networks/__init__.py
index 3f825849118..401271d6d2f 100644
--- a/src/cloudflare/types/zero_trust/networks/__init__.py
+++ b/src/cloudflare/types/zero_trust/networks/__init__.py
@@ -4,13 +4,16 @@
 
 from .route import Route as Route
 from .teamnet import Teamnet as Teamnet
+from .hostname_route import HostnameRoute as HostnameRoute
 from .virtual_network import VirtualNetwork as VirtualNetwork
 from .route_edit_params import RouteEditParams as RouteEditParams
 from .route_list_params import RouteListParams as RouteListParams
+from .subnet_list_params import SubnetListParams as SubnetListParams
 from .route_create_params import RouteCreateParams as RouteCreateParams
+from .subnet_list_response import SubnetListResponse as SubnetListResponse
+from .hostname_route_edit_params import HostnameRouteEditParams as HostnameRouteEditParams
+from .hostname_route_list_params import HostnameRouteListParams as HostnameRouteListParams
 from .virtual_network_edit_params import VirtualNetworkEditParams as VirtualNetworkEditParams
 from .virtual_network_list_params import VirtualNetworkListParams as VirtualNetworkListParams
+from .hostname_route_create_params import HostnameRouteCreateParams as HostnameRouteCreateParams
 from .virtual_network_create_params import VirtualNetworkCreateParams as VirtualNetworkCreateParams
-from .virtual_network_edit_response import VirtualNetworkEditResponse as VirtualNetworkEditResponse
-from .virtual_network_create_response import VirtualNetworkCreateResponse as VirtualNetworkCreateResponse
-from .virtual_network_delete_response import VirtualNetworkDeleteResponse as VirtualNetworkDeleteResponse
diff --git a/src/cloudflare/types/zero_trust/networks/hostname_route.py b/src/cloudflare/types/zero_trust/networks/hostname_route.py
new file mode 100644
index 00000000000..482ff0f071d
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/networks/hostname_route.py
@@ -0,0 +1,34 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["HostnameRoute"]
+
+
+class HostnameRoute(BaseModel):
+    id: Optional[str] = None
+    """The hostname route ID."""
+
+    comment: Optional[str] = None
+    """An optional description of the hostname route."""
+
+    created_at: Optional[datetime] = None
+    """Timestamp of when the resource was created."""
+
+    deleted_at: Optional[datetime] = None
+    """Timestamp of when the resource was deleted.
+
+    If `null`, the resource has not been deleted.
+    """
+
+    hostname: Optional[str] = None
+    """The hostname of the route."""
+
+    tunnel_id: Optional[str] = None
+    """UUID of the tunnel."""
+
+    tunnel_name: Optional[str] = None
+    """A user-friendly name for a tunnel."""
diff --git a/src/cloudflare/types/zero_trust/networks/hostname_route_create_params.py b/src/cloudflare/types/zero_trust/networks/hostname_route_create_params.py
new file mode 100644
index 00000000000..cf16e4aef75
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/networks/hostname_route_create_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["HostnameRouteCreateParams"]
+
+
+class HostnameRouteCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Cloudflare account ID"""
+
+    comment: str
+    """An optional description of the hostname route."""
+
+    hostname: str
+    """The hostname of the route."""
+
+    tunnel_id: str
+    """UUID of the tunnel."""
diff --git a/src/cloudflare/types/zero_trust/networks/hostname_route_edit_params.py b/src/cloudflare/types/zero_trust/networks/hostname_route_edit_params.py
new file mode 100644
index 00000000000..1429767026a
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/networks/hostname_route_edit_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["HostnameRouteEditParams"]
+
+
+class HostnameRouteEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Cloudflare account ID"""
+
+    comment: str
+    """An optional description of the hostname route."""
+
+    hostname: str
+    """The hostname of the route."""
+
+    tunnel_id: str
+    """UUID of the tunnel."""
diff --git a/src/cloudflare/types/zero_trust/networks/hostname_route_list_params.py b/src/cloudflare/types/zero_trust/networks/hostname_route_list_params.py
new file mode 100644
index 00000000000..cda69373764
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/networks/hostname_route_list_params.py
@@ -0,0 +1,45 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["HostnameRouteListParams"]
+
+
+class HostnameRouteListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Cloudflare account ID"""
+
+    id: str
+    """The hostname route ID."""
+
+    comment: str
+    """If set, only list hostname routes with the given comment."""
+
+    existed_at: str
+    """
+    If provided, include only resources that were created (and not deleted) before
+    this time. URL encoded.
+    """
+
+    hostname: str
+    """
+    If set, only list hostname routes that contain a substring of the given value,
+    the filter is case-insensitive.
+    """
+
+    is_deleted: bool
+    """If `true`, only return deleted hostname routes.
+
+    If `false`, exclude deleted hostname routes.
+    """
+
+    page: float
+    """Page number of paginated results."""
+
+    per_page: float
+    """Number of results to display."""
+
+    tunnel_id: str
+    """If set, only list hostname routes that point to a specific tunnel."""
diff --git a/src/cloudflare/types/zero_trust/networks/route_list_params.py b/src/cloudflare/types/zero_trust/networks/route_list_params.py
index 15a5e7bb478..3d1b86f0b2c 100644
--- a/src/cloudflare/types/zero_trust/networks/route_list_params.py
+++ b/src/cloudflare/types/zero_trust/networks/route_list_params.py
@@ -2,11 +2,8 @@
 
 from __future__ import annotations
 
-from typing import Union
-from datetime import datetime
-from typing_extensions import Required, Annotated, TypedDict
-
-from ...._utils import PropertyInfo
+from typing import List
+from typing_extensions import Literal, Required, TypedDict
 
 __all__ = ["RouteListParams"]
 
@@ -18,10 +15,10 @@ class RouteListParams(TypedDict, total=False):
     comment: str
     """Optional remark describing the route."""
 
-    existed_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    existed_at: str
     """
-    If provided, include only tunnels that were created (and not deleted) before
-    this time.
+    If provided, include only resources that were created (and not deleted) before
+    this time. URL encoded.
     """
 
     is_deleted: bool
@@ -45,8 +42,8 @@ class RouteListParams(TypedDict, total=False):
     route_id: str
     """UUID of the route."""
 
-    tun_types: str
-    """The types of tunnels to filter separated by a comma."""
+    tun_types: List[Literal["cfd_tunnel", "warp_connector", "warp", "magic", "ip_sec", "gre", "cni"]]
+    """The types of tunnels to filter by, separated by commas."""
 
     tunnel_id: str
     """UUID of the tunnel."""
diff --git a/src/cloudflare/types/zero_trust/networks/routes/ip_get_params.py b/src/cloudflare/types/zero_trust/networks/routes/ip_get_params.py
index 2e0092ae453..b2b941639c2 100644
--- a/src/cloudflare/types/zero_trust/networks/routes/ip_get_params.py
+++ b/src/cloudflare/types/zero_trust/networks/routes/ip_get_params.py
@@ -11,5 +11,13 @@ class IPGetParams(TypedDict, total=False):
     account_id: Required[str]
     """Cloudflare account ID"""
 
+    default_virtual_network_fallback: bool
+    """
+    When the virtual_network_id parameter is not provided the request filter will
+    default search routes that are in the default virtual network for the account.
+    If this parameter is set to false, the search will include routes that do not
+    have a virtual network.
+    """
+
     virtual_network_id: str
     """UUID of the virtual network."""
diff --git a/src/cloudflare/types/zero_trust/networks/routes/network_delete_params.py b/src/cloudflare/types/zero_trust/networks/routes/network_delete_params.py
index 73d466c6529..c99764abdd3 100644
--- a/src/cloudflare/types/zero_trust/networks/routes/network_delete_params.py
+++ b/src/cloudflare/types/zero_trust/networks/routes/network_delete_params.py
@@ -11,7 +11,7 @@ class NetworkDeleteParams(TypedDict, total=False):
     account_id: Required[str]
     """Cloudflare account ID"""
 
-    tun_type: Literal["cfd_tunnel", "warp_connector", "ip_sec", "gre", "cni"]
+    tun_type: Literal["cfd_tunnel", "warp_connector", "warp", "magic", "ip_sec", "gre", "cni"]
     """The type of tunnel."""
 
     tunnel_id: str
diff --git a/src/cloudflare/types/zero_trust/networks/subnet_list_params.py b/src/cloudflare/types/zero_trust/networks/subnet_list_params.py
new file mode 100644
index 00000000000..ef5475b16ad
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/networks/subnet_list_params.py
@@ -0,0 +1,59 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["SubnetListParams"]
+
+
+class SubnetListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Cloudflare account ID"""
+
+    address_family: Literal["v4", "v6"]
+    """If set, only include subnets in the given address family - `v4` or `v6`"""
+
+    comment: str
+    """If set, only list subnets with the given comment."""
+
+    existed_at: str
+    """
+    If provided, include only resources that were created (and not deleted) before
+    this time. URL encoded.
+    """
+
+    is_default_network: bool
+    """If `true`, only include default subnets.
+
+    If `false`, exclude default subnets subnets. If not set, all subnets will be
+    included.
+    """
+
+    is_deleted: bool
+    """If `true`, only include deleted subnets.
+
+    If `false`, exclude deleted subnets. If not set, all subnets will be included.
+    """
+
+    name: str
+    """If set, only list subnets with the given name"""
+
+    network: str
+    """If set, only list the subnet whose network exactly matches the given CIDR."""
+
+    page: float
+    """Page number of paginated results."""
+
+    per_page: float
+    """Number of results to display."""
+
+    sort_order: Literal["asc", "desc"]
+    """Sort order of the results.
+
+    `asc` means oldest to newest, `desc` means newest to oldest. If not set, they
+    will not be in any particular order.
+    """
+
+    subnet_types: Literal["cloudflare_source", "warp"]
+    """If set, the types of subnets to include, separated by comma."""
diff --git a/src/cloudflare/types/zero_trust/networks/subnet_list_response.py b/src/cloudflare/types/zero_trust/networks/subnet_list_response.py
new file mode 100644
index 00000000000..c6218a22a82
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/networks/subnet_list_response.py
@@ -0,0 +1,41 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ...._models import BaseModel
+
+__all__ = ["SubnetListResponse"]
+
+
+class SubnetListResponse(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the subnet."""
+
+    comment: Optional[str] = None
+    """An optional description of the subnet."""
+
+    created_at: Optional[datetime] = None
+    """Timestamp of when the resource was created."""
+
+    deleted_at: Optional[datetime] = None
+    """Timestamp of when the resource was deleted.
+
+    If `null`, the resource has not been deleted.
+    """
+
+    is_default_network: Optional[bool] = None
+    """If `true`, this is the default subnet for the account.
+
+    There can only be one default subnet per account.
+    """
+
+    name: Optional[str] = None
+    """A user-friendly name for the subnet."""
+
+    network: Optional[str] = None
+    """The private IPv4 or IPv6 range defining the subnet, in CIDR notation."""
+
+    subnet_type: Optional[Literal["cloudflare_source"]] = None
+    """The type of subnet."""
diff --git a/src/cloudflare/types/zero_trust/networks/subnets/__init__.py b/src/cloudflare/types/zero_trust/networks/subnets/__init__.py
new file mode 100644
index 00000000000..afa04bcaada
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/networks/subnets/__init__.py
@@ -0,0 +1,6 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .cloudflare_source_update_params import CloudflareSourceUpdateParams as CloudflareSourceUpdateParams
+from .cloudflare_source_update_response import CloudflareSourceUpdateResponse as CloudflareSourceUpdateResponse
diff --git a/src/cloudflare/types/zero_trust/networks/subnets/cloudflare_source_update_params.py b/src/cloudflare/types/zero_trust/networks/subnets/cloudflare_source_update_params.py
new file mode 100644
index 00000000000..a45818011ea
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/networks/subnets/cloudflare_source_update_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["CloudflareSourceUpdateParams"]
+
+
+class CloudflareSourceUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Cloudflare account ID"""
+
+    comment: str
+    """An optional description of the subnet."""
+
+    name: str
+    """A user-friendly name for the subnet."""
+
+    network: str
+    """The private IPv4 or IPv6 range defining the subnet, in CIDR notation."""
diff --git a/src/cloudflare/types/zero_trust/networks/subnets/cloudflare_source_update_response.py b/src/cloudflare/types/zero_trust/networks/subnets/cloudflare_source_update_response.py
new file mode 100644
index 00000000000..7630e9fe39a
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/networks/subnets/cloudflare_source_update_response.py
@@ -0,0 +1,41 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ....._models import BaseModel
+
+__all__ = ["CloudflareSourceUpdateResponse"]
+
+
+class CloudflareSourceUpdateResponse(BaseModel):
+    id: Optional[str] = None
+    """The UUID of the subnet."""
+
+    comment: Optional[str] = None
+    """An optional description of the subnet."""
+
+    created_at: Optional[datetime] = None
+    """Timestamp of when the resource was created."""
+
+    deleted_at: Optional[datetime] = None
+    """Timestamp of when the resource was deleted.
+
+    If `null`, the resource has not been deleted.
+    """
+
+    is_default_network: Optional[bool] = None
+    """If `true`, this is the default subnet for the account.
+
+    There can only be one default subnet per account.
+    """
+
+    name: Optional[str] = None
+    """A user-friendly name for the subnet."""
+
+    network: Optional[str] = None
+    """The private IPv4 or IPv6 range defining the subnet, in CIDR notation."""
+
+    subnet_type: Optional[Literal["cloudflare_source"]] = None
+    """The type of subnet."""
diff --git a/src/cloudflare/types/zero_trust/networks/teamnet.py b/src/cloudflare/types/zero_trust/networks/teamnet.py
index 768b4564a71..014fdd1a522 100644
--- a/src/cloudflare/types/zero_trust/networks/teamnet.py
+++ b/src/cloudflare/types/zero_trust/networks/teamnet.py
@@ -28,7 +28,7 @@ class Teamnet(BaseModel):
     network: Optional[str] = None
     """The private IPv4 or IPv6 range connected by the route, in CIDR notation."""
 
-    tun_type: Optional[Literal["cfd_tunnel", "warp_connector", "ip_sec", "gre", "cni"]] = None
+    tun_type: Optional[Literal["cfd_tunnel", "warp_connector", "warp", "magic", "ip_sec", "gre", "cni"]] = None
     """The type of tunnel."""
 
     tunnel_id: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/networks/virtual_network_create_params.py b/src/cloudflare/types/zero_trust/networks/virtual_network_create_params.py
index b4ddaed53fc..2ffa581aed1 100644
--- a/src/cloudflare/types/zero_trust/networks/virtual_network_create_params.py
+++ b/src/cloudflare/types/zero_trust/networks/virtual_network_create_params.py
@@ -19,3 +19,6 @@ class VirtualNetworkCreateParams(TypedDict, total=False):
 
     is_default: bool
     """If `true`, this virtual network is the default for the account."""
+
+    is_default_network: bool
+    """If `true`, this virtual network is the default for the account."""
diff --git a/src/cloudflare/types/zero_trust/networks/virtual_network_create_response.py b/src/cloudflare/types/zero_trust/networks/virtual_network_create_response.py
deleted file mode 100644
index 72b480fefc9..00000000000
--- a/src/cloudflare/types/zero_trust/networks/virtual_network_create_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union
-
-__all__ = ["VirtualNetworkCreateResponse"]
-
-VirtualNetworkCreateResponse = Union[List[object], str, object]
diff --git a/src/cloudflare/types/zero_trust/networks/virtual_network_delete_response.py b/src/cloudflare/types/zero_trust/networks/virtual_network_delete_response.py
deleted file mode 100644
index 8974890539f..00000000000
--- a/src/cloudflare/types/zero_trust/networks/virtual_network_delete_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union
-
-__all__ = ["VirtualNetworkDeleteResponse"]
-
-VirtualNetworkDeleteResponse = Union[List[object], str, object]
diff --git a/src/cloudflare/types/zero_trust/networks/virtual_network_edit_response.py b/src/cloudflare/types/zero_trust/networks/virtual_network_edit_response.py
deleted file mode 100644
index df75a34f89c..00000000000
--- a/src/cloudflare/types/zero_trust/networks/virtual_network_edit_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union
-
-__all__ = ["VirtualNetworkEditResponse"]
-
-VirtualNetworkEditResponse = Union[List[object], str, object]
diff --git a/src/cloudflare/types/zero_trust/networks/virtual_network_list_params.py b/src/cloudflare/types/zero_trust/networks/virtual_network_list_params.py
index 3168639a9d1..116077ae8be 100644
--- a/src/cloudflare/types/zero_trust/networks/virtual_network_list_params.py
+++ b/src/cloudflare/types/zero_trust/networks/virtual_network_list_params.py
@@ -21,6 +21,13 @@ class VirtualNetworkListParams(TypedDict, total=False):
     will be included.
     """
 
+    is_default_network: bool
+    """If `true`, only include the default virtual network.
+
+    If `false`, exclude the default virtual network. If empty, all virtual networks
+    will be included.
+    """
+
     is_deleted: bool
     """If `true`, only include deleted virtual networks.
 
diff --git a/src/cloudflare/types/zero_trust/okta_group_rule.py b/src/cloudflare/types/zero_trust/okta_group_rule.py
deleted file mode 100644
index 944e2b57e83..00000000000
--- a/src/cloudflare/types/zero_trust/okta_group_rule.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-from ..._models import BaseModel
-
-__all__ = ["OktaGroupRule", "Okta"]
-
-
-class Okta(BaseModel):
-    connection_id: str
-    """The ID of your Okta identity provider."""
-
-    email: str
-    """The email of the Okta group."""
-
-
-class OktaGroupRule(BaseModel):
-    okta: Okta
diff --git a/src/cloudflare/types/zero_trust/okta_group_rule_param.py b/src/cloudflare/types/zero_trust/okta_group_rule_param.py
deleted file mode 100644
index 34d48a81073..00000000000
--- a/src/cloudflare/types/zero_trust/okta_group_rule_param.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["OktaGroupRuleParam", "Okta"]
-
-
-class Okta(TypedDict, total=False):
-    connection_id: Required[str]
-    """The ID of your Okta identity provider."""
-
-    email: Required[str]
-    """The email of the Okta group."""
-
-
-class OktaGroupRuleParam(TypedDict, total=False):
-    okta: Required[Okta]
diff --git a/src/cloudflare/types/zero_trust/organization.py b/src/cloudflare/types/zero_trust/organization.py
index 69d8412d852..84943c2821b 100644
--- a/src/cloudflare/types/zero_trust/organization.py
+++ b/src/cloudflare/types/zero_trust/organization.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
-from datetime import datetime
+from typing import List, Optional
 
 from ..._models import BaseModel
 from .login_design import LoginDesign
@@ -36,10 +35,25 @@ class Organization(BaseModel):
     login.
     """
 
-    created_at: Optional[datetime] = None
-
     custom_pages: Optional[CustomPages] = None
 
+    deny_unmatched_requests: Optional[bool] = None
+    """
+    Determines whether to deny all requests to Cloudflare-protected resources that
+    lack an associated Access application. If enabled, you must explicitly configure
+    an Access application and policy to allow traffic to your Cloudflare-protected
+    resources. For domains you want to be public across all subdomains, add the
+    domain to the `deny_unmatched_requests_exempted_zone_names` array.
+    """
+
+    deny_unmatched_requests_exempted_zone_names: Optional[List[str]] = None
+    """Contains zone names to exempt from the `deny_unmatched_requests` feature.
+
+    Requests to a subdomain in an exempted zone will block unauthenticated traffic
+    by default if there is a configured Access application and policy that matches
+    the request.
+    """
+
     is_ui_read_only: Optional[bool] = None
     """Lock all settings as Read-Only in the Dashboard, regardless of user permission.
 
@@ -61,15 +75,13 @@ class Organization(BaseModel):
     ui_read_only_toggle_reason: Optional[str] = None
     """A description of the reason why the UI read only field is being toggled."""
 
-    updated_at: Optional[datetime] = None
-
     user_seat_expiration_inactive_time: Optional[str] = None
     """The amount of time a user seat is inactive before it expires.
 
     When the user seat exceeds the set time of inactivity, the user is removed as an
-    active seat and no longer counts against your Teams seat count. Must be in the
-    format `300ms` or `2h45m`. Valid time units are: `ns`, `us` (or `µs`), `ms`,
-    `s`, `m`, `h`.
+    active seat and no longer counts against your Teams seat count. Minimum value
+    for this setting is 1 month (730h). Must be in the format `300ms` or `2h45m`.
+    Valid time units are: `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.
     """
 
     warp_auth_session_duration: Optional[str] = None
diff --git a/src/cloudflare/types/zero_trust/organization_create_params.py b/src/cloudflare/types/zero_trust/organization_create_params.py
index 35e0f167871..6c445ec5a98 100644
--- a/src/cloudflare/types/zero_trust/organization_create_params.py
+++ b/src/cloudflare/types/zero_trust/organization_create_params.py
@@ -4,6 +4,7 @@
 
 from typing_extensions import Required, TypedDict
 
+from ..._types import SequenceNotStr
 from .login_design_param import LoginDesignParam
 
 __all__ = ["OrganizationCreateParams"]
@@ -34,6 +35,23 @@ class OrganizationCreateParams(TypedDict, total=False):
     login.
     """
 
+    deny_unmatched_requests: bool
+    """
+    Determines whether to deny all requests to Cloudflare-protected resources that
+    lack an associated Access application. If enabled, you must explicitly configure
+    an Access application and policy to allow traffic to your Cloudflare-protected
+    resources. For domains you want to be public across all subdomains, add the
+    domain to the `deny_unmatched_requests_exempted_zone_names` array.
+    """
+
+    deny_unmatched_requests_exempted_zone_names: SequenceNotStr[str]
+    """Contains zone names to exempt from the `deny_unmatched_requests` feature.
+
+    Requests to a subdomain in an exempted zone will block unauthenticated traffic
+    by default if there is a configured Access application and policy that matches
+    the request.
+    """
+
     is_ui_read_only: bool
     """Lock all settings as Read-Only in the Dashboard, regardless of user permission.
 
@@ -56,9 +74,9 @@ class OrganizationCreateParams(TypedDict, total=False):
     """The amount of time a user seat is inactive before it expires.
 
     When the user seat exceeds the set time of inactivity, the user is removed as an
-    active seat and no longer counts against your Teams seat count. Must be in the
-    format `300ms` or `2h45m`. Valid time units are: `ns`, `us` (or `µs`), `ms`,
-    `s`, `m`, `h`.
+    active seat and no longer counts against your Teams seat count. Minimum value
+    for this setting is 1 month (730h). Must be in the format `300ms` or `2h45m`.
+    Valid time units are: `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.
     """
 
     warp_auth_session_duration: str
diff --git a/src/cloudflare/types/zero_trust/organization_revoke_users_params.py b/src/cloudflare/types/zero_trust/organization_revoke_users_params.py
index e7b4d725195..d9467bcd648 100644
--- a/src/cloudflare/types/zero_trust/organization_revoke_users_params.py
+++ b/src/cloudflare/types/zero_trust/organization_revoke_users_params.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from typing_extensions import Required, TypedDict
+from typing_extensions import Required, Annotated, TypedDict
+
+from ..._utils import PropertyInfo
 
 __all__ = ["OrganizationRevokeUsersParams"]
 
@@ -16,3 +18,19 @@ class OrganizationRevokeUsersParams(TypedDict, total=False):
 
     zone_id: str
     """The Zone ID to use for this endpoint. Mutually exclusive with the Account ID."""
+
+    query_devices: Annotated[bool, PropertyInfo(alias="devices")]
+    """When set to `true`, all devices associated with the user will be revoked."""
+
+    body_devices: Annotated[bool, PropertyInfo(alias="devices")]
+    """When set to `true`, all devices associated with the user will be revoked."""
+
+    user_uid: str
+    """The uuid of the user to revoke."""
+
+    warp_session_reauth: bool
+    """
+    When set to `true`, the user will be required to re-authenticate to WARP for all
+    Gateway policies that enforce a WARP client session duration. When `false`, the
+    user’s WARP session will remain active
+    """
diff --git a/src/cloudflare/types/zero_trust/organization_revoke_users_response.py b/src/cloudflare/types/zero_trust/organization_revoke_users_response.py
index 843ed6c3d16..afa38e0b982 100644
--- a/src/cloudflare/types/zero_trust/organization_revoke_users_response.py
+++ b/src/cloudflare/types/zero_trust/organization_revoke_users_response.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["OrganizationRevokeUsersResponse"]
 
-OrganizationRevokeUsersResponse = Literal[True, False]
+OrganizationRevokeUsersResponse: TypeAlias = Literal[True, False]
diff --git a/src/cloudflare/types/zero_trust/organization_update_params.py b/src/cloudflare/types/zero_trust/organization_update_params.py
index c83c066fb26..21cebff40bf 100644
--- a/src/cloudflare/types/zero_trust/organization_update_params.py
+++ b/src/cloudflare/types/zero_trust/organization_update_params.py
@@ -4,6 +4,7 @@
 
 from typing_extensions import TypedDict
 
+from ..._types import SequenceNotStr
 from .login_design_param import LoginDesignParam
 
 __all__ = ["OrganizationUpdateParams", "CustomPages"]
@@ -33,6 +34,23 @@ class OrganizationUpdateParams(TypedDict, total=False):
 
     custom_pages: CustomPages
 
+    deny_unmatched_requests: bool
+    """
+    Determines whether to deny all requests to Cloudflare-protected resources that
+    lack an associated Access application. If enabled, you must explicitly configure
+    an Access application and policy to allow traffic to your Cloudflare-protected
+    resources. For domains you want to be public across all subdomains, add the
+    domain to the `deny_unmatched_requests_exempted_zone_names` array.
+    """
+
+    deny_unmatched_requests_exempted_zone_names: SequenceNotStr[str]
+    """Contains zone names to exempt from the `deny_unmatched_requests` feature.
+
+    Requests to a subdomain in an exempted zone will block unauthenticated traffic
+    by default if there is a configured Access application and policy that matches
+    the request.
+    """
+
     is_ui_read_only: bool
     """Lock all settings as Read-Only in the Dashboard, regardless of user permission.
 
@@ -58,9 +76,9 @@ class OrganizationUpdateParams(TypedDict, total=False):
     """The amount of time a user seat is inactive before it expires.
 
     When the user seat exceeds the set time of inactivity, the user is removed as an
-    active seat and no longer counts against your Teams seat count. Must be in the
-    format `300ms` or `2h45m`. Valid time units are: `ns`, `us` (or `µs`), `ms`,
-    `s`, `m`, `h`.
+    active seat and no longer counts against your Teams seat count. Minimum value
+    for this setting is 1 month (730h). Must be in the format `300ms` or `2h45m`.
+    Valid time units are: `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.
     """
 
     warp_auth_session_duration: str
diff --git a/src/cloudflare/types/zero_trust/organizations/__init__.py b/src/cloudflare/types/zero_trust/organizations/__init__.py
new file mode 100644
index 00000000000..067f5cedb70
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/organizations/__init__.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .doh_get_response import DOHGetResponse as DOHGetResponse
+from .doh_update_params import DOHUpdateParams as DOHUpdateParams
+from .doh_update_response import DOHUpdateResponse as DOHUpdateResponse
diff --git a/src/cloudflare/types/zero_trust/organizations/doh_get_response.py b/src/cloudflare/types/zero_trust/organizations/doh_get_response.py
new file mode 100644
index 00000000000..a4eefed23cd
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/organizations/doh_get_response.py
@@ -0,0 +1,39 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["DOHGetResponse"]
+
+
+class DOHGetResponse(BaseModel):
+    id: Optional[str] = None
+    """The ID of the service token."""
+
+    client_id: Optional[str] = None
+    """The Client ID for the service token.
+
+    Access will check for this value in the `CF-Access-Client-ID` request header.
+    """
+
+    doh_jwt_duration: Optional[str] = None
+    """The duration the DoH JWT is valid for.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note that the maximum duration for this setting is the same as the
+    key rotation period on the account.
+    """
+
+    duration: Optional[str] = None
+    """The duration for how long the service token will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. The default is 1 year in hours (8760h).
+    """
+
+    expires_at: Optional[datetime] = None
+
+    name: Optional[str] = None
+    """The name of the service token."""
diff --git a/src/cloudflare/types/zero_trust/organizations/doh_update_params.py b/src/cloudflare/types/zero_trust/organizations/doh_update_params.py
new file mode 100644
index 00000000000..4bb1bb7a67a
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/organizations/doh_update_params.py
@@ -0,0 +1,23 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["DOHUpdateParams"]
+
+
+class DOHUpdateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Identifier."""
+
+    doh_jwt_duration: str
+    """The duration the DoH JWT is valid for.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note that the maximum duration for this setting is the same as the
+    key rotation period on the account. Default expiration is 24h
+    """
+
+    service_token_id: str
+    """The uuid of the service token you want to use for DoH authentication"""
diff --git a/src/cloudflare/types/zero_trust/organizations/doh_update_response.py b/src/cloudflare/types/zero_trust/organizations/doh_update_response.py
new file mode 100644
index 00000000000..748cd3f415f
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/organizations/doh_update_response.py
@@ -0,0 +1,39 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+
+from ...._models import BaseModel
+
+__all__ = ["DOHUpdateResponse"]
+
+
+class DOHUpdateResponse(BaseModel):
+    id: Optional[str] = None
+    """The ID of the service token."""
+
+    client_id: Optional[str] = None
+    """The Client ID for the service token.
+
+    Access will check for this value in the `CF-Access-Client-ID` request header.
+    """
+
+    doh_jwt_duration: Optional[str] = None
+    """The duration the DoH JWT is valid for.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. Note that the maximum duration for this setting is the same as the
+    key rotation period on the account. Default expiration is 24h
+    """
+
+    duration: Optional[str] = None
+    """The duration for how long the service token will be valid.
+
+    Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs),
+    ms, s, m, h. The default is 1 year in hours (8760h).
+    """
+
+    expires_at: Optional[datetime] = None
+
+    name: Optional[str] = None
+    """The name of the service token."""
diff --git a/src/cloudflare/types/zero_trust/risk_scoring/__init__.py b/src/cloudflare/types/zero_trust/risk_scoring/__init__.py
index 8f787e32eb6..1be8fd0a11a 100644
--- a/src/cloudflare/types/zero_trust/risk_scoring/__init__.py
+++ b/src/cloudflare/types/zero_trust/risk_scoring/__init__.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from .summary_get_params import SummaryGetParams as SummaryGetParams
 from .summary_get_response import SummaryGetResponse as SummaryGetResponse
 from .behaviour_get_response import BehaviourGetResponse as BehaviourGetResponse
 from .behaviour_update_params import BehaviourUpdateParams as BehaviourUpdateParams
diff --git a/src/cloudflare/types/zero_trust/risk_scoring/behaviour_get_response.py b/src/cloudflare/types/zero_trust/risk_scoring/behaviour_get_response.py
index 5233be19794..b5689e1087b 100644
--- a/src/cloudflare/types/zero_trust/risk_scoring/behaviour_get_response.py
+++ b/src/cloudflare/types/zero_trust/risk_scoring/behaviour_get_response.py
@@ -1,6 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Dict, Optional
+from typing import Dict
 from typing_extensions import Literal
 
 from ...._models import BaseModel
@@ -9,14 +9,14 @@
 
 
 class Behaviors(BaseModel):
-    description: Optional[str] = None
+    description: str
 
-    enabled: Optional[bool] = None
+    enabled: bool
 
-    name: Optional[str] = None
+    name: str
 
-    risk_level: Optional[Literal["low", "medium", "high"]] = None
+    risk_level: Literal["low", "medium", "high"]
 
 
 class BehaviourGetResponse(BaseModel):
-    behaviors: Optional[Dict[str, Behaviors]] = None
+    behaviors: Dict[str, Behaviors]
diff --git a/src/cloudflare/types/zero_trust/risk_scoring/behaviour_update_params.py b/src/cloudflare/types/zero_trust/risk_scoring/behaviour_update_params.py
index 87299513320..6caa1e31244 100644
--- a/src/cloudflare/types/zero_trust/risk_scoring/behaviour_update_params.py
+++ b/src/cloudflare/types/zero_trust/risk_scoring/behaviour_update_params.py
@@ -9,7 +9,9 @@
 
 
 class BehaviourUpdateParams(TypedDict, total=False):
-    behaviors: Dict[str, Behaviors]
+    account_id: Required[str]
+
+    behaviors: Required[Dict[str, Behaviors]]
 
 
 class Behaviors(TypedDict, total=False):
diff --git a/src/cloudflare/types/zero_trust/risk_scoring/behaviour_update_response.py b/src/cloudflare/types/zero_trust/risk_scoring/behaviour_update_response.py
index ff2cb7b3fef..bf4b13b3235 100644
--- a/src/cloudflare/types/zero_trust/risk_scoring/behaviour_update_response.py
+++ b/src/cloudflare/types/zero_trust/risk_scoring/behaviour_update_response.py
@@ -1,6 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Dict, Optional
+from typing import Dict
 from typing_extensions import Literal
 
 from ...._models import BaseModel
@@ -9,14 +9,10 @@
 
 
 class Behaviors(BaseModel):
-    description: Optional[str] = None
+    enabled: bool
 
-    enabled: Optional[bool] = None
-
-    name: Optional[str] = None
-
-    risk_level: Optional[Literal["low", "medium", "high"]] = None
+    risk_level: Literal["low", "medium", "high"]
 
 
 class BehaviourUpdateResponse(BaseModel):
-    behaviors: Optional[Dict[str, Behaviors]] = None
+    behaviors: Dict[str, Behaviors]
diff --git a/src/cloudflare/types/zero_trust/risk_scoring/integration_create_params.py b/src/cloudflare/types/zero_trust/risk_scoring/integration_create_params.py
index 06b74f56012..e572a4b3ed1 100644
--- a/src/cloudflare/types/zero_trust/risk_scoring/integration_create_params.py
+++ b/src/cloudflare/types/zero_trust/risk_scoring/integration_create_params.py
@@ -14,7 +14,7 @@ class IntegrationCreateParams(TypedDict, total=False):
     integration_type: Required[Literal["Okta"]]
 
     tenant_url: Required[str]
-    """The base url of the tenant, e.g. "https://tenant.okta.com" """
+    """The base url of the tenant, e.g. "https://tenant.okta.com"."""
 
     reference_id: Optional[str]
     """A reference id that can be supplied by the client.
diff --git a/src/cloudflare/types/zero_trust/risk_scoring/integration_create_response.py b/src/cloudflare/types/zero_trust/risk_scoring/integration_create_response.py
index a30b33a1de8..e6155300a9a 100644
--- a/src/cloudflare/types/zero_trust/risk_scoring/integration_create_response.py
+++ b/src/cloudflare/types/zero_trust/risk_scoring/integration_create_response.py
@@ -31,11 +31,11 @@ class IntegrationCreateResponse(BaseModel):
     """
 
     tenant_url: str
-    """The base URL for the tenant. E.g. "https://tenant.okta.com" """
+    """The base URL for the tenant. E.g. "https://tenant.okta.com"."""
 
     well_known_url: str
     """The URL for the Shared Signals Framework configuration, e.g.
 
     "/.well-known/sse-configuration/{integration_uuid}/".
-    https://openid.net/specs/openid-sse-framework-1_0.html#rfc.section.6.2.1
+    https://openid.net/specs/openid-sse-framework-1_0.html#rfc.section.6.2.1.
     """
diff --git a/src/cloudflare/types/zero_trust/risk_scoring/integration_get_response.py b/src/cloudflare/types/zero_trust/risk_scoring/integration_get_response.py
index 1e4bd01fa6c..4e9508f175d 100644
--- a/src/cloudflare/types/zero_trust/risk_scoring/integration_get_response.py
+++ b/src/cloudflare/types/zero_trust/risk_scoring/integration_get_response.py
@@ -31,11 +31,11 @@ class IntegrationGetResponse(BaseModel):
     """
 
     tenant_url: str
-    """The base URL for the tenant. E.g. "https://tenant.okta.com" """
+    """The base URL for the tenant. E.g. "https://tenant.okta.com"."""
 
     well_known_url: str
     """The URL for the Shared Signals Framework configuration, e.g.
 
     "/.well-known/sse-configuration/{integration_uuid}/".
-    https://openid.net/specs/openid-sse-framework-1_0.html#rfc.section.6.2.1
+    https://openid.net/specs/openid-sse-framework-1_0.html#rfc.section.6.2.1.
     """
diff --git a/src/cloudflare/types/zero_trust/risk_scoring/integration_list_response.py b/src/cloudflare/types/zero_trust/risk_scoring/integration_list_response.py
index 870bce91672..3642abf7d19 100644
--- a/src/cloudflare/types/zero_trust/risk_scoring/integration_list_response.py
+++ b/src/cloudflare/types/zero_trust/risk_scoring/integration_list_response.py
@@ -31,11 +31,11 @@ class IntegrationListResponse(BaseModel):
     """
 
     tenant_url: str
-    """The base URL for the tenant. E.g. "https://tenant.okta.com" """
+    """The base URL for the tenant. E.g. "https://tenant.okta.com"."""
 
     well_known_url: str
     """The URL for the Shared Signals Framework configuration, e.g.
 
     "/.well-known/sse-configuration/{integration_uuid}/".
-    https://openid.net/specs/openid-sse-framework-1_0.html#rfc.section.6.2.1
+    https://openid.net/specs/openid-sse-framework-1_0.html#rfc.section.6.2.1.
     """
diff --git a/src/cloudflare/types/zero_trust/risk_scoring/integration_update_params.py b/src/cloudflare/types/zero_trust/risk_scoring/integration_update_params.py
index 82ad2a12b93..44bcbbc8308 100644
--- a/src/cloudflare/types/zero_trust/risk_scoring/integration_update_params.py
+++ b/src/cloudflare/types/zero_trust/risk_scoring/integration_update_params.py
@@ -18,7 +18,7 @@ class IntegrationUpdateParams(TypedDict, total=False):
     """
 
     tenant_url: Required[str]
-    """The base url of the tenant, e.g. "https://tenant.okta.com" """
+    """The base url of the tenant, e.g. "https://tenant.okta.com"."""
 
     reference_id: Optional[str]
     """A reference id that can be supplied by the client.
diff --git a/src/cloudflare/types/zero_trust/risk_scoring/integration_update_response.py b/src/cloudflare/types/zero_trust/risk_scoring/integration_update_response.py
index 5d084429b0c..dabf7461786 100644
--- a/src/cloudflare/types/zero_trust/risk_scoring/integration_update_response.py
+++ b/src/cloudflare/types/zero_trust/risk_scoring/integration_update_response.py
@@ -31,11 +31,11 @@ class IntegrationUpdateResponse(BaseModel):
     """
 
     tenant_url: str
-    """The base URL for the tenant. E.g. "https://tenant.okta.com" """
+    """The base URL for the tenant. E.g. "https://tenant.okta.com"."""
 
     well_known_url: str
     """The URL for the Shared Signals Framework configuration, e.g.
 
     "/.well-known/sse-configuration/{integration_uuid}/".
-    https://openid.net/specs/openid-sse-framework-1_0.html#rfc.section.6.2.1
+    https://openid.net/specs/openid-sse-framework-1_0.html#rfc.section.6.2.1.
     """
diff --git a/src/cloudflare/types/zero_trust/risk_scoring/integrations/reference_get_response.py b/src/cloudflare/types/zero_trust/risk_scoring/integrations/reference_get_response.py
index d0f79a48a3c..74c2584ce7a 100644
--- a/src/cloudflare/types/zero_trust/risk_scoring/integrations/reference_get_response.py
+++ b/src/cloudflare/types/zero_trust/risk_scoring/integrations/reference_get_response.py
@@ -31,11 +31,11 @@ class ReferenceGetResponse(BaseModel):
     """
 
     tenant_url: str
-    """The base URL for the tenant. E.g. "https://tenant.okta.com" """
+    """The base URL for the tenant. E.g. "https://tenant.okta.com"."""
 
     well_known_url: str
     """The URL for the Shared Signals Framework configuration, e.g.
 
     "/.well-known/sse-configuration/{integration_uuid}/".
-    https://openid.net/specs/openid-sse-framework-1_0.html#rfc.section.6.2.1
+    https://openid.net/specs/openid-sse-framework-1_0.html#rfc.section.6.2.1.
     """
diff --git a/src/cloudflare/types/zero_trust/risk_scoring/summary_get_params.py b/src/cloudflare/types/zero_trust/risk_scoring/summary_get_params.py
deleted file mode 100644
index 591d0359289..00000000000
--- a/src/cloudflare/types/zero_trust/risk_scoring/summary_get_params.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, TypedDict
-
-__all__ = ["SummaryGetParams"]
-
-
-class SummaryGetParams(TypedDict, total=False):
-    direction: Literal["desc", "asc"]
-
-    order_by: Literal["timestamp", "event_count", "max_risk_level"]
-
-    page: int
-
-    per_page: int
diff --git a/src/cloudflare/types/zero_trust/risk_scoring/summary_get_response.py b/src/cloudflare/types/zero_trust/risk_scoring/summary_get_response.py
index 8af39df8b36..d8140100e25 100644
--- a/src/cloudflare/types/zero_trust/risk_scoring/summary_get_response.py
+++ b/src/cloudflare/types/zero_trust/risk_scoring/summary_get_response.py
@@ -1,6 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Optional
+from typing import List
 from datetime import datetime
 from typing_extensions import Literal
 
@@ -21,8 +21,7 @@ class User(BaseModel):
     name: str
 
     user_id: str
-    """The ID for a user"""
 
 
 class SummaryGetResponse(BaseModel):
-    users: Optional[List[User]] = None
+    users: List[User]
diff --git a/src/cloudflare/types/zero_trust/risk_scoring_get_params.py b/src/cloudflare/types/zero_trust/risk_scoring_get_params.py
deleted file mode 100644
index 05adf69a3b3..00000000000
--- a/src/cloudflare/types/zero_trust/risk_scoring_get_params.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Literal, Required, TypedDict
-
-__all__ = ["RiskScoringGetParams"]
-
-
-class RiskScoringGetParams(TypedDict, total=False):
-    account_identifier: Required[str]
-    """Identifier"""
-
-    direction: Literal["desc", "asc"]
-
-    order_by: Literal["timestamp", "risk_level"]
-
-    page: int
-
-    per_page: int
diff --git a/src/cloudflare/types/zero_trust/risk_scoring_get_response.py b/src/cloudflare/types/zero_trust/risk_scoring_get_response.py
index 74c48968647..5fd47373074 100644
--- a/src/cloudflare/types/zero_trust/risk_scoring_get_response.py
+++ b/src/cloudflare/types/zero_trust/risk_scoring_get_response.py
@@ -22,12 +22,12 @@ class Event(BaseModel):
 
 
 class RiskScoringGetResponse(BaseModel):
-    email: Optional[str] = None
+    email: str
 
-    events: Optional[List[Event]] = None
+    events: List[Event]
 
-    last_reset_time: Optional[datetime] = None
+    name: str
 
-    name: Optional[str] = None
+    last_reset_time: Optional[datetime] = None
 
     risk_level: Optional[Literal["low", "medium", "high"]] = None
diff --git a/src/cloudflare/types/zero_trust/risk_scoring_reset_response.py b/src/cloudflare/types/zero_trust/risk_scoring_reset_response.py
deleted file mode 100644
index ffc6a070c07..00000000000
--- a/src/cloudflare/types/zero_trust/risk_scoring_reset_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Union, Optional
-
-__all__ = ["RiskScoringResetResponse"]
-
-RiskScoringResetResponse = Union[Optional[str], Optional[object]]
diff --git a/src/cloudflare/types/zero_trust/saml_group_rule.py b/src/cloudflare/types/zero_trust/saml_group_rule.py
deleted file mode 100644
index 62f29468875..00000000000
--- a/src/cloudflare/types/zero_trust/saml_group_rule.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-
-from ..._models import BaseModel
-
-__all__ = ["SAMLGroupRule", "SAML"]
-
-
-class SAML(BaseModel):
-    attribute_name: str
-    """The name of the SAML attribute."""
-
-    attribute_value: str
-    """The SAML attribute value to look for."""
-
-
-class SAMLGroupRule(BaseModel):
-    saml: SAML
diff --git a/src/cloudflare/types/zero_trust/saml_group_rule_param.py b/src/cloudflare/types/zero_trust/saml_group_rule_param.py
deleted file mode 100644
index 78aa37ef3a7..00000000000
--- a/src/cloudflare/types/zero_trust/saml_group_rule_param.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["SAMLGroupRuleParam", "SAML"]
-
-
-class SAML(TypedDict, total=False):
-    attribute_name: Required[str]
-    """The name of the SAML attribute."""
-
-    attribute_value: Required[str]
-    """The SAML attribute value to look for."""
-
-
-class SAMLGroupRuleParam(TypedDict, total=False):
-    saml: Required[SAML]
diff --git a/src/cloudflare/types/zero_trust/scim_config.py b/src/cloudflare/types/zero_trust/scim_config.py
deleted file mode 100644
index 625b2f12655..00000000000
--- a/src/cloudflare/types/zero_trust/scim_config.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-
-from ..._models import BaseModel
-
-__all__ = ["SCIMConfig"]
-
-
-class SCIMConfig(BaseModel):
-    enabled: Optional[bool] = None
-    """A flag to enable or disable SCIM for the identity provider."""
-
-    group_member_deprovision: Optional[bool] = None
-    """
-    A flag to revoke a user's session in Access and force a reauthentication on the
-    user's Gateway session when they have been added or removed from a group in the
-    Identity Provider.
-    """
-
-    seat_deprovision: Optional[bool] = None
-    """
-    A flag to remove a user's seat in Zero Trust when they have been deprovisioned
-    in the Identity Provider. This cannot be enabled unless user_deprovision is also
-    enabled.
-    """
-
-    secret: Optional[str] = None
-    """
-    A read-only token generated when the SCIM integration is enabled for the first
-    time. It is redacted on subsequent requests. If you lose this you will need to
-    refresh it token at /access/identity_providers/:idpID/refresh_scim_secret.
-    """
-
-    user_deprovision: Optional[bool] = None
-    """
-    A flag to enable revoking a user's session in Access and Gateway when they have
-    been deprovisioned in the Identity Provider.
-    """
diff --git a/src/cloudflare/types/zero_trust/scim_config_param.py b/src/cloudflare/types/zero_trust/scim_config_param.py
deleted file mode 100644
index 255b6cebe87..00000000000
--- a/src/cloudflare/types/zero_trust/scim_config_param.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import TypedDict
-
-__all__ = ["SCIMConfigParam"]
-
-
-class SCIMConfigParam(TypedDict, total=False):
-    enabled: bool
-    """A flag to enable or disable SCIM for the identity provider."""
-
-    group_member_deprovision: bool
-    """
-    A flag to revoke a user's session in Access and force a reauthentication on the
-    user's Gateway session when they have been added or removed from a group in the
-    Identity Provider.
-    """
-
-    seat_deprovision: bool
-    """
-    A flag to remove a user's seat in Zero Trust when they have been deprovisioned
-    in the Identity Provider. This cannot be enabled unless user_deprovision is also
-    enabled.
-    """
-
-    secret: str
-    """
-    A read-only token generated when the SCIM integration is enabled for the first
-    time. It is redacted on subsequent requests. If you lose this you will need to
-    refresh it token at /access/identity_providers/:idpID/refresh_scim_secret.
-    """
-
-    user_deprovision: bool
-    """
-    A flag to enable revoking a user's session in Access and Gateway when they have
-    been deprovisioned in the Identity Provider.
-    """
diff --git a/src/cloudflare/types/zero_trust/seat_edit_params.py b/src/cloudflare/types/zero_trust/seat_edit_params.py
index ace9d68ecfb..34e26899551 100644
--- a/src/cloudflare/types/zero_trust/seat_edit_params.py
+++ b/src/cloudflare/types/zero_trust/seat_edit_params.py
@@ -10,7 +10,7 @@
 
 class SeatEditParams(TypedDict, total=False):
     account_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     body: Required[Iterable[Body]]
 
diff --git a/src/cloudflare/types/zero_trust/seat_edit_response.py b/src/cloudflare/types/zero_trust/seat_edit_response.py
deleted file mode 100644
index a29d3feb33b..00000000000
--- a/src/cloudflare/types/zero_trust/seat_edit_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .seat import Seat
-
-__all__ = ["SeatEditResponse"]
-
-SeatEditResponse = List[Seat]
diff --git a/src/cloudflare/types/zero_trust/tunnel_create_params.py b/src/cloudflare/types/zero_trust/tunnel_create_params.py
deleted file mode 100644
index dfc1ee811cc..00000000000
--- a/src/cloudflare/types/zero_trust/tunnel_create_params.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["TunnelCreateParams"]
-
-
-class TunnelCreateParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Cloudflare account ID"""
-
-    name: Required[str]
-    """A user-friendly name for a tunnel."""
-
-    tunnel_secret: Required[str]
-    """Sets the password required to run a locally-managed tunnel.
-
-    Must be at least 32 bytes and encoded as a base64 string.
-    """
diff --git a/src/cloudflare/types/zero_trust/tunnel_create_response.py b/src/cloudflare/types/zero_trust/tunnel_create_response.py
deleted file mode 100644
index b39079e78e2..00000000000
--- a/src/cloudflare/types/zero_trust/tunnel_create_response.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from datetime import datetime
-
-from ..._models import BaseModel
-from .connection import Connection
-
-__all__ = ["TunnelCreateResponse"]
-
-
-class TunnelCreateResponse(BaseModel):
-    id: str
-    """UUID of the tunnel."""
-
-    connections: List[Connection]
-    """The tunnel connections between your origin and Cloudflare's edge."""
-
-    created_at: datetime
-    """Timestamp of when the resource was created."""
-
-    name: str
-    """A user-friendly name for a tunnel."""
-
-    deleted_at: Optional[datetime] = None
-    """Timestamp of when the resource was deleted.
-
-    If `null`, the resource has not been deleted.
-    """
diff --git a/src/cloudflare/types/zero_trust/tunnel_delete_response.py b/src/cloudflare/types/zero_trust/tunnel_delete_response.py
deleted file mode 100644
index b26adb49ef0..00000000000
--- a/src/cloudflare/types/zero_trust/tunnel_delete_response.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from datetime import datetime
-
-from ..._models import BaseModel
-from .connection import Connection
-
-__all__ = ["TunnelDeleteResponse"]
-
-
-class TunnelDeleteResponse(BaseModel):
-    id: str
-    """UUID of the tunnel."""
-
-    connections: List[Connection]
-    """The tunnel connections between your origin and Cloudflare's edge."""
-
-    created_at: datetime
-    """Timestamp of when the resource was created."""
-
-    name: str
-    """A user-friendly name for a tunnel."""
-
-    deleted_at: Optional[datetime] = None
-    """Timestamp of when the resource was deleted.
-
-    If `null`, the resource has not been deleted.
-    """
diff --git a/src/cloudflare/types/zero_trust/tunnel_edit_params.py b/src/cloudflare/types/zero_trust/tunnel_edit_params.py
deleted file mode 100644
index b8174879460..00000000000
--- a/src/cloudflare/types/zero_trust/tunnel_edit_params.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing_extensions import Required, TypedDict
-
-__all__ = ["TunnelEditParams"]
-
-
-class TunnelEditParams(TypedDict, total=False):
-    account_id: Required[str]
-    """Cloudflare account ID"""
-
-    name: str
-    """A user-friendly name for a tunnel."""
-
-    tunnel_secret: str
-    """Sets the password required to run a locally-managed tunnel.
-
-    Must be at least 32 bytes and encoded as a base64 string.
-    """
diff --git a/src/cloudflare/types/zero_trust/tunnel_edit_response.py b/src/cloudflare/types/zero_trust/tunnel_edit_response.py
deleted file mode 100644
index 6e910203a04..00000000000
--- a/src/cloudflare/types/zero_trust/tunnel_edit_response.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union, Optional
-from datetime import datetime
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-from ..shared.cloudflare_tunnel import CloudflareTunnel
-
-__all__ = ["TunnelEditResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"]
-
-
-class TunnelWARPConnectorTunnelConnection(BaseModel):
-    id: Optional[str] = None
-    """UUID of the Cloudflare Tunnel connection."""
-
-    client_id: Optional[str] = None
-    """UUID of the Cloudflare Tunnel connector."""
-
-    client_version: Optional[str] = None
-    """The cloudflared version used to establish this connection."""
-
-    colo_name: Optional[str] = None
-    """The Cloudflare data center used for this connection."""
-
-    is_pending_reconnect: Optional[bool] = None
-    """
-    Cloudflare continues to track connections for several minutes after they
-    disconnect. This is an optimization to improve latency and reliability of
-    reconnecting. If `true`, the connection has disconnected but is still being
-    tracked. If `false`, the connection is actively serving traffic.
-    """
-
-    opened_at: Optional[datetime] = None
-    """Timestamp of when the connection was established."""
-
-    origin_ip: Optional[str] = None
-    """The public IP address of the host running cloudflared."""
-
-    uuid: Optional[str] = None
-    """UUID of the Cloudflare Tunnel connection."""
-
-
-class TunnelWARPConnectorTunnel(BaseModel):
-    id: Optional[str] = None
-    """UUID of the tunnel."""
-
-    account_tag: Optional[str] = None
-    """Cloudflare account ID"""
-
-    connections: Optional[List[TunnelWARPConnectorTunnelConnection]] = None
-    """The Cloudflare Tunnel connections between your origin and Cloudflare's edge."""
-
-    conns_active_at: Optional[datetime] = None
-    """
-    Timestamp of when the tunnel established at least one connection to Cloudflare's
-    edge. If `null`, the tunnel is inactive.
-    """
-
-    conns_inactive_at: Optional[datetime] = None
-    """
-    Timestamp of when the tunnel became inactive (no connections to Cloudflare's
-    edge). If `null`, the tunnel is active.
-    """
-
-    created_at: Optional[datetime] = None
-    """Timestamp of when the resource was created."""
-
-    deleted_at: Optional[datetime] = None
-    """Timestamp of when the resource was deleted.
-
-    If `null`, the resource has not been deleted.
-    """
-
-    metadata: Optional[object] = None
-    """Metadata associated with the tunnel."""
-
-    name: Optional[str] = None
-    """A user-friendly name for a tunnel."""
-
-    status: Optional[Literal["inactive", "degraded", "healthy", "down"]] = None
-    """The status of the tunnel.
-
-    Valid values are `inactive` (tunnel has never been run), `degraded` (tunnel is
-    active and able to serve traffic but in an unhealthy state), `healthy` (tunnel
-    is active and able to serve traffic), or `down` (tunnel can not serve traffic as
-    it has no connections to the Cloudflare Edge).
-    """
-
-    tun_type: Optional[Literal["cfd_tunnel", "warp_connector", "ip_sec", "gre", "cni"]] = None
-    """The type of tunnel."""
-
-
-TunnelEditResponse = Union[CloudflareTunnel, TunnelWARPConnectorTunnel]
diff --git a/src/cloudflare/types/zero_trust/tunnel_get_response.py b/src/cloudflare/types/zero_trust/tunnel_get_response.py
deleted file mode 100644
index 58be38689ff..00000000000
--- a/src/cloudflare/types/zero_trust/tunnel_get_response.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Optional
-from datetime import datetime
-
-from ..._models import BaseModel
-from .connection import Connection
-
-__all__ = ["TunnelGetResponse"]
-
-
-class TunnelGetResponse(BaseModel):
-    id: str
-    """UUID of the tunnel."""
-
-    connections: List[Connection]
-    """The tunnel connections between your origin and Cloudflare's edge."""
-
-    created_at: datetime
-    """Timestamp of when the resource was created."""
-
-    name: str
-    """A user-friendly name for a tunnel."""
-
-    deleted_at: Optional[datetime] = None
-    """Timestamp of when the resource was deleted.
-
-    If `null`, the resource has not been deleted.
-    """
diff --git a/src/cloudflare/types/zero_trust/tunnel_list_params.py b/src/cloudflare/types/zero_trust/tunnel_list_params.py
index 82934968056..cd805857059 100644
--- a/src/cloudflare/types/zero_trust/tunnel_list_params.py
+++ b/src/cloudflare/types/zero_trust/tunnel_list_params.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Union
+from typing import List, Union
 from datetime import datetime
 from typing_extensions import Literal, Required, Annotated, TypedDict
 
@@ -17,10 +17,10 @@ class TunnelListParams(TypedDict, total=False):
 
     exclude_prefix: str
 
-    existed_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    existed_at: str
     """
-    If provided, include only tunnels that were created (and not deleted) before
-    this time.
+    If provided, include only resources that were created (and not deleted) before
+    this time. URL encoded.
     """
 
     include_prefix: str
@@ -49,8 +49,8 @@ class TunnelListParams(TypedDict, total=False):
     it has no connections to the Cloudflare Edge).
     """
 
-    tun_types: str
-    """The types of tunnels to filter separated by a comma."""
+    tun_types: List[Literal["cfd_tunnel", "warp_connector", "warp", "magic", "ip_sec", "gre", "cni"]]
+    """The types of tunnels to filter by, separated by commas."""
 
     uuid: str
     """UUID of the tunnel."""
diff --git a/src/cloudflare/types/zero_trust/tunnel_list_response.py b/src/cloudflare/types/zero_trust/tunnel_list_response.py
index 60b42e47af8..691e2bc77d7 100644
--- a/src/cloudflare/types/zero_trust/tunnel_list_response.py
+++ b/src/cloudflare/types/zero_trust/tunnel_list_response.py
@@ -2,7 +2,7 @@
 
 from typing import List, Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from ..._models import BaseModel
 from ..shared.cloudflare_tunnel import CloudflareTunnel
@@ -42,6 +42,8 @@ class TunnelWARPConnectorTunnelConnection(BaseModel):
 
 
 class TunnelWARPConnectorTunnel(BaseModel):
+    """A Warp Connector Tunnel that connects your origin to Cloudflare's edge."""
+
     id: Optional[str] = None
     """UUID of the tunnel."""
 
@@ -87,8 +89,8 @@ class TunnelWARPConnectorTunnel(BaseModel):
     it has no connections to the Cloudflare Edge).
     """
 
-    tun_type: Optional[Literal["cfd_tunnel", "warp_connector", "ip_sec", "gre", "cni"]] = None
+    tun_type: Optional[Literal["cfd_tunnel", "warp_connector", "warp", "magic", "ip_sec", "gre", "cni"]] = None
     """The type of tunnel."""
 
 
-TunnelListResponse = Union[CloudflareTunnel, TunnelWARPConnectorTunnel]
+TunnelListResponse: TypeAlias = Union[CloudflareTunnel, TunnelWARPConnectorTunnel]
diff --git a/src/cloudflare/types/zero_trust/tunnels/__init__.py b/src/cloudflare/types/zero_trust/tunnels/__init__.py
index 7b1c7d4263f..5ce246adbf6 100644
--- a/src/cloudflare/types/zero_trust/tunnels/__init__.py
+++ b/src/cloudflare/types/zero_trust/tunnels/__init__.py
@@ -2,12 +2,14 @@
 
 from __future__ import annotations
 
-from .client import Client as Client
-from .token_get_response import TokenGetResponse as TokenGetResponse
-from .connection_get_response import ConnectionGetResponse as ConnectionGetResponse
-from .management_create_params import ManagementCreateParams as ManagementCreateParams
-from .configuration_get_response import ConfigurationGetResponse as ConfigurationGetResponse
-from .connection_delete_response import ConnectionDeleteResponse as ConnectionDeleteResponse
-from .management_create_response import ManagementCreateResponse as ManagementCreateResponse
-from .configuration_update_params import ConfigurationUpdateParams as ConfigurationUpdateParams
-from .configuration_update_response import ConfigurationUpdateResponse as ConfigurationUpdateResponse
+from .cloudflared_edit_params import CloudflaredEditParams as CloudflaredEditParams
+from .cloudflared_list_params import CloudflaredListParams as CloudflaredListParams
+from .cloudflared_create_params import CloudflaredCreateParams as CloudflaredCreateParams
+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_edit_response import WARPConnectorEditResponse as WARPConnectorEditResponse
+from .warp_connector_list_response import WARPConnectorListResponse as WARPConnectorListResponse
+from .warp_connector_create_response import WARPConnectorCreateResponse as WARPConnectorCreateResponse
+from .warp_connector_delete_response import WARPConnectorDeleteResponse as WARPConnectorDeleteResponse
diff --git a/src/cloudflare/types/zero_trust/tunnels/cloudflared/__init__.py b/src/cloudflare/types/zero_trust/tunnels/cloudflared/__init__.py
new file mode 100644
index 00000000000..7a1a419e61d
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/tunnels/cloudflared/__init__.py
@@ -0,0 +1,12 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .client import Client as Client
+from .token_get_response import TokenGetResponse as TokenGetResponse
+from .connection_delete_params import ConnectionDeleteParams as ConnectionDeleteParams
+from .management_create_params import ManagementCreateParams as ManagementCreateParams
+from .configuration_get_response import ConfigurationGetResponse as ConfigurationGetResponse
+from .management_create_response import ManagementCreateResponse as ManagementCreateResponse
+from .configuration_update_params import ConfigurationUpdateParams as ConfigurationUpdateParams
+from .configuration_update_response import ConfigurationUpdateResponse as ConfigurationUpdateResponse
diff --git a/src/cloudflare/types/zero_trust/tunnels/client.py b/src/cloudflare/types/zero_trust/tunnels/cloudflared/client.py
similarity index 93%
rename from src/cloudflare/types/zero_trust/tunnels/client.py
rename to src/cloudflare/types/zero_trust/tunnels/cloudflared/client.py
index 2e8e5b973fc..a0871755d2a 100644
--- a/src/cloudflare/types/zero_trust/tunnels/client.py
+++ b/src/cloudflare/types/zero_trust/tunnels/cloudflared/client.py
@@ -3,7 +3,7 @@
 from typing import List, Optional
 from datetime import datetime
 
-from ...._models import BaseModel
+from ....._models import BaseModel
 
 __all__ = ["Client", "Conn"]
 
@@ -40,6 +40,10 @@ class Conn(BaseModel):
 
 
 class Client(BaseModel):
+    """
+    A client (typically cloudflared) that maintains connections to a Cloudflare data center.
+    """
+
     id: Optional[str] = None
     """UUID of the Cloudflare Tunnel connection."""
 
diff --git a/src/cloudflare/types/zero_trust/tunnels/cloudflared/configuration_get_response.py b/src/cloudflare/types/zero_trust/tunnels/cloudflared/configuration_get_response.py
new file mode 100644
index 00000000000..2225891dfbc
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/tunnels/cloudflared/configuration_get_response.py
@@ -0,0 +1,282 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = [
+    "ConfigurationGetResponse",
+    "Config",
+    "ConfigIngress",
+    "ConfigIngressOriginRequest",
+    "ConfigIngressOriginRequestAccess",
+    "ConfigOriginRequest",
+    "ConfigOriginRequestAccess",
+]
+
+
+class ConfigIngressOriginRequestAccess(BaseModel):
+    """
+    For all L7 requests to this hostname, cloudflared will validate each request's Cf-Access-Jwt-Assertion request header.
+    """
+
+    aud_tag: List[str] = FieldInfo(alias="audTag")
+    """Access applications that are allowed to reach this hostname for this Tunnel.
+
+    Audience tags can be identified in the dashboard or via the List Access policies
+    API.
+    """
+
+    team_name: str = FieldInfo(alias="teamName")
+
+    required: Optional[bool] = None
+    """Deny traffic that has not fulfilled Access authorization."""
+
+
+class ConfigIngressOriginRequest(BaseModel):
+    """
+    Configuration parameters for the public hostname specific connection settings between cloudflared and origin server.
+    """
+
+    access: Optional[ConfigIngressOriginRequestAccess] = None
+    """
+    For all L7 requests to this hostname, cloudflared will validate each request's
+    Cf-Access-Jwt-Assertion request header.
+    """
+
+    ca_pool: Optional[str] = FieldInfo(alias="caPool", default=None)
+    """Path to the certificate authority (CA) for the certificate of your origin.
+
+    This option should be used only if your certificate is not signed by Cloudflare.
+    """
+
+    connect_timeout: Optional[int] = FieldInfo(alias="connectTimeout", default=None)
+    """Timeout for establishing a new TCP connection to your origin server.
+
+    This excludes the time taken to establish TLS, which is controlled by
+    tlsTimeout.
+    """
+
+    disable_chunked_encoding: Optional[bool] = FieldInfo(alias="disableChunkedEncoding", default=None)
+    """Disables chunked transfer encoding. Useful if you are running a WSGI server."""
+
+    http2_origin: Optional[bool] = FieldInfo(alias="http2Origin", default=None)
+    """Attempt to connect to origin using HTTP2. Origin must be configured as https."""
+
+    http_host_header: Optional[str] = FieldInfo(alias="httpHostHeader", default=None)
+    """Sets the HTTP Host header on requests sent to the local service."""
+
+    keep_alive_connections: Optional[int] = FieldInfo(alias="keepAliveConnections", default=None)
+    """Maximum number of idle keepalive connections between Tunnel and your origin.
+
+    This does not restrict the total number of concurrent connections.
+    """
+
+    keep_alive_timeout: Optional[int] = FieldInfo(alias="keepAliveTimeout", default=None)
+    """Timeout after which an idle keepalive connection can be discarded."""
+
+    match_sn_ito_host: Optional[bool] = FieldInfo(alias="matchSNItoHost", default=None)
+    """Auto configure the Hostname on the origin server certificate."""
+
+    no_happy_eyeballs: Optional[bool] = FieldInfo(alias="noHappyEyeballs", default=None)
+    """
+    Disable the “happy eyeballs” algorithm for IPv4/IPv6 fallback if your local
+    network has misconfigured one of the protocols.
+    """
+
+    no_tls_verify: Optional[bool] = FieldInfo(alias="noTLSVerify", default=None)
+    """Disables TLS verification of the certificate presented by your origin.
+
+    Will allow any certificate from the origin to be accepted.
+    """
+
+    origin_server_name: Optional[str] = FieldInfo(alias="originServerName", default=None)
+    """Hostname that cloudflared should expect from your origin server certificate."""
+
+    proxy_type: Optional[str] = FieldInfo(alias="proxyType", default=None)
+    """
+    cloudflared starts a proxy server to translate HTTP traffic into TCP when
+    proxying, for example, SSH or RDP. This configures what type of proxy will be
+    started. Valid options are: "" for the regular proxy and "socks" for a SOCKS5
+    proxy.
+    """
+
+    tcp_keep_alive: Optional[int] = FieldInfo(alias="tcpKeepAlive", default=None)
+    """
+    The timeout after which a TCP keepalive packet is sent on a connection between
+    Tunnel and the origin server.
+    """
+
+    tls_timeout: Optional[int] = FieldInfo(alias="tlsTimeout", default=None)
+    """
+    Timeout for completing a TLS handshake to your origin server, if you have chosen
+    to connect Tunnel to an HTTPS server.
+    """
+
+
+class ConfigIngress(BaseModel):
+    """Public hostname"""
+
+    hostname: str
+    """Public hostname for this service."""
+
+    service: str
+    """Protocol and address of destination server.
+
+    Supported protocols: http://, https://, unix://, tcp://, ssh://, rdp://,
+    unix+tls://, smb://. Alternatively can return a HTTP status code
+    http_status:[code] e.g. 'http_status:404'.
+    """
+
+    origin_request: Optional[ConfigIngressOriginRequest] = FieldInfo(alias="originRequest", default=None)
+    """
+    Configuration parameters for the public hostname specific connection settings
+    between cloudflared and origin server.
+    """
+
+    path: Optional[str] = None
+    """Requests with this path route to this public hostname."""
+
+
+class ConfigOriginRequestAccess(BaseModel):
+    """
+    For all L7 requests to this hostname, cloudflared will validate each request's Cf-Access-Jwt-Assertion request header.
+    """
+
+    aud_tag: List[str] = FieldInfo(alias="audTag")
+    """Access applications that are allowed to reach this hostname for this Tunnel.
+
+    Audience tags can be identified in the dashboard or via the List Access policies
+    API.
+    """
+
+    team_name: str = FieldInfo(alias="teamName")
+
+    required: Optional[bool] = None
+    """Deny traffic that has not fulfilled Access authorization."""
+
+
+class ConfigOriginRequest(BaseModel):
+    """
+    Configuration parameters for the public hostname specific connection settings between cloudflared and origin server.
+    """
+
+    access: Optional[ConfigOriginRequestAccess] = None
+    """
+    For all L7 requests to this hostname, cloudflared will validate each request's
+    Cf-Access-Jwt-Assertion request header.
+    """
+
+    ca_pool: Optional[str] = FieldInfo(alias="caPool", default=None)
+    """Path to the certificate authority (CA) for the certificate of your origin.
+
+    This option should be used only if your certificate is not signed by Cloudflare.
+    """
+
+    connect_timeout: Optional[int] = FieldInfo(alias="connectTimeout", default=None)
+    """Timeout for establishing a new TCP connection to your origin server.
+
+    This excludes the time taken to establish TLS, which is controlled by
+    tlsTimeout.
+    """
+
+    disable_chunked_encoding: Optional[bool] = FieldInfo(alias="disableChunkedEncoding", default=None)
+    """Disables chunked transfer encoding. Useful if you are running a WSGI server."""
+
+    http2_origin: Optional[bool] = FieldInfo(alias="http2Origin", default=None)
+    """Attempt to connect to origin using HTTP2. Origin must be configured as https."""
+
+    http_host_header: Optional[str] = FieldInfo(alias="httpHostHeader", default=None)
+    """Sets the HTTP Host header on requests sent to the local service."""
+
+    keep_alive_connections: Optional[int] = FieldInfo(alias="keepAliveConnections", default=None)
+    """Maximum number of idle keepalive connections between Tunnel and your origin.
+
+    This does not restrict the total number of concurrent connections.
+    """
+
+    keep_alive_timeout: Optional[int] = FieldInfo(alias="keepAliveTimeout", default=None)
+    """Timeout after which an idle keepalive connection can be discarded."""
+
+    match_sn_ito_host: Optional[bool] = FieldInfo(alias="matchSNItoHost", default=None)
+    """Auto configure the Hostname on the origin server certificate."""
+
+    no_happy_eyeballs: Optional[bool] = FieldInfo(alias="noHappyEyeballs", default=None)
+    """
+    Disable the “happy eyeballs” algorithm for IPv4/IPv6 fallback if your local
+    network has misconfigured one of the protocols.
+    """
+
+    no_tls_verify: Optional[bool] = FieldInfo(alias="noTLSVerify", default=None)
+    """Disables TLS verification of the certificate presented by your origin.
+
+    Will allow any certificate from the origin to be accepted.
+    """
+
+    origin_server_name: Optional[str] = FieldInfo(alias="originServerName", default=None)
+    """Hostname that cloudflared should expect from your origin server certificate."""
+
+    proxy_type: Optional[str] = FieldInfo(alias="proxyType", default=None)
+    """
+    cloudflared starts a proxy server to translate HTTP traffic into TCP when
+    proxying, for example, SSH or RDP. This configures what type of proxy will be
+    started. Valid options are: "" for the regular proxy and "socks" for a SOCKS5
+    proxy.
+    """
+
+    tcp_keep_alive: Optional[int] = FieldInfo(alias="tcpKeepAlive", default=None)
+    """
+    The timeout after which a TCP keepalive packet is sent on a connection between
+    Tunnel and the origin server.
+    """
+
+    tls_timeout: Optional[int] = FieldInfo(alias="tlsTimeout", default=None)
+    """
+    Timeout for completing a TLS handshake to your origin server, if you have chosen
+    to connect Tunnel to an HTTPS server.
+    """
+
+
+class Config(BaseModel):
+    """The tunnel configuration and ingress rules."""
+
+    ingress: Optional[List[ConfigIngress]] = None
+    """List of public hostname definitions.
+
+    At least one ingress rule needs to be defined for the tunnel.
+    """
+
+    origin_request: Optional[ConfigOriginRequest] = FieldInfo(alias="originRequest", default=None)
+    """
+    Configuration parameters for the public hostname specific connection settings
+    between cloudflared and origin server.
+    """
+
+
+class ConfigurationGetResponse(BaseModel):
+    """Cloudflare Tunnel configuration"""
+
+    account_id: Optional[str] = None
+    """Identifier."""
+
+    config: Optional[Config] = None
+    """The tunnel configuration and ingress rules."""
+
+    created_at: Optional[datetime] = None
+
+    source: Optional[Literal["local", "cloudflare"]] = None
+    """Indicates if this is a locally or remotely configured tunnel.
+
+    If `local`, manage the tunnel using a YAML file on the origin machine. If
+    `cloudflare`, manage the tunnel's configuration on the Zero Trust dashboard.
+    """
+
+    tunnel_id: Optional[str] = None
+    """UUID of the tunnel."""
+
+    version: Optional[int] = None
+    """The version of the Tunnel Configuration."""
diff --git a/src/cloudflare/types/zero_trust/tunnels/configuration_update_params.py b/src/cloudflare/types/zero_trust/tunnels/cloudflared/configuration_update_params.py
similarity index 86%
rename from src/cloudflare/types/zero_trust/tunnels/configuration_update_params.py
rename to src/cloudflare/types/zero_trust/tunnels/cloudflared/configuration_update_params.py
index d01c0015e5c..a1a79a2a334 100644
--- a/src/cloudflare/types/zero_trust/tunnels/configuration_update_params.py
+++ b/src/cloudflare/types/zero_trust/tunnels/cloudflared/configuration_update_params.py
@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
-from typing import List, Iterable
+from typing import Iterable
 from typing_extensions import Required, Annotated, TypedDict
 
-from ...._utils import PropertyInfo
+from ....._types import SequenceNotStr
+from ....._utils import PropertyInfo
 
 __all__ = [
     "ConfigurationUpdateParams",
@@ -15,20 +16,23 @@
     "ConfigIngressOriginRequestAccess",
     "ConfigOriginRequest",
     "ConfigOriginRequestAccess",
-    "ConfigWARPRouting",
 ]
 
 
 class ConfigurationUpdateParams(TypedDict, total=False):
     account_id: Required[str]
-    """Cloudflare account ID"""
+    """Identifier."""
 
     config: Config
     """The tunnel configuration and ingress rules."""
 
 
 class ConfigIngressOriginRequestAccess(TypedDict, total=False):
-    aud_tag: Required[Annotated[List[str], PropertyInfo(alias="audTag")]]
+    """
+    For all L7 requests to this hostname, cloudflared will validate each request's Cf-Access-Jwt-Assertion request header.
+    """
+
+    aud_tag: Required[Annotated[SequenceNotStr[str], PropertyInfo(alias="audTag")]]
     """Access applications that are allowed to reach this hostname for this Tunnel.
 
     Audience tags can be identified in the dashboard or via the List Access policies
@@ -42,6 +46,10 @@ class ConfigIngressOriginRequestAccess(TypedDict, total=False):
 
 
 class ConfigIngressOriginRequest(TypedDict, total=False):
+    """
+    Configuration parameters for the public hostname specific connection settings between cloudflared and origin server.
+    """
+
     access: ConfigIngressOriginRequestAccess
     """
     For all L7 requests to this hostname, cloudflared will validate each request's
@@ -79,6 +87,9 @@ class ConfigIngressOriginRequest(TypedDict, total=False):
     keep_alive_timeout: Annotated[int, PropertyInfo(alias="keepAliveTimeout")]
     """Timeout after which an idle keepalive connection can be discarded."""
 
+    match_sn_ito_host: Annotated[bool, PropertyInfo(alias="matchSNItoHost")]
+    """Auto configure the Hostname on the origin server certificate."""
+
     no_happy_eyeballs: Annotated[bool, PropertyInfo(alias="noHappyEyeballs")]
     """
     Disable the “happy eyeballs” algorithm for IPv4/IPv6 fallback if your local
@@ -116,6 +127,8 @@ class ConfigIngressOriginRequest(TypedDict, total=False):
 
 
 class ConfigIngress(TypedDict, total=False):
+    """Public hostname"""
+
     hostname: Required[str]
     """Public hostname for this service."""
 
@@ -138,7 +151,11 @@ class ConfigIngress(TypedDict, total=False):
 
 
 class ConfigOriginRequestAccess(TypedDict, total=False):
-    aud_tag: Required[Annotated[List[str], PropertyInfo(alias="audTag")]]
+    """
+    For all L7 requests to this hostname, cloudflared will validate each request's Cf-Access-Jwt-Assertion request header.
+    """
+
+    aud_tag: Required[Annotated[SequenceNotStr[str], PropertyInfo(alias="audTag")]]
     """Access applications that are allowed to reach this hostname for this Tunnel.
 
     Audience tags can be identified in the dashboard or via the List Access policies
@@ -152,6 +169,10 @@ class ConfigOriginRequestAccess(TypedDict, total=False):
 
 
 class ConfigOriginRequest(TypedDict, total=False):
+    """
+    Configuration parameters for the public hostname specific connection settings between cloudflared and origin server.
+    """
+
     access: ConfigOriginRequestAccess
     """
     For all L7 requests to this hostname, cloudflared will validate each request's
@@ -189,6 +210,9 @@ class ConfigOriginRequest(TypedDict, total=False):
     keep_alive_timeout: Annotated[int, PropertyInfo(alias="keepAliveTimeout")]
     """Timeout after which an idle keepalive connection can be discarded."""
 
+    match_sn_ito_host: Annotated[bool, PropertyInfo(alias="matchSNItoHost")]
+    """Auto configure the Hostname on the origin server certificate."""
+
     no_happy_eyeballs: Annotated[bool, PropertyInfo(alias="noHappyEyeballs")]
     """
     Disable the “happy eyeballs” algorithm for IPv4/IPv6 fallback if your local
@@ -225,19 +249,17 @@ class ConfigOriginRequest(TypedDict, total=False):
     """
 
 
-class ConfigWARPRouting(TypedDict, total=False):
-    enabled: bool
-
-
 class Config(TypedDict, total=False):
+    """The tunnel configuration and ingress rules."""
+
     ingress: Iterable[ConfigIngress]
-    """List of public hostname definitions"""
+    """List of public hostname definitions.
+
+    At least one ingress rule needs to be defined for the tunnel.
+    """
 
     origin_request: Annotated[ConfigOriginRequest, PropertyInfo(alias="originRequest")]
     """
     Configuration parameters for the public hostname specific connection settings
     between cloudflared and origin server.
     """
-
-    warp_routing: Annotated[ConfigWARPRouting, PropertyInfo(alias="warp-routing")]
-    """Enable private network access from WARP users to private network routes"""
diff --git a/src/cloudflare/types/zero_trust/tunnels/cloudflared/configuration_update_response.py b/src/cloudflare/types/zero_trust/tunnels/cloudflared/configuration_update_response.py
new file mode 100644
index 00000000000..a691b32d7a6
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/tunnels/cloudflared/configuration_update_response.py
@@ -0,0 +1,282 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from pydantic import Field as FieldInfo
+
+from ....._models import BaseModel
+
+__all__ = [
+    "ConfigurationUpdateResponse",
+    "Config",
+    "ConfigIngress",
+    "ConfigIngressOriginRequest",
+    "ConfigIngressOriginRequestAccess",
+    "ConfigOriginRequest",
+    "ConfigOriginRequestAccess",
+]
+
+
+class ConfigIngressOriginRequestAccess(BaseModel):
+    """
+    For all L7 requests to this hostname, cloudflared will validate each request's Cf-Access-Jwt-Assertion request header.
+    """
+
+    aud_tag: List[str] = FieldInfo(alias="audTag")
+    """Access applications that are allowed to reach this hostname for this Tunnel.
+
+    Audience tags can be identified in the dashboard or via the List Access policies
+    API.
+    """
+
+    team_name: str = FieldInfo(alias="teamName")
+
+    required: Optional[bool] = None
+    """Deny traffic that has not fulfilled Access authorization."""
+
+
+class ConfigIngressOriginRequest(BaseModel):
+    """
+    Configuration parameters for the public hostname specific connection settings between cloudflared and origin server.
+    """
+
+    access: Optional[ConfigIngressOriginRequestAccess] = None
+    """
+    For all L7 requests to this hostname, cloudflared will validate each request's
+    Cf-Access-Jwt-Assertion request header.
+    """
+
+    ca_pool: Optional[str] = FieldInfo(alias="caPool", default=None)
+    """Path to the certificate authority (CA) for the certificate of your origin.
+
+    This option should be used only if your certificate is not signed by Cloudflare.
+    """
+
+    connect_timeout: Optional[int] = FieldInfo(alias="connectTimeout", default=None)
+    """Timeout for establishing a new TCP connection to your origin server.
+
+    This excludes the time taken to establish TLS, which is controlled by
+    tlsTimeout.
+    """
+
+    disable_chunked_encoding: Optional[bool] = FieldInfo(alias="disableChunkedEncoding", default=None)
+    """Disables chunked transfer encoding. Useful if you are running a WSGI server."""
+
+    http2_origin: Optional[bool] = FieldInfo(alias="http2Origin", default=None)
+    """Attempt to connect to origin using HTTP2. Origin must be configured as https."""
+
+    http_host_header: Optional[str] = FieldInfo(alias="httpHostHeader", default=None)
+    """Sets the HTTP Host header on requests sent to the local service."""
+
+    keep_alive_connections: Optional[int] = FieldInfo(alias="keepAliveConnections", default=None)
+    """Maximum number of idle keepalive connections between Tunnel and your origin.
+
+    This does not restrict the total number of concurrent connections.
+    """
+
+    keep_alive_timeout: Optional[int] = FieldInfo(alias="keepAliveTimeout", default=None)
+    """Timeout after which an idle keepalive connection can be discarded."""
+
+    match_sn_ito_host: Optional[bool] = FieldInfo(alias="matchSNItoHost", default=None)
+    """Auto configure the Hostname on the origin server certificate."""
+
+    no_happy_eyeballs: Optional[bool] = FieldInfo(alias="noHappyEyeballs", default=None)
+    """
+    Disable the “happy eyeballs” algorithm for IPv4/IPv6 fallback if your local
+    network has misconfigured one of the protocols.
+    """
+
+    no_tls_verify: Optional[bool] = FieldInfo(alias="noTLSVerify", default=None)
+    """Disables TLS verification of the certificate presented by your origin.
+
+    Will allow any certificate from the origin to be accepted.
+    """
+
+    origin_server_name: Optional[str] = FieldInfo(alias="originServerName", default=None)
+    """Hostname that cloudflared should expect from your origin server certificate."""
+
+    proxy_type: Optional[str] = FieldInfo(alias="proxyType", default=None)
+    """
+    cloudflared starts a proxy server to translate HTTP traffic into TCP when
+    proxying, for example, SSH or RDP. This configures what type of proxy will be
+    started. Valid options are: "" for the regular proxy and "socks" for a SOCKS5
+    proxy.
+    """
+
+    tcp_keep_alive: Optional[int] = FieldInfo(alias="tcpKeepAlive", default=None)
+    """
+    The timeout after which a TCP keepalive packet is sent on a connection between
+    Tunnel and the origin server.
+    """
+
+    tls_timeout: Optional[int] = FieldInfo(alias="tlsTimeout", default=None)
+    """
+    Timeout for completing a TLS handshake to your origin server, if you have chosen
+    to connect Tunnel to an HTTPS server.
+    """
+
+
+class ConfigIngress(BaseModel):
+    """Public hostname"""
+
+    hostname: str
+    """Public hostname for this service."""
+
+    service: str
+    """Protocol and address of destination server.
+
+    Supported protocols: http://, https://, unix://, tcp://, ssh://, rdp://,
+    unix+tls://, smb://. Alternatively can return a HTTP status code
+    http_status:[code] e.g. 'http_status:404'.
+    """
+
+    origin_request: Optional[ConfigIngressOriginRequest] = FieldInfo(alias="originRequest", default=None)
+    """
+    Configuration parameters for the public hostname specific connection settings
+    between cloudflared and origin server.
+    """
+
+    path: Optional[str] = None
+    """Requests with this path route to this public hostname."""
+
+
+class ConfigOriginRequestAccess(BaseModel):
+    """
+    For all L7 requests to this hostname, cloudflared will validate each request's Cf-Access-Jwt-Assertion request header.
+    """
+
+    aud_tag: List[str] = FieldInfo(alias="audTag")
+    """Access applications that are allowed to reach this hostname for this Tunnel.
+
+    Audience tags can be identified in the dashboard or via the List Access policies
+    API.
+    """
+
+    team_name: str = FieldInfo(alias="teamName")
+
+    required: Optional[bool] = None
+    """Deny traffic that has not fulfilled Access authorization."""
+
+
+class ConfigOriginRequest(BaseModel):
+    """
+    Configuration parameters for the public hostname specific connection settings between cloudflared and origin server.
+    """
+
+    access: Optional[ConfigOriginRequestAccess] = None
+    """
+    For all L7 requests to this hostname, cloudflared will validate each request's
+    Cf-Access-Jwt-Assertion request header.
+    """
+
+    ca_pool: Optional[str] = FieldInfo(alias="caPool", default=None)
+    """Path to the certificate authority (CA) for the certificate of your origin.
+
+    This option should be used only if your certificate is not signed by Cloudflare.
+    """
+
+    connect_timeout: Optional[int] = FieldInfo(alias="connectTimeout", default=None)
+    """Timeout for establishing a new TCP connection to your origin server.
+
+    This excludes the time taken to establish TLS, which is controlled by
+    tlsTimeout.
+    """
+
+    disable_chunked_encoding: Optional[bool] = FieldInfo(alias="disableChunkedEncoding", default=None)
+    """Disables chunked transfer encoding. Useful if you are running a WSGI server."""
+
+    http2_origin: Optional[bool] = FieldInfo(alias="http2Origin", default=None)
+    """Attempt to connect to origin using HTTP2. Origin must be configured as https."""
+
+    http_host_header: Optional[str] = FieldInfo(alias="httpHostHeader", default=None)
+    """Sets the HTTP Host header on requests sent to the local service."""
+
+    keep_alive_connections: Optional[int] = FieldInfo(alias="keepAliveConnections", default=None)
+    """Maximum number of idle keepalive connections between Tunnel and your origin.
+
+    This does not restrict the total number of concurrent connections.
+    """
+
+    keep_alive_timeout: Optional[int] = FieldInfo(alias="keepAliveTimeout", default=None)
+    """Timeout after which an idle keepalive connection can be discarded."""
+
+    match_sn_ito_host: Optional[bool] = FieldInfo(alias="matchSNItoHost", default=None)
+    """Auto configure the Hostname on the origin server certificate."""
+
+    no_happy_eyeballs: Optional[bool] = FieldInfo(alias="noHappyEyeballs", default=None)
+    """
+    Disable the “happy eyeballs” algorithm for IPv4/IPv6 fallback if your local
+    network has misconfigured one of the protocols.
+    """
+
+    no_tls_verify: Optional[bool] = FieldInfo(alias="noTLSVerify", default=None)
+    """Disables TLS verification of the certificate presented by your origin.
+
+    Will allow any certificate from the origin to be accepted.
+    """
+
+    origin_server_name: Optional[str] = FieldInfo(alias="originServerName", default=None)
+    """Hostname that cloudflared should expect from your origin server certificate."""
+
+    proxy_type: Optional[str] = FieldInfo(alias="proxyType", default=None)
+    """
+    cloudflared starts a proxy server to translate HTTP traffic into TCP when
+    proxying, for example, SSH or RDP. This configures what type of proxy will be
+    started. Valid options are: "" for the regular proxy and "socks" for a SOCKS5
+    proxy.
+    """
+
+    tcp_keep_alive: Optional[int] = FieldInfo(alias="tcpKeepAlive", default=None)
+    """
+    The timeout after which a TCP keepalive packet is sent on a connection between
+    Tunnel and the origin server.
+    """
+
+    tls_timeout: Optional[int] = FieldInfo(alias="tlsTimeout", default=None)
+    """
+    Timeout for completing a TLS handshake to your origin server, if you have chosen
+    to connect Tunnel to an HTTPS server.
+    """
+
+
+class Config(BaseModel):
+    """The tunnel configuration and ingress rules."""
+
+    ingress: Optional[List[ConfigIngress]] = None
+    """List of public hostname definitions.
+
+    At least one ingress rule needs to be defined for the tunnel.
+    """
+
+    origin_request: Optional[ConfigOriginRequest] = FieldInfo(alias="originRequest", default=None)
+    """
+    Configuration parameters for the public hostname specific connection settings
+    between cloudflared and origin server.
+    """
+
+
+class ConfigurationUpdateResponse(BaseModel):
+    """Cloudflare Tunnel configuration"""
+
+    account_id: Optional[str] = None
+    """Identifier."""
+
+    config: Optional[Config] = None
+    """The tunnel configuration and ingress rules."""
+
+    created_at: Optional[datetime] = None
+
+    source: Optional[Literal["local", "cloudflare"]] = None
+    """Indicates if this is a locally or remotely configured tunnel.
+
+    If `local`, manage the tunnel using a YAML file on the origin machine. If
+    `cloudflare`, manage the tunnel's configuration on the Zero Trust dashboard.
+    """
+
+    tunnel_id: Optional[str] = None
+    """UUID of the tunnel."""
+
+    version: Optional[int] = None
+    """The version of the Tunnel Configuration."""
diff --git a/src/cloudflare/types/zero_trust/tunnels/cloudflared/connection_delete_params.py b/src/cloudflare/types/zero_trust/tunnels/cloudflared/connection_delete_params.py
new file mode 100644
index 00000000000..b40d7b56a22
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/tunnels/cloudflared/connection_delete_params.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["ConnectionDeleteParams"]
+
+
+class ConnectionDeleteParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Cloudflare account ID"""
+
+    client_id: str
+    """UUID of the Cloudflare Tunnel connector."""
diff --git a/src/cloudflare/types/zero_trust/tunnels/management_create_params.py b/src/cloudflare/types/zero_trust/tunnels/cloudflared/management_create_params.py
similarity index 100%
rename from src/cloudflare/types/zero_trust/tunnels/management_create_params.py
rename to src/cloudflare/types/zero_trust/tunnels/cloudflared/management_create_params.py
diff --git a/src/cloudflare/types/zero_trust/tunnels/cloudflared/management_create_response.py b/src/cloudflare/types/zero_trust/tunnels/cloudflared/management_create_response.py
new file mode 100644
index 00000000000..674be17a9c6
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/tunnels/cloudflared/management_create_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["ManagementCreateResponse"]
+
+ManagementCreateResponse: TypeAlias = str
diff --git a/src/cloudflare/types/zero_trust/tunnels/cloudflared/token_get_response.py b/src/cloudflare/types/zero_trust/tunnels/cloudflared/token_get_response.py
new file mode 100644
index 00000000000..d520a70e730
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/tunnels/cloudflared/token_get_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["TokenGetResponse"]
+
+TokenGetResponse: TypeAlias = str
diff --git a/src/cloudflare/types/zero_trust/tunnels/cloudflared_create_params.py b/src/cloudflare/types/zero_trust/tunnels/cloudflared_create_params.py
new file mode 100644
index 00000000000..6e77f7c3e75
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/tunnels/cloudflared_create_params.py
@@ -0,0 +1,28 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+__all__ = ["CloudflaredCreateParams"]
+
+
+class CloudflaredCreateParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Cloudflare account ID"""
+
+    name: Required[str]
+    """A user-friendly name for a tunnel."""
+
+    config_src: Literal["local", "cloudflare"]
+    """Indicates if this is a locally or remotely configured tunnel.
+
+    If `local`, manage the tunnel using a YAML file on the origin machine. If
+    `cloudflare`, manage the tunnel on the Zero Trust dashboard.
+    """
+
+    tunnel_secret: str
+    """Sets the password required to run a locally-managed tunnel.
+
+    Must be at least 32 bytes and encoded as a base64 string.
+    """
diff --git a/src/cloudflare/types/zero_trust/tunnels/cloudflared_edit_params.py b/src/cloudflare/types/zero_trust/tunnels/cloudflared_edit_params.py
new file mode 100644
index 00000000000..ba11c0c1235
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/tunnels/cloudflared_edit_params.py
@@ -0,0 +1,21 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["CloudflaredEditParams"]
+
+
+class CloudflaredEditParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Cloudflare account ID"""
+
+    name: str
+    """A user-friendly name for a tunnel."""
+
+    tunnel_secret: str
+    """Sets the password required to run a locally-managed tunnel.
+
+    Must be at least 32 bytes and encoded as a base64 string.
+    """
diff --git a/src/cloudflare/types/zero_trust/tunnels/cloudflared_list_params.py b/src/cloudflare/types/zero_trust/tunnels/cloudflared_list_params.py
new file mode 100644
index 00000000000..cd8091795f0
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/tunnels/cloudflared_list_params.py
@@ -0,0 +1,57 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from datetime import datetime
+from typing_extensions import Literal, Required, Annotated, TypedDict
+
+from ...._utils import PropertyInfo
+
+__all__ = ["CloudflaredListParams"]
+
+
+class CloudflaredListParams(TypedDict, total=False):
+    account_id: Required[str]
+    """Cloudflare account ID"""
+
+    exclude_prefix: str
+
+    existed_at: str
+    """
+    If provided, include only resources that were created (and not deleted) before
+    this time. URL encoded.
+    """
+
+    include_prefix: str
+
+    is_deleted: bool
+    """If `true`, only include deleted tunnels.
+
+    If `false`, exclude deleted tunnels. If empty, all tunnels will be included.
+    """
+
+    name: str
+    """A user-friendly name for a tunnel."""
+
+    page: float
+    """Page number of paginated results."""
+
+    per_page: float
+    """Number of results to display."""
+
+    status: Literal["inactive", "degraded", "healthy", "down"]
+    """The status of the tunnel.
+
+    Valid values are `inactive` (tunnel has never been run), `degraded` (tunnel is
+    active and able to serve traffic but in an unhealthy state), `healthy` (tunnel
+    is active and able to serve traffic), or `down` (tunnel can not serve traffic as
+    it has no connections to the Cloudflare Edge).
+    """
+
+    uuid: str
+    """UUID of the tunnel."""
+
+    was_active_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+
+    was_inactive_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
diff --git a/src/cloudflare/types/zero_trust/tunnels/configuration_get_response.py b/src/cloudflare/types/zero_trust/tunnels/configuration_get_response.py
deleted file mode 100644
index c85fe4c8221..00000000000
--- a/src/cloudflare/types/zero_trust/tunnels/configuration_get_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union
-
-__all__ = ["ConfigurationGetResponse"]
-
-ConfigurationGetResponse = Union[List[object], str, object]
diff --git a/src/cloudflare/types/zero_trust/tunnels/configuration_update_response.py b/src/cloudflare/types/zero_trust/tunnels/configuration_update_response.py
deleted file mode 100644
index 122da9f590b..00000000000
--- a/src/cloudflare/types/zero_trust/tunnels/configuration_update_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union
-
-__all__ = ["ConfigurationUpdateResponse"]
-
-ConfigurationUpdateResponse = Union[List[object], str, object]
diff --git a/src/cloudflare/types/zero_trust/tunnels/connection_delete_response.py b/src/cloudflare/types/zero_trust/tunnels/connection_delete_response.py
deleted file mode 100644
index 256bbaccfc5..00000000000
--- a/src/cloudflare/types/zero_trust/tunnels/connection_delete_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union
-
-__all__ = ["ConnectionDeleteResponse"]
-
-ConnectionDeleteResponse = Union[List[object], str, object]
diff --git a/src/cloudflare/types/zero_trust/tunnels/connection_get_response.py b/src/cloudflare/types/zero_trust/tunnels/connection_get_response.py
deleted file mode 100644
index d219ccbb0be..00000000000
--- a/src/cloudflare/types/zero_trust/tunnels/connection_get_response.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List
-
-from .client import Client
-
-__all__ = ["ConnectionGetResponse"]
-
-ConnectionGetResponse = List[Client]
diff --git a/src/cloudflare/types/zero_trust/tunnels/management_create_response.py b/src/cloudflare/types/zero_trust/tunnels/management_create_response.py
deleted file mode 100644
index 703537b0981..00000000000
--- a/src/cloudflare/types/zero_trust/tunnels/management_create_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union
-
-__all__ = ["ManagementCreateResponse"]
-
-ManagementCreateResponse = Union[List[object], str, object]
diff --git a/src/cloudflare/types/zero_trust/tunnels/token_get_response.py b/src/cloudflare/types/zero_trust/tunnels/token_get_response.py
deleted file mode 100644
index ab26f35cec7..00000000000
--- a/src/cloudflare/types/zero_trust/tunnels/token_get_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import List, Union
-
-__all__ = ["TokenGetResponse"]
-
-TokenGetResponse = Union[List[object], str, object]
diff --git a/src/cloudflare/types/zero_trust/tunnels/warp_connector/__init__.py b/src/cloudflare/types/zero_trust/tunnels/warp_connector/__init__.py
new file mode 100644
index 00000000000..62ef691fccf
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/tunnels/warp_connector/__init__.py
@@ -0,0 +1,5 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .token_get_response import TokenGetResponse as TokenGetResponse
diff --git a/src/cloudflare/types/zero_trust/tunnels/warp_connector/token_get_response.py b/src/cloudflare/types/zero_trust/tunnels/warp_connector/token_get_response.py
new file mode 100644
index 00000000000..d520a70e730
--- /dev/null
+++ b/src/cloudflare/types/zero_trust/tunnels/warp_connector/token_get_response.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import TypeAlias
+
+__all__ = ["TokenGetResponse"]
+
+TokenGetResponse: TypeAlias = str
diff --git a/src/cloudflare/types/warp_connector/warp_connector_create_params.py b/src/cloudflare/types/zero_trust/tunnels/warp_connector_create_params.py
similarity index 100%
rename from src/cloudflare/types/warp_connector/warp_connector_create_params.py
rename to src/cloudflare/types/zero_trust/tunnels/warp_connector_create_params.py
diff --git a/src/cloudflare/types/warp_connector/warp_connector_create_response.py b/src/cloudflare/types/zero_trust/tunnels/warp_connector_create_response.py
similarity index 83%
rename from src/cloudflare/types/warp_connector/warp_connector_create_response.py
rename to src/cloudflare/types/zero_trust/tunnels/warp_connector_create_response.py
index 20c981ffbba..23e7fea1232 100644
--- a/src/cloudflare/types/warp_connector/warp_connector_create_response.py
+++ b/src/cloudflare/types/zero_trust/tunnels/warp_connector_create_response.py
@@ -1,16 +1,15 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Union, Optional
+from typing import List, Optional
 from datetime import datetime
 from typing_extensions import Literal
 
-from ..._models import BaseModel
-from ..shared.cloudflare_tunnel import CloudflareTunnel
+from ...._models import BaseModel
 
-__all__ = ["WARPConnectorCreateResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"]
+__all__ = ["WARPConnectorCreateResponse", "Connection"]
 
 
-class TunnelWARPConnectorTunnelConnection(BaseModel):
+class Connection(BaseModel):
     id: Optional[str] = None
     """UUID of the Cloudflare Tunnel connection."""
 
@@ -41,14 +40,16 @@ class TunnelWARPConnectorTunnelConnection(BaseModel):
     """UUID of the Cloudflare Tunnel connection."""
 
 
-class TunnelWARPConnectorTunnel(BaseModel):
+class WARPConnectorCreateResponse(BaseModel):
+    """A Warp Connector Tunnel that connects your origin to Cloudflare's edge."""
+
     id: Optional[str] = None
     """UUID of the tunnel."""
 
     account_tag: Optional[str] = None
     """Cloudflare account ID"""
 
-    connections: Optional[List[TunnelWARPConnectorTunnelConnection]] = None
+    connections: Optional[List[Connection]] = None
     """The Cloudflare Tunnel connections between your origin and Cloudflare's edge."""
 
     conns_active_at: Optional[datetime] = None
@@ -87,8 +88,5 @@ class TunnelWARPConnectorTunnel(BaseModel):
     it has no connections to the Cloudflare Edge).
     """
 
-    tun_type: Optional[Literal["cfd_tunnel", "warp_connector", "ip_sec", "gre", "cni"]] = None
+    tun_type: Optional[Literal["cfd_tunnel", "warp_connector", "warp", "magic", "ip_sec", "gre", "cni"]] = None
     """The type of tunnel."""
-
-
-WARPConnectorCreateResponse = Union[CloudflareTunnel, TunnelWARPConnectorTunnel]
diff --git a/src/cloudflare/types/warp_connector/warp_connector_delete_response.py b/src/cloudflare/types/zero_trust/tunnels/warp_connector_delete_response.py
similarity index 83%
rename from src/cloudflare/types/warp_connector/warp_connector_delete_response.py
rename to src/cloudflare/types/zero_trust/tunnels/warp_connector_delete_response.py
index 6cbd9848ac0..7e9cb7745ed 100644
--- a/src/cloudflare/types/warp_connector/warp_connector_delete_response.py
+++ b/src/cloudflare/types/zero_trust/tunnels/warp_connector_delete_response.py
@@ -1,16 +1,15 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Union, Optional
+from typing import List, Optional
 from datetime import datetime
 from typing_extensions import Literal
 
-from ..._models import BaseModel
-from ..shared.cloudflare_tunnel import CloudflareTunnel
+from ...._models import BaseModel
 
-__all__ = ["WARPConnectorDeleteResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"]
+__all__ = ["WARPConnectorDeleteResponse", "Connection"]
 
 
-class TunnelWARPConnectorTunnelConnection(BaseModel):
+class Connection(BaseModel):
     id: Optional[str] = None
     """UUID of the Cloudflare Tunnel connection."""
 
@@ -41,14 +40,16 @@ class TunnelWARPConnectorTunnelConnection(BaseModel):
     """UUID of the Cloudflare Tunnel connection."""
 
 
-class TunnelWARPConnectorTunnel(BaseModel):
+class WARPConnectorDeleteResponse(BaseModel):
+    """A Warp Connector Tunnel that connects your origin to Cloudflare's edge."""
+
     id: Optional[str] = None
     """UUID of the tunnel."""
 
     account_tag: Optional[str] = None
     """Cloudflare account ID"""
 
-    connections: Optional[List[TunnelWARPConnectorTunnelConnection]] = None
+    connections: Optional[List[Connection]] = None
     """The Cloudflare Tunnel connections between your origin and Cloudflare's edge."""
 
     conns_active_at: Optional[datetime] = None
@@ -87,8 +88,5 @@ class TunnelWARPConnectorTunnel(BaseModel):
     it has no connections to the Cloudflare Edge).
     """
 
-    tun_type: Optional[Literal["cfd_tunnel", "warp_connector", "ip_sec", "gre", "cni"]] = None
+    tun_type: Optional[Literal["cfd_tunnel", "warp_connector", "warp", "magic", "ip_sec", "gre", "cni"]] = None
     """The type of tunnel."""
-
-
-WARPConnectorDeleteResponse = Union[CloudflareTunnel, TunnelWARPConnectorTunnel]
diff --git a/src/cloudflare/types/warp_connector/warp_connector_edit_params.py b/src/cloudflare/types/zero_trust/tunnels/warp_connector_edit_params.py
similarity index 100%
rename from src/cloudflare/types/warp_connector/warp_connector_edit_params.py
rename to src/cloudflare/types/zero_trust/tunnels/warp_connector_edit_params.py
diff --git a/src/cloudflare/types/warp_connector/warp_connector_edit_response.py b/src/cloudflare/types/zero_trust/tunnels/warp_connector_edit_response.py
similarity index 83%
rename from src/cloudflare/types/warp_connector/warp_connector_edit_response.py
rename to src/cloudflare/types/zero_trust/tunnels/warp_connector_edit_response.py
index 1efce6cc9ab..6f063366634 100644
--- a/src/cloudflare/types/warp_connector/warp_connector_edit_response.py
+++ b/src/cloudflare/types/zero_trust/tunnels/warp_connector_edit_response.py
@@ -1,16 +1,15 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Union, Optional
+from typing import List, Optional
 from datetime import datetime
 from typing_extensions import Literal
 
-from ..._models import BaseModel
-from ..shared.cloudflare_tunnel import CloudflareTunnel
+from ...._models import BaseModel
 
-__all__ = ["WARPConnectorEditResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"]
+__all__ = ["WARPConnectorEditResponse", "Connection"]
 
 
-class TunnelWARPConnectorTunnelConnection(BaseModel):
+class Connection(BaseModel):
     id: Optional[str] = None
     """UUID of the Cloudflare Tunnel connection."""
 
@@ -41,14 +40,16 @@ class TunnelWARPConnectorTunnelConnection(BaseModel):
     """UUID of the Cloudflare Tunnel connection."""
 
 
-class TunnelWARPConnectorTunnel(BaseModel):
+class WARPConnectorEditResponse(BaseModel):
+    """A Warp Connector Tunnel that connects your origin to Cloudflare's edge."""
+
     id: Optional[str] = None
     """UUID of the tunnel."""
 
     account_tag: Optional[str] = None
     """Cloudflare account ID"""
 
-    connections: Optional[List[TunnelWARPConnectorTunnelConnection]] = None
+    connections: Optional[List[Connection]] = None
     """The Cloudflare Tunnel connections between your origin and Cloudflare's edge."""
 
     conns_active_at: Optional[datetime] = None
@@ -87,8 +88,5 @@ class TunnelWARPConnectorTunnel(BaseModel):
     it has no connections to the Cloudflare Edge).
     """
 
-    tun_type: Optional[Literal["cfd_tunnel", "warp_connector", "ip_sec", "gre", "cni"]] = None
+    tun_type: Optional[Literal["cfd_tunnel", "warp_connector", "warp", "magic", "ip_sec", "gre", "cni"]] = None
     """The type of tunnel."""
-
-
-WARPConnectorEditResponse = Union[CloudflareTunnel, TunnelWARPConnectorTunnel]
diff --git a/src/cloudflare/types/warp_connector/warp_connector_get_response.py b/src/cloudflare/types/zero_trust/tunnels/warp_connector_get_response.py
similarity index 83%
rename from src/cloudflare/types/warp_connector/warp_connector_get_response.py
rename to src/cloudflare/types/zero_trust/tunnels/warp_connector_get_response.py
index af11fb6dfbb..fa1075bddc8 100644
--- a/src/cloudflare/types/warp_connector/warp_connector_get_response.py
+++ b/src/cloudflare/types/zero_trust/tunnels/warp_connector_get_response.py
@@ -1,16 +1,15 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Union, Optional
+from typing import List, Optional
 from datetime import datetime
 from typing_extensions import Literal
 
-from ..._models import BaseModel
-from ..shared.cloudflare_tunnel import CloudflareTunnel
+from ...._models import BaseModel
 
-__all__ = ["WARPConnectorGetResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"]
+__all__ = ["WARPConnectorGetResponse", "Connection"]
 
 
-class TunnelWARPConnectorTunnelConnection(BaseModel):
+class Connection(BaseModel):
     id: Optional[str] = None
     """UUID of the Cloudflare Tunnel connection."""
 
@@ -41,14 +40,16 @@ class TunnelWARPConnectorTunnelConnection(BaseModel):
     """UUID of the Cloudflare Tunnel connection."""
 
 
-class TunnelWARPConnectorTunnel(BaseModel):
+class WARPConnectorGetResponse(BaseModel):
+    """A Warp Connector Tunnel that connects your origin to Cloudflare's edge."""
+
     id: Optional[str] = None
     """UUID of the tunnel."""
 
     account_tag: Optional[str] = None
     """Cloudflare account ID"""
 
-    connections: Optional[List[TunnelWARPConnectorTunnelConnection]] = None
+    connections: Optional[List[Connection]] = None
     """The Cloudflare Tunnel connections between your origin and Cloudflare's edge."""
 
     conns_active_at: Optional[datetime] = None
@@ -87,8 +88,5 @@ class TunnelWARPConnectorTunnel(BaseModel):
     it has no connections to the Cloudflare Edge).
     """
 
-    tun_type: Optional[Literal["cfd_tunnel", "warp_connector", "ip_sec", "gre", "cni"]] = None
+    tun_type: Optional[Literal["cfd_tunnel", "warp_connector", "warp", "magic", "ip_sec", "gre", "cni"]] = None
     """The type of tunnel."""
-
-
-WARPConnectorGetResponse = Union[CloudflareTunnel, TunnelWARPConnectorTunnel]
diff --git a/src/cloudflare/types/warp_connector/warp_connector_list_params.py b/src/cloudflare/types/zero_trust/tunnels/warp_connector_list_params.py
similarity index 87%
rename from src/cloudflare/types/warp_connector/warp_connector_list_params.py
rename to src/cloudflare/types/zero_trust/tunnels/warp_connector_list_params.py
index e02da6d9bed..a3b8aa866a9 100644
--- a/src/cloudflare/types/warp_connector/warp_connector_list_params.py
+++ b/src/cloudflare/types/zero_trust/tunnels/warp_connector_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__ = ["WARPConnectorListParams"]
 
@@ -17,10 +17,10 @@ class WARPConnectorListParams(TypedDict, total=False):
 
     exclude_prefix: str
 
-    existed_at: Annotated[Union[str, datetime], PropertyInfo(format="iso8601")]
+    existed_at: str
     """
-    If provided, include only tunnels that were created (and not deleted) before
-    this time.
+    If provided, include only resources that were created (and not deleted) before
+    this time. URL encoded.
     """
 
     include_prefix: str
diff --git a/src/cloudflare/types/warp_connector/warp_connector_list_response.py b/src/cloudflare/types/zero_trust/tunnels/warp_connector_list_response.py
similarity index 83%
rename from src/cloudflare/types/warp_connector/warp_connector_list_response.py
rename to src/cloudflare/types/zero_trust/tunnels/warp_connector_list_response.py
index 1412e8639ee..3859674646e 100644
--- a/src/cloudflare/types/warp_connector/warp_connector_list_response.py
+++ b/src/cloudflare/types/zero_trust/tunnels/warp_connector_list_response.py
@@ -1,16 +1,15 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Union, Optional
+from typing import List, Optional
 from datetime import datetime
 from typing_extensions import Literal
 
-from ..._models import BaseModel
-from ..shared.cloudflare_tunnel import CloudflareTunnel
+from ...._models import BaseModel
 
-__all__ = ["WARPConnectorListResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"]
+__all__ = ["WARPConnectorListResponse", "Connection"]
 
 
-class TunnelWARPConnectorTunnelConnection(BaseModel):
+class Connection(BaseModel):
     id: Optional[str] = None
     """UUID of the Cloudflare Tunnel connection."""
 
@@ -41,14 +40,16 @@ class TunnelWARPConnectorTunnelConnection(BaseModel):
     """UUID of the Cloudflare Tunnel connection."""
 
 
-class TunnelWARPConnectorTunnel(BaseModel):
+class WARPConnectorListResponse(BaseModel):
+    """A Warp Connector Tunnel that connects your origin to Cloudflare's edge."""
+
     id: Optional[str] = None
     """UUID of the tunnel."""
 
     account_tag: Optional[str] = None
     """Cloudflare account ID"""
 
-    connections: Optional[List[TunnelWARPConnectorTunnelConnection]] = None
+    connections: Optional[List[Connection]] = None
     """The Cloudflare Tunnel connections between your origin and Cloudflare's edge."""
 
     conns_active_at: Optional[datetime] = None
@@ -87,8 +88,5 @@ class TunnelWARPConnectorTunnel(BaseModel):
     it has no connections to the Cloudflare Edge).
     """
 
-    tun_type: Optional[Literal["cfd_tunnel", "warp_connector", "ip_sec", "gre", "cni"]] = None
+    tun_type: Optional[Literal["cfd_tunnel", "warp_connector", "warp", "magic", "ip_sec", "gre", "cni"]] = None
     """The type of tunnel."""
-
-
-WARPConnectorListResponse = Union[CloudflareTunnel, TunnelWARPConnectorTunnel]
diff --git a/src/cloudflare/types/zones/__init__.py b/src/cloudflare/types/zones/__init__.py
index fa271c04ce3..5288057feb0 100644
--- a/src/cloudflare/types/zones/__init__.py
+++ b/src/cloudflare/types/zones/__init__.py
@@ -12,17 +12,20 @@
 from .http2 import HTTP2 as HTTP2
 from .http3 import HTTP3 as HTTP3
 from .brotli import Brotli as Brotli
-from .minify import Minify as Minify
 from .mirage import Mirage as Mirage
 from .polish import Polish as Polish
 from .ciphers import Ciphers as Ciphers
 from .tls_1_3 import TLS1_3 as TLS1_3
 from .zero_rtt import ZeroRTT as ZeroRTT
+from .ssl_param import SSLParam as SSLParam
+from .waf_param import WAFParam as WAFParam
 from .websocket import Websocket as Websocket
 from .zone_hold import ZoneHold as ZoneHold
 from .cache_level import CacheLevel as CacheLevel
 from .early_hints import EarlyHints as EarlyHints
 from .pseudo_ipv4 import PseudoIPV4 as PseudoIPV4
+from .mirage_param import MirageParam as MirageParam
+from .polish_param import PolishParam as PolishParam
 from .advanced_ddos import AdvancedDDoS as AdvancedDDoS
 from .always_online import AlwaysOnline as AlwaysOnline
 from .browser_check import BrowserCheck as BrowserCheck
@@ -32,17 +35,18 @@
 from .ip_geolocation import IPGeolocation as IPGeolocation
 from .security_level import SecurityLevel as SecurityLevel
 from .min_tls_version import MinTLSVersion as MinTLSVersion
-from .mobile_redirect import MobileRedirect as MobileRedirect
 from .ssl_recommender import SSLRecommender as SSLRecommender
 from .tls_client_auth import TLSClientAuth as TLSClientAuth
 from .always_use_https import AlwaysUseHTTPS as AlwaysUseHTTPS
 from .development_mode import DevelopmentMode as DevelopmentMode
+from .hold_edit_params import HoldEditParams as HoldEditParams
 from .orange_to_orange import OrangeToOrange as OrangeToOrange
 from .prefetch_preload import PrefetchPreload as PrefetchPreload
 from .security_headers import SecurityHeaders as SecurityHeaders
 from .zone_edit_params import ZoneEditParams as ZoneEditParams
 from .zone_list_params import ZoneListParams as ZoneListParams
 from .browser_cache_ttl import BrowserCacheTTL as BrowserCacheTTL
+from .cache_level_param import CacheLevelParam as CacheLevelParam
 from .email_obfuscation import EmailObfuscation as EmailObfuscation
 from .h2_prioritization import H2Prioritization as H2Prioritization
 from .hold_create_params import HoldCreateParams as HoldCreateParams
@@ -51,26 +55,42 @@
 from .proxy_read_timeout import ProxyReadTimeout as ProxyReadTimeout
 from .response_buffering import ResponseBuffering as ResponseBuffering
 from .zone_create_params import ZoneCreateParams as ZoneCreateParams
+from .available_rate_plan import AvailableRatePlan as AvailableRatePlan
+from .browser_check_param import BrowserCheckParam as BrowserCheckParam
 from .opportunistic_onion import OpportunisticOnion as OpportunisticOnion
+from .rocket_loader_param import RocketLoaderParam as RocketLoaderParam
 from .setting_edit_params import SettingEditParams as SettingEditParams
+from .ip_geolocation_param import IPGeolocationParam as IPGeolocationParam
+from .security_level_param import SecurityLevelParam as SecurityLevelParam
 from .server_side_excludes import ServerSideExcludes as ServerSideExcludes
 from .setting_get_response import SettingGetResponse as SettingGetResponse
 from .zone_delete_response import ZoneDeleteResponse as ZoneDeleteResponse
 from .setting_edit_response import SettingEditResponse as SettingEditResponse
 from .true_client_ip_header import TrueClientIPHeader as TrueClientIPHeader
-from .origin_max_http_version import OriginMaxHTTPVersion as OriginMaxHTTPVersion
+from .always_use_https_param import AlwaysUseHTTPSParam as AlwaysUseHTTPSParam
+from .rate_plan_get_response import RatePlanGetResponse as RatePlanGetResponse
+from .browser_cache_ttl_param import BrowserCacheTTLParam as BrowserCacheTTLParam
+from .email_obfuscation_param import EmailObfuscationParam as EmailObfuscationParam
 from .automatic_https_rewrites import AutomaticHTTPSRewrites as AutomaticHTTPSRewrites
 from .opportunistic_encryption import OpportunisticEncryption as OpportunisticEncryption
+from .response_buffering_param import ResponseBufferingParam as ResponseBufferingParam
 from .subscription_get_response import SubscriptionGetResponse as SubscriptionGetResponse
 from .subscription_create_params import SubscriptionCreateParams as SubscriptionCreateParams
+from .subscription_update_params import SubscriptionUpdateParams as SubscriptionUpdateParams
 from .origin_error_page_pass_thru import OriginErrorPagePassThru as OriginErrorPagePassThru
 from .sort_query_string_for_cache import SortQueryStringForCache as SortQueryStringForCache
+from .true_client_ip_header_param import TrueClientIPHeaderParam as TrueClientIPHeaderParam
 from .subscription_create_response import SubscriptionCreateResponse as SubscriptionCreateResponse
+from .subscription_update_response import SubscriptionUpdateResponse as SubscriptionUpdateResponse
+from .automatic_https_rewrites_param import AutomaticHTTPSRewritesParam as AutomaticHTTPSRewritesParam
 from .custom_nameserver_get_response import CustomNameserverGetResponse as CustomNameserverGetResponse
+from .opportunistic_encryption_param import OpportunisticEncryptionParam as OpportunisticEncryptionParam
 from .automatic_platform_optimization import AutomaticPlatformOptimization as AutomaticPlatformOptimization
 from .custom_nameserver_update_params import CustomNameserverUpdateParams as CustomNameserverUpdateParams
 from .activation_check_trigger_response import ActivationCheckTriggerResponse as ActivationCheckTriggerResponse
 from .custom_nameserver_update_response import CustomNameserverUpdateResponse as CustomNameserverUpdateResponse
+from .origin_error_page_pass_thru_param import OriginErrorPagePassThruParam as OriginErrorPagePassThruParam
+from .sort_query_string_for_cache_param import SortQueryStringForCacheParam as SortQueryStringForCacheParam
 from .automatic_platform_optimization_param import (
     AutomaticPlatformOptimizationParam as AutomaticPlatformOptimizationParam,
 )
diff --git a/src/cloudflare/types/zones/activation_check_trigger_response.py b/src/cloudflare/types/zones/activation_check_trigger_response.py
index 94713b92b22..5d6a3377ec9 100644
--- a/src/cloudflare/types/zones/activation_check_trigger_response.py
+++ b/src/cloudflare/types/zones/activation_check_trigger_response.py
@@ -9,4 +9,4 @@
 
 class ActivationCheckTriggerResponse(BaseModel):
     id: Optional[str] = None
-    """Identifier"""
+    """Identifier."""
diff --git a/src/cloudflare/types/zones/advanced_ddos.py b/src/cloudflare/types/zones/advanced_ddos.py
index f9fc9f46d39..d000cb19bc7 100644
--- a/src/cloudflare/types/zones/advanced_ddos.py
+++ b/src/cloudflare/types/zones/advanced_ddos.py
@@ -10,6 +10,10 @@
 
 
 class AdvancedDDoS(BaseModel):
+    """
+    Advanced protection from Distributed Denial of Service (DDoS) attacks on your website. This is an uneditable value that is 'on' in the case of Business and Enterprise zones.
+    """
+
     id: Literal["advanced_ddos"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/always_online.py b/src/cloudflare/types/zones/always_online.py
index d37202571b6..eefa275ffda 100644
--- a/src/cloudflare/types/zones/always_online.py
+++ b/src/cloudflare/types/zones/always_online.py
@@ -10,6 +10,10 @@
 
 
 class AlwaysOnline(BaseModel):
+    """
+    When enabled, Cloudflare serves limited copies of web pages available from the [Internet Archive's Wayback Machine](https://archive.org/web/) if your server is offline. Refer to [Always Online](https://developers.cloudflare.com/cache/about/always-online) for more information.
+    """
+
     id: Literal["always_online"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/always_use_https.py b/src/cloudflare/types/zones/always_use_https.py
index 78f176711aa..5adb357001b 100644
--- a/src/cloudflare/types/zones/always_use_https.py
+++ b/src/cloudflare/types/zones/always_use_https.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -10,17 +9,8 @@
 
 
 class AlwaysUseHTTPS(BaseModel):
-    id: Literal["always_use_https"]
-    """ID of the zone setting."""
-
-    value: Literal["on", "off"]
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
+    id: Optional[Literal["always_use_https"]] = None
     """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
+    If enabled, any ` http://`` URL is converted to  `https://` through a 301
+    redirect.
     """
-
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
diff --git a/src/cloudflare/types/zones/always_use_https_param.py b/src/cloudflare/types/zones/always_use_https_param.py
new file mode 100644
index 00000000000..9853d49bf7d
--- /dev/null
+++ b/src/cloudflare/types/zones/always_use_https_param.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["AlwaysUseHTTPSParam"]
+
+
+class AlwaysUseHTTPSParam(TypedDict, total=False):
+    id: Literal["always_use_https"]
+    """
+    If enabled, any ` http://`` URL is converted to  `https://` through a 301
+    redirect.
+    """
diff --git a/src/cloudflare/types/zones/automatic_https_rewrites.py b/src/cloudflare/types/zones/automatic_https_rewrites.py
index ced7a3e50f5..d2dbfb41302 100644
--- a/src/cloudflare/types/zones/automatic_https_rewrites.py
+++ b/src/cloudflare/types/zones/automatic_https_rewrites.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -10,17 +9,8 @@
 
 
 class AutomaticHTTPSRewrites(BaseModel):
-    id: Literal["automatic_https_rewrites"]
-    """ID of the zone setting."""
+    id: Optional[Literal["automatic_https_rewrites"]] = None
+    """Turn on or off Automatic HTTPS Rewrites."""
 
-    value: Literal["on", "off"]
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
-    """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
-    """
-
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    value: Optional[Literal["on", "off"]] = None
+    """The status of Automatic HTTPS Rewrites."""
diff --git a/src/cloudflare/types/zones/automatic_https_rewrites_param.py b/src/cloudflare/types/zones/automatic_https_rewrites_param.py
new file mode 100644
index 00000000000..c5d161d3e5b
--- /dev/null
+++ b/src/cloudflare/types/zones/automatic_https_rewrites_param.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["AutomaticHTTPSRewritesParam"]
+
+
+class AutomaticHTTPSRewritesParam(TypedDict, total=False):
+    id: Literal["automatic_https_rewrites"]
+    """Turn on or off Automatic HTTPS Rewrites."""
+
+    value: Literal["on", "off"]
+    """The status of Automatic HTTPS Rewrites."""
diff --git a/src/cloudflare/types/zones/automatic_platform_optimization_param.py b/src/cloudflare/types/zones/automatic_platform_optimization_param.py
index b39664ca0e8..f434e913e27 100644
--- a/src/cloudflare/types/zones/automatic_platform_optimization_param.py
+++ b/src/cloudflare/types/zones/automatic_platform_optimization_param.py
@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Required, TypedDict
 
+from ..._types import SequenceNotStr
+
 __all__ = ["AutomaticPlatformOptimizationParam"]
 
 
@@ -22,7 +23,7 @@ class AutomaticPlatformOptimizationParam(TypedDict, total=False):
     enabled: Required[bool]
     """Indicates whether or not Automatic Platform Optimization is enabled."""
 
-    hostnames: Required[List[str]]
+    hostnames: Required[SequenceNotStr[str]]
     """
     An array of hostnames where Automatic Platform Optimization for WordPress is
     activated.
diff --git a/src/cloudflare/types/plans/available_rate_plan.py b/src/cloudflare/types/zones/available_rate_plan.py
similarity index 100%
rename from src/cloudflare/types/plans/available_rate_plan.py
rename to src/cloudflare/types/zones/available_rate_plan.py
diff --git a/src/cloudflare/types/zones/brotli.py b/src/cloudflare/types/zones/brotli.py
index 74f62f42deb..25d2f10d56a 100644
--- a/src/cloudflare/types/zones/brotli.py
+++ b/src/cloudflare/types/zones/brotli.py
@@ -10,6 +10,10 @@
 
 
 class Brotli(BaseModel):
+    """
+    When the client requesting an asset supports the Brotli compression algorithm, Cloudflare will serve a Brotli compressed version of the asset.
+    """
+
     id: Literal["brotli"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/browser_cache_ttl.py b/src/cloudflare/types/zones/browser_cache_ttl.py
index 77393c400dc..e31b91ff7ca 100644
--- a/src/cloudflare/types/zones/browser_cache_ttl.py
+++ b/src/cloudflare/types/zones/browser_cache_ttl.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -10,46 +9,11 @@
 
 
 class BrowserCacheTTL(BaseModel):
-    id: Literal["browser_cache_ttl"]
-    """ID of the zone setting."""
+    id: Optional[Literal["browser_cache_ttl"]] = None
+    """Control how long resources cached by client browsers remain valid."""
 
-    value: Literal[
-        0,
-        30,
-        60,
-        120,
-        300,
-        1200,
-        1800,
-        3600,
-        7200,
-        10800,
-        14400,
-        18000,
-        28800,
-        43200,
-        57600,
-        72000,
-        86400,
-        172800,
-        259200,
-        345600,
-        432000,
-        691200,
-        1382400,
-        2073600,
-        2678400,
-        5356800,
-        16070400,
-        31536000,
-    ]
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
+    value: Optional[int] = None
     """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
+    The number of seconds to cache resources for. Setting this to 0 enables "Respect
+    Existing Headers".
     """
-
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
diff --git a/src/cloudflare/types/zones/browser_cache_ttl_param.py b/src/cloudflare/types/zones/browser_cache_ttl_param.py
new file mode 100644
index 00000000000..ed274fa31d7
--- /dev/null
+++ b/src/cloudflare/types/zones/browser_cache_ttl_param.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["BrowserCacheTTLParam"]
+
+
+class BrowserCacheTTLParam(TypedDict, total=False):
+    id: Literal["browser_cache_ttl"]
+    """Control how long resources cached by client browsers remain valid."""
+
+    value: int
+    """
+    The number of seconds to cache resources for. Setting this to 0 enables "Respect
+    Existing Headers".
+    """
diff --git a/src/cloudflare/types/zones/browser_check.py b/src/cloudflare/types/zones/browser_check.py
index 9de5013bcaa..79c5d1e6a8b 100644
--- a/src/cloudflare/types/zones/browser_check.py
+++ b/src/cloudflare/types/zones/browser_check.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -10,17 +9,11 @@
 
 
 class BrowserCheck(BaseModel):
-    id: Literal["browser_check"]
-    """ID of the zone setting."""
-
-    value: Literal["on", "off"]
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
+    id: Optional[Literal["browser_check"]] = None
     """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
+    Inspect the visitor's browser for headers commonly associated with spammers and
+    certain bots.
     """
 
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    value: Optional[Literal["on", "off"]] = None
+    """The status of Browser Integrity Check."""
diff --git a/src/cloudflare/types/zones/browser_check_param.py b/src/cloudflare/types/zones/browser_check_param.py
new file mode 100644
index 00000000000..ffe14ebb557
--- /dev/null
+++ b/src/cloudflare/types/zones/browser_check_param.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["BrowserCheckParam"]
+
+
+class BrowserCheckParam(TypedDict, total=False):
+    id: Literal["browser_check"]
+    """
+    Inspect the visitor's browser for headers commonly associated with spammers and
+    certain bots.
+    """
+
+    value: Literal["on", "off"]
+    """The status of Browser Integrity Check."""
diff --git a/src/cloudflare/types/zones/cache_level.py b/src/cloudflare/types/zones/cache_level.py
index 7aaf4433499..06e02c2fb2d 100644
--- a/src/cloudflare/types/zones/cache_level.py
+++ b/src/cloudflare/types/zones/cache_level.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -10,17 +9,17 @@
 
 
 class CacheLevel(BaseModel):
-    id: Literal["cache_level"]
-    """ID of the zone setting."""
+    id: Optional[Literal["cache_level"]] = None
+    """Apply custom caching based on the option selected."""
 
-    value: Literal["aggressive", "basic", "simplified"]
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
+    value: Optional[Literal["bypass", "basic", "simplified", "aggressive", "cache_everything"]] = None
     """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
+    - `bypass`: Cloudflare does not cache.
+    - `basic`: Delivers resources from cache when there is no query string.
+    - `simplified`: Delivers the same resource to everyone independent of the query
+      string.
+    - `aggressive`: Caches all static content that has a query string.
+    - `cache_everything`: Treats all content as static and caches all file types
+      beyond the
+      [Cloudflare default cached content](https://developers.cloudflare.com/cache/concepts/default-cache-behavior/#default-cached-file-extensions).
     """
-
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
diff --git a/src/cloudflare/types/zones/cache_level_param.py b/src/cloudflare/types/zones/cache_level_param.py
new file mode 100644
index 00000000000..daa1406ae4b
--- /dev/null
+++ b/src/cloudflare/types/zones/cache_level_param.py
@@ -0,0 +1,24 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["CacheLevelParam"]
+
+
+class CacheLevelParam(TypedDict, total=False):
+    id: Literal["cache_level"]
+    """Apply custom caching based on the option selected."""
+
+    value: Literal["bypass", "basic", "simplified", "aggressive", "cache_everything"]
+    """
+    - `bypass`: Cloudflare does not cache.
+    - `basic`: Delivers resources from cache when there is no query string.
+    - `simplified`: Delivers the same resource to everyone independent of the query
+      string.
+    - `aggressive`: Caches all static content that has a query string.
+    - `cache_everything`: Treats all content as static and caches all file types
+      beyond the
+      [Cloudflare default cached content](https://developers.cloudflare.com/cache/concepts/default-cache-behavior/#default-cached-file-extensions).
+    """
diff --git a/src/cloudflare/types/zones/challenge_ttl.py b/src/cloudflare/types/zones/challenge_ttl.py
index c7f1057d65b..4621ef14546 100644
--- a/src/cloudflare/types/zones/challenge_ttl.py
+++ b/src/cloudflare/types/zones/challenge_ttl.py
@@ -10,6 +10,10 @@
 
 
 class ChallengeTTL(BaseModel):
+    """
+    Specify how long a visitor is allowed access to your site after successfully completing a challenge (such as a CAPTCHA). After the TTL has expired the visitor will have to complete a new challenge. We recommend a 15 - 45 minute setting and will attempt to honor any setting above 45 minutes. (https://support.cloudflare.com/hc/en-us/articles/200170136).
+    """
+
     id: Literal["challenge_ttl"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/ciphers.py b/src/cloudflare/types/zones/ciphers.py
index 90ac369b89d..40050e055d5 100644
--- a/src/cloudflare/types/zones/ciphers.py
+++ b/src/cloudflare/types/zones/ciphers.py
@@ -10,6 +10,11 @@
 
 
 class Ciphers(BaseModel):
+    """An allowlist of ciphers for TLS termination.
+
+    These ciphers must be in the BoringSSL format.
+    """
+
     id: Literal["ciphers"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/custom_nameserver_get_response.py b/src/cloudflare/types/zones/custom_nameserver_get_response.py
index e28ec99293d..bca0a41202a 100644
--- a/src/cloudflare/types/zones/custom_nameserver_get_response.py
+++ b/src/cloudflare/types/zones/custom_nameserver_get_response.py
@@ -1,7 +1,67 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing import List, Optional
+from typing_extensions import Literal
 
-__all__ = ["CustomNameserverGetResponse"]
+from ..._models import BaseModel
 
-CustomNameserverGetResponse = List[object]
+__all__ = ["CustomNameserverGetResponse", "Error", "ErrorSource", "Message", "MessageSource", "ResultInfo"]
+
+
+class ErrorSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Error(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[ErrorSource] = None
+
+
+class MessageSource(BaseModel):
+    pointer: Optional[str] = None
+
+
+class Message(BaseModel):
+    code: int
+
+    message: str
+
+    documentation_url: Optional[str] = None
+
+    source: Optional[MessageSource] = None
+
+
+class ResultInfo(BaseModel):
+    count: Optional[float] = None
+    """Total number of results for the requested service."""
+
+    page: Optional[float] = None
+    """Current page within paginated list of results."""
+
+    per_page: Optional[float] = None
+    """Number of results per page of results."""
+
+    total_count: Optional[float] = None
+    """Total results available without any search parameters."""
+
+
+class CustomNameserverGetResponse(BaseModel):
+    errors: List[Error]
+
+    messages: List[Message]
+
+    success: Literal[True]
+    """Whether the API call was successful."""
+
+    enabled: Optional[bool] = None
+    """Whether zone uses account-level custom nameservers."""
+
+    ns_set: Optional[float] = None
+    """The number of the name server set to assign to the zone."""
+
+    result_info: Optional[ResultInfo] = None
diff --git a/src/cloudflare/types/zones/custom_nameserver_update_params.py b/src/cloudflare/types/zones/custom_nameserver_update_params.py
index 7a4a53f50b2..0bf2a635c70 100644
--- a/src/cloudflare/types/zones/custom_nameserver_update_params.py
+++ b/src/cloudflare/types/zones/custom_nameserver_update_params.py
@@ -9,7 +9,7 @@
 
 class CustomNameserverUpdateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     enabled: bool
     """Whether zone uses account-level custom nameservers."""
diff --git a/src/cloudflare/types/zones/custom_nameserver_update_response.py b/src/cloudflare/types/zones/custom_nameserver_update_response.py
index ca378e8247d..895f5e51d8f 100644
--- a/src/cloudflare/types/zones/custom_nameserver_update_response.py
+++ b/src/cloudflare/types/zones/custom_nameserver_update_response.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List
+from typing_extensions import TypeAlias
 
 __all__ = ["CustomNameserverUpdateResponse"]
 
-CustomNameserverUpdateResponse = List[object]
+CustomNameserverUpdateResponse: TypeAlias = str
diff --git a/src/cloudflare/types/zones/development_mode.py b/src/cloudflare/types/zones/development_mode.py
index 06c81d58b5f..87b21a0fdd7 100644
--- a/src/cloudflare/types/zones/development_mode.py
+++ b/src/cloudflare/types/zones/development_mode.py
@@ -10,6 +10,10 @@
 
 
 class DevelopmentMode(BaseModel):
+    """
+    Development Mode temporarily allows you to enter development mode for your websites if you need to make changes to your site. This will bypass Cloudflare's accelerated cache and slow down your site, but is useful if you are making changes to cacheable content (like images, css, or JavaScript) and would like to see those changes right away. Once entered, development mode will last for 3 hours and then automatically toggle off.
+    """
+
     id: Literal["development_mode"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/early_hints.py b/src/cloudflare/types/zones/early_hints.py
index 61b3e7421db..e1a8247dc66 100644
--- a/src/cloudflare/types/zones/early_hints.py
+++ b/src/cloudflare/types/zones/early_hints.py
@@ -10,6 +10,10 @@
 
 
 class EarlyHints(BaseModel):
+    """
+    When enabled, Cloudflare will attempt to speed up overall page loads by serving `103` responses with `Link` headers from the final response. Refer to [Early Hints](https://developers.cloudflare.com/cache/about/early-hints) for more information.
+    """
+
     id: Literal["early_hints"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/email_obfuscation.py b/src/cloudflare/types/zones/email_obfuscation.py
index 37ecaca46de..07ff01d4431 100644
--- a/src/cloudflare/types/zones/email_obfuscation.py
+++ b/src/cloudflare/types/zones/email_obfuscation.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -10,17 +9,8 @@
 
 
 class EmailObfuscation(BaseModel):
-    id: Literal["email_obfuscation"]
-    """ID of the zone setting."""
+    id: Optional[Literal["email_obfuscation"]] = None
+    """Turn on or off **Email Obfuscation**."""
 
-    value: Literal["on", "off"]
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
-    """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
-    """
-
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    value: Optional[Literal["on", "off"]] = None
+    """The status of Email Obfuscation."""
diff --git a/src/cloudflare/types/zones/email_obfuscation_param.py b/src/cloudflare/types/zones/email_obfuscation_param.py
new file mode 100644
index 00000000000..e983e18c207
--- /dev/null
+++ b/src/cloudflare/types/zones/email_obfuscation_param.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["EmailObfuscationParam"]
+
+
+class EmailObfuscationParam(TypedDict, total=False):
+    id: Literal["email_obfuscation"]
+    """Turn on or off **Email Obfuscation**."""
+
+    value: Literal["on", "off"]
+    """The status of Email Obfuscation."""
diff --git a/src/cloudflare/types/zones/h2_prioritization.py b/src/cloudflare/types/zones/h2_prioritization.py
index 3efdb72b3e3..0e91e0becf0 100644
--- a/src/cloudflare/types/zones/h2_prioritization.py
+++ b/src/cloudflare/types/zones/h2_prioritization.py
@@ -10,6 +10,10 @@
 
 
 class H2Prioritization(BaseModel):
+    """
+    HTTP/2 Edge Prioritization optimises the delivery of resources served through HTTP/2 to improve page load performance. It also supports fine control of content delivery when used in conjunction with Workers.
+    """
+
     id: Literal["h2_prioritization"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/hold_create_params.py b/src/cloudflare/types/zones/hold_create_params.py
index 9a1f82cf73d..addb06f3ca2 100644
--- a/src/cloudflare/types/zones/hold_create_params.py
+++ b/src/cloudflare/types/zones/hold_create_params.py
@@ -9,7 +9,7 @@
 
 class HoldCreateParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     include_subdomains: bool
     """
diff --git a/src/cloudflare/types/zones/hold_delete_params.py b/src/cloudflare/types/zones/hold_delete_params.py
index eeb91db1bf8..3610944f01b 100644
--- a/src/cloudflare/types/zones/hold_delete_params.py
+++ b/src/cloudflare/types/zones/hold_delete_params.py
@@ -9,7 +9,7 @@
 
 class HoldDeleteParams(TypedDict, total=False):
     zone_id: Required[str]
-    """Identifier"""
+    """Identifier."""
 
     hold_after: str
     """
diff --git a/src/cloudflare/types/zones/hold_edit_params.py b/src/cloudflare/types/zones/hold_edit_params.py
new file mode 100644
index 00000000000..6c86882616b
--- /dev/null
+++ b/src/cloudflare/types/zones/hold_edit_params.py
@@ -0,0 +1,29 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Required, TypedDict
+
+__all__ = ["HoldEditParams"]
+
+
+class HoldEditParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier."""
+
+    hold_after: str
+    """
+    If `hold_after` is provided and future-dated, the hold will be temporarily
+    disabled, then automatically re-enabled by the system at the time specified in
+    this RFC3339-formatted timestamp. A past-dated `hold_after` value will have no
+    effect on an existing, enabled hold. Providing an empty string will set its
+    value to the current time.
+    """
+
+    include_subdomains: bool
+    """
+    If `true`, the zone hold will extend to block any subdomain of the given zone,
+    as well as SSL4SaaS Custom Hostnames. For example, a zone hold on a zone with
+    the hostname 'example.com' and include_subdomains=true will block 'example.com',
+    'staging.example.com', 'api.staging.example.com', etc.
+    """
diff --git a/src/cloudflare/types/zones/hotlink_protection.py b/src/cloudflare/types/zones/hotlink_protection.py
index 45d990193de..9d659066b33 100644
--- a/src/cloudflare/types/zones/hotlink_protection.py
+++ b/src/cloudflare/types/zones/hotlink_protection.py
@@ -10,6 +10,10 @@
 
 
 class HotlinkProtection(BaseModel):
+    """
+    When enabled, the Hotlink Protection option ensures that other sites cannot suck up your bandwidth by building pages that use images hosted on your site. Anytime a request for an image on your site hits Cloudflare, we check to ensure that it's not another site requesting them. People will still be able to download and view images from your page, but other sites won't be able to steal them for use on their own pages. (https://support.cloudflare.com/hc/en-us/articles/200170026).
+    """
+
     id: Literal["hotlink_protection"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/http2.py b/src/cloudflare/types/zones/http2.py
index 2d959b2869f..417b4808ce2 100644
--- a/src/cloudflare/types/zones/http2.py
+++ b/src/cloudflare/types/zones/http2.py
@@ -10,6 +10,8 @@
 
 
 class HTTP2(BaseModel):
+    """HTTP2 enabled for this zone."""
+
     id: Literal["http2"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/http3.py b/src/cloudflare/types/zones/http3.py
index bfca8786793..b48a595a0ea 100644
--- a/src/cloudflare/types/zones/http3.py
+++ b/src/cloudflare/types/zones/http3.py
@@ -10,6 +10,8 @@
 
 
 class HTTP3(BaseModel):
+    """HTTP3 enabled for this zone."""
+
     id: Literal["http3"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/image_resizing.py b/src/cloudflare/types/zones/image_resizing.py
index 5f4d4e370a6..06931d4bc9e 100644
--- a/src/cloudflare/types/zones/image_resizing.py
+++ b/src/cloudflare/types/zones/image_resizing.py
@@ -10,6 +10,10 @@
 
 
 class ImageResizing(BaseModel):
+    """
+    Image Transformations provides on-demand resizing, conversion and optimization for images served through Cloudflare's network. Refer to the [Image Transformations documentation](https://developers.cloudflare.com/images/) for more information.
+    """
+
     id: Literal["image_resizing"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/ip_geolocation.py b/src/cloudflare/types/zones/ip_geolocation.py
index 0c378a4acc9..e6e62be2c7f 100644
--- a/src/cloudflare/types/zones/ip_geolocation.py
+++ b/src/cloudflare/types/zones/ip_geolocation.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -10,17 +9,11 @@
 
 
 class IPGeolocation(BaseModel):
-    id: Literal["ip_geolocation"]
-    """ID of the zone setting."""
-
-    value: Literal["on", "off"]
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
+    id: Optional[Literal["ip_geolocation"]] = None
     """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
+    Cloudflare adds a CF-IPCountry HTTP header containing the country code that
+    corresponds to the visitor.
     """
 
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    value: Optional[Literal["on", "off"]] = None
+    """The status of adding the IP Geolocation Header."""
diff --git a/src/cloudflare/types/zones/ip_geolocation_param.py b/src/cloudflare/types/zones/ip_geolocation_param.py
new file mode 100644
index 00000000000..0b7344a6c32
--- /dev/null
+++ b/src/cloudflare/types/zones/ip_geolocation_param.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["IPGeolocationParam"]
+
+
+class IPGeolocationParam(TypedDict, total=False):
+    id: Literal["ip_geolocation"]
+    """
+    Cloudflare adds a CF-IPCountry HTTP header containing the country code that
+    corresponds to the visitor.
+    """
+
+    value: Literal["on", "off"]
+    """The status of adding the IP Geolocation Header."""
diff --git a/src/cloudflare/types/zones/ipv6.py b/src/cloudflare/types/zones/ipv6.py
index 3ba1ce89134..539201755df 100644
--- a/src/cloudflare/types/zones/ipv6.py
+++ b/src/cloudflare/types/zones/ipv6.py
@@ -10,6 +10,11 @@
 
 
 class IPV6(BaseModel):
+    """Enable IPv6 on all subdomains that are Cloudflare enabled.
+
+    (https://support.cloudflare.com/hc/en-us/articles/200168586).
+    """
+
     id: Literal["ipv6"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/min_tls_version.py b/src/cloudflare/types/zones/min_tls_version.py
index 107999e783e..9c6c1776093 100644
--- a/src/cloudflare/types/zones/min_tls_version.py
+++ b/src/cloudflare/types/zones/min_tls_version.py
@@ -10,6 +10,11 @@
 
 
 class MinTLSVersion(BaseModel):
+    """Only accepts HTTPS requests that use at least the TLS protocol version specified.
+
+    For example, if TLS 1.1 is selected, TLS 1.0 connections will be rejected, while 1.1, 1.2, and 1.3 (if enabled) will be permitted.
+    """
+
     id: Literal["min_tls_version"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/minify.py b/src/cloudflare/types/zones/minify.py
deleted file mode 100644
index 0d036564ca6..00000000000
--- a/src/cloudflare/types/zones/minify.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from datetime import datetime
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = ["Minify", "Value"]
-
-
-class Value(BaseModel):
-    css: Optional[Literal["on", "off"]] = None
-    """Automatically minify all CSS files for your website."""
-
-    html: Optional[Literal["on", "off"]] = None
-    """Automatically minify all HTML files for your website."""
-
-    js: Optional[Literal["on", "off"]] = None
-    """Automatically minify all JavaScript files for your website."""
-
-
-class Minify(BaseModel):
-    id: Literal["minify"]
-    """Zone setting identifier."""
-
-    value: Value
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
-    """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
-    """
-
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
diff --git a/src/cloudflare/types/zones/mirage.py b/src/cloudflare/types/zones/mirage.py
index 4679cc48ebb..c5d492a58ae 100644
--- a/src/cloudflare/types/zones/mirage.py
+++ b/src/cloudflare/types/zones/mirage.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -10,17 +9,12 @@
 
 
 class Mirage(BaseModel):
-    id: Literal["mirage"]
-    """ID of the zone setting."""
-
-    value: Literal["on", "off"]
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
+    id: Optional[Literal["mirage"]] = None
     """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
+    Cloudflare Mirage reduces bandwidth used by images in mobile browsers. It can
+    accelerate loading of image-heavy websites on very slow mobile connections and
+    HTTP/1.
     """
 
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    value: Optional[Literal["on", "off"]] = None
+    """The status of Mirage."""
diff --git a/src/cloudflare/types/zones/mirage_param.py b/src/cloudflare/types/zones/mirage_param.py
new file mode 100644
index 00000000000..13a8c3416c0
--- /dev/null
+++ b/src/cloudflare/types/zones/mirage_param.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["MirageParam"]
+
+
+class MirageParam(TypedDict, total=False):
+    id: Literal["mirage"]
+    """
+    Cloudflare Mirage reduces bandwidth used by images in mobile browsers. It can
+    accelerate loading of image-heavy websites on very slow mobile connections and
+    HTTP/1.
+    """
+
+    value: Literal["on", "off"]
+    """The status of Mirage."""
diff --git a/src/cloudflare/types/zones/mobile_redirect.py b/src/cloudflare/types/zones/mobile_redirect.py
deleted file mode 100644
index b787fbd3ed8..00000000000
--- a/src/cloudflare/types/zones/mobile_redirect.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing import Optional
-from datetime import datetime
-from typing_extensions import Literal
-
-from ..._models import BaseModel
-
-__all__ = ["MobileRedirect", "Value"]
-
-
-class Value(BaseModel):
-    mobile_subdomain: Optional[str] = None
-    """
-    Which subdomain prefix you wish to redirect visitors on mobile devices to
-    (subdomain must already exist).
-    """
-
-    status: Optional[Literal["on", "off"]] = None
-    """
-    Deprecated: Use Single Redirects instead
-    https://developers.cloudflare.com/rules/url-forwarding/single-redirects/examples/#perform-mobile-redirects.
-    Whether or not mobile redirect is enabled.
-    """
-
-    strip_uri: Optional[bool] = None
-    """
-    Whether to drop the current page path and redirect to the mobile subdomain URL
-    root, or keep the path and redirect to the same page on the mobile subdomain.
-    """
-
-
-class MobileRedirect(BaseModel):
-    id: Literal["mobile_redirect"]
-    """Identifier of the zone setting."""
-
-    value: Value
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
-    """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
-    """
-
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
diff --git a/src/cloudflare/types/zones/nel.py b/src/cloudflare/types/zones/nel.py
index bd87df59c8b..1861deb8c2d 100644
--- a/src/cloudflare/types/zones/nel.py
+++ b/src/cloudflare/types/zones/nel.py
@@ -10,10 +10,14 @@
 
 
 class Value(BaseModel):
+    """Current value of the zone setting."""
+
     enabled: Optional[bool] = None
 
 
 class NEL(BaseModel):
+    """Enable Network Error Logging reporting on your zone. (Beta)"""
+
     id: Literal["nel"]
     """Zone setting identifier."""
 
diff --git a/src/cloudflare/types/zones/opportunistic_encryption.py b/src/cloudflare/types/zones/opportunistic_encryption.py
index 7ab0d1e8275..0d6caa0a740 100644
--- a/src/cloudflare/types/zones/opportunistic_encryption.py
+++ b/src/cloudflare/types/zones/opportunistic_encryption.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -10,17 +9,12 @@
 
 
 class OpportunisticEncryption(BaseModel):
-    id: Literal["opportunistic_encryption"]
-    """ID of the zone setting."""
-
-    value: Literal["on", "off"]
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
+    id: Optional[Literal["opportunistic_encryption"]] = None
     """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
+    Opportunistic Encryption allows browsers to access HTTP URIs over an encrypted
+    TLS channel. It's not a substitute for HTTPS, but provides additional security
+    for otherwise vulnerable requests.
     """
 
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    value: Optional[Literal["on", "off"]] = None
+    """The status of Opportunistic Encryption."""
diff --git a/src/cloudflare/types/zones/opportunistic_encryption_param.py b/src/cloudflare/types/zones/opportunistic_encryption_param.py
new file mode 100644
index 00000000000..e04e115379e
--- /dev/null
+++ b/src/cloudflare/types/zones/opportunistic_encryption_param.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["OpportunisticEncryptionParam"]
+
+
+class OpportunisticEncryptionParam(TypedDict, total=False):
+    id: Literal["opportunistic_encryption"]
+    """
+    Opportunistic Encryption allows browsers to access HTTP URIs over an encrypted
+    TLS channel. It's not a substitute for HTTPS, but provides additional security
+    for otherwise vulnerable requests.
+    """
+
+    value: Literal["on", "off"]
+    """The status of Opportunistic Encryption."""
diff --git a/src/cloudflare/types/zones/opportunistic_onion.py b/src/cloudflare/types/zones/opportunistic_onion.py
index 533f547d0b2..8fb40ebaf10 100644
--- a/src/cloudflare/types/zones/opportunistic_onion.py
+++ b/src/cloudflare/types/zones/opportunistic_onion.py
@@ -10,6 +10,10 @@
 
 
 class OpportunisticOnion(BaseModel):
+    """
+    Add an Alt-Svc header to all legitimate requests from Tor, allowing the connection to use our onion services instead of exit nodes.
+    """
+
     id: Literal["opportunistic_onion"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/orange_to_orange.py b/src/cloudflare/types/zones/orange_to_orange.py
index 5605b38f011..41aa95bce0f 100644
--- a/src/cloudflare/types/zones/orange_to_orange.py
+++ b/src/cloudflare/types/zones/orange_to_orange.py
@@ -10,6 +10,10 @@
 
 
 class OrangeToOrange(BaseModel):
+    """
+    Orange to Orange (O2O) allows zones on Cloudflare to CNAME to other zones also on Cloudflare.
+    """
+
     id: Literal["orange_to_orange"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/origin_error_page_pass_thru.py b/src/cloudflare/types/zones/origin_error_page_pass_thru.py
index 24cd47f546b..a393f8cf331 100644
--- a/src/cloudflare/types/zones/origin_error_page_pass_thru.py
+++ b/src/cloudflare/types/zones/origin_error_page_pass_thru.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -10,17 +9,11 @@
 
 
 class OriginErrorPagePassThru(BaseModel):
-    id: Literal["origin_error_page_pass_thru"]
-    """ID of the zone setting."""
-
-    value: Literal["on", "off"]
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
+    id: Optional[Literal["origin_error_page_pass_thru"]] = None
     """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
+    Turn on or off Cloudflare error pages generated from issues sent from the origin
+    server. If enabled, this setting triggers error pages issued by the origin.
     """
 
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    value: Optional[Literal["on", "off"]] = None
+    """The status of Origin Error Page Passthru."""
diff --git a/src/cloudflare/types/zones/origin_error_page_pass_thru_param.py b/src/cloudflare/types/zones/origin_error_page_pass_thru_param.py
new file mode 100644
index 00000000000..addb35ca4d4
--- /dev/null
+++ b/src/cloudflare/types/zones/origin_error_page_pass_thru_param.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["OriginErrorPagePassThruParam"]
+
+
+class OriginErrorPagePassThruParam(TypedDict, total=False):
+    id: Literal["origin_error_page_pass_thru"]
+    """
+    Turn on or off Cloudflare error pages generated from issues sent from the origin
+    server. If enabled, this setting triggers error pages issued by the origin.
+    """
+
+    value: Literal["on", "off"]
+    """The status of Origin Error Page Passthru."""
diff --git a/src/cloudflare/types/zones/origin_max_http_version.py b/src/cloudflare/types/zones/origin_max_http_version.py
deleted file mode 100644
index 338eb691310..00000000000
--- a/src/cloudflare/types/zones/origin_max_http_version.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from typing_extensions import Literal
-
-__all__ = ["OriginMaxHTTPVersion"]
-
-OriginMaxHTTPVersion = Literal["origin_max_http_version"]
diff --git a/src/cloudflare/types/zones/polish.py b/src/cloudflare/types/zones/polish.py
index c75f4c9c129..6435660d5cb 100644
--- a/src/cloudflare/types/zones/polish.py
+++ b/src/cloudflare/types/zones/polish.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -10,17 +9,8 @@
 
 
 class Polish(BaseModel):
-    id: Literal["polish"]
-    """ID of the zone setting."""
+    id: Optional[Literal["polish"]] = None
+    """Apply options from the Polish feature of the Cloudflare Speed app."""
 
-    value: Literal["off", "lossless", "lossy"]
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
-    """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
-    """
-
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    value: Optional[Literal["off", "lossless", "lossy"]] = None
+    """The level of Polish you want applied to your origin."""
diff --git a/src/cloudflare/types/zones/polish_param.py b/src/cloudflare/types/zones/polish_param.py
new file mode 100644
index 00000000000..4ebb59091e0
--- /dev/null
+++ b/src/cloudflare/types/zones/polish_param.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["PolishParam"]
+
+
+class PolishParam(TypedDict, total=False):
+    id: Literal["polish"]
+    """Apply options from the Polish feature of the Cloudflare Speed app."""
+
+    value: Literal["off", "lossless", "lossy"]
+    """The level of Polish you want applied to your origin."""
diff --git a/src/cloudflare/types/zones/prefetch_preload.py b/src/cloudflare/types/zones/prefetch_preload.py
index 38fba5db671..0f71a36d466 100644
--- a/src/cloudflare/types/zones/prefetch_preload.py
+++ b/src/cloudflare/types/zones/prefetch_preload.py
@@ -10,6 +10,11 @@
 
 
 class PrefetchPreload(BaseModel):
+    """Cloudflare will prefetch any URLs that are included in the response headers.
+
+    This is limited to Enterprise Zones.
+    """
+
     id: Literal["prefetch_preload"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/proxy_read_timeout.py b/src/cloudflare/types/zones/proxy_read_timeout.py
index 4ebc5dc4228..9bd7119e735 100644
--- a/src/cloudflare/types/zones/proxy_read_timeout.py
+++ b/src/cloudflare/types/zones/proxy_read_timeout.py
@@ -10,6 +10,8 @@
 
 
 class ProxyReadTimeout(BaseModel):
+    """Maximum time between two read operations from origin."""
+
     id: Literal["proxy_read_timeout"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/pseudo_ipv4.py b/src/cloudflare/types/zones/pseudo_ipv4.py
index 7e8c5077722..0f9e01622db 100644
--- a/src/cloudflare/types/zones/pseudo_ipv4.py
+++ b/src/cloudflare/types/zones/pseudo_ipv4.py
@@ -10,6 +10,8 @@
 
 
 class PseudoIPV4(BaseModel):
+    """The value set for the Pseudo IPv4 setting."""
+
     id: Literal["pseudo_ipv4"]
     """Value of the Pseudo IPv4 setting."""
 
diff --git a/src/cloudflare/types/zones/rate_plan_get_response.py b/src/cloudflare/types/zones/rate_plan_get_response.py
new file mode 100644
index 00000000000..87940e668c0
--- /dev/null
+++ b/src/cloudflare/types/zones/rate_plan_get_response.py
@@ -0,0 +1,39 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Optional
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+
+__all__ = ["RatePlanGetResponse", "Component"]
+
+
+class Component(BaseModel):
+    default: Optional[float] = None
+    """The default amount allocated."""
+
+    name: Optional[Literal["zones", "page_rules", "dedicated_certificates", "dedicated_certificates_custom"]] = None
+    """The unique component."""
+
+    unit_price: Optional[float] = None
+    """The unit price of the addon."""
+
+
+class RatePlanGetResponse(BaseModel):
+    id: Optional[str] = None
+    """Plan identifier tag."""
+
+    components: Optional[List[Component]] = None
+    """Array of available components values for the plan."""
+
+    currency: Optional[str] = None
+    """The monetary unit in which pricing information is displayed."""
+
+    duration: Optional[float] = None
+    """The duration of the plan subscription."""
+
+    frequency: Optional[Literal["weekly", "monthly", "quarterly", "yearly"]] = None
+    """The frequency at which you will be billed for this plan."""
+
+    name: Optional[str] = None
+    """The plan name."""
diff --git a/src/cloudflare/types/zones/response_buffering.py b/src/cloudflare/types/zones/response_buffering.py
index cee36587e1a..840d27c0b0b 100644
--- a/src/cloudflare/types/zones/response_buffering.py
+++ b/src/cloudflare/types/zones/response_buffering.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -10,17 +9,12 @@
 
 
 class ResponseBuffering(BaseModel):
-    id: Literal["response_buffering"]
-    """ID of the zone setting."""
-
-    value: Literal["on", "off"]
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
+    id: Optional[Literal["response_buffering"]] = None
     """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
+    Turn on or off whether Cloudflare should wait for an entire file from the origin
+    server before forwarding it to the site visitor. By default, Cloudflare sends
+    packets to the client as they arrive from the origin server.
     """
 
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    value: Optional[Literal["on", "off"]] = None
+    """The status of Response Buffering"""
diff --git a/src/cloudflare/types/zones/response_buffering_param.py b/src/cloudflare/types/zones/response_buffering_param.py
new file mode 100644
index 00000000000..b144afd1917
--- /dev/null
+++ b/src/cloudflare/types/zones/response_buffering_param.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["ResponseBufferingParam"]
+
+
+class ResponseBufferingParam(TypedDict, total=False):
+    id: Literal["response_buffering"]
+    """
+    Turn on or off whether Cloudflare should wait for an entire file from the origin
+    server before forwarding it to the site visitor. By default, Cloudflare sends
+    packets to the client as they arrive from the origin server.
+    """
+
+    value: Literal["on", "off"]
+    """The status of Response Buffering"""
diff --git a/src/cloudflare/types/zones/rocket_loader.py b/src/cloudflare/types/zones/rocket_loader.py
index 1fcbbd08bea..4ca3fff374a 100644
--- a/src/cloudflare/types/zones/rocket_loader.py
+++ b/src/cloudflare/types/zones/rocket_loader.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -10,17 +9,8 @@
 
 
 class RocketLoader(BaseModel):
-    id: Literal["rocket_loader"]
-    """ID of the zone setting."""
+    id: Optional[Literal["rocket_loader"]] = None
+    """Turn on or off Rocket Loader in the Cloudflare Speed app."""
 
-    value: Literal["on", "off"]
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
-    """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
-    """
-
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    value: Optional[Literal["on", "off"]] = None
+    """The status of Rocket Loader"""
diff --git a/src/cloudflare/types/zones/rocket_loader_param.py b/src/cloudflare/types/zones/rocket_loader_param.py
new file mode 100644
index 00000000000..385afbda75f
--- /dev/null
+++ b/src/cloudflare/types/zones/rocket_loader_param.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["RocketLoaderParam"]
+
+
+class RocketLoaderParam(TypedDict, total=False):
+    id: Literal["rocket_loader"]
+    """Turn on or off Rocket Loader in the Cloudflare Speed app."""
+
+    value: Literal["on", "off"]
+    """The status of Rocket Loader"""
diff --git a/src/cloudflare/types/zones/security_headers.py b/src/cloudflare/types/zones/security_headers.py
index 0054c519547..365fe97e9cf 100644
--- a/src/cloudflare/types/zones/security_headers.py
+++ b/src/cloudflare/types/zones/security_headers.py
@@ -10,6 +10,8 @@
 
 
 class ValueStrictTransportSecurity(BaseModel):
+    """Strict Transport Security."""
+
     enabled: Optional[bool] = None
     """Whether or not strict transport security is enabled."""
 
@@ -27,11 +29,15 @@ class ValueStrictTransportSecurity(BaseModel):
 
 
 class Value(BaseModel):
+    """Current value of the zone setting."""
+
     strict_transport_security: Optional[ValueStrictTransportSecurity] = None
     """Strict Transport Security."""
 
 
 class SecurityHeaders(BaseModel):
+    """Cloudflare security header for a zone."""
+
     id: Literal["security_header"]
     """ID of the zone's security header."""
 
diff --git a/src/cloudflare/types/zones/security_level.py b/src/cloudflare/types/zones/security_level.py
index 93dfddc12ef..0adbeedbaaf 100644
--- a/src/cloudflare/types/zones/security_level.py
+++ b/src/cloudflare/types/zones/security_level.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -10,17 +9,7 @@
 
 
 class SecurityLevel(BaseModel):
-    id: Literal["security_level"]
-    """ID of the zone setting."""
+    id: Optional[Literal["security_level"]] = None
+    """Control options for the **Security Level** feature from the **Security** app."""
 
-    value: Literal["off", "essentially_off", "low", "medium", "high", "under_attack"]
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
-    """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
-    """
-
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    value: Optional[Literal["off", "essentially_off", "low", "medium", "high", "under_attack"]] = None
diff --git a/src/cloudflare/types/zones/security_level_param.py b/src/cloudflare/types/zones/security_level_param.py
new file mode 100644
index 00000000000..ce4d8a4e0aa
--- /dev/null
+++ b/src/cloudflare/types/zones/security_level_param.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["SecurityLevelParam"]
+
+
+class SecurityLevelParam(TypedDict, total=False):
+    id: Literal["security_level"]
+    """Control options for the **Security Level** feature from the **Security** app."""
+
+    value: Literal["off", "essentially_off", "low", "medium", "high", "under_attack"]
diff --git a/src/cloudflare/types/zones/server_side_excludes.py b/src/cloudflare/types/zones/server_side_excludes.py
index 2630a01b631..eeeb026e60a 100644
--- a/src/cloudflare/types/zones/server_side_excludes.py
+++ b/src/cloudflare/types/zones/server_side_excludes.py
@@ -10,6 +10,10 @@
 
 
 class ServerSideExcludes(BaseModel):
+    """
+    If there is sensitive content on your website that you want visible to real visitors, but that you want to hide from suspicious visitors, all you have to do is wrap the content with Cloudflare SSE tags. Wrap any content that you want to be excluded from suspicious visitors in the following SSE tags: <!--sse--><!--/sse-->. For example: <!--sse-->  Bad visitors won't see my phone number, 555-555-5555 <!--/sse-->. Note: SSE only will work with HTML. If you have HTML minification enabled, you won't see the SSE tags in your HTML source when it's served through Cloudflare. SSE will still function in this case, as Cloudflare's HTML minification and SSE functionality occur on-the-fly as the resource moves through our network to the visitor's computer. (https://support.cloudflare.com/hc/en-us/articles/200170036).
+    """
+
     id: Literal["server_side_exclude"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/setting_edit_params.py b/src/cloudflare/types/zones/setting_edit_params.py
index 3bc53b6eba5..7151cf62b94 100644
--- a/src/cloudflare/types/zones/setting_edit_params.py
+++ b/src/cloudflare/types/zones/setting_edit_params.py
@@ -2,632 +2,62 @@
 
 from __future__ import annotations
 
-from typing import List, Union, Optional
-from typing_extensions import Literal, Required, TypedDict
+from typing import Union
+from typing_extensions import Required, TypeAlias, TypedDict
 
+from ..._types import SequenceNotStr
 from .automatic_platform_optimization_param import AutomaticPlatformOptimizationParam
 
 __all__ = [
     "SettingEditParams",
-    "ZeroRTT",
-    "AdvancedDDoS",
-    "AlwaysOnline",
-    "AlwaysUseHTTPS",
-    "AutomaticHTTPSRewrites",
-    "Brotli",
-    "BrowserCacheTTL",
-    "BrowserCheck",
-    "CacheLevel",
-    "ChallengeTTL",
-    "Ciphers",
-    "ZonesCNAMEFlattening",
-    "DevelopmentMode",
-    "EarlyHints",
-    "ZonesEdgeCacheTTL",
-    "EmailObfuscation",
-    "H2Prioritization",
-    "HotlinkProtection",
-    "HTTP2",
-    "HTTP3",
-    "ImageResizing",
-    "IPGeolocation",
-    "IPV6",
-    "ZonesMaxUpload",
-    "MinTLSVersion",
-    "Minify",
-    "MinifyValue",
-    "Mirage",
-    "MobileRedirect",
-    "MobileRedirectValue",
-    "NEL",
-    "NELValue",
-    "OpportunisticEncryption",
-    "OpportunisticOnion",
-    "OrangeToOrange",
-    "OriginErrorPagePassThru",
-    "Polish",
-    "PrefetchPreload",
-    "ProxyReadTimeout",
-    "PseudoIPV4",
-    "ZonesReplaceInsecureJS",
-    "ResponseBuffering",
-    "RocketLoader",
-    "ZonesSchemasAutomaticPlatformOptimization",
-    "SecurityHeaders",
-    "SecurityHeadersValue",
-    "SecurityHeadersValueStrictTransportSecurity",
-    "SecurityLevel",
-    "ServerSideExcludes",
-    "ZonesSha1Support",
-    "SortQueryStringForCache",
-    "SSL",
-    "SSLRecommender",
-    "ZonesTLS1_2Only",
-    "TLS1_3",
-    "TLSClientAuth",
-    "TrueClientIPHeader",
-    "WAF",
-    "WebP",
-    "Websocket",
+    "Variant0",
+    "Variant1",
+    "Variant1Value",
+    "Variant1ValueZonesCacheRulesAegisValue",
+    "Variant1ValueZonesNELValue",
+    "Variant1ValueZonesSecurityHeaderValue",
+    "Variant1ValueZonesSecurityHeaderValueStrictTransportSecurity",
 ]
 
 
-class ZeroRTT(TypedDict, total=False):
+class Variant0(TypedDict, total=False):
     zone_id: Required[str]
     """Identifier"""
 
-    id: Required[Literal["0rtt"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class AdvancedDDoS(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["advanced_ddos"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class AlwaysOnline(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["always_online"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class AlwaysUseHTTPS(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["always_use_https"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class AutomaticHTTPSRewrites(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["automatic_https_rewrites"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class Brotli(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["brotli"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["off", "on"]]
-    """Current value of the zone setting."""
-
-
-class BrowserCacheTTL(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["browser_cache_ttl"]]
-    """ID of the zone setting."""
-
-    value: Required[
-        Literal[
-            0,
-            30,
-            60,
-            120,
-            300,
-            1200,
-            1800,
-            3600,
-            7200,
-            10800,
-            14400,
-            18000,
-            28800,
-            43200,
-            57600,
-            72000,
-            86400,
-            172800,
-            259200,
-            345600,
-            432000,
-            691200,
-            1382400,
-            2073600,
-            2678400,
-            5356800,
-            16070400,
-            31536000,
-        ]
-    ]
-    """Current value of the zone setting."""
-
-
-class BrowserCheck(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["browser_check"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class CacheLevel(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["cache_level"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["aggressive", "basic", "simplified"]]
-    """Current value of the zone setting."""
-
-
-class ChallengeTTL(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["challenge_ttl"]]
-    """ID of the zone setting."""
-
-    value: Required[
-        Literal[300, 900, 1800, 2700, 3600, 7200, 10800, 14400, 28800, 57600, 86400, 604800, 2592000, 31536000]
-    ]
-    """Current value of the zone setting."""
-
-
-class Ciphers(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["ciphers"]]
-    """ID of the zone setting."""
-
-    value: Required[List[str]]
-    """Current value of the zone setting."""
-
-
-class ZonesCNAMEFlattening(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["cname_flattening"]]
-    """How to flatten the cname destination."""
-
-    value: Required[Literal["flatten_at_root", "flatten_all"]]
-    """Current value of the zone setting."""
-
-
-class DevelopmentMode(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["development_mode"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class EarlyHints(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["early_hints"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class ZonesEdgeCacheTTL(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["edge_cache_ttl"]]
-    """ID of the zone setting."""
-
-    value: Required[
-        Literal[
-            30,
-            60,
-            300,
-            1200,
-            1800,
-            3600,
-            7200,
-            10800,
-            14400,
-            18000,
-            28800,
-            43200,
-            57600,
-            72000,
-            86400,
-            172800,
-            259200,
-            345600,
-            432000,
-            518400,
-            604800,
-        ]
-    ]
-    """Current value of the zone setting."""
-
-
-class EmailObfuscation(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["email_obfuscation"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class H2Prioritization(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["h2_prioritization"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off", "custom"]]
-    """Current value of the zone setting."""
-
-
-class HotlinkProtection(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["hotlink_protection"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class HTTP2(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["http2"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class HTTP3(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["http3"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class ImageResizing(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["image_resizing"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off", "open"]]
-    """Current value of the zone setting."""
-
-
-class IPGeolocation(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["ip_geolocation"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class IPV6(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["ipv6"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["off", "on"]]
-    """Current value of the zone setting."""
-
-
-class ZonesMaxUpload(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["max_upload"]]
-    """identifier of the zone setting."""
-
-    value: Required[Literal[100, 200, 500]]
-    """Current value of the zone setting."""
-
-
-class MinTLSVersion(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["min_tls_version"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["1.0", "1.1", "1.2", "1.3"]]
-    """Current value of the zone setting."""
-
-
-class Minify(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["minify"]]
-    """Zone setting identifier."""
-
-    value: Required[MinifyValue]
-    """Current value of the zone setting."""
-
-
-class MinifyValue(TypedDict, total=False):
-    css: Literal["on", "off"]
-    """Automatically minify all CSS files for your website."""
-
-    html: Literal["on", "off"]
-    """Automatically minify all HTML files for your website."""
-
-    js: Literal["on", "off"]
-    """Automatically minify all JavaScript files for your website."""
-
-
-class Mirage(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["mirage"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
+    enabled: bool
+    """ssl-recommender enrollment setting."""
 
 
-class MobileRedirect(TypedDict, total=False):
+class Variant1(TypedDict, total=False):
     zone_id: Required[str]
     """Identifier"""
 
-    id: Required[Literal["mobile_redirect"]]
-    """Identifier of the zone setting."""
+    value: Variant1Value
+    """Value of the zone setting."""
 
-    value: Required[MobileRedirectValue]
-    """Current value of the zone setting."""
 
+class Variant1ValueZonesCacheRulesAegisValue(TypedDict, total=False):
+    """Value of the zone setting."""
 
-class MobileRedirectValue(TypedDict, total=False):
-    mobile_subdomain: Optional[str]
-    """
-    Which subdomain prefix you wish to redirect visitors on mobile devices to
-    (subdomain must already exist).
-    """
-
-    status: Literal["on", "off"]
-    """
-    Deprecated: Use Single Redirects instead
-    https://developers.cloudflare.com/rules/url-forwarding/single-redirects/examples/#perform-mobile-redirects.
-    Whether or not mobile redirect is enabled.
-    """
+    enabled: bool
+    """Whether the feature is enabled or not."""
 
-    strip_uri: bool
+    pool_id: str
     """
-    Whether to drop the current page path and redirect to the mobile subdomain URL
-    root, or keep the path and redirect to the same page on the mobile subdomain.
+    Egress pool id which refers to a grouping of dedicated egress IPs through which
+    Cloudflare will connect to origin.
     """
 
 
-class NEL(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["nel"]]
-    """Zone setting identifier."""
-
-    value: Required[NELValue]
-    """Current value of the zone setting."""
+class Variant1ValueZonesNELValue(TypedDict, total=False):
+    """Value of the zone setting."""
 
-
-class NELValue(TypedDict, total=False):
     enabled: bool
 
 
-class OpportunisticEncryption(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["opportunistic_encryption"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class OpportunisticOnion(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["opportunistic_onion"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class OrangeToOrange(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["orange_to_orange"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class OriginErrorPagePassThru(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["origin_error_page_pass_thru"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class Polish(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["polish"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["off", "lossless", "lossy"]]
-    """Current value of the zone setting."""
-
-
-class PrefetchPreload(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["prefetch_preload"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class ProxyReadTimeout(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["proxy_read_timeout"]]
-    """ID of the zone setting."""
-
-    value: Required[float]
-    """Current value of the zone setting."""
-
-
-class PseudoIPV4(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["pseudo_ipv4"]]
-    """Value of the Pseudo IPv4 setting."""
-
-    value: Required[Literal["off", "add_header", "overwrite_header"]]
-    """Current value of the zone setting."""
-
-
-class ZonesReplaceInsecureJS(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["replace_insecure_js"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class ResponseBuffering(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["response_buffering"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class RocketLoader(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["rocket_loader"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class ZonesSchemasAutomaticPlatformOptimization(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["automatic_platform_optimization"]]
-    """ID of the zone setting."""
-
-    value: Required[AutomaticPlatformOptimizationParam]
-    """Current value of the zone setting."""
-
-
-class SecurityHeaders(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["security_header"]]
-    """ID of the zone's security header."""
-
-    value: Required[SecurityHeadersValue]
-    """Current value of the zone setting."""
-
+class Variant1ValueZonesSecurityHeaderValueStrictTransportSecurity(TypedDict, total=False):
+    """Strict Transport Security."""
 
-class SecurityHeadersValueStrictTransportSecurity(TypedDict, total=False):
     enabled: bool
     """Whether or not strict transport security is enabled."""
 
@@ -644,208 +74,19 @@ class SecurityHeadersValueStrictTransportSecurity(TypedDict, total=False):
     """Enable automatic preload of the HSTS configuration."""
 
 
-class SecurityHeadersValue(TypedDict, total=False):
-    strict_transport_security: SecurityHeadersValueStrictTransportSecurity
+class Variant1ValueZonesSecurityHeaderValue(TypedDict, total=False):
+    strict_transport_security: Variant1ValueZonesSecurityHeaderValueStrictTransportSecurity
     """Strict Transport Security."""
 
 
-class SecurityLevel(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["security_level"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["off", "essentially_off", "low", "medium", "high", "under_attack"]]
-    """Current value of the zone setting."""
-
-
-class ServerSideExcludes(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["server_side_exclude"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class ZonesSha1Support(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["sha1_support"]]
-    """Zone setting identifier."""
-
-    value: Required[Literal["off", "on"]]
-    """Current value of the zone setting."""
-
-
-class SortQueryStringForCache(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["sort_query_string_for_cache"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class SSL(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["ssl"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["off", "flexible", "full", "strict"]]
-    """Current value of the zone setting."""
-
-
-class SSLRecommender(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Literal["ssl_recommender"]
-    """Enrollment value for SSL/TLS Recommender."""
-
-    enabled: bool
-    """ssl-recommender enrollment setting."""
-
-
-class ZonesTLS1_2Only(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["tls_1_2_only"]]
-    """Zone setting identifier."""
-
-    value: Required[Literal["off", "on"]]
-    """Current value of the zone setting."""
-
-
-class TLS1_3(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["tls_1_3"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off", "zrt"]]
-    """Current value of the zone setting."""
-
-
-class TLSClientAuth(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["tls_client_auth"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class TrueClientIPHeader(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["true_client_ip_header"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class WAF(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["waf"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["on", "off"]]
-    """Current value of the zone setting."""
-
-
-class WebP(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["webp"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["off", "on"]]
-    """Current value of the zone setting."""
-
-
-class Websocket(TypedDict, total=False):
-    zone_id: Required[str]
-    """Identifier"""
-
-    id: Required[Literal["websockets"]]
-    """ID of the zone setting."""
-
-    value: Required[Literal["off", "on"]]
-    """Current value of the zone setting."""
-
-
-SettingEditParams = Union[
-    ZeroRTT,
-    AdvancedDDoS,
-    AlwaysOnline,
-    AlwaysUseHTTPS,
-    AutomaticHTTPSRewrites,
-    Brotli,
-    BrowserCacheTTL,
-    BrowserCheck,
-    CacheLevel,
-    ChallengeTTL,
-    Ciphers,
-    ZonesCNAMEFlattening,
-    DevelopmentMode,
-    EarlyHints,
-    ZonesEdgeCacheTTL,
-    EmailObfuscation,
-    H2Prioritization,
-    HotlinkProtection,
-    HTTP2,
-    HTTP3,
-    ImageResizing,
-    IPGeolocation,
-    IPV6,
-    ZonesMaxUpload,
-    MinTLSVersion,
-    Minify,
-    Mirage,
-    MobileRedirect,
-    NEL,
-    OpportunisticEncryption,
-    OpportunisticOnion,
-    OrangeToOrange,
-    OriginErrorPagePassThru,
-    Polish,
-    PrefetchPreload,
-    ProxyReadTimeout,
-    PseudoIPV4,
-    ZonesReplaceInsecureJS,
-    ResponseBuffering,
-    RocketLoader,
-    ZonesSchemasAutomaticPlatformOptimization,
-    SecurityHeaders,
-    SecurityLevel,
-    ServerSideExcludes,
-    ZonesSha1Support,
-    SortQueryStringForCache,
-    SSL,
-    SSLRecommender,
-    ZonesTLS1_2Only,
-    TLS1_3,
-    TLSClientAuth,
-    TrueClientIPHeader,
-    WAF,
-    WebP,
-    Websocket,
+Variant1Value: TypeAlias = Union[
+    Variant1ValueZonesCacheRulesAegisValue,
+    SequenceNotStr[str],
+    Variant1ValueZonesNELValue,
+    float,
+    AutomaticPlatformOptimizationParam,
+    Variant1ValueZonesSecurityHeaderValue,
+    object,
 ]
+
+SettingEditParams: TypeAlias = Union[Variant0, Variant1]
diff --git a/src/cloudflare/types/zones/setting_edit_response.py b/src/cloudflare/types/zones/setting_edit_response.py
index 3c12f6a75d6..9a65fcb24a0 100644
--- a/src/cloudflare/types/zones/setting_edit_response.py
+++ b/src/cloudflare/types/zones/setting_edit_response.py
@@ -2,72 +2,255 @@
 
 from typing import Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from .nel import NEL
-from .ssl import SSL
-from .waf import WAF
 from .ipv6 import IPV6
 from .webp import WebP
 from .http2 import HTTP2
 from .http3 import HTTP3
 from .brotli import Brotli
-from .minify import Minify
-from .mirage import Mirage
-from .polish import Polish
 from .ciphers import Ciphers
 from .tls_1_3 import TLS1_3
 from .zero_rtt import ZeroRTT
 from ..._models import BaseModel
 from .websocket import Websocket
-from .cache_level import CacheLevel
 from .early_hints import EarlyHints
 from .pseudo_ipv4 import PseudoIPV4
 from .advanced_ddos import AdvancedDDoS
 from .always_online import AlwaysOnline
-from .browser_check import BrowserCheck
 from .challenge_ttl import ChallengeTTL
-from .rocket_loader import RocketLoader
 from .image_resizing import ImageResizing
-from .ip_geolocation import IPGeolocation
-from .security_level import SecurityLevel
 from .min_tls_version import MinTLSVersion
-from .mobile_redirect import MobileRedirect
 from .ssl_recommender import SSLRecommender
 from .tls_client_auth import TLSClientAuth
-from .always_use_https import AlwaysUseHTTPS
 from .development_mode import DevelopmentMode
 from .orange_to_orange import OrangeToOrange
 from .prefetch_preload import PrefetchPreload
 from .security_headers import SecurityHeaders
-from .browser_cache_ttl import BrowserCacheTTL
-from .email_obfuscation import EmailObfuscation
 from .h2_prioritization import H2Prioritization
 from .hotlink_protection import HotlinkProtection
 from .proxy_read_timeout import ProxyReadTimeout
-from .response_buffering import ResponseBuffering
 from .opportunistic_onion import OpportunisticOnion
 from .server_side_excludes import ServerSideExcludes
-from .true_client_ip_header import TrueClientIPHeader
-from .automatic_https_rewrites import AutomaticHTTPSRewrites
-from .opportunistic_encryption import OpportunisticEncryption
-from .origin_error_page_pass_thru import OriginErrorPagePassThru
-from .sort_query_string_for_cache import SortQueryStringForCache
 from .automatic_platform_optimization import AutomaticPlatformOptimization
 
 __all__ = [
     "SettingEditResponse",
+    "ZonesCacheRulesAegis",
+    "ZonesCacheRulesAegisValue",
+    "ZonesSchemasAlwaysUseHTTPS",
+    "ZonesSchemasAutomaticHTTPSRewrites",
+    "ZonesSchemasBrowserCacheTTL",
+    "ZonesSchemasBrowserCheck",
+    "ZonesSchemasCacheLevel",
+    "ZonesChinaNetworkEnabled",
+    "ZonesContentConverter",
     "ZonesCNAMEFlattening",
-    "ZonesEdgeCacheTTL",
+    "ZonesSchemasEdgeCacheTTL",
+    "ZonesSchemasEmailObfuscation",
+    "ZonesSchemasIPGeolocation",
     "ZonesMaxUpload",
+    "ZonesSchemasMirage",
+    "ZonesSchemasOpportunisticEncryption",
+    "ZonesSchemasOriginErrorPagePassThru",
+    "ZonesCacheRulesOriginH2MaxStreams",
+    "ZonesCacheRulesOriginMaxHTTPVersion",
+    "ZonesSchemasPolish",
+    "ZonesPrivacyPass",
     "ZonesReplaceInsecureJS",
+    "ZonesSchemasResponseBuffering",
+    "ZonesSchemasRocketLoader",
     "ZonesSchemasAutomaticPlatformOptimization",
+    "ZonesSchemasSecurityLevel",
     "ZonesSha1Support",
+    "ZonesSchemasSortQueryStringForCache",
+    "ZonesSchemasSSL",
     "ZonesTLS1_2Only",
+    "ZonesTransformations",
+    "ZonesTransformationsAllowedOrigins",
+    "ZonesSchemasTrueClientIPHeader",
+    "ZonesSchemasWAF",
 ]
 
 
+class ZonesCacheRulesAegisValue(BaseModel):
+    """Value of the zone setting."""
+
+    enabled: Optional[bool] = None
+    """Whether the feature is enabled or not."""
+
+    pool_id: Optional[str] = None
+    """
+    Egress pool id which refers to a grouping of dedicated egress IPs through which
+    Cloudflare will connect to origin.
+    """
+
+
+class ZonesCacheRulesAegis(BaseModel):
+    """
+    Aegis provides dedicated egress IPs (from Cloudflare to your origin) for your layer 7 WAF and CDN services. The egress IPs are reserved exclusively for your account so that you can increase your origin security by only allowing traffic from a small list of IP addresses.
+    """
+
+    id: Literal["aegis"]
+    """ID of the zone setting."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
+
+    value: Optional[ZonesCacheRulesAegisValue] = None
+    """Value of the zone setting."""
+
+
+class ZonesSchemasAlwaysUseHTTPS(BaseModel):
+    """
+    Reply to all requests for URLs that use "http" with a 301 redirect to the equivalent "https" URL. If you only want to redirect for a subset of requests, consider creating an "Always use HTTPS" page rule.
+    """
+
+    id: Literal["always_use_https"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasAutomaticHTTPSRewrites(BaseModel):
+    """Enable the Automatic HTTPS Rewrites feature for this zone."""
+
+    id: Literal["automatic_https_rewrites"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasBrowserCacheTTL(BaseModel):
+    """
+    Browser Cache TTL (in seconds) specifies how long Cloudflare-cached resources will remain on your visitors' computers. Cloudflare will honor any larger times specified by your server. (https://support.cloudflare.com/hc/en-us/articles/200168276).
+    """
+
+    id: Literal["browser_cache_ttl"]
+    """ID of the zone setting."""
+
+    value: int
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasBrowserCheck(BaseModel):
+    """
+    Browser Integrity Check is similar to Bad Behavior and looks for common HTTP headers abused most commonly by spammers and denies access to your page.  It will also challenge visitors that do not have a user agent or a non standard user agent (also commonly used by abuse bots, crawlers or visitors). (https://support.cloudflare.com/hc/en-us/articles/200170086).
+    """
+
+    id: Literal["browser_check"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasCacheLevel(BaseModel):
+    """Cache Level functions based off the setting level.
+
+    The basic setting will cache most static resources (i.e., css, images, and JavaScript). The simplified setting will ignore the query string when delivering a cached resource. The aggressive setting will cache all static resources, including ones with a query string. (https://support.cloudflare.com/hc/en-us/articles/200168256).
+    """
+
+    id: Literal["cache_level"]
+    """ID of the zone setting."""
+
+    value: Literal["aggressive", "basic", "simplified"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesChinaNetworkEnabled(BaseModel):
+    """Determines whether or not the china network is enabled."""
+
+    id: Literal["china_network_enabled"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesContentConverter(BaseModel):
+    """
+    When enabled and the client sends an Accept header requesting text/markdown,
+    Cloudflare will convert HTML responses to Markdown format using the toMarkdown() service.
+    Refer to the [developer documentation](https://developers.cloudflare.com/workers-ai/features/markdown-conversion/) for more information.
+    """
+
+    id: Literal["content_converter"]
+    """ID of the zone setting."""
+
+    value: Literal["off", "on"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
 class ZonesCNAMEFlattening(BaseModel):
+    """Whether or not cname flattening is on."""
+
     id: Literal["cname_flattening"]
     """How to flatten the cname destination."""
 
@@ -84,7 +267,11 @@ class ZonesCNAMEFlattening(BaseModel):
     """last time this setting was modified."""
 
 
-class ZonesEdgeCacheTTL(BaseModel):
+class ZonesSchemasEdgeCacheTTL(BaseModel):
+    """
+    Time (in seconds) that a resource will be ensured to remain on Cloudflare's cache servers.
+    """
+
     id: Literal["edge_cache_ttl"]
     """ID of the zone setting."""
 
@@ -123,11 +310,192 @@ class ZonesEdgeCacheTTL(BaseModel):
     """last time this setting was modified."""
 
 
+class ZonesSchemasEmailObfuscation(BaseModel):
+    """
+    Encrypt email adresses on your web page from bots, while keeping them visible to humans. (https://support.cloudflare.com/hc/en-us/articles/200170016).
+    """
+
+    id: Literal["email_obfuscation"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasIPGeolocation(BaseModel):
+    """
+    Enable IP Geolocation to have Cloudflare geolocate visitors to your website and pass the country code to you. (https://support.cloudflare.com/hc/en-us/articles/200168236).
+    """
+
+    id: Literal["ip_geolocation"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
 class ZonesMaxUpload(BaseModel):
+    """Maximum size of an allowable upload."""
+
     id: Literal["max_upload"]
     """identifier of the zone setting."""
 
-    value: Literal[100, 200, 500]
+    value: Literal[100, 125, 150, 175, 200, 225, 250, 275, 300, 325, 350, 375, 400, 425, 450, 475, 500, 1000]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasMirage(BaseModel):
+    """Automatically optimize image loading for website visitors on mobile
+    devices.
+
+    Refer to [our blog post](http://blog.cloudflare.com/mirage2-solving-mobile-speed)
+    for more information.
+    """
+
+    id: Literal["mirage"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasOpportunisticEncryption(BaseModel):
+    """Enables the Opportunistic Encryption feature for a zone."""
+
+    id: Literal["opportunistic_encryption"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasOriginErrorPagePassThru(BaseModel):
+    """
+    Cloudflare will proxy customer error pages on any 502,504 errors on origin server instead of showing a default Cloudflare error page. This does not apply to 522 errors and is limited to Enterprise Zones.
+    """
+
+    id: Literal["origin_error_page_pass_thru"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesCacheRulesOriginH2MaxStreams(BaseModel):
+    """
+    Origin H2 Max Streams configures the max number of concurrent requests that Cloudflare will send within the same connection when communicating with the origin server, if the origin supports it. Note that if your origin does not support H2 multiplexing, 5xx errors may be observed, particularly 520s. Also note that the default value is `100` for all plan types except Enterprise where it is `1`. `1` means that H2 multiplexing is disabled.
+    """
+
+    id: Literal["origin_h2_max_streams"]
+    """Value of the zone setting."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
+
+    value: Optional[int] = None
+    """Value of the Origin H2 Max Streams Setting."""
+
+
+class ZonesCacheRulesOriginMaxHTTPVersion(BaseModel):
+    """
+    Origin Max HTTP Setting Version sets the highest HTTP version Cloudflare will attempt to use with your origin. This setting allows Cloudflare to make HTTP/2 requests to your origin. (Refer to [Enable HTTP/2 to Origin](https://developers.cloudflare.com/cache/how-to/enable-http2-to-origin/), for more information.). The default value is "2" for all plan types except Enterprise where it is "1".
+    """
+
+    id: Literal["origin_max_http_version"]
+    """Value of the zone setting."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
+
+    value: Optional[Literal["2", "1"]] = None
+    """Value of the Origin Max HTTP Version Setting."""
+
+
+class ZonesSchemasPolish(BaseModel):
+    """Removes metadata and compresses your images for faster page load times.
+
+    Basic (Lossless): Reduce the size of PNG, JPEG, and GIF files - no impact on visual quality. Basic + JPEG (Lossy): Further reduce the size of JPEG files for faster image loading. Larger JPEGs are converted to progressive images, loading a lower-resolution image first and ending in a higher-resolution version. Not recommended for hi-res photography sites.
+    """
+
+    id: Literal["polish"]
+    """ID of the zone setting."""
+
+    value: Literal["off", "lossless", "lossy"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesPrivacyPass(BaseModel):
+    """
+    Privacy Pass v1 was a browser extension developed by the Privacy Pass Team to improve the browsing experience for your visitors by allowing users to reduce the number of CAPTCHAs shown. (https://support.cloudflare.com/hc/en-us/articles/115001992652-Privacy-Pass).
+    """
+
+    id: Literal["privacy_pass"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
     """Current value of the zone setting."""
 
     editable: Optional[Literal[True, False]] = None
@@ -141,6 +509,10 @@ class ZonesMaxUpload(BaseModel):
 
 
 class ZonesReplaceInsecureJS(BaseModel):
+    """
+    Automatically replace insecure JavaScript libraries with safer and faster alternatives provided under cdnjs and powered by Cloudflare. Currently supports the following libraries: Polyfill under polyfill.io.
+    """
+
     id: Literal["replace_insecure_js"]
     """ID of the zone setting."""
 
@@ -157,7 +529,54 @@ class ZonesReplaceInsecureJS(BaseModel):
     """last time this setting was modified."""
 
 
+class ZonesSchemasResponseBuffering(BaseModel):
+    """Enables or disables buffering of responses from the proxied server.
+
+    Cloudflare may buffer the whole payload to deliver it at once to the client versus allowing it to be delivered in chunks. By default, the proxied server streams directly and is not buffered by Cloudflare. This is limited to Enterprise Zones.
+    """
+
+    id: Literal["response_buffering"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasRocketLoader(BaseModel):
+    """
+    Rocket Loader is a general-purpose asynchronous JavaScript optimisation that prioritises rendering your content while loading your site's Javascript asynchronously. Turning on Rocket Loader will immediately improve a web page's rendering time sometimes measured as Time to First Paint (TTFP), and also the `window.onload` time (assuming there is JavaScript on the page). This can have a positive impact on your Google search ranking. When turned on, Rocket Loader will automatically defer the loading of all Javascript referenced in your HTML, with no configuration required. Refer to [Understanding Rocket Loader](https://support.cloudflare.com/hc/articles/200168056) for more information.
+    """
+
+    id: Literal["rocket_loader"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
 class ZonesSchemasAutomaticPlatformOptimization(BaseModel):
+    """
+    [Automatic Platform Optimization for WordPress](https://developers.cloudflare.com/automatic-platform-optimization/) serves your WordPress site from Cloudflare's edge network and caches third-party fonts.
+    """
+
     id: Literal["automatic_platform_optimization"]
     """ID of the zone setting."""
 
@@ -174,7 +593,30 @@ class ZonesSchemasAutomaticPlatformOptimization(BaseModel):
     """last time this setting was modified."""
 
 
+class ZonesSchemasSecurityLevel(BaseModel):
+    """
+    Choose the appropriate security profile for your website, which will automatically adjust each of the security settings. If you choose to customize an individual security setting, the profile will become Custom. (https://support.cloudflare.com/hc/en-us/articles/200170056).
+    """
+
+    id: Literal["security_level"]
+    """ID of the zone setting."""
+
+    value: Literal["off", "essentially_off", "low", "medium", "high", "under_attack"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
 class ZonesSha1Support(BaseModel):
+    """Allow SHA1 support."""
+
     id: Literal["sha1_support"]
     """Zone setting identifier."""
 
@@ -191,7 +633,51 @@ class ZonesSha1Support(BaseModel):
     """last time this setting was modified."""
 
 
+class ZonesSchemasSortQueryStringForCache(BaseModel):
+    """
+    Cloudflare will treat files with the same query strings as the same file in cache, regardless of the order of the query strings. This is limited to Enterprise Zones.
+    """
+
+    id: Literal["sort_query_string_for_cache"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasSSL(BaseModel):
+    """
+    SSL encrypts your visitor's connection and safeguards credit card numbers and other personal data to and from your website. SSL can take up to 5 minutes to fully activate. Requires Cloudflare active on your root domain or www domain. Off: no SSL between the visitor and Cloudflare, and no SSL between Cloudflare and your web server  (all HTTP traffic). Flexible: SSL between the visitor and Cloudflare -- visitor sees HTTPS on your site, but no SSL between Cloudflare and your web server. You don't need to have an SSL cert on your web server, but your vistors will still see the site as being HTTPS enabled. Full:  SSL between the visitor and Cloudflare -- visitor sees HTTPS on your site, and SSL between Cloudflare and your web server. You'll need to have your own SSL cert or self-signed cert at the very least. Full (Strict): SSL between the visitor and Cloudflare -- visitor sees HTTPS on your site, and SSL between Cloudflare and your web server. You'll need to have a valid SSL certificate installed on your web server. This certificate must be signed by a certificate authority, have an expiration date in the future, and respond for the request domain name (hostname). (https://support.cloudflare.com/hc/en-us/articles/200170416).
+    """
+
+    id: Literal["ssl"]
+    """ID of the zone setting."""
+
+    value: Literal["off", "flexible", "full", "strict"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
 class ZonesTLS1_2Only(BaseModel):
+    """Only allows TLS1.2."""
+
     id: Literal["tls_1_2_only"]
     """Zone setting identifier."""
 
@@ -208,60 +694,157 @@ class ZonesTLS1_2Only(BaseModel):
     """last time this setting was modified."""
 
 
-SettingEditResponse = Union[
+class ZonesTransformations(BaseModel):
+    """
+    Media Transformations provides on-demand resizing, conversion and optimization for images and video served through Cloudflare's network. Refer to the [Image Transformations](https://developers.cloudflare.com/images/) and [Video Transformations](https://developers.cloudflare.com/stream/transform-videos/#getting-started) documentation for more information.
+    """
+
+    id: Literal["transformations"]
+    """ID of the zone setting.
+
+    Shared between Image Transformations and Video Transformations.
+    """
+
+    value: Literal["on", "off", "open"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesTransformationsAllowedOrigins(BaseModel):
+    """
+    Media Transformations Allowed Origins restricts transformations for images and video served through Cloudflare's network. Refer to the [Image Transformations](https://developers.cloudflare.com/images/) and [Video Transformations](https://developers.cloudflare.com/stream/transform-videos/#getting-started) documentation for more information.
+    """
+
+    id: Literal["transformations_allowed_origins"]
+    """ID of the zone setting.
+
+    Shared between Image Transformations and Video Transformations.
+    """
+
+    value: str
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasTrueClientIPHeader(BaseModel):
+    """
+    Allows customer to continue to use True Client IP (Akamai feature) in the headers we send to the origin. This is limited to Enterprise Zones.
+    """
+
+    id: Literal["true_client_ip_header"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasWAF(BaseModel):
+    """The WAF examines HTTP requests to your website.
+
+    It inspects both GET and POST requests and applies rules to help filter out illegitimate traffic from legitimate website visitors. The Cloudflare WAF inspects website addresses or URLs to detect anything out of the ordinary. If the Cloudflare WAF determines suspicious user behavior, then the WAF will 'challenge' the web visitor with a page that asks them to submit a CAPTCHA successfully  to continue their action. If the challenge is failed, the action will be stopped. What this means is that Cloudflare's WAF will block any traffic identified as illegitimate before it reaches your origin web server. (https://support.cloudflare.com/hc/en-us/articles/200172016).
+    """
+
+    id: Literal["waf"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+SettingEditResponse: TypeAlias = Union[
     ZeroRTT,
     AdvancedDDoS,
+    ZonesCacheRulesAegis,
     AlwaysOnline,
-    AlwaysUseHTTPS,
-    AutomaticHTTPSRewrites,
+    ZonesSchemasAlwaysUseHTTPS,
+    ZonesSchemasAutomaticHTTPSRewrites,
     Brotli,
-    BrowserCacheTTL,
-    BrowserCheck,
-    CacheLevel,
+    ZonesSchemasBrowserCacheTTL,
+    ZonesSchemasBrowserCheck,
+    ZonesSchemasCacheLevel,
     ChallengeTTL,
+    ZonesChinaNetworkEnabled,
+    ZonesContentConverter,
     Ciphers,
     ZonesCNAMEFlattening,
     DevelopmentMode,
     EarlyHints,
-    ZonesEdgeCacheTTL,
-    EmailObfuscation,
+    ZonesSchemasEdgeCacheTTL,
+    ZonesSchemasEmailObfuscation,
     H2Prioritization,
     HotlinkProtection,
     HTTP2,
     HTTP3,
     ImageResizing,
-    IPGeolocation,
+    ZonesSchemasIPGeolocation,
     IPV6,
     ZonesMaxUpload,
     MinTLSVersion,
-    Minify,
-    Mirage,
-    MobileRedirect,
+    ZonesSchemasMirage,
     NEL,
-    OpportunisticEncryption,
+    ZonesSchemasOpportunisticEncryption,
     OpportunisticOnion,
     OrangeToOrange,
-    OriginErrorPagePassThru,
-    Polish,
+    ZonesSchemasOriginErrorPagePassThru,
+    ZonesCacheRulesOriginH2MaxStreams,
+    ZonesCacheRulesOriginMaxHTTPVersion,
+    ZonesSchemasPolish,
     PrefetchPreload,
+    ZonesPrivacyPass,
     ProxyReadTimeout,
     PseudoIPV4,
     ZonesReplaceInsecureJS,
-    ResponseBuffering,
-    RocketLoader,
+    ZonesSchemasResponseBuffering,
+    ZonesSchemasRocketLoader,
     ZonesSchemasAutomaticPlatformOptimization,
     SecurityHeaders,
-    SecurityLevel,
+    ZonesSchemasSecurityLevel,
     ServerSideExcludes,
     ZonesSha1Support,
-    SortQueryStringForCache,
-    SSL,
+    ZonesSchemasSortQueryStringForCache,
+    ZonesSchemasSSL,
     SSLRecommender,
     ZonesTLS1_2Only,
     TLS1_3,
     TLSClientAuth,
-    TrueClientIPHeader,
-    WAF,
+    ZonesTransformations,
+    ZonesTransformationsAllowedOrigins,
+    ZonesSchemasTrueClientIPHeader,
+    ZonesSchemasWAF,
     WebP,
     Websocket,
 ]
diff --git a/src/cloudflare/types/zones/setting_get_response.py b/src/cloudflare/types/zones/setting_get_response.py
index 692ee89b86c..5976efc6f37 100644
--- a/src/cloudflare/types/zones/setting_get_response.py
+++ b/src/cloudflare/types/zones/setting_get_response.py
@@ -2,72 +2,255 @@
 
 from typing import Union, Optional
 from datetime import datetime
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 from .nel import NEL
-from .ssl import SSL
-from .waf import WAF
 from .ipv6 import IPV6
 from .webp import WebP
 from .http2 import HTTP2
 from .http3 import HTTP3
 from .brotli import Brotli
-from .minify import Minify
-from .mirage import Mirage
-from .polish import Polish
 from .ciphers import Ciphers
 from .tls_1_3 import TLS1_3
 from .zero_rtt import ZeroRTT
 from ..._models import BaseModel
 from .websocket import Websocket
-from .cache_level import CacheLevel
 from .early_hints import EarlyHints
 from .pseudo_ipv4 import PseudoIPV4
 from .advanced_ddos import AdvancedDDoS
 from .always_online import AlwaysOnline
-from .browser_check import BrowserCheck
 from .challenge_ttl import ChallengeTTL
-from .rocket_loader import RocketLoader
 from .image_resizing import ImageResizing
-from .ip_geolocation import IPGeolocation
-from .security_level import SecurityLevel
 from .min_tls_version import MinTLSVersion
-from .mobile_redirect import MobileRedirect
 from .ssl_recommender import SSLRecommender
 from .tls_client_auth import TLSClientAuth
-from .always_use_https import AlwaysUseHTTPS
 from .development_mode import DevelopmentMode
 from .orange_to_orange import OrangeToOrange
 from .prefetch_preload import PrefetchPreload
 from .security_headers import SecurityHeaders
-from .browser_cache_ttl import BrowserCacheTTL
-from .email_obfuscation import EmailObfuscation
 from .h2_prioritization import H2Prioritization
 from .hotlink_protection import HotlinkProtection
 from .proxy_read_timeout import ProxyReadTimeout
-from .response_buffering import ResponseBuffering
 from .opportunistic_onion import OpportunisticOnion
 from .server_side_excludes import ServerSideExcludes
-from .true_client_ip_header import TrueClientIPHeader
-from .automatic_https_rewrites import AutomaticHTTPSRewrites
-from .opportunistic_encryption import OpportunisticEncryption
-from .origin_error_page_pass_thru import OriginErrorPagePassThru
-from .sort_query_string_for_cache import SortQueryStringForCache
 from .automatic_platform_optimization import AutomaticPlatformOptimization
 
 __all__ = [
     "SettingGetResponse",
+    "ZonesCacheRulesAegis",
+    "ZonesCacheRulesAegisValue",
+    "ZonesSchemasAlwaysUseHTTPS",
+    "ZonesSchemasAutomaticHTTPSRewrites",
+    "ZonesSchemasBrowserCacheTTL",
+    "ZonesSchemasBrowserCheck",
+    "ZonesSchemasCacheLevel",
+    "ZonesChinaNetworkEnabled",
+    "ZonesContentConverter",
     "ZonesCNAMEFlattening",
-    "ZonesEdgeCacheTTL",
+    "ZonesSchemasEdgeCacheTTL",
+    "ZonesSchemasEmailObfuscation",
+    "ZonesSchemasIPGeolocation",
     "ZonesMaxUpload",
+    "ZonesSchemasMirage",
+    "ZonesSchemasOpportunisticEncryption",
+    "ZonesSchemasOriginErrorPagePassThru",
+    "ZonesCacheRulesOriginH2MaxStreams",
+    "ZonesCacheRulesOriginMaxHTTPVersion",
+    "ZonesSchemasPolish",
+    "ZonesPrivacyPass",
     "ZonesReplaceInsecureJS",
+    "ZonesSchemasResponseBuffering",
+    "ZonesSchemasRocketLoader",
     "ZonesSchemasAutomaticPlatformOptimization",
+    "ZonesSchemasSecurityLevel",
     "ZonesSha1Support",
+    "ZonesSchemasSortQueryStringForCache",
+    "ZonesSchemasSSL",
     "ZonesTLS1_2Only",
+    "ZonesTransformations",
+    "ZonesTransformationsAllowedOrigins",
+    "ZonesSchemasTrueClientIPHeader",
+    "ZonesSchemasWAF",
 ]
 
 
+class ZonesCacheRulesAegisValue(BaseModel):
+    """Value of the zone setting."""
+
+    enabled: Optional[bool] = None
+    """Whether the feature is enabled or not."""
+
+    pool_id: Optional[str] = None
+    """
+    Egress pool id which refers to a grouping of dedicated egress IPs through which
+    Cloudflare will connect to origin.
+    """
+
+
+class ZonesCacheRulesAegis(BaseModel):
+    """
+    Aegis provides dedicated egress IPs (from Cloudflare to your origin) for your layer 7 WAF and CDN services. The egress IPs are reserved exclusively for your account so that you can increase your origin security by only allowing traffic from a small list of IP addresses.
+    """
+
+    id: Literal["aegis"]
+    """ID of the zone setting."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
+
+    value: Optional[ZonesCacheRulesAegisValue] = None
+    """Value of the zone setting."""
+
+
+class ZonesSchemasAlwaysUseHTTPS(BaseModel):
+    """
+    Reply to all requests for URLs that use "http" with a 301 redirect to the equivalent "https" URL. If you only want to redirect for a subset of requests, consider creating an "Always use HTTPS" page rule.
+    """
+
+    id: Literal["always_use_https"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasAutomaticHTTPSRewrites(BaseModel):
+    """Enable the Automatic HTTPS Rewrites feature for this zone."""
+
+    id: Literal["automatic_https_rewrites"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasBrowserCacheTTL(BaseModel):
+    """
+    Browser Cache TTL (in seconds) specifies how long Cloudflare-cached resources will remain on your visitors' computers. Cloudflare will honor any larger times specified by your server. (https://support.cloudflare.com/hc/en-us/articles/200168276).
+    """
+
+    id: Literal["browser_cache_ttl"]
+    """ID of the zone setting."""
+
+    value: int
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasBrowserCheck(BaseModel):
+    """
+    Browser Integrity Check is similar to Bad Behavior and looks for common HTTP headers abused most commonly by spammers and denies access to your page.  It will also challenge visitors that do not have a user agent or a non standard user agent (also commonly used by abuse bots, crawlers or visitors). (https://support.cloudflare.com/hc/en-us/articles/200170086).
+    """
+
+    id: Literal["browser_check"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasCacheLevel(BaseModel):
+    """Cache Level functions based off the setting level.
+
+    The basic setting will cache most static resources (i.e., css, images, and JavaScript). The simplified setting will ignore the query string when delivering a cached resource. The aggressive setting will cache all static resources, including ones with a query string. (https://support.cloudflare.com/hc/en-us/articles/200168256).
+    """
+
+    id: Literal["cache_level"]
+    """ID of the zone setting."""
+
+    value: Literal["aggressive", "basic", "simplified"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesChinaNetworkEnabled(BaseModel):
+    """Determines whether or not the china network is enabled."""
+
+    id: Literal["china_network_enabled"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesContentConverter(BaseModel):
+    """
+    When enabled and the client sends an Accept header requesting text/markdown,
+    Cloudflare will convert HTML responses to Markdown format using the toMarkdown() service.
+    Refer to the [developer documentation](https://developers.cloudflare.com/workers-ai/features/markdown-conversion/) for more information.
+    """
+
+    id: Literal["content_converter"]
+    """ID of the zone setting."""
+
+    value: Literal["off", "on"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
 class ZonesCNAMEFlattening(BaseModel):
+    """Whether or not cname flattening is on."""
+
     id: Literal["cname_flattening"]
     """How to flatten the cname destination."""
 
@@ -84,7 +267,11 @@ class ZonesCNAMEFlattening(BaseModel):
     """last time this setting was modified."""
 
 
-class ZonesEdgeCacheTTL(BaseModel):
+class ZonesSchemasEdgeCacheTTL(BaseModel):
+    """
+    Time (in seconds) that a resource will be ensured to remain on Cloudflare's cache servers.
+    """
+
     id: Literal["edge_cache_ttl"]
     """ID of the zone setting."""
 
@@ -123,11 +310,192 @@ class ZonesEdgeCacheTTL(BaseModel):
     """last time this setting was modified."""
 
 
+class ZonesSchemasEmailObfuscation(BaseModel):
+    """
+    Encrypt email adresses on your web page from bots, while keeping them visible to humans. (https://support.cloudflare.com/hc/en-us/articles/200170016).
+    """
+
+    id: Literal["email_obfuscation"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasIPGeolocation(BaseModel):
+    """
+    Enable IP Geolocation to have Cloudflare geolocate visitors to your website and pass the country code to you. (https://support.cloudflare.com/hc/en-us/articles/200168236).
+    """
+
+    id: Literal["ip_geolocation"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
 class ZonesMaxUpload(BaseModel):
+    """Maximum size of an allowable upload."""
+
     id: Literal["max_upload"]
     """identifier of the zone setting."""
 
-    value: Literal[100, 200, 500]
+    value: Literal[100, 125, 150, 175, 200, 225, 250, 275, 300, 325, 350, 375, 400, 425, 450, 475, 500, 1000]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasMirage(BaseModel):
+    """Automatically optimize image loading for website visitors on mobile
+    devices.
+
+    Refer to [our blog post](http://blog.cloudflare.com/mirage2-solving-mobile-speed)
+    for more information.
+    """
+
+    id: Literal["mirage"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasOpportunisticEncryption(BaseModel):
+    """Enables the Opportunistic Encryption feature for a zone."""
+
+    id: Literal["opportunistic_encryption"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasOriginErrorPagePassThru(BaseModel):
+    """
+    Cloudflare will proxy customer error pages on any 502,504 errors on origin server instead of showing a default Cloudflare error page. This does not apply to 522 errors and is limited to Enterprise Zones.
+    """
+
+    id: Literal["origin_error_page_pass_thru"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesCacheRulesOriginH2MaxStreams(BaseModel):
+    """
+    Origin H2 Max Streams configures the max number of concurrent requests that Cloudflare will send within the same connection when communicating with the origin server, if the origin supports it. Note that if your origin does not support H2 multiplexing, 5xx errors may be observed, particularly 520s. Also note that the default value is `100` for all plan types except Enterprise where it is `1`. `1` means that H2 multiplexing is disabled.
+    """
+
+    id: Literal["origin_h2_max_streams"]
+    """Value of the zone setting."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
+
+    value: Optional[int] = None
+    """Value of the Origin H2 Max Streams Setting."""
+
+
+class ZonesCacheRulesOriginMaxHTTPVersion(BaseModel):
+    """
+    Origin Max HTTP Setting Version sets the highest HTTP version Cloudflare will attempt to use with your origin. This setting allows Cloudflare to make HTTP/2 requests to your origin. (Refer to [Enable HTTP/2 to Origin](https://developers.cloudflare.com/cache/how-to/enable-http2-to-origin/), for more information.). The default value is "2" for all plan types except Enterprise where it is "1".
+    """
+
+    id: Literal["origin_max_http_version"]
+    """Value of the zone setting."""
+
+    modified_on: Optional[datetime] = None
+    """Last time this setting was modified."""
+
+    value: Optional[Literal["2", "1"]] = None
+    """Value of the Origin Max HTTP Version Setting."""
+
+
+class ZonesSchemasPolish(BaseModel):
+    """Removes metadata and compresses your images for faster page load times.
+
+    Basic (Lossless): Reduce the size of PNG, JPEG, and GIF files - no impact on visual quality. Basic + JPEG (Lossy): Further reduce the size of JPEG files for faster image loading. Larger JPEGs are converted to progressive images, loading a lower-resolution image first and ending in a higher-resolution version. Not recommended for hi-res photography sites.
+    """
+
+    id: Literal["polish"]
+    """ID of the zone setting."""
+
+    value: Literal["off", "lossless", "lossy"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesPrivacyPass(BaseModel):
+    """
+    Privacy Pass v1 was a browser extension developed by the Privacy Pass Team to improve the browsing experience for your visitors by allowing users to reduce the number of CAPTCHAs shown. (https://support.cloudflare.com/hc/en-us/articles/115001992652-Privacy-Pass).
+    """
+
+    id: Literal["privacy_pass"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
     """Current value of the zone setting."""
 
     editable: Optional[Literal[True, False]] = None
@@ -141,6 +509,10 @@ class ZonesMaxUpload(BaseModel):
 
 
 class ZonesReplaceInsecureJS(BaseModel):
+    """
+    Automatically replace insecure JavaScript libraries with safer and faster alternatives provided under cdnjs and powered by Cloudflare. Currently supports the following libraries: Polyfill under polyfill.io.
+    """
+
     id: Literal["replace_insecure_js"]
     """ID of the zone setting."""
 
@@ -157,7 +529,54 @@ class ZonesReplaceInsecureJS(BaseModel):
     """last time this setting was modified."""
 
 
+class ZonesSchemasResponseBuffering(BaseModel):
+    """Enables or disables buffering of responses from the proxied server.
+
+    Cloudflare may buffer the whole payload to deliver it at once to the client versus allowing it to be delivered in chunks. By default, the proxied server streams directly and is not buffered by Cloudflare. This is limited to Enterprise Zones.
+    """
+
+    id: Literal["response_buffering"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasRocketLoader(BaseModel):
+    """
+    Rocket Loader is a general-purpose asynchronous JavaScript optimisation that prioritises rendering your content while loading your site's Javascript asynchronously. Turning on Rocket Loader will immediately improve a web page's rendering time sometimes measured as Time to First Paint (TTFP), and also the `window.onload` time (assuming there is JavaScript on the page). This can have a positive impact on your Google search ranking. When turned on, Rocket Loader will automatically defer the loading of all Javascript referenced in your HTML, with no configuration required. Refer to [Understanding Rocket Loader](https://support.cloudflare.com/hc/articles/200168056) for more information.
+    """
+
+    id: Literal["rocket_loader"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
 class ZonesSchemasAutomaticPlatformOptimization(BaseModel):
+    """
+    [Automatic Platform Optimization for WordPress](https://developers.cloudflare.com/automatic-platform-optimization/) serves your WordPress site from Cloudflare's edge network and caches third-party fonts.
+    """
+
     id: Literal["automatic_platform_optimization"]
     """ID of the zone setting."""
 
@@ -174,7 +593,30 @@ class ZonesSchemasAutomaticPlatformOptimization(BaseModel):
     """last time this setting was modified."""
 
 
+class ZonesSchemasSecurityLevel(BaseModel):
+    """
+    Choose the appropriate security profile for your website, which will automatically adjust each of the security settings. If you choose to customize an individual security setting, the profile will become Custom. (https://support.cloudflare.com/hc/en-us/articles/200170056).
+    """
+
+    id: Literal["security_level"]
+    """ID of the zone setting."""
+
+    value: Literal["off", "essentially_off", "low", "medium", "high", "under_attack"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
 class ZonesSha1Support(BaseModel):
+    """Allow SHA1 support."""
+
     id: Literal["sha1_support"]
     """Zone setting identifier."""
 
@@ -191,7 +633,51 @@ class ZonesSha1Support(BaseModel):
     """last time this setting was modified."""
 
 
+class ZonesSchemasSortQueryStringForCache(BaseModel):
+    """
+    Cloudflare will treat files with the same query strings as the same file in cache, regardless of the order of the query strings. This is limited to Enterprise Zones.
+    """
+
+    id: Literal["sort_query_string_for_cache"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasSSL(BaseModel):
+    """
+    SSL encrypts your visitor's connection and safeguards credit card numbers and other personal data to and from your website. SSL can take up to 5 minutes to fully activate. Requires Cloudflare active on your root domain or www domain. Off: no SSL between the visitor and Cloudflare, and no SSL between Cloudflare and your web server  (all HTTP traffic). Flexible: SSL between the visitor and Cloudflare -- visitor sees HTTPS on your site, but no SSL between Cloudflare and your web server. You don't need to have an SSL cert on your web server, but your vistors will still see the site as being HTTPS enabled. Full:  SSL between the visitor and Cloudflare -- visitor sees HTTPS on your site, and SSL between Cloudflare and your web server. You'll need to have your own SSL cert or self-signed cert at the very least. Full (Strict): SSL between the visitor and Cloudflare -- visitor sees HTTPS on your site, and SSL between Cloudflare and your web server. You'll need to have a valid SSL certificate installed on your web server. This certificate must be signed by a certificate authority, have an expiration date in the future, and respond for the request domain name (hostname). (https://support.cloudflare.com/hc/en-us/articles/200170416).
+    """
+
+    id: Literal["ssl"]
+    """ID of the zone setting."""
+
+    value: Literal["off", "flexible", "full", "strict"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
 class ZonesTLS1_2Only(BaseModel):
+    """Only allows TLS1.2."""
+
     id: Literal["tls_1_2_only"]
     """Zone setting identifier."""
 
@@ -208,60 +694,157 @@ class ZonesTLS1_2Only(BaseModel):
     """last time this setting was modified."""
 
 
-SettingGetResponse = Union[
+class ZonesTransformations(BaseModel):
+    """
+    Media Transformations provides on-demand resizing, conversion and optimization for images and video served through Cloudflare's network. Refer to the [Image Transformations](https://developers.cloudflare.com/images/) and [Video Transformations](https://developers.cloudflare.com/stream/transform-videos/#getting-started) documentation for more information.
+    """
+
+    id: Literal["transformations"]
+    """ID of the zone setting.
+
+    Shared between Image Transformations and Video Transformations.
+    """
+
+    value: Literal["on", "off", "open"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesTransformationsAllowedOrigins(BaseModel):
+    """
+    Media Transformations Allowed Origins restricts transformations for images and video served through Cloudflare's network. Refer to the [Image Transformations](https://developers.cloudflare.com/images/) and [Video Transformations](https://developers.cloudflare.com/stream/transform-videos/#getting-started) documentation for more information.
+    """
+
+    id: Literal["transformations_allowed_origins"]
+    """ID of the zone setting.
+
+    Shared between Image Transformations and Video Transformations.
+    """
+
+    value: str
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasTrueClientIPHeader(BaseModel):
+    """
+    Allows customer to continue to use True Client IP (Akamai feature) in the headers we send to the origin. This is limited to Enterprise Zones.
+    """
+
+    id: Literal["true_client_ip_header"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+class ZonesSchemasWAF(BaseModel):
+    """The WAF examines HTTP requests to your website.
+
+    It inspects both GET and POST requests and applies rules to help filter out illegitimate traffic from legitimate website visitors. The Cloudflare WAF inspects website addresses or URLs to detect anything out of the ordinary. If the Cloudflare WAF determines suspicious user behavior, then the WAF will 'challenge' the web visitor with a page that asks them to submit a CAPTCHA successfully  to continue their action. If the challenge is failed, the action will be stopped. What this means is that Cloudflare's WAF will block any traffic identified as illegitimate before it reaches your origin web server. (https://support.cloudflare.com/hc/en-us/articles/200172016).
+    """
+
+    id: Literal["waf"]
+    """ID of the zone setting."""
+
+    value: Literal["on", "off"]
+    """Current value of the zone setting."""
+
+    editable: Optional[Literal[True, False]] = None
+    """
+    Whether or not this setting can be modified for this zone (based on your
+    Cloudflare plan level).
+    """
+
+    modified_on: Optional[datetime] = None
+    """last time this setting was modified."""
+
+
+SettingGetResponse: TypeAlias = Union[
     ZeroRTT,
     AdvancedDDoS,
+    ZonesCacheRulesAegis,
     AlwaysOnline,
-    AlwaysUseHTTPS,
-    AutomaticHTTPSRewrites,
+    ZonesSchemasAlwaysUseHTTPS,
+    ZonesSchemasAutomaticHTTPSRewrites,
     Brotli,
-    BrowserCacheTTL,
-    BrowserCheck,
-    CacheLevel,
+    ZonesSchemasBrowserCacheTTL,
+    ZonesSchemasBrowserCheck,
+    ZonesSchemasCacheLevel,
     ChallengeTTL,
+    ZonesChinaNetworkEnabled,
+    ZonesContentConverter,
     Ciphers,
     ZonesCNAMEFlattening,
     DevelopmentMode,
     EarlyHints,
-    ZonesEdgeCacheTTL,
-    EmailObfuscation,
+    ZonesSchemasEdgeCacheTTL,
+    ZonesSchemasEmailObfuscation,
     H2Prioritization,
     HotlinkProtection,
     HTTP2,
     HTTP3,
     ImageResizing,
-    IPGeolocation,
+    ZonesSchemasIPGeolocation,
     IPV6,
     ZonesMaxUpload,
     MinTLSVersion,
-    Minify,
-    Mirage,
-    MobileRedirect,
+    ZonesSchemasMirage,
     NEL,
-    OpportunisticEncryption,
+    ZonesSchemasOpportunisticEncryption,
     OpportunisticOnion,
     OrangeToOrange,
-    OriginErrorPagePassThru,
-    Polish,
+    ZonesSchemasOriginErrorPagePassThru,
+    ZonesCacheRulesOriginH2MaxStreams,
+    ZonesCacheRulesOriginMaxHTTPVersion,
+    ZonesSchemasPolish,
     PrefetchPreload,
+    ZonesPrivacyPass,
     ProxyReadTimeout,
     PseudoIPV4,
     ZonesReplaceInsecureJS,
-    ResponseBuffering,
-    RocketLoader,
+    ZonesSchemasResponseBuffering,
+    ZonesSchemasRocketLoader,
     ZonesSchemasAutomaticPlatformOptimization,
     SecurityHeaders,
-    SecurityLevel,
+    ZonesSchemasSecurityLevel,
     ServerSideExcludes,
     ZonesSha1Support,
-    SortQueryStringForCache,
-    SSL,
+    ZonesSchemasSortQueryStringForCache,
+    ZonesSchemasSSL,
     SSLRecommender,
     ZonesTLS1_2Only,
     TLS1_3,
     TLSClientAuth,
-    TrueClientIPHeader,
-    WAF,
+    ZonesTransformations,
+    ZonesTransformationsAllowedOrigins,
+    ZonesSchemasTrueClientIPHeader,
+    ZonesSchemasWAF,
     WebP,
     Websocket,
 ]
diff --git a/src/cloudflare/types/zones/sort_query_string_for_cache.py b/src/cloudflare/types/zones/sort_query_string_for_cache.py
index ca2fea8aaac..368a8bd7f6b 100644
--- a/src/cloudflare/types/zones/sort_query_string_for_cache.py
+++ b/src/cloudflare/types/zones/sort_query_string_for_cache.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -10,17 +9,11 @@
 
 
 class SortQueryStringForCache(BaseModel):
-    id: Literal["sort_query_string_for_cache"]
-    """ID of the zone setting."""
+    id: Optional[Literal["sort_query_string_for_cache"]] = None
+    """Turn on or off the reordering of query strings.
 
-    value: Literal["on", "off"]
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
-    """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
+    When query strings have the same structure, caching improves.
     """
 
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    value: Optional[Literal["on", "off"]] = None
+    """The status of Query String Sort"""
diff --git a/src/cloudflare/types/zones/sort_query_string_for_cache_param.py b/src/cloudflare/types/zones/sort_query_string_for_cache_param.py
new file mode 100644
index 00000000000..7d17318329f
--- /dev/null
+++ b/src/cloudflare/types/zones/sort_query_string_for_cache_param.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["SortQueryStringForCacheParam"]
+
+
+class SortQueryStringForCacheParam(TypedDict, total=False):
+    id: Literal["sort_query_string_for_cache"]
+    """Turn on or off the reordering of query strings.
+
+    When query strings have the same structure, caching improves.
+    """
+
+    value: Literal["on", "off"]
+    """The status of Query String Sort"""
diff --git a/src/cloudflare/types/zones/ssl.py b/src/cloudflare/types/zones/ssl.py
index 720c4eaa01b..90cb436e4cb 100644
--- a/src/cloudflare/types/zones/ssl.py
+++ b/src/cloudflare/types/zones/ssl.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -10,17 +9,11 @@
 
 
 class SSL(BaseModel):
-    id: Literal["ssl"]
-    """ID of the zone setting."""
-
-    value: Literal["off", "flexible", "full", "strict"]
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
+    id: Optional[Literal["ssl"]] = None
     """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
+    Control options for the SSL feature of the Edge Certificates tab in the
+    Cloudflare SSL/TLS app.
     """
 
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    value: Optional[Literal["off", "flexible", "full", "strict", "origin_pull"]] = None
+    """The encryption mode that Cloudflare uses to connect to your origin server."""
diff --git a/src/cloudflare/types/zones/ssl_param.py b/src/cloudflare/types/zones/ssl_param.py
new file mode 100644
index 00000000000..222d5f93016
--- /dev/null
+++ b/src/cloudflare/types/zones/ssl_param.py
@@ -0,0 +1,18 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["SSLParam"]
+
+
+class SSLParam(TypedDict, total=False):
+    id: Literal["ssl"]
+    """
+    Control options for the SSL feature of the Edge Certificates tab in the
+    Cloudflare SSL/TLS app.
+    """
+
+    value: Literal["off", "flexible", "full", "strict", "origin_pull"]
+    """The encryption mode that Cloudflare uses to connect to your origin server."""
diff --git a/src/cloudflare/types/zones/ssl_recommender.py b/src/cloudflare/types/zones/ssl_recommender.py
index 3fd86d2b451..ef3ef5c0f10 100644
--- a/src/cloudflare/types/zones/ssl_recommender.py
+++ b/src/cloudflare/types/zones/ssl_recommender.py
@@ -9,6 +9,10 @@
 
 
 class SSLRecommender(BaseModel):
+    """
+    Enrollment in the SSL/TLS Recommender service which tries to detect and recommend (by sending periodic emails) the most secure SSL/TLS setting your origin servers support.
+    """
+
     id: Optional[Literal["ssl_recommender"]] = None
     """Enrollment value for SSL/TLS Recommender."""
 
diff --git a/src/cloudflare/types/zones/subscription_create_params.py b/src/cloudflare/types/zones/subscription_create_params.py
index 362a204da34..e4ceb39bcc8 100644
--- a/src/cloudflare/types/zones/subscription_create_params.py
+++ b/src/cloudflare/types/zones/subscription_create_params.py
@@ -2,32 +2,19 @@
 
 from __future__ import annotations
 
-from typing import Iterable
-from typing_extensions import Literal, TypedDict
+from typing_extensions import Literal, Required, TypedDict
 
-from ..user.rate_plan_param import RatePlanParam
-from ..user.subscription_zone_param import SubscriptionZoneParam
-from ..user.subscription_component_param import SubscriptionComponentParam
+from ..shared_params.rate_plan import RatePlan
 
-__all__ = ["SubscriptionCreateParams", "App"]
+__all__ = ["SubscriptionCreateParams"]
 
 
 class SubscriptionCreateParams(TypedDict, total=False):
-    app: App
-
-    component_values: Iterable[SubscriptionComponentParam]
-    """The list of add-ons subscribed to."""
+    zone_id: Required[str]
+    """Identifier"""
 
     frequency: Literal["weekly", "monthly", "quarterly", "yearly"]
     """How often the subscription is renewed automatically."""
 
-    rate_plan: RatePlanParam
+    rate_plan: RatePlan
     """The rate plan applied to the subscription."""
-
-    zone: SubscriptionZoneParam
-    """A simple zone object. May have null properties if not a zone subscription."""
-
-
-class App(TypedDict, total=False):
-    install_id: str
-    """app install id."""
diff --git a/src/cloudflare/types/zones/subscription_create_response.py b/src/cloudflare/types/zones/subscription_create_response.py
index 4b0efa12663..394f28b9f93 100644
--- a/src/cloudflare/types/zones/subscription_create_response.py
+++ b/src/cloudflare/types/zones/subscription_create_response.py
@@ -1,7 +1,39 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+from ..shared.rate_plan import RatePlan
 
 __all__ = ["SubscriptionCreateResponse"]
 
-SubscriptionCreateResponse = Union[Optional[str], Optional[object]]
+
+class SubscriptionCreateResponse(BaseModel):
+    id: Optional[str] = None
+    """Subscription identifier tag."""
+
+    currency: Optional[str] = None
+    """The monetary unit in which pricing information is displayed."""
+
+    current_period_end: Optional[datetime] = None
+    """The end of the current period and also when the next billing is due."""
+
+    current_period_start: Optional[datetime] = None
+    """When the current billing period started.
+
+    May match initial_period_start if this is the first period.
+    """
+
+    frequency: Optional[Literal["weekly", "monthly", "quarterly", "yearly", "not-applicable"]] = None
+    """How often the subscription is renewed automatically."""
+
+    price: Optional[float] = None
+    """The price of the subscription that will be billed, in US dollars."""
+
+    rate_plan: Optional[RatePlan] = None
+    """The rate plan applied to the subscription."""
+
+    state: Optional[Literal["Trial", "Provisioned", "Paid", "AwaitingPayment", "Cancelled", "Failed", "Expired"]] = None
+    """The state that the subscription is in."""
diff --git a/src/cloudflare/types/zones/subscription_get_response.py b/src/cloudflare/types/zones/subscription_get_response.py
index 6f4b5754077..cf4952dbd1a 100644
--- a/src/cloudflare/types/zones/subscription_get_response.py
+++ b/src/cloudflare/types/zones/subscription_get_response.py
@@ -1,7 +1,39 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+from ..shared.rate_plan import RatePlan
 
 __all__ = ["SubscriptionGetResponse"]
 
-SubscriptionGetResponse = Union[Optional[str], Optional[object]]
+
+class SubscriptionGetResponse(BaseModel):
+    id: Optional[str] = None
+    """Subscription identifier tag."""
+
+    currency: Optional[str] = None
+    """The monetary unit in which pricing information is displayed."""
+
+    current_period_end: Optional[datetime] = None
+    """The end of the current period and also when the next billing is due."""
+
+    current_period_start: Optional[datetime] = None
+    """When the current billing period started.
+
+    May match initial_period_start if this is the first period.
+    """
+
+    frequency: Optional[Literal["weekly", "monthly", "quarterly", "yearly", "not-applicable"]] = None
+    """How often the subscription is renewed automatically."""
+
+    price: Optional[float] = None
+    """The price of the subscription that will be billed, in US dollars."""
+
+    rate_plan: Optional[RatePlan] = None
+    """The rate plan applied to the subscription."""
+
+    state: Optional[Literal["Trial", "Provisioned", "Paid", "AwaitingPayment", "Cancelled", "Failed", "Expired"]] = None
+    """The state that the subscription is in."""
diff --git a/src/cloudflare/types/zones/subscription_update_params.py b/src/cloudflare/types/zones/subscription_update_params.py
new file mode 100644
index 00000000000..f6b2ae0ac96
--- /dev/null
+++ b/src/cloudflare/types/zones/subscription_update_params.py
@@ -0,0 +1,20 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, Required, TypedDict
+
+from ..shared_params.rate_plan import RatePlan
+
+__all__ = ["SubscriptionUpdateParams"]
+
+
+class SubscriptionUpdateParams(TypedDict, total=False):
+    zone_id: Required[str]
+    """Identifier"""
+
+    frequency: Literal["weekly", "monthly", "quarterly", "yearly"]
+    """How often the subscription is renewed automatically."""
+
+    rate_plan: RatePlan
+    """The rate plan applied to the subscription."""
diff --git a/src/cloudflare/types/zones/subscription_update_response.py b/src/cloudflare/types/zones/subscription_update_response.py
new file mode 100644
index 00000000000..e70c5bd9dcf
--- /dev/null
+++ b/src/cloudflare/types/zones/subscription_update_response.py
@@ -0,0 +1,39 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from datetime import datetime
+from typing_extensions import Literal
+
+from ..._models import BaseModel
+from ..shared.rate_plan import RatePlan
+
+__all__ = ["SubscriptionUpdateResponse"]
+
+
+class SubscriptionUpdateResponse(BaseModel):
+    id: Optional[str] = None
+    """Subscription identifier tag."""
+
+    currency: Optional[str] = None
+    """The monetary unit in which pricing information is displayed."""
+
+    current_period_end: Optional[datetime] = None
+    """The end of the current period and also when the next billing is due."""
+
+    current_period_start: Optional[datetime] = None
+    """When the current billing period started.
+
+    May match initial_period_start if this is the first period.
+    """
+
+    frequency: Optional[Literal["weekly", "monthly", "quarterly", "yearly", "not-applicable"]] = None
+    """How often the subscription is renewed automatically."""
+
+    price: Optional[float] = None
+    """The price of the subscription that will be billed, in US dollars."""
+
+    rate_plan: Optional[RatePlan] = None
+    """The rate plan applied to the subscription."""
+
+    state: Optional[Literal["Trial", "Provisioned", "Paid", "AwaitingPayment", "Cancelled", "Failed", "Expired"]] = None
+    """The state that the subscription is in."""
diff --git a/src/cloudflare/types/zones/tls_1_3.py b/src/cloudflare/types/zones/tls_1_3.py
index 547b489f92a..40f93e7dea0 100644
--- a/src/cloudflare/types/zones/tls_1_3.py
+++ b/src/cloudflare/types/zones/tls_1_3.py
@@ -10,6 +10,8 @@
 
 
 class TLS1_3(BaseModel):
+    """Enables Crypto TLS 1.3 feature for a zone."""
+
     id: Literal["tls_1_3"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/tls_client_auth.py b/src/cloudflare/types/zones/tls_client_auth.py
index 9d9a33649ad..851154373b2 100644
--- a/src/cloudflare/types/zones/tls_client_auth.py
+++ b/src/cloudflare/types/zones/tls_client_auth.py
@@ -10,6 +10,10 @@
 
 
 class TLSClientAuth(BaseModel):
+    """
+    TLS Client Auth requires Cloudflare to connect to your origin server using a client certificate (Enterprise Only).
+    """
+
     id: Literal["tls_client_auth"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/true_client_ip_header.py b/src/cloudflare/types/zones/true_client_ip_header.py
index c81c57535bf..ec6e643bf9e 100644
--- a/src/cloudflare/types/zones/true_client_ip_header.py
+++ b/src/cloudflare/types/zones/true_client_ip_header.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -10,17 +9,8 @@
 
 
 class TrueClientIPHeader(BaseModel):
-    id: Literal["true_client_ip_header"]
-    """ID of the zone setting."""
+    id: Optional[Literal["true_client_ip_header"]] = None
+    """Turn on or off the True-Client-IP Header feature of the Cloudflare Network app."""
 
-    value: Literal["on", "off"]
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
-    """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
-    """
-
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    value: Optional[Literal["on", "off"]] = None
+    """The status of True Client IP Header."""
diff --git a/src/cloudflare/types/zones/true_client_ip_header_param.py b/src/cloudflare/types/zones/true_client_ip_header_param.py
new file mode 100644
index 00000000000..fde7dcba35a
--- /dev/null
+++ b/src/cloudflare/types/zones/true_client_ip_header_param.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["TrueClientIPHeaderParam"]
+
+
+class TrueClientIPHeaderParam(TypedDict, total=False):
+    id: Literal["true_client_ip_header"]
+    """Turn on or off the True-Client-IP Header feature of the Cloudflare Network app."""
+
+    value: Literal["on", "off"]
+    """The status of True Client IP Header."""
diff --git a/src/cloudflare/types/zones/type.py b/src/cloudflare/types/zones/type.py
index d5f60d0c7f4..7a0bbfd2082 100644
--- a/src/cloudflare/types/zones/type.py
+++ b/src/cloudflare/types/zones/type.py
@@ -1,7 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing_extensions import Literal
+from typing_extensions import Literal, TypeAlias
 
 __all__ = ["Type"]
 
-Type = Literal["full", "partial", "secondary"]
+Type: TypeAlias = Literal["full", "partial", "secondary", "internal"]
diff --git a/src/cloudflare/types/zones/waf.py b/src/cloudflare/types/zones/waf.py
index d5f4c0d363d..c1a7efc3772 100644
--- a/src/cloudflare/types/zones/waf.py
+++ b/src/cloudflare/types/zones/waf.py
@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import Optional
-from datetime import datetime
 from typing_extensions import Literal
 
 from ..._models import BaseModel
@@ -10,17 +9,12 @@
 
 
 class WAF(BaseModel):
-    id: Literal["waf"]
-    """ID of the zone setting."""
-
-    value: Literal["on", "off"]
-    """Current value of the zone setting."""
-
-    editable: Optional[Literal[True, False]] = None
+    id: Optional[Literal["waf"]] = None
     """
-    Whether or not this setting can be modified for this zone (based on your
-    Cloudflare plan level).
+    Turn on or off
+    [WAF managed rules (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-waf-managed-rules/).
+    You cannot enable or disable individual WAF managed rules via Page Rules.
     """
 
-    modified_on: Optional[datetime] = None
-    """last time this setting was modified."""
+    value: Optional[Literal["on", "off"]] = None
+    """The status of WAF managed rules (previous version)."""
diff --git a/src/cloudflare/types/zones/waf_param.py b/src/cloudflare/types/zones/waf_param.py
new file mode 100644
index 00000000000..4cdfe2d3b83
--- /dev/null
+++ b/src/cloudflare/types/zones/waf_param.py
@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import Literal, TypedDict
+
+__all__ = ["WAFParam"]
+
+
+class WAFParam(TypedDict, total=False):
+    id: Literal["waf"]
+    """
+    Turn on or off
+    [WAF managed rules (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-waf-managed-rules/).
+    You cannot enable or disable individual WAF managed rules via Page Rules.
+    """
+
+    value: Literal["on", "off"]
+    """The status of WAF managed rules (previous version)."""
diff --git a/src/cloudflare/types/zones/webp.py b/src/cloudflare/types/zones/webp.py
index 87435839431..e9a13b2621c 100644
--- a/src/cloudflare/types/zones/webp.py
+++ b/src/cloudflare/types/zones/webp.py
@@ -10,6 +10,10 @@
 
 
 class WebP(BaseModel):
+    """
+    When the client requesting the image supports the WebP image codec, and WebP offers a performance advantage over the original image format, Cloudflare will serve a WebP version of the original image.
+    """
+
     id: Literal["webp"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/websocket.py b/src/cloudflare/types/zones/websocket.py
index 02d38041e08..4a87e2140a4 100644
--- a/src/cloudflare/types/zones/websocket.py
+++ b/src/cloudflare/types/zones/websocket.py
@@ -10,6 +10,10 @@
 
 
 class Websocket(BaseModel):
+    """
+    WebSockets are open connections sustained between the client and the origin server. Inside a WebSockets connection, the client and the origin can pass data back and forth without having to reestablish sessions. This makes exchanging data within a WebSockets connection fast. WebSockets are often used for real-time applications such as live chat and gaming. For more information refer to [Can I use Cloudflare with Websockets](https://support.cloudflare.com/hc/en-us/articles/200169466-Can-I-use-Cloudflare-with-WebSockets-).
+    """
+
     id: Literal["websockets"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/zero_rtt.py b/src/cloudflare/types/zones/zero_rtt.py
index f47d0e91f34..004b2c5a3d4 100644
--- a/src/cloudflare/types/zones/zero_rtt.py
+++ b/src/cloudflare/types/zones/zero_rtt.py
@@ -10,6 +10,8 @@
 
 
 class ZeroRTT(BaseModel):
+    """0-RTT session resumption enabled for this zone."""
+
     id: Literal["0rtt"]
     """ID of the zone setting."""
 
diff --git a/src/cloudflare/types/zones/zone.py b/src/cloudflare/types/zones/zone.py
index 38102060124..4a8b41762e6 100644
--- a/src/cloudflare/types/zones/zone.py
+++ b/src/cloudflare/types/zones/zone.py
@@ -2,51 +2,114 @@
 
 from typing import List, Optional
 from datetime import datetime
+from typing_extensions import Literal
 
+from .type import Type
 from ..._models import BaseModel
 
-__all__ = ["Zone", "Account", "Meta", "Owner"]
+__all__ = ["Zone", "Account", "Meta", "Owner", "Plan", "Tenant", "TenantUnit"]
 
 
 class Account(BaseModel):
+    """The account the zone belongs to."""
+
     id: Optional[str] = None
     """Identifier"""
 
     name: Optional[str] = None
-    """The name of the account"""
+    """The name of the account."""
 
 
 class Meta(BaseModel):
+    """Metadata about the zone."""
+
     cdn_only: Optional[bool] = None
-    """The zone is only configured for CDN"""
+    """The zone is only configured for CDN."""
 
     custom_certificate_quota: Optional[int] = None
-    """Number of Custom Certificates the zone can have"""
+    """Number of Custom Certificates the zone can have."""
 
     dns_only: Optional[bool] = None
-    """The zone is only configured for DNS"""
+    """The zone is only configured for DNS."""
 
     foundation_dns: Optional[bool] = None
-    """The zone is setup with Foundation DNS"""
+    """The zone is setup with Foundation DNS."""
 
     page_rule_quota: Optional[int] = None
-    """Number of Page Rules a zone can have"""
+    """Number of Page Rules a zone can have."""
 
     phishing_detected: Optional[bool] = None
-    """The zone has been flagged for phishing"""
+    """The zone has been flagged for phishing."""
 
     step: Optional[int] = None
 
 
 class Owner(BaseModel):
+    """The owner of the zone."""
+
     id: Optional[str] = None
     """Identifier"""
 
     name: Optional[str] = None
-    """Name of the owner"""
+    """Name of the owner."""
 
     type: Optional[str] = None
-    """The type of owner"""
+    """The type of owner."""
+
+
+class Plan(BaseModel):
+    """A Zones subscription information."""
+
+    id: Optional[str] = None
+    """Identifier"""
+
+    can_subscribe: Optional[bool] = None
+    """States if the subscription can be activated."""
+
+    currency: Optional[str] = None
+    """The denomination of the customer."""
+
+    externally_managed: Optional[bool] = None
+    """If this Zone is managed by another company."""
+
+    frequency: Optional[str] = None
+    """How often the customer is billed."""
+
+    is_subscribed: Optional[bool] = None
+    """States if the subscription active."""
+
+    legacy_discount: Optional[bool] = None
+    """If the legacy discount applies to this Zone."""
+
+    legacy_id: Optional[str] = None
+    """The legacy name of the plan."""
+
+    name: Optional[str] = None
+    """Name of the owner."""
+
+    price: Optional[float] = None
+    """How much the customer is paying."""
+
+
+class Tenant(BaseModel):
+    """
+    The root organizational unit that this zone belongs to (such as a tenant or organization).
+    """
+
+    id: Optional[str] = None
+    """Identifier"""
+
+    name: Optional[str] = None
+    """The name of the Tenant account."""
+
+
+class TenantUnit(BaseModel):
+    """
+    The immediate parent organizational unit that this zone belongs to (such as under a tenant or sub-organization).
+    """
+
+    id: Optional[str] = None
+    """Identifier"""
 
 
 class Zone(BaseModel):
@@ -54,13 +117,13 @@ class Zone(BaseModel):
     """Identifier"""
 
     account: Account
-    """The account the zone belongs to"""
+    """The account the zone belongs to."""
 
     activated_on: Optional[datetime] = None
-    """The last time proof of ownership was detected and the zone was made active"""
+    """The last time proof of ownership was detected and the zone was made active."""
 
     created_on: datetime
-    """When the zone was created"""
+    """When the zone was created."""
 
     development_mode: float
     """
@@ -70,31 +133,70 @@ class Zone(BaseModel):
     """
 
     meta: Meta
-    """Metadata about the zone"""
+    """Metadata about the zone."""
 
     modified_on: datetime
-    """When the zone was last modified"""
+    """When the zone was last modified."""
 
     name: str
-    """The domain name"""
+    """The domain name."""
 
     name_servers: List[str]
-    """The name servers Cloudflare assigns to a zone"""
+    """The name servers Cloudflare assigns to a zone."""
 
     original_dnshost: Optional[str] = None
-    """DNS host at the time of switching to Cloudflare"""
+    """DNS host at the time of switching to Cloudflare."""
 
     original_name_servers: Optional[List[str]] = None
-    """Original name servers before moving to Cloudflare"""
+    """Original name servers before moving to Cloudflare."""
 
     original_registrar: Optional[str] = None
-    """Registrar for the domain at the time of switching to Cloudflare"""
+    """Registrar for the domain at the time of switching to Cloudflare."""
 
     owner: Owner
-    """The owner of the zone"""
+    """The owner of the zone."""
+
+    plan: Plan
+    """A Zones subscription information."""
+
+    cname_suffix: Optional[str] = None
+    """Allows the customer to use a custom apex. _Tenants Only Configuration_."""
+
+    paused: Optional[bool] = None
+    """Indicates whether the zone is only using Cloudflare DNS services.
+
+    A true value means the zone will not receive security or performance benefits.
+    """
+
+    permissions: Optional[List[str]] = None
+    """Legacy permissions based on legacy user membership information."""
+
+    status: Optional[Literal["initializing", "pending", "active", "moved"]] = None
+    """The zone status on Cloudflare."""
+
+    tenant: Optional[Tenant] = None
+    """
+    The root organizational unit that this zone belongs to (such as a tenant or
+    organization).
+    """
+
+    tenant_unit: Optional[TenantUnit] = None
+    """
+    The immediate parent organizational unit that this zone belongs to (such as
+    under a tenant or sub-organization).
+    """
+
+    type: Optional[Type] = None
+    """A full zone implies that DNS is hosted with Cloudflare.
+
+    A partial zone is typically a partner-hosted zone or a CNAME setup.
+    """
 
     vanity_name_servers: Optional[List[str]] = None
     """An array of domains used for custom name servers.
 
     This is only available for Business and Enterprise plans.
     """
+
+    verification_key: Optional[str] = None
+    """Verification key for partial zone setup."""
diff --git a/src/cloudflare/types/zones/zone_create_params.py b/src/cloudflare/types/zones/zone_create_params.py
index 9500909dced..209f8e0d0a5 100644
--- a/src/cloudflare/types/zones/zone_create_params.py
+++ b/src/cloudflare/types/zones/zone_create_params.py
@@ -13,7 +13,7 @@ class ZoneCreateParams(TypedDict, total=False):
     account: Required[Account]
 
     name: Required[str]
-    """The domain name"""
+    """The domain name."""
 
     type: Type
     """A full zone implies that DNS is hosted with Cloudflare.
diff --git a/src/cloudflare/types/zones/zone_delete_response.py b/src/cloudflare/types/zones/zone_delete_response.py
index 2793f03434d..8c55f4a3e09 100644
--- a/src/cloudflare/types/zones/zone_delete_response.py
+++ b/src/cloudflare/types/zones/zone_delete_response.py
@@ -1,6 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-
 from ..._models import BaseModel
 
 __all__ = ["ZoneDeleteResponse"]
diff --git a/src/cloudflare/types/zones/zone_edit_params.py b/src/cloudflare/types/zones/zone_edit_params.py
index b31be1c2454..607b488c29e 100644
--- a/src/cloudflare/types/zones/zone_edit_params.py
+++ b/src/cloudflare/types/zones/zone_edit_params.py
@@ -2,24 +2,24 @@
 
 from __future__ import annotations
 
-from typing import List
 from typing_extensions import Literal, Required, TypedDict
 
-__all__ = ["ZoneEditParams", "Plan"]
+from ..._types import SequenceNotStr
+
+__all__ = ["ZoneEditParams"]
 
 
 class ZoneEditParams(TypedDict, total=False):
     zone_id: Required[str]
     """Identifier"""
 
-    plan: Plan
-    """
-    (Deprecated) Please use the `/zones/{zone_id}/subscription` API to update a
-    zone's plan. Changing this value will create/cancel associated subscriptions. To
-    view available plans for this zone, see Zone Plans.
+    paused: bool
+    """Indicates whether the zone is only using Cloudflare DNS services.
+
+    A true value means the zone will not receive security or performance benefits.
     """
 
-    type: Literal["full", "partial", "secondary"]
+    type: Literal["full", "partial", "secondary", "internal"]
     """A full zone implies that DNS is hosted with Cloudflare.
 
     A partial zone is typically a partner-hosted zone or a CNAME setup. This
@@ -27,13 +27,8 @@ class ZoneEditParams(TypedDict, total=False):
     enabled on a zone.
     """
 
-    vanity_name_servers: List[str]
+    vanity_name_servers: SequenceNotStr[str]
     """An array of domains used for custom name servers.
 
     This is only available for Business and Enterprise plans.
     """
-
-
-class Plan(TypedDict, total=False):
-    id: str
-    """Identifier"""
diff --git a/src/cloudflare/types/zones/zone_list_params.py b/src/cloudflare/types/zones/zone_list_params.py
index c61c3eb3c44..8e6985ebfe1 100644
--- a/src/cloudflare/types/zones/zone_list_params.py
+++ b/src/cloudflare/types/zones/zone_list_params.py
@@ -31,7 +31,7 @@ class ZoneListParams(TypedDict, total=False):
     - `contains_case_sensitive`
     """
 
-    order: Literal["name", "status", "account.id", "account.name"]
+    order: Literal["name", "status", "account.id", "account.name", "plan.id"]
     """Field to order zones by."""
 
     page: float
@@ -41,12 +41,12 @@ class ZoneListParams(TypedDict, total=False):
     """Number of zones per page."""
 
     status: Literal["initializing", "pending", "active", "moved"]
-    """A zone status"""
+    """Specify a zone status to filter by."""
 
 
 class Account(TypedDict, total=False):
     id: str
-    """An account ID"""
+    """Filter by an account ID."""
 
     name: str
     """An account Name.
diff --git a/tests/api_resources/addressing/loa_documents/__init__.py b/tests/api_resources/abuse_reports/__init__.py
similarity index 100%
rename from tests/api_resources/addressing/loa_documents/__init__.py
rename to tests/api_resources/abuse_reports/__init__.py
diff --git a/tests/api_resources/abuse_reports/test_mitigations.py b/tests/api_resources/abuse_reports/test_mitigations.py
new file mode 100644
index 00000000000..7975ce3809e
--- /dev/null
+++ b/tests/api_resources/abuse_reports/test_mitigations.py
@@ -0,0 +1,330 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePagination, AsyncV4PagePagination
+from cloudflare.types.abuse_reports import (
+    MitigationListResponse,
+    MitigationReviewResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestMitigations:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        mitigation = client.abuse_reports.mitigations.list(
+            report_id="report_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePagination[Optional[MitigationListResponse]], mitigation, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        mitigation = client.abuse_reports.mitigations.list(
+            report_id="report_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            effective_after="2009-11-10T23:00:00Z",
+            effective_before="2009-11-10T23:00:00Z",
+            entity_type="url_pattern",
+            page=0,
+            per_page=0,
+            sort="type,asc",
+            status="pending",
+            type="legal_block",
+        )
+        assert_matches_type(SyncV4PagePagination[Optional[MitigationListResponse]], mitigation, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.abuse_reports.mitigations.with_raw_response.list(
+            report_id="report_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        mitigation = response.parse()
+        assert_matches_type(SyncV4PagePagination[Optional[MitigationListResponse]], mitigation, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.abuse_reports.mitigations.with_streaming_response.list(
+            report_id="report_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            mitigation = response.parse()
+            assert_matches_type(SyncV4PagePagination[Optional[MitigationListResponse]], mitigation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.abuse_reports.mitigations.with_raw_response.list(
+                report_id="report_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_id` but received ''"):
+            client.abuse_reports.mitigations.with_raw_response.list(
+                report_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    def test_method_review(self, client: Cloudflare) -> None:
+        mitigation = client.abuse_reports.mitigations.review(
+            report_id="report_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            appeals=[
+                {
+                    "id": "id",
+                    "reason": "misclassified",
+                }
+            ],
+        )
+        assert_matches_type(SyncSinglePage[MitigationReviewResponse], mitigation, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    def test_raw_response_review(self, client: Cloudflare) -> None:
+        response = client.abuse_reports.mitigations.with_raw_response.review(
+            report_id="report_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            appeals=[
+                {
+                    "id": "id",
+                    "reason": "misclassified",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        mitigation = response.parse()
+        assert_matches_type(SyncSinglePage[MitigationReviewResponse], mitigation, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    def test_streaming_response_review(self, client: Cloudflare) -> None:
+        with client.abuse_reports.mitigations.with_streaming_response.review(
+            report_id="report_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            appeals=[
+                {
+                    "id": "id",
+                    "reason": "misclassified",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            mitigation = response.parse()
+            assert_matches_type(SyncSinglePage[MitigationReviewResponse], mitigation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    def test_path_params_review(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.abuse_reports.mitigations.with_raw_response.review(
+                report_id="report_id",
+                account_id="",
+                appeals=[
+                    {
+                        "id": "id",
+                        "reason": "misclassified",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_id` but received ''"):
+            client.abuse_reports.mitigations.with_raw_response.review(
+                report_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                appeals=[
+                    {
+                        "id": "id",
+                        "reason": "misclassified",
+                    }
+                ],
+            )
+
+
+class TestAsyncMitigations:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        mitigation = await async_client.abuse_reports.mitigations.list(
+            report_id="report_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePagination[Optional[MitigationListResponse]], mitigation, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        mitigation = await async_client.abuse_reports.mitigations.list(
+            report_id="report_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            effective_after="2009-11-10T23:00:00Z",
+            effective_before="2009-11-10T23:00:00Z",
+            entity_type="url_pattern",
+            page=0,
+            per_page=0,
+            sort="type,asc",
+            status="pending",
+            type="legal_block",
+        )
+        assert_matches_type(AsyncV4PagePagination[Optional[MitigationListResponse]], mitigation, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.abuse_reports.mitigations.with_raw_response.list(
+            report_id="report_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        mitigation = await response.parse()
+        assert_matches_type(AsyncV4PagePagination[Optional[MitigationListResponse]], mitigation, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.abuse_reports.mitigations.with_streaming_response.list(
+            report_id="report_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            mitigation = await response.parse()
+            assert_matches_type(AsyncV4PagePagination[Optional[MitigationListResponse]], mitigation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.abuse_reports.mitigations.with_raw_response.list(
+                report_id="report_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_id` but received ''"):
+            await async_client.abuse_reports.mitigations.with_raw_response.list(
+                report_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    async def test_method_review(self, async_client: AsyncCloudflare) -> None:
+        mitigation = await async_client.abuse_reports.mitigations.review(
+            report_id="report_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            appeals=[
+                {
+                    "id": "id",
+                    "reason": "misclassified",
+                }
+            ],
+        )
+        assert_matches_type(AsyncSinglePage[MitigationReviewResponse], mitigation, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    async def test_raw_response_review(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.abuse_reports.mitigations.with_raw_response.review(
+            report_id="report_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            appeals=[
+                {
+                    "id": "id",
+                    "reason": "misclassified",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        mitigation = await response.parse()
+        assert_matches_type(AsyncSinglePage[MitigationReviewResponse], mitigation, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    async def test_streaming_response_review(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.abuse_reports.mitigations.with_streaming_response.review(
+            report_id="report_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            appeals=[
+                {
+                    "id": "id",
+                    "reason": "misclassified",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            mitigation = await response.parse()
+            assert_matches_type(AsyncSinglePage[MitigationReviewResponse], mitigation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    async def test_path_params_review(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.abuse_reports.mitigations.with_raw_response.review(
+                report_id="report_id",
+                account_id="",
+                appeals=[
+                    {
+                        "id": "id",
+                        "reason": "misclassified",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_id` but received ''"):
+            await async_client.abuse_reports.mitigations.with_raw_response.review(
+                report_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                appeals=[
+                    {
+                        "id": "id",
+                        "reason": "misclassified",
+                    }
+                ],
+            )
diff --git a/tests/api_resources/addressing/prefixes/bgp/__init__.py b/tests/api_resources/accounts/logs/__init__.py
similarity index 100%
rename from tests/api_resources/addressing/prefixes/bgp/__init__.py
rename to tests/api_resources/accounts/logs/__init__.py
diff --git a/tests/api_resources/accounts/logs/test_audit.py b/tests/api_resources/accounts/logs/test_audit.py
new file mode 100644
index 00000000000..3098b4870fb
--- /dev/null
+++ b/tests/api_resources/accounts/logs/test_audit.py
@@ -0,0 +1,196 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_date
+from cloudflare.pagination import SyncCursorPaginationAfter, AsyncCursorPaginationAfter
+from cloudflare.types.accounts.logs import AuditListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestAudit:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO:investigate broken test")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        audit = client.accounts.logs.audit.list(
+            account_id="a67e14daa5f8dceeb91fe5449ba496ef",
+            before=parse_date("2024-10-31"),
+            since=parse_date("2024-10-30"),
+        )
+        assert_matches_type(SyncCursorPaginationAfter[AuditListResponse], audit, path=["response"])
+
+    @pytest.mark.skip(reason="TODO:investigate broken test")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        audit = client.accounts.logs.audit.list(
+            account_id="a67e14daa5f8dceeb91fe5449ba496ef",
+            before=parse_date("2024-10-31"),
+            since=parse_date("2024-10-30"),
+            id={"not": ["f174be97-19b1-40d6-954d-70cd5fbd52db"]},
+            account_name={"not": ["string"]},
+            action_result={"not": ["success"]},
+            action_type={"not": ["create"]},
+            actor_context={"not": ["api_key"]},
+            actor_email={"not": ["alice@example.com"]},
+            actor_id={"not": ["1d20c3afe174f18b642710cec6298a9d"]},
+            actor_ip_address={"not": ["17.168.228.63"]},
+            actor_token_id={"not": ["144cdb2e39c55e203cf225d8d8208647"]},
+            actor_token_name={"not": ["Test Token"]},
+            actor_type={"not": ["account"]},
+            audit_log_id={"not": ["f174be97-19b1-40d6-954d-70cd5fbd52db"]},
+            cursor="Q1buH-__DQqqig7SVYXT-SsMOTGY2Z3Y80W-fGgva7yaDdmPKveucH5ddOcHsJRhNb-xUK8agZQqkJSMAENGO8NU6g==",
+            direction="desc",
+            limit=25,
+            raw_cf_rayid={"not": ["8e8dd2156ef28414"]},
+            raw_method={"not": ["GET"]},
+            raw_status_code={"not": [200]},
+            raw_uri={"not": ["string"]},
+            resource_id={"not": ["string"]},
+            resource_product={"not": ["Stream"]},
+            resource_scope={"not": ["accounts"]},
+            resource_type={"not": ["Video"]},
+            zone_id={"not": ["string"]},
+            zone_name={"not": ["example.com"]},
+        )
+        assert_matches_type(SyncCursorPaginationAfter[AuditListResponse], audit, path=["response"])
+
+    @pytest.mark.skip(reason="TODO:investigate broken test")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.accounts.logs.audit.with_raw_response.list(
+            account_id="a67e14daa5f8dceeb91fe5449ba496ef",
+            before=parse_date("2024-10-31"),
+            since=parse_date("2024-10-30"),
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        audit = response.parse()
+        assert_matches_type(SyncCursorPaginationAfter[AuditListResponse], audit, path=["response"])
+
+    @pytest.mark.skip(reason="TODO:investigate broken test")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.accounts.logs.audit.with_streaming_response.list(
+            account_id="a67e14daa5f8dceeb91fe5449ba496ef",
+            before=parse_date("2024-10-31"),
+            since=parse_date("2024-10-30"),
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            audit = response.parse()
+            assert_matches_type(SyncCursorPaginationAfter[AuditListResponse], audit, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO:investigate broken test")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.accounts.logs.audit.with_raw_response.list(
+                account_id="",
+                before=parse_date("2024-10-31"),
+                since=parse_date("2024-10-30"),
+            )
+
+
+class TestAsyncAudit:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO:investigate broken test")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        audit = await async_client.accounts.logs.audit.list(
+            account_id="a67e14daa5f8dceeb91fe5449ba496ef",
+            before=parse_date("2024-10-31"),
+            since=parse_date("2024-10-30"),
+        )
+        assert_matches_type(AsyncCursorPaginationAfter[AuditListResponse], audit, path=["response"])
+
+    @pytest.mark.skip(reason="TODO:investigate broken test")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        audit = await async_client.accounts.logs.audit.list(
+            account_id="a67e14daa5f8dceeb91fe5449ba496ef",
+            before=parse_date("2024-10-31"),
+            since=parse_date("2024-10-30"),
+            id={"not": ["f174be97-19b1-40d6-954d-70cd5fbd52db"]},
+            account_name={"not": ["string"]},
+            action_result={"not": ["success"]},
+            action_type={"not": ["create"]},
+            actor_context={"not": ["api_key"]},
+            actor_email={"not": ["alice@example.com"]},
+            actor_id={"not": ["1d20c3afe174f18b642710cec6298a9d"]},
+            actor_ip_address={"not": ["17.168.228.63"]},
+            actor_token_id={"not": ["144cdb2e39c55e203cf225d8d8208647"]},
+            actor_token_name={"not": ["Test Token"]},
+            actor_type={"not": ["account"]},
+            audit_log_id={"not": ["f174be97-19b1-40d6-954d-70cd5fbd52db"]},
+            cursor="Q1buH-__DQqqig7SVYXT-SsMOTGY2Z3Y80W-fGgva7yaDdmPKveucH5ddOcHsJRhNb-xUK8agZQqkJSMAENGO8NU6g==",
+            direction="desc",
+            limit=25,
+            raw_cf_rayid={"not": ["8e8dd2156ef28414"]},
+            raw_method={"not": ["GET"]},
+            raw_status_code={"not": [200]},
+            raw_uri={"not": ["string"]},
+            resource_id={"not": ["string"]},
+            resource_product={"not": ["Stream"]},
+            resource_scope={"not": ["accounts"]},
+            resource_type={"not": ["Video"]},
+            zone_id={"not": ["string"]},
+            zone_name={"not": ["example.com"]},
+        )
+        assert_matches_type(AsyncCursorPaginationAfter[AuditListResponse], audit, path=["response"])
+
+    @pytest.mark.skip(reason="TODO:investigate broken test")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.accounts.logs.audit.with_raw_response.list(
+            account_id="a67e14daa5f8dceeb91fe5449ba496ef",
+            before=parse_date("2024-10-31"),
+            since=parse_date("2024-10-30"),
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        audit = await response.parse()
+        assert_matches_type(AsyncCursorPaginationAfter[AuditListResponse], audit, path=["response"])
+
+    @pytest.mark.skip(reason="TODO:investigate broken test")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.accounts.logs.audit.with_streaming_response.list(
+            account_id="a67e14daa5f8dceeb91fe5449ba496ef",
+            before=parse_date("2024-10-31"),
+            since=parse_date("2024-10-30"),
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            audit = await response.parse()
+            assert_matches_type(AsyncCursorPaginationAfter[AuditListResponse], audit, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO:investigate broken test")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.accounts.logs.audit.with_raw_response.list(
+                account_id="",
+                before=parse_date("2024-10-31"),
+                since=parse_date("2024-10-30"),
+            )
diff --git a/tests/api_resources/accounts/test_members.py b/tests/api_resources/accounts/test_members.py
index 3e000cb7f2c..7a280726d61 100644
--- a/tests/api_resources/accounts/test_members.py
+++ b/tests/api_resources/accounts/test_members.py
@@ -10,12 +10,9 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.shared import Member
 from cloudflare.types.accounts import (
-    MemberGetResponse,
-    MemberListResponse,
-    MemberCreateResponse,
     MemberDeleteResponse,
-    MemberUpdateResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -28,66 +25,50 @@ class TestMembers:
     @parametrize
     def test_method_create_overload_1(self, client: Cloudflare) -> None:
         member = client.accounts.members.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
-            roles=[
-                "3536bcfad5faccb999b47003c79917fb",
-                "3536bcfad5faccb999b47003c79917fb",
-                "3536bcfad5faccb999b47003c79917fb",
-            ],
+            roles=["3536bcfad5faccb999b47003c79917fb"],
         )
-        assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> None:
         member = client.accounts.members.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
-            roles=[
-                "3536bcfad5faccb999b47003c79917fb",
-                "3536bcfad5faccb999b47003c79917fb",
-                "3536bcfad5faccb999b47003c79917fb",
-            ],
+            roles=["3536bcfad5faccb999b47003c79917fb"],
             status="accepted",
         )
-        assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     def test_raw_response_create_overload_1(self, client: Cloudflare) -> None:
         response = client.accounts.members.with_raw_response.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
-            roles=[
-                "3536bcfad5faccb999b47003c79917fb",
-                "3536bcfad5faccb999b47003c79917fb",
-                "3536bcfad5faccb999b47003c79917fb",
-            ],
+            roles=["3536bcfad5faccb999b47003c79917fb"],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         member = response.parse()
-        assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
         with client.accounts.members.with_streaming_response.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
-            roles=[
-                "3536bcfad5faccb999b47003c79917fb",
-                "3536bcfad5faccb999b47003c79917fb",
-                "3536bcfad5faccb999b47003c79917fb",
-            ],
+            roles=["3536bcfad5faccb999b47003c79917fb"],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             member = response.parse()
-            assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+            assert_matches_type(Optional[Member], member, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -98,18 +79,14 @@ def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
             client.accounts.members.with_raw_response.create(
                 account_id="",
                 email="user@example.com",
-                roles=[
-                    "3536bcfad5faccb999b47003c79917fb",
-                    "3536bcfad5faccb999b47003c79917fb",
-                    "3536bcfad5faccb999b47003c79917fb",
-                ],
+                roles=["3536bcfad5faccb999b47003c79917fb"],
             )
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     def test_method_create_overload_2(self, client: Cloudflare) -> None:
         member = client.accounts.members.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
             policies=[
                 {
@@ -118,45 +95,17 @@ def test_method_create_overload_2(self, client: Cloudflare) -> None:
                         {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                         {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                     ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
             ],
         )
-        assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> None:
         member = client.accounts.members.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
             policies=[
                 {
@@ -165,46 +114,18 @@ def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> N
                         {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                         {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                     ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
             ],
             status="accepted",
         )
-        assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
         response = client.accounts.members.with_raw_response.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
             policies=[
                 {
@@ -213,49 +134,21 @@ def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
                         {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                         {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                     ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
             ],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         member = response.parse()
-        assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
         with client.accounts.members.with_streaming_response.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
             policies=[
                 {
@@ -264,43 +157,15 @@ def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
                         {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                         {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                     ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
             ],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             member = response.parse()
-            assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+            assert_matches_type(Optional[Member], member, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -318,36 +183,8 @@ def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
                             {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                             {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                         ],
-                        "resource_groups": [
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        ],
-                    },
-                    {
-                        "access": "allow",
-                        "permission_groups": [
-                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                        ],
-                        "resource_groups": [
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        ],
-                    },
-                    {
-                        "access": "allow",
-                        "permission_groups": [
-                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                        ],
-                        "resource_groups": [
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        ],
-                    },
+                        "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                    }
                 ],
             )
 
@@ -356,49 +193,45 @@ def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
     def test_method_update_overload_1(self, client: Cloudflare) -> None:
         member = client.accounts.members.update(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[MemberUpdateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_update_with_all_params_overload_1(self, client: Cloudflare) -> None:
         member = client.accounts.members.update(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
-            roles=[
-                {"id": "3536bcfad5faccb999b47003c79917fb"},
-                {"id": "3536bcfad5faccb999b47003c79917fb"},
-                {"id": "3536bcfad5faccb999b47003c79917fb"},
-            ],
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            roles=[{"id": "3536bcfad5faccb999b47003c79917fb"}],
         )
-        assert_matches_type(Optional[MemberUpdateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_update_overload_1(self, client: Cloudflare) -> None:
         response = client.accounts.members.with_raw_response.update(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         member = response.parse()
-        assert_matches_type(Optional[MemberUpdateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_update_overload_1(self, client: Cloudflare) -> None:
         with client.accounts.members.with_streaming_response.update(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             member = response.parse()
-            assert_matches_type(Optional[MemberUpdateResponse], member, path=["response"])
+            assert_matches_type(Optional[Member], member, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -414,7 +247,7 @@ def test_path_params_update_overload_1(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `member_id` but received ''"):
             client.accounts.members.with_raw_response.update(
                 member_id="",
-                account_id="eb78d65290b24279ba6f44721b3ea3c4",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -422,7 +255,7 @@ def test_path_params_update_overload_1(self, client: Cloudflare) -> None:
     def test_method_update_overload_2(self, client: Cloudflare) -> None:
         member = client.accounts.members.update(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             policies=[
                 {
                     "access": "allow",
@@ -430,46 +263,18 @@ def test_method_update_overload_2(self, client: Cloudflare) -> None:
                         {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                         {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                     ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
             ],
         )
-        assert_matches_type(Optional[MemberUpdateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_update_overload_2(self, client: Cloudflare) -> None:
         response = client.accounts.members.with_raw_response.update(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             policies=[
                 {
                     "access": "allow",
@@ -477,50 +282,22 @@ def test_raw_response_update_overload_2(self, client: Cloudflare) -> None:
                         {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                         {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                     ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
             ],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         member = response.parse()
-        assert_matches_type(Optional[MemberUpdateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_update_overload_2(self, client: Cloudflare) -> None:
         with client.accounts.members.with_streaming_response.update(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             policies=[
                 {
                     "access": "allow",
@@ -528,43 +305,15 @@ def test_streaming_response_update_overload_2(self, client: Cloudflare) -> None:
                         {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                         {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                     ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
             ],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             member = response.parse()
-            assert_matches_type(Optional[MemberUpdateResponse], member, path=["response"])
+            assert_matches_type(Optional[Member], member, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -582,43 +331,15 @@ def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
                             {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                             {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                         ],
-                        "resource_groups": [
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        ],
-                    },
-                    {
-                        "access": "allow",
-                        "permission_groups": [
-                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                        ],
-                        "resource_groups": [
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        ],
-                    },
-                    {
-                        "access": "allow",
-                        "permission_groups": [
-                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                        ],
-                        "resource_groups": [
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        ],
-                    },
+                        "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                    }
                 ],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `member_id` but received ''"):
             client.accounts.members.with_raw_response.update(
                 member_id="",
-                account_id="eb78d65290b24279ba6f44721b3ea3c4",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 policies=[
                     {
                         "access": "allow",
@@ -626,79 +347,51 @@ def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
                             {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                             {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                         ],
-                        "resource_groups": [
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        ],
-                    },
-                    {
-                        "access": "allow",
-                        "permission_groups": [
-                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                        ],
-                        "resource_groups": [
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        ],
-                    },
-                    {
-                        "access": "allow",
-                        "permission_groups": [
-                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                        ],
-                        "resource_groups": [
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        ],
-                    },
+                        "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                    }
                 ],
             )
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         member = client.accounts.members.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncV4PagePaginationArray[MemberListResponse], member, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Member], member, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         member = client.accounts.members.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             direction="desc",
             order="status",
             page=1,
             per_page=5,
             status="accepted",
         )
-        assert_matches_type(SyncV4PagePaginationArray[MemberListResponse], member, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Member], member, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.accounts.members.with_raw_response.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         member = response.parse()
-        assert_matches_type(SyncV4PagePaginationArray[MemberListResponse], member, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Member], member, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.accounts.members.with_streaming_response.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             member = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[MemberListResponse], member, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[Member], member, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -714,7 +407,7 @@ def test_path_params_list(self, client: Cloudflare) -> None:
     def test_method_delete(self, client: Cloudflare) -> None:
         member = client.accounts.members.delete(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[MemberDeleteResponse], member, path=["response"])
 
@@ -723,7 +416,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.accounts.members.with_raw_response.delete(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -736,7 +429,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.accounts.members.with_streaming_response.delete(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -758,7 +451,7 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `member_id` but received ''"):
             client.accounts.members.with_raw_response.delete(
                 member_id="",
-                account_id="eb78d65290b24279ba6f44721b3ea3c4",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
@@ -766,35 +459,35 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
     def test_method_get(self, client: Cloudflare) -> None:
         member = client.accounts.members.get(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[MemberGetResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.accounts.members.with_raw_response.get(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         member = response.parse()
-        assert_matches_type(Optional[MemberGetResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.accounts.members.with_streaming_response.get(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             member = response.parse()
-            assert_matches_type(Optional[MemberGetResponse], member, path=["response"])
+            assert_matches_type(Optional[Member], member, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -810,77 +503,63 @@ def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `member_id` but received ''"):
             client.accounts.members.with_raw_response.get(
                 member_id="",
-                account_id="eb78d65290b24279ba6f44721b3ea3c4",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
 
 class TestAsyncMembers:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
         member = await async_client.accounts.members.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
-            roles=[
-                "3536bcfad5faccb999b47003c79917fb",
-                "3536bcfad5faccb999b47003c79917fb",
-                "3536bcfad5faccb999b47003c79917fb",
-            ],
+            roles=["3536bcfad5faccb999b47003c79917fb"],
         )
-        assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
         member = await async_client.accounts.members.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
-            roles=[
-                "3536bcfad5faccb999b47003c79917fb",
-                "3536bcfad5faccb999b47003c79917fb",
-                "3536bcfad5faccb999b47003c79917fb",
-            ],
+            roles=["3536bcfad5faccb999b47003c79917fb"],
             status="accepted",
         )
-        assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.accounts.members.with_raw_response.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
-            roles=[
-                "3536bcfad5faccb999b47003c79917fb",
-                "3536bcfad5faccb999b47003c79917fb",
-                "3536bcfad5faccb999b47003c79917fb",
-            ],
+            roles=["3536bcfad5faccb999b47003c79917fb"],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         member = await response.parse()
-        assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
         async with async_client.accounts.members.with_streaming_response.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
-            roles=[
-                "3536bcfad5faccb999b47003c79917fb",
-                "3536bcfad5faccb999b47003c79917fb",
-                "3536bcfad5faccb999b47003c79917fb",
-            ],
+            roles=["3536bcfad5faccb999b47003c79917fb"],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             member = await response.parse()
-            assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+            assert_matches_type(Optional[Member], member, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -891,18 +570,14 @@ async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare
             await async_client.accounts.members.with_raw_response.create(
                 account_id="",
                 email="user@example.com",
-                roles=[
-                    "3536bcfad5faccb999b47003c79917fb",
-                    "3536bcfad5faccb999b47003c79917fb",
-                    "3536bcfad5faccb999b47003c79917fb",
-                ],
+                roles=["3536bcfad5faccb999b47003c79917fb"],
             )
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
         member = await async_client.accounts.members.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
             policies=[
                 {
@@ -911,45 +586,17 @@ async def test_method_create_overload_2(self, async_client: AsyncCloudflare) ->
                         {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                         {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                     ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
             ],
         )
-        assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     async def test_method_create_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
         member = await async_client.accounts.members.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
             policies=[
                 {
@@ -958,46 +605,18 @@ async def test_method_create_with_all_params_overload_2(self, async_client: Asyn
                         {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                         {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                     ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
             ],
             status="accepted",
         )
-        assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.accounts.members.with_raw_response.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
             policies=[
                 {
@@ -1006,49 +625,21 @@ async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflar
                         {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                         {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                     ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
             ],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         member = await response.parse()
-        assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
         async with async_client.accounts.members.with_streaming_response.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
             policies=[
                 {
@@ -1057,43 +648,15 @@ async def test_streaming_response_create_overload_2(self, async_client: AsyncClo
                         {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                         {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                     ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
             ],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             member = await response.parse()
-            assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+            assert_matches_type(Optional[Member], member, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1111,36 +674,8 @@ async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare
                             {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                             {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                         ],
-                        "resource_groups": [
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        ],
-                    },
-                    {
-                        "access": "allow",
-                        "permission_groups": [
-                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                        ],
-                        "resource_groups": [
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        ],
-                    },
-                    {
-                        "access": "allow",
-                        "permission_groups": [
-                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                        ],
-                        "resource_groups": [
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        ],
-                    },
+                        "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                    }
                 ],
             )
 
@@ -1149,49 +684,45 @@ async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare
     async def test_method_update_overload_1(self, async_client: AsyncCloudflare) -> None:
         member = await async_client.accounts.members.update(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[MemberUpdateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_update_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
         member = await async_client.accounts.members.update(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
-            roles=[
-                {"id": "3536bcfad5faccb999b47003c79917fb"},
-                {"id": "3536bcfad5faccb999b47003c79917fb"},
-                {"id": "3536bcfad5faccb999b47003c79917fb"},
-            ],
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            roles=[{"id": "3536bcfad5faccb999b47003c79917fb"}],
         )
-        assert_matches_type(Optional[MemberUpdateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.accounts.members.with_raw_response.update(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         member = await response.parse()
-        assert_matches_type(Optional[MemberUpdateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
         async with async_client.accounts.members.with_streaming_response.update(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             member = await response.parse()
-            assert_matches_type(Optional[MemberUpdateResponse], member, path=["response"])
+            assert_matches_type(Optional[Member], member, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1207,7 +738,7 @@ async def test_path_params_update_overload_1(self, async_client: AsyncCloudflare
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `member_id` but received ''"):
             await async_client.accounts.members.with_raw_response.update(
                 member_id="",
-                account_id="eb78d65290b24279ba6f44721b3ea3c4",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -1215,7 +746,7 @@ async def test_path_params_update_overload_1(self, async_client: AsyncCloudflare
     async def test_method_update_overload_2(self, async_client: AsyncCloudflare) -> None:
         member = await async_client.accounts.members.update(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             policies=[
                 {
                     "access": "allow",
@@ -1223,46 +754,18 @@ async def test_method_update_overload_2(self, async_client: AsyncCloudflare) ->
                         {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                         {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                     ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
             ],
         )
-        assert_matches_type(Optional[MemberUpdateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.accounts.members.with_raw_response.update(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             policies=[
                 {
                     "access": "allow",
@@ -1270,50 +773,22 @@ async def test_raw_response_update_overload_2(self, async_client: AsyncCloudflar
                         {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                         {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                     ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
             ],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         member = await response.parse()
-        assert_matches_type(Optional[MemberUpdateResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
         async with async_client.accounts.members.with_streaming_response.update(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             policies=[
                 {
                     "access": "allow",
@@ -1321,43 +796,15 @@ async def test_streaming_response_update_overload_2(self, async_client: AsyncClo
                         {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                         {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                     ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
-                {
-                    "access": "allow",
-                    "permission_groups": [
-                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                    ],
-                    "resource_groups": [
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                    ],
-                },
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
             ],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             member = await response.parse()
-            assert_matches_type(Optional[MemberUpdateResponse], member, path=["response"])
+            assert_matches_type(Optional[Member], member, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1375,43 +822,15 @@ async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare
                             {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                             {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                         ],
-                        "resource_groups": [
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        ],
-                    },
-                    {
-                        "access": "allow",
-                        "permission_groups": [
-                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                        ],
-                        "resource_groups": [
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        ],
-                    },
-                    {
-                        "access": "allow",
-                        "permission_groups": [
-                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                        ],
-                        "resource_groups": [
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        ],
-                    },
+                        "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                    }
                 ],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `member_id` but received ''"):
             await async_client.accounts.members.with_raw_response.update(
                 member_id="",
-                account_id="eb78d65290b24279ba6f44721b3ea3c4",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 policies=[
                     {
                         "access": "allow",
@@ -1419,79 +838,51 @@ async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare
                             {"id": "c8fed203ed3043cba015a93ad1616f1f"},
                             {"id": "82e64a83756745bbbb1c9c2701bf816b"},
                         ],
-                        "resource_groups": [
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        ],
-                    },
-                    {
-                        "access": "allow",
-                        "permission_groups": [
-                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                        ],
-                        "resource_groups": [
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        ],
-                    },
-                    {
-                        "access": "allow",
-                        "permission_groups": [
-                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
-                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
-                        ],
-                        "resource_groups": [
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                            {"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"},
-                        ],
-                    },
+                        "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                    }
                 ],
             )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         member = await async_client.accounts.members.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncV4PagePaginationArray[MemberListResponse], member, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Member], member, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         member = await async_client.accounts.members.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             direction="desc",
             order="status",
             page=1,
             per_page=5,
             status="accepted",
         )
-        assert_matches_type(AsyncV4PagePaginationArray[MemberListResponse], member, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Member], member, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.accounts.members.with_raw_response.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         member = await response.parse()
-        assert_matches_type(AsyncV4PagePaginationArray[MemberListResponse], member, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Member], member, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.accounts.members.with_streaming_response.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             member = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[MemberListResponse], member, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[Member], member, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1507,7 +898,7 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         member = await async_client.accounts.members.delete(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[MemberDeleteResponse], member, path=["response"])
 
@@ -1516,7 +907,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.accounts.members.with_raw_response.delete(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -1529,7 +920,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.accounts.members.with_streaming_response.delete(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -1551,7 +942,7 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `member_id` but received ''"):
             await async_client.accounts.members.with_raw_response.delete(
                 member_id="",
-                account_id="eb78d65290b24279ba6f44721b3ea3c4",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
@@ -1559,35 +950,35 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         member = await async_client.accounts.members.get(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[MemberGetResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.accounts.members.with_raw_response.get(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         member = await response.parse()
-        assert_matches_type(Optional[MemberGetResponse], member, path=["response"])
+        assert_matches_type(Optional[Member], member, path=["response"])
 
     @pytest.mark.skip(reason="HTTP 422 error from prism")
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.accounts.members.with_streaming_response.get(
             member_id="4536bcfad5faccb111b47003c79917fa",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             member = await response.parse()
-            assert_matches_type(Optional[MemberGetResponse], member, path=["response"])
+            assert_matches_type(Optional[Member], member, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1603,5 +994,5 @@ async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `member_id` but received ''"):
             await async_client.accounts.members.with_raw_response.get(
                 member_id="",
-                account_id="eb78d65290b24279ba6f44721b3ea3c4",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/accounts/test_roles.py b/tests/api_resources/accounts/test_roles.py
index 49b18f2dade..b6f6aa04a0d 100644
--- a/tests/api_resources/accounts/test_roles.py
+++ b/tests/api_resources/accounts/test_roles.py
@@ -3,13 +3,13 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.shared import Role
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -21,31 +21,40 @@ class TestRoles:
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         role = client.accounts.roles.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncSinglePage[Role], role, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Role], role, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        role = client.accounts.roles.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=5,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[Role], role, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.accounts.roles.with_raw_response.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         role = response.parse()
-        assert_matches_type(SyncSinglePage[Role], role, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Role], role, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.accounts.roles.with_streaming_response.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             role = response.parse()
-            assert_matches_type(SyncSinglePage[Role], role, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[Role], role, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -59,34 +68,34 @@ def test_path_params_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         role = client.accounts.roles.get(
-            role_id={},
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            role_id="3536bcfad5faccb999b47003c79917fb",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(object, role, path=["response"])
+        assert_matches_type(Optional[Role], role, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.accounts.roles.with_raw_response.get(
-            role_id={},
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            role_id="3536bcfad5faccb999b47003c79917fb",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         role = response.parse()
-        assert_matches_type(object, role, path=["response"])
+        assert_matches_type(Optional[Role], role, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.accounts.roles.with_streaming_response.get(
-            role_id={},
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            role_id="3536bcfad5faccb999b47003c79917fb",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             role = response.parse()
-            assert_matches_type(object, role, path=["response"])
+            assert_matches_type(Optional[Role], role, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -94,42 +103,59 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.accounts.roles.with_raw_response.get(
-                role_id={},
+                role_id="3536bcfad5faccb999b47003c79917fb",
                 account_id="",
             )
 
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `role_id` but received ''"):
+            client.accounts.roles.with_raw_response.get(
+                role_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
 
 class TestAsyncRoles:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         role = await async_client.accounts.roles.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncSinglePage[Role], role, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Role], role, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        role = await async_client.accounts.roles.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=5,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[Role], role, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.accounts.roles.with_raw_response.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         role = await response.parse()
-        assert_matches_type(AsyncSinglePage[Role], role, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Role], role, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.accounts.roles.with_streaming_response.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             role = await response.parse()
-            assert_matches_type(AsyncSinglePage[Role], role, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[Role], role, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -143,34 +169,34 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         role = await async_client.accounts.roles.get(
-            role_id={},
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            role_id="3536bcfad5faccb999b47003c79917fb",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(object, role, path=["response"])
+        assert_matches_type(Optional[Role], role, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.accounts.roles.with_raw_response.get(
-            role_id={},
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            role_id="3536bcfad5faccb999b47003c79917fb",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         role = await response.parse()
-        assert_matches_type(object, role, path=["response"])
+        assert_matches_type(Optional[Role], role, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.accounts.roles.with_streaming_response.get(
-            role_id={},
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            role_id="3536bcfad5faccb999b47003c79917fb",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             role = await response.parse()
-            assert_matches_type(object, role, path=["response"])
+            assert_matches_type(Optional[Role], role, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -178,6 +204,12 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.accounts.roles.with_raw_response.get(
-                role_id={},
+                role_id="3536bcfad5faccb999b47003c79917fb",
                 account_id="",
             )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `role_id` but received ''"):
+            await async_client.accounts.roles.with_raw_response.get(
+                role_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/accounts/test_subscriptions.py b/tests/api_resources/accounts/test_subscriptions.py
new file mode 100644
index 00000000000..1ef48e9a3c3
--- /dev/null
+++ b/tests/api_resources/accounts/test_subscriptions.py
@@ -0,0 +1,448 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.shared import Subscription
+from cloudflare.types.accounts import SubscriptionDeleteResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSubscriptions:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        subscription = client.accounts.subscriptions.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Subscription, subscription, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        subscription = client.accounts.subscriptions.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            frequency="monthly",
+            rate_plan={
+                "id": "free",
+                "currency": "USD",
+                "externally_managed": False,
+                "is_contract": False,
+                "public_name": "Business Plan",
+                "scope": "zone",
+                "sets": ["string"],
+            },
+        )
+        assert_matches_type(Subscription, subscription, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.accounts.subscriptions.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subscription = response.parse()
+        assert_matches_type(Subscription, subscription, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.accounts.subscriptions.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subscription = response.parse()
+            assert_matches_type(Subscription, subscription, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.accounts.subscriptions.with_raw_response.create(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        subscription = client.accounts.subscriptions.update(
+            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Subscription, subscription, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        subscription = client.accounts.subscriptions.update(
+            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            frequency="monthly",
+            rate_plan={
+                "id": "free",
+                "currency": "USD",
+                "externally_managed": False,
+                "is_contract": False,
+                "public_name": "Business Plan",
+                "scope": "zone",
+                "sets": ["string"],
+            },
+        )
+        assert_matches_type(Subscription, subscription, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.accounts.subscriptions.with_raw_response.update(
+            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subscription = response.parse()
+        assert_matches_type(Subscription, subscription, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.accounts.subscriptions.with_streaming_response.update(
+            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subscription = response.parse()
+            assert_matches_type(Subscription, subscription, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.accounts.subscriptions.with_raw_response.update(
+                subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
+                account_id="",
+            )
+
+        with pytest.raises(
+            ValueError, match=r"Expected a non-empty value for `subscription_identifier` but received ''"
+        ):
+            client.accounts.subscriptions.with_raw_response.update(
+                subscription_identifier="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        subscription = client.accounts.subscriptions.delete(
+            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SubscriptionDeleteResponse, subscription, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.accounts.subscriptions.with_raw_response.delete(
+            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subscription = response.parse()
+        assert_matches_type(SubscriptionDeleteResponse, subscription, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.accounts.subscriptions.with_streaming_response.delete(
+            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subscription = response.parse()
+            assert_matches_type(SubscriptionDeleteResponse, subscription, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.accounts.subscriptions.with_raw_response.delete(
+                subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
+                account_id="",
+            )
+
+        with pytest.raises(
+            ValueError, match=r"Expected a non-empty value for `subscription_identifier` but received ''"
+        ):
+            client.accounts.subscriptions.with_raw_response.delete(
+                subscription_identifier="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        subscription = client.accounts.subscriptions.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[Subscription], subscription, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.accounts.subscriptions.with_raw_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subscription = response.parse()
+        assert_matches_type(SyncSinglePage[Subscription], subscription, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.accounts.subscriptions.with_streaming_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subscription = response.parse()
+            assert_matches_type(SyncSinglePage[Subscription], subscription, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.accounts.subscriptions.with_raw_response.get(
+                account_id="",
+            )
+
+
+class TestAsyncSubscriptions:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        subscription = await async_client.accounts.subscriptions.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Subscription, subscription, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        subscription = await async_client.accounts.subscriptions.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            frequency="monthly",
+            rate_plan={
+                "id": "free",
+                "currency": "USD",
+                "externally_managed": False,
+                "is_contract": False,
+                "public_name": "Business Plan",
+                "scope": "zone",
+                "sets": ["string"],
+            },
+        )
+        assert_matches_type(Subscription, subscription, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.accounts.subscriptions.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subscription = await response.parse()
+        assert_matches_type(Subscription, subscription, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.accounts.subscriptions.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subscription = await response.parse()
+            assert_matches_type(Subscription, subscription, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.accounts.subscriptions.with_raw_response.create(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        subscription = await async_client.accounts.subscriptions.update(
+            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Subscription, subscription, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        subscription = await async_client.accounts.subscriptions.update(
+            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            frequency="monthly",
+            rate_plan={
+                "id": "free",
+                "currency": "USD",
+                "externally_managed": False,
+                "is_contract": False,
+                "public_name": "Business Plan",
+                "scope": "zone",
+                "sets": ["string"],
+            },
+        )
+        assert_matches_type(Subscription, subscription, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.accounts.subscriptions.with_raw_response.update(
+            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subscription = await response.parse()
+        assert_matches_type(Subscription, subscription, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.accounts.subscriptions.with_streaming_response.update(
+            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subscription = await response.parse()
+            assert_matches_type(Subscription, subscription, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.accounts.subscriptions.with_raw_response.update(
+                subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
+                account_id="",
+            )
+
+        with pytest.raises(
+            ValueError, match=r"Expected a non-empty value for `subscription_identifier` but received ''"
+        ):
+            await async_client.accounts.subscriptions.with_raw_response.update(
+                subscription_identifier="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        subscription = await async_client.accounts.subscriptions.delete(
+            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SubscriptionDeleteResponse, subscription, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.accounts.subscriptions.with_raw_response.delete(
+            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subscription = await response.parse()
+        assert_matches_type(SubscriptionDeleteResponse, subscription, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.accounts.subscriptions.with_streaming_response.delete(
+            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subscription = await response.parse()
+            assert_matches_type(SubscriptionDeleteResponse, subscription, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.accounts.subscriptions.with_raw_response.delete(
+                subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
+                account_id="",
+            )
+
+        with pytest.raises(
+            ValueError, match=r"Expected a non-empty value for `subscription_identifier` but received ''"
+        ):
+            await async_client.accounts.subscriptions.with_raw_response.delete(
+                subscription_identifier="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        subscription = await async_client.accounts.subscriptions.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[Subscription], subscription, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.accounts.subscriptions.with_raw_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subscription = await response.parse()
+        assert_matches_type(AsyncSinglePage[Subscription], subscription, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.accounts.subscriptions.with_streaming_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subscription = await response.parse()
+            assert_matches_type(AsyncSinglePage[Subscription], subscription, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.accounts.subscriptions.with_raw_response.get(
+                account_id="",
+            )
diff --git a/tests/api_resources/accounts/test_tokens.py b/tests/api_resources/accounts/test_tokens.py
new file mode 100644
index 00000000000..a936ded5e33
--- /dev/null
+++ b/tests/api_resources/accounts/test_tokens.py
@@ -0,0 +1,975 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.shared import Token
+from cloudflare.types.accounts import (
+    TokenCreateResponse,
+    TokenDeleteResponse,
+    TokenVerifyResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestTokens:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        token = client.accounts.tokens.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="readonly token",
+            policies=[
+                {
+                    "effect": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
+            ],
+        )
+        assert_matches_type(Optional[TokenCreateResponse], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        token = client.accounts.tokens.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="readonly token",
+            policies=[
+                {
+                    "effect": "allow",
+                    "permission_groups": [
+                        {
+                            "id": "c8fed203ed3043cba015a93ad1616f1f",
+                            "meta": {
+                                "key": "key",
+                                "value": "value",
+                            },
+                        },
+                        {
+                            "id": "82e64a83756745bbbb1c9c2701bf816b",
+                            "meta": {
+                                "key": "key",
+                                "value": "value",
+                            },
+                        },
+                    ],
+                    "resources": {"foo": "string"},
+                }
+            ],
+            condition={
+                "request_ip": {
+                    "in": ["123.123.123.0/24", "2606:4700::/32"],
+                    "not_in": ["123.123.123.100/24", "2606:4700:4700::/48"],
+                }
+            },
+            expires_on=parse_datetime("2020-01-01T00:00:00Z"),
+            not_before=parse_datetime("2018-07-01T05:20:00Z"),
+        )
+        assert_matches_type(Optional[TokenCreateResponse], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.accounts.tokens.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="readonly token",
+            policies=[
+                {
+                    "effect": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = response.parse()
+        assert_matches_type(Optional[TokenCreateResponse], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.accounts.tokens.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="readonly token",
+            policies=[
+                {
+                    "effect": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = response.parse()
+            assert_matches_type(Optional[TokenCreateResponse], token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.accounts.tokens.with_raw_response.create(
+                account_id="",
+                name="readonly token",
+                policies=[
+                    {
+                        "effect": "allow",
+                        "permission_groups": [
+                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                        ],
+                        "resources": {"foo": "string"},
+                    }
+                ],
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        token = client.accounts.tokens.update(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="readonly token",
+            policies=[
+                {
+                    "effect": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
+            ],
+        )
+        assert_matches_type(Optional[Token], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        token = client.accounts.tokens.update(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="readonly token",
+            policies=[
+                {
+                    "effect": "allow",
+                    "permission_groups": [
+                        {
+                            "id": "c8fed203ed3043cba015a93ad1616f1f",
+                            "meta": {
+                                "key": "key",
+                                "value": "value",
+                            },
+                        },
+                        {
+                            "id": "82e64a83756745bbbb1c9c2701bf816b",
+                            "meta": {
+                                "key": "key",
+                                "value": "value",
+                            },
+                        },
+                    ],
+                    "resources": {"foo": "string"},
+                }
+            ],
+            condition={
+                "request_ip": {
+                    "in": ["123.123.123.0/24", "2606:4700::/32"],
+                    "not_in": ["123.123.123.100/24", "2606:4700:4700::/48"],
+                }
+            },
+            expires_on=parse_datetime("2020-01-01T00:00:00Z"),
+            not_before=parse_datetime("2018-07-01T05:20:00Z"),
+            status="active",
+        )
+        assert_matches_type(Optional[Token], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.accounts.tokens.with_raw_response.update(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="readonly token",
+            policies=[
+                {
+                    "effect": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = response.parse()
+        assert_matches_type(Optional[Token], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.accounts.tokens.with_streaming_response.update(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="readonly token",
+            policies=[
+                {
+                    "effect": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = response.parse()
+            assert_matches_type(Optional[Token], token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.accounts.tokens.with_raw_response.update(
+                token_id="ed17574386854bf78a67040be0a770b0",
+                account_id="",
+                name="readonly token",
+                policies=[
+                    {
+                        "effect": "allow",
+                        "permission_groups": [
+                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                        ],
+                        "resources": {"foo": "string"},
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `token_id` but received ''"):
+            client.accounts.tokens.with_raw_response.update(
+                token_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="readonly token",
+                policies=[
+                    {
+                        "effect": "allow",
+                        "permission_groups": [
+                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                        ],
+                        "resources": {"foo": "string"},
+                    }
+                ],
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        token = client.accounts.tokens.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[Token], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        token = client.accounts.tokens.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="desc",
+            page=1,
+            per_page=5,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[Token], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.accounts.tokens.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[Token], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.accounts.tokens.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[Token], token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.accounts.tokens.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        token = client.accounts.tokens.delete(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[TokenDeleteResponse], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.accounts.tokens.with_raw_response.delete(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = response.parse()
+        assert_matches_type(Optional[TokenDeleteResponse], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.accounts.tokens.with_streaming_response.delete(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = response.parse()
+            assert_matches_type(Optional[TokenDeleteResponse], token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.accounts.tokens.with_raw_response.delete(
+                token_id="ed17574386854bf78a67040be0a770b0",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `token_id` but received ''"):
+            client.accounts.tokens.with_raw_response.delete(
+                token_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        token = client.accounts.tokens.get(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[Token], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.accounts.tokens.with_raw_response.get(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = response.parse()
+        assert_matches_type(Optional[Token], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.accounts.tokens.with_streaming_response.get(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = response.parse()
+            assert_matches_type(Optional[Token], token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.accounts.tokens.with_raw_response.get(
+                token_id="ed17574386854bf78a67040be0a770b0",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `token_id` but received ''"):
+            client.accounts.tokens.with_raw_response.get(
+                token_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_verify(self, client: Cloudflare) -> None:
+        token = client.accounts.tokens.verify(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[TokenVerifyResponse], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_verify(self, client: Cloudflare) -> None:
+        response = client.accounts.tokens.with_raw_response.verify(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = response.parse()
+        assert_matches_type(Optional[TokenVerifyResponse], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_verify(self, client: Cloudflare) -> None:
+        with client.accounts.tokens.with_streaming_response.verify(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = response.parse()
+            assert_matches_type(Optional[TokenVerifyResponse], token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_verify(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.accounts.tokens.with_raw_response.verify(
+                account_id="",
+            )
+
+
+class TestAsyncTokens:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        token = await async_client.accounts.tokens.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="readonly token",
+            policies=[
+                {
+                    "effect": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
+            ],
+        )
+        assert_matches_type(Optional[TokenCreateResponse], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        token = await async_client.accounts.tokens.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="readonly token",
+            policies=[
+                {
+                    "effect": "allow",
+                    "permission_groups": [
+                        {
+                            "id": "c8fed203ed3043cba015a93ad1616f1f",
+                            "meta": {
+                                "key": "key",
+                                "value": "value",
+                            },
+                        },
+                        {
+                            "id": "82e64a83756745bbbb1c9c2701bf816b",
+                            "meta": {
+                                "key": "key",
+                                "value": "value",
+                            },
+                        },
+                    ],
+                    "resources": {"foo": "string"},
+                }
+            ],
+            condition={
+                "request_ip": {
+                    "in": ["123.123.123.0/24", "2606:4700::/32"],
+                    "not_in": ["123.123.123.100/24", "2606:4700:4700::/48"],
+                }
+            },
+            expires_on=parse_datetime("2020-01-01T00:00:00Z"),
+            not_before=parse_datetime("2018-07-01T05:20:00Z"),
+        )
+        assert_matches_type(Optional[TokenCreateResponse], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.accounts.tokens.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="readonly token",
+            policies=[
+                {
+                    "effect": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = await response.parse()
+        assert_matches_type(Optional[TokenCreateResponse], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.accounts.tokens.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="readonly token",
+            policies=[
+                {
+                    "effect": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = await response.parse()
+            assert_matches_type(Optional[TokenCreateResponse], token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.accounts.tokens.with_raw_response.create(
+                account_id="",
+                name="readonly token",
+                policies=[
+                    {
+                        "effect": "allow",
+                        "permission_groups": [
+                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                        ],
+                        "resources": {"foo": "string"},
+                    }
+                ],
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        token = await async_client.accounts.tokens.update(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="readonly token",
+            policies=[
+                {
+                    "effect": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
+            ],
+        )
+        assert_matches_type(Optional[Token], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        token = await async_client.accounts.tokens.update(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="readonly token",
+            policies=[
+                {
+                    "effect": "allow",
+                    "permission_groups": [
+                        {
+                            "id": "c8fed203ed3043cba015a93ad1616f1f",
+                            "meta": {
+                                "key": "key",
+                                "value": "value",
+                            },
+                        },
+                        {
+                            "id": "82e64a83756745bbbb1c9c2701bf816b",
+                            "meta": {
+                                "key": "key",
+                                "value": "value",
+                            },
+                        },
+                    ],
+                    "resources": {"foo": "string"},
+                }
+            ],
+            condition={
+                "request_ip": {
+                    "in": ["123.123.123.0/24", "2606:4700::/32"],
+                    "not_in": ["123.123.123.100/24", "2606:4700:4700::/48"],
+                }
+            },
+            expires_on=parse_datetime("2020-01-01T00:00:00Z"),
+            not_before=parse_datetime("2018-07-01T05:20:00Z"),
+            status="active",
+        )
+        assert_matches_type(Optional[Token], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.accounts.tokens.with_raw_response.update(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="readonly token",
+            policies=[
+                {
+                    "effect": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = await response.parse()
+        assert_matches_type(Optional[Token], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.accounts.tokens.with_streaming_response.update(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="readonly token",
+            policies=[
+                {
+                    "effect": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = await response.parse()
+            assert_matches_type(Optional[Token], token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.accounts.tokens.with_raw_response.update(
+                token_id="ed17574386854bf78a67040be0a770b0",
+                account_id="",
+                name="readonly token",
+                policies=[
+                    {
+                        "effect": "allow",
+                        "permission_groups": [
+                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                        ],
+                        "resources": {"foo": "string"},
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `token_id` but received ''"):
+            await async_client.accounts.tokens.with_raw_response.update(
+                token_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="readonly token",
+                policies=[
+                    {
+                        "effect": "allow",
+                        "permission_groups": [
+                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                        ],
+                        "resources": {"foo": "string"},
+                    }
+                ],
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        token = await async_client.accounts.tokens.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[Token], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        token = await async_client.accounts.tokens.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="desc",
+            page=1,
+            per_page=5,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[Token], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.accounts.tokens.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[Token], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.accounts.tokens.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[Token], token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.accounts.tokens.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        token = await async_client.accounts.tokens.delete(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[TokenDeleteResponse], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.accounts.tokens.with_raw_response.delete(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = await response.parse()
+        assert_matches_type(Optional[TokenDeleteResponse], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.accounts.tokens.with_streaming_response.delete(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = await response.parse()
+            assert_matches_type(Optional[TokenDeleteResponse], token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.accounts.tokens.with_raw_response.delete(
+                token_id="ed17574386854bf78a67040be0a770b0",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `token_id` but received ''"):
+            await async_client.accounts.tokens.with_raw_response.delete(
+                token_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        token = await async_client.accounts.tokens.get(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[Token], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.accounts.tokens.with_raw_response.get(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = await response.parse()
+        assert_matches_type(Optional[Token], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.accounts.tokens.with_streaming_response.get(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = await response.parse()
+            assert_matches_type(Optional[Token], token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.accounts.tokens.with_raw_response.get(
+                token_id="ed17574386854bf78a67040be0a770b0",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `token_id` but received ''"):
+            await async_client.accounts.tokens.with_raw_response.get(
+                token_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_verify(self, async_client: AsyncCloudflare) -> None:
+        token = await async_client.accounts.tokens.verify(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[TokenVerifyResponse], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_verify(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.accounts.tokens.with_raw_response.verify(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = await response.parse()
+        assert_matches_type(Optional[TokenVerifyResponse], token, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_verify(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.accounts.tokens.with_streaming_response.verify(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = await response.parse()
+            assert_matches_type(Optional[TokenVerifyResponse], token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_verify(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.accounts.tokens.with_raw_response.verify(
+                account_id="",
+            )
diff --git a/tests/api_resources/calls/turn/__init__.py b/tests/api_resources/accounts/tokens/__init__.py
similarity index 100%
rename from tests/api_resources/calls/turn/__init__.py
rename to tests/api_resources/accounts/tokens/__init__.py
diff --git a/tests/api_resources/accounts/tokens/test_permission_groups.py b/tests/api_resources/accounts/tokens/test_permission_groups.py
new file mode 100644
index 00000000000..fd4d295b70e
--- /dev/null
+++ b/tests/api_resources/accounts/tokens/test_permission_groups.py
@@ -0,0 +1,236 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.accounts.tokens import (
+    PermissionGroupGetResponse,
+    PermissionGroupListResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestPermissionGroups:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        permission_group = client.accounts.tokens.permission_groups.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[PermissionGroupListResponse], permission_group, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        permission_group = client.accounts.tokens.permission_groups.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="Account%20Settings%20Write",
+            scope="com.cloudflare.api.account.zone",
+        )
+        assert_matches_type(SyncSinglePage[PermissionGroupListResponse], permission_group, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.accounts.tokens.permission_groups.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        permission_group = response.parse()
+        assert_matches_type(SyncSinglePage[PermissionGroupListResponse], permission_group, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.accounts.tokens.permission_groups.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            permission_group = response.parse()
+            assert_matches_type(SyncSinglePage[PermissionGroupListResponse], permission_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.accounts.tokens.permission_groups.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        permission_group = client.accounts.tokens.permission_groups.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[PermissionGroupGetResponse], permission_group, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        permission_group = client.accounts.tokens.permission_groups.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="Account%20Settings%20Write",
+            scope="com.cloudflare.api.account.zone",
+        )
+        assert_matches_type(Optional[PermissionGroupGetResponse], permission_group, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.accounts.tokens.permission_groups.with_raw_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        permission_group = response.parse()
+        assert_matches_type(Optional[PermissionGroupGetResponse], permission_group, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.accounts.tokens.permission_groups.with_streaming_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            permission_group = response.parse()
+            assert_matches_type(Optional[PermissionGroupGetResponse], permission_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.accounts.tokens.permission_groups.with_raw_response.get(
+                account_id="",
+            )
+
+
+class TestAsyncPermissionGroups:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        permission_group = await async_client.accounts.tokens.permission_groups.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[PermissionGroupListResponse], permission_group, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        permission_group = await async_client.accounts.tokens.permission_groups.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="Account%20Settings%20Write",
+            scope="com.cloudflare.api.account.zone",
+        )
+        assert_matches_type(AsyncSinglePage[PermissionGroupListResponse], permission_group, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.accounts.tokens.permission_groups.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        permission_group = await response.parse()
+        assert_matches_type(AsyncSinglePage[PermissionGroupListResponse], permission_group, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.accounts.tokens.permission_groups.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            permission_group = await response.parse()
+            assert_matches_type(AsyncSinglePage[PermissionGroupListResponse], permission_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.accounts.tokens.permission_groups.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        permission_group = await async_client.accounts.tokens.permission_groups.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[PermissionGroupGetResponse], permission_group, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        permission_group = await async_client.accounts.tokens.permission_groups.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="Account%20Settings%20Write",
+            scope="com.cloudflare.api.account.zone",
+        )
+        assert_matches_type(Optional[PermissionGroupGetResponse], permission_group, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.accounts.tokens.permission_groups.with_raw_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        permission_group = await response.parse()
+        assert_matches_type(Optional[PermissionGroupGetResponse], permission_group, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.accounts.tokens.permission_groups.with_streaming_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            permission_group = await response.parse()
+            assert_matches_type(Optional[PermissionGroupGetResponse], permission_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.accounts.tokens.permission_groups.with_raw_response.get(
+                account_id="",
+            )
diff --git a/tests/api_resources/accounts/tokens/test_value.py b/tests/api_resources/accounts/tokens/test_value.py
new file mode 100644
index 00000000000..c04ad23d1c6
--- /dev/null
+++ b/tests/api_resources/accounts/tokens/test_value.py
@@ -0,0 +1,137 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestValue:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        value = client.accounts.tokens.value.update(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        )
+        assert_matches_type(str, value, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.accounts.tokens.value.with_raw_response.update(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        value = response.parse()
+        assert_matches_type(str, value, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.accounts.tokens.value.with_streaming_response.update(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            value = response.parse()
+            assert_matches_type(str, value, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.accounts.tokens.value.with_raw_response.update(
+                token_id="ed17574386854bf78a67040be0a770b0",
+                account_id="",
+                body={},
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `token_id` but received ''"):
+            client.accounts.tokens.value.with_raw_response.update(
+                token_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            )
+
+
+class TestAsyncValue:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        value = await async_client.accounts.tokens.value.update(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        )
+        assert_matches_type(str, value, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.accounts.tokens.value.with_raw_response.update(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        value = await response.parse()
+        assert_matches_type(str, value, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.accounts.tokens.value.with_streaming_response.update(
+            token_id="ed17574386854bf78a67040be0a770b0",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            value = await response.parse()
+            assert_matches_type(str, value, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.accounts.tokens.value.with_raw_response.update(
+                token_id="ed17574386854bf78a67040be0a770b0",
+                account_id="",
+                body={},
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `token_id` but received ''"):
+            await async_client.accounts.tokens.value.with_raw_response.update(
+                token_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            )
diff --git a/tests/api_resources/acm/test_total_tls.py b/tests/api_resources/acm/test_total_tls.py
index cf7af173e5f..ea5938d7d66 100644
--- a/tests/api_resources/acm/test_total_tls.py
+++ b/tests/api_resources/acm/test_total_tls.py
@@ -11,7 +11,8 @@
 from tests.utils import assert_matches_type
 from cloudflare.types.acm import (
     TotalTLSGetResponse,
-    TotalTLSCreateResponse,
+    TotalTLSEditResponse,
+    TotalTLSUpdateResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -21,25 +22,25 @@ class TestTotalTLS:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
     @parametrize
-    def test_method_create(self, client: Cloudflare) -> None:
-        total_tls = client.acm.total_tls.create(
+    def test_method_update(self, client: Cloudflare) -> None:
+        total_tls = client.acm.total_tls.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             enabled=True,
         )
-        assert_matches_type(Optional[TotalTLSCreateResponse], total_tls, path=["response"])
+        assert_matches_type(Optional[TotalTLSUpdateResponse], total_tls, path=["response"])
 
     @parametrize
-    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
-        total_tls = client.acm.total_tls.create(
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        total_tls = client.acm.total_tls.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             enabled=True,
             certificate_authority="google",
         )
-        assert_matches_type(Optional[TotalTLSCreateResponse], total_tls, path=["response"])
+        assert_matches_type(Optional[TotalTLSUpdateResponse], total_tls, path=["response"])
 
     @parametrize
-    def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.acm.total_tls.with_raw_response.create(
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.acm.total_tls.with_raw_response.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             enabled=True,
         )
@@ -47,11 +48,11 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         total_tls = response.parse()
-        assert_matches_type(Optional[TotalTLSCreateResponse], total_tls, path=["response"])
+        assert_matches_type(Optional[TotalTLSUpdateResponse], total_tls, path=["response"])
 
     @parametrize
-    def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.acm.total_tls.with_streaming_response.create(
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.acm.total_tls.with_streaming_response.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             enabled=True,
         ) as response:
@@ -59,14 +60,65 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             total_tls = response.parse()
-            assert_matches_type(Optional[TotalTLSCreateResponse], total_tls, path=["response"])
+            assert_matches_type(Optional[TotalTLSUpdateResponse], total_tls, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    def test_path_params_create(self, client: Cloudflare) -> None:
+    def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.acm.total_tls.with_raw_response.create(
+            client.acm.total_tls.with_raw_response.update(
+                zone_id="",
+                enabled=True,
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        total_tls = client.acm.total_tls.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        )
+        assert_matches_type(Optional[TotalTLSEditResponse], total_tls, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        total_tls = client.acm.total_tls.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+            certificate_authority="google",
+        )
+        assert_matches_type(Optional[TotalTLSEditResponse], total_tls, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.acm.total_tls.with_raw_response.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        total_tls = response.parse()
+        assert_matches_type(Optional[TotalTLSEditResponse], total_tls, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.acm.total_tls.with_streaming_response.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            total_tls = response.parse()
+            assert_matches_type(Optional[TotalTLSEditResponse], total_tls, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.acm.total_tls.with_raw_response.edit(
                 zone_id="",
                 enabled=True,
             )
@@ -111,28 +163,81 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTotalTLS:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        total_tls = await async_client.acm.total_tls.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        )
+        assert_matches_type(Optional[TotalTLSUpdateResponse], total_tls, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        total_tls = await async_client.acm.total_tls.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+            certificate_authority="google",
+        )
+        assert_matches_type(Optional[TotalTLSUpdateResponse], total_tls, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.acm.total_tls.with_raw_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        total_tls = await response.parse()
+        assert_matches_type(Optional[TotalTLSUpdateResponse], total_tls, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.acm.total_tls.with_streaming_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            total_tls = await response.parse()
+            assert_matches_type(Optional[TotalTLSUpdateResponse], total_tls, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.acm.total_tls.with_raw_response.update(
+                zone_id="",
+                enabled=True,
+            )
 
     @parametrize
-    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        total_tls = await async_client.acm.total_tls.create(
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        total_tls = await async_client.acm.total_tls.edit(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             enabled=True,
         )
-        assert_matches_type(Optional[TotalTLSCreateResponse], total_tls, path=["response"])
+        assert_matches_type(Optional[TotalTLSEditResponse], total_tls, path=["response"])
 
     @parametrize
-    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        total_tls = await async_client.acm.total_tls.create(
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        total_tls = await async_client.acm.total_tls.edit(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             enabled=True,
             certificate_authority="google",
         )
-        assert_matches_type(Optional[TotalTLSCreateResponse], total_tls, path=["response"])
+        assert_matches_type(Optional[TotalTLSEditResponse], total_tls, path=["response"])
 
     @parametrize
-    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.acm.total_tls.with_raw_response.create(
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.acm.total_tls.with_raw_response.edit(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             enabled=True,
         )
@@ -140,11 +245,11 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         total_tls = await response.parse()
-        assert_matches_type(Optional[TotalTLSCreateResponse], total_tls, path=["response"])
+        assert_matches_type(Optional[TotalTLSEditResponse], total_tls, path=["response"])
 
     @parametrize
-    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.acm.total_tls.with_streaming_response.create(
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.acm.total_tls.with_streaming_response.edit(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             enabled=True,
         ) as response:
@@ -152,14 +257,14 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             total_tls = await response.parse()
-            assert_matches_type(Optional[TotalTLSCreateResponse], total_tls, path=["response"])
+            assert_matches_type(Optional[TotalTLSEditResponse], total_tls, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.acm.total_tls.with_raw_response.create(
+            await async_client.acm.total_tls.with_raw_response.edit(
                 zone_id="",
                 enabled=True,
             )
diff --git a/tests/api_resources/addressing/address_maps/test_accounts.py b/tests/api_resources/addressing/address_maps/test_accounts.py
index 4010149e6ea..8a8a2efbacc 100644
--- a/tests/api_resources/addressing/address_maps/test_accounts.py
+++ b/tests/api_resources/addressing/address_maps/test_accounts.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -20,37 +20,37 @@ class TestAccounts:
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         account = client.addressing.address_maps.accounts.update(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             body={},
         )
-        assert_matches_type(Optional[AccountUpdateResponse], account, path=["response"])
+        assert_matches_type(AccountUpdateResponse, account, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.addressing.address_maps.accounts.with_raw_response.update(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             body={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         account = response.parse()
-        assert_matches_type(Optional[AccountUpdateResponse], account, path=["response"])
+        assert_matches_type(AccountUpdateResponse, account, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.addressing.address_maps.accounts.with_streaming_response.update(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             account = response.parse()
-            assert_matches_type(Optional[AccountUpdateResponse], account, path=["response"])
+            assert_matches_type(AccountUpdateResponse, account, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -58,7 +58,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.addressing.address_maps.accounts.with_raw_response.update(
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
                 account_id="",
                 body={},
             )
@@ -66,41 +66,41 @@ def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `address_map_id` but received ''"):
             client.addressing.address_maps.accounts.with_raw_response.update(
                 address_map_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
                 body={},
             )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         account = client.addressing.address_maps.accounts.delete(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
-        assert_matches_type(Optional[AccountDeleteResponse], account, path=["response"])
+        assert_matches_type(AccountDeleteResponse, account, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.addressing.address_maps.accounts.with_raw_response.delete(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         account = response.parse()
-        assert_matches_type(Optional[AccountDeleteResponse], account, path=["response"])
+        assert_matches_type(AccountDeleteResponse, account, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.addressing.address_maps.accounts.with_streaming_response.delete(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             account = response.parse()
-            assert_matches_type(Optional[AccountDeleteResponse], account, path=["response"])
+            assert_matches_type(AccountDeleteResponse, account, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -108,54 +108,56 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.addressing.address_maps.accounts.with_raw_response.delete(
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `address_map_id` but received ''"):
             client.addressing.address_maps.accounts.with_raw_response.delete(
                 address_map_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
             )
 
 
 class TestAsyncAccounts:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         account = await async_client.addressing.address_maps.accounts.update(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             body={},
         )
-        assert_matches_type(Optional[AccountUpdateResponse], account, path=["response"])
+        assert_matches_type(AccountUpdateResponse, account, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.address_maps.accounts.with_raw_response.update(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             body={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         account = await response.parse()
-        assert_matches_type(Optional[AccountUpdateResponse], account, path=["response"])
+        assert_matches_type(AccountUpdateResponse, account, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.address_maps.accounts.with_streaming_response.update(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             account = await response.parse()
-            assert_matches_type(Optional[AccountUpdateResponse], account, path=["response"])
+            assert_matches_type(AccountUpdateResponse, account, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -163,7 +165,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.addressing.address_maps.accounts.with_raw_response.update(
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
                 account_id="",
                 body={},
             )
@@ -171,41 +173,41 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `address_map_id` but received ''"):
             await async_client.addressing.address_maps.accounts.with_raw_response.update(
                 address_map_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
                 body={},
             )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         account = await async_client.addressing.address_maps.accounts.delete(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
-        assert_matches_type(Optional[AccountDeleteResponse], account, path=["response"])
+        assert_matches_type(AccountDeleteResponse, account, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.address_maps.accounts.with_raw_response.delete(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         account = await response.parse()
-        assert_matches_type(Optional[AccountDeleteResponse], account, path=["response"])
+        assert_matches_type(AccountDeleteResponse, account, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.address_maps.accounts.with_streaming_response.delete(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             account = await response.parse()
-            assert_matches_type(Optional[AccountDeleteResponse], account, path=["response"])
+            assert_matches_type(AccountDeleteResponse, account, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -213,12 +215,12 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.addressing.address_maps.accounts.with_raw_response.delete(
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `address_map_id` but received ''"):
             await async_client.addressing.address_maps.accounts.with_raw_response.delete(
                 address_map_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
             )
diff --git a/tests/api_resources/addressing/address_maps/test_ips.py b/tests/api_resources/addressing/address_maps/test_ips.py
index 8c957cb7f53..ee94225fd61 100644
--- a/tests/api_resources/addressing/address_maps/test_ips.py
+++ b/tests/api_resources/addressing/address_maps/test_ips.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -21,39 +21,39 @@ class TestIPs:
     def test_method_update(self, client: Cloudflare) -> None:
         ip = client.addressing.address_maps.ips.update(
             ip_address="192.0.2.1",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
             body={},
         )
-        assert_matches_type(Optional[IPUpdateResponse], ip, path=["response"])
+        assert_matches_type(IPUpdateResponse, ip, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.addressing.address_maps.ips.with_raw_response.update(
             ip_address="192.0.2.1",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
             body={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         ip = response.parse()
-        assert_matches_type(Optional[IPUpdateResponse], ip, path=["response"])
+        assert_matches_type(IPUpdateResponse, ip, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.addressing.address_maps.ips.with_streaming_response.update(
             ip_address="192.0.2.1",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
             body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             ip = response.parse()
-            assert_matches_type(Optional[IPUpdateResponse], ip, path=["response"])
+            assert_matches_type(IPUpdateResponse, ip, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -63,14 +63,14 @@ def test_path_params_update(self, client: Cloudflare) -> None:
             client.addressing.address_maps.ips.with_raw_response.update(
                 ip_address="192.0.2.1",
                 account_id="",
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
                 body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `address_map_id` but received ''"):
             client.addressing.address_maps.ips.with_raw_response.update(
                 ip_address="192.0.2.1",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
                 address_map_id="",
                 body={},
             )
@@ -78,8 +78,8 @@ def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `ip_address` but received ''"):
             client.addressing.address_maps.ips.with_raw_response.update(
                 ip_address="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
                 body={},
             )
 
@@ -87,36 +87,36 @@ def test_path_params_update(self, client: Cloudflare) -> None:
     def test_method_delete(self, client: Cloudflare) -> None:
         ip = client.addressing.address_maps.ips.delete(
             ip_address="192.0.2.1",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
         )
-        assert_matches_type(Optional[IPDeleteResponse], ip, path=["response"])
+        assert_matches_type(IPDeleteResponse, ip, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.addressing.address_maps.ips.with_raw_response.delete(
             ip_address="192.0.2.1",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         ip = response.parse()
-        assert_matches_type(Optional[IPDeleteResponse], ip, path=["response"])
+        assert_matches_type(IPDeleteResponse, ip, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.addressing.address_maps.ips.with_streaming_response.delete(
             ip_address="192.0.2.1",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             ip = response.parse()
-            assert_matches_type(Optional[IPDeleteResponse], ip, path=["response"])
+            assert_matches_type(IPDeleteResponse, ip, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -126,64 +126,66 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
             client.addressing.address_maps.ips.with_raw_response.delete(
                 ip_address="192.0.2.1",
                 account_id="",
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `address_map_id` but received ''"):
             client.addressing.address_maps.ips.with_raw_response.delete(
                 ip_address="192.0.2.1",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
                 address_map_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `ip_address` but received ''"):
             client.addressing.address_maps.ips.with_raw_response.delete(
                 ip_address="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
             )
 
 
 class TestAsyncIPs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         ip = await async_client.addressing.address_maps.ips.update(
             ip_address="192.0.2.1",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
             body={},
         )
-        assert_matches_type(Optional[IPUpdateResponse], ip, path=["response"])
+        assert_matches_type(IPUpdateResponse, ip, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.address_maps.ips.with_raw_response.update(
             ip_address="192.0.2.1",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
             body={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         ip = await response.parse()
-        assert_matches_type(Optional[IPUpdateResponse], ip, path=["response"])
+        assert_matches_type(IPUpdateResponse, ip, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.address_maps.ips.with_streaming_response.update(
             ip_address="192.0.2.1",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
             body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             ip = await response.parse()
-            assert_matches_type(Optional[IPUpdateResponse], ip, path=["response"])
+            assert_matches_type(IPUpdateResponse, ip, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -193,14 +195,14 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
             await async_client.addressing.address_maps.ips.with_raw_response.update(
                 ip_address="192.0.2.1",
                 account_id="",
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
                 body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `address_map_id` but received ''"):
             await async_client.addressing.address_maps.ips.with_raw_response.update(
                 ip_address="192.0.2.1",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
                 address_map_id="",
                 body={},
             )
@@ -208,8 +210,8 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `ip_address` but received ''"):
             await async_client.addressing.address_maps.ips.with_raw_response.update(
                 ip_address="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
                 body={},
             )
 
@@ -217,36 +219,36 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         ip = await async_client.addressing.address_maps.ips.delete(
             ip_address="192.0.2.1",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
         )
-        assert_matches_type(Optional[IPDeleteResponse], ip, path=["response"])
+        assert_matches_type(IPDeleteResponse, ip, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.address_maps.ips.with_raw_response.delete(
             ip_address="192.0.2.1",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         ip = await response.parse()
-        assert_matches_type(Optional[IPDeleteResponse], ip, path=["response"])
+        assert_matches_type(IPDeleteResponse, ip, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.address_maps.ips.with_streaming_response.delete(
             ip_address="192.0.2.1",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             ip = await response.parse()
-            assert_matches_type(Optional[IPDeleteResponse], ip, path=["response"])
+            assert_matches_type(IPDeleteResponse, ip, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -256,19 +258,19 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
             await async_client.addressing.address_maps.ips.with_raw_response.delete(
                 ip_address="192.0.2.1",
                 account_id="",
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `address_map_id` but received ''"):
             await async_client.addressing.address_maps.ips.with_raw_response.delete(
                 ip_address="192.0.2.1",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
                 address_map_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `ip_address` but received ''"):
             await async_client.addressing.address_maps.ips.with_raw_response.delete(
                 ip_address="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
             )
diff --git a/tests/api_resources/addressing/address_maps/test_zones.py b/tests/api_resources/addressing/address_maps/test_zones.py
index 15ab975e8ed..978b3f76428 100644
--- a/tests/api_resources/addressing/address_maps/test_zones.py
+++ b/tests/api_resources/addressing/address_maps/test_zones.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -20,40 +20,40 @@ class TestZones:
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         zone = client.addressing.address_maps.zones.update(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            zone_id="8ac8489932db6327334c9b6d58544cfe",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             body={},
         )
-        assert_matches_type(Optional[ZoneUpdateResponse], zone, path=["response"])
+        assert_matches_type(ZoneUpdateResponse, zone, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.addressing.address_maps.zones.with_raw_response.update(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            zone_id="8ac8489932db6327334c9b6d58544cfe",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             body={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         zone = response.parse()
-        assert_matches_type(Optional[ZoneUpdateResponse], zone, path=["response"])
+        assert_matches_type(ZoneUpdateResponse, zone, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.addressing.address_maps.zones.with_streaming_response.update(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            zone_id="8ac8489932db6327334c9b6d58544cfe",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             zone = response.parse()
-            assert_matches_type(Optional[ZoneUpdateResponse], zone, path=["response"])
+            assert_matches_type(ZoneUpdateResponse, zone, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -61,16 +61,16 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.addressing.address_maps.zones.with_raw_response.update(
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
                 zone_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
                 body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.addressing.address_maps.zones.with_raw_response.update(
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
+                zone_id="8ac8489932db6327334c9b6d58544cfe",
                 account_id="",
                 body={},
             )
@@ -78,45 +78,45 @@ def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `address_map_id` but received ''"):
             client.addressing.address_maps.zones.with_raw_response.update(
                 address_map_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="8ac8489932db6327334c9b6d58544cfe",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
                 body={},
             )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         zone = client.addressing.address_maps.zones.delete(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            zone_id="8ac8489932db6327334c9b6d58544cfe",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
-        assert_matches_type(Optional[ZoneDeleteResponse], zone, path=["response"])
+        assert_matches_type(ZoneDeleteResponse, zone, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.addressing.address_maps.zones.with_raw_response.delete(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            zone_id="8ac8489932db6327334c9b6d58544cfe",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         zone = response.parse()
-        assert_matches_type(Optional[ZoneDeleteResponse], zone, path=["response"])
+        assert_matches_type(ZoneDeleteResponse, zone, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.addressing.address_maps.zones.with_streaming_response.delete(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            zone_id="8ac8489932db6327334c9b6d58544cfe",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             zone = response.parse()
-            assert_matches_type(Optional[ZoneDeleteResponse], zone, path=["response"])
+            assert_matches_type(ZoneDeleteResponse, zone, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -124,66 +124,68 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.addressing.address_maps.zones.with_raw_response.delete(
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
                 zone_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.addressing.address_maps.zones.with_raw_response.delete(
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
+                zone_id="8ac8489932db6327334c9b6d58544cfe",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `address_map_id` but received ''"):
             client.addressing.address_maps.zones.with_raw_response.delete(
                 address_map_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="8ac8489932db6327334c9b6d58544cfe",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
             )
 
 
 class TestAsyncZones:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         zone = await async_client.addressing.address_maps.zones.update(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            zone_id="8ac8489932db6327334c9b6d58544cfe",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             body={},
         )
-        assert_matches_type(Optional[ZoneUpdateResponse], zone, path=["response"])
+        assert_matches_type(ZoneUpdateResponse, zone, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.address_maps.zones.with_raw_response.update(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            zone_id="8ac8489932db6327334c9b6d58544cfe",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             body={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         zone = await response.parse()
-        assert_matches_type(Optional[ZoneUpdateResponse], zone, path=["response"])
+        assert_matches_type(ZoneUpdateResponse, zone, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.address_maps.zones.with_streaming_response.update(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            zone_id="8ac8489932db6327334c9b6d58544cfe",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             zone = await response.parse()
-            assert_matches_type(Optional[ZoneUpdateResponse], zone, path=["response"])
+            assert_matches_type(ZoneUpdateResponse, zone, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -191,16 +193,16 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.addressing.address_maps.zones.with_raw_response.update(
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
                 zone_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
                 body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.addressing.address_maps.zones.with_raw_response.update(
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
+                zone_id="8ac8489932db6327334c9b6d58544cfe",
                 account_id="",
                 body={},
             )
@@ -208,45 +210,45 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `address_map_id` but received ''"):
             await async_client.addressing.address_maps.zones.with_raw_response.update(
                 address_map_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="8ac8489932db6327334c9b6d58544cfe",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
                 body={},
             )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         zone = await async_client.addressing.address_maps.zones.delete(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            zone_id="8ac8489932db6327334c9b6d58544cfe",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
-        assert_matches_type(Optional[ZoneDeleteResponse], zone, path=["response"])
+        assert_matches_type(ZoneDeleteResponse, zone, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.address_maps.zones.with_raw_response.delete(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            zone_id="8ac8489932db6327334c9b6d58544cfe",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         zone = await response.parse()
-        assert_matches_type(Optional[ZoneDeleteResponse], zone, path=["response"])
+        assert_matches_type(ZoneDeleteResponse, zone, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.address_maps.zones.with_streaming_response.delete(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            zone_id="8ac8489932db6327334c9b6d58544cfe",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             zone = await response.parse()
-            assert_matches_type(Optional[ZoneDeleteResponse], zone, path=["response"])
+            assert_matches_type(ZoneDeleteResponse, zone, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -254,21 +256,21 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.addressing.address_maps.zones.with_raw_response.delete(
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
                 zone_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.addressing.address_maps.zones.with_raw_response.delete(
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
+                zone_id="8ac8489932db6327334c9b6d58544cfe",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `address_map_id` but received ''"):
             await async_client.addressing.address_maps.zones.with_raw_response.delete(
                 address_map_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="8ac8489932db6327334c9b6d58544cfe",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
             )
diff --git a/tests/api_resources/addressing/loa_documents/test_downloads.py b/tests/api_resources/addressing/loa_documents/test_downloads.py
deleted file mode 100644
index b4ff36279c0..00000000000
--- a/tests/api_resources/addressing/loa_documents/test_downloads.py
+++ /dev/null
@@ -1,184 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, cast
-
-import httpx
-import pytest
-from respx import MockRouter
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from cloudflare._response import (
-    BinaryAPIResponse,
-    AsyncBinaryAPIResponse,
-    StreamedBinaryAPIResponse,
-    AsyncStreamedBinaryAPIResponse,
-)
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestDownloads:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @pytest.mark.skip(
-        reason="TODO: address broken spotlight error - https://github.com/cloudflare/cloudflare-typescript/actions/runs/9456639475/job/26048931174?pr=498#step:5:489"
-    )
-    @parametrize
-    @pytest.mark.respx(base_url=base_url)
-    def test_method_get(self, client: Cloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get(
-            "/accounts/023e105f4ecef8ad9ca31a8372d0c353/addressing/loa_documents/d933b1530bc56c9953cf8ce166da8004/download"
-        ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
-        download = client.addressing.loa_documents.downloads.get(
-            loa_document_id="d933b1530bc56c9953cf8ce166da8004",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert download.is_closed
-        assert download.json() == {"foo": "bar"}
-        assert cast(Any, download.is_closed) is True
-        assert isinstance(download, BinaryAPIResponse)
-
-    @pytest.mark.skip(
-        reason="TODO: address broken spotlight error - https://github.com/cloudflare/cloudflare-typescript/actions/runs/9456639475/job/26048931174?pr=498#step:5:489"
-    )
-    @parametrize
-    @pytest.mark.respx(base_url=base_url)
-    def test_raw_response_get(self, client: Cloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get(
-            "/accounts/023e105f4ecef8ad9ca31a8372d0c353/addressing/loa_documents/d933b1530bc56c9953cf8ce166da8004/download"
-        ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
-
-        download = client.addressing.loa_documents.downloads.with_raw_response.get(
-            loa_document_id="d933b1530bc56c9953cf8ce166da8004",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert download.is_closed is True
-        assert download.http_request.headers.get("X-Stainless-Lang") == "python"
-        assert download.json() == {"foo": "bar"}
-        assert isinstance(download, BinaryAPIResponse)
-
-    @pytest.mark.skip(
-        reason="TODO: address broken spotlight error - https://github.com/cloudflare/cloudflare-typescript/actions/runs/9456639475/job/26048931174?pr=498#step:5:489"
-    )
-    @parametrize
-    @pytest.mark.respx(base_url=base_url)
-    def test_streaming_response_get(self, client: Cloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get(
-            "/accounts/023e105f4ecef8ad9ca31a8372d0c353/addressing/loa_documents/d933b1530bc56c9953cf8ce166da8004/download"
-        ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
-        with client.addressing.loa_documents.downloads.with_streaming_response.get(
-            loa_document_id="d933b1530bc56c9953cf8ce166da8004",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as download:
-            assert not download.is_closed
-            assert download.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            assert download.json() == {"foo": "bar"}
-            assert cast(Any, download.is_closed) is True
-            assert isinstance(download, StreamedBinaryAPIResponse)
-
-        assert cast(Any, download.is_closed) is True
-
-    @pytest.mark.skip(
-        reason="TODO: address broken spotlight error - https://github.com/cloudflare/cloudflare-typescript/actions/runs/9456639475/job/26048931174?pr=498#step:5:489"
-    )
-    @parametrize
-    @pytest.mark.respx(base_url=base_url)
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.addressing.loa_documents.downloads.with_raw_response.get(
-                loa_document_id="d933b1530bc56c9953cf8ce166da8004",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `loa_document_id` but received ''"):
-            client.addressing.loa_documents.downloads.with_raw_response.get(
-                loa_document_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-
-class TestAsyncDownloads:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @pytest.mark.skip(
-        reason="TODO: address broken spotlight error - https://github.com/cloudflare/cloudflare-typescript/actions/runs/9456639475/job/26048931174?pr=498#step:5:489"
-    )
-    @parametrize
-    @pytest.mark.respx(base_url=base_url)
-    async def test_method_get(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get(
-            "/accounts/023e105f4ecef8ad9ca31a8372d0c353/addressing/loa_documents/d933b1530bc56c9953cf8ce166da8004/download"
-        ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
-        download = await async_client.addressing.loa_documents.downloads.get(
-            loa_document_id="d933b1530bc56c9953cf8ce166da8004",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert download.is_closed
-        assert await download.json() == {"foo": "bar"}
-        assert cast(Any, download.is_closed) is True
-        assert isinstance(download, AsyncBinaryAPIResponse)
-
-    @pytest.mark.skip(
-        reason="TODO: address broken spotlight error - https://github.com/cloudflare/cloudflare-typescript/actions/runs/9456639475/job/26048931174?pr=498#step:5:489"
-    )
-    @parametrize
-    @pytest.mark.respx(base_url=base_url)
-    async def test_raw_response_get(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get(
-            "/accounts/023e105f4ecef8ad9ca31a8372d0c353/addressing/loa_documents/d933b1530bc56c9953cf8ce166da8004/download"
-        ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
-
-        download = await async_client.addressing.loa_documents.downloads.with_raw_response.get(
-            loa_document_id="d933b1530bc56c9953cf8ce166da8004",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert download.is_closed is True
-        assert download.http_request.headers.get("X-Stainless-Lang") == "python"
-        assert await download.json() == {"foo": "bar"}
-        assert isinstance(download, AsyncBinaryAPIResponse)
-
-    @pytest.mark.skip(
-        reason="TODO: address broken spotlight error - https://github.com/cloudflare/cloudflare-typescript/actions/runs/9456639475/job/26048931174?pr=498#step:5:489"
-    )
-    @parametrize
-    @pytest.mark.respx(base_url=base_url)
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get(
-            "/accounts/023e105f4ecef8ad9ca31a8372d0c353/addressing/loa_documents/d933b1530bc56c9953cf8ce166da8004/download"
-        ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
-        async with async_client.addressing.loa_documents.downloads.with_streaming_response.get(
-            loa_document_id="d933b1530bc56c9953cf8ce166da8004",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as download:
-            assert not download.is_closed
-            assert download.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            assert await download.json() == {"foo": "bar"}
-            assert cast(Any, download.is_closed) is True
-            assert isinstance(download, AsyncStreamedBinaryAPIResponse)
-
-        assert cast(Any, download.is_closed) is True
-
-    @pytest.mark.skip(
-        reason="TODO: address broken spotlight error - https://github.com/cloudflare/cloudflare-typescript/actions/runs/9456639475/job/26048931174?pr=498#step:5:489"
-    )
-    @parametrize
-    @pytest.mark.respx(base_url=base_url)
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.addressing.loa_documents.downloads.with_raw_response.get(
-                loa_document_id="d933b1530bc56c9953cf8ce166da8004",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `loa_document_id` but received ''"):
-            await async_client.addressing.loa_documents.downloads.with_raw_response.get(
-                loa_document_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
diff --git a/tests/api_resources/addressing/prefixes/bgp/test_bindings.py b/tests/api_resources/addressing/prefixes/bgp/test_bindings.py
deleted file mode 100644
index 1fca628ca73..00000000000
--- a/tests/api_resources/addressing/prefixes/bgp/test_bindings.py
+++ /dev/null
@@ -1,475 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.addressing.prefixes.bgp import ServiceBinding, BindingDeleteResponse
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestBindings:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_create(self, client: Cloudflare) -> None:
-        binding = client.addressing.prefixes.bgp.bindings.create(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[ServiceBinding], binding, path=["response"])
-
-    @parametrize
-    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
-        binding = client.addressing.prefixes.bgp.bindings.create(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            cidr="192.0.2.0/24",
-            service_id="2db684ee7ca04e159946fd05b99e1bcd",
-        )
-        assert_matches_type(Optional[ServiceBinding], binding, path=["response"])
-
-    @parametrize
-    def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.addressing.prefixes.bgp.bindings.with_raw_response.create(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        binding = response.parse()
-        assert_matches_type(Optional[ServiceBinding], binding, path=["response"])
-
-    @parametrize
-    def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.addressing.prefixes.bgp.bindings.with_streaming_response.create(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            binding = response.parse()
-            assert_matches_type(Optional[ServiceBinding], binding, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.addressing.prefixes.bgp.bindings.with_raw_response.create(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
-            client.addressing.prefixes.bgp.bindings.with_raw_response.create(
-                prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        binding = client.addressing.prefixes.bgp.bindings.list(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SyncSinglePage[ServiceBinding], binding, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.addressing.prefixes.bgp.bindings.with_raw_response.list(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        binding = response.parse()
-        assert_matches_type(SyncSinglePage[ServiceBinding], binding, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.addressing.prefixes.bgp.bindings.with_streaming_response.list(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            binding = response.parse()
-            assert_matches_type(SyncSinglePage[ServiceBinding], binding, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.addressing.prefixes.bgp.bindings.with_raw_response.list(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
-            client.addressing.prefixes.bgp.bindings.with_raw_response.list(
-                prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_delete(self, client: Cloudflare) -> None:
-        binding = client.addressing.prefixes.bgp.bindings.delete(
-            binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(BindingDeleteResponse, binding, path=["response"])
-
-    @parametrize
-    def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.addressing.prefixes.bgp.bindings.with_raw_response.delete(
-            binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        binding = response.parse()
-        assert_matches_type(BindingDeleteResponse, binding, path=["response"])
-
-    @parametrize
-    def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.addressing.prefixes.bgp.bindings.with_streaming_response.delete(
-            binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            binding = response.parse()
-            assert_matches_type(BindingDeleteResponse, binding, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.addressing.prefixes.bgp.bindings.with_raw_response.delete(
-                binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
-            client.addressing.prefixes.bgp.bindings.with_raw_response.delete(
-                binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prefix_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `binding_id` but received ''"):
-            client.addressing.prefixes.bgp.bindings.with_raw_response.delete(
-                binding_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        binding = client.addressing.prefixes.bgp.bindings.get(
-            binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[ServiceBinding], binding, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.addressing.prefixes.bgp.bindings.with_raw_response.get(
-            binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        binding = response.parse()
-        assert_matches_type(Optional[ServiceBinding], binding, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.addressing.prefixes.bgp.bindings.with_streaming_response.get(
-            binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            binding = response.parse()
-            assert_matches_type(Optional[ServiceBinding], binding, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.addressing.prefixes.bgp.bindings.with_raw_response.get(
-                binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
-            client.addressing.prefixes.bgp.bindings.with_raw_response.get(
-                binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prefix_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `binding_id` but received ''"):
-            client.addressing.prefixes.bgp.bindings.with_raw_response.get(
-                binding_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-
-class TestAsyncBindings:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        binding = await async_client.addressing.prefixes.bgp.bindings.create(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[ServiceBinding], binding, path=["response"])
-
-    @parametrize
-    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        binding = await async_client.addressing.prefixes.bgp.bindings.create(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            cidr="192.0.2.0/24",
-            service_id="2db684ee7ca04e159946fd05b99e1bcd",
-        )
-        assert_matches_type(Optional[ServiceBinding], binding, path=["response"])
-
-    @parametrize
-    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.addressing.prefixes.bgp.bindings.with_raw_response.create(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        binding = await response.parse()
-        assert_matches_type(Optional[ServiceBinding], binding, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.addressing.prefixes.bgp.bindings.with_streaming_response.create(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            binding = await response.parse()
-            assert_matches_type(Optional[ServiceBinding], binding, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.bindings.with_raw_response.create(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.bindings.with_raw_response.create(
-                prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        binding = await async_client.addressing.prefixes.bgp.bindings.list(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(AsyncSinglePage[ServiceBinding], binding, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.addressing.prefixes.bgp.bindings.with_raw_response.list(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        binding = await response.parse()
-        assert_matches_type(AsyncSinglePage[ServiceBinding], binding, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.addressing.prefixes.bgp.bindings.with_streaming_response.list(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            binding = await response.parse()
-            assert_matches_type(AsyncSinglePage[ServiceBinding], binding, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.bindings.with_raw_response.list(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.bindings.with_raw_response.list(
-                prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        binding = await async_client.addressing.prefixes.bgp.bindings.delete(
-            binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(BindingDeleteResponse, binding, path=["response"])
-
-    @parametrize
-    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.addressing.prefixes.bgp.bindings.with_raw_response.delete(
-            binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        binding = await response.parse()
-        assert_matches_type(BindingDeleteResponse, binding, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.addressing.prefixes.bgp.bindings.with_streaming_response.delete(
-            binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            binding = await response.parse()
-            assert_matches_type(BindingDeleteResponse, binding, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.bindings.with_raw_response.delete(
-                binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.bindings.with_raw_response.delete(
-                binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prefix_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `binding_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.bindings.with_raw_response.delete(
-                binding_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        binding = await async_client.addressing.prefixes.bgp.bindings.get(
-            binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[ServiceBinding], binding, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.addressing.prefixes.bgp.bindings.with_raw_response.get(
-            binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        binding = await response.parse()
-        assert_matches_type(Optional[ServiceBinding], binding, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.addressing.prefixes.bgp.bindings.with_streaming_response.get(
-            binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            binding = await response.parse()
-            assert_matches_type(Optional[ServiceBinding], binding, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.bindings.with_raw_response.get(
-                binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.bindings.with_raw_response.get(
-                binding_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prefix_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `binding_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.bindings.with_raw_response.get(
-                binding_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
diff --git a/tests/api_resources/addressing/prefixes/bgp/test_prefixes.py b/tests/api_resources/addressing/prefixes/bgp/test_prefixes.py
deleted file mode 100644
index c0486fa677a..00000000000
--- a/tests/api_resources/addressing/prefixes/bgp/test_prefixes.py
+++ /dev/null
@@ -1,379 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.addressing.prefixes.bgp import BGPPrefix
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestPrefixes:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        prefix = client.addressing.prefixes.bgp.prefixes.list(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SyncSinglePage[BGPPrefix], prefix, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.addressing.prefixes.bgp.prefixes.with_raw_response.list(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        prefix = response.parse()
-        assert_matches_type(SyncSinglePage[BGPPrefix], prefix, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.addressing.prefixes.bgp.prefixes.with_streaming_response.list(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            prefix = response.parse()
-            assert_matches_type(SyncSinglePage[BGPPrefix], prefix, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.addressing.prefixes.bgp.prefixes.with_raw_response.list(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
-            client.addressing.prefixes.bgp.prefixes.with_raw_response.list(
-                prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_edit(self, client: Cloudflare) -> None:
-        prefix = client.addressing.prefixes.bgp.prefixes.edit(
-            bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[BGPPrefix], prefix, path=["response"])
-
-    @parametrize
-    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
-        prefix = client.addressing.prefixes.bgp.prefixes.edit(
-            bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            on_demand={"advertised": True},
-        )
-        assert_matches_type(Optional[BGPPrefix], prefix, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit(self, client: Cloudflare) -> None:
-        response = client.addressing.prefixes.bgp.prefixes.with_raw_response.edit(
-            bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        prefix = response.parse()
-        assert_matches_type(Optional[BGPPrefix], prefix, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit(self, client: Cloudflare) -> None:
-        with client.addressing.prefixes.bgp.prefixes.with_streaming_response.edit(
-            bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            prefix = response.parse()
-            assert_matches_type(Optional[BGPPrefix], prefix, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.addressing.prefixes.bgp.prefixes.with_raw_response.edit(
-                bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
-            client.addressing.prefixes.bgp.prefixes.with_raw_response.edit(
-                bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prefix_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bgp_prefix_id` but received ''"):
-            client.addressing.prefixes.bgp.prefixes.with_raw_response.edit(
-                bgp_prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        prefix = client.addressing.prefixes.bgp.prefixes.get(
-            bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[BGPPrefix], prefix, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.addressing.prefixes.bgp.prefixes.with_raw_response.get(
-            bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        prefix = response.parse()
-        assert_matches_type(Optional[BGPPrefix], prefix, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.addressing.prefixes.bgp.prefixes.with_streaming_response.get(
-            bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            prefix = response.parse()
-            assert_matches_type(Optional[BGPPrefix], prefix, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.addressing.prefixes.bgp.prefixes.with_raw_response.get(
-                bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
-            client.addressing.prefixes.bgp.prefixes.with_raw_response.get(
-                bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prefix_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bgp_prefix_id` but received ''"):
-            client.addressing.prefixes.bgp.prefixes.with_raw_response.get(
-                bgp_prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-
-class TestAsyncPrefixes:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        prefix = await async_client.addressing.prefixes.bgp.prefixes.list(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(AsyncSinglePage[BGPPrefix], prefix, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.addressing.prefixes.bgp.prefixes.with_raw_response.list(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        prefix = await response.parse()
-        assert_matches_type(AsyncSinglePage[BGPPrefix], prefix, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.addressing.prefixes.bgp.prefixes.with_streaming_response.list(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            prefix = await response.parse()
-            assert_matches_type(AsyncSinglePage[BGPPrefix], prefix, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.prefixes.with_raw_response.list(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.prefixes.with_raw_response.list(
-                prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
-        prefix = await async_client.addressing.prefixes.bgp.prefixes.edit(
-            bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[BGPPrefix], prefix, path=["response"])
-
-    @parametrize
-    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        prefix = await async_client.addressing.prefixes.bgp.prefixes.edit(
-            bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            on_demand={"advertised": True},
-        )
-        assert_matches_type(Optional[BGPPrefix], prefix, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.addressing.prefixes.bgp.prefixes.with_raw_response.edit(
-            bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        prefix = await response.parse()
-        assert_matches_type(Optional[BGPPrefix], prefix, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.addressing.prefixes.bgp.prefixes.with_streaming_response.edit(
-            bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            prefix = await response.parse()
-            assert_matches_type(Optional[BGPPrefix], prefix, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.prefixes.with_raw_response.edit(
-                bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.prefixes.with_raw_response.edit(
-                bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prefix_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bgp_prefix_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.prefixes.with_raw_response.edit(
-                bgp_prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        prefix = await async_client.addressing.prefixes.bgp.prefixes.get(
-            bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[BGPPrefix], prefix, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.addressing.prefixes.bgp.prefixes.with_raw_response.get(
-            bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        prefix = await response.parse()
-        assert_matches_type(Optional[BGPPrefix], prefix, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.addressing.prefixes.bgp.prefixes.with_streaming_response.get(
-            bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            prefix = await response.parse()
-            assert_matches_type(Optional[BGPPrefix], prefix, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.prefixes.with_raw_response.get(
-                bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.prefixes.with_raw_response.get(
-                bgp_prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prefix_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bgp_prefix_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.prefixes.with_raw_response.get(
-                bgp_prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
diff --git a/tests/api_resources/addressing/prefixes/bgp/test_statuses.py b/tests/api_resources/addressing/prefixes/bgp/test_statuses.py
deleted file mode 100644
index 3a1bf7f4e57..00000000000
--- a/tests/api_resources/addressing/prefixes/bgp/test_statuses.py
+++ /dev/null
@@ -1,224 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.addressing.prefixes.bgp import StatusGetResponse, StatusEditResponse
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestStatuses:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_edit(self, client: Cloudflare) -> None:
-        status = client.addressing.prefixes.bgp.statuses.edit(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            advertised=True,
-        )
-        assert_matches_type(Optional[StatusEditResponse], status, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit(self, client: Cloudflare) -> None:
-        response = client.addressing.prefixes.bgp.statuses.with_raw_response.edit(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            advertised=True,
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        status = response.parse()
-        assert_matches_type(Optional[StatusEditResponse], status, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit(self, client: Cloudflare) -> None:
-        with client.addressing.prefixes.bgp.statuses.with_streaming_response.edit(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            advertised=True,
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            status = response.parse()
-            assert_matches_type(Optional[StatusEditResponse], status, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.addressing.prefixes.bgp.statuses.with_raw_response.edit(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                advertised=True,
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
-            client.addressing.prefixes.bgp.statuses.with_raw_response.edit(
-                prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                advertised=True,
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        status = client.addressing.prefixes.bgp.statuses.get(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[StatusGetResponse], status, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.addressing.prefixes.bgp.statuses.with_raw_response.get(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        status = response.parse()
-        assert_matches_type(Optional[StatusGetResponse], status, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.addressing.prefixes.bgp.statuses.with_streaming_response.get(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            status = response.parse()
-            assert_matches_type(Optional[StatusGetResponse], status, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.addressing.prefixes.bgp.statuses.with_raw_response.get(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
-            client.addressing.prefixes.bgp.statuses.with_raw_response.get(
-                prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-
-class TestAsyncStatuses:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
-        status = await async_client.addressing.prefixes.bgp.statuses.edit(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            advertised=True,
-        )
-        assert_matches_type(Optional[StatusEditResponse], status, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.addressing.prefixes.bgp.statuses.with_raw_response.edit(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            advertised=True,
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        status = await response.parse()
-        assert_matches_type(Optional[StatusEditResponse], status, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.addressing.prefixes.bgp.statuses.with_streaming_response.edit(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            advertised=True,
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            status = await response.parse()
-            assert_matches_type(Optional[StatusEditResponse], status, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.statuses.with_raw_response.edit(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                advertised=True,
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.statuses.with_raw_response.edit(
-                prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                advertised=True,
-            )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        status = await async_client.addressing.prefixes.bgp.statuses.get(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[StatusGetResponse], status, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.addressing.prefixes.bgp.statuses.with_raw_response.get(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        status = await response.parse()
-        assert_matches_type(Optional[StatusGetResponse], status, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.addressing.prefixes.bgp.statuses.with_streaming_response.get(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            status = await response.parse()
-            assert_matches_type(Optional[StatusGetResponse], status, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.statuses.with_raw_response.get(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
-            await async_client.addressing.prefixes.bgp.statuses.with_raw_response.get(
-                prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
diff --git a/tests/api_resources/addressing/prefixes/test_advertisement_status.py b/tests/api_resources/addressing/prefixes/test_advertisement_status.py
new file mode 100644
index 00000000000..4bc11f6f6b1
--- /dev/null
+++ b/tests/api_resources/addressing/prefixes/test_advertisement_status.py
@@ -0,0 +1,251 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.addressing.prefixes import (
+    AdvertisementStatusGetResponse,
+    AdvertisementStatusEditResponse,
+)
+
+# pyright: reportDeprecated=false
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestAdvertisementStatus:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            advertisement_status = client.addressing.prefixes.advertisement_status.edit(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                advertised=True,
+            )
+
+        assert_matches_type(Optional[AdvertisementStatusEditResponse], advertisement_status, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.addressing.prefixes.advertisement_status.with_raw_response.edit(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                advertised=True,
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        advertisement_status = response.parse()
+        assert_matches_type(Optional[AdvertisementStatusEditResponse], advertisement_status, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.addressing.prefixes.advertisement_status.with_streaming_response.edit(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                advertised=True,
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                advertisement_status = response.parse()
+                assert_matches_type(Optional[AdvertisementStatusEditResponse], advertisement_status, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.addressing.prefixes.advertisement_status.with_raw_response.edit(
+                    prefix_id="2af39739cc4e3b5910c918468bb89828",
+                    account_id="",
+                    advertised=True,
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+                client.addressing.prefixes.advertisement_status.with_raw_response.edit(
+                    prefix_id="",
+                    account_id="258def64c72dae45f3e4c8516e2111f2",
+                    advertised=True,
+                )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            advertisement_status = client.addressing.prefixes.advertisement_status.get(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+            )
+
+        assert_matches_type(Optional[AdvertisementStatusGetResponse], advertisement_status, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.addressing.prefixes.advertisement_status.with_raw_response.get(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        advertisement_status = response.parse()
+        assert_matches_type(Optional[AdvertisementStatusGetResponse], advertisement_status, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.addressing.prefixes.advertisement_status.with_streaming_response.get(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                advertisement_status = response.parse()
+                assert_matches_type(Optional[AdvertisementStatusGetResponse], advertisement_status, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.addressing.prefixes.advertisement_status.with_raw_response.get(
+                    prefix_id="2af39739cc4e3b5910c918468bb89828",
+                    account_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+                client.addressing.prefixes.advertisement_status.with_raw_response.get(
+                    prefix_id="",
+                    account_id="258def64c72dae45f3e4c8516e2111f2",
+                )
+
+
+class TestAsyncAdvertisementStatus:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            advertisement_status = await async_client.addressing.prefixes.advertisement_status.edit(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                advertised=True,
+            )
+
+        assert_matches_type(Optional[AdvertisementStatusEditResponse], advertisement_status, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.addressing.prefixes.advertisement_status.with_raw_response.edit(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                advertised=True,
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        advertisement_status = await response.parse()
+        assert_matches_type(Optional[AdvertisementStatusEditResponse], advertisement_status, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.addressing.prefixes.advertisement_status.with_streaming_response.edit(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                advertised=True,
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                advertisement_status = await response.parse()
+                assert_matches_type(Optional[AdvertisementStatusEditResponse], advertisement_status, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.addressing.prefixes.advertisement_status.with_raw_response.edit(
+                    prefix_id="2af39739cc4e3b5910c918468bb89828",
+                    account_id="",
+                    advertised=True,
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+                await async_client.addressing.prefixes.advertisement_status.with_raw_response.edit(
+                    prefix_id="",
+                    account_id="258def64c72dae45f3e4c8516e2111f2",
+                    advertised=True,
+                )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            advertisement_status = await async_client.addressing.prefixes.advertisement_status.get(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+            )
+
+        assert_matches_type(Optional[AdvertisementStatusGetResponse], advertisement_status, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.addressing.prefixes.advertisement_status.with_raw_response.get(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        advertisement_status = await response.parse()
+        assert_matches_type(Optional[AdvertisementStatusGetResponse], advertisement_status, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.addressing.prefixes.advertisement_status.with_streaming_response.get(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                advertisement_status = await response.parse()
+                assert_matches_type(Optional[AdvertisementStatusGetResponse], advertisement_status, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.addressing.prefixes.advertisement_status.with_raw_response.get(
+                    prefix_id="2af39739cc4e3b5910c918468bb89828",
+                    account_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+                await async_client.addressing.prefixes.advertisement_status.with_raw_response.get(
+                    prefix_id="",
+                    account_id="258def64c72dae45f3e4c8516e2111f2",
+                )
diff --git a/tests/api_resources/addressing/prefixes/test_bgp_prefixes.py b/tests/api_resources/addressing/prefixes/test_bgp_prefixes.py
new file mode 100644
index 00000000000..edc9d1ff33f
--- /dev/null
+++ b/tests/api_resources/addressing/prefixes/test_bgp_prefixes.py
@@ -0,0 +1,491 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.addressing.prefixes import BGPPrefix
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestBGPPrefixes:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        bgp_prefix = client.addressing.prefixes.bgp_prefixes.create(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            cidr="192.0.2.0/24",
+        )
+        assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.addressing.prefixes.bgp_prefixes.with_raw_response.create(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            cidr="192.0.2.0/24",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bgp_prefix = response.parse()
+        assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.addressing.prefixes.bgp_prefixes.with_streaming_response.create(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            cidr="192.0.2.0/24",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bgp_prefix = response.parse()
+            assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.addressing.prefixes.bgp_prefixes.with_raw_response.create(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="",
+                cidr="192.0.2.0/24",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+            client.addressing.prefixes.bgp_prefixes.with_raw_response.create(
+                prefix_id="",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                cidr="192.0.2.0/24",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        bgp_prefix = client.addressing.prefixes.bgp_prefixes.list(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+        )
+        assert_matches_type(SyncSinglePage[BGPPrefix], bgp_prefix, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.addressing.prefixes.bgp_prefixes.with_raw_response.list(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bgp_prefix = response.parse()
+        assert_matches_type(SyncSinglePage[BGPPrefix], bgp_prefix, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.addressing.prefixes.bgp_prefixes.with_streaming_response.list(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bgp_prefix = response.parse()
+            assert_matches_type(SyncSinglePage[BGPPrefix], bgp_prefix, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.addressing.prefixes.bgp_prefixes.with_raw_response.list(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+            client.addressing.prefixes.bgp_prefixes.with_raw_response.list(
+                prefix_id="",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        bgp_prefix = client.addressing.prefixes.bgp_prefixes.edit(
+            bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        )
+        assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        bgp_prefix = client.addressing.prefixes.bgp_prefixes.edit(
+            bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            asn_prepend_count=2,
+            auto_advertise_withdraw=True,
+            on_demand={"advertised": True},
+        )
+        assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.addressing.prefixes.bgp_prefixes.with_raw_response.edit(
+            bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bgp_prefix = response.parse()
+        assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.addressing.prefixes.bgp_prefixes.with_streaming_response.edit(
+            bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bgp_prefix = response.parse()
+            assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.addressing.prefixes.bgp_prefixes.with_raw_response.edit(
+                bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+                account_id="",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+            client.addressing.prefixes.bgp_prefixes.with_raw_response.edit(
+                bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                prefix_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bgp_prefix_id` but received ''"):
+            client.addressing.prefixes.bgp_prefixes.with_raw_response.edit(
+                bgp_prefix_id="",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        bgp_prefix = client.addressing.prefixes.bgp_prefixes.get(
+            bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        )
+        assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.addressing.prefixes.bgp_prefixes.with_raw_response.get(
+            bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bgp_prefix = response.parse()
+        assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.addressing.prefixes.bgp_prefixes.with_streaming_response.get(
+            bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bgp_prefix = response.parse()
+            assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.addressing.prefixes.bgp_prefixes.with_raw_response.get(
+                bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+                account_id="",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+            client.addressing.prefixes.bgp_prefixes.with_raw_response.get(
+                bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                prefix_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bgp_prefix_id` but received ''"):
+            client.addressing.prefixes.bgp_prefixes.with_raw_response.get(
+                bgp_prefix_id="",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+            )
+
+
+class TestAsyncBGPPrefixes:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        bgp_prefix = await async_client.addressing.prefixes.bgp_prefixes.create(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            cidr="192.0.2.0/24",
+        )
+        assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.addressing.prefixes.bgp_prefixes.with_raw_response.create(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            cidr="192.0.2.0/24",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bgp_prefix = await response.parse()
+        assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.addressing.prefixes.bgp_prefixes.with_streaming_response.create(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            cidr="192.0.2.0/24",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bgp_prefix = await response.parse()
+            assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.addressing.prefixes.bgp_prefixes.with_raw_response.create(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="",
+                cidr="192.0.2.0/24",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+            await async_client.addressing.prefixes.bgp_prefixes.with_raw_response.create(
+                prefix_id="",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                cidr="192.0.2.0/24",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        bgp_prefix = await async_client.addressing.prefixes.bgp_prefixes.list(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+        )
+        assert_matches_type(AsyncSinglePage[BGPPrefix], bgp_prefix, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.addressing.prefixes.bgp_prefixes.with_raw_response.list(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bgp_prefix = await response.parse()
+        assert_matches_type(AsyncSinglePage[BGPPrefix], bgp_prefix, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.addressing.prefixes.bgp_prefixes.with_streaming_response.list(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bgp_prefix = await response.parse()
+            assert_matches_type(AsyncSinglePage[BGPPrefix], bgp_prefix, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.addressing.prefixes.bgp_prefixes.with_raw_response.list(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+            await async_client.addressing.prefixes.bgp_prefixes.with_raw_response.list(
+                prefix_id="",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        bgp_prefix = await async_client.addressing.prefixes.bgp_prefixes.edit(
+            bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        )
+        assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        bgp_prefix = await async_client.addressing.prefixes.bgp_prefixes.edit(
+            bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            asn_prepend_count=2,
+            auto_advertise_withdraw=True,
+            on_demand={"advertised": True},
+        )
+        assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.addressing.prefixes.bgp_prefixes.with_raw_response.edit(
+            bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bgp_prefix = await response.parse()
+        assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.addressing.prefixes.bgp_prefixes.with_streaming_response.edit(
+            bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bgp_prefix = await response.parse()
+            assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.addressing.prefixes.bgp_prefixes.with_raw_response.edit(
+                bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+                account_id="",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+            await async_client.addressing.prefixes.bgp_prefixes.with_raw_response.edit(
+                bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                prefix_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bgp_prefix_id` but received ''"):
+            await async_client.addressing.prefixes.bgp_prefixes.with_raw_response.edit(
+                bgp_prefix_id="",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        bgp_prefix = await async_client.addressing.prefixes.bgp_prefixes.get(
+            bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        )
+        assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.addressing.prefixes.bgp_prefixes.with_raw_response.get(
+            bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bgp_prefix = await response.parse()
+        assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.addressing.prefixes.bgp_prefixes.with_streaming_response.get(
+            bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bgp_prefix = await response.parse()
+            assert_matches_type(Optional[BGPPrefix], bgp_prefix, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.addressing.prefixes.bgp_prefixes.with_raw_response.get(
+                bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+                account_id="",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+            await async_client.addressing.prefixes.bgp_prefixes.with_raw_response.get(
+                bgp_prefix_id="7009ba364c7a5760798ceb430e603b74",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                prefix_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bgp_prefix_id` but received ''"):
+            await async_client.addressing.prefixes.bgp_prefixes.with_raw_response.get(
+                bgp_prefix_id="",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+            )
diff --git a/tests/api_resources/addressing/prefixes/test_delegations.py b/tests/api_resources/addressing/prefixes/test_delegations.py
index dd17a7ac44b..a819531b501 100644
--- a/tests/api_resources/addressing/prefixes/test_delegations.py
+++ b/tests/api_resources/addressing/prefixes/test_delegations.py
@@ -21,8 +21,8 @@ class TestDelegations:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         delegation = client.addressing.prefixes.delegations.create(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             cidr="192.0.2.0/24",
             delegated_account_id="b1946ac92492d2347c6235b4d2611184",
         )
@@ -31,8 +31,8 @@ def test_method_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.addressing.prefixes.delegations.with_raw_response.create(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             cidr="192.0.2.0/24",
             delegated_account_id="b1946ac92492d2347c6235b4d2611184",
         )
@@ -45,8 +45,8 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.addressing.prefixes.delegations.with_streaming_response.create(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             cidr="192.0.2.0/24",
             delegated_account_id="b1946ac92492d2347c6235b4d2611184",
         ) as response:
@@ -62,7 +62,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.addressing.prefixes.delegations.with_raw_response.create(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
                 account_id="",
                 cidr="192.0.2.0/24",
                 delegated_account_id="b1946ac92492d2347c6235b4d2611184",
@@ -71,7 +71,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
             client.addressing.prefixes.delegations.with_raw_response.create(
                 prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
                 cidr="192.0.2.0/24",
                 delegated_account_id="b1946ac92492d2347c6235b4d2611184",
             )
@@ -79,16 +79,16 @@ def test_path_params_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         delegation = client.addressing.prefixes.delegations.list(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
         assert_matches_type(SyncSinglePage[Delegations], delegation, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.addressing.prefixes.delegations.with_raw_response.list(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
@@ -99,8 +99,8 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.addressing.prefixes.delegations.with_streaming_response.list(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -114,22 +114,22 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
     def test_path_params_list(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.addressing.prefixes.delegations.with_raw_response.list(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
             client.addressing.prefixes.delegations.with_raw_response.list(
                 prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
             )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         delegation = client.addressing.prefixes.delegations.delete(
             delegation_id="d933b1530bc56c9953cf8ce166da8004",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
         )
         assert_matches_type(Optional[DelegationDeleteResponse], delegation, path=["response"])
 
@@ -137,8 +137,8 @@ def test_method_delete(self, client: Cloudflare) -> None:
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.addressing.prefixes.delegations.with_raw_response.delete(
             delegation_id="d933b1530bc56c9953cf8ce166da8004",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
         )
 
         assert response.is_closed is True
@@ -150,8 +150,8 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.addressing.prefixes.delegations.with_streaming_response.delete(
             delegation_id="d933b1530bc56c9953cf8ce166da8004",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -167,32 +167,34 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
             client.addressing.prefixes.delegations.with_raw_response.delete(
                 delegation_id="d933b1530bc56c9953cf8ce166da8004",
                 account_id="",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
             client.addressing.prefixes.delegations.with_raw_response.delete(
                 delegation_id="d933b1530bc56c9953cf8ce166da8004",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
                 prefix_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `delegation_id` but received ''"):
             client.addressing.prefixes.delegations.with_raw_response.delete(
                 delegation_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
             )
 
 
 class TestAsyncDelegations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         delegation = await async_client.addressing.prefixes.delegations.create(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             cidr="192.0.2.0/24",
             delegated_account_id="b1946ac92492d2347c6235b4d2611184",
         )
@@ -201,8 +203,8 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.prefixes.delegations.with_raw_response.create(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             cidr="192.0.2.0/24",
             delegated_account_id="b1946ac92492d2347c6235b4d2611184",
         )
@@ -215,8 +217,8 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.prefixes.delegations.with_streaming_response.create(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             cidr="192.0.2.0/24",
             delegated_account_id="b1946ac92492d2347c6235b4d2611184",
         ) as response:
@@ -232,7 +234,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.addressing.prefixes.delegations.with_raw_response.create(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
                 account_id="",
                 cidr="192.0.2.0/24",
                 delegated_account_id="b1946ac92492d2347c6235b4d2611184",
@@ -241,7 +243,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
             await async_client.addressing.prefixes.delegations.with_raw_response.create(
                 prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
                 cidr="192.0.2.0/24",
                 delegated_account_id="b1946ac92492d2347c6235b4d2611184",
             )
@@ -249,16 +251,16 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         delegation = await async_client.addressing.prefixes.delegations.list(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
         assert_matches_type(AsyncSinglePage[Delegations], delegation, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.prefixes.delegations.with_raw_response.list(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
@@ -269,8 +271,8 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.prefixes.delegations.with_streaming_response.list(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -284,22 +286,22 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.addressing.prefixes.delegations.with_raw_response.list(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
             await async_client.addressing.prefixes.delegations.with_raw_response.list(
                 prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
             )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         delegation = await async_client.addressing.prefixes.delegations.delete(
             delegation_id="d933b1530bc56c9953cf8ce166da8004",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
         )
         assert_matches_type(Optional[DelegationDeleteResponse], delegation, path=["response"])
 
@@ -307,8 +309,8 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.prefixes.delegations.with_raw_response.delete(
             delegation_id="d933b1530bc56c9953cf8ce166da8004",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
         )
 
         assert response.is_closed is True
@@ -320,8 +322,8 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.prefixes.delegations.with_streaming_response.delete(
             delegation_id="d933b1530bc56c9953cf8ce166da8004",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -337,19 +339,19 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
             await async_client.addressing.prefixes.delegations.with_raw_response.delete(
                 delegation_id="d933b1530bc56c9953cf8ce166da8004",
                 account_id="",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
             await async_client.addressing.prefixes.delegations.with_raw_response.delete(
                 delegation_id="d933b1530bc56c9953cf8ce166da8004",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
                 prefix_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `delegation_id` but received ''"):
             await async_client.addressing.prefixes.delegations.with_raw_response.delete(
                 delegation_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
             )
diff --git a/tests/api_resources/addressing/prefixes/test_service_bindings.py b/tests/api_resources/addressing/prefixes/test_service_bindings.py
new file mode 100644
index 00000000000..f230d12019f
--- /dev/null
+++ b/tests/api_resources/addressing/prefixes/test_service_bindings.py
@@ -0,0 +1,480 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.addressing.prefixes import (
+    ServiceBinding,
+    ServiceBindingDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestServiceBindings:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        service_binding = client.addressing.prefixes.service_bindings.create(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            cidr="192.0.2.0/24",
+            service_id="2db684ee7ca04e159946fd05b99e1bcd",
+        )
+        assert_matches_type(Optional[ServiceBinding], service_binding, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.addressing.prefixes.service_bindings.with_raw_response.create(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            cidr="192.0.2.0/24",
+            service_id="2db684ee7ca04e159946fd05b99e1bcd",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        service_binding = response.parse()
+        assert_matches_type(Optional[ServiceBinding], service_binding, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.addressing.prefixes.service_bindings.with_streaming_response.create(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            cidr="192.0.2.0/24",
+            service_id="2db684ee7ca04e159946fd05b99e1bcd",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            service_binding = response.parse()
+            assert_matches_type(Optional[ServiceBinding], service_binding, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.addressing.prefixes.service_bindings.with_raw_response.create(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="",
+                cidr="192.0.2.0/24",
+                service_id="2db684ee7ca04e159946fd05b99e1bcd",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+            client.addressing.prefixes.service_bindings.with_raw_response.create(
+                prefix_id="",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                cidr="192.0.2.0/24",
+                service_id="2db684ee7ca04e159946fd05b99e1bcd",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        service_binding = client.addressing.prefixes.service_bindings.list(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+        )
+        assert_matches_type(SyncSinglePage[ServiceBinding], service_binding, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.addressing.prefixes.service_bindings.with_raw_response.list(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        service_binding = response.parse()
+        assert_matches_type(SyncSinglePage[ServiceBinding], service_binding, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.addressing.prefixes.service_bindings.with_streaming_response.list(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            service_binding = response.parse()
+            assert_matches_type(SyncSinglePage[ServiceBinding], service_binding, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.addressing.prefixes.service_bindings.with_raw_response.list(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+            client.addressing.prefixes.service_bindings.with_raw_response.list(
+                prefix_id="",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        service_binding = client.addressing.prefixes.service_bindings.delete(
+            binding_id="0429b49b6a5155297b78e75a44b09e14",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        )
+        assert_matches_type(ServiceBindingDeleteResponse, service_binding, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.addressing.prefixes.service_bindings.with_raw_response.delete(
+            binding_id="0429b49b6a5155297b78e75a44b09e14",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        service_binding = response.parse()
+        assert_matches_type(ServiceBindingDeleteResponse, service_binding, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.addressing.prefixes.service_bindings.with_streaming_response.delete(
+            binding_id="0429b49b6a5155297b78e75a44b09e14",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            service_binding = response.parse()
+            assert_matches_type(ServiceBindingDeleteResponse, service_binding, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.addressing.prefixes.service_bindings.with_raw_response.delete(
+                binding_id="0429b49b6a5155297b78e75a44b09e14",
+                account_id="",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+            client.addressing.prefixes.service_bindings.with_raw_response.delete(
+                binding_id="0429b49b6a5155297b78e75a44b09e14",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                prefix_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `binding_id` but received ''"):
+            client.addressing.prefixes.service_bindings.with_raw_response.delete(
+                binding_id="",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        service_binding = client.addressing.prefixes.service_bindings.get(
+            binding_id="0429b49b6a5155297b78e75a44b09e14",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        )
+        assert_matches_type(Optional[ServiceBinding], service_binding, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.addressing.prefixes.service_bindings.with_raw_response.get(
+            binding_id="0429b49b6a5155297b78e75a44b09e14",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        service_binding = response.parse()
+        assert_matches_type(Optional[ServiceBinding], service_binding, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.addressing.prefixes.service_bindings.with_streaming_response.get(
+            binding_id="0429b49b6a5155297b78e75a44b09e14",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            service_binding = response.parse()
+            assert_matches_type(Optional[ServiceBinding], service_binding, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.addressing.prefixes.service_bindings.with_raw_response.get(
+                binding_id="0429b49b6a5155297b78e75a44b09e14",
+                account_id="",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+            client.addressing.prefixes.service_bindings.with_raw_response.get(
+                binding_id="0429b49b6a5155297b78e75a44b09e14",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                prefix_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `binding_id` but received ''"):
+            client.addressing.prefixes.service_bindings.with_raw_response.get(
+                binding_id="",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+            )
+
+
+class TestAsyncServiceBindings:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        service_binding = await async_client.addressing.prefixes.service_bindings.create(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            cidr="192.0.2.0/24",
+            service_id="2db684ee7ca04e159946fd05b99e1bcd",
+        )
+        assert_matches_type(Optional[ServiceBinding], service_binding, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.addressing.prefixes.service_bindings.with_raw_response.create(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            cidr="192.0.2.0/24",
+            service_id="2db684ee7ca04e159946fd05b99e1bcd",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        service_binding = await response.parse()
+        assert_matches_type(Optional[ServiceBinding], service_binding, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.addressing.prefixes.service_bindings.with_streaming_response.create(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            cidr="192.0.2.0/24",
+            service_id="2db684ee7ca04e159946fd05b99e1bcd",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            service_binding = await response.parse()
+            assert_matches_type(Optional[ServiceBinding], service_binding, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.addressing.prefixes.service_bindings.with_raw_response.create(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="",
+                cidr="192.0.2.0/24",
+                service_id="2db684ee7ca04e159946fd05b99e1bcd",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+            await async_client.addressing.prefixes.service_bindings.with_raw_response.create(
+                prefix_id="",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                cidr="192.0.2.0/24",
+                service_id="2db684ee7ca04e159946fd05b99e1bcd",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        service_binding = await async_client.addressing.prefixes.service_bindings.list(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+        )
+        assert_matches_type(AsyncSinglePage[ServiceBinding], service_binding, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.addressing.prefixes.service_bindings.with_raw_response.list(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        service_binding = await response.parse()
+        assert_matches_type(AsyncSinglePage[ServiceBinding], service_binding, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.addressing.prefixes.service_bindings.with_streaming_response.list(
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            service_binding = await response.parse()
+            assert_matches_type(AsyncSinglePage[ServiceBinding], service_binding, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.addressing.prefixes.service_bindings.with_raw_response.list(
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+            await async_client.addressing.prefixes.service_bindings.with_raw_response.list(
+                prefix_id="",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        service_binding = await async_client.addressing.prefixes.service_bindings.delete(
+            binding_id="0429b49b6a5155297b78e75a44b09e14",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        )
+        assert_matches_type(ServiceBindingDeleteResponse, service_binding, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.addressing.prefixes.service_bindings.with_raw_response.delete(
+            binding_id="0429b49b6a5155297b78e75a44b09e14",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        service_binding = await response.parse()
+        assert_matches_type(ServiceBindingDeleteResponse, service_binding, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.addressing.prefixes.service_bindings.with_streaming_response.delete(
+            binding_id="0429b49b6a5155297b78e75a44b09e14",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            service_binding = await response.parse()
+            assert_matches_type(ServiceBindingDeleteResponse, service_binding, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.addressing.prefixes.service_bindings.with_raw_response.delete(
+                binding_id="0429b49b6a5155297b78e75a44b09e14",
+                account_id="",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+            await async_client.addressing.prefixes.service_bindings.with_raw_response.delete(
+                binding_id="0429b49b6a5155297b78e75a44b09e14",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                prefix_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `binding_id` but received ''"):
+            await async_client.addressing.prefixes.service_bindings.with_raw_response.delete(
+                binding_id="",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        service_binding = await async_client.addressing.prefixes.service_bindings.get(
+            binding_id="0429b49b6a5155297b78e75a44b09e14",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        )
+        assert_matches_type(Optional[ServiceBinding], service_binding, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.addressing.prefixes.service_bindings.with_raw_response.get(
+            binding_id="0429b49b6a5155297b78e75a44b09e14",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        service_binding = await response.parse()
+        assert_matches_type(Optional[ServiceBinding], service_binding, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.addressing.prefixes.service_bindings.with_streaming_response.get(
+            binding_id="0429b49b6a5155297b78e75a44b09e14",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            service_binding = await response.parse()
+            assert_matches_type(Optional[ServiceBinding], service_binding, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.addressing.prefixes.service_bindings.with_raw_response.get(
+                binding_id="0429b49b6a5155297b78e75a44b09e14",
+                account_id="",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
+            await async_client.addressing.prefixes.service_bindings.with_raw_response.get(
+                binding_id="0429b49b6a5155297b78e75a44b09e14",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                prefix_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `binding_id` but received ''"):
+            await async_client.addressing.prefixes.service_bindings.with_raw_response.get(
+                binding_id="",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
+            )
diff --git a/tests/api_resources/addressing/regional_hostnames/test_regions.py b/tests/api_resources/addressing/regional_hostnames/test_regions.py
index 5d23799e1bf..e06d39e8cf3 100644
--- a/tests/api_resources/addressing/regional_hostnames/test_regions.py
+++ b/tests/api_resources/addressing/regional_hostnames/test_regions.py
@@ -58,7 +58,9 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncRegions:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/addressing/test_address_maps.py b/tests/api_resources/addressing/test_address_maps.py
index e38cf946883..c9a93e4d048 100644
--- a/tests/api_resources/addressing/test_address_maps.py
+++ b/tests/api_resources/addressing/test_address_maps.py
@@ -9,7 +9,6 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare._utils import parse_datetime
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.addressing import (
     AddressMap,
@@ -27,33 +26,22 @@ class TestAddressMaps:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         address_map = client.addressing.address_maps.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
         assert_matches_type(Optional[AddressMapCreateResponse], address_map, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         address_map = client.addressing.address_maps.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             description="My Ecommerce zones",
             enabled=True,
-            ips=["192.0.2.1", "192.0.2.1", "192.0.2.1"],
+            ips=["192.0.2.1"],
             memberships=[
                 {
-                    "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
                     "identifier": "023e105f4ecef8ad9ca31a8372d0c353",
                     "kind": "zone",
-                },
-                {
-                    "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-                    "identifier": "023e105f4ecef8ad9ca31a8372d0c353",
-                    "kind": "zone",
-                },
-                {
-                    "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-                    "identifier": "023e105f4ecef8ad9ca31a8372d0c353",
-                    "kind": "zone",
-                },
+                }
             ],
         )
         assert_matches_type(Optional[AddressMapCreateResponse], address_map, path=["response"])
@@ -61,7 +49,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.addressing.address_maps.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
@@ -72,7 +60,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.addressing.address_maps.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -92,14 +80,14 @@ def test_path_params_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         address_map = client.addressing.address_maps.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
         assert_matches_type(SyncSinglePage[AddressMap], address_map, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.addressing.address_maps.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
@@ -110,7 +98,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.addressing.address_maps.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -130,34 +118,34 @@ def test_path_params_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         address_map = client.addressing.address_maps.delete(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
-        assert_matches_type(Optional[AddressMapDeleteResponse], address_map, path=["response"])
+        assert_matches_type(AddressMapDeleteResponse, address_map, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.addressing.address_maps.with_raw_response.delete(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         address_map = response.parse()
-        assert_matches_type(Optional[AddressMapDeleteResponse], address_map, path=["response"])
+        assert_matches_type(AddressMapDeleteResponse, address_map, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.addressing.address_maps.with_streaming_response.delete(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             address_map = response.parse()
-            assert_matches_type(Optional[AddressMapDeleteResponse], address_map, path=["response"])
+            assert_matches_type(AddressMapDeleteResponse, address_map, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -165,29 +153,29 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.addressing.address_maps.with_raw_response.delete(
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `address_map_id` but received ''"):
             client.addressing.address_maps.with_raw_response.delete(
                 address_map_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
             )
 
     @parametrize
     def test_method_edit(self, client: Cloudflare) -> None:
         address_map = client.addressing.address_maps.edit(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
         assert_matches_type(Optional[AddressMap], address_map, path=["response"])
 
     @parametrize
     def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
         address_map = client.addressing.address_maps.edit(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             default_sni="*.example.com",
             description="My Ecommerce zones",
             enabled=True,
@@ -197,8 +185,8 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
         response = client.addressing.address_maps.with_raw_response.edit(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
@@ -209,8 +197,8 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
         with client.addressing.address_maps.with_streaming_response.edit(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -224,29 +212,29 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
     def test_path_params_edit(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.addressing.address_maps.with_raw_response.edit(
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `address_map_id` but received ''"):
             client.addressing.address_maps.with_raw_response.edit(
                 address_map_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         address_map = client.addressing.address_maps.get(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
         assert_matches_type(Optional[AddressMapGetResponse], address_map, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.addressing.address_maps.with_raw_response.get(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
@@ -257,8 +245,8 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.addressing.address_maps.with_streaming_response.get(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -272,50 +260,41 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.addressing.address_maps.with_raw_response.get(
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `address_map_id` but received ''"):
             client.addressing.address_maps.with_raw_response.get(
                 address_map_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
             )
 
 
 class TestAsyncAddressMaps:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         address_map = await async_client.addressing.address_maps.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
         assert_matches_type(Optional[AddressMapCreateResponse], address_map, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         address_map = await async_client.addressing.address_maps.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             description="My Ecommerce zones",
             enabled=True,
-            ips=["192.0.2.1", "192.0.2.1", "192.0.2.1"],
+            ips=["192.0.2.1"],
             memberships=[
                 {
-                    "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-                    "identifier": "023e105f4ecef8ad9ca31a8372d0c353",
-                    "kind": "zone",
-                },
-                {
-                    "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-                    "identifier": "023e105f4ecef8ad9ca31a8372d0c353",
-                    "kind": "zone",
-                },
-                {
-                    "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
                     "identifier": "023e105f4ecef8ad9ca31a8372d0c353",
                     "kind": "zone",
-                },
+                }
             ],
         )
         assert_matches_type(Optional[AddressMapCreateResponse], address_map, path=["response"])
@@ -323,7 +302,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.address_maps.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
@@ -334,7 +313,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.address_maps.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -354,14 +333,14 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         address_map = await async_client.addressing.address_maps.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
         assert_matches_type(AsyncSinglePage[AddressMap], address_map, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.address_maps.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
@@ -372,7 +351,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.address_maps.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -392,34 +371,34 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         address_map = await async_client.addressing.address_maps.delete(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
-        assert_matches_type(Optional[AddressMapDeleteResponse], address_map, path=["response"])
+        assert_matches_type(AddressMapDeleteResponse, address_map, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.address_maps.with_raw_response.delete(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         address_map = await response.parse()
-        assert_matches_type(Optional[AddressMapDeleteResponse], address_map, path=["response"])
+        assert_matches_type(AddressMapDeleteResponse, address_map, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.address_maps.with_streaming_response.delete(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             address_map = await response.parse()
-            assert_matches_type(Optional[AddressMapDeleteResponse], address_map, path=["response"])
+            assert_matches_type(AddressMapDeleteResponse, address_map, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -427,29 +406,29 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.addressing.address_maps.with_raw_response.delete(
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `address_map_id` but received ''"):
             await async_client.addressing.address_maps.with_raw_response.delete(
                 address_map_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
             )
 
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
         address_map = await async_client.addressing.address_maps.edit(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
         assert_matches_type(Optional[AddressMap], address_map, path=["response"])
 
     @parametrize
     async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
         address_map = await async_client.addressing.address_maps.edit(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             default_sni="*.example.com",
             description="My Ecommerce zones",
             enabled=True,
@@ -459,8 +438,8 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.address_maps.with_raw_response.edit(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
@@ -471,8 +450,8 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.address_maps.with_streaming_response.edit(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -486,29 +465,29 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
     async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.addressing.address_maps.with_raw_response.edit(
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `address_map_id` but received ''"):
             await async_client.addressing.address_maps.with_raw_response.edit(
                 address_map_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         address_map = await async_client.addressing.address_maps.get(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
         assert_matches_type(Optional[AddressMapGetResponse], address_map, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.address_maps.with_raw_response.get(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
@@ -519,8 +498,8 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.address_maps.with_streaming_response.get(
-            address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            address_map_id="055817b111884e0227e1be16a0be6ee0",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -534,12 +513,12 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.addressing.address_maps.with_raw_response.get(
-                address_map_id="023e105f4ecef8ad9ca31a8372d0c353",
+                address_map_id="055817b111884e0227e1be16a0be6ee0",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `address_map_id` but received ''"):
             await async_client.addressing.address_maps.with_raw_response.get(
                 address_map_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
             )
diff --git a/tests/api_resources/addressing/test_loa_documents.py b/tests/api_resources/addressing/test_loa_documents.py
index b3bc8c3e862..91a32806d0c 100644
--- a/tests/api_resources/addressing/test_loa_documents.py
+++ b/tests/api_resources/addressing/test_loa_documents.py
@@ -5,10 +5,18 @@
 import os
 from typing import Any, Optional, cast
 
+import httpx
 import pytest
+from respx import MockRouter
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
+from cloudflare._response import (
+    BinaryAPIResponse,
+    AsyncBinaryAPIResponse,
+    StreamedBinaryAPIResponse,
+    AsyncStreamedBinaryAPIResponse,
+)
 from cloudflare.types.addressing import LOADocumentCreateResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -21,7 +29,7 @@ class TestLOADocuments:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         loa_document = client.addressing.loa_documents.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             loa_document="@document.pdf",
         )
         assert_matches_type(Optional[LOADocumentCreateResponse], loa_document, path=["response"])
@@ -30,7 +38,7 @@ def test_method_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.addressing.loa_documents.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             loa_document="@document.pdf",
         )
 
@@ -43,7 +51,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.addressing.loa_documents.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             loa_document="@document.pdf",
         ) as response:
             assert not response.is_closed
@@ -63,15 +71,95 @@ def test_path_params_create(self, client: Cloudflare) -> None:
                 loa_document="@document.pdf",
             )
 
+    @pytest.mark.skip(
+        reason="TODO: address broken spotlight error - https://github.com/cloudflare/cloudflare-typescript/actions/runs/9456639475/job/26048931174?pr=498#step:5:489"
+    )
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_method_get(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get(
+            "/accounts/258def64c72dae45f3e4c8516e2111f2/addressing/loa_documents/d933b1530bc56c9953cf8ce166da8004/download"
+        ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
+        loa_document = client.addressing.loa_documents.get(
+            loa_document_id="d933b1530bc56c9953cf8ce166da8004",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+        )
+        assert loa_document.is_closed
+        assert loa_document.json() == {"foo": "bar"}
+        assert cast(Any, loa_document.is_closed) is True
+        assert isinstance(loa_document, BinaryAPIResponse)
+
+    @pytest.mark.skip(
+        reason="TODO: address broken spotlight error - https://github.com/cloudflare/cloudflare-typescript/actions/runs/9456639475/job/26048931174?pr=498#step:5:489"
+    )
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_raw_response_get(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get(
+            "/accounts/258def64c72dae45f3e4c8516e2111f2/addressing/loa_documents/d933b1530bc56c9953cf8ce166da8004/download"
+        ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
+
+        loa_document = client.addressing.loa_documents.with_raw_response.get(
+            loa_document_id="d933b1530bc56c9953cf8ce166da8004",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+        )
+
+        assert loa_document.is_closed is True
+        assert loa_document.http_request.headers.get("X-Stainless-Lang") == "python"
+        assert loa_document.json() == {"foo": "bar"}
+        assert isinstance(loa_document, BinaryAPIResponse)
+
+    @pytest.mark.skip(
+        reason="TODO: address broken spotlight error - https://github.com/cloudflare/cloudflare-typescript/actions/runs/9456639475/job/26048931174?pr=498#step:5:489"
+    )
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_streaming_response_get(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get(
+            "/accounts/258def64c72dae45f3e4c8516e2111f2/addressing/loa_documents/d933b1530bc56c9953cf8ce166da8004/download"
+        ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
+        with client.addressing.loa_documents.with_streaming_response.get(
+            loa_document_id="d933b1530bc56c9953cf8ce166da8004",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+        ) as loa_document:
+            assert not loa_document.is_closed
+            assert loa_document.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            assert loa_document.json() == {"foo": "bar"}
+            assert cast(Any, loa_document.is_closed) is True
+            assert isinstance(loa_document, StreamedBinaryAPIResponse)
+
+        assert cast(Any, loa_document.is_closed) is True
+
+    @pytest.mark.skip(
+        reason="TODO: address broken spotlight error - https://github.com/cloudflare/cloudflare-typescript/actions/runs/9456639475/job/26048931174?pr=498#step:5:489"
+    )
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.addressing.loa_documents.with_raw_response.get(
+                loa_document_id="d933b1530bc56c9953cf8ce166da8004",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `loa_document_id` but received ''"):
+            client.addressing.loa_documents.with_raw_response.get(
+                loa_document_id="",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+            )
+
 
 class TestAsyncLOADocuments:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         loa_document = await async_client.addressing.loa_documents.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             loa_document="@document.pdf",
         )
         assert_matches_type(Optional[LOADocumentCreateResponse], loa_document, path=["response"])
@@ -80,7 +168,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.loa_documents.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             loa_document="@document.pdf",
         )
 
@@ -93,7 +181,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.loa_documents.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             loa_document="@document.pdf",
         ) as response:
             assert not response.is_closed
@@ -112,3 +200,81 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
                 account_id="",
                 loa_document="@document.pdf",
             )
+
+    @pytest.mark.skip(
+        reason="TODO: address broken spotlight error - https://github.com/cloudflare/cloudflare-typescript/actions/runs/9456639475/job/26048931174?pr=498#step:5:489"
+    )
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_method_get(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get(
+            "/accounts/258def64c72dae45f3e4c8516e2111f2/addressing/loa_documents/d933b1530bc56c9953cf8ce166da8004/download"
+        ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
+        loa_document = await async_client.addressing.loa_documents.get(
+            loa_document_id="d933b1530bc56c9953cf8ce166da8004",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+        )
+        assert loa_document.is_closed
+        assert await loa_document.json() == {"foo": "bar"}
+        assert cast(Any, loa_document.is_closed) is True
+        assert isinstance(loa_document, AsyncBinaryAPIResponse)
+
+    @pytest.mark.skip(
+        reason="TODO: address broken spotlight error - https://github.com/cloudflare/cloudflare-typescript/actions/runs/9456639475/job/26048931174?pr=498#step:5:489"
+    )
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_raw_response_get(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get(
+            "/accounts/258def64c72dae45f3e4c8516e2111f2/addressing/loa_documents/d933b1530bc56c9953cf8ce166da8004/download"
+        ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
+
+        loa_document = await async_client.addressing.loa_documents.with_raw_response.get(
+            loa_document_id="d933b1530bc56c9953cf8ce166da8004",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+        )
+
+        assert loa_document.is_closed is True
+        assert loa_document.http_request.headers.get("X-Stainless-Lang") == "python"
+        assert await loa_document.json() == {"foo": "bar"}
+        assert isinstance(loa_document, AsyncBinaryAPIResponse)
+
+    @pytest.mark.skip(
+        reason="TODO: address broken spotlight error - https://github.com/cloudflare/cloudflare-typescript/actions/runs/9456639475/job/26048931174?pr=498#step:5:489"
+    )
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get(
+            "/accounts/258def64c72dae45f3e4c8516e2111f2/addressing/loa_documents/d933b1530bc56c9953cf8ce166da8004/download"
+        ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
+        async with async_client.addressing.loa_documents.with_streaming_response.get(
+            loa_document_id="d933b1530bc56c9953cf8ce166da8004",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+        ) as loa_document:
+            assert not loa_document.is_closed
+            assert loa_document.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            assert await loa_document.json() == {"foo": "bar"}
+            assert cast(Any, loa_document.is_closed) is True
+            assert isinstance(loa_document, AsyncStreamedBinaryAPIResponse)
+
+        assert cast(Any, loa_document.is_closed) is True
+
+    @pytest.mark.skip(
+        reason="TODO: address broken spotlight error - https://github.com/cloudflare/cloudflare-typescript/actions/runs/9456639475/job/26048931174?pr=498#step:5:489"
+    )
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.addressing.loa_documents.with_raw_response.get(
+                loa_document_id="d933b1530bc56c9953cf8ce166da8004",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `loa_document_id` but received ''"):
+            await async_client.addressing.loa_documents.with_raw_response.get(
+                loa_document_id="",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
+            )
diff --git a/tests/api_resources/addressing/test_prefixes.py b/tests/api_resources/addressing/test_prefixes.py
index 7b593cbebbf..f4bbce99456 100644
--- a/tests/api_resources/addressing/test_prefixes.py
+++ b/tests/api_resources/addressing/test_prefixes.py
@@ -21,9 +21,20 @@ class TestPrefixes:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         prefix = client.addressing.prefixes.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            asn=209242,
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            asn=13335,
             cidr="192.0.2.0/24",
+        )
+        assert_matches_type(Optional[Prefix], prefix, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        prefix = client.addressing.prefixes.create(
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            asn=13335,
+            cidr="192.0.2.0/24",
+            delegate_loa_creation=True,
+            description="Internal test prefix",
             loa_document_id="d933b1530bc56c9953cf8ce166da8004",
         )
         assert_matches_type(Optional[Prefix], prefix, path=["response"])
@@ -31,10 +42,9 @@ def test_method_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.addressing.prefixes.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            asn=209242,
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            asn=13335,
             cidr="192.0.2.0/24",
-            loa_document_id="d933b1530bc56c9953cf8ce166da8004",
         )
 
         assert response.is_closed is True
@@ -45,10 +55,9 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.addressing.prefixes.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            asn=209242,
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            asn=13335,
             cidr="192.0.2.0/24",
-            loa_document_id="d933b1530bc56c9953cf8ce166da8004",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -63,22 +72,21 @@ def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.addressing.prefixes.with_raw_response.create(
                 account_id="",
-                asn=209242,
+                asn=13335,
                 cidr="192.0.2.0/24",
-                loa_document_id="d933b1530bc56c9953cf8ce166da8004",
             )
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         prefix = client.addressing.prefixes.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
         assert_matches_type(SyncSinglePage[Prefix], prefix, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.addressing.prefixes.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
@@ -89,7 +97,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.addressing.prefixes.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -109,34 +117,34 @@ def test_path_params_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         prefix = client.addressing.prefixes.delete(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
-        assert_matches_type(Optional[PrefixDeleteResponse], prefix, path=["response"])
+        assert_matches_type(PrefixDeleteResponse, prefix, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.addressing.prefixes.with_raw_response.delete(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         prefix = response.parse()
-        assert_matches_type(Optional[PrefixDeleteResponse], prefix, path=["response"])
+        assert_matches_type(PrefixDeleteResponse, prefix, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.addressing.prefixes.with_streaming_response.delete(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             prefix = response.parse()
-            assert_matches_type(Optional[PrefixDeleteResponse], prefix, path=["response"])
+            assert_matches_type(PrefixDeleteResponse, prefix, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -144,21 +152,21 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.addressing.prefixes.with_raw_response.delete(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
             client.addressing.prefixes.with_raw_response.delete(
                 prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
             )
 
     @parametrize
     def test_method_edit(self, client: Cloudflare) -> None:
         prefix = client.addressing.prefixes.edit(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             description="Internal test prefix",
         )
         assert_matches_type(Optional[Prefix], prefix, path=["response"])
@@ -166,8 +174,8 @@ def test_method_edit(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
         response = client.addressing.prefixes.with_raw_response.edit(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             description="Internal test prefix",
         )
 
@@ -179,8 +187,8 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
         with client.addressing.prefixes.with_streaming_response.edit(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             description="Internal test prefix",
         ) as response:
             assert not response.is_closed
@@ -195,7 +203,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
     def test_path_params_edit(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.addressing.prefixes.with_raw_response.edit(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
                 account_id="",
                 description="Internal test prefix",
             )
@@ -203,23 +211,23 @@ def test_path_params_edit(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
             client.addressing.prefixes.with_raw_response.edit(
                 prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
                 description="Internal test prefix",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         prefix = client.addressing.prefixes.get(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
         assert_matches_type(Optional[Prefix], prefix, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.addressing.prefixes.with_raw_response.get(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
@@ -230,8 +238,8 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.addressing.prefixes.with_streaming_response.get(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -245,26 +253,39 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.addressing.prefixes.with_raw_response.get(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
             client.addressing.prefixes.with_raw_response.get(
                 prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
             )
 
 
 class TestAsyncPrefixes:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         prefix = await async_client.addressing.prefixes.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            asn=209242,
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            asn=13335,
             cidr="192.0.2.0/24",
+        )
+        assert_matches_type(Optional[Prefix], prefix, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        prefix = await async_client.addressing.prefixes.create(
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            asn=13335,
+            cidr="192.0.2.0/24",
+            delegate_loa_creation=True,
+            description="Internal test prefix",
             loa_document_id="d933b1530bc56c9953cf8ce166da8004",
         )
         assert_matches_type(Optional[Prefix], prefix, path=["response"])
@@ -272,10 +293,9 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.prefixes.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            asn=209242,
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            asn=13335,
             cidr="192.0.2.0/24",
-            loa_document_id="d933b1530bc56c9953cf8ce166da8004",
         )
 
         assert response.is_closed is True
@@ -286,10 +306,9 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.prefixes.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            asn=209242,
+            account_id="258def64c72dae45f3e4c8516e2111f2",
+            asn=13335,
             cidr="192.0.2.0/24",
-            loa_document_id="d933b1530bc56c9953cf8ce166da8004",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -304,22 +323,21 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.addressing.prefixes.with_raw_response.create(
                 account_id="",
-                asn=209242,
+                asn=13335,
                 cidr="192.0.2.0/24",
-                loa_document_id="d933b1530bc56c9953cf8ce166da8004",
             )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         prefix = await async_client.addressing.prefixes.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
         assert_matches_type(AsyncSinglePage[Prefix], prefix, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.prefixes.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
@@ -330,7 +348,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.prefixes.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -350,34 +368,34 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         prefix = await async_client.addressing.prefixes.delete(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
-        assert_matches_type(Optional[PrefixDeleteResponse], prefix, path=["response"])
+        assert_matches_type(PrefixDeleteResponse, prefix, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.prefixes.with_raw_response.delete(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         prefix = await response.parse()
-        assert_matches_type(Optional[PrefixDeleteResponse], prefix, path=["response"])
+        assert_matches_type(PrefixDeleteResponse, prefix, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.prefixes.with_streaming_response.delete(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             prefix = await response.parse()
-            assert_matches_type(Optional[PrefixDeleteResponse], prefix, path=["response"])
+            assert_matches_type(PrefixDeleteResponse, prefix, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -385,21 +403,21 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.addressing.prefixes.with_raw_response.delete(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
             await async_client.addressing.prefixes.with_raw_response.delete(
                 prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
             )
 
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
         prefix = await async_client.addressing.prefixes.edit(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             description="Internal test prefix",
         )
         assert_matches_type(Optional[Prefix], prefix, path=["response"])
@@ -407,8 +425,8 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.prefixes.with_raw_response.edit(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             description="Internal test prefix",
         )
 
@@ -420,8 +438,8 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.prefixes.with_streaming_response.edit(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
             description="Internal test prefix",
         ) as response:
             assert not response.is_closed
@@ -436,7 +454,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
     async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.addressing.prefixes.with_raw_response.edit(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
                 account_id="",
                 description="Internal test prefix",
             )
@@ -444,23 +462,23 @@ async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
             await async_client.addressing.prefixes.with_raw_response.edit(
                 prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
                 description="Internal test prefix",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         prefix = await async_client.addressing.prefixes.get(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
         assert_matches_type(Optional[Prefix], prefix, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.prefixes.with_raw_response.get(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
@@ -471,8 +489,8 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.prefixes.with_streaming_response.get(
-            prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prefix_id="2af39739cc4e3b5910c918468bb89828",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -486,12 +504,12 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.addressing.prefixes.with_raw_response.get(
-                prefix_id="023e105f4ecef8ad9ca31a8372d0c353",
+                prefix_id="2af39739cc4e3b5910c918468bb89828",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `prefix_id` but received ''"):
             await async_client.addressing.prefixes.with_raw_response.get(
                 prefix_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="258def64c72dae45f3e4c8516e2111f2",
             )
diff --git a/tests/api_resources/addressing/test_regional_hostnames.py b/tests/api_resources/addressing/test_regional_hostnames.py
index bb0cf870331..6f9c356c87a 100644
--- a/tests/api_resources/addressing/test_regional_hostnames.py
+++ b/tests/api_resources/addressing/test_regional_hostnames.py
@@ -33,6 +33,16 @@ def test_method_create(self, client: Cloudflare) -> None:
         )
         assert_matches_type(Optional[RegionalHostnameCreateResponse], regional_hostname, path=["response"])
 
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        regional_hostname = client.addressing.regional_hostnames.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostname="foo.example.com",
+            region_key="ca",
+            routing="dns",
+        )
+        assert_matches_type(Optional[RegionalHostnameCreateResponse], regional_hostname, path=["response"])
+
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.addressing.regional_hostnames.with_raw_response.create(
@@ -259,7 +269,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncRegionalHostnames:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -270,6 +282,16 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(Optional[RegionalHostnameCreateResponse], regional_hostname, path=["response"])
 
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        regional_hostname = await async_client.addressing.regional_hostnames.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostname="foo.example.com",
+            region_key="ca",
+            routing="dns",
+        )
+        assert_matches_type(Optional[RegionalHostnameCreateResponse], regional_hostname, path=["response"])
+
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.regional_hostnames.with_raw_response.create(
diff --git a/tests/api_resources/addressing/test_services.py b/tests/api_resources/addressing/test_services.py
index e54cb33ece0..35ad7f029ae 100644
--- a/tests/api_resources/addressing/test_services.py
+++ b/tests/api_resources/addressing/test_services.py
@@ -21,14 +21,14 @@ class TestServices:
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         service = client.addressing.services.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
         assert_matches_type(SyncSinglePage[ServiceListResponse], service, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.addressing.services.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
@@ -39,7 +39,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.addressing.services.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -58,19 +58,21 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncServices:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         service = await async_client.addressing.services.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
         assert_matches_type(AsyncSinglePage[ServiceListResponse], service, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.addressing.services.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         )
 
         assert response.is_closed is True
@@ -81,7 +83,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.addressing.services.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="258def64c72dae45f3e4c8516e2111f2",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
diff --git a/tests/api_resources/challenges/__init__.py b/tests/api_resources/ai/__init__.py
similarity index 100%
rename from tests/api_resources/challenges/__init__.py
rename to tests/api_resources/ai/__init__.py
diff --git a/tests/api_resources/dns/firewall/__init__.py b/tests/api_resources/ai/finetunes/__init__.py
similarity index 100%
rename from tests/api_resources/dns/firewall/__init__.py
rename to tests/api_resources/ai/finetunes/__init__.py
diff --git a/tests/api_resources/ai/finetunes/test_assets.py b/tests/api_resources/ai/finetunes/test_assets.py
new file mode 100644
index 00000000000..015f0a5c02d
--- /dev/null
+++ b/tests/api_resources/ai/finetunes/test_assets.py
@@ -0,0 +1,140 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.ai.finetunes import AssetCreateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestAssets:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        asset = client.ai.finetunes.assets.create(
+            finetune_id="bc451aef-f723-4b26-a6b2-901afd2e7a8a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AssetCreateResponse, asset, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        asset = client.ai.finetunes.assets.create(
+            finetune_id="bc451aef-f723-4b26-a6b2-901afd2e7a8a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            file=b"raw file contents",
+            file_name="file_name",
+        )
+        assert_matches_type(AssetCreateResponse, asset, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.ai.finetunes.assets.with_raw_response.create(
+            finetune_id="bc451aef-f723-4b26-a6b2-901afd2e7a8a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asset = response.parse()
+        assert_matches_type(AssetCreateResponse, asset, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.ai.finetunes.assets.with_streaming_response.create(
+            finetune_id="bc451aef-f723-4b26-a6b2-901afd2e7a8a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asset = response.parse()
+            assert_matches_type(AssetCreateResponse, asset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.finetunes.assets.with_raw_response.create(
+                finetune_id="bc451aef-f723-4b26-a6b2-901afd2e7a8a",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `finetune_id` but received ''"):
+            client.ai.finetunes.assets.with_raw_response.create(
+                finetune_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncAssets:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        asset = await async_client.ai.finetunes.assets.create(
+            finetune_id="bc451aef-f723-4b26-a6b2-901afd2e7a8a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AssetCreateResponse, asset, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        asset = await async_client.ai.finetunes.assets.create(
+            finetune_id="bc451aef-f723-4b26-a6b2-901afd2e7a8a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            file=b"raw file contents",
+            file_name="file_name",
+        )
+        assert_matches_type(AssetCreateResponse, asset, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.finetunes.assets.with_raw_response.create(
+            finetune_id="bc451aef-f723-4b26-a6b2-901afd2e7a8a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asset = await response.parse()
+        assert_matches_type(AssetCreateResponse, asset, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.finetunes.assets.with_streaming_response.create(
+            finetune_id="bc451aef-f723-4b26-a6b2-901afd2e7a8a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asset = await response.parse()
+            assert_matches_type(AssetCreateResponse, asset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.finetunes.assets.with_raw_response.create(
+                finetune_id="bc451aef-f723-4b26-a6b2-901afd2e7a8a",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `finetune_id` but received ''"):
+            await async_client.ai.finetunes.assets.with_raw_response.create(
+                finetune_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/ai/finetunes/test_public.py b/tests/api_resources/ai/finetunes/test_public.py
new file mode 100644
index 00000000000..8c4e13933ce
--- /dev/null
+++ b/tests/api_resources/ai/finetunes/test_public.py
@@ -0,0 +1,121 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.ai.finetunes import PublicListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestPublic:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        public = client.ai.finetunes.public.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[PublicListResponse], public, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        public = client.ai.finetunes.public.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            limit=0,
+            offset=0,
+            order_by="orderBy",
+        )
+        assert_matches_type(SyncSinglePage[PublicListResponse], public, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.ai.finetunes.public.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        public = response.parse()
+        assert_matches_type(SyncSinglePage[PublicListResponse], public, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.ai.finetunes.public.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            public = response.parse()
+            assert_matches_type(SyncSinglePage[PublicListResponse], public, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.finetunes.public.with_raw_response.list(
+                account_id="",
+            )
+
+
+class TestAsyncPublic:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        public = await async_client.ai.finetunes.public.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[PublicListResponse], public, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        public = await async_client.ai.finetunes.public.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            limit=0,
+            offset=0,
+            order_by="orderBy",
+        )
+        assert_matches_type(AsyncSinglePage[PublicListResponse], public, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.finetunes.public.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        public = await response.parse()
+        assert_matches_type(AsyncSinglePage[PublicListResponse], public, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.finetunes.public.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            public = await response.parse()
+            assert_matches_type(AsyncSinglePage[PublicListResponse], public, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.finetunes.public.with_raw_response.list(
+                account_id="",
+            )
diff --git a/tests/api_resources/dns/firewall/analytics/__init__.py b/tests/api_resources/ai/models/__init__.py
similarity index 100%
rename from tests/api_resources/dns/firewall/analytics/__init__.py
rename to tests/api_resources/ai/models/__init__.py
diff --git a/tests/api_resources/workers/ai/models/test_schema.py b/tests/api_resources/ai/models/test_schema.py
similarity index 82%
rename from tests/api_resources/workers/ai/models/test_schema.py
rename to tests/api_resources/ai/models/test_schema.py
index a815dc1f7c1..ff54c76b027 100644
--- a/tests/api_resources/workers/ai/models/test_schema.py
+++ b/tests/api_resources/ai/models/test_schema.py
@@ -18,7 +18,7 @@ class TestSchema:
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        schema = client.workers.ai.models.schema.get(
+        schema = client.ai.models.schema.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             model="model",
         )
@@ -26,7 +26,7 @@ def test_method_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.workers.ai.models.schema.with_raw_response.get(
+        response = client.ai.models.schema.with_raw_response.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             model="model",
         )
@@ -38,7 +38,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.workers.ai.models.schema.with_streaming_response.get(
+        with client.ai.models.schema.with_streaming_response.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             model="model",
         ) as response:
@@ -53,18 +53,20 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.workers.ai.models.schema.with_raw_response.get(
+            client.ai.models.schema.with_raw_response.get(
                 account_id="",
                 model="model",
             )
 
 
 class TestAsyncSchema:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        schema = await async_client.workers.ai.models.schema.get(
+        schema = await async_client.ai.models.schema.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             model="model",
         )
@@ -72,7 +74,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.workers.ai.models.schema.with_raw_response.get(
+        response = await async_client.ai.models.schema.with_raw_response.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             model="model",
         )
@@ -84,7 +86,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.workers.ai.models.schema.with_streaming_response.get(
+        async with async_client.ai.models.schema.with_streaming_response.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             model="model",
         ) as response:
@@ -99,7 +101,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.workers.ai.models.schema.with_raw_response.get(
+            await async_client.ai.models.schema.with_raw_response.get(
                 account_id="",
                 model="model",
             )
diff --git a/tests/api_resources/ai/test_authors.py b/tests/api_resources/ai/test_authors.py
new file mode 100644
index 00000000000..4997cb94973
--- /dev/null
+++ b/tests/api_resources/ai/test_authors.py
@@ -0,0 +1,100 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestAuthors:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        author = client.ai.authors.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[object], author, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.ai.authors.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        author = response.parse()
+        assert_matches_type(SyncSinglePage[object], author, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.ai.authors.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            author = response.parse()
+            assert_matches_type(SyncSinglePage[object], author, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.authors.with_raw_response.list(
+                account_id="",
+            )
+
+
+class TestAsyncAuthors:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        author = await async_client.ai.authors.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[object], author, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.authors.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        author = await response.parse()
+        assert_matches_type(AsyncSinglePage[object], author, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.authors.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            author = await response.parse()
+            assert_matches_type(AsyncSinglePage[object], author, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.authors.with_raw_response.list(
+                account_id="",
+            )
diff --git a/tests/api_resources/ai/test_finetunes.py b/tests/api_resources/ai/test_finetunes.py
new file mode 100644
index 00000000000..74e1b6f8fa2
--- /dev/null
+++ b/tests/api_resources/ai/test_finetunes.py
@@ -0,0 +1,214 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.ai import FinetuneListResponse, FinetuneCreateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestFinetunes:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        finetune = client.ai.finetunes.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            model="model",
+            name="name",
+        )
+        assert_matches_type(FinetuneCreateResponse, finetune, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        finetune = client.ai.finetunes.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            model="model",
+            name="name",
+            description="description",
+            public=True,
+        )
+        assert_matches_type(FinetuneCreateResponse, finetune, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.ai.finetunes.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            model="model",
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        finetune = response.parse()
+        assert_matches_type(FinetuneCreateResponse, finetune, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.ai.finetunes.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            model="model",
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            finetune = response.parse()
+            assert_matches_type(FinetuneCreateResponse, finetune, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.finetunes.with_raw_response.create(
+                account_id="",
+                model="model",
+                name="name",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        finetune = client.ai.finetunes.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(FinetuneListResponse, finetune, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.ai.finetunes.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        finetune = response.parse()
+        assert_matches_type(FinetuneListResponse, finetune, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.ai.finetunes.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            finetune = response.parse()
+            assert_matches_type(FinetuneListResponse, finetune, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.finetunes.with_raw_response.list(
+                account_id="",
+            )
+
+
+class TestAsyncFinetunes:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        finetune = await async_client.ai.finetunes.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            model="model",
+            name="name",
+        )
+        assert_matches_type(FinetuneCreateResponse, finetune, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        finetune = await async_client.ai.finetunes.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            model="model",
+            name="name",
+            description="description",
+            public=True,
+        )
+        assert_matches_type(FinetuneCreateResponse, finetune, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.finetunes.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            model="model",
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        finetune = await response.parse()
+        assert_matches_type(FinetuneCreateResponse, finetune, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.finetunes.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            model="model",
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            finetune = await response.parse()
+            assert_matches_type(FinetuneCreateResponse, finetune, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.finetunes.with_raw_response.create(
+                account_id="",
+                model="model",
+                name="name",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        finetune = await async_client.ai.finetunes.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(FinetuneListResponse, finetune, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.finetunes.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        finetune = await response.parse()
+        assert_matches_type(FinetuneListResponse, finetune, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.finetunes.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            finetune = await response.parse()
+            assert_matches_type(FinetuneListResponse, finetune, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.finetunes.with_raw_response.list(
+                account_id="",
+            )
diff --git a/tests/api_resources/ai/test_models.py b/tests/api_resources/ai/test_models.py
new file mode 100644
index 00000000000..6905cbb257c
--- /dev/null
+++ b/tests/api_resources/ai/test_models.py
@@ -0,0 +1,128 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestModels:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        model = client.ai.models.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[object], model, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        model = client.ai.models.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            author="author",
+            hide_experimental=True,
+            page=0,
+            per_page=0,
+            search="search",
+            source=0,
+            task="Text Generation",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[object], model, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.ai.models.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        model = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[object], model, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.ai.models.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            model = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[object], model, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.models.with_raw_response.list(
+                account_id="",
+            )
+
+
+class TestAsyncModels:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        model = await async_client.ai.models.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[object], model, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        model = await async_client.ai.models.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            author="author",
+            hide_experimental=True,
+            page=0,
+            per_page=0,
+            search="search",
+            source=0,
+            task="Text Generation",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[object], model, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.models.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        model = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[object], model, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.models.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            model = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[object], model, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.models.with_raw_response.list(
+                account_id="",
+            )
diff --git a/tests/api_resources/ai/test_tasks.py b/tests/api_resources/ai/test_tasks.py
new file mode 100644
index 00000000000..b0a6dea5ef5
--- /dev/null
+++ b/tests/api_resources/ai/test_tasks.py
@@ -0,0 +1,100 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestTasks:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        task = client.ai.tasks.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[object], task, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.ai.tasks.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        task = response.parse()
+        assert_matches_type(SyncSinglePage[object], task, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.ai.tasks.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            task = response.parse()
+            assert_matches_type(SyncSinglePage[object], task, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.tasks.with_raw_response.list(
+                account_id="",
+            )
+
+
+class TestAsyncTasks:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        task = await async_client.ai.tasks.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[object], task, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.tasks.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        task = await response.parse()
+        assert_matches_type(AsyncSinglePage[object], task, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.tasks.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            task = await response.parse()
+            assert_matches_type(AsyncSinglePage[object], task, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.tasks.with_raw_response.list(
+                account_id="",
+            )
diff --git a/tests/api_resources/ai/test_to_markdown.py b/tests/api_resources/ai/test_to_markdown.py
new file mode 100644
index 00000000000..607dd536533
--- /dev/null
+++ b/tests/api_resources/ai/test_to_markdown.py
@@ -0,0 +1,193 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.ai import ToMarkdownSupportedResponse, ToMarkdownTransformResponse
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestToMarkdown:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_supported(self, client: Cloudflare) -> None:
+        to_markdown = client.ai.to_markdown.supported(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[ToMarkdownSupportedResponse], to_markdown, path=["response"])
+
+    @parametrize
+    def test_raw_response_supported(self, client: Cloudflare) -> None:
+        response = client.ai.to_markdown.with_raw_response.supported(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        to_markdown = response.parse()
+        assert_matches_type(SyncSinglePage[ToMarkdownSupportedResponse], to_markdown, path=["response"])
+
+    @parametrize
+    def test_streaming_response_supported(self, client: Cloudflare) -> None:
+        with client.ai.to_markdown.with_streaming_response.supported(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            to_markdown = response.parse()
+            assert_matches_type(SyncSinglePage[ToMarkdownSupportedResponse], to_markdown, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_supported(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.to_markdown.with_raw_response.supported(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_transform(self, client: Cloudflare) -> None:
+        to_markdown = client.ai.to_markdown.transform(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            file={"files": [b"raw file contents"]},
+        )
+        assert_matches_type(SyncSinglePage[ToMarkdownTransformResponse], to_markdown, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_raw_response_transform(self, client: Cloudflare) -> None:
+        response = client.ai.to_markdown.with_raw_response.transform(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            file={"files": [b"raw file contents"]},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        to_markdown = response.parse()
+        assert_matches_type(SyncSinglePage[ToMarkdownTransformResponse], to_markdown, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_streaming_response_transform(self, client: Cloudflare) -> None:
+        with client.ai.to_markdown.with_streaming_response.transform(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            file={"files": [b"raw file contents"]},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            to_markdown = response.parse()
+            assert_matches_type(SyncSinglePage[ToMarkdownTransformResponse], to_markdown, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_path_params_transform(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.to_markdown.with_raw_response.transform(
+                account_id="",
+                file={"files": [b"raw file contents"]},
+            )
+
+
+class TestAsyncToMarkdown:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_supported(self, async_client: AsyncCloudflare) -> None:
+        to_markdown = await async_client.ai.to_markdown.supported(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[ToMarkdownSupportedResponse], to_markdown, path=["response"])
+
+    @parametrize
+    async def test_raw_response_supported(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.to_markdown.with_raw_response.supported(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        to_markdown = await response.parse()
+        assert_matches_type(AsyncSinglePage[ToMarkdownSupportedResponse], to_markdown, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_supported(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.to_markdown.with_streaming_response.supported(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            to_markdown = await response.parse()
+            assert_matches_type(AsyncSinglePage[ToMarkdownSupportedResponse], to_markdown, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_supported(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.to_markdown.with_raw_response.supported(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_transform(self, async_client: AsyncCloudflare) -> None:
+        to_markdown = await async_client.ai.to_markdown.transform(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            file={"files": [b"raw file contents"]},
+        )
+        assert_matches_type(AsyncSinglePage[ToMarkdownTransformResponse], to_markdown, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_raw_response_transform(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.to_markdown.with_raw_response.transform(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            file={"files": [b"raw file contents"]},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        to_markdown = await response.parse()
+        assert_matches_type(AsyncSinglePage[ToMarkdownTransformResponse], to_markdown, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_streaming_response_transform(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.to_markdown.with_streaming_response.transform(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            file={"files": [b"raw file contents"]},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            to_markdown = await response.parse()
+            assert_matches_type(AsyncSinglePage[ToMarkdownTransformResponse], to_markdown, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_path_params_transform(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.to_markdown.with_raw_response.transform(
+                account_id="",
+                file={"files": [b"raw file contents"]},
+            )
diff --git a/tests/api_resources/ai_gateway/test_datasets.py b/tests/api_resources/ai_gateway/test_datasets.py
new file mode 100644
index 00000000000..88b9820ab6a
--- /dev/null
+++ b/tests/api_resources/ai_gateway/test_datasets.py
@@ -0,0 +1,807 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.ai_gateway import (
+    DatasetGetResponse,
+    DatasetListResponse,
+    DatasetCreateResponse,
+    DatasetDeleteResponse,
+    DatasetUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestDatasets:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        dataset = client.ai_gateway.datasets.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            enable=True,
+            filters=[
+                {
+                    "key": "created_at",
+                    "operator": "eq",
+                    "value": ["string"],
+                }
+            ],
+            name="name",
+        )
+        assert_matches_type(DatasetCreateResponse, dataset, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.datasets.with_raw_response.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            enable=True,
+            filters=[
+                {
+                    "key": "created_at",
+                    "operator": "eq",
+                    "value": ["string"],
+                }
+            ],
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = response.parse()
+        assert_matches_type(DatasetCreateResponse, dataset, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.ai_gateway.datasets.with_streaming_response.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            enable=True,
+            filters=[
+                {
+                    "key": "created_at",
+                    "operator": "eq",
+                    "value": ["string"],
+                }
+            ],
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = response.parse()
+            assert_matches_type(DatasetCreateResponse, dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.datasets.with_raw_response.create(
+                gateway_id="my-gateway",
+                account_id="",
+                enable=True,
+                filters=[
+                    {
+                        "key": "created_at",
+                        "operator": "eq",
+                        "value": ["string"],
+                    }
+                ],
+                name="name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.datasets.with_raw_response.create(
+                gateway_id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                enable=True,
+                filters=[
+                    {
+                        "key": "created_at",
+                        "operator": "eq",
+                        "value": ["string"],
+                    }
+                ],
+                name="name",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        dataset = client.ai_gateway.datasets.update(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+            enable=True,
+            filters=[
+                {
+                    "key": "created_at",
+                    "operator": "eq",
+                    "value": ["string"],
+                }
+            ],
+            name="name",
+        )
+        assert_matches_type(DatasetUpdateResponse, dataset, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.datasets.with_raw_response.update(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+            enable=True,
+            filters=[
+                {
+                    "key": "created_at",
+                    "operator": "eq",
+                    "value": ["string"],
+                }
+            ],
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = response.parse()
+        assert_matches_type(DatasetUpdateResponse, dataset, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.ai_gateway.datasets.with_streaming_response.update(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+            enable=True,
+            filters=[
+                {
+                    "key": "created_at",
+                    "operator": "eq",
+                    "value": ["string"],
+                }
+            ],
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = response.parse()
+            assert_matches_type(DatasetUpdateResponse, dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.datasets.with_raw_response.update(
+                id="id",
+                account_id="",
+                gateway_id="my-gateway",
+                enable=True,
+                filters=[
+                    {
+                        "key": "created_at",
+                        "operator": "eq",
+                        "value": ["string"],
+                    }
+                ],
+                name="name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.datasets.with_raw_response.update(
+                id="id",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="",
+                enable=True,
+                filters=[
+                    {
+                        "key": "created_at",
+                        "operator": "eq",
+                        "value": ["string"],
+                    }
+                ],
+                name="name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.ai_gateway.datasets.with_raw_response.update(
+                id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="my-gateway",
+                enable=True,
+                filters=[
+                    {
+                        "key": "created_at",
+                        "operator": "eq",
+                        "value": ["string"],
+                    }
+                ],
+                name="name",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        dataset = client.ai_gateway.datasets.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[DatasetListResponse], dataset, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        dataset = client.ai_gateway.datasets.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            enable=True,
+            name="name",
+            page=1,
+            per_page=1,
+            search="search",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[DatasetListResponse], dataset, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.datasets.with_raw_response.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[DatasetListResponse], dataset, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.ai_gateway.datasets.with_streaming_response.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[DatasetListResponse], dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.datasets.with_raw_response.list(
+                gateway_id="my-gateway",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.datasets.with_raw_response.list(
+                gateway_id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        dataset = client.ai_gateway.datasets.delete(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        )
+        assert_matches_type(DatasetDeleteResponse, dataset, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.datasets.with_raw_response.delete(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = response.parse()
+        assert_matches_type(DatasetDeleteResponse, dataset, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.ai_gateway.datasets.with_streaming_response.delete(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = response.parse()
+            assert_matches_type(DatasetDeleteResponse, dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.datasets.with_raw_response.delete(
+                id="id",
+                account_id="",
+                gateway_id="my-gateway",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.datasets.with_raw_response.delete(
+                id="id",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.ai_gateway.datasets.with_raw_response.delete(
+                id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="my-gateway",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        dataset = client.ai_gateway.datasets.get(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        )
+        assert_matches_type(DatasetGetResponse, dataset, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.datasets.with_raw_response.get(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = response.parse()
+        assert_matches_type(DatasetGetResponse, dataset, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.ai_gateway.datasets.with_streaming_response.get(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = response.parse()
+            assert_matches_type(DatasetGetResponse, dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.datasets.with_raw_response.get(
+                id="id",
+                account_id="",
+                gateway_id="my-gateway",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.datasets.with_raw_response.get(
+                id="id",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.ai_gateway.datasets.with_raw_response.get(
+                id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="my-gateway",
+            )
+
+
+class TestAsyncDatasets:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        dataset = await async_client.ai_gateway.datasets.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            enable=True,
+            filters=[
+                {
+                    "key": "created_at",
+                    "operator": "eq",
+                    "value": ["string"],
+                }
+            ],
+            name="name",
+        )
+        assert_matches_type(DatasetCreateResponse, dataset, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.datasets.with_raw_response.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            enable=True,
+            filters=[
+                {
+                    "key": "created_at",
+                    "operator": "eq",
+                    "value": ["string"],
+                }
+            ],
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = await response.parse()
+        assert_matches_type(DatasetCreateResponse, dataset, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.datasets.with_streaming_response.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            enable=True,
+            filters=[
+                {
+                    "key": "created_at",
+                    "operator": "eq",
+                    "value": ["string"],
+                }
+            ],
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = await response.parse()
+            assert_matches_type(DatasetCreateResponse, dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.datasets.with_raw_response.create(
+                gateway_id="my-gateway",
+                account_id="",
+                enable=True,
+                filters=[
+                    {
+                        "key": "created_at",
+                        "operator": "eq",
+                        "value": ["string"],
+                    }
+                ],
+                name="name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.datasets.with_raw_response.create(
+                gateway_id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                enable=True,
+                filters=[
+                    {
+                        "key": "created_at",
+                        "operator": "eq",
+                        "value": ["string"],
+                    }
+                ],
+                name="name",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        dataset = await async_client.ai_gateway.datasets.update(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+            enable=True,
+            filters=[
+                {
+                    "key": "created_at",
+                    "operator": "eq",
+                    "value": ["string"],
+                }
+            ],
+            name="name",
+        )
+        assert_matches_type(DatasetUpdateResponse, dataset, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.datasets.with_raw_response.update(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+            enable=True,
+            filters=[
+                {
+                    "key": "created_at",
+                    "operator": "eq",
+                    "value": ["string"],
+                }
+            ],
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = await response.parse()
+        assert_matches_type(DatasetUpdateResponse, dataset, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.datasets.with_streaming_response.update(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+            enable=True,
+            filters=[
+                {
+                    "key": "created_at",
+                    "operator": "eq",
+                    "value": ["string"],
+                }
+            ],
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = await response.parse()
+            assert_matches_type(DatasetUpdateResponse, dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.datasets.with_raw_response.update(
+                id="id",
+                account_id="",
+                gateway_id="my-gateway",
+                enable=True,
+                filters=[
+                    {
+                        "key": "created_at",
+                        "operator": "eq",
+                        "value": ["string"],
+                    }
+                ],
+                name="name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.datasets.with_raw_response.update(
+                id="id",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="",
+                enable=True,
+                filters=[
+                    {
+                        "key": "created_at",
+                        "operator": "eq",
+                        "value": ["string"],
+                    }
+                ],
+                name="name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.ai_gateway.datasets.with_raw_response.update(
+                id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="my-gateway",
+                enable=True,
+                filters=[
+                    {
+                        "key": "created_at",
+                        "operator": "eq",
+                        "value": ["string"],
+                    }
+                ],
+                name="name",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        dataset = await async_client.ai_gateway.datasets.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[DatasetListResponse], dataset, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        dataset = await async_client.ai_gateway.datasets.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            enable=True,
+            name="name",
+            page=1,
+            per_page=1,
+            search="search",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[DatasetListResponse], dataset, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.datasets.with_raw_response.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[DatasetListResponse], dataset, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.datasets.with_streaming_response.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[DatasetListResponse], dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.datasets.with_raw_response.list(
+                gateway_id="my-gateway",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.datasets.with_raw_response.list(
+                gateway_id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        dataset = await async_client.ai_gateway.datasets.delete(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        )
+        assert_matches_type(DatasetDeleteResponse, dataset, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.datasets.with_raw_response.delete(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = await response.parse()
+        assert_matches_type(DatasetDeleteResponse, dataset, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.datasets.with_streaming_response.delete(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = await response.parse()
+            assert_matches_type(DatasetDeleteResponse, dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.datasets.with_raw_response.delete(
+                id="id",
+                account_id="",
+                gateway_id="my-gateway",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.datasets.with_raw_response.delete(
+                id="id",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.ai_gateway.datasets.with_raw_response.delete(
+                id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="my-gateway",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        dataset = await async_client.ai_gateway.datasets.get(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        )
+        assert_matches_type(DatasetGetResponse, dataset, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.datasets.with_raw_response.get(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = await response.parse()
+        assert_matches_type(DatasetGetResponse, dataset, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.datasets.with_streaming_response.get(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = await response.parse()
+            assert_matches_type(DatasetGetResponse, dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.datasets.with_raw_response.get(
+                id="id",
+                account_id="",
+                gateway_id="my-gateway",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.datasets.with_raw_response.get(
+                id="id",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.ai_gateway.datasets.with_raw_response.get(
+                id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="my-gateway",
+            )
diff --git a/tests/api_resources/ai_gateway/test_dynamic_routing.py b/tests/api_resources/ai_gateway/test_dynamic_routing.py
new file mode 100644
index 00000000000..55c052687ed
--- /dev/null
+++ b/tests/api_resources/ai_gateway/test_dynamic_routing.py
@@ -0,0 +1,1427 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.ai_gateway import (
+    DynamicRoutingGetResponse,
+    DynamicRoutingListResponse,
+    DynamicRoutingCreateResponse,
+    DynamicRoutingDeleteResponse,
+    DynamicRoutingUpdateResponse,
+    DynamicRoutingGetVersionResponse,
+    DynamicRoutingListVersionsResponse,
+    DynamicRoutingCreateVersionResponse,
+    DynamicRoutingListDeploymentsResponse,
+    DynamicRoutingCreateDeploymentResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestDynamicRouting:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        dynamic_routing = client.ai_gateway.dynamic_routing.create(
+            gateway_id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            elements=[
+                {
+                    "id": "id",
+                    "outputs": {"next": {"element_id": "elementId"}},
+                    "type": "start",
+                }
+            ],
+            name="name",
+        )
+        assert_matches_type(DynamicRoutingCreateResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.dynamic_routing.with_raw_response.create(
+            gateway_id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            elements=[
+                {
+                    "id": "id",
+                    "outputs": {"next": {"element_id": "elementId"}},
+                    "type": "start",
+                }
+            ],
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = response.parse()
+        assert_matches_type(DynamicRoutingCreateResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.ai_gateway.dynamic_routing.with_streaming_response.create(
+            gateway_id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            elements=[
+                {
+                    "id": "id",
+                    "outputs": {"next": {"element_id": "elementId"}},
+                    "type": "start",
+                }
+            ],
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = response.parse()
+            assert_matches_type(DynamicRoutingCreateResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.create(
+                gateway_id="54442216",
+                account_id="",
+                elements=[
+                    {
+                        "id": "id",
+                        "outputs": {"next": {"element_id": "elementId"}},
+                        "type": "start",
+                    }
+                ],
+                name="name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.create(
+                gateway_id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                elements=[
+                    {
+                        "id": "id",
+                        "outputs": {"next": {"element_id": "elementId"}},
+                        "type": "start",
+                    }
+                ],
+                name="name",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        dynamic_routing = client.ai_gateway.dynamic_routing.update(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            name="Route Name",
+        )
+        assert_matches_type(DynamicRoutingUpdateResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.dynamic_routing.with_raw_response.update(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            name="Route Name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = response.parse()
+        assert_matches_type(DynamicRoutingUpdateResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.ai_gateway.dynamic_routing.with_streaming_response.update(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            name="Route Name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = response.parse()
+            assert_matches_type(DynamicRoutingUpdateResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.update(
+                id="54442216",
+                account_id="",
+                gateway_id="54442216",
+                name="Route Name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.update(
+                id="54442216",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+                name="Route Name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.update(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="54442216",
+                name="Route Name",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        dynamic_routing = client.ai_gateway.dynamic_routing.list(
+            gateway_id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+        )
+        assert_matches_type(DynamicRoutingListResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.dynamic_routing.with_raw_response.list(
+            gateway_id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = response.parse()
+        assert_matches_type(DynamicRoutingListResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.ai_gateway.dynamic_routing.with_streaming_response.list(
+            gateway_id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = response.parse()
+            assert_matches_type(DynamicRoutingListResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.list(
+                gateway_id="54442216",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.list(
+                gateway_id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        dynamic_routing = client.ai_gateway.dynamic_routing.delete(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        )
+        assert_matches_type(DynamicRoutingDeleteResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.dynamic_routing.with_raw_response.delete(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = response.parse()
+        assert_matches_type(DynamicRoutingDeleteResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.ai_gateway.dynamic_routing.with_streaming_response.delete(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = response.parse()
+            assert_matches_type(DynamicRoutingDeleteResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.delete(
+                id="54442216",
+                account_id="",
+                gateway_id="54442216",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.delete(
+                id="54442216",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.delete(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="54442216",
+            )
+
+    @parametrize
+    def test_method_create_deployment(self, client: Cloudflare) -> None:
+        dynamic_routing = client.ai_gateway.dynamic_routing.create_deployment(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            comment="Route Deployment Comment",
+            version_id="54442216",
+        )
+        assert_matches_type(DynamicRoutingCreateDeploymentResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_deployment(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.dynamic_routing.with_raw_response.create_deployment(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            comment="Route Deployment Comment",
+            version_id="54442216",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = response.parse()
+        assert_matches_type(DynamicRoutingCreateDeploymentResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_deployment(self, client: Cloudflare) -> None:
+        with client.ai_gateway.dynamic_routing.with_streaming_response.create_deployment(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            comment="Route Deployment Comment",
+            version_id="54442216",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = response.parse()
+            assert_matches_type(DynamicRoutingCreateDeploymentResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_deployment(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.create_deployment(
+                id="54442216",
+                account_id="",
+                gateway_id="54442216",
+                comment="Route Deployment Comment",
+                version_id="54442216",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.create_deployment(
+                id="54442216",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+                comment="Route Deployment Comment",
+                version_id="54442216",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.create_deployment(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="54442216",
+                comment="Route Deployment Comment",
+                version_id="54442216",
+            )
+
+    @parametrize
+    def test_method_create_version(self, client: Cloudflare) -> None:
+        dynamic_routing = client.ai_gateway.dynamic_routing.create_version(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            comment="Route Version Comment",
+            elements=[
+                {
+                    "id": "id",
+                    "outputs": {"next": {"element_id": "elementId"}},
+                    "type": "start",
+                }
+            ],
+        )
+        assert_matches_type(DynamicRoutingCreateVersionResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_version(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.dynamic_routing.with_raw_response.create_version(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            comment="Route Version Comment",
+            elements=[
+                {
+                    "id": "id",
+                    "outputs": {"next": {"element_id": "elementId"}},
+                    "type": "start",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = response.parse()
+        assert_matches_type(DynamicRoutingCreateVersionResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_version(self, client: Cloudflare) -> None:
+        with client.ai_gateway.dynamic_routing.with_streaming_response.create_version(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            comment="Route Version Comment",
+            elements=[
+                {
+                    "id": "id",
+                    "outputs": {"next": {"element_id": "elementId"}},
+                    "type": "start",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = response.parse()
+            assert_matches_type(DynamicRoutingCreateVersionResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_version(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.create_version(
+                id="54442216",
+                account_id="",
+                gateway_id="54442216",
+                comment="Route Version Comment",
+                elements=[
+                    {
+                        "id": "id",
+                        "outputs": {"next": {"element_id": "elementId"}},
+                        "type": "start",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.create_version(
+                id="54442216",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+                comment="Route Version Comment",
+                elements=[
+                    {
+                        "id": "id",
+                        "outputs": {"next": {"element_id": "elementId"}},
+                        "type": "start",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.create_version(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="54442216",
+                comment="Route Version Comment",
+                elements=[
+                    {
+                        "id": "id",
+                        "outputs": {"next": {"element_id": "elementId"}},
+                        "type": "start",
+                    }
+                ],
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        dynamic_routing = client.ai_gateway.dynamic_routing.get(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        )
+        assert_matches_type(DynamicRoutingGetResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.dynamic_routing.with_raw_response.get(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = response.parse()
+        assert_matches_type(DynamicRoutingGetResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.ai_gateway.dynamic_routing.with_streaming_response.get(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = response.parse()
+            assert_matches_type(DynamicRoutingGetResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.get(
+                id="54442216",
+                account_id="",
+                gateway_id="54442216",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.get(
+                id="54442216",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.get(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="54442216",
+            )
+
+    @parametrize
+    def test_method_get_version(self, client: Cloudflare) -> None:
+        dynamic_routing = client.ai_gateway.dynamic_routing.get_version(
+            version_id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            id="54442216",
+        )
+        assert_matches_type(DynamicRoutingGetVersionResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_raw_response_get_version(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.dynamic_routing.with_raw_response.get_version(
+            version_id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            id="54442216",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = response.parse()
+        assert_matches_type(DynamicRoutingGetVersionResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get_version(self, client: Cloudflare) -> None:
+        with client.ai_gateway.dynamic_routing.with_streaming_response.get_version(
+            version_id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            id="54442216",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = response.parse()
+            assert_matches_type(DynamicRoutingGetVersionResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get_version(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.get_version(
+                version_id="54442216",
+                account_id="",
+                gateway_id="54442216",
+                id="54442216",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.get_version(
+                version_id="54442216",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+                id="54442216",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.get_version(
+                version_id="54442216",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="54442216",
+                id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `version_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.get_version(
+                version_id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="54442216",
+                id="54442216",
+            )
+
+    @parametrize
+    def test_method_list_deployments(self, client: Cloudflare) -> None:
+        dynamic_routing = client.ai_gateway.dynamic_routing.list_deployments(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        )
+        assert_matches_type(DynamicRoutingListDeploymentsResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_raw_response_list_deployments(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.dynamic_routing.with_raw_response.list_deployments(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = response.parse()
+        assert_matches_type(DynamicRoutingListDeploymentsResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list_deployments(self, client: Cloudflare) -> None:
+        with client.ai_gateway.dynamic_routing.with_streaming_response.list_deployments(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = response.parse()
+            assert_matches_type(DynamicRoutingListDeploymentsResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list_deployments(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.list_deployments(
+                id="54442216",
+                account_id="",
+                gateway_id="54442216",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.list_deployments(
+                id="54442216",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.list_deployments(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="54442216",
+            )
+
+    @parametrize
+    def test_method_list_versions(self, client: Cloudflare) -> None:
+        dynamic_routing = client.ai_gateway.dynamic_routing.list_versions(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        )
+        assert_matches_type(DynamicRoutingListVersionsResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_raw_response_list_versions(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.dynamic_routing.with_raw_response.list_versions(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = response.parse()
+        assert_matches_type(DynamicRoutingListVersionsResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list_versions(self, client: Cloudflare) -> None:
+        with client.ai_gateway.dynamic_routing.with_streaming_response.list_versions(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = response.parse()
+            assert_matches_type(DynamicRoutingListVersionsResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list_versions(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.list_versions(
+                id="54442216",
+                account_id="",
+                gateway_id="54442216",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.list_versions(
+                id="54442216",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.ai_gateway.dynamic_routing.with_raw_response.list_versions(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="54442216",
+            )
+
+
+class TestAsyncDynamicRouting:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        dynamic_routing = await async_client.ai_gateway.dynamic_routing.create(
+            gateway_id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            elements=[
+                {
+                    "id": "id",
+                    "outputs": {"next": {"element_id": "elementId"}},
+                    "type": "start",
+                }
+            ],
+            name="name",
+        )
+        assert_matches_type(DynamicRoutingCreateResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.dynamic_routing.with_raw_response.create(
+            gateway_id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            elements=[
+                {
+                    "id": "id",
+                    "outputs": {"next": {"element_id": "elementId"}},
+                    "type": "start",
+                }
+            ],
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = await response.parse()
+        assert_matches_type(DynamicRoutingCreateResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.dynamic_routing.with_streaming_response.create(
+            gateway_id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            elements=[
+                {
+                    "id": "id",
+                    "outputs": {"next": {"element_id": "elementId"}},
+                    "type": "start",
+                }
+            ],
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = await response.parse()
+            assert_matches_type(DynamicRoutingCreateResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.create(
+                gateway_id="54442216",
+                account_id="",
+                elements=[
+                    {
+                        "id": "id",
+                        "outputs": {"next": {"element_id": "elementId"}},
+                        "type": "start",
+                    }
+                ],
+                name="name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.create(
+                gateway_id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                elements=[
+                    {
+                        "id": "id",
+                        "outputs": {"next": {"element_id": "elementId"}},
+                        "type": "start",
+                    }
+                ],
+                name="name",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        dynamic_routing = await async_client.ai_gateway.dynamic_routing.update(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            name="Route Name",
+        )
+        assert_matches_type(DynamicRoutingUpdateResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.dynamic_routing.with_raw_response.update(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            name="Route Name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = await response.parse()
+        assert_matches_type(DynamicRoutingUpdateResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.dynamic_routing.with_streaming_response.update(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            name="Route Name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = await response.parse()
+            assert_matches_type(DynamicRoutingUpdateResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.update(
+                id="54442216",
+                account_id="",
+                gateway_id="54442216",
+                name="Route Name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.update(
+                id="54442216",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+                name="Route Name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.update(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="54442216",
+                name="Route Name",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        dynamic_routing = await async_client.ai_gateway.dynamic_routing.list(
+            gateway_id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+        )
+        assert_matches_type(DynamicRoutingListResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.dynamic_routing.with_raw_response.list(
+            gateway_id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = await response.parse()
+        assert_matches_type(DynamicRoutingListResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.dynamic_routing.with_streaming_response.list(
+            gateway_id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = await response.parse()
+            assert_matches_type(DynamicRoutingListResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.list(
+                gateway_id="54442216",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.list(
+                gateway_id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        dynamic_routing = await async_client.ai_gateway.dynamic_routing.delete(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        )
+        assert_matches_type(DynamicRoutingDeleteResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.dynamic_routing.with_raw_response.delete(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = await response.parse()
+        assert_matches_type(DynamicRoutingDeleteResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.dynamic_routing.with_streaming_response.delete(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = await response.parse()
+            assert_matches_type(DynamicRoutingDeleteResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.delete(
+                id="54442216",
+                account_id="",
+                gateway_id="54442216",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.delete(
+                id="54442216",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.delete(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="54442216",
+            )
+
+    @parametrize
+    async def test_method_create_deployment(self, async_client: AsyncCloudflare) -> None:
+        dynamic_routing = await async_client.ai_gateway.dynamic_routing.create_deployment(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            comment="Route Deployment Comment",
+            version_id="54442216",
+        )
+        assert_matches_type(DynamicRoutingCreateDeploymentResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_deployment(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.dynamic_routing.with_raw_response.create_deployment(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            comment="Route Deployment Comment",
+            version_id="54442216",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = await response.parse()
+        assert_matches_type(DynamicRoutingCreateDeploymentResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_deployment(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.dynamic_routing.with_streaming_response.create_deployment(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            comment="Route Deployment Comment",
+            version_id="54442216",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = await response.parse()
+            assert_matches_type(DynamicRoutingCreateDeploymentResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_deployment(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.create_deployment(
+                id="54442216",
+                account_id="",
+                gateway_id="54442216",
+                comment="Route Deployment Comment",
+                version_id="54442216",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.create_deployment(
+                id="54442216",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+                comment="Route Deployment Comment",
+                version_id="54442216",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.create_deployment(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="54442216",
+                comment="Route Deployment Comment",
+                version_id="54442216",
+            )
+
+    @parametrize
+    async def test_method_create_version(self, async_client: AsyncCloudflare) -> None:
+        dynamic_routing = await async_client.ai_gateway.dynamic_routing.create_version(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            comment="Route Version Comment",
+            elements=[
+                {
+                    "id": "id",
+                    "outputs": {"next": {"element_id": "elementId"}},
+                    "type": "start",
+                }
+            ],
+        )
+        assert_matches_type(DynamicRoutingCreateVersionResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_version(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.dynamic_routing.with_raw_response.create_version(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            comment="Route Version Comment",
+            elements=[
+                {
+                    "id": "id",
+                    "outputs": {"next": {"element_id": "elementId"}},
+                    "type": "start",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = await response.parse()
+        assert_matches_type(DynamicRoutingCreateVersionResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_version(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.dynamic_routing.with_streaming_response.create_version(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            comment="Route Version Comment",
+            elements=[
+                {
+                    "id": "id",
+                    "outputs": {"next": {"element_id": "elementId"}},
+                    "type": "start",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = await response.parse()
+            assert_matches_type(DynamicRoutingCreateVersionResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_version(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.create_version(
+                id="54442216",
+                account_id="",
+                gateway_id="54442216",
+                comment="Route Version Comment",
+                elements=[
+                    {
+                        "id": "id",
+                        "outputs": {"next": {"element_id": "elementId"}},
+                        "type": "start",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.create_version(
+                id="54442216",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+                comment="Route Version Comment",
+                elements=[
+                    {
+                        "id": "id",
+                        "outputs": {"next": {"element_id": "elementId"}},
+                        "type": "start",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.create_version(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="54442216",
+                comment="Route Version Comment",
+                elements=[
+                    {
+                        "id": "id",
+                        "outputs": {"next": {"element_id": "elementId"}},
+                        "type": "start",
+                    }
+                ],
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        dynamic_routing = await async_client.ai_gateway.dynamic_routing.get(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        )
+        assert_matches_type(DynamicRoutingGetResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.dynamic_routing.with_raw_response.get(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = await response.parse()
+        assert_matches_type(DynamicRoutingGetResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.dynamic_routing.with_streaming_response.get(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = await response.parse()
+            assert_matches_type(DynamicRoutingGetResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.get(
+                id="54442216",
+                account_id="",
+                gateway_id="54442216",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.get(
+                id="54442216",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.get(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="54442216",
+            )
+
+    @parametrize
+    async def test_method_get_version(self, async_client: AsyncCloudflare) -> None:
+        dynamic_routing = await async_client.ai_gateway.dynamic_routing.get_version(
+            version_id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            id="54442216",
+        )
+        assert_matches_type(DynamicRoutingGetVersionResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get_version(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.dynamic_routing.with_raw_response.get_version(
+            version_id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            id="54442216",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = await response.parse()
+        assert_matches_type(DynamicRoutingGetVersionResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get_version(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.dynamic_routing.with_streaming_response.get_version(
+            version_id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+            id="54442216",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = await response.parse()
+            assert_matches_type(DynamicRoutingGetVersionResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get_version(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.get_version(
+                version_id="54442216",
+                account_id="",
+                gateway_id="54442216",
+                id="54442216",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.get_version(
+                version_id="54442216",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+                id="54442216",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.get_version(
+                version_id="54442216",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="54442216",
+                id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `version_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.get_version(
+                version_id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="54442216",
+                id="54442216",
+            )
+
+    @parametrize
+    async def test_method_list_deployments(self, async_client: AsyncCloudflare) -> None:
+        dynamic_routing = await async_client.ai_gateway.dynamic_routing.list_deployments(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        )
+        assert_matches_type(DynamicRoutingListDeploymentsResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list_deployments(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.dynamic_routing.with_raw_response.list_deployments(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = await response.parse()
+        assert_matches_type(DynamicRoutingListDeploymentsResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list_deployments(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.dynamic_routing.with_streaming_response.list_deployments(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = await response.parse()
+            assert_matches_type(DynamicRoutingListDeploymentsResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list_deployments(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.list_deployments(
+                id="54442216",
+                account_id="",
+                gateway_id="54442216",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.list_deployments(
+                id="54442216",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.list_deployments(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="54442216",
+            )
+
+    @parametrize
+    async def test_method_list_versions(self, async_client: AsyncCloudflare) -> None:
+        dynamic_routing = await async_client.ai_gateway.dynamic_routing.list_versions(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        )
+        assert_matches_type(DynamicRoutingListVersionsResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list_versions(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.dynamic_routing.with_raw_response.list_versions(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dynamic_routing = await response.parse()
+        assert_matches_type(DynamicRoutingListVersionsResponse, dynamic_routing, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list_versions(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.dynamic_routing.with_streaming_response.list_versions(
+            id="54442216",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="54442216",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dynamic_routing = await response.parse()
+            assert_matches_type(DynamicRoutingListVersionsResponse, dynamic_routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list_versions(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.list_versions(
+                id="54442216",
+                account_id="",
+                gateway_id="54442216",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.list_versions(
+                id="54442216",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.ai_gateway.dynamic_routing.with_raw_response.list_versions(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="54442216",
+            )
diff --git a/tests/api_resources/ai_gateway/test_evaluation_types.py b/tests/api_resources/ai_gateway/test_evaluation_types.py
new file mode 100644
index 00000000000..64b7cca833a
--- /dev/null
+++ b/tests/api_resources/ai_gateway/test_evaluation_types.py
@@ -0,0 +1,127 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.ai_gateway import EvaluationTypeListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestEvaluationTypes:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        evaluation_type = client.ai_gateway.evaluation_types.list(
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[EvaluationTypeListResponse], evaluation_type, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        evaluation_type = client.ai_gateway.evaluation_types.list(
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            order_by="order_by",
+            order_by_direction="asc",
+            page=1,
+            per_page=5,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[EvaluationTypeListResponse], evaluation_type, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.evaluation_types.with_raw_response.list(
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        evaluation_type = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[EvaluationTypeListResponse], evaluation_type, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.ai_gateway.evaluation_types.with_streaming_response.list(
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            evaluation_type = response.parse()
+            assert_matches_type(
+                SyncV4PagePaginationArray[EvaluationTypeListResponse], evaluation_type, path=["response"]
+            )
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.evaluation_types.with_raw_response.list(
+                account_id="",
+            )
+
+
+class TestAsyncEvaluationTypes:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        evaluation_type = await async_client.ai_gateway.evaluation_types.list(
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[EvaluationTypeListResponse], evaluation_type, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        evaluation_type = await async_client.ai_gateway.evaluation_types.list(
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            order_by="order_by",
+            order_by_direction="asc",
+            page=1,
+            per_page=5,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[EvaluationTypeListResponse], evaluation_type, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.evaluation_types.with_raw_response.list(
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        evaluation_type = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[EvaluationTypeListResponse], evaluation_type, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.evaluation_types.with_streaming_response.list(
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            evaluation_type = await response.parse()
+            assert_matches_type(
+                AsyncV4PagePaginationArray[EvaluationTypeListResponse], evaluation_type, path=["response"]
+            )
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.evaluation_types.with_raw_response.list(
+                account_id="",
+            )
diff --git a/tests/api_resources/ai_gateway/test_evaluations.py b/tests/api_resources/ai_gateway/test_evaluations.py
new file mode 100644
index 00000000000..0ae12b69d6b
--- /dev/null
+++ b/tests/api_resources/ai_gateway/test_evaluations.py
@@ -0,0 +1,518 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.ai_gateway import (
+    EvaluationGetResponse,
+    EvaluationListResponse,
+    EvaluationCreateResponse,
+    EvaluationDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestEvaluations:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        evaluation = client.ai_gateway.evaluations.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            dataset_ids=["string"],
+            evaluation_type_ids=["string"],
+            name="name",
+        )
+        assert_matches_type(EvaluationCreateResponse, evaluation, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.evaluations.with_raw_response.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            dataset_ids=["string"],
+            evaluation_type_ids=["string"],
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        evaluation = response.parse()
+        assert_matches_type(EvaluationCreateResponse, evaluation, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.ai_gateway.evaluations.with_streaming_response.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            dataset_ids=["string"],
+            evaluation_type_ids=["string"],
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            evaluation = response.parse()
+            assert_matches_type(EvaluationCreateResponse, evaluation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.evaluations.with_raw_response.create(
+                gateway_id="my-gateway",
+                account_id="",
+                dataset_ids=["string"],
+                evaluation_type_ids=["string"],
+                name="name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.evaluations.with_raw_response.create(
+                gateway_id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                dataset_ids=["string"],
+                evaluation_type_ids=["string"],
+                name="name",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        evaluation = client.ai_gateway.evaluations.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[EvaluationListResponse], evaluation, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        evaluation = client.ai_gateway.evaluations.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            name="name",
+            page=1,
+            per_page=1,
+            processed=True,
+            search="search",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[EvaluationListResponse], evaluation, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.evaluations.with_raw_response.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        evaluation = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[EvaluationListResponse], evaluation, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.ai_gateway.evaluations.with_streaming_response.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            evaluation = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[EvaluationListResponse], evaluation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.evaluations.with_raw_response.list(
+                gateway_id="my-gateway",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.evaluations.with_raw_response.list(
+                gateway_id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        evaluation = client.ai_gateway.evaluations.delete(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        )
+        assert_matches_type(EvaluationDeleteResponse, evaluation, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.evaluations.with_raw_response.delete(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        evaluation = response.parse()
+        assert_matches_type(EvaluationDeleteResponse, evaluation, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.ai_gateway.evaluations.with_streaming_response.delete(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            evaluation = response.parse()
+            assert_matches_type(EvaluationDeleteResponse, evaluation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.evaluations.with_raw_response.delete(
+                id="id",
+                account_id="",
+                gateway_id="my-gateway",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.evaluations.with_raw_response.delete(
+                id="id",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.ai_gateway.evaluations.with_raw_response.delete(
+                id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="my-gateway",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        evaluation = client.ai_gateway.evaluations.get(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        )
+        assert_matches_type(EvaluationGetResponse, evaluation, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.evaluations.with_raw_response.get(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        evaluation = response.parse()
+        assert_matches_type(EvaluationGetResponse, evaluation, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.ai_gateway.evaluations.with_streaming_response.get(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            evaluation = response.parse()
+            assert_matches_type(EvaluationGetResponse, evaluation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.evaluations.with_raw_response.get(
+                id="id",
+                account_id="",
+                gateway_id="my-gateway",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.evaluations.with_raw_response.get(
+                id="id",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.ai_gateway.evaluations.with_raw_response.get(
+                id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="my-gateway",
+            )
+
+
+class TestAsyncEvaluations:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        evaluation = await async_client.ai_gateway.evaluations.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            dataset_ids=["string"],
+            evaluation_type_ids=["string"],
+            name="name",
+        )
+        assert_matches_type(EvaluationCreateResponse, evaluation, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.evaluations.with_raw_response.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            dataset_ids=["string"],
+            evaluation_type_ids=["string"],
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        evaluation = await response.parse()
+        assert_matches_type(EvaluationCreateResponse, evaluation, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.evaluations.with_streaming_response.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            dataset_ids=["string"],
+            evaluation_type_ids=["string"],
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            evaluation = await response.parse()
+            assert_matches_type(EvaluationCreateResponse, evaluation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.evaluations.with_raw_response.create(
+                gateway_id="my-gateway",
+                account_id="",
+                dataset_ids=["string"],
+                evaluation_type_ids=["string"],
+                name="name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.evaluations.with_raw_response.create(
+                gateway_id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                dataset_ids=["string"],
+                evaluation_type_ids=["string"],
+                name="name",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        evaluation = await async_client.ai_gateway.evaluations.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[EvaluationListResponse], evaluation, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        evaluation = await async_client.ai_gateway.evaluations.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            name="name",
+            page=1,
+            per_page=1,
+            processed=True,
+            search="search",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[EvaluationListResponse], evaluation, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.evaluations.with_raw_response.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        evaluation = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[EvaluationListResponse], evaluation, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.evaluations.with_streaming_response.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            evaluation = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[EvaluationListResponse], evaluation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.evaluations.with_raw_response.list(
+                gateway_id="my-gateway",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.evaluations.with_raw_response.list(
+                gateway_id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        evaluation = await async_client.ai_gateway.evaluations.delete(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        )
+        assert_matches_type(EvaluationDeleteResponse, evaluation, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.evaluations.with_raw_response.delete(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        evaluation = await response.parse()
+        assert_matches_type(EvaluationDeleteResponse, evaluation, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.evaluations.with_streaming_response.delete(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            evaluation = await response.parse()
+            assert_matches_type(EvaluationDeleteResponse, evaluation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.evaluations.with_raw_response.delete(
+                id="id",
+                account_id="",
+                gateway_id="my-gateway",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.evaluations.with_raw_response.delete(
+                id="id",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.ai_gateway.evaluations.with_raw_response.delete(
+                id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="my-gateway",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        evaluation = await async_client.ai_gateway.evaluations.get(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        )
+        assert_matches_type(EvaluationGetResponse, evaluation, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.evaluations.with_raw_response.get(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        evaluation = await response.parse()
+        assert_matches_type(EvaluationGetResponse, evaluation, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.evaluations.with_streaming_response.get(
+            id="id",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            gateway_id="my-gateway",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            evaluation = await response.parse()
+            assert_matches_type(EvaluationGetResponse, evaluation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.evaluations.with_raw_response.get(
+                id="id",
+                account_id="",
+                gateway_id="my-gateway",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.evaluations.with_raw_response.get(
+                id="id",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.ai_gateway.evaluations.with_raw_response.get(
+                id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                gateway_id="my-gateway",
+            )
diff --git a/tests/api_resources/ai_gateway/test_logs.py b/tests/api_resources/ai_gateway/test_logs.py
index 7bcb2da715a..734f4a528d9 100644
--- a/tests/api_resources/ai_gateway/test_logs.py
+++ b/tests/api_resources/ai_gateway/test_logs.py
@@ -11,7 +11,11 @@
 from tests.utils import assert_matches_type
 from cloudflare._utils import parse_datetime
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
-from cloudflare.types.ai_gateway import LogListResponse
+from cloudflare.types.ai_gateway import (
+    LogGetResponse,
+    LogListResponse,
+    LogDeleteResponse,
+)
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -22,7 +26,7 @@ class TestLogs:
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         log = client.ai_gateway.logs.list(
-            id="my-gateway",
+            gateway_id="my-gateway",
             account_id="0d37909e38d3e99c29fa2cd343ac421a",
         )
         assert_matches_type(SyncV4PagePaginationArray[LogListResponse], log, path=["response"])
@@ -30,14 +34,39 @@ def test_method_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         log = client.ai_gateway.logs.list(
-            id="my-gateway",
+            gateway_id="my-gateway",
             account_id="0d37909e38d3e99c29fa2cd343ac421a",
             cached=True,
             direction="asc",
             end_date=parse_datetime("2019-12-27T18:11:19.117Z"),
+            feedback=0,
+            filters=[
+                {
+                    "key": "id",
+                    "operator": "eq",
+                    "value": ["string"],
+                }
+            ],
+            max_cost=0,
+            max_duration=0,
+            max_tokens_in=0,
+            max_tokens_out=0,
+            max_total_tokens=0,
+            meta_info=True,
+            min_cost=0,
+            min_duration=0,
+            min_tokens_in=0,
+            min_tokens_out=0,
+            min_total_tokens=0,
+            model="model",
+            model_type="model_type",
             order_by="created_at",
+            order_by_direction="asc",
             page=1,
-            per_page=5,
+            per_page=1,
+            provider="provider",
+            request_content_type="request_content_type",
+            response_content_type="response_content_type",
             search="search",
             start_date=parse_datetime("2019-12-27T18:11:19.117Z"),
             success=True,
@@ -47,7 +76,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.ai_gateway.logs.with_raw_response.list(
-            id="my-gateway",
+            gateway_id="my-gateway",
             account_id="0d37909e38d3e99c29fa2cd343ac421a",
         )
 
@@ -59,7 +88,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.ai_gateway.logs.with_streaming_response.list(
-            id="my-gateway",
+            gateway_id="my-gateway",
             account_id="0d37909e38d3e99c29fa2cd343ac421a",
         ) as response:
             assert not response.is_closed
@@ -74,24 +103,344 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
     def test_path_params_list(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.ai_gateway.logs.with_raw_response.list(
-                id="my-gateway",
+                gateway_id="my-gateway",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
             client.ai_gateway.logs.with_raw_response.list(
+                gateway_id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        log = client.ai_gateway.logs.delete(
+            gateway_id="my-gateway",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+        )
+        assert_matches_type(LogDeleteResponse, log, path=["response"])
+
+    @parametrize
+    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
+        log = client.ai_gateway.logs.delete(
+            gateway_id="my-gateway",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            filters=[
+                {
+                    "key": "id",
+                    "operator": "eq",
+                    "value": ["string"],
+                }
+            ],
+            limit=1,
+            order_by="created_at",
+            order_by_direction="asc",
+        )
+        assert_matches_type(LogDeleteResponse, log, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.logs.with_raw_response.delete(
+            gateway_id="my-gateway",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        log = response.parse()
+        assert_matches_type(LogDeleteResponse, log, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.ai_gateway.logs.with_streaming_response.delete(
+            gateway_id="my-gateway",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            log = response.parse()
+            assert_matches_type(LogDeleteResponse, log, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.logs.with_raw_response.delete(
+                gateway_id="my-gateway",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.logs.with_raw_response.delete(
+                gateway_id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        log = client.ai_gateway.logs.edit(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+        assert_matches_type(object, log, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        log = client.ai_gateway.logs.edit(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+            feedback=-1,
+            metadata={"foo": "string"},
+            score=0,
+        )
+        assert_matches_type(object, log, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.logs.with_raw_response.edit(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        log = response.parse()
+        assert_matches_type(object, log, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.ai_gateway.logs.with_streaming_response.edit(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            log = response.parse()
+            assert_matches_type(object, log, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.logs.with_raw_response.edit(
+                id="id",
+                account_id="",
+                gateway_id="my-gateway",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.logs.with_raw_response.edit(
+                id="id",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.ai_gateway.logs.with_raw_response.edit(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="my-gateway",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        log = client.ai_gateway.logs.get(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+        assert_matches_type(LogGetResponse, log, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.logs.with_raw_response.get(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        log = response.parse()
+        assert_matches_type(LogGetResponse, log, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.ai_gateway.logs.with_streaming_response.get(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            log = response.parse()
+            assert_matches_type(LogGetResponse, log, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.logs.with_raw_response.get(
+                id="id",
+                account_id="",
+                gateway_id="my-gateway",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.logs.with_raw_response.get(
+                id="id",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.ai_gateway.logs.with_raw_response.get(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="my-gateway",
+            )
+
+    @parametrize
+    def test_method_request(self, client: Cloudflare) -> None:
+        log = client.ai_gateway.logs.request(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+        assert_matches_type(object, log, path=["response"])
+
+    @parametrize
+    def test_raw_response_request(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.logs.with_raw_response.request(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        log = response.parse()
+        assert_matches_type(object, log, path=["response"])
+
+    @parametrize
+    def test_streaming_response_request(self, client: Cloudflare) -> None:
+        with client.ai_gateway.logs.with_streaming_response.request(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            log = response.parse()
+            assert_matches_type(object, log, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_request(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.logs.with_raw_response.request(
+                id="id",
+                account_id="",
+                gateway_id="my-gateway",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.logs.with_raw_response.request(
+                id="id",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.ai_gateway.logs.with_raw_response.request(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="my-gateway",
+            )
+
+    @parametrize
+    def test_method_response(self, client: Cloudflare) -> None:
+        log = client.ai_gateway.logs.response(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+        assert_matches_type(object, log, path=["response"])
+
+    @parametrize
+    def test_raw_response_response(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.logs.with_raw_response.response(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        log = response.parse()
+        assert_matches_type(object, log, path=["response"])
+
+    @parametrize
+    def test_streaming_response_response(self, client: Cloudflare) -> None:
+        with client.ai_gateway.logs.with_streaming_response.response(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            log = response.parse()
+            assert_matches_type(object, log, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_response(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.logs.with_raw_response.response(
+                id="id",
+                account_id="",
+                gateway_id="my-gateway",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.logs.with_raw_response.response(
+                id="id",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.ai_gateway.logs.with_raw_response.response(
                 id="",
                 account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="my-gateway",
             )
 
 
 class TestAsyncLogs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         log = await async_client.ai_gateway.logs.list(
-            id="my-gateway",
+            gateway_id="my-gateway",
             account_id="0d37909e38d3e99c29fa2cd343ac421a",
         )
         assert_matches_type(AsyncV4PagePaginationArray[LogListResponse], log, path=["response"])
@@ -99,14 +448,39 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         log = await async_client.ai_gateway.logs.list(
-            id="my-gateway",
+            gateway_id="my-gateway",
             account_id="0d37909e38d3e99c29fa2cd343ac421a",
             cached=True,
             direction="asc",
             end_date=parse_datetime("2019-12-27T18:11:19.117Z"),
+            feedback=0,
+            filters=[
+                {
+                    "key": "id",
+                    "operator": "eq",
+                    "value": ["string"],
+                }
+            ],
+            max_cost=0,
+            max_duration=0,
+            max_tokens_in=0,
+            max_tokens_out=0,
+            max_total_tokens=0,
+            meta_info=True,
+            min_cost=0,
+            min_duration=0,
+            min_tokens_in=0,
+            min_tokens_out=0,
+            min_total_tokens=0,
+            model="model",
+            model_type="model_type",
             order_by="created_at",
+            order_by_direction="asc",
             page=1,
-            per_page=5,
+            per_page=1,
+            provider="provider",
+            request_content_type="request_content_type",
+            response_content_type="response_content_type",
             search="search",
             start_date=parse_datetime("2019-12-27T18:11:19.117Z"),
             success=True,
@@ -116,7 +490,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.ai_gateway.logs.with_raw_response.list(
-            id="my-gateway",
+            gateway_id="my-gateway",
             account_id="0d37909e38d3e99c29fa2cd343ac421a",
         )
 
@@ -128,7 +502,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.ai_gateway.logs.with_streaming_response.list(
-            id="my-gateway",
+            gateway_id="my-gateway",
             account_id="0d37909e38d3e99c29fa2cd343ac421a",
         ) as response:
             assert not response.is_closed
@@ -143,12 +517,330 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.ai_gateway.logs.with_raw_response.list(
-                id="my-gateway",
+                gateway_id="my-gateway",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
             await async_client.ai_gateway.logs.with_raw_response.list(
+                gateway_id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        log = await async_client.ai_gateway.logs.delete(
+            gateway_id="my-gateway",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+        )
+        assert_matches_type(LogDeleteResponse, log, path=["response"])
+
+    @parametrize
+    async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        log = await async_client.ai_gateway.logs.delete(
+            gateway_id="my-gateway",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            filters=[
+                {
+                    "key": "id",
+                    "operator": "eq",
+                    "value": ["string"],
+                }
+            ],
+            limit=1,
+            order_by="created_at",
+            order_by_direction="asc",
+        )
+        assert_matches_type(LogDeleteResponse, log, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.logs.with_raw_response.delete(
+            gateway_id="my-gateway",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        log = await response.parse()
+        assert_matches_type(LogDeleteResponse, log, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.logs.with_streaming_response.delete(
+            gateway_id="my-gateway",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            log = await response.parse()
+            assert_matches_type(LogDeleteResponse, log, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.logs.with_raw_response.delete(
+                gateway_id="my-gateway",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.logs.with_raw_response.delete(
+                gateway_id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        log = await async_client.ai_gateway.logs.edit(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+        assert_matches_type(object, log, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        log = await async_client.ai_gateway.logs.edit(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+            feedback=-1,
+            metadata={"foo": "string"},
+            score=0,
+        )
+        assert_matches_type(object, log, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.logs.with_raw_response.edit(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        log = await response.parse()
+        assert_matches_type(object, log, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.logs.with_streaming_response.edit(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            log = await response.parse()
+            assert_matches_type(object, log, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.logs.with_raw_response.edit(
+                id="id",
+                account_id="",
+                gateway_id="my-gateway",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.logs.with_raw_response.edit(
+                id="id",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.ai_gateway.logs.with_raw_response.edit(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="my-gateway",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        log = await async_client.ai_gateway.logs.get(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+        assert_matches_type(LogGetResponse, log, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.logs.with_raw_response.get(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        log = await response.parse()
+        assert_matches_type(LogGetResponse, log, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.logs.with_streaming_response.get(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            log = await response.parse()
+            assert_matches_type(LogGetResponse, log, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.logs.with_raw_response.get(
+                id="id",
+                account_id="",
+                gateway_id="my-gateway",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.logs.with_raw_response.get(
+                id="id",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.ai_gateway.logs.with_raw_response.get(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="my-gateway",
+            )
+
+    @parametrize
+    async def test_method_request(self, async_client: AsyncCloudflare) -> None:
+        log = await async_client.ai_gateway.logs.request(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+        assert_matches_type(object, log, path=["response"])
+
+    @parametrize
+    async def test_raw_response_request(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.logs.with_raw_response.request(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        log = await response.parse()
+        assert_matches_type(object, log, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_request(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.logs.with_streaming_response.request(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            log = await response.parse()
+            assert_matches_type(object, log, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_request(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.logs.with_raw_response.request(
+                id="id",
+                account_id="",
+                gateway_id="my-gateway",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.logs.with_raw_response.request(
+                id="id",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.ai_gateway.logs.with_raw_response.request(
+                id="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="my-gateway",
+            )
+
+    @parametrize
+    async def test_method_response(self, async_client: AsyncCloudflare) -> None:
+        log = await async_client.ai_gateway.logs.response(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+        assert_matches_type(object, log, path=["response"])
+
+    @parametrize
+    async def test_raw_response_response(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.logs.with_raw_response.response(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        log = await response.parse()
+        assert_matches_type(object, log, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_response(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.logs.with_streaming_response.response(
+            id="id",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            log = await response.parse()
+            assert_matches_type(object, log, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_response(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.logs.with_raw_response.response(
+                id="id",
+                account_id="",
+                gateway_id="my-gateway",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.logs.with_raw_response.response(
+                id="id",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.ai_gateway.logs.with_raw_response.response(
                 id="",
                 account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="my-gateway",
             )
diff --git a/tests/api_resources/ai_gateway/test_provider_configs.py b/tests/api_resources/ai_gateway/test_provider_configs.py
new file mode 100644
index 00000000000..c1add46928c
--- /dev/null
+++ b/tests/api_resources/ai_gateway/test_provider_configs.py
@@ -0,0 +1,324 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.ai_gateway import (
+    ProviderConfigListResponse,
+    ProviderConfigCreateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestProviderConfigs:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        provider_config = client.ai_gateway.provider_configs.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            alias="alias",
+            default_config=True,
+            provider_slug="provider_slug",
+            secret="secret",
+            secret_id="secret_id",
+        )
+        assert_matches_type(ProviderConfigCreateResponse, provider_config, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        provider_config = client.ai_gateway.provider_configs.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            alias="alias",
+            default_config=True,
+            provider_slug="provider_slug",
+            secret="secret",
+            secret_id="secret_id",
+            rate_limit=0,
+            rate_limit_period=0,
+        )
+        assert_matches_type(ProviderConfigCreateResponse, provider_config, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.provider_configs.with_raw_response.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            alias="alias",
+            default_config=True,
+            provider_slug="provider_slug",
+            secret="secret",
+            secret_id="secret_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        provider_config = response.parse()
+        assert_matches_type(ProviderConfigCreateResponse, provider_config, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.ai_gateway.provider_configs.with_streaming_response.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            alias="alias",
+            default_config=True,
+            provider_slug="provider_slug",
+            secret="secret",
+            secret_id="secret_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            provider_config = response.parse()
+            assert_matches_type(ProviderConfigCreateResponse, provider_config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.provider_configs.with_raw_response.create(
+                gateway_id="my-gateway",
+                account_id="",
+                alias="alias",
+                default_config=True,
+                provider_slug="provider_slug",
+                secret="secret",
+                secret_id="secret_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.provider_configs.with_raw_response.create(
+                gateway_id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                alias="alias",
+                default_config=True,
+                provider_slug="provider_slug",
+                secret="secret",
+                secret_id="secret_id",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        provider_config = client.ai_gateway.provider_configs.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ProviderConfigListResponse], provider_config, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        provider_config = client.ai_gateway.provider_configs.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ProviderConfigListResponse], provider_config, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.provider_configs.with_raw_response.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        provider_config = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[ProviderConfigListResponse], provider_config, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.ai_gateway.provider_configs.with_streaming_response.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            provider_config = response.parse()
+            assert_matches_type(
+                SyncV4PagePaginationArray[ProviderConfigListResponse], provider_config, path=["response"]
+            )
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.provider_configs.with_raw_response.list(
+                gateway_id="my-gateway",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.provider_configs.with_raw_response.list(
+                gateway_id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            )
+
+
+class TestAsyncProviderConfigs:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        provider_config = await async_client.ai_gateway.provider_configs.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            alias="alias",
+            default_config=True,
+            provider_slug="provider_slug",
+            secret="secret",
+            secret_id="secret_id",
+        )
+        assert_matches_type(ProviderConfigCreateResponse, provider_config, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        provider_config = await async_client.ai_gateway.provider_configs.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            alias="alias",
+            default_config=True,
+            provider_slug="provider_slug",
+            secret="secret",
+            secret_id="secret_id",
+            rate_limit=0,
+            rate_limit_period=0,
+        )
+        assert_matches_type(ProviderConfigCreateResponse, provider_config, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.provider_configs.with_raw_response.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            alias="alias",
+            default_config=True,
+            provider_slug="provider_slug",
+            secret="secret",
+            secret_id="secret_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        provider_config = await response.parse()
+        assert_matches_type(ProviderConfigCreateResponse, provider_config, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.provider_configs.with_streaming_response.create(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            alias="alias",
+            default_config=True,
+            provider_slug="provider_slug",
+            secret="secret",
+            secret_id="secret_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            provider_config = await response.parse()
+            assert_matches_type(ProviderConfigCreateResponse, provider_config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.provider_configs.with_raw_response.create(
+                gateway_id="my-gateway",
+                account_id="",
+                alias="alias",
+                default_config=True,
+                provider_slug="provider_slug",
+                secret="secret",
+                secret_id="secret_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.provider_configs.with_raw_response.create(
+                gateway_id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+                alias="alias",
+                default_config=True,
+                provider_slug="provider_slug",
+                secret="secret",
+                secret_id="secret_id",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        provider_config = await async_client.ai_gateway.provider_configs.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[ProviderConfigListResponse], provider_config, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        provider_config = await async_client.ai_gateway.provider_configs.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[ProviderConfigListResponse], provider_config, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.provider_configs.with_raw_response.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        provider_config = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[ProviderConfigListResponse], provider_config, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.provider_configs.with_streaming_response.list(
+            gateway_id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            provider_config = await response.parse()
+            assert_matches_type(
+                AsyncV4PagePaginationArray[ProviderConfigListResponse], provider_config, path=["response"]
+            )
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.provider_configs.with_raw_response.list(
+                gateway_id="my-gateway",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.provider_configs.with_raw_response.list(
+                gateway_id="",
+                account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            )
diff --git a/tests/api_resources/ai_gateway/test_urls.py b/tests/api_resources/ai_gateway/test_urls.py
new file mode 100644
index 00000000000..5dc57869a81
--- /dev/null
+++ b/tests/api_resources/ai_gateway/test_urls.py
@@ -0,0 +1,143 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestURLs:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        url = client.ai_gateway.urls.get(
+            provider="workers-ai",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+        assert_matches_type(str, url, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.ai_gateway.urls.with_raw_response.get(
+            provider="workers-ai",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        url = response.parse()
+        assert_matches_type(str, url, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.ai_gateway.urls.with_streaming_response.get(
+            provider="workers-ai",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            url = response.parse()
+            assert_matches_type(str, url, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai_gateway.urls.with_raw_response.get(
+                provider="workers-ai",
+                account_id="",
+                gateway_id="my-gateway",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            client.ai_gateway.urls.with_raw_response.get(
+                provider="workers-ai",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `provider` but received ''"):
+            client.ai_gateway.urls.with_raw_response.get(
+                provider="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="my-gateway",
+            )
+
+
+class TestAsyncURLs:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        url = await async_client.ai_gateway.urls.get(
+            provider="workers-ai",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+        assert_matches_type(str, url, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai_gateway.urls.with_raw_response.get(
+            provider="workers-ai",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        url = await response.parse()
+        assert_matches_type(str, url, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai_gateway.urls.with_streaming_response.get(
+            provider="workers-ai",
+            account_id="0d37909e38d3e99c29fa2cd343ac421a",
+            gateway_id="my-gateway",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            url = await response.parse()
+            assert_matches_type(str, url, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai_gateway.urls.with_raw_response.get(
+                provider="workers-ai",
+                account_id="",
+                gateway_id="my-gateway",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `gateway_id` but received ''"):
+            await async_client.ai_gateway.urls.with_raw_response.get(
+                provider="workers-ai",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `provider` but received ''"):
+            await async_client.ai_gateway.urls.with_raw_response.get(
+                provider="",
+                account_id="0d37909e38d3e99c29fa2cd343ac421a",
+                gateway_id="my-gateway",
+            )
diff --git a/tests/api_resources/dns/firewall/analytics/reports/__init__.py b/tests/api_resources/aisearch/__init__.py
similarity index 100%
rename from tests/api_resources/dns/firewall/analytics/reports/__init__.py
rename to tests/api_resources/aisearch/__init__.py
diff --git a/tests/api_resources/event_notifications/__init__.py b/tests/api_resources/aisearch/instances/__init__.py
similarity index 100%
rename from tests/api_resources/event_notifications/__init__.py
rename to tests/api_resources/aisearch/instances/__init__.py
diff --git a/tests/api_resources/aisearch/instances/test_items.py b/tests/api_resources/aisearch/instances/test_items.py
new file mode 100644
index 00000000000..1d2e15d03b9
--- /dev/null
+++ b/tests/api_resources/aisearch/instances/test_items.py
@@ -0,0 +1,265 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.aisearch.instances import ItemGetResponse, ItemListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestItems:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        item = client.aisearch.instances.items.list(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ItemListResponse], item, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        item = client.aisearch.instances.items.list(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            page=1,
+            per_page=0,
+            search="search",
+            status="queued",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ItemListResponse], item, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.aisearch.instances.items.with_raw_response.list(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        item = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[ItemListResponse], item, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.aisearch.instances.items.with_streaming_response.list(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            item = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[ItemListResponse], item, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.instances.items.with_raw_response.list(
+                id="my-ai-search",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.aisearch.instances.items.with_raw_response.list(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        item = client.aisearch.instances.items.get(
+            item_id="item_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+        )
+        assert_matches_type(ItemGetResponse, item, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.aisearch.instances.items.with_raw_response.get(
+            item_id="item_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        item = response.parse()
+        assert_matches_type(ItemGetResponse, item, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.aisearch.instances.items.with_streaming_response.get(
+            item_id="item_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            item = response.parse()
+            assert_matches_type(ItemGetResponse, item, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.instances.items.with_raw_response.get(
+                item_id="item_id",
+                account_id="",
+                id="my-ai-search",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.aisearch.instances.items.with_raw_response.get(
+                item_id="item_id",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+                id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `item_id` but received ''"):
+            client.aisearch.instances.items.with_raw_response.get(
+                item_id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+                id="my-ai-search",
+            )
+
+
+class TestAsyncItems:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        item = await async_client.aisearch.instances.items.list(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[ItemListResponse], item, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        item = await async_client.aisearch.instances.items.list(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            page=1,
+            per_page=0,
+            search="search",
+            status="queued",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[ItemListResponse], item, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.instances.items.with_raw_response.list(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        item = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[ItemListResponse], item, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.instances.items.with_streaming_response.list(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            item = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[ItemListResponse], item, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.instances.items.with_raw_response.list(
+                id="my-ai-search",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.aisearch.instances.items.with_raw_response.list(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        item = await async_client.aisearch.instances.items.get(
+            item_id="item_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+        )
+        assert_matches_type(ItemGetResponse, item, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.instances.items.with_raw_response.get(
+            item_id="item_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        item = await response.parse()
+        assert_matches_type(ItemGetResponse, item, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.instances.items.with_streaming_response.get(
+            item_id="item_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            item = await response.parse()
+            assert_matches_type(ItemGetResponse, item, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.instances.items.with_raw_response.get(
+                item_id="item_id",
+                account_id="",
+                id="my-ai-search",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.aisearch.instances.items.with_raw_response.get(
+                item_id="item_id",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+                id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `item_id` but received ''"):
+            await async_client.aisearch.instances.items.with_raw_response.get(
+                item_id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+                id="my-ai-search",
+            )
diff --git a/tests/api_resources/aisearch/instances/test_jobs.py b/tests/api_resources/aisearch/instances/test_jobs.py
new file mode 100644
index 00000000000..9fa2d6a28d4
--- /dev/null
+++ b/tests/api_resources/aisearch/instances/test_jobs.py
@@ -0,0 +1,504 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.aisearch.instances import (
+    JobGetResponse,
+    JobListResponse,
+    JobLogsResponse,
+    JobCreateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestJobs:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        job = client.aisearch.instances.jobs.create(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(JobCreateResponse, job, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.aisearch.instances.jobs.with_raw_response.create(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = response.parse()
+        assert_matches_type(JobCreateResponse, job, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.aisearch.instances.jobs.with_streaming_response.create(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = response.parse()
+            assert_matches_type(JobCreateResponse, job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.instances.jobs.with_raw_response.create(
+                id="my-ai-search",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.aisearch.instances.jobs.with_raw_response.create(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        job = client.aisearch.instances.jobs.list(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[JobListResponse], job, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        job = client.aisearch.instances.jobs.list(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            page=1,
+            per_page=0,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[JobListResponse], job, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.aisearch.instances.jobs.with_raw_response.list(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[JobListResponse], job, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.aisearch.instances.jobs.with_streaming_response.list(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[JobListResponse], job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.instances.jobs.with_raw_response.list(
+                id="my-ai-search",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.aisearch.instances.jobs.with_raw_response.list(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        job = client.aisearch.instances.jobs.get(
+            job_id="job_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+        )
+        assert_matches_type(JobGetResponse, job, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.aisearch.instances.jobs.with_raw_response.get(
+            job_id="job_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = response.parse()
+        assert_matches_type(JobGetResponse, job, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.aisearch.instances.jobs.with_streaming_response.get(
+            job_id="job_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = response.parse()
+            assert_matches_type(JobGetResponse, job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.instances.jobs.with_raw_response.get(
+                job_id="job_id",
+                account_id="",
+                id="my-ai-search",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.aisearch.instances.jobs.with_raw_response.get(
+                job_id="job_id",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+                id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `job_id` but received ''"):
+            client.aisearch.instances.jobs.with_raw_response.get(
+                job_id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+                id="my-ai-search",
+            )
+
+    @parametrize
+    def test_method_logs(self, client: Cloudflare) -> None:
+        job = client.aisearch.instances.jobs.logs(
+            job_id="job_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+        )
+        assert_matches_type(JobLogsResponse, job, path=["response"])
+
+    @parametrize
+    def test_method_logs_with_all_params(self, client: Cloudflare) -> None:
+        job = client.aisearch.instances.jobs.logs(
+            job_id="job_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+            page=1,
+            per_page=0,
+        )
+        assert_matches_type(JobLogsResponse, job, path=["response"])
+
+    @parametrize
+    def test_raw_response_logs(self, client: Cloudflare) -> None:
+        response = client.aisearch.instances.jobs.with_raw_response.logs(
+            job_id="job_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = response.parse()
+        assert_matches_type(JobLogsResponse, job, path=["response"])
+
+    @parametrize
+    def test_streaming_response_logs(self, client: Cloudflare) -> None:
+        with client.aisearch.instances.jobs.with_streaming_response.logs(
+            job_id="job_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = response.parse()
+            assert_matches_type(JobLogsResponse, job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_logs(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.instances.jobs.with_raw_response.logs(
+                job_id="job_id",
+                account_id="",
+                id="my-ai-search",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.aisearch.instances.jobs.with_raw_response.logs(
+                job_id="job_id",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+                id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `job_id` but received ''"):
+            client.aisearch.instances.jobs.with_raw_response.logs(
+                job_id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+                id="my-ai-search",
+            )
+
+
+class TestAsyncJobs:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        job = await async_client.aisearch.instances.jobs.create(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(JobCreateResponse, job, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.instances.jobs.with_raw_response.create(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = await response.parse()
+        assert_matches_type(JobCreateResponse, job, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.instances.jobs.with_streaming_response.create(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = await response.parse()
+            assert_matches_type(JobCreateResponse, job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.instances.jobs.with_raw_response.create(
+                id="my-ai-search",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.aisearch.instances.jobs.with_raw_response.create(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        job = await async_client.aisearch.instances.jobs.list(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[JobListResponse], job, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        job = await async_client.aisearch.instances.jobs.list(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            page=1,
+            per_page=0,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[JobListResponse], job, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.instances.jobs.with_raw_response.list(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[JobListResponse], job, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.instances.jobs.with_streaming_response.list(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[JobListResponse], job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.instances.jobs.with_raw_response.list(
+                id="my-ai-search",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.aisearch.instances.jobs.with_raw_response.list(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        job = await async_client.aisearch.instances.jobs.get(
+            job_id="job_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+        )
+        assert_matches_type(JobGetResponse, job, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.instances.jobs.with_raw_response.get(
+            job_id="job_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = await response.parse()
+        assert_matches_type(JobGetResponse, job, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.instances.jobs.with_streaming_response.get(
+            job_id="job_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = await response.parse()
+            assert_matches_type(JobGetResponse, job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.instances.jobs.with_raw_response.get(
+                job_id="job_id",
+                account_id="",
+                id="my-ai-search",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.aisearch.instances.jobs.with_raw_response.get(
+                job_id="job_id",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+                id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `job_id` but received ''"):
+            await async_client.aisearch.instances.jobs.with_raw_response.get(
+                job_id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+                id="my-ai-search",
+            )
+
+    @parametrize
+    async def test_method_logs(self, async_client: AsyncCloudflare) -> None:
+        job = await async_client.aisearch.instances.jobs.logs(
+            job_id="job_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+        )
+        assert_matches_type(JobLogsResponse, job, path=["response"])
+
+    @parametrize
+    async def test_method_logs_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        job = await async_client.aisearch.instances.jobs.logs(
+            job_id="job_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+            page=1,
+            per_page=0,
+        )
+        assert_matches_type(JobLogsResponse, job, path=["response"])
+
+    @parametrize
+    async def test_raw_response_logs(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.instances.jobs.with_raw_response.logs(
+            job_id="job_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = await response.parse()
+        assert_matches_type(JobLogsResponse, job, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_logs(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.instances.jobs.with_streaming_response.logs(
+            job_id="job_id",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = await response.parse()
+            assert_matches_type(JobLogsResponse, job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_logs(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.instances.jobs.with_raw_response.logs(
+                job_id="job_id",
+                account_id="",
+                id="my-ai-search",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.aisearch.instances.jobs.with_raw_response.logs(
+                job_id="job_id",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+                id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `job_id` but received ''"):
+            await async_client.aisearch.instances.jobs.with_raw_response.logs(
+                job_id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+                id="my-ai-search",
+            )
diff --git a/tests/api_resources/aisearch/test_instances.py b/tests/api_resources/aisearch/test_instances.py
new file mode 100644
index 00000000000..dfd32d9d6e8
--- /dev/null
+++ b/tests/api_resources/aisearch/test_instances.py
@@ -0,0 +1,1366 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.aisearch import (
+    InstanceListResponse,
+    InstanceReadResponse,
+    InstanceStatsResponse,
+    InstanceCreateResponse,
+    InstanceDeleteResponse,
+    InstanceSearchResponse,
+    InstanceUpdateResponse,
+    InstanceChatCompletionsResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestInstances:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        instance = client.aisearch.instances.create(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+            source="source",
+            type="r2",
+        )
+        assert_matches_type(InstanceCreateResponse, instance, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        instance = client.aisearch.instances.create(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+            source="source",
+            type="r2",
+            ai_gateway_id="ai_gateway_id",
+            aisearch_model="@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            chunk=True,
+            chunk_overlap=0,
+            chunk_size=64,
+            custom_metadata=[
+                {
+                    "data_type": "text",
+                    "field_name": "x",
+                }
+            ],
+            embedding_model="@cf/qwen/qwen3-embedding-0.6b",
+            hybrid_search_enabled=True,
+            max_num_results=1,
+            metadata={
+                "created_from_aisearch_wizard": True,
+                "worker_domain": "worker_domain",
+            },
+            public_endpoint_params={
+                "authorized_hosts": ["string"],
+                "chat_completions_endpoint": {"disabled": True},
+                "enabled": True,
+                "mcp": {"disabled": True},
+                "rate_limit": {
+                    "period_ms": 60000,
+                    "requests": 1,
+                    "technique": "fixed",
+                },
+                "search_endpoint": {"disabled": True},
+            },
+            reranking=True,
+            reranking_model="@cf/baai/bge-reranker-base",
+            rewrite_model="@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            rewrite_query=True,
+            score_threshold=0,
+            source_params={
+                "exclude_items": ["/admin/**", "/private/**", "**\\temp\\**"],
+                "include_items": ["/blog/**", "/docs/**/*.html", "**\\blog\\**.html"],
+                "prefix": "prefix",
+                "r2_jurisdiction": "r2_jurisdiction",
+                "web_crawler": {
+                    "parse_options": {
+                        "include_headers": {"foo": "string"},
+                        "include_images": True,
+                        "specific_sitemaps": [
+                            "https://example.com/sitemap.xml",
+                            "https://example.com/blog-sitemap.xml",
+                        ],
+                        "use_browser_rendering": True,
+                    },
+                    "parse_type": "sitemap",
+                    "store_options": {
+                        "storage_id": "storage_id",
+                        "r2_jurisdiction": "r2_jurisdiction",
+                        "storage_type": "r2",
+                    },
+                },
+            },
+            token_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(InstanceCreateResponse, instance, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.aisearch.instances.with_raw_response.create(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+            source="source",
+            type="r2",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = response.parse()
+        assert_matches_type(InstanceCreateResponse, instance, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.aisearch.instances.with_streaming_response.create(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+            source="source",
+            type="r2",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = response.parse()
+            assert_matches_type(InstanceCreateResponse, instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.instances.with_raw_response.create(
+                account_id="",
+                id="my-ai-search",
+                source="source",
+                type="r2",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        instance = client.aisearch.instances.update(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(InstanceUpdateResponse, instance, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        instance = client.aisearch.instances.update(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            ai_gateway_id="ai_gateway_id",
+            aisearch_model="@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            cache=True,
+            cache_threshold="super_strict_match",
+            chunk=True,
+            chunk_overlap=0,
+            chunk_size=64,
+            custom_metadata=[
+                {
+                    "data_type": "text",
+                    "field_name": "x",
+                }
+            ],
+            embedding_model="@cf/qwen/qwen3-embedding-0.6b",
+            hybrid_search_enabled=True,
+            max_num_results=1,
+            metadata={
+                "created_from_aisearch_wizard": True,
+                "worker_domain": "worker_domain",
+            },
+            paused=True,
+            public_endpoint_params={
+                "authorized_hosts": ["string"],
+                "chat_completions_endpoint": {"disabled": True},
+                "enabled": True,
+                "mcp": {"disabled": True},
+                "rate_limit": {
+                    "period_ms": 60000,
+                    "requests": 1,
+                    "technique": "fixed",
+                },
+                "search_endpoint": {"disabled": True},
+            },
+            reranking=True,
+            reranking_model="@cf/baai/bge-reranker-base",
+            rewrite_model="@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            rewrite_query=True,
+            score_threshold=0,
+            source_params={
+                "exclude_items": ["/admin/**", "/private/**", "**\\temp\\**"],
+                "include_items": ["/blog/**", "/docs/**/*.html", "**\\blog\\**.html"],
+                "prefix": "prefix",
+                "r2_jurisdiction": "r2_jurisdiction",
+                "web_crawler": {
+                    "parse_options": {
+                        "include_headers": {"foo": "string"},
+                        "include_images": True,
+                        "specific_sitemaps": [
+                            "https://example.com/sitemap.xml",
+                            "https://example.com/blog-sitemap.xml",
+                        ],
+                        "use_browser_rendering": True,
+                    },
+                    "parse_type": "sitemap",
+                    "store_options": {
+                        "storage_id": "storage_id",
+                        "r2_jurisdiction": "r2_jurisdiction",
+                        "storage_type": "r2",
+                    },
+                },
+            },
+            summarization=True,
+            summarization_model="@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            system_prompt_aisearch="system_prompt_ai_search",
+            system_prompt_index_summarization="system_prompt_index_summarization",
+            system_prompt_rewrite_query="system_prompt_rewrite_query",
+            token_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(InstanceUpdateResponse, instance, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.aisearch.instances.with_raw_response.update(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = response.parse()
+        assert_matches_type(InstanceUpdateResponse, instance, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.aisearch.instances.with_streaming_response.update(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = response.parse()
+            assert_matches_type(InstanceUpdateResponse, instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.instances.with_raw_response.update(
+                id="my-ai-search",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.aisearch.instances.with_raw_response.update(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        instance = client.aisearch.instances.list(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[InstanceListResponse], instance, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        instance = client.aisearch.instances.list(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            page=1,
+            per_page=1,
+            search="search",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[InstanceListResponse], instance, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.aisearch.instances.with_raw_response.list(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[InstanceListResponse], instance, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.aisearch.instances.with_streaming_response.list(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[InstanceListResponse], instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.instances.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        instance = client.aisearch.instances.delete(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(InstanceDeleteResponse, instance, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.aisearch.instances.with_raw_response.delete(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = response.parse()
+        assert_matches_type(InstanceDeleteResponse, instance, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.aisearch.instances.with_streaming_response.delete(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = response.parse()
+            assert_matches_type(InstanceDeleteResponse, instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.instances.with_raw_response.delete(
+                id="my-ai-search",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.aisearch.instances.with_raw_response.delete(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            )
+
+    @parametrize
+    def test_method_chat_completions(self, client: Cloudflare) -> None:
+        instance = client.aisearch.instances.chat_completions(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "system",
+                }
+            ],
+        )
+        assert_matches_type(InstanceChatCompletionsResponse, instance, path=["response"])
+
+    @parametrize
+    def test_method_chat_completions_with_all_params(self, client: Cloudflare) -> None:
+        instance = client.aisearch.instances.chat_completions(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "system",
+                }
+            ],
+            aisearch_options={
+                "query_rewrite": {
+                    "enabled": True,
+                    "model": "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+                    "rewrite_prompt": "rewrite_prompt",
+                },
+                "reranking": {
+                    "enabled": True,
+                    "match_threshold": 0,
+                    "model": "@cf/baai/bge-reranker-base",
+                },
+                "retrieval": {
+                    "context_expansion": 0,
+                    "filters": {
+                        "key": "key",
+                        "type": "eq",
+                        "value": "string",
+                    },
+                    "match_threshold": 0,
+                    "max_num_results": 1,
+                    "retrieval_type": "vector",
+                },
+            },
+            model="@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            stream=True,
+        )
+        assert_matches_type(InstanceChatCompletionsResponse, instance, path=["response"])
+
+    @parametrize
+    def test_raw_response_chat_completions(self, client: Cloudflare) -> None:
+        response = client.aisearch.instances.with_raw_response.chat_completions(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "system",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = response.parse()
+        assert_matches_type(InstanceChatCompletionsResponse, instance, path=["response"])
+
+    @parametrize
+    def test_streaming_response_chat_completions(self, client: Cloudflare) -> None:
+        with client.aisearch.instances.with_streaming_response.chat_completions(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "system",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = response.parse()
+            assert_matches_type(InstanceChatCompletionsResponse, instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_chat_completions(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.instances.with_raw_response.chat_completions(
+                id="my-ai-search",
+                account_id="",
+                messages=[
+                    {
+                        "content": "content",
+                        "role": "system",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.aisearch.instances.with_raw_response.chat_completions(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+                messages=[
+                    {
+                        "content": "content",
+                        "role": "system",
+                    }
+                ],
+            )
+
+    @parametrize
+    def test_method_read(self, client: Cloudflare) -> None:
+        instance = client.aisearch.instances.read(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(InstanceReadResponse, instance, path=["response"])
+
+    @parametrize
+    def test_raw_response_read(self, client: Cloudflare) -> None:
+        response = client.aisearch.instances.with_raw_response.read(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = response.parse()
+        assert_matches_type(InstanceReadResponse, instance, path=["response"])
+
+    @parametrize
+    def test_streaming_response_read(self, client: Cloudflare) -> None:
+        with client.aisearch.instances.with_streaming_response.read(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = response.parse()
+            assert_matches_type(InstanceReadResponse, instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_read(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.instances.with_raw_response.read(
+                id="my-ai-search",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.aisearch.instances.with_raw_response.read(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            )
+
+    @parametrize
+    def test_method_search(self, client: Cloudflare) -> None:
+        instance = client.aisearch.instances.search(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "system",
+                }
+            ],
+        )
+        assert_matches_type(InstanceSearchResponse, instance, path=["response"])
+
+    @parametrize
+    def test_method_search_with_all_params(self, client: Cloudflare) -> None:
+        instance = client.aisearch.instances.search(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "system",
+                }
+            ],
+            aisearch_options={
+                "query_rewrite": {
+                    "enabled": True,
+                    "model": "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+                    "rewrite_prompt": "rewrite_prompt",
+                },
+                "reranking": {
+                    "enabled": True,
+                    "match_threshold": 0,
+                    "model": "@cf/baai/bge-reranker-base",
+                },
+                "retrieval": {
+                    "context_expansion": 0,
+                    "filters": {
+                        "key": "key",
+                        "type": "eq",
+                        "value": "string",
+                    },
+                    "match_threshold": 0,
+                    "max_num_results": 1,
+                    "retrieval_type": "vector",
+                },
+            },
+        )
+        assert_matches_type(InstanceSearchResponse, instance, path=["response"])
+
+    @parametrize
+    def test_raw_response_search(self, client: Cloudflare) -> None:
+        response = client.aisearch.instances.with_raw_response.search(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "system",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = response.parse()
+        assert_matches_type(InstanceSearchResponse, instance, path=["response"])
+
+    @parametrize
+    def test_streaming_response_search(self, client: Cloudflare) -> None:
+        with client.aisearch.instances.with_streaming_response.search(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "system",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = response.parse()
+            assert_matches_type(InstanceSearchResponse, instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_search(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.instances.with_raw_response.search(
+                id="my-ai-search",
+                account_id="",
+                messages=[
+                    {
+                        "content": "content",
+                        "role": "system",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.aisearch.instances.with_raw_response.search(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+                messages=[
+                    {
+                        "content": "content",
+                        "role": "system",
+                    }
+                ],
+            )
+
+    @parametrize
+    def test_method_stats(self, client: Cloudflare) -> None:
+        instance = client.aisearch.instances.stats(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(InstanceStatsResponse, instance, path=["response"])
+
+    @parametrize
+    def test_raw_response_stats(self, client: Cloudflare) -> None:
+        response = client.aisearch.instances.with_raw_response.stats(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = response.parse()
+        assert_matches_type(InstanceStatsResponse, instance, path=["response"])
+
+    @parametrize
+    def test_streaming_response_stats(self, client: Cloudflare) -> None:
+        with client.aisearch.instances.with_streaming_response.stats(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = response.parse()
+            assert_matches_type(InstanceStatsResponse, instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_stats(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.instances.with_raw_response.stats(
+                id="my-ai-search",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.aisearch.instances.with_raw_response.stats(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            )
+
+
+class TestAsyncInstances:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.aisearch.instances.create(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+            source="source",
+            type="r2",
+        )
+        assert_matches_type(InstanceCreateResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.aisearch.instances.create(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+            source="source",
+            type="r2",
+            ai_gateway_id="ai_gateway_id",
+            aisearch_model="@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            chunk=True,
+            chunk_overlap=0,
+            chunk_size=64,
+            custom_metadata=[
+                {
+                    "data_type": "text",
+                    "field_name": "x",
+                }
+            ],
+            embedding_model="@cf/qwen/qwen3-embedding-0.6b",
+            hybrid_search_enabled=True,
+            max_num_results=1,
+            metadata={
+                "created_from_aisearch_wizard": True,
+                "worker_domain": "worker_domain",
+            },
+            public_endpoint_params={
+                "authorized_hosts": ["string"],
+                "chat_completions_endpoint": {"disabled": True},
+                "enabled": True,
+                "mcp": {"disabled": True},
+                "rate_limit": {
+                    "period_ms": 60000,
+                    "requests": 1,
+                    "technique": "fixed",
+                },
+                "search_endpoint": {"disabled": True},
+            },
+            reranking=True,
+            reranking_model="@cf/baai/bge-reranker-base",
+            rewrite_model="@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            rewrite_query=True,
+            score_threshold=0,
+            source_params={
+                "exclude_items": ["/admin/**", "/private/**", "**\\temp\\**"],
+                "include_items": ["/blog/**", "/docs/**/*.html", "**\\blog\\**.html"],
+                "prefix": "prefix",
+                "r2_jurisdiction": "r2_jurisdiction",
+                "web_crawler": {
+                    "parse_options": {
+                        "include_headers": {"foo": "string"},
+                        "include_images": True,
+                        "specific_sitemaps": [
+                            "https://example.com/sitemap.xml",
+                            "https://example.com/blog-sitemap.xml",
+                        ],
+                        "use_browser_rendering": True,
+                    },
+                    "parse_type": "sitemap",
+                    "store_options": {
+                        "storage_id": "storage_id",
+                        "r2_jurisdiction": "r2_jurisdiction",
+                        "storage_type": "r2",
+                    },
+                },
+            },
+            token_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(InstanceCreateResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.instances.with_raw_response.create(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+            source="source",
+            type="r2",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = await response.parse()
+        assert_matches_type(InstanceCreateResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.instances.with_streaming_response.create(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            id="my-ai-search",
+            source="source",
+            type="r2",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = await response.parse()
+            assert_matches_type(InstanceCreateResponse, instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.instances.with_raw_response.create(
+                account_id="",
+                id="my-ai-search",
+                source="source",
+                type="r2",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.aisearch.instances.update(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(InstanceUpdateResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.aisearch.instances.update(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            ai_gateway_id="ai_gateway_id",
+            aisearch_model="@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            cache=True,
+            cache_threshold="super_strict_match",
+            chunk=True,
+            chunk_overlap=0,
+            chunk_size=64,
+            custom_metadata=[
+                {
+                    "data_type": "text",
+                    "field_name": "x",
+                }
+            ],
+            embedding_model="@cf/qwen/qwen3-embedding-0.6b",
+            hybrid_search_enabled=True,
+            max_num_results=1,
+            metadata={
+                "created_from_aisearch_wizard": True,
+                "worker_domain": "worker_domain",
+            },
+            paused=True,
+            public_endpoint_params={
+                "authorized_hosts": ["string"],
+                "chat_completions_endpoint": {"disabled": True},
+                "enabled": True,
+                "mcp": {"disabled": True},
+                "rate_limit": {
+                    "period_ms": 60000,
+                    "requests": 1,
+                    "technique": "fixed",
+                },
+                "search_endpoint": {"disabled": True},
+            },
+            reranking=True,
+            reranking_model="@cf/baai/bge-reranker-base",
+            rewrite_model="@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            rewrite_query=True,
+            score_threshold=0,
+            source_params={
+                "exclude_items": ["/admin/**", "/private/**", "**\\temp\\**"],
+                "include_items": ["/blog/**", "/docs/**/*.html", "**\\blog\\**.html"],
+                "prefix": "prefix",
+                "r2_jurisdiction": "r2_jurisdiction",
+                "web_crawler": {
+                    "parse_options": {
+                        "include_headers": {"foo": "string"},
+                        "include_images": True,
+                        "specific_sitemaps": [
+                            "https://example.com/sitemap.xml",
+                            "https://example.com/blog-sitemap.xml",
+                        ],
+                        "use_browser_rendering": True,
+                    },
+                    "parse_type": "sitemap",
+                    "store_options": {
+                        "storage_id": "storage_id",
+                        "r2_jurisdiction": "r2_jurisdiction",
+                        "storage_type": "r2",
+                    },
+                },
+            },
+            summarization=True,
+            summarization_model="@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            system_prompt_aisearch="system_prompt_ai_search",
+            system_prompt_index_summarization="system_prompt_index_summarization",
+            system_prompt_rewrite_query="system_prompt_rewrite_query",
+            token_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(InstanceUpdateResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.instances.with_raw_response.update(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = await response.parse()
+        assert_matches_type(InstanceUpdateResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.instances.with_streaming_response.update(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = await response.parse()
+            assert_matches_type(InstanceUpdateResponse, instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.instances.with_raw_response.update(
+                id="my-ai-search",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.aisearch.instances.with_raw_response.update(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.aisearch.instances.list(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[InstanceListResponse], instance, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.aisearch.instances.list(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            page=1,
+            per_page=1,
+            search="search",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[InstanceListResponse], instance, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.instances.with_raw_response.list(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[InstanceListResponse], instance, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.instances.with_streaming_response.list(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[InstanceListResponse], instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.instances.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.aisearch.instances.delete(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(InstanceDeleteResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.instances.with_raw_response.delete(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = await response.parse()
+        assert_matches_type(InstanceDeleteResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.instances.with_streaming_response.delete(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = await response.parse()
+            assert_matches_type(InstanceDeleteResponse, instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.instances.with_raw_response.delete(
+                id="my-ai-search",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.aisearch.instances.with_raw_response.delete(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            )
+
+    @parametrize
+    async def test_method_chat_completions(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.aisearch.instances.chat_completions(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "system",
+                }
+            ],
+        )
+        assert_matches_type(InstanceChatCompletionsResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_method_chat_completions_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.aisearch.instances.chat_completions(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "system",
+                }
+            ],
+            aisearch_options={
+                "query_rewrite": {
+                    "enabled": True,
+                    "model": "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+                    "rewrite_prompt": "rewrite_prompt",
+                },
+                "reranking": {
+                    "enabled": True,
+                    "match_threshold": 0,
+                    "model": "@cf/baai/bge-reranker-base",
+                },
+                "retrieval": {
+                    "context_expansion": 0,
+                    "filters": {
+                        "key": "key",
+                        "type": "eq",
+                        "value": "string",
+                    },
+                    "match_threshold": 0,
+                    "max_num_results": 1,
+                    "retrieval_type": "vector",
+                },
+            },
+            model="@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+            stream=True,
+        )
+        assert_matches_type(InstanceChatCompletionsResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_raw_response_chat_completions(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.instances.with_raw_response.chat_completions(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "system",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = await response.parse()
+        assert_matches_type(InstanceChatCompletionsResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_chat_completions(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.instances.with_streaming_response.chat_completions(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "system",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = await response.parse()
+            assert_matches_type(InstanceChatCompletionsResponse, instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_chat_completions(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.instances.with_raw_response.chat_completions(
+                id="my-ai-search",
+                account_id="",
+                messages=[
+                    {
+                        "content": "content",
+                        "role": "system",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.aisearch.instances.with_raw_response.chat_completions(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+                messages=[
+                    {
+                        "content": "content",
+                        "role": "system",
+                    }
+                ],
+            )
+
+    @parametrize
+    async def test_method_read(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.aisearch.instances.read(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(InstanceReadResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_raw_response_read(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.instances.with_raw_response.read(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = await response.parse()
+        assert_matches_type(InstanceReadResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_read(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.instances.with_streaming_response.read(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = await response.parse()
+            assert_matches_type(InstanceReadResponse, instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_read(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.instances.with_raw_response.read(
+                id="my-ai-search",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.aisearch.instances.with_raw_response.read(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            )
+
+    @parametrize
+    async def test_method_search(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.aisearch.instances.search(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "system",
+                }
+            ],
+        )
+        assert_matches_type(InstanceSearchResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_method_search_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.aisearch.instances.search(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "system",
+                }
+            ],
+            aisearch_options={
+                "query_rewrite": {
+                    "enabled": True,
+                    "model": "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+                    "rewrite_prompt": "rewrite_prompt",
+                },
+                "reranking": {
+                    "enabled": True,
+                    "match_threshold": 0,
+                    "model": "@cf/baai/bge-reranker-base",
+                },
+                "retrieval": {
+                    "context_expansion": 0,
+                    "filters": {
+                        "key": "key",
+                        "type": "eq",
+                        "value": "string",
+                    },
+                    "match_threshold": 0,
+                    "max_num_results": 1,
+                    "retrieval_type": "vector",
+                },
+            },
+        )
+        assert_matches_type(InstanceSearchResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_raw_response_search(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.instances.with_raw_response.search(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "system",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = await response.parse()
+        assert_matches_type(InstanceSearchResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_search(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.instances.with_streaming_response.search(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "system",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = await response.parse()
+            assert_matches_type(InstanceSearchResponse, instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_search(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.instances.with_raw_response.search(
+                id="my-ai-search",
+                account_id="",
+                messages=[
+                    {
+                        "content": "content",
+                        "role": "system",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.aisearch.instances.with_raw_response.search(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+                messages=[
+                    {
+                        "content": "content",
+                        "role": "system",
+                    }
+                ],
+            )
+
+    @parametrize
+    async def test_method_stats(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.aisearch.instances.stats(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(InstanceStatsResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_raw_response_stats(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.instances.with_raw_response.stats(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = await response.parse()
+        assert_matches_type(InstanceStatsResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_stats(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.instances.with_streaming_response.stats(
+            id="my-ai-search",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = await response.parse()
+            assert_matches_type(InstanceStatsResponse, instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_stats(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.instances.with_raw_response.stats(
+                id="my-ai-search",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.aisearch.instances.with_raw_response.stats(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            )
diff --git a/tests/api_resources/aisearch/test_tokens.py b/tests/api_resources/aisearch/test_tokens.py
new file mode 100644
index 00000000000..92ab27fd1db
--- /dev/null
+++ b/tests/api_resources/aisearch/test_tokens.py
@@ -0,0 +1,543 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.aisearch import (
+    TokenListResponse,
+    TokenReadResponse,
+    TokenCreateResponse,
+    TokenDeleteResponse,
+    TokenUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestTokens:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        token = client.aisearch.tokens.create(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            cf_api_id="cf_api_id",
+            cf_api_key="cf_api_key",
+            name="name",
+        )
+        assert_matches_type(TokenCreateResponse, token, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.aisearch.tokens.with_raw_response.create(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            cf_api_id="cf_api_id",
+            cf_api_key="cf_api_key",
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = response.parse()
+        assert_matches_type(TokenCreateResponse, token, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.aisearch.tokens.with_streaming_response.create(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            cf_api_id="cf_api_id",
+            cf_api_key="cf_api_key",
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = response.parse()
+            assert_matches_type(TokenCreateResponse, token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.tokens.with_raw_response.create(
+                account_id="",
+                cf_api_id="cf_api_id",
+                cf_api_key="cf_api_key",
+                name="name",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        token = client.aisearch.tokens.update(
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            cf_api_id="cf_api_id",
+            cf_api_key="cf_api_key",
+            name="name",
+        )
+        assert_matches_type(TokenUpdateResponse, token, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.aisearch.tokens.with_raw_response.update(
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            cf_api_id="cf_api_id",
+            cf_api_key="cf_api_key",
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = response.parse()
+        assert_matches_type(TokenUpdateResponse, token, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.aisearch.tokens.with_streaming_response.update(
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            cf_api_id="cf_api_id",
+            cf_api_key="cf_api_key",
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = response.parse()
+            assert_matches_type(TokenUpdateResponse, token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.tokens.with_raw_response.update(
+                id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                cf_api_id="cf_api_id",
+                cf_api_key="cf_api_key",
+                name="name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.aisearch.tokens.with_raw_response.update(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+                cf_api_id="cf_api_id",
+                cf_api_key="cf_api_key",
+                name="name",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        token = client.aisearch.tokens.list(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[TokenListResponse], token, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        token = client.aisearch.tokens.list(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[TokenListResponse], token, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.aisearch.tokens.with_raw_response.list(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[TokenListResponse], token, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.aisearch.tokens.with_streaming_response.list(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[TokenListResponse], token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.tokens.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        token = client.aisearch.tokens.delete(
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(TokenDeleteResponse, token, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.aisearch.tokens.with_raw_response.delete(
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = response.parse()
+        assert_matches_type(TokenDeleteResponse, token, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.aisearch.tokens.with_streaming_response.delete(
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = response.parse()
+            assert_matches_type(TokenDeleteResponse, token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.tokens.with_raw_response.delete(
+                id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.aisearch.tokens.with_raw_response.delete(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            )
+
+    @parametrize
+    def test_method_read(self, client: Cloudflare) -> None:
+        token = client.aisearch.tokens.read(
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(TokenReadResponse, token, path=["response"])
+
+    @parametrize
+    def test_raw_response_read(self, client: Cloudflare) -> None:
+        response = client.aisearch.tokens.with_raw_response.read(
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = response.parse()
+        assert_matches_type(TokenReadResponse, token, path=["response"])
+
+    @parametrize
+    def test_streaming_response_read(self, client: Cloudflare) -> None:
+        with client.aisearch.tokens.with_streaming_response.read(
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = response.parse()
+            assert_matches_type(TokenReadResponse, token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_read(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.aisearch.tokens.with_raw_response.read(
+                id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.aisearch.tokens.with_raw_response.read(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            )
+
+
+class TestAsyncTokens:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        token = await async_client.aisearch.tokens.create(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            cf_api_id="cf_api_id",
+            cf_api_key="cf_api_key",
+            name="name",
+        )
+        assert_matches_type(TokenCreateResponse, token, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.tokens.with_raw_response.create(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            cf_api_id="cf_api_id",
+            cf_api_key="cf_api_key",
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = await response.parse()
+        assert_matches_type(TokenCreateResponse, token, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.tokens.with_streaming_response.create(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            cf_api_id="cf_api_id",
+            cf_api_key="cf_api_key",
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = await response.parse()
+            assert_matches_type(TokenCreateResponse, token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.tokens.with_raw_response.create(
+                account_id="",
+                cf_api_id="cf_api_id",
+                cf_api_key="cf_api_key",
+                name="name",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        token = await async_client.aisearch.tokens.update(
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            cf_api_id="cf_api_id",
+            cf_api_key="cf_api_key",
+            name="name",
+        )
+        assert_matches_type(TokenUpdateResponse, token, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.tokens.with_raw_response.update(
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            cf_api_id="cf_api_id",
+            cf_api_key="cf_api_key",
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = await response.parse()
+        assert_matches_type(TokenUpdateResponse, token, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.tokens.with_streaming_response.update(
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            cf_api_id="cf_api_id",
+            cf_api_key="cf_api_key",
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = await response.parse()
+            assert_matches_type(TokenUpdateResponse, token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.tokens.with_raw_response.update(
+                id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                cf_api_id="cf_api_id",
+                cf_api_key="cf_api_key",
+                name="name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.aisearch.tokens.with_raw_response.update(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+                cf_api_id="cf_api_id",
+                cf_api_key="cf_api_key",
+                name="name",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        token = await async_client.aisearch.tokens.list(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[TokenListResponse], token, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        token = await async_client.aisearch.tokens.list(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[TokenListResponse], token, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.tokens.with_raw_response.list(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[TokenListResponse], token, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.tokens.with_streaming_response.list(
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[TokenListResponse], token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.tokens.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        token = await async_client.aisearch.tokens.delete(
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(TokenDeleteResponse, token, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.tokens.with_raw_response.delete(
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = await response.parse()
+        assert_matches_type(TokenDeleteResponse, token, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.tokens.with_streaming_response.delete(
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = await response.parse()
+            assert_matches_type(TokenDeleteResponse, token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.tokens.with_raw_response.delete(
+                id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.aisearch.tokens.with_raw_response.delete(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            )
+
+    @parametrize
+    async def test_method_read(self, async_client: AsyncCloudflare) -> None:
+        token = await async_client.aisearch.tokens.read(
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+        assert_matches_type(TokenReadResponse, token, path=["response"])
+
+    @parametrize
+    async def test_raw_response_read(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.aisearch.tokens.with_raw_response.read(
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = await response.parse()
+        assert_matches_type(TokenReadResponse, token, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_read(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.aisearch.tokens.with_streaming_response.read(
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = await response.parse()
+            assert_matches_type(TokenReadResponse, token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_read(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.aisearch.tokens.with_raw_response.read(
+                id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.aisearch.tokens.with_raw_response.read(
+                id="",
+                account_id="c3dc5f0b34a14ff8e1b3ec04895e1b22",
+            )
diff --git a/tests/api_resources/alerting/destinations/test_eligible.py b/tests/api_resources/alerting/destinations/test_eligible.py
index ee7c9caff3e..84d19adcb16 100644
--- a/tests/api_resources/alerting/destinations/test_eligible.py
+++ b/tests/api_resources/alerting/destinations/test_eligible.py
@@ -57,7 +57,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncEligible:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/alerting/destinations/test_pagerduty.py b/tests/api_resources/alerting/destinations/test_pagerduty.py
index 05247187082..0df4266e854 100644
--- a/tests/api_resources/alerting/destinations/test_pagerduty.py
+++ b/tests/api_resources/alerting/destinations/test_pagerduty.py
@@ -9,8 +9,9 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.alerting.destinations import (
-    PagerdutyGetResponse,
+    Pagerduty,
     PagerdutyLinkResponse,
     PagerdutyCreateResponse,
     PagerdutyDeleteResponse,
@@ -115,7 +116,7 @@ def test_method_get(self, client: Cloudflare) -> None:
         pagerduty = client.alerting.destinations.pagerduty.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[PagerdutyGetResponse], pagerduty, path=["response"])
+        assert_matches_type(SyncSinglePage[Pagerduty], pagerduty, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -126,7 +127,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         pagerduty = response.parse()
-        assert_matches_type(Optional[PagerdutyGetResponse], pagerduty, path=["response"])
+        assert_matches_type(SyncSinglePage[Pagerduty], pagerduty, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -137,7 +138,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             pagerduty = response.parse()
-            assert_matches_type(Optional[PagerdutyGetResponse], pagerduty, path=["response"])
+            assert_matches_type(SyncSinglePage[Pagerduty], pagerduty, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -210,7 +211,9 @@ def test_path_params_link(self, client: Cloudflare) -> None:
 
 
 class TestAsyncPagerduty:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4285"
@@ -305,7 +308,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         pagerduty = await async_client.alerting.destinations.pagerduty.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[PagerdutyGetResponse], pagerduty, path=["response"])
+        assert_matches_type(AsyncSinglePage[Pagerduty], pagerduty, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -316,7 +319,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         pagerduty = await response.parse()
-        assert_matches_type(Optional[PagerdutyGetResponse], pagerduty, path=["response"])
+        assert_matches_type(AsyncSinglePage[Pagerduty], pagerduty, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -327,7 +330,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             pagerduty = await response.parse()
-            assert_matches_type(Optional[PagerdutyGetResponse], pagerduty, path=["response"])
+            assert_matches_type(AsyncSinglePage[Pagerduty], pagerduty, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/alerting/destinations/test_webhooks.py b/tests/api_resources/alerting/destinations/test_webhooks.py
index ea816e0bdbf..18717c96efa 100644
--- a/tests/api_resources/alerting/destinations/test_webhooks.py
+++ b/tests/api_resources/alerting/destinations/test_webhooks.py
@@ -100,7 +100,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         webhook = client.alerting.destinations.webhooks.update(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="Slack Webhook",
             url="https://hooks.slack.com/services/Ds3fdBFbV/456464Gdd",
@@ -113,7 +113,7 @@ def test_method_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         webhook = client.alerting.destinations.webhooks.update(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="Slack Webhook",
             url="https://hooks.slack.com/services/Ds3fdBFbV/456464Gdd",
@@ -127,7 +127,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.alerting.destinations.webhooks.with_raw_response.update(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="Slack Webhook",
             url="https://hooks.slack.com/services/Ds3fdBFbV/456464Gdd",
@@ -144,7 +144,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.alerting.destinations.webhooks.with_streaming_response.update(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="Slack Webhook",
             url="https://hooks.slack.com/services/Ds3fdBFbV/456464Gdd",
@@ -164,7 +164,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.alerting.destinations.webhooks.with_raw_response.update(
-                webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+                webhook_id="b115d5ec15c641ee8b7692c449b5227b",
                 account_id="",
                 name="Slack Webhook",
                 url="https://hooks.slack.com/services/Ds3fdBFbV/456464Gdd",
@@ -219,7 +219,7 @@ def test_path_params_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         webhook = client.alerting.destinations.webhooks.delete(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(WebhookDeleteResponse, webhook, path=["response"])
@@ -227,7 +227,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.alerting.destinations.webhooks.with_raw_response.delete(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -239,7 +239,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.alerting.destinations.webhooks.with_streaming_response.delete(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -254,7 +254,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.alerting.destinations.webhooks.with_raw_response.delete(
-                webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+                webhook_id="b115d5ec15c641ee8b7692c449b5227b",
                 account_id="",
             )
 
@@ -270,7 +270,7 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         webhook = client.alerting.destinations.webhooks.get(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Webhooks], webhook, path=["response"])
@@ -281,7 +281,7 @@ def test_method_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.alerting.destinations.webhooks.with_raw_response.get(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -296,7 +296,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.alerting.destinations.webhooks.with_streaming_response.get(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -314,7 +314,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.alerting.destinations.webhooks.with_raw_response.get(
-                webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+                webhook_id="b115d5ec15c641ee8b7692c449b5227b",
                 account_id="",
             )
 
@@ -326,7 +326,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncWebhooks:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4291"
@@ -405,7 +407,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         webhook = await async_client.alerting.destinations.webhooks.update(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="Slack Webhook",
             url="https://hooks.slack.com/services/Ds3fdBFbV/456464Gdd",
@@ -418,7 +420,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         webhook = await async_client.alerting.destinations.webhooks.update(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="Slack Webhook",
             url="https://hooks.slack.com/services/Ds3fdBFbV/456464Gdd",
@@ -432,7 +434,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.alerting.destinations.webhooks.with_raw_response.update(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="Slack Webhook",
             url="https://hooks.slack.com/services/Ds3fdBFbV/456464Gdd",
@@ -449,7 +451,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.alerting.destinations.webhooks.with_streaming_response.update(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="Slack Webhook",
             url="https://hooks.slack.com/services/Ds3fdBFbV/456464Gdd",
@@ -469,7 +471,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.alerting.destinations.webhooks.with_raw_response.update(
-                webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+                webhook_id="b115d5ec15c641ee8b7692c449b5227b",
                 account_id="",
                 name="Slack Webhook",
                 url="https://hooks.slack.com/services/Ds3fdBFbV/456464Gdd",
@@ -524,7 +526,7 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         webhook = await async_client.alerting.destinations.webhooks.delete(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(WebhookDeleteResponse, webhook, path=["response"])
@@ -532,7 +534,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.alerting.destinations.webhooks.with_raw_response.delete(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -544,7 +546,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.alerting.destinations.webhooks.with_streaming_response.delete(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -559,7 +561,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.alerting.destinations.webhooks.with_raw_response.delete(
-                webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+                webhook_id="b115d5ec15c641ee8b7692c449b5227b",
                 account_id="",
             )
 
@@ -575,7 +577,7 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         webhook = await async_client.alerting.destinations.webhooks.get(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Webhooks], webhook, path=["response"])
@@ -586,7 +588,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.alerting.destinations.webhooks.with_raw_response.get(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -601,7 +603,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.alerting.destinations.webhooks.with_streaming_response.get(
-            webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+            webhook_id="b115d5ec15c641ee8b7692c449b5227b",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -619,7 +621,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.alerting.destinations.webhooks.with_raw_response.get(
-                webhook_id="b115d5ec-15c6-41ee-8b76-92c449b5227b",
+                webhook_id="b115d5ec15c641ee8b7692c449b5227b",
                 account_id="",
             )
 
diff --git a/tests/api_resources/alerting/test_available_alerts.py b/tests/api_resources/alerting/test_available_alerts.py
index 253ff803cdf..0836a669443 100644
--- a/tests/api_resources/alerting/test_available_alerts.py
+++ b/tests/api_resources/alerting/test_available_alerts.py
@@ -57,7 +57,9 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncAvailableAlerts:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/alerting/test_history.py b/tests/api_resources/alerting/test_history.py
index 43ef79ac5c3..912513472c3 100644
--- a/tests/api_resources/alerting/test_history.py
+++ b/tests/api_resources/alerting/test_history.py
@@ -70,7 +70,9 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncHistory:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/alerting/test_policies.py b/tests/api_resources/alerting/test_policies.py
index b88cc65631a..ac71af18821 100644
--- a/tests/api_resources/alerting/test_policies.py
+++ b/tests/api_resources/alerting/test_policies.py
@@ -32,11 +32,7 @@ def test_method_create(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             alert_type="universal_ssl_event_type",
             enabled=True,
-            mechanisms={
-                "email": [{}],
-                "pagerduty": [{}],
-                "webhooks": [{}],
-            },
+            mechanisms={},
             name="SSL Notification Event Policy",
         )
         assert_matches_type(Optional[PolicyCreateResponse], policy, path=["response"])
@@ -51,53 +47,57 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             alert_type="universal_ssl_event_type",
             enabled=True,
             mechanisms={
-                "email": [{"id": "test@example.com"}],
-                "pagerduty": [{"id": "e8133a15-00a4-4d69-aec1-32f70c51f6e5"}],
-                "webhooks": [{"id": "14cc1190-5d2b-4b98-a696-c424cb2ad05f"}],
+                "email": [{"id": "id"}],
+                "pagerduty": [{"id": "f174e90afafe4643bbbc4a0ed4fc8415"}],
+                "webhooks": [{"id": "f174e90afafe4643bbbc4a0ed4fc8415"}],
             },
             name="SSL Notification Event Policy",
+            alert_interval="30m",
             description="Something describing the policy.",
             filters={
-                "actions": ["string", "string", "string"],
-                "affected_asns": ["string", "string", "string"],
-                "affected_components": ["string", "string", "string"],
-                "affected_locations": ["string", "string", "string"],
-                "airport_code": ["string", "string", "string"],
-                "alert_trigger_preferences": ["string", "string", "string"],
-                "alert_trigger_preferences_value": ["99.0", "98.0", "97.0"],
-                "enabled": ["string", "string", "string"],
-                "environment": ["string", "string", "string"],
-                "event": ["string", "string", "string"],
-                "event_source": ["string", "string", "string"],
-                "event_type": ["string", "string", "string"],
-                "group_by": ["string", "string", "string"],
-                "health_check_id": ["string", "string", "string"],
-                "incident_impact": ["INCIDENT_IMPACT_NONE", "INCIDENT_IMPACT_MINOR", "INCIDENT_IMPACT_MAJOR"],
-                "input_id": ["string", "string", "string"],
-                "limit": ["string", "string", "string"],
-                "logo_tag": ["string", "string", "string"],
-                "megabits_per_second": ["string", "string", "string"],
-                "new_health": ["string", "string", "string"],
-                "new_status": ["string", "string", "string"],
-                "packets_per_second": ["string", "string", "string"],
-                "pool_id": ["string", "string", "string"],
-                "product": ["string", "string", "string"],
-                "project_id": ["string", "string", "string"],
-                "protocol": ["string", "string", "string"],
-                "query_tag": ["string", "string", "string"],
-                "requests_per_second": ["string", "string", "string"],
-                "selectors": ["string", "string", "string"],
-                "services": ["string", "string", "string"],
+                "actions": ["string"],
+                "affected_asns": ["string"],
+                "affected_components": ["string"],
+                "affected_locations": ["string"],
+                "airport_code": ["string"],
+                "alert_trigger_preferences": ["string"],
+                "alert_trigger_preferences_value": ["string"],
+                "enabled": ["string"],
+                "environment": ["string"],
+                "event": ["string"],
+                "event_source": ["string"],
+                "event_type": ["string"],
+                "group_by": ["string"],
+                "health_check_id": ["string"],
+                "incident_impact": ["INCIDENT_IMPACT_NONE"],
+                "input_id": ["string"],
+                "insight_class": ["string"],
+                "limit": ["string"],
+                "logo_tag": ["string"],
+                "megabits_per_second": ["string"],
+                "new_health": ["string"],
+                "new_status": ["string"],
+                "packets_per_second": ["string"],
+                "pool_id": ["string"],
+                "pop_names": ["string"],
+                "product": ["string"],
+                "project_id": ["string"],
+                "protocol": ["string"],
+                "query_tag": ["string"],
+                "requests_per_second": ["string"],
+                "selectors": ["string"],
+                "services": ["string"],
                 "slo": ["99.9"],
-                "status": ["string", "string", "string"],
-                "target_hostname": ["string", "string", "string"],
-                "target_ip": ["string", "string", "string"],
-                "target_zone_name": ["string", "string", "string"],
+                "status": ["string"],
+                "target_hostname": ["string"],
+                "target_ip": ["string"],
+                "target_zone_name": ["string"],
                 "traffic_exclusions": ["security_events"],
-                "tunnel_id": ["string", "string", "string"],
-                "tunnel_name": ["string", "string", "string"],
-                "where": ["string", "string", "string"],
-                "zones": ["string", "string", "string"],
+                "tunnel_id": ["string"],
+                "tunnel_name": ["string"],
+                "type": ["string"],
+                "where": ["string"],
+                "zones": ["string"],
             },
         )
         assert_matches_type(Optional[PolicyCreateResponse], policy, path=["response"])
@@ -111,11 +111,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             alert_type="universal_ssl_event_type",
             enabled=True,
-            mechanisms={
-                "email": [{}],
-                "pagerduty": [{}],
-                "webhooks": [{}],
-            },
+            mechanisms={},
             name="SSL Notification Event Policy",
         )
 
@@ -133,11 +129,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             alert_type="universal_ssl_event_type",
             enabled=True,
-            mechanisms={
-                "email": [{}],
-                "pagerduty": [{}],
-                "webhooks": [{}],
-            },
+            mechanisms={},
             name="SSL Notification Event Policy",
         ) as response:
             assert not response.is_closed
@@ -158,11 +150,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
                 account_id="",
                 alert_type="universal_ssl_event_type",
                 enabled=True,
-                mechanisms={
-                    "email": [{}],
-                    "pagerduty": [{}],
-                    "webhooks": [{}],
-                },
+                mechanisms={},
                 name="SSL Notification Event Policy",
             )
 
@@ -172,7 +160,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         policy = client.alerting.policies.update(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[PolicyUpdateResponse], policy, path=["response"])
@@ -183,57 +171,61 @@ def test_method_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         policy = client.alerting.policies.update(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            alert_interval="30m",
             alert_type="universal_ssl_event_type",
             description="Something describing the policy.",
             enabled=True,
             filters={
-                "actions": ["string", "string", "string"],
-                "affected_asns": ["string", "string", "string"],
-                "affected_components": ["string", "string", "string"],
-                "affected_locations": ["string", "string", "string"],
-                "airport_code": ["string", "string", "string"],
-                "alert_trigger_preferences": ["string", "string", "string"],
-                "alert_trigger_preferences_value": ["99.0", "98.0", "97.0"],
-                "enabled": ["string", "string", "string"],
-                "environment": ["string", "string", "string"],
-                "event": ["string", "string", "string"],
-                "event_source": ["string", "string", "string"],
-                "event_type": ["string", "string", "string"],
-                "group_by": ["string", "string", "string"],
-                "health_check_id": ["string", "string", "string"],
-                "incident_impact": ["INCIDENT_IMPACT_NONE", "INCIDENT_IMPACT_MINOR", "INCIDENT_IMPACT_MAJOR"],
-                "input_id": ["string", "string", "string"],
-                "limit": ["string", "string", "string"],
-                "logo_tag": ["string", "string", "string"],
-                "megabits_per_second": ["string", "string", "string"],
-                "new_health": ["string", "string", "string"],
-                "new_status": ["string", "string", "string"],
-                "packets_per_second": ["string", "string", "string"],
-                "pool_id": ["string", "string", "string"],
-                "product": ["string", "string", "string"],
-                "project_id": ["string", "string", "string"],
-                "protocol": ["string", "string", "string"],
-                "query_tag": ["string", "string", "string"],
-                "requests_per_second": ["string", "string", "string"],
-                "selectors": ["string", "string", "string"],
-                "services": ["string", "string", "string"],
+                "actions": ["string"],
+                "affected_asns": ["string"],
+                "affected_components": ["string"],
+                "affected_locations": ["string"],
+                "airport_code": ["string"],
+                "alert_trigger_preferences": ["string"],
+                "alert_trigger_preferences_value": ["string"],
+                "enabled": ["string"],
+                "environment": ["string"],
+                "event": ["string"],
+                "event_source": ["string"],
+                "event_type": ["string"],
+                "group_by": ["string"],
+                "health_check_id": ["string"],
+                "incident_impact": ["INCIDENT_IMPACT_NONE"],
+                "input_id": ["string"],
+                "insight_class": ["string"],
+                "limit": ["string"],
+                "logo_tag": ["string"],
+                "megabits_per_second": ["string"],
+                "new_health": ["string"],
+                "new_status": ["string"],
+                "packets_per_second": ["string"],
+                "pool_id": ["string"],
+                "pop_names": ["string"],
+                "product": ["string"],
+                "project_id": ["string"],
+                "protocol": ["string"],
+                "query_tag": ["string"],
+                "requests_per_second": ["string"],
+                "selectors": ["string"],
+                "services": ["string"],
                 "slo": ["99.9"],
-                "status": ["string", "string", "string"],
-                "target_hostname": ["string", "string", "string"],
-                "target_ip": ["string", "string", "string"],
-                "target_zone_name": ["string", "string", "string"],
+                "status": ["string"],
+                "target_hostname": ["string"],
+                "target_ip": ["string"],
+                "target_zone_name": ["string"],
                 "traffic_exclusions": ["security_events"],
-                "tunnel_id": ["string", "string", "string"],
-                "tunnel_name": ["string", "string", "string"],
-                "where": ["string", "string", "string"],
-                "zones": ["string", "string", "string"],
+                "tunnel_id": ["string"],
+                "tunnel_name": ["string"],
+                "type": ["string"],
+                "where": ["string"],
+                "zones": ["string"],
             },
             mechanisms={
-                "email": [{"id": "test@example.com"}],
-                "pagerduty": [{"id": "e8133a15-00a4-4d69-aec1-32f70c51f6e5"}],
-                "webhooks": [{"id": "14cc1190-5d2b-4b98-a696-c424cb2ad05f"}],
+                "email": [{"id": "id"}],
+                "pagerduty": [{"id": "f174e90afafe4643bbbc4a0ed4fc8415"}],
+                "webhooks": [{"id": "f174e90afafe4643bbbc4a0ed4fc8415"}],
             },
             name="SSL Notification Event Policy",
         )
@@ -245,7 +237,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.alerting.policies.with_raw_response.update(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -260,7 +252,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.alerting.policies.with_streaming_response.update(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -278,7 +270,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.alerting.policies.with_raw_response.update(
-                policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+                policy_id="0da2b59ef118439d8097bdfb215203c9",
                 account_id="",
             )
 
@@ -329,7 +321,7 @@ def test_path_params_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         policy = client.alerting.policies.delete(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(PolicyDeleteResponse, policy, path=["response"])
@@ -337,7 +329,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.alerting.policies.with_raw_response.delete(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -349,7 +341,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.alerting.policies.with_streaming_response.delete(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -364,7 +356,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.alerting.policies.with_raw_response.delete(
-                policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+                policy_id="0da2b59ef118439d8097bdfb215203c9",
                 account_id="",
             )
 
@@ -380,7 +372,7 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         policy = client.alerting.policies.get(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Policy], policy, path=["response"])
@@ -391,7 +383,7 @@ def test_method_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.alerting.policies.with_raw_response.get(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -406,7 +398,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.alerting.policies.with_streaming_response.get(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -424,7 +416,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.alerting.policies.with_raw_response.get(
-                policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+                policy_id="0da2b59ef118439d8097bdfb215203c9",
                 account_id="",
             )
 
@@ -436,7 +428,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncPolicies:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4274"
@@ -447,11 +441,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             alert_type="universal_ssl_event_type",
             enabled=True,
-            mechanisms={
-                "email": [{}],
-                "pagerduty": [{}],
-                "webhooks": [{}],
-            },
+            mechanisms={},
             name="SSL Notification Event Policy",
         )
         assert_matches_type(Optional[PolicyCreateResponse], policy, path=["response"])
@@ -466,53 +456,57 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             alert_type="universal_ssl_event_type",
             enabled=True,
             mechanisms={
-                "email": [{"id": "test@example.com"}],
-                "pagerduty": [{"id": "e8133a15-00a4-4d69-aec1-32f70c51f6e5"}],
-                "webhooks": [{"id": "14cc1190-5d2b-4b98-a696-c424cb2ad05f"}],
+                "email": [{"id": "id"}],
+                "pagerduty": [{"id": "f174e90afafe4643bbbc4a0ed4fc8415"}],
+                "webhooks": [{"id": "f174e90afafe4643bbbc4a0ed4fc8415"}],
             },
             name="SSL Notification Event Policy",
+            alert_interval="30m",
             description="Something describing the policy.",
             filters={
-                "actions": ["string", "string", "string"],
-                "affected_asns": ["string", "string", "string"],
-                "affected_components": ["string", "string", "string"],
-                "affected_locations": ["string", "string", "string"],
-                "airport_code": ["string", "string", "string"],
-                "alert_trigger_preferences": ["string", "string", "string"],
-                "alert_trigger_preferences_value": ["99.0", "98.0", "97.0"],
-                "enabled": ["string", "string", "string"],
-                "environment": ["string", "string", "string"],
-                "event": ["string", "string", "string"],
-                "event_source": ["string", "string", "string"],
-                "event_type": ["string", "string", "string"],
-                "group_by": ["string", "string", "string"],
-                "health_check_id": ["string", "string", "string"],
-                "incident_impact": ["INCIDENT_IMPACT_NONE", "INCIDENT_IMPACT_MINOR", "INCIDENT_IMPACT_MAJOR"],
-                "input_id": ["string", "string", "string"],
-                "limit": ["string", "string", "string"],
-                "logo_tag": ["string", "string", "string"],
-                "megabits_per_second": ["string", "string", "string"],
-                "new_health": ["string", "string", "string"],
-                "new_status": ["string", "string", "string"],
-                "packets_per_second": ["string", "string", "string"],
-                "pool_id": ["string", "string", "string"],
-                "product": ["string", "string", "string"],
-                "project_id": ["string", "string", "string"],
-                "protocol": ["string", "string", "string"],
-                "query_tag": ["string", "string", "string"],
-                "requests_per_second": ["string", "string", "string"],
-                "selectors": ["string", "string", "string"],
-                "services": ["string", "string", "string"],
+                "actions": ["string"],
+                "affected_asns": ["string"],
+                "affected_components": ["string"],
+                "affected_locations": ["string"],
+                "airport_code": ["string"],
+                "alert_trigger_preferences": ["string"],
+                "alert_trigger_preferences_value": ["string"],
+                "enabled": ["string"],
+                "environment": ["string"],
+                "event": ["string"],
+                "event_source": ["string"],
+                "event_type": ["string"],
+                "group_by": ["string"],
+                "health_check_id": ["string"],
+                "incident_impact": ["INCIDENT_IMPACT_NONE"],
+                "input_id": ["string"],
+                "insight_class": ["string"],
+                "limit": ["string"],
+                "logo_tag": ["string"],
+                "megabits_per_second": ["string"],
+                "new_health": ["string"],
+                "new_status": ["string"],
+                "packets_per_second": ["string"],
+                "pool_id": ["string"],
+                "pop_names": ["string"],
+                "product": ["string"],
+                "project_id": ["string"],
+                "protocol": ["string"],
+                "query_tag": ["string"],
+                "requests_per_second": ["string"],
+                "selectors": ["string"],
+                "services": ["string"],
                 "slo": ["99.9"],
-                "status": ["string", "string", "string"],
-                "target_hostname": ["string", "string", "string"],
-                "target_ip": ["string", "string", "string"],
-                "target_zone_name": ["string", "string", "string"],
+                "status": ["string"],
+                "target_hostname": ["string"],
+                "target_ip": ["string"],
+                "target_zone_name": ["string"],
                 "traffic_exclusions": ["security_events"],
-                "tunnel_id": ["string", "string", "string"],
-                "tunnel_name": ["string", "string", "string"],
-                "where": ["string", "string", "string"],
-                "zones": ["string", "string", "string"],
+                "tunnel_id": ["string"],
+                "tunnel_name": ["string"],
+                "type": ["string"],
+                "where": ["string"],
+                "zones": ["string"],
             },
         )
         assert_matches_type(Optional[PolicyCreateResponse], policy, path=["response"])
@@ -526,11 +520,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             alert_type="universal_ssl_event_type",
             enabled=True,
-            mechanisms={
-                "email": [{}],
-                "pagerduty": [{}],
-                "webhooks": [{}],
-            },
+            mechanisms={},
             name="SSL Notification Event Policy",
         )
 
@@ -548,11 +538,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             alert_type="universal_ssl_event_type",
             enabled=True,
-            mechanisms={
-                "email": [{}],
-                "pagerduty": [{}],
-                "webhooks": [{}],
-            },
+            mechanisms={},
             name="SSL Notification Event Policy",
         ) as response:
             assert not response.is_closed
@@ -573,11 +559,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
                 account_id="",
                 alert_type="universal_ssl_event_type",
                 enabled=True,
-                mechanisms={
-                    "email": [{}],
-                    "pagerduty": [{}],
-                    "webhooks": [{}],
-                },
+                mechanisms={},
                 name="SSL Notification Event Policy",
             )
 
@@ -587,7 +569,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         policy = await async_client.alerting.policies.update(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[PolicyUpdateResponse], policy, path=["response"])
@@ -598,57 +580,61 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         policy = await async_client.alerting.policies.update(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            alert_interval="30m",
             alert_type="universal_ssl_event_type",
             description="Something describing the policy.",
             enabled=True,
             filters={
-                "actions": ["string", "string", "string"],
-                "affected_asns": ["string", "string", "string"],
-                "affected_components": ["string", "string", "string"],
-                "affected_locations": ["string", "string", "string"],
-                "airport_code": ["string", "string", "string"],
-                "alert_trigger_preferences": ["string", "string", "string"],
-                "alert_trigger_preferences_value": ["99.0", "98.0", "97.0"],
-                "enabled": ["string", "string", "string"],
-                "environment": ["string", "string", "string"],
-                "event": ["string", "string", "string"],
-                "event_source": ["string", "string", "string"],
-                "event_type": ["string", "string", "string"],
-                "group_by": ["string", "string", "string"],
-                "health_check_id": ["string", "string", "string"],
-                "incident_impact": ["INCIDENT_IMPACT_NONE", "INCIDENT_IMPACT_MINOR", "INCIDENT_IMPACT_MAJOR"],
-                "input_id": ["string", "string", "string"],
-                "limit": ["string", "string", "string"],
-                "logo_tag": ["string", "string", "string"],
-                "megabits_per_second": ["string", "string", "string"],
-                "new_health": ["string", "string", "string"],
-                "new_status": ["string", "string", "string"],
-                "packets_per_second": ["string", "string", "string"],
-                "pool_id": ["string", "string", "string"],
-                "product": ["string", "string", "string"],
-                "project_id": ["string", "string", "string"],
-                "protocol": ["string", "string", "string"],
-                "query_tag": ["string", "string", "string"],
-                "requests_per_second": ["string", "string", "string"],
-                "selectors": ["string", "string", "string"],
-                "services": ["string", "string", "string"],
+                "actions": ["string"],
+                "affected_asns": ["string"],
+                "affected_components": ["string"],
+                "affected_locations": ["string"],
+                "airport_code": ["string"],
+                "alert_trigger_preferences": ["string"],
+                "alert_trigger_preferences_value": ["string"],
+                "enabled": ["string"],
+                "environment": ["string"],
+                "event": ["string"],
+                "event_source": ["string"],
+                "event_type": ["string"],
+                "group_by": ["string"],
+                "health_check_id": ["string"],
+                "incident_impact": ["INCIDENT_IMPACT_NONE"],
+                "input_id": ["string"],
+                "insight_class": ["string"],
+                "limit": ["string"],
+                "logo_tag": ["string"],
+                "megabits_per_second": ["string"],
+                "new_health": ["string"],
+                "new_status": ["string"],
+                "packets_per_second": ["string"],
+                "pool_id": ["string"],
+                "pop_names": ["string"],
+                "product": ["string"],
+                "project_id": ["string"],
+                "protocol": ["string"],
+                "query_tag": ["string"],
+                "requests_per_second": ["string"],
+                "selectors": ["string"],
+                "services": ["string"],
                 "slo": ["99.9"],
-                "status": ["string", "string", "string"],
-                "target_hostname": ["string", "string", "string"],
-                "target_ip": ["string", "string", "string"],
-                "target_zone_name": ["string", "string", "string"],
+                "status": ["string"],
+                "target_hostname": ["string"],
+                "target_ip": ["string"],
+                "target_zone_name": ["string"],
                 "traffic_exclusions": ["security_events"],
-                "tunnel_id": ["string", "string", "string"],
-                "tunnel_name": ["string", "string", "string"],
-                "where": ["string", "string", "string"],
-                "zones": ["string", "string", "string"],
+                "tunnel_id": ["string"],
+                "tunnel_name": ["string"],
+                "type": ["string"],
+                "where": ["string"],
+                "zones": ["string"],
             },
             mechanisms={
-                "email": [{"id": "test@example.com"}],
-                "pagerduty": [{"id": "e8133a15-00a4-4d69-aec1-32f70c51f6e5"}],
-                "webhooks": [{"id": "14cc1190-5d2b-4b98-a696-c424cb2ad05f"}],
+                "email": [{"id": "id"}],
+                "pagerduty": [{"id": "f174e90afafe4643bbbc4a0ed4fc8415"}],
+                "webhooks": [{"id": "f174e90afafe4643bbbc4a0ed4fc8415"}],
             },
             name="SSL Notification Event Policy",
         )
@@ -660,7 +646,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.alerting.policies.with_raw_response.update(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -675,7 +661,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.alerting.policies.with_streaming_response.update(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -693,7 +679,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.alerting.policies.with_raw_response.update(
-                policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+                policy_id="0da2b59ef118439d8097bdfb215203c9",
                 account_id="",
             )
 
@@ -744,7 +730,7 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         policy = await async_client.alerting.policies.delete(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(PolicyDeleteResponse, policy, path=["response"])
@@ -752,7 +738,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.alerting.policies.with_raw_response.delete(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -764,7 +750,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.alerting.policies.with_streaming_response.delete(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -779,7 +765,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.alerting.policies.with_raw_response.delete(
-                policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+                policy_id="0da2b59ef118439d8097bdfb215203c9",
                 account_id="",
             )
 
@@ -795,7 +781,7 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         policy = await async_client.alerting.policies.get(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Policy], policy, path=["response"])
@@ -806,7 +792,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.alerting.policies.with_raw_response.get(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -821,7 +807,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.alerting.policies.with_streaming_response.get(
-            policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+            policy_id="0da2b59ef118439d8097bdfb215203c9",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -839,7 +825,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.alerting.policies.with_raw_response.get(
-                policy_id="0da2b59e-f118-439d-8097-bdfb215203c9",
+                policy_id="0da2b59ef118439d8097bdfb215203c9",
                 account_id="",
             )
 
diff --git a/tests/api_resources/alerting/test_silences.py b/tests/api_resources/alerting/test_silences.py
new file mode 100644
index 00000000000..5c290630aad
--- /dev/null
+++ b/tests/api_resources/alerting/test_silences.py
@@ -0,0 +1,467 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.alerting import (
+    SilenceGetResponse,
+    SilenceListResponse,
+    SilenceCreateResponse,
+    SilenceDeleteResponse,
+    SilenceUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSilences:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        silence = client.alerting.silences.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{}],
+        )
+        assert_matches_type(SilenceCreateResponse, silence, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.alerting.silences.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        silence = response.parse()
+        assert_matches_type(SilenceCreateResponse, silence, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.alerting.silences.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            silence = response.parse()
+            assert_matches_type(SilenceCreateResponse, silence, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.alerting.silences.with_raw_response.create(
+                account_id="",
+                body=[{}],
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        silence = client.alerting.silences.update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{}],
+        )
+        assert_matches_type(SyncSinglePage[SilenceUpdateResponse], silence, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.alerting.silences.with_raw_response.update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        silence = response.parse()
+        assert_matches_type(SyncSinglePage[SilenceUpdateResponse], silence, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.alerting.silences.with_streaming_response.update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            silence = response.parse()
+            assert_matches_type(SyncSinglePage[SilenceUpdateResponse], silence, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.alerting.silences.with_raw_response.update(
+                account_id="",
+                body=[{}],
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        silence = client.alerting.silences.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[SilenceListResponse], silence, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.alerting.silences.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        silence = response.parse()
+        assert_matches_type(SyncSinglePage[SilenceListResponse], silence, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.alerting.silences.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            silence = response.parse()
+            assert_matches_type(SyncSinglePage[SilenceListResponse], silence, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.alerting.silences.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        silence = client.alerting.silences.delete(
+            silence_id="f878e90c23f44126ae3cfc399f646977",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SilenceDeleteResponse, silence, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.alerting.silences.with_raw_response.delete(
+            silence_id="f878e90c23f44126ae3cfc399f646977",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        silence = response.parse()
+        assert_matches_type(SilenceDeleteResponse, silence, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.alerting.silences.with_streaming_response.delete(
+            silence_id="f878e90c23f44126ae3cfc399f646977",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            silence = response.parse()
+            assert_matches_type(SilenceDeleteResponse, silence, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.alerting.silences.with_raw_response.delete(
+                silence_id="f878e90c23f44126ae3cfc399f646977",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `silence_id` but received ''"):
+            client.alerting.silences.with_raw_response.delete(
+                silence_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        silence = client.alerting.silences.get(
+            silence_id="f878e90c23f44126ae3cfc399f646977",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SilenceGetResponse], silence, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.alerting.silences.with_raw_response.get(
+            silence_id="f878e90c23f44126ae3cfc399f646977",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        silence = response.parse()
+        assert_matches_type(Optional[SilenceGetResponse], silence, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.alerting.silences.with_streaming_response.get(
+            silence_id="f878e90c23f44126ae3cfc399f646977",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            silence = response.parse()
+            assert_matches_type(Optional[SilenceGetResponse], silence, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.alerting.silences.with_raw_response.get(
+                silence_id="f878e90c23f44126ae3cfc399f646977",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `silence_id` but received ''"):
+            client.alerting.silences.with_raw_response.get(
+                silence_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncSilences:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        silence = await async_client.alerting.silences.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{}],
+        )
+        assert_matches_type(SilenceCreateResponse, silence, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.alerting.silences.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        silence = await response.parse()
+        assert_matches_type(SilenceCreateResponse, silence, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.alerting.silences.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            silence = await response.parse()
+            assert_matches_type(SilenceCreateResponse, silence, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.alerting.silences.with_raw_response.create(
+                account_id="",
+                body=[{}],
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        silence = await async_client.alerting.silences.update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{}],
+        )
+        assert_matches_type(AsyncSinglePage[SilenceUpdateResponse], silence, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.alerting.silences.with_raw_response.update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        silence = await response.parse()
+        assert_matches_type(AsyncSinglePage[SilenceUpdateResponse], silence, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.alerting.silences.with_streaming_response.update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            silence = await response.parse()
+            assert_matches_type(AsyncSinglePage[SilenceUpdateResponse], silence, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.alerting.silences.with_raw_response.update(
+                account_id="",
+                body=[{}],
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        silence = await async_client.alerting.silences.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[SilenceListResponse], silence, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.alerting.silences.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        silence = await response.parse()
+        assert_matches_type(AsyncSinglePage[SilenceListResponse], silence, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.alerting.silences.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            silence = await response.parse()
+            assert_matches_type(AsyncSinglePage[SilenceListResponse], silence, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.alerting.silences.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        silence = await async_client.alerting.silences.delete(
+            silence_id="f878e90c23f44126ae3cfc399f646977",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SilenceDeleteResponse, silence, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.alerting.silences.with_raw_response.delete(
+            silence_id="f878e90c23f44126ae3cfc399f646977",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        silence = await response.parse()
+        assert_matches_type(SilenceDeleteResponse, silence, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.alerting.silences.with_streaming_response.delete(
+            silence_id="f878e90c23f44126ae3cfc399f646977",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            silence = await response.parse()
+            assert_matches_type(SilenceDeleteResponse, silence, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.alerting.silences.with_raw_response.delete(
+                silence_id="f878e90c23f44126ae3cfc399f646977",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `silence_id` but received ''"):
+            await async_client.alerting.silences.with_raw_response.delete(
+                silence_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        silence = await async_client.alerting.silences.get(
+            silence_id="f878e90c23f44126ae3cfc399f646977",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SilenceGetResponse], silence, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.alerting.silences.with_raw_response.get(
+            silence_id="f878e90c23f44126ae3cfc399f646977",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        silence = await response.parse()
+        assert_matches_type(Optional[SilenceGetResponse], silence, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.alerting.silences.with_streaming_response.get(
+            silence_id="f878e90c23f44126ae3cfc399f646977",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            silence = await response.parse()
+            assert_matches_type(Optional[SilenceGetResponse], silence, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.alerting.silences.with_raw_response.get(
+                silence_id="f878e90c23f44126ae3cfc399f646977",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `silence_id` but received ''"):
+            await async_client.alerting.silences.with_raw_response.get(
+                silence_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/api_gateway/discovery/test_operations.py b/tests/api_resources/api_gateway/discovery/test_operations.py
index b08333fa51c..48149bb3a16 100644
--- a/tests/api_resources/api_gateway/discovery/test_operations.py
+++ b/tests/api_resources/api_gateway/discovery/test_operations.py
@@ -11,7 +11,10 @@
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.api_gateway import DiscoveryOperation
-from cloudflare.types.api_gateway.discovery import OperationEditResponse
+from cloudflare.types.api_gateway.discovery import (
+    OperationEditResponse,
+    OperationBulkEditResponse,
+)
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -74,6 +77,60 @@ def test_path_params_list(self, client: Cloudflare) -> None:
                 zone_id="",
             )
 
+    @parametrize
+    def test_method_bulk_edit(self, client: Cloudflare) -> None:
+        operation = client.api_gateway.discovery.operations.bulk_edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={
+                "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+            },
+        )
+        assert_matches_type(OperationBulkEditResponse, operation, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_edit(self, client: Cloudflare) -> None:
+        response = client.api_gateway.discovery.operations.with_raw_response.bulk_edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={
+                "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+            },
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        operation = response.parse()
+        assert_matches_type(OperationBulkEditResponse, operation, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_edit(self, client: Cloudflare) -> None:
+        with client.api_gateway.discovery.operations.with_streaming_response.bulk_edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={
+                "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+            },
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            operation = response.parse()
+            assert_matches_type(OperationBulkEditResponse, operation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.api_gateway.discovery.operations.with_raw_response.bulk_edit(
+                zone_id="",
+                body={
+                    "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                    "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+                },
+            )
+
     @parametrize
     def test_method_edit(self, client: Cloudflare) -> None:
         operation = client.api_gateway.discovery.operations.edit(
@@ -133,7 +190,9 @@ def test_path_params_edit(self, client: Cloudflare) -> None:
 
 
 class TestAsyncOperations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
@@ -190,6 +249,60 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
                 zone_id="",
             )
 
+    @parametrize
+    async def test_method_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        operation = await async_client.api_gateway.discovery.operations.bulk_edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={
+                "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+            },
+        )
+        assert_matches_type(OperationBulkEditResponse, operation, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.api_gateway.discovery.operations.with_raw_response.bulk_edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={
+                "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+            },
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        operation = await response.parse()
+        assert_matches_type(OperationBulkEditResponse, operation, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.api_gateway.discovery.operations.with_streaming_response.bulk_edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={
+                "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+            },
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            operation = await response.parse()
+            assert_matches_type(OperationBulkEditResponse, operation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.api_gateway.discovery.operations.with_raw_response.bulk_edit(
+                zone_id="",
+                body={
+                    "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                    "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+                },
+            )
+
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
         operation = await async_client.api_gateway.discovery.operations.edit(
diff --git a/tests/api_resources/event_notifications/r2/__init__.py b/tests/api_resources/api_gateway/expression_template/__init__.py
similarity index 100%
rename from tests/api_resources/event_notifications/r2/__init__.py
rename to tests/api_resources/api_gateway/expression_template/__init__.py
diff --git a/tests/api_resources/api_gateway/expression_template/test_fallthrough.py b/tests/api_resources/api_gateway/expression_template/test_fallthrough.py
new file mode 100644
index 00000000000..5db06ad8f6e
--- /dev/null
+++ b/tests/api_resources/api_gateway/expression_template/test_fallthrough.py
@@ -0,0 +1,108 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.api_gateway.expression_template import FallthroughCreateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestFallthrough:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        fallthrough = client.api_gateway.expression_template.fallthrough.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hosts=["{zone}.domain1.tld", "domain2.tld"],
+        )
+        assert_matches_type(FallthroughCreateResponse, fallthrough, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.api_gateway.expression_template.fallthrough.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hosts=["{zone}.domain1.tld", "domain2.tld"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        fallthrough = response.parse()
+        assert_matches_type(FallthroughCreateResponse, fallthrough, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.api_gateway.expression_template.fallthrough.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hosts=["{zone}.domain1.tld", "domain2.tld"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            fallthrough = response.parse()
+            assert_matches_type(FallthroughCreateResponse, fallthrough, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.api_gateway.expression_template.fallthrough.with_raw_response.create(
+                zone_id="",
+                hosts=["{zone}.domain1.tld", "domain2.tld"],
+            )
+
+
+class TestAsyncFallthrough:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        fallthrough = await async_client.api_gateway.expression_template.fallthrough.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hosts=["{zone}.domain1.tld", "domain2.tld"],
+        )
+        assert_matches_type(FallthroughCreateResponse, fallthrough, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.api_gateway.expression_template.fallthrough.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hosts=["{zone}.domain1.tld", "domain2.tld"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        fallthrough = await response.parse()
+        assert_matches_type(FallthroughCreateResponse, fallthrough, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.api_gateway.expression_template.fallthrough.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hosts=["{zone}.domain1.tld", "domain2.tld"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            fallthrough = await response.parse()
+            assert_matches_type(FallthroughCreateResponse, fallthrough, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.api_gateway.expression_template.fallthrough.with_raw_response.create(
+                zone_id="",
+                hosts=["{zone}.domain1.tld", "domain2.tld"],
+            )
diff --git a/tests/api_resources/api_gateway/operations/test_schema_validation.py b/tests/api_resources/api_gateway/operations/test_schema_validation.py
index 21c19d6c184..dc8cf1adfbb 100644
--- a/tests/api_resources/api_gateway/operations/test_schema_validation.py
+++ b/tests/api_resources/api_gateway/operations/test_schema_validation.py
@@ -15,6 +15,8 @@
     SchemaValidationUpdateResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -23,27 +25,32 @@ class TestSchemaValidation:
 
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
-        schema_validation = client.api_gateway.operations.schema_validation.update(
-            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            schema_validation = client.api_gateway.operations.schema_validation.update(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(SchemaValidationUpdateResponse, schema_validation, path=["response"])
 
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        schema_validation = client.api_gateway.operations.schema_validation.update(
-            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            mitigation_action="block",
-        )
+        with pytest.warns(DeprecationWarning):
+            schema_validation = client.api_gateway.operations.schema_validation.update(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                mitigation_action="block",
+            )
+
         assert_matches_type(SchemaValidationUpdateResponse, schema_validation, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.api_gateway.operations.schema_validation.with_raw_response.update(
-            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.api_gateway.operations.schema_validation.with_raw_response.update(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -52,52 +59,57 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.api_gateway.operations.schema_validation.with_streaming_response.update(
-            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.api_gateway.operations.schema_validation.with_streaming_response.update(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            schema_validation = response.parse()
-            assert_matches_type(SchemaValidationUpdateResponse, schema_validation, path=["response"])
+                schema_validation = response.parse()
+                assert_matches_type(SchemaValidationUpdateResponse, schema_validation, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.api_gateway.operations.schema_validation.with_raw_response.update(
-                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.api_gateway.operations.schema_validation.with_raw_response.update(
+                    operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    zone_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `operation_id` but received ''"):
+                client.api_gateway.operations.schema_validation.with_raw_response.update(
+                    operation_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `operation_id` but received ''"):
-            client.api_gateway.operations.schema_validation.with_raw_response.update(
-                operation_id="",
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            schema_validation = client.api_gateway.operations.schema_validation.edit(
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                settings_multiple_request={
+                    "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                    "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+                },
             )
 
-    @parametrize
-    def test_method_edit(self, client: Cloudflare) -> None:
-        schema_validation = client.api_gateway.operations.schema_validation.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            settings_multiple_request={
-                "3818d821-5901-4147-a474-f5f5aec1d54e": {},
-                "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
-            },
-        )
         assert_matches_type(SettingsMultipleRequest, schema_validation, path=["response"])
 
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
-        response = client.api_gateway.operations.schema_validation.with_raw_response.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            settings_multiple_request={
-                "3818d821-5901-4147-a474-f5f5aec1d54e": {},
-                "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
-            },
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.api_gateway.operations.schema_validation.with_raw_response.edit(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                settings_multiple_request={
+                    "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                    "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+                },
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -106,46 +118,51 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
-        with client.api_gateway.operations.schema_validation.with_streaming_response.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            settings_multiple_request={
-                "3818d821-5901-4147-a474-f5f5aec1d54e": {},
-                "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
-            },
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            schema_validation = response.parse()
-            assert_matches_type(SettingsMultipleRequest, schema_validation, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            with client.api_gateway.operations.schema_validation.with_streaming_response.edit(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                settings_multiple_request={
+                    "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                    "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+                },
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                schema_validation = response.parse()
+                assert_matches_type(SettingsMultipleRequest, schema_validation, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_edit(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.api_gateway.operations.schema_validation.with_raw_response.edit(
-                zone_id="",
-                settings_multiple_request={
-                    "3818d821-5901-4147-a474-f5f5aec1d54e": {},
-                    "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
-                },
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.api_gateway.operations.schema_validation.with_raw_response.edit(
+                    zone_id="",
+                    settings_multiple_request={
+                        "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                        "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+                    },
+                )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        schema_validation = client.api_gateway.operations.schema_validation.get(
-            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            schema_validation = client.api_gateway.operations.schema_validation.get(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(SchemaValidationGetResponse, schema_validation, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.api_gateway.operations.schema_validation.with_raw_response.get(
-            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.api_gateway.operations.schema_validation.with_raw_response.get(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -154,59 +171,68 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.api_gateway.operations.schema_validation.with_streaming_response.get(
-            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.api_gateway.operations.schema_validation.with_streaming_response.get(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            schema_validation = response.parse()
-            assert_matches_type(SchemaValidationGetResponse, schema_validation, path=["response"])
+                schema_validation = response.parse()
+                assert_matches_type(SchemaValidationGetResponse, schema_validation, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.api_gateway.operations.schema_validation.with_raw_response.get(
-                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.api_gateway.operations.schema_validation.with_raw_response.get(
+                    operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    zone_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `operation_id` but received ''"):
-            client.api_gateway.operations.schema_validation.with_raw_response.get(
-                operation_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `operation_id` but received ''"):
+                client.api_gateway.operations.schema_validation.with_raw_response.get(
+                    operation_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
 
 class TestAsyncSchemaValidation:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        schema_validation = await async_client.api_gateway.operations.schema_validation.update(
-            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            schema_validation = await async_client.api_gateway.operations.schema_validation.update(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(SchemaValidationUpdateResponse, schema_validation, path=["response"])
 
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        schema_validation = await async_client.api_gateway.operations.schema_validation.update(
-            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            mitigation_action="block",
-        )
+        with pytest.warns(DeprecationWarning):
+            schema_validation = await async_client.api_gateway.operations.schema_validation.update(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                mitigation_action="block",
+            )
+
         assert_matches_type(SchemaValidationUpdateResponse, schema_validation, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.api_gateway.operations.schema_validation.with_raw_response.update(
-            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.api_gateway.operations.schema_validation.with_raw_response.update(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -215,52 +241,57 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.api_gateway.operations.schema_validation.with_streaming_response.update(
-            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.api_gateway.operations.schema_validation.with_streaming_response.update(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            schema_validation = await response.parse()
-            assert_matches_type(SchemaValidationUpdateResponse, schema_validation, path=["response"])
+                schema_validation = await response.parse()
+                assert_matches_type(SchemaValidationUpdateResponse, schema_validation, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.api_gateway.operations.schema_validation.with_raw_response.update(
-                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.api_gateway.operations.schema_validation.with_raw_response.update(
+                    operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    zone_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `operation_id` but received ''"):
+                await async_client.api_gateway.operations.schema_validation.with_raw_response.update(
+                    operation_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `operation_id` but received ''"):
-            await async_client.api_gateway.operations.schema_validation.with_raw_response.update(
-                operation_id="",
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            schema_validation = await async_client.api_gateway.operations.schema_validation.edit(
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                settings_multiple_request={
+                    "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                    "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+                },
             )
 
-    @parametrize
-    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
-        schema_validation = await async_client.api_gateway.operations.schema_validation.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            settings_multiple_request={
-                "3818d821-5901-4147-a474-f5f5aec1d54e": {},
-                "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
-            },
-        )
         assert_matches_type(SettingsMultipleRequest, schema_validation, path=["response"])
 
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.api_gateway.operations.schema_validation.with_raw_response.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            settings_multiple_request={
-                "3818d821-5901-4147-a474-f5f5aec1d54e": {},
-                "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
-            },
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.api_gateway.operations.schema_validation.with_raw_response.edit(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                settings_multiple_request={
+                    "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                    "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+                },
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -269,46 +300,51 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.api_gateway.operations.schema_validation.with_streaming_response.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            settings_multiple_request={
-                "3818d821-5901-4147-a474-f5f5aec1d54e": {},
-                "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
-            },
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            schema_validation = await response.parse()
-            assert_matches_type(SettingsMultipleRequest, schema_validation, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            async with async_client.api_gateway.operations.schema_validation.with_streaming_response.edit(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                settings_multiple_request={
+                    "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                    "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+                },
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                schema_validation = await response.parse()
+                assert_matches_type(SettingsMultipleRequest, schema_validation, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.api_gateway.operations.schema_validation.with_raw_response.edit(
-                zone_id="",
-                settings_multiple_request={
-                    "3818d821-5901-4147-a474-f5f5aec1d54e": {},
-                    "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
-                },
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.api_gateway.operations.schema_validation.with_raw_response.edit(
+                    zone_id="",
+                    settings_multiple_request={
+                        "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                        "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+                    },
+                )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        schema_validation = await async_client.api_gateway.operations.schema_validation.get(
-            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            schema_validation = await async_client.api_gateway.operations.schema_validation.get(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(SchemaValidationGetResponse, schema_validation, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.api_gateway.operations.schema_validation.with_raw_response.get(
-            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.api_gateway.operations.schema_validation.with_raw_response.get(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -317,28 +353,30 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.api_gateway.operations.schema_validation.with_streaming_response.get(
-            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.api_gateway.operations.schema_validation.with_streaming_response.get(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            schema_validation = await response.parse()
-            assert_matches_type(SchemaValidationGetResponse, schema_validation, path=["response"])
+                schema_validation = await response.parse()
+                assert_matches_type(SchemaValidationGetResponse, schema_validation, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.api_gateway.operations.schema_validation.with_raw_response.get(
-                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                zone_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `operation_id` but received ''"):
-            await async_client.api_gateway.operations.schema_validation.with_raw_response.get(
-                operation_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.api_gateway.operations.schema_validation.with_raw_response.get(
+                    operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    zone_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `operation_id` but received ''"):
+                await async_client.api_gateway.operations.schema_validation.with_raw_response.get(
+                    operation_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
diff --git a/tests/api_resources/api_gateway/settings/test_schema_validation.py b/tests/api_resources/api_gateway/settings/test_schema_validation.py
index 2441b86a24c..cbcf33147af 100644
--- a/tests/api_resources/api_gateway/settings/test_schema_validation.py
+++ b/tests/api_resources/api_gateway/settings/test_schema_validation.py
@@ -13,6 +13,8 @@
     Settings,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -21,27 +23,32 @@ class TestSchemaValidation:
 
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
-        schema_validation = client.api_gateway.settings.schema_validation.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            validation_default_mitigation_action="block",
-        )
+        with pytest.warns(DeprecationWarning):
+            schema_validation = client.api_gateway.settings.schema_validation.update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                validation_default_mitigation_action="block",
+            )
+
         assert_matches_type(Settings, schema_validation, path=["response"])
 
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        schema_validation = client.api_gateway.settings.schema_validation.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            validation_default_mitigation_action="block",
-            validation_override_mitigation_action="none",
-        )
+        with pytest.warns(DeprecationWarning):
+            schema_validation = client.api_gateway.settings.schema_validation.update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                validation_default_mitigation_action="block",
+                validation_override_mitigation_action="none",
+            )
+
         assert_matches_type(Settings, schema_validation, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.api_gateway.settings.schema_validation.with_raw_response.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            validation_default_mitigation_action="block",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.api_gateway.settings.schema_validation.with_raw_response.update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                validation_default_mitigation_action="block",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -50,47 +57,54 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.api_gateway.settings.schema_validation.with_streaming_response.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            validation_default_mitigation_action="block",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.api_gateway.settings.schema_validation.with_streaming_response.update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                validation_default_mitigation_action="block",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            schema_validation = response.parse()
-            assert_matches_type(Settings, schema_validation, path=["response"])
+                schema_validation = response.parse()
+                assert_matches_type(Settings, schema_validation, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.api_gateway.settings.schema_validation.with_raw_response.update(
-                zone_id="",
-                validation_default_mitigation_action="block",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.api_gateway.settings.schema_validation.with_raw_response.update(
+                    zone_id="",
+                    validation_default_mitigation_action="block",
+                )
 
     @parametrize
     def test_method_edit(self, client: Cloudflare) -> None:
-        schema_validation = client.api_gateway.settings.schema_validation.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            schema_validation = client.api_gateway.settings.schema_validation.edit(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(Settings, schema_validation, path=["response"])
 
     @parametrize
     def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
-        schema_validation = client.api_gateway.settings.schema_validation.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            validation_default_mitigation_action="block",
-            validation_override_mitigation_action="none",
-        )
+        with pytest.warns(DeprecationWarning):
+            schema_validation = client.api_gateway.settings.schema_validation.edit(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                validation_default_mitigation_action="block",
+                validation_override_mitigation_action="none",
+            )
+
         assert_matches_type(Settings, schema_validation, path=["response"])
 
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
-        response = client.api_gateway.settings.schema_validation.with_raw_response.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.api_gateway.settings.schema_validation.with_raw_response.edit(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -99,36 +113,41 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
-        with client.api_gateway.settings.schema_validation.with_streaming_response.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.api_gateway.settings.schema_validation.with_streaming_response.edit(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            schema_validation = response.parse()
-            assert_matches_type(Settings, schema_validation, path=["response"])
+                schema_validation = response.parse()
+                assert_matches_type(Settings, schema_validation, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_edit(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.api_gateway.settings.schema_validation.with_raw_response.edit(
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.api_gateway.settings.schema_validation.with_raw_response.edit(
+                    zone_id="",
+                )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        schema_validation = client.api_gateway.settings.schema_validation.get(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            schema_validation = client.api_gateway.settings.schema_validation.get(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(Settings, schema_validation, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.api_gateway.settings.schema_validation.with_raw_response.get(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.api_gateway.settings.schema_validation.with_raw_response.get(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -137,51 +156,60 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.api_gateway.settings.schema_validation.with_streaming_response.get(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.api_gateway.settings.schema_validation.with_streaming_response.get(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            schema_validation = response.parse()
-            assert_matches_type(Settings, schema_validation, path=["response"])
+                schema_validation = response.parse()
+                assert_matches_type(Settings, schema_validation, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.api_gateway.settings.schema_validation.with_raw_response.get(
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.api_gateway.settings.schema_validation.with_raw_response.get(
+                    zone_id="",
+                )
 
 
 class TestAsyncSchemaValidation:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        schema_validation = await async_client.api_gateway.settings.schema_validation.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            validation_default_mitigation_action="block",
-        )
+        with pytest.warns(DeprecationWarning):
+            schema_validation = await async_client.api_gateway.settings.schema_validation.update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                validation_default_mitigation_action="block",
+            )
+
         assert_matches_type(Settings, schema_validation, path=["response"])
 
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        schema_validation = await async_client.api_gateway.settings.schema_validation.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            validation_default_mitigation_action="block",
-            validation_override_mitigation_action="none",
-        )
+        with pytest.warns(DeprecationWarning):
+            schema_validation = await async_client.api_gateway.settings.schema_validation.update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                validation_default_mitigation_action="block",
+                validation_override_mitigation_action="none",
+            )
+
         assert_matches_type(Settings, schema_validation, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.api_gateway.settings.schema_validation.with_raw_response.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            validation_default_mitigation_action="block",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.api_gateway.settings.schema_validation.with_raw_response.update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                validation_default_mitigation_action="block",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -190,47 +218,54 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.api_gateway.settings.schema_validation.with_streaming_response.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            validation_default_mitigation_action="block",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.api_gateway.settings.schema_validation.with_streaming_response.update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                validation_default_mitigation_action="block",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            schema_validation = await response.parse()
-            assert_matches_type(Settings, schema_validation, path=["response"])
+                schema_validation = await response.parse()
+                assert_matches_type(Settings, schema_validation, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.api_gateway.settings.schema_validation.with_raw_response.update(
-                zone_id="",
-                validation_default_mitigation_action="block",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.api_gateway.settings.schema_validation.with_raw_response.update(
+                    zone_id="",
+                    validation_default_mitigation_action="block",
+                )
 
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
-        schema_validation = await async_client.api_gateway.settings.schema_validation.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            schema_validation = await async_client.api_gateway.settings.schema_validation.edit(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(Settings, schema_validation, path=["response"])
 
     @parametrize
     async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        schema_validation = await async_client.api_gateway.settings.schema_validation.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            validation_default_mitigation_action="block",
-            validation_override_mitigation_action="none",
-        )
+        with pytest.warns(DeprecationWarning):
+            schema_validation = await async_client.api_gateway.settings.schema_validation.edit(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                validation_default_mitigation_action="block",
+                validation_override_mitigation_action="none",
+            )
+
         assert_matches_type(Settings, schema_validation, path=["response"])
 
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.api_gateway.settings.schema_validation.with_raw_response.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.api_gateway.settings.schema_validation.with_raw_response.edit(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -239,36 +274,41 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.api_gateway.settings.schema_validation.with_streaming_response.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.api_gateway.settings.schema_validation.with_streaming_response.edit(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            schema_validation = await response.parse()
-            assert_matches_type(Settings, schema_validation, path=["response"])
+                schema_validation = await response.parse()
+                assert_matches_type(Settings, schema_validation, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.api_gateway.settings.schema_validation.with_raw_response.edit(
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.api_gateway.settings.schema_validation.with_raw_response.edit(
+                    zone_id="",
+                )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        schema_validation = await async_client.api_gateway.settings.schema_validation.get(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            schema_validation = await async_client.api_gateway.settings.schema_validation.get(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(Settings, schema_validation, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.api_gateway.settings.schema_validation.with_raw_response.get(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.api_gateway.settings.schema_validation.with_raw_response.get(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -277,20 +317,22 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.api_gateway.settings.schema_validation.with_streaming_response.get(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.api_gateway.settings.schema_validation.with_streaming_response.get(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            schema_validation = await response.parse()
-            assert_matches_type(Settings, schema_validation, path=["response"])
+                schema_validation = await response.parse()
+                assert_matches_type(Settings, schema_validation, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.api_gateway.settings.schema_validation.with_raw_response.get(
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.api_gateway.settings.schema_validation.with_raw_response.get(
+                    zone_id="",
+                )
diff --git a/tests/api_resources/api_gateway/test_configurations.py b/tests/api_resources/api_gateway/test_configurations.py
index 13bdbc85420..6160549b819 100644
--- a/tests/api_resources/api_gateway/test_configurations.py
+++ b/tests/api_resources/api_gateway/test_configurations.py
@@ -9,10 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.api_gateway import (
-    Configuration,
-    ConfigurationUpdateResponse,
-)
+from cloudflare.types.api_gateway import Configuration
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -31,7 +28,21 @@ def test_method_update(self, client: Cloudflare) -> None:
                 }
             ],
         )
-        assert_matches_type(ConfigurationUpdateResponse, configuration, path=["response"])
+        assert_matches_type(Configuration, configuration, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        configuration = client.api_gateway.configurations.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            auth_id_characteristics=[
+                {
+                    "name": "authorization",
+                    "type": "header",
+                }
+            ],
+            normalize=True,
+        )
+        assert_matches_type(Configuration, configuration, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
@@ -48,7 +59,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         configuration = response.parse()
-        assert_matches_type(ConfigurationUpdateResponse, configuration, path=["response"])
+        assert_matches_type(Configuration, configuration, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
@@ -65,7 +76,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             configuration = response.parse()
-            assert_matches_type(ConfigurationUpdateResponse, configuration, path=["response"])
+            assert_matches_type(Configuration, configuration, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -93,7 +104,7 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         configuration = client.api_gateway.configurations.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            properties=["auth_id_characteristics"],
+            normalize=True,
         )
         assert_matches_type(Configuration, configuration, path=["response"])
 
@@ -130,7 +141,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncConfigurations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
@@ -143,7 +156,21 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
                 }
             ],
         )
-        assert_matches_type(ConfigurationUpdateResponse, configuration, path=["response"])
+        assert_matches_type(Configuration, configuration, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        configuration = await async_client.api_gateway.configurations.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            auth_id_characteristics=[
+                {
+                    "name": "authorization",
+                    "type": "header",
+                }
+            ],
+            normalize=True,
+        )
+        assert_matches_type(Configuration, configuration, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
@@ -160,7 +187,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         configuration = await response.parse()
-        assert_matches_type(ConfigurationUpdateResponse, configuration, path=["response"])
+        assert_matches_type(Configuration, configuration, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
@@ -177,7 +204,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             configuration = await response.parse()
-            assert_matches_type(ConfigurationUpdateResponse, configuration, path=["response"])
+            assert_matches_type(Configuration, configuration, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -205,7 +232,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         configuration = await async_client.api_gateway.configurations.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            properties=["auth_id_characteristics"],
+            normalize=True,
         )
         assert_matches_type(Configuration, configuration, path=["response"])
 
diff --git a/tests/api_resources/api_gateway/test_discovery.py b/tests/api_resources/api_gateway/test_discovery.py
index f41ab529266..94be7e36cd8 100644
--- a/tests/api_resources/api_gateway/test_discovery.py
+++ b/tests/api_resources/api_gateway/test_discovery.py
@@ -57,7 +57,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncDiscovery:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/api_gateway/test_operations.py b/tests/api_resources/api_gateway/test_operations.py
index 2e4570286b5..aab5d1b4997 100644
--- a/tests/api_resources/api_gateway/test_operations.py
+++ b/tests/api_resources/api_gateway/test_operations.py
@@ -9,12 +9,14 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.api_gateway import (
     OperationGetResponse,
     OperationListResponse,
     OperationCreateResponse,
     OperationDeleteResponse,
+    OperationBulkCreateResponse,
+    OperationBulkDeleteResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -27,23 +29,9 @@ class TestOperations:
     def test_method_create(self, client: Cloudflare) -> None:
         operation = client.api_gateway.operations.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[
-                {
-                    "endpoint": "/api/v1/users/{var1}",
-                    "host": "www.example.com",
-                    "method": "GET",
-                },
-                {
-                    "endpoint": "/api/v1/users/{var1}",
-                    "host": "www.example.com",
-                    "method": "GET",
-                },
-                {
-                    "endpoint": "/api/v1/users/{var1}",
-                    "host": "www.example.com",
-                    "method": "GET",
-                },
-            ],
+            endpoint="/api/v1/users/{var1}",
+            host="www.example.com",
+            method="GET",
         )
         assert_matches_type(OperationCreateResponse, operation, path=["response"])
 
@@ -51,23 +39,9 @@ def test_method_create(self, client: Cloudflare) -> None:
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.api_gateway.operations.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[
-                {
-                    "endpoint": "/api/v1/users/{var1}",
-                    "host": "www.example.com",
-                    "method": "GET",
-                },
-                {
-                    "endpoint": "/api/v1/users/{var1}",
-                    "host": "www.example.com",
-                    "method": "GET",
-                },
-                {
-                    "endpoint": "/api/v1/users/{var1}",
-                    "host": "www.example.com",
-                    "method": "GET",
-                },
-            ],
+            endpoint="/api/v1/users/{var1}",
+            host="www.example.com",
+            method="GET",
         )
 
         assert response.is_closed is True
@@ -79,23 +53,9 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.api_gateway.operations.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[
-                {
-                    "endpoint": "/api/v1/users/{var1}",
-                    "host": "www.example.com",
-                    "method": "GET",
-                },
-                {
-                    "endpoint": "/api/v1/users/{var1}",
-                    "host": "www.example.com",
-                    "method": "GET",
-                },
-                {
-                    "endpoint": "/api/v1/users/{var1}",
-                    "host": "www.example.com",
-                    "method": "GET",
-                },
-            ],
+            endpoint="/api/v1/users/{var1}",
+            host="www.example.com",
+            method="GET",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -110,23 +70,9 @@ def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.api_gateway.operations.with_raw_response.create(
                 zone_id="",
-                body=[
-                    {
-                        "endpoint": "/api/v1/users/{var1}",
-                        "host": "www.example.com",
-                        "method": "GET",
-                    },
-                    {
-                        "endpoint": "/api/v1/users/{var1}",
-                        "host": "www.example.com",
-                        "method": "GET",
-                    },
-                    {
-                        "endpoint": "/api/v1/users/{var1}",
-                        "host": "www.example.com",
-                        "method": "GET",
-                    },
-                ],
+                endpoint="/api/v1/users/{var1}",
+                host="www.example.com",
+                method="GET",
             )
 
     @parametrize
@@ -230,6 +176,110 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @parametrize
+    def test_method_bulk_create(self, client: Cloudflare) -> None:
+        operation = client.api_gateway.operations.bulk_create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "endpoint": "/api/v1/users/{var1}",
+                    "host": "www.example.com",
+                    "method": "GET",
+                }
+            ],
+        )
+        assert_matches_type(SyncSinglePage[OperationBulkCreateResponse], operation, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_create(self, client: Cloudflare) -> None:
+        response = client.api_gateway.operations.with_raw_response.bulk_create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "endpoint": "/api/v1/users/{var1}",
+                    "host": "www.example.com",
+                    "method": "GET",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        operation = response.parse()
+        assert_matches_type(SyncSinglePage[OperationBulkCreateResponse], operation, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_create(self, client: Cloudflare) -> None:
+        with client.api_gateway.operations.with_streaming_response.bulk_create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "endpoint": "/api/v1/users/{var1}",
+                    "host": "www.example.com",
+                    "method": "GET",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            operation = response.parse()
+            assert_matches_type(SyncSinglePage[OperationBulkCreateResponse], operation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.api_gateway.operations.with_raw_response.bulk_create(
+                zone_id="",
+                body=[
+                    {
+                        "endpoint": "/api/v1/users/{var1}",
+                        "host": "www.example.com",
+                        "method": "GET",
+                    }
+                ],
+            )
+
+    @parametrize
+    def test_method_bulk_delete(self, client: Cloudflare) -> None:
+        operation = client.api_gateway.operations.bulk_delete(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(OperationBulkDeleteResponse, operation, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_delete(self, client: Cloudflare) -> None:
+        response = client.api_gateway.operations.with_raw_response.bulk_delete(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        operation = response.parse()
+        assert_matches_type(OperationBulkDeleteResponse, operation, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_delete(self, client: Cloudflare) -> None:
+        with client.api_gateway.operations.with_streaming_response.bulk_delete(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            operation = response.parse()
+            assert_matches_type(OperationBulkDeleteResponse, operation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.api_gateway.operations.with_raw_response.bulk_delete(
+                zone_id="",
+            )
+
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         operation = client.api_gateway.operations.get(
@@ -289,29 +339,17 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncOperations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         operation = await async_client.api_gateway.operations.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[
-                {
-                    "endpoint": "/api/v1/users/{var1}",
-                    "host": "www.example.com",
-                    "method": "GET",
-                },
-                {
-                    "endpoint": "/api/v1/users/{var1}",
-                    "host": "www.example.com",
-                    "method": "GET",
-                },
-                {
-                    "endpoint": "/api/v1/users/{var1}",
-                    "host": "www.example.com",
-                    "method": "GET",
-                },
-            ],
+            endpoint="/api/v1/users/{var1}",
+            host="www.example.com",
+            method="GET",
         )
         assert_matches_type(OperationCreateResponse, operation, path=["response"])
 
@@ -319,23 +357,9 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.api_gateway.operations.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[
-                {
-                    "endpoint": "/api/v1/users/{var1}",
-                    "host": "www.example.com",
-                    "method": "GET",
-                },
-                {
-                    "endpoint": "/api/v1/users/{var1}",
-                    "host": "www.example.com",
-                    "method": "GET",
-                },
-                {
-                    "endpoint": "/api/v1/users/{var1}",
-                    "host": "www.example.com",
-                    "method": "GET",
-                },
-            ],
+            endpoint="/api/v1/users/{var1}",
+            host="www.example.com",
+            method="GET",
         )
 
         assert response.is_closed is True
@@ -347,23 +371,9 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.api_gateway.operations.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[
-                {
-                    "endpoint": "/api/v1/users/{var1}",
-                    "host": "www.example.com",
-                    "method": "GET",
-                },
-                {
-                    "endpoint": "/api/v1/users/{var1}",
-                    "host": "www.example.com",
-                    "method": "GET",
-                },
-                {
-                    "endpoint": "/api/v1/users/{var1}",
-                    "host": "www.example.com",
-                    "method": "GET",
-                },
-            ],
+            endpoint="/api/v1/users/{var1}",
+            host="www.example.com",
+            method="GET",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -378,23 +388,9 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.api_gateway.operations.with_raw_response.create(
                 zone_id="",
-                body=[
-                    {
-                        "endpoint": "/api/v1/users/{var1}",
-                        "host": "www.example.com",
-                        "method": "GET",
-                    },
-                    {
-                        "endpoint": "/api/v1/users/{var1}",
-                        "host": "www.example.com",
-                        "method": "GET",
-                    },
-                    {
-                        "endpoint": "/api/v1/users/{var1}",
-                        "host": "www.example.com",
-                        "method": "GET",
-                    },
-                ],
+                endpoint="/api/v1/users/{var1}",
+                host="www.example.com",
+                method="GET",
             )
 
     @parametrize
@@ -498,6 +494,110 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @parametrize
+    async def test_method_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        operation = await async_client.api_gateway.operations.bulk_create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "endpoint": "/api/v1/users/{var1}",
+                    "host": "www.example.com",
+                    "method": "GET",
+                }
+            ],
+        )
+        assert_matches_type(AsyncSinglePage[OperationBulkCreateResponse], operation, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.api_gateway.operations.with_raw_response.bulk_create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "endpoint": "/api/v1/users/{var1}",
+                    "host": "www.example.com",
+                    "method": "GET",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        operation = await response.parse()
+        assert_matches_type(AsyncSinglePage[OperationBulkCreateResponse], operation, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.api_gateway.operations.with_streaming_response.bulk_create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "endpoint": "/api/v1/users/{var1}",
+                    "host": "www.example.com",
+                    "method": "GET",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            operation = await response.parse()
+            assert_matches_type(AsyncSinglePage[OperationBulkCreateResponse], operation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.api_gateway.operations.with_raw_response.bulk_create(
+                zone_id="",
+                body=[
+                    {
+                        "endpoint": "/api/v1/users/{var1}",
+                        "host": "www.example.com",
+                        "method": "GET",
+                    }
+                ],
+            )
+
+    @parametrize
+    async def test_method_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        operation = await async_client.api_gateway.operations.bulk_delete(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(OperationBulkDeleteResponse, operation, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.api_gateway.operations.with_raw_response.bulk_delete(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        operation = await response.parse()
+        assert_matches_type(OperationBulkDeleteResponse, operation, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.api_gateway.operations.with_streaming_response.bulk_delete(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            operation = await response.parse()
+            assert_matches_type(OperationBulkDeleteResponse, operation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.api_gateway.operations.with_raw_response.bulk_delete(
+                zone_id="",
+            )
+
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         operation = await async_client.api_gateway.operations.get(
diff --git a/tests/api_resources/api_gateway/test_schemas.py b/tests/api_resources/api_gateway/test_schemas.py
index 5c2542b4cb5..df03ab73a6a 100644
--- a/tests/api_resources/api_gateway/test_schemas.py
+++ b/tests/api_resources/api_gateway/test_schemas.py
@@ -66,7 +66,9 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSchemas:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/api_gateway/test_user_schemas.py b/tests/api_resources/api_gateway/test_user_schemas.py
index 287bc62373d..f3f6c21272d 100644
--- a/tests/api_resources/api_gateway/test_user_schemas.py
+++ b/tests/api_resources/api_gateway/test_user_schemas.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -11,11 +11,13 @@
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.api_gateway import (
-    PublicSchema,
-    SchemaUpload,
+    OldPublicSchema,
+    UserSchemaCreateResponse,
     UserSchemaDeleteResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -24,540 +26,608 @@ class TestUserSchemas:
 
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
-        user_schema = client.api_gateway.user_schemas.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            file=b"raw file contents",
-            kind="openapi_v3",
-        )
-        assert_matches_type(SchemaUpload, user_schema, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            user_schema = client.api_gateway.user_schemas.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                file=b"raw file contents",
+                kind="openapi_v3",
+            )
+
+        assert_matches_type(UserSchemaCreateResponse, user_schema, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
-        user_schema = client.api_gateway.user_schemas.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            file=b"raw file contents",
-            kind="openapi_v3",
-            name="petstore schema",
-            validation_enabled="true",
-        )
-        assert_matches_type(SchemaUpload, user_schema, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            user_schema = client.api_gateway.user_schemas.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                file=b"raw file contents",
+                kind="openapi_v3",
+                name="petstore schema",
+                validation_enabled="true",
+            )
+
+        assert_matches_type(UserSchemaCreateResponse, user_schema, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.api_gateway.user_schemas.with_raw_response.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            file=b"raw file contents",
-            kind="openapi_v3",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.api_gateway.user_schemas.with_raw_response.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                file=b"raw file contents",
+                kind="openapi_v3",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         user_schema = response.parse()
-        assert_matches_type(SchemaUpload, user_schema, path=["response"])
+        assert_matches_type(UserSchemaCreateResponse, user_schema, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.api_gateway.user_schemas.with_streaming_response.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            file=b"raw file contents",
-            kind="openapi_v3",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.api_gateway.user_schemas.with_streaming_response.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                file=b"raw file contents",
+                kind="openapi_v3",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            user_schema = response.parse()
-            assert_matches_type(SchemaUpload, user_schema, path=["response"])
+                user_schema = response.parse()
+                assert_matches_type(UserSchemaCreateResponse, user_schema, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.api_gateway.user_schemas.with_raw_response.create(
-                zone_id="",
-                file=b"raw file contents",
-                kind="openapi_v3",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.api_gateway.user_schemas.with_raw_response.create(
+                    zone_id="",
+                    file=b"raw file contents",
+                    kind="openapi_v3",
+                )
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
-        user_schema = client.api_gateway.user_schemas.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SyncV4PagePaginationArray[PublicSchema], user_schema, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            user_schema = client.api_gateway.user_schemas.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(SyncV4PagePaginationArray[OldPublicSchema], user_schema, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
-        user_schema = client.api_gateway.user_schemas.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            omit_source=True,
-            page=1,
-            per_page=5,
-            validation_enabled=True,
-        )
-        assert_matches_type(SyncV4PagePaginationArray[PublicSchema], user_schema, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            user_schema = client.api_gateway.user_schemas.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                omit_source=True,
+                page=1,
+                per_page=5,
+                validation_enabled=True,
+            )
+
+        assert_matches_type(SyncV4PagePaginationArray[OldPublicSchema], user_schema, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.api_gateway.user_schemas.with_raw_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.api_gateway.user_schemas.with_raw_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         user_schema = response.parse()
-        assert_matches_type(SyncV4PagePaginationArray[PublicSchema], user_schema, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[OldPublicSchema], user_schema, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.api_gateway.user_schemas.with_streaming_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.api_gateway.user_schemas.with_streaming_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            user_schema = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[PublicSchema], user_schema, path=["response"])
+                user_schema = response.parse()
+                assert_matches_type(SyncV4PagePaginationArray[OldPublicSchema], user_schema, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.api_gateway.user_schemas.with_raw_response.list(
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.api_gateway.user_schemas.with_raw_response.list(
+                    zone_id="",
+                )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
-        user_schema = client.api_gateway.user_schemas.delete(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[UserSchemaDeleteResponse], user_schema, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            user_schema = client.api_gateway.user_schemas.delete(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(UserSchemaDeleteResponse, user_schema, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.api_gateway.user_schemas.with_raw_response.delete(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.api_gateway.user_schemas.with_raw_response.delete(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         user_schema = response.parse()
-        assert_matches_type(Optional[UserSchemaDeleteResponse], user_schema, path=["response"])
+        assert_matches_type(UserSchemaDeleteResponse, user_schema, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.api_gateway.user_schemas.with_streaming_response.delete(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.api_gateway.user_schemas.with_streaming_response.delete(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            user_schema = response.parse()
-            assert_matches_type(Optional[UserSchemaDeleteResponse], user_schema, path=["response"])
+                user_schema = response.parse()
+                assert_matches_type(UserSchemaDeleteResponse, user_schema, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.api_gateway.user_schemas.with_raw_response.delete(
-                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.api_gateway.user_schemas.with_raw_response.delete(
+                    schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    zone_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
-            client.api_gateway.user_schemas.with_raw_response.delete(
-                schema_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
+                client.api_gateway.user_schemas.with_raw_response.delete(
+                    schema_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
     @parametrize
     def test_method_edit(self, client: Cloudflare) -> None:
-        user_schema = client.api_gateway.user_schemas.edit(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(PublicSchema, user_schema, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            user_schema = client.api_gateway.user_schemas.edit(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(OldPublicSchema, user_schema, path=["response"])
 
     @parametrize
     def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
-        user_schema = client.api_gateway.user_schemas.edit(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            validation_enabled=True,
-        )
-        assert_matches_type(PublicSchema, user_schema, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            user_schema = client.api_gateway.user_schemas.edit(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                validation_enabled=True,
+            )
+
+        assert_matches_type(OldPublicSchema, user_schema, path=["response"])
 
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
-        response = client.api_gateway.user_schemas.with_raw_response.edit(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.api_gateway.user_schemas.with_raw_response.edit(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         user_schema = response.parse()
-        assert_matches_type(PublicSchema, user_schema, path=["response"])
+        assert_matches_type(OldPublicSchema, user_schema, path=["response"])
 
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
-        with client.api_gateway.user_schemas.with_streaming_response.edit(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.api_gateway.user_schemas.with_streaming_response.edit(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            user_schema = response.parse()
-            assert_matches_type(PublicSchema, user_schema, path=["response"])
+                user_schema = response.parse()
+                assert_matches_type(OldPublicSchema, user_schema, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_edit(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.api_gateway.user_schemas.with_raw_response.edit(
-                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.api_gateway.user_schemas.with_raw_response.edit(
+                    schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    zone_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
-            client.api_gateway.user_schemas.with_raw_response.edit(
-                schema_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
+                client.api_gateway.user_schemas.with_raw_response.edit(
+                    schema_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        user_schema = client.api_gateway.user_schemas.get(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(PublicSchema, user_schema, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            user_schema = client.api_gateway.user_schemas.get(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(OldPublicSchema, user_schema, path=["response"])
 
     @parametrize
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
-        user_schema = client.api_gateway.user_schemas.get(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            omit_source=True,
-        )
-        assert_matches_type(PublicSchema, user_schema, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            user_schema = client.api_gateway.user_schemas.get(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                omit_source=True,
+            )
+
+        assert_matches_type(OldPublicSchema, user_schema, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.api_gateway.user_schemas.with_raw_response.get(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.api_gateway.user_schemas.with_raw_response.get(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         user_schema = response.parse()
-        assert_matches_type(PublicSchema, user_schema, path=["response"])
+        assert_matches_type(OldPublicSchema, user_schema, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.api_gateway.user_schemas.with_streaming_response.get(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.api_gateway.user_schemas.with_streaming_response.get(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            user_schema = response.parse()
-            assert_matches_type(PublicSchema, user_schema, path=["response"])
+                user_schema = response.parse()
+                assert_matches_type(OldPublicSchema, user_schema, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.api_gateway.user_schemas.with_raw_response.get(
-                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.api_gateway.user_schemas.with_raw_response.get(
+                    schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    zone_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
-            client.api_gateway.user_schemas.with_raw_response.get(
-                schema_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
+                client.api_gateway.user_schemas.with_raw_response.get(
+                    schema_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
 
 class TestAsyncUserSchemas:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        user_schema = await async_client.api_gateway.user_schemas.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            file=b"raw file contents",
-            kind="openapi_v3",
-        )
-        assert_matches_type(SchemaUpload, user_schema, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            user_schema = await async_client.api_gateway.user_schemas.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                file=b"raw file contents",
+                kind="openapi_v3",
+            )
+
+        assert_matches_type(UserSchemaCreateResponse, user_schema, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        user_schema = await async_client.api_gateway.user_schemas.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            file=b"raw file contents",
-            kind="openapi_v3",
-            name="petstore schema",
-            validation_enabled="true",
-        )
-        assert_matches_type(SchemaUpload, user_schema, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            user_schema = await async_client.api_gateway.user_schemas.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                file=b"raw file contents",
+                kind="openapi_v3",
+                name="petstore schema",
+                validation_enabled="true",
+            )
+
+        assert_matches_type(UserSchemaCreateResponse, user_schema, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.api_gateway.user_schemas.with_raw_response.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            file=b"raw file contents",
-            kind="openapi_v3",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.api_gateway.user_schemas.with_raw_response.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                file=b"raw file contents",
+                kind="openapi_v3",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         user_schema = await response.parse()
-        assert_matches_type(SchemaUpload, user_schema, path=["response"])
+        assert_matches_type(UserSchemaCreateResponse, user_schema, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.api_gateway.user_schemas.with_streaming_response.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            file=b"raw file contents",
-            kind="openapi_v3",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.api_gateway.user_schemas.with_streaming_response.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                file=b"raw file contents",
+                kind="openapi_v3",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            user_schema = await response.parse()
-            assert_matches_type(SchemaUpload, user_schema, path=["response"])
+                user_schema = await response.parse()
+                assert_matches_type(UserSchemaCreateResponse, user_schema, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.api_gateway.user_schemas.with_raw_response.create(
-                zone_id="",
-                file=b"raw file contents",
-                kind="openapi_v3",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.api_gateway.user_schemas.with_raw_response.create(
+                    zone_id="",
+                    file=b"raw file contents",
+                    kind="openapi_v3",
+                )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        user_schema = await async_client.api_gateway.user_schemas.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(AsyncV4PagePaginationArray[PublicSchema], user_schema, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            user_schema = await async_client.api_gateway.user_schemas.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(AsyncV4PagePaginationArray[OldPublicSchema], user_schema, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        user_schema = await async_client.api_gateway.user_schemas.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            omit_source=True,
-            page=1,
-            per_page=5,
-            validation_enabled=True,
-        )
-        assert_matches_type(AsyncV4PagePaginationArray[PublicSchema], user_schema, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            user_schema = await async_client.api_gateway.user_schemas.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                omit_source=True,
+                page=1,
+                per_page=5,
+                validation_enabled=True,
+            )
+
+        assert_matches_type(AsyncV4PagePaginationArray[OldPublicSchema], user_schema, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.api_gateway.user_schemas.with_raw_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.api_gateway.user_schemas.with_raw_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         user_schema = await response.parse()
-        assert_matches_type(AsyncV4PagePaginationArray[PublicSchema], user_schema, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[OldPublicSchema], user_schema, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.api_gateway.user_schemas.with_streaming_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.api_gateway.user_schemas.with_streaming_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            user_schema = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[PublicSchema], user_schema, path=["response"])
+                user_schema = await response.parse()
+                assert_matches_type(AsyncV4PagePaginationArray[OldPublicSchema], user_schema, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.api_gateway.user_schemas.with_raw_response.list(
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.api_gateway.user_schemas.with_raw_response.list(
+                    zone_id="",
+                )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        user_schema = await async_client.api_gateway.user_schemas.delete(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[UserSchemaDeleteResponse], user_schema, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            user_schema = await async_client.api_gateway.user_schemas.delete(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(UserSchemaDeleteResponse, user_schema, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.api_gateway.user_schemas.with_raw_response.delete(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.api_gateway.user_schemas.with_raw_response.delete(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         user_schema = await response.parse()
-        assert_matches_type(Optional[UserSchemaDeleteResponse], user_schema, path=["response"])
+        assert_matches_type(UserSchemaDeleteResponse, user_schema, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.api_gateway.user_schemas.with_streaming_response.delete(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.api_gateway.user_schemas.with_streaming_response.delete(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            user_schema = await response.parse()
-            assert_matches_type(Optional[UserSchemaDeleteResponse], user_schema, path=["response"])
+                user_schema = await response.parse()
+                assert_matches_type(UserSchemaDeleteResponse, user_schema, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.api_gateway.user_schemas.with_raw_response.delete(
-                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.api_gateway.user_schemas.with_raw_response.delete(
+                    schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    zone_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
-            await async_client.api_gateway.user_schemas.with_raw_response.delete(
-                schema_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
+                await async_client.api_gateway.user_schemas.with_raw_response.delete(
+                    schema_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
-        user_schema = await async_client.api_gateway.user_schemas.edit(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(PublicSchema, user_schema, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            user_schema = await async_client.api_gateway.user_schemas.edit(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(OldPublicSchema, user_schema, path=["response"])
 
     @parametrize
     async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        user_schema = await async_client.api_gateway.user_schemas.edit(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            validation_enabled=True,
-        )
-        assert_matches_type(PublicSchema, user_schema, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            user_schema = await async_client.api_gateway.user_schemas.edit(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                validation_enabled=True,
+            )
+
+        assert_matches_type(OldPublicSchema, user_schema, path=["response"])
 
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.api_gateway.user_schemas.with_raw_response.edit(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.api_gateway.user_schemas.with_raw_response.edit(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         user_schema = await response.parse()
-        assert_matches_type(PublicSchema, user_schema, path=["response"])
+        assert_matches_type(OldPublicSchema, user_schema, path=["response"])
 
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.api_gateway.user_schemas.with_streaming_response.edit(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.api_gateway.user_schemas.with_streaming_response.edit(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            user_schema = await response.parse()
-            assert_matches_type(PublicSchema, user_schema, path=["response"])
+                user_schema = await response.parse()
+                assert_matches_type(OldPublicSchema, user_schema, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.api_gateway.user_schemas.with_raw_response.edit(
-                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.api_gateway.user_schemas.with_raw_response.edit(
+                    schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    zone_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
-            await async_client.api_gateway.user_schemas.with_raw_response.edit(
-                schema_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
+                await async_client.api_gateway.user_schemas.with_raw_response.edit(
+                    schema_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        user_schema = await async_client.api_gateway.user_schemas.get(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(PublicSchema, user_schema, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            user_schema = await async_client.api_gateway.user_schemas.get(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(OldPublicSchema, user_schema, path=["response"])
 
     @parametrize
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        user_schema = await async_client.api_gateway.user_schemas.get(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            omit_source=True,
-        )
-        assert_matches_type(PublicSchema, user_schema, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            user_schema = await async_client.api_gateway.user_schemas.get(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                omit_source=True,
+            )
+
+        assert_matches_type(OldPublicSchema, user_schema, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.api_gateway.user_schemas.with_raw_response.get(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.api_gateway.user_schemas.with_raw_response.get(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         user_schema = await response.parse()
-        assert_matches_type(PublicSchema, user_schema, path=["response"])
+        assert_matches_type(OldPublicSchema, user_schema, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.api_gateway.user_schemas.with_streaming_response.get(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.api_gateway.user_schemas.with_streaming_response.get(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            user_schema = await response.parse()
-            assert_matches_type(PublicSchema, user_schema, path=["response"])
+                user_schema = await response.parse()
+                assert_matches_type(OldPublicSchema, user_schema, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.api_gateway.user_schemas.with_raw_response.get(
-                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                zone_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
-            await async_client.api_gateway.user_schemas.with_raw_response.get(
-                schema_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.api_gateway.user_schemas.with_raw_response.get(
+                    schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    zone_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
+                await async_client.api_gateway.user_schemas.with_raw_response.get(
+                    schema_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
diff --git a/tests/api_resources/api_gateway/user_schemas/test_hosts.py b/tests/api_resources/api_gateway/user_schemas/test_hosts.py
new file mode 100644
index 00000000000..37f783ef2e5
--- /dev/null
+++ b/tests/api_resources/api_gateway/user_schemas/test_hosts.py
@@ -0,0 +1,135 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.api_gateway.user_schemas import HostListResponse
+
+# pyright: reportDeprecated=false
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestHosts:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            host = client.api_gateway.user_schemas.hosts.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(SyncV4PagePaginationArray[HostListResponse], host, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            host = client.api_gateway.user_schemas.hosts.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                page=1,
+                per_page=5,
+            )
+
+        assert_matches_type(SyncV4PagePaginationArray[HostListResponse], host, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.api_gateway.user_schemas.hosts.with_raw_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        host = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[HostListResponse], host, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.api_gateway.user_schemas.hosts.with_streaming_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                host = response.parse()
+                assert_matches_type(SyncV4PagePaginationArray[HostListResponse], host, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.api_gateway.user_schemas.hosts.with_raw_response.list(
+                    zone_id="",
+                )
+
+
+class TestAsyncHosts:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            host = await async_client.api_gateway.user_schemas.hosts.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(AsyncV4PagePaginationArray[HostListResponse], host, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            host = await async_client.api_gateway.user_schemas.hosts.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                page=1,
+                per_page=5,
+            )
+
+        assert_matches_type(AsyncV4PagePaginationArray[HostListResponse], host, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.api_gateway.user_schemas.hosts.with_raw_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        host = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[HostListResponse], host, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.api_gateway.user_schemas.hosts.with_streaming_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                host = await response.parse()
+                assert_matches_type(AsyncV4PagePaginationArray[HostListResponse], host, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.api_gateway.user_schemas.hosts.with_raw_response.list(
+                    zone_id="",
+                )
diff --git a/tests/api_resources/api_gateway/user_schemas/test_operations.py b/tests/api_resources/api_gateway/user_schemas/test_operations.py
index 64234507893..be56db3c8ee 100644
--- a/tests/api_resources/api_gateway/user_schemas/test_operations.py
+++ b/tests/api_resources/api_gateway/user_schemas/test_operations.py
@@ -12,6 +12,8 @@
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.api_gateway.user_schemas import OperationListResponse
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -20,33 +22,38 @@ class TestOperations:
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
-        operation = client.api_gateway.user_schemas.operations.list(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            operation = client.api_gateway.user_schemas.operations.list(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(SyncV4PagePaginationArray[OperationListResponse], operation, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
-        operation = client.api_gateway.user_schemas.operations.list(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            endpoint="/api/v1",
-            feature=["thresholds"],
-            host=["api.cloudflare.com"],
-            method=["GET"],
-            operation_status="new",
-            page=1,
-            per_page=5,
-        )
+        with pytest.warns(DeprecationWarning):
+            operation = client.api_gateway.user_schemas.operations.list(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                endpoint="/api/v1",
+                feature=["thresholds"],
+                host=["api.cloudflare.com"],
+                method=["GET"],
+                operation_status="new",
+                page=1,
+                per_page=5,
+            )
+
         assert_matches_type(SyncV4PagePaginationArray[OperationListResponse], operation, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.api_gateway.user_schemas.operations.with_raw_response.list(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.api_gateway.user_schemas.operations.with_raw_response.list(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -55,65 +62,74 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.api_gateway.user_schemas.operations.with_streaming_response.list(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.api_gateway.user_schemas.operations.with_streaming_response.list(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            operation = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[OperationListResponse], operation, path=["response"])
+                operation = response.parse()
+                assert_matches_type(SyncV4PagePaginationArray[OperationListResponse], operation, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.api_gateway.user_schemas.operations.with_raw_response.list(
-                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.api_gateway.user_schemas.operations.with_raw_response.list(
+                    schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    zone_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
-            client.api_gateway.user_schemas.operations.with_raw_response.list(
-                schema_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
+                client.api_gateway.user_schemas.operations.with_raw_response.list(
+                    schema_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
 
 class TestAsyncOperations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        operation = await async_client.api_gateway.user_schemas.operations.list(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            operation = await async_client.api_gateway.user_schemas.operations.list(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(AsyncV4PagePaginationArray[OperationListResponse], operation, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        operation = await async_client.api_gateway.user_schemas.operations.list(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            endpoint="/api/v1",
-            feature=["thresholds"],
-            host=["api.cloudflare.com"],
-            method=["GET"],
-            operation_status="new",
-            page=1,
-            per_page=5,
-        )
+        with pytest.warns(DeprecationWarning):
+            operation = await async_client.api_gateway.user_schemas.operations.list(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                endpoint="/api/v1",
+                feature=["thresholds"],
+                host=["api.cloudflare.com"],
+                method=["GET"],
+                operation_status="new",
+                page=1,
+                per_page=5,
+            )
+
         assert_matches_type(AsyncV4PagePaginationArray[OperationListResponse], operation, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.api_gateway.user_schemas.operations.with_raw_response.list(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.api_gateway.user_schemas.operations.with_raw_response.list(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -122,28 +138,30 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.api_gateway.user_schemas.operations.with_streaming_response.list(
-            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.api_gateway.user_schemas.operations.with_streaming_response.list(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            operation = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[OperationListResponse], operation, path=["response"])
+                operation = await response.parse()
+                assert_matches_type(AsyncV4PagePaginationArray[OperationListResponse], operation, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.api_gateway.user_schemas.operations.with_raw_response.list(
-                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                zone_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
-            await async_client.api_gateway.user_schemas.operations.with_raw_response.list(
-                schema_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.api_gateway.user_schemas.operations.with_raw_response.list(
+                    schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    zone_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
+                await async_client.api_gateway.user_schemas.operations.with_raw_response.list(
+                    schema_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
diff --git a/tests/api_resources/argo/test_smart_routing.py b/tests/api_resources/argo/test_smart_routing.py
index 8622689044d..b568bb4fbb1 100644
--- a/tests/api_resources/argo/test_smart_routing.py
+++ b/tests/api_resources/argo/test_smart_routing.py
@@ -99,7 +99,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSmartRouting:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/argo/test_tiered_caching.py b/tests/api_resources/argo/test_tiered_caching.py
index 9afbafa5d1c..9055eebb8b8 100644
--- a/tests/api_resources/argo/test_tiered_caching.py
+++ b/tests/api_resources/argo/test_tiered_caching.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
@@ -23,7 +23,7 @@ def test_method_edit(self, client: Cloudflare) -> None:
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             value="on",
         )
-        assert_matches_type(TieredCachingEditResponse, tiered_caching, path=["response"])
+        assert_matches_type(Optional[TieredCachingEditResponse], tiered_caching, path=["response"])
 
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
@@ -35,7 +35,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         tiered_caching = response.parse()
-        assert_matches_type(TieredCachingEditResponse, tiered_caching, path=["response"])
+        assert_matches_type(Optional[TieredCachingEditResponse], tiered_caching, path=["response"])
 
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
@@ -47,7 +47,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             tiered_caching = response.parse()
-            assert_matches_type(TieredCachingEditResponse, tiered_caching, path=["response"])
+            assert_matches_type(Optional[TieredCachingEditResponse], tiered_caching, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -64,7 +64,7 @@ def test_method_get(self, client: Cloudflare) -> None:
         tiered_caching = client.argo.tiered_caching.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(TieredCachingGetResponse, tiered_caching, path=["response"])
+        assert_matches_type(Optional[TieredCachingGetResponse], tiered_caching, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -75,7 +75,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         tiered_caching = response.parse()
-        assert_matches_type(TieredCachingGetResponse, tiered_caching, path=["response"])
+        assert_matches_type(Optional[TieredCachingGetResponse], tiered_caching, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -86,7 +86,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             tiered_caching = response.parse()
-            assert_matches_type(TieredCachingGetResponse, tiered_caching, path=["response"])
+            assert_matches_type(Optional[TieredCachingGetResponse], tiered_caching, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -99,7 +99,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTieredCaching:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
@@ -107,7 +109,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             value="on",
         )
-        assert_matches_type(TieredCachingEditResponse, tiered_caching, path=["response"])
+        assert_matches_type(Optional[TieredCachingEditResponse], tiered_caching, path=["response"])
 
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -119,7 +121,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         tiered_caching = await response.parse()
-        assert_matches_type(TieredCachingEditResponse, tiered_caching, path=["response"])
+        assert_matches_type(Optional[TieredCachingEditResponse], tiered_caching, path=["response"])
 
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -131,7 +133,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             tiered_caching = await response.parse()
-            assert_matches_type(TieredCachingEditResponse, tiered_caching, path=["response"])
+            assert_matches_type(Optional[TieredCachingEditResponse], tiered_caching, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -148,7 +150,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         tiered_caching = await async_client.argo.tiered_caching.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(TieredCachingGetResponse, tiered_caching, path=["response"])
+        assert_matches_type(Optional[TieredCachingGetResponse], tiered_caching, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -159,7 +161,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         tiered_caching = await response.parse()
-        assert_matches_type(TieredCachingGetResponse, tiered_caching, path=["response"])
+        assert_matches_type(Optional[TieredCachingGetResponse], tiered_caching, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -170,7 +172,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             tiered_caching = await response.parse()
-            assert_matches_type(TieredCachingGetResponse, tiered_caching, path=["response"])
+            assert_matches_type(Optional[TieredCachingGetResponse], tiered_caching, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/billing/test_profiles.py b/tests/api_resources/billing/test_profiles.py
index 03230b18439..faf0afcb458 100644
--- a/tests/api_resources/billing/test_profiles.py
+++ b/tests/api_resources/billing/test_profiles.py
@@ -11,6 +11,8 @@
 from tests.utils import assert_matches_type
 from cloudflare.types.billing import ProfileGetResponse
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -19,16 +21,19 @@ class TestProfiles:
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        profile = client.billing.profiles.get(
-            {},
-        )
+        with pytest.warns(DeprecationWarning):
+            profile = client.billing.profiles.get(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(ProfileGetResponse, profile, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.billing.profiles.with_raw_response.get(
-            {},
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.billing.profiles.with_raw_response.get(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -37,33 +42,47 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.billing.profiles.with_streaming_response.get(
-            {},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.billing.profiles.with_streaming_response.get(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            profile = response.parse()
-            assert_matches_type(ProfileGetResponse, profile, path=["response"])
+                profile = response.parse()
+                assert_matches_type(ProfileGetResponse, profile, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.billing.profiles.with_raw_response.get(
+                    account_id="",
+                )
+
 
 class TestAsyncProfiles:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        profile = await async_client.billing.profiles.get(
-            {},
-        )
+        with pytest.warns(DeprecationWarning):
+            profile = await async_client.billing.profiles.get(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(ProfileGetResponse, profile, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.billing.profiles.with_raw_response.get(
-            {},
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.billing.profiles.with_raw_response.get(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -72,13 +91,22 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.billing.profiles.with_streaming_response.get(
-            {},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.billing.profiles.with_streaming_response.get(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            profile = await response.parse()
-            assert_matches_type(ProfileGetResponse, profile, path=["response"])
+                profile = await response.parse()
+                assert_matches_type(ProfileGetResponse, profile, path=["response"])
 
         assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.billing.profiles.with_raw_response.get(
+                    account_id="",
+                )
diff --git a/tests/api_resources/event_notifications/r2/configuration/__init__.py b/tests/api_resources/botnet_feed/__init__.py
old mode 100644
new mode 100755
similarity index 100%
rename from tests/api_resources/event_notifications/r2/configuration/__init__.py
rename to tests/api_resources/botnet_feed/__init__.py
diff --git a/tests/api_resources/origin_tls_client_auth/hostnames/__init__.py b/tests/api_resources/botnet_feed/configs/__init__.py
old mode 100644
new mode 100755
similarity index 100%
rename from tests/api_resources/origin_tls_client_auth/hostnames/__init__.py
rename to tests/api_resources/botnet_feed/configs/__init__.py
diff --git a/tests/api_resources/botnet_feed/configs/test_asn.py b/tests/api_resources/botnet_feed/configs/test_asn.py
new file mode 100755
index 00000000000..7a026bc4696
--- /dev/null
+++ b/tests/api_resources/botnet_feed/configs/test_asn.py
@@ -0,0 +1,184 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.botnet_feed.configs import ASNGetResponse, ASNDeleteResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestASN:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        asn = client.botnet_feed.configs.asn.delete(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ASNDeleteResponse], asn, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.botnet_feed.configs.asn.with_raw_response.delete(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asn = response.parse()
+        assert_matches_type(Optional[ASNDeleteResponse], asn, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.botnet_feed.configs.asn.with_streaming_response.delete(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asn = response.parse()
+            assert_matches_type(Optional[ASNDeleteResponse], asn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.botnet_feed.configs.asn.with_raw_response.delete(
+                asn_id=0,
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        asn = client.botnet_feed.configs.asn.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ASNGetResponse], asn, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.botnet_feed.configs.asn.with_raw_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asn = response.parse()
+        assert_matches_type(Optional[ASNGetResponse], asn, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.botnet_feed.configs.asn.with_streaming_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asn = response.parse()
+            assert_matches_type(Optional[ASNGetResponse], asn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.botnet_feed.configs.asn.with_raw_response.get(
+                account_id="",
+            )
+
+
+class TestAsyncASN:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        asn = await async_client.botnet_feed.configs.asn.delete(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ASNDeleteResponse], asn, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.botnet_feed.configs.asn.with_raw_response.delete(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asn = await response.parse()
+        assert_matches_type(Optional[ASNDeleteResponse], asn, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.botnet_feed.configs.asn.with_streaming_response.delete(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asn = await response.parse()
+            assert_matches_type(Optional[ASNDeleteResponse], asn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.botnet_feed.configs.asn.with_raw_response.delete(
+                asn_id=0,
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        asn = await async_client.botnet_feed.configs.asn.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ASNGetResponse], asn, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.botnet_feed.configs.asn.with_raw_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asn = await response.parse()
+        assert_matches_type(Optional[ASNGetResponse], asn, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.botnet_feed.configs.asn.with_streaming_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asn = await response.parse()
+            assert_matches_type(Optional[ASNGetResponse], asn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.botnet_feed.configs.asn.with_raw_response.get(
+                account_id="",
+            )
diff --git a/tests/api_resources/botnet_feed/test_asn.py b/tests/api_resources/botnet_feed/test_asn.py
new file mode 100755
index 00000000000..89f402069b3
--- /dev/null
+++ b/tests/api_resources/botnet_feed/test_asn.py
@@ -0,0 +1,211 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.botnet_feed import ASNDayReportResponse, ASNFullReportResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestASN:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_day_report(self, client: Cloudflare) -> None:
+        asn = client.botnet_feed.asn.day_report(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ASNDayReportResponse], asn, path=["response"])
+
+    @parametrize
+    def test_method_day_report_with_all_params(self, client: Cloudflare) -> None:
+        asn = client.botnet_feed.asn.day_report(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            date=parse_datetime("2014-01-01T05:20:00.12345Z"),
+        )
+        assert_matches_type(Optional[ASNDayReportResponse], asn, path=["response"])
+
+    @parametrize
+    def test_raw_response_day_report(self, client: Cloudflare) -> None:
+        response = client.botnet_feed.asn.with_raw_response.day_report(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asn = response.parse()
+        assert_matches_type(Optional[ASNDayReportResponse], asn, path=["response"])
+
+    @parametrize
+    def test_streaming_response_day_report(self, client: Cloudflare) -> None:
+        with client.botnet_feed.asn.with_streaming_response.day_report(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asn = response.parse()
+            assert_matches_type(Optional[ASNDayReportResponse], asn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_day_report(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.botnet_feed.asn.with_raw_response.day_report(
+                asn_id=0,
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_full_report(self, client: Cloudflare) -> None:
+        asn = client.botnet_feed.asn.full_report(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ASNFullReportResponse], asn, path=["response"])
+
+    @parametrize
+    def test_raw_response_full_report(self, client: Cloudflare) -> None:
+        response = client.botnet_feed.asn.with_raw_response.full_report(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asn = response.parse()
+        assert_matches_type(Optional[ASNFullReportResponse], asn, path=["response"])
+
+    @parametrize
+    def test_streaming_response_full_report(self, client: Cloudflare) -> None:
+        with client.botnet_feed.asn.with_streaming_response.full_report(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asn = response.parse()
+            assert_matches_type(Optional[ASNFullReportResponse], asn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_full_report(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.botnet_feed.asn.with_raw_response.full_report(
+                asn_id=0,
+                account_id="",
+            )
+
+
+class TestAsyncASN:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_day_report(self, async_client: AsyncCloudflare) -> None:
+        asn = await async_client.botnet_feed.asn.day_report(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ASNDayReportResponse], asn, path=["response"])
+
+    @parametrize
+    async def test_method_day_report_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        asn = await async_client.botnet_feed.asn.day_report(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            date=parse_datetime("2014-01-01T05:20:00.12345Z"),
+        )
+        assert_matches_type(Optional[ASNDayReportResponse], asn, path=["response"])
+
+    @parametrize
+    async def test_raw_response_day_report(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.botnet_feed.asn.with_raw_response.day_report(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asn = await response.parse()
+        assert_matches_type(Optional[ASNDayReportResponse], asn, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_day_report(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.botnet_feed.asn.with_streaming_response.day_report(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asn = await response.parse()
+            assert_matches_type(Optional[ASNDayReportResponse], asn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_day_report(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.botnet_feed.asn.with_raw_response.day_report(
+                asn_id=0,
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_full_report(self, async_client: AsyncCloudflare) -> None:
+        asn = await async_client.botnet_feed.asn.full_report(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ASNFullReportResponse], asn, path=["response"])
+
+    @parametrize
+    async def test_raw_response_full_report(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.botnet_feed.asn.with_raw_response.full_report(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asn = await response.parse()
+        assert_matches_type(Optional[ASNFullReportResponse], asn, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_full_report(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.botnet_feed.asn.with_streaming_response.full_report(
+            asn_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asn = await response.parse()
+            assert_matches_type(Optional[ASNFullReportResponse], asn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_full_report(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.botnet_feed.asn.with_raw_response.full_report(
+                asn_id=0,
+                account_id="",
+            )
diff --git a/tests/api_resources/pagerules/__init__.py b/tests/api_resources/brand_protection/__init__.py
similarity index 100%
rename from tests/api_resources/pagerules/__init__.py
rename to tests/api_resources/brand_protection/__init__.py
diff --git a/tests/api_resources/brand_protection/test_logo_matches.py b/tests/api_resources/brand_protection/test_logo_matches.py
new file mode 100644
index 00000000000..27c7c7723dd
--- /dev/null
+++ b/tests/api_resources/brand_protection/test_logo_matches.py
@@ -0,0 +1,239 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.brand_protection import (
+    LogoMatchGetResponse,
+    LogoMatchDownloadResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestLogoMatches:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    def test_method_download(self, client: Cloudflare) -> None:
+        logo_match = client.brand_protection.logo_matches.download(
+            account_id="x",
+        )
+        assert_matches_type(LogoMatchDownloadResponse, logo_match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    def test_method_download_with_all_params(self, client: Cloudflare) -> None:
+        logo_match = client.brand_protection.logo_matches.download(
+            account_id="x",
+            limit="limit",
+            logo_id=["string"],
+            offset="offset",
+        )
+        assert_matches_type(LogoMatchDownloadResponse, logo_match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    def test_raw_response_download(self, client: Cloudflare) -> None:
+        response = client.brand_protection.logo_matches.with_raw_response.download(
+            account_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        logo_match = response.parse()
+        assert_matches_type(LogoMatchDownloadResponse, logo_match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    def test_streaming_response_download(self, client: Cloudflare) -> None:
+        with client.brand_protection.logo_matches.with_streaming_response.download(
+            account_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            logo_match = response.parse()
+            assert_matches_type(LogoMatchDownloadResponse, logo_match, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    def test_path_params_download(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.brand_protection.logo_matches.with_raw_response.download(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        logo_match = client.brand_protection.logo_matches.get(
+            account_id="x",
+        )
+        assert_matches_type(LogoMatchGetResponse, logo_match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        logo_match = client.brand_protection.logo_matches.get(
+            account_id="x",
+            limit="limit",
+            logo_id=["string"],
+            offset="offset",
+        )
+        assert_matches_type(LogoMatchGetResponse, logo_match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.brand_protection.logo_matches.with_raw_response.get(
+            account_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        logo_match = response.parse()
+        assert_matches_type(LogoMatchGetResponse, logo_match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.brand_protection.logo_matches.with_streaming_response.get(
+            account_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            logo_match = response.parse()
+            assert_matches_type(LogoMatchGetResponse, logo_match, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.brand_protection.logo_matches.with_raw_response.get(
+                account_id="",
+            )
+
+
+class TestAsyncLogoMatches:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    async def test_method_download(self, async_client: AsyncCloudflare) -> None:
+        logo_match = await async_client.brand_protection.logo_matches.download(
+            account_id="x",
+        )
+        assert_matches_type(LogoMatchDownloadResponse, logo_match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    async def test_method_download_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        logo_match = await async_client.brand_protection.logo_matches.download(
+            account_id="x",
+            limit="limit",
+            logo_id=["string"],
+            offset="offset",
+        )
+        assert_matches_type(LogoMatchDownloadResponse, logo_match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    async def test_raw_response_download(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.brand_protection.logo_matches.with_raw_response.download(
+            account_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        logo_match = await response.parse()
+        assert_matches_type(LogoMatchDownloadResponse, logo_match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    async def test_streaming_response_download(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.brand_protection.logo_matches.with_streaming_response.download(
+            account_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            logo_match = await response.parse()
+            assert_matches_type(LogoMatchDownloadResponse, logo_match, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    async def test_path_params_download(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.brand_protection.logo_matches.with_raw_response.download(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        logo_match = await async_client.brand_protection.logo_matches.get(
+            account_id="x",
+        )
+        assert_matches_type(LogoMatchGetResponse, logo_match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        logo_match = await async_client.brand_protection.logo_matches.get(
+            account_id="x",
+            limit="limit",
+            logo_id=["string"],
+            offset="offset",
+        )
+        assert_matches_type(LogoMatchGetResponse, logo_match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.brand_protection.logo_matches.with_raw_response.get(
+            account_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        logo_match = await response.parse()
+        assert_matches_type(LogoMatchGetResponse, logo_match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.brand_protection.logo_matches.with_streaming_response.get(
+            account_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            logo_match = await response.parse()
+            assert_matches_type(LogoMatchGetResponse, logo_match, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.brand_protection.logo_matches.with_raw_response.get(
+                account_id="",
+            )
diff --git a/tests/api_resources/brand_protection/test_logos.py b/tests/api_resources/brand_protection/test_logos.py
new file mode 100644
index 00000000000..4d6740bb7f4
--- /dev/null
+++ b/tests/api_resources/brand_protection/test_logos.py
@@ -0,0 +1,236 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.brand_protection import LogoCreateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestLogos:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 422 Unprocessable Entity")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        logo = client.brand_protection.logos.create(
+            account_id="x",
+        )
+        assert_matches_type(LogoCreateResponse, logo, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 422 Unprocessable Entity")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        logo = client.brand_protection.logos.create(
+            account_id="x",
+            match_type="match_type",
+            tag="tag",
+            threshold=0,
+            image=b"raw file contents",
+        )
+        assert_matches_type(LogoCreateResponse, logo, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 422 Unprocessable Entity")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.brand_protection.logos.with_raw_response.create(
+            account_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        logo = response.parse()
+        assert_matches_type(LogoCreateResponse, logo, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 422 Unprocessable Entity")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.brand_protection.logos.with_streaming_response.create(
+            account_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            logo = response.parse()
+            assert_matches_type(LogoCreateResponse, logo, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 422 Unprocessable Entity")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.brand_protection.logos.with_raw_response.create(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        logo = client.brand_protection.logos.delete(
+            logo_id="x",
+            account_id="x",
+        )
+        assert logo is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.brand_protection.logos.with_raw_response.delete(
+            logo_id="x",
+            account_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        logo = response.parse()
+        assert logo is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.brand_protection.logos.with_streaming_response.delete(
+            logo_id="x",
+            account_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            logo = response.parse()
+            assert logo is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.brand_protection.logos.with_raw_response.delete(
+                logo_id="x",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `logo_id` but received ''"):
+            client.brand_protection.logos.with_raw_response.delete(
+                logo_id="",
+                account_id="x",
+            )
+
+
+class TestAsyncLogos:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 422 Unprocessable Entity")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        logo = await async_client.brand_protection.logos.create(
+            account_id="x",
+        )
+        assert_matches_type(LogoCreateResponse, logo, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 422 Unprocessable Entity")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        logo = await async_client.brand_protection.logos.create(
+            account_id="x",
+            match_type="match_type",
+            tag="tag",
+            threshold=0,
+            image=b"raw file contents",
+        )
+        assert_matches_type(LogoCreateResponse, logo, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 422 Unprocessable Entity")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.brand_protection.logos.with_raw_response.create(
+            account_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        logo = await response.parse()
+        assert_matches_type(LogoCreateResponse, logo, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 422 Unprocessable Entity")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.brand_protection.logos.with_streaming_response.create(
+            account_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            logo = await response.parse()
+            assert_matches_type(LogoCreateResponse, logo, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 422 Unprocessable Entity")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.brand_protection.logos.with_raw_response.create(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        logo = await async_client.brand_protection.logos.delete(
+            logo_id="x",
+            account_id="x",
+        )
+        assert logo is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.brand_protection.logos.with_raw_response.delete(
+            logo_id="x",
+            account_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        logo = await response.parse()
+        assert logo is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.brand_protection.logos.with_streaming_response.delete(
+            logo_id="x",
+            account_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            logo = await response.parse()
+            assert logo is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized error")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.brand_protection.logos.with_raw_response.delete(
+                logo_id="x",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `logo_id` but received ''"):
+            await async_client.brand_protection.logos.with_raw_response.delete(
+                logo_id="",
+                account_id="x",
+            )
diff --git a/tests/api_resources/brand_protection/test_matches.py b/tests/api_resources/brand_protection/test_matches.py
new file mode 100644
index 00000000000..fb28396847a
--- /dev/null
+++ b/tests/api_resources/brand_protection/test_matches.py
@@ -0,0 +1,243 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.brand_protection import (
+    MatchGetResponse,
+    MatchDownloadResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestMatches:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_method_download(self, client: Cloudflare) -> None:
+        match = client.brand_protection.matches.download(
+            account_id="x",
+        )
+        assert_matches_type(MatchDownloadResponse, match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_method_download_with_all_params(self, client: Cloudflare) -> None:
+        match = client.brand_protection.matches.download(
+            account_id="x",
+            id="id",
+            include_domain_id=True,
+            limit=0,
+            offset=0,
+        )
+        assert_matches_type(MatchDownloadResponse, match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_raw_response_download(self, client: Cloudflare) -> None:
+        response = client.brand_protection.matches.with_raw_response.download(
+            account_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        match = response.parse()
+        assert_matches_type(MatchDownloadResponse, match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_streaming_response_download(self, client: Cloudflare) -> None:
+        with client.brand_protection.matches.with_streaming_response.download(
+            account_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            match = response.parse()
+            assert_matches_type(MatchDownloadResponse, match, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_path_params_download(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.brand_protection.matches.with_raw_response.download(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        match = client.brand_protection.matches.get(
+            account_id="x",
+        )
+        assert_matches_type(MatchGetResponse, match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        match = client.brand_protection.matches.get(
+            account_id="x",
+            id="id",
+            include_domain_id=True,
+            limit=0,
+            offset=0,
+        )
+        assert_matches_type(MatchGetResponse, match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.brand_protection.matches.with_raw_response.get(
+            account_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        match = response.parse()
+        assert_matches_type(MatchGetResponse, match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.brand_protection.matches.with_streaming_response.get(
+            account_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            match = response.parse()
+            assert_matches_type(MatchGetResponse, match, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.brand_protection.matches.with_raw_response.get(
+                account_id="",
+            )
+
+
+class TestAsyncMatches:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_method_download(self, async_client: AsyncCloudflare) -> None:
+        match = await async_client.brand_protection.matches.download(
+            account_id="x",
+        )
+        assert_matches_type(MatchDownloadResponse, match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_method_download_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        match = await async_client.brand_protection.matches.download(
+            account_id="x",
+            id="id",
+            include_domain_id=True,
+            limit=0,
+            offset=0,
+        )
+        assert_matches_type(MatchDownloadResponse, match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_raw_response_download(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.brand_protection.matches.with_raw_response.download(
+            account_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        match = await response.parse()
+        assert_matches_type(MatchDownloadResponse, match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_streaming_response_download(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.brand_protection.matches.with_streaming_response.download(
+            account_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            match = await response.parse()
+            assert_matches_type(MatchDownloadResponse, match, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_path_params_download(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.brand_protection.matches.with_raw_response.download(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        match = await async_client.brand_protection.matches.get(
+            account_id="x",
+        )
+        assert_matches_type(MatchGetResponse, match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        match = await async_client.brand_protection.matches.get(
+            account_id="x",
+            id="id",
+            include_domain_id=True,
+            limit=0,
+            offset=0,
+        )
+        assert_matches_type(MatchGetResponse, match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.brand_protection.matches.with_raw_response.get(
+            account_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        match = await response.parse()
+        assert_matches_type(MatchGetResponse, match, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.brand_protection.matches.with_streaming_response.get(
+            account_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            match = await response.parse()
+            assert_matches_type(MatchGetResponse, match, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.brand_protection.matches.with_raw_response.get(
+                account_id="",
+            )
diff --git a/tests/api_resources/brand_protection/test_queries.py b/tests/api_resources/brand_protection/test_queries.py
new file mode 100644
index 00000000000..94135ab542e
--- /dev/null
+++ b/tests/api_resources/brand_protection/test_queries.py
@@ -0,0 +1,347 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from cloudflare._utils import parse_datetime
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestQueries:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        query = client.brand_protection.queries.create(
+            account_id="x",
+        )
+        assert query is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        query = client.brand_protection.queries.create(
+            account_id="x",
+            id="id",
+            query_scan=True,
+            query_tag="tag",
+            max_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            min_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            body_scan=True,
+            string_matches={},
+            body_tag="tag",
+        )
+        assert query is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.brand_protection.queries.with_raw_response.create(
+            account_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        query = response.parse()
+        assert query is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.brand_protection.queries.with_streaming_response.create(
+            account_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            query = response.parse()
+            assert query is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.brand_protection.queries.with_raw_response.create(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        query = client.brand_protection.queries.delete(
+            account_id="x",
+        )
+        assert query is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
+        query = client.brand_protection.queries.delete(
+            account_id="x",
+            id="id",
+            scan=True,
+            tag="tag",
+        )
+        assert query is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.brand_protection.queries.with_raw_response.delete(
+            account_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        query = response.parse()
+        assert query is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.brand_protection.queries.with_streaming_response.delete(
+            account_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            query = response.parse()
+            assert query is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.brand_protection.queries.with_raw_response.delete(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_method_bulk(self, client: Cloudflare) -> None:
+        query = client.brand_protection.queries.bulk(
+            account_id="x",
+        )
+        assert query is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_method_bulk_with_all_params(self, client: Cloudflare) -> None:
+        query = client.brand_protection.queries.bulk(
+            account_id="x",
+            queries=[{"foo": "bar"}],
+        )
+        assert query is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_raw_response_bulk(self, client: Cloudflare) -> None:
+        response = client.brand_protection.queries.with_raw_response.bulk(
+            account_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        query = response.parse()
+        assert query is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_streaming_response_bulk(self, client: Cloudflare) -> None:
+        with client.brand_protection.queries.with_streaming_response.bulk(
+            account_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            query = response.parse()
+            assert query is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    def test_path_params_bulk(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.brand_protection.queries.with_raw_response.bulk(
+                account_id="",
+            )
+
+
+class TestAsyncQueries:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        query = await async_client.brand_protection.queries.create(
+            account_id="x",
+        )
+        assert query is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        query = await async_client.brand_protection.queries.create(
+            account_id="x",
+            id="id",
+            query_scan=True,
+            query_tag="tag",
+            max_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            min_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            body_scan=True,
+            string_matches={},
+            body_tag="tag",
+        )
+        assert query is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.brand_protection.queries.with_raw_response.create(
+            account_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        query = await response.parse()
+        assert query is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.brand_protection.queries.with_streaming_response.create(
+            account_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            query = await response.parse()
+            assert query is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.brand_protection.queries.with_raw_response.create(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        query = await async_client.brand_protection.queries.delete(
+            account_id="x",
+        )
+        assert query is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        query = await async_client.brand_protection.queries.delete(
+            account_id="x",
+            id="id",
+            scan=True,
+            tag="tag",
+        )
+        assert query is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.brand_protection.queries.with_raw_response.delete(
+            account_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        query = await response.parse()
+        assert query is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.brand_protection.queries.with_streaming_response.delete(
+            account_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            query = await response.parse()
+            assert query is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.brand_protection.queries.with_raw_response.delete(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_method_bulk(self, async_client: AsyncCloudflare) -> None:
+        query = await async_client.brand_protection.queries.bulk(
+            account_id="x",
+        )
+        assert query is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_method_bulk_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        query = await async_client.brand_protection.queries.bulk(
+            account_id="x",
+            queries=[{"foo": "bar"}],
+        )
+        assert query is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_raw_response_bulk(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.brand_protection.queries.with_raw_response.bulk(
+            account_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        query = await response.parse()
+        assert query is None
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_streaming_response_bulk(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.brand_protection.queries.with_streaming_response.bulk(
+            account_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            query = await response.parse()
+            assert query is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test, 401 Unauthorized")
+    @parametrize
+    async def test_path_params_bulk(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.brand_protection.queries.with_raw_response.bulk(
+                account_id="",
+            )
diff --git a/tests/api_resources/pcaps/__init__.py b/tests/api_resources/browser_rendering/__init__.py
similarity index 100%
rename from tests/api_resources/pcaps/__init__.py
rename to tests/api_resources/browser_rendering/__init__.py
diff --git a/tests/api_resources/browser_rendering/test_content.py b/tests/api_resources/browser_rendering/test_content.py
new file mode 100644
index 00000000000..c702e1e2c05
--- /dev/null
+++ b/tests/api_resources/browser_rendering/test_content.py
@@ -0,0 +1,495 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestContent:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create_overload_1(self, client: Cloudflare) -> None:
+        content = client.browser_rendering.content.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+        assert_matches_type(str, content, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        content = client.browser_rendering.content.create(
+            account_id="account_id",
+            url="https://example.com/",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(str, content, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_1(self, client: Cloudflare) -> None:
+        response = client.browser_rendering.content.with_raw_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        content = response.parse()
+        assert_matches_type(str, content, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
+        with client.browser_rendering.content.with_streaming_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            content = response.parse()
+            assert_matches_type(str, content, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.browser_rendering.content.with_raw_response.create(
+                account_id="",
+                url="https://example.com/",
+            )
+
+    @parametrize
+    def test_method_create_overload_2(self, client: Cloudflare) -> None:
+        content = client.browser_rendering.content.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+        assert_matches_type(str, content, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        content = client.browser_rendering.content.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(str, content, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
+        response = client.browser_rendering.content.with_raw_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        content = response.parse()
+        assert_matches_type(str, content, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
+        with client.browser_rendering.content.with_streaming_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            content = response.parse()
+            assert_matches_type(str, content, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.browser_rendering.content.with_raw_response.create(
+                account_id="",
+                html="<h1>Hello World!</h1>",
+            )
+
+
+class TestAsyncContent:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        content = await async_client.browser_rendering.content.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+        assert_matches_type(str, content, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        content = await async_client.browser_rendering.content.create(
+            account_id="account_id",
+            url="https://example.com/",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(str, content, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.browser_rendering.content.with_raw_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        content = await response.parse()
+        assert_matches_type(str, content, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.browser_rendering.content.with_streaming_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            content = await response.parse()
+            assert_matches_type(str, content, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.browser_rendering.content.with_raw_response.create(
+                account_id="",
+                url="https://example.com/",
+            )
+
+    @parametrize
+    async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        content = await async_client.browser_rendering.content.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+        assert_matches_type(str, content, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        content = await async_client.browser_rendering.content.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(str, content, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.browser_rendering.content.with_raw_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        content = await response.parse()
+        assert_matches_type(str, content, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.browser_rendering.content.with_streaming_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            content = await response.parse()
+            assert_matches_type(str, content, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.browser_rendering.content.with_raw_response.create(
+                account_id="",
+                html="<h1>Hello World!</h1>",
+            )
diff --git a/tests/api_resources/browser_rendering/test_json.py b/tests/api_resources/browser_rendering/test_json.py
new file mode 100644
index 00000000000..f16bc8384c4
--- /dev/null
+++ b/tests/api_resources/browser_rendering/test_json.py
@@ -0,0 +1,540 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.browser_rendering import JsonCreateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestJson:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create_overload_1(self, client: Cloudflare) -> None:
+        json = client.browser_rendering.json.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+        assert_matches_type(JsonCreateResponse, json, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        json = client.browser_rendering.json.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            custom_ai=[
+                {
+                    "authorization": "authorization",
+                    "model": "model",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            prompt="prompt",
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            response_format={
+                "type": "type",
+                "json_schema": {"foo": "string"},
+            },
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(JsonCreateResponse, json, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_1(self, client: Cloudflare) -> None:
+        response = client.browser_rendering.json.with_raw_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        json = response.parse()
+        assert_matches_type(JsonCreateResponse, json, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
+        with client.browser_rendering.json.with_streaming_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            json = response.parse()
+            assert_matches_type(JsonCreateResponse, json, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.browser_rendering.json.with_raw_response.create(
+                account_id="",
+                html="<h1>Hello World!</h1>",
+            )
+
+    @parametrize
+    def test_method_create_overload_2(self, client: Cloudflare) -> None:
+        json = client.browser_rendering.json.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+        assert_matches_type(JsonCreateResponse, json, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        json = client.browser_rendering.json.create(
+            account_id="account_id",
+            url="https://example.com/",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            custom_ai=[
+                {
+                    "authorization": "authorization",
+                    "model": "model",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            prompt="prompt",
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            response_format={
+                "type": "type",
+                "json_schema": {"foo": "string"},
+            },
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(JsonCreateResponse, json, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
+        response = client.browser_rendering.json.with_raw_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        json = response.parse()
+        assert_matches_type(JsonCreateResponse, json, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
+        with client.browser_rendering.json.with_streaming_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            json = response.parse()
+            assert_matches_type(JsonCreateResponse, json, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.browser_rendering.json.with_raw_response.create(
+                account_id="",
+                url="https://example.com/",
+            )
+
+
+class TestAsyncJson:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        json = await async_client.browser_rendering.json.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+        assert_matches_type(JsonCreateResponse, json, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        json = await async_client.browser_rendering.json.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            custom_ai=[
+                {
+                    "authorization": "authorization",
+                    "model": "model",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            prompt="prompt",
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            response_format={
+                "type": "type",
+                "json_schema": {"foo": "string"},
+            },
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(JsonCreateResponse, json, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.browser_rendering.json.with_raw_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        json = await response.parse()
+        assert_matches_type(JsonCreateResponse, json, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.browser_rendering.json.with_streaming_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            json = await response.parse()
+            assert_matches_type(JsonCreateResponse, json, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.browser_rendering.json.with_raw_response.create(
+                account_id="",
+                html="<h1>Hello World!</h1>",
+            )
+
+    @parametrize
+    async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        json = await async_client.browser_rendering.json.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+        assert_matches_type(JsonCreateResponse, json, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        json = await async_client.browser_rendering.json.create(
+            account_id="account_id",
+            url="https://example.com/",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            custom_ai=[
+                {
+                    "authorization": "authorization",
+                    "model": "model",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            prompt="prompt",
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            response_format={
+                "type": "type",
+                "json_schema": {"foo": "string"},
+            },
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(JsonCreateResponse, json, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.browser_rendering.json.with_raw_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        json = await response.parse()
+        assert_matches_type(JsonCreateResponse, json, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.browser_rendering.json.with_streaming_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            json = await response.parse()
+            assert_matches_type(JsonCreateResponse, json, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.browser_rendering.json.with_raw_response.create(
+                account_id="",
+                url="https://example.com/",
+            )
diff --git a/tests/api_resources/browser_rendering/test_links.py b/tests/api_resources/browser_rendering/test_links.py
new file mode 100644
index 00000000000..6609f2a3586
--- /dev/null
+++ b/tests/api_resources/browser_rendering/test_links.py
@@ -0,0 +1,504 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.browser_rendering import LinkCreateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestLinks:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create_overload_1(self, client: Cloudflare) -> None:
+        link = client.browser_rendering.links.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+        assert_matches_type(LinkCreateResponse, link, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        link = client.browser_rendering.links.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            exclude_external_links=True,
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            visible_links_only=True,
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(LinkCreateResponse, link, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_1(self, client: Cloudflare) -> None:
+        response = client.browser_rendering.links.with_raw_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        link = response.parse()
+        assert_matches_type(LinkCreateResponse, link, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
+        with client.browser_rendering.links.with_streaming_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            link = response.parse()
+            assert_matches_type(LinkCreateResponse, link, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.browser_rendering.links.with_raw_response.create(
+                account_id="",
+                html="<h1>Hello World!</h1>",
+            )
+
+    @parametrize
+    def test_method_create_overload_2(self, client: Cloudflare) -> None:
+        link = client.browser_rendering.links.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+        assert_matches_type(LinkCreateResponse, link, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        link = client.browser_rendering.links.create(
+            account_id="account_id",
+            url="https://example.com/",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            exclude_external_links=True,
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            visible_links_only=True,
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(LinkCreateResponse, link, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
+        response = client.browser_rendering.links.with_raw_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        link = response.parse()
+        assert_matches_type(LinkCreateResponse, link, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
+        with client.browser_rendering.links.with_streaming_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            link = response.parse()
+            assert_matches_type(LinkCreateResponse, link, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.browser_rendering.links.with_raw_response.create(
+                account_id="",
+                url="https://example.com/",
+            )
+
+
+class TestAsyncLinks:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        link = await async_client.browser_rendering.links.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+        assert_matches_type(LinkCreateResponse, link, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        link = await async_client.browser_rendering.links.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            exclude_external_links=True,
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            visible_links_only=True,
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(LinkCreateResponse, link, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.browser_rendering.links.with_raw_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        link = await response.parse()
+        assert_matches_type(LinkCreateResponse, link, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.browser_rendering.links.with_streaming_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            link = await response.parse()
+            assert_matches_type(LinkCreateResponse, link, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.browser_rendering.links.with_raw_response.create(
+                account_id="",
+                html="<h1>Hello World!</h1>",
+            )
+
+    @parametrize
+    async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        link = await async_client.browser_rendering.links.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+        assert_matches_type(LinkCreateResponse, link, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        link = await async_client.browser_rendering.links.create(
+            account_id="account_id",
+            url="https://example.com/",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            exclude_external_links=True,
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            visible_links_only=True,
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(LinkCreateResponse, link, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.browser_rendering.links.with_raw_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        link = await response.parse()
+        assert_matches_type(LinkCreateResponse, link, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.browser_rendering.links.with_streaming_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            link = await response.parse()
+            assert_matches_type(LinkCreateResponse, link, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.browser_rendering.links.with_raw_response.create(
+                account_id="",
+                url="https://example.com/",
+            )
diff --git a/tests/api_resources/browser_rendering/test_markdown.py b/tests/api_resources/browser_rendering/test_markdown.py
new file mode 100644
index 00000000000..b62b9643e4b
--- /dev/null
+++ b/tests/api_resources/browser_rendering/test_markdown.py
@@ -0,0 +1,495 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestMarkdown:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create_overload_1(self, client: Cloudflare) -> None:
+        markdown = client.browser_rendering.markdown.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+        assert_matches_type(str, markdown, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        markdown = client.browser_rendering.markdown.create(
+            account_id="account_id",
+            url="https://example.com/",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(str, markdown, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_1(self, client: Cloudflare) -> None:
+        response = client.browser_rendering.markdown.with_raw_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        markdown = response.parse()
+        assert_matches_type(str, markdown, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
+        with client.browser_rendering.markdown.with_streaming_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            markdown = response.parse()
+            assert_matches_type(str, markdown, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.browser_rendering.markdown.with_raw_response.create(
+                account_id="",
+                url="https://example.com/",
+            )
+
+    @parametrize
+    def test_method_create_overload_2(self, client: Cloudflare) -> None:
+        markdown = client.browser_rendering.markdown.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+        assert_matches_type(str, markdown, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        markdown = client.browser_rendering.markdown.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(str, markdown, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
+        response = client.browser_rendering.markdown.with_raw_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        markdown = response.parse()
+        assert_matches_type(str, markdown, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
+        with client.browser_rendering.markdown.with_streaming_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            markdown = response.parse()
+            assert_matches_type(str, markdown, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.browser_rendering.markdown.with_raw_response.create(
+                account_id="",
+                html="<h1>Hello World!</h1>",
+            )
+
+
+class TestAsyncMarkdown:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        markdown = await async_client.browser_rendering.markdown.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+        assert_matches_type(str, markdown, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        markdown = await async_client.browser_rendering.markdown.create(
+            account_id="account_id",
+            url="https://example.com/",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(str, markdown, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.browser_rendering.markdown.with_raw_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        markdown = await response.parse()
+        assert_matches_type(str, markdown, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.browser_rendering.markdown.with_streaming_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            markdown = await response.parse()
+            assert_matches_type(str, markdown, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.browser_rendering.markdown.with_raw_response.create(
+                account_id="",
+                url="https://example.com/",
+            )
+
+    @parametrize
+    async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        markdown = await async_client.browser_rendering.markdown.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+        assert_matches_type(str, markdown, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        markdown = await async_client.browser_rendering.markdown.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(str, markdown, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.browser_rendering.markdown.with_raw_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        markdown = await response.parse()
+        assert_matches_type(str, markdown, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.browser_rendering.markdown.with_streaming_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            markdown = await response.parse()
+            assert_matches_type(str, markdown, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.browser_rendering.markdown.with_raw_response.create(
+                account_id="",
+                html="<h1>Hello World!</h1>",
+            )
diff --git a/tests/api_resources/browser_rendering/test_pdf.py b/tests/api_resources/browser_rendering/test_pdf.py
new file mode 100644
index 00000000000..4c9e90a46d2
--- /dev/null
+++ b/tests/api_resources/browser_rendering/test_pdf.py
@@ -0,0 +1,702 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import httpx
+import pytest
+from respx import MockRouter
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from cloudflare._response import (
+    BinaryAPIResponse,
+    AsyncBinaryAPIResponse,
+    StreamedBinaryAPIResponse,
+    AsyncStreamedBinaryAPIResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestPDF:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_method_create_overload_1(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.post("/accounts/account_id/browser-rendering/pdf").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        pdf = client.browser_rendering.pdf.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+        assert pdf.is_closed
+        assert pdf.json() == {"foo": "bar"}
+        assert cast(Any, pdf.is_closed) is True
+        assert isinstance(pdf, BinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_method_create_with_all_params_overload_1(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.post("/accounts/account_id/browser-rendering/pdf").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        pdf = client.browser_rendering.pdf.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            pdf_options={
+                "display_header_footer": True,
+                "footer_template": "footerTemplate",
+                "format": "letter",
+                "header_template": "headerTemplate",
+                "height": "string",
+                "landscape": True,
+                "margin": {
+                    "bottom": "string",
+                    "left": "string",
+                    "right": "string",
+                    "top": "string",
+                },
+                "omit_background": True,
+                "outline": True,
+                "page_ranges": "pageRanges",
+                "prefer_css_page_size": True,
+                "print_background": True,
+                "scale": 0.1,
+                "tagged": True,
+                "timeout": 0,
+                "width": "string",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert pdf.is_closed
+        assert pdf.json() == {"foo": "bar"}
+        assert cast(Any, pdf.is_closed) is True
+        assert isinstance(pdf, BinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_raw_response_create_overload_1(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.post("/accounts/account_id/browser-rendering/pdf").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+
+        pdf = client.browser_rendering.pdf.with_raw_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+
+        assert pdf.is_closed is True
+        assert pdf.http_request.headers.get("X-Stainless-Lang") == "python"
+        assert pdf.json() == {"foo": "bar"}
+        assert isinstance(pdf, BinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_streaming_response_create_overload_1(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.post("/accounts/account_id/browser-rendering/pdf").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        with client.browser_rendering.pdf.with_streaming_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        ) as pdf:
+            assert not pdf.is_closed
+            assert pdf.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            assert pdf.json() == {"foo": "bar"}
+            assert cast(Any, pdf.is_closed) is True
+            assert isinstance(pdf, StreamedBinaryAPIResponse)
+
+        assert cast(Any, pdf.is_closed) is True
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.browser_rendering.pdf.with_raw_response.create(
+                account_id="",
+                html="<h1>Hello World!</h1>",
+            )
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_method_create_overload_2(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.post("/accounts/account_id/browser-rendering/pdf").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        pdf = client.browser_rendering.pdf.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+        assert pdf.is_closed
+        assert pdf.json() == {"foo": "bar"}
+        assert cast(Any, pdf.is_closed) is True
+        assert isinstance(pdf, BinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_method_create_with_all_params_overload_2(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.post("/accounts/account_id/browser-rendering/pdf").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        pdf = client.browser_rendering.pdf.create(
+            account_id="account_id",
+            url="https://example.com/",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            pdf_options={
+                "display_header_footer": True,
+                "footer_template": "footerTemplate",
+                "format": "letter",
+                "header_template": "headerTemplate",
+                "height": "string",
+                "landscape": True,
+                "margin": {
+                    "bottom": "string",
+                    "left": "string",
+                    "right": "string",
+                    "top": "string",
+                },
+                "omit_background": True,
+                "outline": True,
+                "page_ranges": "pageRanges",
+                "prefer_css_page_size": True,
+                "print_background": True,
+                "scale": 0.1,
+                "tagged": True,
+                "timeout": 0,
+                "width": "string",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert pdf.is_closed
+        assert pdf.json() == {"foo": "bar"}
+        assert cast(Any, pdf.is_closed) is True
+        assert isinstance(pdf, BinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_raw_response_create_overload_2(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.post("/accounts/account_id/browser-rendering/pdf").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+
+        pdf = client.browser_rendering.pdf.with_raw_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+
+        assert pdf.is_closed is True
+        assert pdf.http_request.headers.get("X-Stainless-Lang") == "python"
+        assert pdf.json() == {"foo": "bar"}
+        assert isinstance(pdf, BinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_streaming_response_create_overload_2(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.post("/accounts/account_id/browser-rendering/pdf").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        with client.browser_rendering.pdf.with_streaming_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        ) as pdf:
+            assert not pdf.is_closed
+            assert pdf.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            assert pdf.json() == {"foo": "bar"}
+            assert cast(Any, pdf.is_closed) is True
+            assert isinstance(pdf, StreamedBinaryAPIResponse)
+
+        assert cast(Any, pdf.is_closed) is True
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.browser_rendering.pdf.with_raw_response.create(
+                account_id="",
+                url="https://example.com/",
+            )
+
+
+class TestAsyncPDF:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_method_create_overload_1(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.post("/accounts/account_id/browser-rendering/pdf").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        pdf = await async_client.browser_rendering.pdf.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+        assert pdf.is_closed
+        assert await pdf.json() == {"foo": "bar"}
+        assert cast(Any, pdf.is_closed) is True
+        assert isinstance(pdf, AsyncBinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_method_create_with_all_params_overload_1(
+        self, async_client: AsyncCloudflare, respx_mock: MockRouter
+    ) -> None:
+        respx_mock.post("/accounts/account_id/browser-rendering/pdf").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        pdf = await async_client.browser_rendering.pdf.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            pdf_options={
+                "display_header_footer": True,
+                "footer_template": "footerTemplate",
+                "format": "letter",
+                "header_template": "headerTemplate",
+                "height": "string",
+                "landscape": True,
+                "margin": {
+                    "bottom": "string",
+                    "left": "string",
+                    "right": "string",
+                    "top": "string",
+                },
+                "omit_background": True,
+                "outline": True,
+                "page_ranges": "pageRanges",
+                "prefer_css_page_size": True,
+                "print_background": True,
+                "scale": 0.1,
+                "tagged": True,
+                "timeout": 0,
+                "width": "string",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert pdf.is_closed
+        assert await pdf.json() == {"foo": "bar"}
+        assert cast(Any, pdf.is_closed) is True
+        assert isinstance(pdf, AsyncBinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.post("/accounts/account_id/browser-rendering/pdf").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+
+        pdf = await async_client.browser_rendering.pdf.with_raw_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+
+        assert pdf.is_closed is True
+        assert pdf.http_request.headers.get("X-Stainless-Lang") == "python"
+        assert await pdf.json() == {"foo": "bar"}
+        assert isinstance(pdf, AsyncBinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_streaming_response_create_overload_1(
+        self, async_client: AsyncCloudflare, respx_mock: MockRouter
+    ) -> None:
+        respx_mock.post("/accounts/account_id/browser-rendering/pdf").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        async with async_client.browser_rendering.pdf.with_streaming_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        ) as pdf:
+            assert not pdf.is_closed
+            assert pdf.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            assert await pdf.json() == {"foo": "bar"}
+            assert cast(Any, pdf.is_closed) is True
+            assert isinstance(pdf, AsyncStreamedBinaryAPIResponse)
+
+        assert cast(Any, pdf.is_closed) is True
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.browser_rendering.pdf.with_raw_response.create(
+                account_id="",
+                html="<h1>Hello World!</h1>",
+            )
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_method_create_overload_2(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.post("/accounts/account_id/browser-rendering/pdf").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        pdf = await async_client.browser_rendering.pdf.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+        assert pdf.is_closed
+        assert await pdf.json() == {"foo": "bar"}
+        assert cast(Any, pdf.is_closed) is True
+        assert isinstance(pdf, AsyncBinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_method_create_with_all_params_overload_2(
+        self, async_client: AsyncCloudflare, respx_mock: MockRouter
+    ) -> None:
+        respx_mock.post("/accounts/account_id/browser-rendering/pdf").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        pdf = await async_client.browser_rendering.pdf.create(
+            account_id="account_id",
+            url="https://example.com/",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            pdf_options={
+                "display_header_footer": True,
+                "footer_template": "footerTemplate",
+                "format": "letter",
+                "header_template": "headerTemplate",
+                "height": "string",
+                "landscape": True,
+                "margin": {
+                    "bottom": "string",
+                    "left": "string",
+                    "right": "string",
+                    "top": "string",
+                },
+                "omit_background": True,
+                "outline": True,
+                "page_ranges": "pageRanges",
+                "prefer_css_page_size": True,
+                "print_background": True,
+                "scale": 0.1,
+                "tagged": True,
+                "timeout": 0,
+                "width": "string",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert pdf.is_closed
+        assert await pdf.json() == {"foo": "bar"}
+        assert cast(Any, pdf.is_closed) is True
+        assert isinstance(pdf, AsyncBinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.post("/accounts/account_id/browser-rendering/pdf").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+
+        pdf = await async_client.browser_rendering.pdf.with_raw_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+
+        assert pdf.is_closed is True
+        assert pdf.http_request.headers.get("X-Stainless-Lang") == "python"
+        assert await pdf.json() == {"foo": "bar"}
+        assert isinstance(pdf, AsyncBinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_streaming_response_create_overload_2(
+        self, async_client: AsyncCloudflare, respx_mock: MockRouter
+    ) -> None:
+        respx_mock.post("/accounts/account_id/browser-rendering/pdf").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        async with async_client.browser_rendering.pdf.with_streaming_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        ) as pdf:
+            assert not pdf.is_closed
+            assert pdf.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            assert await pdf.json() == {"foo": "bar"}
+            assert cast(Any, pdf.is_closed) is True
+            assert isinstance(pdf, AsyncStreamedBinaryAPIResponse)
+
+        assert cast(Any, pdf.is_closed) is True
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.browser_rendering.pdf.with_raw_response.create(
+                account_id="",
+                url="https://example.com/",
+            )
diff --git a/tests/api_resources/browser_rendering/test_scrape.py b/tests/api_resources/browser_rendering/test_scrape.py
new file mode 100644
index 00000000000..e02f2924895
--- /dev/null
+++ b/tests/api_resources/browser_rendering/test_scrape.py
@@ -0,0 +1,516 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.browser_rendering import ScrapeCreateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestScrape:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create_overload_1(self, client: Cloudflare) -> None:
+        scrape = client.browser_rendering.scrape.create(
+            account_id="account_id",
+            elements=[{"selector": "selector"}],
+            html="<h1>Hello World!</h1>",
+        )
+        assert_matches_type(ScrapeCreateResponse, scrape, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        scrape = client.browser_rendering.scrape.create(
+            account_id="account_id",
+            elements=[{"selector": "selector"}],
+            html="<h1>Hello World!</h1>",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(ScrapeCreateResponse, scrape, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_1(self, client: Cloudflare) -> None:
+        response = client.browser_rendering.scrape.with_raw_response.create(
+            account_id="account_id",
+            elements=[{"selector": "selector"}],
+            html="<h1>Hello World!</h1>",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        scrape = response.parse()
+        assert_matches_type(ScrapeCreateResponse, scrape, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
+        with client.browser_rendering.scrape.with_streaming_response.create(
+            account_id="account_id",
+            elements=[{"selector": "selector"}],
+            html="<h1>Hello World!</h1>",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            scrape = response.parse()
+            assert_matches_type(ScrapeCreateResponse, scrape, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.browser_rendering.scrape.with_raw_response.create(
+                account_id="",
+                elements=[{"selector": "selector"}],
+                html="<h1>Hello World!</h1>",
+            )
+
+    @parametrize
+    def test_method_create_overload_2(self, client: Cloudflare) -> None:
+        scrape = client.browser_rendering.scrape.create(
+            account_id="account_id",
+            elements=[{"selector": "selector"}],
+            url="https://example.com/",
+        )
+        assert_matches_type(ScrapeCreateResponse, scrape, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        scrape = client.browser_rendering.scrape.create(
+            account_id="account_id",
+            elements=[{"selector": "selector"}],
+            url="https://example.com/",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(ScrapeCreateResponse, scrape, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
+        response = client.browser_rendering.scrape.with_raw_response.create(
+            account_id="account_id",
+            elements=[{"selector": "selector"}],
+            url="https://example.com/",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        scrape = response.parse()
+        assert_matches_type(ScrapeCreateResponse, scrape, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
+        with client.browser_rendering.scrape.with_streaming_response.create(
+            account_id="account_id",
+            elements=[{"selector": "selector"}],
+            url="https://example.com/",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            scrape = response.parse()
+            assert_matches_type(ScrapeCreateResponse, scrape, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.browser_rendering.scrape.with_raw_response.create(
+                account_id="",
+                elements=[{"selector": "selector"}],
+                url="https://example.com/",
+            )
+
+
+class TestAsyncScrape:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        scrape = await async_client.browser_rendering.scrape.create(
+            account_id="account_id",
+            elements=[{"selector": "selector"}],
+            html="<h1>Hello World!</h1>",
+        )
+        assert_matches_type(ScrapeCreateResponse, scrape, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        scrape = await async_client.browser_rendering.scrape.create(
+            account_id="account_id",
+            elements=[{"selector": "selector"}],
+            html="<h1>Hello World!</h1>",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(ScrapeCreateResponse, scrape, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.browser_rendering.scrape.with_raw_response.create(
+            account_id="account_id",
+            elements=[{"selector": "selector"}],
+            html="<h1>Hello World!</h1>",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        scrape = await response.parse()
+        assert_matches_type(ScrapeCreateResponse, scrape, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.browser_rendering.scrape.with_streaming_response.create(
+            account_id="account_id",
+            elements=[{"selector": "selector"}],
+            html="<h1>Hello World!</h1>",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            scrape = await response.parse()
+            assert_matches_type(ScrapeCreateResponse, scrape, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.browser_rendering.scrape.with_raw_response.create(
+                account_id="",
+                elements=[{"selector": "selector"}],
+                html="<h1>Hello World!</h1>",
+            )
+
+    @parametrize
+    async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        scrape = await async_client.browser_rendering.scrape.create(
+            account_id="account_id",
+            elements=[{"selector": "selector"}],
+            url="https://example.com/",
+        )
+        assert_matches_type(ScrapeCreateResponse, scrape, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        scrape = await async_client.browser_rendering.scrape.create(
+            account_id="account_id",
+            elements=[{"selector": "selector"}],
+            url="https://example.com/",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(ScrapeCreateResponse, scrape, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.browser_rendering.scrape.with_raw_response.create(
+            account_id="account_id",
+            elements=[{"selector": "selector"}],
+            url="https://example.com/",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        scrape = await response.parse()
+        assert_matches_type(ScrapeCreateResponse, scrape, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.browser_rendering.scrape.with_streaming_response.create(
+            account_id="account_id",
+            elements=[{"selector": "selector"}],
+            url="https://example.com/",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            scrape = await response.parse()
+            assert_matches_type(ScrapeCreateResponse, scrape, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.browser_rendering.scrape.with_raw_response.create(
+                account_id="",
+                elements=[{"selector": "selector"}],
+                url="https://example.com/",
+            )
diff --git a/tests/api_resources/browser_rendering/test_screenshot.py b/tests/api_resources/browser_rendering/test_screenshot.py
new file mode 100644
index 00000000000..98d09071930
--- /dev/null
+++ b/tests/api_resources/browser_rendering/test_screenshot.py
@@ -0,0 +1,572 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.browser_rendering import ScreenshotCreateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestScreenshot:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create_overload_1(self, client: Cloudflare) -> None:
+        screenshot = client.browser_rendering.screenshot.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+        assert_matches_type(ScreenshotCreateResponse, screenshot, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        screenshot = client.browser_rendering.screenshot.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            screenshot_options={
+                "capture_beyond_viewport": True,
+                "clip": {
+                    "height": 0,
+                    "width": 0,
+                    "x": 0,
+                    "y": 0,
+                    "scale": 0,
+                },
+                "encoding": "binary",
+                "from_surface": True,
+                "full_page": True,
+                "omit_background": True,
+                "optimize_for_speed": True,
+                "quality": 0,
+                "type": "png",
+            },
+            scroll_page=True,
+            selector="selector",
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(ScreenshotCreateResponse, screenshot, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_1(self, client: Cloudflare) -> None:
+        response = client.browser_rendering.screenshot.with_raw_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        screenshot = response.parse()
+        assert_matches_type(ScreenshotCreateResponse, screenshot, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
+        with client.browser_rendering.screenshot.with_streaming_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            screenshot = response.parse()
+            assert_matches_type(ScreenshotCreateResponse, screenshot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.browser_rendering.screenshot.with_raw_response.create(
+                account_id="",
+                html="<h1>Hello World!</h1>",
+            )
+
+    @parametrize
+    def test_method_create_overload_2(self, client: Cloudflare) -> None:
+        screenshot = client.browser_rendering.screenshot.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+        assert_matches_type(ScreenshotCreateResponse, screenshot, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        screenshot = client.browser_rendering.screenshot.create(
+            account_id="account_id",
+            url="https://example.com/",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            screenshot_options={
+                "capture_beyond_viewport": True,
+                "clip": {
+                    "height": 0,
+                    "width": 0,
+                    "x": 0,
+                    "y": 0,
+                    "scale": 0,
+                },
+                "encoding": "binary",
+                "from_surface": True,
+                "full_page": True,
+                "omit_background": True,
+                "optimize_for_speed": True,
+                "quality": 0,
+                "type": "png",
+            },
+            scroll_page=True,
+            selector="selector",
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(ScreenshotCreateResponse, screenshot, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
+        response = client.browser_rendering.screenshot.with_raw_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        screenshot = response.parse()
+        assert_matches_type(ScreenshotCreateResponse, screenshot, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
+        with client.browser_rendering.screenshot.with_streaming_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            screenshot = response.parse()
+            assert_matches_type(ScreenshotCreateResponse, screenshot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.browser_rendering.screenshot.with_raw_response.create(
+                account_id="",
+                url="https://example.com/",
+            )
+
+
+class TestAsyncScreenshot:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        screenshot = await async_client.browser_rendering.screenshot.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+        assert_matches_type(ScreenshotCreateResponse, screenshot, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        screenshot = await async_client.browser_rendering.screenshot.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            screenshot_options={
+                "capture_beyond_viewport": True,
+                "clip": {
+                    "height": 0,
+                    "width": 0,
+                    "x": 0,
+                    "y": 0,
+                    "scale": 0,
+                },
+                "encoding": "binary",
+                "from_surface": True,
+                "full_page": True,
+                "omit_background": True,
+                "optimize_for_speed": True,
+                "quality": 0,
+                "type": "png",
+            },
+            scroll_page=True,
+            selector="selector",
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(ScreenshotCreateResponse, screenshot, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.browser_rendering.screenshot.with_raw_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        screenshot = await response.parse()
+        assert_matches_type(ScreenshotCreateResponse, screenshot, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.browser_rendering.screenshot.with_streaming_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            screenshot = await response.parse()
+            assert_matches_type(ScreenshotCreateResponse, screenshot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.browser_rendering.screenshot.with_raw_response.create(
+                account_id="",
+                html="<h1>Hello World!</h1>",
+            )
+
+    @parametrize
+    async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        screenshot = await async_client.browser_rendering.screenshot.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+        assert_matches_type(ScreenshotCreateResponse, screenshot, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        screenshot = await async_client.browser_rendering.screenshot.create(
+            account_id="account_id",
+            url="https://example.com/",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            screenshot_options={
+                "capture_beyond_viewport": True,
+                "clip": {
+                    "height": 0,
+                    "width": 0,
+                    "x": 0,
+                    "y": 0,
+                    "scale": 0,
+                },
+                "encoding": "binary",
+                "from_surface": True,
+                "full_page": True,
+                "omit_background": True,
+                "optimize_for_speed": True,
+                "quality": 0,
+                "type": "png",
+            },
+            scroll_page=True,
+            selector="selector",
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(ScreenshotCreateResponse, screenshot, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.browser_rendering.screenshot.with_raw_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        screenshot = await response.parse()
+        assert_matches_type(ScreenshotCreateResponse, screenshot, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.browser_rendering.screenshot.with_streaming_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            screenshot = await response.parse()
+            assert_matches_type(ScreenshotCreateResponse, screenshot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.browser_rendering.screenshot.with_raw_response.create(
+                account_id="",
+                url="https://example.com/",
+            )
diff --git a/tests/api_resources/browser_rendering/test_snapshot.py b/tests/api_resources/browser_rendering/test_snapshot.py
new file mode 100644
index 00000000000..4c342c1d5eb
--- /dev/null
+++ b/tests/api_resources/browser_rendering/test_snapshot.py
@@ -0,0 +1,560 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.browser_rendering import SnapshotCreateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSnapshot:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create_overload_1(self, client: Cloudflare) -> None:
+        snapshot = client.browser_rendering.snapshot.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+        assert_matches_type(Optional[SnapshotCreateResponse], snapshot, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        snapshot = client.browser_rendering.snapshot.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            screenshot_options={
+                "capture_beyond_viewport": True,
+                "clip": {
+                    "height": 0,
+                    "width": 0,
+                    "x": 0,
+                    "y": 0,
+                    "scale": 0,
+                },
+                "from_surface": True,
+                "full_page": True,
+                "omit_background": True,
+                "optimize_for_speed": True,
+                "quality": 0,
+                "type": "png",
+            },
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(Optional[SnapshotCreateResponse], snapshot, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_1(self, client: Cloudflare) -> None:
+        response = client.browser_rendering.snapshot.with_raw_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        snapshot = response.parse()
+        assert_matches_type(Optional[SnapshotCreateResponse], snapshot, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
+        with client.browser_rendering.snapshot.with_streaming_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            snapshot = response.parse()
+            assert_matches_type(Optional[SnapshotCreateResponse], snapshot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.browser_rendering.snapshot.with_raw_response.create(
+                account_id="",
+                html="<h1>Hello World!</h1>",
+            )
+
+    @parametrize
+    def test_method_create_overload_2(self, client: Cloudflare) -> None:
+        snapshot = client.browser_rendering.snapshot.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+        assert_matches_type(Optional[SnapshotCreateResponse], snapshot, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        snapshot = client.browser_rendering.snapshot.create(
+            account_id="account_id",
+            url="https://example.com/",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            screenshot_options={
+                "capture_beyond_viewport": True,
+                "clip": {
+                    "height": 0,
+                    "width": 0,
+                    "x": 0,
+                    "y": 0,
+                    "scale": 0,
+                },
+                "from_surface": True,
+                "full_page": True,
+                "omit_background": True,
+                "optimize_for_speed": True,
+                "quality": 0,
+                "type": "png",
+            },
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(Optional[SnapshotCreateResponse], snapshot, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
+        response = client.browser_rendering.snapshot.with_raw_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        snapshot = response.parse()
+        assert_matches_type(Optional[SnapshotCreateResponse], snapshot, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
+        with client.browser_rendering.snapshot.with_streaming_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            snapshot = response.parse()
+            assert_matches_type(Optional[SnapshotCreateResponse], snapshot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.browser_rendering.snapshot.with_raw_response.create(
+                account_id="",
+                url="https://example.com/",
+            )
+
+
+class TestAsyncSnapshot:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        snapshot = await async_client.browser_rendering.snapshot.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+        assert_matches_type(Optional[SnapshotCreateResponse], snapshot, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        snapshot = await async_client.browser_rendering.snapshot.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            screenshot_options={
+                "capture_beyond_viewport": True,
+                "clip": {
+                    "height": 0,
+                    "width": 0,
+                    "x": 0,
+                    "y": 0,
+                    "scale": 0,
+                },
+                "from_surface": True,
+                "full_page": True,
+                "omit_background": True,
+                "optimize_for_speed": True,
+                "quality": 0,
+                "type": "png",
+            },
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(Optional[SnapshotCreateResponse], snapshot, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.browser_rendering.snapshot.with_raw_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        snapshot = await response.parse()
+        assert_matches_type(Optional[SnapshotCreateResponse], snapshot, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.browser_rendering.snapshot.with_streaming_response.create(
+            account_id="account_id",
+            html="<h1>Hello World!</h1>",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            snapshot = await response.parse()
+            assert_matches_type(Optional[SnapshotCreateResponse], snapshot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.browser_rendering.snapshot.with_raw_response.create(
+                account_id="",
+                html="<h1>Hello World!</h1>",
+            )
+
+    @parametrize
+    async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        snapshot = await async_client.browser_rendering.snapshot.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+        assert_matches_type(Optional[SnapshotCreateResponse], snapshot, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        snapshot = await async_client.browser_rendering.snapshot.create(
+            account_id="account_id",
+            url="https://example.com/",
+            cache_ttl=86400,
+            action_timeout=120000,
+            add_script_tag=[
+                {
+                    "id": "id",
+                    "content": "content",
+                    "type": "type",
+                    "url": "url",
+                }
+            ],
+            add_style_tag=[
+                {
+                    "content": "content",
+                    "url": "url",
+                }
+            ],
+            allow_request_pattern=["string"],
+            allow_resource_types=["document"],
+            authenticate={
+                "password": "x",
+                "username": "x",
+            },
+            best_attempt=True,
+            cookies=[
+                {
+                    "name": "name",
+                    "value": "value",
+                    "domain": "domain",
+                    "expires": 0,
+                    "http_only": True,
+                    "partition_key": "partitionKey",
+                    "path": "path",
+                    "priority": "Low",
+                    "same_party": True,
+                    "same_site": "Strict",
+                    "secure": True,
+                    "source_port": 0,
+                    "source_scheme": "Unset",
+                    "url": "url",
+                }
+            ],
+            emulate_media_type="emulateMediaType",
+            goto_options={
+                "referer": "referer",
+                "referrer_policy": "referrerPolicy",
+                "timeout": 60000,
+                "wait_until": "load",
+            },
+            reject_request_pattern=["string"],
+            reject_resource_types=["document"],
+            screenshot_options={
+                "capture_beyond_viewport": True,
+                "clip": {
+                    "height": 0,
+                    "width": 0,
+                    "x": 0,
+                    "y": 0,
+                    "scale": 0,
+                },
+                "from_surface": True,
+                "full_page": True,
+                "omit_background": True,
+                "optimize_for_speed": True,
+                "quality": 0,
+                "type": "png",
+            },
+            set_extra_http_headers={"foo": "string"},
+            set_java_script_enabled=True,
+            user_agent="userAgent",
+            viewport={
+                "height": 0,
+                "width": 0,
+                "device_scale_factor": 0,
+                "has_touch": True,
+                "is_landscape": True,
+                "is_mobile": True,
+            },
+            wait_for_selector={
+                "selector": "selector",
+                "hidden": True,
+                "timeout": 120000,
+                "visible": True,
+            },
+            wait_for_timeout=120000,
+        )
+        assert_matches_type(Optional[SnapshotCreateResponse], snapshot, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.browser_rendering.snapshot.with_raw_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        snapshot = await response.parse()
+        assert_matches_type(Optional[SnapshotCreateResponse], snapshot, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.browser_rendering.snapshot.with_streaming_response.create(
+            account_id="account_id",
+            url="https://example.com/",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            snapshot = await response.parse()
+            assert_matches_type(Optional[SnapshotCreateResponse], snapshot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.browser_rendering.snapshot.with_raw_response.create(
+                account_id="",
+                url="https://example.com/",
+            )
diff --git a/tests/api_resources/cache/test_cache_reserve.py b/tests/api_resources/cache/test_cache_reserve.py
index fb8eab75309..abbb074d4e9 100644
--- a/tests/api_resources/cache/test_cache_reserve.py
+++ b/tests/api_resources/cache/test_cache_reserve.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
@@ -26,33 +26,33 @@ class TestCacheReserve:
     def test_method_clear(self, client: Cloudflare) -> None:
         cache_reserve = client.cache.cache_reserve.clear(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="{}",
+            body={},
         )
-        assert_matches_type(CacheReserveClearResponse, cache_reserve, path=["response"])
+        assert_matches_type(Optional[CacheReserveClearResponse], cache_reserve, path=["response"])
 
     @parametrize
     def test_raw_response_clear(self, client: Cloudflare) -> None:
         response = client.cache.cache_reserve.with_raw_response.clear(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="{}",
+            body={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         cache_reserve = response.parse()
-        assert_matches_type(CacheReserveClearResponse, cache_reserve, path=["response"])
+        assert_matches_type(Optional[CacheReserveClearResponse], cache_reserve, path=["response"])
 
     @parametrize
     def test_streaming_response_clear(self, client: Cloudflare) -> None:
         with client.cache.cache_reserve.with_streaming_response.clear(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="{}",
+            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             cache_reserve = response.parse()
-            assert_matches_type(CacheReserveClearResponse, cache_reserve, path=["response"])
+            assert_matches_type(Optional[CacheReserveClearResponse], cache_reserve, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -61,7 +61,7 @@ def test_path_params_clear(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.cache.cache_reserve.with_raw_response.clear(
                 zone_id="",
-                body="{}",
+                body={},
             )
 
     @parametrize
@@ -70,7 +70,7 @@ def test_method_edit(self, client: Cloudflare) -> None:
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             value="on",
         )
-        assert_matches_type(CacheReserveEditResponse, cache_reserve, path=["response"])
+        assert_matches_type(Optional[CacheReserveEditResponse], cache_reserve, path=["response"])
 
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
@@ -82,7 +82,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         cache_reserve = response.parse()
-        assert_matches_type(CacheReserveEditResponse, cache_reserve, path=["response"])
+        assert_matches_type(Optional[CacheReserveEditResponse], cache_reserve, path=["response"])
 
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
@@ -94,7 +94,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             cache_reserve = response.parse()
-            assert_matches_type(CacheReserveEditResponse, cache_reserve, path=["response"])
+            assert_matches_type(Optional[CacheReserveEditResponse], cache_reserve, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -111,7 +111,7 @@ def test_method_get(self, client: Cloudflare) -> None:
         cache_reserve = client.cache.cache_reserve.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(CacheReserveGetResponse, cache_reserve, path=["response"])
+        assert_matches_type(Optional[CacheReserveGetResponse], cache_reserve, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -122,7 +122,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         cache_reserve = response.parse()
-        assert_matches_type(CacheReserveGetResponse, cache_reserve, path=["response"])
+        assert_matches_type(Optional[CacheReserveGetResponse], cache_reserve, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -133,7 +133,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             cache_reserve = response.parse()
-            assert_matches_type(CacheReserveGetResponse, cache_reserve, path=["response"])
+            assert_matches_type(Optional[CacheReserveGetResponse], cache_reserve, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -149,7 +149,7 @@ def test_method_status(self, client: Cloudflare) -> None:
         cache_reserve = client.cache.cache_reserve.status(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(CacheReserveStatusResponse, cache_reserve, path=["response"])
+        assert_matches_type(Optional[CacheReserveStatusResponse], cache_reserve, path=["response"])
 
     @parametrize
     def test_raw_response_status(self, client: Cloudflare) -> None:
@@ -160,7 +160,7 @@ def test_raw_response_status(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         cache_reserve = response.parse()
-        assert_matches_type(CacheReserveStatusResponse, cache_reserve, path=["response"])
+        assert_matches_type(Optional[CacheReserveStatusResponse], cache_reserve, path=["response"])
 
     @parametrize
     def test_streaming_response_status(self, client: Cloudflare) -> None:
@@ -171,7 +171,7 @@ def test_streaming_response_status(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             cache_reserve = response.parse()
-            assert_matches_type(CacheReserveStatusResponse, cache_reserve, path=["response"])
+            assert_matches_type(Optional[CacheReserveStatusResponse], cache_reserve, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -184,39 +184,41 @@ def test_path_params_status(self, client: Cloudflare) -> None:
 
 
 class TestAsyncCacheReserve:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_clear(self, async_client: AsyncCloudflare) -> None:
         cache_reserve = await async_client.cache.cache_reserve.clear(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="{}",
+            body={},
         )
-        assert_matches_type(CacheReserveClearResponse, cache_reserve, path=["response"])
+        assert_matches_type(Optional[CacheReserveClearResponse], cache_reserve, path=["response"])
 
     @parametrize
     async def test_raw_response_clear(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cache.cache_reserve.with_raw_response.clear(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="{}",
+            body={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         cache_reserve = await response.parse()
-        assert_matches_type(CacheReserveClearResponse, cache_reserve, path=["response"])
+        assert_matches_type(Optional[CacheReserveClearResponse], cache_reserve, path=["response"])
 
     @parametrize
     async def test_streaming_response_clear(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cache.cache_reserve.with_streaming_response.clear(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="{}",
+            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             cache_reserve = await response.parse()
-            assert_matches_type(CacheReserveClearResponse, cache_reserve, path=["response"])
+            assert_matches_type(Optional[CacheReserveClearResponse], cache_reserve, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -225,7 +227,7 @@ async def test_path_params_clear(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.cache.cache_reserve.with_raw_response.clear(
                 zone_id="",
-                body="{}",
+                body={},
             )
 
     @parametrize
@@ -234,7 +236,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             value="on",
         )
-        assert_matches_type(CacheReserveEditResponse, cache_reserve, path=["response"])
+        assert_matches_type(Optional[CacheReserveEditResponse], cache_reserve, path=["response"])
 
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -246,7 +248,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         cache_reserve = await response.parse()
-        assert_matches_type(CacheReserveEditResponse, cache_reserve, path=["response"])
+        assert_matches_type(Optional[CacheReserveEditResponse], cache_reserve, path=["response"])
 
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -258,7 +260,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             cache_reserve = await response.parse()
-            assert_matches_type(CacheReserveEditResponse, cache_reserve, path=["response"])
+            assert_matches_type(Optional[CacheReserveEditResponse], cache_reserve, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -275,7 +277,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         cache_reserve = await async_client.cache.cache_reserve.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(CacheReserveGetResponse, cache_reserve, path=["response"])
+        assert_matches_type(Optional[CacheReserveGetResponse], cache_reserve, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -286,7 +288,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         cache_reserve = await response.parse()
-        assert_matches_type(CacheReserveGetResponse, cache_reserve, path=["response"])
+        assert_matches_type(Optional[CacheReserveGetResponse], cache_reserve, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -297,7 +299,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             cache_reserve = await response.parse()
-            assert_matches_type(CacheReserveGetResponse, cache_reserve, path=["response"])
+            assert_matches_type(Optional[CacheReserveGetResponse], cache_reserve, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -313,7 +315,7 @@ async def test_method_status(self, async_client: AsyncCloudflare) -> None:
         cache_reserve = await async_client.cache.cache_reserve.status(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(CacheReserveStatusResponse, cache_reserve, path=["response"])
+        assert_matches_type(Optional[CacheReserveStatusResponse], cache_reserve, path=["response"])
 
     @parametrize
     async def test_raw_response_status(self, async_client: AsyncCloudflare) -> None:
@@ -324,7 +326,7 @@ async def test_raw_response_status(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         cache_reserve = await response.parse()
-        assert_matches_type(CacheReserveStatusResponse, cache_reserve, path=["response"])
+        assert_matches_type(Optional[CacheReserveStatusResponse], cache_reserve, path=["response"])
 
     @parametrize
     async def test_streaming_response_status(self, async_client: AsyncCloudflare) -> None:
@@ -335,7 +337,7 @@ async def test_streaming_response_status(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             cache_reserve = await response.parse()
-            assert_matches_type(CacheReserveStatusResponse, cache_reserve, path=["response"])
+            assert_matches_type(Optional[CacheReserveStatusResponse], cache_reserve, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/cache/test_regional_tiered_cache.py b/tests/api_resources/cache/test_regional_tiered_cache.py
index ec3ddfeb861..2b78a788e2e 100644
--- a/tests/api_resources/cache/test_regional_tiered_cache.py
+++ b/tests/api_resources/cache/test_regional_tiered_cache.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
@@ -26,7 +26,7 @@ def test_method_edit(self, client: Cloudflare) -> None:
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             value="on",
         )
-        assert_matches_type(RegionalTieredCacheEditResponse, regional_tiered_cache, path=["response"])
+        assert_matches_type(Optional[RegionalTieredCacheEditResponse], regional_tiered_cache, path=["response"])
 
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
@@ -38,7 +38,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         regional_tiered_cache = response.parse()
-        assert_matches_type(RegionalTieredCacheEditResponse, regional_tiered_cache, path=["response"])
+        assert_matches_type(Optional[RegionalTieredCacheEditResponse], regional_tiered_cache, path=["response"])
 
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
@@ -50,7 +50,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             regional_tiered_cache = response.parse()
-            assert_matches_type(RegionalTieredCacheEditResponse, regional_tiered_cache, path=["response"])
+            assert_matches_type(Optional[RegionalTieredCacheEditResponse], regional_tiered_cache, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -67,7 +67,7 @@ def test_method_get(self, client: Cloudflare) -> None:
         regional_tiered_cache = client.cache.regional_tiered_cache.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(RegionalTieredCacheGetResponse, regional_tiered_cache, path=["response"])
+        assert_matches_type(Optional[RegionalTieredCacheGetResponse], regional_tiered_cache, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -78,7 +78,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         regional_tiered_cache = response.parse()
-        assert_matches_type(RegionalTieredCacheGetResponse, regional_tiered_cache, path=["response"])
+        assert_matches_type(Optional[RegionalTieredCacheGetResponse], regional_tiered_cache, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -89,7 +89,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             regional_tiered_cache = response.parse()
-            assert_matches_type(RegionalTieredCacheGetResponse, regional_tiered_cache, path=["response"])
+            assert_matches_type(Optional[RegionalTieredCacheGetResponse], regional_tiered_cache, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -102,7 +102,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncRegionalTieredCache:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
@@ -110,7 +112,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             value="on",
         )
-        assert_matches_type(RegionalTieredCacheEditResponse, regional_tiered_cache, path=["response"])
+        assert_matches_type(Optional[RegionalTieredCacheEditResponse], regional_tiered_cache, path=["response"])
 
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -122,7 +124,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         regional_tiered_cache = await response.parse()
-        assert_matches_type(RegionalTieredCacheEditResponse, regional_tiered_cache, path=["response"])
+        assert_matches_type(Optional[RegionalTieredCacheEditResponse], regional_tiered_cache, path=["response"])
 
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -134,7 +136,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             regional_tiered_cache = await response.parse()
-            assert_matches_type(RegionalTieredCacheEditResponse, regional_tiered_cache, path=["response"])
+            assert_matches_type(Optional[RegionalTieredCacheEditResponse], regional_tiered_cache, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -151,7 +153,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         regional_tiered_cache = await async_client.cache.regional_tiered_cache.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(RegionalTieredCacheGetResponse, regional_tiered_cache, path=["response"])
+        assert_matches_type(Optional[RegionalTieredCacheGetResponse], regional_tiered_cache, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -162,7 +164,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         regional_tiered_cache = await response.parse()
-        assert_matches_type(RegionalTieredCacheGetResponse, regional_tiered_cache, path=["response"])
+        assert_matches_type(Optional[RegionalTieredCacheGetResponse], regional_tiered_cache, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -173,7 +175,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             regional_tiered_cache = await response.parse()
-            assert_matches_type(RegionalTieredCacheGetResponse, regional_tiered_cache, path=["response"])
+            assert_matches_type(Optional[RegionalTieredCacheGetResponse], regional_tiered_cache, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/cache/test_smart_tiered_cache.py b/tests/api_resources/cache/test_smart_tiered_cache.py
index b683f9fc4dc..3457741e5fe 100644
--- a/tests/api_resources/cache/test_smart_tiered_cache.py
+++ b/tests/api_resources/cache/test_smart_tiered_cache.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
@@ -26,7 +26,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
         smart_tiered_cache = client.cache.smart_tiered_cache.delete(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SmartTieredCacheDeleteResponse, smart_tiered_cache, path=["response"])
+        assert_matches_type(Optional[SmartTieredCacheDeleteResponse], smart_tiered_cache, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -37,7 +37,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         smart_tiered_cache = response.parse()
-        assert_matches_type(SmartTieredCacheDeleteResponse, smart_tiered_cache, path=["response"])
+        assert_matches_type(Optional[SmartTieredCacheDeleteResponse], smart_tiered_cache, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -48,7 +48,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             smart_tiered_cache = response.parse()
-            assert_matches_type(SmartTieredCacheDeleteResponse, smart_tiered_cache, path=["response"])
+            assert_matches_type(Optional[SmartTieredCacheDeleteResponse], smart_tiered_cache, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -65,7 +65,7 @@ def test_method_edit(self, client: Cloudflare) -> None:
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             value="on",
         )
-        assert_matches_type(SmartTieredCacheEditResponse, smart_tiered_cache, path=["response"])
+        assert_matches_type(Optional[SmartTieredCacheEditResponse], smart_tiered_cache, path=["response"])
 
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
@@ -77,7 +77,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         smart_tiered_cache = response.parse()
-        assert_matches_type(SmartTieredCacheEditResponse, smart_tiered_cache, path=["response"])
+        assert_matches_type(Optional[SmartTieredCacheEditResponse], smart_tiered_cache, path=["response"])
 
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
@@ -89,7 +89,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             smart_tiered_cache = response.parse()
-            assert_matches_type(SmartTieredCacheEditResponse, smart_tiered_cache, path=["response"])
+            assert_matches_type(Optional[SmartTieredCacheEditResponse], smart_tiered_cache, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -106,7 +106,7 @@ def test_method_get(self, client: Cloudflare) -> None:
         smart_tiered_cache = client.cache.smart_tiered_cache.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SmartTieredCacheGetResponse, smart_tiered_cache, path=["response"])
+        assert_matches_type(Optional[SmartTieredCacheGetResponse], smart_tiered_cache, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -117,7 +117,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         smart_tiered_cache = response.parse()
-        assert_matches_type(SmartTieredCacheGetResponse, smart_tiered_cache, path=["response"])
+        assert_matches_type(Optional[SmartTieredCacheGetResponse], smart_tiered_cache, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -128,7 +128,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             smart_tiered_cache = response.parse()
-            assert_matches_type(SmartTieredCacheGetResponse, smart_tiered_cache, path=["response"])
+            assert_matches_type(Optional[SmartTieredCacheGetResponse], smart_tiered_cache, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -141,14 +141,16 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSmartTieredCache:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         smart_tiered_cache = await async_client.cache.smart_tiered_cache.delete(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SmartTieredCacheDeleteResponse, smart_tiered_cache, path=["response"])
+        assert_matches_type(Optional[SmartTieredCacheDeleteResponse], smart_tiered_cache, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -159,7 +161,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         smart_tiered_cache = await response.parse()
-        assert_matches_type(SmartTieredCacheDeleteResponse, smart_tiered_cache, path=["response"])
+        assert_matches_type(Optional[SmartTieredCacheDeleteResponse], smart_tiered_cache, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -170,7 +172,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             smart_tiered_cache = await response.parse()
-            assert_matches_type(SmartTieredCacheDeleteResponse, smart_tiered_cache, path=["response"])
+            assert_matches_type(Optional[SmartTieredCacheDeleteResponse], smart_tiered_cache, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -187,7 +189,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             value="on",
         )
-        assert_matches_type(SmartTieredCacheEditResponse, smart_tiered_cache, path=["response"])
+        assert_matches_type(Optional[SmartTieredCacheEditResponse], smart_tiered_cache, path=["response"])
 
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -199,7 +201,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         smart_tiered_cache = await response.parse()
-        assert_matches_type(SmartTieredCacheEditResponse, smart_tiered_cache, path=["response"])
+        assert_matches_type(Optional[SmartTieredCacheEditResponse], smart_tiered_cache, path=["response"])
 
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -211,7 +213,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             smart_tiered_cache = await response.parse()
-            assert_matches_type(SmartTieredCacheEditResponse, smart_tiered_cache, path=["response"])
+            assert_matches_type(Optional[SmartTieredCacheEditResponse], smart_tiered_cache, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -228,7 +230,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         smart_tiered_cache = await async_client.cache.smart_tiered_cache.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SmartTieredCacheGetResponse, smart_tiered_cache, path=["response"])
+        assert_matches_type(Optional[SmartTieredCacheGetResponse], smart_tiered_cache, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -239,7 +241,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         smart_tiered_cache = await response.parse()
-        assert_matches_type(SmartTieredCacheGetResponse, smart_tiered_cache, path=["response"])
+        assert_matches_type(Optional[SmartTieredCacheGetResponse], smart_tiered_cache, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -250,7 +252,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             smart_tiered_cache = await response.parse()
-            assert_matches_type(SmartTieredCacheGetResponse, smart_tiered_cache, path=["response"])
+            assert_matches_type(Optional[SmartTieredCacheGetResponse], smart_tiered_cache, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/cache/test_variants.py b/tests/api_resources/cache/test_variants.py
index c46c601fbb8..5ddaebb439f 100644
--- a/tests/api_resources/cache/test_variants.py
+++ b/tests/api_resources/cache/test_variants.py
@@ -3,13 +3,13 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.cache import CacheVariant, VariantGetResponse, VariantEditResponse
+from cloudflare.types.cache import VariantGetResponse, VariantEditResponse, VariantDeleteResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -22,7 +22,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
         variant = client.cache.variants.delete(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(CacheVariant, variant, path=["response"])
+        assert_matches_type(Optional[VariantDeleteResponse], variant, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -33,7 +33,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         variant = response.parse()
-        assert_matches_type(CacheVariant, variant, path=["response"])
+        assert_matches_type(Optional[VariantDeleteResponse], variant, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -44,7 +44,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             variant = response.parse()
-            assert_matches_type(CacheVariant, variant, path=["response"])
+            assert_matches_type(Optional[VariantDeleteResponse], variant, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -55,14 +55,16 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 zone_id="",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     def test_method_edit(self, client: Cloudflare) -> None:
         variant = client.cache.variants.edit(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             value={},
         )
-        assert_matches_type(VariantEditResponse, variant, path=["response"])
+        assert_matches_type(Optional[VariantEditResponse], variant, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
         variant = client.cache.variants.edit(
@@ -81,8 +83,9 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
                 "webp": ["image/jpeg", "image/avif"],
             },
         )
-        assert_matches_type(VariantEditResponse, variant, path=["response"])
+        assert_matches_type(Optional[VariantEditResponse], variant, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
         response = client.cache.variants.with_raw_response.edit(
@@ -93,8 +96,9 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         variant = response.parse()
-        assert_matches_type(VariantEditResponse, variant, path=["response"])
+        assert_matches_type(Optional[VariantEditResponse], variant, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
         with client.cache.variants.with_streaming_response.edit(
@@ -105,10 +109,11 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             variant = response.parse()
-            assert_matches_type(VariantEditResponse, variant, path=["response"])
+            assert_matches_type(Optional[VariantEditResponse], variant, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     def test_path_params_edit(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
@@ -117,13 +122,15 @@ def test_path_params_edit(self, client: Cloudflare) -> None:
                 value={},
             )
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         variant = client.cache.variants.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(VariantGetResponse, variant, path=["response"])
+        assert_matches_type(Optional[VariantGetResponse], variant, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.cache.variants.with_raw_response.get(
@@ -133,8 +140,9 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         variant = response.parse()
-        assert_matches_type(VariantGetResponse, variant, path=["response"])
+        assert_matches_type(Optional[VariantGetResponse], variant, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.cache.variants.with_streaming_response.get(
@@ -144,10 +152,11 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             variant = response.parse()
-            assert_matches_type(VariantGetResponse, variant, path=["response"])
+            assert_matches_type(Optional[VariantGetResponse], variant, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
@@ -157,14 +166,16 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncVariants:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         variant = await async_client.cache.variants.delete(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(CacheVariant, variant, path=["response"])
+        assert_matches_type(Optional[VariantDeleteResponse], variant, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -175,7 +186,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         variant = await response.parse()
-        assert_matches_type(CacheVariant, variant, path=["response"])
+        assert_matches_type(Optional[VariantDeleteResponse], variant, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -186,7 +197,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             variant = await response.parse()
-            assert_matches_type(CacheVariant, variant, path=["response"])
+            assert_matches_type(Optional[VariantDeleteResponse], variant, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -197,14 +208,16 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 zone_id="",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
         variant = await async_client.cache.variants.edit(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             value={},
         )
-        assert_matches_type(VariantEditResponse, variant, path=["response"])
+        assert_matches_type(Optional[VariantEditResponse], variant, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
         variant = await async_client.cache.variants.edit(
@@ -223,8 +236,9 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
                 "webp": ["image/jpeg", "image/avif"],
             },
         )
-        assert_matches_type(VariantEditResponse, variant, path=["response"])
+        assert_matches_type(Optional[VariantEditResponse], variant, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cache.variants.with_raw_response.edit(
@@ -235,8 +249,9 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         variant = await response.parse()
-        assert_matches_type(VariantEditResponse, variant, path=["response"])
+        assert_matches_type(Optional[VariantEditResponse], variant, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cache.variants.with_streaming_response.edit(
@@ -247,10 +262,11 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             variant = await response.parse()
-            assert_matches_type(VariantEditResponse, variant, path=["response"])
+            assert_matches_type(Optional[VariantEditResponse], variant, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
@@ -259,13 +275,15 @@ async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
                 value={},
             )
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         variant = await async_client.cache.variants.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(VariantGetResponse, variant, path=["response"])
+        assert_matches_type(Optional[VariantGetResponse], variant, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cache.variants.with_raw_response.get(
@@ -275,8 +293,9 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         variant = await response.parse()
-        assert_matches_type(VariantGetResponse, variant, path=["response"])
+        assert_matches_type(Optional[VariantGetResponse], variant, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cache.variants.with_streaming_response.get(
@@ -286,10 +305,11 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             variant = await response.parse()
-            assert_matches_type(VariantGetResponse, variant, path=["response"])
+            assert_matches_type(Optional[VariantGetResponse], variant, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
diff --git a/tests/api_resources/calls/test_sfu.py b/tests/api_resources/calls/test_sfu.py
new file mode 100644
index 00000000000..5a4bc4ca177
--- /dev/null
+++ b/tests/api_resources/calls/test_sfu.py
@@ -0,0 +1,549 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.calls import (
+    SFUGetResponse,
+    SFUListResponse,
+    SFUCreateResponse,
+    SFUDeleteResponse,
+    SFUUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSFU:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        sfu = client.calls.sfu.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SFUCreateResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        sfu = client.calls.sfu.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="production-realtime-app",
+        )
+        assert_matches_type(Optional[SFUCreateResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.calls.sfu.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sfu = response.parse()
+        assert_matches_type(Optional[SFUCreateResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.calls.sfu.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sfu = response.parse()
+            assert_matches_type(Optional[SFUCreateResponse], sfu, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.calls.sfu.with_raw_response.create(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        sfu = client.calls.sfu.update(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SFUUpdateResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        sfu = client.calls.sfu.update(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="production-realtime-app",
+        )
+        assert_matches_type(Optional[SFUUpdateResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.calls.sfu.with_raw_response.update(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sfu = response.parse()
+        assert_matches_type(Optional[SFUUpdateResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.calls.sfu.with_streaming_response.update(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sfu = response.parse()
+            assert_matches_type(Optional[SFUUpdateResponse], sfu, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.calls.sfu.with_raw_response.update(
+                app_id="2a95132c15732412d22c1476fa83f27a",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.calls.sfu.with_raw_response.update(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        sfu = client.calls.sfu.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[SFUListResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.calls.sfu.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sfu = response.parse()
+        assert_matches_type(SyncSinglePage[SFUListResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.calls.sfu.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sfu = response.parse()
+            assert_matches_type(SyncSinglePage[SFUListResponse], sfu, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.calls.sfu.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        sfu = client.calls.sfu.delete(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SFUDeleteResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.calls.sfu.with_raw_response.delete(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sfu = response.parse()
+        assert_matches_type(Optional[SFUDeleteResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.calls.sfu.with_streaming_response.delete(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sfu = response.parse()
+            assert_matches_type(Optional[SFUDeleteResponse], sfu, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.calls.sfu.with_raw_response.delete(
+                app_id="2a95132c15732412d22c1476fa83f27a",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.calls.sfu.with_raw_response.delete(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        sfu = client.calls.sfu.get(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SFUGetResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.calls.sfu.with_raw_response.get(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sfu = response.parse()
+        assert_matches_type(Optional[SFUGetResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.calls.sfu.with_streaming_response.get(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sfu = response.parse()
+            assert_matches_type(Optional[SFUGetResponse], sfu, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.calls.sfu.with_raw_response.get(
+                app_id="2a95132c15732412d22c1476fa83f27a",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.calls.sfu.with_raw_response.get(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncSFU:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        sfu = await async_client.calls.sfu.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SFUCreateResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        sfu = await async_client.calls.sfu.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="production-realtime-app",
+        )
+        assert_matches_type(Optional[SFUCreateResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.calls.sfu.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sfu = await response.parse()
+        assert_matches_type(Optional[SFUCreateResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.calls.sfu.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sfu = await response.parse()
+            assert_matches_type(Optional[SFUCreateResponse], sfu, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.calls.sfu.with_raw_response.create(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        sfu = await async_client.calls.sfu.update(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SFUUpdateResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        sfu = await async_client.calls.sfu.update(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="production-realtime-app",
+        )
+        assert_matches_type(Optional[SFUUpdateResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.calls.sfu.with_raw_response.update(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sfu = await response.parse()
+        assert_matches_type(Optional[SFUUpdateResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.calls.sfu.with_streaming_response.update(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sfu = await response.parse()
+            assert_matches_type(Optional[SFUUpdateResponse], sfu, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.calls.sfu.with_raw_response.update(
+                app_id="2a95132c15732412d22c1476fa83f27a",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.calls.sfu.with_raw_response.update(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        sfu = await async_client.calls.sfu.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[SFUListResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.calls.sfu.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sfu = await response.parse()
+        assert_matches_type(AsyncSinglePage[SFUListResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.calls.sfu.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sfu = await response.parse()
+            assert_matches_type(AsyncSinglePage[SFUListResponse], sfu, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.calls.sfu.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        sfu = await async_client.calls.sfu.delete(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SFUDeleteResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.calls.sfu.with_raw_response.delete(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sfu = await response.parse()
+        assert_matches_type(Optional[SFUDeleteResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.calls.sfu.with_streaming_response.delete(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sfu = await response.parse()
+            assert_matches_type(Optional[SFUDeleteResponse], sfu, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.calls.sfu.with_raw_response.delete(
+                app_id="2a95132c15732412d22c1476fa83f27a",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.calls.sfu.with_raw_response.delete(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        sfu = await async_client.calls.sfu.get(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SFUGetResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.calls.sfu.with_raw_response.get(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sfu = await response.parse()
+        assert_matches_type(Optional[SFUGetResponse], sfu, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.calls.sfu.with_streaming_response.get(
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sfu = await response.parse()
+            assert_matches_type(Optional[SFUGetResponse], sfu, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.calls.sfu.with_raw_response.get(
+                app_id="2a95132c15732412d22c1476fa83f27a",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.calls.sfu.with_raw_response.get(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/calls/test_turn.py b/tests/api_resources/calls/test_turn.py
new file mode 100644
index 00000000000..31b3e0686be
--- /dev/null
+++ b/tests/api_resources/calls/test_turn.py
@@ -0,0 +1,549 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.calls import (
+    TURNGetResponse,
+    TURNListResponse,
+    TURNCreateResponse,
+    TURNDeleteResponse,
+    TURNUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestTURN:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        turn = client.calls.turn.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[TURNCreateResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        turn = client.calls.turn.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-turn-key",
+        )
+        assert_matches_type(Optional[TURNCreateResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.calls.turn.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        turn = response.parse()
+        assert_matches_type(Optional[TURNCreateResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.calls.turn.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            turn = response.parse()
+            assert_matches_type(Optional[TURNCreateResponse], turn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.calls.turn.with_raw_response.create(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        turn = client.calls.turn.update(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[TURNUpdateResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        turn = client.calls.turn.update(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-turn-key",
+        )
+        assert_matches_type(Optional[TURNUpdateResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.calls.turn.with_raw_response.update(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        turn = response.parse()
+        assert_matches_type(Optional[TURNUpdateResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.calls.turn.with_streaming_response.update(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            turn = response.parse()
+            assert_matches_type(Optional[TURNUpdateResponse], turn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.calls.turn.with_raw_response.update(
+                key_id="2a95132c15732412d22c1476fa83f27a",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `key_id` but received ''"):
+            client.calls.turn.with_raw_response.update(
+                key_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        turn = client.calls.turn.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[TURNListResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.calls.turn.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        turn = response.parse()
+        assert_matches_type(SyncSinglePage[TURNListResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.calls.turn.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            turn = response.parse()
+            assert_matches_type(SyncSinglePage[TURNListResponse], turn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.calls.turn.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        turn = client.calls.turn.delete(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[TURNDeleteResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.calls.turn.with_raw_response.delete(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        turn = response.parse()
+        assert_matches_type(Optional[TURNDeleteResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.calls.turn.with_streaming_response.delete(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            turn = response.parse()
+            assert_matches_type(Optional[TURNDeleteResponse], turn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.calls.turn.with_raw_response.delete(
+                key_id="2a95132c15732412d22c1476fa83f27a",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `key_id` but received ''"):
+            client.calls.turn.with_raw_response.delete(
+                key_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        turn = client.calls.turn.get(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[TURNGetResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.calls.turn.with_raw_response.get(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        turn = response.parse()
+        assert_matches_type(Optional[TURNGetResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.calls.turn.with_streaming_response.get(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            turn = response.parse()
+            assert_matches_type(Optional[TURNGetResponse], turn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.calls.turn.with_raw_response.get(
+                key_id="2a95132c15732412d22c1476fa83f27a",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `key_id` but received ''"):
+            client.calls.turn.with_raw_response.get(
+                key_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncTURN:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        turn = await async_client.calls.turn.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[TURNCreateResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        turn = await async_client.calls.turn.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-turn-key",
+        )
+        assert_matches_type(Optional[TURNCreateResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.calls.turn.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        turn = await response.parse()
+        assert_matches_type(Optional[TURNCreateResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.calls.turn.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            turn = await response.parse()
+            assert_matches_type(Optional[TURNCreateResponse], turn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.calls.turn.with_raw_response.create(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        turn = await async_client.calls.turn.update(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[TURNUpdateResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        turn = await async_client.calls.turn.update(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-turn-key",
+        )
+        assert_matches_type(Optional[TURNUpdateResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.calls.turn.with_raw_response.update(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        turn = await response.parse()
+        assert_matches_type(Optional[TURNUpdateResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.calls.turn.with_streaming_response.update(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            turn = await response.parse()
+            assert_matches_type(Optional[TURNUpdateResponse], turn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.calls.turn.with_raw_response.update(
+                key_id="2a95132c15732412d22c1476fa83f27a",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `key_id` but received ''"):
+            await async_client.calls.turn.with_raw_response.update(
+                key_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        turn = await async_client.calls.turn.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[TURNListResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.calls.turn.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        turn = await response.parse()
+        assert_matches_type(AsyncSinglePage[TURNListResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.calls.turn.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            turn = await response.parse()
+            assert_matches_type(AsyncSinglePage[TURNListResponse], turn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.calls.turn.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        turn = await async_client.calls.turn.delete(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[TURNDeleteResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.calls.turn.with_raw_response.delete(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        turn = await response.parse()
+        assert_matches_type(Optional[TURNDeleteResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.calls.turn.with_streaming_response.delete(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            turn = await response.parse()
+            assert_matches_type(Optional[TURNDeleteResponse], turn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.calls.turn.with_raw_response.delete(
+                key_id="2a95132c15732412d22c1476fa83f27a",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `key_id` but received ''"):
+            await async_client.calls.turn.with_raw_response.delete(
+                key_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        turn = await async_client.calls.turn.get(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[TURNGetResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.calls.turn.with_raw_response.get(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        turn = await response.parse()
+        assert_matches_type(Optional[TURNGetResponse], turn, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.calls.turn.with_streaming_response.get(
+            key_id="2a95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            turn = await response.parse()
+            assert_matches_type(Optional[TURNGetResponse], turn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.calls.turn.with_raw_response.get(
+                key_id="2a95132c15732412d22c1476fa83f27a",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `key_id` but received ''"):
+            await async_client.calls.turn.with_raw_response.get(
+                key_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/calls/turn/test_keys.py b/tests/api_resources/calls/turn/test_keys.py
deleted file mode 100644
index c0359f2da99..00000000000
--- a/tests/api_resources/calls/turn/test_keys.py
+++ /dev/null
@@ -1,500 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.calls.turn import (
-    KeyListResponse,
-    KeyCreateResponse,
-)
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestKeys:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_create(self, client: Cloudflare) -> None:
-        key = client.calls.turn.keys.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(KeyCreateResponse, key, path=["response"])
-
-    @parametrize
-    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
-        key = client.calls.turn.keys.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="my-turn-key",
-        )
-        assert_matches_type(KeyCreateResponse, key, path=["response"])
-
-    @parametrize
-    def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.calls.turn.keys.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        key = response.parse()
-        assert_matches_type(KeyCreateResponse, key, path=["response"])
-
-    @parametrize
-    def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.calls.turn.keys.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            key = response.parse()
-            assert_matches_type(KeyCreateResponse, key, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.calls.turn.keys.with_raw_response.create(
-                account_id="",
-            )
-
-    @parametrize
-    def test_method_update(self, client: Cloudflare) -> None:
-        key = client.calls.turn.keys.update(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(str, key, path=["response"])
-
-    @parametrize
-    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        key = client.calls.turn.keys.update(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="my-turn-key",
-        )
-        assert_matches_type(str, key, path=["response"])
-
-    @parametrize
-    def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.calls.turn.keys.with_raw_response.update(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        key = response.parse()
-        assert_matches_type(str, key, path=["response"])
-
-    @parametrize
-    def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.calls.turn.keys.with_streaming_response.update(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            key = response.parse()
-            assert_matches_type(str, key, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.calls.turn.keys.with_raw_response.update(
-                key_id="2a95132c15732412d22c1476fa83f27a",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `key_id` but received ''"):
-            client.calls.turn.keys.with_raw_response.update(
-                key_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        key = client.calls.turn.keys.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SyncSinglePage[KeyListResponse], key, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.calls.turn.keys.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        key = response.parse()
-        assert_matches_type(SyncSinglePage[KeyListResponse], key, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.calls.turn.keys.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            key = response.parse()
-            assert_matches_type(SyncSinglePage[KeyListResponse], key, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.calls.turn.keys.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    def test_method_delete(self, client: Cloudflare) -> None:
-        key = client.calls.turn.keys.delete(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(str, key, path=["response"])
-
-    @parametrize
-    def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.calls.turn.keys.with_raw_response.delete(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        key = response.parse()
-        assert_matches_type(str, key, path=["response"])
-
-    @parametrize
-    def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.calls.turn.keys.with_streaming_response.delete(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            key = response.parse()
-            assert_matches_type(str, key, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.calls.turn.keys.with_raw_response.delete(
-                key_id="2a95132c15732412d22c1476fa83f27a",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `key_id` but received ''"):
-            client.calls.turn.keys.with_raw_response.delete(
-                key_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        key = client.calls.turn.keys.get(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(str, key, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.calls.turn.keys.with_raw_response.get(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        key = response.parse()
-        assert_matches_type(str, key, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.calls.turn.keys.with_streaming_response.get(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            key = response.parse()
-            assert_matches_type(str, key, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.calls.turn.keys.with_raw_response.get(
-                key_id="2a95132c15732412d22c1476fa83f27a",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `key_id` but received ''"):
-            client.calls.turn.keys.with_raw_response.get(
-                key_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-
-class TestAsyncKeys:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        key = await async_client.calls.turn.keys.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(KeyCreateResponse, key, path=["response"])
-
-    @parametrize
-    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        key = await async_client.calls.turn.keys.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="my-turn-key",
-        )
-        assert_matches_type(KeyCreateResponse, key, path=["response"])
-
-    @parametrize
-    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.calls.turn.keys.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        key = await response.parse()
-        assert_matches_type(KeyCreateResponse, key, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.calls.turn.keys.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            key = await response.parse()
-            assert_matches_type(KeyCreateResponse, key, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.calls.turn.keys.with_raw_response.create(
-                account_id="",
-            )
-
-    @parametrize
-    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        key = await async_client.calls.turn.keys.update(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(str, key, path=["response"])
-
-    @parametrize
-    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        key = await async_client.calls.turn.keys.update(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="my-turn-key",
-        )
-        assert_matches_type(str, key, path=["response"])
-
-    @parametrize
-    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.calls.turn.keys.with_raw_response.update(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        key = await response.parse()
-        assert_matches_type(str, key, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.calls.turn.keys.with_streaming_response.update(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            key = await response.parse()
-            assert_matches_type(str, key, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.calls.turn.keys.with_raw_response.update(
-                key_id="2a95132c15732412d22c1476fa83f27a",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `key_id` but received ''"):
-            await async_client.calls.turn.keys.with_raw_response.update(
-                key_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        key = await async_client.calls.turn.keys.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(AsyncSinglePage[KeyListResponse], key, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.calls.turn.keys.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        key = await response.parse()
-        assert_matches_type(AsyncSinglePage[KeyListResponse], key, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.calls.turn.keys.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            key = await response.parse()
-            assert_matches_type(AsyncSinglePage[KeyListResponse], key, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.calls.turn.keys.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        key = await async_client.calls.turn.keys.delete(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(str, key, path=["response"])
-
-    @parametrize
-    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.calls.turn.keys.with_raw_response.delete(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        key = await response.parse()
-        assert_matches_type(str, key, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.calls.turn.keys.with_streaming_response.delete(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            key = await response.parse()
-            assert_matches_type(str, key, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.calls.turn.keys.with_raw_response.delete(
-                key_id="2a95132c15732412d22c1476fa83f27a",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `key_id` but received ''"):
-            await async_client.calls.turn.keys.with_raw_response.delete(
-                key_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        key = await async_client.calls.turn.keys.get(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(str, key, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.calls.turn.keys.with_raw_response.get(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        key = await response.parse()
-        assert_matches_type(str, key, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.calls.turn.keys.with_streaming_response.get(
-            key_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            key = await response.parse()
-            assert_matches_type(str, key, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.calls.turn.keys.with_raw_response.get(
-                key_id="2a95132c15732412d22c1476fa83f27a",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `key_id` but received ''"):
-            await async_client.calls.turn.keys.with_raw_response.get(
-                key_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
diff --git a/tests/api_resources/certificate_authorities/test_hostname_associations.py b/tests/api_resources/certificate_authorities/test_hostname_associations.py
index 799d89cd874..7f4088bae55 100644
--- a/tests/api_resources/certificate_authorities/test_hostname_associations.py
+++ b/tests/api_resources/certificate_authorities/test_hostname_associations.py
@@ -31,7 +31,7 @@ def test_method_update(self, client: Cloudflare) -> None:
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         hostname_association = client.certificate_authorities.hostname_associations.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            hostnames=["api.example.com", "api.example.com", "api.example.com"],
+            hostnames=["api.example.com"],
             mtls_certificate_id="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
         )
         assert_matches_type(Optional[HostnameAssociationUpdateResponse], hostname_association, path=["response"])
@@ -115,7 +115,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncHostnameAssociations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
@@ -128,7 +130,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         hostname_association = await async_client.certificate_authorities.hostname_associations.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            hostnames=["api.example.com", "api.example.com", "api.example.com"],
+            hostnames=["api.example.com"],
             mtls_certificate_id="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
         )
         assert_matches_type(Optional[HostnameAssociationUpdateResponse], hostname_association, path=["response"])
diff --git a/tests/api_resources/cloud_connector/test_rules.py b/tests/api_resources/cloud_connector/test_rules.py
index 8506196e905..d80f63bdf9f 100644
--- a/tests/api_resources/cloud_connector/test_rules.py
+++ b/tests/api_resources/cloud_connector/test_rules.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -22,33 +22,47 @@ class TestRules:
     def test_method_update(self, client: Cloudflare) -> None:
         rule = client.cloud_connector.rules.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
         )
-        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+        assert_matches_type(SyncSinglePage[RuleUpdateResponse], rule, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        rule = client.cloud_connector.rules.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            rules=[
+                {
+                    "id": "95c365e17e1b46599cd99e5b231fac4e",
+                    "description": "Rule description",
+                    "enabled": True,
+                    "expression": 'http.cookie eq "a=b"',
+                    "parameters": {"host": "examplebucket.s3.eu-north-1.amazonaws.com"},
+                    "provider": "aws_s3",
+                }
+            ],
+        )
+        assert_matches_type(SyncSinglePage[RuleUpdateResponse], rule, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.cloud_connector.rules.with_raw_response.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rule = response.parse()
-        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+        assert_matches_type(SyncSinglePage[RuleUpdateResponse], rule, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.cloud_connector.rules.with_streaming_response.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             rule = response.parse()
-            assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+            assert_matches_type(SyncSinglePage[RuleUpdateResponse], rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -57,7 +71,6 @@ def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.cloud_connector.rules.with_raw_response.update(
                 zone_id="",
-                body=[{}, {}, {}],
             )
 
     @parametrize
@@ -100,39 +113,55 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncRules:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         rule = await async_client.cloud_connector.rules.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
         )
-        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[RuleUpdateResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.cloud_connector.rules.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            rules=[
+                {
+                    "id": "95c365e17e1b46599cd99e5b231fac4e",
+                    "description": "Rule description",
+                    "enabled": True,
+                    "expression": 'http.cookie eq "a=b"',
+                    "parameters": {"host": "examplebucket.s3.eu-north-1.amazonaws.com"},
+                    "provider": "aws_s3",
+                }
+            ],
+        )
+        assert_matches_type(AsyncSinglePage[RuleUpdateResponse], rule, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cloud_connector.rules.with_raw_response.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rule = await response.parse()
-        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[RuleUpdateResponse], rule, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cloud_connector.rules.with_streaming_response.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             rule = await response.parse()
-            assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+            assert_matches_type(AsyncSinglePage[RuleUpdateResponse], rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -141,7 +170,6 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.cloud_connector.rules.with_raw_response.update(
                 zone_id="",
-                body=[{}, {}, {}],
             )
 
     @parametrize
diff --git a/tests/api_resources/cloudforce_one/requests/test_assets.py b/tests/api_resources/cloudforce_one/requests/test_assets.py
new file mode 100644
index 00000000000..e2d5c2f8fae
--- /dev/null
+++ b/tests/api_resources/cloudforce_one/requests/test_assets.py
@@ -0,0 +1,526 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.cloudforce_one.requests import (
+    AssetGetResponse,
+    AssetCreateResponse,
+    AssetDeleteResponse,
+    AssetUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestAssets:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        asset = client.cloudforce_one.requests.assets.create(
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=10,
+        )
+        assert_matches_type(SyncSinglePage[AssetCreateResponse], asset, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.requests.assets.with_raw_response.create(
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=10,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asset = response.parse()
+        assert_matches_type(SyncSinglePage[AssetCreateResponse], asset, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.requests.assets.with_streaming_response.create(
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=10,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asset = response.parse()
+            assert_matches_type(SyncSinglePage[AssetCreateResponse], asset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.requests.assets.with_raw_response.create(
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                page=0,
+                per_page=10,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
+            client.cloudforce_one.requests.assets.with_raw_response.create(
+                request_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                page=0,
+                per_page=10,
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        asset = client.cloudforce_one.requests.assets.update(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        )
+        assert_matches_type(Optional[AssetUpdateResponse], asset, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        asset = client.cloudforce_one.requests.assets.update(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            source="@/Users/me/example.docx",
+        )
+        assert_matches_type(Optional[AssetUpdateResponse], asset, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.requests.assets.with_raw_response.update(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asset = response.parse()
+        assert_matches_type(Optional[AssetUpdateResponse], asset, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.requests.assets.with_streaming_response.update(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asset = response.parse()
+            assert_matches_type(Optional[AssetUpdateResponse], asset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.requests.assets.with_raw_response.update(
+                asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
+            client.cloudforce_one.requests.assets.with_raw_response.update(
+                asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `asset_id` but received ''"):
+            client.cloudforce_one.requests.assets.with_raw_response.update(
+                asset_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        asset = client.cloudforce_one.requests.assets.delete(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        )
+        assert_matches_type(AssetDeleteResponse, asset, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.requests.assets.with_raw_response.delete(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asset = response.parse()
+        assert_matches_type(AssetDeleteResponse, asset, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.requests.assets.with_streaming_response.delete(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asset = response.parse()
+            assert_matches_type(AssetDeleteResponse, asset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.requests.assets.with_raw_response.delete(
+                asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
+            client.cloudforce_one.requests.assets.with_raw_response.delete(
+                asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `asset_id` but received ''"):
+            client.cloudforce_one.requests.assets.with_raw_response.delete(
+                asset_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        asset = client.cloudforce_one.requests.assets.get(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        )
+        assert_matches_type(SyncSinglePage[AssetGetResponse], asset, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.requests.assets.with_raw_response.get(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asset = response.parse()
+        assert_matches_type(SyncSinglePage[AssetGetResponse], asset, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.requests.assets.with_streaming_response.get(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asset = response.parse()
+            assert_matches_type(SyncSinglePage[AssetGetResponse], asset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.requests.assets.with_raw_response.get(
+                asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
+            client.cloudforce_one.requests.assets.with_raw_response.get(
+                asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `asset_id` but received ''"):
+            client.cloudforce_one.requests.assets.with_raw_response.get(
+                asset_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            )
+
+
+class TestAsyncAssets:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        asset = await async_client.cloudforce_one.requests.assets.create(
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=10,
+        )
+        assert_matches_type(AsyncSinglePage[AssetCreateResponse], asset, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.requests.assets.with_raw_response.create(
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=10,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asset = await response.parse()
+        assert_matches_type(AsyncSinglePage[AssetCreateResponse], asset, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.requests.assets.with_streaming_response.create(
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=10,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asset = await response.parse()
+            assert_matches_type(AsyncSinglePage[AssetCreateResponse], asset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.requests.assets.with_raw_response.create(
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                page=0,
+                per_page=10,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
+            await async_client.cloudforce_one.requests.assets.with_raw_response.create(
+                request_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                page=0,
+                per_page=10,
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        asset = await async_client.cloudforce_one.requests.assets.update(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        )
+        assert_matches_type(Optional[AssetUpdateResponse], asset, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        asset = await async_client.cloudforce_one.requests.assets.update(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            source="@/Users/me/example.docx",
+        )
+        assert_matches_type(Optional[AssetUpdateResponse], asset, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.requests.assets.with_raw_response.update(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asset = await response.parse()
+        assert_matches_type(Optional[AssetUpdateResponse], asset, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.requests.assets.with_streaming_response.update(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asset = await response.parse()
+            assert_matches_type(Optional[AssetUpdateResponse], asset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.requests.assets.with_raw_response.update(
+                asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
+            await async_client.cloudforce_one.requests.assets.with_raw_response.update(
+                asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `asset_id` but received ''"):
+            await async_client.cloudforce_one.requests.assets.with_raw_response.update(
+                asset_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        asset = await async_client.cloudforce_one.requests.assets.delete(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        )
+        assert_matches_type(AssetDeleteResponse, asset, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.requests.assets.with_raw_response.delete(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asset = await response.parse()
+        assert_matches_type(AssetDeleteResponse, asset, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.requests.assets.with_streaming_response.delete(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asset = await response.parse()
+            assert_matches_type(AssetDeleteResponse, asset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.requests.assets.with_raw_response.delete(
+                asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
+            await async_client.cloudforce_one.requests.assets.with_raw_response.delete(
+                asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `asset_id` but received ''"):
+            await async_client.cloudforce_one.requests.assets.with_raw_response.delete(
+                asset_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        asset = await async_client.cloudforce_one.requests.assets.get(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        )
+        assert_matches_type(AsyncSinglePage[AssetGetResponse], asset, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.requests.assets.with_raw_response.get(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asset = await response.parse()
+        assert_matches_type(AsyncSinglePage[AssetGetResponse], asset, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.requests.assets.with_streaming_response.get(
+            asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asset = await response.parse()
+            assert_matches_type(AsyncSinglePage[AssetGetResponse], asset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.requests.assets.with_raw_response.get(
+                asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
+            await async_client.cloudforce_one.requests.assets.with_raw_response.get(
+                asset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `asset_id` but received ''"):
+            await async_client.cloudforce_one.requests.assets.with_raw_response.get(
+                asset_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            )
diff --git a/tests/api_resources/cloudforce_one/requests/test_message.py b/tests/api_resources/cloudforce_one/requests/test_message.py
index af281c7eb9f..36273480abe 100644
--- a/tests/api_resources/cloudforce_one/requests/test_message.py
+++ b/tests/api_resources/cloudforce_one/requests/test_message.py
@@ -10,9 +10,9 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare._utils import parse_datetime
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.cloudforce_one.requests import (
     Message,
-    MessageGetResponse,
     MessageDeleteResponse,
 )
 
@@ -25,16 +25,16 @@ class TestMessage:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         message = client.cloudforce_one.requests.message.create(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Message], message, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         message = client.cloudforce_one.requests.message.create(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             content="Can you elaborate on the type of DoS that occurred?",
         )
         assert_matches_type(Optional[Message], message, path=["response"])
@@ -42,8 +42,8 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.cloudforce_one.requests.message.with_raw_response.create(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -54,8 +54,8 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.cloudforce_one.requests.message.with_streaming_response.create(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -67,47 +67,43 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.cloudforce_one.requests.message.with_raw_response.create(
-                request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_identifier="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
             client.cloudforce_one.requests.message.with_raw_response.create(
-                request_identifier="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         message = client.cloudforce_one.requests.message.update(
-            message_identifer=0,
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            message_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
         )
         assert_matches_type(Optional[Message], message, path=["response"])
 
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         message = client.cloudforce_one.requests.message.update(
-            message_identifer=0,
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            content="What regions were most effected by the recent DoS?",
-            priority="routine",
-            request_type="Victomology",
-            summary="DoS attack",
-            tlp="clear",
+            message_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            content="Can you elaborate on the type of DoS that occurred?",
         )
         assert_matches_type(Optional[Message], message, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.cloudforce_one.requests.message.with_raw_response.update(
-            message_identifer=0,
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            message_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
         )
 
         assert response.is_closed is True
@@ -118,9 +114,9 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.cloudforce_one.requests.message.with_streaming_response.update(
-            message_identifer=0,
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            message_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -132,35 +128,35 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.cloudforce_one.requests.message.with_raw_response.update(
-                message_identifer=0,
-                account_identifier="",
-                request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                message_id=0,
+                account_id="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
             client.cloudforce_one.requests.message.with_raw_response.update(
-                message_identifer=0,
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                request_identifier="",
+                message_id=0,
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
             )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         message = client.cloudforce_one.requests.message.delete(
-            message_identifer=0,
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            message_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
         )
         assert_matches_type(MessageDeleteResponse, message, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.cloudforce_one.requests.message.with_raw_response.delete(
-            message_identifer=0,
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            message_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
         )
 
         assert response.is_closed is True
@@ -171,9 +167,9 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.cloudforce_one.requests.message.with_streaming_response.delete(
-            message_identifer=0,
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            message_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -185,49 +181,49 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.cloudforce_one.requests.message.with_raw_response.delete(
-                message_identifer=0,
-                account_identifier="",
-                request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                message_id=0,
+                account_id="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
             client.cloudforce_one.requests.message.with_raw_response.delete(
-                message_identifer=0,
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                request_identifier="",
+                message_id=0,
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         message = client.cloudforce_one.requests.message.get(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             page=0,
             per_page=10,
         )
-        assert_matches_type(Optional[MessageGetResponse], message, path=["response"])
+        assert_matches_type(SyncSinglePage[Message], message, path=["response"])
 
     @parametrize
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         message = client.cloudforce_one.requests.message.get(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             page=0,
             per_page=10,
-            after=parse_datetime("2022-01-01T00:00:00Z"),
+            after=parse_datetime("2022-04-01T05:20:00Z"),
             before=parse_datetime("2024-01-01T00:00:00Z"),
             sort_by="created",
             sort_order="asc",
         )
-        assert_matches_type(Optional[MessageGetResponse], message, path=["response"])
+        assert_matches_type(SyncSinglePage[Message], message, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.cloudforce_one.requests.message.with_raw_response.get(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             page=0,
             per_page=10,
         )
@@ -235,13 +231,13 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         message = response.parse()
-        assert_matches_type(Optional[MessageGetResponse], message, path=["response"])
+        assert_matches_type(SyncSinglePage[Message], message, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.cloudforce_one.requests.message.with_streaming_response.get(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             page=0,
             per_page=10,
         ) as response:
@@ -249,45 +245,47 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             message = response.parse()
-            assert_matches_type(Optional[MessageGetResponse], message, path=["response"])
+            assert_matches_type(SyncSinglePage[Message], message, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.cloudforce_one.requests.message.with_raw_response.get(
-                request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_identifier="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
                 page=0,
                 per_page=10,
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
             client.cloudforce_one.requests.message.with_raw_response.get(
-                request_identifier="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 page=0,
                 per_page=10,
             )
 
 
 class TestAsyncMessage:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         message = await async_client.cloudforce_one.requests.message.create(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Message], message, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         message = await async_client.cloudforce_one.requests.message.create(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             content="Can you elaborate on the type of DoS that occurred?",
         )
         assert_matches_type(Optional[Message], message, path=["response"])
@@ -295,8 +293,8 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cloudforce_one.requests.message.with_raw_response.create(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -307,8 +305,8 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cloudforce_one.requests.message.with_streaming_response.create(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -320,47 +318,43 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.cloudforce_one.requests.message.with_raw_response.create(
-                request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_identifier="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
             await async_client.cloudforce_one.requests.message.with_raw_response.create(
-                request_identifier="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         message = await async_client.cloudforce_one.requests.message.update(
-            message_identifer=0,
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            message_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
         )
         assert_matches_type(Optional[Message], message, path=["response"])
 
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         message = await async_client.cloudforce_one.requests.message.update(
-            message_identifer=0,
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            content="What regions were most effected by the recent DoS?",
-            priority="routine",
-            request_type="Victomology",
-            summary="DoS attack",
-            tlp="clear",
+            message_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            content="Can you elaborate on the type of DoS that occurred?",
         )
         assert_matches_type(Optional[Message], message, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cloudforce_one.requests.message.with_raw_response.update(
-            message_identifer=0,
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            message_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
         )
 
         assert response.is_closed is True
@@ -371,9 +365,9 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cloudforce_one.requests.message.with_streaming_response.update(
-            message_identifer=0,
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            message_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -385,35 +379,35 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.cloudforce_one.requests.message.with_raw_response.update(
-                message_identifer=0,
-                account_identifier="",
-                request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                message_id=0,
+                account_id="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
             await async_client.cloudforce_one.requests.message.with_raw_response.update(
-                message_identifer=0,
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                request_identifier="",
+                message_id=0,
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
             )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         message = await async_client.cloudforce_one.requests.message.delete(
-            message_identifer=0,
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            message_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
         )
         assert_matches_type(MessageDeleteResponse, message, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cloudforce_one.requests.message.with_raw_response.delete(
-            message_identifer=0,
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            message_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
         )
 
         assert response.is_closed is True
@@ -424,9 +418,9 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cloudforce_one.requests.message.with_streaming_response.delete(
-            message_identifer=0,
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            message_id=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -438,49 +432,49 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.cloudforce_one.requests.message.with_raw_response.delete(
-                message_identifer=0,
-                account_identifier="",
-                request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                message_id=0,
+                account_id="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
             await async_client.cloudforce_one.requests.message.with_raw_response.delete(
-                message_identifer=0,
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                request_identifier="",
+                message_id=0,
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         message = await async_client.cloudforce_one.requests.message.get(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             page=0,
             per_page=10,
         )
-        assert_matches_type(Optional[MessageGetResponse], message, path=["response"])
+        assert_matches_type(AsyncSinglePage[Message], message, path=["response"])
 
     @parametrize
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         message = await async_client.cloudforce_one.requests.message.get(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             page=0,
             per_page=10,
-            after=parse_datetime("2022-01-01T00:00:00Z"),
+            after=parse_datetime("2022-04-01T05:20:00Z"),
             before=parse_datetime("2024-01-01T00:00:00Z"),
             sort_by="created",
             sort_order="asc",
         )
-        assert_matches_type(Optional[MessageGetResponse], message, path=["response"])
+        assert_matches_type(AsyncSinglePage[Message], message, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cloudforce_one.requests.message.with_raw_response.get(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             page=0,
             per_page=10,
         )
@@ -488,13 +482,13 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         message = await response.parse()
-        assert_matches_type(Optional[MessageGetResponse], message, path=["response"])
+        assert_matches_type(AsyncSinglePage[Message], message, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cloudforce_one.requests.message.with_streaming_response.get(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             page=0,
             per_page=10,
         ) as response:
@@ -502,24 +496,24 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             message = await response.parse()
-            assert_matches_type(Optional[MessageGetResponse], message, path=["response"])
+            assert_matches_type(AsyncSinglePage[Message], message, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.cloudforce_one.requests.message.with_raw_response.get(
-                request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_identifier="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
                 page=0,
                 per_page=10,
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
             await async_client.cloudforce_one.requests.message.with_raw_response.get(
-                request_identifier="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 page=0,
                 per_page=10,
             )
diff --git a/tests/api_resources/cloudforce_one/requests/test_priority.py b/tests/api_resources/cloudforce_one/requests/test_priority.py
index a3078846680..66bd879a97e 100644
--- a/tests/api_resources/cloudforce_one/requests/test_priority.py
+++ b/tests/api_resources/cloudforce_one/requests/test_priority.py
@@ -24,7 +24,7 @@ class TestPriority:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         priority = client.cloudforce_one.requests.priority.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             labels=["DoS", "CVE"],
             priority=1,
             requirement="DoS attacks carried out by CVEs",
@@ -35,7 +35,7 @@ def test_method_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.cloudforce_one.requests.priority.with_raw_response.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             labels=["DoS", "CVE"],
             priority=1,
             requirement="DoS attacks carried out by CVEs",
@@ -50,7 +50,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.cloudforce_one.requests.priority.with_streaming_response.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             labels=["DoS", "CVE"],
             priority=1,
             requirement="DoS attacks carried out by CVEs",
@@ -66,9 +66,9 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.cloudforce_one.requests.priority.with_raw_response.create(
-                account_identifier="",
+                account_id="",
                 labels=["DoS", "CVE"],
                 priority=1,
                 requirement="DoS attacks carried out by CVEs",
@@ -78,8 +78,8 @@ def test_path_params_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         priority = client.cloudforce_one.requests.priority.update(
-            priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             labels=["DoS", "CVE"],
             priority=1,
             requirement="DoS attacks carried out by CVEs",
@@ -90,8 +90,8 @@ def test_method_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.cloudforce_one.requests.priority.with_raw_response.update(
-            priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             labels=["DoS", "CVE"],
             priority=1,
             requirement="DoS attacks carried out by CVEs",
@@ -106,8 +106,8 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.cloudforce_one.requests.priority.with_streaming_response.update(
-            priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             labels=["DoS", "CVE"],
             priority=1,
             requirement="DoS attacks carried out by CVEs",
@@ -123,20 +123,20 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.cloudforce_one.requests.priority.with_raw_response.update(
-                priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_identifier="",
+                priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
                 labels=["DoS", "CVE"],
                 priority=1,
                 requirement="DoS attacks carried out by CVEs",
                 tlp="clear",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `priority_identifer` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `priority_id` but received ''"):
             client.cloudforce_one.requests.priority.with_raw_response.update(
-                priority_identifer="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                priority_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 labels=["DoS", "CVE"],
                 priority=1,
                 requirement="DoS attacks carried out by CVEs",
@@ -146,16 +146,16 @@ def test_path_params_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         priority = client.cloudforce_one.requests.priority.delete(
-            priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(PriorityDeleteResponse, priority, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.cloudforce_one.requests.priority.with_raw_response.delete(
-            priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -166,8 +166,8 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.cloudforce_one.requests.priority.with_streaming_response.delete(
-            priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -179,31 +179,31 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.cloudforce_one.requests.priority.with_raw_response.delete(
-                priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_identifier="",
+                priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `priority_identifer` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `priority_id` but received ''"):
             client.cloudforce_one.requests.priority.with_raw_response.delete(
-                priority_identifer="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                priority_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         priority = client.cloudforce_one.requests.priority.get(
-            priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Item], priority, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.cloudforce_one.requests.priority.with_raw_response.get(
-            priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -214,8 +214,8 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.cloudforce_one.requests.priority.with_streaming_response.get(
-            priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -227,29 +227,29 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.cloudforce_one.requests.priority.with_raw_response.get(
-                priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_identifier="",
+                priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `priority_identifer` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `priority_id` but received ''"):
             client.cloudforce_one.requests.priority.with_raw_response.get(
-                priority_identifer="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                priority_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_quota(self, client: Cloudflare) -> None:
         priority = client.cloudforce_one.requests.priority.quota(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Quota], priority, path=["response"])
 
     @parametrize
     def test_raw_response_quota(self, client: Cloudflare) -> None:
         response = client.cloudforce_one.requests.priority.with_raw_response.quota(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -260,7 +260,7 @@ def test_raw_response_quota(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_quota(self, client: Cloudflare) -> None:
         with client.cloudforce_one.requests.priority.with_streaming_response.quota(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -272,19 +272,21 @@ def test_streaming_response_quota(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_quota(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.cloudforce_one.requests.priority.with_raw_response.quota(
-                "",
+                account_id="",
             )
 
 
 class TestAsyncPriority:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         priority = await async_client.cloudforce_one.requests.priority.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             labels=["DoS", "CVE"],
             priority=1,
             requirement="DoS attacks carried out by CVEs",
@@ -295,7 +297,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cloudforce_one.requests.priority.with_raw_response.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             labels=["DoS", "CVE"],
             priority=1,
             requirement="DoS attacks carried out by CVEs",
@@ -310,7 +312,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cloudforce_one.requests.priority.with_streaming_response.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             labels=["DoS", "CVE"],
             priority=1,
             requirement="DoS attacks carried out by CVEs",
@@ -326,9 +328,9 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.cloudforce_one.requests.priority.with_raw_response.create(
-                account_identifier="",
+                account_id="",
                 labels=["DoS", "CVE"],
                 priority=1,
                 requirement="DoS attacks carried out by CVEs",
@@ -338,8 +340,8 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         priority = await async_client.cloudforce_one.requests.priority.update(
-            priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             labels=["DoS", "CVE"],
             priority=1,
             requirement="DoS attacks carried out by CVEs",
@@ -350,8 +352,8 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cloudforce_one.requests.priority.with_raw_response.update(
-            priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             labels=["DoS", "CVE"],
             priority=1,
             requirement="DoS attacks carried out by CVEs",
@@ -366,8 +368,8 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cloudforce_one.requests.priority.with_streaming_response.update(
-            priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             labels=["DoS", "CVE"],
             priority=1,
             requirement="DoS attacks carried out by CVEs",
@@ -383,20 +385,20 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.cloudforce_one.requests.priority.with_raw_response.update(
-                priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_identifier="",
+                priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
                 labels=["DoS", "CVE"],
                 priority=1,
                 requirement="DoS attacks carried out by CVEs",
                 tlp="clear",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `priority_identifer` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `priority_id` but received ''"):
             await async_client.cloudforce_one.requests.priority.with_raw_response.update(
-                priority_identifer="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                priority_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 labels=["DoS", "CVE"],
                 priority=1,
                 requirement="DoS attacks carried out by CVEs",
@@ -406,16 +408,16 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         priority = await async_client.cloudforce_one.requests.priority.delete(
-            priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(PriorityDeleteResponse, priority, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cloudforce_one.requests.priority.with_raw_response.delete(
-            priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -426,8 +428,8 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cloudforce_one.requests.priority.with_streaming_response.delete(
-            priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -439,31 +441,31 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.cloudforce_one.requests.priority.with_raw_response.delete(
-                priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_identifier="",
+                priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `priority_identifer` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `priority_id` but received ''"):
             await async_client.cloudforce_one.requests.priority.with_raw_response.delete(
-                priority_identifer="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                priority_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         priority = await async_client.cloudforce_one.requests.priority.get(
-            priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Item], priority, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cloudforce_one.requests.priority.with_raw_response.get(
-            priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -474,8 +476,8 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cloudforce_one.requests.priority.with_streaming_response.get(
-            priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -487,29 +489,29 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.cloudforce_one.requests.priority.with_raw_response.get(
-                priority_identifer="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_identifier="",
+                priority_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `priority_identifer` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `priority_id` but received ''"):
             await async_client.cloudforce_one.requests.priority.with_raw_response.get(
-                priority_identifer="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                priority_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_quota(self, async_client: AsyncCloudflare) -> None:
         priority = await async_client.cloudforce_one.requests.priority.quota(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Quota], priority, path=["response"])
 
     @parametrize
     async def test_raw_response_quota(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cloudforce_one.requests.priority.with_raw_response.quota(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -520,7 +522,7 @@ async def test_raw_response_quota(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_quota(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cloudforce_one.requests.priority.with_streaming_response.quota(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -532,7 +534,7 @@ async def test_streaming_response_quota(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_quota(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.cloudforce_one.requests.priority.with_raw_response.quota(
-                "",
+                account_id="",
             )
diff --git a/tests/api_resources/rulesets/versions/__init__.py b/tests/api_resources/cloudforce_one/scans/__init__.py
similarity index 100%
rename from tests/api_resources/rulesets/versions/__init__.py
rename to tests/api_resources/cloudforce_one/scans/__init__.py
diff --git a/tests/api_resources/cloudforce_one/scans/test_config.py b/tests/api_resources/cloudforce_one/scans/test_config.py
new file mode 100644
index 00000000000..86680ee87c9
--- /dev/null
+++ b/tests/api_resources/cloudforce_one/scans/test_config.py
@@ -0,0 +1,423 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.cloudforce_one.scans import (
+    ConfigEditResponse,
+    ConfigListResponse,
+    ConfigCreateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestConfig:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        config = client.cloudforce_one.scans.config.create(
+            account_id="account_id",
+            ips=["1.1.1.1", "2606:4700:4700::1111"],
+        )
+        assert_matches_type(Optional[ConfigCreateResponse], config, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        config = client.cloudforce_one.scans.config.create(
+            account_id="account_id",
+            ips=["1.1.1.1", "2606:4700:4700::1111"],
+            frequency=7,
+            ports=["default"],
+        )
+        assert_matches_type(Optional[ConfigCreateResponse], config, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.scans.config.with_raw_response.create(
+            account_id="account_id",
+            ips=["1.1.1.1", "2606:4700:4700::1111"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        config = response.parse()
+        assert_matches_type(Optional[ConfigCreateResponse], config, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.scans.config.with_streaming_response.create(
+            account_id="account_id",
+            ips=["1.1.1.1", "2606:4700:4700::1111"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            config = response.parse()
+            assert_matches_type(Optional[ConfigCreateResponse], config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.scans.config.with_raw_response.create(
+                account_id="",
+                ips=["1.1.1.1", "2606:4700:4700::1111"],
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        config = client.cloudforce_one.scans.config.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncSinglePage[ConfigListResponse], config, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.scans.config.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        config = response.parse()
+        assert_matches_type(SyncSinglePage[ConfigListResponse], config, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.scans.config.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            config = response.parse()
+            assert_matches_type(SyncSinglePage[ConfigListResponse], config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.scans.config.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        config = client.cloudforce_one.scans.config.delete(
+            config_id="config_id",
+            account_id="account_id",
+        )
+        assert_matches_type(object, config, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.scans.config.with_raw_response.delete(
+            config_id="config_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        config = response.parse()
+        assert_matches_type(object, config, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.scans.config.with_streaming_response.delete(
+            config_id="config_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            config = response.parse()
+            assert_matches_type(object, config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.scans.config.with_raw_response.delete(
+                config_id="config_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `config_id` but received ''"):
+            client.cloudforce_one.scans.config.with_raw_response.delete(
+                config_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        config = client.cloudforce_one.scans.config.edit(
+            config_id="config_id",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ConfigEditResponse], config, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        config = client.cloudforce_one.scans.config.edit(
+            config_id="config_id",
+            account_id="account_id",
+            frequency=7,
+            ips=["1.1.1.1", "2606:4700:4700::1111"],
+            ports=["default"],
+        )
+        assert_matches_type(Optional[ConfigEditResponse], config, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.scans.config.with_raw_response.edit(
+            config_id="config_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        config = response.parse()
+        assert_matches_type(Optional[ConfigEditResponse], config, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.scans.config.with_streaming_response.edit(
+            config_id="config_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            config = response.parse()
+            assert_matches_type(Optional[ConfigEditResponse], config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.scans.config.with_raw_response.edit(
+                config_id="config_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `config_id` but received ''"):
+            client.cloudforce_one.scans.config.with_raw_response.edit(
+                config_id="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncConfig:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        config = await async_client.cloudforce_one.scans.config.create(
+            account_id="account_id",
+            ips=["1.1.1.1", "2606:4700:4700::1111"],
+        )
+        assert_matches_type(Optional[ConfigCreateResponse], config, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        config = await async_client.cloudforce_one.scans.config.create(
+            account_id="account_id",
+            ips=["1.1.1.1", "2606:4700:4700::1111"],
+            frequency=7,
+            ports=["default"],
+        )
+        assert_matches_type(Optional[ConfigCreateResponse], config, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.scans.config.with_raw_response.create(
+            account_id="account_id",
+            ips=["1.1.1.1", "2606:4700:4700::1111"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        config = await response.parse()
+        assert_matches_type(Optional[ConfigCreateResponse], config, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.scans.config.with_streaming_response.create(
+            account_id="account_id",
+            ips=["1.1.1.1", "2606:4700:4700::1111"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            config = await response.parse()
+            assert_matches_type(Optional[ConfigCreateResponse], config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.scans.config.with_raw_response.create(
+                account_id="",
+                ips=["1.1.1.1", "2606:4700:4700::1111"],
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        config = await async_client.cloudforce_one.scans.config.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncSinglePage[ConfigListResponse], config, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.scans.config.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        config = await response.parse()
+        assert_matches_type(AsyncSinglePage[ConfigListResponse], config, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.scans.config.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            config = await response.parse()
+            assert_matches_type(AsyncSinglePage[ConfigListResponse], config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.scans.config.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        config = await async_client.cloudforce_one.scans.config.delete(
+            config_id="config_id",
+            account_id="account_id",
+        )
+        assert_matches_type(object, config, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.scans.config.with_raw_response.delete(
+            config_id="config_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        config = await response.parse()
+        assert_matches_type(object, config, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.scans.config.with_streaming_response.delete(
+            config_id="config_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            config = await response.parse()
+            assert_matches_type(object, config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.scans.config.with_raw_response.delete(
+                config_id="config_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `config_id` but received ''"):
+            await async_client.cloudforce_one.scans.config.with_raw_response.delete(
+                config_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        config = await async_client.cloudforce_one.scans.config.edit(
+            config_id="config_id",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ConfigEditResponse], config, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        config = await async_client.cloudforce_one.scans.config.edit(
+            config_id="config_id",
+            account_id="account_id",
+            frequency=7,
+            ips=["1.1.1.1", "2606:4700:4700::1111"],
+            ports=["default"],
+        )
+        assert_matches_type(Optional[ConfigEditResponse], config, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.scans.config.with_raw_response.edit(
+            config_id="config_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        config = await response.parse()
+        assert_matches_type(Optional[ConfigEditResponse], config, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.scans.config.with_streaming_response.edit(
+            config_id="config_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            config = await response.parse()
+            assert_matches_type(Optional[ConfigEditResponse], config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.scans.config.with_raw_response.edit(
+                config_id="config_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `config_id` but received ''"):
+            await async_client.cloudforce_one.scans.config.with_raw_response.edit(
+                config_id="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/cloudforce_one/scans/test_results.py b/tests/api_resources/cloudforce_one/scans/test_results.py
new file mode 100644
index 00000000000..8f385538a2c
--- /dev/null
+++ b/tests/api_resources/cloudforce_one/scans/test_results.py
@@ -0,0 +1,120 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.cloudforce_one.scans import ResultGetResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestResults:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        result = client.cloudforce_one.scans.results.get(
+            config_id="config_id",
+            account_id="account_id",
+        )
+        assert_matches_type(ResultGetResponse, result, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.scans.results.with_raw_response.get(
+            config_id="config_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        result = response.parse()
+        assert_matches_type(ResultGetResponse, result, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.scans.results.with_streaming_response.get(
+            config_id="config_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            result = response.parse()
+            assert_matches_type(ResultGetResponse, result, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.scans.results.with_raw_response.get(
+                config_id="config_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `config_id` but received ''"):
+            client.cloudforce_one.scans.results.with_raw_response.get(
+                config_id="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncResults:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        result = await async_client.cloudforce_one.scans.results.get(
+            config_id="config_id",
+            account_id="account_id",
+        )
+        assert_matches_type(ResultGetResponse, result, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.scans.results.with_raw_response.get(
+            config_id="config_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        result = await response.parse()
+        assert_matches_type(ResultGetResponse, result, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.scans.results.with_streaming_response.get(
+            config_id="config_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            result = await response.parse()
+            assert_matches_type(ResultGetResponse, result, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.scans.results.with_raw_response.get(
+                config_id="config_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `config_id` but received ''"):
+            await async_client.cloudforce_one.scans.results.with_raw_response.get(
+                config_id="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/cloudforce_one/test_binary_storage.py b/tests/api_resources/cloudforce_one/test_binary_storage.py
new file mode 100644
index 00000000000..b26a1186d15
--- /dev/null
+++ b/tests/api_resources/cloudforce_one/test_binary_storage.py
@@ -0,0 +1,220 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.cloudforce_one import BinaryStorageCreateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestBinaryStorage:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        binary_storage = client.cloudforce_one.binary_storage.create(
+            account_id="account_id",
+            file=b"raw file contents",
+        )
+        assert_matches_type(BinaryStorageCreateResponse, binary_storage, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.binary_storage.with_raw_response.create(
+            account_id="account_id",
+            file=b"raw file contents",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        binary_storage = response.parse()
+        assert_matches_type(BinaryStorageCreateResponse, binary_storage, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.binary_storage.with_streaming_response.create(
+            account_id="account_id",
+            file=b"raw file contents",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            binary_storage = response.parse()
+            assert_matches_type(BinaryStorageCreateResponse, binary_storage, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.binary_storage.with_raw_response.create(
+                account_id="",
+                file=b"raw file contents",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        binary_storage = client.cloudforce_one.binary_storage.get(
+            hash="hash",
+            account_id="account_id",
+        )
+        assert binary_storage is None
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.binary_storage.with_raw_response.get(
+            hash="hash",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        binary_storage = response.parse()
+        assert binary_storage is None
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.binary_storage.with_streaming_response.get(
+            hash="hash",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            binary_storage = response.parse()
+            assert binary_storage is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.binary_storage.with_raw_response.get(
+                hash="hash",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `hash` but received ''"):
+            client.cloudforce_one.binary_storage.with_raw_response.get(
+                hash="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncBinaryStorage:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        binary_storage = await async_client.cloudforce_one.binary_storage.create(
+            account_id="account_id",
+            file=b"raw file contents",
+        )
+        assert_matches_type(BinaryStorageCreateResponse, binary_storage, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.binary_storage.with_raw_response.create(
+            account_id="account_id",
+            file=b"raw file contents",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        binary_storage = await response.parse()
+        assert_matches_type(BinaryStorageCreateResponse, binary_storage, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.binary_storage.with_streaming_response.create(
+            account_id="account_id",
+            file=b"raw file contents",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            binary_storage = await response.parse()
+            assert_matches_type(BinaryStorageCreateResponse, binary_storage, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.binary_storage.with_raw_response.create(
+                account_id="",
+                file=b"raw file contents",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        binary_storage = await async_client.cloudforce_one.binary_storage.get(
+            hash="hash",
+            account_id="account_id",
+        )
+        assert binary_storage is None
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.binary_storage.with_raw_response.get(
+            hash="hash",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        binary_storage = await response.parse()
+        assert binary_storage is None
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.binary_storage.with_streaming_response.get(
+            hash="hash",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            binary_storage = await response.parse()
+            assert binary_storage is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.binary_storage.with_raw_response.get(
+                hash="hash",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `hash` but received ''"):
+            await async_client.cloudforce_one.binary_storage.with_raw_response.get(
+                hash="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/cloudforce_one/test_requests.py b/tests/api_resources/cloudforce_one/test_requests.py
index 53ea792ef95..e4da0a26eed 100644
--- a/tests/api_resources/cloudforce_one/test_requests.py
+++ b/tests/api_resources/cloudforce_one/test_requests.py
@@ -10,13 +10,13 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare._utils import parse_datetime
-from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.cloudforce_one import (
     Item,
     Quota,
     ListItem,
-    RequestTypes,
     RequestConstants,
+    RequestTypesResponse,
     RequestDeleteResponse,
 )
 
@@ -29,14 +29,14 @@ class TestRequests:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         request = client.cloudforce_one.requests.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Item], request, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         request = client.cloudforce_one.requests.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             content="What regions were most effected by the recent DoS?",
             priority="routine",
             request_type="Victomology",
@@ -48,7 +48,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.cloudforce_one.requests.with_raw_response.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -59,7 +59,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.cloudforce_one.requests.with_streaming_response.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -71,24 +71,24 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.cloudforce_one.requests.with_raw_response.create(
-                account_identifier="",
+                account_id="",
             )
 
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         request = client.cloudforce_one.requests.update(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Item], request, path=["response"])
 
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         request = client.cloudforce_one.requests.update(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             content="What regions were most effected by the recent DoS?",
             priority="routine",
             request_type="Victomology",
@@ -100,8 +100,8 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.cloudforce_one.requests.with_raw_response.update(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -112,8 +112,8 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.cloudforce_one.requests.with_streaming_response.update(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -125,31 +125,31 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.cloudforce_one.requests.with_raw_response.update(
-                request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_identifier="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
             client.cloudforce_one.requests.with_raw_response.update(
-                request_identifier="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         request = client.cloudforce_one.requests.list(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             page=0,
             per_page=10,
         )
-        assert_matches_type(SyncV4PagePaginationArray[ListItem], request, path=["response"])
+        assert_matches_type(SyncSinglePage[ListItem], request, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         request = client.cloudforce_one.requests.list(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             page=0,
             per_page=10,
             completed_after=parse_datetime("2022-01-01T00:00:00Z"),
@@ -161,12 +161,12 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
             sort_order="asc",
             status="open",
         )
-        assert_matches_type(SyncV4PagePaginationArray[ListItem], request, path=["response"])
+        assert_matches_type(SyncSinglePage[ListItem], request, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.cloudforce_one.requests.with_raw_response.list(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             page=0,
             per_page=10,
         )
@@ -174,12 +174,12 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         request = response.parse()
-        assert_matches_type(SyncV4PagePaginationArray[ListItem], request, path=["response"])
+        assert_matches_type(SyncSinglePage[ListItem], request, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.cloudforce_one.requests.with_streaming_response.list(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             page=0,
             per_page=10,
         ) as response:
@@ -187,15 +187,15 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             request = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[ListItem], request, path=["response"])
+            assert_matches_type(SyncSinglePage[ListItem], request, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.cloudforce_one.requests.with_raw_response.list(
-                account_identifier="",
+                account_id="",
                 page=0,
                 per_page=10,
             )
@@ -203,16 +203,16 @@ def test_path_params_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         request = client.cloudforce_one.requests.delete(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(RequestDeleteResponse, request, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.cloudforce_one.requests.with_raw_response.delete(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -223,8 +223,8 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.cloudforce_one.requests.with_streaming_response.delete(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -236,29 +236,29 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.cloudforce_one.requests.with_raw_response.delete(
-                request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_identifier="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
             client.cloudforce_one.requests.with_raw_response.delete(
-                request_identifier="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_constants(self, client: Cloudflare) -> None:
         request = client.cloudforce_one.requests.constants(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[RequestConstants], request, path=["response"])
 
     @parametrize
     def test_raw_response_constants(self, client: Cloudflare) -> None:
         response = client.cloudforce_one.requests.with_raw_response.constants(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -269,7 +269,7 @@ def test_raw_response_constants(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_constants(self, client: Cloudflare) -> None:
         with client.cloudforce_one.requests.with_streaming_response.constants(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -281,24 +281,24 @@ def test_streaming_response_constants(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_constants(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.cloudforce_one.requests.with_raw_response.constants(
-                "",
+                account_id="",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         request = client.cloudforce_one.requests.get(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Item], request, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.cloudforce_one.requests.with_raw_response.get(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -309,8 +309,8 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.cloudforce_one.requests.with_streaming_response.get(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -322,29 +322,29 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.cloudforce_one.requests.with_raw_response.get(
-                request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_identifier="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
             client.cloudforce_one.requests.with_raw_response.get(
-                request_identifier="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_quota(self, client: Cloudflare) -> None:
         request = client.cloudforce_one.requests.quota(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Quota], request, path=["response"])
 
     @parametrize
     def test_raw_response_quota(self, client: Cloudflare) -> None:
         response = client.cloudforce_one.requests.with_raw_response.quota(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -355,7 +355,7 @@ def test_raw_response_quota(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_quota(self, client: Cloudflare) -> None:
         with client.cloudforce_one.requests.with_streaming_response.quota(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -367,64 +367,66 @@ def test_streaming_response_quota(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_quota(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.cloudforce_one.requests.with_raw_response.quota(
-                "",
+                account_id="",
             )
 
     @parametrize
     def test_method_types(self, client: Cloudflare) -> None:
         request = client.cloudforce_one.requests.types(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[RequestTypes], request, path=["response"])
+        assert_matches_type(SyncSinglePage[RequestTypesResponse], request, path=["response"])
 
     @parametrize
     def test_raw_response_types(self, client: Cloudflare) -> None:
         response = client.cloudforce_one.requests.with_raw_response.types(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         request = response.parse()
-        assert_matches_type(Optional[RequestTypes], request, path=["response"])
+        assert_matches_type(SyncSinglePage[RequestTypesResponse], request, path=["response"])
 
     @parametrize
     def test_streaming_response_types(self, client: Cloudflare) -> None:
         with client.cloudforce_one.requests.with_streaming_response.types(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             request = response.parse()
-            assert_matches_type(Optional[RequestTypes], request, path=["response"])
+            assert_matches_type(SyncSinglePage[RequestTypesResponse], request, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_types(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.cloudforce_one.requests.with_raw_response.types(
-                "",
+                account_id="",
             )
 
 
 class TestAsyncRequests:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         request = await async_client.cloudforce_one.requests.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Item], request, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         request = await async_client.cloudforce_one.requests.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             content="What regions were most effected by the recent DoS?",
             priority="routine",
             request_type="Victomology",
@@ -436,7 +438,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cloudforce_one.requests.with_raw_response.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -447,7 +449,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cloudforce_one.requests.with_streaming_response.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -459,24 +461,24 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.cloudforce_one.requests.with_raw_response.create(
-                account_identifier="",
+                account_id="",
             )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         request = await async_client.cloudforce_one.requests.update(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Item], request, path=["response"])
 
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         request = await async_client.cloudforce_one.requests.update(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             content="What regions were most effected by the recent DoS?",
             priority="routine",
             request_type="Victomology",
@@ -488,8 +490,8 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cloudforce_one.requests.with_raw_response.update(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -500,8 +502,8 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cloudforce_one.requests.with_streaming_response.update(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -513,31 +515,31 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.cloudforce_one.requests.with_raw_response.update(
-                request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_identifier="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
             await async_client.cloudforce_one.requests.with_raw_response.update(
-                request_identifier="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         request = await async_client.cloudforce_one.requests.list(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             page=0,
             per_page=10,
         )
-        assert_matches_type(AsyncV4PagePaginationArray[ListItem], request, path=["response"])
+        assert_matches_type(AsyncSinglePage[ListItem], request, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         request = await async_client.cloudforce_one.requests.list(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             page=0,
             per_page=10,
             completed_after=parse_datetime("2022-01-01T00:00:00Z"),
@@ -549,12 +551,12 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
             sort_order="asc",
             status="open",
         )
-        assert_matches_type(AsyncV4PagePaginationArray[ListItem], request, path=["response"])
+        assert_matches_type(AsyncSinglePage[ListItem], request, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cloudforce_one.requests.with_raw_response.list(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             page=0,
             per_page=10,
         )
@@ -562,12 +564,12 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         request = await response.parse()
-        assert_matches_type(AsyncV4PagePaginationArray[ListItem], request, path=["response"])
+        assert_matches_type(AsyncSinglePage[ListItem], request, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cloudforce_one.requests.with_streaming_response.list(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             page=0,
             per_page=10,
         ) as response:
@@ -575,15 +577,15 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             request = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[ListItem], request, path=["response"])
+            assert_matches_type(AsyncSinglePage[ListItem], request, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.cloudforce_one.requests.with_raw_response.list(
-                account_identifier="",
+                account_id="",
                 page=0,
                 per_page=10,
             )
@@ -591,16 +593,16 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         request = await async_client.cloudforce_one.requests.delete(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(RequestDeleteResponse, request, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cloudforce_one.requests.with_raw_response.delete(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -611,8 +613,8 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cloudforce_one.requests.with_streaming_response.delete(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -624,29 +626,29 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.cloudforce_one.requests.with_raw_response.delete(
-                request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_identifier="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
             await async_client.cloudforce_one.requests.with_raw_response.delete(
-                request_identifier="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_constants(self, async_client: AsyncCloudflare) -> None:
         request = await async_client.cloudforce_one.requests.constants(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[RequestConstants], request, path=["response"])
 
     @parametrize
     async def test_raw_response_constants(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cloudforce_one.requests.with_raw_response.constants(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -657,7 +659,7 @@ async def test_raw_response_constants(self, async_client: AsyncCloudflare) -> No
     @parametrize
     async def test_streaming_response_constants(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cloudforce_one.requests.with_streaming_response.constants(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -669,24 +671,24 @@ async def test_streaming_response_constants(self, async_client: AsyncCloudflare)
 
     @parametrize
     async def test_path_params_constants(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.cloudforce_one.requests.with_raw_response.constants(
-                "",
+                account_id="",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         request = await async_client.cloudforce_one.requests.get(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Item], request, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cloudforce_one.requests.with_raw_response.get(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -697,8 +699,8 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cloudforce_one.requests.with_streaming_response.get(
-            request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -710,29 +712,29 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.cloudforce_one.requests.with_raw_response.get(
-                request_identifier="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_identifier="",
+                request_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `request_id` but received ''"):
             await async_client.cloudforce_one.requests.with_raw_response.get(
-                request_identifier="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                request_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_quota(self, async_client: AsyncCloudflare) -> None:
         request = await async_client.cloudforce_one.requests.quota(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Quota], request, path=["response"])
 
     @parametrize
     async def test_raw_response_quota(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cloudforce_one.requests.with_raw_response.quota(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -743,7 +745,7 @@ async def test_raw_response_quota(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_quota(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cloudforce_one.requests.with_streaming_response.quota(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -755,45 +757,45 @@ async def test_streaming_response_quota(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_quota(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.cloudforce_one.requests.with_raw_response.quota(
-                "",
+                account_id="",
             )
 
     @parametrize
     async def test_method_types(self, async_client: AsyncCloudflare) -> None:
         request = await async_client.cloudforce_one.requests.types(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[RequestTypes], request, path=["response"])
+        assert_matches_type(AsyncSinglePage[RequestTypesResponse], request, path=["response"])
 
     @parametrize
     async def test_raw_response_types(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cloudforce_one.requests.with_raw_response.types(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         request = await response.parse()
-        assert_matches_type(Optional[RequestTypes], request, path=["response"])
+        assert_matches_type(AsyncSinglePage[RequestTypesResponse], request, path=["response"])
 
     @parametrize
     async def test_streaming_response_types(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cloudforce_one.requests.with_streaming_response.types(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             request = await response.parse()
-            assert_matches_type(Optional[RequestTypes], request, path=["response"])
+            assert_matches_type(AsyncSinglePage[RequestTypesResponse], request, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_types(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.cloudforce_one.requests.with_raw_response.types(
-                "",
+                account_id="",
             )
diff --git a/tests/api_resources/cloudforce_one/test_threat_events.py b/tests/api_resources/cloudforce_one/test_threat_events.py
new file mode 100644
index 00000000000..7353757e437
--- /dev/null
+++ b/tests/api_resources/cloudforce_one/test_threat_events.py
@@ -0,0 +1,972 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.cloudforce_one import (
+    ThreatEventGetResponse,
+    ThreatEventEditResponse,
+    ThreatEventListResponse,
+    ThreatEventCreateResponse,
+    ThreatEventDeleteResponse,
+    ThreatEventBulkCreateResponse,
+)
+
+# pyright: reportDeprecated=false
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestThreatEvents:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        threat_event = client.cloudforce_one.threat_events.create(
+            path_account_id="account_id",
+            category="Domain Resolution",
+            date=parse_datetime("2022-04-01T00:00:00Z"),
+            event="An attacker registered the domain domain.com",
+            raw={"data": {"foo": "bar"}},
+            tlp="amber",
+        )
+        assert_matches_type(ThreatEventCreateResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        threat_event = client.cloudforce_one.threat_events.create(
+            path_account_id="account_id",
+            category="Domain Resolution",
+            date=parse_datetime("2022-04-01T00:00:00Z"),
+            event="An attacker registered the domain domain.com",
+            raw={
+                "data": {"foo": "bar"},
+                "source": "example.com",
+                "tlp": "amber",
+            },
+            tlp="amber",
+            body_account_id=123456,
+            attacker="Flying Yeti",
+            attacker_country="CN",
+            dataset_id="durableObjectName",
+            indicator="domain.com",
+            indicators=[
+                {
+                    "indicator_type": "domain",
+                    "value": "malicious.com",
+                }
+            ],
+            indicator_type="domain",
+            insight="This domain was likely registered for phishing purposes",
+            tags=["malware"],
+            target_country="US",
+            target_industry="Agriculture",
+        )
+        assert_matches_type(ThreatEventCreateResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.with_raw_response.create(
+            path_account_id="account_id",
+            category="Domain Resolution",
+            date=parse_datetime("2022-04-01T00:00:00Z"),
+            event="An attacker registered the domain domain.com",
+            raw={"data": {"foo": "bar"}},
+            tlp="amber",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        threat_event = response.parse()
+        assert_matches_type(ThreatEventCreateResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.with_streaming_response.create(
+            path_account_id="account_id",
+            category="Domain Resolution",
+            date=parse_datetime("2022-04-01T00:00:00Z"),
+            event="An attacker registered the domain domain.com",
+            raw={"data": {"foo": "bar"}},
+            tlp="amber",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            threat_event = response.parse()
+            assert_matches_type(ThreatEventCreateResponse, threat_event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `path_account_id` but received ''"):
+            client.cloudforce_one.threat_events.with_raw_response.create(
+                path_account_id="",
+                category="Domain Resolution",
+                date=parse_datetime("2022-04-01T00:00:00Z"),
+                event="An attacker registered the domain domain.com",
+                raw={"data": {"foo": "bar"}},
+                tlp="amber",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        threat_event = client.cloudforce_one.threat_events.list(
+            account_id="account_id",
+        )
+        assert_matches_type(ThreatEventListResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        threat_event = client.cloudforce_one.threat_events.list(
+            account_id="account_id",
+            cursor="eyJ2ZXJzaW9uIjoxLCJwb3NpdGlvbiI6eyJkYXRlIjoiMjAyNC0wMS0xMlQxMDowMDowMFoiLCJ1dWlkIjoiYWJjMTIzIn19",
+            dataset_id=["string"],
+            force_refresh=True,
+            format="json",
+            order="asc",
+            order_by="orderBy",
+            page=0,
+            page_size=0,
+            search=[
+                {
+                    "field": "attackerCountry",
+                    "op": "equals",
+                    "value": "usa",
+                }
+            ],
+        )
+        assert_matches_type(ThreatEventListResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        threat_event = response.parse()
+        assert_matches_type(ThreatEventListResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            threat_event = response.parse()
+            assert_matches_type(ThreatEventListResponse, threat_event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        threat_event = client.cloudforce_one.threat_events.delete(
+            event_id="event_id",
+            account_id="account_id",
+        )
+        assert_matches_type(ThreatEventDeleteResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.with_raw_response.delete(
+            event_id="event_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        threat_event = response.parse()
+        assert_matches_type(ThreatEventDeleteResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.with_streaming_response.delete(
+            event_id="event_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            threat_event = response.parse()
+            assert_matches_type(ThreatEventDeleteResponse, threat_event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.with_raw_response.delete(
+                event_id="event_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_id` but received ''"):
+            client.cloudforce_one.threat_events.with_raw_response.delete(
+                event_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_bulk_create(self, client: Cloudflare) -> None:
+        threat_event = client.cloudforce_one.threat_events.bulk_create(
+            account_id="account_id",
+            data=[
+                {
+                    "category": "Domain Resolution",
+                    "date": parse_datetime("2022-04-01T00:00:00Z"),
+                    "event": "An attacker registered the domain domain.com",
+                    "raw": {"data": {"foo": "bar"}},
+                    "tlp": "amber",
+                }
+            ],
+            dataset_id="durableObjectName",
+        )
+        assert_matches_type(ThreatEventBulkCreateResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_bulk_create_with_all_params(self, client: Cloudflare) -> None:
+        threat_event = client.cloudforce_one.threat_events.bulk_create(
+            account_id="account_id",
+            data=[
+                {
+                    "category": "Domain Resolution",
+                    "date": parse_datetime("2022-04-01T00:00:00Z"),
+                    "event": "An attacker registered the domain domain.com",
+                    "raw": {
+                        "data": {"foo": "bar"},
+                        "source": "example.com",
+                        "tlp": "amber",
+                    },
+                    "tlp": "amber",
+                    "account_id": 123456,
+                    "attacker": "Flying Yeti",
+                    "attacker_country": "CN",
+                    "dataset_id": "durableObjectName",
+                    "indicator": "domain.com",
+                    "indicators": [
+                        {
+                            "indicator_type": "domain",
+                            "value": "malicious.com",
+                        }
+                    ],
+                    "indicator_type": "domain",
+                    "insight": "This domain was likely registered for phishing purposes",
+                    "tags": ["malware"],
+                    "target_country": "US",
+                    "target_industry": "Agriculture",
+                }
+            ],
+            dataset_id="durableObjectName",
+            include_created_events=True,
+        )
+        assert_matches_type(ThreatEventBulkCreateResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_bulk_create(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.with_raw_response.bulk_create(
+            account_id="account_id",
+            data=[
+                {
+                    "category": "Domain Resolution",
+                    "date": parse_datetime("2022-04-01T00:00:00Z"),
+                    "event": "An attacker registered the domain domain.com",
+                    "raw": {"data": {"foo": "bar"}},
+                    "tlp": "amber",
+                }
+            ],
+            dataset_id="durableObjectName",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        threat_event = response.parse()
+        assert_matches_type(ThreatEventBulkCreateResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_bulk_create(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.with_streaming_response.bulk_create(
+            account_id="account_id",
+            data=[
+                {
+                    "category": "Domain Resolution",
+                    "date": parse_datetime("2022-04-01T00:00:00Z"),
+                    "event": "An attacker registered the domain domain.com",
+                    "raw": {"data": {"foo": "bar"}},
+                    "tlp": "amber",
+                }
+            ],
+            dataset_id="durableObjectName",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            threat_event = response.parse()
+            assert_matches_type(ThreatEventBulkCreateResponse, threat_event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_bulk_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.with_raw_response.bulk_create(
+                account_id="",
+                data=[
+                    {
+                        "category": "Domain Resolution",
+                        "date": parse_datetime("2022-04-01T00:00:00Z"),
+                        "event": "An attacker registered the domain domain.com",
+                        "raw": {"data": {"foo": "bar"}},
+                        "tlp": "amber",
+                    }
+                ],
+                dataset_id="durableObjectName",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        threat_event = client.cloudforce_one.threat_events.edit(
+            event_id="event_id",
+            account_id="account_id",
+        )
+        assert_matches_type(ThreatEventEditResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        threat_event = client.cloudforce_one.threat_events.edit(
+            event_id="event_id",
+            account_id="account_id",
+            attacker="Flying Yeti",
+            attacker_country="CN",
+            category="Domain Resolution",
+            created_at=parse_datetime("2025-12-19T00:00:00Z"),
+            dataset_id="9b769969-a211-466c-8ac3-cb91266a066a",
+            date=parse_datetime("2022-04-01T00:00:00Z"),
+            event="An attacker registered the domain domain.com",
+            indicator="domain2.com",
+            indicator_type="domain",
+            insight="new insight",
+            raw={
+                "data": {"foo": "bar"},
+                "source": "example.com",
+                "tlp": "amber",
+            },
+            target_country="US",
+            target_industry="Insurance",
+            tlp="amber",
+        )
+        assert_matches_type(ThreatEventEditResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.with_raw_response.edit(
+            event_id="event_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        threat_event = response.parse()
+        assert_matches_type(ThreatEventEditResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.with_streaming_response.edit(
+            event_id="event_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            threat_event = response.parse()
+            assert_matches_type(ThreatEventEditResponse, threat_event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.with_raw_response.edit(
+                event_id="event_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_id` but received ''"):
+            client.cloudforce_one.threat_events.with_raw_response.edit(
+                event_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            threat_event = client.cloudforce_one.threat_events.get(
+                event_id="event_id",
+                account_id="account_id",
+            )
+
+        assert_matches_type(ThreatEventGetResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.cloudforce_one.threat_events.with_raw_response.get(
+                event_id="event_id",
+                account_id="account_id",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        threat_event = response.parse()
+        assert_matches_type(ThreatEventGetResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.cloudforce_one.threat_events.with_streaming_response.get(
+                event_id="event_id",
+                account_id="account_id",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                threat_event = response.parse()
+                assert_matches_type(ThreatEventGetResponse, threat_event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.cloudforce_one.threat_events.with_raw_response.get(
+                    event_id="event_id",
+                    account_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_id` but received ''"):
+                client.cloudforce_one.threat_events.with_raw_response.get(
+                    event_id="",
+                    account_id="account_id",
+                )
+
+
+class TestAsyncThreatEvents:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        threat_event = await async_client.cloudforce_one.threat_events.create(
+            path_account_id="account_id",
+            category="Domain Resolution",
+            date=parse_datetime("2022-04-01T00:00:00Z"),
+            event="An attacker registered the domain domain.com",
+            raw={"data": {"foo": "bar"}},
+            tlp="amber",
+        )
+        assert_matches_type(ThreatEventCreateResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        threat_event = await async_client.cloudforce_one.threat_events.create(
+            path_account_id="account_id",
+            category="Domain Resolution",
+            date=parse_datetime("2022-04-01T00:00:00Z"),
+            event="An attacker registered the domain domain.com",
+            raw={
+                "data": {"foo": "bar"},
+                "source": "example.com",
+                "tlp": "amber",
+            },
+            tlp="amber",
+            body_account_id=123456,
+            attacker="Flying Yeti",
+            attacker_country="CN",
+            dataset_id="durableObjectName",
+            indicator="domain.com",
+            indicators=[
+                {
+                    "indicator_type": "domain",
+                    "value": "malicious.com",
+                }
+            ],
+            indicator_type="domain",
+            insight="This domain was likely registered for phishing purposes",
+            tags=["malware"],
+            target_country="US",
+            target_industry="Agriculture",
+        )
+        assert_matches_type(ThreatEventCreateResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.with_raw_response.create(
+            path_account_id="account_id",
+            category="Domain Resolution",
+            date=parse_datetime("2022-04-01T00:00:00Z"),
+            event="An attacker registered the domain domain.com",
+            raw={"data": {"foo": "bar"}},
+            tlp="amber",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        threat_event = await response.parse()
+        assert_matches_type(ThreatEventCreateResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.with_streaming_response.create(
+            path_account_id="account_id",
+            category="Domain Resolution",
+            date=parse_datetime("2022-04-01T00:00:00Z"),
+            event="An attacker registered the domain domain.com",
+            raw={"data": {"foo": "bar"}},
+            tlp="amber",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            threat_event = await response.parse()
+            assert_matches_type(ThreatEventCreateResponse, threat_event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `path_account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.with_raw_response.create(
+                path_account_id="",
+                category="Domain Resolution",
+                date=parse_datetime("2022-04-01T00:00:00Z"),
+                event="An attacker registered the domain domain.com",
+                raw={"data": {"foo": "bar"}},
+                tlp="amber",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        threat_event = await async_client.cloudforce_one.threat_events.list(
+            account_id="account_id",
+        )
+        assert_matches_type(ThreatEventListResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        threat_event = await async_client.cloudforce_one.threat_events.list(
+            account_id="account_id",
+            cursor="eyJ2ZXJzaW9uIjoxLCJwb3NpdGlvbiI6eyJkYXRlIjoiMjAyNC0wMS0xMlQxMDowMDowMFoiLCJ1dWlkIjoiYWJjMTIzIn19",
+            dataset_id=["string"],
+            force_refresh=True,
+            format="json",
+            order="asc",
+            order_by="orderBy",
+            page=0,
+            page_size=0,
+            search=[
+                {
+                    "field": "attackerCountry",
+                    "op": "equals",
+                    "value": "usa",
+                }
+            ],
+        )
+        assert_matches_type(ThreatEventListResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        threat_event = await response.parse()
+        assert_matches_type(ThreatEventListResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            threat_event = await response.parse()
+            assert_matches_type(ThreatEventListResponse, threat_event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        threat_event = await async_client.cloudforce_one.threat_events.delete(
+            event_id="event_id",
+            account_id="account_id",
+        )
+        assert_matches_type(ThreatEventDeleteResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.with_raw_response.delete(
+            event_id="event_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        threat_event = await response.parse()
+        assert_matches_type(ThreatEventDeleteResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.with_streaming_response.delete(
+            event_id="event_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            threat_event = await response.parse()
+            assert_matches_type(ThreatEventDeleteResponse, threat_event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.with_raw_response.delete(
+                event_id="event_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.with_raw_response.delete(
+                event_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        threat_event = await async_client.cloudforce_one.threat_events.bulk_create(
+            account_id="account_id",
+            data=[
+                {
+                    "category": "Domain Resolution",
+                    "date": parse_datetime("2022-04-01T00:00:00Z"),
+                    "event": "An attacker registered the domain domain.com",
+                    "raw": {"data": {"foo": "bar"}},
+                    "tlp": "amber",
+                }
+            ],
+            dataset_id="durableObjectName",
+        )
+        assert_matches_type(ThreatEventBulkCreateResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_bulk_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        threat_event = await async_client.cloudforce_one.threat_events.bulk_create(
+            account_id="account_id",
+            data=[
+                {
+                    "category": "Domain Resolution",
+                    "date": parse_datetime("2022-04-01T00:00:00Z"),
+                    "event": "An attacker registered the domain domain.com",
+                    "raw": {
+                        "data": {"foo": "bar"},
+                        "source": "example.com",
+                        "tlp": "amber",
+                    },
+                    "tlp": "amber",
+                    "account_id": 123456,
+                    "attacker": "Flying Yeti",
+                    "attacker_country": "CN",
+                    "dataset_id": "durableObjectName",
+                    "indicator": "domain.com",
+                    "indicators": [
+                        {
+                            "indicator_type": "domain",
+                            "value": "malicious.com",
+                        }
+                    ],
+                    "indicator_type": "domain",
+                    "insight": "This domain was likely registered for phishing purposes",
+                    "tags": ["malware"],
+                    "target_country": "US",
+                    "target_industry": "Agriculture",
+                }
+            ],
+            dataset_id="durableObjectName",
+            include_created_events=True,
+        )
+        assert_matches_type(ThreatEventBulkCreateResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.with_raw_response.bulk_create(
+            account_id="account_id",
+            data=[
+                {
+                    "category": "Domain Resolution",
+                    "date": parse_datetime("2022-04-01T00:00:00Z"),
+                    "event": "An attacker registered the domain domain.com",
+                    "raw": {"data": {"foo": "bar"}},
+                    "tlp": "amber",
+                }
+            ],
+            dataset_id="durableObjectName",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        threat_event = await response.parse()
+        assert_matches_type(ThreatEventBulkCreateResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.with_streaming_response.bulk_create(
+            account_id="account_id",
+            data=[
+                {
+                    "category": "Domain Resolution",
+                    "date": parse_datetime("2022-04-01T00:00:00Z"),
+                    "event": "An attacker registered the domain domain.com",
+                    "raw": {"data": {"foo": "bar"}},
+                    "tlp": "amber",
+                }
+            ],
+            dataset_id="durableObjectName",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            threat_event = await response.parse()
+            assert_matches_type(ThreatEventBulkCreateResponse, threat_event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.with_raw_response.bulk_create(
+                account_id="",
+                data=[
+                    {
+                        "category": "Domain Resolution",
+                        "date": parse_datetime("2022-04-01T00:00:00Z"),
+                        "event": "An attacker registered the domain domain.com",
+                        "raw": {"data": {"foo": "bar"}},
+                        "tlp": "amber",
+                    }
+                ],
+                dataset_id="durableObjectName",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        threat_event = await async_client.cloudforce_one.threat_events.edit(
+            event_id="event_id",
+            account_id="account_id",
+        )
+        assert_matches_type(ThreatEventEditResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        threat_event = await async_client.cloudforce_one.threat_events.edit(
+            event_id="event_id",
+            account_id="account_id",
+            attacker="Flying Yeti",
+            attacker_country="CN",
+            category="Domain Resolution",
+            created_at=parse_datetime("2025-12-19T00:00:00Z"),
+            dataset_id="9b769969-a211-466c-8ac3-cb91266a066a",
+            date=parse_datetime("2022-04-01T00:00:00Z"),
+            event="An attacker registered the domain domain.com",
+            indicator="domain2.com",
+            indicator_type="domain",
+            insight="new insight",
+            raw={
+                "data": {"foo": "bar"},
+                "source": "example.com",
+                "tlp": "amber",
+            },
+            target_country="US",
+            target_industry="Insurance",
+            tlp="amber",
+        )
+        assert_matches_type(ThreatEventEditResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.with_raw_response.edit(
+            event_id="event_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        threat_event = await response.parse()
+        assert_matches_type(ThreatEventEditResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.with_streaming_response.edit(
+            event_id="event_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            threat_event = await response.parse()
+            assert_matches_type(ThreatEventEditResponse, threat_event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.with_raw_response.edit(
+                event_id="event_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.with_raw_response.edit(
+                event_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            threat_event = await async_client.cloudforce_one.threat_events.get(
+                event_id="event_id",
+                account_id="account_id",
+            )
+
+        assert_matches_type(ThreatEventGetResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.cloudforce_one.threat_events.with_raw_response.get(
+                event_id="event_id",
+                account_id="account_id",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        threat_event = await response.parse()
+        assert_matches_type(ThreatEventGetResponse, threat_event, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.cloudforce_one.threat_events.with_streaming_response.get(
+                event_id="event_id",
+                account_id="account_id",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                threat_event = await response.parse()
+                assert_matches_type(ThreatEventGetResponse, threat_event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.cloudforce_one.threat_events.with_raw_response.get(
+                    event_id="event_id",
+                    account_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_id` but received ''"):
+                await async_client.cloudforce_one.threat_events.with_raw_response.get(
+                    event_id="",
+                    account_id="account_id",
+                )
diff --git a/tests/api_resources/secondary_dns/__init__.py b/tests/api_resources/cloudforce_one/threat_events/__init__.py
similarity index 100%
rename from tests/api_resources/secondary_dns/__init__.py
rename to tests/api_resources/cloudforce_one/threat_events/__init__.py
diff --git a/tests/api_resources/secondary_dns/outgoing/__init__.py b/tests/api_resources/cloudforce_one/threat_events/datasets/__init__.py
similarity index 100%
rename from tests/api_resources/secondary_dns/outgoing/__init__.py
rename to tests/api_resources/cloudforce_one/threat_events/datasets/__init__.py
diff --git a/tests/api_resources/cloudforce_one/threat_events/test_attackers.py b/tests/api_resources/cloudforce_one/threat_events/test_attackers.py
new file mode 100644
index 00000000000..368924cff85
--- /dev/null
+++ b/tests/api_resources/cloudforce_one/threat_events/test_attackers.py
@@ -0,0 +1,126 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.cloudforce_one.threat_events import AttackerListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestAttackers:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        attacker = client.cloudforce_one.threat_events.attackers.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AttackerListResponse, attacker, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        attacker = client.cloudforce_one.threat_events.attackers.list(
+            account_id="account_id",
+            dataset_ids=["string"],
+        )
+        assert_matches_type(AttackerListResponse, attacker, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.attackers.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        attacker = response.parse()
+        assert_matches_type(AttackerListResponse, attacker, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.attackers.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            attacker = response.parse()
+            assert_matches_type(AttackerListResponse, attacker, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.attackers.with_raw_response.list(
+                account_id="",
+            )
+
+
+class TestAsyncAttackers:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        attacker = await async_client.cloudforce_one.threat_events.attackers.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AttackerListResponse, attacker, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        attacker = await async_client.cloudforce_one.threat_events.attackers.list(
+            account_id="account_id",
+            dataset_ids=["string"],
+        )
+        assert_matches_type(AttackerListResponse, attacker, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.attackers.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        attacker = await response.parse()
+        assert_matches_type(AttackerListResponse, attacker, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.attackers.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            attacker = await response.parse()
+            assert_matches_type(AttackerListResponse, attacker, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.attackers.with_raw_response.list(
+                account_id="",
+            )
diff --git a/tests/api_resources/cloudforce_one/threat_events/test_categories.py b/tests/api_resources/cloudforce_one/threat_events/test_categories.py
new file mode 100644
index 00000000000..5f5ae85558e
--- /dev/null
+++ b/tests/api_resources/cloudforce_one/threat_events/test_categories.py
@@ -0,0 +1,594 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.cloudforce_one.threat_events import (
+    CategoryGetResponse,
+    CategoryEditResponse,
+    CategoryListResponse,
+    CategoryCreateResponse,
+    CategoryDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCategories:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        category = client.cloudforce_one.threat_events.categories.create(
+            account_id="account_id",
+            kill_chain=0,
+            name="name",
+        )
+        assert_matches_type(CategoryCreateResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        category = client.cloudforce_one.threat_events.categories.create(
+            account_id="account_id",
+            kill_chain=0,
+            name="name",
+            mitre_attack=["T1234"],
+            shortname="shortname",
+        )
+        assert_matches_type(CategoryCreateResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.categories.with_raw_response.create(
+            account_id="account_id",
+            kill_chain=0,
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        category = response.parse()
+        assert_matches_type(CategoryCreateResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.categories.with_streaming_response.create(
+            account_id="account_id",
+            kill_chain=0,
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            category = response.parse()
+            assert_matches_type(CategoryCreateResponse, category, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.categories.with_raw_response.create(
+                account_id="",
+                kill_chain=0,
+                name="name",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        category = client.cloudforce_one.threat_events.categories.list(
+            account_id="account_id",
+        )
+        assert_matches_type(CategoryListResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        category = client.cloudforce_one.threat_events.categories.list(
+            account_id="account_id",
+            dataset_ids=["string"],
+        )
+        assert_matches_type(CategoryListResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.categories.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        category = response.parse()
+        assert_matches_type(CategoryListResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.categories.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            category = response.parse()
+            assert_matches_type(CategoryListResponse, category, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.categories.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        category = client.cloudforce_one.threat_events.categories.delete(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CategoryDeleteResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.categories.with_raw_response.delete(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        category = response.parse()
+        assert_matches_type(CategoryDeleteResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.categories.with_streaming_response.delete(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            category = response.parse()
+            assert_matches_type(CategoryDeleteResponse, category, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.categories.with_raw_response.delete(
+                category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `category_id` but received ''"):
+            client.cloudforce_one.threat_events.categories.with_raw_response.delete(
+                category_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        category = client.cloudforce_one.threat_events.categories.edit(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CategoryEditResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        category = client.cloudforce_one.threat_events.categories.edit(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            kill_chain=0,
+            mitre_attack=["T1234"],
+            name="name",
+            shortname="shortname",
+        )
+        assert_matches_type(CategoryEditResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.categories.with_raw_response.edit(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        category = response.parse()
+        assert_matches_type(CategoryEditResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.categories.with_streaming_response.edit(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            category = response.parse()
+            assert_matches_type(CategoryEditResponse, category, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.categories.with_raw_response.edit(
+                category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `category_id` but received ''"):
+            client.cloudforce_one.threat_events.categories.with_raw_response.edit(
+                category_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        category = client.cloudforce_one.threat_events.categories.get(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CategoryGetResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.categories.with_raw_response.get(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        category = response.parse()
+        assert_matches_type(CategoryGetResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.categories.with_streaming_response.get(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            category = response.parse()
+            assert_matches_type(CategoryGetResponse, category, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.categories.with_raw_response.get(
+                category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `category_id` but received ''"):
+            client.cloudforce_one.threat_events.categories.with_raw_response.get(
+                category_id="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncCategories:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        category = await async_client.cloudforce_one.threat_events.categories.create(
+            account_id="account_id",
+            kill_chain=0,
+            name="name",
+        )
+        assert_matches_type(CategoryCreateResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        category = await async_client.cloudforce_one.threat_events.categories.create(
+            account_id="account_id",
+            kill_chain=0,
+            name="name",
+            mitre_attack=["T1234"],
+            shortname="shortname",
+        )
+        assert_matches_type(CategoryCreateResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.categories.with_raw_response.create(
+            account_id="account_id",
+            kill_chain=0,
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        category = await response.parse()
+        assert_matches_type(CategoryCreateResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.categories.with_streaming_response.create(
+            account_id="account_id",
+            kill_chain=0,
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            category = await response.parse()
+            assert_matches_type(CategoryCreateResponse, category, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.categories.with_raw_response.create(
+                account_id="",
+                kill_chain=0,
+                name="name",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        category = await async_client.cloudforce_one.threat_events.categories.list(
+            account_id="account_id",
+        )
+        assert_matches_type(CategoryListResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        category = await async_client.cloudforce_one.threat_events.categories.list(
+            account_id="account_id",
+            dataset_ids=["string"],
+        )
+        assert_matches_type(CategoryListResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.categories.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        category = await response.parse()
+        assert_matches_type(CategoryListResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.categories.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            category = await response.parse()
+            assert_matches_type(CategoryListResponse, category, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.categories.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        category = await async_client.cloudforce_one.threat_events.categories.delete(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CategoryDeleteResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.categories.with_raw_response.delete(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        category = await response.parse()
+        assert_matches_type(CategoryDeleteResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.categories.with_streaming_response.delete(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            category = await response.parse()
+            assert_matches_type(CategoryDeleteResponse, category, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.categories.with_raw_response.delete(
+                category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `category_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.categories.with_raw_response.delete(
+                category_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        category = await async_client.cloudforce_one.threat_events.categories.edit(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CategoryEditResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        category = await async_client.cloudforce_one.threat_events.categories.edit(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            kill_chain=0,
+            mitre_attack=["T1234"],
+            name="name",
+            shortname="shortname",
+        )
+        assert_matches_type(CategoryEditResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.categories.with_raw_response.edit(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        category = await response.parse()
+        assert_matches_type(CategoryEditResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.categories.with_streaming_response.edit(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            category = await response.parse()
+            assert_matches_type(CategoryEditResponse, category, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.categories.with_raw_response.edit(
+                category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `category_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.categories.with_raw_response.edit(
+                category_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        category = await async_client.cloudforce_one.threat_events.categories.get(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CategoryGetResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.categories.with_raw_response.get(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        category = await response.parse()
+        assert_matches_type(CategoryGetResponse, category, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.categories.with_streaming_response.get(
+            category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            category = await response.parse()
+            assert_matches_type(CategoryGetResponse, category, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.categories.with_raw_response.get(
+                category_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `category_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.categories.with_raw_response.get(
+                category_id="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/cloudforce_one/threat_events/test_countries.py b/tests/api_resources/cloudforce_one/threat_events/test_countries.py
new file mode 100644
index 00000000000..706c0925c45
--- /dev/null
+++ b/tests/api_resources/cloudforce_one/threat_events/test_countries.py
@@ -0,0 +1,108 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.cloudforce_one.threat_events import CountryListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCountries:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        country = client.cloudforce_one.threat_events.countries.list(
+            account_id="account_id",
+        )
+        assert_matches_type(CountryListResponse, country, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.countries.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        country = response.parse()
+        assert_matches_type(CountryListResponse, country, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.countries.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            country = response.parse()
+            assert_matches_type(CountryListResponse, country, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.countries.with_raw_response.list(
+                account_id="",
+            )
+
+
+class TestAsyncCountries:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        country = await async_client.cloudforce_one.threat_events.countries.list(
+            account_id="account_id",
+        )
+        assert_matches_type(CountryListResponse, country, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.countries.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        country = await response.parse()
+        assert_matches_type(CountryListResponse, country, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.countries.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            country = await response.parse()
+            assert_matches_type(CountryListResponse, country, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.countries.with_raw_response.list(
+                account_id="",
+            )
diff --git a/tests/api_resources/cloudforce_one/threat_events/test_datasets.py b/tests/api_resources/cloudforce_one/threat_events/test_datasets.py
new file mode 100644
index 00000000000..f1ae4d436cd
--- /dev/null
+++ b/tests/api_resources/cloudforce_one/threat_events/test_datasets.py
@@ -0,0 +1,570 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.cloudforce_one.threat_events import (
+    DatasetGetResponse,
+    DatasetRawResponse,
+    DatasetEditResponse,
+    DatasetListResponse,
+    DatasetCreateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestDatasets:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        dataset = client.cloudforce_one.threat_events.datasets.create(
+            account_id="account_id",
+            is_public=True,
+            name="x",
+        )
+        assert_matches_type(DatasetCreateResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.datasets.with_raw_response.create(
+            account_id="account_id",
+            is_public=True,
+            name="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = response.parse()
+        assert_matches_type(DatasetCreateResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.datasets.with_streaming_response.create(
+            account_id="account_id",
+            is_public=True,
+            name="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = response.parse()
+            assert_matches_type(DatasetCreateResponse, dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.datasets.with_raw_response.create(
+                account_id="",
+                is_public=True,
+                name="x",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        dataset = client.cloudforce_one.threat_events.datasets.list(
+            account_id="account_id",
+        )
+        assert_matches_type(DatasetListResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.datasets.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = response.parse()
+        assert_matches_type(DatasetListResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.datasets.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = response.parse()
+            assert_matches_type(DatasetListResponse, dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.datasets.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        dataset = client.cloudforce_one.threat_events.datasets.edit(
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            is_public=True,
+            name="x",
+        )
+        assert_matches_type(DatasetEditResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.datasets.with_raw_response.edit(
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            is_public=True,
+            name="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = response.parse()
+        assert_matches_type(DatasetEditResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.datasets.with_streaming_response.edit(
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            is_public=True,
+            name="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = response.parse()
+            assert_matches_type(DatasetEditResponse, dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.datasets.with_raw_response.edit(
+                dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                is_public=True,
+                name="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dataset_id` but received ''"):
+            client.cloudforce_one.threat_events.datasets.with_raw_response.edit(
+                dataset_id="",
+                account_id="account_id",
+                is_public=True,
+                name="x",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        dataset = client.cloudforce_one.threat_events.datasets.get(
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(DatasetGetResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.datasets.with_raw_response.get(
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = response.parse()
+        assert_matches_type(DatasetGetResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.datasets.with_streaming_response.get(
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = response.parse()
+            assert_matches_type(DatasetGetResponse, dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.datasets.with_raw_response.get(
+                dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dataset_id` but received ''"):
+            client.cloudforce_one.threat_events.datasets.with_raw_response.get(
+                dataset_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_raw(self, client: Cloudflare) -> None:
+        dataset = client.cloudforce_one.threat_events.datasets.raw(
+            event_id="event_id",
+            account_id="account_id",
+            dataset_id="dataset_id",
+        )
+        assert_matches_type(DatasetRawResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_raw(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.datasets.with_raw_response.raw(
+            event_id="event_id",
+            account_id="account_id",
+            dataset_id="dataset_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = response.parse()
+        assert_matches_type(DatasetRawResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_raw(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.datasets.with_streaming_response.raw(
+            event_id="event_id",
+            account_id="account_id",
+            dataset_id="dataset_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = response.parse()
+            assert_matches_type(DatasetRawResponse, dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_raw(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.datasets.with_raw_response.raw(
+                event_id="event_id",
+                account_id="",
+                dataset_id="dataset_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dataset_id` but received ''"):
+            client.cloudforce_one.threat_events.datasets.with_raw_response.raw(
+                event_id="event_id",
+                account_id="account_id",
+                dataset_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_id` but received ''"):
+            client.cloudforce_one.threat_events.datasets.with_raw_response.raw(
+                event_id="",
+                account_id="account_id",
+                dataset_id="dataset_id",
+            )
+
+
+class TestAsyncDatasets:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        dataset = await async_client.cloudforce_one.threat_events.datasets.create(
+            account_id="account_id",
+            is_public=True,
+            name="x",
+        )
+        assert_matches_type(DatasetCreateResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.datasets.with_raw_response.create(
+            account_id="account_id",
+            is_public=True,
+            name="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = await response.parse()
+        assert_matches_type(DatasetCreateResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.datasets.with_streaming_response.create(
+            account_id="account_id",
+            is_public=True,
+            name="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = await response.parse()
+            assert_matches_type(DatasetCreateResponse, dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.datasets.with_raw_response.create(
+                account_id="",
+                is_public=True,
+                name="x",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        dataset = await async_client.cloudforce_one.threat_events.datasets.list(
+            account_id="account_id",
+        )
+        assert_matches_type(DatasetListResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.datasets.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = await response.parse()
+        assert_matches_type(DatasetListResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.datasets.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = await response.parse()
+            assert_matches_type(DatasetListResponse, dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.datasets.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        dataset = await async_client.cloudforce_one.threat_events.datasets.edit(
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            is_public=True,
+            name="x",
+        )
+        assert_matches_type(DatasetEditResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.datasets.with_raw_response.edit(
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            is_public=True,
+            name="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = await response.parse()
+        assert_matches_type(DatasetEditResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.datasets.with_streaming_response.edit(
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            is_public=True,
+            name="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = await response.parse()
+            assert_matches_type(DatasetEditResponse, dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.datasets.with_raw_response.edit(
+                dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                is_public=True,
+                name="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dataset_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.datasets.with_raw_response.edit(
+                dataset_id="",
+                account_id="account_id",
+                is_public=True,
+                name="x",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        dataset = await async_client.cloudforce_one.threat_events.datasets.get(
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(DatasetGetResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.datasets.with_raw_response.get(
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = await response.parse()
+        assert_matches_type(DatasetGetResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.datasets.with_streaming_response.get(
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = await response.parse()
+            assert_matches_type(DatasetGetResponse, dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.datasets.with_raw_response.get(
+                dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dataset_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.datasets.with_raw_response.get(
+                dataset_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_raw(self, async_client: AsyncCloudflare) -> None:
+        dataset = await async_client.cloudforce_one.threat_events.datasets.raw(
+            event_id="event_id",
+            account_id="account_id",
+            dataset_id="dataset_id",
+        )
+        assert_matches_type(DatasetRawResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_raw(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.datasets.with_raw_response.raw(
+            event_id="event_id",
+            account_id="account_id",
+            dataset_id="dataset_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dataset = await response.parse()
+        assert_matches_type(DatasetRawResponse, dataset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_raw(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.datasets.with_streaming_response.raw(
+            event_id="event_id",
+            account_id="account_id",
+            dataset_id="dataset_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dataset = await response.parse()
+            assert_matches_type(DatasetRawResponse, dataset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_raw(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.datasets.with_raw_response.raw(
+                event_id="event_id",
+                account_id="",
+                dataset_id="dataset_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dataset_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.datasets.with_raw_response.raw(
+                event_id="event_id",
+                account_id="account_id",
+                dataset_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.datasets.with_raw_response.raw(
+                event_id="",
+                account_id="account_id",
+                dataset_id="dataset_id",
+            )
diff --git a/tests/api_resources/cloudforce_one/threat_events/test_event_tags.py b/tests/api_resources/cloudforce_one/threat_events/test_event_tags.py
new file mode 100644
index 00000000000..0ea6e662e1a
--- /dev/null
+++ b/tests/api_resources/cloudforce_one/threat_events/test_event_tags.py
@@ -0,0 +1,245 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.cloudforce_one.threat_events import (
+    EventTagCreateResponse,
+    EventTagDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestEventTags:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        event_tag = client.cloudforce_one.threat_events.event_tags.create(
+            event_id="event_id",
+            account_id="account_id",
+            tags=["botnet"],
+        )
+        assert_matches_type(EventTagCreateResponse, event_tag, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.event_tags.with_raw_response.create(
+            event_id="event_id",
+            account_id="account_id",
+            tags=["botnet"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        event_tag = response.parse()
+        assert_matches_type(EventTagCreateResponse, event_tag, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.event_tags.with_streaming_response.create(
+            event_id="event_id",
+            account_id="account_id",
+            tags=["botnet"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            event_tag = response.parse()
+            assert_matches_type(EventTagCreateResponse, event_tag, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.event_tags.with_raw_response.create(
+                event_id="event_id",
+                account_id="",
+                tags=["botnet"],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_id` but received ''"):
+            client.cloudforce_one.threat_events.event_tags.with_raw_response.create(
+                event_id="",
+                account_id="account_id",
+                tags=["botnet"],
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        event_tag = client.cloudforce_one.threat_events.event_tags.delete(
+            event_id="event_id",
+            account_id="account_id",
+        )
+        assert_matches_type(EventTagDeleteResponse, event_tag, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.event_tags.with_raw_response.delete(
+            event_id="event_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        event_tag = response.parse()
+        assert_matches_type(EventTagDeleteResponse, event_tag, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.event_tags.with_streaming_response.delete(
+            event_id="event_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            event_tag = response.parse()
+            assert_matches_type(EventTagDeleteResponse, event_tag, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.event_tags.with_raw_response.delete(
+                event_id="event_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_id` but received ''"):
+            client.cloudforce_one.threat_events.event_tags.with_raw_response.delete(
+                event_id="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncEventTags:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        event_tag = await async_client.cloudforce_one.threat_events.event_tags.create(
+            event_id="event_id",
+            account_id="account_id",
+            tags=["botnet"],
+        )
+        assert_matches_type(EventTagCreateResponse, event_tag, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.event_tags.with_raw_response.create(
+            event_id="event_id",
+            account_id="account_id",
+            tags=["botnet"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        event_tag = await response.parse()
+        assert_matches_type(EventTagCreateResponse, event_tag, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.event_tags.with_streaming_response.create(
+            event_id="event_id",
+            account_id="account_id",
+            tags=["botnet"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            event_tag = await response.parse()
+            assert_matches_type(EventTagCreateResponse, event_tag, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.event_tags.with_raw_response.create(
+                event_id="event_id",
+                account_id="",
+                tags=["botnet"],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.event_tags.with_raw_response.create(
+                event_id="",
+                account_id="account_id",
+                tags=["botnet"],
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        event_tag = await async_client.cloudforce_one.threat_events.event_tags.delete(
+            event_id="event_id",
+            account_id="account_id",
+        )
+        assert_matches_type(EventTagDeleteResponse, event_tag, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.event_tags.with_raw_response.delete(
+            event_id="event_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        event_tag = await response.parse()
+        assert_matches_type(EventTagDeleteResponse, event_tag, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.event_tags.with_streaming_response.delete(
+            event_id="event_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            event_tag = await response.parse()
+            assert_matches_type(EventTagDeleteResponse, event_tag, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.event_tags.with_raw_response.delete(
+                event_id="event_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.event_tags.with_raw_response.delete(
+                event_id="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/cloudforce_one/threat_events/test_indicator_types.py b/tests/api_resources/cloudforce_one/threat_events/test_indicator_types.py
new file mode 100644
index 00000000000..e00800132bb
--- /dev/null
+++ b/tests/api_resources/cloudforce_one/threat_events/test_indicator_types.py
@@ -0,0 +1,120 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.cloudforce_one.threat_events import IndicatorTypeListResponse
+
+# pyright: reportDeprecated=false
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestIndicatorTypes:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            indicator_type = client.cloudforce_one.threat_events.indicator_types.list(
+                account_id="account_id",
+            )
+
+        assert_matches_type(IndicatorTypeListResponse, indicator_type, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.cloudforce_one.threat_events.indicator_types.with_raw_response.list(
+                account_id="account_id",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        indicator_type = response.parse()
+        assert_matches_type(IndicatorTypeListResponse, indicator_type, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.cloudforce_one.threat_events.indicator_types.with_streaming_response.list(
+                account_id="account_id",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                indicator_type = response.parse()
+                assert_matches_type(IndicatorTypeListResponse, indicator_type, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.cloudforce_one.threat_events.indicator_types.with_raw_response.list(
+                    account_id="",
+                )
+
+
+class TestAsyncIndicatorTypes:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            indicator_type = await async_client.cloudforce_one.threat_events.indicator_types.list(
+                account_id="account_id",
+            )
+
+        assert_matches_type(IndicatorTypeListResponse, indicator_type, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.cloudforce_one.threat_events.indicator_types.with_raw_response.list(
+                account_id="account_id",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        indicator_type = await response.parse()
+        assert_matches_type(IndicatorTypeListResponse, indicator_type, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.cloudforce_one.threat_events.indicator_types.with_streaming_response.list(
+                account_id="account_id",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                indicator_type = await response.parse()
+                assert_matches_type(IndicatorTypeListResponse, indicator_type, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.cloudforce_one.threat_events.indicator_types.with_raw_response.list(
+                    account_id="",
+                )
diff --git a/tests/api_resources/cloudforce_one/threat_events/test_raw.py b/tests/api_resources/cloudforce_one/threat_events/test_raw.py
new file mode 100644
index 00000000000..b56d85ba3b8
--- /dev/null
+++ b/tests/api_resources/cloudforce_one/threat_events/test_raw.py
@@ -0,0 +1,306 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.cloudforce_one.threat_events import RawGetResponse, RawEditResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestRaw:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        raw = client.cloudforce_one.threat_events.raw.edit(
+            raw_id="raw_id",
+            account_id="account_id",
+            event_id="event_id",
+        )
+        assert_matches_type(RawEditResponse, raw, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        raw = client.cloudforce_one.threat_events.raw.edit(
+            raw_id="raw_id",
+            account_id="account_id",
+            event_id="event_id",
+            data={},
+            source="example.com",
+            tlp="amber",
+        )
+        assert_matches_type(RawEditResponse, raw, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.raw.with_raw_response.edit(
+            raw_id="raw_id",
+            account_id="account_id",
+            event_id="event_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        raw = response.parse()
+        assert_matches_type(RawEditResponse, raw, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.raw.with_streaming_response.edit(
+            raw_id="raw_id",
+            account_id="account_id",
+            event_id="event_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            raw = response.parse()
+            assert_matches_type(RawEditResponse, raw, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.raw.with_raw_response.edit(
+                raw_id="raw_id",
+                account_id="",
+                event_id="event_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_id` but received ''"):
+            client.cloudforce_one.threat_events.raw.with_raw_response.edit(
+                raw_id="raw_id",
+                account_id="account_id",
+                event_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `raw_id` but received ''"):
+            client.cloudforce_one.threat_events.raw.with_raw_response.edit(
+                raw_id="",
+                account_id="account_id",
+                event_id="event_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        raw = client.cloudforce_one.threat_events.raw.get(
+            raw_id="raw_id",
+            account_id="account_id",
+            event_id="event_id",
+        )
+        assert_matches_type(RawGetResponse, raw, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.raw.with_raw_response.get(
+            raw_id="raw_id",
+            account_id="account_id",
+            event_id="event_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        raw = response.parse()
+        assert_matches_type(RawGetResponse, raw, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.raw.with_streaming_response.get(
+            raw_id="raw_id",
+            account_id="account_id",
+            event_id="event_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            raw = response.parse()
+            assert_matches_type(RawGetResponse, raw, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.raw.with_raw_response.get(
+                raw_id="raw_id",
+                account_id="",
+                event_id="event_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_id` but received ''"):
+            client.cloudforce_one.threat_events.raw.with_raw_response.get(
+                raw_id="raw_id",
+                account_id="account_id",
+                event_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `raw_id` but received ''"):
+            client.cloudforce_one.threat_events.raw.with_raw_response.get(
+                raw_id="",
+                account_id="account_id",
+                event_id="event_id",
+            )
+
+
+class TestAsyncRaw:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        raw = await async_client.cloudforce_one.threat_events.raw.edit(
+            raw_id="raw_id",
+            account_id="account_id",
+            event_id="event_id",
+        )
+        assert_matches_type(RawEditResponse, raw, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        raw = await async_client.cloudforce_one.threat_events.raw.edit(
+            raw_id="raw_id",
+            account_id="account_id",
+            event_id="event_id",
+            data={},
+            source="example.com",
+            tlp="amber",
+        )
+        assert_matches_type(RawEditResponse, raw, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.raw.with_raw_response.edit(
+            raw_id="raw_id",
+            account_id="account_id",
+            event_id="event_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        raw = await response.parse()
+        assert_matches_type(RawEditResponse, raw, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.raw.with_streaming_response.edit(
+            raw_id="raw_id",
+            account_id="account_id",
+            event_id="event_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            raw = await response.parse()
+            assert_matches_type(RawEditResponse, raw, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.raw.with_raw_response.edit(
+                raw_id="raw_id",
+                account_id="",
+                event_id="event_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.raw.with_raw_response.edit(
+                raw_id="raw_id",
+                account_id="account_id",
+                event_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `raw_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.raw.with_raw_response.edit(
+                raw_id="",
+                account_id="account_id",
+                event_id="event_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        raw = await async_client.cloudforce_one.threat_events.raw.get(
+            raw_id="raw_id",
+            account_id="account_id",
+            event_id="event_id",
+        )
+        assert_matches_type(RawGetResponse, raw, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.raw.with_raw_response.get(
+            raw_id="raw_id",
+            account_id="account_id",
+            event_id="event_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        raw = await response.parse()
+        assert_matches_type(RawGetResponse, raw, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.raw.with_streaming_response.get(
+            raw_id="raw_id",
+            account_id="account_id",
+            event_id="event_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            raw = await response.parse()
+            assert_matches_type(RawGetResponse, raw, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.raw.with_raw_response.get(
+                raw_id="raw_id",
+                account_id="",
+                event_id="event_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.raw.with_raw_response.get(
+                raw_id="raw_id",
+                account_id="account_id",
+                event_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `raw_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.raw.with_raw_response.get(
+                raw_id="",
+                account_id="account_id",
+                event_id="event_id",
+            )
diff --git a/tests/api_resources/cloudforce_one/threat_events/test_relate.py b/tests/api_resources/cloudforce_one/threat_events/test_relate.py
new file mode 100644
index 00000000000..f9a8447e117
--- /dev/null
+++ b/tests/api_resources/cloudforce_one/threat_events/test_relate.py
@@ -0,0 +1,128 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.cloudforce_one.threat_events import RelateDeleteResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestRelate:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        relate = client.cloudforce_one.threat_events.relate.delete(
+            event_id="event_id",
+            account_id="account_id",
+        )
+        assert_matches_type(RelateDeleteResponse, relate, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.relate.with_raw_response.delete(
+            event_id="event_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        relate = response.parse()
+        assert_matches_type(RelateDeleteResponse, relate, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.relate.with_streaming_response.delete(
+            event_id="event_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            relate = response.parse()
+            assert_matches_type(RelateDeleteResponse, relate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.relate.with_raw_response.delete(
+                event_id="event_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_id` but received ''"):
+            client.cloudforce_one.threat_events.relate.with_raw_response.delete(
+                event_id="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncRelate:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        relate = await async_client.cloudforce_one.threat_events.relate.delete(
+            event_id="event_id",
+            account_id="account_id",
+        )
+        assert_matches_type(RelateDeleteResponse, relate, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.relate.with_raw_response.delete(
+            event_id="event_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        relate = await response.parse()
+        assert_matches_type(RelateDeleteResponse, relate, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.relate.with_streaming_response.delete(
+            event_id="event_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            relate = await response.parse()
+            assert_matches_type(RelateDeleteResponse, relate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.relate.with_raw_response.delete(
+                event_id="event_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.relate.with_raw_response.delete(
+                event_id="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/cloudforce_one/threat_events/test_tags.py b/tests/api_resources/cloudforce_one/threat_events/test_tags.py
new file mode 100644
index 00000000000..4187ab44687
--- /dev/null
+++ b/tests/api_resources/cloudforce_one/threat_events/test_tags.py
@@ -0,0 +1,164 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.cloudforce_one.threat_events import TagCreateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestTags:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        tag = client.cloudforce_one.threat_events.tags.create(
+            account_id="account_id",
+            value="APT28",
+        )
+        assert_matches_type(TagCreateResponse, tag, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        tag = client.cloudforce_one.threat_events.tags.create(
+            account_id="account_id",
+            value="APT28",
+            active_duration="activeDuration",
+            actor_category="actorCategory",
+            alias_group_names=["string"],
+            alias_group_names_internal=["string"],
+            analytic_priority=0,
+            attribution_confidence="attributionConfidence",
+            attribution_organization="attributionOrganization",
+            category_uuid="12345678-1234-1234-1234-1234567890ab",
+            external_reference_links=["string"],
+            internal_description="internalDescription",
+            motive="motive",
+            opsec_level="opsecLevel",
+            origin_country_iso="originCountryISO",
+            priority=0,
+            sophistication_level="sophisticationLevel",
+        )
+        assert_matches_type(TagCreateResponse, tag, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.tags.with_raw_response.create(
+            account_id="account_id",
+            value="APT28",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        tag = response.parse()
+        assert_matches_type(TagCreateResponse, tag, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.tags.with_streaming_response.create(
+            account_id="account_id",
+            value="APT28",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            tag = response.parse()
+            assert_matches_type(TagCreateResponse, tag, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.tags.with_raw_response.create(
+                account_id="",
+                value="APT28",
+            )
+
+
+class TestAsyncTags:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        tag = await async_client.cloudforce_one.threat_events.tags.create(
+            account_id="account_id",
+            value="APT28",
+        )
+        assert_matches_type(TagCreateResponse, tag, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        tag = await async_client.cloudforce_one.threat_events.tags.create(
+            account_id="account_id",
+            value="APT28",
+            active_duration="activeDuration",
+            actor_category="actorCategory",
+            alias_group_names=["string"],
+            alias_group_names_internal=["string"],
+            analytic_priority=0,
+            attribution_confidence="attributionConfidence",
+            attribution_organization="attributionOrganization",
+            category_uuid="12345678-1234-1234-1234-1234567890ab",
+            external_reference_links=["string"],
+            internal_description="internalDescription",
+            motive="motive",
+            opsec_level="opsecLevel",
+            origin_country_iso="originCountryISO",
+            priority=0,
+            sophistication_level="sophisticationLevel",
+        )
+        assert_matches_type(TagCreateResponse, tag, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.tags.with_raw_response.create(
+            account_id="account_id",
+            value="APT28",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        tag = await response.parse()
+        assert_matches_type(TagCreateResponse, tag, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.tags.with_streaming_response.create(
+            account_id="account_id",
+            value="APT28",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            tag = await response.parse()
+            assert_matches_type(TagCreateResponse, tag, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.tags.with_raw_response.create(
+                account_id="",
+                value="APT28",
+            )
diff --git a/tests/api_resources/cloudforce_one/threat_events/test_target_industries.py b/tests/api_resources/cloudforce_one/threat_events/test_target_industries.py
new file mode 100644
index 00000000000..5d802fb3a22
--- /dev/null
+++ b/tests/api_resources/cloudforce_one/threat_events/test_target_industries.py
@@ -0,0 +1,126 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.cloudforce_one.threat_events import TargetIndustryListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestTargetIndustries:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        target_industry = client.cloudforce_one.threat_events.target_industries.list(
+            account_id="account_id",
+        )
+        assert_matches_type(TargetIndustryListResponse, target_industry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        target_industry = client.cloudforce_one.threat_events.target_industries.list(
+            account_id="account_id",
+            dataset_ids=["string"],
+        )
+        assert_matches_type(TargetIndustryListResponse, target_industry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.cloudforce_one.threat_events.target_industries.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        target_industry = response.parse()
+        assert_matches_type(TargetIndustryListResponse, target_industry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.cloudforce_one.threat_events.target_industries.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            target_industry = response.parse()
+            assert_matches_type(TargetIndustryListResponse, target_industry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.cloudforce_one.threat_events.target_industries.with_raw_response.list(
+                account_id="",
+            )
+
+
+class TestAsyncTargetIndustries:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        target_industry = await async_client.cloudforce_one.threat_events.target_industries.list(
+            account_id="account_id",
+        )
+        assert_matches_type(TargetIndustryListResponse, target_industry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        target_industry = await async_client.cloudforce_one.threat_events.target_industries.list(
+            account_id="account_id",
+            dataset_ids=["string"],
+        )
+        assert_matches_type(TargetIndustryListResponse, target_industry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.cloudforce_one.threat_events.target_industries.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        target_industry = await response.parse()
+        assert_matches_type(TargetIndustryListResponse, target_industry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.cloudforce_one.threat_events.target_industries.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            target_industry = await response.parse()
+            assert_matches_type(TargetIndustryListResponse, target_industry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.cloudforce_one.threat_events.target_industries.with_raw_response.list(
+                account_id="",
+            )
diff --git a/tests/api_resources/storage/__init__.py b/tests/api_resources/connectivity/__init__.py
similarity index 100%
rename from tests/api_resources/storage/__init__.py
rename to tests/api_resources/connectivity/__init__.py
diff --git a/tests/api_resources/workers/ai/__init__.py b/tests/api_resources/connectivity/directory/__init__.py
similarity index 100%
rename from tests/api_resources/workers/ai/__init__.py
rename to tests/api_resources/connectivity/directory/__init__.py
diff --git a/tests/api_resources/connectivity/directory/test_services.py b/tests/api_resources/connectivity/directory/test_services.py
new file mode 100644
index 00000000000..bb190d1c91e
--- /dev/null
+++ b/tests/api_resources/connectivity/directory/test_services.py
@@ -0,0 +1,666 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.connectivity.directory import (
+    ServiceGetResponse,
+    ServiceListResponse,
+    ServiceCreateResponse,
+    ServiceUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestServices:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        service = client.connectivity.directory.services.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            host={
+                "hostname": "api.example.com",
+                "resolver_network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+            },
+            name="web-server",
+            type="http",
+        )
+        assert_matches_type(Optional[ServiceCreateResponse], service, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        service = client.connectivity.directory.services.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            host={
+                "hostname": "api.example.com",
+                "resolver_network": {
+                    "tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da",
+                    "resolver_ips": ["string"],
+                },
+            },
+            name="web-server",
+            type="http",
+            http_port=8080,
+            https_port=8443,
+        )
+        assert_matches_type(Optional[ServiceCreateResponse], service, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.connectivity.directory.services.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            host={
+                "hostname": "api.example.com",
+                "resolver_network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+            },
+            name="web-server",
+            type="http",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        service = response.parse()
+        assert_matches_type(Optional[ServiceCreateResponse], service, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.connectivity.directory.services.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            host={
+                "hostname": "api.example.com",
+                "resolver_network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+            },
+            name="web-server",
+            type="http",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            service = response.parse()
+            assert_matches_type(Optional[ServiceCreateResponse], service, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.connectivity.directory.services.with_raw_response.create(
+                account_id="",
+                host={
+                    "hostname": "api.example.com",
+                    "resolver_network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+                },
+                name="web-server",
+                type="http",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        service = client.connectivity.directory.services.update(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            host={
+                "ipv4": "10.0.0.1",
+                "network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+            },
+            name="web-app",
+            type="http",
+        )
+        assert_matches_type(Optional[ServiceUpdateResponse], service, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        service = client.connectivity.directory.services.update(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            host={
+                "ipv4": "10.0.0.1",
+                "network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+            },
+            name="web-app",
+            type="http",
+            http_port=8080,
+            https_port=8443,
+        )
+        assert_matches_type(Optional[ServiceUpdateResponse], service, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.connectivity.directory.services.with_raw_response.update(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            host={
+                "ipv4": "10.0.0.1",
+                "network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+            },
+            name="web-app",
+            type="http",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        service = response.parse()
+        assert_matches_type(Optional[ServiceUpdateResponse], service, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.connectivity.directory.services.with_streaming_response.update(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            host={
+                "ipv4": "10.0.0.1",
+                "network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+            },
+            name="web-app",
+            type="http",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            service = response.parse()
+            assert_matches_type(Optional[ServiceUpdateResponse], service, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.connectivity.directory.services.with_raw_response.update(
+                service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                host={
+                    "ipv4": "10.0.0.1",
+                    "network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+                },
+                name="web-app",
+                type="http",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `service_id` but received ''"):
+            client.connectivity.directory.services.with_raw_response.update(
+                service_id="",
+                account_id="account_id",
+                host={
+                    "ipv4": "10.0.0.1",
+                    "network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+                },
+                name="web-app",
+                type="http",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        service = client.connectivity.directory.services.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ServiceListResponse], service, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        service = client.connectivity.directory.services.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=1,
+            type="http",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ServiceListResponse], service, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.connectivity.directory.services.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        service = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[ServiceListResponse], service, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.connectivity.directory.services.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            service = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[ServiceListResponse], service, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.connectivity.directory.services.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        service = client.connectivity.directory.services.delete(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert service is None
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.connectivity.directory.services.with_raw_response.delete(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        service = response.parse()
+        assert service is None
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.connectivity.directory.services.with_streaming_response.delete(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            service = response.parse()
+            assert service is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.connectivity.directory.services.with_raw_response.delete(
+                service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `service_id` but received ''"):
+            client.connectivity.directory.services.with_raw_response.delete(
+                service_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        service = client.connectivity.directory.services.get(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ServiceGetResponse], service, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.connectivity.directory.services.with_raw_response.get(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        service = response.parse()
+        assert_matches_type(Optional[ServiceGetResponse], service, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.connectivity.directory.services.with_streaming_response.get(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            service = response.parse()
+            assert_matches_type(Optional[ServiceGetResponse], service, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.connectivity.directory.services.with_raw_response.get(
+                service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `service_id` but received ''"):
+            client.connectivity.directory.services.with_raw_response.get(
+                service_id="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncServices:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        service = await async_client.connectivity.directory.services.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            host={
+                "hostname": "api.example.com",
+                "resolver_network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+            },
+            name="web-server",
+            type="http",
+        )
+        assert_matches_type(Optional[ServiceCreateResponse], service, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        service = await async_client.connectivity.directory.services.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            host={
+                "hostname": "api.example.com",
+                "resolver_network": {
+                    "tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da",
+                    "resolver_ips": ["string"],
+                },
+            },
+            name="web-server",
+            type="http",
+            http_port=8080,
+            https_port=8443,
+        )
+        assert_matches_type(Optional[ServiceCreateResponse], service, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.connectivity.directory.services.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            host={
+                "hostname": "api.example.com",
+                "resolver_network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+            },
+            name="web-server",
+            type="http",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        service = await response.parse()
+        assert_matches_type(Optional[ServiceCreateResponse], service, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.connectivity.directory.services.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            host={
+                "hostname": "api.example.com",
+                "resolver_network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+            },
+            name="web-server",
+            type="http",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            service = await response.parse()
+            assert_matches_type(Optional[ServiceCreateResponse], service, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.connectivity.directory.services.with_raw_response.create(
+                account_id="",
+                host={
+                    "hostname": "api.example.com",
+                    "resolver_network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+                },
+                name="web-server",
+                type="http",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        service = await async_client.connectivity.directory.services.update(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            host={
+                "ipv4": "10.0.0.1",
+                "network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+            },
+            name="web-app",
+            type="http",
+        )
+        assert_matches_type(Optional[ServiceUpdateResponse], service, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        service = await async_client.connectivity.directory.services.update(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            host={
+                "ipv4": "10.0.0.1",
+                "network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+            },
+            name="web-app",
+            type="http",
+            http_port=8080,
+            https_port=8443,
+        )
+        assert_matches_type(Optional[ServiceUpdateResponse], service, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.connectivity.directory.services.with_raw_response.update(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            host={
+                "ipv4": "10.0.0.1",
+                "network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+            },
+            name="web-app",
+            type="http",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        service = await response.parse()
+        assert_matches_type(Optional[ServiceUpdateResponse], service, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.connectivity.directory.services.with_streaming_response.update(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            host={
+                "ipv4": "10.0.0.1",
+                "network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+            },
+            name="web-app",
+            type="http",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            service = await response.parse()
+            assert_matches_type(Optional[ServiceUpdateResponse], service, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.connectivity.directory.services.with_raw_response.update(
+                service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                host={
+                    "ipv4": "10.0.0.1",
+                    "network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+                },
+                name="web-app",
+                type="http",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `service_id` but received ''"):
+            await async_client.connectivity.directory.services.with_raw_response.update(
+                service_id="",
+                account_id="account_id",
+                host={
+                    "ipv4": "10.0.0.1",
+                    "network": {"tunnel_id": "0191dce4-9ab4-7fce-b660-8e5dec5172da"},
+                },
+                name="web-app",
+                type="http",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        service = await async_client.connectivity.directory.services.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[ServiceListResponse], service, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        service = await async_client.connectivity.directory.services.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=1,
+            type="http",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[ServiceListResponse], service, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.connectivity.directory.services.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        service = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[ServiceListResponse], service, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.connectivity.directory.services.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            service = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[ServiceListResponse], service, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.connectivity.directory.services.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        service = await async_client.connectivity.directory.services.delete(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert service is None
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.connectivity.directory.services.with_raw_response.delete(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        service = await response.parse()
+        assert service is None
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.connectivity.directory.services.with_streaming_response.delete(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            service = await response.parse()
+            assert service is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.connectivity.directory.services.with_raw_response.delete(
+                service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `service_id` but received ''"):
+            await async_client.connectivity.directory.services.with_raw_response.delete(
+                service_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        service = await async_client.connectivity.directory.services.get(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ServiceGetResponse], service, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.connectivity.directory.services.with_raw_response.get(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        service = await response.parse()
+        assert_matches_type(Optional[ServiceGetResponse], service, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.connectivity.directory.services.with_streaming_response.get(
+            service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            service = await response.parse()
+            assert_matches_type(Optional[ServiceGetResponse], service, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.connectivity.directory.services.with_raw_response.get(
+                service_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `service_id` but received ''"):
+            await async_client.connectivity.directory.services.with_raw_response.get(
+                service_id="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/workers/ai/models/__init__.py b/tests/api_resources/content_scanning/__init__.py
similarity index 100%
rename from tests/api_resources/workers/ai/models/__init__.py
rename to tests/api_resources/content_scanning/__init__.py
diff --git a/tests/api_resources/content_scanning/test_payloads.py b/tests/api_resources/content_scanning/test_payloads.py
new file mode 100644
index 00000000000..3c24ad530e0
--- /dev/null
+++ b/tests/api_resources/content_scanning/test_payloads.py
@@ -0,0 +1,285 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.content_scanning import (
+    PayloadListResponse,
+    PayloadCreateResponse,
+    PayloadDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestPayloads:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        payload = client.content_scanning.payloads.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"payload": 'lookup_json_string(http.request.body.raw, "file")'}],
+        )
+        assert_matches_type(SyncSinglePage[PayloadCreateResponse], payload, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.content_scanning.payloads.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"payload": 'lookup_json_string(http.request.body.raw, "file")'}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        payload = response.parse()
+        assert_matches_type(SyncSinglePage[PayloadCreateResponse], payload, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.content_scanning.payloads.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"payload": 'lookup_json_string(http.request.body.raw, "file")'}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            payload = response.parse()
+            assert_matches_type(SyncSinglePage[PayloadCreateResponse], payload, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.content_scanning.payloads.with_raw_response.create(
+                zone_id="",
+                body=[{"payload": 'lookup_json_string(http.request.body.raw, "file")'}],
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        payload = client.content_scanning.payloads.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[PayloadListResponse], payload, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.content_scanning.payloads.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        payload = response.parse()
+        assert_matches_type(SyncSinglePage[PayloadListResponse], payload, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.content_scanning.payloads.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            payload = response.parse()
+            assert_matches_type(SyncSinglePage[PayloadListResponse], payload, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.content_scanning.payloads.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        payload = client.content_scanning.payloads.delete(
+            expression_id="a350a054caa840c9becd89c3b4f0195b",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[PayloadDeleteResponse], payload, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.content_scanning.payloads.with_raw_response.delete(
+            expression_id="a350a054caa840c9becd89c3b4f0195b",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        payload = response.parse()
+        assert_matches_type(SyncSinglePage[PayloadDeleteResponse], payload, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.content_scanning.payloads.with_streaming_response.delete(
+            expression_id="a350a054caa840c9becd89c3b4f0195b",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            payload = response.parse()
+            assert_matches_type(SyncSinglePage[PayloadDeleteResponse], payload, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.content_scanning.payloads.with_raw_response.delete(
+                expression_id="a350a054caa840c9becd89c3b4f0195b",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `expression_id` but received ''"):
+            client.content_scanning.payloads.with_raw_response.delete(
+                expression_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncPayloads:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        payload = await async_client.content_scanning.payloads.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"payload": 'lookup_json_string(http.request.body.raw, "file")'}],
+        )
+        assert_matches_type(AsyncSinglePage[PayloadCreateResponse], payload, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.content_scanning.payloads.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"payload": 'lookup_json_string(http.request.body.raw, "file")'}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        payload = await response.parse()
+        assert_matches_type(AsyncSinglePage[PayloadCreateResponse], payload, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.content_scanning.payloads.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"payload": 'lookup_json_string(http.request.body.raw, "file")'}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            payload = await response.parse()
+            assert_matches_type(AsyncSinglePage[PayloadCreateResponse], payload, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.content_scanning.payloads.with_raw_response.create(
+                zone_id="",
+                body=[{"payload": 'lookup_json_string(http.request.body.raw, "file")'}],
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        payload = await async_client.content_scanning.payloads.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[PayloadListResponse], payload, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.content_scanning.payloads.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        payload = await response.parse()
+        assert_matches_type(AsyncSinglePage[PayloadListResponse], payload, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.content_scanning.payloads.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            payload = await response.parse()
+            assert_matches_type(AsyncSinglePage[PayloadListResponse], payload, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.content_scanning.payloads.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        payload = await async_client.content_scanning.payloads.delete(
+            expression_id="a350a054caa840c9becd89c3b4f0195b",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[PayloadDeleteResponse], payload, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.content_scanning.payloads.with_raw_response.delete(
+            expression_id="a350a054caa840c9becd89c3b4f0195b",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        payload = await response.parse()
+        assert_matches_type(AsyncSinglePage[PayloadDeleteResponse], payload, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.content_scanning.payloads.with_streaming_response.delete(
+            expression_id="a350a054caa840c9becd89c3b4f0195b",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            payload = await response.parse()
+            assert_matches_type(AsyncSinglePage[PayloadDeleteResponse], payload, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.content_scanning.payloads.with_raw_response.delete(
+                expression_id="a350a054caa840c9becd89c3b4f0195b",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `expression_id` but received ''"):
+            await async_client.content_scanning.payloads.with_raw_response.delete(
+                expression_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/content_scanning/test_settings.py b/tests/api_resources/content_scanning/test_settings.py
new file mode 100644
index 00000000000..61236f71476
--- /dev/null
+++ b/tests/api_resources/content_scanning/test_settings.py
@@ -0,0 +1,100 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.content_scanning import SettingGetResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSettings:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        setting = client.content_scanning.settings.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SettingGetResponse, setting, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.content_scanning.settings.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = response.parse()
+        assert_matches_type(SettingGetResponse, setting, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.content_scanning.settings.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = response.parse()
+            assert_matches_type(SettingGetResponse, setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.content_scanning.settings.with_raw_response.get(
+                zone_id="",
+            )
+
+
+class TestAsyncSettings:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.content_scanning.settings.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SettingGetResponse, setting, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.content_scanning.settings.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = await response.parse()
+        assert_matches_type(SettingGetResponse, setting, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.content_scanning.settings.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = await response.parse()
+            assert_matches_type(SettingGetResponse, setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.content_scanning.settings.with_raw_response.get(
+                zone_id="",
+            )
diff --git a/tests/api_resources/custom_certificates/test_prioritize.py b/tests/api_resources/custom_certificates/test_prioritize.py
index 25accbd83cb..1ee27704925 100644
--- a/tests/api_resources/custom_certificates/test_prioritize.py
+++ b/tests/api_resources/custom_certificates/test_prioritize.py
@@ -3,13 +3,14 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.custom_certificates import PrioritizeUpdateResponse
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.custom_certificates import CustomCertificate
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -23,7 +24,7 @@ def test_method_update(self, client: Cloudflare) -> None:
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             certificates=[{}, {}],
         )
-        assert_matches_type(Optional[PrioritizeUpdateResponse], prioritize, path=["response"])
+        assert_matches_type(SyncSinglePage[CustomCertificate], prioritize, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
@@ -35,7 +36,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         prioritize = response.parse()
-        assert_matches_type(Optional[PrioritizeUpdateResponse], prioritize, path=["response"])
+        assert_matches_type(SyncSinglePage[CustomCertificate], prioritize, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
@@ -47,7 +48,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             prioritize = response.parse()
-            assert_matches_type(Optional[PrioritizeUpdateResponse], prioritize, path=["response"])
+            assert_matches_type(SyncSinglePage[CustomCertificate], prioritize, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -61,7 +62,9 @@ def test_path_params_update(self, client: Cloudflare) -> None:
 
 
 class TestAsyncPrioritize:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
@@ -69,7 +72,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             certificates=[{}, {}],
         )
-        assert_matches_type(Optional[PrioritizeUpdateResponse], prioritize, path=["response"])
+        assert_matches_type(AsyncSinglePage[CustomCertificate], prioritize, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
@@ -81,7 +84,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         prioritize = await response.parse()
-        assert_matches_type(Optional[PrioritizeUpdateResponse], prioritize, path=["response"])
+        assert_matches_type(AsyncSinglePage[CustomCertificate], prioritize, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
@@ -93,7 +96,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             prioritize = await response.parse()
-            assert_matches_type(Optional[PrioritizeUpdateResponse], prioritize, path=["response"])
+            assert_matches_type(AsyncSinglePage[CustomCertificate], prioritize, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/custom_hostnames/certificate_pack/__init__.py b/tests/api_resources/custom_hostnames/certificate_pack/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/custom_hostnames/certificate_pack/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/custom_hostnames/certificate_pack/test_certificates.py b/tests/api_resources/custom_hostnames/certificate_pack/test_certificates.py
new file mode 100644
index 00000000000..9ceb3582c3f
--- /dev/null
+++ b/tests/api_resources/custom_hostnames/certificate_pack/test_certificates.py
@@ -0,0 +1,351 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.custom_hostnames.certificate_pack import (
+    CertificateDeleteResponse,
+    CertificateUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCertificates:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        certificate = client.custom_hostnames.certificate_pack.certificates.update(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+            custom_certificate="-----BEGIN CERTIFICATE-----\nMIIDdjCCAl6gAwIBAgIJAPnMg0Fs+/B0MA0GCSqGSIb3DQEBCwUAMFsx...\n-----END CERTIFICATE-----\n",
+            custom_key="-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/SCB5...\n-----END PRIVATE KEY-----\n",
+        )
+        assert_matches_type(Optional[CertificateUpdateResponse], certificate, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.custom_hostnames.certificate_pack.certificates.with_raw_response.update(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+            custom_certificate="-----BEGIN CERTIFICATE-----\nMIIDdjCCAl6gAwIBAgIJAPnMg0Fs+/B0MA0GCSqGSIb3DQEBCwUAMFsx...\n-----END CERTIFICATE-----\n",
+            custom_key="-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/SCB5...\n-----END PRIVATE KEY-----\n",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        certificate = response.parse()
+        assert_matches_type(Optional[CertificateUpdateResponse], certificate, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.custom_hostnames.certificate_pack.certificates.with_streaming_response.update(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+            custom_certificate="-----BEGIN CERTIFICATE-----\nMIIDdjCCAl6gAwIBAgIJAPnMg0Fs+/B0MA0GCSqGSIb3DQEBCwUAMFsx...\n-----END CERTIFICATE-----\n",
+            custom_key="-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/SCB5...\n-----END PRIVATE KEY-----\n",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            certificate = response.parse()
+            assert_matches_type(Optional[CertificateUpdateResponse], certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.custom_hostnames.certificate_pack.certificates.with_raw_response.update(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+                custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+                custom_certificate="-----BEGIN CERTIFICATE-----\nMIIDdjCCAl6gAwIBAgIJAPnMg0Fs+/B0MA0GCSqGSIb3DQEBCwUAMFsx...\n-----END CERTIFICATE-----\n",
+                custom_key="-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/SCB5...\n-----END PRIVATE KEY-----\n",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `custom_hostname_id` but received ''"):
+            client.custom_hostnames.certificate_pack.certificates.with_raw_response.update(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                custom_hostname_id="",
+                certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+                custom_certificate="-----BEGIN CERTIFICATE-----\nMIIDdjCCAl6gAwIBAgIJAPnMg0Fs+/B0MA0GCSqGSIb3DQEBCwUAMFsx...\n-----END CERTIFICATE-----\n",
+                custom_key="-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/SCB5...\n-----END PRIVATE KEY-----\n",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_pack_id` but received ''"):
+            client.custom_hostnames.certificate_pack.certificates.with_raw_response.update(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate_pack_id="",
+                custom_certificate="-----BEGIN CERTIFICATE-----\nMIIDdjCCAl6gAwIBAgIJAPnMg0Fs+/B0MA0GCSqGSIb3DQEBCwUAMFsx...\n-----END CERTIFICATE-----\n",
+                custom_key="-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/SCB5...\n-----END PRIVATE KEY-----\n",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+            client.custom_hostnames.certificate_pack.certificates.with_raw_response.update(
+                certificate_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+                custom_certificate="-----BEGIN CERTIFICATE-----\nMIIDdjCCAl6gAwIBAgIJAPnMg0Fs+/B0MA0GCSqGSIb3DQEBCwUAMFsx...\n-----END CERTIFICATE-----\n",
+                custom_key="-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/SCB5...\n-----END PRIVATE KEY-----\n",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        certificate = client.custom_hostnames.certificate_pack.certificates.delete(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(CertificateDeleteResponse, certificate, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.custom_hostnames.certificate_pack.certificates.with_raw_response.delete(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        certificate = response.parse()
+        assert_matches_type(CertificateDeleteResponse, certificate, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.custom_hostnames.certificate_pack.certificates.with_streaming_response.delete(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            certificate = response.parse()
+            assert_matches_type(CertificateDeleteResponse, certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.custom_hostnames.certificate_pack.certificates.with_raw_response.delete(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+                custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `custom_hostname_id` but received ''"):
+            client.custom_hostnames.certificate_pack.certificates.with_raw_response.delete(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                custom_hostname_id="",
+                certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_pack_id` but received ''"):
+            client.custom_hostnames.certificate_pack.certificates.with_raw_response.delete(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate_pack_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+            client.custom_hostnames.certificate_pack.certificates.with_raw_response.delete(
+                certificate_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncCertificates:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        certificate = await async_client.custom_hostnames.certificate_pack.certificates.update(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+            custom_certificate="-----BEGIN CERTIFICATE-----\nMIIDdjCCAl6gAwIBAgIJAPnMg0Fs+/B0MA0GCSqGSIb3DQEBCwUAMFsx...\n-----END CERTIFICATE-----\n",
+            custom_key="-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/SCB5...\n-----END PRIVATE KEY-----\n",
+        )
+        assert_matches_type(Optional[CertificateUpdateResponse], certificate, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.custom_hostnames.certificate_pack.certificates.with_raw_response.update(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+            custom_certificate="-----BEGIN CERTIFICATE-----\nMIIDdjCCAl6gAwIBAgIJAPnMg0Fs+/B0MA0GCSqGSIb3DQEBCwUAMFsx...\n-----END CERTIFICATE-----\n",
+            custom_key="-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/SCB5...\n-----END PRIVATE KEY-----\n",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        certificate = await response.parse()
+        assert_matches_type(Optional[CertificateUpdateResponse], certificate, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.custom_hostnames.certificate_pack.certificates.with_streaming_response.update(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+            custom_certificate="-----BEGIN CERTIFICATE-----\nMIIDdjCCAl6gAwIBAgIJAPnMg0Fs+/B0MA0GCSqGSIb3DQEBCwUAMFsx...\n-----END CERTIFICATE-----\n",
+            custom_key="-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/SCB5...\n-----END PRIVATE KEY-----\n",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            certificate = await response.parse()
+            assert_matches_type(Optional[CertificateUpdateResponse], certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.custom_hostnames.certificate_pack.certificates.with_raw_response.update(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+                custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+                custom_certificate="-----BEGIN CERTIFICATE-----\nMIIDdjCCAl6gAwIBAgIJAPnMg0Fs+/B0MA0GCSqGSIb3DQEBCwUAMFsx...\n-----END CERTIFICATE-----\n",
+                custom_key="-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/SCB5...\n-----END PRIVATE KEY-----\n",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `custom_hostname_id` but received ''"):
+            await async_client.custom_hostnames.certificate_pack.certificates.with_raw_response.update(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                custom_hostname_id="",
+                certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+                custom_certificate="-----BEGIN CERTIFICATE-----\nMIIDdjCCAl6gAwIBAgIJAPnMg0Fs+/B0MA0GCSqGSIb3DQEBCwUAMFsx...\n-----END CERTIFICATE-----\n",
+                custom_key="-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/SCB5...\n-----END PRIVATE KEY-----\n",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_pack_id` but received ''"):
+            await async_client.custom_hostnames.certificate_pack.certificates.with_raw_response.update(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate_pack_id="",
+                custom_certificate="-----BEGIN CERTIFICATE-----\nMIIDdjCCAl6gAwIBAgIJAPnMg0Fs+/B0MA0GCSqGSIb3DQEBCwUAMFsx...\n-----END CERTIFICATE-----\n",
+                custom_key="-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/SCB5...\n-----END PRIVATE KEY-----\n",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+            await async_client.custom_hostnames.certificate_pack.certificates.with_raw_response.update(
+                certificate_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+                custom_certificate="-----BEGIN CERTIFICATE-----\nMIIDdjCCAl6gAwIBAgIJAPnMg0Fs+/B0MA0GCSqGSIb3DQEBCwUAMFsx...\n-----END CERTIFICATE-----\n",
+                custom_key="-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/SCB5...\n-----END PRIVATE KEY-----\n",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        certificate = await async_client.custom_hostnames.certificate_pack.certificates.delete(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(CertificateDeleteResponse, certificate, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.custom_hostnames.certificate_pack.certificates.with_raw_response.delete(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        certificate = await response.parse()
+        assert_matches_type(CertificateDeleteResponse, certificate, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.custom_hostnames.certificate_pack.certificates.with_streaming_response.delete(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            certificate = await response.parse()
+            assert_matches_type(CertificateDeleteResponse, certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.custom_hostnames.certificate_pack.certificates.with_raw_response.delete(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+                custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `custom_hostname_id` but received ''"):
+            await async_client.custom_hostnames.certificate_pack.certificates.with_raw_response.delete(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                custom_hostname_id="",
+                certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_pack_id` but received ''"):
+            await async_client.custom_hostnames.certificate_pack.certificates.with_raw_response.delete(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate_pack_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+            await async_client.custom_hostnames.certificate_pack.certificates.with_raw_response.delete(
+                certificate_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/custom_hostnames/test_fallback_origin.py b/tests/api_resources/custom_hostnames/test_fallback_origin.py
index 06e7260f852..4e0e1a70a62 100644
--- a/tests/api_resources/custom_hostnames/test_fallback_origin.py
+++ b/tests/api_resources/custom_hostnames/test_fallback_origin.py
@@ -141,7 +141,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncFallbackOrigin:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/d1/database/__init__.py b/tests/api_resources/d1/database/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/d1/database/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/d1/database/test_time_travel.py b/tests/api_resources/d1/database/test_time_travel.py
new file mode 100644
index 00000000000..7c3d59295cb
--- /dev/null
+++ b/tests/api_resources/d1/database/test_time_travel.py
@@ -0,0 +1,258 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.d1.database import (
+    TimeTravelRestoreResponse,
+    TimeTravelGetBookmarkResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestTimeTravel:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get_bookmark(self, client: Cloudflare) -> None:
+        time_travel = client.d1.database.time_travel.get_bookmark(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(TimeTravelGetBookmarkResponse, time_travel, path=["response"])
+
+    @parametrize
+    def test_method_get_bookmark_with_all_params(self, client: Cloudflare) -> None:
+        time_travel = client.d1.database.time_travel.get_bookmark(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            timestamp=parse_datetime("2024-01-15T12:00:00Z"),
+        )
+        assert_matches_type(TimeTravelGetBookmarkResponse, time_travel, path=["response"])
+
+    @parametrize
+    def test_raw_response_get_bookmark(self, client: Cloudflare) -> None:
+        response = client.d1.database.time_travel.with_raw_response.get_bookmark(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        time_travel = response.parse()
+        assert_matches_type(TimeTravelGetBookmarkResponse, time_travel, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get_bookmark(self, client: Cloudflare) -> None:
+        with client.d1.database.time_travel.with_streaming_response.get_bookmark(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            time_travel = response.parse()
+            assert_matches_type(TimeTravelGetBookmarkResponse, time_travel, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get_bookmark(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.d1.database.time_travel.with_raw_response.get_bookmark(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            client.d1.database.time_travel.with_raw_response.get_bookmark(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_restore(self, client: Cloudflare) -> None:
+        time_travel = client.d1.database.time_travel.restore(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(TimeTravelRestoreResponse, time_travel, path=["response"])
+
+    @parametrize
+    def test_method_restore_with_all_params(self, client: Cloudflare) -> None:
+        time_travel = client.d1.database.time_travel.restore(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bookmark="00000001-00000002-00004e2f-0a83ea2fceebc654de0640c422be4653",
+            timestamp=parse_datetime("2024-01-15T12:00:00Z"),
+        )
+        assert_matches_type(TimeTravelRestoreResponse, time_travel, path=["response"])
+
+    @parametrize
+    def test_raw_response_restore(self, client: Cloudflare) -> None:
+        response = client.d1.database.time_travel.with_raw_response.restore(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        time_travel = response.parse()
+        assert_matches_type(TimeTravelRestoreResponse, time_travel, path=["response"])
+
+    @parametrize
+    def test_streaming_response_restore(self, client: Cloudflare) -> None:
+        with client.d1.database.time_travel.with_streaming_response.restore(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            time_travel = response.parse()
+            assert_matches_type(TimeTravelRestoreResponse, time_travel, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_restore(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.d1.database.time_travel.with_raw_response.restore(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            client.d1.database.time_travel.with_raw_response.restore(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncTimeTravel:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get_bookmark(self, async_client: AsyncCloudflare) -> None:
+        time_travel = await async_client.d1.database.time_travel.get_bookmark(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(TimeTravelGetBookmarkResponse, time_travel, path=["response"])
+
+    @parametrize
+    async def test_method_get_bookmark_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        time_travel = await async_client.d1.database.time_travel.get_bookmark(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            timestamp=parse_datetime("2024-01-15T12:00:00Z"),
+        )
+        assert_matches_type(TimeTravelGetBookmarkResponse, time_travel, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get_bookmark(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.d1.database.time_travel.with_raw_response.get_bookmark(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        time_travel = await response.parse()
+        assert_matches_type(TimeTravelGetBookmarkResponse, time_travel, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get_bookmark(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.d1.database.time_travel.with_streaming_response.get_bookmark(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            time_travel = await response.parse()
+            assert_matches_type(TimeTravelGetBookmarkResponse, time_travel, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get_bookmark(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.d1.database.time_travel.with_raw_response.get_bookmark(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            await async_client.d1.database.time_travel.with_raw_response.get_bookmark(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_restore(self, async_client: AsyncCloudflare) -> None:
+        time_travel = await async_client.d1.database.time_travel.restore(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(TimeTravelRestoreResponse, time_travel, path=["response"])
+
+    @parametrize
+    async def test_method_restore_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        time_travel = await async_client.d1.database.time_travel.restore(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bookmark="00000001-00000002-00004e2f-0a83ea2fceebc654de0640c422be4653",
+            timestamp=parse_datetime("2024-01-15T12:00:00Z"),
+        )
+        assert_matches_type(TimeTravelRestoreResponse, time_travel, path=["response"])
+
+    @parametrize
+    async def test_raw_response_restore(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.d1.database.time_travel.with_raw_response.restore(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        time_travel = await response.parse()
+        assert_matches_type(TimeTravelRestoreResponse, time_travel, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_restore(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.d1.database.time_travel.with_streaming_response.restore(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            time_travel = await response.parse()
+            assert_matches_type(TimeTravelRestoreResponse, time_travel, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_restore(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.d1.database.time_travel.with_raw_response.restore(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            await async_client.d1.database.time_travel.with_raw_response.restore(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/d1/test_database.py b/tests/api_resources/d1/test_database.py
index d0ade522942..f7f014d55a0 100644
--- a/tests/api_resources/d1/test_database.py
+++ b/tests/api_resources/d1/test_database.py
@@ -11,13 +11,13 @@
 from tests.utils import assert_matches_type
 from cloudflare.types.d1 import (
     D1,
+    QueryResult,
     DatabaseRawResponse,
     DatabaseListResponse,
-    DatabaseQueryResponse,
-    DatabaseCreateResponse,
-    DatabaseDeleteResponse,
+    DatabaseExportResponse,
+    DatabaseImportResponse,
 )
-from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -31,16 +31,17 @@ def test_method_create(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="my-database",
         )
-        assert_matches_type(DatabaseCreateResponse, database, path=["response"])
+        assert_matches_type(D1, database, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         database = client.d1.database.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="my-database",
+            jurisdiction="eu",
             primary_location_hint="wnam",
         )
-        assert_matches_type(DatabaseCreateResponse, database, path=["response"])
+        assert_matches_type(D1, database, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
@@ -52,7 +53,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         database = response.parse()
-        assert_matches_type(DatabaseCreateResponse, database, path=["response"])
+        assert_matches_type(D1, database, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
@@ -64,7 +65,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             database = response.parse()
-            assert_matches_type(DatabaseCreateResponse, database, path=["response"])
+            assert_matches_type(D1, database, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -76,6 +77,59 @@ def test_path_params_create(self, client: Cloudflare) -> None:
                 name="my-database",
             )
 
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        database = client.d1.database.update(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            read_replication={"mode": "auto"},
+        )
+        assert_matches_type(D1, database, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.d1.database.with_raw_response.update(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            read_replication={"mode": "auto"},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        database = response.parse()
+        assert_matches_type(D1, database, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.d1.database.with_streaming_response.update(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            read_replication={"mode": "auto"},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            database = response.parse()
+            assert_matches_type(D1, database, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.d1.database.with_raw_response.update(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                account_id="",
+                read_replication={"mode": "auto"},
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            client.d1.database.with_raw_response.update(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                read_replication={"mode": "auto"},
+            )
+
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         database = client.d1.database.list(
@@ -130,7 +184,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(DatabaseDeleteResponse, database, path=["response"])
+        assert_matches_type(object, database, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -142,7 +196,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         database = response.parse()
-        assert_matches_type(DatabaseDeleteResponse, database, path=["response"])
+        assert_matches_type(object, database, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -154,7 +208,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             database = response.parse()
-            assert_matches_type(DatabaseDeleteResponse, database, path=["response"])
+            assert_matches_type(object, database, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -173,16 +227,25 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
             )
 
     @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        database = client.d1.database.get(
+    def test_method_edit(self, client: Cloudflare) -> None:
+        database = client.d1.database.edit(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(D1, database, path=["response"])
 
     @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.d1.database.with_raw_response.get(
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        database = client.d1.database.edit(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            read_replication={"mode": "auto"},
+        )
+        assert_matches_type(D1, database, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.d1.database.with_raw_response.edit(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -193,8 +256,8 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert_matches_type(D1, database, path=["response"])
 
     @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.d1.database.with_streaming_response.get(
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.d1.database.with_streaming_response.edit(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
@@ -207,429 +270,452 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
+    def test_path_params_edit(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.d1.database.with_raw_response.get(
+            client.d1.database.with_raw_response.edit(
                 database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
-            client.d1.database.with_raw_response.get(
+            client.d1.database.with_raw_response.edit(
                 database_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
-    def test_method_query(self, client: Cloudflare) -> None:
-        database = client.d1.database.query(
+    def test_method_export(self, client: Cloudflare) -> None:
+        database = client.d1.database.export(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+            output_format="polling",
         )
-        assert_matches_type(DatabaseQueryResponse, database, path=["response"])
+        assert_matches_type(DatabaseExportResponse, database, path=["response"])
 
     @parametrize
-    def test_method_query_with_all_params(self, client: Cloudflare) -> None:
-        database = client.d1.database.query(
+    def test_method_export_with_all_params(self, client: Cloudflare) -> None:
+        database = client.d1.database.export(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
-            params=["firstParam", "secondParam"],
+            output_format="polling",
+            current_bookmark="current_bookmark",
+            dump_options={
+                "no_data": True,
+                "no_schema": True,
+                "tables": ["string"],
+            },
         )
-        assert_matches_type(DatabaseQueryResponse, database, path=["response"])
+        assert_matches_type(DatabaseExportResponse, database, path=["response"])
 
     @parametrize
-    def test_raw_response_query(self, client: Cloudflare) -> None:
-        response = client.d1.database.with_raw_response.query(
+    def test_raw_response_export(self, client: Cloudflare) -> None:
+        response = client.d1.database.with_raw_response.export(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+            output_format="polling",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         database = response.parse()
-        assert_matches_type(DatabaseQueryResponse, database, path=["response"])
+        assert_matches_type(DatabaseExportResponse, database, path=["response"])
 
     @parametrize
-    def test_streaming_response_query(self, client: Cloudflare) -> None:
-        with client.d1.database.with_streaming_response.query(
+    def test_streaming_response_export(self, client: Cloudflare) -> None:
+        with client.d1.database.with_streaming_response.export(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+            output_format="polling",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             database = response.parse()
-            assert_matches_type(DatabaseQueryResponse, database, path=["response"])
+            assert_matches_type(DatabaseExportResponse, database, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    def test_path_params_query(self, client: Cloudflare) -> None:
+    def test_path_params_export(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.d1.database.with_raw_response.query(
+            client.d1.database.with_raw_response.export(
                 database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
                 account_id="",
-                sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+                output_format="polling",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
-            client.d1.database.with_raw_response.query(
+            client.d1.database.with_raw_response.export(
                 database_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+                output_format="polling",
             )
 
     @parametrize
-    def test_method_raw(self, client: Cloudflare) -> None:
-        database = client.d1.database.raw(
-            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
-        )
-        assert_matches_type(DatabaseRawResponse, database, path=["response"])
-
-    @parametrize
-    def test_method_raw_with_all_params(self, client: Cloudflare) -> None:
-        database = client.d1.database.raw(
+    def test_method_get(self, client: Cloudflare) -> None:
+        database = client.d1.database.get(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
-            params=["firstParam", "secondParam"],
         )
-        assert_matches_type(DatabaseRawResponse, database, path=["response"])
+        assert_matches_type(D1, database, path=["response"])
 
     @parametrize
-    def test_raw_response_raw(self, client: Cloudflare) -> None:
-        response = client.d1.database.with_raw_response.raw(
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.d1.database.with_raw_response.get(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         database = response.parse()
-        assert_matches_type(DatabaseRawResponse, database, path=["response"])
+        assert_matches_type(D1, database, path=["response"])
 
     @parametrize
-    def test_streaming_response_raw(self, client: Cloudflare) -> None:
-        with client.d1.database.with_streaming_response.raw(
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.d1.database.with_streaming_response.get(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             database = response.parse()
-            assert_matches_type(DatabaseRawResponse, database, path=["response"])
+            assert_matches_type(D1, database, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    def test_path_params_raw(self, client: Cloudflare) -> None:
+    def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.d1.database.with_raw_response.raw(
+            client.d1.database.with_raw_response.get(
                 database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
                 account_id="",
-                sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
-            client.d1.database.with_raw_response.raw(
+            client.d1.database.with_raw_response.get(
                 database_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
             )
 
-
-class TestAsyncDatabase:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
     @parametrize
-    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        database = await async_client.d1.database.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="my-database",
-        )
-        assert_matches_type(DatabaseCreateResponse, database, path=["response"])
-
-    @parametrize
-    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        database = await async_client.d1.database.create(
+    def test_method_import_overload_1(self, client: Cloudflare) -> None:
+        database = client.d1.database.import_(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="my-database",
-            primary_location_hint="wnam",
+            action="init",
+            etag="etag",
         )
-        assert_matches_type(DatabaseCreateResponse, database, path=["response"])
+        assert_matches_type(DatabaseImportResponse, database, path=["response"])
 
     @parametrize
-    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.d1.database.with_raw_response.create(
+    def test_raw_response_import_overload_1(self, client: Cloudflare) -> None:
+        response = client.d1.database.with_raw_response.import_(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="my-database",
+            action="init",
+            etag="etag",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        database = await response.parse()
-        assert_matches_type(DatabaseCreateResponse, database, path=["response"])
+        database = response.parse()
+        assert_matches_type(DatabaseImportResponse, database, path=["response"])
 
     @parametrize
-    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.d1.database.with_streaming_response.create(
+    def test_streaming_response_import_overload_1(self, client: Cloudflare) -> None:
+        with client.d1.database.with_streaming_response.import_(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="my-database",
+            action="init",
+            etag="etag",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            database = await response.parse()
-            assert_matches_type(DatabaseCreateResponse, database, path=["response"])
+            database = response.parse()
+            assert_matches_type(DatabaseImportResponse, database, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+    def test_path_params_import_overload_1(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.d1.database.with_raw_response.create(
+            client.d1.database.with_raw_response.import_(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
                 account_id="",
-                name="my-database",
+                action="init",
+                etag="etag",
             )
 
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        database = await async_client.d1.database.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(AsyncV4PagePaginationArray[DatabaseListResponse], database, path=["response"])
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            client.d1.database.with_raw_response.import_(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action="init",
+                etag="etag",
+            )
 
     @parametrize
-    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        database = await async_client.d1.database.list(
+    def test_method_import_overload_2(self, client: Cloudflare) -> None:
+        database = client.d1.database.import_(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="name",
-            page=1,
-            per_page=10,
+            action="ingest",
+            etag="etag",
+            filename="filename",
         )
-        assert_matches_type(AsyncV4PagePaginationArray[DatabaseListResponse], database, path=["response"])
+        assert_matches_type(DatabaseImportResponse, database, path=["response"])
 
     @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.d1.database.with_raw_response.list(
+    def test_raw_response_import_overload_2(self, client: Cloudflare) -> None:
+        response = client.d1.database.with_raw_response.import_(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="ingest",
+            etag="etag",
+            filename="filename",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        database = await response.parse()
-        assert_matches_type(AsyncV4PagePaginationArray[DatabaseListResponse], database, path=["response"])
+        database = response.parse()
+        assert_matches_type(DatabaseImportResponse, database, path=["response"])
 
     @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.d1.database.with_streaming_response.list(
+    def test_streaming_response_import_overload_2(self, client: Cloudflare) -> None:
+        with client.d1.database.with_streaming_response.import_(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="ingest",
+            etag="etag",
+            filename="filename",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            database = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[DatabaseListResponse], database, path=["response"])
+            database = response.parse()
+            assert_matches_type(DatabaseImportResponse, database, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+    def test_path_params_import_overload_2(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.d1.database.with_raw_response.list(
+            client.d1.database.with_raw_response.import_(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
                 account_id="",
+                action="ingest",
+                etag="etag",
+                filename="filename",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            client.d1.database.with_raw_response.import_(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action="ingest",
+                etag="etag",
+                filename="filename",
             )
 
     @parametrize
-    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        database = await async_client.d1.database.delete(
+    def test_method_import_overload_3(self, client: Cloudflare) -> None:
+        database = client.d1.database.import_(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="poll",
+            current_bookmark="current_bookmark",
         )
-        assert_matches_type(DatabaseDeleteResponse, database, path=["response"])
+        assert_matches_type(DatabaseImportResponse, database, path=["response"])
 
     @parametrize
-    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.d1.database.with_raw_response.delete(
+    def test_raw_response_import_overload_3(self, client: Cloudflare) -> None:
+        response = client.d1.database.with_raw_response.import_(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="poll",
+            current_bookmark="current_bookmark",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        database = await response.parse()
-        assert_matches_type(DatabaseDeleteResponse, database, path=["response"])
+        database = response.parse()
+        assert_matches_type(DatabaseImportResponse, database, path=["response"])
 
     @parametrize
-    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.d1.database.with_streaming_response.delete(
+    def test_streaming_response_import_overload_3(self, client: Cloudflare) -> None:
+        with client.d1.database.with_streaming_response.import_(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="poll",
+            current_bookmark="current_bookmark",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            database = await response.parse()
-            assert_matches_type(DatabaseDeleteResponse, database, path=["response"])
+            database = response.parse()
+            assert_matches_type(DatabaseImportResponse, database, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+    def test_path_params_import_overload_3(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.d1.database.with_raw_response.delete(
+            client.d1.database.with_raw_response.import_(
                 database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
                 account_id="",
+                action="poll",
+                current_bookmark="current_bookmark",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
-            await async_client.d1.database.with_raw_response.delete(
+            client.d1.database.with_raw_response.import_(
                 database_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action="poll",
+                current_bookmark="current_bookmark",
             )
 
     @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        database = await async_client.d1.database.get(
+    def test_method_query_overload_1(self, client: Cloudflare) -> None:
+        database = client.d1.database.query(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
         )
-        assert_matches_type(D1, database, path=["response"])
+        assert_matches_type(SyncSinglePage[QueryResult], database, path=["response"])
 
     @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.d1.database.with_raw_response.get(
+    def test_method_query_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        database = client.d1.database.query(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+            params=["firstParam", "secondParam"],
+        )
+        assert_matches_type(SyncSinglePage[QueryResult], database, path=["response"])
+
+    @parametrize
+    def test_raw_response_query_overload_1(self, client: Cloudflare) -> None:
+        response = client.d1.database.with_raw_response.query(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        database = await response.parse()
-        assert_matches_type(D1, database, path=["response"])
+        database = response.parse()
+        assert_matches_type(SyncSinglePage[QueryResult], database, path=["response"])
 
     @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.d1.database.with_streaming_response.get(
+    def test_streaming_response_query_overload_1(self, client: Cloudflare) -> None:
+        with client.d1.database.with_streaming_response.query(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            database = await response.parse()
-            assert_matches_type(D1, database, path=["response"])
+            database = response.parse()
+            assert_matches_type(SyncSinglePage[QueryResult], database, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+    def test_path_params_query_overload_1(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.d1.database.with_raw_response.get(
+            client.d1.database.with_raw_response.query(
                 database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
                 account_id="",
+                sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
-            await async_client.d1.database.with_raw_response.get(
+            client.d1.database.with_raw_response.query(
                 database_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
             )
 
     @parametrize
-    async def test_method_query(self, async_client: AsyncCloudflare) -> None:
-        database = await async_client.d1.database.query(
-            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
-        )
-        assert_matches_type(DatabaseQueryResponse, database, path=["response"])
-
-    @parametrize
-    async def test_method_query_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        database = await async_client.d1.database.query(
+    def test_method_query_overload_2(self, client: Cloudflare) -> None:
+        database = client.d1.database.query(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
-            params=["firstParam", "secondParam"],
+            batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
         )
-        assert_matches_type(DatabaseQueryResponse, database, path=["response"])
+        assert_matches_type(SyncSinglePage[QueryResult], database, path=["response"])
 
     @parametrize
-    async def test_raw_response_query(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.d1.database.with_raw_response.query(
+    def test_raw_response_query_overload_2(self, client: Cloudflare) -> None:
+        response = client.d1.database.with_raw_response.query(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+            batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        database = await response.parse()
-        assert_matches_type(DatabaseQueryResponse, database, path=["response"])
+        database = response.parse()
+        assert_matches_type(SyncSinglePage[QueryResult], database, path=["response"])
 
     @parametrize
-    async def test_streaming_response_query(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.d1.database.with_streaming_response.query(
+    def test_streaming_response_query_overload_2(self, client: Cloudflare) -> None:
+        with client.d1.database.with_streaming_response.query(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+            batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            database = await response.parse()
-            assert_matches_type(DatabaseQueryResponse, database, path=["response"])
+            database = response.parse()
+            assert_matches_type(SyncSinglePage[QueryResult], database, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    async def test_path_params_query(self, async_client: AsyncCloudflare) -> None:
+    def test_path_params_query_overload_2(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.d1.database.with_raw_response.query(
+            client.d1.database.with_raw_response.query(
                 database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
                 account_id="",
-                sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+                batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
-            await async_client.d1.database.with_raw_response.query(
+            client.d1.database.with_raw_response.query(
                 database_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+                batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
             )
 
     @parametrize
-    async def test_method_raw(self, async_client: AsyncCloudflare) -> None:
-        database = await async_client.d1.database.raw(
+    def test_method_raw_overload_1(self, client: Cloudflare) -> None:
+        database = client.d1.database.raw(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
         )
-        assert_matches_type(DatabaseRawResponse, database, path=["response"])
+        assert_matches_type(SyncSinglePage[DatabaseRawResponse], database, path=["response"])
 
     @parametrize
-    async def test_method_raw_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        database = await async_client.d1.database.raw(
+    def test_method_raw_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        database = client.d1.database.raw(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
             params=["firstParam", "secondParam"],
         )
-        assert_matches_type(DatabaseRawResponse, database, path=["response"])
+        assert_matches_type(SyncSinglePage[DatabaseRawResponse], database, path=["response"])
 
     @parametrize
-    async def test_raw_response_raw(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.d1.database.with_raw_response.raw(
+    def test_raw_response_raw_overload_1(self, client: Cloudflare) -> None:
+        response = client.d1.database.with_raw_response.raw(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
@@ -637,12 +723,12 @@ async def test_raw_response_raw(self, async_client: AsyncCloudflare) -> None:
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        database = await response.parse()
-        assert_matches_type(DatabaseRawResponse, database, path=["response"])
+        database = response.parse()
+        assert_matches_type(SyncSinglePage[DatabaseRawResponse], database, path=["response"])
 
     @parametrize
-    async def test_streaming_response_raw(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.d1.database.with_streaming_response.raw(
+    def test_streaming_response_raw_overload_1(self, client: Cloudflare) -> None:
+        with client.d1.database.with_streaming_response.raw(
             database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
@@ -650,15 +736,806 @@ async def test_streaming_response_raw(self, async_client: AsyncCloudflare) -> No
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            database = await response.parse()
-            assert_matches_type(DatabaseRawResponse, database, path=["response"])
+            database = response.parse()
+            assert_matches_type(SyncSinglePage[DatabaseRawResponse], database, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    async def test_path_params_raw(self, async_client: AsyncCloudflare) -> None:
+    def test_path_params_raw_overload_1(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.d1.database.with_raw_response.raw(
+            client.d1.database.with_raw_response.raw(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                account_id="",
+                sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            client.d1.database.with_raw_response.raw(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+            )
+
+    @parametrize
+    def test_method_raw_overload_2(self, client: Cloudflare) -> None:
+        database = client.d1.database.raw(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
+        )
+        assert_matches_type(SyncSinglePage[DatabaseRawResponse], database, path=["response"])
+
+    @parametrize
+    def test_raw_response_raw_overload_2(self, client: Cloudflare) -> None:
+        response = client.d1.database.with_raw_response.raw(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        database = response.parse()
+        assert_matches_type(SyncSinglePage[DatabaseRawResponse], database, path=["response"])
+
+    @parametrize
+    def test_streaming_response_raw_overload_2(self, client: Cloudflare) -> None:
+        with client.d1.database.with_streaming_response.raw(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            database = response.parse()
+            assert_matches_type(SyncSinglePage[DatabaseRawResponse], database, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_raw_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.d1.database.with_raw_response.raw(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                account_id="",
+                batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            client.d1.database.with_raw_response.raw(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
+            )
+
+
+class TestAsyncDatabase:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-database",
+        )
+        assert_matches_type(D1, database, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-database",
+            jurisdiction="eu",
+            primary_location_hint="wnam",
+        )
+        assert_matches_type(D1, database, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.d1.database.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-database",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        database = await response.parse()
+        assert_matches_type(D1, database, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.d1.database.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-database",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            database = await response.parse()
+            assert_matches_type(D1, database, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.d1.database.with_raw_response.create(
+                account_id="",
+                name="my-database",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.update(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            read_replication={"mode": "auto"},
+        )
+        assert_matches_type(D1, database, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.d1.database.with_raw_response.update(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            read_replication={"mode": "auto"},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        database = await response.parse()
+        assert_matches_type(D1, database, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.d1.database.with_streaming_response.update(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            read_replication={"mode": "auto"},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            database = await response.parse()
+            assert_matches_type(D1, database, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.d1.database.with_raw_response.update(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                account_id="",
+                read_replication={"mode": "auto"},
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            await async_client.d1.database.with_raw_response.update(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                read_replication={"mode": "auto"},
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[DatabaseListResponse], database, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="name",
+            page=1,
+            per_page=10,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[DatabaseListResponse], database, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.d1.database.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        database = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[DatabaseListResponse], database, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.d1.database.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            database = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[DatabaseListResponse], database, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.d1.database.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.delete(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(object, database, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.d1.database.with_raw_response.delete(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        database = await response.parse()
+        assert_matches_type(object, database, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.d1.database.with_streaming_response.delete(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            database = await response.parse()
+            assert_matches_type(object, database, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.d1.database.with_raw_response.delete(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            await async_client.d1.database.with_raw_response.delete(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.edit(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(D1, database, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.edit(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            read_replication={"mode": "auto"},
+        )
+        assert_matches_type(D1, database, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.d1.database.with_raw_response.edit(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        database = await response.parse()
+        assert_matches_type(D1, database, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.d1.database.with_streaming_response.edit(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            database = await response.parse()
+            assert_matches_type(D1, database, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.d1.database.with_raw_response.edit(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            await async_client.d1.database.with_raw_response.edit(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_export(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.export(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            output_format="polling",
+        )
+        assert_matches_type(DatabaseExportResponse, database, path=["response"])
+
+    @parametrize
+    async def test_method_export_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.export(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            output_format="polling",
+            current_bookmark="current_bookmark",
+            dump_options={
+                "no_data": True,
+                "no_schema": True,
+                "tables": ["string"],
+            },
+        )
+        assert_matches_type(DatabaseExportResponse, database, path=["response"])
+
+    @parametrize
+    async def test_raw_response_export(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.d1.database.with_raw_response.export(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            output_format="polling",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        database = await response.parse()
+        assert_matches_type(DatabaseExportResponse, database, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_export(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.d1.database.with_streaming_response.export(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            output_format="polling",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            database = await response.parse()
+            assert_matches_type(DatabaseExportResponse, database, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_export(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.d1.database.with_raw_response.export(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                account_id="",
+                output_format="polling",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            await async_client.d1.database.with_raw_response.export(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                output_format="polling",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.get(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(D1, database, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.d1.database.with_raw_response.get(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        database = await response.parse()
+        assert_matches_type(D1, database, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.d1.database.with_streaming_response.get(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            database = await response.parse()
+            assert_matches_type(D1, database, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.d1.database.with_raw_response.get(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            await async_client.d1.database.with_raw_response.get(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_import_overload_1(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.import_(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="init",
+            etag="etag",
+        )
+        assert_matches_type(DatabaseImportResponse, database, path=["response"])
+
+    @parametrize
+    async def test_raw_response_import_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.d1.database.with_raw_response.import_(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="init",
+            etag="etag",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        database = await response.parse()
+        assert_matches_type(DatabaseImportResponse, database, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_import_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.d1.database.with_streaming_response.import_(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="init",
+            etag="etag",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            database = await response.parse()
+            assert_matches_type(DatabaseImportResponse, database, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_import_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.d1.database.with_raw_response.import_(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                account_id="",
+                action="init",
+                etag="etag",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            await async_client.d1.database.with_raw_response.import_(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action="init",
+                etag="etag",
+            )
+
+    @parametrize
+    async def test_method_import_overload_2(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.import_(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="ingest",
+            etag="etag",
+            filename="filename",
+        )
+        assert_matches_type(DatabaseImportResponse, database, path=["response"])
+
+    @parametrize
+    async def test_raw_response_import_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.d1.database.with_raw_response.import_(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="ingest",
+            etag="etag",
+            filename="filename",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        database = await response.parse()
+        assert_matches_type(DatabaseImportResponse, database, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_import_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.d1.database.with_streaming_response.import_(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="ingest",
+            etag="etag",
+            filename="filename",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            database = await response.parse()
+            assert_matches_type(DatabaseImportResponse, database, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_import_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.d1.database.with_raw_response.import_(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                account_id="",
+                action="ingest",
+                etag="etag",
+                filename="filename",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            await async_client.d1.database.with_raw_response.import_(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action="ingest",
+                etag="etag",
+                filename="filename",
+            )
+
+    @parametrize
+    async def test_method_import_overload_3(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.import_(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="poll",
+            current_bookmark="current_bookmark",
+        )
+        assert_matches_type(DatabaseImportResponse, database, path=["response"])
+
+    @parametrize
+    async def test_raw_response_import_overload_3(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.d1.database.with_raw_response.import_(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="poll",
+            current_bookmark="current_bookmark",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        database = await response.parse()
+        assert_matches_type(DatabaseImportResponse, database, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_import_overload_3(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.d1.database.with_streaming_response.import_(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="poll",
+            current_bookmark="current_bookmark",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            database = await response.parse()
+            assert_matches_type(DatabaseImportResponse, database, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_import_overload_3(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.d1.database.with_raw_response.import_(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                account_id="",
+                action="poll",
+                current_bookmark="current_bookmark",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            await async_client.d1.database.with_raw_response.import_(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action="poll",
+                current_bookmark="current_bookmark",
+            )
+
+    @parametrize
+    async def test_method_query_overload_1(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.query(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+        )
+        assert_matches_type(AsyncSinglePage[QueryResult], database, path=["response"])
+
+    @parametrize
+    async def test_method_query_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.query(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+            params=["firstParam", "secondParam"],
+        )
+        assert_matches_type(AsyncSinglePage[QueryResult], database, path=["response"])
+
+    @parametrize
+    async def test_raw_response_query_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.d1.database.with_raw_response.query(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        database = await response.parse()
+        assert_matches_type(AsyncSinglePage[QueryResult], database, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_query_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.d1.database.with_streaming_response.query(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            database = await response.parse()
+            assert_matches_type(AsyncSinglePage[QueryResult], database, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_query_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.d1.database.with_raw_response.query(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                account_id="",
+                sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            await async_client.d1.database.with_raw_response.query(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+            )
+
+    @parametrize
+    async def test_method_query_overload_2(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.query(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
+        )
+        assert_matches_type(AsyncSinglePage[QueryResult], database, path=["response"])
+
+    @parametrize
+    async def test_raw_response_query_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.d1.database.with_raw_response.query(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        database = await response.parse()
+        assert_matches_type(AsyncSinglePage[QueryResult], database, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_query_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.d1.database.with_streaming_response.query(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            database = await response.parse()
+            assert_matches_type(AsyncSinglePage[QueryResult], database, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_query_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.d1.database.with_raw_response.query(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                account_id="",
+                batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            await async_client.d1.database.with_raw_response.query(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
+            )
+
+    @parametrize
+    async def test_method_raw_overload_1(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.raw(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+        )
+        assert_matches_type(AsyncSinglePage[DatabaseRawResponse], database, path=["response"])
+
+    @parametrize
+    async def test_method_raw_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.raw(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+            params=["firstParam", "secondParam"],
+        )
+        assert_matches_type(AsyncSinglePage[DatabaseRawResponse], database, path=["response"])
+
+    @parametrize
+    async def test_raw_response_raw_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.d1.database.with_raw_response.raw(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        database = await response.parse()
+        assert_matches_type(AsyncSinglePage[DatabaseRawResponse], database, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_raw_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.d1.database.with_streaming_response.raw(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            database = await response.parse()
+            assert_matches_type(AsyncSinglePage[DatabaseRawResponse], database, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_raw_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.d1.database.with_raw_response.raw(
                 database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
                 account_id="",
                 sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
@@ -670,3 +1547,56 @@ async def test_path_params_raw(self, async_client: AsyncCloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 sql="SELECT * FROM myTable WHERE field = ? OR field = ?;",
             )
+
+    @parametrize
+    async def test_method_raw_overload_2(self, async_client: AsyncCloudflare) -> None:
+        database = await async_client.d1.database.raw(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
+        )
+        assert_matches_type(AsyncSinglePage[DatabaseRawResponse], database, path=["response"])
+
+    @parametrize
+    async def test_raw_response_raw_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.d1.database.with_raw_response.raw(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        database = await response.parse()
+        assert_matches_type(AsyncSinglePage[DatabaseRawResponse], database, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_raw_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.d1.database.with_streaming_response.raw(
+            database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            database = await response.parse()
+            assert_matches_type(AsyncSinglePage[DatabaseRawResponse], database, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_raw_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.d1.database.with_raw_response.raw(
+                database_id="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                account_id="",
+                batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `database_id` but received ''"):
+            await async_client.d1.database.with_raw_response.raw(
+                database_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                batch=[{"sql": "SELECT * FROM myTable WHERE field = ? OR field = ?;"}],
+            )
diff --git a/tests/api_resources/diagnostics/test_endpoint_healthchecks.py b/tests/api_resources/diagnostics/test_endpoint_healthchecks.py
new file mode 100644
index 00000000000..406240e1223
--- /dev/null
+++ b/tests/api_resources/diagnostics/test_endpoint_healthchecks.py
@@ -0,0 +1,548 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.diagnostics import (
+    EndpointHealthcheckGetResponse,
+    EndpointHealthcheckListResponse,
+    EndpointHealthcheckCreateResponse,
+    EndpointHealthcheckDeleteResponse,
+    EndpointHealthcheckUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestEndpointHealthchecks:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        endpoint_healthcheck = client.diagnostics.endpoint_healthchecks.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            check_type="icmp",
+            endpoint="203.0.113.1",
+        )
+        assert_matches_type(Optional[EndpointHealthcheckCreateResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        endpoint_healthcheck = client.diagnostics.endpoint_healthchecks.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            check_type="icmp",
+            endpoint="203.0.113.1",
+            name="My Endpoint",
+        )
+        assert_matches_type(Optional[EndpointHealthcheckCreateResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.diagnostics.endpoint_healthchecks.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            check_type="icmp",
+            endpoint="203.0.113.1",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        endpoint_healthcheck = response.parse()
+        assert_matches_type(Optional[EndpointHealthcheckCreateResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.diagnostics.endpoint_healthchecks.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            check_type="icmp",
+            endpoint="203.0.113.1",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            endpoint_healthcheck = response.parse()
+            assert_matches_type(Optional[EndpointHealthcheckCreateResponse], endpoint_healthcheck, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.diagnostics.endpoint_healthchecks.with_raw_response.create(
+                account_id="",
+                check_type="icmp",
+                endpoint="203.0.113.1",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        endpoint_healthcheck = client.diagnostics.endpoint_healthchecks.update(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            check_type="icmp",
+            endpoint="203.0.113.1",
+        )
+        assert_matches_type(Optional[EndpointHealthcheckUpdateResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        endpoint_healthcheck = client.diagnostics.endpoint_healthchecks.update(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            check_type="icmp",
+            endpoint="203.0.113.1",
+            name="My Endpoint",
+        )
+        assert_matches_type(Optional[EndpointHealthcheckUpdateResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.diagnostics.endpoint_healthchecks.with_raw_response.update(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            check_type="icmp",
+            endpoint="203.0.113.1",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        endpoint_healthcheck = response.parse()
+        assert_matches_type(Optional[EndpointHealthcheckUpdateResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.diagnostics.endpoint_healthchecks.with_streaming_response.update(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            check_type="icmp",
+            endpoint="203.0.113.1",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            endpoint_healthcheck = response.parse()
+            assert_matches_type(Optional[EndpointHealthcheckUpdateResponse], endpoint_healthcheck, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.diagnostics.endpoint_healthchecks.with_raw_response.update(
+                id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                check_type="icmp",
+                endpoint="203.0.113.1",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.diagnostics.endpoint_healthchecks.with_raw_response.update(
+                id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                check_type="icmp",
+                endpoint="203.0.113.1",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        endpoint_healthcheck = client.diagnostics.endpoint_healthchecks.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[EndpointHealthcheckListResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.diagnostics.endpoint_healthchecks.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        endpoint_healthcheck = response.parse()
+        assert_matches_type(Optional[EndpointHealthcheckListResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.diagnostics.endpoint_healthchecks.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            endpoint_healthcheck = response.parse()
+            assert_matches_type(Optional[EndpointHealthcheckListResponse], endpoint_healthcheck, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.diagnostics.endpoint_healthchecks.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        endpoint_healthcheck = client.diagnostics.endpoint_healthchecks.delete(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(EndpointHealthcheckDeleteResponse, endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.diagnostics.endpoint_healthchecks.with_raw_response.delete(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        endpoint_healthcheck = response.parse()
+        assert_matches_type(EndpointHealthcheckDeleteResponse, endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.diagnostics.endpoint_healthchecks.with_streaming_response.delete(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            endpoint_healthcheck = response.parse()
+            assert_matches_type(EndpointHealthcheckDeleteResponse, endpoint_healthcheck, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.diagnostics.endpoint_healthchecks.with_raw_response.delete(
+                id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.diagnostics.endpoint_healthchecks.with_raw_response.delete(
+                id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        endpoint_healthcheck = client.diagnostics.endpoint_healthchecks.get(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[EndpointHealthcheckGetResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.diagnostics.endpoint_healthchecks.with_raw_response.get(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        endpoint_healthcheck = response.parse()
+        assert_matches_type(Optional[EndpointHealthcheckGetResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.diagnostics.endpoint_healthchecks.with_streaming_response.get(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            endpoint_healthcheck = response.parse()
+            assert_matches_type(Optional[EndpointHealthcheckGetResponse], endpoint_healthcheck, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.diagnostics.endpoint_healthchecks.with_raw_response.get(
+                id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.diagnostics.endpoint_healthchecks.with_raw_response.get(
+                id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncEndpointHealthchecks:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        endpoint_healthcheck = await async_client.diagnostics.endpoint_healthchecks.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            check_type="icmp",
+            endpoint="203.0.113.1",
+        )
+        assert_matches_type(Optional[EndpointHealthcheckCreateResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        endpoint_healthcheck = await async_client.diagnostics.endpoint_healthchecks.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            check_type="icmp",
+            endpoint="203.0.113.1",
+            name="My Endpoint",
+        )
+        assert_matches_type(Optional[EndpointHealthcheckCreateResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.diagnostics.endpoint_healthchecks.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            check_type="icmp",
+            endpoint="203.0.113.1",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        endpoint_healthcheck = await response.parse()
+        assert_matches_type(Optional[EndpointHealthcheckCreateResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.diagnostics.endpoint_healthchecks.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            check_type="icmp",
+            endpoint="203.0.113.1",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            endpoint_healthcheck = await response.parse()
+            assert_matches_type(Optional[EndpointHealthcheckCreateResponse], endpoint_healthcheck, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.diagnostics.endpoint_healthchecks.with_raw_response.create(
+                account_id="",
+                check_type="icmp",
+                endpoint="203.0.113.1",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        endpoint_healthcheck = await async_client.diagnostics.endpoint_healthchecks.update(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            check_type="icmp",
+            endpoint="203.0.113.1",
+        )
+        assert_matches_type(Optional[EndpointHealthcheckUpdateResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        endpoint_healthcheck = await async_client.diagnostics.endpoint_healthchecks.update(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            check_type="icmp",
+            endpoint="203.0.113.1",
+            name="My Endpoint",
+        )
+        assert_matches_type(Optional[EndpointHealthcheckUpdateResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.diagnostics.endpoint_healthchecks.with_raw_response.update(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            check_type="icmp",
+            endpoint="203.0.113.1",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        endpoint_healthcheck = await response.parse()
+        assert_matches_type(Optional[EndpointHealthcheckUpdateResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.diagnostics.endpoint_healthchecks.with_streaming_response.update(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            check_type="icmp",
+            endpoint="203.0.113.1",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            endpoint_healthcheck = await response.parse()
+            assert_matches_type(Optional[EndpointHealthcheckUpdateResponse], endpoint_healthcheck, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.diagnostics.endpoint_healthchecks.with_raw_response.update(
+                id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                check_type="icmp",
+                endpoint="203.0.113.1",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.diagnostics.endpoint_healthchecks.with_raw_response.update(
+                id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                check_type="icmp",
+                endpoint="203.0.113.1",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        endpoint_healthcheck = await async_client.diagnostics.endpoint_healthchecks.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[EndpointHealthcheckListResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.diagnostics.endpoint_healthchecks.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        endpoint_healthcheck = await response.parse()
+        assert_matches_type(Optional[EndpointHealthcheckListResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.diagnostics.endpoint_healthchecks.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            endpoint_healthcheck = await response.parse()
+            assert_matches_type(Optional[EndpointHealthcheckListResponse], endpoint_healthcheck, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.diagnostics.endpoint_healthchecks.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        endpoint_healthcheck = await async_client.diagnostics.endpoint_healthchecks.delete(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(EndpointHealthcheckDeleteResponse, endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.diagnostics.endpoint_healthchecks.with_raw_response.delete(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        endpoint_healthcheck = await response.parse()
+        assert_matches_type(EndpointHealthcheckDeleteResponse, endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.diagnostics.endpoint_healthchecks.with_streaming_response.delete(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            endpoint_healthcheck = await response.parse()
+            assert_matches_type(EndpointHealthcheckDeleteResponse, endpoint_healthcheck, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.diagnostics.endpoint_healthchecks.with_raw_response.delete(
+                id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.diagnostics.endpoint_healthchecks.with_raw_response.delete(
+                id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        endpoint_healthcheck = await async_client.diagnostics.endpoint_healthchecks.get(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[EndpointHealthcheckGetResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.diagnostics.endpoint_healthchecks.with_raw_response.get(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        endpoint_healthcheck = await response.parse()
+        assert_matches_type(Optional[EndpointHealthcheckGetResponse], endpoint_healthcheck, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.diagnostics.endpoint_healthchecks.with_streaming_response.get(
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            endpoint_healthcheck = await response.parse()
+            assert_matches_type(Optional[EndpointHealthcheckGetResponse], endpoint_healthcheck, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.diagnostics.endpoint_healthchecks.with_raw_response.get(
+                id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.diagnostics.endpoint_healthchecks.with_raw_response.get(
+                id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/diagnostics/test_traceroutes.py b/tests/api_resources/diagnostics/test_traceroutes.py
index 930de49727f..9ad32223c09 100644
--- a/tests/api_resources/diagnostics/test_traceroutes.py
+++ b/tests/api_resources/diagnostics/test_traceroutes.py
@@ -3,13 +3,14 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.diagnostics import TracerouteCreateResponse
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.diagnostics import Traceroute
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -23,7 +24,7 @@ def test_method_create(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             targets=["203.0.113.1", "cloudflare.com"],
         )
-        assert_matches_type(Optional[TracerouteCreateResponse], traceroute, path=["response"])
+        assert_matches_type(SyncSinglePage[Traceroute], traceroute, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
@@ -39,7 +40,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                 "wait_time": 1,
             },
         )
-        assert_matches_type(Optional[TracerouteCreateResponse], traceroute, path=["response"])
+        assert_matches_type(SyncSinglePage[Traceroute], traceroute, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
@@ -51,7 +52,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         traceroute = response.parse()
-        assert_matches_type(Optional[TracerouteCreateResponse], traceroute, path=["response"])
+        assert_matches_type(SyncSinglePage[Traceroute], traceroute, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
@@ -63,7 +64,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             traceroute = response.parse()
-            assert_matches_type(Optional[TracerouteCreateResponse], traceroute, path=["response"])
+            assert_matches_type(SyncSinglePage[Traceroute], traceroute, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -77,7 +78,9 @@ def test_path_params_create(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTraceroutes:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -85,7 +88,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             targets=["203.0.113.1", "cloudflare.com"],
         )
-        assert_matches_type(Optional[TracerouteCreateResponse], traceroute, path=["response"])
+        assert_matches_type(AsyncSinglePage[Traceroute], traceroute, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -101,7 +104,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                 "wait_time": 1,
             },
         )
-        assert_matches_type(Optional[TracerouteCreateResponse], traceroute, path=["response"])
+        assert_matches_type(AsyncSinglePage[Traceroute], traceroute, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
@@ -113,7 +116,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         traceroute = await response.parse()
-        assert_matches_type(Optional[TracerouteCreateResponse], traceroute, path=["response"])
+        assert_matches_type(AsyncSinglePage[Traceroute], traceroute, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
@@ -125,7 +128,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             traceroute = await response.parse()
-            assert_matches_type(Optional[TracerouteCreateResponse], traceroute, path=["response"])
+            assert_matches_type(AsyncSinglePage[Traceroute], traceroute, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/dns/analytics/reports/test_bytimes.py b/tests/api_resources/dns/analytics/reports/test_bytimes.py
index 73408198645..419f0d4670f 100644
--- a/tests/api_resources/dns/analytics/reports/test_bytimes.py
+++ b/tests/api_resources/dns/analytics/reports/test_bytimes.py
@@ -73,7 +73,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncBytimes:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/dns/analytics/test_reports.py b/tests/api_resources/dns/analytics/test_reports.py
index 89dae97959c..d3c918a2868 100644
--- a/tests/api_resources/dns/analytics/test_reports.py
+++ b/tests/api_resources/dns/analytics/test_reports.py
@@ -72,7 +72,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncReports:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/dns/settings/__init__.py b/tests/api_resources/dns/settings/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/dns/settings/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/dns/settings/account/__init__.py b/tests/api_resources/dns/settings/account/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/dns/settings/account/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/dns/settings/account/test_views.py b/tests/api_resources/dns/settings/account/test_views.py
new file mode 100644
index 00000000000..0d76207ae4f
--- /dev/null
+++ b/tests/api_resources/dns/settings/account/test_views.py
@@ -0,0 +1,547 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.dns.settings.account import (
+    ViewGetResponse,
+    ViewEditResponse,
+    ViewListResponse,
+    ViewCreateResponse,
+    ViewDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestViews:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        view = client.dns.settings.account.views.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my view",
+            zones=["372e67954025e0ba6aaa6d586b9e0b59"],
+        )
+        assert_matches_type(Optional[ViewCreateResponse], view, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.dns.settings.account.views.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my view",
+            zones=["372e67954025e0ba6aaa6d586b9e0b59"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        view = response.parse()
+        assert_matches_type(Optional[ViewCreateResponse], view, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.dns.settings.account.views.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my view",
+            zones=["372e67954025e0ba6aaa6d586b9e0b59"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            view = response.parse()
+            assert_matches_type(Optional[ViewCreateResponse], view, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.dns.settings.account.views.with_raw_response.create(
+                account_id="",
+                name="my view",
+                zones=["372e67954025e0ba6aaa6d586b9e0b59"],
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        view = client.dns.settings.account.views.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ViewListResponse], view, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        view = client.dns.settings.account.views.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="asc",
+            match="any",
+            name={
+                "contains": "view",
+                "endswith": "ew",
+                "exact": "my view",
+                "startswith": "my",
+            },
+            order="name",
+            page=1,
+            per_page=5,
+            zone_id="ae29bea30e2e427ba9cd8d78b628177b",
+            zone_name="www.example.com",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ViewListResponse], view, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.dns.settings.account.views.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        view = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[ViewListResponse], view, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.dns.settings.account.views.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            view = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[ViewListResponse], view, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.dns.settings.account.views.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        view = client.dns.settings.account.views.delete(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ViewDeleteResponse], view, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.dns.settings.account.views.with_raw_response.delete(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        view = response.parse()
+        assert_matches_type(Optional[ViewDeleteResponse], view, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.dns.settings.account.views.with_streaming_response.delete(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            view = response.parse()
+            assert_matches_type(Optional[ViewDeleteResponse], view, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.dns.settings.account.views.with_raw_response.delete(
+                view_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `view_id` but received ''"):
+            client.dns.settings.account.views.with_raw_response.delete(
+                view_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        view = client.dns.settings.account.views.edit(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ViewEditResponse], view, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        view = client.dns.settings.account.views.edit(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my view",
+            zones=["372e67954025e0ba6aaa6d586b9e0b59"],
+        )
+        assert_matches_type(Optional[ViewEditResponse], view, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.dns.settings.account.views.with_raw_response.edit(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        view = response.parse()
+        assert_matches_type(Optional[ViewEditResponse], view, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.dns.settings.account.views.with_streaming_response.edit(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            view = response.parse()
+            assert_matches_type(Optional[ViewEditResponse], view, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.dns.settings.account.views.with_raw_response.edit(
+                view_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `view_id` but received ''"):
+            client.dns.settings.account.views.with_raw_response.edit(
+                view_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        view = client.dns.settings.account.views.get(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ViewGetResponse], view, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.dns.settings.account.views.with_raw_response.get(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        view = response.parse()
+        assert_matches_type(Optional[ViewGetResponse], view, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.dns.settings.account.views.with_streaming_response.get(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            view = response.parse()
+            assert_matches_type(Optional[ViewGetResponse], view, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.dns.settings.account.views.with_raw_response.get(
+                view_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `view_id` but received ''"):
+            client.dns.settings.account.views.with_raw_response.get(
+                view_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncViews:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        view = await async_client.dns.settings.account.views.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my view",
+            zones=["372e67954025e0ba6aaa6d586b9e0b59"],
+        )
+        assert_matches_type(Optional[ViewCreateResponse], view, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.settings.account.views.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my view",
+            zones=["372e67954025e0ba6aaa6d586b9e0b59"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        view = await response.parse()
+        assert_matches_type(Optional[ViewCreateResponse], view, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns.settings.account.views.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my view",
+            zones=["372e67954025e0ba6aaa6d586b9e0b59"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            view = await response.parse()
+            assert_matches_type(Optional[ViewCreateResponse], view, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.dns.settings.account.views.with_raw_response.create(
+                account_id="",
+                name="my view",
+                zones=["372e67954025e0ba6aaa6d586b9e0b59"],
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        view = await async_client.dns.settings.account.views.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[ViewListResponse], view, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        view = await async_client.dns.settings.account.views.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="asc",
+            match="any",
+            name={
+                "contains": "view",
+                "endswith": "ew",
+                "exact": "my view",
+                "startswith": "my",
+            },
+            order="name",
+            page=1,
+            per_page=5,
+            zone_id="ae29bea30e2e427ba9cd8d78b628177b",
+            zone_name="www.example.com",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[ViewListResponse], view, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.settings.account.views.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        view = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[ViewListResponse], view, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns.settings.account.views.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            view = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[ViewListResponse], view, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.dns.settings.account.views.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        view = await async_client.dns.settings.account.views.delete(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ViewDeleteResponse], view, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.settings.account.views.with_raw_response.delete(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        view = await response.parse()
+        assert_matches_type(Optional[ViewDeleteResponse], view, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns.settings.account.views.with_streaming_response.delete(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            view = await response.parse()
+            assert_matches_type(Optional[ViewDeleteResponse], view, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.dns.settings.account.views.with_raw_response.delete(
+                view_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `view_id` but received ''"):
+            await async_client.dns.settings.account.views.with_raw_response.delete(
+                view_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        view = await async_client.dns.settings.account.views.edit(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ViewEditResponse], view, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        view = await async_client.dns.settings.account.views.edit(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my view",
+            zones=["372e67954025e0ba6aaa6d586b9e0b59"],
+        )
+        assert_matches_type(Optional[ViewEditResponse], view, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.settings.account.views.with_raw_response.edit(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        view = await response.parse()
+        assert_matches_type(Optional[ViewEditResponse], view, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns.settings.account.views.with_streaming_response.edit(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            view = await response.parse()
+            assert_matches_type(Optional[ViewEditResponse], view, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.dns.settings.account.views.with_raw_response.edit(
+                view_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `view_id` but received ''"):
+            await async_client.dns.settings.account.views.with_raw_response.edit(
+                view_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        view = await async_client.dns.settings.account.views.get(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ViewGetResponse], view, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.settings.account.views.with_raw_response.get(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        view = await response.parse()
+        assert_matches_type(Optional[ViewGetResponse], view, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns.settings.account.views.with_streaming_response.get(
+            view_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            view = await response.parse()
+            assert_matches_type(Optional[ViewGetResponse], view, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.dns.settings.account.views.with_raw_response.get(
+                view_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `view_id` but received ''"):
+            await async_client.dns.settings.account.views.with_raw_response.get(
+                view_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/dns/settings/test_account.py b/tests/api_resources/dns/settings/test_account.py
new file mode 100644
index 00000000000..b449a943640
--- /dev/null
+++ b/tests/api_resources/dns/settings/test_account.py
@@ -0,0 +1,246 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.dns.settings import AccountGetResponse, AccountEditResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestAccount:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        account = client.dns.settings.account.edit(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[AccountEditResponse], account, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        account = client.dns.settings.account.edit(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_defaults={
+                "flatten_all_cnames": False,
+                "foundation_dns": False,
+                "internal_dns": {"reference_zone_id": "reference_zone_id"},
+                "multi_provider": False,
+                "nameservers": {"type": "cloudflare.standard"},
+                "ns_ttl": 86400,
+                "secondary_overrides": False,
+                "soa": {
+                    "expire": 604800,
+                    "min_ttl": 1800,
+                    "mname": "kristina.ns.cloudflare.com",
+                    "refresh": 10000,
+                    "retry": 2400,
+                    "rname": "admin.example.com",
+                    "ttl": 3600,
+                },
+                "zone_mode": "dns_only",
+            },
+        )
+        assert_matches_type(Optional[AccountEditResponse], account, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.dns.settings.account.with_raw_response.edit(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        account = response.parse()
+        assert_matches_type(Optional[AccountEditResponse], account, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.dns.settings.account.with_streaming_response.edit(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            account = response.parse()
+            assert_matches_type(Optional[AccountEditResponse], account, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.dns.settings.account.with_raw_response.edit(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        account = client.dns.settings.account.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[AccountGetResponse], account, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.dns.settings.account.with_raw_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        account = response.parse()
+        assert_matches_type(Optional[AccountGetResponse], account, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.dns.settings.account.with_streaming_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            account = response.parse()
+            assert_matches_type(Optional[AccountGetResponse], account, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.dns.settings.account.with_raw_response.get(
+                account_id="",
+            )
+
+
+class TestAsyncAccount:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        account = await async_client.dns.settings.account.edit(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[AccountEditResponse], account, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        account = await async_client.dns.settings.account.edit(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_defaults={
+                "flatten_all_cnames": False,
+                "foundation_dns": False,
+                "internal_dns": {"reference_zone_id": "reference_zone_id"},
+                "multi_provider": False,
+                "nameservers": {"type": "cloudflare.standard"},
+                "ns_ttl": 86400,
+                "secondary_overrides": False,
+                "soa": {
+                    "expire": 604800,
+                    "min_ttl": 1800,
+                    "mname": "kristina.ns.cloudflare.com",
+                    "refresh": 10000,
+                    "retry": 2400,
+                    "rname": "admin.example.com",
+                    "ttl": 3600,
+                },
+                "zone_mode": "dns_only",
+            },
+        )
+        assert_matches_type(Optional[AccountEditResponse], account, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.settings.account.with_raw_response.edit(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        account = await response.parse()
+        assert_matches_type(Optional[AccountEditResponse], account, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns.settings.account.with_streaming_response.edit(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            account = await response.parse()
+            assert_matches_type(Optional[AccountEditResponse], account, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.dns.settings.account.with_raw_response.edit(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        account = await async_client.dns.settings.account.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[AccountGetResponse], account, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.settings.account.with_raw_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        account = await response.parse()
+        assert_matches_type(Optional[AccountGetResponse], account, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns.settings.account.with_streaming_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            account = await response.parse()
+            assert_matches_type(Optional[AccountGetResponse], account, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.dns.settings.account.with_raw_response.get(
+                account_id="",
+            )
diff --git a/tests/api_resources/dns/settings/test_zone.py b/tests/api_resources/dns/settings/test_zone.py
new file mode 100644
index 00000000000..37266ebed1b
--- /dev/null
+++ b/tests/api_resources/dns/settings/test_zone.py
@@ -0,0 +1,248 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.dns.settings import ZoneGetResponse, ZoneEditResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestZone:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        zone = client.dns.settings.zone.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ZoneEditResponse], zone, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        zone = client.dns.settings.zone.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            flatten_all_cnames=False,
+            foundation_dns=False,
+            internal_dns={"reference_zone_id": "reference_zone_id"},
+            multi_provider=False,
+            nameservers={
+                "ns_set": 1,
+                "type": "cloudflare.standard",
+            },
+            ns_ttl=86400,
+            secondary_overrides=False,
+            soa={
+                "expire": 604800,
+                "min_ttl": 1800,
+                "mname": "kristina.ns.cloudflare.com",
+                "refresh": 10000,
+                "retry": 2400,
+                "rname": "admin.example.com",
+                "ttl": 3600,
+            },
+            zone_mode="dns_only",
+        )
+        assert_matches_type(Optional[ZoneEditResponse], zone, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.dns.settings.zone.with_raw_response.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        zone = response.parse()
+        assert_matches_type(Optional[ZoneEditResponse], zone, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.dns.settings.zone.with_streaming_response.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            zone = response.parse()
+            assert_matches_type(Optional[ZoneEditResponse], zone, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.dns.settings.zone.with_raw_response.edit(
+                zone_id="",
+            )
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        zone = client.dns.settings.zone.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ZoneGetResponse], zone, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.dns.settings.zone.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        zone = response.parse()
+        assert_matches_type(Optional[ZoneGetResponse], zone, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.dns.settings.zone.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            zone = response.parse()
+            assert_matches_type(Optional[ZoneGetResponse], zone, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.dns.settings.zone.with_raw_response.get(
+                zone_id="",
+            )
+
+
+class TestAsyncZone:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        zone = await async_client.dns.settings.zone.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ZoneEditResponse], zone, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        zone = await async_client.dns.settings.zone.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            flatten_all_cnames=False,
+            foundation_dns=False,
+            internal_dns={"reference_zone_id": "reference_zone_id"},
+            multi_provider=False,
+            nameservers={
+                "ns_set": 1,
+                "type": "cloudflare.standard",
+            },
+            ns_ttl=86400,
+            secondary_overrides=False,
+            soa={
+                "expire": 604800,
+                "min_ttl": 1800,
+                "mname": "kristina.ns.cloudflare.com",
+                "refresh": 10000,
+                "retry": 2400,
+                "rname": "admin.example.com",
+                "ttl": 3600,
+            },
+            zone_mode="dns_only",
+        )
+        assert_matches_type(Optional[ZoneEditResponse], zone, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.settings.zone.with_raw_response.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        zone = await response.parse()
+        assert_matches_type(Optional[ZoneEditResponse], zone, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns.settings.zone.with_streaming_response.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            zone = await response.parse()
+            assert_matches_type(Optional[ZoneEditResponse], zone, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.dns.settings.zone.with_raw_response.edit(
+                zone_id="",
+            )
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        zone = await async_client.dns.settings.zone.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ZoneGetResponse], zone, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.settings.zone.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        zone = await response.parse()
+        assert_matches_type(Optional[ZoneGetResponse], zone, path=["response"])
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns.settings.zone.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            zone = await response.parse()
+            assert_matches_type(Optional[ZoneGetResponse], zone, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="HTTP 422 from prism")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.dns.settings.zone.with_raw_response.get(
+                zone_id="",
+            )
diff --git a/tests/api_resources/test_dnssec.py b/tests/api_resources/dns/test_dnssec.py
similarity index 80%
rename from tests/api_resources/test_dnssec.py
rename to tests/api_resources/dns/test_dnssec.py
index 8b083f578d3..e37b7a54f70 100644
--- a/tests/api_resources/test_dnssec.py
+++ b/tests/api_resources/dns/test_dnssec.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.dnssec import DNSSEC, DNSSECDeleteResponse
+from cloudflare.types.dns import DNSSEC
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -19,62 +19,63 @@ class TestDNSSEC:
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
-        dnssec = client.dnssec.delete(
+        dnssec = client.dns.dnssec.delete(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[DNSSECDeleteResponse], dnssec, path=["response"])
+        assert_matches_type(str, dnssec, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.dnssec.with_raw_response.delete(
+        response = client.dns.dnssec.with_raw_response.delete(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dnssec = response.parse()
-        assert_matches_type(Optional[DNSSECDeleteResponse], dnssec, path=["response"])
+        assert_matches_type(str, dnssec, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.dnssec.with_streaming_response.delete(
+        with client.dns.dnssec.with_streaming_response.delete(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dnssec = response.parse()
-            assert_matches_type(Optional[DNSSECDeleteResponse], dnssec, path=["response"])
+            assert_matches_type(str, dnssec, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.dnssec.with_raw_response.delete(
+            client.dns.dnssec.with_raw_response.delete(
                 zone_id="",
             )
 
     @parametrize
     def test_method_edit(self, client: Cloudflare) -> None:
-        dnssec = client.dnssec.edit(
+        dnssec = client.dns.dnssec.edit(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[DNSSEC], dnssec, path=["response"])
 
     @parametrize
     def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
-        dnssec = client.dnssec.edit(
+        dnssec = client.dns.dnssec.edit(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dnssec_multi_signer=False,
             dnssec_presigned=True,
+            dnssec_use_nsec3=False,
             status="active",
         )
         assert_matches_type(Optional[DNSSEC], dnssec, path=["response"])
 
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
-        response = client.dnssec.with_raw_response.edit(
+        response = client.dns.dnssec.with_raw_response.edit(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -85,7 +86,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
-        with client.dnssec.with_streaming_response.edit(
+        with client.dns.dnssec.with_streaming_response.edit(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -99,20 +100,20 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_edit(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.dnssec.with_raw_response.edit(
+            client.dns.dnssec.with_raw_response.edit(
                 zone_id="",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        dnssec = client.dnssec.get(
+        dnssec = client.dns.dnssec.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[DNSSEC], dnssec, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.dnssec.with_raw_response.get(
+        response = client.dns.dnssec.with_raw_response.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -123,7 +124,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.dnssec.with_streaming_response.get(
+        with client.dns.dnssec.with_streaming_response.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -137,72 +138,75 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.dnssec.with_raw_response.get(
+            client.dns.dnssec.with_raw_response.get(
                 zone_id="",
             )
 
 
 class TestAsyncDNSSEC:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        dnssec = await async_client.dnssec.delete(
+        dnssec = await async_client.dns.dnssec.delete(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[DNSSECDeleteResponse], dnssec, path=["response"])
+        assert_matches_type(str, dnssec, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.dnssec.with_raw_response.delete(
+        response = await async_client.dns.dnssec.with_raw_response.delete(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dnssec = await response.parse()
-        assert_matches_type(Optional[DNSSECDeleteResponse], dnssec, path=["response"])
+        assert_matches_type(str, dnssec, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.dnssec.with_streaming_response.delete(
+        async with async_client.dns.dnssec.with_streaming_response.delete(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dnssec = await response.parse()
-            assert_matches_type(Optional[DNSSECDeleteResponse], dnssec, path=["response"])
+            assert_matches_type(str, dnssec, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.dnssec.with_raw_response.delete(
+            await async_client.dns.dnssec.with_raw_response.delete(
                 zone_id="",
             )
 
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
-        dnssec = await async_client.dnssec.edit(
+        dnssec = await async_client.dns.dnssec.edit(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[DNSSEC], dnssec, path=["response"])
 
     @parametrize
     async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        dnssec = await async_client.dnssec.edit(
+        dnssec = await async_client.dns.dnssec.edit(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dnssec_multi_signer=False,
             dnssec_presigned=True,
+            dnssec_use_nsec3=False,
             status="active",
         )
         assert_matches_type(Optional[DNSSEC], dnssec, path=["response"])
 
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.dnssec.with_raw_response.edit(
+        response = await async_client.dns.dnssec.with_raw_response.edit(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -213,7 +217,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.dnssec.with_streaming_response.edit(
+        async with async_client.dns.dnssec.with_streaming_response.edit(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -227,20 +231,20 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
     @parametrize
     async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.dnssec.with_raw_response.edit(
+            await async_client.dns.dnssec.with_raw_response.edit(
                 zone_id="",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        dnssec = await async_client.dnssec.get(
+        dnssec = await async_client.dns.dnssec.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[DNSSEC], dnssec, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.dnssec.with_raw_response.get(
+        response = await async_client.dns.dnssec.with_raw_response.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -251,7 +255,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.dnssec.with_streaming_response.get(
+        async with async_client.dns.dnssec.with_streaming_response.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -265,6 +269,6 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.dnssec.with_raw_response.get(
+            await async_client.dns.dnssec.with_raw_response.get(
                 zone_id="",
             )
diff --git a/tests/api_resources/dns/test_firewall.py b/tests/api_resources/dns/test_firewall.py
deleted file mode 100644
index aac76b89adc..00000000000
--- a/tests/api_resources/dns/test_firewall.py
+++ /dev/null
@@ -1,666 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.dns import (
-    FirewallDeleteResponse,
-)
-from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
-from cloudflare.types.dns.firewall import Firewall
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestFirewall:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_create(self, client: Cloudflare) -> None:
-        firewall = client.dns.firewall.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="My Awesome DNS Firewall cluster",
-            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-        )
-        assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-    @parametrize
-    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
-        firewall = client.dns.firewall.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="My Awesome DNS Firewall cluster",
-            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-            attack_mitigation={
-                "enabled": True,
-                "only_when_upstream_unhealthy": False,
-            },
-            deprecate_any_requests=True,
-            ecs_fallback=False,
-            maximum_cache_ttl=900,
-            minimum_cache_ttl=60,
-            negative_cache_ttl=900,
-            ratelimit=600,
-            retries=2,
-        )
-        assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-    @parametrize
-    def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.dns.firewall.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="My Awesome DNS Firewall cluster",
-            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        firewall = response.parse()
-        assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-    @parametrize
-    def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.dns.firewall.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="My Awesome DNS Firewall cluster",
-            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            firewall = response.parse()
-            assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.dns.firewall.with_raw_response.create(
-                account_id="",
-                name="My Awesome DNS Firewall cluster",
-                upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-            )
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        firewall = client.dns.firewall.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SyncV4PagePaginationArray[Firewall], firewall, path=["response"])
-
-    @parametrize
-    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
-        firewall = client.dns.firewall.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            page=1,
-            per_page=1,
-        )
-        assert_matches_type(SyncV4PagePaginationArray[Firewall], firewall, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.dns.firewall.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        firewall = response.parse()
-        assert_matches_type(SyncV4PagePaginationArray[Firewall], firewall, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.dns.firewall.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            firewall = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[Firewall], firewall, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.dns.firewall.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    def test_method_delete(self, client: Cloudflare) -> None:
-        firewall = client.dns.firewall.delete(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[FirewallDeleteResponse], firewall, path=["response"])
-
-    @parametrize
-    def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.dns.firewall.with_raw_response.delete(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        firewall = response.parse()
-        assert_matches_type(Optional[FirewallDeleteResponse], firewall, path=["response"])
-
-    @parametrize
-    def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.dns.firewall.with_streaming_response.delete(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            firewall = response.parse()
-            assert_matches_type(Optional[FirewallDeleteResponse], firewall, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.dns.firewall.with_raw_response.delete(
-                dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
-            client.dns.firewall.with_raw_response.delete(
-                dns_firewall_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_edit(self, client: Cloudflare) -> None:
-        firewall = client.dns.firewall.edit(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            deprecate_any_requests=True,
-            dns_firewall_ips=["203.0.113.1", "203.0.113.254", "2001:DB8:AB::CF", "2001:DB8:CD::CF"],
-            ecs_fallback=False,
-            maximum_cache_ttl=900,
-            minimum_cache_ttl=60,
-            name="My Awesome DNS Firewall cluster",
-            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-        )
-        assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-    @parametrize
-    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
-        firewall = client.dns.firewall.edit(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            deprecate_any_requests=True,
-            dns_firewall_ips=["203.0.113.1", "203.0.113.254", "2001:DB8:AB::CF", "2001:DB8:CD::CF"],
-            ecs_fallback=False,
-            maximum_cache_ttl=900,
-            minimum_cache_ttl=60,
-            name="My Awesome DNS Firewall cluster",
-            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-            attack_mitigation={
-                "enabled": True,
-                "only_when_upstream_unhealthy": False,
-            },
-            negative_cache_ttl=900,
-            ratelimit=600,
-            retries=2,
-        )
-        assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit(self, client: Cloudflare) -> None:
-        response = client.dns.firewall.with_raw_response.edit(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            deprecate_any_requests=True,
-            dns_firewall_ips=["203.0.113.1", "203.0.113.254", "2001:DB8:AB::CF", "2001:DB8:CD::CF"],
-            ecs_fallback=False,
-            maximum_cache_ttl=900,
-            minimum_cache_ttl=60,
-            name="My Awesome DNS Firewall cluster",
-            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        firewall = response.parse()
-        assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit(self, client: Cloudflare) -> None:
-        with client.dns.firewall.with_streaming_response.edit(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            deprecate_any_requests=True,
-            dns_firewall_ips=["203.0.113.1", "203.0.113.254", "2001:DB8:AB::CF", "2001:DB8:CD::CF"],
-            ecs_fallback=False,
-            maximum_cache_ttl=900,
-            minimum_cache_ttl=60,
-            name="My Awesome DNS Firewall cluster",
-            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            firewall = response.parse()
-            assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.dns.firewall.with_raw_response.edit(
-                dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                id="023e105f4ecef8ad9ca31a8372d0c353",
-                deprecate_any_requests=True,
-                dns_firewall_ips=["203.0.113.1", "203.0.113.254", "2001:DB8:AB::CF", "2001:DB8:CD::CF"],
-                ecs_fallback=False,
-                maximum_cache_ttl=900,
-                minimum_cache_ttl=60,
-                name="My Awesome DNS Firewall cluster",
-                upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
-            client.dns.firewall.with_raw_response.edit(
-                dns_firewall_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="023e105f4ecef8ad9ca31a8372d0c353",
-                deprecate_any_requests=True,
-                dns_firewall_ips=["203.0.113.1", "203.0.113.254", "2001:DB8:AB::CF", "2001:DB8:CD::CF"],
-                ecs_fallback=False,
-                maximum_cache_ttl=900,
-                minimum_cache_ttl=60,
-                name="My Awesome DNS Firewall cluster",
-                upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        firewall = client.dns.firewall.get(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.dns.firewall.with_raw_response.get(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        firewall = response.parse()
-        assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.dns.firewall.with_streaming_response.get(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            firewall = response.parse()
-            assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.dns.firewall.with_raw_response.get(
-                dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
-            client.dns.firewall.with_raw_response.get(
-                dns_firewall_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-
-class TestAsyncFirewall:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        firewall = await async_client.dns.firewall.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="My Awesome DNS Firewall cluster",
-            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-        )
-        assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-    @parametrize
-    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        firewall = await async_client.dns.firewall.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="My Awesome DNS Firewall cluster",
-            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-            attack_mitigation={
-                "enabled": True,
-                "only_when_upstream_unhealthy": False,
-            },
-            deprecate_any_requests=True,
-            ecs_fallback=False,
-            maximum_cache_ttl=900,
-            minimum_cache_ttl=60,
-            negative_cache_ttl=900,
-            ratelimit=600,
-            retries=2,
-        )
-        assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-    @parametrize
-    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.dns.firewall.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="My Awesome DNS Firewall cluster",
-            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        firewall = await response.parse()
-        assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.dns.firewall.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="My Awesome DNS Firewall cluster",
-            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            firewall = await response.parse()
-            assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.dns.firewall.with_raw_response.create(
-                account_id="",
-                name="My Awesome DNS Firewall cluster",
-                upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-            )
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        firewall = await async_client.dns.firewall.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(AsyncV4PagePaginationArray[Firewall], firewall, path=["response"])
-
-    @parametrize
-    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        firewall = await async_client.dns.firewall.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            page=1,
-            per_page=1,
-        )
-        assert_matches_type(AsyncV4PagePaginationArray[Firewall], firewall, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.dns.firewall.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        firewall = await response.parse()
-        assert_matches_type(AsyncV4PagePaginationArray[Firewall], firewall, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.dns.firewall.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            firewall = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[Firewall], firewall, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.dns.firewall.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        firewall = await async_client.dns.firewall.delete(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[FirewallDeleteResponse], firewall, path=["response"])
-
-    @parametrize
-    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.dns.firewall.with_raw_response.delete(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        firewall = await response.parse()
-        assert_matches_type(Optional[FirewallDeleteResponse], firewall, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.dns.firewall.with_streaming_response.delete(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            firewall = await response.parse()
-            assert_matches_type(Optional[FirewallDeleteResponse], firewall, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.dns.firewall.with_raw_response.delete(
-                dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
-            await async_client.dns.firewall.with_raw_response.delete(
-                dns_firewall_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
-        firewall = await async_client.dns.firewall.edit(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            deprecate_any_requests=True,
-            dns_firewall_ips=["203.0.113.1", "203.0.113.254", "2001:DB8:AB::CF", "2001:DB8:CD::CF"],
-            ecs_fallback=False,
-            maximum_cache_ttl=900,
-            minimum_cache_ttl=60,
-            name="My Awesome DNS Firewall cluster",
-            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-        )
-        assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-    @parametrize
-    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        firewall = await async_client.dns.firewall.edit(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            deprecate_any_requests=True,
-            dns_firewall_ips=["203.0.113.1", "203.0.113.254", "2001:DB8:AB::CF", "2001:DB8:CD::CF"],
-            ecs_fallback=False,
-            maximum_cache_ttl=900,
-            minimum_cache_ttl=60,
-            name="My Awesome DNS Firewall cluster",
-            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-            attack_mitigation={
-                "enabled": True,
-                "only_when_upstream_unhealthy": False,
-            },
-            negative_cache_ttl=900,
-            ratelimit=600,
-            retries=2,
-        )
-        assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.dns.firewall.with_raw_response.edit(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            deprecate_any_requests=True,
-            dns_firewall_ips=["203.0.113.1", "203.0.113.254", "2001:DB8:AB::CF", "2001:DB8:CD::CF"],
-            ecs_fallback=False,
-            maximum_cache_ttl=900,
-            minimum_cache_ttl=60,
-            name="My Awesome DNS Firewall cluster",
-            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        firewall = await response.parse()
-        assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.dns.firewall.with_streaming_response.edit(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            deprecate_any_requests=True,
-            dns_firewall_ips=["203.0.113.1", "203.0.113.254", "2001:DB8:AB::CF", "2001:DB8:CD::CF"],
-            ecs_fallback=False,
-            maximum_cache_ttl=900,
-            minimum_cache_ttl=60,
-            name="My Awesome DNS Firewall cluster",
-            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            firewall = await response.parse()
-            assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.dns.firewall.with_raw_response.edit(
-                dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                id="023e105f4ecef8ad9ca31a8372d0c353",
-                deprecate_any_requests=True,
-                dns_firewall_ips=["203.0.113.1", "203.0.113.254", "2001:DB8:AB::CF", "2001:DB8:CD::CF"],
-                ecs_fallback=False,
-                maximum_cache_ttl=900,
-                minimum_cache_ttl=60,
-                name="My Awesome DNS Firewall cluster",
-                upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
-            await async_client.dns.firewall.with_raw_response.edit(
-                dns_firewall_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="023e105f4ecef8ad9ca31a8372d0c353",
-                deprecate_any_requests=True,
-                dns_firewall_ips=["203.0.113.1", "203.0.113.254", "2001:DB8:AB::CF", "2001:DB8:CD::CF"],
-                ecs_fallback=False,
-                maximum_cache_ttl=900,
-                minimum_cache_ttl=60,
-                name="My Awesome DNS Firewall cluster",
-                upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
-            )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        firewall = await async_client.dns.firewall.get(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.dns.firewall.with_raw_response.get(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        firewall = await response.parse()
-        assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.dns.firewall.with_streaming_response.get(
-            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            firewall = await response.parse()
-            assert_matches_type(Optional[Firewall], firewall, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.dns.firewall.with_raw_response.get(
-                dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
-            await async_client.dns.firewall.with_raw_response.get(
-                dns_firewall_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
diff --git a/tests/api_resources/dns/test_records.py b/tests/api_resources/dns/test_records.py
index 532f10ae713..fe95acaeafd 100644
--- a/tests/api_resources/dns/test_records.py
+++ b/tests/api_resources/dns/test_records.py
@@ -10,12 +10,17 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.types.dns import (
-    Record,
+    RecordResponse,
     RecordScanResponse,
+    RecordBatchResponse,
     RecordDeleteResponse,
     RecordImportResponse,
+    RecordScanReviewResponse,
+    RecordScanTriggerResponse,
 )
-from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+
+# pyright: reportDeprecated=false
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -28,57 +33,60 @@ class TestRecords:
     def test_method_create_overload_1(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
             comment="Domain verification record",
-            proxied=False,
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            content="198.51.100.4",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_1(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -88,8 +96,8 @@ def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                content="198.51.100.4",
                 name="example.com",
+                ttl=3600,
                 type="A",
             )
 
@@ -98,57 +106,60 @@ def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
     def test_method_create_overload_2(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
             comment="Domain verification record",
-            proxied=False,
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            content="2400:cb00:2049::1",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -158,8 +169,8 @@ def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                content="2400:cb00:2049::1",
                 name="example.com",
+                ttl=3600,
                 type="AAAA",
             )
 
@@ -168,60 +179,61 @@ def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
     def test_method_create_overload_3(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CAA",
+            ttl=3600,
+            type="CNAME",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_3(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "flags": 1,
-                "tag": "issue",
-                "value": "value",
-            },
             name="example.com",
-            type="CAA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="CNAME",
+            comment="Domain verification record",
+            content="content",
+            proxied=True,
+            settings={
+                "flatten_cname": True,
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_3(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CAA",
+            ttl=3600,
+            type="CNAME",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_3(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CAA",
+            ttl=3600,
+            type="CNAME",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -231,9 +243,9 @@ def test_path_params_create_overload_3(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="CAA",
+                ttl=3600,
+                type="CNAME",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -241,61 +253,61 @@ def test_path_params_create_overload_3(self, client: Cloudflare) -> None:
     def test_method_create_overload_4(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CERT",
+            ttl=3600,
+            type="MX",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_4(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 8,
-                "certificate": "certificate",
-                "key_tag": 1,
-                "type": 9,
-            },
             name="example.com",
-            type="CERT",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="MX",
+            comment="Domain verification record",
+            content="mx.example.com",
+            priority=10,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_4(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CERT",
+            ttl=3600,
+            type="MX",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_4(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CERT",
+            ttl=3600,
+            type="MX",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -305,9 +317,9 @@ def test_path_params_create_overload_4(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="CERT",
+                ttl=3600,
+                type="MX",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -315,57 +327,60 @@ def test_path_params_create_overload_4(self, client: Cloudflare) -> None:
     def test_method_create_overload_5(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
+            ttl=3600,
+            type="NS",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_5(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            proxied=False,
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="NS",
+            comment="Domain verification record",
+            content="ns1.example.com",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_5(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
+            ttl=3600,
+            type="NS",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_5(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
+            ttl=3600,
+            type="NS",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -375,9 +390,9 @@ def test_path_params_create_overload_5(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                content={},
                 name="example.com",
-                type="CNAME",
+                ttl=3600,
+                type="NS",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -385,61 +400,60 @@ def test_path_params_create_overload_5(self, client: Cloudflare) -> None:
     def test_method_create_overload_6(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DNSKEY",
+            ttl=3600,
+            type="OPENPGPKEY",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_6(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 5,
-                "flags": 1,
-                "protocol": 3,
-                "public_key": "public_key",
-            },
             name="example.com",
-            type="DNSKEY",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="OPENPGPKEY",
+            comment="Domain verification record",
+            content="content",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_6(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DNSKEY",
+            ttl=3600,
+            type="OPENPGPKEY",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_6(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DNSKEY",
+            ttl=3600,
+            type="OPENPGPKEY",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -449,9 +463,9 @@ def test_path_params_create_overload_6(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="DNSKEY",
+                ttl=3600,
+                type="OPENPGPKEY",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -459,61 +473,60 @@ def test_path_params_create_overload_6(self, client: Cloudflare) -> None:
     def test_method_create_overload_7(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DS",
+            ttl=3600,
+            type="PTR",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_7(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 3,
-                "digest": "digest",
-                "digest_type": 1,
-                "key_tag": 1,
-            },
             name="example.com",
-            type="DS",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="PTR",
+            comment="Domain verification record",
+            content="example.com",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_7(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DS",
+            ttl=3600,
+            type="PTR",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_7(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DS",
+            ttl=3600,
+            type="PTR",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -523,9 +536,9 @@ def test_path_params_create_overload_7(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="DS",
+                ttl=3600,
+                type="PTR",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -533,60 +546,60 @@ def test_path_params_create_overload_7(self, client: Cloudflare) -> None:
     def test_method_create_overload_8(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="HTTPS",
+            ttl=3600,
+            type="TXT",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_8(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "priority": 1,
-                "target": ".",
-                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
-            },
             name="example.com",
-            type="HTTPS",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="TXT",
+            comment="Domain verification record",
+            content='"v=spf1 include:example.com -all"',
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_8(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="HTTPS",
+            ttl=3600,
+            type="TXT",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_8(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="HTTPS",
+            ttl=3600,
+            type="TXT",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -596,9 +609,9 @@ def test_path_params_create_overload_8(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="HTTPS",
+                ttl=3600,
+                type="TXT",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -606,69 +619,64 @@ def test_path_params_create_overload_8(self, client: Cloudflare) -> None:
     def test_method_create_overload_9(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="LOC",
+            ttl=3600,
+            type="CAA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_9(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "altitude": 0,
-                "lat_degrees": 37,
-                "lat_direction": "N",
-                "lat_minutes": 46,
-                "lat_seconds": 46,
-                "long_degrees": 122,
-                "long_direction": "W",
-                "long_minutes": 23,
-                "long_seconds": 35,
-                "precision_horz": 0,
-                "precision_vert": 0,
-                "size": 100,
-            },
             name="example.com",
-            type="LOC",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="CAA",
+            comment="Domain verification record",
+            data={
+                "flags": 1,
+                "tag": "issue",
+                "value": "value",
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_9(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="LOC",
+            ttl=3600,
+            type="CAA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_9(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="LOC",
+            ttl=3600,
+            type="CAA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -678,9 +686,9 @@ def test_path_params_create_overload_9(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="LOC",
+                ttl=3600,
+                type="CAA",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -688,60 +696,65 @@ def test_path_params_create_overload_9(self, client: Cloudflare) -> None:
     def test_method_create_overload_10(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
+            ttl=3600,
+            type="CERT",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_10(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="CERT",
+            comment="Domain verification record",
+            data={
+                "algorithm": 8,
+                "certificate": "certificate",
+                "key_tag": 1,
+                "type": 9,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_10(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
+            ttl=3600,
+            type="CERT",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_10(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
+            ttl=3600,
+            type="CERT",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -751,10 +764,9 @@ def test_path_params_create_overload_10(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                content="mx.example.com",
                 name="example.com",
-                priority=10,
-                type="MX",
+                ttl=3600,
+                type="CERT",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -762,63 +774,65 @@ def test_path_params_create_overload_10(self, client: Cloudflare) -> None:
     def test_method_create_overload_11(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="NAPTR",
+            ttl=3600,
+            type="DNSKEY",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_11(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "flags": "flags",
-                "order": 100,
-                "preference": 10,
-                "regex": "regex",
-                "replacement": "replacement",
-                "service": "service",
-            },
             name="example.com",
-            type="NAPTR",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="DNSKEY",
+            comment="Domain verification record",
+            data={
+                "algorithm": 5,
+                "flags": 1,
+                "protocol": 3,
+                "public_key": "public_key",
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_11(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="NAPTR",
+            ttl=3600,
+            type="DNSKEY",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_11(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="NAPTR",
+            ttl=3600,
+            type="DNSKEY",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -828,9 +842,9 @@ def test_path_params_create_overload_11(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="NAPTR",
+                ttl=3600,
+                type="DNSKEY",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -838,56 +852,65 @@ def test_path_params_create_overload_11(self, client: Cloudflare) -> None:
     def test_method_create_overload_12(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
+            ttl=3600,
+            type="DS",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_12(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
-        )
-        assert_matches_type(Optional[Record], record, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_raw_response_create_overload_12(self, client: Cloudflare) -> None:
-        response = client.dns.records.with_raw_response.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
+            type="DS",
+            comment="Domain verification record",
+            data={
+                "algorithm": 3,
+                "digest": "digest",
+                "digest_type": 1,
+                "key_tag": 1,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
+        )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_create_overload_12(self, client: Cloudflare) -> None:
+        response = client.dns.records.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="example.com",
-            type="NS",
+            ttl=3600,
+            type="DS",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_12(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
+            ttl=3600,
+            type="DS",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -897,9 +920,9 @@ def test_path_params_create_overload_12(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                content="ns1.example.com",
                 name="example.com",
-                type="NS",
+                ttl=3600,
+                type="DS",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -907,56 +930,64 @@ def test_path_params_create_overload_12(self, client: Cloudflare) -> None:
     def test_method_create_overload_13(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
+            ttl=3600,
+            type="HTTPS",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_13(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="HTTPS",
+            comment="Domain verification record",
+            data={
+                "priority": 1,
+                "target": ".",
+                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_13(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
+            ttl=3600,
+            type="HTTPS",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_13(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
+            ttl=3600,
+            type="HTTPS",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -966,9 +997,9 @@ def test_path_params_create_overload_13(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                content="example.com",
                 name="example.com",
-                type="PTR",
+                ttl=3600,
+                type="HTTPS",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -976,61 +1007,73 @@ def test_path_params_create_overload_13(self, client: Cloudflare) -> None:
     def test_method_create_overload_14(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SMIMEA",
+            ttl=3600,
+            type="LOC",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_14(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "certificate": "certificate",
-                "matching_type": 0,
-                "selector": 0,
-                "usage": 3,
-            },
             name="example.com",
-            type="SMIMEA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="LOC",
+            comment="Domain verification record",
+            data={
+                "altitude": 0,
+                "lat_degrees": 37,
+                "lat_direction": "N",
+                "lat_minutes": 46,
+                "lat_seconds": 46,
+                "long_degrees": 122,
+                "long_direction": "W",
+                "long_minutes": 23,
+                "long_seconds": 35,
+                "precision_horz": 0,
+                "precision_vert": 0,
+                "size": 100,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_14(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SMIMEA",
+            ttl=3600,
+            type="LOC",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_14(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SMIMEA",
+            ttl=3600,
+            type="LOC",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1040,9 +1083,9 @@ def test_path_params_create_overload_14(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="SMIMEA",
+                ttl=3600,
+                type="LOC",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -1050,64 +1093,67 @@ def test_path_params_create_overload_14(self, client: Cloudflare) -> None:
     def test_method_create_overload_15(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
-            name="_sip._tcp.example.com",
-            type="SRV",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_15(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
+            comment="Domain verification record",
             data={
-                "name": "example.com",
-                "port": 8806,
-                "priority": 10,
-                "proto": "_tcp",
-                "service": "_sip",
-                "target": "example.com",
-                "weight": 5,
+                "flags": "flags",
+                "order": 100,
+                "preference": 10,
+                "regex": "regex",
+                "replacement": "replacement",
+                "service": "service",
             },
-            name="_sip._tcp.example.com",
-            type="SRV",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_15(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
-            name="_sip._tcp.example.com",
-            type="SRV",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_15(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
-            name="_sip._tcp.example.com",
-            type="SRV",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1117,9 +1163,9 @@ def test_path_params_create_overload_15(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
-                name="_sip._tcp.example.com",
-                type="SRV",
+                name="example.com",
+                ttl=3600,
+                type="NAPTR",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -1127,60 +1173,65 @@ def test_path_params_create_overload_15(self, client: Cloudflare) -> None:
     def test_method_create_overload_16(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SSHFP",
+            ttl=3600,
+            type="SMIMEA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_16(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 2,
-                "fingerprint": "fingerprint",
-                "type": 1,
-            },
             name="example.com",
-            type="SSHFP",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SMIMEA",
+            comment="Domain verification record",
+            data={
+                "certificate": "certificate",
+                "matching_type": 0,
+                "selector": 0,
+                "usage": 3,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_16(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SSHFP",
+            ttl=3600,
+            type="SMIMEA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_16(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SSHFP",
+            ttl=3600,
+            type="SMIMEA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1190,9 +1241,9 @@ def test_path_params_create_overload_16(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="SSHFP",
+                ttl=3600,
+                type="SMIMEA",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -1200,60 +1251,65 @@ def test_path_params_create_overload_16(self, client: Cloudflare) -> None:
     def test_method_create_overload_17(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SVCB",
+            ttl=3600,
+            type="SRV",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_17(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "priority": 1,
-                "target": ".",
-                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
-            },
             name="example.com",
-            type="SVCB",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SRV",
+            comment="Domain verification record",
+            data={
+                "port": 8806,
+                "priority": 10,
+                "target": "example.com",
+                "weight": 5,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_17(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SVCB",
+            ttl=3600,
+            type="SRV",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_17(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SVCB",
+            ttl=3600,
+            type="SRV",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1263,9 +1319,9 @@ def test_path_params_create_overload_17(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="SVCB",
+                ttl=3600,
+                type="SRV",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -1273,61 +1329,64 @@ def test_path_params_create_overload_17(self, client: Cloudflare) -> None:
     def test_method_create_overload_18(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="TLSA",
+            ttl=3600,
+            type="SSHFP",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_18(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "certificate": "certificate",
-                "matching_type": 1,
-                "selector": 0,
-                "usage": 0,
-            },
             name="example.com",
-            type="TLSA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SSHFP",
+            comment="Domain verification record",
+            data={
+                "algorithm": 2,
+                "fingerprint": "fingerprint",
+                "type": 1,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_18(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="TLSA",
+            ttl=3600,
+            type="SSHFP",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_18(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="TLSA",
+            ttl=3600,
+            type="SSHFP",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1337,9 +1396,9 @@ def test_path_params_create_overload_18(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="TLSA",
+                ttl=3600,
+                type="SSHFP",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -1347,56 +1406,64 @@ def test_path_params_create_overload_18(self, client: Cloudflare) -> None:
     def test_method_create_overload_19(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
+            ttl=3600,
+            type="SVCB",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_19(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SVCB",
+            comment="Domain verification record",
+            data={
+                "priority": 1,
+                "target": ".",
+                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_19(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
+            ttl=3600,
+            type="SVCB",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_19(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
+            ttl=3600,
+            type="SVCB",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1406,9 +1473,9 @@ def test_path_params_create_overload_19(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                content="example text content",
                 name="example.com",
-                type="TXT",
+                ttl=3600,
+                type="SVCB",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -1416,63 +1483,65 @@ def test_path_params_create_overload_19(self, client: Cloudflare) -> None:
     def test_method_create_overload_20(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            priority=10,
-            type="URI",
+            ttl=3600,
+            type="TLSA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params_overload_20(self, client: Cloudflare) -> None:
         record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "target": "http://example.com/example.html",
-                "weight": 20,
-            },
             name="example.com",
-            priority=10,
-            type="URI",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="TLSA",
+            comment="Domain verification record",
+            data={
+                "certificate": "certificate",
+                "matching_type": 1,
+                "selector": 0,
+                "usage": 0,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create_overload_20(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            priority=10,
-            type="URI",
+            ttl=3600,
+            type="TLSA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create_overload_20(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            priority=10,
-            type="URI",
+            ttl=3600,
+            type="TLSA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1482,23 +1551,99 @@ def test_path_params_create_overload_20(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                priority=10,
-                type="URI",
+                ttl=3600,
+                type="TLSA",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_overload_1(self, client: Cloudflare) -> None:
-        record = client.dns.records.update(
-            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+    def test_method_create_overload_21(self, client: Cloudflare) -> None:
+        record = client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
+            type="URI",
+        )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_create_with_all_params_overload_21(self, client: Cloudflare) -> None:
+        record = client.dns.records.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="URI",
+            comment="Domain verification record",
+            data={
+                "target": "http://example.com/example.html",
+                "weight": 20,
+            },
+            priority=10,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
+        )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_create_overload_21(self, client: Cloudflare) -> None:
+        response = client.dns.records.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="URI",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        record = response.parse()
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_create_overload_21(self, client: Cloudflare) -> None:
+        with client.dns.records.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="URI",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            record = response.parse()
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_create_overload_21(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.dns.records.with_raw_response.create(
+                zone_id="",
+                name="example.com",
+                ttl=3600,
+                type="URI",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_overload_1(self, client: Cloudflare) -> None:
+        record = client.dns.records.update(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
             type="A",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1506,16 +1651,19 @@ def test_method_update_with_all_params_overload_1(self, client: Cloudflare) -> N
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
             comment="Domain verification record",
-            proxied=False,
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            content="198.51.100.4",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1523,15 +1671,15 @@ def test_raw_response_update_overload_1(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1539,15 +1687,15 @@ def test_streaming_response_update_overload_1(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1558,8 +1706,8 @@ def test_path_params_update_overload_1(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="198.51.100.4",
                 name="example.com",
+                ttl=3600,
                 type="A",
             )
 
@@ -1567,8 +1715,8 @@ def test_path_params_update_overload_1(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="198.51.100.4",
                 name="example.com",
+                ttl=3600,
                 type="A",
             )
 
@@ -1578,11 +1726,11 @@ def test_method_update_overload_2(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1590,16 +1738,19 @@ def test_method_update_with_all_params_overload_2(self, client: Cloudflare) -> N
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
             comment="Domain verification record",
-            proxied=False,
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            content="2400:cb00:2049::1",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1607,15 +1758,15 @@ def test_raw_response_update_overload_2(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1623,15 +1774,15 @@ def test_streaming_response_update_overload_2(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1642,8 +1793,8 @@ def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="2400:cb00:2049::1",
                 name="example.com",
+                ttl=3600,
                 type="AAAA",
             )
 
@@ -1651,8 +1802,8 @@ def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="2400:cb00:2049::1",
                 name="example.com",
+                ttl=3600,
                 type="AAAA",
             )
 
@@ -1662,11 +1813,11 @@ def test_method_update_overload_3(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CAA",
+            ttl=3600,
+            type="CNAME",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1674,19 +1825,20 @@ def test_method_update_with_all_params_overload_3(self, client: Cloudflare) -> N
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "flags": 1,
-                "tag": "issue",
-                "value": "value",
-            },
             name="example.com",
-            type="CAA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="CNAME",
+            comment="Domain verification record",
+            content="content",
+            proxied=True,
+            settings={
+                "flatten_cname": True,
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1694,15 +1846,15 @@ def test_raw_response_update_overload_3(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CAA",
+            ttl=3600,
+            type="CNAME",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1710,15 +1862,15 @@ def test_streaming_response_update_overload_3(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CAA",
+            ttl=3600,
+            type="CNAME",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1729,18 +1881,18 @@ def test_path_params_update_overload_3(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="CAA",
+                ttl=3600,
+                type="CNAME",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="CAA",
+                ttl=3600,
+                type="CNAME",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -1749,11 +1901,11 @@ def test_method_update_overload_4(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CERT",
+            ttl=3600,
+            type="MX",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1761,20 +1913,20 @@ def test_method_update_with_all_params_overload_4(self, client: Cloudflare) -> N
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 8,
-                "certificate": "certificate",
-                "key_tag": 1,
-                "type": 9,
-            },
             name="example.com",
-            type="CERT",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="MX",
+            comment="Domain verification record",
+            content="mx.example.com",
+            priority=10,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1782,15 +1934,15 @@ def test_raw_response_update_overload_4(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CERT",
+            ttl=3600,
+            type="MX",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1798,15 +1950,15 @@ def test_streaming_response_update_overload_4(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CERT",
+            ttl=3600,
+            type="MX",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1817,18 +1969,18 @@ def test_path_params_update_overload_4(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="CERT",
+                ttl=3600,
+                type="MX",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="CERT",
+                ttl=3600,
+                type="MX",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -1837,11 +1989,11 @@ def test_method_update_overload_5(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
+            ttl=3600,
+            type="NS",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1849,16 +2001,19 @@ def test_method_update_with_all_params_overload_5(self, client: Cloudflare) -> N
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            proxied=False,
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="NS",
+            comment="Domain verification record",
+            content="ns1.example.com",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1866,15 +2021,15 @@ def test_raw_response_update_overload_5(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
+            ttl=3600,
+            type="NS",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1882,15 +2037,15 @@ def test_streaming_response_update_overload_5(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
+            ttl=3600,
+            type="NS",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1901,18 +2056,18 @@ def test_path_params_update_overload_5(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content={},
                 name="example.com",
-                type="CNAME",
+                ttl=3600,
+                type="NS",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content={},
                 name="example.com",
-                type="CNAME",
+                ttl=3600,
+                type="NS",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -1921,11 +2076,11 @@ def test_method_update_overload_6(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DNSKEY",
+            ttl=3600,
+            type="OPENPGPKEY",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1933,20 +2088,19 @@ def test_method_update_with_all_params_overload_6(self, client: Cloudflare) -> N
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 5,
-                "flags": 1,
-                "protocol": 3,
-                "public_key": "public_key",
-            },
             name="example.com",
-            type="DNSKEY",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="OPENPGPKEY",
+            comment="Domain verification record",
+            content="content",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1954,15 +2108,15 @@ def test_raw_response_update_overload_6(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DNSKEY",
+            ttl=3600,
+            type="OPENPGPKEY",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1970,15 +2124,15 @@ def test_streaming_response_update_overload_6(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DNSKEY",
+            ttl=3600,
+            type="OPENPGPKEY",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1989,18 +2143,18 @@ def test_path_params_update_overload_6(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="DNSKEY",
+                ttl=3600,
+                type="OPENPGPKEY",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="DNSKEY",
+                ttl=3600,
+                type="OPENPGPKEY",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -2009,11 +2163,11 @@ def test_method_update_overload_7(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DS",
+            ttl=3600,
+            type="PTR",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2021,20 +2175,19 @@ def test_method_update_with_all_params_overload_7(self, client: Cloudflare) -> N
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 3,
-                "digest": "digest",
-                "digest_type": 1,
-                "key_tag": 1,
-            },
             name="example.com",
-            type="DS",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="PTR",
+            comment="Domain verification record",
+            content="example.com",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2042,15 +2195,15 @@ def test_raw_response_update_overload_7(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DS",
+            ttl=3600,
+            type="PTR",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2058,15 +2211,15 @@ def test_streaming_response_update_overload_7(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DS",
+            ttl=3600,
+            type="PTR",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -2077,18 +2230,18 @@ def test_path_params_update_overload_7(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="DS",
+                ttl=3600,
+                type="PTR",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="DS",
+                ttl=3600,
+                type="PTR",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -2097,11 +2250,11 @@ def test_method_update_overload_8(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="HTTPS",
+            ttl=3600,
+            type="TXT",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2109,19 +2262,19 @@ def test_method_update_with_all_params_overload_8(self, client: Cloudflare) -> N
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "priority": 1,
-                "target": ".",
-                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
-            },
             name="example.com",
-            type="HTTPS",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="TXT",
+            comment="Domain verification record",
+            content='"v=spf1 include:example.com -all"',
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2129,15 +2282,15 @@ def test_raw_response_update_overload_8(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="HTTPS",
+            ttl=3600,
+            type="TXT",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2145,15 +2298,15 @@ def test_streaming_response_update_overload_8(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="HTTPS",
+            ttl=3600,
+            type="TXT",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -2164,18 +2317,18 @@ def test_path_params_update_overload_8(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="HTTPS",
+                ttl=3600,
+                type="TXT",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="HTTPS",
+                ttl=3600,
+                type="TXT",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -2184,11 +2337,11 @@ def test_method_update_overload_9(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="LOC",
+            ttl=3600,
+            type="CAA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2196,28 +2349,23 @@ def test_method_update_with_all_params_overload_9(self, client: Cloudflare) -> N
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "altitude": 0,
-                "lat_degrees": 37,
-                "lat_direction": "N",
-                "lat_minutes": 46,
-                "lat_seconds": 46,
-                "long_degrees": 122,
-                "long_direction": "W",
-                "long_minutes": 23,
-                "long_seconds": 35,
-                "precision_horz": 0,
-                "precision_vert": 0,
-                "size": 100,
-            },
             name="example.com",
-            type="LOC",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="CAA",
+            comment="Domain verification record",
+            data={
+                "flags": 1,
+                "tag": "issue",
+                "value": "value",
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2225,15 +2373,15 @@ def test_raw_response_update_overload_9(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="LOC",
+            ttl=3600,
+            type="CAA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2241,15 +2389,15 @@ def test_streaming_response_update_overload_9(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="LOC",
+            ttl=3600,
+            type="CAA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -2260,18 +2408,18 @@ def test_path_params_update_overload_9(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="LOC",
+                ttl=3600,
+                type="CAA",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="LOC",
+                ttl=3600,
+                type="CAA",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -2280,12 +2428,11 @@ def test_method_update_overload_10(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
+            ttl=3600,
+            type="CERT",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2293,16 +2440,24 @@ def test_method_update_with_all_params_overload_10(self, client: Cloudflare) ->
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="CERT",
+            comment="Domain verification record",
+            data={
+                "algorithm": 8,
+                "certificate": "certificate",
+                "key_tag": 1,
+                "type": 9,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2310,16 +2465,15 @@ def test_raw_response_update_overload_10(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
+            ttl=3600,
+            type="CERT",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2327,16 +2481,15 @@ def test_streaming_response_update_overload_10(self, client: Cloudflare) -> None
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
+            ttl=3600,
+            type="CERT",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -2347,20 +2500,18 @@ def test_path_params_update_overload_10(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="mx.example.com",
                 name="example.com",
-                priority=10,
-                type="MX",
+                ttl=3600,
+                type="CERT",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="mx.example.com",
                 name="example.com",
-                priority=10,
-                type="MX",
+                ttl=3600,
+                type="CERT",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -2369,11 +2520,11 @@ def test_method_update_overload_11(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="NAPTR",
+            ttl=3600,
+            type="DNSKEY",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2381,22 +2532,24 @@ def test_method_update_with_all_params_overload_11(self, client: Cloudflare) ->
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "flags": "flags",
-                "order": 100,
-                "preference": 10,
-                "regex": "regex",
-                "replacement": "replacement",
-                "service": "service",
-            },
             name="example.com",
-            type="NAPTR",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="DNSKEY",
+            comment="Domain verification record",
+            data={
+                "algorithm": 5,
+                "flags": 1,
+                "protocol": 3,
+                "public_key": "public_key",
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2404,15 +2557,15 @@ def test_raw_response_update_overload_11(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="NAPTR",
+            ttl=3600,
+            type="DNSKEY",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2420,15 +2573,15 @@ def test_streaming_response_update_overload_11(self, client: Cloudflare) -> None
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="NAPTR",
+            ttl=3600,
+            type="DNSKEY",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -2439,18 +2592,18 @@ def test_path_params_update_overload_11(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="NAPTR",
+                ttl=3600,
+                type="DNSKEY",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="NAPTR",
+                ttl=3600,
+                type="DNSKEY",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -2459,11 +2612,11 @@ def test_method_update_overload_12(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
+            ttl=3600,
+            type="DS",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2471,15 +2624,24 @@ def test_method_update_with_all_params_overload_12(self, client: Cloudflare) ->
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="DS",
+            comment="Domain verification record",
+            data={
+                "algorithm": 3,
+                "digest": "digest",
+                "digest_type": 1,
+                "key_tag": 1,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2487,15 +2649,15 @@ def test_raw_response_update_overload_12(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
+            ttl=3600,
+            type="DS",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2503,15 +2665,15 @@ def test_streaming_response_update_overload_12(self, client: Cloudflare) -> None
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
+            ttl=3600,
+            type="DS",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -2522,18 +2684,18 @@ def test_path_params_update_overload_12(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="ns1.example.com",
                 name="example.com",
-                type="NS",
+                ttl=3600,
+                type="DS",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="ns1.example.com",
                 name="example.com",
-                type="NS",
+                ttl=3600,
+                type="DS",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -2542,11 +2704,11 @@ def test_method_update_overload_13(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
+            ttl=3600,
+            type="HTTPS",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2554,15 +2716,23 @@ def test_method_update_with_all_params_overload_13(self, client: Cloudflare) ->
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="HTTPS",
+            comment="Domain verification record",
+            data={
+                "priority": 1,
+                "target": ".",
+                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2570,15 +2740,15 @@ def test_raw_response_update_overload_13(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
+            ttl=3600,
+            type="HTTPS",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2586,15 +2756,15 @@ def test_streaming_response_update_overload_13(self, client: Cloudflare) -> None
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
+            ttl=3600,
+            type="HTTPS",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -2605,18 +2775,18 @@ def test_path_params_update_overload_13(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="example.com",
                 name="example.com",
-                type="PTR",
+                ttl=3600,
+                type="HTTPS",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="example.com",
                 name="example.com",
-                type="PTR",
+                ttl=3600,
+                type="HTTPS",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -2625,11 +2795,11 @@ def test_method_update_overload_14(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SMIMEA",
+            ttl=3600,
+            type="LOC",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2637,20 +2807,32 @@ def test_method_update_with_all_params_overload_14(self, client: Cloudflare) ->
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "certificate": "certificate",
-                "matching_type": 0,
-                "selector": 0,
-                "usage": 3,
-            },
             name="example.com",
-            type="SMIMEA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="LOC",
+            comment="Domain verification record",
+            data={
+                "altitude": 0,
+                "lat_degrees": 37,
+                "lat_direction": "N",
+                "lat_minutes": 46,
+                "lat_seconds": 46,
+                "long_degrees": 122,
+                "long_direction": "W",
+                "long_minutes": 23,
+                "long_seconds": 35,
+                "precision_horz": 0,
+                "precision_vert": 0,
+                "size": 100,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2658,15 +2840,15 @@ def test_raw_response_update_overload_14(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SMIMEA",
+            ttl=3600,
+            type="LOC",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2674,15 +2856,15 @@ def test_streaming_response_update_overload_14(self, client: Cloudflare) -> None
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SMIMEA",
+            ttl=3600,
+            type="LOC",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -2693,18 +2875,18 @@ def test_path_params_update_overload_14(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="SMIMEA",
+                ttl=3600,
+                type="LOC",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="SMIMEA",
+                ttl=3600,
+                type="LOC",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -2713,11 +2895,11 @@ def test_method_update_overload_15(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
-            name="_sip._tcp.example.com",
-            type="SRV",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2725,23 +2907,26 @@ def test_method_update_with_all_params_overload_15(self, client: Cloudflare) ->
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
+            comment="Domain verification record",
             data={
-                "name": "example.com",
-                "port": 8806,
-                "priority": 10,
-                "proto": "_tcp",
-                "service": "_sip",
-                "target": "example.com",
-                "weight": 5,
+                "flags": "flags",
+                "order": 100,
+                "preference": 10,
+                "regex": "regex",
+                "replacement": "replacement",
+                "service": "service",
             },
-            name="_sip._tcp.example.com",
-            type="SRV",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2749,15 +2934,15 @@ def test_raw_response_update_overload_15(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
-            name="_sip._tcp.example.com",
-            type="SRV",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2765,15 +2950,15 @@ def test_streaming_response_update_overload_15(self, client: Cloudflare) -> None
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
-            name="_sip._tcp.example.com",
-            type="SRV",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -2784,18 +2969,18 @@ def test_path_params_update_overload_15(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
-                name="_sip._tcp.example.com",
-                type="SRV",
+                name="example.com",
+                ttl=3600,
+                type="NAPTR",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
-                name="_sip._tcp.example.com",
-                type="SRV",
+                name="example.com",
+                ttl=3600,
+                type="NAPTR",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -2804,11 +2989,11 @@ def test_method_update_overload_16(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SSHFP",
+            ttl=3600,
+            type="SMIMEA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2816,19 +3001,24 @@ def test_method_update_with_all_params_overload_16(self, client: Cloudflare) ->
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 2,
-                "fingerprint": "fingerprint",
-                "type": 1,
-            },
             name="example.com",
-            type="SSHFP",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SMIMEA",
+            comment="Domain verification record",
+            data={
+                "certificate": "certificate",
+                "matching_type": 0,
+                "selector": 0,
+                "usage": 3,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2836,15 +3026,15 @@ def test_raw_response_update_overload_16(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SSHFP",
+            ttl=3600,
+            type="SMIMEA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2852,15 +3042,15 @@ def test_streaming_response_update_overload_16(self, client: Cloudflare) -> None
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SSHFP",
+            ttl=3600,
+            type="SMIMEA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -2871,18 +3061,18 @@ def test_path_params_update_overload_16(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="SSHFP",
+                ttl=3600,
+                type="SMIMEA",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="SSHFP",
+                ttl=3600,
+                type="SMIMEA",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -2891,11 +3081,11 @@ def test_method_update_overload_17(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SVCB",
+            ttl=3600,
+            type="SRV",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2903,19 +3093,24 @@ def test_method_update_with_all_params_overload_17(self, client: Cloudflare) ->
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "priority": 1,
-                "target": ".",
-                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
-            },
             name="example.com",
-            type="SVCB",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SRV",
+            comment="Domain verification record",
+            data={
+                "port": 8806,
+                "priority": 10,
+                "target": "example.com",
+                "weight": 5,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2923,15 +3118,15 @@ def test_raw_response_update_overload_17(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SVCB",
+            ttl=3600,
+            type="SRV",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2939,15 +3134,15 @@ def test_streaming_response_update_overload_17(self, client: Cloudflare) -> None
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SVCB",
+            ttl=3600,
+            type="SRV",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -2958,18 +3153,18 @@ def test_path_params_update_overload_17(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="SVCB",
+                ttl=3600,
+                type="SRV",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="SVCB",
+                ttl=3600,
+                type="SRV",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -2978,11 +3173,11 @@ def test_method_update_overload_18(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="TLSA",
+            ttl=3600,
+            type="SSHFP",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2990,20 +3185,23 @@ def test_method_update_with_all_params_overload_18(self, client: Cloudflare) ->
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "certificate": "certificate",
-                "matching_type": 1,
-                "selector": 0,
-                "usage": 0,
-            },
             name="example.com",
-            type="TLSA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SSHFP",
+            comment="Domain verification record",
+            data={
+                "algorithm": 2,
+                "fingerprint": "fingerprint",
+                "type": 1,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3011,15 +3209,15 @@ def test_raw_response_update_overload_18(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="TLSA",
+            ttl=3600,
+            type="SSHFP",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3027,15 +3225,15 @@ def test_streaming_response_update_overload_18(self, client: Cloudflare) -> None
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="TLSA",
+            ttl=3600,
+            type="SSHFP",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -3046,18 +3244,18 @@ def test_path_params_update_overload_18(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="TLSA",
+                ttl=3600,
+                type="SSHFP",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="TLSA",
+                ttl=3600,
+                type="SSHFP",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -3066,11 +3264,11 @@ def test_method_update_overload_19(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
+            ttl=3600,
+            type="SVCB",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3078,15 +3276,23 @@ def test_method_update_with_all_params_overload_19(self, client: Cloudflare) ->
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SVCB",
+            comment="Domain verification record",
+            data={
+                "priority": 1,
+                "target": ".",
+                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3094,15 +3300,15 @@ def test_raw_response_update_overload_19(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
+            ttl=3600,
+            type="SVCB",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3110,15 +3316,15 @@ def test_streaming_response_update_overload_19(self, client: Cloudflare) -> None
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
+            ttl=3600,
+            type="SVCB",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -3129,18 +3335,18 @@ def test_path_params_update_overload_19(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="example text content",
                 name="example.com",
-                type="TXT",
+                ttl=3600,
+                type="SVCB",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="example text content",
                 name="example.com",
-                type="TXT",
+                ttl=3600,
+                type="SVCB",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -3149,12 +3355,11 @@ def test_method_update_overload_20(self, client: Cloudflare) -> None:
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            priority=10,
-            type="URI",
+            ttl=3600,
+            type="TLSA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3162,66 +3367,159 @@ def test_method_update_with_all_params_overload_20(self, client: Cloudflare) ->
         record = client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="TLSA",
+            comment="Domain verification record",
             data={
-                "target": "http://example.com/example.html",
-                "weight": 20,
+                "certificate": "certificate",
+                "matching_type": 1,
+                "selector": 0,
+                "usage": 0,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
             },
+            tags=["owner:dns-team"],
+        )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_update_overload_20(self, client: Cloudflare) -> None:
+        response = client.dns.records.with_raw_response.update(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="example.com",
-            priority=10,
+            ttl=3600,
+            type="TLSA",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        record = response.parse()
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_update_overload_20(self, client: Cloudflare) -> None:
+        with client.dns.records.with_streaming_response.update(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="TLSA",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            record = response.parse()
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_update_overload_20(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.dns.records.with_raw_response.update(
+                dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+                name="example.com",
+                ttl=3600,
+                type="TLSA",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
+            client.dns.records.with_raw_response.update(
+                dns_record_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="example.com",
+                ttl=3600,
+                type="TLSA",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_overload_21(self, client: Cloudflare) -> None:
+        record = client.dns.records.update(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
             type="URI",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
+        )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params_overload_21(self, client: Cloudflare) -> None:
+        record = client.dns.records.update(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
             ttl=3600,
+            type="URI",
+            comment="Domain verification record",
+            data={
+                "target": "http://example.com/example.html",
+                "weight": 20,
+            },
+            priority=10,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_raw_response_update_overload_20(self, client: Cloudflare) -> None:
+    def test_raw_response_update_overload_21(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            priority=10,
+            ttl=3600,
             type="URI",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_streaming_response_update_overload_20(self, client: Cloudflare) -> None:
+    def test_streaming_response_update_overload_21(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            priority=10,
+            ttl=3600,
             type="URI",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_path_params_update_overload_20(self, client: Cloudflare) -> None:
+    def test_path_params_update_overload_21(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                priority=10,
+                ttl=3600,
                 type="URI",
             )
 
@@ -3229,53 +3527,65 @@ def test_path_params_update_overload_20(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                priority=10,
+                ttl=3600,
                 type="URI",
             )
 
+    @pytest.mark.skip(reason="mock server returns invalid data")
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         record = client.dns.records.list(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncV4PagePaginationArray[Record], record, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[RecordResponse], record, path=["response"])
 
+    @pytest.mark.skip(reason="mock server returns invalid data")
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         record = client.dns.records.list(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             comment={
-                "present": "present",
                 "absent": "absent",
-                "exact": "Hello, world",
                 "contains": "ello, worl",
-                "startswith": "Hello, w",
                 "endswith": "o, world",
+                "exact": "Hello, world",
+                "present": "present",
+                "startswith": "Hello, w",
+            },
+            content={
+                "contains": "7.0.0.",
+                "endswith": ".0.1",
+                "exact": "127.0.0.1",
+                "startswith": "127.0.",
             },
-            content="127.0.0.1",
             direction="asc",
             match="any",
-            name="example.com",
+            name={
+                "contains": "w.example.",
+                "endswith": ".example.com",
+                "exact": "www.example.com",
+                "startswith": "www.example",
+            },
             order="type",
             page=1,
             per_page=5,
-            proxied=False,
+            proxied=True,
             search="www.cloudflare.com",
             tag={
-                "present": "important",
                 "absent": "important",
-                "exact": "greeting:Hello, world",
                 "contains": "greeting:ello, worl",
-                "startswith": "greeting:Hello, w",
                 "endswith": "greeting:o, world",
+                "exact": "greeting:Hello, world",
+                "present": "important",
+                "startswith": "greeting:Hello, w",
             },
             tag_match="any",
             type="A",
         )
-        assert_matches_type(SyncV4PagePaginationArray[Record], record, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[RecordResponse], record, path=["response"])
 
+    @pytest.mark.skip(reason="mock server returns invalid data")
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.list(
@@ -3285,8 +3595,9 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(SyncV4PagePaginationArray[Record], record, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[RecordResponse], record, path=["response"])
 
+    @pytest.mark.skip(reason="mock server returns invalid data")
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.list(
@@ -3296,10 +3607,11 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[Record], record, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="mock server returns invalid data")
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
@@ -3355,17 +3667,115 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_batch(self, client: Cloudflare) -> None:
+        record = client.dns.records.batch(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[RecordBatchResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_batch_with_all_params(self, client: Cloudflare) -> None:
+        record = client.dns.records.batch(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            deletes=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+            patches=[
+                {
+                    "name": "example.com",
+                    "ttl": 3600,
+                    "type": "A",
+                    "comment": "Domain verification record",
+                    "content": "198.51.100.4",
+                    "proxied": True,
+                    "settings": {
+                        "ipv4_only": True,
+                        "ipv6_only": True,
+                    },
+                    "tags": ["owner:dns-team"],
+                    "id": "023e105f4ecef8ad9ca31a8372d0c353",
+                }
+            ],
+            posts=[
+                {
+                    "name": "example.com",
+                    "ttl": 3600,
+                    "type": "A",
+                    "comment": "Domain verification record",
+                    "content": "198.51.100.4",
+                    "proxied": True,
+                    "settings": {
+                        "ipv4_only": True,
+                        "ipv6_only": True,
+                    },
+                    "tags": ["owner:dns-team"],
+                }
+            ],
+            puts=[
+                {
+                    "name": "example.com",
+                    "ttl": 3600,
+                    "type": "A",
+                    "comment": "Domain verification record",
+                    "content": "198.51.100.4",
+                    "proxied": True,
+                    "settings": {
+                        "ipv4_only": True,
+                        "ipv6_only": True,
+                    },
+                    "tags": ["owner:dns-team"],
+                    "id": "023e105f4ecef8ad9ca31a8372d0c353",
+                }
+            ],
+        )
+        assert_matches_type(Optional[RecordBatchResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_batch(self, client: Cloudflare) -> None:
+        response = client.dns.records.with_raw_response.batch(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        record = response.parse()
+        assert_matches_type(Optional[RecordBatchResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_batch(self, client: Cloudflare) -> None:
+        with client.dns.records.with_streaming_response.batch(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            record = response.parse()
+            assert_matches_type(Optional[RecordBatchResponse], record, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_batch(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.dns.records.with_raw_response.batch(
+                zone_id="",
+            )
+
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_edit_overload_1(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3373,16 +3783,19 @@ def test_method_edit_with_all_params_overload_1(self, client: Cloudflare) -> Non
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
             comment="Domain verification record",
-            proxied=False,
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            content="198.51.100.4",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3390,15 +3803,15 @@ def test_raw_response_edit_overload_1(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3406,15 +3819,15 @@ def test_streaming_response_edit_overload_1(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -3425,8 +3838,8 @@ def test_path_params_edit_overload_1(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="198.51.100.4",
                 name="example.com",
+                ttl=3600,
                 type="A",
             )
 
@@ -3434,8 +3847,8 @@ def test_path_params_edit_overload_1(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="198.51.100.4",
                 name="example.com",
+                ttl=3600,
                 type="A",
             )
 
@@ -3445,11 +3858,11 @@ def test_method_edit_overload_2(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3457,16 +3870,19 @@ def test_method_edit_with_all_params_overload_2(self, client: Cloudflare) -> Non
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
             comment="Domain verification record",
-            proxied=False,
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            content="2400:cb00:2049::1",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3474,15 +3890,15 @@ def test_raw_response_edit_overload_2(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3490,15 +3906,15 @@ def test_streaming_response_edit_overload_2(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -3509,8 +3925,8 @@ def test_path_params_edit_overload_2(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="2400:cb00:2049::1",
                 name="example.com",
+                ttl=3600,
                 type="AAAA",
             )
 
@@ -3518,8 +3934,8 @@ def test_path_params_edit_overload_2(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="2400:cb00:2049::1",
                 name="example.com",
+                ttl=3600,
                 type="AAAA",
             )
 
@@ -3529,11 +3945,11 @@ def test_method_edit_overload_3(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CAA",
+            ttl=3600,
+            type="CNAME",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3541,19 +3957,20 @@ def test_method_edit_with_all_params_overload_3(self, client: Cloudflare) -> Non
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "flags": 1,
-                "tag": "issue",
-                "value": "value",
-            },
             name="example.com",
-            type="CAA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="CNAME",
+            comment="Domain verification record",
+            content="content",
+            proxied=True,
+            settings={
+                "flatten_cname": True,
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3561,15 +3978,15 @@ def test_raw_response_edit_overload_3(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CAA",
+            ttl=3600,
+            type="CNAME",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3577,15 +3994,15 @@ def test_streaming_response_edit_overload_3(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CAA",
+            ttl=3600,
+            type="CNAME",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -3596,18 +4013,18 @@ def test_path_params_edit_overload_3(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="CAA",
+                ttl=3600,
+                type="CNAME",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="CAA",
+                ttl=3600,
+                type="CNAME",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -3616,11 +4033,11 @@ def test_method_edit_overload_4(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CERT",
+            ttl=3600,
+            type="MX",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3628,20 +4045,20 @@ def test_method_edit_with_all_params_overload_4(self, client: Cloudflare) -> Non
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 8,
-                "certificate": "certificate",
-                "key_tag": 1,
-                "type": 9,
-            },
             name="example.com",
-            type="CERT",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="MX",
+            comment="Domain verification record",
+            content="mx.example.com",
+            priority=10,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3649,15 +4066,15 @@ def test_raw_response_edit_overload_4(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CERT",
+            ttl=3600,
+            type="MX",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3665,15 +4082,15 @@ def test_streaming_response_edit_overload_4(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CERT",
+            ttl=3600,
+            type="MX",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -3684,18 +4101,18 @@ def test_path_params_edit_overload_4(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="CERT",
+                ttl=3600,
+                type="MX",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="CERT",
+                ttl=3600,
+                type="MX",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -3704,11 +4121,11 @@ def test_method_edit_overload_5(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
-        )
-        assert_matches_type(Optional[Record], record, path=["response"])
+            ttl=3600,
+            type="NS",
+        )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3716,16 +4133,19 @@ def test_method_edit_with_all_params_overload_5(self, client: Cloudflare) -> Non
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            proxied=False,
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="NS",
+            comment="Domain verification record",
+            content="ns1.example.com",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3733,15 +4153,15 @@ def test_raw_response_edit_overload_5(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
+            ttl=3600,
+            type="NS",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3749,15 +4169,15 @@ def test_streaming_response_edit_overload_5(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
+            ttl=3600,
+            type="NS",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -3768,18 +4188,18 @@ def test_path_params_edit_overload_5(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content={},
                 name="example.com",
-                type="CNAME",
+                ttl=3600,
+                type="NS",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content={},
                 name="example.com",
-                type="CNAME",
+                ttl=3600,
+                type="NS",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -3788,11 +4208,11 @@ def test_method_edit_overload_6(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DNSKEY",
+            ttl=3600,
+            type="OPENPGPKEY",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3800,20 +4220,19 @@ def test_method_edit_with_all_params_overload_6(self, client: Cloudflare) -> Non
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 5,
-                "flags": 1,
-                "protocol": 3,
-                "public_key": "public_key",
-            },
             name="example.com",
-            type="DNSKEY",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="OPENPGPKEY",
+            comment="Domain verification record",
+            content="content",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3821,15 +4240,15 @@ def test_raw_response_edit_overload_6(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DNSKEY",
+            ttl=3600,
+            type="OPENPGPKEY",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3837,15 +4256,15 @@ def test_streaming_response_edit_overload_6(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DNSKEY",
+            ttl=3600,
+            type="OPENPGPKEY",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -3856,18 +4275,18 @@ def test_path_params_edit_overload_6(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="DNSKEY",
+                ttl=3600,
+                type="OPENPGPKEY",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="DNSKEY",
+                ttl=3600,
+                type="OPENPGPKEY",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -3876,11 +4295,11 @@ def test_method_edit_overload_7(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DS",
+            ttl=3600,
+            type="PTR",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3888,20 +4307,19 @@ def test_method_edit_with_all_params_overload_7(self, client: Cloudflare) -> Non
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 3,
-                "digest": "digest",
-                "digest_type": 1,
-                "key_tag": 1,
-            },
             name="example.com",
-            type="DS",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="PTR",
+            comment="Domain verification record",
+            content="example.com",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3909,15 +4327,15 @@ def test_raw_response_edit_overload_7(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DS",
+            ttl=3600,
+            type="PTR",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3925,15 +4343,15 @@ def test_streaming_response_edit_overload_7(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DS",
+            ttl=3600,
+            type="PTR",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -3944,18 +4362,18 @@ def test_path_params_edit_overload_7(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="DS",
+                ttl=3600,
+                type="PTR",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="DS",
+                ttl=3600,
+                type="PTR",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -3964,11 +4382,11 @@ def test_method_edit_overload_8(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="HTTPS",
+            ttl=3600,
+            type="TXT",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3976,19 +4394,19 @@ def test_method_edit_with_all_params_overload_8(self, client: Cloudflare) -> Non
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "priority": 1,
-                "target": ".",
-                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
-            },
             name="example.com",
-            type="HTTPS",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="TXT",
+            comment="Domain verification record",
+            content='"v=spf1 include:example.com -all"',
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3996,15 +4414,15 @@ def test_raw_response_edit_overload_8(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="HTTPS",
+            ttl=3600,
+            type="TXT",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4012,15 +4430,15 @@ def test_streaming_response_edit_overload_8(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="HTTPS",
+            ttl=3600,
+            type="TXT",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -4031,18 +4449,18 @@ def test_path_params_edit_overload_8(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="HTTPS",
+                ttl=3600,
+                type="TXT",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="HTTPS",
+                ttl=3600,
+                type="TXT",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -4051,11 +4469,11 @@ def test_method_edit_overload_9(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="LOC",
+            ttl=3600,
+            type="CAA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4063,28 +4481,23 @@ def test_method_edit_with_all_params_overload_9(self, client: Cloudflare) -> Non
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "altitude": 0,
-                "lat_degrees": 37,
-                "lat_direction": "N",
-                "lat_minutes": 46,
-                "lat_seconds": 46,
-                "long_degrees": 122,
-                "long_direction": "W",
-                "long_minutes": 23,
-                "long_seconds": 35,
-                "precision_horz": 0,
-                "precision_vert": 0,
-                "size": 100,
-            },
             name="example.com",
-            type="LOC",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="CAA",
+            comment="Domain verification record",
+            data={
+                "flags": 1,
+                "tag": "issue",
+                "value": "value",
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4092,15 +4505,15 @@ def test_raw_response_edit_overload_9(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="LOC",
+            ttl=3600,
+            type="CAA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4108,15 +4521,15 @@ def test_streaming_response_edit_overload_9(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="LOC",
+            ttl=3600,
+            type="CAA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -4127,18 +4540,18 @@ def test_path_params_edit_overload_9(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="LOC",
+                ttl=3600,
+                type="CAA",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="LOC",
+                ttl=3600,
+                type="CAA",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -4147,12 +4560,11 @@ def test_method_edit_overload_10(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
+            ttl=3600,
+            type="CERT",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4160,16 +4572,24 @@ def test_method_edit_with_all_params_overload_10(self, client: Cloudflare) -> No
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="CERT",
+            comment="Domain verification record",
+            data={
+                "algorithm": 8,
+                "certificate": "certificate",
+                "key_tag": 1,
+                "type": 9,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4177,16 +4597,15 @@ def test_raw_response_edit_overload_10(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
+            ttl=3600,
+            type="CERT",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4194,16 +4613,15 @@ def test_streaming_response_edit_overload_10(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
+            ttl=3600,
+            type="CERT",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -4214,20 +4632,18 @@ def test_path_params_edit_overload_10(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="mx.example.com",
                 name="example.com",
-                priority=10,
-                type="MX",
+                ttl=3600,
+                type="CERT",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="mx.example.com",
                 name="example.com",
-                priority=10,
-                type="MX",
+                ttl=3600,
+                type="CERT",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -4236,11 +4652,11 @@ def test_method_edit_overload_11(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="NAPTR",
+            ttl=3600,
+            type="DNSKEY",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4248,22 +4664,24 @@ def test_method_edit_with_all_params_overload_11(self, client: Cloudflare) -> No
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "flags": "flags",
-                "order": 100,
-                "preference": 10,
-                "regex": "regex",
-                "replacement": "replacement",
-                "service": "service",
-            },
             name="example.com",
-            type="NAPTR",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="DNSKEY",
+            comment="Domain verification record",
+            data={
+                "algorithm": 5,
+                "flags": 1,
+                "protocol": 3,
+                "public_key": "public_key",
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4271,15 +4689,15 @@ def test_raw_response_edit_overload_11(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="NAPTR",
+            ttl=3600,
+            type="DNSKEY",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4287,15 +4705,15 @@ def test_streaming_response_edit_overload_11(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="NAPTR",
+            ttl=3600,
+            type="DNSKEY",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -4306,18 +4724,18 @@ def test_path_params_edit_overload_11(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="NAPTR",
+                ttl=3600,
+                type="DNSKEY",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="NAPTR",
+                ttl=3600,
+                type="DNSKEY",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -4326,11 +4744,11 @@ def test_method_edit_overload_12(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
+            ttl=3600,
+            type="DS",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4338,15 +4756,24 @@ def test_method_edit_with_all_params_overload_12(self, client: Cloudflare) -> No
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="DS",
+            comment="Domain verification record",
+            data={
+                "algorithm": 3,
+                "digest": "digest",
+                "digest_type": 1,
+                "key_tag": 1,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4354,15 +4781,15 @@ def test_raw_response_edit_overload_12(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
+            ttl=3600,
+            type="DS",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4370,15 +4797,15 @@ def test_streaming_response_edit_overload_12(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
+            ttl=3600,
+            type="DS",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -4389,18 +4816,18 @@ def test_path_params_edit_overload_12(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="ns1.example.com",
                 name="example.com",
-                type="NS",
+                ttl=3600,
+                type="DS",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="ns1.example.com",
                 name="example.com",
-                type="NS",
+                ttl=3600,
+                type="DS",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -4409,11 +4836,11 @@ def test_method_edit_overload_13(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
+            ttl=3600,
+            type="HTTPS",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4421,15 +4848,23 @@ def test_method_edit_with_all_params_overload_13(self, client: Cloudflare) -> No
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="HTTPS",
+            comment="Domain verification record",
+            data={
+                "priority": 1,
+                "target": ".",
+                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4437,15 +4872,15 @@ def test_raw_response_edit_overload_13(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
+            ttl=3600,
+            type="HTTPS",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4453,15 +4888,15 @@ def test_streaming_response_edit_overload_13(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
+            ttl=3600,
+            type="HTTPS",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -4472,18 +4907,18 @@ def test_path_params_edit_overload_13(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="example.com",
                 name="example.com",
-                type="PTR",
+                ttl=3600,
+                type="HTTPS",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="example.com",
                 name="example.com",
-                type="PTR",
+                ttl=3600,
+                type="HTTPS",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -4492,11 +4927,11 @@ def test_method_edit_overload_14(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SMIMEA",
+            ttl=3600,
+            type="LOC",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4504,36 +4939,48 @@ def test_method_edit_with_all_params_overload_14(self, client: Cloudflare) -> No
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "certificate": "certificate",
-                "matching_type": 0,
-                "selector": 0,
-                "usage": 3,
-            },
             name="example.com",
-            type="SMIMEA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
-        )
-        assert_matches_type(Optional[Record], record, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
+            type="LOC",
+            comment="Domain verification record",
+            data={
+                "altitude": 0,
+                "lat_degrees": 37,
+                "lat_direction": "N",
+                "lat_minutes": 46,
+                "lat_seconds": 46,
+                "long_degrees": 122,
+                "long_direction": "W",
+                "long_minutes": 23,
+                "long_seconds": 35,
+                "precision_horz": 0,
+                "precision_vert": 0,
+                "size": 100,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
+        )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
     def test_raw_response_edit_overload_14(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SMIMEA",
+            ttl=3600,
+            type="LOC",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4541,15 +4988,15 @@ def test_streaming_response_edit_overload_14(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SMIMEA",
+            ttl=3600,
+            type="LOC",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -4560,18 +5007,18 @@ def test_path_params_edit_overload_14(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="SMIMEA",
+                ttl=3600,
+                type="LOC",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="SMIMEA",
+                ttl=3600,
+                type="LOC",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -4580,11 +5027,11 @@ def test_method_edit_overload_15(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
-            name="_sip._tcp.example.com",
-            type="SRV",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4592,23 +5039,26 @@ def test_method_edit_with_all_params_overload_15(self, client: Cloudflare) -> No
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
+            comment="Domain verification record",
             data={
-                "name": "example.com",
-                "port": 8806,
-                "priority": 10,
-                "proto": "_tcp",
-                "service": "_sip",
-                "target": "example.com",
-                "weight": 5,
+                "flags": "flags",
+                "order": 100,
+                "preference": 10,
+                "regex": "regex",
+                "replacement": "replacement",
+                "service": "service",
             },
-            name="_sip._tcp.example.com",
-            type="SRV",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4616,15 +5066,15 @@ def test_raw_response_edit_overload_15(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
-            name="_sip._tcp.example.com",
-            type="SRV",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4632,15 +5082,15 @@ def test_streaming_response_edit_overload_15(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
-            name="_sip._tcp.example.com",
-            type="SRV",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -4651,18 +5101,18 @@ def test_path_params_edit_overload_15(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
-                name="_sip._tcp.example.com",
-                type="SRV",
+                name="example.com",
+                ttl=3600,
+                type="NAPTR",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
-                name="_sip._tcp.example.com",
-                type="SRV",
+                name="example.com",
+                ttl=3600,
+                type="NAPTR",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -4671,11 +5121,11 @@ def test_method_edit_overload_16(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SSHFP",
+            ttl=3600,
+            type="SMIMEA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4683,19 +5133,24 @@ def test_method_edit_with_all_params_overload_16(self, client: Cloudflare) -> No
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 2,
-                "fingerprint": "fingerprint",
-                "type": 1,
-            },
             name="example.com",
-            type="SSHFP",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SMIMEA",
+            comment="Domain verification record",
+            data={
+                "certificate": "certificate",
+                "matching_type": 0,
+                "selector": 0,
+                "usage": 3,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4703,15 +5158,15 @@ def test_raw_response_edit_overload_16(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SSHFP",
+            ttl=3600,
+            type="SMIMEA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4719,15 +5174,15 @@ def test_streaming_response_edit_overload_16(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SSHFP",
+            ttl=3600,
+            type="SMIMEA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -4738,18 +5193,18 @@ def test_path_params_edit_overload_16(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="SSHFP",
+                ttl=3600,
+                type="SMIMEA",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="SSHFP",
+                ttl=3600,
+                type="SMIMEA",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -4758,11 +5213,11 @@ def test_method_edit_overload_17(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SVCB",
+            ttl=3600,
+            type="SRV",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4770,19 +5225,24 @@ def test_method_edit_with_all_params_overload_17(self, client: Cloudflare) -> No
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "priority": 1,
-                "target": ".",
-                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
-            },
             name="example.com",
-            type="SVCB",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SRV",
+            comment="Domain verification record",
+            data={
+                "port": 8806,
+                "priority": 10,
+                "target": "example.com",
+                "weight": 5,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4790,15 +5250,15 @@ def test_raw_response_edit_overload_17(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SVCB",
+            ttl=3600,
+            type="SRV",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4806,15 +5266,15 @@ def test_streaming_response_edit_overload_17(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SVCB",
+            ttl=3600,
+            type="SRV",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -4825,18 +5285,18 @@ def test_path_params_edit_overload_17(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="SVCB",
+                ttl=3600,
+                type="SRV",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="SVCB",
+                ttl=3600,
+                type="SRV",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -4845,11 +5305,11 @@ def test_method_edit_overload_18(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="TLSA",
+            ttl=3600,
+            type="SSHFP",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4857,20 +5317,23 @@ def test_method_edit_with_all_params_overload_18(self, client: Cloudflare) -> No
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "certificate": "certificate",
-                "matching_type": 1,
-                "selector": 0,
-                "usage": 0,
-            },
             name="example.com",
-            type="TLSA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SSHFP",
+            comment="Domain verification record",
+            data={
+                "algorithm": 2,
+                "fingerprint": "fingerprint",
+                "type": 1,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4878,15 +5341,15 @@ def test_raw_response_edit_overload_18(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="TLSA",
+            ttl=3600,
+            type="SSHFP",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4894,15 +5357,15 @@ def test_streaming_response_edit_overload_18(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="TLSA",
+            ttl=3600,
+            type="SSHFP",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -4913,18 +5376,18 @@ def test_path_params_edit_overload_18(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="TLSA",
+                ttl=3600,
+                type="SSHFP",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="TLSA",
+                ttl=3600,
+                type="SSHFP",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -4933,11 +5396,11 @@ def test_method_edit_overload_19(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
+            ttl=3600,
+            type="SVCB",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4945,15 +5408,23 @@ def test_method_edit_with_all_params_overload_19(self, client: Cloudflare) -> No
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SVCB",
+            comment="Domain verification record",
+            data={
+                "priority": 1,
+                "target": ".",
+                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4961,15 +5432,15 @@ def test_raw_response_edit_overload_19(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
+            ttl=3600,
+            type="SVCB",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4977,15 +5448,15 @@ def test_streaming_response_edit_overload_19(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
+            ttl=3600,
+            type="SVCB",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -4996,18 +5467,18 @@ def test_path_params_edit_overload_19(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="example text content",
                 name="example.com",
-                type="TXT",
+                ttl=3600,
+                type="SVCB",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="example text content",
                 name="example.com",
-                type="TXT",
+                ttl=3600,
+                type="SVCB",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -5016,12 +5487,11 @@ def test_method_edit_overload_20(self, client: Cloudflare) -> None:
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            priority=10,
-            type="URI",
+            ttl=3600,
+            type="TLSA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -5029,19 +5499,24 @@ def test_method_edit_with_all_params_overload_20(self, client: Cloudflare) -> No
         record = client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "target": "http://example.com/example.html",
-                "weight": 20,
-            },
             name="example.com",
-            priority=10,
-            type="URI",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="TLSA",
+            comment="Domain verification record",
+            data={
+                "certificate": "certificate",
+                "matching_type": 1,
+                "selector": 0,
+                "usage": 0,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -5049,16 +5524,15 @@ def test_raw_response_edit_overload_20(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            priority=10,
-            type="URI",
+            ttl=3600,
+            type="TLSA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -5066,16 +5540,15 @@ def test_streaming_response_edit_overload_20(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            priority=10,
-            type="URI",
+            ttl=3600,
+            type="TLSA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -5086,68 +5559,159 @@ def test_path_params_edit_overload_20(self, client: Cloudflare) -> None:
             client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                priority=10,
-                type="URI",
+                ttl=3600,
+                type="TLSA",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                priority=10,
-                type="URI",
+                ttl=3600,
+                type="TLSA",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_export(self, client: Cloudflare) -> None:
-        record = client.dns.records.export(
+    def test_method_edit_overload_21(self, client: Cloudflare) -> None:
+        record = client.dns.records.edit(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="URI",
         )
-        assert_matches_type(str, record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_raw_response_export(self, client: Cloudflare) -> None:
-        response = client.dns.records.with_raw_response.export(
+    def test_method_edit_with_all_params_overload_21(self, client: Cloudflare) -> None:
+        record = client.dns.records.edit(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="URI",
+            comment="Domain verification record",
+            data={
+                "target": "http://example.com/example.html",
+                "weight": 20,
+            },
+            priority=10,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
+        )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_edit_overload_21(self, client: Cloudflare) -> None:
+        response = client.dns.records.with_raw_response.edit(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="URI",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(str, record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_streaming_response_export(self, client: Cloudflare) -> None:
-        with client.dns.records.with_streaming_response.export(
+    def test_streaming_response_edit_overload_21(self, client: Cloudflare) -> None:
+        with client.dns.records.with_streaming_response.edit(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="URI",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(str, record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_path_params_export(self, client: Cloudflare) -> None:
+    def test_path_params_edit_overload_21(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.dns.records.with_raw_response.export(
+            client.dns.records.with_raw_response.edit(
+                dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+                name="example.com",
+                ttl=3600,
+                type="URI",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
+            client.dns.records.with_raw_response.edit(
+                dns_record_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="example.com",
+                ttl=3600,
+                type="URI",
+            )
+
+    @parametrize
+    def test_method_export(self, client: Cloudflare) -> None:
+        record = client.dns.records.export(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(str, record, path=["response"])
+
+    @parametrize
+    def test_raw_response_export(self, client: Cloudflare) -> None:
+        response = client.dns.records.with_raw_response.export(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        record = response.parse()
+        assert_matches_type(str, record, path=["response"])
+
+    @parametrize
+    def test_streaming_response_export(self, client: Cloudflare) -> None:
+        with client.dns.records.with_streaming_response.export(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            record = response.parse()
+            assert_matches_type(str, record, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_export(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.dns.records.with_raw_response.export(
                 zone_id="",
             )
 
+    @pytest.mark.skip(reason="mock server returns invalid data")
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         record = client.dns.records.get(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
+    @pytest.mark.skip(reason="mock server returns invalid data")
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.dns.records.with_raw_response.get(
@@ -5158,8 +5722,9 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
+    @pytest.mark.skip(reason="mock server returns invalid data")
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.dns.records.with_streaming_response.get(
@@ -5170,10 +5735,11 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="mock server returns invalid data")
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
@@ -5246,18 +5812,21 @@ def test_path_params_import(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_scan(self, client: Cloudflare) -> None:
-        record = client.dns.records.scan(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            record = client.dns.records.scan(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            )
+
         assert_matches_type(Optional[RecordScanResponse], record, path=["response"])
 
     @parametrize
     def test_raw_response_scan(self, client: Cloudflare) -> None:
-        response = client.dns.records.with_raw_response.scan(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.dns.records.with_raw_response.scan(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -5266,86 +5835,237 @@ def test_raw_response_scan(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_scan(self, client: Cloudflare) -> None:
-        with client.dns.records.with_streaming_response.scan(
+        with pytest.warns(DeprecationWarning):
+            with client.dns.records.with_streaming_response.scan(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                record = response.parse()
+                assert_matches_type(Optional[RecordScanResponse], record, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_scan(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.dns.records.with_raw_response.scan(
+                    zone_id="",
+                    body={},
+                )
+
+    @pytest.mark.skip(reason="Mock server returns incomplete DNS records missing required fields: id, created_on, meta, modified_on (Issue #2)")
+    @parametrize
+    def test_method_scan_list(self, client: Cloudflare) -> None:
+        record = client.dns.records.scan_list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="Mock server returns incomplete DNS records missing required fields: id, created_on, meta, modified_on (Issue #2)")
+    @parametrize
+    def test_raw_response_scan_list(self, client: Cloudflare) -> None:
+        response = client.dns.records.with_raw_response.scan_list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        record = response.parse()
+        assert_matches_type(SyncSinglePage[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="Mock server returns incomplete DNS records missing required fields: id, created_on, meta, modified_on (Issue #2)")
+    @parametrize
+    def test_streaming_response_scan_list(self, client: Cloudflare) -> None:
+        with client.dns.records.with_streaming_response.scan_list(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = response.parse()
-            assert_matches_type(Optional[RecordScanResponse], record, path=["response"])
+            assert_matches_type(SyncSinglePage[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    def test_path_params_scan(self, client: Cloudflare) -> None:
+    def test_path_params_scan_list(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.dns.records.with_raw_response.scan(
+            client.dns.records.with_raw_response.scan_list(
+                zone_id="",
+            )
+
+    @pytest.mark.skip(reason="Mock server returns incomplete DNS records missing required fields: id, created_on, meta, modified_on (Issue #2)")
+    @parametrize
+    def test_method_scan_review(self, client: Cloudflare) -> None:
+        record = client.dns.records.scan_review(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[RecordScanReviewResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="Mock server returns incomplete DNS records missing required fields: id, created_on, meta, modified_on (Issue #2)")
+    @parametrize
+    def test_method_scan_review_with_all_params(self, client: Cloudflare) -> None:
+        record = client.dns.records.scan_review(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            accepts=[
+                {
+                    "name": "example.com",
+                    "ttl": 3600,
+                    "type": "A",
+                    "comment": "Domain verification record",
+                    "content": "198.51.100.4",
+                    "proxied": True,
+                    "settings": {
+                        "ipv4_only": True,
+                        "ipv6_only": True,
+                    },
+                    "tags": ["owner:dns-team"],
+                }
+            ],
+            rejects=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+        )
+        assert_matches_type(Optional[RecordScanReviewResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="Mock server returns incomplete DNS records missing required fields: id, created_on, meta, modified_on (Issue #2)")
+    @parametrize
+    def test_raw_response_scan_review(self, client: Cloudflare) -> None:
+        response = client.dns.records.with_raw_response.scan_review(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        record = response.parse()
+        assert_matches_type(Optional[RecordScanReviewResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="Mock server returns incomplete DNS records missing required fields: id, created_on, meta, modified_on (Issue #2)")
+    @parametrize
+    def test_streaming_response_scan_review(self, client: Cloudflare) -> None:
+        with client.dns.records.with_streaming_response.scan_review(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            record = response.parse()
+            assert_matches_type(Optional[RecordScanReviewResponse], record, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_scan_review(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.dns.records.with_raw_response.scan_review(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_scan_trigger(self, client: Cloudflare) -> None:
+        record = client.dns.records.scan_trigger(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(RecordScanTriggerResponse, record, path=["response"])
+
+    @parametrize
+    def test_raw_response_scan_trigger(self, client: Cloudflare) -> None:
+        response = client.dns.records.with_raw_response.scan_trigger(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        record = response.parse()
+        assert_matches_type(RecordScanTriggerResponse, record, path=["response"])
+
+    @parametrize
+    def test_streaming_response_scan_trigger(self, client: Cloudflare) -> None:
+        with client.dns.records.with_streaming_response.scan_trigger(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            record = response.parse()
+            assert_matches_type(RecordScanTriggerResponse, record, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_scan_trigger(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.dns.records.with_raw_response.scan_trigger(
                 zone_id="",
-                body={},
             )
 
 
 class TestAsyncRecords:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
             comment="Domain verification record",
-            proxied=False,
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            content="198.51.100.4",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -5355,8 +6075,8 @@ async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                content="198.51.100.4",
                 name="example.com",
+                ttl=3600,
                 type="A",
             )
 
@@ -5365,57 +6085,60 @@ async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare
     async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
             comment="Domain verification record",
-            proxied=False,
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            content="2400:cb00:2049::1",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -5425,8 +6148,8 @@ async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                content="2400:cb00:2049::1",
                 name="example.com",
+                ttl=3600,
                 type="AAAA",
             )
 
@@ -5435,60 +6158,61 @@ async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare
     async def test_method_create_overload_3(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CAA",
+            ttl=3600,
+            type="CNAME",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_3(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "flags": 1,
-                "tag": "issue",
-                "value": "value",
-            },
             name="example.com",
-            type="CAA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="CNAME",
+            comment="Domain verification record",
+            content="content",
+            proxied=True,
+            settings={
+                "flatten_cname": True,
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_3(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CAA",
+            ttl=3600,
+            type="CNAME",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_3(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CAA",
+            ttl=3600,
+            type="CNAME",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -5498,9 +6222,9 @@ async def test_path_params_create_overload_3(self, async_client: AsyncCloudflare
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="CAA",
+                ttl=3600,
+                type="CNAME",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -5508,61 +6232,61 @@ async def test_path_params_create_overload_3(self, async_client: AsyncCloudflare
     async def test_method_create_overload_4(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CERT",
+            ttl=3600,
+            type="MX",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_4(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 8,
-                "certificate": "certificate",
-                "key_tag": 1,
-                "type": 9,
-            },
             name="example.com",
-            type="CERT",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="MX",
+            comment="Domain verification record",
+            content="mx.example.com",
+            priority=10,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_4(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CERT",
+            ttl=3600,
+            type="MX",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_4(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CERT",
+            ttl=3600,
+            type="MX",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -5572,9 +6296,9 @@ async def test_path_params_create_overload_4(self, async_client: AsyncCloudflare
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="CERT",
+                ttl=3600,
+                type="MX",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -5582,57 +6306,60 @@ async def test_path_params_create_overload_4(self, async_client: AsyncCloudflare
     async def test_method_create_overload_5(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
+            ttl=3600,
+            type="NS",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_5(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            proxied=False,
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="NS",
+            comment="Domain verification record",
+            content="ns1.example.com",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_5(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
+            ttl=3600,
+            type="NS",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_5(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
+            ttl=3600,
+            type="NS",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -5642,9 +6369,9 @@ async def test_path_params_create_overload_5(self, async_client: AsyncCloudflare
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                content={},
                 name="example.com",
-                type="CNAME",
+                ttl=3600,
+                type="NS",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -5652,61 +6379,60 @@ async def test_path_params_create_overload_5(self, async_client: AsyncCloudflare
     async def test_method_create_overload_6(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DNSKEY",
+            ttl=3600,
+            type="OPENPGPKEY",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_6(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 5,
-                "flags": 1,
-                "protocol": 3,
-                "public_key": "public_key",
-            },
             name="example.com",
-            type="DNSKEY",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="OPENPGPKEY",
+            comment="Domain verification record",
+            content="content",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_6(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DNSKEY",
+            ttl=3600,
+            type="OPENPGPKEY",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_6(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DNSKEY",
+            ttl=3600,
+            type="OPENPGPKEY",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -5716,9 +6442,9 @@ async def test_path_params_create_overload_6(self, async_client: AsyncCloudflare
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="DNSKEY",
+                ttl=3600,
+                type="OPENPGPKEY",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -5726,61 +6452,60 @@ async def test_path_params_create_overload_6(self, async_client: AsyncCloudflare
     async def test_method_create_overload_7(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DS",
+            ttl=3600,
+            type="PTR",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_7(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 3,
-                "digest": "digest",
-                "digest_type": 1,
-                "key_tag": 1,
-            },
             name="example.com",
-            type="DS",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
-        )
-        assert_matches_type(Optional[Record], record, path=["response"])
+            type="PTR",
+            comment="Domain verification record",
+            content="example.com",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
+        )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_7(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DS",
+            ttl=3600,
+            type="PTR",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_7(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DS",
+            ttl=3600,
+            type="PTR",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -5790,9 +6515,9 @@ async def test_path_params_create_overload_7(self, async_client: AsyncCloudflare
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="DS",
+                ttl=3600,
+                type="PTR",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -5800,60 +6525,60 @@ async def test_path_params_create_overload_7(self, async_client: AsyncCloudflare
     async def test_method_create_overload_8(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="HTTPS",
+            ttl=3600,
+            type="TXT",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_8(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "priority": 1,
-                "target": ".",
-                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
-            },
             name="example.com",
-            type="HTTPS",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="TXT",
+            comment="Domain verification record",
+            content='"v=spf1 include:example.com -all"',
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_8(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="HTTPS",
+            ttl=3600,
+            type="TXT",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_8(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="HTTPS",
+            ttl=3600,
+            type="TXT",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -5863,9 +6588,9 @@ async def test_path_params_create_overload_8(self, async_client: AsyncCloudflare
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="HTTPS",
+                ttl=3600,
+                type="TXT",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -5873,69 +6598,64 @@ async def test_path_params_create_overload_8(self, async_client: AsyncCloudflare
     async def test_method_create_overload_9(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="LOC",
+            ttl=3600,
+            type="CAA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_9(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "altitude": 0,
-                "lat_degrees": 37,
-                "lat_direction": "N",
-                "lat_minutes": 46,
-                "lat_seconds": 46,
-                "long_degrees": 122,
-                "long_direction": "W",
-                "long_minutes": 23,
-                "long_seconds": 35,
-                "precision_horz": 0,
-                "precision_vert": 0,
-                "size": 100,
-            },
             name="example.com",
-            type="LOC",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="CAA",
+            comment="Domain verification record",
+            data={
+                "flags": 1,
+                "tag": "issue",
+                "value": "value",
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_9(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="LOC",
+            ttl=3600,
+            type="CAA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_9(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="LOC",
+            ttl=3600,
+            type="CAA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -5945,9 +6665,9 @@ async def test_path_params_create_overload_9(self, async_client: AsyncCloudflare
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="LOC",
+                ttl=3600,
+                type="CAA",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -5955,60 +6675,65 @@ async def test_path_params_create_overload_9(self, async_client: AsyncCloudflare
     async def test_method_create_overload_10(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
+            ttl=3600,
+            type="CERT",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_10(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="CERT",
+            comment="Domain verification record",
+            data={
+                "algorithm": 8,
+                "certificate": "certificate",
+                "key_tag": 1,
+                "type": 9,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_10(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
+            ttl=3600,
+            type="CERT",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_10(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
+            ttl=3600,
+            type="CERT",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -6018,10 +6743,9 @@ async def test_path_params_create_overload_10(self, async_client: AsyncCloudflar
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                content="mx.example.com",
                 name="example.com",
-                priority=10,
-                type="MX",
+                ttl=3600,
+                type="CERT",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -6029,63 +6753,65 @@ async def test_path_params_create_overload_10(self, async_client: AsyncCloudflar
     async def test_method_create_overload_11(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="NAPTR",
+            ttl=3600,
+            type="DNSKEY",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_11(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "flags": "flags",
-                "order": 100,
-                "preference": 10,
-                "regex": "regex",
-                "replacement": "replacement",
-                "service": "service",
-            },
             name="example.com",
-            type="NAPTR",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="DNSKEY",
+            comment="Domain verification record",
+            data={
+                "algorithm": 5,
+                "flags": 1,
+                "protocol": 3,
+                "public_key": "public_key",
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_11(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="NAPTR",
+            ttl=3600,
+            type="DNSKEY",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_11(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="NAPTR",
+            ttl=3600,
+            type="DNSKEY",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -6095,9 +6821,9 @@ async def test_path_params_create_overload_11(self, async_client: AsyncCloudflar
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="NAPTR",
+                ttl=3600,
+                type="DNSKEY",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -6105,56 +6831,65 @@ async def test_path_params_create_overload_11(self, async_client: AsyncCloudflar
     async def test_method_create_overload_12(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
+            ttl=3600,
+            type="DS",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_12(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="DS",
+            comment="Domain verification record",
+            data={
+                "algorithm": 3,
+                "digest": "digest",
+                "digest_type": 1,
+                "key_tag": 1,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_12(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
+            ttl=3600,
+            type="DS",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_12(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
+            ttl=3600,
+            type="DS",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -6164,9 +6899,9 @@ async def test_path_params_create_overload_12(self, async_client: AsyncCloudflar
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                content="ns1.example.com",
                 name="example.com",
-                type="NS",
+                ttl=3600,
+                type="DS",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -6174,56 +6909,64 @@ async def test_path_params_create_overload_12(self, async_client: AsyncCloudflar
     async def test_method_create_overload_13(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
+            ttl=3600,
+            type="HTTPS",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_13(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="HTTPS",
+            comment="Domain verification record",
+            data={
+                "priority": 1,
+                "target": ".",
+                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_13(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
+            ttl=3600,
+            type="HTTPS",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_13(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
+            ttl=3600,
+            type="HTTPS",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -6233,9 +6976,9 @@ async def test_path_params_create_overload_13(self, async_client: AsyncCloudflar
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                content="example.com",
                 name="example.com",
-                type="PTR",
+                ttl=3600,
+                type="HTTPS",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -6243,61 +6986,73 @@ async def test_path_params_create_overload_13(self, async_client: AsyncCloudflar
     async def test_method_create_overload_14(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SMIMEA",
+            ttl=3600,
+            type="LOC",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_14(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "certificate": "certificate",
-                "matching_type": 0,
-                "selector": 0,
-                "usage": 3,
-            },
             name="example.com",
-            type="SMIMEA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="LOC",
+            comment="Domain verification record",
+            data={
+                "altitude": 0,
+                "lat_degrees": 37,
+                "lat_direction": "N",
+                "lat_minutes": 46,
+                "lat_seconds": 46,
+                "long_degrees": 122,
+                "long_direction": "W",
+                "long_minutes": 23,
+                "long_seconds": 35,
+                "precision_horz": 0,
+                "precision_vert": 0,
+                "size": 100,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_14(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SMIMEA",
+            ttl=3600,
+            type="LOC",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_14(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SMIMEA",
+            ttl=3600,
+            type="LOC",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -6307,9 +7062,9 @@ async def test_path_params_create_overload_14(self, async_client: AsyncCloudflar
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="SMIMEA",
+                ttl=3600,
+                type="LOC",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -6317,64 +7072,67 @@ async def test_path_params_create_overload_14(self, async_client: AsyncCloudflar
     async def test_method_create_overload_15(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
-            name="_sip._tcp.example.com",
-            type="SRV",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_15(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
+            comment="Domain verification record",
             data={
-                "name": "example.com",
-                "port": 8806,
-                "priority": 10,
-                "proto": "_tcp",
-                "service": "_sip",
-                "target": "example.com",
-                "weight": 5,
+                "flags": "flags",
+                "order": 100,
+                "preference": 10,
+                "regex": "regex",
+                "replacement": "replacement",
+                "service": "service",
             },
-            name="_sip._tcp.example.com",
-            type="SRV",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_15(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
-            name="_sip._tcp.example.com",
-            type="SRV",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_15(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
-            name="_sip._tcp.example.com",
-            type="SRV",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -6384,9 +7142,9 @@ async def test_path_params_create_overload_15(self, async_client: AsyncCloudflar
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
-                name="_sip._tcp.example.com",
-                type="SRV",
+                name="example.com",
+                ttl=3600,
+                type="NAPTR",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -6394,60 +7152,65 @@ async def test_path_params_create_overload_15(self, async_client: AsyncCloudflar
     async def test_method_create_overload_16(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SSHFP",
+            ttl=3600,
+            type="SMIMEA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_16(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="SMIMEA",
+            comment="Domain verification record",
             data={
-                "algorithm": 2,
-                "fingerprint": "fingerprint",
-                "type": 1,
+                "certificate": "certificate",
+                "matching_type": 0,
+                "selector": 0,
+                "usage": 3,
             },
-            name="example.com",
-            type="SSHFP",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_16(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SSHFP",
+            ttl=3600,
+            type="SMIMEA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_16(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SSHFP",
+            ttl=3600,
+            type="SMIMEA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -6457,9 +7220,9 @@ async def test_path_params_create_overload_16(self, async_client: AsyncCloudflar
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="SSHFP",
+                ttl=3600,
+                type="SMIMEA",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -6467,60 +7230,65 @@ async def test_path_params_create_overload_16(self, async_client: AsyncCloudflar
     async def test_method_create_overload_17(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SVCB",
+            ttl=3600,
+            type="SRV",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_17(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "priority": 1,
-                "target": ".",
-                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
-            },
             name="example.com",
-            type="SVCB",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SRV",
+            comment="Domain verification record",
+            data={
+                "port": 8806,
+                "priority": 10,
+                "target": "example.com",
+                "weight": 5,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_17(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SVCB",
+            ttl=3600,
+            type="SRV",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_17(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SVCB",
+            ttl=3600,
+            type="SRV",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -6530,9 +7298,9 @@ async def test_path_params_create_overload_17(self, async_client: AsyncCloudflar
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="SVCB",
+                ttl=3600,
+                type="SRV",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -6540,61 +7308,64 @@ async def test_path_params_create_overload_17(self, async_client: AsyncCloudflar
     async def test_method_create_overload_18(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="TLSA",
+            ttl=3600,
+            type="SSHFP",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_18(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "certificate": "certificate",
-                "matching_type": 1,
-                "selector": 0,
-                "usage": 0,
-            },
             name="example.com",
-            type="TLSA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SSHFP",
+            comment="Domain verification record",
+            data={
+                "algorithm": 2,
+                "fingerprint": "fingerprint",
+                "type": 1,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_18(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="TLSA",
+            ttl=3600,
+            type="SSHFP",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_18(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="TLSA",
+            ttl=3600,
+            type="SSHFP",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -6604,9 +7375,9 @@ async def test_path_params_create_overload_18(self, async_client: AsyncCloudflar
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                type="TLSA",
+                ttl=3600,
+                type="SSHFP",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -6614,56 +7385,64 @@ async def test_path_params_create_overload_18(self, async_client: AsyncCloudflar
     async def test_method_create_overload_19(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
+            ttl=3600,
+            type="SVCB",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_19(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SVCB",
+            comment="Domain verification record",
+            data={
+                "priority": 1,
+                "target": ".",
+                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create_overload_19(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
+            ttl=3600,
+            type="SVCB",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create_overload_19(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
+            ttl=3600,
+            type="SVCB",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -6673,9 +7452,9 @@ async def test_path_params_create_overload_19(self, async_client: AsyncCloudflar
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                content="example text content",
                 name="example.com",
-                type="TXT",
+                ttl=3600,
+                type="SVCB",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -6683,75 +7462,153 @@ async def test_path_params_create_overload_19(self, async_client: AsyncCloudflar
     async def test_method_create_overload_20(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            priority=10,
-            type="URI",
+            ttl=3600,
+            type="TLSA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params_overload_20(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="TLSA",
+            comment="Domain verification record",
             data={
-                "target": "http://example.com/example.html",
-                "weight": 20,
+                "certificate": "certificate",
+                "matching_type": 1,
+                "selector": 0,
+                "usage": 0,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
             },
+            tags=["owner:dns-team"],
+        )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_create_overload_20(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.records.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="example.com",
-            priority=10,
+            ttl=3600,
+            type="TLSA",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        record = await response.parse()
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_create_overload_20(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns.records.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="TLSA",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            record = await response.parse()
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_create_overload_20(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.dns.records.with_raw_response.create(
+                zone_id="",
+                name="example.com",
+                ttl=3600,
+                type="TLSA",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_overload_21(self, async_client: AsyncCloudflare) -> None:
+        record = await async_client.dns.records.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
             type="URI",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
+        )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_with_all_params_overload_21(self, async_client: AsyncCloudflare) -> None:
+        record = await async_client.dns.records.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
             ttl=3600,
+            type="URI",
+            comment="Domain verification record",
+            data={
+                "target": "http://example.com/example.html",
+                "weight": 20,
+            },
+            priority=10,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_create_overload_20(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_create_overload_21(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            priority=10,
+            ttl=3600,
             type="URI",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_create_overload_20(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_create_overload_21(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            priority=10,
+            ttl=3600,
             type="URI",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_create_overload_20(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_create_overload_21(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.create(
                 zone_id="",
-                data={},
                 name="example.com",
-                priority=10,
+                ttl=3600,
                 type="URI",
             )
 
@@ -6761,11 +7618,11 @@ async def test_method_update_overload_1(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -6773,16 +7630,19 @@ async def test_method_update_with_all_params_overload_1(self, async_client: Asyn
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
             comment="Domain verification record",
-            proxied=False,
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            content="198.51.100.4",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -6790,15 +7650,15 @@ async def test_raw_response_update_overload_1(self, async_client: AsyncCloudflar
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -6806,15 +7666,15 @@ async def test_streaming_response_update_overload_1(self, async_client: AsyncClo
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -6825,8 +7685,8 @@ async def test_path_params_update_overload_1(self, async_client: AsyncCloudflare
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="198.51.100.4",
                 name="example.com",
+                ttl=3600,
                 type="A",
             )
 
@@ -6834,8 +7694,8 @@ async def test_path_params_update_overload_1(self, async_client: AsyncCloudflare
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="198.51.100.4",
                 name="example.com",
+                ttl=3600,
                 type="A",
             )
 
@@ -6845,11 +7705,11 @@ async def test_method_update_overload_2(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -6857,16 +7717,19 @@ async def test_method_update_with_all_params_overload_2(self, async_client: Asyn
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
             comment="Domain verification record",
-            proxied=False,
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            content="2400:cb00:2049::1",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -6874,15 +7737,15 @@ async def test_raw_response_update_overload_2(self, async_client: AsyncCloudflar
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -6890,15 +7753,15 @@ async def test_streaming_response_update_overload_2(self, async_client: AsyncClo
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -6909,8 +7772,8 @@ async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="2400:cb00:2049::1",
                 name="example.com",
+                ttl=3600,
                 type="AAAA",
             )
 
@@ -6918,8 +7781,8 @@ async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="2400:cb00:2049::1",
                 name="example.com",
+                ttl=3600,
                 type="AAAA",
             )
 
@@ -6929,11 +7792,11 @@ async def test_method_update_overload_3(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CAA",
+            ttl=3600,
+            type="CNAME",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -6941,19 +7804,20 @@ async def test_method_update_with_all_params_overload_3(self, async_client: Asyn
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "flags": 1,
-                "tag": "issue",
-                "value": "value",
-            },
             name="example.com",
-            type="CAA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="CNAME",
+            comment="Domain verification record",
+            content="content",
+            proxied=True,
+            settings={
+                "flatten_cname": True,
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -6961,15 +7825,15 @@ async def test_raw_response_update_overload_3(self, async_client: AsyncCloudflar
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CAA",
+            ttl=3600,
+            type="CNAME",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -6977,15 +7841,15 @@ async def test_streaming_response_update_overload_3(self, async_client: AsyncClo
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CAA",
+            ttl=3600,
+            type="CNAME",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -6996,18 +7860,18 @@ async def test_path_params_update_overload_3(self, async_client: AsyncCloudflare
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="CAA",
+                ttl=3600,
+                type="CNAME",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="CAA",
+                ttl=3600,
+                type="CNAME",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -7016,11 +7880,11 @@ async def test_method_update_overload_4(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CERT",
+            ttl=3600,
+            type="MX",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7028,20 +7892,20 @@ async def test_method_update_with_all_params_overload_4(self, async_client: Asyn
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 8,
-                "certificate": "certificate",
-                "key_tag": 1,
-                "type": 9,
-            },
             name="example.com",
-            type="CERT",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="MX",
+            comment="Domain verification record",
+            content="mx.example.com",
+            priority=10,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7049,15 +7913,15 @@ async def test_raw_response_update_overload_4(self, async_client: AsyncCloudflar
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CERT",
+            ttl=3600,
+            type="MX",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7065,15 +7929,15 @@ async def test_streaming_response_update_overload_4(self, async_client: AsyncClo
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CERT",
+            ttl=3600,
+            type="MX",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -7084,18 +7948,18 @@ async def test_path_params_update_overload_4(self, async_client: AsyncCloudflare
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="CERT",
+                ttl=3600,
+                type="MX",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="CERT",
+                ttl=3600,
+                type="MX",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -7104,11 +7968,11 @@ async def test_method_update_overload_5(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
+            ttl=3600,
+            type="NS",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7116,16 +7980,19 @@ async def test_method_update_with_all_params_overload_5(self, async_client: Asyn
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            proxied=False,
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="NS",
+            comment="Domain verification record",
+            content="ns1.example.com",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7133,15 +8000,15 @@ async def test_raw_response_update_overload_5(self, async_client: AsyncCloudflar
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
+            ttl=3600,
+            type="NS",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7149,15 +8016,15 @@ async def test_streaming_response_update_overload_5(self, async_client: AsyncClo
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
+            ttl=3600,
+            type="NS",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -7168,18 +8035,18 @@ async def test_path_params_update_overload_5(self, async_client: AsyncCloudflare
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content={},
                 name="example.com",
-                type="CNAME",
+                ttl=3600,
+                type="NS",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content={},
                 name="example.com",
-                type="CNAME",
+                ttl=3600,
+                type="NS",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -7188,11 +8055,11 @@ async def test_method_update_overload_6(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DNSKEY",
+            ttl=3600,
+            type="OPENPGPKEY",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7200,20 +8067,19 @@ async def test_method_update_with_all_params_overload_6(self, async_client: Asyn
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 5,
-                "flags": 1,
-                "protocol": 3,
-                "public_key": "public_key",
-            },
             name="example.com",
-            type="DNSKEY",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="OPENPGPKEY",
+            comment="Domain verification record",
+            content="content",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7221,15 +8087,15 @@ async def test_raw_response_update_overload_6(self, async_client: AsyncCloudflar
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DNSKEY",
+            ttl=3600,
+            type="OPENPGPKEY",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7237,15 +8103,15 @@ async def test_streaming_response_update_overload_6(self, async_client: AsyncClo
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DNSKEY",
+            ttl=3600,
+            type="OPENPGPKEY",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -7256,18 +8122,18 @@ async def test_path_params_update_overload_6(self, async_client: AsyncCloudflare
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="DNSKEY",
+                ttl=3600,
+                type="OPENPGPKEY",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="DNSKEY",
+                ttl=3600,
+                type="OPENPGPKEY",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -7276,11 +8142,11 @@ async def test_method_update_overload_7(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DS",
+            ttl=3600,
+            type="PTR",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7288,20 +8154,19 @@ async def test_method_update_with_all_params_overload_7(self, async_client: Asyn
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 3,
-                "digest": "digest",
-                "digest_type": 1,
-                "key_tag": 1,
-            },
             name="example.com",
-            type="DS",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="PTR",
+            comment="Domain verification record",
+            content="example.com",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7309,15 +8174,15 @@ async def test_raw_response_update_overload_7(self, async_client: AsyncCloudflar
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DS",
+            ttl=3600,
+            type="PTR",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7325,15 +8190,15 @@ async def test_streaming_response_update_overload_7(self, async_client: AsyncClo
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DS",
+            ttl=3600,
+            type="PTR",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -7344,18 +8209,18 @@ async def test_path_params_update_overload_7(self, async_client: AsyncCloudflare
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="DS",
+                ttl=3600,
+                type="PTR",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="DS",
+                ttl=3600,
+                type="PTR",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -7364,11 +8229,11 @@ async def test_method_update_overload_8(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="HTTPS",
+            ttl=3600,
+            type="TXT",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7376,19 +8241,19 @@ async def test_method_update_with_all_params_overload_8(self, async_client: Asyn
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "priority": 1,
-                "target": ".",
-                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
-            },
             name="example.com",
-            type="HTTPS",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="TXT",
+            comment="Domain verification record",
+            content='"v=spf1 include:example.com -all"',
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7396,15 +8261,15 @@ async def test_raw_response_update_overload_8(self, async_client: AsyncCloudflar
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="HTTPS",
+            ttl=3600,
+            type="TXT",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7412,15 +8277,15 @@ async def test_streaming_response_update_overload_8(self, async_client: AsyncClo
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="HTTPS",
+            ttl=3600,
+            type="TXT",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -7431,18 +8296,18 @@ async def test_path_params_update_overload_8(self, async_client: AsyncCloudflare
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="HTTPS",
+                ttl=3600,
+                type="TXT",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="HTTPS",
+                ttl=3600,
+                type="TXT",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -7451,11 +8316,11 @@ async def test_method_update_overload_9(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="LOC",
+            ttl=3600,
+            type="CAA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7463,28 +8328,23 @@ async def test_method_update_with_all_params_overload_9(self, async_client: Asyn
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "altitude": 0,
-                "lat_degrees": 37,
-                "lat_direction": "N",
-                "lat_minutes": 46,
-                "lat_seconds": 46,
-                "long_degrees": 122,
-                "long_direction": "W",
-                "long_minutes": 23,
-                "long_seconds": 35,
-                "precision_horz": 0,
-                "precision_vert": 0,
-                "size": 100,
-            },
             name="example.com",
-            type="LOC",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="CAA",
+            comment="Domain verification record",
+            data={
+                "flags": 1,
+                "tag": "issue",
+                "value": "value",
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7492,15 +8352,15 @@ async def test_raw_response_update_overload_9(self, async_client: AsyncCloudflar
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="LOC",
+            ttl=3600,
+            type="CAA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7508,15 +8368,15 @@ async def test_streaming_response_update_overload_9(self, async_client: AsyncClo
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="LOC",
+            ttl=3600,
+            type="CAA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -7527,18 +8387,18 @@ async def test_path_params_update_overload_9(self, async_client: AsyncCloudflare
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="LOC",
+                ttl=3600,
+                type="CAA",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="LOC",
+                ttl=3600,
+                type="CAA",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -7547,12 +8407,11 @@ async def test_method_update_overload_10(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
+            ttl=3600,
+            type="CERT",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7560,16 +8419,24 @@ async def test_method_update_with_all_params_overload_10(self, async_client: Asy
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="CERT",
+            comment="Domain verification record",
+            data={
+                "algorithm": 8,
+                "certificate": "certificate",
+                "key_tag": 1,
+                "type": 9,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7577,16 +8444,15 @@ async def test_raw_response_update_overload_10(self, async_client: AsyncCloudfla
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
+            ttl=3600,
+            type="CERT",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7594,16 +8460,15 @@ async def test_streaming_response_update_overload_10(self, async_client: AsyncCl
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
+            ttl=3600,
+            type="CERT",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -7614,20 +8479,18 @@ async def test_path_params_update_overload_10(self, async_client: AsyncCloudflar
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="mx.example.com",
                 name="example.com",
-                priority=10,
-                type="MX",
+                ttl=3600,
+                type="CERT",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="mx.example.com",
                 name="example.com",
-                priority=10,
-                type="MX",
+                ttl=3600,
+                type="CERT",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -7636,11 +8499,11 @@ async def test_method_update_overload_11(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="NAPTR",
+            ttl=3600,
+            type="DNSKEY",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7648,22 +8511,24 @@ async def test_method_update_with_all_params_overload_11(self, async_client: Asy
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "flags": "flags",
-                "order": 100,
-                "preference": 10,
-                "regex": "regex",
-                "replacement": "replacement",
-                "service": "service",
-            },
             name="example.com",
-            type="NAPTR",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="DNSKEY",
+            comment="Domain verification record",
+            data={
+                "algorithm": 5,
+                "flags": 1,
+                "protocol": 3,
+                "public_key": "public_key",
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7671,15 +8536,15 @@ async def test_raw_response_update_overload_11(self, async_client: AsyncCloudfla
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="NAPTR",
+            ttl=3600,
+            type="DNSKEY",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7687,15 +8552,15 @@ async def test_streaming_response_update_overload_11(self, async_client: AsyncCl
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="NAPTR",
+            ttl=3600,
+            type="DNSKEY",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -7706,18 +8571,18 @@ async def test_path_params_update_overload_11(self, async_client: AsyncCloudflar
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="NAPTR",
+                ttl=3600,
+                type="DNSKEY",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="NAPTR",
+                ttl=3600,
+                type="DNSKEY",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -7726,11 +8591,11 @@ async def test_method_update_overload_12(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
+            ttl=3600,
+            type="DS",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7738,15 +8603,24 @@ async def test_method_update_with_all_params_overload_12(self, async_client: Asy
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="DS",
+            comment="Domain verification record",
+            data={
+                "algorithm": 3,
+                "digest": "digest",
+                "digest_type": 1,
+                "key_tag": 1,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7754,15 +8628,15 @@ async def test_raw_response_update_overload_12(self, async_client: AsyncCloudfla
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
+            ttl=3600,
+            type="DS",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7770,15 +8644,15 @@ async def test_streaming_response_update_overload_12(self, async_client: AsyncCl
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
+            ttl=3600,
+            type="DS",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -7789,18 +8663,18 @@ async def test_path_params_update_overload_12(self, async_client: AsyncCloudflar
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="ns1.example.com",
                 name="example.com",
-                type="NS",
+                ttl=3600,
+                type="DS",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="ns1.example.com",
                 name="example.com",
-                type="NS",
+                ttl=3600,
+                type="DS",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -7809,11 +8683,11 @@ async def test_method_update_overload_13(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
+            ttl=3600,
+            type="HTTPS",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7821,15 +8695,23 @@ async def test_method_update_with_all_params_overload_13(self, async_client: Asy
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="HTTPS",
+            comment="Domain verification record",
+            data={
+                "priority": 1,
+                "target": ".",
+                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7837,15 +8719,15 @@ async def test_raw_response_update_overload_13(self, async_client: AsyncCloudfla
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
+            ttl=3600,
+            type="HTTPS",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7853,15 +8735,15 @@ async def test_streaming_response_update_overload_13(self, async_client: AsyncCl
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
+            ttl=3600,
+            type="HTTPS",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -7872,18 +8754,18 @@ async def test_path_params_update_overload_13(self, async_client: AsyncCloudflar
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="example.com",
                 name="example.com",
-                type="PTR",
+                ttl=3600,
+                type="HTTPS",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="example.com",
                 name="example.com",
-                type="PTR",
+                ttl=3600,
+                type="HTTPS",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -7892,11 +8774,11 @@ async def test_method_update_overload_14(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SMIMEA",
+            ttl=3600,
+            type="LOC",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7904,36 +8786,48 @@ async def test_method_update_with_all_params_overload_14(self, async_client: Asy
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "certificate": "certificate",
-                "matching_type": 0,
-                "selector": 0,
-                "usage": 3,
-            },
             name="example.com",
-            type="SMIMEA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
-        )
-        assert_matches_type(Optional[Record], record, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_raw_response_update_overload_14(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.dns.records.with_raw_response.update(
-            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
+            type="LOC",
+            comment="Domain verification record",
+            data={
+                "altitude": 0,
+                "lat_degrees": 37,
+                "lat_direction": "N",
+                "lat_minutes": 46,
+                "lat_seconds": 46,
+                "long_degrees": 122,
+                "long_direction": "W",
+                "long_minutes": 23,
+                "long_seconds": 35,
+                "precision_horz": 0,
+                "precision_vert": 0,
+                "size": 100,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
+        )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_update_overload_14(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.records.with_raw_response.update(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="example.com",
-            type="SMIMEA",
+            ttl=3600,
+            type="LOC",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7941,15 +8835,15 @@ async def test_streaming_response_update_overload_14(self, async_client: AsyncCl
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SMIMEA",
+            ttl=3600,
+            type="LOC",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -7960,18 +8854,18 @@ async def test_path_params_update_overload_14(self, async_client: AsyncCloudflar
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="SMIMEA",
+                ttl=3600,
+                type="LOC",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="SMIMEA",
+                ttl=3600,
+                type="LOC",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -7980,11 +8874,11 @@ async def test_method_update_overload_15(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
-            name="_sip._tcp.example.com",
-            type="SRV",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -7992,23 +8886,26 @@ async def test_method_update_with_all_params_overload_15(self, async_client: Asy
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
+            comment="Domain verification record",
             data={
-                "name": "example.com",
-                "port": 8806,
-                "priority": 10,
-                "proto": "_tcp",
-                "service": "_sip",
-                "target": "example.com",
-                "weight": 5,
+                "flags": "flags",
+                "order": 100,
+                "preference": 10,
+                "regex": "regex",
+                "replacement": "replacement",
+                "service": "service",
             },
-            name="_sip._tcp.example.com",
-            type="SRV",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8016,15 +8913,15 @@ async def test_raw_response_update_overload_15(self, async_client: AsyncCloudfla
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
-            name="_sip._tcp.example.com",
-            type="SRV",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8032,15 +8929,15 @@ async def test_streaming_response_update_overload_15(self, async_client: AsyncCl
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
-            name="_sip._tcp.example.com",
-            type="SRV",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -8051,18 +8948,18 @@ async def test_path_params_update_overload_15(self, async_client: AsyncCloudflar
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
-                name="_sip._tcp.example.com",
-                type="SRV",
+                name="example.com",
+                ttl=3600,
+                type="NAPTR",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
-                name="_sip._tcp.example.com",
-                type="SRV",
+                name="example.com",
+                ttl=3600,
+                type="NAPTR",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -8071,11 +8968,11 @@ async def test_method_update_overload_16(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SSHFP",
+            ttl=3600,
+            type="SMIMEA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8083,19 +8980,24 @@ async def test_method_update_with_all_params_overload_16(self, async_client: Asy
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 2,
-                "fingerprint": "fingerprint",
-                "type": 1,
-            },
             name="example.com",
-            type="SSHFP",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SMIMEA",
+            comment="Domain verification record",
+            data={
+                "certificate": "certificate",
+                "matching_type": 0,
+                "selector": 0,
+                "usage": 3,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8103,15 +9005,15 @@ async def test_raw_response_update_overload_16(self, async_client: AsyncCloudfla
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SSHFP",
+            ttl=3600,
+            type="SMIMEA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8119,15 +9021,15 @@ async def test_streaming_response_update_overload_16(self, async_client: AsyncCl
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SSHFP",
+            ttl=3600,
+            type="SMIMEA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -8138,18 +9040,18 @@ async def test_path_params_update_overload_16(self, async_client: AsyncCloudflar
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="SSHFP",
+                ttl=3600,
+                type="SMIMEA",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="SSHFP",
+                ttl=3600,
+                type="SMIMEA",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -8158,11 +9060,11 @@ async def test_method_update_overload_17(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SVCB",
+            ttl=3600,
+            type="SRV",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8170,19 +9072,24 @@ async def test_method_update_with_all_params_overload_17(self, async_client: Asy
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "priority": 1,
-                "target": ".",
-                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
-            },
             name="example.com",
-            type="SVCB",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SRV",
+            comment="Domain verification record",
+            data={
+                "port": 8806,
+                "priority": 10,
+                "target": "example.com",
+                "weight": 5,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8190,15 +9097,15 @@ async def test_raw_response_update_overload_17(self, async_client: AsyncCloudfla
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SVCB",
+            ttl=3600,
+            type="SRV",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8206,15 +9113,15 @@ async def test_streaming_response_update_overload_17(self, async_client: AsyncCl
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SVCB",
+            ttl=3600,
+            type="SRV",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -8225,18 +9132,18 @@ async def test_path_params_update_overload_17(self, async_client: AsyncCloudflar
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="SVCB",
+                ttl=3600,
+                type="SRV",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="SVCB",
+                ttl=3600,
+                type="SRV",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -8245,11 +9152,11 @@ async def test_method_update_overload_18(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="TLSA",
+            ttl=3600,
+            type="SSHFP",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8257,20 +9164,23 @@ async def test_method_update_with_all_params_overload_18(self, async_client: Asy
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "certificate": "certificate",
-                "matching_type": 1,
-                "selector": 0,
-                "usage": 0,
-            },
             name="example.com",
-            type="TLSA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SSHFP",
+            comment="Domain verification record",
+            data={
+                "algorithm": 2,
+                "fingerprint": "fingerprint",
+                "type": 1,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8278,15 +9188,15 @@ async def test_raw_response_update_overload_18(self, async_client: AsyncCloudfla
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="TLSA",
+            ttl=3600,
+            type="SSHFP",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8294,15 +9204,15 @@ async def test_streaming_response_update_overload_18(self, async_client: AsyncCl
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="TLSA",
+            ttl=3600,
+            type="SSHFP",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -8313,18 +9223,18 @@ async def test_path_params_update_overload_18(self, async_client: AsyncCloudflar
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="TLSA",
+                ttl=3600,
+                type="SSHFP",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="TLSA",
+                ttl=3600,
+                type="SSHFP",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -8333,11 +9243,11 @@ async def test_method_update_overload_19(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
+            ttl=3600,
+            type="SVCB",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8345,15 +9255,23 @@ async def test_method_update_with_all_params_overload_19(self, async_client: Asy
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="SVCB",
+            comment="Domain verification record",
+            data={
+                "priority": 1,
+                "target": ".",
+                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8361,15 +9279,15 @@ async def test_raw_response_update_overload_19(self, async_client: AsyncCloudfla
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
+            ttl=3600,
+            type="SVCB",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8377,15 +9295,15 @@ async def test_streaming_response_update_overload_19(self, async_client: AsyncCl
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
+            ttl=3600,
+            type="SVCB",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -8396,18 +9314,18 @@ async def test_path_params_update_overload_19(self, async_client: AsyncCloudflar
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="example text content",
                 name="example.com",
-                type="TXT",
+                ttl=3600,
+                type="SVCB",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="example text content",
                 name="example.com",
-                type="TXT",
+                ttl=3600,
+                type="SVCB",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -8416,12 +9334,11 @@ async def test_method_update_overload_20(self, async_client: AsyncCloudflare) ->
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            priority=10,
-            type="URI",
+            ttl=3600,
+            type="TLSA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8429,19 +9346,24 @@ async def test_method_update_with_all_params_overload_20(self, async_client: Asy
         record = await async_client.dns.records.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "target": "http://example.com/example.html",
-                "weight": 20,
-            },
             name="example.com",
-            priority=10,
-            type="URI",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="TLSA",
+            comment="Domain verification record",
+            data={
+                "certificate": "certificate",
+                "matching_type": 1,
+                "selector": 0,
+                "usage": 0,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8449,16 +9371,15 @@ async def test_raw_response_update_overload_20(self, async_client: AsyncCloudfla
         response = await async_client.dns.records.with_raw_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            priority=10,
-            type="URI",
+            ttl=3600,
+            type="TLSA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8466,16 +9387,15 @@ async def test_streaming_response_update_overload_20(self, async_client: AsyncCl
         async with async_client.dns.records.with_streaming_response.update(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            priority=10,
-            type="URI",
+            ttl=3600,
+            type="TLSA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -8486,63 +9406,165 @@ async def test_path_params_update_overload_20(self, async_client: AsyncCloudflar
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                priority=10,
-                type="URI",
+                ttl=3600,
+                type="TLSA",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.update(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                priority=10,
-                type="URI",
+                ttl=3600,
+                type="TLSA",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        record = await async_client.dns.records.list(
+    async def test_method_update_overload_21(self, async_client: AsyncCloudflare) -> None:
+        record = await async_client.dns.records.update(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="URI",
         )
-        assert_matches_type(AsyncV4PagePaginationArray[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        record = await async_client.dns.records.list(
+    async def test_method_update_with_all_params_overload_21(self, async_client: AsyncCloudflare) -> None:
+        record = await async_client.dns.records.update(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment={
-                "present": "present",
-                "absent": "absent",
-                "exact": "Hello, world",
-                "contains": "ello, worl",
-                "startswith": "Hello, w",
-                "endswith": "o, world",
-            },
-            content="127.0.0.1",
-            direction="asc",
-            match="any",
             name="example.com",
-            order="type",
-            page=1,
-            per_page=5,
-            proxied=False,
-            search="www.cloudflare.com",
-            tag={
-                "present": "important",
-                "absent": "important",
-                "exact": "greeting:Hello, world",
-                "contains": "greeting:ello, worl",
-                "startswith": "greeting:Hello, w",
-                "endswith": "greeting:o, world",
+            ttl=3600,
+            type="URI",
+            comment="Domain verification record",
+            data={
+                "target": "http://example.com/example.html",
+                "weight": 20,
             },
-            tag_match="any",
-            type="A",
-        )
-        assert_matches_type(AsyncV4PagePaginationArray[Record], record, path=["response"])
+            priority=10,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
+        )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_update_overload_21(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.records.with_raw_response.update(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="URI",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        record = await response.parse()
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_update_overload_21(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns.records.with_streaming_response.update(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="URI",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            record = await response.parse()
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update_overload_21(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.dns.records.with_raw_response.update(
+                dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+                name="example.com",
+                ttl=3600,
+                type="URI",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
+            await async_client.dns.records.with_raw_response.update(
+                dns_record_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="example.com",
+                ttl=3600,
+                type="URI",
+            )
+
+    @pytest.mark.skip(reason="mock server returns invalid data")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        record = await async_client.dns.records.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="mock server returns invalid data")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        record = await async_client.dns.records.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            comment={
+                "absent": "absent",
+                "contains": "ello, worl",
+                "endswith": "o, world",
+                "exact": "Hello, world",
+                "present": "present",
+                "startswith": "Hello, w",
+            },
+            content={
+                "contains": "7.0.0.",
+                "endswith": ".0.1",
+                "exact": "127.0.0.1",
+                "startswith": "127.0.",
+            },
+            direction="asc",
+            match="any",
+            name={
+                "contains": "w.example.",
+                "endswith": ".example.com",
+                "exact": "www.example.com",
+                "startswith": "www.example",
+            },
+            order="type",
+            page=1,
+            per_page=5,
+            proxied=True,
+            search="www.cloudflare.com",
+            tag={
+                "absent": "important",
+                "contains": "greeting:ello, worl",
+                "endswith": "greeting:o, world",
+                "exact": "greeting:Hello, world",
+                "present": "important",
+                "startswith": "greeting:Hello, w",
+            },
+            tag_match="any",
+            type="A",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[RecordResponse], record, path=["response"])
 
+    @pytest.mark.skip(reason="mock server returns invalid data")
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.list(
@@ -8552,8 +9574,9 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(AsyncV4PagePaginationArray[Record], record, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[RecordResponse], record, path=["response"])
 
+    @pytest.mark.skip(reason="mock server returns invalid data")
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.list(
@@ -8563,10 +9586,11 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[Record], record, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="mock server returns invalid data")
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
@@ -8622,17 +9646,115 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_batch(self, async_client: AsyncCloudflare) -> None:
+        record = await async_client.dns.records.batch(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[RecordBatchResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_batch_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        record = await async_client.dns.records.batch(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            deletes=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+            patches=[
+                {
+                    "name": "example.com",
+                    "ttl": 3600,
+                    "type": "A",
+                    "comment": "Domain verification record",
+                    "content": "198.51.100.4",
+                    "proxied": True,
+                    "settings": {
+                        "ipv4_only": True,
+                        "ipv6_only": True,
+                    },
+                    "tags": ["owner:dns-team"],
+                    "id": "023e105f4ecef8ad9ca31a8372d0c353",
+                }
+            ],
+            posts=[
+                {
+                    "name": "example.com",
+                    "ttl": 3600,
+                    "type": "A",
+                    "comment": "Domain verification record",
+                    "content": "198.51.100.4",
+                    "proxied": True,
+                    "settings": {
+                        "ipv4_only": True,
+                        "ipv6_only": True,
+                    },
+                    "tags": ["owner:dns-team"],
+                }
+            ],
+            puts=[
+                {
+                    "name": "example.com",
+                    "ttl": 3600,
+                    "type": "A",
+                    "comment": "Domain verification record",
+                    "content": "198.51.100.4",
+                    "proxied": True,
+                    "settings": {
+                        "ipv4_only": True,
+                        "ipv6_only": True,
+                    },
+                    "tags": ["owner:dns-team"],
+                    "id": "023e105f4ecef8ad9ca31a8372d0c353",
+                }
+            ],
+        )
+        assert_matches_type(Optional[RecordBatchResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_batch(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.records.with_raw_response.batch(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        record = await response.parse()
+        assert_matches_type(Optional[RecordBatchResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_batch(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns.records.with_streaming_response.batch(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            record = await response.parse()
+            assert_matches_type(Optional[RecordBatchResponse], record, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_batch(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.dns.records.with_raw_response.batch(
+                zone_id="",
+            )
+
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_edit_overload_1(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8640,16 +9762,19 @@ async def test_method_edit_with_all_params_overload_1(self, async_client: AsyncC
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
             comment="Domain verification record",
-            proxied=False,
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            content="198.51.100.4",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8657,15 +9782,15 @@ async def test_raw_response_edit_overload_1(self, async_client: AsyncCloudflare)
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8673,15 +9798,15 @@ async def test_streaming_response_edit_overload_1(self, async_client: AsyncCloud
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="198.51.100.4",
             name="example.com",
+            ttl=3600,
             type="A",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -8692,8 +9817,8 @@ async def test_path_params_edit_overload_1(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="198.51.100.4",
                 name="example.com",
+                ttl=3600,
                 type="A",
             )
 
@@ -8701,8 +9826,8 @@ async def test_path_params_edit_overload_1(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="198.51.100.4",
                 name="example.com",
+                ttl=3600,
                 type="A",
             )
 
@@ -8712,11 +9837,11 @@ async def test_method_edit_overload_2(self, async_client: AsyncCloudflare) -> No
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8724,16 +9849,19 @@ async def test_method_edit_with_all_params_overload_2(self, async_client: AsyncC
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
             comment="Domain verification record",
-            proxied=False,
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            content="2400:cb00:2049::1",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8741,15 +9869,15 @@ async def test_raw_response_edit_overload_2(self, async_client: AsyncCloudflare)
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8757,15 +9885,15 @@ async def test_streaming_response_edit_overload_2(self, async_client: AsyncCloud
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="2400:cb00:2049::1",
             name="example.com",
+            ttl=3600,
             type="AAAA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -8776,8 +9904,8 @@ async def test_path_params_edit_overload_2(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="2400:cb00:2049::1",
                 name="example.com",
+                ttl=3600,
                 type="AAAA",
             )
 
@@ -8785,8 +9913,8 @@ async def test_path_params_edit_overload_2(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="2400:cb00:2049::1",
                 name="example.com",
+                ttl=3600,
                 type="AAAA",
             )
 
@@ -8796,11 +9924,11 @@ async def test_method_edit_overload_3(self, async_client: AsyncCloudflare) -> No
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CAA",
+            ttl=3600,
+            type="CNAME",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8808,19 +9936,20 @@ async def test_method_edit_with_all_params_overload_3(self, async_client: AsyncC
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "flags": 1,
-                "tag": "issue",
-                "value": "value",
-            },
             name="example.com",
-            type="CAA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="CNAME",
+            comment="Domain verification record",
+            content="content",
+            proxied=True,
+            settings={
+                "flatten_cname": True,
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8828,15 +9957,15 @@ async def test_raw_response_edit_overload_3(self, async_client: AsyncCloudflare)
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CAA",
+            ttl=3600,
+            type="CNAME",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8844,15 +9973,15 @@ async def test_streaming_response_edit_overload_3(self, async_client: AsyncCloud
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CAA",
+            ttl=3600,
+            type="CNAME",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -8863,18 +9992,18 @@ async def test_path_params_edit_overload_3(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="CAA",
+                ttl=3600,
+                type="CNAME",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="CAA",
+                ttl=3600,
+                type="CNAME",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -8883,11 +10012,11 @@ async def test_method_edit_overload_4(self, async_client: AsyncCloudflare) -> No
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CERT",
+            ttl=3600,
+            type="MX",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8895,20 +10024,20 @@ async def test_method_edit_with_all_params_overload_4(self, async_client: AsyncC
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 8,
-                "certificate": "certificate",
-                "key_tag": 1,
-                "type": 9,
-            },
             name="example.com",
-            type="CERT",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="MX",
+            comment="Domain verification record",
+            content="mx.example.com",
+            priority=10,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8916,15 +10045,15 @@ async def test_raw_response_edit_overload_4(self, async_client: AsyncCloudflare)
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CERT",
+            ttl=3600,
+            type="MX",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8932,15 +10061,15 @@ async def test_streaming_response_edit_overload_4(self, async_client: AsyncCloud
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="CERT",
+            ttl=3600,
+            type="MX",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -8951,18 +10080,18 @@ async def test_path_params_edit_overload_4(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="CERT",
+                ttl=3600,
+                type="MX",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="CERT",
+                ttl=3600,
+                type="MX",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -8971,11 +10100,11 @@ async def test_method_edit_overload_5(self, async_client: AsyncCloudflare) -> No
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
+            ttl=3600,
+            type="NS",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -8983,16 +10112,19 @@ async def test_method_edit_with_all_params_overload_5(self, async_client: AsyncC
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            proxied=False,
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="NS",
+            comment="Domain verification record",
+            content="ns1.example.com",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9000,15 +10132,15 @@ async def test_raw_response_edit_overload_5(self, async_client: AsyncCloudflare)
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
+            ttl=3600,
+            type="NS",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9016,15 +10148,15 @@ async def test_streaming_response_edit_overload_5(self, async_client: AsyncCloud
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content={},
             name="example.com",
-            type="CNAME",
+            ttl=3600,
+            type="NS",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -9035,18 +10167,18 @@ async def test_path_params_edit_overload_5(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content={},
                 name="example.com",
-                type="CNAME",
+                ttl=3600,
+                type="NS",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content={},
                 name="example.com",
-                type="CNAME",
+                ttl=3600,
+                type="NS",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -9055,11 +10187,11 @@ async def test_method_edit_overload_6(self, async_client: AsyncCloudflare) -> No
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DNSKEY",
+            ttl=3600,
+            type="OPENPGPKEY",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9067,20 +10199,19 @@ async def test_method_edit_with_all_params_overload_6(self, async_client: AsyncC
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 5,
-                "flags": 1,
-                "protocol": 3,
-                "public_key": "public_key",
-            },
             name="example.com",
-            type="DNSKEY",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="OPENPGPKEY",
+            comment="Domain verification record",
+            content="content",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9088,15 +10219,15 @@ async def test_raw_response_edit_overload_6(self, async_client: AsyncCloudflare)
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DNSKEY",
+            ttl=3600,
+            type="OPENPGPKEY",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9104,15 +10235,15 @@ async def test_streaming_response_edit_overload_6(self, async_client: AsyncCloud
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DNSKEY",
+            ttl=3600,
+            type="OPENPGPKEY",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -9123,18 +10254,18 @@ async def test_path_params_edit_overload_6(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="DNSKEY",
+                ttl=3600,
+                type="OPENPGPKEY",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="DNSKEY",
+                ttl=3600,
+                type="OPENPGPKEY",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -9143,11 +10274,11 @@ async def test_method_edit_overload_7(self, async_client: AsyncCloudflare) -> No
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DS",
+            ttl=3600,
+            type="PTR",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9155,20 +10286,19 @@ async def test_method_edit_with_all_params_overload_7(self, async_client: AsyncC
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "algorithm": 3,
-                "digest": "digest",
-                "digest_type": 1,
-                "key_tag": 1,
-            },
             name="example.com",
-            type="DS",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="PTR",
+            comment="Domain verification record",
+            content="example.com",
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9176,15 +10306,15 @@ async def test_raw_response_edit_overload_7(self, async_client: AsyncCloudflare)
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DS",
+            ttl=3600,
+            type="PTR",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9192,15 +10322,15 @@ async def test_streaming_response_edit_overload_7(self, async_client: AsyncCloud
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="DS",
+            ttl=3600,
+            type="PTR",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -9211,18 +10341,18 @@ async def test_path_params_edit_overload_7(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="DS",
+                ttl=3600,
+                type="PTR",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="DS",
+                ttl=3600,
+                type="PTR",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -9231,11 +10361,11 @@ async def test_method_edit_overload_8(self, async_client: AsyncCloudflare) -> No
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="HTTPS",
+            ttl=3600,
+            type="TXT",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9243,35 +10373,35 @@ async def test_method_edit_with_all_params_overload_8(self, async_client: AsyncC
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "priority": 1,
-                "target": ".",
-                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
-            },
             name="example.com",
-            type="HTTPS",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
-        )
-        assert_matches_type(Optional[Record], record, path=["response"])
-
+            type="TXT",
+            comment="Domain verification record",
+            content='"v=spf1 include:example.com -all"',
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
+        )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_edit_overload_8(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="HTTPS",
+            ttl=3600,
+            type="TXT",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9279,15 +10409,15 @@ async def test_streaming_response_edit_overload_8(self, async_client: AsyncCloud
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="HTTPS",
+            ttl=3600,
+            type="TXT",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -9298,18 +10428,18 @@ async def test_path_params_edit_overload_8(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="HTTPS",
+                ttl=3600,
+                type="TXT",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="HTTPS",
+                ttl=3600,
+                type="TXT",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -9318,11 +10448,11 @@ async def test_method_edit_overload_9(self, async_client: AsyncCloudflare) -> No
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="LOC",
+            ttl=3600,
+            type="CAA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9330,28 +10460,23 @@ async def test_method_edit_with_all_params_overload_9(self, async_client: AsyncC
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "altitude": 0,
-                "lat_degrees": 37,
-                "lat_direction": "N",
-                "lat_minutes": 46,
-                "lat_seconds": 46,
-                "long_degrees": 122,
-                "long_direction": "W",
-                "long_minutes": 23,
-                "long_seconds": 35,
-                "precision_horz": 0,
-                "precision_vert": 0,
-                "size": 100,
-            },
             name="example.com",
-            type="LOC",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="CAA",
+            comment="Domain verification record",
+            data={
+                "flags": 1,
+                "tag": "issue",
+                "value": "value",
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9359,15 +10484,15 @@ async def test_raw_response_edit_overload_9(self, async_client: AsyncCloudflare)
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="LOC",
+            ttl=3600,
+            type="CAA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9375,15 +10500,15 @@ async def test_streaming_response_edit_overload_9(self, async_client: AsyncCloud
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="LOC",
+            ttl=3600,
+            type="CAA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -9394,18 +10519,18 @@ async def test_path_params_edit_overload_9(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="LOC",
+                ttl=3600,
+                type="CAA",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="LOC",
+                ttl=3600,
+                type="CAA",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -9414,12 +10539,11 @@ async def test_method_edit_overload_10(self, async_client: AsyncCloudflare) -> N
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
+            ttl=3600,
+            type="CERT",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9427,16 +10551,24 @@ async def test_method_edit_with_all_params_overload_10(self, async_client: Async
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="CERT",
+            comment="Domain verification record",
+            data={
+                "algorithm": 8,
+                "certificate": "certificate",
+                "key_tag": 1,
+                "type": 9,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9444,16 +10576,15 @@ async def test_raw_response_edit_overload_10(self, async_client: AsyncCloudflare
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
+            ttl=3600,
+            type="CERT",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9461,16 +10592,15 @@ async def test_streaming_response_edit_overload_10(self, async_client: AsyncClou
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="mx.example.com",
             name="example.com",
-            priority=10,
-            type="MX",
+            ttl=3600,
+            type="CERT",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -9481,20 +10611,18 @@ async def test_path_params_edit_overload_10(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="mx.example.com",
                 name="example.com",
-                priority=10,
-                type="MX",
+                ttl=3600,
+                type="CERT",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="mx.example.com",
                 name="example.com",
-                priority=10,
-                type="MX",
+                ttl=3600,
+                type="CERT",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -9503,11 +10631,11 @@ async def test_method_edit_overload_11(self, async_client: AsyncCloudflare) -> N
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="NAPTR",
+            ttl=3600,
+            type="DNSKEY",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9515,22 +10643,24 @@ async def test_method_edit_with_all_params_overload_11(self, async_client: Async
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={
-                "flags": "flags",
-                "order": 100,
-                "preference": 10,
-                "regex": "regex",
-                "replacement": "replacement",
-                "service": "service",
-            },
             name="example.com",
-            type="NAPTR",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="DNSKEY",
+            comment="Domain verification record",
+            data={
+                "algorithm": 5,
+                "flags": 1,
+                "protocol": 3,
+                "public_key": "public_key",
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9538,15 +10668,15 @@ async def test_raw_response_edit_overload_11(self, async_client: AsyncCloudflare
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="NAPTR",
+            ttl=3600,
+            type="DNSKEY",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9554,15 +10684,15 @@ async def test_streaming_response_edit_overload_11(self, async_client: AsyncClou
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="NAPTR",
+            ttl=3600,
+            type="DNSKEY",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -9573,18 +10703,18 @@ async def test_path_params_edit_overload_11(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                type="NAPTR",
+                ttl=3600,
+                type="DNSKEY",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                type="NAPTR",
+                ttl=3600,
+                type="DNSKEY",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -9593,11 +10723,11 @@ async def test_method_edit_overload_12(self, async_client: AsyncCloudflare) -> N
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
+            ttl=3600,
+            type="DS",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9605,15 +10735,24 @@ async def test_method_edit_with_all_params_overload_12(self, async_client: Async
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="DS",
+            comment="Domain verification record",
+            data={
+                "algorithm": 3,
+                "digest": "digest",
+                "digest_type": 1,
+                "key_tag": 1,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9621,15 +10760,15 @@ async def test_raw_response_edit_overload_12(self, async_client: AsyncCloudflare
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
+            ttl=3600,
+            type="DS",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9637,15 +10776,15 @@ async def test_streaming_response_edit_overload_12(self, async_client: AsyncClou
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="ns1.example.com",
             name="example.com",
-            type="NS",
+            ttl=3600,
+            type="DS",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -9656,18 +10795,18 @@ async def test_path_params_edit_overload_12(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="ns1.example.com",
                 name="example.com",
-                type="NS",
+                ttl=3600,
+                type="DS",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="ns1.example.com",
                 name="example.com",
-                type="NS",
+                ttl=3600,
+                type="DS",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -9676,11 +10815,11 @@ async def test_method_edit_overload_13(self, async_client: AsyncCloudflare) -> N
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
+            ttl=3600,
+            type="HTTPS",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9688,15 +10827,23 @@ async def test_method_edit_with_all_params_overload_13(self, async_client: Async
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="HTTPS",
+            comment="Domain verification record",
+            data={
+                "priority": 1,
+                "target": ".",
+                "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9704,15 +10851,15 @@ async def test_raw_response_edit_overload_13(self, async_client: AsyncCloudflare
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
+            ttl=3600,
+            type="HTTPS",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9720,15 +10867,15 @@ async def test_streaming_response_edit_overload_13(self, async_client: AsyncClou
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example.com",
             name="example.com",
-            type="PTR",
+            ttl=3600,
+            type="HTTPS",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -9739,18 +10886,18 @@ async def test_path_params_edit_overload_13(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                content="example.com",
                 name="example.com",
-                type="PTR",
+                ttl=3600,
+                type="HTTPS",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="example.com",
                 name="example.com",
-                type="PTR",
+                ttl=3600,
+                type="HTTPS",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -9759,11 +10906,11 @@ async def test_method_edit_overload_14(self, async_client: AsyncCloudflare) -> N
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            type="SMIMEA",
+            ttl=3600,
+            type="LOC",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -9771,64 +10918,262 @@ async def test_method_edit_with_all_params_overload_14(self, async_client: Async
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="LOC",
+            comment="Domain verification record",
+            data={
+                "altitude": 0,
+                "lat_degrees": 37,
+                "lat_direction": "N",
+                "lat_minutes": 46,
+                "lat_seconds": 46,
+                "long_degrees": 122,
+                "long_direction": "W",
+                "long_minutes": 23,
+                "long_seconds": 35,
+                "precision_horz": 0,
+                "precision_vert": 0,
+                "size": 100,
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
+        )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_edit_overload_14(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.records.with_raw_response.edit(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="LOC",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        record = await response.parse()
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_edit_overload_14(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns.records.with_streaming_response.edit(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="LOC",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            record = await response.parse()
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_edit_overload_14(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.dns.records.with_raw_response.edit(
+                dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+                name="example.com",
+                ttl=3600,
+                type="LOC",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
+            await async_client.dns.records.with_raw_response.edit(
+                dns_record_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="example.com",
+                ttl=3600,
+                type="LOC",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_edit_overload_15(self, async_client: AsyncCloudflare) -> None:
+        record = await async_client.dns.records.edit(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
+        )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_edit_with_all_params_overload_15(self, async_client: AsyncCloudflare) -> None:
+        record = await async_client.dns.records.edit(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
+            comment="Domain verification record",
+            data={
+                "flags": "flags",
+                "order": 100,
+                "preference": 10,
+                "regex": "regex",
+                "replacement": "replacement",
+                "service": "service",
+            },
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
+        )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_edit_overload_15(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.records.with_raw_response.edit(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        record = await response.parse()
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_edit_overload_15(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns.records.with_streaming_response.edit(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="NAPTR",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            record = await response.parse()
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_edit_overload_15(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.dns.records.with_raw_response.edit(
+                dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+                name="example.com",
+                ttl=3600,
+                type="NAPTR",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
+            await async_client.dns.records.with_raw_response.edit(
+                dns_record_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="example.com",
+                ttl=3600,
+                type="NAPTR",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_edit_overload_16(self, async_client: AsyncCloudflare) -> None:
+        record = await async_client.dns.records.edit(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="SMIMEA",
+        )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_edit_with_all_params_overload_16(self, async_client: AsyncCloudflare) -> None:
+        record = await async_client.dns.records.edit(
+            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="SMIMEA",
+            comment="Domain verification record",
             data={
                 "certificate": "certificate",
                 "matching_type": 0,
                 "selector": 0,
                 "usage": 3,
             },
-            name="example.com",
-            type="SMIMEA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_edit_overload_14(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_edit_overload_16(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
+            ttl=3600,
             type="SMIMEA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_edit_overload_14(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_edit_overload_16(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
+            ttl=3600,
             type="SMIMEA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_edit_overload_14(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_edit_overload_16(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
+                ttl=3600,
                 type="SMIMEA",
             )
 
@@ -9836,90 +11181,91 @@ async def test_path_params_edit_overload_14(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
+                ttl=3600,
                 type="SMIMEA",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_edit_overload_15(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_edit_overload_17(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
-            name="_sip._tcp.example.com",
+            name="example.com",
+            ttl=3600,
             type="SRV",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_edit_with_all_params_overload_15(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_edit_with_all_params_overload_17(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="SRV",
+            comment="Domain verification record",
             data={
-                "name": "example.com",
                 "port": 8806,
                 "priority": 10,
-                "proto": "_tcp",
-                "service": "_sip",
                 "target": "example.com",
                 "weight": 5,
             },
-            name="_sip._tcp.example.com",
-            type="SRV",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_edit_overload_15(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_edit_overload_17(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
-            name="_sip._tcp.example.com",
+            name="example.com",
+            ttl=3600,
             type="SRV",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_edit_overload_15(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_edit_overload_17(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
-            name="_sip._tcp.example.com",
+            name="example.com",
+            ttl=3600,
             type="SRV",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_edit_overload_15(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_edit_overload_17(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
-                name="_sip._tcp.example.com",
+                name="example.com",
+                ttl=3600,
                 type="SRV",
             )
 
@@ -9927,86 +11273,90 @@ async def test_path_params_edit_overload_15(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
-                name="_sip._tcp.example.com",
+                name="example.com",
+                ttl=3600,
                 type="SRV",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_edit_overload_16(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_edit_overload_18(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
+            ttl=3600,
             type="SSHFP",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_edit_with_all_params_overload_16(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_edit_with_all_params_overload_18(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="SSHFP",
+            comment="Domain verification record",
             data={
                 "algorithm": 2,
                 "fingerprint": "fingerprint",
                 "type": 1,
             },
-            name="example.com",
-            type="SSHFP",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_edit_overload_16(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_edit_overload_18(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
+            ttl=3600,
             type="SSHFP",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_edit_overload_16(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_edit_overload_18(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
+            ttl=3600,
             type="SSHFP",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_edit_overload_16(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_edit_overload_18(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
+                ttl=3600,
                 type="SSHFP",
             )
 
@@ -10014,86 +11364,90 @@ async def test_path_params_edit_overload_16(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
+                ttl=3600,
                 type="SSHFP",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_edit_overload_17(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_edit_overload_19(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
+            ttl=3600,
             type="SVCB",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_edit_with_all_params_overload_17(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_edit_with_all_params_overload_19(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="SVCB",
+            comment="Domain verification record",
             data={
                 "priority": 1,
                 "target": ".",
                 "value": 'alpn="h3,h2" ipv4hint="127.0.0.1" ipv6hint="::1"',
             },
-            name="example.com",
-            type="SVCB",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_edit_overload_17(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_edit_overload_19(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
+            ttl=3600,
             type="SVCB",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_edit_overload_17(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_edit_overload_19(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
+            ttl=3600,
             type="SVCB",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_edit_overload_17(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_edit_overload_19(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
+                ttl=3600,
                 type="SVCB",
             )
 
@@ -10101,87 +11455,91 @@ async def test_path_params_edit_overload_17(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
+                ttl=3600,
                 type="SVCB",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_edit_overload_18(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_edit_overload_20(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
+            ttl=3600,
             type="TLSA",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_edit_with_all_params_overload_18(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_edit_with_all_params_overload_20(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.com",
+            ttl=3600,
+            type="TLSA",
+            comment="Domain verification record",
             data={
                 "certificate": "certificate",
                 "matching_type": 1,
                 "selector": 0,
                 "usage": 0,
             },
-            name="example.com",
-            type="TLSA",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_edit_overload_18(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_edit_overload_20(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
+            ttl=3600,
             type="TLSA",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_edit_overload_18(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_edit_overload_20(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
+            ttl=3600,
             type="TLSA",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_edit_overload_18(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_edit_overload_20(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
+                ttl=3600,
                 type="TLSA",
             )
 
@@ -10189,173 +11547,90 @@ async def test_path_params_edit_overload_18(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
+                ttl=3600,
                 type="TLSA",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_edit_overload_19(self, async_client: AsyncCloudflare) -> None:
-        record = await async_client.dns.records.edit(
-            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
-            name="example.com",
-            type="TXT",
-        )
-        assert_matches_type(Optional[Record], record, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_method_edit_with_all_params_overload_19(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_edit_overload_21(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
             name="example.com",
-            type="TXT",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
             ttl=3600,
+            type="URI",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_raw_response_edit_overload_19(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.dns.records.with_raw_response.edit(
-            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
-            name="example.com",
-            type="TXT",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_streaming_response_edit_overload_19(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.dns.records.with_streaming_response.edit(
-            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            content="example text content",
-            name="example.com",
-            type="TXT",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_path_params_edit_overload_19(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.dns.records.with_raw_response.edit(
-                dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="",
-                content="example text content",
-                name="example.com",
-                type="TXT",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_record_id` but received ''"):
-            await async_client.dns.records.with_raw_response.edit(
-                dns_record_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                content="example text content",
-                name="example.com",
-                type="TXT",
-            )
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_edit_overload_20(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_edit_with_all_params_overload_21(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            priority=10,
+            ttl=3600,
             type="URI",
-        )
-        assert_matches_type(Optional[Record], record, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_method_edit_with_all_params_overload_20(self, async_client: AsyncCloudflare) -> None:
-        record = await async_client.dns.records.edit(
-            dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            comment="Domain verification record",
             data={
                 "target": "http://example.com/example.html",
                 "weight": 20,
             },
-            name="example.com",
             priority=10,
-            type="URI",
-            id="023e105f4ecef8ad9ca31a8372d0c353",
-            comment="Domain verification record",
-            tags=["owner:dns-team", "owner:dns-team", "owner:dns-team"],
-            ttl=3600,
+            proxied=True,
+            settings={
+                "ipv4_only": True,
+                "ipv6_only": True,
+            },
+            tags=["owner:dns-team"],
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_edit_overload_20(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_edit_overload_21(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            priority=10,
+            ttl=3600,
             type="URI",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_edit_overload_20(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_edit_overload_21(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.edit(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            data={},
             name="example.com",
-            priority=10,
+            ttl=3600,
             type="URI",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_edit_overload_20(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_edit_overload_21(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                data={},
                 name="example.com",
-                priority=10,
+                ttl=3600,
                 type="URI",
             )
 
@@ -10363,9 +11638,8 @@ async def test_path_params_edit_overload_20(self, async_client: AsyncCloudflare)
             await async_client.dns.records.with_raw_response.edit(
                 dns_record_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                data={},
                 name="example.com",
-                priority=10,
+                ttl=3600,
                 type="URI",
             )
 
@@ -10407,14 +11681,16 @@ async def test_path_params_export(self, async_client: AsyncCloudflare) -> None:
                 zone_id="",
             )
 
+    @pytest.mark.skip(reason="mock server returns invalid data")
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         record = await async_client.dns.records.get(
             dns_record_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
+    @pytest.mark.skip(reason="mock server returns invalid data")
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.dns.records.with_raw_response.get(
@@ -10425,8 +11701,9 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         record = await response.parse()
-        assert_matches_type(Optional[Record], record, path=["response"])
+        assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
+    @pytest.mark.skip(reason="mock server returns invalid data")
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.dns.records.with_streaming_response.get(
@@ -10437,10 +11714,11 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[Record], record, path=["response"])
+            assert_matches_type(Optional[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="mock server returns invalid data")
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
@@ -10513,18 +11791,21 @@ async def test_path_params_import(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_method_scan(self, async_client: AsyncCloudflare) -> None:
-        record = await async_client.dns.records.scan(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            record = await async_client.dns.records.scan(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            )
+
         assert_matches_type(Optional[RecordScanResponse], record, path=["response"])
 
     @parametrize
     async def test_raw_response_scan(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.dns.records.with_raw_response.scan(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.dns.records.with_raw_response.scan(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -10533,22 +11814,168 @@ async def test_raw_response_scan(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_scan(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.dns.records.with_streaming_response.scan(
+        with pytest.warns(DeprecationWarning):
+            async with async_client.dns.records.with_streaming_response.scan(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                record = await response.parse()
+                assert_matches_type(Optional[RecordScanResponse], record, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_scan(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.dns.records.with_raw_response.scan(
+                    zone_id="",
+                    body={},
+                )
+
+    @pytest.mark.skip(reason="Mock server returns incomplete DNS records missing required fields: id, created_on, meta, modified_on (Issue #2)")
+    @parametrize
+    async def test_method_scan_list(self, async_client: AsyncCloudflare) -> None:
+        record = await async_client.dns.records.scan_list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="Mock server returns incomplete DNS records missing required fields: id, created_on, meta, modified_on (Issue #2)")
+    @parametrize
+    async def test_raw_response_scan_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.records.with_raw_response.scan_list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        record = await response.parse()
+        assert_matches_type(AsyncSinglePage[RecordResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="Mock server returns incomplete DNS records missing required fields: id, created_on, meta, modified_on (Issue #2)")
+    @parametrize
+    async def test_streaming_response_scan_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns.records.with_streaming_response.scan_list(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             record = await response.parse()
-            assert_matches_type(Optional[RecordScanResponse], record, path=["response"])
+            assert_matches_type(AsyncSinglePage[RecordResponse], record, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    async def test_path_params_scan(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_scan_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.dns.records.with_raw_response.scan(
+            await async_client.dns.records.with_raw_response.scan_list(
+                zone_id="",
+            )
+
+    @pytest.mark.skip(reason="Mock server returns incomplete DNS records missing required fields: id, created_on, meta, modified_on (Issue #2)")
+    @parametrize
+    async def test_method_scan_review(self, async_client: AsyncCloudflare) -> None:
+        record = await async_client.dns.records.scan_review(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[RecordScanReviewResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="Mock server returns incomplete DNS records missing required fields: id, created_on, meta, modified_on (Issue #2)")
+    @parametrize
+    async def test_method_scan_review_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        record = await async_client.dns.records.scan_review(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            accepts=[
+                {
+                    "name": "example.com",
+                    "ttl": 3600,
+                    "type": "A",
+                    "comment": "Domain verification record",
+                    "content": "198.51.100.4",
+                    "proxied": True,
+                    "settings": {
+                        "ipv4_only": True,
+                        "ipv6_only": True,
+                    },
+                    "tags": ["owner:dns-team"],
+                }
+            ],
+            rejects=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+        )
+        assert_matches_type(Optional[RecordScanReviewResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="Mock server returns incomplete DNS records missing required fields: id, created_on, meta, modified_on (Issue #2)")
+    @parametrize
+    async def test_raw_response_scan_review(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.records.with_raw_response.scan_review(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        record = await response.parse()
+        assert_matches_type(Optional[RecordScanReviewResponse], record, path=["response"])
+
+    @pytest.mark.skip(reason="Mock server returns incomplete DNS records missing required fields: id, created_on, meta, modified_on (Issue #2)")
+    @parametrize
+    async def test_streaming_response_scan_review(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns.records.with_streaming_response.scan_review(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            record = await response.parse()
+            assert_matches_type(Optional[RecordScanReviewResponse], record, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_scan_review(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.dns.records.with_raw_response.scan_review(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_scan_trigger(self, async_client: AsyncCloudflare) -> None:
+        record = await async_client.dns.records.scan_trigger(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(RecordScanTriggerResponse, record, path=["response"])
+
+    @parametrize
+    async def test_raw_response_scan_trigger(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.records.with_raw_response.scan_trigger(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        record = await response.parse()
+        assert_matches_type(RecordScanTriggerResponse, record, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_scan_trigger(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns.records.with_streaming_response.scan_trigger(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            record = await response.parse()
+            assert_matches_type(RecordScanTriggerResponse, record, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_scan_trigger(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.dns.records.with_raw_response.scan_trigger(
                 zone_id="",
-                body={},
             )
diff --git a/tests/api_resources/dns/test_settings.py b/tests/api_resources/dns/test_settings.py
deleted file mode 100644
index 4a2eee8e82f..00000000000
--- a/tests/api_resources/dns/test_settings.py
+++ /dev/null
@@ -1,276 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.dns import SettingGetResponse, SettingEditResponse
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestSettings:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    def test_method_edit(self, client: Cloudflare) -> None:
-        setting = client.dns.settings.edit(
-            account_id="account_id",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
-        setting = client.dns.settings.edit(
-            account_id="account_id",
-            zone_defaults={
-                "foundation_dns": False,
-                "multi_provider": False,
-                "nameservers": {"type": "cloudflare.standard"},
-                "ns_ttl": 86400,
-                "secondary_overrides": False,
-                "soa": {
-                    "expire": 604800,
-                    "min_ttl": 1800,
-                    "mname": "kristina.ns.cloudflare.com",
-                    "refresh": 10000,
-                    "retry": 2400,
-                    "rname": "admin.example.com",
-                    "ttl": 3600,
-                },
-                "zone_mode": "dns_only",
-            },
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    def test_raw_response_edit(self, client: Cloudflare) -> None:
-        response = client.dns.settings.with_raw_response.edit(
-            account_id="account_id",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    def test_streaming_response_edit(self, client: Cloudflare) -> None:
-        with client.dns.settings.with_streaming_response.edit(
-            account_id="account_id",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    def test_path_params_edit(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.dns.settings.with_raw_response.edit(
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.dns.settings.with_raw_response.edit(
-                account_id="account_id",
-            )
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        setting = client.dns.settings.get(
-            account_id="account_id",
-        )
-        assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
-        setting = client.dns.settings.get(
-            account_id="account_id",
-        )
-        assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.dns.settings.with_raw_response.get(
-            account_id="account_id",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.dns.settings.with_streaming_response.get(
-            account_id="account_id",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.dns.settings.with_raw_response.get(
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.dns.settings.with_raw_response.get(
-                account_id="account_id",
-            )
-
-
-class TestAsyncSettings:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.dns.settings.edit(
-            account_id="account_id",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.dns.settings.edit(
-            account_id="account_id",
-            zone_defaults={
-                "foundation_dns": False,
-                "multi_provider": False,
-                "nameservers": {"type": "cloudflare.standard"},
-                "ns_ttl": 86400,
-                "secondary_overrides": False,
-                "soa": {
-                    "expire": 604800,
-                    "min_ttl": 1800,
-                    "mname": "kristina.ns.cloudflare.com",
-                    "refresh": 10000,
-                    "retry": 2400,
-                    "rname": "admin.example.com",
-                    "ttl": 3600,
-                },
-                "zone_mode": "dns_only",
-            },
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.dns.settings.with_raw_response.edit(
-            account_id="account_id",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.dns.settings.with_streaming_response.edit(
-            account_id="account_id",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.dns.settings.with_raw_response.edit(
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.dns.settings.with_raw_response.edit(
-                account_id="account_id",
-            )
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.dns.settings.get(
-            account_id="account_id",
-        )
-        assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.dns.settings.get(
-            account_id="account_id",
-        )
-        assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.dns.settings.with_raw_response.get(
-            account_id="account_id",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.dns.settings.with_streaming_response.get(
-            account_id="account_id",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(reason="HTTP 422 from prism")
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.dns.settings.with_raw_response.get(
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.dns.settings.with_raw_response.get(
-                account_id="account_id",
-            )
diff --git a/tests/api_resources/dns/zone_transfers/__init__.py b/tests/api_resources/dns/zone_transfers/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/dns/zone_transfers/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/dns/zone_transfers/outgoing/__init__.py b/tests/api_resources/dns/zone_transfers/outgoing/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/dns/zone_transfers/outgoing/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/dns/zone_transfers/outgoing/test_status.py b/tests/api_resources/dns/zone_transfers/outgoing/test_status.py
new file mode 100644
index 00000000000..ac11f1743d2
--- /dev/null
+++ b/tests/api_resources/dns/zone_transfers/outgoing/test_status.py
@@ -0,0 +1,99 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestStatus:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        status = client.dns.zone_transfers.outgoing.status.get(
+            zone_id="269d8f4853475ca241c4e730be286b20",
+        )
+        assert_matches_type(str, status, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.dns.zone_transfers.outgoing.status.with_raw_response.get(
+            zone_id="269d8f4853475ca241c4e730be286b20",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        status = response.parse()
+        assert_matches_type(str, status, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.dns.zone_transfers.outgoing.status.with_streaming_response.get(
+            zone_id="269d8f4853475ca241c4e730be286b20",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            status = response.parse()
+            assert_matches_type(str, status, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.dns.zone_transfers.outgoing.status.with_raw_response.get(
+                zone_id="",
+            )
+
+
+class TestAsyncStatus:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        status = await async_client.dns.zone_transfers.outgoing.status.get(
+            zone_id="269d8f4853475ca241c4e730be286b20",
+        )
+        assert_matches_type(str, status, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns.zone_transfers.outgoing.status.with_raw_response.get(
+            zone_id="269d8f4853475ca241c4e730be286b20",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        status = await response.parse()
+        assert_matches_type(str, status, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns.zone_transfers.outgoing.status.with_streaming_response.get(
+            zone_id="269d8f4853475ca241c4e730be286b20",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            status = await response.parse()
+            assert_matches_type(str, status, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.dns.zone_transfers.outgoing.status.with_raw_response.get(
+                zone_id="",
+            )
diff --git a/tests/api_resources/secondary_dns/test_acls.py b/tests/api_resources/dns/zone_transfers/test_acls.py
similarity index 81%
rename from tests/api_resources/secondary_dns/test_acls.py
rename to tests/api_resources/dns/zone_transfers/test_acls.py
index 421109936c4..17a8ce6984f 100644
--- a/tests/api_resources/secondary_dns/test_acls.py
+++ b/tests/api_resources/dns/zone_transfers/test_acls.py
@@ -10,7 +10,7 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.secondary_dns import ACL, ACLDeleteResponse
+from cloudflare.types.dns.zone_transfers import ACL, ACLDeleteResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -21,18 +21,20 @@ class TestACLs:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
-        acl = client.secondary_dns.acls.create(
+        acl = client.dns.zone_transfers.acls.create(
             account_id="01a7362d577a6c3019a474fd6f485823",
-            body={},
+            ip_range="192.0.2.53/28",
+            name="my-acl-1",
         )
         assert_matches_type(Optional[ACL], acl, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.acls.with_raw_response.create(
+        response = client.dns.zone_transfers.acls.with_raw_response.create(
             account_id="01a7362d577a6c3019a474fd6f485823",
-            body={},
+            ip_range="192.0.2.53/28",
+            name="my-acl-1",
         )
 
         assert response.is_closed is True
@@ -43,9 +45,10 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.secondary_dns.acls.with_streaming_response.create(
+        with client.dns.zone_transfers.acls.with_streaming_response.create(
             account_id="01a7362d577a6c3019a474fd6f485823",
-            body={},
+            ip_range="192.0.2.53/28",
+            name="my-acl-1",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -59,14 +62,15 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.secondary_dns.acls.with_raw_response.create(
+            client.dns.zone_transfers.acls.with_raw_response.create(
                 account_id="",
-                body={},
+                ip_range="192.0.2.53/28",
+                name="my-acl-1",
             )
 
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
-        acl = client.secondary_dns.acls.update(
+        acl = client.dns.zone_transfers.acls.update(
             acl_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
             ip_range="192.0.2.53/28",
@@ -76,7 +80,7 @@ def test_method_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.acls.with_raw_response.update(
+        response = client.dns.zone_transfers.acls.with_raw_response.update(
             acl_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
             ip_range="192.0.2.53/28",
@@ -90,7 +94,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.secondary_dns.acls.with_streaming_response.update(
+        with client.dns.zone_transfers.acls.with_streaming_response.update(
             acl_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
             ip_range="192.0.2.53/28",
@@ -107,7 +111,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.secondary_dns.acls.with_raw_response.update(
+            client.dns.zone_transfers.acls.with_raw_response.update(
                 acl_id="23ff594956f20c2a721606e94745a8aa",
                 account_id="",
                 ip_range="192.0.2.53/28",
@@ -115,7 +119,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `acl_id` but received ''"):
-            client.secondary_dns.acls.with_raw_response.update(
+            client.dns.zone_transfers.acls.with_raw_response.update(
                 acl_id="",
                 account_id="01a7362d577a6c3019a474fd6f485823",
                 ip_range="192.0.2.53/28",
@@ -124,14 +128,14 @@ def test_path_params_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
-        acl = client.secondary_dns.acls.list(
+        acl = client.dns.zone_transfers.acls.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
         assert_matches_type(SyncSinglePage[ACL], acl, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.acls.with_raw_response.list(
+        response = client.dns.zone_transfers.acls.with_raw_response.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
 
@@ -142,7 +146,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.secondary_dns.acls.with_streaming_response.list(
+        with client.dns.zone_transfers.acls.with_streaming_response.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
             assert not response.is_closed
@@ -156,13 +160,13 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.secondary_dns.acls.with_raw_response.list(
+            client.dns.zone_transfers.acls.with_raw_response.list(
                 account_id="",
             )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
-        acl = client.secondary_dns.acls.delete(
+        acl = client.dns.zone_transfers.acls.delete(
             acl_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -170,7 +174,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.acls.with_raw_response.delete(
+        response = client.dns.zone_transfers.acls.with_raw_response.delete(
             acl_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -182,7 +186,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.secondary_dns.acls.with_streaming_response.delete(
+        with client.dns.zone_transfers.acls.with_streaming_response.delete(
             acl_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
@@ -197,20 +201,20 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.secondary_dns.acls.with_raw_response.delete(
+            client.dns.zone_transfers.acls.with_raw_response.delete(
                 acl_id="23ff594956f20c2a721606e94745a8aa",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `acl_id` but received ''"):
-            client.secondary_dns.acls.with_raw_response.delete(
+            client.dns.zone_transfers.acls.with_raw_response.delete(
                 acl_id="",
                 account_id="01a7362d577a6c3019a474fd6f485823",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        acl = client.secondary_dns.acls.get(
+        acl = client.dns.zone_transfers.acls.get(
             acl_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -218,7 +222,7 @@ def test_method_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.acls.with_raw_response.get(
+        response = client.dns.zone_transfers.acls.with_raw_response.get(
             acl_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -230,7 +234,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.secondary_dns.acls.with_streaming_response.get(
+        with client.dns.zone_transfers.acls.with_streaming_response.get(
             acl_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
@@ -245,36 +249,40 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.secondary_dns.acls.with_raw_response.get(
+            client.dns.zone_transfers.acls.with_raw_response.get(
                 acl_id="23ff594956f20c2a721606e94745a8aa",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `acl_id` but received ''"):
-            client.secondary_dns.acls.with_raw_response.get(
+            client.dns.zone_transfers.acls.with_raw_response.get(
                 acl_id="",
                 account_id="01a7362d577a6c3019a474fd6f485823",
             )
 
 
 class TestAsyncACLs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        acl = await async_client.secondary_dns.acls.create(
+        acl = await async_client.dns.zone_transfers.acls.create(
             account_id="01a7362d577a6c3019a474fd6f485823",
-            body={},
+            ip_range="192.0.2.53/28",
+            name="my-acl-1",
         )
         assert_matches_type(Optional[ACL], acl, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.acls.with_raw_response.create(
+        response = await async_client.dns.zone_transfers.acls.with_raw_response.create(
             account_id="01a7362d577a6c3019a474fd6f485823",
-            body={},
+            ip_range="192.0.2.53/28",
+            name="my-acl-1",
         )
 
         assert response.is_closed is True
@@ -285,9 +293,10 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.acls.with_streaming_response.create(
+        async with async_client.dns.zone_transfers.acls.with_streaming_response.create(
             account_id="01a7362d577a6c3019a474fd6f485823",
-            body={},
+            ip_range="192.0.2.53/28",
+            name="my-acl-1",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -301,14 +310,15 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.secondary_dns.acls.with_raw_response.create(
+            await async_client.dns.zone_transfers.acls.with_raw_response.create(
                 account_id="",
-                body={},
+                ip_range="192.0.2.53/28",
+                name="my-acl-1",
             )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        acl = await async_client.secondary_dns.acls.update(
+        acl = await async_client.dns.zone_transfers.acls.update(
             acl_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
             ip_range="192.0.2.53/28",
@@ -318,7 +328,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.acls.with_raw_response.update(
+        response = await async_client.dns.zone_transfers.acls.with_raw_response.update(
             acl_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
             ip_range="192.0.2.53/28",
@@ -332,7 +342,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.acls.with_streaming_response.update(
+        async with async_client.dns.zone_transfers.acls.with_streaming_response.update(
             acl_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
             ip_range="192.0.2.53/28",
@@ -349,7 +359,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.secondary_dns.acls.with_raw_response.update(
+            await async_client.dns.zone_transfers.acls.with_raw_response.update(
                 acl_id="23ff594956f20c2a721606e94745a8aa",
                 account_id="",
                 ip_range="192.0.2.53/28",
@@ -357,7 +367,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `acl_id` but received ''"):
-            await async_client.secondary_dns.acls.with_raw_response.update(
+            await async_client.dns.zone_transfers.acls.with_raw_response.update(
                 acl_id="",
                 account_id="01a7362d577a6c3019a474fd6f485823",
                 ip_range="192.0.2.53/28",
@@ -366,14 +376,14 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        acl = await async_client.secondary_dns.acls.list(
+        acl = await async_client.dns.zone_transfers.acls.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
         assert_matches_type(AsyncSinglePage[ACL], acl, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.acls.with_raw_response.list(
+        response = await async_client.dns.zone_transfers.acls.with_raw_response.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
 
@@ -384,7 +394,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.acls.with_streaming_response.list(
+        async with async_client.dns.zone_transfers.acls.with_streaming_response.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
             assert not response.is_closed
@@ -398,13 +408,13 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.secondary_dns.acls.with_raw_response.list(
+            await async_client.dns.zone_transfers.acls.with_raw_response.list(
                 account_id="",
             )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        acl = await async_client.secondary_dns.acls.delete(
+        acl = await async_client.dns.zone_transfers.acls.delete(
             acl_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -412,7 +422,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.acls.with_raw_response.delete(
+        response = await async_client.dns.zone_transfers.acls.with_raw_response.delete(
             acl_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -424,7 +434,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.acls.with_streaming_response.delete(
+        async with async_client.dns.zone_transfers.acls.with_streaming_response.delete(
             acl_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
@@ -439,20 +449,20 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.secondary_dns.acls.with_raw_response.delete(
+            await async_client.dns.zone_transfers.acls.with_raw_response.delete(
                 acl_id="23ff594956f20c2a721606e94745a8aa",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `acl_id` but received ''"):
-            await async_client.secondary_dns.acls.with_raw_response.delete(
+            await async_client.dns.zone_transfers.acls.with_raw_response.delete(
                 acl_id="",
                 account_id="01a7362d577a6c3019a474fd6f485823",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        acl = await async_client.secondary_dns.acls.get(
+        acl = await async_client.dns.zone_transfers.acls.get(
             acl_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -460,7 +470,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.acls.with_raw_response.get(
+        response = await async_client.dns.zone_transfers.acls.with_raw_response.get(
             acl_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -472,7 +482,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.acls.with_streaming_response.get(
+        async with async_client.dns.zone_transfers.acls.with_streaming_response.get(
             acl_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
@@ -487,13 +497,13 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.secondary_dns.acls.with_raw_response.get(
+            await async_client.dns.zone_transfers.acls.with_raw_response.get(
                 acl_id="23ff594956f20c2a721606e94745a8aa",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `acl_id` but received ''"):
-            await async_client.secondary_dns.acls.with_raw_response.get(
+            await async_client.dns.zone_transfers.acls.with_raw_response.get(
                 acl_id="",
                 account_id="01a7362d577a6c3019a474fd6f485823",
             )
diff --git a/tests/api_resources/secondary_dns/test_force_axfr.py b/tests/api_resources/dns/zone_transfers/test_force_axfr.py
similarity index 80%
rename from tests/api_resources/secondary_dns/test_force_axfr.py
rename to tests/api_resources/dns/zone_transfers/test_force_axfr.py
index 2e0d975d424..1041d8749e6 100644
--- a/tests/api_resources/secondary_dns/test_force_axfr.py
+++ b/tests/api_resources/dns/zone_transfers/test_force_axfr.py
@@ -18,7 +18,7 @@ class TestForceAXFR:
 
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
-        force_axfr = client.secondary_dns.force_axfr.create(
+        force_axfr = client.dns.zone_transfers.force_axfr.create(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         )
@@ -26,7 +26,7 @@ def test_method_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.force_axfr.with_raw_response.create(
+        response = client.dns.zone_transfers.force_axfr.with_raw_response.create(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         )
@@ -38,7 +38,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.secondary_dns.force_axfr.with_streaming_response.create(
+        with client.dns.zone_transfers.force_axfr.with_streaming_response.create(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         ) as response:
@@ -53,18 +53,20 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.secondary_dns.force_axfr.with_raw_response.create(
+            client.dns.zone_transfers.force_axfr.with_raw_response.create(
                 zone_id="",
                 body={},
             )
 
 
 class TestAsyncForceAXFR:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        force_axfr = await async_client.secondary_dns.force_axfr.create(
+        force_axfr = await async_client.dns.zone_transfers.force_axfr.create(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         )
@@ -72,7 +74,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.force_axfr.with_raw_response.create(
+        response = await async_client.dns.zone_transfers.force_axfr.with_raw_response.create(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         )
@@ -84,7 +86,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.force_axfr.with_streaming_response.create(
+        async with async_client.dns.zone_transfers.force_axfr.with_streaming_response.create(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         ) as response:
@@ -99,7 +101,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.secondary_dns.force_axfr.with_raw_response.create(
+            await async_client.dns.zone_transfers.force_axfr.with_raw_response.create(
                 zone_id="",
                 body={},
             )
diff --git a/tests/api_resources/secondary_dns/test_incoming.py b/tests/api_resources/dns/zone_transfers/test_incoming.py
similarity index 84%
rename from tests/api_resources/secondary_dns/test_incoming.py
rename to tests/api_resources/dns/zone_transfers/test_incoming.py
index f5dfb88362c..c9f7894ced1 100644
--- a/tests/api_resources/secondary_dns/test_incoming.py
+++ b/tests/api_resources/dns/zone_transfers/test_incoming.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.secondary_dns import (
+from cloudflare.types.dns.zone_transfers import (
     IncomingGetResponse,
     IncomingCreateResponse,
     IncomingDeleteResponse,
@@ -24,7 +24,7 @@ class TestIncoming:
 
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
-        incoming = client.secondary_dns.incoming.create(
+        incoming = client.dns.zone_transfers.incoming.create(
             zone_id="269d8f4853475ca241c4e730be286b20",
             auto_refresh_seconds=86400,
             name="www.example.com.",
@@ -34,7 +34,7 @@ def test_method_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.incoming.with_raw_response.create(
+        response = client.dns.zone_transfers.incoming.with_raw_response.create(
             zone_id="269d8f4853475ca241c4e730be286b20",
             auto_refresh_seconds=86400,
             name="www.example.com.",
@@ -48,7 +48,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.secondary_dns.incoming.with_streaming_response.create(
+        with client.dns.zone_transfers.incoming.with_streaming_response.create(
             zone_id="269d8f4853475ca241c4e730be286b20",
             auto_refresh_seconds=86400,
             name="www.example.com.",
@@ -65,7 +65,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.secondary_dns.incoming.with_raw_response.create(
+            client.dns.zone_transfers.incoming.with_raw_response.create(
                 zone_id="",
                 auto_refresh_seconds=86400,
                 name="www.example.com.",
@@ -74,7 +74,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
-        incoming = client.secondary_dns.incoming.update(
+        incoming = client.dns.zone_transfers.incoming.update(
             zone_id="269d8f4853475ca241c4e730be286b20",
             auto_refresh_seconds=86400,
             name="www.example.com.",
@@ -84,7 +84,7 @@ def test_method_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.incoming.with_raw_response.update(
+        response = client.dns.zone_transfers.incoming.with_raw_response.update(
             zone_id="269d8f4853475ca241c4e730be286b20",
             auto_refresh_seconds=86400,
             name="www.example.com.",
@@ -98,7 +98,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.secondary_dns.incoming.with_streaming_response.update(
+        with client.dns.zone_transfers.incoming.with_streaming_response.update(
             zone_id="269d8f4853475ca241c4e730be286b20",
             auto_refresh_seconds=86400,
             name="www.example.com.",
@@ -115,7 +115,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.secondary_dns.incoming.with_raw_response.update(
+            client.dns.zone_transfers.incoming.with_raw_response.update(
                 zone_id="",
                 auto_refresh_seconds=86400,
                 name="www.example.com.",
@@ -124,14 +124,14 @@ def test_path_params_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
-        incoming = client.secondary_dns.incoming.delete(
+        incoming = client.dns.zone_transfers.incoming.delete(
             zone_id="269d8f4853475ca241c4e730be286b20",
         )
         assert_matches_type(Optional[IncomingDeleteResponse], incoming, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.incoming.with_raw_response.delete(
+        response = client.dns.zone_transfers.incoming.with_raw_response.delete(
             zone_id="269d8f4853475ca241c4e730be286b20",
         )
 
@@ -142,7 +142,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.secondary_dns.incoming.with_streaming_response.delete(
+        with client.dns.zone_transfers.incoming.with_streaming_response.delete(
             zone_id="269d8f4853475ca241c4e730be286b20",
         ) as response:
             assert not response.is_closed
@@ -156,20 +156,20 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.secondary_dns.incoming.with_raw_response.delete(
+            client.dns.zone_transfers.incoming.with_raw_response.delete(
                 zone_id="",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        incoming = client.secondary_dns.incoming.get(
+        incoming = client.dns.zone_transfers.incoming.get(
             zone_id="269d8f4853475ca241c4e730be286b20",
         )
         assert_matches_type(Optional[IncomingGetResponse], incoming, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.incoming.with_raw_response.get(
+        response = client.dns.zone_transfers.incoming.with_raw_response.get(
             zone_id="269d8f4853475ca241c4e730be286b20",
         )
 
@@ -180,7 +180,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.secondary_dns.incoming.with_streaming_response.get(
+        with client.dns.zone_transfers.incoming.with_streaming_response.get(
             zone_id="269d8f4853475ca241c4e730be286b20",
         ) as response:
             assert not response.is_closed
@@ -194,17 +194,19 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.secondary_dns.incoming.with_raw_response.get(
+            client.dns.zone_transfers.incoming.with_raw_response.get(
                 zone_id="",
             )
 
 
 class TestAsyncIncoming:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        incoming = await async_client.secondary_dns.incoming.create(
+        incoming = await async_client.dns.zone_transfers.incoming.create(
             zone_id="269d8f4853475ca241c4e730be286b20",
             auto_refresh_seconds=86400,
             name="www.example.com.",
@@ -214,7 +216,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.incoming.with_raw_response.create(
+        response = await async_client.dns.zone_transfers.incoming.with_raw_response.create(
             zone_id="269d8f4853475ca241c4e730be286b20",
             auto_refresh_seconds=86400,
             name="www.example.com.",
@@ -228,7 +230,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.incoming.with_streaming_response.create(
+        async with async_client.dns.zone_transfers.incoming.with_streaming_response.create(
             zone_id="269d8f4853475ca241c4e730be286b20",
             auto_refresh_seconds=86400,
             name="www.example.com.",
@@ -245,7 +247,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.secondary_dns.incoming.with_raw_response.create(
+            await async_client.dns.zone_transfers.incoming.with_raw_response.create(
                 zone_id="",
                 auto_refresh_seconds=86400,
                 name="www.example.com.",
@@ -254,7 +256,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        incoming = await async_client.secondary_dns.incoming.update(
+        incoming = await async_client.dns.zone_transfers.incoming.update(
             zone_id="269d8f4853475ca241c4e730be286b20",
             auto_refresh_seconds=86400,
             name="www.example.com.",
@@ -264,7 +266,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.incoming.with_raw_response.update(
+        response = await async_client.dns.zone_transfers.incoming.with_raw_response.update(
             zone_id="269d8f4853475ca241c4e730be286b20",
             auto_refresh_seconds=86400,
             name="www.example.com.",
@@ -278,7 +280,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.incoming.with_streaming_response.update(
+        async with async_client.dns.zone_transfers.incoming.with_streaming_response.update(
             zone_id="269d8f4853475ca241c4e730be286b20",
             auto_refresh_seconds=86400,
             name="www.example.com.",
@@ -295,7 +297,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.secondary_dns.incoming.with_raw_response.update(
+            await async_client.dns.zone_transfers.incoming.with_raw_response.update(
                 zone_id="",
                 auto_refresh_seconds=86400,
                 name="www.example.com.",
@@ -304,14 +306,14 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        incoming = await async_client.secondary_dns.incoming.delete(
+        incoming = await async_client.dns.zone_transfers.incoming.delete(
             zone_id="269d8f4853475ca241c4e730be286b20",
         )
         assert_matches_type(Optional[IncomingDeleteResponse], incoming, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.incoming.with_raw_response.delete(
+        response = await async_client.dns.zone_transfers.incoming.with_raw_response.delete(
             zone_id="269d8f4853475ca241c4e730be286b20",
         )
 
@@ -322,7 +324,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.incoming.with_streaming_response.delete(
+        async with async_client.dns.zone_transfers.incoming.with_streaming_response.delete(
             zone_id="269d8f4853475ca241c4e730be286b20",
         ) as response:
             assert not response.is_closed
@@ -336,20 +338,20 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.secondary_dns.incoming.with_raw_response.delete(
+            await async_client.dns.zone_transfers.incoming.with_raw_response.delete(
                 zone_id="",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        incoming = await async_client.secondary_dns.incoming.get(
+        incoming = await async_client.dns.zone_transfers.incoming.get(
             zone_id="269d8f4853475ca241c4e730be286b20",
         )
         assert_matches_type(Optional[IncomingGetResponse], incoming, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.incoming.with_raw_response.get(
+        response = await async_client.dns.zone_transfers.incoming.with_raw_response.get(
             zone_id="269d8f4853475ca241c4e730be286b20",
         )
 
@@ -360,7 +362,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.incoming.with_streaming_response.get(
+        async with async_client.dns.zone_transfers.incoming.with_streaming_response.get(
             zone_id="269d8f4853475ca241c4e730be286b20",
         ) as response:
             assert not response.is_closed
@@ -374,6 +376,6 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.secondary_dns.incoming.with_raw_response.get(
+            await async_client.dns.zone_transfers.incoming.with_raw_response.get(
                 zone_id="",
             )
diff --git a/tests/api_resources/secondary_dns/test_outgoing.py b/tests/api_resources/dns/zone_transfers/test_outgoing.py
similarity index 83%
rename from tests/api_resources/secondary_dns/test_outgoing.py
rename to tests/api_resources/dns/zone_transfers/test_outgoing.py
index 8e9a1d8e9e2..15137462121 100644
--- a/tests/api_resources/secondary_dns/test_outgoing.py
+++ b/tests/api_resources/dns/zone_transfers/test_outgoing.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.secondary_dns import (
+from cloudflare.types.dns.zone_transfers import (
     OutgoingGetResponse,
     OutgoingCreateResponse,
     OutgoingDeleteResponse,
@@ -24,7 +24,7 @@ class TestOutgoing:
 
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
-        outgoing = client.secondary_dns.outgoing.create(
+        outgoing = client.dns.zone_transfers.outgoing.create(
             zone_id="269d8f4853475ca241c4e730be286b20",
             name="www.example.com.",
             peers=["23ff594956f20c2a721606e94745a8aa", "00920f38ce07c2e2f4df50b1f61d4194"],
@@ -33,7 +33,7 @@ def test_method_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.outgoing.with_raw_response.create(
+        response = client.dns.zone_transfers.outgoing.with_raw_response.create(
             zone_id="269d8f4853475ca241c4e730be286b20",
             name="www.example.com.",
             peers=["23ff594956f20c2a721606e94745a8aa", "00920f38ce07c2e2f4df50b1f61d4194"],
@@ -46,7 +46,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.secondary_dns.outgoing.with_streaming_response.create(
+        with client.dns.zone_transfers.outgoing.with_streaming_response.create(
             zone_id="269d8f4853475ca241c4e730be286b20",
             name="www.example.com.",
             peers=["23ff594956f20c2a721606e94745a8aa", "00920f38ce07c2e2f4df50b1f61d4194"],
@@ -62,7 +62,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.secondary_dns.outgoing.with_raw_response.create(
+            client.dns.zone_transfers.outgoing.with_raw_response.create(
                 zone_id="",
                 name="www.example.com.",
                 peers=["23ff594956f20c2a721606e94745a8aa", "00920f38ce07c2e2f4df50b1f61d4194"],
@@ -70,7 +70,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
-        outgoing = client.secondary_dns.outgoing.update(
+        outgoing = client.dns.zone_transfers.outgoing.update(
             zone_id="269d8f4853475ca241c4e730be286b20",
             name="www.example.com.",
             peers=["23ff594956f20c2a721606e94745a8aa", "00920f38ce07c2e2f4df50b1f61d4194"],
@@ -79,7 +79,7 @@ def test_method_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.outgoing.with_raw_response.update(
+        response = client.dns.zone_transfers.outgoing.with_raw_response.update(
             zone_id="269d8f4853475ca241c4e730be286b20",
             name="www.example.com.",
             peers=["23ff594956f20c2a721606e94745a8aa", "00920f38ce07c2e2f4df50b1f61d4194"],
@@ -92,7 +92,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.secondary_dns.outgoing.with_streaming_response.update(
+        with client.dns.zone_transfers.outgoing.with_streaming_response.update(
             zone_id="269d8f4853475ca241c4e730be286b20",
             name="www.example.com.",
             peers=["23ff594956f20c2a721606e94745a8aa", "00920f38ce07c2e2f4df50b1f61d4194"],
@@ -108,7 +108,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.secondary_dns.outgoing.with_raw_response.update(
+            client.dns.zone_transfers.outgoing.with_raw_response.update(
                 zone_id="",
                 name="www.example.com.",
                 peers=["23ff594956f20c2a721606e94745a8aa", "00920f38ce07c2e2f4df50b1f61d4194"],
@@ -116,14 +116,14 @@ def test_path_params_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
-        outgoing = client.secondary_dns.outgoing.delete(
+        outgoing = client.dns.zone_transfers.outgoing.delete(
             zone_id="269d8f4853475ca241c4e730be286b20",
         )
         assert_matches_type(Optional[OutgoingDeleteResponse], outgoing, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.outgoing.with_raw_response.delete(
+        response = client.dns.zone_transfers.outgoing.with_raw_response.delete(
             zone_id="269d8f4853475ca241c4e730be286b20",
         )
 
@@ -134,7 +134,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.secondary_dns.outgoing.with_streaming_response.delete(
+        with client.dns.zone_transfers.outgoing.with_streaming_response.delete(
             zone_id="269d8f4853475ca241c4e730be286b20",
         ) as response:
             assert not response.is_closed
@@ -148,13 +148,13 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.secondary_dns.outgoing.with_raw_response.delete(
+            client.dns.zone_transfers.outgoing.with_raw_response.delete(
                 zone_id="",
             )
 
     @parametrize
     def test_method_disable(self, client: Cloudflare) -> None:
-        outgoing = client.secondary_dns.outgoing.disable(
+        outgoing = client.dns.zone_transfers.outgoing.disable(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         )
@@ -162,7 +162,7 @@ def test_method_disable(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_disable(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.outgoing.with_raw_response.disable(
+        response = client.dns.zone_transfers.outgoing.with_raw_response.disable(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         )
@@ -174,7 +174,7 @@ def test_raw_response_disable(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_disable(self, client: Cloudflare) -> None:
-        with client.secondary_dns.outgoing.with_streaming_response.disable(
+        with client.dns.zone_transfers.outgoing.with_streaming_response.disable(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         ) as response:
@@ -189,14 +189,14 @@ def test_streaming_response_disable(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_disable(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.secondary_dns.outgoing.with_raw_response.disable(
+            client.dns.zone_transfers.outgoing.with_raw_response.disable(
                 zone_id="",
                 body={},
             )
 
     @parametrize
     def test_method_enable(self, client: Cloudflare) -> None:
-        outgoing = client.secondary_dns.outgoing.enable(
+        outgoing = client.dns.zone_transfers.outgoing.enable(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         )
@@ -204,7 +204,7 @@ def test_method_enable(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_enable(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.outgoing.with_raw_response.enable(
+        response = client.dns.zone_transfers.outgoing.with_raw_response.enable(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         )
@@ -216,7 +216,7 @@ def test_raw_response_enable(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_enable(self, client: Cloudflare) -> None:
-        with client.secondary_dns.outgoing.with_streaming_response.enable(
+        with client.dns.zone_transfers.outgoing.with_streaming_response.enable(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         ) as response:
@@ -231,14 +231,14 @@ def test_streaming_response_enable(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_enable(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.secondary_dns.outgoing.with_raw_response.enable(
+            client.dns.zone_transfers.outgoing.with_raw_response.enable(
                 zone_id="",
                 body={},
             )
 
     @parametrize
     def test_method_force_notify(self, client: Cloudflare) -> None:
-        outgoing = client.secondary_dns.outgoing.force_notify(
+        outgoing = client.dns.zone_transfers.outgoing.force_notify(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         )
@@ -246,7 +246,7 @@ def test_method_force_notify(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_force_notify(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.outgoing.with_raw_response.force_notify(
+        response = client.dns.zone_transfers.outgoing.with_raw_response.force_notify(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         )
@@ -258,7 +258,7 @@ def test_raw_response_force_notify(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_force_notify(self, client: Cloudflare) -> None:
-        with client.secondary_dns.outgoing.with_streaming_response.force_notify(
+        with client.dns.zone_transfers.outgoing.with_streaming_response.force_notify(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         ) as response:
@@ -273,21 +273,21 @@ def test_streaming_response_force_notify(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_force_notify(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.secondary_dns.outgoing.with_raw_response.force_notify(
+            client.dns.zone_transfers.outgoing.with_raw_response.force_notify(
                 zone_id="",
                 body={},
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        outgoing = client.secondary_dns.outgoing.get(
+        outgoing = client.dns.zone_transfers.outgoing.get(
             zone_id="269d8f4853475ca241c4e730be286b20",
         )
         assert_matches_type(Optional[OutgoingGetResponse], outgoing, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.outgoing.with_raw_response.get(
+        response = client.dns.zone_transfers.outgoing.with_raw_response.get(
             zone_id="269d8f4853475ca241c4e730be286b20",
         )
 
@@ -298,7 +298,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.secondary_dns.outgoing.with_streaming_response.get(
+        with client.dns.zone_transfers.outgoing.with_streaming_response.get(
             zone_id="269d8f4853475ca241c4e730be286b20",
         ) as response:
             assert not response.is_closed
@@ -312,17 +312,19 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.secondary_dns.outgoing.with_raw_response.get(
+            client.dns.zone_transfers.outgoing.with_raw_response.get(
                 zone_id="",
             )
 
 
 class TestAsyncOutgoing:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        outgoing = await async_client.secondary_dns.outgoing.create(
+        outgoing = await async_client.dns.zone_transfers.outgoing.create(
             zone_id="269d8f4853475ca241c4e730be286b20",
             name="www.example.com.",
             peers=["23ff594956f20c2a721606e94745a8aa", "00920f38ce07c2e2f4df50b1f61d4194"],
@@ -331,7 +333,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.outgoing.with_raw_response.create(
+        response = await async_client.dns.zone_transfers.outgoing.with_raw_response.create(
             zone_id="269d8f4853475ca241c4e730be286b20",
             name="www.example.com.",
             peers=["23ff594956f20c2a721606e94745a8aa", "00920f38ce07c2e2f4df50b1f61d4194"],
@@ -344,7 +346,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.outgoing.with_streaming_response.create(
+        async with async_client.dns.zone_transfers.outgoing.with_streaming_response.create(
             zone_id="269d8f4853475ca241c4e730be286b20",
             name="www.example.com.",
             peers=["23ff594956f20c2a721606e94745a8aa", "00920f38ce07c2e2f4df50b1f61d4194"],
@@ -360,7 +362,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.secondary_dns.outgoing.with_raw_response.create(
+            await async_client.dns.zone_transfers.outgoing.with_raw_response.create(
                 zone_id="",
                 name="www.example.com.",
                 peers=["23ff594956f20c2a721606e94745a8aa", "00920f38ce07c2e2f4df50b1f61d4194"],
@@ -368,7 +370,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        outgoing = await async_client.secondary_dns.outgoing.update(
+        outgoing = await async_client.dns.zone_transfers.outgoing.update(
             zone_id="269d8f4853475ca241c4e730be286b20",
             name="www.example.com.",
             peers=["23ff594956f20c2a721606e94745a8aa", "00920f38ce07c2e2f4df50b1f61d4194"],
@@ -377,7 +379,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.outgoing.with_raw_response.update(
+        response = await async_client.dns.zone_transfers.outgoing.with_raw_response.update(
             zone_id="269d8f4853475ca241c4e730be286b20",
             name="www.example.com.",
             peers=["23ff594956f20c2a721606e94745a8aa", "00920f38ce07c2e2f4df50b1f61d4194"],
@@ -390,7 +392,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.outgoing.with_streaming_response.update(
+        async with async_client.dns.zone_transfers.outgoing.with_streaming_response.update(
             zone_id="269d8f4853475ca241c4e730be286b20",
             name="www.example.com.",
             peers=["23ff594956f20c2a721606e94745a8aa", "00920f38ce07c2e2f4df50b1f61d4194"],
@@ -406,7 +408,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.secondary_dns.outgoing.with_raw_response.update(
+            await async_client.dns.zone_transfers.outgoing.with_raw_response.update(
                 zone_id="",
                 name="www.example.com.",
                 peers=["23ff594956f20c2a721606e94745a8aa", "00920f38ce07c2e2f4df50b1f61d4194"],
@@ -414,14 +416,14 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        outgoing = await async_client.secondary_dns.outgoing.delete(
+        outgoing = await async_client.dns.zone_transfers.outgoing.delete(
             zone_id="269d8f4853475ca241c4e730be286b20",
         )
         assert_matches_type(Optional[OutgoingDeleteResponse], outgoing, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.outgoing.with_raw_response.delete(
+        response = await async_client.dns.zone_transfers.outgoing.with_raw_response.delete(
             zone_id="269d8f4853475ca241c4e730be286b20",
         )
 
@@ -432,7 +434,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.outgoing.with_streaming_response.delete(
+        async with async_client.dns.zone_transfers.outgoing.with_streaming_response.delete(
             zone_id="269d8f4853475ca241c4e730be286b20",
         ) as response:
             assert not response.is_closed
@@ -446,13 +448,13 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.secondary_dns.outgoing.with_raw_response.delete(
+            await async_client.dns.zone_transfers.outgoing.with_raw_response.delete(
                 zone_id="",
             )
 
     @parametrize
     async def test_method_disable(self, async_client: AsyncCloudflare) -> None:
-        outgoing = await async_client.secondary_dns.outgoing.disable(
+        outgoing = await async_client.dns.zone_transfers.outgoing.disable(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         )
@@ -460,7 +462,7 @@ async def test_method_disable(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_disable(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.outgoing.with_raw_response.disable(
+        response = await async_client.dns.zone_transfers.outgoing.with_raw_response.disable(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         )
@@ -472,7 +474,7 @@ async def test_raw_response_disable(self, async_client: AsyncCloudflare) -> None
 
     @parametrize
     async def test_streaming_response_disable(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.outgoing.with_streaming_response.disable(
+        async with async_client.dns.zone_transfers.outgoing.with_streaming_response.disable(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         ) as response:
@@ -487,14 +489,14 @@ async def test_streaming_response_disable(self, async_client: AsyncCloudflare) -
     @parametrize
     async def test_path_params_disable(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.secondary_dns.outgoing.with_raw_response.disable(
+            await async_client.dns.zone_transfers.outgoing.with_raw_response.disable(
                 zone_id="",
                 body={},
             )
 
     @parametrize
     async def test_method_enable(self, async_client: AsyncCloudflare) -> None:
-        outgoing = await async_client.secondary_dns.outgoing.enable(
+        outgoing = await async_client.dns.zone_transfers.outgoing.enable(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         )
@@ -502,7 +504,7 @@ async def test_method_enable(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_enable(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.outgoing.with_raw_response.enable(
+        response = await async_client.dns.zone_transfers.outgoing.with_raw_response.enable(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         )
@@ -514,7 +516,7 @@ async def test_raw_response_enable(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_enable(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.outgoing.with_streaming_response.enable(
+        async with async_client.dns.zone_transfers.outgoing.with_streaming_response.enable(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         ) as response:
@@ -529,14 +531,14 @@ async def test_streaming_response_enable(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_enable(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.secondary_dns.outgoing.with_raw_response.enable(
+            await async_client.dns.zone_transfers.outgoing.with_raw_response.enable(
                 zone_id="",
                 body={},
             )
 
     @parametrize
     async def test_method_force_notify(self, async_client: AsyncCloudflare) -> None:
-        outgoing = await async_client.secondary_dns.outgoing.force_notify(
+        outgoing = await async_client.dns.zone_transfers.outgoing.force_notify(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         )
@@ -544,7 +546,7 @@ async def test_method_force_notify(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_force_notify(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.outgoing.with_raw_response.force_notify(
+        response = await async_client.dns.zone_transfers.outgoing.with_raw_response.force_notify(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         )
@@ -556,7 +558,7 @@ async def test_raw_response_force_notify(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_streaming_response_force_notify(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.outgoing.with_streaming_response.force_notify(
+        async with async_client.dns.zone_transfers.outgoing.with_streaming_response.force_notify(
             zone_id="269d8f4853475ca241c4e730be286b20",
             body={},
         ) as response:
@@ -571,21 +573,21 @@ async def test_streaming_response_force_notify(self, async_client: AsyncCloudfla
     @parametrize
     async def test_path_params_force_notify(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.secondary_dns.outgoing.with_raw_response.force_notify(
+            await async_client.dns.zone_transfers.outgoing.with_raw_response.force_notify(
                 zone_id="",
                 body={},
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        outgoing = await async_client.secondary_dns.outgoing.get(
+        outgoing = await async_client.dns.zone_transfers.outgoing.get(
             zone_id="269d8f4853475ca241c4e730be286b20",
         )
         assert_matches_type(Optional[OutgoingGetResponse], outgoing, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.outgoing.with_raw_response.get(
+        response = await async_client.dns.zone_transfers.outgoing.with_raw_response.get(
             zone_id="269d8f4853475ca241c4e730be286b20",
         )
 
@@ -596,7 +598,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.outgoing.with_streaming_response.get(
+        async with async_client.dns.zone_transfers.outgoing.with_streaming_response.get(
             zone_id="269d8f4853475ca241c4e730be286b20",
         ) as response:
             assert not response.is_closed
@@ -610,6 +612,6 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.secondary_dns.outgoing.with_raw_response.get(
+            await async_client.dns.zone_transfers.outgoing.with_raw_response.get(
                 zone_id="",
             )
diff --git a/tests/api_resources/secondary_dns/test_peers.py b/tests/api_resources/dns/zone_transfers/test_peers.py
similarity index 82%
rename from tests/api_resources/secondary_dns/test_peers.py
rename to tests/api_resources/dns/zone_transfers/test_peers.py
index 82430f212f7..39e2a5e3254 100644
--- a/tests/api_resources/secondary_dns/test_peers.py
+++ b/tests/api_resources/dns/zone_transfers/test_peers.py
@@ -10,7 +10,7 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.secondary_dns import Peer, PeerDeleteResponse
+from cloudflare.types.dns.zone_transfers import Peer, PeerDeleteResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -21,18 +21,18 @@ class TestPeers:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
-        peer = client.secondary_dns.peers.create(
+        peer = client.dns.zone_transfers.peers.create(
             account_id="01a7362d577a6c3019a474fd6f485823",
-            body={},
+            name="my-peer-1",
         )
         assert_matches_type(Optional[Peer], peer, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.peers.with_raw_response.create(
+        response = client.dns.zone_transfers.peers.with_raw_response.create(
             account_id="01a7362d577a6c3019a474fd6f485823",
-            body={},
+            name="my-peer-1",
         )
 
         assert response.is_closed is True
@@ -43,9 +43,9 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.secondary_dns.peers.with_streaming_response.create(
+        with client.dns.zone_transfers.peers.with_streaming_response.create(
             account_id="01a7362d577a6c3019a474fd6f485823",
-            body={},
+            name="my-peer-1",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -59,14 +59,14 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.secondary_dns.peers.with_raw_response.create(
+            client.dns.zone_transfers.peers.with_raw_response.create(
                 account_id="",
-                body={},
+                name="my-peer-1",
             )
 
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
-        peer = client.secondary_dns.peers.update(
+        peer = client.dns.zone_transfers.peers.update(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
             name="my-peer-1",
@@ -75,7 +75,7 @@ def test_method_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        peer = client.secondary_dns.peers.update(
+        peer = client.dns.zone_transfers.peers.update(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
             name="my-peer-1",
@@ -88,7 +88,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.peers.with_raw_response.update(
+        response = client.dns.zone_transfers.peers.with_raw_response.update(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
             name="my-peer-1",
@@ -101,7 +101,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.secondary_dns.peers.with_streaming_response.update(
+        with client.dns.zone_transfers.peers.with_streaming_response.update(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
             name="my-peer-1",
@@ -117,14 +117,14 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.secondary_dns.peers.with_raw_response.update(
+            client.dns.zone_transfers.peers.with_raw_response.update(
                 peer_id="23ff594956f20c2a721606e94745a8aa",
                 account_id="",
                 name="my-peer-1",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `peer_id` but received ''"):
-            client.secondary_dns.peers.with_raw_response.update(
+            client.dns.zone_transfers.peers.with_raw_response.update(
                 peer_id="",
                 account_id="01a7362d577a6c3019a474fd6f485823",
                 name="my-peer-1",
@@ -132,14 +132,14 @@ def test_path_params_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
-        peer = client.secondary_dns.peers.list(
+        peer = client.dns.zone_transfers.peers.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
         assert_matches_type(SyncSinglePage[Peer], peer, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.peers.with_raw_response.list(
+        response = client.dns.zone_transfers.peers.with_raw_response.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
 
@@ -150,7 +150,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.secondary_dns.peers.with_streaming_response.list(
+        with client.dns.zone_transfers.peers.with_streaming_response.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
             assert not response.is_closed
@@ -164,13 +164,13 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.secondary_dns.peers.with_raw_response.list(
+            client.dns.zone_transfers.peers.with_raw_response.list(
                 account_id="",
             )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
-        peer = client.secondary_dns.peers.delete(
+        peer = client.dns.zone_transfers.peers.delete(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -178,7 +178,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.peers.with_raw_response.delete(
+        response = client.dns.zone_transfers.peers.with_raw_response.delete(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -190,7 +190,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.secondary_dns.peers.with_streaming_response.delete(
+        with client.dns.zone_transfers.peers.with_streaming_response.delete(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
@@ -205,20 +205,20 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.secondary_dns.peers.with_raw_response.delete(
+            client.dns.zone_transfers.peers.with_raw_response.delete(
                 peer_id="23ff594956f20c2a721606e94745a8aa",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `peer_id` but received ''"):
-            client.secondary_dns.peers.with_raw_response.delete(
+            client.dns.zone_transfers.peers.with_raw_response.delete(
                 peer_id="",
                 account_id="01a7362d577a6c3019a474fd6f485823",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        peer = client.secondary_dns.peers.get(
+        peer = client.dns.zone_transfers.peers.get(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -226,7 +226,7 @@ def test_method_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.peers.with_raw_response.get(
+        response = client.dns.zone_transfers.peers.with_raw_response.get(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -238,7 +238,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.secondary_dns.peers.with_streaming_response.get(
+        with client.dns.zone_transfers.peers.with_streaming_response.get(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
@@ -253,36 +253,38 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.secondary_dns.peers.with_raw_response.get(
+            client.dns.zone_transfers.peers.with_raw_response.get(
                 peer_id="23ff594956f20c2a721606e94745a8aa",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `peer_id` but received ''"):
-            client.secondary_dns.peers.with_raw_response.get(
+            client.dns.zone_transfers.peers.with_raw_response.get(
                 peer_id="",
                 account_id="01a7362d577a6c3019a474fd6f485823",
             )
 
 
 class TestAsyncPeers:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        peer = await async_client.secondary_dns.peers.create(
+        peer = await async_client.dns.zone_transfers.peers.create(
             account_id="01a7362d577a6c3019a474fd6f485823",
-            body={},
+            name="my-peer-1",
         )
         assert_matches_type(Optional[Peer], peer, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.peers.with_raw_response.create(
+        response = await async_client.dns.zone_transfers.peers.with_raw_response.create(
             account_id="01a7362d577a6c3019a474fd6f485823",
-            body={},
+            name="my-peer-1",
         )
 
         assert response.is_closed is True
@@ -293,9 +295,9 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.peers.with_streaming_response.create(
+        async with async_client.dns.zone_transfers.peers.with_streaming_response.create(
             account_id="01a7362d577a6c3019a474fd6f485823",
-            body={},
+            name="my-peer-1",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -309,14 +311,14 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.secondary_dns.peers.with_raw_response.create(
+            await async_client.dns.zone_transfers.peers.with_raw_response.create(
                 account_id="",
-                body={},
+                name="my-peer-1",
             )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        peer = await async_client.secondary_dns.peers.update(
+        peer = await async_client.dns.zone_transfers.peers.update(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
             name="my-peer-1",
@@ -325,7 +327,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        peer = await async_client.secondary_dns.peers.update(
+        peer = await async_client.dns.zone_transfers.peers.update(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
             name="my-peer-1",
@@ -338,7 +340,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.peers.with_raw_response.update(
+        response = await async_client.dns.zone_transfers.peers.with_raw_response.update(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
             name="my-peer-1",
@@ -351,7 +353,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.peers.with_streaming_response.update(
+        async with async_client.dns.zone_transfers.peers.with_streaming_response.update(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
             name="my-peer-1",
@@ -367,14 +369,14 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.secondary_dns.peers.with_raw_response.update(
+            await async_client.dns.zone_transfers.peers.with_raw_response.update(
                 peer_id="23ff594956f20c2a721606e94745a8aa",
                 account_id="",
                 name="my-peer-1",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `peer_id` but received ''"):
-            await async_client.secondary_dns.peers.with_raw_response.update(
+            await async_client.dns.zone_transfers.peers.with_raw_response.update(
                 peer_id="",
                 account_id="01a7362d577a6c3019a474fd6f485823",
                 name="my-peer-1",
@@ -382,14 +384,14 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        peer = await async_client.secondary_dns.peers.list(
+        peer = await async_client.dns.zone_transfers.peers.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
         assert_matches_type(AsyncSinglePage[Peer], peer, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.peers.with_raw_response.list(
+        response = await async_client.dns.zone_transfers.peers.with_raw_response.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
 
@@ -400,7 +402,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.peers.with_streaming_response.list(
+        async with async_client.dns.zone_transfers.peers.with_streaming_response.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
             assert not response.is_closed
@@ -414,13 +416,13 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.secondary_dns.peers.with_raw_response.list(
+            await async_client.dns.zone_transfers.peers.with_raw_response.list(
                 account_id="",
             )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        peer = await async_client.secondary_dns.peers.delete(
+        peer = await async_client.dns.zone_transfers.peers.delete(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -428,7 +430,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.peers.with_raw_response.delete(
+        response = await async_client.dns.zone_transfers.peers.with_raw_response.delete(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -440,7 +442,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.peers.with_streaming_response.delete(
+        async with async_client.dns.zone_transfers.peers.with_streaming_response.delete(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
@@ -455,20 +457,20 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.secondary_dns.peers.with_raw_response.delete(
+            await async_client.dns.zone_transfers.peers.with_raw_response.delete(
                 peer_id="23ff594956f20c2a721606e94745a8aa",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `peer_id` but received ''"):
-            await async_client.secondary_dns.peers.with_raw_response.delete(
+            await async_client.dns.zone_transfers.peers.with_raw_response.delete(
                 peer_id="",
                 account_id="01a7362d577a6c3019a474fd6f485823",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        peer = await async_client.secondary_dns.peers.get(
+        peer = await async_client.dns.zone_transfers.peers.get(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -476,7 +478,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.peers.with_raw_response.get(
+        response = await async_client.dns.zone_transfers.peers.with_raw_response.get(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -488,7 +490,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.peers.with_streaming_response.get(
+        async with async_client.dns.zone_transfers.peers.with_streaming_response.get(
             peer_id="23ff594956f20c2a721606e94745a8aa",
             account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
@@ -503,13 +505,13 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.secondary_dns.peers.with_raw_response.get(
+            await async_client.dns.zone_transfers.peers.with_raw_response.get(
                 peer_id="23ff594956f20c2a721606e94745a8aa",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `peer_id` but received ''"):
-            await async_client.secondary_dns.peers.with_raw_response.get(
+            await async_client.dns.zone_transfers.peers.with_raw_response.get(
                 peer_id="",
                 account_id="01a7362d577a6c3019a474fd6f485823",
             )
diff --git a/tests/api_resources/secondary_dns/test_tsigs.py b/tests/api_resources/dns/zone_transfers/test_tsigs.py
similarity index 85%
rename from tests/api_resources/secondary_dns/test_tsigs.py
rename to tests/api_resources/dns/zone_transfers/test_tsigs.py
index c75273b7eef..93277f99e97 100644
--- a/tests/api_resources/secondary_dns/test_tsigs.py
+++ b/tests/api_resources/dns/zone_transfers/test_tsigs.py
@@ -10,7 +10,7 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.secondary_dns import TSIG, TSIGDeleteResponse
+from cloudflare.types.dns.zone_transfers import TSIG, TSIGDeleteResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -20,7 +20,7 @@ class TestTSIGs:
 
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
-        tsig = client.secondary_dns.tsigs.create(
+        tsig = client.dns.zone_transfers.tsigs.create(
             account_id="01a7362d577a6c3019a474fd6f485823",
             algo="hmac-sha512.",
             name="tsig.customer.cf.",
@@ -30,7 +30,7 @@ def test_method_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.tsigs.with_raw_response.create(
+        response = client.dns.zone_transfers.tsigs.with_raw_response.create(
             account_id="01a7362d577a6c3019a474fd6f485823",
             algo="hmac-sha512.",
             name="tsig.customer.cf.",
@@ -44,7 +44,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.secondary_dns.tsigs.with_streaming_response.create(
+        with client.dns.zone_transfers.tsigs.with_streaming_response.create(
             account_id="01a7362d577a6c3019a474fd6f485823",
             algo="hmac-sha512.",
             name="tsig.customer.cf.",
@@ -61,7 +61,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.secondary_dns.tsigs.with_raw_response.create(
+            client.dns.zone_transfers.tsigs.with_raw_response.create(
                 account_id="",
                 algo="hmac-sha512.",
                 name="tsig.customer.cf.",
@@ -70,7 +70,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
-        tsig = client.secondary_dns.tsigs.update(
+        tsig = client.dns.zone_transfers.tsigs.update(
             tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
             account_id="01a7362d577a6c3019a474fd6f485823",
             algo="hmac-sha512.",
@@ -81,7 +81,7 @@ def test_method_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.tsigs.with_raw_response.update(
+        response = client.dns.zone_transfers.tsigs.with_raw_response.update(
             tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
             account_id="01a7362d577a6c3019a474fd6f485823",
             algo="hmac-sha512.",
@@ -96,7 +96,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.secondary_dns.tsigs.with_streaming_response.update(
+        with client.dns.zone_transfers.tsigs.with_streaming_response.update(
             tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
             account_id="01a7362d577a6c3019a474fd6f485823",
             algo="hmac-sha512.",
@@ -114,7 +114,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.secondary_dns.tsigs.with_raw_response.update(
+            client.dns.zone_transfers.tsigs.with_raw_response.update(
                 tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
                 account_id="",
                 algo="hmac-sha512.",
@@ -123,7 +123,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `tsig_id` but received ''"):
-            client.secondary_dns.tsigs.with_raw_response.update(
+            client.dns.zone_transfers.tsigs.with_raw_response.update(
                 tsig_id="",
                 account_id="01a7362d577a6c3019a474fd6f485823",
                 algo="hmac-sha512.",
@@ -133,14 +133,14 @@ def test_path_params_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
-        tsig = client.secondary_dns.tsigs.list(
+        tsig = client.dns.zone_transfers.tsigs.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
         assert_matches_type(SyncSinglePage[TSIG], tsig, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.tsigs.with_raw_response.list(
+        response = client.dns.zone_transfers.tsigs.with_raw_response.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
 
@@ -151,7 +151,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.secondary_dns.tsigs.with_streaming_response.list(
+        with client.dns.zone_transfers.tsigs.with_streaming_response.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
             assert not response.is_closed
@@ -165,13 +165,13 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.secondary_dns.tsigs.with_raw_response.list(
+            client.dns.zone_transfers.tsigs.with_raw_response.list(
                 account_id="",
             )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
-        tsig = client.secondary_dns.tsigs.delete(
+        tsig = client.dns.zone_transfers.tsigs.delete(
             tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -179,7 +179,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.tsigs.with_raw_response.delete(
+        response = client.dns.zone_transfers.tsigs.with_raw_response.delete(
             tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -191,7 +191,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.secondary_dns.tsigs.with_streaming_response.delete(
+        with client.dns.zone_transfers.tsigs.with_streaming_response.delete(
             tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
             account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
@@ -206,20 +206,20 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.secondary_dns.tsigs.with_raw_response.delete(
+            client.dns.zone_transfers.tsigs.with_raw_response.delete(
                 tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `tsig_id` but received ''"):
-            client.secondary_dns.tsigs.with_raw_response.delete(
+            client.dns.zone_transfers.tsigs.with_raw_response.delete(
                 tsig_id="",
                 account_id="01a7362d577a6c3019a474fd6f485823",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        tsig = client.secondary_dns.tsigs.get(
+        tsig = client.dns.zone_transfers.tsigs.get(
             tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -227,7 +227,7 @@ def test_method_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.tsigs.with_raw_response.get(
+        response = client.dns.zone_transfers.tsigs.with_raw_response.get(
             tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -239,7 +239,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.secondary_dns.tsigs.with_streaming_response.get(
+        with client.dns.zone_transfers.tsigs.with_streaming_response.get(
             tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
             account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
@@ -254,24 +254,26 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.secondary_dns.tsigs.with_raw_response.get(
+            client.dns.zone_transfers.tsigs.with_raw_response.get(
                 tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `tsig_id` but received ''"):
-            client.secondary_dns.tsigs.with_raw_response.get(
+            client.dns.zone_transfers.tsigs.with_raw_response.get(
                 tsig_id="",
                 account_id="01a7362d577a6c3019a474fd6f485823",
             )
 
 
 class TestAsyncTSIGs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        tsig = await async_client.secondary_dns.tsigs.create(
+        tsig = await async_client.dns.zone_transfers.tsigs.create(
             account_id="01a7362d577a6c3019a474fd6f485823",
             algo="hmac-sha512.",
             name="tsig.customer.cf.",
@@ -281,7 +283,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.tsigs.with_raw_response.create(
+        response = await async_client.dns.zone_transfers.tsigs.with_raw_response.create(
             account_id="01a7362d577a6c3019a474fd6f485823",
             algo="hmac-sha512.",
             name="tsig.customer.cf.",
@@ -295,7 +297,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.tsigs.with_streaming_response.create(
+        async with async_client.dns.zone_transfers.tsigs.with_streaming_response.create(
             account_id="01a7362d577a6c3019a474fd6f485823",
             algo="hmac-sha512.",
             name="tsig.customer.cf.",
@@ -312,7 +314,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.secondary_dns.tsigs.with_raw_response.create(
+            await async_client.dns.zone_transfers.tsigs.with_raw_response.create(
                 account_id="",
                 algo="hmac-sha512.",
                 name="tsig.customer.cf.",
@@ -321,7 +323,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        tsig = await async_client.secondary_dns.tsigs.update(
+        tsig = await async_client.dns.zone_transfers.tsigs.update(
             tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
             account_id="01a7362d577a6c3019a474fd6f485823",
             algo="hmac-sha512.",
@@ -332,7 +334,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.tsigs.with_raw_response.update(
+        response = await async_client.dns.zone_transfers.tsigs.with_raw_response.update(
             tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
             account_id="01a7362d577a6c3019a474fd6f485823",
             algo="hmac-sha512.",
@@ -347,7 +349,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.tsigs.with_streaming_response.update(
+        async with async_client.dns.zone_transfers.tsigs.with_streaming_response.update(
             tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
             account_id="01a7362d577a6c3019a474fd6f485823",
             algo="hmac-sha512.",
@@ -365,7 +367,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.secondary_dns.tsigs.with_raw_response.update(
+            await async_client.dns.zone_transfers.tsigs.with_raw_response.update(
                 tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
                 account_id="",
                 algo="hmac-sha512.",
@@ -374,7 +376,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `tsig_id` but received ''"):
-            await async_client.secondary_dns.tsigs.with_raw_response.update(
+            await async_client.dns.zone_transfers.tsigs.with_raw_response.update(
                 tsig_id="",
                 account_id="01a7362d577a6c3019a474fd6f485823",
                 algo="hmac-sha512.",
@@ -384,14 +386,14 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        tsig = await async_client.secondary_dns.tsigs.list(
+        tsig = await async_client.dns.zone_transfers.tsigs.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
         assert_matches_type(AsyncSinglePage[TSIG], tsig, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.tsigs.with_raw_response.list(
+        response = await async_client.dns.zone_transfers.tsigs.with_raw_response.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
 
@@ -402,7 +404,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.tsigs.with_streaming_response.list(
+        async with async_client.dns.zone_transfers.tsigs.with_streaming_response.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
             assert not response.is_closed
@@ -416,13 +418,13 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.secondary_dns.tsigs.with_raw_response.list(
+            await async_client.dns.zone_transfers.tsigs.with_raw_response.list(
                 account_id="",
             )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        tsig = await async_client.secondary_dns.tsigs.delete(
+        tsig = await async_client.dns.zone_transfers.tsigs.delete(
             tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -430,7 +432,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.tsigs.with_raw_response.delete(
+        response = await async_client.dns.zone_transfers.tsigs.with_raw_response.delete(
             tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -442,7 +444,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.tsigs.with_streaming_response.delete(
+        async with async_client.dns.zone_transfers.tsigs.with_streaming_response.delete(
             tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
             account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
@@ -457,20 +459,20 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.secondary_dns.tsigs.with_raw_response.delete(
+            await async_client.dns.zone_transfers.tsigs.with_raw_response.delete(
                 tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `tsig_id` but received ''"):
-            await async_client.secondary_dns.tsigs.with_raw_response.delete(
+            await async_client.dns.zone_transfers.tsigs.with_raw_response.delete(
                 tsig_id="",
                 account_id="01a7362d577a6c3019a474fd6f485823",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        tsig = await async_client.secondary_dns.tsigs.get(
+        tsig = await async_client.dns.zone_transfers.tsigs.get(
             tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -478,7 +480,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.tsigs.with_raw_response.get(
+        response = await async_client.dns.zone_transfers.tsigs.with_raw_response.get(
             tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
@@ -490,7 +492,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.tsigs.with_streaming_response.get(
+        async with async_client.dns.zone_transfers.tsigs.with_streaming_response.get(
             tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
             account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
@@ -505,13 +507,13 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.secondary_dns.tsigs.with_raw_response.get(
+            await async_client.dns.zone_transfers.tsigs.with_raw_response.get(
                 tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `tsig_id` but received ''"):
-            await async_client.secondary_dns.tsigs.with_raw_response.get(
+            await async_client.dns.zone_transfers.tsigs.with_raw_response.get(
                 tsig_id="",
                 account_id="01a7362d577a6c3019a474fd6f485823",
             )
diff --git a/tests/api_resources/dns_firewall/__init__.py b/tests/api_resources/dns_firewall/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/dns_firewall/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/dns_firewall/analytics/__init__.py b/tests/api_resources/dns_firewall/analytics/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/dns_firewall/analytics/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/dns_firewall/analytics/reports/__init__.py b/tests/api_resources/dns_firewall/analytics/reports/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/dns_firewall/analytics/reports/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/dns/firewall/analytics/reports/test_bytimes.py b/tests/api_resources/dns_firewall/analytics/reports/test_bytimes.py
similarity index 86%
rename from tests/api_resources/dns/firewall/analytics/reports/test_bytimes.py
rename to tests/api_resources/dns_firewall/analytics/reports/test_bytimes.py
index 8b22e6d0ee0..c80b22034cd 100644
--- a/tests/api_resources/dns/firewall/analytics/reports/test_bytimes.py
+++ b/tests/api_resources/dns_firewall/analytics/reports/test_bytimes.py
@@ -20,7 +20,7 @@ class TestBytimes:
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        bytime = client.dns.firewall.analytics.reports.bytimes.get(
+        bytime = client.dns_firewall.analytics.reports.bytimes.get(
             dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -28,7 +28,7 @@ def test_method_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
-        bytime = client.dns.firewall.analytics.reports.bytimes.get(
+        bytime = client.dns_firewall.analytics.reports.bytimes.get(
             dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dimensions="queryType",
@@ -44,7 +44,7 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.dns.firewall.analytics.reports.bytimes.with_raw_response.get(
+        response = client.dns_firewall.analytics.reports.bytimes.with_raw_response.get(
             dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -56,7 +56,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.dns.firewall.analytics.reports.bytimes.with_streaming_response.get(
+        with client.dns_firewall.analytics.reports.bytimes.with_streaming_response.get(
             dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
@@ -71,24 +71,26 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.dns.firewall.analytics.reports.bytimes.with_raw_response.get(
+            client.dns_firewall.analytics.reports.bytimes.with_raw_response.get(
                 dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
-            client.dns.firewall.analytics.reports.bytimes.with_raw_response.get(
+            client.dns_firewall.analytics.reports.bytimes.with_raw_response.get(
                 dns_firewall_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
 
 class TestAsyncBytimes:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        bytime = await async_client.dns.firewall.analytics.reports.bytimes.get(
+        bytime = await async_client.dns_firewall.analytics.reports.bytimes.get(
             dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -96,7 +98,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        bytime = await async_client.dns.firewall.analytics.reports.bytimes.get(
+        bytime = await async_client.dns_firewall.analytics.reports.bytimes.get(
             dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dimensions="queryType",
@@ -112,7 +114,7 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.dns.firewall.analytics.reports.bytimes.with_raw_response.get(
+        response = await async_client.dns_firewall.analytics.reports.bytimes.with_raw_response.get(
             dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -124,7 +126,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.dns.firewall.analytics.reports.bytimes.with_streaming_response.get(
+        async with async_client.dns_firewall.analytics.reports.bytimes.with_streaming_response.get(
             dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
@@ -139,13 +141,13 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.dns.firewall.analytics.reports.bytimes.with_raw_response.get(
+            await async_client.dns_firewall.analytics.reports.bytimes.with_raw_response.get(
                 dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
-            await async_client.dns.firewall.analytics.reports.bytimes.with_raw_response.get(
+            await async_client.dns_firewall.analytics.reports.bytimes.with_raw_response.get(
                 dns_firewall_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/dns/firewall/analytics/test_reports.py b/tests/api_resources/dns_firewall/analytics/test_reports.py
similarity index 86%
rename from tests/api_resources/dns/firewall/analytics/test_reports.py
rename to tests/api_resources/dns_firewall/analytics/test_reports.py
index ebdb5cad0c1..38fe3e6fec2 100644
--- a/tests/api_resources/dns/firewall/analytics/test_reports.py
+++ b/tests/api_resources/dns_firewall/analytics/test_reports.py
@@ -20,7 +20,7 @@ class TestReports:
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        report = client.dns.firewall.analytics.reports.get(
+        report = client.dns_firewall.analytics.reports.get(
             dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -28,7 +28,7 @@ def test_method_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
-        report = client.dns.firewall.analytics.reports.get(
+        report = client.dns_firewall.analytics.reports.get(
             dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dimensions="queryType",
@@ -43,7 +43,7 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.dns.firewall.analytics.reports.with_raw_response.get(
+        response = client.dns_firewall.analytics.reports.with_raw_response.get(
             dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -55,7 +55,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.dns.firewall.analytics.reports.with_streaming_response.get(
+        with client.dns_firewall.analytics.reports.with_streaming_response.get(
             dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
@@ -70,24 +70,26 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.dns.firewall.analytics.reports.with_raw_response.get(
+            client.dns_firewall.analytics.reports.with_raw_response.get(
                 dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
-            client.dns.firewall.analytics.reports.with_raw_response.get(
+            client.dns_firewall.analytics.reports.with_raw_response.get(
                 dns_firewall_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
 
 class TestAsyncReports:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        report = await async_client.dns.firewall.analytics.reports.get(
+        report = await async_client.dns_firewall.analytics.reports.get(
             dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -95,7 +97,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        report = await async_client.dns.firewall.analytics.reports.get(
+        report = await async_client.dns_firewall.analytics.reports.get(
             dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dimensions="queryType",
@@ -110,7 +112,7 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.dns.firewall.analytics.reports.with_raw_response.get(
+        response = await async_client.dns_firewall.analytics.reports.with_raw_response.get(
             dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -122,7 +124,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.dns.firewall.analytics.reports.with_streaming_response.get(
+        async with async_client.dns_firewall.analytics.reports.with_streaming_response.get(
             dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
@@ -137,13 +139,13 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.dns.firewall.analytics.reports.with_raw_response.get(
+            await async_client.dns_firewall.analytics.reports.with_raw_response.get(
                 dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
-            await async_client.dns.firewall.analytics.reports.with_raw_response.get(
+            await async_client.dns_firewall.analytics.reports.with_raw_response.get(
                 dns_firewall_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/dns_firewall/test_reverse_dns.py b/tests/api_resources/dns_firewall/test_reverse_dns.py
new file mode 100644
index 00000000000..ba9cca0909a
--- /dev/null
+++ b/tests/api_resources/dns_firewall/test_reverse_dns.py
@@ -0,0 +1,234 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.dns_firewall import ReverseDNSGetResponse, ReverseDNSEditResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestReverseDNS:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        reverse_dns = client.dns_firewall.reverse_dns.edit(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ReverseDNSEditResponse], reverse_dns, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        reverse_dns = client.dns_firewall.reverse_dns.edit(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ptr={"foo": "string"},
+        )
+        assert_matches_type(Optional[ReverseDNSEditResponse], reverse_dns, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.dns_firewall.reverse_dns.with_raw_response.edit(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        reverse_dns = response.parse()
+        assert_matches_type(Optional[ReverseDNSEditResponse], reverse_dns, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.dns_firewall.reverse_dns.with_streaming_response.edit(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            reverse_dns = response.parse()
+            assert_matches_type(Optional[ReverseDNSEditResponse], reverse_dns, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.dns_firewall.reverse_dns.with_raw_response.edit(
+                dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
+            client.dns_firewall.reverse_dns.with_raw_response.edit(
+                dns_firewall_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        reverse_dns = client.dns_firewall.reverse_dns.get(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ReverseDNSGetResponse], reverse_dns, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.dns_firewall.reverse_dns.with_raw_response.get(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        reverse_dns = response.parse()
+        assert_matches_type(Optional[ReverseDNSGetResponse], reverse_dns, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.dns_firewall.reverse_dns.with_streaming_response.get(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            reverse_dns = response.parse()
+            assert_matches_type(Optional[ReverseDNSGetResponse], reverse_dns, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.dns_firewall.reverse_dns.with_raw_response.get(
+                dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
+            client.dns_firewall.reverse_dns.with_raw_response.get(
+                dns_firewall_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncReverseDNS:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        reverse_dns = await async_client.dns_firewall.reverse_dns.edit(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ReverseDNSEditResponse], reverse_dns, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        reverse_dns = await async_client.dns_firewall.reverse_dns.edit(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ptr={"foo": "string"},
+        )
+        assert_matches_type(Optional[ReverseDNSEditResponse], reverse_dns, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns_firewall.reverse_dns.with_raw_response.edit(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        reverse_dns = await response.parse()
+        assert_matches_type(Optional[ReverseDNSEditResponse], reverse_dns, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns_firewall.reverse_dns.with_streaming_response.edit(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            reverse_dns = await response.parse()
+            assert_matches_type(Optional[ReverseDNSEditResponse], reverse_dns, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.dns_firewall.reverse_dns.with_raw_response.edit(
+                dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
+            await async_client.dns_firewall.reverse_dns.with_raw_response.edit(
+                dns_firewall_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        reverse_dns = await async_client.dns_firewall.reverse_dns.get(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ReverseDNSGetResponse], reverse_dns, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns_firewall.reverse_dns.with_raw_response.get(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        reverse_dns = await response.parse()
+        assert_matches_type(Optional[ReverseDNSGetResponse], reverse_dns, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns_firewall.reverse_dns.with_streaming_response.get(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            reverse_dns = await response.parse()
+            assert_matches_type(Optional[ReverseDNSGetResponse], reverse_dns, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.dns_firewall.reverse_dns.with_raw_response.get(
+                dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
+            await async_client.dns_firewall.reverse_dns.with_raw_response.get(
+                dns_firewall_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/durable_objects/namespaces/test_objects.py b/tests/api_resources/durable_objects/namespaces/test_objects.py
index 9e703603fcc..2e238a8a0c7 100644
--- a/tests/api_resources/durable_objects/namespaces/test_objects.py
+++ b/tests/api_resources/durable_objects/namespaces/test_objects.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncCursorLimitPagination, AsyncCursorLimitPagination
+from cloudflare.pagination import SyncCursorPaginationAfter, AsyncCursorPaginationAfter
 from cloudflare.types.durable_objects.namespaces import DurableObject
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -24,7 +24,7 @@ def test_method_list(self, client: Cloudflare) -> None:
             id="5fd1cafff895419c8bcc647fc64ab8f0",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncCursorLimitPagination[DurableObject], object_, path=["response"])
+        assert_matches_type(SyncCursorPaginationAfter[DurableObject], object_, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
@@ -34,7 +34,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
             cursor="AAAAANuhDN7SjacTnSVsDu3WW1Lvst6dxJGTjRY5BhxPXdf6L6uTcpd_NVtjhn11OUYRsVEykxoUwF-JQU4dn6QylZSKTOJuG0indrdn_MlHpMRtsxgXjs-RPdHYIVm3odE_uvEQ_dTQGFm8oikZMohns34DLBgrQpc",
             limit=10,
         )
-        assert_matches_type(SyncCursorLimitPagination[DurableObject], object_, path=["response"])
+        assert_matches_type(SyncCursorPaginationAfter[DurableObject], object_, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -46,7 +46,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         object_ = response.parse()
-        assert_matches_type(SyncCursorLimitPagination[DurableObject], object_, path=["response"])
+        assert_matches_type(SyncCursorPaginationAfter[DurableObject], object_, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -58,7 +58,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             object_ = response.parse()
-            assert_matches_type(SyncCursorLimitPagination[DurableObject], object_, path=["response"])
+            assert_matches_type(SyncCursorPaginationAfter[DurableObject], object_, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -78,7 +78,9 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncObjects:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
@@ -86,7 +88,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
             id="5fd1cafff895419c8bcc647fc64ab8f0",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncCursorLimitPagination[DurableObject], object_, path=["response"])
+        assert_matches_type(AsyncCursorPaginationAfter[DurableObject], object_, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -96,7 +98,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
             cursor="AAAAANuhDN7SjacTnSVsDu3WW1Lvst6dxJGTjRY5BhxPXdf6L6uTcpd_NVtjhn11OUYRsVEykxoUwF-JQU4dn6QylZSKTOJuG0indrdn_MlHpMRtsxgXjs-RPdHYIVm3odE_uvEQ_dTQGFm8oikZMohns34DLBgrQpc",
             limit=10,
         )
-        assert_matches_type(AsyncCursorLimitPagination[DurableObject], object_, path=["response"])
+        assert_matches_type(AsyncCursorPaginationAfter[DurableObject], object_, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -108,7 +110,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         object_ = await response.parse()
-        assert_matches_type(AsyncCursorLimitPagination[DurableObject], object_, path=["response"])
+        assert_matches_type(AsyncCursorPaginationAfter[DurableObject], object_, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -120,7 +122,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             object_ = await response.parse()
-            assert_matches_type(AsyncCursorLimitPagination[DurableObject], object_, path=["response"])
+            assert_matches_type(AsyncCursorPaginationAfter[DurableObject], object_, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/durable_objects/test_namespaces.py b/tests/api_resources/durable_objects/test_namespaces.py
index db836e379cd..2ec52448b4e 100644
--- a/tests/api_resources/durable_objects/test_namespaces.py
+++ b/tests/api_resources/durable_objects/test_namespaces.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.durable_objects import Namespace
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -23,7 +23,16 @@ def test_method_list(self, client: Cloudflare) -> None:
         namespace = client.durable_objects.namespaces.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncSinglePage[Namespace], namespace, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Namespace], namespace, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        namespace = client.durable_objects.namespaces.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[Namespace], namespace, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -34,7 +43,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         namespace = response.parse()
-        assert_matches_type(SyncSinglePage[Namespace], namespace, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Namespace], namespace, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -45,7 +54,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             namespace = response.parse()
-            assert_matches_type(SyncSinglePage[Namespace], namespace, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[Namespace], namespace, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -58,14 +67,25 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncNamespaces:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         namespace = await async_client.durable_objects.namespaces.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncSinglePage[Namespace], namespace, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Namespace], namespace, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        namespace = await async_client.durable_objects.namespaces.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[Namespace], namespace, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -76,7 +96,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         namespace = await response.parse()
-        assert_matches_type(AsyncSinglePage[Namespace], namespace, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Namespace], namespace, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -87,7 +107,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             namespace = await response.parse()
-            assert_matches_type(AsyncSinglePage[Namespace], namespace, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[Namespace], namespace, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/email_routing/rules/test_catch_alls.py b/tests/api_resources/email_routing/rules/test_catch_alls.py
index 3c894ee8d54..3f6d0df00de 100644
--- a/tests/api_resources/email_routing/rules/test_catch_alls.py
+++ b/tests/api_resources/email_routing/rules/test_catch_alls.py
@@ -20,43 +20,23 @@ class TestCatchAlls:
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         catch_all = client.email_routing.rules.catch_alls.update(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            actions=[{"type": "forward"}, {"type": "forward"}, {"type": "forward"}],
-            matchers=[{"type": "all"}, {"type": "all"}, {"type": "all"}],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"type": "forward"}],
+            matchers=[{"type": "all"}],
         )
         assert_matches_type(Optional[CatchAllUpdateResponse], catch_all, path=["response"])
 
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         catch_all = client.email_routing.rules.catch_alls.update(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             actions=[
                 {
                     "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
+                    "value": ["destinationaddress@example.net"],
+                }
             ],
-            matchers=[{"type": "all"}, {"type": "all"}, {"type": "all"}],
+            matchers=[{"type": "all"}],
             enabled=True,
             name="Send to user@example.net rule.",
         )
@@ -65,9 +45,9 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.email_routing.rules.catch_alls.with_raw_response.update(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            actions=[{"type": "forward"}, {"type": "forward"}, {"type": "forward"}],
-            matchers=[{"type": "all"}, {"type": "all"}, {"type": "all"}],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"type": "forward"}],
+            matchers=[{"type": "all"}],
         )
 
         assert response.is_closed is True
@@ -78,9 +58,9 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.email_routing.rules.catch_alls.with_streaming_response.update(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            actions=[{"type": "forward"}, {"type": "forward"}, {"type": "forward"}],
-            matchers=[{"type": "all"}, {"type": "all"}, {"type": "all"}],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"type": "forward"}],
+            matchers=[{"type": "all"}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -92,24 +72,24 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.email_routing.rules.catch_alls.with_raw_response.update(
-                zone_identifier="",
-                actions=[{"type": "forward"}, {"type": "forward"}, {"type": "forward"}],
-                matchers=[{"type": "all"}, {"type": "all"}, {"type": "all"}],
+                zone_id="",
+                actions=[{"type": "forward"}],
+                matchers=[{"type": "all"}],
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         catch_all = client.email_routing.rules.catch_alls.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[CatchAllGetResponse], catch_all, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.email_routing.rules.catch_alls.with_raw_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -120,7 +100,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.email_routing.rules.catch_alls.with_streaming_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -132,55 +112,37 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.email_routing.rules.catch_alls.with_raw_response.get(
-                "",
+                zone_id="",
             )
 
 
 class TestAsyncCatchAlls:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         catch_all = await async_client.email_routing.rules.catch_alls.update(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            actions=[{"type": "forward"}, {"type": "forward"}, {"type": "forward"}],
-            matchers=[{"type": "all"}, {"type": "all"}, {"type": "all"}],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"type": "forward"}],
+            matchers=[{"type": "all"}],
         )
         assert_matches_type(Optional[CatchAllUpdateResponse], catch_all, path=["response"])
 
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         catch_all = await async_client.email_routing.rules.catch_alls.update(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             actions=[
                 {
                     "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
+                    "value": ["destinationaddress@example.net"],
+                }
             ],
-            matchers=[{"type": "all"}, {"type": "all"}, {"type": "all"}],
+            matchers=[{"type": "all"}],
             enabled=True,
             name="Send to user@example.net rule.",
         )
@@ -189,9 +151,9 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.email_routing.rules.catch_alls.with_raw_response.update(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            actions=[{"type": "forward"}, {"type": "forward"}, {"type": "forward"}],
-            matchers=[{"type": "all"}, {"type": "all"}, {"type": "all"}],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"type": "forward"}],
+            matchers=[{"type": "all"}],
         )
 
         assert response.is_closed is True
@@ -202,9 +164,9 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.email_routing.rules.catch_alls.with_streaming_response.update(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            actions=[{"type": "forward"}, {"type": "forward"}, {"type": "forward"}],
-            matchers=[{"type": "all"}, {"type": "all"}, {"type": "all"}],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"type": "forward"}],
+            matchers=[{"type": "all"}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -216,24 +178,24 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.email_routing.rules.catch_alls.with_raw_response.update(
-                zone_identifier="",
-                actions=[{"type": "forward"}, {"type": "forward"}, {"type": "forward"}],
-                matchers=[{"type": "all"}, {"type": "all"}, {"type": "all"}],
+                zone_id="",
+                actions=[{"type": "forward"}],
+                matchers=[{"type": "all"}],
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         catch_all = await async_client.email_routing.rules.catch_alls.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[CatchAllGetResponse], catch_all, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.email_routing.rules.catch_alls.with_raw_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -244,7 +206,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.email_routing.rules.catch_alls.with_streaming_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -256,7 +218,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.email_routing.rules.catch_alls.with_raw_response.get(
-                "",
+                zone_id="",
             )
diff --git a/tests/api_resources/email_routing/test_addresses.py b/tests/api_resources/email_routing/test_addresses.py
index 1f7a9438ef6..2299afe4b1c 100644
--- a/tests/api_resources/email_routing/test_addresses.py
+++ b/tests/api_resources/email_routing/test_addresses.py
@@ -21,7 +21,7 @@ class TestAddresses:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         address = client.email_routing.addresses.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
         )
         assert_matches_type(Optional[Address], address, path=["response"])
@@ -29,7 +29,7 @@ def test_method_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.email_routing.addresses.with_raw_response.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
         )
 
@@ -41,7 +41,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.email_routing.addresses.with_streaming_response.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
         ) as response:
             assert not response.is_closed
@@ -54,23 +54,23 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.email_routing.addresses.with_raw_response.create(
-                account_identifier="",
+                account_id="",
                 email="user@example.com",
             )
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         address = client.email_routing.addresses.list(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(SyncV4PagePaginationArray[Address], address, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         address = client.email_routing.addresses.list(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             direction="asc",
             page=1,
             per_page=5,
@@ -81,7 +81,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.email_routing.addresses.with_raw_response.list(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -92,7 +92,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.email_routing.addresses.with_streaming_response.list(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -104,16 +104,16 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.email_routing.addresses.with_raw_response.list(
-                account_identifier="",
+                account_id="",
             )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         address = client.email_routing.addresses.delete(
             destination_address_identifier="ea95132c15732412d22c1476fa83f27a",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Address], address, path=["response"])
 
@@ -121,7 +121,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.email_routing.addresses.with_raw_response.delete(
             destination_address_identifier="ea95132c15732412d22c1476fa83f27a",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -133,7 +133,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.email_routing.addresses.with_streaming_response.delete(
             destination_address_identifier="ea95132c15732412d22c1476fa83f27a",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -145,10 +145,10 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.email_routing.addresses.with_raw_response.delete(
                 destination_address_identifier="ea95132c15732412d22c1476fa83f27a",
-                account_identifier="",
+                account_id="",
             )
 
         with pytest.raises(
@@ -156,14 +156,14 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
         ):
             client.email_routing.addresses.with_raw_response.delete(
                 destination_address_identifier="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         address = client.email_routing.addresses.get(
             destination_address_identifier="ea95132c15732412d22c1476fa83f27a",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Address], address, path=["response"])
 
@@ -171,7 +171,7 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.email_routing.addresses.with_raw_response.get(
             destination_address_identifier="ea95132c15732412d22c1476fa83f27a",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -183,7 +183,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.email_routing.addresses.with_streaming_response.get(
             destination_address_identifier="ea95132c15732412d22c1476fa83f27a",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -195,10 +195,10 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.email_routing.addresses.with_raw_response.get(
                 destination_address_identifier="ea95132c15732412d22c1476fa83f27a",
-                account_identifier="",
+                account_id="",
             )
 
         with pytest.raises(
@@ -206,17 +206,19 @@ def test_path_params_get(self, client: Cloudflare) -> None:
         ):
             client.email_routing.addresses.with_raw_response.get(
                 destination_address_identifier="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
 
 class TestAsyncAddresses:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         address = await async_client.email_routing.addresses.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
         )
         assert_matches_type(Optional[Address], address, path=["response"])
@@ -224,7 +226,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.email_routing.addresses.with_raw_response.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
         )
 
@@ -236,7 +238,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.email_routing.addresses.with_streaming_response.create(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             email="user@example.com",
         ) as response:
             assert not response.is_closed
@@ -249,23 +251,23 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.email_routing.addresses.with_raw_response.create(
-                account_identifier="",
+                account_id="",
                 email="user@example.com",
             )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         address = await async_client.email_routing.addresses.list(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(AsyncV4PagePaginationArray[Address], address, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         address = await async_client.email_routing.addresses.list(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             direction="asc",
             page=1,
             per_page=5,
@@ -276,7 +278,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.email_routing.addresses.with_raw_response.list(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -287,7 +289,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.email_routing.addresses.with_streaming_response.list(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -299,16 +301,16 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.email_routing.addresses.with_raw_response.list(
-                account_identifier="",
+                account_id="",
             )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         address = await async_client.email_routing.addresses.delete(
             destination_address_identifier="ea95132c15732412d22c1476fa83f27a",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Address], address, path=["response"])
 
@@ -316,7 +318,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.email_routing.addresses.with_raw_response.delete(
             destination_address_identifier="ea95132c15732412d22c1476fa83f27a",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -328,7 +330,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.email_routing.addresses.with_streaming_response.delete(
             destination_address_identifier="ea95132c15732412d22c1476fa83f27a",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -340,10 +342,10 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.email_routing.addresses.with_raw_response.delete(
                 destination_address_identifier="ea95132c15732412d22c1476fa83f27a",
-                account_identifier="",
+                account_id="",
             )
 
         with pytest.raises(
@@ -351,14 +353,14 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         ):
             await async_client.email_routing.addresses.with_raw_response.delete(
                 destination_address_identifier="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         address = await async_client.email_routing.addresses.get(
             destination_address_identifier="ea95132c15732412d22c1476fa83f27a",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Address], address, path=["response"])
 
@@ -366,7 +368,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.email_routing.addresses.with_raw_response.get(
             destination_address_identifier="ea95132c15732412d22c1476fa83f27a",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -378,7 +380,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.email_routing.addresses.with_streaming_response.get(
             destination_address_identifier="ea95132c15732412d22c1476fa83f27a",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -390,10 +392,10 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.email_routing.addresses.with_raw_response.get(
                 destination_address_identifier="ea95132c15732412d22c1476fa83f27a",
-                account_identifier="",
+                account_id="",
             )
 
         with pytest.raises(
@@ -401,5 +403,5 @@ async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         ):
             await async_client.email_routing.addresses.with_raw_response.get(
                 destination_address_identifier="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/email_routing/test_dns.py b/tests/api_resources/email_routing/test_dns.py
index 0cee3728995..0ad1b16a873 100644
--- a/tests/api_resources/email_routing/test_dns.py
+++ b/tests/api_resources/email_routing/test_dns.py
@@ -9,7 +9,12 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.email_routing import DNSGetResponse
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.email_routing import (
+    Settings,
+    DNSRecord,
+    DNSGetResponse,
+)
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -17,82 +22,368 @@
 class TestDNS:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        dns = client.email_routing.dns.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[Settings], dns, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        dns = client.email_routing.dns.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.net",
+        )
+        assert_matches_type(Optional[Settings], dns, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.email_routing.dns.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns = response.parse()
+        assert_matches_type(Optional[Settings], dns, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.email_routing.dns.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns = response.parse()
+            assert_matches_type(Optional[Settings], dns, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.email_routing.dns.with_raw_response.create(
+                zone_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertions")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        dns = client.email_routing.dns.delete(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[DNSRecord], dns, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertions")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.email_routing.dns.with_raw_response.delete(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns = response.parse()
+        assert_matches_type(SyncSinglePage[DNSRecord], dns, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertions")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.email_routing.dns.with_streaming_response.delete(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns = response.parse()
+            assert_matches_type(SyncSinglePage[DNSRecord], dns, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertions")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.email_routing.dns.with_raw_response.delete(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        dns = client.email_routing.dns.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[Settings], dns, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        dns = client.email_routing.dns.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.net",
+        )
+        assert_matches_type(Optional[Settings], dns, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.email_routing.dns.with_raw_response.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns = response.parse()
+        assert_matches_type(Optional[Settings], dns, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.email_routing.dns.with_streaming_response.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns = response.parse()
+            assert_matches_type(Optional[Settings], dns, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.email_routing.dns.with_raw_response.edit(
+                zone_id="",
+            )
+
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         dns = client.email_routing.dns.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(DNSGetResponse, dns, path=["response"])
+
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        dns = client.email_routing.dns.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            subdomain="example.net",
         )
-        assert_matches_type(Optional[DNSGetResponse], dns, path=["response"])
+        assert_matches_type(DNSGetResponse, dns, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.email_routing.dns.with_raw_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dns = response.parse()
-        assert_matches_type(Optional[DNSGetResponse], dns, path=["response"])
+        assert_matches_type(DNSGetResponse, dns, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.email_routing.dns.with_streaming_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dns = response.parse()
-            assert_matches_type(Optional[DNSGetResponse], dns, path=["response"])
+            assert_matches_type(DNSGetResponse, dns, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.email_routing.dns.with_raw_response.get(
-                "",
+                zone_id="",
             )
 
 
 class TestAsyncDNS:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        dns = await async_client.email_routing.dns.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[Settings], dns, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        dns = await async_client.email_routing.dns.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.net",
+        )
+        assert_matches_type(Optional[Settings], dns, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_routing.dns.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns = await response.parse()
+        assert_matches_type(Optional[Settings], dns, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_routing.dns.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns = await response.parse()
+            assert_matches_type(Optional[Settings], dns, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.email_routing.dns.with_raw_response.create(
+                zone_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertions")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        dns = await async_client.email_routing.dns.delete(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[DNSRecord], dns, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertions")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_routing.dns.with_raw_response.delete(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns = await response.parse()
+        assert_matches_type(AsyncSinglePage[DNSRecord], dns, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertions")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_routing.dns.with_streaming_response.delete(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns = await response.parse()
+            assert_matches_type(AsyncSinglePage[DNSRecord], dns, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertions")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.email_routing.dns.with_raw_response.delete(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        dns = await async_client.email_routing.dns.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[Settings], dns, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        dns = await async_client.email_routing.dns.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="example.net",
+        )
+        assert_matches_type(Optional[Settings], dns, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_routing.dns.with_raw_response.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns = await response.parse()
+        assert_matches_type(Optional[Settings], dns, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_routing.dns.with_streaming_response.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns = await response.parse()
+            assert_matches_type(Optional[Settings], dns, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.email_routing.dns.with_raw_response.edit(
+                zone_id="",
+            )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         dns = await async_client.email_routing.dns.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(DNSGetResponse, dns, path=["response"])
+
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        dns = await async_client.email_routing.dns.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            subdomain="example.net",
         )
-        assert_matches_type(Optional[DNSGetResponse], dns, path=["response"])
+        assert_matches_type(DNSGetResponse, dns, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.email_routing.dns.with_raw_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dns = await response.parse()
-        assert_matches_type(Optional[DNSGetResponse], dns, path=["response"])
+        assert_matches_type(DNSGetResponse, dns, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.email_routing.dns.with_streaming_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dns = await response.parse()
-            assert_matches_type(Optional[DNSGetResponse], dns, path=["response"])
+            assert_matches_type(DNSGetResponse, dns, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.email_routing.dns.with_raw_response.get(
-                "",
+                zone_id="",
             )
diff --git a/tests/api_resources/email_routing/test_rules.py b/tests/api_resources/email_routing/test_rules.py
index 489ef091576..33b96b74828 100644
--- a/tests/api_resources/email_routing/test_rules.py
+++ b/tests/api_resources/email_routing/test_rules.py
@@ -21,99 +21,28 @@ class TestRules:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         rule = client.email_routing.rules.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            actions=[
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-            ],
-            matchers=[
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-            ],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"type": "forward"}],
+            matchers=[{"type": "literal"}],
         )
         assert_matches_type(Optional[EmailRoutingRule], rule, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         rule = client.email_routing.rules.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             actions=[
                 {
                     "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
+                    "value": ["destinationaddress@example.net"],
+                }
             ],
             matchers=[
                 {
-                    "field": "to",
                     "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
                     "field": "to",
-                    "type": "literal",
                     "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
+                }
             ],
             enabled=True,
             name="Send to user@example.net rule.",
@@ -124,50 +53,9 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.email_routing.rules.with_raw_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            actions=[
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-            ],
-            matchers=[
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-            ],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"type": "forward"}],
+            matchers=[{"type": "literal"}],
         )
 
         assert response.is_closed is True
@@ -178,50 +66,9 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.email_routing.rules.with_streaming_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            actions=[
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-            ],
-            matchers=[
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-            ],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"type": "forward"}],
+            matchers=[{"type": "literal"}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -233,102 +80,20 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.email_routing.rules.with_raw_response.create(
-                zone_identifier="",
-                actions=[
-                    {
-                        "type": "forward",
-                        "value": [
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                        ],
-                    },
-                    {
-                        "type": "forward",
-                        "value": [
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                        ],
-                    },
-                    {
-                        "type": "forward",
-                        "value": [
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                        ],
-                    },
-                ],
-                matchers=[
-                    {
-                        "field": "to",
-                        "type": "literal",
-                        "value": "test@example.com",
-                    },
-                    {
-                        "field": "to",
-                        "type": "literal",
-                        "value": "test@example.com",
-                    },
-                    {
-                        "field": "to",
-                        "type": "literal",
-                        "value": "test@example.com",
-                    },
-                ],
+                zone_id="",
+                actions=[{"type": "forward"}],
+                matchers=[{"type": "literal"}],
             )
 
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         rule = client.email_routing.rules.update(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            actions=[
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-            ],
-            matchers=[
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-            ],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"type": "forward"}],
+            matchers=[{"type": "literal"}],
         )
         assert_matches_type(Optional[EmailRoutingRule], rule, path=["response"])
 
@@ -336,49 +101,19 @@ def test_method_update(self, client: Cloudflare) -> None:
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         rule = client.email_routing.rules.update(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             actions=[
                 {
                     "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
+                    "value": ["destinationaddress@example.net"],
+                }
             ],
             matchers=[
                 {
-                    "field": "to",
                     "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
                     "field": "to",
-                    "type": "literal",
                     "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
+                }
             ],
             enabled=True,
             name="Send to user@example.net rule.",
@@ -390,50 +125,9 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.email_routing.rules.with_raw_response.update(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            actions=[
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-            ],
-            matchers=[
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-            ],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"type": "forward"}],
+            matchers=[{"type": "literal"}],
         )
 
         assert response.is_closed is True
@@ -445,50 +139,9 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.email_routing.rules.with_streaming_response.update(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            actions=[
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-            ],
-            matchers=[
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-            ],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"type": "forward"}],
+            matchers=[{"type": "literal"}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -500,115 +153,33 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.email_routing.rules.with_raw_response.update(
                 rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-                zone_identifier="",
-                actions=[
-                    {
-                        "type": "forward",
-                        "value": [
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                        ],
-                    },
-                    {
-                        "type": "forward",
-                        "value": [
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                        ],
-                    },
-                    {
-                        "type": "forward",
-                        "value": [
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                        ],
-                    },
-                ],
-                matchers=[
-                    {
-                        "field": "to",
-                        "type": "literal",
-                        "value": "test@example.com",
-                    },
-                    {
-                        "field": "to",
-                        "type": "literal",
-                        "value": "test@example.com",
-                    },
-                    {
-                        "field": "to",
-                        "type": "literal",
-                        "value": "test@example.com",
-                    },
-                ],
+                zone_id="",
+                actions=[{"type": "forward"}],
+                matchers=[{"type": "literal"}],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_identifier` but received ''"):
             client.email_routing.rules.with_raw_response.update(
                 rule_identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[
-                    {
-                        "type": "forward",
-                        "value": [
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                        ],
-                    },
-                    {
-                        "type": "forward",
-                        "value": [
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                        ],
-                    },
-                    {
-                        "type": "forward",
-                        "value": [
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                        ],
-                    },
-                ],
-                matchers=[
-                    {
-                        "field": "to",
-                        "type": "literal",
-                        "value": "test@example.com",
-                    },
-                    {
-                        "field": "to",
-                        "type": "literal",
-                        "value": "test@example.com",
-                    },
-                    {
-                        "field": "to",
-                        "type": "literal",
-                        "value": "test@example.com",
-                    },
-                ],
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                actions=[{"type": "forward"}],
+                matchers=[{"type": "literal"}],
             )
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         rule = client.email_routing.rules.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(SyncV4PagePaginationArray[EmailRoutingRule], rule, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         rule = client.email_routing.rules.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             enabled=True,
             page=1,
             per_page=5,
@@ -618,7 +189,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.email_routing.rules.with_raw_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -629,7 +200,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.email_routing.rules.with_streaming_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -641,16 +212,16 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.email_routing.rules.with_raw_response.list(
-                zone_identifier="",
+                zone_id="",
             )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         rule = client.email_routing.rules.delete(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[EmailRoutingRule], rule, path=["response"])
 
@@ -658,7 +229,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.email_routing.rules.with_raw_response.delete(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -670,7 +241,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.email_routing.rules.with_streaming_response.delete(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -682,23 +253,23 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.email_routing.rules.with_raw_response.delete(
                 rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-                zone_identifier="",
+                zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_identifier` but received ''"):
             client.email_routing.rules.with_raw_response.delete(
                 rule_identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         rule = client.email_routing.rules.get(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[EmailRoutingRule], rule, path=["response"])
 
@@ -706,7 +277,7 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.email_routing.rules.with_raw_response.get(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -718,7 +289,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.email_routing.rules.with_streaming_response.get(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -730,118 +301,49 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.email_routing.rules.with_raw_response.get(
                 rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-                zone_identifier="",
+                zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_identifier` but received ''"):
             client.email_routing.rules.with_raw_response.get(
                 rule_identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
 
 class TestAsyncRules:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         rule = await async_client.email_routing.rules.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            actions=[
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-            ],
-            matchers=[
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-            ],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"type": "forward"}],
+            matchers=[{"type": "literal"}],
         )
         assert_matches_type(Optional[EmailRoutingRule], rule, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         rule = await async_client.email_routing.rules.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             actions=[
                 {
                     "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
+                    "value": ["destinationaddress@example.net"],
+                }
             ],
             matchers=[
                 {
-                    "field": "to",
                     "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
                     "field": "to",
-                    "type": "literal",
                     "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
+                }
             ],
             enabled=True,
             name="Send to user@example.net rule.",
@@ -852,50 +354,9 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.email_routing.rules.with_raw_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            actions=[
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-            ],
-            matchers=[
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-            ],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"type": "forward"}],
+            matchers=[{"type": "literal"}],
         )
 
         assert response.is_closed is True
@@ -906,50 +367,9 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.email_routing.rules.with_streaming_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            actions=[
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-            ],
-            matchers=[
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-            ],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"type": "forward"}],
+            matchers=[{"type": "literal"}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -961,102 +381,20 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.email_routing.rules.with_raw_response.create(
-                zone_identifier="",
-                actions=[
-                    {
-                        "type": "forward",
-                        "value": [
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                        ],
-                    },
-                    {
-                        "type": "forward",
-                        "value": [
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                        ],
-                    },
-                    {
-                        "type": "forward",
-                        "value": [
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                        ],
-                    },
-                ],
-                matchers=[
-                    {
-                        "field": "to",
-                        "type": "literal",
-                        "value": "test@example.com",
-                    },
-                    {
-                        "field": "to",
-                        "type": "literal",
-                        "value": "test@example.com",
-                    },
-                    {
-                        "field": "to",
-                        "type": "literal",
-                        "value": "test@example.com",
-                    },
-                ],
+                zone_id="",
+                actions=[{"type": "forward"}],
+                matchers=[{"type": "literal"}],
             )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         rule = await async_client.email_routing.rules.update(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            actions=[
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-            ],
-            matchers=[
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-            ],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"type": "forward"}],
+            matchers=[{"type": "literal"}],
         )
         assert_matches_type(Optional[EmailRoutingRule], rule, path=["response"])
 
@@ -1064,49 +402,19 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         rule = await async_client.email_routing.rules.update(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             actions=[
                 {
                     "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
+                    "value": ["destinationaddress@example.net"],
+                }
             ],
             matchers=[
                 {
-                    "field": "to",
                     "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
                     "field": "to",
-                    "type": "literal",
                     "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
+                }
             ],
             enabled=True,
             name="Send to user@example.net rule.",
@@ -1118,50 +426,9 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.email_routing.rules.with_raw_response.update(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            actions=[
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-            ],
-            matchers=[
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-            ],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"type": "forward"}],
+            matchers=[{"type": "literal"}],
         )
 
         assert response.is_closed is True
@@ -1173,50 +440,9 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.email_routing.rules.with_streaming_response.update(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            actions=[
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-                {
-                    "type": "forward",
-                    "value": [
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                        "destinationaddress@example.net",
-                    ],
-                },
-            ],
-            matchers=[
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-                {
-                    "field": "to",
-                    "type": "literal",
-                    "value": "test@example.com",
-                },
-            ],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"type": "forward"}],
+            matchers=[{"type": "literal"}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -1228,115 +454,33 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.email_routing.rules.with_raw_response.update(
                 rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-                zone_identifier="",
-                actions=[
-                    {
-                        "type": "forward",
-                        "value": [
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                        ],
-                    },
-                    {
-                        "type": "forward",
-                        "value": [
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                        ],
-                    },
-                    {
-                        "type": "forward",
-                        "value": [
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                        ],
-                    },
-                ],
-                matchers=[
-                    {
-                        "field": "to",
-                        "type": "literal",
-                        "value": "test@example.com",
-                    },
-                    {
-                        "field": "to",
-                        "type": "literal",
-                        "value": "test@example.com",
-                    },
-                    {
-                        "field": "to",
-                        "type": "literal",
-                        "value": "test@example.com",
-                    },
-                ],
+                zone_id="",
+                actions=[{"type": "forward"}],
+                matchers=[{"type": "literal"}],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_identifier` but received ''"):
             await async_client.email_routing.rules.with_raw_response.update(
                 rule_identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[
-                    {
-                        "type": "forward",
-                        "value": [
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                        ],
-                    },
-                    {
-                        "type": "forward",
-                        "value": [
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                        ],
-                    },
-                    {
-                        "type": "forward",
-                        "value": [
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                            "destinationaddress@example.net",
-                        ],
-                    },
-                ],
-                matchers=[
-                    {
-                        "field": "to",
-                        "type": "literal",
-                        "value": "test@example.com",
-                    },
-                    {
-                        "field": "to",
-                        "type": "literal",
-                        "value": "test@example.com",
-                    },
-                    {
-                        "field": "to",
-                        "type": "literal",
-                        "value": "test@example.com",
-                    },
-                ],
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                actions=[{"type": "forward"}],
+                matchers=[{"type": "literal"}],
             )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         rule = await async_client.email_routing.rules.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(AsyncV4PagePaginationArray[EmailRoutingRule], rule, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         rule = await async_client.email_routing.rules.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             enabled=True,
             page=1,
             per_page=5,
@@ -1346,7 +490,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.email_routing.rules.with_raw_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -1357,7 +501,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.email_routing.rules.with_streaming_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -1369,16 +513,16 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.email_routing.rules.with_raw_response.list(
-                zone_identifier="",
+                zone_id="",
             )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         rule = await async_client.email_routing.rules.delete(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[EmailRoutingRule], rule, path=["response"])
 
@@ -1386,7 +530,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.email_routing.rules.with_raw_response.delete(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -1398,7 +542,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.email_routing.rules.with_streaming_response.delete(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -1410,23 +554,23 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.email_routing.rules.with_raw_response.delete(
                 rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-                zone_identifier="",
+                zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_identifier` but received ''"):
             await async_client.email_routing.rules.with_raw_response.delete(
                 rule_identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         rule = await async_client.email_routing.rules.get(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[EmailRoutingRule], rule, path=["response"])
 
@@ -1434,7 +578,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.email_routing.rules.with_raw_response.get(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -1446,7 +590,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.email_routing.rules.with_streaming_response.get(
             rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -1458,14 +602,14 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.email_routing.rules.with_raw_response.get(
                 rule_identifier="a7e6fb77503c41d8a7f3113c6918f10c",
-                zone_identifier="",
+                zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_identifier` but received ''"):
             await async_client.email_routing.rules.with_raw_response.get(
                 rule_identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/email_security/__init__.py b/tests/api_resources/email_security/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/email_security/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/email_security/investigate/__init__.py b/tests/api_resources/email_security/investigate/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/email_security/investigate/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/email_security/investigate/test_detections.py b/tests/api_resources/email_security/investigate/test_detections.py
new file mode 100644
index 00000000000..b9a5059538d
--- /dev/null
+++ b/tests/api_resources/email_security/investigate/test_detections.py
@@ -0,0 +1,120 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.email_security.investigate import DetectionGetResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestDetections:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        detection = client.email_security.investigate.detections.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(DetectionGetResponse, detection, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.email_security.investigate.detections.with_raw_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        detection = response.parse()
+        assert_matches_type(DetectionGetResponse, detection, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.email_security.investigate.detections.with_streaming_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            detection = response.parse()
+            assert_matches_type(DetectionGetResponse, detection, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.investigate.detections.with_raw_response.get(
+                postfix_id="4Njp3P0STMz2c02Q",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `postfix_id` but received ''"):
+            client.email_security.investigate.detections.with_raw_response.get(
+                postfix_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncDetections:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        detection = await async_client.email_security.investigate.detections.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(DetectionGetResponse, detection, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.investigate.detections.with_raw_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        detection = await response.parse()
+        assert_matches_type(DetectionGetResponse, detection, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.investigate.detections.with_streaming_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            detection = await response.parse()
+            assert_matches_type(DetectionGetResponse, detection, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.investigate.detections.with_raw_response.get(
+                postfix_id="4Njp3P0STMz2c02Q",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `postfix_id` but received ''"):
+            await async_client.email_security.investigate.detections.with_raw_response.get(
+                postfix_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/email_security/investigate/test_move.py b/tests/api_resources/email_security/investigate/test_move.py
new file mode 100644
index 00000000000..8d683157071
--- /dev/null
+++ b/tests/api_resources/email_security/investigate/test_move.py
@@ -0,0 +1,238 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.email_security.investigate import (
+    MoveBulkResponse,
+    MoveCreateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestMove:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        move = client.email_security.investigate.move.create(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination="Inbox",
+        )
+        assert_matches_type(SyncSinglePage[MoveCreateResponse], move, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.email_security.investigate.move.with_raw_response.create(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination="Inbox",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        move = response.parse()
+        assert_matches_type(SyncSinglePage[MoveCreateResponse], move, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.email_security.investigate.move.with_streaming_response.create(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination="Inbox",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            move = response.parse()
+            assert_matches_type(SyncSinglePage[MoveCreateResponse], move, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.investigate.move.with_raw_response.create(
+                postfix_id="4Njp3P0STMz2c02Q",
+                account_id="",
+                destination="Inbox",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `postfix_id` but received ''"):
+            client.email_security.investigate.move.with_raw_response.create(
+                postfix_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                destination="Inbox",
+            )
+
+    @parametrize
+    def test_method_bulk(self, client: Cloudflare) -> None:
+        move = client.email_security.investigate.move.bulk(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination="Inbox",
+        )
+        assert_matches_type(SyncSinglePage[MoveBulkResponse], move, path=["response"])
+
+    @parametrize
+    def test_method_bulk_with_all_params(self, client: Cloudflare) -> None:
+        move = client.email_security.investigate.move.bulk(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination="Inbox",
+            ids=["string"],
+            postfix_ids=["4Njp3P0STMz2c02Q"],
+        )
+        assert_matches_type(SyncSinglePage[MoveBulkResponse], move, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk(self, client: Cloudflare) -> None:
+        response = client.email_security.investigate.move.with_raw_response.bulk(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination="Inbox",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        move = response.parse()
+        assert_matches_type(SyncSinglePage[MoveBulkResponse], move, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk(self, client: Cloudflare) -> None:
+        with client.email_security.investigate.move.with_streaming_response.bulk(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination="Inbox",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            move = response.parse()
+            assert_matches_type(SyncSinglePage[MoveBulkResponse], move, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.investigate.move.with_raw_response.bulk(
+                account_id="",
+                destination="Inbox",
+            )
+
+
+class TestAsyncMove:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        move = await async_client.email_security.investigate.move.create(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination="Inbox",
+        )
+        assert_matches_type(AsyncSinglePage[MoveCreateResponse], move, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.investigate.move.with_raw_response.create(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination="Inbox",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        move = await response.parse()
+        assert_matches_type(AsyncSinglePage[MoveCreateResponse], move, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.investigate.move.with_streaming_response.create(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination="Inbox",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            move = await response.parse()
+            assert_matches_type(AsyncSinglePage[MoveCreateResponse], move, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.investigate.move.with_raw_response.create(
+                postfix_id="4Njp3P0STMz2c02Q",
+                account_id="",
+                destination="Inbox",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `postfix_id` but received ''"):
+            await async_client.email_security.investigate.move.with_raw_response.create(
+                postfix_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                destination="Inbox",
+            )
+
+    @parametrize
+    async def test_method_bulk(self, async_client: AsyncCloudflare) -> None:
+        move = await async_client.email_security.investigate.move.bulk(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination="Inbox",
+        )
+        assert_matches_type(AsyncSinglePage[MoveBulkResponse], move, path=["response"])
+
+    @parametrize
+    async def test_method_bulk_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        move = await async_client.email_security.investigate.move.bulk(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination="Inbox",
+            ids=["string"],
+            postfix_ids=["4Njp3P0STMz2c02Q"],
+        )
+        assert_matches_type(AsyncSinglePage[MoveBulkResponse], move, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.investigate.move.with_raw_response.bulk(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination="Inbox",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        move = await response.parse()
+        assert_matches_type(AsyncSinglePage[MoveBulkResponse], move, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.investigate.move.with_streaming_response.bulk(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination="Inbox",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            move = await response.parse()
+            assert_matches_type(AsyncSinglePage[MoveBulkResponse], move, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.investigate.move.with_raw_response.bulk(
+                account_id="",
+                destination="Inbox",
+            )
diff --git a/tests/api_resources/email_security/investigate/test_preview.py b/tests/api_resources/email_security/investigate/test_preview.py
new file mode 100644
index 00000000000..18e710732bb
--- /dev/null
+++ b/tests/api_resources/email_security/investigate/test_preview.py
@@ -0,0 +1,204 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.email_security.investigate import PreviewGetResponse, PreviewCreateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestPreview:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        preview = client.email_security.investigate.preview.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            postfix_id="4Njp3P0STMz2c02Q",
+        )
+        assert_matches_type(PreviewCreateResponse, preview, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.email_security.investigate.preview.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            postfix_id="4Njp3P0STMz2c02Q",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        preview = response.parse()
+        assert_matches_type(PreviewCreateResponse, preview, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.email_security.investigate.preview.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            postfix_id="4Njp3P0STMz2c02Q",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            preview = response.parse()
+            assert_matches_type(PreviewCreateResponse, preview, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.investigate.preview.with_raw_response.create(
+                account_id="",
+                postfix_id="4Njp3P0STMz2c02Q",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        preview = client.email_security.investigate.preview.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(PreviewGetResponse, preview, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.email_security.investigate.preview.with_raw_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        preview = response.parse()
+        assert_matches_type(PreviewGetResponse, preview, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.email_security.investigate.preview.with_streaming_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            preview = response.parse()
+            assert_matches_type(PreviewGetResponse, preview, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.investigate.preview.with_raw_response.get(
+                postfix_id="4Njp3P0STMz2c02Q",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `postfix_id` but received ''"):
+            client.email_security.investigate.preview.with_raw_response.get(
+                postfix_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncPreview:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        preview = await async_client.email_security.investigate.preview.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            postfix_id="4Njp3P0STMz2c02Q",
+        )
+        assert_matches_type(PreviewCreateResponse, preview, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.investigate.preview.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            postfix_id="4Njp3P0STMz2c02Q",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        preview = await response.parse()
+        assert_matches_type(PreviewCreateResponse, preview, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.investigate.preview.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            postfix_id="4Njp3P0STMz2c02Q",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            preview = await response.parse()
+            assert_matches_type(PreviewCreateResponse, preview, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.investigate.preview.with_raw_response.create(
+                account_id="",
+                postfix_id="4Njp3P0STMz2c02Q",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        preview = await async_client.email_security.investigate.preview.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(PreviewGetResponse, preview, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.investigate.preview.with_raw_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        preview = await response.parse()
+        assert_matches_type(PreviewGetResponse, preview, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.investigate.preview.with_streaming_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            preview = await response.parse()
+            assert_matches_type(PreviewGetResponse, preview, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.investigate.preview.with_raw_response.get(
+                postfix_id="4Njp3P0STMz2c02Q",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `postfix_id` but received ''"):
+            await async_client.email_security.investigate.preview.with_raw_response.get(
+                postfix_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/email_security/investigate/test_raw.py b/tests/api_resources/email_security/investigate/test_raw.py
new file mode 100644
index 00000000000..204fbb63f6b
--- /dev/null
+++ b/tests/api_resources/email_security/investigate/test_raw.py
@@ -0,0 +1,120 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.email_security.investigate import RawGetResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestRaw:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        raw = client.email_security.investigate.raw.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(RawGetResponse, raw, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.email_security.investigate.raw.with_raw_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        raw = response.parse()
+        assert_matches_type(RawGetResponse, raw, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.email_security.investigate.raw.with_streaming_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            raw = response.parse()
+            assert_matches_type(RawGetResponse, raw, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.investigate.raw.with_raw_response.get(
+                postfix_id="4Njp3P0STMz2c02Q",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `postfix_id` but received ''"):
+            client.email_security.investigate.raw.with_raw_response.get(
+                postfix_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncRaw:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        raw = await async_client.email_security.investigate.raw.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(RawGetResponse, raw, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.investigate.raw.with_raw_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        raw = await response.parse()
+        assert_matches_type(RawGetResponse, raw, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.investigate.raw.with_streaming_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            raw = await response.parse()
+            assert_matches_type(RawGetResponse, raw, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.investigate.raw.with_raw_response.get(
+                postfix_id="4Njp3P0STMz2c02Q",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `postfix_id` but received ''"):
+            await async_client.email_security.investigate.raw.with_raw_response.get(
+                postfix_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/email_security/investigate/test_reclassify.py b/tests/api_resources/email_security/investigate/test_reclassify.py
new file mode 100644
index 00000000000..a4552921abc
--- /dev/null
+++ b/tests/api_resources/email_security/investigate/test_reclassify.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestReclassify:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        reclassify = client.email_security.investigate.reclassify.create(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            expected_disposition="NONE",
+        )
+        assert_matches_type(object, reclassify, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        reclassify = client.email_security.investigate.reclassify.create(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            expected_disposition="NONE",
+            eml_content="eml_content",
+            escalated_submission_id="escalated_submission_id",
+        )
+        assert_matches_type(object, reclassify, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.email_security.investigate.reclassify.with_raw_response.create(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            expected_disposition="NONE",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        reclassify = response.parse()
+        assert_matches_type(object, reclassify, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.email_security.investigate.reclassify.with_streaming_response.create(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            expected_disposition="NONE",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            reclassify = response.parse()
+            assert_matches_type(object, reclassify, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.investigate.reclassify.with_raw_response.create(
+                postfix_id="4Njp3P0STMz2c02Q",
+                account_id="",
+                expected_disposition="NONE",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `postfix_id` but received ''"):
+            client.email_security.investigate.reclassify.with_raw_response.create(
+                postfix_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                expected_disposition="NONE",
+            )
+
+
+class TestAsyncReclassify:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        reclassify = await async_client.email_security.investigate.reclassify.create(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            expected_disposition="NONE",
+        )
+        assert_matches_type(object, reclassify, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        reclassify = await async_client.email_security.investigate.reclassify.create(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            expected_disposition="NONE",
+            eml_content="eml_content",
+            escalated_submission_id="escalated_submission_id",
+        )
+        assert_matches_type(object, reclassify, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.investigate.reclassify.with_raw_response.create(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            expected_disposition="NONE",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        reclassify = await response.parse()
+        assert_matches_type(object, reclassify, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.investigate.reclassify.with_streaming_response.create(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            expected_disposition="NONE",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            reclassify = await response.parse()
+            assert_matches_type(object, reclassify, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.investigate.reclassify.with_raw_response.create(
+                postfix_id="4Njp3P0STMz2c02Q",
+                account_id="",
+                expected_disposition="NONE",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `postfix_id` but received ''"):
+            await async_client.email_security.investigate.reclassify.with_raw_response.create(
+                postfix_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                expected_disposition="NONE",
+            )
diff --git a/tests/api_resources/email_security/investigate/test_release.py b/tests/api_resources/email_security/investigate/test_release.py
new file mode 100644
index 00000000000..44430b8c827
--- /dev/null
+++ b/tests/api_resources/email_security/investigate/test_release.py
@@ -0,0 +1,109 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.email_security.investigate import ReleaseBulkResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestRelease:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_bulk(self, client: Cloudflare) -> None:
+        release = client.email_security.investigate.release.bulk(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=["4Njp3P0STMz2c02Q"],
+        )
+        assert_matches_type(SyncSinglePage[ReleaseBulkResponse], release, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk(self, client: Cloudflare) -> None:
+        response = client.email_security.investigate.release.with_raw_response.bulk(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=["4Njp3P0STMz2c02Q"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        release = response.parse()
+        assert_matches_type(SyncSinglePage[ReleaseBulkResponse], release, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk(self, client: Cloudflare) -> None:
+        with client.email_security.investigate.release.with_streaming_response.bulk(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=["4Njp3P0STMz2c02Q"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            release = response.parse()
+            assert_matches_type(SyncSinglePage[ReleaseBulkResponse], release, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.investigate.release.with_raw_response.bulk(
+                account_id="",
+                body=["4Njp3P0STMz2c02Q"],
+            )
+
+
+class TestAsyncRelease:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_bulk(self, async_client: AsyncCloudflare) -> None:
+        release = await async_client.email_security.investigate.release.bulk(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=["4Njp3P0STMz2c02Q"],
+        )
+        assert_matches_type(AsyncSinglePage[ReleaseBulkResponse], release, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.investigate.release.with_raw_response.bulk(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=["4Njp3P0STMz2c02Q"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        release = await response.parse()
+        assert_matches_type(AsyncSinglePage[ReleaseBulkResponse], release, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.investigate.release.with_streaming_response.bulk(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=["4Njp3P0STMz2c02Q"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            release = await response.parse()
+            assert_matches_type(AsyncSinglePage[ReleaseBulkResponse], release, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.investigate.release.with_raw_response.bulk(
+                account_id="",
+                body=["4Njp3P0STMz2c02Q"],
+            )
diff --git a/tests/api_resources/email_security/investigate/test_trace.py b/tests/api_resources/email_security/investigate/test_trace.py
new file mode 100644
index 00000000000..f3ad42bcaea
--- /dev/null
+++ b/tests/api_resources/email_security/investigate/test_trace.py
@@ -0,0 +1,120 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.email_security.investigate import TraceGetResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestTrace:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        trace = client.email_security.investigate.trace.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(TraceGetResponse, trace, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.email_security.investigate.trace.with_raw_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        trace = response.parse()
+        assert_matches_type(TraceGetResponse, trace, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.email_security.investigate.trace.with_streaming_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            trace = response.parse()
+            assert_matches_type(TraceGetResponse, trace, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.investigate.trace.with_raw_response.get(
+                postfix_id="4Njp3P0STMz2c02Q",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `postfix_id` but received ''"):
+            client.email_security.investigate.trace.with_raw_response.get(
+                postfix_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncTrace:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        trace = await async_client.email_security.investigate.trace.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(TraceGetResponse, trace, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.investigate.trace.with_raw_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        trace = await response.parse()
+        assert_matches_type(TraceGetResponse, trace, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.investigate.trace.with_streaming_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            trace = await response.parse()
+            assert_matches_type(TraceGetResponse, trace, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.investigate.trace.with_raw_response.get(
+                postfix_id="4Njp3P0STMz2c02Q",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `postfix_id` but received ''"):
+            await async_client.email_security.investigate.trace.with_raw_response.get(
+                postfix_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/email_security/settings/__init__.py b/tests/api_resources/email_security/settings/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/email_security/settings/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/email_security/settings/test_allow_policies.py b/tests/api_resources/email_security/settings/test_allow_policies.py
new file mode 100644
index 00000000000..9957ba139f1
--- /dev/null
+++ b/tests/api_resources/email_security/settings/test_allow_policies.py
@@ -0,0 +1,601 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.email_security.settings import (
+    AllowPolicyGetResponse,
+    AllowPolicyEditResponse,
+    AllowPolicyListResponse,
+    AllowPolicyCreateResponse,
+    AllowPolicyDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestAllowPolicies:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        allow_policy = client.email_security.settings.allow_policies.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_acceptable_sender=False,
+            is_exempt_recipient=False,
+            is_regex=False,
+            is_trusted_sender=True,
+            pattern="test@example.com",
+            pattern_type="EMAIL",
+            verify_sender=True,
+        )
+        assert_matches_type(AllowPolicyCreateResponse, allow_policy, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        allow_policy = client.email_security.settings.allow_policies.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_acceptable_sender=False,
+            is_exempt_recipient=False,
+            is_regex=False,
+            is_trusted_sender=True,
+            pattern="test@example.com",
+            pattern_type="EMAIL",
+            verify_sender=True,
+            comments="Trust all messages send from test@example.com",
+            is_recipient=False,
+            is_sender=True,
+            is_spoof=False,
+        )
+        assert_matches_type(AllowPolicyCreateResponse, allow_policy, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.allow_policies.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_acceptable_sender=False,
+            is_exempt_recipient=False,
+            is_regex=False,
+            is_trusted_sender=True,
+            pattern="test@example.com",
+            pattern_type="EMAIL",
+            verify_sender=True,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        allow_policy = response.parse()
+        assert_matches_type(AllowPolicyCreateResponse, allow_policy, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.email_security.settings.allow_policies.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_acceptable_sender=False,
+            is_exempt_recipient=False,
+            is_regex=False,
+            is_trusted_sender=True,
+            pattern="test@example.com",
+            pattern_type="EMAIL",
+            verify_sender=True,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            allow_policy = response.parse()
+            assert_matches_type(AllowPolicyCreateResponse, allow_policy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.allow_policies.with_raw_response.create(
+                account_id="",
+                is_acceptable_sender=False,
+                is_exempt_recipient=False,
+                is_regex=False,
+                is_trusted_sender=True,
+                pattern="test@example.com",
+                pattern_type="EMAIL",
+                verify_sender=True,
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        allow_policy = client.email_security.settings.allow_policies.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[AllowPolicyListResponse], allow_policy, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        allow_policy = client.email_security.settings.allow_policies.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="asc",
+            is_acceptable_sender=True,
+            is_exempt_recipient=True,
+            is_recipient=True,
+            is_sender=True,
+            is_spoof=True,
+            is_trusted_sender=True,
+            order="pattern",
+            page=1,
+            pattern="pattern",
+            pattern_type="EMAIL",
+            per_page=1,
+            search="search",
+            verify_sender=True,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[AllowPolicyListResponse], allow_policy, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.allow_policies.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        allow_policy = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[AllowPolicyListResponse], allow_policy, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.email_security.settings.allow_policies.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            allow_policy = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[AllowPolicyListResponse], allow_policy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.allow_policies.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        allow_policy = client.email_security.settings.allow_policies.delete(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AllowPolicyDeleteResponse, allow_policy, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.allow_policies.with_raw_response.delete(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        allow_policy = response.parse()
+        assert_matches_type(AllowPolicyDeleteResponse, allow_policy, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.email_security.settings.allow_policies.with_streaming_response.delete(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            allow_policy = response.parse()
+            assert_matches_type(AllowPolicyDeleteResponse, allow_policy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.allow_policies.with_raw_response.delete(
+                policy_id=2401,
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        allow_policy = client.email_security.settings.allow_policies.edit(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AllowPolicyEditResponse, allow_policy, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        allow_policy = client.email_security.settings.allow_policies.edit(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            comments="comments",
+            is_acceptable_sender=True,
+            is_exempt_recipient=True,
+            is_regex=True,
+            is_trusted_sender=True,
+            pattern="x",
+            pattern_type="EMAIL",
+            verify_sender=True,
+        )
+        assert_matches_type(AllowPolicyEditResponse, allow_policy, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.allow_policies.with_raw_response.edit(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        allow_policy = response.parse()
+        assert_matches_type(AllowPolicyEditResponse, allow_policy, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.email_security.settings.allow_policies.with_streaming_response.edit(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            allow_policy = response.parse()
+            assert_matches_type(AllowPolicyEditResponse, allow_policy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.allow_policies.with_raw_response.edit(
+                policy_id=2401,
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        allow_policy = client.email_security.settings.allow_policies.get(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AllowPolicyGetResponse, allow_policy, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.allow_policies.with_raw_response.get(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        allow_policy = response.parse()
+        assert_matches_type(AllowPolicyGetResponse, allow_policy, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.email_security.settings.allow_policies.with_streaming_response.get(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            allow_policy = response.parse()
+            assert_matches_type(AllowPolicyGetResponse, allow_policy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.allow_policies.with_raw_response.get(
+                policy_id=2401,
+                account_id="",
+            )
+
+
+class TestAsyncAllowPolicies:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        allow_policy = await async_client.email_security.settings.allow_policies.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_acceptable_sender=False,
+            is_exempt_recipient=False,
+            is_regex=False,
+            is_trusted_sender=True,
+            pattern="test@example.com",
+            pattern_type="EMAIL",
+            verify_sender=True,
+        )
+        assert_matches_type(AllowPolicyCreateResponse, allow_policy, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        allow_policy = await async_client.email_security.settings.allow_policies.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_acceptable_sender=False,
+            is_exempt_recipient=False,
+            is_regex=False,
+            is_trusted_sender=True,
+            pattern="test@example.com",
+            pattern_type="EMAIL",
+            verify_sender=True,
+            comments="Trust all messages send from test@example.com",
+            is_recipient=False,
+            is_sender=True,
+            is_spoof=False,
+        )
+        assert_matches_type(AllowPolicyCreateResponse, allow_policy, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.allow_policies.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_acceptable_sender=False,
+            is_exempt_recipient=False,
+            is_regex=False,
+            is_trusted_sender=True,
+            pattern="test@example.com",
+            pattern_type="EMAIL",
+            verify_sender=True,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        allow_policy = await response.parse()
+        assert_matches_type(AllowPolicyCreateResponse, allow_policy, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.allow_policies.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_acceptable_sender=False,
+            is_exempt_recipient=False,
+            is_regex=False,
+            is_trusted_sender=True,
+            pattern="test@example.com",
+            pattern_type="EMAIL",
+            verify_sender=True,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            allow_policy = await response.parse()
+            assert_matches_type(AllowPolicyCreateResponse, allow_policy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.allow_policies.with_raw_response.create(
+                account_id="",
+                is_acceptable_sender=False,
+                is_exempt_recipient=False,
+                is_regex=False,
+                is_trusted_sender=True,
+                pattern="test@example.com",
+                pattern_type="EMAIL",
+                verify_sender=True,
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        allow_policy = await async_client.email_security.settings.allow_policies.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[AllowPolicyListResponse], allow_policy, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        allow_policy = await async_client.email_security.settings.allow_policies.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="asc",
+            is_acceptable_sender=True,
+            is_exempt_recipient=True,
+            is_recipient=True,
+            is_sender=True,
+            is_spoof=True,
+            is_trusted_sender=True,
+            order="pattern",
+            page=1,
+            pattern="pattern",
+            pattern_type="EMAIL",
+            per_page=1,
+            search="search",
+            verify_sender=True,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[AllowPolicyListResponse], allow_policy, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.allow_policies.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        allow_policy = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[AllowPolicyListResponse], allow_policy, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.allow_policies.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            allow_policy = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[AllowPolicyListResponse], allow_policy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.allow_policies.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        allow_policy = await async_client.email_security.settings.allow_policies.delete(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AllowPolicyDeleteResponse, allow_policy, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.allow_policies.with_raw_response.delete(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        allow_policy = await response.parse()
+        assert_matches_type(AllowPolicyDeleteResponse, allow_policy, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.allow_policies.with_streaming_response.delete(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            allow_policy = await response.parse()
+            assert_matches_type(AllowPolicyDeleteResponse, allow_policy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.allow_policies.with_raw_response.delete(
+                policy_id=2401,
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        allow_policy = await async_client.email_security.settings.allow_policies.edit(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AllowPolicyEditResponse, allow_policy, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        allow_policy = await async_client.email_security.settings.allow_policies.edit(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            comments="comments",
+            is_acceptable_sender=True,
+            is_exempt_recipient=True,
+            is_regex=True,
+            is_trusted_sender=True,
+            pattern="x",
+            pattern_type="EMAIL",
+            verify_sender=True,
+        )
+        assert_matches_type(AllowPolicyEditResponse, allow_policy, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.allow_policies.with_raw_response.edit(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        allow_policy = await response.parse()
+        assert_matches_type(AllowPolicyEditResponse, allow_policy, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.allow_policies.with_streaming_response.edit(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            allow_policy = await response.parse()
+            assert_matches_type(AllowPolicyEditResponse, allow_policy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.allow_policies.with_raw_response.edit(
+                policy_id=2401,
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        allow_policy = await async_client.email_security.settings.allow_policies.get(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AllowPolicyGetResponse, allow_policy, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.allow_policies.with_raw_response.get(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        allow_policy = await response.parse()
+        assert_matches_type(AllowPolicyGetResponse, allow_policy, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.allow_policies.with_streaming_response.get(
+            policy_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            allow_policy = await response.parse()
+            assert_matches_type(AllowPolicyGetResponse, allow_policy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.allow_policies.with_raw_response.get(
+                policy_id=2401,
+                account_id="",
+            )
diff --git a/tests/api_resources/email_security/settings/test_block_senders.py b/tests/api_resources/email_security/settings/test_block_senders.py
new file mode 100644
index 00000000000..f2611adf7dd
--- /dev/null
+++ b/tests/api_resources/email_security/settings/test_block_senders.py
@@ -0,0 +1,533 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.email_security.settings import (
+    BlockSenderGetResponse,
+    BlockSenderEditResponse,
+    BlockSenderListResponse,
+    BlockSenderCreateResponse,
+    BlockSenderDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestBlockSenders:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        block_sender = client.email_security.settings.block_senders.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_regex=False,
+            pattern="test@example.com",
+            pattern_type="EMAIL",
+        )
+        assert_matches_type(BlockSenderCreateResponse, block_sender, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        block_sender = client.email_security.settings.block_senders.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_regex=False,
+            pattern="test@example.com",
+            pattern_type="EMAIL",
+            comments="block sender with email test@example.com",
+        )
+        assert_matches_type(BlockSenderCreateResponse, block_sender, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.block_senders.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_regex=False,
+            pattern="test@example.com",
+            pattern_type="EMAIL",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        block_sender = response.parse()
+        assert_matches_type(BlockSenderCreateResponse, block_sender, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.email_security.settings.block_senders.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_regex=False,
+            pattern="test@example.com",
+            pattern_type="EMAIL",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            block_sender = response.parse()
+            assert_matches_type(BlockSenderCreateResponse, block_sender, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.block_senders.with_raw_response.create(
+                account_id="",
+                is_regex=False,
+                pattern="test@example.com",
+                pattern_type="EMAIL",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        block_sender = client.email_security.settings.block_senders.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[BlockSenderListResponse], block_sender, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        block_sender = client.email_security.settings.block_senders.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="asc",
+            order="pattern",
+            page=1,
+            pattern="pattern",
+            pattern_type="EMAIL",
+            per_page=1,
+            search="search",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[BlockSenderListResponse], block_sender, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.block_senders.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        block_sender = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[BlockSenderListResponse], block_sender, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.email_security.settings.block_senders.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            block_sender = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[BlockSenderListResponse], block_sender, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.block_senders.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        block_sender = client.email_security.settings.block_senders.delete(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(BlockSenderDeleteResponse, block_sender, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.block_senders.with_raw_response.delete(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        block_sender = response.parse()
+        assert_matches_type(BlockSenderDeleteResponse, block_sender, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.email_security.settings.block_senders.with_streaming_response.delete(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            block_sender = response.parse()
+            assert_matches_type(BlockSenderDeleteResponse, block_sender, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.block_senders.with_raw_response.delete(
+                pattern_id=2402,
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        block_sender = client.email_security.settings.block_senders.edit(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(BlockSenderEditResponse, block_sender, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        block_sender = client.email_security.settings.block_senders.edit(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            comments="comments",
+            is_regex=True,
+            pattern="x",
+            pattern_type="EMAIL",
+        )
+        assert_matches_type(BlockSenderEditResponse, block_sender, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.block_senders.with_raw_response.edit(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        block_sender = response.parse()
+        assert_matches_type(BlockSenderEditResponse, block_sender, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.email_security.settings.block_senders.with_streaming_response.edit(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            block_sender = response.parse()
+            assert_matches_type(BlockSenderEditResponse, block_sender, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.block_senders.with_raw_response.edit(
+                pattern_id=2402,
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        block_sender = client.email_security.settings.block_senders.get(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(BlockSenderGetResponse, block_sender, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.block_senders.with_raw_response.get(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        block_sender = response.parse()
+        assert_matches_type(BlockSenderGetResponse, block_sender, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.email_security.settings.block_senders.with_streaming_response.get(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            block_sender = response.parse()
+            assert_matches_type(BlockSenderGetResponse, block_sender, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.block_senders.with_raw_response.get(
+                pattern_id=2402,
+                account_id="",
+            )
+
+
+class TestAsyncBlockSenders:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        block_sender = await async_client.email_security.settings.block_senders.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_regex=False,
+            pattern="test@example.com",
+            pattern_type="EMAIL",
+        )
+        assert_matches_type(BlockSenderCreateResponse, block_sender, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        block_sender = await async_client.email_security.settings.block_senders.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_regex=False,
+            pattern="test@example.com",
+            pattern_type="EMAIL",
+            comments="block sender with email test@example.com",
+        )
+        assert_matches_type(BlockSenderCreateResponse, block_sender, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.block_senders.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_regex=False,
+            pattern="test@example.com",
+            pattern_type="EMAIL",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        block_sender = await response.parse()
+        assert_matches_type(BlockSenderCreateResponse, block_sender, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.block_senders.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_regex=False,
+            pattern="test@example.com",
+            pattern_type="EMAIL",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            block_sender = await response.parse()
+            assert_matches_type(BlockSenderCreateResponse, block_sender, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.block_senders.with_raw_response.create(
+                account_id="",
+                is_regex=False,
+                pattern="test@example.com",
+                pattern_type="EMAIL",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        block_sender = await async_client.email_security.settings.block_senders.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[BlockSenderListResponse], block_sender, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        block_sender = await async_client.email_security.settings.block_senders.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="asc",
+            order="pattern",
+            page=1,
+            pattern="pattern",
+            pattern_type="EMAIL",
+            per_page=1,
+            search="search",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[BlockSenderListResponse], block_sender, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.block_senders.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        block_sender = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[BlockSenderListResponse], block_sender, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.block_senders.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            block_sender = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[BlockSenderListResponse], block_sender, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.block_senders.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        block_sender = await async_client.email_security.settings.block_senders.delete(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(BlockSenderDeleteResponse, block_sender, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.block_senders.with_raw_response.delete(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        block_sender = await response.parse()
+        assert_matches_type(BlockSenderDeleteResponse, block_sender, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.block_senders.with_streaming_response.delete(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            block_sender = await response.parse()
+            assert_matches_type(BlockSenderDeleteResponse, block_sender, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.block_senders.with_raw_response.delete(
+                pattern_id=2402,
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        block_sender = await async_client.email_security.settings.block_senders.edit(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(BlockSenderEditResponse, block_sender, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        block_sender = await async_client.email_security.settings.block_senders.edit(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            comments="comments",
+            is_regex=True,
+            pattern="x",
+            pattern_type="EMAIL",
+        )
+        assert_matches_type(BlockSenderEditResponse, block_sender, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.block_senders.with_raw_response.edit(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        block_sender = await response.parse()
+        assert_matches_type(BlockSenderEditResponse, block_sender, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.block_senders.with_streaming_response.edit(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            block_sender = await response.parse()
+            assert_matches_type(BlockSenderEditResponse, block_sender, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.block_senders.with_raw_response.edit(
+                pattern_id=2402,
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        block_sender = await async_client.email_security.settings.block_senders.get(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(BlockSenderGetResponse, block_sender, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.block_senders.with_raw_response.get(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        block_sender = await response.parse()
+        assert_matches_type(BlockSenderGetResponse, block_sender, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.block_senders.with_streaming_response.get(
+            pattern_id=2402,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            block_sender = await response.parse()
+            assert_matches_type(BlockSenderGetResponse, block_sender, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.block_senders.with_raw_response.get(
+                pattern_id=2402,
+                account_id="",
+            )
diff --git a/tests/api_resources/email_security/settings/test_domains.py b/tests/api_resources/email_security/settings/test_domains.py
new file mode 100644
index 00000000000..f7a0c73a988
--- /dev/null
+++ b/tests/api_resources/email_security/settings/test_domains.py
@@ -0,0 +1,513 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.email_security.settings import (
+    DomainGetResponse,
+    DomainEditResponse,
+    DomainListResponse,
+    DomainDeleteResponse,
+    DomainBulkDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestDomains:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        domain = client.email_security.settings.domains.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[DomainListResponse], domain, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        domain = client.email_security.settings.domains.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            active_delivery_mode="DIRECT",
+            allowed_delivery_mode="DIRECT",
+            direction="asc",
+            domain=["string"],
+            integration_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            order="domain",
+            page=1,
+            per_page=1,
+            search="search",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[DomainListResponse], domain, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.domains.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        domain = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[DomainListResponse], domain, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.email_security.settings.domains.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            domain = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[DomainListResponse], domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.domains.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        domain = client.email_security.settings.domains.delete(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(DomainDeleteResponse, domain, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.domains.with_raw_response.delete(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        domain = response.parse()
+        assert_matches_type(DomainDeleteResponse, domain, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.email_security.settings.domains.with_streaming_response.delete(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            domain = response.parse()
+            assert_matches_type(DomainDeleteResponse, domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.domains.with_raw_response.delete(
+                domain_id=2400,
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_bulk_delete(self, client: Cloudflare) -> None:
+        domain = client.email_security.settings.domains.bulk_delete(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[DomainBulkDeleteResponse], domain, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_delete(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.domains.with_raw_response.bulk_delete(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        domain = response.parse()
+        assert_matches_type(SyncSinglePage[DomainBulkDeleteResponse], domain, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_delete(self, client: Cloudflare) -> None:
+        with client.email_security.settings.domains.with_streaming_response.bulk_delete(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            domain = response.parse()
+            assert_matches_type(SyncSinglePage[DomainBulkDeleteResponse], domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.domains.with_raw_response.bulk_delete(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        domain = client.email_security.settings.domains.edit(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ip_restrictions=["192.0.2.0/24", "2001:db8::/32"],
+        )
+        assert_matches_type(DomainEditResponse, domain, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        domain = client.email_security.settings.domains.edit(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ip_restrictions=["192.0.2.0/24", "2001:db8::/32"],
+            allowed_delivery_modes=["DIRECT"],
+            domain="domain",
+            drop_dispositions=["MALICIOUS"],
+            folder="AllItems",
+            integration_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            lookback_hops=1,
+            regions=["GLOBAL"],
+            require_tls_inbound=True,
+            require_tls_outbound=True,
+            transport="transport",
+        )
+        assert_matches_type(DomainEditResponse, domain, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.domains.with_raw_response.edit(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ip_restrictions=["192.0.2.0/24", "2001:db8::/32"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        domain = response.parse()
+        assert_matches_type(DomainEditResponse, domain, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.email_security.settings.domains.with_streaming_response.edit(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ip_restrictions=["192.0.2.0/24", "2001:db8::/32"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            domain = response.parse()
+            assert_matches_type(DomainEditResponse, domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.domains.with_raw_response.edit(
+                domain_id=2400,
+                account_id="",
+                ip_restrictions=["192.0.2.0/24", "2001:db8::/32"],
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        domain = client.email_security.settings.domains.get(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(DomainGetResponse, domain, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.domains.with_raw_response.get(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        domain = response.parse()
+        assert_matches_type(DomainGetResponse, domain, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.email_security.settings.domains.with_streaming_response.get(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            domain = response.parse()
+            assert_matches_type(DomainGetResponse, domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.domains.with_raw_response.get(
+                domain_id=2400,
+                account_id="",
+            )
+
+
+class TestAsyncDomains:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        domain = await async_client.email_security.settings.domains.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[DomainListResponse], domain, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        domain = await async_client.email_security.settings.domains.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            active_delivery_mode="DIRECT",
+            allowed_delivery_mode="DIRECT",
+            direction="asc",
+            domain=["string"],
+            integration_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            order="domain",
+            page=1,
+            per_page=1,
+            search="search",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[DomainListResponse], domain, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.domains.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        domain = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[DomainListResponse], domain, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.domains.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            domain = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[DomainListResponse], domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.domains.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        domain = await async_client.email_security.settings.domains.delete(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(DomainDeleteResponse, domain, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.domains.with_raw_response.delete(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        domain = await response.parse()
+        assert_matches_type(DomainDeleteResponse, domain, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.domains.with_streaming_response.delete(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            domain = await response.parse()
+            assert_matches_type(DomainDeleteResponse, domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.domains.with_raw_response.delete(
+                domain_id=2400,
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        domain = await async_client.email_security.settings.domains.bulk_delete(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[DomainBulkDeleteResponse], domain, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.domains.with_raw_response.bulk_delete(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        domain = await response.parse()
+        assert_matches_type(AsyncSinglePage[DomainBulkDeleteResponse], domain, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.domains.with_streaming_response.bulk_delete(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            domain = await response.parse()
+            assert_matches_type(AsyncSinglePage[DomainBulkDeleteResponse], domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.domains.with_raw_response.bulk_delete(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        domain = await async_client.email_security.settings.domains.edit(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ip_restrictions=["192.0.2.0/24", "2001:db8::/32"],
+        )
+        assert_matches_type(DomainEditResponse, domain, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        domain = await async_client.email_security.settings.domains.edit(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ip_restrictions=["192.0.2.0/24", "2001:db8::/32"],
+            allowed_delivery_modes=["DIRECT"],
+            domain="domain",
+            drop_dispositions=["MALICIOUS"],
+            folder="AllItems",
+            integration_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            lookback_hops=1,
+            regions=["GLOBAL"],
+            require_tls_inbound=True,
+            require_tls_outbound=True,
+            transport="transport",
+        )
+        assert_matches_type(DomainEditResponse, domain, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.domains.with_raw_response.edit(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ip_restrictions=["192.0.2.0/24", "2001:db8::/32"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        domain = await response.parse()
+        assert_matches_type(DomainEditResponse, domain, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.domains.with_streaming_response.edit(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ip_restrictions=["192.0.2.0/24", "2001:db8::/32"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            domain = await response.parse()
+            assert_matches_type(DomainEditResponse, domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.domains.with_raw_response.edit(
+                domain_id=2400,
+                account_id="",
+                ip_restrictions=["192.0.2.0/24", "2001:db8::/32"],
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        domain = await async_client.email_security.settings.domains.get(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(DomainGetResponse, domain, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.domains.with_raw_response.get(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        domain = await response.parse()
+        assert_matches_type(DomainGetResponse, domain, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.domains.with_streaming_response.get(
+            domain_id=2400,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            domain = await response.parse()
+            assert_matches_type(DomainGetResponse, domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.domains.with_raw_response.get(
+                domain_id=2400,
+                account_id="",
+            )
diff --git a/tests/api_resources/email_security/settings/test_impersonation_registry.py b/tests/api_resources/email_security/settings/test_impersonation_registry.py
new file mode 100644
index 00000000000..0d484d1724d
--- /dev/null
+++ b/tests/api_resources/email_security/settings/test_impersonation_registry.py
@@ -0,0 +1,523 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.email_security.settings import (
+    ImpersonationRegistryGetResponse,
+    ImpersonationRegistryEditResponse,
+    ImpersonationRegistryListResponse,
+    ImpersonationRegistryCreateResponse,
+    ImpersonationRegistryDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestImpersonationRegistry:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        impersonation_registry = client.email_security.settings.impersonation_registry.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            email="email",
+            is_email_regex=True,
+            name="name",
+        )
+        assert_matches_type(ImpersonationRegistryCreateResponse, impersonation_registry, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.impersonation_registry.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            email="email",
+            is_email_regex=True,
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        impersonation_registry = response.parse()
+        assert_matches_type(ImpersonationRegistryCreateResponse, impersonation_registry, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.email_security.settings.impersonation_registry.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            email="email",
+            is_email_regex=True,
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            impersonation_registry = response.parse()
+            assert_matches_type(ImpersonationRegistryCreateResponse, impersonation_registry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.impersonation_registry.with_raw_response.create(
+                account_id="",
+                email="email",
+                is_email_regex=True,
+                name="name",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        impersonation_registry = client.email_security.settings.impersonation_registry.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(
+            SyncV4PagePaginationArray[ImpersonationRegistryListResponse], impersonation_registry, path=["response"]
+        )
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        impersonation_registry = client.email_security.settings.impersonation_registry.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="asc",
+            order="name",
+            page=1,
+            per_page=1,
+            provenance="A1S_INTERNAL",
+            search="search",
+        )
+        assert_matches_type(
+            SyncV4PagePaginationArray[ImpersonationRegistryListResponse], impersonation_registry, path=["response"]
+        )
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.impersonation_registry.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        impersonation_registry = response.parse()
+        assert_matches_type(
+            SyncV4PagePaginationArray[ImpersonationRegistryListResponse], impersonation_registry, path=["response"]
+        )
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.email_security.settings.impersonation_registry.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            impersonation_registry = response.parse()
+            assert_matches_type(
+                SyncV4PagePaginationArray[ImpersonationRegistryListResponse], impersonation_registry, path=["response"]
+            )
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.impersonation_registry.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        impersonation_registry = client.email_security.settings.impersonation_registry.delete(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ImpersonationRegistryDeleteResponse, impersonation_registry, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.impersonation_registry.with_raw_response.delete(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        impersonation_registry = response.parse()
+        assert_matches_type(ImpersonationRegistryDeleteResponse, impersonation_registry, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.email_security.settings.impersonation_registry.with_streaming_response.delete(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            impersonation_registry = response.parse()
+            assert_matches_type(ImpersonationRegistryDeleteResponse, impersonation_registry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.impersonation_registry.with_raw_response.delete(
+                display_name_id=2403,
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        impersonation_registry = client.email_security.settings.impersonation_registry.edit(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ImpersonationRegistryEditResponse, impersonation_registry, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        impersonation_registry = client.email_security.settings.impersonation_registry.edit(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            email="email",
+            is_email_regex=True,
+            name="name",
+        )
+        assert_matches_type(ImpersonationRegistryEditResponse, impersonation_registry, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.impersonation_registry.with_raw_response.edit(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        impersonation_registry = response.parse()
+        assert_matches_type(ImpersonationRegistryEditResponse, impersonation_registry, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.email_security.settings.impersonation_registry.with_streaming_response.edit(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            impersonation_registry = response.parse()
+            assert_matches_type(ImpersonationRegistryEditResponse, impersonation_registry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.impersonation_registry.with_raw_response.edit(
+                display_name_id=2403,
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        impersonation_registry = client.email_security.settings.impersonation_registry.get(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ImpersonationRegistryGetResponse, impersonation_registry, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.impersonation_registry.with_raw_response.get(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        impersonation_registry = response.parse()
+        assert_matches_type(ImpersonationRegistryGetResponse, impersonation_registry, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.email_security.settings.impersonation_registry.with_streaming_response.get(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            impersonation_registry = response.parse()
+            assert_matches_type(ImpersonationRegistryGetResponse, impersonation_registry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.impersonation_registry.with_raw_response.get(
+                display_name_id=2403,
+                account_id="",
+            )
+
+
+class TestAsyncImpersonationRegistry:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        impersonation_registry = await async_client.email_security.settings.impersonation_registry.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            email="email",
+            is_email_regex=True,
+            name="name",
+        )
+        assert_matches_type(ImpersonationRegistryCreateResponse, impersonation_registry, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.impersonation_registry.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            email="email",
+            is_email_regex=True,
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        impersonation_registry = await response.parse()
+        assert_matches_type(ImpersonationRegistryCreateResponse, impersonation_registry, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.impersonation_registry.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            email="email",
+            is_email_regex=True,
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            impersonation_registry = await response.parse()
+            assert_matches_type(ImpersonationRegistryCreateResponse, impersonation_registry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.impersonation_registry.with_raw_response.create(
+                account_id="",
+                email="email",
+                is_email_regex=True,
+                name="name",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        impersonation_registry = await async_client.email_security.settings.impersonation_registry.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(
+            AsyncV4PagePaginationArray[ImpersonationRegistryListResponse], impersonation_registry, path=["response"]
+        )
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        impersonation_registry = await async_client.email_security.settings.impersonation_registry.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="asc",
+            order="name",
+            page=1,
+            per_page=1,
+            provenance="A1S_INTERNAL",
+            search="search",
+        )
+        assert_matches_type(
+            AsyncV4PagePaginationArray[ImpersonationRegistryListResponse], impersonation_registry, path=["response"]
+        )
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.impersonation_registry.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        impersonation_registry = await response.parse()
+        assert_matches_type(
+            AsyncV4PagePaginationArray[ImpersonationRegistryListResponse], impersonation_registry, path=["response"]
+        )
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.impersonation_registry.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            impersonation_registry = await response.parse()
+            assert_matches_type(
+                AsyncV4PagePaginationArray[ImpersonationRegistryListResponse], impersonation_registry, path=["response"]
+            )
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.impersonation_registry.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        impersonation_registry = await async_client.email_security.settings.impersonation_registry.delete(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ImpersonationRegistryDeleteResponse, impersonation_registry, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.impersonation_registry.with_raw_response.delete(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        impersonation_registry = await response.parse()
+        assert_matches_type(ImpersonationRegistryDeleteResponse, impersonation_registry, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.impersonation_registry.with_streaming_response.delete(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            impersonation_registry = await response.parse()
+            assert_matches_type(ImpersonationRegistryDeleteResponse, impersonation_registry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.impersonation_registry.with_raw_response.delete(
+                display_name_id=2403,
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        impersonation_registry = await async_client.email_security.settings.impersonation_registry.edit(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ImpersonationRegistryEditResponse, impersonation_registry, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        impersonation_registry = await async_client.email_security.settings.impersonation_registry.edit(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            email="email",
+            is_email_regex=True,
+            name="name",
+        )
+        assert_matches_type(ImpersonationRegistryEditResponse, impersonation_registry, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.impersonation_registry.with_raw_response.edit(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        impersonation_registry = await response.parse()
+        assert_matches_type(ImpersonationRegistryEditResponse, impersonation_registry, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.impersonation_registry.with_streaming_response.edit(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            impersonation_registry = await response.parse()
+            assert_matches_type(ImpersonationRegistryEditResponse, impersonation_registry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.impersonation_registry.with_raw_response.edit(
+                display_name_id=2403,
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        impersonation_registry = await async_client.email_security.settings.impersonation_registry.get(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ImpersonationRegistryGetResponse, impersonation_registry, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.impersonation_registry.with_raw_response.get(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        impersonation_registry = await response.parse()
+        assert_matches_type(ImpersonationRegistryGetResponse, impersonation_registry, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.impersonation_registry.with_streaming_response.get(
+            display_name_id=2403,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            impersonation_registry = await response.parse()
+            assert_matches_type(ImpersonationRegistryGetResponse, impersonation_registry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.impersonation_registry.with_raw_response.get(
+                display_name_id=2403,
+                account_id="",
+            )
diff --git a/tests/api_resources/email_security/settings/test_trusted_domains.py b/tests/api_resources/email_security/settings/test_trusted_domains.py
new file mode 100644
index 00000000000..57aa6fcd50d
--- /dev/null
+++ b/tests/api_resources/email_security/settings/test_trusted_domains.py
@@ -0,0 +1,707 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.email_security.settings import (
+    TrustedDomainGetResponse,
+    TrustedDomainEditResponse,
+    TrustedDomainListResponse,
+    TrustedDomainCreateResponse,
+    TrustedDomainDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestTrustedDomains:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
+    @parametrize
+    def test_method_create_overload_1(self, client: Cloudflare) -> None:
+        trusted_domain = client.email_security.settings.trusted_domains.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_recent=True,
+            is_regex=False,
+            is_similarity=False,
+            pattern="example.com",
+        )
+        assert_matches_type(TrustedDomainCreateResponse, trusted_domain, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
+    @parametrize
+    def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        trusted_domain = client.email_security.settings.trusted_domains.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_recent=True,
+            is_regex=False,
+            is_similarity=False,
+            pattern="example.com",
+            comments=None,
+        )
+        assert_matches_type(TrustedDomainCreateResponse, trusted_domain, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
+    @parametrize
+    def test_raw_response_create_overload_1(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.trusted_domains.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_recent=True,
+            is_regex=False,
+            is_similarity=False,
+            pattern="example.com",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        trusted_domain = response.parse()
+        assert_matches_type(TrustedDomainCreateResponse, trusted_domain, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
+    @parametrize
+    def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
+        with client.email_security.settings.trusted_domains.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_recent=True,
+            is_regex=False,
+            is_similarity=False,
+            pattern="example.com",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            trusted_domain = response.parse()
+            assert_matches_type(TrustedDomainCreateResponse, trusted_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
+    @parametrize
+    def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.trusted_domains.with_raw_response.create(
+                account_id="",
+                is_recent=True,
+                is_regex=False,
+                is_similarity=False,
+                pattern="example.com",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
+    @parametrize
+    def test_method_create_overload_2(self, client: Cloudflare) -> None:
+        trusted_domain = client.email_security.settings.trusted_domains.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "is_recent": True,
+                    "is_regex": False,
+                    "is_similarity": False,
+                    "pattern": "example.com",
+                }
+            ],
+        )
+        assert_matches_type(TrustedDomainCreateResponse, trusted_domain, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
+    @parametrize
+    def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.trusted_domains.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "is_recent": True,
+                    "is_regex": False,
+                    "is_similarity": False,
+                    "pattern": "example.com",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        trusted_domain = response.parse()
+        assert_matches_type(TrustedDomainCreateResponse, trusted_domain, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
+    @parametrize
+    def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
+        with client.email_security.settings.trusted_domains.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "is_recent": True,
+                    "is_regex": False,
+                    "is_similarity": False,
+                    "pattern": "example.com",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            trusted_domain = response.parse()
+            assert_matches_type(TrustedDomainCreateResponse, trusted_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
+    @parametrize
+    def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.trusted_domains.with_raw_response.create(
+                account_id="",
+                body=[
+                    {
+                        "is_recent": True,
+                        "is_regex": False,
+                        "is_similarity": False,
+                        "pattern": "example.com",
+                    }
+                ],
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        trusted_domain = client.email_security.settings.trusted_domains.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[TrustedDomainListResponse], trusted_domain, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        trusted_domain = client.email_security.settings.trusted_domains.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="asc",
+            is_recent=True,
+            is_similarity=True,
+            order="pattern",
+            page=1,
+            pattern="pattern",
+            per_page=1,
+            search="search",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[TrustedDomainListResponse], trusted_domain, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.trusted_domains.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        trusted_domain = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[TrustedDomainListResponse], trusted_domain, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.email_security.settings.trusted_domains.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            trusted_domain = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[TrustedDomainListResponse], trusted_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.trusted_domains.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        trusted_domain = client.email_security.settings.trusted_domains.delete(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(TrustedDomainDeleteResponse, trusted_domain, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.trusted_domains.with_raw_response.delete(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        trusted_domain = response.parse()
+        assert_matches_type(TrustedDomainDeleteResponse, trusted_domain, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.email_security.settings.trusted_domains.with_streaming_response.delete(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            trusted_domain = response.parse()
+            assert_matches_type(TrustedDomainDeleteResponse, trusted_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.trusted_domains.with_raw_response.delete(
+                trusted_domain_id=2401,
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        trusted_domain = client.email_security.settings.trusted_domains.edit(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(TrustedDomainEditResponse, trusted_domain, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        trusted_domain = client.email_security.settings.trusted_domains.edit(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            comments="comments",
+            is_recent=True,
+            is_regex=True,
+            is_similarity=True,
+            pattern="x",
+        )
+        assert_matches_type(TrustedDomainEditResponse, trusted_domain, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.trusted_domains.with_raw_response.edit(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        trusted_domain = response.parse()
+        assert_matches_type(TrustedDomainEditResponse, trusted_domain, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.email_security.settings.trusted_domains.with_streaming_response.edit(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            trusted_domain = response.parse()
+            assert_matches_type(TrustedDomainEditResponse, trusted_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.trusted_domains.with_raw_response.edit(
+                trusted_domain_id=2401,
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        trusted_domain = client.email_security.settings.trusted_domains.get(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(TrustedDomainGetResponse, trusted_domain, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.email_security.settings.trusted_domains.with_raw_response.get(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        trusted_domain = response.parse()
+        assert_matches_type(TrustedDomainGetResponse, trusted_domain, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.email_security.settings.trusted_domains.with_streaming_response.get(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            trusted_domain = response.parse()
+            assert_matches_type(TrustedDomainGetResponse, trusted_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.settings.trusted_domains.with_raw_response.get(
+                trusted_domain_id=2401,
+                account_id="",
+            )
+
+
+class TestAsyncTrustedDomains:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
+    @parametrize
+    async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        trusted_domain = await async_client.email_security.settings.trusted_domains.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_recent=True,
+            is_regex=False,
+            is_similarity=False,
+            pattern="example.com",
+        )
+        assert_matches_type(TrustedDomainCreateResponse, trusted_domain, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
+    @parametrize
+    async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        trusted_domain = await async_client.email_security.settings.trusted_domains.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_recent=True,
+            is_regex=False,
+            is_similarity=False,
+            pattern="example.com",
+            comments=None,
+        )
+        assert_matches_type(TrustedDomainCreateResponse, trusted_domain, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
+    @parametrize
+    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.trusted_domains.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_recent=True,
+            is_regex=False,
+            is_similarity=False,
+            pattern="example.com",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        trusted_domain = await response.parse()
+        assert_matches_type(TrustedDomainCreateResponse, trusted_domain, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
+    @parametrize
+    async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.trusted_domains.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            is_recent=True,
+            is_regex=False,
+            is_similarity=False,
+            pattern="example.com",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            trusted_domain = await response.parse()
+            assert_matches_type(TrustedDomainCreateResponse, trusted_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
+    @parametrize
+    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.trusted_domains.with_raw_response.create(
+                account_id="",
+                is_recent=True,
+                is_regex=False,
+                is_similarity=False,
+                pattern="example.com",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
+    @parametrize
+    async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        trusted_domain = await async_client.email_security.settings.trusted_domains.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "is_recent": True,
+                    "is_regex": False,
+                    "is_similarity": False,
+                    "pattern": "example.com",
+                }
+            ],
+        )
+        assert_matches_type(TrustedDomainCreateResponse, trusted_domain, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
+    @parametrize
+    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.trusted_domains.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "is_recent": True,
+                    "is_regex": False,
+                    "is_similarity": False,
+                    "pattern": "example.com",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        trusted_domain = await response.parse()
+        assert_matches_type(TrustedDomainCreateResponse, trusted_domain, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
+    @parametrize
+    async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.trusted_domains.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "is_recent": True,
+                    "is_regex": False,
+                    "is_similarity": False,
+                    "pattern": "example.com",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            trusted_domain = await response.parse()
+            assert_matches_type(TrustedDomainCreateResponse, trusted_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
+    @parametrize
+    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.trusted_domains.with_raw_response.create(
+                account_id="",
+                body=[
+                    {
+                        "is_recent": True,
+                        "is_regex": False,
+                        "is_similarity": False,
+                        "pattern": "example.com",
+                    }
+                ],
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        trusted_domain = await async_client.email_security.settings.trusted_domains.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[TrustedDomainListResponse], trusted_domain, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        trusted_domain = await async_client.email_security.settings.trusted_domains.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="asc",
+            is_recent=True,
+            is_similarity=True,
+            order="pattern",
+            page=1,
+            pattern="pattern",
+            per_page=1,
+            search="search",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[TrustedDomainListResponse], trusted_domain, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.trusted_domains.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        trusted_domain = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[TrustedDomainListResponse], trusted_domain, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.trusted_domains.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            trusted_domain = await response.parse()
+            assert_matches_type(
+                AsyncV4PagePaginationArray[TrustedDomainListResponse], trusted_domain, path=["response"]
+            )
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.trusted_domains.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        trusted_domain = await async_client.email_security.settings.trusted_domains.delete(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(TrustedDomainDeleteResponse, trusted_domain, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.trusted_domains.with_raw_response.delete(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        trusted_domain = await response.parse()
+        assert_matches_type(TrustedDomainDeleteResponse, trusted_domain, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.trusted_domains.with_streaming_response.delete(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            trusted_domain = await response.parse()
+            assert_matches_type(TrustedDomainDeleteResponse, trusted_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.trusted_domains.with_raw_response.delete(
+                trusted_domain_id=2401,
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        trusted_domain = await async_client.email_security.settings.trusted_domains.edit(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(TrustedDomainEditResponse, trusted_domain, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        trusted_domain = await async_client.email_security.settings.trusted_domains.edit(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            comments="comments",
+            is_recent=True,
+            is_regex=True,
+            is_similarity=True,
+            pattern="x",
+        )
+        assert_matches_type(TrustedDomainEditResponse, trusted_domain, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.trusted_domains.with_raw_response.edit(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        trusted_domain = await response.parse()
+        assert_matches_type(TrustedDomainEditResponse, trusted_domain, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.trusted_domains.with_streaming_response.edit(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            trusted_domain = await response.parse()
+            assert_matches_type(TrustedDomainEditResponse, trusted_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.trusted_domains.with_raw_response.edit(
+                trusted_domain_id=2401,
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        trusted_domain = await async_client.email_security.settings.trusted_domains.get(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(TrustedDomainGetResponse, trusted_domain, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.settings.trusted_domains.with_raw_response.get(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        trusted_domain = await response.parse()
+        assert_matches_type(TrustedDomainGetResponse, trusted_domain, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.settings.trusted_domains.with_streaming_response.get(
+            trusted_domain_id=2401,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            trusted_domain = await response.parse()
+            assert_matches_type(TrustedDomainGetResponse, trusted_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.settings.trusted_domains.with_raw_response.get(
+                trusted_domain_id=2401,
+                account_id="",
+            )
diff --git a/tests/api_resources/email_security/test_investigate.py b/tests/api_resources/email_security/test_investigate.py
new file mode 100644
index 00000000000..641cd669ad2
--- /dev/null
+++ b/tests/api_resources/email_security/test_investigate.py
@@ -0,0 +1,246 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.email_security import InvestigateGetResponse, InvestigateListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestInvestigate:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        investigate = client.email_security.investigate.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[InvestigateListResponse], investigate, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        investigate = client.email_security.investigate.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action_log=True,
+            alert_id="alert_id",
+            cursor="cursor",
+            detections_only=True,
+            domain="domain",
+            end=parse_datetime("2019-12-27T18:11:19.117Z"),
+            final_disposition="MALICIOUS",
+            message_action="PREVIEW",
+            message_id="message_id",
+            metric="metric",
+            page=1,
+            per_page=1,
+            query="query",
+            recipient="recipient",
+            sender="sender",
+            start=parse_datetime("2019-12-27T18:11:19.117Z"),
+            subject="subject",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[InvestigateListResponse], investigate, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.email_security.investigate.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        investigate = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[InvestigateListResponse], investigate, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.email_security.investigate.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            investigate = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[InvestigateListResponse], investigate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.investigate.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        investigate = client.email_security.investigate.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(InvestigateGetResponse, investigate, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.email_security.investigate.with_raw_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        investigate = response.parse()
+        assert_matches_type(InvestigateGetResponse, investigate, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.email_security.investigate.with_streaming_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            investigate = response.parse()
+            assert_matches_type(InvestigateGetResponse, investigate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.investigate.with_raw_response.get(
+                postfix_id="4Njp3P0STMz2c02Q",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `postfix_id` but received ''"):
+            client.email_security.investigate.with_raw_response.get(
+                postfix_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncInvestigate:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        investigate = await async_client.email_security.investigate.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[InvestigateListResponse], investigate, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        investigate = await async_client.email_security.investigate.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action_log=True,
+            alert_id="alert_id",
+            cursor="cursor",
+            detections_only=True,
+            domain="domain",
+            end=parse_datetime("2019-12-27T18:11:19.117Z"),
+            final_disposition="MALICIOUS",
+            message_action="PREVIEW",
+            message_id="message_id",
+            metric="metric",
+            page=1,
+            per_page=1,
+            query="query",
+            recipient="recipient",
+            sender="sender",
+            start=parse_datetime("2019-12-27T18:11:19.117Z"),
+            subject="subject",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[InvestigateListResponse], investigate, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.investigate.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        investigate = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[InvestigateListResponse], investigate, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.investigate.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            investigate = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[InvestigateListResponse], investigate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.investigate.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        investigate = await async_client.email_security.investigate.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(InvestigateGetResponse, investigate, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.investigate.with_raw_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        investigate = await response.parse()
+        assert_matches_type(InvestigateGetResponse, investigate, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.investigate.with_streaming_response.get(
+            postfix_id="4Njp3P0STMz2c02Q",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            investigate = await response.parse()
+            assert_matches_type(InvestigateGetResponse, investigate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.investigate.with_raw_response.get(
+                postfix_id="4Njp3P0STMz2c02Q",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `postfix_id` but received ''"):
+            await async_client.email_security.investigate.with_raw_response.get(
+                postfix_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/email_security/test_submissions.py b/tests/api_resources/email_security/test_submissions.py
new file mode 100644
index 00000000000..0645b94fd7a
--- /dev/null
+++ b/tests/api_resources/email_security/test_submissions.py
@@ -0,0 +1,138 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.email_security import SubmissionListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSubmissions:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        submission = client.email_security.submissions.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[SubmissionListResponse], submission, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        submission = client.email_security.submissions.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            end=parse_datetime("2019-12-27T18:11:19.117Z"),
+            original_disposition="MALICIOUS",
+            outcome_disposition="MALICIOUS",
+            page=1,
+            per_page=1,
+            query="query",
+            requested_disposition="MALICIOUS",
+            start=parse_datetime("2019-12-27T18:11:19.117Z"),
+            status="status",
+            submission_id="submission_id",
+            type="TEAM",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[SubmissionListResponse], submission, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.email_security.submissions.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        submission = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[SubmissionListResponse], submission, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.email_security.submissions.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            submission = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[SubmissionListResponse], submission, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.email_security.submissions.with_raw_response.list(
+                account_id="",
+            )
+
+
+class TestAsyncSubmissions:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        submission = await async_client.email_security.submissions.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[SubmissionListResponse], submission, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        submission = await async_client.email_security.submissions.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            end=parse_datetime("2019-12-27T18:11:19.117Z"),
+            original_disposition="MALICIOUS",
+            outcome_disposition="MALICIOUS",
+            page=1,
+            per_page=1,
+            query="query",
+            requested_disposition="MALICIOUS",
+            start=parse_datetime("2019-12-27T18:11:19.117Z"),
+            status="status",
+            submission_id="submission_id",
+            type="TEAM",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[SubmissionListResponse], submission, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.email_security.submissions.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        submission = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[SubmissionListResponse], submission, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.email_security.submissions.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            submission = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[SubmissionListResponse], submission, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.email_security.submissions.with_raw_response.list(
+                account_id="",
+            )
diff --git a/tests/api_resources/event_notifications/r2/configuration/test_queues.py b/tests/api_resources/event_notifications/r2/configuration/test_queues.py
deleted file mode 100644
index f2d278015d9..00000000000
--- a/tests/api_resources/event_notifications/r2/configuration/test_queues.py
+++ /dev/null
@@ -1,317 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.event_notifications.r2.configuration import (
-    QueueDeleteResponse,
-    QueueUpdateResponse,
-)
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestQueues:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_update(self, client: Cloudflare) -> None:
-        queue = client.event_notifications.r2.configuration.queues.update(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(QueueUpdateResponse, queue, path=["response"])
-
-    @parametrize
-    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        queue = client.event_notifications.r2.configuration.queues.update(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-            rules=[
-                {
-                    "actions": ["PutObject", "CopyObject"],
-                    "prefix": "img/",
-                    "suffix": ".jpeg",
-                },
-                {
-                    "actions": ["PutObject", "CopyObject"],
-                    "prefix": "img/",
-                    "suffix": ".jpeg",
-                },
-                {
-                    "actions": ["PutObject", "CopyObject"],
-                    "prefix": "img/",
-                    "suffix": ".jpeg",
-                },
-            ],
-        )
-        assert_matches_type(QueueUpdateResponse, queue, path=["response"])
-
-    @parametrize
-    def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.event_notifications.r2.configuration.queues.with_raw_response.update(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        queue = response.parse()
-        assert_matches_type(QueueUpdateResponse, queue, path=["response"])
-
-    @parametrize
-    def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.event_notifications.r2.configuration.queues.with_streaming_response.update(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            queue = response.parse()
-            assert_matches_type(QueueUpdateResponse, queue, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.event_notifications.r2.configuration.queues.with_raw_response.update(
-                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
-            client.event_notifications.r2.configuration.queues.with_raw_response.update(
-                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                bucket_name="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
-            client.event_notifications.r2.configuration.queues.with_raw_response.update(
-                queue_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_delete(self, client: Cloudflare) -> None:
-        queue = client.event_notifications.r2.configuration.queues.delete(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(QueueDeleteResponse, queue, path=["response"])
-
-    @parametrize
-    def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.event_notifications.r2.configuration.queues.with_raw_response.delete(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        queue = response.parse()
-        assert_matches_type(QueueDeleteResponse, queue, path=["response"])
-
-    @parametrize
-    def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.event_notifications.r2.configuration.queues.with_streaming_response.delete(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            queue = response.parse()
-            assert_matches_type(QueueDeleteResponse, queue, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.event_notifications.r2.configuration.queues.with_raw_response.delete(
-                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
-            client.event_notifications.r2.configuration.queues.with_raw_response.delete(
-                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                bucket_name="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
-            client.event_notifications.r2.configuration.queues.with_raw_response.delete(
-                queue_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-
-class TestAsyncQueues:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        queue = await async_client.event_notifications.r2.configuration.queues.update(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(QueueUpdateResponse, queue, path=["response"])
-
-    @parametrize
-    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        queue = await async_client.event_notifications.r2.configuration.queues.update(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-            rules=[
-                {
-                    "actions": ["PutObject", "CopyObject"],
-                    "prefix": "img/",
-                    "suffix": ".jpeg",
-                },
-                {
-                    "actions": ["PutObject", "CopyObject"],
-                    "prefix": "img/",
-                    "suffix": ".jpeg",
-                },
-                {
-                    "actions": ["PutObject", "CopyObject"],
-                    "prefix": "img/",
-                    "suffix": ".jpeg",
-                },
-            ],
-        )
-        assert_matches_type(QueueUpdateResponse, queue, path=["response"])
-
-    @parametrize
-    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.event_notifications.r2.configuration.queues.with_raw_response.update(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        queue = await response.parse()
-        assert_matches_type(QueueUpdateResponse, queue, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.event_notifications.r2.configuration.queues.with_streaming_response.update(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            queue = await response.parse()
-            assert_matches_type(QueueUpdateResponse, queue, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.event_notifications.r2.configuration.queues.with_raw_response.update(
-                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
-            await async_client.event_notifications.r2.configuration.queues.with_raw_response.update(
-                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                bucket_name="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
-            await async_client.event_notifications.r2.configuration.queues.with_raw_response.update(
-                queue_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        queue = await async_client.event_notifications.r2.configuration.queues.delete(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(QueueDeleteResponse, queue, path=["response"])
-
-    @parametrize
-    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.event_notifications.r2.configuration.queues.with_raw_response.delete(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        queue = await response.parse()
-        assert_matches_type(QueueDeleteResponse, queue, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.event_notifications.r2.configuration.queues.with_streaming_response.delete(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            queue = await response.parse()
-            assert_matches_type(QueueDeleteResponse, queue, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.event_notifications.r2.configuration.queues.with_raw_response.delete(
-                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
-            await async_client.event_notifications.r2.configuration.queues.with_raw_response.delete(
-                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                bucket_name="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
-            await async_client.event_notifications.r2.configuration.queues.with_raw_response.delete(
-                queue_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-            )
diff --git a/tests/api_resources/event_notifications/r2/test_configuration.py b/tests/api_resources/event_notifications/r2/test_configuration.py
deleted file mode 100644
index 0ca03d9fc9f..00000000000
--- a/tests/api_resources/event_notifications/r2/test_configuration.py
+++ /dev/null
@@ -1,118 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.event_notifications.r2 import ConfigurationGetResponse
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestConfiguration:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        configuration = client.event_notifications.r2.configuration.get(
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(ConfigurationGetResponse, configuration, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.event_notifications.r2.configuration.with_raw_response.get(
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        configuration = response.parse()
-        assert_matches_type(ConfigurationGetResponse, configuration, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.event_notifications.r2.configuration.with_streaming_response.get(
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            configuration = response.parse()
-            assert_matches_type(ConfigurationGetResponse, configuration, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.event_notifications.r2.configuration.with_raw_response.get(
-                bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
-            client.event_notifications.r2.configuration.with_raw_response.get(
-                bucket_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-
-class TestAsyncConfiguration:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        configuration = await async_client.event_notifications.r2.configuration.get(
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(ConfigurationGetResponse, configuration, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.event_notifications.r2.configuration.with_raw_response.get(
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        configuration = await response.parse()
-        assert_matches_type(ConfigurationGetResponse, configuration, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.event_notifications.r2.configuration.with_streaming_response.get(
-            bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            configuration = await response.parse()
-            assert_matches_type(ConfigurationGetResponse, configuration, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.event_notifications.r2.configuration.with_raw_response.get(
-                bucket_name="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
-            await async_client.event_notifications.r2.configuration.with_raw_response.get(
-                bucket_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
diff --git a/tests/api_resources/firewall/test_access_rules.py b/tests/api_resources/firewall/test_access_rules.py
index 1ae82d79762..a44b3cddb69 100644
--- a/tests/api_resources/firewall/test_access_rules.py
+++ b/tests/api_resources/firewall/test_access_rules.py
@@ -13,6 +13,7 @@
 from cloudflare.types.firewall import (
     AccessRuleGetResponse,
     AccessRuleEditResponse,
+    AccessRuleListResponse,
     AccessRuleCreateResponse,
     AccessRuleDeleteResponse,
 )
@@ -80,14 +81,14 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.firewall.access_rules.with_raw_response.create(
                 configuration={},
                 mode="challenge",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.firewall.access_rules.with_raw_response.create(
                 configuration={},
                 mode="challenge",
@@ -100,32 +101,26 @@ def test_method_list(self, client: Cloudflare) -> None:
         access_rule = client.firewall.access_rules.list(
             account_id="account_id",
         )
-        assert_matches_type(SyncV4PagePaginationArray[object], access_rule, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[AccessRuleListResponse], access_rule, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         access_rule = client.firewall.access_rules.list(
             account_id="account_id",
-            direction="desc",
-            egs_pagination={
-                "json": {
-                    "page": 1,
-                    "per_page": 1,
-                }
-            },
-            filters={
-                "configuration_target": "ip",
-                "configuration_value": "198.51.100.4",
-                "match": "any",
-                "mode": "challenge",
-                "notes": "my note",
+            configuration={
+                "target": "ip",
+                "value": "198.51.100.4",
             },
+            direction="desc",
+            match="any",
+            mode="challenge",
+            notes="my note",
             order="mode",
             page=1,
             per_page=20,
         )
-        assert_matches_type(SyncV4PagePaginationArray[object], access_rule, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[AccessRuleListResponse], access_rule, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -137,7 +132,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         access_rule = response.parse()
-        assert_matches_type(SyncV4PagePaginationArray[object], access_rule, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[AccessRuleListResponse], access_rule, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -149,19 +144,19 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             access_rule = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[object], access_rule, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[AccessRuleListResponse], access_rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.firewall.access_rules.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.firewall.access_rules.with_raw_response.list(
                 account_id="account_id",
             )
@@ -170,7 +165,7 @@ def test_path_params_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         access_rule = client.firewall.access_rules.delete(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         )
         assert_matches_type(Optional[AccessRuleDeleteResponse], access_rule, path=["response"])
@@ -179,7 +174,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
         access_rule = client.firewall.access_rules.delete(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         )
         assert_matches_type(Optional[AccessRuleDeleteResponse], access_rule, path=["response"])
@@ -188,7 +183,7 @@ def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.firewall.access_rules.with_raw_response.delete(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         )
 
@@ -201,7 +196,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.firewall.access_rules.with_streaming_response.delete(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -215,15 +210,21 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+            client.firewall.access_rules.with_raw_response.delete(
+                rule_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.firewall.access_rules.with_raw_response.delete(
-                identifier={},
+                rule_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.firewall.access_rules.with_raw_response.delete(
-                identifier={},
+                rule_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="account_id",
             )
 
@@ -231,7 +232,7 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_edit(self, client: Cloudflare) -> None:
         access_rule = client.firewall.access_rules.edit(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             configuration={},
             mode="challenge",
             account_id="account_id",
@@ -242,7 +243,7 @@ def test_method_edit(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
         access_rule = client.firewall.access_rules.edit(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             configuration={
                 "target": "ip",
                 "value": "198.51.100.4",
@@ -257,7 +258,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
         response = client.firewall.access_rules.with_raw_response.edit(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             configuration={},
             mode="challenge",
             account_id="account_id",
@@ -272,7 +273,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
         with client.firewall.access_rules.with_streaming_response.edit(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             configuration={},
             mode="challenge",
             account_id="account_id",
@@ -288,17 +289,25 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_edit(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
             client.firewall.access_rules.with_raw_response.edit(
-                identifier={},
+                rule_id="",
+                configuration={},
+                mode="challenge",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.firewall.access_rules.with_raw_response.edit(
+                rule_id="023e105f4ecef8ad9ca31a8372d0c353",
                 configuration={},
                 mode="challenge",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.firewall.access_rules.with_raw_response.edit(
-                identifier={},
+                rule_id="023e105f4ecef8ad9ca31a8372d0c353",
                 configuration={},
                 mode="challenge",
                 account_id="account_id",
@@ -308,7 +317,7 @@ def test_path_params_edit(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         access_rule = client.firewall.access_rules.get(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         )
         assert_matches_type(AccessRuleGetResponse, access_rule, path=["response"])
@@ -317,7 +326,7 @@ def test_method_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         access_rule = client.firewall.access_rules.get(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         )
         assert_matches_type(AccessRuleGetResponse, access_rule, path=["response"])
@@ -326,7 +335,7 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.firewall.access_rules.with_raw_response.get(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         )
 
@@ -339,7 +348,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.firewall.access_rules.with_streaming_response.get(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -353,21 +362,29 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+            client.firewall.access_rules.with_raw_response.get(
+                rule_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.firewall.access_rules.with_raw_response.get(
-                identifier={},
+                rule_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.firewall.access_rules.with_raw_response.get(
-                identifier={},
+                rule_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="account_id",
             )
 
 
 class TestAsyncAccessRules:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -426,14 +443,14 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.firewall.access_rules.with_raw_response.create(
                 configuration={},
                 mode="challenge",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.firewall.access_rules.with_raw_response.create(
                 configuration={},
                 mode="challenge",
@@ -446,32 +463,26 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         access_rule = await async_client.firewall.access_rules.list(
             account_id="account_id",
         )
-        assert_matches_type(AsyncV4PagePaginationArray[object], access_rule, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[AccessRuleListResponse], access_rule, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         access_rule = await async_client.firewall.access_rules.list(
             account_id="account_id",
-            direction="desc",
-            egs_pagination={
-                "json": {
-                    "page": 1,
-                    "per_page": 1,
-                }
-            },
-            filters={
-                "configuration_target": "ip",
-                "configuration_value": "198.51.100.4",
-                "match": "any",
-                "mode": "challenge",
-                "notes": "my note",
+            configuration={
+                "target": "ip",
+                "value": "198.51.100.4",
             },
+            direction="desc",
+            match="any",
+            mode="challenge",
+            notes="my note",
             order="mode",
             page=1,
             per_page=20,
         )
-        assert_matches_type(AsyncV4PagePaginationArray[object], access_rule, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[AccessRuleListResponse], access_rule, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -483,7 +494,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         access_rule = await response.parse()
-        assert_matches_type(AsyncV4PagePaginationArray[object], access_rule, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[AccessRuleListResponse], access_rule, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -495,19 +506,19 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             access_rule = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[object], access_rule, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[AccessRuleListResponse], access_rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.firewall.access_rules.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.firewall.access_rules.with_raw_response.list(
                 account_id="account_id",
             )
@@ -516,7 +527,7 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         access_rule = await async_client.firewall.access_rules.delete(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         )
         assert_matches_type(Optional[AccessRuleDeleteResponse], access_rule, path=["response"])
@@ -525,7 +536,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
         access_rule = await async_client.firewall.access_rules.delete(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         )
         assert_matches_type(Optional[AccessRuleDeleteResponse], access_rule, path=["response"])
@@ -534,7 +545,7 @@ async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.firewall.access_rules.with_raw_response.delete(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         )
 
@@ -547,7 +558,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.firewall.access_rules.with_streaming_response.delete(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -561,15 +572,21 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+            await async_client.firewall.access_rules.with_raw_response.delete(
+                rule_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.firewall.access_rules.with_raw_response.delete(
-                identifier={},
+                rule_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.firewall.access_rules.with_raw_response.delete(
-                identifier={},
+                rule_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="account_id",
             )
 
@@ -577,7 +594,7 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
         access_rule = await async_client.firewall.access_rules.edit(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             configuration={},
             mode="challenge",
             account_id="account_id",
@@ -588,7 +605,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
         access_rule = await async_client.firewall.access_rules.edit(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             configuration={
                 "target": "ip",
                 "value": "198.51.100.4",
@@ -603,7 +620,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.firewall.access_rules.with_raw_response.edit(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             configuration={},
             mode="challenge",
             account_id="account_id",
@@ -618,7 +635,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
         async with async_client.firewall.access_rules.with_streaming_response.edit(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             configuration={},
             mode="challenge",
             account_id="account_id",
@@ -634,17 +651,25 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
             await async_client.firewall.access_rules.with_raw_response.edit(
-                identifier={},
+                rule_id="",
+                configuration={},
+                mode="challenge",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.firewall.access_rules.with_raw_response.edit(
+                rule_id="023e105f4ecef8ad9ca31a8372d0c353",
                 configuration={},
                 mode="challenge",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.firewall.access_rules.with_raw_response.edit(
-                identifier={},
+                rule_id="023e105f4ecef8ad9ca31a8372d0c353",
                 configuration={},
                 mode="challenge",
                 account_id="account_id",
@@ -654,7 +679,7 @@ async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         access_rule = await async_client.firewall.access_rules.get(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         )
         assert_matches_type(AccessRuleGetResponse, access_rule, path=["response"])
@@ -663,7 +688,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         access_rule = await async_client.firewall.access_rules.get(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         )
         assert_matches_type(AccessRuleGetResponse, access_rule, path=["response"])
@@ -672,7 +697,7 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.firewall.access_rules.with_raw_response.get(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         )
 
@@ -685,7 +710,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.firewall.access_rules.with_streaming_response.get(
-            identifier={},
+            rule_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -699,14 +724,20 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+            await async_client.firewall.access_rules.with_raw_response.get(
+                rule_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.firewall.access_rules.with_raw_response.get(
-                identifier={},
+                rule_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.firewall.access_rules.with_raw_response.get(
-                identifier={},
+                rule_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="account_id",
             )
diff --git a/tests/api_resources/firewall/test_lockdowns.py b/tests/api_resources/firewall/test_lockdowns.py
index 78477626c3e..eb9320ca771 100644
--- a/tests/api_resources/firewall/test_lockdowns.py
+++ b/tests/api_resources/firewall/test_lockdowns.py
@@ -26,8 +26,27 @@ class TestLockdowns:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         lockdown = client.firewall.lockdowns.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configurations=[{}],
+            urls=["shop.example.com/*"],
+        )
+        assert_matches_type(Lockdown, lockdown, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        lockdown = client.firewall.lockdowns.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configurations=[
+                {
+                    "target": "ip",
+                    "value": "198.51.100.4",
+                }
+            ],
+            urls=["shop.example.com/*"],
+            description="Prevent multiple login failures to mitigate brute force attacks",
+            paused=False,
+            priority=5,
         )
         assert_matches_type(Lockdown, lockdown, path=["response"])
 
@@ -35,8 +54,9 @@ def test_method_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.firewall.lockdowns.with_raw_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configurations=[{}],
+            urls=["shop.example.com/*"],
         )
 
         assert response.is_closed is True
@@ -48,8 +68,9 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.firewall.lockdowns.with_streaming_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configurations=[{}],
+            urls=["shop.example.com/*"],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -62,19 +83,21 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.firewall.lockdowns.with_raw_response.create(
-                zone_identifier="",
-                body={},
+                zone_id="",
+                configurations=[{}],
+                urls=["shop.example.com/*"],
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         lockdown = client.firewall.lockdowns.update(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configurations=[{}],
+            urls=["shop.example.com/*"],
         )
         assert_matches_type(Lockdown, lockdown, path=["response"])
 
@@ -82,9 +105,10 @@ def test_method_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.firewall.lockdowns.with_raw_response.update(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configurations=[{}],
+            urls=["shop.example.com/*"],
         )
 
         assert response.is_closed is True
@@ -96,9 +120,10 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.firewall.lockdowns.with_streaming_response.update(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configurations=[{}],
+            urls=["shop.example.com/*"],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -111,31 +136,33 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.firewall.lockdowns.with_raw_response.update(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="",
-                body={},
+                lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="",
+                configurations=[{}],
+                urls=["shop.example.com/*"],
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `lock_downs_id` but received ''"):
             client.firewall.lockdowns.with_raw_response.update(
-                id="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                lock_downs_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                configurations=[{}],
+                urls=["shop.example.com/*"],
             )
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         lockdown = client.firewall.lockdowns.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(SyncV4PagePaginationArray[Lockdown], lockdown, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         lockdown = client.firewall.lockdowns.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             created_on=parse_datetime("2014-01-01T05:20:00.12345Z"),
             description="endpoints",
             description_search="endpoints",
@@ -153,7 +180,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.firewall.lockdowns.with_raw_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -164,7 +191,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.firewall.lockdowns.with_streaming_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -176,24 +203,24 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.firewall.lockdowns.with_raw_response.list(
-                zone_identifier="",
+                zone_id="",
             )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         lockdown = client.firewall.lockdowns.delete(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[LockdownDeleteResponse], lockdown, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.firewall.lockdowns.with_raw_response.delete(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -204,8 +231,8 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.firewall.lockdowns.with_streaming_response.delete(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -217,31 +244,31 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.firewall.lockdowns.with_raw_response.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="",
+                lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `lock_downs_id` but received ''"):
             client.firewall.lockdowns.with_raw_response.delete(
-                id="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                lock_downs_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         lockdown = client.firewall.lockdowns.get(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Lockdown, lockdown, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.firewall.lockdowns.with_raw_response.get(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -252,8 +279,8 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.firewall.lockdowns.with_streaming_response.get(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -265,28 +292,49 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.firewall.lockdowns.with_raw_response.get(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="",
+                lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `lock_downs_id` but received ''"):
             client.firewall.lockdowns.with_raw_response.get(
-                id="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                lock_downs_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
 
 class TestAsyncLockdowns:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         lockdown = await async_client.firewall.lockdowns.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configurations=[{}],
+            urls=["shop.example.com/*"],
+        )
+        assert_matches_type(Lockdown, lockdown, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        lockdown = await async_client.firewall.lockdowns.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configurations=[
+                {
+                    "target": "ip",
+                    "value": "198.51.100.4",
+                }
+            ],
+            urls=["shop.example.com/*"],
+            description="Prevent multiple login failures to mitigate brute force attacks",
+            paused=False,
+            priority=5,
         )
         assert_matches_type(Lockdown, lockdown, path=["response"])
 
@@ -294,8 +342,9 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.firewall.lockdowns.with_raw_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configurations=[{}],
+            urls=["shop.example.com/*"],
         )
 
         assert response.is_closed is True
@@ -307,8 +356,9 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.firewall.lockdowns.with_streaming_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configurations=[{}],
+            urls=["shop.example.com/*"],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -321,19 +371,21 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.firewall.lockdowns.with_raw_response.create(
-                zone_identifier="",
-                body={},
+                zone_id="",
+                configurations=[{}],
+                urls=["shop.example.com/*"],
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         lockdown = await async_client.firewall.lockdowns.update(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configurations=[{}],
+            urls=["shop.example.com/*"],
         )
         assert_matches_type(Lockdown, lockdown, path=["response"])
 
@@ -341,9 +393,10 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.firewall.lockdowns.with_raw_response.update(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configurations=[{}],
+            urls=["shop.example.com/*"],
         )
 
         assert response.is_closed is True
@@ -355,9 +408,10 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.firewall.lockdowns.with_streaming_response.update(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configurations=[{}],
+            urls=["shop.example.com/*"],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -370,31 +424,33 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.firewall.lockdowns.with_raw_response.update(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="",
-                body={},
+                lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="",
+                configurations=[{}],
+                urls=["shop.example.com/*"],
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `lock_downs_id` but received ''"):
             await async_client.firewall.lockdowns.with_raw_response.update(
-                id="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                lock_downs_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                configurations=[{}],
+                urls=["shop.example.com/*"],
             )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         lockdown = await async_client.firewall.lockdowns.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(AsyncV4PagePaginationArray[Lockdown], lockdown, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         lockdown = await async_client.firewall.lockdowns.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             created_on=parse_datetime("2014-01-01T05:20:00.12345Z"),
             description="endpoints",
             description_search="endpoints",
@@ -412,7 +468,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.firewall.lockdowns.with_raw_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -423,7 +479,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.firewall.lockdowns.with_streaming_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -435,24 +491,24 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.firewall.lockdowns.with_raw_response.list(
-                zone_identifier="",
+                zone_id="",
             )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         lockdown = await async_client.firewall.lockdowns.delete(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[LockdownDeleteResponse], lockdown, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.firewall.lockdowns.with_raw_response.delete(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -463,8 +519,8 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.firewall.lockdowns.with_streaming_response.delete(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -476,31 +532,31 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.firewall.lockdowns.with_raw_response.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="",
+                lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `lock_downs_id` but received ''"):
             await async_client.firewall.lockdowns.with_raw_response.delete(
-                id="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                lock_downs_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         lockdown = await async_client.firewall.lockdowns.get(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Lockdown, lockdown, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.firewall.lockdowns.with_raw_response.get(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -511,8 +567,8 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.firewall.lockdowns.with_streaming_response.get(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -524,14 +580,14 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.firewall.lockdowns.with_raw_response.get(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="",
+                lock_downs_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `lock_downs_id` but received ''"):
             await async_client.firewall.lockdowns.with_raw_response.get(
-                id="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                lock_downs_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/firewall/test_rules.py b/tests/api_resources/firewall/test_rules.py
index cefdccf0ace..311ee64e156 100644
--- a/tests/api_resources/firewall/test_rules.py
+++ b/tests/api_resources/firewall/test_rules.py
@@ -3,17 +3,15 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.firewall import (
     FirewallRule,
-    RuleEditResponse,
-    RuleCreateResponse,
 )
 
 # pyright: reportDeprecated=false
@@ -29,39 +27,66 @@ class TestRules:
     def test_method_create(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rule = client.firewall.rules.create(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                filter={},
+            )
+
+        assert_matches_type(SyncSinglePage[FirewallRule], rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            rule = client.firewall.rules.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={
+                    "mode": "challenge",
+                    "response": {
+                        "body": "<error>This request has been rate-limited.</error>",
+                        "content_type": "text/xml",
+                    },
+                    "timeout": 86400,
+                },
+                filter={
+                    "description": "Restrict access from these browsers on this address range.",
+                    "expression": '(http.request.uri.path ~ ".*wp-login.php" or http.request.uri.path ~ ".*xmlrpc.php") and ip.addr ne 172.16.22.155',
+                    "paused": False,
+                    "ref": "FIL-100",
+                },
             )
 
-        assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+        assert_matches_type(SyncSinglePage[FirewallRule], rule, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = client.firewall.rules.with_raw_response.create(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                filter={},
             )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rule = response.parse()
-        assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+        assert_matches_type(SyncSinglePage[FirewallRule], rule, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             with client.firewall.rules.with_streaming_response.create(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                filter={},
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
                 rule = response.parse()
-                assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+                assert_matches_type(SyncSinglePage[FirewallRule], rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -69,10 +94,11 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 client.firewall.rules.with_raw_response.create(
-                    zone_identifier="",
-                    body={},
+                    zone_id="",
+                    action={},
+                    filter={},
                 )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -80,9 +106,35 @@ def test_path_params_create(self, client: Cloudflare) -> None:
     def test_method_update(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rule = client.firewall.rules.update(
-                id="372e67954025e0ba6aaa6d586b9e0b60",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                filter={},
+            )
+
+        assert_matches_type(FirewallRule, rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            rule = client.firewall.rules.update(
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={
+                    "mode": "challenge",
+                    "response": {
+                        "body": "<error>This request has been rate-limited.</error>",
+                        "content_type": "text/xml",
+                    },
+                    "timeout": 86400,
+                },
+                filter={
+                    "description": "Restrict access from these browsers on this address range.",
+                    "expression": '(http.request.uri.path ~ ".*wp-login.php" or http.request.uri.path ~ ".*xmlrpc.php") and ip.addr ne 172.16.22.155',
+                    "paused": False,
+                    "ref": "FIL-100",
+                },
             )
 
         assert_matches_type(FirewallRule, rule, path=["response"])
@@ -92,9 +144,10 @@ def test_method_update(self, client: Cloudflare) -> None:
     def test_raw_response_update(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = client.firewall.rules.with_raw_response.update(
-                id="372e67954025e0ba6aaa6d586b9e0b60",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                filter={},
             )
 
         assert response.is_closed is True
@@ -107,9 +160,10 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             with client.firewall.rules.with_streaming_response.update(
-                id="372e67954025e0ba6aaa6d586b9e0b60",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                filter={},
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -123,25 +177,27 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 client.firewall.rules.with_raw_response.update(
-                    id="372e67954025e0ba6aaa6d586b9e0b60",
-                    zone_identifier="",
-                    body={},
+                    rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                    zone_id="",
+                    action={},
+                    filter={},
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
                 client.firewall.rules.with_raw_response.update(
-                    id="",
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                    body={},
+                    rule_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    action={},
+                    filter={},
                 )
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rule = client.firewall.rules.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert_matches_type(SyncV4PagePaginationArray[FirewallRule], rule, path=["response"])
@@ -150,7 +206,7 @@ def test_method_list(self, client: Cloudflare) -> None:
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rule = client.firewall.rules.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 id="372e67954025e0ba6aaa6d586b9e0b60",
                 action="block",
                 description="mir",
@@ -165,7 +221,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
     def test_raw_response_list(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = client.firewall.rules.with_raw_response.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
@@ -177,7 +233,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             with client.firewall.rules.with_streaming_response.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -190,17 +246,17 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 client.firewall.rules.with_raw_response.list(
-                    zone_identifier="",
+                    zone_id="",
                 )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rule = client.firewall.rules.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b60",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert_matches_type(FirewallRule, rule, path=["response"])
@@ -209,8 +265,8 @@ def test_method_delete(self, client: Cloudflare) -> None:
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = client.firewall.rules.with_raw_response.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b60",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
@@ -222,8 +278,8 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             with client.firewall.rules.with_streaming_response.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b60",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -236,97 +292,230 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 client.firewall.rules.with_raw_response.delete(
-                    id="372e67954025e0ba6aaa6d586b9e0b60",
-                    zone_identifier="",
+                    rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                    zone_id="",
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
                 client.firewall.rules.with_raw_response.delete(
-                    id="",
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                    rule_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_edit(self, client: Cloudflare) -> None:
+    def test_method_bulk_delete(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            rule = client.firewall.rules.edit(
-                id="372e67954025e0ba6aaa6d586b9e0b60",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            rule = client.firewall.rules.bulk_delete(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(SyncSinglePage[FirewallRule], rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.firewall.rules.with_raw_response.bulk_delete(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(SyncSinglePage[FirewallRule], rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.firewall.rules.with_streaming_response.bulk_delete(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                rule = response.parse()
+                assert_matches_type(SyncSinglePage[FirewallRule], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.firewall.rules.with_raw_response.bulk_delete(
+                    zone_id="",
+                )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_bulk_edit(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            rule = client.firewall.rules.bulk_edit(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 body={},
             )
 
-        assert_matches_type(Optional[RuleEditResponse], rule, path=["response"])
+        assert_matches_type(SyncSinglePage[FirewallRule], rule, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_raw_response_edit(self, client: Cloudflare) -> None:
+    def test_raw_response_bulk_edit(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            response = client.firewall.rules.with_raw_response.edit(
-                id="372e67954025e0ba6aaa6d586b9e0b60",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            response = client.firewall.rules.with_raw_response.bulk_edit(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 body={},
             )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rule = response.parse()
-        assert_matches_type(Optional[RuleEditResponse], rule, path=["response"])
+        assert_matches_type(SyncSinglePage[FirewallRule], rule, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+    def test_streaming_response_bulk_edit(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with client.firewall.rules.with_streaming_response.edit(
-                id="372e67954025e0ba6aaa6d586b9e0b60",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            with client.firewall.rules.with_streaming_response.bulk_edit(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 body={},
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
                 rule = response.parse()
-                assert_matches_type(Optional[RuleEditResponse], rule, path=["response"])
+                assert_matches_type(SyncSinglePage[FirewallRule], rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_path_params_edit(self, client: Cloudflare) -> None:
+    def test_path_params_bulk_edit(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-                client.firewall.rules.with_raw_response.edit(
-                    id="372e67954025e0ba6aaa6d586b9e0b60",
-                    zone_identifier="",
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.firewall.rules.with_raw_response.bulk_edit(
+                    zone_id="",
                     body={},
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
-                client.firewall.rules.with_raw_response.edit(
-                    id="",
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_bulk_update(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            rule = client.firewall.rules.bulk_update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            )
+
+        assert_matches_type(SyncSinglePage[FirewallRule], rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_bulk_update(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.firewall.rules.with_raw_response.bulk_update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(SyncSinglePage[FirewallRule], rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_bulk_update(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.firewall.rules.with_streaming_response.bulk_update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                rule = response.parse()
+                assert_matches_type(SyncSinglePage[FirewallRule], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_bulk_update(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.firewall.rules.with_raw_response.bulk_update(
+                    zone_id="",
                     body={},
                 )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
+    def test_method_edit(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            rule = client.firewall.rules.get(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                path_id="372e67954025e0ba6aaa6d586b9e0b60",
+            rule = client.firewall.rules.edit(
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
-        assert_matches_type(FirewallRule, rule, path=["response"])
+        assert_matches_type(SyncSinglePage[FirewallRule], rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.firewall.rules.with_raw_response.edit(
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(SyncSinglePage[FirewallRule], rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.firewall.rules.with_streaming_response.edit(
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                rule = response.parse()
+                assert_matches_type(SyncSinglePage[FirewallRule], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.firewall.rules.with_raw_response.edit(
+                    rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                    zone_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+                client.firewall.rules.with_raw_response.edit(
+                    rule_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
     @parametrize
-    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+    def test_method_get(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rule = client.firewall.rules.get(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                path_id="372e67954025e0ba6aaa6d586b9e0b60",
-                query_id="372e67954025e0ba6aaa6d586b9e0b60",
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert_matches_type(FirewallRule, rule, path=["response"])
@@ -335,8 +524,8 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None:
     def test_raw_response_get(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = client.firewall.rules.with_raw_response.get(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                path_id="372e67954025e0ba6aaa6d586b9e0b60",
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
@@ -348,8 +537,8 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             with client.firewall.rules.with_streaming_response.get(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                path_id="372e67954025e0ba6aaa6d586b9e0b60",
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -362,61 +551,89 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `path_id` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 client.firewall.rules.with_raw_response.get(
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                    path_id="",
-                    query_id="",
+                    rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                    zone_id="",
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
                 client.firewall.rules.with_raw_response.get(
-                    zone_identifier="",
-                    path_id="372e67954025e0ba6aaa6d586b9e0b60",
+                    rule_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 )
 
 
 class TestAsyncRules:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rule = await async_client.firewall.rules.create(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                filter={},
+            )
+
+        assert_matches_type(AsyncSinglePage[FirewallRule], rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            rule = await async_client.firewall.rules.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={
+                    "mode": "challenge",
+                    "response": {
+                        "body": "<error>This request has been rate-limited.</error>",
+                        "content_type": "text/xml",
+                    },
+                    "timeout": 86400,
+                },
+                filter={
+                    "description": "Restrict access from these browsers on this address range.",
+                    "expression": '(http.request.uri.path ~ ".*wp-login.php" or http.request.uri.path ~ ".*xmlrpc.php") and ip.addr ne 172.16.22.155',
+                    "paused": False,
+                    "ref": "FIL-100",
+                },
             )
 
-        assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[FirewallRule], rule, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = await async_client.firewall.rules.with_raw_response.create(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                filter={},
             )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rule = await response.parse()
-        assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[FirewallRule], rule, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             async with async_client.firewall.rules.with_streaming_response.create(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                filter={},
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
                 rule = await response.parse()
-                assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+                assert_matches_type(AsyncSinglePage[FirewallRule], rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -424,10 +641,11 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 await async_client.firewall.rules.with_raw_response.create(
-                    zone_identifier="",
-                    body={},
+                    zone_id="",
+                    action={},
+                    filter={},
                 )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -435,9 +653,35 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rule = await async_client.firewall.rules.update(
-                id="372e67954025e0ba6aaa6d586b9e0b60",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                filter={},
+            )
+
+        assert_matches_type(FirewallRule, rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            rule = await async_client.firewall.rules.update(
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={
+                    "mode": "challenge",
+                    "response": {
+                        "body": "<error>This request has been rate-limited.</error>",
+                        "content_type": "text/xml",
+                    },
+                    "timeout": 86400,
+                },
+                filter={
+                    "description": "Restrict access from these browsers on this address range.",
+                    "expression": '(http.request.uri.path ~ ".*wp-login.php" or http.request.uri.path ~ ".*xmlrpc.php") and ip.addr ne 172.16.22.155',
+                    "paused": False,
+                    "ref": "FIL-100",
+                },
             )
 
         assert_matches_type(FirewallRule, rule, path=["response"])
@@ -447,9 +691,10 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = await async_client.firewall.rules.with_raw_response.update(
-                id="372e67954025e0ba6aaa6d586b9e0b60",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                filter={},
             )
 
         assert response.is_closed is True
@@ -462,9 +707,10 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             async with async_client.firewall.rules.with_streaming_response.update(
-                id="372e67954025e0ba6aaa6d586b9e0b60",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                filter={},
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -478,25 +724,27 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 await async_client.firewall.rules.with_raw_response.update(
-                    id="372e67954025e0ba6aaa6d586b9e0b60",
-                    zone_identifier="",
-                    body={},
+                    rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                    zone_id="",
+                    action={},
+                    filter={},
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
                 await async_client.firewall.rules.with_raw_response.update(
-                    id="",
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                    body={},
+                    rule_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    action={},
+                    filter={},
                 )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rule = await async_client.firewall.rules.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert_matches_type(AsyncV4PagePaginationArray[FirewallRule], rule, path=["response"])
@@ -505,7 +753,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rule = await async_client.firewall.rules.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 id="372e67954025e0ba6aaa6d586b9e0b60",
                 action="block",
                 description="mir",
@@ -520,7 +768,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = await async_client.firewall.rules.with_raw_response.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
@@ -532,7 +780,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             async with async_client.firewall.rules.with_streaming_response.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -545,17 +793,17 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 await async_client.firewall.rules.with_raw_response.list(
-                    zone_identifier="",
+                    zone_id="",
                 )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rule = await async_client.firewall.rules.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b60",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert_matches_type(FirewallRule, rule, path=["response"])
@@ -564,8 +812,8 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = await async_client.firewall.rules.with_raw_response.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b60",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
@@ -577,8 +825,8 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             async with async_client.firewall.rules.with_streaming_response.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b60",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -591,97 +839,230 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 await async_client.firewall.rules.with_raw_response.delete(
-                    id="372e67954025e0ba6aaa6d586b9e0b60",
-                    zone_identifier="",
+                    rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                    zone_id="",
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
                 await async_client.firewall.rules.with_raw_response.delete(
-                    id="",
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                    rule_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_bulk_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            rule = await async_client.firewall.rules.edit(
-                id="372e67954025e0ba6aaa6d586b9e0b60",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            rule = await async_client.firewall.rules.bulk_delete(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(AsyncSinglePage[FirewallRule], rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.firewall.rules.with_raw_response.bulk_delete(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(AsyncSinglePage[FirewallRule], rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.firewall.rules.with_streaming_response.bulk_delete(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                rule = await response.parse()
+                assert_matches_type(AsyncSinglePage[FirewallRule], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.firewall.rules.with_raw_response.bulk_delete(
+                    zone_id="",
+                )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            rule = await async_client.firewall.rules.bulk_edit(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 body={},
             )
 
-        assert_matches_type(Optional[RuleEditResponse], rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[FirewallRule], rule, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_bulk_edit(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            response = await async_client.firewall.rules.with_raw_response.edit(
-                id="372e67954025e0ba6aaa6d586b9e0b60",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            response = await async_client.firewall.rules.with_raw_response.bulk_edit(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 body={},
             )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rule = await response.parse()
-        assert_matches_type(Optional[RuleEditResponse], rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[FirewallRule], rule, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_bulk_edit(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            async with async_client.firewall.rules.with_streaming_response.edit(
-                id="372e67954025e0ba6aaa6d586b9e0b60",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            async with async_client.firewall.rules.with_streaming_response.bulk_edit(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 body={},
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
                 rule = await response.parse()
-                assert_matches_type(Optional[RuleEditResponse], rule, path=["response"])
+                assert_matches_type(AsyncSinglePage[FirewallRule], rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_bulk_edit(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-                await async_client.firewall.rules.with_raw_response.edit(
-                    id="372e67954025e0ba6aaa6d586b9e0b60",
-                    zone_identifier="",
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.firewall.rules.with_raw_response.bulk_edit(
+                    zone_id="",
                     body={},
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
-                await async_client.firewall.rules.with_raw_response.edit(
-                    id="",
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            rule = await async_client.firewall.rules.bulk_update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            )
+
+        assert_matches_type(AsyncSinglePage[FirewallRule], rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.firewall.rules.with_raw_response.bulk_update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(AsyncSinglePage[FirewallRule], rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.firewall.rules.with_streaming_response.bulk_update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                rule = await response.parse()
+                assert_matches_type(AsyncSinglePage[FirewallRule], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.firewall.rules.with_raw_response.bulk_update(
+                    zone_id="",
                     body={},
                 )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            rule = await async_client.firewall.rules.get(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                path_id="372e67954025e0ba6aaa6d586b9e0b60",
+            rule = await async_client.firewall.rules.edit(
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
-        assert_matches_type(FirewallRule, rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[FirewallRule], rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.firewall.rules.with_raw_response.edit(
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(AsyncSinglePage[FirewallRule], rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.firewall.rules.with_streaming_response.edit(
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                rule = await response.parse()
+                assert_matches_type(AsyncSinglePage[FirewallRule], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.firewall.rules.with_raw_response.edit(
+                    rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                    zone_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+                await async_client.firewall.rules.with_raw_response.edit(
+                    rule_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
     @parametrize
-    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rule = await async_client.firewall.rules.get(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                path_id="372e67954025e0ba6aaa6d586b9e0b60",
-                query_id="372e67954025e0ba6aaa6d586b9e0b60",
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert_matches_type(FirewallRule, rule, path=["response"])
@@ -690,8 +1071,8 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = await async_client.firewall.rules.with_raw_response.get(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                path_id="372e67954025e0ba6aaa6d586b9e0b60",
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
@@ -703,8 +1084,8 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             async with async_client.firewall.rules.with_streaming_response.get(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                path_id="372e67954025e0ba6aaa6d586b9e0b60",
+                rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -717,15 +1098,14 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `path_id` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 await async_client.firewall.rules.with_raw_response.get(
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                    path_id="",
-                    query_id="",
+                    rule_id="372e67954025e0ba6aaa6d586b9e0b60",
+                    zone_id="",
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
                 await async_client.firewall.rules.with_raw_response.get(
-                    zone_identifier="",
-                    path_id="372e67954025e0ba6aaa6d586b9e0b60",
+                    rule_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 )
diff --git a/tests/api_resources/firewall/test_ua_rules.py b/tests/api_resources/firewall/test_ua_rules.py
index 669f41a8dc8..269d7e2662b 100644
--- a/tests/api_resources/firewall/test_ua_rules.py
+++ b/tests/api_resources/firewall/test_ua_rules.py
@@ -28,8 +28,24 @@ class TestUARules:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         ua_rule = client.firewall.ua_rules.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configuration={},
+            mode="challenge",
+        )
+        assert_matches_type(UARuleCreateResponse, ua_rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        ua_rule = client.firewall.ua_rules.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configuration={
+                "target": "ua",
+                "value": "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)",
+            },
+            mode="challenge",
+            description="Prevent multiple login failures to mitigate brute force attacks",
+            paused=False,
         )
         assert_matches_type(UARuleCreateResponse, ua_rule, path=["response"])
 
@@ -37,8 +53,9 @@ def test_method_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.firewall.ua_rules.with_raw_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configuration={},
+            mode="challenge",
         )
 
         assert response.is_closed is True
@@ -50,8 +67,9 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.firewall.ua_rules.with_streaming_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configuration={},
+            mode="challenge",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -64,19 +82,37 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.firewall.ua_rules.with_raw_response.create(
-                zone_identifier="",
-                body={},
+                zone_id="",
+                configuration={},
+                mode="challenge",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         ua_rule = client.firewall.ua_rules.update(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configuration={},
+            mode="challenge",
+        )
+        assert_matches_type(UARuleUpdateResponse, ua_rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        ua_rule = client.firewall.ua_rules.update(
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configuration={
+                "target": "ip",
+                "value": "198.51.100.4",
+            },
+            mode="challenge",
+            description="Prevent multiple login failures to mitigate brute force attacks",
+            paused=False,
         )
         assert_matches_type(UARuleUpdateResponse, ua_rule, path=["response"])
 
@@ -84,9 +120,10 @@ def test_method_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.firewall.ua_rules.with_raw_response.update(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configuration={},
+            mode="challenge",
         )
 
         assert response.is_closed is True
@@ -98,9 +135,10 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.firewall.ua_rules.with_streaming_response.update(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configuration={},
+            mode="challenge",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -113,43 +151,45 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.firewall.ua_rules.with_raw_response.update(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="",
-                body={},
+                ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="",
+                configuration={},
+                mode="challenge",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ua_rule_id` but received ''"):
             client.firewall.ua_rules.with_raw_response.update(
-                id="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                ua_rule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                configuration={},
+                mode="challenge",
             )
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         ua_rule = client.firewall.ua_rules.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(SyncV4PagePaginationArray[UARuleListResponse], ua_rule, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         ua_rule = client.firewall.ua_rules.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             description="abusive",
-            description_search="abusive",
             page=1,
+            paused=False,
             per_page=1,
-            ua_search="Safari",
+            user_agent="Safari",
         )
         assert_matches_type(SyncV4PagePaginationArray[UARuleListResponse], ua_rule, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.firewall.ua_rules.with_raw_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -160,7 +200,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.firewall.ua_rules.with_streaming_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -172,24 +212,24 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.firewall.ua_rules.with_raw_response.list(
-                zone_identifier="",
+                zone_id="",
             )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         ua_rule = client.firewall.ua_rules.delete(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(UARuleDeleteResponse, ua_rule, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.firewall.ua_rules.with_raw_response.delete(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -200,8 +240,8 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.firewall.ua_rules.with_streaming_response.delete(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -213,31 +253,31 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.firewall.ua_rules.with_raw_response.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="",
+                ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ua_rule_id` but received ''"):
             client.firewall.ua_rules.with_raw_response.delete(
-                id="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                ua_rule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         ua_rule = client.firewall.ua_rules.get(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(UARuleGetResponse, ua_rule, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.firewall.ua_rules.with_raw_response.get(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -248,8 +288,8 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.firewall.ua_rules.with_streaming_response.get(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -261,28 +301,46 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.firewall.ua_rules.with_raw_response.get(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="",
+                ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ua_rule_id` but received ''"):
             client.firewall.ua_rules.with_raw_response.get(
-                id="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                ua_rule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
 
 class TestAsyncUARules:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         ua_rule = await async_client.firewall.ua_rules.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configuration={},
+            mode="challenge",
+        )
+        assert_matches_type(UARuleCreateResponse, ua_rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        ua_rule = await async_client.firewall.ua_rules.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configuration={
+                "target": "ua",
+                "value": "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)",
+            },
+            mode="challenge",
+            description="Prevent multiple login failures to mitigate brute force attacks",
+            paused=False,
         )
         assert_matches_type(UARuleCreateResponse, ua_rule, path=["response"])
 
@@ -290,8 +348,9 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.firewall.ua_rules.with_raw_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configuration={},
+            mode="challenge",
         )
 
         assert response.is_closed is True
@@ -303,8 +362,9 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.firewall.ua_rules.with_streaming_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configuration={},
+            mode="challenge",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -317,19 +377,37 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.firewall.ua_rules.with_raw_response.create(
-                zone_identifier="",
-                body={},
+                zone_id="",
+                configuration={},
+                mode="challenge",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         ua_rule = await async_client.firewall.ua_rules.update(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configuration={},
+            mode="challenge",
+        )
+        assert_matches_type(UARuleUpdateResponse, ua_rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        ua_rule = await async_client.firewall.ua_rules.update(
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configuration={
+                "target": "ip",
+                "value": "198.51.100.4",
+            },
+            mode="challenge",
+            description="Prevent multiple login failures to mitigate brute force attacks",
+            paused=False,
         )
         assert_matches_type(UARuleUpdateResponse, ua_rule, path=["response"])
 
@@ -337,9 +415,10 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.firewall.ua_rules.with_raw_response.update(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configuration={},
+            mode="challenge",
         )
 
         assert response.is_closed is True
@@ -351,9 +430,10 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.firewall.ua_rules.with_streaming_response.update(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            configuration={},
+            mode="challenge",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -366,43 +446,45 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.firewall.ua_rules.with_raw_response.update(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="",
-                body={},
+                ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="",
+                configuration={},
+                mode="challenge",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ua_rule_id` but received ''"):
             await async_client.firewall.ua_rules.with_raw_response.update(
-                id="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                ua_rule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                configuration={},
+                mode="challenge",
             )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         ua_rule = await async_client.firewall.ua_rules.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(AsyncV4PagePaginationArray[UARuleListResponse], ua_rule, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         ua_rule = await async_client.firewall.ua_rules.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             description="abusive",
-            description_search="abusive",
             page=1,
+            paused=False,
             per_page=1,
-            ua_search="Safari",
+            user_agent="Safari",
         )
         assert_matches_type(AsyncV4PagePaginationArray[UARuleListResponse], ua_rule, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.firewall.ua_rules.with_raw_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -413,7 +495,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.firewall.ua_rules.with_streaming_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -425,24 +507,24 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.firewall.ua_rules.with_raw_response.list(
-                zone_identifier="",
+                zone_id="",
             )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         ua_rule = await async_client.firewall.ua_rules.delete(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(UARuleDeleteResponse, ua_rule, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.firewall.ua_rules.with_raw_response.delete(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -453,8 +535,8 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.firewall.ua_rules.with_streaming_response.delete(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -466,31 +548,31 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.firewall.ua_rules.with_raw_response.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="",
+                ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ua_rule_id` but received ''"):
             await async_client.firewall.ua_rules.with_raw_response.delete(
-                id="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                ua_rule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         ua_rule = await async_client.firewall.ua_rules.get(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(UARuleGetResponse, ua_rule, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.firewall.ua_rules.with_raw_response.get(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -501,8 +583,8 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.firewall.ua_rules.with_streaming_response.get(
-            id="372e67954025e0ba6aaa6d586b9e0b59",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -514,14 +596,14 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.firewall.ua_rules.with_raw_response.get(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="",
+                ua_rule_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ua_rule_id` but received ''"):
             await async_client.firewall.ua_rules.with_raw_response.get(
-                id="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                ua_rule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/firewall/waf/packages/test_groups.py b/tests/api_resources/firewall/waf/packages/test_groups.py
index ced79a7799f..3bdf259db3a 100644
--- a/tests/api_resources/firewall/waf/packages/test_groups.py
+++ b/tests/api_resources/firewall/waf/packages/test_groups.py
@@ -16,6 +16,8 @@
     GroupEditResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -24,34 +26,39 @@ class TestGroups:
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
-        group = client.firewall.waf.packages.groups.list(
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            group = client.firewall.waf.packages.groups.list(
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(SyncV4PagePaginationArray[Group], group, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
-        group = client.firewall.waf.packages.groups.list(
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            direction="desc",
-            match="any",
-            mode="on",
-            name="Project Honey Pot",
-            order="mode",
-            page=1,
-            per_page=5,
-            rules_count=10,
-        )
+        with pytest.warns(DeprecationWarning):
+            group = client.firewall.waf.packages.groups.list(
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                direction="desc",
+                match="any",
+                mode="on",
+                name="Project Honey Pot",
+                order="mode",
+                page=1,
+                per_page=5,
+                rules_count=10,
+            )
+
         assert_matches_type(SyncV4PagePaginationArray[Group], group, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.firewall.waf.packages.groups.with_raw_response.list(
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.firewall.waf.packages.groups.with_raw_response.list(
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -60,58 +67,65 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.firewall.waf.packages.groups.with_streaming_response.list(
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.firewall.waf.packages.groups.with_streaming_response.list(
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            group = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[Group], group, path=["response"])
+                group = response.parse()
+                assert_matches_type(SyncV4PagePaginationArray[Group], group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.firewall.waf.packages.groups.with_raw_response.list(
-                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.firewall.waf.packages.groups.with_raw_response.list(
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
+                client.firewall.waf.packages.groups.with_raw_response.list(
+                    package_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
-            client.firewall.waf.packages.groups.with_raw_response.list(
-                package_id="",
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            group = client.firewall.waf.packages.groups.edit(
+                group_id="a25a9a7e9c00afc1fb2e0245519d725b",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
             )
 
-    @parametrize
-    def test_method_edit(self, client: Cloudflare) -> None:
-        group = client.firewall.waf.packages.groups.edit(
-            group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        )
         assert_matches_type(GroupEditResponse, group, path=["response"])
 
     @parametrize
     def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
-        group = client.firewall.waf.packages.groups.edit(
-            group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            mode="on",
-        )
+        with pytest.warns(DeprecationWarning):
+            group = client.firewall.waf.packages.groups.edit(
+                group_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                mode="on",
+            )
+
         assert_matches_type(GroupEditResponse, group, path=["response"])
 
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
-        response = client.firewall.waf.packages.groups.with_raw_response.edit(
-            group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.firewall.waf.packages.groups.with_raw_response.edit(
+                group_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -120,58 +134,63 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
-        with client.firewall.waf.packages.groups.with_streaming_response.edit(
-            group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.firewall.waf.packages.groups.with_streaming_response.edit(
+                group_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            group = response.parse()
-            assert_matches_type(GroupEditResponse, group, path=["response"])
+                group = response.parse()
+                assert_matches_type(GroupEditResponse, group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_edit(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.firewall.waf.packages.groups.with_raw_response.edit(
-                group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-                zone_id="",
-                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.firewall.waf.packages.groups.with_raw_response.edit(
+                    group_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="",
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
+                client.firewall.waf.packages.groups.with_raw_response.edit(
+                    group_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    package_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `group_id` but received ''"):
+                client.firewall.waf.packages.groups.with_raw_response.edit(
+                    group_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
-            client.firewall.waf.packages.groups.with_raw_response.edit(
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            group = client.firewall.waf.packages.groups.get(
                 group_id="a25a9a7e9c00afc1fb2e0245519d725b",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                package_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `group_id` but received ''"):
-            client.firewall.waf.packages.groups.with_raw_response.edit(
-                group_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 package_id="a25a9a7e9c00afc1fb2e0245519d725b",
             )
 
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        group = client.firewall.waf.packages.groups.get(
-            group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        )
         assert_matches_type(GroupGetResponse, group, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.firewall.waf.packages.groups.with_raw_response.get(
-            group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.firewall.waf.packages.groups.with_raw_response.get(
+                group_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -180,76 +199,85 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.firewall.waf.packages.groups.with_streaming_response.get(
-            group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.firewall.waf.packages.groups.with_streaming_response.get(
+                group_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            group = response.parse()
-            assert_matches_type(GroupGetResponse, group, path=["response"])
+                group = response.parse()
+                assert_matches_type(GroupGetResponse, group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.firewall.waf.packages.groups.with_raw_response.get(
-                group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-                zone_id="",
-                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
-            client.firewall.waf.packages.groups.with_raw_response.get(
-                group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                package_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `group_id` but received ''"):
-            client.firewall.waf.packages.groups.with_raw_response.get(
-                group_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.firewall.waf.packages.groups.with_raw_response.get(
+                    group_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="",
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
+                client.firewall.waf.packages.groups.with_raw_response.get(
+                    group_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    package_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `group_id` but received ''"):
+                client.firewall.waf.packages.groups.with_raw_response.get(
+                    group_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                )
 
 
 class TestAsyncGroups:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        group = await async_client.firewall.waf.packages.groups.list(
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            group = await async_client.firewall.waf.packages.groups.list(
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(AsyncV4PagePaginationArray[Group], group, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        group = await async_client.firewall.waf.packages.groups.list(
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            direction="desc",
-            match="any",
-            mode="on",
-            name="Project Honey Pot",
-            order="mode",
-            page=1,
-            per_page=5,
-            rules_count=10,
-        )
+        with pytest.warns(DeprecationWarning):
+            group = await async_client.firewall.waf.packages.groups.list(
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                direction="desc",
+                match="any",
+                mode="on",
+                name="Project Honey Pot",
+                order="mode",
+                page=1,
+                per_page=5,
+                rules_count=10,
+            )
+
         assert_matches_type(AsyncV4PagePaginationArray[Group], group, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.firewall.waf.packages.groups.with_raw_response.list(
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.firewall.waf.packages.groups.with_raw_response.list(
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -258,58 +286,65 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.firewall.waf.packages.groups.with_streaming_response.list(
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.firewall.waf.packages.groups.with_streaming_response.list(
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            group = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[Group], group, path=["response"])
+                group = await response.parse()
+                assert_matches_type(AsyncV4PagePaginationArray[Group], group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.firewall.waf.packages.groups.with_raw_response.list(
-                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.firewall.waf.packages.groups.with_raw_response.list(
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
+                await async_client.firewall.waf.packages.groups.with_raw_response.list(
+                    package_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
-            await async_client.firewall.waf.packages.groups.with_raw_response.list(
-                package_id="",
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            group = await async_client.firewall.waf.packages.groups.edit(
+                group_id="a25a9a7e9c00afc1fb2e0245519d725b",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
             )
 
-    @parametrize
-    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
-        group = await async_client.firewall.waf.packages.groups.edit(
-            group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        )
         assert_matches_type(GroupEditResponse, group, path=["response"])
 
     @parametrize
     async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        group = await async_client.firewall.waf.packages.groups.edit(
-            group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            mode="on",
-        )
+        with pytest.warns(DeprecationWarning):
+            group = await async_client.firewall.waf.packages.groups.edit(
+                group_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                mode="on",
+            )
+
         assert_matches_type(GroupEditResponse, group, path=["response"])
 
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.firewall.waf.packages.groups.with_raw_response.edit(
-            group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.firewall.waf.packages.groups.with_raw_response.edit(
+                group_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -318,58 +353,63 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.firewall.waf.packages.groups.with_streaming_response.edit(
-            group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.firewall.waf.packages.groups.with_streaming_response.edit(
+                group_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            group = await response.parse()
-            assert_matches_type(GroupEditResponse, group, path=["response"])
+                group = await response.parse()
+                assert_matches_type(GroupEditResponse, group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.firewall.waf.packages.groups.with_raw_response.edit(
-                group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-                zone_id="",
-                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.firewall.waf.packages.groups.with_raw_response.edit(
+                    group_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="",
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
+                await async_client.firewall.waf.packages.groups.with_raw_response.edit(
+                    group_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    package_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `group_id` but received ''"):
+                await async_client.firewall.waf.packages.groups.with_raw_response.edit(
+                    group_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
-            await async_client.firewall.waf.packages.groups.with_raw_response.edit(
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            group = await async_client.firewall.waf.packages.groups.get(
                 group_id="a25a9a7e9c00afc1fb2e0245519d725b",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                package_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `group_id` but received ''"):
-            await async_client.firewall.waf.packages.groups.with_raw_response.edit(
-                group_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 package_id="a25a9a7e9c00afc1fb2e0245519d725b",
             )
 
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        group = await async_client.firewall.waf.packages.groups.get(
-            group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        )
         assert_matches_type(GroupGetResponse, group, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.firewall.waf.packages.groups.with_raw_response.get(
-            group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.firewall.waf.packages.groups.with_raw_response.get(
+                group_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -378,38 +418,40 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.firewall.waf.packages.groups.with_streaming_response.get(
-            group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.firewall.waf.packages.groups.with_streaming_response.get(
+                group_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            group = await response.parse()
-            assert_matches_type(GroupGetResponse, group, path=["response"])
+                group = await response.parse()
+                assert_matches_type(GroupGetResponse, group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.firewall.waf.packages.groups.with_raw_response.get(
-                group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-                zone_id="",
-                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
-            await async_client.firewall.waf.packages.groups.with_raw_response.get(
-                group_id="a25a9a7e9c00afc1fb2e0245519d725b",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                package_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `group_id` but received ''"):
-            await async_client.firewall.waf.packages.groups.with_raw_response.get(
-                group_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.firewall.waf.packages.groups.with_raw_response.get(
+                    group_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="",
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
+                await async_client.firewall.waf.packages.groups.with_raw_response.get(
+                    group_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    package_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `group_id` but received ''"):
+                await async_client.firewall.waf.packages.groups.with_raw_response.get(
+                    group_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                )
diff --git a/tests/api_resources/firewall/waf/packages/test_rules.py b/tests/api_resources/firewall/waf/packages/test_rules.py
index 627ebc309fb..97927be6a8d 100644
--- a/tests/api_resources/firewall/waf/packages/test_rules.py
+++ b/tests/api_resources/firewall/waf/packages/test_rules.py
@@ -16,6 +16,8 @@
     RuleListResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -24,35 +26,40 @@ class TestRules:
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
-        rule = client.firewall.waf.packages.rules.list(
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            rule = client.firewall.waf.packages.rules.list(
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(SyncV4PagePaginationArray[RuleListResponse], rule, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
-        rule = client.firewall.waf.packages.rules.list(
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            description="SQL injection prevention for SELECT statements",
-            direction="desc",
-            group_id="de677e5818985db1285d0e80225f06e5",
-            match="any",
-            mode="CHL",
-            order="priority",
-            page=1,
-            per_page=5,
-            priority="priority",
-        )
+        with pytest.warns(DeprecationWarning):
+            rule = client.firewall.waf.packages.rules.list(
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                description="SQL injection prevention for SELECT statements",
+                direction="desc",
+                group_id="de677e5818985db1285d0e80225f06e5",
+                match="any",
+                mode="CHL",
+                order="priority",
+                page=1,
+                per_page=5,
+                priority="priority",
+            )
+
         assert_matches_type(SyncV4PagePaginationArray[RuleListResponse], rule, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.firewall.waf.packages.rules.with_raw_response.list(
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.firewall.waf.packages.rules.with_raw_response.list(
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -61,58 +68,65 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.firewall.waf.packages.rules.with_streaming_response.list(
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.firewall.waf.packages.rules.with_streaming_response.list(
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            rule = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[RuleListResponse], rule, path=["response"])
+                rule = response.parse()
+                assert_matches_type(SyncV4PagePaginationArray[RuleListResponse], rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.firewall.waf.packages.rules.with_raw_response.list(
-                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.firewall.waf.packages.rules.with_raw_response.list(
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
+                client.firewall.waf.packages.rules.with_raw_response.list(
+                    package_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
-            client.firewall.waf.packages.rules.with_raw_response.list(
-                package_id="",
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            rule = client.firewall.waf.packages.rules.edit(
+                rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
             )
 
-    @parametrize
-    def test_method_edit(self, client: Cloudflare) -> None:
-        rule = client.firewall.waf.packages.rules.edit(
-            rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
 
     @parametrize
     def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
-        rule = client.firewall.waf.packages.rules.edit(
-            rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            mode="on",
-        )
+        with pytest.warns(DeprecationWarning):
+            rule = client.firewall.waf.packages.rules.edit(
+                rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                mode="on",
+            )
+
         assert_matches_type(RuleEditResponse, rule, path=["response"])
 
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
-        response = client.firewall.waf.packages.rules.with_raw_response.edit(
-            rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.firewall.waf.packages.rules.with_raw_response.edit(
+                rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -121,58 +135,63 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
-        with client.firewall.waf.packages.rules.with_streaming_response.edit(
-            rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.firewall.waf.packages.rules.with_streaming_response.edit(
+                rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            rule = response.parse()
-            assert_matches_type(RuleEditResponse, rule, path=["response"])
+                rule = response.parse()
+                assert_matches_type(RuleEditResponse, rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_edit(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.firewall.waf.packages.rules.with_raw_response.edit(
-                rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-                zone_id="",
-                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.firewall.waf.packages.rules.with_raw_response.edit(
+                    rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="",
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
+                client.firewall.waf.packages.rules.with_raw_response.edit(
+                    rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    package_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+                client.firewall.waf.packages.rules.with_raw_response.edit(
+                    rule_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
-            client.firewall.waf.packages.rules.with_raw_response.edit(
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            rule = client.firewall.waf.packages.rules.get(
                 rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                package_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
-            client.firewall.waf.packages.rules.with_raw_response.edit(
-                rule_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 package_id="a25a9a7e9c00afc1fb2e0245519d725b",
             )
 
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        rule = client.firewall.waf.packages.rules.get(
-            rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        )
         assert_matches_type(RuleGetResponse, rule, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.firewall.waf.packages.rules.with_raw_response.get(
-            rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.firewall.waf.packages.rules.with_raw_response.get(
+                rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -181,77 +200,86 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.firewall.waf.packages.rules.with_streaming_response.get(
-            rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.firewall.waf.packages.rules.with_streaming_response.get(
+                rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            rule = response.parse()
-            assert_matches_type(RuleGetResponse, rule, path=["response"])
+                rule = response.parse()
+                assert_matches_type(RuleGetResponse, rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.firewall.waf.packages.rules.with_raw_response.get(
-                rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-                zone_id="",
-                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
-            client.firewall.waf.packages.rules.with_raw_response.get(
-                rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                package_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
-            client.firewall.waf.packages.rules.with_raw_response.get(
-                rule_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.firewall.waf.packages.rules.with_raw_response.get(
+                    rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="",
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
+                client.firewall.waf.packages.rules.with_raw_response.get(
+                    rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    package_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+                client.firewall.waf.packages.rules.with_raw_response.get(
+                    rule_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                )
 
 
 class TestAsyncRules:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        rule = await async_client.firewall.waf.packages.rules.list(
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            rule = await async_client.firewall.waf.packages.rules.list(
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(AsyncV4PagePaginationArray[RuleListResponse], rule, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        rule = await async_client.firewall.waf.packages.rules.list(
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            description="SQL injection prevention for SELECT statements",
-            direction="desc",
-            group_id="de677e5818985db1285d0e80225f06e5",
-            match="any",
-            mode="CHL",
-            order="priority",
-            page=1,
-            per_page=5,
-            priority="priority",
-        )
+        with pytest.warns(DeprecationWarning):
+            rule = await async_client.firewall.waf.packages.rules.list(
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                description="SQL injection prevention for SELECT statements",
+                direction="desc",
+                group_id="de677e5818985db1285d0e80225f06e5",
+                match="any",
+                mode="CHL",
+                order="priority",
+                page=1,
+                per_page=5,
+                priority="priority",
+            )
+
         assert_matches_type(AsyncV4PagePaginationArray[RuleListResponse], rule, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.firewall.waf.packages.rules.with_raw_response.list(
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.firewall.waf.packages.rules.with_raw_response.list(
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -260,58 +288,65 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.firewall.waf.packages.rules.with_streaming_response.list(
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.firewall.waf.packages.rules.with_streaming_response.list(
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            rule = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[RuleListResponse], rule, path=["response"])
+                rule = await response.parse()
+                assert_matches_type(AsyncV4PagePaginationArray[RuleListResponse], rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.firewall.waf.packages.rules.with_raw_response.list(
-                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.firewall.waf.packages.rules.with_raw_response.list(
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
+                await async_client.firewall.waf.packages.rules.with_raw_response.list(
+                    package_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
-            await async_client.firewall.waf.packages.rules.with_raw_response.list(
-                package_id="",
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            rule = await async_client.firewall.waf.packages.rules.edit(
+                rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
             )
 
-    @parametrize
-    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
-        rule = await async_client.firewall.waf.packages.rules.edit(
-            rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
 
     @parametrize
     async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        rule = await async_client.firewall.waf.packages.rules.edit(
-            rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            mode="on",
-        )
+        with pytest.warns(DeprecationWarning):
+            rule = await async_client.firewall.waf.packages.rules.edit(
+                rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                mode="on",
+            )
+
         assert_matches_type(RuleEditResponse, rule, path=["response"])
 
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.firewall.waf.packages.rules.with_raw_response.edit(
-            rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.firewall.waf.packages.rules.with_raw_response.edit(
+                rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -320,58 +355,63 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.firewall.waf.packages.rules.with_streaming_response.edit(
-            rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.firewall.waf.packages.rules.with_streaming_response.edit(
+                rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            rule = await response.parse()
-            assert_matches_type(RuleEditResponse, rule, path=["response"])
+                rule = await response.parse()
+                assert_matches_type(RuleEditResponse, rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.firewall.waf.packages.rules.with_raw_response.edit(
-                rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-                zone_id="",
-                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.firewall.waf.packages.rules.with_raw_response.edit(
+                    rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="",
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
+                await async_client.firewall.waf.packages.rules.with_raw_response.edit(
+                    rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    package_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+                await async_client.firewall.waf.packages.rules.with_raw_response.edit(
+                    rule_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
-            await async_client.firewall.waf.packages.rules.with_raw_response.edit(
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            rule = await async_client.firewall.waf.packages.rules.get(
                 rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                package_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
-            await async_client.firewall.waf.packages.rules.with_raw_response.edit(
-                rule_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 package_id="a25a9a7e9c00afc1fb2e0245519d725b",
             )
 
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        rule = await async_client.firewall.waf.packages.rules.get(
-            rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        )
         assert_matches_type(RuleGetResponse, rule, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.firewall.waf.packages.rules.with_raw_response.get(
-            rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.firewall.waf.packages.rules.with_raw_response.get(
+                rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -380,38 +420,40 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.firewall.waf.packages.rules.with_streaming_response.get(
-            rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.firewall.waf.packages.rules.with_streaming_response.get(
+                rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            rule = await response.parse()
-            assert_matches_type(RuleGetResponse, rule, path=["response"])
+                rule = await response.parse()
+                assert_matches_type(RuleGetResponse, rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.firewall.waf.packages.rules.with_raw_response.get(
-                rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-                zone_id="",
-                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
-            await async_client.firewall.waf.packages.rules.with_raw_response.get(
-                rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                package_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
-            await async_client.firewall.waf.packages.rules.with_raw_response.get(
-                rule_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                package_id="a25a9a7e9c00afc1fb2e0245519d725b",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.firewall.waf.packages.rules.with_raw_response.get(
+                    rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="",
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
+                await async_client.firewall.waf.packages.rules.with_raw_response.get(
+                    rule_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    package_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+                await async_client.firewall.waf.packages.rules.with_raw_response.get(
+                    rule_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    package_id="a25a9a7e9c00afc1fb2e0245519d725b",
+                )
diff --git a/tests/api_resources/firewall/waf/test_overrides.py b/tests/api_resources/firewall/waf/test_overrides.py
index aecf521b556..81f3f471190 100644
--- a/tests/api_resources/firewall/waf/test_overrides.py
+++ b/tests/api_resources/firewall/waf/test_overrides.py
@@ -15,6 +15,8 @@
     OverrideDeleteResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -24,19 +26,22 @@ class TestOverrides:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
-        override = client.firewall.waf.overrides.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            override = client.firewall.waf.overrides.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                urls=["shop.example.com/*"],
+            )
+
         assert_matches_type(Override, override, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.firewall.waf.overrides.with_raw_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.firewall.waf.overrides.with_raw_response.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                urls=["shop.example.com/*"],
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -46,45 +51,77 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.firewall.waf.overrides.with_streaming_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.firewall.waf.overrides.with_streaming_response.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                urls=["shop.example.com/*"],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            override = response.parse()
-            assert_matches_type(Override, override, path=["response"])
+                override = response.parse()
+                assert_matches_type(Override, override, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            client.firewall.waf.overrides.with_raw_response.create(
-                zone_identifier="",
-                body={},
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.firewall.waf.overrides.with_raw_response.create(
+                    zone_id="",
+                    urls=["shop.example.com/*"],
+                )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
-        override = client.firewall.waf.overrides.update(
-            id="de677e5818985db1285d0e80225f06e5",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            override = client.firewall.waf.overrides.update(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                id="023e105f4ecef8ad9ca31a8372d0c353",
+                rewrite_action={},
+                rules={"100015": "disable"},
+                urls=["shop.example.com/*"],
+            )
+
+        assert_matches_type(Override, override, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            override = client.firewall.waf.overrides.update(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                id="023e105f4ecef8ad9ca31a8372d0c353",
+                rewrite_action={
+                    "block": "challenge",
+                    "challenge": "challenge",
+                    "default": "challenge",
+                    "disable": "challenge",
+                    "simulate": "challenge",
+                },
+                rules={"100015": "disable"},
+                urls=["shop.example.com/*"],
+            )
+
         assert_matches_type(Override, override, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.firewall.waf.overrides.with_raw_response.update(
-            id="de677e5818985db1285d0e80225f06e5",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.firewall.waf.overrides.with_raw_response.update(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                id="023e105f4ecef8ad9ca31a8372d0c353",
+                rewrite_action={},
+                rules={"100015": "disable"},
+                urls=["shop.example.com/*"],
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -94,57 +131,73 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.firewall.waf.overrides.with_streaming_response.update(
-            id="de677e5818985db1285d0e80225f06e5",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            override = response.parse()
-            assert_matches_type(Override, override, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            with client.firewall.waf.overrides.with_streaming_response.update(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                id="023e105f4ecef8ad9ca31a8372d0c353",
+                rewrite_action={},
+                rules={"100015": "disable"},
+                urls=["shop.example.com/*"],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                override = response.parse()
+                assert_matches_type(Override, override, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            client.firewall.waf.overrides.with_raw_response.update(
-                id="de677e5818985db1285d0e80225f06e5",
-                zone_identifier="",
-                body={},
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
-            client.firewall.waf.overrides.with_raw_response.update(
-                id="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.firewall.waf.overrides.with_raw_response.update(
+                    overrides_id="de677e5818985db1285d0e80225f06e5",
+                    zone_id="",
+                    id="023e105f4ecef8ad9ca31a8372d0c353",
+                    rewrite_action={},
+                    rules={"100015": "disable"},
+                    urls=["shop.example.com/*"],
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `overrides_id` but received ''"):
+                client.firewall.waf.overrides.with_raw_response.update(
+                    overrides_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    id="023e105f4ecef8ad9ca31a8372d0c353",
+                    rewrite_action={},
+                    rules={"100015": "disable"},
+                    urls=["shop.example.com/*"],
+                )
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
-        override = client.firewall.waf.overrides.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            override = client.firewall.waf.overrides.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(SyncV4PagePaginationArray[Override], override, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
-        override = client.firewall.waf.overrides.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            page=1,
-            per_page=5,
-        )
+        with pytest.warns(DeprecationWarning):
+            override = client.firewall.waf.overrides.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                page=1,
+                per_page=5,
+            )
+
         assert_matches_type(SyncV4PagePaginationArray[Override], override, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.firewall.waf.overrides.with_raw_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.firewall.waf.overrides.with_raw_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -153,38 +206,43 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.firewall.waf.overrides.with_streaming_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.firewall.waf.overrides.with_streaming_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            override = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[Override], override, path=["response"])
+                override = response.parse()
+                assert_matches_type(SyncV4PagePaginationArray[Override], override, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            client.firewall.waf.overrides.with_raw_response.list(
-                zone_identifier="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.firewall.waf.overrides.with_raw_response.list(
+                    zone_id="",
+                )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
-        override = client.firewall.waf.overrides.delete(
-            id="de677e5818985db1285d0e80225f06e5",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            override = client.firewall.waf.overrides.delete(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(Optional[OverrideDeleteResponse], override, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.firewall.waf.overrides.with_raw_response.delete(
-            id="de677e5818985db1285d0e80225f06e5",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.firewall.waf.overrides.with_raw_response.delete(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -193,46 +251,51 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.firewall.waf.overrides.with_streaming_response.delete(
-            id="de677e5818985db1285d0e80225f06e5",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.firewall.waf.overrides.with_streaming_response.delete(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            override = response.parse()
-            assert_matches_type(Optional[OverrideDeleteResponse], override, path=["response"])
+                override = response.parse()
+                assert_matches_type(Optional[OverrideDeleteResponse], override, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            client.firewall.waf.overrides.with_raw_response.delete(
-                id="de677e5818985db1285d0e80225f06e5",
-                zone_identifier="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.firewall.waf.overrides.with_raw_response.delete(
+                    overrides_id="de677e5818985db1285d0e80225f06e5",
+                    zone_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
-            client.firewall.waf.overrides.with_raw_response.delete(
-                id="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `overrides_id` but received ''"):
+                client.firewall.waf.overrides.with_raw_response.delete(
+                    overrides_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        override = client.firewall.waf.overrides.get(
-            id="de677e5818985db1285d0e80225f06e5",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            override = client.firewall.waf.overrides.get(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(Override, override, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.firewall.waf.overrides.with_raw_response.get(
-            id="de677e5818985db1285d0e80225f06e5",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.firewall.waf.overrides.with_raw_response.get(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -241,52 +304,59 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.firewall.waf.overrides.with_streaming_response.get(
-            id="de677e5818985db1285d0e80225f06e5",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.firewall.waf.overrides.with_streaming_response.get(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            override = response.parse()
-            assert_matches_type(Override, override, path=["response"])
+                override = response.parse()
+                assert_matches_type(Override, override, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            client.firewall.waf.overrides.with_raw_response.get(
-                id="de677e5818985db1285d0e80225f06e5",
-                zone_identifier="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.firewall.waf.overrides.with_raw_response.get(
+                    overrides_id="de677e5818985db1285d0e80225f06e5",
+                    zone_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
-            client.firewall.waf.overrides.with_raw_response.get(
-                id="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `overrides_id` but received ''"):
+                client.firewall.waf.overrides.with_raw_response.get(
+                    overrides_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
 
 class TestAsyncOverrides:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        override = await async_client.firewall.waf.overrides.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            override = await async_client.firewall.waf.overrides.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                urls=["shop.example.com/*"],
+            )
+
         assert_matches_type(Override, override, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.firewall.waf.overrides.with_raw_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.firewall.waf.overrides.with_raw_response.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                urls=["shop.example.com/*"],
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -296,45 +366,77 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.firewall.waf.overrides.with_streaming_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.firewall.waf.overrides.with_streaming_response.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                urls=["shop.example.com/*"],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            override = await response.parse()
-            assert_matches_type(Override, override, path=["response"])
+                override = await response.parse()
+                assert_matches_type(Override, override, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            await async_client.firewall.waf.overrides.with_raw_response.create(
-                zone_identifier="",
-                body={},
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.firewall.waf.overrides.with_raw_response.create(
+                    zone_id="",
+                    urls=["shop.example.com/*"],
+                )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        override = await async_client.firewall.waf.overrides.update(
-            id="de677e5818985db1285d0e80225f06e5",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            override = await async_client.firewall.waf.overrides.update(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                id="023e105f4ecef8ad9ca31a8372d0c353",
+                rewrite_action={},
+                rules={"100015": "disable"},
+                urls=["shop.example.com/*"],
+            )
+
+        assert_matches_type(Override, override, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            override = await async_client.firewall.waf.overrides.update(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                id="023e105f4ecef8ad9ca31a8372d0c353",
+                rewrite_action={
+                    "block": "challenge",
+                    "challenge": "challenge",
+                    "default": "challenge",
+                    "disable": "challenge",
+                    "simulate": "challenge",
+                },
+                rules={"100015": "disable"},
+                urls=["shop.example.com/*"],
+            )
+
         assert_matches_type(Override, override, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.firewall.waf.overrides.with_raw_response.update(
-            id="de677e5818985db1285d0e80225f06e5",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.firewall.waf.overrides.with_raw_response.update(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                id="023e105f4ecef8ad9ca31a8372d0c353",
+                rewrite_action={},
+                rules={"100015": "disable"},
+                urls=["shop.example.com/*"],
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -344,57 +446,73 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.firewall.waf.overrides.with_streaming_response.update(
-            id="de677e5818985db1285d0e80225f06e5",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            override = await response.parse()
-            assert_matches_type(Override, override, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            async with async_client.firewall.waf.overrides.with_streaming_response.update(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                id="023e105f4ecef8ad9ca31a8372d0c353",
+                rewrite_action={},
+                rules={"100015": "disable"},
+                urls=["shop.example.com/*"],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                override = await response.parse()
+                assert_matches_type(Override, override, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            await async_client.firewall.waf.overrides.with_raw_response.update(
-                id="de677e5818985db1285d0e80225f06e5",
-                zone_identifier="",
-                body={},
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
-            await async_client.firewall.waf.overrides.with_raw_response.update(
-                id="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.firewall.waf.overrides.with_raw_response.update(
+                    overrides_id="de677e5818985db1285d0e80225f06e5",
+                    zone_id="",
+                    id="023e105f4ecef8ad9ca31a8372d0c353",
+                    rewrite_action={},
+                    rules={"100015": "disable"},
+                    urls=["shop.example.com/*"],
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `overrides_id` but received ''"):
+                await async_client.firewall.waf.overrides.with_raw_response.update(
+                    overrides_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    id="023e105f4ecef8ad9ca31a8372d0c353",
+                    rewrite_action={},
+                    rules={"100015": "disable"},
+                    urls=["shop.example.com/*"],
+                )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        override = await async_client.firewall.waf.overrides.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            override = await async_client.firewall.waf.overrides.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(AsyncV4PagePaginationArray[Override], override, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        override = await async_client.firewall.waf.overrides.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            page=1,
-            per_page=5,
-        )
+        with pytest.warns(DeprecationWarning):
+            override = await async_client.firewall.waf.overrides.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                page=1,
+                per_page=5,
+            )
+
         assert_matches_type(AsyncV4PagePaginationArray[Override], override, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.firewall.waf.overrides.with_raw_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.firewall.waf.overrides.with_raw_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -403,38 +521,43 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.firewall.waf.overrides.with_streaming_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.firewall.waf.overrides.with_streaming_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            override = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[Override], override, path=["response"])
+                override = await response.parse()
+                assert_matches_type(AsyncV4PagePaginationArray[Override], override, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            await async_client.firewall.waf.overrides.with_raw_response.list(
-                zone_identifier="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.firewall.waf.overrides.with_raw_response.list(
+                    zone_id="",
+                )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        override = await async_client.firewall.waf.overrides.delete(
-            id="de677e5818985db1285d0e80225f06e5",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            override = await async_client.firewall.waf.overrides.delete(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(Optional[OverrideDeleteResponse], override, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.firewall.waf.overrides.with_raw_response.delete(
-            id="de677e5818985db1285d0e80225f06e5",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.firewall.waf.overrides.with_raw_response.delete(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -443,46 +566,51 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.firewall.waf.overrides.with_streaming_response.delete(
-            id="de677e5818985db1285d0e80225f06e5",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.firewall.waf.overrides.with_streaming_response.delete(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            override = await response.parse()
-            assert_matches_type(Optional[OverrideDeleteResponse], override, path=["response"])
+                override = await response.parse()
+                assert_matches_type(Optional[OverrideDeleteResponse], override, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            await async_client.firewall.waf.overrides.with_raw_response.delete(
-                id="de677e5818985db1285d0e80225f06e5",
-                zone_identifier="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.firewall.waf.overrides.with_raw_response.delete(
+                    overrides_id="de677e5818985db1285d0e80225f06e5",
+                    zone_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
-            await async_client.firewall.waf.overrides.with_raw_response.delete(
-                id="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `overrides_id` but received ''"):
+                await async_client.firewall.waf.overrides.with_raw_response.delete(
+                    overrides_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        override = await async_client.firewall.waf.overrides.get(
-            id="de677e5818985db1285d0e80225f06e5",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            override = await async_client.firewall.waf.overrides.get(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(Override, override, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.firewall.waf.overrides.with_raw_response.get(
-            id="de677e5818985db1285d0e80225f06e5",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.firewall.waf.overrides.with_raw_response.get(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -491,28 +619,30 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.firewall.waf.overrides.with_streaming_response.get(
-            id="de677e5818985db1285d0e80225f06e5",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.firewall.waf.overrides.with_streaming_response.get(
+                overrides_id="de677e5818985db1285d0e80225f06e5",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            override = await response.parse()
-            assert_matches_type(Override, override, path=["response"])
+                override = await response.parse()
+                assert_matches_type(Override, override, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            await async_client.firewall.waf.overrides.with_raw_response.get(
-                id="de677e5818985db1285d0e80225f06e5",
-                zone_identifier="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
-            await async_client.firewall.waf.overrides.with_raw_response.get(
-                id="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.firewall.waf.overrides.with_raw_response.get(
+                    overrides_id="de677e5818985db1285d0e80225f06e5",
+                    zone_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `overrides_id` but received ''"):
+                await async_client.firewall.waf.overrides.with_raw_response.get(
+                    overrides_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
diff --git a/tests/api_resources/firewall/waf/test_packages.py b/tests/api_resources/firewall/waf/test_packages.py
index b93a426e71f..c79d6229958 100644
--- a/tests/api_resources/firewall/waf/test_packages.py
+++ b/tests/api_resources/firewall/waf/test_packages.py
@@ -10,7 +10,9 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
-from cloudflare.types.firewall.waf import PackageGetResponse, PackageListResponse
+from cloudflare.types.firewall.waf import PackageGetResponse
+
+# pyright: reportDeprecated=false
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -21,73 +23,83 @@ class TestPackages:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
-        package = client.firewall.waf.packages.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SyncV4PagePaginationArray[PackageListResponse], package, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            package = client.firewall.waf.packages.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(SyncV4PagePaginationArray[object], package, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
-        package = client.firewall.waf.packages.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            direction="desc",
-            match="any",
-            name="USER",
-            order="name",
-            page=1,
-            per_page=5,
-        )
-        assert_matches_type(SyncV4PagePaginationArray[PackageListResponse], package, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            package = client.firewall.waf.packages.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                direction="desc",
+                match="any",
+                name="USER",
+                order="name",
+                page=1,
+                per_page=5,
+            )
+
+        assert_matches_type(SyncV4PagePaginationArray[object], package, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.firewall.waf.packages.with_raw_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.firewall.waf.packages.with_raw_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         package = response.parse()
-        assert_matches_type(SyncV4PagePaginationArray[PackageListResponse], package, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[object], package, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.firewall.waf.packages.with_streaming_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.firewall.waf.packages.with_streaming_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            package = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[PackageListResponse], package, path=["response"])
+                package = response.parse()
+                assert_matches_type(SyncV4PagePaginationArray[object], package, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            client.firewall.waf.packages.with_raw_response.list(
-                zone_identifier="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.firewall.waf.packages.with_raw_response.list(
+                    zone_id="",
+                )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        package = client.firewall.waf.packages.get(
-            identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            package = client.firewall.waf.packages.get(
+                package_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(PackageGetResponse, package, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.firewall.waf.packages.with_raw_response.get(
-            identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.firewall.waf.packages.with_raw_response.get(
+                package_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -96,106 +108,120 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.firewall.waf.packages.with_streaming_response.get(
-            identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.firewall.waf.packages.with_streaming_response.get(
+                package_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            package = response.parse()
-            assert_matches_type(PackageGetResponse, package, path=["response"])
+                package = response.parse()
+                assert_matches_type(PackageGetResponse, package, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            client.firewall.waf.packages.with_raw_response.get(
-                identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.firewall.waf.packages.with_raw_response.get(
+                    package_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    zone_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
-            client.firewall.waf.packages.with_raw_response.get(
-                identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
+                client.firewall.waf.packages.with_raw_response.get(
+                    package_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
 
 class TestAsyncPackages:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        package = await async_client.firewall.waf.packages.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(AsyncV4PagePaginationArray[PackageListResponse], package, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            package = await async_client.firewall.waf.packages.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(AsyncV4PagePaginationArray[object], package, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        package = await async_client.firewall.waf.packages.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            direction="desc",
-            match="any",
-            name="USER",
-            order="name",
-            page=1,
-            per_page=5,
-        )
-        assert_matches_type(AsyncV4PagePaginationArray[PackageListResponse], package, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            package = await async_client.firewall.waf.packages.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                direction="desc",
+                match="any",
+                name="USER",
+                order="name",
+                page=1,
+                per_page=5,
+            )
+
+        assert_matches_type(AsyncV4PagePaginationArray[object], package, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.firewall.waf.packages.with_raw_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.firewall.waf.packages.with_raw_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         package = await response.parse()
-        assert_matches_type(AsyncV4PagePaginationArray[PackageListResponse], package, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[object], package, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.firewall.waf.packages.with_streaming_response.list(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.firewall.waf.packages.with_streaming_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            package = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[PackageListResponse], package, path=["response"])
+                package = await response.parse()
+                assert_matches_type(AsyncV4PagePaginationArray[object], package, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            await async_client.firewall.waf.packages.with_raw_response.list(
-                zone_identifier="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.firewall.waf.packages.with_raw_response.list(
+                    zone_id="",
+                )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        package = await async_client.firewall.waf.packages.get(
-            identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            package = await async_client.firewall.waf.packages.get(
+                package_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(PackageGetResponse, package, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.firewall.waf.packages.with_raw_response.get(
-            identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.firewall.waf.packages.with_raw_response.get(
+                package_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -204,28 +230,30 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.firewall.waf.packages.with_streaming_response.get(
-            identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.firewall.waf.packages.with_streaming_response.get(
+                package_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            package = await response.parse()
-            assert_matches_type(PackageGetResponse, package, path=["response"])
+                package = await response.parse()
+                assert_matches_type(PackageGetResponse, package, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            await async_client.firewall.waf.packages.with_raw_response.get(
-                identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
-            await async_client.firewall.waf.packages.with_raw_response.get(
-                identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.firewall.waf.packages.with_raw_response.get(
+                    package_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    zone_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `package_id` but received ''"):
+                await async_client.firewall.waf.packages.with_raw_response.get(
+                    package_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
diff --git a/tests/api_resources/healthchecks/test_previews.py b/tests/api_resources/healthchecks/test_previews.py
index 8377cb4f89d..a58c84df9b8 100644
--- a/tests/api_resources/healthchecks/test_previews.py
+++ b/tests/api_resources/healthchecks/test_previews.py
@@ -199,7 +199,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncPreviews:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/hostnames/settings/test_tls.py b/tests/api_resources/hostnames/settings/test_tls.py
index 60abcaf4022..09b8b27b4f8 100644
--- a/tests/api_resources/hostnames/settings/test_tls.py
+++ b/tests/api_resources/hostnames/settings/test_tls.py
@@ -9,6 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.hostnames.settings import (
     Setting,
     TLSGetResponse,
@@ -138,7 +139,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             setting_id="ciphers",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[TLSGetResponse], tls, path=["response"])
+        assert_matches_type(SyncSinglePage[TLSGetResponse], tls, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -150,7 +151,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         tls = response.parse()
-        assert_matches_type(Optional[TLSGetResponse], tls, path=["response"])
+        assert_matches_type(SyncSinglePage[TLSGetResponse], tls, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -162,7 +163,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             tls = response.parse()
-            assert_matches_type(Optional[TLSGetResponse], tls, path=["response"])
+            assert_matches_type(SyncSinglePage[TLSGetResponse], tls, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -176,7 +177,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTLS:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
@@ -295,7 +298,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             setting_id="ciphers",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[TLSGetResponse], tls, path=["response"])
+        assert_matches_type(AsyncSinglePage[TLSGetResponse], tls, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -307,7 +310,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         tls = await response.parse()
-        assert_matches_type(Optional[TLSGetResponse], tls, path=["response"])
+        assert_matches_type(AsyncSinglePage[TLSGetResponse], tls, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -319,7 +322,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             tls = await response.parse()
-            assert_matches_type(Optional[TLSGetResponse], tls, path=["response"])
+            assert_matches_type(AsyncSinglePage[TLSGetResponse], tls, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/hyperdrive/test_configs.py b/tests/api_resources/hyperdrive/test_configs.py
index bb89f9ec1a4..cbd44624bd7 100644
--- a/tests/api_resources/hyperdrive/test_configs.py
+++ b/tests/api_resources/hyperdrive/test_configs.py
@@ -3,17 +3,14 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.hyperdrive import (
-    Hyperdrive,
-    ConfigDeleteResponse,
-)
+from cloudflare.types.hyperdrive import Hyperdrive
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -30,11 +27,13 @@ def test_method_create(self, client: Cloudflare) -> None:
             origin={
                 "database": "postgres",
                 "host": "database.example.com",
+                "password": "password",
+                "port": 5432,
                 "scheme": "postgres",
                 "user": "postgres",
             },
         )
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -43,20 +42,22 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="example-hyperdrive",
             origin={
-                "access_client_id": "0123456789abcdef0123456789abcdef.access",
                 "database": "postgres",
                 "host": "database.example.com",
+                "password": "password",
                 "port": 5432,
                 "scheme": "postgres",
                 "user": "postgres",
             },
-            caching={
-                "disabled": False,
-                "max_age": 60,
-                "stale_while_revalidate": 15,
+            caching={"disabled": True},
+            mtls={
+                "ca_certificate_id": "00000000-0000-0000-0000-0000000000",
+                "mtls_certificate_id": "00000000-0000-0000-0000-0000000000",
+                "sslmode": "verify-full",
             },
+            origin_connection_limit=60,
         )
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -67,6 +68,8 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
             origin={
                 "database": "postgres",
                 "host": "database.example.com",
+                "password": "password",
+                "port": 5432,
                 "scheme": "postgres",
                 "user": "postgres",
             },
@@ -75,7 +78,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         config = response.parse()
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -86,6 +89,8 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             origin={
                 "database": "postgres",
                 "host": "database.example.com",
+                "password": "password",
+                "port": 5432,
                 "scheme": "postgres",
                 "user": "postgres",
             },
@@ -94,7 +99,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             config = response.parse()
-            assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+            assert_matches_type(Hyperdrive, config, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -108,6 +113,8 @@ def test_path_params_create(self, client: Cloudflare) -> None:
                 origin={
                     "database": "postgres",
                     "host": "database.example.com",
+                    "password": "password",
+                    "port": 5432,
                     "scheme": "postgres",
                     "user": "postgres",
                 },
@@ -123,11 +130,13 @@ def test_method_update(self, client: Cloudflare) -> None:
             origin={
                 "database": "postgres",
                 "host": "database.example.com",
+                "password": "password",
+                "port": 5432,
                 "scheme": "postgres",
                 "user": "postgres",
             },
         )
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -137,20 +146,22 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="example-hyperdrive",
             origin={
-                "access_client_id": "0123456789abcdef0123456789abcdef.access",
                 "database": "postgres",
                 "host": "database.example.com",
+                "password": "password",
                 "port": 5432,
                 "scheme": "postgres",
                 "user": "postgres",
             },
-            caching={
-                "disabled": False,
-                "max_age": 60,
-                "stale_while_revalidate": 15,
+            caching={"disabled": True},
+            mtls={
+                "ca_certificate_id": "00000000-0000-0000-0000-0000000000",
+                "mtls_certificate_id": "00000000-0000-0000-0000-0000000000",
+                "sslmode": "verify-full",
             },
+            origin_connection_limit=60,
         )
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -162,6 +173,8 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
             origin={
                 "database": "postgres",
                 "host": "database.example.com",
+                "password": "password",
+                "port": 5432,
                 "scheme": "postgres",
                 "user": "postgres",
             },
@@ -170,7 +183,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         config = response.parse()
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -182,6 +195,8 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
             origin={
                 "database": "postgres",
                 "host": "database.example.com",
+                "password": "password",
+                "port": 5432,
                 "scheme": "postgres",
                 "user": "postgres",
             },
@@ -190,7 +205,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             config = response.parse()
-            assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+            assert_matches_type(Hyperdrive, config, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -205,6 +220,8 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 origin={
                     "database": "postgres",
                     "host": "database.example.com",
+                    "password": "password",
+                    "port": 5432,
                     "scheme": "postgres",
                     "user": "postgres",
                 },
@@ -218,6 +235,8 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 origin={
                     "database": "postgres",
                     "host": "database.example.com",
+                    "password": "password",
+                    "port": 5432,
                     "scheme": "postgres",
                     "user": "postgres",
                 },
@@ -267,7 +286,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             hyperdrive_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(ConfigDeleteResponse, config, path=["response"])
+        assert_matches_type(object, config, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -279,7 +298,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         config = response.parse()
-        assert_matches_type(ConfigDeleteResponse, config, path=["response"])
+        assert_matches_type(object, config, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -291,7 +310,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             config = response.parse()
-            assert_matches_type(ConfigDeleteResponse, config, path=["response"])
+            assert_matches_type(object, config, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -316,7 +335,7 @@ def test_method_edit(self, client: Cloudflare) -> None:
             hyperdrive_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -324,22 +343,21 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
         config = client.hyperdrive.configs.edit(
             hyperdrive_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            caching={
-                "disabled": False,
-                "max_age": 60,
-                "stale_while_revalidate": 15,
+            caching={"disabled": True},
+            mtls={
+                "ca_certificate_id": "00000000-0000-0000-0000-0000000000",
+                "mtls_certificate_id": "00000000-0000-0000-0000-0000000000",
+                "sslmode": "verify-full",
             },
             name="example-hyperdrive",
             origin={
-                "access_client_id": "0123456789abcdef0123456789abcdef.access",
                 "database": "postgres",
-                "host": "database.example.com",
-                "port": 5432,
                 "scheme": "postgres",
                 "user": "postgres",
             },
+            origin_connection_limit=60,
         )
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -352,7 +370,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         config = response.parse()
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -365,7 +383,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             config = response.parse()
-            assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+            assert_matches_type(Hyperdrive, config, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -390,7 +408,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             hyperdrive_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -402,7 +420,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         config = response.parse()
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -414,7 +432,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             config = response.parse()
-            assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+            assert_matches_type(Hyperdrive, config, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -434,7 +452,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncConfigs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -445,11 +465,13 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
             origin={
                 "database": "postgres",
                 "host": "database.example.com",
+                "password": "password",
+                "port": 5432,
                 "scheme": "postgres",
                 "user": "postgres",
             },
         )
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -458,20 +480,22 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="example-hyperdrive",
             origin={
-                "access_client_id": "0123456789abcdef0123456789abcdef.access",
                 "database": "postgres",
                 "host": "database.example.com",
+                "password": "password",
                 "port": 5432,
                 "scheme": "postgres",
                 "user": "postgres",
             },
-            caching={
-                "disabled": False,
-                "max_age": 60,
-                "stale_while_revalidate": 15,
+            caching={"disabled": True},
+            mtls={
+                "ca_certificate_id": "00000000-0000-0000-0000-0000000000",
+                "mtls_certificate_id": "00000000-0000-0000-0000-0000000000",
+                "sslmode": "verify-full",
             },
+            origin_connection_limit=60,
         )
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -482,6 +506,8 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
             origin={
                 "database": "postgres",
                 "host": "database.example.com",
+                "password": "password",
+                "port": 5432,
                 "scheme": "postgres",
                 "user": "postgres",
             },
@@ -490,7 +516,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         config = await response.parse()
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -501,6 +527,8 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             origin={
                 "database": "postgres",
                 "host": "database.example.com",
+                "password": "password",
+                "port": 5432,
                 "scheme": "postgres",
                 "user": "postgres",
             },
@@ -509,7 +537,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             config = await response.parse()
-            assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+            assert_matches_type(Hyperdrive, config, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -523,6 +551,8 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
                 origin={
                     "database": "postgres",
                     "host": "database.example.com",
+                    "password": "password",
+                    "port": 5432,
                     "scheme": "postgres",
                     "user": "postgres",
                 },
@@ -538,11 +568,13 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
             origin={
                 "database": "postgres",
                 "host": "database.example.com",
+                "password": "password",
+                "port": 5432,
                 "scheme": "postgres",
                 "user": "postgres",
             },
         )
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -552,20 +584,22 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="example-hyperdrive",
             origin={
-                "access_client_id": "0123456789abcdef0123456789abcdef.access",
                 "database": "postgres",
                 "host": "database.example.com",
+                "password": "password",
                 "port": 5432,
                 "scheme": "postgres",
                 "user": "postgres",
             },
-            caching={
-                "disabled": False,
-                "max_age": 60,
-                "stale_while_revalidate": 15,
+            caching={"disabled": True},
+            mtls={
+                "ca_certificate_id": "00000000-0000-0000-0000-0000000000",
+                "mtls_certificate_id": "00000000-0000-0000-0000-0000000000",
+                "sslmode": "verify-full",
             },
+            origin_connection_limit=60,
         )
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -577,6 +611,8 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
             origin={
                 "database": "postgres",
                 "host": "database.example.com",
+                "password": "password",
+                "port": 5432,
                 "scheme": "postgres",
                 "user": "postgres",
             },
@@ -585,7 +621,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         config = await response.parse()
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -597,6 +633,8 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
             origin={
                 "database": "postgres",
                 "host": "database.example.com",
+                "password": "password",
+                "port": 5432,
                 "scheme": "postgres",
                 "user": "postgres",
             },
@@ -605,7 +643,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             config = await response.parse()
-            assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+            assert_matches_type(Hyperdrive, config, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -620,6 +658,8 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 origin={
                     "database": "postgres",
                     "host": "database.example.com",
+                    "password": "password",
+                    "port": 5432,
                     "scheme": "postgres",
                     "user": "postgres",
                 },
@@ -633,6 +673,8 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 origin={
                     "database": "postgres",
                     "host": "database.example.com",
+                    "password": "password",
+                    "port": 5432,
                     "scheme": "postgres",
                     "user": "postgres",
                 },
@@ -682,7 +724,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             hyperdrive_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(ConfigDeleteResponse, config, path=["response"])
+        assert_matches_type(object, config, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -694,7 +736,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         config = await response.parse()
-        assert_matches_type(ConfigDeleteResponse, config, path=["response"])
+        assert_matches_type(object, config, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -706,7 +748,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             config = await response.parse()
-            assert_matches_type(ConfigDeleteResponse, config, path=["response"])
+            assert_matches_type(object, config, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -731,7 +773,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
             hyperdrive_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -739,22 +781,21 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
         config = await async_client.hyperdrive.configs.edit(
             hyperdrive_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            caching={
-                "disabled": False,
-                "max_age": 60,
-                "stale_while_revalidate": 15,
+            caching={"disabled": True},
+            mtls={
+                "ca_certificate_id": "00000000-0000-0000-0000-0000000000",
+                "mtls_certificate_id": "00000000-0000-0000-0000-0000000000",
+                "sslmode": "verify-full",
             },
             name="example-hyperdrive",
             origin={
-                "access_client_id": "0123456789abcdef0123456789abcdef.access",
                 "database": "postgres",
-                "host": "database.example.com",
-                "port": 5432,
                 "scheme": "postgres",
                 "user": "postgres",
             },
+            origin_connection_limit=60,
         )
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -767,7 +808,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         config = await response.parse()
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -780,7 +821,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             config = await response.parse()
-            assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+            assert_matches_type(Hyperdrive, config, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -805,7 +846,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             hyperdrive_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -817,7 +858,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         config = await response.parse()
-        assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+        assert_matches_type(Hyperdrive, config, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -829,7 +870,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             config = await response.parse()
-            assert_matches_type(Optional[Hyperdrive], config, path=["response"])
+            assert_matches_type(Hyperdrive, config, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/iam/test_permission_groups.py b/tests/api_resources/iam/test_permission_groups.py
index b1da71007ab..f72bb512d6c 100644
--- a/tests/api_resources/iam/test_permission_groups.py
+++ b/tests/api_resources/iam/test_permission_groups.py
@@ -3,13 +3,13 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.iam import PermissionGroupGetResponse
+from cloudflare.types.iam import PermissionGroupGetResponse, PermissionGroupListResponse
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -21,43 +21,45 @@ class TestPermissionGroups:
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         permission_group = client.iam.permission_groups.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncV4PagePaginationArray[object], permission_group, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[PermissionGroupListResponse], permission_group, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         permission_group = client.iam.permission_groups.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
             label="labelOfThePermissionGroup",
             name="NameOfThePermissionGroup",
             page=1,
             per_page=5,
         )
-        assert_matches_type(SyncV4PagePaginationArray[object], permission_group, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[PermissionGroupListResponse], permission_group, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.iam.permission_groups.with_raw_response.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         permission_group = response.parse()
-        assert_matches_type(SyncV4PagePaginationArray[object], permission_group, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[PermissionGroupListResponse], permission_group, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.iam.permission_groups.with_streaming_response.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             permission_group = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[object], permission_group, path=["response"])
+            assert_matches_type(
+                SyncV4PagePaginationArray[PermissionGroupListResponse], permission_group, path=["response"]
+            )
 
         assert cast(Any, response.is_closed) is True
 
@@ -71,34 +73,34 @@ def test_path_params_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         permission_group = client.iam.permission_groups.get(
-            permission_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            permission_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(PermissionGroupGetResponse, permission_group, path=["response"])
+        assert_matches_type(Optional[PermissionGroupGetResponse], permission_group, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.iam.permission_groups.with_raw_response.get(
-            permission_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            permission_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         permission_group = response.parse()
-        assert_matches_type(PermissionGroupGetResponse, permission_group, path=["response"])
+        assert_matches_type(Optional[PermissionGroupGetResponse], permission_group, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.iam.permission_groups.with_streaming_response.get(
-            permission_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            permission_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             permission_group = response.parse()
-            assert_matches_type(PermissionGroupGetResponse, permission_group, path=["response"])
+            assert_matches_type(Optional[PermissionGroupGetResponse], permission_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -106,60 +108,70 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.iam.permission_groups.with_raw_response.get(
-                permission_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
+                permission_group_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `permission_group_id` but received ''"):
             client.iam.permission_groups.with_raw_response.get(
                 permission_group_id="",
-                account_id="eb78d65290b24279ba6f44721b3ea3c4",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
 
 class TestAsyncPermissionGroups:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         permission_group = await async_client.iam.permission_groups.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(
+            AsyncV4PagePaginationArray[PermissionGroupListResponse], permission_group, path=["response"]
         )
-        assert_matches_type(AsyncV4PagePaginationArray[object], permission_group, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         permission_group = await async_client.iam.permission_groups.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
             label="labelOfThePermissionGroup",
             name="NameOfThePermissionGroup",
             page=1,
             per_page=5,
         )
-        assert_matches_type(AsyncV4PagePaginationArray[object], permission_group, path=["response"])
+        assert_matches_type(
+            AsyncV4PagePaginationArray[PermissionGroupListResponse], permission_group, path=["response"]
+        )
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.iam.permission_groups.with_raw_response.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         permission_group = await response.parse()
-        assert_matches_type(AsyncV4PagePaginationArray[object], permission_group, path=["response"])
+        assert_matches_type(
+            AsyncV4PagePaginationArray[PermissionGroupListResponse], permission_group, path=["response"]
+        )
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.iam.permission_groups.with_streaming_response.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             permission_group = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[object], permission_group, path=["response"])
+            assert_matches_type(
+                AsyncV4PagePaginationArray[PermissionGroupListResponse], permission_group, path=["response"]
+            )
 
         assert cast(Any, response.is_closed) is True
 
@@ -173,34 +185,34 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         permission_group = await async_client.iam.permission_groups.get(
-            permission_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            permission_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(PermissionGroupGetResponse, permission_group, path=["response"])
+        assert_matches_type(Optional[PermissionGroupGetResponse], permission_group, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.iam.permission_groups.with_raw_response.get(
-            permission_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            permission_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         permission_group = await response.parse()
-        assert_matches_type(PermissionGroupGetResponse, permission_group, path=["response"])
+        assert_matches_type(Optional[PermissionGroupGetResponse], permission_group, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.iam.permission_groups.with_streaming_response.get(
-            permission_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            permission_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             permission_group = await response.parse()
-            assert_matches_type(PermissionGroupGetResponse, permission_group, path=["response"])
+            assert_matches_type(Optional[PermissionGroupGetResponse], permission_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -208,12 +220,12 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.iam.permission_groups.with_raw_response.get(
-                permission_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
+                permission_group_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `permission_group_id` but received ''"):
             await async_client.iam.permission_groups.with_raw_response.get(
                 permission_group_id="",
-                account_id="eb78d65290b24279ba6f44721b3ea3c4",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/iam/test_resource_groups.py b/tests/api_resources/iam/test_resource_groups.py
index bd287629b9f..5e629791876 100644
--- a/tests/api_resources/iam/test_resource_groups.py
+++ b/tests/api_resources/iam/test_resource_groups.py
@@ -11,11 +11,12 @@
 from tests.utils import assert_matches_type
 from cloudflare.types.iam import (
     ResourceGroupGetResponse,
+    ResourceGroupListResponse,
     ResourceGroupCreateResponse,
     ResourceGroupDeleteResponse,
     ResourceGroupUpdateResponse,
 )
-from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -26,71 +27,46 @@ class TestResourceGroups:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         resource_group = client.iam.resource_groups.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="NewResourceGroup",
             scope={
                 "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                "objects": [
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                ],
+                "objects": [{"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"}],
             },
         )
-        assert_matches_type(ResourceGroupCreateResponse, resource_group, path=["response"])
-
-    @parametrize
-    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
-        resource_group = client.iam.resource_groups.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
-            scope={
-                "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                "objects": [
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                ],
-            },
-            meta={"editable": "false"},
-        )
-        assert_matches_type(ResourceGroupCreateResponse, resource_group, path=["response"])
+        assert_matches_type(Optional[ResourceGroupCreateResponse], resource_group, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.iam.resource_groups.with_raw_response.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="NewResourceGroup",
             scope={
                 "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                "objects": [
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                ],
+                "objects": [{"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"}],
             },
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         resource_group = response.parse()
-        assert_matches_type(ResourceGroupCreateResponse, resource_group, path=["response"])
+        assert_matches_type(Optional[ResourceGroupCreateResponse], resource_group, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.iam.resource_groups.with_streaming_response.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="NewResourceGroup",
             scope={
                 "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                "objects": [
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                ],
+                "objects": [{"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"}],
             },
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             resource_group = response.parse()
-            assert_matches_type(ResourceGroupCreateResponse, resource_group, path=["response"])
+            assert_matches_type(Optional[ResourceGroupCreateResponse], resource_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -99,88 +75,57 @@ def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.iam.resource_groups.with_raw_response.create(
                 account_id="",
+                name="NewResourceGroup",
                 scope={
                     "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                    "objects": [
-                        {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                        {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                        {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    ],
+                    "objects": [{"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"}],
                 },
             )
 
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         resource_group = client.iam.resource_groups.update(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
-            scope={
-                "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                "objects": [
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                ],
-            },
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(ResourceGroupUpdateResponse, resource_group, path=["response"])
+        assert_matches_type(Optional[ResourceGroupUpdateResponse], resource_group, path=["response"])
 
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         resource_group = client.iam.resource_groups.update(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="UpdatedResourceGroup",
             scope={
                 "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                "objects": [
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                ],
+                "objects": [{"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"}],
             },
-            meta={"editable": "false"},
         )
-        assert_matches_type(ResourceGroupUpdateResponse, resource_group, path=["response"])
+        assert_matches_type(Optional[ResourceGroupUpdateResponse], resource_group, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.iam.resource_groups.with_raw_response.update(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
-            scope={
-                "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                "objects": [
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                ],
-            },
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         resource_group = response.parse()
-        assert_matches_type(ResourceGroupUpdateResponse, resource_group, path=["response"])
+        assert_matches_type(Optional[ResourceGroupUpdateResponse], resource_group, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.iam.resource_groups.with_streaming_response.update(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
-            scope={
-                "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                "objects": [
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                ],
-            },
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             resource_group = response.parse()
-            assert_matches_type(ResourceGroupUpdateResponse, resource_group, path=["response"])
+            assert_matches_type(Optional[ResourceGroupUpdateResponse], resource_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -188,71 +133,53 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.iam.resource_groups.with_raw_response.update(
-                resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
+                resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
-                scope={
-                    "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                    "objects": [
-                        {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                        {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                        {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    ],
-                },
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `resource_group_id` but received ''"):
             client.iam.resource_groups.with_raw_response.update(
                 resource_group_id="",
-                account_id="eb78d65290b24279ba6f44721b3ea3c4",
-                scope={
-                    "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                    "objects": [
-                        {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                        {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                        {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    ],
-                },
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         resource_group = client.iam.resource_groups.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncV4PagePaginationArray[object], resource_group, path=["response"])
+        assert_matches_type(SyncSinglePage[ResourceGroupListResponse], resource_group, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         resource_group = client.iam.resource_groups.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
-            id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="023e105f4ecef8ad9ca31a8372d0c353",
             name="NameOfTheResourceGroup",
-            page=1,
-            per_page=5,
         )
-        assert_matches_type(SyncV4PagePaginationArray[object], resource_group, path=["response"])
+        assert_matches_type(SyncSinglePage[ResourceGroupListResponse], resource_group, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.iam.resource_groups.with_raw_response.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         resource_group = response.parse()
-        assert_matches_type(SyncV4PagePaginationArray[object], resource_group, path=["response"])
+        assert_matches_type(SyncSinglePage[ResourceGroupListResponse], resource_group, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.iam.resource_groups.with_streaming_response.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             resource_group = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[object], resource_group, path=["response"])
+            assert_matches_type(SyncSinglePage[ResourceGroupListResponse], resource_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -266,16 +193,16 @@ def test_path_params_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         resource_group = client.iam.resource_groups.delete(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[ResourceGroupDeleteResponse], resource_group, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.iam.resource_groups.with_raw_response.delete(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -286,8 +213,8 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.iam.resource_groups.with_streaming_response.delete(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -301,47 +228,47 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.iam.resource_groups.with_raw_response.delete(
-                resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
+                resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `resource_group_id` but received ''"):
             client.iam.resource_groups.with_raw_response.delete(
                 resource_group_id="",
-                account_id="eb78d65290b24279ba6f44721b3ea3c4",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         resource_group = client.iam.resource_groups.get(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(ResourceGroupGetResponse, resource_group, path=["response"])
+        assert_matches_type(Optional[ResourceGroupGetResponse], resource_group, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.iam.resource_groups.with_raw_response.get(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         resource_group = response.parse()
-        assert_matches_type(ResourceGroupGetResponse, resource_group, path=["response"])
+        assert_matches_type(Optional[ResourceGroupGetResponse], resource_group, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.iam.resource_groups.with_streaming_response.get(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             resource_group = response.parse()
-            assert_matches_type(ResourceGroupGetResponse, resource_group, path=["response"])
+            assert_matches_type(Optional[ResourceGroupGetResponse], resource_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -349,88 +276,65 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.iam.resource_groups.with_raw_response.get(
-                resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
+                resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `resource_group_id` but received ''"):
             client.iam.resource_groups.with_raw_response.get(
                 resource_group_id="",
-                account_id="eb78d65290b24279ba6f44721b3ea3c4",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
 
 class TestAsyncResourceGroups:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         resource_group = await async_client.iam.resource_groups.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="NewResourceGroup",
             scope={
                 "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                "objects": [
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                ],
+                "objects": [{"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"}],
             },
         )
-        assert_matches_type(ResourceGroupCreateResponse, resource_group, path=["response"])
-
-    @parametrize
-    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        resource_group = await async_client.iam.resource_groups.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
-            scope={
-                "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                "objects": [
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                ],
-            },
-            meta={"editable": "false"},
-        )
-        assert_matches_type(ResourceGroupCreateResponse, resource_group, path=["response"])
+        assert_matches_type(Optional[ResourceGroupCreateResponse], resource_group, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.iam.resource_groups.with_raw_response.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="NewResourceGroup",
             scope={
                 "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                "objects": [
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                ],
+                "objects": [{"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"}],
             },
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         resource_group = await response.parse()
-        assert_matches_type(ResourceGroupCreateResponse, resource_group, path=["response"])
+        assert_matches_type(Optional[ResourceGroupCreateResponse], resource_group, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.iam.resource_groups.with_streaming_response.create(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="NewResourceGroup",
             scope={
                 "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                "objects": [
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                ],
+                "objects": [{"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"}],
             },
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             resource_group = await response.parse()
-            assert_matches_type(ResourceGroupCreateResponse, resource_group, path=["response"])
+            assert_matches_type(Optional[ResourceGroupCreateResponse], resource_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -439,88 +343,57 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.iam.resource_groups.with_raw_response.create(
                 account_id="",
+                name="NewResourceGroup",
                 scope={
                     "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                    "objects": [
-                        {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                        {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                        {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    ],
+                    "objects": [{"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"}],
                 },
             )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         resource_group = await async_client.iam.resource_groups.update(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
-            scope={
-                "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                "objects": [
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                ],
-            },
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(ResourceGroupUpdateResponse, resource_group, path=["response"])
+        assert_matches_type(Optional[ResourceGroupUpdateResponse], resource_group, path=["response"])
 
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         resource_group = await async_client.iam.resource_groups.update(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="UpdatedResourceGroup",
             scope={
                 "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                "objects": [
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                ],
+                "objects": [{"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"}],
             },
-            meta={"editable": "false"},
         )
-        assert_matches_type(ResourceGroupUpdateResponse, resource_group, path=["response"])
+        assert_matches_type(Optional[ResourceGroupUpdateResponse], resource_group, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.iam.resource_groups.with_raw_response.update(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
-            scope={
-                "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                "objects": [
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                ],
-            },
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         resource_group = await response.parse()
-        assert_matches_type(ResourceGroupUpdateResponse, resource_group, path=["response"])
+        assert_matches_type(Optional[ResourceGroupUpdateResponse], resource_group, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.iam.resource_groups.with_streaming_response.update(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
-            scope={
-                "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                "objects": [
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                ],
-            },
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             resource_group = await response.parse()
-            assert_matches_type(ResourceGroupUpdateResponse, resource_group, path=["response"])
+            assert_matches_type(Optional[ResourceGroupUpdateResponse], resource_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -528,71 +401,53 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.iam.resource_groups.with_raw_response.update(
-                resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
+                resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
-                scope={
-                    "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                    "objects": [
-                        {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                        {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                        {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    ],
-                },
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `resource_group_id` but received ''"):
             await async_client.iam.resource_groups.with_raw_response.update(
                 resource_group_id="",
-                account_id="eb78d65290b24279ba6f44721b3ea3c4",
-                scope={
-                    "key": "com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4",
-                    "objects": [
-                        {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                        {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                        {"key": "com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5"},
-                    ],
-                },
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         resource_group = await async_client.iam.resource_groups.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncV4PagePaginationArray[object], resource_group, path=["response"])
+        assert_matches_type(AsyncSinglePage[ResourceGroupListResponse], resource_group, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         resource_group = await async_client.iam.resource_groups.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
-            id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="023e105f4ecef8ad9ca31a8372d0c353",
             name="NameOfTheResourceGroup",
-            page=1,
-            per_page=5,
         )
-        assert_matches_type(AsyncV4PagePaginationArray[object], resource_group, path=["response"])
+        assert_matches_type(AsyncSinglePage[ResourceGroupListResponse], resource_group, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.iam.resource_groups.with_raw_response.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         resource_group = await response.parse()
-        assert_matches_type(AsyncV4PagePaginationArray[object], resource_group, path=["response"])
+        assert_matches_type(AsyncSinglePage[ResourceGroupListResponse], resource_group, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.iam.resource_groups.with_streaming_response.list(
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             resource_group = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[object], resource_group, path=["response"])
+            assert_matches_type(AsyncSinglePage[ResourceGroupListResponse], resource_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -606,16 +461,16 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         resource_group = await async_client.iam.resource_groups.delete(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[ResourceGroupDeleteResponse], resource_group, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.iam.resource_groups.with_raw_response.delete(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -626,8 +481,8 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.iam.resource_groups.with_streaming_response.delete(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -641,47 +496,47 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.iam.resource_groups.with_raw_response.delete(
-                resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
+                resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `resource_group_id` but received ''"):
             await async_client.iam.resource_groups.with_raw_response.delete(
                 resource_group_id="",
-                account_id="eb78d65290b24279ba6f44721b3ea3c4",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         resource_group = await async_client.iam.resource_groups.get(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(ResourceGroupGetResponse, resource_group, path=["response"])
+        assert_matches_type(Optional[ResourceGroupGetResponse], resource_group, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.iam.resource_groups.with_raw_response.get(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         resource_group = await response.parse()
-        assert_matches_type(ResourceGroupGetResponse, resource_group, path=["response"])
+        assert_matches_type(Optional[ResourceGroupGetResponse], resource_group, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.iam.resource_groups.with_streaming_response.get(
-            resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
-            account_id="eb78d65290b24279ba6f44721b3ea3c4",
+            resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             resource_group = await response.parse()
-            assert_matches_type(ResourceGroupGetResponse, resource_group, path=["response"])
+            assert_matches_type(Optional[ResourceGroupGetResponse], resource_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -689,12 +544,12 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.iam.resource_groups.with_raw_response.get(
-                resource_group_id="6d7f2f5f5b1d4a0e9081fdc98d432fd1",
+                resource_group_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `resource_group_id` but received ''"):
             await async_client.iam.resource_groups.with_raw_response.get(
                 resource_group_id="",
-                account_id="eb78d65290b24279ba6f44721b3ea3c4",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/iam/test_sso.py b/tests/api_resources/iam/test_sso.py
new file mode 100644
index 00000000000..b974f6f7a72
--- /dev/null
+++ b/tests/api_resources/iam/test_sso.py
@@ -0,0 +1,668 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.iam import (
+    SSOGetResponse,
+    SSOListResponse,
+    SSOCreateResponse,
+    SSODeleteResponse,
+    SSOUpdateResponse,
+    SSOBeginVerificationResponse,
+)
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSSO:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        sso = client.iam.sso.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            email_domain="example.com",
+        )
+        assert_matches_type(Optional[SSOCreateResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        sso = client.iam.sso.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            email_domain="example.com",
+            begin_verification=True,
+            use_fedramp_language=False,
+        )
+        assert_matches_type(Optional[SSOCreateResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.iam.sso.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            email_domain="example.com",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sso = response.parse()
+        assert_matches_type(Optional[SSOCreateResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.iam.sso.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            email_domain="example.com",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sso = response.parse()
+            assert_matches_type(Optional[SSOCreateResponse], sso, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.iam.sso.with_raw_response.create(
+                account_id="",
+                email_domain="example.com",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        sso = client.iam.sso.update(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SSOUpdateResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        sso = client.iam.sso.update(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+            use_fedramp_language=False,
+        )
+        assert_matches_type(Optional[SSOUpdateResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.iam.sso.with_raw_response.update(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sso = response.parse()
+        assert_matches_type(Optional[SSOUpdateResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.iam.sso.with_streaming_response.update(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sso = response.parse()
+            assert_matches_type(Optional[SSOUpdateResponse], sso, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.iam.sso.with_raw_response.update(
+                sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sso_connector_id` but received ''"):
+            client.iam.sso.with_raw_response.update(
+                sso_connector_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        sso = client.iam.sso.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[SSOListResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.iam.sso.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sso = response.parse()
+        assert_matches_type(SyncSinglePage[SSOListResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.iam.sso.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sso = response.parse()
+            assert_matches_type(SyncSinglePage[SSOListResponse], sso, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.iam.sso.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        sso = client.iam.sso.delete(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SSODeleteResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.iam.sso.with_raw_response.delete(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sso = response.parse()
+        assert_matches_type(Optional[SSODeleteResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.iam.sso.with_streaming_response.delete(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sso = response.parse()
+            assert_matches_type(Optional[SSODeleteResponse], sso, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.iam.sso.with_raw_response.delete(
+                sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sso_connector_id` but received ''"):
+            client.iam.sso.with_raw_response.delete(
+                sso_connector_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_begin_verification(self, client: Cloudflare) -> None:
+        sso = client.iam.sso.begin_verification(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SSOBeginVerificationResponse, sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_begin_verification(self, client: Cloudflare) -> None:
+        response = client.iam.sso.with_raw_response.begin_verification(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sso = response.parse()
+        assert_matches_type(SSOBeginVerificationResponse, sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_begin_verification(self, client: Cloudflare) -> None:
+        with client.iam.sso.with_streaming_response.begin_verification(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sso = response.parse()
+            assert_matches_type(SSOBeginVerificationResponse, sso, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_begin_verification(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.iam.sso.with_raw_response.begin_verification(
+                sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sso_connector_id` but received ''"):
+            client.iam.sso.with_raw_response.begin_verification(
+                sso_connector_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        sso = client.iam.sso.get(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SSOGetResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.iam.sso.with_raw_response.get(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sso = response.parse()
+        assert_matches_type(Optional[SSOGetResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.iam.sso.with_streaming_response.get(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sso = response.parse()
+            assert_matches_type(Optional[SSOGetResponse], sso, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.iam.sso.with_raw_response.get(
+                sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sso_connector_id` but received ''"):
+            client.iam.sso.with_raw_response.get(
+                sso_connector_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncSSO:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        sso = await async_client.iam.sso.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            email_domain="example.com",
+        )
+        assert_matches_type(Optional[SSOCreateResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        sso = await async_client.iam.sso.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            email_domain="example.com",
+            begin_verification=True,
+            use_fedramp_language=False,
+        )
+        assert_matches_type(Optional[SSOCreateResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.iam.sso.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            email_domain="example.com",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sso = await response.parse()
+        assert_matches_type(Optional[SSOCreateResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.iam.sso.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            email_domain="example.com",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sso = await response.parse()
+            assert_matches_type(Optional[SSOCreateResponse], sso, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.iam.sso.with_raw_response.create(
+                account_id="",
+                email_domain="example.com",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        sso = await async_client.iam.sso.update(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SSOUpdateResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        sso = await async_client.iam.sso.update(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+            use_fedramp_language=False,
+        )
+        assert_matches_type(Optional[SSOUpdateResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.iam.sso.with_raw_response.update(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sso = await response.parse()
+        assert_matches_type(Optional[SSOUpdateResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.iam.sso.with_streaming_response.update(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sso = await response.parse()
+            assert_matches_type(Optional[SSOUpdateResponse], sso, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.iam.sso.with_raw_response.update(
+                sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sso_connector_id` but received ''"):
+            await async_client.iam.sso.with_raw_response.update(
+                sso_connector_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        sso = await async_client.iam.sso.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[SSOListResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.iam.sso.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sso = await response.parse()
+        assert_matches_type(AsyncSinglePage[SSOListResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.iam.sso.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sso = await response.parse()
+            assert_matches_type(AsyncSinglePage[SSOListResponse], sso, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.iam.sso.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        sso = await async_client.iam.sso.delete(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SSODeleteResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.iam.sso.with_raw_response.delete(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sso = await response.parse()
+        assert_matches_type(Optional[SSODeleteResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.iam.sso.with_streaming_response.delete(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sso = await response.parse()
+            assert_matches_type(Optional[SSODeleteResponse], sso, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.iam.sso.with_raw_response.delete(
+                sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sso_connector_id` but received ''"):
+            await async_client.iam.sso.with_raw_response.delete(
+                sso_connector_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_begin_verification(self, async_client: AsyncCloudflare) -> None:
+        sso = await async_client.iam.sso.begin_verification(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SSOBeginVerificationResponse, sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_begin_verification(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.iam.sso.with_raw_response.begin_verification(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sso = await response.parse()
+        assert_matches_type(SSOBeginVerificationResponse, sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_begin_verification(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.iam.sso.with_streaming_response.begin_verification(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sso = await response.parse()
+            assert_matches_type(SSOBeginVerificationResponse, sso, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_begin_verification(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.iam.sso.with_raw_response.begin_verification(
+                sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sso_connector_id` but received ''"):
+            await async_client.iam.sso.with_raw_response.begin_verification(
+                sso_connector_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        sso = await async_client.iam.sso.get(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SSOGetResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.iam.sso.with_raw_response.get(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sso = await response.parse()
+        assert_matches_type(Optional[SSOGetResponse], sso, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.iam.sso.with_streaming_response.get(
+            sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sso = await response.parse()
+            assert_matches_type(Optional[SSOGetResponse], sso, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.iam.sso.with_raw_response.get(
+                sso_connector_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sso_connector_id` but received ''"):
+            await async_client.iam.sso.with_raw_response.get(
+                sso_connector_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/iam/test_user_groups.py b/tests/api_resources/iam/test_user_groups.py
new file mode 100644
index 00000000000..f3fd0402f8a
--- /dev/null
+++ b/tests/api_resources/iam/test_user_groups.py
@@ -0,0 +1,625 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.iam import (
+    UserGroupGetResponse,
+    UserGroupListResponse,
+    UserGroupCreateResponse,
+    UserGroupDeleteResponse,
+    UserGroupUpdateResponse,
+)
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestUserGroups:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        user_group = client.iam.user_groups.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My New User Group",
+            policies=[
+                {
+                    "access": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
+            ],
+        )
+        assert_matches_type(Optional[UserGroupCreateResponse], user_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.iam.user_groups.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My New User Group",
+            policies=[
+                {
+                    "access": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        user_group = response.parse()
+        assert_matches_type(Optional[UserGroupCreateResponse], user_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.iam.user_groups.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My New User Group",
+            policies=[
+                {
+                    "access": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            user_group = response.parse()
+            assert_matches_type(Optional[UserGroupCreateResponse], user_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.iam.user_groups.with_raw_response.create(
+                account_id="",
+                name="My New User Group",
+                policies=[
+                    {
+                        "access": "allow",
+                        "permission_groups": [
+                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                        ],
+                        "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                    }
+                ],
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        user_group = client.iam.user_groups.update(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[UserGroupUpdateResponse], user_group, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        user_group = client.iam.user_groups.update(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My New User Group",
+            policies=[
+                {
+                    "id": "f267e341f3dd4697bd3b9f71dd96247f",
+                    "access": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
+            ],
+        )
+        assert_matches_type(Optional[UserGroupUpdateResponse], user_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.iam.user_groups.with_raw_response.update(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        user_group = response.parse()
+        assert_matches_type(Optional[UserGroupUpdateResponse], user_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.iam.user_groups.with_streaming_response.update(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            user_group = response.parse()
+            assert_matches_type(Optional[UserGroupUpdateResponse], user_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.iam.user_groups.with_raw_response.update(
+                user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `user_group_id` but received ''"):
+            client.iam.user_groups.with_raw_response.update(
+                user_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        user_group = client.iam.user_groups.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[UserGroupListResponse], user_group, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        user_group = client.iam.user_groups.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="desc",
+            fuzzy_name="Foo",
+            name="NameOfTheUserGroup",
+            page=1,
+            per_page=5,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[UserGroupListResponse], user_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.iam.user_groups.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        user_group = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[UserGroupListResponse], user_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.iam.user_groups.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            user_group = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[UserGroupListResponse], user_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.iam.user_groups.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        user_group = client.iam.user_groups.delete(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[UserGroupDeleteResponse], user_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.iam.user_groups.with_raw_response.delete(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        user_group = response.parse()
+        assert_matches_type(Optional[UserGroupDeleteResponse], user_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.iam.user_groups.with_streaming_response.delete(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            user_group = response.parse()
+            assert_matches_type(Optional[UserGroupDeleteResponse], user_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.iam.user_groups.with_raw_response.delete(
+                user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `user_group_id` but received ''"):
+            client.iam.user_groups.with_raw_response.delete(
+                user_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        user_group = client.iam.user_groups.get(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[UserGroupGetResponse], user_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.iam.user_groups.with_raw_response.get(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        user_group = response.parse()
+        assert_matches_type(Optional[UserGroupGetResponse], user_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.iam.user_groups.with_streaming_response.get(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            user_group = response.parse()
+            assert_matches_type(Optional[UserGroupGetResponse], user_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.iam.user_groups.with_raw_response.get(
+                user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `user_group_id` but received ''"):
+            client.iam.user_groups.with_raw_response.get(
+                user_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncUserGroups:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        user_group = await async_client.iam.user_groups.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My New User Group",
+            policies=[
+                {
+                    "access": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
+            ],
+        )
+        assert_matches_type(Optional[UserGroupCreateResponse], user_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.iam.user_groups.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My New User Group",
+            policies=[
+                {
+                    "access": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        user_group = await response.parse()
+        assert_matches_type(Optional[UserGroupCreateResponse], user_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.iam.user_groups.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My New User Group",
+            policies=[
+                {
+                    "access": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            user_group = await response.parse()
+            assert_matches_type(Optional[UserGroupCreateResponse], user_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.iam.user_groups.with_raw_response.create(
+                account_id="",
+                name="My New User Group",
+                policies=[
+                    {
+                        "access": "allow",
+                        "permission_groups": [
+                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                        ],
+                        "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                    }
+                ],
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        user_group = await async_client.iam.user_groups.update(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[UserGroupUpdateResponse], user_group, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        user_group = await async_client.iam.user_groups.update(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My New User Group",
+            policies=[
+                {
+                    "id": "f267e341f3dd4697bd3b9f71dd96247f",
+                    "access": "allow",
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resource_groups": [{"id": "6d7f2f5f5b1d4a0e9081fdc98d432fd1"}],
+                }
+            ],
+        )
+        assert_matches_type(Optional[UserGroupUpdateResponse], user_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.iam.user_groups.with_raw_response.update(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        user_group = await response.parse()
+        assert_matches_type(Optional[UserGroupUpdateResponse], user_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.iam.user_groups.with_streaming_response.update(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            user_group = await response.parse()
+            assert_matches_type(Optional[UserGroupUpdateResponse], user_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.iam.user_groups.with_raw_response.update(
+                user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `user_group_id` but received ''"):
+            await async_client.iam.user_groups.with_raw_response.update(
+                user_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        user_group = await async_client.iam.user_groups.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[UserGroupListResponse], user_group, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        user_group = await async_client.iam.user_groups.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="desc",
+            fuzzy_name="Foo",
+            name="NameOfTheUserGroup",
+            page=1,
+            per_page=5,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[UserGroupListResponse], user_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.iam.user_groups.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        user_group = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[UserGroupListResponse], user_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.iam.user_groups.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            user_group = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[UserGroupListResponse], user_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.iam.user_groups.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        user_group = await async_client.iam.user_groups.delete(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[UserGroupDeleteResponse], user_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.iam.user_groups.with_raw_response.delete(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        user_group = await response.parse()
+        assert_matches_type(Optional[UserGroupDeleteResponse], user_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.iam.user_groups.with_streaming_response.delete(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            user_group = await response.parse()
+            assert_matches_type(Optional[UserGroupDeleteResponse], user_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.iam.user_groups.with_raw_response.delete(
+                user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `user_group_id` but received ''"):
+            await async_client.iam.user_groups.with_raw_response.delete(
+                user_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        user_group = await async_client.iam.user_groups.get(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[UserGroupGetResponse], user_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.iam.user_groups.with_raw_response.get(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        user_group = await response.parse()
+        assert_matches_type(Optional[UserGroupGetResponse], user_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.iam.user_groups.with_streaming_response.get(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            user_group = await response.parse()
+            assert_matches_type(Optional[UserGroupGetResponse], user_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.iam.user_groups.with_raw_response.get(
+                user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `user_group_id` but received ''"):
+            await async_client.iam.user_groups.with_raw_response.get(
+                user_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/iam/user_groups/__init__.py b/tests/api_resources/iam/user_groups/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/iam/user_groups/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/iam/user_groups/test_members.py b/tests/api_resources/iam/user_groups/test_members.py
new file mode 100644
index 00000000000..603db00d3d0
--- /dev/null
+++ b/tests/api_resources/iam/user_groups/test_members.py
@@ -0,0 +1,478 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.iam.user_groups import (
+    MemberListResponse,
+    MemberCreateResponse,
+    MemberDeleteResponse,
+    MemberUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestMembers:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        member = client.iam.user_groups.members.create(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+        )
+        assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.iam.user_groups.members.with_raw_response.create(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        member = response.parse()
+        assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.iam.user_groups.members.with_streaming_response.create(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            member = response.parse()
+            assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.iam.user_groups.members.with_raw_response.create(
+                user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+                body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `user_group_id` but received ''"):
+            client.iam.user_groups.members.with_raw_response.create(
+                user_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        member = client.iam.user_groups.members.update(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+        )
+        assert_matches_type(SyncSinglePage[MemberUpdateResponse], member, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.iam.user_groups.members.with_raw_response.update(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        member = response.parse()
+        assert_matches_type(SyncSinglePage[MemberUpdateResponse], member, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.iam.user_groups.members.with_streaming_response.update(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            member = response.parse()
+            assert_matches_type(SyncSinglePage[MemberUpdateResponse], member, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.iam.user_groups.members.with_raw_response.update(
+                user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+                body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `user_group_id` but received ''"):
+            client.iam.user_groups.members.with_raw_response.update(
+                user_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        member = client.iam.user_groups.members.list(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[MemberListResponse], member, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        member = client.iam.user_groups.members.list(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[MemberListResponse], member, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.iam.user_groups.members.with_raw_response.list(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        member = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[MemberListResponse], member, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.iam.user_groups.members.with_streaming_response.list(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            member = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[MemberListResponse], member, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.iam.user_groups.members.with_raw_response.list(
+                user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `user_group_id` but received ''"):
+            client.iam.user_groups.members.with_raw_response.list(
+                user_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        member = client.iam.user_groups.members.delete(
+            member_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[MemberDeleteResponse], member, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.iam.user_groups.members.with_raw_response.delete(
+            member_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        member = response.parse()
+        assert_matches_type(Optional[MemberDeleteResponse], member, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.iam.user_groups.members.with_streaming_response.delete(
+            member_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            member = response.parse()
+            assert_matches_type(Optional[MemberDeleteResponse], member, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.iam.user_groups.members.with_raw_response.delete(
+                member_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+                user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `user_group_id` but received ''"):
+            client.iam.user_groups.members.with_raw_response.delete(
+                member_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                user_group_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `member_id` but received ''"):
+            client.iam.user_groups.members.with_raw_response.delete(
+                member_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncMembers:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        member = await async_client.iam.user_groups.members.create(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+        )
+        assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.iam.user_groups.members.with_raw_response.create(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        member = await response.parse()
+        assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.iam.user_groups.members.with_streaming_response.create(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            member = await response.parse()
+            assert_matches_type(Optional[MemberCreateResponse], member, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.iam.user_groups.members.with_raw_response.create(
+                user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+                body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `user_group_id` but received ''"):
+            await async_client.iam.user_groups.members.with_raw_response.create(
+                user_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        member = await async_client.iam.user_groups.members.update(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+        )
+        assert_matches_type(AsyncSinglePage[MemberUpdateResponse], member, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.iam.user_groups.members.with_raw_response.update(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        member = await response.parse()
+        assert_matches_type(AsyncSinglePage[MemberUpdateResponse], member, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.iam.user_groups.members.with_streaming_response.update(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            member = await response.parse()
+            assert_matches_type(AsyncSinglePage[MemberUpdateResponse], member, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.iam.user_groups.members.with_raw_response.update(
+                user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+                body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `user_group_id` but received ''"):
+            await async_client.iam.user_groups.members.with_raw_response.update(
+                user_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[{"id": "023e105f4ecef8ad9ca31a8372d0c353"}],
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        member = await async_client.iam.user_groups.members.list(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[MemberListResponse], member, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        member = await async_client.iam.user_groups.members.list(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[MemberListResponse], member, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.iam.user_groups.members.with_raw_response.list(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        member = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[MemberListResponse], member, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.iam.user_groups.members.with_streaming_response.list(
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            member = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[MemberListResponse], member, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.iam.user_groups.members.with_raw_response.list(
+                user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `user_group_id` but received ''"):
+            await async_client.iam.user_groups.members.with_raw_response.list(
+                user_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        member = await async_client.iam.user_groups.members.delete(
+            member_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[MemberDeleteResponse], member, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.iam.user_groups.members.with_raw_response.delete(
+            member_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        member = await response.parse()
+        assert_matches_type(Optional[MemberDeleteResponse], member, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.iam.user_groups.members.with_streaming_response.delete(
+            member_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            member = await response.parse()
+            assert_matches_type(Optional[MemberDeleteResponse], member, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.iam.user_groups.members.with_raw_response.delete(
+                member_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+                user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `user_group_id` but received ''"):
+            await async_client.iam.user_groups.members.with_raw_response.delete(
+                member_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                user_group_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `member_id` but received ''"):
+            await async_client.iam.user_groups.members.with_raw_response.delete(
+                member_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                user_group_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/images/test_v1.py b/tests/api_resources/images/test_v1.py
index 1114273c5e3..2e168db2008 100644
--- a/tests/api_resources/images/test_v1.py
+++ b/tests/api_resources/images/test_v1.py
@@ -16,6 +16,8 @@
     V1DeleteResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -35,7 +37,9 @@ def test_method_create(self, client: Cloudflare) -> None:
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         v1 = client.images.v1.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            file={},
+            id="id",
+            creator="creator",
+            file=b"raw file contents",
             metadata={},
             require_signed_urls=True,
             url="https://example.com/path/to/logo.png",
@@ -78,25 +82,31 @@ def test_path_params_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
-        v1 = client.images.v1.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            v1 = client.images.v1.list(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(SyncV4PagePagination[V1ListResponse], v1, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
-        v1 = client.images.v1.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            page=1,
-            per_page=10,
-        )
+        with pytest.warns(DeprecationWarning):
+            v1 = client.images.v1.list(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                creator="creator",
+                page=1,
+                per_page=10,
+            )
+
         assert_matches_type(SyncV4PagePagination[V1ListResponse], v1, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.images.v1.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.images.v1.with_raw_response.list(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -105,23 +115,25 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.images.v1.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.images.v1.with_streaming_response.list(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            v1 = response.parse()
-            assert_matches_type(SyncV4PagePagination[V1ListResponse], v1, path=["response"])
+                v1 = response.parse()
+                assert_matches_type(SyncV4PagePagination[V1ListResponse], v1, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.images.v1.with_raw_response.list(
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.images.v1.with_raw_response.list(
+                    account_id="",
+                )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
@@ -184,6 +196,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
         v1 = client.images.v1.edit(
             image_id="image_id",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            creator="creator",
             metadata={},
             require_signed_urls=True,
         )
@@ -279,7 +292,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncV1:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -294,7 +309,9 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         v1 = await async_client.images.v1.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            file={},
+            id="id",
+            creator="creator",
+            file=b"raw file contents",
             metadata={},
             require_signed_urls=True,
             url="https://example.com/path/to/logo.png",
@@ -337,25 +354,31 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        v1 = await async_client.images.v1.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            v1 = await async_client.images.v1.list(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(AsyncV4PagePagination[V1ListResponse], v1, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        v1 = await async_client.images.v1.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            page=1,
-            per_page=10,
-        )
+        with pytest.warns(DeprecationWarning):
+            v1 = await async_client.images.v1.list(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                creator="creator",
+                page=1,
+                per_page=10,
+            )
+
         assert_matches_type(AsyncV4PagePagination[V1ListResponse], v1, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.images.v1.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.images.v1.with_raw_response.list(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -364,23 +387,25 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.images.v1.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.images.v1.with_streaming_response.list(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            v1 = await response.parse()
-            assert_matches_type(AsyncV4PagePagination[V1ListResponse], v1, path=["response"])
+                v1 = await response.parse()
+                assert_matches_type(AsyncV4PagePagination[V1ListResponse], v1, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.images.v1.with_raw_response.list(
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.images.v1.with_raw_response.list(
+                    account_id="",
+                )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
@@ -443,6 +468,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
         v1 = await async_client.images.v1.edit(
             image_id="image_id",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            creator="creator",
             metadata={},
             require_signed_urls=True,
         )
diff --git a/tests/api_resources/images/test_v2.py b/tests/api_resources/images/test_v2.py
index d668ca234a8..dfd71f6a858 100644
--- a/tests/api_resources/images/test_v2.py
+++ b/tests/api_resources/images/test_v2.py
@@ -29,6 +29,8 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         v2 = client.images.v2.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             continuation_token="continuation_token",
+            creator="creator",
+            meta={"field_operator": "<field>[<operator>]"},
             per_page=10,
             sort_order="asc",
         )
@@ -67,7 +69,9 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncV2:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
@@ -81,6 +85,8 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
         v2 = await async_client.images.v2.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             continuation_token="continuation_token",
+            creator="creator",
+            meta={"field_operator": "<field>[<operator>]"},
             per_page=10,
             sort_order="asc",
         )
diff --git a/tests/api_resources/images/v1/test_blobs.py b/tests/api_resources/images/v1/test_blobs.py
index 2d3a89dbc0b..316785c842d 100644
--- a/tests/api_resources/images/v1/test_blobs.py
+++ b/tests/api_resources/images/v1/test_blobs.py
@@ -91,7 +91,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncBlobs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     @pytest.mark.respx(base_url=base_url)
diff --git a/tests/api_resources/images/v1/test_keys.py b/tests/api_resources/images/v1/test_keys.py
index ef6122e1816..edad6ebcb43 100644
--- a/tests/api_resources/images/v1/test_keys.py
+++ b/tests/api_resources/images/v1/test_keys.py
@@ -153,7 +153,9 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
 
 
 class TestAsyncKeys:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/images/v1/test_stats.py b/tests/api_resources/images/v1/test_stats.py
index ba44e332bc2..0c355f2fd23 100644
--- a/tests/api_resources/images/v1/test_stats.py
+++ b/tests/api_resources/images/v1/test_stats.py
@@ -57,7 +57,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncStats:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/images/v1/test_variants.py b/tests/api_resources/images/v1/test_variants.py
index 0b88368b362..05d13a9d6c7 100644
--- a/tests/api_resources/images/v1/test_variants.py
+++ b/tests/api_resources/images/v1/test_variants.py
@@ -333,7 +333,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncVariants:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/images/v2/test_direct_uploads.py b/tests/api_resources/images/v2/test_direct_uploads.py
index 88a6299905f..066ffab203a 100644
--- a/tests/api_resources/images/v2/test_direct_uploads.py
+++ b/tests/api_resources/images/v2/test_direct_uploads.py
@@ -32,6 +32,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         direct_upload = client.images.v2.direct_uploads.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             id="this/is/my-customid",
+            creator="creator",
             expiry=parse_datetime("2021-01-02T02:20:00Z"),
             metadata={},
             require_signed_urls=True,
@@ -74,7 +75,9 @@ def test_path_params_create(self, client: Cloudflare) -> None:
 
 
 class TestAsyncDirectUploads:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -90,6 +93,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
         direct_upload = await async_client.images.v2.direct_uploads.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             id="this/is/my-customid",
+            creator="creator",
             expiry=parse_datetime("2021-01-02T02:20:00Z"),
             metadata={},
             require_signed_urls=True,
diff --git a/tests/api_resources/intel/asn/test_subnets.py b/tests/api_resources/intel/asn/test_subnets.py
index 116eb6f482b..f6b27a86ca8 100644
--- a/tests/api_resources/intel/asn/test_subnets.py
+++ b/tests/api_resources/intel/asn/test_subnets.py
@@ -61,7 +61,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSubnets:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/intel/attack_surface_report/test_issue_types.py b/tests/api_resources/intel/attack_surface_report/test_issue_types.py
index 25b244d8989..01b9bf416fb 100644
--- a/tests/api_resources/intel/attack_surface_report/test_issue_types.py
+++ b/tests/api_resources/intel/attack_surface_report/test_issue_types.py
@@ -3,12 +3,13 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.intel.attack_surface_report import IssueTypeGetResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -22,7 +23,7 @@ def test_method_get(self, client: Cloudflare) -> None:
         issue_type = client.intel.attack_surface_report.issue_types.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[IssueTypeGetResponse], issue_type, path=["response"])
+        assert_matches_type(SyncSinglePage[IssueTypeGetResponse], issue_type, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -33,7 +34,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         issue_type = response.parse()
-        assert_matches_type(Optional[IssueTypeGetResponse], issue_type, path=["response"])
+        assert_matches_type(SyncSinglePage[IssueTypeGetResponse], issue_type, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -44,7 +45,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             issue_type = response.parse()
-            assert_matches_type(Optional[IssueTypeGetResponse], issue_type, path=["response"])
+            assert_matches_type(SyncSinglePage[IssueTypeGetResponse], issue_type, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -57,14 +58,16 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncIssueTypes:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         issue_type = await async_client.intel.attack_surface_report.issue_types.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[IssueTypeGetResponse], issue_type, path=["response"])
+        assert_matches_type(AsyncSinglePage[IssueTypeGetResponse], issue_type, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -75,7 +78,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         issue_type = await response.parse()
-        assert_matches_type(Optional[IssueTypeGetResponse], issue_type, path=["response"])
+        assert_matches_type(AsyncSinglePage[IssueTypeGetResponse], issue_type, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -86,7 +89,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             issue_type = await response.parse()
-            assert_matches_type(Optional[IssueTypeGetResponse], issue_type, path=["response"])
+            assert_matches_type(AsyncSinglePage[IssueTypeGetResponse], issue_type, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/intel/attack_surface_report/test_issues.py b/tests/api_resources/intel/attack_surface_report/test_issues.py
index db438e3e04a..985ca4c1d6c 100644
--- a/tests/api_resources/intel/attack_surface_report/test_issues.py
+++ b/tests/api_resources/intel/attack_surface_report/test_issues.py
@@ -18,6 +18,8 @@
     IssueSeverityResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -26,92 +28,104 @@ class TestIssues:
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
-        issue = client.intel.attack_surface_report.issues.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SyncV4PagePagination[IssueListResponse], issue, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            issue = client.intel.attack_surface_report.issues.list(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(SyncV4PagePagination[Optional[IssueListResponse]], issue, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
-        issue = client.intel.attack_surface_report.issues.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dismissed=False,
-            issue_class=["a_record_dangling", "always_use_https_not_enabled"],
-            issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
-            issue_type=["compliance_violation", "email_security"],
-            issue_type_neq=["compliance_violation", "email_security"],
-            page=1,
-            per_page=25,
-            product=["access", "dns"],
-            product_neq=["access", "dns"],
-            severity=["low", "moderate"],
-            severity_neq=["low", "moderate"],
-            subject=["example.com", "example.com", "example.com"],
-            subject_neq=["example.com", "example.com", "example.com"],
-        )
-        assert_matches_type(SyncV4PagePagination[IssueListResponse], issue, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            issue = client.intel.attack_surface_report.issues.list(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dismissed=False,
+                issue_class=["a_record_dangling", "always_use_https_not_enabled"],
+                issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
+                issue_type=["compliance_violation", "email_security"],
+                issue_type_neq=["compliance_violation", "email_security"],
+                page=1,
+                per_page=25,
+                product=["access", "dns"],
+                product_neq=["access", "dns"],
+                severity=["low", "moderate"],
+                severity_neq=["low", "moderate"],
+                subject=["example.com"],
+                subject_neq=["example.com"],
+            )
+
+        assert_matches_type(SyncV4PagePagination[Optional[IssueListResponse]], issue, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.intel.attack_surface_report.issues.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.intel.attack_surface_report.issues.with_raw_response.list(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         issue = response.parse()
-        assert_matches_type(SyncV4PagePagination[IssueListResponse], issue, path=["response"])
+        assert_matches_type(SyncV4PagePagination[Optional[IssueListResponse]], issue, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.intel.attack_surface_report.issues.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.intel.attack_surface_report.issues.with_streaming_response.list(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            issue = response.parse()
-            assert_matches_type(SyncV4PagePagination[IssueListResponse], issue, path=["response"])
+                issue = response.parse()
+                assert_matches_type(SyncV4PagePagination[Optional[IssueListResponse]], issue, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.intel.attack_surface_report.issues.with_raw_response.list(
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.intel.attack_surface_report.issues.with_raw_response.list(
+                    account_id="",
+                )
 
     @parametrize
     def test_method_class(self, client: Cloudflare) -> None:
-        issue = client.intel.attack_surface_report.issues.class_(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            issue = client.intel.attack_surface_report.issues.class_(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(Optional[IssueClassResponse], issue, path=["response"])
 
     @parametrize
     def test_method_class_with_all_params(self, client: Cloudflare) -> None:
-        issue = client.intel.attack_surface_report.issues.class_(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dismissed=False,
-            issue_class=["a_record_dangling", "always_use_https_not_enabled"],
-            issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
-            issue_type=["compliance_violation", "email_security"],
-            issue_type_neq=["compliance_violation", "email_security"],
-            product=["access", "dns"],
-            product_neq=["access", "dns"],
-            severity=["low", "moderate"],
-            severity_neq=["low", "moderate"],
-            subject=["example.com", "example.com", "example.com"],
-            subject_neq=["example.com", "example.com", "example.com"],
-        )
+        with pytest.warns(DeprecationWarning):
+            issue = client.intel.attack_surface_report.issues.class_(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dismissed=False,
+                issue_class=["a_record_dangling", "always_use_https_not_enabled"],
+                issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
+                issue_type=["compliance_violation", "email_security"],
+                issue_type_neq=["compliance_violation", "email_security"],
+                product=["access", "dns"],
+                product_neq=["access", "dns"],
+                severity=["low", "moderate"],
+                severity_neq=["low", "moderate"],
+                subject=["example.com"],
+                subject_neq=["example.com"],
+            )
+
         assert_matches_type(Optional[IssueClassResponse], issue, path=["response"])
 
     @parametrize
     def test_raw_response_class(self, client: Cloudflare) -> None:
-        response = client.intel.attack_surface_report.issues.with_raw_response.class_(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.intel.attack_surface_report.issues.with_raw_response.class_(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -120,111 +134,125 @@ def test_raw_response_class(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_class(self, client: Cloudflare) -> None:
-        with client.intel.attack_surface_report.issues.with_streaming_response.class_(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.intel.attack_surface_report.issues.with_streaming_response.class_(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            issue = response.parse()
-            assert_matches_type(Optional[IssueClassResponse], issue, path=["response"])
+                issue = response.parse()
+                assert_matches_type(Optional[IssueClassResponse], issue, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_class(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.intel.attack_surface_report.issues.with_raw_response.class_(
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.intel.attack_surface_report.issues.with_raw_response.class_(
+                    account_id="",
+                )
 
     @parametrize
     def test_method_dismiss(self, client: Cloudflare) -> None:
-        issue = client.intel.attack_surface_report.issues.dismiss(
-            issue_id="issue_id",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[IssueDismissResponse], issue, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            issue = client.intel.attack_surface_report.issues.dismiss(
+                issue_id="issue_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(IssueDismissResponse, issue, path=["response"])
 
     @parametrize
     def test_method_dismiss_with_all_params(self, client: Cloudflare) -> None:
-        issue = client.intel.attack_surface_report.issues.dismiss(
-            issue_id="issue_id",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dismiss=True,
-        )
-        assert_matches_type(Optional[IssueDismissResponse], issue, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            issue = client.intel.attack_surface_report.issues.dismiss(
+                issue_id="issue_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dismiss=True,
+            )
+
+        assert_matches_type(IssueDismissResponse, issue, path=["response"])
 
     @parametrize
     def test_raw_response_dismiss(self, client: Cloudflare) -> None:
-        response = client.intel.attack_surface_report.issues.with_raw_response.dismiss(
-            issue_id="issue_id",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.intel.attack_surface_report.issues.with_raw_response.dismiss(
+                issue_id="issue_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         issue = response.parse()
-        assert_matches_type(Optional[IssueDismissResponse], issue, path=["response"])
+        assert_matches_type(IssueDismissResponse, issue, path=["response"])
 
     @parametrize
     def test_streaming_response_dismiss(self, client: Cloudflare) -> None:
-        with client.intel.attack_surface_report.issues.with_streaming_response.dismiss(
-            issue_id="issue_id",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.intel.attack_surface_report.issues.with_streaming_response.dismiss(
+                issue_id="issue_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            issue = response.parse()
-            assert_matches_type(Optional[IssueDismissResponse], issue, path=["response"])
+                issue = response.parse()
+                assert_matches_type(IssueDismissResponse, issue, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_dismiss(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.intel.attack_surface_report.issues.with_raw_response.dismiss(
-                issue_id="issue_id",
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.intel.attack_surface_report.issues.with_raw_response.dismiss(
+                    issue_id="issue_id",
+                    account_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `issue_id` but received ''"):
-            client.intel.attack_surface_report.issues.with_raw_response.dismiss(
-                issue_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `issue_id` but received ''"):
+                client.intel.attack_surface_report.issues.with_raw_response.dismiss(
+                    issue_id="",
+                    account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
     @parametrize
     def test_method_severity(self, client: Cloudflare) -> None:
-        issue = client.intel.attack_surface_report.issues.severity(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            issue = client.intel.attack_surface_report.issues.severity(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(Optional[IssueSeverityResponse], issue, path=["response"])
 
     @parametrize
     def test_method_severity_with_all_params(self, client: Cloudflare) -> None:
-        issue = client.intel.attack_surface_report.issues.severity(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dismissed=False,
-            issue_class=["a_record_dangling", "always_use_https_not_enabled"],
-            issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
-            issue_type=["compliance_violation", "email_security"],
-            issue_type_neq=["compliance_violation", "email_security"],
-            product=["access", "dns"],
-            product_neq=["access", "dns"],
-            severity=["low", "moderate"],
-            severity_neq=["low", "moderate"],
-            subject=["example.com", "example.com", "example.com"],
-            subject_neq=["example.com", "example.com", "example.com"],
-        )
+        with pytest.warns(DeprecationWarning):
+            issue = client.intel.attack_surface_report.issues.severity(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dismissed=False,
+                issue_class=["a_record_dangling", "always_use_https_not_enabled"],
+                issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
+                issue_type=["compliance_violation", "email_security"],
+                issue_type_neq=["compliance_violation", "email_security"],
+                product=["access", "dns"],
+                product_neq=["access", "dns"],
+                severity=["low", "moderate"],
+                severity_neq=["low", "moderate"],
+                subject=["example.com"],
+                subject_neq=["example.com"],
+            )
+
         assert_matches_type(Optional[IssueSeverityResponse], issue, path=["response"])
 
     @parametrize
     def test_raw_response_severity(self, client: Cloudflare) -> None:
-        response = client.intel.attack_surface_report.issues.with_raw_response.severity(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.intel.attack_surface_report.issues.with_raw_response.severity(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -233,54 +261,61 @@ def test_raw_response_severity(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_severity(self, client: Cloudflare) -> None:
-        with client.intel.attack_surface_report.issues.with_streaming_response.severity(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.intel.attack_surface_report.issues.with_streaming_response.severity(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            issue = response.parse()
-            assert_matches_type(Optional[IssueSeverityResponse], issue, path=["response"])
+                issue = response.parse()
+                assert_matches_type(Optional[IssueSeverityResponse], issue, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_severity(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.intel.attack_surface_report.issues.with_raw_response.severity(
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.intel.attack_surface_report.issues.with_raw_response.severity(
+                    account_id="",
+                )
 
     @parametrize
     def test_method_type(self, client: Cloudflare) -> None:
-        issue = client.intel.attack_surface_report.issues.type(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            issue = client.intel.attack_surface_report.issues.type(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(Optional[IssueTypeResponse], issue, path=["response"])
 
     @parametrize
     def test_method_type_with_all_params(self, client: Cloudflare) -> None:
-        issue = client.intel.attack_surface_report.issues.type(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dismissed=False,
-            issue_class=["a_record_dangling", "always_use_https_not_enabled"],
-            issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
-            issue_type=["compliance_violation", "email_security"],
-            issue_type_neq=["compliance_violation", "email_security"],
-            product=["access", "dns"],
-            product_neq=["access", "dns"],
-            severity=["low", "moderate"],
-            severity_neq=["low", "moderate"],
-            subject=["example.com", "example.com", "example.com"],
-            subject_neq=["example.com", "example.com", "example.com"],
-        )
+        with pytest.warns(DeprecationWarning):
+            issue = client.intel.attack_surface_report.issues.type(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dismissed=False,
+                issue_class=["a_record_dangling", "always_use_https_not_enabled"],
+                issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
+                issue_type=["compliance_violation", "email_security"],
+                issue_type_neq=["compliance_violation", "email_security"],
+                product=["access", "dns"],
+                product_neq=["access", "dns"],
+                severity=["low", "moderate"],
+                severity_neq=["low", "moderate"],
+                subject=["example.com"],
+                subject_neq=["example.com"],
+            )
+
         assert_matches_type(Optional[IssueTypeResponse], issue, path=["response"])
 
     @parametrize
     def test_raw_response_type(self, client: Cloudflare) -> None:
-        response = client.intel.attack_surface_report.issues.with_raw_response.type(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.intel.attack_surface_report.issues.with_raw_response.type(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -289,116 +324,132 @@ def test_raw_response_type(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_type(self, client: Cloudflare) -> None:
-        with client.intel.attack_surface_report.issues.with_streaming_response.type(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.intel.attack_surface_report.issues.with_streaming_response.type(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            issue = response.parse()
-            assert_matches_type(Optional[IssueTypeResponse], issue, path=["response"])
+                issue = response.parse()
+                assert_matches_type(Optional[IssueTypeResponse], issue, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_type(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.intel.attack_surface_report.issues.with_raw_response.type(
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.intel.attack_surface_report.issues.with_raw_response.type(
+                    account_id="",
+                )
 
 
 class TestAsyncIssues:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        issue = await async_client.intel.attack_surface_report.issues.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(AsyncV4PagePagination[IssueListResponse], issue, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            issue = await async_client.intel.attack_surface_report.issues.list(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(AsyncV4PagePagination[Optional[IssueListResponse]], issue, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        issue = await async_client.intel.attack_surface_report.issues.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dismissed=False,
-            issue_class=["a_record_dangling", "always_use_https_not_enabled"],
-            issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
-            issue_type=["compliance_violation", "email_security"],
-            issue_type_neq=["compliance_violation", "email_security"],
-            page=1,
-            per_page=25,
-            product=["access", "dns"],
-            product_neq=["access", "dns"],
-            severity=["low", "moderate"],
-            severity_neq=["low", "moderate"],
-            subject=["example.com", "example.com", "example.com"],
-            subject_neq=["example.com", "example.com", "example.com"],
-        )
-        assert_matches_type(AsyncV4PagePagination[IssueListResponse], issue, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            issue = await async_client.intel.attack_surface_report.issues.list(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dismissed=False,
+                issue_class=["a_record_dangling", "always_use_https_not_enabled"],
+                issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
+                issue_type=["compliance_violation", "email_security"],
+                issue_type_neq=["compliance_violation", "email_security"],
+                page=1,
+                per_page=25,
+                product=["access", "dns"],
+                product_neq=["access", "dns"],
+                severity=["low", "moderate"],
+                severity_neq=["low", "moderate"],
+                subject=["example.com"],
+                subject_neq=["example.com"],
+            )
+
+        assert_matches_type(AsyncV4PagePagination[Optional[IssueListResponse]], issue, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.intel.attack_surface_report.issues.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.intel.attack_surface_report.issues.with_raw_response.list(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         issue = await response.parse()
-        assert_matches_type(AsyncV4PagePagination[IssueListResponse], issue, path=["response"])
+        assert_matches_type(AsyncV4PagePagination[Optional[IssueListResponse]], issue, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.intel.attack_surface_report.issues.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.intel.attack_surface_report.issues.with_streaming_response.list(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            issue = await response.parse()
-            assert_matches_type(AsyncV4PagePagination[IssueListResponse], issue, path=["response"])
+                issue = await response.parse()
+                assert_matches_type(AsyncV4PagePagination[Optional[IssueListResponse]], issue, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.intel.attack_surface_report.issues.with_raw_response.list(
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.intel.attack_surface_report.issues.with_raw_response.list(
+                    account_id="",
+                )
 
     @parametrize
     async def test_method_class(self, async_client: AsyncCloudflare) -> None:
-        issue = await async_client.intel.attack_surface_report.issues.class_(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            issue = await async_client.intel.attack_surface_report.issues.class_(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(Optional[IssueClassResponse], issue, path=["response"])
 
     @parametrize
     async def test_method_class_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        issue = await async_client.intel.attack_surface_report.issues.class_(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dismissed=False,
-            issue_class=["a_record_dangling", "always_use_https_not_enabled"],
-            issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
-            issue_type=["compliance_violation", "email_security"],
-            issue_type_neq=["compliance_violation", "email_security"],
-            product=["access", "dns"],
-            product_neq=["access", "dns"],
-            severity=["low", "moderate"],
-            severity_neq=["low", "moderate"],
-            subject=["example.com", "example.com", "example.com"],
-            subject_neq=["example.com", "example.com", "example.com"],
-        )
+        with pytest.warns(DeprecationWarning):
+            issue = await async_client.intel.attack_surface_report.issues.class_(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dismissed=False,
+                issue_class=["a_record_dangling", "always_use_https_not_enabled"],
+                issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
+                issue_type=["compliance_violation", "email_security"],
+                issue_type_neq=["compliance_violation", "email_security"],
+                product=["access", "dns"],
+                product_neq=["access", "dns"],
+                severity=["low", "moderate"],
+                severity_neq=["low", "moderate"],
+                subject=["example.com"],
+                subject_neq=["example.com"],
+            )
+
         assert_matches_type(Optional[IssueClassResponse], issue, path=["response"])
 
     @parametrize
     async def test_raw_response_class(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.intel.attack_surface_report.issues.with_raw_response.class_(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.intel.attack_surface_report.issues.with_raw_response.class_(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -407,111 +458,125 @@ async def test_raw_response_class(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_class(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.intel.attack_surface_report.issues.with_streaming_response.class_(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.intel.attack_surface_report.issues.with_streaming_response.class_(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            issue = await response.parse()
-            assert_matches_type(Optional[IssueClassResponse], issue, path=["response"])
+                issue = await response.parse()
+                assert_matches_type(Optional[IssueClassResponse], issue, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_class(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.intel.attack_surface_report.issues.with_raw_response.class_(
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.intel.attack_surface_report.issues.with_raw_response.class_(
+                    account_id="",
+                )
 
     @parametrize
     async def test_method_dismiss(self, async_client: AsyncCloudflare) -> None:
-        issue = await async_client.intel.attack_surface_report.issues.dismiss(
-            issue_id="issue_id",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[IssueDismissResponse], issue, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            issue = await async_client.intel.attack_surface_report.issues.dismiss(
+                issue_id="issue_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(IssueDismissResponse, issue, path=["response"])
 
     @parametrize
     async def test_method_dismiss_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        issue = await async_client.intel.attack_surface_report.issues.dismiss(
-            issue_id="issue_id",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dismiss=True,
-        )
-        assert_matches_type(Optional[IssueDismissResponse], issue, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            issue = await async_client.intel.attack_surface_report.issues.dismiss(
+                issue_id="issue_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dismiss=True,
+            )
+
+        assert_matches_type(IssueDismissResponse, issue, path=["response"])
 
     @parametrize
     async def test_raw_response_dismiss(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.intel.attack_surface_report.issues.with_raw_response.dismiss(
-            issue_id="issue_id",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.intel.attack_surface_report.issues.with_raw_response.dismiss(
+                issue_id="issue_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         issue = await response.parse()
-        assert_matches_type(Optional[IssueDismissResponse], issue, path=["response"])
+        assert_matches_type(IssueDismissResponse, issue, path=["response"])
 
     @parametrize
     async def test_streaming_response_dismiss(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.intel.attack_surface_report.issues.with_streaming_response.dismiss(
-            issue_id="issue_id",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.intel.attack_surface_report.issues.with_streaming_response.dismiss(
+                issue_id="issue_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            issue = await response.parse()
-            assert_matches_type(Optional[IssueDismissResponse], issue, path=["response"])
+                issue = await response.parse()
+                assert_matches_type(IssueDismissResponse, issue, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_dismiss(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.intel.attack_surface_report.issues.with_raw_response.dismiss(
-                issue_id="issue_id",
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.intel.attack_surface_report.issues.with_raw_response.dismiss(
+                    issue_id="issue_id",
+                    account_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `issue_id` but received ''"):
-            await async_client.intel.attack_surface_report.issues.with_raw_response.dismiss(
-                issue_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `issue_id` but received ''"):
+                await async_client.intel.attack_surface_report.issues.with_raw_response.dismiss(
+                    issue_id="",
+                    account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
     @parametrize
     async def test_method_severity(self, async_client: AsyncCloudflare) -> None:
-        issue = await async_client.intel.attack_surface_report.issues.severity(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            issue = await async_client.intel.attack_surface_report.issues.severity(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(Optional[IssueSeverityResponse], issue, path=["response"])
 
     @parametrize
     async def test_method_severity_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        issue = await async_client.intel.attack_surface_report.issues.severity(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dismissed=False,
-            issue_class=["a_record_dangling", "always_use_https_not_enabled"],
-            issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
-            issue_type=["compliance_violation", "email_security"],
-            issue_type_neq=["compliance_violation", "email_security"],
-            product=["access", "dns"],
-            product_neq=["access", "dns"],
-            severity=["low", "moderate"],
-            severity_neq=["low", "moderate"],
-            subject=["example.com", "example.com", "example.com"],
-            subject_neq=["example.com", "example.com", "example.com"],
-        )
+        with pytest.warns(DeprecationWarning):
+            issue = await async_client.intel.attack_surface_report.issues.severity(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dismissed=False,
+                issue_class=["a_record_dangling", "always_use_https_not_enabled"],
+                issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
+                issue_type=["compliance_violation", "email_security"],
+                issue_type_neq=["compliance_violation", "email_security"],
+                product=["access", "dns"],
+                product_neq=["access", "dns"],
+                severity=["low", "moderate"],
+                severity_neq=["low", "moderate"],
+                subject=["example.com"],
+                subject_neq=["example.com"],
+            )
+
         assert_matches_type(Optional[IssueSeverityResponse], issue, path=["response"])
 
     @parametrize
     async def test_raw_response_severity(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.intel.attack_surface_report.issues.with_raw_response.severity(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.intel.attack_surface_report.issues.with_raw_response.severity(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -520,54 +585,61 @@ async def test_raw_response_severity(self, async_client: AsyncCloudflare) -> Non
 
     @parametrize
     async def test_streaming_response_severity(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.intel.attack_surface_report.issues.with_streaming_response.severity(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.intel.attack_surface_report.issues.with_streaming_response.severity(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            issue = await response.parse()
-            assert_matches_type(Optional[IssueSeverityResponse], issue, path=["response"])
+                issue = await response.parse()
+                assert_matches_type(Optional[IssueSeverityResponse], issue, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_severity(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.intel.attack_surface_report.issues.with_raw_response.severity(
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.intel.attack_surface_report.issues.with_raw_response.severity(
+                    account_id="",
+                )
 
     @parametrize
     async def test_method_type(self, async_client: AsyncCloudflare) -> None:
-        issue = await async_client.intel.attack_surface_report.issues.type(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            issue = await async_client.intel.attack_surface_report.issues.type(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(Optional[IssueTypeResponse], issue, path=["response"])
 
     @parametrize
     async def test_method_type_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        issue = await async_client.intel.attack_surface_report.issues.type(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dismissed=False,
-            issue_class=["a_record_dangling", "always_use_https_not_enabled"],
-            issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
-            issue_type=["compliance_violation", "email_security"],
-            issue_type_neq=["compliance_violation", "email_security"],
-            product=["access", "dns"],
-            product_neq=["access", "dns"],
-            severity=["low", "moderate"],
-            severity_neq=["low", "moderate"],
-            subject=["example.com", "example.com", "example.com"],
-            subject_neq=["example.com", "example.com", "example.com"],
-        )
+        with pytest.warns(DeprecationWarning):
+            issue = await async_client.intel.attack_surface_report.issues.type(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dismissed=False,
+                issue_class=["a_record_dangling", "always_use_https_not_enabled"],
+                issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
+                issue_type=["compliance_violation", "email_security"],
+                issue_type_neq=["compliance_violation", "email_security"],
+                product=["access", "dns"],
+                product_neq=["access", "dns"],
+                severity=["low", "moderate"],
+                severity_neq=["low", "moderate"],
+                subject=["example.com"],
+                subject_neq=["example.com"],
+            )
+
         assert_matches_type(Optional[IssueTypeResponse], issue, path=["response"])
 
     @parametrize
     async def test_raw_response_type(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.intel.attack_surface_report.issues.with_raw_response.type(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.intel.attack_surface_report.issues.with_raw_response.type(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -576,20 +648,22 @@ async def test_raw_response_type(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_type(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.intel.attack_surface_report.issues.with_streaming_response.type(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.intel.attack_surface_report.issues.with_streaming_response.type(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            issue = await response.parse()
-            assert_matches_type(Optional[IssueTypeResponse], issue, path=["response"])
+                issue = await response.parse()
+                assert_matches_type(Optional[IssueTypeResponse], issue, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_type(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.intel.attack_surface_report.issues.with_raw_response.type(
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.intel.attack_surface_report.issues.with_raw_response.type(
+                    account_id="",
+                )
diff --git a/tests/api_resources/intel/domains/test_bulks.py b/tests/api_resources/intel/domains/test_bulks.py
index 0a1c1828bc7..8a1c0480f60 100644
--- a/tests/api_resources/intel/domains/test_bulks.py
+++ b/tests/api_resources/intel/domains/test_bulks.py
@@ -28,7 +28,7 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         bulk = client.intel.domains.bulks.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            domain={},
+            domain=["string"],
         )
         assert_matches_type(Optional[BulkGetResponse], bulk, path=["response"])
 
@@ -65,7 +65,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncBulks:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -78,7 +80,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         bulk = await async_client.intel.domains.bulks.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            domain={},
+            domain=["string"],
         )
         assert_matches_type(Optional[BulkGetResponse], bulk, path=["response"])
 
diff --git a/tests/api_resources/intel/indicator_feeds/test_permissions.py b/tests/api_resources/intel/indicator_feeds/test_permissions.py
index 3b06e3c0d14..4b5ec188fd9 100644
--- a/tests/api_resources/intel/indicator_feeds/test_permissions.py
+++ b/tests/api_resources/intel/indicator_feeds/test_permissions.py
@@ -155,7 +155,9 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
 
 
 class TestAsyncPermissions:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/intel/indicator_feeds/test_snapshots.py b/tests/api_resources/intel/indicator_feeds/test_snapshots.py
index 5b7f91a523b..ed91b7eb9ea 100644
--- a/tests/api_resources/intel/indicator_feeds/test_snapshots.py
+++ b/tests/api_resources/intel/indicator_feeds/test_snapshots.py
@@ -75,7 +75,9 @@ def test_path_params_update(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSnapshots:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
diff --git a/tests/api_resources/intel/test_asn.py b/tests/api_resources/intel/test_asn.py
index 1b9016472fe..16911e7242a 100644
--- a/tests/api_resources/intel/test_asn.py
+++ b/tests/api_resources/intel/test_asn.py
@@ -61,7 +61,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncASN:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/intel/test_dns.py b/tests/api_resources/intel/test_dns.py
index 515012c788b..a0e513e9464 100644
--- a/tests/api_resources/intel/test_dns.py
+++ b/tests/api_resources/intel/test_dns.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
@@ -11,7 +11,7 @@
 from tests.utils import assert_matches_type
 from cloudflare._utils import parse_date
 from cloudflare.pagination import SyncV4PagePagination, AsyncV4PagePagination
-from cloudflare.types.intel import DNSListResponse
+from cloudflare.types.intel import DNS
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -24,7 +24,7 @@ def test_method_list(self, client: Cloudflare) -> None:
         dns = client.intel.dns.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncV4PagePagination[DNSListResponse], dns, path=["response"])
+        assert_matches_type(SyncV4PagePagination[Optional[DNS]], dns, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
@@ -38,7 +38,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
                 "start": parse_date("2021-04-01"),
             },
         )
-        assert_matches_type(SyncV4PagePagination[DNSListResponse], dns, path=["response"])
+        assert_matches_type(SyncV4PagePagination[Optional[DNS]], dns, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -49,7 +49,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dns = response.parse()
-        assert_matches_type(SyncV4PagePagination[DNSListResponse], dns, path=["response"])
+        assert_matches_type(SyncV4PagePagination[Optional[DNS]], dns, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -60,7 +60,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dns = response.parse()
-            assert_matches_type(SyncV4PagePagination[DNSListResponse], dns, path=["response"])
+            assert_matches_type(SyncV4PagePagination[Optional[DNS]], dns, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -73,14 +73,16 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncDNS:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         dns = await async_client.intel.dns.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncV4PagePagination[DNSListResponse], dns, path=["response"])
+        assert_matches_type(AsyncV4PagePagination[Optional[DNS]], dns, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -94,7 +96,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
                 "start": parse_date("2021-04-01"),
             },
         )
-        assert_matches_type(AsyncV4PagePagination[DNSListResponse], dns, path=["response"])
+        assert_matches_type(AsyncV4PagePagination[Optional[DNS]], dns, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -105,7 +107,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dns = await response.parse()
-        assert_matches_type(AsyncV4PagePagination[DNSListResponse], dns, path=["response"])
+        assert_matches_type(AsyncV4PagePagination[Optional[DNS]], dns, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -116,7 +118,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dns = await response.parse()
-            assert_matches_type(AsyncV4PagePagination[DNSListResponse], dns, path=["response"])
+            assert_matches_type(AsyncV4PagePagination[Optional[DNS]], dns, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/intel/test_domain_history.py b/tests/api_resources/intel/test_domain_history.py
index 75926dc919d..e958709d7ca 100644
--- a/tests/api_resources/intel/test_domain_history.py
+++ b/tests/api_resources/intel/test_domain_history.py
@@ -65,7 +65,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncDomainHistory:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/intel/test_domains.py b/tests/api_resources/intel/test_domains.py
index 9a897bf7904..1915f55b790 100644
--- a/tests/api_resources/intel/test_domains.py
+++ b/tests/api_resources/intel/test_domains.py
@@ -65,7 +65,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncDomains:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/intel/test_indicator_feeds.py b/tests/api_resources/intel/test_indicator_feeds.py
index b1d65b7148f..c3d7ce21af7 100644
--- a/tests/api_resources/intel/test_indicator_feeds.py
+++ b/tests/api_resources/intel/test_indicator_feeds.py
@@ -85,6 +85,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             description="This is an example description",
             is_attributable=True,
+            is_downloadable=True,
             is_public=True,
             name="indicator_list",
         )
@@ -248,7 +249,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncIndicatorFeeds:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -312,6 +315,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             description="This is an example description",
             is_attributable=True,
+            is_downloadable=True,
             is_public=True,
             name="indicator_list",
         )
diff --git a/tests/api_resources/intel/test_ip_lists.py b/tests/api_resources/intel/test_ip_lists.py
deleted file mode 100644
index afb47b13e8c..00000000000
--- a/tests/api_resources/intel/test_ip_lists.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.intel import IPListGetResponse
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestIPLists:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        ip_list = client.intel.ip_lists.get(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[IPListGetResponse], ip_list, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.intel.ip_lists.with_raw_response.get(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ip_list = response.parse()
-        assert_matches_type(Optional[IPListGetResponse], ip_list, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.intel.ip_lists.with_streaming_response.get(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ip_list = response.parse()
-            assert_matches_type(Optional[IPListGetResponse], ip_list, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.intel.ip_lists.with_raw_response.get(
-                account_id="",
-            )
-
-
-class TestAsyncIPLists:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        ip_list = await async_client.intel.ip_lists.get(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[IPListGetResponse], ip_list, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.intel.ip_lists.with_raw_response.get(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ip_list = await response.parse()
-        assert_matches_type(Optional[IPListGetResponse], ip_list, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.intel.ip_lists.with_streaming_response.get(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ip_list = await response.parse()
-            assert_matches_type(Optional[IPListGetResponse], ip_list, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.intel.ip_lists.with_raw_response.get(
-                account_id="",
-            )
diff --git a/tests/api_resources/intel/test_ips.py b/tests/api_resources/intel/test_ips.py
index 4f39c996906..8ebd90426c0 100644
--- a/tests/api_resources/intel/test_ips.py
+++ b/tests/api_resources/intel/test_ips.py
@@ -66,7 +66,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncIPs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/intel/test_miscategorizations.py b/tests/api_resources/intel/test_miscategorizations.py
index a72f326fff3..549b9fa76eb 100644
--- a/tests/api_resources/intel/test_miscategorizations.py
+++ b/tests/api_resources/intel/test_miscategorizations.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -22,7 +22,7 @@ def test_method_create(self, client: Cloudflare) -> None:
         miscategorization = client.intel.miscategorizations.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[MiscategorizationCreateResponse], miscategorization, path=["response"])
+        assert_matches_type(MiscategorizationCreateResponse, miscategorization, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
@@ -31,12 +31,12 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             content_adds=[82],
             content_removes=[155],
             indicator_type="domain",
-            ip={},
+            ip="ip",
             security_adds=[117, 131],
             security_removes=[83],
             url="url",
         )
-        assert_matches_type(Optional[MiscategorizationCreateResponse], miscategorization, path=["response"])
+        assert_matches_type(MiscategorizationCreateResponse, miscategorization, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
@@ -47,7 +47,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         miscategorization = response.parse()
-        assert_matches_type(Optional[MiscategorizationCreateResponse], miscategorization, path=["response"])
+        assert_matches_type(MiscategorizationCreateResponse, miscategorization, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
@@ -58,7 +58,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             miscategorization = response.parse()
-            assert_matches_type(Optional[MiscategorizationCreateResponse], miscategorization, path=["response"])
+            assert_matches_type(MiscategorizationCreateResponse, miscategorization, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -71,14 +71,16 @@ def test_path_params_create(self, client: Cloudflare) -> None:
 
 
 class TestAsyncMiscategorizations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         miscategorization = await async_client.intel.miscategorizations.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[MiscategorizationCreateResponse], miscategorization, path=["response"])
+        assert_matches_type(MiscategorizationCreateResponse, miscategorization, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -87,12 +89,12 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             content_adds=[82],
             content_removes=[155],
             indicator_type="domain",
-            ip={},
+            ip="ip",
             security_adds=[117, 131],
             security_removes=[83],
             url="url",
         )
-        assert_matches_type(Optional[MiscategorizationCreateResponse], miscategorization, path=["response"])
+        assert_matches_type(MiscategorizationCreateResponse, miscategorization, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
@@ -103,7 +105,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         miscategorization = await response.parse()
-        assert_matches_type(Optional[MiscategorizationCreateResponse], miscategorization, path=["response"])
+        assert_matches_type(MiscategorizationCreateResponse, miscategorization, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
@@ -114,7 +116,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             miscategorization = await response.parse()
-            assert_matches_type(Optional[MiscategorizationCreateResponse], miscategorization, path=["response"])
+            assert_matches_type(MiscategorizationCreateResponse, miscategorization, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/intel/test_sinkholes.py b/tests/api_resources/intel/test_sinkholes.py
index 5e9b3dda069..ff8bbde79c8 100644
--- a/tests/api_resources/intel/test_sinkholes.py
+++ b/tests/api_resources/intel/test_sinkholes.py
@@ -58,7 +58,9 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSinkholes:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/intel/test_whois.py b/tests/api_resources/intel/test_whois.py
index 97c8efbf7a2..2bd6d6f9801 100644
--- a/tests/api_resources/intel/test_whois.py
+++ b/tests/api_resources/intel/test_whois.py
@@ -65,7 +65,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncWhois:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/kv/namespaces/test_bulk.py b/tests/api_resources/kv/namespaces/test_bulk.py
deleted file mode 100644
index 42649742375..00000000000
--- a/tests/api_resources/kv/namespaces/test_bulk.py
+++ /dev/null
@@ -1,224 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.kv.namespaces import BulkDeleteResponse, BulkUpdateResponse
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestBulk:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_update(self, client: Cloudflare) -> None:
-        bulk = client.kv.namespaces.bulk.update(
-            namespace_id="0f2ac74b498b48028cb68387c421e279",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
-        )
-        assert_matches_type(Optional[BulkUpdateResponse], bulk, path=["response"])
-
-    @parametrize
-    def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.kv.namespaces.bulk.with_raw_response.update(
-            namespace_id="0f2ac74b498b48028cb68387c421e279",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        bulk = response.parse()
-        assert_matches_type(Optional[BulkUpdateResponse], bulk, path=["response"])
-
-    @parametrize
-    def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.kv.namespaces.bulk.with_streaming_response.update(
-            namespace_id="0f2ac74b498b48028cb68387c421e279",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            bulk = response.parse()
-            assert_matches_type(Optional[BulkUpdateResponse], bulk, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.kv.namespaces.bulk.with_raw_response.update(
-                namespace_id="0f2ac74b498b48028cb68387c421e279",
-                account_id="",
-                body=[{}, {}, {}],
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace_id` but received ''"):
-            client.kv.namespaces.bulk.with_raw_response.update(
-                namespace_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body=[{}, {}, {}],
-            )
-
-    @parametrize
-    def test_method_delete(self, client: Cloudflare) -> None:
-        bulk = client.kv.namespaces.bulk.delete(
-            namespace_id="0f2ac74b498b48028cb68387c421e279",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[BulkDeleteResponse], bulk, path=["response"])
-
-    @parametrize
-    def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.kv.namespaces.bulk.with_raw_response.delete(
-            namespace_id="0f2ac74b498b48028cb68387c421e279",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        bulk = response.parse()
-        assert_matches_type(Optional[BulkDeleteResponse], bulk, path=["response"])
-
-    @parametrize
-    def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.kv.namespaces.bulk.with_streaming_response.delete(
-            namespace_id="0f2ac74b498b48028cb68387c421e279",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            bulk = response.parse()
-            assert_matches_type(Optional[BulkDeleteResponse], bulk, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.kv.namespaces.bulk.with_raw_response.delete(
-                namespace_id="0f2ac74b498b48028cb68387c421e279",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace_id` but received ''"):
-            client.kv.namespaces.bulk.with_raw_response.delete(
-                namespace_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-
-class TestAsyncBulk:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        bulk = await async_client.kv.namespaces.bulk.update(
-            namespace_id="0f2ac74b498b48028cb68387c421e279",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
-        )
-        assert_matches_type(Optional[BulkUpdateResponse], bulk, path=["response"])
-
-    @parametrize
-    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.kv.namespaces.bulk.with_raw_response.update(
-            namespace_id="0f2ac74b498b48028cb68387c421e279",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        bulk = await response.parse()
-        assert_matches_type(Optional[BulkUpdateResponse], bulk, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.kv.namespaces.bulk.with_streaming_response.update(
-            namespace_id="0f2ac74b498b48028cb68387c421e279",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            bulk = await response.parse()
-            assert_matches_type(Optional[BulkUpdateResponse], bulk, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.kv.namespaces.bulk.with_raw_response.update(
-                namespace_id="0f2ac74b498b48028cb68387c421e279",
-                account_id="",
-                body=[{}, {}, {}],
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace_id` but received ''"):
-            await async_client.kv.namespaces.bulk.with_raw_response.update(
-                namespace_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body=[{}, {}, {}],
-            )
-
-    @parametrize
-    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        bulk = await async_client.kv.namespaces.bulk.delete(
-            namespace_id="0f2ac74b498b48028cb68387c421e279",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[BulkDeleteResponse], bulk, path=["response"])
-
-    @parametrize
-    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.kv.namespaces.bulk.with_raw_response.delete(
-            namespace_id="0f2ac74b498b48028cb68387c421e279",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        bulk = await response.parse()
-        assert_matches_type(Optional[BulkDeleteResponse], bulk, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.kv.namespaces.bulk.with_streaming_response.delete(
-            namespace_id="0f2ac74b498b48028cb68387c421e279",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            bulk = await response.parse()
-            assert_matches_type(Optional[BulkDeleteResponse], bulk, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.kv.namespaces.bulk.with_raw_response.delete(
-                namespace_id="0f2ac74b498b48028cb68387c421e279",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace_id` but received ''"):
-            await async_client.kv.namespaces.bulk.with_raw_response.delete(
-                namespace_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
diff --git a/tests/api_resources/kv/namespaces/test_keys.py b/tests/api_resources/kv/namespaces/test_keys.py
index 074a872cc1d..578cd37251e 100644
--- a/tests/api_resources/kv/namespaces/test_keys.py
+++ b/tests/api_resources/kv/namespaces/test_keys.py
@@ -3,14 +3,21 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncCursorLimitPagination, AsyncCursorLimitPagination
-from cloudflare.types.kv.namespaces import Key
+from cloudflare.types.kv.namespaces import (
+    Key,
+    KeyBulkGetResponse,
+    KeyBulkDeleteResponse,
+    KeyBulkUpdateResponse,
+)
+
+# pyright: reportDeprecated=false
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -77,9 +84,223 @@ def test_path_params_list(self, client: Cloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @parametrize
+    def test_method_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            key = client.kv.namespaces.keys.bulk_delete(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=["My-Key"],
+            )
+
+        assert_matches_type(Optional[KeyBulkDeleteResponse], key, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.kv.namespaces.keys.with_raw_response.bulk_delete(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=["My-Key"],
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        key = response.parse()
+        assert_matches_type(Optional[KeyBulkDeleteResponse], key, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.kv.namespaces.keys.with_streaming_response.bulk_delete(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=["My-Key"],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                key = response.parse()
+                assert_matches_type(Optional[KeyBulkDeleteResponse], key, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.kv.namespaces.keys.with_raw_response.bulk_delete(
+                    namespace_id="0f2ac74b498b48028cb68387c421e279",
+                    account_id="",
+                    body=["My-Key"],
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace_id` but received ''"):
+                client.kv.namespaces.keys.with_raw_response.bulk_delete(
+                    namespace_id="",
+                    account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    body=["My-Key"],
+                )
+
+    @parametrize
+    def test_method_bulk_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            key = client.kv.namespaces.keys.bulk_get(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                keys=["My-Key"],
+            )
+
+        assert_matches_type(Optional[KeyBulkGetResponse], key, path=["response"])
+
+    @parametrize
+    def test_method_bulk_get_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            key = client.kv.namespaces.keys.bulk_get(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                keys=["My-Key"],
+                type="text",
+                with_metadata=True,
+            )
+
+        assert_matches_type(Optional[KeyBulkGetResponse], key, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.kv.namespaces.keys.with_raw_response.bulk_get(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                keys=["My-Key"],
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        key = response.parse()
+        assert_matches_type(Optional[KeyBulkGetResponse], key, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.kv.namespaces.keys.with_streaming_response.bulk_get(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                keys=["My-Key"],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                key = response.parse()
+                assert_matches_type(Optional[KeyBulkGetResponse], key, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.kv.namespaces.keys.with_raw_response.bulk_get(
+                    namespace_id="0f2ac74b498b48028cb68387c421e279",
+                    account_id="",
+                    keys=["My-Key"],
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace_id` but received ''"):
+                client.kv.namespaces.keys.with_raw_response.bulk_get(
+                    namespace_id="",
+                    account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    keys=["My-Key"],
+                )
+
+    @parametrize
+    def test_method_bulk_update(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            key = client.kv.namespaces.keys.bulk_update(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[
+                    {
+                        "key": "My-Key",
+                        "value": "Some string",
+                    }
+                ],
+            )
+
+        assert_matches_type(Optional[KeyBulkUpdateResponse], key, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_update(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.kv.namespaces.keys.with_raw_response.bulk_update(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[
+                    {
+                        "key": "My-Key",
+                        "value": "Some string",
+                    }
+                ],
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        key = response.parse()
+        assert_matches_type(Optional[KeyBulkUpdateResponse], key, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_update(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.kv.namespaces.keys.with_streaming_response.bulk_update(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[
+                    {
+                        "key": "My-Key",
+                        "value": "Some string",
+                    }
+                ],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                key = response.parse()
+                assert_matches_type(Optional[KeyBulkUpdateResponse], key, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_update(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.kv.namespaces.keys.with_raw_response.bulk_update(
+                    namespace_id="0f2ac74b498b48028cb68387c421e279",
+                    account_id="",
+                    body=[
+                        {
+                            "key": "My-Key",
+                            "value": "Some string",
+                        }
+                    ],
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace_id` but received ''"):
+                client.kv.namespaces.keys.with_raw_response.bulk_update(
+                    namespace_id="",
+                    account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    body=[
+                        {
+                            "key": "My-Key",
+                            "value": "Some string",
+                        }
+                    ],
+                )
+
 
 class TestAsyncKeys:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
@@ -139,3 +360,215 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
                 namespace_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
+
+    @parametrize
+    async def test_method_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            key = await async_client.kv.namespaces.keys.bulk_delete(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=["My-Key"],
+            )
+
+        assert_matches_type(Optional[KeyBulkDeleteResponse], key, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.kv.namespaces.keys.with_raw_response.bulk_delete(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=["My-Key"],
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        key = await response.parse()
+        assert_matches_type(Optional[KeyBulkDeleteResponse], key, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.kv.namespaces.keys.with_streaming_response.bulk_delete(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=["My-Key"],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                key = await response.parse()
+                assert_matches_type(Optional[KeyBulkDeleteResponse], key, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.kv.namespaces.keys.with_raw_response.bulk_delete(
+                    namespace_id="0f2ac74b498b48028cb68387c421e279",
+                    account_id="",
+                    body=["My-Key"],
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace_id` but received ''"):
+                await async_client.kv.namespaces.keys.with_raw_response.bulk_delete(
+                    namespace_id="",
+                    account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    body=["My-Key"],
+                )
+
+    @parametrize
+    async def test_method_bulk_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            key = await async_client.kv.namespaces.keys.bulk_get(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                keys=["My-Key"],
+            )
+
+        assert_matches_type(Optional[KeyBulkGetResponse], key, path=["response"])
+
+    @parametrize
+    async def test_method_bulk_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            key = await async_client.kv.namespaces.keys.bulk_get(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                keys=["My-Key"],
+                type="text",
+                with_metadata=True,
+            )
+
+        assert_matches_type(Optional[KeyBulkGetResponse], key, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.kv.namespaces.keys.with_raw_response.bulk_get(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                keys=["My-Key"],
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        key = await response.parse()
+        assert_matches_type(Optional[KeyBulkGetResponse], key, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.kv.namespaces.keys.with_streaming_response.bulk_get(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                keys=["My-Key"],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                key = await response.parse()
+                assert_matches_type(Optional[KeyBulkGetResponse], key, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.kv.namespaces.keys.with_raw_response.bulk_get(
+                    namespace_id="0f2ac74b498b48028cb68387c421e279",
+                    account_id="",
+                    keys=["My-Key"],
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace_id` but received ''"):
+                await async_client.kv.namespaces.keys.with_raw_response.bulk_get(
+                    namespace_id="",
+                    account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    keys=["My-Key"],
+                )
+
+    @parametrize
+    async def test_method_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            key = await async_client.kv.namespaces.keys.bulk_update(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[
+                    {
+                        "key": "My-Key",
+                        "value": "Some string",
+                    }
+                ],
+            )
+
+        assert_matches_type(Optional[KeyBulkUpdateResponse], key, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.kv.namespaces.keys.with_raw_response.bulk_update(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[
+                    {
+                        "key": "My-Key",
+                        "value": "Some string",
+                    }
+                ],
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        key = await response.parse()
+        assert_matches_type(Optional[KeyBulkUpdateResponse], key, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.kv.namespaces.keys.with_streaming_response.bulk_update(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[
+                    {
+                        "key": "My-Key",
+                        "value": "Some string",
+                    }
+                ],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                key = await response.parse()
+                assert_matches_type(Optional[KeyBulkUpdateResponse], key, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.kv.namespaces.keys.with_raw_response.bulk_update(
+                    namespace_id="0f2ac74b498b48028cb68387c421e279",
+                    account_id="",
+                    body=[
+                        {
+                            "key": "My-Key",
+                            "value": "Some string",
+                        }
+                    ],
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace_id` but received ''"):
+                await async_client.kv.namespaces.keys.with_raw_response.bulk_update(
+                    namespace_id="",
+                    account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    body=[
+                        {
+                            "key": "My-Key",
+                            "value": "Some string",
+                        }
+                    ],
+                )
diff --git a/tests/api_resources/kv/namespaces/test_metadata.py b/tests/api_resources/kv/namespaces/test_metadata.py
index e6e56f6f06a..a53c0f4cee9 100644
--- a/tests/api_resources/kv/namespaces/test_metadata.py
+++ b/tests/api_resources/kv/namespaces/test_metadata.py
@@ -3,13 +3,12 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.kv.namespaces import MetadataGetResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -24,7 +23,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             namespace_id="0f2ac74b498b48028cb68387c421e279",
         )
-        assert_matches_type(Optional[MetadataGetResponse], metadata, path=["response"])
+        assert_matches_type(object, metadata, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -37,7 +36,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         metadata = response.parse()
-        assert_matches_type(Optional[MetadataGetResponse], metadata, path=["response"])
+        assert_matches_type(object, metadata, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -50,7 +49,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             metadata = response.parse()
-            assert_matches_type(Optional[MetadataGetResponse], metadata, path=["response"])
+            assert_matches_type(object, metadata, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -79,7 +78,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncMetadata:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -88,7 +89,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             namespace_id="0f2ac74b498b48028cb68387c421e279",
         )
-        assert_matches_type(Optional[MetadataGetResponse], metadata, path=["response"])
+        assert_matches_type(object, metadata, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -101,7 +102,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         metadata = await response.parse()
-        assert_matches_type(Optional[MetadataGetResponse], metadata, path=["response"])
+        assert_matches_type(object, metadata, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -114,7 +115,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             metadata = await response.parse()
-            assert_matches_type(Optional[MetadataGetResponse], metadata, path=["response"])
+            assert_matches_type(object, metadata, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/kv/namespaces/test_values.py b/tests/api_resources/kv/namespaces/test_values.py
index 376ec1960ef..7e8b58275dc 100644
--- a/tests/api_resources/kv/namespaces/test_values.py
+++ b/tests/api_resources/kv/namespaces/test_values.py
@@ -32,11 +32,24 @@ def test_method_update(self, client: Cloudflare) -> None:
             key_name="My-Key",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             namespace_id="0f2ac74b498b48028cb68387c421e279",
-            metadata='{"someMetadataKey": "someMetadataValue"}',
             value="Some Value",
         )
         assert_matches_type(Optional[ValueUpdateResponse], value, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        value = client.kv.namespaces.values.update(
+            key_name="My-Key",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            value="Some Value",
+            expiration=1578435000,
+            expiration_ttl=300,
+            metadata={},
+        )
+        assert_matches_type(Optional[ValueUpdateResponse], value, path=["response"])
+
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
@@ -44,7 +57,6 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
             key_name="My-Key",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             namespace_id="0f2ac74b498b48028cb68387c421e279",
-            metadata='{"someMetadataKey": "someMetadataValue"}',
             value="Some Value",
         )
 
@@ -60,7 +72,6 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
             key_name="My-Key",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             namespace_id="0f2ac74b498b48028cb68387c421e279",
-            metadata='{"someMetadataKey": "someMetadataValue"}',
             value="Some Value",
         ) as response:
             assert not response.is_closed
@@ -79,7 +90,6 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 key_name="My-Key",
                 account_id="",
                 namespace_id="0f2ac74b498b48028cb68387c421e279",
-                metadata='{"someMetadataKey": "someMetadataValue"}',
                 value="Some Value",
             )
 
@@ -88,7 +98,6 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 key_name="My-Key",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 namespace_id="",
-                metadata='{"someMetadataKey": "someMetadataValue"}',
                 value="Some Value",
             )
 
@@ -97,7 +106,6 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 key_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 namespace_id="0f2ac74b498b48028cb68387c421e279",
-                metadata='{"someMetadataKey": "someMetadataValue"}',
                 value="Some Value",
             )
 
@@ -245,7 +253,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncValues:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -254,11 +264,24 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
             key_name="My-Key",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             namespace_id="0f2ac74b498b48028cb68387c421e279",
-            metadata='{"someMetadataKey": "someMetadataValue"}',
             value="Some Value",
         )
         assert_matches_type(Optional[ValueUpdateResponse], value, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        value = await async_client.kv.namespaces.values.update(
+            key_name="My-Key",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            value="Some Value",
+            expiration=1578435000,
+            expiration_ttl=300,
+            metadata={},
+        )
+        assert_matches_type(Optional[ValueUpdateResponse], value, path=["response"])
+
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
@@ -266,7 +289,6 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
             key_name="My-Key",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             namespace_id="0f2ac74b498b48028cb68387c421e279",
-            metadata='{"someMetadataKey": "someMetadataValue"}',
             value="Some Value",
         )
 
@@ -282,7 +304,6 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
             key_name="My-Key",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             namespace_id="0f2ac74b498b48028cb68387c421e279",
-            metadata='{"someMetadataKey": "someMetadataValue"}',
             value="Some Value",
         ) as response:
             assert not response.is_closed
@@ -301,7 +322,6 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 key_name="My-Key",
                 account_id="",
                 namespace_id="0f2ac74b498b48028cb68387c421e279",
-                metadata='{"someMetadataKey": "someMetadataValue"}',
                 value="Some Value",
             )
 
@@ -310,7 +330,6 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 key_name="My-Key",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 namespace_id="",
-                metadata='{"someMetadataKey": "someMetadataValue"}',
                 value="Some Value",
             )
 
@@ -319,7 +338,6 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 key_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 namespace_id="0f2ac74b498b48028cb68387c421e279",
-                metadata='{"someMetadataKey": "someMetadataValue"}',
                 value="Some Value",
             )
 
diff --git a/tests/api_resources/kv/test_namespaces.py b/tests/api_resources/kv/test_namespaces.py
index aa2e9589dfe..56565db8a35 100644
--- a/tests/api_resources/kv/test_namespaces.py
+++ b/tests/api_resources/kv/test_namespaces.py
@@ -12,7 +12,9 @@
 from cloudflare.types.kv import (
     Namespace,
     NamespaceDeleteResponse,
-    NamespaceUpdateResponse,
+    NamespaceBulkGetResponse,
+    NamespaceBulkDeleteResponse,
+    NamespaceBulkUpdateResponse,
 )
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 
@@ -71,7 +73,7 @@ def test_method_update(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             title="My Own Namespace",
         )
-        assert_matches_type(Optional[NamespaceUpdateResponse], namespace, path=["response"])
+        assert_matches_type(Namespace, namespace, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
@@ -84,7 +86,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         namespace = response.parse()
-        assert_matches_type(Optional[NamespaceUpdateResponse], namespace, path=["response"])
+        assert_matches_type(Namespace, namespace, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
@@ -97,7 +99,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             namespace = response.parse()
-            assert_matches_type(Optional[NamespaceUpdateResponse], namespace, path=["response"])
+            assert_matches_type(Namespace, namespace, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -131,7 +133,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
             direction="asc",
             order="id",
             page=1,
-            per_page=5,
+            per_page=1,
         )
         assert_matches_type(SyncV4PagePaginationArray[Namespace], namespace, path=["response"])
 
@@ -214,6 +216,201 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @parametrize
+    def test_method_bulk_delete(self, client: Cloudflare) -> None:
+        namespace = client.kv.namespaces.bulk_delete(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=["My-Key"],
+        )
+        assert_matches_type(Optional[NamespaceBulkDeleteResponse], namespace, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_delete(self, client: Cloudflare) -> None:
+        response = client.kv.namespaces.with_raw_response.bulk_delete(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=["My-Key"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        namespace = response.parse()
+        assert_matches_type(Optional[NamespaceBulkDeleteResponse], namespace, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_delete(self, client: Cloudflare) -> None:
+        with client.kv.namespaces.with_streaming_response.bulk_delete(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=["My-Key"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            namespace = response.parse()
+            assert_matches_type(Optional[NamespaceBulkDeleteResponse], namespace, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.kv.namespaces.with_raw_response.bulk_delete(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="",
+                body=["My-Key"],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace_id` but received ''"):
+            client.kv.namespaces.with_raw_response.bulk_delete(
+                namespace_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=["My-Key"],
+            )
+
+    @parametrize
+    def test_method_bulk_get(self, client: Cloudflare) -> None:
+        namespace = client.kv.namespaces.bulk_get(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            keys=["My-Key"],
+        )
+        assert_matches_type(Optional[NamespaceBulkGetResponse], namespace, path=["response"])
+
+    @parametrize
+    def test_method_bulk_get_with_all_params(self, client: Cloudflare) -> None:
+        namespace = client.kv.namespaces.bulk_get(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            keys=["My-Key"],
+            type="text",
+            with_metadata=True,
+        )
+        assert_matches_type(Optional[NamespaceBulkGetResponse], namespace, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_get(self, client: Cloudflare) -> None:
+        response = client.kv.namespaces.with_raw_response.bulk_get(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            keys=["My-Key"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        namespace = response.parse()
+        assert_matches_type(Optional[NamespaceBulkGetResponse], namespace, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_get(self, client: Cloudflare) -> None:
+        with client.kv.namespaces.with_streaming_response.bulk_get(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            keys=["My-Key"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            namespace = response.parse()
+            assert_matches_type(Optional[NamespaceBulkGetResponse], namespace, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.kv.namespaces.with_raw_response.bulk_get(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="",
+                keys=["My-Key"],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace_id` but received ''"):
+            client.kv.namespaces.with_raw_response.bulk_get(
+                namespace_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                keys=["My-Key"],
+            )
+
+    @parametrize
+    def test_method_bulk_update(self, client: Cloudflare) -> None:
+        namespace = client.kv.namespaces.bulk_update(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "key": "My-Key",
+                    "value": "Some string",
+                }
+            ],
+        )
+        assert_matches_type(Optional[NamespaceBulkUpdateResponse], namespace, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_update(self, client: Cloudflare) -> None:
+        response = client.kv.namespaces.with_raw_response.bulk_update(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "key": "My-Key",
+                    "value": "Some string",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        namespace = response.parse()
+        assert_matches_type(Optional[NamespaceBulkUpdateResponse], namespace, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_update(self, client: Cloudflare) -> None:
+        with client.kv.namespaces.with_streaming_response.bulk_update(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "key": "My-Key",
+                    "value": "Some string",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            namespace = response.parse()
+            assert_matches_type(Optional[NamespaceBulkUpdateResponse], namespace, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.kv.namespaces.with_raw_response.bulk_update(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="",
+                body=[
+                    {
+                        "key": "My-Key",
+                        "value": "Some string",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace_id` but received ''"):
+            client.kv.namespaces.with_raw_response.bulk_update(
+                namespace_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[
+                    {
+                        "key": "My-Key",
+                        "value": "Some string",
+                    }
+                ],
+            )
+
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         namespace = client.kv.namespaces.get(
@@ -264,7 +461,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncNamespaces:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -315,7 +514,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             title="My Own Namespace",
         )
-        assert_matches_type(Optional[NamespaceUpdateResponse], namespace, path=["response"])
+        assert_matches_type(Namespace, namespace, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
@@ -328,7 +527,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         namespace = await response.parse()
-        assert_matches_type(Optional[NamespaceUpdateResponse], namespace, path=["response"])
+        assert_matches_type(Namespace, namespace, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
@@ -341,7 +540,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             namespace = await response.parse()
-            assert_matches_type(Optional[NamespaceUpdateResponse], namespace, path=["response"])
+            assert_matches_type(Namespace, namespace, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -375,7 +574,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
             direction="asc",
             order="id",
             page=1,
-            per_page=5,
+            per_page=1,
         )
         assert_matches_type(AsyncV4PagePaginationArray[Namespace], namespace, path=["response"])
 
@@ -458,6 +657,201 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @parametrize
+    async def test_method_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        namespace = await async_client.kv.namespaces.bulk_delete(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=["My-Key"],
+        )
+        assert_matches_type(Optional[NamespaceBulkDeleteResponse], namespace, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.kv.namespaces.with_raw_response.bulk_delete(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=["My-Key"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        namespace = await response.parse()
+        assert_matches_type(Optional[NamespaceBulkDeleteResponse], namespace, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.kv.namespaces.with_streaming_response.bulk_delete(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=["My-Key"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            namespace = await response.parse()
+            assert_matches_type(Optional[NamespaceBulkDeleteResponse], namespace, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.kv.namespaces.with_raw_response.bulk_delete(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="",
+                body=["My-Key"],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace_id` but received ''"):
+            await async_client.kv.namespaces.with_raw_response.bulk_delete(
+                namespace_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=["My-Key"],
+            )
+
+    @parametrize
+    async def test_method_bulk_get(self, async_client: AsyncCloudflare) -> None:
+        namespace = await async_client.kv.namespaces.bulk_get(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            keys=["My-Key"],
+        )
+        assert_matches_type(Optional[NamespaceBulkGetResponse], namespace, path=["response"])
+
+    @parametrize
+    async def test_method_bulk_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        namespace = await async_client.kv.namespaces.bulk_get(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            keys=["My-Key"],
+            type="text",
+            with_metadata=True,
+        )
+        assert_matches_type(Optional[NamespaceBulkGetResponse], namespace, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.kv.namespaces.with_raw_response.bulk_get(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            keys=["My-Key"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        namespace = await response.parse()
+        assert_matches_type(Optional[NamespaceBulkGetResponse], namespace, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.kv.namespaces.with_streaming_response.bulk_get(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            keys=["My-Key"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            namespace = await response.parse()
+            assert_matches_type(Optional[NamespaceBulkGetResponse], namespace, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.kv.namespaces.with_raw_response.bulk_get(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="",
+                keys=["My-Key"],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace_id` but received ''"):
+            await async_client.kv.namespaces.with_raw_response.bulk_get(
+                namespace_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                keys=["My-Key"],
+            )
+
+    @parametrize
+    async def test_method_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        namespace = await async_client.kv.namespaces.bulk_update(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "key": "My-Key",
+                    "value": "Some string",
+                }
+            ],
+        )
+        assert_matches_type(Optional[NamespaceBulkUpdateResponse], namespace, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.kv.namespaces.with_raw_response.bulk_update(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "key": "My-Key",
+                    "value": "Some string",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        namespace = await response.parse()
+        assert_matches_type(Optional[NamespaceBulkUpdateResponse], namespace, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.kv.namespaces.with_streaming_response.bulk_update(
+            namespace_id="0f2ac74b498b48028cb68387c421e279",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "key": "My-Key",
+                    "value": "Some string",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            namespace = await response.parse()
+            assert_matches_type(Optional[NamespaceBulkUpdateResponse], namespace, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.kv.namespaces.with_raw_response.bulk_update(
+                namespace_id="0f2ac74b498b48028cb68387c421e279",
+                account_id="",
+                body=[
+                    {
+                        "key": "My-Key",
+                        "value": "Some string",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace_id` but received ''"):
+            await async_client.kv.namespaces.with_raw_response.bulk_update(
+                namespace_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[
+                    {
+                        "key": "My-Key",
+                        "value": "Some string",
+                    }
+                ],
+            )
+
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         namespace = await async_client.kv.namespaces.get(
diff --git a/tests/api_resources/leaked_credential_checks/__init__.py b/tests/api_resources/leaked_credential_checks/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/leaked_credential_checks/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/leaked_credential_checks/test_detections.py b/tests/api_resources/leaked_credential_checks/test_detections.py
new file mode 100644
index 00000000000..baa8f0690af
--- /dev/null
+++ b/tests/api_resources/leaked_credential_checks/test_detections.py
@@ -0,0 +1,508 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.leaked_credential_checks import (
+    DetectionGetResponse,
+    DetectionListResponse,
+    DetectionCreateResponse,
+    DetectionUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestDetections:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        detection = client.leaked_credential_checks.detections.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(DetectionCreateResponse, detection, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        detection = client.leaked_credential_checks.detections.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            password='lookup_json_string(http.request.body.raw, "secret")',
+            username='lookup_json_string(http.request.body.raw, "user")',
+        )
+        assert_matches_type(DetectionCreateResponse, detection, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.leaked_credential_checks.detections.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        detection = response.parse()
+        assert_matches_type(DetectionCreateResponse, detection, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.leaked_credential_checks.detections.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            detection = response.parse()
+            assert_matches_type(DetectionCreateResponse, detection, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.leaked_credential_checks.detections.with_raw_response.create(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        detection = client.leaked_credential_checks.detections.update(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(DetectionUpdateResponse, detection, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        detection = client.leaked_credential_checks.detections.update(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            password='lookup_json_string(http.request.body.raw, "secret")',
+            username='lookup_json_string(http.request.body.raw, "user")',
+        )
+        assert_matches_type(DetectionUpdateResponse, detection, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.leaked_credential_checks.detections.with_raw_response.update(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        detection = response.parse()
+        assert_matches_type(DetectionUpdateResponse, detection, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.leaked_credential_checks.detections.with_streaming_response.update(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            detection = response.parse()
+            assert_matches_type(DetectionUpdateResponse, detection, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.leaked_credential_checks.detections.with_raw_response.update(
+                detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `detection_id` but received ''"):
+            client.leaked_credential_checks.detections.with_raw_response.update(
+                detection_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        detection = client.leaked_credential_checks.detections.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[DetectionListResponse], detection, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.leaked_credential_checks.detections.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        detection = response.parse()
+        assert_matches_type(SyncSinglePage[DetectionListResponse], detection, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.leaked_credential_checks.detections.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            detection = response.parse()
+            assert_matches_type(SyncSinglePage[DetectionListResponse], detection, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.leaked_credential_checks.detections.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        detection = client.leaked_credential_checks.detections.delete(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(object, detection, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.leaked_credential_checks.detections.with_raw_response.delete(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        detection = response.parse()
+        assert_matches_type(object, detection, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.leaked_credential_checks.detections.with_streaming_response.delete(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            detection = response.parse()
+            assert_matches_type(object, detection, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.leaked_credential_checks.detections.with_raw_response.delete(
+                detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `detection_id` but received ''"):
+            client.leaked_credential_checks.detections.with_raw_response.delete(
+                detection_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        detection = client.leaked_credential_checks.detections.get(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(DetectionGetResponse, detection, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.leaked_credential_checks.detections.with_raw_response.get(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        detection = response.parse()
+        assert_matches_type(DetectionGetResponse, detection, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.leaked_credential_checks.detections.with_streaming_response.get(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            detection = response.parse()
+            assert_matches_type(DetectionGetResponse, detection, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.leaked_credential_checks.detections.with_raw_response.get(
+                detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `detection_id` but received ''"):
+            client.leaked_credential_checks.detections.with_raw_response.get(
+                detection_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncDetections:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        detection = await async_client.leaked_credential_checks.detections.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(DetectionCreateResponse, detection, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        detection = await async_client.leaked_credential_checks.detections.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            password='lookup_json_string(http.request.body.raw, "secret")',
+            username='lookup_json_string(http.request.body.raw, "user")',
+        )
+        assert_matches_type(DetectionCreateResponse, detection, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.leaked_credential_checks.detections.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        detection = await response.parse()
+        assert_matches_type(DetectionCreateResponse, detection, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.leaked_credential_checks.detections.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            detection = await response.parse()
+            assert_matches_type(DetectionCreateResponse, detection, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.leaked_credential_checks.detections.with_raw_response.create(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        detection = await async_client.leaked_credential_checks.detections.update(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(DetectionUpdateResponse, detection, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        detection = await async_client.leaked_credential_checks.detections.update(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            password='lookup_json_string(http.request.body.raw, "secret")',
+            username='lookup_json_string(http.request.body.raw, "user")',
+        )
+        assert_matches_type(DetectionUpdateResponse, detection, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.leaked_credential_checks.detections.with_raw_response.update(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        detection = await response.parse()
+        assert_matches_type(DetectionUpdateResponse, detection, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.leaked_credential_checks.detections.with_streaming_response.update(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            detection = await response.parse()
+            assert_matches_type(DetectionUpdateResponse, detection, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.leaked_credential_checks.detections.with_raw_response.update(
+                detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `detection_id` but received ''"):
+            await async_client.leaked_credential_checks.detections.with_raw_response.update(
+                detection_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        detection = await async_client.leaked_credential_checks.detections.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[DetectionListResponse], detection, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.leaked_credential_checks.detections.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        detection = await response.parse()
+        assert_matches_type(AsyncSinglePage[DetectionListResponse], detection, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.leaked_credential_checks.detections.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            detection = await response.parse()
+            assert_matches_type(AsyncSinglePage[DetectionListResponse], detection, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.leaked_credential_checks.detections.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        detection = await async_client.leaked_credential_checks.detections.delete(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(object, detection, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.leaked_credential_checks.detections.with_raw_response.delete(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        detection = await response.parse()
+        assert_matches_type(object, detection, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.leaked_credential_checks.detections.with_streaming_response.delete(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            detection = await response.parse()
+            assert_matches_type(object, detection, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.leaked_credential_checks.detections.with_raw_response.delete(
+                detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `detection_id` but received ''"):
+            await async_client.leaked_credential_checks.detections.with_raw_response.delete(
+                detection_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        detection = await async_client.leaked_credential_checks.detections.get(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(DetectionGetResponse, detection, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.leaked_credential_checks.detections.with_raw_response.get(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        detection = await response.parse()
+        assert_matches_type(DetectionGetResponse, detection, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.leaked_credential_checks.detections.with_streaming_response.get(
+            detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            detection = await response.parse()
+            assert_matches_type(DetectionGetResponse, detection, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.leaked_credential_checks.detections.with_raw_response.get(
+                detection_id="18a14bafaa8eb1df04ce683ec18c765e",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `detection_id` but received ''"):
+            await async_client.leaked_credential_checks.detections.with_raw_response.get(
+                detection_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/load_balancers/monitors/test_previews.py b/tests/api_resources/load_balancers/monitors/test_previews.py
index 88087f7cac9..25aba3a816a 100644
--- a/tests/api_resources/load_balancers/monitors/test_previews.py
+++ b/tests/api_resources/load_balancers/monitors/test_previews.py
@@ -22,7 +22,6 @@ def test_method_create(self, client: Cloudflare) -> None:
         preview = client.load_balancers.monitors.previews.create(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
         assert_matches_type(PreviewCreateResponse, preview, path=["response"])
 
@@ -31,12 +30,12 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         preview = client.load_balancers.monitors.previews.create(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
             allow_insecure=True,
             consecutive_down=0,
             consecutive_up=0,
             description="Login page monitor",
             expected_body="alive",
+            expected_codes="2xx",
             follow_redirects=True,
             header={
                 "Host": ["example.com"],
@@ -58,7 +57,6 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.load_balancers.monitors.previews.with_raw_response.create(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
 
         assert response.is_closed is True
@@ -71,7 +69,6 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.load_balancers.monitors.previews.with_streaming_response.create(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -87,26 +84,25 @@ def test_path_params_create(self, client: Cloudflare) -> None:
             client.load_balancers.monitors.previews.with_raw_response.create(
                 monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
                 account_id="",
-                expected_codes="2xx",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `monitor_id` but received ''"):
             client.load_balancers.monitors.previews.with_raw_response.create(
                 monitor_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                expected_codes="2xx",
             )
 
 
 class TestAsyncPreviews:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         preview = await async_client.load_balancers.monitors.previews.create(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
         assert_matches_type(PreviewCreateResponse, preview, path=["response"])
 
@@ -115,12 +111,12 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
         preview = await async_client.load_balancers.monitors.previews.create(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
             allow_insecure=True,
             consecutive_down=0,
             consecutive_up=0,
             description="Login page monitor",
             expected_body="alive",
+            expected_codes="2xx",
             follow_redirects=True,
             header={
                 "Host": ["example.com"],
@@ -142,7 +138,6 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.load_balancers.monitors.previews.with_raw_response.create(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
 
         assert response.is_closed is True
@@ -155,7 +150,6 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
         async with async_client.load_balancers.monitors.previews.with_streaming_response.create(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -171,12 +165,10 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
             await async_client.load_balancers.monitors.previews.with_raw_response.create(
                 monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
                 account_id="",
-                expected_codes="2xx",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `monitor_id` but received ''"):
             await async_client.load_balancers.monitors.previews.with_raw_response.create(
                 monitor_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                expected_codes="2xx",
             )
diff --git a/tests/api_resources/load_balancers/monitors/test_references.py b/tests/api_resources/load_balancers/monitors/test_references.py
index 58c8dcd21b2..11f3553bf4b 100644
--- a/tests/api_resources/load_balancers/monitors/test_references.py
+++ b/tests/api_resources/load_balancers/monitors/test_references.py
@@ -3,12 +3,13 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.load_balancers.monitors import ReferenceGetResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -23,7 +24,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ReferenceGetResponse], reference, path=["response"])
+        assert_matches_type(SyncSinglePage[ReferenceGetResponse], reference, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -35,7 +36,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         reference = response.parse()
-        assert_matches_type(Optional[ReferenceGetResponse], reference, path=["response"])
+        assert_matches_type(SyncSinglePage[ReferenceGetResponse], reference, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -47,7 +48,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             reference = response.parse()
-            assert_matches_type(Optional[ReferenceGetResponse], reference, path=["response"])
+            assert_matches_type(SyncSinglePage[ReferenceGetResponse], reference, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -67,7 +68,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncReferences:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -75,7 +78,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ReferenceGetResponse], reference, path=["response"])
+        assert_matches_type(AsyncSinglePage[ReferenceGetResponse], reference, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -87,7 +90,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         reference = await response.parse()
-        assert_matches_type(Optional[ReferenceGetResponse], reference, path=["response"])
+        assert_matches_type(AsyncSinglePage[ReferenceGetResponse], reference, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -99,7 +102,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             reference = await response.parse()
-            assert_matches_type(Optional[ReferenceGetResponse], reference, path=["response"])
+            assert_matches_type(AsyncSinglePage[ReferenceGetResponse], reference, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/load_balancers/pools/test_health.py b/tests/api_resources/load_balancers/pools/test_health.py
index eba8b0346db..132196347d6 100644
--- a/tests/api_resources/load_balancers/pools/test_health.py
+++ b/tests/api_resources/load_balancers/pools/test_health.py
@@ -22,7 +22,6 @@ def test_method_create(self, client: Cloudflare) -> None:
         health = client.load_balancers.pools.health.create(
             pool_id="17b5962d775c646f3f9725cbc7a53df4",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
         assert_matches_type(HealthCreateResponse, health, path=["response"])
 
@@ -31,12 +30,12 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         health = client.load_balancers.pools.health.create(
             pool_id="17b5962d775c646f3f9725cbc7a53df4",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
             allow_insecure=True,
             consecutive_down=0,
             consecutive_up=0,
             description="Login page monitor",
             expected_body="alive",
+            expected_codes="2xx",
             follow_redirects=True,
             header={
                 "Host": ["example.com"],
@@ -58,7 +57,6 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.load_balancers.pools.health.with_raw_response.create(
             pool_id="17b5962d775c646f3f9725cbc7a53df4",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
 
         assert response.is_closed is True
@@ -71,7 +69,6 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.load_balancers.pools.health.with_streaming_response.create(
             pool_id="17b5962d775c646f3f9725cbc7a53df4",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -87,14 +84,12 @@ def test_path_params_create(self, client: Cloudflare) -> None:
             client.load_balancers.pools.health.with_raw_response.create(
                 pool_id="17b5962d775c646f3f9725cbc7a53df4",
                 account_id="",
-                expected_codes="2xx",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `pool_id` but received ''"):
             client.load_balancers.pools.health.with_raw_response.create(
                 pool_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                expected_codes="2xx",
             )
 
     @parametrize
@@ -147,14 +142,15 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncHealth:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         health = await async_client.load_balancers.pools.health.create(
             pool_id="17b5962d775c646f3f9725cbc7a53df4",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
         assert_matches_type(HealthCreateResponse, health, path=["response"])
 
@@ -163,12 +159,12 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
         health = await async_client.load_balancers.pools.health.create(
             pool_id="17b5962d775c646f3f9725cbc7a53df4",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
             allow_insecure=True,
             consecutive_down=0,
             consecutive_up=0,
             description="Login page monitor",
             expected_body="alive",
+            expected_codes="2xx",
             follow_redirects=True,
             header={
                 "Host": ["example.com"],
@@ -190,7 +186,6 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.load_balancers.pools.health.with_raw_response.create(
             pool_id="17b5962d775c646f3f9725cbc7a53df4",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
 
         assert response.is_closed is True
@@ -203,7 +198,6 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
         async with async_client.load_balancers.pools.health.with_streaming_response.create(
             pool_id="17b5962d775c646f3f9725cbc7a53df4",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -219,14 +213,12 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
             await async_client.load_balancers.pools.health.with_raw_response.create(
                 pool_id="17b5962d775c646f3f9725cbc7a53df4",
                 account_id="",
-                expected_codes="2xx",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `pool_id` but received ''"):
             await async_client.load_balancers.pools.health.with_raw_response.create(
                 pool_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                expected_codes="2xx",
             )
 
     @parametrize
diff --git a/tests/api_resources/load_balancers/pools/test_references.py b/tests/api_resources/load_balancers/pools/test_references.py
index cde06313f61..33509c209d5 100644
--- a/tests/api_resources/load_balancers/pools/test_references.py
+++ b/tests/api_resources/load_balancers/pools/test_references.py
@@ -3,12 +3,13 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.load_balancers.pools import ReferenceGetResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -23,7 +24,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             pool_id="17b5962d775c646f3f9725cbc7a53df4",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ReferenceGetResponse], reference, path=["response"])
+        assert_matches_type(SyncSinglePage[ReferenceGetResponse], reference, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -35,7 +36,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         reference = response.parse()
-        assert_matches_type(Optional[ReferenceGetResponse], reference, path=["response"])
+        assert_matches_type(SyncSinglePage[ReferenceGetResponse], reference, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -47,7 +48,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             reference = response.parse()
-            assert_matches_type(Optional[ReferenceGetResponse], reference, path=["response"])
+            assert_matches_type(SyncSinglePage[ReferenceGetResponse], reference, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -67,7 +68,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncReferences:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -75,7 +78,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             pool_id="17b5962d775c646f3f9725cbc7a53df4",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ReferenceGetResponse], reference, path=["response"])
+        assert_matches_type(AsyncSinglePage[ReferenceGetResponse], reference, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -87,7 +90,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         reference = await response.parse()
-        assert_matches_type(Optional[ReferenceGetResponse], reference, path=["response"])
+        assert_matches_type(AsyncSinglePage[ReferenceGetResponse], reference, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -99,7 +102,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             reference = await response.parse()
-            assert_matches_type(Optional[ReferenceGetResponse], reference, path=["response"])
+            assert_matches_type(AsyncSinglePage[ReferenceGetResponse], reference, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/load_balancers/test_monitor_groups.py b/tests/api_resources/load_balancers/test_monitor_groups.py
new file mode 100644
index 00000000000..7c9ecf52ac8
--- /dev/null
+++ b/tests/api_resources/load_balancers/test_monitor_groups.py
@@ -0,0 +1,843 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.load_balancers import (
+    MonitorGroup,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestMonitorGroups:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        monitor_group = client.load_balancers.monitor_groups.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="id",
+            description="Primary datacenter monitors",
+            members=[
+                {
+                    "enabled": True,
+                    "monitor_id": "monitor_id",
+                    "monitoring_only": False,
+                    "must_be_healthy": True,
+                }
+            ],
+        )
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.load_balancers.monitor_groups.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="id",
+            description="Primary datacenter monitors",
+            members=[
+                {
+                    "enabled": True,
+                    "monitor_id": "monitor_id",
+                    "monitoring_only": False,
+                    "must_be_healthy": True,
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        monitor_group = response.parse()
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.load_balancers.monitor_groups.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="id",
+            description="Primary datacenter monitors",
+            members=[
+                {
+                    "enabled": True,
+                    "monitor_id": "monitor_id",
+                    "monitoring_only": False,
+                    "must_be_healthy": True,
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            monitor_group = response.parse()
+            assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.load_balancers.monitor_groups.with_raw_response.create(
+                account_id="",
+                id="id",
+                description="Primary datacenter monitors",
+                members=[
+                    {
+                        "enabled": True,
+                        "monitor_id": "monitor_id",
+                        "monitoring_only": False,
+                        "must_be_healthy": True,
+                    }
+                ],
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        monitor_group = client.load_balancers.monitor_groups.update(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="id",
+            description="Primary datacenter monitors",
+            members=[
+                {
+                    "enabled": True,
+                    "monitor_id": "monitor_id",
+                    "monitoring_only": False,
+                    "must_be_healthy": True,
+                }
+            ],
+        )
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.load_balancers.monitor_groups.with_raw_response.update(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="id",
+            description="Primary datacenter monitors",
+            members=[
+                {
+                    "enabled": True,
+                    "monitor_id": "monitor_id",
+                    "monitoring_only": False,
+                    "must_be_healthy": True,
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        monitor_group = response.parse()
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.load_balancers.monitor_groups.with_streaming_response.update(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="id",
+            description="Primary datacenter monitors",
+            members=[
+                {
+                    "enabled": True,
+                    "monitor_id": "monitor_id",
+                    "monitoring_only": False,
+                    "must_be_healthy": True,
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            monitor_group = response.parse()
+            assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.load_balancers.monitor_groups.with_raw_response.update(
+                monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+                account_id="",
+                id="id",
+                description="Primary datacenter monitors",
+                members=[
+                    {
+                        "enabled": True,
+                        "monitor_id": "monitor_id",
+                        "monitoring_only": False,
+                        "must_be_healthy": True,
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `monitor_group_id` but received ''"):
+            client.load_balancers.monitor_groups.with_raw_response.update(
+                monitor_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                id="id",
+                description="Primary datacenter monitors",
+                members=[
+                    {
+                        "enabled": True,
+                        "monitor_id": "monitor_id",
+                        "monitoring_only": False,
+                        "must_be_healthy": True,
+                    }
+                ],
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        monitor_group = client.load_balancers.monitor_groups.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[MonitorGroup], monitor_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.load_balancers.monitor_groups.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        monitor_group = response.parse()
+        assert_matches_type(SyncSinglePage[MonitorGroup], monitor_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.load_balancers.monitor_groups.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            monitor_group = response.parse()
+            assert_matches_type(SyncSinglePage[MonitorGroup], monitor_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.load_balancers.monitor_groups.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        monitor_group = client.load_balancers.monitor_groups.delete(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.load_balancers.monitor_groups.with_raw_response.delete(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        monitor_group = response.parse()
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.load_balancers.monitor_groups.with_streaming_response.delete(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            monitor_group = response.parse()
+            assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.load_balancers.monitor_groups.with_raw_response.delete(
+                monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `monitor_group_id` but received ''"):
+            client.load_balancers.monitor_groups.with_raw_response.delete(
+                monitor_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        monitor_group = client.load_balancers.monitor_groups.edit(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="id",
+            description="Primary datacenter monitors",
+            members=[
+                {
+                    "enabled": True,
+                    "monitor_id": "monitor_id",
+                    "monitoring_only": False,
+                    "must_be_healthy": True,
+                }
+            ],
+        )
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.load_balancers.monitor_groups.with_raw_response.edit(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="id",
+            description="Primary datacenter monitors",
+            members=[
+                {
+                    "enabled": True,
+                    "monitor_id": "monitor_id",
+                    "monitoring_only": False,
+                    "must_be_healthy": True,
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        monitor_group = response.parse()
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.load_balancers.monitor_groups.with_streaming_response.edit(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="id",
+            description="Primary datacenter monitors",
+            members=[
+                {
+                    "enabled": True,
+                    "monitor_id": "monitor_id",
+                    "monitoring_only": False,
+                    "must_be_healthy": True,
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            monitor_group = response.parse()
+            assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.load_balancers.monitor_groups.with_raw_response.edit(
+                monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+                account_id="",
+                id="id",
+                description="Primary datacenter monitors",
+                members=[
+                    {
+                        "enabled": True,
+                        "monitor_id": "monitor_id",
+                        "monitoring_only": False,
+                        "must_be_healthy": True,
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `monitor_group_id` but received ''"):
+            client.load_balancers.monitor_groups.with_raw_response.edit(
+                monitor_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                id="id",
+                description="Primary datacenter monitors",
+                members=[
+                    {
+                        "enabled": True,
+                        "monitor_id": "monitor_id",
+                        "monitoring_only": False,
+                        "must_be_healthy": True,
+                    }
+                ],
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        monitor_group = client.load_balancers.monitor_groups.get(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.load_balancers.monitor_groups.with_raw_response.get(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        monitor_group = response.parse()
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.load_balancers.monitor_groups.with_streaming_response.get(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            monitor_group = response.parse()
+            assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.load_balancers.monitor_groups.with_raw_response.get(
+                monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `monitor_group_id` but received ''"):
+            client.load_balancers.monitor_groups.with_raw_response.get(
+                monitor_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncMonitorGroups:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        monitor_group = await async_client.load_balancers.monitor_groups.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="id",
+            description="Primary datacenter monitors",
+            members=[
+                {
+                    "enabled": True,
+                    "monitor_id": "monitor_id",
+                    "monitoring_only": False,
+                    "must_be_healthy": True,
+                }
+            ],
+        )
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.load_balancers.monitor_groups.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="id",
+            description="Primary datacenter monitors",
+            members=[
+                {
+                    "enabled": True,
+                    "monitor_id": "monitor_id",
+                    "monitoring_only": False,
+                    "must_be_healthy": True,
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        monitor_group = await response.parse()
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.load_balancers.monitor_groups.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="id",
+            description="Primary datacenter monitors",
+            members=[
+                {
+                    "enabled": True,
+                    "monitor_id": "monitor_id",
+                    "monitoring_only": False,
+                    "must_be_healthy": True,
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            monitor_group = await response.parse()
+            assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.load_balancers.monitor_groups.with_raw_response.create(
+                account_id="",
+                id="id",
+                description="Primary datacenter monitors",
+                members=[
+                    {
+                        "enabled": True,
+                        "monitor_id": "monitor_id",
+                        "monitoring_only": False,
+                        "must_be_healthy": True,
+                    }
+                ],
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        monitor_group = await async_client.load_balancers.monitor_groups.update(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="id",
+            description="Primary datacenter monitors",
+            members=[
+                {
+                    "enabled": True,
+                    "monitor_id": "monitor_id",
+                    "monitoring_only": False,
+                    "must_be_healthy": True,
+                }
+            ],
+        )
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.load_balancers.monitor_groups.with_raw_response.update(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="id",
+            description="Primary datacenter monitors",
+            members=[
+                {
+                    "enabled": True,
+                    "monitor_id": "monitor_id",
+                    "monitoring_only": False,
+                    "must_be_healthy": True,
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        monitor_group = await response.parse()
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.load_balancers.monitor_groups.with_streaming_response.update(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="id",
+            description="Primary datacenter monitors",
+            members=[
+                {
+                    "enabled": True,
+                    "monitor_id": "monitor_id",
+                    "monitoring_only": False,
+                    "must_be_healthy": True,
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            monitor_group = await response.parse()
+            assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.load_balancers.monitor_groups.with_raw_response.update(
+                monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+                account_id="",
+                id="id",
+                description="Primary datacenter monitors",
+                members=[
+                    {
+                        "enabled": True,
+                        "monitor_id": "monitor_id",
+                        "monitoring_only": False,
+                        "must_be_healthy": True,
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `monitor_group_id` but received ''"):
+            await async_client.load_balancers.monitor_groups.with_raw_response.update(
+                monitor_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                id="id",
+                description="Primary datacenter monitors",
+                members=[
+                    {
+                        "enabled": True,
+                        "monitor_id": "monitor_id",
+                        "monitoring_only": False,
+                        "must_be_healthy": True,
+                    }
+                ],
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        monitor_group = await async_client.load_balancers.monitor_groups.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[MonitorGroup], monitor_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.load_balancers.monitor_groups.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        monitor_group = await response.parse()
+        assert_matches_type(AsyncSinglePage[MonitorGroup], monitor_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.load_balancers.monitor_groups.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            monitor_group = await response.parse()
+            assert_matches_type(AsyncSinglePage[MonitorGroup], monitor_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.load_balancers.monitor_groups.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        monitor_group = await async_client.load_balancers.monitor_groups.delete(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.load_balancers.monitor_groups.with_raw_response.delete(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        monitor_group = await response.parse()
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.load_balancers.monitor_groups.with_streaming_response.delete(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            monitor_group = await response.parse()
+            assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.load_balancers.monitor_groups.with_raw_response.delete(
+                monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `monitor_group_id` but received ''"):
+            await async_client.load_balancers.monitor_groups.with_raw_response.delete(
+                monitor_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        monitor_group = await async_client.load_balancers.monitor_groups.edit(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="id",
+            description="Primary datacenter monitors",
+            members=[
+                {
+                    "enabled": True,
+                    "monitor_id": "monitor_id",
+                    "monitoring_only": False,
+                    "must_be_healthy": True,
+                }
+            ],
+        )
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.load_balancers.monitor_groups.with_raw_response.edit(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="id",
+            description="Primary datacenter monitors",
+            members=[
+                {
+                    "enabled": True,
+                    "monitor_id": "monitor_id",
+                    "monitoring_only": False,
+                    "must_be_healthy": True,
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        monitor_group = await response.parse()
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.load_balancers.monitor_groups.with_streaming_response.edit(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="id",
+            description="Primary datacenter monitors",
+            members=[
+                {
+                    "enabled": True,
+                    "monitor_id": "monitor_id",
+                    "monitoring_only": False,
+                    "must_be_healthy": True,
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            monitor_group = await response.parse()
+            assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.load_balancers.monitor_groups.with_raw_response.edit(
+                monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+                account_id="",
+                id="id",
+                description="Primary datacenter monitors",
+                members=[
+                    {
+                        "enabled": True,
+                        "monitor_id": "monitor_id",
+                        "monitoring_only": False,
+                        "must_be_healthy": True,
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `monitor_group_id` but received ''"):
+            await async_client.load_balancers.monitor_groups.with_raw_response.edit(
+                monitor_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                id="id",
+                description="Primary datacenter monitors",
+                members=[
+                    {
+                        "enabled": True,
+                        "monitor_id": "monitor_id",
+                        "monitoring_only": False,
+                        "must_be_healthy": True,
+                    }
+                ],
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        monitor_group = await async_client.load_balancers.monitor_groups.get(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.load_balancers.monitor_groups.with_raw_response.get(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        monitor_group = await response.parse()
+        assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.load_balancers.monitor_groups.with_streaming_response.get(
+            monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            monitor_group = await response.parse()
+            assert_matches_type(MonitorGroup, monitor_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.load_balancers.monitor_groups.with_raw_response.get(
+                monitor_group_id="17b5962d775c646f3f9725cbc7a53df4",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `monitor_group_id` but received ''"):
+            await async_client.load_balancers.monitor_groups.with_raw_response.get(
+                monitor_group_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/load_balancers/test_monitors.py b/tests/api_resources/load_balancers/test_monitors.py
index 051a99da886..8f6468e4245 100644
--- a/tests/api_resources/load_balancers/test_monitors.py
+++ b/tests/api_resources/load_balancers/test_monitors.py
@@ -25,7 +25,6 @@ class TestMonitors:
     def test_method_create(self, client: Cloudflare) -> None:
         monitor = client.load_balancers.monitors.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
         assert_matches_type(Monitor, monitor, path=["response"])
 
@@ -33,12 +32,12 @@ def test_method_create(self, client: Cloudflare) -> None:
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         monitor = client.load_balancers.monitors.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
             allow_insecure=True,
             consecutive_down=0,
             consecutive_up=0,
             description="Login page monitor",
             expected_body="alive",
+            expected_codes="2xx",
             follow_redirects=True,
             header={
                 "Host": ["example.com"],
@@ -59,7 +58,6 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.load_balancers.monitors.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
 
         assert response.is_closed is True
@@ -71,7 +69,6 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.load_balancers.monitors.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -86,7 +83,6 @@ def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.load_balancers.monitors.with_raw_response.create(
                 account_id="",
-                expected_codes="2xx",
             )
 
     @parametrize
@@ -94,7 +90,6 @@ def test_method_update(self, client: Cloudflare) -> None:
         monitor = client.load_balancers.monitors.update(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
         assert_matches_type(Monitor, monitor, path=["response"])
 
@@ -103,12 +98,12 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         monitor = client.load_balancers.monitors.update(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
             allow_insecure=True,
             consecutive_down=0,
             consecutive_up=0,
             description="Login page monitor",
             expected_body="alive",
+            expected_codes="2xx",
             follow_redirects=True,
             header={
                 "Host": ["example.com"],
@@ -130,7 +125,6 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.load_balancers.monitors.with_raw_response.update(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
 
         assert response.is_closed is True
@@ -143,7 +137,6 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.load_balancers.monitors.with_streaming_response.update(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -159,14 +152,12 @@ def test_path_params_update(self, client: Cloudflare) -> None:
             client.load_balancers.monitors.with_raw_response.update(
                 monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
                 account_id="",
-                expected_codes="2xx",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `monitor_id` but received ''"):
             client.load_balancers.monitors.with_raw_response.update(
                 monitor_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                expected_codes="2xx",
             )
 
     @parametrize
@@ -260,7 +251,6 @@ def test_method_edit(self, client: Cloudflare) -> None:
         monitor = client.load_balancers.monitors.edit(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
         assert_matches_type(Monitor, monitor, path=["response"])
 
@@ -269,12 +259,12 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
         monitor = client.load_balancers.monitors.edit(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
             allow_insecure=True,
             consecutive_down=0,
             consecutive_up=0,
             description="Login page monitor",
             expected_body="alive",
+            expected_codes="2xx",
             follow_redirects=True,
             header={
                 "Host": ["example.com"],
@@ -296,7 +286,6 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
         response = client.load_balancers.monitors.with_raw_response.edit(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
 
         assert response.is_closed is True
@@ -309,7 +298,6 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
         with client.load_balancers.monitors.with_streaming_response.edit(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -325,14 +313,12 @@ def test_path_params_edit(self, client: Cloudflare) -> None:
             client.load_balancers.monitors.with_raw_response.edit(
                 monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
                 account_id="",
-                expected_codes="2xx",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `monitor_id` but received ''"):
             client.load_balancers.monitors.with_raw_response.edit(
                 monitor_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                expected_codes="2xx",
             )
 
     @parametrize
@@ -385,13 +371,14 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncMonitors:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         monitor = await async_client.load_balancers.monitors.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
         assert_matches_type(Monitor, monitor, path=["response"])
 
@@ -399,12 +386,12 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         monitor = await async_client.load_balancers.monitors.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
             allow_insecure=True,
             consecutive_down=0,
             consecutive_up=0,
             description="Login page monitor",
             expected_body="alive",
+            expected_codes="2xx",
             follow_redirects=True,
             header={
                 "Host": ["example.com"],
@@ -425,7 +412,6 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.load_balancers.monitors.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
 
         assert response.is_closed is True
@@ -437,7 +423,6 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.load_balancers.monitors.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -452,7 +437,6 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.load_balancers.monitors.with_raw_response.create(
                 account_id="",
-                expected_codes="2xx",
             )
 
     @parametrize
@@ -460,7 +444,6 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         monitor = await async_client.load_balancers.monitors.update(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
         assert_matches_type(Monitor, monitor, path=["response"])
 
@@ -469,12 +452,12 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
         monitor = await async_client.load_balancers.monitors.update(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
             allow_insecure=True,
             consecutive_down=0,
             consecutive_up=0,
             description="Login page monitor",
             expected_body="alive",
+            expected_codes="2xx",
             follow_redirects=True,
             header={
                 "Host": ["example.com"],
@@ -496,7 +479,6 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.load_balancers.monitors.with_raw_response.update(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
 
         assert response.is_closed is True
@@ -509,7 +491,6 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
         async with async_client.load_balancers.monitors.with_streaming_response.update(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -525,14 +506,12 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
             await async_client.load_balancers.monitors.with_raw_response.update(
                 monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
                 account_id="",
-                expected_codes="2xx",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `monitor_id` but received ''"):
             await async_client.load_balancers.monitors.with_raw_response.update(
                 monitor_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                expected_codes="2xx",
             )
 
     @parametrize
@@ -626,7 +605,6 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
         monitor = await async_client.load_balancers.monitors.edit(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
         assert_matches_type(Monitor, monitor, path=["response"])
 
@@ -635,12 +613,12 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
         monitor = await async_client.load_balancers.monitors.edit(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
             allow_insecure=True,
             consecutive_down=0,
             consecutive_up=0,
             description="Login page monitor",
             expected_body="alive",
+            expected_codes="2xx",
             follow_redirects=True,
             header={
                 "Host": ["example.com"],
@@ -662,7 +640,6 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.load_balancers.monitors.with_raw_response.edit(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         )
 
         assert response.is_closed is True
@@ -675,7 +652,6 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
         async with async_client.load_balancers.monitors.with_streaming_response.edit(
             monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            expected_codes="2xx",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -691,14 +667,12 @@ async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
             await async_client.load_balancers.monitors.with_raw_response.edit(
                 monitor_id="f1aba936b94213e5b8dca0c0dbf1f9cc",
                 account_id="",
-                expected_codes="2xx",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `monitor_id` but received ''"):
             await async_client.load_balancers.monitors.with_raw_response.edit(
                 monitor_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                expected_codes="2xx",
             )
 
     @parametrize
diff --git a/tests/api_resources/load_balancers/test_pools.py b/tests/api_resources/load_balancers/test_pools.py
index 7d82191846e..95c9457cce2 100644
--- a/tests/api_resources/load_balancers/test_pools.py
+++ b/tests/api_resources/load_balancers/test_pools.py
@@ -26,7 +26,7 @@ def test_method_create(self, client: Cloudflare) -> None:
         pool = client.load_balancers.pools.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="primary-dc-1",
-            origins=[{}, {}, {}],
+            origins=[{}],
         )
         assert_matches_type(Pool, pool, path=["response"])
 
@@ -39,27 +39,12 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                 {
                     "address": "0.0.0.0",
                     "enabled": True,
-                    "header": {"host": ["example.com", "example.com", "example.com"]},
+                    "header": {"host": ["example.com"]},
                     "name": "app-server-1",
+                    "port": 0,
                     "virtual_network_id": "a5624d4e-044a-4ff0-b3e1-e2465353d4b4",
                     "weight": 0.6,
-                },
-                {
-                    "address": "0.0.0.0",
-                    "enabled": True,
-                    "header": {"host": ["example.com", "example.com", "example.com"]},
-                    "name": "app-server-1",
-                    "virtual_network_id": "a5624d4e-044a-4ff0-b3e1-e2465353d4b4",
-                    "weight": 0.6,
-                },
-                {
-                    "address": "0.0.0.0",
-                    "enabled": True,
-                    "header": {"host": ["example.com", "example.com", "example.com"]},
-                    "name": "app-server-1",
-                    "virtual_network_id": "a5624d4e-044a-4ff0-b3e1-e2465353d4b4",
-                    "weight": 0.6,
-                },
+                }
             ],
             description="Primary data center - Provider XYZ",
             enabled=False,
@@ -72,7 +57,8 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             },
             longitude=0,
             minimum_origins=0,
-            monitor={},
+            monitor="monitor",
+            monitor_group="monitor_group",
             notification_email="someone@example.com,sometwo@example.com",
             notification_filter={
                 "origin": {
@@ -93,7 +79,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.load_balancers.pools.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="primary-dc-1",
-            origins=[{}, {}, {}],
+            origins=[{}],
         )
 
         assert response.is_closed is True
@@ -106,7 +92,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.load_balancers.pools.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="primary-dc-1",
-            origins=[{}, {}, {}],
+            origins=[{}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -122,7 +108,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
             client.load_balancers.pools.with_raw_response.create(
                 account_id="",
                 name="primary-dc-1",
-                origins=[{}, {}, {}],
+                origins=[{}],
             )
 
     @parametrize
@@ -131,7 +117,7 @@ def test_method_update(self, client: Cloudflare) -> None:
             pool_id="17b5962d775c646f3f9725cbc7a53df4",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="primary-dc-1",
-            origins=[{}, {}, {}],
+            origins=[{}],
         )
         assert_matches_type(Pool, pool, path=["response"])
 
@@ -145,27 +131,12 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                 {
                     "address": "0.0.0.0",
                     "enabled": True,
-                    "header": {"host": ["example.com", "example.com", "example.com"]},
-                    "name": "app-server-1",
-                    "virtual_network_id": "a5624d4e-044a-4ff0-b3e1-e2465353d4b4",
-                    "weight": 0.6,
-                },
-                {
-                    "address": "0.0.0.0",
-                    "enabled": True,
-                    "header": {"host": ["example.com", "example.com", "example.com"]},
-                    "name": "app-server-1",
-                    "virtual_network_id": "a5624d4e-044a-4ff0-b3e1-e2465353d4b4",
-                    "weight": 0.6,
-                },
-                {
-                    "address": "0.0.0.0",
-                    "enabled": True,
-                    "header": {"host": ["example.com", "example.com", "example.com"]},
+                    "header": {"host": ["example.com"]},
                     "name": "app-server-1",
+                    "port": 0,
                     "virtual_network_id": "a5624d4e-044a-4ff0-b3e1-e2465353d4b4",
                     "weight": 0.6,
-                },
+                }
             ],
             check_regions=["WEU", "ENAM"],
             description="Primary data center - Provider XYZ",
@@ -179,7 +150,8 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             },
             longitude=0,
             minimum_origins=0,
-            monitor={},
+            monitor="monitor",
+            monitor_group="monitor_group",
             notification_email="someone@example.com,sometwo@example.com",
             notification_filter={
                 "origin": {
@@ -201,7 +173,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
             pool_id="17b5962d775c646f3f9725cbc7a53df4",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="primary-dc-1",
-            origins=[{}, {}, {}],
+            origins=[{}],
         )
 
         assert response.is_closed is True
@@ -215,7 +187,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
             pool_id="17b5962d775c646f3f9725cbc7a53df4",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="primary-dc-1",
-            origins=[{}, {}, {}],
+            origins=[{}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -232,7 +204,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 pool_id="17b5962d775c646f3f9725cbc7a53df4",
                 account_id="",
                 name="primary-dc-1",
-                origins=[{}, {}, {}],
+                origins=[{}],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `pool_id` but received ''"):
@@ -240,7 +212,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 pool_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 name="primary-dc-1",
-                origins=[{}, {}, {}],
+                origins=[{}],
             )
 
     @parametrize
@@ -254,7 +226,7 @@ def test_method_list(self, client: Cloudflare) -> None:
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         pool = client.load_balancers.pools.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            monitor={},
+            monitor="monitor",
         )
         assert_matches_type(SyncSinglePage[Pool], pool, path=["response"])
 
@@ -337,6 +309,57 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @pytest.mark.skip(reason="TODO: Investigate 422 Unprocessable Entity in prism test")
+    @parametrize
+    def test_method_bulk_edit(self, client: Cloudflare) -> None:
+        pool = client.load_balancers.pools.bulk_edit(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[Pool], pool, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: Investigate 422 Unprocessable Entity in prism test")
+    @parametrize
+    def test_method_bulk_edit_with_all_params(self, client: Cloudflare) -> None:
+        pool = client.load_balancers.pools.bulk_edit(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            notification_email="",
+        )
+        assert_matches_type(SyncSinglePage[Pool], pool, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: Investigate 422 Unprocessable Entity in prism test")
+    @parametrize
+    def test_raw_response_bulk_edit(self, client: Cloudflare) -> None:
+        response = client.load_balancers.pools.with_raw_response.bulk_edit(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pool = response.parse()
+        assert_matches_type(SyncSinglePage[Pool], pool, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: Investigate 422 Unprocessable Entity in prism test")
+    @parametrize
+    def test_streaming_response_bulk_edit(self, client: Cloudflare) -> None:
+        with client.load_balancers.pools.with_streaming_response.bulk_edit(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pool = response.parse()
+            assert_matches_type(SyncSinglePage[Pool], pool, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: Investigate 422 Unprocessable Entity in prism test")
+    @parametrize
+    def test_path_params_bulk_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.load_balancers.pools.with_raw_response.bulk_edit(
+                account_id="",
+            )
+
     @parametrize
     def test_method_edit(self, client: Cloudflare) -> None:
         pool = client.load_balancers.pools.edit(
@@ -362,7 +385,8 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
             },
             longitude=0,
             minimum_origins=0,
-            monitor={},
+            monitor="monitor",
+            monitor_group="monitor_group",
             name="primary-dc-1",
             notification_email="someone@example.com,sometwo@example.com",
             notification_filter={
@@ -380,27 +404,12 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
                 {
                     "address": "0.0.0.0",
                     "enabled": True,
-                    "header": {"host": ["example.com", "example.com", "example.com"]},
-                    "name": "app-server-1",
-                    "virtual_network_id": "a5624d4e-044a-4ff0-b3e1-e2465353d4b4",
-                    "weight": 0.6,
-                },
-                {
-                    "address": "0.0.0.0",
-                    "enabled": True,
-                    "header": {"host": ["example.com", "example.com", "example.com"]},
-                    "name": "app-server-1",
-                    "virtual_network_id": "a5624d4e-044a-4ff0-b3e1-e2465353d4b4",
-                    "weight": 0.6,
-                },
-                {
-                    "address": "0.0.0.0",
-                    "enabled": True,
-                    "header": {"host": ["example.com", "example.com", "example.com"]},
+                    "header": {"host": ["example.com"]},
                     "name": "app-server-1",
+                    "port": 0,
                     "virtual_network_id": "a5624d4e-044a-4ff0-b3e1-e2465353d4b4",
                     "weight": 0.6,
-                },
+                }
             ],
         )
         assert_matches_type(Pool, pool, path=["response"])
@@ -495,14 +504,16 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncPools:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         pool = await async_client.load_balancers.pools.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="primary-dc-1",
-            origins=[{}, {}, {}],
+            origins=[{}],
         )
         assert_matches_type(Pool, pool, path=["response"])
 
@@ -515,27 +526,12 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                 {
                     "address": "0.0.0.0",
                     "enabled": True,
-                    "header": {"host": ["example.com", "example.com", "example.com"]},
+                    "header": {"host": ["example.com"]},
                     "name": "app-server-1",
+                    "port": 0,
                     "virtual_network_id": "a5624d4e-044a-4ff0-b3e1-e2465353d4b4",
                     "weight": 0.6,
-                },
-                {
-                    "address": "0.0.0.0",
-                    "enabled": True,
-                    "header": {"host": ["example.com", "example.com", "example.com"]},
-                    "name": "app-server-1",
-                    "virtual_network_id": "a5624d4e-044a-4ff0-b3e1-e2465353d4b4",
-                    "weight": 0.6,
-                },
-                {
-                    "address": "0.0.0.0",
-                    "enabled": True,
-                    "header": {"host": ["example.com", "example.com", "example.com"]},
-                    "name": "app-server-1",
-                    "virtual_network_id": "a5624d4e-044a-4ff0-b3e1-e2465353d4b4",
-                    "weight": 0.6,
-                },
+                }
             ],
             description="Primary data center - Provider XYZ",
             enabled=False,
@@ -548,7 +544,8 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             },
             longitude=0,
             minimum_origins=0,
-            monitor={},
+            monitor="monitor",
+            monitor_group="monitor_group",
             notification_email="someone@example.com,sometwo@example.com",
             notification_filter={
                 "origin": {
@@ -569,7 +566,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.load_balancers.pools.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="primary-dc-1",
-            origins=[{}, {}, {}],
+            origins=[{}],
         )
 
         assert response.is_closed is True
@@ -582,7 +579,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
         async with async_client.load_balancers.pools.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="primary-dc-1",
-            origins=[{}, {}, {}],
+            origins=[{}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -598,7 +595,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
             await async_client.load_balancers.pools.with_raw_response.create(
                 account_id="",
                 name="primary-dc-1",
-                origins=[{}, {}, {}],
+                origins=[{}],
             )
 
     @parametrize
@@ -607,7 +604,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
             pool_id="17b5962d775c646f3f9725cbc7a53df4",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="primary-dc-1",
-            origins=[{}, {}, {}],
+            origins=[{}],
         )
         assert_matches_type(Pool, pool, path=["response"])
 
@@ -621,27 +618,12 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                 {
                     "address": "0.0.0.0",
                     "enabled": True,
-                    "header": {"host": ["example.com", "example.com", "example.com"]},
-                    "name": "app-server-1",
-                    "virtual_network_id": "a5624d4e-044a-4ff0-b3e1-e2465353d4b4",
-                    "weight": 0.6,
-                },
-                {
-                    "address": "0.0.0.0",
-                    "enabled": True,
-                    "header": {"host": ["example.com", "example.com", "example.com"]},
-                    "name": "app-server-1",
-                    "virtual_network_id": "a5624d4e-044a-4ff0-b3e1-e2465353d4b4",
-                    "weight": 0.6,
-                },
-                {
-                    "address": "0.0.0.0",
-                    "enabled": True,
-                    "header": {"host": ["example.com", "example.com", "example.com"]},
+                    "header": {"host": ["example.com"]},
                     "name": "app-server-1",
+                    "port": 0,
                     "virtual_network_id": "a5624d4e-044a-4ff0-b3e1-e2465353d4b4",
                     "weight": 0.6,
-                },
+                }
             ],
             check_regions=["WEU", "ENAM"],
             description="Primary data center - Provider XYZ",
@@ -655,7 +637,8 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             },
             longitude=0,
             minimum_origins=0,
-            monitor={},
+            monitor="monitor",
+            monitor_group="monitor_group",
             notification_email="someone@example.com,sometwo@example.com",
             notification_filter={
                 "origin": {
@@ -677,7 +660,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
             pool_id="17b5962d775c646f3f9725cbc7a53df4",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="primary-dc-1",
-            origins=[{}, {}, {}],
+            origins=[{}],
         )
 
         assert response.is_closed is True
@@ -691,7 +674,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
             pool_id="17b5962d775c646f3f9725cbc7a53df4",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="primary-dc-1",
-            origins=[{}, {}, {}],
+            origins=[{}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -708,7 +691,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 pool_id="17b5962d775c646f3f9725cbc7a53df4",
                 account_id="",
                 name="primary-dc-1",
-                origins=[{}, {}, {}],
+                origins=[{}],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `pool_id` but received ''"):
@@ -716,7 +699,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 pool_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 name="primary-dc-1",
-                origins=[{}, {}, {}],
+                origins=[{}],
             )
 
     @parametrize
@@ -730,7 +713,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         pool = await async_client.load_balancers.pools.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            monitor={},
+            monitor="monitor",
         )
         assert_matches_type(AsyncSinglePage[Pool], pool, path=["response"])
 
@@ -813,6 +796,57 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @pytest.mark.skip(reason="TODO: Investigate 422 Unprocessable Entity in prism test")
+    @parametrize
+    async def test_method_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        pool = await async_client.load_balancers.pools.bulk_edit(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[Pool], pool, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: Investigate 422 Unprocessable Entity in prism test")
+    @parametrize
+    async def test_method_bulk_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        pool = await async_client.load_balancers.pools.bulk_edit(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            notification_email="",
+        )
+        assert_matches_type(AsyncSinglePage[Pool], pool, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: Investigate 422 Unprocessable Entity in prism test")
+    @parametrize
+    async def test_raw_response_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.load_balancers.pools.with_raw_response.bulk_edit(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pool = await response.parse()
+        assert_matches_type(AsyncSinglePage[Pool], pool, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: Investigate 422 Unprocessable Entity in prism test")
+    @parametrize
+    async def test_streaming_response_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.load_balancers.pools.with_streaming_response.bulk_edit(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pool = await response.parse()
+            assert_matches_type(AsyncSinglePage[Pool], pool, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: Investigate 422 Unprocessable Entity in prism test")
+    @parametrize
+    async def test_path_params_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.load_balancers.pools.with_raw_response.bulk_edit(
+                account_id="",
+            )
+
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
         pool = await async_client.load_balancers.pools.edit(
@@ -838,7 +872,8 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
             },
             longitude=0,
             minimum_origins=0,
-            monitor={},
+            monitor="monitor",
+            monitor_group="monitor_group",
             name="primary-dc-1",
             notification_email="someone@example.com,sometwo@example.com",
             notification_filter={
@@ -856,27 +891,12 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
                 {
                     "address": "0.0.0.0",
                     "enabled": True,
-                    "header": {"host": ["example.com", "example.com", "example.com"]},
-                    "name": "app-server-1",
-                    "virtual_network_id": "a5624d4e-044a-4ff0-b3e1-e2465353d4b4",
-                    "weight": 0.6,
-                },
-                {
-                    "address": "0.0.0.0",
-                    "enabled": True,
-                    "header": {"host": ["example.com", "example.com", "example.com"]},
-                    "name": "app-server-1",
-                    "virtual_network_id": "a5624d4e-044a-4ff0-b3e1-e2465353d4b4",
-                    "weight": 0.6,
-                },
-                {
-                    "address": "0.0.0.0",
-                    "enabled": True,
-                    "header": {"host": ["example.com", "example.com", "example.com"]},
+                    "header": {"host": ["example.com"]},
                     "name": "app-server-1",
+                    "port": 0,
                     "virtual_network_id": "a5624d4e-044a-4ff0-b3e1-e2465353d4b4",
                     "weight": 0.6,
-                },
+                }
             ],
         )
         assert_matches_type(Pool, pool, path=["response"])
diff --git a/tests/api_resources/load_balancers/test_previews.py b/tests/api_resources/load_balancers/test_previews.py
index 281f21e0600..12b9ed13602 100644
--- a/tests/api_resources/load_balancers/test_previews.py
+++ b/tests/api_resources/load_balancers/test_previews.py
@@ -67,7 +67,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncPreviews:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/load_balancers/test_regions.py b/tests/api_resources/load_balancers/test_regions.py
index 6e689dc253b..eb825e082cd 100644
--- a/tests/api_resources/load_balancers/test_regions.py
+++ b/tests/api_resources/load_balancers/test_regions.py
@@ -109,7 +109,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncRegions:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/load_balancers/test_searches.py b/tests/api_resources/load_balancers/test_searches.py
index 26259459464..7b6ed9ddf7c 100644
--- a/tests/api_resources/load_balancers/test_searches.py
+++ b/tests/api_resources/load_balancers/test_searches.py
@@ -3,13 +3,14 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.load_balancers import SearchGetResponse
+from cloudflare.pagination import SyncV4PagePagination, AsyncV4PagePagination
+from cloudflare.types.load_balancers import SearchListResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -19,116 +20,114 @@ class TestSearches:
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        search = client.load_balancers.searches.get(
+    def test_method_list(self, client: Cloudflare) -> None:
+        search = client.load_balancers.searches.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[SearchGetResponse], search, path=["response"])
+        assert_matches_type(SyncV4PagePagination[SearchListResponse], search, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
-        search = client.load_balancers.searches.get(
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        search = client.load_balancers.searches.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            page={},
-            per_page={},
-            search_params={
-                "query": "primary",
-                "references": "*",
-            },
+            page=1,
+            per_page=1,
+            query="primary",
+            references="*",
         )
-        assert_matches_type(Optional[SearchGetResponse], search, path=["response"])
+        assert_matches_type(SyncV4PagePagination[SearchListResponse], search, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.load_balancers.searches.with_raw_response.get(
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.load_balancers.searches.with_raw_response.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         search = response.parse()
-        assert_matches_type(Optional[SearchGetResponse], search, path=["response"])
+        assert_matches_type(SyncV4PagePagination[SearchListResponse], search, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.load_balancers.searches.with_streaming_response.get(
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.load_balancers.searches.with_streaming_response.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             search = response.parse()
-            assert_matches_type(Optional[SearchGetResponse], search, path=["response"])
+            assert_matches_type(SyncV4PagePagination[SearchListResponse], search, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
+    def test_path_params_list(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.load_balancers.searches.with_raw_response.get(
+            client.load_balancers.searches.with_raw_response.list(
                 account_id="",
             )
 
 
 class TestAsyncSearches:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        search = await async_client.load_balancers.searches.get(
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        search = await async_client.load_balancers.searches.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[SearchGetResponse], search, path=["response"])
+        assert_matches_type(AsyncV4PagePagination[SearchListResponse], search, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        search = await async_client.load_balancers.searches.get(
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        search = await async_client.load_balancers.searches.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            page={},
-            per_page={},
-            search_params={
-                "query": "primary",
-                "references": "*",
-            },
+            page=1,
+            per_page=1,
+            query="primary",
+            references="*",
         )
-        assert_matches_type(Optional[SearchGetResponse], search, path=["response"])
+        assert_matches_type(AsyncV4PagePagination[SearchListResponse], search, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.load_balancers.searches.with_raw_response.get(
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.load_balancers.searches.with_raw_response.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         search = await response.parse()
-        assert_matches_type(Optional[SearchGetResponse], search, path=["response"])
+        assert_matches_type(AsyncV4PagePagination[SearchListResponse], search, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.load_balancers.searches.with_streaming_response.get(
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.load_balancers.searches.with_streaming_response.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             search = await response.parse()
-            assert_matches_type(Optional[SearchGetResponse], search, path=["response"])
+            assert_matches_type(AsyncV4PagePagination[SearchListResponse], search, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.load_balancers.searches.with_raw_response.get(
+            await async_client.load_balancers.searches.with_raw_response.list(
                 account_id="",
             )
diff --git a/tests/api_resources/logpush/datasets/test_fields.py b/tests/api_resources/logpush/datasets/test_fields.py
index b62d8b5a19f..f9e929d6f7f 100644
--- a/tests/api_resources/logpush/datasets/test_fields.py
+++ b/tests/api_resources/logpush/datasets/test_fields.py
@@ -20,7 +20,7 @@ class TestFields:
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         field = client.logpush.datasets.fields.get(
-            dataset_id="http_requests",
+            dataset_id="gateway_dns",
             account_id="account_id",
         )
         assert_matches_type(object, field, path=["response"])
@@ -29,7 +29,7 @@ def test_method_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         field = client.logpush.datasets.fields.get(
-            dataset_id="http_requests",
+            dataset_id="gateway_dns",
             account_id="account_id",
         )
         assert_matches_type(object, field, path=["response"])
@@ -38,7 +38,7 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.logpush.datasets.fields.with_raw_response.get(
-            dataset_id="http_requests",
+            dataset_id="gateway_dns",
             account_id="account_id",
         )
 
@@ -51,7 +51,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.logpush.datasets.fields.with_streaming_response.get(
-            dataset_id="http_requests",
+            dataset_id="gateway_dns",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -65,33 +65,29 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dataset_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.datasets.fields.with_raw_response.get(
-                dataset_id="",
-                account_id="account_id",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.logpush.datasets.fields.with_raw_response.get(
-                dataset_id="http_requests",
+                dataset_id="gateway_dns",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.datasets.fields.with_raw_response.get(
-                dataset_id="http_requests",
+                dataset_id="gateway_dns",
                 account_id="account_id",
             )
 
 
 class TestAsyncFields:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         field = await async_client.logpush.datasets.fields.get(
-            dataset_id="http_requests",
+            dataset_id="gateway_dns",
             account_id="account_id",
         )
         assert_matches_type(object, field, path=["response"])
@@ -100,7 +96,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         field = await async_client.logpush.datasets.fields.get(
-            dataset_id="http_requests",
+            dataset_id="gateway_dns",
             account_id="account_id",
         )
         assert_matches_type(object, field, path=["response"])
@@ -109,7 +105,7 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.logpush.datasets.fields.with_raw_response.get(
-            dataset_id="http_requests",
+            dataset_id="gateway_dns",
             account_id="account_id",
         )
 
@@ -122,7 +118,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.logpush.datasets.fields.with_streaming_response.get(
-            dataset_id="http_requests",
+            dataset_id="gateway_dns",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -136,20 +132,14 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dataset_id` but received ''"):
-            await async_client.logpush.datasets.fields.with_raw_response.get(
-                dataset_id="",
-                account_id="account_id",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.datasets.fields.with_raw_response.get(
-                dataset_id="http_requests",
+                dataset_id="gateway_dns",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.datasets.fields.with_raw_response.get(
-                dataset_id="http_requests",
+                dataset_id="gateway_dns",
                 account_id="account_id",
             )
diff --git a/tests/api_resources/logpush/datasets/test_jobs.py b/tests/api_resources/logpush/datasets/test_jobs.py
index 7d87be256af..54f7c233e8f 100644
--- a/tests/api_resources/logpush/datasets/test_jobs.py
+++ b/tests/api_resources/logpush/datasets/test_jobs.py
@@ -9,7 +9,8 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.logpush.datasets import JobGetResponse
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.logpush import LogpushJob
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -21,136 +22,126 @@ class TestJobs:
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         job = client.logpush.datasets.jobs.get(
-            dataset_id="http_requests",
+            dataset_id="gateway_dns",
             account_id="account_id",
         )
-        assert_matches_type(Optional[JobGetResponse], job, path=["response"])
+        assert_matches_type(SyncSinglePage[Optional[LogpushJob]], job, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         job = client.logpush.datasets.jobs.get(
-            dataset_id="http_requests",
+            dataset_id="gateway_dns",
             account_id="account_id",
         )
-        assert_matches_type(Optional[JobGetResponse], job, path=["response"])
+        assert_matches_type(SyncSinglePage[Optional[LogpushJob]], job, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.logpush.datasets.jobs.with_raw_response.get(
-            dataset_id="http_requests",
+            dataset_id="gateway_dns",
             account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         job = response.parse()
-        assert_matches_type(Optional[JobGetResponse], job, path=["response"])
+        assert_matches_type(SyncSinglePage[Optional[LogpushJob]], job, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.logpush.datasets.jobs.with_streaming_response.get(
-            dataset_id="http_requests",
+            dataset_id="gateway_dns",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             job = response.parse()
-            assert_matches_type(Optional[JobGetResponse], job, path=["response"])
+            assert_matches_type(SyncSinglePage[Optional[LogpushJob]], job, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dataset_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.datasets.jobs.with_raw_response.get(
-                dataset_id="",
-                account_id="account_id",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.logpush.datasets.jobs.with_raw_response.get(
-                dataset_id="http_requests",
+                dataset_id="gateway_dns",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.datasets.jobs.with_raw_response.get(
-                dataset_id="http_requests",
+                dataset_id="gateway_dns",
                 account_id="account_id",
             )
 
 
 class TestAsyncJobs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         job = await async_client.logpush.datasets.jobs.get(
-            dataset_id="http_requests",
+            dataset_id="gateway_dns",
             account_id="account_id",
         )
-        assert_matches_type(Optional[JobGetResponse], job, path=["response"])
+        assert_matches_type(AsyncSinglePage[Optional[LogpushJob]], job, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         job = await async_client.logpush.datasets.jobs.get(
-            dataset_id="http_requests",
+            dataset_id="gateway_dns",
             account_id="account_id",
         )
-        assert_matches_type(Optional[JobGetResponse], job, path=["response"])
+        assert_matches_type(AsyncSinglePage[Optional[LogpushJob]], job, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.logpush.datasets.jobs.with_raw_response.get(
-            dataset_id="http_requests",
+            dataset_id="gateway_dns",
             account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         job = await response.parse()
-        assert_matches_type(Optional[JobGetResponse], job, path=["response"])
+        assert_matches_type(AsyncSinglePage[Optional[LogpushJob]], job, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.logpush.datasets.jobs.with_streaming_response.get(
-            dataset_id="http_requests",
+            dataset_id="gateway_dns",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             job = await response.parse()
-            assert_matches_type(Optional[JobGetResponse], job, path=["response"])
+            assert_matches_type(AsyncSinglePage[Optional[LogpushJob]], job, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dataset_id` but received ''"):
-            await async_client.logpush.datasets.jobs.with_raw_response.get(
-                dataset_id="",
-                account_id="account_id",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.datasets.jobs.with_raw_response.get(
-                dataset_id="http_requests",
+                dataset_id="gateway_dns",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.datasets.jobs.with_raw_response.get(
-                dataset_id="http_requests",
+                dataset_id="gateway_dns",
                 account_id="account_id",
             )
diff --git a/tests/api_resources/logpush/test_edge.py b/tests/api_resources/logpush/test_edge.py
index 850a8a4cb57..49a554ba2f0 100644
--- a/tests/api_resources/logpush/test_edge.py
+++ b/tests/api_resources/logpush/test_edge.py
@@ -9,7 +9,8 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.logpush import EdgeGetResponse, InstantLogpushJob
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.logpush import InstantLogpushJob
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -70,7 +71,7 @@ def test_method_get(self, client: Cloudflare) -> None:
         edge = client.logpush.edge.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[EdgeGetResponse], edge, path=["response"])
+        assert_matches_type(SyncSinglePage[Optional[InstantLogpushJob]], edge, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -81,7 +82,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         edge = response.parse()
-        assert_matches_type(Optional[EdgeGetResponse], edge, path=["response"])
+        assert_matches_type(SyncSinglePage[Optional[InstantLogpushJob]], edge, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -92,7 +93,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             edge = response.parse()
-            assert_matches_type(Optional[EdgeGetResponse], edge, path=["response"])
+            assert_matches_type(SyncSinglePage[Optional[InstantLogpushJob]], edge, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -105,7 +106,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncEdge:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -160,7 +163,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         edge = await async_client.logpush.edge.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[EdgeGetResponse], edge, path=["response"])
+        assert_matches_type(AsyncSinglePage[Optional[InstantLogpushJob]], edge, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -171,7 +174,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         edge = await response.parse()
-        assert_matches_type(Optional[EdgeGetResponse], edge, path=["response"])
+        assert_matches_type(AsyncSinglePage[Optional[InstantLogpushJob]], edge, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -182,7 +185,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             edge = await response.parse()
-            assert_matches_type(Optional[EdgeGetResponse], edge, path=["response"])
+            assert_matches_type(AsyncSinglePage[Optional[InstantLogpushJob]], edge, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/logpush/test_jobs.py b/tests/api_resources/logpush/test_jobs.py
index 3a730eb3e3c..862caad9f98 100644
--- a/tests/api_resources/logpush/test_jobs.py
+++ b/tests/api_resources/logpush/test_jobs.py
@@ -10,7 +10,7 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.logpush import LogpushJob
+from cloudflare.types.logpush import LogpushJob, JobDeleteResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -33,27 +33,28 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         job = client.logpush.jobs.create(
             destination_conf="s3://mybucket/logs?region=us-west-2",
             account_id="account_id",
-            dataset="http_requests",
+            dataset="gateway_dns",
             enabled=False,
+            filter='{"where":{"and":[{"key":"ClientRequestPath","operator":"contains","value":"/static"},{"key":"ClientRequestHost","operator":"eq","value":"example.com"}]}}',
             frequency="high",
-            kind="edge",
+            kind="",
             logpull_options="fields=RayID,ClientIP,EdgeStartTimestamp&timestamps=rfc3339",
             max_upload_bytes=5000000,
             max_upload_interval_seconds=30,
             max_upload_records=1000,
             name="example.com",
             output_options={
-                "cve_2021_4428": True,
-                "batch_prefix": "batch_prefix",
-                "batch_suffix": "batch_suffix",
-                "field_delimiter": "field_delimiter",
-                "field_names": ["ClientIP", "EdgeStartTimestamp", "RayID"],
+                "batch_prefix": "",
+                "batch_suffix": "",
+                "cve_2021_44228": False,
+                "field_delimiter": ",",
+                "field_names": ["Datetime", "DstIP", "SrcIP"],
                 "output_type": "ndjson",
-                "record_delimiter": "record_delimiter",
-                "record_prefix": "record_prefix",
-                "record_suffix": "record_suffix",
+                "record_delimiter": "",
+                "record_prefix": "{",
+                "record_suffix": "}\n",
                 "record_template": "record_template",
-                "sample_rate": 0,
+                "sample_rate": 1,
                 "timestamp_format": "unixnano",
             },
             ownership_challenge="00000000000000000000",
@@ -91,13 +92,13 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.jobs.with_raw_response.create(
                 destination_conf="s3://mybucket/logs?region=us-west-2",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.jobs.with_raw_response.create(
                 destination_conf="s3://mybucket/logs?region=us-west-2",
                 account_id="account_id",
@@ -120,24 +121,26 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             account_id="account_id",
             destination_conf="s3://mybucket/logs?region=us-west-2",
             enabled=False,
+            filter='{"where":{"and":[{"key":"ClientRequestPath","operator":"contains","value":"/static"},{"key":"ClientRequestHost","operator":"eq","value":"example.com"}]}}',
             frequency="high",
-            kind="edge",
+            kind="",
             logpull_options="fields=RayID,ClientIP,EdgeStartTimestamp&timestamps=rfc3339",
             max_upload_bytes=5000000,
             max_upload_interval_seconds=30,
             max_upload_records=1000,
+            name="example.com",
             output_options={
-                "cve_2021_4428": True,
-                "batch_prefix": "batch_prefix",
-                "batch_suffix": "batch_suffix",
-                "field_delimiter": "field_delimiter",
-                "field_names": ["ClientIP", "EdgeStartTimestamp", "RayID"],
+                "batch_prefix": "",
+                "batch_suffix": "",
+                "cve_2021_44228": False,
+                "field_delimiter": ",",
+                "field_names": ["Datetime", "DstIP", "SrcIP"],
                 "output_type": "ndjson",
-                "record_delimiter": "record_delimiter",
-                "record_prefix": "record_prefix",
-                "record_suffix": "record_suffix",
+                "record_delimiter": "",
+                "record_prefix": "{",
+                "record_suffix": "}\n",
                 "record_template": "record_template",
-                "sample_rate": 0,
+                "sample_rate": 1,
                 "timestamp_format": "unixnano",
             },
             ownership_challenge="00000000000000000000",
@@ -175,13 +178,13 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.jobs.with_raw_response.update(
                 job_id=1,
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.jobs.with_raw_response.update(
                 job_id=1,
                 account_id="account_id",
@@ -232,12 +235,12 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.jobs.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.jobs.with_raw_response.list(
                 account_id="account_id",
             )
@@ -249,7 +252,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             job_id=1,
             account_id="account_id",
         )
-        assert_matches_type(object, job, path=["response"])
+        assert_matches_type(Optional[JobDeleteResponse], job, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -258,7 +261,7 @@ def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
             job_id=1,
             account_id="account_id",
         )
-        assert_matches_type(object, job, path=["response"])
+        assert_matches_type(Optional[JobDeleteResponse], job, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -271,7 +274,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         job = response.parse()
-        assert_matches_type(object, job, path=["response"])
+        assert_matches_type(Optional[JobDeleteResponse], job, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -284,20 +287,20 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             job = response.parse()
-            assert_matches_type(object, job, path=["response"])
+            assert_matches_type(Optional[JobDeleteResponse], job, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.jobs.with_raw_response.delete(
                 job_id=1,
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.jobs.with_raw_response.delete(
                 job_id=1,
                 account_id="account_id",
@@ -352,13 +355,13 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.jobs.with_raw_response.get(
                 job_id=1,
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.jobs.with_raw_response.get(
                 job_id=1,
                 account_id="account_id",
@@ -366,7 +369,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncJobs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -383,27 +388,28 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
         job = await async_client.logpush.jobs.create(
             destination_conf="s3://mybucket/logs?region=us-west-2",
             account_id="account_id",
-            dataset="http_requests",
+            dataset="gateway_dns",
             enabled=False,
+            filter='{"where":{"and":[{"key":"ClientRequestPath","operator":"contains","value":"/static"},{"key":"ClientRequestHost","operator":"eq","value":"example.com"}]}}',
             frequency="high",
-            kind="edge",
+            kind="",
             logpull_options="fields=RayID,ClientIP,EdgeStartTimestamp&timestamps=rfc3339",
             max_upload_bytes=5000000,
             max_upload_interval_seconds=30,
             max_upload_records=1000,
             name="example.com",
             output_options={
-                "cve_2021_4428": True,
-                "batch_prefix": "batch_prefix",
-                "batch_suffix": "batch_suffix",
-                "field_delimiter": "field_delimiter",
-                "field_names": ["ClientIP", "EdgeStartTimestamp", "RayID"],
+                "batch_prefix": "",
+                "batch_suffix": "",
+                "cve_2021_44228": False,
+                "field_delimiter": ",",
+                "field_names": ["Datetime", "DstIP", "SrcIP"],
                 "output_type": "ndjson",
-                "record_delimiter": "record_delimiter",
-                "record_prefix": "record_prefix",
-                "record_suffix": "record_suffix",
+                "record_delimiter": "",
+                "record_prefix": "{",
+                "record_suffix": "}\n",
                 "record_template": "record_template",
-                "sample_rate": 0,
+                "sample_rate": 1,
                 "timestamp_format": "unixnano",
             },
             ownership_challenge="00000000000000000000",
@@ -441,13 +447,13 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.jobs.with_raw_response.create(
                 destination_conf="s3://mybucket/logs?region=us-west-2",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.jobs.with_raw_response.create(
                 destination_conf="s3://mybucket/logs?region=us-west-2",
                 account_id="account_id",
@@ -470,24 +476,26 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             account_id="account_id",
             destination_conf="s3://mybucket/logs?region=us-west-2",
             enabled=False,
+            filter='{"where":{"and":[{"key":"ClientRequestPath","operator":"contains","value":"/static"},{"key":"ClientRequestHost","operator":"eq","value":"example.com"}]}}',
             frequency="high",
-            kind="edge",
+            kind="",
             logpull_options="fields=RayID,ClientIP,EdgeStartTimestamp&timestamps=rfc3339",
             max_upload_bytes=5000000,
             max_upload_interval_seconds=30,
             max_upload_records=1000,
+            name="example.com",
             output_options={
-                "cve_2021_4428": True,
-                "batch_prefix": "batch_prefix",
-                "batch_suffix": "batch_suffix",
-                "field_delimiter": "field_delimiter",
-                "field_names": ["ClientIP", "EdgeStartTimestamp", "RayID"],
+                "batch_prefix": "",
+                "batch_suffix": "",
+                "cve_2021_44228": False,
+                "field_delimiter": ",",
+                "field_names": ["Datetime", "DstIP", "SrcIP"],
                 "output_type": "ndjson",
-                "record_delimiter": "record_delimiter",
-                "record_prefix": "record_prefix",
-                "record_suffix": "record_suffix",
+                "record_delimiter": "",
+                "record_prefix": "{",
+                "record_suffix": "}\n",
                 "record_template": "record_template",
-                "sample_rate": 0,
+                "sample_rate": 1,
                 "timestamp_format": "unixnano",
             },
             ownership_challenge="00000000000000000000",
@@ -525,13 +533,13 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.jobs.with_raw_response.update(
                 job_id=1,
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.jobs.with_raw_response.update(
                 job_id=1,
                 account_id="account_id",
@@ -582,12 +590,12 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.jobs.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.jobs.with_raw_response.list(
                 account_id="account_id",
             )
@@ -599,7 +607,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             job_id=1,
             account_id="account_id",
         )
-        assert_matches_type(object, job, path=["response"])
+        assert_matches_type(Optional[JobDeleteResponse], job, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -608,7 +616,7 @@ async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare
             job_id=1,
             account_id="account_id",
         )
-        assert_matches_type(object, job, path=["response"])
+        assert_matches_type(Optional[JobDeleteResponse], job, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -621,7 +629,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         job = await response.parse()
-        assert_matches_type(object, job, path=["response"])
+        assert_matches_type(Optional[JobDeleteResponse], job, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -634,20 +642,20 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             job = await response.parse()
-            assert_matches_type(object, job, path=["response"])
+            assert_matches_type(Optional[JobDeleteResponse], job, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.jobs.with_raw_response.delete(
                 job_id=1,
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.jobs.with_raw_response.delete(
                 job_id=1,
                 account_id="account_id",
@@ -702,13 +710,13 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.jobs.with_raw_response.get(
                 job_id=1,
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.jobs.with_raw_response.get(
                 job_id=1,
                 account_id="account_id",
diff --git a/tests/api_resources/logpush/test_ownership.py b/tests/api_resources/logpush/test_ownership.py
index c2d9297623c..18096fdc424 100644
--- a/tests/api_resources/logpush/test_ownership.py
+++ b/tests/api_resources/logpush/test_ownership.py
@@ -69,13 +69,13 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.ownership.with_raw_response.create(
                 destination_conf="s3://mybucket/logs?region=us-west-2",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.ownership.with_raw_response.create(
                 destination_conf="s3://mybucket/logs?region=us-west-2",
                 account_id="account_id",
@@ -134,14 +134,14 @@ def test_streaming_response_validate(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_validate(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.ownership.with_raw_response.validate(
                 destination_conf="s3://mybucket/logs?region=us-west-2",
                 ownership_challenge="00000000000000000000",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.ownership.with_raw_response.validate(
                 destination_conf="s3://mybucket/logs?region=us-west-2",
                 ownership_challenge="00000000000000000000",
@@ -150,7 +150,9 @@ def test_path_params_validate(self, client: Cloudflare) -> None:
 
 
 class TestAsyncOwnership:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -201,13 +203,13 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.ownership.with_raw_response.create(
                 destination_conf="s3://mybucket/logs?region=us-west-2",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.ownership.with_raw_response.create(
                 destination_conf="s3://mybucket/logs?region=us-west-2",
                 account_id="account_id",
@@ -266,14 +268,14 @@ async def test_streaming_response_validate(self, async_client: AsyncCloudflare)
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_validate(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.ownership.with_raw_response.validate(
                 destination_conf="s3://mybucket/logs?region=us-west-2",
                 ownership_challenge="00000000000000000000",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.ownership.with_raw_response.validate(
                 destination_conf="s3://mybucket/logs?region=us-west-2",
                 ownership_challenge="00000000000000000000",
diff --git a/tests/api_resources/logpush/test_validate.py b/tests/api_resources/logpush/test_validate.py
index fd2a12df619..8ecf8701fc8 100644
--- a/tests/api_resources/logpush/test_validate.py
+++ b/tests/api_resources/logpush/test_validate.py
@@ -12,6 +12,7 @@
 from cloudflare.types.logpush import (
     ValidateOriginResponse,
     ValidateDestinationResponse,
+    ValidateDestinationExistsResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -69,18 +70,79 @@ def test_streaming_response_destination(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_destination(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.validate.with_raw_response.destination(
                 destination_conf="s3://mybucket/logs?region=us-west-2",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.validate.with_raw_response.destination(
                 destination_conf="s3://mybucket/logs?region=us-west-2",
                 account_id="account_id",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_destination_exists(self, client: Cloudflare) -> None:
+        validate = client.logpush.validate.destination_exists(
+            destination_conf="s3://mybucket/logs?region=us-west-2",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ValidateDestinationExistsResponse], validate, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_destination_exists_with_all_params(self, client: Cloudflare) -> None:
+        validate = client.logpush.validate.destination_exists(
+            destination_conf="s3://mybucket/logs?region=us-west-2",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ValidateDestinationExistsResponse], validate, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_destination_exists(self, client: Cloudflare) -> None:
+        response = client.logpush.validate.with_raw_response.destination_exists(
+            destination_conf="s3://mybucket/logs?region=us-west-2",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        validate = response.parse()
+        assert_matches_type(Optional[ValidateDestinationExistsResponse], validate, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_destination_exists(self, client: Cloudflare) -> None:
+        with client.logpush.validate.with_streaming_response.destination_exists(
+            destination_conf="s3://mybucket/logs?region=us-west-2",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            validate = response.parse()
+            assert_matches_type(Optional[ValidateDestinationExistsResponse], validate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_destination_exists(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.logpush.validate.with_raw_response.destination_exists(
+                destination_conf="s3://mybucket/logs?region=us-west-2",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.logpush.validate.with_raw_response.destination_exists(
+                destination_conf="s3://mybucket/logs?region=us-west-2",
+                account_id="account_id",
+            )
+
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_origin(self, client: Cloudflare) -> None:
@@ -130,13 +192,13 @@ def test_streaming_response_origin(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_origin(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.validate.with_raw_response.origin(
                 logpull_options="fields=RayID,ClientIP,EdgeStartTimestamp&timestamps=rfc3339",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.logpush.validate.with_raw_response.origin(
                 logpull_options="fields=RayID,ClientIP,EdgeStartTimestamp&timestamps=rfc3339",
                 account_id="account_id",
@@ -144,7 +206,9 @@ def test_path_params_origin(self, client: Cloudflare) -> None:
 
 
 class TestAsyncValidate:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -195,18 +259,79 @@ async def test_streaming_response_destination(self, async_client: AsyncCloudflar
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_destination(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.validate.with_raw_response.destination(
                 destination_conf="s3://mybucket/logs?region=us-west-2",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.validate.with_raw_response.destination(
                 destination_conf="s3://mybucket/logs?region=us-west-2",
                 account_id="account_id",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_destination_exists(self, async_client: AsyncCloudflare) -> None:
+        validate = await async_client.logpush.validate.destination_exists(
+            destination_conf="s3://mybucket/logs?region=us-west-2",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ValidateDestinationExistsResponse], validate, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_destination_exists_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        validate = await async_client.logpush.validate.destination_exists(
+            destination_conf="s3://mybucket/logs?region=us-west-2",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ValidateDestinationExistsResponse], validate, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_destination_exists(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.logpush.validate.with_raw_response.destination_exists(
+            destination_conf="s3://mybucket/logs?region=us-west-2",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        validate = await response.parse()
+        assert_matches_type(Optional[ValidateDestinationExistsResponse], validate, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_destination_exists(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.logpush.validate.with_streaming_response.destination_exists(
+            destination_conf="s3://mybucket/logs?region=us-west-2",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            validate = await response.parse()
+            assert_matches_type(Optional[ValidateDestinationExistsResponse], validate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_destination_exists(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.logpush.validate.with_raw_response.destination_exists(
+                destination_conf="s3://mybucket/logs?region=us-west-2",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.logpush.validate.with_raw_response.destination_exists(
+                destination_conf="s3://mybucket/logs?region=us-west-2",
+                account_id="account_id",
+            )
+
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_origin(self, async_client: AsyncCloudflare) -> None:
@@ -256,13 +381,13 @@ async def test_streaming_response_origin(self, async_client: AsyncCloudflare) ->
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_origin(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.validate.with_raw_response.origin(
                 logpull_options="fields=RayID,ClientIP,EdgeStartTimestamp&timestamps=rfc3339",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.logpush.validate.with_raw_response.origin(
                 logpull_options="fields=RayID,ClientIP,EdgeStartTimestamp&timestamps=rfc3339",
                 account_id="account_id",
diff --git a/tests/api_resources/logs/control/cmb/test_config.py b/tests/api_resources/logs/control/cmb/test_config.py
index b7240366dcd..e745ff9be6b 100644
--- a/tests/api_resources/logs/control/cmb/test_config.py
+++ b/tests/api_resources/logs/control/cmb/test_config.py
@@ -28,6 +28,7 @@ def test_method_create(self, client: Cloudflare) -> None:
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         config = client.logs.control.cmb.config.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            allow_out_of_region_access=False,
             regions="eu",
         )
         assert_matches_type(Optional[CmbConfig], config, path=["response"])
@@ -141,7 +142,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncConfig:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -154,6 +157,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         config = await async_client.logs.control.cmb.config.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            allow_out_of_region_access=False,
             regions="eu",
         )
         assert_matches_type(Optional[CmbConfig], config, path=["response"])
diff --git a/tests/api_resources/logs/control/test_retention.py b/tests/api_resources/logs/control/test_retention.py
index c88567517cb..8177450dcf5 100644
--- a/tests/api_resources/logs/control/test_retention.py
+++ b/tests/api_resources/logs/control/test_retention.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
@@ -20,163 +20,173 @@ class TestRetention:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         retention = client.logs.control.retention.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[RetentionCreateResponse], retention, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        retention = client.logs.control.retention.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             flag=True,
         )
-        assert_matches_type(RetentionCreateResponse, retention, path=["response"])
+        assert_matches_type(Optional[RetentionCreateResponse], retention, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.logs.control.retention.with_raw_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            flag=True,
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         retention = response.parse()
-        assert_matches_type(RetentionCreateResponse, retention, path=["response"])
+        assert_matches_type(Optional[RetentionCreateResponse], retention, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.logs.control.retention.with_streaming_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            flag=True,
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             retention = response.parse()
-            assert_matches_type(RetentionCreateResponse, retention, path=["response"])
+            assert_matches_type(Optional[RetentionCreateResponse], retention, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.logs.control.retention.with_raw_response.create(
-                zone_identifier="",
-                flag=True,
+                zone_id="",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         retention = client.logs.control.retention.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(RetentionGetResponse, retention, path=["response"])
+        assert_matches_type(Optional[RetentionGetResponse], retention, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.logs.control.retention.with_raw_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         retention = response.parse()
-        assert_matches_type(RetentionGetResponse, retention, path=["response"])
+        assert_matches_type(Optional[RetentionGetResponse], retention, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.logs.control.retention.with_streaming_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             retention = response.parse()
-            assert_matches_type(RetentionGetResponse, retention, path=["response"])
+            assert_matches_type(Optional[RetentionGetResponse], retention, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.logs.control.retention.with_raw_response.get(
-                "",
+                zone_id="",
             )
 
 
 class TestAsyncRetention:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         retention = await async_client.logs.control.retention.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[RetentionCreateResponse], retention, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        retention = await async_client.logs.control.retention.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             flag=True,
         )
-        assert_matches_type(RetentionCreateResponse, retention, path=["response"])
+        assert_matches_type(Optional[RetentionCreateResponse], retention, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.logs.control.retention.with_raw_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            flag=True,
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         retention = await response.parse()
-        assert_matches_type(RetentionCreateResponse, retention, path=["response"])
+        assert_matches_type(Optional[RetentionCreateResponse], retention, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.logs.control.retention.with_streaming_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            flag=True,
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             retention = await response.parse()
-            assert_matches_type(RetentionCreateResponse, retention, path=["response"])
+            assert_matches_type(Optional[RetentionCreateResponse], retention, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.logs.control.retention.with_raw_response.create(
-                zone_identifier="",
-                flag=True,
+                zone_id="",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         retention = await async_client.logs.control.retention.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(RetentionGetResponse, retention, path=["response"])
+        assert_matches_type(Optional[RetentionGetResponse], retention, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.logs.control.retention.with_raw_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         retention = await response.parse()
-        assert_matches_type(RetentionGetResponse, retention, path=["response"])
+        assert_matches_type(Optional[RetentionGetResponse], retention, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.logs.control.retention.with_streaming_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             retention = await response.parse()
-            assert_matches_type(RetentionGetResponse, retention, path=["response"])
+            assert_matches_type(Optional[RetentionGetResponse], retention, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.logs.control.retention.with_raw_response.get(
-                "",
+                zone_id="",
             )
diff --git a/tests/api_resources/logs/received/test_fields.py b/tests/api_resources/logs/received/test_fields.py
index 67fa637d050..473a5baf341 100644
--- a/tests/api_resources/logs/received/test_fields.py
+++ b/tests/api_resources/logs/received/test_fields.py
@@ -20,14 +20,14 @@ class TestFields:
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         field = client.logs.received.fields.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(FieldGetResponse, field, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.logs.received.fields.with_raw_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -38,7 +38,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.logs.received.fields.with_streaming_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -50,26 +50,28 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.logs.received.fields.with_raw_response.get(
-                "",
+                zone_id="",
             )
 
 
 class TestAsyncFields:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         field = await async_client.logs.received.fields.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(FieldGetResponse, field, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.logs.received.fields.with_raw_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -80,7 +82,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.logs.received.fields.with_streaming_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -92,7 +94,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.logs.received.fields.with_raw_response.get(
-                "",
+                zone_id="",
             )
diff --git a/tests/api_resources/logs/test_rayid.py b/tests/api_resources/logs/test_rayid.py
index 6a18a0ba0dd..bcd572c49c1 100644
--- a/tests/api_resources/logs/test_rayid.py
+++ b/tests/api_resources/logs/test_rayid.py
@@ -20,16 +20,16 @@ class TestRayID:
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         rayid = client.logs.rayid.get(
-            ray_identifier="41ddf1740f67442d",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            rayid="41ddf1740f67442d",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(RayIDGetResponse, rayid, path=["response"])
 
     @parametrize
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         rayid = client.logs.rayid.get(
-            ray_identifier="41ddf1740f67442d",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            rayid="41ddf1740f67442d",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             fields="ClientIP,RayID,EdgeStartTimestamp",
             timestamps="unixnano",
         )
@@ -38,8 +38,8 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.logs.rayid.with_raw_response.get(
-            ray_identifier="41ddf1740f67442d",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            rayid="41ddf1740f67442d",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -50,8 +50,8 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.logs.rayid.with_streaming_response.get(
-            ray_identifier="41ddf1740f67442d",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            rayid="41ddf1740f67442d",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -63,35 +63,37 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.logs.rayid.with_raw_response.get(
-                ray_identifier="41ddf1740f67442d",
-                zone_identifier="",
+                rayid="41ddf1740f67442d",
+                zone_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ray_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rayid` but received ''"):
             client.logs.rayid.with_raw_response.get(
-                ray_identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rayid="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
 
 class TestAsyncRayID:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         rayid = await async_client.logs.rayid.get(
-            ray_identifier="41ddf1740f67442d",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            rayid="41ddf1740f67442d",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(RayIDGetResponse, rayid, path=["response"])
 
     @parametrize
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         rayid = await async_client.logs.rayid.get(
-            ray_identifier="41ddf1740f67442d",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            rayid="41ddf1740f67442d",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             fields="ClientIP,RayID,EdgeStartTimestamp",
             timestamps="unixnano",
         )
@@ -100,8 +102,8 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.logs.rayid.with_raw_response.get(
-            ray_identifier="41ddf1740f67442d",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            rayid="41ddf1740f67442d",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -112,8 +114,8 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.logs.rayid.with_streaming_response.get(
-            ray_identifier="41ddf1740f67442d",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            rayid="41ddf1740f67442d",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -125,14 +127,14 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.logs.rayid.with_raw_response.get(
-                ray_identifier="41ddf1740f67442d",
-                zone_identifier="",
+                rayid="41ddf1740f67442d",
+                zone_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ray_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rayid` but received ''"):
             await async_client.logs.rayid.with_raw_response.get(
-                ray_identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rayid="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/logs/test_received.py b/tests/api_resources/logs/test_received.py
index 5f3746d0335..f8c8795c20c 100644
--- a/tests/api_resources/logs/test_received.py
+++ b/tests/api_resources/logs/test_received.py
@@ -20,7 +20,7 @@ class TestReceived:
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         received = client.logs.received.get(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             end="2018-05-20T10:01:00Z",
         )
         assert_matches_type(ReceivedGetResponse, received, path=["response"])
@@ -28,7 +28,7 @@ def test_method_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         received = client.logs.received.get(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             end="2018-05-20T10:01:00Z",
             count=1,
             fields="ClientIP,RayID,EdgeStartTimestamp",
@@ -41,7 +41,7 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.logs.received.with_raw_response.get(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             end="2018-05-20T10:01:00Z",
         )
 
@@ -53,7 +53,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.logs.received.with_streaming_response.get(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             end="2018-05-20T10:01:00Z",
         ) as response:
             assert not response.is_closed
@@ -66,20 +66,22 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.logs.received.with_raw_response.get(
-                zone_identifier="",
+                zone_id="",
                 end="2018-05-20T10:01:00Z",
             )
 
 
 class TestAsyncReceived:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         received = await async_client.logs.received.get(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             end="2018-05-20T10:01:00Z",
         )
         assert_matches_type(ReceivedGetResponse, received, path=["response"])
@@ -87,7 +89,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         received = await async_client.logs.received.get(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             end="2018-05-20T10:01:00Z",
             count=1,
             fields="ClientIP,RayID,EdgeStartTimestamp",
@@ -100,7 +102,7 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.logs.received.with_raw_response.get(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             end="2018-05-20T10:01:00Z",
         )
 
@@ -112,7 +114,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.logs.received.with_streaming_response.get(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             end="2018-05-20T10:01:00Z",
         ) as response:
             assert not response.is_closed
@@ -125,8 +127,8 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.logs.received.with_raw_response.get(
-                zone_identifier="",
+                zone_id="",
                 end="2018-05-20T10:01:00Z",
             )
diff --git a/tests/api_resources/magic_cloud_networking/__init__.py b/tests/api_resources/magic_cloud_networking/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/magic_cloud_networking/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/magic_cloud_networking/catalog_syncs/__init__.py b/tests/api_resources/magic_cloud_networking/catalog_syncs/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/magic_cloud_networking/catalog_syncs/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/magic_cloud_networking/catalog_syncs/test_prebuilt_policies.py b/tests/api_resources/magic_cloud_networking/catalog_syncs/test_prebuilt_policies.py
new file mode 100644
index 00000000000..9159a726003
--- /dev/null
+++ b/tests/api_resources/magic_cloud_networking/catalog_syncs/test_prebuilt_policies.py
@@ -0,0 +1,119 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.magic_cloud_networking.catalog_syncs import (
+    PrebuiltPolicyListResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestPrebuiltPolicies:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        prebuilt_policy = client.magic_cloud_networking.catalog_syncs.prebuilt_policies.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncSinglePage[PrebuiltPolicyListResponse], prebuilt_policy, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        prebuilt_policy = client.magic_cloud_networking.catalog_syncs.prebuilt_policies.list(
+            account_id="account_id",
+            destination_type="NONE",
+        )
+        assert_matches_type(SyncSinglePage[PrebuiltPolicyListResponse], prebuilt_policy, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.catalog_syncs.prebuilt_policies.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        prebuilt_policy = response.parse()
+        assert_matches_type(SyncSinglePage[PrebuiltPolicyListResponse], prebuilt_policy, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.catalog_syncs.prebuilt_policies.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            prebuilt_policy = response.parse()
+            assert_matches_type(SyncSinglePage[PrebuiltPolicyListResponse], prebuilt_policy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.catalog_syncs.prebuilt_policies.with_raw_response.list(
+                account_id="",
+            )
+
+
+class TestAsyncPrebuiltPolicies:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        prebuilt_policy = await async_client.magic_cloud_networking.catalog_syncs.prebuilt_policies.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncSinglePage[PrebuiltPolicyListResponse], prebuilt_policy, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        prebuilt_policy = await async_client.magic_cloud_networking.catalog_syncs.prebuilt_policies.list(
+            account_id="account_id",
+            destination_type="NONE",
+        )
+        assert_matches_type(AsyncSinglePage[PrebuiltPolicyListResponse], prebuilt_policy, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.catalog_syncs.prebuilt_policies.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        prebuilt_policy = await response.parse()
+        assert_matches_type(AsyncSinglePage[PrebuiltPolicyListResponse], prebuilt_policy, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.catalog_syncs.prebuilt_policies.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            prebuilt_policy = await response.parse()
+            assert_matches_type(AsyncSinglePage[PrebuiltPolicyListResponse], prebuilt_policy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.catalog_syncs.prebuilt_policies.with_raw_response.list(
+                account_id="",
+            )
diff --git a/tests/api_resources/magic_cloud_networking/on_ramps/__init__.py b/tests/api_resources/magic_cloud_networking/on_ramps/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/magic_cloud_networking/on_ramps/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/magic_cloud_networking/on_ramps/test_address_spaces.py b/tests/api_resources/magic_cloud_networking/on_ramps/test_address_spaces.py
new file mode 100644
index 00000000000..4813fc1dc17
--- /dev/null
+++ b/tests/api_resources/magic_cloud_networking/on_ramps/test_address_spaces.py
@@ -0,0 +1,272 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.magic_cloud_networking.on_ramps import (
+    AddressSpaceEditResponse,
+    AddressSpaceListResponse,
+    AddressSpaceUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestAddressSpaces:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        address_space = client.magic_cloud_networking.on_ramps.address_spaces.update(
+            account_id="account_id",
+            prefixes=["192.168.0.0/16"],
+        )
+        assert_matches_type(AddressSpaceUpdateResponse, address_space, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.on_ramps.address_spaces.with_raw_response.update(
+            account_id="account_id",
+            prefixes=["192.168.0.0/16"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        address_space = response.parse()
+        assert_matches_type(AddressSpaceUpdateResponse, address_space, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.on_ramps.address_spaces.with_streaming_response.update(
+            account_id="account_id",
+            prefixes=["192.168.0.0/16"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            address_space = response.parse()
+            assert_matches_type(AddressSpaceUpdateResponse, address_space, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.address_spaces.with_raw_response.update(
+                account_id="",
+                prefixes=["192.168.0.0/16"],
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        address_space = client.magic_cloud_networking.on_ramps.address_spaces.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AddressSpaceListResponse, address_space, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.on_ramps.address_spaces.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        address_space = response.parse()
+        assert_matches_type(AddressSpaceListResponse, address_space, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.on_ramps.address_spaces.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            address_space = response.parse()
+            assert_matches_type(AddressSpaceListResponse, address_space, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.address_spaces.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        address_space = client.magic_cloud_networking.on_ramps.address_spaces.edit(
+            account_id="account_id",
+            prefixes=["192.168.0.0/16"],
+        )
+        assert_matches_type(AddressSpaceEditResponse, address_space, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.on_ramps.address_spaces.with_raw_response.edit(
+            account_id="account_id",
+            prefixes=["192.168.0.0/16"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        address_space = response.parse()
+        assert_matches_type(AddressSpaceEditResponse, address_space, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.on_ramps.address_spaces.with_streaming_response.edit(
+            account_id="account_id",
+            prefixes=["192.168.0.0/16"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            address_space = response.parse()
+            assert_matches_type(AddressSpaceEditResponse, address_space, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.address_spaces.with_raw_response.edit(
+                account_id="",
+                prefixes=["192.168.0.0/16"],
+            )
+
+
+class TestAsyncAddressSpaces:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        address_space = await async_client.magic_cloud_networking.on_ramps.address_spaces.update(
+            account_id="account_id",
+            prefixes=["192.168.0.0/16"],
+        )
+        assert_matches_type(AddressSpaceUpdateResponse, address_space, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.on_ramps.address_spaces.with_raw_response.update(
+            account_id="account_id",
+            prefixes=["192.168.0.0/16"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        address_space = await response.parse()
+        assert_matches_type(AddressSpaceUpdateResponse, address_space, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.on_ramps.address_spaces.with_streaming_response.update(
+            account_id="account_id",
+            prefixes=["192.168.0.0/16"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            address_space = await response.parse()
+            assert_matches_type(AddressSpaceUpdateResponse, address_space, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.address_spaces.with_raw_response.update(
+                account_id="",
+                prefixes=["192.168.0.0/16"],
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        address_space = await async_client.magic_cloud_networking.on_ramps.address_spaces.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AddressSpaceListResponse, address_space, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.on_ramps.address_spaces.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        address_space = await response.parse()
+        assert_matches_type(AddressSpaceListResponse, address_space, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.on_ramps.address_spaces.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            address_space = await response.parse()
+            assert_matches_type(AddressSpaceListResponse, address_space, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.address_spaces.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        address_space = await async_client.magic_cloud_networking.on_ramps.address_spaces.edit(
+            account_id="account_id",
+            prefixes=["192.168.0.0/16"],
+        )
+        assert_matches_type(AddressSpaceEditResponse, address_space, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.on_ramps.address_spaces.with_raw_response.edit(
+            account_id="account_id",
+            prefixes=["192.168.0.0/16"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        address_space = await response.parse()
+        assert_matches_type(AddressSpaceEditResponse, address_space, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.on_ramps.address_spaces.with_streaming_response.edit(
+            account_id="account_id",
+            prefixes=["192.168.0.0/16"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            address_space = await response.parse()
+            assert_matches_type(AddressSpaceEditResponse, address_space, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.address_spaces.with_raw_response.edit(
+                account_id="",
+                prefixes=["192.168.0.0/16"],
+            )
diff --git a/tests/api_resources/magic_cloud_networking/test_catalog_syncs.py b/tests/api_resources/magic_cloud_networking/test_catalog_syncs.py
new file mode 100644
index 00000000000..71e9deec8ed
--- /dev/null
+++ b/tests/api_resources/magic_cloud_networking/test_catalog_syncs.py
@@ -0,0 +1,780 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.magic_cloud_networking import (
+    CatalogSyncGetResponse,
+    CatalogSyncEditResponse,
+    CatalogSyncListResponse,
+    CatalogSyncCreateResponse,
+    CatalogSyncDeleteResponse,
+    CatalogSyncUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCatalogSyncs:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        catalog_sync = client.magic_cloud_networking.catalog_syncs.create(
+            account_id="account_id",
+            destination_type="NONE",
+            name="name",
+            update_mode="AUTO",
+        )
+        assert_matches_type(CatalogSyncCreateResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        catalog_sync = client.magic_cloud_networking.catalog_syncs.create(
+            account_id="account_id",
+            destination_type="NONE",
+            name="name",
+            update_mode="AUTO",
+            description="description",
+            policy="policy",
+            forwarded="forwarded",
+        )
+        assert_matches_type(CatalogSyncCreateResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.catalog_syncs.with_raw_response.create(
+            account_id="account_id",
+            destination_type="NONE",
+            name="name",
+            update_mode="AUTO",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        catalog_sync = response.parse()
+        assert_matches_type(CatalogSyncCreateResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.catalog_syncs.with_streaming_response.create(
+            account_id="account_id",
+            destination_type="NONE",
+            name="name",
+            update_mode="AUTO",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            catalog_sync = response.parse()
+            assert_matches_type(CatalogSyncCreateResponse, catalog_sync, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.catalog_syncs.with_raw_response.create(
+                account_id="",
+                destination_type="NONE",
+                name="name",
+                update_mode="AUTO",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        catalog_sync = client.magic_cloud_networking.catalog_syncs.update(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CatalogSyncUpdateResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        catalog_sync = client.magic_cloud_networking.catalog_syncs.update(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            description="description",
+            name="name",
+            policy="policy",
+            update_mode="AUTO",
+        )
+        assert_matches_type(CatalogSyncUpdateResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.catalog_syncs.with_raw_response.update(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        catalog_sync = response.parse()
+        assert_matches_type(CatalogSyncUpdateResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.catalog_syncs.with_streaming_response.update(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            catalog_sync = response.parse()
+            assert_matches_type(CatalogSyncUpdateResponse, catalog_sync, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.catalog_syncs.with_raw_response.update(
+                sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sync_id` but received ''"):
+            client.magic_cloud_networking.catalog_syncs.with_raw_response.update(
+                sync_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        catalog_sync = client.magic_cloud_networking.catalog_syncs.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncSinglePage[CatalogSyncListResponse], catalog_sync, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.catalog_syncs.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        catalog_sync = response.parse()
+        assert_matches_type(SyncSinglePage[CatalogSyncListResponse], catalog_sync, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.catalog_syncs.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            catalog_sync = response.parse()
+            assert_matches_type(SyncSinglePage[CatalogSyncListResponse], catalog_sync, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.catalog_syncs.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        catalog_sync = client.magic_cloud_networking.catalog_syncs.delete(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CatalogSyncDeleteResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
+        catalog_sync = client.magic_cloud_networking.catalog_syncs.delete(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            delete_destination=True,
+        )
+        assert_matches_type(CatalogSyncDeleteResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.catalog_syncs.with_raw_response.delete(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        catalog_sync = response.parse()
+        assert_matches_type(CatalogSyncDeleteResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.catalog_syncs.with_streaming_response.delete(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            catalog_sync = response.parse()
+            assert_matches_type(CatalogSyncDeleteResponse, catalog_sync, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.catalog_syncs.with_raw_response.delete(
+                sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sync_id` but received ''"):
+            client.magic_cloud_networking.catalog_syncs.with_raw_response.delete(
+                sync_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        catalog_sync = client.magic_cloud_networking.catalog_syncs.edit(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CatalogSyncEditResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        catalog_sync = client.magic_cloud_networking.catalog_syncs.edit(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            description="description",
+            name="name",
+            policy="policy",
+            update_mode="AUTO",
+        )
+        assert_matches_type(CatalogSyncEditResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.catalog_syncs.with_raw_response.edit(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        catalog_sync = response.parse()
+        assert_matches_type(CatalogSyncEditResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.catalog_syncs.with_streaming_response.edit(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            catalog_sync = response.parse()
+            assert_matches_type(CatalogSyncEditResponse, catalog_sync, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.catalog_syncs.with_raw_response.edit(
+                sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sync_id` but received ''"):
+            client.magic_cloud_networking.catalog_syncs.with_raw_response.edit(
+                sync_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        catalog_sync = client.magic_cloud_networking.catalog_syncs.get(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CatalogSyncGetResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.catalog_syncs.with_raw_response.get(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        catalog_sync = response.parse()
+        assert_matches_type(CatalogSyncGetResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.catalog_syncs.with_streaming_response.get(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            catalog_sync = response.parse()
+            assert_matches_type(CatalogSyncGetResponse, catalog_sync, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.catalog_syncs.with_raw_response.get(
+                sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sync_id` but received ''"):
+            client.magic_cloud_networking.catalog_syncs.with_raw_response.get(
+                sync_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_refresh(self, client: Cloudflare) -> None:
+        catalog_sync = client.magic_cloud_networking.catalog_syncs.refresh(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(str, catalog_sync, path=["response"])
+
+    @parametrize
+    def test_raw_response_refresh(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.catalog_syncs.with_raw_response.refresh(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        catalog_sync = response.parse()
+        assert_matches_type(str, catalog_sync, path=["response"])
+
+    @parametrize
+    def test_streaming_response_refresh(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.catalog_syncs.with_streaming_response.refresh(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            catalog_sync = response.parse()
+            assert_matches_type(str, catalog_sync, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_refresh(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.catalog_syncs.with_raw_response.refresh(
+                sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sync_id` but received ''"):
+            client.magic_cloud_networking.catalog_syncs.with_raw_response.refresh(
+                sync_id="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncCatalogSyncs:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        catalog_sync = await async_client.magic_cloud_networking.catalog_syncs.create(
+            account_id="account_id",
+            destination_type="NONE",
+            name="name",
+            update_mode="AUTO",
+        )
+        assert_matches_type(CatalogSyncCreateResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        catalog_sync = await async_client.magic_cloud_networking.catalog_syncs.create(
+            account_id="account_id",
+            destination_type="NONE",
+            name="name",
+            update_mode="AUTO",
+            description="description",
+            policy="policy",
+            forwarded="forwarded",
+        )
+        assert_matches_type(CatalogSyncCreateResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.create(
+            account_id="account_id",
+            destination_type="NONE",
+            name="name",
+            update_mode="AUTO",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        catalog_sync = await response.parse()
+        assert_matches_type(CatalogSyncCreateResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.catalog_syncs.with_streaming_response.create(
+            account_id="account_id",
+            destination_type="NONE",
+            name="name",
+            update_mode="AUTO",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            catalog_sync = await response.parse()
+            assert_matches_type(CatalogSyncCreateResponse, catalog_sync, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.create(
+                account_id="",
+                destination_type="NONE",
+                name="name",
+                update_mode="AUTO",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        catalog_sync = await async_client.magic_cloud_networking.catalog_syncs.update(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CatalogSyncUpdateResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        catalog_sync = await async_client.magic_cloud_networking.catalog_syncs.update(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            description="description",
+            name="name",
+            policy="policy",
+            update_mode="AUTO",
+        )
+        assert_matches_type(CatalogSyncUpdateResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.update(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        catalog_sync = await response.parse()
+        assert_matches_type(CatalogSyncUpdateResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.catalog_syncs.with_streaming_response.update(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            catalog_sync = await response.parse()
+            assert_matches_type(CatalogSyncUpdateResponse, catalog_sync, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.update(
+                sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sync_id` but received ''"):
+            await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.update(
+                sync_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        catalog_sync = await async_client.magic_cloud_networking.catalog_syncs.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncSinglePage[CatalogSyncListResponse], catalog_sync, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        catalog_sync = await response.parse()
+        assert_matches_type(AsyncSinglePage[CatalogSyncListResponse], catalog_sync, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.catalog_syncs.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            catalog_sync = await response.parse()
+            assert_matches_type(AsyncSinglePage[CatalogSyncListResponse], catalog_sync, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        catalog_sync = await async_client.magic_cloud_networking.catalog_syncs.delete(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CatalogSyncDeleteResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        catalog_sync = await async_client.magic_cloud_networking.catalog_syncs.delete(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            delete_destination=True,
+        )
+        assert_matches_type(CatalogSyncDeleteResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.delete(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        catalog_sync = await response.parse()
+        assert_matches_type(CatalogSyncDeleteResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.catalog_syncs.with_streaming_response.delete(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            catalog_sync = await response.parse()
+            assert_matches_type(CatalogSyncDeleteResponse, catalog_sync, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.delete(
+                sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sync_id` but received ''"):
+            await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.delete(
+                sync_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        catalog_sync = await async_client.magic_cloud_networking.catalog_syncs.edit(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CatalogSyncEditResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        catalog_sync = await async_client.magic_cloud_networking.catalog_syncs.edit(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            description="description",
+            name="name",
+            policy="policy",
+            update_mode="AUTO",
+        )
+        assert_matches_type(CatalogSyncEditResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.edit(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        catalog_sync = await response.parse()
+        assert_matches_type(CatalogSyncEditResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.catalog_syncs.with_streaming_response.edit(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            catalog_sync = await response.parse()
+            assert_matches_type(CatalogSyncEditResponse, catalog_sync, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.edit(
+                sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sync_id` but received ''"):
+            await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.edit(
+                sync_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        catalog_sync = await async_client.magic_cloud_networking.catalog_syncs.get(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CatalogSyncGetResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.get(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        catalog_sync = await response.parse()
+        assert_matches_type(CatalogSyncGetResponse, catalog_sync, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.catalog_syncs.with_streaming_response.get(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            catalog_sync = await response.parse()
+            assert_matches_type(CatalogSyncGetResponse, catalog_sync, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.get(
+                sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sync_id` but received ''"):
+            await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.get(
+                sync_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_refresh(self, async_client: AsyncCloudflare) -> None:
+        catalog_sync = await async_client.magic_cloud_networking.catalog_syncs.refresh(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(str, catalog_sync, path=["response"])
+
+    @parametrize
+    async def test_raw_response_refresh(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.refresh(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        catalog_sync = await response.parse()
+        assert_matches_type(str, catalog_sync, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_refresh(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.catalog_syncs.with_streaming_response.refresh(
+            sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            catalog_sync = await response.parse()
+            assert_matches_type(str, catalog_sync, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_refresh(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.refresh(
+                sync_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sync_id` but received ''"):
+            await async_client.magic_cloud_networking.catalog_syncs.with_raw_response.refresh(
+                sync_id="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/magic_cloud_networking/test_cloud_integrations.py b/tests/api_resources/magic_cloud_networking/test_cloud_integrations.py
new file mode 100644
index 00000000000..d03faca3b56
--- /dev/null
+++ b/tests/api_resources/magic_cloud_networking/test_cloud_integrations.py
@@ -0,0 +1,995 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.magic_cloud_networking import (
+    CloudIntegrationGetResponse,
+    CloudIntegrationEditResponse,
+    CloudIntegrationListResponse,
+    CloudIntegrationCreateResponse,
+    CloudIntegrationDeleteResponse,
+    CloudIntegrationUpdateResponse,
+    CloudIntegrationDiscoverResponse,
+    CloudIntegrationDiscoverAllResponse,
+    CloudIntegrationInitialSetupResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCloudIntegrations:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        cloud_integration = client.magic_cloud_networking.cloud_integrations.create(
+            account_id="account_id",
+            cloud_type="AWS",
+            friendly_name="friendly_name",
+        )
+        assert_matches_type(CloudIntegrationCreateResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        cloud_integration = client.magic_cloud_networking.cloud_integrations.create(
+            account_id="account_id",
+            cloud_type="AWS",
+            friendly_name="friendly_name",
+            description="description",
+            forwarded="forwarded",
+        )
+        assert_matches_type(CloudIntegrationCreateResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.cloud_integrations.with_raw_response.create(
+            account_id="account_id",
+            cloud_type="AWS",
+            friendly_name="friendly_name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloud_integration = response.parse()
+        assert_matches_type(CloudIntegrationCreateResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.cloud_integrations.with_streaming_response.create(
+            account_id="account_id",
+            cloud_type="AWS",
+            friendly_name="friendly_name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloud_integration = response.parse()
+            assert_matches_type(CloudIntegrationCreateResponse, cloud_integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.cloud_integrations.with_raw_response.create(
+                account_id="",
+                cloud_type="AWS",
+                friendly_name="friendly_name",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        cloud_integration = client.magic_cloud_networking.cloud_integrations.update(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CloudIntegrationUpdateResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        cloud_integration = client.magic_cloud_networking.cloud_integrations.update(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            aws_arn="aws_arn",
+            azure_subscription_id="azure_subscription_id",
+            azure_tenant_id="azure_tenant_id",
+            description="description",
+            friendly_name="friendly_name",
+            gcp_project_id="gcp_project_id",
+            gcp_service_account_email="gcp_service_account_email",
+        )
+        assert_matches_type(CloudIntegrationUpdateResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.cloud_integrations.with_raw_response.update(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloud_integration = response.parse()
+        assert_matches_type(CloudIntegrationUpdateResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.cloud_integrations.with_streaming_response.update(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloud_integration = response.parse()
+            assert_matches_type(CloudIntegrationUpdateResponse, cloud_integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.cloud_integrations.with_raw_response.update(
+                provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `provider_id` but received ''"):
+            client.magic_cloud_networking.cloud_integrations.with_raw_response.update(
+                provider_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        cloud_integration = client.magic_cloud_networking.cloud_integrations.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncSinglePage[CloudIntegrationListResponse], cloud_integration, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        cloud_integration = client.magic_cloud_networking.cloud_integrations.list(
+            account_id="account_id",
+            cloudflare=True,
+            desc=True,
+            order_by="order_by",
+            status=True,
+        )
+        assert_matches_type(SyncSinglePage[CloudIntegrationListResponse], cloud_integration, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.cloud_integrations.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloud_integration = response.parse()
+        assert_matches_type(SyncSinglePage[CloudIntegrationListResponse], cloud_integration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.cloud_integrations.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloud_integration = response.parse()
+            assert_matches_type(SyncSinglePage[CloudIntegrationListResponse], cloud_integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.cloud_integrations.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        cloud_integration = client.magic_cloud_networking.cloud_integrations.delete(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CloudIntegrationDeleteResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.cloud_integrations.with_raw_response.delete(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloud_integration = response.parse()
+        assert_matches_type(CloudIntegrationDeleteResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.cloud_integrations.with_streaming_response.delete(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloud_integration = response.parse()
+            assert_matches_type(CloudIntegrationDeleteResponse, cloud_integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.cloud_integrations.with_raw_response.delete(
+                provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `provider_id` but received ''"):
+            client.magic_cloud_networking.cloud_integrations.with_raw_response.delete(
+                provider_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_discover(self, client: Cloudflare) -> None:
+        cloud_integration = client.magic_cloud_networking.cloud_integrations.discover(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CloudIntegrationDiscoverResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_method_discover_with_all_params(self, client: Cloudflare) -> None:
+        cloud_integration = client.magic_cloud_networking.cloud_integrations.discover(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            v2=True,
+        )
+        assert_matches_type(CloudIntegrationDiscoverResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_raw_response_discover(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.cloud_integrations.with_raw_response.discover(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloud_integration = response.parse()
+        assert_matches_type(CloudIntegrationDiscoverResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_discover(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.cloud_integrations.with_streaming_response.discover(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloud_integration = response.parse()
+            assert_matches_type(CloudIntegrationDiscoverResponse, cloud_integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_discover(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.cloud_integrations.with_raw_response.discover(
+                provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `provider_id` but received ''"):
+            client.magic_cloud_networking.cloud_integrations.with_raw_response.discover(
+                provider_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_discover_all(self, client: Cloudflare) -> None:
+        cloud_integration = client.magic_cloud_networking.cloud_integrations.discover_all(
+            account_id="account_id",
+        )
+        assert_matches_type(CloudIntegrationDiscoverAllResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_raw_response_discover_all(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.cloud_integrations.with_raw_response.discover_all(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloud_integration = response.parse()
+        assert_matches_type(CloudIntegrationDiscoverAllResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_discover_all(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.cloud_integrations.with_streaming_response.discover_all(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloud_integration = response.parse()
+            assert_matches_type(CloudIntegrationDiscoverAllResponse, cloud_integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_discover_all(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.cloud_integrations.with_raw_response.discover_all(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        cloud_integration = client.magic_cloud_networking.cloud_integrations.edit(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CloudIntegrationEditResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        cloud_integration = client.magic_cloud_networking.cloud_integrations.edit(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            aws_arn="aws_arn",
+            azure_subscription_id="azure_subscription_id",
+            azure_tenant_id="azure_tenant_id",
+            description="description",
+            friendly_name="friendly_name",
+            gcp_project_id="gcp_project_id",
+            gcp_service_account_email="gcp_service_account_email",
+        )
+        assert_matches_type(CloudIntegrationEditResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.cloud_integrations.with_raw_response.edit(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloud_integration = response.parse()
+        assert_matches_type(CloudIntegrationEditResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.cloud_integrations.with_streaming_response.edit(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloud_integration = response.parse()
+            assert_matches_type(CloudIntegrationEditResponse, cloud_integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.cloud_integrations.with_raw_response.edit(
+                provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `provider_id` but received ''"):
+            client.magic_cloud_networking.cloud_integrations.with_raw_response.edit(
+                provider_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        cloud_integration = client.magic_cloud_networking.cloud_integrations.get(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CloudIntegrationGetResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        cloud_integration = client.magic_cloud_networking.cloud_integrations.get(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            status=True,
+        )
+        assert_matches_type(CloudIntegrationGetResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.cloud_integrations.with_raw_response.get(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloud_integration = response.parse()
+        assert_matches_type(CloudIntegrationGetResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.cloud_integrations.with_streaming_response.get(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloud_integration = response.parse()
+            assert_matches_type(CloudIntegrationGetResponse, cloud_integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.cloud_integrations.with_raw_response.get(
+                provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `provider_id` but received ''"):
+            client.magic_cloud_networking.cloud_integrations.with_raw_response.get(
+                provider_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_initial_setup(self, client: Cloudflare) -> None:
+        cloud_integration = client.magic_cloud_networking.cloud_integrations.initial_setup(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CloudIntegrationInitialSetupResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_raw_response_initial_setup(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.cloud_integrations.with_raw_response.initial_setup(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloud_integration = response.parse()
+        assert_matches_type(CloudIntegrationInitialSetupResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_initial_setup(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.cloud_integrations.with_streaming_response.initial_setup(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloud_integration = response.parse()
+            assert_matches_type(CloudIntegrationInitialSetupResponse, cloud_integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_initial_setup(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.cloud_integrations.with_raw_response.initial_setup(
+                provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `provider_id` but received ''"):
+            client.magic_cloud_networking.cloud_integrations.with_raw_response.initial_setup(
+                provider_id="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncCloudIntegrations:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        cloud_integration = await async_client.magic_cloud_networking.cloud_integrations.create(
+            account_id="account_id",
+            cloud_type="AWS",
+            friendly_name="friendly_name",
+        )
+        assert_matches_type(CloudIntegrationCreateResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cloud_integration = await async_client.magic_cloud_networking.cloud_integrations.create(
+            account_id="account_id",
+            cloud_type="AWS",
+            friendly_name="friendly_name",
+            description="description",
+            forwarded="forwarded",
+        )
+        assert_matches_type(CloudIntegrationCreateResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.create(
+            account_id="account_id",
+            cloud_type="AWS",
+            friendly_name="friendly_name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloud_integration = await response.parse()
+        assert_matches_type(CloudIntegrationCreateResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.cloud_integrations.with_streaming_response.create(
+            account_id="account_id",
+            cloud_type="AWS",
+            friendly_name="friendly_name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloud_integration = await response.parse()
+            assert_matches_type(CloudIntegrationCreateResponse, cloud_integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.create(
+                account_id="",
+                cloud_type="AWS",
+                friendly_name="friendly_name",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        cloud_integration = await async_client.magic_cloud_networking.cloud_integrations.update(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CloudIntegrationUpdateResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cloud_integration = await async_client.magic_cloud_networking.cloud_integrations.update(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            aws_arn="aws_arn",
+            azure_subscription_id="azure_subscription_id",
+            azure_tenant_id="azure_tenant_id",
+            description="description",
+            friendly_name="friendly_name",
+            gcp_project_id="gcp_project_id",
+            gcp_service_account_email="gcp_service_account_email",
+        )
+        assert_matches_type(CloudIntegrationUpdateResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.update(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloud_integration = await response.parse()
+        assert_matches_type(CloudIntegrationUpdateResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.cloud_integrations.with_streaming_response.update(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloud_integration = await response.parse()
+            assert_matches_type(CloudIntegrationUpdateResponse, cloud_integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.update(
+                provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `provider_id` but received ''"):
+            await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.update(
+                provider_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        cloud_integration = await async_client.magic_cloud_networking.cloud_integrations.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncSinglePage[CloudIntegrationListResponse], cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cloud_integration = await async_client.magic_cloud_networking.cloud_integrations.list(
+            account_id="account_id",
+            cloudflare=True,
+            desc=True,
+            order_by="order_by",
+            status=True,
+        )
+        assert_matches_type(AsyncSinglePage[CloudIntegrationListResponse], cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloud_integration = await response.parse()
+        assert_matches_type(AsyncSinglePage[CloudIntegrationListResponse], cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.cloud_integrations.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloud_integration = await response.parse()
+            assert_matches_type(AsyncSinglePage[CloudIntegrationListResponse], cloud_integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        cloud_integration = await async_client.magic_cloud_networking.cloud_integrations.delete(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CloudIntegrationDeleteResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.delete(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloud_integration = await response.parse()
+        assert_matches_type(CloudIntegrationDeleteResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.cloud_integrations.with_streaming_response.delete(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloud_integration = await response.parse()
+            assert_matches_type(CloudIntegrationDeleteResponse, cloud_integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.delete(
+                provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `provider_id` but received ''"):
+            await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.delete(
+                provider_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_discover(self, async_client: AsyncCloudflare) -> None:
+        cloud_integration = await async_client.magic_cloud_networking.cloud_integrations.discover(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CloudIntegrationDiscoverResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_method_discover_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cloud_integration = await async_client.magic_cloud_networking.cloud_integrations.discover(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            v2=True,
+        )
+        assert_matches_type(CloudIntegrationDiscoverResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_discover(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.discover(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloud_integration = await response.parse()
+        assert_matches_type(CloudIntegrationDiscoverResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_discover(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.cloud_integrations.with_streaming_response.discover(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloud_integration = await response.parse()
+            assert_matches_type(CloudIntegrationDiscoverResponse, cloud_integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_discover(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.discover(
+                provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `provider_id` but received ''"):
+            await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.discover(
+                provider_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_discover_all(self, async_client: AsyncCloudflare) -> None:
+        cloud_integration = await async_client.magic_cloud_networking.cloud_integrations.discover_all(
+            account_id="account_id",
+        )
+        assert_matches_type(CloudIntegrationDiscoverAllResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_discover_all(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.discover_all(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloud_integration = await response.parse()
+        assert_matches_type(CloudIntegrationDiscoverAllResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_discover_all(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.cloud_integrations.with_streaming_response.discover_all(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloud_integration = await response.parse()
+            assert_matches_type(CloudIntegrationDiscoverAllResponse, cloud_integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_discover_all(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.discover_all(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        cloud_integration = await async_client.magic_cloud_networking.cloud_integrations.edit(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CloudIntegrationEditResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cloud_integration = await async_client.magic_cloud_networking.cloud_integrations.edit(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            aws_arn="aws_arn",
+            azure_subscription_id="azure_subscription_id",
+            azure_tenant_id="azure_tenant_id",
+            description="description",
+            friendly_name="friendly_name",
+            gcp_project_id="gcp_project_id",
+            gcp_service_account_email="gcp_service_account_email",
+        )
+        assert_matches_type(CloudIntegrationEditResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.edit(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloud_integration = await response.parse()
+        assert_matches_type(CloudIntegrationEditResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.cloud_integrations.with_streaming_response.edit(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloud_integration = await response.parse()
+            assert_matches_type(CloudIntegrationEditResponse, cloud_integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.edit(
+                provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `provider_id` but received ''"):
+            await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.edit(
+                provider_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        cloud_integration = await async_client.magic_cloud_networking.cloud_integrations.get(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CloudIntegrationGetResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cloud_integration = await async_client.magic_cloud_networking.cloud_integrations.get(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            status=True,
+        )
+        assert_matches_type(CloudIntegrationGetResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.get(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloud_integration = await response.parse()
+        assert_matches_type(CloudIntegrationGetResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.cloud_integrations.with_streaming_response.get(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloud_integration = await response.parse()
+            assert_matches_type(CloudIntegrationGetResponse, cloud_integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.get(
+                provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `provider_id` but received ''"):
+            await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.get(
+                provider_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_initial_setup(self, async_client: AsyncCloudflare) -> None:
+        cloud_integration = await async_client.magic_cloud_networking.cloud_integrations.initial_setup(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CloudIntegrationInitialSetupResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_initial_setup(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.initial_setup(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloud_integration = await response.parse()
+        assert_matches_type(CloudIntegrationInitialSetupResponse, cloud_integration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_initial_setup(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.cloud_integrations.with_streaming_response.initial_setup(
+            provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloud_integration = await response.parse()
+            assert_matches_type(CloudIntegrationInitialSetupResponse, cloud_integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_initial_setup(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.initial_setup(
+                provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `provider_id` but received ''"):
+            await async_client.magic_cloud_networking.cloud_integrations.with_raw_response.initial_setup(
+                provider_id="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/magic_cloud_networking/test_on_ramps.py b/tests/api_resources/magic_cloud_networking/test_on_ramps.py
new file mode 100644
index 00000000000..50fbd41a8c1
--- /dev/null
+++ b/tests/api_resources/magic_cloud_networking/test_on_ramps.py
@@ -0,0 +1,1132 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import httpx
+import pytest
+from respx import MockRouter
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._response import (
+    BinaryAPIResponse,
+    AsyncBinaryAPIResponse,
+    StreamedBinaryAPIResponse,
+    AsyncStreamedBinaryAPIResponse,
+)
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.magic_cloud_networking import (
+    OnRampGetResponse,
+    OnRampEditResponse,
+    OnRampListResponse,
+    OnRampPlanResponse,
+    OnRampApplyResponse,
+    OnRampCreateResponse,
+    OnRampDeleteResponse,
+    OnRampUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestOnRamps:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        on_ramp = client.magic_cloud_networking.on_ramps.create(
+            account_id="account_id",
+            cloud_type="AWS",
+            dynamic_routing=True,
+            install_routes_in_cloud=True,
+            install_routes_in_magic_wan=True,
+            name="name",
+            type="OnrampTypeSingle",
+        )
+        assert_matches_type(OnRampCreateResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        on_ramp = client.magic_cloud_networking.on_ramps.create(
+            account_id="account_id",
+            cloud_type="AWS",
+            dynamic_routing=True,
+            install_routes_in_cloud=True,
+            install_routes_in_magic_wan=True,
+            name="name",
+            type="OnrampTypeSingle",
+            adopted_hub_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            attached_hubs=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            attached_vpcs=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            cloud_asn=0,
+            description="description",
+            hub_provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            manage_hub_to_hub_attachments=True,
+            manage_vpc_to_hub_attachments=True,
+            region="region",
+            vpc="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            forwarded="forwarded",
+        )
+        assert_matches_type(OnRampCreateResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.on_ramps.with_raw_response.create(
+            account_id="account_id",
+            cloud_type="AWS",
+            dynamic_routing=True,
+            install_routes_in_cloud=True,
+            install_routes_in_magic_wan=True,
+            name="name",
+            type="OnrampTypeSingle",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        on_ramp = response.parse()
+        assert_matches_type(OnRampCreateResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.on_ramps.with_streaming_response.create(
+            account_id="account_id",
+            cloud_type="AWS",
+            dynamic_routing=True,
+            install_routes_in_cloud=True,
+            install_routes_in_magic_wan=True,
+            name="name",
+            type="OnrampTypeSingle",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            on_ramp = response.parse()
+            assert_matches_type(OnRampCreateResponse, on_ramp, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.with_raw_response.create(
+                account_id="",
+                cloud_type="AWS",
+                dynamic_routing=True,
+                install_routes_in_cloud=True,
+                install_routes_in_magic_wan=True,
+                name="name",
+                type="OnrampTypeSingle",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        on_ramp = client.magic_cloud_networking.on_ramps.update(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(OnRampUpdateResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        on_ramp = client.magic_cloud_networking.on_ramps.update(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            attached_hubs=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            attached_vpcs=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            description="description",
+            install_routes_in_cloud=True,
+            install_routes_in_magic_wan=True,
+            manage_hub_to_hub_attachments=True,
+            manage_vpc_to_hub_attachments=True,
+            name="name",
+            vpc="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(OnRampUpdateResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.on_ramps.with_raw_response.update(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        on_ramp = response.parse()
+        assert_matches_type(OnRampUpdateResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.on_ramps.with_streaming_response.update(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            on_ramp = response.parse()
+            assert_matches_type(OnRampUpdateResponse, on_ramp, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.with_raw_response.update(
+                onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `onramp_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.with_raw_response.update(
+                onramp_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        on_ramp = client.magic_cloud_networking.on_ramps.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncSinglePage[OnRampListResponse], on_ramp, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        on_ramp = client.magic_cloud_networking.on_ramps.list(
+            account_id="account_id",
+            desc=True,
+            order_by="order_by",
+            status=True,
+            vpcs=True,
+        )
+        assert_matches_type(SyncSinglePage[OnRampListResponse], on_ramp, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.on_ramps.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        on_ramp = response.parse()
+        assert_matches_type(SyncSinglePage[OnRampListResponse], on_ramp, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.on_ramps.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            on_ramp = response.parse()
+            assert_matches_type(SyncSinglePage[OnRampListResponse], on_ramp, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        on_ramp = client.magic_cloud_networking.on_ramps.delete(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(OnRampDeleteResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
+        on_ramp = client.magic_cloud_networking.on_ramps.delete(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            destroy=True,
+            force=True,
+        )
+        assert_matches_type(OnRampDeleteResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.on_ramps.with_raw_response.delete(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        on_ramp = response.parse()
+        assert_matches_type(OnRampDeleteResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.on_ramps.with_streaming_response.delete(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            on_ramp = response.parse()
+            assert_matches_type(OnRampDeleteResponse, on_ramp, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.with_raw_response.delete(
+                onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `onramp_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.with_raw_response.delete(
+                onramp_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_apply(self, client: Cloudflare) -> None:
+        on_ramp = client.magic_cloud_networking.on_ramps.apply(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(OnRampApplyResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_raw_response_apply(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.on_ramps.with_raw_response.apply(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        on_ramp = response.parse()
+        assert_matches_type(OnRampApplyResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_streaming_response_apply(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.on_ramps.with_streaming_response.apply(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            on_ramp = response.parse()
+            assert_matches_type(OnRampApplyResponse, on_ramp, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_apply(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.with_raw_response.apply(
+                onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `onramp_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.with_raw_response.apply(
+                onramp_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        on_ramp = client.magic_cloud_networking.on_ramps.edit(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(OnRampEditResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        on_ramp = client.magic_cloud_networking.on_ramps.edit(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            attached_hubs=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            attached_vpcs=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            description="description",
+            install_routes_in_cloud=True,
+            install_routes_in_magic_wan=True,
+            manage_hub_to_hub_attachments=True,
+            manage_vpc_to_hub_attachments=True,
+            name="name",
+            vpc="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(OnRampEditResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.on_ramps.with_raw_response.edit(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        on_ramp = response.parse()
+        assert_matches_type(OnRampEditResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.on_ramps.with_streaming_response.edit(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            on_ramp = response.parse()
+            assert_matches_type(OnRampEditResponse, on_ramp, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.with_raw_response.edit(
+                onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `onramp_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.with_raw_response.edit(
+                onramp_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_method_export(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.post("/accounts/account_id/magic/cloud/onramps/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e/export").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        on_ramp = client.magic_cloud_networking.on_ramps.export(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert on_ramp.is_closed
+        assert on_ramp.json() == {"foo": "bar"}
+        assert cast(Any, on_ramp.is_closed) is True
+        assert isinstance(on_ramp, BinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_raw_response_export(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.post("/accounts/account_id/magic/cloud/onramps/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e/export").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+
+        on_ramp = client.magic_cloud_networking.on_ramps.with_raw_response.export(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert on_ramp.is_closed is True
+        assert on_ramp.http_request.headers.get("X-Stainless-Lang") == "python"
+        assert on_ramp.json() == {"foo": "bar"}
+        assert isinstance(on_ramp, BinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_streaming_response_export(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.post("/accounts/account_id/magic/cloud/onramps/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e/export").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        with client.magic_cloud_networking.on_ramps.with_streaming_response.export(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as on_ramp:
+            assert not on_ramp.is_closed
+            assert on_ramp.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            assert on_ramp.json() == {"foo": "bar"}
+            assert cast(Any, on_ramp.is_closed) is True
+            assert isinstance(on_ramp, StreamedBinaryAPIResponse)
+
+        assert cast(Any, on_ramp.is_closed) is True
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_path_params_export(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.with_raw_response.export(
+                onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `onramp_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.with_raw_response.export(
+                onramp_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        on_ramp = client.magic_cloud_networking.on_ramps.get(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(OnRampGetResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        on_ramp = client.magic_cloud_networking.on_ramps.get(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            planned_resources=True,
+            post_apply_resources=True,
+            status=True,
+            vpcs=True,
+        )
+        assert_matches_type(OnRampGetResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.on_ramps.with_raw_response.get(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        on_ramp = response.parse()
+        assert_matches_type(OnRampGetResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.on_ramps.with_streaming_response.get(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            on_ramp = response.parse()
+            assert_matches_type(OnRampGetResponse, on_ramp, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.with_raw_response.get(
+                onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `onramp_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.with_raw_response.get(
+                onramp_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_plan(self, client: Cloudflare) -> None:
+        on_ramp = client.magic_cloud_networking.on_ramps.plan(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(OnRampPlanResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_raw_response_plan(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.on_ramps.with_raw_response.plan(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        on_ramp = response.parse()
+        assert_matches_type(OnRampPlanResponse, on_ramp, path=["response"])
+
+    @parametrize
+    def test_streaming_response_plan(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.on_ramps.with_streaming_response.plan(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            on_ramp = response.parse()
+            assert_matches_type(OnRampPlanResponse, on_ramp, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_plan(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.with_raw_response.plan(
+                onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `onramp_id` but received ''"):
+            client.magic_cloud_networking.on_ramps.with_raw_response.plan(
+                onramp_id="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncOnRamps:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        on_ramp = await async_client.magic_cloud_networking.on_ramps.create(
+            account_id="account_id",
+            cloud_type="AWS",
+            dynamic_routing=True,
+            install_routes_in_cloud=True,
+            install_routes_in_magic_wan=True,
+            name="name",
+            type="OnrampTypeSingle",
+        )
+        assert_matches_type(OnRampCreateResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        on_ramp = await async_client.magic_cloud_networking.on_ramps.create(
+            account_id="account_id",
+            cloud_type="AWS",
+            dynamic_routing=True,
+            install_routes_in_cloud=True,
+            install_routes_in_magic_wan=True,
+            name="name",
+            type="OnrampTypeSingle",
+            adopted_hub_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            attached_hubs=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            attached_vpcs=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            cloud_asn=0,
+            description="description",
+            hub_provider_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            manage_hub_to_hub_attachments=True,
+            manage_vpc_to_hub_attachments=True,
+            region="region",
+            vpc="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            forwarded="forwarded",
+        )
+        assert_matches_type(OnRampCreateResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.on_ramps.with_raw_response.create(
+            account_id="account_id",
+            cloud_type="AWS",
+            dynamic_routing=True,
+            install_routes_in_cloud=True,
+            install_routes_in_magic_wan=True,
+            name="name",
+            type="OnrampTypeSingle",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        on_ramp = await response.parse()
+        assert_matches_type(OnRampCreateResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.on_ramps.with_streaming_response.create(
+            account_id="account_id",
+            cloud_type="AWS",
+            dynamic_routing=True,
+            install_routes_in_cloud=True,
+            install_routes_in_magic_wan=True,
+            name="name",
+            type="OnrampTypeSingle",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            on_ramp = await response.parse()
+            assert_matches_type(OnRampCreateResponse, on_ramp, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.with_raw_response.create(
+                account_id="",
+                cloud_type="AWS",
+                dynamic_routing=True,
+                install_routes_in_cloud=True,
+                install_routes_in_magic_wan=True,
+                name="name",
+                type="OnrampTypeSingle",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        on_ramp = await async_client.magic_cloud_networking.on_ramps.update(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(OnRampUpdateResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        on_ramp = await async_client.magic_cloud_networking.on_ramps.update(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            attached_hubs=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            attached_vpcs=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            description="description",
+            install_routes_in_cloud=True,
+            install_routes_in_magic_wan=True,
+            manage_hub_to_hub_attachments=True,
+            manage_vpc_to_hub_attachments=True,
+            name="name",
+            vpc="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(OnRampUpdateResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.on_ramps.with_raw_response.update(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        on_ramp = await response.parse()
+        assert_matches_type(OnRampUpdateResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.on_ramps.with_streaming_response.update(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            on_ramp = await response.parse()
+            assert_matches_type(OnRampUpdateResponse, on_ramp, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.with_raw_response.update(
+                onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `onramp_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.with_raw_response.update(
+                onramp_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        on_ramp = await async_client.magic_cloud_networking.on_ramps.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncSinglePage[OnRampListResponse], on_ramp, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        on_ramp = await async_client.magic_cloud_networking.on_ramps.list(
+            account_id="account_id",
+            desc=True,
+            order_by="order_by",
+            status=True,
+            vpcs=True,
+        )
+        assert_matches_type(AsyncSinglePage[OnRampListResponse], on_ramp, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.on_ramps.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        on_ramp = await response.parse()
+        assert_matches_type(AsyncSinglePage[OnRampListResponse], on_ramp, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.on_ramps.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            on_ramp = await response.parse()
+            assert_matches_type(AsyncSinglePage[OnRampListResponse], on_ramp, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        on_ramp = await async_client.magic_cloud_networking.on_ramps.delete(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(OnRampDeleteResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        on_ramp = await async_client.magic_cloud_networking.on_ramps.delete(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            destroy=True,
+            force=True,
+        )
+        assert_matches_type(OnRampDeleteResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.on_ramps.with_raw_response.delete(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        on_ramp = await response.parse()
+        assert_matches_type(OnRampDeleteResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.on_ramps.with_streaming_response.delete(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            on_ramp = await response.parse()
+            assert_matches_type(OnRampDeleteResponse, on_ramp, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.with_raw_response.delete(
+                onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `onramp_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.with_raw_response.delete(
+                onramp_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_apply(self, async_client: AsyncCloudflare) -> None:
+        on_ramp = await async_client.magic_cloud_networking.on_ramps.apply(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(OnRampApplyResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_raw_response_apply(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.on_ramps.with_raw_response.apply(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        on_ramp = await response.parse()
+        assert_matches_type(OnRampApplyResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_apply(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.on_ramps.with_streaming_response.apply(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            on_ramp = await response.parse()
+            assert_matches_type(OnRampApplyResponse, on_ramp, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_apply(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.with_raw_response.apply(
+                onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `onramp_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.with_raw_response.apply(
+                onramp_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        on_ramp = await async_client.magic_cloud_networking.on_ramps.edit(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(OnRampEditResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        on_ramp = await async_client.magic_cloud_networking.on_ramps.edit(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            attached_hubs=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            attached_vpcs=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            description="description",
+            install_routes_in_cloud=True,
+            install_routes_in_magic_wan=True,
+            manage_hub_to_hub_attachments=True,
+            manage_vpc_to_hub_attachments=True,
+            name="name",
+            vpc="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(OnRampEditResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.on_ramps.with_raw_response.edit(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        on_ramp = await response.parse()
+        assert_matches_type(OnRampEditResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.on_ramps.with_streaming_response.edit(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            on_ramp = await response.parse()
+            assert_matches_type(OnRampEditResponse, on_ramp, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.with_raw_response.edit(
+                onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `onramp_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.with_raw_response.edit(
+                onramp_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_method_export(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.post("/accounts/account_id/magic/cloud/onramps/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e/export").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        on_ramp = await async_client.magic_cloud_networking.on_ramps.export(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert on_ramp.is_closed
+        assert await on_ramp.json() == {"foo": "bar"}
+        assert cast(Any, on_ramp.is_closed) is True
+        assert isinstance(on_ramp, AsyncBinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_raw_response_export(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.post("/accounts/account_id/magic/cloud/onramps/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e/export").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+
+        on_ramp = await async_client.magic_cloud_networking.on_ramps.with_raw_response.export(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert on_ramp.is_closed is True
+        assert on_ramp.http_request.headers.get("X-Stainless-Lang") == "python"
+        assert await on_ramp.json() == {"foo": "bar"}
+        assert isinstance(on_ramp, AsyncBinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_streaming_response_export(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.post("/accounts/account_id/magic/cloud/onramps/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e/export").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        async with async_client.magic_cloud_networking.on_ramps.with_streaming_response.export(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as on_ramp:
+            assert not on_ramp.is_closed
+            assert on_ramp.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            assert await on_ramp.json() == {"foo": "bar"}
+            assert cast(Any, on_ramp.is_closed) is True
+            assert isinstance(on_ramp, AsyncStreamedBinaryAPIResponse)
+
+        assert cast(Any, on_ramp.is_closed) is True
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_path_params_export(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.with_raw_response.export(
+                onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `onramp_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.with_raw_response.export(
+                onramp_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        on_ramp = await async_client.magic_cloud_networking.on_ramps.get(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(OnRampGetResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        on_ramp = await async_client.magic_cloud_networking.on_ramps.get(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            planned_resources=True,
+            post_apply_resources=True,
+            status=True,
+            vpcs=True,
+        )
+        assert_matches_type(OnRampGetResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.on_ramps.with_raw_response.get(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        on_ramp = await response.parse()
+        assert_matches_type(OnRampGetResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.on_ramps.with_streaming_response.get(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            on_ramp = await response.parse()
+            assert_matches_type(OnRampGetResponse, on_ramp, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.with_raw_response.get(
+                onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `onramp_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.with_raw_response.get(
+                onramp_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_plan(self, async_client: AsyncCloudflare) -> None:
+        on_ramp = await async_client.magic_cloud_networking.on_ramps.plan(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(OnRampPlanResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_raw_response_plan(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.on_ramps.with_raw_response.plan(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        on_ramp = await response.parse()
+        assert_matches_type(OnRampPlanResponse, on_ramp, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_plan(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.on_ramps.with_streaming_response.plan(
+            onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            on_ramp = await response.parse()
+            assert_matches_type(OnRampPlanResponse, on_ramp, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_plan(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.with_raw_response.plan(
+                onramp_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `onramp_id` but received ''"):
+            await async_client.magic_cloud_networking.on_ramps.with_raw_response.plan(
+                onramp_id="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/magic_cloud_networking/test_resources.py b/tests/api_resources/magic_cloud_networking/test_resources.py
new file mode 100644
index 00000000000..8275125681e
--- /dev/null
+++ b/tests/api_resources/magic_cloud_networking/test_resources.py
@@ -0,0 +1,508 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import httpx
+import pytest
+from respx import MockRouter
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._response import (
+    BinaryAPIResponse,
+    AsyncBinaryAPIResponse,
+    StreamedBinaryAPIResponse,
+    AsyncStreamedBinaryAPIResponse,
+)
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.magic_cloud_networking import (
+    ResourceGetResponse,
+    ResourceListResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestResources:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        resource = client.magic_cloud_networking.resources.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ResourceListResponse], resource, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        resource = client.magic_cloud_networking.resources.list(
+            account_id="account_id",
+            cloudflare=True,
+            desc=True,
+            managed=True,
+            order_by="order_by",
+            page=1,
+            per_page=1,
+            provider_id="provider_id",
+            region="region",
+            resource_group="resource_group",
+            resource_id=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            resource_type=["aws_customer_gateway"],
+            search=["string"],
+            v2=True,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ResourceListResponse], resource, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.resources.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[ResourceListResponse], resource, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.resources.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[ResourceListResponse], resource, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.resources.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_method_export(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get("/accounts/account_id/magic/cloud/resources/export").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        resource = client.magic_cloud_networking.resources.export(
+            account_id="account_id",
+        )
+        assert resource.is_closed
+        assert resource.json() == {"foo": "bar"}
+        assert cast(Any, resource.is_closed) is True
+        assert isinstance(resource, BinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_method_export_with_all_params(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get("/accounts/account_id/magic/cloud/resources/export").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        resource = client.magic_cloud_networking.resources.export(
+            account_id="account_id",
+            desc=True,
+            order_by="order_by",
+            provider_id="provider_id",
+            region="region",
+            resource_group="resource_group",
+            resource_id=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            resource_type=["aws_customer_gateway"],
+            search=["string"],
+            v2=True,
+        )
+        assert resource.is_closed
+        assert resource.json() == {"foo": "bar"}
+        assert cast(Any, resource.is_closed) is True
+        assert isinstance(resource, BinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_raw_response_export(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get("/accounts/account_id/magic/cloud/resources/export").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+
+        resource = client.magic_cloud_networking.resources.with_raw_response.export(
+            account_id="account_id",
+        )
+
+        assert resource.is_closed is True
+        assert resource.http_request.headers.get("X-Stainless-Lang") == "python"
+        assert resource.json() == {"foo": "bar"}
+        assert isinstance(resource, BinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_streaming_response_export(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get("/accounts/account_id/magic/cloud/resources/export").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        with client.magic_cloud_networking.resources.with_streaming_response.export(
+            account_id="account_id",
+        ) as resource:
+            assert not resource.is_closed
+            assert resource.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            assert resource.json() == {"foo": "bar"}
+            assert cast(Any, resource.is_closed) is True
+            assert isinstance(resource, StreamedBinaryAPIResponse)
+
+        assert cast(Any, resource.is_closed) is True
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_path_params_export(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.resources.with_raw_response.export(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        resource = client.magic_cloud_networking.resources.get(
+            resource_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(ResourceGetResponse, resource, path=["response"])
+
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        resource = client.magic_cloud_networking.resources.get(
+            resource_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            v2=True,
+        )
+        assert_matches_type(ResourceGetResponse, resource, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.resources.with_raw_response.get(
+            resource_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource = response.parse()
+        assert_matches_type(ResourceGetResponse, resource, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.resources.with_streaming_response.get(
+            resource_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource = response.parse()
+            assert_matches_type(ResourceGetResponse, resource, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.resources.with_raw_response.get(
+                resource_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `resource_id` but received ''"):
+            client.magic_cloud_networking.resources.with_raw_response.get(
+                resource_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_policy_preview(self, client: Cloudflare) -> None:
+        resource = client.magic_cloud_networking.resources.policy_preview(
+            account_id="account_id",
+            policy="policy",
+        )
+        assert_matches_type(str, resource, path=["response"])
+
+    @parametrize
+    def test_raw_response_policy_preview(self, client: Cloudflare) -> None:
+        response = client.magic_cloud_networking.resources.with_raw_response.policy_preview(
+            account_id="account_id",
+            policy="policy",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource = response.parse()
+        assert_matches_type(str, resource, path=["response"])
+
+    @parametrize
+    def test_streaming_response_policy_preview(self, client: Cloudflare) -> None:
+        with client.magic_cloud_networking.resources.with_streaming_response.policy_preview(
+            account_id="account_id",
+            policy="policy",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource = response.parse()
+            assert_matches_type(str, resource, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_policy_preview(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_cloud_networking.resources.with_raw_response.policy_preview(
+                account_id="",
+                policy="policy",
+            )
+
+
+class TestAsyncResources:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        resource = await async_client.magic_cloud_networking.resources.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[ResourceListResponse], resource, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        resource = await async_client.magic_cloud_networking.resources.list(
+            account_id="account_id",
+            cloudflare=True,
+            desc=True,
+            managed=True,
+            order_by="order_by",
+            page=1,
+            per_page=1,
+            provider_id="provider_id",
+            region="region",
+            resource_group="resource_group",
+            resource_id=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            resource_type=["aws_customer_gateway"],
+            search=["string"],
+            v2=True,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[ResourceListResponse], resource, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.resources.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[ResourceListResponse], resource, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.resources.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[ResourceListResponse], resource, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.resources.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_method_export(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get("/accounts/account_id/magic/cloud/resources/export").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        resource = await async_client.magic_cloud_networking.resources.export(
+            account_id="account_id",
+        )
+        assert resource.is_closed
+        assert await resource.json() == {"foo": "bar"}
+        assert cast(Any, resource.is_closed) is True
+        assert isinstance(resource, AsyncBinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_method_export_with_all_params(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get("/accounts/account_id/magic/cloud/resources/export").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        resource = await async_client.magic_cloud_networking.resources.export(
+            account_id="account_id",
+            desc=True,
+            order_by="order_by",
+            provider_id="provider_id",
+            region="region",
+            resource_group="resource_group",
+            resource_id=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            resource_type=["aws_customer_gateway"],
+            search=["string"],
+            v2=True,
+        )
+        assert resource.is_closed
+        assert await resource.json() == {"foo": "bar"}
+        assert cast(Any, resource.is_closed) is True
+        assert isinstance(resource, AsyncBinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_raw_response_export(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get("/accounts/account_id/magic/cloud/resources/export").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+
+        resource = await async_client.magic_cloud_networking.resources.with_raw_response.export(
+            account_id="account_id",
+        )
+
+        assert resource.is_closed is True
+        assert resource.http_request.headers.get("X-Stainless-Lang") == "python"
+        assert await resource.json() == {"foo": "bar"}
+        assert isinstance(resource, AsyncBinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_streaming_response_export(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get("/accounts/account_id/magic/cloud/resources/export").mock(
+            return_value=httpx.Response(200, json={"foo": "bar"})
+        )
+        async with async_client.magic_cloud_networking.resources.with_streaming_response.export(
+            account_id="account_id",
+        ) as resource:
+            assert not resource.is_closed
+            assert resource.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            assert await resource.json() == {"foo": "bar"}
+            assert cast(Any, resource.is_closed) is True
+            assert isinstance(resource, AsyncStreamedBinaryAPIResponse)
+
+        assert cast(Any, resource.is_closed) is True
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_path_params_export(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.resources.with_raw_response.export(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        resource = await async_client.magic_cloud_networking.resources.get(
+            resource_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(ResourceGetResponse, resource, path=["response"])
+
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        resource = await async_client.magic_cloud_networking.resources.get(
+            resource_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            v2=True,
+        )
+        assert_matches_type(ResourceGetResponse, resource, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.resources.with_raw_response.get(
+            resource_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource = await response.parse()
+        assert_matches_type(ResourceGetResponse, resource, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.resources.with_streaming_response.get(
+            resource_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource = await response.parse()
+            assert_matches_type(ResourceGetResponse, resource, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.resources.with_raw_response.get(
+                resource_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `resource_id` but received ''"):
+            await async_client.magic_cloud_networking.resources.with_raw_response.get(
+                resource_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_policy_preview(self, async_client: AsyncCloudflare) -> None:
+        resource = await async_client.magic_cloud_networking.resources.policy_preview(
+            account_id="account_id",
+            policy="policy",
+        )
+        assert_matches_type(str, resource, path=["response"])
+
+    @parametrize
+    async def test_raw_response_policy_preview(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_cloud_networking.resources.with_raw_response.policy_preview(
+            account_id="account_id",
+            policy="policy",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource = await response.parse()
+        assert_matches_type(str, resource, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_policy_preview(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_cloud_networking.resources.with_streaming_response.policy_preview(
+            account_id="account_id",
+            policy="policy",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource = await response.parse()
+            assert_matches_type(str, resource, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_policy_preview(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_cloud_networking.resources.with_raw_response.policy_preview(
+                account_id="",
+                policy="policy",
+            )
diff --git a/tests/api_resources/magic_network_monitoring/configs/test_full.py b/tests/api_resources/magic_network_monitoring/configs/test_full.py
index fa2d1efd518..9233a8c1c40 100644
--- a/tests/api_resources/magic_network_monitoring/configs/test_full.py
+++ b/tests/api_resources/magic_network_monitoring/configs/test_full.py
@@ -57,7 +57,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncFull:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/magic_network_monitoring/rules/test_advertisements.py b/tests/api_resources/magic_network_monitoring/rules/test_advertisements.py
index 46761c021c6..c9415da5b36 100644
--- a/tests/api_resources/magic_network_monitoring/rules/test_advertisements.py
+++ b/tests/api_resources/magic_network_monitoring/rules/test_advertisements.py
@@ -72,7 +72,9 @@ def test_path_params_edit(self, client: Cloudflare) -> None:
 
 
 class TestAsyncAdvertisements:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/magic_network_monitoring/test_configs.py b/tests/api_resources/magic_network_monitoring/test_configs.py
index 8a60e5320fa..aa21987216c 100644
--- a/tests/api_resources/magic_network_monitoring/test_configs.py
+++ b/tests/api_resources/magic_network_monitoring/test_configs.py
@@ -23,7 +23,25 @@ class TestConfigs:
     def test_method_create(self, client: Cloudflare) -> None:
         config = client.magic_network_monitoring.configs.create(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            default_sampling=1,
+            name="cloudflare user's account",
+        )
+        assert_matches_type(Configuration, config, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        config = client.magic_network_monitoring.configs.create(
+            account_id="6f91088a406011ed95aed352566e8d4c",
+            default_sampling=1,
+            name="cloudflare user's account",
+            router_ips=["203.0.113.1"],
+            warp_devices=[
+                {
+                    "id": "5360368d-b351-4791-abe1-93550dabd351",
+                    "name": "My warp device",
+                    "router_ip": "203.0.113.1",
+                }
+            ],
         )
         assert_matches_type(Configuration, config, path=["response"])
 
@@ -31,7 +49,8 @@ def test_method_create(self, client: Cloudflare) -> None:
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.magic_network_monitoring.configs.with_raw_response.create(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            default_sampling=1,
+            name="cloudflare user's account",
         )
 
         assert response.is_closed is True
@@ -43,7 +62,8 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.magic_network_monitoring.configs.with_streaming_response.create(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            default_sampling=1,
+            name="cloudflare user's account",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -58,14 +78,33 @@ def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.magic_network_monitoring.configs.with_raw_response.create(
                 account_id="",
-                body={},
+                default_sampling=1,
+                name="cloudflare user's account",
             )
 
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         config = client.magic_network_monitoring.configs.update(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            default_sampling=1,
+            name="cloudflare user's account",
+        )
+        assert_matches_type(Configuration, config, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        config = client.magic_network_monitoring.configs.update(
+            account_id="6f91088a406011ed95aed352566e8d4c",
+            default_sampling=1,
+            name="cloudflare user's account",
+            router_ips=["203.0.113.1"],
+            warp_devices=[
+                {
+                    "id": "5360368d-b351-4791-abe1-93550dabd351",
+                    "name": "My warp device",
+                    "router_ip": "203.0.113.1",
+                }
+            ],
         )
         assert_matches_type(Configuration, config, path=["response"])
 
@@ -73,7 +112,8 @@ def test_method_update(self, client: Cloudflare) -> None:
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.magic_network_monitoring.configs.with_raw_response.update(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            default_sampling=1,
+            name="cloudflare user's account",
         )
 
         assert response.is_closed is True
@@ -85,7 +125,8 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.magic_network_monitoring.configs.with_streaming_response.update(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            default_sampling=1,
+            name="cloudflare user's account",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -100,7 +141,8 @@ def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.magic_network_monitoring.configs.with_raw_response.update(
                 account_id="",
-                body={},
+                default_sampling=1,
+                name="cloudflare user's account",
             )
 
     @parametrize
@@ -145,7 +187,23 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
     def test_method_edit(self, client: Cloudflare) -> None:
         config = client.magic_network_monitoring.configs.edit(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+        )
+        assert_matches_type(Configuration, config, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        config = client.magic_network_monitoring.configs.edit(
+            account_id="6f91088a406011ed95aed352566e8d4c",
+            default_sampling=1,
+            name="cloudflare user's account",
+            router_ips=["203.0.113.1"],
+            warp_devices=[
+                {
+                    "id": "5360368d-b351-4791-abe1-93550dabd351",
+                    "name": "My warp device",
+                    "router_ip": "203.0.113.1",
+                }
+            ],
         )
         assert_matches_type(Configuration, config, path=["response"])
 
@@ -153,7 +211,6 @@ def test_method_edit(self, client: Cloudflare) -> None:
     def test_raw_response_edit(self, client: Cloudflare) -> None:
         response = client.magic_network_monitoring.configs.with_raw_response.edit(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
         )
 
         assert response.is_closed is True
@@ -165,7 +222,6 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
         with client.magic_network_monitoring.configs.with_streaming_response.edit(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -180,7 +236,6 @@ def test_path_params_edit(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.magic_network_monitoring.configs.with_raw_response.edit(
                 account_id="",
-                body={},
             )
 
     @parametrize
@@ -223,13 +278,33 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncConfigs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         config = await async_client.magic_network_monitoring.configs.create(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            default_sampling=1,
+            name="cloudflare user's account",
+        )
+        assert_matches_type(Configuration, config, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        config = await async_client.magic_network_monitoring.configs.create(
+            account_id="6f91088a406011ed95aed352566e8d4c",
+            default_sampling=1,
+            name="cloudflare user's account",
+            router_ips=["203.0.113.1"],
+            warp_devices=[
+                {
+                    "id": "5360368d-b351-4791-abe1-93550dabd351",
+                    "name": "My warp device",
+                    "router_ip": "203.0.113.1",
+                }
+            ],
         )
         assert_matches_type(Configuration, config, path=["response"])
 
@@ -237,7 +312,8 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_network_monitoring.configs.with_raw_response.create(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            default_sampling=1,
+            name="cloudflare user's account",
         )
 
         assert response.is_closed is True
@@ -249,7 +325,8 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.magic_network_monitoring.configs.with_streaming_response.create(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            default_sampling=1,
+            name="cloudflare user's account",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -264,14 +341,33 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.magic_network_monitoring.configs.with_raw_response.create(
                 account_id="",
-                body={},
+                default_sampling=1,
+                name="cloudflare user's account",
             )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         config = await async_client.magic_network_monitoring.configs.update(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            default_sampling=1,
+            name="cloudflare user's account",
+        )
+        assert_matches_type(Configuration, config, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        config = await async_client.magic_network_monitoring.configs.update(
+            account_id="6f91088a406011ed95aed352566e8d4c",
+            default_sampling=1,
+            name="cloudflare user's account",
+            router_ips=["203.0.113.1"],
+            warp_devices=[
+                {
+                    "id": "5360368d-b351-4791-abe1-93550dabd351",
+                    "name": "My warp device",
+                    "router_ip": "203.0.113.1",
+                }
+            ],
         )
         assert_matches_type(Configuration, config, path=["response"])
 
@@ -279,7 +375,8 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_network_monitoring.configs.with_raw_response.update(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            default_sampling=1,
+            name="cloudflare user's account",
         )
 
         assert response.is_closed is True
@@ -291,7 +388,8 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.magic_network_monitoring.configs.with_streaming_response.update(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            default_sampling=1,
+            name="cloudflare user's account",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -306,7 +404,8 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.magic_network_monitoring.configs.with_raw_response.update(
                 account_id="",
-                body={},
+                default_sampling=1,
+                name="cloudflare user's account",
             )
 
     @parametrize
@@ -351,7 +450,23 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
         config = await async_client.magic_network_monitoring.configs.edit(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+        )
+        assert_matches_type(Configuration, config, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        config = await async_client.magic_network_monitoring.configs.edit(
+            account_id="6f91088a406011ed95aed352566e8d4c",
+            default_sampling=1,
+            name="cloudflare user's account",
+            router_ips=["203.0.113.1"],
+            warp_devices=[
+                {
+                    "id": "5360368d-b351-4791-abe1-93550dabd351",
+                    "name": "My warp device",
+                    "router_ip": "203.0.113.1",
+                }
+            ],
         )
         assert_matches_type(Configuration, config, path=["response"])
 
@@ -359,7 +474,6 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_network_monitoring.configs.with_raw_response.edit(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
         )
 
         assert response.is_closed is True
@@ -371,7 +485,6 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
         async with async_client.magic_network_monitoring.configs.with_streaming_response.edit(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -386,7 +499,6 @@ async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.magic_network_monitoring.configs.with_raw_response.edit(
                 account_id="",
-                body={},
             )
 
     @parametrize
diff --git a/tests/api_resources/magic_network_monitoring/test_rules.py b/tests/api_resources/magic_network_monitoring/test_rules.py
index d2b2bce970e..862586ea078 100644
--- a/tests/api_resources/magic_network_monitoring/test_rules.py
+++ b/tests/api_resources/magic_network_monitoring/test_rules.py
@@ -24,7 +24,21 @@ class TestRules:
     def test_method_create(self, client: Cloudflare) -> None:
         rule = client.magic_network_monitoring.rules.create(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            duration="1m",
+            name="my_rule_1",
+        )
+        assert_matches_type(Optional[MagicNetworkMonitoringRule], rule, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        rule = client.magic_network_monitoring.rules.create(
+            account_id="6f91088a406011ed95aed352566e8d4c",
+            duration="1m",
+            name="my_rule_1",
+            automatic_advertisement=True,
+            bandwidth=1000,
+            packet_threshold=10000,
+            prefixes=["203.0.113.1/32"],
         )
         assert_matches_type(Optional[MagicNetworkMonitoringRule], rule, path=["response"])
 
@@ -32,7 +46,8 @@ def test_method_create(self, client: Cloudflare) -> None:
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.magic_network_monitoring.rules.with_raw_response.create(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            duration="1m",
+            name="my_rule_1",
         )
 
         assert response.is_closed is True
@@ -44,7 +59,8 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.magic_network_monitoring.rules.with_streaming_response.create(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            duration="1m",
+            name="my_rule_1",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -59,22 +75,42 @@ def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.magic_network_monitoring.rules.with_raw_response.create(
                 account_id="",
-                body={},
+                duration="1m",
+                name="my_rule_1",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         rule = client.magic_network_monitoring.rules.update(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            duration="1m",
+            name="my_rule_1",
         )
         assert_matches_type(Optional[MagicNetworkMonitoringRule], rule, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        rule = client.magic_network_monitoring.rules.update(
+            account_id="6f91088a406011ed95aed352566e8d4c",
+            duration="1m",
+            name="my_rule_1",
+            id="2890e6fa406311ed9b5a23f70f6fb8cf",
+            automatic_advertisement=True,
+            bandwidth=1000,
+            packet_threshold=10000,
+            prefixes=["203.0.113.1/32"],
+        )
+        assert_matches_type(Optional[MagicNetworkMonitoringRule], rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.magic_network_monitoring.rules.with_raw_response.update(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            duration="1m",
+            name="my_rule_1",
         )
 
         assert response.is_closed is True
@@ -82,11 +118,13 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         rule = response.parse()
         assert_matches_type(Optional[MagicNetworkMonitoringRule], rule, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.magic_network_monitoring.rules.with_streaming_response.update(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            duration="1m",
+            name="my_rule_1",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -96,12 +134,14 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.magic_network_monitoring.rules.with_raw_response.update(
                 account_id="",
-                body={},
+                duration="1m",
+                name="my_rule_1",
             )
 
     @parametrize
@@ -195,7 +235,20 @@ def test_method_edit(self, client: Cloudflare) -> None:
         rule = client.magic_network_monitoring.rules.edit(
             rule_id="2890e6fa406311ed9b5a23f70f6fb8cf",
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+        )
+        assert_matches_type(Optional[MagicNetworkMonitoringRule], rule, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        rule = client.magic_network_monitoring.rules.edit(
+            rule_id="2890e6fa406311ed9b5a23f70f6fb8cf",
+            account_id="6f91088a406011ed95aed352566e8d4c",
+            automatic_advertisement=True,
+            bandwidth=1000,
+            duration="1m",
+            name="my_rule_1",
+            packet_threshold=10000,
+            prefixes=["203.0.113.1/32"],
         )
         assert_matches_type(Optional[MagicNetworkMonitoringRule], rule, path=["response"])
 
@@ -204,7 +257,6 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
         response = client.magic_network_monitoring.rules.with_raw_response.edit(
             rule_id="2890e6fa406311ed9b5a23f70f6fb8cf",
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
         )
 
         assert response.is_closed is True
@@ -217,7 +269,6 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
         with client.magic_network_monitoring.rules.with_streaming_response.edit(
             rule_id="2890e6fa406311ed9b5a23f70f6fb8cf",
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -233,14 +284,12 @@ def test_path_params_edit(self, client: Cloudflare) -> None:
             client.magic_network_monitoring.rules.with_raw_response.edit(
                 rule_id="2890e6fa406311ed9b5a23f70f6fb8cf",
                 account_id="",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
             client.magic_network_monitoring.rules.with_raw_response.edit(
                 rule_id="",
                 account_id="6f91088a406011ed95aed352566e8d4c",
-                body={},
             )
 
     @parametrize
@@ -293,13 +342,29 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncRules:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         rule = await async_client.magic_network_monitoring.rules.create(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            duration="1m",
+            name="my_rule_1",
+        )
+        assert_matches_type(Optional[MagicNetworkMonitoringRule], rule, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.magic_network_monitoring.rules.create(
+            account_id="6f91088a406011ed95aed352566e8d4c",
+            duration="1m",
+            name="my_rule_1",
+            automatic_advertisement=True,
+            bandwidth=1000,
+            packet_threshold=10000,
+            prefixes=["203.0.113.1/32"],
         )
         assert_matches_type(Optional[MagicNetworkMonitoringRule], rule, path=["response"])
 
@@ -307,7 +372,8 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_network_monitoring.rules.with_raw_response.create(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            duration="1m",
+            name="my_rule_1",
         )
 
         assert response.is_closed is True
@@ -319,7 +385,8 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.magic_network_monitoring.rules.with_streaming_response.create(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            duration="1m",
+            name="my_rule_1",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -334,22 +401,42 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.magic_network_monitoring.rules.with_raw_response.create(
                 account_id="",
-                body={},
+                duration="1m",
+                name="my_rule_1",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         rule = await async_client.magic_network_monitoring.rules.update(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            duration="1m",
+            name="my_rule_1",
         )
         assert_matches_type(Optional[MagicNetworkMonitoringRule], rule, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.magic_network_monitoring.rules.update(
+            account_id="6f91088a406011ed95aed352566e8d4c",
+            duration="1m",
+            name="my_rule_1",
+            id="2890e6fa406311ed9b5a23f70f6fb8cf",
+            automatic_advertisement=True,
+            bandwidth=1000,
+            packet_threshold=10000,
+            prefixes=["203.0.113.1/32"],
+        )
+        assert_matches_type(Optional[MagicNetworkMonitoringRule], rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_network_monitoring.rules.with_raw_response.update(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            duration="1m",
+            name="my_rule_1",
         )
 
         assert response.is_closed is True
@@ -357,11 +444,13 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         rule = await response.parse()
         assert_matches_type(Optional[MagicNetworkMonitoringRule], rule, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.magic_network_monitoring.rules.with_streaming_response.update(
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+            duration="1m",
+            name="my_rule_1",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -371,12 +460,14 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.magic_network_monitoring.rules.with_raw_response.update(
                 account_id="",
-                body={},
+                duration="1m",
+                name="my_rule_1",
             )
 
     @parametrize
@@ -470,7 +561,20 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
         rule = await async_client.magic_network_monitoring.rules.edit(
             rule_id="2890e6fa406311ed9b5a23f70f6fb8cf",
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
+        )
+        assert_matches_type(Optional[MagicNetworkMonitoringRule], rule, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.magic_network_monitoring.rules.edit(
+            rule_id="2890e6fa406311ed9b5a23f70f6fb8cf",
+            account_id="6f91088a406011ed95aed352566e8d4c",
+            automatic_advertisement=True,
+            bandwidth=1000,
+            duration="1m",
+            name="my_rule_1",
+            packet_threshold=10000,
+            prefixes=["203.0.113.1/32"],
         )
         assert_matches_type(Optional[MagicNetworkMonitoringRule], rule, path=["response"])
 
@@ -479,7 +583,6 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_network_monitoring.rules.with_raw_response.edit(
             rule_id="2890e6fa406311ed9b5a23f70f6fb8cf",
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
         )
 
         assert response.is_closed is True
@@ -492,7 +595,6 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
         async with async_client.magic_network_monitoring.rules.with_streaming_response.edit(
             rule_id="2890e6fa406311ed9b5a23f70f6fb8cf",
             account_id="6f91088a406011ed95aed352566e8d4c",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -508,14 +610,12 @@ async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
             await async_client.magic_network_monitoring.rules.with_raw_response.edit(
                 rule_id="2890e6fa406311ed9b5a23f70f6fb8cf",
                 account_id="",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
             await async_client.magic_network_monitoring.rules.with_raw_response.edit(
                 rule_id="",
                 account_id="6f91088a406011ed95aed352566e8d4c",
-                body={},
             )
 
     @parametrize
diff --git a/tests/api_resources/magic_network_monitoring/vpc_flows/__init__.py b/tests/api_resources/magic_network_monitoring/vpc_flows/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/magic_network_monitoring/vpc_flows/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/magic_network_monitoring/vpc_flows/test_tokens.py b/tests/api_resources/magic_network_monitoring/vpc_flows/test_tokens.py
new file mode 100644
index 00000000000..3d876e6c8bf
--- /dev/null
+++ b/tests/api_resources/magic_network_monitoring/vpc_flows/test_tokens.py
@@ -0,0 +1,99 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestTokens:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        token = client.magic_network_monitoring.vpc_flows.tokens.create(
+            account_id="6f91088a406011ed95aed352566e8d4c",
+        )
+        assert_matches_type(str, token, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.magic_network_monitoring.vpc_flows.tokens.with_raw_response.create(
+            account_id="6f91088a406011ed95aed352566e8d4c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = response.parse()
+        assert_matches_type(str, token, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.magic_network_monitoring.vpc_flows.tokens.with_streaming_response.create(
+            account_id="6f91088a406011ed95aed352566e8d4c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = response.parse()
+            assert_matches_type(str, token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_network_monitoring.vpc_flows.tokens.with_raw_response.create(
+                account_id="",
+            )
+
+
+class TestAsyncTokens:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        token = await async_client.magic_network_monitoring.vpc_flows.tokens.create(
+            account_id="6f91088a406011ed95aed352566e8d4c",
+        )
+        assert_matches_type(str, token, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_network_monitoring.vpc_flows.tokens.with_raw_response.create(
+            account_id="6f91088a406011ed95aed352566e8d4c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = await response.parse()
+        assert_matches_type(str, token, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_network_monitoring.vpc_flows.tokens.with_streaming_response.create(
+            account_id="6f91088a406011ed95aed352566e8d4c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = await response.parse()
+            assert_matches_type(str, token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_network_monitoring.vpc_flows.tokens.with_raw_response.create(
+                account_id="",
+            )
diff --git a/tests/api_resources/magic_transit/connectors/__init__.py b/tests/api_resources/magic_transit/connectors/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/magic_transit/connectors/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/magic_transit/connectors/events/__init__.py b/tests/api_resources/magic_transit/connectors/events/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/magic_transit/connectors/events/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/magic_transit/connectors/events/test_latest.py b/tests/api_resources/magic_transit/connectors/events/test_latest.py
new file mode 100644
index 00000000000..04679973ea3
--- /dev/null
+++ b/tests/api_resources/magic_transit/connectors/events/test_latest.py
@@ -0,0 +1,120 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.magic_transit.connectors.events import LatestListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestLatest:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        latest = client.magic_transit.connectors.events.latest.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LatestListResponse, latest, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.magic_transit.connectors.events.latest.with_raw_response.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        latest = response.parse()
+        assert_matches_type(LatestListResponse, latest, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.magic_transit.connectors.events.latest.with_streaming_response.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            latest = response.parse()
+            assert_matches_type(LatestListResponse, latest, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_transit.connectors.events.latest.with_raw_response.list(
+                connector_id="connector_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `connector_id` but received ''"):
+            client.magic_transit.connectors.events.latest.with_raw_response.list(
+                connector_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncLatest:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        latest = await async_client.magic_transit.connectors.events.latest.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LatestListResponse, latest, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.connectors.events.latest.with_raw_response.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        latest = await response.parse()
+        assert_matches_type(LatestListResponse, latest, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.connectors.events.latest.with_streaming_response.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            latest = await response.parse()
+            assert_matches_type(LatestListResponse, latest, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_transit.connectors.events.latest.with_raw_response.list(
+                connector_id="connector_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `connector_id` but received ''"):
+            await async_client.magic_transit.connectors.events.latest.with_raw_response.list(
+                connector_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/magic_transit/connectors/snapshots/__init__.py b/tests/api_resources/magic_transit/connectors/snapshots/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/magic_transit/connectors/snapshots/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/magic_transit/connectors/snapshots/test_latest.py b/tests/api_resources/magic_transit/connectors/snapshots/test_latest.py
new file mode 100644
index 00000000000..639138ca157
--- /dev/null
+++ b/tests/api_resources/magic_transit/connectors/snapshots/test_latest.py
@@ -0,0 +1,120 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.magic_transit.connectors.snapshots import LatestListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestLatest:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        latest = client.magic_transit.connectors.snapshots.latest.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LatestListResponse, latest, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.magic_transit.connectors.snapshots.latest.with_raw_response.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        latest = response.parse()
+        assert_matches_type(LatestListResponse, latest, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.magic_transit.connectors.snapshots.latest.with_streaming_response.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            latest = response.parse()
+            assert_matches_type(LatestListResponse, latest, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_transit.connectors.snapshots.latest.with_raw_response.list(
+                connector_id="connector_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `connector_id` but received ''"):
+            client.magic_transit.connectors.snapshots.latest.with_raw_response.list(
+                connector_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncLatest:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        latest = await async_client.magic_transit.connectors.snapshots.latest.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LatestListResponse, latest, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.connectors.snapshots.latest.with_raw_response.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        latest = await response.parse()
+        assert_matches_type(LatestListResponse, latest, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.connectors.snapshots.latest.with_streaming_response.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            latest = await response.parse()
+            assert_matches_type(LatestListResponse, latest, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_transit.connectors.snapshots.latest.with_raw_response.list(
+                connector_id="connector_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `connector_id` but received ''"):
+            await async_client.magic_transit.connectors.snapshots.latest.with_raw_response.list(
+                connector_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/magic_transit/connectors/test_events.py b/tests/api_resources/magic_transit/connectors/test_events.py
new file mode 100644
index 00000000000..aab24b14fa6
--- /dev/null
+++ b/tests/api_resources/magic_transit/connectors/test_events.py
@@ -0,0 +1,282 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.magic_transit.connectors import EventGetResponse, EventListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestEvents:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        event = client.magic_transit.connectors.events.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            from_=0,
+            to=0,
+        )
+        assert_matches_type(EventListResponse, event, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        event = client.magic_transit.connectors.events.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            from_=0,
+            to=0,
+            cursor="cursor",
+            k="k",
+            limit=0,
+        )
+        assert_matches_type(EventListResponse, event, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.magic_transit.connectors.events.with_raw_response.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            from_=0,
+            to=0,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        event = response.parse()
+        assert_matches_type(EventListResponse, event, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.magic_transit.connectors.events.with_streaming_response.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            from_=0,
+            to=0,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            event = response.parse()
+            assert_matches_type(EventListResponse, event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_transit.connectors.events.with_raw_response.list(
+                connector_id="connector_id",
+                account_id="",
+                from_=0,
+                to=0,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `connector_id` but received ''"):
+            client.magic_transit.connectors.events.with_raw_response.list(
+                connector_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                from_=0,
+                to=0,
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        event = client.magic_transit.connectors.events.get(
+            event_n=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            connector_id="connector_id",
+            event_t=0,
+        )
+        assert_matches_type(EventGetResponse, event, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.magic_transit.connectors.events.with_raw_response.get(
+            event_n=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            connector_id="connector_id",
+            event_t=0,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        event = response.parse()
+        assert_matches_type(EventGetResponse, event, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.magic_transit.connectors.events.with_streaming_response.get(
+            event_n=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            connector_id="connector_id",
+            event_t=0,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            event = response.parse()
+            assert_matches_type(EventGetResponse, event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_transit.connectors.events.with_raw_response.get(
+                event_n=0,
+                account_id="",
+                connector_id="connector_id",
+                event_t=0,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `connector_id` but received ''"):
+            client.magic_transit.connectors.events.with_raw_response.get(
+                event_n=0,
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                connector_id="",
+                event_t=0,
+            )
+
+
+class TestAsyncEvents:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        event = await async_client.magic_transit.connectors.events.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            from_=0,
+            to=0,
+        )
+        assert_matches_type(EventListResponse, event, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        event = await async_client.magic_transit.connectors.events.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            from_=0,
+            to=0,
+            cursor="cursor",
+            k="k",
+            limit=0,
+        )
+        assert_matches_type(EventListResponse, event, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.connectors.events.with_raw_response.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            from_=0,
+            to=0,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        event = await response.parse()
+        assert_matches_type(EventListResponse, event, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.connectors.events.with_streaming_response.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            from_=0,
+            to=0,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            event = await response.parse()
+            assert_matches_type(EventListResponse, event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_transit.connectors.events.with_raw_response.list(
+                connector_id="connector_id",
+                account_id="",
+                from_=0,
+                to=0,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `connector_id` but received ''"):
+            await async_client.magic_transit.connectors.events.with_raw_response.list(
+                connector_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                from_=0,
+                to=0,
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        event = await async_client.magic_transit.connectors.events.get(
+            event_n=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            connector_id="connector_id",
+            event_t=0,
+        )
+        assert_matches_type(EventGetResponse, event, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.connectors.events.with_raw_response.get(
+            event_n=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            connector_id="connector_id",
+            event_t=0,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        event = await response.parse()
+        assert_matches_type(EventGetResponse, event, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.connectors.events.with_streaming_response.get(
+            event_n=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            connector_id="connector_id",
+            event_t=0,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            event = await response.parse()
+            assert_matches_type(EventGetResponse, event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_transit.connectors.events.with_raw_response.get(
+                event_n=0,
+                account_id="",
+                connector_id="connector_id",
+                event_t=0,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `connector_id` but received ''"):
+            await async_client.magic_transit.connectors.events.with_raw_response.get(
+                event_n=0,
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                connector_id="",
+                event_t=0,
+            )
diff --git a/tests/api_resources/magic_transit/connectors/test_snapshots.py b/tests/api_resources/magic_transit/connectors/test_snapshots.py
new file mode 100644
index 00000000000..f820c3d86f3
--- /dev/null
+++ b/tests/api_resources/magic_transit/connectors/test_snapshots.py
@@ -0,0 +1,270 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.magic_transit.connectors import SnapshotGetResponse, SnapshotListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSnapshots:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        snapshot = client.magic_transit.connectors.snapshots.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            from_=0,
+            to=0,
+        )
+        assert_matches_type(SnapshotListResponse, snapshot, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        snapshot = client.magic_transit.connectors.snapshots.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            from_=0,
+            to=0,
+            cursor="cursor",
+            limit=0,
+        )
+        assert_matches_type(SnapshotListResponse, snapshot, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.magic_transit.connectors.snapshots.with_raw_response.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            from_=0,
+            to=0,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        snapshot = response.parse()
+        assert_matches_type(SnapshotListResponse, snapshot, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.magic_transit.connectors.snapshots.with_streaming_response.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            from_=0,
+            to=0,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            snapshot = response.parse()
+            assert_matches_type(SnapshotListResponse, snapshot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_transit.connectors.snapshots.with_raw_response.list(
+                connector_id="connector_id",
+                account_id="",
+                from_=0,
+                to=0,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `connector_id` but received ''"):
+            client.magic_transit.connectors.snapshots.with_raw_response.list(
+                connector_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                from_=0,
+                to=0,
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        snapshot = client.magic_transit.connectors.snapshots.get(
+            snapshot_t=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            connector_id="connector_id",
+        )
+        assert_matches_type(SnapshotGetResponse, snapshot, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.magic_transit.connectors.snapshots.with_raw_response.get(
+            snapshot_t=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            connector_id="connector_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        snapshot = response.parse()
+        assert_matches_type(SnapshotGetResponse, snapshot, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.magic_transit.connectors.snapshots.with_streaming_response.get(
+            snapshot_t=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            connector_id="connector_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            snapshot = response.parse()
+            assert_matches_type(SnapshotGetResponse, snapshot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_transit.connectors.snapshots.with_raw_response.get(
+                snapshot_t=0,
+                account_id="",
+                connector_id="connector_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `connector_id` but received ''"):
+            client.magic_transit.connectors.snapshots.with_raw_response.get(
+                snapshot_t=0,
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                connector_id="",
+            )
+
+
+class TestAsyncSnapshots:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        snapshot = await async_client.magic_transit.connectors.snapshots.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            from_=0,
+            to=0,
+        )
+        assert_matches_type(SnapshotListResponse, snapshot, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        snapshot = await async_client.magic_transit.connectors.snapshots.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            from_=0,
+            to=0,
+            cursor="cursor",
+            limit=0,
+        )
+        assert_matches_type(SnapshotListResponse, snapshot, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.connectors.snapshots.with_raw_response.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            from_=0,
+            to=0,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        snapshot = await response.parse()
+        assert_matches_type(SnapshotListResponse, snapshot, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.connectors.snapshots.with_streaming_response.list(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            from_=0,
+            to=0,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            snapshot = await response.parse()
+            assert_matches_type(SnapshotListResponse, snapshot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_transit.connectors.snapshots.with_raw_response.list(
+                connector_id="connector_id",
+                account_id="",
+                from_=0,
+                to=0,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `connector_id` but received ''"):
+            await async_client.magic_transit.connectors.snapshots.with_raw_response.list(
+                connector_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                from_=0,
+                to=0,
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        snapshot = await async_client.magic_transit.connectors.snapshots.get(
+            snapshot_t=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            connector_id="connector_id",
+        )
+        assert_matches_type(SnapshotGetResponse, snapshot, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.connectors.snapshots.with_raw_response.get(
+            snapshot_t=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            connector_id="connector_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        snapshot = await response.parse()
+        assert_matches_type(SnapshotGetResponse, snapshot, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.connectors.snapshots.with_streaming_response.get(
+            snapshot_t=0,
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            connector_id="connector_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            snapshot = await response.parse()
+            assert_matches_type(SnapshotGetResponse, snapshot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_transit.connectors.snapshots.with_raw_response.get(
+                snapshot_t=0,
+                account_id="",
+                connector_id="connector_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `connector_id` but received ''"):
+            await async_client.magic_transit.connectors.snapshots.with_raw_response.get(
+                snapshot_t=0,
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                connector_id="",
+            )
diff --git a/tests/api_resources/magic_transit/pcaps/__init__.py b/tests/api_resources/magic_transit/pcaps/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/magic_transit/pcaps/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/pcaps/test_download.py b/tests/api_resources/magic_transit/pcaps/test_download.py
similarity index 86%
rename from tests/api_resources/pcaps/test_download.py
rename to tests/api_resources/magic_transit/pcaps/test_download.py
index 95dae97f261..de43411bbd3 100644
--- a/tests/api_resources/pcaps/test_download.py
+++ b/tests/api_resources/magic_transit/pcaps/test_download.py
@@ -29,7 +29,7 @@ def test_method_get(self, client: Cloudflare, respx_mock: MockRouter) -> None:
         respx_mock.get(
             "/accounts/023e105f4ecef8ad9ca31a8372d0c353/pcaps/023e105f4ecef8ad9ca31a8372d0c353/download"
         ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
-        download = client.pcaps.download.get(
+        download = client.magic_transit.pcaps.download.get(
             pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -45,7 +45,7 @@ def test_raw_response_get(self, client: Cloudflare, respx_mock: MockRouter) -> N
             "/accounts/023e105f4ecef8ad9ca31a8372d0c353/pcaps/023e105f4ecef8ad9ca31a8372d0c353/download"
         ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
 
-        download = client.pcaps.download.with_raw_response.get(
+        download = client.magic_transit.pcaps.download.with_raw_response.get(
             pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -61,7 +61,7 @@ def test_streaming_response_get(self, client: Cloudflare, respx_mock: MockRouter
         respx_mock.get(
             "/accounts/023e105f4ecef8ad9ca31a8372d0c353/pcaps/023e105f4ecef8ad9ca31a8372d0c353/download"
         ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
-        with client.pcaps.download.with_streaming_response.get(
+        with client.magic_transit.pcaps.download.with_streaming_response.get(
             pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as download:
@@ -78,20 +78,22 @@ def test_streaming_response_get(self, client: Cloudflare, respx_mock: MockRouter
     @pytest.mark.respx(base_url=base_url)
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.pcaps.download.with_raw_response.get(
+            client.magic_transit.pcaps.download.with_raw_response.get(
                 pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `pcap_id` but received ''"):
-            client.pcaps.download.with_raw_response.get(
+            client.magic_transit.pcaps.download.with_raw_response.get(
                 pcap_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
 
 class TestAsyncDownload:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     @pytest.mark.respx(base_url=base_url)
@@ -99,7 +101,7 @@ async def test_method_get(self, async_client: AsyncCloudflare, respx_mock: MockR
         respx_mock.get(
             "/accounts/023e105f4ecef8ad9ca31a8372d0c353/pcaps/023e105f4ecef8ad9ca31a8372d0c353/download"
         ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
-        download = await async_client.pcaps.download.get(
+        download = await async_client.magic_transit.pcaps.download.get(
             pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -115,7 +117,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare, respx_mock:
             "/accounts/023e105f4ecef8ad9ca31a8372d0c353/pcaps/023e105f4ecef8ad9ca31a8372d0c353/download"
         ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
 
-        download = await async_client.pcaps.download.with_raw_response.get(
+        download = await async_client.magic_transit.pcaps.download.with_raw_response.get(
             pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -131,7 +133,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare, respx
         respx_mock.get(
             "/accounts/023e105f4ecef8ad9ca31a8372d0c353/pcaps/023e105f4ecef8ad9ca31a8372d0c353/download"
         ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
-        async with async_client.pcaps.download.with_streaming_response.get(
+        async with async_client.magic_transit.pcaps.download.with_streaming_response.get(
             pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as download:
@@ -148,13 +150,13 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare, respx
     @pytest.mark.respx(base_url=base_url)
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.pcaps.download.with_raw_response.get(
+            await async_client.magic_transit.pcaps.download.with_raw_response.get(
                 pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `pcap_id` but received ''"):
-            await async_client.pcaps.download.with_raw_response.get(
+            await async_client.magic_transit.pcaps.download.with_raw_response.get(
                 pcap_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/pcaps/test_ownership.py b/tests/api_resources/magic_transit/pcaps/test_ownership.py
similarity index 78%
rename from tests/api_resources/pcaps/test_ownership.py
rename to tests/api_resources/magic_transit/pcaps/test_ownership.py
index e6854449f2d..dcc99b592ff 100644
--- a/tests/api_resources/pcaps/test_ownership.py
+++ b/tests/api_resources/magic_transit/pcaps/test_ownership.py
@@ -3,13 +3,14 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.pcaps import Ownership, OwnershipGetResponse
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.magic_transit.pcaps import Ownership
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -19,7 +20,7 @@ class TestOwnership:
 
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
-        ownership = client.pcaps.ownership.create(
+        ownership = client.magic_transit.pcaps.ownership.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             destination_conf="s3://pcaps-bucket?region=us-east-1",
         )
@@ -27,7 +28,7 @@ def test_method_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.pcaps.ownership.with_raw_response.create(
+        response = client.magic_transit.pcaps.ownership.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             destination_conf="s3://pcaps-bucket?region=us-east-1",
         )
@@ -39,7 +40,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.pcaps.ownership.with_streaming_response.create(
+        with client.magic_transit.pcaps.ownership.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             destination_conf="s3://pcaps-bucket?region=us-east-1",
         ) as response:
@@ -54,14 +55,14 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.pcaps.ownership.with_raw_response.create(
+            client.magic_transit.pcaps.ownership.with_raw_response.create(
                 account_id="",
                 destination_conf="s3://pcaps-bucket?region=us-east-1",
             )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
-        ownership = client.pcaps.ownership.delete(
+        ownership = client.magic_transit.pcaps.ownership.delete(
             ownership_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -69,7 +70,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.pcaps.ownership.with_raw_response.delete(
+        response = client.magic_transit.pcaps.ownership.with_raw_response.delete(
             ownership_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -81,7 +82,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.pcaps.ownership.with_streaming_response.delete(
+        with client.magic_transit.pcaps.ownership.with_streaming_response.delete(
             ownership_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
@@ -96,58 +97,58 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.pcaps.ownership.with_raw_response.delete(
+            client.magic_transit.pcaps.ownership.with_raw_response.delete(
                 ownership_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `ownership_id` but received ''"):
-            client.pcaps.ownership.with_raw_response.delete(
+            client.magic_transit.pcaps.ownership.with_raw_response.delete(
                 ownership_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        ownership = client.pcaps.ownership.get(
+        ownership = client.magic_transit.pcaps.ownership.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[OwnershipGetResponse], ownership, path=["response"])
+        assert_matches_type(SyncSinglePage[Ownership], ownership, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.pcaps.ownership.with_raw_response.get(
+        response = client.magic_transit.pcaps.ownership.with_raw_response.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         ownership = response.parse()
-        assert_matches_type(Optional[OwnershipGetResponse], ownership, path=["response"])
+        assert_matches_type(SyncSinglePage[Ownership], ownership, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.pcaps.ownership.with_streaming_response.get(
+        with client.magic_transit.pcaps.ownership.with_streaming_response.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             ownership = response.parse()
-            assert_matches_type(Optional[OwnershipGetResponse], ownership, path=["response"])
+            assert_matches_type(SyncSinglePage[Ownership], ownership, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.pcaps.ownership.with_raw_response.get(
+            client.magic_transit.pcaps.ownership.with_raw_response.get(
                 account_id="",
             )
 
     @parametrize
     def test_method_validate(self, client: Cloudflare) -> None:
-        ownership = client.pcaps.ownership.validate(
+        ownership = client.magic_transit.pcaps.ownership.validate(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             destination_conf="s3://pcaps-bucket?region=us-east-1",
             ownership_challenge="ownership-challenge-9883874ecac311ec8475433579a6bf5f.txt",
@@ -156,7 +157,7 @@ def test_method_validate(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_validate(self, client: Cloudflare) -> None:
-        response = client.pcaps.ownership.with_raw_response.validate(
+        response = client.magic_transit.pcaps.ownership.with_raw_response.validate(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             destination_conf="s3://pcaps-bucket?region=us-east-1",
             ownership_challenge="ownership-challenge-9883874ecac311ec8475433579a6bf5f.txt",
@@ -169,7 +170,7 @@ def test_raw_response_validate(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_validate(self, client: Cloudflare) -> None:
-        with client.pcaps.ownership.with_streaming_response.validate(
+        with client.magic_transit.pcaps.ownership.with_streaming_response.validate(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             destination_conf="s3://pcaps-bucket?region=us-east-1",
             ownership_challenge="ownership-challenge-9883874ecac311ec8475433579a6bf5f.txt",
@@ -185,7 +186,7 @@ def test_streaming_response_validate(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_validate(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.pcaps.ownership.with_raw_response.validate(
+            client.magic_transit.pcaps.ownership.with_raw_response.validate(
                 account_id="",
                 destination_conf="s3://pcaps-bucket?region=us-east-1",
                 ownership_challenge="ownership-challenge-9883874ecac311ec8475433579a6bf5f.txt",
@@ -193,11 +194,13 @@ def test_path_params_validate(self, client: Cloudflare) -> None:
 
 
 class TestAsyncOwnership:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        ownership = await async_client.pcaps.ownership.create(
+        ownership = await async_client.magic_transit.pcaps.ownership.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             destination_conf="s3://pcaps-bucket?region=us-east-1",
         )
@@ -205,7 +208,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.pcaps.ownership.with_raw_response.create(
+        response = await async_client.magic_transit.pcaps.ownership.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             destination_conf="s3://pcaps-bucket?region=us-east-1",
         )
@@ -217,7 +220,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.pcaps.ownership.with_streaming_response.create(
+        async with async_client.magic_transit.pcaps.ownership.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             destination_conf="s3://pcaps-bucket?region=us-east-1",
         ) as response:
@@ -232,14 +235,14 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.pcaps.ownership.with_raw_response.create(
+            await async_client.magic_transit.pcaps.ownership.with_raw_response.create(
                 account_id="",
                 destination_conf="s3://pcaps-bucket?region=us-east-1",
             )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        ownership = await async_client.pcaps.ownership.delete(
+        ownership = await async_client.magic_transit.pcaps.ownership.delete(
             ownership_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -247,7 +250,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.pcaps.ownership.with_raw_response.delete(
+        response = await async_client.magic_transit.pcaps.ownership.with_raw_response.delete(
             ownership_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -259,7 +262,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.pcaps.ownership.with_streaming_response.delete(
+        async with async_client.magic_transit.pcaps.ownership.with_streaming_response.delete(
             ownership_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
@@ -274,58 +277,58 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.pcaps.ownership.with_raw_response.delete(
+            await async_client.magic_transit.pcaps.ownership.with_raw_response.delete(
                 ownership_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `ownership_id` but received ''"):
-            await async_client.pcaps.ownership.with_raw_response.delete(
+            await async_client.magic_transit.pcaps.ownership.with_raw_response.delete(
                 ownership_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        ownership = await async_client.pcaps.ownership.get(
+        ownership = await async_client.magic_transit.pcaps.ownership.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[OwnershipGetResponse], ownership, path=["response"])
+        assert_matches_type(AsyncSinglePage[Ownership], ownership, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.pcaps.ownership.with_raw_response.get(
+        response = await async_client.magic_transit.pcaps.ownership.with_raw_response.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         ownership = await response.parse()
-        assert_matches_type(Optional[OwnershipGetResponse], ownership, path=["response"])
+        assert_matches_type(AsyncSinglePage[Ownership], ownership, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.pcaps.ownership.with_streaming_response.get(
+        async with async_client.magic_transit.pcaps.ownership.with_streaming_response.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             ownership = await response.parse()
-            assert_matches_type(Optional[OwnershipGetResponse], ownership, path=["response"])
+            assert_matches_type(AsyncSinglePage[Ownership], ownership, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.pcaps.ownership.with_raw_response.get(
+            await async_client.magic_transit.pcaps.ownership.with_raw_response.get(
                 account_id="",
             )
 
     @parametrize
     async def test_method_validate(self, async_client: AsyncCloudflare) -> None:
-        ownership = await async_client.pcaps.ownership.validate(
+        ownership = await async_client.magic_transit.pcaps.ownership.validate(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             destination_conf="s3://pcaps-bucket?region=us-east-1",
             ownership_challenge="ownership-challenge-9883874ecac311ec8475433579a6bf5f.txt",
@@ -334,7 +337,7 @@ async def test_method_validate(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_validate(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.pcaps.ownership.with_raw_response.validate(
+        response = await async_client.magic_transit.pcaps.ownership.with_raw_response.validate(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             destination_conf="s3://pcaps-bucket?region=us-east-1",
             ownership_challenge="ownership-challenge-9883874ecac311ec8475433579a6bf5f.txt",
@@ -347,7 +350,7 @@ async def test_raw_response_validate(self, async_client: AsyncCloudflare) -> Non
 
     @parametrize
     async def test_streaming_response_validate(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.pcaps.ownership.with_streaming_response.validate(
+        async with async_client.magic_transit.pcaps.ownership.with_streaming_response.validate(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             destination_conf="s3://pcaps-bucket?region=us-east-1",
             ownership_challenge="ownership-challenge-9883874ecac311ec8475433579a6bf5f.txt",
@@ -363,7 +366,7 @@ async def test_streaming_response_validate(self, async_client: AsyncCloudflare)
     @parametrize
     async def test_path_params_validate(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.pcaps.ownership.with_raw_response.validate(
+            await async_client.magic_transit.pcaps.ownership.with_raw_response.validate(
                 account_id="",
                 destination_conf="s3://pcaps-bucket?region=us-east-1",
                 ownership_challenge="ownership-challenge-9883874ecac311ec8475433579a6bf5f.txt",
diff --git a/tests/api_resources/magic_transit/sites/test_acls.py b/tests/api_resources/magic_transit/sites/test_acls.py
index bf74fe77628..1e98e853d29 100644
--- a/tests/api_resources/magic_transit/sites/test_acls.py
+++ b/tests/api_resources/magic_transit/sites/test_acls.py
@@ -39,19 +39,22 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             lan_1={
                 "lan_id": "lan_id",
                 "lan_name": "lan_name",
-                "ports": [1, 1, 1],
-                "subnets": ["192.0.2.1", "192.0.2.1", "192.0.2.1"],
+                "port_ranges": ["8080-9000"],
+                "ports": [1],
+                "subnets": ["192.0.2.1"],
             },
             lan_2={
                 "lan_id": "lan_id",
                 "lan_name": "lan_name",
-                "ports": [1, 1, 1],
-                "subnets": ["192.0.2.1", "192.0.2.1", "192.0.2.1"],
+                "port_ranges": ["8080-9000"],
+                "ports": [1],
+                "subnets": ["192.0.2.1"],
             },
             name="PIN Pad - Cash Register",
             description="Allows local traffic between PIN pads and cash register.",
             forward_locally=True,
-            protocols=["tcp", "udp", "icmp"],
+            protocols=["tcp"],
+            unidirectional=True,
         )
         assert_matches_type(ACL, acl, path=["response"])
 
@@ -127,17 +130,20 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             lan_1={
                 "lan_id": "lan_id",
                 "lan_name": "lan_name",
-                "ports": [1, 1, 1],
-                "subnets": ["192.0.2.1", "192.0.2.1", "192.0.2.1"],
+                "port_ranges": ["8080-9000"],
+                "ports": [1],
+                "subnets": ["192.0.2.1"],
             },
             lan_2={
                 "lan_id": "lan_id",
                 "lan_name": "lan_name",
-                "ports": [1, 1, 1],
-                "subnets": ["192.0.2.1", "192.0.2.1", "192.0.2.1"],
+                "port_ranges": ["8080-9000"],
+                "ports": [1],
+                "subnets": ["192.0.2.1"],
             },
             name="PIN Pad - Cash Register",
-            protocols=["tcp", "udp", "icmp"],
+            protocols=["tcp"],
+            unidirectional=True,
         )
         assert_matches_type(ACL, acl, path=["response"])
 
@@ -320,17 +326,20 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
             lan_1={
                 "lan_id": "lan_id",
                 "lan_name": "lan_name",
-                "ports": [1, 1, 1],
-                "subnets": ["192.0.2.1", "192.0.2.1", "192.0.2.1"],
+                "port_ranges": ["8080-9000"],
+                "ports": [1],
+                "subnets": ["192.0.2.1"],
             },
             lan_2={
                 "lan_id": "lan_id",
                 "lan_name": "lan_name",
-                "ports": [1, 1, 1],
-                "subnets": ["192.0.2.1", "192.0.2.1", "192.0.2.1"],
+                "port_ranges": ["8080-9000"],
+                "ports": [1],
+                "subnets": ["192.0.2.1"],
             },
             name="PIN Pad - Cash Register",
-            protocols=["tcp", "udp", "icmp"],
+            protocols=["tcp"],
+            unidirectional=True,
         )
         assert_matches_type(ACL, acl, path=["response"])
 
@@ -447,7 +456,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncACLs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -468,19 +479,22 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             lan_1={
                 "lan_id": "lan_id",
                 "lan_name": "lan_name",
-                "ports": [1, 1, 1],
-                "subnets": ["192.0.2.1", "192.0.2.1", "192.0.2.1"],
+                "port_ranges": ["8080-9000"],
+                "ports": [1],
+                "subnets": ["192.0.2.1"],
             },
             lan_2={
                 "lan_id": "lan_id",
                 "lan_name": "lan_name",
-                "ports": [1, 1, 1],
-                "subnets": ["192.0.2.1", "192.0.2.1", "192.0.2.1"],
+                "port_ranges": ["8080-9000"],
+                "ports": [1],
+                "subnets": ["192.0.2.1"],
             },
             name="PIN Pad - Cash Register",
             description="Allows local traffic between PIN pads and cash register.",
             forward_locally=True,
-            protocols=["tcp", "udp", "icmp"],
+            protocols=["tcp"],
+            unidirectional=True,
         )
         assert_matches_type(ACL, acl, path=["response"])
 
@@ -556,17 +570,20 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             lan_1={
                 "lan_id": "lan_id",
                 "lan_name": "lan_name",
-                "ports": [1, 1, 1],
-                "subnets": ["192.0.2.1", "192.0.2.1", "192.0.2.1"],
+                "port_ranges": ["8080-9000"],
+                "ports": [1],
+                "subnets": ["192.0.2.1"],
             },
             lan_2={
                 "lan_id": "lan_id",
                 "lan_name": "lan_name",
-                "ports": [1, 1, 1],
-                "subnets": ["192.0.2.1", "192.0.2.1", "192.0.2.1"],
+                "port_ranges": ["8080-9000"],
+                "ports": [1],
+                "subnets": ["192.0.2.1"],
             },
             name="PIN Pad - Cash Register",
-            protocols=["tcp", "udp", "icmp"],
+            protocols=["tcp"],
+            unidirectional=True,
         )
         assert_matches_type(ACL, acl, path=["response"])
 
@@ -749,17 +766,20 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
             lan_1={
                 "lan_id": "lan_id",
                 "lan_name": "lan_name",
-                "ports": [1, 1, 1],
-                "subnets": ["192.0.2.1", "192.0.2.1", "192.0.2.1"],
+                "port_ranges": ["8080-9000"],
+                "ports": [1],
+                "subnets": ["192.0.2.1"],
             },
             lan_2={
                 "lan_id": "lan_id",
                 "lan_name": "lan_name",
-                "ports": [1, 1, 1],
-                "subnets": ["192.0.2.1", "192.0.2.1", "192.0.2.1"],
+                "port_ranges": ["8080-9000"],
+                "ports": [1],
+                "subnets": ["192.0.2.1"],
             },
             name="PIN Pad - Cash Register",
-            protocols=["tcp", "udp", "icmp"],
+            protocols=["tcp"],
+            unidirectional=True,
         )
         assert_matches_type(ACL, acl, path=["response"])
 
diff --git a/tests/api_resources/magic_transit/sites/test_lans.py b/tests/api_resources/magic_transit/sites/test_lans.py
index 9d0be9dce40..967a5ba1c41 100644
--- a/tests/api_resources/magic_transit/sites/test_lans.py
+++ b/tests/api_resources/magic_transit/sites/test_lans.py
@@ -12,7 +12,6 @@
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.magic_transit.sites import (
     LAN,
-    LANCreateResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -26,45 +25,34 @@ def test_method_create(self, client: Cloudflare) -> None:
         lan = client.magic_transit.sites.lans.create(
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            physport=1,
-            vlan_tag=0,
         )
-        assert_matches_type(LANCreateResponse, lan, path=["response"])
+        assert_matches_type(SyncSinglePage[LAN], lan, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         lan = client.magic_transit.sites.lans.create(
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            physport=1,
-            vlan_tag=0,
+            bond_id=2,
             ha_link=True,
             name="name",
             nat={"static_prefix": "192.0.2.0/24"},
+            physport=1,
             routed_subnets=[
                 {
-                    "nat": {"static_prefix": "192.0.2.0/24"},
                     "next_hop": "192.0.2.1",
                     "prefix": "192.0.2.0/24",
-                },
-                {
                     "nat": {"static_prefix": "192.0.2.0/24"},
-                    "next_hop": "192.0.2.1",
-                    "prefix": "192.0.2.0/24",
-                },
-                {
-                    "nat": {"static_prefix": "192.0.2.0/24"},
-                    "next_hop": "192.0.2.1",
-                    "prefix": "192.0.2.0/24",
-                },
+                }
             ],
             static_addressing={
                 "address": "192.0.2.0/24",
-                "dhcp_relay": {"server_addresses": ["192.0.2.1", "192.0.2.1", "192.0.2.1"]},
+                "dhcp_relay": {"server_addresses": ["192.0.2.1"]},
                 "dhcp_server": {
                     "dhcp_pool_end": "192.0.2.1",
                     "dhcp_pool_start": "192.0.2.1",
                     "dns_server": "192.0.2.1",
+                    "dns_servers": ["192.0.2.1"],
                     "reservations": {
                         "00:11:22:33:44:55": "192.0.2.100",
                         "AA:BB:CC:DD:EE:FF": "192.168.1.101",
@@ -73,36 +61,33 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                 "secondary_address": "192.0.2.0/24",
                 "virtual_address": "192.0.2.0/24",
             },
+            vlan_tag=42,
         )
-        assert_matches_type(LANCreateResponse, lan, path=["response"])
+        assert_matches_type(SyncSinglePage[LAN], lan, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.magic_transit.sites.lans.with_raw_response.create(
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            physport=1,
-            vlan_tag=0,
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         lan = response.parse()
-        assert_matches_type(LANCreateResponse, lan, path=["response"])
+        assert_matches_type(SyncSinglePage[LAN], lan, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.magic_transit.sites.lans.with_streaming_response.create(
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            physport=1,
-            vlan_tag=0,
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             lan = response.parse()
-            assert_matches_type(LANCreateResponse, lan, path=["response"])
+            assert_matches_type(SyncSinglePage[LAN], lan, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -112,16 +97,12 @@ def test_path_params_create(self, client: Cloudflare) -> None:
             client.magic_transit.sites.lans.with_raw_response.create(
                 site_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
-                physport=1,
-                vlan_tag=0,
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `site_id` but received ''"):
             client.magic_transit.sites.lans.with_raw_response.create(
                 site_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                physport=1,
-                vlan_tag=0,
             )
 
     @parametrize
@@ -139,33 +120,25 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             lan_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bond_id=2,
             name="name",
             nat={"static_prefix": "192.0.2.0/24"},
             physport=1,
             routed_subnets=[
                 {
-                    "nat": {"static_prefix": "192.0.2.0/24"},
-                    "next_hop": "192.0.2.1",
-                    "prefix": "192.0.2.0/24",
-                },
-                {
-                    "nat": {"static_prefix": "192.0.2.0/24"},
                     "next_hop": "192.0.2.1",
                     "prefix": "192.0.2.0/24",
-                },
-                {
                     "nat": {"static_prefix": "192.0.2.0/24"},
-                    "next_hop": "192.0.2.1",
-                    "prefix": "192.0.2.0/24",
-                },
+                }
             ],
             static_addressing={
                 "address": "192.0.2.0/24",
-                "dhcp_relay": {"server_addresses": ["192.0.2.1", "192.0.2.1", "192.0.2.1"]},
+                "dhcp_relay": {"server_addresses": ["192.0.2.1"]},
                 "dhcp_server": {
                     "dhcp_pool_end": "192.0.2.1",
                     "dhcp_pool_start": "192.0.2.1",
                     "dns_server": "192.0.2.1",
+                    "dns_servers": ["192.0.2.1"],
                     "reservations": {
                         "00:11:22:33:44:55": "192.0.2.100",
                         "AA:BB:CC:DD:EE:FF": "192.168.1.101",
@@ -174,7 +147,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                 "secondary_address": "192.0.2.0/24",
                 "virtual_address": "192.0.2.0/24",
             },
-            vlan_tag=0,
+            vlan_tag=42,
         )
         assert_matches_type(LAN, lan, path=["response"])
 
@@ -352,33 +325,25 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
             lan_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bond_id=2,
             name="name",
             nat={"static_prefix": "192.0.2.0/24"},
             physport=1,
             routed_subnets=[
                 {
-                    "nat": {"static_prefix": "192.0.2.0/24"},
                     "next_hop": "192.0.2.1",
                     "prefix": "192.0.2.0/24",
-                },
-                {
-                    "nat": {"static_prefix": "192.0.2.0/24"},
-                    "next_hop": "192.0.2.1",
-                    "prefix": "192.0.2.0/24",
-                },
-                {
                     "nat": {"static_prefix": "192.0.2.0/24"},
-                    "next_hop": "192.0.2.1",
-                    "prefix": "192.0.2.0/24",
-                },
+                }
             ],
             static_addressing={
                 "address": "192.0.2.0/24",
-                "dhcp_relay": {"server_addresses": ["192.0.2.1", "192.0.2.1", "192.0.2.1"]},
+                "dhcp_relay": {"server_addresses": ["192.0.2.1"]},
                 "dhcp_server": {
                     "dhcp_pool_end": "192.0.2.1",
                     "dhcp_pool_start": "192.0.2.1",
                     "dns_server": "192.0.2.1",
+                    "dns_servers": ["192.0.2.1"],
                     "reservations": {
                         "00:11:22:33:44:55": "192.0.2.100",
                         "AA:BB:CC:DD:EE:FF": "192.168.1.101",
@@ -387,7 +352,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
                 "secondary_address": "192.0.2.0/24",
                 "virtual_address": "192.0.2.0/24",
             },
-            vlan_tag=0,
+            vlan_tag=42,
         )
         assert_matches_type(LAN, lan, path=["response"])
 
@@ -504,52 +469,43 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncLANs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         lan = await async_client.magic_transit.sites.lans.create(
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            physport=1,
-            vlan_tag=0,
         )
-        assert_matches_type(LANCreateResponse, lan, path=["response"])
+        assert_matches_type(AsyncSinglePage[LAN], lan, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         lan = await async_client.magic_transit.sites.lans.create(
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            physport=1,
-            vlan_tag=0,
+            bond_id=2,
             ha_link=True,
             name="name",
             nat={"static_prefix": "192.0.2.0/24"},
+            physport=1,
             routed_subnets=[
                 {
-                    "nat": {"static_prefix": "192.0.2.0/24"},
                     "next_hop": "192.0.2.1",
                     "prefix": "192.0.2.0/24",
-                },
-                {
                     "nat": {"static_prefix": "192.0.2.0/24"},
-                    "next_hop": "192.0.2.1",
-                    "prefix": "192.0.2.0/24",
-                },
-                {
-                    "nat": {"static_prefix": "192.0.2.0/24"},
-                    "next_hop": "192.0.2.1",
-                    "prefix": "192.0.2.0/24",
-                },
+                }
             ],
             static_addressing={
                 "address": "192.0.2.0/24",
-                "dhcp_relay": {"server_addresses": ["192.0.2.1", "192.0.2.1", "192.0.2.1"]},
+                "dhcp_relay": {"server_addresses": ["192.0.2.1"]},
                 "dhcp_server": {
                     "dhcp_pool_end": "192.0.2.1",
                     "dhcp_pool_start": "192.0.2.1",
                     "dns_server": "192.0.2.1",
+                    "dns_servers": ["192.0.2.1"],
                     "reservations": {
                         "00:11:22:33:44:55": "192.0.2.100",
                         "AA:BB:CC:DD:EE:FF": "192.168.1.101",
@@ -558,36 +514,33 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                 "secondary_address": "192.0.2.0/24",
                 "virtual_address": "192.0.2.0/24",
             },
+            vlan_tag=42,
         )
-        assert_matches_type(LANCreateResponse, lan, path=["response"])
+        assert_matches_type(AsyncSinglePage[LAN], lan, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_transit.sites.lans.with_raw_response.create(
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            physport=1,
-            vlan_tag=0,
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         lan = await response.parse()
-        assert_matches_type(LANCreateResponse, lan, path=["response"])
+        assert_matches_type(AsyncSinglePage[LAN], lan, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.magic_transit.sites.lans.with_streaming_response.create(
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            physport=1,
-            vlan_tag=0,
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             lan = await response.parse()
-            assert_matches_type(LANCreateResponse, lan, path=["response"])
+            assert_matches_type(AsyncSinglePage[LAN], lan, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -597,16 +550,12 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
             await async_client.magic_transit.sites.lans.with_raw_response.create(
                 site_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
-                physport=1,
-                vlan_tag=0,
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `site_id` but received ''"):
             await async_client.magic_transit.sites.lans.with_raw_response.create(
                 site_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                physport=1,
-                vlan_tag=0,
             )
 
     @parametrize
@@ -624,33 +573,25 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             lan_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bond_id=2,
             name="name",
             nat={"static_prefix": "192.0.2.0/24"},
             physport=1,
             routed_subnets=[
                 {
-                    "nat": {"static_prefix": "192.0.2.0/24"},
-                    "next_hop": "192.0.2.1",
-                    "prefix": "192.0.2.0/24",
-                },
-                {
-                    "nat": {"static_prefix": "192.0.2.0/24"},
                     "next_hop": "192.0.2.1",
                     "prefix": "192.0.2.0/24",
-                },
-                {
                     "nat": {"static_prefix": "192.0.2.0/24"},
-                    "next_hop": "192.0.2.1",
-                    "prefix": "192.0.2.0/24",
-                },
+                }
             ],
             static_addressing={
                 "address": "192.0.2.0/24",
-                "dhcp_relay": {"server_addresses": ["192.0.2.1", "192.0.2.1", "192.0.2.1"]},
+                "dhcp_relay": {"server_addresses": ["192.0.2.1"]},
                 "dhcp_server": {
                     "dhcp_pool_end": "192.0.2.1",
                     "dhcp_pool_start": "192.0.2.1",
                     "dns_server": "192.0.2.1",
+                    "dns_servers": ["192.0.2.1"],
                     "reservations": {
                         "00:11:22:33:44:55": "192.0.2.100",
                         "AA:BB:CC:DD:EE:FF": "192.168.1.101",
@@ -659,7 +600,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                 "secondary_address": "192.0.2.0/24",
                 "virtual_address": "192.0.2.0/24",
             },
-            vlan_tag=0,
+            vlan_tag=42,
         )
         assert_matches_type(LAN, lan, path=["response"])
 
@@ -837,33 +778,25 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
             lan_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bond_id=2,
             name="name",
             nat={"static_prefix": "192.0.2.0/24"},
             physport=1,
             routed_subnets=[
                 {
-                    "nat": {"static_prefix": "192.0.2.0/24"},
                     "next_hop": "192.0.2.1",
                     "prefix": "192.0.2.0/24",
-                },
-                {
-                    "nat": {"static_prefix": "192.0.2.0/24"},
-                    "next_hop": "192.0.2.1",
-                    "prefix": "192.0.2.0/24",
-                },
-                {
                     "nat": {"static_prefix": "192.0.2.0/24"},
-                    "next_hop": "192.0.2.1",
-                    "prefix": "192.0.2.0/24",
-                },
+                }
             ],
             static_addressing={
                 "address": "192.0.2.0/24",
-                "dhcp_relay": {"server_addresses": ["192.0.2.1", "192.0.2.1", "192.0.2.1"]},
+                "dhcp_relay": {"server_addresses": ["192.0.2.1"]},
                 "dhcp_server": {
                     "dhcp_pool_end": "192.0.2.1",
                     "dhcp_pool_start": "192.0.2.1",
                     "dns_server": "192.0.2.1",
+                    "dns_servers": ["192.0.2.1"],
                     "reservations": {
                         "00:11:22:33:44:55": "192.0.2.100",
                         "AA:BB:CC:DD:EE:FF": "192.168.1.101",
@@ -872,7 +805,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
                 "secondary_address": "192.0.2.0/24",
                 "virtual_address": "192.0.2.0/24",
             },
-            vlan_tag=0,
+            vlan_tag=42,
         )
         assert_matches_type(LAN, lan, path=["response"])
 
diff --git a/tests/api_resources/magic_transit/sites/test_wans.py b/tests/api_resources/magic_transit/sites/test_wans.py
index c3ba81f3615..98217a3396c 100644
--- a/tests/api_resources/magic_transit/sites/test_wans.py
+++ b/tests/api_resources/magic_transit/sites/test_wans.py
@@ -12,7 +12,6 @@
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.magic_transit.sites import (
     WAN,
-    WANCreateResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -27,9 +26,8 @@ def test_method_create(self, client: Cloudflare) -> None:
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             physport=1,
-            vlan_tag=0,
         )
-        assert_matches_type(WANCreateResponse, wan, path=["response"])
+        assert_matches_type(SyncSinglePage[WAN], wan, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
@@ -37,7 +35,6 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             physport=1,
-            vlan_tag=0,
             name="name",
             priority=0,
             static_addressing={
@@ -45,8 +42,9 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                 "gateway_address": "192.0.2.1",
                 "secondary_address": "192.0.2.0/24",
             },
+            vlan_tag=42,
         )
-        assert_matches_type(WANCreateResponse, wan, path=["response"])
+        assert_matches_type(SyncSinglePage[WAN], wan, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
@@ -54,13 +52,12 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             physport=1,
-            vlan_tag=0,
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         wan = response.parse()
-        assert_matches_type(WANCreateResponse, wan, path=["response"])
+        assert_matches_type(SyncSinglePage[WAN], wan, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
@@ -68,13 +65,12 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             physport=1,
-            vlan_tag=0,
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             wan = response.parse()
-            assert_matches_type(WANCreateResponse, wan, path=["response"])
+            assert_matches_type(SyncSinglePage[WAN], wan, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -85,7 +81,6 @@ def test_path_params_create(self, client: Cloudflare) -> None:
                 site_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
                 physport=1,
-                vlan_tag=0,
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `site_id` but received ''"):
@@ -93,7 +88,6 @@ def test_path_params_create(self, client: Cloudflare) -> None:
                 site_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 physport=1,
-                vlan_tag=0,
             )
 
     @parametrize
@@ -119,7 +113,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                 "gateway_address": "192.0.2.1",
                 "secondary_address": "192.0.2.0/24",
             },
-            vlan_tag=0,
+            vlan_tag=42,
         )
         assert_matches_type(WAN, wan, path=["response"])
 
@@ -305,7 +299,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
                 "gateway_address": "192.0.2.1",
                 "secondary_address": "192.0.2.0/24",
             },
-            vlan_tag=0,
+            vlan_tag=42,
         )
         assert_matches_type(WAN, wan, path=["response"])
 
@@ -422,7 +416,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncWANs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -430,9 +426,8 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             physport=1,
-            vlan_tag=0,
         )
-        assert_matches_type(WANCreateResponse, wan, path=["response"])
+        assert_matches_type(AsyncSinglePage[WAN], wan, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -440,7 +435,6 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             physport=1,
-            vlan_tag=0,
             name="name",
             priority=0,
             static_addressing={
@@ -448,8 +442,9 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                 "gateway_address": "192.0.2.1",
                 "secondary_address": "192.0.2.0/24",
             },
+            vlan_tag=42,
         )
-        assert_matches_type(WANCreateResponse, wan, path=["response"])
+        assert_matches_type(AsyncSinglePage[WAN], wan, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
@@ -457,13 +452,12 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             physport=1,
-            vlan_tag=0,
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         wan = await response.parse()
-        assert_matches_type(WANCreateResponse, wan, path=["response"])
+        assert_matches_type(AsyncSinglePage[WAN], wan, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
@@ -471,13 +465,12 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             physport=1,
-            vlan_tag=0,
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             wan = await response.parse()
-            assert_matches_type(WANCreateResponse, wan, path=["response"])
+            assert_matches_type(AsyncSinglePage[WAN], wan, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -488,7 +481,6 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
                 site_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
                 physport=1,
-                vlan_tag=0,
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `site_id` but received ''"):
@@ -496,7 +488,6 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
                 site_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 physport=1,
-                vlan_tag=0,
             )
 
     @parametrize
@@ -522,7 +513,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                 "gateway_address": "192.0.2.1",
                 "secondary_address": "192.0.2.0/24",
             },
-            vlan_tag=0,
+            vlan_tag=42,
         )
         assert_matches_type(WAN, wan, path=["response"])
 
@@ -708,7 +699,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
                 "gateway_address": "192.0.2.1",
                 "secondary_address": "192.0.2.0/24",
             },
-            vlan_tag=0,
+            vlan_tag=42,
         )
         assert_matches_type(WAN, wan, path=["response"])
 
diff --git a/tests/api_resources/magic_transit/test_apps.py b/tests/api_resources/magic_transit/test_apps.py
index 7a2bea638d1..bfa9adeceb6 100644
--- a/tests/api_resources/magic_transit/test_apps.py
+++ b/tests/api_resources/magic_transit/test_apps.py
@@ -11,6 +11,7 @@
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.magic_transit import (
+    AppEditResponse,
     AppListResponse,
     AppCreateResponse,
     AppDeleteResponse,
@@ -27,10 +28,11 @@ class TestApps:
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    def test_method_create_overload_1(self, client: Cloudflare) -> None:
+    def test_method_create(self, client: Cloudflare) -> None:
         app = client.magic_transit.apps.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            name="Cloudflare Dashboard",
+            type="Development",
         )
         assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
 
@@ -38,53 +40,13 @@ def test_method_create_overload_1(self, client: Cloudflare) -> None:
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    def test_raw_response_create_overload_1(self, client: Cloudflare) -> None:
-        response = client.magic_transit.apps.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        app = response.parse()
-        assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
-    @parametrize
-    def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
-        with client.magic_transit.apps.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            app = response.parse()
-            assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
-    @parametrize
-    def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.magic_transit.apps.with_raw_response.create(
-                account_id="",
-                body={},
-            )
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
-    @parametrize
-    def test_method_create_overload_2(self, client: Cloudflare) -> None:
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         app = client.magic_transit.apps.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            name="Cloudflare Dashboard",
+            type="Development",
+            hostnames=["auth.cloudflare.com"],
+            ip_subnets=["192.0.2.0/24"],
         )
         assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
 
@@ -92,10 +54,11 @@ def test_method_create_overload_2(self, client: Cloudflare) -> None:
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
+    def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.magic_transit.apps.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            name="Cloudflare Dashboard",
+            type="Development",
         )
 
         assert response.is_closed is True
@@ -107,10 +70,11 @@ def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.magic_transit.apps.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            name="Cloudflare Dashboard",
+            type="Development",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -124,22 +88,22 @@ def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
+    def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.magic_transit.apps.with_raw_response.create(
                 account_id="",
-                body={},
+                name="Cloudflare Dashboard",
+                type="Development",
             )
 
     @pytest.mark.skip(
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    def test_method_update_overload_1(self, client: Cloudflare) -> None:
+    def test_method_update(self, client: Cloudflare) -> None:
         app = client.magic_transit.apps.update(
             account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         )
         assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
 
@@ -147,64 +111,14 @@ def test_method_update_overload_1(self, client: Cloudflare) -> None:
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    def test_raw_response_update_overload_1(self, client: Cloudflare) -> None:
-        response = client.magic_transit.apps.with_raw_response.update(
-            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        app = response.parse()
-        assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
-    @parametrize
-    def test_streaming_response_update_overload_1(self, client: Cloudflare) -> None:
-        with client.magic_transit.apps.with_streaming_response.update(
-            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            app = response.parse()
-            assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
-    @parametrize
-    def test_path_params_update_overload_1(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.magic_transit.apps.with_raw_response.update(
-                account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                body={},
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_app_id` but received ''"):
-            client.magic_transit.apps.with_raw_response.update(
-                account_app_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
-            )
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
-    @parametrize
-    def test_method_update_overload_2(self, client: Cloudflare) -> None:
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         app = client.magic_transit.apps.update(
             account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            hostnames=["auth.cloudflare.com"],
+            ip_subnets=["1.1.1.1/32"],
+            name="Cloudflare Dashboard",
+            type="Development",
         )
         assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
 
@@ -212,11 +126,10 @@ def test_method_update_overload_2(self, client: Cloudflare) -> None:
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    def test_raw_response_update_overload_2(self, client: Cloudflare) -> None:
+    def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.magic_transit.apps.with_raw_response.update(
             account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         )
 
         assert response.is_closed is True
@@ -228,11 +141,10 @@ def test_raw_response_update_overload_2(self, client: Cloudflare) -> None:
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    def test_streaming_response_update_overload_2(self, client: Cloudflare) -> None:
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.magic_transit.apps.with_streaming_response.update(
             account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -246,149 +158,17 @@ def test_streaming_response_update_overload_2(self, client: Cloudflare) -> None:
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
+    def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.magic_transit.apps.with_raw_response.update(
                 account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_app_id` but received ''"):
             client.magic_transit.apps.with_raw_response.update(
                 account_app_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
-            )
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
-    @parametrize
-    def test_method_update_overload_3(self, client: Cloudflare) -> None:
-        app = client.magic_transit.apps.update(
-            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
-        assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
-    @parametrize
-    def test_raw_response_update_overload_3(self, client: Cloudflare) -> None:
-        response = client.magic_transit.apps.with_raw_response.update(
-            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        app = response.parse()
-        assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
-    @parametrize
-    def test_streaming_response_update_overload_3(self, client: Cloudflare) -> None:
-        with client.magic_transit.apps.with_streaming_response.update(
-            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            app = response.parse()
-            assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
-    @parametrize
-    def test_path_params_update_overload_3(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.magic_transit.apps.with_raw_response.update(
-                account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                body={},
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_app_id` but received ''"):
-            client.magic_transit.apps.with_raw_response.update(
-                account_app_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
-            )
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
-    @parametrize
-    def test_method_update_overload_4(self, client: Cloudflare) -> None:
-        app = client.magic_transit.apps.update(
-            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
-        assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
-    @parametrize
-    def test_raw_response_update_overload_4(self, client: Cloudflare) -> None:
-        response = client.magic_transit.apps.with_raw_response.update(
-            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        app = response.parse()
-        assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
-    @parametrize
-    def test_streaming_response_update_overload_4(self, client: Cloudflare) -> None:
-        with client.magic_transit.apps.with_streaming_response.update(
-            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            app = response.parse()
-            assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
-    @parametrize
-    def test_path_params_update_overload_4(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.magic_transit.apps.with_raw_response.update(
-                account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                body={},
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_app_id` but received ''"):
-            client.magic_transit.apps.with_raw_response.update(
-                account_app_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
             )
 
     @pytest.mark.skip(
@@ -489,50 +269,61 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
-
-class TestAsyncApps:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    @pytest.mark.skip(
+        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
+    )
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        app = client.magic_transit.apps.edit(
+            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[AppEditResponse], app, path=["response"])
 
     @pytest.mark.skip(
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
-        app = await async_client.magic_transit.apps.create(
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        app = client.magic_transit.apps.edit(
+            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            hostnames=["auth.cloudflare.com"],
+            ip_subnets=["1.1.1.1/32"],
+            name="Cloudflare Dashboard",
+            type="Development",
         )
-        assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
+        assert_matches_type(Optional[AppEditResponse], app, path=["response"])
 
     @pytest.mark.skip(
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.magic_transit.apps.with_raw_response.create(
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.magic_transit.apps.with_raw_response.edit(
+            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        app = await response.parse()
-        assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
+        app = response.parse()
+        assert_matches_type(Optional[AppEditResponse], app, path=["response"])
 
     @pytest.mark.skip(
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.magic_transit.apps.with_streaming_response.create(
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.magic_transit.apps.with_streaming_response.edit(
+            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            app = await response.parse()
-            assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
+            app = response.parse()
+            assert_matches_type(Optional[AppEditResponse], app, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -540,21 +331,34 @@ async def test_streaming_response_create_overload_1(self, async_client: AsyncClo
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+    def test_path_params_edit(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.magic_transit.apps.with_raw_response.create(
+            client.magic_transit.apps.with_raw_response.edit(
+                account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
-                body={},
             )
 
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_app_id` but received ''"):
+            client.magic_transit.apps.with_raw_response.edit(
+                account_app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncApps:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
     @pytest.mark.skip(
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         app = await async_client.magic_transit.apps.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            name="Cloudflare Dashboard",
+            type="Development",
         )
         assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
 
@@ -562,10 +366,25 @@ async def test_method_create_overload_2(self, async_client: AsyncCloudflare) ->
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        app = await async_client.magic_transit.apps.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="Cloudflare Dashboard",
+            type="Development",
+            hostnames=["auth.cloudflare.com"],
+            ip_subnets=["192.0.2.0/24"],
+        )
+        assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
+
+    @pytest.mark.skip(
+        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
+    )
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_transit.apps.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            name="Cloudflare Dashboard",
+            type="Development",
         )
 
         assert response.is_closed is True
@@ -577,10 +396,11 @@ async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflar
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.magic_transit.apps.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            name="Cloudflare Dashboard",
+            type="Development",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -594,22 +414,22 @@ async def test_streaming_response_create_overload_2(self, async_client: AsyncClo
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.magic_transit.apps.with_raw_response.create(
                 account_id="",
-                body={},
+                name="Cloudflare Dashboard",
+                type="Development",
             )
 
     @pytest.mark.skip(
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_method_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         app = await async_client.magic_transit.apps.update(
             account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         )
         assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
 
@@ -617,64 +437,14 @@ async def test_method_update_overload_1(self, async_client: AsyncCloudflare) ->
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_raw_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.magic_transit.apps.with_raw_response.update(
-            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        app = await response.parse()
-        assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
-    @parametrize
-    async def test_streaming_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.magic_transit.apps.with_streaming_response.update(
-            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            app = await response.parse()
-            assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
-    @parametrize
-    async def test_path_params_update_overload_1(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.magic_transit.apps.with_raw_response.update(
-                account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-                body={},
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_app_id` but received ''"):
-            await async_client.magic_transit.apps.with_raw_response.update(
-                account_app_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
-            )
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
-    @parametrize
-    async def test_method_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         app = await async_client.magic_transit.apps.update(
             account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            hostnames=["auth.cloudflare.com"],
+            ip_subnets=["1.1.1.1/32"],
+            name="Cloudflare Dashboard",
+            type="Development",
         )
         assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
 
@@ -682,11 +452,10 @@ async def test_method_update_overload_2(self, async_client: AsyncCloudflare) ->
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_raw_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_transit.apps.with_raw_response.update(
             account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         )
 
         assert response.is_closed is True
@@ -698,11 +467,10 @@ async def test_raw_response_update_overload_2(self, async_client: AsyncCloudflar
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_streaming_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.magic_transit.apps.with_streaming_response.update(
             account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -716,64 +484,56 @@ async def test_streaming_response_update_overload_2(self, async_client: AsyncClo
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.magic_transit.apps.with_raw_response.update(
                 account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_app_id` but received ''"):
             await async_client.magic_transit.apps.with_raw_response.update(
                 account_app_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
             )
 
     @pytest.mark.skip(
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_method_update_overload_3(self, async_client: AsyncCloudflare) -> None:
-        app = await async_client.magic_transit.apps.update(
-            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        app = await async_client.magic_transit.apps.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         )
-        assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
+        assert_matches_type(AsyncSinglePage[AppListResponse], app, path=["response"])
 
     @pytest.mark.skip(
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_raw_response_update_overload_3(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.magic_transit.apps.with_raw_response.update(
-            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.apps.with_raw_response.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         app = await response.parse()
-        assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
+        assert_matches_type(AsyncSinglePage[AppListResponse], app, path=["response"])
 
     @pytest.mark.skip(
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_streaming_response_update_overload_3(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.magic_transit.apps.with_streaming_response.update(
-            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.apps.with_streaming_response.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             app = await response.parse()
-            assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
+            assert_matches_type(AsyncSinglePage[AppListResponse], app, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -781,147 +541,92 @@ async def test_streaming_response_update_overload_3(self, async_client: AsyncClo
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_path_params_update_overload_3(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.magic_transit.apps.with_raw_response.update(
-                account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            await async_client.magic_transit.apps.with_raw_response.list(
                 account_id="",
-                body={},
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_app_id` but received ''"):
-            await async_client.magic_transit.apps.with_raw_response.update(
-                account_app_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
-            )
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
     @parametrize
-    async def test_method_update_overload_4(self, async_client: AsyncCloudflare) -> None:
-        app = await async_client.magic_transit.apps.update(
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        app = await async_client.magic_transit.apps.delete(
             account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         )
-        assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
+        assert_matches_type(Optional[AppDeleteResponse], app, path=["response"])
 
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
     @parametrize
-    async def test_raw_response_update_overload_4(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.magic_transit.apps.with_raw_response.update(
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.apps.with_raw_response.delete(
             account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         app = await response.parse()
-        assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
+        assert_matches_type(Optional[AppDeleteResponse], app, path=["response"])
 
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
     @parametrize
-    async def test_streaming_response_update_overload_4(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.magic_transit.apps.with_streaming_response.update(
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.apps.with_streaming_response.delete(
             account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             app = await response.parse()
-            assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
+            assert_matches_type(Optional[AppDeleteResponse], app, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
     @parametrize
-    async def test_path_params_update_overload_4(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.magic_transit.apps.with_raw_response.update(
+            await async_client.magic_transit.apps.with_raw_response.delete(
                 account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_app_id` but received ''"):
-            await async_client.magic_transit.apps.with_raw_response.update(
+            await async_client.magic_transit.apps.with_raw_response.delete(
                 account_app_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
             )
 
     @pytest.mark.skip(
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        app = await async_client.magic_transit.apps.list(
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        app = await async_client.magic_transit.apps.edit(
+            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncSinglePage[AppListResponse], app, path=["response"])
+        assert_matches_type(Optional[AppEditResponse], app, path=["response"])
 
     @pytest.mark.skip(
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.magic_transit.apps.with_raw_response.list(
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        app = await async_client.magic_transit.apps.edit(
+            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostnames=["auth.cloudflare.com"],
+            ip_subnets=["1.1.1.1/32"],
+            name="Cloudflare Dashboard",
+            type="Development",
         )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        app = await response.parse()
-        assert_matches_type(AsyncSinglePage[AppListResponse], app, path=["response"])
+        assert_matches_type(Optional[AppEditResponse], app, path=["response"])
 
     @pytest.mark.skip(
         reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
     )
     @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.magic_transit.apps.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            app = await response.parse()
-            assert_matches_type(AsyncSinglePage[AppListResponse], app, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(
-        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
-    )
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.magic_transit.apps.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        app = await async_client.magic_transit.apps.delete(
-            account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[AppDeleteResponse], app, path=["response"])
-
-    @parametrize
-    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.magic_transit.apps.with_raw_response.delete(
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.apps.with_raw_response.edit(
             account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -929,11 +634,14 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         app = await response.parse()
-        assert_matches_type(Optional[AppDeleteResponse], app, path=["response"])
+        assert_matches_type(Optional[AppEditResponse], app, path=["response"])
 
+    @pytest.mark.skip(
+        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
+    )
     @parametrize
-    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.magic_transit.apps.with_streaming_response.delete(
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.apps.with_streaming_response.edit(
             account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
@@ -941,20 +649,23 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             app = await response.parse()
-            assert_matches_type(Optional[AppDeleteResponse], app, path=["response"])
+            assert_matches_type(Optional[AppEditResponse], app, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(
+        reason="prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212"
+    )
     @parametrize
-    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.magic_transit.apps.with_raw_response.delete(
+            await async_client.magic_transit.apps.with_raw_response.edit(
                 account_app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_app_id` but received ''"):
-            await async_client.magic_transit.apps.with_raw_response.delete(
+            await async_client.magic_transit.apps.with_raw_response.edit(
                 account_app_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/magic_transit/test_cf_interconnects.py b/tests/api_resources/magic_transit/test_cf_interconnects.py
index 203c0a018a1..82dbe550093 100644
--- a/tests/api_resources/magic_transit/test_cf_interconnects.py
+++ b/tests/api_resources/magic_transit/test_cf_interconnects.py
@@ -13,6 +13,7 @@
     CfInterconnectGetResponse,
     CfInterconnectListResponse,
     CfInterconnectUpdateResponse,
+    CfInterconnectBulkUpdateResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -21,6 +22,7 @@
 class TestCfInterconnects:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         cf_interconnect = client.magic_transit.cf_interconnects.update(
@@ -29,24 +31,29 @@ def test_method_update(self, client: Cloudflare) -> None:
         )
         assert_matches_type(CfInterconnectUpdateResponse, cf_interconnect, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         cf_interconnect = client.magic_transit.cf_interconnects.update(
             cf_interconnect_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            automatic_return_routing=True,
             description="Tunnel for Interconnect to ORD",
             gre={"cloudflare_endpoint": "203.0.113.1"},
             health_check={
                 "enabled": True,
                 "rate": "low",
-                "target": "203.0.113.1",
+                "target": {"saved": "203.0.113.1"},
                 "type": "request",
             },
             interface_address="192.0.2.0/31",
+            interface_address6="2606:54c1:7:0:a9fe:12d2:1:200/127",
             mtu=0,
+            x_magic_new_hc_target=True,
         )
         assert_matches_type(CfInterconnectUpdateResponse, cf_interconnect, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.magic_transit.cf_interconnects.with_raw_response.update(
@@ -59,6 +66,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         cf_interconnect = response.parse()
         assert_matches_type(CfInterconnectUpdateResponse, cf_interconnect, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.magic_transit.cf_interconnects.with_streaming_response.update(
@@ -73,6 +81,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -94,6 +103,14 @@ def test_method_list(self, client: Cloudflare) -> None:
         )
         assert_matches_type(CfInterconnectListResponse, cf_interconnect, path=["response"])
 
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        cf_interconnect = client.magic_transit.cf_interconnects.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(CfInterconnectListResponse, cf_interconnect, path=["response"])
+
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.magic_transit.cf_interconnects.with_raw_response.list(
@@ -125,6 +142,62 @@ def test_path_params_list(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_bulk_update(self, client: Cloudflare) -> None:
+        cf_interconnect = client.magic_transit.cf_interconnects.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        )
+        assert_matches_type(CfInterconnectBulkUpdateResponse, cf_interconnect, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_bulk_update_with_all_params(self, client: Cloudflare) -> None:
+        cf_interconnect = client.magic_transit.cf_interconnects.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(CfInterconnectBulkUpdateResponse, cf_interconnect, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_bulk_update(self, client: Cloudflare) -> None:
+        response = client.magic_transit.cf_interconnects.with_raw_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cf_interconnect = response.parse()
+        assert_matches_type(CfInterconnectBulkUpdateResponse, cf_interconnect, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_bulk_update(self, client: Cloudflare) -> None:
+        with client.magic_transit.cf_interconnects.with_streaming_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cf_interconnect = response.parse()
+            assert_matches_type(CfInterconnectBulkUpdateResponse, cf_interconnect, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_bulk_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_transit.cf_interconnects.with_raw_response.bulk_update(
+                account_id="",
+                body={},
+            )
+
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         cf_interconnect = client.magic_transit.cf_interconnects.get(
@@ -133,6 +206,15 @@ def test_method_get(self, client: Cloudflare) -> None:
         )
         assert_matches_type(CfInterconnectGetResponse, cf_interconnect, path=["response"])
 
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        cf_interconnect = client.magic_transit.cf_interconnects.get(
+            cf_interconnect_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(CfInterconnectGetResponse, cf_interconnect, path=["response"])
+
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.magic_transit.cf_interconnects.with_raw_response.get(
@@ -175,8 +257,11 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncCfInterconnects:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         cf_interconnect = await async_client.magic_transit.cf_interconnects.update(
@@ -185,24 +270,29 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(CfInterconnectUpdateResponse, cf_interconnect, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         cf_interconnect = await async_client.magic_transit.cf_interconnects.update(
             cf_interconnect_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            automatic_return_routing=True,
             description="Tunnel for Interconnect to ORD",
             gre={"cloudflare_endpoint": "203.0.113.1"},
             health_check={
                 "enabled": True,
                 "rate": "low",
-                "target": "203.0.113.1",
+                "target": {"saved": "203.0.113.1"},
                 "type": "request",
             },
             interface_address="192.0.2.0/31",
+            interface_address6="2606:54c1:7:0:a9fe:12d2:1:200/127",
             mtu=0,
+            x_magic_new_hc_target=True,
         )
         assert_matches_type(CfInterconnectUpdateResponse, cf_interconnect, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_transit.cf_interconnects.with_raw_response.update(
@@ -215,6 +305,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         cf_interconnect = await response.parse()
         assert_matches_type(CfInterconnectUpdateResponse, cf_interconnect, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.magic_transit.cf_interconnects.with_streaming_response.update(
@@ -229,6 +320,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -250,6 +342,14 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(CfInterconnectListResponse, cf_interconnect, path=["response"])
 
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cf_interconnect = await async_client.magic_transit.cf_interconnects.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(CfInterconnectListResponse, cf_interconnect, path=["response"])
+
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_transit.cf_interconnects.with_raw_response.list(
@@ -281,6 +381,62 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
                 account_id="",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        cf_interconnect = await async_client.magic_transit.cf_interconnects.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        )
+        assert_matches_type(CfInterconnectBulkUpdateResponse, cf_interconnect, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_bulk_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cf_interconnect = await async_client.magic_transit.cf_interconnects.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(CfInterconnectBulkUpdateResponse, cf_interconnect, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.cf_interconnects.with_raw_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cf_interconnect = await response.parse()
+        assert_matches_type(CfInterconnectBulkUpdateResponse, cf_interconnect, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.cf_interconnects.with_streaming_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cf_interconnect = await response.parse()
+            assert_matches_type(CfInterconnectBulkUpdateResponse, cf_interconnect, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_transit.cf_interconnects.with_raw_response.bulk_update(
+                account_id="",
+                body={},
+            )
+
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         cf_interconnect = await async_client.magic_transit.cf_interconnects.get(
@@ -289,6 +445,15 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(CfInterconnectGetResponse, cf_interconnect, path=["response"])
 
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cf_interconnect = await async_client.magic_transit.cf_interconnects.get(
+            cf_interconnect_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(CfInterconnectGetResponse, cf_interconnect, path=["response"])
+
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_transit.cf_interconnects.with_raw_response.get(
diff --git a/tests/api_resources/magic_transit/test_connectors.py b/tests/api_resources/magic_transit/test_connectors.py
index 75506734f5e..77bb1d77052 100644
--- a/tests/api_resources/magic_transit/test_connectors.py
+++ b/tests/api_resources/magic_transit/test_connectors.py
@@ -14,6 +14,8 @@
     ConnectorGetResponse,
     ConnectorEditResponse,
     ConnectorListResponse,
+    ConnectorCreateResponse,
+    ConnectorDeleteResponse,
     ConnectorUpdateResponse,
 )
 
@@ -23,6 +25,80 @@
 class TestConnectors:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @pytest.mark.skip(
+        reason="TODO: consider oneOf instead of maxProperties to indicate that this can be either id or serial_number"
+    )
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        connector = client.magic_transit.connectors.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            device={},
+        )
+        assert_matches_type(ConnectorCreateResponse, connector, path=["response"])
+
+    @pytest.mark.skip(
+        reason="TODO: consider oneOf instead of maxProperties to indicate that this can be either id or serial_number"
+    )
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        connector = client.magic_transit.connectors.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            device={
+                "id": "id",
+                "provision_license": True,
+                "serial_number": "serial_number",
+            },
+            activated=True,
+            interrupt_window_duration_hours=0,
+            interrupt_window_hour_of_day=0,
+            notes="notes",
+            timezone="timezone",
+        )
+        assert_matches_type(ConnectorCreateResponse, connector, path=["response"])
+
+    @pytest.mark.skip(
+        reason="TODO: consider oneOf instead of maxProperties to indicate that this can be either id or serial_number"
+    )
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.magic_transit.connectors.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            device={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        connector = response.parse()
+        assert_matches_type(ConnectorCreateResponse, connector, path=["response"])
+
+    @pytest.mark.skip(
+        reason="TODO: consider oneOf instead of maxProperties to indicate that this can be either id or serial_number"
+    )
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.magic_transit.connectors.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            device={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            connector = response.parse()
+            assert_matches_type(ConnectorCreateResponse, connector, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(
+        reason="TODO: consider oneOf instead of maxProperties to indicate that this can be either id or serial_number"
+    )
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_transit.connectors.with_raw_response.create(
+                account_id="",
+                device={},
+            )
+
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         connector = client.magic_transit.connectors.update(
@@ -40,6 +116,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             interrupt_window_duration_hours=0,
             interrupt_window_hour_of_day=0,
             notes="notes",
+            provision_license=True,
             timezone="timezone",
         )
         assert_matches_type(ConnectorUpdateResponse, connector, path=["response"])
@@ -122,6 +199,54 @@ def test_path_params_list(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        connector = client.magic_transit.connectors.delete(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ConnectorDeleteResponse, connector, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.magic_transit.connectors.with_raw_response.delete(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        connector = response.parse()
+        assert_matches_type(ConnectorDeleteResponse, connector, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.magic_transit.connectors.with_streaming_response.delete(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            connector = response.parse()
+            assert_matches_type(ConnectorDeleteResponse, connector, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_transit.connectors.with_raw_response.delete(
+                connector_id="connector_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `connector_id` but received ''"):
+            client.magic_transit.connectors.with_raw_response.delete(
+                connector_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
     @parametrize
     def test_method_edit(self, client: Cloudflare) -> None:
         connector = client.magic_transit.connectors.edit(
@@ -139,6 +264,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
             interrupt_window_duration_hours=0,
             interrupt_window_hour_of_day=0,
             notes="notes",
+            provision_license=True,
             timezone="timezone",
         )
         assert_matches_type(ConnectorEditResponse, connector, path=["response"])
@@ -233,7 +359,83 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncConnectors:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(
+        reason="TODO: consider oneOf instead of maxProperties to indicate that this can be either id or serial_number"
+    )
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        connector = await async_client.magic_transit.connectors.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            device={},
+        )
+        assert_matches_type(ConnectorCreateResponse, connector, path=["response"])
+
+    @pytest.mark.skip(
+        reason="TODO: consider oneOf instead of maxProperties to indicate that this can be either id or serial_number"
+    )
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        connector = await async_client.magic_transit.connectors.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            device={
+                "id": "id",
+                "provision_license": True,
+                "serial_number": "serial_number",
+            },
+            activated=True,
+            interrupt_window_duration_hours=0,
+            interrupt_window_hour_of_day=0,
+            notes="notes",
+            timezone="timezone",
+        )
+        assert_matches_type(ConnectorCreateResponse, connector, path=["response"])
+
+    @pytest.mark.skip(
+        reason="TODO: consider oneOf instead of maxProperties to indicate that this can be either id or serial_number"
+    )
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.connectors.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            device={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        connector = await response.parse()
+        assert_matches_type(ConnectorCreateResponse, connector, path=["response"])
+
+    @pytest.mark.skip(
+        reason="TODO: consider oneOf instead of maxProperties to indicate that this can be either id or serial_number"
+    )
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.connectors.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            device={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            connector = await response.parse()
+            assert_matches_type(ConnectorCreateResponse, connector, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(
+        reason="TODO: consider oneOf instead of maxProperties to indicate that this can be either id or serial_number"
+    )
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_transit.connectors.with_raw_response.create(
+                account_id="",
+                device={},
+            )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
@@ -252,6 +454,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             interrupt_window_duration_hours=0,
             interrupt_window_hour_of_day=0,
             notes="notes",
+            provision_license=True,
             timezone="timezone",
         )
         assert_matches_type(ConnectorUpdateResponse, connector, path=["response"])
@@ -334,6 +537,54 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
                 account_id="",
             )
 
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        connector = await async_client.magic_transit.connectors.delete(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ConnectorDeleteResponse, connector, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.connectors.with_raw_response.delete(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        connector = await response.parse()
+        assert_matches_type(ConnectorDeleteResponse, connector, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.connectors.with_streaming_response.delete(
+            connector_id="connector_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            connector = await response.parse()
+            assert_matches_type(ConnectorDeleteResponse, connector, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_transit.connectors.with_raw_response.delete(
+                connector_id="connector_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `connector_id` but received ''"):
+            await async_client.magic_transit.connectors.with_raw_response.delete(
+                connector_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
         connector = await async_client.magic_transit.connectors.edit(
@@ -351,6 +602,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
             interrupt_window_duration_hours=0,
             interrupt_window_hour_of_day=0,
             notes="notes",
+            provision_license=True,
             timezone="timezone",
         )
         assert_matches_type(ConnectorEditResponse, connector, path=["response"])
diff --git a/tests/api_resources/magic_transit/test_gre_tunnels.py b/tests/api_resources/magic_transit/test_gre_tunnels.py
index a444b45f529..95128794a5d 100644
--- a/tests/api_resources/magic_transit/test_gre_tunnels.py
+++ b/tests/api_resources/magic_transit/test_gre_tunnels.py
@@ -15,6 +15,7 @@
     GRETunnelCreateResponse,
     GRETunnelDeleteResponse,
     GRETunnelUpdateResponse,
+    GRETunnelBulkUpdateResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -28,7 +29,40 @@ class TestGRETunnels:
     def test_method_create(self, client: Cloudflare) -> None:
         gre_tunnel = client.magic_transit.gre_tunnels.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            cloudflare_gre_endpoint="203.0.113.1",
+            customer_gre_endpoint="203.0.113.1",
+            interface_address="192.0.2.0/31",
+            name="GRE_1",
+        )
+        assert_matches_type(GRETunnelCreateResponse, gre_tunnel, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        gre_tunnel = client.magic_transit.gre_tunnels.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            cloudflare_gre_endpoint="203.0.113.1",
+            customer_gre_endpoint="203.0.113.1",
+            interface_address="192.0.2.0/31",
+            name="GRE_1",
+            automatic_return_routing=True,
+            bgp={
+                "customer_asn": 0,
+                "extra_prefixes": ["string"],
+                "md5_key": "md5_key",
+            },
+            description="Tunnel for ISP X",
+            health_check={
+                "direction": "bidirectional",
+                "enabled": True,
+                "rate": "low",
+                "target": {"saved": "203.0.113.1"},
+                "type": "request",
+            },
+            interface_address6="2606:54c1:7:0:a9fe:12d2:1:200/127",
+            mtu=0,
+            ttl=0,
+            x_magic_new_hc_target=True,
         )
         assert_matches_type(GRETunnelCreateResponse, gre_tunnel, path=["response"])
 
@@ -37,7 +71,10 @@ def test_method_create(self, client: Cloudflare) -> None:
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.magic_transit.gre_tunnels.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            cloudflare_gre_endpoint="203.0.113.1",
+            customer_gre_endpoint="203.0.113.1",
+            interface_address="192.0.2.0/31",
+            name="GRE_1",
         )
 
         assert response.is_closed is True
@@ -50,7 +87,10 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.magic_transit.gre_tunnels.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            cloudflare_gre_endpoint="203.0.113.1",
+            customer_gre_endpoint="203.0.113.1",
+            interface_address="192.0.2.0/31",
+            name="GRE_1",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -66,9 +106,13 @@ def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.magic_transit.gre_tunnels.with_raw_response.create(
                 account_id="",
-                body={},
+                cloudflare_gre_endpoint="203.0.113.1",
+                customer_gre_endpoint="203.0.113.1",
+                interface_address="192.0.2.0/31",
+                name="GRE_1",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         gre_tunnel = client.magic_transit.gre_tunnels.update(
@@ -81,6 +125,7 @@ def test_method_update(self, client: Cloudflare) -> None:
         )
         assert_matches_type(GRETunnelUpdateResponse, gre_tunnel, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         gre_tunnel = client.magic_transit.gre_tunnels.update(
@@ -90,19 +135,23 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             customer_gre_endpoint="203.0.113.1",
             interface_address="192.0.2.0/31",
             name="GRE_1",
+            automatic_return_routing=True,
             description="Tunnel for ISP X",
             health_check={
                 "direction": "bidirectional",
                 "enabled": True,
                 "rate": "low",
-                "target": "203.0.113.1",
+                "target": {"saved": "203.0.113.1"},
                 "type": "request",
             },
+            interface_address6="2606:54c1:7:0:a9fe:12d2:1:200/127",
             mtu=0,
             ttl=0,
+            x_magic_new_hc_target=True,
         )
         assert_matches_type(GRETunnelUpdateResponse, gre_tunnel, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.magic_transit.gre_tunnels.with_raw_response.update(
@@ -119,6 +168,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         gre_tunnel = response.parse()
         assert_matches_type(GRETunnelUpdateResponse, gre_tunnel, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.magic_transit.gre_tunnels.with_streaming_response.update(
@@ -137,6 +187,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -166,6 +217,14 @@ def test_method_list(self, client: Cloudflare) -> None:
         )
         assert_matches_type(GRETunnelListResponse, gre_tunnel, path=["response"])
 
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        gre_tunnel = client.magic_transit.gre_tunnels.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(GRETunnelListResponse, gre_tunnel, path=["response"])
+
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.magic_transit.gre_tunnels.with_raw_response.list(
@@ -205,6 +264,15 @@ def test_method_delete(self, client: Cloudflare) -> None:
         )
         assert_matches_type(GRETunnelDeleteResponse, gre_tunnel, path=["response"])
 
+    @parametrize
+    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
+        gre_tunnel = client.magic_transit.gre_tunnels.delete(
+            gre_tunnel_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(GRETunnelDeleteResponse, gre_tunnel, path=["response"])
+
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.magic_transit.gre_tunnels.with_raw_response.delete(
@@ -245,6 +313,62 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_bulk_update(self, client: Cloudflare) -> None:
+        gre_tunnel = client.magic_transit.gre_tunnels.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        )
+        assert_matches_type(GRETunnelBulkUpdateResponse, gre_tunnel, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_bulk_update_with_all_params(self, client: Cloudflare) -> None:
+        gre_tunnel = client.magic_transit.gre_tunnels.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(GRETunnelBulkUpdateResponse, gre_tunnel, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_bulk_update(self, client: Cloudflare) -> None:
+        response = client.magic_transit.gre_tunnels.with_raw_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        gre_tunnel = response.parse()
+        assert_matches_type(GRETunnelBulkUpdateResponse, gre_tunnel, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_bulk_update(self, client: Cloudflare) -> None:
+        with client.magic_transit.gre_tunnels.with_streaming_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            gre_tunnel = response.parse()
+            assert_matches_type(GRETunnelBulkUpdateResponse, gre_tunnel, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_bulk_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_transit.gre_tunnels.with_raw_response.bulk_update(
+                account_id="",
+                body={},
+            )
+
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         gre_tunnel = client.magic_transit.gre_tunnels.get(
@@ -253,6 +377,15 @@ def test_method_get(self, client: Cloudflare) -> None:
         )
         assert_matches_type(GRETunnelGetResponse, gre_tunnel, path=["response"])
 
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        gre_tunnel = client.magic_transit.gre_tunnels.get(
+            gre_tunnel_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(GRETunnelGetResponse, gre_tunnel, path=["response"])
+
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.magic_transit.gre_tunnels.with_raw_response.get(
@@ -295,14 +428,49 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncGRETunnels:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         gre_tunnel = await async_client.magic_transit.gre_tunnels.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            cloudflare_gre_endpoint="203.0.113.1",
+            customer_gre_endpoint="203.0.113.1",
+            interface_address="192.0.2.0/31",
+            name="GRE_1",
+        )
+        assert_matches_type(GRETunnelCreateResponse, gre_tunnel, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        gre_tunnel = await async_client.magic_transit.gre_tunnels.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            cloudflare_gre_endpoint="203.0.113.1",
+            customer_gre_endpoint="203.0.113.1",
+            interface_address="192.0.2.0/31",
+            name="GRE_1",
+            automatic_return_routing=True,
+            bgp={
+                "customer_asn": 0,
+                "extra_prefixes": ["string"],
+                "md5_key": "md5_key",
+            },
+            description="Tunnel for ISP X",
+            health_check={
+                "direction": "bidirectional",
+                "enabled": True,
+                "rate": "low",
+                "target": {"saved": "203.0.113.1"},
+                "type": "request",
+            },
+            interface_address6="2606:54c1:7:0:a9fe:12d2:1:200/127",
+            mtu=0,
+            ttl=0,
+            x_magic_new_hc_target=True,
         )
         assert_matches_type(GRETunnelCreateResponse, gre_tunnel, path=["response"])
 
@@ -311,7 +479,10 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_transit.gre_tunnels.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            cloudflare_gre_endpoint="203.0.113.1",
+            customer_gre_endpoint="203.0.113.1",
+            interface_address="192.0.2.0/31",
+            name="GRE_1",
         )
 
         assert response.is_closed is True
@@ -324,7 +495,10 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.magic_transit.gre_tunnels.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            cloudflare_gre_endpoint="203.0.113.1",
+            customer_gre_endpoint="203.0.113.1",
+            interface_address="192.0.2.0/31",
+            name="GRE_1",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -340,9 +514,13 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.magic_transit.gre_tunnels.with_raw_response.create(
                 account_id="",
-                body={},
+                cloudflare_gre_endpoint="203.0.113.1",
+                customer_gre_endpoint="203.0.113.1",
+                interface_address="192.0.2.0/31",
+                name="GRE_1",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         gre_tunnel = await async_client.magic_transit.gre_tunnels.update(
@@ -355,6 +533,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(GRETunnelUpdateResponse, gre_tunnel, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         gre_tunnel = await async_client.magic_transit.gre_tunnels.update(
@@ -364,19 +543,23 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             customer_gre_endpoint="203.0.113.1",
             interface_address="192.0.2.0/31",
             name="GRE_1",
+            automatic_return_routing=True,
             description="Tunnel for ISP X",
             health_check={
                 "direction": "bidirectional",
                 "enabled": True,
                 "rate": "low",
-                "target": "203.0.113.1",
+                "target": {"saved": "203.0.113.1"},
                 "type": "request",
             },
+            interface_address6="2606:54c1:7:0:a9fe:12d2:1:200/127",
             mtu=0,
             ttl=0,
+            x_magic_new_hc_target=True,
         )
         assert_matches_type(GRETunnelUpdateResponse, gre_tunnel, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_transit.gre_tunnels.with_raw_response.update(
@@ -393,6 +576,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         gre_tunnel = await response.parse()
         assert_matches_type(GRETunnelUpdateResponse, gre_tunnel, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.magic_transit.gre_tunnels.with_streaming_response.update(
@@ -411,6 +595,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -440,6 +625,14 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(GRETunnelListResponse, gre_tunnel, path=["response"])
 
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        gre_tunnel = await async_client.magic_transit.gre_tunnels.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(GRETunnelListResponse, gre_tunnel, path=["response"])
+
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_transit.gre_tunnels.with_raw_response.list(
@@ -479,6 +672,15 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(GRETunnelDeleteResponse, gre_tunnel, path=["response"])
 
+    @parametrize
+    async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        gre_tunnel = await async_client.magic_transit.gre_tunnels.delete(
+            gre_tunnel_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(GRETunnelDeleteResponse, gre_tunnel, path=["response"])
+
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_transit.gre_tunnels.with_raw_response.delete(
@@ -519,6 +721,62 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        gre_tunnel = await async_client.magic_transit.gre_tunnels.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        )
+        assert_matches_type(GRETunnelBulkUpdateResponse, gre_tunnel, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_bulk_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        gre_tunnel = await async_client.magic_transit.gre_tunnels.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(GRETunnelBulkUpdateResponse, gre_tunnel, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.gre_tunnels.with_raw_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        gre_tunnel = await response.parse()
+        assert_matches_type(GRETunnelBulkUpdateResponse, gre_tunnel, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.gre_tunnels.with_streaming_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            gre_tunnel = await response.parse()
+            assert_matches_type(GRETunnelBulkUpdateResponse, gre_tunnel, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_transit.gre_tunnels.with_raw_response.bulk_update(
+                account_id="",
+                body={},
+            )
+
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         gre_tunnel = await async_client.magic_transit.gre_tunnels.get(
@@ -527,6 +785,15 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(GRETunnelGetResponse, gre_tunnel, path=["response"])
 
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        gre_tunnel = await async_client.magic_transit.gre_tunnels.get(
+            gre_tunnel_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(GRETunnelGetResponse, gre_tunnel, path=["response"])
+
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_transit.gre_tunnels.with_raw_response.get(
diff --git a/tests/api_resources/magic_transit/test_ipsec_tunnels.py b/tests/api_resources/magic_transit/test_ipsec_tunnels.py
index ef622e4b728..01460e202f7 100644
--- a/tests/api_resources/magic_transit/test_ipsec_tunnels.py
+++ b/tests/api_resources/magic_transit/test_ipsec_tunnels.py
@@ -15,6 +15,7 @@
     IPSECTunnelCreateResponse,
     IPSECTunnelDeleteResponse,
     IPSECTunnelUpdateResponse,
+    IPSECTunnelBulkUpdateResponse,
     IPSECTunnelPSKGenerateResponse,
 )
 
@@ -41,17 +42,26 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             cloudflare_endpoint="203.0.113.1",
             interface_address="192.0.2.0/31",
             name="IPsec_1",
+            automatic_return_routing=True,
+            bgp={
+                "customer_asn": 0,
+                "extra_prefixes": ["string"],
+                "md5_key": "md5_key",
+            },
+            custom_remote_identities={"fqdn_id": "fqdn_id"},
             customer_endpoint="203.0.113.1",
             description="Tunnel for ISP X",
             health_check={
                 "direction": "bidirectional",
                 "enabled": True,
                 "rate": "low",
-                "target": "203.0.113.1",
+                "target": {"saved": "203.0.113.1"},
                 "type": "request",
             },
+            interface_address6="2606:54c1:7:0:a9fe:12d2:1:200/127",
             psk="O3bwKSjnaoCxDoUxjcq4Rk8ZKkezQUiy",
             replay_protection=False,
+            x_magic_new_hc_target=True,
         )
         assert_matches_type(IPSECTunnelCreateResponse, ipsec_tunnel, path=["response"])
 
@@ -95,6 +105,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
                 name="IPsec_1",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         ipsec_tunnel = client.magic_transit.ipsec_tunnels.update(
@@ -106,6 +117,7 @@ def test_method_update(self, client: Cloudflare) -> None:
         )
         assert_matches_type(IPSECTunnelUpdateResponse, ipsec_tunnel, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         ipsec_tunnel = client.magic_transit.ipsec_tunnels.update(
@@ -114,20 +126,30 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             cloudflare_endpoint="203.0.113.1",
             interface_address="192.0.2.0/31",
             name="IPsec_1",
+            automatic_return_routing=True,
+            bgp={
+                "customer_asn": 0,
+                "extra_prefixes": ["string"],
+                "md5_key": "md5_key",
+            },
+            custom_remote_identities={"fqdn_id": "fqdn_id"},
             customer_endpoint="203.0.113.1",
             description="Tunnel for ISP X",
             health_check={
                 "direction": "bidirectional",
                 "enabled": True,
                 "rate": "low",
-                "target": "203.0.113.1",
+                "target": {"saved": "203.0.113.1"},
                 "type": "request",
             },
+            interface_address6="2606:54c1:7:0:a9fe:12d2:1:200/127",
             psk="O3bwKSjnaoCxDoUxjcq4Rk8ZKkezQUiy",
             replay_protection=False,
+            x_magic_new_hc_target=True,
         )
         assert_matches_type(IPSECTunnelUpdateResponse, ipsec_tunnel, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.magic_transit.ipsec_tunnels.with_raw_response.update(
@@ -143,6 +165,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         ipsec_tunnel = response.parse()
         assert_matches_type(IPSECTunnelUpdateResponse, ipsec_tunnel, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.magic_transit.ipsec_tunnels.with_streaming_response.update(
@@ -160,6 +183,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -187,6 +211,14 @@ def test_method_list(self, client: Cloudflare) -> None:
         )
         assert_matches_type(IPSECTunnelListResponse, ipsec_tunnel, path=["response"])
 
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        ipsec_tunnel = client.magic_transit.ipsec_tunnels.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(IPSECTunnelListResponse, ipsec_tunnel, path=["response"])
+
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.magic_transit.ipsec_tunnels.with_raw_response.list(
@@ -226,6 +258,15 @@ def test_method_delete(self, client: Cloudflare) -> None:
         )
         assert_matches_type(IPSECTunnelDeleteResponse, ipsec_tunnel, path=["response"])
 
+    @parametrize
+    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
+        ipsec_tunnel = client.magic_transit.ipsec_tunnels.delete(
+            ipsec_tunnel_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(IPSECTunnelDeleteResponse, ipsec_tunnel, path=["response"])
+
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.magic_transit.ipsec_tunnels.with_raw_response.delete(
@@ -266,6 +307,62 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_bulk_update(self, client: Cloudflare) -> None:
+        ipsec_tunnel = client.magic_transit.ipsec_tunnels.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        )
+        assert_matches_type(IPSECTunnelBulkUpdateResponse, ipsec_tunnel, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_bulk_update_with_all_params(self, client: Cloudflare) -> None:
+        ipsec_tunnel = client.magic_transit.ipsec_tunnels.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(IPSECTunnelBulkUpdateResponse, ipsec_tunnel, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_bulk_update(self, client: Cloudflare) -> None:
+        response = client.magic_transit.ipsec_tunnels.with_raw_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ipsec_tunnel = response.parse()
+        assert_matches_type(IPSECTunnelBulkUpdateResponse, ipsec_tunnel, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_bulk_update(self, client: Cloudflare) -> None:
+        with client.magic_transit.ipsec_tunnels.with_streaming_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ipsec_tunnel = response.parse()
+            assert_matches_type(IPSECTunnelBulkUpdateResponse, ipsec_tunnel, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_bulk_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_transit.ipsec_tunnels.with_raw_response.bulk_update(
+                account_id="",
+                body={},
+            )
+
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         ipsec_tunnel = client.magic_transit.ipsec_tunnels.get(
@@ -274,6 +371,15 @@ def test_method_get(self, client: Cloudflare) -> None:
         )
         assert_matches_type(IPSECTunnelGetResponse, ipsec_tunnel, path=["response"])
 
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        ipsec_tunnel = client.magic_transit.ipsec_tunnels.get(
+            ipsec_tunnel_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(IPSECTunnelGetResponse, ipsec_tunnel, path=["response"])
+
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.magic_transit.ipsec_tunnels.with_raw_response.get(
@@ -369,7 +475,9 @@ def test_path_params_psk_generate(self, client: Cloudflare) -> None:
 
 
 class TestAsyncIPSECTunnels:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -388,17 +496,26 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             cloudflare_endpoint="203.0.113.1",
             interface_address="192.0.2.0/31",
             name="IPsec_1",
+            automatic_return_routing=True,
+            bgp={
+                "customer_asn": 0,
+                "extra_prefixes": ["string"],
+                "md5_key": "md5_key",
+            },
+            custom_remote_identities={"fqdn_id": "fqdn_id"},
             customer_endpoint="203.0.113.1",
             description="Tunnel for ISP X",
             health_check={
                 "direction": "bidirectional",
                 "enabled": True,
                 "rate": "low",
-                "target": "203.0.113.1",
+                "target": {"saved": "203.0.113.1"},
                 "type": "request",
             },
+            interface_address6="2606:54c1:7:0:a9fe:12d2:1:200/127",
             psk="O3bwKSjnaoCxDoUxjcq4Rk8ZKkezQUiy",
             replay_protection=False,
+            x_magic_new_hc_target=True,
         )
         assert_matches_type(IPSECTunnelCreateResponse, ipsec_tunnel, path=["response"])
 
@@ -442,6 +559,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
                 name="IPsec_1",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         ipsec_tunnel = await async_client.magic_transit.ipsec_tunnels.update(
@@ -453,6 +571,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(IPSECTunnelUpdateResponse, ipsec_tunnel, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         ipsec_tunnel = await async_client.magic_transit.ipsec_tunnels.update(
@@ -461,20 +580,30 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             cloudflare_endpoint="203.0.113.1",
             interface_address="192.0.2.0/31",
             name="IPsec_1",
+            automatic_return_routing=True,
+            bgp={
+                "customer_asn": 0,
+                "extra_prefixes": ["string"],
+                "md5_key": "md5_key",
+            },
+            custom_remote_identities={"fqdn_id": "fqdn_id"},
             customer_endpoint="203.0.113.1",
             description="Tunnel for ISP X",
             health_check={
                 "direction": "bidirectional",
                 "enabled": True,
                 "rate": "low",
-                "target": "203.0.113.1",
+                "target": {"saved": "203.0.113.1"},
                 "type": "request",
             },
+            interface_address6="2606:54c1:7:0:a9fe:12d2:1:200/127",
             psk="O3bwKSjnaoCxDoUxjcq4Rk8ZKkezQUiy",
             replay_protection=False,
+            x_magic_new_hc_target=True,
         )
         assert_matches_type(IPSECTunnelUpdateResponse, ipsec_tunnel, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_transit.ipsec_tunnels.with_raw_response.update(
@@ -490,6 +619,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         ipsec_tunnel = await response.parse()
         assert_matches_type(IPSECTunnelUpdateResponse, ipsec_tunnel, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.magic_transit.ipsec_tunnels.with_streaming_response.update(
@@ -507,6 +637,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -534,6 +665,14 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(IPSECTunnelListResponse, ipsec_tunnel, path=["response"])
 
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        ipsec_tunnel = await async_client.magic_transit.ipsec_tunnels.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(IPSECTunnelListResponse, ipsec_tunnel, path=["response"])
+
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_transit.ipsec_tunnels.with_raw_response.list(
@@ -573,6 +712,15 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(IPSECTunnelDeleteResponse, ipsec_tunnel, path=["response"])
 
+    @parametrize
+    async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        ipsec_tunnel = await async_client.magic_transit.ipsec_tunnels.delete(
+            ipsec_tunnel_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(IPSECTunnelDeleteResponse, ipsec_tunnel, path=["response"])
+
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_transit.ipsec_tunnels.with_raw_response.delete(
@@ -613,6 +761,62 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        ipsec_tunnel = await async_client.magic_transit.ipsec_tunnels.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        )
+        assert_matches_type(IPSECTunnelBulkUpdateResponse, ipsec_tunnel, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_bulk_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        ipsec_tunnel = await async_client.magic_transit.ipsec_tunnels.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(IPSECTunnelBulkUpdateResponse, ipsec_tunnel, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.ipsec_tunnels.with_raw_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ipsec_tunnel = await response.parse()
+        assert_matches_type(IPSECTunnelBulkUpdateResponse, ipsec_tunnel, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.ipsec_tunnels.with_streaming_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ipsec_tunnel = await response.parse()
+            assert_matches_type(IPSECTunnelBulkUpdateResponse, ipsec_tunnel, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_transit.ipsec_tunnels.with_raw_response.bulk_update(
+                account_id="",
+                body={},
+            )
+
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         ipsec_tunnel = await async_client.magic_transit.ipsec_tunnels.get(
@@ -621,6 +825,15 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(IPSECTunnelGetResponse, ipsec_tunnel, path=["response"])
 
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        ipsec_tunnel = await async_client.magic_transit.ipsec_tunnels.get(
+            ipsec_tunnel_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(IPSECTunnelGetResponse, ipsec_tunnel, path=["response"])
+
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_transit.ipsec_tunnels.with_raw_response.get(
diff --git a/tests/api_resources/magic_transit/test_pcaps.py b/tests/api_resources/magic_transit/test_pcaps.py
new file mode 100644
index 00000000000..17a6cb661d4
--- /dev/null
+++ b/tests/api_resources/magic_transit/test_pcaps.py
@@ -0,0 +1,602 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.magic_transit import (
+    PCAPGetResponse,
+    PCAPListResponse,
+    PCAPCreateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestPCAPs:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create_overload_1(self, client: Cloudflare) -> None:
+        pcap = client.magic_transit.pcaps.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            packet_limit=10000,
+            system="magic-transit",
+            time_limit=300,
+            type="simple",
+        )
+        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        pcap = client.magic_transit.pcaps.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            packet_limit=10000,
+            system="magic-transit",
+            time_limit=300,
+            type="simple",
+            filter_v1={
+                "destination_address": "1.2.3.4",
+                "destination_port": 80,
+                "protocol": 6,
+                "source_address": "1.2.3.4",
+                "source_port": 123,
+            },
+            offset_time=parse_datetime("2020-01-01T08:00:00Z"),
+        )
+        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_1(self, client: Cloudflare) -> None:
+        response = client.magic_transit.pcaps.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            packet_limit=10000,
+            system="magic-transit",
+            time_limit=300,
+            type="simple",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pcap = response.parse()
+        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
+        with client.magic_transit.pcaps.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            packet_limit=10000,
+            system="magic-transit",
+            time_limit=300,
+            type="simple",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pcap = response.parse()
+            assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_transit.pcaps.with_raw_response.create(
+                account_id="",
+                packet_limit=10000,
+                system="magic-transit",
+                time_limit=300,
+                type="simple",
+            )
+
+    @parametrize
+    def test_method_create_overload_2(self, client: Cloudflare) -> None:
+        pcap = client.magic_transit.pcaps.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            colo_name="ord02",
+            destination_conf="s3://pcaps-bucket?region=us-east-1",
+            system="magic-transit",
+            time_limit=86400,
+            type="simple",
+        )
+        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        pcap = client.magic_transit.pcaps.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            colo_name="ord02",
+            destination_conf="s3://pcaps-bucket?region=us-east-1",
+            system="magic-transit",
+            time_limit=86400,
+            type="simple",
+            byte_limit=500000,
+            filter_v1={
+                "destination_address": "1.2.3.4",
+                "destination_port": 80,
+                "protocol": 6,
+                "source_address": "1.2.3.4",
+                "source_port": 123,
+            },
+            packet_limit=10000,
+        )
+        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
+        response = client.magic_transit.pcaps.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            colo_name="ord02",
+            destination_conf="s3://pcaps-bucket?region=us-east-1",
+            system="magic-transit",
+            time_limit=86400,
+            type="simple",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pcap = response.parse()
+        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
+        with client.magic_transit.pcaps.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            colo_name="ord02",
+            destination_conf="s3://pcaps-bucket?region=us-east-1",
+            system="magic-transit",
+            time_limit=86400,
+            type="simple",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pcap = response.parse()
+            assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_transit.pcaps.with_raw_response.create(
+                account_id="",
+                colo_name="ord02",
+                destination_conf="s3://pcaps-bucket?region=us-east-1",
+                system="magic-transit",
+                time_limit=86400,
+                type="simple",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        pcap = client.magic_transit.pcaps.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[PCAPListResponse], pcap, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.magic_transit.pcaps.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pcap = response.parse()
+        assert_matches_type(SyncSinglePage[PCAPListResponse], pcap, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.magic_transit.pcaps.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pcap = response.parse()
+            assert_matches_type(SyncSinglePage[PCAPListResponse], pcap, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_transit.pcaps.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        pcap = client.magic_transit.pcaps.get(
+            pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(PCAPGetResponse, pcap, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.magic_transit.pcaps.with_raw_response.get(
+            pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pcap = response.parse()
+        assert_matches_type(PCAPGetResponse, pcap, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.magic_transit.pcaps.with_streaming_response.get(
+            pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pcap = response.parse()
+            assert_matches_type(PCAPGetResponse, pcap, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_transit.pcaps.with_raw_response.get(
+                pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `pcap_id` but received ''"):
+            client.magic_transit.pcaps.with_raw_response.get(
+                pcap_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_stop(self, client: Cloudflare) -> None:
+        pcap = client.magic_transit.pcaps.stop(
+            pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert pcap is None
+
+    @parametrize
+    def test_raw_response_stop(self, client: Cloudflare) -> None:
+        response = client.magic_transit.pcaps.with_raw_response.stop(
+            pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pcap = response.parse()
+        assert pcap is None
+
+    @parametrize
+    def test_streaming_response_stop(self, client: Cloudflare) -> None:
+        with client.magic_transit.pcaps.with_streaming_response.stop(
+            pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pcap = response.parse()
+            assert pcap is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_stop(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_transit.pcaps.with_raw_response.stop(
+                pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `pcap_id` but received ''"):
+            client.magic_transit.pcaps.with_raw_response.stop(
+                pcap_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncPCAPs:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        pcap = await async_client.magic_transit.pcaps.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            packet_limit=10000,
+            system="magic-transit",
+            time_limit=300,
+            type="simple",
+        )
+        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        pcap = await async_client.magic_transit.pcaps.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            packet_limit=10000,
+            system="magic-transit",
+            time_limit=300,
+            type="simple",
+            filter_v1={
+                "destination_address": "1.2.3.4",
+                "destination_port": 80,
+                "protocol": 6,
+                "source_address": "1.2.3.4",
+                "source_port": 123,
+            },
+            offset_time=parse_datetime("2020-01-01T08:00:00Z"),
+        )
+        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.pcaps.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            packet_limit=10000,
+            system="magic-transit",
+            time_limit=300,
+            type="simple",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pcap = await response.parse()
+        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.pcaps.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            packet_limit=10000,
+            system="magic-transit",
+            time_limit=300,
+            type="simple",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pcap = await response.parse()
+            assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_transit.pcaps.with_raw_response.create(
+                account_id="",
+                packet_limit=10000,
+                system="magic-transit",
+                time_limit=300,
+                type="simple",
+            )
+
+    @parametrize
+    async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        pcap = await async_client.magic_transit.pcaps.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            colo_name="ord02",
+            destination_conf="s3://pcaps-bucket?region=us-east-1",
+            system="magic-transit",
+            time_limit=86400,
+            type="simple",
+        )
+        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        pcap = await async_client.magic_transit.pcaps.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            colo_name="ord02",
+            destination_conf="s3://pcaps-bucket?region=us-east-1",
+            system="magic-transit",
+            time_limit=86400,
+            type="simple",
+            byte_limit=500000,
+            filter_v1={
+                "destination_address": "1.2.3.4",
+                "destination_port": 80,
+                "protocol": 6,
+                "source_address": "1.2.3.4",
+                "source_port": 123,
+            },
+            packet_limit=10000,
+        )
+        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.pcaps.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            colo_name="ord02",
+            destination_conf="s3://pcaps-bucket?region=us-east-1",
+            system="magic-transit",
+            time_limit=86400,
+            type="simple",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pcap = await response.parse()
+        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.pcaps.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            colo_name="ord02",
+            destination_conf="s3://pcaps-bucket?region=us-east-1",
+            system="magic-transit",
+            time_limit=86400,
+            type="simple",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pcap = await response.parse()
+            assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_transit.pcaps.with_raw_response.create(
+                account_id="",
+                colo_name="ord02",
+                destination_conf="s3://pcaps-bucket?region=us-east-1",
+                system="magic-transit",
+                time_limit=86400,
+                type="simple",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        pcap = await async_client.magic_transit.pcaps.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[PCAPListResponse], pcap, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.pcaps.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pcap = await response.parse()
+        assert_matches_type(AsyncSinglePage[PCAPListResponse], pcap, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.pcaps.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pcap = await response.parse()
+            assert_matches_type(AsyncSinglePage[PCAPListResponse], pcap, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_transit.pcaps.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        pcap = await async_client.magic_transit.pcaps.get(
+            pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(PCAPGetResponse, pcap, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.pcaps.with_raw_response.get(
+            pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pcap = await response.parse()
+        assert_matches_type(PCAPGetResponse, pcap, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.pcaps.with_streaming_response.get(
+            pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pcap = await response.parse()
+            assert_matches_type(PCAPGetResponse, pcap, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_transit.pcaps.with_raw_response.get(
+                pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `pcap_id` but received ''"):
+            await async_client.magic_transit.pcaps.with_raw_response.get(
+                pcap_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_stop(self, async_client: AsyncCloudflare) -> None:
+        pcap = await async_client.magic_transit.pcaps.stop(
+            pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert pcap is None
+
+    @parametrize
+    async def test_raw_response_stop(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.pcaps.with_raw_response.stop(
+            pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pcap = await response.parse()
+        assert pcap is None
+
+    @parametrize
+    async def test_streaming_response_stop(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.pcaps.with_streaming_response.stop(
+            pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pcap = await response.parse()
+            assert pcap is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_stop(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_transit.pcaps.with_raw_response.stop(
+                pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `pcap_id` but received ''"):
+            await async_client.magic_transit.pcaps.with_raw_response.stop(
+                pcap_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/magic_transit/test_routes.py b/tests/api_resources/magic_transit/test_routes.py
index 109d3b9f025..9524a986da2 100644
--- a/tests/api_resources/magic_transit/test_routes.py
+++ b/tests/api_resources/magic_transit/test_routes.py
@@ -16,6 +16,7 @@
     RouteCreateResponse,
     RouteDeleteResponse,
     RouteUpdateResponse,
+    RouteBulkUpdateResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -29,7 +30,26 @@ class TestRoutes:
     def test_method_create(self, client: Cloudflare) -> None:
         route = client.magic_transit.routes.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            nexthop="203.0.113.1",
+            prefix="192.0.2.0/24",
+            priority=0,
+        )
+        assert_matches_type(RouteCreateResponse, route, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        route = client.magic_transit.routes.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            nexthop="203.0.113.1",
+            prefix="192.0.2.0/24",
+            priority=0,
+            description="New route for new prefix 203.0.113.1",
+            scope={
+                "colo_names": ["den01"],
+                "colo_regions": ["APAC"],
+            },
+            weight=0,
         )
         assert_matches_type(RouteCreateResponse, route, path=["response"])
 
@@ -38,7 +58,9 @@ def test_method_create(self, client: Cloudflare) -> None:
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.magic_transit.routes.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            nexthop="203.0.113.1",
+            prefix="192.0.2.0/24",
+            priority=0,
         )
 
         assert response.is_closed is True
@@ -51,7 +73,9 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.magic_transit.routes.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            nexthop="203.0.113.1",
+            prefix="192.0.2.0/24",
+            priority=0,
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -67,7 +91,9 @@ def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.magic_transit.routes.with_raw_response.create(
                 account_id="",
-                body={},
+                nexthop="203.0.113.1",
+                prefix="192.0.2.0/24",
+                priority=0,
             )
 
     @parametrize
@@ -91,8 +117,8 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             priority=0,
             description="New route for new prefix 203.0.113.1",
             scope={
-                "colo_names": ["den01", "den01", "den01"],
-                "colo_regions": ["APAC", "APAC", "APAC"],
+                "colo_names": ["den01"],
+                "colo_regions": ["APAC"],
             },
             weight=0,
         )
@@ -236,6 +262,76 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @parametrize
+    def test_method_bulk_update(self, client: Cloudflare) -> None:
+        route = client.magic_transit.routes.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            routes=[
+                {
+                    "id": "023e105f4ecef8ad9ca31a8372d0c353",
+                    "nexthop": "203.0.113.1",
+                    "prefix": "192.0.2.0/24",
+                    "priority": 0,
+                }
+            ],
+        )
+        assert_matches_type(RouteBulkUpdateResponse, route, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_update(self, client: Cloudflare) -> None:
+        response = client.magic_transit.routes.with_raw_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            routes=[
+                {
+                    "id": "023e105f4ecef8ad9ca31a8372d0c353",
+                    "nexthop": "203.0.113.1",
+                    "prefix": "192.0.2.0/24",
+                    "priority": 0,
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        route = response.parse()
+        assert_matches_type(RouteBulkUpdateResponse, route, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_update(self, client: Cloudflare) -> None:
+        with client.magic_transit.routes.with_streaming_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            routes=[
+                {
+                    "id": "023e105f4ecef8ad9ca31a8372d0c353",
+                    "nexthop": "203.0.113.1",
+                    "prefix": "192.0.2.0/24",
+                    "priority": 0,
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            route = response.parse()
+            assert_matches_type(RouteBulkUpdateResponse, route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.magic_transit.routes.with_raw_response.bulk_update(
+                account_id="",
+                routes=[
+                    {
+                        "id": "023e105f4ecef8ad9ca31a8372d0c353",
+                        "nexthop": "203.0.113.1",
+                        "prefix": "192.0.2.0/24",
+                        "priority": 0,
+                    }
+                ],
+            )
+
     @parametrize
     def test_method_empty(self, client: Cloudflare) -> None:
         route = client.magic_transit.routes.empty(
@@ -324,14 +420,35 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncRoutes:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         route = await async_client.magic_transit.routes.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            nexthop="203.0.113.1",
+            prefix="192.0.2.0/24",
+            priority=0,
+        )
+        assert_matches_type(RouteCreateResponse, route, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        route = await async_client.magic_transit.routes.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            nexthop="203.0.113.1",
+            prefix="192.0.2.0/24",
+            priority=0,
+            description="New route for new prefix 203.0.113.1",
+            scope={
+                "colo_names": ["den01"],
+                "colo_regions": ["APAC"],
+            },
+            weight=0,
         )
         assert_matches_type(RouteCreateResponse, route, path=["response"])
 
@@ -340,7 +457,9 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_transit.routes.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            nexthop="203.0.113.1",
+            prefix="192.0.2.0/24",
+            priority=0,
         )
 
         assert response.is_closed is True
@@ -353,7 +472,9 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.magic_transit.routes.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+            nexthop="203.0.113.1",
+            prefix="192.0.2.0/24",
+            priority=0,
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -369,7 +490,9 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.magic_transit.routes.with_raw_response.create(
                 account_id="",
-                body={},
+                nexthop="203.0.113.1",
+                prefix="192.0.2.0/24",
+                priority=0,
             )
 
     @parametrize
@@ -393,8 +516,8 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             priority=0,
             description="New route for new prefix 203.0.113.1",
             scope={
-                "colo_names": ["den01", "den01", "den01"],
-                "colo_regions": ["APAC", "APAC", "APAC"],
+                "colo_names": ["den01"],
+                "colo_regions": ["APAC"],
             },
             weight=0,
         )
@@ -538,6 +661,76 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @parametrize
+    async def test_method_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        route = await async_client.magic_transit.routes.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            routes=[
+                {
+                    "id": "023e105f4ecef8ad9ca31a8372d0c353",
+                    "nexthop": "203.0.113.1",
+                    "prefix": "192.0.2.0/24",
+                    "priority": 0,
+                }
+            ],
+        )
+        assert_matches_type(RouteBulkUpdateResponse, route, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.magic_transit.routes.with_raw_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            routes=[
+                {
+                    "id": "023e105f4ecef8ad9ca31a8372d0c353",
+                    "nexthop": "203.0.113.1",
+                    "prefix": "192.0.2.0/24",
+                    "priority": 0,
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        route = await response.parse()
+        assert_matches_type(RouteBulkUpdateResponse, route, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.magic_transit.routes.with_streaming_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            routes=[
+                {
+                    "id": "023e105f4ecef8ad9ca31a8372d0c353",
+                    "nexthop": "203.0.113.1",
+                    "prefix": "192.0.2.0/24",
+                    "priority": 0,
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            route = await response.parse()
+            assert_matches_type(RouteBulkUpdateResponse, route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.magic_transit.routes.with_raw_response.bulk_update(
+                account_id="",
+                routes=[
+                    {
+                        "id": "023e105f4ecef8ad9ca31a8372d0c353",
+                        "nexthop": "203.0.113.1",
+                        "prefix": "192.0.2.0/24",
+                        "priority": 0,
+                    }
+                ],
+            )
+
     @parametrize
     async def test_method_empty(self, async_client: AsyncCloudflare) -> None:
         route = await async_client.magic_transit.routes.empty(
diff --git a/tests/api_resources/magic_transit/test_sites.py b/tests/api_resources/magic_transit/test_sites.py
index e4556c64f70..27c50c24f7f 100644
--- a/tests/api_resources/magic_transit/test_sites.py
+++ b/tests/api_resources/magic_transit/test_sites.py
@@ -153,7 +153,7 @@ def test_method_list(self, client: Cloudflare) -> None:
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         site = client.magic_transit.sites.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            connector_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            connectorid="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(SyncSinglePage[Site], site, path=["response"])
 
@@ -308,6 +308,15 @@ def test_method_get(self, client: Cloudflare) -> None:
         )
         assert_matches_type(Site, site, path=["response"])
 
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        site = client.magic_transit.sites.get(
+            site_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(Site, site, path=["response"])
+
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.magic_transit.sites.with_raw_response.get(
@@ -350,7 +359,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSites:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -485,7 +496,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         site = await async_client.magic_transit.sites.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            connector_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            connectorid="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(AsyncSinglePage[Site], site, path=["response"])
 
@@ -640,6 +651,15 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(Site, site, path=["response"])
 
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        site = await async_client.magic_transit.sites.get(
+            site_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            x_magic_new_hc_target=True,
+        )
+        assert_matches_type(Site, site, path=["response"])
+
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.magic_transit.sites.with_raw_response.get(
diff --git a/tests/api_resources/mtls_certificates/test_associations.py b/tests/api_resources/mtls_certificates/test_associations.py
index 8c28a978c39..ce2192b2694 100644
--- a/tests/api_resources/mtls_certificates/test_associations.py
+++ b/tests/api_resources/mtls_certificates/test_associations.py
@@ -3,13 +3,14 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.mtls_certificates import AssociationGetResponse
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.mtls_certificates import CertificateAsssociation
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -23,7 +24,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             mtls_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[AssociationGetResponse], association, path=["response"])
+        assert_matches_type(SyncSinglePage[CertificateAsssociation], association, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -35,7 +36,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         association = response.parse()
-        assert_matches_type(Optional[AssociationGetResponse], association, path=["response"])
+        assert_matches_type(SyncSinglePage[CertificateAsssociation], association, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -47,7 +48,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             association = response.parse()
-            assert_matches_type(Optional[AssociationGetResponse], association, path=["response"])
+            assert_matches_type(SyncSinglePage[CertificateAsssociation], association, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -67,7 +68,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncAssociations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -75,7 +78,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             mtls_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[AssociationGetResponse], association, path=["response"])
+        assert_matches_type(AsyncSinglePage[CertificateAsssociation], association, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -87,7 +90,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         association = await response.parse()
-        assert_matches_type(Optional[AssociationGetResponse], association, path=["response"])
+        assert_matches_type(AsyncSinglePage[CertificateAsssociation], association, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -99,7 +102,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             association = await response.parse()
-            assert_matches_type(Optional[AssociationGetResponse], association, path=["response"])
+            assert_matches_type(AsyncSinglePage[CertificateAsssociation], association, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/network_interconnects/__init__.py b/tests/api_resources/network_interconnects/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/network_interconnects/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/network_interconnects/test_cnis.py b/tests/api_resources/network_interconnects/test_cnis.py
new file mode 100644
index 00000000000..a2d7d5044f1
--- /dev/null
+++ b/tests/api_resources/network_interconnects/test_cnis.py
@@ -0,0 +1,731 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.network_interconnects import (
+    CNIGetResponse,
+    CNIListResponse,
+    CNICreateResponse,
+    CNIUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCNIs:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        cni = client.network_interconnects.cnis.create(
+            account_id="account_id",
+            account="account",
+            interconnect="interconnect",
+            magic={
+                "conduit_name": "conduit_name",
+                "description": "description",
+                "mtu": 0,
+            },
+        )
+        assert_matches_type(CNICreateResponse, cni, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        cni = client.network_interconnects.cnis.create(
+            account_id="account_id",
+            account="account",
+            interconnect="interconnect",
+            magic={
+                "conduit_name": "conduit_name",
+                "description": "description",
+                "mtu": 0,
+            },
+            bgp={
+                "customer_asn": 0,
+                "extra_prefixes": ["string"],
+                "md5_key": "md5_key",
+            },
+        )
+        assert_matches_type(CNICreateResponse, cni, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.network_interconnects.cnis.with_raw_response.create(
+            account_id="account_id",
+            account="account",
+            interconnect="interconnect",
+            magic={
+                "conduit_name": "conduit_name",
+                "description": "description",
+                "mtu": 0,
+            },
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cni = response.parse()
+        assert_matches_type(CNICreateResponse, cni, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.network_interconnects.cnis.with_streaming_response.create(
+            account_id="account_id",
+            account="account",
+            interconnect="interconnect",
+            magic={
+                "conduit_name": "conduit_name",
+                "description": "description",
+                "mtu": 0,
+            },
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cni = response.parse()
+            assert_matches_type(CNICreateResponse, cni, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.network_interconnects.cnis.with_raw_response.create(
+                account_id="",
+                account="account",
+                interconnect="interconnect",
+                magic={
+                    "conduit_name": "conduit_name",
+                    "description": "description",
+                    "mtu": 0,
+                },
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        cni = client.network_interconnects.cnis.update(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account="account",
+            cust_ip="192.168.3.4/31",
+            interconnect="interconnect",
+            magic={
+                "conduit_name": "conduit_name",
+                "description": "description",
+                "mtu": 0,
+            },
+            p2p_ip="192.168.3.4/31",
+        )
+        assert_matches_type(CNIUpdateResponse, cni, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        cni = client.network_interconnects.cnis.update(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account="account",
+            cust_ip="192.168.3.4/31",
+            interconnect="interconnect",
+            magic={
+                "conduit_name": "conduit_name",
+                "description": "description",
+                "mtu": 0,
+            },
+            p2p_ip="192.168.3.4/31",
+            bgp={
+                "customer_asn": 0,
+                "extra_prefixes": ["string"],
+                "md5_key": "md5_key",
+            },
+        )
+        assert_matches_type(CNIUpdateResponse, cni, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.network_interconnects.cnis.with_raw_response.update(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account="account",
+            cust_ip="192.168.3.4/31",
+            interconnect="interconnect",
+            magic={
+                "conduit_name": "conduit_name",
+                "description": "description",
+                "mtu": 0,
+            },
+            p2p_ip="192.168.3.4/31",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cni = response.parse()
+        assert_matches_type(CNIUpdateResponse, cni, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.network_interconnects.cnis.with_streaming_response.update(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account="account",
+            cust_ip="192.168.3.4/31",
+            interconnect="interconnect",
+            magic={
+                "conduit_name": "conduit_name",
+                "description": "description",
+                "mtu": 0,
+            },
+            p2p_ip="192.168.3.4/31",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cni = response.parse()
+            assert_matches_type(CNIUpdateResponse, cni, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.network_interconnects.cnis.with_raw_response.update(
+                cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account="account",
+                cust_ip="192.168.3.4/31",
+                interconnect="interconnect",
+                magic={
+                    "conduit_name": "conduit_name",
+                    "description": "description",
+                    "mtu": 0,
+                },
+                p2p_ip="192.168.3.4/31",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `cni` but received ''"):
+            client.network_interconnects.cnis.with_raw_response.update(
+                cni="",
+                account_id="account_id",
+                id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account="account",
+                cust_ip="192.168.3.4/31",
+                interconnect="interconnect",
+                magic={
+                    "conduit_name": "conduit_name",
+                    "description": "description",
+                    "mtu": 0,
+                },
+                p2p_ip="192.168.3.4/31",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        cni = client.network_interconnects.cnis.list(
+            account_id="account_id",
+        )
+        assert_matches_type(CNIListResponse, cni, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        cni = client.network_interconnects.cnis.list(
+            account_id="account_id",
+            cursor=0,
+            limit=0,
+            slot="slot",
+            tunnel_id="tunnel_id",
+        )
+        assert_matches_type(CNIListResponse, cni, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.network_interconnects.cnis.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cni = response.parse()
+        assert_matches_type(CNIListResponse, cni, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.network_interconnects.cnis.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cni = response.parse()
+            assert_matches_type(CNIListResponse, cni, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.network_interconnects.cnis.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        cni = client.network_interconnects.cnis.delete(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert cni is None
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.network_interconnects.cnis.with_raw_response.delete(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cni = response.parse()
+        assert cni is None
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.network_interconnects.cnis.with_streaming_response.delete(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cni = response.parse()
+            assert cni is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.network_interconnects.cnis.with_raw_response.delete(
+                cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `cni` but received ''"):
+            client.network_interconnects.cnis.with_raw_response.delete(
+                cni="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        cni = client.network_interconnects.cnis.get(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CNIGetResponse, cni, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.network_interconnects.cnis.with_raw_response.get(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cni = response.parse()
+        assert_matches_type(CNIGetResponse, cni, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.network_interconnects.cnis.with_streaming_response.get(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cni = response.parse()
+            assert_matches_type(CNIGetResponse, cni, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.network_interconnects.cnis.with_raw_response.get(
+                cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `cni` but received ''"):
+            client.network_interconnects.cnis.with_raw_response.get(
+                cni="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncCNIs:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        cni = await async_client.network_interconnects.cnis.create(
+            account_id="account_id",
+            account="account",
+            interconnect="interconnect",
+            magic={
+                "conduit_name": "conduit_name",
+                "description": "description",
+                "mtu": 0,
+            },
+        )
+        assert_matches_type(CNICreateResponse, cni, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cni = await async_client.network_interconnects.cnis.create(
+            account_id="account_id",
+            account="account",
+            interconnect="interconnect",
+            magic={
+                "conduit_name": "conduit_name",
+                "description": "description",
+                "mtu": 0,
+            },
+            bgp={
+                "customer_asn": 0,
+                "extra_prefixes": ["string"],
+                "md5_key": "md5_key",
+            },
+        )
+        assert_matches_type(CNICreateResponse, cni, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.network_interconnects.cnis.with_raw_response.create(
+            account_id="account_id",
+            account="account",
+            interconnect="interconnect",
+            magic={
+                "conduit_name": "conduit_name",
+                "description": "description",
+                "mtu": 0,
+            },
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cni = await response.parse()
+        assert_matches_type(CNICreateResponse, cni, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.network_interconnects.cnis.with_streaming_response.create(
+            account_id="account_id",
+            account="account",
+            interconnect="interconnect",
+            magic={
+                "conduit_name": "conduit_name",
+                "description": "description",
+                "mtu": 0,
+            },
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cni = await response.parse()
+            assert_matches_type(CNICreateResponse, cni, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.network_interconnects.cnis.with_raw_response.create(
+                account_id="",
+                account="account",
+                interconnect="interconnect",
+                magic={
+                    "conduit_name": "conduit_name",
+                    "description": "description",
+                    "mtu": 0,
+                },
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        cni = await async_client.network_interconnects.cnis.update(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account="account",
+            cust_ip="192.168.3.4/31",
+            interconnect="interconnect",
+            magic={
+                "conduit_name": "conduit_name",
+                "description": "description",
+                "mtu": 0,
+            },
+            p2p_ip="192.168.3.4/31",
+        )
+        assert_matches_type(CNIUpdateResponse, cni, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cni = await async_client.network_interconnects.cnis.update(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account="account",
+            cust_ip="192.168.3.4/31",
+            interconnect="interconnect",
+            magic={
+                "conduit_name": "conduit_name",
+                "description": "description",
+                "mtu": 0,
+            },
+            p2p_ip="192.168.3.4/31",
+            bgp={
+                "customer_asn": 0,
+                "extra_prefixes": ["string"],
+                "md5_key": "md5_key",
+            },
+        )
+        assert_matches_type(CNIUpdateResponse, cni, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.network_interconnects.cnis.with_raw_response.update(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account="account",
+            cust_ip="192.168.3.4/31",
+            interconnect="interconnect",
+            magic={
+                "conduit_name": "conduit_name",
+                "description": "description",
+                "mtu": 0,
+            },
+            p2p_ip="192.168.3.4/31",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cni = await response.parse()
+        assert_matches_type(CNIUpdateResponse, cni, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.network_interconnects.cnis.with_streaming_response.update(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account="account",
+            cust_ip="192.168.3.4/31",
+            interconnect="interconnect",
+            magic={
+                "conduit_name": "conduit_name",
+                "description": "description",
+                "mtu": 0,
+            },
+            p2p_ip="192.168.3.4/31",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cni = await response.parse()
+            assert_matches_type(CNIUpdateResponse, cni, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.network_interconnects.cnis.with_raw_response.update(
+                cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account="account",
+                cust_ip="192.168.3.4/31",
+                interconnect="interconnect",
+                magic={
+                    "conduit_name": "conduit_name",
+                    "description": "description",
+                    "mtu": 0,
+                },
+                p2p_ip="192.168.3.4/31",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `cni` but received ''"):
+            await async_client.network_interconnects.cnis.with_raw_response.update(
+                cni="",
+                account_id="account_id",
+                id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account="account",
+                cust_ip="192.168.3.4/31",
+                interconnect="interconnect",
+                magic={
+                    "conduit_name": "conduit_name",
+                    "description": "description",
+                    "mtu": 0,
+                },
+                p2p_ip="192.168.3.4/31",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        cni = await async_client.network_interconnects.cnis.list(
+            account_id="account_id",
+        )
+        assert_matches_type(CNIListResponse, cni, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cni = await async_client.network_interconnects.cnis.list(
+            account_id="account_id",
+            cursor=0,
+            limit=0,
+            slot="slot",
+            tunnel_id="tunnel_id",
+        )
+        assert_matches_type(CNIListResponse, cni, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.network_interconnects.cnis.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cni = await response.parse()
+        assert_matches_type(CNIListResponse, cni, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.network_interconnects.cnis.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cni = await response.parse()
+            assert_matches_type(CNIListResponse, cni, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.network_interconnects.cnis.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        cni = await async_client.network_interconnects.cnis.delete(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert cni is None
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.network_interconnects.cnis.with_raw_response.delete(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cni = await response.parse()
+        assert cni is None
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.network_interconnects.cnis.with_streaming_response.delete(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cni = await response.parse()
+            assert cni is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.network_interconnects.cnis.with_raw_response.delete(
+                cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `cni` but received ''"):
+            await async_client.network_interconnects.cnis.with_raw_response.delete(
+                cni="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        cni = await async_client.network_interconnects.cnis.get(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(CNIGetResponse, cni, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.network_interconnects.cnis.with_raw_response.get(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cni = await response.parse()
+        assert_matches_type(CNIGetResponse, cni, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.network_interconnects.cnis.with_streaming_response.get(
+            cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cni = await response.parse()
+            assert_matches_type(CNIGetResponse, cni, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.network_interconnects.cnis.with_raw_response.get(
+                cni="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `cni` but received ''"):
+            await async_client.network_interconnects.cnis.with_raw_response.get(
+                cni="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/network_interconnects/test_interconnects.py b/tests/api_resources/network_interconnects/test_interconnects.py
new file mode 100644
index 00000000000..ff267d7864b
--- /dev/null
+++ b/tests/api_resources/network_interconnects/test_interconnects.py
@@ -0,0 +1,741 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.network_interconnects import (
+    InterconnectGetResponse,
+    InterconnectListResponse,
+    InterconnectCreateResponse,
+    InterconnectStatusResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestInterconnects:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create_overload_1(self, client: Cloudflare) -> None:
+        interconnect = client.network_interconnects.interconnects.create(
+            account_id="account_id",
+            account="account",
+            slot_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            type="type",
+        )
+        assert_matches_type(InterconnectCreateResponse, interconnect, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        interconnect = client.network_interconnects.interconnects.create(
+            account_id="account_id",
+            account="account",
+            slot_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            type="type",
+            speed="speed",
+        )
+        assert_matches_type(InterconnectCreateResponse, interconnect, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_1(self, client: Cloudflare) -> None:
+        response = client.network_interconnects.interconnects.with_raw_response.create(
+            account_id="account_id",
+            account="account",
+            slot_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            type="type",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        interconnect = response.parse()
+        assert_matches_type(InterconnectCreateResponse, interconnect, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
+        with client.network_interconnects.interconnects.with_streaming_response.create(
+            account_id="account_id",
+            account="account",
+            slot_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            type="type",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            interconnect = response.parse()
+            assert_matches_type(InterconnectCreateResponse, interconnect, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.network_interconnects.interconnects.with_raw_response.create(
+                account_id="",
+                account="account",
+                slot_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                type="type",
+            )
+
+    @parametrize
+    def test_method_create_overload_2(self, client: Cloudflare) -> None:
+        interconnect = client.network_interconnects.interconnects.create(
+            account_id="account_id",
+            account="account",
+            bandwidth="50M",
+            pairing_key="pairing_key",
+            type="type",
+        )
+        assert_matches_type(InterconnectCreateResponse, interconnect, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
+        response = client.network_interconnects.interconnects.with_raw_response.create(
+            account_id="account_id",
+            account="account",
+            bandwidth="50M",
+            pairing_key="pairing_key",
+            type="type",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        interconnect = response.parse()
+        assert_matches_type(InterconnectCreateResponse, interconnect, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
+        with client.network_interconnects.interconnects.with_streaming_response.create(
+            account_id="account_id",
+            account="account",
+            bandwidth="50M",
+            pairing_key="pairing_key",
+            type="type",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            interconnect = response.parse()
+            assert_matches_type(InterconnectCreateResponse, interconnect, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.network_interconnects.interconnects.with_raw_response.create(
+                account_id="",
+                account="account",
+                bandwidth="50M",
+                pairing_key="pairing_key",
+                type="type",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        interconnect = client.network_interconnects.interconnects.list(
+            account_id="account_id",
+        )
+        assert_matches_type(InterconnectListResponse, interconnect, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        interconnect = client.network_interconnects.interconnects.list(
+            account_id="account_id",
+            cursor=0,
+            limit=0,
+            site="site",
+            type="type",
+        )
+        assert_matches_type(InterconnectListResponse, interconnect, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.network_interconnects.interconnects.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        interconnect = response.parse()
+        assert_matches_type(InterconnectListResponse, interconnect, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.network_interconnects.interconnects.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            interconnect = response.parse()
+            assert_matches_type(InterconnectListResponse, interconnect, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.network_interconnects.interconnects.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        interconnect = client.network_interconnects.interconnects.delete(
+            icon="icon",
+            account_id="account_id",
+        )
+        assert interconnect is None
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.network_interconnects.interconnects.with_raw_response.delete(
+            icon="icon",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        interconnect = response.parse()
+        assert interconnect is None
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.network_interconnects.interconnects.with_streaming_response.delete(
+            icon="icon",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            interconnect = response.parse()
+            assert interconnect is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.network_interconnects.interconnects.with_raw_response.delete(
+                icon="icon",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `icon` but received ''"):
+            client.network_interconnects.interconnects.with_raw_response.delete(
+                icon="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        interconnect = client.network_interconnects.interconnects.get(
+            icon="icon",
+            account_id="account_id",
+        )
+        assert_matches_type(InterconnectGetResponse, interconnect, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.network_interconnects.interconnects.with_raw_response.get(
+            icon="icon",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        interconnect = response.parse()
+        assert_matches_type(InterconnectGetResponse, interconnect, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.network_interconnects.interconnects.with_streaming_response.get(
+            icon="icon",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            interconnect = response.parse()
+            assert_matches_type(InterconnectGetResponse, interconnect, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.network_interconnects.interconnects.with_raw_response.get(
+                icon="icon",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `icon` but received ''"):
+            client.network_interconnects.interconnects.with_raw_response.get(
+                icon="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_loa(self, client: Cloudflare) -> None:
+        interconnect = client.network_interconnects.interconnects.loa(
+            icon="icon",
+            account_id="account_id",
+        )
+        assert interconnect is None
+
+    @parametrize
+    def test_raw_response_loa(self, client: Cloudflare) -> None:
+        response = client.network_interconnects.interconnects.with_raw_response.loa(
+            icon="icon",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        interconnect = response.parse()
+        assert interconnect is None
+
+    @parametrize
+    def test_streaming_response_loa(self, client: Cloudflare) -> None:
+        with client.network_interconnects.interconnects.with_streaming_response.loa(
+            icon="icon",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            interconnect = response.parse()
+            assert interconnect is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_loa(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.network_interconnects.interconnects.with_raw_response.loa(
+                icon="icon",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `icon` but received ''"):
+            client.network_interconnects.interconnects.with_raw_response.loa(
+                icon="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_status(self, client: Cloudflare) -> None:
+        interconnect = client.network_interconnects.interconnects.status(
+            icon="icon",
+            account_id="account_id",
+        )
+        assert_matches_type(InterconnectStatusResponse, interconnect, path=["response"])
+
+    @parametrize
+    def test_raw_response_status(self, client: Cloudflare) -> None:
+        response = client.network_interconnects.interconnects.with_raw_response.status(
+            icon="icon",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        interconnect = response.parse()
+        assert_matches_type(InterconnectStatusResponse, interconnect, path=["response"])
+
+    @parametrize
+    def test_streaming_response_status(self, client: Cloudflare) -> None:
+        with client.network_interconnects.interconnects.with_streaming_response.status(
+            icon="icon",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            interconnect = response.parse()
+            assert_matches_type(InterconnectStatusResponse, interconnect, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_status(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.network_interconnects.interconnects.with_raw_response.status(
+                icon="icon",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `icon` but received ''"):
+            client.network_interconnects.interconnects.with_raw_response.status(
+                icon="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncInterconnects:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        interconnect = await async_client.network_interconnects.interconnects.create(
+            account_id="account_id",
+            account="account",
+            slot_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            type="type",
+        )
+        assert_matches_type(InterconnectCreateResponse, interconnect, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        interconnect = await async_client.network_interconnects.interconnects.create(
+            account_id="account_id",
+            account="account",
+            slot_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            type="type",
+            speed="speed",
+        )
+        assert_matches_type(InterconnectCreateResponse, interconnect, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.network_interconnects.interconnects.with_raw_response.create(
+            account_id="account_id",
+            account="account",
+            slot_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            type="type",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        interconnect = await response.parse()
+        assert_matches_type(InterconnectCreateResponse, interconnect, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.network_interconnects.interconnects.with_streaming_response.create(
+            account_id="account_id",
+            account="account",
+            slot_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            type="type",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            interconnect = await response.parse()
+            assert_matches_type(InterconnectCreateResponse, interconnect, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.network_interconnects.interconnects.with_raw_response.create(
+                account_id="",
+                account="account",
+                slot_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                type="type",
+            )
+
+    @parametrize
+    async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        interconnect = await async_client.network_interconnects.interconnects.create(
+            account_id="account_id",
+            account="account",
+            bandwidth="50M",
+            pairing_key="pairing_key",
+            type="type",
+        )
+        assert_matches_type(InterconnectCreateResponse, interconnect, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.network_interconnects.interconnects.with_raw_response.create(
+            account_id="account_id",
+            account="account",
+            bandwidth="50M",
+            pairing_key="pairing_key",
+            type="type",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        interconnect = await response.parse()
+        assert_matches_type(InterconnectCreateResponse, interconnect, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.network_interconnects.interconnects.with_streaming_response.create(
+            account_id="account_id",
+            account="account",
+            bandwidth="50M",
+            pairing_key="pairing_key",
+            type="type",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            interconnect = await response.parse()
+            assert_matches_type(InterconnectCreateResponse, interconnect, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.network_interconnects.interconnects.with_raw_response.create(
+                account_id="",
+                account="account",
+                bandwidth="50M",
+                pairing_key="pairing_key",
+                type="type",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        interconnect = await async_client.network_interconnects.interconnects.list(
+            account_id="account_id",
+        )
+        assert_matches_type(InterconnectListResponse, interconnect, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        interconnect = await async_client.network_interconnects.interconnects.list(
+            account_id="account_id",
+            cursor=0,
+            limit=0,
+            site="site",
+            type="type",
+        )
+        assert_matches_type(InterconnectListResponse, interconnect, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.network_interconnects.interconnects.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        interconnect = await response.parse()
+        assert_matches_type(InterconnectListResponse, interconnect, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.network_interconnects.interconnects.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            interconnect = await response.parse()
+            assert_matches_type(InterconnectListResponse, interconnect, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.network_interconnects.interconnects.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        interconnect = await async_client.network_interconnects.interconnects.delete(
+            icon="icon",
+            account_id="account_id",
+        )
+        assert interconnect is None
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.network_interconnects.interconnects.with_raw_response.delete(
+            icon="icon",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        interconnect = await response.parse()
+        assert interconnect is None
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.network_interconnects.interconnects.with_streaming_response.delete(
+            icon="icon",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            interconnect = await response.parse()
+            assert interconnect is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.network_interconnects.interconnects.with_raw_response.delete(
+                icon="icon",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `icon` but received ''"):
+            await async_client.network_interconnects.interconnects.with_raw_response.delete(
+                icon="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        interconnect = await async_client.network_interconnects.interconnects.get(
+            icon="icon",
+            account_id="account_id",
+        )
+        assert_matches_type(InterconnectGetResponse, interconnect, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.network_interconnects.interconnects.with_raw_response.get(
+            icon="icon",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        interconnect = await response.parse()
+        assert_matches_type(InterconnectGetResponse, interconnect, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.network_interconnects.interconnects.with_streaming_response.get(
+            icon="icon",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            interconnect = await response.parse()
+            assert_matches_type(InterconnectGetResponse, interconnect, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.network_interconnects.interconnects.with_raw_response.get(
+                icon="icon",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `icon` but received ''"):
+            await async_client.network_interconnects.interconnects.with_raw_response.get(
+                icon="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_loa(self, async_client: AsyncCloudflare) -> None:
+        interconnect = await async_client.network_interconnects.interconnects.loa(
+            icon="icon",
+            account_id="account_id",
+        )
+        assert interconnect is None
+
+    @parametrize
+    async def test_raw_response_loa(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.network_interconnects.interconnects.with_raw_response.loa(
+            icon="icon",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        interconnect = await response.parse()
+        assert interconnect is None
+
+    @parametrize
+    async def test_streaming_response_loa(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.network_interconnects.interconnects.with_streaming_response.loa(
+            icon="icon",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            interconnect = await response.parse()
+            assert interconnect is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_loa(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.network_interconnects.interconnects.with_raw_response.loa(
+                icon="icon",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `icon` but received ''"):
+            await async_client.network_interconnects.interconnects.with_raw_response.loa(
+                icon="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_status(self, async_client: AsyncCloudflare) -> None:
+        interconnect = await async_client.network_interconnects.interconnects.status(
+            icon="icon",
+            account_id="account_id",
+        )
+        assert_matches_type(InterconnectStatusResponse, interconnect, path=["response"])
+
+    @parametrize
+    async def test_raw_response_status(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.network_interconnects.interconnects.with_raw_response.status(
+            icon="icon",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        interconnect = await response.parse()
+        assert_matches_type(InterconnectStatusResponse, interconnect, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_status(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.network_interconnects.interconnects.with_streaming_response.status(
+            icon="icon",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            interconnect = await response.parse()
+            assert_matches_type(InterconnectStatusResponse, interconnect, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_status(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.network_interconnects.interconnects.with_raw_response.status(
+                icon="icon",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `icon` but received ''"):
+            await async_client.network_interconnects.interconnects.with_raw_response.status(
+                icon="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/network_interconnects/test_settings.py b/tests/api_resources/network_interconnects/test_settings.py
new file mode 100644
index 00000000000..144eb7b2f92
--- /dev/null
+++ b/tests/api_resources/network_interconnects/test_settings.py
@@ -0,0 +1,192 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.network_interconnects import SettingGetResponse, SettingUpdateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSettings:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        setting = client.network_interconnects.settings.update(
+            account_id="account_id",
+        )
+        assert_matches_type(SettingUpdateResponse, setting, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        setting = client.network_interconnects.settings.update(
+            account_id="account_id",
+            default_asn=0,
+        )
+        assert_matches_type(SettingUpdateResponse, setting, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.network_interconnects.settings.with_raw_response.update(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = response.parse()
+        assert_matches_type(SettingUpdateResponse, setting, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.network_interconnects.settings.with_streaming_response.update(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = response.parse()
+            assert_matches_type(SettingUpdateResponse, setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.network_interconnects.settings.with_raw_response.update(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        setting = client.network_interconnects.settings.get(
+            account_id="account_id",
+        )
+        assert_matches_type(SettingGetResponse, setting, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.network_interconnects.settings.with_raw_response.get(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = response.parse()
+        assert_matches_type(SettingGetResponse, setting, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.network_interconnects.settings.with_streaming_response.get(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = response.parse()
+            assert_matches_type(SettingGetResponse, setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.network_interconnects.settings.with_raw_response.get(
+                account_id="",
+            )
+
+
+class TestAsyncSettings:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.network_interconnects.settings.update(
+            account_id="account_id",
+        )
+        assert_matches_type(SettingUpdateResponse, setting, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.network_interconnects.settings.update(
+            account_id="account_id",
+            default_asn=0,
+        )
+        assert_matches_type(SettingUpdateResponse, setting, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.network_interconnects.settings.with_raw_response.update(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = await response.parse()
+        assert_matches_type(SettingUpdateResponse, setting, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.network_interconnects.settings.with_streaming_response.update(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = await response.parse()
+            assert_matches_type(SettingUpdateResponse, setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.network_interconnects.settings.with_raw_response.update(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.network_interconnects.settings.get(
+            account_id="account_id",
+        )
+        assert_matches_type(SettingGetResponse, setting, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.network_interconnects.settings.with_raw_response.get(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = await response.parse()
+        assert_matches_type(SettingGetResponse, setting, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.network_interconnects.settings.with_streaming_response.get(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = await response.parse()
+            assert_matches_type(SettingGetResponse, setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.network_interconnects.settings.with_raw_response.get(
+                account_id="",
+            )
diff --git a/tests/api_resources/network_interconnects/test_slots.py b/tests/api_resources/network_interconnects/test_slots.py
new file mode 100644
index 00000000000..b57afef6ce5
--- /dev/null
+++ b/tests/api_resources/network_interconnects/test_slots.py
@@ -0,0 +1,222 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.network_interconnects import SlotGetResponse, SlotListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSlots:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        slot = client.network_interconnects.slots.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SlotListResponse, slot, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        slot = client.network_interconnects.slots.list(
+            account_id="account_id",
+            address_contains="address_contains",
+            cursor=0,
+            limit=0,
+            occupied=True,
+            site="site",
+            speed="speed",
+        )
+        assert_matches_type(SlotListResponse, slot, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.network_interconnects.slots.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        slot = response.parse()
+        assert_matches_type(SlotListResponse, slot, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.network_interconnects.slots.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            slot = response.parse()
+            assert_matches_type(SlotListResponse, slot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.network_interconnects.slots.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        slot = client.network_interconnects.slots.get(
+            slot="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(SlotGetResponse, slot, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.network_interconnects.slots.with_raw_response.get(
+            slot="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        slot = response.parse()
+        assert_matches_type(SlotGetResponse, slot, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.network_interconnects.slots.with_streaming_response.get(
+            slot="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            slot = response.parse()
+            assert_matches_type(SlotGetResponse, slot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.network_interconnects.slots.with_raw_response.get(
+                slot="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `slot` but received ''"):
+            client.network_interconnects.slots.with_raw_response.get(
+                slot="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncSlots:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        slot = await async_client.network_interconnects.slots.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SlotListResponse, slot, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        slot = await async_client.network_interconnects.slots.list(
+            account_id="account_id",
+            address_contains="address_contains",
+            cursor=0,
+            limit=0,
+            occupied=True,
+            site="site",
+            speed="speed",
+        )
+        assert_matches_type(SlotListResponse, slot, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.network_interconnects.slots.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        slot = await response.parse()
+        assert_matches_type(SlotListResponse, slot, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.network_interconnects.slots.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            slot = await response.parse()
+            assert_matches_type(SlotListResponse, slot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.network_interconnects.slots.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        slot = await async_client.network_interconnects.slots.get(
+            slot="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(SlotGetResponse, slot, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.network_interconnects.slots.with_raw_response.get(
+            slot="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        slot = await response.parse()
+        assert_matches_type(SlotGetResponse, slot, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.network_interconnects.slots.with_streaming_response.get(
+            slot="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            slot = await response.parse()
+            assert_matches_type(SlotGetResponse, slot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.network_interconnects.slots.with_raw_response.get(
+                slot="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `slot` but received ''"):
+            await async_client.network_interconnects.slots.with_raw_response.get(
+                slot="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/organizations/__init__.py b/tests/api_resources/organizations/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/organizations/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/organizations/test_organization_profile.py b/tests/api_resources/organizations/test_organization_profile.py
new file mode 100644
index 00000000000..a35af6ef2da
--- /dev/null
+++ b/tests/api_resources/organizations/test_organization_profile.py
@@ -0,0 +1,218 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.organizations.organization_profile_get_params import (  # pyright: ignore[reportMissingImports]
+    Result,  # pyright: ignore[reportUnknownVariableType]
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestOrganizationProfile:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        organization_profile = client.organizations.organization_profile.update(
+            organization_id="a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+            business_address="business_address",
+            business_email="business_email",
+            business_name="business_name",
+            business_phone="business_phone",
+            external_metadata="external_metadata",
+        )
+        assert organization_profile is None
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.organizations.organization_profile.with_raw_response.update(
+            organization_id="a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+            business_address="business_address",
+            business_email="business_email",
+            business_name="business_name",
+            business_phone="business_phone",
+            external_metadata="external_metadata",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        organization_profile = response.parse()
+        assert organization_profile is None
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.organizations.organization_profile.with_streaming_response.update(
+            organization_id="a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+            business_address="business_address",
+            business_email="business_email",
+            business_name="business_name",
+            business_phone="business_phone",
+            external_metadata="external_metadata",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            organization_profile = response.parse()
+            assert organization_profile is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `organization_id` but received ''"):
+            client.organizations.organization_profile.with_raw_response.update(
+                organization_id="",
+                business_address="business_address",
+                business_email="business_email",
+                business_name="business_name",
+                business_phone="business_phone",
+                external_metadata="external_metadata",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        organization_profile = client.organizations.organization_profile.get(  # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType]
+            "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+        )
+        assert_matches_type(Result, organization_profile, path=["response"])  # pyright: ignore[reportUnknownArgumentType]
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.organizations.organization_profile.with_raw_response.get(  # pyright: ignore[reportUnknownVariableType]
+            "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        organization_profile = response.parse()  # pyright: ignore[reportUnknownVariableType]
+        assert_matches_type(Result, organization_profile, path=["response"])  # pyright: ignore[reportUnknownArgumentType]
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.organizations.organization_profile.with_streaming_response.get(  # pyright: ignore[reportUnknownVariableType]
+            "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+        ) as response:  # pyright: ignore[reportUnknownVariableType]
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            organization_profile = response.parse()  # pyright: ignore[reportUnknownVariableType]
+            assert_matches_type(Result, organization_profile, path=["response"])  # pyright: ignore[reportUnknownArgumentType]
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `organization_id` but received ''"):
+            client.organizations.organization_profile.with_raw_response.get(
+                "",
+            )
+
+
+class TestAsyncOrganizationProfile:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        organization_profile = await async_client.organizations.organization_profile.update(
+            organization_id="a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+            business_address="business_address",
+            business_email="business_email",
+            business_name="business_name",
+            business_phone="business_phone",
+            external_metadata="external_metadata",
+        )
+        assert organization_profile is None
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.organizations.organization_profile.with_raw_response.update(
+            organization_id="a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+            business_address="business_address",
+            business_email="business_email",
+            business_name="business_name",
+            business_phone="business_phone",
+            external_metadata="external_metadata",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        organization_profile = await response.parse()
+        assert organization_profile is None
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.organizations.organization_profile.with_streaming_response.update(
+            organization_id="a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+            business_address="business_address",
+            business_email="business_email",
+            business_name="business_name",
+            business_phone="business_phone",
+            external_metadata="external_metadata",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            organization_profile = await response.parse()
+            assert organization_profile is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `organization_id` but received ''"):
+            await async_client.organizations.organization_profile.with_raw_response.update(
+                organization_id="",
+                business_address="business_address",
+                business_email="business_email",
+                business_name="business_name",
+                business_phone="business_phone",
+                external_metadata="external_metadata",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        organization_profile = await async_client.organizations.organization_profile.get(  # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType]
+            "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+        )
+        assert_matches_type(Result, organization_profile, path=["response"])  # pyright: ignore[reportUnknownArgumentType]
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.organizations.organization_profile.with_raw_response.get(  # pyright: ignore[reportUnknownVariableType]
+            "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        organization_profile = await response.parse()  # pyright: ignore[reportUnknownVariableType]
+        assert_matches_type(Result, organization_profile, path=["response"])  # pyright: ignore[reportUnknownArgumentType]
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.organizations.organization_profile.with_streaming_response.get(  # pyright: ignore[reportUnknownVariableType]
+            "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+        ) as response:  # pyright: ignore[reportUnknownVariableType]
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            organization_profile = await response.parse()  # pyright: ignore[reportUnknownVariableType]
+            assert_matches_type(Result, organization_profile, path=["response"])  # pyright: ignore[reportUnknownArgumentType]
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `organization_id` but received ''"):
+            await async_client.organizations.organization_profile.with_raw_response.get(
+                "",
+            )
diff --git a/tests/api_resources/origin_tls_client_auth/hostnames/test_certificates.py b/tests/api_resources/origin_tls_client_auth/hostnames/test_certificates.py
deleted file mode 100644
index ccaf45b9b4e..00000000000
--- a/tests/api_resources/origin_tls_client_auth/hostnames/test_certificates.py
+++ /dev/null
@@ -1,388 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.origin_tls_client_auth import AuthenticatedOriginPull
-from cloudflare.types.origin_tls_client_auth.hostnames import (
-    CertificateGetResponse,
-    CertificateCreateResponse,
-    CertificateDeleteResponse,
-)
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestCertificates:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_create(self, client: Cloudflare) -> None:
-        certificate = client.origin_tls_client_auth.hostnames.certificates.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
-            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
-        )
-        assert_matches_type(Optional[CertificateCreateResponse], certificate, path=["response"])
-
-    @parametrize
-    def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.origin_tls_client_auth.hostnames.certificates.with_raw_response.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
-            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        certificate = response.parse()
-        assert_matches_type(Optional[CertificateCreateResponse], certificate, path=["response"])
-
-    @parametrize
-    def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.origin_tls_client_auth.hostnames.certificates.with_streaming_response.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
-            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            certificate = response.parse()
-            assert_matches_type(Optional[CertificateCreateResponse], certificate, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.origin_tls_client_auth.hostnames.certificates.with_raw_response.create(
-                zone_id="",
-                certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
-                private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
-            )
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        certificate = client.origin_tls_client_auth.hostnames.certificates.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SyncSinglePage[AuthenticatedOriginPull], certificate, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.origin_tls_client_auth.hostnames.certificates.with_raw_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        certificate = response.parse()
-        assert_matches_type(SyncSinglePage[AuthenticatedOriginPull], certificate, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.origin_tls_client_auth.hostnames.certificates.with_streaming_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            certificate = response.parse()
-            assert_matches_type(SyncSinglePage[AuthenticatedOriginPull], certificate, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.origin_tls_client_auth.hostnames.certificates.with_raw_response.list(
-                zone_id="",
-            )
-
-    @parametrize
-    def test_method_delete(self, client: Cloudflare) -> None:
-        certificate = client.origin_tls_client_auth.hostnames.certificates.delete(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[CertificateDeleteResponse], certificate, path=["response"])
-
-    @parametrize
-    def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.origin_tls_client_auth.hostnames.certificates.with_raw_response.delete(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        certificate = response.parse()
-        assert_matches_type(Optional[CertificateDeleteResponse], certificate, path=["response"])
-
-    @parametrize
-    def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.origin_tls_client_auth.hostnames.certificates.with_streaming_response.delete(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            certificate = response.parse()
-            assert_matches_type(Optional[CertificateDeleteResponse], certificate, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.origin_tls_client_auth.hostnames.certificates.with_raw_response.delete(
-                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
-            client.origin_tls_client_auth.hostnames.certificates.with_raw_response.delete(
-                certificate_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        certificate = client.origin_tls_client_auth.hostnames.certificates.get(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[CertificateGetResponse], certificate, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.origin_tls_client_auth.hostnames.certificates.with_raw_response.get(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        certificate = response.parse()
-        assert_matches_type(Optional[CertificateGetResponse], certificate, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.origin_tls_client_auth.hostnames.certificates.with_streaming_response.get(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            certificate = response.parse()
-            assert_matches_type(Optional[CertificateGetResponse], certificate, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.origin_tls_client_auth.hostnames.certificates.with_raw_response.get(
-                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
-            client.origin_tls_client_auth.hostnames.certificates.with_raw_response.get(
-                certificate_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-
-class TestAsyncCertificates:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        certificate = await async_client.origin_tls_client_auth.hostnames.certificates.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
-            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
-        )
-        assert_matches_type(Optional[CertificateCreateResponse], certificate, path=["response"])
-
-    @parametrize
-    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.origin_tls_client_auth.hostnames.certificates.with_raw_response.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
-            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        certificate = await response.parse()
-        assert_matches_type(Optional[CertificateCreateResponse], certificate, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.origin_tls_client_auth.hostnames.certificates.with_streaming_response.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
-            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            certificate = await response.parse()
-            assert_matches_type(Optional[CertificateCreateResponse], certificate, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.origin_tls_client_auth.hostnames.certificates.with_raw_response.create(
-                zone_id="",
-                certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
-                private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
-            )
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        certificate = await async_client.origin_tls_client_auth.hostnames.certificates.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(AsyncSinglePage[AuthenticatedOriginPull], certificate, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.origin_tls_client_auth.hostnames.certificates.with_raw_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        certificate = await response.parse()
-        assert_matches_type(AsyncSinglePage[AuthenticatedOriginPull], certificate, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.origin_tls_client_auth.hostnames.certificates.with_streaming_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            certificate = await response.parse()
-            assert_matches_type(AsyncSinglePage[AuthenticatedOriginPull], certificate, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.origin_tls_client_auth.hostnames.certificates.with_raw_response.list(
-                zone_id="",
-            )
-
-    @parametrize
-    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        certificate = await async_client.origin_tls_client_auth.hostnames.certificates.delete(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[CertificateDeleteResponse], certificate, path=["response"])
-
-    @parametrize
-    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.origin_tls_client_auth.hostnames.certificates.with_raw_response.delete(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        certificate = await response.parse()
-        assert_matches_type(Optional[CertificateDeleteResponse], certificate, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.origin_tls_client_auth.hostnames.certificates.with_streaming_response.delete(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            certificate = await response.parse()
-            assert_matches_type(Optional[CertificateDeleteResponse], certificate, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.origin_tls_client_auth.hostnames.certificates.with_raw_response.delete(
-                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
-            await async_client.origin_tls_client_auth.hostnames.certificates.with_raw_response.delete(
-                certificate_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        certificate = await async_client.origin_tls_client_auth.hostnames.certificates.get(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[CertificateGetResponse], certificate, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.origin_tls_client_auth.hostnames.certificates.with_raw_response.get(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        certificate = await response.parse()
-        assert_matches_type(Optional[CertificateGetResponse], certificate, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.origin_tls_client_auth.hostnames.certificates.with_streaming_response.get(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            certificate = await response.parse()
-            assert_matches_type(Optional[CertificateGetResponse], certificate, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.origin_tls_client_auth.hostnames.certificates.with_raw_response.get(
-                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
-            await async_client.origin_tls_client_auth.hostnames.certificates.with_raw_response.get(
-                certificate_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
diff --git a/tests/api_resources/origin_tls_client_auth/test_hostname_certificates.py b/tests/api_resources/origin_tls_client_auth/test_hostname_certificates.py
new file mode 100644
index 00000000000..8215742fd0c
--- /dev/null
+++ b/tests/api_resources/origin_tls_client_auth/test_hostname_certificates.py
@@ -0,0 +1,394 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.origin_tls_client_auth import (
+    HostnameCertificateGetResponse,
+    HostnameCertificateListResponse,
+    HostnameCertificateCreateResponse,
+    HostnameCertificateDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestHostnameCertificates:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        hostname_certificate = client.origin_tls_client_auth.hostname_certificates.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+        )
+        assert_matches_type(Optional[HostnameCertificateCreateResponse], hostname_certificate, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.origin_tls_client_auth.hostname_certificates.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hostname_certificate = response.parse()
+        assert_matches_type(Optional[HostnameCertificateCreateResponse], hostname_certificate, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.origin_tls_client_auth.hostname_certificates.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hostname_certificate = response.parse()
+            assert_matches_type(Optional[HostnameCertificateCreateResponse], hostname_certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.origin_tls_client_auth.hostname_certificates.with_raw_response.create(
+                zone_id="",
+                certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+                private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        hostname_certificate = client.origin_tls_client_auth.hostname_certificates.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[HostnameCertificateListResponse], hostname_certificate, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.origin_tls_client_auth.hostname_certificates.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hostname_certificate = response.parse()
+        assert_matches_type(SyncSinglePage[HostnameCertificateListResponse], hostname_certificate, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.origin_tls_client_auth.hostname_certificates.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hostname_certificate = response.parse()
+            assert_matches_type(
+                SyncSinglePage[HostnameCertificateListResponse], hostname_certificate, path=["response"]
+            )
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.origin_tls_client_auth.hostname_certificates.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        hostname_certificate = client.origin_tls_client_auth.hostname_certificates.delete(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[HostnameCertificateDeleteResponse], hostname_certificate, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.origin_tls_client_auth.hostname_certificates.with_raw_response.delete(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hostname_certificate = response.parse()
+        assert_matches_type(Optional[HostnameCertificateDeleteResponse], hostname_certificate, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.origin_tls_client_auth.hostname_certificates.with_streaming_response.delete(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hostname_certificate = response.parse()
+            assert_matches_type(Optional[HostnameCertificateDeleteResponse], hostname_certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.origin_tls_client_auth.hostname_certificates.with_raw_response.delete(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+            client.origin_tls_client_auth.hostname_certificates.with_raw_response.delete(
+                certificate_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        hostname_certificate = client.origin_tls_client_auth.hostname_certificates.get(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[HostnameCertificateGetResponse], hostname_certificate, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.origin_tls_client_auth.hostname_certificates.with_raw_response.get(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hostname_certificate = response.parse()
+        assert_matches_type(Optional[HostnameCertificateGetResponse], hostname_certificate, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.origin_tls_client_auth.hostname_certificates.with_streaming_response.get(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hostname_certificate = response.parse()
+            assert_matches_type(Optional[HostnameCertificateGetResponse], hostname_certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.origin_tls_client_auth.hostname_certificates.with_raw_response.get(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+            client.origin_tls_client_auth.hostname_certificates.with_raw_response.get(
+                certificate_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncHostnameCertificates:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        hostname_certificate = await async_client.origin_tls_client_auth.hostname_certificates.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+        )
+        assert_matches_type(Optional[HostnameCertificateCreateResponse], hostname_certificate, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.origin_tls_client_auth.hostname_certificates.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hostname_certificate = await response.parse()
+        assert_matches_type(Optional[HostnameCertificateCreateResponse], hostname_certificate, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.origin_tls_client_auth.hostname_certificates.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hostname_certificate = await response.parse()
+            assert_matches_type(Optional[HostnameCertificateCreateResponse], hostname_certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.origin_tls_client_auth.hostname_certificates.with_raw_response.create(
+                zone_id="",
+                certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+                private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        hostname_certificate = await async_client.origin_tls_client_auth.hostname_certificates.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[HostnameCertificateListResponse], hostname_certificate, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.origin_tls_client_auth.hostname_certificates.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hostname_certificate = await response.parse()
+        assert_matches_type(AsyncSinglePage[HostnameCertificateListResponse], hostname_certificate, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.origin_tls_client_auth.hostname_certificates.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hostname_certificate = await response.parse()
+            assert_matches_type(
+                AsyncSinglePage[HostnameCertificateListResponse], hostname_certificate, path=["response"]
+            )
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.origin_tls_client_auth.hostname_certificates.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        hostname_certificate = await async_client.origin_tls_client_auth.hostname_certificates.delete(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[HostnameCertificateDeleteResponse], hostname_certificate, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.origin_tls_client_auth.hostname_certificates.with_raw_response.delete(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hostname_certificate = await response.parse()
+        assert_matches_type(Optional[HostnameCertificateDeleteResponse], hostname_certificate, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.origin_tls_client_auth.hostname_certificates.with_streaming_response.delete(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hostname_certificate = await response.parse()
+            assert_matches_type(Optional[HostnameCertificateDeleteResponse], hostname_certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.origin_tls_client_auth.hostname_certificates.with_raw_response.delete(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+            await async_client.origin_tls_client_auth.hostname_certificates.with_raw_response.delete(
+                certificate_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        hostname_certificate = await async_client.origin_tls_client_auth.hostname_certificates.get(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[HostnameCertificateGetResponse], hostname_certificate, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.origin_tls_client_auth.hostname_certificates.with_raw_response.get(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hostname_certificate = await response.parse()
+        assert_matches_type(Optional[HostnameCertificateGetResponse], hostname_certificate, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.origin_tls_client_auth.hostname_certificates.with_streaming_response.get(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hostname_certificate = await response.parse()
+            assert_matches_type(Optional[HostnameCertificateGetResponse], hostname_certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.origin_tls_client_auth.hostname_certificates.with_raw_response.get(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+            await async_client.origin_tls_client_auth.hostname_certificates.with_raw_response.get(
+                certificate_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/origin_tls_client_auth/test_hostnames.py b/tests/api_resources/origin_tls_client_auth/test_hostnames.py
index 1e361bb8ee9..caded780ceb 100644
--- a/tests/api_resources/origin_tls_client_auth/test_hostnames.py
+++ b/tests/api_resources/origin_tls_client_auth/test_hostnames.py
@@ -9,6 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.origin_tls_client_auth import (
     HostnameUpdateResponse,
     AuthenticatedOriginPull,
@@ -24,33 +25,33 @@ class TestHostnames:
     def test_method_update(self, client: Cloudflare) -> None:
         hostname = client.origin_tls_client_auth.hostnames.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            config=[{}, {}, {}],
+            config=[{}],
         )
-        assert_matches_type(Optional[HostnameUpdateResponse], hostname, path=["response"])
+        assert_matches_type(SyncSinglePage[HostnameUpdateResponse], hostname, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.origin_tls_client_auth.hostnames.with_raw_response.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            config=[{}, {}, {}],
+            config=[{}],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         hostname = response.parse()
-        assert_matches_type(Optional[HostnameUpdateResponse], hostname, path=["response"])
+        assert_matches_type(SyncSinglePage[HostnameUpdateResponse], hostname, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.origin_tls_client_auth.hostnames.with_streaming_response.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            config=[{}, {}, {}],
+            config=[{}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             hostname = response.parse()
-            assert_matches_type(Optional[HostnameUpdateResponse], hostname, path=["response"])
+            assert_matches_type(SyncSinglePage[HostnameUpdateResponse], hostname, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -59,7 +60,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.origin_tls_client_auth.hostnames.with_raw_response.update(
                 zone_id="",
-                config=[{}, {}, {}],
+                config=[{}],
             )
 
     @parametrize
@@ -112,39 +113,41 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncHostnames:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         hostname = await async_client.origin_tls_client_auth.hostnames.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            config=[{}, {}, {}],
+            config=[{}],
         )
-        assert_matches_type(Optional[HostnameUpdateResponse], hostname, path=["response"])
+        assert_matches_type(AsyncSinglePage[HostnameUpdateResponse], hostname, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.origin_tls_client_auth.hostnames.with_raw_response.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            config=[{}, {}, {}],
+            config=[{}],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         hostname = await response.parse()
-        assert_matches_type(Optional[HostnameUpdateResponse], hostname, path=["response"])
+        assert_matches_type(AsyncSinglePage[HostnameUpdateResponse], hostname, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.origin_tls_client_auth.hostnames.with_streaming_response.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            config=[{}, {}, {}],
+            config=[{}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             hostname = await response.parse()
-            assert_matches_type(Optional[HostnameUpdateResponse], hostname, path=["response"])
+            assert_matches_type(AsyncSinglePage[HostnameUpdateResponse], hostname, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -153,7 +156,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.origin_tls_client_auth.hostnames.with_raw_response.update(
                 zone_id="",
-                config=[{}, {}, {}],
+                config=[{}],
             )
 
     @parametrize
diff --git a/tests/api_resources/origin_tls_client_auth/test_settings.py b/tests/api_resources/origin_tls_client_auth/test_settings.py
index fc30faf30eb..03cf5a4bc0e 100644
--- a/tests/api_resources/origin_tls_client_auth/test_settings.py
+++ b/tests/api_resources/origin_tls_client_auth/test_settings.py
@@ -99,7 +99,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSettings:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/origin_tls_client_auth/test_zone_certificates.py b/tests/api_resources/origin_tls_client_auth/test_zone_certificates.py
new file mode 100644
index 00000000000..747f6d83ee2
--- /dev/null
+++ b/tests/api_resources/origin_tls_client_auth/test_zone_certificates.py
@@ -0,0 +1,390 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.origin_tls_client_auth import (
+    ZoneCertificateGetResponse,
+    ZoneCertificateListResponse,
+    ZoneCertificateCreateResponse,
+    ZoneCertificateDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestZoneCertificates:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        zone_certificate = client.origin_tls_client_auth.zone_certificates.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+        )
+        assert_matches_type(Optional[ZoneCertificateCreateResponse], zone_certificate, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.origin_tls_client_auth.zone_certificates.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        zone_certificate = response.parse()
+        assert_matches_type(Optional[ZoneCertificateCreateResponse], zone_certificate, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.origin_tls_client_auth.zone_certificates.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            zone_certificate = response.parse()
+            assert_matches_type(Optional[ZoneCertificateCreateResponse], zone_certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.origin_tls_client_auth.zone_certificates.with_raw_response.create(
+                zone_id="",
+                certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+                private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        zone_certificate = client.origin_tls_client_auth.zone_certificates.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[ZoneCertificateListResponse], zone_certificate, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.origin_tls_client_auth.zone_certificates.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        zone_certificate = response.parse()
+        assert_matches_type(SyncSinglePage[ZoneCertificateListResponse], zone_certificate, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.origin_tls_client_auth.zone_certificates.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            zone_certificate = response.parse()
+            assert_matches_type(SyncSinglePage[ZoneCertificateListResponse], zone_certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.origin_tls_client_auth.zone_certificates.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        zone_certificate = client.origin_tls_client_auth.zone_certificates.delete(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ZoneCertificateDeleteResponse], zone_certificate, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.origin_tls_client_auth.zone_certificates.with_raw_response.delete(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        zone_certificate = response.parse()
+        assert_matches_type(Optional[ZoneCertificateDeleteResponse], zone_certificate, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.origin_tls_client_auth.zone_certificates.with_streaming_response.delete(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            zone_certificate = response.parse()
+            assert_matches_type(Optional[ZoneCertificateDeleteResponse], zone_certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.origin_tls_client_auth.zone_certificates.with_raw_response.delete(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+            client.origin_tls_client_auth.zone_certificates.with_raw_response.delete(
+                certificate_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        zone_certificate = client.origin_tls_client_auth.zone_certificates.get(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ZoneCertificateGetResponse], zone_certificate, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.origin_tls_client_auth.zone_certificates.with_raw_response.get(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        zone_certificate = response.parse()
+        assert_matches_type(Optional[ZoneCertificateGetResponse], zone_certificate, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.origin_tls_client_auth.zone_certificates.with_streaming_response.get(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            zone_certificate = response.parse()
+            assert_matches_type(Optional[ZoneCertificateGetResponse], zone_certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.origin_tls_client_auth.zone_certificates.with_raw_response.get(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+            client.origin_tls_client_auth.zone_certificates.with_raw_response.get(
+                certificate_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncZoneCertificates:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        zone_certificate = await async_client.origin_tls_client_auth.zone_certificates.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+        )
+        assert_matches_type(Optional[ZoneCertificateCreateResponse], zone_certificate, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.origin_tls_client_auth.zone_certificates.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        zone_certificate = await response.parse()
+        assert_matches_type(Optional[ZoneCertificateCreateResponse], zone_certificate, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.origin_tls_client_auth.zone_certificates.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            zone_certificate = await response.parse()
+            assert_matches_type(Optional[ZoneCertificateCreateResponse], zone_certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.origin_tls_client_auth.zone_certificates.with_raw_response.create(
+                zone_id="",
+                certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+                private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        zone_certificate = await async_client.origin_tls_client_auth.zone_certificates.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[ZoneCertificateListResponse], zone_certificate, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.origin_tls_client_auth.zone_certificates.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        zone_certificate = await response.parse()
+        assert_matches_type(AsyncSinglePage[ZoneCertificateListResponse], zone_certificate, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.origin_tls_client_auth.zone_certificates.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            zone_certificate = await response.parse()
+            assert_matches_type(AsyncSinglePage[ZoneCertificateListResponse], zone_certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.origin_tls_client_auth.zone_certificates.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        zone_certificate = await async_client.origin_tls_client_auth.zone_certificates.delete(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ZoneCertificateDeleteResponse], zone_certificate, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.origin_tls_client_auth.zone_certificates.with_raw_response.delete(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        zone_certificate = await response.parse()
+        assert_matches_type(Optional[ZoneCertificateDeleteResponse], zone_certificate, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.origin_tls_client_auth.zone_certificates.with_streaming_response.delete(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            zone_certificate = await response.parse()
+            assert_matches_type(Optional[ZoneCertificateDeleteResponse], zone_certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.origin_tls_client_auth.zone_certificates.with_raw_response.delete(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+            await async_client.origin_tls_client_auth.zone_certificates.with_raw_response.delete(
+                certificate_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        zone_certificate = await async_client.origin_tls_client_auth.zone_certificates.get(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ZoneCertificateGetResponse], zone_certificate, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.origin_tls_client_auth.zone_certificates.with_raw_response.get(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        zone_certificate = await response.parse()
+        assert_matches_type(Optional[ZoneCertificateGetResponse], zone_certificate, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.origin_tls_client_auth.zone_certificates.with_streaming_response.get(
+            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            zone_certificate = await response.parse()
+            assert_matches_type(Optional[ZoneCertificateGetResponse], zone_certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.origin_tls_client_auth.zone_certificates.with_raw_response.get(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+            await async_client.origin_tls_client_auth.zone_certificates.with_raw_response.get(
+                certificate_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/page_shield/test_connections.py b/tests/api_resources/page_shield/test_connections.py
index 1af65b2ef8f..ea61c20c164 100644
--- a/tests/api_resources/page_shield/test_connections.py
+++ b/tests/api_resources/page_shield/test_connections.py
@@ -125,7 +125,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncConnections:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/page_shield/test_cookies.py b/tests/api_resources/page_shield/test_cookies.py
index d3008ff641a..4c3ee43d562 100644
--- a/tests/api_resources/page_shield/test_cookies.py
+++ b/tests/api_resources/page_shield/test_cookies.py
@@ -127,7 +127,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncCookies:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/page_shield/test_policies.py b/tests/api_resources/page_shield/test_policies.py
index 375863ad9b6..a62663f6b51 100644
--- a/tests/api_resources/page_shield/test_policies.py
+++ b/tests/api_resources/page_shield/test_policies.py
@@ -278,7 +278,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncPolicies:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/page_shield/test_scripts.py b/tests/api_resources/page_shield/test_scripts.py
index f8a9077bccf..af2706f5f45 100644
--- a/tests/api_resources/page_shield/test_scripts.py
+++ b/tests/api_resources/page_shield/test_scripts.py
@@ -126,7 +126,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncScripts:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/pagerules/test_settings.py b/tests/api_resources/pagerules/test_settings.py
deleted file mode 100644
index 7339a7f0ecc..00000000000
--- a/tests/api_resources/pagerules/test_settings.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.pagerules import SettingListResponse
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestSettings:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        setting = client.pagerules.settings.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SettingListResponse, setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.pagerules.settings.with_raw_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(SettingListResponse, setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.pagerules.settings.with_streaming_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(SettingListResponse, setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.pagerules.settings.with_raw_response.list(
-                zone_id="",
-            )
-
-
-class TestAsyncSettings:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.pagerules.settings.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SettingListResponse, setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.pagerules.settings.with_raw_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(SettingListResponse, setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.pagerules.settings.with_streaming_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(SettingListResponse, setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.pagerules.settings.with_raw_response.list(
-                zone_id="",
-            )
diff --git a/tests/api_resources/pages/projects/deployments/history/test_logs.py b/tests/api_resources/pages/projects/deployments/history/test_logs.py
index db7215a143b..54642c4a269 100644
--- a/tests/api_resources/pages/projects/deployments/history/test_logs.py
+++ b/tests/api_resources/pages/projects/deployments/history/test_logs.py
@@ -79,7 +79,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncLogs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/pages/projects/test_deployments.py b/tests/api_resources/pages/projects/test_deployments.py
index 7c9203aa0c3..3b8446648fc 100644
--- a/tests/api_resources/pages/projects/test_deployments.py
+++ b/tests/api_resources/pages/projects/test_deployments.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.pages import Deployment
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -33,7 +33,19 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         deployment = client.pages.projects.deployments.create(
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            _headers=b"raw file contents",
+            _redirects=b"raw file contents",
+            _routes_json=b"raw file contents",
+            _worker_bundle=b"raw file contents",
+            _worker_js=b"raw file contents",
             branch="staging",
+            commit_dirty="false",
+            commit_hash="a1b2c3d4e5f6",
+            commit_message="Update homepage",
+            functions_filepath_routing_config_json=b"raw file contents",
+            manifest='{"index.html": "abc123", "style.css": "def456"}',
+            pages_build_output_dir="dist",
+            wrangler_config_hash="wrangler_config_hash",
         )
         assert_matches_type(Deployment, deployment, path=["response"])
 
@@ -86,7 +98,7 @@ def test_method_list(self, client: Cloudflare) -> None:
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncSinglePage[Deployment], deployment, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Deployment], deployment, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
@@ -94,8 +106,10 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             env="preview",
+            page=1,
+            per_page=10,
         )
-        assert_matches_type(SyncSinglePage[Deployment], deployment, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Deployment], deployment, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -107,7 +121,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         deployment = response.parse()
-        assert_matches_type(SyncSinglePage[Deployment], deployment, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Deployment], deployment, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -119,7 +133,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             deployment = response.parse()
-            assert_matches_type(SyncSinglePage[Deployment], deployment, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[Deployment], deployment, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -263,7 +277,6 @@ def test_method_retry(self, client: Cloudflare) -> None:
             deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
-            body={},
         )
         assert_matches_type(Deployment, deployment, path=["response"])
 
@@ -273,7 +286,6 @@ def test_raw_response_retry(self, client: Cloudflare) -> None:
             deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
-            body={},
         )
 
         assert response.is_closed is True
@@ -287,7 +299,6 @@ def test_streaming_response_retry(self, client: Cloudflare) -> None:
             deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -304,7 +315,6 @@ def test_path_params_retry(self, client: Cloudflare) -> None:
                 deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
                 project_name="this-is-my-project-01",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `project_name` but received ''"):
@@ -312,7 +322,6 @@ def test_path_params_retry(self, client: Cloudflare) -> None:
                 deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 project_name="",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `deployment_id` but received ''"):
@@ -320,7 +329,6 @@ def test_path_params_retry(self, client: Cloudflare) -> None:
                 deployment_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 project_name="this-is-my-project-01",
-                body={},
             )
 
     @parametrize
@@ -329,7 +337,6 @@ def test_method_rollback(self, client: Cloudflare) -> None:
             deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
-            body={},
         )
         assert_matches_type(Deployment, deployment, path=["response"])
 
@@ -339,7 +346,6 @@ def test_raw_response_rollback(self, client: Cloudflare) -> None:
             deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
-            body={},
         )
 
         assert response.is_closed is True
@@ -353,7 +359,6 @@ def test_streaming_response_rollback(self, client: Cloudflare) -> None:
             deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -370,7 +375,6 @@ def test_path_params_rollback(self, client: Cloudflare) -> None:
                 deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
                 project_name="this-is-my-project-01",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `project_name` but received ''"):
@@ -378,7 +382,6 @@ def test_path_params_rollback(self, client: Cloudflare) -> None:
                 deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 project_name="",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `deployment_id` but received ''"):
@@ -386,12 +389,13 @@ def test_path_params_rollback(self, client: Cloudflare) -> None:
                 deployment_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 project_name="this-is-my-project-01",
-                body={},
             )
 
 
 class TestAsyncDeployments:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -408,7 +412,19 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
         deployment = await async_client.pages.projects.deployments.create(
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            _headers=b"raw file contents",
+            _redirects=b"raw file contents",
+            _routes_json=b"raw file contents",
+            _worker_bundle=b"raw file contents",
+            _worker_js=b"raw file contents",
             branch="staging",
+            commit_dirty="false",
+            commit_hash="a1b2c3d4e5f6",
+            commit_message="Update homepage",
+            functions_filepath_routing_config_json=b"raw file contents",
+            manifest='{"index.html": "abc123", "style.css": "def456"}',
+            pages_build_output_dir="dist",
+            wrangler_config_hash="wrangler_config_hash",
         )
         assert_matches_type(Deployment, deployment, path=["response"])
 
@@ -461,7 +477,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncSinglePage[Deployment], deployment, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Deployment], deployment, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -469,8 +485,10 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             env="preview",
+            page=1,
+            per_page=10,
         )
-        assert_matches_type(AsyncSinglePage[Deployment], deployment, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Deployment], deployment, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -482,7 +500,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         deployment = await response.parse()
-        assert_matches_type(AsyncSinglePage[Deployment], deployment, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Deployment], deployment, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -494,7 +512,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             deployment = await response.parse()
-            assert_matches_type(AsyncSinglePage[Deployment], deployment, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[Deployment], deployment, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -638,7 +656,6 @@ async def test_method_retry(self, async_client: AsyncCloudflare) -> None:
             deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
-            body={},
         )
         assert_matches_type(Deployment, deployment, path=["response"])
 
@@ -648,7 +665,6 @@ async def test_raw_response_retry(self, async_client: AsyncCloudflare) -> None:
             deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
-            body={},
         )
 
         assert response.is_closed is True
@@ -662,7 +678,6 @@ async def test_streaming_response_retry(self, async_client: AsyncCloudflare) ->
             deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -679,7 +694,6 @@ async def test_path_params_retry(self, async_client: AsyncCloudflare) -> None:
                 deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
                 project_name="this-is-my-project-01",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `project_name` but received ''"):
@@ -687,7 +701,6 @@ async def test_path_params_retry(self, async_client: AsyncCloudflare) -> None:
                 deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 project_name="",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `deployment_id` but received ''"):
@@ -695,7 +708,6 @@ async def test_path_params_retry(self, async_client: AsyncCloudflare) -> None:
                 deployment_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 project_name="this-is-my-project-01",
-                body={},
             )
 
     @parametrize
@@ -704,7 +716,6 @@ async def test_method_rollback(self, async_client: AsyncCloudflare) -> None:
             deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
-            body={},
         )
         assert_matches_type(Deployment, deployment, path=["response"])
 
@@ -714,7 +725,6 @@ async def test_raw_response_rollback(self, async_client: AsyncCloudflare) -> Non
             deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
-            body={},
         )
 
         assert response.is_closed is True
@@ -728,7 +738,6 @@ async def test_streaming_response_rollback(self, async_client: AsyncCloudflare)
             deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -745,7 +754,6 @@ async def test_path_params_rollback(self, async_client: AsyncCloudflare) -> None
                 deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
                 project_name="this-is-my-project-01",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `project_name` but received ''"):
@@ -753,7 +761,6 @@ async def test_path_params_rollback(self, async_client: AsyncCloudflare) -> None
                 deployment_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 project_name="",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `deployment_id` but received ''"):
@@ -761,5 +768,4 @@ async def test_path_params_rollback(self, async_client: AsyncCloudflare) -> None
                 deployment_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 project_name="this-is-my-project-01",
-                body={},
             )
diff --git a/tests/api_resources/pages/projects/test_domains.py b/tests/api_resources/pages/projects/test_domains.py
index d99095ae14e..e2219f7ed6a 100644
--- a/tests/api_resources/pages/projects/test_domains.py
+++ b/tests/api_resources/pages/projects/test_domains.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -13,6 +13,7 @@
 from cloudflare.types.pages.projects import (
     DomainGetResponse,
     DomainEditResponse,
+    DomainListResponse,
     DomainCreateResponse,
 )
 
@@ -27,35 +28,35 @@ def test_method_create(self, client: Cloudflare) -> None:
         domain = client.pages.projects.domains.create(
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={"name": "example.com"},
+            name="this-is-my-domain-01.com",
         )
-        assert_matches_type(Optional[DomainCreateResponse], domain, path=["response"])
+        assert_matches_type(DomainCreateResponse, domain, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.pages.projects.domains.with_raw_response.create(
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={"name": "example.com"},
+            name="this-is-my-domain-01.com",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         domain = response.parse()
-        assert_matches_type(Optional[DomainCreateResponse], domain, path=["response"])
+        assert_matches_type(DomainCreateResponse, domain, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.pages.projects.domains.with_streaming_response.create(
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={"name": "example.com"},
+            name="this-is-my-domain-01.com",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             domain = response.parse()
-            assert_matches_type(Optional[DomainCreateResponse], domain, path=["response"])
+            assert_matches_type(DomainCreateResponse, domain, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -65,14 +66,14 @@ def test_path_params_create(self, client: Cloudflare) -> None:
             client.pages.projects.domains.with_raw_response.create(
                 project_name="this-is-my-project-01",
                 account_id="",
-                body={"name": "example.com"},
+                name="this-is-my-domain-01.com",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `project_name` but received ''"):
             client.pages.projects.domains.with_raw_response.create(
                 project_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={"name": "example.com"},
+                name="this-is-my-domain-01.com",
             )
 
     @parametrize
@@ -81,7 +82,7 @@ def test_method_list(self, client: Cloudflare) -> None:
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncSinglePage[object], domain, path=["response"])
+        assert_matches_type(SyncSinglePage[DomainListResponse], domain, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -93,7 +94,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         domain = response.parse()
-        assert_matches_type(SyncSinglePage[object], domain, path=["response"])
+        assert_matches_type(SyncSinglePage[DomainListResponse], domain, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -105,7 +106,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             domain = response.parse()
-            assert_matches_type(SyncSinglePage[object], domain, path=["response"])
+            assert_matches_type(SyncSinglePage[DomainListResponse], domain, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -189,9 +190,8 @@ def test_method_edit(self, client: Cloudflare) -> None:
             domain_name="this-is-my-domain-01.com",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
-            body={},
         )
-        assert_matches_type(Optional[DomainEditResponse], domain, path=["response"])
+        assert_matches_type(DomainEditResponse, domain, path=["response"])
 
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
@@ -199,13 +199,12 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
             domain_name="this-is-my-domain-01.com",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
-            body={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         domain = response.parse()
-        assert_matches_type(Optional[DomainEditResponse], domain, path=["response"])
+        assert_matches_type(DomainEditResponse, domain, path=["response"])
 
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
@@ -213,13 +212,12 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
             domain_name="this-is-my-domain-01.com",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             domain = response.parse()
-            assert_matches_type(Optional[DomainEditResponse], domain, path=["response"])
+            assert_matches_type(DomainEditResponse, domain, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -230,7 +228,6 @@ def test_path_params_edit(self, client: Cloudflare) -> None:
                 domain_name="this-is-my-domain-01.com",
                 account_id="",
                 project_name="this-is-my-project-01",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `project_name` but received ''"):
@@ -238,7 +235,6 @@ def test_path_params_edit(self, client: Cloudflare) -> None:
                 domain_name="this-is-my-domain-01.com",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 project_name="",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `domain_name` but received ''"):
@@ -246,7 +242,6 @@ def test_path_params_edit(self, client: Cloudflare) -> None:
                 domain_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 project_name="this-is-my-project-01",
-                body={},
             )
 
     @parametrize
@@ -256,7 +251,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
         )
-        assert_matches_type(Optional[DomainGetResponse], domain, path=["response"])
+        assert_matches_type(DomainGetResponse, domain, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -269,7 +264,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         domain = response.parse()
-        assert_matches_type(Optional[DomainGetResponse], domain, path=["response"])
+        assert_matches_type(DomainGetResponse, domain, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -282,7 +277,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             domain = response.parse()
-            assert_matches_type(Optional[DomainGetResponse], domain, path=["response"])
+            assert_matches_type(DomainGetResponse, domain, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -311,42 +306,44 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncDomains:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         domain = await async_client.pages.projects.domains.create(
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={"name": "example.com"},
+            name="this-is-my-domain-01.com",
         )
-        assert_matches_type(Optional[DomainCreateResponse], domain, path=["response"])
+        assert_matches_type(DomainCreateResponse, domain, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.pages.projects.domains.with_raw_response.create(
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={"name": "example.com"},
+            name="this-is-my-domain-01.com",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         domain = await response.parse()
-        assert_matches_type(Optional[DomainCreateResponse], domain, path=["response"])
+        assert_matches_type(DomainCreateResponse, domain, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.pages.projects.domains.with_streaming_response.create(
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={"name": "example.com"},
+            name="this-is-my-domain-01.com",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             domain = await response.parse()
-            assert_matches_type(Optional[DomainCreateResponse], domain, path=["response"])
+            assert_matches_type(DomainCreateResponse, domain, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -356,14 +353,14 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
             await async_client.pages.projects.domains.with_raw_response.create(
                 project_name="this-is-my-project-01",
                 account_id="",
-                body={"name": "example.com"},
+                name="this-is-my-domain-01.com",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `project_name` but received ''"):
             await async_client.pages.projects.domains.with_raw_response.create(
                 project_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={"name": "example.com"},
+                name="this-is-my-domain-01.com",
             )
 
     @parametrize
@@ -372,7 +369,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncSinglePage[object], domain, path=["response"])
+        assert_matches_type(AsyncSinglePage[DomainListResponse], domain, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -384,7 +381,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         domain = await response.parse()
-        assert_matches_type(AsyncSinglePage[object], domain, path=["response"])
+        assert_matches_type(AsyncSinglePage[DomainListResponse], domain, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -396,7 +393,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             domain = await response.parse()
-            assert_matches_type(AsyncSinglePage[object], domain, path=["response"])
+            assert_matches_type(AsyncSinglePage[DomainListResponse], domain, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -480,9 +477,8 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
             domain_name="this-is-my-domain-01.com",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
-            body={},
         )
-        assert_matches_type(Optional[DomainEditResponse], domain, path=["response"])
+        assert_matches_type(DomainEditResponse, domain, path=["response"])
 
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -490,13 +486,12 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
             domain_name="this-is-my-domain-01.com",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
-            body={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         domain = await response.parse()
-        assert_matches_type(Optional[DomainEditResponse], domain, path=["response"])
+        assert_matches_type(DomainEditResponse, domain, path=["response"])
 
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -504,13 +499,12 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
             domain_name="this-is-my-domain-01.com",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             domain = await response.parse()
-            assert_matches_type(Optional[DomainEditResponse], domain, path=["response"])
+            assert_matches_type(DomainEditResponse, domain, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -521,7 +515,6 @@ async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
                 domain_name="this-is-my-domain-01.com",
                 account_id="",
                 project_name="this-is-my-project-01",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `project_name` but received ''"):
@@ -529,7 +522,6 @@ async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
                 domain_name="this-is-my-domain-01.com",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 project_name="",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `domain_name` but received ''"):
@@ -537,7 +529,6 @@ async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
                 domain_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 project_name="this-is-my-project-01",
-                body={},
             )
 
     @parametrize
@@ -547,7 +538,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             project_name="this-is-my-project-01",
         )
-        assert_matches_type(Optional[DomainGetResponse], domain, path=["response"])
+        assert_matches_type(DomainGetResponse, domain, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -560,7 +551,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         domain = await response.parse()
-        assert_matches_type(Optional[DomainGetResponse], domain, path=["response"])
+        assert_matches_type(DomainGetResponse, domain, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -573,7 +564,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             domain = await response.parse()
-            assert_matches_type(Optional[DomainGetResponse], domain, path=["response"])
+            assert_matches_type(DomainGetResponse, domain, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/pages/test_projects.py b/tests/api_resources/pages/test_projects.py
index 44ce71019b1..5220b9b2893 100644
--- a/tests/api_resources/pages/test_projects.py
+++ b/tests/api_resources/pages/test_projects.py
@@ -9,13 +9,8 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.pages import (
-    Project,
-    Deployment,
-    ProjectEditResponse,
-    ProjectCreateResponse,
-)
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.pages import Project
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -27,13 +22,17 @@ class TestProjects:
     def test_method_create(self, client: Cloudflare) -> None:
         project = client.pages.projects.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-pages-app",
+            production_branch="main",
         )
-        assert_matches_type(ProjectCreateResponse, project, path=["response"])
+        assert_matches_type(Project, project, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         project = client.pages.projects.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-pages-app",
+            production_branch="main",
             build_config={
                 "build_caching": True,
                 "build_command": "npm run build",
@@ -42,104 +41,134 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                 "web_analytics_tag": "cee1c73f6e4743d0b5e6bb1a0bcaabcc",
                 "web_analytics_token": "021e1057c18547eca7b79f2516f06o7x",
             },
-            canonical_deployment={},
             deployment_configs={
                 "preview": {
-                    "ai_bindings": {"ai_binding": {"project_id": {}}},
-                    "analytics_engine_datasets": {"analytics_engine_binding": {"dataset": "api_analytics"}},
-                    "browsers": {"browser": {}},
-                    "compatibility_date": "2022-01-01",
+                    "ai_bindings": {"AI_BINDING": {"project_id": "some-project-id"}},
+                    "always_use_latest_compatibility_date": False,
+                    "analytics_engine_datasets": {"ANALYTICS_ENGINE_BINDING": {"dataset": "api_analytics"}},
+                    "browsers": {"BROWSER": {}},
+                    "build_image_major_version": 3,
+                    "compatibility_date": "2025-01-01",
                     "compatibility_flags": ["url_standard"],
-                    "d1_databases": {"d1_binding": {"id": "445e2955-951a-43f8-a35b-a4d0c8138f63"}},
-                    "durable_object_namespaces": {"do_binding": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
+                    "d1_databases": {"D1_BINDING": {"id": "445e2955-951a-43f8-a35b-a4d0c8138f63"}},
+                    "durable_object_namespaces": {"DO_BINDING": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
                     "env_vars": {
-                        "environment_variable": {
+                        "foo": {
                             "type": "plain_text",
                             "value": "hello world",
                         }
                     },
-                    "hyperdrive_bindings": {"hyperdrive": {"id": "a76a99bc342644deb02c38d66082262a"}},
-                    "kv_namespaces": {"kv_binding": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
-                    "mtls_certificates": {"mtls": {"certificate_id": "d7cdd17c-916f-4cb7-aabe-585eb382ec4e"}},
+                    "fail_open": True,
+                    "hyperdrive_bindings": {"HYPERDRIVE": {"id": "a76a99bc342644deb02c38d66082262a"}},
+                    "kv_namespaces": {"KV_BINDING": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
+                    "limits": {"cpu_ms": 100},
+                    "mtls_certificates": {"MTLS": {"certificate_id": "d7cdd17c-916f-4cb7-aabe-585eb382ec4e"}},
                     "placement": {"mode": "smart"},
-                    "queue_producers": {"queue_producer_binding": {"name": "some-queue"}},
+                    "queue_producers": {"QUEUE_PRODUCER_BINDING": {"name": "some-queue"}},
                     "r2_buckets": {
-                        "r2_binding": {
-                            "jurisdiction": "eu",
+                        "R2_BINDING": {
                             "name": "some-bucket",
+                            "jurisdiction": "eu",
                         }
                     },
                     "services": {
-                        "service_binding": {
+                        "SERVICE_BINDING": {
+                            "service": "example-worker",
                             "entrypoint": "MyHandler",
                             "environment": "production",
-                            "service": "example-worker",
                         }
                     },
-                    "vectorize_bindings": {"vectorize": {"index_name": "my_index"}},
+                    "usage_model": "standard",
+                    "vectorize_bindings": {"VECTORIZE": {"index_name": "my_index"}},
+                    "wrangler_config_hash": "abc123def456",
                 },
                 "production": {
-                    "ai_bindings": {"ai_binding": {"project_id": {}}},
-                    "analytics_engine_datasets": {"analytics_engine_binding": {"dataset": "api_analytics"}},
-                    "browsers": {"browser": {}},
-                    "compatibility_date": "2022-01-01",
+                    "ai_bindings": {"AI_BINDING": {"project_id": "some-project-id"}},
+                    "always_use_latest_compatibility_date": False,
+                    "analytics_engine_datasets": {"ANALYTICS_ENGINE_BINDING": {"dataset": "api_analytics"}},
+                    "browsers": {"BROWSER": {}},
+                    "build_image_major_version": 3,
+                    "compatibility_date": "2025-01-01",
                     "compatibility_flags": ["url_standard"],
-                    "d1_databases": {"d1_binding": {"id": "445e2955-951a-43f8-a35b-a4d0c8138f63"}},
-                    "durable_object_namespaces": {"do_binding": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
+                    "d1_databases": {"D1_BINDING": {"id": "445e2955-951a-43f8-a35b-a4d0c8138f63"}},
+                    "durable_object_namespaces": {"DO_BINDING": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
                     "env_vars": {
-                        "environment_variable": {
+                        "foo": {
                             "type": "plain_text",
                             "value": "hello world",
                         }
                     },
-                    "hyperdrive_bindings": {"hyperdrive": {"id": "a76a99bc342644deb02c38d66082262a"}},
-                    "kv_namespaces": {"kv_binding": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
-                    "mtls_certificates": {"mtls": {"certificate_id": "d7cdd17c-916f-4cb7-aabe-585eb382ec4e"}},
+                    "fail_open": True,
+                    "hyperdrive_bindings": {"HYPERDRIVE": {"id": "a76a99bc342644deb02c38d66082262a"}},
+                    "kv_namespaces": {"KV_BINDING": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
+                    "limits": {"cpu_ms": 100},
+                    "mtls_certificates": {"MTLS": {"certificate_id": "d7cdd17c-916f-4cb7-aabe-585eb382ec4e"}},
                     "placement": {"mode": "smart"},
-                    "queue_producers": {"queue_producer_binding": {"name": "some-queue"}},
+                    "queue_producers": {"QUEUE_PRODUCER_BINDING": {"name": "some-queue"}},
                     "r2_buckets": {
-                        "r2_binding": {
-                            "jurisdiction": "eu",
+                        "R2_BINDING": {
                             "name": "some-bucket",
+                            "jurisdiction": "eu",
                         }
                     },
                     "services": {
-                        "service_binding": {
+                        "SERVICE_BINDING": {
+                            "service": "example-worker",
                             "entrypoint": "MyHandler",
                             "environment": "production",
-                            "service": "example-worker",
                         }
                     },
-                    "vectorize_bindings": {"vectorize": {"index_name": "my_index"}},
+                    "usage_model": "standard",
+                    "vectorize_bindings": {"VECTORIZE": {"index_name": "my_index"}},
+                    "wrangler_config_hash": "abc123def456",
                 },
             },
-            latest_deployment={},
-            name="NextJS Blog",
-            production_branch="main",
+            source={
+                "config": {
+                    "deployments_enabled": True,
+                    "owner": "my-org",
+                    "owner_id": "12345678",
+                    "path_excludes": ["string"],
+                    "path_includes": ["string"],
+                    "pr_comments_enabled": True,
+                    "preview_branch_excludes": ["string"],
+                    "preview_branch_includes": ["string"],
+                    "preview_deployment_setting": "all",
+                    "production_branch": "main",
+                    "production_deployments_enabled": True,
+                    "repo_id": "12345678",
+                    "repo_name": "my-repo",
+                },
+                "type": "github",
+            },
         )
-        assert_matches_type(ProjectCreateResponse, project, path=["response"])
+        assert_matches_type(Project, project, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.pages.projects.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-pages-app",
+            production_branch="main",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         project = response.parse()
-        assert_matches_type(ProjectCreateResponse, project, path=["response"])
+        assert_matches_type(Project, project, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.pages.projects.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-pages-app",
+            production_branch="main",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             project = response.parse()
-            assert_matches_type(ProjectCreateResponse, project, path=["response"])
+            assert_matches_type(Project, project, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -148,6 +177,8 @@ def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.pages.projects.with_raw_response.create(
                 account_id="",
+                name="my-pages-app",
+                production_branch="main",
             )
 
     @parametrize
@@ -155,7 +186,16 @@ def test_method_list(self, client: Cloudflare) -> None:
         project = client.pages.projects.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncSinglePage[Deployment], project, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Project], project, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        project = client.pages.projects.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=10,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[Project], project, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -166,7 +206,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         project = response.parse()
-        assert_matches_type(SyncSinglePage[Deployment], project, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Project], project, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -177,7 +217,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             project = response.parse()
-            assert_matches_type(SyncSinglePage[Deployment], project, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[Project], project, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -241,80 +281,150 @@ def test_method_edit(self, client: Cloudflare) -> None:
         project = client.pages.projects.edit(
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={
-                "deployment_configs": {
-                    "production": {
-                        "compatibility_date": "2022-01-01",
-                        "compatibility_flags": ["url_standard"],
-                        "env_vars": {
-                            "BUILD_VERSION": {"value": "3.3"},
-                            "delete_this_env_var": None,
-                            "secret_var": {
-                                "type": "secret_text",
-                                "value": "A_CMS_API_TOKEN",
-                            },
-                        },
-                    }
-                }
+        )
+        assert_matches_type(Project, project, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        project = client.pages.projects.edit(
+            project_name="this-is-my-project-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            build_config={
+                "build_caching": True,
+                "build_command": "npm run build",
+                "destination_dir": "build",
+                "root_dir": "/",
+                "web_analytics_tag": "cee1c73f6e4743d0b5e6bb1a0bcaabcc",
+                "web_analytics_token": "021e1057c18547eca7b79f2516f06o7x",
+            },
+            deployment_configs={
+                "preview": {
+                    "ai_bindings": {"AI_BINDING": {"project_id": "some-project-id"}},
+                    "always_use_latest_compatibility_date": False,
+                    "analytics_engine_datasets": {"ANALYTICS_ENGINE_BINDING": {"dataset": "api_analytics"}},
+                    "browsers": {"BROWSER": {}},
+                    "build_image_major_version": 3,
+                    "compatibility_date": "2025-01-01",
+                    "compatibility_flags": ["url_standard"],
+                    "d1_databases": {"D1_BINDING": {"id": "445e2955-951a-43f8-a35b-a4d0c8138f63"}},
+                    "durable_object_namespaces": {"DO_BINDING": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
+                    "env_vars": {
+                        "foo": {
+                            "type": "plain_text",
+                            "value": "hello world",
+                        }
+                    },
+                    "fail_open": True,
+                    "hyperdrive_bindings": {"HYPERDRIVE": {"id": "a76a99bc342644deb02c38d66082262a"}},
+                    "kv_namespaces": {"KV_BINDING": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
+                    "limits": {"cpu_ms": 100},
+                    "mtls_certificates": {"MTLS": {"certificate_id": "d7cdd17c-916f-4cb7-aabe-585eb382ec4e"}},
+                    "placement": {"mode": "smart"},
+                    "queue_producers": {"QUEUE_PRODUCER_BINDING": {"name": "some-queue"}},
+                    "r2_buckets": {
+                        "R2_BINDING": {
+                            "name": "some-bucket",
+                            "jurisdiction": "eu",
+                        }
+                    },
+                    "services": {
+                        "SERVICE_BINDING": {
+                            "service": "example-worker",
+                            "entrypoint": "MyHandler",
+                            "environment": "production",
+                        }
+                    },
+                    "usage_model": "standard",
+                    "vectorize_bindings": {"VECTORIZE": {"index_name": "my_index"}},
+                    "wrangler_config_hash": "abc123def456",
+                },
+                "production": {
+                    "ai_bindings": {"AI_BINDING": {"project_id": "some-project-id"}},
+                    "always_use_latest_compatibility_date": False,
+                    "analytics_engine_datasets": {"ANALYTICS_ENGINE_BINDING": {"dataset": "api_analytics"}},
+                    "browsers": {"BROWSER": {}},
+                    "build_image_major_version": 3,
+                    "compatibility_date": "2025-01-01",
+                    "compatibility_flags": ["url_standard"],
+                    "d1_databases": {"D1_BINDING": {"id": "445e2955-951a-43f8-a35b-a4d0c8138f63"}},
+                    "durable_object_namespaces": {"DO_BINDING": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
+                    "env_vars": {
+                        "foo": {
+                            "type": "plain_text",
+                            "value": "hello world",
+                        }
+                    },
+                    "fail_open": True,
+                    "hyperdrive_bindings": {"HYPERDRIVE": {"id": "a76a99bc342644deb02c38d66082262a"}},
+                    "kv_namespaces": {"KV_BINDING": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
+                    "limits": {"cpu_ms": 100},
+                    "mtls_certificates": {"MTLS": {"certificate_id": "d7cdd17c-916f-4cb7-aabe-585eb382ec4e"}},
+                    "placement": {"mode": "smart"},
+                    "queue_producers": {"QUEUE_PRODUCER_BINDING": {"name": "some-queue"}},
+                    "r2_buckets": {
+                        "R2_BINDING": {
+                            "name": "some-bucket",
+                            "jurisdiction": "eu",
+                        }
+                    },
+                    "services": {
+                        "SERVICE_BINDING": {
+                            "service": "example-worker",
+                            "entrypoint": "MyHandler",
+                            "environment": "production",
+                        }
+                    },
+                    "usage_model": "standard",
+                    "vectorize_bindings": {"VECTORIZE": {"index_name": "my_index"}},
+                    "wrangler_config_hash": "abc123def456",
+                },
+            },
+            name="my-pages-app",
+            production_branch="main",
+            source={
+                "config": {
+                    "deployments_enabled": True,
+                    "owner": "my-org",
+                    "owner_id": "12345678",
+                    "path_excludes": ["string"],
+                    "path_includes": ["string"],
+                    "pr_comments_enabled": True,
+                    "preview_branch_excludes": ["string"],
+                    "preview_branch_includes": ["string"],
+                    "preview_deployment_setting": "all",
+                    "production_branch": "main",
+                    "production_deployments_enabled": True,
+                    "repo_id": "12345678",
+                    "repo_name": "my-repo",
+                },
+                "type": "github",
             },
         )
-        assert_matches_type(ProjectEditResponse, project, path=["response"])
+        assert_matches_type(Project, project, path=["response"])
 
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
         response = client.pages.projects.with_raw_response.edit(
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={
-                "deployment_configs": {
-                    "production": {
-                        "compatibility_date": "2022-01-01",
-                        "compatibility_flags": ["url_standard"],
-                        "env_vars": {
-                            "BUILD_VERSION": {"value": "3.3"},
-                            "delete_this_env_var": None,
-                            "secret_var": {
-                                "type": "secret_text",
-                                "value": "A_CMS_API_TOKEN",
-                            },
-                        },
-                    }
-                }
-            },
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         project = response.parse()
-        assert_matches_type(ProjectEditResponse, project, path=["response"])
+        assert_matches_type(Project, project, path=["response"])
 
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
         with client.pages.projects.with_streaming_response.edit(
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={
-                "deployment_configs": {
-                    "production": {
-                        "compatibility_date": "2022-01-01",
-                        "compatibility_flags": ["url_standard"],
-                        "env_vars": {
-                            "BUILD_VERSION": {"value": "3.3"},
-                            "delete_this_env_var": None,
-                            "secret_var": {
-                                "type": "secret_text",
-                                "value": "A_CMS_API_TOKEN",
-                            },
-                        },
-                    }
-                }
-            },
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             project = response.parse()
-            assert_matches_type(ProjectEditResponse, project, path=["response"])
+            assert_matches_type(Project, project, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -324,44 +434,12 @@ def test_path_params_edit(self, client: Cloudflare) -> None:
             client.pages.projects.with_raw_response.edit(
                 project_name="this-is-my-project-01",
                 account_id="",
-                body={
-                    "deployment_configs": {
-                        "production": {
-                            "compatibility_date": "2022-01-01",
-                            "compatibility_flags": ["url_standard"],
-                            "env_vars": {
-                                "BUILD_VERSION": {"value": "3.3"},
-                                "delete_this_env_var": None,
-                                "secret_var": {
-                                    "type": "secret_text",
-                                    "value": "A_CMS_API_TOKEN",
-                                },
-                            },
-                        }
-                    }
-                },
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `project_name` but received ''"):
             client.pages.projects.with_raw_response.edit(
                 project_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={
-                    "deployment_configs": {
-                        "production": {
-                            "compatibility_date": "2022-01-01",
-                            "compatibility_flags": ["url_standard"],
-                            "env_vars": {
-                                "BUILD_VERSION": {"value": "3.3"},
-                                "delete_this_env_var": None,
-                                "secret_var": {
-                                    "type": "secret_text",
-                                    "value": "A_CMS_API_TOKEN",
-                                },
-                            },
-                        }
-                    }
-                },
             )
 
     @parametrize
@@ -462,19 +540,25 @@ def test_path_params_purge_build_cache(self, client: Cloudflare) -> None:
 
 
 class TestAsyncProjects:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         project = await async_client.pages.projects.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-pages-app",
+            production_branch="main",
         )
-        assert_matches_type(ProjectCreateResponse, project, path=["response"])
+        assert_matches_type(Project, project, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         project = await async_client.pages.projects.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-pages-app",
+            production_branch="main",
             build_config={
                 "build_caching": True,
                 "build_command": "npm run build",
@@ -483,104 +567,134 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                 "web_analytics_tag": "cee1c73f6e4743d0b5e6bb1a0bcaabcc",
                 "web_analytics_token": "021e1057c18547eca7b79f2516f06o7x",
             },
-            canonical_deployment={},
             deployment_configs={
                 "preview": {
-                    "ai_bindings": {"ai_binding": {"project_id": {}}},
-                    "analytics_engine_datasets": {"analytics_engine_binding": {"dataset": "api_analytics"}},
-                    "browsers": {"browser": {}},
-                    "compatibility_date": "2022-01-01",
+                    "ai_bindings": {"AI_BINDING": {"project_id": "some-project-id"}},
+                    "always_use_latest_compatibility_date": False,
+                    "analytics_engine_datasets": {"ANALYTICS_ENGINE_BINDING": {"dataset": "api_analytics"}},
+                    "browsers": {"BROWSER": {}},
+                    "build_image_major_version": 3,
+                    "compatibility_date": "2025-01-01",
                     "compatibility_flags": ["url_standard"],
-                    "d1_databases": {"d1_binding": {"id": "445e2955-951a-43f8-a35b-a4d0c8138f63"}},
-                    "durable_object_namespaces": {"do_binding": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
+                    "d1_databases": {"D1_BINDING": {"id": "445e2955-951a-43f8-a35b-a4d0c8138f63"}},
+                    "durable_object_namespaces": {"DO_BINDING": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
                     "env_vars": {
-                        "environment_variable": {
+                        "foo": {
                             "type": "plain_text",
                             "value": "hello world",
                         }
                     },
-                    "hyperdrive_bindings": {"hyperdrive": {"id": "a76a99bc342644deb02c38d66082262a"}},
-                    "kv_namespaces": {"kv_binding": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
-                    "mtls_certificates": {"mtls": {"certificate_id": "d7cdd17c-916f-4cb7-aabe-585eb382ec4e"}},
+                    "fail_open": True,
+                    "hyperdrive_bindings": {"HYPERDRIVE": {"id": "a76a99bc342644deb02c38d66082262a"}},
+                    "kv_namespaces": {"KV_BINDING": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
+                    "limits": {"cpu_ms": 100},
+                    "mtls_certificates": {"MTLS": {"certificate_id": "d7cdd17c-916f-4cb7-aabe-585eb382ec4e"}},
                     "placement": {"mode": "smart"},
-                    "queue_producers": {"queue_producer_binding": {"name": "some-queue"}},
+                    "queue_producers": {"QUEUE_PRODUCER_BINDING": {"name": "some-queue"}},
                     "r2_buckets": {
-                        "r2_binding": {
-                            "jurisdiction": "eu",
+                        "R2_BINDING": {
                             "name": "some-bucket",
+                            "jurisdiction": "eu",
                         }
                     },
                     "services": {
-                        "service_binding": {
+                        "SERVICE_BINDING": {
+                            "service": "example-worker",
                             "entrypoint": "MyHandler",
                             "environment": "production",
-                            "service": "example-worker",
                         }
                     },
-                    "vectorize_bindings": {"vectorize": {"index_name": "my_index"}},
+                    "usage_model": "standard",
+                    "vectorize_bindings": {"VECTORIZE": {"index_name": "my_index"}},
+                    "wrangler_config_hash": "abc123def456",
                 },
                 "production": {
-                    "ai_bindings": {"ai_binding": {"project_id": {}}},
-                    "analytics_engine_datasets": {"analytics_engine_binding": {"dataset": "api_analytics"}},
-                    "browsers": {"browser": {}},
-                    "compatibility_date": "2022-01-01",
+                    "ai_bindings": {"AI_BINDING": {"project_id": "some-project-id"}},
+                    "always_use_latest_compatibility_date": False,
+                    "analytics_engine_datasets": {"ANALYTICS_ENGINE_BINDING": {"dataset": "api_analytics"}},
+                    "browsers": {"BROWSER": {}},
+                    "build_image_major_version": 3,
+                    "compatibility_date": "2025-01-01",
                     "compatibility_flags": ["url_standard"],
-                    "d1_databases": {"d1_binding": {"id": "445e2955-951a-43f8-a35b-a4d0c8138f63"}},
-                    "durable_object_namespaces": {"do_binding": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
+                    "d1_databases": {"D1_BINDING": {"id": "445e2955-951a-43f8-a35b-a4d0c8138f63"}},
+                    "durable_object_namespaces": {"DO_BINDING": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
                     "env_vars": {
-                        "environment_variable": {
+                        "foo": {
                             "type": "plain_text",
                             "value": "hello world",
                         }
                     },
-                    "hyperdrive_bindings": {"hyperdrive": {"id": "a76a99bc342644deb02c38d66082262a"}},
-                    "kv_namespaces": {"kv_binding": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
-                    "mtls_certificates": {"mtls": {"certificate_id": "d7cdd17c-916f-4cb7-aabe-585eb382ec4e"}},
+                    "fail_open": True,
+                    "hyperdrive_bindings": {"HYPERDRIVE": {"id": "a76a99bc342644deb02c38d66082262a"}},
+                    "kv_namespaces": {"KV_BINDING": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
+                    "limits": {"cpu_ms": 100},
+                    "mtls_certificates": {"MTLS": {"certificate_id": "d7cdd17c-916f-4cb7-aabe-585eb382ec4e"}},
                     "placement": {"mode": "smart"},
-                    "queue_producers": {"queue_producer_binding": {"name": "some-queue"}},
+                    "queue_producers": {"QUEUE_PRODUCER_BINDING": {"name": "some-queue"}},
                     "r2_buckets": {
-                        "r2_binding": {
-                            "jurisdiction": "eu",
+                        "R2_BINDING": {
                             "name": "some-bucket",
+                            "jurisdiction": "eu",
                         }
                     },
                     "services": {
-                        "service_binding": {
+                        "SERVICE_BINDING": {
+                            "service": "example-worker",
                             "entrypoint": "MyHandler",
                             "environment": "production",
-                            "service": "example-worker",
                         }
                     },
-                    "vectorize_bindings": {"vectorize": {"index_name": "my_index"}},
+                    "usage_model": "standard",
+                    "vectorize_bindings": {"VECTORIZE": {"index_name": "my_index"}},
+                    "wrangler_config_hash": "abc123def456",
                 },
             },
-            latest_deployment={},
-            name="NextJS Blog",
-            production_branch="main",
+            source={
+                "config": {
+                    "deployments_enabled": True,
+                    "owner": "my-org",
+                    "owner_id": "12345678",
+                    "path_excludes": ["string"],
+                    "path_includes": ["string"],
+                    "pr_comments_enabled": True,
+                    "preview_branch_excludes": ["string"],
+                    "preview_branch_includes": ["string"],
+                    "preview_deployment_setting": "all",
+                    "production_branch": "main",
+                    "production_deployments_enabled": True,
+                    "repo_id": "12345678",
+                    "repo_name": "my-repo",
+                },
+                "type": "github",
+            },
         )
-        assert_matches_type(ProjectCreateResponse, project, path=["response"])
+        assert_matches_type(Project, project, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.pages.projects.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-pages-app",
+            production_branch="main",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         project = await response.parse()
-        assert_matches_type(ProjectCreateResponse, project, path=["response"])
+        assert_matches_type(Project, project, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.pages.projects.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-pages-app",
+            production_branch="main",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             project = await response.parse()
-            assert_matches_type(ProjectCreateResponse, project, path=["response"])
+            assert_matches_type(Project, project, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -589,6 +703,8 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.pages.projects.with_raw_response.create(
                 account_id="",
+                name="my-pages-app",
+                production_branch="main",
             )
 
     @parametrize
@@ -596,7 +712,16 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         project = await async_client.pages.projects.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncSinglePage[Deployment], project, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Project], project, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        project = await async_client.pages.projects.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=10,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[Project], project, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -607,7 +732,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         project = await response.parse()
-        assert_matches_type(AsyncSinglePage[Deployment], project, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Project], project, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -618,7 +743,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             project = await response.parse()
-            assert_matches_type(AsyncSinglePage[Deployment], project, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[Project], project, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -682,80 +807,150 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
         project = await async_client.pages.projects.edit(
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={
-                "deployment_configs": {
-                    "production": {
-                        "compatibility_date": "2022-01-01",
-                        "compatibility_flags": ["url_standard"],
-                        "env_vars": {
-                            "BUILD_VERSION": {"value": "3.3"},
-                            "delete_this_env_var": None,
-                            "secret_var": {
-                                "type": "secret_text",
-                                "value": "A_CMS_API_TOKEN",
-                            },
-                        },
-                    }
-                }
+        )
+        assert_matches_type(Project, project, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        project = await async_client.pages.projects.edit(
+            project_name="this-is-my-project-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            build_config={
+                "build_caching": True,
+                "build_command": "npm run build",
+                "destination_dir": "build",
+                "root_dir": "/",
+                "web_analytics_tag": "cee1c73f6e4743d0b5e6bb1a0bcaabcc",
+                "web_analytics_token": "021e1057c18547eca7b79f2516f06o7x",
+            },
+            deployment_configs={
+                "preview": {
+                    "ai_bindings": {"AI_BINDING": {"project_id": "some-project-id"}},
+                    "always_use_latest_compatibility_date": False,
+                    "analytics_engine_datasets": {"ANALYTICS_ENGINE_BINDING": {"dataset": "api_analytics"}},
+                    "browsers": {"BROWSER": {}},
+                    "build_image_major_version": 3,
+                    "compatibility_date": "2025-01-01",
+                    "compatibility_flags": ["url_standard"],
+                    "d1_databases": {"D1_BINDING": {"id": "445e2955-951a-43f8-a35b-a4d0c8138f63"}},
+                    "durable_object_namespaces": {"DO_BINDING": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
+                    "env_vars": {
+                        "foo": {
+                            "type": "plain_text",
+                            "value": "hello world",
+                        }
+                    },
+                    "fail_open": True,
+                    "hyperdrive_bindings": {"HYPERDRIVE": {"id": "a76a99bc342644deb02c38d66082262a"}},
+                    "kv_namespaces": {"KV_BINDING": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
+                    "limits": {"cpu_ms": 100},
+                    "mtls_certificates": {"MTLS": {"certificate_id": "d7cdd17c-916f-4cb7-aabe-585eb382ec4e"}},
+                    "placement": {"mode": "smart"},
+                    "queue_producers": {"QUEUE_PRODUCER_BINDING": {"name": "some-queue"}},
+                    "r2_buckets": {
+                        "R2_BINDING": {
+                            "name": "some-bucket",
+                            "jurisdiction": "eu",
+                        }
+                    },
+                    "services": {
+                        "SERVICE_BINDING": {
+                            "service": "example-worker",
+                            "entrypoint": "MyHandler",
+                            "environment": "production",
+                        }
+                    },
+                    "usage_model": "standard",
+                    "vectorize_bindings": {"VECTORIZE": {"index_name": "my_index"}},
+                    "wrangler_config_hash": "abc123def456",
+                },
+                "production": {
+                    "ai_bindings": {"AI_BINDING": {"project_id": "some-project-id"}},
+                    "always_use_latest_compatibility_date": False,
+                    "analytics_engine_datasets": {"ANALYTICS_ENGINE_BINDING": {"dataset": "api_analytics"}},
+                    "browsers": {"BROWSER": {}},
+                    "build_image_major_version": 3,
+                    "compatibility_date": "2025-01-01",
+                    "compatibility_flags": ["url_standard"],
+                    "d1_databases": {"D1_BINDING": {"id": "445e2955-951a-43f8-a35b-a4d0c8138f63"}},
+                    "durable_object_namespaces": {"DO_BINDING": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
+                    "env_vars": {
+                        "foo": {
+                            "type": "plain_text",
+                            "value": "hello world",
+                        }
+                    },
+                    "fail_open": True,
+                    "hyperdrive_bindings": {"HYPERDRIVE": {"id": "a76a99bc342644deb02c38d66082262a"}},
+                    "kv_namespaces": {"KV_BINDING": {"namespace_id": "5eb63bbbe01eeed093cb22bb8f5acdc3"}},
+                    "limits": {"cpu_ms": 100},
+                    "mtls_certificates": {"MTLS": {"certificate_id": "d7cdd17c-916f-4cb7-aabe-585eb382ec4e"}},
+                    "placement": {"mode": "smart"},
+                    "queue_producers": {"QUEUE_PRODUCER_BINDING": {"name": "some-queue"}},
+                    "r2_buckets": {
+                        "R2_BINDING": {
+                            "name": "some-bucket",
+                            "jurisdiction": "eu",
+                        }
+                    },
+                    "services": {
+                        "SERVICE_BINDING": {
+                            "service": "example-worker",
+                            "entrypoint": "MyHandler",
+                            "environment": "production",
+                        }
+                    },
+                    "usage_model": "standard",
+                    "vectorize_bindings": {"VECTORIZE": {"index_name": "my_index"}},
+                    "wrangler_config_hash": "abc123def456",
+                },
+            },
+            name="my-pages-app",
+            production_branch="main",
+            source={
+                "config": {
+                    "deployments_enabled": True,
+                    "owner": "my-org",
+                    "owner_id": "12345678",
+                    "path_excludes": ["string"],
+                    "path_includes": ["string"],
+                    "pr_comments_enabled": True,
+                    "preview_branch_excludes": ["string"],
+                    "preview_branch_includes": ["string"],
+                    "preview_deployment_setting": "all",
+                    "production_branch": "main",
+                    "production_deployments_enabled": True,
+                    "repo_id": "12345678",
+                    "repo_name": "my-repo",
+                },
+                "type": "github",
             },
         )
-        assert_matches_type(ProjectEditResponse, project, path=["response"])
+        assert_matches_type(Project, project, path=["response"])
 
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.pages.projects.with_raw_response.edit(
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={
-                "deployment_configs": {
-                    "production": {
-                        "compatibility_date": "2022-01-01",
-                        "compatibility_flags": ["url_standard"],
-                        "env_vars": {
-                            "BUILD_VERSION": {"value": "3.3"},
-                            "delete_this_env_var": None,
-                            "secret_var": {
-                                "type": "secret_text",
-                                "value": "A_CMS_API_TOKEN",
-                            },
-                        },
-                    }
-                }
-            },
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         project = await response.parse()
-        assert_matches_type(ProjectEditResponse, project, path=["response"])
+        assert_matches_type(Project, project, path=["response"])
 
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
         async with async_client.pages.projects.with_streaming_response.edit(
             project_name="this-is-my-project-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={
-                "deployment_configs": {
-                    "production": {
-                        "compatibility_date": "2022-01-01",
-                        "compatibility_flags": ["url_standard"],
-                        "env_vars": {
-                            "BUILD_VERSION": {"value": "3.3"},
-                            "delete_this_env_var": None,
-                            "secret_var": {
-                                "type": "secret_text",
-                                "value": "A_CMS_API_TOKEN",
-                            },
-                        },
-                    }
-                }
-            },
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             project = await response.parse()
-            assert_matches_type(ProjectEditResponse, project, path=["response"])
+            assert_matches_type(Project, project, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -765,44 +960,12 @@ async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
             await async_client.pages.projects.with_raw_response.edit(
                 project_name="this-is-my-project-01",
                 account_id="",
-                body={
-                    "deployment_configs": {
-                        "production": {
-                            "compatibility_date": "2022-01-01",
-                            "compatibility_flags": ["url_standard"],
-                            "env_vars": {
-                                "BUILD_VERSION": {"value": "3.3"},
-                                "delete_this_env_var": None,
-                                "secret_var": {
-                                    "type": "secret_text",
-                                    "value": "A_CMS_API_TOKEN",
-                                },
-                            },
-                        }
-                    }
-                },
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `project_name` but received ''"):
             await async_client.pages.projects.with_raw_response.edit(
                 project_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={
-                    "deployment_configs": {
-                        "production": {
-                            "compatibility_date": "2022-01-01",
-                            "compatibility_flags": ["url_standard"],
-                            "env_vars": {
-                                "BUILD_VERSION": {"value": "3.3"},
-                                "delete_this_env_var": None,
-                                "secret_var": {
-                                    "type": "secret_text",
-                                    "value": "A_CMS_API_TOKEN",
-                                },
-                            },
-                        }
-                    }
-                },
             )
 
     @parametrize
diff --git a/tests/api_resources/pipelines/__init__.py b/tests/api_resources/pipelines/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/pipelines/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/pipelines/test_sinks.py b/tests/api_resources/pipelines/test_sinks.py
new file mode 100644
index 00000000000..23610e9dea3
--- /dev/null
+++ b/tests/api_resources/pipelines/test_sinks.py
@@ -0,0 +1,535 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.pipelines import (
+    SinkGetResponse,
+    SinkListResponse,
+    SinkCreateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSinks:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        sink = client.pipelines.sinks.create(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_sink",
+            type="r2",
+        )
+        assert_matches_type(SinkCreateResponse, sink, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        sink = client.pipelines.sinks.create(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_sink",
+            type="r2",
+            config={
+                "account_id": "account_id",
+                "bucket": "bucket",
+                "credentials": {
+                    "access_key_id": "access_key_id",
+                    "secret_access_key": "secret_access_key",
+                },
+                "file_naming": {
+                    "prefix": "prefix",
+                    "strategy": "serial",
+                    "suffix": "suffix",
+                },
+                "jurisdiction": "jurisdiction",
+                "partitioning": {"time_pattern": "year=%Y/month=%m/day=%d/hour=%H"},
+                "path": "path",
+                "rolling_policy": {
+                    "file_size_bytes": 0,
+                    "inactivity_seconds": 1,
+                    "interval_seconds": 1,
+                },
+            },
+            format={
+                "type": "json",
+                "decimal_encoding": "number",
+                "timestamp_format": "rfc3339",
+                "unstructured": True,
+            },
+            schema={
+                "fields": [
+                    {
+                        "type": "int32",
+                        "metadata_key": "metadata_key",
+                        "name": "name",
+                        "required": True,
+                        "sql_name": "sql_name",
+                    }
+                ],
+                "format": {
+                    "type": "json",
+                    "decimal_encoding": "number",
+                    "timestamp_format": "rfc3339",
+                    "unstructured": True,
+                },
+                "inferred": True,
+            },
+        )
+        assert_matches_type(SinkCreateResponse, sink, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.pipelines.sinks.with_raw_response.create(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_sink",
+            type="r2",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sink = response.parse()
+        assert_matches_type(SinkCreateResponse, sink, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.pipelines.sinks.with_streaming_response.create(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_sink",
+            type="r2",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sink = response.parse()
+            assert_matches_type(SinkCreateResponse, sink, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.pipelines.sinks.with_raw_response.create(
+                account_id="",
+                name="my_sink",
+                type="r2",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        sink = client.pipelines.sinks.list(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[SinkListResponse], sink, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        sink = client.pipelines.sinks.list(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=0,
+            pipeline_id="pipeline_id",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[SinkListResponse], sink, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.pipelines.sinks.with_raw_response.list(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sink = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[SinkListResponse], sink, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.pipelines.sinks.with_streaming_response.list(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sink = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[SinkListResponse], sink, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.pipelines.sinks.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        sink = client.pipelines.sinks.delete(
+            sink_id="0223105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert sink is None
+
+    @parametrize
+    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
+        sink = client.pipelines.sinks.delete(
+            sink_id="0223105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            force="force",
+        )
+        assert sink is None
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.pipelines.sinks.with_raw_response.delete(
+            sink_id="0223105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sink = response.parse()
+        assert sink is None
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.pipelines.sinks.with_streaming_response.delete(
+            sink_id="0223105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sink = response.parse()
+            assert sink is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.pipelines.sinks.with_raw_response.delete(
+                sink_id="0223105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sink_id` but received ''"):
+            client.pipelines.sinks.with_raw_response.delete(
+                sink_id="",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        sink = client.pipelines.sinks.get(
+            sink_id="0223105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SinkGetResponse, sink, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.pipelines.sinks.with_raw_response.get(
+            sink_id="0223105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sink = response.parse()
+        assert_matches_type(SinkGetResponse, sink, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.pipelines.sinks.with_streaming_response.get(
+            sink_id="0223105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sink = response.parse()
+            assert_matches_type(SinkGetResponse, sink, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.pipelines.sinks.with_raw_response.get(
+                sink_id="0223105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sink_id` but received ''"):
+            client.pipelines.sinks.with_raw_response.get(
+                sink_id="",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncSinks:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        sink = await async_client.pipelines.sinks.create(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_sink",
+            type="r2",
+        )
+        assert_matches_type(SinkCreateResponse, sink, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        sink = await async_client.pipelines.sinks.create(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_sink",
+            type="r2",
+            config={
+                "account_id": "account_id",
+                "bucket": "bucket",
+                "credentials": {
+                    "access_key_id": "access_key_id",
+                    "secret_access_key": "secret_access_key",
+                },
+                "file_naming": {
+                    "prefix": "prefix",
+                    "strategy": "serial",
+                    "suffix": "suffix",
+                },
+                "jurisdiction": "jurisdiction",
+                "partitioning": {"time_pattern": "year=%Y/month=%m/day=%d/hour=%H"},
+                "path": "path",
+                "rolling_policy": {
+                    "file_size_bytes": 0,
+                    "inactivity_seconds": 1,
+                    "interval_seconds": 1,
+                },
+            },
+            format={
+                "type": "json",
+                "decimal_encoding": "number",
+                "timestamp_format": "rfc3339",
+                "unstructured": True,
+            },
+            schema={
+                "fields": [
+                    {
+                        "type": "int32",
+                        "metadata_key": "metadata_key",
+                        "name": "name",
+                        "required": True,
+                        "sql_name": "sql_name",
+                    }
+                ],
+                "format": {
+                    "type": "json",
+                    "decimal_encoding": "number",
+                    "timestamp_format": "rfc3339",
+                    "unstructured": True,
+                },
+                "inferred": True,
+            },
+        )
+        assert_matches_type(SinkCreateResponse, sink, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.pipelines.sinks.with_raw_response.create(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_sink",
+            type="r2",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sink = await response.parse()
+        assert_matches_type(SinkCreateResponse, sink, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.pipelines.sinks.with_streaming_response.create(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_sink",
+            type="r2",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sink = await response.parse()
+            assert_matches_type(SinkCreateResponse, sink, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.pipelines.sinks.with_raw_response.create(
+                account_id="",
+                name="my_sink",
+                type="r2",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        sink = await async_client.pipelines.sinks.list(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[SinkListResponse], sink, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        sink = await async_client.pipelines.sinks.list(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=0,
+            pipeline_id="pipeline_id",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[SinkListResponse], sink, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.pipelines.sinks.with_raw_response.list(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sink = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[SinkListResponse], sink, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.pipelines.sinks.with_streaming_response.list(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sink = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[SinkListResponse], sink, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.pipelines.sinks.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        sink = await async_client.pipelines.sinks.delete(
+            sink_id="0223105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert sink is None
+
+    @parametrize
+    async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        sink = await async_client.pipelines.sinks.delete(
+            sink_id="0223105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            force="force",
+        )
+        assert sink is None
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.pipelines.sinks.with_raw_response.delete(
+            sink_id="0223105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sink = await response.parse()
+        assert sink is None
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.pipelines.sinks.with_streaming_response.delete(
+            sink_id="0223105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sink = await response.parse()
+            assert sink is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.pipelines.sinks.with_raw_response.delete(
+                sink_id="0223105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sink_id` but received ''"):
+            await async_client.pipelines.sinks.with_raw_response.delete(
+                sink_id="",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        sink = await async_client.pipelines.sinks.get(
+            sink_id="0223105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SinkGetResponse, sink, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.pipelines.sinks.with_raw_response.get(
+            sink_id="0223105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sink = await response.parse()
+        assert_matches_type(SinkGetResponse, sink, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.pipelines.sinks.with_streaming_response.get(
+            sink_id="0223105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sink = await response.parse()
+            assert_matches_type(SinkGetResponse, sink, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.pipelines.sinks.with_raw_response.get(
+                sink_id="0223105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `sink_id` but received ''"):
+            await async_client.pipelines.sinks.with_raw_response.get(
+                sink_id="",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/pipelines/test_streams.py b/tests/api_resources/pipelines/test_streams.py
new file mode 100644
index 00000000000..b2bf2e6f634
--- /dev/null
+++ b/tests/api_resources/pipelines/test_streams.py
@@ -0,0 +1,620 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.pipelines import (
+    StreamGetResponse,
+    StreamListResponse,
+    StreamCreateResponse,
+    StreamUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestStreams:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        stream = client.pipelines.streams.create(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_stream",
+        )
+        assert_matches_type(StreamCreateResponse, stream, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        stream = client.pipelines.streams.create(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_stream",
+            format={
+                "type": "json",
+                "decimal_encoding": "number",
+                "timestamp_format": "rfc3339",
+                "unstructured": True,
+            },
+            http={
+                "authentication": False,
+                "enabled": True,
+                "cors": {"origins": ["string"]},
+            },
+            schema={
+                "fields": [
+                    {
+                        "type": "int32",
+                        "metadata_key": "metadata_key",
+                        "name": "name",
+                        "required": True,
+                        "sql_name": "sql_name",
+                    }
+                ],
+                "format": {
+                    "type": "json",
+                    "decimal_encoding": "number",
+                    "timestamp_format": "rfc3339",
+                    "unstructured": True,
+                },
+                "inferred": True,
+            },
+            worker_binding={"enabled": True},
+        )
+        assert_matches_type(StreamCreateResponse, stream, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.pipelines.streams.with_raw_response.create(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_stream",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        stream = response.parse()
+        assert_matches_type(StreamCreateResponse, stream, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.pipelines.streams.with_streaming_response.create(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_stream",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            stream = response.parse()
+            assert_matches_type(StreamCreateResponse, stream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.pipelines.streams.with_raw_response.create(
+                account_id="",
+                name="my_stream",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        stream = client.pipelines.streams.update(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(StreamUpdateResponse, stream, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        stream = client.pipelines.streams.update(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            http={
+                "authentication": False,
+                "enabled": True,
+                "cors": {"origins": ["string"]},
+            },
+            worker_binding={"enabled": True},
+        )
+        assert_matches_type(StreamUpdateResponse, stream, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.pipelines.streams.with_raw_response.update(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        stream = response.parse()
+        assert_matches_type(StreamUpdateResponse, stream, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.pipelines.streams.with_streaming_response.update(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            stream = response.parse()
+            assert_matches_type(StreamUpdateResponse, stream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.pipelines.streams.with_raw_response.update(
+                stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `stream_id` but received ''"):
+            client.pipelines.streams.with_raw_response.update(
+                stream_id="",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        stream = client.pipelines.streams.list(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[StreamListResponse], stream, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        stream = client.pipelines.streams.list(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=0,
+            pipeline_id="043e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[StreamListResponse], stream, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.pipelines.streams.with_raw_response.list(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        stream = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[StreamListResponse], stream, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.pipelines.streams.with_streaming_response.list(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            stream = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[StreamListResponse], stream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.pipelines.streams.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        stream = client.pipelines.streams.delete(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert stream is None
+
+    @parametrize
+    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
+        stream = client.pipelines.streams.delete(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            force="force",
+        )
+        assert stream is None
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.pipelines.streams.with_raw_response.delete(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        stream = response.parse()
+        assert stream is None
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.pipelines.streams.with_streaming_response.delete(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            stream = response.parse()
+            assert stream is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.pipelines.streams.with_raw_response.delete(
+                stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `stream_id` but received ''"):
+            client.pipelines.streams.with_raw_response.delete(
+                stream_id="",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        stream = client.pipelines.streams.get(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(StreamGetResponse, stream, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.pipelines.streams.with_raw_response.get(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        stream = response.parse()
+        assert_matches_type(StreamGetResponse, stream, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.pipelines.streams.with_streaming_response.get(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            stream = response.parse()
+            assert_matches_type(StreamGetResponse, stream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.pipelines.streams.with_raw_response.get(
+                stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `stream_id` but received ''"):
+            client.pipelines.streams.with_raw_response.get(
+                stream_id="",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncStreams:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        stream = await async_client.pipelines.streams.create(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_stream",
+        )
+        assert_matches_type(StreamCreateResponse, stream, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        stream = await async_client.pipelines.streams.create(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_stream",
+            format={
+                "type": "json",
+                "decimal_encoding": "number",
+                "timestamp_format": "rfc3339",
+                "unstructured": True,
+            },
+            http={
+                "authentication": False,
+                "enabled": True,
+                "cors": {"origins": ["string"]},
+            },
+            schema={
+                "fields": [
+                    {
+                        "type": "int32",
+                        "metadata_key": "metadata_key",
+                        "name": "name",
+                        "required": True,
+                        "sql_name": "sql_name",
+                    }
+                ],
+                "format": {
+                    "type": "json",
+                    "decimal_encoding": "number",
+                    "timestamp_format": "rfc3339",
+                    "unstructured": True,
+                },
+                "inferred": True,
+            },
+            worker_binding={"enabled": True},
+        )
+        assert_matches_type(StreamCreateResponse, stream, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.pipelines.streams.with_raw_response.create(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_stream",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        stream = await response.parse()
+        assert_matches_type(StreamCreateResponse, stream, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.pipelines.streams.with_streaming_response.create(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_stream",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            stream = await response.parse()
+            assert_matches_type(StreamCreateResponse, stream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.pipelines.streams.with_raw_response.create(
+                account_id="",
+                name="my_stream",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        stream = await async_client.pipelines.streams.update(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(StreamUpdateResponse, stream, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        stream = await async_client.pipelines.streams.update(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            http={
+                "authentication": False,
+                "enabled": True,
+                "cors": {"origins": ["string"]},
+            },
+            worker_binding={"enabled": True},
+        )
+        assert_matches_type(StreamUpdateResponse, stream, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.pipelines.streams.with_raw_response.update(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        stream = await response.parse()
+        assert_matches_type(StreamUpdateResponse, stream, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.pipelines.streams.with_streaming_response.update(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            stream = await response.parse()
+            assert_matches_type(StreamUpdateResponse, stream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.pipelines.streams.with_raw_response.update(
+                stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `stream_id` but received ''"):
+            await async_client.pipelines.streams.with_raw_response.update(
+                stream_id="",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        stream = await async_client.pipelines.streams.list(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[StreamListResponse], stream, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        stream = await async_client.pipelines.streams.list(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=0,
+            pipeline_id="043e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[StreamListResponse], stream, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.pipelines.streams.with_raw_response.list(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        stream = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[StreamListResponse], stream, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.pipelines.streams.with_streaming_response.list(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            stream = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[StreamListResponse], stream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.pipelines.streams.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        stream = await async_client.pipelines.streams.delete(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert stream is None
+
+    @parametrize
+    async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        stream = await async_client.pipelines.streams.delete(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            force="force",
+        )
+        assert stream is None
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.pipelines.streams.with_raw_response.delete(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        stream = await response.parse()
+        assert stream is None
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.pipelines.streams.with_streaming_response.delete(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            stream = await response.parse()
+            assert stream is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.pipelines.streams.with_raw_response.delete(
+                stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `stream_id` but received ''"):
+            await async_client.pipelines.streams.with_raw_response.delete(
+                stream_id="",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        stream = await async_client.pipelines.streams.get(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(StreamGetResponse, stream, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.pipelines.streams.with_raw_response.get(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        stream = await response.parse()
+        assert_matches_type(StreamGetResponse, stream, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.pipelines.streams.with_streaming_response.get(
+            stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            stream = await response.parse()
+            assert_matches_type(StreamGetResponse, stream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.pipelines.streams.with_raw_response.get(
+                stream_id="033e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `stream_id` but received ''"):
+            await async_client.pipelines.streams.with_raw_response.get(
+                stream_id="",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/queues/test_consumers.py b/tests/api_resources/queues/test_consumers.py
index 4cca547cf8c..f6d8f1a374d 100644
--- a/tests/api_resources/queues/test_consumers.py
+++ b/tests/api_resources/queues/test_consumers.py
@@ -9,12 +9,8 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.queues import (
-    ConsumerGetResponse,
-    ConsumerCreateResponse,
-    ConsumerDeleteResponse,
-    ConsumerUpdateResponse,
-)
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.queues import Consumer, ConsumerDeleteResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -23,176 +19,275 @@ class TestConsumers:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
     @parametrize
-    def test_method_create(self, client: Cloudflare) -> None:
+    def test_method_create_overload_1(self, client: Cloudflare) -> None:
         consumer = client.queues.consumers.create(
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={
-                "dead_letter_queue": "example-dlq",
-                "environment": "production",
-                "script_name": "example-consumer",
-                "settings": {
-                    "batch_size": 10,
-                    "max_retries": 3,
-                    "max_wait_time_ms": 5000,
-                },
-                "type": "worker",
+        )
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        consumer = client.queues.consumers.create(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dead_letter_queue="example-queue",
+            script_name="my-consumer-worker",
+            settings={
+                "batch_size": 50,
+                "max_concurrency": 10,
+                "max_retries": 3,
+                "max_wait_time_ms": 5000,
+                "retry_delay": 10,
             },
+            type="worker",
         )
-        assert_matches_type(Optional[ConsumerCreateResponse], consumer, path=["response"])
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
 
     @parametrize
-    def test_raw_response_create(self, client: Cloudflare) -> None:
+    def test_raw_response_create_overload_1(self, client: Cloudflare) -> None:
         response = client.queues.consumers.with_raw_response.create(
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={
-                "dead_letter_queue": "example-dlq",
-                "environment": "production",
-                "script_name": "example-consumer",
-                "settings": {
-                    "batch_size": 10,
-                    "max_retries": 3,
-                    "max_wait_time_ms": 5000,
-                },
-                "type": "worker",
-            },
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         consumer = response.parse()
-        assert_matches_type(Optional[ConsumerCreateResponse], consumer, path=["response"])
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
 
     @parametrize
-    def test_streaming_response_create(self, client: Cloudflare) -> None:
+    def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
         with client.queues.consumers.with_streaming_response.create(
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={
-                "dead_letter_queue": "example-dlq",
-                "environment": "production",
-                "script_name": "example-consumer",
-                "settings": {
-                    "batch_size": 10,
-                    "max_retries": 3,
-                    "max_wait_time_ms": 5000,
-                },
-                "type": "worker",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            consumer = response.parse()
+            assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.queues.consumers.with_raw_response.create(
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            client.queues.consumers.with_raw_response.create(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_create_overload_2(self, client: Cloudflare) -> None:
+        consumer = client.queues.consumers.create(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        consumer = client.queues.consumers.create(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dead_letter_queue="example-queue",
+            settings={
+                "batch_size": 50,
+                "max_retries": 3,
+                "retry_delay": 10,
+                "visibility_timeout_ms": 6000,
             },
+            type="http_pull",
+        )
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
+        response = client.queues.consumers.with_raw_response.create(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        consumer = response.parse()
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
+        with client.queues.consumers.with_streaming_response.create(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             consumer = response.parse()
-            assert_matches_type(Optional[ConsumerCreateResponse], consumer, path=["response"])
+            assert_matches_type(Optional[Consumer], consumer, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    def test_path_params_create(self, client: Cloudflare) -> None:
+    def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.queues.consumers.with_raw_response.create(
                 queue_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
-                body={
-                    "dead_letter_queue": "example-dlq",
-                    "environment": "production",
-                    "script_name": "example-consumer",
-                    "settings": {
-                        "batch_size": 10,
-                        "max_retries": 3,
-                        "max_wait_time_ms": 5000,
-                    },
-                    "type": "worker",
-                },
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
             client.queues.consumers.with_raw_response.create(
                 queue_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={
-                    "dead_letter_queue": "example-dlq",
-                    "environment": "production",
-                    "script_name": "example-consumer",
-                    "settings": {
-                        "batch_size": 10,
-                        "max_retries": 3,
-                        "max_wait_time_ms": 5000,
-                    },
-                    "type": "worker",
-                },
             )
 
     @parametrize
-    def test_method_update(self, client: Cloudflare) -> None:
+    def test_method_update_overload_1(self, client: Cloudflare) -> None:
+        consumer = client.queues.consumers.update(
+            consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params_overload_1(self, client: Cloudflare) -> None:
         consumer = client.queues.consumers.update(
             consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={
-                "dead_letter_queue": "updated-example-dlq",
-                "environment": "production",
-                "script_name": "example-consumer",
-                "settings": {"batch_size": 100},
+            dead_letter_queue="example-queue",
+            script_name="my-consumer-worker",
+            settings={
+                "batch_size": 50,
+                "max_concurrency": 10,
+                "max_retries": 3,
+                "max_wait_time_ms": 5000,
+                "retry_delay": 10,
             },
+            type="worker",
         )
-        assert_matches_type(Optional[ConsumerUpdateResponse], consumer, path=["response"])
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
 
     @parametrize
-    def test_raw_response_update(self, client: Cloudflare) -> None:
+    def test_raw_response_update_overload_1(self, client: Cloudflare) -> None:
         response = client.queues.consumers.with_raw_response.update(
             consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={
-                "dead_letter_queue": "updated-example-dlq",
-                "environment": "production",
-                "script_name": "example-consumer",
-                "settings": {"batch_size": 100},
-            },
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         consumer = response.parse()
-        assert_matches_type(Optional[ConsumerUpdateResponse], consumer, path=["response"])
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
 
     @parametrize
-    def test_streaming_response_update(self, client: Cloudflare) -> None:
+    def test_streaming_response_update_overload_1(self, client: Cloudflare) -> None:
         with client.queues.consumers.with_streaming_response.update(
             consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={
-                "dead_letter_queue": "updated-example-dlq",
-                "environment": "production",
-                "script_name": "example-consumer",
-                "settings": {"batch_size": 100},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            consumer = response.parse()
+            assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.queues.consumers.with_raw_response.update(
+                consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            client.queues.consumers.with_raw_response.update(
+                consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                queue_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `consumer_id` but received ''"):
+            client.queues.consumers.with_raw_response.update(
+                consumer_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_update_overload_2(self, client: Cloudflare) -> None:
+        consumer = client.queues.consumers.update(
+            consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        consumer = client.queues.consumers.update(
+            consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dead_letter_queue="example-queue",
+            settings={
+                "batch_size": 50,
+                "max_retries": 3,
+                "retry_delay": 10,
+                "visibility_timeout_ms": 6000,
             },
+            type="http_pull",
+        )
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+    @parametrize
+    def test_raw_response_update_overload_2(self, client: Cloudflare) -> None:
+        response = client.queues.consumers.with_raw_response.update(
+            consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        consumer = response.parse()
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update_overload_2(self, client: Cloudflare) -> None:
+        with client.queues.consumers.with_streaming_response.update(
+            consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             consumer = response.parse()
-            assert_matches_type(Optional[ConsumerUpdateResponse], consumer, path=["response"])
+            assert_matches_type(Optional[Consumer], consumer, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    def test_path_params_update(self, client: Cloudflare) -> None:
+    def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.queues.consumers.with_raw_response.update(
                 consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
                 queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={
-                    "dead_letter_queue": "updated-example-dlq",
-                    "environment": "production",
-                    "script_name": "example-consumer",
-                    "settings": {"batch_size": 100},
-                },
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
@@ -200,12 +295,6 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 queue_id="",
-                body={
-                    "dead_letter_queue": "updated-example-dlq",
-                    "environment": "production",
-                    "script_name": "example-consumer",
-                    "settings": {"batch_size": 100},
-                },
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `consumer_id` but received ''"):
@@ -213,12 +302,54 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 consumer_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={
-                    "dead_letter_queue": "updated-example-dlq",
-                    "environment": "production",
-                    "script_name": "example-consumer",
-                    "settings": {"batch_size": 100},
-                },
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        consumer = client.queues.consumers.list(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[Consumer], consumer, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.queues.consumers.with_raw_response.list(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        consumer = response.parse()
+        assert_matches_type(SyncSinglePage[Consumer], consumer, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.queues.consumers.with_streaming_response.list(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            consumer = response.parse()
+            assert_matches_type(SyncSinglePage[Consumer], consumer, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.queues.consumers.with_raw_response.list(
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            client.queues.consumers.with_raw_response.list(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
@@ -228,7 +359,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ConsumerDeleteResponse], consumer, path=["response"])
+        assert_matches_type(ConsumerDeleteResponse, consumer, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -241,7 +372,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         consumer = response.parse()
-        assert_matches_type(Optional[ConsumerDeleteResponse], consumer, path=["response"])
+        assert_matches_type(ConsumerDeleteResponse, consumer, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -254,7 +385,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             consumer = response.parse()
-            assert_matches_type(Optional[ConsumerDeleteResponse], consumer, path=["response"])
+            assert_matches_type(ConsumerDeleteResponse, consumer, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -284,34 +415,37 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         consumer = client.queues.consumers.get(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ConsumerGetResponse], consumer, path=["response"])
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.queues.consumers.with_raw_response.get(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         consumer = response.parse()
-        assert_matches_type(Optional[ConsumerGetResponse], consumer, path=["response"])
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.queues.consumers.with_streaming_response.get(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             consumer = response.parse()
-            assert_matches_type(Optional[ConsumerGetResponse], consumer, path=["response"])
+            assert_matches_type(Optional[Consumer], consumer, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -319,191 +453,301 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.queues.consumers.with_raw_response.get(
-                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+                consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
             client.queues.consumers.with_raw_response.get(
+                consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 queue_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `consumer_id` but received ''"):
+            client.queues.consumers.with_raw_response.get(
+                consumer_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
 
 class TestAsyncConsumers:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
-    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
         consumer = await async_client.queues.consumers.create(
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={
-                "dead_letter_queue": "example-dlq",
-                "environment": "production",
-                "script_name": "example-consumer",
-                "settings": {
-                    "batch_size": 10,
-                    "max_retries": 3,
-                    "max_wait_time_ms": 5000,
-                },
-                "type": "worker",
+        )
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        consumer = await async_client.queues.consumers.create(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dead_letter_queue="example-queue",
+            script_name="my-consumer-worker",
+            settings={
+                "batch_size": 50,
+                "max_concurrency": 10,
+                "max_retries": 3,
+                "max_wait_time_ms": 5000,
+                "retry_delay": 10,
             },
+            type="worker",
         )
-        assert_matches_type(Optional[ConsumerCreateResponse], consumer, path=["response"])
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
 
     @parametrize
-    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.queues.consumers.with_raw_response.create(
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={
-                "dead_letter_queue": "example-dlq",
-                "environment": "production",
-                "script_name": "example-consumer",
-                "settings": {
-                    "batch_size": 10,
-                    "max_retries": 3,
-                    "max_wait_time_ms": 5000,
-                },
-                "type": "worker",
-            },
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         consumer = await response.parse()
-        assert_matches_type(Optional[ConsumerCreateResponse], consumer, path=["response"])
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
 
     @parametrize
-    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
         async with async_client.queues.consumers.with_streaming_response.create(
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={
-                "dead_letter_queue": "example-dlq",
-                "environment": "production",
-                "script_name": "example-consumer",
-                "settings": {
-                    "batch_size": 10,
-                    "max_retries": 3,
-                    "max_wait_time_ms": 5000,
-                },
-                "type": "worker",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            consumer = await response.parse()
+            assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.queues.consumers.with_raw_response.create(
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            await async_client.queues.consumers.with_raw_response.create(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        consumer = await async_client.queues.consumers.create(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        consumer = await async_client.queues.consumers.create(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dead_letter_queue="example-queue",
+            settings={
+                "batch_size": 50,
+                "max_retries": 3,
+                "retry_delay": 10,
+                "visibility_timeout_ms": 6000,
             },
+            type="http_pull",
+        )
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.queues.consumers.with_raw_response.create(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        consumer = await response.parse()
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.queues.consumers.with_streaming_response.create(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             consumer = await response.parse()
-            assert_matches_type(Optional[ConsumerCreateResponse], consumer, path=["response"])
+            assert_matches_type(Optional[Consumer], consumer, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.queues.consumers.with_raw_response.create(
                 queue_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
-                body={
-                    "dead_letter_queue": "example-dlq",
-                    "environment": "production",
-                    "script_name": "example-consumer",
-                    "settings": {
-                        "batch_size": 10,
-                        "max_retries": 3,
-                        "max_wait_time_ms": 5000,
-                    },
-                    "type": "worker",
-                },
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
             await async_client.queues.consumers.with_raw_response.create(
                 queue_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={
-                    "dead_letter_queue": "example-dlq",
-                    "environment": "production",
-                    "script_name": "example-consumer",
-                    "settings": {
-                        "batch_size": 10,
-                        "max_retries": 3,
-                        "max_wait_time_ms": 5000,
-                    },
-                    "type": "worker",
-                },
             )
 
     @parametrize
-    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        consumer = await async_client.queues.consumers.update(
+            consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
         consumer = await async_client.queues.consumers.update(
             consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={
-                "dead_letter_queue": "updated-example-dlq",
-                "environment": "production",
-                "script_name": "example-consumer",
-                "settings": {"batch_size": 100},
+            dead_letter_queue="example-queue",
+            script_name="my-consumer-worker",
+            settings={
+                "batch_size": 50,
+                "max_concurrency": 10,
+                "max_retries": 3,
+                "max_wait_time_ms": 5000,
+                "retry_delay": 10,
             },
+            type="worker",
         )
-        assert_matches_type(Optional[ConsumerUpdateResponse], consumer, path=["response"])
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
 
     @parametrize
-    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.queues.consumers.with_raw_response.update(
             consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={
-                "dead_letter_queue": "updated-example-dlq",
-                "environment": "production",
-                "script_name": "example-consumer",
-                "settings": {"batch_size": 100},
-            },
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         consumer = await response.parse()
-        assert_matches_type(Optional[ConsumerUpdateResponse], consumer, path=["response"])
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
 
     @parametrize
-    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
         async with async_client.queues.consumers.with_streaming_response.update(
             consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={
-                "dead_letter_queue": "updated-example-dlq",
-                "environment": "production",
-                "script_name": "example-consumer",
-                "settings": {"batch_size": 100},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            consumer = await response.parse()
+            assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.queues.consumers.with_raw_response.update(
+                consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            await async_client.queues.consumers.with_raw_response.update(
+                consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                queue_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `consumer_id` but received ''"):
+            await async_client.queues.consumers.with_raw_response.update(
+                consumer_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        consumer = await async_client.queues.consumers.update(
+            consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        consumer = await async_client.queues.consumers.update(
+            consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dead_letter_queue="example-queue",
+            settings={
+                "batch_size": 50,
+                "max_retries": 3,
+                "retry_delay": 10,
+                "visibility_timeout_ms": 6000,
             },
+            type="http_pull",
+        )
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.queues.consumers.with_raw_response.update(
+            consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        consumer = await response.parse()
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.queues.consumers.with_streaming_response.update(
+            consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             consumer = await response.parse()
-            assert_matches_type(Optional[ConsumerUpdateResponse], consumer, path=["response"])
+            assert_matches_type(Optional[Consumer], consumer, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.queues.consumers.with_raw_response.update(
                 consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
                 queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={
-                    "dead_letter_queue": "updated-example-dlq",
-                    "environment": "production",
-                    "script_name": "example-consumer",
-                    "settings": {"batch_size": 100},
-                },
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
@@ -511,12 +755,6 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 queue_id="",
-                body={
-                    "dead_letter_queue": "updated-example-dlq",
-                    "environment": "production",
-                    "script_name": "example-consumer",
-                    "settings": {"batch_size": 100},
-                },
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `consumer_id` but received ''"):
@@ -524,12 +762,54 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 consumer_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 queue_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={
-                    "dead_letter_queue": "updated-example-dlq",
-                    "environment": "production",
-                    "script_name": "example-consumer",
-                    "settings": {"batch_size": 100},
-                },
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        consumer = await async_client.queues.consumers.list(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[Consumer], consumer, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.queues.consumers.with_raw_response.list(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        consumer = await response.parse()
+        assert_matches_type(AsyncSinglePage[Consumer], consumer, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.queues.consumers.with_streaming_response.list(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            consumer = await response.parse()
+            assert_matches_type(AsyncSinglePage[Consumer], consumer, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.queues.consumers.with_raw_response.list(
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            await async_client.queues.consumers.with_raw_response.list(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
@@ -539,7 +819,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ConsumerDeleteResponse], consumer, path=["response"])
+        assert_matches_type(ConsumerDeleteResponse, consumer, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -552,7 +832,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         consumer = await response.parse()
-        assert_matches_type(Optional[ConsumerDeleteResponse], consumer, path=["response"])
+        assert_matches_type(ConsumerDeleteResponse, consumer, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -565,7 +845,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             consumer = await response.parse()
-            assert_matches_type(Optional[ConsumerDeleteResponse], consumer, path=["response"])
+            assert_matches_type(ConsumerDeleteResponse, consumer, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -595,34 +875,37 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         consumer = await async_client.queues.consumers.get(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ConsumerGetResponse], consumer, path=["response"])
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.queues.consumers.with_raw_response.get(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         consumer = await response.parse()
-        assert_matches_type(Optional[ConsumerGetResponse], consumer, path=["response"])
+        assert_matches_type(Optional[Consumer], consumer, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.queues.consumers.with_streaming_response.get(
-            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             consumer = await response.parse()
-            assert_matches_type(Optional[ConsumerGetResponse], consumer, path=["response"])
+            assert_matches_type(Optional[Consumer], consumer, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -630,12 +913,21 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.queues.consumers.with_raw_response.get(
-                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+                consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
             await async_client.queues.consumers.with_raw_response.get(
+                consumer_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 queue_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `consumer_id` but received ''"):
+            await async_client.queues.consumers.with_raw_response.get(
+                consumer_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/queues/test_messages.py b/tests/api_resources/queues/test_messages.py
index 6052877da88..f53b6239ae1 100644
--- a/tests/api_resources/queues/test_messages.py
+++ b/tests/api_resources/queues/test_messages.py
@@ -9,7 +9,12 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.queues import MessageAckResponse, MessagePullResponse
+from cloudflare.types.queues import (
+    MessageAckResponse,
+    MessagePullResponse,
+    MessagePushResponse,
+    MessageBulkPushResponse,
+)
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -33,27 +38,13 @@ def test_method_ack_with_all_params(self, client: Cloudflare) -> None:
             acks=[
                 {
                     "lease_id": "eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..Q8p21d7dceR6vUfwftONdQ.JVqZgAS-Zk7MqmqccYtTHeeMElNHaOMigeWdb8LyMOg.T2_HV99CYzGaQuhTyW8RsgbnpTRZHRM6N7UoSaAKeK0"
-                },
-                {
-                    "lease_id": "eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..Q8p21d7dceR6vUfwftONdQ.JVqZgAS-Zk7MqmqccYtTHeeMElNHaOMigeWdb8LyMOg.T2_HV99CYzGaQuhTyW8RsgbnpTRZHRM6N7UoSaAKeK0"
-                },
-                {
-                    "lease_id": "eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..Q8p21d7dceR6vUfwftONdQ.JVqZgAS-Zk7MqmqccYtTHeeMElNHaOMigeWdb8LyMOg.T2_HV99CYzGaQuhTyW8RsgbnpTRZHRM6N7UoSaAKeK0"
-                },
+                }
             ],
             retries=[
                 {
                     "delay_seconds": 10,
                     "lease_id": "eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..Q8p21d7dceR6vUfwftONdQ.JVqZgAS-Zk7MqmqccYtTHeeMElNHaOMigeWdb8LyMOg.T2_HV99CYzGaQuhTyW8RsgbnpTRZHRM6N7UoSaAKeK0",
-                },
-                {
-                    "delay_seconds": 10,
-                    "lease_id": "eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..Q8p21d7dceR6vUfwftONdQ.JVqZgAS-Zk7MqmqccYtTHeeMElNHaOMigeWdb8LyMOg.T2_HV99CYzGaQuhTyW8RsgbnpTRZHRM6N7UoSaAKeK0",
-                },
-                {
-                    "delay_seconds": 10,
-                    "lease_id": "eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..Q8p21d7dceR6vUfwftONdQ.JVqZgAS-Zk7MqmqccYtTHeeMElNHaOMigeWdb8LyMOg.T2_HV99CYzGaQuhTyW8RsgbnpTRZHRM6N7UoSaAKeK0",
-                },
+                }
             ],
         )
         assert_matches_type(Optional[MessageAckResponse], message, path=["response"])
@@ -98,6 +89,70 @@ def test_path_params_ack(self, client: Cloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @parametrize
+    def test_method_bulk_push(self, client: Cloudflare) -> None:
+        message = client.queues.messages.bulk_push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(MessageBulkPushResponse, message, path=["response"])
+
+    @parametrize
+    def test_method_bulk_push_with_all_params(self, client: Cloudflare) -> None:
+        message = client.queues.messages.bulk_push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            delay_seconds=0,
+            messages=[
+                {
+                    "body": "body",
+                    "content_type": "text",
+                    "delay_seconds": 0,
+                }
+            ],
+        )
+        assert_matches_type(MessageBulkPushResponse, message, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_push(self, client: Cloudflare) -> None:
+        response = client.queues.messages.with_raw_response.bulk_push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        message = response.parse()
+        assert_matches_type(MessageBulkPushResponse, message, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_push(self, client: Cloudflare) -> None:
+        with client.queues.messages.with_streaming_response.bulk_push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            message = response.parse()
+            assert_matches_type(MessageBulkPushResponse, message, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_push(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.queues.messages.with_raw_response.bulk_push(
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            client.queues.messages.with_raw_response.bulk_push(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
     @parametrize
     def test_method_pull(self, client: Cloudflare) -> None:
         message = client.queues.messages.pull(
@@ -111,8 +166,8 @@ def test_method_pull_with_all_params(self, client: Cloudflare) -> None:
         message = client.queues.messages.pull(
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            batch_size=10,
-            visibility_timeout_ms=1000,
+            batch_size=50,
+            visibility_timeout_ms=6000,
         )
         assert_matches_type(Optional[MessagePullResponse], message, path=["response"])
 
@@ -156,9 +211,129 @@ def test_path_params_pull(self, client: Cloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @parametrize
+    def test_method_push_overload_1(self, client: Cloudflare) -> None:
+        message = client.queues.messages.push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(MessagePushResponse, message, path=["response"])
+
+    @parametrize
+    def test_method_push_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        message = client.queues.messages.push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body="body",
+            content_type="text",
+            delay_seconds=0,
+        )
+        assert_matches_type(MessagePushResponse, message, path=["response"])
+
+    @parametrize
+    def test_raw_response_push_overload_1(self, client: Cloudflare) -> None:
+        response = client.queues.messages.with_raw_response.push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        message = response.parse()
+        assert_matches_type(MessagePushResponse, message, path=["response"])
+
+    @parametrize
+    def test_streaming_response_push_overload_1(self, client: Cloudflare) -> None:
+        with client.queues.messages.with_streaming_response.push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            message = response.parse()
+            assert_matches_type(MessagePushResponse, message, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_push_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.queues.messages.with_raw_response.push(
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            client.queues.messages.with_raw_response.push(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_push_overload_2(self, client: Cloudflare) -> None:
+        message = client.queues.messages.push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(MessagePushResponse, message, path=["response"])
+
+    @parametrize
+    def test_method_push_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        message = client.queues.messages.push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+            content_type="json",
+            delay_seconds=0,
+        )
+        assert_matches_type(MessagePushResponse, message, path=["response"])
+
+    @parametrize
+    def test_raw_response_push_overload_2(self, client: Cloudflare) -> None:
+        response = client.queues.messages.with_raw_response.push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        message = response.parse()
+        assert_matches_type(MessagePushResponse, message, path=["response"])
+
+    @parametrize
+    def test_streaming_response_push_overload_2(self, client: Cloudflare) -> None:
+        with client.queues.messages.with_streaming_response.push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            message = response.parse()
+            assert_matches_type(MessagePushResponse, message, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_push_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.queues.messages.with_raw_response.push(
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            client.queues.messages.with_raw_response.push(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
 
 class TestAsyncMessages:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_ack(self, async_client: AsyncCloudflare) -> None:
@@ -176,27 +351,13 @@ async def test_method_ack_with_all_params(self, async_client: AsyncCloudflare) -
             acks=[
                 {
                     "lease_id": "eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..Q8p21d7dceR6vUfwftONdQ.JVqZgAS-Zk7MqmqccYtTHeeMElNHaOMigeWdb8LyMOg.T2_HV99CYzGaQuhTyW8RsgbnpTRZHRM6N7UoSaAKeK0"
-                },
-                {
-                    "lease_id": "eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..Q8p21d7dceR6vUfwftONdQ.JVqZgAS-Zk7MqmqccYtTHeeMElNHaOMigeWdb8LyMOg.T2_HV99CYzGaQuhTyW8RsgbnpTRZHRM6N7UoSaAKeK0"
-                },
-                {
-                    "lease_id": "eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..Q8p21d7dceR6vUfwftONdQ.JVqZgAS-Zk7MqmqccYtTHeeMElNHaOMigeWdb8LyMOg.T2_HV99CYzGaQuhTyW8RsgbnpTRZHRM6N7UoSaAKeK0"
-                },
+                }
             ],
             retries=[
                 {
                     "delay_seconds": 10,
                     "lease_id": "eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..Q8p21d7dceR6vUfwftONdQ.JVqZgAS-Zk7MqmqccYtTHeeMElNHaOMigeWdb8LyMOg.T2_HV99CYzGaQuhTyW8RsgbnpTRZHRM6N7UoSaAKeK0",
-                },
-                {
-                    "delay_seconds": 10,
-                    "lease_id": "eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..Q8p21d7dceR6vUfwftONdQ.JVqZgAS-Zk7MqmqccYtTHeeMElNHaOMigeWdb8LyMOg.T2_HV99CYzGaQuhTyW8RsgbnpTRZHRM6N7UoSaAKeK0",
-                },
-                {
-                    "delay_seconds": 10,
-                    "lease_id": "eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..Q8p21d7dceR6vUfwftONdQ.JVqZgAS-Zk7MqmqccYtTHeeMElNHaOMigeWdb8LyMOg.T2_HV99CYzGaQuhTyW8RsgbnpTRZHRM6N7UoSaAKeK0",
-                },
+                }
             ],
         )
         assert_matches_type(Optional[MessageAckResponse], message, path=["response"])
@@ -241,6 +402,70 @@ async def test_path_params_ack(self, async_client: AsyncCloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @parametrize
+    async def test_method_bulk_push(self, async_client: AsyncCloudflare) -> None:
+        message = await async_client.queues.messages.bulk_push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(MessageBulkPushResponse, message, path=["response"])
+
+    @parametrize
+    async def test_method_bulk_push_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        message = await async_client.queues.messages.bulk_push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            delay_seconds=0,
+            messages=[
+                {
+                    "body": "body",
+                    "content_type": "text",
+                    "delay_seconds": 0,
+                }
+            ],
+        )
+        assert_matches_type(MessageBulkPushResponse, message, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_push(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.queues.messages.with_raw_response.bulk_push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        message = await response.parse()
+        assert_matches_type(MessageBulkPushResponse, message, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_push(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.queues.messages.with_streaming_response.bulk_push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            message = await response.parse()
+            assert_matches_type(MessageBulkPushResponse, message, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_push(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.queues.messages.with_raw_response.bulk_push(
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            await async_client.queues.messages.with_raw_response.bulk_push(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
     @parametrize
     async def test_method_pull(self, async_client: AsyncCloudflare) -> None:
         message = await async_client.queues.messages.pull(
@@ -254,8 +479,8 @@ async def test_method_pull_with_all_params(self, async_client: AsyncCloudflare)
         message = await async_client.queues.messages.pull(
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            batch_size=10,
-            visibility_timeout_ms=1000,
+            batch_size=50,
+            visibility_timeout_ms=6000,
         )
         assert_matches_type(Optional[MessagePullResponse], message, path=["response"])
 
@@ -298,3 +523,121 @@ async def test_path_params_pull(self, async_client: AsyncCloudflare) -> None:
                 queue_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
+
+    @parametrize
+    async def test_method_push_overload_1(self, async_client: AsyncCloudflare) -> None:
+        message = await async_client.queues.messages.push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(MessagePushResponse, message, path=["response"])
+
+    @parametrize
+    async def test_method_push_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        message = await async_client.queues.messages.push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body="body",
+            content_type="text",
+            delay_seconds=0,
+        )
+        assert_matches_type(MessagePushResponse, message, path=["response"])
+
+    @parametrize
+    async def test_raw_response_push_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.queues.messages.with_raw_response.push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        message = await response.parse()
+        assert_matches_type(MessagePushResponse, message, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_push_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.queues.messages.with_streaming_response.push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            message = await response.parse()
+            assert_matches_type(MessagePushResponse, message, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_push_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.queues.messages.with_raw_response.push(
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            await async_client.queues.messages.with_raw_response.push(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_push_overload_2(self, async_client: AsyncCloudflare) -> None:
+        message = await async_client.queues.messages.push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(MessagePushResponse, message, path=["response"])
+
+    @parametrize
+    async def test_method_push_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        message = await async_client.queues.messages.push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={},
+            content_type="json",
+            delay_seconds=0,
+        )
+        assert_matches_type(MessagePushResponse, message, path=["response"])
+
+    @parametrize
+    async def test_raw_response_push_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.queues.messages.with_raw_response.push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        message = await response.parse()
+        assert_matches_type(MessagePushResponse, message, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_push_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.queues.messages.with_streaming_response.push(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            message = await response.parse()
+            assert_matches_type(MessagePushResponse, message, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_push_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.queues.messages.with_raw_response.push(
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            await async_client.queues.messages.with_raw_response.push(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/queues/test_purge.py b/tests/api_resources/queues/test_purge.py
new file mode 100644
index 00000000000..3148148bfb7
--- /dev/null
+++ b/tests/api_resources/queues/test_purge.py
@@ -0,0 +1,234 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.queues import Queue, PurgeStatusResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestPurge:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_start(self, client: Cloudflare) -> None:
+        purge = client.queues.purge.start(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[Queue], purge, path=["response"])
+
+    @parametrize
+    def test_method_start_with_all_params(self, client: Cloudflare) -> None:
+        purge = client.queues.purge.start(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            delete_messages_permanently=True,
+        )
+        assert_matches_type(Optional[Queue], purge, path=["response"])
+
+    @parametrize
+    def test_raw_response_start(self, client: Cloudflare) -> None:
+        response = client.queues.purge.with_raw_response.start(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        purge = response.parse()
+        assert_matches_type(Optional[Queue], purge, path=["response"])
+
+    @parametrize
+    def test_streaming_response_start(self, client: Cloudflare) -> None:
+        with client.queues.purge.with_streaming_response.start(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            purge = response.parse()
+            assert_matches_type(Optional[Queue], purge, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_start(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.queues.purge.with_raw_response.start(
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            client.queues.purge.with_raw_response.start(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_status(self, client: Cloudflare) -> None:
+        purge = client.queues.purge.status(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[PurgeStatusResponse], purge, path=["response"])
+
+    @parametrize
+    def test_raw_response_status(self, client: Cloudflare) -> None:
+        response = client.queues.purge.with_raw_response.status(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        purge = response.parse()
+        assert_matches_type(Optional[PurgeStatusResponse], purge, path=["response"])
+
+    @parametrize
+    def test_streaming_response_status(self, client: Cloudflare) -> None:
+        with client.queues.purge.with_streaming_response.status(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            purge = response.parse()
+            assert_matches_type(Optional[PurgeStatusResponse], purge, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_status(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.queues.purge.with_raw_response.status(
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            client.queues.purge.with_raw_response.status(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncPurge:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_start(self, async_client: AsyncCloudflare) -> None:
+        purge = await async_client.queues.purge.start(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[Queue], purge, path=["response"])
+
+    @parametrize
+    async def test_method_start_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        purge = await async_client.queues.purge.start(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            delete_messages_permanently=True,
+        )
+        assert_matches_type(Optional[Queue], purge, path=["response"])
+
+    @parametrize
+    async def test_raw_response_start(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.queues.purge.with_raw_response.start(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        purge = await response.parse()
+        assert_matches_type(Optional[Queue], purge, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_start(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.queues.purge.with_streaming_response.start(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            purge = await response.parse()
+            assert_matches_type(Optional[Queue], purge, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_start(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.queues.purge.with_raw_response.start(
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            await async_client.queues.purge.with_raw_response.start(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_status(self, async_client: AsyncCloudflare) -> None:
+        purge = await async_client.queues.purge.status(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[PurgeStatusResponse], purge, path=["response"])
+
+    @parametrize
+    async def test_raw_response_status(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.queues.purge.with_raw_response.status(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        purge = await response.parse()
+        assert_matches_type(Optional[PurgeStatusResponse], purge, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_status(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.queues.purge.with_streaming_response.status(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            purge = await response.parse()
+            assert_matches_type(Optional[PurgeStatusResponse], purge, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_status(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.queues.purge.with_raw_response.status(
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            await async_client.queues.purge.with_raw_response.status(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/queues/test_subscriptions.py b/tests/api_resources/queues/test_subscriptions.py
new file mode 100644
index 00000000000..33cb45a5e4b
--- /dev/null
+++ b/tests/api_resources/queues/test_subscriptions.py
@@ -0,0 +1,553 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.queues import (
+    SubscriptionGetResponse,
+    SubscriptionListResponse,
+    SubscriptionCreateResponse,
+    SubscriptionDeleteResponse,
+    SubscriptionUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSubscriptions:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        subscription = client.queues.subscriptions.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SubscriptionCreateResponse], subscription, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        subscription = client.queues.subscriptions.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination={
+                "queue_id": "queue_id",
+                "type": "queues.queue",
+            },
+            enabled=True,
+            events=["string"],
+            name="name",
+            source={"type": "images"},
+        )
+        assert_matches_type(Optional[SubscriptionCreateResponse], subscription, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.queues.subscriptions.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subscription = response.parse()
+        assert_matches_type(Optional[SubscriptionCreateResponse], subscription, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.queues.subscriptions.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subscription = response.parse()
+            assert_matches_type(Optional[SubscriptionCreateResponse], subscription, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.queues.subscriptions.with_raw_response.create(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        subscription = client.queues.subscriptions.update(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SubscriptionUpdateResponse], subscription, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        subscription = client.queues.subscriptions.update(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination={
+                "queue_id": "queue_id",
+                "type": "queues.queue",
+            },
+            enabled=True,
+            events=["string"],
+            name="name",
+        )
+        assert_matches_type(Optional[SubscriptionUpdateResponse], subscription, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.queues.subscriptions.with_raw_response.update(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subscription = response.parse()
+        assert_matches_type(Optional[SubscriptionUpdateResponse], subscription, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.queues.subscriptions.with_streaming_response.update(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subscription = response.parse()
+            assert_matches_type(Optional[SubscriptionUpdateResponse], subscription, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.queues.subscriptions.with_raw_response.update(
+                subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `subscription_id` but received ''"):
+            client.queues.subscriptions.with_raw_response.update(
+                subscription_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        subscription = client.queues.subscriptions.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[SubscriptionListResponse], subscription, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        subscription = client.queues.subscriptions.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="asc",
+            order="created_at",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[SubscriptionListResponse], subscription, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.queues.subscriptions.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subscription = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[SubscriptionListResponse], subscription, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.queues.subscriptions.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subscription = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[SubscriptionListResponse], subscription, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.queues.subscriptions.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        subscription = client.queues.subscriptions.delete(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SubscriptionDeleteResponse], subscription, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.queues.subscriptions.with_raw_response.delete(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subscription = response.parse()
+        assert_matches_type(Optional[SubscriptionDeleteResponse], subscription, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.queues.subscriptions.with_streaming_response.delete(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subscription = response.parse()
+            assert_matches_type(Optional[SubscriptionDeleteResponse], subscription, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.queues.subscriptions.with_raw_response.delete(
+                subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `subscription_id` but received ''"):
+            client.queues.subscriptions.with_raw_response.delete(
+                subscription_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        subscription = client.queues.subscriptions.get(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SubscriptionGetResponse], subscription, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.queues.subscriptions.with_raw_response.get(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subscription = response.parse()
+        assert_matches_type(Optional[SubscriptionGetResponse], subscription, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.queues.subscriptions.with_streaming_response.get(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subscription = response.parse()
+            assert_matches_type(Optional[SubscriptionGetResponse], subscription, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.queues.subscriptions.with_raw_response.get(
+                subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `subscription_id` but received ''"):
+            client.queues.subscriptions.with_raw_response.get(
+                subscription_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncSubscriptions:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        subscription = await async_client.queues.subscriptions.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SubscriptionCreateResponse], subscription, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        subscription = await async_client.queues.subscriptions.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination={
+                "queue_id": "queue_id",
+                "type": "queues.queue",
+            },
+            enabled=True,
+            events=["string"],
+            name="name",
+            source={"type": "images"},
+        )
+        assert_matches_type(Optional[SubscriptionCreateResponse], subscription, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.queues.subscriptions.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subscription = await response.parse()
+        assert_matches_type(Optional[SubscriptionCreateResponse], subscription, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.queues.subscriptions.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subscription = await response.parse()
+            assert_matches_type(Optional[SubscriptionCreateResponse], subscription, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.queues.subscriptions.with_raw_response.create(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        subscription = await async_client.queues.subscriptions.update(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SubscriptionUpdateResponse], subscription, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        subscription = await async_client.queues.subscriptions.update(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination={
+                "queue_id": "queue_id",
+                "type": "queues.queue",
+            },
+            enabled=True,
+            events=["string"],
+            name="name",
+        )
+        assert_matches_type(Optional[SubscriptionUpdateResponse], subscription, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.queues.subscriptions.with_raw_response.update(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subscription = await response.parse()
+        assert_matches_type(Optional[SubscriptionUpdateResponse], subscription, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.queues.subscriptions.with_streaming_response.update(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subscription = await response.parse()
+            assert_matches_type(Optional[SubscriptionUpdateResponse], subscription, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.queues.subscriptions.with_raw_response.update(
+                subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `subscription_id` but received ''"):
+            await async_client.queues.subscriptions.with_raw_response.update(
+                subscription_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        subscription = await async_client.queues.subscriptions.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[SubscriptionListResponse], subscription, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        subscription = await async_client.queues.subscriptions.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="asc",
+            order="created_at",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[SubscriptionListResponse], subscription, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.queues.subscriptions.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subscription = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[SubscriptionListResponse], subscription, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.queues.subscriptions.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subscription = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[SubscriptionListResponse], subscription, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.queues.subscriptions.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        subscription = await async_client.queues.subscriptions.delete(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SubscriptionDeleteResponse], subscription, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.queues.subscriptions.with_raw_response.delete(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subscription = await response.parse()
+        assert_matches_type(Optional[SubscriptionDeleteResponse], subscription, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.queues.subscriptions.with_streaming_response.delete(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subscription = await response.parse()
+            assert_matches_type(Optional[SubscriptionDeleteResponse], subscription, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.queues.subscriptions.with_raw_response.delete(
+                subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `subscription_id` but received ''"):
+            await async_client.queues.subscriptions.with_raw_response.delete(
+                subscription_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        subscription = await async_client.queues.subscriptions.get(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SubscriptionGetResponse], subscription, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.queues.subscriptions.with_raw_response.get(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subscription = await response.parse()
+        assert_matches_type(Optional[SubscriptionGetResponse], subscription, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.queues.subscriptions.with_streaming_response.get(
+            subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subscription = await response.parse()
+            assert_matches_type(Optional[SubscriptionGetResponse], subscription, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.queues.subscriptions.with_raw_response.get(
+                subscription_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `subscription_id` but received ''"):
+            await async_client.queues.subscriptions.with_raw_response.get(
+                subscription_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/r2/buckets/__init__.py b/tests/api_resources/r2/buckets/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/r2/buckets/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/r2/buckets/domains/__init__.py b/tests/api_resources/r2/buckets/domains/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/r2/buckets/domains/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/r2/buckets/domains/test_custom.py b/tests/api_resources/r2/buckets/domains/test_custom.py
new file mode 100644
index 00000000000..da1458ab1ef
--- /dev/null
+++ b/tests/api_resources/r2/buckets/domains/test_custom.py
@@ -0,0 +1,774 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.r2.buckets.domains import (
+    CustomGetResponse,
+    CustomListResponse,
+    CustomCreateResponse,
+    CustomDeleteResponse,
+    CustomUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCustom:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        custom = client.r2.buckets.domains.custom.create(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            domain="prefix.example-domain.com",
+            enabled=True,
+            zone_id="36ca64a6d92827b8a6b90be344bb1bfd",
+        )
+        assert_matches_type(CustomCreateResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        custom = client.r2.buckets.domains.custom.create(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            domain="prefix.example-domain.com",
+            enabled=True,
+            zone_id="36ca64a6d92827b8a6b90be344bb1bfd",
+            ciphers=["string"],
+            min_tls="1.0",
+            jurisdiction="default",
+        )
+        assert_matches_type(CustomCreateResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.domains.custom.with_raw_response.create(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            domain="prefix.example-domain.com",
+            enabled=True,
+            zone_id="36ca64a6d92827b8a6b90be344bb1bfd",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = response.parse()
+        assert_matches_type(CustomCreateResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.r2.buckets.domains.custom.with_streaming_response.create(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            domain="prefix.example-domain.com",
+            enabled=True,
+            zone_id="36ca64a6d92827b8a6b90be344bb1bfd",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = response.parse()
+            assert_matches_type(CustomCreateResponse, custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.domains.custom.with_raw_response.create(
+                bucket_name="example-bucket",
+                account_id="",
+                domain="prefix.example-domain.com",
+                enabled=True,
+                zone_id="36ca64a6d92827b8a6b90be344bb1bfd",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.domains.custom.with_raw_response.create(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                domain="prefix.example-domain.com",
+                enabled=True,
+                zone_id="36ca64a6d92827b8a6b90be344bb1bfd",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        custom = client.r2.buckets.domains.custom.update(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+        assert_matches_type(CustomUpdateResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        custom = client.r2.buckets.domains.custom.update(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+            ciphers=["string"],
+            enabled=True,
+            min_tls="1.2",
+            jurisdiction="default",
+        )
+        assert_matches_type(CustomUpdateResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.domains.custom.with_raw_response.update(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = response.parse()
+        assert_matches_type(CustomUpdateResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.r2.buckets.domains.custom.with_streaming_response.update(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = response.parse()
+            assert_matches_type(CustomUpdateResponse, custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.domains.custom.with_raw_response.update(
+                domain="example-domain/custom-domain.com",
+                account_id="",
+                bucket_name="example-bucket",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.domains.custom.with_raw_response.update(
+                domain="example-domain/custom-domain.com",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `domain` but received ''"):
+            client.r2.buckets.domains.custom.with_raw_response.update(
+                domain="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="example-bucket",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        custom = client.r2.buckets.domains.custom.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(CustomListResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        custom = client.r2.buckets.domains.custom.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(CustomListResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.domains.custom.with_raw_response.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = response.parse()
+        assert_matches_type(CustomListResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.r2.buckets.domains.custom.with_streaming_response.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = response.parse()
+            assert_matches_type(CustomListResponse, custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.domains.custom.with_raw_response.list(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.domains.custom.with_raw_response.list(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        custom = client.r2.buckets.domains.custom.delete(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+        assert_matches_type(CustomDeleteResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
+        custom = client.r2.buckets.domains.custom.delete(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+            jurisdiction="default",
+        )
+        assert_matches_type(CustomDeleteResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.domains.custom.with_raw_response.delete(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = response.parse()
+        assert_matches_type(CustomDeleteResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.r2.buckets.domains.custom.with_streaming_response.delete(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = response.parse()
+            assert_matches_type(CustomDeleteResponse, custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.domains.custom.with_raw_response.delete(
+                domain="example-domain/custom-domain.com",
+                account_id="",
+                bucket_name="example-bucket",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.domains.custom.with_raw_response.delete(
+                domain="example-domain/custom-domain.com",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `domain` but received ''"):
+            client.r2.buckets.domains.custom.with_raw_response.delete(
+                domain="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="example-bucket",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        custom = client.r2.buckets.domains.custom.get(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+        assert_matches_type(CustomGetResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        custom = client.r2.buckets.domains.custom.get(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+            jurisdiction="default",
+        )
+        assert_matches_type(CustomGetResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.domains.custom.with_raw_response.get(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = response.parse()
+        assert_matches_type(CustomGetResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.r2.buckets.domains.custom.with_streaming_response.get(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = response.parse()
+            assert_matches_type(CustomGetResponse, custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.domains.custom.with_raw_response.get(
+                domain="example-domain/custom-domain.com",
+                account_id="",
+                bucket_name="example-bucket",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.domains.custom.with_raw_response.get(
+                domain="example-domain/custom-domain.com",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `domain` but received ''"):
+            client.r2.buckets.domains.custom.with_raw_response.get(
+                domain="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="example-bucket",
+            )
+
+
+class TestAsyncCustom:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.r2.buckets.domains.custom.create(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            domain="prefix.example-domain.com",
+            enabled=True,
+            zone_id="36ca64a6d92827b8a6b90be344bb1bfd",
+        )
+        assert_matches_type(CustomCreateResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.r2.buckets.domains.custom.create(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            domain="prefix.example-domain.com",
+            enabled=True,
+            zone_id="36ca64a6d92827b8a6b90be344bb1bfd",
+            ciphers=["string"],
+            min_tls="1.0",
+            jurisdiction="default",
+        )
+        assert_matches_type(CustomCreateResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.domains.custom.with_raw_response.create(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            domain="prefix.example-domain.com",
+            enabled=True,
+            zone_id="36ca64a6d92827b8a6b90be344bb1bfd",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = await response.parse()
+        assert_matches_type(CustomCreateResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.domains.custom.with_streaming_response.create(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            domain="prefix.example-domain.com",
+            enabled=True,
+            zone_id="36ca64a6d92827b8a6b90be344bb1bfd",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = await response.parse()
+            assert_matches_type(CustomCreateResponse, custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.domains.custom.with_raw_response.create(
+                bucket_name="example-bucket",
+                account_id="",
+                domain="prefix.example-domain.com",
+                enabled=True,
+                zone_id="36ca64a6d92827b8a6b90be344bb1bfd",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.domains.custom.with_raw_response.create(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                domain="prefix.example-domain.com",
+                enabled=True,
+                zone_id="36ca64a6d92827b8a6b90be344bb1bfd",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.r2.buckets.domains.custom.update(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+        assert_matches_type(CustomUpdateResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.r2.buckets.domains.custom.update(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+            ciphers=["string"],
+            enabled=True,
+            min_tls="1.2",
+            jurisdiction="default",
+        )
+        assert_matches_type(CustomUpdateResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.domains.custom.with_raw_response.update(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = await response.parse()
+        assert_matches_type(CustomUpdateResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.domains.custom.with_streaming_response.update(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = await response.parse()
+            assert_matches_type(CustomUpdateResponse, custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.domains.custom.with_raw_response.update(
+                domain="example-domain/custom-domain.com",
+                account_id="",
+                bucket_name="example-bucket",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.domains.custom.with_raw_response.update(
+                domain="example-domain/custom-domain.com",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `domain` but received ''"):
+            await async_client.r2.buckets.domains.custom.with_raw_response.update(
+                domain="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="example-bucket",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.r2.buckets.domains.custom.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(CustomListResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.r2.buckets.domains.custom.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(CustomListResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.domains.custom.with_raw_response.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = await response.parse()
+        assert_matches_type(CustomListResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.domains.custom.with_streaming_response.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = await response.parse()
+            assert_matches_type(CustomListResponse, custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.domains.custom.with_raw_response.list(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.domains.custom.with_raw_response.list(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.r2.buckets.domains.custom.delete(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+        assert_matches_type(CustomDeleteResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.r2.buckets.domains.custom.delete(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+            jurisdiction="default",
+        )
+        assert_matches_type(CustomDeleteResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.domains.custom.with_raw_response.delete(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = await response.parse()
+        assert_matches_type(CustomDeleteResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.domains.custom.with_streaming_response.delete(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = await response.parse()
+            assert_matches_type(CustomDeleteResponse, custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.domains.custom.with_raw_response.delete(
+                domain="example-domain/custom-domain.com",
+                account_id="",
+                bucket_name="example-bucket",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.domains.custom.with_raw_response.delete(
+                domain="example-domain/custom-domain.com",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `domain` but received ''"):
+            await async_client.r2.buckets.domains.custom.with_raw_response.delete(
+                domain="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="example-bucket",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.r2.buckets.domains.custom.get(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+        assert_matches_type(CustomGetResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.r2.buckets.domains.custom.get(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+            jurisdiction="default",
+        )
+        assert_matches_type(CustomGetResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.domains.custom.with_raw_response.get(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = await response.parse()
+        assert_matches_type(CustomGetResponse, custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.domains.custom.with_streaming_response.get(
+            domain="example-domain/custom-domain.com",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = await response.parse()
+            assert_matches_type(CustomGetResponse, custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.domains.custom.with_raw_response.get(
+                domain="example-domain/custom-domain.com",
+                account_id="",
+                bucket_name="example-bucket",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.domains.custom.with_raw_response.get(
+                domain="example-domain/custom-domain.com",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `domain` but received ''"):
+            await async_client.r2.buckets.domains.custom.with_raw_response.get(
+                domain="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="example-bucket",
+            )
diff --git a/tests/api_resources/r2/buckets/domains/test_managed.py b/tests/api_resources/r2/buckets/domains/test_managed.py
new file mode 100644
index 00000000000..416c742d2ed
--- /dev/null
+++ b/tests/api_resources/r2/buckets/domains/test_managed.py
@@ -0,0 +1,284 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.r2.buckets.domains import ManagedListResponse, ManagedUpdateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestManaged:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        managed = client.r2.buckets.domains.managed.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        )
+        assert_matches_type(ManagedUpdateResponse, managed, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        managed = client.r2.buckets.domains.managed.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+            jurisdiction="default",
+        )
+        assert_matches_type(ManagedUpdateResponse, managed, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.domains.managed.with_raw_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        managed = response.parse()
+        assert_matches_type(ManagedUpdateResponse, managed, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.r2.buckets.domains.managed.with_streaming_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            managed = response.parse()
+            assert_matches_type(ManagedUpdateResponse, managed, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.domains.managed.with_raw_response.update(
+                bucket_name="example-bucket",
+                account_id="",
+                enabled=True,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.domains.managed.with_raw_response.update(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                enabled=True,
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        managed = client.r2.buckets.domains.managed.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ManagedListResponse, managed, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        managed = client.r2.buckets.domains.managed.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(ManagedListResponse, managed, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.domains.managed.with_raw_response.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        managed = response.parse()
+        assert_matches_type(ManagedListResponse, managed, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.r2.buckets.domains.managed.with_streaming_response.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            managed = response.parse()
+            assert_matches_type(ManagedListResponse, managed, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.domains.managed.with_raw_response.list(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.domains.managed.with_raw_response.list(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncManaged:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        managed = await async_client.r2.buckets.domains.managed.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        )
+        assert_matches_type(ManagedUpdateResponse, managed, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        managed = await async_client.r2.buckets.domains.managed.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+            jurisdiction="default",
+        )
+        assert_matches_type(ManagedUpdateResponse, managed, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.domains.managed.with_raw_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        managed = await response.parse()
+        assert_matches_type(ManagedUpdateResponse, managed, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.domains.managed.with_streaming_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            managed = await response.parse()
+            assert_matches_type(ManagedUpdateResponse, managed, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.domains.managed.with_raw_response.update(
+                bucket_name="example-bucket",
+                account_id="",
+                enabled=True,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.domains.managed.with_raw_response.update(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                enabled=True,
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        managed = await async_client.r2.buckets.domains.managed.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ManagedListResponse, managed, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        managed = await async_client.r2.buckets.domains.managed.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(ManagedListResponse, managed, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.domains.managed.with_raw_response.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        managed = await response.parse()
+        assert_matches_type(ManagedListResponse, managed, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.domains.managed.with_streaming_response.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            managed = await response.parse()
+            assert_matches_type(ManagedListResponse, managed, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.domains.managed.with_raw_response.list(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.domains.managed.with_raw_response.list(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/r2/buckets/test_cors.py b/tests/api_resources/r2/buckets/test_cors.py
new file mode 100644
index 00000000000..0864698edc4
--- /dev/null
+++ b/tests/api_resources/r2/buckets/test_cors.py
@@ -0,0 +1,420 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.r2.buckets import CORSGetResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCORS:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        cors = client.r2.buckets.cors.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(object, cors, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        cors = client.r2.buckets.cors.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            rules=[
+                {
+                    "allowed": {
+                        "methods": ["GET"],
+                        "origins": ["http://localhost:3000"],
+                        "headers": ["x-requested-by"],
+                    },
+                    "id": "Allow Local Development",
+                    "expose_headers": ["Content-Encoding"],
+                    "max_age_seconds": 3600,
+                }
+            ],
+            jurisdiction="default",
+        )
+        assert_matches_type(object, cors, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.cors.with_raw_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cors = response.parse()
+        assert_matches_type(object, cors, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.r2.buckets.cors.with_streaming_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cors = response.parse()
+            assert_matches_type(object, cors, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.cors.with_raw_response.update(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.cors.with_raw_response.update(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        cors = client.r2.buckets.cors.delete(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(object, cors, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
+        cors = client.r2.buckets.cors.delete(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(object, cors, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.cors.with_raw_response.delete(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cors = response.parse()
+        assert_matches_type(object, cors, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.r2.buckets.cors.with_streaming_response.delete(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cors = response.parse()
+            assert_matches_type(object, cors, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.cors.with_raw_response.delete(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.cors.with_raw_response.delete(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        cors = client.r2.buckets.cors.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(CORSGetResponse, cors, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        cors = client.r2.buckets.cors.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(CORSGetResponse, cors, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.cors.with_raw_response.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cors = response.parse()
+        assert_matches_type(CORSGetResponse, cors, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.r2.buckets.cors.with_streaming_response.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cors = response.parse()
+            assert_matches_type(CORSGetResponse, cors, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.cors.with_raw_response.get(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.cors.with_raw_response.get(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncCORS:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        cors = await async_client.r2.buckets.cors.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(object, cors, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cors = await async_client.r2.buckets.cors.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            rules=[
+                {
+                    "allowed": {
+                        "methods": ["GET"],
+                        "origins": ["http://localhost:3000"],
+                        "headers": ["x-requested-by"],
+                    },
+                    "id": "Allow Local Development",
+                    "expose_headers": ["Content-Encoding"],
+                    "max_age_seconds": 3600,
+                }
+            ],
+            jurisdiction="default",
+        )
+        assert_matches_type(object, cors, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.cors.with_raw_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cors = await response.parse()
+        assert_matches_type(object, cors, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.cors.with_streaming_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cors = await response.parse()
+            assert_matches_type(object, cors, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.cors.with_raw_response.update(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.cors.with_raw_response.update(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        cors = await async_client.r2.buckets.cors.delete(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(object, cors, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cors = await async_client.r2.buckets.cors.delete(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(object, cors, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.cors.with_raw_response.delete(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cors = await response.parse()
+        assert_matches_type(object, cors, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.cors.with_streaming_response.delete(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cors = await response.parse()
+            assert_matches_type(object, cors, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.cors.with_raw_response.delete(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.cors.with_raw_response.delete(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        cors = await async_client.r2.buckets.cors.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(CORSGetResponse, cors, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cors = await async_client.r2.buckets.cors.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(CORSGetResponse, cors, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.cors.with_raw_response.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cors = await response.parse()
+        assert_matches_type(CORSGetResponse, cors, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.cors.with_streaming_response.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cors = await response.parse()
+            assert_matches_type(CORSGetResponse, cors, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.cors.with_raw_response.get(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.cors.with_raw_response.get(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/r2/buckets/test_event_notifications.py b/tests/api_resources/r2/buckets/test_event_notifications.py
new file mode 100644
index 00000000000..c2805e15aa3
--- /dev/null
+++ b/tests/api_resources/r2/buckets/test_event_notifications.py
@@ -0,0 +1,629 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.r2.buckets import (
+    EventNotificationGetResponse,
+    EventNotificationListResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestEventNotifications:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        event_notification = client.r2.buckets.event_notifications.update(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+            rules=[{"actions": ["PutObject", "CopyObject"]}],
+        )
+        assert_matches_type(object, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        event_notification = client.r2.buckets.event_notifications.update(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+            rules=[
+                {
+                    "actions": ["PutObject", "CopyObject"],
+                    "description": "Notifications from source bucket to queue",
+                    "prefix": "img/",
+                    "suffix": ".jpeg",
+                }
+            ],
+            jurisdiction="default",
+        )
+        assert_matches_type(object, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.event_notifications.with_raw_response.update(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+            rules=[{"actions": ["PutObject", "CopyObject"]}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        event_notification = response.parse()
+        assert_matches_type(object, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.r2.buckets.event_notifications.with_streaming_response.update(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+            rules=[{"actions": ["PutObject", "CopyObject"]}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            event_notification = response.parse()
+            assert_matches_type(object, event_notification, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.event_notifications.with_raw_response.update(
+                queue_id="queue_id",
+                account_id="",
+                bucket_name="example-bucket",
+                rules=[{"actions": ["PutObject", "CopyObject"]}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.event_notifications.with_raw_response.update(
+                queue_id="queue_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="",
+                rules=[{"actions": ["PutObject", "CopyObject"]}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            client.r2.buckets.event_notifications.with_raw_response.update(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="example-bucket",
+                rules=[{"actions": ["PutObject", "CopyObject"]}],
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        event_notification = client.r2.buckets.event_notifications.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(EventNotificationListResponse, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        event_notification = client.r2.buckets.event_notifications.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(EventNotificationListResponse, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.event_notifications.with_raw_response.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        event_notification = response.parse()
+        assert_matches_type(EventNotificationListResponse, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.r2.buckets.event_notifications.with_streaming_response.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            event_notification = response.parse()
+            assert_matches_type(EventNotificationListResponse, event_notification, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.event_notifications.with_raw_response.list(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.event_notifications.with_raw_response.list(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        event_notification = client.r2.buckets.event_notifications.delete(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+        assert_matches_type(object, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
+        event_notification = client.r2.buckets.event_notifications.delete(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+            jurisdiction="default",
+        )
+        assert_matches_type(object, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.event_notifications.with_raw_response.delete(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        event_notification = response.parse()
+        assert_matches_type(object, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.r2.buckets.event_notifications.with_streaming_response.delete(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            event_notification = response.parse()
+            assert_matches_type(object, event_notification, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.event_notifications.with_raw_response.delete(
+                queue_id="queue_id",
+                account_id="",
+                bucket_name="example-bucket",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.event_notifications.with_raw_response.delete(
+                queue_id="queue_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            client.r2.buckets.event_notifications.with_raw_response.delete(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="example-bucket",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        event_notification = client.r2.buckets.event_notifications.get(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+        assert_matches_type(EventNotificationGetResponse, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        event_notification = client.r2.buckets.event_notifications.get(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+            jurisdiction="default",
+        )
+        assert_matches_type(EventNotificationGetResponse, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.event_notifications.with_raw_response.get(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        event_notification = response.parse()
+        assert_matches_type(EventNotificationGetResponse, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.r2.buckets.event_notifications.with_streaming_response.get(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            event_notification = response.parse()
+            assert_matches_type(EventNotificationGetResponse, event_notification, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.event_notifications.with_raw_response.get(
+                queue_id="queue_id",
+                account_id="",
+                bucket_name="example-bucket",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.event_notifications.with_raw_response.get(
+                queue_id="queue_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            client.r2.buckets.event_notifications.with_raw_response.get(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="example-bucket",
+            )
+
+
+class TestAsyncEventNotifications:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        event_notification = await async_client.r2.buckets.event_notifications.update(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+            rules=[{"actions": ["PutObject", "CopyObject"]}],
+        )
+        assert_matches_type(object, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        event_notification = await async_client.r2.buckets.event_notifications.update(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+            rules=[
+                {
+                    "actions": ["PutObject", "CopyObject"],
+                    "description": "Notifications from source bucket to queue",
+                    "prefix": "img/",
+                    "suffix": ".jpeg",
+                }
+            ],
+            jurisdiction="default",
+        )
+        assert_matches_type(object, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.event_notifications.with_raw_response.update(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+            rules=[{"actions": ["PutObject", "CopyObject"]}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        event_notification = await response.parse()
+        assert_matches_type(object, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.event_notifications.with_streaming_response.update(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+            rules=[{"actions": ["PutObject", "CopyObject"]}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            event_notification = await response.parse()
+            assert_matches_type(object, event_notification, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.event_notifications.with_raw_response.update(
+                queue_id="queue_id",
+                account_id="",
+                bucket_name="example-bucket",
+                rules=[{"actions": ["PutObject", "CopyObject"]}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.event_notifications.with_raw_response.update(
+                queue_id="queue_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="",
+                rules=[{"actions": ["PutObject", "CopyObject"]}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            await async_client.r2.buckets.event_notifications.with_raw_response.update(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="example-bucket",
+                rules=[{"actions": ["PutObject", "CopyObject"]}],
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        event_notification = await async_client.r2.buckets.event_notifications.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(EventNotificationListResponse, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        event_notification = await async_client.r2.buckets.event_notifications.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(EventNotificationListResponse, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.event_notifications.with_raw_response.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        event_notification = await response.parse()
+        assert_matches_type(EventNotificationListResponse, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.event_notifications.with_streaming_response.list(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            event_notification = await response.parse()
+            assert_matches_type(EventNotificationListResponse, event_notification, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.event_notifications.with_raw_response.list(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.event_notifications.with_raw_response.list(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        event_notification = await async_client.r2.buckets.event_notifications.delete(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+        assert_matches_type(object, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        event_notification = await async_client.r2.buckets.event_notifications.delete(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+            jurisdiction="default",
+        )
+        assert_matches_type(object, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.event_notifications.with_raw_response.delete(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        event_notification = await response.parse()
+        assert_matches_type(object, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.event_notifications.with_streaming_response.delete(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            event_notification = await response.parse()
+            assert_matches_type(object, event_notification, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.event_notifications.with_raw_response.delete(
+                queue_id="queue_id",
+                account_id="",
+                bucket_name="example-bucket",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.event_notifications.with_raw_response.delete(
+                queue_id="queue_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            await async_client.r2.buckets.event_notifications.with_raw_response.delete(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="example-bucket",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        event_notification = await async_client.r2.buckets.event_notifications.get(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+        assert_matches_type(EventNotificationGetResponse, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        event_notification = await async_client.r2.buckets.event_notifications.get(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+            jurisdiction="default",
+        )
+        assert_matches_type(EventNotificationGetResponse, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.event_notifications.with_raw_response.get(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        event_notification = await response.parse()
+        assert_matches_type(EventNotificationGetResponse, event_notification, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.event_notifications.with_streaming_response.get(
+            queue_id="queue_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            bucket_name="example-bucket",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            event_notification = await response.parse()
+            assert_matches_type(EventNotificationGetResponse, event_notification, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.event_notifications.with_raw_response.get(
+                queue_id="queue_id",
+                account_id="",
+                bucket_name="example-bucket",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.event_notifications.with_raw_response.get(
+                queue_id="queue_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            await async_client.r2.buckets.event_notifications.with_raw_response.get(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                bucket_name="example-bucket",
+            )
diff --git a/tests/api_resources/r2/buckets/test_lifecycle.py b/tests/api_resources/r2/buckets/test_lifecycle.py
new file mode 100644
index 00000000000..d366fb30c4b
--- /dev/null
+++ b/tests/api_resources/r2/buckets/test_lifecycle.py
@@ -0,0 +1,328 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.r2.buckets import LifecycleGetResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestLifecycle:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        lifecycle = client.r2.buckets.lifecycle.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(object, lifecycle, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        lifecycle = client.r2.buckets.lifecycle.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            rules=[
+                {
+                    "id": "Expire all objects older than 24 hours",
+                    "conditions": {"prefix": "prefix"},
+                    "enabled": True,
+                    "abort_multipart_uploads_transition": {
+                        "condition": {
+                            "max_age": 0,
+                            "type": "Age",
+                        }
+                    },
+                    "delete_objects_transition": {
+                        "condition": {
+                            "max_age": 0,
+                            "type": "Age",
+                        }
+                    },
+                    "storage_class_transitions": [
+                        {
+                            "condition": {
+                                "max_age": 0,
+                                "type": "Age",
+                            },
+                            "storage_class": "InfrequentAccess",
+                        }
+                    ],
+                }
+            ],
+            jurisdiction="default",
+        )
+        assert_matches_type(object, lifecycle, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.lifecycle.with_raw_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        lifecycle = response.parse()
+        assert_matches_type(object, lifecycle, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.r2.buckets.lifecycle.with_streaming_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            lifecycle = response.parse()
+            assert_matches_type(object, lifecycle, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.lifecycle.with_raw_response.update(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.lifecycle.with_raw_response.update(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        lifecycle = client.r2.buckets.lifecycle.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LifecycleGetResponse, lifecycle, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        lifecycle = client.r2.buckets.lifecycle.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(LifecycleGetResponse, lifecycle, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.lifecycle.with_raw_response.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        lifecycle = response.parse()
+        assert_matches_type(LifecycleGetResponse, lifecycle, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.r2.buckets.lifecycle.with_streaming_response.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            lifecycle = response.parse()
+            assert_matches_type(LifecycleGetResponse, lifecycle, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.lifecycle.with_raw_response.get(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.lifecycle.with_raw_response.get(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncLifecycle:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        lifecycle = await async_client.r2.buckets.lifecycle.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(object, lifecycle, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        lifecycle = await async_client.r2.buckets.lifecycle.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            rules=[
+                {
+                    "id": "Expire all objects older than 24 hours",
+                    "conditions": {"prefix": "prefix"},
+                    "enabled": True,
+                    "abort_multipart_uploads_transition": {
+                        "condition": {
+                            "max_age": 0,
+                            "type": "Age",
+                        }
+                    },
+                    "delete_objects_transition": {
+                        "condition": {
+                            "max_age": 0,
+                            "type": "Age",
+                        }
+                    },
+                    "storage_class_transitions": [
+                        {
+                            "condition": {
+                                "max_age": 0,
+                                "type": "Age",
+                            },
+                            "storage_class": "InfrequentAccess",
+                        }
+                    ],
+                }
+            ],
+            jurisdiction="default",
+        )
+        assert_matches_type(object, lifecycle, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.lifecycle.with_raw_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        lifecycle = await response.parse()
+        assert_matches_type(object, lifecycle, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.lifecycle.with_streaming_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            lifecycle = await response.parse()
+            assert_matches_type(object, lifecycle, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.lifecycle.with_raw_response.update(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.lifecycle.with_raw_response.update(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        lifecycle = await async_client.r2.buckets.lifecycle.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LifecycleGetResponse, lifecycle, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        lifecycle = await async_client.r2.buckets.lifecycle.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(LifecycleGetResponse, lifecycle, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.lifecycle.with_raw_response.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        lifecycle = await response.parse()
+        assert_matches_type(LifecycleGetResponse, lifecycle, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.lifecycle.with_streaming_response.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            lifecycle = await response.parse()
+            assert_matches_type(LifecycleGetResponse, lifecycle, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.lifecycle.with_raw_response.get(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.lifecycle.with_raw_response.get(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/r2/buckets/test_locks.py b/tests/api_resources/r2/buckets/test_locks.py
new file mode 100644
index 00000000000..2debc63606e
--- /dev/null
+++ b/tests/api_resources/r2/buckets/test_locks.py
@@ -0,0 +1,294 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.r2.buckets import LockGetResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestLocks:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        lock = client.r2.buckets.locks.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(object, lock, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        lock = client.r2.buckets.locks.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            rules=[
+                {
+                    "id": "Lock all objects for 24 hours",
+                    "condition": {
+                        "max_age_seconds": 100,
+                        "type": "Age",
+                    },
+                    "enabled": True,
+                    "prefix": "prefix",
+                }
+            ],
+            jurisdiction="default",
+        )
+        assert_matches_type(object, lock, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.locks.with_raw_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        lock = response.parse()
+        assert_matches_type(object, lock, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.r2.buckets.locks.with_streaming_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            lock = response.parse()
+            assert_matches_type(object, lock, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.locks.with_raw_response.update(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.locks.with_raw_response.update(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        lock = client.r2.buckets.locks.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LockGetResponse, lock, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        lock = client.r2.buckets.locks.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(LockGetResponse, lock, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.locks.with_raw_response.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        lock = response.parse()
+        assert_matches_type(LockGetResponse, lock, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.r2.buckets.locks.with_streaming_response.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            lock = response.parse()
+            assert_matches_type(LockGetResponse, lock, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.locks.with_raw_response.get(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.locks.with_raw_response.get(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncLocks:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        lock = await async_client.r2.buckets.locks.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(object, lock, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        lock = await async_client.r2.buckets.locks.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            rules=[
+                {
+                    "id": "Lock all objects for 24 hours",
+                    "condition": {
+                        "max_age_seconds": 100,
+                        "type": "Age",
+                    },
+                    "enabled": True,
+                    "prefix": "prefix",
+                }
+            ],
+            jurisdiction="default",
+        )
+        assert_matches_type(object, lock, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.locks.with_raw_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        lock = await response.parse()
+        assert_matches_type(object, lock, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.locks.with_streaming_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            lock = await response.parse()
+            assert_matches_type(object, lock, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.locks.with_raw_response.update(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.locks.with_raw_response.update(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        lock = await async_client.r2.buckets.locks.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LockGetResponse, lock, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        lock = await async_client.r2.buckets.locks.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(LockGetResponse, lock, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.locks.with_raw_response.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        lock = await response.parse()
+        assert_matches_type(LockGetResponse, lock, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.locks.with_streaming_response.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            lock = await response.parse()
+            assert_matches_type(LockGetResponse, lock, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.locks.with_raw_response.get(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.locks.with_raw_response.get(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/r2/buckets/test_metrics.py b/tests/api_resources/r2/buckets/test_metrics.py
new file mode 100644
index 00000000000..974564e0fc8
--- /dev/null
+++ b/tests/api_resources/r2/buckets/test_metrics.py
@@ -0,0 +1,108 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.r2.buckets import MetricListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestMetrics:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        metric = client.r2.buckets.metrics.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(MetricListResponse, metric, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.metrics.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        metric = response.parse()
+        assert_matches_type(MetricListResponse, metric, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.r2.buckets.metrics.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            metric = response.parse()
+            assert_matches_type(MetricListResponse, metric, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.metrics.with_raw_response.list(
+                account_id="",
+            )
+
+
+class TestAsyncMetrics:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        metric = await async_client.r2.buckets.metrics.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(MetricListResponse, metric, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.metrics.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        metric = await response.parse()
+        assert_matches_type(MetricListResponse, metric, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.metrics.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            metric = await response.parse()
+            assert_matches_type(MetricListResponse, metric, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.metrics.with_raw_response.list(
+                account_id="",
+            )
diff --git a/tests/api_resources/r2/buckets/test_sippy.py b/tests/api_resources/r2/buckets/test_sippy.py
new file mode 100644
index 00000000000..a80bd2fec8c
--- /dev/null
+++ b/tests/api_resources/r2/buckets/test_sippy.py
@@ -0,0 +1,712 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.r2.buckets import Sippy, SippyDeleteResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSippy:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_overload_1(self, client: Cloudflare) -> None:
+        sippy = client.r2.buckets.sippy.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        sippy = client.r2.buckets.sippy.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination={
+                "access_key_id": "accessKeyId",
+                "provider": "r2",
+                "secret_access_key": "secretAccessKey",
+            },
+            source={
+                "access_key_id": "accessKeyId",
+                "bucket": "bucket",
+                "provider": "aws",
+                "region": "region",
+                "secret_access_key": "secretAccessKey",
+            },
+            jurisdiction="default",
+        )
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_update_overload_1(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.sippy.with_raw_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sippy = response.parse()
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_update_overload_1(self, client: Cloudflare) -> None:
+        with client.r2.buckets.sippy.with_streaming_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sippy = response.parse()
+            assert_matches_type(Sippy, sippy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_update_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.sippy.with_raw_response.update(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.sippy.with_raw_response.update(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_overload_2(self, client: Cloudflare) -> None:
+        sippy = client.r2.buckets.sippy.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        sippy = client.r2.buckets.sippy.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination={
+                "access_key_id": "accessKeyId",
+                "provider": "r2",
+                "secret_access_key": "secretAccessKey",
+            },
+            source={
+                "bucket": "bucket",
+                "client_email": "clientEmail",
+                "private_key": "privateKey",
+                "provider": "gcs",
+            },
+            jurisdiction="default",
+        )
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_update_overload_2(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.sippy.with_raw_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sippy = response.parse()
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_update_overload_2(self, client: Cloudflare) -> None:
+        with client.r2.buckets.sippy.with_streaming_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sippy = response.parse()
+            assert_matches_type(Sippy, sippy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.sippy.with_raw_response.update(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.sippy.with_raw_response.update(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_overload_3(self, client: Cloudflare) -> None:
+        sippy = client.r2.buckets.sippy.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params_overload_3(self, client: Cloudflare) -> None:
+        sippy = client.r2.buckets.sippy.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination={
+                "access_key_id": "accessKeyId",
+                "provider": "r2",
+                "secret_access_key": "secretAccessKey",
+            },
+            source={
+                "access_key_id": "accessKeyId",
+                "bucket_url": "bucketUrl",
+                "provider": "s3",
+                "secret_access_key": "secretAccessKey",
+            },
+            jurisdiction="default",
+        )
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_update_overload_3(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.sippy.with_raw_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sippy = response.parse()
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_update_overload_3(self, client: Cloudflare) -> None:
+        with client.r2.buckets.sippy.with_streaming_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sippy = response.parse()
+            assert_matches_type(Sippy, sippy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_update_overload_3(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.sippy.with_raw_response.update(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.sippy.with_raw_response.update(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        sippy = client.r2.buckets.sippy.delete(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SippyDeleteResponse, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
+        sippy = client.r2.buckets.sippy.delete(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(SippyDeleteResponse, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.sippy.with_raw_response.delete(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sippy = response.parse()
+        assert_matches_type(SippyDeleteResponse, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.r2.buckets.sippy.with_streaming_response.delete(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sippy = response.parse()
+            assert_matches_type(SippyDeleteResponse, sippy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.sippy.with_raw_response.delete(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.sippy.with_raw_response.delete(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        sippy = client.r2.buckets.sippy.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        sippy = client.r2.buckets.sippy.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.sippy.with_raw_response.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sippy = response.parse()
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.r2.buckets.sippy.with_streaming_response.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sippy = response.parse()
+            assert_matches_type(Sippy, sippy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.sippy.with_raw_response.get(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.sippy.with_raw_response.get(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncSippy:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        sippy = await async_client.r2.buckets.sippy.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        sippy = await async_client.r2.buckets.sippy.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination={
+                "access_key_id": "accessKeyId",
+                "provider": "r2",
+                "secret_access_key": "secretAccessKey",
+            },
+            source={
+                "access_key_id": "accessKeyId",
+                "bucket": "bucket",
+                "provider": "aws",
+                "region": "region",
+                "secret_access_key": "secretAccessKey",
+            },
+            jurisdiction="default",
+        )
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.sippy.with_raw_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sippy = await response.parse()
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.sippy.with_streaming_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sippy = await response.parse()
+            assert_matches_type(Sippy, sippy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.sippy.with_raw_response.update(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.sippy.with_raw_response.update(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        sippy = await async_client.r2.buckets.sippy.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        sippy = await async_client.r2.buckets.sippy.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination={
+                "access_key_id": "accessKeyId",
+                "provider": "r2",
+                "secret_access_key": "secretAccessKey",
+            },
+            source={
+                "bucket": "bucket",
+                "client_email": "clientEmail",
+                "private_key": "privateKey",
+                "provider": "gcs",
+            },
+            jurisdiction="default",
+        )
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.sippy.with_raw_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sippy = await response.parse()
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.sippy.with_streaming_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sippy = await response.parse()
+            assert_matches_type(Sippy, sippy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.sippy.with_raw_response.update(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.sippy.with_raw_response.update(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_overload_3(self, async_client: AsyncCloudflare) -> None:
+        sippy = await async_client.r2.buckets.sippy.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params_overload_3(self, async_client: AsyncCloudflare) -> None:
+        sippy = await async_client.r2.buckets.sippy.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            destination={
+                "access_key_id": "accessKeyId",
+                "provider": "r2",
+                "secret_access_key": "secretAccessKey",
+            },
+            source={
+                "access_key_id": "accessKeyId",
+                "bucket_url": "bucketUrl",
+                "provider": "s3",
+                "secret_access_key": "secretAccessKey",
+            },
+            jurisdiction="default",
+        )
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_update_overload_3(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.sippy.with_raw_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sippy = await response.parse()
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_update_overload_3(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.sippy.with_streaming_response.update(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sippy = await response.parse()
+            assert_matches_type(Sippy, sippy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update_overload_3(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.sippy.with_raw_response.update(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.sippy.with_raw_response.update(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        sippy = await async_client.r2.buckets.sippy.delete(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SippyDeleteResponse, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        sippy = await async_client.r2.buckets.sippy.delete(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(SippyDeleteResponse, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.sippy.with_raw_response.delete(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sippy = await response.parse()
+        assert_matches_type(SippyDeleteResponse, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.sippy.with_streaming_response.delete(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sippy = await response.parse()
+            assert_matches_type(SippyDeleteResponse, sippy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.sippy.with_raw_response.delete(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.sippy.with_raw_response.delete(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        sippy = await async_client.r2.buckets.sippy.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        sippy = await async_client.r2.buckets.sippy.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.sippy.with_raw_response.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        sippy = await response.parse()
+        assert_matches_type(Sippy, sippy, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.sippy.with_streaming_response.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            sippy = await response.parse()
+            assert_matches_type(Sippy, sippy, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.sippy.with_raw_response.get(
+                bucket_name="example-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.sippy.with_raw_response.get(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/r2/super_slurper/__init__.py b/tests/api_resources/r2/super_slurper/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/r2/super_slurper/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/r2/super_slurper/jobs/__init__.py b/tests/api_resources/r2/super_slurper/jobs/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/r2/super_slurper/jobs/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/r2/super_slurper/jobs/test_logs.py b/tests/api_resources/r2/super_slurper/jobs/test_logs.py
new file mode 100644
index 00000000000..847b27f546d
--- /dev/null
+++ b/tests/api_resources/r2/super_slurper/jobs/test_logs.py
@@ -0,0 +1,141 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.r2.super_slurper.jobs import LogListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestLogs:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        log = client.r2.super_slurper.jobs.logs.list(
+            job_id="job_id",
+            account_id="account_id",
+        )
+        assert_matches_type(SyncSinglePage[LogListResponse], log, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        log = client.r2.super_slurper.jobs.logs.list(
+            job_id="job_id",
+            account_id="account_id",
+            limit=50,
+            offset=0,
+        )
+        assert_matches_type(SyncSinglePage[LogListResponse], log, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.r2.super_slurper.jobs.logs.with_raw_response.list(
+            job_id="job_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        log = response.parse()
+        assert_matches_type(SyncSinglePage[LogListResponse], log, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.r2.super_slurper.jobs.logs.with_streaming_response.list(
+            job_id="job_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            log = response.parse()
+            assert_matches_type(SyncSinglePage[LogListResponse], log, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.super_slurper.jobs.logs.with_raw_response.list(
+                job_id="job_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `job_id` but received ''"):
+            client.r2.super_slurper.jobs.logs.with_raw_response.list(
+                job_id="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncLogs:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        log = await async_client.r2.super_slurper.jobs.logs.list(
+            job_id="job_id",
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncSinglePage[LogListResponse], log, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        log = await async_client.r2.super_slurper.jobs.logs.list(
+            job_id="job_id",
+            account_id="account_id",
+            limit=50,
+            offset=0,
+        )
+        assert_matches_type(AsyncSinglePage[LogListResponse], log, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.super_slurper.jobs.logs.with_raw_response.list(
+            job_id="job_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        log = await response.parse()
+        assert_matches_type(AsyncSinglePage[LogListResponse], log, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.super_slurper.jobs.logs.with_streaming_response.list(
+            job_id="job_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            log = await response.parse()
+            assert_matches_type(AsyncSinglePage[LogListResponse], log, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.super_slurper.jobs.logs.with_raw_response.list(
+                job_id="job_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `job_id` but received ''"):
+            await async_client.r2.super_slurper.jobs.logs.with_raw_response.list(
+                job_id="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/r2/super_slurper/test_connectivity_precheck.py b/tests/api_resources/r2/super_slurper/test_connectivity_precheck.py
new file mode 100644
index 00000000000..3d6e68149af
--- /dev/null
+++ b/tests/api_resources/r2/super_slurper/test_connectivity_precheck.py
@@ -0,0 +1,641 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.r2.super_slurper import (
+    ConnectivityPrecheckSourceResponse,
+    ConnectivityPrecheckTargetResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestConnectivityPrecheck:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_source_overload_1(self, client: Cloudflare) -> None:
+        connectivity_precheck = client.r2.super_slurper.connectivity_precheck.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="s3",
+        )
+        assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    def test_method_source_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        connectivity_precheck = client.r2.super_slurper.connectivity_precheck.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="s3",
+            endpoint="endpoint",
+            path_prefix="pathPrefix",
+            region="region",
+        )
+        assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    def test_raw_response_source_overload_1(self, client: Cloudflare) -> None:
+        response = client.r2.super_slurper.connectivity_precheck.with_raw_response.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="s3",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        connectivity_precheck = response.parse()
+        assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    def test_streaming_response_source_overload_1(self, client: Cloudflare) -> None:
+        with client.r2.super_slurper.connectivity_precheck.with_streaming_response.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="s3",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            connectivity_precheck = response.parse()
+            assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_source_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.super_slurper.connectivity_precheck.with_raw_response.source(
+                account_id="",
+                bucket="bucket",
+                secret={
+                    "access_key_id": "accessKeyId",
+                    "secret_access_key": "secretAccessKey",
+                },
+                vendor="s3",
+            )
+
+    @parametrize
+    def test_method_source_overload_2(self, client: Cloudflare) -> None:
+        connectivity_precheck = client.r2.super_slurper.connectivity_precheck.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "client_email": "clientEmail",
+                "private_key": "privateKey",
+            },
+            vendor="gcs",
+        )
+        assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    def test_method_source_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        connectivity_precheck = client.r2.super_slurper.connectivity_precheck.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "client_email": "clientEmail",
+                "private_key": "privateKey",
+            },
+            vendor="gcs",
+            path_prefix="pathPrefix",
+        )
+        assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    def test_raw_response_source_overload_2(self, client: Cloudflare) -> None:
+        response = client.r2.super_slurper.connectivity_precheck.with_raw_response.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "client_email": "clientEmail",
+                "private_key": "privateKey",
+            },
+            vendor="gcs",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        connectivity_precheck = response.parse()
+        assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    def test_streaming_response_source_overload_2(self, client: Cloudflare) -> None:
+        with client.r2.super_slurper.connectivity_precheck.with_streaming_response.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "client_email": "clientEmail",
+                "private_key": "privateKey",
+            },
+            vendor="gcs",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            connectivity_precheck = response.parse()
+            assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_source_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.super_slurper.connectivity_precheck.with_raw_response.source(
+                account_id="",
+                bucket="bucket",
+                secret={
+                    "client_email": "clientEmail",
+                    "private_key": "privateKey",
+                },
+                vendor="gcs",
+            )
+
+    @parametrize
+    def test_method_source_overload_3(self, client: Cloudflare) -> None:
+        connectivity_precheck = client.r2.super_slurper.connectivity_precheck.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="r2",
+        )
+        assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    def test_method_source_with_all_params_overload_3(self, client: Cloudflare) -> None:
+        connectivity_precheck = client.r2.super_slurper.connectivity_precheck.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="r2",
+            jurisdiction="default",
+            path_prefix="pathPrefix",
+        )
+        assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    def test_raw_response_source_overload_3(self, client: Cloudflare) -> None:
+        response = client.r2.super_slurper.connectivity_precheck.with_raw_response.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="r2",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        connectivity_precheck = response.parse()
+        assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    def test_streaming_response_source_overload_3(self, client: Cloudflare) -> None:
+        with client.r2.super_slurper.connectivity_precheck.with_streaming_response.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="r2",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            connectivity_precheck = response.parse()
+            assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_source_overload_3(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.super_slurper.connectivity_precheck.with_raw_response.source(
+                account_id="",
+                bucket="bucket",
+                secret={
+                    "access_key_id": "accessKeyId",
+                    "secret_access_key": "secretAccessKey",
+                },
+                vendor="r2",
+            )
+
+    @parametrize
+    def test_method_target(self, client: Cloudflare) -> None:
+        connectivity_precheck = client.r2.super_slurper.connectivity_precheck.target(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="r2",
+        )
+        assert_matches_type(Optional[ConnectivityPrecheckTargetResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    def test_method_target_with_all_params(self, client: Cloudflare) -> None:
+        connectivity_precheck = client.r2.super_slurper.connectivity_precheck.target(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="r2",
+            jurisdiction="default",
+        )
+        assert_matches_type(Optional[ConnectivityPrecheckTargetResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    def test_raw_response_target(self, client: Cloudflare) -> None:
+        response = client.r2.super_slurper.connectivity_precheck.with_raw_response.target(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="r2",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        connectivity_precheck = response.parse()
+        assert_matches_type(Optional[ConnectivityPrecheckTargetResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    def test_streaming_response_target(self, client: Cloudflare) -> None:
+        with client.r2.super_slurper.connectivity_precheck.with_streaming_response.target(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="r2",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            connectivity_precheck = response.parse()
+            assert_matches_type(Optional[ConnectivityPrecheckTargetResponse], connectivity_precheck, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_target(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.super_slurper.connectivity_precheck.with_raw_response.target(
+                account_id="",
+                bucket="bucket",
+                secret={
+                    "access_key_id": "accessKeyId",
+                    "secret_access_key": "secretAccessKey",
+                },
+                vendor="r2",
+            )
+
+
+class TestAsyncConnectivityPrecheck:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_source_overload_1(self, async_client: AsyncCloudflare) -> None:
+        connectivity_precheck = await async_client.r2.super_slurper.connectivity_precheck.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="s3",
+        )
+        assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    async def test_method_source_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        connectivity_precheck = await async_client.r2.super_slurper.connectivity_precheck.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="s3",
+            endpoint="endpoint",
+            path_prefix="pathPrefix",
+            region="region",
+        )
+        assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    async def test_raw_response_source_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.super_slurper.connectivity_precheck.with_raw_response.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="s3",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        connectivity_precheck = await response.parse()
+        assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_source_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.super_slurper.connectivity_precheck.with_streaming_response.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="s3",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            connectivity_precheck = await response.parse()
+            assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_source_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.super_slurper.connectivity_precheck.with_raw_response.source(
+                account_id="",
+                bucket="bucket",
+                secret={
+                    "access_key_id": "accessKeyId",
+                    "secret_access_key": "secretAccessKey",
+                },
+                vendor="s3",
+            )
+
+    @parametrize
+    async def test_method_source_overload_2(self, async_client: AsyncCloudflare) -> None:
+        connectivity_precheck = await async_client.r2.super_slurper.connectivity_precheck.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "client_email": "clientEmail",
+                "private_key": "privateKey",
+            },
+            vendor="gcs",
+        )
+        assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    async def test_method_source_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        connectivity_precheck = await async_client.r2.super_slurper.connectivity_precheck.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "client_email": "clientEmail",
+                "private_key": "privateKey",
+            },
+            vendor="gcs",
+            path_prefix="pathPrefix",
+        )
+        assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    async def test_raw_response_source_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.super_slurper.connectivity_precheck.with_raw_response.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "client_email": "clientEmail",
+                "private_key": "privateKey",
+            },
+            vendor="gcs",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        connectivity_precheck = await response.parse()
+        assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_source_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.super_slurper.connectivity_precheck.with_streaming_response.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "client_email": "clientEmail",
+                "private_key": "privateKey",
+            },
+            vendor="gcs",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            connectivity_precheck = await response.parse()
+            assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_source_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.super_slurper.connectivity_precheck.with_raw_response.source(
+                account_id="",
+                bucket="bucket",
+                secret={
+                    "client_email": "clientEmail",
+                    "private_key": "privateKey",
+                },
+                vendor="gcs",
+            )
+
+    @parametrize
+    async def test_method_source_overload_3(self, async_client: AsyncCloudflare) -> None:
+        connectivity_precheck = await async_client.r2.super_slurper.connectivity_precheck.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="r2",
+        )
+        assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    async def test_method_source_with_all_params_overload_3(self, async_client: AsyncCloudflare) -> None:
+        connectivity_precheck = await async_client.r2.super_slurper.connectivity_precheck.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="r2",
+            jurisdiction="default",
+            path_prefix="pathPrefix",
+        )
+        assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    async def test_raw_response_source_overload_3(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.super_slurper.connectivity_precheck.with_raw_response.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="r2",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        connectivity_precheck = await response.parse()
+        assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_source_overload_3(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.super_slurper.connectivity_precheck.with_streaming_response.source(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="r2",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            connectivity_precheck = await response.parse()
+            assert_matches_type(Optional[ConnectivityPrecheckSourceResponse], connectivity_precheck, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_source_overload_3(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.super_slurper.connectivity_precheck.with_raw_response.source(
+                account_id="",
+                bucket="bucket",
+                secret={
+                    "access_key_id": "accessKeyId",
+                    "secret_access_key": "secretAccessKey",
+                },
+                vendor="r2",
+            )
+
+    @parametrize
+    async def test_method_target(self, async_client: AsyncCloudflare) -> None:
+        connectivity_precheck = await async_client.r2.super_slurper.connectivity_precheck.target(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="r2",
+        )
+        assert_matches_type(Optional[ConnectivityPrecheckTargetResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    async def test_method_target_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        connectivity_precheck = await async_client.r2.super_slurper.connectivity_precheck.target(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="r2",
+            jurisdiction="default",
+        )
+        assert_matches_type(Optional[ConnectivityPrecheckTargetResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    async def test_raw_response_target(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.super_slurper.connectivity_precheck.with_raw_response.target(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="r2",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        connectivity_precheck = await response.parse()
+        assert_matches_type(Optional[ConnectivityPrecheckTargetResponse], connectivity_precheck, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_target(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.super_slurper.connectivity_precheck.with_streaming_response.target(
+            account_id="account_id",
+            bucket="bucket",
+            secret={
+                "access_key_id": "accessKeyId",
+                "secret_access_key": "secretAccessKey",
+            },
+            vendor="r2",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            connectivity_precheck = await response.parse()
+            assert_matches_type(Optional[ConnectivityPrecheckTargetResponse], connectivity_precheck, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_target(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.super_slurper.connectivity_precheck.with_raw_response.target(
+                account_id="",
+                bucket="bucket",
+                secret={
+                    "access_key_id": "accessKeyId",
+                    "secret_access_key": "secretAccessKey",
+                },
+                vendor="r2",
+            )
diff --git a/tests/api_resources/r2/super_slurper/test_jobs.py b/tests/api_resources/r2/super_slurper/test_jobs.py
new file mode 100644
index 00000000000..e99c08891a1
--- /dev/null
+++ b/tests/api_resources/r2/super_slurper/test_jobs.py
@@ -0,0 +1,812 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.r2.super_slurper import (
+    JobGetResponse,
+    JobListResponse,
+    JobCreateResponse,
+    JobProgressResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestJobs:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        job = client.r2.super_slurper.jobs.create(
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[JobCreateResponse], job, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        job = client.r2.super_slurper.jobs.create(
+            account_id="account_id",
+            overwrite=True,
+            source={
+                "bucket": "bucket",
+                "secret": {
+                    "access_key_id": "accessKeyId",
+                    "secret_access_key": "secretAccessKey",
+                },
+                "vendor": "s3",
+                "endpoint": "endpoint",
+                "path_prefix": "pathPrefix",
+                "region": "region",
+            },
+            target={
+                "bucket": "bucket",
+                "secret": {
+                    "access_key_id": "accessKeyId",
+                    "secret_access_key": "secretAccessKey",
+                },
+                "vendor": "r2",
+                "jurisdiction": "default",
+            },
+        )
+        assert_matches_type(Optional[JobCreateResponse], job, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.r2.super_slurper.jobs.with_raw_response.create(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = response.parse()
+        assert_matches_type(Optional[JobCreateResponse], job, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.r2.super_slurper.jobs.with_streaming_response.create(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = response.parse()
+            assert_matches_type(Optional[JobCreateResponse], job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.super_slurper.jobs.with_raw_response.create(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        job = client.r2.super_slurper.jobs.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncSinglePage[JobListResponse], job, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        job = client.r2.super_slurper.jobs.list(
+            account_id="account_id",
+            limit=50,
+            offset=0,
+        )
+        assert_matches_type(SyncSinglePage[JobListResponse], job, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.r2.super_slurper.jobs.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = response.parse()
+        assert_matches_type(SyncSinglePage[JobListResponse], job, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.r2.super_slurper.jobs.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = response.parse()
+            assert_matches_type(SyncSinglePage[JobListResponse], job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.super_slurper.jobs.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_abort(self, client: Cloudflare) -> None:
+        job = client.r2.super_slurper.jobs.abort(
+            job_id="job_id",
+            account_id="account_id",
+        )
+        assert_matches_type(str, job, path=["response"])
+
+    @parametrize
+    def test_raw_response_abort(self, client: Cloudflare) -> None:
+        response = client.r2.super_slurper.jobs.with_raw_response.abort(
+            job_id="job_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = response.parse()
+        assert_matches_type(str, job, path=["response"])
+
+    @parametrize
+    def test_streaming_response_abort(self, client: Cloudflare) -> None:
+        with client.r2.super_slurper.jobs.with_streaming_response.abort(
+            job_id="job_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = response.parse()
+            assert_matches_type(str, job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_abort(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.super_slurper.jobs.with_raw_response.abort(
+                job_id="job_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `job_id` but received ''"):
+            client.r2.super_slurper.jobs.with_raw_response.abort(
+                job_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_abort_all(self, client: Cloudflare) -> None:
+        job = client.r2.super_slurper.jobs.abort_all(
+            account_id="account_id",
+        )
+        assert_matches_type(str, job, path=["response"])
+
+    @parametrize
+    def test_raw_response_abort_all(self, client: Cloudflare) -> None:
+        response = client.r2.super_slurper.jobs.with_raw_response.abort_all(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = response.parse()
+        assert_matches_type(str, job, path=["response"])
+
+    @parametrize
+    def test_streaming_response_abort_all(self, client: Cloudflare) -> None:
+        with client.r2.super_slurper.jobs.with_streaming_response.abort_all(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = response.parse()
+            assert_matches_type(str, job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_abort_all(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.super_slurper.jobs.with_raw_response.abort_all(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        job = client.r2.super_slurper.jobs.get(
+            job_id="job_id",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[JobGetResponse], job, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.r2.super_slurper.jobs.with_raw_response.get(
+            job_id="job_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = response.parse()
+        assert_matches_type(Optional[JobGetResponse], job, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.r2.super_slurper.jobs.with_streaming_response.get(
+            job_id="job_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = response.parse()
+            assert_matches_type(Optional[JobGetResponse], job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.super_slurper.jobs.with_raw_response.get(
+                job_id="job_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `job_id` but received ''"):
+            client.r2.super_slurper.jobs.with_raw_response.get(
+                job_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_pause(self, client: Cloudflare) -> None:
+        job = client.r2.super_slurper.jobs.pause(
+            job_id="job_id",
+            account_id="account_id",
+        )
+        assert_matches_type(str, job, path=["response"])
+
+    @parametrize
+    def test_raw_response_pause(self, client: Cloudflare) -> None:
+        response = client.r2.super_slurper.jobs.with_raw_response.pause(
+            job_id="job_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = response.parse()
+        assert_matches_type(str, job, path=["response"])
+
+    @parametrize
+    def test_streaming_response_pause(self, client: Cloudflare) -> None:
+        with client.r2.super_slurper.jobs.with_streaming_response.pause(
+            job_id="job_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = response.parse()
+            assert_matches_type(str, job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_pause(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.super_slurper.jobs.with_raw_response.pause(
+                job_id="job_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `job_id` but received ''"):
+            client.r2.super_slurper.jobs.with_raw_response.pause(
+                job_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_progress(self, client: Cloudflare) -> None:
+        job = client.r2.super_slurper.jobs.progress(
+            job_id="job_id",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[JobProgressResponse], job, path=["response"])
+
+    @parametrize
+    def test_raw_response_progress(self, client: Cloudflare) -> None:
+        response = client.r2.super_slurper.jobs.with_raw_response.progress(
+            job_id="job_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = response.parse()
+        assert_matches_type(Optional[JobProgressResponse], job, path=["response"])
+
+    @parametrize
+    def test_streaming_response_progress(self, client: Cloudflare) -> None:
+        with client.r2.super_slurper.jobs.with_streaming_response.progress(
+            job_id="job_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = response.parse()
+            assert_matches_type(Optional[JobProgressResponse], job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_progress(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.super_slurper.jobs.with_raw_response.progress(
+                job_id="job_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `job_id` but received ''"):
+            client.r2.super_slurper.jobs.with_raw_response.progress(
+                job_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_resume(self, client: Cloudflare) -> None:
+        job = client.r2.super_slurper.jobs.resume(
+            job_id="job_id",
+            account_id="account_id",
+        )
+        assert_matches_type(str, job, path=["response"])
+
+    @parametrize
+    def test_raw_response_resume(self, client: Cloudflare) -> None:
+        response = client.r2.super_slurper.jobs.with_raw_response.resume(
+            job_id="job_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = response.parse()
+        assert_matches_type(str, job, path=["response"])
+
+    @parametrize
+    def test_streaming_response_resume(self, client: Cloudflare) -> None:
+        with client.r2.super_slurper.jobs.with_streaming_response.resume(
+            job_id="job_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = response.parse()
+            assert_matches_type(str, job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_resume(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.super_slurper.jobs.with_raw_response.resume(
+                job_id="job_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `job_id` but received ''"):
+            client.r2.super_slurper.jobs.with_raw_response.resume(
+                job_id="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncJobs:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        job = await async_client.r2.super_slurper.jobs.create(
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[JobCreateResponse], job, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        job = await async_client.r2.super_slurper.jobs.create(
+            account_id="account_id",
+            overwrite=True,
+            source={
+                "bucket": "bucket",
+                "secret": {
+                    "access_key_id": "accessKeyId",
+                    "secret_access_key": "secretAccessKey",
+                },
+                "vendor": "s3",
+                "endpoint": "endpoint",
+                "path_prefix": "pathPrefix",
+                "region": "region",
+            },
+            target={
+                "bucket": "bucket",
+                "secret": {
+                    "access_key_id": "accessKeyId",
+                    "secret_access_key": "secretAccessKey",
+                },
+                "vendor": "r2",
+                "jurisdiction": "default",
+            },
+        )
+        assert_matches_type(Optional[JobCreateResponse], job, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.super_slurper.jobs.with_raw_response.create(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = await response.parse()
+        assert_matches_type(Optional[JobCreateResponse], job, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.super_slurper.jobs.with_streaming_response.create(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = await response.parse()
+            assert_matches_type(Optional[JobCreateResponse], job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.super_slurper.jobs.with_raw_response.create(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        job = await async_client.r2.super_slurper.jobs.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncSinglePage[JobListResponse], job, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        job = await async_client.r2.super_slurper.jobs.list(
+            account_id="account_id",
+            limit=50,
+            offset=0,
+        )
+        assert_matches_type(AsyncSinglePage[JobListResponse], job, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.super_slurper.jobs.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = await response.parse()
+        assert_matches_type(AsyncSinglePage[JobListResponse], job, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.super_slurper.jobs.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = await response.parse()
+            assert_matches_type(AsyncSinglePage[JobListResponse], job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.super_slurper.jobs.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_abort(self, async_client: AsyncCloudflare) -> None:
+        job = await async_client.r2.super_slurper.jobs.abort(
+            job_id="job_id",
+            account_id="account_id",
+        )
+        assert_matches_type(str, job, path=["response"])
+
+    @parametrize
+    async def test_raw_response_abort(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.super_slurper.jobs.with_raw_response.abort(
+            job_id="job_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = await response.parse()
+        assert_matches_type(str, job, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_abort(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.super_slurper.jobs.with_streaming_response.abort(
+            job_id="job_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = await response.parse()
+            assert_matches_type(str, job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_abort(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.super_slurper.jobs.with_raw_response.abort(
+                job_id="job_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `job_id` but received ''"):
+            await async_client.r2.super_slurper.jobs.with_raw_response.abort(
+                job_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_abort_all(self, async_client: AsyncCloudflare) -> None:
+        job = await async_client.r2.super_slurper.jobs.abort_all(
+            account_id="account_id",
+        )
+        assert_matches_type(str, job, path=["response"])
+
+    @parametrize
+    async def test_raw_response_abort_all(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.super_slurper.jobs.with_raw_response.abort_all(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = await response.parse()
+        assert_matches_type(str, job, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_abort_all(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.super_slurper.jobs.with_streaming_response.abort_all(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = await response.parse()
+            assert_matches_type(str, job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_abort_all(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.super_slurper.jobs.with_raw_response.abort_all(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        job = await async_client.r2.super_slurper.jobs.get(
+            job_id="job_id",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[JobGetResponse], job, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.super_slurper.jobs.with_raw_response.get(
+            job_id="job_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = await response.parse()
+        assert_matches_type(Optional[JobGetResponse], job, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.super_slurper.jobs.with_streaming_response.get(
+            job_id="job_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = await response.parse()
+            assert_matches_type(Optional[JobGetResponse], job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.super_slurper.jobs.with_raw_response.get(
+                job_id="job_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `job_id` but received ''"):
+            await async_client.r2.super_slurper.jobs.with_raw_response.get(
+                job_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_pause(self, async_client: AsyncCloudflare) -> None:
+        job = await async_client.r2.super_slurper.jobs.pause(
+            job_id="job_id",
+            account_id="account_id",
+        )
+        assert_matches_type(str, job, path=["response"])
+
+    @parametrize
+    async def test_raw_response_pause(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.super_slurper.jobs.with_raw_response.pause(
+            job_id="job_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = await response.parse()
+        assert_matches_type(str, job, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_pause(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.super_slurper.jobs.with_streaming_response.pause(
+            job_id="job_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = await response.parse()
+            assert_matches_type(str, job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_pause(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.super_slurper.jobs.with_raw_response.pause(
+                job_id="job_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `job_id` but received ''"):
+            await async_client.r2.super_slurper.jobs.with_raw_response.pause(
+                job_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_progress(self, async_client: AsyncCloudflare) -> None:
+        job = await async_client.r2.super_slurper.jobs.progress(
+            job_id="job_id",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[JobProgressResponse], job, path=["response"])
+
+    @parametrize
+    async def test_raw_response_progress(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.super_slurper.jobs.with_raw_response.progress(
+            job_id="job_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = await response.parse()
+        assert_matches_type(Optional[JobProgressResponse], job, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_progress(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.super_slurper.jobs.with_streaming_response.progress(
+            job_id="job_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = await response.parse()
+            assert_matches_type(Optional[JobProgressResponse], job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_progress(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.super_slurper.jobs.with_raw_response.progress(
+                job_id="job_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `job_id` but received ''"):
+            await async_client.r2.super_slurper.jobs.with_raw_response.progress(
+                job_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_resume(self, async_client: AsyncCloudflare) -> None:
+        job = await async_client.r2.super_slurper.jobs.resume(
+            job_id="job_id",
+            account_id="account_id",
+        )
+        assert_matches_type(str, job, path=["response"])
+
+    @parametrize
+    async def test_raw_response_resume(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.super_slurper.jobs.with_raw_response.resume(
+            job_id="job_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        job = await response.parse()
+        assert_matches_type(str, job, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_resume(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.super_slurper.jobs.with_streaming_response.resume(
+            job_id="job_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            job = await response.parse()
+            assert_matches_type(str, job, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_resume(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.super_slurper.jobs.with_raw_response.resume(
+                job_id="job_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `job_id` but received ''"):
+            await async_client.r2.super_slurper.jobs.with_raw_response.resume(
+                job_id="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/r2/test_buckets.py b/tests/api_resources/r2/test_buckets.py
index 491c61664c1..733506878c5 100644
--- a/tests/api_resources/r2/test_buckets.py
+++ b/tests/api_resources/r2/test_buckets.py
@@ -9,8 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.r2 import Bucket
-from cloudflare.pagination import SyncCursorPagination, AsyncCursorPagination
+from cloudflare.types.r2 import Bucket, BucketListResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -18,6 +17,7 @@
 class TestBuckets:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         bucket = client.r2.buckets.create(
@@ -26,6 +26,7 @@ def test_method_create(self, client: Cloudflare) -> None:
         )
         assert_matches_type(Bucket, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         bucket = client.r2.buckets.create(
@@ -33,9 +34,11 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             name="example-bucket",
             location_hint="apac",
             storage_class="Standard",
+            jurisdiction="default",
         )
         assert_matches_type(Bucket, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.r2.buckets.with_raw_response.create(
@@ -48,6 +51,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         bucket = response.parse()
         assert_matches_type(Bucket, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.r2.buckets.with_streaming_response.create(
@@ -62,6 +66,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -70,13 +75,15 @@ def test_path_params_create(self, client: Cloudflare) -> None:
                 name="example-bucket",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         bucket = client.r2.buckets.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncCursorPagination[Bucket], bucket, path=["response"])
+        assert_matches_type(BucketListResponse, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         bucket = client.r2.buckets.list(
@@ -87,9 +94,11 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
             order="name",
             per_page=1,
             start_after="my-bucket",
+            jurisdiction="default",
         )
-        assert_matches_type(SyncCursorPagination[Bucket], bucket, path=["response"])
+        assert_matches_type(BucketListResponse, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.r2.buckets.with_raw_response.list(
@@ -99,8 +108,9 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         bucket = response.parse()
-        assert_matches_type(SyncCursorPagination[Bucket], bucket, path=["response"])
+        assert_matches_type(BucketListResponse, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.r2.buckets.with_streaming_response.list(
@@ -110,10 +120,11 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             bucket = response.parse()
-            assert_matches_type(SyncCursorPagination[Bucket], bucket, path=["response"])
+            assert_matches_type(BucketListResponse, bucket, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -121,6 +132,7 @@ def test_path_params_list(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         bucket = client.r2.buckets.delete(
@@ -129,6 +141,17 @@ def test_method_delete(self, client: Cloudflare) -> None:
         )
         assert_matches_type(object, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
+        bucket = client.r2.buckets.delete(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(object, bucket, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.r2.buckets.with_raw_response.delete(
@@ -141,6 +164,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         bucket = response.parse()
         assert_matches_type(object, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.r2.buckets.with_streaming_response.delete(
@@ -155,6 +179,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -169,6 +194,75 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        bucket = client.r2.buckets.edit(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            storage_class="Standard",
+        )
+        assert_matches_type(Bucket, bucket, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        bucket = client.r2.buckets.edit(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            storage_class="Standard",
+            jurisdiction="default",
+        )
+        assert_matches_type(Bucket, bucket, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.r2.buckets.with_raw_response.edit(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            storage_class="Standard",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bucket = response.parse()
+        assert_matches_type(Bucket, bucket, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.r2.buckets.with_streaming_response.edit(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            storage_class="Standard",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bucket = response.parse()
+            assert_matches_type(Bucket, bucket, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2.buckets.with_raw_response.edit(
+                bucket_name="example-bucket",
+                account_id="",
+                storage_class="Standard",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2.buckets.with_raw_response.edit(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                storage_class="Standard",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         bucket = client.r2.buckets.get(
@@ -177,6 +271,17 @@ def test_method_get(self, client: Cloudflare) -> None:
         )
         assert_matches_type(Bucket, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        bucket = client.r2.buckets.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(Bucket, bucket, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.r2.buckets.with_raw_response.get(
@@ -189,6 +294,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         bucket = response.parse()
         assert_matches_type(Bucket, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.r2.buckets.with_streaming_response.get(
@@ -203,6 +309,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -219,8 +326,11 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncBuckets:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         bucket = await async_client.r2.buckets.create(
@@ -229,6 +339,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(Bucket, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         bucket = await async_client.r2.buckets.create(
@@ -236,9 +347,11 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             name="example-bucket",
             location_hint="apac",
             storage_class="Standard",
+            jurisdiction="default",
         )
         assert_matches_type(Bucket, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.r2.buckets.with_raw_response.create(
@@ -251,6 +364,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         bucket = await response.parse()
         assert_matches_type(Bucket, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.r2.buckets.with_streaming_response.create(
@@ -265,6 +379,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -273,13 +388,15 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
                 name="example-bucket",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         bucket = await async_client.r2.buckets.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncCursorPagination[Bucket], bucket, path=["response"])
+        assert_matches_type(BucketListResponse, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         bucket = await async_client.r2.buckets.list(
@@ -290,9 +407,11 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
             order="name",
             per_page=1,
             start_after="my-bucket",
+            jurisdiction="default",
         )
-        assert_matches_type(AsyncCursorPagination[Bucket], bucket, path=["response"])
+        assert_matches_type(BucketListResponse, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.r2.buckets.with_raw_response.list(
@@ -302,8 +421,9 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         bucket = await response.parse()
-        assert_matches_type(AsyncCursorPagination[Bucket], bucket, path=["response"])
+        assert_matches_type(BucketListResponse, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.r2.buckets.with_streaming_response.list(
@@ -313,10 +433,11 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             bucket = await response.parse()
-            assert_matches_type(AsyncCursorPagination[Bucket], bucket, path=["response"])
+            assert_matches_type(BucketListResponse, bucket, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -324,6 +445,7 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
                 account_id="",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         bucket = await async_client.r2.buckets.delete(
@@ -332,6 +454,17 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(object, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        bucket = await async_client.r2.buckets.delete(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(object, bucket, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.r2.buckets.with_raw_response.delete(
@@ -344,6 +477,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         bucket = await response.parse()
         assert_matches_type(object, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.r2.buckets.with_streaming_response.delete(
@@ -358,6 +492,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -372,6 +507,75 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        bucket = await async_client.r2.buckets.edit(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            storage_class="Standard",
+        )
+        assert_matches_type(Bucket, bucket, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        bucket = await async_client.r2.buckets.edit(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            storage_class="Standard",
+            jurisdiction="default",
+        )
+        assert_matches_type(Bucket, bucket, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2.buckets.with_raw_response.edit(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            storage_class="Standard",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bucket = await response.parse()
+        assert_matches_type(Bucket, bucket, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2.buckets.with_streaming_response.edit(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            storage_class="Standard",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bucket = await response.parse()
+            assert_matches_type(Bucket, bucket, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2.buckets.with_raw_response.edit(
+                bucket_name="example-bucket",
+                account_id="",
+                storage_class="Standard",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2.buckets.with_raw_response.edit(
+                bucket_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                storage_class="Standard",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         bucket = await async_client.r2.buckets.get(
@@ -380,6 +584,17 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(Bucket, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        bucket = await async_client.r2.buckets.get(
+            bucket_name="example-bucket",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            jurisdiction="default",
+        )
+        assert_matches_type(Bucket, bucket, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.r2.buckets.with_raw_response.get(
@@ -392,6 +607,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         bucket = await response.parse()
         assert_matches_type(Bucket, bucket, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.r2.buckets.with_streaming_response.get(
@@ -406,6 +622,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
diff --git a/tests/api_resources/r2/test_sippy.py b/tests/api_resources/r2/test_sippy.py
deleted file mode 100644
index fa63c6f67c9..00000000000
--- a/tests/api_resources/r2/test_sippy.py
+++ /dev/null
@@ -1,484 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.r2 import Sippy, SippyDeleteResponse
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestSippy:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_update_overload_1(self, client: Cloudflare) -> None:
-        sippy = client.r2.sippy.update(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Sippy, sippy, path=["response"])
-
-    @parametrize
-    def test_method_update_with_all_params_overload_1(self, client: Cloudflare) -> None:
-        sippy = client.r2.sippy.update(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            destination={
-                "access_key_id": "accessKeyId",
-                "provider": "r2",
-                "secret_access_key": "secretAccessKey",
-            },
-            source={
-                "access_key_id": "accessKeyId",
-                "bucket": "bucket",
-                "provider": "aws",
-                "region": "region",
-                "secret_access_key": "secretAccessKey",
-            },
-        )
-        assert_matches_type(Sippy, sippy, path=["response"])
-
-    @parametrize
-    def test_raw_response_update_overload_1(self, client: Cloudflare) -> None:
-        response = client.r2.sippy.with_raw_response.update(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        sippy = response.parse()
-        assert_matches_type(Sippy, sippy, path=["response"])
-
-    @parametrize
-    def test_streaming_response_update_overload_1(self, client: Cloudflare) -> None:
-        with client.r2.sippy.with_streaming_response.update(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            sippy = response.parse()
-            assert_matches_type(Sippy, sippy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_update_overload_1(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.r2.sippy.with_raw_response.update(
-                bucket_name="example-bucket",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
-            client.r2.sippy.with_raw_response.update(
-                bucket_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_update_overload_2(self, client: Cloudflare) -> None:
-        sippy = client.r2.sippy.update(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Sippy, sippy, path=["response"])
-
-    @parametrize
-    def test_method_update_with_all_params_overload_2(self, client: Cloudflare) -> None:
-        sippy = client.r2.sippy.update(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            destination={
-                "access_key_id": "accessKeyId",
-                "provider": "r2",
-                "secret_access_key": "secretAccessKey",
-            },
-            source={
-                "bucket": "bucket",
-                "client_email": "clientEmail",
-                "private_key": "privateKey",
-                "provider": "gcs",
-            },
-        )
-        assert_matches_type(Sippy, sippy, path=["response"])
-
-    @parametrize
-    def test_raw_response_update_overload_2(self, client: Cloudflare) -> None:
-        response = client.r2.sippy.with_raw_response.update(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        sippy = response.parse()
-        assert_matches_type(Sippy, sippy, path=["response"])
-
-    @parametrize
-    def test_streaming_response_update_overload_2(self, client: Cloudflare) -> None:
-        with client.r2.sippy.with_streaming_response.update(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            sippy = response.parse()
-            assert_matches_type(Sippy, sippy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.r2.sippy.with_raw_response.update(
-                bucket_name="example-bucket",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
-            client.r2.sippy.with_raw_response.update(
-                bucket_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_delete(self, client: Cloudflare) -> None:
-        sippy = client.r2.sippy.delete(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SippyDeleteResponse, sippy, path=["response"])
-
-    @parametrize
-    def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.r2.sippy.with_raw_response.delete(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        sippy = response.parse()
-        assert_matches_type(SippyDeleteResponse, sippy, path=["response"])
-
-    @parametrize
-    def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.r2.sippy.with_streaming_response.delete(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            sippy = response.parse()
-            assert_matches_type(SippyDeleteResponse, sippy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.r2.sippy.with_raw_response.delete(
-                bucket_name="example-bucket",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
-            client.r2.sippy.with_raw_response.delete(
-                bucket_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        sippy = client.r2.sippy.get(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Sippy, sippy, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.r2.sippy.with_raw_response.get(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        sippy = response.parse()
-        assert_matches_type(Sippy, sippy, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.r2.sippy.with_streaming_response.get(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            sippy = response.parse()
-            assert_matches_type(Sippy, sippy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.r2.sippy.with_raw_response.get(
-                bucket_name="example-bucket",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
-            client.r2.sippy.with_raw_response.get(
-                bucket_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-
-class TestAsyncSippy:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_update_overload_1(self, async_client: AsyncCloudflare) -> None:
-        sippy = await async_client.r2.sippy.update(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Sippy, sippy, path=["response"])
-
-    @parametrize
-    async def test_method_update_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
-        sippy = await async_client.r2.sippy.update(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            destination={
-                "access_key_id": "accessKeyId",
-                "provider": "r2",
-                "secret_access_key": "secretAccessKey",
-            },
-            source={
-                "access_key_id": "accessKeyId",
-                "bucket": "bucket",
-                "provider": "aws",
-                "region": "region",
-                "secret_access_key": "secretAccessKey",
-            },
-        )
-        assert_matches_type(Sippy, sippy, path=["response"])
-
-    @parametrize
-    async def test_raw_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.r2.sippy.with_raw_response.update(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        sippy = await response.parse()
-        assert_matches_type(Sippy, sippy, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.r2.sippy.with_streaming_response.update(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            sippy = await response.parse()
-            assert_matches_type(Sippy, sippy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_update_overload_1(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.r2.sippy.with_raw_response.update(
-                bucket_name="example-bucket",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
-            await async_client.r2.sippy.with_raw_response.update(
-                bucket_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_update_overload_2(self, async_client: AsyncCloudflare) -> None:
-        sippy = await async_client.r2.sippy.update(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Sippy, sippy, path=["response"])
-
-    @parametrize
-    async def test_method_update_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
-        sippy = await async_client.r2.sippy.update(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            destination={
-                "access_key_id": "accessKeyId",
-                "provider": "r2",
-                "secret_access_key": "secretAccessKey",
-            },
-            source={
-                "bucket": "bucket",
-                "client_email": "clientEmail",
-                "private_key": "privateKey",
-                "provider": "gcs",
-            },
-        )
-        assert_matches_type(Sippy, sippy, path=["response"])
-
-    @parametrize
-    async def test_raw_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.r2.sippy.with_raw_response.update(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        sippy = await response.parse()
-        assert_matches_type(Sippy, sippy, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.r2.sippy.with_streaming_response.update(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            sippy = await response.parse()
-            assert_matches_type(Sippy, sippy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.r2.sippy.with_raw_response.update(
-                bucket_name="example-bucket",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
-            await async_client.r2.sippy.with_raw_response.update(
-                bucket_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        sippy = await async_client.r2.sippy.delete(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SippyDeleteResponse, sippy, path=["response"])
-
-    @parametrize
-    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.r2.sippy.with_raw_response.delete(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        sippy = await response.parse()
-        assert_matches_type(SippyDeleteResponse, sippy, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.r2.sippy.with_streaming_response.delete(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            sippy = await response.parse()
-            assert_matches_type(SippyDeleteResponse, sippy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.r2.sippy.with_raw_response.delete(
-                bucket_name="example-bucket",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
-            await async_client.r2.sippy.with_raw_response.delete(
-                bucket_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        sippy = await async_client.r2.sippy.get(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Sippy, sippy, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.r2.sippy.with_raw_response.get(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        sippy = await response.parse()
-        assert_matches_type(Sippy, sippy, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.r2.sippy.with_streaming_response.get(
-            bucket_name="example-bucket",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            sippy = await response.parse()
-            assert_matches_type(Sippy, sippy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.r2.sippy.with_raw_response.get(
-                bucket_name="example-bucket",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
-            await async_client.r2.sippy.with_raw_response.get(
-                bucket_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
diff --git a/tests/api_resources/r2/test_temporary_credentials.py b/tests/api_resources/r2/test_temporary_credentials.py
index 3bdf9c876b1..71d2caa82f8 100644
--- a/tests/api_resources/r2/test_temporary_credentials.py
+++ b/tests/api_resources/r2/test_temporary_credentials.py
@@ -17,6 +17,7 @@
 class TestTemporaryCredentials:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         temporary_credential = client.r2.temporary_credentials.create(
@@ -28,6 +29,7 @@ def test_method_create(self, client: Cloudflare) -> None:
         )
         assert_matches_type(TemporaryCredentialCreateResponse, temporary_credential, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         temporary_credential = client.r2.temporary_credentials.create(
@@ -41,6 +43,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         )
         assert_matches_type(TemporaryCredentialCreateResponse, temporary_credential, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.r2.temporary_credentials.with_raw_response.create(
@@ -56,6 +59,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         temporary_credential = response.parse()
         assert_matches_type(TemporaryCredentialCreateResponse, temporary_credential, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.r2.temporary_credentials.with_streaming_response.create(
@@ -73,6 +77,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -86,8 +91,11 @@ def test_path_params_create(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTemporaryCredentials:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         temporary_credential = await async_client.r2.temporary_credentials.create(
@@ -99,6 +107,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(TemporaryCredentialCreateResponse, temporary_credential, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         temporary_credential = await async_client.r2.temporary_credentials.create(
@@ -112,6 +121,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
         )
         assert_matches_type(TemporaryCredentialCreateResponse, temporary_credential, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.r2.temporary_credentials.with_raw_response.create(
@@ -127,6 +137,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         temporary_credential = await response.parse()
         assert_matches_type(TemporaryCredentialCreateResponse, temporary_credential, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.r2.temporary_credentials.with_streaming_response.create(
@@ -144,6 +155,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
diff --git a/tests/api_resources/r2_data_catalog/__init__.py b/tests/api_resources/r2_data_catalog/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/r2_data_catalog/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/r2_data_catalog/namespaces/__init__.py b/tests/api_resources/r2_data_catalog/namespaces/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/r2_data_catalog/namespaces/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/r2_data_catalog/namespaces/tables/__init__.py b/tests/api_resources/r2_data_catalog/namespaces/tables/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/r2_data_catalog/namespaces/tables/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/r2_data_catalog/namespaces/tables/test_maintenance_configs.py b/tests/api_resources/r2_data_catalog/namespaces/tables/test_maintenance_configs.py
new file mode 100644
index 00000000000..313916aa261
--- /dev/null
+++ b/tests/api_resources/r2_data_catalog/namespaces/tables/test_maintenance_configs.py
@@ -0,0 +1,361 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.r2_data_catalog.namespaces.tables import (
+    MaintenanceConfigGetResponse,
+    MaintenanceConfigUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestMaintenanceConfigs:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        maintenance_config = client.r2_data_catalog.namespaces.tables.maintenance_configs.update(
+            table_name="my_table",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+            namespace="my_namespace%1Fsub_namespace",
+        )
+        assert_matches_type(Optional[MaintenanceConfigUpdateResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        maintenance_config = client.r2_data_catalog.namespaces.tables.maintenance_configs.update(
+            table_name="my_table",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+            namespace="my_namespace%1Fsub_namespace",
+            compaction={
+                "state": "enabled",
+                "target_size_mb": "256",
+            },
+            snapshot_expiration={
+                "max_snapshot_age": "14d",
+                "min_snapshots_to_keep": 5,
+                "state": "enabled",
+            },
+        )
+        assert_matches_type(Optional[MaintenanceConfigUpdateResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.update(
+            table_name="my_table",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+            namespace="my_namespace%1Fsub_namespace",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        maintenance_config = response.parse()
+        assert_matches_type(Optional[MaintenanceConfigUpdateResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.r2_data_catalog.namespaces.tables.maintenance_configs.with_streaming_response.update(
+            table_name="my_table",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+            namespace="my_namespace%1Fsub_namespace",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            maintenance_config = response.parse()
+            assert_matches_type(Optional[MaintenanceConfigUpdateResponse], maintenance_config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.update(
+                table_name="my_table",
+                account_id="",
+                bucket_name="my-data-bucket",
+                namespace="my_namespace%1Fsub_namespace",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.update(
+                table_name="my_table",
+                account_id="0123456789abcdef0123456789abcdef",
+                bucket_name="",
+                namespace="my_namespace%1Fsub_namespace",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace` but received ''"):
+            client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.update(
+                table_name="my_table",
+                account_id="0123456789abcdef0123456789abcdef",
+                bucket_name="my-data-bucket",
+                namespace="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `table_name` but received ''"):
+            client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.update(
+                table_name="",
+                account_id="0123456789abcdef0123456789abcdef",
+                bucket_name="my-data-bucket",
+                namespace="my_namespace%1Fsub_namespace",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        maintenance_config = client.r2_data_catalog.namespaces.tables.maintenance_configs.get(
+            table_name="my_table",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+            namespace="my_namespace%1Fsub_namespace",
+        )
+        assert_matches_type(Optional[MaintenanceConfigGetResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.get(
+            table_name="my_table",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+            namespace="my_namespace%1Fsub_namespace",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        maintenance_config = response.parse()
+        assert_matches_type(Optional[MaintenanceConfigGetResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.r2_data_catalog.namespaces.tables.maintenance_configs.with_streaming_response.get(
+            table_name="my_table",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+            namespace="my_namespace%1Fsub_namespace",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            maintenance_config = response.parse()
+            assert_matches_type(Optional[MaintenanceConfigGetResponse], maintenance_config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.get(
+                table_name="my_table",
+                account_id="",
+                bucket_name="my-data-bucket",
+                namespace="my_namespace%1Fsub_namespace",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.get(
+                table_name="my_table",
+                account_id="0123456789abcdef0123456789abcdef",
+                bucket_name="",
+                namespace="my_namespace%1Fsub_namespace",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace` but received ''"):
+            client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.get(
+                table_name="my_table",
+                account_id="0123456789abcdef0123456789abcdef",
+                bucket_name="my-data-bucket",
+                namespace="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `table_name` but received ''"):
+            client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.get(
+                table_name="",
+                account_id="0123456789abcdef0123456789abcdef",
+                bucket_name="my-data-bucket",
+                namespace="my_namespace%1Fsub_namespace",
+            )
+
+
+class TestAsyncMaintenanceConfigs:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        maintenance_config = await async_client.r2_data_catalog.namespaces.tables.maintenance_configs.update(
+            table_name="my_table",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+            namespace="my_namespace%1Fsub_namespace",
+        )
+        assert_matches_type(Optional[MaintenanceConfigUpdateResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        maintenance_config = await async_client.r2_data_catalog.namespaces.tables.maintenance_configs.update(
+            table_name="my_table",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+            namespace="my_namespace%1Fsub_namespace",
+            compaction={
+                "state": "enabled",
+                "target_size_mb": "256",
+            },
+            snapshot_expiration={
+                "max_snapshot_age": "14d",
+                "min_snapshots_to_keep": 5,
+                "state": "enabled",
+            },
+        )
+        assert_matches_type(Optional[MaintenanceConfigUpdateResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.update(
+            table_name="my_table",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+            namespace="my_namespace%1Fsub_namespace",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        maintenance_config = await response.parse()
+        assert_matches_type(Optional[MaintenanceConfigUpdateResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2_data_catalog.namespaces.tables.maintenance_configs.with_streaming_response.update(
+            table_name="my_table",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+            namespace="my_namespace%1Fsub_namespace",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            maintenance_config = await response.parse()
+            assert_matches_type(Optional[MaintenanceConfigUpdateResponse], maintenance_config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.update(
+                table_name="my_table",
+                account_id="",
+                bucket_name="my-data-bucket",
+                namespace="my_namespace%1Fsub_namespace",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.update(
+                table_name="my_table",
+                account_id="0123456789abcdef0123456789abcdef",
+                bucket_name="",
+                namespace="my_namespace%1Fsub_namespace",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace` but received ''"):
+            await async_client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.update(
+                table_name="my_table",
+                account_id="0123456789abcdef0123456789abcdef",
+                bucket_name="my-data-bucket",
+                namespace="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `table_name` but received ''"):
+            await async_client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.update(
+                table_name="",
+                account_id="0123456789abcdef0123456789abcdef",
+                bucket_name="my-data-bucket",
+                namespace="my_namespace%1Fsub_namespace",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        maintenance_config = await async_client.r2_data_catalog.namespaces.tables.maintenance_configs.get(
+            table_name="my_table",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+            namespace="my_namespace%1Fsub_namespace",
+        )
+        assert_matches_type(Optional[MaintenanceConfigGetResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.get(
+            table_name="my_table",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+            namespace="my_namespace%1Fsub_namespace",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        maintenance_config = await response.parse()
+        assert_matches_type(Optional[MaintenanceConfigGetResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2_data_catalog.namespaces.tables.maintenance_configs.with_streaming_response.get(
+            table_name="my_table",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+            namespace="my_namespace%1Fsub_namespace",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            maintenance_config = await response.parse()
+            assert_matches_type(Optional[MaintenanceConfigGetResponse], maintenance_config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.get(
+                table_name="my_table",
+                account_id="",
+                bucket_name="my-data-bucket",
+                namespace="my_namespace%1Fsub_namespace",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.get(
+                table_name="my_table",
+                account_id="0123456789abcdef0123456789abcdef",
+                bucket_name="",
+                namespace="my_namespace%1Fsub_namespace",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace` but received ''"):
+            await async_client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.get(
+                table_name="my_table",
+                account_id="0123456789abcdef0123456789abcdef",
+                bucket_name="my-data-bucket",
+                namespace="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `table_name` but received ''"):
+            await async_client.r2_data_catalog.namespaces.tables.maintenance_configs.with_raw_response.get(
+                table_name="",
+                account_id="0123456789abcdef0123456789abcdef",
+                bucket_name="my-data-bucket",
+                namespace="my_namespace%1Fsub_namespace",
+            )
diff --git a/tests/api_resources/r2_data_catalog/namespaces/test_tables.py b/tests/api_resources/r2_data_catalog/namespaces/test_tables.py
new file mode 100644
index 00000000000..bcd23dde9c2
--- /dev/null
+++ b/tests/api_resources/r2_data_catalog/namespaces/test_tables.py
@@ -0,0 +1,170 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.r2_data_catalog.namespaces import TableListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestTables:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        table = client.r2_data_catalog.namespaces.tables.list(
+            namespace="bronze",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+        )
+        assert_matches_type(Optional[TableListResponse], table, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        table = client.r2_data_catalog.namespaces.tables.list(
+            namespace="bronze",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+            page_size=1,
+            page_token="page_token",
+            return_details=True,
+            return_uuids=True,
+        )
+        assert_matches_type(Optional[TableListResponse], table, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.r2_data_catalog.namespaces.tables.with_raw_response.list(
+            namespace="bronze",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        table = response.parse()
+        assert_matches_type(Optional[TableListResponse], table, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.r2_data_catalog.namespaces.tables.with_streaming_response.list(
+            namespace="bronze",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            table = response.parse()
+            assert_matches_type(Optional[TableListResponse], table, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2_data_catalog.namespaces.tables.with_raw_response.list(
+                namespace="bronze",
+                account_id="",
+                bucket_name="my-data-bucket",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2_data_catalog.namespaces.tables.with_raw_response.list(
+                namespace="bronze",
+                account_id="0123456789abcdef0123456789abcdef",
+                bucket_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace` but received ''"):
+            client.r2_data_catalog.namespaces.tables.with_raw_response.list(
+                namespace="",
+                account_id="0123456789abcdef0123456789abcdef",
+                bucket_name="my-data-bucket",
+            )
+
+
+class TestAsyncTables:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        table = await async_client.r2_data_catalog.namespaces.tables.list(
+            namespace="bronze",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+        )
+        assert_matches_type(Optional[TableListResponse], table, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        table = await async_client.r2_data_catalog.namespaces.tables.list(
+            namespace="bronze",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+            page_size=1,
+            page_token="page_token",
+            return_details=True,
+            return_uuids=True,
+        )
+        assert_matches_type(Optional[TableListResponse], table, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2_data_catalog.namespaces.tables.with_raw_response.list(
+            namespace="bronze",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        table = await response.parse()
+        assert_matches_type(Optional[TableListResponse], table, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2_data_catalog.namespaces.tables.with_streaming_response.list(
+            namespace="bronze",
+            account_id="0123456789abcdef0123456789abcdef",
+            bucket_name="my-data-bucket",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            table = await response.parse()
+            assert_matches_type(Optional[TableListResponse], table, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2_data_catalog.namespaces.tables.with_raw_response.list(
+                namespace="bronze",
+                account_id="",
+                bucket_name="my-data-bucket",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2_data_catalog.namespaces.tables.with_raw_response.list(
+                namespace="bronze",
+                account_id="0123456789abcdef0123456789abcdef",
+                bucket_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `namespace` but received ''"):
+            await async_client.r2_data_catalog.namespaces.tables.with_raw_response.list(
+                namespace="",
+                account_id="0123456789abcdef0123456789abcdef",
+                bucket_name="my-data-bucket",
+            )
diff --git a/tests/api_resources/r2_data_catalog/test_credentials.py b/tests/api_resources/r2_data_catalog/test_credentials.py
new file mode 100644
index 00000000000..35351088095
--- /dev/null
+++ b/tests/api_resources/r2_data_catalog/test_credentials.py
@@ -0,0 +1,129 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCredentials:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        credential = client.r2_data_catalog.credentials.create(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+            token="your-cloudflare-api-token-here",
+        )
+        assert_matches_type(object, credential, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.r2_data_catalog.credentials.with_raw_response.create(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+            token="your-cloudflare-api-token-here",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        credential = response.parse()
+        assert_matches_type(object, credential, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.r2_data_catalog.credentials.with_streaming_response.create(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+            token="your-cloudflare-api-token-here",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            credential = response.parse()
+            assert_matches_type(object, credential, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2_data_catalog.credentials.with_raw_response.create(
+                bucket_name="my-data-bucket",
+                account_id="",
+                token="your-cloudflare-api-token-here",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2_data_catalog.credentials.with_raw_response.create(
+                bucket_name="",
+                account_id="0123456789abcdef0123456789abcdef",
+                token="your-cloudflare-api-token-here",
+            )
+
+
+class TestAsyncCredentials:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        credential = await async_client.r2_data_catalog.credentials.create(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+            token="your-cloudflare-api-token-here",
+        )
+        assert_matches_type(object, credential, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2_data_catalog.credentials.with_raw_response.create(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+            token="your-cloudflare-api-token-here",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        credential = await response.parse()
+        assert_matches_type(object, credential, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2_data_catalog.credentials.with_streaming_response.create(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+            token="your-cloudflare-api-token-here",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            credential = await response.parse()
+            assert_matches_type(object, credential, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2_data_catalog.credentials.with_raw_response.create(
+                bucket_name="my-data-bucket",
+                account_id="",
+                token="your-cloudflare-api-token-here",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2_data_catalog.credentials.with_raw_response.create(
+                bucket_name="",
+                account_id="0123456789abcdef0123456789abcdef",
+                token="your-cloudflare-api-token-here",
+            )
diff --git a/tests/api_resources/r2_data_catalog/test_maintenance_configs.py b/tests/api_resources/r2_data_catalog/test_maintenance_configs.py
new file mode 100644
index 00000000000..629d2e51060
--- /dev/null
+++ b/tests/api_resources/r2_data_catalog/test_maintenance_configs.py
@@ -0,0 +1,253 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.r2_data_catalog import (
+    MaintenanceConfigGetResponse,
+    MaintenanceConfigUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestMaintenanceConfigs:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        maintenance_config = client.r2_data_catalog.maintenance_configs.update(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+        assert_matches_type(Optional[MaintenanceConfigUpdateResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        maintenance_config = client.r2_data_catalog.maintenance_configs.update(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+            compaction={
+                "state": "enabled",
+                "target_size_mb": "256",
+            },
+            snapshot_expiration={
+                "max_snapshot_age": "14d",
+                "min_snapshots_to_keep": 5,
+                "state": "enabled",
+            },
+        )
+        assert_matches_type(Optional[MaintenanceConfigUpdateResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.r2_data_catalog.maintenance_configs.with_raw_response.update(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        maintenance_config = response.parse()
+        assert_matches_type(Optional[MaintenanceConfigUpdateResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.r2_data_catalog.maintenance_configs.with_streaming_response.update(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            maintenance_config = response.parse()
+            assert_matches_type(Optional[MaintenanceConfigUpdateResponse], maintenance_config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2_data_catalog.maintenance_configs.with_raw_response.update(
+                bucket_name="my-data-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2_data_catalog.maintenance_configs.with_raw_response.update(
+                bucket_name="",
+                account_id="0123456789abcdef0123456789abcdef",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        maintenance_config = client.r2_data_catalog.maintenance_configs.get(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+        assert_matches_type(Optional[MaintenanceConfigGetResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.r2_data_catalog.maintenance_configs.with_raw_response.get(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        maintenance_config = response.parse()
+        assert_matches_type(Optional[MaintenanceConfigGetResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.r2_data_catalog.maintenance_configs.with_streaming_response.get(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            maintenance_config = response.parse()
+            assert_matches_type(Optional[MaintenanceConfigGetResponse], maintenance_config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2_data_catalog.maintenance_configs.with_raw_response.get(
+                bucket_name="my-data-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2_data_catalog.maintenance_configs.with_raw_response.get(
+                bucket_name="",
+                account_id="0123456789abcdef0123456789abcdef",
+            )
+
+
+class TestAsyncMaintenanceConfigs:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        maintenance_config = await async_client.r2_data_catalog.maintenance_configs.update(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+        assert_matches_type(Optional[MaintenanceConfigUpdateResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        maintenance_config = await async_client.r2_data_catalog.maintenance_configs.update(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+            compaction={
+                "state": "enabled",
+                "target_size_mb": "256",
+            },
+            snapshot_expiration={
+                "max_snapshot_age": "14d",
+                "min_snapshots_to_keep": 5,
+                "state": "enabled",
+            },
+        )
+        assert_matches_type(Optional[MaintenanceConfigUpdateResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2_data_catalog.maintenance_configs.with_raw_response.update(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        maintenance_config = await response.parse()
+        assert_matches_type(Optional[MaintenanceConfigUpdateResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2_data_catalog.maintenance_configs.with_streaming_response.update(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            maintenance_config = await response.parse()
+            assert_matches_type(Optional[MaintenanceConfigUpdateResponse], maintenance_config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2_data_catalog.maintenance_configs.with_raw_response.update(
+                bucket_name="my-data-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2_data_catalog.maintenance_configs.with_raw_response.update(
+                bucket_name="",
+                account_id="0123456789abcdef0123456789abcdef",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        maintenance_config = await async_client.r2_data_catalog.maintenance_configs.get(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+        assert_matches_type(Optional[MaintenanceConfigGetResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2_data_catalog.maintenance_configs.with_raw_response.get(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        maintenance_config = await response.parse()
+        assert_matches_type(Optional[MaintenanceConfigGetResponse], maintenance_config, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2_data_catalog.maintenance_configs.with_streaming_response.get(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            maintenance_config = await response.parse()
+            assert_matches_type(Optional[MaintenanceConfigGetResponse], maintenance_config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2_data_catalog.maintenance_configs.with_raw_response.get(
+                bucket_name="my-data-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2_data_catalog.maintenance_configs.with_raw_response.get(
+                bucket_name="",
+                account_id="0123456789abcdef0123456789abcdef",
+            )
diff --git a/tests/api_resources/r2_data_catalog/test_namespaces.py b/tests/api_resources/r2_data_catalog/test_namespaces.py
new file mode 100644
index 00000000000..613a9b81018
--- /dev/null
+++ b/tests/api_resources/r2_data_catalog/test_namespaces.py
@@ -0,0 +1,146 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.r2_data_catalog import NamespaceListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestNamespaces:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        namespace = client.r2_data_catalog.namespaces.list(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+        assert_matches_type(Optional[NamespaceListResponse], namespace, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        namespace = client.r2_data_catalog.namespaces.list(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+            page_size=1,
+            page_token="page_token",
+            parent="parent",
+            return_details=True,
+            return_uuids=True,
+        )
+        assert_matches_type(Optional[NamespaceListResponse], namespace, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.r2_data_catalog.namespaces.with_raw_response.list(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        namespace = response.parse()
+        assert_matches_type(Optional[NamespaceListResponse], namespace, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.r2_data_catalog.namespaces.with_streaming_response.list(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            namespace = response.parse()
+            assert_matches_type(Optional[NamespaceListResponse], namespace, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2_data_catalog.namespaces.with_raw_response.list(
+                bucket_name="my-data-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2_data_catalog.namespaces.with_raw_response.list(
+                bucket_name="",
+                account_id="0123456789abcdef0123456789abcdef",
+            )
+
+
+class TestAsyncNamespaces:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        namespace = await async_client.r2_data_catalog.namespaces.list(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+        assert_matches_type(Optional[NamespaceListResponse], namespace, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        namespace = await async_client.r2_data_catalog.namespaces.list(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+            page_size=1,
+            page_token="page_token",
+            parent="parent",
+            return_details=True,
+            return_uuids=True,
+        )
+        assert_matches_type(Optional[NamespaceListResponse], namespace, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2_data_catalog.namespaces.with_raw_response.list(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        namespace = await response.parse()
+        assert_matches_type(Optional[NamespaceListResponse], namespace, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2_data_catalog.namespaces.with_streaming_response.list(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            namespace = await response.parse()
+            assert_matches_type(Optional[NamespaceListResponse], namespace, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2_data_catalog.namespaces.with_raw_response.list(
+                bucket_name="my-data-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2_data_catalog.namespaces.with_raw_response.list(
+                bucket_name="",
+                account_id="0123456789abcdef0123456789abcdef",
+            )
diff --git a/tests/api_resources/radar/ai/__init__.py b/tests/api_resources/radar/ai/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/radar/ai/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/radar/ai/bots/__init__.py b/tests/api_resources/radar/ai/bots/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/radar/ai/bots/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/radar/ai/bots/test_summary.py b/tests/api_resources/radar/ai/bots/test_summary.py
new file mode 100644
index 00000000000..e0519fb4b0e
--- /dev/null
+++ b/tests/api_resources/radar/ai/bots/test_summary.py
@@ -0,0 +1,119 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar.ai.bots import SummaryUserAgentResponse
+
+# pyright: reportDeprecated=false
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSummary:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_user_agent(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.ai.bots.summary.user_agent()
+
+        assert_matches_type(SummaryUserAgentResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_user_agent_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.ai.bots.summary.user_agent(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+            )
+
+        assert_matches_type(SummaryUserAgentResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_user_agent(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.ai.bots.summary.with_raw_response.user_agent()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryUserAgentResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_user_agent(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.ai.bots.summary.with_streaming_response.user_agent() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryUserAgentResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncSummary:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_user_agent(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.ai.bots.summary.user_agent()
+
+        assert_matches_type(SummaryUserAgentResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_user_agent_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.ai.bots.summary.user_agent(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+            )
+
+        assert_matches_type(SummaryUserAgentResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_user_agent(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.ai.bots.summary.with_raw_response.user_agent()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryUserAgentResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_user_agent(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.ai.bots.summary.with_streaming_response.user_agent() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryUserAgentResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/ai/inference/__init__.py b/tests/api_resources/radar/ai/inference/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/radar/ai/inference/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/radar/ai/inference/test_summary.py b/tests/api_resources/radar/ai/inference/test_summary.py
new file mode 100644
index 00000000000..951db98ea39
--- /dev/null
+++ b/tests/api_resources/radar/ai/inference/test_summary.py
@@ -0,0 +1,202 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar.ai.inference import (
+    SummaryTaskResponse,
+    SummaryModelResponse,
+)
+
+# pyright: reportDeprecated=false
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSummary:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_model(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.ai.inference.summary.model()
+
+        assert_matches_type(SummaryModelResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_model_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.ai.inference.summary.model(
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                name=["main_series"],
+            )
+
+        assert_matches_type(SummaryModelResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_model(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.ai.inference.summary.with_raw_response.model()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryModelResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_model(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.ai.inference.summary.with_streaming_response.model() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryModelResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_task(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.ai.inference.summary.task()
+
+        assert_matches_type(SummaryTaskResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_task_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.ai.inference.summary.task(
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                name=["main_series"],
+            )
+
+        assert_matches_type(SummaryTaskResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_task(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.ai.inference.summary.with_raw_response.task()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryTaskResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_task(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.ai.inference.summary.with_streaming_response.task() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryTaskResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncSummary:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_model(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.ai.inference.summary.model()
+
+        assert_matches_type(SummaryModelResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_model_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.ai.inference.summary.model(
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                name=["main_series"],
+            )
+
+        assert_matches_type(SummaryModelResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_model(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.ai.inference.summary.with_raw_response.model()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryModelResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_model(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.ai.inference.summary.with_streaming_response.model() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryModelResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_task(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.ai.inference.summary.task()
+
+        assert_matches_type(SummaryTaskResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_task_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.ai.inference.summary.task(
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                name=["main_series"],
+            )
+
+        assert_matches_type(SummaryTaskResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_task(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.ai.inference.summary.with_raw_response.task()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryTaskResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_task(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.ai.inference.summary.with_streaming_response.task() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryTaskResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/ai/inference/timeseries_groups/__init__.py b/tests/api_resources/radar/ai/inference/timeseries_groups/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/radar/ai/inference/timeseries_groups/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/radar/ai/inference/timeseries_groups/test_summary.py b/tests/api_resources/radar/ai/inference/timeseries_groups/test_summary.py
new file mode 100644
index 00000000000..c6b6894e32f
--- /dev/null
+++ b/tests/api_resources/radar/ai/inference/timeseries_groups/test_summary.py
@@ -0,0 +1,210 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar.ai.inference.timeseries_groups import (
+    SummaryTaskResponse,
+    SummaryModelResponse,
+)
+
+# pyright: reportDeprecated=false
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSummary:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_model(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.ai.inference.timeseries_groups.summary.model()
+
+        assert_matches_type(SummaryModelResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_model_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.ai.inference.timeseries_groups.summary.model(
+                agg_interval="1h",
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                name=["main_series"],
+            )
+
+        assert_matches_type(SummaryModelResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_model(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.ai.inference.timeseries_groups.summary.with_raw_response.model()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryModelResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_model(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.ai.inference.timeseries_groups.summary.with_streaming_response.model() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryModelResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_task(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.ai.inference.timeseries_groups.summary.task()
+
+        assert_matches_type(SummaryTaskResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_task_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.ai.inference.timeseries_groups.summary.task(
+                agg_interval="1h",
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                name=["main_series"],
+            )
+
+        assert_matches_type(SummaryTaskResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_task(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.ai.inference.timeseries_groups.summary.with_raw_response.task()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryTaskResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_task(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.ai.inference.timeseries_groups.summary.with_streaming_response.task() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryTaskResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncSummary:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_model(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.ai.inference.timeseries_groups.summary.model()
+
+        assert_matches_type(SummaryModelResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_model_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.ai.inference.timeseries_groups.summary.model(
+                agg_interval="1h",
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                name=["main_series"],
+            )
+
+        assert_matches_type(SummaryModelResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_model(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.ai.inference.timeseries_groups.summary.with_raw_response.model()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryModelResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_model(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.ai.inference.timeseries_groups.summary.with_streaming_response.model()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryModelResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_task(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.ai.inference.timeseries_groups.summary.task()
+
+        assert_matches_type(SummaryTaskResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_task_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.ai.inference.timeseries_groups.summary.task(
+                agg_interval="1h",
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                name=["main_series"],
+            )
+
+        assert_matches_type(SummaryTaskResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_task(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.ai.inference.timeseries_groups.summary.with_raw_response.task()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryTaskResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_task(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.ai.inference.timeseries_groups.summary.with_streaming_response.task()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryTaskResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/ai/test_bots.py b/tests/api_resources/radar/ai/test_bots.py
new file mode 100644
index 00000000000..80a6276974e
--- /dev/null
+++ b/tests/api_resources/radar/ai/test_bots.py
@@ -0,0 +1,323 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar.ai import (
+    BotSummaryV2Response,
+    BotTimeseriesResponse,
+    BotTimeseriesGroupsResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestBots:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_summary_v2(self, client: Cloudflare) -> None:
+        bot = client.radar.ai.bots.summary_v2(
+            dimension="USER_AGENT",
+        )
+        assert_matches_type(BotSummaryV2Response, bot, path=["response"])
+
+    @parametrize
+    def test_method_summary_v2_with_all_params(self, client: Cloudflare) -> None:
+        bot = client.radar.ai.bots.summary_v2(
+            dimension="USER_AGENT",
+            asn=["string"],
+            continent=["string"],
+            crawl_purpose=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            industry=["string"],
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            vertical=["string"],
+        )
+        assert_matches_type(BotSummaryV2Response, bot, path=["response"])
+
+    @parametrize
+    def test_raw_response_summary_v2(self, client: Cloudflare) -> None:
+        response = client.radar.ai.bots.with_raw_response.summary_v2(
+            dimension="USER_AGENT",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bot = response.parse()
+        assert_matches_type(BotSummaryV2Response, bot, path=["response"])
+
+    @parametrize
+    def test_streaming_response_summary_v2(self, client: Cloudflare) -> None:
+        with client.radar.ai.bots.with_streaming_response.summary_v2(
+            dimension="USER_AGENT",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bot = response.parse()
+            assert_matches_type(BotSummaryV2Response, bot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_timeseries(self, client: Cloudflare) -> None:
+        bot = client.radar.ai.bots.timeseries()
+        assert_matches_type(BotTimeseriesResponse, bot, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_with_all_params(self, client: Cloudflare) -> None:
+        bot = client.radar.ai.bots.timeseries(
+            agg_interval="1h",
+            asn=["string"],
+            continent=["string"],
+            crawl_purpose=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            industry=["string"],
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            user_agent=["string"],
+            vertical=["string"],
+        )
+        assert_matches_type(BotTimeseriesResponse, bot, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries(self, client: Cloudflare) -> None:
+        response = client.radar.ai.bots.with_raw_response.timeseries()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bot = response.parse()
+        assert_matches_type(BotTimeseriesResponse, bot, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries(self, client: Cloudflare) -> None:
+        with client.radar.ai.bots.with_streaming_response.timeseries() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bot = response.parse()
+            assert_matches_type(BotTimeseriesResponse, bot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_timeseries_groups(self, client: Cloudflare) -> None:
+        bot = client.radar.ai.bots.timeseries_groups(
+            dimension="USER_AGENT",
+        )
+        assert_matches_type(BotTimeseriesGroupsResponse, bot, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_groups_with_all_params(self, client: Cloudflare) -> None:
+        bot = client.radar.ai.bots.timeseries_groups(
+            dimension="USER_AGENT",
+            agg_interval="1h",
+            asn=["string"],
+            continent=["string"],
+            crawl_purpose=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            industry=["string"],
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            normalization="MIN0_MAX",
+            vertical=["string"],
+        )
+        assert_matches_type(BotTimeseriesGroupsResponse, bot, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries_groups(self, client: Cloudflare) -> None:
+        response = client.radar.ai.bots.with_raw_response.timeseries_groups(
+            dimension="USER_AGENT",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bot = response.parse()
+        assert_matches_type(BotTimeseriesGroupsResponse, bot, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries_groups(self, client: Cloudflare) -> None:
+        with client.radar.ai.bots.with_streaming_response.timeseries_groups(
+            dimension="USER_AGENT",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bot = response.parse()
+            assert_matches_type(BotTimeseriesGroupsResponse, bot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncBots:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        bot = await async_client.radar.ai.bots.summary_v2(
+            dimension="USER_AGENT",
+        )
+        assert_matches_type(BotSummaryV2Response, bot, path=["response"])
+
+    @parametrize
+    async def test_method_summary_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        bot = await async_client.radar.ai.bots.summary_v2(
+            dimension="USER_AGENT",
+            asn=["string"],
+            continent=["string"],
+            crawl_purpose=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            industry=["string"],
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            vertical=["string"],
+        )
+        assert_matches_type(BotSummaryV2Response, bot, path=["response"])
+
+    @parametrize
+    async def test_raw_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.ai.bots.with_raw_response.summary_v2(
+            dimension="USER_AGENT",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bot = await response.parse()
+        assert_matches_type(BotSummaryV2Response, bot, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.ai.bots.with_streaming_response.summary_v2(
+            dimension="USER_AGENT",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bot = await response.parse()
+            assert_matches_type(BotSummaryV2Response, bot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
+        bot = await async_client.radar.ai.bots.timeseries()
+        assert_matches_type(BotTimeseriesResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        bot = await async_client.radar.ai.bots.timeseries(
+            agg_interval="1h",
+            asn=["string"],
+            continent=["string"],
+            crawl_purpose=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            industry=["string"],
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            user_agent=["string"],
+            vertical=["string"],
+        )
+        assert_matches_type(BotTimeseriesResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.ai.bots.with_raw_response.timeseries()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bot = await response.parse()
+        assert_matches_type(BotTimeseriesResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.ai.bots.with_streaming_response.timeseries() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bot = await response.parse()
+            assert_matches_type(BotTimeseriesResponse, bot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        bot = await async_client.radar.ai.bots.timeseries_groups(
+            dimension="USER_AGENT",
+        )
+        assert_matches_type(BotTimeseriesGroupsResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_groups_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        bot = await async_client.radar.ai.bots.timeseries_groups(
+            dimension="USER_AGENT",
+            agg_interval="1h",
+            asn=["string"],
+            continent=["string"],
+            crawl_purpose=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            industry=["string"],
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            normalization="MIN0_MAX",
+            vertical=["string"],
+        )
+        assert_matches_type(BotTimeseriesGroupsResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.ai.bots.with_raw_response.timeseries_groups(
+            dimension="USER_AGENT",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bot = await response.parse()
+        assert_matches_type(BotTimeseriesGroupsResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.ai.bots.with_streaming_response.timeseries_groups(
+            dimension="USER_AGENT",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bot = await response.parse()
+            assert_matches_type(BotTimeseriesGroupsResponse, bot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/ai/test_inference.py b/tests/api_resources/radar/ai/test_inference.py
new file mode 100644
index 00000000000..f9da17395a9
--- /dev/null
+++ b/tests/api_resources/radar/ai/test_inference.py
@@ -0,0 +1,220 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar.ai import (
+    InferenceSummaryV2Response,
+    InferenceTimeseriesGroupsV2Response,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestInference:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_summary_v2(self, client: Cloudflare) -> None:
+        inference = client.radar.ai.inference.summary_v2(
+            dimension="MODEL",
+        )
+        assert_matches_type(InferenceSummaryV2Response, inference, path=["response"])
+
+    @parametrize
+    def test_method_summary_v2_with_all_params(self, client: Cloudflare) -> None:
+        inference = client.radar.ai.inference.summary_v2(
+            dimension="MODEL",
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+        )
+        assert_matches_type(InferenceSummaryV2Response, inference, path=["response"])
+
+    @parametrize
+    def test_raw_response_summary_v2(self, client: Cloudflare) -> None:
+        response = client.radar.ai.inference.with_raw_response.summary_v2(
+            dimension="MODEL",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        inference = response.parse()
+        assert_matches_type(InferenceSummaryV2Response, inference, path=["response"])
+
+    @parametrize
+    def test_streaming_response_summary_v2(self, client: Cloudflare) -> None:
+        with client.radar.ai.inference.with_streaming_response.summary_v2(
+            dimension="MODEL",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            inference = response.parse()
+            assert_matches_type(InferenceSummaryV2Response, inference, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        inference = client.radar.ai.inference.timeseries_groups_v2(
+            dimension="MODEL",
+        )
+        assert_matches_type(InferenceTimeseriesGroupsV2Response, inference, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_groups_v2_with_all_params(self, client: Cloudflare) -> None:
+        inference = client.radar.ai.inference.timeseries_groups_v2(
+            dimension="MODEL",
+            agg_interval="1h",
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            normalization="MIN0_MAX",
+        )
+        assert_matches_type(InferenceTimeseriesGroupsV2Response, inference, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        response = client.radar.ai.inference.with_raw_response.timeseries_groups_v2(
+            dimension="MODEL",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        inference = response.parse()
+        assert_matches_type(InferenceTimeseriesGroupsV2Response, inference, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        with client.radar.ai.inference.with_streaming_response.timeseries_groups_v2(
+            dimension="MODEL",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            inference = response.parse()
+            assert_matches_type(InferenceTimeseriesGroupsV2Response, inference, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncInference:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        inference = await async_client.radar.ai.inference.summary_v2(
+            dimension="MODEL",
+        )
+        assert_matches_type(InferenceSummaryV2Response, inference, path=["response"])
+
+    @parametrize
+    async def test_method_summary_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        inference = await async_client.radar.ai.inference.summary_v2(
+            dimension="MODEL",
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+        )
+        assert_matches_type(InferenceSummaryV2Response, inference, path=["response"])
+
+    @parametrize
+    async def test_raw_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.ai.inference.with_raw_response.summary_v2(
+            dimension="MODEL",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        inference = await response.parse()
+        assert_matches_type(InferenceSummaryV2Response, inference, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.ai.inference.with_streaming_response.summary_v2(
+            dimension="MODEL",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            inference = await response.parse()
+            assert_matches_type(InferenceSummaryV2Response, inference, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        inference = await async_client.radar.ai.inference.timeseries_groups_v2(
+            dimension="MODEL",
+        )
+        assert_matches_type(InferenceTimeseriesGroupsV2Response, inference, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_groups_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        inference = await async_client.radar.ai.inference.timeseries_groups_v2(
+            dimension="MODEL",
+            agg_interval="1h",
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            normalization="MIN0_MAX",
+        )
+        assert_matches_type(InferenceTimeseriesGroupsV2Response, inference, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.ai.inference.with_raw_response.timeseries_groups_v2(
+            dimension="MODEL",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        inference = await response.parse()
+        assert_matches_type(InferenceTimeseriesGroupsV2Response, inference, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.ai.inference.with_streaming_response.timeseries_groups_v2(
+            dimension="MODEL",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            inference = await response.parse()
+            assert_matches_type(InferenceTimeseriesGroupsV2Response, inference, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/ai/test_timeseries_groups.py b/tests/api_resources/radar/ai/test_timeseries_groups.py
new file mode 100644
index 00000000000..4d12d4f250f
--- /dev/null
+++ b/tests/api_resources/radar/ai/test_timeseries_groups.py
@@ -0,0 +1,456 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar.ai import (
+    TimeseriesGroupSummaryResponse,
+    TimeseriesGroupUserAgentResponse,
+    TimeseriesGroupTimeseriesResponse,
+    TimeseriesGroupTimeseriesGroupsResponse,
+)
+
+# pyright: reportDeprecated=false
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestTimeseriesGroups:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_summary(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.ai.timeseries_groups.summary(
+                dimension="USER_AGENT",
+            )
+
+        assert_matches_type(TimeseriesGroupSummaryResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_method_summary_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.ai.timeseries_groups.summary(
+                dimension="USER_AGENT",
+                asn=["string"],
+                continent=["string"],
+                crawl_purpose=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                industry=["string"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                vertical=["string"],
+            )
+
+        assert_matches_type(TimeseriesGroupSummaryResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_summary(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.ai.timeseries_groups.with_raw_response.summary(
+                dimension="USER_AGENT",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = response.parse()
+        assert_matches_type(TimeseriesGroupSummaryResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_summary(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.ai.timeseries_groups.with_streaming_response.summary(
+                dimension="USER_AGENT",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupSummaryResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_timeseries(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.ai.timeseries_groups.timeseries()
+
+        assert_matches_type(TimeseriesGroupTimeseriesResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.ai.timeseries_groups.timeseries(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                crawl_purpose=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                industry=["string"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                user_agent=["string"],
+                vertical=["string"],
+            )
+
+        assert_matches_type(TimeseriesGroupTimeseriesResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.ai.timeseries_groups.with_raw_response.timeseries()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = response.parse()
+        assert_matches_type(TimeseriesGroupTimeseriesResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.ai.timeseries_groups.with_streaming_response.timeseries() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupTimeseriesResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_timeseries_groups(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.ai.timeseries_groups.timeseries_groups(
+                dimension="USER_AGENT",
+            )
+
+        assert_matches_type(TimeseriesGroupTimeseriesGroupsResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_groups_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.ai.timeseries_groups.timeseries_groups(
+                dimension="USER_AGENT",
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                crawl_purpose=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                industry=["string"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                normalization="MIN0_MAX",
+                vertical=["string"],
+            )
+
+        assert_matches_type(TimeseriesGroupTimeseriesGroupsResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries_groups(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.ai.timeseries_groups.with_raw_response.timeseries_groups(
+                dimension="USER_AGENT",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = response.parse()
+        assert_matches_type(TimeseriesGroupTimeseriesGroupsResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries_groups(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.ai.timeseries_groups.with_streaming_response.timeseries_groups(
+                dimension="USER_AGENT",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupTimeseriesGroupsResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_user_agent(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.ai.timeseries_groups.user_agent()
+
+        assert_matches_type(TimeseriesGroupUserAgentResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_method_user_agent_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.ai.timeseries_groups.user_agent(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+            )
+
+        assert_matches_type(TimeseriesGroupUserAgentResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_user_agent(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.ai.timeseries_groups.with_raw_response.user_agent()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = response.parse()
+        assert_matches_type(TimeseriesGroupUserAgentResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_user_agent(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.ai.timeseries_groups.with_streaming_response.user_agent() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupUserAgentResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncTimeseriesGroups:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_summary(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.ai.timeseries_groups.summary(
+                dimension="USER_AGENT",
+            )
+
+        assert_matches_type(TimeseriesGroupSummaryResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_method_summary_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.ai.timeseries_groups.summary(
+                dimension="USER_AGENT",
+                asn=["string"],
+                continent=["string"],
+                crawl_purpose=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                industry=["string"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                vertical=["string"],
+            )
+
+        assert_matches_type(TimeseriesGroupSummaryResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_summary(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.ai.timeseries_groups.with_raw_response.summary(
+                dimension="USER_AGENT",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = await response.parse()
+        assert_matches_type(TimeseriesGroupSummaryResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_summary(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.ai.timeseries_groups.with_streaming_response.summary(
+                dimension="USER_AGENT",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupSummaryResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.ai.timeseries_groups.timeseries()
+
+        assert_matches_type(TimeseriesGroupTimeseriesResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.ai.timeseries_groups.timeseries(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                crawl_purpose=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                industry=["string"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                user_agent=["string"],
+                vertical=["string"],
+            )
+
+        assert_matches_type(TimeseriesGroupTimeseriesResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.ai.timeseries_groups.with_raw_response.timeseries()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = await response.parse()
+        assert_matches_type(TimeseriesGroupTimeseriesResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.ai.timeseries_groups.with_streaming_response.timeseries() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupTimeseriesResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.ai.timeseries_groups.timeseries_groups(
+                dimension="USER_AGENT",
+            )
+
+        assert_matches_type(TimeseriesGroupTimeseriesGroupsResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_groups_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.ai.timeseries_groups.timeseries_groups(
+                dimension="USER_AGENT",
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                crawl_purpose=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                industry=["string"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                normalization="MIN0_MAX",
+                vertical=["string"],
+            )
+
+        assert_matches_type(TimeseriesGroupTimeseriesGroupsResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.ai.timeseries_groups.with_raw_response.timeseries_groups(
+                dimension="USER_AGENT",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = await response.parse()
+        assert_matches_type(TimeseriesGroupTimeseriesGroupsResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.ai.timeseries_groups.with_streaming_response.timeseries_groups(
+                dimension="USER_AGENT",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupTimeseriesGroupsResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_user_agent(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.ai.timeseries_groups.user_agent()
+
+        assert_matches_type(TimeseriesGroupUserAgentResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_method_user_agent_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.ai.timeseries_groups.user_agent(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+            )
+
+        assert_matches_type(TimeseriesGroupUserAgentResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_user_agent(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.ai.timeseries_groups.with_raw_response.user_agent()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = await response.parse()
+        assert_matches_type(TimeseriesGroupUserAgentResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_user_agent(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.ai.timeseries_groups.with_streaming_response.user_agent() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupUserAgentResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/ai/test_to_markdown.py b/tests/api_resources/radar/ai/test_to_markdown.py
new file mode 100644
index 00000000000..1241e0782b2
--- /dev/null
+++ b/tests/api_resources/radar/ai/test_to_markdown.py
@@ -0,0 +1,129 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.radar.ai import ToMarkdownCreateResponse
+
+# pyright: reportDeprecated=false
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestToMarkdown:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            to_markdown = client.radar.ai.to_markdown.create(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                files=[b"raw file contents"],
+            )
+
+        assert_matches_type(SyncSinglePage[ToMarkdownCreateResponse], to_markdown, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.ai.to_markdown.with_raw_response.create(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                files=[b"raw file contents"],
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        to_markdown = response.parse()
+        assert_matches_type(SyncSinglePage[ToMarkdownCreateResponse], to_markdown, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.ai.to_markdown.with_streaming_response.create(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                files=[b"raw file contents"],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                to_markdown = response.parse()
+                assert_matches_type(SyncSinglePage[ToMarkdownCreateResponse], to_markdown, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.radar.ai.to_markdown.with_raw_response.create(
+                    account_id="",
+                    files=[b"raw file contents"],
+                )
+
+
+class TestAsyncToMarkdown:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            to_markdown = await async_client.radar.ai.to_markdown.create(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                files=[b"raw file contents"],
+            )
+
+        assert_matches_type(AsyncSinglePage[ToMarkdownCreateResponse], to_markdown, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.ai.to_markdown.with_raw_response.create(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                files=[b"raw file contents"],
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        to_markdown = await response.parse()
+        assert_matches_type(AsyncSinglePage[ToMarkdownCreateResponse], to_markdown, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.ai.to_markdown.with_streaming_response.create(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                files=[b"raw file contents"],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                to_markdown = await response.parse()
+                assert_matches_type(AsyncSinglePage[ToMarkdownCreateResponse], to_markdown, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.radar.ai.to_markdown.with_raw_response.create(
+                    account_id="",
+                    files=[b"raw file contents"],
+                )
diff --git a/tests/api_resources/radar/annotations/test_outages.py b/tests/api_resources/radar/annotations/test_outages.py
index f249d7e3c89..da25c4f6e4a 100644
--- a/tests/api_resources/radar/annotations/test_outages.py
+++ b/tests/api_resources/radar/annotations/test_outages.py
@@ -34,9 +34,10 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None:
             date_range="7d",
             date_start=parse_datetime("2023-09-01T11:41:33.782Z"),
             format="JSON",
-            limit=5,
+            limit=1,
             location="US",
             offset=0,
+            origin="amazon-us-east-1",
         )
         assert_matches_type(OutageGetResponse, outage, path=["response"])
 
@@ -72,7 +73,7 @@ def test_method_locations_with_all_params(self, client: Cloudflare) -> None:
             date_range="7d",
             date_start=parse_datetime("2023-09-01T11:41:33.782Z"),
             format="JSON",
-            limit=5,
+            limit=1,
         )
         assert_matches_type(OutageLocationsResponse, outage, path=["response"])
 
@@ -98,7 +99,9 @@ def test_streaming_response_locations(self, client: Cloudflare) -> None:
 
 
 class TestAsyncOutages:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -113,9 +116,10 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -
             date_range="7d",
             date_start=parse_datetime("2023-09-01T11:41:33.782Z"),
             format="JSON",
-            limit=5,
+            limit=1,
             location="US",
             offset=0,
+            origin="amazon-us-east-1",
         )
         assert_matches_type(OutageGetResponse, outage, path=["response"])
 
@@ -151,7 +155,7 @@ async def test_method_locations_with_all_params(self, async_client: AsyncCloudfl
             date_range="7d",
             date_start=parse_datetime("2023-09-01T11:41:33.782Z"),
             format="JSON",
-            limit=5,
+            limit=1,
         )
         assert_matches_type(OutageLocationsResponse, outage, path=["response"])
 
diff --git a/tests/api_resources/radar/as112/test_summary.py b/tests/api_resources/radar/as112/test_summary.py
index 3778d9fba55..43b72a7743b 100644
--- a/tests/api_resources/radar/as112/test_summary.py
+++ b/tests/api_resources/radar/as112/test_summary.py
@@ -19,6 +19,8 @@
     SummaryResponseCodesResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -27,34 +29,33 @@ class TestSummary:
 
     @parametrize
     def test_method_dnssec(self, client: Cloudflare) -> None:
-        summary = client.radar.as112.summary.dnssec()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.as112.summary.dnssec()
+
         assert_matches_type(SummaryDNSSECResponse, summary, path=["response"])
 
     @parametrize
     def test_method_dnssec_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.as112.summary.dnssec(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.as112.summary.dnssec(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(SummaryDNSSECResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_dnssec(self, client: Cloudflare) -> None:
-        response = client.radar.as112.summary.with_raw_response.dnssec()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.as112.summary.with_raw_response.dnssec()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -63,45 +64,45 @@ def test_raw_response_dnssec(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_dnssec(self, client: Cloudflare) -> None:
-        with client.radar.as112.summary.with_streaming_response.dnssec() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.as112.summary.with_streaming_response.dnssec() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryDNSSECResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryDNSSECResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_edns(self, client: Cloudflare) -> None:
-        summary = client.radar.as112.summary.edns()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.as112.summary.edns()
+
         assert_matches_type(SummaryEdnsResponse, summary, path=["response"])
 
     @parametrize
     def test_method_edns_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.as112.summary.edns(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.as112.summary.edns(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(SummaryEdnsResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_edns(self, client: Cloudflare) -> None:
-        response = client.radar.as112.summary.with_raw_response.edns()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.as112.summary.with_raw_response.edns()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -110,45 +111,45 @@ def test_raw_response_edns(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_edns(self, client: Cloudflare) -> None:
-        with client.radar.as112.summary.with_streaming_response.edns() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.as112.summary.with_streaming_response.edns() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryEdnsResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryEdnsResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_ip_version(self, client: Cloudflare) -> None:
-        summary = client.radar.as112.summary.ip_version()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.as112.summary.ip_version()
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     def test_method_ip_version_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.as112.summary.ip_version(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.as112.summary.ip_version(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_ip_version(self, client: Cloudflare) -> None:
-        response = client.radar.as112.summary.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.as112.summary.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -157,45 +158,44 @@ def test_raw_response_ip_version(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_ip_version(self, client: Cloudflare) -> None:
-        with client.radar.as112.summary.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.as112.summary.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_protocol(self, client: Cloudflare) -> None:
-        summary = client.radar.as112.summary.protocol()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.as112.summary.protocol()
+
         assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
 
     @parametrize
     def test_method_protocol_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.as112.summary.protocol(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.as112.summary.protocol(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_protocol(self, client: Cloudflare) -> None:
-        response = client.radar.as112.summary.with_raw_response.protocol()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.as112.summary.with_raw_response.protocol()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -204,45 +204,45 @@ def test_raw_response_protocol(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_protocol(self, client: Cloudflare) -> None:
-        with client.radar.as112.summary.with_streaming_response.protocol() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.as112.summary.with_streaming_response.protocol() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_query_type(self, client: Cloudflare) -> None:
-        summary = client.radar.as112.summary.query_type()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.as112.summary.query_type()
+
         assert_matches_type(SummaryQueryTypeResponse, summary, path=["response"])
 
     @parametrize
     def test_method_query_type_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.as112.summary.query_type(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.as112.summary.query_type(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(SummaryQueryTypeResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_query_type(self, client: Cloudflare) -> None:
-        response = client.radar.as112.summary.with_raw_response.query_type()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.as112.summary.with_raw_response.query_type()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -251,45 +251,45 @@ def test_raw_response_query_type(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_query_type(self, client: Cloudflare) -> None:
-        with client.radar.as112.summary.with_streaming_response.query_type() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.as112.summary.with_streaming_response.query_type() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryQueryTypeResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryQueryTypeResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_response_codes(self, client: Cloudflare) -> None:
-        summary = client.radar.as112.summary.response_codes()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.as112.summary.response_codes()
+
         assert_matches_type(SummaryResponseCodesResponse, summary, path=["response"])
 
     @parametrize
     def test_method_response_codes_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.as112.summary.response_codes(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.as112.summary.response_codes(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                query_type=["A"],
+            )
+
         assert_matches_type(SummaryResponseCodesResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_response_codes(self, client: Cloudflare) -> None:
-        response = client.radar.as112.summary.with_raw_response.response_codes()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.as112.summary.with_raw_response.response_codes()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -298,49 +298,51 @@ def test_raw_response_response_codes(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_response_codes(self, client: Cloudflare) -> None:
-        with client.radar.as112.summary.with_streaming_response.response_codes() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.as112.summary.with_streaming_response.response_codes() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryResponseCodesResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryResponseCodesResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncSummary:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_dnssec(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.as112.summary.dnssec()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.as112.summary.dnssec()
+
         assert_matches_type(SummaryDNSSECResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_dnssec_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.as112.summary.dnssec(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.as112.summary.dnssec(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(SummaryDNSSECResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_dnssec(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.as112.summary.with_raw_response.dnssec()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.as112.summary.with_raw_response.dnssec()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -349,45 +351,45 @@ async def test_raw_response_dnssec(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_dnssec(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.as112.summary.with_streaming_response.dnssec() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.as112.summary.with_streaming_response.dnssec() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryDNSSECResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryDNSSECResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_edns(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.as112.summary.edns()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.as112.summary.edns()
+
         assert_matches_type(SummaryEdnsResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_edns_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.as112.summary.edns(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.as112.summary.edns(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(SummaryEdnsResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_edns(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.as112.summary.with_raw_response.edns()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.as112.summary.with_raw_response.edns()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -396,45 +398,45 @@ async def test_raw_response_edns(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_edns(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.as112.summary.with_streaming_response.edns() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.as112.summary.with_streaming_response.edns() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryEdnsResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryEdnsResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_ip_version(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.as112.summary.ip_version()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.as112.summary.ip_version()
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_ip_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.as112.summary.ip_version(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.as112.summary.ip_version(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.as112.summary.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.as112.summary.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -443,45 +445,44 @@ async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_streaming_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.as112.summary.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.as112.summary.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_protocol(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.as112.summary.protocol()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.as112.summary.protocol()
+
         assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_protocol_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.as112.summary.protocol(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.as112.summary.protocol(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_protocol(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.as112.summary.with_raw_response.protocol()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.as112.summary.with_raw_response.protocol()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -490,45 +491,45 @@ async def test_raw_response_protocol(self, async_client: AsyncCloudflare) -> Non
 
     @parametrize
     async def test_streaming_response_protocol(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.as112.summary.with_streaming_response.protocol() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.as112.summary.with_streaming_response.protocol() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_query_type(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.as112.summary.query_type()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.as112.summary.query_type()
+
         assert_matches_type(SummaryQueryTypeResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_query_type_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.as112.summary.query_type(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.as112.summary.query_type(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(SummaryQueryTypeResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_query_type(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.as112.summary.with_raw_response.query_type()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.as112.summary.with_raw_response.query_type()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -537,45 +538,45 @@ async def test_raw_response_query_type(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_streaming_response_query_type(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.as112.summary.with_streaming_response.query_type() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.as112.summary.with_streaming_response.query_type() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryQueryTypeResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryQueryTypeResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_response_codes(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.as112.summary.response_codes()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.as112.summary.response_codes()
+
         assert_matches_type(SummaryResponseCodesResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_response_codes_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.as112.summary.response_codes(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.as112.summary.response_codes(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                query_type=["A"],
+            )
+
         assert_matches_type(SummaryResponseCodesResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_response_codes(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.as112.summary.with_raw_response.response_codes()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.as112.summary.with_raw_response.response_codes()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -584,11 +585,12 @@ async def test_raw_response_response_codes(self, async_client: AsyncCloudflare)
 
     @parametrize
     async def test_streaming_response_response_codes(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.as112.summary.with_streaming_response.response_codes() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.as112.summary.with_streaming_response.response_codes() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryResponseCodesResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryResponseCodesResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/as112/test_timeseries_groups.py b/tests/api_resources/radar/as112/test_timeseries_groups.py
index fd9b0c69959..5ce61f1db6e 100644
--- a/tests/api_resources/radar/as112/test_timeseries_groups.py
+++ b/tests/api_resources/radar/as112/test_timeseries_groups.py
@@ -19,6 +19,8 @@
     TimeseriesGroupResponseCodesResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -27,35 +29,34 @@ class TestTimeseriesGroups:
 
     @parametrize
     def test_method_dnssec(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.as112.timeseries_groups.dnssec()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.as112.timeseries_groups.dnssec()
+
         assert_matches_type(TimeseriesGroupDNSSECResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_dnssec_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.as112.timeseries_groups.dnssec(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.as112.timeseries_groups.dnssec(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(TimeseriesGroupDNSSECResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_dnssec(self, client: Cloudflare) -> None:
-        response = client.radar.as112.timeseries_groups.with_raw_response.dnssec()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.as112.timeseries_groups.with_raw_response.dnssec()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -64,46 +65,46 @@ def test_raw_response_dnssec(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_dnssec(self, client: Cloudflare) -> None:
-        with client.radar.as112.timeseries_groups.with_streaming_response.dnssec() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.as112.timeseries_groups.with_streaming_response.dnssec() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupDNSSECResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupDNSSECResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_edns(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.as112.timeseries_groups.edns()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.as112.timeseries_groups.edns()
+
         assert_matches_type(TimeseriesGroupEdnsResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_edns_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.as112.timeseries_groups.edns(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.as112.timeseries_groups.edns(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(TimeseriesGroupEdnsResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_edns(self, client: Cloudflare) -> None:
-        response = client.radar.as112.timeseries_groups.with_raw_response.edns()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.as112.timeseries_groups.with_raw_response.edns()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -112,46 +113,46 @@ def test_raw_response_edns(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_edns(self, client: Cloudflare) -> None:
-        with client.radar.as112.timeseries_groups.with_streaming_response.edns() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.as112.timeseries_groups.with_streaming_response.edns() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupEdnsResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupEdnsResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_ip_version(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.as112.timeseries_groups.ip_version()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.as112.timeseries_groups.ip_version()
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_ip_version_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.as112.timeseries_groups.ip_version(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.as112.timeseries_groups.ip_version(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_ip_version(self, client: Cloudflare) -> None:
-        response = client.radar.as112.timeseries_groups.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.as112.timeseries_groups.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -160,46 +161,45 @@ def test_raw_response_ip_version(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_ip_version(self, client: Cloudflare) -> None:
-        with client.radar.as112.timeseries_groups.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.as112.timeseries_groups.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_protocol(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.as112.timeseries_groups.protocol()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.as112.timeseries_groups.protocol()
+
         assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_protocol_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.as112.timeseries_groups.protocol(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.as112.timeseries_groups.protocol(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_protocol(self, client: Cloudflare) -> None:
-        response = client.radar.as112.timeseries_groups.with_raw_response.protocol()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.as112.timeseries_groups.with_raw_response.protocol()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -208,46 +208,46 @@ def test_raw_response_protocol(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_protocol(self, client: Cloudflare) -> None:
-        with client.radar.as112.timeseries_groups.with_streaming_response.protocol() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.as112.timeseries_groups.with_streaming_response.protocol() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_query_type(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.as112.timeseries_groups.query_type()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.as112.timeseries_groups.query_type()
+
         assert_matches_type(TimeseriesGroupQueryTypeResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_query_type_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.as112.timeseries_groups.query_type(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.as112.timeseries_groups.query_type(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(TimeseriesGroupQueryTypeResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_query_type(self, client: Cloudflare) -> None:
-        response = client.radar.as112.timeseries_groups.with_raw_response.query_type()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.as112.timeseries_groups.with_raw_response.query_type()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -256,46 +256,46 @@ def test_raw_response_query_type(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_query_type(self, client: Cloudflare) -> None:
-        with client.radar.as112.timeseries_groups.with_streaming_response.query_type() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.as112.timeseries_groups.with_streaming_response.query_type() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupQueryTypeResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupQueryTypeResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_response_codes(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.as112.timeseries_groups.response_codes()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.as112.timeseries_groups.response_codes()
+
         assert_matches_type(TimeseriesGroupResponseCodesResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_response_codes_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.as112.timeseries_groups.response_codes(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.as112.timeseries_groups.response_codes(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                query_type=["A"],
+            )
+
         assert_matches_type(TimeseriesGroupResponseCodesResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_response_codes(self, client: Cloudflare) -> None:
-        response = client.radar.as112.timeseries_groups.with_raw_response.response_codes()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.as112.timeseries_groups.with_raw_response.response_codes()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -304,50 +304,52 @@ def test_raw_response_response_codes(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_response_codes(self, client: Cloudflare) -> None:
-        with client.radar.as112.timeseries_groups.with_streaming_response.response_codes() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.as112.timeseries_groups.with_streaming_response.response_codes() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupResponseCodesResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupResponseCodesResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncTimeseriesGroups:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_dnssec(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.as112.timeseries_groups.dnssec()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.as112.timeseries_groups.dnssec()
+
         assert_matches_type(TimeseriesGroupDNSSECResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_dnssec_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.as112.timeseries_groups.dnssec(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.as112.timeseries_groups.dnssec(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(TimeseriesGroupDNSSECResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_dnssec(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.as112.timeseries_groups.with_raw_response.dnssec()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.as112.timeseries_groups.with_raw_response.dnssec()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -356,46 +358,46 @@ async def test_raw_response_dnssec(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_dnssec(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.as112.timeseries_groups.with_streaming_response.dnssec() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.as112.timeseries_groups.with_streaming_response.dnssec() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupDNSSECResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupDNSSECResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_edns(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.as112.timeseries_groups.edns()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.as112.timeseries_groups.edns()
+
         assert_matches_type(TimeseriesGroupEdnsResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_edns_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.as112.timeseries_groups.edns(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.as112.timeseries_groups.edns(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(TimeseriesGroupEdnsResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_edns(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.as112.timeseries_groups.with_raw_response.edns()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.as112.timeseries_groups.with_raw_response.edns()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -404,46 +406,46 @@ async def test_raw_response_edns(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_edns(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.as112.timeseries_groups.with_streaming_response.edns() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.as112.timeseries_groups.with_streaming_response.edns() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupEdnsResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupEdnsResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_ip_version(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.as112.timeseries_groups.ip_version()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.as112.timeseries_groups.ip_version()
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_ip_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.as112.timeseries_groups.ip_version(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.as112.timeseries_groups.ip_version(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.as112.timeseries_groups.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.as112.timeseries_groups.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -452,46 +454,45 @@ async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_streaming_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.as112.timeseries_groups.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.as112.timeseries_groups.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_protocol(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.as112.timeseries_groups.protocol()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.as112.timeseries_groups.protocol()
+
         assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_protocol_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.as112.timeseries_groups.protocol(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.as112.timeseries_groups.protocol(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_protocol(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.as112.timeseries_groups.with_raw_response.protocol()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.as112.timeseries_groups.with_raw_response.protocol()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -500,46 +501,46 @@ async def test_raw_response_protocol(self, async_client: AsyncCloudflare) -> Non
 
     @parametrize
     async def test_streaming_response_protocol(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.as112.timeseries_groups.with_streaming_response.protocol() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.as112.timeseries_groups.with_streaming_response.protocol() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_query_type(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.as112.timeseries_groups.query_type()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.as112.timeseries_groups.query_type()
+
         assert_matches_type(TimeseriesGroupQueryTypeResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_query_type_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.as112.timeseries_groups.query_type(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.as112.timeseries_groups.query_type(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                response_code=["NOERROR"],
+            )
+
         assert_matches_type(TimeseriesGroupQueryTypeResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_query_type(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.as112.timeseries_groups.with_raw_response.query_type()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.as112.timeseries_groups.with_raw_response.query_type()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -548,46 +549,46 @@ async def test_raw_response_query_type(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_streaming_response_query_type(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.as112.timeseries_groups.with_streaming_response.query_type() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.as112.timeseries_groups.with_streaming_response.query_type() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupQueryTypeResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupQueryTypeResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_response_codes(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.as112.timeseries_groups.response_codes()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.as112.timeseries_groups.response_codes()
+
         assert_matches_type(TimeseriesGroupResponseCodesResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_response_codes_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.as112.timeseries_groups.response_codes(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.as112.timeseries_groups.response_codes(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+                query_type=["A"],
+            )
+
         assert_matches_type(TimeseriesGroupResponseCodesResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_response_codes(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.as112.timeseries_groups.with_raw_response.response_codes()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.as112.timeseries_groups.with_raw_response.response_codes()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -596,11 +597,12 @@ async def test_raw_response_response_codes(self, async_client: AsyncCloudflare)
 
     @parametrize
     async def test_streaming_response_response_codes(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.as112.timeseries_groups.with_streaming_response.response_codes() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.as112.timeseries_groups.with_streaming_response.response_codes() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupResponseCodesResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupResponseCodesResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/as112/test_top.py b/tests/api_resources/radar/as112/test_top.py
index a97851a7967..75494548b73 100644
--- a/tests/api_resources/radar/as112/test_top.py
+++ b/tests/api_resources/radar/as112/test_top.py
@@ -34,23 +34,14 @@ def test_method_dnssec(self, client: Cloudflare) -> None:
     def test_method_dnssec_with_all_params(self, client: Cloudflare) -> None:
         top = client.radar.as112.top.dnssec(
             dnssec="SUPPORTED",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(TopDNSSECResponse, top, path=["response"])
 
@@ -89,23 +80,14 @@ def test_method_edns(self, client: Cloudflare) -> None:
     def test_method_edns_with_all_params(self, client: Cloudflare) -> None:
         top = client.radar.as112.top.edns(
             edns="SUPPORTED",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(TopEdnsResponse, top, path=["response"])
 
@@ -144,23 +126,14 @@ def test_method_ip_version(self, client: Cloudflare) -> None:
     def test_method_ip_version_with_all_params(self, client: Cloudflare) -> None:
         top = client.radar.as112.top.ip_version(
             ip_version="IPv4",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(TopIPVersionResponse, top, path=["response"])
 
@@ -196,23 +169,14 @@ def test_method_locations(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_locations_with_all_params(self, client: Cloudflare) -> None:
         top = client.radar.as112.top.locations(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(TopLocationsResponse, top, path=["response"])
 
@@ -238,7 +202,9 @@ def test_streaming_response_locations(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTop:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_dnssec(self, async_client: AsyncCloudflare) -> None:
@@ -251,23 +217,14 @@ async def test_method_dnssec(self, async_client: AsyncCloudflare) -> None:
     async def test_method_dnssec_with_all_params(self, async_client: AsyncCloudflare) -> None:
         top = await async_client.radar.as112.top.dnssec(
             dnssec="SUPPORTED",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(TopDNSSECResponse, top, path=["response"])
 
@@ -306,23 +263,14 @@ async def test_method_edns(self, async_client: AsyncCloudflare) -> None:
     async def test_method_edns_with_all_params(self, async_client: AsyncCloudflare) -> None:
         top = await async_client.radar.as112.top.edns(
             edns="SUPPORTED",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(TopEdnsResponse, top, path=["response"])
 
@@ -361,23 +309,14 @@ async def test_method_ip_version(self, async_client: AsyncCloudflare) -> None:
     async def test_method_ip_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
         top = await async_client.radar.as112.top.ip_version(
             ip_version="IPv4",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(TopIPVersionResponse, top, path=["response"])
 
@@ -413,23 +352,14 @@ async def test_method_locations(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_locations_with_all_params(self, async_client: AsyncCloudflare) -> None:
         top = await async_client.radar.as112.top.locations(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(TopLocationsResponse, top, path=["response"])
 
diff --git a/tests/api_resources/radar/attacks/layer3/test_summary.py b/tests/api_resources/radar/attacks/layer3/test_summary.py
index 0e77b0b96fb..015ca166821 100644
--- a/tests/api_resources/radar/attacks/layer3/test_summary.py
+++ b/tests/api_resources/radar/attacks/layer3/test_summary.py
@@ -11,14 +11,17 @@
 from tests.utils import assert_matches_type
 from cloudflare._utils import parse_datetime
 from cloudflare.types.radar.attacks.layer3 import (
-    SummaryGetResponse,
     SummaryVectorResponse,
     SummaryBitrateResponse,
     SummaryDurationResponse,
+    SummaryIndustryResponse,
     SummaryProtocolResponse,
+    SummaryVerticalResponse,
     SummaryIPVersionResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -27,36 +30,33 @@ class TestSummary:
 
     @parametrize
     def test_method_bitrate(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer3.summary.bitrate()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer3.summary.bitrate()
+
         assert_matches_type(SummaryBitrateResponse, summary, path=["response"])
 
     @parametrize
     def test_method_bitrate_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer3.summary.bitrate(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer3.summary.bitrate(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+            )
+
         assert_matches_type(SummaryBitrateResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_bitrate(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer3.summary.with_raw_response.bitrate()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer3.summary.with_raw_response.bitrate()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -65,47 +65,45 @@ def test_raw_response_bitrate(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_bitrate(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer3.summary.with_streaming_response.bitrate() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer3.summary.with_streaming_response.bitrate() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryBitrateResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryBitrateResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_duration(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer3.summary.duration()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer3.summary.duration()
+
         assert_matches_type(SummaryDurationResponse, summary, path=["response"])
 
     @parametrize
     def test_method_duration_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer3.summary.duration(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer3.summary.duration(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+            )
+
         assert_matches_type(SummaryDurationResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_duration(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer3.summary.with_raw_response.duration()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer3.summary.with_raw_response.duration()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -114,93 +112,92 @@ def test_raw_response_duration(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_duration(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer3.summary.with_streaming_response.duration() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer3.summary.with_streaming_response.duration() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryDurationResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryDurationResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer3.summary.get()
-        assert_matches_type(SummaryGetResponse, summary, path=["response"])
-
-    @parametrize
-    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer3.summary.get(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
-        assert_matches_type(SummaryGetResponse, summary, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer3.summary.with_raw_response.get()
+    def test_method_industry(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer3.summary.industry()
+
+        assert_matches_type(SummaryIndustryResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_industry_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer3.summary.industry(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+            )
+
+        assert_matches_type(SummaryIndustryResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_industry(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer3.summary.with_raw_response.industry()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         summary = response.parse()
-        assert_matches_type(SummaryGetResponse, summary, path=["response"])
+        assert_matches_type(SummaryIndustryResponse, summary, path=["response"])
 
     @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer3.summary.with_streaming_response.get() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+    def test_streaming_response_industry(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer3.summary.with_streaming_response.industry() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryGetResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryIndustryResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_ip_version(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer3.summary.ip_version()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer3.summary.ip_version()
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     def test_method_ip_version_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer3.summary.ip_version(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer3.summary.ip_version(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+            )
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_ip_version(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer3.summary.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer3.summary.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -209,46 +206,44 @@ def test_raw_response_ip_version(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_ip_version(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer3.summary.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer3.summary.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_protocol(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer3.summary.protocol()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer3.summary.protocol()
+
         assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
 
     @parametrize
     def test_method_protocol_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer3.summary.protocol(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer3.summary.protocol(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+            )
+
         assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_protocol(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer3.summary.with_raw_response.protocol()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer3.summary.with_raw_response.protocol()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -257,47 +252,46 @@ def test_raw_response_protocol(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_protocol(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer3.summary.with_streaming_response.protocol() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer3.summary.with_streaming_response.protocol() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_vector(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer3.summary.vector()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer3.summary.vector()
+
         assert_matches_type(SummaryVectorResponse, summary, path=["response"])
 
     @parametrize
     def test_method_vector_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer3.summary.vector(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer3.summary.vector(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+            )
+
         assert_matches_type(SummaryVectorResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_vector(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer3.summary.with_raw_response.vector()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer3.summary.with_raw_response.vector()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -306,51 +300,99 @@ def test_raw_response_vector(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_vector(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer3.summary.with_streaming_response.vector() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer3.summary.with_streaming_response.vector() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryVectorResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_vertical(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer3.summary.vertical()
+
+        assert_matches_type(SummaryVerticalResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_vertical_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer3.summary.vertical(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+            )
+
+        assert_matches_type(SummaryVerticalResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_vertical(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer3.summary.with_raw_response.vertical()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryVerticalResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_vertical(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer3.summary.with_streaming_response.vertical() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryVectorResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryVerticalResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncSummary:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_bitrate(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer3.summary.bitrate()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer3.summary.bitrate()
+
         assert_matches_type(SummaryBitrateResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_bitrate_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer3.summary.bitrate(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer3.summary.bitrate(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+            )
+
         assert_matches_type(SummaryBitrateResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_bitrate(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer3.summary.with_raw_response.bitrate()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer3.summary.with_raw_response.bitrate()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -359,47 +401,45 @@ async def test_raw_response_bitrate(self, async_client: AsyncCloudflare) -> None
 
     @parametrize
     async def test_streaming_response_bitrate(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer3.summary.with_streaming_response.bitrate() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.attacks.layer3.summary.with_streaming_response.bitrate() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryBitrateResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryBitrateResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_duration(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer3.summary.duration()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer3.summary.duration()
+
         assert_matches_type(SummaryDurationResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_duration_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer3.summary.duration(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer3.summary.duration(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+            )
+
         assert_matches_type(SummaryDurationResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_duration(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer3.summary.with_raw_response.duration()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer3.summary.with_raw_response.duration()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -408,93 +448,92 @@ async def test_raw_response_duration(self, async_client: AsyncCloudflare) -> Non
 
     @parametrize
     async def test_streaming_response_duration(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer3.summary.with_streaming_response.duration() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.attacks.layer3.summary.with_streaming_response.duration() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryDurationResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryDurationResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer3.summary.get()
-        assert_matches_type(SummaryGetResponse, summary, path=["response"])
-
-    @parametrize
-    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer3.summary.get(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
-        assert_matches_type(SummaryGetResponse, summary, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer3.summary.with_raw_response.get()
+    async def test_method_industry(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer3.summary.industry()
+
+        assert_matches_type(SummaryIndustryResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_industry_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer3.summary.industry(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+            )
+
+        assert_matches_type(SummaryIndustryResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_industry(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer3.summary.with_raw_response.industry()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         summary = await response.parse()
-        assert_matches_type(SummaryGetResponse, summary, path=["response"])
+        assert_matches_type(SummaryIndustryResponse, summary, path=["response"])
 
     @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer3.summary.with_streaming_response.get() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+    async def test_streaming_response_industry(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.attacks.layer3.summary.with_streaming_response.industry() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryGetResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryIndustryResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_ip_version(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer3.summary.ip_version()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer3.summary.ip_version()
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_ip_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer3.summary.ip_version(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer3.summary.ip_version(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+            )
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer3.summary.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer3.summary.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -503,46 +542,44 @@ async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_streaming_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer3.summary.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.attacks.layer3.summary.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_protocol(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer3.summary.protocol()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer3.summary.protocol()
+
         assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_protocol_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer3.summary.protocol(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer3.summary.protocol(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+            )
+
         assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_protocol(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer3.summary.with_raw_response.protocol()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer3.summary.with_raw_response.protocol()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -551,47 +588,46 @@ async def test_raw_response_protocol(self, async_client: AsyncCloudflare) -> Non
 
     @parametrize
     async def test_streaming_response_protocol(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer3.summary.with_streaming_response.protocol() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.attacks.layer3.summary.with_streaming_response.protocol() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_vector(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer3.summary.vector()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer3.summary.vector()
+
         assert_matches_type(SummaryVectorResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_vector_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer3.summary.vector(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer3.summary.vector(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+            )
+
         assert_matches_type(SummaryVectorResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_vector(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer3.summary.with_raw_response.vector()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer3.summary.with_raw_response.vector()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -600,11 +636,60 @@ async def test_raw_response_vector(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_vector(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer3.summary.with_streaming_response.vector() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.attacks.layer3.summary.with_streaming_response.vector() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryVectorResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_vertical(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer3.summary.vertical()
+
+        assert_matches_type(SummaryVerticalResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_vertical_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer3.summary.vertical(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+            )
+
+        assert_matches_type(SummaryVerticalResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_vertical(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer3.summary.with_raw_response.vertical()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryVerticalResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_vertical(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.attacks.layer3.summary.with_streaming_response.vertical() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryVectorResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryVerticalResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/attacks/layer3/test_timeseries_groups.py b/tests/api_resources/radar/attacks/layer3/test_timeseries_groups.py
index 7463f67dbf3..7915972510a 100644
--- a/tests/api_resources/radar/attacks/layer3/test_timeseries_groups.py
+++ b/tests/api_resources/radar/attacks/layer3/test_timeseries_groups.py
@@ -11,7 +11,6 @@
 from tests.utils import assert_matches_type
 from cloudflare._utils import parse_datetime
 from cloudflare.types.radar.attacks.layer3 import (
-    TimeseriesGroupGetResponse,
     TimeseriesGroupVectorResponse,
     TimeseriesGroupBitrateResponse,
     TimeseriesGroupDurationResponse,
@@ -21,6 +20,8 @@
     TimeseriesGroupIPVersionResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -29,38 +30,35 @@ class TestTimeseriesGroups:
 
     @parametrize
     def test_method_bitrate(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer3.timeseries_groups.bitrate()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer3.timeseries_groups.bitrate()
+
         assert_matches_type(TimeseriesGroupBitrateResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_bitrate_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer3.timeseries_groups.bitrate(
-            agg_interval="1h",
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer3.timeseries_groups.bitrate(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+                protocol=["UDP"],
+            )
+
         assert_matches_type(TimeseriesGroupBitrateResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_bitrate(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer3.timeseries_groups.with_raw_response.bitrate()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer3.timeseries_groups.with_raw_response.bitrate()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -69,49 +67,47 @@ def test_raw_response_bitrate(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_bitrate(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer3.timeseries_groups.with_streaming_response.bitrate() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer3.timeseries_groups.with_streaming_response.bitrate() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupBitrateResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupBitrateResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_duration(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer3.timeseries_groups.duration()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer3.timeseries_groups.duration()
+
         assert_matches_type(TimeseriesGroupDurationResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_duration_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer3.timeseries_groups.duration(
-            agg_interval="1h",
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer3.timeseries_groups.duration(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+                protocol=["UDP"],
+            )
+
         assert_matches_type(TimeseriesGroupDurationResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_duration(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer3.timeseries_groups.with_raw_response.duration()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer3.timeseries_groups.with_raw_response.duration()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -120,98 +116,48 @@ def test_raw_response_duration(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_duration(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer3.timeseries_groups.with_streaming_response.duration() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupDurationResponse, timeseries_group, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer3.timeseries_groups.get()
-        assert_matches_type(TimeseriesGroupGetResponse, timeseries_group, path=["response"])
-
-    @parametrize
-    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer3.timeseries_groups.get(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
-        assert_matches_type(TimeseriesGroupGetResponse, timeseries_group, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer3.timeseries_groups.with_raw_response.get()
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        timeseries_group = response.parse()
-        assert_matches_type(TimeseriesGroupGetResponse, timeseries_group, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer3.timeseries_groups.with_streaming_response.get() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer3.timeseries_groups.with_streaming_response.duration() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupGetResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupDurationResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_industry(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer3.timeseries_groups.industry()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer3.timeseries_groups.industry()
+
         assert_matches_type(TimeseriesGroupIndustryResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_industry_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer3.timeseries_groups.industry(
-            agg_interval="1h",
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit_per_group=4,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer3.timeseries_groups.industry(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+                protocol=["UDP"],
+            )
+
         assert_matches_type(TimeseriesGroupIndustryResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_industry(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer3.timeseries_groups.with_raw_response.industry()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer3.timeseries_groups.with_raw_response.industry()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -220,48 +166,46 @@ def test_raw_response_industry(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_industry(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer3.timeseries_groups.with_streaming_response.industry() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer3.timeseries_groups.with_streaming_response.industry() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupIndustryResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupIndustryResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_ip_version(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer3.timeseries_groups.ip_version()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer3.timeseries_groups.ip_version()
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_ip_version_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer3.timeseries_groups.ip_version(
-            agg_interval="1h",
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer3.timeseries_groups.ip_version(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+                protocol=["UDP"],
+            )
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_ip_version(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer3.timeseries_groups.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer3.timeseries_groups.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -270,48 +214,46 @@ def test_raw_response_ip_version(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_ip_version(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer3.timeseries_groups.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer3.timeseries_groups.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_protocol(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer3.timeseries_groups.protocol()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer3.timeseries_groups.protocol()
+
         assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_protocol_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer3.timeseries_groups.protocol(
-            agg_interval="1h",
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer3.timeseries_groups.protocol(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+            )
+
         assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_protocol(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer3.timeseries_groups.with_raw_response.protocol()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer3.timeseries_groups.with_raw_response.protocol()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -320,50 +262,48 @@ def test_raw_response_protocol(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_protocol(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer3.timeseries_groups.with_streaming_response.protocol() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer3.timeseries_groups.with_streaming_response.protocol() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_vector(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer3.timeseries_groups.vector()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer3.timeseries_groups.vector()
+
         assert_matches_type(TimeseriesGroupVectorResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_vector_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer3.timeseries_groups.vector(
-            agg_interval="1h",
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit_per_group=4,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer3.timeseries_groups.vector(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+                protocol=["UDP"],
+            )
+
         assert_matches_type(TimeseriesGroupVectorResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_vector(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer3.timeseries_groups.with_raw_response.vector()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer3.timeseries_groups.with_raw_response.vector()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -372,50 +312,48 @@ def test_raw_response_vector(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_vector(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer3.timeseries_groups.with_streaming_response.vector() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer3.timeseries_groups.with_streaming_response.vector() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupVectorResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupVectorResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_vertical(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer3.timeseries_groups.vertical()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer3.timeseries_groups.vertical()
+
         assert_matches_type(TimeseriesGroupVerticalResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_vertical_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer3.timeseries_groups.vertical(
-            agg_interval="1h",
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit_per_group=4,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer3.timeseries_groups.vertical(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+                protocol=["UDP"],
+            )
+
         assert_matches_type(TimeseriesGroupVerticalResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_vertical(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer3.timeseries_groups.with_raw_response.vertical()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer3.timeseries_groups.with_raw_response.vertical()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -424,53 +362,53 @@ def test_raw_response_vertical(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_vertical(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer3.timeseries_groups.with_streaming_response.vertical() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer3.timeseries_groups.with_streaming_response.vertical() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupVerticalResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupVerticalResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncTimeseriesGroups:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_bitrate(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.bitrate()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.bitrate()
+
         assert_matches_type(TimeseriesGroupBitrateResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_bitrate_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.bitrate(
-            agg_interval="1h",
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.bitrate(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+                protocol=["UDP"],
+            )
+
         assert_matches_type(TimeseriesGroupBitrateResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_bitrate(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer3.timeseries_groups.with_raw_response.bitrate()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer3.timeseries_groups.with_raw_response.bitrate()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -479,49 +417,49 @@ async def test_raw_response_bitrate(self, async_client: AsyncCloudflare) -> None
 
     @parametrize
     async def test_streaming_response_bitrate(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer3.timeseries_groups.with_streaming_response.bitrate() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.attacks.layer3.timeseries_groups.with_streaming_response.bitrate()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupBitrateResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupBitrateResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_duration(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.duration()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.duration()
+
         assert_matches_type(TimeseriesGroupDurationResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_duration_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.duration(
-            agg_interval="1h",
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.duration(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+                protocol=["UDP"],
+            )
+
         assert_matches_type(TimeseriesGroupDurationResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_duration(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer3.timeseries_groups.with_raw_response.duration()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer3.timeseries_groups.with_raw_response.duration()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -530,98 +468,50 @@ async def test_raw_response_duration(self, async_client: AsyncCloudflare) -> Non
 
     @parametrize
     async def test_streaming_response_duration(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer3.timeseries_groups.with_streaming_response.duration() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupDurationResponse, timeseries_group, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.get()
-        assert_matches_type(TimeseriesGroupGetResponse, timeseries_group, path=["response"])
-
-    @parametrize
-    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.get(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
-        assert_matches_type(TimeseriesGroupGetResponse, timeseries_group, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer3.timeseries_groups.with_raw_response.get()
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        timeseries_group = await response.parse()
-        assert_matches_type(TimeseriesGroupGetResponse, timeseries_group, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.attacks.layer3.timeseries_groups.with_streaming_response.duration()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer3.timeseries_groups.with_streaming_response.get() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupGetResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupDurationResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_industry(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.industry()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.industry()
+
         assert_matches_type(TimeseriesGroupIndustryResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_industry_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.industry(
-            agg_interval="1h",
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit_per_group=4,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.industry(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+                protocol=["UDP"],
+            )
+
         assert_matches_type(TimeseriesGroupIndustryResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_industry(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer3.timeseries_groups.with_raw_response.industry()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer3.timeseries_groups.with_raw_response.industry()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -630,48 +520,48 @@ async def test_raw_response_industry(self, async_client: AsyncCloudflare) -> Non
 
     @parametrize
     async def test_streaming_response_industry(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer3.timeseries_groups.with_streaming_response.industry() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.attacks.layer3.timeseries_groups.with_streaming_response.industry()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupIndustryResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupIndustryResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_ip_version(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.ip_version()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.ip_version()
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_ip_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.ip_version(
-            agg_interval="1h",
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.ip_version(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+                protocol=["UDP"],
+            )
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer3.timeseries_groups.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer3.timeseries_groups.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -680,48 +570,48 @@ async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_streaming_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer3.timeseries_groups.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.attacks.layer3.timeseries_groups.with_streaming_response.ip_version()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_protocol(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.protocol()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.protocol()
+
         assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_protocol_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.protocol(
-            agg_interval="1h",
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.protocol(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+            )
+
         assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_protocol(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer3.timeseries_groups.with_raw_response.protocol()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer3.timeseries_groups.with_raw_response.protocol()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -730,50 +620,50 @@ async def test_raw_response_protocol(self, async_client: AsyncCloudflare) -> Non
 
     @parametrize
     async def test_streaming_response_protocol(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer3.timeseries_groups.with_streaming_response.protocol() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.attacks.layer3.timeseries_groups.with_streaming_response.protocol()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_vector(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.vector()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.vector()
+
         assert_matches_type(TimeseriesGroupVectorResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_vector_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.vector(
-            agg_interval="1h",
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit_per_group=4,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.vector(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+                protocol=["UDP"],
+            )
+
         assert_matches_type(TimeseriesGroupVectorResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_vector(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer3.timeseries_groups.with_raw_response.vector()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer3.timeseries_groups.with_raw_response.vector()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -782,50 +672,48 @@ async def test_raw_response_vector(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_vector(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer3.timeseries_groups.with_streaming_response.vector() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.attacks.layer3.timeseries_groups.with_streaming_response.vector() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupVectorResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupVectorResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_vertical(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.vertical()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.vertical()
+
         assert_matches_type(TimeseriesGroupVerticalResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_vertical_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.vertical(
-            agg_interval="1h",
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            direction="ORIGIN",
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit_per_group=4,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer3.timeseries_groups.vertical(
+                agg_interval="1h",
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                direction="ORIGIN",
+                format="JSON",
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+                protocol=["UDP"],
+            )
+
         assert_matches_type(TimeseriesGroupVerticalResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_vertical(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer3.timeseries_groups.with_raw_response.vertical()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer3.timeseries_groups.with_raw_response.vertical()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -834,11 +722,14 @@ async def test_raw_response_vertical(self, async_client: AsyncCloudflare) -> Non
 
     @parametrize
     async def test_streaming_response_vertical(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer3.timeseries_groups.with_streaming_response.vertical() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupVerticalResponse, timeseries_group, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.attacks.layer3.timeseries_groups.with_streaming_response.vertical()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupVerticalResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/attacks/layer3/test_top.py b/tests/api_resources/radar/attacks/layer3/test_top.py
index 696f58eafed..c8b0fb7a923 100644
--- a/tests/api_resources/radar/attacks/layer3/test_top.py
+++ b/tests/api_resources/radar/attacks/layer3/test_top.py
@@ -16,6 +16,8 @@
     TopVerticalResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -30,27 +32,20 @@ def test_method_attacks(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_attacks_with_all_params(self, client: Cloudflare) -> None:
         top = client.radar.attacks.layer3.top.attacks(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
+            ip_version=["IPv4"],
+            limit=1,
             limit_direction="ORIGIN",
-            limit_per_location=10,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            limit_per_location=1,
+            location=["string"],
+            magnitude="MITIGATED_BYTES",
+            name=["main_series"],
             normalization="PERCENTAGE",
-            protocol=["UDP", "TCP", "ICMP"],
+            protocol=["UDP"],
         )
         assert_matches_type(TopAttacksResponse, top, path=["response"])
 
@@ -76,36 +71,33 @@ def test_streaming_response_attacks(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_industry(self, client: Cloudflare) -> None:
-        top = client.radar.attacks.layer3.top.industry()
+        with pytest.warns(DeprecationWarning):
+            top = client.radar.attacks.layer3.top.industry()
+
         assert_matches_type(TopIndustryResponse, top, path=["response"])
 
     @parametrize
     def test_method_industry_with_all_params(self, client: Cloudflare) -> None:
-        top = client.radar.attacks.layer3.top.industry(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            top = client.radar.attacks.layer3.top.industry(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                ip_version=["IPv4"],
+                limit=1,
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+            )
+
         assert_matches_type(TopIndustryResponse, top, path=["response"])
 
     @parametrize
     def test_raw_response_industry(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer3.top.with_raw_response.industry()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer3.top.with_raw_response.industry()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -114,47 +106,45 @@ def test_raw_response_industry(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_industry(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer3.top.with_streaming_response.industry() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer3.top.with_streaming_response.industry() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            top = response.parse()
-            assert_matches_type(TopIndustryResponse, top, path=["response"])
+                top = response.parse()
+                assert_matches_type(TopIndustryResponse, top, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_vertical(self, client: Cloudflare) -> None:
-        top = client.radar.attacks.layer3.top.vertical()
+        with pytest.warns(DeprecationWarning):
+            top = client.radar.attacks.layer3.top.vertical()
+
         assert_matches_type(TopVerticalResponse, top, path=["response"])
 
     @parametrize
     def test_method_vertical_with_all_params(self, client: Cloudflare) -> None:
-        top = client.radar.attacks.layer3.top.vertical(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            top = client.radar.attacks.layer3.top.vertical(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                ip_version=["IPv4"],
+                limit=1,
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+            )
+
         assert_matches_type(TopVerticalResponse, top, path=["response"])
 
     @parametrize
     def test_raw_response_vertical(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer3.top.with_raw_response.vertical()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer3.top.with_raw_response.vertical()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -163,18 +153,21 @@ def test_raw_response_vertical(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_vertical(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer3.top.with_streaming_response.vertical() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer3.top.with_streaming_response.vertical() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            top = response.parse()
-            assert_matches_type(TopVerticalResponse, top, path=["response"])
+                top = response.parse()
+                assert_matches_type(TopVerticalResponse, top, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncTop:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_attacks(self, async_client: AsyncCloudflare) -> None:
@@ -184,27 +177,20 @@ async def test_method_attacks(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_attacks_with_all_params(self, async_client: AsyncCloudflare) -> None:
         top = await async_client.radar.attacks.layer3.top.attacks(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
+            ip_version=["IPv4"],
+            limit=1,
             limit_direction="ORIGIN",
-            limit_per_location=10,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            limit_per_location=1,
+            location=["string"],
+            magnitude="MITIGATED_BYTES",
+            name=["main_series"],
             normalization="PERCENTAGE",
-            protocol=["UDP", "TCP", "ICMP"],
+            protocol=["UDP"],
         )
         assert_matches_type(TopAttacksResponse, top, path=["response"])
 
@@ -230,36 +216,33 @@ async def test_streaming_response_attacks(self, async_client: AsyncCloudflare) -
 
     @parametrize
     async def test_method_industry(self, async_client: AsyncCloudflare) -> None:
-        top = await async_client.radar.attacks.layer3.top.industry()
+        with pytest.warns(DeprecationWarning):
+            top = await async_client.radar.attacks.layer3.top.industry()
+
         assert_matches_type(TopIndustryResponse, top, path=["response"])
 
     @parametrize
     async def test_method_industry_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        top = await async_client.radar.attacks.layer3.top.industry(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            top = await async_client.radar.attacks.layer3.top.industry(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                ip_version=["IPv4"],
+                limit=1,
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+            )
+
         assert_matches_type(TopIndustryResponse, top, path=["response"])
 
     @parametrize
     async def test_raw_response_industry(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer3.top.with_raw_response.industry()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer3.top.with_raw_response.industry()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -268,47 +251,45 @@ async def test_raw_response_industry(self, async_client: AsyncCloudflare) -> Non
 
     @parametrize
     async def test_streaming_response_industry(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer3.top.with_streaming_response.industry() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.attacks.layer3.top.with_streaming_response.industry() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            top = await response.parse()
-            assert_matches_type(TopIndustryResponse, top, path=["response"])
+                top = await response.parse()
+                assert_matches_type(TopIndustryResponse, top, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_vertical(self, async_client: AsyncCloudflare) -> None:
-        top = await async_client.radar.attacks.layer3.top.vertical()
+        with pytest.warns(DeprecationWarning):
+            top = await async_client.radar.attacks.layer3.top.vertical()
+
         assert_matches_type(TopVerticalResponse, top, path=["response"])
 
     @parametrize
     async def test_method_vertical_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        top = await async_client.radar.attacks.layer3.top.vertical(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            protocol=["UDP", "TCP", "ICMP"],
-        )
+        with pytest.warns(DeprecationWarning):
+            top = await async_client.radar.attacks.layer3.top.vertical(
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                ip_version=["IPv4"],
+                limit=1,
+                location=["string"],
+                name=["main_series"],
+                protocol=["UDP"],
+            )
+
         assert_matches_type(TopVerticalResponse, top, path=["response"])
 
     @parametrize
     async def test_raw_response_vertical(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer3.top.with_raw_response.vertical()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer3.top.with_raw_response.vertical()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -317,11 +298,12 @@ async def test_raw_response_vertical(self, async_client: AsyncCloudflare) -> Non
 
     @parametrize
     async def test_streaming_response_vertical(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer3.top.with_streaming_response.vertical() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.attacks.layer3.top.with_streaming_response.vertical() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            top = await response.parse()
-            assert_matches_type(TopVerticalResponse, top, path=["response"])
+                top = await response.parse()
+                assert_matches_type(TopVerticalResponse, top, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/attacks/layer3/top/test_locations.py b/tests/api_resources/radar/attacks/layer3/top/test_locations.py
index a0e56083ec6..196e16c8dad 100644
--- a/tests/api_resources/radar/attacks/layer3/top/test_locations.py
+++ b/tests/api_resources/radar/attacks/layer3/top/test_locations.py
@@ -29,24 +29,16 @@ def test_method_origin(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_origin_with_all_params(self, client: Cloudflare) -> None:
         location = client.radar.attacks.layer3.top.locations.origin(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            protocol=["UDP", "TCP", "ICMP"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            protocol=["UDP"],
         )
         assert_matches_type(LocationOriginResponse, location, path=["response"])
 
@@ -78,24 +70,16 @@ def test_method_target(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_target_with_all_params(self, client: Cloudflare) -> None:
         location = client.radar.attacks.layer3.top.locations.target(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            protocol=["UDP", "TCP", "ICMP"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            protocol=["UDP"],
         )
         assert_matches_type(LocationTargetResponse, location, path=["response"])
 
@@ -121,7 +105,9 @@ def test_streaming_response_target(self, client: Cloudflare) -> None:
 
 
 class TestAsyncLocations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_origin(self, async_client: AsyncCloudflare) -> None:
@@ -131,24 +117,16 @@ async def test_method_origin(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_origin_with_all_params(self, async_client: AsyncCloudflare) -> None:
         location = await async_client.radar.attacks.layer3.top.locations.origin(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            protocol=["UDP", "TCP", "ICMP"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            protocol=["UDP"],
         )
         assert_matches_type(LocationOriginResponse, location, path=["response"])
 
@@ -180,24 +158,16 @@ async def test_method_target(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_target_with_all_params(self, async_client: AsyncCloudflare) -> None:
         location = await async_client.radar.attacks.layer3.top.locations.target(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            protocol=["UDP", "TCP", "ICMP"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            protocol=["UDP"],
         )
         assert_matches_type(LocationTargetResponse, location, path=["response"])
 
diff --git a/tests/api_resources/radar/attacks/layer7/test_summary.py b/tests/api_resources/radar/attacks/layer7/test_summary.py
index b94343f2fa0..d7d18b1efca 100644
--- a/tests/api_resources/radar/attacks/layer7/test_summary.py
+++ b/tests/api_resources/radar/attacks/layer7/test_summary.py
@@ -11,7 +11,8 @@
 from tests.utils import assert_matches_type
 from cloudflare._utils import parse_datetime
 from cloudflare.types.radar.attacks.layer7 import (
-    SummaryGetResponse,
+    SummaryIndustryResponse,
+    SummaryVerticalResponse,
     SummaryIPVersionResponse,
     SummaryHTTPMethodResponse,
     SummaryHTTPVersionResponse,
@@ -19,92 +20,45 @@
     SummaryMitigationProductResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
 class TestSummary:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer7.summary.get()
-        assert_matches_type(SummaryGetResponse, summary, path=["response"])
-
-    @parametrize
-    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer7.summary.get(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
-        assert_matches_type(SummaryGetResponse, summary, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer7.summary.with_raw_response.get()
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        summary = response.parse()
-        assert_matches_type(SummaryGetResponse, summary, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer7.summary.with_streaming_response.get() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            summary = response.parse()
-            assert_matches_type(SummaryGetResponse, summary, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
     @parametrize
     def test_method_http_method(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer7.summary.http_method()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer7.summary.http_method()
+
         assert_matches_type(SummaryHTTPMethodResponse, summary, path=["response"])
 
     @parametrize
     def test_method_http_method_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer7.summary.http_method(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer7.summary.http_method(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+            )
+
         assert_matches_type(SummaryHTTPMethodResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_http_method(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer7.summary.with_raw_response.http_method()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer7.summary.with_raw_response.http_method()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -113,48 +67,46 @@ def test_raw_response_http_method(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_http_method(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer7.summary.with_streaming_response.http_method() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer7.summary.with_streaming_response.http_method() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryHTTPMethodResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryHTTPMethodResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_http_version(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer7.summary.http_version()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer7.summary.http_version()
+
         assert_matches_type(SummaryHTTPVersionResponse, summary, path=["response"])
 
     @parametrize
     def test_method_http_version_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer7.summary.http_version(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer7.summary.http_version(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                ip_version=["IPv4"],
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+            )
+
         assert_matches_type(SummaryHTTPVersionResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_http_version(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer7.summary.with_raw_response.http_version()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer7.summary.with_raw_response.http_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -163,48 +115,96 @@ def test_raw_response_http_version(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_http_version(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer7.summary.with_streaming_response.http_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer7.summary.with_streaming_response.http_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryHTTPVersionResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_industry(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer7.summary.industry()
+
+        assert_matches_type(SummaryIndustryResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_industry_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer7.summary.industry(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+            )
 
-            summary = response.parse()
-            assert_matches_type(SummaryHTTPVersionResponse, summary, path=["response"])
+        assert_matches_type(SummaryIndustryResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_industry(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer7.summary.with_raw_response.industry()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryIndustryResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_industry(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer7.summary.with_streaming_response.industry() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryIndustryResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_ip_version(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer7.summary.ip_version()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer7.summary.ip_version()
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     def test_method_ip_version_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer7.summary.ip_version(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer7.summary.ip_version(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+            )
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_ip_version(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer7.summary.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer7.summary.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -213,49 +213,48 @@ def test_raw_response_ip_version(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_ip_version(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer7.summary.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer7.summary.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_managed_rules(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer7.summary.managed_rules()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer7.summary.managed_rules()
+
         assert_matches_type(SummaryManagedRulesResponse, summary, path=["response"])
 
     @parametrize
     def test_method_managed_rules_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer7.summary.managed_rules(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer7.summary.managed_rules(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+            )
+
         assert_matches_type(SummaryManagedRulesResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_managed_rules(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer7.summary.with_raw_response.managed_rules()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer7.summary.with_raw_response.managed_rules()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -264,48 +263,47 @@ def test_raw_response_managed_rules(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_managed_rules(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer7.summary.with_streaming_response.managed_rules() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer7.summary.with_streaming_response.managed_rules() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryManagedRulesResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryManagedRulesResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_mitigation_product(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer7.summary.mitigation_product()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer7.summary.mitigation_product()
+
         assert_matches_type(SummaryMitigationProductResponse, summary, path=["response"])
 
     @parametrize
     def test_method_mitigation_product_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.attacks.layer7.summary.mitigation_product(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer7.summary.mitigation_product(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+            )
+
         assert_matches_type(SummaryMitigationProductResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_mitigation_product(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer7.summary.with_raw_response.mitigation_product()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer7.summary.with_raw_response.mitigation_product()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -314,99 +312,103 @@ def test_raw_response_mitigation_product(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_mitigation_product(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer7.summary.with_streaming_response.mitigation_product() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer7.summary.with_streaming_response.mitigation_product() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryMitigationProductResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryMitigationProductResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @parametrize
+    def test_method_vertical(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer7.summary.vertical()
 
-class TestAsyncSummary:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer7.summary.get()
-        assert_matches_type(SummaryGetResponse, summary, path=["response"])
-
-    @parametrize
-    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer7.summary.get(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
-        assert_matches_type(SummaryGetResponse, summary, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer7.summary.with_raw_response.get()
+        assert_matches_type(SummaryVerticalResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_vertical_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.attacks.layer7.summary.vertical(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+            )
+
+        assert_matches_type(SummaryVerticalResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_vertical(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer7.summary.with_raw_response.vertical()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        summary = await response.parse()
-        assert_matches_type(SummaryGetResponse, summary, path=["response"])
+        summary = response.parse()
+        assert_matches_type(SummaryVerticalResponse, summary, path=["response"])
 
     @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer7.summary.with_streaming_response.get() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+    def test_streaming_response_vertical(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer7.summary.with_streaming_response.vertical() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryGetResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryVerticalResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+
+class TestAsyncSummary:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
     @parametrize
     async def test_method_http_method(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer7.summary.http_method()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer7.summary.http_method()
+
         assert_matches_type(SummaryHTTPMethodResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_http_method_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer7.summary.http_method(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer7.summary.http_method(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+            )
+
         assert_matches_type(SummaryHTTPMethodResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_http_method(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer7.summary.with_raw_response.http_method()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer7.summary.with_raw_response.http_method()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -415,48 +417,46 @@ async def test_raw_response_http_method(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_streaming_response_http_method(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer7.summary.with_streaming_response.http_method() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.attacks.layer7.summary.with_streaming_response.http_method() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryHTTPMethodResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryHTTPMethodResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_http_version(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer7.summary.http_version()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer7.summary.http_version()
+
         assert_matches_type(SummaryHTTPVersionResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_http_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer7.summary.http_version(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer7.summary.http_version(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                ip_version=["IPv4"],
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+            )
+
         assert_matches_type(SummaryHTTPVersionResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_http_version(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer7.summary.with_raw_response.http_version()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer7.summary.with_raw_response.http_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -465,48 +465,96 @@ async def test_raw_response_http_version(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_streaming_response_http_version(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer7.summary.with_streaming_response.http_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.attacks.layer7.summary.with_streaming_response.http_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryHTTPVersionResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_industry(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer7.summary.industry()
+
+        assert_matches_type(SummaryIndustryResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_industry_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer7.summary.industry(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+            )
+
+        assert_matches_type(SummaryIndustryResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_industry(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer7.summary.with_raw_response.industry()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryIndustryResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_industry(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.attacks.layer7.summary.with_streaming_response.industry() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryHTTPVersionResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryIndustryResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_ip_version(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer7.summary.ip_version()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer7.summary.ip_version()
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_ip_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer7.summary.ip_version(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer7.summary.ip_version(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+            )
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer7.summary.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer7.summary.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -515,49 +563,48 @@ async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_streaming_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer7.summary.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.attacks.layer7.summary.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_managed_rules(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer7.summary.managed_rules()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer7.summary.managed_rules()
+
         assert_matches_type(SummaryManagedRulesResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_managed_rules_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer7.summary.managed_rules(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer7.summary.managed_rules(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+            )
+
         assert_matches_type(SummaryManagedRulesResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_managed_rules(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer7.summary.with_raw_response.managed_rules()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer7.summary.with_raw_response.managed_rules()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -566,48 +613,47 @@ async def test_raw_response_managed_rules(self, async_client: AsyncCloudflare) -
 
     @parametrize
     async def test_streaming_response_managed_rules(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer7.summary.with_streaming_response.managed_rules() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.attacks.layer7.summary.with_streaming_response.managed_rules() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryManagedRulesResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryManagedRulesResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_mitigation_product(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer7.summary.mitigation_product()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer7.summary.mitigation_product()
+
         assert_matches_type(SummaryMitigationProductResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_mitigation_product_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.attacks.layer7.summary.mitigation_product(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer7.summary.mitigation_product(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+            )
+
         assert_matches_type(SummaryMitigationProductResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_mitigation_product(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer7.summary.with_raw_response.mitigation_product()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer7.summary.with_raw_response.mitigation_product()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -616,11 +662,64 @@ async def test_raw_response_mitigation_product(self, async_client: AsyncCloudfla
 
     @parametrize
     async def test_streaming_response_mitigation_product(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer7.summary.with_streaming_response.mitigation_product() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.attacks.layer7.summary.with_streaming_response.mitigation_product()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryMitigationProductResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_vertical(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer7.summary.vertical()
+
+        assert_matches_type(SummaryVerticalResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_vertical_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.attacks.layer7.summary.vertical(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+            )
+
+        assert_matches_type(SummaryVerticalResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_vertical(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer7.summary.with_raw_response.vertical()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryVerticalResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_vertical(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.attacks.layer7.summary.with_streaming_response.vertical() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryMitigationProductResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryVerticalResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/attacks/layer7/test_timeseries_groups.py b/tests/api_resources/radar/attacks/layer7/test_timeseries_groups.py
index 31dcbe0283b..590e70ec024 100644
--- a/tests/api_resources/radar/attacks/layer7/test_timeseries_groups.py
+++ b/tests/api_resources/radar/attacks/layer7/test_timeseries_groups.py
@@ -11,7 +11,6 @@
 from tests.utils import assert_matches_type
 from cloudflare._utils import parse_datetime
 from cloudflare.types.radar.attacks.layer7 import (
-    TimeseriesGroupGetResponse,
     TimeseriesGroupIndustryResponse,
     TimeseriesGroupVerticalResponse,
     TimeseriesGroupIPVersionResponse,
@@ -21,95 +20,47 @@
     TimeseriesGroupMitigationProductResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
 class TestTimeseriesGroups:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer7.timeseries_groups.get()
-        assert_matches_type(TimeseriesGroupGetResponse, timeseries_group, path=["response"])
-
-    @parametrize
-    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer7.timeseries_groups.get(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
-        assert_matches_type(TimeseriesGroupGetResponse, timeseries_group, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer7.timeseries_groups.with_raw_response.get()
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        timeseries_group = response.parse()
-        assert_matches_type(TimeseriesGroupGetResponse, timeseries_group, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer7.timeseries_groups.with_streaming_response.get() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupGetResponse, timeseries_group, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
     @parametrize
     def test_method_http_method(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer7.timeseries_groups.http_method()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer7.timeseries_groups.http_method()
+
         assert_matches_type(TimeseriesGroupHTTPMethodResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_http_method_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer7.timeseries_groups.http_method(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer7.timeseries_groups.http_method(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+            )
+
         assert_matches_type(TimeseriesGroupHTTPMethodResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_http_method(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer7.timeseries_groups.with_raw_response.http_method()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer7.timeseries_groups.with_raw_response.http_method()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -118,50 +69,48 @@ def test_raw_response_http_method(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_http_method(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer7.timeseries_groups.with_streaming_response.http_method() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer7.timeseries_groups.with_streaming_response.http_method() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupHTTPMethodResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupHTTPMethodResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_http_version(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer7.timeseries_groups.http_version()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer7.timeseries_groups.http_version()
+
         assert_matches_type(TimeseriesGroupHTTPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_http_version_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer7.timeseries_groups.http_version(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer7.timeseries_groups.http_version(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                ip_version=["IPv4"],
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+            )
+
         assert_matches_type(TimeseriesGroupHTTPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_http_version(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer7.timeseries_groups.with_raw_response.http_version()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer7.timeseries_groups.with_raw_response.http_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -170,52 +119,50 @@ def test_raw_response_http_version(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_http_version(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer7.timeseries_groups.with_streaming_response.http_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer7.timeseries_groups.with_streaming_response.http_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupHTTPVersionResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupHTTPVersionResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_industry(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer7.timeseries_groups.industry()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer7.timeseries_groups.industry()
+
         assert_matches_type(TimeseriesGroupIndustryResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_industry_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer7.timeseries_groups.industry(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit_per_group=4,
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer7.timeseries_groups.industry(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+            )
+
         assert_matches_type(TimeseriesGroupIndustryResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_industry(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer7.timeseries_groups.with_raw_response.industry()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer7.timeseries_groups.with_raw_response.industry()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -224,50 +171,48 @@ def test_raw_response_industry(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_industry(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer7.timeseries_groups.with_streaming_response.industry() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer7.timeseries_groups.with_streaming_response.industry() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupIndustryResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupIndustryResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_ip_version(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer7.timeseries_groups.ip_version()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer7.timeseries_groups.ip_version()
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_ip_version_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer7.timeseries_groups.ip_version(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer7.timeseries_groups.ip_version(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+            )
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_ip_version(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer7.timeseries_groups.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer7.timeseries_groups.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -276,51 +221,50 @@ def test_raw_response_ip_version(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_ip_version(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer7.timeseries_groups.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer7.timeseries_groups.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_managed_rules(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer7.timeseries_groups.managed_rules()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer7.timeseries_groups.managed_rules()
+
         assert_matches_type(TimeseriesGroupManagedRulesResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_managed_rules_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer7.timeseries_groups.managed_rules(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer7.timeseries_groups.managed_rules(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+            )
+
         assert_matches_type(TimeseriesGroupManagedRulesResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_managed_rules(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer7.timeseries_groups.with_raw_response.managed_rules()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer7.timeseries_groups.with_raw_response.managed_rules()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -329,50 +273,49 @@ def test_raw_response_managed_rules(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_managed_rules(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer7.timeseries_groups.with_streaming_response.managed_rules() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer7.timeseries_groups.with_streaming_response.managed_rules() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupManagedRulesResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupManagedRulesResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_mitigation_product(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer7.timeseries_groups.mitigation_product()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer7.timeseries_groups.mitigation_product()
+
         assert_matches_type(TimeseriesGroupMitigationProductResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_mitigation_product_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer7.timeseries_groups.mitigation_product(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer7.timeseries_groups.mitigation_product(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+            )
+
         assert_matches_type(TimeseriesGroupMitigationProductResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_mitigation_product(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer7.timeseries_groups.with_raw_response.mitigation_product()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer7.timeseries_groups.with_raw_response.mitigation_product()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -381,52 +324,50 @@ def test_raw_response_mitigation_product(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_mitigation_product(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer7.timeseries_groups.with_streaming_response.mitigation_product() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer7.timeseries_groups.with_streaming_response.mitigation_product() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupMitigationProductResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupMitigationProductResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_vertical(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer7.timeseries_groups.vertical()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer7.timeseries_groups.vertical()
+
         assert_matches_type(TimeseriesGroupVerticalResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_vertical_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.attacks.layer7.timeseries_groups.vertical(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit_per_group=4,
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.attacks.layer7.timeseries_groups.vertical(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+            )
+
         assert_matches_type(TimeseriesGroupVerticalResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_vertical(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer7.timeseries_groups.with_raw_response.vertical()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer7.timeseries_groups.with_raw_response.vertical()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -435,102 +376,55 @@ def test_raw_response_vertical(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_vertical(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer7.timeseries_groups.with_streaming_response.vertical() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer7.timeseries_groups.with_streaming_response.vertical() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupVerticalResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupVerticalResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncTimeseriesGroups:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.get()
-        assert_matches_type(TimeseriesGroupGetResponse, timeseries_group, path=["response"])
-
-    @parametrize
-    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.get(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
-        assert_matches_type(TimeseriesGroupGetResponse, timeseries_group, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer7.timeseries_groups.with_raw_response.get()
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        timeseries_group = await response.parse()
-        assert_matches_type(TimeseriesGroupGetResponse, timeseries_group, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer7.timeseries_groups.with_streaming_response.get() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupGetResponse, timeseries_group, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_http_method(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.http_method()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.http_method()
+
         assert_matches_type(TimeseriesGroupHTTPMethodResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_http_method_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.http_method(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.http_method(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+            )
+
         assert_matches_type(TimeseriesGroupHTTPMethodResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_http_method(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer7.timeseries_groups.with_raw_response.http_method()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer7.timeseries_groups.with_raw_response.http_method()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -539,50 +433,50 @@ async def test_raw_response_http_method(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_streaming_response_http_method(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer7.timeseries_groups.with_streaming_response.http_method() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.attacks.layer7.timeseries_groups.with_streaming_response.http_method()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupHTTPMethodResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupHTTPMethodResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_http_version(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.http_version()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.http_version()
+
         assert_matches_type(TimeseriesGroupHTTPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_http_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.http_version(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.http_version(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                ip_version=["IPv4"],
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+            )
+
         assert_matches_type(TimeseriesGroupHTTPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_http_version(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer7.timeseries_groups.with_raw_response.http_version()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer7.timeseries_groups.with_raw_response.http_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -591,52 +485,52 @@ async def test_raw_response_http_version(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_streaming_response_http_version(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer7.timeseries_groups.with_streaming_response.http_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.attacks.layer7.timeseries_groups.with_streaming_response.http_version()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupHTTPVersionResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupHTTPVersionResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_industry(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.industry()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.industry()
+
         assert_matches_type(TimeseriesGroupIndustryResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_industry_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.industry(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit_per_group=4,
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.industry(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+            )
+
         assert_matches_type(TimeseriesGroupIndustryResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_industry(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer7.timeseries_groups.with_raw_response.industry()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer7.timeseries_groups.with_raw_response.industry()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -645,50 +539,50 @@ async def test_raw_response_industry(self, async_client: AsyncCloudflare) -> Non
 
     @parametrize
     async def test_streaming_response_industry(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer7.timeseries_groups.with_streaming_response.industry() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.attacks.layer7.timeseries_groups.with_streaming_response.industry()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupIndustryResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupIndustryResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_ip_version(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.ip_version()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.ip_version()
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_ip_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.ip_version(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.ip_version(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+            )
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer7.timeseries_groups.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer7.timeseries_groups.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -697,51 +591,52 @@ async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_streaming_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer7.timeseries_groups.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.attacks.layer7.timeseries_groups.with_streaming_response.ip_version()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_managed_rules(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.managed_rules()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.managed_rules()
+
         assert_matches_type(TimeseriesGroupManagedRulesResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_managed_rules_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.managed_rules(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.managed_rules(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+            )
+
         assert_matches_type(TimeseriesGroupManagedRulesResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_managed_rules(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer7.timeseries_groups.with_raw_response.managed_rules()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer7.timeseries_groups.with_raw_response.managed_rules()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -750,50 +645,51 @@ async def test_raw_response_managed_rules(self, async_client: AsyncCloudflare) -
 
     @parametrize
     async def test_streaming_response_managed_rules(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer7.timeseries_groups.with_streaming_response.managed_rules() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.attacks.layer7.timeseries_groups.with_streaming_response.managed_rules()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupManagedRulesResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupManagedRulesResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_mitigation_product(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.mitigation_product()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.mitigation_product()
+
         assert_matches_type(TimeseriesGroupMitigationProductResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_mitigation_product_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.mitigation_product(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.mitigation_product(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+            )
+
         assert_matches_type(TimeseriesGroupMitigationProductResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_mitigation_product(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer7.timeseries_groups.with_raw_response.mitigation_product()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer7.timeseries_groups.with_raw_response.mitigation_product()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -802,52 +698,52 @@ async def test_raw_response_mitigation_product(self, async_client: AsyncCloudfla
 
     @parametrize
     async def test_streaming_response_mitigation_product(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer7.timeseries_groups.with_streaming_response.mitigation_product() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.attacks.layer7.timeseries_groups.with_streaming_response.mitigation_product()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupMitigationProductResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupMitigationProductResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_vertical(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.vertical()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.vertical()
+
         assert_matches_type(TimeseriesGroupVerticalResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_vertical_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.vertical(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit_per_group=4,
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-            normalization="PERCENTAGE",
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.attacks.layer7.timeseries_groups.vertical(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+                normalization="PERCENTAGE",
+            )
+
         assert_matches_type(TimeseriesGroupVerticalResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_vertical(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer7.timeseries_groups.with_raw_response.vertical()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer7.timeseries_groups.with_raw_response.vertical()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -856,11 +752,14 @@ async def test_raw_response_vertical(self, async_client: AsyncCloudflare) -> Non
 
     @parametrize
     async def test_streaming_response_vertical(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer7.timeseries_groups.with_streaming_response.vertical() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupVerticalResponse, timeseries_group, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.attacks.layer7.timeseries_groups.with_streaming_response.vertical()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupVerticalResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/attacks/layer7/test_top.py b/tests/api_resources/radar/attacks/layer7/test_top.py
index 57fbfb1852d..3556046c6ea 100644
--- a/tests/api_resources/radar/attacks/layer7/test_top.py
+++ b/tests/api_resources/radar/attacks/layer7/test_top.py
@@ -16,6 +16,8 @@
     TopVerticalResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -30,30 +32,18 @@ def test_method_attacks(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_attacks_with_all_params(self, client: Cloudflare) -> None:
         top = client.radar.attacks.layer7.top.attacks(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
+            limit=1,
             limit_direction="ORIGIN",
-            limit_per_location=10,
-            location=["string", "string", "string"],
-            magnitude="MITIGATED_REQUESTS",
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
+            limit_per_location=1,
+            location=["string"],
+            mitigation_product=["DDOS"],
+            name=["main_series"],
             normalization="PERCENTAGE",
         )
         assert_matches_type(TopAttacksResponse, top, path=["response"])
@@ -80,39 +70,36 @@ def test_streaming_response_attacks(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_industry(self, client: Cloudflare) -> None:
-        top = client.radar.attacks.layer7.top.industry()
+        with pytest.warns(DeprecationWarning):
+            top = client.radar.attacks.layer7.top.industry()
+
         assert_matches_type(TopIndustryResponse, top, path=["response"])
 
     @parametrize
     def test_method_industry_with_all_params(self, client: Cloudflare) -> None:
-        top = client.radar.attacks.layer7.top.industry(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            top = client.radar.attacks.layer7.top.industry(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit=1,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+            )
+
         assert_matches_type(TopIndustryResponse, top, path=["response"])
 
     @parametrize
     def test_raw_response_industry(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer7.top.with_raw_response.industry()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer7.top.with_raw_response.industry()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -121,50 +108,48 @@ def test_raw_response_industry(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_industry(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer7.top.with_streaming_response.industry() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer7.top.with_streaming_response.industry() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            top = response.parse()
-            assert_matches_type(TopIndustryResponse, top, path=["response"])
+                top = response.parse()
+                assert_matches_type(TopIndustryResponse, top, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_vertical(self, client: Cloudflare) -> None:
-        top = client.radar.attacks.layer7.top.vertical()
+        with pytest.warns(DeprecationWarning):
+            top = client.radar.attacks.layer7.top.vertical()
+
         assert_matches_type(TopVerticalResponse, top, path=["response"])
 
     @parametrize
     def test_method_vertical_with_all_params(self, client: Cloudflare) -> None:
-        top = client.radar.attacks.layer7.top.vertical(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            top = client.radar.attacks.layer7.top.vertical(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit=1,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+            )
+
         assert_matches_type(TopVerticalResponse, top, path=["response"])
 
     @parametrize
     def test_raw_response_vertical(self, client: Cloudflare) -> None:
-        response = client.radar.attacks.layer7.top.with_raw_response.vertical()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.attacks.layer7.top.with_raw_response.vertical()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -173,18 +158,21 @@ def test_raw_response_vertical(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_vertical(self, client: Cloudflare) -> None:
-        with client.radar.attacks.layer7.top.with_streaming_response.vertical() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.attacks.layer7.top.with_streaming_response.vertical() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            top = response.parse()
-            assert_matches_type(TopVerticalResponse, top, path=["response"])
+                top = response.parse()
+                assert_matches_type(TopVerticalResponse, top, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncTop:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_attacks(self, async_client: AsyncCloudflare) -> None:
@@ -194,30 +182,18 @@ async def test_method_attacks(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_attacks_with_all_params(self, async_client: AsyncCloudflare) -> None:
         top = await async_client.radar.attacks.layer7.top.attacks(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
+            limit=1,
             limit_direction="ORIGIN",
-            limit_per_location=10,
-            location=["string", "string", "string"],
-            magnitude="MITIGATED_REQUESTS",
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
+            limit_per_location=1,
+            location=["string"],
+            mitigation_product=["DDOS"],
+            name=["main_series"],
             normalization="PERCENTAGE",
         )
         assert_matches_type(TopAttacksResponse, top, path=["response"])
@@ -244,39 +220,36 @@ async def test_streaming_response_attacks(self, async_client: AsyncCloudflare) -
 
     @parametrize
     async def test_method_industry(self, async_client: AsyncCloudflare) -> None:
-        top = await async_client.radar.attacks.layer7.top.industry()
+        with pytest.warns(DeprecationWarning):
+            top = await async_client.radar.attacks.layer7.top.industry()
+
         assert_matches_type(TopIndustryResponse, top, path=["response"])
 
     @parametrize
     async def test_method_industry_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        top = await async_client.radar.attacks.layer7.top.industry(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            top = await async_client.radar.attacks.layer7.top.industry(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit=1,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+            )
+
         assert_matches_type(TopIndustryResponse, top, path=["response"])
 
     @parametrize
     async def test_raw_response_industry(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer7.top.with_raw_response.industry()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer7.top.with_raw_response.industry()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -285,50 +258,48 @@ async def test_raw_response_industry(self, async_client: AsyncCloudflare) -> Non
 
     @parametrize
     async def test_streaming_response_industry(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer7.top.with_streaming_response.industry() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.attacks.layer7.top.with_streaming_response.industry() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            top = await response.parse()
-            assert_matches_type(TopIndustryResponse, top, path=["response"])
+                top = await response.parse()
+                assert_matches_type(TopIndustryResponse, top, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_vertical(self, async_client: AsyncCloudflare) -> None:
-        top = await async_client.radar.attacks.layer7.top.vertical()
+        with pytest.warns(DeprecationWarning):
+            top = await async_client.radar.attacks.layer7.top.vertical()
+
         assert_matches_type(TopVerticalResponse, top, path=["response"])
 
     @parametrize
     async def test_method_vertical_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        top = await async_client.radar.attacks.layer7.top.vertical(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            top = await async_client.radar.attacks.layer7.top.vertical(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                http_method=["GET"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit=1,
+                location=["string"],
+                mitigation_product=["DDOS"],
+                name=["main_series"],
+            )
+
         assert_matches_type(TopVerticalResponse, top, path=["response"])
 
     @parametrize
     async def test_raw_response_vertical(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.attacks.layer7.top.with_raw_response.vertical()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.attacks.layer7.top.with_raw_response.vertical()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -337,11 +308,12 @@ async def test_raw_response_vertical(self, async_client: AsyncCloudflare) -> Non
 
     @parametrize
     async def test_streaming_response_vertical(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.attacks.layer7.top.with_streaming_response.vertical() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.attacks.layer7.top.with_streaming_response.vertical() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            top = await response.parse()
-            assert_matches_type(TopVerticalResponse, top, path=["response"])
+                top = await response.parse()
+                assert_matches_type(TopVerticalResponse, top, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/attacks/layer7/top/test_ases.py b/tests/api_resources/radar/attacks/layer7/top/test_ases.py
index 3eac5b1b0fc..cf1da509e9e 100644
--- a/tests/api_resources/radar/attacks/layer7/top/test_ases.py
+++ b/tests/api_resources/radar/attacks/layer7/top/test_ases.py
@@ -26,26 +26,18 @@ def test_method_origin(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_origin_with_all_params(self, client: Cloudflare) -> None:
         ase = client.radar.attacks.layer7.top.ases.origin(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
+            http_method=["GET"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            mitigation_product=["DDOS"],
+            name=["main_series"],
         )
         assert_matches_type(AseOriginResponse, ase, path=["response"])
 
@@ -71,7 +63,9 @@ def test_streaming_response_origin(self, client: Cloudflare) -> None:
 
 
 class TestAsyncAses:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_origin(self, async_client: AsyncCloudflare) -> None:
@@ -81,26 +75,18 @@ async def test_method_origin(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_origin_with_all_params(self, async_client: AsyncCloudflare) -> None:
         ase = await async_client.radar.attacks.layer7.top.ases.origin(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
+            http_method=["GET"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            mitigation_product=["DDOS"],
+            name=["main_series"],
         )
         assert_matches_type(AseOriginResponse, ase, path=["response"])
 
diff --git a/tests/api_resources/radar/attacks/layer7/top/test_locations.py b/tests/api_resources/radar/attacks/layer7/top/test_locations.py
index 9dbd50722a2..66da67f4c35 100644
--- a/tests/api_resources/radar/attacks/layer7/top/test_locations.py
+++ b/tests/api_resources/radar/attacks/layer7/top/test_locations.py
@@ -29,26 +29,18 @@ def test_method_origin(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_origin_with_all_params(self, client: Cloudflare) -> None:
         location = client.radar.attacks.layer7.top.locations.origin(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
+            http_method=["GET"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            mitigation_product=["DDOS"],
+            name=["main_series"],
         )
         assert_matches_type(LocationOriginResponse, location, path=["response"])
 
@@ -80,25 +72,14 @@ def test_method_target(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_target_with_all_params(self, client: Cloudflare) -> None:
         location = client.radar.attacks.layer7.top.locations.target(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
+            limit=1,
+            mitigation_product=["DDOS"],
+            name=["main_series"],
         )
         assert_matches_type(LocationTargetResponse, location, path=["response"])
 
@@ -124,7 +105,9 @@ def test_streaming_response_target(self, client: Cloudflare) -> None:
 
 
 class TestAsyncLocations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_origin(self, async_client: AsyncCloudflare) -> None:
@@ -134,26 +117,18 @@ async def test_method_origin(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_origin_with_all_params(self, async_client: AsyncCloudflare) -> None:
         location = await async_client.radar.attacks.layer7.top.locations.origin(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
+            http_method=["GET"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            mitigation_product=["DDOS"],
+            name=["main_series"],
         )
         assert_matches_type(LocationOriginResponse, location, path=["response"])
 
@@ -185,25 +160,14 @@ async def test_method_target(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_target_with_all_params(self, async_client: AsyncCloudflare) -> None:
         location = await async_client.radar.attacks.layer7.top.locations.target(
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
+            limit=1,
+            mitigation_product=["DDOS"],
+            name=["main_series"],
         )
         assert_matches_type(LocationTargetResponse, location, path=["response"])
 
diff --git a/tests/api_resources/radar/attacks/test_layer3.py b/tests/api_resources/radar/attacks/test_layer3.py
index b5284733f5b..33552df4937 100644
--- a/tests/api_resources/radar/attacks/test_layer3.py
+++ b/tests/api_resources/radar/attacks/test_layer3.py
@@ -10,7 +10,11 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare._utils import parse_datetime
-from cloudflare.types.radar.attacks import Layer3TimeseriesResponse
+from cloudflare.types.radar.attacks import (
+    Layer3SummaryV2Response,
+    Layer3TimeseriesResponse,
+    Layer3TimeseriesGroupsV2Response,
+)
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -18,6 +22,55 @@
 class TestLayer3:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @parametrize
+    def test_method_summary_v2(self, client: Cloudflare) -> None:
+        layer3 = client.radar.attacks.layer3.summary_v2(
+            dimension="PROTOCOL",
+        )
+        assert_matches_type(Layer3SummaryV2Response, layer3, path=["response"])
+
+    @parametrize
+    def test_method_summary_v2_with_all_params(self, client: Cloudflare) -> None:
+        layer3 = client.radar.attacks.layer3.summary_v2(
+            dimension="PROTOCOL",
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            direction="ORIGIN",
+            format="JSON",
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            protocol=["UDP"],
+        )
+        assert_matches_type(Layer3SummaryV2Response, layer3, path=["response"])
+
+    @parametrize
+    def test_raw_response_summary_v2(self, client: Cloudflare) -> None:
+        response = client.radar.attacks.layer3.with_raw_response.summary_v2(
+            dimension="PROTOCOL",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        layer3 = response.parse()
+        assert_matches_type(Layer3SummaryV2Response, layer3, path=["response"])
+
+    @parametrize
+    def test_streaming_response_summary_v2(self, client: Cloudflare) -> None:
+        with client.radar.attacks.layer3.with_streaming_response.summary_v2(
+            dimension="PROTOCOL",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            layer3 = response.parse()
+            assert_matches_type(Layer3SummaryV2Response, layer3, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
     @parametrize
     def test_method_timeseries(self, client: Cloudflare) -> None:
         layer3 = client.radar.attacks.layer3.timeseries()
@@ -27,27 +80,19 @@ def test_method_timeseries(self, client: Cloudflare) -> None:
     def test_method_timeseries_with_all_params(self, client: Cloudflare) -> None:
         layer3 = client.radar.attacks.layer3.timeseries(
             agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             direction="ORIGIN",
             format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
+            ip_version=["IPv4"],
+            location=["string"],
             metric="BYTES",
-            name=["string", "string", "string"],
+            name=["main_series"],
             normalization="MIN0_MAX",
-            protocol=["UDP", "TCP", "ICMP"],
+            protocol=["UDP"],
         )
         assert_matches_type(Layer3TimeseriesResponse, layer3, path=["response"])
 
@@ -71,9 +116,111 @@ def test_streaming_response_timeseries(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @parametrize
+    def test_method_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        layer3 = client.radar.attacks.layer3.timeseries_groups_v2(
+            dimension="PROTOCOL",
+        )
+        assert_matches_type(Layer3TimeseriesGroupsV2Response, layer3, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_groups_v2_with_all_params(self, client: Cloudflare) -> None:
+        layer3 = client.radar.attacks.layer3.timeseries_groups_v2(
+            dimension="PROTOCOL",
+            agg_interval="1h",
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            direction="ORIGIN",
+            format="JSON",
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            normalization="PERCENTAGE",
+            protocol=["UDP"],
+        )
+        assert_matches_type(Layer3TimeseriesGroupsV2Response, layer3, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        response = client.radar.attacks.layer3.with_raw_response.timeseries_groups_v2(
+            dimension="PROTOCOL",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        layer3 = response.parse()
+        assert_matches_type(Layer3TimeseriesGroupsV2Response, layer3, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        with client.radar.attacks.layer3.with_streaming_response.timeseries_groups_v2(
+            dimension="PROTOCOL",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            layer3 = response.parse()
+            assert_matches_type(Layer3TimeseriesGroupsV2Response, layer3, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
 
 class TestAsyncLayer3:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        layer3 = await async_client.radar.attacks.layer3.summary_v2(
+            dimension="PROTOCOL",
+        )
+        assert_matches_type(Layer3SummaryV2Response, layer3, path=["response"])
+
+    @parametrize
+    async def test_method_summary_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        layer3 = await async_client.radar.attacks.layer3.summary_v2(
+            dimension="PROTOCOL",
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            direction="ORIGIN",
+            format="JSON",
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            protocol=["UDP"],
+        )
+        assert_matches_type(Layer3SummaryV2Response, layer3, path=["response"])
+
+    @parametrize
+    async def test_raw_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.attacks.layer3.with_raw_response.summary_v2(
+            dimension="PROTOCOL",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        layer3 = await response.parse()
+        assert_matches_type(Layer3SummaryV2Response, layer3, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.attacks.layer3.with_streaming_response.summary_v2(
+            dimension="PROTOCOL",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            layer3 = await response.parse()
+            assert_matches_type(Layer3SummaryV2Response, layer3, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
@@ -84,27 +231,19 @@ async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
     async def test_method_timeseries_with_all_params(self, async_client: AsyncCloudflare) -> None:
         layer3 = await async_client.radar.attacks.layer3.timeseries(
             agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             direction="ORIGIN",
             format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
+            ip_version=["IPv4"],
+            location=["string"],
             metric="BYTES",
-            name=["string", "string", "string"],
+            name=["main_series"],
             normalization="MIN0_MAX",
-            protocol=["UDP", "TCP", "ICMP"],
+            protocol=["UDP"],
         )
         assert_matches_type(Layer3TimeseriesResponse, layer3, path=["response"])
 
@@ -127,3 +266,54 @@ async def test_streaming_response_timeseries(self, async_client: AsyncCloudflare
             assert_matches_type(Layer3TimeseriesResponse, layer3, path=["response"])
 
         assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        layer3 = await async_client.radar.attacks.layer3.timeseries_groups_v2(
+            dimension="PROTOCOL",
+        )
+        assert_matches_type(Layer3TimeseriesGroupsV2Response, layer3, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_groups_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        layer3 = await async_client.radar.attacks.layer3.timeseries_groups_v2(
+            dimension="PROTOCOL",
+            agg_interval="1h",
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            direction="ORIGIN",
+            format="JSON",
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            normalization="PERCENTAGE",
+            protocol=["UDP"],
+        )
+        assert_matches_type(Layer3TimeseriesGroupsV2Response, layer3, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.attacks.layer3.with_raw_response.timeseries_groups_v2(
+            dimension="PROTOCOL",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        layer3 = await response.parse()
+        assert_matches_type(Layer3TimeseriesGroupsV2Response, layer3, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.attacks.layer3.with_streaming_response.timeseries_groups_v2(
+            dimension="PROTOCOL",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            layer3 = await response.parse()
+            assert_matches_type(Layer3TimeseriesGroupsV2Response, layer3, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/attacks/test_layer7.py b/tests/api_resources/radar/attacks/test_layer7.py
index b5fab2f2768..cc167d692ff 100644
--- a/tests/api_resources/radar/attacks/test_layer7.py
+++ b/tests/api_resources/radar/attacks/test_layer7.py
@@ -10,7 +10,11 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare._utils import parse_datetime
-from cloudflare.types.radar.attacks import Layer7TimeseriesResponse
+from cloudflare.types.radar.attacks import (
+    Layer7SummaryV2Response,
+    Layer7TimeseriesResponse,
+    Layer7TimeseriesGroupsV2Response,
+)
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -18,6 +22,57 @@
 class TestLayer7:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @parametrize
+    def test_method_summary_v2(self, client: Cloudflare) -> None:
+        layer7 = client.radar.attacks.layer7.summary_v2(
+            dimension="HTTP_METHOD",
+        )
+        assert_matches_type(Layer7SummaryV2Response, layer7, path=["response"])
+
+    @parametrize
+    def test_method_summary_v2_with_all_params(self, client: Cloudflare) -> None:
+        layer7 = client.radar.attacks.layer7.summary_v2(
+            dimension="HTTP_METHOD",
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            http_method=["GET"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            location=["string"],
+            mitigation_product=["DDOS"],
+            name=["main_series"],
+        )
+        assert_matches_type(Layer7SummaryV2Response, layer7, path=["response"])
+
+    @parametrize
+    def test_raw_response_summary_v2(self, client: Cloudflare) -> None:
+        response = client.radar.attacks.layer7.with_raw_response.summary_v2(
+            dimension="HTTP_METHOD",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        layer7 = response.parse()
+        assert_matches_type(Layer7SummaryV2Response, layer7, path=["response"])
+
+    @parametrize
+    def test_streaming_response_summary_v2(self, client: Cloudflare) -> None:
+        with client.radar.attacks.layer7.with_streaming_response.summary_v2(
+            dimension="HTTP_METHOD",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            layer7 = response.parse()
+            assert_matches_type(Layer7SummaryV2Response, layer7, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
     @parametrize
     def test_method_timeseries(self, client: Cloudflare) -> None:
         layer7 = client.radar.attacks.layer7.timeseries()
@@ -27,27 +82,18 @@ def test_method_timeseries(self, client: Cloudflare) -> None:
     def test_method_timeseries_with_all_params(self, client: Cloudflare) -> None:
         layer7 = client.radar.attacks.layer7.timeseries(
             agg_interval="1h",
-            asn=["string", "string", "string"],
-            attack=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
+            http_method=["GET"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            location=["string"],
+            mitigation_product=["DDOS"],
+            name=["main_series"],
             normalization="MIN0_MAX",
         )
         assert_matches_type(Layer7TimeseriesResponse, layer7, path=["response"])
@@ -72,9 +118,115 @@ def test_streaming_response_timeseries(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @parametrize
+    def test_method_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        layer7 = client.radar.attacks.layer7.timeseries_groups_v2(
+            dimension="HTTP_METHOD",
+        )
+        assert_matches_type(Layer7TimeseriesGroupsV2Response, layer7, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_groups_v2_with_all_params(self, client: Cloudflare) -> None:
+        layer7 = client.radar.attacks.layer7.timeseries_groups_v2(
+            dimension="HTTP_METHOD",
+            agg_interval="1h",
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            http_method=["GET"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            location=["string"],
+            mitigation_product=["DDOS"],
+            name=["main_series"],
+            normalization="PERCENTAGE",
+        )
+        assert_matches_type(Layer7TimeseriesGroupsV2Response, layer7, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        response = client.radar.attacks.layer7.with_raw_response.timeseries_groups_v2(
+            dimension="HTTP_METHOD",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        layer7 = response.parse()
+        assert_matches_type(Layer7TimeseriesGroupsV2Response, layer7, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        with client.radar.attacks.layer7.with_streaming_response.timeseries_groups_v2(
+            dimension="HTTP_METHOD",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            layer7 = response.parse()
+            assert_matches_type(Layer7TimeseriesGroupsV2Response, layer7, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
 
 class TestAsyncLayer7:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        layer7 = await async_client.radar.attacks.layer7.summary_v2(
+            dimension="HTTP_METHOD",
+        )
+        assert_matches_type(Layer7SummaryV2Response, layer7, path=["response"])
+
+    @parametrize
+    async def test_method_summary_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        layer7 = await async_client.radar.attacks.layer7.summary_v2(
+            dimension="HTTP_METHOD",
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            http_method=["GET"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            location=["string"],
+            mitigation_product=["DDOS"],
+            name=["main_series"],
+        )
+        assert_matches_type(Layer7SummaryV2Response, layer7, path=["response"])
+
+    @parametrize
+    async def test_raw_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.attacks.layer7.with_raw_response.summary_v2(
+            dimension="HTTP_METHOD",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        layer7 = await response.parse()
+        assert_matches_type(Layer7SummaryV2Response, layer7, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.attacks.layer7.with_streaming_response.summary_v2(
+            dimension="HTTP_METHOD",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            layer7 = await response.parse()
+            assert_matches_type(Layer7SummaryV2Response, layer7, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
@@ -85,27 +237,18 @@ async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
     async def test_method_timeseries_with_all_params(self, async_client: AsyncCloudflare) -> None:
         layer7 = await async_client.radar.attacks.layer7.timeseries(
             agg_interval="1h",
-            asn=["string", "string", "string"],
-            attack=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            http_method=["GET", "POST", "DELETE"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            mitigation_product=["DDOS", "WAF", "BOT_MANAGEMENT"],
-            name=["string", "string", "string"],
+            http_method=["GET"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            location=["string"],
+            mitigation_product=["DDOS"],
+            name=["main_series"],
             normalization="MIN0_MAX",
         )
         assert_matches_type(Layer7TimeseriesResponse, layer7, path=["response"])
@@ -129,3 +272,56 @@ async def test_streaming_response_timeseries(self, async_client: AsyncCloudflare
             assert_matches_type(Layer7TimeseriesResponse, layer7, path=["response"])
 
         assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        layer7 = await async_client.radar.attacks.layer7.timeseries_groups_v2(
+            dimension="HTTP_METHOD",
+        )
+        assert_matches_type(Layer7TimeseriesGroupsV2Response, layer7, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_groups_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        layer7 = await async_client.radar.attacks.layer7.timeseries_groups_v2(
+            dimension="HTTP_METHOD",
+            agg_interval="1h",
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            http_method=["GET"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            location=["string"],
+            mitigation_product=["DDOS"],
+            name=["main_series"],
+            normalization="PERCENTAGE",
+        )
+        assert_matches_type(Layer7TimeseriesGroupsV2Response, layer7, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.attacks.layer7.with_raw_response.timeseries_groups_v2(
+            dimension="HTTP_METHOD",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        layer7 = await response.parse()
+        assert_matches_type(Layer7TimeseriesGroupsV2Response, layer7, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.attacks.layer7.with_streaming_response.timeseries_groups_v2(
+            dimension="HTTP_METHOD",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            layer7 = await response.parse()
+            assert_matches_type(Layer7TimeseriesGroupsV2Response, layer7, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/bgp/hijacks/test_events.py b/tests/api_resources/radar/bgp/hijacks/test_events.py
index 950799cb558..84f69964413 100644
--- a/tests/api_resources/radar/bgp/hijacks/test_events.py
+++ b/tests/api_resources/radar/bgp/hijacks/test_events.py
@@ -34,14 +34,14 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
             format="JSON",
             hijacker_asn=0,
             involved_asn=0,
-            involved_country="involvedCountry",
+            involved_country="PT",
             max_confidence=0,
             min_confidence=0,
-            page=0,
-            per_page=0,
+            page=1,
+            per_page=1,
             prefix="1.1.1.0/24",
             sort_by="TIME",
-            sort_order="DESC",
+            sort_order="ASC",
             victim_asn=0,
         )
         assert_matches_type(SyncV4PagePagination[EventListResponse], event, path=["response"])
@@ -68,7 +68,9 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncEvents:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
@@ -85,14 +87,14 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
             format="JSON",
             hijacker_asn=0,
             involved_asn=0,
-            involved_country="involvedCountry",
+            involved_country="PT",
             max_confidence=0,
             min_confidence=0,
-            page=0,
-            per_page=0,
+            page=1,
+            per_page=1,
             prefix="1.1.1.0/24",
             sort_by="TIME",
-            sort_order="DESC",
+            sort_order="ASC",
             victim_asn=0,
         )
         assert_matches_type(AsyncV4PagePagination[EventListResponse], event, path=["response"])
diff --git a/tests/api_resources/radar/bgp/leaks/test_events.py b/tests/api_resources/radar/bgp/leaks/test_events.py
index 03b6644d96e..2736d58a6d8 100644
--- a/tests/api_resources/radar/bgp/leaks/test_events.py
+++ b/tests/api_resources/radar/bgp/leaks/test_events.py
@@ -33,12 +33,12 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
             event_id=0,
             format="JSON",
             involved_asn=0,
-            involved_country="involvedCountry",
+            involved_country="PT",
             leak_asn=0,
-            page=0,
-            per_page=0,
+            page=1,
+            per_page=1,
             sort_by="TIME",
-            sort_order="DESC",
+            sort_order="ASC",
         )
         assert_matches_type(SyncV4PagePagination[EventListResponse], event, path=["response"])
 
@@ -64,7 +64,9 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncEvents:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
@@ -80,12 +82,12 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
             event_id=0,
             format="JSON",
             involved_asn=0,
-            involved_country="involvedCountry",
+            involved_country="PT",
             leak_asn=0,
-            page=0,
-            per_page=0,
+            page=1,
+            per_page=1,
             sort_by="TIME",
-            sort_order="DESC",
+            sort_order="ASC",
         )
         assert_matches_type(AsyncV4PagePagination[EventListResponse], event, path=["response"])
 
diff --git a/tests/api_resources/radar/bgp/rpki/__init__.py b/tests/api_resources/radar/bgp/rpki/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/radar/bgp/rpki/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/radar/bgp/rpki/test_aspa.py b/tests/api_resources/radar/bgp/rpki/test_aspa.py
new file mode 100644
index 00000000000..2274b3728ae
--- /dev/null
+++ b/tests/api_resources/radar/bgp/rpki/test_aspa.py
@@ -0,0 +1,247 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar.bgp.rpki import (
+    ASPAChangesResponse,
+    ASPASnapshotResponse,
+    ASPATimeseriesResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestASPA:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_changes(self, client: Cloudflare) -> None:
+        aspa = client.radar.bgp.rpki.aspa.changes()
+        assert_matches_type(ASPAChangesResponse, aspa, path=["response"])
+
+    @parametrize
+    def test_method_changes_with_all_params(self, client: Cloudflare) -> None:
+        aspa = client.radar.bgp.rpki.aspa.changes(
+            asn=13335,
+            date_end=parse_datetime("2023-09-01T11:41:33.782Z"),
+            date_start=parse_datetime("2023-09-01T11:41:33.782Z"),
+            format="JSON",
+            include_asn_info=True,
+        )
+        assert_matches_type(ASPAChangesResponse, aspa, path=["response"])
+
+    @parametrize
+    def test_raw_response_changes(self, client: Cloudflare) -> None:
+        response = client.radar.bgp.rpki.aspa.with_raw_response.changes()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        aspa = response.parse()
+        assert_matches_type(ASPAChangesResponse, aspa, path=["response"])
+
+    @parametrize
+    def test_streaming_response_changes(self, client: Cloudflare) -> None:
+        with client.radar.bgp.rpki.aspa.with_streaming_response.changes() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            aspa = response.parse()
+            assert_matches_type(ASPAChangesResponse, aspa, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_snapshot(self, client: Cloudflare) -> None:
+        aspa = client.radar.bgp.rpki.aspa.snapshot()
+        assert_matches_type(ASPASnapshotResponse, aspa, path=["response"])
+
+    @parametrize
+    def test_method_snapshot_with_all_params(self, client: Cloudflare) -> None:
+        aspa = client.radar.bgp.rpki.aspa.snapshot(
+            customer_asn=13335,
+            date=parse_datetime("2024-09-19T00:00:00Z"),
+            format="JSON",
+            include_asn_info=True,
+            provider_asn=174,
+        )
+        assert_matches_type(ASPASnapshotResponse, aspa, path=["response"])
+
+    @parametrize
+    def test_raw_response_snapshot(self, client: Cloudflare) -> None:
+        response = client.radar.bgp.rpki.aspa.with_raw_response.snapshot()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        aspa = response.parse()
+        assert_matches_type(ASPASnapshotResponse, aspa, path=["response"])
+
+    @parametrize
+    def test_streaming_response_snapshot(self, client: Cloudflare) -> None:
+        with client.radar.bgp.rpki.aspa.with_streaming_response.snapshot() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            aspa = response.parse()
+            assert_matches_type(ASPASnapshotResponse, aspa, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_timeseries(self, client: Cloudflare) -> None:
+        aspa = client.radar.bgp.rpki.aspa.timeseries()
+        assert_matches_type(ASPATimeseriesResponse, aspa, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_with_all_params(self, client: Cloudflare) -> None:
+        aspa = client.radar.bgp.rpki.aspa.timeseries(
+            date_end=parse_datetime("2023-09-01T11:41:33.782Z"),
+            date_start=parse_datetime("2023-09-01T11:41:33.782Z"),
+            format="JSON",
+            location=["string"],
+            name=["main_series"],
+            rir=["RIPE_NCC"],
+        )
+        assert_matches_type(ASPATimeseriesResponse, aspa, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries(self, client: Cloudflare) -> None:
+        response = client.radar.bgp.rpki.aspa.with_raw_response.timeseries()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        aspa = response.parse()
+        assert_matches_type(ASPATimeseriesResponse, aspa, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries(self, client: Cloudflare) -> None:
+        with client.radar.bgp.rpki.aspa.with_streaming_response.timeseries() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            aspa = response.parse()
+            assert_matches_type(ASPATimeseriesResponse, aspa, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncASPA:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_changes(self, async_client: AsyncCloudflare) -> None:
+        aspa = await async_client.radar.bgp.rpki.aspa.changes()
+        assert_matches_type(ASPAChangesResponse, aspa, path=["response"])
+
+    @parametrize
+    async def test_method_changes_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        aspa = await async_client.radar.bgp.rpki.aspa.changes(
+            asn=13335,
+            date_end=parse_datetime("2023-09-01T11:41:33.782Z"),
+            date_start=parse_datetime("2023-09-01T11:41:33.782Z"),
+            format="JSON",
+            include_asn_info=True,
+        )
+        assert_matches_type(ASPAChangesResponse, aspa, path=["response"])
+
+    @parametrize
+    async def test_raw_response_changes(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.bgp.rpki.aspa.with_raw_response.changes()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        aspa = await response.parse()
+        assert_matches_type(ASPAChangesResponse, aspa, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_changes(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.bgp.rpki.aspa.with_streaming_response.changes() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            aspa = await response.parse()
+            assert_matches_type(ASPAChangesResponse, aspa, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_snapshot(self, async_client: AsyncCloudflare) -> None:
+        aspa = await async_client.radar.bgp.rpki.aspa.snapshot()
+        assert_matches_type(ASPASnapshotResponse, aspa, path=["response"])
+
+    @parametrize
+    async def test_method_snapshot_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        aspa = await async_client.radar.bgp.rpki.aspa.snapshot(
+            customer_asn=13335,
+            date=parse_datetime("2024-09-19T00:00:00Z"),
+            format="JSON",
+            include_asn_info=True,
+            provider_asn=174,
+        )
+        assert_matches_type(ASPASnapshotResponse, aspa, path=["response"])
+
+    @parametrize
+    async def test_raw_response_snapshot(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.bgp.rpki.aspa.with_raw_response.snapshot()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        aspa = await response.parse()
+        assert_matches_type(ASPASnapshotResponse, aspa, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_snapshot(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.bgp.rpki.aspa.with_streaming_response.snapshot() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            aspa = await response.parse()
+            assert_matches_type(ASPASnapshotResponse, aspa, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
+        aspa = await async_client.radar.bgp.rpki.aspa.timeseries()
+        assert_matches_type(ASPATimeseriesResponse, aspa, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        aspa = await async_client.radar.bgp.rpki.aspa.timeseries(
+            date_end=parse_datetime("2023-09-01T11:41:33.782Z"),
+            date_start=parse_datetime("2023-09-01T11:41:33.782Z"),
+            format="JSON",
+            location=["string"],
+            name=["main_series"],
+            rir=["RIPE_NCC"],
+        )
+        assert_matches_type(ASPATimeseriesResponse, aspa, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.bgp.rpki.aspa.with_raw_response.timeseries()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        aspa = await response.parse()
+        assert_matches_type(ASPATimeseriesResponse, aspa, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.bgp.rpki.aspa.with_streaming_response.timeseries() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            aspa = await response.parse()
+            assert_matches_type(ASPATimeseriesResponse, aspa, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/bgp/test_ips.py b/tests/api_resources/radar/bgp/test_ips.py
index d8438d9d709..8a852f8528c 100644
--- a/tests/api_resources/radar/bgp/test_ips.py
+++ b/tests/api_resources/radar/bgp/test_ips.py
@@ -26,14 +26,15 @@ def test_method_timeseries(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_timeseries_with_all_params(self, client: Cloudflare) -> None:
         ip = client.radar.bgp.ips.timeseries(
-            asn="174,7922",
-            date_end=parse_datetime("2023-09-01T11:41:33.782Z"),
-            date_range="7d",
-            date_start=parse_datetime("2023-09-01T11:41:33.782Z"),
+            asn=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
             include_delay=True,
-            location="US,CA",
-            name=["string", "string", "string"],
+            ip_version=["IPv4"],
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(IPTimeseriesResponse, ip, path=["response"])
 
@@ -59,7 +60,9 @@ def test_streaming_response_timeseries(self, client: Cloudflare) -> None:
 
 
 class TestAsyncIPs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
@@ -69,14 +72,15 @@ async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_timeseries_with_all_params(self, async_client: AsyncCloudflare) -> None:
         ip = await async_client.radar.bgp.ips.timeseries(
-            asn="174,7922",
-            date_end=parse_datetime("2023-09-01T11:41:33.782Z"),
-            date_range="7d",
-            date_start=parse_datetime("2023-09-01T11:41:33.782Z"),
+            asn=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
             include_delay=True,
-            location="US,CA",
-            name=["string", "string", "string"],
+            ip_version=["IPv4"],
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(IPTimeseriesResponse, ip, path=["response"])
 
diff --git a/tests/api_resources/radar/bgp/test_routes.py b/tests/api_resources/radar/bgp/test_routes.py
index bcb74fee056..517740d5d32 100644
--- a/tests/api_resources/radar/bgp/test_routes.py
+++ b/tests/api_resources/radar/bgp/test_routes.py
@@ -14,6 +14,7 @@
     RouteMoasResponse,
     RouteStatsResponse,
     RoutePfx2asResponse,
+    RouteRealtimeResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -31,10 +32,10 @@ def test_method_ases(self, client: Cloudflare) -> None:
     def test_method_ases_with_all_params(self, client: Cloudflare) -> None:
         route = client.radar.bgp.routes.ases(
             format="JSON",
-            limit=5,
+            limit=1,
             location="US",
             sort_by="ipv4",
-            sort_order="desc",
+            sort_order="ASC",
         )
         assert_matches_type(RouteAsesResponse, route, path=["response"])
 
@@ -129,6 +130,39 @@ def test_streaming_response_pfx2as(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @parametrize
+    def test_method_realtime(self, client: Cloudflare) -> None:
+        route = client.radar.bgp.routes.realtime()
+        assert_matches_type(RouteRealtimeResponse, route, path=["response"])
+
+    @parametrize
+    def test_method_realtime_with_all_params(self, client: Cloudflare) -> None:
+        route = client.radar.bgp.routes.realtime(
+            format="JSON",
+            prefix="1.1.1.0/24",
+        )
+        assert_matches_type(RouteRealtimeResponse, route, path=["response"])
+
+    @parametrize
+    def test_raw_response_realtime(self, client: Cloudflare) -> None:
+        response = client.radar.bgp.routes.with_raw_response.realtime()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        route = response.parse()
+        assert_matches_type(RouteRealtimeResponse, route, path=["response"])
+
+    @parametrize
+    def test_streaming_response_realtime(self, client: Cloudflare) -> None:
+        with client.radar.bgp.routes.with_streaming_response.realtime() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            route = response.parse()
+            assert_matches_type(RouteRealtimeResponse, route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
     @parametrize
     def test_method_stats(self, client: Cloudflare) -> None:
         route = client.radar.bgp.routes.stats()
@@ -165,7 +199,9 @@ def test_streaming_response_stats(self, client: Cloudflare) -> None:
 
 
 class TestAsyncRoutes:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_ases(self, async_client: AsyncCloudflare) -> None:
@@ -176,10 +212,10 @@ async def test_method_ases(self, async_client: AsyncCloudflare) -> None:
     async def test_method_ases_with_all_params(self, async_client: AsyncCloudflare) -> None:
         route = await async_client.radar.bgp.routes.ases(
             format="JSON",
-            limit=5,
+            limit=1,
             location="US",
             sort_by="ipv4",
-            sort_order="desc",
+            sort_order="ASC",
         )
         assert_matches_type(RouteAsesResponse, route, path=["response"])
 
@@ -274,6 +310,39 @@ async def test_streaming_response_pfx2as(self, async_client: AsyncCloudflare) ->
 
         assert cast(Any, response.is_closed) is True
 
+    @parametrize
+    async def test_method_realtime(self, async_client: AsyncCloudflare) -> None:
+        route = await async_client.radar.bgp.routes.realtime()
+        assert_matches_type(RouteRealtimeResponse, route, path=["response"])
+
+    @parametrize
+    async def test_method_realtime_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        route = await async_client.radar.bgp.routes.realtime(
+            format="JSON",
+            prefix="1.1.1.0/24",
+        )
+        assert_matches_type(RouteRealtimeResponse, route, path=["response"])
+
+    @parametrize
+    async def test_raw_response_realtime(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.bgp.routes.with_raw_response.realtime()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        route = await response.parse()
+        assert_matches_type(RouteRealtimeResponse, route, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_realtime(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.bgp.routes.with_streaming_response.realtime() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            route = await response.parse()
+            assert_matches_type(RouteRealtimeResponse, route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
     @parametrize
     async def test_method_stats(self, async_client: AsyncCloudflare) -> None:
         route = await async_client.radar.bgp.routes.stats()
diff --git a/tests/api_resources/radar/bgp/test_top.py b/tests/api_resources/radar/bgp/test_top.py
index efd3d739ed2..c5920033e3f 100644
--- a/tests/api_resources/radar/bgp/test_top.py
+++ b/tests/api_resources/radar/bgp/test_top.py
@@ -26,22 +26,14 @@ def test_method_prefixes(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_prefixes_with_all_params(self, client: Cloudflare) -> None:
         top = client.radar.bgp.top.prefixes(
-            asn=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            name=["string", "string", "string"],
-            update_type=["ANNOUNCEMENT", "WITHDRAWAL"],
+            limit=1,
+            name=["main_series"],
+            update_type=["ANNOUNCEMENT"],
         )
         assert_matches_type(TopPrefixesResponse, top, path=["response"])
 
@@ -67,7 +59,9 @@ def test_streaming_response_prefixes(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTop:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_prefixes(self, async_client: AsyncCloudflare) -> None:
@@ -77,22 +71,14 @@ async def test_method_prefixes(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_prefixes_with_all_params(self, async_client: AsyncCloudflare) -> None:
         top = await async_client.radar.bgp.top.prefixes(
-            asn=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            name=["string", "string", "string"],
-            update_type=["ANNOUNCEMENT", "WITHDRAWAL"],
+            limit=1,
+            name=["main_series"],
+            update_type=["ANNOUNCEMENT"],
         )
         assert_matches_type(TopPrefixesResponse, top, path=["response"])
 
diff --git a/tests/api_resources/radar/bgp/top/test_ases.py b/tests/api_resources/radar/bgp/top/test_ases.py
index da303ce9b72..453bc1af21f 100644
--- a/tests/api_resources/radar/bgp/top/test_ases.py
+++ b/tests/api_resources/radar/bgp/top/test_ases.py
@@ -26,42 +26,15 @@ def test_method_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         ase = client.radar.bgp.top.ases.get(
-            asn=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            name=["string", "string", "string"],
-            prefix=[
-                {
-                    "in": "query",
-                    "name": "prefix",
-                    "test": 12,
-                    "type": "1.1.1.0/24",
-                },
-                {
-                    "in": "query",
-                    "name": "prefix",
-                    "test": 12,
-                    "type": "1.1.1.0/24",
-                },
-                {
-                    "in": "query",
-                    "name": "prefix",
-                    "test": 12,
-                    "type": "1.1.1.0/24",
-                },
-            ],
-            update_type=["ANNOUNCEMENT", "WITHDRAWAL"],
+            limit=1,
+            name=["main_series"],
+            prefix=["string"],
+            update_type=["ANNOUNCEMENT"],
         )
         assert_matches_type(AseGetResponse, ase, path=["response"])
 
@@ -121,7 +94,9 @@ def test_streaming_response_prefixes(self, client: Cloudflare) -> None:
 
 
 class TestAsyncAses:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -131,42 +106,15 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         ase = await async_client.radar.bgp.top.ases.get(
-            asn=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            name=["string", "string", "string"],
-            prefix=[
-                {
-                    "in": "query",
-                    "name": "prefix",
-                    "test": 12,
-                    "type": "1.1.1.0/24",
-                },
-                {
-                    "in": "query",
-                    "name": "prefix",
-                    "test": 12,
-                    "type": "1.1.1.0/24",
-                },
-                {
-                    "in": "query",
-                    "name": "prefix",
-                    "test": 12,
-                    "type": "1.1.1.0/24",
-                },
-            ],
-            update_type=["ANNOUNCEMENT", "WITHDRAWAL"],
+            limit=1,
+            name=["main_series"],
+            prefix=["string"],
+            update_type=["ANNOUNCEMENT"],
         )
         assert_matches_type(AseGetResponse, ase, path=["response"])
 
diff --git a/tests/api_resources/radar/bots/__init__.py b/tests/api_resources/radar/bots/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/radar/bots/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/radar/bots/test_web_crawlers.py b/tests/api_resources/radar/bots/test_web_crawlers.py
new file mode 100644
index 00000000000..5e50fe5dc88
--- /dev/null
+++ b/tests/api_resources/radar/bots/test_web_crawlers.py
@@ -0,0 +1,222 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar.bots import (
+    WebCrawlerSummaryResponse,
+    WebCrawlerTimeseriesGroupsResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestWebCrawlers:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_summary(self, client: Cloudflare) -> None:
+        web_crawler = client.radar.bots.web_crawlers.summary(
+            dimension="CLIENT_TYPE",
+        )
+        assert_matches_type(WebCrawlerSummaryResponse, web_crawler, path=["response"])
+
+    @parametrize
+    def test_method_summary_with_all_params(self, client: Cloudflare) -> None:
+        web_crawler = client.radar.bots.web_crawlers.summary(
+            dimension="CLIENT_TYPE",
+            bot_operator=["string"],
+            client_type=["HUMAN"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            industry=["string"],
+            limit_per_group=10,
+            name=["main_series"],
+            vertical=["string"],
+        )
+        assert_matches_type(WebCrawlerSummaryResponse, web_crawler, path=["response"])
+
+    @parametrize
+    def test_raw_response_summary(self, client: Cloudflare) -> None:
+        response = client.radar.bots.web_crawlers.with_raw_response.summary(
+            dimension="CLIENT_TYPE",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        web_crawler = response.parse()
+        assert_matches_type(WebCrawlerSummaryResponse, web_crawler, path=["response"])
+
+    @parametrize
+    def test_streaming_response_summary(self, client: Cloudflare) -> None:
+        with client.radar.bots.web_crawlers.with_streaming_response.summary(
+            dimension="CLIENT_TYPE",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            web_crawler = response.parse()
+            assert_matches_type(WebCrawlerSummaryResponse, web_crawler, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_timeseries_groups(self, client: Cloudflare) -> None:
+        web_crawler = client.radar.bots.web_crawlers.timeseries_groups(
+            dimension="CLIENT_TYPE",
+        )
+        assert_matches_type(WebCrawlerTimeseriesGroupsResponse, web_crawler, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_groups_with_all_params(self, client: Cloudflare) -> None:
+        web_crawler = client.radar.bots.web_crawlers.timeseries_groups(
+            dimension="CLIENT_TYPE",
+            agg_interval="1h",
+            bot_operator=["string"],
+            client_type=["HUMAN"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            industry=["string"],
+            limit_per_group=10,
+            name=["main_series"],
+            vertical=["string"],
+        )
+        assert_matches_type(WebCrawlerTimeseriesGroupsResponse, web_crawler, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries_groups(self, client: Cloudflare) -> None:
+        response = client.radar.bots.web_crawlers.with_raw_response.timeseries_groups(
+            dimension="CLIENT_TYPE",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        web_crawler = response.parse()
+        assert_matches_type(WebCrawlerTimeseriesGroupsResponse, web_crawler, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries_groups(self, client: Cloudflare) -> None:
+        with client.radar.bots.web_crawlers.with_streaming_response.timeseries_groups(
+            dimension="CLIENT_TYPE",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            web_crawler = response.parse()
+            assert_matches_type(WebCrawlerTimeseriesGroupsResponse, web_crawler, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncWebCrawlers:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_summary(self, async_client: AsyncCloudflare) -> None:
+        web_crawler = await async_client.radar.bots.web_crawlers.summary(
+            dimension="CLIENT_TYPE",
+        )
+        assert_matches_type(WebCrawlerSummaryResponse, web_crawler, path=["response"])
+
+    @parametrize
+    async def test_method_summary_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        web_crawler = await async_client.radar.bots.web_crawlers.summary(
+            dimension="CLIENT_TYPE",
+            bot_operator=["string"],
+            client_type=["HUMAN"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            industry=["string"],
+            limit_per_group=10,
+            name=["main_series"],
+            vertical=["string"],
+        )
+        assert_matches_type(WebCrawlerSummaryResponse, web_crawler, path=["response"])
+
+    @parametrize
+    async def test_raw_response_summary(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.bots.web_crawlers.with_raw_response.summary(
+            dimension="CLIENT_TYPE",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        web_crawler = await response.parse()
+        assert_matches_type(WebCrawlerSummaryResponse, web_crawler, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_summary(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.bots.web_crawlers.with_streaming_response.summary(
+            dimension="CLIENT_TYPE",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            web_crawler = await response.parse()
+            assert_matches_type(WebCrawlerSummaryResponse, web_crawler, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        web_crawler = await async_client.radar.bots.web_crawlers.timeseries_groups(
+            dimension="CLIENT_TYPE",
+        )
+        assert_matches_type(WebCrawlerTimeseriesGroupsResponse, web_crawler, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_groups_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        web_crawler = await async_client.radar.bots.web_crawlers.timeseries_groups(
+            dimension="CLIENT_TYPE",
+            agg_interval="1h",
+            bot_operator=["string"],
+            client_type=["HUMAN"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            industry=["string"],
+            limit_per_group=10,
+            name=["main_series"],
+            vertical=["string"],
+        )
+        assert_matches_type(WebCrawlerTimeseriesGroupsResponse, web_crawler, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.bots.web_crawlers.with_raw_response.timeseries_groups(
+            dimension="CLIENT_TYPE",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        web_crawler = await response.parse()
+        assert_matches_type(WebCrawlerTimeseriesGroupsResponse, web_crawler, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.bots.web_crawlers.with_streaming_response.timeseries_groups(
+            dimension="CLIENT_TYPE",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            web_crawler = await response.parse()
+            assert_matches_type(WebCrawlerTimeseriesGroupsResponse, web_crawler, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/ct/__init__.py b/tests/api_resources/radar/ct/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/radar/ct/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/radar/ct/test_authorities.py b/tests/api_resources/radar/ct/test_authorities.py
new file mode 100644
index 00000000000..ab82b3cc147
--- /dev/null
+++ b/tests/api_resources/radar/ct/test_authorities.py
@@ -0,0 +1,187 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.radar.ct import (
+    AuthorityGetResponse,
+    AuthorityListResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestAuthorities:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        authority = client.radar.ct.authorities.list()
+        assert_matches_type(AuthorityListResponse, authority, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        authority = client.radar.ct.authorities.list(
+            format="JSON",
+            limit=1,
+            offset=0,
+        )
+        assert_matches_type(AuthorityListResponse, authority, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.radar.ct.authorities.with_raw_response.list()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        authority = response.parse()
+        assert_matches_type(AuthorityListResponse, authority, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.radar.ct.authorities.with_streaming_response.list() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            authority = response.parse()
+            assert_matches_type(AuthorityListResponse, authority, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        authority = client.radar.ct.authorities.get(
+            ca_slug="24EDD4E503A8D3FDB5FFB4AF66C887359901CBE687A5A0760D10A08EED99A7C3",
+        )
+        assert_matches_type(AuthorityGetResponse, authority, path=["response"])
+
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        authority = client.radar.ct.authorities.get(
+            ca_slug="24EDD4E503A8D3FDB5FFB4AF66C887359901CBE687A5A0760D10A08EED99A7C3",
+            format="JSON",
+        )
+        assert_matches_type(AuthorityGetResponse, authority, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.radar.ct.authorities.with_raw_response.get(
+            ca_slug="24EDD4E503A8D3FDB5FFB4AF66C887359901CBE687A5A0760D10A08EED99A7C3",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        authority = response.parse()
+        assert_matches_type(AuthorityGetResponse, authority, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.radar.ct.authorities.with_streaming_response.get(
+            ca_slug="24EDD4E503A8D3FDB5FFB4AF66C887359901CBE687A5A0760D10A08EED99A7C3",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            authority = response.parse()
+            assert_matches_type(AuthorityGetResponse, authority, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ca_slug` but received ''"):
+            client.radar.ct.authorities.with_raw_response.get(
+                ca_slug="",
+            )
+
+
+class TestAsyncAuthorities:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        authority = await async_client.radar.ct.authorities.list()
+        assert_matches_type(AuthorityListResponse, authority, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        authority = await async_client.radar.ct.authorities.list(
+            format="JSON",
+            limit=1,
+            offset=0,
+        )
+        assert_matches_type(AuthorityListResponse, authority, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.ct.authorities.with_raw_response.list()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        authority = await response.parse()
+        assert_matches_type(AuthorityListResponse, authority, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.ct.authorities.with_streaming_response.list() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            authority = await response.parse()
+            assert_matches_type(AuthorityListResponse, authority, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        authority = await async_client.radar.ct.authorities.get(
+            ca_slug="24EDD4E503A8D3FDB5FFB4AF66C887359901CBE687A5A0760D10A08EED99A7C3",
+        )
+        assert_matches_type(AuthorityGetResponse, authority, path=["response"])
+
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        authority = await async_client.radar.ct.authorities.get(
+            ca_slug="24EDD4E503A8D3FDB5FFB4AF66C887359901CBE687A5A0760D10A08EED99A7C3",
+            format="JSON",
+        )
+        assert_matches_type(AuthorityGetResponse, authority, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.ct.authorities.with_raw_response.get(
+            ca_slug="24EDD4E503A8D3FDB5FFB4AF66C887359901CBE687A5A0760D10A08EED99A7C3",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        authority = await response.parse()
+        assert_matches_type(AuthorityGetResponse, authority, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.ct.authorities.with_streaming_response.get(
+            ca_slug="24EDD4E503A8D3FDB5FFB4AF66C887359901CBE687A5A0760D10A08EED99A7C3",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            authority = await response.parse()
+            assert_matches_type(AuthorityGetResponse, authority, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ca_slug` but received ''"):
+            await async_client.radar.ct.authorities.with_raw_response.get(
+                ca_slug="",
+            )
diff --git a/tests/api_resources/radar/ct/test_logs.py b/tests/api_resources/radar/ct/test_logs.py
new file mode 100644
index 00000000000..246883bd341
--- /dev/null
+++ b/tests/api_resources/radar/ct/test_logs.py
@@ -0,0 +1,184 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.radar.ct import LogGetResponse, LogListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestLogs:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        log = client.radar.ct.logs.list()
+        assert_matches_type(LogListResponse, log, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        log = client.radar.ct.logs.list(
+            format="JSON",
+            limit=1,
+            offset=0,
+        )
+        assert_matches_type(LogListResponse, log, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.radar.ct.logs.with_raw_response.list()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        log = response.parse()
+        assert_matches_type(LogListResponse, log, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.radar.ct.logs.with_streaming_response.list() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            log = response.parse()
+            assert_matches_type(LogListResponse, log, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        log = client.radar.ct.logs.get(
+            log_slug="argon2024",
+        )
+        assert_matches_type(LogGetResponse, log, path=["response"])
+
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        log = client.radar.ct.logs.get(
+            log_slug="argon2024",
+            format="JSON",
+        )
+        assert_matches_type(LogGetResponse, log, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.radar.ct.logs.with_raw_response.get(
+            log_slug="argon2024",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        log = response.parse()
+        assert_matches_type(LogGetResponse, log, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.radar.ct.logs.with_streaming_response.get(
+            log_slug="argon2024",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            log = response.parse()
+            assert_matches_type(LogGetResponse, log, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `log_slug` but received ''"):
+            client.radar.ct.logs.with_raw_response.get(
+                log_slug="",
+            )
+
+
+class TestAsyncLogs:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        log = await async_client.radar.ct.logs.list()
+        assert_matches_type(LogListResponse, log, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        log = await async_client.radar.ct.logs.list(
+            format="JSON",
+            limit=1,
+            offset=0,
+        )
+        assert_matches_type(LogListResponse, log, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.ct.logs.with_raw_response.list()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        log = await response.parse()
+        assert_matches_type(LogListResponse, log, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.ct.logs.with_streaming_response.list() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            log = await response.parse()
+            assert_matches_type(LogListResponse, log, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        log = await async_client.radar.ct.logs.get(
+            log_slug="argon2024",
+        )
+        assert_matches_type(LogGetResponse, log, path=["response"])
+
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        log = await async_client.radar.ct.logs.get(
+            log_slug="argon2024",
+            format="JSON",
+        )
+        assert_matches_type(LogGetResponse, log, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.ct.logs.with_raw_response.get(
+            log_slug="argon2024",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        log = await response.parse()
+        assert_matches_type(LogGetResponse, log, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.ct.logs.with_streaming_response.get(
+            log_slug="argon2024",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            log = await response.parse()
+            assert_matches_type(LogGetResponse, log, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `log_slug` but received ''"):
+            await async_client.radar.ct.logs.with_raw_response.get(
+                log_slug="",
+            )
diff --git a/tests/api_resources/radar/dns/test_summary.py b/tests/api_resources/radar/dns/test_summary.py
new file mode 100644
index 00000000000..7a354cd903d
--- /dev/null
+++ b/tests/api_resources/radar/dns/test_summary.py
@@ -0,0 +1,1036 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar.dns import (
+    SummaryDNSSECResponse,
+    SummaryCacheHitResponse,
+    SummaryProtocolResponse,
+    SummaryDNSSECE2EResponse,
+    SummaryIPVersionResponse,
+    SummaryQueryTypeResponse,
+    SummaryDNSSECAwareResponse,
+    SummaryResponseTTLResponse,
+    SummaryResponseCodeResponse,
+    SummaryMatchingAnswerResponse,
+)
+
+# pyright: reportDeprecated=false
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSummary:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_cache_hit(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.cache_hit()
+
+        assert_matches_type(SummaryCacheHitResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_cache_hit_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.cache_hit(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryCacheHitResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_cache_hit(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.summary.with_raw_response.cache_hit()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryCacheHitResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_cache_hit(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.summary.with_streaming_response.cache_hit() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryCacheHitResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_dnssec(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.dnssec()
+
+        assert_matches_type(SummaryDNSSECResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_dnssec_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.dnssec(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryDNSSECResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_dnssec(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.summary.with_raw_response.dnssec()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryDNSSECResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_dnssec(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.summary.with_streaming_response.dnssec() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryDNSSECResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_dnssec_aware(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.dnssec_aware()
+
+        assert_matches_type(SummaryDNSSECAwareResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_dnssec_aware_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.dnssec_aware(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryDNSSECAwareResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_dnssec_aware(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.summary.with_raw_response.dnssec_aware()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryDNSSECAwareResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_dnssec_aware(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.summary.with_streaming_response.dnssec_aware() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryDNSSECAwareResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_dnssec_e2e(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.dnssec_e2e()
+
+        assert_matches_type(SummaryDNSSECE2EResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_dnssec_e2e_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.dnssec_e2e(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryDNSSECE2EResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_dnssec_e2e(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.summary.with_raw_response.dnssec_e2e()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryDNSSECE2EResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_dnssec_e2e(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.summary.with_streaming_response.dnssec_e2e() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryDNSSECE2EResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_ip_version(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.ip_version()
+
+        assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_ip_version_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.ip_version(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_ip_version(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.summary.with_raw_response.ip_version()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_ip_version(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.summary.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_matching_answer(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.matching_answer()
+
+        assert_matches_type(SummaryMatchingAnswerResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_matching_answer_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.matching_answer(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryMatchingAnswerResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_matching_answer(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.summary.with_raw_response.matching_answer()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryMatchingAnswerResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_matching_answer(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.summary.with_streaming_response.matching_answer() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryMatchingAnswerResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_protocol(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.protocol()
+
+        assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_protocol_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.protocol(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_protocol(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.summary.with_raw_response.protocol()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_protocol(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.summary.with_streaming_response.protocol() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_query_type(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.query_type()
+
+        assert_matches_type(SummaryQueryTypeResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_query_type_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.query_type(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryQueryTypeResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_query_type(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.summary.with_raw_response.query_type()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryQueryTypeResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_query_type(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.summary.with_streaming_response.query_type() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryQueryTypeResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_response_code(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.response_code()
+
+        assert_matches_type(SummaryResponseCodeResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_response_code_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.response_code(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryResponseCodeResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_response_code(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.summary.with_raw_response.response_code()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryResponseCodeResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_response_code(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.summary.with_streaming_response.response_code() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryResponseCodeResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_response_ttl(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.response_ttl()
+
+        assert_matches_type(SummaryResponseTTLResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_response_ttl_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.dns.summary.response_ttl(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryResponseTTLResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_response_ttl(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.summary.with_raw_response.response_ttl()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryResponseTTLResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_response_ttl(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.summary.with_streaming_response.response_ttl() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryResponseTTLResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncSummary:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_cache_hit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.cache_hit()
+
+        assert_matches_type(SummaryCacheHitResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_cache_hit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.cache_hit(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryCacheHitResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_cache_hit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.summary.with_raw_response.cache_hit()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryCacheHitResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_cache_hit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.summary.with_streaming_response.cache_hit() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryCacheHitResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_dnssec(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.dnssec()
+
+        assert_matches_type(SummaryDNSSECResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_dnssec_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.dnssec(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryDNSSECResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_dnssec(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.summary.with_raw_response.dnssec()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryDNSSECResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_dnssec(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.summary.with_streaming_response.dnssec() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryDNSSECResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_dnssec_aware(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.dnssec_aware()
+
+        assert_matches_type(SummaryDNSSECAwareResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_dnssec_aware_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.dnssec_aware(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryDNSSECAwareResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_dnssec_aware(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.summary.with_raw_response.dnssec_aware()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryDNSSECAwareResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_dnssec_aware(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.summary.with_streaming_response.dnssec_aware() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryDNSSECAwareResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_dnssec_e2e(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.dnssec_e2e()
+
+        assert_matches_type(SummaryDNSSECE2EResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_dnssec_e2e_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.dnssec_e2e(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryDNSSECE2EResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_dnssec_e2e(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.summary.with_raw_response.dnssec_e2e()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryDNSSECE2EResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_dnssec_e2e(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.summary.with_streaming_response.dnssec_e2e() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryDNSSECE2EResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_ip_version(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.ip_version()
+
+        assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_ip_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.ip_version(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.summary.with_raw_response.ip_version()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_ip_version(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.summary.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_matching_answer(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.matching_answer()
+
+        assert_matches_type(SummaryMatchingAnswerResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_matching_answer_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.matching_answer(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryMatchingAnswerResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_matching_answer(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.summary.with_raw_response.matching_answer()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryMatchingAnswerResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_matching_answer(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.summary.with_streaming_response.matching_answer() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryMatchingAnswerResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_protocol(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.protocol()
+
+        assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_protocol_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.protocol(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_protocol(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.summary.with_raw_response.protocol()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_protocol(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.summary.with_streaming_response.protocol() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryProtocolResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_query_type(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.query_type()
+
+        assert_matches_type(SummaryQueryTypeResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_query_type_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.query_type(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryQueryTypeResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_query_type(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.summary.with_raw_response.query_type()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryQueryTypeResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_query_type(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.summary.with_streaming_response.query_type() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryQueryTypeResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_response_code(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.response_code()
+
+        assert_matches_type(SummaryResponseCodeResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_response_code_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.response_code(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryResponseCodeResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_response_code(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.summary.with_raw_response.response_code()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryResponseCodeResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_response_code(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.summary.with_streaming_response.response_code() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryResponseCodeResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_response_ttl(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.response_ttl()
+
+        assert_matches_type(SummaryResponseTTLResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_response_ttl_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.dns.summary.response_ttl(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(SummaryResponseTTLResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_response_ttl(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.summary.with_raw_response.response_ttl()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryResponseTTLResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_response_ttl(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.summary.with_streaming_response.response_ttl() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryResponseTTLResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/dns/test_timeseries_groups.py b/tests/api_resources/radar/dns/test_timeseries_groups.py
new file mode 100644
index 00000000000..48e032bd75a
--- /dev/null
+++ b/tests/api_resources/radar/dns/test_timeseries_groups.py
@@ -0,0 +1,1056 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar.dns import (
+    TimeseriesGroupDNSSECResponse,
+    TimeseriesGroupCacheHitResponse,
+    TimeseriesGroupProtocolResponse,
+    TimeseriesGroupDNSSECE2EResponse,
+    TimeseriesGroupIPVersionResponse,
+    TimeseriesGroupQueryTypeResponse,
+    TimeseriesGroupDNSSECAwareResponse,
+    TimeseriesGroupResponseTTLResponse,
+    TimeseriesGroupResponseCodeResponse,
+    TimeseriesGroupMatchingAnswerResponse,
+)
+
+# pyright: reportDeprecated=false
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestTimeseriesGroups:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_cache_hit(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.cache_hit()
+
+        assert_matches_type(TimeseriesGroupCacheHitResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_method_cache_hit_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.cache_hit(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupCacheHitResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_cache_hit(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.timeseries_groups.with_raw_response.cache_hit()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = response.parse()
+        assert_matches_type(TimeseriesGroupCacheHitResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_cache_hit(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.timeseries_groups.with_streaming_response.cache_hit() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupCacheHitResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_dnssec(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.dnssec()
+
+        assert_matches_type(TimeseriesGroupDNSSECResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_method_dnssec_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.dnssec(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupDNSSECResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_dnssec(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.timeseries_groups.with_raw_response.dnssec()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = response.parse()
+        assert_matches_type(TimeseriesGroupDNSSECResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_dnssec(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.timeseries_groups.with_streaming_response.dnssec() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupDNSSECResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_dnssec_aware(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.dnssec_aware()
+
+        assert_matches_type(TimeseriesGroupDNSSECAwareResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_method_dnssec_aware_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.dnssec_aware(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupDNSSECAwareResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_dnssec_aware(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.timeseries_groups.with_raw_response.dnssec_aware()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = response.parse()
+        assert_matches_type(TimeseriesGroupDNSSECAwareResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_dnssec_aware(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.timeseries_groups.with_streaming_response.dnssec_aware() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupDNSSECAwareResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_dnssec_e2e(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.dnssec_e2e()
+
+        assert_matches_type(TimeseriesGroupDNSSECE2EResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_method_dnssec_e2e_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.dnssec_e2e(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupDNSSECE2EResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_dnssec_e2e(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.timeseries_groups.with_raw_response.dnssec_e2e()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = response.parse()
+        assert_matches_type(TimeseriesGroupDNSSECE2EResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_dnssec_e2e(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.timeseries_groups.with_streaming_response.dnssec_e2e() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupDNSSECE2EResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_ip_version(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.ip_version()
+
+        assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_method_ip_version_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.ip_version(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_ip_version(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.timeseries_groups.with_raw_response.ip_version()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = response.parse()
+        assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_ip_version(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.timeseries_groups.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_matching_answer(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.matching_answer()
+
+        assert_matches_type(TimeseriesGroupMatchingAnswerResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_method_matching_answer_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.matching_answer(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupMatchingAnswerResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_matching_answer(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.timeseries_groups.with_raw_response.matching_answer()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = response.parse()
+        assert_matches_type(TimeseriesGroupMatchingAnswerResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_matching_answer(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.timeseries_groups.with_streaming_response.matching_answer() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupMatchingAnswerResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_protocol(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.protocol()
+
+        assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_method_protocol_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.protocol(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_protocol(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.timeseries_groups.with_raw_response.protocol()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = response.parse()
+        assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_protocol(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.timeseries_groups.with_streaming_response.protocol() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_query_type(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.query_type()
+
+        assert_matches_type(TimeseriesGroupQueryTypeResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_method_query_type_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.query_type(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupQueryTypeResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_query_type(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.timeseries_groups.with_raw_response.query_type()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = response.parse()
+        assert_matches_type(TimeseriesGroupQueryTypeResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_query_type(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.timeseries_groups.with_streaming_response.query_type() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupQueryTypeResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_response_code(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.response_code()
+
+        assert_matches_type(TimeseriesGroupResponseCodeResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_method_response_code_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.response_code(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupResponseCodeResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_response_code(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.timeseries_groups.with_raw_response.response_code()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = response.parse()
+        assert_matches_type(TimeseriesGroupResponseCodeResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_response_code(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.timeseries_groups.with_streaming_response.response_code() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupResponseCodeResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_response_ttl(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.response_ttl()
+
+        assert_matches_type(TimeseriesGroupResponseTTLResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_method_response_ttl_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.dns.timeseries_groups.response_ttl(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupResponseTTLResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_response_ttl(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.dns.timeseries_groups.with_raw_response.response_ttl()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = response.parse()
+        assert_matches_type(TimeseriesGroupResponseTTLResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_response_ttl(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.dns.timeseries_groups.with_streaming_response.response_ttl() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupResponseTTLResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncTimeseriesGroups:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_cache_hit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.cache_hit()
+
+        assert_matches_type(TimeseriesGroupCacheHitResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_method_cache_hit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.cache_hit(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupCacheHitResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_cache_hit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.timeseries_groups.with_raw_response.cache_hit()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = await response.parse()
+        assert_matches_type(TimeseriesGroupCacheHitResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_cache_hit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.timeseries_groups.with_streaming_response.cache_hit() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupCacheHitResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_dnssec(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.dnssec()
+
+        assert_matches_type(TimeseriesGroupDNSSECResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_method_dnssec_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.dnssec(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupDNSSECResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_dnssec(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.timeseries_groups.with_raw_response.dnssec()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = await response.parse()
+        assert_matches_type(TimeseriesGroupDNSSECResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_dnssec(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.timeseries_groups.with_streaming_response.dnssec() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupDNSSECResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_dnssec_aware(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.dnssec_aware()
+
+        assert_matches_type(TimeseriesGroupDNSSECAwareResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_method_dnssec_aware_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.dnssec_aware(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupDNSSECAwareResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_dnssec_aware(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.timeseries_groups.with_raw_response.dnssec_aware()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = await response.parse()
+        assert_matches_type(TimeseriesGroupDNSSECAwareResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_dnssec_aware(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.timeseries_groups.with_streaming_response.dnssec_aware() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupDNSSECAwareResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_dnssec_e2e(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.dnssec_e2e()
+
+        assert_matches_type(TimeseriesGroupDNSSECE2EResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_method_dnssec_e2e_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.dnssec_e2e(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupDNSSECE2EResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_dnssec_e2e(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.timeseries_groups.with_raw_response.dnssec_e2e()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = await response.parse()
+        assert_matches_type(TimeseriesGroupDNSSECE2EResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_dnssec_e2e(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.timeseries_groups.with_streaming_response.dnssec_e2e() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupDNSSECE2EResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_ip_version(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.ip_version()
+
+        assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_method_ip_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.ip_version(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.timeseries_groups.with_raw_response.ip_version()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = await response.parse()
+        assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_ip_version(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.timeseries_groups.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_matching_answer(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.matching_answer()
+
+        assert_matches_type(TimeseriesGroupMatchingAnswerResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_method_matching_answer_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.matching_answer(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupMatchingAnswerResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_matching_answer(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.timeseries_groups.with_raw_response.matching_answer()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = await response.parse()
+        assert_matches_type(TimeseriesGroupMatchingAnswerResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_matching_answer(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.timeseries_groups.with_streaming_response.matching_answer() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupMatchingAnswerResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_protocol(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.protocol()
+
+        assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_method_protocol_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.protocol(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_protocol(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.timeseries_groups.with_raw_response.protocol()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = await response.parse()
+        assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_protocol(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.timeseries_groups.with_streaming_response.protocol() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupProtocolResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_query_type(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.query_type()
+
+        assert_matches_type(TimeseriesGroupQueryTypeResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_method_query_type_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.query_type(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupQueryTypeResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_query_type(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.timeseries_groups.with_raw_response.query_type()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = await response.parse()
+        assert_matches_type(TimeseriesGroupQueryTypeResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_query_type(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.timeseries_groups.with_streaming_response.query_type() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupQueryTypeResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_response_code(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.response_code()
+
+        assert_matches_type(TimeseriesGroupResponseCodeResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_method_response_code_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.response_code(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupResponseCodeResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_response_code(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.timeseries_groups.with_raw_response.response_code()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = await response.parse()
+        assert_matches_type(TimeseriesGroupResponseCodeResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_response_code(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.timeseries_groups.with_streaming_response.response_code() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupResponseCodeResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_response_ttl(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.response_ttl()
+
+        assert_matches_type(TimeseriesGroupResponseTTLResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_method_response_ttl_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.dns.timeseries_groups.response_ttl(
+                agg_interval="1h",
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                location=["string"],
+                name=["main_series"],
+                nodata=[True],
+                protocol=["UDP"],
+                query_type=["A"],
+                response_code=["NOERROR"],
+                tld=["com"],
+            )
+
+        assert_matches_type(TimeseriesGroupResponseTTLResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_response_ttl(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.dns.timeseries_groups.with_raw_response.response_ttl()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = await response.parse()
+        assert_matches_type(TimeseriesGroupResponseTTLResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_response_ttl(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.dns.timeseries_groups.with_streaming_response.response_ttl() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupResponseTTLResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/dns/test_top.py b/tests/api_resources/radar/dns/test_top.py
index b202d6868f9..e78de8a3c24 100644
--- a/tests/api_resources/radar/dns/test_top.py
+++ b/tests/api_resources/radar/dns/test_top.py
@@ -20,40 +20,39 @@ class TestTop:
 
     @parametrize
     def test_method_ases(self, client: Cloudflare) -> None:
-        top = client.radar.dns.top.ases(
-            domain=["string", "string", "string"],
-        )
+        top = client.radar.dns.top.ases()
         assert_matches_type(TopAsesResponse, top, path=["response"])
 
     @parametrize
     def test_method_ases_with_all_params(self, client: Cloudflare) -> None:
         top = client.radar.dns.top.ases(
-            domain=["string", "string", "string"],
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            cache_hit=[True],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dnssec=["INVALID"],
+            dnssec_aware=["SUPPORTED"],
+            dnssec_e2e=[True],
+            domain=["google.com"],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            matching_answer=[True],
+            name=["main_series"],
+            nodata=[True],
+            protocol=["UDP"],
+            query_type=["A"],
+            response_code=["NOERROR"],
+            response_ttl=["LTE_1M"],
         )
         assert_matches_type(TopAsesResponse, top, path=["response"])
 
     @parametrize
     def test_raw_response_ases(self, client: Cloudflare) -> None:
-        response = client.radar.dns.top.with_raw_response.ases(
-            domain=["string", "string", "string"],
-        )
+        response = client.radar.dns.top.with_raw_response.ases()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -62,9 +61,7 @@ def test_raw_response_ases(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_ases(self, client: Cloudflare) -> None:
-        with client.radar.dns.top.with_streaming_response.ases(
-            domain=["string", "string", "string"],
-        ) as response:
+        with client.radar.dns.top.with_streaming_response.ases() as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
@@ -75,40 +72,40 @@ def test_streaming_response_ases(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_locations(self, client: Cloudflare) -> None:
-        top = client.radar.dns.top.locations(
-            domain=["string", "string", "string"],
-        )
+        top = client.radar.dns.top.locations()
         assert_matches_type(TopLocationsResponse, top, path=["response"])
 
     @parametrize
     def test_method_locations_with_all_params(self, client: Cloudflare) -> None:
         top = client.radar.dns.top.locations(
-            domain=["string", "string", "string"],
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            cache_hit=[True],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dnssec=["INVALID"],
+            dnssec_aware=["SUPPORTED"],
+            dnssec_e2e=[True],
+            domain=["google.com"],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            matching_answer=[True],
+            name=["main_series"],
+            nodata=[True],
+            protocol=["UDP"],
+            query_type=["A"],
+            response_code=["NOERROR"],
+            response_ttl=["LTE_1M"],
+            tld=["com"],
         )
         assert_matches_type(TopLocationsResponse, top, path=["response"])
 
     @parametrize
     def test_raw_response_locations(self, client: Cloudflare) -> None:
-        response = client.radar.dns.top.with_raw_response.locations(
-            domain=["string", "string", "string"],
-        )
+        response = client.radar.dns.top.with_raw_response.locations()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -117,9 +114,7 @@ def test_raw_response_locations(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_locations(self, client: Cloudflare) -> None:
-        with client.radar.dns.top.with_streaming_response.locations(
-            domain=["string", "string", "string"],
-        ) as response:
+        with client.radar.dns.top.with_streaming_response.locations() as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
@@ -130,44 +125,45 @@ def test_streaming_response_locations(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTop:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_ases(self, async_client: AsyncCloudflare) -> None:
-        top = await async_client.radar.dns.top.ases(
-            domain=["string", "string", "string"],
-        )
+        top = await async_client.radar.dns.top.ases()
         assert_matches_type(TopAsesResponse, top, path=["response"])
 
     @parametrize
     async def test_method_ases_with_all_params(self, async_client: AsyncCloudflare) -> None:
         top = await async_client.radar.dns.top.ases(
-            domain=["string", "string", "string"],
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            cache_hit=[True],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dnssec=["INVALID"],
+            dnssec_aware=["SUPPORTED"],
+            dnssec_e2e=[True],
+            domain=["google.com"],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            matching_answer=[True],
+            name=["main_series"],
+            nodata=[True],
+            protocol=["UDP"],
+            query_type=["A"],
+            response_code=["NOERROR"],
+            response_ttl=["LTE_1M"],
         )
         assert_matches_type(TopAsesResponse, top, path=["response"])
 
     @parametrize
     async def test_raw_response_ases(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.dns.top.with_raw_response.ases(
-            domain=["string", "string", "string"],
-        )
+        response = await async_client.radar.dns.top.with_raw_response.ases()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -176,9 +172,7 @@ async def test_raw_response_ases(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_ases(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.dns.top.with_streaming_response.ases(
-            domain=["string", "string", "string"],
-        ) as response:
+        async with async_client.radar.dns.top.with_streaming_response.ases() as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
@@ -189,40 +183,40 @@ async def test_streaming_response_ases(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_method_locations(self, async_client: AsyncCloudflare) -> None:
-        top = await async_client.radar.dns.top.locations(
-            domain=["string", "string", "string"],
-        )
+        top = await async_client.radar.dns.top.locations()
         assert_matches_type(TopLocationsResponse, top, path=["response"])
 
     @parametrize
     async def test_method_locations_with_all_params(self, async_client: AsyncCloudflare) -> None:
         top = await async_client.radar.dns.top.locations(
-            domain=["string", "string", "string"],
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            cache_hit=[True],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dnssec=["INVALID"],
+            dnssec_aware=["SUPPORTED"],
+            dnssec_e2e=[True],
+            domain=["google.com"],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            matching_answer=[True],
+            name=["main_series"],
+            nodata=[True],
+            protocol=["UDP"],
+            query_type=["A"],
+            response_code=["NOERROR"],
+            response_ttl=["LTE_1M"],
+            tld=["com"],
         )
         assert_matches_type(TopLocationsResponse, top, path=["response"])
 
     @parametrize
     async def test_raw_response_locations(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.dns.top.with_raw_response.locations(
-            domain=["string", "string", "string"],
-        )
+        response = await async_client.radar.dns.top.with_raw_response.locations()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -231,9 +225,7 @@ async def test_raw_response_locations(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_streaming_response_locations(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.dns.top.with_streaming_response.locations(
-            domain=["string", "string", "string"],
-        ) as response:
+        async with async_client.radar.dns.top.with_streaming_response.locations() as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
diff --git a/tests/api_resources/radar/email/routing/test_summary.py b/tests/api_resources/radar/email/routing/test_summary.py
index ec3ee1bd774..20f352c7be7 100644
--- a/tests/api_resources/radar/email/routing/test_summary.py
+++ b/tests/api_resources/radar/email/routing/test_summary.py
@@ -19,6 +19,8 @@
     SummaryIPVersionResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -27,36 +29,33 @@ class TestSummary:
 
     @parametrize
     def test_method_arc(self, client: Cloudflare) -> None:
-        summary = client.radar.email.routing.summary.arc()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.routing.summary.arc()
+
         assert_matches_type(SummaryARCResponse, summary, path=["response"])
 
     @parametrize
     def test_method_arc_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.email.routing.summary.arc(
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.routing.summary.arc(
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(SummaryARCResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_arc(self, client: Cloudflare) -> None:
-        response = client.radar.email.routing.summary.with_raw_response.arc()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.routing.summary.with_raw_response.arc()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -65,47 +64,45 @@ def test_raw_response_arc(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_arc(self, client: Cloudflare) -> None:
-        with client.radar.email.routing.summary.with_streaming_response.arc() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.routing.summary.with_streaming_response.arc() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryARCResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryARCResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_dkim(self, client: Cloudflare) -> None:
-        summary = client.radar.email.routing.summary.dkim()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.routing.summary.dkim()
+
         assert_matches_type(SummaryDKIMResponse, summary, path=["response"])
 
     @parametrize
     def test_method_dkim_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.email.routing.summary.dkim(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dmarc=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.routing.summary.dkim(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dmarc=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(SummaryDKIMResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_dkim(self, client: Cloudflare) -> None:
-        response = client.radar.email.routing.summary.with_raw_response.dkim()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.routing.summary.with_raw_response.dkim()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -114,47 +111,45 @@ def test_raw_response_dkim(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_dkim(self, client: Cloudflare) -> None:
-        with client.radar.email.routing.summary.with_streaming_response.dkim() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.routing.summary.with_streaming_response.dkim() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryDKIMResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryDKIMResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_dmarc(self, client: Cloudflare) -> None:
-        summary = client.radar.email.routing.summary.dmarc()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.routing.summary.dmarc()
+
         assert_matches_type(SummaryDMARCResponse, summary, path=["response"])
 
     @parametrize
     def test_method_dmarc_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.email.routing.summary.dmarc(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.routing.summary.dmarc(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(SummaryDMARCResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_dmarc(self, client: Cloudflare) -> None:
-        response = client.radar.email.routing.summary.with_raw_response.dmarc()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.routing.summary.with_raw_response.dmarc()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -163,47 +158,45 @@ def test_raw_response_dmarc(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_dmarc(self, client: Cloudflare) -> None:
-        with client.radar.email.routing.summary.with_streaming_response.dmarc() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.routing.summary.with_streaming_response.dmarc() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryDMARCResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryDMARCResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_encrypted(self, client: Cloudflare) -> None:
-        summary = client.radar.email.routing.summary.encrypted()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.routing.summary.encrypted()
+
         assert_matches_type(SummaryEncryptedResponse, summary, path=["response"])
 
     @parametrize
     def test_method_encrypted_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.email.routing.summary.encrypted(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.routing.summary.encrypted(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(SummaryEncryptedResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_encrypted(self, client: Cloudflare) -> None:
-        response = client.radar.email.routing.summary.with_raw_response.encrypted()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.routing.summary.with_raw_response.encrypted()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -212,47 +205,45 @@ def test_raw_response_encrypted(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_encrypted(self, client: Cloudflare) -> None:
-        with client.radar.email.routing.summary.with_streaming_response.encrypted() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.routing.summary.with_streaming_response.encrypted() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryEncryptedResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryEncryptedResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_ip_version(self, client: Cloudflare) -> None:
-        summary = client.radar.email.routing.summary.ip_version()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.routing.summary.ip_version()
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     def test_method_ip_version_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.email.routing.summary.ip_version(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.routing.summary.ip_version(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_ip_version(self, client: Cloudflare) -> None:
-        response = client.radar.email.routing.summary.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.routing.summary.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -261,47 +252,45 @@ def test_raw_response_ip_version(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_ip_version(self, client: Cloudflare) -> None:
-        with client.radar.email.routing.summary.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.routing.summary.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_spf(self, client: Cloudflare) -> None:
-        summary = client.radar.email.routing.summary.spf()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.routing.summary.spf()
+
         assert_matches_type(SummarySPFResponse, summary, path=["response"])
 
     @parametrize
     def test_method_spf_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.email.routing.summary.spf(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.routing.summary.spf(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+            )
+
         assert_matches_type(SummarySPFResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_spf(self, client: Cloudflare) -> None:
-        response = client.radar.email.routing.summary.with_raw_response.spf()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.routing.summary.with_raw_response.spf()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -310,51 +299,51 @@ def test_raw_response_spf(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_spf(self, client: Cloudflare) -> None:
-        with client.radar.email.routing.summary.with_streaming_response.spf() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.routing.summary.with_streaming_response.spf() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummarySPFResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummarySPFResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncSummary:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_arc(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.routing.summary.arc()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.routing.summary.arc()
+
         assert_matches_type(SummaryARCResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_arc_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.routing.summary.arc(
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.routing.summary.arc(
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(SummaryARCResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_arc(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.routing.summary.with_raw_response.arc()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.routing.summary.with_raw_response.arc()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -363,47 +352,45 @@ async def test_raw_response_arc(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_arc(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.routing.summary.with_streaming_response.arc() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.routing.summary.with_streaming_response.arc() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryARCResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryARCResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_dkim(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.routing.summary.dkim()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.routing.summary.dkim()
+
         assert_matches_type(SummaryDKIMResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_dkim_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.routing.summary.dkim(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dmarc=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.routing.summary.dkim(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dmarc=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(SummaryDKIMResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_dkim(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.routing.summary.with_raw_response.dkim()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.routing.summary.with_raw_response.dkim()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -412,47 +399,45 @@ async def test_raw_response_dkim(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_dkim(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.routing.summary.with_streaming_response.dkim() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.routing.summary.with_streaming_response.dkim() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryDKIMResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryDKIMResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_dmarc(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.routing.summary.dmarc()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.routing.summary.dmarc()
+
         assert_matches_type(SummaryDMARCResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_dmarc_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.routing.summary.dmarc(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.routing.summary.dmarc(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(SummaryDMARCResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_dmarc(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.routing.summary.with_raw_response.dmarc()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.routing.summary.with_raw_response.dmarc()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -461,47 +446,45 @@ async def test_raw_response_dmarc(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_dmarc(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.routing.summary.with_streaming_response.dmarc() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.routing.summary.with_streaming_response.dmarc() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryDMARCResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryDMARCResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_encrypted(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.routing.summary.encrypted()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.routing.summary.encrypted()
+
         assert_matches_type(SummaryEncryptedResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_encrypted_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.routing.summary.encrypted(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.routing.summary.encrypted(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(SummaryEncryptedResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_encrypted(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.routing.summary.with_raw_response.encrypted()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.routing.summary.with_raw_response.encrypted()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -510,47 +493,45 @@ async def test_raw_response_encrypted(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_streaming_response_encrypted(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.routing.summary.with_streaming_response.encrypted() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.routing.summary.with_streaming_response.encrypted() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryEncryptedResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryEncryptedResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_ip_version(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.routing.summary.ip_version()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.routing.summary.ip_version()
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_ip_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.routing.summary.ip_version(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.routing.summary.ip_version(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.routing.summary.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.routing.summary.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -559,47 +540,45 @@ async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_streaming_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.routing.summary.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.routing.summary.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_spf(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.routing.summary.spf()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.routing.summary.spf()
+
         assert_matches_type(SummarySPFResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_spf_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.routing.summary.spf(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.routing.summary.spf(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+            )
+
         assert_matches_type(SummarySPFResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_spf(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.routing.summary.with_raw_response.spf()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.routing.summary.with_raw_response.spf()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -608,11 +587,12 @@ async def test_raw_response_spf(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_spf(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.routing.summary.with_streaming_response.spf() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.routing.summary.with_streaming_response.spf() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummarySPFResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummarySPFResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/email/routing/test_timeseries_groups.py b/tests/api_resources/radar/email/routing/test_timeseries_groups.py
index ea7f67c70a0..3872f481af8 100644
--- a/tests/api_resources/radar/email/routing/test_timeseries_groups.py
+++ b/tests/api_resources/radar/email/routing/test_timeseries_groups.py
@@ -19,6 +19,8 @@
     TimeseriesGroupIPVersionResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -27,37 +29,34 @@ class TestTimeseriesGroups:
 
     @parametrize
     def test_method_arc(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.routing.timeseries_groups.arc()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.routing.timeseries_groups.arc()
+
         assert_matches_type(TimeseriesGroupARCResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_arc_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.routing.timeseries_groups.arc(
-            agg_interval="1h",
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.routing.timeseries_groups.arc(
+                agg_interval="1h",
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(TimeseriesGroupARCResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_arc(self, client: Cloudflare) -> None:
-        response = client.radar.email.routing.timeseries_groups.with_raw_response.arc()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.routing.timeseries_groups.with_raw_response.arc()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -66,48 +65,46 @@ def test_raw_response_arc(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_arc(self, client: Cloudflare) -> None:
-        with client.radar.email.routing.timeseries_groups.with_streaming_response.arc() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.routing.timeseries_groups.with_streaming_response.arc() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupARCResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupARCResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_dkim(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.routing.timeseries_groups.dkim()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.routing.timeseries_groups.dkim()
+
         assert_matches_type(TimeseriesGroupDKIMResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_dkim_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.routing.timeseries_groups.dkim(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dmarc=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.routing.timeseries_groups.dkim(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dmarc=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(TimeseriesGroupDKIMResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_dkim(self, client: Cloudflare) -> None:
-        response = client.radar.email.routing.timeseries_groups.with_raw_response.dkim()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.routing.timeseries_groups.with_raw_response.dkim()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -116,48 +113,46 @@ def test_raw_response_dkim(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_dkim(self, client: Cloudflare) -> None:
-        with client.radar.email.routing.timeseries_groups.with_streaming_response.dkim() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.routing.timeseries_groups.with_streaming_response.dkim() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupDKIMResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupDKIMResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_dmarc(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.routing.timeseries_groups.dmarc()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.routing.timeseries_groups.dmarc()
+
         assert_matches_type(TimeseriesGroupDMARCResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_dmarc_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.routing.timeseries_groups.dmarc(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.routing.timeseries_groups.dmarc(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(TimeseriesGroupDMARCResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_dmarc(self, client: Cloudflare) -> None:
-        response = client.radar.email.routing.timeseries_groups.with_raw_response.dmarc()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.routing.timeseries_groups.with_raw_response.dmarc()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -166,48 +161,46 @@ def test_raw_response_dmarc(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_dmarc(self, client: Cloudflare) -> None:
-        with client.radar.email.routing.timeseries_groups.with_streaming_response.dmarc() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.routing.timeseries_groups.with_streaming_response.dmarc() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupDMARCResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupDMARCResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_encrypted(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.routing.timeseries_groups.encrypted()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.routing.timeseries_groups.encrypted()
+
         assert_matches_type(TimeseriesGroupEncryptedResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_encrypted_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.routing.timeseries_groups.encrypted(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.routing.timeseries_groups.encrypted(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(TimeseriesGroupEncryptedResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_encrypted(self, client: Cloudflare) -> None:
-        response = client.radar.email.routing.timeseries_groups.with_raw_response.encrypted()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.routing.timeseries_groups.with_raw_response.encrypted()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -216,48 +209,46 @@ def test_raw_response_encrypted(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_encrypted(self, client: Cloudflare) -> None:
-        with client.radar.email.routing.timeseries_groups.with_streaming_response.encrypted() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.routing.timeseries_groups.with_streaming_response.encrypted() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupEncryptedResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupEncryptedResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_ip_version(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.routing.timeseries_groups.ip_version()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.routing.timeseries_groups.ip_version()
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_ip_version_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.routing.timeseries_groups.ip_version(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.routing.timeseries_groups.ip_version(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_ip_version(self, client: Cloudflare) -> None:
-        response = client.radar.email.routing.timeseries_groups.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.routing.timeseries_groups.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -266,48 +257,46 @@ def test_raw_response_ip_version(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_ip_version(self, client: Cloudflare) -> None:
-        with client.radar.email.routing.timeseries_groups.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.routing.timeseries_groups.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_spf(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.routing.timeseries_groups.spf()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.routing.timeseries_groups.spf()
+
         assert_matches_type(TimeseriesGroupSPFResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_spf_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.routing.timeseries_groups.spf(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.routing.timeseries_groups.spf(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+            )
+
         assert_matches_type(TimeseriesGroupSPFResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_spf(self, client: Cloudflare) -> None:
-        response = client.radar.email.routing.timeseries_groups.with_raw_response.spf()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.routing.timeseries_groups.with_raw_response.spf()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -316,52 +305,52 @@ def test_raw_response_spf(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_spf(self, client: Cloudflare) -> None:
-        with client.radar.email.routing.timeseries_groups.with_streaming_response.spf() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.routing.timeseries_groups.with_streaming_response.spf() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupSPFResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupSPFResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncTimeseriesGroups:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_arc(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.routing.timeseries_groups.arc()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.routing.timeseries_groups.arc()
+
         assert_matches_type(TimeseriesGroupARCResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_arc_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.routing.timeseries_groups.arc(
-            agg_interval="1h",
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.routing.timeseries_groups.arc(
+                agg_interval="1h",
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(TimeseriesGroupARCResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_arc(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.routing.timeseries_groups.with_raw_response.arc()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.routing.timeseries_groups.with_raw_response.arc()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -370,48 +359,46 @@ async def test_raw_response_arc(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_arc(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.routing.timeseries_groups.with_streaming_response.arc() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.routing.timeseries_groups.with_streaming_response.arc() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupARCResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupARCResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_dkim(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.routing.timeseries_groups.dkim()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.routing.timeseries_groups.dkim()
+
         assert_matches_type(TimeseriesGroupDKIMResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_dkim_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.routing.timeseries_groups.dkim(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dmarc=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.routing.timeseries_groups.dkim(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dmarc=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(TimeseriesGroupDKIMResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_dkim(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.routing.timeseries_groups.with_raw_response.dkim()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.routing.timeseries_groups.with_raw_response.dkim()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -420,48 +407,46 @@ async def test_raw_response_dkim(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_dkim(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.routing.timeseries_groups.with_streaming_response.dkim() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.routing.timeseries_groups.with_streaming_response.dkim() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupDKIMResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupDKIMResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_dmarc(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.routing.timeseries_groups.dmarc()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.routing.timeseries_groups.dmarc()
+
         assert_matches_type(TimeseriesGroupDMARCResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_dmarc_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.routing.timeseries_groups.dmarc(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.routing.timeseries_groups.dmarc(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(TimeseriesGroupDMARCResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_dmarc(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.routing.timeseries_groups.with_raw_response.dmarc()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.routing.timeseries_groups.with_raw_response.dmarc()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -470,48 +455,46 @@ async def test_raw_response_dmarc(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_dmarc(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.routing.timeseries_groups.with_streaming_response.dmarc() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.routing.timeseries_groups.with_streaming_response.dmarc() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupDMARCResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupDMARCResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_encrypted(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.routing.timeseries_groups.encrypted()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.routing.timeseries_groups.encrypted()
+
         assert_matches_type(TimeseriesGroupEncryptedResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_encrypted_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.routing.timeseries_groups.encrypted(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.routing.timeseries_groups.encrypted(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(TimeseriesGroupEncryptedResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_encrypted(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.routing.timeseries_groups.with_raw_response.encrypted()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.routing.timeseries_groups.with_raw_response.encrypted()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -520,48 +503,48 @@ async def test_raw_response_encrypted(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_streaming_response_encrypted(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.routing.timeseries_groups.with_streaming_response.encrypted() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.email.routing.timeseries_groups.with_streaming_response.encrypted()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupEncryptedResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupEncryptedResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_ip_version(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.routing.timeseries_groups.ip_version()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.routing.timeseries_groups.ip_version()
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_ip_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.routing.timeseries_groups.ip_version(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.routing.timeseries_groups.ip_version(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.routing.timeseries_groups.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.routing.timeseries_groups.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -570,48 +553,48 @@ async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_streaming_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.routing.timeseries_groups.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.email.routing.timeseries_groups.with_streaming_response.ip_version()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_spf(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.routing.timeseries_groups.spf()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.routing.timeseries_groups.spf()
+
         assert_matches_type(TimeseriesGroupSPFResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_spf_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.routing.timeseries_groups.spf(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            encrypted=["ENCRYPTED", "NOT_ENCRYPTED"],
-            format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.routing.timeseries_groups.spf(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                encrypted=["ENCRYPTED"],
+                format="JSON",
+                ip_version=["IPv4"],
+                name=["main_series"],
+            )
+
         assert_matches_type(TimeseriesGroupSPFResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_spf(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.routing.timeseries_groups.with_raw_response.spf()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.routing.timeseries_groups.with_raw_response.spf()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -620,11 +603,12 @@ async def test_raw_response_spf(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_spf(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.routing.timeseries_groups.with_streaming_response.spf() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.routing.timeseries_groups.with_streaming_response.spf() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupSPFResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupSPFResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/email/security/test_summary.py b/tests/api_resources/radar/email/security/test_summary.py
index c46974d06b0..d663caa464e 100644
--- a/tests/api_resources/radar/email/security/test_summary.py
+++ b/tests/api_resources/radar/email/security/test_summary.py
@@ -22,6 +22,8 @@
     SummaryThreatCategoryResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -30,35 +32,32 @@ class TestSummary:
 
     @parametrize
     def test_method_arc(self, client: Cloudflare) -> None:
-        summary = client.radar.email.security.summary.arc()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.security.summary.arc()
+
         assert_matches_type(SummaryARCResponse, summary, path=["response"])
 
     @parametrize
     def test_method_arc_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.email.security.summary.arc(
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.security.summary.arc(
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryARCResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_arc(self, client: Cloudflare) -> None:
-        response = client.radar.email.security.summary.with_raw_response.arc()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.security.summary.with_raw_response.arc()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -67,46 +66,44 @@ def test_raw_response_arc(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_arc(self, client: Cloudflare) -> None:
-        with client.radar.email.security.summary.with_streaming_response.arc() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.security.summary.with_streaming_response.arc() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryARCResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryARCResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_dkim(self, client: Cloudflare) -> None:
-        summary = client.radar.email.security.summary.dkim()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.security.summary.dkim()
+
         assert_matches_type(SummaryDKIMResponse, summary, path=["response"])
 
     @parametrize
     def test_method_dkim_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.email.security.summary.dkim(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.security.summary.dkim(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryDKIMResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_dkim(self, client: Cloudflare) -> None:
-        response = client.radar.email.security.summary.with_raw_response.dkim()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.security.summary.with_raw_response.dkim()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -115,46 +112,44 @@ def test_raw_response_dkim(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_dkim(self, client: Cloudflare) -> None:
-        with client.radar.email.security.summary.with_streaming_response.dkim() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.security.summary.with_streaming_response.dkim() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryDKIMResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryDKIMResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_dmarc(self, client: Cloudflare) -> None:
-        summary = client.radar.email.security.summary.dmarc()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.security.summary.dmarc()
+
         assert_matches_type(SummaryDMARCResponse, summary, path=["response"])
 
     @parametrize
     def test_method_dmarc_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.email.security.summary.dmarc(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.security.summary.dmarc(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryDMARCResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_dmarc(self, client: Cloudflare) -> None:
-        response = client.radar.email.security.summary.with_raw_response.dmarc()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.security.summary.with_raw_response.dmarc()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -163,47 +158,45 @@ def test_raw_response_dmarc(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_dmarc(self, client: Cloudflare) -> None:
-        with client.radar.email.security.summary.with_streaming_response.dmarc() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.security.summary.with_streaming_response.dmarc() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryDMARCResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryDMARCResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_malicious(self, client: Cloudflare) -> None:
-        summary = client.radar.email.security.summary.malicious()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.security.summary.malicious()
+
         assert_matches_type(SummaryMaliciousResponse, summary, path=["response"])
 
     @parametrize
     def test_method_malicious_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.email.security.summary.malicious(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.security.summary.malicious(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryMaliciousResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_malicious(self, client: Cloudflare) -> None:
-        response = client.radar.email.security.summary.with_raw_response.malicious()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.security.summary.with_raw_response.malicious()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -212,47 +205,45 @@ def test_raw_response_malicious(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_malicious(self, client: Cloudflare) -> None:
-        with client.radar.email.security.summary.with_streaming_response.malicious() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.security.summary.with_streaming_response.malicious() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryMaliciousResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryMaliciousResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_spam(self, client: Cloudflare) -> None:
-        summary = client.radar.email.security.summary.spam()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.security.summary.spam()
+
         assert_matches_type(SummarySpamResponse, summary, path=["response"])
 
     @parametrize
     def test_method_spam_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.email.security.summary.spam(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.security.summary.spam(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummarySpamResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_spam(self, client: Cloudflare) -> None:
-        response = client.radar.email.security.summary.with_raw_response.spam()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.security.summary.with_raw_response.spam()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -261,46 +252,44 @@ def test_raw_response_spam(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_spam(self, client: Cloudflare) -> None:
-        with client.radar.email.security.summary.with_streaming_response.spam() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.security.summary.with_streaming_response.spam() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummarySpamResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummarySpamResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_spf(self, client: Cloudflare) -> None:
-        summary = client.radar.email.security.summary.spf()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.security.summary.spf()
+
         assert_matches_type(SummarySPFResponse, summary, path=["response"])
 
     @parametrize
     def test_method_spf_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.email.security.summary.spf(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.security.summary.spf(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummarySPFResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_spf(self, client: Cloudflare) -> None:
-        response = client.radar.email.security.summary.with_raw_response.spf()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.security.summary.with_raw_response.spf()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -309,47 +298,45 @@ def test_raw_response_spf(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_spf(self, client: Cloudflare) -> None:
-        with client.radar.email.security.summary.with_streaming_response.spf() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.security.summary.with_streaming_response.spf() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummarySPFResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummarySPFResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_spoof(self, client: Cloudflare) -> None:
-        summary = client.radar.email.security.summary.spoof()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.security.summary.spoof()
+
         assert_matches_type(SummarySpoofResponse, summary, path=["response"])
 
     @parametrize
     def test_method_spoof_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.email.security.summary.spoof(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.security.summary.spoof(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummarySpoofResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_spoof(self, client: Cloudflare) -> None:
-        response = client.radar.email.security.summary.with_raw_response.spoof()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.security.summary.with_raw_response.spoof()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -358,47 +345,45 @@ def test_raw_response_spoof(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_spoof(self, client: Cloudflare) -> None:
-        with client.radar.email.security.summary.with_streaming_response.spoof() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.security.summary.with_streaming_response.spoof() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummarySpoofResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummarySpoofResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_threat_category(self, client: Cloudflare) -> None:
-        summary = client.radar.email.security.summary.threat_category()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.security.summary.threat_category()
+
         assert_matches_type(SummaryThreatCategoryResponse, summary, path=["response"])
 
     @parametrize
     def test_method_threat_category_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.email.security.summary.threat_category(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.security.summary.threat_category(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryThreatCategoryResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_threat_category(self, client: Cloudflare) -> None:
-        response = client.radar.email.security.summary.with_raw_response.threat_category()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.security.summary.with_raw_response.threat_category()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -407,46 +392,44 @@ def test_raw_response_threat_category(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_threat_category(self, client: Cloudflare) -> None:
-        with client.radar.email.security.summary.with_streaming_response.threat_category() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.security.summary.with_streaming_response.threat_category() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryThreatCategoryResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryThreatCategoryResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_tls_version(self, client: Cloudflare) -> None:
-        summary = client.radar.email.security.summary.tls_version()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.security.summary.tls_version()
+
         assert_matches_type(SummaryTLSVersionResponse, summary, path=["response"])
 
     @parametrize
     def test_method_tls_version_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.email.security.summary.tls_version(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.email.security.summary.tls_version(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(SummaryTLSVersionResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_tls_version(self, client: Cloudflare) -> None:
-        response = client.radar.email.security.summary.with_raw_response.tls_version()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.security.summary.with_raw_response.tls_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -455,50 +438,50 @@ def test_raw_response_tls_version(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_tls_version(self, client: Cloudflare) -> None:
-        with client.radar.email.security.summary.with_streaming_response.tls_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.security.summary.with_streaming_response.tls_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryTLSVersionResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryTLSVersionResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncSummary:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_arc(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.security.summary.arc()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.security.summary.arc()
+
         assert_matches_type(SummaryARCResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_arc_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.security.summary.arc(
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.security.summary.arc(
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryARCResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_arc(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.security.summary.with_raw_response.arc()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.security.summary.with_raw_response.arc()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -507,46 +490,44 @@ async def test_raw_response_arc(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_arc(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.security.summary.with_streaming_response.arc() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.security.summary.with_streaming_response.arc() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryARCResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryARCResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_dkim(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.security.summary.dkim()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.security.summary.dkim()
+
         assert_matches_type(SummaryDKIMResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_dkim_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.security.summary.dkim(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.security.summary.dkim(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryDKIMResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_dkim(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.security.summary.with_raw_response.dkim()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.security.summary.with_raw_response.dkim()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -555,46 +536,44 @@ async def test_raw_response_dkim(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_dkim(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.security.summary.with_streaming_response.dkim() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.security.summary.with_streaming_response.dkim() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryDKIMResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryDKIMResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_dmarc(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.security.summary.dmarc()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.security.summary.dmarc()
+
         assert_matches_type(SummaryDMARCResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_dmarc_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.security.summary.dmarc(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.security.summary.dmarc(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryDMARCResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_dmarc(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.security.summary.with_raw_response.dmarc()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.security.summary.with_raw_response.dmarc()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -603,47 +582,45 @@ async def test_raw_response_dmarc(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_dmarc(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.security.summary.with_streaming_response.dmarc() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.security.summary.with_streaming_response.dmarc() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryDMARCResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryDMARCResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_malicious(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.security.summary.malicious()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.security.summary.malicious()
+
         assert_matches_type(SummaryMaliciousResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_malicious_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.security.summary.malicious(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.security.summary.malicious(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryMaliciousResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_malicious(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.security.summary.with_raw_response.malicious()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.security.summary.with_raw_response.malicious()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -652,47 +629,45 @@ async def test_raw_response_malicious(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_streaming_response_malicious(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.security.summary.with_streaming_response.malicious() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.security.summary.with_streaming_response.malicious() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryMaliciousResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryMaliciousResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_spam(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.security.summary.spam()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.security.summary.spam()
+
         assert_matches_type(SummarySpamResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_spam_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.security.summary.spam(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.security.summary.spam(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummarySpamResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_spam(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.security.summary.with_raw_response.spam()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.security.summary.with_raw_response.spam()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -701,46 +676,44 @@ async def test_raw_response_spam(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_spam(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.security.summary.with_streaming_response.spam() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.security.summary.with_streaming_response.spam() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummarySpamResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummarySpamResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_spf(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.security.summary.spf()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.security.summary.spf()
+
         assert_matches_type(SummarySPFResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_spf_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.security.summary.spf(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.security.summary.spf(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummarySPFResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_spf(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.security.summary.with_raw_response.spf()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.security.summary.with_raw_response.spf()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -749,47 +722,45 @@ async def test_raw_response_spf(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_spf(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.security.summary.with_streaming_response.spf() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.security.summary.with_streaming_response.spf() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummarySPFResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummarySPFResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_spoof(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.security.summary.spoof()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.security.summary.spoof()
+
         assert_matches_type(SummarySpoofResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_spoof_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.security.summary.spoof(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.security.summary.spoof(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummarySpoofResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_spoof(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.security.summary.with_raw_response.spoof()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.security.summary.with_raw_response.spoof()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -798,47 +769,45 @@ async def test_raw_response_spoof(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_spoof(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.security.summary.with_streaming_response.spoof() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.security.summary.with_streaming_response.spoof() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummarySpoofResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummarySpoofResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_threat_category(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.security.summary.threat_category()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.security.summary.threat_category()
+
         assert_matches_type(SummaryThreatCategoryResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_threat_category_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.security.summary.threat_category(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.security.summary.threat_category(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryThreatCategoryResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_threat_category(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.security.summary.with_raw_response.threat_category()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.security.summary.with_raw_response.threat_category()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -847,46 +816,44 @@ async def test_raw_response_threat_category(self, async_client: AsyncCloudflare)
 
     @parametrize
     async def test_streaming_response_threat_category(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.security.summary.with_streaming_response.threat_category() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.security.summary.with_streaming_response.threat_category() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryThreatCategoryResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryThreatCategoryResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_tls_version(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.security.summary.tls_version()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.security.summary.tls_version()
+
         assert_matches_type(SummaryTLSVersionResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_tls_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.email.security.summary.tls_version(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.email.security.summary.tls_version(
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(SummaryTLSVersionResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_tls_version(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.security.summary.with_raw_response.tls_version()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.security.summary.with_raw_response.tls_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -895,11 +862,12 @@ async def test_raw_response_tls_version(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_streaming_response_tls_version(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.security.summary.with_streaming_response.tls_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.security.summary.with_streaming_response.tls_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryTLSVersionResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryTLSVersionResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/email/security/test_timeseries_groups.py b/tests/api_resources/radar/email/security/test_timeseries_groups.py
index a917102ae45..90d9471851e 100644
--- a/tests/api_resources/radar/email/security/test_timeseries_groups.py
+++ b/tests/api_resources/radar/email/security/test_timeseries_groups.py
@@ -22,6 +22,8 @@
     TimeseriesGroupThreatCategoryResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -30,36 +32,33 @@ class TestTimeseriesGroups:
 
     @parametrize
     def test_method_arc(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.security.timeseries_groups.arc()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.security.timeseries_groups.arc()
+
         assert_matches_type(TimeseriesGroupARCResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_arc_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.security.timeseries_groups.arc(
-            agg_interval="1h",
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.security.timeseries_groups.arc(
+                agg_interval="1h",
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupARCResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_arc(self, client: Cloudflare) -> None:
-        response = client.radar.email.security.timeseries_groups.with_raw_response.arc()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.security.timeseries_groups.with_raw_response.arc()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -68,47 +67,45 @@ def test_raw_response_arc(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_arc(self, client: Cloudflare) -> None:
-        with client.radar.email.security.timeseries_groups.with_streaming_response.arc() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.security.timeseries_groups.with_streaming_response.arc() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupARCResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupARCResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_dkim(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.security.timeseries_groups.dkim()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.security.timeseries_groups.dkim()
+
         assert_matches_type(TimeseriesGroupDKIMResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_dkim_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.security.timeseries_groups.dkim(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.security.timeseries_groups.dkim(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupDKIMResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_dkim(self, client: Cloudflare) -> None:
-        response = client.radar.email.security.timeseries_groups.with_raw_response.dkim()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.security.timeseries_groups.with_raw_response.dkim()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -117,47 +114,45 @@ def test_raw_response_dkim(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_dkim(self, client: Cloudflare) -> None:
-        with client.radar.email.security.timeseries_groups.with_streaming_response.dkim() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.security.timeseries_groups.with_streaming_response.dkim() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupDKIMResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupDKIMResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_dmarc(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.security.timeseries_groups.dmarc()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.security.timeseries_groups.dmarc()
+
         assert_matches_type(TimeseriesGroupDMARCResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_dmarc_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.security.timeseries_groups.dmarc(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.security.timeseries_groups.dmarc(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupDMARCResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_dmarc(self, client: Cloudflare) -> None:
-        response = client.radar.email.security.timeseries_groups.with_raw_response.dmarc()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.security.timeseries_groups.with_raw_response.dmarc()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -166,48 +161,46 @@ def test_raw_response_dmarc(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_dmarc(self, client: Cloudflare) -> None:
-        with client.radar.email.security.timeseries_groups.with_streaming_response.dmarc() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.security.timeseries_groups.with_streaming_response.dmarc() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupDMARCResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupDMARCResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_malicious(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.security.timeseries_groups.malicious()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.security.timeseries_groups.malicious()
+
         assert_matches_type(TimeseriesGroupMaliciousResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_malicious_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.security.timeseries_groups.malicious(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.security.timeseries_groups.malicious(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupMaliciousResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_malicious(self, client: Cloudflare) -> None:
-        response = client.radar.email.security.timeseries_groups.with_raw_response.malicious()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.security.timeseries_groups.with_raw_response.malicious()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -216,48 +209,46 @@ def test_raw_response_malicious(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_malicious(self, client: Cloudflare) -> None:
-        with client.radar.email.security.timeseries_groups.with_streaming_response.malicious() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.security.timeseries_groups.with_streaming_response.malicious() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupMaliciousResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupMaliciousResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_spam(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.security.timeseries_groups.spam()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.security.timeseries_groups.spam()
+
         assert_matches_type(TimeseriesGroupSpamResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_spam_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.security.timeseries_groups.spam(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.security.timeseries_groups.spam(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupSpamResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_spam(self, client: Cloudflare) -> None:
-        response = client.radar.email.security.timeseries_groups.with_raw_response.spam()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.security.timeseries_groups.with_raw_response.spam()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -266,47 +257,45 @@ def test_raw_response_spam(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_spam(self, client: Cloudflare) -> None:
-        with client.radar.email.security.timeseries_groups.with_streaming_response.spam() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.security.timeseries_groups.with_streaming_response.spam() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupSpamResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupSpamResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_spf(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.security.timeseries_groups.spf()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.security.timeseries_groups.spf()
+
         assert_matches_type(TimeseriesGroupSPFResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_spf_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.security.timeseries_groups.spf(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.security.timeseries_groups.spf(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupSPFResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_spf(self, client: Cloudflare) -> None:
-        response = client.radar.email.security.timeseries_groups.with_raw_response.spf()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.security.timeseries_groups.with_raw_response.spf()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -315,48 +304,46 @@ def test_raw_response_spf(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_spf(self, client: Cloudflare) -> None:
-        with client.radar.email.security.timeseries_groups.with_streaming_response.spf() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.security.timeseries_groups.with_streaming_response.spf() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupSPFResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupSPFResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_spoof(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.security.timeseries_groups.spoof()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.security.timeseries_groups.spoof()
+
         assert_matches_type(TimeseriesGroupSpoofResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_spoof_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.security.timeseries_groups.spoof(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.security.timeseries_groups.spoof(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupSpoofResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_spoof(self, client: Cloudflare) -> None:
-        response = client.radar.email.security.timeseries_groups.with_raw_response.spoof()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.security.timeseries_groups.with_raw_response.spoof()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -365,48 +352,46 @@ def test_raw_response_spoof(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_spoof(self, client: Cloudflare) -> None:
-        with client.radar.email.security.timeseries_groups.with_streaming_response.spoof() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.security.timeseries_groups.with_streaming_response.spoof() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupSpoofResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupSpoofResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_threat_category(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.security.timeseries_groups.threat_category()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.security.timeseries_groups.threat_category()
+
         assert_matches_type(TimeseriesGroupThreatCategoryResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_threat_category_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.security.timeseries_groups.threat_category(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.security.timeseries_groups.threat_category(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupThreatCategoryResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_threat_category(self, client: Cloudflare) -> None:
-        response = client.radar.email.security.timeseries_groups.with_raw_response.threat_category()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.security.timeseries_groups.with_raw_response.threat_category()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -415,47 +400,45 @@ def test_raw_response_threat_category(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_threat_category(self, client: Cloudflare) -> None:
-        with client.radar.email.security.timeseries_groups.with_streaming_response.threat_category() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.security.timeseries_groups.with_streaming_response.threat_category() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupThreatCategoryResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupThreatCategoryResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_tls_version(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.security.timeseries_groups.tls_version()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.security.timeseries_groups.tls_version()
+
         assert_matches_type(TimeseriesGroupTLSVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_tls_version_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.email.security.timeseries_groups.tls_version(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.email.security.timeseries_groups.tls_version(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(TimeseriesGroupTLSVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_tls_version(self, client: Cloudflare) -> None:
-        response = client.radar.email.security.timeseries_groups.with_raw_response.tls_version()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.email.security.timeseries_groups.with_raw_response.tls_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -464,51 +447,51 @@ def test_raw_response_tls_version(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_tls_version(self, client: Cloudflare) -> None:
-        with client.radar.email.security.timeseries_groups.with_streaming_response.tls_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.email.security.timeseries_groups.with_streaming_response.tls_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupTLSVersionResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupTLSVersionResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncTimeseriesGroups:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_arc(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.security.timeseries_groups.arc()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.security.timeseries_groups.arc()
+
         assert_matches_type(TimeseriesGroupARCResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_arc_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.security.timeseries_groups.arc(
-            agg_interval="1h",
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.security.timeseries_groups.arc(
+                agg_interval="1h",
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupARCResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_arc(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.security.timeseries_groups.with_raw_response.arc()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.security.timeseries_groups.with_raw_response.arc()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -517,47 +500,45 @@ async def test_raw_response_arc(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_arc(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.security.timeseries_groups.with_streaming_response.arc() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.security.timeseries_groups.with_streaming_response.arc() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupARCResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupARCResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_dkim(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.security.timeseries_groups.dkim()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.security.timeseries_groups.dkim()
+
         assert_matches_type(TimeseriesGroupDKIMResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_dkim_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.security.timeseries_groups.dkim(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.security.timeseries_groups.dkim(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupDKIMResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_dkim(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.security.timeseries_groups.with_raw_response.dkim()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.security.timeseries_groups.with_raw_response.dkim()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -566,47 +547,45 @@ async def test_raw_response_dkim(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_dkim(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.security.timeseries_groups.with_streaming_response.dkim() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.security.timeseries_groups.with_streaming_response.dkim() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupDKIMResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupDKIMResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_dmarc(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.security.timeseries_groups.dmarc()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.security.timeseries_groups.dmarc()
+
         assert_matches_type(TimeseriesGroupDMARCResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_dmarc_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.security.timeseries_groups.dmarc(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.security.timeseries_groups.dmarc(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupDMARCResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_dmarc(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.security.timeseries_groups.with_raw_response.dmarc()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.security.timeseries_groups.with_raw_response.dmarc()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -615,48 +594,46 @@ async def test_raw_response_dmarc(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_dmarc(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.security.timeseries_groups.with_streaming_response.dmarc() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.security.timeseries_groups.with_streaming_response.dmarc() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupDMARCResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupDMARCResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_malicious(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.security.timeseries_groups.malicious()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.security.timeseries_groups.malicious()
+
         assert_matches_type(TimeseriesGroupMaliciousResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_malicious_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.security.timeseries_groups.malicious(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.security.timeseries_groups.malicious(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupMaliciousResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_malicious(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.security.timeseries_groups.with_raw_response.malicious()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.security.timeseries_groups.with_raw_response.malicious()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -665,48 +642,48 @@ async def test_raw_response_malicious(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_streaming_response_malicious(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.security.timeseries_groups.with_streaming_response.malicious() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.email.security.timeseries_groups.with_streaming_response.malicious()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupMaliciousResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupMaliciousResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_spam(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.security.timeseries_groups.spam()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.security.timeseries_groups.spam()
+
         assert_matches_type(TimeseriesGroupSpamResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_spam_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.security.timeseries_groups.spam(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.security.timeseries_groups.spam(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupSpamResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_spam(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.security.timeseries_groups.with_raw_response.spam()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.security.timeseries_groups.with_raw_response.spam()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -715,47 +692,45 @@ async def test_raw_response_spam(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_spam(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.security.timeseries_groups.with_streaming_response.spam() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.security.timeseries_groups.with_streaming_response.spam() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupSpamResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupSpamResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_spf(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.security.timeseries_groups.spf()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.security.timeseries_groups.spf()
+
         assert_matches_type(TimeseriesGroupSPFResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_spf_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.security.timeseries_groups.spf(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.security.timeseries_groups.spf(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupSPFResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_spf(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.security.timeseries_groups.with_raw_response.spf()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.security.timeseries_groups.with_raw_response.spf()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -764,48 +739,46 @@ async def test_raw_response_spf(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_spf(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.security.timeseries_groups.with_streaming_response.spf() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.security.timeseries_groups.with_streaming_response.spf() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupSPFResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupSPFResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_spoof(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.security.timeseries_groups.spoof()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.security.timeseries_groups.spoof()
+
         assert_matches_type(TimeseriesGroupSpoofResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_spoof_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.security.timeseries_groups.spoof(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.security.timeseries_groups.spoof(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupSpoofResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_spoof(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.security.timeseries_groups.with_raw_response.spoof()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.security.timeseries_groups.with_raw_response.spoof()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -814,48 +787,46 @@ async def test_raw_response_spoof(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_spoof(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.security.timeseries_groups.with_streaming_response.spoof() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.email.security.timeseries_groups.with_streaming_response.spoof() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupSpoofResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupSpoofResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_threat_category(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.security.timeseries_groups.threat_category()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.security.timeseries_groups.threat_category()
+
         assert_matches_type(TimeseriesGroupThreatCategoryResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_threat_category_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.security.timeseries_groups.threat_category(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.security.timeseries_groups.threat_category(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupThreatCategoryResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_threat_category(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.security.timeseries_groups.with_raw_response.threat_category()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.security.timeseries_groups.with_raw_response.threat_category()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -864,47 +835,47 @@ async def test_raw_response_threat_category(self, async_client: AsyncCloudflare)
 
     @parametrize
     async def test_streaming_response_threat_category(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.security.timeseries_groups.with_streaming_response.threat_category() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.email.security.timeseries_groups.with_streaming_response.threat_category()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupThreatCategoryResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupThreatCategoryResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_tls_version(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.security.timeseries_groups.tls_version()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.security.timeseries_groups.tls_version()
+
         assert_matches_type(TimeseriesGroupTLSVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_tls_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.email.security.timeseries_groups.tls_version(
-            agg_interval="1h",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
-            format="JSON",
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.email.security.timeseries_groups.tls_version(
+                agg_interval="1h",
+                arc=["PASS"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                dkim=["PASS"],
+                dmarc=["PASS"],
+                format="JSON",
+                name=["main_series"],
+                spf=["PASS"],
+            )
+
         assert_matches_type(TimeseriesGroupTLSVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_tls_version(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.email.security.timeseries_groups.with_raw_response.tls_version()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.email.security.timeseries_groups.with_raw_response.tls_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -913,11 +884,14 @@ async def test_raw_response_tls_version(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_streaming_response_tls_version(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.email.security.timeseries_groups.with_streaming_response.tls_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupTLSVersionResponse, timeseries_group, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.email.security.timeseries_groups.with_streaming_response.tls_version()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupTLSVersionResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/email/security/top/test_tlds.py b/tests/api_resources/radar/email/security/top/test_tlds.py
index fb71286f8f9..0e1e4ec899e 100644
--- a/tests/api_resources/radar/email/security/top/test_tlds.py
+++ b/tests/api_resources/radar/email/security/top/test_tlds.py
@@ -10,44 +10,36 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare._utils import parse_datetime
-from cloudflare.types.radar.email.security.top import TldGetResponse
+from cloudflare.types.radar.email.security.top import TLDGetResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
-class TestTlds:
+class TestTLDs:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         tld = client.radar.email.security.top.tlds.get()
-        assert_matches_type(TldGetResponse, tld, path=["response"])
+        assert_matches_type(TLDGetResponse, tld, path=["response"])
 
     @parametrize
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         tld = client.radar.email.security.top.tlds.get(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
+            arc=["PASS"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dkim=["PASS"],
+            dmarc=["PASS"],
             format="JSON",
-            limit=5,
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
+            limit=1,
+            name=["main_series"],
+            spf=["PASS"],
             tld_category="CLASSIC",
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            tls_version=["TLSv1_0"],
         )
-        assert_matches_type(TldGetResponse, tld, path=["response"])
+        assert_matches_type(TLDGetResponse, tld, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -56,7 +48,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         tld = response.parse()
-        assert_matches_type(TldGetResponse, tld, path=["response"])
+        assert_matches_type(TLDGetResponse, tld, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -65,44 +57,38 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             tld = response.parse()
-            assert_matches_type(TldGetResponse, tld, path=["response"])
+            assert_matches_type(TLDGetResponse, tld, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
-class TestAsyncTlds:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+class TestAsyncTLDs:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         tld = await async_client.radar.email.security.top.tlds.get()
-        assert_matches_type(TldGetResponse, tld, path=["response"])
+        assert_matches_type(TLDGetResponse, tld, path=["response"])
 
     @parametrize
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         tld = await async_client.radar.email.security.top.tlds.get(
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
+            arc=["PASS"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dkim=["PASS"],
+            dmarc=["PASS"],
             format="JSON",
-            limit=5,
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
+            limit=1,
+            name=["main_series"],
+            spf=["PASS"],
             tld_category="CLASSIC",
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            tls_version=["TLSv1_0"],
         )
-        assert_matches_type(TldGetResponse, tld, path=["response"])
+        assert_matches_type(TLDGetResponse, tld, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -111,7 +97,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         tld = await response.parse()
-        assert_matches_type(TldGetResponse, tld, path=["response"])
+        assert_matches_type(TLDGetResponse, tld, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -120,6 +106,6 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             tld = await response.parse()
-            assert_matches_type(TldGetResponse, tld, path=["response"])
+            assert_matches_type(TLDGetResponse, tld, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/email/security/top/tlds/test_malicious.py b/tests/api_resources/radar/email/security/top/tlds/test_malicious.py
index 47f0c6b92ca..87ca146ca53 100644
--- a/tests/api_resources/radar/email/security/top/tlds/test_malicious.py
+++ b/tests/api_resources/radar/email/security/top/tlds/test_malicious.py
@@ -29,26 +29,18 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         malicious = client.radar.email.security.top.tlds.malicious.get(
             malicious="MALICIOUS",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
+            arc=["PASS"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dkim=["PASS"],
+            dmarc=["PASS"],
             format="JSON",
-            limit=5,
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
+            limit=1,
+            name=["main_series"],
+            spf=["PASS"],
             tld_category="CLASSIC",
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(MaliciousGetResponse, malicious, path=["response"])
 
@@ -78,7 +70,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncMalicious:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -91,26 +85,18 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         malicious = await async_client.radar.email.security.top.tlds.malicious.get(
             malicious="MALICIOUS",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
+            arc=["PASS"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dkim=["PASS"],
+            dmarc=["PASS"],
             format="JSON",
-            limit=5,
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
+            limit=1,
+            name=["main_series"],
+            spf=["PASS"],
             tld_category="CLASSIC",
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(MaliciousGetResponse, malicious, path=["response"])
 
diff --git a/tests/api_resources/radar/email/security/top/tlds/test_spam.py b/tests/api_resources/radar/email/security/top/tlds/test_spam.py
index d8ea7caf83c..822480259a5 100644
--- a/tests/api_resources/radar/email/security/top/tlds/test_spam.py
+++ b/tests/api_resources/radar/email/security/top/tlds/test_spam.py
@@ -29,26 +29,18 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         spam = client.radar.email.security.top.tlds.spam.get(
             spam="SPAM",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
+            arc=["PASS"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dkim=["PASS"],
+            dmarc=["PASS"],
             format="JSON",
-            limit=5,
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
+            limit=1,
+            name=["main_series"],
+            spf=["PASS"],
             tld_category="CLASSIC",
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(SpamGetResponse, spam, path=["response"])
 
@@ -78,7 +70,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSpam:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -91,26 +85,18 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         spam = await async_client.radar.email.security.top.tlds.spam.get(
             spam="SPAM",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
+            arc=["PASS"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dkim=["PASS"],
+            dmarc=["PASS"],
             format="JSON",
-            limit=5,
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
+            limit=1,
+            name=["main_series"],
+            spf=["PASS"],
             tld_category="CLASSIC",
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(SpamGetResponse, spam, path=["response"])
 
diff --git a/tests/api_resources/radar/email/security/top/tlds/test_spoof.py b/tests/api_resources/radar/email/security/top/tlds/test_spoof.py
index 552471930fd..a253075b2dc 100644
--- a/tests/api_resources/radar/email/security/top/tlds/test_spoof.py
+++ b/tests/api_resources/radar/email/security/top/tlds/test_spoof.py
@@ -29,26 +29,18 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         spoof = client.radar.email.security.top.tlds.spoof.get(
             spoof="SPOOF",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
+            arc=["PASS"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dkim=["PASS"],
+            dmarc=["PASS"],
             format="JSON",
-            limit=5,
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
+            limit=1,
+            name=["main_series"],
+            spf=["PASS"],
             tld_category="CLASSIC",
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(SpoofGetResponse, spoof, path=["response"])
 
@@ -78,7 +70,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSpoof:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -91,26 +85,18 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         spoof = await async_client.radar.email.security.top.tlds.spoof.get(
             spoof="SPOOF",
-            arc=["PASS", "NONE", "FAIL"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            dkim=["PASS", "NONE", "FAIL"],
-            dmarc=["PASS", "NONE", "FAIL"],
+            arc=["PASS"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dkim=["PASS"],
+            dmarc=["PASS"],
             format="JSON",
-            limit=5,
-            name=["string", "string", "string"],
-            spf=["PASS", "NONE", "FAIL"],
+            limit=1,
+            name=["main_series"],
+            spf=["PASS"],
             tld_category="CLASSIC",
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(SpoofGetResponse, spoof, path=["response"])
 
diff --git a/tests/api_resources/radar/email/test_routing.py b/tests/api_resources/radar/email/test_routing.py
new file mode 100644
index 00000000000..a83cecf769b
--- /dev/null
+++ b/tests/api_resources/radar/email/test_routing.py
@@ -0,0 +1,230 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar.email import (
+    RoutingSummaryV2Response,
+    RoutingTimeseriesGroupsV2Response,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestRouting:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_summary_v2(self, client: Cloudflare) -> None:
+        routing = client.radar.email.routing.summary_v2(
+            dimension="IP_VERSION",
+        )
+        assert_matches_type(RoutingSummaryV2Response, routing, path=["response"])
+
+    @parametrize
+    def test_method_summary_v2_with_all_params(self, client: Cloudflare) -> None:
+        routing = client.radar.email.routing.summary_v2(
+            dimension="IP_VERSION",
+            arc=["PASS"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dkim=["PASS"],
+            dmarc=["PASS"],
+            encrypted=["ENCRYPTED"],
+            format="JSON",
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            name=["main_series"],
+            spf=["PASS"],
+        )
+        assert_matches_type(RoutingSummaryV2Response, routing, path=["response"])
+
+    @parametrize
+    def test_raw_response_summary_v2(self, client: Cloudflare) -> None:
+        response = client.radar.email.routing.with_raw_response.summary_v2(
+            dimension="IP_VERSION",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        routing = response.parse()
+        assert_matches_type(RoutingSummaryV2Response, routing, path=["response"])
+
+    @parametrize
+    def test_streaming_response_summary_v2(self, client: Cloudflare) -> None:
+        with client.radar.email.routing.with_streaming_response.summary_v2(
+            dimension="IP_VERSION",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            routing = response.parse()
+            assert_matches_type(RoutingSummaryV2Response, routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        routing = client.radar.email.routing.timeseries_groups_v2(
+            dimension="IP_VERSION",
+        )
+        assert_matches_type(RoutingTimeseriesGroupsV2Response, routing, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_groups_v2_with_all_params(self, client: Cloudflare) -> None:
+        routing = client.radar.email.routing.timeseries_groups_v2(
+            dimension="IP_VERSION",
+            agg_interval="1h",
+            arc=["PASS"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dkim=["PASS"],
+            dmarc=["PASS"],
+            encrypted=["ENCRYPTED"],
+            format="JSON",
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            name=["main_series"],
+            spf=["PASS"],
+        )
+        assert_matches_type(RoutingTimeseriesGroupsV2Response, routing, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        response = client.radar.email.routing.with_raw_response.timeseries_groups_v2(
+            dimension="IP_VERSION",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        routing = response.parse()
+        assert_matches_type(RoutingTimeseriesGroupsV2Response, routing, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        with client.radar.email.routing.with_streaming_response.timeseries_groups_v2(
+            dimension="IP_VERSION",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            routing = response.parse()
+            assert_matches_type(RoutingTimeseriesGroupsV2Response, routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncRouting:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        routing = await async_client.radar.email.routing.summary_v2(
+            dimension="IP_VERSION",
+        )
+        assert_matches_type(RoutingSummaryV2Response, routing, path=["response"])
+
+    @parametrize
+    async def test_method_summary_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        routing = await async_client.radar.email.routing.summary_v2(
+            dimension="IP_VERSION",
+            arc=["PASS"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dkim=["PASS"],
+            dmarc=["PASS"],
+            encrypted=["ENCRYPTED"],
+            format="JSON",
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            name=["main_series"],
+            spf=["PASS"],
+        )
+        assert_matches_type(RoutingSummaryV2Response, routing, path=["response"])
+
+    @parametrize
+    async def test_raw_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.email.routing.with_raw_response.summary_v2(
+            dimension="IP_VERSION",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        routing = await response.parse()
+        assert_matches_type(RoutingSummaryV2Response, routing, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.email.routing.with_streaming_response.summary_v2(
+            dimension="IP_VERSION",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            routing = await response.parse()
+            assert_matches_type(RoutingSummaryV2Response, routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        routing = await async_client.radar.email.routing.timeseries_groups_v2(
+            dimension="IP_VERSION",
+        )
+        assert_matches_type(RoutingTimeseriesGroupsV2Response, routing, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_groups_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        routing = await async_client.radar.email.routing.timeseries_groups_v2(
+            dimension="IP_VERSION",
+            agg_interval="1h",
+            arc=["PASS"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dkim=["PASS"],
+            dmarc=["PASS"],
+            encrypted=["ENCRYPTED"],
+            format="JSON",
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            name=["main_series"],
+            spf=["PASS"],
+        )
+        assert_matches_type(RoutingTimeseriesGroupsV2Response, routing, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.email.routing.with_raw_response.timeseries_groups_v2(
+            dimension="IP_VERSION",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        routing = await response.parse()
+        assert_matches_type(RoutingTimeseriesGroupsV2Response, routing, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.email.routing.with_streaming_response.timeseries_groups_v2(
+            dimension="IP_VERSION",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            routing = await response.parse()
+            assert_matches_type(RoutingTimeseriesGroupsV2Response, routing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/email/test_security.py b/tests/api_resources/radar/email/test_security.py
new file mode 100644
index 00000000000..c21f4513387
--- /dev/null
+++ b/tests/api_resources/radar/email/test_security.py
@@ -0,0 +1,226 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar.email import (
+    SecuritySummaryV2Response,
+    SecurityTimeseriesGroupsV2Response,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSecurity:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_summary_v2(self, client: Cloudflare) -> None:
+        security = client.radar.email.security.summary_v2(
+            dimension="SPAM",
+        )
+        assert_matches_type(SecuritySummaryV2Response, security, path=["response"])
+
+    @parametrize
+    def test_method_summary_v2_with_all_params(self, client: Cloudflare) -> None:
+        security = client.radar.email.security.summary_v2(
+            dimension="SPAM",
+            arc=["PASS"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dkim=["PASS"],
+            dmarc=["PASS"],
+            format="JSON",
+            limit_per_group=10,
+            name=["main_series"],
+            spf=["PASS"],
+            tls_version=["TLSv1_0"],
+        )
+        assert_matches_type(SecuritySummaryV2Response, security, path=["response"])
+
+    @parametrize
+    def test_raw_response_summary_v2(self, client: Cloudflare) -> None:
+        response = client.radar.email.security.with_raw_response.summary_v2(
+            dimension="SPAM",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        security = response.parse()
+        assert_matches_type(SecuritySummaryV2Response, security, path=["response"])
+
+    @parametrize
+    def test_streaming_response_summary_v2(self, client: Cloudflare) -> None:
+        with client.radar.email.security.with_streaming_response.summary_v2(
+            dimension="SPAM",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            security = response.parse()
+            assert_matches_type(SecuritySummaryV2Response, security, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        security = client.radar.email.security.timeseries_groups_v2(
+            dimension="SPAM",
+        )
+        assert_matches_type(SecurityTimeseriesGroupsV2Response, security, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_groups_v2_with_all_params(self, client: Cloudflare) -> None:
+        security = client.radar.email.security.timeseries_groups_v2(
+            dimension="SPAM",
+            agg_interval="1h",
+            arc=["PASS"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dkim=["PASS"],
+            dmarc=["PASS"],
+            format="JSON",
+            limit_per_group=10,
+            name=["main_series"],
+            spf=["PASS"],
+            tls_version=["TLSv1_0"],
+        )
+        assert_matches_type(SecurityTimeseriesGroupsV2Response, security, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        response = client.radar.email.security.with_raw_response.timeseries_groups_v2(
+            dimension="SPAM",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        security = response.parse()
+        assert_matches_type(SecurityTimeseriesGroupsV2Response, security, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        with client.radar.email.security.with_streaming_response.timeseries_groups_v2(
+            dimension="SPAM",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            security = response.parse()
+            assert_matches_type(SecurityTimeseriesGroupsV2Response, security, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncSecurity:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        security = await async_client.radar.email.security.summary_v2(
+            dimension="SPAM",
+        )
+        assert_matches_type(SecuritySummaryV2Response, security, path=["response"])
+
+    @parametrize
+    async def test_method_summary_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        security = await async_client.radar.email.security.summary_v2(
+            dimension="SPAM",
+            arc=["PASS"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dkim=["PASS"],
+            dmarc=["PASS"],
+            format="JSON",
+            limit_per_group=10,
+            name=["main_series"],
+            spf=["PASS"],
+            tls_version=["TLSv1_0"],
+        )
+        assert_matches_type(SecuritySummaryV2Response, security, path=["response"])
+
+    @parametrize
+    async def test_raw_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.email.security.with_raw_response.summary_v2(
+            dimension="SPAM",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        security = await response.parse()
+        assert_matches_type(SecuritySummaryV2Response, security, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.email.security.with_streaming_response.summary_v2(
+            dimension="SPAM",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            security = await response.parse()
+            assert_matches_type(SecuritySummaryV2Response, security, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        security = await async_client.radar.email.security.timeseries_groups_v2(
+            dimension="SPAM",
+        )
+        assert_matches_type(SecurityTimeseriesGroupsV2Response, security, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_groups_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        security = await async_client.radar.email.security.timeseries_groups_v2(
+            dimension="SPAM",
+            agg_interval="1h",
+            arc=["PASS"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dkim=["PASS"],
+            dmarc=["PASS"],
+            format="JSON",
+            limit_per_group=10,
+            name=["main_series"],
+            spf=["PASS"],
+            tls_version=["TLSv1_0"],
+        )
+        assert_matches_type(SecurityTimeseriesGroupsV2Response, security, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.email.security.with_raw_response.timeseries_groups_v2(
+            dimension="SPAM",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        security = await response.parse()
+        assert_matches_type(SecurityTimeseriesGroupsV2Response, security, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.email.security.with_streaming_response.timeseries_groups_v2(
+            dimension="SPAM",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            security = await response.parse()
+            assert_matches_type(SecurityTimeseriesGroupsV2Response, security, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/entities/test_asns.py b/tests/api_resources/radar/entities/test_asns.py
index 78555b0de2d..f5e50b1cce8 100644
--- a/tests/api_resources/radar/entities/test_asns.py
+++ b/tests/api_resources/radar/entities/test_asns.py
@@ -14,6 +14,7 @@
     ASNGetResponse,
     ASNRelResponse,
     ASNListResponse,
+    ASNAsSetResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -32,7 +33,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         asn = client.radar.entities.asns.list(
             asn="174,7922",
             format="JSON",
-            limit=5,
+            limit=1,
             location="US",
             offset=0,
             order_by="ASN",
@@ -59,17 +60,56 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @parametrize
+    def test_method_as_set(self, client: Cloudflare) -> None:
+        asn = client.radar.entities.asns.as_set(
+            asn=3,
+        )
+        assert_matches_type(ASNAsSetResponse, asn, path=["response"])
+
+    @parametrize
+    def test_method_as_set_with_all_params(self, client: Cloudflare) -> None:
+        asn = client.radar.entities.asns.as_set(
+            asn=3,
+            format="JSON",
+        )
+        assert_matches_type(ASNAsSetResponse, asn, path=["response"])
+
+    @parametrize
+    def test_raw_response_as_set(self, client: Cloudflare) -> None:
+        response = client.radar.entities.asns.with_raw_response.as_set(
+            asn=3,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asn = response.parse()
+        assert_matches_type(ASNAsSetResponse, asn, path=["response"])
+
+    @parametrize
+    def test_streaming_response_as_set(self, client: Cloudflare) -> None:
+        with client.radar.entities.asns.with_streaming_response.as_set(
+            asn=3,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asn = response.parse()
+            assert_matches_type(ASNAsSetResponse, asn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         asn = client.radar.entities.asns.get(
-            asn=3,
+            asn=174,
         )
         assert_matches_type(ASNGetResponse, asn, path=["response"])
 
     @parametrize
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         asn = client.radar.entities.asns.get(
-            asn=3,
+            asn=174,
             format="JSON",
         )
         assert_matches_type(ASNGetResponse, asn, path=["response"])
@@ -77,7 +117,7 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.radar.entities.asns.with_raw_response.get(
-            asn=3,
+            asn=174,
         )
 
         assert response.is_closed is True
@@ -88,7 +128,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.radar.entities.asns.with_streaming_response.get(
-            asn=3,
+            asn=174,
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -179,7 +219,9 @@ def test_streaming_response_rel(self, client: Cloudflare) -> None:
 
 
 class TestAsyncASNs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
@@ -191,7 +233,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
         asn = await async_client.radar.entities.asns.list(
             asn="174,7922",
             format="JSON",
-            limit=5,
+            limit=1,
             location="US",
             offset=0,
             order_by="ASN",
@@ -218,17 +260,56 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
 
         assert cast(Any, response.is_closed) is True
 
+    @parametrize
+    async def test_method_as_set(self, async_client: AsyncCloudflare) -> None:
+        asn = await async_client.radar.entities.asns.as_set(
+            asn=3,
+        )
+        assert_matches_type(ASNAsSetResponse, asn, path=["response"])
+
+    @parametrize
+    async def test_method_as_set_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        asn = await async_client.radar.entities.asns.as_set(
+            asn=3,
+            format="JSON",
+        )
+        assert_matches_type(ASNAsSetResponse, asn, path=["response"])
+
+    @parametrize
+    async def test_raw_response_as_set(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.entities.asns.with_raw_response.as_set(
+            asn=3,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asn = await response.parse()
+        assert_matches_type(ASNAsSetResponse, asn, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_as_set(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.entities.asns.with_streaming_response.as_set(
+            asn=3,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asn = await response.parse()
+            assert_matches_type(ASNAsSetResponse, asn, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         asn = await async_client.radar.entities.asns.get(
-            asn=3,
+            asn=174,
         )
         assert_matches_type(ASNGetResponse, asn, path=["response"])
 
     @parametrize
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         asn = await async_client.radar.entities.asns.get(
-            asn=3,
+            asn=174,
             format="JSON",
         )
         assert_matches_type(ASNGetResponse, asn, path=["response"])
@@ -236,7 +317,7 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.radar.entities.asns.with_raw_response.get(
-            asn=3,
+            asn=174,
         )
 
         assert response.is_closed is True
@@ -247,7 +328,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.radar.entities.asns.with_streaming_response.get(
-            asn=3,
+            asn=174,
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
diff --git a/tests/api_resources/radar/entities/test_locations.py b/tests/api_resources/radar/entities/test_locations.py
index b7fedeea1e4..0cf9c0fc608 100644
--- a/tests/api_resources/radar/entities/test_locations.py
+++ b/tests/api_resources/radar/entities/test_locations.py
@@ -29,7 +29,7 @@ def test_method_list(self, client: Cloudflare) -> None:
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         location = client.radar.entities.locations.list(
             format="JSON",
-            limit=5,
+            limit=1,
             location="US,CA",
             offset=0,
         )
@@ -103,7 +103,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncLocations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
@@ -114,7 +116,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         location = await async_client.radar.entities.locations.list(
             format="JSON",
-            limit=5,
+            limit=1,
             location="US,CA",
             offset=0,
         )
diff --git a/tests/api_resources/radar/http/ases/test_bot_class.py b/tests/api_resources/radar/http/ases/test_bot_class.py
index 43dfccdf6fa..2e668c2dad0 100644
--- a/tests/api_resources/radar/http/ases/test_bot_class.py
+++ b/tests/api_resources/radar/http/ases/test_bot_class.py
@@ -29,30 +29,23 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         bot_class = client.radar.http.ases.bot_class.get(
             bot_class="LIKELY_AUTOMATED",
-            asn=["string", "string", "string"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(BotClassGetResponse, bot_class, path=["response"])
 
@@ -82,7 +75,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncBotClass:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -95,30 +90,23 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         bot_class = await async_client.radar.http.ases.bot_class.get(
             bot_class="LIKELY_AUTOMATED",
-            asn=["string", "string", "string"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(BotClassGetResponse, bot_class, path=["response"])
 
diff --git a/tests/api_resources/radar/http/ases/test_browser_family.py b/tests/api_resources/radar/http/ases/test_browser_family.py
index 518b019bc9b..5bead4b6436 100644
--- a/tests/api_resources/radar/http/ases/test_browser_family.py
+++ b/tests/api_resources/radar/http/ases/test_browser_family.py
@@ -29,30 +29,23 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         browser_family = client.radar.http.ases.browser_family.get(
             browser_family="CHROME",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(BrowserFamilyGetResponse, browser_family, path=["response"])
 
@@ -82,7 +75,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncBrowserFamily:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -95,30 +90,23 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         browser_family = await async_client.radar.http.ases.browser_family.get(
             browser_family="CHROME",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(BrowserFamilyGetResponse, browser_family, path=["response"])
 
diff --git a/tests/api_resources/radar/http/ases/test_device_type.py b/tests/api_resources/radar/http/ases/test_device_type.py
index 82a48550643..9392839a473 100644
--- a/tests/api_resources/radar/http/ases/test_device_type.py
+++ b/tests/api_resources/radar/http/ases/test_device_type.py
@@ -29,30 +29,23 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         device_type = client.radar.http.ases.device_type.get(
             device_type="DESKTOP",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(DeviceTypeGetResponse, device_type, path=["response"])
 
@@ -82,7 +75,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncDeviceType:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -95,30 +90,23 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         device_type = await async_client.radar.http.ases.device_type.get(
             device_type="DESKTOP",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(DeviceTypeGetResponse, device_type, path=["response"])
 
diff --git a/tests/api_resources/radar/http/ases/test_http_method.py b/tests/api_resources/radar/http/ases/test_http_method.py
index 69ab4182496..82f32a3bf31 100644
--- a/tests/api_resources/radar/http/ases/test_http_method.py
+++ b/tests/api_resources/radar/http/ases/test_http_method.py
@@ -29,30 +29,23 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         http_method = client.radar.http.ases.http_method.get(
             http_version="HTTPv1",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(HTTPMethodGetResponse, http_method, path=["response"])
 
@@ -82,7 +75,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncHTTPMethod:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -95,30 +90,23 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         http_method = await async_client.radar.http.ases.http_method.get(
             http_version="HTTPv1",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(HTTPMethodGetResponse, http_method, path=["response"])
 
diff --git a/tests/api_resources/radar/http/ases/test_http_protocol.py b/tests/api_resources/radar/http/ases/test_http_protocol.py
index 8651316350b..3324fe25319 100644
--- a/tests/api_resources/radar/http/ases/test_http_protocol.py
+++ b/tests/api_resources/radar/http/ases/test_http_protocol.py
@@ -29,29 +29,23 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         http_protocol = client.radar.http.ases.http_protocol.get(
             http_protocol="HTTP",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(HTTPProtocolGetResponse, http_protocol, path=["response"])
 
@@ -81,7 +75,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncHTTPProtocol:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -94,29 +90,23 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         http_protocol = await async_client.radar.http.ases.http_protocol.get(
             http_protocol="HTTP",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(HTTPProtocolGetResponse, http_protocol, path=["response"])
 
diff --git a/tests/api_resources/radar/http/ases/test_ip_version.py b/tests/api_resources/radar/http/ases/test_ip_version.py
index f9abf302b8a..c2c37db2008 100644
--- a/tests/api_resources/radar/http/ases/test_ip_version.py
+++ b/tests/api_resources/radar/http/ases/test_ip_version.py
@@ -29,30 +29,23 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         ip_version = client.radar.http.ases.ip_version.get(
             ip_version="IPv4",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(IPVersionGetResponse, ip_version, path=["response"])
 
@@ -82,7 +75,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncIPVersion:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -95,30 +90,23 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         ip_version = await async_client.radar.http.ases.ip_version.get(
             ip_version="IPv4",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(IPVersionGetResponse, ip_version, path=["response"])
 
diff --git a/tests/api_resources/radar/http/ases/test_os.py b/tests/api_resources/radar/http/ases/test_os.py
index b06f72f2b6c..c59c8137609 100644
--- a/tests/api_resources/radar/http/ases/test_os.py
+++ b/tests/api_resources/radar/http/ases/test_os.py
@@ -29,30 +29,23 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         os = client.radar.http.ases.os.get(
             os="WINDOWS",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(OSGetResponse, os, path=["response"])
 
@@ -82,7 +75,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncOS:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -95,30 +90,23 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         os = await async_client.radar.http.ases.os.get(
             os="WINDOWS",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(OSGetResponse, os, path=["response"])
 
diff --git a/tests/api_resources/radar/http/ases/test_tls_version.py b/tests/api_resources/radar/http/ases/test_tls_version.py
index 1ee28eb9c84..dd8c1335125 100644
--- a/tests/api_resources/radar/http/ases/test_tls_version.py
+++ b/tests/api_resources/radar/http/ases/test_tls_version.py
@@ -29,30 +29,23 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         tls_version = client.radar.http.ases.tls_version.get(
             tls_version="TLSv1_0",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
         )
         assert_matches_type(TLSVersionGetResponse, tls_version, path=["response"])
 
@@ -82,7 +75,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTLSVersion:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -95,30 +90,23 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         tls_version = await async_client.radar.http.ases.tls_version.get(
             tls_version="TLSv1_0",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
         )
         assert_matches_type(TLSVersionGetResponse, tls_version, path=["response"])
 
diff --git a/tests/api_resources/radar/http/locations/test_bot_class.py b/tests/api_resources/radar/http/locations/test_bot_class.py
index f80aa0f4018..c688003d33c 100644
--- a/tests/api_resources/radar/http/locations/test_bot_class.py
+++ b/tests/api_resources/radar/http/locations/test_bot_class.py
@@ -29,30 +29,23 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         bot_class = client.radar.http.locations.bot_class.get(
             bot_class="LIKELY_AUTOMATED",
-            asn=["string", "string", "string"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(BotClassGetResponse, bot_class, path=["response"])
 
@@ -82,7 +75,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncBotClass:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -95,30 +90,23 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         bot_class = await async_client.radar.http.locations.bot_class.get(
             bot_class="LIKELY_AUTOMATED",
-            asn=["string", "string", "string"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(BotClassGetResponse, bot_class, path=["response"])
 
diff --git a/tests/api_resources/radar/http/locations/test_browser_family.py b/tests/api_resources/radar/http/locations/test_browser_family.py
index 07964a092a1..b5fe5c0a98c 100644
--- a/tests/api_resources/radar/http/locations/test_browser_family.py
+++ b/tests/api_resources/radar/http/locations/test_browser_family.py
@@ -29,30 +29,23 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         browser_family = client.radar.http.locations.browser_family.get(
             browser_family="CHROME",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(BrowserFamilyGetResponse, browser_family, path=["response"])
 
@@ -82,7 +75,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncBrowserFamily:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -95,30 +90,23 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         browser_family = await async_client.radar.http.locations.browser_family.get(
             browser_family="CHROME",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(BrowserFamilyGetResponse, browser_family, path=["response"])
 
diff --git a/tests/api_resources/radar/http/locations/test_device_type.py b/tests/api_resources/radar/http/locations/test_device_type.py
index 15ae343d0f8..68752237105 100644
--- a/tests/api_resources/radar/http/locations/test_device_type.py
+++ b/tests/api_resources/radar/http/locations/test_device_type.py
@@ -29,30 +29,23 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         device_type = client.radar.http.locations.device_type.get(
             device_type="DESKTOP",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(DeviceTypeGetResponse, device_type, path=["response"])
 
@@ -82,7 +75,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncDeviceType:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -95,30 +90,23 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         device_type = await async_client.radar.http.locations.device_type.get(
             device_type="DESKTOP",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(DeviceTypeGetResponse, device_type, path=["response"])
 
diff --git a/tests/api_resources/radar/http/locations/test_http_method.py b/tests/api_resources/radar/http/locations/test_http_method.py
index dd3f53d5eda..0c5e85c4222 100644
--- a/tests/api_resources/radar/http/locations/test_http_method.py
+++ b/tests/api_resources/radar/http/locations/test_http_method.py
@@ -29,30 +29,23 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         http_method = client.radar.http.locations.http_method.get(
             http_version="HTTPv1",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(HTTPMethodGetResponse, http_method, path=["response"])
 
@@ -82,7 +75,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncHTTPMethod:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -95,30 +90,23 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         http_method = await async_client.radar.http.locations.http_method.get(
             http_version="HTTPv1",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(HTTPMethodGetResponse, http_method, path=["response"])
 
diff --git a/tests/api_resources/radar/http/locations/test_http_protocol.py b/tests/api_resources/radar/http/locations/test_http_protocol.py
index 8c5abee1834..cc5277e6ff1 100644
--- a/tests/api_resources/radar/http/locations/test_http_protocol.py
+++ b/tests/api_resources/radar/http/locations/test_http_protocol.py
@@ -29,29 +29,23 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         http_protocol = client.radar.http.locations.http_protocol.get(
             http_protocol="HTTP",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(HTTPProtocolGetResponse, http_protocol, path=["response"])
 
@@ -81,7 +75,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncHTTPProtocol:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -94,29 +90,23 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         http_protocol = await async_client.radar.http.locations.http_protocol.get(
             http_protocol="HTTP",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(HTTPProtocolGetResponse, http_protocol, path=["response"])
 
diff --git a/tests/api_resources/radar/http/locations/test_ip_version.py b/tests/api_resources/radar/http/locations/test_ip_version.py
index 47315faea87..70cb7f49173 100644
--- a/tests/api_resources/radar/http/locations/test_ip_version.py
+++ b/tests/api_resources/radar/http/locations/test_ip_version.py
@@ -29,30 +29,23 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         ip_version = client.radar.http.locations.ip_version.get(
             ip_version="IPv4",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(IPVersionGetResponse, ip_version, path=["response"])
 
@@ -82,7 +75,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncIPVersion:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -95,30 +90,23 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         ip_version = await async_client.radar.http.locations.ip_version.get(
             ip_version="IPv4",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(IPVersionGetResponse, ip_version, path=["response"])
 
diff --git a/tests/api_resources/radar/http/locations/test_os.py b/tests/api_resources/radar/http/locations/test_os.py
index 2006ca10d2d..75d9ec359a0 100644
--- a/tests/api_resources/radar/http/locations/test_os.py
+++ b/tests/api_resources/radar/http/locations/test_os.py
@@ -29,30 +29,23 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         os = client.radar.http.locations.os.get(
             os="WINDOWS",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(OSGetResponse, os, path=["response"])
 
@@ -82,7 +75,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncOS:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -95,30 +90,23 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         os = await async_client.radar.http.locations.os.get(
             os="WINDOWS",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(OSGetResponse, os, path=["response"])
 
diff --git a/tests/api_resources/radar/http/locations/test_tls_version.py b/tests/api_resources/radar/http/locations/test_tls_version.py
index af160f32587..b4fc1ca0a5b 100644
--- a/tests/api_resources/radar/http/locations/test_tls_version.py
+++ b/tests/api_resources/radar/http/locations/test_tls_version.py
@@ -29,30 +29,23 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         tls_version = client.radar.http.locations.tls_version.get(
             tls_version="TLSv1_0",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
         )
         assert_matches_type(TLSVersionGetResponse, tls_version, path=["response"])
 
@@ -82,7 +75,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTLSVersion:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -95,30 +90,23 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         tls_version = await async_client.radar.http.locations.tls_version.get(
             tls_version="TLSv1_0",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
         )
         assert_matches_type(TLSVersionGetResponse, tls_version, path=["response"])
 
diff --git a/tests/api_resources/radar/http/test_ases.py b/tests/api_resources/radar/http/test_ases.py
index 08c4f0dfda5..c580afec08a 100644
--- a/tests/api_resources/radar/http/test_ases.py
+++ b/tests/api_resources/radar/http/test_ases.py
@@ -26,31 +26,24 @@ def test_method_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         ase = client.radar.http.ases.get(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(AseGetResponse, ase, path=["response"])
 
@@ -76,7 +69,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncAses:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -86,31 +81,24 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         ase = await async_client.radar.http.ases.get(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(AseGetResponse, ase, path=["response"])
 
diff --git a/tests/api_resources/radar/http/test_locations.py b/tests/api_resources/radar/http/test_locations.py
index e609c513b72..2dd3eb7fc3c 100644
--- a/tests/api_resources/radar/http/test_locations.py
+++ b/tests/api_resources/radar/http/test_locations.py
@@ -26,31 +26,24 @@ def test_method_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         location = client.radar.http.locations.get(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(LocationGetResponse, location, path=["response"])
 
@@ -76,7 +69,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncLocations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -86,31 +81,24 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         location = await async_client.radar.http.locations.get(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(LocationGetResponse, location, path=["response"])
 
diff --git a/tests/api_resources/radar/http/test_summary.py b/tests/api_resources/radar/http/test_summary.py
index 8beb2d1d8cf..2b7eeffce60 100644
--- a/tests/api_resources/radar/http/test_summary.py
+++ b/tests/api_resources/radar/http/test_summary.py
@@ -21,6 +21,8 @@
     SummaryHTTPProtocolResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -29,40 +31,39 @@ class TestSummary:
 
     @parametrize
     def test_method_bot_class(self, client: Cloudflare) -> None:
-        summary = client.radar.http.summary.bot_class()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.http.summary.bot_class()
+
         assert_matches_type(SummaryBotClassResponse, summary, path=["response"])
 
     @parametrize
     def test_method_bot_class_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.http.summary.bot_class(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.http.summary.bot_class(
+                asn=["string"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryBotClassResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_bot_class(self, client: Cloudflare) -> None:
-        response = client.radar.http.summary.with_raw_response.bot_class()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.summary.with_raw_response.bot_class()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -71,51 +72,51 @@ def test_raw_response_bot_class(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_bot_class(self, client: Cloudflare) -> None:
-        with client.radar.http.summary.with_streaming_response.bot_class() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.summary.with_streaming_response.bot_class() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryBotClassResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryBotClassResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_device_type(self, client: Cloudflare) -> None:
-        summary = client.radar.http.summary.device_type()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.http.summary.device_type()
+
         assert_matches_type(SummaryDeviceTypeResponse, summary, path=["response"])
 
     @parametrize
     def test_method_device_type_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.http.summary.device_type(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.http.summary.device_type(
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryDeviceTypeResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_device_type(self, client: Cloudflare) -> None:
-        response = client.radar.http.summary.with_raw_response.device_type()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.summary.with_raw_response.device_type()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -124,51 +125,51 @@ def test_raw_response_device_type(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_device_type(self, client: Cloudflare) -> None:
-        with client.radar.http.summary.with_streaming_response.device_type() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.summary.with_streaming_response.device_type() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryDeviceTypeResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryDeviceTypeResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_http_protocol(self, client: Cloudflare) -> None:
-        summary = client.radar.http.summary.http_protocol()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.http.summary.http_protocol()
+
         assert_matches_type(SummaryHTTPProtocolResponse, summary, path=["response"])
 
     @parametrize
     def test_method_http_protocol_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.http.summary.http_protocol(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.http.summary.http_protocol(
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryHTTPProtocolResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_http_protocol(self, client: Cloudflare) -> None:
-        response = client.radar.http.summary.with_raw_response.http_protocol()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.summary.with_raw_response.http_protocol()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -177,51 +178,51 @@ def test_raw_response_http_protocol(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_http_protocol(self, client: Cloudflare) -> None:
-        with client.radar.http.summary.with_streaming_response.http_protocol() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.summary.with_streaming_response.http_protocol() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryHTTPProtocolResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryHTTPProtocolResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_http_version(self, client: Cloudflare) -> None:
-        summary = client.radar.http.summary.http_version()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.http.summary.http_version()
+
         assert_matches_type(SummaryHTTPVersionResponse, summary, path=["response"])
 
     @parametrize
     def test_method_http_version_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.http.summary.http_version(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.http.summary.http_version(
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryHTTPVersionResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_http_version(self, client: Cloudflare) -> None:
-        response = client.radar.http.summary.with_raw_response.http_version()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.summary.with_raw_response.http_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -230,51 +231,51 @@ def test_raw_response_http_version(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_http_version(self, client: Cloudflare) -> None:
-        with client.radar.http.summary.with_streaming_response.http_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.summary.with_streaming_response.http_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryHTTPVersionResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryHTTPVersionResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_ip_version(self, client: Cloudflare) -> None:
-        summary = client.radar.http.summary.ip_version()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.http.summary.ip_version()
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     def test_method_ip_version_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.http.summary.ip_version(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.http.summary.ip_version(
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_ip_version(self, client: Cloudflare) -> None:
-        response = client.radar.http.summary.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.summary.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -283,51 +284,51 @@ def test_raw_response_ip_version(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_ip_version(self, client: Cloudflare) -> None:
-        with client.radar.http.summary.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.summary.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_os(self, client: Cloudflare) -> None:
-        summary = client.radar.http.summary.os()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.http.summary.os()
+
         assert_matches_type(SummaryOSResponse, summary, path=["response"])
 
     @parametrize
     def test_method_os_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.http.summary.os(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.http.summary.os(
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryOSResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_os(self, client: Cloudflare) -> None:
-        response = client.radar.http.summary.with_raw_response.os()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.summary.with_raw_response.os()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -336,52 +337,52 @@ def test_raw_response_os(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_os(self, client: Cloudflare) -> None:
-        with client.radar.http.summary.with_streaming_response.os() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.summary.with_streaming_response.os() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryOSResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryOSResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_post_quantum(self, client: Cloudflare) -> None:
-        summary = client.radar.http.summary.post_quantum()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.http.summary.post_quantum()
+
         assert_matches_type(SummaryPostQuantumResponse, summary, path=["response"])
 
     @parametrize
     def test_method_post_quantum_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.http.summary.post_quantum(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.http.summary.post_quantum(
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryPostQuantumResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_post_quantum(self, client: Cloudflare) -> None:
-        response = client.radar.http.summary.with_raw_response.post_quantum()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.summary.with_raw_response.post_quantum()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -390,51 +391,51 @@ def test_raw_response_post_quantum(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_post_quantum(self, client: Cloudflare) -> None:
-        with client.radar.http.summary.with_streaming_response.post_quantum() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.summary.with_streaming_response.post_quantum() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryPostQuantumResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryPostQuantumResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_tls_version(self, client: Cloudflare) -> None:
-        summary = client.radar.http.summary.tls_version()
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.http.summary.tls_version()
+
         assert_matches_type(SummaryTLSVersionResponse, summary, path=["response"])
 
     @parametrize
     def test_method_tls_version_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.radar.http.summary.tls_version(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.http.summary.tls_version(
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+            )
+
         assert_matches_type(SummaryTLSVersionResponse, summary, path=["response"])
 
     @parametrize
     def test_raw_response_tls_version(self, client: Cloudflare) -> None:
-        response = client.radar.http.summary.with_raw_response.tls_version()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.summary.with_raw_response.tls_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -443,55 +444,57 @@ def test_raw_response_tls_version(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_tls_version(self, client: Cloudflare) -> None:
-        with client.radar.http.summary.with_streaming_response.tls_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.summary.with_streaming_response.tls_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = response.parse()
-            assert_matches_type(SummaryTLSVersionResponse, summary, path=["response"])
+                summary = response.parse()
+                assert_matches_type(SummaryTLSVersionResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncSummary:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_bot_class(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.http.summary.bot_class()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.http.summary.bot_class()
+
         assert_matches_type(SummaryBotClassResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_bot_class_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.http.summary.bot_class(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.http.summary.bot_class(
+                asn=["string"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryBotClassResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_bot_class(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.summary.with_raw_response.bot_class()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.summary.with_raw_response.bot_class()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -500,51 +503,51 @@ async def test_raw_response_bot_class(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_streaming_response_bot_class(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.summary.with_streaming_response.bot_class() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.summary.with_streaming_response.bot_class() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryBotClassResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryBotClassResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_device_type(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.http.summary.device_type()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.http.summary.device_type()
+
         assert_matches_type(SummaryDeviceTypeResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_device_type_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.http.summary.device_type(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.http.summary.device_type(
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryDeviceTypeResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_device_type(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.summary.with_raw_response.device_type()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.summary.with_raw_response.device_type()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -553,51 +556,51 @@ async def test_raw_response_device_type(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_streaming_response_device_type(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.summary.with_streaming_response.device_type() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.summary.with_streaming_response.device_type() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryDeviceTypeResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryDeviceTypeResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_http_protocol(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.http.summary.http_protocol()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.http.summary.http_protocol()
+
         assert_matches_type(SummaryHTTPProtocolResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_http_protocol_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.http.summary.http_protocol(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.http.summary.http_protocol(
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryHTTPProtocolResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_http_protocol(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.summary.with_raw_response.http_protocol()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.summary.with_raw_response.http_protocol()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -606,51 +609,51 @@ async def test_raw_response_http_protocol(self, async_client: AsyncCloudflare) -
 
     @parametrize
     async def test_streaming_response_http_protocol(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.summary.with_streaming_response.http_protocol() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.summary.with_streaming_response.http_protocol() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryHTTPProtocolResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryHTTPProtocolResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_http_version(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.http.summary.http_version()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.http.summary.http_version()
+
         assert_matches_type(SummaryHTTPVersionResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_http_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.http.summary.http_version(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.http.summary.http_version(
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryHTTPVersionResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_http_version(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.summary.with_raw_response.http_version()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.summary.with_raw_response.http_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -659,51 +662,51 @@ async def test_raw_response_http_version(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_streaming_response_http_version(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.summary.with_streaming_response.http_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.summary.with_streaming_response.http_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryHTTPVersionResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryHTTPVersionResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_ip_version(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.http.summary.ip_version()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.http.summary.ip_version()
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_ip_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.http.summary.ip_version(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.http.summary.ip_version(
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.summary.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.summary.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -712,51 +715,51 @@ async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_streaming_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.summary.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.summary.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryIPVersionResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_os(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.http.summary.os()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.http.summary.os()
+
         assert_matches_type(SummaryOSResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_os_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.http.summary.os(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.http.summary.os(
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryOSResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_os(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.summary.with_raw_response.os()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.summary.with_raw_response.os()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -765,52 +768,52 @@ async def test_raw_response_os(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_os(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.summary.with_streaming_response.os() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.summary.with_streaming_response.os() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryOSResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryOSResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_post_quantum(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.http.summary.post_quantum()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.http.summary.post_quantum()
+
         assert_matches_type(SummaryPostQuantumResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_post_quantum_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.http.summary.post_quantum(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.http.summary.post_quantum(
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(SummaryPostQuantumResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_post_quantum(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.summary.with_raw_response.post_quantum()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.summary.with_raw_response.post_quantum()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -819,51 +822,51 @@ async def test_raw_response_post_quantum(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_streaming_response_post_quantum(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.summary.with_streaming_response.post_quantum() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.summary.with_streaming_response.post_quantum() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryPostQuantumResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryPostQuantumResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_tls_version(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.http.summary.tls_version()
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.http.summary.tls_version()
+
         assert_matches_type(SummaryTLSVersionResponse, summary, path=["response"])
 
     @parametrize
     async def test_method_tls_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.radar.http.summary.tls_version(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-        )
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.http.summary.tls_version(
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+            )
+
         assert_matches_type(SummaryTLSVersionResponse, summary, path=["response"])
 
     @parametrize
     async def test_raw_response_tls_version(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.summary.with_raw_response.tls_version()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.summary.with_raw_response.tls_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -872,11 +875,12 @@ async def test_raw_response_tls_version(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_streaming_response_tls_version(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.summary.with_streaming_response.tls_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.summary.with_streaming_response.tls_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            summary = await response.parse()
-            assert_matches_type(SummaryTLSVersionResponse, summary, path=["response"])
+                summary = await response.parse()
+                assert_matches_type(SummaryTLSVersionResponse, summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/http/test_timeseries_groups.py b/tests/api_resources/radar/http/test_timeseries_groups.py
index 443a3efbddd..4582362590d 100644
--- a/tests/api_resources/radar/http/test_timeseries_groups.py
+++ b/tests/api_resources/radar/http/test_timeseries_groups.py
@@ -23,6 +23,8 @@
     TimeseriesGroupBrowserFamilyResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -31,41 +33,40 @@ class TestTimeseriesGroups:
 
     @parametrize
     def test_method_bot_class(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.bot_class()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.bot_class()
+
         assert_matches_type(TimeseriesGroupBotClassResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_bot_class_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.bot_class(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.bot_class(
+                agg_interval="1h",
+                asn=["string"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupBotClassResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_bot_class(self, client: Cloudflare) -> None:
-        response = client.radar.http.timeseries_groups.with_raw_response.bot_class()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.timeseries_groups.with_raw_response.bot_class()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -74,54 +75,54 @@ def test_raw_response_bot_class(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_bot_class(self, client: Cloudflare) -> None:
-        with client.radar.http.timeseries_groups.with_streaming_response.bot_class() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.timeseries_groups.with_streaming_response.bot_class() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupBotClassResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupBotClassResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_browser(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.browser()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.browser()
+
         assert_matches_type(TimeseriesGroupBrowserResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_browser_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.browser(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit_per_group=4,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.browser(
+                agg_interval="1h",
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupBrowserResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_browser(self, client: Cloudflare) -> None:
-        response = client.radar.http.timeseries_groups.with_raw_response.browser()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.timeseries_groups.with_raw_response.browser()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -130,53 +131,53 @@ def test_raw_response_browser(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_browser(self, client: Cloudflare) -> None:
-        with client.radar.http.timeseries_groups.with_streaming_response.browser() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.timeseries_groups.with_streaming_response.browser() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupBrowserResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupBrowserResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_browser_family(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.browser_family()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.browser_family()
+
         assert_matches_type(TimeseriesGroupBrowserFamilyResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_browser_family_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.browser_family(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.browser_family(
+                agg_interval="1h",
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupBrowserFamilyResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_browser_family(self, client: Cloudflare) -> None:
-        response = client.radar.http.timeseries_groups.with_raw_response.browser_family()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.timeseries_groups.with_raw_response.browser_family()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -185,52 +186,52 @@ def test_raw_response_browser_family(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_browser_family(self, client: Cloudflare) -> None:
-        with client.radar.http.timeseries_groups.with_streaming_response.browser_family() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.timeseries_groups.with_streaming_response.browser_family() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupBrowserFamilyResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupBrowserFamilyResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_device_type(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.device_type()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.device_type()
+
         assert_matches_type(TimeseriesGroupDeviceTypeResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_device_type_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.device_type(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.device_type(
+                agg_interval="1h",
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupDeviceTypeResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_device_type(self, client: Cloudflare) -> None:
-        response = client.radar.http.timeseries_groups.with_raw_response.device_type()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.timeseries_groups.with_raw_response.device_type()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -239,52 +240,52 @@ def test_raw_response_device_type(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_device_type(self, client: Cloudflare) -> None:
-        with client.radar.http.timeseries_groups.with_streaming_response.device_type() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.timeseries_groups.with_streaming_response.device_type() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupDeviceTypeResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupDeviceTypeResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_http_protocol(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.http_protocol()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.http_protocol()
+
         assert_matches_type(TimeseriesGroupHTTPProtocolResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_http_protocol_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.http_protocol(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.http_protocol(
+                agg_interval="1h",
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupHTTPProtocolResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_http_protocol(self, client: Cloudflare) -> None:
-        response = client.radar.http.timeseries_groups.with_raw_response.http_protocol()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.timeseries_groups.with_raw_response.http_protocol()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -293,52 +294,52 @@ def test_raw_response_http_protocol(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_http_protocol(self, client: Cloudflare) -> None:
-        with client.radar.http.timeseries_groups.with_streaming_response.http_protocol() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.timeseries_groups.with_streaming_response.http_protocol() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupHTTPProtocolResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupHTTPProtocolResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_http_version(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.http_version()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.http_version()
+
         assert_matches_type(TimeseriesGroupHTTPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_http_version_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.http_version(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.http_version(
+                agg_interval="1h",
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupHTTPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_http_version(self, client: Cloudflare) -> None:
-        response = client.radar.http.timeseries_groups.with_raw_response.http_version()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.timeseries_groups.with_raw_response.http_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -347,52 +348,52 @@ def test_raw_response_http_version(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_http_version(self, client: Cloudflare) -> None:
-        with client.radar.http.timeseries_groups.with_streaming_response.http_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.timeseries_groups.with_streaming_response.http_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupHTTPVersionResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupHTTPVersionResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_ip_version(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.ip_version()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.ip_version()
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_ip_version_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.ip_version(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.ip_version(
+                agg_interval="1h",
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_ip_version(self, client: Cloudflare) -> None:
-        response = client.radar.http.timeseries_groups.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.timeseries_groups.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -401,52 +402,52 @@ def test_raw_response_ip_version(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_ip_version(self, client: Cloudflare) -> None:
-        with client.radar.http.timeseries_groups.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.timeseries_groups.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_os(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.os()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.os()
+
         assert_matches_type(TimeseriesGroupOSResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_os_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.os(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.os(
+                agg_interval="1h",
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupOSResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_os(self, client: Cloudflare) -> None:
-        response = client.radar.http.timeseries_groups.with_raw_response.os()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.timeseries_groups.with_raw_response.os()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -455,53 +456,53 @@ def test_raw_response_os(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_os(self, client: Cloudflare) -> None:
-        with client.radar.http.timeseries_groups.with_streaming_response.os() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.timeseries_groups.with_streaming_response.os() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupOSResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupOSResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_post_quantum(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.post_quantum()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.post_quantum()
+
         assert_matches_type(TimeseriesGroupPostQuantumResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_post_quantum_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.post_quantum(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.post_quantum(
+                agg_interval="1h",
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupPostQuantumResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_post_quantum(self, client: Cloudflare) -> None:
-        response = client.radar.http.timeseries_groups.with_raw_response.post_quantum()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.timeseries_groups.with_raw_response.post_quantum()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -510,52 +511,52 @@ def test_raw_response_post_quantum(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_post_quantum(self, client: Cloudflare) -> None:
-        with client.radar.http.timeseries_groups.with_streaming_response.post_quantum() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.timeseries_groups.with_streaming_response.post_quantum() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupPostQuantumResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupPostQuantumResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_tls_version(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.tls_version()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.tls_version()
+
         assert_matches_type(TimeseriesGroupTLSVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_method_tls_version_with_all_params(self, client: Cloudflare) -> None:
-        timeseries_group = client.radar.http.timeseries_groups.tls_version(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.http.timeseries_groups.tls_version(
+                agg_interval="1h",
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+            )
+
         assert_matches_type(TimeseriesGroupTLSVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     def test_raw_response_tls_version(self, client: Cloudflare) -> None:
-        response = client.radar.http.timeseries_groups.with_raw_response.tls_version()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.timeseries_groups.with_raw_response.tls_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -564,56 +565,58 @@ def test_raw_response_tls_version(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_tls_version(self, client: Cloudflare) -> None:
-        with client.radar.http.timeseries_groups.with_streaming_response.tls_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.timeseries_groups.with_streaming_response.tls_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = response.parse()
-            assert_matches_type(TimeseriesGroupTLSVersionResponse, timeseries_group, path=["response"])
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupTLSVersionResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncTimeseriesGroups:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_bot_class(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.bot_class()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.bot_class()
+
         assert_matches_type(TimeseriesGroupBotClassResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_bot_class_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.bot_class(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.bot_class(
+                agg_interval="1h",
+                asn=["string"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupBotClassResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_bot_class(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.timeseries_groups.with_raw_response.bot_class()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.timeseries_groups.with_raw_response.bot_class()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -622,54 +625,54 @@ async def test_raw_response_bot_class(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_streaming_response_bot_class(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.timeseries_groups.with_streaming_response.bot_class() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.timeseries_groups.with_streaming_response.bot_class() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupBotClassResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupBotClassResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_browser(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.browser()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.browser()
+
         assert_matches_type(TimeseriesGroupBrowserResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_browser_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.browser(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit_per_group=4,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.browser(
+                agg_interval="1h",
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupBrowserResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_browser(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.timeseries_groups.with_raw_response.browser()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.timeseries_groups.with_raw_response.browser()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -678,53 +681,53 @@ async def test_raw_response_browser(self, async_client: AsyncCloudflare) -> None
 
     @parametrize
     async def test_streaming_response_browser(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.timeseries_groups.with_streaming_response.browser() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.timeseries_groups.with_streaming_response.browser() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupBrowserResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupBrowserResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_browser_family(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.browser_family()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.browser_family()
+
         assert_matches_type(TimeseriesGroupBrowserFamilyResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_browser_family_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.browser_family(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.browser_family(
+                agg_interval="1h",
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit_per_group=10,
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupBrowserFamilyResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_browser_family(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.timeseries_groups.with_raw_response.browser_family()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.timeseries_groups.with_raw_response.browser_family()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -733,52 +736,52 @@ async def test_raw_response_browser_family(self, async_client: AsyncCloudflare)
 
     @parametrize
     async def test_streaming_response_browser_family(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.timeseries_groups.with_streaming_response.browser_family() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.timeseries_groups.with_streaming_response.browser_family() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupBrowserFamilyResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupBrowserFamilyResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_device_type(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.device_type()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.device_type()
+
         assert_matches_type(TimeseriesGroupDeviceTypeResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_device_type_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.device_type(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.device_type(
+                agg_interval="1h",
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupDeviceTypeResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_device_type(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.timeseries_groups.with_raw_response.device_type()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.timeseries_groups.with_raw_response.device_type()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -787,52 +790,52 @@ async def test_raw_response_device_type(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_streaming_response_device_type(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.timeseries_groups.with_streaming_response.device_type() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.timeseries_groups.with_streaming_response.device_type() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupDeviceTypeResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupDeviceTypeResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_http_protocol(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.http_protocol()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.http_protocol()
+
         assert_matches_type(TimeseriesGroupHTTPProtocolResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_http_protocol_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.http_protocol(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.http_protocol(
+                agg_interval="1h",
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupHTTPProtocolResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_http_protocol(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.timeseries_groups.with_raw_response.http_protocol()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.timeseries_groups.with_raw_response.http_protocol()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -841,52 +844,52 @@ async def test_raw_response_http_protocol(self, async_client: AsyncCloudflare) -
 
     @parametrize
     async def test_streaming_response_http_protocol(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.timeseries_groups.with_streaming_response.http_protocol() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.timeseries_groups.with_streaming_response.http_protocol() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupHTTPProtocolResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupHTTPProtocolResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_http_version(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.http_version()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.http_version()
+
         assert_matches_type(TimeseriesGroupHTTPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_http_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.http_version(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.http_version(
+                agg_interval="1h",
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupHTTPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_http_version(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.timeseries_groups.with_raw_response.http_version()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.timeseries_groups.with_raw_response.http_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -895,52 +898,52 @@ async def test_raw_response_http_version(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_streaming_response_http_version(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.timeseries_groups.with_streaming_response.http_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.timeseries_groups.with_streaming_response.http_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupHTTPVersionResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupHTTPVersionResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_ip_version(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.ip_version()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.ip_version()
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_ip_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.ip_version(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.ip_version(
+                agg_interval="1h",
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.timeseries_groups.with_raw_response.ip_version()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.timeseries_groups.with_raw_response.ip_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -949,52 +952,52 @@ async def test_raw_response_ip_version(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_streaming_response_ip_version(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.timeseries_groups.with_streaming_response.ip_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.timeseries_groups.with_streaming_response.ip_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupIPVersionResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_os(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.os()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.os()
+
         assert_matches_type(TimeseriesGroupOSResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_os_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.os(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.os(
+                agg_interval="1h",
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupOSResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_os(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.timeseries_groups.with_raw_response.os()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.timeseries_groups.with_raw_response.os()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -1003,53 +1006,53 @@ async def test_raw_response_os(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_os(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.timeseries_groups.with_streaming_response.os() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.timeseries_groups.with_streaming_response.os() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupOSResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupOSResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_post_quantum(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.post_quantum()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.post_quantum()
+
         assert_matches_type(TimeseriesGroupPostQuantumResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_post_quantum_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.post_quantum(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.post_quantum(
+                agg_interval="1h",
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
         assert_matches_type(TimeseriesGroupPostQuantumResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_post_quantum(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.timeseries_groups.with_raw_response.post_quantum()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.timeseries_groups.with_raw_response.post_quantum()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -1058,52 +1061,52 @@ async def test_raw_response_post_quantum(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_streaming_response_post_quantum(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.timeseries_groups.with_streaming_response.post_quantum() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.timeseries_groups.with_streaming_response.post_quantum() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupPostQuantumResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupPostQuantumResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_tls_version(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.tls_version()
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.tls_version()
+
         assert_matches_type(TimeseriesGroupTLSVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_method_tls_version_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        timeseries_group = await async_client.radar.http.timeseries_groups.tls_version(
-            agg_interval="1h",
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-        )
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.http.timeseries_groups.tls_version(
+                agg_interval="1h",
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+            )
+
         assert_matches_type(TimeseriesGroupTLSVersionResponse, timeseries_group, path=["response"])
 
     @parametrize
     async def test_raw_response_tls_version(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.timeseries_groups.with_raw_response.tls_version()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.timeseries_groups.with_raw_response.tls_version()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -1112,11 +1115,12 @@ async def test_raw_response_tls_version(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_streaming_response_tls_version(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.timeseries_groups.with_streaming_response.tls_version() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.timeseries_groups.with_streaming_response.tls_version() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            timeseries_group = await response.parse()
-            assert_matches_type(TimeseriesGroupTLSVersionResponse, timeseries_group, path=["response"])
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupTLSVersionResponse, timeseries_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/http/test_top.py b/tests/api_resources/radar/http/test_top.py
index a25ea7b57e8..943678b69ce 100644
--- a/tests/api_resources/radar/http/test_top.py
+++ b/tests/api_resources/radar/http/test_top.py
@@ -11,10 +11,12 @@
 from tests.utils import assert_matches_type
 from cloudflare._utils import parse_datetime
 from cloudflare.types.radar.http import (
-    TopBrowsersResponse,
-    TopBrowserFamiliesResponse,
+    TopBrowserResponse,
+    TopBrowserFamilyResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -22,229 +24,225 @@ class TestTop:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
     @parametrize
-    def test_method_browser_families(self, client: Cloudflare) -> None:
-        top = client.radar.http.top.browser_families()
-        assert_matches_type(TopBrowserFamiliesResponse, top, path=["response"])
-
-    @parametrize
-    def test_method_browser_families_with_all_params(self, client: Cloudflare) -> None:
-        top = client.radar.http.top.browser_families(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
-        assert_matches_type(TopBrowserFamiliesResponse, top, path=["response"])
-
-    @parametrize
-    def test_raw_response_browser_families(self, client: Cloudflare) -> None:
-        response = client.radar.http.top.with_raw_response.browser_families()
+    def test_method_browser(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            top = client.radar.http.top.browser()
+
+        assert_matches_type(TopBrowserResponse, top, path=["response"])
+
+    @parametrize
+    def test_method_browser_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            top = client.radar.http.top.browser(
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit=1,
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
+        assert_matches_type(TopBrowserResponse, top, path=["response"])
+
+    @parametrize
+    def test_raw_response_browser(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.top.with_raw_response.browser()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         top = response.parse()
-        assert_matches_type(TopBrowserFamiliesResponse, top, path=["response"])
+        assert_matches_type(TopBrowserResponse, top, path=["response"])
 
     @parametrize
-    def test_streaming_response_browser_families(self, client: Cloudflare) -> None:
-        with client.radar.http.top.with_streaming_response.browser_families() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+    def test_streaming_response_browser(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.top.with_streaming_response.browser() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            top = response.parse()
-            assert_matches_type(TopBrowserFamiliesResponse, top, path=["response"])
+                top = response.parse()
+                assert_matches_type(TopBrowserResponse, top, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    def test_method_browsers(self, client: Cloudflare) -> None:
-        top = client.radar.http.top.browsers()
-        assert_matches_type(TopBrowsersResponse, top, path=["response"])
-
-    @parametrize
-    def test_method_browsers_with_all_params(self, client: Cloudflare) -> None:
-        top = client.radar.http.top.browsers(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
-        assert_matches_type(TopBrowsersResponse, top, path=["response"])
-
-    @parametrize
-    def test_raw_response_browsers(self, client: Cloudflare) -> None:
-        response = client.radar.http.top.with_raw_response.browsers()
+    def test_method_browser_family(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            top = client.radar.http.top.browser_family()
+
+        assert_matches_type(TopBrowserFamilyResponse, top, path=["response"])
+
+    @parametrize
+    def test_method_browser_family_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            top = client.radar.http.top.browser_family(
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit=1,
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
+        assert_matches_type(TopBrowserFamilyResponse, top, path=["response"])
+
+    @parametrize
+    def test_raw_response_browser_family(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.http.top.with_raw_response.browser_family()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         top = response.parse()
-        assert_matches_type(TopBrowsersResponse, top, path=["response"])
+        assert_matches_type(TopBrowserFamilyResponse, top, path=["response"])
 
     @parametrize
-    def test_streaming_response_browsers(self, client: Cloudflare) -> None:
-        with client.radar.http.top.with_streaming_response.browsers() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+    def test_streaming_response_browser_family(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.http.top.with_streaming_response.browser_family() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            top = response.parse()
-            assert_matches_type(TopBrowsersResponse, top, path=["response"])
+                top = response.parse()
+                assert_matches_type(TopBrowserFamilyResponse, top, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncTop:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_browser_families(self, async_client: AsyncCloudflare) -> None:
-        top = await async_client.radar.http.top.browser_families()
-        assert_matches_type(TopBrowserFamiliesResponse, top, path=["response"])
-
-    @parametrize
-    async def test_method_browser_families_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        top = await async_client.radar.http.top.browser_families(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
-        assert_matches_type(TopBrowserFamiliesResponse, top, path=["response"])
-
-    @parametrize
-    async def test_raw_response_browser_families(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.top.with_raw_response.browser_families()
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_browser(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            top = await async_client.radar.http.top.browser()
+
+        assert_matches_type(TopBrowserResponse, top, path=["response"])
+
+    @parametrize
+    async def test_method_browser_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            top = await async_client.radar.http.top.browser(
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                browser_family=["CHROME"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit=1,
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
+        assert_matches_type(TopBrowserResponse, top, path=["response"])
+
+    @parametrize
+    async def test_raw_response_browser(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.top.with_raw_response.browser()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         top = await response.parse()
-        assert_matches_type(TopBrowserFamiliesResponse, top, path=["response"])
+        assert_matches_type(TopBrowserResponse, top, path=["response"])
 
     @parametrize
-    async def test_streaming_response_browser_families(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.top.with_streaming_response.browser_families() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+    async def test_streaming_response_browser(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.top.with_streaming_response.browser() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            top = await response.parse()
-            assert_matches_type(TopBrowserFamiliesResponse, top, path=["response"])
+                top = await response.parse()
+                assert_matches_type(TopBrowserResponse, top, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    async def test_method_browsers(self, async_client: AsyncCloudflare) -> None:
-        top = await async_client.radar.http.top.browsers()
-        assert_matches_type(TopBrowsersResponse, top, path=["response"])
-
-    @parametrize
-    async def test_method_browsers_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        top = await async_client.radar.http.top.browsers(
-            asn=["string", "string", "string"],
-            bot_class=["LIKELY_AUTOMATED", "LIKELY_HUMAN"],
-            browser_family=["CHROME", "EDGE", "FIREFOX"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            device_type=["DESKTOP", "MOBILE", "OTHER"],
-            format="JSON",
-            http_protocol=["HTTP", "HTTPS"],
-            http_version=["HTTPv1", "HTTPv2", "HTTPv3"],
-            ip_version=["IPv4", "IPv6"],
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-            os=["WINDOWS", "MACOSX", "IOS"],
-            tls_version=["TLSv1_0", "TLSv1_1", "TLSv1_2"],
-        )
-        assert_matches_type(TopBrowsersResponse, top, path=["response"])
-
-    @parametrize
-    async def test_raw_response_browsers(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.http.top.with_raw_response.browsers()
+    async def test_method_browser_family(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            top = await async_client.radar.http.top.browser_family()
+
+        assert_matches_type(TopBrowserFamilyResponse, top, path=["response"])
+
+    @parametrize
+    async def test_method_browser_family_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            top = await async_client.radar.http.top.browser_family(
+                asn=["string"],
+                bot_class=["LIKELY_AUTOMATED"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                device_type=["DESKTOP"],
+                format="JSON",
+                geo_id=["string"],
+                http_protocol=["HTTP"],
+                http_version=["HTTPv1"],
+                ip_version=["IPv4"],
+                limit=1,
+                location=["string"],
+                name=["main_series"],
+                os=["WINDOWS"],
+                tls_version=["TLSv1_0"],
+            )
+
+        assert_matches_type(TopBrowserFamilyResponse, top, path=["response"])
+
+    @parametrize
+    async def test_raw_response_browser_family(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.http.top.with_raw_response.browser_family()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         top = await response.parse()
-        assert_matches_type(TopBrowsersResponse, top, path=["response"])
+        assert_matches_type(TopBrowserFamilyResponse, top, path=["response"])
 
     @parametrize
-    async def test_streaming_response_browsers(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.http.top.with_streaming_response.browsers() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+    async def test_streaming_response_browser_family(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.http.top.with_streaming_response.browser_family() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            top = await response.parse()
-            assert_matches_type(TopBrowsersResponse, top, path=["response"])
+                top = await response.parse()
+                assert_matches_type(TopBrowserFamilyResponse, top, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/leaked_credentials/__init__.py b/tests/api_resources/radar/leaked_credentials/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/radar/leaked_credentials/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/radar/leaked_credentials/test_summary.py b/tests/api_resources/radar/leaked_credentials/test_summary.py
new file mode 100644
index 00000000000..86fea185b33
--- /dev/null
+++ b/tests/api_resources/radar/leaked_credentials/test_summary.py
@@ -0,0 +1,202 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar.leaked_credentials import (
+    SummaryBotClassResponse,
+    SummaryCompromisedResponse,
+)
+
+# pyright: reportDeprecated=false
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSummary:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_bot_class(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.leaked_credentials.summary.bot_class()
+
+        assert_matches_type(SummaryBotClassResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_bot_class_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.leaked_credentials.summary.bot_class(
+                compromised=["CLEAN"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                name=["main_series"],
+            )
+
+        assert_matches_type(SummaryBotClassResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_bot_class(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.leaked_credentials.summary.with_raw_response.bot_class()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryBotClassResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bot_class(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.leaked_credentials.summary.with_streaming_response.bot_class() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryBotClassResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_compromised(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.leaked_credentials.summary.compromised()
+
+        assert_matches_type(SummaryCompromisedResponse, summary, path=["response"])
+
+    @parametrize
+    def test_method_compromised_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = client.radar.leaked_credentials.summary.compromised(
+                bot_class=["LIKELY_AUTOMATED"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                name=["main_series"],
+            )
+
+        assert_matches_type(SummaryCompromisedResponse, summary, path=["response"])
+
+    @parametrize
+    def test_raw_response_compromised(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.leaked_credentials.summary.with_raw_response.compromised()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = response.parse()
+        assert_matches_type(SummaryCompromisedResponse, summary, path=["response"])
+
+    @parametrize
+    def test_streaming_response_compromised(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.leaked_credentials.summary.with_streaming_response.compromised() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = response.parse()
+                assert_matches_type(SummaryCompromisedResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncSummary:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_bot_class(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.leaked_credentials.summary.bot_class()
+
+        assert_matches_type(SummaryBotClassResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_bot_class_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.leaked_credentials.summary.bot_class(
+                compromised=["CLEAN"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                name=["main_series"],
+            )
+
+        assert_matches_type(SummaryBotClassResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bot_class(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.leaked_credentials.summary.with_raw_response.bot_class()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryBotClassResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bot_class(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.leaked_credentials.summary.with_streaming_response.bot_class() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryBotClassResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_compromised(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.leaked_credentials.summary.compromised()
+
+        assert_matches_type(SummaryCompromisedResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_method_compromised_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            summary = await async_client.radar.leaked_credentials.summary.compromised(
+                bot_class=["LIKELY_AUTOMATED"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                name=["main_series"],
+            )
+
+        assert_matches_type(SummaryCompromisedResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_raw_response_compromised(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.leaked_credentials.summary.with_raw_response.compromised()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        summary = await response.parse()
+        assert_matches_type(SummaryCompromisedResponse, summary, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_compromised(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.leaked_credentials.summary.with_streaming_response.compromised() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                summary = await response.parse()
+                assert_matches_type(SummaryCompromisedResponse, summary, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/leaked_credentials/test_timeseries_groups.py b/tests/api_resources/radar/leaked_credentials/test_timeseries_groups.py
new file mode 100644
index 00000000000..64e478783cf
--- /dev/null
+++ b/tests/api_resources/radar/leaked_credentials/test_timeseries_groups.py
@@ -0,0 +1,210 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar.leaked_credentials import (
+    TimeseriesGroupBotClassResponse,
+    TimeseriesGroupCompromisedResponse,
+)
+
+# pyright: reportDeprecated=false
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestTimeseriesGroups:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_bot_class(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.leaked_credentials.timeseries_groups.bot_class()
+
+        assert_matches_type(TimeseriesGroupBotClassResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_method_bot_class_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.leaked_credentials.timeseries_groups.bot_class(
+                agg_interval="1h",
+                compromised=["CLEAN"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                name=["main_series"],
+            )
+
+        assert_matches_type(TimeseriesGroupBotClassResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_bot_class(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.leaked_credentials.timeseries_groups.with_raw_response.bot_class()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = response.parse()
+        assert_matches_type(TimeseriesGroupBotClassResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bot_class(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.leaked_credentials.timeseries_groups.with_streaming_response.bot_class() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupBotClassResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_compromised(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.leaked_credentials.timeseries_groups.compromised()
+
+        assert_matches_type(TimeseriesGroupCompromisedResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_method_compromised_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = client.radar.leaked_credentials.timeseries_groups.compromised(
+                agg_interval="1h",
+                bot_class=["LIKELY_AUTOMATED"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                name=["main_series"],
+            )
+
+        assert_matches_type(TimeseriesGroupCompromisedResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_raw_response_compromised(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.leaked_credentials.timeseries_groups.with_raw_response.compromised()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = response.parse()
+        assert_matches_type(TimeseriesGroupCompromisedResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_compromised(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.leaked_credentials.timeseries_groups.with_streaming_response.compromised() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = response.parse()
+                assert_matches_type(TimeseriesGroupCompromisedResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncTimeseriesGroups:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_bot_class(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.leaked_credentials.timeseries_groups.bot_class()
+
+        assert_matches_type(TimeseriesGroupBotClassResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_method_bot_class_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.leaked_credentials.timeseries_groups.bot_class(
+                agg_interval="1h",
+                compromised=["CLEAN"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                name=["main_series"],
+            )
+
+        assert_matches_type(TimeseriesGroupBotClassResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bot_class(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.leaked_credentials.timeseries_groups.with_raw_response.bot_class()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = await response.parse()
+        assert_matches_type(TimeseriesGroupBotClassResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bot_class(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.leaked_credentials.timeseries_groups.with_streaming_response.bot_class()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupBotClassResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_compromised(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.leaked_credentials.timeseries_groups.compromised()
+
+        assert_matches_type(TimeseriesGroupCompromisedResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_method_compromised_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            timeseries_group = await async_client.radar.leaked_credentials.timeseries_groups.compromised(
+                agg_interval="1h",
+                bot_class=["LIKELY_AUTOMATED"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                name=["main_series"],
+            )
+
+        assert_matches_type(TimeseriesGroupCompromisedResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_compromised(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.leaked_credentials.timeseries_groups.with_raw_response.compromised()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        timeseries_group = await response.parse()
+        assert_matches_type(TimeseriesGroupCompromisedResponse, timeseries_group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_compromised(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with (
+                async_client.radar.leaked_credentials.timeseries_groups.with_streaming_response.compromised()
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                timeseries_group = await response.parse()
+                assert_matches_type(TimeseriesGroupCompromisedResponse, timeseries_group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/netflows/test_top.py b/tests/api_resources/radar/netflows/test_top.py
index 294063d1b87..6903e2a80aa 100644
--- a/tests/api_resources/radar/netflows/test_top.py
+++ b/tests/api_resources/radar/netflows/test_top.py
@@ -26,23 +26,16 @@ def test_method_ases(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_ases_with_all_params(self, client: Cloudflare) -> None:
         top = client.radar.netflows.top.ases(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            geo_id=["string"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(TopAsesResponse, top, path=["response"])
 
@@ -74,23 +67,16 @@ def test_method_locations(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_locations_with_all_params(self, client: Cloudflare) -> None:
         top = client.radar.netflows.top.locations(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            geo_id=["string"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(TopLocationsResponse, top, path=["response"])
 
@@ -116,7 +102,9 @@ def test_streaming_response_locations(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTop:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_ases(self, async_client: AsyncCloudflare) -> None:
@@ -126,23 +114,16 @@ async def test_method_ases(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_ases_with_all_params(self, async_client: AsyncCloudflare) -> None:
         top = await async_client.radar.netflows.top.ases(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            geo_id=["string"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(TopAsesResponse, top, path=["response"])
 
@@ -174,23 +155,16 @@ async def test_method_locations(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_locations_with_all_params(self, async_client: AsyncCloudflare) -> None:
         top = await async_client.radar.netflows.top.locations(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            geo_id=["string"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(TopLocationsResponse, top, path=["response"])
 
diff --git a/tests/api_resources/radar/quality/speed/test_top.py b/tests/api_resources/radar/quality/speed/test_top.py
index 1ddd81fa72b..5726b69e270 100644
--- a/tests/api_resources/radar/quality/speed/test_top.py
+++ b/tests/api_resources/radar/quality/speed/test_top.py
@@ -29,17 +29,13 @@ def test_method_ases(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_ases_with_all_params(self, client: Cloudflare) -> None:
         top = client.radar.quality.speed.top.ases(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
             order_by="BANDWIDTH_DOWNLOAD",
             reverse=True,
         )
@@ -73,17 +69,13 @@ def test_method_locations(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_locations_with_all_params(self, client: Cloudflare) -> None:
         top = client.radar.quality.speed.top.locations(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
             order_by="BANDWIDTH_DOWNLOAD",
             reverse=True,
         )
@@ -111,7 +103,9 @@ def test_streaming_response_locations(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTop:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_ases(self, async_client: AsyncCloudflare) -> None:
@@ -121,17 +115,13 @@ async def test_method_ases(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_ases_with_all_params(self, async_client: AsyncCloudflare) -> None:
         top = await async_client.radar.quality.speed.top.ases(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
             order_by="BANDWIDTH_DOWNLOAD",
             reverse=True,
         )
@@ -165,17 +155,13 @@ async def test_method_locations(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_locations_with_all_params(self, async_client: AsyncCloudflare) -> None:
         top = await async_client.radar.quality.speed.top.locations(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
             order_by="BANDWIDTH_DOWNLOAD",
             reverse=True,
         )
diff --git a/tests/api_resources/radar/quality/test_iqi.py b/tests/api_resources/radar/quality/test_iqi.py
index 52aef8e5c8e..3d337273df4 100644
--- a/tests/api_resources/radar/quality/test_iqi.py
+++ b/tests/api_resources/radar/quality/test_iqi.py
@@ -32,22 +32,14 @@ def test_method_summary(self, client: Cloudflare) -> None:
     def test_method_summary_with_all_params(self, client: Cloudflare) -> None:
         iqi = client.radar.quality.iqi.summary(
             metric="BANDWIDTH",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(IQISummaryResponse, iqi, path=["response"])
 
@@ -87,23 +79,15 @@ def test_method_timeseries_groups_with_all_params(self, client: Cloudflare) -> N
         iqi = client.radar.quality.iqi.timeseries_groups(
             metric="BANDWIDTH",
             agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
             interpolation=True,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(IQITimeseriesGroupsResponse, iqi, path=["response"])
 
@@ -133,7 +117,9 @@ def test_streaming_response_timeseries_groups(self, client: Cloudflare) -> None:
 
 
 class TestAsyncIQI:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_summary(self, async_client: AsyncCloudflare) -> None:
@@ -146,22 +132,14 @@ async def test_method_summary(self, async_client: AsyncCloudflare) -> None:
     async def test_method_summary_with_all_params(self, async_client: AsyncCloudflare) -> None:
         iqi = await async_client.radar.quality.iqi.summary(
             metric="BANDWIDTH",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(IQISummaryResponse, iqi, path=["response"])
 
@@ -201,23 +179,15 @@ async def test_method_timeseries_groups_with_all_params(self, async_client: Asyn
         iqi = await async_client.radar.quality.iqi.timeseries_groups(
             metric="BANDWIDTH",
             agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
             interpolation=True,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(IQITimeseriesGroupsResponse, iqi, path=["response"])
 
diff --git a/tests/api_resources/radar/quality/test_speed.py b/tests/api_resources/radar/quality/test_speed.py
index 7ee3ce0bd64..73ae0a7e430 100644
--- a/tests/api_resources/radar/quality/test_speed.py
+++ b/tests/api_resources/radar/quality/test_speed.py
@@ -29,18 +29,14 @@ def test_method_histogram(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_histogram_with_all_params(self, client: Cloudflare) -> None:
         speed = client.radar.quality.speed.histogram(
-            asn=["string", "string", "string"],
+            asn=["string"],
             bucket_size=0,
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            location=["string", "string", "string"],
+            location=["string"],
             metric_group="BANDWIDTH",
-            name=["string", "string", "string"],
+            name=["main_series"],
         )
         assert_matches_type(SpeedHistogramResponse, speed, path=["response"])
 
@@ -72,16 +68,12 @@ def test_method_summary(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_summary_with_all_params(self, client: Cloudflare) -> None:
         speed = client.radar.quality.speed.summary(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(SpeedSummaryResponse, speed, path=["response"])
 
@@ -107,7 +99,9 @@ def test_streaming_response_summary(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSpeed:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_histogram(self, async_client: AsyncCloudflare) -> None:
@@ -117,18 +111,14 @@ async def test_method_histogram(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_histogram_with_all_params(self, async_client: AsyncCloudflare) -> None:
         speed = await async_client.radar.quality.speed.histogram(
-            asn=["string", "string", "string"],
+            asn=["string"],
             bucket_size=0,
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            location=["string", "string", "string"],
+            location=["string"],
             metric_group="BANDWIDTH",
-            name=["string", "string", "string"],
+            name=["main_series"],
         )
         assert_matches_type(SpeedHistogramResponse, speed, path=["response"])
 
@@ -160,16 +150,12 @@ async def test_method_summary(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_summary_with_all_params(self, async_client: AsyncCloudflare) -> None:
         speed = await async_client.radar.quality.speed.summary(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(SpeedSummaryResponse, speed, path=["response"])
 
diff --git a/tests/api_resources/radar/ranking/test_domain.py b/tests/api_resources/radar/ranking/test_domain.py
index 058290c4c9f..b22ea42c6df 100644
--- a/tests/api_resources/radar/ranking/test_domain.py
+++ b/tests/api_resources/radar/ranking/test_domain.py
@@ -9,6 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
+from cloudflare._utils import parse_date
 from cloudflare.types.radar.ranking import DomainGetResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -28,10 +29,11 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         domain = client.radar.ranking.domain.get(
             domain="google.com",
-            date=["string", "string", "string"],
+            date=[parse_date("2019-12-27")],
             format="JSON",
-            limit=5,
-            name=["string", "string", "string"],
+            include_top_locations=True,
+            limit=1,
+            name=["main_series"],
             ranking_type="POPULAR",
         )
         assert_matches_type(DomainGetResponse, domain, path=["response"])
@@ -69,7 +71,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncDomain:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -82,10 +86,11 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         domain = await async_client.radar.ranking.domain.get(
             domain="google.com",
-            date=["string", "string", "string"],
+            date=[parse_date("2019-12-27")],
             format="JSON",
-            limit=5,
-            name=["string", "string", "string"],
+            include_top_locations=True,
+            limit=1,
+            name=["main_series"],
             ranking_type="POPULAR",
         )
         assert_matches_type(DomainGetResponse, domain, path=["response"])
diff --git a/tests/api_resources/radar/ranking/test_internet_services.py b/tests/api_resources/radar/ranking/test_internet_services.py
new file mode 100644
index 00000000000..a87a3404fef
--- /dev/null
+++ b/tests/api_resources/radar/ranking/test_internet_services.py
@@ -0,0 +1,247 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_date, parse_datetime
+from cloudflare.types.radar.ranking import (
+    InternetServiceTopResponse,
+    InternetServiceCategoriesResponse,
+    InternetServiceTimeseriesGroupsResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestInternetServices:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_categories(self, client: Cloudflare) -> None:
+        internet_service = client.radar.ranking.internet_services.categories()
+        assert_matches_type(InternetServiceCategoriesResponse, internet_service, path=["response"])
+
+    @parametrize
+    def test_method_categories_with_all_params(self, client: Cloudflare) -> None:
+        internet_service = client.radar.ranking.internet_services.categories(
+            date=[parse_date("2019-12-27")],
+            format="JSON",
+            limit=5,
+            name=["main_series"],
+        )
+        assert_matches_type(InternetServiceCategoriesResponse, internet_service, path=["response"])
+
+    @parametrize
+    def test_raw_response_categories(self, client: Cloudflare) -> None:
+        response = client.radar.ranking.internet_services.with_raw_response.categories()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        internet_service = response.parse()
+        assert_matches_type(InternetServiceCategoriesResponse, internet_service, path=["response"])
+
+    @parametrize
+    def test_streaming_response_categories(self, client: Cloudflare) -> None:
+        with client.radar.ranking.internet_services.with_streaming_response.categories() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            internet_service = response.parse()
+            assert_matches_type(InternetServiceCategoriesResponse, internet_service, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_timeseries_groups(self, client: Cloudflare) -> None:
+        internet_service = client.radar.ranking.internet_services.timeseries_groups()
+        assert_matches_type(InternetServiceTimeseriesGroupsResponse, internet_service, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_groups_with_all_params(self, client: Cloudflare) -> None:
+        internet_service = client.radar.ranking.internet_services.timeseries_groups(
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            limit=1,
+            name=["main_series"],
+            service_category=["string"],
+        )
+        assert_matches_type(InternetServiceTimeseriesGroupsResponse, internet_service, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries_groups(self, client: Cloudflare) -> None:
+        response = client.radar.ranking.internet_services.with_raw_response.timeseries_groups()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        internet_service = response.parse()
+        assert_matches_type(InternetServiceTimeseriesGroupsResponse, internet_service, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries_groups(self, client: Cloudflare) -> None:
+        with client.radar.ranking.internet_services.with_streaming_response.timeseries_groups() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            internet_service = response.parse()
+            assert_matches_type(InternetServiceTimeseriesGroupsResponse, internet_service, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_top(self, client: Cloudflare) -> None:
+        internet_service = client.radar.ranking.internet_services.top()
+        assert_matches_type(InternetServiceTopResponse, internet_service, path=["response"])
+
+    @parametrize
+    def test_method_top_with_all_params(self, client: Cloudflare) -> None:
+        internet_service = client.radar.ranking.internet_services.top(
+            date=[parse_date("2019-12-27")],
+            format="JSON",
+            limit=5,
+            name=["main_series"],
+            service_category=["string"],
+        )
+        assert_matches_type(InternetServiceTopResponse, internet_service, path=["response"])
+
+    @parametrize
+    def test_raw_response_top(self, client: Cloudflare) -> None:
+        response = client.radar.ranking.internet_services.with_raw_response.top()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        internet_service = response.parse()
+        assert_matches_type(InternetServiceTopResponse, internet_service, path=["response"])
+
+    @parametrize
+    def test_streaming_response_top(self, client: Cloudflare) -> None:
+        with client.radar.ranking.internet_services.with_streaming_response.top() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            internet_service = response.parse()
+            assert_matches_type(InternetServiceTopResponse, internet_service, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncInternetServices:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_categories(self, async_client: AsyncCloudflare) -> None:
+        internet_service = await async_client.radar.ranking.internet_services.categories()
+        assert_matches_type(InternetServiceCategoriesResponse, internet_service, path=["response"])
+
+    @parametrize
+    async def test_method_categories_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        internet_service = await async_client.radar.ranking.internet_services.categories(
+            date=[parse_date("2019-12-27")],
+            format="JSON",
+            limit=5,
+            name=["main_series"],
+        )
+        assert_matches_type(InternetServiceCategoriesResponse, internet_service, path=["response"])
+
+    @parametrize
+    async def test_raw_response_categories(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.ranking.internet_services.with_raw_response.categories()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        internet_service = await response.parse()
+        assert_matches_type(InternetServiceCategoriesResponse, internet_service, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_categories(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.ranking.internet_services.with_streaming_response.categories() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            internet_service = await response.parse()
+            assert_matches_type(InternetServiceCategoriesResponse, internet_service, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        internet_service = await async_client.radar.ranking.internet_services.timeseries_groups()
+        assert_matches_type(InternetServiceTimeseriesGroupsResponse, internet_service, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_groups_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        internet_service = await async_client.radar.ranking.internet_services.timeseries_groups(
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            limit=1,
+            name=["main_series"],
+            service_category=["string"],
+        )
+        assert_matches_type(InternetServiceTimeseriesGroupsResponse, internet_service, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.ranking.internet_services.with_raw_response.timeseries_groups()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        internet_service = await response.parse()
+        assert_matches_type(InternetServiceTimeseriesGroupsResponse, internet_service, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.ranking.internet_services.with_streaming_response.timeseries_groups() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            internet_service = await response.parse()
+            assert_matches_type(InternetServiceTimeseriesGroupsResponse, internet_service, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_top(self, async_client: AsyncCloudflare) -> None:
+        internet_service = await async_client.radar.ranking.internet_services.top()
+        assert_matches_type(InternetServiceTopResponse, internet_service, path=["response"])
+
+    @parametrize
+    async def test_method_top_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        internet_service = await async_client.radar.ranking.internet_services.top(
+            date=[parse_date("2019-12-27")],
+            format="JSON",
+            limit=5,
+            name=["main_series"],
+            service_category=["string"],
+        )
+        assert_matches_type(InternetServiceTopResponse, internet_service, path=["response"])
+
+    @parametrize
+    async def test_raw_response_top(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.ranking.internet_services.with_raw_response.top()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        internet_service = await response.parse()
+        assert_matches_type(InternetServiceTopResponse, internet_service, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_top(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.ranking.internet_services.with_streaming_response.top() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            internet_service = await response.parse()
+            assert_matches_type(InternetServiceTopResponse, internet_service, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/robots_txt/__init__.py b/tests/api_resources/radar/robots_txt/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/radar/robots_txt/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/radar/robots_txt/test_top.py b/tests/api_resources/radar/robots_txt/test_top.py
new file mode 100644
index 00000000000..dfd947373f3
--- /dev/null
+++ b/tests/api_resources/radar/robots_txt/test_top.py
@@ -0,0 +1,97 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_date
+from cloudflare.types.radar.robots_txt import TopDomainCategoriesResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestTop:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_domain_categories(self, client: Cloudflare) -> None:
+        top = client.radar.robots_txt.top.domain_categories()
+        assert_matches_type(TopDomainCategoriesResponse, top, path=["response"])
+
+    @parametrize
+    def test_method_domain_categories_with_all_params(self, client: Cloudflare) -> None:
+        top = client.radar.robots_txt.top.domain_categories(
+            date=[parse_date("2019-12-27")],
+            format="JSON",
+            limit=1,
+            name=["main_series"],
+            user_agent_category="AI",
+        )
+        assert_matches_type(TopDomainCategoriesResponse, top, path=["response"])
+
+    @parametrize
+    def test_raw_response_domain_categories(self, client: Cloudflare) -> None:
+        response = client.radar.robots_txt.top.with_raw_response.domain_categories()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        top = response.parse()
+        assert_matches_type(TopDomainCategoriesResponse, top, path=["response"])
+
+    @parametrize
+    def test_streaming_response_domain_categories(self, client: Cloudflare) -> None:
+        with client.radar.robots_txt.top.with_streaming_response.domain_categories() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            top = response.parse()
+            assert_matches_type(TopDomainCategoriesResponse, top, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncTop:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_domain_categories(self, async_client: AsyncCloudflare) -> None:
+        top = await async_client.radar.robots_txt.top.domain_categories()
+        assert_matches_type(TopDomainCategoriesResponse, top, path=["response"])
+
+    @parametrize
+    async def test_method_domain_categories_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        top = await async_client.radar.robots_txt.top.domain_categories(
+            date=[parse_date("2019-12-27")],
+            format="JSON",
+            limit=1,
+            name=["main_series"],
+            user_agent_category="AI",
+        )
+        assert_matches_type(TopDomainCategoriesResponse, top, path=["response"])
+
+    @parametrize
+    async def test_raw_response_domain_categories(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.robots_txt.top.with_raw_response.domain_categories()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        top = await response.parse()
+        assert_matches_type(TopDomainCategoriesResponse, top, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_domain_categories(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.robots_txt.top.with_streaming_response.domain_categories() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            top = await response.parse()
+            assert_matches_type(TopDomainCategoriesResponse, top, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/robots_txt/top/__init__.py b/tests/api_resources/radar/robots_txt/top/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/radar/robots_txt/top/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/radar/robots_txt/top/test_user_agents.py b/tests/api_resources/radar/robots_txt/top/test_user_agents.py
new file mode 100644
index 00000000000..9d9eea9a1e6
--- /dev/null
+++ b/tests/api_resources/radar/robots_txt/top/test_user_agents.py
@@ -0,0 +1,101 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_date
+from cloudflare.types.radar.robots_txt.top import UserAgentDirectiveResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestUserAgents:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_directive(self, client: Cloudflare) -> None:
+        user_agent = client.radar.robots_txt.top.user_agents.directive()
+        assert_matches_type(UserAgentDirectiveResponse, user_agent, path=["response"])
+
+    @parametrize
+    def test_method_directive_with_all_params(self, client: Cloudflare) -> None:
+        user_agent = client.radar.robots_txt.top.user_agents.directive(
+            date=[parse_date("2019-12-27")],
+            directive="ALLOW",
+            domain_category=["string"],
+            format="JSON",
+            limit=1,
+            name=["main_series"],
+            user_agent_category="AI",
+        )
+        assert_matches_type(UserAgentDirectiveResponse, user_agent, path=["response"])
+
+    @parametrize
+    def test_raw_response_directive(self, client: Cloudflare) -> None:
+        response = client.radar.robots_txt.top.user_agents.with_raw_response.directive()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        user_agent = response.parse()
+        assert_matches_type(UserAgentDirectiveResponse, user_agent, path=["response"])
+
+    @parametrize
+    def test_streaming_response_directive(self, client: Cloudflare) -> None:
+        with client.radar.robots_txt.top.user_agents.with_streaming_response.directive() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            user_agent = response.parse()
+            assert_matches_type(UserAgentDirectiveResponse, user_agent, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncUserAgents:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_directive(self, async_client: AsyncCloudflare) -> None:
+        user_agent = await async_client.radar.robots_txt.top.user_agents.directive()
+        assert_matches_type(UserAgentDirectiveResponse, user_agent, path=["response"])
+
+    @parametrize
+    async def test_method_directive_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        user_agent = await async_client.radar.robots_txt.top.user_agents.directive(
+            date=[parse_date("2019-12-27")],
+            directive="ALLOW",
+            domain_category=["string"],
+            format="JSON",
+            limit=1,
+            name=["main_series"],
+            user_agent_category="AI",
+        )
+        assert_matches_type(UserAgentDirectiveResponse, user_agent, path=["response"])
+
+    @parametrize
+    async def test_raw_response_directive(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.robots_txt.top.user_agents.with_raw_response.directive()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        user_agent = await response.parse()
+        assert_matches_type(UserAgentDirectiveResponse, user_agent, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_directive(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.robots_txt.top.user_agents.with_streaming_response.directive() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            user_agent = await response.parse()
+            assert_matches_type(UserAgentDirectiveResponse, user_agent, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/test_annotations.py b/tests/api_resources/radar/test_annotations.py
new file mode 100644
index 00000000000..aac6dc5dc54
--- /dev/null
+++ b/tests/api_resources/radar/test_annotations.py
@@ -0,0 +1,109 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar import AnnotationListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestAnnotations:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        annotation = client.radar.annotations.list()
+        assert_matches_type(AnnotationListResponse, annotation, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        annotation = client.radar.annotations.list(
+            asn=174,
+            data_source="ALL",
+            date_end=parse_datetime("2023-09-01T11:41:33.782Z"),
+            date_range="7d",
+            date_start=parse_datetime("2023-09-01T11:41:33.782Z"),
+            event_type="OUTAGE",
+            format="JSON",
+            limit=1,
+            location="US",
+            offset=0,
+            origin="amazon-us-east-1",
+        )
+        assert_matches_type(AnnotationListResponse, annotation, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.radar.annotations.with_raw_response.list()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        annotation = response.parse()
+        assert_matches_type(AnnotationListResponse, annotation, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.radar.annotations.with_streaming_response.list() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            annotation = response.parse()
+            assert_matches_type(AnnotationListResponse, annotation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncAnnotations:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        annotation = await async_client.radar.annotations.list()
+        assert_matches_type(AnnotationListResponse, annotation, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        annotation = await async_client.radar.annotations.list(
+            asn=174,
+            data_source="ALL",
+            date_end=parse_datetime("2023-09-01T11:41:33.782Z"),
+            date_range="7d",
+            date_start=parse_datetime("2023-09-01T11:41:33.782Z"),
+            event_type="OUTAGE",
+            format="JSON",
+            limit=1,
+            location="US",
+            offset=0,
+            origin="amazon-us-east-1",
+        )
+        assert_matches_type(AnnotationListResponse, annotation, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.annotations.with_raw_response.list()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        annotation = await response.parse()
+        assert_matches_type(AnnotationListResponse, annotation, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.annotations.with_streaming_response.list() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            annotation = await response.parse()
+            assert_matches_type(AnnotationListResponse, annotation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/test_as112.py b/tests/api_resources/radar/test_as112.py
index fa41b93c8a8..3b6495152d8 100644
--- a/tests/api_resources/radar/test_as112.py
+++ b/tests/api_resources/radar/test_as112.py
@@ -10,7 +10,11 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare._utils import parse_datetime
-from cloudflare.types.radar import AS112TimeseriesResponse
+from cloudflare.types.radar import (
+    AS112SummaryV2Response,
+    AS112TimeseriesResponse,
+    AS112TimeseriesGroupsV2Response,
+)
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -18,6 +22,55 @@
 class TestAS112:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @parametrize
+    def test_method_summary_v2(self, client: Cloudflare) -> None:
+        as112 = client.radar.as112.summary_v2(
+            dimension="DNSSEC",
+        )
+        assert_matches_type(AS112SummaryV2Response, as112, path=["response"])
+
+    @parametrize
+    def test_method_summary_v2_with_all_params(self, client: Cloudflare) -> None:
+        as112 = client.radar.as112.summary_v2(
+            dimension="DNSSEC",
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            protocol=["UDP"],
+            query_type=["A"],
+            response_code=["NOERROR"],
+        )
+        assert_matches_type(AS112SummaryV2Response, as112, path=["response"])
+
+    @parametrize
+    def test_raw_response_summary_v2(self, client: Cloudflare) -> None:
+        response = client.radar.as112.with_raw_response.summary_v2(
+            dimension="DNSSEC",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        as112 = response.parse()
+        assert_matches_type(AS112SummaryV2Response, as112, path=["response"])
+
+    @parametrize
+    def test_streaming_response_summary_v2(self, client: Cloudflare) -> None:
+        with client.radar.as112.with_streaming_response.summary_v2(
+            dimension="DNSSEC",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            as112 = response.parse()
+            assert_matches_type(AS112SummaryV2Response, as112, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
     @parametrize
     def test_method_timeseries(self, client: Cloudflare) -> None:
         as112 = client.radar.as112.timeseries()
@@ -27,22 +80,16 @@ def test_method_timeseries(self, client: Cloudflare) -> None:
     def test_method_timeseries_with_all_params(self, client: Cloudflare) -> None:
         as112 = client.radar.as112.timeseries(
             agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            location=["string"],
+            name=["main_series"],
+            protocol=["UDP"],
+            query_type=["A"],
+            response_code=["NOERROR"],
         )
         assert_matches_type(AS112TimeseriesResponse, as112, path=["response"])
 
@@ -66,9 +113,110 @@ def test_streaming_response_timeseries(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @parametrize
+    def test_method_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        as112 = client.radar.as112.timeseries_groups_v2(
+            dimension="DNSSEC",
+        )
+        assert_matches_type(AS112TimeseriesGroupsV2Response, as112, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_groups_v2_with_all_params(self, client: Cloudflare) -> None:
+        as112 = client.radar.as112.timeseries_groups_v2(
+            dimension="DNSSEC",
+            agg_interval="1h",
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            protocol=["UDP"],
+            query_type=["A"],
+            response_code=["NOERROR"],
+        )
+        assert_matches_type(AS112TimeseriesGroupsV2Response, as112, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        response = client.radar.as112.with_raw_response.timeseries_groups_v2(
+            dimension="DNSSEC",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        as112 = response.parse()
+        assert_matches_type(AS112TimeseriesGroupsV2Response, as112, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        with client.radar.as112.with_streaming_response.timeseries_groups_v2(
+            dimension="DNSSEC",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            as112 = response.parse()
+            assert_matches_type(AS112TimeseriesGroupsV2Response, as112, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
 
 class TestAsyncAS112:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        as112 = await async_client.radar.as112.summary_v2(
+            dimension="DNSSEC",
+        )
+        assert_matches_type(AS112SummaryV2Response, as112, path=["response"])
+
+    @parametrize
+    async def test_method_summary_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        as112 = await async_client.radar.as112.summary_v2(
+            dimension="DNSSEC",
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            protocol=["UDP"],
+            query_type=["A"],
+            response_code=["NOERROR"],
+        )
+        assert_matches_type(AS112SummaryV2Response, as112, path=["response"])
+
+    @parametrize
+    async def test_raw_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.as112.with_raw_response.summary_v2(
+            dimension="DNSSEC",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        as112 = await response.parse()
+        assert_matches_type(AS112SummaryV2Response, as112, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.as112.with_streaming_response.summary_v2(
+            dimension="DNSSEC",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            as112 = await response.parse()
+            assert_matches_type(AS112SummaryV2Response, as112, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
@@ -79,22 +227,16 @@ async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
     async def test_method_timeseries_with_all_params(self, async_client: AsyncCloudflare) -> None:
         as112 = await async_client.radar.as112.timeseries(
             agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            location=["string"],
+            name=["main_series"],
+            protocol=["UDP"],
+            query_type=["A"],
+            response_code=["NOERROR"],
         )
         assert_matches_type(AS112TimeseriesResponse, as112, path=["response"])
 
@@ -117,3 +259,53 @@ async def test_streaming_response_timeseries(self, async_client: AsyncCloudflare
             assert_matches_type(AS112TimeseriesResponse, as112, path=["response"])
 
         assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        as112 = await async_client.radar.as112.timeseries_groups_v2(
+            dimension="DNSSEC",
+        )
+        assert_matches_type(AS112TimeseriesGroupsV2Response, as112, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_groups_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        as112 = await async_client.radar.as112.timeseries_groups_v2(
+            dimension="DNSSEC",
+            agg_interval="1h",
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            protocol=["UDP"],
+            query_type=["A"],
+            response_code=["NOERROR"],
+        )
+        assert_matches_type(AS112TimeseriesGroupsV2Response, as112, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.as112.with_raw_response.timeseries_groups_v2(
+            dimension="DNSSEC",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        as112 = await response.parse()
+        assert_matches_type(AS112TimeseriesGroupsV2Response, as112, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.as112.with_streaming_response.timeseries_groups_v2(
+            dimension="DNSSEC",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            as112 = await response.parse()
+            assert_matches_type(AS112TimeseriesGroupsV2Response, as112, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/test_bgp.py b/tests/api_resources/radar/test_bgp.py
index f7feab80efb..3bb83ab46c2 100644
--- a/tests/api_resources/radar/test_bgp.py
+++ b/tests/api_resources/radar/test_bgp.py
@@ -27,41 +27,14 @@ def test_method_timeseries(self, client: Cloudflare) -> None:
     def test_method_timeseries_with_all_params(self, client: Cloudflare) -> None:
         bgp = client.radar.bgp.timeseries(
             agg_interval="1h",
-            asn=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            name=["string", "string", "string"],
-            prefix=[
-                {
-                    "in": "query",
-                    "name": "prefix",
-                    "test": 12,
-                    "type": "1.1.1.0/24",
-                },
-                {
-                    "in": "query",
-                    "name": "prefix",
-                    "test": 12,
-                    "type": "1.1.1.0/24",
-                },
-                {
-                    "in": "query",
-                    "name": "prefix",
-                    "test": 12,
-                    "type": "1.1.1.0/24",
-                },
-            ],
-            update_type=["ANNOUNCEMENT", "WITHDRAWAL"],
+            name=["main_series"],
+            prefix=["string"],
+            update_type=["ANNOUNCEMENT"],
         )
         assert_matches_type(BGPTimeseriesResponse, bgp, path=["response"])
 
@@ -87,7 +60,9 @@ def test_streaming_response_timeseries(self, client: Cloudflare) -> None:
 
 
 class TestAsyncBGP:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
@@ -98,41 +73,14 @@ async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
     async def test_method_timeseries_with_all_params(self, async_client: AsyncCloudflare) -> None:
         bgp = await async_client.radar.bgp.timeseries(
             agg_interval="1h",
-            asn=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            name=["string", "string", "string"],
-            prefix=[
-                {
-                    "in": "query",
-                    "name": "prefix",
-                    "test": 12,
-                    "type": "1.1.1.0/24",
-                },
-                {
-                    "in": "query",
-                    "name": "prefix",
-                    "test": 12,
-                    "type": "1.1.1.0/24",
-                },
-                {
-                    "in": "query",
-                    "name": "prefix",
-                    "test": 12,
-                    "type": "1.1.1.0/24",
-                },
-            ],
-            update_type=["ANNOUNCEMENT", "WITHDRAWAL"],
+            name=["main_series"],
+            prefix=["string"],
+            update_type=["ANNOUNCEMENT"],
         )
         assert_matches_type(BGPTimeseriesResponse, bgp, path=["response"])
 
diff --git a/tests/api_resources/radar/test_bots.py b/tests/api_resources/radar/test_bots.py
new file mode 100644
index 00000000000..aa4e6365246
--- /dev/null
+++ b/tests/api_resources/radar/test_bots.py
@@ -0,0 +1,499 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar import (
+    BotGetResponse,
+    BotListResponse,
+    BotSummaryResponse,
+    BotTimeseriesResponse,
+    BotTimeseriesGroupsResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestBots:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        bot = client.radar.bots.list()
+        assert_matches_type(BotListResponse, bot, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        bot = client.radar.bots.list(
+            bot_category="SEARCH_ENGINE_CRAWLER",
+            bot_operator="botOperator",
+            bot_verification_status="VERIFIED",
+            format="JSON",
+            kind="AGENT",
+            limit=1,
+            offset=0,
+        )
+        assert_matches_type(BotListResponse, bot, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.radar.bots.with_raw_response.list()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bot = response.parse()
+        assert_matches_type(BotListResponse, bot, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.radar.bots.with_streaming_response.list() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bot = response.parse()
+            assert_matches_type(BotListResponse, bot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        bot = client.radar.bots.get(
+            bot_slug="gptbot",
+        )
+        assert_matches_type(BotGetResponse, bot, path=["response"])
+
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        bot = client.radar.bots.get(
+            bot_slug="gptbot",
+            format="JSON",
+        )
+        assert_matches_type(BotGetResponse, bot, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.radar.bots.with_raw_response.get(
+            bot_slug="gptbot",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bot = response.parse()
+        assert_matches_type(BotGetResponse, bot, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.radar.bots.with_streaming_response.get(
+            bot_slug="gptbot",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bot = response.parse()
+            assert_matches_type(BotGetResponse, bot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bot_slug` but received ''"):
+            client.radar.bots.with_raw_response.get(
+                bot_slug="",
+            )
+
+    @parametrize
+    def test_method_summary(self, client: Cloudflare) -> None:
+        bot = client.radar.bots.summary(
+            dimension="BOT",
+        )
+        assert_matches_type(BotSummaryResponse, bot, path=["response"])
+
+    @parametrize
+    def test_method_summary_with_all_params(self, client: Cloudflare) -> None:
+        bot = client.radar.bots.summary(
+            dimension="BOT",
+            asn=["string"],
+            bot=["string"],
+            bot_category=["SEARCH_ENGINE_CRAWLER"],
+            bot_kind=["AGENT"],
+            bot_operator=["string"],
+            bot_verification_status=["VERIFIED"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+        )
+        assert_matches_type(BotSummaryResponse, bot, path=["response"])
+
+    @parametrize
+    def test_raw_response_summary(self, client: Cloudflare) -> None:
+        response = client.radar.bots.with_raw_response.summary(
+            dimension="BOT",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bot = response.parse()
+        assert_matches_type(BotSummaryResponse, bot, path=["response"])
+
+    @parametrize
+    def test_streaming_response_summary(self, client: Cloudflare) -> None:
+        with client.radar.bots.with_streaming_response.summary(
+            dimension="BOT",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bot = response.parse()
+            assert_matches_type(BotSummaryResponse, bot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_timeseries(self, client: Cloudflare) -> None:
+        bot = client.radar.bots.timeseries()
+        assert_matches_type(BotTimeseriesResponse, bot, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_with_all_params(self, client: Cloudflare) -> None:
+        bot = client.radar.bots.timeseries(
+            agg_interval="1h",
+            asn=["string"],
+            bot=["string"],
+            bot_category=["SEARCH_ENGINE_CRAWLER"],
+            bot_kind=["AGENT"],
+            bot_operator=["string"],
+            bot_verification_status=["VERIFIED"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            location=["string"],
+            name=["main_series"],
+        )
+        assert_matches_type(BotTimeseriesResponse, bot, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries(self, client: Cloudflare) -> None:
+        response = client.radar.bots.with_raw_response.timeseries()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bot = response.parse()
+        assert_matches_type(BotTimeseriesResponse, bot, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries(self, client: Cloudflare) -> None:
+        with client.radar.bots.with_streaming_response.timeseries() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bot = response.parse()
+            assert_matches_type(BotTimeseriesResponse, bot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_timeseries_groups(self, client: Cloudflare) -> None:
+        bot = client.radar.bots.timeseries_groups(
+            dimension="BOT",
+        )
+        assert_matches_type(BotTimeseriesGroupsResponse, bot, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_groups_with_all_params(self, client: Cloudflare) -> None:
+        bot = client.radar.bots.timeseries_groups(
+            dimension="BOT",
+            agg_interval="1h",
+            asn=["string"],
+            bot=["string"],
+            bot_category=["SEARCH_ENGINE_CRAWLER"],
+            bot_kind=["AGENT"],
+            bot_operator=["string"],
+            bot_verification_status=["VERIFIED"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+        )
+        assert_matches_type(BotTimeseriesGroupsResponse, bot, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries_groups(self, client: Cloudflare) -> None:
+        response = client.radar.bots.with_raw_response.timeseries_groups(
+            dimension="BOT",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bot = response.parse()
+        assert_matches_type(BotTimeseriesGroupsResponse, bot, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries_groups(self, client: Cloudflare) -> None:
+        with client.radar.bots.with_streaming_response.timeseries_groups(
+            dimension="BOT",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bot = response.parse()
+            assert_matches_type(BotTimeseriesGroupsResponse, bot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncBots:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        bot = await async_client.radar.bots.list()
+        assert_matches_type(BotListResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        bot = await async_client.radar.bots.list(
+            bot_category="SEARCH_ENGINE_CRAWLER",
+            bot_operator="botOperator",
+            bot_verification_status="VERIFIED",
+            format="JSON",
+            kind="AGENT",
+            limit=1,
+            offset=0,
+        )
+        assert_matches_type(BotListResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.bots.with_raw_response.list()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bot = await response.parse()
+        assert_matches_type(BotListResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.bots.with_streaming_response.list() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bot = await response.parse()
+            assert_matches_type(BotListResponse, bot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        bot = await async_client.radar.bots.get(
+            bot_slug="gptbot",
+        )
+        assert_matches_type(BotGetResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        bot = await async_client.radar.bots.get(
+            bot_slug="gptbot",
+            format="JSON",
+        )
+        assert_matches_type(BotGetResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.bots.with_raw_response.get(
+            bot_slug="gptbot",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bot = await response.parse()
+        assert_matches_type(BotGetResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.bots.with_streaming_response.get(
+            bot_slug="gptbot",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bot = await response.parse()
+            assert_matches_type(BotGetResponse, bot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bot_slug` but received ''"):
+            await async_client.radar.bots.with_raw_response.get(
+                bot_slug="",
+            )
+
+    @parametrize
+    async def test_method_summary(self, async_client: AsyncCloudflare) -> None:
+        bot = await async_client.radar.bots.summary(
+            dimension="BOT",
+        )
+        assert_matches_type(BotSummaryResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_method_summary_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        bot = await async_client.radar.bots.summary(
+            dimension="BOT",
+            asn=["string"],
+            bot=["string"],
+            bot_category=["SEARCH_ENGINE_CRAWLER"],
+            bot_kind=["AGENT"],
+            bot_operator=["string"],
+            bot_verification_status=["VERIFIED"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+        )
+        assert_matches_type(BotSummaryResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_raw_response_summary(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.bots.with_raw_response.summary(
+            dimension="BOT",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bot = await response.parse()
+        assert_matches_type(BotSummaryResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_summary(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.bots.with_streaming_response.summary(
+            dimension="BOT",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bot = await response.parse()
+            assert_matches_type(BotSummaryResponse, bot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
+        bot = await async_client.radar.bots.timeseries()
+        assert_matches_type(BotTimeseriesResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        bot = await async_client.radar.bots.timeseries(
+            agg_interval="1h",
+            asn=["string"],
+            bot=["string"],
+            bot_category=["SEARCH_ENGINE_CRAWLER"],
+            bot_kind=["AGENT"],
+            bot_operator=["string"],
+            bot_verification_status=["VERIFIED"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            location=["string"],
+            name=["main_series"],
+        )
+        assert_matches_type(BotTimeseriesResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.bots.with_raw_response.timeseries()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bot = await response.parse()
+        assert_matches_type(BotTimeseriesResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.bots.with_streaming_response.timeseries() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bot = await response.parse()
+            assert_matches_type(BotTimeseriesResponse, bot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        bot = await async_client.radar.bots.timeseries_groups(
+            dimension="BOT",
+        )
+        assert_matches_type(BotTimeseriesGroupsResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_groups_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        bot = await async_client.radar.bots.timeseries_groups(
+            dimension="BOT",
+            agg_interval="1h",
+            asn=["string"],
+            bot=["string"],
+            bot_category=["SEARCH_ENGINE_CRAWLER"],
+            bot_kind=["AGENT"],
+            bot_operator=["string"],
+            bot_verification_status=["VERIFIED"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+        )
+        assert_matches_type(BotTimeseriesGroupsResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.bots.with_raw_response.timeseries_groups(
+            dimension="BOT",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        bot = await response.parse()
+        assert_matches_type(BotTimeseriesGroupsResponse, bot, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.bots.with_streaming_response.timeseries_groups(
+            dimension="BOT",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            bot = await response.parse()
+            assert_matches_type(BotTimeseriesGroupsResponse, bot, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/test_ct.py b/tests/api_resources/radar/test_ct.py
new file mode 100644
index 00000000000..a5ccdca6e4b
--- /dev/null
+++ b/tests/api_resources/radar/test_ct.py
@@ -0,0 +1,375 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar import (
+    CTSummaryResponse,
+    CTTimeseriesResponse,
+    CTTimeseriesGroupsResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCT:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_summary(self, client: Cloudflare) -> None:
+        ct = client.radar.ct.summary(
+            dimension="CA",
+        )
+        assert_matches_type(CTSummaryResponse, ct, path=["response"])
+
+    @parametrize
+    def test_method_summary_with_all_params(self, client: Cloudflare) -> None:
+        ct = client.radar.ct.summary(
+            dimension="CA",
+            ca=["string"],
+            ca_owner=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            duration=["LTE_3D"],
+            entry_type=["PRECERTIFICATE"],
+            expiration_status=["EXPIRED"],
+            format="JSON",
+            has_ips=[True],
+            has_wildcards=[True],
+            limit_per_group=10,
+            log=["string"],
+            log_api=["RFC6962"],
+            log_operator=["string"],
+            name=["main_series"],
+            normalization="RAW_VALUES",
+            public_key_algorithm=["DSA"],
+            signature_algorithm=["DSA_SHA_1"],
+            tld=["com"],
+            unique_entries=["true"],
+            validation_level=["DOMAIN"],
+        )
+        assert_matches_type(CTSummaryResponse, ct, path=["response"])
+
+    @parametrize
+    def test_raw_response_summary(self, client: Cloudflare) -> None:
+        response = client.radar.ct.with_raw_response.summary(
+            dimension="CA",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ct = response.parse()
+        assert_matches_type(CTSummaryResponse, ct, path=["response"])
+
+    @parametrize
+    def test_streaming_response_summary(self, client: Cloudflare) -> None:
+        with client.radar.ct.with_streaming_response.summary(
+            dimension="CA",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ct = response.parse()
+            assert_matches_type(CTSummaryResponse, ct, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_timeseries(self, client: Cloudflare) -> None:
+        ct = client.radar.ct.timeseries()
+        assert_matches_type(CTTimeseriesResponse, ct, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_with_all_params(self, client: Cloudflare) -> None:
+        ct = client.radar.ct.timeseries(
+            agg_interval="1h",
+            ca=["string"],
+            ca_owner=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            duration=["LTE_3D"],
+            entry_type=["PRECERTIFICATE"],
+            expiration_status=["EXPIRED"],
+            format="JSON",
+            has_ips=[True],
+            has_wildcards=[True],
+            log=["string"],
+            log_api=["RFC6962"],
+            log_operator=["string"],
+            name=["main_series"],
+            public_key_algorithm=["DSA"],
+            signature_algorithm=["DSA_SHA_1"],
+            tld=["com"],
+            unique_entries=["true"],
+            validation_level=["DOMAIN"],
+        )
+        assert_matches_type(CTTimeseriesResponse, ct, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries(self, client: Cloudflare) -> None:
+        response = client.radar.ct.with_raw_response.timeseries()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ct = response.parse()
+        assert_matches_type(CTTimeseriesResponse, ct, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries(self, client: Cloudflare) -> None:
+        with client.radar.ct.with_streaming_response.timeseries() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ct = response.parse()
+            assert_matches_type(CTTimeseriesResponse, ct, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_timeseries_groups(self, client: Cloudflare) -> None:
+        ct = client.radar.ct.timeseries_groups(
+            dimension="CA",
+        )
+        assert_matches_type(CTTimeseriesGroupsResponse, ct, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_groups_with_all_params(self, client: Cloudflare) -> None:
+        ct = client.radar.ct.timeseries_groups(
+            dimension="CA",
+            agg_interval="1h",
+            ca=["string"],
+            ca_owner=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            duration=["LTE_3D"],
+            entry_type=["PRECERTIFICATE"],
+            expiration_status=["EXPIRED"],
+            format="JSON",
+            has_ips=[True],
+            has_wildcards=[True],
+            limit_per_group=10,
+            log=["string"],
+            log_api=["RFC6962"],
+            log_operator=["string"],
+            name=["main_series"],
+            normalization="RAW_VALUES",
+            public_key_algorithm=["DSA"],
+            signature_algorithm=["DSA_SHA_1"],
+            tld=["com"],
+            unique_entries=["true"],
+            validation_level=["DOMAIN"],
+        )
+        assert_matches_type(CTTimeseriesGroupsResponse, ct, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries_groups(self, client: Cloudflare) -> None:
+        response = client.radar.ct.with_raw_response.timeseries_groups(
+            dimension="CA",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ct = response.parse()
+        assert_matches_type(CTTimeseriesGroupsResponse, ct, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries_groups(self, client: Cloudflare) -> None:
+        with client.radar.ct.with_streaming_response.timeseries_groups(
+            dimension="CA",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ct = response.parse()
+            assert_matches_type(CTTimeseriesGroupsResponse, ct, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncCT:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_summary(self, async_client: AsyncCloudflare) -> None:
+        ct = await async_client.radar.ct.summary(
+            dimension="CA",
+        )
+        assert_matches_type(CTSummaryResponse, ct, path=["response"])
+
+    @parametrize
+    async def test_method_summary_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        ct = await async_client.radar.ct.summary(
+            dimension="CA",
+            ca=["string"],
+            ca_owner=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            duration=["LTE_3D"],
+            entry_type=["PRECERTIFICATE"],
+            expiration_status=["EXPIRED"],
+            format="JSON",
+            has_ips=[True],
+            has_wildcards=[True],
+            limit_per_group=10,
+            log=["string"],
+            log_api=["RFC6962"],
+            log_operator=["string"],
+            name=["main_series"],
+            normalization="RAW_VALUES",
+            public_key_algorithm=["DSA"],
+            signature_algorithm=["DSA_SHA_1"],
+            tld=["com"],
+            unique_entries=["true"],
+            validation_level=["DOMAIN"],
+        )
+        assert_matches_type(CTSummaryResponse, ct, path=["response"])
+
+    @parametrize
+    async def test_raw_response_summary(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.ct.with_raw_response.summary(
+            dimension="CA",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ct = await response.parse()
+        assert_matches_type(CTSummaryResponse, ct, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_summary(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.ct.with_streaming_response.summary(
+            dimension="CA",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ct = await response.parse()
+            assert_matches_type(CTSummaryResponse, ct, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
+        ct = await async_client.radar.ct.timeseries()
+        assert_matches_type(CTTimeseriesResponse, ct, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        ct = await async_client.radar.ct.timeseries(
+            agg_interval="1h",
+            ca=["string"],
+            ca_owner=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            duration=["LTE_3D"],
+            entry_type=["PRECERTIFICATE"],
+            expiration_status=["EXPIRED"],
+            format="JSON",
+            has_ips=[True],
+            has_wildcards=[True],
+            log=["string"],
+            log_api=["RFC6962"],
+            log_operator=["string"],
+            name=["main_series"],
+            public_key_algorithm=["DSA"],
+            signature_algorithm=["DSA_SHA_1"],
+            tld=["com"],
+            unique_entries=["true"],
+            validation_level=["DOMAIN"],
+        )
+        assert_matches_type(CTTimeseriesResponse, ct, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.ct.with_raw_response.timeseries()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ct = await response.parse()
+        assert_matches_type(CTTimeseriesResponse, ct, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.ct.with_streaming_response.timeseries() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ct = await response.parse()
+            assert_matches_type(CTTimeseriesResponse, ct, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        ct = await async_client.radar.ct.timeseries_groups(
+            dimension="CA",
+        )
+        assert_matches_type(CTTimeseriesGroupsResponse, ct, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_groups_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        ct = await async_client.radar.ct.timeseries_groups(
+            dimension="CA",
+            agg_interval="1h",
+            ca=["string"],
+            ca_owner=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            duration=["LTE_3D"],
+            entry_type=["PRECERTIFICATE"],
+            expiration_status=["EXPIRED"],
+            format="JSON",
+            has_ips=[True],
+            has_wildcards=[True],
+            limit_per_group=10,
+            log=["string"],
+            log_api=["RFC6962"],
+            log_operator=["string"],
+            name=["main_series"],
+            normalization="RAW_VALUES",
+            public_key_algorithm=["DSA"],
+            signature_algorithm=["DSA_SHA_1"],
+            tld=["com"],
+            unique_entries=["true"],
+            validation_level=["DOMAIN"],
+        )
+        assert_matches_type(CTTimeseriesGroupsResponse, ct, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.ct.with_raw_response.timeseries_groups(
+            dimension="CA",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ct = await response.parse()
+        assert_matches_type(CTTimeseriesGroupsResponse, ct, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.ct.with_streaming_response.timeseries_groups(
+            dimension="CA",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ct = await response.parse()
+            assert_matches_type(CTTimeseriesGroupsResponse, ct, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/test_datasets.py b/tests/api_resources/radar/test_datasets.py
index 571fffac223..f4e89f66d31 100644
--- a/tests/api_resources/radar/test_datasets.py
+++ b/tests/api_resources/radar/test_datasets.py
@@ -9,6 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
+from cloudflare._utils import parse_date
 from cloudflare.types.radar import (
     DatasetListResponse,
     DatasetDownloadResponse,
@@ -29,8 +30,9 @@ def test_method_list(self, client: Cloudflare) -> None:
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         dataset = client.radar.datasets.list(
             dataset_type="RANKING_BUCKET",
+            date=parse_date("2024-09-19"),
             format="JSON",
-            limit=5,
+            limit=1,
             offset=0,
         )
         assert_matches_type(DatasetListResponse, dataset, path=["response"])
@@ -134,7 +136,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncDatasets:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
@@ -145,8 +149,9 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         dataset = await async_client.radar.datasets.list(
             dataset_type="RANKING_BUCKET",
+            date=parse_date("2024-09-19"),
             format="JSON",
-            limit=5,
+            limit=1,
             offset=0,
         )
         assert_matches_type(DatasetListResponse, dataset, path=["response"])
diff --git a/tests/api_resources/radar/test_dns.py b/tests/api_resources/radar/test_dns.py
new file mode 100644
index 00000000000..9d11fe15abb
--- /dev/null
+++ b/tests/api_resources/radar/test_dns.py
@@ -0,0 +1,373 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar import (
+    DNSSummaryV2Response,
+    DNSTimeseriesResponse,
+    DNSTimeseriesGroupsV2Response,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestDNS:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_summary_v2(self, client: Cloudflare) -> None:
+        dns = client.radar.dns.summary_v2(
+            dimension="IP_VERSION",
+        )
+        assert_matches_type(DNSSummaryV2Response, dns, path=["response"])
+
+    @parametrize
+    def test_method_summary_v2_with_all_params(self, client: Cloudflare) -> None:
+        dns = client.radar.dns.summary_v2(
+            dimension="IP_VERSION",
+            asn=["string"],
+            cache_hit=[True],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dnssec=["INVALID"],
+            dnssec_aware=["SUPPORTED"],
+            dnssec_e2e=[True],
+            format="JSON",
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            location=["string"],
+            matching_answer=[True],
+            name=["main_series"],
+            nodata=[True],
+            protocol=["UDP"],
+            query_type=["A"],
+            response_code=["NOERROR"],
+            response_ttl=["LTE_1M"],
+            tld=["com"],
+        )
+        assert_matches_type(DNSSummaryV2Response, dns, path=["response"])
+
+    @parametrize
+    def test_raw_response_summary_v2(self, client: Cloudflare) -> None:
+        response = client.radar.dns.with_raw_response.summary_v2(
+            dimension="IP_VERSION",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns = response.parse()
+        assert_matches_type(DNSSummaryV2Response, dns, path=["response"])
+
+    @parametrize
+    def test_streaming_response_summary_v2(self, client: Cloudflare) -> None:
+        with client.radar.dns.with_streaming_response.summary_v2(
+            dimension="IP_VERSION",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns = response.parse()
+            assert_matches_type(DNSSummaryV2Response, dns, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_timeseries(self, client: Cloudflare) -> None:
+        dns = client.radar.dns.timeseries()
+        assert_matches_type(DNSTimeseriesResponse, dns, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_with_all_params(self, client: Cloudflare) -> None:
+        dns = client.radar.dns.timeseries(
+            agg_interval="1h",
+            asn=["string"],
+            cache_hit=[True],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dnssec=["INVALID"],
+            dnssec_aware=["SUPPORTED"],
+            dnssec_e2e=[True],
+            format="JSON",
+            ip_version=["IPv4"],
+            location=["string"],
+            matching_answer=[True],
+            name=["main_series"],
+            nodata=[True],
+            protocol=["UDP"],
+            query_type=["A"],
+            response_code=["NOERROR"],
+            response_ttl=["LTE_1M"],
+            tld=["com"],
+        )
+        assert_matches_type(DNSTimeseriesResponse, dns, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries(self, client: Cloudflare) -> None:
+        response = client.radar.dns.with_raw_response.timeseries()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns = response.parse()
+        assert_matches_type(DNSTimeseriesResponse, dns, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries(self, client: Cloudflare) -> None:
+        with client.radar.dns.with_streaming_response.timeseries() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns = response.parse()
+            assert_matches_type(DNSTimeseriesResponse, dns, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        dns = client.radar.dns.timeseries_groups_v2(
+            dimension="IP_VERSION",
+        )
+        assert_matches_type(DNSTimeseriesGroupsV2Response, dns, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_groups_v2_with_all_params(self, client: Cloudflare) -> None:
+        dns = client.radar.dns.timeseries_groups_v2(
+            dimension="IP_VERSION",
+            agg_interval="1h",
+            asn=["string"],
+            cache_hit=[True],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dnssec=["INVALID"],
+            dnssec_aware=["SUPPORTED"],
+            dnssec_e2e=[True],
+            format="JSON",
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            location=["string"],
+            matching_answer=[True],
+            name=["main_series"],
+            nodata=[True],
+            normalization="PERCENTAGE",
+            protocol=["UDP"],
+            query_type=["A"],
+            response_code=["NOERROR"],
+            response_ttl=["LTE_1M"],
+            tld=["com"],
+        )
+        assert_matches_type(DNSTimeseriesGroupsV2Response, dns, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        response = client.radar.dns.with_raw_response.timeseries_groups_v2(
+            dimension="IP_VERSION",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns = response.parse()
+        assert_matches_type(DNSTimeseriesGroupsV2Response, dns, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        with client.radar.dns.with_streaming_response.timeseries_groups_v2(
+            dimension="IP_VERSION",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns = response.parse()
+            assert_matches_type(DNSTimeseriesGroupsV2Response, dns, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncDNS:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        dns = await async_client.radar.dns.summary_v2(
+            dimension="IP_VERSION",
+        )
+        assert_matches_type(DNSSummaryV2Response, dns, path=["response"])
+
+    @parametrize
+    async def test_method_summary_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        dns = await async_client.radar.dns.summary_v2(
+            dimension="IP_VERSION",
+            asn=["string"],
+            cache_hit=[True],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dnssec=["INVALID"],
+            dnssec_aware=["SUPPORTED"],
+            dnssec_e2e=[True],
+            format="JSON",
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            location=["string"],
+            matching_answer=[True],
+            name=["main_series"],
+            nodata=[True],
+            protocol=["UDP"],
+            query_type=["A"],
+            response_code=["NOERROR"],
+            response_ttl=["LTE_1M"],
+            tld=["com"],
+        )
+        assert_matches_type(DNSSummaryV2Response, dns, path=["response"])
+
+    @parametrize
+    async def test_raw_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.dns.with_raw_response.summary_v2(
+            dimension="IP_VERSION",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns = await response.parse()
+        assert_matches_type(DNSSummaryV2Response, dns, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.dns.with_streaming_response.summary_v2(
+            dimension="IP_VERSION",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns = await response.parse()
+            assert_matches_type(DNSSummaryV2Response, dns, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
+        dns = await async_client.radar.dns.timeseries()
+        assert_matches_type(DNSTimeseriesResponse, dns, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        dns = await async_client.radar.dns.timeseries(
+            agg_interval="1h",
+            asn=["string"],
+            cache_hit=[True],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dnssec=["INVALID"],
+            dnssec_aware=["SUPPORTED"],
+            dnssec_e2e=[True],
+            format="JSON",
+            ip_version=["IPv4"],
+            location=["string"],
+            matching_answer=[True],
+            name=["main_series"],
+            nodata=[True],
+            protocol=["UDP"],
+            query_type=["A"],
+            response_code=["NOERROR"],
+            response_ttl=["LTE_1M"],
+            tld=["com"],
+        )
+        assert_matches_type(DNSTimeseriesResponse, dns, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.dns.with_raw_response.timeseries()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns = await response.parse()
+        assert_matches_type(DNSTimeseriesResponse, dns, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.dns.with_streaming_response.timeseries() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns = await response.parse()
+            assert_matches_type(DNSTimeseriesResponse, dns, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        dns = await async_client.radar.dns.timeseries_groups_v2(
+            dimension="IP_VERSION",
+        )
+        assert_matches_type(DNSTimeseriesGroupsV2Response, dns, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_groups_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        dns = await async_client.radar.dns.timeseries_groups_v2(
+            dimension="IP_VERSION",
+            agg_interval="1h",
+            asn=["string"],
+            cache_hit=[True],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            dnssec=["INVALID"],
+            dnssec_aware=["SUPPORTED"],
+            dnssec_e2e=[True],
+            format="JSON",
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            location=["string"],
+            matching_answer=[True],
+            name=["main_series"],
+            nodata=[True],
+            normalization="PERCENTAGE",
+            protocol=["UDP"],
+            query_type=["A"],
+            response_code=["NOERROR"],
+            response_ttl=["LTE_1M"],
+            tld=["com"],
+        )
+        assert_matches_type(DNSTimeseriesGroupsV2Response, dns, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.dns.with_raw_response.timeseries_groups_v2(
+            dimension="IP_VERSION",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns = await response.parse()
+        assert_matches_type(DNSTimeseriesGroupsV2Response, dns, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.dns.with_streaming_response.timeseries_groups_v2(
+            dimension="IP_VERSION",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns = await response.parse()
+            assert_matches_type(DNSTimeseriesGroupsV2Response, dns, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/test_entities.py b/tests/api_resources/radar/test_entities.py
index a9a5a170bf0..9c3d1f16731 100644
--- a/tests/api_resources/radar/test_entities.py
+++ b/tests/api_resources/radar/test_entities.py
@@ -58,7 +58,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncEntities:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/radar/test_geolocations.py b/tests/api_resources/radar/test_geolocations.py
new file mode 100644
index 00000000000..95245aed1eb
--- /dev/null
+++ b/tests/api_resources/radar/test_geolocations.py
@@ -0,0 +1,191 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.radar import (
+    GeolocationGetResponse,
+    GeolocationListResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestGeolocations:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        geolocation = client.radar.geolocations.list()
+        assert_matches_type(GeolocationListResponse, geolocation, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        geolocation = client.radar.geolocations.list(
+            format="JSON",
+            geo_id="3190509,360689",
+            limit=1,
+            location="US,CA",
+            offset=0,
+        )
+        assert_matches_type(GeolocationListResponse, geolocation, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.radar.geolocations.with_raw_response.list()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        geolocation = response.parse()
+        assert_matches_type(GeolocationListResponse, geolocation, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.radar.geolocations.with_streaming_response.list() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            geolocation = response.parse()
+            assert_matches_type(GeolocationListResponse, geolocation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        geolocation = client.radar.geolocations.get(
+            geo_id="3190509",
+        )
+        assert_matches_type(GeolocationGetResponse, geolocation, path=["response"])
+
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        geolocation = client.radar.geolocations.get(
+            geo_id="3190509",
+            format="JSON",
+        )
+        assert_matches_type(GeolocationGetResponse, geolocation, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.radar.geolocations.with_raw_response.get(
+            geo_id="3190509",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        geolocation = response.parse()
+        assert_matches_type(GeolocationGetResponse, geolocation, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.radar.geolocations.with_streaming_response.get(
+            geo_id="3190509",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            geolocation = response.parse()
+            assert_matches_type(GeolocationGetResponse, geolocation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `geo_id` but received ''"):
+            client.radar.geolocations.with_raw_response.get(
+                geo_id="",
+            )
+
+
+class TestAsyncGeolocations:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        geolocation = await async_client.radar.geolocations.list()
+        assert_matches_type(GeolocationListResponse, geolocation, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        geolocation = await async_client.radar.geolocations.list(
+            format="JSON",
+            geo_id="3190509,360689",
+            limit=1,
+            location="US,CA",
+            offset=0,
+        )
+        assert_matches_type(GeolocationListResponse, geolocation, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.geolocations.with_raw_response.list()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        geolocation = await response.parse()
+        assert_matches_type(GeolocationListResponse, geolocation, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.geolocations.with_streaming_response.list() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            geolocation = await response.parse()
+            assert_matches_type(GeolocationListResponse, geolocation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        geolocation = await async_client.radar.geolocations.get(
+            geo_id="3190509",
+        )
+        assert_matches_type(GeolocationGetResponse, geolocation, path=["response"])
+
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        geolocation = await async_client.radar.geolocations.get(
+            geo_id="3190509",
+            format="JSON",
+        )
+        assert_matches_type(GeolocationGetResponse, geolocation, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.geolocations.with_raw_response.get(
+            geo_id="3190509",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        geolocation = await response.parse()
+        assert_matches_type(GeolocationGetResponse, geolocation, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.geolocations.with_streaming_response.get(
+            geo_id="3190509",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            geolocation = await response.parse()
+            assert_matches_type(GeolocationGetResponse, geolocation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `geo_id` but received ''"):
+            await async_client.radar.geolocations.with_raw_response.get(
+                geo_id="",
+            )
diff --git a/tests/api_resources/radar/test_http.py b/tests/api_resources/radar/test_http.py
index a71996ed209..cd432fea405 100644
--- a/tests/api_resources/radar/test_http.py
+++ b/tests/api_resources/radar/test_http.py
@@ -10,7 +10,11 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare._utils import parse_datetime
-from cloudflare.types.radar import HTTPTimeseriesResponse
+from cloudflare.types.radar import (
+    HTTPSummaryV2Response,
+    HTTPTimeseriesResponse,
+    HTTPTimeseriesGroupsV2Response,
+)
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -18,6 +22,61 @@
 class TestHTTP:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @parametrize
+    def test_method_summary_v2(self, client: Cloudflare) -> None:
+        http = client.radar.http.summary_v2(
+            dimension="ADM1",
+        )
+        assert_matches_type(HTTPSummaryV2Response, http, path=["response"])
+
+    @parametrize
+    def test_method_summary_v2_with_all_params(self, client: Cloudflare) -> None:
+        http = client.radar.http.summary_v2(
+            dimension="ADM1",
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
+            format="JSON",
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
+        )
+        assert_matches_type(HTTPSummaryV2Response, http, path=["response"])
+
+    @parametrize
+    def test_raw_response_summary_v2(self, client: Cloudflare) -> None:
+        response = client.radar.http.with_raw_response.summary_v2(
+            dimension="ADM1",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        http = response.parse()
+        assert_matches_type(HTTPSummaryV2Response, http, path=["response"])
+
+    @parametrize
+    def test_streaming_response_summary_v2(self, client: Cloudflare) -> None:
+        with client.radar.http.with_streaming_response.summary_v2(
+            dimension="ADM1",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            http = response.parse()
+            assert_matches_type(HTTPSummaryV2Response, http, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
     @parametrize
     def test_method_timeseries(self, client: Cloudflare) -> None:
         http = client.radar.http.timeseries()
@@ -27,22 +86,24 @@ def test_method_timeseries(self, client: Cloudflare) -> None:
     def test_method_timeseries_with_all_params(self, client: Cloudflare) -> None:
         http = client.radar.http.timeseries(
             agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            location=["string"],
+            name=["main_series"],
+            normalization="MIN0_MAX",
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(HTTPTimeseriesResponse, http, path=["response"])
 
@@ -66,9 +127,123 @@ def test_streaming_response_timeseries(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @parametrize
+    def test_method_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        http = client.radar.http.timeseries_groups_v2(
+            dimension="ADM1",
+        )
+        assert_matches_type(HTTPTimeseriesGroupsV2Response, http, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_groups_v2_with_all_params(self, client: Cloudflare) -> None:
+        http = client.radar.http.timeseries_groups_v2(
+            dimension="ADM1",
+            agg_interval="1h",
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
+            format="JSON",
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            normalization="PERCENTAGE",
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
+        )
+        assert_matches_type(HTTPTimeseriesGroupsV2Response, http, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        response = client.radar.http.with_raw_response.timeseries_groups_v2(
+            dimension="ADM1",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        http = response.parse()
+        assert_matches_type(HTTPTimeseriesGroupsV2Response, http, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        with client.radar.http.with_streaming_response.timeseries_groups_v2(
+            dimension="ADM1",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            http = response.parse()
+            assert_matches_type(HTTPTimeseriesGroupsV2Response, http, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
 
 class TestAsyncHTTP:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        http = await async_client.radar.http.summary_v2(
+            dimension="ADM1",
+        )
+        assert_matches_type(HTTPSummaryV2Response, http, path=["response"])
+
+    @parametrize
+    async def test_method_summary_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        http = await async_client.radar.http.summary_v2(
+            dimension="ADM1",
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
+            format="JSON",
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
+        )
+        assert_matches_type(HTTPSummaryV2Response, http, path=["response"])
+
+    @parametrize
+    async def test_raw_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.http.with_raw_response.summary_v2(
+            dimension="ADM1",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        http = await response.parse()
+        assert_matches_type(HTTPSummaryV2Response, http, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.http.with_streaming_response.summary_v2(
+            dimension="ADM1",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            http = await response.parse()
+            assert_matches_type(HTTPSummaryV2Response, http, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
@@ -79,22 +254,24 @@ async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
     async def test_method_timeseries_with_all_params(self, async_client: AsyncCloudflare) -> None:
         http = await async_client.radar.http.timeseries(
             agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            browser_family=["CHROME"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
             format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            location=["string"],
+            name=["main_series"],
+            normalization="MIN0_MAX",
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
         )
         assert_matches_type(HTTPTimeseriesResponse, http, path=["response"])
 
@@ -117,3 +294,60 @@ async def test_streaming_response_timeseries(self, async_client: AsyncCloudflare
             assert_matches_type(HTTPTimeseriesResponse, http, path=["response"])
 
         assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        http = await async_client.radar.http.timeseries_groups_v2(
+            dimension="ADM1",
+        )
+        assert_matches_type(HTTPTimeseriesGroupsV2Response, http, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_groups_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        http = await async_client.radar.http.timeseries_groups_v2(
+            dimension="ADM1",
+            agg_interval="1h",
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            device_type=["DESKTOP"],
+            format="JSON",
+            geo_id=["string"],
+            http_protocol=["HTTP"],
+            http_version=["HTTPv1"],
+            ip_version=["IPv4"],
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            normalization="PERCENTAGE",
+            os=["WINDOWS"],
+            tls_version=["TLSv1_0"],
+        )
+        assert_matches_type(HTTPTimeseriesGroupsV2Response, http, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.http.with_raw_response.timeseries_groups_v2(
+            dimension="ADM1",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        http = await response.parse()
+        assert_matches_type(HTTPTimeseriesGroupsV2Response, http, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.http.with_streaming_response.timeseries_groups_v2(
+            dimension="ADM1",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            http = await response.parse()
+            assert_matches_type(HTTPTimeseriesGroupsV2Response, http, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/test_leaked_credentials.py b/tests/api_resources/radar/test_leaked_credentials.py
new file mode 100644
index 00000000000..c214da52983
--- /dev/null
+++ b/tests/api_resources/radar/test_leaked_credentials.py
@@ -0,0 +1,230 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.radar import (
+    LeakedCredentialSummaryV2Response,
+    LeakedCredentialTimeseriesGroupsV2Response,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestLeakedCredentials:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_summary_v2(self, client: Cloudflare) -> None:
+        leaked_credential = client.radar.leaked_credentials.summary_v2(
+            dimension="COMPROMISED",
+        )
+        assert_matches_type(LeakedCredentialSummaryV2Response, leaked_credential, path=["response"])
+
+    @parametrize
+    def test_method_summary_v2_with_all_params(self, client: Cloudflare) -> None:
+        leaked_credential = client.radar.leaked_credentials.summary_v2(
+            dimension="COMPROMISED",
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            compromised=["CLEAN"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+        )
+        assert_matches_type(LeakedCredentialSummaryV2Response, leaked_credential, path=["response"])
+
+    @parametrize
+    def test_raw_response_summary_v2(self, client: Cloudflare) -> None:
+        response = client.radar.leaked_credentials.with_raw_response.summary_v2(
+            dimension="COMPROMISED",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        leaked_credential = response.parse()
+        assert_matches_type(LeakedCredentialSummaryV2Response, leaked_credential, path=["response"])
+
+    @parametrize
+    def test_streaming_response_summary_v2(self, client: Cloudflare) -> None:
+        with client.radar.leaked_credentials.with_streaming_response.summary_v2(
+            dimension="COMPROMISED",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            leaked_credential = response.parse()
+            assert_matches_type(LeakedCredentialSummaryV2Response, leaked_credential, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        leaked_credential = client.radar.leaked_credentials.timeseries_groups_v2(
+            dimension="COMPROMISED",
+        )
+        assert_matches_type(LeakedCredentialTimeseriesGroupsV2Response, leaked_credential, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_groups_v2_with_all_params(self, client: Cloudflare) -> None:
+        leaked_credential = client.radar.leaked_credentials.timeseries_groups_v2(
+            dimension="COMPROMISED",
+            agg_interval="1h",
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            check_result=["CLEAN"],
+            compromised=["CLEAN"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            normalization="MIN0_MAX",
+        )
+        assert_matches_type(LeakedCredentialTimeseriesGroupsV2Response, leaked_credential, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        response = client.radar.leaked_credentials.with_raw_response.timeseries_groups_v2(
+            dimension="COMPROMISED",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        leaked_credential = response.parse()
+        assert_matches_type(LeakedCredentialTimeseriesGroupsV2Response, leaked_credential, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries_groups_v2(self, client: Cloudflare) -> None:
+        with client.radar.leaked_credentials.with_streaming_response.timeseries_groups_v2(
+            dimension="COMPROMISED",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            leaked_credential = response.parse()
+            assert_matches_type(LeakedCredentialTimeseriesGroupsV2Response, leaked_credential, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+
+class TestAsyncLeakedCredentials:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        leaked_credential = await async_client.radar.leaked_credentials.summary_v2(
+            dimension="COMPROMISED",
+        )
+        assert_matches_type(LeakedCredentialSummaryV2Response, leaked_credential, path=["response"])
+
+    @parametrize
+    async def test_method_summary_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        leaked_credential = await async_client.radar.leaked_credentials.summary_v2(
+            dimension="COMPROMISED",
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            compromised=["CLEAN"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+        )
+        assert_matches_type(LeakedCredentialSummaryV2Response, leaked_credential, path=["response"])
+
+    @parametrize
+    async def test_raw_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.leaked_credentials.with_raw_response.summary_v2(
+            dimension="COMPROMISED",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        leaked_credential = await response.parse()
+        assert_matches_type(LeakedCredentialSummaryV2Response, leaked_credential, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.leaked_credentials.with_streaming_response.summary_v2(
+            dimension="COMPROMISED",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            leaked_credential = await response.parse()
+            assert_matches_type(LeakedCredentialSummaryV2Response, leaked_credential, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        leaked_credential = await async_client.radar.leaked_credentials.timeseries_groups_v2(
+            dimension="COMPROMISED",
+        )
+        assert_matches_type(LeakedCredentialTimeseriesGroupsV2Response, leaked_credential, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_groups_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        leaked_credential = await async_client.radar.leaked_credentials.timeseries_groups_v2(
+            dimension="COMPROMISED",
+            agg_interval="1h",
+            asn=["string"],
+            bot_class=["LIKELY_AUTOMATED"],
+            check_result=["CLEAN"],
+            compromised=["CLEAN"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            normalization="MIN0_MAX",
+        )
+        assert_matches_type(LeakedCredentialTimeseriesGroupsV2Response, leaked_credential, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.leaked_credentials.with_raw_response.timeseries_groups_v2(
+            dimension="COMPROMISED",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        leaked_credential = await response.parse()
+        assert_matches_type(LeakedCredentialTimeseriesGroupsV2Response, leaked_credential, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries_groups_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.leaked_credentials.with_streaming_response.timeseries_groups_v2(
+            dimension="COMPROMISED",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            leaked_credential = await response.parse()
+            assert_matches_type(LeakedCredentialTimeseriesGroupsV2Response, leaked_credential, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/test_netflows.py b/tests/api_resources/radar/test_netflows.py
index 04df3a371fd..40e6a04624c 100644
--- a/tests/api_resources/radar/test_netflows.py
+++ b/tests/api_resources/radar/test_netflows.py
@@ -10,43 +10,138 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare._utils import parse_datetime
-from cloudflare.types.radar import NetflowTimeseriesResponse
+from cloudflare.types.radar import (
+    NetFlowsSummaryResponse,
+    NetFlowsSummaryV2Response,
+    NetFlowsTimeseriesResponse,
+    NetFlowsTimeseriesGroupsResponse,
+)
+
+# pyright: reportDeprecated=false
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
-class TestNetflows:
+class TestNetFlows:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @parametrize
+    def test_method_summary(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            netflows = client.radar.netflows.summary()
+
+        assert_matches_type(NetFlowsSummaryResponse, netflows, path=["response"])
+
+    @parametrize
+    def test_method_summary_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            netflows = client.radar.netflows.summary(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                geo_id=["string"],
+                location=["string"],
+                name=["main_series"],
+            )
+
+        assert_matches_type(NetFlowsSummaryResponse, netflows, path=["response"])
+
+    @parametrize
+    def test_raw_response_summary(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.netflows.with_raw_response.summary()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        netflows = response.parse()
+        assert_matches_type(NetFlowsSummaryResponse, netflows, path=["response"])
+
+    @parametrize
+    def test_streaming_response_summary(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.radar.netflows.with_streaming_response.summary() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                netflows = response.parse()
+                assert_matches_type(NetFlowsSummaryResponse, netflows, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_summary_v2(self, client: Cloudflare) -> None:
+        netflows = client.radar.netflows.summary_v2(
+            dimension="ADM1",
+        )
+        assert_matches_type(NetFlowsSummaryV2Response, netflows, path=["response"])
+
+    @parametrize
+    def test_method_summary_v2_with_all_params(self, client: Cloudflare) -> None:
+        netflows = client.radar.netflows.summary_v2(
+            dimension="ADM1",
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            geo_id=["string"],
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            product=["HTTP"],
+        )
+        assert_matches_type(NetFlowsSummaryV2Response, netflows, path=["response"])
+
+    @parametrize
+    def test_raw_response_summary_v2(self, client: Cloudflare) -> None:
+        response = client.radar.netflows.with_raw_response.summary_v2(
+            dimension="ADM1",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        netflows = response.parse()
+        assert_matches_type(NetFlowsSummaryV2Response, netflows, path=["response"])
+
+    @parametrize
+    def test_streaming_response_summary_v2(self, client: Cloudflare) -> None:
+        with client.radar.netflows.with_streaming_response.summary_v2(
+            dimension="ADM1",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            netflows = response.parse()
+            assert_matches_type(NetFlowsSummaryV2Response, netflows, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
     @parametrize
     def test_method_timeseries(self, client: Cloudflare) -> None:
-        netflow = client.radar.netflows.timeseries()
-        assert_matches_type(NetflowTimeseriesResponse, netflow, path=["response"])
+        netflows = client.radar.netflows.timeseries()
+        assert_matches_type(NetFlowsTimeseriesResponse, netflows, path=["response"])
 
     @parametrize
     def test_method_timeseries_with_all_params(self, client: Cloudflare) -> None:
-        netflow = client.radar.netflows.timeseries(
+        netflows = client.radar.netflows.timeseries(
             agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            geo_id=["string"],
+            location=["string"],
+            name=["main_series"],
             normalization="MIN0_MAX",
-            product=["HTTP", "ALL"],
+            product=["HTTP"],
         )
-        assert_matches_type(NetflowTimeseriesResponse, netflow, path=["response"])
+        assert_matches_type(NetFlowsTimeseriesResponse, netflows, path=["response"])
 
     @parametrize
     def test_raw_response_timeseries(self, client: Cloudflare) -> None:
@@ -54,8 +149,8 @@ def test_raw_response_timeseries(self, client: Cloudflare) -> None:
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        netflow = response.parse()
-        assert_matches_type(NetflowTimeseriesResponse, netflow, path=["response"])
+        netflows = response.parse()
+        assert_matches_type(NetFlowsTimeseriesResponse, netflows, path=["response"])
 
     @parametrize
     def test_streaming_response_timeseries(self, client: Cloudflare) -> None:
@@ -63,44 +158,185 @@ def test_streaming_response_timeseries(self, client: Cloudflare) -> None:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            netflow = response.parse()
-            assert_matches_type(NetflowTimeseriesResponse, netflow, path=["response"])
+            netflows = response.parse()
+            assert_matches_type(NetFlowsTimeseriesResponse, netflows, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_timeseries_groups(self, client: Cloudflare) -> None:
+        netflows = client.radar.netflows.timeseries_groups(
+            dimension="ADM1",
+        )
+        assert_matches_type(NetFlowsTimeseriesGroupsResponse, netflows, path=["response"])
+
+    @parametrize
+    def test_method_timeseries_groups_with_all_params(self, client: Cloudflare) -> None:
+        netflows = client.radar.netflows.timeseries_groups(
+            dimension="ADM1",
+            agg_interval="1h",
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            geo_id=["string"],
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            normalization="PERCENTAGE",
+            product=["HTTP"],
+        )
+        assert_matches_type(NetFlowsTimeseriesGroupsResponse, netflows, path=["response"])
+
+    @parametrize
+    def test_raw_response_timeseries_groups(self, client: Cloudflare) -> None:
+        response = client.radar.netflows.with_raw_response.timeseries_groups(
+            dimension="ADM1",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        netflows = response.parse()
+        assert_matches_type(NetFlowsTimeseriesGroupsResponse, netflows, path=["response"])
+
+    @parametrize
+    def test_streaming_response_timeseries_groups(self, client: Cloudflare) -> None:
+        with client.radar.netflows.with_streaming_response.timeseries_groups(
+            dimension="ADM1",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            netflows = response.parse()
+            assert_matches_type(NetFlowsTimeseriesGroupsResponse, netflows, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
-class TestAsyncNetflows:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+class TestAsyncNetFlows:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_summary(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            netflows = await async_client.radar.netflows.summary()
+
+        assert_matches_type(NetFlowsSummaryResponse, netflows, path=["response"])
+
+    @parametrize
+    async def test_method_summary_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            netflows = await async_client.radar.netflows.summary(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                geo_id=["string"],
+                location=["string"],
+                name=["main_series"],
+            )
+
+        assert_matches_type(NetFlowsSummaryResponse, netflows, path=["response"])
+
+    @parametrize
+    async def test_raw_response_summary(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.netflows.with_raw_response.summary()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        netflows = await response.parse()
+        assert_matches_type(NetFlowsSummaryResponse, netflows, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_summary(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.netflows.with_streaming_response.summary() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                netflows = await response.parse()
+                assert_matches_type(NetFlowsSummaryResponse, netflows, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        netflows = await async_client.radar.netflows.summary_v2(
+            dimension="ADM1",
+        )
+        assert_matches_type(NetFlowsSummaryV2Response, netflows, path=["response"])
+
+    @parametrize
+    async def test_method_summary_v2_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        netflows = await async_client.radar.netflows.summary_v2(
+            dimension="ADM1",
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            geo_id=["string"],
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            product=["HTTP"],
+        )
+        assert_matches_type(NetFlowsSummaryV2Response, netflows, path=["response"])
+
+    @parametrize
+    async def test_raw_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.netflows.with_raw_response.summary_v2(
+            dimension="ADM1",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        netflows = await response.parse()
+        assert_matches_type(NetFlowsSummaryV2Response, netflows, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_summary_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.netflows.with_streaming_response.summary_v2(
+            dimension="ADM1",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            netflows = await response.parse()
+            assert_matches_type(NetFlowsSummaryV2Response, netflows, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_timeseries(self, async_client: AsyncCloudflare) -> None:
-        netflow = await async_client.radar.netflows.timeseries()
-        assert_matches_type(NetflowTimeseriesResponse, netflow, path=["response"])
+        netflows = await async_client.radar.netflows.timeseries()
+        assert_matches_type(NetFlowsTimeseriesResponse, netflows, path=["response"])
 
     @parametrize
     async def test_method_timeseries_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        netflow = await async_client.radar.netflows.timeseries(
+        netflows = await async_client.radar.netflows.timeseries(
             agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            geo_id=["string"],
+            location=["string"],
+            name=["main_series"],
             normalization="MIN0_MAX",
-            product=["HTTP", "ALL"],
+            product=["HTTP"],
         )
-        assert_matches_type(NetflowTimeseriesResponse, netflow, path=["response"])
+        assert_matches_type(NetFlowsTimeseriesResponse, netflows, path=["response"])
 
     @parametrize
     async def test_raw_response_timeseries(self, async_client: AsyncCloudflare) -> None:
@@ -108,8 +344,8 @@ async def test_raw_response_timeseries(self, async_client: AsyncCloudflare) -> N
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        netflow = await response.parse()
-        assert_matches_type(NetflowTimeseriesResponse, netflow, path=["response"])
+        netflows = await response.parse()
+        assert_matches_type(NetFlowsTimeseriesResponse, netflows, path=["response"])
 
     @parametrize
     async def test_streaming_response_timeseries(self, async_client: AsyncCloudflare) -> None:
@@ -117,7 +353,58 @@ async def test_streaming_response_timeseries(self, async_client: AsyncCloudflare
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            netflow = await response.parse()
-            assert_matches_type(NetflowTimeseriesResponse, netflow, path=["response"])
+            netflows = await response.parse()
+            assert_matches_type(NetFlowsTimeseriesResponse, netflows, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        netflows = await async_client.radar.netflows.timeseries_groups(
+            dimension="ADM1",
+        )
+        assert_matches_type(NetFlowsTimeseriesGroupsResponse, netflows, path=["response"])
+
+    @parametrize
+    async def test_method_timeseries_groups_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        netflows = await async_client.radar.netflows.timeseries_groups(
+            dimension="ADM1",
+            agg_interval="1h",
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            format="JSON",
+            geo_id=["string"],
+            limit_per_group=10,
+            location=["string"],
+            name=["main_series"],
+            normalization="PERCENTAGE",
+            product=["HTTP"],
+        )
+        assert_matches_type(NetFlowsTimeseriesGroupsResponse, netflows, path=["response"])
+
+    @parametrize
+    async def test_raw_response_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.radar.netflows.with_raw_response.timeseries_groups(
+            dimension="ADM1",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        netflows = await response.parse()
+        assert_matches_type(NetFlowsTimeseriesGroupsResponse, netflows, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.radar.netflows.with_streaming_response.timeseries_groups(
+            dimension="ADM1",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            netflows = await response.parse()
+            assert_matches_type(NetFlowsTimeseriesGroupsResponse, netflows, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/radar/test_ranking.py b/tests/api_resources/radar/test_ranking.py
index 5cf488f26b3..a0db34fccf4 100644
--- a/tests/api_resources/radar/test_ranking.py
+++ b/tests/api_resources/radar/test_ranking.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare._utils import parse_datetime
+from cloudflare._utils import parse_date, parse_datetime
 from cloudflare.types.radar import (
     RankingTopResponse,
     RankingTimeseriesGroupsResponse,
@@ -29,22 +29,15 @@ def test_method_timeseries_groups(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_timeseries_groups_with_all_params(self, client: Cloudflare) -> None:
         ranking = client.radar.ranking.timeseries_groups(
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            domains=["string", "string", "string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            domain_category=["string"],
+            domains=["google.com"],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
             ranking_type="POPULAR",
         )
         assert_matches_type(RankingTimeseriesGroupsResponse, ranking, path=["response"])
@@ -77,11 +70,12 @@ def test_method_top(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_top_with_all_params(self, client: Cloudflare) -> None:
         ranking = client.radar.ranking.top(
-            date=["string", "string", "string"],
+            date=[parse_date("2019-12-27")],
+            domain_category=["string"],
             format="JSON",
             limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            location=["string"],
+            name=["main_series"],
             ranking_type="POPULAR",
         )
         assert_matches_type(RankingTopResponse, ranking, path=["response"])
@@ -108,7 +102,9 @@ def test_streaming_response_top(self, client: Cloudflare) -> None:
 
 
 class TestAsyncRanking:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_timeseries_groups(self, async_client: AsyncCloudflare) -> None:
@@ -118,22 +114,15 @@ async def test_method_timeseries_groups(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_method_timeseries_groups_with_all_params(self, async_client: AsyncCloudflare) -> None:
         ranking = await async_client.radar.ranking.timeseries_groups(
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            domains=["string", "string", "string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            domain_category=["string"],
+            domains=["google.com"],
             format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            limit=1,
+            location=["string"],
+            name=["main_series"],
             ranking_type="POPULAR",
         )
         assert_matches_type(RankingTimeseriesGroupsResponse, ranking, path=["response"])
@@ -166,11 +155,12 @@ async def test_method_top(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_top_with_all_params(self, async_client: AsyncCloudflare) -> None:
         ranking = await async_client.radar.ranking.top(
-            date=["string", "string", "string"],
+            date=[parse_date("2019-12-27")],
+            domain_category=["string"],
             format="JSON",
             limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            location=["string"],
+            name=["main_series"],
             ranking_type="POPULAR",
         )
         assert_matches_type(RankingTopResponse, ranking, path=["response"])
diff --git a/tests/api_resources/radar/test_search.py b/tests/api_resources/radar/test_search.py
index 5185e12e4c3..ba42917b557 100644
--- a/tests/api_resources/radar/test_search.py
+++ b/tests/api_resources/radar/test_search.py
@@ -28,10 +28,10 @@ def test_method_global(self, client: Cloudflare) -> None:
     def test_method_global_with_all_params(self, client: Cloudflare) -> None:
         search = client.radar.search.global_(
             query="United",
-            exclude=["SPECIAL_EVENTS", "NOTEBOOKS", "LOCATIONS"],
+            exclude=["ADM1S"],
             format="JSON",
-            include=["SPECIAL_EVENTS", "NOTEBOOKS", "LOCATIONS"],
-            limit=5,
+            include=["ADM1S"],
+            limit=1,
             limit_per_group=0,
         )
         assert_matches_type(SearchGlobalResponse, search, path=["response"])
@@ -62,7 +62,9 @@ def test_streaming_response_global(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSearch:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_global(self, async_client: AsyncCloudflare) -> None:
@@ -75,10 +77,10 @@ async def test_method_global(self, async_client: AsyncCloudflare) -> None:
     async def test_method_global_with_all_params(self, async_client: AsyncCloudflare) -> None:
         search = await async_client.radar.search.global_(
             query="United",
-            exclude=["SPECIAL_EVENTS", "NOTEBOOKS", "LOCATIONS"],
+            exclude=["ADM1S"],
             format="JSON",
-            include=["SPECIAL_EVENTS", "NOTEBOOKS", "LOCATIONS"],
-            limit=5,
+            include=["ADM1S"],
+            limit=1,
             limit_per_group=0,
         )
         assert_matches_type(SearchGlobalResponse, search, path=["response"])
diff --git a/tests/api_resources/radar/test_tcp_resets_timeouts.py b/tests/api_resources/radar/test_tcp_resets_timeouts.py
index fc54e4be455..3ea655e3b91 100644
--- a/tests/api_resources/radar/test_tcp_resets_timeouts.py
+++ b/tests/api_resources/radar/test_tcp_resets_timeouts.py
@@ -29,22 +29,14 @@ def test_method_summary(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_summary_with_all_params(self, client: Cloudflare) -> None:
         tcp_resets_timeout = client.radar.tcp_resets_timeouts.summary(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(TCPResetsTimeoutSummaryResponse, tcp_resets_timeout, path=["response"])
 
@@ -77,22 +69,14 @@ def test_method_timeseries_groups(self, client: Cloudflare) -> None:
     def test_method_timeseries_groups_with_all_params(self, client: Cloudflare) -> None:
         tcp_resets_timeout = client.radar.tcp_resets_timeouts.timeseries_groups(
             agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(TCPResetsTimeoutTimeseriesGroupsResponse, tcp_resets_timeout, path=["response"])
 
@@ -118,7 +102,9 @@ def test_streaming_response_timeseries_groups(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTCPResetsTimeouts:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_summary(self, async_client: AsyncCloudflare) -> None:
@@ -128,22 +114,14 @@ async def test_method_summary(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_summary_with_all_params(self, async_client: AsyncCloudflare) -> None:
         tcp_resets_timeout = await async_client.radar.tcp_resets_timeouts.summary(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(TCPResetsTimeoutSummaryResponse, tcp_resets_timeout, path=["response"])
 
@@ -176,22 +154,14 @@ async def test_method_timeseries_groups(self, async_client: AsyncCloudflare) ->
     async def test_method_timeseries_groups_with_all_params(self, async_client: AsyncCloudflare) -> None:
         tcp_resets_timeout = await async_client.radar.tcp_resets_timeouts.timeseries_groups(
             agg_interval="1h",
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
+            asn=["string"],
+            continent=["string"],
+            date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+            date_range=["7d"],
+            date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
             format="JSON",
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
+            location=["string"],
+            name=["main_series"],
         )
         assert_matches_type(TCPResetsTimeoutTimeseriesGroupsResponse, tcp_resets_timeout, path=["response"])
 
diff --git a/tests/api_resources/radar/test_traffic_anomalies.py b/tests/api_resources/radar/test_traffic_anomalies.py
index 7e92c76fe39..0580733e99b 100644
--- a/tests/api_resources/radar/test_traffic_anomalies.py
+++ b/tests/api_resources/radar/test_traffic_anomalies.py
@@ -31,10 +31,12 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None:
             date_range="7d",
             date_start=parse_datetime("2023-09-01T11:41:33.782Z"),
             format="JSON",
-            limit=5,
+            limit=1,
             location="US",
             offset=0,
+            origin="amazon-us-east-1",
             status="VERIFIED",
+            type=["LOCATION"],
         )
         assert_matches_type(TrafficAnomalyGetResponse, traffic_anomaly, path=["response"])
 
@@ -60,7 +62,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTrafficAnomalies:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -75,10 +79,12 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -
             date_range="7d",
             date_start=parse_datetime("2023-09-01T11:41:33.782Z"),
             format="JSON",
-            limit=5,
+            limit=1,
             location="US",
             offset=0,
+            origin="amazon-us-east-1",
             status="VERIFIED",
+            type=["LOCATION"],
         )
         assert_matches_type(TrafficAnomalyGetResponse, traffic_anomaly, path=["response"])
 
diff --git a/tests/api_resources/radar/traffic_anomalies/test_locations.py b/tests/api_resources/radar/traffic_anomalies/test_locations.py
index 005738ac3e2..f9ab4a9bbff 100644
--- a/tests/api_resources/radar/traffic_anomalies/test_locations.py
+++ b/tests/api_resources/radar/traffic_anomalies/test_locations.py
@@ -30,7 +30,7 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None:
             date_range="7d",
             date_start=parse_datetime("2023-09-01T11:41:33.782Z"),
             format="JSON",
-            limit=5,
+            limit=1,
             status="VERIFIED",
         )
         assert_matches_type(LocationGetResponse, location, path=["response"])
@@ -57,7 +57,9 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncLocations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -71,7 +73,7 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -
             date_range="7d",
             date_start=parse_datetime("2023-09-01T11:41:33.782Z"),
             format="JSON",
-            limit=5,
+            limit=1,
             status="VERIFIED",
         )
         assert_matches_type(LocationGetResponse, location, path=["response"])
diff --git a/tests/api_resources/radar/verified_bots/test_top.py b/tests/api_resources/radar/verified_bots/test_top.py
index d185234e31b..f43472969b8 100644
--- a/tests/api_resources/radar/verified_bots/test_top.py
+++ b/tests/api_resources/radar/verified_bots/test_top.py
@@ -15,6 +15,8 @@
     TopCategoriesResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -23,35 +25,32 @@ class TestTop:
 
     @parametrize
     def test_method_bots(self, client: Cloudflare) -> None:
-        top = client.radar.verified_bots.top.bots()
+        with pytest.warns(DeprecationWarning):
+            top = client.radar.verified_bots.top.bots()
+
         assert_matches_type(TopBotsResponse, top, path=["response"])
 
     @parametrize
     def test_method_bots_with_all_params(self, client: Cloudflare) -> None:
-        top = client.radar.verified_bots.top.bots(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            top = client.radar.verified_bots.top.bots(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit=1,
+                location=["string"],
+                name=["main_series"],
+            )
+
         assert_matches_type(TopBotsResponse, top, path=["response"])
 
     @parametrize
     def test_raw_response_bots(self, client: Cloudflare) -> None:
-        response = client.radar.verified_bots.top.with_raw_response.bots()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.verified_bots.top.with_raw_response.bots()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -60,46 +59,44 @@ def test_raw_response_bots(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_bots(self, client: Cloudflare) -> None:
-        with client.radar.verified_bots.top.with_streaming_response.bots() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.verified_bots.top.with_streaming_response.bots() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            top = response.parse()
-            assert_matches_type(TopBotsResponse, top, path=["response"])
+                top = response.parse()
+                assert_matches_type(TopBotsResponse, top, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_categories(self, client: Cloudflare) -> None:
-        top = client.radar.verified_bots.top.categories()
+        with pytest.warns(DeprecationWarning):
+            top = client.radar.verified_bots.top.categories()
+
         assert_matches_type(TopCategoriesResponse, top, path=["response"])
 
     @parametrize
     def test_method_categories_with_all_params(self, client: Cloudflare) -> None:
-        top = client.radar.verified_bots.top.categories(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            top = client.radar.verified_bots.top.categories(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit=1,
+                location=["string"],
+                name=["main_series"],
+            )
+
         assert_matches_type(TopCategoriesResponse, top, path=["response"])
 
     @parametrize
     def test_raw_response_categories(self, client: Cloudflare) -> None:
-        response = client.radar.verified_bots.top.with_raw_response.categories()
+        with pytest.warns(DeprecationWarning):
+            response = client.radar.verified_bots.top.with_raw_response.categories()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -108,50 +105,50 @@ def test_raw_response_categories(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_categories(self, client: Cloudflare) -> None:
-        with client.radar.verified_bots.top.with_streaming_response.categories() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.radar.verified_bots.top.with_streaming_response.categories() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            top = response.parse()
-            assert_matches_type(TopCategoriesResponse, top, path=["response"])
+                top = response.parse()
+                assert_matches_type(TopCategoriesResponse, top, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncTop:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_bots(self, async_client: AsyncCloudflare) -> None:
-        top = await async_client.radar.verified_bots.top.bots()
+        with pytest.warns(DeprecationWarning):
+            top = await async_client.radar.verified_bots.top.bots()
+
         assert_matches_type(TopBotsResponse, top, path=["response"])
 
     @parametrize
     async def test_method_bots_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        top = await async_client.radar.verified_bots.top.bots(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            top = await async_client.radar.verified_bots.top.bots(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit=1,
+                location=["string"],
+                name=["main_series"],
+            )
+
         assert_matches_type(TopBotsResponse, top, path=["response"])
 
     @parametrize
     async def test_raw_response_bots(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.verified_bots.top.with_raw_response.bots()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.verified_bots.top.with_raw_response.bots()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -160,46 +157,44 @@ async def test_raw_response_bots(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_bots(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.verified_bots.top.with_streaming_response.bots() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.verified_bots.top.with_streaming_response.bots() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            top = await response.parse()
-            assert_matches_type(TopBotsResponse, top, path=["response"])
+                top = await response.parse()
+                assert_matches_type(TopBotsResponse, top, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_categories(self, async_client: AsyncCloudflare) -> None:
-        top = await async_client.radar.verified_bots.top.categories()
+        with pytest.warns(DeprecationWarning):
+            top = await async_client.radar.verified_bots.top.categories()
+
         assert_matches_type(TopCategoriesResponse, top, path=["response"])
 
     @parametrize
     async def test_method_categories_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        top = await async_client.radar.verified_bots.top.categories(
-            asn=["string", "string", "string"],
-            continent=["string", "string", "string"],
-            date_end=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            date_range=["7d", "7d", "7d"],
-            date_start=[
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-                parse_datetime("2019-12-27T18:11:19.117Z"),
-            ],
-            format="JSON",
-            limit=5,
-            location=["string", "string", "string"],
-            name=["string", "string", "string"],
-        )
+        with pytest.warns(DeprecationWarning):
+            top = await async_client.radar.verified_bots.top.categories(
+                asn=["string"],
+                continent=["string"],
+                date_end=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                date_range=["7d"],
+                date_start=[parse_datetime("2019-12-27T18:11:19.117Z")],
+                format="JSON",
+                limit=1,
+                location=["string"],
+                name=["main_series"],
+            )
+
         assert_matches_type(TopCategoriesResponse, top, path=["response"])
 
     @parametrize
     async def test_raw_response_categories(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.radar.verified_bots.top.with_raw_response.categories()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.radar.verified_bots.top.with_raw_response.categories()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -208,11 +203,12 @@ async def test_raw_response_categories(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_streaming_response_categories(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.radar.verified_bots.top.with_streaming_response.categories() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.radar.verified_bots.top.with_streaming_response.categories() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            top = await response.parse()
-            assert_matches_type(TopCategoriesResponse, top, path=["response"])
+                top = await response.parse()
+                assert_matches_type(TopCategoriesResponse, top, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/realtime_kit/__init__.py b/tests/api_resources/realtime_kit/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/realtime_kit/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/realtime_kit/test_active_session.py b/tests/api_resources/realtime_kit/test_active_session.py
new file mode 100644
index 00000000000..6611ca27462
--- /dev/null
+++ b/tests/api_resources/realtime_kit/test_active_session.py
@@ -0,0 +1,617 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.realtime_kit import (
+    ActiveSessionCreatePollResponse,
+    ActiveSessionGetActiveSessionResponse,
+    ActiveSessionKickParticipantsResponse,
+    ActiveSessionKickAllParticipantsResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestActiveSession:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_create_poll(self, client: Cloudflare) -> None:
+        active_session = client.realtime_kit.active_session.create_poll(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            options=["string"],
+            question="question",
+        )
+        assert_matches_type(ActiveSessionCreatePollResponse, active_session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_create_poll_with_all_params(self, client: Cloudflare) -> None:
+        active_session = client.realtime_kit.active_session.create_poll(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            options=["string"],
+            question="question",
+            anonymous=True,
+            hide_votes=True,
+        )
+        assert_matches_type(ActiveSessionCreatePollResponse, active_session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_create_poll(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.active_session.with_raw_response.create_poll(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            options=["string"],
+            question="question",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        active_session = response.parse()
+        assert_matches_type(ActiveSessionCreatePollResponse, active_session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_create_poll(self, client: Cloudflare) -> None:
+        with client.realtime_kit.active_session.with_streaming_response.create_poll(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            options=["string"],
+            question="question",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            active_session = response.parse()
+            assert_matches_type(ActiveSessionCreatePollResponse, active_session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_create_poll(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.active_session.with_raw_response.create_poll(
+                meeting_id="meeting_id",
+                account_id="",
+                app_id="app_id",
+                options=["string"],
+                question="question",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.active_session.with_raw_response.create_poll(
+                meeting_id="meeting_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                options=["string"],
+                question="question",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            client.realtime_kit.active_session.with_raw_response.create_poll(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                options=["string"],
+                question="question",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_active_session(self, client: Cloudflare) -> None:
+        active_session = client.realtime_kit.active_session.get_active_session(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(ActiveSessionGetActiveSessionResponse, active_session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_active_session(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.active_session.with_raw_response.get_active_session(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        active_session = response.parse()
+        assert_matches_type(ActiveSessionGetActiveSessionResponse, active_session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_active_session(self, client: Cloudflare) -> None:
+        with client.realtime_kit.active_session.with_streaming_response.get_active_session(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            active_session = response.parse()
+            assert_matches_type(ActiveSessionGetActiveSessionResponse, active_session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_active_session(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.active_session.with_raw_response.get_active_session(
+                meeting_id="meeting_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.active_session.with_raw_response.get_active_session(
+                meeting_id="meeting_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            client.realtime_kit.active_session.with_raw_response.get_active_session(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_kick_all_participants(self, client: Cloudflare) -> None:
+        active_session = client.realtime_kit.active_session.kick_all_participants(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(ActiveSessionKickAllParticipantsResponse, active_session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_kick_all_participants(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.active_session.with_raw_response.kick_all_participants(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        active_session = response.parse()
+        assert_matches_type(ActiveSessionKickAllParticipantsResponse, active_session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_kick_all_participants(self, client: Cloudflare) -> None:
+        with client.realtime_kit.active_session.with_streaming_response.kick_all_participants(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            active_session = response.parse()
+            assert_matches_type(ActiveSessionKickAllParticipantsResponse, active_session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_kick_all_participants(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.active_session.with_raw_response.kick_all_participants(
+                meeting_id="meeting_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.active_session.with_raw_response.kick_all_participants(
+                meeting_id="meeting_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            client.realtime_kit.active_session.with_raw_response.kick_all_participants(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_kick_participants(self, client: Cloudflare) -> None:
+        active_session = client.realtime_kit.active_session.kick_participants(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            custom_participant_ids=["string"],
+            participant_ids=["string"],
+        )
+        assert_matches_type(ActiveSessionKickParticipantsResponse, active_session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_kick_participants(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.active_session.with_raw_response.kick_participants(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            custom_participant_ids=["string"],
+            participant_ids=["string"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        active_session = response.parse()
+        assert_matches_type(ActiveSessionKickParticipantsResponse, active_session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_kick_participants(self, client: Cloudflare) -> None:
+        with client.realtime_kit.active_session.with_streaming_response.kick_participants(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            custom_participant_ids=["string"],
+            participant_ids=["string"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            active_session = response.parse()
+            assert_matches_type(ActiveSessionKickParticipantsResponse, active_session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_kick_participants(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.active_session.with_raw_response.kick_participants(
+                meeting_id="meeting_id",
+                account_id="",
+                app_id="app_id",
+                custom_participant_ids=["string"],
+                participant_ids=["string"],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.active_session.with_raw_response.kick_participants(
+                meeting_id="meeting_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                custom_participant_ids=["string"],
+                participant_ids=["string"],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            client.realtime_kit.active_session.with_raw_response.kick_participants(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                custom_participant_ids=["string"],
+                participant_ids=["string"],
+            )
+
+
+class TestAsyncActiveSession:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_create_poll(self, async_client: AsyncCloudflare) -> None:
+        active_session = await async_client.realtime_kit.active_session.create_poll(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            options=["string"],
+            question="question",
+        )
+        assert_matches_type(ActiveSessionCreatePollResponse, active_session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_create_poll_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        active_session = await async_client.realtime_kit.active_session.create_poll(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            options=["string"],
+            question="question",
+            anonymous=True,
+            hide_votes=True,
+        )
+        assert_matches_type(ActiveSessionCreatePollResponse, active_session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_create_poll(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.active_session.with_raw_response.create_poll(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            options=["string"],
+            question="question",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        active_session = await response.parse()
+        assert_matches_type(ActiveSessionCreatePollResponse, active_session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_create_poll(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.active_session.with_streaming_response.create_poll(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            options=["string"],
+            question="question",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            active_session = await response.parse()
+            assert_matches_type(ActiveSessionCreatePollResponse, active_session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_create_poll(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.active_session.with_raw_response.create_poll(
+                meeting_id="meeting_id",
+                account_id="",
+                app_id="app_id",
+                options=["string"],
+                question="question",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.active_session.with_raw_response.create_poll(
+                meeting_id="meeting_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                options=["string"],
+                question="question",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            await async_client.realtime_kit.active_session.with_raw_response.create_poll(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                options=["string"],
+                question="question",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_active_session(self, async_client: AsyncCloudflare) -> None:
+        active_session = await async_client.realtime_kit.active_session.get_active_session(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(ActiveSessionGetActiveSessionResponse, active_session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_active_session(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.active_session.with_raw_response.get_active_session(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        active_session = await response.parse()
+        assert_matches_type(ActiveSessionGetActiveSessionResponse, active_session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_active_session(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.active_session.with_streaming_response.get_active_session(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            active_session = await response.parse()
+            assert_matches_type(ActiveSessionGetActiveSessionResponse, active_session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_active_session(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.active_session.with_raw_response.get_active_session(
+                meeting_id="meeting_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.active_session.with_raw_response.get_active_session(
+                meeting_id="meeting_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            await async_client.realtime_kit.active_session.with_raw_response.get_active_session(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_kick_all_participants(self, async_client: AsyncCloudflare) -> None:
+        active_session = await async_client.realtime_kit.active_session.kick_all_participants(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(ActiveSessionKickAllParticipantsResponse, active_session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_kick_all_participants(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.active_session.with_raw_response.kick_all_participants(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        active_session = await response.parse()
+        assert_matches_type(ActiveSessionKickAllParticipantsResponse, active_session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_kick_all_participants(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.active_session.with_streaming_response.kick_all_participants(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            active_session = await response.parse()
+            assert_matches_type(ActiveSessionKickAllParticipantsResponse, active_session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_kick_all_participants(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.active_session.with_raw_response.kick_all_participants(
+                meeting_id="meeting_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.active_session.with_raw_response.kick_all_participants(
+                meeting_id="meeting_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            await async_client.realtime_kit.active_session.with_raw_response.kick_all_participants(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_kick_participants(self, async_client: AsyncCloudflare) -> None:
+        active_session = await async_client.realtime_kit.active_session.kick_participants(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            custom_participant_ids=["string"],
+            participant_ids=["string"],
+        )
+        assert_matches_type(ActiveSessionKickParticipantsResponse, active_session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_kick_participants(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.active_session.with_raw_response.kick_participants(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            custom_participant_ids=["string"],
+            participant_ids=["string"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        active_session = await response.parse()
+        assert_matches_type(ActiveSessionKickParticipantsResponse, active_session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_kick_participants(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.active_session.with_streaming_response.kick_participants(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            custom_participant_ids=["string"],
+            participant_ids=["string"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            active_session = await response.parse()
+            assert_matches_type(ActiveSessionKickParticipantsResponse, active_session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_kick_participants(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.active_session.with_raw_response.kick_participants(
+                meeting_id="meeting_id",
+                account_id="",
+                app_id="app_id",
+                custom_participant_ids=["string"],
+                participant_ids=["string"],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.active_session.with_raw_response.kick_participants(
+                meeting_id="meeting_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                custom_participant_ids=["string"],
+                participant_ids=["string"],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            await async_client.realtime_kit.active_session.with_raw_response.kick_participants(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                custom_participant_ids=["string"],
+                participant_ids=["string"],
+            )
diff --git a/tests/api_resources/realtime_kit/test_analytics.py b/tests/api_resources/realtime_kit/test_analytics.py
new file mode 100644
index 00000000000..af069554eb8
--- /dev/null
+++ b/tests/api_resources/realtime_kit/test_analytics.py
@@ -0,0 +1,150 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.realtime_kit import AnalyticsGetOrgAnalyticsResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestAnalytics:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_org_analytics(self, client: Cloudflare) -> None:
+        analytics = client.realtime_kit.analytics.get_org_analytics(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AnalyticsGetOrgAnalyticsResponse, analytics, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_org_analytics_with_all_params(self, client: Cloudflare) -> None:
+        analytics = client.realtime_kit.analytics.get_org_analytics(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            end_date="2022-09-22",
+            start_date="2022-09-01",
+        )
+        assert_matches_type(AnalyticsGetOrgAnalyticsResponse, analytics, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_org_analytics(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.analytics.with_raw_response.get_org_analytics(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        analytics = response.parse()
+        assert_matches_type(AnalyticsGetOrgAnalyticsResponse, analytics, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_org_analytics(self, client: Cloudflare) -> None:
+        with client.realtime_kit.analytics.with_streaming_response.get_org_analytics(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            analytics = response.parse()
+            assert_matches_type(AnalyticsGetOrgAnalyticsResponse, analytics, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_org_analytics(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.analytics.with_raw_response.get_org_analytics(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.analytics.with_raw_response.get_org_analytics(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncAnalytics:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_org_analytics(self, async_client: AsyncCloudflare) -> None:
+        analytics = await async_client.realtime_kit.analytics.get_org_analytics(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AnalyticsGetOrgAnalyticsResponse, analytics, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_org_analytics_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        analytics = await async_client.realtime_kit.analytics.get_org_analytics(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            end_date="2022-09-22",
+            start_date="2022-09-01",
+        )
+        assert_matches_type(AnalyticsGetOrgAnalyticsResponse, analytics, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_org_analytics(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.analytics.with_raw_response.get_org_analytics(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        analytics = await response.parse()
+        assert_matches_type(AnalyticsGetOrgAnalyticsResponse, analytics, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_org_analytics(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.analytics.with_streaming_response.get_org_analytics(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            analytics = await response.parse()
+            assert_matches_type(AnalyticsGetOrgAnalyticsResponse, analytics, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_org_analytics(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.analytics.with_raw_response.get_org_analytics(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.analytics.with_raw_response.get_org_analytics(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/realtime_kit/test_apps.py b/tests/api_resources/realtime_kit/test_apps.py
new file mode 100644
index 00000000000..b9cdf522f05
--- /dev/null
+++ b/tests/api_resources/realtime_kit/test_apps.py
@@ -0,0 +1,200 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.realtime_kit import AppGetResponse, AppPostResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestApps:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        app = client.realtime_kit.apps.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AppGetResponse, app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.apps.with_raw_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        app = response.parse()
+        assert_matches_type(AppGetResponse, app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.realtime_kit.apps.with_streaming_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            app = response.parse()
+            assert_matches_type(AppGetResponse, app, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.apps.with_raw_response.get(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_post(self, client: Cloudflare) -> None:
+        app = client.realtime_kit.apps.post(
+            account_id="account_id",
+            name="name",
+        )
+        assert_matches_type(AppPostResponse, app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_post(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.apps.with_raw_response.post(
+            account_id="account_id",
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        app = response.parse()
+        assert_matches_type(AppPostResponse, app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_post(self, client: Cloudflare) -> None:
+        with client.realtime_kit.apps.with_streaming_response.post(
+            account_id="account_id",
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            app = response.parse()
+            assert_matches_type(AppPostResponse, app, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_post(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.apps.with_raw_response.post(
+                account_id="",
+                name="name",
+            )
+
+
+class TestAsyncApps:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        app = await async_client.realtime_kit.apps.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AppGetResponse, app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.apps.with_raw_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        app = await response.parse()
+        assert_matches_type(AppGetResponse, app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.apps.with_streaming_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            app = await response.parse()
+            assert_matches_type(AppGetResponse, app, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.apps.with_raw_response.get(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_post(self, async_client: AsyncCloudflare) -> None:
+        app = await async_client.realtime_kit.apps.post(
+            account_id="account_id",
+            name="name",
+        )
+        assert_matches_type(AppPostResponse, app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_post(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.apps.with_raw_response.post(
+            account_id="account_id",
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        app = await response.parse()
+        assert_matches_type(AppPostResponse, app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_post(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.apps.with_streaming_response.post(
+            account_id="account_id",
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            app = await response.parse()
+            assert_matches_type(AppPostResponse, app, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_post(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.apps.with_raw_response.post(
+                account_id="",
+                name="name",
+            )
diff --git a/tests/api_resources/realtime_kit/test_livestreams.py b/tests/api_resources/realtime_kit/test_livestreams.py
new file mode 100644
index 00000000000..aa6ad20d78f
--- /dev/null
+++ b/tests/api_resources/realtime_kit/test_livestreams.py
@@ -0,0 +1,1400 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.realtime_kit import (
+    LivestreamGetOrgAnalyticsResponse,
+    LivestreamGetAllLivestreamsResponse,
+    LivestreamStopLivestreamingAMeetingResponse,
+    LivestreamStartLivestreamingAMeetingResponse,
+    LivestreamCreateIndependentLivestreamResponse,
+    LivestreamGetMeetingActiveLivestreamsResponse,
+    LivestreamGetLivestreamAnalyticsCompleteResponse,
+    LivestreamGetActiveLivestreamsForLivestreamIDResponse,
+    LivestreamGetLivestreamSessionForLivestreamIDResponse,
+    LivestreamGetLivestreamSessionDetailsForSessionIDResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestLivestreams:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_create_independent_livestream(self, client: Cloudflare) -> None:
+        livestream = client.realtime_kit.livestreams.create_independent_livestream(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LivestreamCreateIndependentLivestreamResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_create_independent_livestream_with_all_params(self, client: Cloudflare) -> None:
+        livestream = client.realtime_kit.livestreams.create_independent_livestream(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="prdmmp-xhycsl",
+        )
+        assert_matches_type(LivestreamCreateIndependentLivestreamResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_create_independent_livestream(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.livestreams.with_raw_response.create_independent_livestream(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = response.parse()
+        assert_matches_type(LivestreamCreateIndependentLivestreamResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_create_independent_livestream(self, client: Cloudflare) -> None:
+        with client.realtime_kit.livestreams.with_streaming_response.create_independent_livestream(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = response.parse()
+            assert_matches_type(LivestreamCreateIndependentLivestreamResponse, livestream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_create_independent_livestream(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.create_independent_livestream(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.create_independent_livestream(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_active_livestreams_for_livestream_id(self, client: Cloudflare) -> None:
+        livestream = client.realtime_kit.livestreams.get_active_livestreams_for_livestream_id(
+            livestream_id="livestream_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(LivestreamGetActiveLivestreamsForLivestreamIDResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_active_livestreams_for_livestream_id(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.livestreams.with_raw_response.get_active_livestreams_for_livestream_id(
+            livestream_id="livestream_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = response.parse()
+        assert_matches_type(LivestreamGetActiveLivestreamsForLivestreamIDResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_active_livestreams_for_livestream_id(self, client: Cloudflare) -> None:
+        with client.realtime_kit.livestreams.with_streaming_response.get_active_livestreams_for_livestream_id(
+            livestream_id="livestream_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = response.parse()
+            assert_matches_type(LivestreamGetActiveLivestreamsForLivestreamIDResponse, livestream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_active_livestreams_for_livestream_id(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.get_active_livestreams_for_livestream_id(
+                livestream_id="livestream_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.get_active_livestreams_for_livestream_id(
+                livestream_id="livestream_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `livestream_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.get_active_livestreams_for_livestream_id(
+                livestream_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_all_livestreams(self, client: Cloudflare) -> None:
+        livestream = client.realtime_kit.livestreams.get_all_livestreams(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LivestreamGetAllLivestreamsResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_all_livestreams_with_all_params(self, client: Cloudflare) -> None:
+        livestream = client.realtime_kit.livestreams.get_all_livestreams(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            end_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            exclude_meetings=True,
+            page_no=0,
+            per_page=0,
+            sort_order="ASC",
+            start_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            status="LIVE",
+        )
+        assert_matches_type(LivestreamGetAllLivestreamsResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_all_livestreams(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.livestreams.with_raw_response.get_all_livestreams(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = response.parse()
+        assert_matches_type(LivestreamGetAllLivestreamsResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_all_livestreams(self, client: Cloudflare) -> None:
+        with client.realtime_kit.livestreams.with_streaming_response.get_all_livestreams(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = response.parse()
+            assert_matches_type(LivestreamGetAllLivestreamsResponse, livestream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_all_livestreams(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.get_all_livestreams(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.get_all_livestreams(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_livestream_analytics_complete(self, client: Cloudflare) -> None:
+        livestream = client.realtime_kit.livestreams.get_livestream_analytics_complete(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LivestreamGetLivestreamAnalyticsCompleteResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_livestream_analytics_complete_with_all_params(self, client: Cloudflare) -> None:
+        livestream = client.realtime_kit.livestreams.get_livestream_analytics_complete(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            end_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            start_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+        )
+        assert_matches_type(LivestreamGetLivestreamAnalyticsCompleteResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_livestream_analytics_complete(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.livestreams.with_raw_response.get_livestream_analytics_complete(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = response.parse()
+        assert_matches_type(LivestreamGetLivestreamAnalyticsCompleteResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_livestream_analytics_complete(self, client: Cloudflare) -> None:
+        with client.realtime_kit.livestreams.with_streaming_response.get_livestream_analytics_complete(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = response.parse()
+            assert_matches_type(LivestreamGetLivestreamAnalyticsCompleteResponse, livestream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_livestream_analytics_complete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.get_livestream_analytics_complete(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.get_livestream_analytics_complete(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_livestream_session_details_for_session_id(self, client: Cloudflare) -> None:
+        livestream = client.realtime_kit.livestreams.get_livestream_session_details_for_session_id(
+            livestream_session_id="livestream-session-id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(LivestreamGetLivestreamSessionDetailsForSessionIDResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_livestream_session_details_for_session_id(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.livestreams.with_raw_response.get_livestream_session_details_for_session_id(
+            livestream_session_id="livestream-session-id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = response.parse()
+        assert_matches_type(LivestreamGetLivestreamSessionDetailsForSessionIDResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_livestream_session_details_for_session_id(self, client: Cloudflare) -> None:
+        with client.realtime_kit.livestreams.with_streaming_response.get_livestream_session_details_for_session_id(
+            livestream_session_id="livestream-session-id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = response.parse()
+            assert_matches_type(
+                LivestreamGetLivestreamSessionDetailsForSessionIDResponse, livestream, path=["response"]
+            )
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_livestream_session_details_for_session_id(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.get_livestream_session_details_for_session_id(
+                livestream_session_id="livestream-session-id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.get_livestream_session_details_for_session_id(
+                livestream_session_id="livestream-session-id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `livestream_session_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.get_livestream_session_details_for_session_id(
+                livestream_session_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_livestream_session_for_livestream_id(self, client: Cloudflare) -> None:
+        livestream = client.realtime_kit.livestreams.get_livestream_session_for_livestream_id(
+            livestream_id="livestream_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(LivestreamGetLivestreamSessionForLivestreamIDResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_livestream_session_for_livestream_id_with_all_params(self, client: Cloudflare) -> None:
+        livestream = client.realtime_kit.livestreams.get_livestream_session_for_livestream_id(
+            livestream_id="livestream_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            page_no=0,
+            per_page=0,
+        )
+        assert_matches_type(LivestreamGetLivestreamSessionForLivestreamIDResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_livestream_session_for_livestream_id(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.livestreams.with_raw_response.get_livestream_session_for_livestream_id(
+            livestream_id="livestream_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = response.parse()
+        assert_matches_type(LivestreamGetLivestreamSessionForLivestreamIDResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_livestream_session_for_livestream_id(self, client: Cloudflare) -> None:
+        with client.realtime_kit.livestreams.with_streaming_response.get_livestream_session_for_livestream_id(
+            livestream_id="livestream_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = response.parse()
+            assert_matches_type(LivestreamGetLivestreamSessionForLivestreamIDResponse, livestream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_livestream_session_for_livestream_id(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.get_livestream_session_for_livestream_id(
+                livestream_id="livestream_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.get_livestream_session_for_livestream_id(
+                livestream_id="livestream_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `livestream_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.get_livestream_session_for_livestream_id(
+                livestream_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_meeting_active_livestreams(self, client: Cloudflare) -> None:
+        livestream = client.realtime_kit.livestreams.get_meeting_active_livestreams(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(LivestreamGetMeetingActiveLivestreamsResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_meeting_active_livestreams(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.livestreams.with_raw_response.get_meeting_active_livestreams(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = response.parse()
+        assert_matches_type(LivestreamGetMeetingActiveLivestreamsResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_meeting_active_livestreams(self, client: Cloudflare) -> None:
+        with client.realtime_kit.livestreams.with_streaming_response.get_meeting_active_livestreams(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = response.parse()
+            assert_matches_type(LivestreamGetMeetingActiveLivestreamsResponse, livestream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_meeting_active_livestreams(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.get_meeting_active_livestreams(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.get_meeting_active_livestreams(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.get_meeting_active_livestreams(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_org_analytics(self, client: Cloudflare) -> None:
+        livestream = client.realtime_kit.livestreams.get_org_analytics(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LivestreamGetOrgAnalyticsResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_org_analytics_with_all_params(self, client: Cloudflare) -> None:
+        livestream = client.realtime_kit.livestreams.get_org_analytics(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            end_date="2022-09-22",
+            start_date="2022-09-01",
+        )
+        assert_matches_type(LivestreamGetOrgAnalyticsResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_org_analytics(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.livestreams.with_raw_response.get_org_analytics(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = response.parse()
+        assert_matches_type(LivestreamGetOrgAnalyticsResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_org_analytics(self, client: Cloudflare) -> None:
+        with client.realtime_kit.livestreams.with_streaming_response.get_org_analytics(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = response.parse()
+            assert_matches_type(LivestreamGetOrgAnalyticsResponse, livestream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_org_analytics(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.get_org_analytics(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.get_org_analytics(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_start_livestreaming_a_meeting(self, client: Cloudflare) -> None:
+        livestream = client.realtime_kit.livestreams.start_livestreaming_a_meeting(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(LivestreamStartLivestreamingAMeetingResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_start_livestreaming_a_meeting_with_all_params(self, client: Cloudflare) -> None:
+        livestream = client.realtime_kit.livestreams.start_livestreaming_a_meeting(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            name="prdmmp-xhycsl",
+            video_config={
+                "height": 0,
+                "width": 0,
+            },
+        )
+        assert_matches_type(LivestreamStartLivestreamingAMeetingResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_start_livestreaming_a_meeting(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.livestreams.with_raw_response.start_livestreaming_a_meeting(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = response.parse()
+        assert_matches_type(LivestreamStartLivestreamingAMeetingResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_start_livestreaming_a_meeting(self, client: Cloudflare) -> None:
+        with client.realtime_kit.livestreams.with_streaming_response.start_livestreaming_a_meeting(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = response.parse()
+            assert_matches_type(LivestreamStartLivestreamingAMeetingResponse, livestream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_start_livestreaming_a_meeting(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.start_livestreaming_a_meeting(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.start_livestreaming_a_meeting(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.start_livestreaming_a_meeting(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_stop_livestreaming_a_meeting(self, client: Cloudflare) -> None:
+        livestream = client.realtime_kit.livestreams.stop_livestreaming_a_meeting(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(LivestreamStopLivestreamingAMeetingResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_stop_livestreaming_a_meeting(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.livestreams.with_raw_response.stop_livestreaming_a_meeting(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = response.parse()
+        assert_matches_type(LivestreamStopLivestreamingAMeetingResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_stop_livestreaming_a_meeting(self, client: Cloudflare) -> None:
+        with client.realtime_kit.livestreams.with_streaming_response.stop_livestreaming_a_meeting(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = response.parse()
+            assert_matches_type(LivestreamStopLivestreamingAMeetingResponse, livestream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_stop_livestreaming_a_meeting(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.stop_livestreaming_a_meeting(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.stop_livestreaming_a_meeting(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            client.realtime_kit.livestreams.with_raw_response.stop_livestreaming_a_meeting(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+
+class TestAsyncLivestreams:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_create_independent_livestream(self, async_client: AsyncCloudflare) -> None:
+        livestream = await async_client.realtime_kit.livestreams.create_independent_livestream(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LivestreamCreateIndependentLivestreamResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_create_independent_livestream_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        livestream = await async_client.realtime_kit.livestreams.create_independent_livestream(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="prdmmp-xhycsl",
+        )
+        assert_matches_type(LivestreamCreateIndependentLivestreamResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_create_independent_livestream(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.livestreams.with_raw_response.create_independent_livestream(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = await response.parse()
+        assert_matches_type(LivestreamCreateIndependentLivestreamResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_create_independent_livestream(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.livestreams.with_streaming_response.create_independent_livestream(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = await response.parse()
+            assert_matches_type(LivestreamCreateIndependentLivestreamResponse, livestream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_create_independent_livestream(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.create_independent_livestream(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.create_independent_livestream(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_active_livestreams_for_livestream_id(self, async_client: AsyncCloudflare) -> None:
+        livestream = await async_client.realtime_kit.livestreams.get_active_livestreams_for_livestream_id(
+            livestream_id="livestream_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(LivestreamGetActiveLivestreamsForLivestreamIDResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_active_livestreams_for_livestream_id(self, async_client: AsyncCloudflare) -> None:
+        response = (
+            await async_client.realtime_kit.livestreams.with_raw_response.get_active_livestreams_for_livestream_id(
+                livestream_id="livestream_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = await response.parse()
+        assert_matches_type(LivestreamGetActiveLivestreamsForLivestreamIDResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_active_livestreams_for_livestream_id(
+        self, async_client: AsyncCloudflare
+    ) -> None:
+        async with (
+            async_client.realtime_kit.livestreams.with_streaming_response.get_active_livestreams_for_livestream_id(
+                livestream_id="livestream_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = await response.parse()
+            assert_matches_type(LivestreamGetActiveLivestreamsForLivestreamIDResponse, livestream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_active_livestreams_for_livestream_id(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.get_active_livestreams_for_livestream_id(
+                livestream_id="livestream_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.get_active_livestreams_for_livestream_id(
+                livestream_id="livestream_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `livestream_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.get_active_livestreams_for_livestream_id(
+                livestream_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_all_livestreams(self, async_client: AsyncCloudflare) -> None:
+        livestream = await async_client.realtime_kit.livestreams.get_all_livestreams(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LivestreamGetAllLivestreamsResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_all_livestreams_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        livestream = await async_client.realtime_kit.livestreams.get_all_livestreams(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            end_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            exclude_meetings=True,
+            page_no=0,
+            per_page=0,
+            sort_order="ASC",
+            start_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            status="LIVE",
+        )
+        assert_matches_type(LivestreamGetAllLivestreamsResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_all_livestreams(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.livestreams.with_raw_response.get_all_livestreams(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = await response.parse()
+        assert_matches_type(LivestreamGetAllLivestreamsResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_all_livestreams(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.livestreams.with_streaming_response.get_all_livestreams(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = await response.parse()
+            assert_matches_type(LivestreamGetAllLivestreamsResponse, livestream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_all_livestreams(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.get_all_livestreams(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.get_all_livestreams(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_livestream_analytics_complete(self, async_client: AsyncCloudflare) -> None:
+        livestream = await async_client.realtime_kit.livestreams.get_livestream_analytics_complete(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LivestreamGetLivestreamAnalyticsCompleteResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_livestream_analytics_complete_with_all_params(
+        self, async_client: AsyncCloudflare
+    ) -> None:
+        livestream = await async_client.realtime_kit.livestreams.get_livestream_analytics_complete(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            end_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            start_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+        )
+        assert_matches_type(LivestreamGetLivestreamAnalyticsCompleteResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_livestream_analytics_complete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.livestreams.with_raw_response.get_livestream_analytics_complete(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = await response.parse()
+        assert_matches_type(LivestreamGetLivestreamAnalyticsCompleteResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_livestream_analytics_complete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.livestreams.with_streaming_response.get_livestream_analytics_complete(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = await response.parse()
+            assert_matches_type(LivestreamGetLivestreamAnalyticsCompleteResponse, livestream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_livestream_analytics_complete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.get_livestream_analytics_complete(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.get_livestream_analytics_complete(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_livestream_session_details_for_session_id(self, async_client: AsyncCloudflare) -> None:
+        livestream = await async_client.realtime_kit.livestreams.get_livestream_session_details_for_session_id(
+            livestream_session_id="livestream-session-id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(LivestreamGetLivestreamSessionDetailsForSessionIDResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_livestream_session_details_for_session_id(
+        self, async_client: AsyncCloudflare
+    ) -> None:
+        response = (
+            await async_client.realtime_kit.livestreams.with_raw_response.get_livestream_session_details_for_session_id(
+                livestream_session_id="livestream-session-id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = await response.parse()
+        assert_matches_type(LivestreamGetLivestreamSessionDetailsForSessionIDResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_livestream_session_details_for_session_id(
+        self, async_client: AsyncCloudflare
+    ) -> None:
+        async with (
+            async_client.realtime_kit.livestreams.with_streaming_response.get_livestream_session_details_for_session_id(
+                livestream_session_id="livestream-session-id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = await response.parse()
+            assert_matches_type(
+                LivestreamGetLivestreamSessionDetailsForSessionIDResponse, livestream, path=["response"]
+            )
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_livestream_session_details_for_session_id(
+        self, async_client: AsyncCloudflare
+    ) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.get_livestream_session_details_for_session_id(
+                livestream_session_id="livestream-session-id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.get_livestream_session_details_for_session_id(
+                livestream_session_id="livestream-session-id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `livestream_session_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.get_livestream_session_details_for_session_id(
+                livestream_session_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_livestream_session_for_livestream_id(self, async_client: AsyncCloudflare) -> None:
+        livestream = await async_client.realtime_kit.livestreams.get_livestream_session_for_livestream_id(
+            livestream_id="livestream_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(LivestreamGetLivestreamSessionForLivestreamIDResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_livestream_session_for_livestream_id_with_all_params(
+        self, async_client: AsyncCloudflare
+    ) -> None:
+        livestream = await async_client.realtime_kit.livestreams.get_livestream_session_for_livestream_id(
+            livestream_id="livestream_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            page_no=0,
+            per_page=0,
+        )
+        assert_matches_type(LivestreamGetLivestreamSessionForLivestreamIDResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_livestream_session_for_livestream_id(self, async_client: AsyncCloudflare) -> None:
+        response = (
+            await async_client.realtime_kit.livestreams.with_raw_response.get_livestream_session_for_livestream_id(
+                livestream_id="livestream_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = await response.parse()
+        assert_matches_type(LivestreamGetLivestreamSessionForLivestreamIDResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_livestream_session_for_livestream_id(
+        self, async_client: AsyncCloudflare
+    ) -> None:
+        async with (
+            async_client.realtime_kit.livestreams.with_streaming_response.get_livestream_session_for_livestream_id(
+                livestream_id="livestream_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = await response.parse()
+            assert_matches_type(LivestreamGetLivestreamSessionForLivestreamIDResponse, livestream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_livestream_session_for_livestream_id(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.get_livestream_session_for_livestream_id(
+                livestream_id="livestream_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.get_livestream_session_for_livestream_id(
+                livestream_id="livestream_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `livestream_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.get_livestream_session_for_livestream_id(
+                livestream_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_meeting_active_livestreams(self, async_client: AsyncCloudflare) -> None:
+        livestream = await async_client.realtime_kit.livestreams.get_meeting_active_livestreams(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(LivestreamGetMeetingActiveLivestreamsResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_meeting_active_livestreams(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.livestreams.with_raw_response.get_meeting_active_livestreams(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = await response.parse()
+        assert_matches_type(LivestreamGetMeetingActiveLivestreamsResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_meeting_active_livestreams(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.livestreams.with_streaming_response.get_meeting_active_livestreams(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = await response.parse()
+            assert_matches_type(LivestreamGetMeetingActiveLivestreamsResponse, livestream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_meeting_active_livestreams(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.get_meeting_active_livestreams(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.get_meeting_active_livestreams(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.get_meeting_active_livestreams(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_org_analytics(self, async_client: AsyncCloudflare) -> None:
+        livestream = await async_client.realtime_kit.livestreams.get_org_analytics(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LivestreamGetOrgAnalyticsResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_org_analytics_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        livestream = await async_client.realtime_kit.livestreams.get_org_analytics(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            end_date="2022-09-22",
+            start_date="2022-09-01",
+        )
+        assert_matches_type(LivestreamGetOrgAnalyticsResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_org_analytics(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.livestreams.with_raw_response.get_org_analytics(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = await response.parse()
+        assert_matches_type(LivestreamGetOrgAnalyticsResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_org_analytics(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.livestreams.with_streaming_response.get_org_analytics(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = await response.parse()
+            assert_matches_type(LivestreamGetOrgAnalyticsResponse, livestream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_org_analytics(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.get_org_analytics(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.get_org_analytics(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_start_livestreaming_a_meeting(self, async_client: AsyncCloudflare) -> None:
+        livestream = await async_client.realtime_kit.livestreams.start_livestreaming_a_meeting(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(LivestreamStartLivestreamingAMeetingResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_start_livestreaming_a_meeting_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        livestream = await async_client.realtime_kit.livestreams.start_livestreaming_a_meeting(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            name="prdmmp-xhycsl",
+            video_config={
+                "height": 0,
+                "width": 0,
+            },
+        )
+        assert_matches_type(LivestreamStartLivestreamingAMeetingResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_start_livestreaming_a_meeting(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.livestreams.with_raw_response.start_livestreaming_a_meeting(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = await response.parse()
+        assert_matches_type(LivestreamStartLivestreamingAMeetingResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_start_livestreaming_a_meeting(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.livestreams.with_streaming_response.start_livestreaming_a_meeting(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = await response.parse()
+            assert_matches_type(LivestreamStartLivestreamingAMeetingResponse, livestream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_start_livestreaming_a_meeting(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.start_livestreaming_a_meeting(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.start_livestreaming_a_meeting(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.start_livestreaming_a_meeting(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_stop_livestreaming_a_meeting(self, async_client: AsyncCloudflare) -> None:
+        livestream = await async_client.realtime_kit.livestreams.stop_livestreaming_a_meeting(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(LivestreamStopLivestreamingAMeetingResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_stop_livestreaming_a_meeting(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.livestreams.with_raw_response.stop_livestreaming_a_meeting(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        livestream = await response.parse()
+        assert_matches_type(LivestreamStopLivestreamingAMeetingResponse, livestream, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_stop_livestreaming_a_meeting(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.livestreams.with_streaming_response.stop_livestreaming_a_meeting(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            livestream = await response.parse()
+            assert_matches_type(LivestreamStopLivestreamingAMeetingResponse, livestream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_stop_livestreaming_a_meeting(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.stop_livestreaming_a_meeting(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.stop_livestreaming_a_meeting(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            await async_client.realtime_kit.livestreams.with_raw_response.stop_livestreaming_a_meeting(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
diff --git a/tests/api_resources/realtime_kit/test_meetings.py b/tests/api_resources/realtime_kit/test_meetings.py
new file mode 100644
index 00000000000..75e1393a93d
--- /dev/null
+++ b/tests/api_resources/realtime_kit/test_meetings.py
@@ -0,0 +1,1987 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.realtime_kit import (
+    MeetingGetResponse,
+    MeetingCreateResponse,
+    MeetingAddParticipantResponse,
+    MeetingGetMeetingByIDResponse,
+    MeetingEditParticipantResponse,
+    MeetingUpdateMeetingByIDResponse,
+    MeetingReplaceMeetingByIDResponse,
+    MeetingGetMeetingParticipantResponse,
+    MeetingGetMeetingParticipantsResponse,
+    MeetingRefreshParticipantTokenResponse,
+    MeetingDeleteMeetingParticipantResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestMeetings:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.create(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(MeetingCreateResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.create(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ai_config={
+                "summarization": {
+                    "summary_type": "general",
+                    "text_format": "plain_text",
+                    "word_limit": 150,
+                },
+                "transcription": {
+                    "keywords": ["string"],
+                    "language": "en-US",
+                    "profanity_filter": True,
+                },
+            },
+            live_stream_on_start=True,
+            persist_chat=True,
+            record_on_start=True,
+            recording_config={
+                "audio_config": {
+                    "channel": "mono",
+                    "codec": "MP3",
+                    "export_file": True,
+                },
+                "file_name_prefix": "file_name_prefix",
+                "live_streaming_config": {"rtmp_url": "rtmp://a.rtmp.youtube.com/live2"},
+                "max_seconds": 60,
+                "realtimekit_bucket_config": {"enabled": True},
+                "storage_config": {
+                    "type": "aws",
+                    "access_key": "access_key",
+                    "auth_method": "KEY",
+                    "bucket": "bucket",
+                    "host": "host",
+                    "password": "password",
+                    "path": "path",
+                    "port": 0,
+                    "private_key": "private_key",
+                    "region": "us-east-1",
+                    "secret": "secret",
+                    "username": "username",
+                },
+                "video_config": {
+                    "codec": "H264",
+                    "export_file": True,
+                    "height": 720,
+                    "watermark": {
+                        "position": "left top",
+                        "size": {
+                            "height": 1,
+                            "width": 1,
+                        },
+                        "url": "https://example.com",
+                    },
+                    "width": 1280,
+                },
+            },
+            session_keep_alive_time_in_secs=60,
+            summarize_on_end=True,
+            title="title",
+        )
+        assert_matches_type(MeetingCreateResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.meetings.with_raw_response.create(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = response.parse()
+        assert_matches_type(MeetingCreateResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.realtime_kit.meetings.with_streaming_response.create(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = response.parse()
+            assert_matches_type(MeetingCreateResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.create(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.create(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_add_participant(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.add_participant(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            custom_participant_id="custom_participant_id",
+            preset_name="preset_name",
+        )
+        assert_matches_type(MeetingAddParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_add_participant_with_all_params(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.add_participant(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            custom_participant_id="custom_participant_id",
+            preset_name="preset_name",
+            name="Mary Sue",
+            picture="https://i.imgur.com/test.jpg",
+        )
+        assert_matches_type(MeetingAddParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_add_participant(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.meetings.with_raw_response.add_participant(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            custom_participant_id="custom_participant_id",
+            preset_name="preset_name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = response.parse()
+        assert_matches_type(MeetingAddParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_add_participant(self, client: Cloudflare) -> None:
+        with client.realtime_kit.meetings.with_streaming_response.add_participant(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            custom_participant_id="custom_participant_id",
+            preset_name="preset_name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = response.parse()
+            assert_matches_type(MeetingAddParticipantResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_add_participant(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.add_participant(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                app_id="app_id",
+                custom_participant_id="custom_participant_id",
+                preset_name="preset_name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.add_participant(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                custom_participant_id="custom_participant_id",
+                preset_name="preset_name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.add_participant(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                custom_participant_id="custom_participant_id",
+                preset_name="preset_name",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_delete_meeting_participant(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.delete_meeting_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(MeetingDeleteMeetingParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_delete_meeting_participant(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.meetings.with_raw_response.delete_meeting_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = response.parse()
+        assert_matches_type(MeetingDeleteMeetingParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_delete_meeting_participant(self, client: Cloudflare) -> None:
+        with client.realtime_kit.meetings.with_streaming_response.delete_meeting_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = response.parse()
+            assert_matches_type(MeetingDeleteMeetingParticipantResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_delete_meeting_participant(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.delete_meeting_participant(
+                participant_id="participant_id",
+                account_id="",
+                app_id="app_id",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.delete_meeting_participant(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.delete_meeting_participant(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                meeting_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `participant_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.delete_meeting_participant(
+                participant_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_edit_participant(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.edit_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(MeetingEditParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_edit_participant_with_all_params(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.edit_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            name="Jane Doe",
+            picture="https://example.com",
+            preset_name="preset_name",
+        )
+        assert_matches_type(MeetingEditParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_edit_participant(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.meetings.with_raw_response.edit_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = response.parse()
+        assert_matches_type(MeetingEditParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_edit_participant(self, client: Cloudflare) -> None:
+        with client.realtime_kit.meetings.with_streaming_response.edit_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = response.parse()
+            assert_matches_type(MeetingEditParticipantResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_edit_participant(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.edit_participant(
+                participant_id="participant_id",
+                account_id="",
+                app_id="app_id",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.edit_participant(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.edit_participant(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                meeting_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `participant_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.edit_participant(
+                participant_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.get(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(MeetingGetResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.get(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            end_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            page_no=0,
+            per_page=0,
+            search="search",
+            start_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+        )
+        assert_matches_type(MeetingGetResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.meetings.with_raw_response.get(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = response.parse()
+        assert_matches_type(MeetingGetResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.realtime_kit.meetings.with_streaming_response.get(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = response.parse()
+            assert_matches_type(MeetingGetResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.get(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.get(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_meeting_by_id(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.get_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(MeetingGetMeetingByIDResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_meeting_by_id_with_all_params(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.get_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            name="name",
+        )
+        assert_matches_type(MeetingGetMeetingByIDResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_meeting_by_id(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.meetings.with_raw_response.get_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = response.parse()
+        assert_matches_type(MeetingGetMeetingByIDResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_meeting_by_id(self, client: Cloudflare) -> None:
+        with client.realtime_kit.meetings.with_streaming_response.get_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = response.parse()
+            assert_matches_type(MeetingGetMeetingByIDResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_meeting_by_id(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.get_meeting_by_id(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.get_meeting_by_id(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.get_meeting_by_id(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_meeting_participant(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.get_meeting_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(MeetingGetMeetingParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_meeting_participant(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.meetings.with_raw_response.get_meeting_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = response.parse()
+        assert_matches_type(MeetingGetMeetingParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_meeting_participant(self, client: Cloudflare) -> None:
+        with client.realtime_kit.meetings.with_streaming_response.get_meeting_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = response.parse()
+            assert_matches_type(MeetingGetMeetingParticipantResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_meeting_participant(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.get_meeting_participant(
+                participant_id="participant_id",
+                account_id="",
+                app_id="app_id",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.get_meeting_participant(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.get_meeting_participant(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                meeting_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `participant_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.get_meeting_participant(
+                participant_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_meeting_participants(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.get_meeting_participants(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(MeetingGetMeetingParticipantsResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_meeting_participants_with_all_params(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.get_meeting_participants(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            page_no=0,
+            per_page=0,
+        )
+        assert_matches_type(MeetingGetMeetingParticipantsResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_meeting_participants(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.meetings.with_raw_response.get_meeting_participants(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = response.parse()
+        assert_matches_type(MeetingGetMeetingParticipantsResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_meeting_participants(self, client: Cloudflare) -> None:
+        with client.realtime_kit.meetings.with_streaming_response.get_meeting_participants(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = response.parse()
+            assert_matches_type(MeetingGetMeetingParticipantsResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_meeting_participants(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.get_meeting_participants(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.get_meeting_participants(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.get_meeting_participants(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_refresh_participant_token(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.refresh_participant_token(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(MeetingRefreshParticipantTokenResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_refresh_participant_token(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.meetings.with_raw_response.refresh_participant_token(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = response.parse()
+        assert_matches_type(MeetingRefreshParticipantTokenResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_refresh_participant_token(self, client: Cloudflare) -> None:
+        with client.realtime_kit.meetings.with_streaming_response.refresh_participant_token(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = response.parse()
+            assert_matches_type(MeetingRefreshParticipantTokenResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_refresh_participant_token(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.refresh_participant_token(
+                participant_id="participant_id",
+                account_id="",
+                app_id="app_id",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.refresh_participant_token(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.refresh_participant_token(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                meeting_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `participant_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.refresh_participant_token(
+                participant_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_replace_meeting_by_id(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.replace_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(MeetingReplaceMeetingByIDResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_replace_meeting_by_id_with_all_params(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.replace_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            ai_config={
+                "summarization": {
+                    "summary_type": "general",
+                    "text_format": "plain_text",
+                    "word_limit": 150,
+                },
+                "transcription": {
+                    "keywords": ["string"],
+                    "language": "en-US",
+                    "profanity_filter": True,
+                },
+            },
+            live_stream_on_start=True,
+            persist_chat=True,
+            record_on_start=True,
+            recording_config={
+                "audio_config": {
+                    "channel": "mono",
+                    "codec": "MP3",
+                    "export_file": True,
+                },
+                "file_name_prefix": "file_name_prefix",
+                "live_streaming_config": {"rtmp_url": "rtmp://a.rtmp.youtube.com/live2"},
+                "max_seconds": 60,
+                "realtimekit_bucket_config": {"enabled": True},
+                "storage_config": {
+                    "type": "aws",
+                    "access_key": "access_key",
+                    "auth_method": "KEY",
+                    "bucket": "bucket",
+                    "host": "host",
+                    "password": "password",
+                    "path": "path",
+                    "port": 0,
+                    "private_key": "private_key",
+                    "region": "us-east-1",
+                    "secret": "secret",
+                    "username": "username",
+                },
+                "video_config": {
+                    "codec": "H264",
+                    "export_file": True,
+                    "height": 720,
+                    "watermark": {
+                        "position": "left top",
+                        "size": {
+                            "height": 1,
+                            "width": 1,
+                        },
+                        "url": "https://example.com",
+                    },
+                    "width": 1280,
+                },
+            },
+            session_keep_alive_time_in_secs=60,
+            summarize_on_end=True,
+            title="title",
+        )
+        assert_matches_type(MeetingReplaceMeetingByIDResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_replace_meeting_by_id(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.meetings.with_raw_response.replace_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = response.parse()
+        assert_matches_type(MeetingReplaceMeetingByIDResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_replace_meeting_by_id(self, client: Cloudflare) -> None:
+        with client.realtime_kit.meetings.with_streaming_response.replace_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = response.parse()
+            assert_matches_type(MeetingReplaceMeetingByIDResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_replace_meeting_by_id(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.replace_meeting_by_id(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.replace_meeting_by_id(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.replace_meeting_by_id(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_update_meeting_by_id(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.update_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(MeetingUpdateMeetingByIDResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_update_meeting_by_id_with_all_params(self, client: Cloudflare) -> None:
+        meeting = client.realtime_kit.meetings.update_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            ai_config={
+                "summarization": {
+                    "summary_type": "general",
+                    "text_format": "plain_text",
+                    "word_limit": 150,
+                },
+                "transcription": {
+                    "keywords": ["string"],
+                    "language": "en-US",
+                    "profanity_filter": True,
+                },
+            },
+            live_stream_on_start=True,
+            persist_chat=True,
+            record_on_start=True,
+            session_keep_alive_time_in_secs=60,
+            status="INACTIVE",
+            summarize_on_end=True,
+            title="title",
+        )
+        assert_matches_type(MeetingUpdateMeetingByIDResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_update_meeting_by_id(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.meetings.with_raw_response.update_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = response.parse()
+        assert_matches_type(MeetingUpdateMeetingByIDResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_update_meeting_by_id(self, client: Cloudflare) -> None:
+        with client.realtime_kit.meetings.with_streaming_response.update_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = response.parse()
+            assert_matches_type(MeetingUpdateMeetingByIDResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_update_meeting_by_id(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.update_meeting_by_id(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.update_meeting_by_id(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            client.realtime_kit.meetings.with_raw_response.update_meeting_by_id(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+
+class TestAsyncMeetings:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.create(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(MeetingCreateResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.create(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ai_config={
+                "summarization": {
+                    "summary_type": "general",
+                    "text_format": "plain_text",
+                    "word_limit": 150,
+                },
+                "transcription": {
+                    "keywords": ["string"],
+                    "language": "en-US",
+                    "profanity_filter": True,
+                },
+            },
+            live_stream_on_start=True,
+            persist_chat=True,
+            record_on_start=True,
+            recording_config={
+                "audio_config": {
+                    "channel": "mono",
+                    "codec": "MP3",
+                    "export_file": True,
+                },
+                "file_name_prefix": "file_name_prefix",
+                "live_streaming_config": {"rtmp_url": "rtmp://a.rtmp.youtube.com/live2"},
+                "max_seconds": 60,
+                "realtimekit_bucket_config": {"enabled": True},
+                "storage_config": {
+                    "type": "aws",
+                    "access_key": "access_key",
+                    "auth_method": "KEY",
+                    "bucket": "bucket",
+                    "host": "host",
+                    "password": "password",
+                    "path": "path",
+                    "port": 0,
+                    "private_key": "private_key",
+                    "region": "us-east-1",
+                    "secret": "secret",
+                    "username": "username",
+                },
+                "video_config": {
+                    "codec": "H264",
+                    "export_file": True,
+                    "height": 720,
+                    "watermark": {
+                        "position": "left top",
+                        "size": {
+                            "height": 1,
+                            "width": 1,
+                        },
+                        "url": "https://example.com",
+                    },
+                    "width": 1280,
+                },
+            },
+            session_keep_alive_time_in_secs=60,
+            summarize_on_end=True,
+            title="title",
+        )
+        assert_matches_type(MeetingCreateResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.meetings.with_raw_response.create(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = await response.parse()
+        assert_matches_type(MeetingCreateResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.meetings.with_streaming_response.create(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = await response.parse()
+            assert_matches_type(MeetingCreateResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.create(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.create(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_add_participant(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.add_participant(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            custom_participant_id="custom_participant_id",
+            preset_name="preset_name",
+        )
+        assert_matches_type(MeetingAddParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_add_participant_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.add_participant(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            custom_participant_id="custom_participant_id",
+            preset_name="preset_name",
+            name="Mary Sue",
+            picture="https://i.imgur.com/test.jpg",
+        )
+        assert_matches_type(MeetingAddParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_add_participant(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.meetings.with_raw_response.add_participant(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            custom_participant_id="custom_participant_id",
+            preset_name="preset_name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = await response.parse()
+        assert_matches_type(MeetingAddParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_add_participant(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.meetings.with_streaming_response.add_participant(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            custom_participant_id="custom_participant_id",
+            preset_name="preset_name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = await response.parse()
+            assert_matches_type(MeetingAddParticipantResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_add_participant(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.add_participant(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                app_id="app_id",
+                custom_participant_id="custom_participant_id",
+                preset_name="preset_name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.add_participant(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                custom_participant_id="custom_participant_id",
+                preset_name="preset_name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.add_participant(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                custom_participant_id="custom_participant_id",
+                preset_name="preset_name",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_delete_meeting_participant(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.delete_meeting_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(MeetingDeleteMeetingParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_delete_meeting_participant(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.meetings.with_raw_response.delete_meeting_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = await response.parse()
+        assert_matches_type(MeetingDeleteMeetingParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_delete_meeting_participant(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.meetings.with_streaming_response.delete_meeting_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = await response.parse()
+            assert_matches_type(MeetingDeleteMeetingParticipantResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_delete_meeting_participant(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.delete_meeting_participant(
+                participant_id="participant_id",
+                account_id="",
+                app_id="app_id",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.delete_meeting_participant(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.delete_meeting_participant(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                meeting_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `participant_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.delete_meeting_participant(
+                participant_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_edit_participant(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.edit_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(MeetingEditParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_edit_participant_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.edit_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            name="Jane Doe",
+            picture="https://example.com",
+            preset_name="preset_name",
+        )
+        assert_matches_type(MeetingEditParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_edit_participant(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.meetings.with_raw_response.edit_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = await response.parse()
+        assert_matches_type(MeetingEditParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_edit_participant(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.meetings.with_streaming_response.edit_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = await response.parse()
+            assert_matches_type(MeetingEditParticipantResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_edit_participant(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.edit_participant(
+                participant_id="participant_id",
+                account_id="",
+                app_id="app_id",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.edit_participant(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.edit_participant(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                meeting_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `participant_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.edit_participant(
+                participant_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.get(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(MeetingGetResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.get(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            end_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            page_no=0,
+            per_page=0,
+            search="search",
+            start_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+        )
+        assert_matches_type(MeetingGetResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.meetings.with_raw_response.get(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = await response.parse()
+        assert_matches_type(MeetingGetResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.meetings.with_streaming_response.get(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = await response.parse()
+            assert_matches_type(MeetingGetResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.get(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.get(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_meeting_by_id(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.get_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(MeetingGetMeetingByIDResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_meeting_by_id_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.get_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            name="name",
+        )
+        assert_matches_type(MeetingGetMeetingByIDResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_meeting_by_id(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.meetings.with_raw_response.get_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = await response.parse()
+        assert_matches_type(MeetingGetMeetingByIDResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_meeting_by_id(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.meetings.with_streaming_response.get_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = await response.parse()
+            assert_matches_type(MeetingGetMeetingByIDResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_meeting_by_id(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.get_meeting_by_id(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.get_meeting_by_id(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.get_meeting_by_id(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_meeting_participant(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.get_meeting_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(MeetingGetMeetingParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_meeting_participant(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.meetings.with_raw_response.get_meeting_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = await response.parse()
+        assert_matches_type(MeetingGetMeetingParticipantResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_meeting_participant(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.meetings.with_streaming_response.get_meeting_participant(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = await response.parse()
+            assert_matches_type(MeetingGetMeetingParticipantResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_meeting_participant(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.get_meeting_participant(
+                participant_id="participant_id",
+                account_id="",
+                app_id="app_id",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.get_meeting_participant(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.get_meeting_participant(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                meeting_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `participant_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.get_meeting_participant(
+                participant_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_meeting_participants(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.get_meeting_participants(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(MeetingGetMeetingParticipantsResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_meeting_participants_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.get_meeting_participants(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            page_no=0,
+            per_page=0,
+        )
+        assert_matches_type(MeetingGetMeetingParticipantsResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_meeting_participants(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.meetings.with_raw_response.get_meeting_participants(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = await response.parse()
+        assert_matches_type(MeetingGetMeetingParticipantsResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_meeting_participants(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.meetings.with_streaming_response.get_meeting_participants(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = await response.parse()
+            assert_matches_type(MeetingGetMeetingParticipantsResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_meeting_participants(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.get_meeting_participants(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.get_meeting_participants(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.get_meeting_participants(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_refresh_participant_token(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.refresh_participant_token(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(MeetingRefreshParticipantTokenResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_refresh_participant_token(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.meetings.with_raw_response.refresh_participant_token(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = await response.parse()
+        assert_matches_type(MeetingRefreshParticipantTokenResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_refresh_participant_token(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.meetings.with_streaming_response.refresh_participant_token(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = await response.parse()
+            assert_matches_type(MeetingRefreshParticipantTokenResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_refresh_participant_token(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.refresh_participant_token(
+                participant_id="participant_id",
+                account_id="",
+                app_id="app_id",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.refresh_participant_token(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.refresh_participant_token(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                meeting_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `participant_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.refresh_participant_token(
+                participant_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_replace_meeting_by_id(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.replace_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(MeetingReplaceMeetingByIDResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_replace_meeting_by_id_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.replace_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            ai_config={
+                "summarization": {
+                    "summary_type": "general",
+                    "text_format": "plain_text",
+                    "word_limit": 150,
+                },
+                "transcription": {
+                    "keywords": ["string"],
+                    "language": "en-US",
+                    "profanity_filter": True,
+                },
+            },
+            live_stream_on_start=True,
+            persist_chat=True,
+            record_on_start=True,
+            recording_config={
+                "audio_config": {
+                    "channel": "mono",
+                    "codec": "MP3",
+                    "export_file": True,
+                },
+                "file_name_prefix": "file_name_prefix",
+                "live_streaming_config": {"rtmp_url": "rtmp://a.rtmp.youtube.com/live2"},
+                "max_seconds": 60,
+                "realtimekit_bucket_config": {"enabled": True},
+                "storage_config": {
+                    "type": "aws",
+                    "access_key": "access_key",
+                    "auth_method": "KEY",
+                    "bucket": "bucket",
+                    "host": "host",
+                    "password": "password",
+                    "path": "path",
+                    "port": 0,
+                    "private_key": "private_key",
+                    "region": "us-east-1",
+                    "secret": "secret",
+                    "username": "username",
+                },
+                "video_config": {
+                    "codec": "H264",
+                    "export_file": True,
+                    "height": 720,
+                    "watermark": {
+                        "position": "left top",
+                        "size": {
+                            "height": 1,
+                            "width": 1,
+                        },
+                        "url": "https://example.com",
+                    },
+                    "width": 1280,
+                },
+            },
+            session_keep_alive_time_in_secs=60,
+            summarize_on_end=True,
+            title="title",
+        )
+        assert_matches_type(MeetingReplaceMeetingByIDResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_replace_meeting_by_id(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.meetings.with_raw_response.replace_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = await response.parse()
+        assert_matches_type(MeetingReplaceMeetingByIDResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_replace_meeting_by_id(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.meetings.with_streaming_response.replace_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = await response.parse()
+            assert_matches_type(MeetingReplaceMeetingByIDResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_replace_meeting_by_id(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.replace_meeting_by_id(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.replace_meeting_by_id(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.replace_meeting_by_id(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_update_meeting_by_id(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.update_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(MeetingUpdateMeetingByIDResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_update_meeting_by_id_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        meeting = await async_client.realtime_kit.meetings.update_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            ai_config={
+                "summarization": {
+                    "summary_type": "general",
+                    "text_format": "plain_text",
+                    "word_limit": 150,
+                },
+                "transcription": {
+                    "keywords": ["string"],
+                    "language": "en-US",
+                    "profanity_filter": True,
+                },
+            },
+            live_stream_on_start=True,
+            persist_chat=True,
+            record_on_start=True,
+            session_keep_alive_time_in_secs=60,
+            status="INACTIVE",
+            summarize_on_end=True,
+            title="title",
+        )
+        assert_matches_type(MeetingUpdateMeetingByIDResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_update_meeting_by_id(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.meetings.with_raw_response.update_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        meeting = await response.parse()
+        assert_matches_type(MeetingUpdateMeetingByIDResponse, meeting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_update_meeting_by_id(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.meetings.with_streaming_response.update_meeting_by_id(
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            meeting = await response.parse()
+            assert_matches_type(MeetingUpdateMeetingByIDResponse, meeting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_update_meeting_by_id(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.update_meeting_by_id(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.update_meeting_by_id(
+                meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            await async_client.realtime_kit.meetings.with_raw_response.update_meeting_by_id(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
diff --git a/tests/api_resources/realtime_kit/test_presets.py b/tests/api_resources/realtime_kit/test_presets.py
new file mode 100644
index 00000000000..28cdb5b278c
--- /dev/null
+++ b/tests/api_resources/realtime_kit/test_presets.py
@@ -0,0 +1,1606 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.realtime_kit import (
+    PresetGetResponse,
+    PresetCreateResponse,
+    PresetDeleteResponse,
+    PresetUpdateResponse,
+    PresetGetPresetByIDResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestPresets:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        preset = client.realtime_kit.presets.create(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            config={
+                "max_screenshare_count": 0,
+                "max_video_streams": {
+                    "desktop": 0,
+                    "mobile": 0,
+                },
+                "media": {
+                    "screenshare": {
+                        "frame_rate": 0,
+                        "quality": "hd",
+                    },
+                    "video": {
+                        "frame_rate": 30,
+                        "quality": "hd",
+                    },
+                },
+                "view_type": "GROUP_CALL",
+            },
+            name="name",
+            ui={
+                "design_tokens": {
+                    "border_radius": "rounded",
+                    "border_width": "thin",
+                    "colors": {
+                        "background": {
+                            "_600": "600",
+                            "_700": "700",
+                            "_800": "800",
+                            "_900": "900",
+                            "_1000": "1000",
+                        },
+                        "brand": {
+                            "_300": "300",
+                            "_400": "400",
+                            "_500": "500",
+                            "_600": "600",
+                            "_700": "700",
+                        },
+                        "danger": "danger",
+                        "success": "success",
+                        "text": "text",
+                        "text_on_brand": "text_on_brand",
+                        "video_bg": "video_bg",
+                        "warning": "warning",
+                    },
+                    "logo": "logo",
+                    "spacing_base": 0,
+                    "theme": "dark",
+                }
+            },
+        )
+        assert_matches_type(PresetCreateResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        preset = client.realtime_kit.presets.create(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            config={
+                "max_screenshare_count": 0,
+                "max_video_streams": {
+                    "desktop": 0,
+                    "mobile": 0,
+                },
+                "media": {
+                    "screenshare": {
+                        "frame_rate": 0,
+                        "quality": "hd",
+                    },
+                    "video": {
+                        "frame_rate": 30,
+                        "quality": "hd",
+                    },
+                    "audio": {
+                        "enable_high_bitrate": True,
+                        "enable_stereo": True,
+                    },
+                },
+                "view_type": "GROUP_CALL",
+            },
+            name="name",
+            ui={
+                "design_tokens": {
+                    "border_radius": "rounded",
+                    "border_width": "thin",
+                    "colors": {
+                        "background": {
+                            "_600": "600",
+                            "_700": "700",
+                            "_800": "800",
+                            "_900": "900",
+                            "_1000": "1000",
+                        },
+                        "brand": {
+                            "_300": "300",
+                            "_400": "400",
+                            "_500": "500",
+                            "_600": "600",
+                            "_700": "700",
+                        },
+                        "danger": "danger",
+                        "success": "success",
+                        "text": "text",
+                        "text_on_brand": "text_on_brand",
+                        "video_bg": "video_bg",
+                        "warning": "warning",
+                    },
+                    "logo": "logo",
+                    "spacing_base": 0,
+                    "theme": "dark",
+                },
+                "config_diff": {},
+            },
+            permissions={
+                "accept_waiting_requests": True,
+                "can_accept_production_requests": True,
+                "can_change_participant_permissions": True,
+                "can_edit_display_name": True,
+                "can_livestream": True,
+                "can_record": True,
+                "can_spotlight": True,
+                "chat": {
+                    "private": {
+                        "can_receive": True,
+                        "can_send": True,
+                        "files": True,
+                        "text": True,
+                    },
+                    "public": {
+                        "can_send": True,
+                        "files": True,
+                        "text": True,
+                    },
+                },
+                "connected_meetings": {
+                    "can_alter_connected_meetings": True,
+                    "can_switch_connected_meetings": True,
+                    "can_switch_to_parent_meeting": True,
+                },
+                "disable_participant_audio": True,
+                "disable_participant_screensharing": True,
+                "disable_participant_video": True,
+                "hidden_participant": True,
+                "kick_participant": True,
+                "media": {
+                    "audio": {"can_produce": "ALLOWED"},
+                    "screenshare": {"can_produce": "ALLOWED"},
+                    "video": {"can_produce": "ALLOWED"},
+                },
+                "pin_participant": True,
+                "plugins": {
+                    "can_close": True,
+                    "can_edit_config": True,
+                    "can_start": True,
+                    "config": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                },
+                "polls": {
+                    "can_create": True,
+                    "can_view": True,
+                    "can_vote": True,
+                },
+                "recorder_type": "RECORDER",
+                "show_participant_list": True,
+                "waiting_room_type": "SKIP",
+                "is_recorder": True,
+            },
+        )
+        assert_matches_type(PresetCreateResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.presets.with_raw_response.create(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            config={
+                "max_screenshare_count": 0,
+                "max_video_streams": {
+                    "desktop": 0,
+                    "mobile": 0,
+                },
+                "media": {
+                    "screenshare": {
+                        "frame_rate": 0,
+                        "quality": "hd",
+                    },
+                    "video": {
+                        "frame_rate": 30,
+                        "quality": "hd",
+                    },
+                },
+                "view_type": "GROUP_CALL",
+            },
+            name="name",
+            ui={
+                "design_tokens": {
+                    "border_radius": "rounded",
+                    "border_width": "thin",
+                    "colors": {
+                        "background": {
+                            "_600": "600",
+                            "_700": "700",
+                            "_800": "800",
+                            "_900": "900",
+                            "_1000": "1000",
+                        },
+                        "brand": {
+                            "_300": "300",
+                            "_400": "400",
+                            "_500": "500",
+                            "_600": "600",
+                            "_700": "700",
+                        },
+                        "danger": "danger",
+                        "success": "success",
+                        "text": "text",
+                        "text_on_brand": "text_on_brand",
+                        "video_bg": "video_bg",
+                        "warning": "warning",
+                    },
+                    "logo": "logo",
+                    "spacing_base": 0,
+                    "theme": "dark",
+                }
+            },
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        preset = response.parse()
+        assert_matches_type(PresetCreateResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.realtime_kit.presets.with_streaming_response.create(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            config={
+                "max_screenshare_count": 0,
+                "max_video_streams": {
+                    "desktop": 0,
+                    "mobile": 0,
+                },
+                "media": {
+                    "screenshare": {
+                        "frame_rate": 0,
+                        "quality": "hd",
+                    },
+                    "video": {
+                        "frame_rate": 30,
+                        "quality": "hd",
+                    },
+                },
+                "view_type": "GROUP_CALL",
+            },
+            name="name",
+            ui={
+                "design_tokens": {
+                    "border_radius": "rounded",
+                    "border_width": "thin",
+                    "colors": {
+                        "background": {
+                            "_600": "600",
+                            "_700": "700",
+                            "_800": "800",
+                            "_900": "900",
+                            "_1000": "1000",
+                        },
+                        "brand": {
+                            "_300": "300",
+                            "_400": "400",
+                            "_500": "500",
+                            "_600": "600",
+                            "_700": "700",
+                        },
+                        "danger": "danger",
+                        "success": "success",
+                        "text": "text",
+                        "text_on_brand": "text_on_brand",
+                        "video_bg": "video_bg",
+                        "warning": "warning",
+                    },
+                    "logo": "logo",
+                    "spacing_base": 0,
+                    "theme": "dark",
+                }
+            },
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            preset = response.parse()
+            assert_matches_type(PresetCreateResponse, preset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.presets.with_raw_response.create(
+                app_id="app_id",
+                account_id="",
+                config={
+                    "max_screenshare_count": 0,
+                    "max_video_streams": {
+                        "desktop": 0,
+                        "mobile": 0,
+                    },
+                    "media": {
+                        "screenshare": {
+                            "frame_rate": 0,
+                            "quality": "hd",
+                        },
+                        "video": {
+                            "frame_rate": 30,
+                            "quality": "hd",
+                        },
+                    },
+                    "view_type": "GROUP_CALL",
+                },
+                name="name",
+                ui={
+                    "design_tokens": {
+                        "border_radius": "rounded",
+                        "border_width": "thin",
+                        "colors": {
+                            "background": {
+                                "_600": "600",
+                                "_700": "700",
+                                "_800": "800",
+                                "_900": "900",
+                                "_1000": "1000",
+                            },
+                            "brand": {
+                                "_300": "300",
+                                "_400": "400",
+                                "_500": "500",
+                                "_600": "600",
+                                "_700": "700",
+                            },
+                            "danger": "danger",
+                            "success": "success",
+                            "text": "text",
+                            "text_on_brand": "text_on_brand",
+                            "video_bg": "video_bg",
+                            "warning": "warning",
+                        },
+                        "logo": "logo",
+                        "spacing_base": 0,
+                        "theme": "dark",
+                    }
+                },
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.presets.with_raw_response.create(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                config={
+                    "max_screenshare_count": 0,
+                    "max_video_streams": {
+                        "desktop": 0,
+                        "mobile": 0,
+                    },
+                    "media": {
+                        "screenshare": {
+                            "frame_rate": 0,
+                            "quality": "hd",
+                        },
+                        "video": {
+                            "frame_rate": 30,
+                            "quality": "hd",
+                        },
+                    },
+                    "view_type": "GROUP_CALL",
+                },
+                name="name",
+                ui={
+                    "design_tokens": {
+                        "border_radius": "rounded",
+                        "border_width": "thin",
+                        "colors": {
+                            "background": {
+                                "_600": "600",
+                                "_700": "700",
+                                "_800": "800",
+                                "_900": "900",
+                                "_1000": "1000",
+                            },
+                            "brand": {
+                                "_300": "300",
+                                "_400": "400",
+                                "_500": "500",
+                                "_600": "600",
+                                "_700": "700",
+                            },
+                            "danger": "danger",
+                            "success": "success",
+                            "text": "text",
+                            "text_on_brand": "text_on_brand",
+                            "video_bg": "video_bg",
+                            "warning": "warning",
+                        },
+                        "logo": "logo",
+                        "spacing_base": 0,
+                        "theme": "dark",
+                    }
+                },
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        preset = client.realtime_kit.presets.update(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(PresetUpdateResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        preset = client.realtime_kit.presets.update(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            config={
+                "max_screenshare_count": 0,
+                "max_video_streams": {
+                    "desktop": 0,
+                    "mobile": 0,
+                },
+                "media": {
+                    "screenshare": {
+                        "frame_rate": 0,
+                        "quality": "hd",
+                    },
+                    "video": {
+                        "frame_rate": 30,
+                        "quality": "hd",
+                    },
+                },
+                "view_type": "GROUP_CALL",
+            },
+            name="name",
+            permissions={
+                "accept_waiting_requests": True,
+                "can_accept_production_requests": True,
+                "can_change_participant_permissions": True,
+                "can_edit_display_name": True,
+                "can_livestream": True,
+                "can_record": True,
+                "can_spotlight": True,
+                "chat": {
+                    "private": {
+                        "can_receive": True,
+                        "can_send": True,
+                        "files": True,
+                        "text": True,
+                    },
+                    "public": {
+                        "can_send": True,
+                        "files": True,
+                        "text": True,
+                    },
+                },
+                "connected_meetings": {
+                    "can_alter_connected_meetings": True,
+                    "can_switch_connected_meetings": True,
+                    "can_switch_to_parent_meeting": True,
+                },
+                "disable_participant_audio": True,
+                "disable_participant_screensharing": True,
+                "disable_participant_video": True,
+                "hidden_participant": True,
+                "is_recorder": True,
+                "kick_participant": True,
+                "media": {
+                    "audio": {"can_produce": "ALLOWED"},
+                    "screenshare": {"can_produce": "ALLOWED"},
+                    "video": {"can_produce": "ALLOWED"},
+                },
+                "pin_participant": True,
+                "plugins": {
+                    "can_close": True,
+                    "can_edit_config": True,
+                    "can_start": True,
+                    "config": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                },
+                "polls": {
+                    "can_create": True,
+                    "can_view": True,
+                    "can_vote": True,
+                },
+                "recorder_type": "RECORDER",
+                "show_participant_list": True,
+                "waiting_room_type": "SKIP",
+            },
+            ui={
+                "config_diff": {},
+                "design_tokens": {
+                    "border_radius": "rounded",
+                    "border_width": "thin",
+                    "colors": {
+                        "background": {
+                            "_600": "600",
+                            "_700": "700",
+                            "_800": "800",
+                            "_900": "900",
+                            "_1000": "1000",
+                        },
+                        "brand": {
+                            "_300": "300",
+                            "_400": "400",
+                            "_500": "500",
+                            "_600": "600",
+                            "_700": "700",
+                        },
+                        "danger": "danger",
+                        "success": "success",
+                        "text": "text",
+                        "text_on_brand": "text_on_brand",
+                        "video_bg": "video_bg",
+                        "warning": "warning",
+                    },
+                    "logo": "logo",
+                    "spacing_base": 0,
+                    "theme": "dark",
+                },
+            },
+        )
+        assert_matches_type(PresetUpdateResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.presets.with_raw_response.update(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        preset = response.parse()
+        assert_matches_type(PresetUpdateResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.realtime_kit.presets.with_streaming_response.update(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            preset = response.parse()
+            assert_matches_type(PresetUpdateResponse, preset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.presets.with_raw_response.update(
+                preset_id="preset_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.presets.with_raw_response.update(
+                preset_id="preset_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `preset_id` but received ''"):
+            client.realtime_kit.presets.with_raw_response.update(
+                preset_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        preset = client.realtime_kit.presets.delete(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(PresetDeleteResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.presets.with_raw_response.delete(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        preset = response.parse()
+        assert_matches_type(PresetDeleteResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.realtime_kit.presets.with_streaming_response.delete(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            preset = response.parse()
+            assert_matches_type(PresetDeleteResponse, preset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.presets.with_raw_response.delete(
+                preset_id="preset_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.presets.with_raw_response.delete(
+                preset_id="preset_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `preset_id` but received ''"):
+            client.realtime_kit.presets.with_raw_response.delete(
+                preset_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        preset = client.realtime_kit.presets.get(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(PresetGetResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        preset = client.realtime_kit.presets.get(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page_no=0,
+            per_page=0,
+        )
+        assert_matches_type(PresetGetResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.presets.with_raw_response.get(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        preset = response.parse()
+        assert_matches_type(PresetGetResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.realtime_kit.presets.with_streaming_response.get(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            preset = response.parse()
+            assert_matches_type(PresetGetResponse, preset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.presets.with_raw_response.get(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.presets.with_raw_response.get(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_preset_by_id(self, client: Cloudflare) -> None:
+        preset = client.realtime_kit.presets.get_preset_by_id(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(PresetGetPresetByIDResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_preset_by_id(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.presets.with_raw_response.get_preset_by_id(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        preset = response.parse()
+        assert_matches_type(PresetGetPresetByIDResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_preset_by_id(self, client: Cloudflare) -> None:
+        with client.realtime_kit.presets.with_streaming_response.get_preset_by_id(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            preset = response.parse()
+            assert_matches_type(PresetGetPresetByIDResponse, preset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_preset_by_id(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.presets.with_raw_response.get_preset_by_id(
+                preset_id="preset_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.presets.with_raw_response.get_preset_by_id(
+                preset_id="preset_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `preset_id` but received ''"):
+            client.realtime_kit.presets.with_raw_response.get_preset_by_id(
+                preset_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+
+class TestAsyncPresets:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        preset = await async_client.realtime_kit.presets.create(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            config={
+                "max_screenshare_count": 0,
+                "max_video_streams": {
+                    "desktop": 0,
+                    "mobile": 0,
+                },
+                "media": {
+                    "screenshare": {
+                        "frame_rate": 0,
+                        "quality": "hd",
+                    },
+                    "video": {
+                        "frame_rate": 30,
+                        "quality": "hd",
+                    },
+                },
+                "view_type": "GROUP_CALL",
+            },
+            name="name",
+            ui={
+                "design_tokens": {
+                    "border_radius": "rounded",
+                    "border_width": "thin",
+                    "colors": {
+                        "background": {
+                            "_600": "600",
+                            "_700": "700",
+                            "_800": "800",
+                            "_900": "900",
+                            "_1000": "1000",
+                        },
+                        "brand": {
+                            "_300": "300",
+                            "_400": "400",
+                            "_500": "500",
+                            "_600": "600",
+                            "_700": "700",
+                        },
+                        "danger": "danger",
+                        "success": "success",
+                        "text": "text",
+                        "text_on_brand": "text_on_brand",
+                        "video_bg": "video_bg",
+                        "warning": "warning",
+                    },
+                    "logo": "logo",
+                    "spacing_base": 0,
+                    "theme": "dark",
+                }
+            },
+        )
+        assert_matches_type(PresetCreateResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        preset = await async_client.realtime_kit.presets.create(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            config={
+                "max_screenshare_count": 0,
+                "max_video_streams": {
+                    "desktop": 0,
+                    "mobile": 0,
+                },
+                "media": {
+                    "screenshare": {
+                        "frame_rate": 0,
+                        "quality": "hd",
+                    },
+                    "video": {
+                        "frame_rate": 30,
+                        "quality": "hd",
+                    },
+                    "audio": {
+                        "enable_high_bitrate": True,
+                        "enable_stereo": True,
+                    },
+                },
+                "view_type": "GROUP_CALL",
+            },
+            name="name",
+            ui={
+                "design_tokens": {
+                    "border_radius": "rounded",
+                    "border_width": "thin",
+                    "colors": {
+                        "background": {
+                            "_600": "600",
+                            "_700": "700",
+                            "_800": "800",
+                            "_900": "900",
+                            "_1000": "1000",
+                        },
+                        "brand": {
+                            "_300": "300",
+                            "_400": "400",
+                            "_500": "500",
+                            "_600": "600",
+                            "_700": "700",
+                        },
+                        "danger": "danger",
+                        "success": "success",
+                        "text": "text",
+                        "text_on_brand": "text_on_brand",
+                        "video_bg": "video_bg",
+                        "warning": "warning",
+                    },
+                    "logo": "logo",
+                    "spacing_base": 0,
+                    "theme": "dark",
+                },
+                "config_diff": {},
+            },
+            permissions={
+                "accept_waiting_requests": True,
+                "can_accept_production_requests": True,
+                "can_change_participant_permissions": True,
+                "can_edit_display_name": True,
+                "can_livestream": True,
+                "can_record": True,
+                "can_spotlight": True,
+                "chat": {
+                    "private": {
+                        "can_receive": True,
+                        "can_send": True,
+                        "files": True,
+                        "text": True,
+                    },
+                    "public": {
+                        "can_send": True,
+                        "files": True,
+                        "text": True,
+                    },
+                },
+                "connected_meetings": {
+                    "can_alter_connected_meetings": True,
+                    "can_switch_connected_meetings": True,
+                    "can_switch_to_parent_meeting": True,
+                },
+                "disable_participant_audio": True,
+                "disable_participant_screensharing": True,
+                "disable_participant_video": True,
+                "hidden_participant": True,
+                "kick_participant": True,
+                "media": {
+                    "audio": {"can_produce": "ALLOWED"},
+                    "screenshare": {"can_produce": "ALLOWED"},
+                    "video": {"can_produce": "ALLOWED"},
+                },
+                "pin_participant": True,
+                "plugins": {
+                    "can_close": True,
+                    "can_edit_config": True,
+                    "can_start": True,
+                    "config": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                },
+                "polls": {
+                    "can_create": True,
+                    "can_view": True,
+                    "can_vote": True,
+                },
+                "recorder_type": "RECORDER",
+                "show_participant_list": True,
+                "waiting_room_type": "SKIP",
+                "is_recorder": True,
+            },
+        )
+        assert_matches_type(PresetCreateResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.presets.with_raw_response.create(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            config={
+                "max_screenshare_count": 0,
+                "max_video_streams": {
+                    "desktop": 0,
+                    "mobile": 0,
+                },
+                "media": {
+                    "screenshare": {
+                        "frame_rate": 0,
+                        "quality": "hd",
+                    },
+                    "video": {
+                        "frame_rate": 30,
+                        "quality": "hd",
+                    },
+                },
+                "view_type": "GROUP_CALL",
+            },
+            name="name",
+            ui={
+                "design_tokens": {
+                    "border_radius": "rounded",
+                    "border_width": "thin",
+                    "colors": {
+                        "background": {
+                            "_600": "600",
+                            "_700": "700",
+                            "_800": "800",
+                            "_900": "900",
+                            "_1000": "1000",
+                        },
+                        "brand": {
+                            "_300": "300",
+                            "_400": "400",
+                            "_500": "500",
+                            "_600": "600",
+                            "_700": "700",
+                        },
+                        "danger": "danger",
+                        "success": "success",
+                        "text": "text",
+                        "text_on_brand": "text_on_brand",
+                        "video_bg": "video_bg",
+                        "warning": "warning",
+                    },
+                    "logo": "logo",
+                    "spacing_base": 0,
+                    "theme": "dark",
+                }
+            },
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        preset = await response.parse()
+        assert_matches_type(PresetCreateResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.presets.with_streaming_response.create(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            config={
+                "max_screenshare_count": 0,
+                "max_video_streams": {
+                    "desktop": 0,
+                    "mobile": 0,
+                },
+                "media": {
+                    "screenshare": {
+                        "frame_rate": 0,
+                        "quality": "hd",
+                    },
+                    "video": {
+                        "frame_rate": 30,
+                        "quality": "hd",
+                    },
+                },
+                "view_type": "GROUP_CALL",
+            },
+            name="name",
+            ui={
+                "design_tokens": {
+                    "border_radius": "rounded",
+                    "border_width": "thin",
+                    "colors": {
+                        "background": {
+                            "_600": "600",
+                            "_700": "700",
+                            "_800": "800",
+                            "_900": "900",
+                            "_1000": "1000",
+                        },
+                        "brand": {
+                            "_300": "300",
+                            "_400": "400",
+                            "_500": "500",
+                            "_600": "600",
+                            "_700": "700",
+                        },
+                        "danger": "danger",
+                        "success": "success",
+                        "text": "text",
+                        "text_on_brand": "text_on_brand",
+                        "video_bg": "video_bg",
+                        "warning": "warning",
+                    },
+                    "logo": "logo",
+                    "spacing_base": 0,
+                    "theme": "dark",
+                }
+            },
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            preset = await response.parse()
+            assert_matches_type(PresetCreateResponse, preset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.presets.with_raw_response.create(
+                app_id="app_id",
+                account_id="",
+                config={
+                    "max_screenshare_count": 0,
+                    "max_video_streams": {
+                        "desktop": 0,
+                        "mobile": 0,
+                    },
+                    "media": {
+                        "screenshare": {
+                            "frame_rate": 0,
+                            "quality": "hd",
+                        },
+                        "video": {
+                            "frame_rate": 30,
+                            "quality": "hd",
+                        },
+                    },
+                    "view_type": "GROUP_CALL",
+                },
+                name="name",
+                ui={
+                    "design_tokens": {
+                        "border_radius": "rounded",
+                        "border_width": "thin",
+                        "colors": {
+                            "background": {
+                                "_600": "600",
+                                "_700": "700",
+                                "_800": "800",
+                                "_900": "900",
+                                "_1000": "1000",
+                            },
+                            "brand": {
+                                "_300": "300",
+                                "_400": "400",
+                                "_500": "500",
+                                "_600": "600",
+                                "_700": "700",
+                            },
+                            "danger": "danger",
+                            "success": "success",
+                            "text": "text",
+                            "text_on_brand": "text_on_brand",
+                            "video_bg": "video_bg",
+                            "warning": "warning",
+                        },
+                        "logo": "logo",
+                        "spacing_base": 0,
+                        "theme": "dark",
+                    }
+                },
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.presets.with_raw_response.create(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                config={
+                    "max_screenshare_count": 0,
+                    "max_video_streams": {
+                        "desktop": 0,
+                        "mobile": 0,
+                    },
+                    "media": {
+                        "screenshare": {
+                            "frame_rate": 0,
+                            "quality": "hd",
+                        },
+                        "video": {
+                            "frame_rate": 30,
+                            "quality": "hd",
+                        },
+                    },
+                    "view_type": "GROUP_CALL",
+                },
+                name="name",
+                ui={
+                    "design_tokens": {
+                        "border_radius": "rounded",
+                        "border_width": "thin",
+                        "colors": {
+                            "background": {
+                                "_600": "600",
+                                "_700": "700",
+                                "_800": "800",
+                                "_900": "900",
+                                "_1000": "1000",
+                            },
+                            "brand": {
+                                "_300": "300",
+                                "_400": "400",
+                                "_500": "500",
+                                "_600": "600",
+                                "_700": "700",
+                            },
+                            "danger": "danger",
+                            "success": "success",
+                            "text": "text",
+                            "text_on_brand": "text_on_brand",
+                            "video_bg": "video_bg",
+                            "warning": "warning",
+                        },
+                        "logo": "logo",
+                        "spacing_base": 0,
+                        "theme": "dark",
+                    }
+                },
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        preset = await async_client.realtime_kit.presets.update(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(PresetUpdateResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        preset = await async_client.realtime_kit.presets.update(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            config={
+                "max_screenshare_count": 0,
+                "max_video_streams": {
+                    "desktop": 0,
+                    "mobile": 0,
+                },
+                "media": {
+                    "screenshare": {
+                        "frame_rate": 0,
+                        "quality": "hd",
+                    },
+                    "video": {
+                        "frame_rate": 30,
+                        "quality": "hd",
+                    },
+                },
+                "view_type": "GROUP_CALL",
+            },
+            name="name",
+            permissions={
+                "accept_waiting_requests": True,
+                "can_accept_production_requests": True,
+                "can_change_participant_permissions": True,
+                "can_edit_display_name": True,
+                "can_livestream": True,
+                "can_record": True,
+                "can_spotlight": True,
+                "chat": {
+                    "private": {
+                        "can_receive": True,
+                        "can_send": True,
+                        "files": True,
+                        "text": True,
+                    },
+                    "public": {
+                        "can_send": True,
+                        "files": True,
+                        "text": True,
+                    },
+                },
+                "connected_meetings": {
+                    "can_alter_connected_meetings": True,
+                    "can_switch_connected_meetings": True,
+                    "can_switch_to_parent_meeting": True,
+                },
+                "disable_participant_audio": True,
+                "disable_participant_screensharing": True,
+                "disable_participant_video": True,
+                "hidden_participant": True,
+                "is_recorder": True,
+                "kick_participant": True,
+                "media": {
+                    "audio": {"can_produce": "ALLOWED"},
+                    "screenshare": {"can_produce": "ALLOWED"},
+                    "video": {"can_produce": "ALLOWED"},
+                },
+                "pin_participant": True,
+                "plugins": {
+                    "can_close": True,
+                    "can_edit_config": True,
+                    "can_start": True,
+                    "config": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                },
+                "polls": {
+                    "can_create": True,
+                    "can_view": True,
+                    "can_vote": True,
+                },
+                "recorder_type": "RECORDER",
+                "show_participant_list": True,
+                "waiting_room_type": "SKIP",
+            },
+            ui={
+                "config_diff": {},
+                "design_tokens": {
+                    "border_radius": "rounded",
+                    "border_width": "thin",
+                    "colors": {
+                        "background": {
+                            "_600": "600",
+                            "_700": "700",
+                            "_800": "800",
+                            "_900": "900",
+                            "_1000": "1000",
+                        },
+                        "brand": {
+                            "_300": "300",
+                            "_400": "400",
+                            "_500": "500",
+                            "_600": "600",
+                            "_700": "700",
+                        },
+                        "danger": "danger",
+                        "success": "success",
+                        "text": "text",
+                        "text_on_brand": "text_on_brand",
+                        "video_bg": "video_bg",
+                        "warning": "warning",
+                    },
+                    "logo": "logo",
+                    "spacing_base": 0,
+                    "theme": "dark",
+                },
+            },
+        )
+        assert_matches_type(PresetUpdateResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.presets.with_raw_response.update(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        preset = await response.parse()
+        assert_matches_type(PresetUpdateResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.presets.with_streaming_response.update(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            preset = await response.parse()
+            assert_matches_type(PresetUpdateResponse, preset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.presets.with_raw_response.update(
+                preset_id="preset_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.presets.with_raw_response.update(
+                preset_id="preset_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `preset_id` but received ''"):
+            await async_client.realtime_kit.presets.with_raw_response.update(
+                preset_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        preset = await async_client.realtime_kit.presets.delete(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(PresetDeleteResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.presets.with_raw_response.delete(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        preset = await response.parse()
+        assert_matches_type(PresetDeleteResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.presets.with_streaming_response.delete(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            preset = await response.parse()
+            assert_matches_type(PresetDeleteResponse, preset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.presets.with_raw_response.delete(
+                preset_id="preset_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.presets.with_raw_response.delete(
+                preset_id="preset_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `preset_id` but received ''"):
+            await async_client.realtime_kit.presets.with_raw_response.delete(
+                preset_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        preset = await async_client.realtime_kit.presets.get(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(PresetGetResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        preset = await async_client.realtime_kit.presets.get(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page_no=0,
+            per_page=0,
+        )
+        assert_matches_type(PresetGetResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.presets.with_raw_response.get(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        preset = await response.parse()
+        assert_matches_type(PresetGetResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.presets.with_streaming_response.get(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            preset = await response.parse()
+            assert_matches_type(PresetGetResponse, preset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.presets.with_raw_response.get(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.presets.with_raw_response.get(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_preset_by_id(self, async_client: AsyncCloudflare) -> None:
+        preset = await async_client.realtime_kit.presets.get_preset_by_id(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(PresetGetPresetByIDResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_preset_by_id(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.presets.with_raw_response.get_preset_by_id(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        preset = await response.parse()
+        assert_matches_type(PresetGetPresetByIDResponse, preset, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_preset_by_id(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.presets.with_streaming_response.get_preset_by_id(
+            preset_id="preset_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            preset = await response.parse()
+            assert_matches_type(PresetGetPresetByIDResponse, preset, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_preset_by_id(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.presets.with_raw_response.get_preset_by_id(
+                preset_id="preset_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.presets.with_raw_response.get_preset_by_id(
+                preset_id="preset_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `preset_id` but received ''"):
+            await async_client.realtime_kit.presets.with_raw_response.get_preset_by_id(
+                preset_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
diff --git a/tests/api_resources/realtime_kit/test_recordings.py b/tests/api_resources/realtime_kit/test_recordings.py
new file mode 100644
index 00000000000..52ec87f3586
--- /dev/null
+++ b/tests/api_resources/realtime_kit/test_recordings.py
@@ -0,0 +1,1041 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.realtime_kit import (
+    RecordingGetRecordingsResponse,
+    RecordingGetOneRecordingResponse,
+    RecordingStartRecordingsResponse,
+    RecordingGetActiveRecordingsResponse,
+    RecordingPauseResumeStopRecordingResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestRecordings:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_active_recordings(self, client: Cloudflare) -> None:
+        recording = client.realtime_kit.recordings.get_active_recordings(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(RecordingGetActiveRecordingsResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_active_recordings(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.recordings.with_raw_response.get_active_recordings(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recording = response.parse()
+        assert_matches_type(RecordingGetActiveRecordingsResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_active_recordings(self, client: Cloudflare) -> None:
+        with client.realtime_kit.recordings.with_streaming_response.get_active_recordings(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recording = response.parse()
+            assert_matches_type(RecordingGetActiveRecordingsResponse, recording, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_active_recordings(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.recordings.with_raw_response.get_active_recordings(
+                meeting_id="meeting_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.recordings.with_raw_response.get_active_recordings(
+                meeting_id="meeting_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            client.realtime_kit.recordings.with_raw_response.get_active_recordings(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_one_recording(self, client: Cloudflare) -> None:
+        recording = client.realtime_kit.recordings.get_one_recording(
+            recording_id="recording_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(RecordingGetOneRecordingResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_one_recording(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.recordings.with_raw_response.get_one_recording(
+            recording_id="recording_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recording = response.parse()
+        assert_matches_type(RecordingGetOneRecordingResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_one_recording(self, client: Cloudflare) -> None:
+        with client.realtime_kit.recordings.with_streaming_response.get_one_recording(
+            recording_id="recording_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recording = response.parse()
+            assert_matches_type(RecordingGetOneRecordingResponse, recording, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_one_recording(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.recordings.with_raw_response.get_one_recording(
+                recording_id="recording_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.recordings.with_raw_response.get_one_recording(
+                recording_id="recording_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `recording_id` but received ''"):
+            client.realtime_kit.recordings.with_raw_response.get_one_recording(
+                recording_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_recordings(self, client: Cloudflare) -> None:
+        recording = client.realtime_kit.recordings.get_recordings(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(RecordingGetRecordingsResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_recordings_with_all_params(self, client: Cloudflare) -> None:
+        recording = client.realtime_kit.recordings.get_recordings(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            end_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            expired=True,
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            page_no=0,
+            per_page=0,
+            search="search",
+            sort_by="invokedTime",
+            sort_order="ASC",
+            start_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            status=["INVOKED"],
+        )
+        assert_matches_type(RecordingGetRecordingsResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_recordings(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.recordings.with_raw_response.get_recordings(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recording = response.parse()
+        assert_matches_type(RecordingGetRecordingsResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_recordings(self, client: Cloudflare) -> None:
+        with client.realtime_kit.recordings.with_streaming_response.get_recordings(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recording = response.parse()
+            assert_matches_type(RecordingGetRecordingsResponse, recording, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_recordings(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.recordings.with_raw_response.get_recordings(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.recordings.with_raw_response.get_recordings(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_pause_resume_stop_recording(self, client: Cloudflare) -> None:
+        recording = client.realtime_kit.recordings.pause_resume_stop_recording(
+            recording_id="recording_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            action="stop",
+        )
+        assert_matches_type(RecordingPauseResumeStopRecordingResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_pause_resume_stop_recording(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.recordings.with_raw_response.pause_resume_stop_recording(
+            recording_id="recording_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            action="stop",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recording = response.parse()
+        assert_matches_type(RecordingPauseResumeStopRecordingResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_pause_resume_stop_recording(self, client: Cloudflare) -> None:
+        with client.realtime_kit.recordings.with_streaming_response.pause_resume_stop_recording(
+            recording_id="recording_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            action="stop",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recording = response.parse()
+            assert_matches_type(RecordingPauseResumeStopRecordingResponse, recording, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_pause_resume_stop_recording(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.recordings.with_raw_response.pause_resume_stop_recording(
+                recording_id="recording_id",
+                account_id="",
+                app_id="2a95132c15732412d22c1476fa83f27a",
+                action="stop",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.recordings.with_raw_response.pause_resume_stop_recording(
+                recording_id="recording_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                action="stop",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `recording_id` but received ''"):
+            client.realtime_kit.recordings.with_raw_response.pause_resume_stop_recording(
+                recording_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="2a95132c15732412d22c1476fa83f27a",
+                action="stop",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_start_recordings(self, client: Cloudflare) -> None:
+        recording = client.realtime_kit.recordings.start_recordings(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(RecordingStartRecordingsResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_start_recordings_with_all_params(self, client: Cloudflare) -> None:
+        recording = client.realtime_kit.recordings.start_recordings(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            allow_multiple_recordings=False,
+            audio_config={
+                "channel": "stereo",
+                "codec": "AAC",
+                "export_file": True,
+            },
+            file_name_prefix="string",
+            interactive_config={"type": "ID3"},
+            max_seconds=60,
+            meeting_id="97440c6a-140b-40a9-9499-b23fd7a3868a",
+            realtimekit_bucket_config={"enabled": True},
+            rtmp_out_config={"rtmp_url": "rtmp://a.rtmp.youtube.com/live2"},
+            storage_config={
+                "type": "aws",
+                "access_key": "access_key",
+                "auth_method": "KEY",
+                "bucket": "bucket",
+                "host": "host",
+                "password": "password",
+                "path": "path",
+                "port": 0,
+                "private_key": "private_key",
+                "region": "us-east-1",
+                "secret": "secret",
+                "username": "username",
+            },
+            url="https://example.com",
+            video_config={
+                "codec": "H264",
+                "export_file": True,
+                "height": 720,
+                "watermark": {
+                    "position": "left top",
+                    "size": {
+                        "height": 1,
+                        "width": 1,
+                    },
+                    "url": "http://example.com",
+                },
+                "width": 1280,
+            },
+        )
+        assert_matches_type(RecordingStartRecordingsResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_start_recordings(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.recordings.with_raw_response.start_recordings(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recording = response.parse()
+        assert_matches_type(RecordingStartRecordingsResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_start_recordings(self, client: Cloudflare) -> None:
+        with client.realtime_kit.recordings.with_streaming_response.start_recordings(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recording = response.parse()
+            assert_matches_type(RecordingStartRecordingsResponse, recording, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_start_recordings(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.recordings.with_raw_response.start_recordings(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.recordings.with_raw_response.start_recordings(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_start_track_recording(self, client: Cloudflare) -> None:
+        recording = client.realtime_kit.recordings.start_track_recording(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            layers={
+                "default": {},
+                "default-video": {},
+            },
+            meeting_id="string",
+        )
+        assert recording is None
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_start_track_recording_with_all_params(self, client: Cloudflare) -> None:
+        recording = client.realtime_kit.recordings.start_track_recording(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            layers={
+                "default": {
+                    "file_name_prefix": "string",
+                    "outputs": [
+                        {
+                            "storage_config": {
+                                "type": "aws",
+                                "access_key": "access_key",
+                                "auth_method": "KEY",
+                                "bucket": "bucket",
+                                "host": "host",
+                                "password": "password",
+                                "path": "path",
+                                "port": 0,
+                                "private_key": "private_key",
+                                "region": "us-east-1",
+                                "secret": "secret",
+                                "username": "username",
+                            },
+                            "type": "REALTIMEKIT_BUCKET",
+                        }
+                    ],
+                },
+                "default-video": {
+                    "file_name_prefix": "string",
+                    "outputs": [
+                        {
+                            "storage_config": {
+                                "type": "aws",
+                                "access_key": "access_key",
+                                "auth_method": "KEY",
+                                "bucket": "bucket",
+                                "host": "host",
+                                "password": "password",
+                                "path": "path",
+                                "port": 0,
+                                "private_key": "private_key",
+                                "region": "us-east-1",
+                                "secret": "secret",
+                                "username": "username",
+                            },
+                            "type": "REALTIMEKIT_BUCKET",
+                        }
+                    ],
+                },
+            },
+            meeting_id="string",
+            max_seconds=60,
+        )
+        assert recording is None
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_start_track_recording(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.recordings.with_raw_response.start_track_recording(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            layers={
+                "default": {},
+                "default-video": {},
+            },
+            meeting_id="string",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recording = response.parse()
+        assert recording is None
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_start_track_recording(self, client: Cloudflare) -> None:
+        with client.realtime_kit.recordings.with_streaming_response.start_track_recording(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            layers={
+                "default": {},
+                "default-video": {},
+            },
+            meeting_id="string",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recording = response.parse()
+            assert recording is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_start_track_recording(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.recordings.with_raw_response.start_track_recording(
+                app_id="app_id",
+                account_id="",
+                layers={
+                    "default": {},
+                    "default-video": {},
+                },
+                meeting_id="string",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.recordings.with_raw_response.start_track_recording(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                layers={
+                    "default": {},
+                    "default-video": {},
+                },
+                meeting_id="string",
+            )
+
+
+class TestAsyncRecordings:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_active_recordings(self, async_client: AsyncCloudflare) -> None:
+        recording = await async_client.realtime_kit.recordings.get_active_recordings(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(RecordingGetActiveRecordingsResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_active_recordings(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.recordings.with_raw_response.get_active_recordings(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recording = await response.parse()
+        assert_matches_type(RecordingGetActiveRecordingsResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_active_recordings(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.recordings.with_streaming_response.get_active_recordings(
+            meeting_id="meeting_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recording = await response.parse()
+            assert_matches_type(RecordingGetActiveRecordingsResponse, recording, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_active_recordings(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.recordings.with_raw_response.get_active_recordings(
+                meeting_id="meeting_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.recordings.with_raw_response.get_active_recordings(
+                meeting_id="meeting_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `meeting_id` but received ''"):
+            await async_client.realtime_kit.recordings.with_raw_response.get_active_recordings(
+                meeting_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_one_recording(self, async_client: AsyncCloudflare) -> None:
+        recording = await async_client.realtime_kit.recordings.get_one_recording(
+            recording_id="recording_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(RecordingGetOneRecordingResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_one_recording(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.recordings.with_raw_response.get_one_recording(
+            recording_id="recording_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recording = await response.parse()
+        assert_matches_type(RecordingGetOneRecordingResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_one_recording(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.recordings.with_streaming_response.get_one_recording(
+            recording_id="recording_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recording = await response.parse()
+            assert_matches_type(RecordingGetOneRecordingResponse, recording, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_one_recording(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.recordings.with_raw_response.get_one_recording(
+                recording_id="recording_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.recordings.with_raw_response.get_one_recording(
+                recording_id="recording_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `recording_id` but received ''"):
+            await async_client.realtime_kit.recordings.with_raw_response.get_one_recording(
+                recording_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_recordings(self, async_client: AsyncCloudflare) -> None:
+        recording = await async_client.realtime_kit.recordings.get_recordings(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(RecordingGetRecordingsResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_recordings_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        recording = await async_client.realtime_kit.recordings.get_recordings(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            end_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            expired=True,
+            meeting_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            page_no=0,
+            per_page=0,
+            search="search",
+            sort_by="invokedTime",
+            sort_order="ASC",
+            start_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            status=["INVOKED"],
+        )
+        assert_matches_type(RecordingGetRecordingsResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_recordings(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.recordings.with_raw_response.get_recordings(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recording = await response.parse()
+        assert_matches_type(RecordingGetRecordingsResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_recordings(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.recordings.with_streaming_response.get_recordings(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recording = await response.parse()
+            assert_matches_type(RecordingGetRecordingsResponse, recording, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_recordings(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.recordings.with_raw_response.get_recordings(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.recordings.with_raw_response.get_recordings(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_pause_resume_stop_recording(self, async_client: AsyncCloudflare) -> None:
+        recording = await async_client.realtime_kit.recordings.pause_resume_stop_recording(
+            recording_id="recording_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            action="stop",
+        )
+        assert_matches_type(RecordingPauseResumeStopRecordingResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_pause_resume_stop_recording(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.recordings.with_raw_response.pause_resume_stop_recording(
+            recording_id="recording_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            action="stop",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recording = await response.parse()
+        assert_matches_type(RecordingPauseResumeStopRecordingResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_pause_resume_stop_recording(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.recordings.with_streaming_response.pause_resume_stop_recording(
+            recording_id="recording_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="2a95132c15732412d22c1476fa83f27a",
+            action="stop",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recording = await response.parse()
+            assert_matches_type(RecordingPauseResumeStopRecordingResponse, recording, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_pause_resume_stop_recording(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.recordings.with_raw_response.pause_resume_stop_recording(
+                recording_id="recording_id",
+                account_id="",
+                app_id="2a95132c15732412d22c1476fa83f27a",
+                action="stop",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.recordings.with_raw_response.pause_resume_stop_recording(
+                recording_id="recording_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                action="stop",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `recording_id` but received ''"):
+            await async_client.realtime_kit.recordings.with_raw_response.pause_resume_stop_recording(
+                recording_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="2a95132c15732412d22c1476fa83f27a",
+                action="stop",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_start_recordings(self, async_client: AsyncCloudflare) -> None:
+        recording = await async_client.realtime_kit.recordings.start_recordings(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(RecordingStartRecordingsResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_start_recordings_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        recording = await async_client.realtime_kit.recordings.start_recordings(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            allow_multiple_recordings=False,
+            audio_config={
+                "channel": "stereo",
+                "codec": "AAC",
+                "export_file": True,
+            },
+            file_name_prefix="string",
+            interactive_config={"type": "ID3"},
+            max_seconds=60,
+            meeting_id="97440c6a-140b-40a9-9499-b23fd7a3868a",
+            realtimekit_bucket_config={"enabled": True},
+            rtmp_out_config={"rtmp_url": "rtmp://a.rtmp.youtube.com/live2"},
+            storage_config={
+                "type": "aws",
+                "access_key": "access_key",
+                "auth_method": "KEY",
+                "bucket": "bucket",
+                "host": "host",
+                "password": "password",
+                "path": "path",
+                "port": 0,
+                "private_key": "private_key",
+                "region": "us-east-1",
+                "secret": "secret",
+                "username": "username",
+            },
+            url="https://example.com",
+            video_config={
+                "codec": "H264",
+                "export_file": True,
+                "height": 720,
+                "watermark": {
+                    "position": "left top",
+                    "size": {
+                        "height": 1,
+                        "width": 1,
+                    },
+                    "url": "http://example.com",
+                },
+                "width": 1280,
+            },
+        )
+        assert_matches_type(RecordingStartRecordingsResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_start_recordings(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.recordings.with_raw_response.start_recordings(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recording = await response.parse()
+        assert_matches_type(RecordingStartRecordingsResponse, recording, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_start_recordings(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.recordings.with_streaming_response.start_recordings(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recording = await response.parse()
+            assert_matches_type(RecordingStartRecordingsResponse, recording, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_start_recordings(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.recordings.with_raw_response.start_recordings(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.recordings.with_raw_response.start_recordings(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_start_track_recording(self, async_client: AsyncCloudflare) -> None:
+        recording = await async_client.realtime_kit.recordings.start_track_recording(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            layers={
+                "default": {},
+                "default-video": {},
+            },
+            meeting_id="string",
+        )
+        assert recording is None
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_start_track_recording_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        recording = await async_client.realtime_kit.recordings.start_track_recording(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            layers={
+                "default": {
+                    "file_name_prefix": "string",
+                    "outputs": [
+                        {
+                            "storage_config": {
+                                "type": "aws",
+                                "access_key": "access_key",
+                                "auth_method": "KEY",
+                                "bucket": "bucket",
+                                "host": "host",
+                                "password": "password",
+                                "path": "path",
+                                "port": 0,
+                                "private_key": "private_key",
+                                "region": "us-east-1",
+                                "secret": "secret",
+                                "username": "username",
+                            },
+                            "type": "REALTIMEKIT_BUCKET",
+                        }
+                    ],
+                },
+                "default-video": {
+                    "file_name_prefix": "string",
+                    "outputs": [
+                        {
+                            "storage_config": {
+                                "type": "aws",
+                                "access_key": "access_key",
+                                "auth_method": "KEY",
+                                "bucket": "bucket",
+                                "host": "host",
+                                "password": "password",
+                                "path": "path",
+                                "port": 0,
+                                "private_key": "private_key",
+                                "region": "us-east-1",
+                                "secret": "secret",
+                                "username": "username",
+                            },
+                            "type": "REALTIMEKIT_BUCKET",
+                        }
+                    ],
+                },
+            },
+            meeting_id="string",
+            max_seconds=60,
+        )
+        assert recording is None
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_start_track_recording(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.recordings.with_raw_response.start_track_recording(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            layers={
+                "default": {},
+                "default-video": {},
+            },
+            meeting_id="string",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recording = await response.parse()
+        assert recording is None
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_start_track_recording(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.recordings.with_streaming_response.start_track_recording(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            layers={
+                "default": {},
+                "default-video": {},
+            },
+            meeting_id="string",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recording = await response.parse()
+            assert recording is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_start_track_recording(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.recordings.with_raw_response.start_track_recording(
+                app_id="app_id",
+                account_id="",
+                layers={
+                    "default": {},
+                    "default-video": {},
+                },
+                meeting_id="string",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.recordings.with_raw_response.start_track_recording(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                layers={
+                    "default": {},
+                    "default-video": {},
+                },
+                meeting_id="string",
+            )
diff --git a/tests/api_resources/realtime_kit/test_sessions.py b/tests/api_resources/realtime_kit/test_sessions.py
new file mode 100644
index 00000000000..a6f3998237c
--- /dev/null
+++ b/tests/api_resources/realtime_kit/test_sessions.py
@@ -0,0 +1,1334 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.realtime_kit import (
+    SessionGetSessionsResponse,
+    SessionGetSessionChatResponse,
+    SessionGetSessionDetailsResponse,
+    SessionGetSessionSummaryResponse,
+    SessionGetSessionTranscriptsResponse,
+    SessionGetSessionParticipantsResponse,
+    SessionGetParticipantDataFromPeerIDResponse,
+    SessionGetSessionParticipantDetailsResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSessions:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_generate_summary_of_transcripts(self, client: Cloudflare) -> None:
+        session = client.realtime_kit.sessions.generate_summary_of_transcripts(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert session is None
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_generate_summary_of_transcripts(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.sessions.with_raw_response.generate_summary_of_transcripts(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        session = response.parse()
+        assert session is None
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_generate_summary_of_transcripts(self, client: Cloudflare) -> None:
+        with client.realtime_kit.sessions.with_streaming_response.generate_summary_of_transcripts(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            session = response.parse()
+            assert session is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_generate_summary_of_transcripts(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.generate_summary_of_transcripts(
+                session_id="session_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.generate_summary_of_transcripts(
+                session_id="session_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `session_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.generate_summary_of_transcripts(
+                session_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_participant_data_from_peer_id(self, client: Cloudflare) -> None:
+        session = client.realtime_kit.sessions.get_participant_data_from_peer_id(
+            peer_id="peer_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(SessionGetParticipantDataFromPeerIDResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_participant_data_from_peer_id_with_all_params(self, client: Cloudflare) -> None:
+        session = client.realtime_kit.sessions.get_participant_data_from_peer_id(
+            peer_id="peer_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            filters="device_info",
+        )
+        assert_matches_type(SessionGetParticipantDataFromPeerIDResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_participant_data_from_peer_id(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.sessions.with_raw_response.get_participant_data_from_peer_id(
+            peer_id="peer_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        session = response.parse()
+        assert_matches_type(SessionGetParticipantDataFromPeerIDResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_participant_data_from_peer_id(self, client: Cloudflare) -> None:
+        with client.realtime_kit.sessions.with_streaming_response.get_participant_data_from_peer_id(
+            peer_id="peer_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            session = response.parse()
+            assert_matches_type(SessionGetParticipantDataFromPeerIDResponse, session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_participant_data_from_peer_id(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_participant_data_from_peer_id(
+                peer_id="peer_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_participant_data_from_peer_id(
+                peer_id="peer_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `peer_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_participant_data_from_peer_id(
+                peer_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_session_chat(self, client: Cloudflare) -> None:
+        session = client.realtime_kit.sessions.get_session_chat(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(SessionGetSessionChatResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_session_chat(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.sessions.with_raw_response.get_session_chat(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        session = response.parse()
+        assert_matches_type(SessionGetSessionChatResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_session_chat(self, client: Cloudflare) -> None:
+        with client.realtime_kit.sessions.with_streaming_response.get_session_chat(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            session = response.parse()
+            assert_matches_type(SessionGetSessionChatResponse, session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_session_chat(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_chat(
+                session_id="session_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_chat(
+                session_id="session_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `session_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_chat(
+                session_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_session_details(self, client: Cloudflare) -> None:
+        session = client.realtime_kit.sessions.get_session_details(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(SessionGetSessionDetailsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_session_details_with_all_params(self, client: Cloudflare) -> None:
+        session = client.realtime_kit.sessions.get_session_details(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            include_breakout_rooms=True,
+        )
+        assert_matches_type(SessionGetSessionDetailsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_session_details(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.sessions.with_raw_response.get_session_details(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        session = response.parse()
+        assert_matches_type(SessionGetSessionDetailsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_session_details(self, client: Cloudflare) -> None:
+        with client.realtime_kit.sessions.with_streaming_response.get_session_details(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            session = response.parse()
+            assert_matches_type(SessionGetSessionDetailsResponse, session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_session_details(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_details(
+                session_id="session_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_details(
+                session_id="session_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `session_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_details(
+                session_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_session_participant_details(self, client: Cloudflare) -> None:
+        session = client.realtime_kit.sessions.get_session_participant_details(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            session_id="session_id",
+        )
+        assert_matches_type(SessionGetSessionParticipantDetailsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_session_participant_details_with_all_params(self, client: Cloudflare) -> None:
+        session = client.realtime_kit.sessions.get_session_participant_details(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            session_id="session_id",
+            filters="device_info",
+            include_peer_events=True,
+        )
+        assert_matches_type(SessionGetSessionParticipantDetailsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_session_participant_details(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.sessions.with_raw_response.get_session_participant_details(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            session_id="session_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        session = response.parse()
+        assert_matches_type(SessionGetSessionParticipantDetailsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_session_participant_details(self, client: Cloudflare) -> None:
+        with client.realtime_kit.sessions.with_streaming_response.get_session_participant_details(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            session_id="session_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            session = response.parse()
+            assert_matches_type(SessionGetSessionParticipantDetailsResponse, session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_session_participant_details(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_participant_details(
+                participant_id="participant_id",
+                account_id="",
+                app_id="app_id",
+                session_id="session_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_participant_details(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                session_id="session_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `session_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_participant_details(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                session_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `participant_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_participant_details(
+                participant_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                session_id="session_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_session_participants(self, client: Cloudflare) -> None:
+        session = client.realtime_kit.sessions.get_session_participants(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(SessionGetSessionParticipantsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_session_participants_with_all_params(self, client: Cloudflare) -> None:
+        session = client.realtime_kit.sessions.get_session_participants(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            include_peer_events=True,
+            page_no=0,
+            per_page=0,
+            search="search",
+            sort_by="joinedAt",
+            sort_order="ASC",
+            view="raw",
+        )
+        assert_matches_type(SessionGetSessionParticipantsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_session_participants(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.sessions.with_raw_response.get_session_participants(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        session = response.parse()
+        assert_matches_type(SessionGetSessionParticipantsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_session_participants(self, client: Cloudflare) -> None:
+        with client.realtime_kit.sessions.with_streaming_response.get_session_participants(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            session = response.parse()
+            assert_matches_type(SessionGetSessionParticipantsResponse, session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_session_participants(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_participants(
+                session_id="session_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_participants(
+                session_id="session_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `session_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_participants(
+                session_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_session_summary(self, client: Cloudflare) -> None:
+        session = client.realtime_kit.sessions.get_session_summary(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(SessionGetSessionSummaryResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_session_summary(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.sessions.with_raw_response.get_session_summary(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        session = response.parse()
+        assert_matches_type(SessionGetSessionSummaryResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_session_summary(self, client: Cloudflare) -> None:
+        with client.realtime_kit.sessions.with_streaming_response.get_session_summary(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            session = response.parse()
+            assert_matches_type(SessionGetSessionSummaryResponse, session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_session_summary(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_summary(
+                session_id="session_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_summary(
+                session_id="session_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `session_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_summary(
+                session_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_session_transcripts(self, client: Cloudflare) -> None:
+        session = client.realtime_kit.sessions.get_session_transcripts(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(SessionGetSessionTranscriptsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_session_transcripts(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.sessions.with_raw_response.get_session_transcripts(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        session = response.parse()
+        assert_matches_type(SessionGetSessionTranscriptsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_session_transcripts(self, client: Cloudflare) -> None:
+        with client.realtime_kit.sessions.with_streaming_response.get_session_transcripts(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            session = response.parse()
+            assert_matches_type(SessionGetSessionTranscriptsResponse, session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_session_transcripts(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_transcripts(
+                session_id="session_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_transcripts(
+                session_id="session_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `session_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_session_transcripts(
+                session_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_sessions(self, client: Cloudflare) -> None:
+        session = client.realtime_kit.sessions.get_sessions(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SessionGetSessionsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_sessions_with_all_params(self, client: Cloudflare) -> None:
+        session = client.realtime_kit.sessions.get_sessions(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            associated_id="associated_id",
+            end_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            page_no=0,
+            participants="1:10",
+            per_page=0,
+            search="search",
+            sort_by="minutesConsumed",
+            sort_order="ASC",
+            start_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            status="LIVE",
+        )
+        assert_matches_type(SessionGetSessionsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_sessions(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.sessions.with_raw_response.get_sessions(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        session = response.parse()
+        assert_matches_type(SessionGetSessionsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_sessions(self, client: Cloudflare) -> None:
+        with client.realtime_kit.sessions.with_streaming_response.get_sessions(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            session = response.parse()
+            assert_matches_type(SessionGetSessionsResponse, session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_sessions(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_sessions(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.sessions.with_raw_response.get_sessions(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncSessions:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_generate_summary_of_transcripts(self, async_client: AsyncCloudflare) -> None:
+        session = await async_client.realtime_kit.sessions.generate_summary_of_transcripts(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert session is None
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_generate_summary_of_transcripts(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.sessions.with_raw_response.generate_summary_of_transcripts(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        session = await response.parse()
+        assert session is None
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_generate_summary_of_transcripts(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.sessions.with_streaming_response.generate_summary_of_transcripts(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            session = await response.parse()
+            assert session is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_generate_summary_of_transcripts(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.generate_summary_of_transcripts(
+                session_id="session_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.generate_summary_of_transcripts(
+                session_id="session_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `session_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.generate_summary_of_transcripts(
+                session_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_participant_data_from_peer_id(self, async_client: AsyncCloudflare) -> None:
+        session = await async_client.realtime_kit.sessions.get_participant_data_from_peer_id(
+            peer_id="peer_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(SessionGetParticipantDataFromPeerIDResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_participant_data_from_peer_id_with_all_params(
+        self, async_client: AsyncCloudflare
+    ) -> None:
+        session = await async_client.realtime_kit.sessions.get_participant_data_from_peer_id(
+            peer_id="peer_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            filters="device_info",
+        )
+        assert_matches_type(SessionGetParticipantDataFromPeerIDResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_participant_data_from_peer_id(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.sessions.with_raw_response.get_participant_data_from_peer_id(
+            peer_id="peer_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        session = await response.parse()
+        assert_matches_type(SessionGetParticipantDataFromPeerIDResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_participant_data_from_peer_id(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.sessions.with_streaming_response.get_participant_data_from_peer_id(
+            peer_id="peer_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            session = await response.parse()
+            assert_matches_type(SessionGetParticipantDataFromPeerIDResponse, session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_participant_data_from_peer_id(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_participant_data_from_peer_id(
+                peer_id="peer_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_participant_data_from_peer_id(
+                peer_id="peer_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `peer_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_participant_data_from_peer_id(
+                peer_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_session_chat(self, async_client: AsyncCloudflare) -> None:
+        session = await async_client.realtime_kit.sessions.get_session_chat(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(SessionGetSessionChatResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_session_chat(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.sessions.with_raw_response.get_session_chat(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        session = await response.parse()
+        assert_matches_type(SessionGetSessionChatResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_session_chat(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.sessions.with_streaming_response.get_session_chat(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            session = await response.parse()
+            assert_matches_type(SessionGetSessionChatResponse, session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_session_chat(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_chat(
+                session_id="session_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_chat(
+                session_id="session_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `session_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_chat(
+                session_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_session_details(self, async_client: AsyncCloudflare) -> None:
+        session = await async_client.realtime_kit.sessions.get_session_details(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(SessionGetSessionDetailsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_session_details_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        session = await async_client.realtime_kit.sessions.get_session_details(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            include_breakout_rooms=True,
+        )
+        assert_matches_type(SessionGetSessionDetailsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_session_details(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.sessions.with_raw_response.get_session_details(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        session = await response.parse()
+        assert_matches_type(SessionGetSessionDetailsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_session_details(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.sessions.with_streaming_response.get_session_details(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            session = await response.parse()
+            assert_matches_type(SessionGetSessionDetailsResponse, session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_session_details(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_details(
+                session_id="session_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_details(
+                session_id="session_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `session_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_details(
+                session_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_session_participant_details(self, async_client: AsyncCloudflare) -> None:
+        session = await async_client.realtime_kit.sessions.get_session_participant_details(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            session_id="session_id",
+        )
+        assert_matches_type(SessionGetSessionParticipantDetailsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_session_participant_details_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        session = await async_client.realtime_kit.sessions.get_session_participant_details(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            session_id="session_id",
+            filters="device_info",
+            include_peer_events=True,
+        )
+        assert_matches_type(SessionGetSessionParticipantDetailsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_session_participant_details(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.sessions.with_raw_response.get_session_participant_details(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            session_id="session_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        session = await response.parse()
+        assert_matches_type(SessionGetSessionParticipantDetailsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_session_participant_details(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.sessions.with_streaming_response.get_session_participant_details(
+            participant_id="participant_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            session_id="session_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            session = await response.parse()
+            assert_matches_type(SessionGetSessionParticipantDetailsResponse, session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_session_participant_details(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_participant_details(
+                participant_id="participant_id",
+                account_id="",
+                app_id="app_id",
+                session_id="session_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_participant_details(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                session_id="session_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `session_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_participant_details(
+                participant_id="participant_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                session_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `participant_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_participant_details(
+                participant_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                session_id="session_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_session_participants(self, async_client: AsyncCloudflare) -> None:
+        session = await async_client.realtime_kit.sessions.get_session_participants(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(SessionGetSessionParticipantsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_session_participants_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        session = await async_client.realtime_kit.sessions.get_session_participants(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            include_peer_events=True,
+            page_no=0,
+            per_page=0,
+            search="search",
+            sort_by="joinedAt",
+            sort_order="ASC",
+            view="raw",
+        )
+        assert_matches_type(SessionGetSessionParticipantsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_session_participants(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.sessions.with_raw_response.get_session_participants(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        session = await response.parse()
+        assert_matches_type(SessionGetSessionParticipantsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_session_participants(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.sessions.with_streaming_response.get_session_participants(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            session = await response.parse()
+            assert_matches_type(SessionGetSessionParticipantsResponse, session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_session_participants(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_participants(
+                session_id="session_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_participants(
+                session_id="session_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `session_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_participants(
+                session_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_session_summary(self, async_client: AsyncCloudflare) -> None:
+        session = await async_client.realtime_kit.sessions.get_session_summary(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(SessionGetSessionSummaryResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_session_summary(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.sessions.with_raw_response.get_session_summary(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        session = await response.parse()
+        assert_matches_type(SessionGetSessionSummaryResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_session_summary(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.sessions.with_streaming_response.get_session_summary(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            session = await response.parse()
+            assert_matches_type(SessionGetSessionSummaryResponse, session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_session_summary(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_summary(
+                session_id="session_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_summary(
+                session_id="session_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `session_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_summary(
+                session_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_session_transcripts(self, async_client: AsyncCloudflare) -> None:
+        session = await async_client.realtime_kit.sessions.get_session_transcripts(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(SessionGetSessionTranscriptsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_session_transcripts(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.sessions.with_raw_response.get_session_transcripts(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        session = await response.parse()
+        assert_matches_type(SessionGetSessionTranscriptsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_session_transcripts(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.sessions.with_streaming_response.get_session_transcripts(
+            session_id="session_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            session = await response.parse()
+            assert_matches_type(SessionGetSessionTranscriptsResponse, session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_session_transcripts(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_transcripts(
+                session_id="session_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_transcripts(
+                session_id="session_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `session_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_session_transcripts(
+                session_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_sessions(self, async_client: AsyncCloudflare) -> None:
+        session = await async_client.realtime_kit.sessions.get_sessions(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SessionGetSessionsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_sessions_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        session = await async_client.realtime_kit.sessions.get_sessions(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            associated_id="associated_id",
+            end_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            page_no=0,
+            participants="1:10",
+            per_page=0,
+            search="search",
+            sort_by="minutesConsumed",
+            sort_order="ASC",
+            start_time=parse_datetime("2019-12-27T18:11:19.117Z"),
+            status="LIVE",
+        )
+        assert_matches_type(SessionGetSessionsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_sessions(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.sessions.with_raw_response.get_sessions(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        session = await response.parse()
+        assert_matches_type(SessionGetSessionsResponse, session, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_sessions(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.sessions.with_streaming_response.get_sessions(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            session = await response.parse()
+            assert_matches_type(SessionGetSessionsResponse, session, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_sessions(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_sessions(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.sessions.with_raw_response.get_sessions(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/realtime_kit/test_webhooks.py b/tests/api_resources/realtime_kit/test_webhooks.py
new file mode 100644
index 00000000000..5f78545ccca
--- /dev/null
+++ b/tests/api_resources/realtime_kit/test_webhooks.py
@@ -0,0 +1,1159 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.realtime_kit import (
+    WebhookEditWebhookResponse,
+    WebhookGetWebhooksResponse,
+    WebhookCreateWebhookResponse,
+    WebhookDeleteWebhookResponse,
+    WebhookGetWebhookByIDResponse,
+    WebhookReplaceWebhookResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestWebhooks:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_create_webhook(self, client: Cloudflare) -> None:
+        webhook = client.realtime_kit.webhooks.create_webhook(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            events=[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ],
+            name="All events webhook",
+            url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+        )
+        assert_matches_type(WebhookCreateWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_create_webhook_with_all_params(self, client: Cloudflare) -> None:
+        webhook = client.realtime_kit.webhooks.create_webhook(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            events=[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ],
+            name="All events webhook",
+            url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+            enabled=True,
+        )
+        assert_matches_type(WebhookCreateWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_create_webhook(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.webhooks.with_raw_response.create_webhook(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            events=[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ],
+            name="All events webhook",
+            url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        webhook = response.parse()
+        assert_matches_type(WebhookCreateWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_create_webhook(self, client: Cloudflare) -> None:
+        with client.realtime_kit.webhooks.with_streaming_response.create_webhook(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            events=[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ],
+            name="All events webhook",
+            url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            webhook = response.parse()
+            assert_matches_type(WebhookCreateWebhookResponse, webhook, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_create_webhook(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.webhooks.with_raw_response.create_webhook(
+                app_id="app_id",
+                account_id="",
+                events=[
+                    "meeting.started",
+                    "meeting.ended",
+                    "meeting.participantJoined",
+                    "meeting.participantLeft",
+                    "meeting.chatSynced",
+                    "recording.statusUpdate",
+                    "livestreaming.statusUpdate",
+                    "meeting.transcript",
+                    "meeting.summary",
+                ],
+                name="All events webhook",
+                url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.webhooks.with_raw_response.create_webhook(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                events=[
+                    "meeting.started",
+                    "meeting.ended",
+                    "meeting.participantJoined",
+                    "meeting.participantLeft",
+                    "meeting.chatSynced",
+                    "recording.statusUpdate",
+                    "livestreaming.statusUpdate",
+                    "meeting.transcript",
+                    "meeting.summary",
+                ],
+                name="All events webhook",
+                url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_delete_webhook(self, client: Cloudflare) -> None:
+        webhook = client.realtime_kit.webhooks.delete_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(WebhookDeleteWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_delete_webhook(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.webhooks.with_raw_response.delete_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        webhook = response.parse()
+        assert_matches_type(WebhookDeleteWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_delete_webhook(self, client: Cloudflare) -> None:
+        with client.realtime_kit.webhooks.with_streaming_response.delete_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            webhook = response.parse()
+            assert_matches_type(WebhookDeleteWebhookResponse, webhook, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_delete_webhook(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.webhooks.with_raw_response.delete_webhook(
+                webhook_id="webhook_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.webhooks.with_raw_response.delete_webhook(
+                webhook_id="webhook_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `webhook_id` but received ''"):
+            client.realtime_kit.webhooks.with_raw_response.delete_webhook(
+                webhook_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_edit_webhook(self, client: Cloudflare) -> None:
+        webhook = client.realtime_kit.webhooks.edit_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(WebhookEditWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_edit_webhook_with_all_params(self, client: Cloudflare) -> None:
+        webhook = client.realtime_kit.webhooks.edit_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            enabled=True,
+            events=["meeting.started"],
+            name="name",
+            url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+        )
+        assert_matches_type(WebhookEditWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_edit_webhook(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.webhooks.with_raw_response.edit_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        webhook = response.parse()
+        assert_matches_type(WebhookEditWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_edit_webhook(self, client: Cloudflare) -> None:
+        with client.realtime_kit.webhooks.with_streaming_response.edit_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            webhook = response.parse()
+            assert_matches_type(WebhookEditWebhookResponse, webhook, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_edit_webhook(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.webhooks.with_raw_response.edit_webhook(
+                webhook_id="webhook_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.webhooks.with_raw_response.edit_webhook(
+                webhook_id="webhook_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `webhook_id` but received ''"):
+            client.realtime_kit.webhooks.with_raw_response.edit_webhook(
+                webhook_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_webhook_by_id(self, client: Cloudflare) -> None:
+        webhook = client.realtime_kit.webhooks.get_webhook_by_id(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(WebhookGetWebhookByIDResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_webhook_by_id(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.webhooks.with_raw_response.get_webhook_by_id(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        webhook = response.parse()
+        assert_matches_type(WebhookGetWebhookByIDResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_webhook_by_id(self, client: Cloudflare) -> None:
+        with client.realtime_kit.webhooks.with_streaming_response.get_webhook_by_id(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            webhook = response.parse()
+            assert_matches_type(WebhookGetWebhookByIDResponse, webhook, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_webhook_by_id(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.webhooks.with_raw_response.get_webhook_by_id(
+                webhook_id="webhook_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.webhooks.with_raw_response.get_webhook_by_id(
+                webhook_id="webhook_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `webhook_id` but received ''"):
+            client.realtime_kit.webhooks.with_raw_response.get_webhook_by_id(
+                webhook_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_get_webhooks(self, client: Cloudflare) -> None:
+        webhook = client.realtime_kit.webhooks.get_webhooks(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(WebhookGetWebhooksResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_get_webhooks(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.webhooks.with_raw_response.get_webhooks(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        webhook = response.parse()
+        assert_matches_type(WebhookGetWebhooksResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_get_webhooks(self, client: Cloudflare) -> None:
+        with client.realtime_kit.webhooks.with_streaming_response.get_webhooks(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            webhook = response.parse()
+            assert_matches_type(WebhookGetWebhooksResponse, webhook, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_get_webhooks(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.webhooks.with_raw_response.get_webhooks(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.webhooks.with_raw_response.get_webhooks(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_replace_webhook(self, client: Cloudflare) -> None:
+        webhook = client.realtime_kit.webhooks.replace_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            events=[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ],
+            name="All events webhook",
+            url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+        )
+        assert_matches_type(WebhookReplaceWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_method_replace_webhook_with_all_params(self, client: Cloudflare) -> None:
+        webhook = client.realtime_kit.webhooks.replace_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            events=[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ],
+            name="All events webhook",
+            url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+            enabled=True,
+        )
+        assert_matches_type(WebhookReplaceWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_raw_response_replace_webhook(self, client: Cloudflare) -> None:
+        response = client.realtime_kit.webhooks.with_raw_response.replace_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            events=[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ],
+            name="All events webhook",
+            url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        webhook = response.parse()
+        assert_matches_type(WebhookReplaceWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_streaming_response_replace_webhook(self, client: Cloudflare) -> None:
+        with client.realtime_kit.webhooks.with_streaming_response.replace_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            events=[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ],
+            name="All events webhook",
+            url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            webhook = response.parse()
+            assert_matches_type(WebhookReplaceWebhookResponse, webhook, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    def test_path_params_replace_webhook(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.realtime_kit.webhooks.with_raw_response.replace_webhook(
+                webhook_id="webhook_id",
+                account_id="",
+                app_id="app_id",
+                events=[
+                    "meeting.started",
+                    "meeting.ended",
+                    "meeting.participantJoined",
+                    "meeting.participantLeft",
+                    "meeting.chatSynced",
+                    "recording.statusUpdate",
+                    "livestreaming.statusUpdate",
+                    "meeting.transcript",
+                    "meeting.summary",
+                ],
+                name="All events webhook",
+                url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.realtime_kit.webhooks.with_raw_response.replace_webhook(
+                webhook_id="webhook_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                events=[
+                    "meeting.started",
+                    "meeting.ended",
+                    "meeting.participantJoined",
+                    "meeting.participantLeft",
+                    "meeting.chatSynced",
+                    "recording.statusUpdate",
+                    "livestreaming.statusUpdate",
+                    "meeting.transcript",
+                    "meeting.summary",
+                ],
+                name="All events webhook",
+                url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `webhook_id` but received ''"):
+            client.realtime_kit.webhooks.with_raw_response.replace_webhook(
+                webhook_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                events=[
+                    "meeting.started",
+                    "meeting.ended",
+                    "meeting.participantJoined",
+                    "meeting.participantLeft",
+                    "meeting.chatSynced",
+                    "recording.statusUpdate",
+                    "livestreaming.statusUpdate",
+                    "meeting.transcript",
+                    "meeting.summary",
+                ],
+                name="All events webhook",
+                url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+            )
+
+
+class TestAsyncWebhooks:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_create_webhook(self, async_client: AsyncCloudflare) -> None:
+        webhook = await async_client.realtime_kit.webhooks.create_webhook(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            events=[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ],
+            name="All events webhook",
+            url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+        )
+        assert_matches_type(WebhookCreateWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_create_webhook_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        webhook = await async_client.realtime_kit.webhooks.create_webhook(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            events=[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ],
+            name="All events webhook",
+            url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+            enabled=True,
+        )
+        assert_matches_type(WebhookCreateWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_create_webhook(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.webhooks.with_raw_response.create_webhook(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            events=[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ],
+            name="All events webhook",
+            url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        webhook = await response.parse()
+        assert_matches_type(WebhookCreateWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_create_webhook(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.webhooks.with_streaming_response.create_webhook(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            events=[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ],
+            name="All events webhook",
+            url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            webhook = await response.parse()
+            assert_matches_type(WebhookCreateWebhookResponse, webhook, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_create_webhook(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.webhooks.with_raw_response.create_webhook(
+                app_id="app_id",
+                account_id="",
+                events=[
+                    "meeting.started",
+                    "meeting.ended",
+                    "meeting.participantJoined",
+                    "meeting.participantLeft",
+                    "meeting.chatSynced",
+                    "recording.statusUpdate",
+                    "livestreaming.statusUpdate",
+                    "meeting.transcript",
+                    "meeting.summary",
+                ],
+                name="All events webhook",
+                url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.webhooks.with_raw_response.create_webhook(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                events=[
+                    "meeting.started",
+                    "meeting.ended",
+                    "meeting.participantJoined",
+                    "meeting.participantLeft",
+                    "meeting.chatSynced",
+                    "recording.statusUpdate",
+                    "livestreaming.statusUpdate",
+                    "meeting.transcript",
+                    "meeting.summary",
+                ],
+                name="All events webhook",
+                url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_delete_webhook(self, async_client: AsyncCloudflare) -> None:
+        webhook = await async_client.realtime_kit.webhooks.delete_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(WebhookDeleteWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_delete_webhook(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.webhooks.with_raw_response.delete_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        webhook = await response.parse()
+        assert_matches_type(WebhookDeleteWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_delete_webhook(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.webhooks.with_streaming_response.delete_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            webhook = await response.parse()
+            assert_matches_type(WebhookDeleteWebhookResponse, webhook, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_delete_webhook(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.webhooks.with_raw_response.delete_webhook(
+                webhook_id="webhook_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.webhooks.with_raw_response.delete_webhook(
+                webhook_id="webhook_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `webhook_id` but received ''"):
+            await async_client.realtime_kit.webhooks.with_raw_response.delete_webhook(
+                webhook_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_edit_webhook(self, async_client: AsyncCloudflare) -> None:
+        webhook = await async_client.realtime_kit.webhooks.edit_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(WebhookEditWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_edit_webhook_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        webhook = await async_client.realtime_kit.webhooks.edit_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            enabled=True,
+            events=["meeting.started"],
+            name="name",
+            url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+        )
+        assert_matches_type(WebhookEditWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_edit_webhook(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.webhooks.with_raw_response.edit_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        webhook = await response.parse()
+        assert_matches_type(WebhookEditWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_edit_webhook(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.webhooks.with_streaming_response.edit_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            webhook = await response.parse()
+            assert_matches_type(WebhookEditWebhookResponse, webhook, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_edit_webhook(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.webhooks.with_raw_response.edit_webhook(
+                webhook_id="webhook_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.webhooks.with_raw_response.edit_webhook(
+                webhook_id="webhook_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `webhook_id` but received ''"):
+            await async_client.realtime_kit.webhooks.with_raw_response.edit_webhook(
+                webhook_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_webhook_by_id(self, async_client: AsyncCloudflare) -> None:
+        webhook = await async_client.realtime_kit.webhooks.get_webhook_by_id(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+        assert_matches_type(WebhookGetWebhookByIDResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_webhook_by_id(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.webhooks.with_raw_response.get_webhook_by_id(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        webhook = await response.parse()
+        assert_matches_type(WebhookGetWebhookByIDResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_webhook_by_id(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.webhooks.with_streaming_response.get_webhook_by_id(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            webhook = await response.parse()
+            assert_matches_type(WebhookGetWebhookByIDResponse, webhook, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_webhook_by_id(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.webhooks.with_raw_response.get_webhook_by_id(
+                webhook_id="webhook_id",
+                account_id="",
+                app_id="app_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.webhooks.with_raw_response.get_webhook_by_id(
+                webhook_id="webhook_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `webhook_id` but received ''"):
+            await async_client.realtime_kit.webhooks.with_raw_response.get_webhook_by_id(
+                webhook_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_get_webhooks(self, async_client: AsyncCloudflare) -> None:
+        webhook = await async_client.realtime_kit.webhooks.get_webhooks(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(WebhookGetWebhooksResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_get_webhooks(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.webhooks.with_raw_response.get_webhooks(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        webhook = await response.parse()
+        assert_matches_type(WebhookGetWebhooksResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_get_webhooks(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.webhooks.with_streaming_response.get_webhooks(
+            app_id="app_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            webhook = await response.parse()
+            assert_matches_type(WebhookGetWebhooksResponse, webhook, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_get_webhooks(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.webhooks.with_raw_response.get_webhooks(
+                app_id="app_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.webhooks.with_raw_response.get_webhooks(
+                app_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_replace_webhook(self, async_client: AsyncCloudflare) -> None:
+        webhook = await async_client.realtime_kit.webhooks.replace_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            events=[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ],
+            name="All events webhook",
+            url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+        )
+        assert_matches_type(WebhookReplaceWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_method_replace_webhook_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        webhook = await async_client.realtime_kit.webhooks.replace_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            events=[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ],
+            name="All events webhook",
+            url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+            enabled=True,
+        )
+        assert_matches_type(WebhookReplaceWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_raw_response_replace_webhook(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.realtime_kit.webhooks.with_raw_response.replace_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            events=[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ],
+            name="All events webhook",
+            url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        webhook = await response.parse()
+        assert_matches_type(WebhookReplaceWebhookResponse, webhook, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_streaming_response_replace_webhook(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.realtime_kit.webhooks.with_streaming_response.replace_webhook(
+            webhook_id="webhook_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="app_id",
+            events=[
+                "meeting.started",
+                "meeting.ended",
+                "meeting.participantJoined",
+                "meeting.participantLeft",
+                "meeting.chatSynced",
+                "recording.statusUpdate",
+                "livestreaming.statusUpdate",
+                "meeting.transcript",
+                "meeting.summary",
+            ],
+            name="All events webhook",
+            url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            webhook = await response.parse()
+            assert_matches_type(WebhookReplaceWebhookResponse, webhook, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: HTTP 401 from prism, support api tokens")
+    @parametrize
+    async def test_path_params_replace_webhook(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.realtime_kit.webhooks.with_raw_response.replace_webhook(
+                webhook_id="webhook_id",
+                account_id="",
+                app_id="app_id",
+                events=[
+                    "meeting.started",
+                    "meeting.ended",
+                    "meeting.participantJoined",
+                    "meeting.participantLeft",
+                    "meeting.chatSynced",
+                    "recording.statusUpdate",
+                    "livestreaming.statusUpdate",
+                    "meeting.transcript",
+                    "meeting.summary",
+                ],
+                name="All events webhook",
+                url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.realtime_kit.webhooks.with_raw_response.replace_webhook(
+                webhook_id="webhook_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="",
+                events=[
+                    "meeting.started",
+                    "meeting.ended",
+                    "meeting.participantJoined",
+                    "meeting.participantLeft",
+                    "meeting.chatSynced",
+                    "recording.statusUpdate",
+                    "livestreaming.statusUpdate",
+                    "meeting.transcript",
+                    "meeting.summary",
+                ],
+                name="All events webhook",
+                url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `webhook_id` but received ''"):
+            await async_client.realtime_kit.webhooks.with_raw_response.replace_webhook(
+                webhook_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                app_id="app_id",
+                events=[
+                    "meeting.started",
+                    "meeting.ended",
+                    "meeting.participantJoined",
+                    "meeting.participantLeft",
+                    "meeting.chatSynced",
+                    "recording.statusUpdate",
+                    "livestreaming.statusUpdate",
+                    "meeting.transcript",
+                    "meeting.summary",
+                ],
+                name="All events webhook",
+                url="https://webhook.site/b23a5bbd-c7b0-4ced-a9e2-78ae7889897e",
+            )
diff --git a/tests/api_resources/registrar/test_domains.py b/tests/api_resources/registrar/test_domains.py
index 2418c2d157e..672117b33bb 100644
--- a/tests/api_resources/registrar/test_domains.py
+++ b/tests/api_resources/registrar/test_domains.py
@@ -3,14 +3,14 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.registrar import Domain, DomainGetResponse, DomainUpdateResponse
+from cloudflare.types.registrar import Domain
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -24,7 +24,7 @@ def test_method_update(self, client: Cloudflare) -> None:
             domain_name="cloudflare.com",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[DomainUpdateResponse], domain, path=["response"])
+        assert_matches_type(object, domain, path=["response"])
 
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
@@ -35,7 +35,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             locked=False,
             privacy=True,
         )
-        assert_matches_type(Optional[DomainUpdateResponse], domain, path=["response"])
+        assert_matches_type(object, domain, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
@@ -47,7 +47,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         domain = response.parse()
-        assert_matches_type(Optional[DomainUpdateResponse], domain, path=["response"])
+        assert_matches_type(object, domain, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
@@ -59,7 +59,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             domain = response.parse()
-            assert_matches_type(Optional[DomainUpdateResponse], domain, path=["response"])
+            assert_matches_type(object, domain, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -121,7 +121,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             domain_name="cloudflare.com",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[DomainGetResponse], domain, path=["response"])
+        assert_matches_type(object, domain, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -133,7 +133,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         domain = response.parse()
-        assert_matches_type(Optional[DomainGetResponse], domain, path=["response"])
+        assert_matches_type(object, domain, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -145,7 +145,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             domain = response.parse()
-            assert_matches_type(Optional[DomainGetResponse], domain, path=["response"])
+            assert_matches_type(object, domain, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -165,7 +165,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncDomains:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
@@ -173,7 +175,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
             domain_name="cloudflare.com",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[DomainUpdateResponse], domain, path=["response"])
+        assert_matches_type(object, domain, path=["response"])
 
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -184,7 +186,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             locked=False,
             privacy=True,
         )
-        assert_matches_type(Optional[DomainUpdateResponse], domain, path=["response"])
+        assert_matches_type(object, domain, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
@@ -196,7 +198,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         domain = await response.parse()
-        assert_matches_type(Optional[DomainUpdateResponse], domain, path=["response"])
+        assert_matches_type(object, domain, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
@@ -208,7 +210,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             domain = await response.parse()
-            assert_matches_type(Optional[DomainUpdateResponse], domain, path=["response"])
+            assert_matches_type(object, domain, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -270,7 +272,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             domain_name="cloudflare.com",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[DomainGetResponse], domain, path=["response"])
+        assert_matches_type(object, domain, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -282,7 +284,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         domain = await response.parse()
-        assert_matches_type(Optional[DomainGetResponse], domain, path=["response"])
+        assert_matches_type(object, domain, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -294,7 +296,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             domain = await response.parse()
-            assert_matches_type(Optional[DomainGetResponse], domain, path=["response"])
+            assert_matches_type(object, domain, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/request_tracers/test_traces.py b/tests/api_resources/request_tracers/test_traces.py
index 92147ae93ba..78f66485eff 100644
--- a/tests/api_resources/request_tracers/test_traces.py
+++ b/tests/api_resources/request_tracers/test_traces.py
@@ -17,6 +17,7 @@
 class TestTraces:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @pytest.mark.skip(reason="TypeError: issubclass() - TraceCreateResponse has invalid type annotation (Issue #6)")
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         trace = client.request_tracers.traces.create(
@@ -26,6 +27,7 @@ def test_method_create(self, client: Cloudflare) -> None:
         )
         assert_matches_type(Optional[TraceCreateResponse], trace, path=["response"])
 
+    @pytest.mark.skip(reason="TypeError: issubclass() - TraceCreateResponse has invalid type annotation (Issue #6)")
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         trace = client.request_tracers.traces.create(
@@ -67,6 +69,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         )
         assert_matches_type(Optional[TraceCreateResponse], trace, path=["response"])
 
+    @pytest.mark.skip(reason="TypeError: issubclass() - TraceCreateResponse has invalid type annotation (Issue #6)")
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.request_tracers.traces.with_raw_response.create(
@@ -80,6 +83,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         trace = response.parse()
         assert_matches_type(Optional[TraceCreateResponse], trace, path=["response"])
 
+    @pytest.mark.skip(reason="TypeError: issubclass() - TraceCreateResponse has invalid type annotation (Issue #6)")
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.request_tracers.traces.with_streaming_response.create(
@@ -106,8 +110,11 @@ def test_path_params_create(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTraces:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
+    @pytest.mark.skip(reason="TypeError: issubclass() - TraceCreateResponse has invalid type annotation (Issue #6)")
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         trace = await async_client.request_tracers.traces.create(
@@ -117,6 +124,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(Optional[TraceCreateResponse], trace, path=["response"])
 
+    @pytest.mark.skip(reason="TypeError: issubclass() - TraceCreateResponse has invalid type annotation (Issue #6)")
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         trace = await async_client.request_tracers.traces.create(
@@ -158,6 +166,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
         )
         assert_matches_type(Optional[TraceCreateResponse], trace, path=["response"])
 
+    @pytest.mark.skip(reason="TypeError: issubclass() - TraceCreateResponse has invalid type annotation (Issue #6)")
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.request_tracers.traces.with_raw_response.create(
@@ -171,6 +180,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         trace = await response.parse()
         assert_matches_type(Optional[TraceCreateResponse], trace, path=["response"])
 
+    @pytest.mark.skip(reason="TypeError: issubclass() - TraceCreateResponse has invalid type annotation (Issue #6)")
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.request_tracers.traces.with_streaming_response.create(
diff --git a/tests/api_resources/resource_sharing/__init__.py b/tests/api_resources/resource_sharing/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/resource_sharing/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/resource_sharing/test_recipients.py b/tests/api_resources/resource_sharing/test_recipients.py
new file mode 100644
index 00000000000..837b3fe256c
--- /dev/null
+++ b/tests/api_resources/resource_sharing/test_recipients.py
@@ -0,0 +1,524 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.resource_sharing import (
+    RecipientGetResponse,
+    RecipientListResponse,
+    RecipientCreateResponse,
+    RecipientDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestRecipients:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        recipient = client.resource_sharing.recipients.create(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            path_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[RecipientCreateResponse], recipient, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        recipient = client.resource_sharing.recipients.create(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            path_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            organization_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[RecipientCreateResponse], recipient, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.resource_sharing.recipients.with_raw_response.create(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            path_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recipient = response.parse()
+        assert_matches_type(Optional[RecipientCreateResponse], recipient, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.resource_sharing.recipients.with_streaming_response.create(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            path_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recipient = response.parse()
+            assert_matches_type(Optional[RecipientCreateResponse], recipient, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `path_account_id` but received ''"):
+            client.resource_sharing.recipients.with_raw_response.create(
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+                path_account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            client.resource_sharing.recipients.with_raw_response.create(
+                share_id="",
+                path_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        recipient = client.resource_sharing.recipients.list(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[RecipientListResponse], recipient, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        recipient = client.resource_sharing.recipients.list(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            include_resources=True,
+            page=2,
+            per_page=20,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[RecipientListResponse], recipient, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.resource_sharing.recipients.with_raw_response.list(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recipient = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[RecipientListResponse], recipient, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.resource_sharing.recipients.with_streaming_response.list(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recipient = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[RecipientListResponse], recipient, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.resource_sharing.recipients.with_raw_response.list(
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            client.resource_sharing.recipients.with_raw_response.list(
+                share_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        recipient = client.resource_sharing.recipients.delete(
+            recipient_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        )
+        assert_matches_type(Optional[RecipientDeleteResponse], recipient, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.resource_sharing.recipients.with_raw_response.delete(
+            recipient_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recipient = response.parse()
+        assert_matches_type(Optional[RecipientDeleteResponse], recipient, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.resource_sharing.recipients.with_streaming_response.delete(
+            recipient_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recipient = response.parse()
+            assert_matches_type(Optional[RecipientDeleteResponse], recipient, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.resource_sharing.recipients.with_raw_response.delete(
+                recipient_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            client.resource_sharing.recipients.with_raw_response.delete(
+                recipient_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `recipient_id` but received ''"):
+            client.resource_sharing.recipients.with_raw_response.delete(
+                recipient_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        recipient = client.resource_sharing.recipients.get(
+            recipient_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        )
+        assert_matches_type(Optional[RecipientGetResponse], recipient, path=["response"])
+
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        recipient = client.resource_sharing.recipients.get(
+            recipient_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            include_resources=True,
+        )
+        assert_matches_type(Optional[RecipientGetResponse], recipient, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.resource_sharing.recipients.with_raw_response.get(
+            recipient_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recipient = response.parse()
+        assert_matches_type(Optional[RecipientGetResponse], recipient, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.resource_sharing.recipients.with_streaming_response.get(
+            recipient_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recipient = response.parse()
+            assert_matches_type(Optional[RecipientGetResponse], recipient, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.resource_sharing.recipients.with_raw_response.get(
+                recipient_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            client.resource_sharing.recipients.with_raw_response.get(
+                recipient_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `recipient_id` but received ''"):
+            client.resource_sharing.recipients.with_raw_response.get(
+                recipient_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+            )
+
+
+class TestAsyncRecipients:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        recipient = await async_client.resource_sharing.recipients.create(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            path_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[RecipientCreateResponse], recipient, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        recipient = await async_client.resource_sharing.recipients.create(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            path_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            organization_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[RecipientCreateResponse], recipient, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.resource_sharing.recipients.with_raw_response.create(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            path_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recipient = await response.parse()
+        assert_matches_type(Optional[RecipientCreateResponse], recipient, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.resource_sharing.recipients.with_streaming_response.create(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            path_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recipient = await response.parse()
+            assert_matches_type(Optional[RecipientCreateResponse], recipient, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `path_account_id` but received ''"):
+            await async_client.resource_sharing.recipients.with_raw_response.create(
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+                path_account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            await async_client.resource_sharing.recipients.with_raw_response.create(
+                share_id="",
+                path_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        recipient = await async_client.resource_sharing.recipients.list(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[RecipientListResponse], recipient, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        recipient = await async_client.resource_sharing.recipients.list(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            include_resources=True,
+            page=2,
+            per_page=20,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[RecipientListResponse], recipient, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.resource_sharing.recipients.with_raw_response.list(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recipient = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[RecipientListResponse], recipient, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.resource_sharing.recipients.with_streaming_response.list(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recipient = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[RecipientListResponse], recipient, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.resource_sharing.recipients.with_raw_response.list(
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            await async_client.resource_sharing.recipients.with_raw_response.list(
+                share_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        recipient = await async_client.resource_sharing.recipients.delete(
+            recipient_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        )
+        assert_matches_type(Optional[RecipientDeleteResponse], recipient, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.resource_sharing.recipients.with_raw_response.delete(
+            recipient_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recipient = await response.parse()
+        assert_matches_type(Optional[RecipientDeleteResponse], recipient, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.resource_sharing.recipients.with_streaming_response.delete(
+            recipient_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recipient = await response.parse()
+            assert_matches_type(Optional[RecipientDeleteResponse], recipient, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.resource_sharing.recipients.with_raw_response.delete(
+                recipient_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            await async_client.resource_sharing.recipients.with_raw_response.delete(
+                recipient_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `recipient_id` but received ''"):
+            await async_client.resource_sharing.recipients.with_raw_response.delete(
+                recipient_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        recipient = await async_client.resource_sharing.recipients.get(
+            recipient_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        )
+        assert_matches_type(Optional[RecipientGetResponse], recipient, path=["response"])
+
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        recipient = await async_client.resource_sharing.recipients.get(
+            recipient_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            include_resources=True,
+        )
+        assert_matches_type(Optional[RecipientGetResponse], recipient, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.resource_sharing.recipients.with_raw_response.get(
+            recipient_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        recipient = await response.parse()
+        assert_matches_type(Optional[RecipientGetResponse], recipient, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.resource_sharing.recipients.with_streaming_response.get(
+            recipient_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            recipient = await response.parse()
+            assert_matches_type(Optional[RecipientGetResponse], recipient, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.resource_sharing.recipients.with_raw_response.get(
+                recipient_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            await async_client.resource_sharing.recipients.with_raw_response.get(
+                recipient_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `recipient_id` but received ''"):
+            await async_client.resource_sharing.recipients.with_raw_response.get(
+                recipient_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+            )
diff --git a/tests/api_resources/resource_sharing/test_resources.py b/tests/api_resources/resource_sharing/test_resources.py
new file mode 100644
index 00000000000..36adaec0d62
--- /dev/null
+++ b/tests/api_resources/resource_sharing/test_resources.py
@@ -0,0 +1,659 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.resource_sharing import (
+    ResourceGetResponse,
+    ResourceListResponse,
+    ResourceCreateResponse,
+    ResourceDeleteResponse,
+    ResourceUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestResources:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        resource = client.resource_sharing.resources.create(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            meta={},
+            resource_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            resource_type="custom-ruleset",
+        )
+        assert_matches_type(Optional[ResourceCreateResponse], resource, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.resource_sharing.resources.with_raw_response.create(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            meta={},
+            resource_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            resource_type="custom-ruleset",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource = response.parse()
+        assert_matches_type(Optional[ResourceCreateResponse], resource, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.resource_sharing.resources.with_streaming_response.create(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            meta={},
+            resource_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            resource_type="custom-ruleset",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource = response.parse()
+            assert_matches_type(Optional[ResourceCreateResponse], resource, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.resource_sharing.resources.with_raw_response.create(
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+                meta={},
+                resource_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+                resource_type="custom-ruleset",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            client.resource_sharing.resources.with_raw_response.create(
+                share_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                meta={},
+                resource_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+                resource_type="custom-ruleset",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        resource = client.resource_sharing.resources.update(
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            meta={},
+        )
+        assert_matches_type(Optional[ResourceUpdateResponse], resource, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.resource_sharing.resources.with_raw_response.update(
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            meta={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource = response.parse()
+        assert_matches_type(Optional[ResourceUpdateResponse], resource, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.resource_sharing.resources.with_streaming_response.update(
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            meta={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource = response.parse()
+            assert_matches_type(Optional[ResourceUpdateResponse], resource, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.resource_sharing.resources.with_raw_response.update(
+                resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+                meta={},
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            client.resource_sharing.resources.with_raw_response.update(
+                resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="",
+                meta={},
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `resource_id` but received ''"):
+            client.resource_sharing.resources.with_raw_response.update(
+                resource_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+                meta={},
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        resource = client.resource_sharing.resources.list(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ResourceListResponse], resource, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        resource = client.resource_sharing.resources.list(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=2,
+            per_page=20,
+            resource_type="custom-ruleset",
+            status="active",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ResourceListResponse], resource, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.resource_sharing.resources.with_raw_response.list(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[ResourceListResponse], resource, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.resource_sharing.resources.with_streaming_response.list(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[ResourceListResponse], resource, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.resource_sharing.resources.with_raw_response.list(
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            client.resource_sharing.resources.with_raw_response.list(
+                share_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        resource = client.resource_sharing.resources.delete(
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        )
+        assert_matches_type(Optional[ResourceDeleteResponse], resource, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.resource_sharing.resources.with_raw_response.delete(
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource = response.parse()
+        assert_matches_type(Optional[ResourceDeleteResponse], resource, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.resource_sharing.resources.with_streaming_response.delete(
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource = response.parse()
+            assert_matches_type(Optional[ResourceDeleteResponse], resource, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.resource_sharing.resources.with_raw_response.delete(
+                resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            client.resource_sharing.resources.with_raw_response.delete(
+                resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `resource_id` but received ''"):
+            client.resource_sharing.resources.with_raw_response.delete(
+                resource_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        resource = client.resource_sharing.resources.get(
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        )
+        assert_matches_type(Optional[ResourceGetResponse], resource, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.resource_sharing.resources.with_raw_response.get(
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource = response.parse()
+        assert_matches_type(Optional[ResourceGetResponse], resource, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.resource_sharing.resources.with_streaming_response.get(
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource = response.parse()
+            assert_matches_type(Optional[ResourceGetResponse], resource, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.resource_sharing.resources.with_raw_response.get(
+                resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            client.resource_sharing.resources.with_raw_response.get(
+                resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `resource_id` but received ''"):
+            client.resource_sharing.resources.with_raw_response.get(
+                resource_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+            )
+
+
+class TestAsyncResources:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        resource = await async_client.resource_sharing.resources.create(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            meta={},
+            resource_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            resource_type="custom-ruleset",
+        )
+        assert_matches_type(Optional[ResourceCreateResponse], resource, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.resource_sharing.resources.with_raw_response.create(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            meta={},
+            resource_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            resource_type="custom-ruleset",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource = await response.parse()
+        assert_matches_type(Optional[ResourceCreateResponse], resource, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.resource_sharing.resources.with_streaming_response.create(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            meta={},
+            resource_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            resource_type="custom-ruleset",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource = await response.parse()
+            assert_matches_type(Optional[ResourceCreateResponse], resource, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.resource_sharing.resources.with_raw_response.create(
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+                meta={},
+                resource_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+                resource_type="custom-ruleset",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            await async_client.resource_sharing.resources.with_raw_response.create(
+                share_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                meta={},
+                resource_account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+                resource_type="custom-ruleset",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        resource = await async_client.resource_sharing.resources.update(
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            meta={},
+        )
+        assert_matches_type(Optional[ResourceUpdateResponse], resource, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.resource_sharing.resources.with_raw_response.update(
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            meta={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource = await response.parse()
+        assert_matches_type(Optional[ResourceUpdateResponse], resource, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.resource_sharing.resources.with_streaming_response.update(
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            meta={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource = await response.parse()
+            assert_matches_type(Optional[ResourceUpdateResponse], resource, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.resource_sharing.resources.with_raw_response.update(
+                resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+                meta={},
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            await async_client.resource_sharing.resources.with_raw_response.update(
+                resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="",
+                meta={},
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `resource_id` but received ''"):
+            await async_client.resource_sharing.resources.with_raw_response.update(
+                resource_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+                meta={},
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        resource = await async_client.resource_sharing.resources.list(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[ResourceListResponse], resource, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        resource = await async_client.resource_sharing.resources.list(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=2,
+            per_page=20,
+            resource_type="custom-ruleset",
+            status="active",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[ResourceListResponse], resource, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.resource_sharing.resources.with_raw_response.list(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[ResourceListResponse], resource, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.resource_sharing.resources.with_streaming_response.list(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[ResourceListResponse], resource, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.resource_sharing.resources.with_raw_response.list(
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            await async_client.resource_sharing.resources.with_raw_response.list(
+                share_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        resource = await async_client.resource_sharing.resources.delete(
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        )
+        assert_matches_type(Optional[ResourceDeleteResponse], resource, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.resource_sharing.resources.with_raw_response.delete(
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource = await response.parse()
+        assert_matches_type(Optional[ResourceDeleteResponse], resource, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.resource_sharing.resources.with_streaming_response.delete(
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource = await response.parse()
+            assert_matches_type(Optional[ResourceDeleteResponse], resource, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.resource_sharing.resources.with_raw_response.delete(
+                resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            await async_client.resource_sharing.resources.with_raw_response.delete(
+                resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `resource_id` but received ''"):
+            await async_client.resource_sharing.resources.with_raw_response.delete(
+                resource_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        resource = await async_client.resource_sharing.resources.get(
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        )
+        assert_matches_type(Optional[ResourceGetResponse], resource, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.resource_sharing.resources.with_raw_response.get(
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource = await response.parse()
+        assert_matches_type(Optional[ResourceGetResponse], resource, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.resource_sharing.resources.with_streaming_response.get(
+            resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource = await response.parse()
+            assert_matches_type(Optional[ResourceGetResponse], resource, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.resource_sharing.resources.with_raw_response.get(
+                resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            await async_client.resource_sharing.resources.with_raw_response.get(
+                resource_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `resource_id` but received ''"):
+            await async_client.resource_sharing.resources.with_raw_response.get(
+                resource_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+            )
diff --git a/tests/api_resources/rules/lists/test_bulk_operations.py b/tests/api_resources/rules/lists/test_bulk_operations.py
index cea227ed259..da56522a4bf 100644
--- a/tests/api_resources/rules/lists/test_bulk_operations.py
+++ b/tests/api_resources/rules/lists/test_bulk_operations.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -21,98 +21,100 @@ class TestBulkOperations:
     def test_method_get(self, client: Cloudflare) -> None:
         bulk_operation = client.rules.lists.bulk_operations.get(
             operation_id="4da8780eeb215e6cb7f48dd981c4ea02",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[BulkOperationGetResponse], bulk_operation, path=["response"])
+        assert_matches_type(BulkOperationGetResponse, bulk_operation, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.rules.lists.bulk_operations.with_raw_response.get(
             operation_id="4da8780eeb215e6cb7f48dd981c4ea02",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         bulk_operation = response.parse()
-        assert_matches_type(Optional[BulkOperationGetResponse], bulk_operation, path=["response"])
+        assert_matches_type(BulkOperationGetResponse, bulk_operation, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.rules.lists.bulk_operations.with_streaming_response.get(
             operation_id="4da8780eeb215e6cb7f48dd981c4ea02",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             bulk_operation = response.parse()
-            assert_matches_type(Optional[BulkOperationGetResponse], bulk_operation, path=["response"])
+            assert_matches_type(BulkOperationGetResponse, bulk_operation, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.rules.lists.bulk_operations.with_raw_response.get(
                 operation_id="4da8780eeb215e6cb7f48dd981c4ea02",
-                account_identifier="",
+                account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `operation_id` but received ''"):
             client.rules.lists.bulk_operations.with_raw_response.get(
                 operation_id="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
 
 class TestAsyncBulkOperations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         bulk_operation = await async_client.rules.lists.bulk_operations.get(
             operation_id="4da8780eeb215e6cb7f48dd981c4ea02",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[BulkOperationGetResponse], bulk_operation, path=["response"])
+        assert_matches_type(BulkOperationGetResponse, bulk_operation, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.rules.lists.bulk_operations.with_raw_response.get(
             operation_id="4da8780eeb215e6cb7f48dd981c4ea02",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         bulk_operation = await response.parse()
-        assert_matches_type(Optional[BulkOperationGetResponse], bulk_operation, path=["response"])
+        assert_matches_type(BulkOperationGetResponse, bulk_operation, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.rules.lists.bulk_operations.with_streaming_response.get(
             operation_id="4da8780eeb215e6cb7f48dd981c4ea02",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             bulk_operation = await response.parse()
-            assert_matches_type(Optional[BulkOperationGetResponse], bulk_operation, path=["response"])
+            assert_matches_type(BulkOperationGetResponse, bulk_operation, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.rules.lists.bulk_operations.with_raw_response.get(
                 operation_id="4da8780eeb215e6cb7f48dd981c4ea02",
-                account_identifier="",
+                account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `operation_id` but received ''"):
             await async_client.rules.lists.bulk_operations.with_raw_response.get(
                 operation_id="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/rules/lists/test_items.py b/tests/api_resources/rules/lists/test_items.py
index 591f68417ff..82004c72614 100644
--- a/tests/api_resources/rules/lists/test_items.py
+++ b/tests/api_resources/rules/lists/test_items.py
@@ -3,15 +3,16 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncCursorPagination, AsyncCursorPagination
+from cloudflare.pagination import SyncCursorPaginationAfter, AsyncCursorPaginationAfter
 from cloudflare.types.rules.lists import (
     ItemGetResponse,
+    ItemListResponse,
     ItemCreateResponse,
     ItemDeleteResponse,
     ItemUpdateResponse,
@@ -28,35 +29,35 @@ def test_method_create(self, client: Cloudflare) -> None:
         item = client.rules.lists.items.create(
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
+            body=[{"ip": "10.0.0.1"}],
         )
-        assert_matches_type(Optional[ItemCreateResponse], item, path=["response"])
+        assert_matches_type(ItemCreateResponse, item, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.rules.lists.items.with_raw_response.create(
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
+            body=[{"ip": "10.0.0.1"}],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         item = response.parse()
-        assert_matches_type(Optional[ItemCreateResponse], item, path=["response"])
+        assert_matches_type(ItemCreateResponse, item, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.rules.lists.items.with_streaming_response.create(
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
+            body=[{"ip": "10.0.0.1"}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             item = response.parse()
-            assert_matches_type(Optional[ItemCreateResponse], item, path=["response"])
+            assert_matches_type(ItemCreateResponse, item, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -66,14 +67,14 @@ def test_path_params_create(self, client: Cloudflare) -> None:
             client.rules.lists.items.with_raw_response.create(
                 list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
                 account_id="",
-                body=[{}, {}, {}],
+                body=[{"ip": "10.0.0.1"}],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `list_id` but received ''"):
             client.rules.lists.items.with_raw_response.create(
                 list_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body=[{}, {}, {}],
+                body=[{"ip": "10.0.0.1"}],
             )
 
     @parametrize
@@ -81,35 +82,35 @@ def test_method_update(self, client: Cloudflare) -> None:
         item = client.rules.lists.items.update(
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
+            body=[{"ip": "10.0.0.1"}],
         )
-        assert_matches_type(Optional[ItemUpdateResponse], item, path=["response"])
+        assert_matches_type(ItemUpdateResponse, item, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.rules.lists.items.with_raw_response.update(
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
+            body=[{"ip": "10.0.0.1"}],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         item = response.parse()
-        assert_matches_type(Optional[ItemUpdateResponse], item, path=["response"])
+        assert_matches_type(ItemUpdateResponse, item, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.rules.lists.items.with_streaming_response.update(
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
+            body=[{"ip": "10.0.0.1"}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             item = response.parse()
-            assert_matches_type(Optional[ItemUpdateResponse], item, path=["response"])
+            assert_matches_type(ItemUpdateResponse, item, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -119,14 +120,14 @@ def test_path_params_update(self, client: Cloudflare) -> None:
             client.rules.lists.items.with_raw_response.update(
                 list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
                 account_id="",
-                body=[{}, {}, {}],
+                body=[{"ip": "10.0.0.1"}],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `list_id` but received ''"):
             client.rules.lists.items.with_raw_response.update(
                 list_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body=[{}, {}, {}],
+                body=[{"ip": "10.0.0.1"}],
             )
 
     @parametrize
@@ -135,7 +136,7 @@ def test_method_list(self, client: Cloudflare) -> None:
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncCursorPagination[object], item, path=["response"])
+        assert_matches_type(SyncCursorPaginationAfter[ItemListResponse], item, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
@@ -146,7 +147,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
             per_page=1,
             search="1.1.1.",
         )
-        assert_matches_type(SyncCursorPagination[object], item, path=["response"])
+        assert_matches_type(SyncCursorPaginationAfter[ItemListResponse], item, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -158,7 +159,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         item = response.parse()
-        assert_matches_type(SyncCursorPagination[object], item, path=["response"])
+        assert_matches_type(SyncCursorPaginationAfter[ItemListResponse], item, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -170,7 +171,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             item = response.parse()
-            assert_matches_type(SyncCursorPagination[object], item, path=["response"])
+            assert_matches_type(SyncCursorPaginationAfter[ItemListResponse], item, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -194,7 +195,16 @@ def test_method_delete(self, client: Cloudflare) -> None:
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ItemDeleteResponse], item, path=["response"])
+        assert_matches_type(ItemDeleteResponse, item, path=["response"])
+
+    @parametrize
+    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
+        item = client.rules.lists.items.delete(
+            list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            items=[{"id": "34b12448945f11eaa1b71c4d701ab86e"}],
+        )
+        assert_matches_type(ItemDeleteResponse, item, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -206,7 +216,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         item = response.parse()
-        assert_matches_type(Optional[ItemDeleteResponse], item, path=["response"])
+        assert_matches_type(ItemDeleteResponse, item, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -218,7 +228,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             item = response.parse()
-            assert_matches_type(Optional[ItemDeleteResponse], item, path=["response"])
+            assert_matches_type(ItemDeleteResponse, item, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -240,100 +250,102 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
     def test_method_get(self, client: Cloudflare) -> None:
         item = client.rules.lists.items.get(
             item_id="34b12448945f11eaa1b71c4d701ab86e",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
         )
-        assert_matches_type(Optional[ItemGetResponse], item, path=["response"])
+        assert_matches_type(ItemGetResponse, item, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.rules.lists.items.with_raw_response.get(
             item_id="34b12448945f11eaa1b71c4d701ab86e",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         item = response.parse()
-        assert_matches_type(Optional[ItemGetResponse], item, path=["response"])
+        assert_matches_type(ItemGetResponse, item, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.rules.lists.items.with_streaming_response.get(
             item_id="34b12448945f11eaa1b71c4d701ab86e",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             item = response.parse()
-            assert_matches_type(Optional[ItemGetResponse], item, path=["response"])
+            assert_matches_type(ItemGetResponse, item, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.rules.lists.items.with_raw_response.get(
                 item_id="34b12448945f11eaa1b71c4d701ab86e",
-                account_identifier="",
+                account_id="",
                 list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `list_id` but received ''"):
             client.rules.lists.items.with_raw_response.get(
                 item_id="34b12448945f11eaa1b71c4d701ab86e",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 list_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `item_id` but received ''"):
             client.rules.lists.items.with_raw_response.get(
                 item_id="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             )
 
 
 class TestAsyncItems:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         item = await async_client.rules.lists.items.create(
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
+            body=[{"ip": "10.0.0.1"}],
         )
-        assert_matches_type(Optional[ItemCreateResponse], item, path=["response"])
+        assert_matches_type(ItemCreateResponse, item, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.rules.lists.items.with_raw_response.create(
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
+            body=[{"ip": "10.0.0.1"}],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         item = await response.parse()
-        assert_matches_type(Optional[ItemCreateResponse], item, path=["response"])
+        assert_matches_type(ItemCreateResponse, item, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.rules.lists.items.with_streaming_response.create(
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
+            body=[{"ip": "10.0.0.1"}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             item = await response.parse()
-            assert_matches_type(Optional[ItemCreateResponse], item, path=["response"])
+            assert_matches_type(ItemCreateResponse, item, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -343,14 +355,14 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
             await async_client.rules.lists.items.with_raw_response.create(
                 list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
                 account_id="",
-                body=[{}, {}, {}],
+                body=[{"ip": "10.0.0.1"}],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `list_id` but received ''"):
             await async_client.rules.lists.items.with_raw_response.create(
                 list_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body=[{}, {}, {}],
+                body=[{"ip": "10.0.0.1"}],
             )
 
     @parametrize
@@ -358,35 +370,35 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         item = await async_client.rules.lists.items.update(
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
+            body=[{"ip": "10.0.0.1"}],
         )
-        assert_matches_type(Optional[ItemUpdateResponse], item, path=["response"])
+        assert_matches_type(ItemUpdateResponse, item, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.rules.lists.items.with_raw_response.update(
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
+            body=[{"ip": "10.0.0.1"}],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         item = await response.parse()
-        assert_matches_type(Optional[ItemUpdateResponse], item, path=["response"])
+        assert_matches_type(ItemUpdateResponse, item, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.rules.lists.items.with_streaming_response.update(
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[{}, {}, {}],
+            body=[{"ip": "10.0.0.1"}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             item = await response.parse()
-            assert_matches_type(Optional[ItemUpdateResponse], item, path=["response"])
+            assert_matches_type(ItemUpdateResponse, item, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -396,14 +408,14 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
             await async_client.rules.lists.items.with_raw_response.update(
                 list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
                 account_id="",
-                body=[{}, {}, {}],
+                body=[{"ip": "10.0.0.1"}],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `list_id` but received ''"):
             await async_client.rules.lists.items.with_raw_response.update(
                 list_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body=[{}, {}, {}],
+                body=[{"ip": "10.0.0.1"}],
             )
 
     @parametrize
@@ -412,7 +424,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncCursorPagination[object], item, path=["response"])
+        assert_matches_type(AsyncCursorPaginationAfter[ItemListResponse], item, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -423,7 +435,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
             per_page=1,
             search="1.1.1.",
         )
-        assert_matches_type(AsyncCursorPagination[object], item, path=["response"])
+        assert_matches_type(AsyncCursorPaginationAfter[ItemListResponse], item, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -435,7 +447,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         item = await response.parse()
-        assert_matches_type(AsyncCursorPagination[object], item, path=["response"])
+        assert_matches_type(AsyncCursorPaginationAfter[ItemListResponse], item, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -447,7 +459,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             item = await response.parse()
-            assert_matches_type(AsyncCursorPagination[object], item, path=["response"])
+            assert_matches_type(AsyncCursorPaginationAfter[ItemListResponse], item, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -471,7 +483,16 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ItemDeleteResponse], item, path=["response"])
+        assert_matches_type(ItemDeleteResponse, item, path=["response"])
+
+    @parametrize
+    async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        item = await async_client.rules.lists.items.delete(
+            list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            items=[{"id": "34b12448945f11eaa1b71c4d701ab86e"}],
+        )
+        assert_matches_type(ItemDeleteResponse, item, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -483,7 +504,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         item = await response.parse()
-        assert_matches_type(Optional[ItemDeleteResponse], item, path=["response"])
+        assert_matches_type(ItemDeleteResponse, item, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -495,7 +516,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             item = await response.parse()
-            assert_matches_type(Optional[ItemDeleteResponse], item, path=["response"])
+            assert_matches_type(ItemDeleteResponse, item, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -517,58 +538,58 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         item = await async_client.rules.lists.items.get(
             item_id="34b12448945f11eaa1b71c4d701ab86e",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
         )
-        assert_matches_type(Optional[ItemGetResponse], item, path=["response"])
+        assert_matches_type(ItemGetResponse, item, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.rules.lists.items.with_raw_response.get(
             item_id="34b12448945f11eaa1b71c4d701ab86e",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         item = await response.parse()
-        assert_matches_type(Optional[ItemGetResponse], item, path=["response"])
+        assert_matches_type(ItemGetResponse, item, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.rules.lists.items.with_streaming_response.get(
             item_id="34b12448945f11eaa1b71c4d701ab86e",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             item = await response.parse()
-            assert_matches_type(Optional[ItemGetResponse], item, path=["response"])
+            assert_matches_type(ItemGetResponse, item, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.rules.lists.items.with_raw_response.get(
                 item_id="34b12448945f11eaa1b71c4d701ab86e",
-                account_identifier="",
+                account_id="",
                 list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `list_id` but received ''"):
             await async_client.rules.lists.items.with_raw_response.get(
                 item_id="34b12448945f11eaa1b71c4d701ab86e",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 list_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `item_id` but received ''"):
             await async_client.rules.lists.items.with_raw_response.get(
                 item_id="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             )
diff --git a/tests/api_resources/rules/test_lists.py b/tests/api_resources/rules/test_lists.py
index c14548725c1..df909befdc9 100644
--- a/tests/api_resources/rules/test_lists.py
+++ b/tests/api_resources/rules/test_lists.py
@@ -3,14 +3,20 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.rules import ListsList, ListDeleteResponse
+from cloudflare.types.rules import (
+    ListsList,
+    ListGetResponse,
+    ListCreateResponse,
+    ListDeleteResponse,
+    ListUpdateResponse,
+)
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -26,7 +32,7 @@ def test_method_create(self, client: Cloudflare) -> None:
             kind="ip",
             name="list1",
         )
-        assert_matches_type(Optional[ListsList], list_, path=["response"])
+        assert_matches_type(ListCreateResponse, list_, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -37,7 +43,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             name="list1",
             description="This is a note",
         )
-        assert_matches_type(Optional[ListsList], list_, path=["response"])
+        assert_matches_type(ListCreateResponse, list_, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -51,7 +57,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         list_ = response.parse()
-        assert_matches_type(Optional[ListsList], list_, path=["response"])
+        assert_matches_type(ListCreateResponse, list_, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -65,7 +71,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             list_ = response.parse()
-            assert_matches_type(Optional[ListsList], list_, path=["response"])
+            assert_matches_type(ListCreateResponse, list_, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -86,7 +92,7 @@ def test_method_update(self, client: Cloudflare) -> None:
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ListsList], list_, path=["response"])
+        assert_matches_type(ListUpdateResponse, list_, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -96,7 +102,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             description="This is a note",
         )
-        assert_matches_type(Optional[ListsList], list_, path=["response"])
+        assert_matches_type(ListUpdateResponse, list_, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -109,7 +115,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         list_ = response.parse()
-        assert_matches_type(Optional[ListsList], list_, path=["response"])
+        assert_matches_type(ListUpdateResponse, list_, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -122,7 +128,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             list_ = response.parse()
-            assert_matches_type(Optional[ListsList], list_, path=["response"])
+            assert_matches_type(ListUpdateResponse, list_, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -185,7 +191,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ListDeleteResponse], list_, path=["response"])
+        assert_matches_type(ListDeleteResponse, list_, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -197,7 +203,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         list_ = response.parse()
-        assert_matches_type(Optional[ListDeleteResponse], list_, path=["response"])
+        assert_matches_type(ListDeleteResponse, list_, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -209,7 +215,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             list_ = response.parse()
-            assert_matches_type(Optional[ListDeleteResponse], list_, path=["response"])
+            assert_matches_type(ListDeleteResponse, list_, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -234,7 +240,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ListsList], list_, path=["response"])
+        assert_matches_type(ListGetResponse, list_, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -247,7 +253,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         list_ = response.parse()
-        assert_matches_type(Optional[ListsList], list_, path=["response"])
+        assert_matches_type(ListGetResponse, list_, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -260,7 +266,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             list_ = response.parse()
-            assert_matches_type(Optional[ListsList], list_, path=["response"])
+            assert_matches_type(ListGetResponse, list_, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -281,7 +287,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncLists:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -291,7 +299,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
             kind="ip",
             name="list1",
         )
-        assert_matches_type(Optional[ListsList], list_, path=["response"])
+        assert_matches_type(ListCreateResponse, list_, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -302,7 +310,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             name="list1",
             description="This is a note",
         )
-        assert_matches_type(Optional[ListsList], list_, path=["response"])
+        assert_matches_type(ListCreateResponse, list_, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -316,7 +324,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         list_ = await response.parse()
-        assert_matches_type(Optional[ListsList], list_, path=["response"])
+        assert_matches_type(ListCreateResponse, list_, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -330,7 +338,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             list_ = await response.parse()
-            assert_matches_type(Optional[ListsList], list_, path=["response"])
+            assert_matches_type(ListCreateResponse, list_, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -351,7 +359,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ListsList], list_, path=["response"])
+        assert_matches_type(ListUpdateResponse, list_, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -361,7 +369,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             description="This is a note",
         )
-        assert_matches_type(Optional[ListsList], list_, path=["response"])
+        assert_matches_type(ListUpdateResponse, list_, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -374,7 +382,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         list_ = await response.parse()
-        assert_matches_type(Optional[ListsList], list_, path=["response"])
+        assert_matches_type(ListUpdateResponse, list_, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -387,7 +395,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             list_ = await response.parse()
-            assert_matches_type(Optional[ListsList], list_, path=["response"])
+            assert_matches_type(ListUpdateResponse, list_, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -450,7 +458,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ListDeleteResponse], list_, path=["response"])
+        assert_matches_type(ListDeleteResponse, list_, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -462,7 +470,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         list_ = await response.parse()
-        assert_matches_type(Optional[ListDeleteResponse], list_, path=["response"])
+        assert_matches_type(ListDeleteResponse, list_, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -474,7 +482,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             list_ = await response.parse()
-            assert_matches_type(Optional[ListDeleteResponse], list_, path=["response"])
+            assert_matches_type(ListDeleteResponse, list_, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -499,7 +507,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             list_id="2c0fc9fa937b11eaa1b71c4d701ab86e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ListsList], list_, path=["response"])
+        assert_matches_type(ListGetResponse, list_, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -512,7 +520,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         list_ = await response.parse()
-        assert_matches_type(Optional[ListsList], list_, path=["response"])
+        assert_matches_type(ListGetResponse, list_, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -525,7 +533,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             list_ = await response.parse()
-            assert_matches_type(Optional[ListsList], list_, path=["response"])
+            assert_matches_type(ListGetResponse, list_, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/rulesets/phases/test_versions.py b/tests/api_resources/rulesets/phases/test_versions.py
index 2e285e86c92..002f11ccc12 100644
--- a/tests/api_resources/rulesets/phases/test_versions.py
+++ b/tests/api_resources/rulesets/phases/test_versions.py
@@ -67,13 +67,13 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.phases.versions.with_raw_response.list(
                 ruleset_phase="http_request_firewall_custom",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.phases.versions.with_raw_response.list(
                 ruleset_phase="http_request_firewall_custom",
                 account_id="account_id",
@@ -139,14 +139,14 @@ def test_path_params_get(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.phases.versions.with_raw_response.get(
                 ruleset_version="1",
                 ruleset_phase="http_request_firewall_custom",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.phases.versions.with_raw_response.get(
                 ruleset_version="1",
                 ruleset_phase="http_request_firewall_custom",
@@ -155,7 +155,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncVersions:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -206,13 +208,13 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.phases.versions.with_raw_response.list(
                 ruleset_phase="http_request_firewall_custom",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.phases.versions.with_raw_response.list(
                 ruleset_phase="http_request_firewall_custom",
                 account_id="account_id",
@@ -278,14 +280,14 @@ async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.phases.versions.with_raw_response.get(
                 ruleset_version="1",
                 ruleset_phase="http_request_firewall_custom",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.phases.versions.with_raw_response.get(
                 ruleset_version="1",
                 ruleset_phase="http_request_firewall_custom",
diff --git a/tests/api_resources/rulesets/test_phases.py b/tests/api_resources/rulesets/test_phases.py
index c795b8c6f79..27f2dfd5373 100644
--- a/tests/api_resources/rulesets/test_phases.py
+++ b/tests/api_resources/rulesets/test_phases.py
@@ -22,7 +22,6 @@ class TestPhases:
     def test_method_update(self, client: Cloudflare) -> None:
         phase = client.rulesets.phases.update(
             ruleset_phase="http_request_firewall_custom",
-            rules=[{}, {}, {}],
             account_id="account_id",
         )
         assert_matches_type(PhaseUpdateResponse, phase, path=["response"])
@@ -32,24 +31,12 @@ def test_method_update(self, client: Cloudflare) -> None:
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         phase = client.rulesets.phases.update(
             ruleset_phase="http_request_firewall_custom",
+            account_id="account_id",
+            description="A description for my ruleset.",
+            name="My ruleset",
             rules=[
                 {
-                    "action": "block",
-                    "action_parameters": {
-                        "response": {
-                            "content": '{\n  "success": false,\n  "error": "you have been blocked"\n}',
-                            "content_type": "application/json",
-                            "status_code": 400,
-                        }
-                    },
-                    "description": "Block when the IP address is not 1.1.1.1",
-                    "enabled": True,
-                    "expression": "ip.src ne 1.1.1.1",
                     "id": "3a03d665bac047339bb530ecb439a90d",
-                    "logging": {"enabled": True},
-                    "ref": "my_ref",
-                },
-                {
                     "action": "block",
                     "action_parameters": {
                         "response": {
@@ -58,33 +45,27 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                             "status_code": 400,
                         }
                     },
-                    "description": "Block when the IP address is not 1.1.1.1",
+                    "description": "Block the request.",
                     "enabled": True,
-                    "expression": "ip.src ne 1.1.1.1",
-                    "id": "3a03d665bac047339bb530ecb439a90d",
-                    "logging": {"enabled": True},
-                    "ref": "my_ref",
-                },
-                {
-                    "action": "block",
-                    "action_parameters": {
-                        "response": {
-                            "content": '{\n  "success": false,\n  "error": "you have been blocked"\n}',
-                            "content_type": "application/json",
-                            "status_code": 400,
-                        }
+                    "exposed_credential_check": {
+                        "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                        "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
                     },
-                    "description": "Block when the IP address is not 1.1.1.1",
-                    "enabled": True,
-                    "expression": "ip.src ne 1.1.1.1",
-                    "id": "3a03d665bac047339bb530ecb439a90d",
+                    "expression": "ip.src eq 1.1.1.1",
                     "logging": {"enabled": True},
+                    "ratelimit": {
+                        "characteristics": ["cf.colo.id"],
+                        "period": 60,
+                        "counting_expression": 'http.request.body.raw eq "abcd"',
+                        "mitigation_timeout": 600,
+                        "requests_per_period": 1000,
+                        "requests_to_origin": True,
+                        "score_per_period": 400,
+                        "score_response_header_name": "my-score",
+                    },
                     "ref": "my_ref",
-                },
+                }
             ],
-            account_id="account_id",
-            description="My ruleset to execute managed rulesets",
-            name="My ruleset",
         )
         assert_matches_type(PhaseUpdateResponse, phase, path=["response"])
 
@@ -93,7 +74,6 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.rulesets.phases.with_raw_response.update(
             ruleset_phase="http_request_firewall_custom",
-            rules=[{}, {}, {}],
             account_id="account_id",
         )
 
@@ -107,7 +87,6 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.rulesets.phases.with_streaming_response.update(
             ruleset_phase="http_request_firewall_custom",
-            rules=[{}, {}, {}],
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -121,17 +100,15 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.phases.with_raw_response.update(
                 ruleset_phase="http_request_firewall_custom",
-                rules=[{}, {}, {}],
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.phases.with_raw_response.update(
                 ruleset_phase="http_request_firewall_custom",
-                rules=[{}, {}, {}],
                 account_id="account_id",
             )
 
@@ -184,13 +161,13 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.phases.with_raw_response.get(
                 ruleset_phase="http_request_firewall_custom",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.phases.with_raw_response.get(
                 ruleset_phase="http_request_firewall_custom",
                 account_id="account_id",
@@ -198,14 +175,15 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncPhases:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         phase = await async_client.rulesets.phases.update(
             ruleset_phase="http_request_firewall_custom",
-            rules=[{}, {}, {}],
             account_id="account_id",
         )
         assert_matches_type(PhaseUpdateResponse, phase, path=["response"])
@@ -215,24 +193,12 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         phase = await async_client.rulesets.phases.update(
             ruleset_phase="http_request_firewall_custom",
+            account_id="account_id",
+            description="A description for my ruleset.",
+            name="My ruleset",
             rules=[
                 {
-                    "action": "block",
-                    "action_parameters": {
-                        "response": {
-                            "content": '{\n  "success": false,\n  "error": "you have been blocked"\n}',
-                            "content_type": "application/json",
-                            "status_code": 400,
-                        }
-                    },
-                    "description": "Block when the IP address is not 1.1.1.1",
-                    "enabled": True,
-                    "expression": "ip.src ne 1.1.1.1",
                     "id": "3a03d665bac047339bb530ecb439a90d",
-                    "logging": {"enabled": True},
-                    "ref": "my_ref",
-                },
-                {
                     "action": "block",
                     "action_parameters": {
                         "response": {
@@ -241,33 +207,27 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                             "status_code": 400,
                         }
                     },
-                    "description": "Block when the IP address is not 1.1.1.1",
+                    "description": "Block the request.",
                     "enabled": True,
-                    "expression": "ip.src ne 1.1.1.1",
-                    "id": "3a03d665bac047339bb530ecb439a90d",
-                    "logging": {"enabled": True},
-                    "ref": "my_ref",
-                },
-                {
-                    "action": "block",
-                    "action_parameters": {
-                        "response": {
-                            "content": '{\n  "success": false,\n  "error": "you have been blocked"\n}',
-                            "content_type": "application/json",
-                            "status_code": 400,
-                        }
+                    "exposed_credential_check": {
+                        "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                        "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
                     },
-                    "description": "Block when the IP address is not 1.1.1.1",
-                    "enabled": True,
-                    "expression": "ip.src ne 1.1.1.1",
-                    "id": "3a03d665bac047339bb530ecb439a90d",
+                    "expression": "ip.src eq 1.1.1.1",
                     "logging": {"enabled": True},
+                    "ratelimit": {
+                        "characteristics": ["cf.colo.id"],
+                        "period": 60,
+                        "counting_expression": 'http.request.body.raw eq "abcd"',
+                        "mitigation_timeout": 600,
+                        "requests_per_period": 1000,
+                        "requests_to_origin": True,
+                        "score_per_period": 400,
+                        "score_response_header_name": "my-score",
+                    },
                     "ref": "my_ref",
-                },
+                }
             ],
-            account_id="account_id",
-            description="My ruleset to execute managed rulesets",
-            name="My ruleset",
         )
         assert_matches_type(PhaseUpdateResponse, phase, path=["response"])
 
@@ -276,7 +236,6 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.rulesets.phases.with_raw_response.update(
             ruleset_phase="http_request_firewall_custom",
-            rules=[{}, {}, {}],
             account_id="account_id",
         )
 
@@ -290,7 +249,6 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.rulesets.phases.with_streaming_response.update(
             ruleset_phase="http_request_firewall_custom",
-            rules=[{}, {}, {}],
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -304,17 +262,15 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.phases.with_raw_response.update(
                 ruleset_phase="http_request_firewall_custom",
-                rules=[{}, {}, {}],
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.phases.with_raw_response.update(
                 ruleset_phase="http_request_firewall_custom",
-                rules=[{}, {}, {}],
                 account_id="account_id",
             )
 
@@ -367,13 +323,13 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.phases.with_raw_response.get(
                 ruleset_phase="http_request_firewall_custom",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.phases.with_raw_response.get(
                 ruleset_phase="http_request_firewall_custom",
                 account_id="account_id",
diff --git a/tests/api_resources/rulesets/test_rules.py b/tests/api_resources/rulesets/test_rules.py
index 381720e4919..d19c85a55ee 100644
--- a/tests/api_resources/rulesets/test_rules.py
+++ b/tests/api_resources/rulesets/test_rules.py
@@ -45,10 +45,25 @@ def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> N
                     "status_code": 400,
                 }
             },
-            description="Block when the IP address is not 1.1.1.1",
+            description="Block the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -90,13 +105,13 @@ def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -120,10 +135,25 @@ def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> N
             id="3a03d665bac047339bb530ecb439a90d",
             action="challenge",
             action_parameters={},
-            description="Issue an Interactive Challenge if the visitor had not solved an Interactive Challenge prior to the request when the address is not 1.1.1.1",
+            description="Issue an Interactive Challenge if the visitor has not solved an Interactive Challenge prior to the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -165,13 +195,13 @@ def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -195,10 +225,25 @@ def test_method_create_with_all_params_overload_3(self, client: Cloudflare) -> N
             id="3a03d665bac047339bb530ecb439a90d",
             action="compress_response",
             action_parameters={"algorithms": [{"name": "none"}]},
-            description="Disable compression when address is not 1.1.1.1",
+            description="Modify the compression algorithm used in the response.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -240,13 +285,13 @@ def test_path_params_create_overload_3(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -268,37 +313,27 @@ def test_method_create_with_all_params_overload_4(self, client: Cloudflare) -> N
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="execute",
-            action_parameters={
-                "id": "4814384a9e5d4991b9815dcfc25d2f1f",
-                "matched_data": {"public_key": "iGqBmyIUxuWt1rvxoAharN9FUXneUBxA/Y19PyyrEG0="},
-                "overrides": {
-                    "action": "log",
-                    "categories": [
-                        {
-                            "action": "log",
-                            "category": "directory-traversal",
-                            "enabled": True,
-                            "sensitivity_level": "default",
-                        }
-                    ],
-                    "enabled": True,
-                    "rules": [
-                        {
-                            "action": "log",
-                            "enabled": True,
-                            "id": "8ac8bc2a661e475d940980f9317f28e1",
-                            "score_threshold": 0,
-                            "sensitivity_level": "default",
-                        }
-                    ],
-                    "sensitivity_level": "default",
-                },
-            },
-            description="Execute the OWASP ruleset when the IP address is not 1.1.1.1",
+            action="ddos_dynamic",
+            action_parameters={},
+            description="Perform a specific action according to a set of internal guidelines defined by Cloudflare.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -340,13 +375,13 @@ def test_path_params_create_overload_4(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -368,12 +403,52 @@ def test_method_create_with_all_params_overload_5(self, client: Cloudflare) -> N
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="js_challenge",
-            action_parameters={},
-            description="Issue a non-interactive Javascript Challenge if the visitor had not solved a Interactive Challenge, Managed Challenge, or Javascript Challenge prior to the request when the address is not 1.1.1.1",
+            action="execute",
+            action_parameters={
+                "id": "4814384a9e5d4991b9815dcfc25d2f1f",
+                "matched_data": {"public_key": "iGqBmyIUxuWt1rvxoAharN9FUXneUBxA/Y19PyyrEG0="},
+                "overrides": {
+                    "action": "log",
+                    "categories": [
+                        {
+                            "category": "directory-traversal",
+                            "action": "log",
+                            "enabled": True,
+                            "sensitivity_level": "default",
+                        }
+                    ],
+                    "enabled": True,
+                    "rules": [
+                        {
+                            "id": "8ac8bc2a661e475d940980f9317f28e1",
+                            "action": "log",
+                            "enabled": True,
+                            "score_threshold": 0,
+                            "sensitivity_level": "default",
+                        }
+                    ],
+                    "sensitivity_level": "default",
+                },
+            },
+            description="Execute another ruleset.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -415,13 +490,13 @@ def test_path_params_create_overload_5(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -443,12 +518,27 @@ def test_method_create_with_all_params_overload_6(self, client: Cloudflare) -> N
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="log",
+            action="force_connection_close",
             action_parameters={},
-            description="Log when the IP address is not 1.1.1.1",
+            description="Close ongoing HTTP connections. This action does not block a request, but it forces the client to reconnect. For HTTP/2 and HTTP/3 connections, the connection will be closed even if it breaks other requests running on the same connection.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -490,13 +580,13 @@ def test_path_params_create_overload_6(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -518,12 +608,27 @@ def test_method_create_with_all_params_overload_7(self, client: Cloudflare) -> N
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="managed_challenge",
+            action="js_challenge",
             action_parameters={},
-            description="Issue a Managed Challenge if the visitor had not solved a Managed Challenge or Interactive Challenge prior to the request when the address is not 1.1.1.1",
+            description="Issue a non-interactive JavaScript Challenge if the visitor has not solved an Interactive Challenge, Managed Challenge, or JavaScript Challenge prior to the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -565,13 +670,13 @@ def test_path_params_create_overload_7(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -593,22 +698,27 @@ def test_method_create_with_all_params_overload_8(self, client: Cloudflare) -> N
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="redirect",
-            action_parameters={
-                "from_list": {
-                    "key": "http.request.full_uri",
-                    "name": "list1",
-                },
-                "from_value": {
-                    "preserve_query_string": True,
-                    "status_code": 301,
-                    "target_url": {"value": "x"},
-                },
-            },
-            description="Redirect when IP address is not 1.1.1.1",
+            action="log",
+            action_parameters={},
+            description="Log the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -650,13 +760,13 @@ def test_path_params_create_overload_8(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -678,23 +788,43 @@ def test_method_create_with_all_params_overload_9(self, client: Cloudflare) -> N
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="rewrite",
+            action="log_custom_field",
             action_parameters={
-                "headers": {
-                    "client-http-version": {
-                        "expression": "http.request.version",
-                        "operation": "set",
+                "cookie_fields": [{"name": "myCookie"}],
+                "raw_response_fields": [
+                    {
+                        "name": "my-response-header",
+                        "preserve_duplicates": True,
                     }
-                },
-                "uri": {
-                    "path": {"expression": 'regex_replace(http.request.uri.path, "/bar$", "/baz")'},
-                    "query": {"expression": 'regex_replace(http.request.uri.query, "foo=bar", "")'},
-                },
+                ],
+                "request_fields": [{"name": "my-request-header"}],
+                "response_fields": [
+                    {
+                        "name": "my-response-header",
+                        "preserve_duplicates": True,
+                    }
+                ],
+                "transformed_request_fields": [{"name": "my-request-header"}],
             },
-            description="Add a header when the IP address is not 1.1.1.1",
+            description="Log additional custom fields.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -736,13 +866,13 @@ def test_path_params_create_overload_9(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -764,19 +894,27 @@ def test_method_create_with_all_params_overload_10(self, client: Cloudflare) ->
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="route",
-            action_parameters={
-                "host_header": "static.example.com",
-                "origin": {
-                    "host": "static.example.com",
-                    "port": 1,
-                },
-                "sni": {"value": "static.example.com"},
-            },
-            description="Select origin server when IP address is not 1.1.1.1",
+            action="managed_challenge",
+            action_parameters={},
+            description="Issue a Managed Challenge if the visitor has not solved a Managed Challenge or Interactive Challenge prior to the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -818,13 +956,13 @@ def test_path_params_create_overload_10(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -846,12 +984,40 @@ def test_method_create_with_all_params_overload_11(self, client: Cloudflare) ->
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="score",
-            action_parameters={"increment": 3},
-            description="Increment score when the IP address is not 1.1.1.1",
+            action="redirect",
+            action_parameters={
+                "from_list": {
+                    "key": "http.request.full_uri",
+                    "name": "my_list",
+                },
+                "from_value": {
+                    "target_url": {
+                        "expression": 'concat("https://example.com", http.request.uri.path)',
+                        "value": "https://example.com",
+                    },
+                    "preserve_query_string": True,
+                    "status_code": 302,
+                },
+            },
+            description="Redirect the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -893,13 +1059,13 @@ def test_path_params_create_overload_11(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -921,16 +1087,40 @@ def test_method_create_with_all_params_overload_12(self, client: Cloudflare) ->
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="serve_error",
+            action="rewrite",
             action_parameters={
-                "content": '{"error": "1xxx error occurred"}\n',
-                "content_type": "application/json",
-                "status_code": 500,
+                "headers": {
+                    "client-http-version": {
+                        "expression": "http.request.version",
+                        "operation": "set",
+                    }
+                },
+                "uri": {
+                    "path": {
+                        "expression": 'regex_replace(http.request.uri.path, "/foo$", "/bar")',
+                        "value": "/foo",
+                    }
+                },
             },
-            description="Serve a JSON response to api users on error",
+            description="Rewrite properties of the request or response.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -972,13 +1162,13 @@ def test_path_params_create_overload_12(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -1000,34 +1190,34 @@ def test_method_create_with_all_params_overload_13(self, client: Cloudflare) ->
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="set_config",
+            action="route",
             action_parameters={
-                "automatic_https_rewrites": True,
-                "autominify": {
-                    "css": True,
-                    "html": True,
-                    "js": True,
+                "host_header": "static.example.com",
+                "origin": {
+                    "host": "static.example.com",
+                    "port": 80,
                 },
-                "bic": True,
-                "disable_apps": True,
-                "disable_rum": True,
-                "disable_zaraz": True,
-                "email_obfuscation": True,
-                "fonts": True,
-                "hotlink_protection": True,
-                "mirage": True,
-                "opportunistic_encryption": True,
-                "polish": "off",
-                "rocket_loader": True,
-                "security_level": "off",
-                "server_side_excludes": True,
-                "ssl": "off",
-                "sxg": True,
+                "sni": {"value": "static.example.com"},
             },
-            description="Disable Zaraz when IP address is not 1.1.1.1",
+            description="Select an origin server to route the request to.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -1069,13 +1259,13 @@ def test_path_params_create_overload_13(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -1097,18 +1287,27 @@ def test_method_create_with_all_params_overload_14(self, client: Cloudflare) ->
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="skip",
-            action_parameters={
-                "phases": ["http_request_firewall_custom"],
-                "products": ["bic"],
-                "rules": {"4814384a9e5d4991b9815dcfc25d2f1f": ["8ac8bc2a661e475d940980f9317f28e1"]},
-                "ruleset": "current",
-                "rulesets": ["4814384a9e5d4991b9815dcfc25d2f1f"],
-            },
-            description="Skip the current ruleset when the IP address is not 1.1.1.1",
+            action="score",
+            action_parameters={"increment": 3},
+            description="Increment the cumulative score.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -1150,13 +1349,13 @@ def test_path_params_create_overload_14(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -1178,91 +1377,31 @@ def test_method_create_with_all_params_overload_15(self, client: Cloudflare) ->
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="set_cache_settings",
+            action="serve_error",
             action_parameters={
-                "additional_cacheable_ports": [0, 0, 0],
-                "browser_ttl": {
-                    "default": 0,
-                    "mode": "respect_origin",
-                },
-                "cache": True,
-                "cache_key": {
-                    "cache_by_device_type": True,
-                    "cache_deception_armor": True,
-                    "custom_key": {
-                        "cookie": {
-                            "check_presence": ["string", "string", "string"],
-                            "include": ["string", "string", "string"],
-                        },
-                        "header": {
-                            "check_presence": ["string", "string", "string"],
-                            "contains": {"foo": ["string", "string", "string"]},
-                            "exclude_origin": True,
-                            "include": ["string", "string", "string"],
-                        },
-                        "host": {"resolved": True},
-                        "query_string": {
-                            "exclude": {
-                                "all": True,
-                                "list": ["string", "string", "string"],
-                            },
-                            "include": {
-                                "all": True,
-                                "list": ["string", "string", "string"],
-                            },
-                        },
-                        "user": {
-                            "device_type": True,
-                            "geo": True,
-                            "lang": True,
-                        },
-                    },
-                    "ignore_query_strings_order": True,
-                },
-                "cache_reserve": {
-                    "eligible": True,
-                    "min_file_size": 0,
-                },
-                "edge_ttl": {
-                    "default": 0,
-                    "mode": "respect_origin",
-                    "status_code_ttl": [
-                        {
-                            "status_code_range": {
-                                "from": 0,
-                                "to": 0,
-                            },
-                            "status_code_value": 0,
-                            "value": 0,
-                        },
-                        {
-                            "status_code_range": {
-                                "from": 0,
-                                "to": 0,
-                            },
-                            "status_code_value": 0,
-                            "value": 0,
-                        },
-                        {
-                            "status_code_range": {
-                                "from": 0,
-                                "to": 0,
-                            },
-                            "status_code_value": 0,
-                            "value": 0,
-                        },
-                    ],
-                },
-                "origin_cache_control": True,
-                "origin_error_page_passthru": True,
-                "read_timeout": 900,
-                "respect_strong_etags": True,
-                "serve_stale": {"disable_stale_while_updating": True},
+                "content": '{\n  "error": "1xxx error occurred"\n}',
+                "content_type": "application/json",
+                "status_code": 500,
             },
-            description="Set cache settings when the hostname  address is not example.com",
+            description="Customize the serving of errors.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -1304,13 +1443,13 @@ def test_path_params_create_overload_15(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -1332,24 +1471,98 @@ def test_method_create_with_all_params_overload_16(self, client: Cloudflare) ->
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="log_custom_field",
+            action="set_cache_settings",
             action_parameters={
-                "cookie_fields": [{"name": "cookie_name_1"}],
-                "request_fields": [{"name": "http_request_header_name_1_in_lower_case"}],
-                "response_fields": [{"name": "http_response_header_name_1_in_lower_case"}],
-            },
-            description="Log custom field when the IP address is not 1.1.1.1",
-            enabled=True,
-            expression="ip.src ne 1.1.1.1",
-            logging={"enabled": True},
-            ref="my_ref",
-        )
-        assert_matches_type(RuleCreateResponse, rule, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_raw_response_create_overload_16(self, client: Cloudflare) -> None:
-        response = client.rulesets.rules.with_raw_response.create(
+                "additional_cacheable_ports": [8080],
+                "browser_ttl": {
+                    "mode": "override_origin",
+                    "default": 60,
+                },
+                "cache": True,
+                "cache_key": {
+                    "cache_by_device_type": True,
+                    "cache_deception_armor": True,
+                    "custom_key": {
+                        "cookie": {
+                            "check_presence": ["myCookie"],
+                            "include": ["myCookie"],
+                        },
+                        "header": {
+                            "check_presence": ["my-header"],
+                            "contains": {"my-header": ["my-header-value-1", "my-header-value-2"]},
+                            "exclude_origin": True,
+                            "include": ["my-header"],
+                        },
+                        "host": {"resolved": True},
+                        "query_string": {
+                            "exclude": {
+                                "all": True,
+                                "list": ["foo"],
+                            },
+                            "include": {
+                                "all": True,
+                                "list": ["foo"],
+                            },
+                        },
+                        "user": {
+                            "device_type": True,
+                            "geo": True,
+                            "lang": True,
+                        },
+                    },
+                    "ignore_query_strings_order": True,
+                },
+                "cache_reserve": {
+                    "eligible": True,
+                    "minimum_file_size": 1024,
+                },
+                "edge_ttl": {
+                    "mode": "override_origin",
+                    "default": 60,
+                    "status_code_ttl": [
+                        {
+                            "value": 0,
+                            "status_code": 200,
+                            "status_code_range": {
+                                "from": 200,
+                                "to": 299,
+                            },
+                        }
+                    ],
+                },
+                "origin_cache_control": True,
+                "origin_error_page_passthru": True,
+                "read_timeout": 900,
+                "respect_strong_etags": True,
+                "serve_stale": {"disable_stale_while_updating": True},
+            },
+            description="Configure settings for how the response is cached.",
+            enabled=True,
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
+            logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
+            ref="my_ref",
+        )
+        assert_matches_type(RuleCreateResponse, rule, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_create_overload_16(self, client: Cloudflare) -> None:
+        response = client.rulesets.rules.with_raw_response.create(
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
         )
@@ -1383,13 +1596,13 @@ def test_path_params_create_overload_16(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -1411,12 +1624,52 @@ def test_method_create_with_all_params_overload_17(self, client: Cloudflare) ->
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="ddos_dynamic",
-            action_parameters={},
-            description="Performs a specific action according to a set of internal guidelines defined by Cloudflare.",
+            action="set_config",
+            action_parameters={
+                "automatic_https_rewrites": True,
+                "autominify": {
+                    "css": True,
+                    "html": True,
+                    "js": True,
+                },
+                "bic": True,
+                "disable_apps": True,
+                "disable_pay_per_crawl": True,
+                "disable_rum": True,
+                "disable_zaraz": True,
+                "email_obfuscation": True,
+                "fonts": True,
+                "hotlink_protection": True,
+                "mirage": True,
+                "opportunistic_encryption": True,
+                "polish": "off",
+                "request_body_buffering": "standard",
+                "response_body_buffering": "standard",
+                "rocket_loader": True,
+                "security_level": "off",
+                "server_side_excludes": True,
+                "ssl": "off",
+                "sxg": True,
+            },
+            description="Configure settings for the request and response.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -1458,13 +1711,13 @@ def test_path_params_create_overload_17(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -1486,12 +1739,34 @@ def test_method_create_with_all_params_overload_18(self, client: Cloudflare) ->
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="force_connection_close",
-            action_parameters={},
-            description="Closes ongoing HTTP connections. This action does not block a request, but it forces the client to reconnect. For HTTP/2 and HTTP/3 connections, the connection will be closed even if it breaks other requests running on the same connection.",
+            action="skip",
+            action_parameters={
+                "phase": "current",
+                "phases": ["http_request_firewall_custom"],
+                "products": ["bic"],
+                "rules": {"4814384a9e5d4991b9815dcfc25d2f1f": ["8ac8bc2a661e475d940980f9317f28e1"]},
+                "ruleset": "current",
+                "rulesets": ["2f2feab2026849078ba485f918791bdc"],
+            },
+            description="Skip executing rulesets, rules, phases, and other products.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -1533,13 +1808,13 @@ def test_path_params_create_overload_18(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -1612,14 +1887,14 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.delete(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.delete(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -1652,10 +1927,25 @@ def test_method_edit_with_all_params_overload_1(self, client: Cloudflare) -> Non
                     "status_code": 400,
                 }
             },
-            description="Block when the IP address is not 1.1.1.1",
+            description="Block the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -1707,14 +1997,14 @@ def test_path_params_edit_overload_1(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -1741,10 +2031,25 @@ def test_method_edit_with_all_params_overload_2(self, client: Cloudflare) -> Non
             id="3a03d665bac047339bb530ecb439a90d",
             action="challenge",
             action_parameters={},
-            description="Issue an Interactive Challenge if the visitor had not solved an Interactive Challenge prior to the request when the address is not 1.1.1.1",
+            description="Issue an Interactive Challenge if the visitor has not solved an Interactive Challenge prior to the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -1796,14 +2101,14 @@ def test_path_params_edit_overload_2(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -1830,10 +2135,25 @@ def test_method_edit_with_all_params_overload_3(self, client: Cloudflare) -> Non
             id="3a03d665bac047339bb530ecb439a90d",
             action="compress_response",
             action_parameters={"algorithms": [{"name": "none"}]},
-            description="Disable compression when address is not 1.1.1.1",
+            description="Modify the compression algorithm used in the response.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -1885,14 +2205,14 @@ def test_path_params_edit_overload_3(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -1917,37 +2237,27 @@ def test_method_edit_with_all_params_overload_4(self, client: Cloudflare) -> Non
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="execute",
-            action_parameters={
-                "id": "4814384a9e5d4991b9815dcfc25d2f1f",
-                "matched_data": {"public_key": "iGqBmyIUxuWt1rvxoAharN9FUXneUBxA/Y19PyyrEG0="},
-                "overrides": {
-                    "action": "log",
-                    "categories": [
-                        {
-                            "action": "log",
-                            "category": "directory-traversal",
-                            "enabled": True,
-                            "sensitivity_level": "default",
-                        }
-                    ],
-                    "enabled": True,
-                    "rules": [
-                        {
-                            "action": "log",
-                            "enabled": True,
-                            "id": "8ac8bc2a661e475d940980f9317f28e1",
-                            "score_threshold": 0,
-                            "sensitivity_level": "default",
-                        }
-                    ],
-                    "sensitivity_level": "default",
-                },
-            },
-            description="Execute the OWASP ruleset when the IP address is not 1.1.1.1",
+            action="ddos_dynamic",
+            action_parameters={},
+            description="Perform a specific action according to a set of internal guidelines defined by Cloudflare.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -1999,14 +2309,14 @@ def test_path_params_edit_overload_4(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -2031,12 +2341,52 @@ def test_method_edit_with_all_params_overload_5(self, client: Cloudflare) -> Non
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="js_challenge",
-            action_parameters={},
-            description="Issue a non-interactive Javascript Challenge if the visitor had not solved a Interactive Challenge, Managed Challenge, or Javascript Challenge prior to the request when the address is not 1.1.1.1",
+            action="execute",
+            action_parameters={
+                "id": "4814384a9e5d4991b9815dcfc25d2f1f",
+                "matched_data": {"public_key": "iGqBmyIUxuWt1rvxoAharN9FUXneUBxA/Y19PyyrEG0="},
+                "overrides": {
+                    "action": "log",
+                    "categories": [
+                        {
+                            "category": "directory-traversal",
+                            "action": "log",
+                            "enabled": True,
+                            "sensitivity_level": "default",
+                        }
+                    ],
+                    "enabled": True,
+                    "rules": [
+                        {
+                            "id": "8ac8bc2a661e475d940980f9317f28e1",
+                            "action": "log",
+                            "enabled": True,
+                            "score_threshold": 0,
+                            "sensitivity_level": "default",
+                        }
+                    ],
+                    "sensitivity_level": "default",
+                },
+            },
+            description="Execute another ruleset.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -2088,14 +2438,14 @@ def test_path_params_edit_overload_5(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -2120,12 +2470,27 @@ def test_method_edit_with_all_params_overload_6(self, client: Cloudflare) -> Non
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="log",
+            action="force_connection_close",
             action_parameters={},
-            description="Log when the IP address is not 1.1.1.1",
+            description="Close ongoing HTTP connections. This action does not block a request, but it forces the client to reconnect. For HTTP/2 and HTTP/3 connections, the connection will be closed even if it breaks other requests running on the same connection.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -2177,14 +2542,14 @@ def test_path_params_edit_overload_6(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -2209,12 +2574,27 @@ def test_method_edit_with_all_params_overload_7(self, client: Cloudflare) -> Non
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="managed_challenge",
+            action="js_challenge",
             action_parameters={},
-            description="Issue a Managed Challenge if the visitor had not solved a Managed Challenge or Interactive Challenge prior to the request when the address is not 1.1.1.1",
+            description="Issue a non-interactive JavaScript Challenge if the visitor has not solved an Interactive Challenge, Managed Challenge, or JavaScript Challenge prior to the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -2266,14 +2646,14 @@ def test_path_params_edit_overload_7(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -2298,22 +2678,27 @@ def test_method_edit_with_all_params_overload_8(self, client: Cloudflare) -> Non
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="redirect",
-            action_parameters={
-                "from_list": {
-                    "key": "http.request.full_uri",
-                    "name": "list1",
-                },
-                "from_value": {
-                    "preserve_query_string": True,
-                    "status_code": 301,
-                    "target_url": {"value": "x"},
-                },
-            },
-            description="Redirect when IP address is not 1.1.1.1",
+            action="log",
+            action_parameters={},
+            description="Log the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -2365,14 +2750,14 @@ def test_path_params_edit_overload_8(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -2397,23 +2782,43 @@ def test_method_edit_with_all_params_overload_9(self, client: Cloudflare) -> Non
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="rewrite",
+            action="log_custom_field",
             action_parameters={
-                "headers": {
-                    "client-http-version": {
-                        "expression": "http.request.version",
-                        "operation": "set",
+                "cookie_fields": [{"name": "myCookie"}],
+                "raw_response_fields": [
+                    {
+                        "name": "my-response-header",
+                        "preserve_duplicates": True,
                     }
-                },
-                "uri": {
-                    "path": {"expression": 'regex_replace(http.request.uri.path, "/bar$", "/baz")'},
-                    "query": {"expression": 'regex_replace(http.request.uri.query, "foo=bar", "")'},
-                },
+                ],
+                "request_fields": [{"name": "my-request-header"}],
+                "response_fields": [
+                    {
+                        "name": "my-response-header",
+                        "preserve_duplicates": True,
+                    }
+                ],
+                "transformed_request_fields": [{"name": "my-request-header"}],
             },
-            description="Add a header when the IP address is not 1.1.1.1",
+            description="Log additional custom fields.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -2465,14 +2870,14 @@ def test_path_params_edit_overload_9(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -2497,19 +2902,27 @@ def test_method_edit_with_all_params_overload_10(self, client: Cloudflare) -> No
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="route",
-            action_parameters={
-                "host_header": "static.example.com",
-                "origin": {
-                    "host": "static.example.com",
-                    "port": 1,
-                },
-                "sni": {"value": "static.example.com"},
-            },
-            description="Select origin server when IP address is not 1.1.1.1",
+            action="managed_challenge",
+            action_parameters={},
+            description="Issue a Managed Challenge if the visitor has not solved a Managed Challenge or Interactive Challenge prior to the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -2561,14 +2974,14 @@ def test_path_params_edit_overload_10(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -2593,12 +3006,40 @@ def test_method_edit_with_all_params_overload_11(self, client: Cloudflare) -> No
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="score",
-            action_parameters={"increment": 3},
-            description="Increment score when the IP address is not 1.1.1.1",
+            action="redirect",
+            action_parameters={
+                "from_list": {
+                    "key": "http.request.full_uri",
+                    "name": "my_list",
+                },
+                "from_value": {
+                    "target_url": {
+                        "expression": 'concat("https://example.com", http.request.uri.path)',
+                        "value": "https://example.com",
+                    },
+                    "preserve_query_string": True,
+                    "status_code": 302,
+                },
+            },
+            description="Redirect the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -2650,14 +3091,14 @@ def test_path_params_edit_overload_11(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -2682,16 +3123,40 @@ def test_method_edit_with_all_params_overload_12(self, client: Cloudflare) -> No
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="serve_error",
+            action="rewrite",
             action_parameters={
-                "content": '{"error": "1xxx error occurred"}\n',
-                "content_type": "application/json",
-                "status_code": 500,
+                "headers": {
+                    "client-http-version": {
+                        "expression": "http.request.version",
+                        "operation": "set",
+                    }
+                },
+                "uri": {
+                    "path": {
+                        "expression": 'regex_replace(http.request.uri.path, "/foo$", "/bar")',
+                        "value": "/foo",
+                    }
+                },
             },
-            description="Serve a JSON response to api users on error",
+            description="Rewrite properties of the request or response.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -2743,14 +3208,14 @@ def test_path_params_edit_overload_12(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -2775,34 +3240,34 @@ def test_method_edit_with_all_params_overload_13(self, client: Cloudflare) -> No
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="set_config",
+            action="route",
             action_parameters={
-                "automatic_https_rewrites": True,
-                "autominify": {
-                    "css": True,
-                    "html": True,
-                    "js": True,
+                "host_header": "static.example.com",
+                "origin": {
+                    "host": "static.example.com",
+                    "port": 80,
                 },
-                "bic": True,
-                "disable_apps": True,
-                "disable_rum": True,
-                "disable_zaraz": True,
-                "email_obfuscation": True,
-                "fonts": True,
-                "hotlink_protection": True,
-                "mirage": True,
-                "opportunistic_encryption": True,
-                "polish": "off",
-                "rocket_loader": True,
-                "security_level": "off",
-                "server_side_excludes": True,
-                "ssl": "off",
-                "sxg": True,
+                "sni": {"value": "static.example.com"},
             },
-            description="Disable Zaraz when IP address is not 1.1.1.1",
+            description="Select an origin server to route the request to.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -2854,14 +3319,14 @@ def test_path_params_edit_overload_13(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -2886,18 +3351,27 @@ def test_method_edit_with_all_params_overload_14(self, client: Cloudflare) -> No
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="skip",
-            action_parameters={
-                "phases": ["http_request_firewall_custom"],
-                "products": ["bic"],
-                "rules": {"4814384a9e5d4991b9815dcfc25d2f1f": ["8ac8bc2a661e475d940980f9317f28e1"]},
-                "ruleset": "current",
-                "rulesets": ["4814384a9e5d4991b9815dcfc25d2f1f"],
-            },
-            description="Skip the current ruleset when the IP address is not 1.1.1.1",
+            action="score",
+            action_parameters={"increment": 3},
+            description="Increment the cumulative score.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -2949,14 +3423,14 @@ def test_path_params_edit_overload_14(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -2981,91 +3455,31 @@ def test_method_edit_with_all_params_overload_15(self, client: Cloudflare) -> No
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="set_cache_settings",
+            action="serve_error",
             action_parameters={
-                "additional_cacheable_ports": [0, 0, 0],
-                "browser_ttl": {
-                    "default": 0,
-                    "mode": "respect_origin",
-                },
-                "cache": True,
-                "cache_key": {
-                    "cache_by_device_type": True,
-                    "cache_deception_armor": True,
-                    "custom_key": {
-                        "cookie": {
-                            "check_presence": ["string", "string", "string"],
-                            "include": ["string", "string", "string"],
-                        },
-                        "header": {
-                            "check_presence": ["string", "string", "string"],
-                            "contains": {"foo": ["string", "string", "string"]},
-                            "exclude_origin": True,
-                            "include": ["string", "string", "string"],
-                        },
-                        "host": {"resolved": True},
-                        "query_string": {
-                            "exclude": {
-                                "all": True,
-                                "list": ["string", "string", "string"],
-                            },
-                            "include": {
-                                "all": True,
-                                "list": ["string", "string", "string"],
-                            },
-                        },
-                        "user": {
-                            "device_type": True,
-                            "geo": True,
-                            "lang": True,
-                        },
-                    },
-                    "ignore_query_strings_order": True,
-                },
-                "cache_reserve": {
-                    "eligible": True,
-                    "min_file_size": 0,
-                },
-                "edge_ttl": {
-                    "default": 0,
-                    "mode": "respect_origin",
-                    "status_code_ttl": [
-                        {
-                            "status_code_range": {
-                                "from": 0,
-                                "to": 0,
-                            },
-                            "status_code_value": 0,
-                            "value": 0,
-                        },
-                        {
-                            "status_code_range": {
-                                "from": 0,
-                                "to": 0,
-                            },
-                            "status_code_value": 0,
-                            "value": 0,
-                        },
-                        {
-                            "status_code_range": {
-                                "from": 0,
-                                "to": 0,
-                            },
-                            "status_code_value": 0,
-                            "value": 0,
-                        },
-                    ],
-                },
-                "origin_cache_control": True,
-                "origin_error_page_passthru": True,
-                "read_timeout": 900,
-                "respect_strong_etags": True,
-                "serve_stale": {"disable_stale_while_updating": True},
+                "content": '{\n  "error": "1xxx error occurred"\n}',
+                "content_type": "application/json",
+                "status_code": 500,
             },
-            description="Set cache settings when the hostname  address is not example.com",
+            description="Customize the serving of errors.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -3117,14 +3531,14 @@ def test_path_params_edit_overload_15(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -3149,16 +3563,90 @@ def test_method_edit_with_all_params_overload_16(self, client: Cloudflare) -> No
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="log_custom_field",
+            action="set_cache_settings",
             action_parameters={
-                "cookie_fields": [{"name": "cookie_name_1"}],
-                "request_fields": [{"name": "http_request_header_name_1_in_lower_case"}],
-                "response_fields": [{"name": "http_response_header_name_1_in_lower_case"}],
+                "additional_cacheable_ports": [8080],
+                "browser_ttl": {
+                    "mode": "override_origin",
+                    "default": 60,
+                },
+                "cache": True,
+                "cache_key": {
+                    "cache_by_device_type": True,
+                    "cache_deception_armor": True,
+                    "custom_key": {
+                        "cookie": {
+                            "check_presence": ["myCookie"],
+                            "include": ["myCookie"],
+                        },
+                        "header": {
+                            "check_presence": ["my-header"],
+                            "contains": {"my-header": ["my-header-value-1", "my-header-value-2"]},
+                            "exclude_origin": True,
+                            "include": ["my-header"],
+                        },
+                        "host": {"resolved": True},
+                        "query_string": {
+                            "exclude": {
+                                "all": True,
+                                "list": ["foo"],
+                            },
+                            "include": {
+                                "all": True,
+                                "list": ["foo"],
+                            },
+                        },
+                        "user": {
+                            "device_type": True,
+                            "geo": True,
+                            "lang": True,
+                        },
+                    },
+                    "ignore_query_strings_order": True,
+                },
+                "cache_reserve": {
+                    "eligible": True,
+                    "minimum_file_size": 1024,
+                },
+                "edge_ttl": {
+                    "mode": "override_origin",
+                    "default": 60,
+                    "status_code_ttl": [
+                        {
+                            "value": 0,
+                            "status_code": 200,
+                            "status_code_range": {
+                                "from": 200,
+                                "to": 299,
+                            },
+                        }
+                    ],
+                },
+                "origin_cache_control": True,
+                "origin_error_page_passthru": True,
+                "read_timeout": 900,
+                "respect_strong_etags": True,
+                "serve_stale": {"disable_stale_while_updating": True},
             },
-            description="Log custom field when the IP address is not 1.1.1.1",
+            description="Configure settings for how the response is cached.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -3210,14 +3698,14 @@ def test_path_params_edit_overload_16(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -3242,12 +3730,52 @@ def test_method_edit_with_all_params_overload_17(self, client: Cloudflare) -> No
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="ddos_dynamic",
-            action_parameters={},
-            description="Performs a specific action according to a set of internal guidelines defined by Cloudflare.",
+            action="set_config",
+            action_parameters={
+                "automatic_https_rewrites": True,
+                "autominify": {
+                    "css": True,
+                    "html": True,
+                    "js": True,
+                },
+                "bic": True,
+                "disable_apps": True,
+                "disable_pay_per_crawl": True,
+                "disable_rum": True,
+                "disable_zaraz": True,
+                "email_obfuscation": True,
+                "fonts": True,
+                "hotlink_protection": True,
+                "mirage": True,
+                "opportunistic_encryption": True,
+                "polish": "off",
+                "request_body_buffering": "standard",
+                "response_body_buffering": "standard",
+                "rocket_loader": True,
+                "security_level": "off",
+                "server_side_excludes": True,
+                "ssl": "off",
+                "sxg": True,
+            },
+            description="Configure settings for the request and response.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -3299,14 +3827,14 @@ def test_path_params_edit_overload_17(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -3331,12 +3859,34 @@ def test_method_edit_with_all_params_overload_18(self, client: Cloudflare) -> No
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="force_connection_close",
-            action_parameters={},
-            description="Closes ongoing HTTP connections. This action does not block a request, but it forces the client to reconnect. For HTTP/2 and HTTP/3 connections, the connection will be closed even if it breaks other requests running on the same connection.",
+            action="skip",
+            action_parameters={
+                "phase": "current",
+                "phases": ["http_request_firewall_custom"],
+                "products": ["bic"],
+                "rules": {"4814384a9e5d4991b9815dcfc25d2f1f": ["8ac8bc2a661e475d940980f9317f28e1"]},
+                "ruleset": "current",
+                "rulesets": ["2f2feab2026849078ba485f918791bdc"],
+            },
+            description="Skip executing rulesets, rules, phases, and other products.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -3388,14 +3938,14 @@ def test_path_params_edit_overload_18(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -3404,7 +3954,9 @@ def test_path_params_edit_overload_18(self, client: Cloudflare) -> None:
 
 
 class TestAsyncRules:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -3430,10 +3982,25 @@ async def test_method_create_with_all_params_overload_1(self, async_client: Asyn
                     "status_code": 400,
                 }
             },
-            description="Block when the IP address is not 1.1.1.1",
+            description="Block the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -3475,13 +4042,13 @@ async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -3505,10 +4072,25 @@ async def test_method_create_with_all_params_overload_2(self, async_client: Asyn
             id="3a03d665bac047339bb530ecb439a90d",
             action="challenge",
             action_parameters={},
-            description="Issue an Interactive Challenge if the visitor had not solved an Interactive Challenge prior to the request when the address is not 1.1.1.1",
+            description="Issue an Interactive Challenge if the visitor has not solved an Interactive Challenge prior to the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -3550,13 +4132,13 @@ async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -3580,10 +4162,25 @@ async def test_method_create_with_all_params_overload_3(self, async_client: Asyn
             id="3a03d665bac047339bb530ecb439a90d",
             action="compress_response",
             action_parameters={"algorithms": [{"name": "none"}]},
-            description="Disable compression when address is not 1.1.1.1",
+            description="Modify the compression algorithm used in the response.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -3625,13 +4222,13 @@ async def test_path_params_create_overload_3(self, async_client: AsyncCloudflare
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -3653,37 +4250,27 @@ async def test_method_create_with_all_params_overload_4(self, async_client: Asyn
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="execute",
-            action_parameters={
-                "id": "4814384a9e5d4991b9815dcfc25d2f1f",
-                "matched_data": {"public_key": "iGqBmyIUxuWt1rvxoAharN9FUXneUBxA/Y19PyyrEG0="},
-                "overrides": {
-                    "action": "log",
-                    "categories": [
-                        {
-                            "action": "log",
-                            "category": "directory-traversal",
-                            "enabled": True,
-                            "sensitivity_level": "default",
-                        }
-                    ],
-                    "enabled": True,
-                    "rules": [
-                        {
-                            "action": "log",
-                            "enabled": True,
-                            "id": "8ac8bc2a661e475d940980f9317f28e1",
-                            "score_threshold": 0,
-                            "sensitivity_level": "default",
-                        }
-                    ],
-                    "sensitivity_level": "default",
-                },
-            },
-            description="Execute the OWASP ruleset when the IP address is not 1.1.1.1",
+            action="ddos_dynamic",
+            action_parameters={},
+            description="Perform a specific action according to a set of internal guidelines defined by Cloudflare.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -3725,13 +4312,13 @@ async def test_path_params_create_overload_4(self, async_client: AsyncCloudflare
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -3753,12 +4340,52 @@ async def test_method_create_with_all_params_overload_5(self, async_client: Asyn
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="js_challenge",
-            action_parameters={},
-            description="Issue a non-interactive Javascript Challenge if the visitor had not solved a Interactive Challenge, Managed Challenge, or Javascript Challenge prior to the request when the address is not 1.1.1.1",
+            action="execute",
+            action_parameters={
+                "id": "4814384a9e5d4991b9815dcfc25d2f1f",
+                "matched_data": {"public_key": "iGqBmyIUxuWt1rvxoAharN9FUXneUBxA/Y19PyyrEG0="},
+                "overrides": {
+                    "action": "log",
+                    "categories": [
+                        {
+                            "category": "directory-traversal",
+                            "action": "log",
+                            "enabled": True,
+                            "sensitivity_level": "default",
+                        }
+                    ],
+                    "enabled": True,
+                    "rules": [
+                        {
+                            "id": "8ac8bc2a661e475d940980f9317f28e1",
+                            "action": "log",
+                            "enabled": True,
+                            "score_threshold": 0,
+                            "sensitivity_level": "default",
+                        }
+                    ],
+                    "sensitivity_level": "default",
+                },
+            },
+            description="Execute another ruleset.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -3800,13 +4427,13 @@ async def test_path_params_create_overload_5(self, async_client: AsyncCloudflare
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -3828,12 +4455,27 @@ async def test_method_create_with_all_params_overload_6(self, async_client: Asyn
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="log",
+            action="force_connection_close",
             action_parameters={},
-            description="Log when the IP address is not 1.1.1.1",
+            description="Close ongoing HTTP connections. This action does not block a request, but it forces the client to reconnect. For HTTP/2 and HTTP/3 connections, the connection will be closed even if it breaks other requests running on the same connection.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -3875,13 +4517,13 @@ async def test_path_params_create_overload_6(self, async_client: AsyncCloudflare
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -3903,12 +4545,27 @@ async def test_method_create_with_all_params_overload_7(self, async_client: Asyn
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="managed_challenge",
+            action="js_challenge",
             action_parameters={},
-            description="Issue a Managed Challenge if the visitor had not solved a Managed Challenge or Interactive Challenge prior to the request when the address is not 1.1.1.1",
+            description="Issue a non-interactive JavaScript Challenge if the visitor has not solved an Interactive Challenge, Managed Challenge, or JavaScript Challenge prior to the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -3950,13 +4607,13 @@ async def test_path_params_create_overload_7(self, async_client: AsyncCloudflare
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -3978,22 +4635,27 @@ async def test_method_create_with_all_params_overload_8(self, async_client: Asyn
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="redirect",
-            action_parameters={
-                "from_list": {
-                    "key": "http.request.full_uri",
-                    "name": "list1",
-                },
-                "from_value": {
-                    "preserve_query_string": True,
-                    "status_code": 301,
-                    "target_url": {"value": "x"},
-                },
-            },
-            description="Redirect when IP address is not 1.1.1.1",
+            action="log",
+            action_parameters={},
+            description="Log the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -4035,13 +4697,13 @@ async def test_path_params_create_overload_8(self, async_client: AsyncCloudflare
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -4063,23 +4725,43 @@ async def test_method_create_with_all_params_overload_9(self, async_client: Asyn
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="rewrite",
+            action="log_custom_field",
             action_parameters={
-                "headers": {
-                    "client-http-version": {
-                        "expression": "http.request.version",
-                        "operation": "set",
+                "cookie_fields": [{"name": "myCookie"}],
+                "raw_response_fields": [
+                    {
+                        "name": "my-response-header",
+                        "preserve_duplicates": True,
                     }
-                },
-                "uri": {
-                    "path": {"expression": 'regex_replace(http.request.uri.path, "/bar$", "/baz")'},
-                    "query": {"expression": 'regex_replace(http.request.uri.query, "foo=bar", "")'},
-                },
+                ],
+                "request_fields": [{"name": "my-request-header"}],
+                "response_fields": [
+                    {
+                        "name": "my-response-header",
+                        "preserve_duplicates": True,
+                    }
+                ],
+                "transformed_request_fields": [{"name": "my-request-header"}],
             },
-            description="Add a header when the IP address is not 1.1.1.1",
+            description="Log additional custom fields.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -4121,13 +4803,13 @@ async def test_path_params_create_overload_9(self, async_client: AsyncCloudflare
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -4149,19 +4831,27 @@ async def test_method_create_with_all_params_overload_10(self, async_client: Asy
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="route",
-            action_parameters={
-                "host_header": "static.example.com",
-                "origin": {
-                    "host": "static.example.com",
-                    "port": 1,
-                },
-                "sni": {"value": "static.example.com"},
-            },
-            description="Select origin server when IP address is not 1.1.1.1",
+            action="managed_challenge",
+            action_parameters={},
+            description="Issue a Managed Challenge if the visitor has not solved a Managed Challenge or Interactive Challenge prior to the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -4203,13 +4893,13 @@ async def test_path_params_create_overload_10(self, async_client: AsyncCloudflar
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -4231,12 +4921,40 @@ async def test_method_create_with_all_params_overload_11(self, async_client: Asy
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="score",
-            action_parameters={"increment": 3},
-            description="Increment score when the IP address is not 1.1.1.1",
+            action="redirect",
+            action_parameters={
+                "from_list": {
+                    "key": "http.request.full_uri",
+                    "name": "my_list",
+                },
+                "from_value": {
+                    "target_url": {
+                        "expression": 'concat("https://example.com", http.request.uri.path)',
+                        "value": "https://example.com",
+                    },
+                    "preserve_query_string": True,
+                    "status_code": 302,
+                },
+            },
+            description="Redirect the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -4278,13 +4996,13 @@ async def test_path_params_create_overload_11(self, async_client: AsyncCloudflar
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -4306,16 +5024,40 @@ async def test_method_create_with_all_params_overload_12(self, async_client: Asy
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="serve_error",
+            action="rewrite",
             action_parameters={
-                "content": '{"error": "1xxx error occurred"}\n',
-                "content_type": "application/json",
-                "status_code": 500,
+                "headers": {
+                    "client-http-version": {
+                        "expression": "http.request.version",
+                        "operation": "set",
+                    }
+                },
+                "uri": {
+                    "path": {
+                        "expression": 'regex_replace(http.request.uri.path, "/foo$", "/bar")',
+                        "value": "/foo",
+                    }
+                },
             },
-            description="Serve a JSON response to api users on error",
+            description="Rewrite properties of the request or response.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -4357,13 +5099,13 @@ async def test_path_params_create_overload_12(self, async_client: AsyncCloudflar
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -4385,34 +5127,34 @@ async def test_method_create_with_all_params_overload_13(self, async_client: Asy
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="set_config",
+            action="route",
             action_parameters={
-                "automatic_https_rewrites": True,
-                "autominify": {
-                    "css": True,
-                    "html": True,
-                    "js": True,
+                "host_header": "static.example.com",
+                "origin": {
+                    "host": "static.example.com",
+                    "port": 80,
                 },
-                "bic": True,
-                "disable_apps": True,
-                "disable_rum": True,
-                "disable_zaraz": True,
-                "email_obfuscation": True,
-                "fonts": True,
-                "hotlink_protection": True,
-                "mirage": True,
-                "opportunistic_encryption": True,
-                "polish": "off",
-                "rocket_loader": True,
-                "security_level": "off",
-                "server_side_excludes": True,
-                "ssl": "off",
-                "sxg": True,
+                "sni": {"value": "static.example.com"},
             },
-            description="Disable Zaraz when IP address is not 1.1.1.1",
+            description="Select an origin server to route the request to.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -4454,13 +5196,13 @@ async def test_path_params_create_overload_13(self, async_client: AsyncCloudflar
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -4482,18 +5224,27 @@ async def test_method_create_with_all_params_overload_14(self, async_client: Asy
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="skip",
-            action_parameters={
-                "phases": ["http_request_firewall_custom"],
-                "products": ["bic"],
-                "rules": {"4814384a9e5d4991b9815dcfc25d2f1f": ["8ac8bc2a661e475d940980f9317f28e1"]},
-                "ruleset": "current",
-                "rulesets": ["4814384a9e5d4991b9815dcfc25d2f1f"],
-            },
-            description="Skip the current ruleset when the IP address is not 1.1.1.1",
+            action="score",
+            action_parameters={"increment": 3},
+            description="Increment the cumulative score.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -4535,13 +5286,13 @@ async def test_path_params_create_overload_14(self, async_client: AsyncCloudflar
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -4563,91 +5314,31 @@ async def test_method_create_with_all_params_overload_15(self, async_client: Asy
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="set_cache_settings",
+            action="serve_error",
             action_parameters={
-                "additional_cacheable_ports": [0, 0, 0],
-                "browser_ttl": {
-                    "default": 0,
-                    "mode": "respect_origin",
-                },
-                "cache": True,
-                "cache_key": {
-                    "cache_by_device_type": True,
-                    "cache_deception_armor": True,
-                    "custom_key": {
-                        "cookie": {
-                            "check_presence": ["string", "string", "string"],
-                            "include": ["string", "string", "string"],
-                        },
-                        "header": {
-                            "check_presence": ["string", "string", "string"],
-                            "contains": {"foo": ["string", "string", "string"]},
-                            "exclude_origin": True,
-                            "include": ["string", "string", "string"],
-                        },
-                        "host": {"resolved": True},
-                        "query_string": {
-                            "exclude": {
-                                "all": True,
-                                "list": ["string", "string", "string"],
-                            },
-                            "include": {
-                                "all": True,
-                                "list": ["string", "string", "string"],
-                            },
-                        },
-                        "user": {
-                            "device_type": True,
-                            "geo": True,
-                            "lang": True,
-                        },
-                    },
-                    "ignore_query_strings_order": True,
-                },
-                "cache_reserve": {
-                    "eligible": True,
-                    "min_file_size": 0,
-                },
-                "edge_ttl": {
-                    "default": 0,
-                    "mode": "respect_origin",
-                    "status_code_ttl": [
-                        {
-                            "status_code_range": {
-                                "from": 0,
-                                "to": 0,
-                            },
-                            "status_code_value": 0,
-                            "value": 0,
-                        },
-                        {
-                            "status_code_range": {
-                                "from": 0,
-                                "to": 0,
-                            },
-                            "status_code_value": 0,
-                            "value": 0,
-                        },
-                        {
-                            "status_code_range": {
-                                "from": 0,
-                                "to": 0,
-                            },
-                            "status_code_value": 0,
-                            "value": 0,
-                        },
-                    ],
-                },
-                "origin_cache_control": True,
-                "origin_error_page_passthru": True,
-                "read_timeout": 900,
-                "respect_strong_etags": True,
-                "serve_stale": {"disable_stale_while_updating": True},
+                "content": '{\n  "error": "1xxx error occurred"\n}',
+                "content_type": "application/json",
+                "status_code": 500,
             },
-            description="Set cache settings when the hostname  address is not example.com",
+            description="Customize the serving of errors.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -4689,13 +5380,13 @@ async def test_path_params_create_overload_15(self, async_client: AsyncCloudflar
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -4717,16 +5408,90 @@ async def test_method_create_with_all_params_overload_16(self, async_client: Asy
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="log_custom_field",
+            action="set_cache_settings",
             action_parameters={
-                "cookie_fields": [{"name": "cookie_name_1"}],
-                "request_fields": [{"name": "http_request_header_name_1_in_lower_case"}],
-                "response_fields": [{"name": "http_response_header_name_1_in_lower_case"}],
+                "additional_cacheable_ports": [8080],
+                "browser_ttl": {
+                    "mode": "override_origin",
+                    "default": 60,
+                },
+                "cache": True,
+                "cache_key": {
+                    "cache_by_device_type": True,
+                    "cache_deception_armor": True,
+                    "custom_key": {
+                        "cookie": {
+                            "check_presence": ["myCookie"],
+                            "include": ["myCookie"],
+                        },
+                        "header": {
+                            "check_presence": ["my-header"],
+                            "contains": {"my-header": ["my-header-value-1", "my-header-value-2"]},
+                            "exclude_origin": True,
+                            "include": ["my-header"],
+                        },
+                        "host": {"resolved": True},
+                        "query_string": {
+                            "exclude": {
+                                "all": True,
+                                "list": ["foo"],
+                            },
+                            "include": {
+                                "all": True,
+                                "list": ["foo"],
+                            },
+                        },
+                        "user": {
+                            "device_type": True,
+                            "geo": True,
+                            "lang": True,
+                        },
+                    },
+                    "ignore_query_strings_order": True,
+                },
+                "cache_reserve": {
+                    "eligible": True,
+                    "minimum_file_size": 1024,
+                },
+                "edge_ttl": {
+                    "mode": "override_origin",
+                    "default": 60,
+                    "status_code_ttl": [
+                        {
+                            "value": 0,
+                            "status_code": 200,
+                            "status_code_range": {
+                                "from": 200,
+                                "to": 299,
+                            },
+                        }
+                    ],
+                },
+                "origin_cache_control": True,
+                "origin_error_page_passthru": True,
+                "read_timeout": 900,
+                "respect_strong_etags": True,
+                "serve_stale": {"disable_stale_while_updating": True},
             },
-            description="Log custom field when the IP address is not 1.1.1.1",
+            description="Configure settings for how the response is cached.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -4768,13 +5533,13 @@ async def test_path_params_create_overload_16(self, async_client: AsyncCloudflar
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -4796,12 +5561,52 @@ async def test_method_create_with_all_params_overload_17(self, async_client: Asy
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="ddos_dynamic",
-            action_parameters={},
-            description="Performs a specific action according to a set of internal guidelines defined by Cloudflare.",
+            action="set_config",
+            action_parameters={
+                "automatic_https_rewrites": True,
+                "autominify": {
+                    "css": True,
+                    "html": True,
+                    "js": True,
+                },
+                "bic": True,
+                "disable_apps": True,
+                "disable_pay_per_crawl": True,
+                "disable_rum": True,
+                "disable_zaraz": True,
+                "email_obfuscation": True,
+                "fonts": True,
+                "hotlink_protection": True,
+                "mirage": True,
+                "opportunistic_encryption": True,
+                "polish": "off",
+                "request_body_buffering": "standard",
+                "response_body_buffering": "standard",
+                "rocket_loader": True,
+                "security_level": "off",
+                "server_side_excludes": True,
+                "ssl": "off",
+                "sxg": True,
+            },
+            description="Configure settings for the request and response.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -4843,13 +5648,13 @@ async def test_path_params_create_overload_17(self, async_client: AsyncCloudflar
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -4871,12 +5676,34 @@ async def test_method_create_with_all_params_overload_18(self, async_client: Asy
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="force_connection_close",
-            action_parameters={},
-            description="Closes ongoing HTTP connections. This action does not block a request, but it forces the client to reconnect. For HTTP/2 and HTTP/3 connections, the connection will be closed even if it breaks other requests running on the same connection.",
+            action="skip",
+            action_parameters={
+                "phase": "current",
+                "phases": ["http_request_firewall_custom"],
+                "products": ["bic"],
+                "rules": {"4814384a9e5d4991b9815dcfc25d2f1f": ["8ac8bc2a661e475d940980f9317f28e1"]},
+                "ruleset": "current",
+                "rulesets": ["2f2feab2026849078ba485f918791bdc"],
+            },
+            description="Skip executing rulesets, rules, phases, and other products.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleCreateResponse, rule, path=["response"])
@@ -4918,13 +5745,13 @@ async def test_path_params_create_overload_18(self, async_client: AsyncCloudflar
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.create(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -4997,14 +5824,14 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.delete(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.delete(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -5037,10 +5864,25 @@ async def test_method_edit_with_all_params_overload_1(self, async_client: AsyncC
                     "status_code": 400,
                 }
             },
-            description="Block when the IP address is not 1.1.1.1",
+            description="Block the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -5092,14 +5934,14 @@ async def test_path_params_edit_overload_1(self, async_client: AsyncCloudflare)
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -5126,10 +5968,25 @@ async def test_method_edit_with_all_params_overload_2(self, async_client: AsyncC
             id="3a03d665bac047339bb530ecb439a90d",
             action="challenge",
             action_parameters={},
-            description="Issue an Interactive Challenge if the visitor had not solved an Interactive Challenge prior to the request when the address is not 1.1.1.1",
+            description="Issue an Interactive Challenge if the visitor has not solved an Interactive Challenge prior to the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -5181,14 +6038,14 @@ async def test_path_params_edit_overload_2(self, async_client: AsyncCloudflare)
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -5215,10 +6072,25 @@ async def test_method_edit_with_all_params_overload_3(self, async_client: AsyncC
             id="3a03d665bac047339bb530ecb439a90d",
             action="compress_response",
             action_parameters={"algorithms": [{"name": "none"}]},
-            description="Disable compression when address is not 1.1.1.1",
+            description="Modify the compression algorithm used in the response.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -5270,14 +6142,14 @@ async def test_path_params_edit_overload_3(self, async_client: AsyncCloudflare)
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -5302,37 +6174,27 @@ async def test_method_edit_with_all_params_overload_4(self, async_client: AsyncC
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="execute",
-            action_parameters={
-                "id": "4814384a9e5d4991b9815dcfc25d2f1f",
-                "matched_data": {"public_key": "iGqBmyIUxuWt1rvxoAharN9FUXneUBxA/Y19PyyrEG0="},
-                "overrides": {
-                    "action": "log",
-                    "categories": [
-                        {
-                            "action": "log",
-                            "category": "directory-traversal",
-                            "enabled": True,
-                            "sensitivity_level": "default",
-                        }
-                    ],
-                    "enabled": True,
-                    "rules": [
-                        {
-                            "action": "log",
-                            "enabled": True,
-                            "id": "8ac8bc2a661e475d940980f9317f28e1",
-                            "score_threshold": 0,
-                            "sensitivity_level": "default",
-                        }
-                    ],
-                    "sensitivity_level": "default",
-                },
-            },
-            description="Execute the OWASP ruleset when the IP address is not 1.1.1.1",
+            action="ddos_dynamic",
+            action_parameters={},
+            description="Perform a specific action according to a set of internal guidelines defined by Cloudflare.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -5384,14 +6246,14 @@ async def test_path_params_edit_overload_4(self, async_client: AsyncCloudflare)
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -5416,12 +6278,52 @@ async def test_method_edit_with_all_params_overload_5(self, async_client: AsyncC
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="js_challenge",
-            action_parameters={},
-            description="Issue a non-interactive Javascript Challenge if the visitor had not solved a Interactive Challenge, Managed Challenge, or Javascript Challenge prior to the request when the address is not 1.1.1.1",
+            action="execute",
+            action_parameters={
+                "id": "4814384a9e5d4991b9815dcfc25d2f1f",
+                "matched_data": {"public_key": "iGqBmyIUxuWt1rvxoAharN9FUXneUBxA/Y19PyyrEG0="},
+                "overrides": {
+                    "action": "log",
+                    "categories": [
+                        {
+                            "category": "directory-traversal",
+                            "action": "log",
+                            "enabled": True,
+                            "sensitivity_level": "default",
+                        }
+                    ],
+                    "enabled": True,
+                    "rules": [
+                        {
+                            "id": "8ac8bc2a661e475d940980f9317f28e1",
+                            "action": "log",
+                            "enabled": True,
+                            "score_threshold": 0,
+                            "sensitivity_level": "default",
+                        }
+                    ],
+                    "sensitivity_level": "default",
+                },
+            },
+            description="Execute another ruleset.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -5473,14 +6375,14 @@ async def test_path_params_edit_overload_5(self, async_client: AsyncCloudflare)
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -5505,12 +6407,27 @@ async def test_method_edit_with_all_params_overload_6(self, async_client: AsyncC
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="log",
+            action="force_connection_close",
             action_parameters={},
-            description="Log when the IP address is not 1.1.1.1",
+            description="Close ongoing HTTP connections. This action does not block a request, but it forces the client to reconnect. For HTTP/2 and HTTP/3 connections, the connection will be closed even if it breaks other requests running on the same connection.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -5562,14 +6479,14 @@ async def test_path_params_edit_overload_6(self, async_client: AsyncCloudflare)
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -5594,12 +6511,27 @@ async def test_method_edit_with_all_params_overload_7(self, async_client: AsyncC
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="managed_challenge",
+            action="js_challenge",
             action_parameters={},
-            description="Issue a Managed Challenge if the visitor had not solved a Managed Challenge or Interactive Challenge prior to the request when the address is not 1.1.1.1",
+            description="Issue a non-interactive JavaScript Challenge if the visitor has not solved an Interactive Challenge, Managed Challenge, or JavaScript Challenge prior to the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -5651,14 +6583,14 @@ async def test_path_params_edit_overload_7(self, async_client: AsyncCloudflare)
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -5683,22 +6615,27 @@ async def test_method_edit_with_all_params_overload_8(self, async_client: AsyncC
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="redirect",
-            action_parameters={
-                "from_list": {
-                    "key": "http.request.full_uri",
-                    "name": "list1",
-                },
-                "from_value": {
-                    "preserve_query_string": True,
-                    "status_code": 301,
-                    "target_url": {"value": "x"},
-                },
-            },
-            description="Redirect when IP address is not 1.1.1.1",
+            action="log",
+            action_parameters={},
+            description="Log the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -5750,14 +6687,14 @@ async def test_path_params_edit_overload_8(self, async_client: AsyncCloudflare)
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -5782,23 +6719,43 @@ async def test_method_edit_with_all_params_overload_9(self, async_client: AsyncC
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="rewrite",
+            action="log_custom_field",
             action_parameters={
-                "headers": {
-                    "client-http-version": {
-                        "expression": "http.request.version",
-                        "operation": "set",
+                "cookie_fields": [{"name": "myCookie"}],
+                "raw_response_fields": [
+                    {
+                        "name": "my-response-header",
+                        "preserve_duplicates": True,
                     }
-                },
-                "uri": {
-                    "path": {"expression": 'regex_replace(http.request.uri.path, "/bar$", "/baz")'},
-                    "query": {"expression": 'regex_replace(http.request.uri.query, "foo=bar", "")'},
-                },
+                ],
+                "request_fields": [{"name": "my-request-header"}],
+                "response_fields": [
+                    {
+                        "name": "my-response-header",
+                        "preserve_duplicates": True,
+                    }
+                ],
+                "transformed_request_fields": [{"name": "my-request-header"}],
             },
-            description="Add a header when the IP address is not 1.1.1.1",
+            description="Log additional custom fields.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -5850,14 +6807,14 @@ async def test_path_params_edit_overload_9(self, async_client: AsyncCloudflare)
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -5882,19 +6839,27 @@ async def test_method_edit_with_all_params_overload_10(self, async_client: Async
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="route",
-            action_parameters={
-                "host_header": "static.example.com",
-                "origin": {
-                    "host": "static.example.com",
-                    "port": 1,
-                },
-                "sni": {"value": "static.example.com"},
-            },
-            description="Select origin server when IP address is not 1.1.1.1",
+            action="managed_challenge",
+            action_parameters={},
+            description="Issue a Managed Challenge if the visitor has not solved a Managed Challenge or Interactive Challenge prior to the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -5946,14 +6911,14 @@ async def test_path_params_edit_overload_10(self, async_client: AsyncCloudflare)
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -5978,12 +6943,40 @@ async def test_method_edit_with_all_params_overload_11(self, async_client: Async
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="score",
-            action_parameters={"increment": 3},
-            description="Increment score when the IP address is not 1.1.1.1",
+            action="redirect",
+            action_parameters={
+                "from_list": {
+                    "key": "http.request.full_uri",
+                    "name": "my_list",
+                },
+                "from_value": {
+                    "target_url": {
+                        "expression": 'concat("https://example.com", http.request.uri.path)',
+                        "value": "https://example.com",
+                    },
+                    "preserve_query_string": True,
+                    "status_code": 302,
+                },
+            },
+            description="Redirect the request.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -6035,14 +7028,14 @@ async def test_path_params_edit_overload_11(self, async_client: AsyncCloudflare)
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -6067,16 +7060,40 @@ async def test_method_edit_with_all_params_overload_12(self, async_client: Async
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="serve_error",
+            action="rewrite",
             action_parameters={
-                "content": '{"error": "1xxx error occurred"}\n',
-                "content_type": "application/json",
-                "status_code": 500,
+                "headers": {
+                    "client-http-version": {
+                        "expression": "http.request.version",
+                        "operation": "set",
+                    }
+                },
+                "uri": {
+                    "path": {
+                        "expression": 'regex_replace(http.request.uri.path, "/foo$", "/bar")',
+                        "value": "/foo",
+                    }
+                },
             },
-            description="Serve a JSON response to api users on error",
+            description="Rewrite properties of the request or response.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -6128,14 +7145,14 @@ async def test_path_params_edit_overload_12(self, async_client: AsyncCloudflare)
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -6160,34 +7177,34 @@ async def test_method_edit_with_all_params_overload_13(self, async_client: Async
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="set_config",
+            action="route",
             action_parameters={
-                "automatic_https_rewrites": True,
-                "autominify": {
-                    "css": True,
-                    "html": True,
-                    "js": True,
+                "host_header": "static.example.com",
+                "origin": {
+                    "host": "static.example.com",
+                    "port": 80,
                 },
-                "bic": True,
-                "disable_apps": True,
-                "disable_rum": True,
-                "disable_zaraz": True,
-                "email_obfuscation": True,
-                "fonts": True,
-                "hotlink_protection": True,
-                "mirage": True,
-                "opportunistic_encryption": True,
-                "polish": "off",
-                "rocket_loader": True,
-                "security_level": "off",
-                "server_side_excludes": True,
-                "ssl": "off",
-                "sxg": True,
+                "sni": {"value": "static.example.com"},
             },
-            description="Disable Zaraz when IP address is not 1.1.1.1",
+            description="Select an origin server to route the request to.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -6239,14 +7256,14 @@ async def test_path_params_edit_overload_13(self, async_client: AsyncCloudflare)
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -6271,18 +7288,27 @@ async def test_method_edit_with_all_params_overload_14(self, async_client: Async
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="skip",
-            action_parameters={
-                "phases": ["http_request_firewall_custom"],
-                "products": ["bic"],
-                "rules": {"4814384a9e5d4991b9815dcfc25d2f1f": ["8ac8bc2a661e475d940980f9317f28e1"]},
-                "ruleset": "current",
-                "rulesets": ["4814384a9e5d4991b9815dcfc25d2f1f"],
-            },
-            description="Skip the current ruleset when the IP address is not 1.1.1.1",
+            action="score",
+            action_parameters={"increment": 3},
+            description="Increment the cumulative score.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -6334,14 +7360,14 @@ async def test_path_params_edit_overload_14(self, async_client: AsyncCloudflare)
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -6366,91 +7392,31 @@ async def test_method_edit_with_all_params_overload_15(self, async_client: Async
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="set_cache_settings",
+            action="serve_error",
             action_parameters={
-                "additional_cacheable_ports": [0, 0, 0],
-                "browser_ttl": {
-                    "default": 0,
-                    "mode": "respect_origin",
-                },
-                "cache": True,
-                "cache_key": {
-                    "cache_by_device_type": True,
-                    "cache_deception_armor": True,
-                    "custom_key": {
-                        "cookie": {
-                            "check_presence": ["string", "string", "string"],
-                            "include": ["string", "string", "string"],
-                        },
-                        "header": {
-                            "check_presence": ["string", "string", "string"],
-                            "contains": {"foo": ["string", "string", "string"]},
-                            "exclude_origin": True,
-                            "include": ["string", "string", "string"],
-                        },
-                        "host": {"resolved": True},
-                        "query_string": {
-                            "exclude": {
-                                "all": True,
-                                "list": ["string", "string", "string"],
-                            },
-                            "include": {
-                                "all": True,
-                                "list": ["string", "string", "string"],
-                            },
-                        },
-                        "user": {
-                            "device_type": True,
-                            "geo": True,
-                            "lang": True,
-                        },
-                    },
-                    "ignore_query_strings_order": True,
-                },
-                "cache_reserve": {
-                    "eligible": True,
-                    "min_file_size": 0,
-                },
-                "edge_ttl": {
-                    "default": 0,
-                    "mode": "respect_origin",
-                    "status_code_ttl": [
-                        {
-                            "status_code_range": {
-                                "from": 0,
-                                "to": 0,
-                            },
-                            "status_code_value": 0,
-                            "value": 0,
-                        },
-                        {
-                            "status_code_range": {
-                                "from": 0,
-                                "to": 0,
-                            },
-                            "status_code_value": 0,
-                            "value": 0,
-                        },
-                        {
-                            "status_code_range": {
-                                "from": 0,
-                                "to": 0,
-                            },
-                            "status_code_value": 0,
-                            "value": 0,
-                        },
-                    ],
-                },
-                "origin_cache_control": True,
-                "origin_error_page_passthru": True,
-                "read_timeout": 900,
-                "respect_strong_etags": True,
-                "serve_stale": {"disable_stale_while_updating": True},
+                "content": '{\n  "error": "1xxx error occurred"\n}',
+                "content_type": "application/json",
+                "status_code": 500,
             },
-            description="Set cache settings when the hostname  address is not example.com",
+            description="Customize the serving of errors.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -6502,14 +7468,14 @@ async def test_path_params_edit_overload_15(self, async_client: AsyncCloudflare)
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -6534,16 +7500,90 @@ async def test_method_edit_with_all_params_overload_16(self, async_client: Async
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="log_custom_field",
+            action="set_cache_settings",
             action_parameters={
-                "cookie_fields": [{"name": "cookie_name_1"}],
-                "request_fields": [{"name": "http_request_header_name_1_in_lower_case"}],
-                "response_fields": [{"name": "http_response_header_name_1_in_lower_case"}],
+                "additional_cacheable_ports": [8080],
+                "browser_ttl": {
+                    "mode": "override_origin",
+                    "default": 60,
+                },
+                "cache": True,
+                "cache_key": {
+                    "cache_by_device_type": True,
+                    "cache_deception_armor": True,
+                    "custom_key": {
+                        "cookie": {
+                            "check_presence": ["myCookie"],
+                            "include": ["myCookie"],
+                        },
+                        "header": {
+                            "check_presence": ["my-header"],
+                            "contains": {"my-header": ["my-header-value-1", "my-header-value-2"]},
+                            "exclude_origin": True,
+                            "include": ["my-header"],
+                        },
+                        "host": {"resolved": True},
+                        "query_string": {
+                            "exclude": {
+                                "all": True,
+                                "list": ["foo"],
+                            },
+                            "include": {
+                                "all": True,
+                                "list": ["foo"],
+                            },
+                        },
+                        "user": {
+                            "device_type": True,
+                            "geo": True,
+                            "lang": True,
+                        },
+                    },
+                    "ignore_query_strings_order": True,
+                },
+                "cache_reserve": {
+                    "eligible": True,
+                    "minimum_file_size": 1024,
+                },
+                "edge_ttl": {
+                    "mode": "override_origin",
+                    "default": 60,
+                    "status_code_ttl": [
+                        {
+                            "value": 0,
+                            "status_code": 200,
+                            "status_code_range": {
+                                "from": 200,
+                                "to": 299,
+                            },
+                        }
+                    ],
+                },
+                "origin_cache_control": True,
+                "origin_error_page_passthru": True,
+                "read_timeout": 900,
+                "respect_strong_etags": True,
+                "serve_stale": {"disable_stale_while_updating": True},
             },
-            description="Log custom field when the IP address is not 1.1.1.1",
+            description="Configure settings for how the response is cached.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -6595,14 +7635,14 @@ async def test_path_params_edit_overload_16(self, async_client: AsyncCloudflare)
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -6627,12 +7667,52 @@ async def test_method_edit_with_all_params_overload_17(self, async_client: Async
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="ddos_dynamic",
-            action_parameters={},
-            description="Performs a specific action according to a set of internal guidelines defined by Cloudflare.",
+            action="set_config",
+            action_parameters={
+                "automatic_https_rewrites": True,
+                "autominify": {
+                    "css": True,
+                    "html": True,
+                    "js": True,
+                },
+                "bic": True,
+                "disable_apps": True,
+                "disable_pay_per_crawl": True,
+                "disable_rum": True,
+                "disable_zaraz": True,
+                "email_obfuscation": True,
+                "fonts": True,
+                "hotlink_protection": True,
+                "mirage": True,
+                "opportunistic_encryption": True,
+                "polish": "off",
+                "request_body_buffering": "standard",
+                "response_body_buffering": "standard",
+                "rocket_loader": True,
+                "security_level": "off",
+                "server_side_excludes": True,
+                "ssl": "off",
+                "sxg": True,
+            },
+            description="Configure settings for the request and response.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -6684,14 +7764,14 @@ async def test_path_params_edit_overload_17(self, async_client: AsyncCloudflare)
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -6716,12 +7796,34 @@ async def test_method_edit_with_all_params_overload_18(self, async_client: Async
             ruleset_id="2f2feab2026849078ba485f918791bdc",
             account_id="account_id",
             id="3a03d665bac047339bb530ecb439a90d",
-            action="force_connection_close",
-            action_parameters={},
-            description="Closes ongoing HTTP connections. This action does not block a request, but it forces the client to reconnect. For HTTP/2 and HTTP/3 connections, the connection will be closed even if it breaks other requests running on the same connection.",
+            action="skip",
+            action_parameters={
+                "phase": "current",
+                "phases": ["http_request_firewall_custom"],
+                "products": ["bic"],
+                "rules": {"4814384a9e5d4991b9815dcfc25d2f1f": ["8ac8bc2a661e475d940980f9317f28e1"]},
+                "ruleset": "current",
+                "rulesets": ["2f2feab2026849078ba485f918791bdc"],
+            },
+            description="Skip executing rulesets, rules, phases, and other products.",
             enabled=True,
-            expression="ip.src ne 1.1.1.1",
+            exposed_credential_check={
+                "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
+            },
+            expression="ip.src eq 1.1.1.1",
             logging={"enabled": True},
+            position={"before": "da5e8e506c8e7877fe06cdf4c41add54"},
+            ratelimit={
+                "characteristics": ["cf.colo.id"],
+                "period": 60,
+                "counting_expression": 'http.request.body.raw eq "abcd"',
+                "mitigation_timeout": 600,
+                "requests_per_period": 1000,
+                "requests_to_origin": True,
+                "score_per_period": 400,
+                "score_response_header_name": "my-score",
+            },
             ref="my_ref",
         )
         assert_matches_type(RuleEditResponse, rule, path=["response"])
@@ -6773,14 +7875,14 @@ async def test_path_params_edit_overload_18(self, async_client: AsyncCloudflare)
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.rules.with_raw_response.edit(
                 rule_id="3a03d665bac047339bb530ecb439a90d",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
diff --git a/tests/api_resources/rulesets/test_versions.py b/tests/api_resources/rulesets/test_versions.py
index 67582d09bf4..21b8ef98db7 100644
--- a/tests/api_resources/rulesets/test_versions.py
+++ b/tests/api_resources/rulesets/test_versions.py
@@ -73,13 +73,13 @@ def test_path_params_list(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.versions.with_raw_response.list(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.versions.with_raw_response.list(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -152,14 +152,14 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.versions.with_raw_response.delete(
                 ruleset_version="1",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.versions.with_raw_response.delete(
                 ruleset_version="1",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -233,14 +233,14 @@ def test_path_params_get(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.versions.with_raw_response.get(
                 ruleset_version="1",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.versions.with_raw_response.get(
                 ruleset_version="1",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -249,7 +249,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncVersions:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -306,13 +308,13 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.versions.with_raw_response.list(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.versions.with_raw_response.list(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -385,14 +387,14 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.versions.with_raw_response.delete(
                 ruleset_version="1",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.versions.with_raw_response.delete(
                 ruleset_version="1",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
@@ -466,14 +468,14 @@ async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.versions.with_raw_response.get(
                 ruleset_version="1",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.versions.with_raw_response.get(
                 ruleset_version="1",
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
diff --git a/tests/api_resources/rulesets/versions/test_by_tag.py b/tests/api_resources/rulesets/versions/test_by_tag.py
deleted file mode 100644
index 01267ce0ff9..00000000000
--- a/tests/api_resources/rulesets/versions/test_by_tag.py
+++ /dev/null
@@ -1,170 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.rulesets.versions import ByTagGetResponse
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestByTag:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        by_tag = client.rulesets.versions.by_tag.get(
-            rule_tag="directory-traversal",
-            account_id="abf9b32d38c5f572afde3336ec0ce302",
-            ruleset_id="2f2feab2026849078ba485f918791bdc",
-            ruleset_version="1",
-        )
-        assert_matches_type(ByTagGetResponse, by_tag, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.rulesets.versions.by_tag.with_raw_response.get(
-            rule_tag="directory-traversal",
-            account_id="abf9b32d38c5f572afde3336ec0ce302",
-            ruleset_id="2f2feab2026849078ba485f918791bdc",
-            ruleset_version="1",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        by_tag = response.parse()
-        assert_matches_type(ByTagGetResponse, by_tag, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.rulesets.versions.by_tag.with_streaming_response.get(
-            rule_tag="directory-traversal",
-            account_id="abf9b32d38c5f572afde3336ec0ce302",
-            ruleset_id="2f2feab2026849078ba485f918791bdc",
-            ruleset_version="1",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            by_tag = response.parse()
-            assert_matches_type(ByTagGetResponse, by_tag, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.rulesets.versions.by_tag.with_raw_response.get(
-                rule_tag="directory-traversal",
-                account_id="",
-                ruleset_id="2f2feab2026849078ba485f918791bdc",
-                ruleset_version="1",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ruleset_id` but received ''"):
-            client.rulesets.versions.by_tag.with_raw_response.get(
-                rule_tag="directory-traversal",
-                account_id="abf9b32d38c5f572afde3336ec0ce302",
-                ruleset_id="",
-                ruleset_version="1",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ruleset_version` but received ''"):
-            client.rulesets.versions.by_tag.with_raw_response.get(
-                rule_tag="directory-traversal",
-                account_id="abf9b32d38c5f572afde3336ec0ce302",
-                ruleset_id="2f2feab2026849078ba485f918791bdc",
-                ruleset_version="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_tag` but received ''"):
-            client.rulesets.versions.by_tag.with_raw_response.get(
-                rule_tag="",
-                account_id="abf9b32d38c5f572afde3336ec0ce302",
-                ruleset_id="2f2feab2026849078ba485f918791bdc",
-                ruleset_version="1",
-            )
-
-
-class TestAsyncByTag:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        by_tag = await async_client.rulesets.versions.by_tag.get(
-            rule_tag="directory-traversal",
-            account_id="abf9b32d38c5f572afde3336ec0ce302",
-            ruleset_id="2f2feab2026849078ba485f918791bdc",
-            ruleset_version="1",
-        )
-        assert_matches_type(ByTagGetResponse, by_tag, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.rulesets.versions.by_tag.with_raw_response.get(
-            rule_tag="directory-traversal",
-            account_id="abf9b32d38c5f572afde3336ec0ce302",
-            ruleset_id="2f2feab2026849078ba485f918791bdc",
-            ruleset_version="1",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        by_tag = await response.parse()
-        assert_matches_type(ByTagGetResponse, by_tag, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.rulesets.versions.by_tag.with_streaming_response.get(
-            rule_tag="directory-traversal",
-            account_id="abf9b32d38c5f572afde3336ec0ce302",
-            ruleset_id="2f2feab2026849078ba485f918791bdc",
-            ruleset_version="1",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            by_tag = await response.parse()
-            assert_matches_type(ByTagGetResponse, by_tag, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.rulesets.versions.by_tag.with_raw_response.get(
-                rule_tag="directory-traversal",
-                account_id="",
-                ruleset_id="2f2feab2026849078ba485f918791bdc",
-                ruleset_version="1",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ruleset_id` but received ''"):
-            await async_client.rulesets.versions.by_tag.with_raw_response.get(
-                rule_tag="directory-traversal",
-                account_id="abf9b32d38c5f572afde3336ec0ce302",
-                ruleset_id="",
-                ruleset_version="1",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ruleset_version` but received ''"):
-            await async_client.rulesets.versions.by_tag.with_raw_response.get(
-                rule_tag="directory-traversal",
-                account_id="abf9b32d38c5f572afde3336ec0ce302",
-                ruleset_id="2f2feab2026849078ba485f918791bdc",
-                ruleset_version="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_tag` but received ''"):
-            await async_client.rulesets.versions.by_tag.with_raw_response.get(
-                rule_tag="",
-                account_id="abf9b32d38c5f572afde3336ec0ce302",
-                ruleset_id="2f2feab2026849078ba485f918791bdc",
-                ruleset_version="1",
-            )
diff --git a/tests/api_resources/rum/test_rules.py b/tests/api_resources/rum/test_rules.py
index 6cdb5f5db36..6f8dce9a875 100644
--- a/tests/api_resources/rum/test_rules.py
+++ b/tests/api_resources/rum/test_rules.py
@@ -9,7 +9,12 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.rum import RUMRule, RuleListResponse, RuleDeleteResponse
+from cloudflare.types.rum import (
+    RUMRule,
+    RuleListResponse,
+    RuleDeleteResponse,
+    RuleBulkCreateResponse,
+)
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -258,9 +263,77 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 ruleset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             )
 
+    @parametrize
+    def test_method_bulk_create(self, client: Cloudflare) -> None:
+        rule = client.rum.rules.bulk_create(
+            ruleset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[RuleBulkCreateResponse], rule, path=["response"])
+
+    @parametrize
+    def test_method_bulk_create_with_all_params(self, client: Cloudflare) -> None:
+        rule = client.rum.rules.bulk_create(
+            ruleset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            delete_rules=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+            rules=[
+                {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    "host": "example.com",
+                    "inclusive": True,
+                    "is_paused": False,
+                    "paths": ["*"],
+                }
+            ],
+        )
+        assert_matches_type(Optional[RuleBulkCreateResponse], rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_create(self, client: Cloudflare) -> None:
+        response = client.rum.rules.with_raw_response.bulk_create(
+            ruleset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(Optional[RuleBulkCreateResponse], rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_create(self, client: Cloudflare) -> None:
+        with client.rum.rules.with_streaming_response.bulk_create(
+            ruleset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = response.parse()
+            assert_matches_type(Optional[RuleBulkCreateResponse], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.rum.rules.with_raw_response.bulk_create(
+                ruleset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ruleset_id` but received ''"):
+            client.rum.rules.with_raw_response.bulk_create(
+                ruleset_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
 
 class TestAsyncRules:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -502,3 +575,69 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 ruleset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             )
+
+    @parametrize
+    async def test_method_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.rum.rules.bulk_create(
+            ruleset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[RuleBulkCreateResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_method_bulk_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.rum.rules.bulk_create(
+            ruleset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            delete_rules=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+            rules=[
+                {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    "host": "example.com",
+                    "inclusive": True,
+                    "is_paused": False,
+                    "paths": ["*"],
+                }
+            ],
+        )
+        assert_matches_type(Optional[RuleBulkCreateResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.rum.rules.with_raw_response.bulk_create(
+            ruleset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(Optional[RuleBulkCreateResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.rum.rules.with_streaming_response.bulk_create(
+            ruleset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = await response.parse()
+            assert_matches_type(Optional[RuleBulkCreateResponse], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.rum.rules.with_raw_response.bulk_create(
+                ruleset_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ruleset_id` but received ''"):
+            await async_client.rum.rules.with_raw_response.bulk_create(
+                ruleset_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/rum/test_site_info.py b/tests/api_resources/rum/test_site_info.py
index dbd592cad22..279dc7b73dd 100644
--- a/tests/api_resources/rum/test_site_info.py
+++ b/tests/api_resources/rum/test_site_info.py
@@ -83,7 +83,9 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             auto_install=True,
+            enabled=True,
             host="example.com",
+            lite=True,
             zone_tag="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Site], site_info, path=["response"])
@@ -274,7 +276,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSiteInfo:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -338,7 +342,9 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             site_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             auto_install=True,
+            enabled=True,
             host="example.com",
+            lite=True,
             zone_tag="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Site], site_info, path=["response"])
diff --git a/tests/api_resources/schema_validation/__init__.py b/tests/api_resources/schema_validation/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/schema_validation/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/schema_validation/settings/__init__.py b/tests/api_resources/schema_validation/settings/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/schema_validation/settings/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/schema_validation/settings/test_operations.py b/tests/api_resources/schema_validation/settings/test_operations.py
new file mode 100644
index 00000000000..6e05e58155a
--- /dev/null
+++ b/tests/api_resources/schema_validation/settings/test_operations.py
@@ -0,0 +1,531 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.schema_validation.settings import (
+    OperationGetResponse,
+    OperationListResponse,
+    OperationDeleteResponse,
+    OperationUpdateResponse,
+    OperationBulkEditResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestOperations:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        operation = client.schema_validation.settings.operations.update(
+            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            mitigation_action="block",
+        )
+        assert_matches_type(OperationUpdateResponse, operation, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.schema_validation.settings.operations.with_raw_response.update(
+            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            mitigation_action="block",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        operation = response.parse()
+        assert_matches_type(OperationUpdateResponse, operation, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.schema_validation.settings.operations.with_streaming_response.update(
+            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            mitigation_action="block",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            operation = response.parse()
+            assert_matches_type(OperationUpdateResponse, operation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.schema_validation.settings.operations.with_raw_response.update(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="",
+                mitigation_action="block",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `operation_id` but received ''"):
+            client.schema_validation.settings.operations.with_raw_response.update(
+                operation_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                mitigation_action="block",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        operation = client.schema_validation.settings.operations.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[OperationListResponse], operation, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        operation = client.schema_validation.settings.operations.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=5,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[OperationListResponse], operation, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.schema_validation.settings.operations.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        operation = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[OperationListResponse], operation, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.schema_validation.settings.operations.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            operation = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[OperationListResponse], operation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.schema_validation.settings.operations.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        operation = client.schema_validation.settings.operations.delete(
+            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(OperationDeleteResponse, operation, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.schema_validation.settings.operations.with_raw_response.delete(
+            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        operation = response.parse()
+        assert_matches_type(OperationDeleteResponse, operation, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.schema_validation.settings.operations.with_streaming_response.delete(
+            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            operation = response.parse()
+            assert_matches_type(OperationDeleteResponse, operation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.schema_validation.settings.operations.with_raw_response.delete(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `operation_id` but received ''"):
+            client.schema_validation.settings.operations.with_raw_response.delete(
+                operation_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_bulk_edit(self, client: Cloudflare) -> None:
+        operation = client.schema_validation.settings.operations.bulk_edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={
+                "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+            },
+        )
+        assert_matches_type(OperationBulkEditResponse, operation, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_edit(self, client: Cloudflare) -> None:
+        response = client.schema_validation.settings.operations.with_raw_response.bulk_edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={
+                "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+            },
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        operation = response.parse()
+        assert_matches_type(OperationBulkEditResponse, operation, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_edit(self, client: Cloudflare) -> None:
+        with client.schema_validation.settings.operations.with_streaming_response.bulk_edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={
+                "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+            },
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            operation = response.parse()
+            assert_matches_type(OperationBulkEditResponse, operation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.schema_validation.settings.operations.with_raw_response.bulk_edit(
+                zone_id="",
+                body={
+                    "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                    "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+                },
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        operation = client.schema_validation.settings.operations.get(
+            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(OperationGetResponse, operation, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.schema_validation.settings.operations.with_raw_response.get(
+            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        operation = response.parse()
+        assert_matches_type(OperationGetResponse, operation, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.schema_validation.settings.operations.with_streaming_response.get(
+            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            operation = response.parse()
+            assert_matches_type(OperationGetResponse, operation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.schema_validation.settings.operations.with_raw_response.get(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `operation_id` but received ''"):
+            client.schema_validation.settings.operations.with_raw_response.get(
+                operation_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncOperations:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        operation = await async_client.schema_validation.settings.operations.update(
+            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            mitigation_action="block",
+        )
+        assert_matches_type(OperationUpdateResponse, operation, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.schema_validation.settings.operations.with_raw_response.update(
+            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            mitigation_action="block",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        operation = await response.parse()
+        assert_matches_type(OperationUpdateResponse, operation, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.schema_validation.settings.operations.with_streaming_response.update(
+            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            mitigation_action="block",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            operation = await response.parse()
+            assert_matches_type(OperationUpdateResponse, operation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.schema_validation.settings.operations.with_raw_response.update(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="",
+                mitigation_action="block",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `operation_id` but received ''"):
+            await async_client.schema_validation.settings.operations.with_raw_response.update(
+                operation_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                mitigation_action="block",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        operation = await async_client.schema_validation.settings.operations.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[OperationListResponse], operation, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        operation = await async_client.schema_validation.settings.operations.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=5,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[OperationListResponse], operation, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.schema_validation.settings.operations.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        operation = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[OperationListResponse], operation, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.schema_validation.settings.operations.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            operation = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[OperationListResponse], operation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.schema_validation.settings.operations.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        operation = await async_client.schema_validation.settings.operations.delete(
+            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(OperationDeleteResponse, operation, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.schema_validation.settings.operations.with_raw_response.delete(
+            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        operation = await response.parse()
+        assert_matches_type(OperationDeleteResponse, operation, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.schema_validation.settings.operations.with_streaming_response.delete(
+            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            operation = await response.parse()
+            assert_matches_type(OperationDeleteResponse, operation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.schema_validation.settings.operations.with_raw_response.delete(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `operation_id` but received ''"):
+            await async_client.schema_validation.settings.operations.with_raw_response.delete(
+                operation_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        operation = await async_client.schema_validation.settings.operations.bulk_edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={
+                "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+            },
+        )
+        assert_matches_type(OperationBulkEditResponse, operation, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.schema_validation.settings.operations.with_raw_response.bulk_edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={
+                "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+            },
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        operation = await response.parse()
+        assert_matches_type(OperationBulkEditResponse, operation, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.schema_validation.settings.operations.with_streaming_response.bulk_edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body={
+                "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+            },
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            operation = await response.parse()
+            assert_matches_type(OperationBulkEditResponse, operation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.schema_validation.settings.operations.with_raw_response.bulk_edit(
+                zone_id="",
+                body={
+                    "3818d821-5901-4147-a474-f5f5aec1d54e": {},
+                    "b17c8043-99a0-4202-b7d9-8f7cdbee02cd": {},
+                },
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        operation = await async_client.schema_validation.settings.operations.get(
+            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(OperationGetResponse, operation, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.schema_validation.settings.operations.with_raw_response.get(
+            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        operation = await response.parse()
+        assert_matches_type(OperationGetResponse, operation, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.schema_validation.settings.operations.with_streaming_response.get(
+            operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            operation = await response.parse()
+            assert_matches_type(OperationGetResponse, operation, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.schema_validation.settings.operations.with_raw_response.get(
+                operation_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `operation_id` but received ''"):
+            await async_client.schema_validation.settings.operations.with_raw_response.get(
+                operation_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/schema_validation/test_schemas.py b/tests/api_resources/schema_validation/test_schemas.py
new file mode 100644
index 00000000000..c2a31877f63
--- /dev/null
+++ b/tests/api_resources/schema_validation/test_schemas.py
@@ -0,0 +1,558 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.schema_validation import (
+    PublicSchema,
+    SchemaDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSchemas:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        schema = client.schema_validation.schemas.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            kind="openapi_v3",
+            name="petstore schema",
+            source="<schema file contents>",
+            validation_enabled=True,
+        )
+        assert_matches_type(PublicSchema, schema, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.schema_validation.schemas.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            kind="openapi_v3",
+            name="petstore schema",
+            source="<schema file contents>",
+            validation_enabled=True,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        schema = response.parse()
+        assert_matches_type(PublicSchema, schema, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.schema_validation.schemas.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            kind="openapi_v3",
+            name="petstore schema",
+            source="<schema file contents>",
+            validation_enabled=True,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            schema = response.parse()
+            assert_matches_type(PublicSchema, schema, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.schema_validation.schemas.with_raw_response.create(
+                zone_id="",
+                kind="openapi_v3",
+                name="petstore schema",
+                source="<schema file contents>",
+                validation_enabled=True,
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        schema = client.schema_validation.schemas.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[PublicSchema], schema, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        schema = client.schema_validation.schemas.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            omit_source=True,
+            page=1,
+            per_page=5,
+            validation_enabled=True,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[PublicSchema], schema, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.schema_validation.schemas.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        schema = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[PublicSchema], schema, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.schema_validation.schemas.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            schema = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[PublicSchema], schema, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.schema_validation.schemas.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        schema = client.schema_validation.schemas.delete(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SchemaDeleteResponse, schema, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.schema_validation.schemas.with_raw_response.delete(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        schema = response.parse()
+        assert_matches_type(SchemaDeleteResponse, schema, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.schema_validation.schemas.with_streaming_response.delete(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            schema = response.parse()
+            assert_matches_type(SchemaDeleteResponse, schema, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.schema_validation.schemas.with_raw_response.delete(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
+            client.schema_validation.schemas.with_raw_response.delete(
+                schema_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        schema = client.schema_validation.schemas.edit(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(PublicSchema, schema, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        schema = client.schema_validation.schemas.edit(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            validation_enabled=True,
+        )
+        assert_matches_type(PublicSchema, schema, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.schema_validation.schemas.with_raw_response.edit(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        schema = response.parse()
+        assert_matches_type(PublicSchema, schema, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.schema_validation.schemas.with_streaming_response.edit(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            schema = response.parse()
+            assert_matches_type(PublicSchema, schema, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.schema_validation.schemas.with_raw_response.edit(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
+            client.schema_validation.schemas.with_raw_response.edit(
+                schema_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        schema = client.schema_validation.schemas.get(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(PublicSchema, schema, path=["response"])
+
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        schema = client.schema_validation.schemas.get(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            omit_source=True,
+        )
+        assert_matches_type(PublicSchema, schema, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.schema_validation.schemas.with_raw_response.get(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        schema = response.parse()
+        assert_matches_type(PublicSchema, schema, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.schema_validation.schemas.with_streaming_response.get(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            schema = response.parse()
+            assert_matches_type(PublicSchema, schema, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.schema_validation.schemas.with_raw_response.get(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
+            client.schema_validation.schemas.with_raw_response.get(
+                schema_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncSchemas:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        schema = await async_client.schema_validation.schemas.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            kind="openapi_v3",
+            name="petstore schema",
+            source="<schema file contents>",
+            validation_enabled=True,
+        )
+        assert_matches_type(PublicSchema, schema, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.schema_validation.schemas.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            kind="openapi_v3",
+            name="petstore schema",
+            source="<schema file contents>",
+            validation_enabled=True,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        schema = await response.parse()
+        assert_matches_type(PublicSchema, schema, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.schema_validation.schemas.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            kind="openapi_v3",
+            name="petstore schema",
+            source="<schema file contents>",
+            validation_enabled=True,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            schema = await response.parse()
+            assert_matches_type(PublicSchema, schema, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.schema_validation.schemas.with_raw_response.create(
+                zone_id="",
+                kind="openapi_v3",
+                name="petstore schema",
+                source="<schema file contents>",
+                validation_enabled=True,
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        schema = await async_client.schema_validation.schemas.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[PublicSchema], schema, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        schema = await async_client.schema_validation.schemas.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            omit_source=True,
+            page=1,
+            per_page=5,
+            validation_enabled=True,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[PublicSchema], schema, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.schema_validation.schemas.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        schema = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[PublicSchema], schema, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.schema_validation.schemas.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            schema = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[PublicSchema], schema, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.schema_validation.schemas.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        schema = await async_client.schema_validation.schemas.delete(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SchemaDeleteResponse, schema, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.schema_validation.schemas.with_raw_response.delete(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        schema = await response.parse()
+        assert_matches_type(SchemaDeleteResponse, schema, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.schema_validation.schemas.with_streaming_response.delete(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            schema = await response.parse()
+            assert_matches_type(SchemaDeleteResponse, schema, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.schema_validation.schemas.with_raw_response.delete(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
+            await async_client.schema_validation.schemas.with_raw_response.delete(
+                schema_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        schema = await async_client.schema_validation.schemas.edit(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(PublicSchema, schema, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        schema = await async_client.schema_validation.schemas.edit(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            validation_enabled=True,
+        )
+        assert_matches_type(PublicSchema, schema, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.schema_validation.schemas.with_raw_response.edit(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        schema = await response.parse()
+        assert_matches_type(PublicSchema, schema, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.schema_validation.schemas.with_streaming_response.edit(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            schema = await response.parse()
+            assert_matches_type(PublicSchema, schema, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.schema_validation.schemas.with_raw_response.edit(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
+            await async_client.schema_validation.schemas.with_raw_response.edit(
+                schema_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        schema = await async_client.schema_validation.schemas.get(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(PublicSchema, schema, path=["response"])
+
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        schema = await async_client.schema_validation.schemas.get(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            omit_source=True,
+        )
+        assert_matches_type(PublicSchema, schema, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.schema_validation.schemas.with_raw_response.get(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        schema = await response.parse()
+        assert_matches_type(PublicSchema, schema, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.schema_validation.schemas.with_streaming_response.get(
+            schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            schema = await response.parse()
+            assert_matches_type(PublicSchema, schema, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.schema_validation.schemas.with_raw_response.get(
+                schema_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `schema_id` but received ''"):
+            await async_client.schema_validation.schemas.with_raw_response.get(
+                schema_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/schema_validation/test_settings.py b/tests/api_resources/schema_validation/test_settings.py
new file mode 100644
index 00000000000..68752e94f3d
--- /dev/null
+++ b/tests/api_resources/schema_validation/test_settings.py
@@ -0,0 +1,300 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.schema_validation import (
+    SettingGetResponse,
+    SettingEditResponse,
+    SettingUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSettings:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        setting = client.schema_validation.settings.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            validation_default_mitigation_action="block",
+        )
+        assert_matches_type(SettingUpdateResponse, setting, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        setting = client.schema_validation.settings.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            validation_default_mitigation_action="block",
+            validation_override_mitigation_action="none",
+        )
+        assert_matches_type(SettingUpdateResponse, setting, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.schema_validation.settings.with_raw_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            validation_default_mitigation_action="block",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = response.parse()
+        assert_matches_type(SettingUpdateResponse, setting, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.schema_validation.settings.with_streaming_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            validation_default_mitigation_action="block",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = response.parse()
+            assert_matches_type(SettingUpdateResponse, setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.schema_validation.settings.with_raw_response.update(
+                zone_id="",
+                validation_default_mitigation_action="block",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        setting = client.schema_validation.settings.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SettingEditResponse, setting, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        setting = client.schema_validation.settings.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            validation_default_mitigation_action="block",
+            validation_override_mitigation_action="none",
+        )
+        assert_matches_type(SettingEditResponse, setting, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.schema_validation.settings.with_raw_response.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = response.parse()
+        assert_matches_type(SettingEditResponse, setting, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.schema_validation.settings.with_streaming_response.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = response.parse()
+            assert_matches_type(SettingEditResponse, setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.schema_validation.settings.with_raw_response.edit(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        setting = client.schema_validation.settings.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SettingGetResponse, setting, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.schema_validation.settings.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = response.parse()
+        assert_matches_type(SettingGetResponse, setting, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.schema_validation.settings.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = response.parse()
+            assert_matches_type(SettingGetResponse, setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.schema_validation.settings.with_raw_response.get(
+                zone_id="",
+            )
+
+
+class TestAsyncSettings:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.schema_validation.settings.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            validation_default_mitigation_action="block",
+        )
+        assert_matches_type(SettingUpdateResponse, setting, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.schema_validation.settings.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            validation_default_mitigation_action="block",
+            validation_override_mitigation_action="none",
+        )
+        assert_matches_type(SettingUpdateResponse, setting, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.schema_validation.settings.with_raw_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            validation_default_mitigation_action="block",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = await response.parse()
+        assert_matches_type(SettingUpdateResponse, setting, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.schema_validation.settings.with_streaming_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            validation_default_mitigation_action="block",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = await response.parse()
+            assert_matches_type(SettingUpdateResponse, setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.schema_validation.settings.with_raw_response.update(
+                zone_id="",
+                validation_default_mitigation_action="block",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.schema_validation.settings.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SettingEditResponse, setting, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.schema_validation.settings.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            validation_default_mitigation_action="block",
+            validation_override_mitigation_action="none",
+        )
+        assert_matches_type(SettingEditResponse, setting, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.schema_validation.settings.with_raw_response.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = await response.parse()
+        assert_matches_type(SettingEditResponse, setting, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.schema_validation.settings.with_streaming_response.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = await response.parse()
+            assert_matches_type(SettingEditResponse, setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.schema_validation.settings.with_raw_response.edit(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.schema_validation.settings.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SettingGetResponse, setting, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.schema_validation.settings.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = await response.parse()
+        assert_matches_type(SettingGetResponse, setting, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.schema_validation.settings.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = await response.parse()
+            assert_matches_type(SettingGetResponse, setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.schema_validation.settings.with_raw_response.get(
+                zone_id="",
+            )
diff --git a/tests/api_resources/secondary_dns/outgoing/test_status.py b/tests/api_resources/secondary_dns/outgoing/test_status.py
deleted file mode 100644
index 98ced5177aa..00000000000
--- a/tests/api_resources/secondary_dns/outgoing/test_status.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestStatus:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        status = client.secondary_dns.outgoing.status.get(
-            zone_id="269d8f4853475ca241c4e730be286b20",
-        )
-        assert_matches_type(str, status, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.secondary_dns.outgoing.status.with_raw_response.get(
-            zone_id="269d8f4853475ca241c4e730be286b20",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        status = response.parse()
-        assert_matches_type(str, status, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.secondary_dns.outgoing.status.with_streaming_response.get(
-            zone_id="269d8f4853475ca241c4e730be286b20",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            status = response.parse()
-            assert_matches_type(str, status, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.secondary_dns.outgoing.status.with_raw_response.get(
-                zone_id="",
-            )
-
-
-class TestAsyncStatus:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        status = await async_client.secondary_dns.outgoing.status.get(
-            zone_id="269d8f4853475ca241c4e730be286b20",
-        )
-        assert_matches_type(str, status, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.secondary_dns.outgoing.status.with_raw_response.get(
-            zone_id="269d8f4853475ca241c4e730be286b20",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        status = await response.parse()
-        assert_matches_type(str, status, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.secondary_dns.outgoing.status.with_streaming_response.get(
-            zone_id="269d8f4853475ca241c4e730be286b20",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            status = await response.parse()
-            assert_matches_type(str, status, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.secondary_dns.outgoing.status.with_raw_response.get(
-                zone_id="",
-            )
diff --git a/tests/api_resources/secrets_store/__init__.py b/tests/api_resources/secrets_store/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/secrets_store/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/secrets_store/stores/__init__.py b/tests/api_resources/secrets_store/stores/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/secrets_store/stores/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/secrets_store/stores/test_secrets.py b/tests/api_resources/secrets_store/stores/test_secrets.py
new file mode 100644
index 00000000000..cbc40a2a0d7
--- /dev/null
+++ b/tests/api_resources/secrets_store/stores/test_secrets.py
@@ -0,0 +1,999 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.secrets_store.stores import (
+    SecretGetResponse,
+    SecretEditResponse,
+    SecretListResponse,
+    SecretCreateResponse,
+    SecretDeleteResponse,
+    SecretDuplicateResponse,
+    SecretBulkDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSecrets:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        secret = client.secrets_store.stores.secrets.create(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "name": "MY_API_KEY",
+                    "scopes": ["workers", "ai_gateway", "dex", "access"],
+                    "value": "api-token-secret-123",
+                }
+            ],
+        )
+        assert_matches_type(SyncSinglePage[SecretCreateResponse], secret, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.secrets_store.stores.secrets.with_raw_response.create(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "name": "MY_API_KEY",
+                    "scopes": ["workers", "ai_gateway", "dex", "access"],
+                    "value": "api-token-secret-123",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = response.parse()
+        assert_matches_type(SyncSinglePage[SecretCreateResponse], secret, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.secrets_store.stores.secrets.with_streaming_response.create(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "name": "MY_API_KEY",
+                    "scopes": ["workers", "ai_gateway", "dex", "access"],
+                    "value": "api-token-secret-123",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = response.parse()
+            assert_matches_type(SyncSinglePage[SecretCreateResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.secrets_store.stores.secrets.with_raw_response.create(
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+                body=[
+                    {
+                        "name": "MY_API_KEY",
+                        "scopes": ["workers", "ai_gateway", "dex", "access"],
+                        "value": "api-token-secret-123",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `store_id` but received ''"):
+            client.secrets_store.stores.secrets.with_raw_response.create(
+                store_id="",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+                body=[
+                    {
+                        "name": "MY_API_KEY",
+                        "scopes": ["workers", "ai_gateway", "dex", "access"],
+                        "value": "api-token-secret-123",
+                    }
+                ],
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        secret = client.secrets_store.stores.secrets.list(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[SecretListResponse], secret, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        secret = client.secrets_store.stores.secrets.list(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            direction="asc",
+            order="name",
+            page=2,
+            per_page=20,
+            scopes=[["workers", "ai_gateway", "dex", "access"]],
+            search="search",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[SecretListResponse], secret, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.secrets_store.stores.secrets.with_raw_response.list(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[SecretListResponse], secret, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.secrets_store.stores.secrets.with_streaming_response.list(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[SecretListResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.secrets_store.stores.secrets.with_raw_response.list(
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `store_id` but received ''"):
+            client.secrets_store.stores.secrets.with_raw_response.list(
+                store_id="",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        secret = client.secrets_store.stores.secrets.delete(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SecretDeleteResponse], secret, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.secrets_store.stores.secrets.with_raw_response.delete(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = response.parse()
+        assert_matches_type(Optional[SecretDeleteResponse], secret, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.secrets_store.stores.secrets.with_streaming_response.delete(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = response.parse()
+            assert_matches_type(Optional[SecretDeleteResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.secrets_store.stores.secrets.with_raw_response.delete(
+                secret_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `store_id` but received ''"):
+            client.secrets_store.stores.secrets.with_raw_response.delete(
+                secret_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+                store_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `secret_id` but received ''"):
+            client.secrets_store.stores.secrets.with_raw_response.delete(
+                secret_id="",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_bulk_delete(self, client: Cloudflare) -> None:
+        secret = client.secrets_store.stores.secrets.bulk_delete(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[SecretBulkDeleteResponse], secret, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_delete(self, client: Cloudflare) -> None:
+        response = client.secrets_store.stores.secrets.with_raw_response.bulk_delete(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = response.parse()
+        assert_matches_type(SyncSinglePage[SecretBulkDeleteResponse], secret, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_delete(self, client: Cloudflare) -> None:
+        with client.secrets_store.stores.secrets.with_streaming_response.bulk_delete(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = response.parse()
+            assert_matches_type(SyncSinglePage[SecretBulkDeleteResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.secrets_store.stores.secrets.with_raw_response.bulk_delete(
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `store_id` but received ''"):
+            client.secrets_store.stores.secrets.with_raw_response.bulk_delete(
+                store_id="",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_duplicate(self, client: Cloudflare) -> None:
+        secret = client.secrets_store.stores.secrets.duplicate(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="MY_API_KEY",
+            scopes=["workers", "ai_gateway", "dex", "access"],
+        )
+        assert_matches_type(Optional[SecretDuplicateResponse], secret, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_duplicate_with_all_params(self, client: Cloudflare) -> None:
+        secret = client.secrets_store.stores.secrets.duplicate(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="MY_API_KEY",
+            scopes=["workers", "ai_gateway", "dex", "access"],
+            comment="info about my secret",
+        )
+        assert_matches_type(Optional[SecretDuplicateResponse], secret, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_raw_response_duplicate(self, client: Cloudflare) -> None:
+        response = client.secrets_store.stores.secrets.with_raw_response.duplicate(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="MY_API_KEY",
+            scopes=["workers", "ai_gateway", "dex", "access"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = response.parse()
+        assert_matches_type(Optional[SecretDuplicateResponse], secret, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_streaming_response_duplicate(self, client: Cloudflare) -> None:
+        with client.secrets_store.stores.secrets.with_streaming_response.duplicate(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="MY_API_KEY",
+            scopes=["workers", "ai_gateway", "dex", "access"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = response.parse()
+            assert_matches_type(Optional[SecretDuplicateResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_path_params_duplicate(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.secrets_store.stores.secrets.with_raw_response.duplicate(
+                secret_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="MY_API_KEY",
+                scopes=["workers", "ai_gateway", "dex", "access"],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `store_id` but received ''"):
+            client.secrets_store.stores.secrets.with_raw_response.duplicate(
+                secret_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+                store_id="",
+                name="MY_API_KEY",
+                scopes=["workers", "ai_gateway", "dex", "access"],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `secret_id` but received ''"):
+            client.secrets_store.stores.secrets.with_raw_response.duplicate(
+                secret_id="",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="MY_API_KEY",
+                scopes=["workers", "ai_gateway", "dex", "access"],
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        secret = client.secrets_store.stores.secrets.edit(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SecretEditResponse], secret, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        secret = client.secrets_store.stores.secrets.edit(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            comment="info about my secret",
+            scopes=["workers", "ai_gateway", "dex", "access"],
+        )
+        assert_matches_type(Optional[SecretEditResponse], secret, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.secrets_store.stores.secrets.with_raw_response.edit(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = response.parse()
+        assert_matches_type(Optional[SecretEditResponse], secret, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.secrets_store.stores.secrets.with_streaming_response.edit(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = response.parse()
+            assert_matches_type(Optional[SecretEditResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.secrets_store.stores.secrets.with_raw_response.edit(
+                secret_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `store_id` but received ''"):
+            client.secrets_store.stores.secrets.with_raw_response.edit(
+                secret_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+                store_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `secret_id` but received ''"):
+            client.secrets_store.stores.secrets.with_raw_response.edit(
+                secret_id="",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        secret = client.secrets_store.stores.secrets.get(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SecretGetResponse], secret, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.secrets_store.stores.secrets.with_raw_response.get(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = response.parse()
+        assert_matches_type(Optional[SecretGetResponse], secret, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.secrets_store.stores.secrets.with_streaming_response.get(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = response.parse()
+            assert_matches_type(Optional[SecretGetResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.secrets_store.stores.secrets.with_raw_response.get(
+                secret_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `store_id` but received ''"):
+            client.secrets_store.stores.secrets.with_raw_response.get(
+                secret_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+                store_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `secret_id` but received ''"):
+            client.secrets_store.stores.secrets.with_raw_response.get(
+                secret_id="",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncSecrets:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.secrets_store.stores.secrets.create(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "name": "MY_API_KEY",
+                    "scopes": ["workers", "ai_gateway", "dex", "access"],
+                    "value": "api-token-secret-123",
+                }
+            ],
+        )
+        assert_matches_type(AsyncSinglePage[SecretCreateResponse], secret, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.secrets_store.stores.secrets.with_raw_response.create(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "name": "MY_API_KEY",
+                    "scopes": ["workers", "ai_gateway", "dex", "access"],
+                    "value": "api-token-secret-123",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = await response.parse()
+        assert_matches_type(AsyncSinglePage[SecretCreateResponse], secret, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.secrets_store.stores.secrets.with_streaming_response.create(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "name": "MY_API_KEY",
+                    "scopes": ["workers", "ai_gateway", "dex", "access"],
+                    "value": "api-token-secret-123",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = await response.parse()
+            assert_matches_type(AsyncSinglePage[SecretCreateResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.secrets_store.stores.secrets.with_raw_response.create(
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+                body=[
+                    {
+                        "name": "MY_API_KEY",
+                        "scopes": ["workers", "ai_gateway", "dex", "access"],
+                        "value": "api-token-secret-123",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `store_id` but received ''"):
+            await async_client.secrets_store.stores.secrets.with_raw_response.create(
+                store_id="",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+                body=[
+                    {
+                        "name": "MY_API_KEY",
+                        "scopes": ["workers", "ai_gateway", "dex", "access"],
+                        "value": "api-token-secret-123",
+                    }
+                ],
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.secrets_store.stores.secrets.list(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[SecretListResponse], secret, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.secrets_store.stores.secrets.list(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            direction="asc",
+            order="name",
+            page=2,
+            per_page=20,
+            scopes=[["workers", "ai_gateway", "dex", "access"]],
+            search="search",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[SecretListResponse], secret, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.secrets_store.stores.secrets.with_raw_response.list(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[SecretListResponse], secret, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.secrets_store.stores.secrets.with_streaming_response.list(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[SecretListResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.secrets_store.stores.secrets.with_raw_response.list(
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `store_id` but received ''"):
+            await async_client.secrets_store.stores.secrets.with_raw_response.list(
+                store_id="",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.secrets_store.stores.secrets.delete(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SecretDeleteResponse], secret, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.secrets_store.stores.secrets.with_raw_response.delete(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = await response.parse()
+        assert_matches_type(Optional[SecretDeleteResponse], secret, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.secrets_store.stores.secrets.with_streaming_response.delete(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = await response.parse()
+            assert_matches_type(Optional[SecretDeleteResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.secrets_store.stores.secrets.with_raw_response.delete(
+                secret_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `store_id` but received ''"):
+            await async_client.secrets_store.stores.secrets.with_raw_response.delete(
+                secret_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+                store_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `secret_id` but received ''"):
+            await async_client.secrets_store.stores.secrets.with_raw_response.delete(
+                secret_id="",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.secrets_store.stores.secrets.bulk_delete(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[SecretBulkDeleteResponse], secret, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.secrets_store.stores.secrets.with_raw_response.bulk_delete(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = await response.parse()
+        assert_matches_type(AsyncSinglePage[SecretBulkDeleteResponse], secret, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.secrets_store.stores.secrets.with_streaming_response.bulk_delete(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = await response.parse()
+            assert_matches_type(AsyncSinglePage[SecretBulkDeleteResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.secrets_store.stores.secrets.with_raw_response.bulk_delete(
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `store_id` but received ''"):
+            await async_client.secrets_store.stores.secrets.with_raw_response.bulk_delete(
+                store_id="",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_duplicate(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.secrets_store.stores.secrets.duplicate(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="MY_API_KEY",
+            scopes=["workers", "ai_gateway", "dex", "access"],
+        )
+        assert_matches_type(Optional[SecretDuplicateResponse], secret, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_duplicate_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.secrets_store.stores.secrets.duplicate(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="MY_API_KEY",
+            scopes=["workers", "ai_gateway", "dex", "access"],
+            comment="info about my secret",
+        )
+        assert_matches_type(Optional[SecretDuplicateResponse], secret, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_raw_response_duplicate(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.secrets_store.stores.secrets.with_raw_response.duplicate(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="MY_API_KEY",
+            scopes=["workers", "ai_gateway", "dex", "access"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = await response.parse()
+        assert_matches_type(Optional[SecretDuplicateResponse], secret, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_streaming_response_duplicate(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.secrets_store.stores.secrets.with_streaming_response.duplicate(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="MY_API_KEY",
+            scopes=["workers", "ai_gateway", "dex", "access"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = await response.parse()
+            assert_matches_type(Optional[SecretDuplicateResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_path_params_duplicate(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.secrets_store.stores.secrets.with_raw_response.duplicate(
+                secret_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="MY_API_KEY",
+                scopes=["workers", "ai_gateway", "dex", "access"],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `store_id` but received ''"):
+            await async_client.secrets_store.stores.secrets.with_raw_response.duplicate(
+                secret_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+                store_id="",
+                name="MY_API_KEY",
+                scopes=["workers", "ai_gateway", "dex", "access"],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `secret_id` but received ''"):
+            await async_client.secrets_store.stores.secrets.with_raw_response.duplicate(
+                secret_id="",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="MY_API_KEY",
+                scopes=["workers", "ai_gateway", "dex", "access"],
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.secrets_store.stores.secrets.edit(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SecretEditResponse], secret, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.secrets_store.stores.secrets.edit(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            comment="info about my secret",
+            scopes=["workers", "ai_gateway", "dex", "access"],
+        )
+        assert_matches_type(Optional[SecretEditResponse], secret, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.secrets_store.stores.secrets.with_raw_response.edit(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = await response.parse()
+        assert_matches_type(Optional[SecretEditResponse], secret, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.secrets_store.stores.secrets.with_streaming_response.edit(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = await response.parse()
+            assert_matches_type(Optional[SecretEditResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for 422 Unprocessable Entity")
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.secrets_store.stores.secrets.with_raw_response.edit(
+                secret_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `store_id` but received ''"):
+            await async_client.secrets_store.stores.secrets.with_raw_response.edit(
+                secret_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+                store_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `secret_id` but received ''"):
+            await async_client.secrets_store.stores.secrets.with_raw_response.edit(
+                secret_id="",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.secrets_store.stores.secrets.get(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SecretGetResponse], secret, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.secrets_store.stores.secrets.with_raw_response.get(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = await response.parse()
+        assert_matches_type(Optional[SecretGetResponse], secret, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.secrets_store.stores.secrets.with_streaming_response.get(
+            secret_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = await response.parse()
+            assert_matches_type(Optional[SecretGetResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.secrets_store.stores.secrets.with_raw_response.get(
+                secret_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `store_id` but received ''"):
+            await async_client.secrets_store.stores.secrets.with_raw_response.get(
+                secret_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+                store_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `secret_id` but received ''"):
+            await async_client.secrets_store.stores.secrets.with_raw_response.get(
+                secret_id="",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/secrets_store/test_quota.py b/tests/api_resources/secrets_store/test_quota.py
new file mode 100644
index 00000000000..d74f03ae049
--- /dev/null
+++ b/tests/api_resources/secrets_store/test_quota.py
@@ -0,0 +1,100 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.secrets_store import QuotaGetResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestQuota:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        quota = client.secrets_store.quota.get(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[QuotaGetResponse], quota, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.secrets_store.quota.with_raw_response.get(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        quota = response.parse()
+        assert_matches_type(Optional[QuotaGetResponse], quota, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.secrets_store.quota.with_streaming_response.get(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            quota = response.parse()
+            assert_matches_type(Optional[QuotaGetResponse], quota, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.secrets_store.quota.with_raw_response.get(
+                account_id="",
+            )
+
+
+class TestAsyncQuota:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        quota = await async_client.secrets_store.quota.get(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[QuotaGetResponse], quota, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.secrets_store.quota.with_raw_response.get(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        quota = await response.parse()
+        assert_matches_type(Optional[QuotaGetResponse], quota, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.secrets_store.quota.with_streaming_response.get(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            quota = await response.parse()
+            assert_matches_type(Optional[QuotaGetResponse], quota, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.secrets_store.quota.with_raw_response.get(
+                account_id="",
+            )
diff --git a/tests/api_resources/secrets_store/test_stores.py b/tests/api_resources/secrets_store/test_stores.py
new file mode 100644
index 00000000000..68fb500fd5e
--- /dev/null
+++ b/tests/api_resources/secrets_store/test_stores.py
@@ -0,0 +1,307 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.secrets_store import (
+    StoreListResponse,
+    StoreCreateResponse,
+    StoreDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestStores:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        store = client.secrets_store.stores.create(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"name": "service_x_keys"}],
+        )
+        assert_matches_type(SyncSinglePage[StoreCreateResponse], store, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.secrets_store.stores.with_raw_response.create(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"name": "service_x_keys"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        store = response.parse()
+        assert_matches_type(SyncSinglePage[StoreCreateResponse], store, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.secrets_store.stores.with_streaming_response.create(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"name": "service_x_keys"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            store = response.parse()
+            assert_matches_type(SyncSinglePage[StoreCreateResponse], store, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.secrets_store.stores.with_raw_response.create(
+                account_id="",
+                body=[{"name": "service_x_keys"}],
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        store = client.secrets_store.stores.list(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[StoreListResponse], store, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        store = client.secrets_store.stores.list(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            direction="asc",
+            order="name",
+            page=2,
+            per_page=20,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[StoreListResponse], store, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.secrets_store.stores.with_raw_response.list(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        store = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[StoreListResponse], store, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.secrets_store.stores.with_streaming_response.list(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            store = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[StoreListResponse], store, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.secrets_store.stores.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        store = client.secrets_store.stores.delete(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[StoreDeleteResponse], store, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.secrets_store.stores.with_raw_response.delete(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        store = response.parse()
+        assert_matches_type(Optional[StoreDeleteResponse], store, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.secrets_store.stores.with_streaming_response.delete(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            store = response.parse()
+            assert_matches_type(Optional[StoreDeleteResponse], store, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.secrets_store.stores.with_raw_response.delete(
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `store_id` but received ''"):
+            client.secrets_store.stores.with_raw_response.delete(
+                store_id="",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncStores:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        store = await async_client.secrets_store.stores.create(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"name": "service_x_keys"}],
+        )
+        assert_matches_type(AsyncSinglePage[StoreCreateResponse], store, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.secrets_store.stores.with_raw_response.create(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"name": "service_x_keys"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        store = await response.parse()
+        assert_matches_type(AsyncSinglePage[StoreCreateResponse], store, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.secrets_store.stores.with_streaming_response.create(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"name": "service_x_keys"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            store = await response.parse()
+            assert_matches_type(AsyncSinglePage[StoreCreateResponse], store, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.secrets_store.stores.with_raw_response.create(
+                account_id="",
+                body=[{"name": "service_x_keys"}],
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        store = await async_client.secrets_store.stores.list(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[StoreListResponse], store, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        store = await async_client.secrets_store.stores.list(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            direction="asc",
+            order="name",
+            page=2,
+            per_page=20,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[StoreListResponse], store, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.secrets_store.stores.with_raw_response.list(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        store = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[StoreListResponse], store, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.secrets_store.stores.with_streaming_response.list(
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            store = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[StoreListResponse], store, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.secrets_store.stores.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        store = await async_client.secrets_store.stores.delete(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[StoreDeleteResponse], store, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.secrets_store.stores.with_raw_response.delete(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        store = await response.parse()
+        assert_matches_type(Optional[StoreDeleteResponse], store, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.secrets_store.stores.with_streaming_response.delete(
+            store_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="985e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            store = await response.parse()
+            assert_matches_type(Optional[StoreDeleteResponse], store, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.secrets_store.stores.with_raw_response.delete(
+                store_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `store_id` but received ''"):
+            await async_client.secrets_store.stores.with_raw_response.delete(
+                store_id="",
+                account_id="985e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/security_center/__init__.py b/tests/api_resources/security_center/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/security_center/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/security_center/insights/__init__.py b/tests/api_resources/security_center/insights/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/security_center/insights/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/security_center/insights/test_class_.py b/tests/api_resources/security_center/insights/test_class_.py
new file mode 100644
index 00000000000..0609b2be126
--- /dev/null
+++ b/tests/api_resources/security_center/insights/test_class_.py
@@ -0,0 +1,156 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.security_center.insights import ClassGetResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestClass:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        class_ = client.security_center.insights.class_.get(
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ClassGetResponse], class_, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        class_ = client.security_center.insights.class_.get(
+            account_id="account_id",
+            dismissed=False,
+            issue_class=["a_record_dangling", "always_use_https_not_enabled"],
+            issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
+            issue_type=["compliance_violation", "email_security"],
+            issue_type_neq=["compliance_violation", "email_security"],
+            product=["access", "dns"],
+            product_neq=["access", "dns"],
+            severity=["low", "moderate"],
+            severity_neq=["low", "moderate"],
+            subject=["example.com"],
+            subject_neq=["example.com"],
+        )
+        assert_matches_type(Optional[ClassGetResponse], class_, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.security_center.insights.class_.with_raw_response.get(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        class_ = response.parse()
+        assert_matches_type(Optional[ClassGetResponse], class_, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.security_center.insights.class_.with_streaming_response.get(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            class_ = response.parse()
+            assert_matches_type(Optional[ClassGetResponse], class_, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.security_center.insights.class_.with_raw_response.get(
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.security_center.insights.class_.with_raw_response.get(
+                account_id="account_id",
+            )
+
+
+class TestAsyncClass:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        class_ = await async_client.security_center.insights.class_.get(
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ClassGetResponse], class_, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        class_ = await async_client.security_center.insights.class_.get(
+            account_id="account_id",
+            dismissed=False,
+            issue_class=["a_record_dangling", "always_use_https_not_enabled"],
+            issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
+            issue_type=["compliance_violation", "email_security"],
+            issue_type_neq=["compliance_violation", "email_security"],
+            product=["access", "dns"],
+            product_neq=["access", "dns"],
+            severity=["low", "moderate"],
+            severity_neq=["low", "moderate"],
+            subject=["example.com"],
+            subject_neq=["example.com"],
+        )
+        assert_matches_type(Optional[ClassGetResponse], class_, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.security_center.insights.class_.with_raw_response.get(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        class_ = await response.parse()
+        assert_matches_type(Optional[ClassGetResponse], class_, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.security_center.insights.class_.with_streaming_response.get(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            class_ = await response.parse()
+            assert_matches_type(Optional[ClassGetResponse], class_, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.security_center.insights.class_.with_raw_response.get(
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.security_center.insights.class_.with_raw_response.get(
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/security_center/insights/test_severity.py b/tests/api_resources/security_center/insights/test_severity.py
new file mode 100644
index 00000000000..589dd72a083
--- /dev/null
+++ b/tests/api_resources/security_center/insights/test_severity.py
@@ -0,0 +1,156 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.security_center.insights import SeverityGetResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSeverity:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        severity = client.security_center.insights.severity.get(
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[SeverityGetResponse], severity, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        severity = client.security_center.insights.severity.get(
+            account_id="account_id",
+            dismissed=False,
+            issue_class=["a_record_dangling", "always_use_https_not_enabled"],
+            issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
+            issue_type=["compliance_violation", "email_security"],
+            issue_type_neq=["compliance_violation", "email_security"],
+            product=["access", "dns"],
+            product_neq=["access", "dns"],
+            severity=["low", "moderate"],
+            severity_neq=["low", "moderate"],
+            subject=["example.com"],
+            subject_neq=["example.com"],
+        )
+        assert_matches_type(Optional[SeverityGetResponse], severity, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.security_center.insights.severity.with_raw_response.get(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        severity = response.parse()
+        assert_matches_type(Optional[SeverityGetResponse], severity, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.security_center.insights.severity.with_streaming_response.get(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            severity = response.parse()
+            assert_matches_type(Optional[SeverityGetResponse], severity, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.security_center.insights.severity.with_raw_response.get(
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.security_center.insights.severity.with_raw_response.get(
+                account_id="account_id",
+            )
+
+
+class TestAsyncSeverity:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        severity = await async_client.security_center.insights.severity.get(
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[SeverityGetResponse], severity, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        severity = await async_client.security_center.insights.severity.get(
+            account_id="account_id",
+            dismissed=False,
+            issue_class=["a_record_dangling", "always_use_https_not_enabled"],
+            issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
+            issue_type=["compliance_violation", "email_security"],
+            issue_type_neq=["compliance_violation", "email_security"],
+            product=["access", "dns"],
+            product_neq=["access", "dns"],
+            severity=["low", "moderate"],
+            severity_neq=["low", "moderate"],
+            subject=["example.com"],
+            subject_neq=["example.com"],
+        )
+        assert_matches_type(Optional[SeverityGetResponse], severity, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.security_center.insights.severity.with_raw_response.get(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        severity = await response.parse()
+        assert_matches_type(Optional[SeverityGetResponse], severity, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.security_center.insights.severity.with_streaming_response.get(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            severity = await response.parse()
+            assert_matches_type(Optional[SeverityGetResponse], severity, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.security_center.insights.severity.with_raw_response.get(
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.security_center.insights.severity.with_raw_response.get(
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/security_center/insights/test_type.py b/tests/api_resources/security_center/insights/test_type.py
new file mode 100644
index 00000000000..e9ae172ed08
--- /dev/null
+++ b/tests/api_resources/security_center/insights/test_type.py
@@ -0,0 +1,156 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.security_center.insights import TypeGetResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestType:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        type = client.security_center.insights.type.get(
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[TypeGetResponse], type, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        type = client.security_center.insights.type.get(
+            account_id="account_id",
+            dismissed=False,
+            issue_class=["a_record_dangling", "always_use_https_not_enabled"],
+            issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
+            issue_type=["compliance_violation", "email_security"],
+            issue_type_neq=["compliance_violation", "email_security"],
+            product=["access", "dns"],
+            product_neq=["access", "dns"],
+            severity=["low", "moderate"],
+            severity_neq=["low", "moderate"],
+            subject=["example.com"],
+            subject_neq=["example.com"],
+        )
+        assert_matches_type(Optional[TypeGetResponse], type, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.security_center.insights.type.with_raw_response.get(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        type = response.parse()
+        assert_matches_type(Optional[TypeGetResponse], type, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.security_center.insights.type.with_streaming_response.get(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            type = response.parse()
+            assert_matches_type(Optional[TypeGetResponse], type, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.security_center.insights.type.with_raw_response.get(
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.security_center.insights.type.with_raw_response.get(
+                account_id="account_id",
+            )
+
+
+class TestAsyncType:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        type = await async_client.security_center.insights.type.get(
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[TypeGetResponse], type, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        type = await async_client.security_center.insights.type.get(
+            account_id="account_id",
+            dismissed=False,
+            issue_class=["a_record_dangling", "always_use_https_not_enabled"],
+            issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
+            issue_type=["compliance_violation", "email_security"],
+            issue_type_neq=["compliance_violation", "email_security"],
+            product=["access", "dns"],
+            product_neq=["access", "dns"],
+            severity=["low", "moderate"],
+            severity_neq=["low", "moderate"],
+            subject=["example.com"],
+            subject_neq=["example.com"],
+        )
+        assert_matches_type(Optional[TypeGetResponse], type, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.security_center.insights.type.with_raw_response.get(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        type = await response.parse()
+        assert_matches_type(Optional[TypeGetResponse], type, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.security_center.insights.type.with_streaming_response.get(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            type = await response.parse()
+            assert_matches_type(Optional[TypeGetResponse], type, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.security_center.insights.type.with_raw_response.get(
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.security_center.insights.type.with_raw_response.get(
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/security_center/test_insights.py b/tests/api_resources/security_center/test_insights.py
new file mode 100644
index 00000000000..4c92fe945f9
--- /dev/null
+++ b/tests/api_resources/security_center/test_insights.py
@@ -0,0 +1,300 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePagination, AsyncV4PagePagination
+from cloudflare.types.security_center import (
+    InsightListResponse,
+    InsightDismissResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestInsights:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        insight = client.security_center.insights.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncV4PagePagination[Optional[InsightListResponse]], insight, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        insight = client.security_center.insights.list(
+            account_id="account_id",
+            dismissed=False,
+            issue_class=["a_record_dangling", "always_use_https_not_enabled"],
+            issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
+            issue_type=["compliance_violation", "email_security"],
+            issue_type_neq=["compliance_violation", "email_security"],
+            page=1,
+            per_page=25,
+            product=["access", "dns"],
+            product_neq=["access", "dns"],
+            severity=["low", "moderate"],
+            severity_neq=["low", "moderate"],
+            subject=["example.com"],
+            subject_neq=["example.com"],
+        )
+        assert_matches_type(SyncV4PagePagination[Optional[InsightListResponse]], insight, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.security_center.insights.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        insight = response.parse()
+        assert_matches_type(SyncV4PagePagination[Optional[InsightListResponse]], insight, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.security_center.insights.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            insight = response.parse()
+            assert_matches_type(SyncV4PagePagination[Optional[InsightListResponse]], insight, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.security_center.insights.with_raw_response.list(
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.security_center.insights.with_raw_response.list(
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_method_dismiss(self, client: Cloudflare) -> None:
+        insight = client.security_center.insights.dismiss(
+            issue_id="issue_id",
+            account_id="account_id",
+        )
+        assert_matches_type(InsightDismissResponse, insight, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_method_dismiss_with_all_params(self, client: Cloudflare) -> None:
+        insight = client.security_center.insights.dismiss(
+            issue_id="issue_id",
+            account_id="account_id",
+            dismiss=True,
+        )
+        assert_matches_type(InsightDismissResponse, insight, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_raw_response_dismiss(self, client: Cloudflare) -> None:
+        response = client.security_center.insights.with_raw_response.dismiss(
+            issue_id="issue_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        insight = response.parse()
+        assert_matches_type(InsightDismissResponse, insight, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_streaming_response_dismiss(self, client: Cloudflare) -> None:
+        with client.security_center.insights.with_streaming_response.dismiss(
+            issue_id="issue_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            insight = response.parse()
+            assert_matches_type(InsightDismissResponse, insight, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    def test_path_params_dismiss(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `issue_id` but received ''"):
+            client.security_center.insights.with_raw_response.dismiss(
+                issue_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.security_center.insights.with_raw_response.dismiss(
+                issue_id="issue_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.security_center.insights.with_raw_response.dismiss(
+                issue_id="issue_id",
+                account_id="account_id",
+            )
+
+
+class TestAsyncInsights:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        insight = await async_client.security_center.insights.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncV4PagePagination[Optional[InsightListResponse]], insight, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        insight = await async_client.security_center.insights.list(
+            account_id="account_id",
+            dismissed=False,
+            issue_class=["a_record_dangling", "always_use_https_not_enabled"],
+            issue_class_neq=["a_record_dangling", "always_use_https_not_enabled"],
+            issue_type=["compliance_violation", "email_security"],
+            issue_type_neq=["compliance_violation", "email_security"],
+            page=1,
+            per_page=25,
+            product=["access", "dns"],
+            product_neq=["access", "dns"],
+            severity=["low", "moderate"],
+            severity_neq=["low", "moderate"],
+            subject=["example.com"],
+            subject_neq=["example.com"],
+        )
+        assert_matches_type(AsyncV4PagePagination[Optional[InsightListResponse]], insight, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.security_center.insights.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        insight = await response.parse()
+        assert_matches_type(AsyncV4PagePagination[Optional[InsightListResponse]], insight, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.security_center.insights.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            insight = await response.parse()
+            assert_matches_type(AsyncV4PagePagination[Optional[InsightListResponse]], insight, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.security_center.insights.with_raw_response.list(
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.security_center.insights.with_raw_response.list(
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_method_dismiss(self, async_client: AsyncCloudflare) -> None:
+        insight = await async_client.security_center.insights.dismiss(
+            issue_id="issue_id",
+            account_id="account_id",
+        )
+        assert_matches_type(InsightDismissResponse, insight, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_method_dismiss_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        insight = await async_client.security_center.insights.dismiss(
+            issue_id="issue_id",
+            account_id="account_id",
+            dismiss=True,
+        )
+        assert_matches_type(InsightDismissResponse, insight, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_raw_response_dismiss(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.security_center.insights.with_raw_response.dismiss(
+            issue_id="issue_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        insight = await response.parse()
+        assert_matches_type(InsightDismissResponse, insight, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_streaming_response_dismiss(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.security_center.insights.with_streaming_response.dismiss(
+            issue_id="issue_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            insight = await response.parse()
+            assert_matches_type(InsightDismissResponse, insight, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken prism assertion")
+    @parametrize
+    async def test_path_params_dismiss(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `issue_id` but received ''"):
+            await async_client.security_center.insights.with_raw_response.dismiss(
+                issue_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.security_center.insights.with_raw_response.dismiss(
+                issue_id="issue_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.security_center.insights.with_raw_response.dismiss(
+                issue_id="issue_id",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/snippets/test_content.py b/tests/api_resources/snippets/test_content.py
index 371c111994b..a3d69547087 100644
--- a/tests/api_resources/snippets/test_content.py
+++ b/tests/api_resources/snippets/test_content.py
@@ -27,12 +27,12 @@ class TestContent:
     @parametrize
     @pytest.mark.respx(base_url=base_url)
     def test_method_get(self, client: Cloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/zones/023e105f4ecef8ad9ca31a8372d0c353/snippets/snippet_name_01/content").mock(
+        respx_mock.get("/zones/9f1839b6152d298aca64c4e906b6d074/snippets/my_snippet/content").mock(
             return_value=httpx.Response(200, json={"foo": "bar"})
         )
         content = client.snippets.content.get(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
         assert content.is_closed
         assert content.json() == {"foo": "bar"}
@@ -43,13 +43,13 @@ def test_method_get(self, client: Cloudflare, respx_mock: MockRouter) -> None:
     @parametrize
     @pytest.mark.respx(base_url=base_url)
     def test_raw_response_get(self, client: Cloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/zones/023e105f4ecef8ad9ca31a8372d0c353/snippets/snippet_name_01/content").mock(
+        respx_mock.get("/zones/9f1839b6152d298aca64c4e906b6d074/snippets/my_snippet/content").mock(
             return_value=httpx.Response(200, json={"foo": "bar"})
         )
 
         content = client.snippets.content.with_raw_response.get(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
 
         assert content.is_closed is True
@@ -61,12 +61,12 @@ def test_raw_response_get(self, client: Cloudflare, respx_mock: MockRouter) -> N
     @parametrize
     @pytest.mark.respx(base_url=base_url)
     def test_streaming_response_get(self, client: Cloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/zones/023e105f4ecef8ad9ca31a8372d0c353/snippets/snippet_name_01/content").mock(
+        respx_mock.get("/zones/9f1839b6152d298aca64c4e906b6d074/snippets/my_snippet/content").mock(
             return_value=httpx.Response(200, json={"foo": "bar"})
         )
         with client.snippets.content.with_streaming_response.get(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         ) as content:
             assert not content.is_closed
             assert content.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -83,30 +83,32 @@ def test_streaming_response_get(self, client: Cloudflare, respx_mock: MockRouter
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.snippets.content.with_raw_response.get(
-                snippet_name="snippet_name_01",
+                snippet_name="my_snippet",
                 zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `snippet_name` but received ''"):
             client.snippets.content.with_raw_response.get(
                 snippet_name="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="9f1839b6152d298aca64c4e906b6d074",
             )
 
 
 class TestAsyncContent:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="throwing HTTP 415")
     @parametrize
     @pytest.mark.respx(base_url=base_url)
     async def test_method_get(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/zones/023e105f4ecef8ad9ca31a8372d0c353/snippets/snippet_name_01/content").mock(
+        respx_mock.get("/zones/9f1839b6152d298aca64c4e906b6d074/snippets/my_snippet/content").mock(
             return_value=httpx.Response(200, json={"foo": "bar"})
         )
         content = await async_client.snippets.content.get(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
         assert content.is_closed
         assert await content.json() == {"foo": "bar"}
@@ -117,13 +119,13 @@ async def test_method_get(self, async_client: AsyncCloudflare, respx_mock: MockR
     @parametrize
     @pytest.mark.respx(base_url=base_url)
     async def test_raw_response_get(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/zones/023e105f4ecef8ad9ca31a8372d0c353/snippets/snippet_name_01/content").mock(
+        respx_mock.get("/zones/9f1839b6152d298aca64c4e906b6d074/snippets/my_snippet/content").mock(
             return_value=httpx.Response(200, json={"foo": "bar"})
         )
 
         content = await async_client.snippets.content.with_raw_response.get(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
 
         assert content.is_closed is True
@@ -135,12 +137,12 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare, respx_mock:
     @parametrize
     @pytest.mark.respx(base_url=base_url)
     async def test_streaming_response_get(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/zones/023e105f4ecef8ad9ca31a8372d0c353/snippets/snippet_name_01/content").mock(
+        respx_mock.get("/zones/9f1839b6152d298aca64c4e906b6d074/snippets/my_snippet/content").mock(
             return_value=httpx.Response(200, json={"foo": "bar"})
         )
         async with async_client.snippets.content.with_streaming_response.get(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         ) as content:
             assert not content.is_closed
             assert content.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -157,12 +159,12 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare, respx
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.snippets.content.with_raw_response.get(
-                snippet_name="snippet_name_01",
+                snippet_name="my_snippet",
                 zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `snippet_name` but received ''"):
             await async_client.snippets.content.with_raw_response.get(
                 snippet_name="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="9f1839b6152d298aca64c4e906b6d074",
             )
diff --git a/tests/api_resources/snippets/test_rules.py b/tests/api_resources/snippets/test_rules.py
index 83e021043b6..53da364b377 100644
--- a/tests/api_resources/snippets/test_rules.py
+++ b/tests/api_resources/snippets/test_rules.py
@@ -3,14 +3,14 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.snippets import RuleListResponse, RuleUpdateResponse
+from cloudflare.types.snippets import RuleListResponse, RuleDeleteResponse, RuleUpdateResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -21,58 +21,49 @@ class TestRules:
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         rule = client.snippets.rules.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
-
-    @parametrize
-    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        rule = client.snippets.rules.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
             rules=[
                 {
-                    "description": "Rule description",
-                    "enabled": True,
-                    "expression": 'http.cookie eq "a=b"',
-                    "snippet_name": "snippet_name_01",
-                },
-                {
-                    "description": "Rule description",
-                    "enabled": True,
-                    "expression": 'http.cookie eq "a=b"',
-                    "snippet_name": "snippet_name_01",
-                },
-                {
-                    "description": "Rule description",
-                    "enabled": True,
-                    "expression": 'http.cookie eq "a=b"',
-                    "snippet_name": "snippet_name_01",
-                },
+                    "expression": "ip.src eq 1.1.1.1",
+                    "snippet_name": "my_snippet",
+                }
             ],
         )
-        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+        assert_matches_type(SyncSinglePage[RuleUpdateResponse], rule, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.snippets.rules.with_raw_response.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            rules=[
+                {
+                    "expression": "ip.src eq 1.1.1.1",
+                    "snippet_name": "my_snippet",
+                }
+            ],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rule = response.parse()
-        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+        assert_matches_type(SyncSinglePage[RuleUpdateResponse], rule, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.snippets.rules.with_streaming_response.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            rules=[
+                {
+                    "expression": "ip.src eq 1.1.1.1",
+                    "snippet_name": "my_snippet",
+                }
+            ],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             rule = response.parse()
-            assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+            assert_matches_type(SyncSinglePage[RuleUpdateResponse], rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -81,19 +72,25 @@ def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.snippets.rules.with_raw_response.update(
                 zone_id="",
+                rules=[
+                    {
+                        "expression": "ip.src eq 1.1.1.1",
+                        "snippet_name": "my_snippet",
+                    }
+                ],
             )
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         rule = client.snippets.rules.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
         assert_matches_type(SyncSinglePage[RuleListResponse], rule, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.snippets.rules.with_raw_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
 
         assert response.is_closed is True
@@ -104,7 +101,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.snippets.rules.with_streaming_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -121,65 +118,96 @@ def test_path_params_list(self, client: Cloudflare) -> None:
                 zone_id="",
             )
 
-
-class TestAsyncRules:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        rule = client.snippets.rules.delete(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        )
+        assert_matches_type(SyncSinglePage[RuleDeleteResponse], rule, path=["response"])
 
     @parametrize
-    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        rule = await async_client.snippets.rules.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.snippets.rules.with_raw_response.delete(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
-        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(SyncSinglePage[RuleDeleteResponse], rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.snippets.rules.with_streaming_response.delete(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = response.parse()
+            assert_matches_type(SyncSinglePage[RuleDeleteResponse], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.snippets.rules.with_raw_response.delete(
+                zone_id="",
+            )
+
+
+class TestAsyncRules:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
-    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         rule = await async_client.snippets.rules.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
             rules=[
                 {
-                    "description": "Rule description",
-                    "enabled": True,
-                    "expression": 'http.cookie eq "a=b"',
-                    "snippet_name": "snippet_name_01",
-                },
-                {
-                    "description": "Rule description",
-                    "enabled": True,
-                    "expression": 'http.cookie eq "a=b"',
-                    "snippet_name": "snippet_name_01",
-                },
-                {
-                    "description": "Rule description",
-                    "enabled": True,
-                    "expression": 'http.cookie eq "a=b"',
-                    "snippet_name": "snippet_name_01",
-                },
+                    "expression": "ip.src eq 1.1.1.1",
+                    "snippet_name": "my_snippet",
+                }
             ],
         )
-        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[RuleUpdateResponse], rule, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.snippets.rules.with_raw_response.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            rules=[
+                {
+                    "expression": "ip.src eq 1.1.1.1",
+                    "snippet_name": "my_snippet",
+                }
+            ],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rule = await response.parse()
-        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[RuleUpdateResponse], rule, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.snippets.rules.with_streaming_response.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            rules=[
+                {
+                    "expression": "ip.src eq 1.1.1.1",
+                    "snippet_name": "my_snippet",
+                }
+            ],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             rule = await response.parse()
-            assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+            assert_matches_type(AsyncSinglePage[RuleUpdateResponse], rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -188,19 +216,25 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.snippets.rules.with_raw_response.update(
                 zone_id="",
+                rules=[
+                    {
+                        "expression": "ip.src eq 1.1.1.1",
+                        "snippet_name": "my_snippet",
+                    }
+                ],
             )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         rule = await async_client.snippets.rules.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
         assert_matches_type(AsyncSinglePage[RuleListResponse], rule, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.snippets.rules.with_raw_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
 
         assert response.is_closed is True
@@ -211,7 +245,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.snippets.rules.with_streaming_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -227,3 +261,41 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
             await async_client.snippets.rules.with_raw_response.list(
                 zone_id="",
             )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.snippets.rules.delete(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        )
+        assert_matches_type(AsyncSinglePage[RuleDeleteResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.snippets.rules.with_raw_response.delete(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(AsyncSinglePage[RuleDeleteResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.snippets.rules.with_streaming_response.delete(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = await response.parse()
+            assert_matches_type(AsyncSinglePage[RuleDeleteResponse], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.snippets.rules.with_raw_response.delete(
+                zone_id="",
+            )
diff --git a/tests/api_resources/spectrum/analytics/aggregates/test_currents.py b/tests/api_resources/spectrum/analytics/aggregates/test_currents.py
index de18b708629..e5734e2287b 100644
--- a/tests/api_resources/spectrum/analytics/aggregates/test_currents.py
+++ b/tests/api_resources/spectrum/analytics/aggregates/test_currents.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
@@ -20,99 +20,99 @@ class TestCurrents:
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         current = client.spectrum.analytics.aggregates.currents.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(CurrentGetResponse, current, path=["response"])
+        assert_matches_type(Optional[CurrentGetResponse], current, path=["response"])
 
     @parametrize
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         current = client.spectrum.analytics.aggregates.currents.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
-            app_id_param="ea95132c15732412d22c1476fa83f27a,d122c5f4bb71e25cc9e86ab43b142e2f",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             app_id="ea95132c15732412d22c1476fa83f27a,d122c5f4bb71e25cc9e86ab43b142e2f",
             colo_name="PDX",
         )
-        assert_matches_type(CurrentGetResponse, current, path=["response"])
+        assert_matches_type(Optional[CurrentGetResponse], current, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.spectrum.analytics.aggregates.currents.with_raw_response.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         current = response.parse()
-        assert_matches_type(CurrentGetResponse, current, path=["response"])
+        assert_matches_type(Optional[CurrentGetResponse], current, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.spectrum.analytics.aggregates.currents.with_streaming_response.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             current = response.parse()
-            assert_matches_type(CurrentGetResponse, current, path=["response"])
+            assert_matches_type(Optional[CurrentGetResponse], current, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.spectrum.analytics.aggregates.currents.with_raw_response.get(
-                zone="",
+                zone_id="",
             )
 
 
 class TestAsyncCurrents:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         current = await async_client.spectrum.analytics.aggregates.currents.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(CurrentGetResponse, current, path=["response"])
+        assert_matches_type(Optional[CurrentGetResponse], current, path=["response"])
 
     @parametrize
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         current = await async_client.spectrum.analytics.aggregates.currents.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
-            app_id_param="ea95132c15732412d22c1476fa83f27a,d122c5f4bb71e25cc9e86ab43b142e2f",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             app_id="ea95132c15732412d22c1476fa83f27a,d122c5f4bb71e25cc9e86ab43b142e2f",
             colo_name="PDX",
         )
-        assert_matches_type(CurrentGetResponse, current, path=["response"])
+        assert_matches_type(Optional[CurrentGetResponse], current, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.spectrum.analytics.aggregates.currents.with_raw_response.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         current = await response.parse()
-        assert_matches_type(CurrentGetResponse, current, path=["response"])
+        assert_matches_type(Optional[CurrentGetResponse], current, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.spectrum.analytics.aggregates.currents.with_streaming_response.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             current = await response.parse()
-            assert_matches_type(CurrentGetResponse, current, path=["response"])
+            assert_matches_type(Optional[CurrentGetResponse], current, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.spectrum.analytics.aggregates.currents.with_raw_response.get(
-                zone="",
+                zone_id="",
             )
diff --git a/tests/api_resources/spectrum/analytics/events/test_bytimes.py b/tests/api_resources/spectrum/analytics/events/test_bytimes.py
index 70f1ba3f65d..0699c930575 100644
--- a/tests/api_resources/spectrum/analytics/events/test_bytimes.py
+++ b/tests/api_resources/spectrum/analytics/events/test_bytimes.py
@@ -21,28 +21,30 @@ class TestBytimes:
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         bytime = client.spectrum.analytics.events.bytimes.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            time_delta="minute",
         )
         assert_matches_type(Optional[BytimeGetResponse], bytime, path=["response"])
 
     @parametrize
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         bytime = client.spectrum.analytics.events.bytimes.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            time_delta="minute",
             dimensions=["event", "appID"],
             filters="event==disconnect%20AND%20coloName!=SFO",
             metrics=["count", "bytesIngress"],
-            since=parse_datetime("2014-01-02T02:20:00Z"),
+            since=parse_datetime("2014-01-01T05:20:00.12345Z"),
             sort=["+count", "-bytesIngress"],
-            time_delta="minute",
-            until=parse_datetime("2014-01-02T03:20:00Z"),
+            until=parse_datetime("2014-01-01T05:20:00.12345Z"),
         )
         assert_matches_type(Optional[BytimeGetResponse], bytime, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.spectrum.analytics.events.bytimes.with_raw_response.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            time_delta="minute",
         )
 
         assert response.is_closed is True
@@ -53,7 +55,8 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.spectrum.analytics.events.bytimes.with_streaming_response.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            time_delta="minute",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -65,40 +68,45 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.spectrum.analytics.events.bytimes.with_raw_response.get(
-                zone="",
+                zone_id="",
+                time_delta="minute",
             )
 
 
 class TestAsyncBytimes:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         bytime = await async_client.spectrum.analytics.events.bytimes.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            time_delta="minute",
         )
         assert_matches_type(Optional[BytimeGetResponse], bytime, path=["response"])
 
     @parametrize
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         bytime = await async_client.spectrum.analytics.events.bytimes.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            time_delta="minute",
             dimensions=["event", "appID"],
             filters="event==disconnect%20AND%20coloName!=SFO",
             metrics=["count", "bytesIngress"],
-            since=parse_datetime("2014-01-02T02:20:00Z"),
+            since=parse_datetime("2014-01-01T05:20:00.12345Z"),
             sort=["+count", "-bytesIngress"],
-            time_delta="minute",
-            until=parse_datetime("2014-01-02T03:20:00Z"),
+            until=parse_datetime("2014-01-01T05:20:00.12345Z"),
         )
         assert_matches_type(Optional[BytimeGetResponse], bytime, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.spectrum.analytics.events.bytimes.with_raw_response.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            time_delta="minute",
         )
 
         assert response.is_closed is True
@@ -109,7 +117,8 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.spectrum.analytics.events.bytimes.with_streaming_response.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            time_delta="minute",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -121,7 +130,8 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.spectrum.analytics.events.bytimes.with_raw_response.get(
-                zone="",
+                zone_id="",
+                time_delta="minute",
             )
diff --git a/tests/api_resources/spectrum/analytics/events/test_summaries.py b/tests/api_resources/spectrum/analytics/events/test_summaries.py
index d1e1bedcdf7..bf892c8df62 100644
--- a/tests/api_resources/spectrum/analytics/events/test_summaries.py
+++ b/tests/api_resources/spectrum/analytics/events/test_summaries.py
@@ -21,27 +21,27 @@ class TestSummaries:
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         summary = client.spectrum.analytics.events.summaries.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[SummaryGetResponse], summary, path=["response"])
 
     @parametrize
     def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         summary = client.spectrum.analytics.events.summaries.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dimensions=["event", "appID"],
             filters="event==disconnect%20AND%20coloName!=SFO",
             metrics=["count", "bytesIngress"],
-            since=parse_datetime("2014-01-02T02:20:00Z"),
+            since=parse_datetime("2014-01-01T05:20:00.12345Z"),
             sort=["+count", "-bytesIngress"],
-            until=parse_datetime("2014-01-02T03:20:00Z"),
+            until=parse_datetime("2014-01-01T05:20:00.12345Z"),
         )
         assert_matches_type(Optional[SummaryGetResponse], summary, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.spectrum.analytics.events.summaries.with_raw_response.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -52,7 +52,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.spectrum.analytics.events.summaries.with_streaming_response.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -64,39 +64,41 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.spectrum.analytics.events.summaries.with_raw_response.get(
-                zone="",
+                zone_id="",
             )
 
 
 class TestAsyncSummaries:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         summary = await async_client.spectrum.analytics.events.summaries.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[SummaryGetResponse], summary, path=["response"])
 
     @parametrize
     async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
         summary = await async_client.spectrum.analytics.events.summaries.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dimensions=["event", "appID"],
             filters="event==disconnect%20AND%20coloName!=SFO",
             metrics=["count", "bytesIngress"],
-            since=parse_datetime("2014-01-02T02:20:00Z"),
+            since=parse_datetime("2014-01-01T05:20:00.12345Z"),
             sort=["+count", "-bytesIngress"],
-            until=parse_datetime("2014-01-02T03:20:00Z"),
+            until=parse_datetime("2014-01-01T05:20:00.12345Z"),
         )
         assert_matches_type(Optional[SummaryGetResponse], summary, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.spectrum.analytics.events.summaries.with_raw_response.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -107,7 +109,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.spectrum.analytics.events.summaries.with_streaming_response.get(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -119,7 +121,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.spectrum.analytics.events.summaries.with_raw_response.get(
-                zone="",
+                zone_id="",
             )
diff --git a/tests/api_resources/spectrum/test_apps.py b/tests/api_resources/spectrum/test_apps.py
index 58722950191..3e29932b05b 100644
--- a/tests/api_resources/spectrum/test_apps.py
+++ b/tests/api_resources/spectrum/test_apps.py
@@ -12,6 +12,7 @@
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.spectrum import (
     AppGetResponse,
+    AppListResponse,
     AppCreateResponse,
     AppDeleteResponse,
     AppUpdateResponse,
@@ -23,51 +24,119 @@
 class TestApps:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    def test_method_create(self, client: Cloudflare) -> None:
+    def test_method_create_overload_1(self, client: Cloudflare) -> None:
         app = client.spectrum.apps.create(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dns={},
-            origin_dns={},
-            origin_port=22,
             protocol="tcp/22",
+            traffic_type="direct",
         )
         assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+    def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> None:
         app = client.spectrum.apps.create(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dns={
                 "name": "ssh.example.com",
                 "type": "CNAME",
             },
-            origin_dns={
-                "name": "origin.example.com",
-                "ttl": 600,
-                "type": "",
-            },
-            origin_port=22,
             protocol="tcp/22",
+            traffic_type="direct",
             argo_smart_routing=True,
             edge_ips={
                 "connectivity": "all",
                 "type": "dynamic",
             },
-            ip_firewall=True,
+            ip_firewall=False,
+            origin_direct=["tcp://127.0.0.1:8080"],
+            origin_dns={
+                "name": "origin.example.com",
+                "ttl": 600,
+                "type": "",
+            },
+            origin_port=22,
             proxy_protocol="off",
-            tls="full",
+            tls="off",
+        )
+        assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_create_overload_1(self, client: Cloudflare) -> None:
+        response = client.spectrum.apps.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dns={},
+            protocol="tcp/22",
             traffic_type="direct",
         )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        app = response.parse()
         assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    def test_raw_response_create(self, client: Cloudflare) -> None:
+    def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
+        with client.spectrum.apps.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dns={},
+            protocol="tcp/22",
+            traffic_type="direct",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            app = response.parse()
+            assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.spectrum.apps.with_raw_response.create(
+                zone_id="",
+                dns={},
+                protocol="tcp/22",
+                traffic_type="direct",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_create_overload_2(self, client: Cloudflare) -> None:
+        app = client.spectrum.apps.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dns={},
+            protocol="tcp/22",
+        )
+        assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        app = client.spectrum.apps.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dns={
+                "name": "ssh.example.com",
+                "type": "CNAME",
+            },
+            protocol="tcp/22",
+            origin_direct=["tcp://127.0.0.1:8080"],
+        )
+        assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
         response = client.spectrum.apps.with_raw_response.create(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dns={},
-            origin_dns={},
-            origin_port=22,
             protocol="tcp/22",
         )
 
@@ -76,13 +145,12 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         app = response.parse()
         assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    def test_streaming_response_create(self, client: Cloudflare) -> None:
+    def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
         with client.spectrum.apps.with_streaming_response.create(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dns={},
-            origin_dns={},
-            origin_port=22,
             protocol="tcp/22",
         ) as response:
             assert not response.is_closed
@@ -93,65 +161,146 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone` but received ''"):
+    def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.spectrum.apps.with_raw_response.create(
-                zone="",
+                zone_id="",
                 dns={},
-                origin_dns={},
-                origin_port=22,
                 protocol="tcp/22",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    def test_method_update(self, client: Cloudflare) -> None:
+    def test_method_update_overload_1(self, client: Cloudflare) -> None:
         app = client.spectrum.apps.update(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dns={},
-            origin_dns={},
-            origin_port=22,
             protocol="tcp/22",
+            traffic_type="direct",
         )
         assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+    def test_method_update_with_all_params_overload_1(self, client: Cloudflare) -> None:
         app = client.spectrum.apps.update(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dns={
                 "name": "ssh.example.com",
                 "type": "CNAME",
             },
-            origin_dns={
-                "name": "origin.example.com",
-                "ttl": 600,
-                "type": "",
-            },
-            origin_port=22,
             protocol="tcp/22",
+            traffic_type="direct",
             argo_smart_routing=True,
             edge_ips={
                 "connectivity": "all",
                 "type": "dynamic",
             },
-            ip_firewall=True,
+            ip_firewall=False,
+            origin_direct=["tcp://127.0.0.1:8080"],
+            origin_dns={
+                "name": "origin.example.com",
+                "ttl": 600,
+                "type": "",
+            },
+            origin_port=22,
             proxy_protocol="off",
-            tls="full",
+            tls="off",
+        )
+        assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_update_overload_1(self, client: Cloudflare) -> None:
+        response = client.spectrum.apps.with_raw_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dns={},
+            protocol="tcp/22",
             traffic_type="direct",
         )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        app = response.parse()
+        assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_streaming_response_update_overload_1(self, client: Cloudflare) -> None:
+        with client.spectrum.apps.with_streaming_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dns={},
+            protocol="tcp/22",
+            traffic_type="direct",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            app = response.parse()
+            assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_path_params_update_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.spectrum.apps.with_raw_response.update(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+                dns={},
+                protocol="tcp/22",
+                traffic_type="direct",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.spectrum.apps.with_raw_response.update(
+                app_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dns={},
+                protocol="tcp/22",
+                traffic_type="direct",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_method_update_overload_2(self, client: Cloudflare) -> None:
+        app = client.spectrum.apps.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dns={},
+            protocol="tcp/22",
+        )
         assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    def test_raw_response_update(self, client: Cloudflare) -> None:
+    def test_method_update_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        app = client.spectrum.apps.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dns={
+                "name": "ssh.example.com",
+                "type": "CNAME",
+            },
+            protocol="tcp/22",
+            origin_direct=["tcp://127.0.0.1:8080"],
+        )
+        assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    def test_raw_response_update_overload_2(self, client: Cloudflare) -> None:
         response = client.spectrum.apps.with_raw_response.update(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dns={},
-            origin_dns={},
-            origin_port=22,
             protocol="tcp/22",
         )
 
@@ -160,14 +309,13 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         app = response.parse()
         assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    def test_streaming_response_update(self, client: Cloudflare) -> None:
+    def test_streaming_response_update_overload_2(self, client: Cloudflare) -> None:
         with client.spectrum.apps.with_streaming_response.update(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dns={},
-            origin_dns={},
-            origin_port=22,
             protocol="tcp/22",
         ) as response:
             assert not response.is_closed
@@ -178,90 +326,92 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone` but received ''"):
+    def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.spectrum.apps.with_raw_response.update(
-                app_id="ea95132c15732412d22c1476fa83f27a",
-                zone="",
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
                 dns={},
-                origin_dns={},
-                origin_port=22,
                 protocol="tcp/22",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
             client.spectrum.apps.with_raw_response.update(
                 app_id="",
-                zone="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dns={},
-                origin_dns={},
-                origin_port=22,
                 protocol="tcp/22",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         app = client.spectrum.apps.list(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncV4PagePaginationArray[object], app, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[AppListResponse], app, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         app = client.spectrum.apps.list(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             direction="desc",
             order="protocol",
             page=1,
             per_page=1,
         )
-        assert_matches_type(SyncV4PagePaginationArray[object], app, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[AppListResponse], app, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.spectrum.apps.with_raw_response.list(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         app = response.parse()
-        assert_matches_type(SyncV4PagePaginationArray[object], app, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[AppListResponse], app, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.spectrum.apps.with_streaming_response.list(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             app = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[object], app, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[AppListResponse], app, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.spectrum.apps.with_raw_response.list(
-                zone="",
+                zone_id="",
             )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         app = client.spectrum.apps.delete(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[AppDeleteResponse], app, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.spectrum.apps.with_raw_response.delete(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -272,8 +422,8 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.spectrum.apps.with_streaming_response.delete(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -285,115 +435,185 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.spectrum.apps.with_raw_response.delete(
-                app_id="ea95132c15732412d22c1476fa83f27a",
-                zone="",
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
             client.spectrum.apps.with_raw_response.delete(
                 app_id="",
-                zone="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         app = client.spectrum.apps.get(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AppGetResponse, app, path=["response"])
+        assert_matches_type(Optional[AppGetResponse], app, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.spectrum.apps.with_raw_response.get(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         app = response.parse()
-        assert_matches_type(AppGetResponse, app, path=["response"])
+        assert_matches_type(Optional[AppGetResponse], app, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.spectrum.apps.with_streaming_response.get(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             app = response.parse()
-            assert_matches_type(AppGetResponse, app, path=["response"])
+            assert_matches_type(Optional[AppGetResponse], app, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.spectrum.apps.with_raw_response.get(
-                app_id="ea95132c15732412d22c1476fa83f27a",
-                zone="",
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
             client.spectrum.apps.with_raw_response.get(
                 app_id="",
-                zone="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
 
 class TestAsyncApps:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
         app = await async_client.spectrum.apps.create(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dns={},
-            origin_dns={},
-            origin_port=22,
             protocol="tcp/22",
+            traffic_type="direct",
         )
         assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
         app = await async_client.spectrum.apps.create(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dns={
                 "name": "ssh.example.com",
                 "type": "CNAME",
             },
-            origin_dns={
-                "name": "origin.example.com",
-                "ttl": 600,
-                "type": "",
-            },
-            origin_port=22,
             protocol="tcp/22",
+            traffic_type="direct",
             argo_smart_routing=True,
             edge_ips={
                 "connectivity": "all",
                 "type": "dynamic",
             },
-            ip_firewall=True,
+            ip_firewall=False,
+            origin_direct=["tcp://127.0.0.1:8080"],
+            origin_dns={
+                "name": "origin.example.com",
+                "ttl": 600,
+                "type": "",
+            },
+            origin_port=22,
             proxy_protocol="off",
-            tls="full",
+            tls="off",
+        )
+        assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.spectrum.apps.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dns={},
+            protocol="tcp/22",
             traffic_type="direct",
         )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        app = await response.parse()
         assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.spectrum.apps.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dns={},
+            protocol="tcp/22",
+            traffic_type="direct",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            app = await response.parse()
+            assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.spectrum.apps.with_raw_response.create(
+                zone_id="",
+                dns={},
+                protocol="tcp/22",
+                traffic_type="direct",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        app = await async_client.spectrum.apps.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dns={},
+            protocol="tcp/22",
+        )
+        assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_create_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        app = await async_client.spectrum.apps.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dns={
+                "name": "ssh.example.com",
+                "type": "CNAME",
+            },
+            protocol="tcp/22",
+            origin_direct=["tcp://127.0.0.1:8080"],
+        )
+        assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.spectrum.apps.with_raw_response.create(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dns={},
-            origin_dns={},
-            origin_port=22,
             protocol="tcp/22",
         )
 
@@ -402,13 +622,12 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         app = await response.parse()
         assert_matches_type(Optional[AppCreateResponse], app, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
         async with async_client.spectrum.apps.with_streaming_response.create(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dns={},
-            origin_dns={},
-            origin_port=22,
             protocol="tcp/22",
         ) as response:
             assert not response.is_closed
@@ -419,65 +638,146 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone` but received ''"):
+    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.spectrum.apps.with_raw_response.create(
-                zone="",
+                zone_id="",
                 dns={},
-                origin_dns={},
-                origin_port=22,
                 protocol="tcp/22",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_overload_1(self, async_client: AsyncCloudflare) -> None:
         app = await async_client.spectrum.apps.update(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dns={},
-            origin_dns={},
-            origin_port=22,
             protocol="tcp/22",
+            traffic_type="direct",
         )
         assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
         app = await async_client.spectrum.apps.update(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dns={
                 "name": "ssh.example.com",
                 "type": "CNAME",
             },
-            origin_dns={
-                "name": "origin.example.com",
-                "ttl": 600,
-                "type": "",
-            },
-            origin_port=22,
             protocol="tcp/22",
+            traffic_type="direct",
             argo_smart_routing=True,
             edge_ips={
                 "connectivity": "all",
                 "type": "dynamic",
             },
-            ip_firewall=True,
+            ip_firewall=False,
+            origin_direct=["tcp://127.0.0.1:8080"],
+            origin_dns={
+                "name": "origin.example.com",
+                "ttl": 600,
+                "type": "",
+            },
+            origin_port=22,
             proxy_protocol="off",
-            tls="full",
+            tls="off",
+        )
+        assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.spectrum.apps.with_raw_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dns={},
+            protocol="tcp/22",
             traffic_type="direct",
         )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        app = await response.parse()
+        assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_streaming_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.spectrum.apps.with_streaming_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dns={},
+            protocol="tcp/22",
+            traffic_type="direct",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            app = await response.parse()
+            assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_path_params_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.spectrum.apps.with_raw_response.update(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+                dns={},
+                protocol="tcp/22",
+                traffic_type="direct",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.spectrum.apps.with_raw_response.update(
+                app_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dns={},
+                protocol="tcp/22",
+                traffic_type="direct",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_method_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        app = await async_client.spectrum.apps.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dns={},
+            protocol="tcp/22",
+        )
         assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        app = await async_client.spectrum.apps.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dns={
+                "name": "ssh.example.com",
+                "type": "CNAME",
+            },
+            protocol="tcp/22",
+            origin_direct=["tcp://127.0.0.1:8080"],
+        )
+        assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
+    @parametrize
+    async def test_raw_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.spectrum.apps.with_raw_response.update(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dns={},
-            origin_dns={},
-            origin_port=22,
             protocol="tcp/22",
         )
 
@@ -486,14 +786,13 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         app = await response.parse()
         assert_matches_type(Optional[AppUpdateResponse], app, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
         async with async_client.spectrum.apps.with_streaming_response.update(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             dns={},
-            origin_dns={},
-            origin_port=22,
             protocol="tcp/22",
         ) as response:
             assert not response.is_closed
@@ -504,90 +803,92 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
-    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone` but received ''"):
+    async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.spectrum.apps.with_raw_response.update(
-                app_id="ea95132c15732412d22c1476fa83f27a",
-                zone="",
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
                 dns={},
-                origin_dns={},
-                origin_port=22,
                 protocol="tcp/22",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
             await async_client.spectrum.apps.with_raw_response.update(
                 app_id="",
-                zone="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dns={},
-                origin_dns={},
-                origin_port=22,
                 protocol="tcp/22",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         app = await async_client.spectrum.apps.list(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncV4PagePaginationArray[object], app, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[AppListResponse], app, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         app = await async_client.spectrum.apps.list(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             direction="desc",
             order="protocol",
             page=1,
             per_page=1,
         )
-        assert_matches_type(AsyncV4PagePaginationArray[object], app, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[AppListResponse], app, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.spectrum.apps.with_raw_response.list(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         app = await response.parse()
-        assert_matches_type(AsyncV4PagePaginationArray[object], app, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[AppListResponse], app, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.spectrum.apps.with_streaming_response.list(
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             app = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[object], app, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[AppListResponse], app, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate HTTP 422 errors on test suite")
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.spectrum.apps.with_raw_response.list(
-                zone="",
+                zone_id="",
             )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         app = await async_client.spectrum.apps.delete(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[AppDeleteResponse], app, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.spectrum.apps.with_raw_response.delete(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -598,8 +899,8 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.spectrum.apps.with_streaming_response.delete(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -611,62 +912,62 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.spectrum.apps.with_raw_response.delete(
-                app_id="ea95132c15732412d22c1476fa83f27a",
-                zone="",
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
             await async_client.spectrum.apps.with_raw_response.delete(
                 app_id="",
-                zone="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         app = await async_client.spectrum.apps.get(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AppGetResponse, app, path=["response"])
+        assert_matches_type(Optional[AppGetResponse], app, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.spectrum.apps.with_raw_response.get(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         app = await response.parse()
-        assert_matches_type(AppGetResponse, app, path=["response"])
+        assert_matches_type(Optional[AppGetResponse], app, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.spectrum.apps.with_streaming_response.get(
-            app_id="ea95132c15732412d22c1476fa83f27a",
-            zone="023e105f4ecef8ad9ca31a8372d0c353",
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             app = await response.parse()
-            assert_matches_type(AppGetResponse, app, path=["response"])
+            assert_matches_type(Optional[AppGetResponse], app, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.spectrum.apps.with_raw_response.get(
-                app_id="ea95132c15732412d22c1476fa83f27a",
-                zone="",
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
             await async_client.spectrum.apps.with_raw_response.get(
                 app_id="",
-                zone="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/speed/pages/test_tests.py b/tests/api_resources/speed/pages/test_tests.py
index 9bc7170f416..148d3b0c93d 100644
--- a/tests/api_resources/speed/pages/test_tests.py
+++ b/tests/api_resources/speed/pages/test_tests.py
@@ -9,9 +9,9 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.speed.pages import (
     Test,
-    TestListResponse,
     TestDeleteResponse,
 )
 
@@ -84,18 +84,18 @@ def test_method_list(self, client: Cloudflare) -> None:
             url="example.com",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(TestListResponse, test, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Test], test, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         test = client.speed.pages.tests.list(
             url="example.com",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            page=1,
-            per_page=20,
+            page=0,
+            per_page=5,
             region="us-central1",
         )
-        assert_matches_type(TestListResponse, test, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Test], test, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -107,7 +107,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         test = response.parse()
-        assert_matches_type(TestListResponse, test, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Test], test, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -119,7 +119,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             test = response.parse()
-            assert_matches_type(TestListResponse, test, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[Test], test, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -256,7 +256,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTests:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -321,18 +323,18 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
             url="example.com",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(TestListResponse, test, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Test], test, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         test = await async_client.speed.pages.tests.list(
             url="example.com",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            page=1,
-            per_page=20,
+            page=0,
+            per_page=5,
             region="us-central1",
         )
-        assert_matches_type(TestListResponse, test, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Test], test, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -344,7 +346,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         test = await response.parse()
-        assert_matches_type(TestListResponse, test, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Test], test, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -356,7 +358,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             test = await response.parse()
-            assert_matches_type(TestListResponse, test, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[Test], test, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/speed/test_availabilities.py b/tests/api_resources/speed/test_availabilities.py
index 59d87a22852..8f2e328affd 100644
--- a/tests/api_resources/speed/test_availabilities.py
+++ b/tests/api_resources/speed/test_availabilities.py
@@ -57,7 +57,9 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncAvailabilities:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/speed/test_pages.py b/tests/api_resources/speed/test_pages.py
index 611a73ec015..a14bcb31c8b 100644
--- a/tests/api_resources/speed/test_pages.py
+++ b/tests/api_resources/speed/test_pages.py
@@ -151,7 +151,9 @@ def test_path_params_trend(self, client: Cloudflare) -> None:
 
 
 class TestAsyncPages:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/speed/test_schedule.py b/tests/api_resources/speed/test_schedule.py
index e3e05e0ed53..96eab910c45 100644
--- a/tests/api_resources/speed/test_schedule.py
+++ b/tests/api_resources/speed/test_schedule.py
@@ -194,7 +194,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSchedule:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/ssl/certificate_packs/test_order.py b/tests/api_resources/ssl/certificate_packs/test_order.py
deleted file mode 100644
index 3fcccbf64b9..00000000000
--- a/tests/api_resources/ssl/certificate_packs/test_order.py
+++ /dev/null
@@ -1,164 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.ssl.certificate_packs import OrderCreateResponse
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestOrder:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_create(self, client: Cloudflare) -> None:
-        order = client.ssl.certificate_packs.order.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate_authority="lets_encrypt",
-            hosts=["example.com", "*.example.com", "www.example.com"],
-            type="advanced",
-            validation_method="txt",
-            validity_days=14,
-        )
-        assert_matches_type(Optional[OrderCreateResponse], order, path=["response"])
-
-    @parametrize
-    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
-        order = client.ssl.certificate_packs.order.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate_authority="lets_encrypt",
-            hosts=["example.com", "*.example.com", "www.example.com"],
-            type="advanced",
-            validation_method="txt",
-            validity_days=14,
-            cloudflare_branding=False,
-        )
-        assert_matches_type(Optional[OrderCreateResponse], order, path=["response"])
-
-    @parametrize
-    def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.ssl.certificate_packs.order.with_raw_response.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate_authority="lets_encrypt",
-            hosts=["example.com", "*.example.com", "www.example.com"],
-            type="advanced",
-            validation_method="txt",
-            validity_days=14,
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        order = response.parse()
-        assert_matches_type(Optional[OrderCreateResponse], order, path=["response"])
-
-    @parametrize
-    def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.ssl.certificate_packs.order.with_streaming_response.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate_authority="lets_encrypt",
-            hosts=["example.com", "*.example.com", "www.example.com"],
-            type="advanced",
-            validation_method="txt",
-            validity_days=14,
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            order = response.parse()
-            assert_matches_type(Optional[OrderCreateResponse], order, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.ssl.certificate_packs.order.with_raw_response.create(
-                zone_id="",
-                certificate_authority="lets_encrypt",
-                hosts=["example.com", "*.example.com", "www.example.com"],
-                type="advanced",
-                validation_method="txt",
-                validity_days=14,
-            )
-
-
-class TestAsyncOrder:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        order = await async_client.ssl.certificate_packs.order.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate_authority="lets_encrypt",
-            hosts=["example.com", "*.example.com", "www.example.com"],
-            type="advanced",
-            validation_method="txt",
-            validity_days=14,
-        )
-        assert_matches_type(Optional[OrderCreateResponse], order, path=["response"])
-
-    @parametrize
-    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        order = await async_client.ssl.certificate_packs.order.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate_authority="lets_encrypt",
-            hosts=["example.com", "*.example.com", "www.example.com"],
-            type="advanced",
-            validation_method="txt",
-            validity_days=14,
-            cloudflare_branding=False,
-        )
-        assert_matches_type(Optional[OrderCreateResponse], order, path=["response"])
-
-    @parametrize
-    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.ssl.certificate_packs.order.with_raw_response.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate_authority="lets_encrypt",
-            hosts=["example.com", "*.example.com", "www.example.com"],
-            type="advanced",
-            validation_method="txt",
-            validity_days=14,
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        order = await response.parse()
-        assert_matches_type(Optional[OrderCreateResponse], order, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.ssl.certificate_packs.order.with_streaming_response.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate_authority="lets_encrypt",
-            hosts=["example.com", "*.example.com", "www.example.com"],
-            type="advanced",
-            validation_method="txt",
-            validity_days=14,
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            order = await response.parse()
-            assert_matches_type(Optional[OrderCreateResponse], order, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.ssl.certificate_packs.order.with_raw_response.create(
-                zone_id="",
-                certificate_authority="lets_encrypt",
-                hosts=["example.com", "*.example.com", "www.example.com"],
-                type="advanced",
-                validation_method="txt",
-                validity_days=14,
-            )
diff --git a/tests/api_resources/ssl/certificate_packs/test_quota.py b/tests/api_resources/ssl/certificate_packs/test_quota.py
index 0181a4d9e7d..2c665c9237e 100644
--- a/tests/api_resources/ssl/certificate_packs/test_quota.py
+++ b/tests/api_resources/ssl/certificate_packs/test_quota.py
@@ -57,7 +57,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncQuota:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/ssl/test_analyze.py b/tests/api_resources/ssl/test_analyze.py
index 5de06d1c3d5..cd0a9100b67 100644
--- a/tests/api_resources/ssl/test_analyze.py
+++ b/tests/api_resources/ssl/test_analyze.py
@@ -3,13 +3,12 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.ssl import AnalyzeCreateResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -22,7 +21,7 @@ def test_method_create(self, client: Cloudflare) -> None:
         analyze = client.ssl.analyze.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[AnalyzeCreateResponse], analyze, path=["response"])
+        assert_matches_type(object, analyze, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
@@ -31,7 +30,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             bundle_method="ubiquitous",
             certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
         )
-        assert_matches_type(Optional[AnalyzeCreateResponse], analyze, path=["response"])
+        assert_matches_type(object, analyze, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
@@ -42,7 +41,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         analyze = response.parse()
-        assert_matches_type(Optional[AnalyzeCreateResponse], analyze, path=["response"])
+        assert_matches_type(object, analyze, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
@@ -53,7 +52,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             analyze = response.parse()
-            assert_matches_type(Optional[AnalyzeCreateResponse], analyze, path=["response"])
+            assert_matches_type(object, analyze, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -66,14 +65,16 @@ def test_path_params_create(self, client: Cloudflare) -> None:
 
 
 class TestAsyncAnalyze:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         analyze = await async_client.ssl.analyze.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[AnalyzeCreateResponse], analyze, path=["response"])
+        assert_matches_type(object, analyze, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -82,7 +83,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             bundle_method="ubiquitous",
             certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
         )
-        assert_matches_type(Optional[AnalyzeCreateResponse], analyze, path=["response"])
+        assert_matches_type(object, analyze, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
@@ -93,7 +94,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         analyze = await response.parse()
-        assert_matches_type(Optional[AnalyzeCreateResponse], analyze, path=["response"])
+        assert_matches_type(object, analyze, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
@@ -104,7 +105,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             analyze = await response.parse()
-            assert_matches_type(Optional[AnalyzeCreateResponse], analyze, path=["response"])
+            assert_matches_type(object, analyze, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/ssl/test_certificate_packs.py b/tests/api_resources/ssl/test_certificate_packs.py
index 6bef155e88b..f2ace2cbb53 100644
--- a/tests/api_resources/ssl/test_certificate_packs.py
+++ b/tests/api_resources/ssl/test_certificate_packs.py
@@ -12,6 +12,8 @@
 from cloudflare.types.ssl import (
     CertificatePackGetResponse,
     CertificatePackEditResponse,
+    CertificatePackListResponse,
+    CertificatePackCreateResponse,
     CertificatePackDeleteResponse,
 )
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
@@ -22,12 +24,83 @@
 class TestCertificatePacks:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        certificate_pack = client.ssl.certificate_packs.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_authority="lets_encrypt",
+            hosts=["example.com", "*.example.com", "www.example.com"],
+            type="advanced",
+            validation_method="txt",
+            validity_days=14,
+        )
+        assert_matches_type(Optional[CertificatePackCreateResponse], certificate_pack, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        certificate_pack = client.ssl.certificate_packs.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_authority="lets_encrypt",
+            hosts=["example.com", "*.example.com", "www.example.com"],
+            type="advanced",
+            validation_method="txt",
+            validity_days=14,
+            cloudflare_branding=False,
+        )
+        assert_matches_type(Optional[CertificatePackCreateResponse], certificate_pack, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.ssl.certificate_packs.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_authority="lets_encrypt",
+            hosts=["example.com", "*.example.com", "www.example.com"],
+            type="advanced",
+            validation_method="txt",
+            validity_days=14,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        certificate_pack = response.parse()
+        assert_matches_type(Optional[CertificatePackCreateResponse], certificate_pack, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.ssl.certificate_packs.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_authority="lets_encrypt",
+            hosts=["example.com", "*.example.com", "www.example.com"],
+            type="advanced",
+            validation_method="txt",
+            validity_days=14,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            certificate_pack = response.parse()
+            assert_matches_type(Optional[CertificatePackCreateResponse], certificate_pack, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.ssl.certificate_packs.with_raw_response.create(
+                zone_id="",
+                certificate_authority="lets_encrypt",
+                hosts=["example.com", "*.example.com", "www.example.com"],
+                type="advanced",
+                validation_method="txt",
+                validity_days=14,
+            )
+
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         certificate_pack = client.ssl.certificate_packs.list(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncSinglePage[object], certificate_pack, path=["response"])
+        assert_matches_type(SyncSinglePage[CertificatePackListResponse], certificate_pack, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
@@ -35,7 +108,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             status="all",
         )
-        assert_matches_type(SyncSinglePage[object], certificate_pack, path=["response"])
+        assert_matches_type(SyncSinglePage[CertificatePackListResponse], certificate_pack, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -46,7 +119,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         certificate_pack = response.parse()
-        assert_matches_type(SyncSinglePage[object], certificate_pack, path=["response"])
+        assert_matches_type(SyncSinglePage[CertificatePackListResponse], certificate_pack, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -57,7 +130,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             certificate_pack = response.parse()
-            assert_matches_type(SyncSinglePage[object], certificate_pack, path=["response"])
+            assert_matches_type(SyncSinglePage[CertificatePackListResponse], certificate_pack, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -121,7 +194,15 @@ def test_method_edit(self, client: Cloudflare) -> None:
         certificate_pack = client.ssl.certificate_packs.edit(
             certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+        )
+        assert_matches_type(Optional[CertificatePackEditResponse], certificate_pack, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        certificate_pack = client.ssl.certificate_packs.edit(
+            certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            cloudflare_branding=False,
         )
         assert_matches_type(Optional[CertificatePackEditResponse], certificate_pack, path=["response"])
 
@@ -130,7 +211,6 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
         response = client.ssl.certificate_packs.with_raw_response.edit(
             certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         )
 
         assert response.is_closed is True
@@ -143,7 +223,6 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
         with client.ssl.certificate_packs.with_streaming_response.edit(
             certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -159,14 +238,12 @@ def test_path_params_edit(self, client: Cloudflare) -> None:
             client.ssl.certificate_packs.with_raw_response.edit(
                 certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_pack_id` but received ''"):
             client.ssl.certificate_packs.with_raw_response.edit(
                 certificate_pack_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
             )
 
     @parametrize
@@ -219,14 +296,87 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncCertificatePacks:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        certificate_pack = await async_client.ssl.certificate_packs.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_authority="lets_encrypt",
+            hosts=["example.com", "*.example.com", "www.example.com"],
+            type="advanced",
+            validation_method="txt",
+            validity_days=14,
+        )
+        assert_matches_type(Optional[CertificatePackCreateResponse], certificate_pack, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        certificate_pack = await async_client.ssl.certificate_packs.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_authority="lets_encrypt",
+            hosts=["example.com", "*.example.com", "www.example.com"],
+            type="advanced",
+            validation_method="txt",
+            validity_days=14,
+            cloudflare_branding=False,
+        )
+        assert_matches_type(Optional[CertificatePackCreateResponse], certificate_pack, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ssl.certificate_packs.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_authority="lets_encrypt",
+            hosts=["example.com", "*.example.com", "www.example.com"],
+            type="advanced",
+            validation_method="txt",
+            validity_days=14,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        certificate_pack = await response.parse()
+        assert_matches_type(Optional[CertificatePackCreateResponse], certificate_pack, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ssl.certificate_packs.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate_authority="lets_encrypt",
+            hosts=["example.com", "*.example.com", "www.example.com"],
+            type="advanced",
+            validation_method="txt",
+            validity_days=14,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            certificate_pack = await response.parse()
+            assert_matches_type(Optional[CertificatePackCreateResponse], certificate_pack, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.ssl.certificate_packs.with_raw_response.create(
+                zone_id="",
+                certificate_authority="lets_encrypt",
+                hosts=["example.com", "*.example.com", "www.example.com"],
+                type="advanced",
+                validation_method="txt",
+                validity_days=14,
+            )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         certificate_pack = await async_client.ssl.certificate_packs.list(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncSinglePage[object], certificate_pack, path=["response"])
+        assert_matches_type(AsyncSinglePage[CertificatePackListResponse], certificate_pack, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -234,7 +384,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             status="all",
         )
-        assert_matches_type(AsyncSinglePage[object], certificate_pack, path=["response"])
+        assert_matches_type(AsyncSinglePage[CertificatePackListResponse], certificate_pack, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -245,7 +395,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         certificate_pack = await response.parse()
-        assert_matches_type(AsyncSinglePage[object], certificate_pack, path=["response"])
+        assert_matches_type(AsyncSinglePage[CertificatePackListResponse], certificate_pack, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -256,7 +406,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             certificate_pack = await response.parse()
-            assert_matches_type(AsyncSinglePage[object], certificate_pack, path=["response"])
+            assert_matches_type(AsyncSinglePage[CertificatePackListResponse], certificate_pack, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -320,7 +470,15 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
         certificate_pack = await async_client.ssl.certificate_packs.edit(
             certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
+        )
+        assert_matches_type(Optional[CertificatePackEditResponse], certificate_pack, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        certificate_pack = await async_client.ssl.certificate_packs.edit(
+            certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            cloudflare_branding=False,
         )
         assert_matches_type(Optional[CertificatePackEditResponse], certificate_pack, path=["response"])
 
@@ -329,7 +487,6 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.ssl.certificate_packs.with_raw_response.edit(
             certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         )
 
         assert response.is_closed is True
@@ -342,7 +499,6 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
         async with async_client.ssl.certificate_packs.with_streaming_response.edit(
             certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -358,14 +514,12 @@ async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
             await async_client.ssl.certificate_packs.with_raw_response.edit(
                 certificate_pack_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
-                body={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_pack_id` but received ''"):
             await async_client.ssl.certificate_packs.with_raw_response.edit(
                 certificate_pack_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
             )
 
     @parametrize
diff --git a/tests/api_resources/ssl/test_recommendations.py b/tests/api_resources/ssl/test_recommendations.py
index 25c8c9c2841..972bf1c1ffc 100644
--- a/tests/api_resources/ssl/test_recommendations.py
+++ b/tests/api_resources/ssl/test_recommendations.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -11,6 +11,8 @@
 from tests.utils import assert_matches_type
 from cloudflare.types.ssl import RecommendationGetResponse
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -19,80 +21,92 @@ class TestRecommendations:
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        recommendation = client.ssl.recommendations.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[RecommendationGetResponse], recommendation, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            recommendation = client.ssl.recommendations.get(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(RecommendationGetResponse, recommendation, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.ssl.recommendations.with_raw_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.ssl.recommendations.with_raw_response.get(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         recommendation = response.parse()
-        assert_matches_type(Optional[RecommendationGetResponse], recommendation, path=["response"])
+        assert_matches_type(RecommendationGetResponse, recommendation, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.ssl.recommendations.with_streaming_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.ssl.recommendations.with_streaming_response.get(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            recommendation = response.parse()
-            assert_matches_type(Optional[RecommendationGetResponse], recommendation, path=["response"])
+                recommendation = response.parse()
+                assert_matches_type(RecommendationGetResponse, recommendation, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            client.ssl.recommendations.with_raw_response.get(
-                "",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.ssl.recommendations.with_raw_response.get(
+                    zone_id="",
+                )
 
 
 class TestAsyncRecommendations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        recommendation = await async_client.ssl.recommendations.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[RecommendationGetResponse], recommendation, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            recommendation = await async_client.ssl.recommendations.get(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(RecommendationGetResponse, recommendation, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.ssl.recommendations.with_raw_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.ssl.recommendations.with_raw_response.get(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         recommendation = await response.parse()
-        assert_matches_type(Optional[RecommendationGetResponse], recommendation, path=["response"])
+        assert_matches_type(RecommendationGetResponse, recommendation, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.ssl.recommendations.with_streaming_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.ssl.recommendations.with_streaming_response.get(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            recommendation = await response.parse()
-            assert_matches_type(Optional[RecommendationGetResponse], recommendation, path=["response"])
+                recommendation = await response.parse()
+                assert_matches_type(RecommendationGetResponse, recommendation, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            await async_client.ssl.recommendations.with_raw_response.get(
-                "",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.ssl.recommendations.with_raw_response.get(
+                    zone_id="",
+                )
diff --git a/tests/api_resources/ssl/test_verification.py b/tests/api_resources/ssl/test_verification.py
index 4d6460a428d..73b42e44599 100644
--- a/tests/api_resources/ssl/test_verification.py
+++ b/tests/api_resources/ssl/test_verification.py
@@ -121,7 +121,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncVerification:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/ssl/universal/test_settings.py b/tests/api_resources/ssl/universal/test_settings.py
index a6040dd1411..425b2528f38 100644
--- a/tests/api_resources/ssl/universal/test_settings.py
+++ b/tests/api_resources/ssl/universal/test_settings.py
@@ -103,7 +103,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSettings:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/storage/test_analytics.py b/tests/api_resources/storage/test_analytics.py
deleted file mode 100644
index d75ef09d287..00000000000
--- a/tests/api_resources/storage/test_analytics.py
+++ /dev/null
@@ -1,239 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare._utils import parse_datetime
-from cloudflare.types.storage import Schema, Components
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestAnalytics:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        analytics = client.storage.analytics.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[Schema], analytics, path=["response"])
-
-    @parametrize
-    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
-        analytics = client.storage.analytics.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            query={
-                "dimensions": ["accountId", "responseCode", "requestType"],
-                "filters": "requestType==read AND responseCode!=200",
-                "limit": 0,
-                "metrics": ["requests", "writeKiB", "readKiB"],
-                "since": parse_datetime("2019-01-02T02:20:00Z"),
-                "sort": ["+requests", "-responseCode"],
-                "until": parse_datetime("2019-01-02T03:20:00Z"),
-            },
-        )
-        assert_matches_type(Optional[Schema], analytics, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.storage.analytics.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        analytics = response.parse()
-        assert_matches_type(Optional[Schema], analytics, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.storage.analytics.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            analytics = response.parse()
-            assert_matches_type(Optional[Schema], analytics, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.storage.analytics.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    def test_method_stored(self, client: Cloudflare) -> None:
-        analytics = client.storage.analytics.stored(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[Components], analytics, path=["response"])
-
-    @parametrize
-    def test_method_stored_with_all_params(self, client: Cloudflare) -> None:
-        analytics = client.storage.analytics.stored(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            query={
-                "dimensions": ["namespaceId"],
-                "filters": "namespaceId==a4e8cbb7-1b58-4990-925e-e026d40c4c64",
-                "limit": 0,
-                "metrics": ["storedBytes", "storedKeys"],
-                "since": parse_datetime("2019-01-02T02:20:00Z"),
-                "sort": ["+storedBytes", "-namespaceId"],
-                "until": parse_datetime("2019-01-02T03:20:00Z"),
-            },
-        )
-        assert_matches_type(Optional[Components], analytics, path=["response"])
-
-    @parametrize
-    def test_raw_response_stored(self, client: Cloudflare) -> None:
-        response = client.storage.analytics.with_raw_response.stored(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        analytics = response.parse()
-        assert_matches_type(Optional[Components], analytics, path=["response"])
-
-    @parametrize
-    def test_streaming_response_stored(self, client: Cloudflare) -> None:
-        with client.storage.analytics.with_streaming_response.stored(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            analytics = response.parse()
-            assert_matches_type(Optional[Components], analytics, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_stored(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.storage.analytics.with_raw_response.stored(
-                account_id="",
-            )
-
-
-class TestAsyncAnalytics:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        analytics = await async_client.storage.analytics.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[Schema], analytics, path=["response"])
-
-    @parametrize
-    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        analytics = await async_client.storage.analytics.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            query={
-                "dimensions": ["accountId", "responseCode", "requestType"],
-                "filters": "requestType==read AND responseCode!=200",
-                "limit": 0,
-                "metrics": ["requests", "writeKiB", "readKiB"],
-                "since": parse_datetime("2019-01-02T02:20:00Z"),
-                "sort": ["+requests", "-responseCode"],
-                "until": parse_datetime("2019-01-02T03:20:00Z"),
-            },
-        )
-        assert_matches_type(Optional[Schema], analytics, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.storage.analytics.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        analytics = await response.parse()
-        assert_matches_type(Optional[Schema], analytics, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.storage.analytics.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            analytics = await response.parse()
-            assert_matches_type(Optional[Schema], analytics, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.storage.analytics.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    async def test_method_stored(self, async_client: AsyncCloudflare) -> None:
-        analytics = await async_client.storage.analytics.stored(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[Components], analytics, path=["response"])
-
-    @parametrize
-    async def test_method_stored_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        analytics = await async_client.storage.analytics.stored(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            query={
-                "dimensions": ["namespaceId"],
-                "filters": "namespaceId==a4e8cbb7-1b58-4990-925e-e026d40c4c64",
-                "limit": 0,
-                "metrics": ["storedBytes", "storedKeys"],
-                "since": parse_datetime("2019-01-02T02:20:00Z"),
-                "sort": ["+storedBytes", "-namespaceId"],
-                "until": parse_datetime("2019-01-02T03:20:00Z"),
-            },
-        )
-        assert_matches_type(Optional[Components], analytics, path=["response"])
-
-    @parametrize
-    async def test_raw_response_stored(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.storage.analytics.with_raw_response.stored(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        analytics = await response.parse()
-        assert_matches_type(Optional[Components], analytics, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_stored(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.storage.analytics.with_streaming_response.stored(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            analytics = await response.parse()
-            assert_matches_type(Optional[Components], analytics, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_stored(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.storage.analytics.with_raw_response.stored(
-                account_id="",
-            )
diff --git a/tests/api_resources/stream/captions/language/test_vtt.py b/tests/api_resources/stream/captions/language/test_vtt.py
index c3e6421643b..e70b277d2e2 100644
--- a/tests/api_resources/stream/captions/language/test_vtt.py
+++ b/tests/api_resources/stream/captions/language/test_vtt.py
@@ -78,7 +78,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncVtt:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/stream/captions/test_language.py b/tests/api_resources/stream/captions/test_language.py
index 0fe61c3cb38..133fafb0f57 100644
--- a/tests/api_resources/stream/captions/test_language.py
+++ b/tests/api_resources/stream/captions/test_language.py
@@ -269,7 +269,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncLanguage:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/stream/live_inputs/test_outputs.py b/tests/api_resources/stream/live_inputs/test_outputs.py
index d1041731a3f..e4aeed86843 100644
--- a/tests/api_resources/stream/live_inputs/test_outputs.py
+++ b/tests/api_resources/stream/live_inputs/test_outputs.py
@@ -263,7 +263,9 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
 
 
 class TestAsyncOutputs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/stream/test_audio_tracks.py b/tests/api_resources/stream/test_audio_tracks.py
index 026c7c2486f..243129a8296 100644
--- a/tests/api_resources/stream/test_audio_tracks.py
+++ b/tests/api_resources/stream/test_audio_tracks.py
@@ -9,11 +9,8 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.stream import (
-    Audio,
-    AudioTrackGetResponse,
-    AudioTrackDeleteResponse,
-)
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.stream import Audio
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -28,7 +25,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             identifier="ea95132c15732412d22c1476fa83f27a",
         )
-        assert_matches_type(Optional[AudioTrackDeleteResponse], audio_track, path=["response"])
+        assert_matches_type(str, audio_track, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -41,7 +38,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         audio_track = response.parse()
-        assert_matches_type(Optional[AudioTrackDeleteResponse], audio_track, path=["response"])
+        assert_matches_type(str, audio_track, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -54,7 +51,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             audio_track = response.parse()
-            assert_matches_type(Optional[AudioTrackDeleteResponse], audio_track, path=["response"])
+            assert_matches_type(str, audio_track, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -221,7 +218,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             identifier="ea95132c15732412d22c1476fa83f27a",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[AudioTrackGetResponse], audio_track, path=["response"])
+        assert_matches_type(SyncSinglePage[Audio], audio_track, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -233,7 +230,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         audio_track = response.parse()
-        assert_matches_type(Optional[AudioTrackGetResponse], audio_track, path=["response"])
+        assert_matches_type(SyncSinglePage[Audio], audio_track, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -245,7 +242,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             audio_track = response.parse()
-            assert_matches_type(Optional[AudioTrackGetResponse], audio_track, path=["response"])
+            assert_matches_type(SyncSinglePage[Audio], audio_track, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -265,7 +262,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncAudioTracks:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
@@ -274,7 +273,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             identifier="ea95132c15732412d22c1476fa83f27a",
         )
-        assert_matches_type(Optional[AudioTrackDeleteResponse], audio_track, path=["response"])
+        assert_matches_type(str, audio_track, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -287,7 +286,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         audio_track = await response.parse()
-        assert_matches_type(Optional[AudioTrackDeleteResponse], audio_track, path=["response"])
+        assert_matches_type(str, audio_track, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -300,7 +299,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             audio_track = await response.parse()
-            assert_matches_type(Optional[AudioTrackDeleteResponse], audio_track, path=["response"])
+            assert_matches_type(str, audio_track, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -467,7 +466,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             identifier="ea95132c15732412d22c1476fa83f27a",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[AudioTrackGetResponse], audio_track, path=["response"])
+        assert_matches_type(AsyncSinglePage[Audio], audio_track, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -479,7 +478,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         audio_track = await response.parse()
-        assert_matches_type(Optional[AudioTrackGetResponse], audio_track, path=["response"])
+        assert_matches_type(AsyncSinglePage[Audio], audio_track, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -491,7 +490,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             audio_track = await response.parse()
-            assert_matches_type(Optional[AudioTrackGetResponse], audio_track, path=["response"])
+            assert_matches_type(AsyncSinglePage[Audio], audio_track, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/stream/test_captions.py b/tests/api_resources/stream/test_captions.py
index 75cf3073069..e39009815b6 100644
--- a/tests/api_resources/stream/test_captions.py
+++ b/tests/api_resources/stream/test_captions.py
@@ -3,13 +3,14 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.stream import CaptionGetResponse
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.stream import Caption
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -23,7 +24,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             identifier="ea95132c15732412d22c1476fa83f27a",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[CaptionGetResponse], caption, path=["response"])
+        assert_matches_type(SyncSinglePage[Caption], caption, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -35,7 +36,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         caption = response.parse()
-        assert_matches_type(Optional[CaptionGetResponse], caption, path=["response"])
+        assert_matches_type(SyncSinglePage[Caption], caption, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -47,7 +48,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             caption = response.parse()
-            assert_matches_type(Optional[CaptionGetResponse], caption, path=["response"])
+            assert_matches_type(SyncSinglePage[Caption], caption, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -67,7 +68,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncCaptions:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -75,7 +78,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             identifier="ea95132c15732412d22c1476fa83f27a",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[CaptionGetResponse], caption, path=["response"])
+        assert_matches_type(AsyncSinglePage[Caption], caption, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -87,7 +90,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         caption = await response.parse()
-        assert_matches_type(Optional[CaptionGetResponse], caption, path=["response"])
+        assert_matches_type(AsyncSinglePage[Caption], caption, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -99,7 +102,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             caption = await response.parse()
-            assert_matches_type(Optional[CaptionGetResponse], caption, path=["response"])
+            assert_matches_type(AsyncSinglePage[Caption], caption, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/stream/test_clip.py b/tests/api_resources/stream/test_clip.py
index c0806600820..7c6b2a2bf25 100644
--- a/tests/api_resources/stream/test_clip.py
+++ b/tests/api_resources/stream/test_clip.py
@@ -85,7 +85,9 @@ def test_path_params_create(self, client: Cloudflare) -> None:
 
 
 class TestAsyncClip:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/stream/test_copy.py b/tests/api_resources/stream/test_copy.py
index fa2c1cdd5b1..da77578d882 100644
--- a/tests/api_resources/stream/test_copy.py
+++ b/tests/api_resources/stream/test_copy.py
@@ -39,7 +39,6 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             thumbnail_timestamp_pct=0.529241,
             watermark={"uid": "ea95132c15732412d22c1476fa83f27a"},
             upload_creator="creator-id_abcde12345",
-            upload_metadata="name aGVsbG8gd29ybGQ=, requiresignedurls, allowedorigins ZXhhbXBsZS5jb20sdGVzdC5jb20=",
         )
         assert_matches_type(Optional[Video], copy, path=["response"])
 
@@ -79,7 +78,9 @@ def test_path_params_create(self, client: Cloudflare) -> None:
 
 
 class TestAsyncCopy:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -102,7 +103,6 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             thumbnail_timestamp_pct=0.529241,
             watermark={"uid": "ea95132c15732412d22c1476fa83f27a"},
             upload_creator="creator-id_abcde12345",
-            upload_metadata="name aGVsbG8gd29ybGQ=, requiresignedurls, allowedorigins ZXhhbXBsZS5jb20sdGVzdC5jb20=",
         )
         assert_matches_type(Optional[Video], copy, path=["response"])
 
diff --git a/tests/api_resources/stream/test_direct_upload.py b/tests/api_resources/stream/test_direct_upload.py
index 54f9c3d0070..70474f551cb 100644
--- a/tests/api_resources/stream/test_direct_upload.py
+++ b/tests/api_resources/stream/test_direct_upload.py
@@ -79,7 +79,9 @@ def test_path_params_create(self, client: Cloudflare) -> None:
 
 
 class TestAsyncDirectUpload:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/stream/test_downloads.py b/tests/api_resources/stream/test_downloads.py
index 94e6dd14371..f084fb3ee62 100644
--- a/tests/api_resources/stream/test_downloads.py
+++ b/tests/api_resources/stream/test_downloads.py
@@ -12,7 +12,6 @@
 from cloudflare.types.stream import (
     DownloadGetResponse,
     DownloadCreateResponse,
-    DownloadDeleteResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -80,7 +79,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             identifier="ea95132c15732412d22c1476fa83f27a",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[DownloadDeleteResponse], download, path=["response"])
+        assert_matches_type(str, download, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -92,7 +91,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         download = response.parse()
-        assert_matches_type(Optional[DownloadDeleteResponse], download, path=["response"])
+        assert_matches_type(str, download, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -104,7 +103,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             download = response.parse()
-            assert_matches_type(Optional[DownloadDeleteResponse], download, path=["response"])
+            assert_matches_type(str, download, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -172,7 +171,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncDownloads:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -233,7 +234,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             identifier="ea95132c15732412d22c1476fa83f27a",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[DownloadDeleteResponse], download, path=["response"])
+        assert_matches_type(str, download, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -245,7 +246,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         download = await response.parse()
-        assert_matches_type(Optional[DownloadDeleteResponse], download, path=["response"])
+        assert_matches_type(str, download, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -257,7 +258,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             download = await response.parse()
-            assert_matches_type(Optional[DownloadDeleteResponse], download, path=["response"])
+            assert_matches_type(str, download, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/stream/test_embed.py b/tests/api_resources/stream/test_embed.py
index 1019efe5e4c..4158863edde 100644
--- a/tests/api_resources/stream/test_embed.py
+++ b/tests/api_resources/stream/test_embed.py
@@ -66,7 +66,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncEmbed:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/stream/test_keys.py b/tests/api_resources/stream/test_keys.py
index feb60741e82..31b38c8f769 100644
--- a/tests/api_resources/stream/test_keys.py
+++ b/tests/api_resources/stream/test_keys.py
@@ -9,7 +9,8 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.stream import Keys, KeyGetResponse, KeyDeleteResponse
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.stream import Keys, KeyGetResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -65,7 +66,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[KeyDeleteResponse], key, path=["response"])
+        assert_matches_type(str, key, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -77,7 +78,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         key = response.parse()
-        assert_matches_type(Optional[KeyDeleteResponse], key, path=["response"])
+        assert_matches_type(str, key, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -89,7 +90,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             key = response.parse()
-            assert_matches_type(Optional[KeyDeleteResponse], key, path=["response"])
+            assert_matches_type(str, key, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -112,7 +113,7 @@ def test_method_get(self, client: Cloudflare) -> None:
         key = client.stream.keys.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[KeyGetResponse], key, path=["response"])
+        assert_matches_type(SyncSinglePage[KeyGetResponse], key, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -123,7 +124,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         key = response.parse()
-        assert_matches_type(Optional[KeyGetResponse], key, path=["response"])
+        assert_matches_type(SyncSinglePage[KeyGetResponse], key, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -134,7 +135,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             key = response.parse()
-            assert_matches_type(Optional[KeyGetResponse], key, path=["response"])
+            assert_matches_type(SyncSinglePage[KeyGetResponse], key, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -147,7 +148,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncKeys:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -197,7 +200,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[KeyDeleteResponse], key, path=["response"])
+        assert_matches_type(str, key, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -209,7 +212,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         key = await response.parse()
-        assert_matches_type(Optional[KeyDeleteResponse], key, path=["response"])
+        assert_matches_type(str, key, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -221,7 +224,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             key = await response.parse()
-            assert_matches_type(Optional[KeyDeleteResponse], key, path=["response"])
+            assert_matches_type(str, key, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -244,7 +247,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         key = await async_client.stream.keys.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[KeyGetResponse], key, path=["response"])
+        assert_matches_type(AsyncSinglePage[KeyGetResponse], key, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -255,7 +258,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         key = await response.parse()
-        assert_matches_type(Optional[KeyGetResponse], key, path=["response"])
+        assert_matches_type(AsyncSinglePage[KeyGetResponse], key, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -266,7 +269,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             key = await response.parse()
-            assert_matches_type(Optional[KeyGetResponse], key, path=["response"])
+            assert_matches_type(AsyncSinglePage[KeyGetResponse], key, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/stream/test_live_inputs.py b/tests/api_resources/stream/test_live_inputs.py
index c34ea9ecd6f..8c637eb3141 100644
--- a/tests/api_resources/stream/test_live_inputs.py
+++ b/tests/api_resources/stream/test_live_inputs.py
@@ -36,6 +36,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             meta={"name": "test stream 1"},
             recording={
                 "allowed_origins": ["example.com"],
+                "hide_live_viewer_count": False,
                 "mode": "off",
                 "require_signed_urls": False,
                 "timeout_seconds": 0,
@@ -92,6 +93,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             meta={"name": "test stream 1"},
             recording={
                 "allowed_origins": ["example.com"],
+                "hide_live_viewer_count": False,
                 "mode": "off",
                 "require_signed_urls": False,
                 "timeout_seconds": 0,
@@ -283,7 +285,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncLiveInputs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -301,6 +305,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             meta={"name": "test stream 1"},
             recording={
                 "allowed_origins": ["example.com"],
+                "hide_live_viewer_count": False,
                 "mode": "off",
                 "require_signed_urls": False,
                 "timeout_seconds": 0,
@@ -357,6 +362,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             meta={"name": "test stream 1"},
             recording={
                 "allowed_origins": ["example.com"],
+                "hide_live_viewer_count": False,
                 "mode": "off",
                 "require_signed_urls": False,
                 "timeout_seconds": 0,
diff --git a/tests/api_resources/stream/test_token.py b/tests/api_resources/stream/test_token.py
index 723546ff70c..1ecc4892b56 100644
--- a/tests/api_resources/stream/test_token.py
+++ b/tests/api_resources/stream/test_token.py
@@ -35,19 +35,19 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                 {
                     "action": "block",
                     "country": ["US", "MX"],
-                    "ip": ["string", "string", "string"],
+                    "ip": ["string"],
                     "type": "ip.geoip.country",
                 },
                 {
                     "action": "allow",
-                    "country": ["string", "string", "string"],
+                    "country": ["string"],
                     "ip": ["93.184.216.0/24", "2400:cb00::/32"],
                     "type": "ip.src",
                 },
                 {
                     "action": "block",
-                    "country": ["string", "string", "string"],
-                    "ip": ["string", "string", "string"],
+                    "country": ["string"],
+                    "ip": ["string"],
                     "type": "any",
                 },
             ],
@@ -100,7 +100,9 @@ def test_path_params_create(self, client: Cloudflare) -> None:
 
 
 class TestAsyncToken:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -120,19 +122,19 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                 {
                     "action": "block",
                     "country": ["US", "MX"],
-                    "ip": ["string", "string", "string"],
+                    "ip": ["string"],
                     "type": "ip.geoip.country",
                 },
                 {
                     "action": "allow",
-                    "country": ["string", "string", "string"],
+                    "country": ["string"],
                     "ip": ["93.184.216.0/24", "2400:cb00::/32"],
                     "type": "ip.src",
                 },
                 {
                     "action": "block",
-                    "country": ["string", "string", "string"],
-                    "ip": ["string", "string", "string"],
+                    "country": ["string"],
+                    "ip": ["string"],
                     "type": "any",
                 },
             ],
diff --git a/tests/api_resources/stream/test_videos.py b/tests/api_resources/stream/test_videos.py
index c0ee01a60ff..9708f4488bf 100644
--- a/tests/api_resources/stream/test_videos.py
+++ b/tests/api_resources/stream/test_videos.py
@@ -65,7 +65,9 @@ def test_path_params_storage_usage(self, client: Cloudflare) -> None:
 
 
 class TestAsyncVideos:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_storage_usage(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/stream/test_watermarks.py b/tests/api_resources/stream/test_watermarks.py
index 911dd1d6ad7..0cafcf5d0c5 100644
--- a/tests/api_resources/stream/test_watermarks.py
+++ b/tests/api_resources/stream/test_watermarks.py
@@ -10,7 +10,7 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.stream import Watermark, WatermarkDeleteResponse
+from cloudflare.types.stream import Watermark
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -122,7 +122,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             identifier="ea95132c15732412d22c1476fa83f27a",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[WatermarkDeleteResponse], watermark, path=["response"])
+        assert_matches_type(str, watermark, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -134,7 +134,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         watermark = response.parse()
-        assert_matches_type(Optional[WatermarkDeleteResponse], watermark, path=["response"])
+        assert_matches_type(str, watermark, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -146,7 +146,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             watermark = response.parse()
-            assert_matches_type(Optional[WatermarkDeleteResponse], watermark, path=["response"])
+            assert_matches_type(str, watermark, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -214,7 +214,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncWatermarks:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -320,7 +322,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             identifier="ea95132c15732412d22c1476fa83f27a",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[WatermarkDeleteResponse], watermark, path=["response"])
+        assert_matches_type(str, watermark, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -332,7 +334,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         watermark = await response.parse()
-        assert_matches_type(Optional[WatermarkDeleteResponse], watermark, path=["response"])
+        assert_matches_type(str, watermark, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -344,7 +346,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             watermark = await response.parse()
-            assert_matches_type(Optional[WatermarkDeleteResponse], watermark, path=["response"])
+            assert_matches_type(str, watermark, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/stream/test_webhooks.py b/tests/api_resources/stream/test_webhooks.py
index c6d1fb2222f..63a685256d4 100644
--- a/tests/api_resources/stream/test_webhooks.py
+++ b/tests/api_resources/stream/test_webhooks.py
@@ -3,17 +3,12 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.stream import (
-    WebhookGetResponse,
-    WebhookDeleteResponse,
-    WebhookUpdateResponse,
-)
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -27,7 +22,7 @@ def test_method_update(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             notification_url="https://example.com",
         )
-        assert_matches_type(Optional[WebhookUpdateResponse], webhook, path=["response"])
+        assert_matches_type(object, webhook, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
@@ -39,7 +34,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         webhook = response.parse()
-        assert_matches_type(Optional[WebhookUpdateResponse], webhook, path=["response"])
+        assert_matches_type(object, webhook, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
@@ -51,7 +46,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             webhook = response.parse()
-            assert_matches_type(Optional[WebhookUpdateResponse], webhook, path=["response"])
+            assert_matches_type(object, webhook, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -68,7 +63,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
         webhook = client.stream.webhooks.delete(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[WebhookDeleteResponse], webhook, path=["response"])
+        assert_matches_type(str, webhook, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -79,7 +74,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         webhook = response.parse()
-        assert_matches_type(Optional[WebhookDeleteResponse], webhook, path=["response"])
+        assert_matches_type(str, webhook, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -90,7 +85,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             webhook = response.parse()
-            assert_matches_type(Optional[WebhookDeleteResponse], webhook, path=["response"])
+            assert_matches_type(str, webhook, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -106,7 +101,7 @@ def test_method_get(self, client: Cloudflare) -> None:
         webhook = client.stream.webhooks.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[WebhookGetResponse], webhook, path=["response"])
+        assert_matches_type(object, webhook, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -117,7 +112,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         webhook = response.parse()
-        assert_matches_type(Optional[WebhookGetResponse], webhook, path=["response"])
+        assert_matches_type(object, webhook, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -128,7 +123,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             webhook = response.parse()
-            assert_matches_type(Optional[WebhookGetResponse], webhook, path=["response"])
+            assert_matches_type(object, webhook, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -141,7 +136,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncWebhooks:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
@@ -149,7 +146,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             notification_url="https://example.com",
         )
-        assert_matches_type(Optional[WebhookUpdateResponse], webhook, path=["response"])
+        assert_matches_type(object, webhook, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
@@ -161,7 +158,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         webhook = await response.parse()
-        assert_matches_type(Optional[WebhookUpdateResponse], webhook, path=["response"])
+        assert_matches_type(object, webhook, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
@@ -173,7 +170,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             webhook = await response.parse()
-            assert_matches_type(Optional[WebhookUpdateResponse], webhook, path=["response"])
+            assert_matches_type(object, webhook, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -190,7 +187,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         webhook = await async_client.stream.webhooks.delete(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[WebhookDeleteResponse], webhook, path=["response"])
+        assert_matches_type(str, webhook, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -201,7 +198,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         webhook = await response.parse()
-        assert_matches_type(Optional[WebhookDeleteResponse], webhook, path=["response"])
+        assert_matches_type(str, webhook, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -212,7 +209,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             webhook = await response.parse()
-            assert_matches_type(Optional[WebhookDeleteResponse], webhook, path=["response"])
+            assert_matches_type(str, webhook, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -228,7 +225,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         webhook = await async_client.stream.webhooks.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[WebhookGetResponse], webhook, path=["response"])
+        assert_matches_type(object, webhook, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -239,7 +236,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         webhook = await response.parse()
-        assert_matches_type(Optional[WebhookGetResponse], webhook, path=["response"])
+        assert_matches_type(object, webhook, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -250,7 +247,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             webhook = await response.parse()
-            assert_matches_type(Optional[WebhookGetResponse], webhook, path=["response"])
+            assert_matches_type(object, webhook, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/test_abuse_reports.py b/tests/api_resources/test_abuse_reports.py
new file mode 100644
index 00000000000..ec496a32f19
--- /dev/null
+++ b/tests/api_resources/test_abuse_reports.py
@@ -0,0 +1,2214 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePagination, AsyncV4PagePagination
+from cloudflare.types.abuse_reports import (
+    AbuseReportGetResponse,
+    AbuseReportListResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestAbuseReports:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_create_overload_1(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_dmca",
+            address1="x",
+            agent_name="x",
+            agree=1,
+            city="x",
+            country="x",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            name="x",
+            original_work="x",
+            owner_notification="send",
+            signature="signature",
+            state="x",
+            urls="urls",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_dmca",
+            address1="x",
+            agent_name="x",
+            agree=1,
+            city="x",
+            country="x",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            name="x",
+            original_work="x",
+            owner_notification="send",
+            signature="signature",
+            state="x",
+            urls="urls",
+            comments="x",
+            company="x",
+            reported_country="xx",
+            reported_user_agent="x",
+            tele="x",
+            title="x",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_raw_response_create_overload_1(self, client: Cloudflare) -> None:
+        response = client.abuse_reports.with_raw_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_dmca",
+            address1="x",
+            agent_name="x",
+            agree=1,
+            city="x",
+            country="x",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            name="x",
+            original_work="x",
+            owner_notification="send",
+            signature="signature",
+            state="x",
+            urls="urls",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = response.parse()
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
+        with client.abuse_reports.with_streaming_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_dmca",
+            address1="x",
+            agent_name="x",
+            agree=1,
+            city="x",
+            country="x",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            name="x",
+            original_work="x",
+            owner_notification="send",
+            signature="signature",
+            state="x",
+            urls="urls",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = response.parse()
+            assert_matches_type(str, abuse_report, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.abuse_reports.with_raw_response.create(
+                report_param="report_param",
+                account_id="",
+                act="abuse_dmca",
+                address1="x",
+                agent_name="x",
+                agree=1,
+                city="x",
+                country="x",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                name="x",
+                original_work="x",
+                owner_notification="send",
+                signature="signature",
+                state="x",
+                urls="urls",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_param` but received ''"):
+            client.abuse_reports.with_raw_response.create(
+                report_param="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                act="abuse_dmca",
+                address1="x",
+                agent_name="x",
+                agree=1,
+                city="x",
+                country="x",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                name="x",
+                original_work="x",
+                owner_notification="send",
+                signature="signature",
+                state="x",
+                urls="urls",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_create_overload_2(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_trademark",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            trademark_number="x",
+            trademark_office="x",
+            trademark_symbol="x",
+            urls="urls",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_trademark",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            trademark_number="x",
+            trademark_office="x",
+            trademark_symbol="x",
+            urls="urls",
+            comments="x",
+            company="x",
+            reported_country="xx",
+            reported_user_agent="x",
+            tele="x",
+            title="x",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
+        response = client.abuse_reports.with_raw_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_trademark",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            trademark_number="x",
+            trademark_office="x",
+            trademark_symbol="x",
+            urls="urls",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = response.parse()
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
+        with client.abuse_reports.with_streaming_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_trademark",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            trademark_number="x",
+            trademark_office="x",
+            trademark_symbol="x",
+            urls="urls",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = response.parse()
+            assert_matches_type(str, abuse_report, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.abuse_reports.with_raw_response.create(
+                report_param="report_param",
+                account_id="",
+                act="abuse_trademark",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="x",
+                name="x",
+                owner_notification="send",
+                trademark_number="x",
+                trademark_office="x",
+                trademark_symbol="x",
+                urls="urls",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_param` but received ''"):
+            client.abuse_reports.with_raw_response.create(
+                report_param="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                act="abuse_trademark",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="x",
+                name="x",
+                owner_notification="send",
+                trademark_number="x",
+                trademark_office="x",
+                trademark_symbol="x",
+                urls="urls",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_create_overload_3(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_general",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_create_with_all_params_overload_3(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_general",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+            comments="x",
+            company="x",
+            destination_ips="destination_ips",
+            ports_protocols="ports_protocols",
+            reported_country="xx",
+            reported_user_agent="x",
+            source_ips="source_ips",
+            tele="x",
+            title="x",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_raw_response_create_overload_3(self, client: Cloudflare) -> None:
+        response = client.abuse_reports.with_raw_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_general",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = response.parse()
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_streaming_response_create_overload_3(self, client: Cloudflare) -> None:
+        with client.abuse_reports.with_streaming_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_general",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = response.parse()
+            assert_matches_type(str, abuse_report, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_path_params_create_overload_3(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.abuse_reports.with_raw_response.create(
+                report_param="report_param",
+                account_id="",
+                act="abuse_general",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="x",
+                name="x",
+                owner_notification="send",
+                urls="urls",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_param` but received ''"):
+            client.abuse_reports.with_raw_response.create(
+                report_param="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                act="abuse_general",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="x",
+                name="x",
+                owner_notification="send",
+                urls="urls",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_create_overload_4(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_phishing",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="xxxxxxxxxxxxxxxxxxxx",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_create_with_all_params_overload_4(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_phishing",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="xxxxxxxxxxxxxxxxxxxx",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+            comments="x",
+            company="x",
+            original_work="x",
+            reported_country="xx",
+            reported_user_agent="x",
+            tele="x",
+            title="x",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_raw_response_create_overload_4(self, client: Cloudflare) -> None:
+        response = client.abuse_reports.with_raw_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_phishing",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="xxxxxxxxxxxxxxxxxxxx",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = response.parse()
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_streaming_response_create_overload_4(self, client: Cloudflare) -> None:
+        with client.abuse_reports.with_streaming_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_phishing",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="xxxxxxxxxxxxxxxxxxxx",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = response.parse()
+            assert_matches_type(str, abuse_report, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_path_params_create_overload_4(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.abuse_reports.with_raw_response.create(
+                report_param="report_param",
+                account_id="",
+                act="abuse_phishing",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="xxxxxxxxxxxxxxxxxxxx",
+                name="x",
+                owner_notification="send",
+                urls="urls",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_param` but received ''"):
+            client.abuse_reports.with_raw_response.create(
+                report_param="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                act="abuse_phishing",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="xxxxxxxxxxxxxxxxxxxx",
+                name="x",
+                owner_notification="send",
+                urls="urls",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_create_overload_5(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_children",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            ncmec_notification="send",
+            owner_notification="send",
+            urls="urls",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_create_with_all_params_overload_5(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_children",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            ncmec_notification="send",
+            owner_notification="send",
+            urls="urls",
+            comments="x",
+            company="x",
+            country="x",
+            reported_country="xx",
+            reported_user_agent="x",
+            tele="x",
+            title="x",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_raw_response_create_overload_5(self, client: Cloudflare) -> None:
+        response = client.abuse_reports.with_raw_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_children",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            ncmec_notification="send",
+            owner_notification="send",
+            urls="urls",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = response.parse()
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_streaming_response_create_overload_5(self, client: Cloudflare) -> None:
+        with client.abuse_reports.with_streaming_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_children",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            ncmec_notification="send",
+            owner_notification="send",
+            urls="urls",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = response.parse()
+            assert_matches_type(str, abuse_report, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_path_params_create_overload_5(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.abuse_reports.with_raw_response.create(
+                report_param="report_param",
+                account_id="",
+                act="abuse_children",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="x",
+                name="x",
+                ncmec_notification="send",
+                owner_notification="send",
+                urls="urls",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_param` but received ''"):
+            client.abuse_reports.with_raw_response.create(
+                report_param="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                act="abuse_children",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="x",
+                name="x",
+                ncmec_notification="send",
+                owner_notification="send",
+                urls="urls",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_create_overload_6(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_threat",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_create_with_all_params_overload_6(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_threat",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+            comments="x",
+            company="x",
+            reported_country="xx",
+            reported_user_agent="x",
+            tele="x",
+            title="x",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_raw_response_create_overload_6(self, client: Cloudflare) -> None:
+        response = client.abuse_reports.with_raw_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_threat",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = response.parse()
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_streaming_response_create_overload_6(self, client: Cloudflare) -> None:
+        with client.abuse_reports.with_streaming_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_threat",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = response.parse()
+            assert_matches_type(str, abuse_report, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_path_params_create_overload_6(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.abuse_reports.with_raw_response.create(
+                report_param="report_param",
+                account_id="",
+                act="abuse_threat",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="x",
+                name="x",
+                owner_notification="send",
+                urls="urls",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_param` but received ''"):
+            client.abuse_reports.with_raw_response.create(
+                report_param="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                act="abuse_threat",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="x",
+                name="x",
+                owner_notification="send",
+                urls="urls",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_create_overload_7(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_registrar_whois",
+            email="email",
+            email2="email2",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_create_with_all_params_overload_7(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_registrar_whois",
+            email="email",
+            email2="email2",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+            comments="x",
+            company="x",
+            reported_country="xx",
+            reported_user_agent="x",
+            tele="x",
+            title="x",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_raw_response_create_overload_7(self, client: Cloudflare) -> None:
+        response = client.abuse_reports.with_raw_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_registrar_whois",
+            email="email",
+            email2="email2",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = response.parse()
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_streaming_response_create_overload_7(self, client: Cloudflare) -> None:
+        with client.abuse_reports.with_streaming_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_registrar_whois",
+            email="email",
+            email2="email2",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = response.parse()
+            assert_matches_type(str, abuse_report, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_path_params_create_overload_7(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.abuse_reports.with_raw_response.create(
+                report_param="report_param",
+                account_id="",
+                act="abuse_registrar_whois",
+                email="email",
+                email2="email2",
+                name="x",
+                owner_notification="send",
+                urls="urls",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_param` but received ''"):
+            client.abuse_reports.with_raw_response.create(
+                report_param="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                act="abuse_registrar_whois",
+                email="email",
+                email2="email2",
+                name="x",
+                owner_notification="send",
+                urls="urls",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_create_overload_8(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_ncsei",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            name="x",
+            ncsei_subject_representation=True,
+            owner_notification="send",
+            urls="urls",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_create_with_all_params_overload_8(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_ncsei",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            name="x",
+            ncsei_subject_representation=True,
+            owner_notification="send",
+            urls="urls",
+            comments="x",
+            company="x",
+            country="x",
+            reported_country="xx",
+            reported_user_agent="x",
+            tele="x",
+            title="x",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_raw_response_create_overload_8(self, client: Cloudflare) -> None:
+        response = client.abuse_reports.with_raw_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_ncsei",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            name="x",
+            ncsei_subject_representation=True,
+            owner_notification="send",
+            urls="urls",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = response.parse()
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_streaming_response_create_overload_8(self, client: Cloudflare) -> None:
+        with client.abuse_reports.with_streaming_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_ncsei",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            name="x",
+            ncsei_subject_representation=True,
+            owner_notification="send",
+            urls="urls",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = response.parse()
+            assert_matches_type(str, abuse_report, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_path_params_create_overload_8(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.abuse_reports.with_raw_response.create(
+                report_param="report_param",
+                account_id="",
+                act="abuse_ncsei",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                name="x",
+                ncsei_subject_representation=True,
+                owner_notification="send",
+                urls="urls",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_param` but received ''"):
+            client.abuse_reports.with_raw_response.create(
+                report_param="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                act="abuse_ncsei",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                name="x",
+                ncsei_subject_representation=True,
+                owner_notification="send",
+                urls="urls",
+            )
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePagination[Optional[AbuseReportListResponse]], abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            created_after="2009-11-10T23:00:00Z",
+            created_before="2009-11-10T23:00:00Z",
+            domain="domain",
+            mitigation_status="pending",
+            page=0,
+            per_page=0,
+            sort="sort",
+            status="accepted",
+            type="PHISH",
+        )
+        assert_matches_type(SyncV4PagePagination[Optional[AbuseReportListResponse]], abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.abuse_reports.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = response.parse()
+        assert_matches_type(SyncV4PagePagination[Optional[AbuseReportListResponse]], abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.abuse_reports.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = response.parse()
+            assert_matches_type(
+                SyncV4PagePagination[Optional[AbuseReportListResponse]], abuse_report, path=["response"]
+            )
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.abuse_reports.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        abuse_report = client.abuse_reports.get(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AbuseReportGetResponse, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.abuse_reports.with_raw_response.get(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = response.parse()
+        assert_matches_type(AbuseReportGetResponse, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.abuse_reports.with_streaming_response.get(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = response.parse()
+            assert_matches_type(AbuseReportGetResponse, abuse_report, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.abuse_reports.with_raw_response.get(
+                report_param="report_param",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_param` but received ''"):
+            client.abuse_reports.with_raw_response.get(
+                report_param="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncAbuseReports:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_dmca",
+            address1="x",
+            agent_name="x",
+            agree=1,
+            city="x",
+            country="x",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            name="x",
+            original_work="x",
+            owner_notification="send",
+            signature="signature",
+            state="x",
+            urls="urls",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_dmca",
+            address1="x",
+            agent_name="x",
+            agree=1,
+            city="x",
+            country="x",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            name="x",
+            original_work="x",
+            owner_notification="send",
+            signature="signature",
+            state="x",
+            urls="urls",
+            comments="x",
+            company="x",
+            reported_country="xx",
+            reported_user_agent="x",
+            tele="x",
+            title="x",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.abuse_reports.with_raw_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_dmca",
+            address1="x",
+            agent_name="x",
+            agree=1,
+            city="x",
+            country="x",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            name="x",
+            original_work="x",
+            owner_notification="send",
+            signature="signature",
+            state="x",
+            urls="urls",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = await response.parse()
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.abuse_reports.with_streaming_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_dmca",
+            address1="x",
+            agent_name="x",
+            agree=1,
+            city="x",
+            country="x",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            name="x",
+            original_work="x",
+            owner_notification="send",
+            signature="signature",
+            state="x",
+            urls="urls",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = await response.parse()
+            assert_matches_type(str, abuse_report, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.abuse_reports.with_raw_response.create(
+                report_param="report_param",
+                account_id="",
+                act="abuse_dmca",
+                address1="x",
+                agent_name="x",
+                agree=1,
+                city="x",
+                country="x",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                name="x",
+                original_work="x",
+                owner_notification="send",
+                signature="signature",
+                state="x",
+                urls="urls",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_param` but received ''"):
+            await async_client.abuse_reports.with_raw_response.create(
+                report_param="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                act="abuse_dmca",
+                address1="x",
+                agent_name="x",
+                agree=1,
+                city="x",
+                country="x",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                name="x",
+                original_work="x",
+                owner_notification="send",
+                signature="signature",
+                state="x",
+                urls="urls",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_trademark",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            trademark_number="x",
+            trademark_office="x",
+            trademark_symbol="x",
+            urls="urls",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_create_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_trademark",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            trademark_number="x",
+            trademark_office="x",
+            trademark_symbol="x",
+            urls="urls",
+            comments="x",
+            company="x",
+            reported_country="xx",
+            reported_user_agent="x",
+            tele="x",
+            title="x",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.abuse_reports.with_raw_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_trademark",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            trademark_number="x",
+            trademark_office="x",
+            trademark_symbol="x",
+            urls="urls",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = await response.parse()
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.abuse_reports.with_streaming_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_trademark",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            trademark_number="x",
+            trademark_office="x",
+            trademark_symbol="x",
+            urls="urls",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = await response.parse()
+            assert_matches_type(str, abuse_report, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.abuse_reports.with_raw_response.create(
+                report_param="report_param",
+                account_id="",
+                act="abuse_trademark",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="x",
+                name="x",
+                owner_notification="send",
+                trademark_number="x",
+                trademark_office="x",
+                trademark_symbol="x",
+                urls="urls",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_param` but received ''"):
+            await async_client.abuse_reports.with_raw_response.create(
+                report_param="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                act="abuse_trademark",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="x",
+                name="x",
+                owner_notification="send",
+                trademark_number="x",
+                trademark_office="x",
+                trademark_symbol="x",
+                urls="urls",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_create_overload_3(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_general",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_create_with_all_params_overload_3(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_general",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+            comments="x",
+            company="x",
+            destination_ips="destination_ips",
+            ports_protocols="ports_protocols",
+            reported_country="xx",
+            reported_user_agent="x",
+            source_ips="source_ips",
+            tele="x",
+            title="x",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_raw_response_create_overload_3(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.abuse_reports.with_raw_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_general",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = await response.parse()
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_streaming_response_create_overload_3(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.abuse_reports.with_streaming_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_general",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = await response.parse()
+            assert_matches_type(str, abuse_report, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_path_params_create_overload_3(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.abuse_reports.with_raw_response.create(
+                report_param="report_param",
+                account_id="",
+                act="abuse_general",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="x",
+                name="x",
+                owner_notification="send",
+                urls="urls",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_param` but received ''"):
+            await async_client.abuse_reports.with_raw_response.create(
+                report_param="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                act="abuse_general",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="x",
+                name="x",
+                owner_notification="send",
+                urls="urls",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_create_overload_4(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_phishing",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="xxxxxxxxxxxxxxxxxxxx",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_create_with_all_params_overload_4(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_phishing",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="xxxxxxxxxxxxxxxxxxxx",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+            comments="x",
+            company="x",
+            original_work="x",
+            reported_country="xx",
+            reported_user_agent="x",
+            tele="x",
+            title="x",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_raw_response_create_overload_4(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.abuse_reports.with_raw_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_phishing",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="xxxxxxxxxxxxxxxxxxxx",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = await response.parse()
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_streaming_response_create_overload_4(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.abuse_reports.with_streaming_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_phishing",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="xxxxxxxxxxxxxxxxxxxx",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = await response.parse()
+            assert_matches_type(str, abuse_report, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_path_params_create_overload_4(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.abuse_reports.with_raw_response.create(
+                report_param="report_param",
+                account_id="",
+                act="abuse_phishing",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="xxxxxxxxxxxxxxxxxxxx",
+                name="x",
+                owner_notification="send",
+                urls="urls",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_param` but received ''"):
+            await async_client.abuse_reports.with_raw_response.create(
+                report_param="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                act="abuse_phishing",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="xxxxxxxxxxxxxxxxxxxx",
+                name="x",
+                owner_notification="send",
+                urls="urls",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_create_overload_5(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_children",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            ncmec_notification="send",
+            owner_notification="send",
+            urls="urls",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_create_with_all_params_overload_5(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_children",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            ncmec_notification="send",
+            owner_notification="send",
+            urls="urls",
+            comments="x",
+            company="x",
+            country="x",
+            reported_country="xx",
+            reported_user_agent="x",
+            tele="x",
+            title="x",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_raw_response_create_overload_5(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.abuse_reports.with_raw_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_children",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            ncmec_notification="send",
+            owner_notification="send",
+            urls="urls",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = await response.parse()
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_streaming_response_create_overload_5(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.abuse_reports.with_streaming_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_children",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            ncmec_notification="send",
+            owner_notification="send",
+            urls="urls",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = await response.parse()
+            assert_matches_type(str, abuse_report, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_path_params_create_overload_5(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.abuse_reports.with_raw_response.create(
+                report_param="report_param",
+                account_id="",
+                act="abuse_children",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="x",
+                name="x",
+                ncmec_notification="send",
+                owner_notification="send",
+                urls="urls",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_param` but received ''"):
+            await async_client.abuse_reports.with_raw_response.create(
+                report_param="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                act="abuse_children",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="x",
+                name="x",
+                ncmec_notification="send",
+                owner_notification="send",
+                urls="urls",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_create_overload_6(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_threat",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_create_with_all_params_overload_6(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_threat",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+            comments="x",
+            company="x",
+            reported_country="xx",
+            reported_user_agent="x",
+            tele="x",
+            title="x",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_raw_response_create_overload_6(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.abuse_reports.with_raw_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_threat",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = await response.parse()
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_streaming_response_create_overload_6(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.abuse_reports.with_streaming_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_threat",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            justification="x",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = await response.parse()
+            assert_matches_type(str, abuse_report, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_path_params_create_overload_6(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.abuse_reports.with_raw_response.create(
+                report_param="report_param",
+                account_id="",
+                act="abuse_threat",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="x",
+                name="x",
+                owner_notification="send",
+                urls="urls",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_param` but received ''"):
+            await async_client.abuse_reports.with_raw_response.create(
+                report_param="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                act="abuse_threat",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                justification="x",
+                name="x",
+                owner_notification="send",
+                urls="urls",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_create_overload_7(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_registrar_whois",
+            email="email",
+            email2="email2",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_create_with_all_params_overload_7(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_registrar_whois",
+            email="email",
+            email2="email2",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+            comments="x",
+            company="x",
+            reported_country="xx",
+            reported_user_agent="x",
+            tele="x",
+            title="x",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_raw_response_create_overload_7(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.abuse_reports.with_raw_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_registrar_whois",
+            email="email",
+            email2="email2",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = await response.parse()
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_streaming_response_create_overload_7(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.abuse_reports.with_streaming_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_registrar_whois",
+            email="email",
+            email2="email2",
+            name="x",
+            owner_notification="send",
+            urls="urls",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = await response.parse()
+            assert_matches_type(str, abuse_report, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_path_params_create_overload_7(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.abuse_reports.with_raw_response.create(
+                report_param="report_param",
+                account_id="",
+                act="abuse_registrar_whois",
+                email="email",
+                email2="email2",
+                name="x",
+                owner_notification="send",
+                urls="urls",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_param` but received ''"):
+            await async_client.abuse_reports.with_raw_response.create(
+                report_param="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                act="abuse_registrar_whois",
+                email="email",
+                email2="email2",
+                name="x",
+                owner_notification="send",
+                urls="urls",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_create_overload_8(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_ncsei",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            name="x",
+            ncsei_subject_representation=True,
+            owner_notification="send",
+            urls="urls",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_create_with_all_params_overload_8(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_ncsei",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            name="x",
+            ncsei_subject_representation=True,
+            owner_notification="send",
+            urls="urls",
+            comments="x",
+            company="x",
+            country="x",
+            reported_country="xx",
+            reported_user_agent="x",
+            tele="x",
+            title="x",
+        )
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_raw_response_create_overload_8(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.abuse_reports.with_raw_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_ncsei",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            name="x",
+            ncsei_subject_representation=True,
+            owner_notification="send",
+            urls="urls",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = await response.parse()
+        assert_matches_type(str, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_streaming_response_create_overload_8(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.abuse_reports.with_streaming_response.create(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            act="abuse_ncsei",
+            email="email",
+            email2="email2",
+            host_notification="send",
+            name="x",
+            ncsei_subject_representation=True,
+            owner_notification="send",
+            urls="urls",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = await response.parse()
+            assert_matches_type(str, abuse_report, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_path_params_create_overload_8(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.abuse_reports.with_raw_response.create(
+                report_param="report_param",
+                account_id="",
+                act="abuse_ncsei",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                name="x",
+                ncsei_subject_representation=True,
+                owner_notification="send",
+                urls="urls",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_param` but received ''"):
+            await async_client.abuse_reports.with_raw_response.create(
+                report_param="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                act="abuse_ncsei",
+                email="email",
+                email2="email2",
+                host_notification="send",
+                name="x",
+                ncsei_subject_representation=True,
+                owner_notification="send",
+                urls="urls",
+            )
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePagination[Optional[AbuseReportListResponse]], abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            created_after="2009-11-10T23:00:00Z",
+            created_before="2009-11-10T23:00:00Z",
+            domain="domain",
+            mitigation_status="pending",
+            page=0,
+            per_page=0,
+            sort="sort",
+            status="accepted",
+            type="PHISH",
+        )
+        assert_matches_type(AsyncV4PagePagination[Optional[AbuseReportListResponse]], abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.abuse_reports.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = await response.parse()
+        assert_matches_type(AsyncV4PagePagination[Optional[AbuseReportListResponse]], abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.abuse_reports.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = await response.parse()
+            assert_matches_type(
+                AsyncV4PagePagination[Optional[AbuseReportListResponse]], abuse_report, path=["response"]
+            )
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.abuse_reports.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        abuse_report = await async_client.abuse_reports.get(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AbuseReportGetResponse, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.abuse_reports.with_raw_response.get(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        abuse_report = await response.parse()
+        assert_matches_type(AbuseReportGetResponse, abuse_report, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.abuse_reports.with_streaming_response.get(
+            report_param="report_param",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            abuse_report = await response.parse()
+            assert_matches_type(AbuseReportGetResponse, abuse_report, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: support api token auth scheme")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.abuse_reports.with_raw_response.get(
+                report_param="report_param",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `report_param` but received ''"):
+            await async_client.abuse_reports.with_raw_response.get(
+                report_param="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/test_accounts.py b/tests/api_resources/test_accounts.py
index fca546cad37..b8cba0c99c7 100644
--- a/tests/api_resources/test_accounts.py
+++ b/tests/api_resources/test_accounts.py
@@ -3,13 +3,17 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.accounts import (
+    Account,
+    AccountDeleteResponse,
+)
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -17,58 +21,115 @@
 class TestAccounts:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        account = client.accounts.create(
+            name="name",
+        )
+        assert_matches_type(Optional[Account], account, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        account = client.accounts.create(
+            name="name",
+            type="standard",
+            unit={"id": "f267e341f3dd4697bd3b9f71dd96247f"},
+        )
+        assert_matches_type(Optional[Account], account, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.accounts.with_raw_response.create(
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        account = response.parse()
+        assert_matches_type(Optional[Account], account, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.accounts.with_streaming_response.create(
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            account = response.parse()
+            assert_matches_type(Optional[Account], account, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         account = client.accounts.update(
-            account_id={},
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="023e105f4ecef8ad9ca31a8372d0c353",
             name="Demo Account",
+            type="standard",
         )
-        assert_matches_type(object, account, path=["response"])
+        assert_matches_type(Optional[Account], account, path=["response"])
 
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         account = client.accounts.update(
-            account_id={},
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="023e105f4ecef8ad9ca31a8372d0c353",
             name="Demo Account",
+            type="standard",
+            managed_by={},
             settings={
                 "abuse_contact_email": "abuse_contact_email",
-                "default_nameservers": "cloudflare.standard",
                 "enforce_twofactor": True,
-                "use_account_custom_ns_by_default": True,
             },
         )
-        assert_matches_type(object, account, path=["response"])
+        assert_matches_type(Optional[Account], account, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.accounts.with_raw_response.update(
-            account_id={},
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="023e105f4ecef8ad9ca31a8372d0c353",
             name="Demo Account",
+            type="standard",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         account = response.parse()
-        assert_matches_type(object, account, path=["response"])
+        assert_matches_type(Optional[Account], account, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.accounts.with_streaming_response.update(
-            account_id={},
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="023e105f4ecef8ad9ca31a8372d0c353",
             name="Demo Account",
+            type="standard",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             account = response.parse()
-            assert_matches_type(object, account, path=["response"])
+            assert_matches_type(Optional[Account], account, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.accounts.with_raw_response.update(
+                account_id="",
+                id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="Demo Account",
+                type="standard",
+            )
+
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         account = client.accounts.list()
-        assert_matches_type(SyncV4PagePaginationArray[object], account, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Account], account, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
@@ -78,7 +139,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
             page=1,
             per_page=5,
         )
-        assert_matches_type(SyncV4PagePaginationArray[object], account, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Account], account, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -87,7 +148,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         account = response.parse()
-        assert_matches_type(SyncV4PagePaginationArray[object], account, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Account], account, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -96,97 +157,201 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             account = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[object], account, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[Account], account, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        account = client.accounts.delete(
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[AccountDeleteResponse], account, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.accounts.with_raw_response.delete(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        account = response.parse()
+        assert_matches_type(Optional[AccountDeleteResponse], account, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.accounts.with_streaming_response.delete(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            account = response.parse()
+            assert_matches_type(Optional[AccountDeleteResponse], account, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.accounts.with_raw_response.delete(
+                account_id="",
+            )
+
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         account = client.accounts.get(
-            account_id={},
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(object, account, path=["response"])
+        assert_matches_type(Optional[Account], account, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.accounts.with_raw_response.get(
-            account_id={},
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         account = response.parse()
-        assert_matches_type(object, account, path=["response"])
+        assert_matches_type(Optional[Account], account, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.accounts.with_streaming_response.get(
-            account_id={},
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             account = response.parse()
-            assert_matches_type(object, account, path=["response"])
+            assert_matches_type(Optional[Account], account, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.accounts.with_raw_response.get(
+                account_id="",
+            )
+
 
 class TestAsyncAccounts:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        account = await async_client.accounts.create(
+            name="name",
+        )
+        assert_matches_type(Optional[Account], account, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        account = await async_client.accounts.create(
+            name="name",
+            type="standard",
+            unit={"id": "f267e341f3dd4697bd3b9f71dd96247f"},
+        )
+        assert_matches_type(Optional[Account], account, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.accounts.with_raw_response.create(
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        account = await response.parse()
+        assert_matches_type(Optional[Account], account, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.accounts.with_streaming_response.create(
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            account = await response.parse()
+            assert_matches_type(Optional[Account], account, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         account = await async_client.accounts.update(
-            account_id={},
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="023e105f4ecef8ad9ca31a8372d0c353",
             name="Demo Account",
+            type="standard",
         )
-        assert_matches_type(object, account, path=["response"])
+        assert_matches_type(Optional[Account], account, path=["response"])
 
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         account = await async_client.accounts.update(
-            account_id={},
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="023e105f4ecef8ad9ca31a8372d0c353",
             name="Demo Account",
+            type="standard",
+            managed_by={},
             settings={
                 "abuse_contact_email": "abuse_contact_email",
-                "default_nameservers": "cloudflare.standard",
                 "enforce_twofactor": True,
-                "use_account_custom_ns_by_default": True,
             },
         )
-        assert_matches_type(object, account, path=["response"])
+        assert_matches_type(Optional[Account], account, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.accounts.with_raw_response.update(
-            account_id={},
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="023e105f4ecef8ad9ca31a8372d0c353",
             name="Demo Account",
+            type="standard",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         account = await response.parse()
-        assert_matches_type(object, account, path=["response"])
+        assert_matches_type(Optional[Account], account, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.accounts.with_streaming_response.update(
-            account_id={},
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="023e105f4ecef8ad9ca31a8372d0c353",
             name="Demo Account",
+            type="standard",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             account = await response.parse()
-            assert_matches_type(object, account, path=["response"])
+            assert_matches_type(Optional[Account], account, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.accounts.with_raw_response.update(
+                account_id="",
+                id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="Demo Account",
+                type="standard",
+            )
+
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         account = await async_client.accounts.list()
-        assert_matches_type(AsyncV4PagePaginationArray[object], account, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Account], account, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -196,7 +361,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
             page=1,
             per_page=5,
         )
-        assert_matches_type(AsyncV4PagePaginationArray[object], account, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Account], account, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -205,7 +370,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         account = await response.parse()
-        assert_matches_type(AsyncV4PagePaginationArray[object], account, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Account], account, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -214,37 +379,82 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             account = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[object], account, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[Account], account, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        account = await async_client.accounts.delete(
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[AccountDeleteResponse], account, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.accounts.with_raw_response.delete(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        account = await response.parse()
+        assert_matches_type(Optional[AccountDeleteResponse], account, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.accounts.with_streaming_response.delete(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            account = await response.parse()
+            assert_matches_type(Optional[AccountDeleteResponse], account, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.accounts.with_raw_response.delete(
+                account_id="",
+            )
+
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         account = await async_client.accounts.get(
-            account_id={},
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(object, account, path=["response"])
+        assert_matches_type(Optional[Account], account, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.accounts.with_raw_response.get(
-            account_id={},
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         account = await response.parse()
-        assert_matches_type(object, account, path=["response"])
+        assert_matches_type(Optional[Account], account, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.accounts.with_streaming_response.get(
-            account_id={},
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             account = await response.parse()
-            assert_matches_type(object, account, path=["response"])
+            assert_matches_type(Optional[Account], account, path=["response"])
 
         assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.accounts.with_raw_response.get(
+                account_id="",
+            )
diff --git a/tests/api_resources/test_ai.py b/tests/api_resources/test_ai.py
new file mode 100644
index 00000000000..aa2f3717bc0
--- /dev/null
+++ b/tests/api_resources/test_ai.py
@@ -0,0 +1,2156 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.ai import AIRunResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestAI:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_run_overload_1(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            text="x",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_raw_response_run_overload_1(self, client: Cloudflare) -> None:
+        response = client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            text="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_streaming_response_run_overload_1(self, client: Cloudflare) -> None:
+        with client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            text="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_run_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                text="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                text="x",
+            )
+
+    @parametrize
+    def test_method_run_overload_2(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_method_run_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+            guidance=0,
+            height=256,
+            image=[0],
+            image_b64="image_b64",
+            mask=[0],
+            negative_prompt="negative_prompt",
+            num_steps=20,
+            seed=0,
+            strength=0,
+            width=256,
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_raw_response_run_overload_2(self, client: Cloudflare) -> None:
+        response = client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_streaming_response_run_overload_2(self, client: Cloudflare) -> None:
+        with client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_run_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                prompt="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                prompt="x",
+            )
+
+    @parametrize
+    def test_method_run_overload_3(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_method_run_with_all_params_overload_3(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+            lang="lang",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_raw_response_run_overload_3(self, client: Cloudflare) -> None:
+        response = client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_streaming_response_run_overload_3(self, client: Cloudflare) -> None:
+        with client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_run_overload_3(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                prompt="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                prompt="x",
+            )
+
+    @parametrize
+    def test_method_run_overload_4(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            text="x",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_raw_response_run_overload_4(self, client: Cloudflare) -> None:
+        response = client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            text="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_streaming_response_run_overload_4(self, client: Cloudflare) -> None:
+        with client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            text="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_run_overload_4(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                text="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                text="x",
+            )
+
+    @parametrize
+    def test_method_run_overload_5(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            audio=[0],
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_method_run_with_all_params_overload_5(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            audio=[0],
+            source_lang="source_lang",
+            target_lang="target_lang",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_raw_response_run_overload_5(self, client: Cloudflare) -> None:
+        response = client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            audio=[0],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_streaming_response_run_overload_5(self, client: Cloudflare) -> None:
+        with client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            audio=[0],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_run_overload_5(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                audio=[0],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                audio=[0],
+            )
+
+    @parametrize
+    def test_method_run_overload_6(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image=[0],
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_raw_response_run_overload_6(self, client: Cloudflare) -> None:
+        response = client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image=[0],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_streaming_response_run_overload_6(self, client: Cloudflare) -> None:
+        with client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image=[0],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_run_overload_6(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                image=[0],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                image=[0],
+            )
+
+    @parametrize
+    def test_method_run_overload_7(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_method_run_with_all_params_overload_7(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image=[0],
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_raw_response_run_overload_7(self, client: Cloudflare) -> None:
+        response = client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_streaming_response_run_overload_7(self, client: Cloudflare) -> None:
+        with client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_run_overload_7(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_run_overload_8(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_method_run_with_all_params_overload_8(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+            frequency_penalty=-2,
+            lora="lora",
+            max_tokens=0,
+            presence_penalty=-2,
+            raw=True,
+            repetition_penalty=0,
+            response_format={
+                "json_schema": {},
+                "type": "json_object",
+            },
+            seed=1,
+            stream=True,
+            temperature=0,
+            top_k=1,
+            top_p=0.001,
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_raw_response_run_overload_8(self, client: Cloudflare) -> None:
+        response = client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_streaming_response_run_overload_8(self, client: Cloudflare) -> None:
+        with client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_run_overload_8(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                prompt="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                prompt="x",
+            )
+
+    @parametrize
+    def test_method_run_overload_9(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "role",
+                }
+            ],
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_method_run_with_all_params_overload_9(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "role",
+                }
+            ],
+            frequency_penalty=-2,
+            functions=[
+                {
+                    "code": "code",
+                    "name": "name",
+                }
+            ],
+            max_tokens=0,
+            presence_penalty=-2,
+            raw=True,
+            repetition_penalty=0,
+            response_format={
+                "json_schema": {},
+                "type": "json_object",
+            },
+            seed=1,
+            stream=True,
+            temperature=0,
+            tools=[
+                {
+                    "description": "description",
+                    "name": "name",
+                    "parameters": {
+                        "properties": {
+                            "foo": {
+                                "description": "description",
+                                "type": "type",
+                            }
+                        },
+                        "type": "type",
+                        "required": ["string"],
+                    },
+                }
+            ],
+            top_k=1,
+            top_p=0.001,
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_raw_response_run_overload_9(self, client: Cloudflare) -> None:
+        response = client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "role",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_streaming_response_run_overload_9(self, client: Cloudflare) -> None:
+        with client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "role",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_run_overload_9(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                messages=[
+                    {
+                        "content": "content",
+                        "role": "role",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                messages=[
+                    {
+                        "content": "content",
+                        "role": "role",
+                    }
+                ],
+            )
+
+    @parametrize
+    def test_method_run_overload_10(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            target_lang="target_lang",
+            text="x",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_method_run_with_all_params_overload_10(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            target_lang="target_lang",
+            text="x",
+            source_lang="source_lang",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_raw_response_run_overload_10(self, client: Cloudflare) -> None:
+        response = client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            target_lang="target_lang",
+            text="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_streaming_response_run_overload_10(self, client: Cloudflare) -> None:
+        with client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            target_lang="target_lang",
+            text="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_run_overload_10(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                target_lang="target_lang",
+                text="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                target_lang="target_lang",
+                text="x",
+            )
+
+    @parametrize
+    def test_method_run_overload_11(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            input_text="x",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_method_run_with_all_params_overload_11(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            input_text="x",
+            max_length=0,
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_raw_response_run_overload_11(self, client: Cloudflare) -> None:
+        response = client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            input_text="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_streaming_response_run_overload_11(self, client: Cloudflare) -> None:
+        with client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            input_text="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_run_overload_11(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                input_text="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                input_text="x",
+            )
+
+    @parametrize
+    def test_method_run_overload_12(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image=[0],
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_method_run_with_all_params_overload_12(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image=[0],
+            frequency_penalty=0,
+            max_tokens=0,
+            presence_penalty=0,
+            prompt="prompt",
+            raw=True,
+            repetition_penalty=0,
+            seed=0,
+            temperature=0,
+            top_k=0,
+            top_p=0,
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_raw_response_run_overload_12(self, client: Cloudflare) -> None:
+        response = client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image=[0],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_streaming_response_run_overload_12(self, client: Cloudflare) -> None:
+        with client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image=[0],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_run_overload_12(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                image=[0],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                image=[0],
+            )
+
+    @parametrize
+    def test_method_run_overload_13(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image="image",
+            prompt="x",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_method_run_with_all_params_overload_13(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image="image",
+            prompt="x",
+            frequency_penalty=0,
+            ignore_eos=True,
+            max_tokens=0,
+            presence_penalty=0,
+            repetition_penalty=0,
+            seed=0,
+            temperature=0,
+            top_k=0,
+            top_p=0,
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_raw_response_run_overload_13(self, client: Cloudflare) -> None:
+        response = client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image="image",
+            prompt="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_streaming_response_run_overload_13(self, client: Cloudflare) -> None:
+        with client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image="image",
+            prompt="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_run_overload_13(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                image="image",
+                prompt="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                image="image",
+                prompt="x",
+            )
+
+    @parametrize
+    def test_method_run_overload_14(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image="image",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "role",
+                }
+            ],
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_method_run_with_all_params_overload_14(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image="image",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "role",
+                }
+            ],
+            frequency_penalty=0,
+            ignore_eos=True,
+            max_tokens=0,
+            presence_penalty=0,
+            repetition_penalty=0,
+            seed=0,
+            temperature=0,
+            top_k=0,
+            top_p=0,
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_raw_response_run_overload_14(self, client: Cloudflare) -> None:
+        response = client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image="image",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "role",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_streaming_response_run_overload_14(self, client: Cloudflare) -> None:
+        with client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image="image",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "role",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_run_overload_14(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                image="image",
+                messages=[
+                    {
+                        "content": "content",
+                        "role": "role",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                image="image",
+                messages=[
+                    {
+                        "content": "content",
+                        "role": "role",
+                    }
+                ],
+            )
+
+    @parametrize
+    def test_method_run_overload_15(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_method_run_with_all_params_overload_15(self, client: Cloudflare) -> None:
+        ai = client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image="x",
+            text=["x"],
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_raw_response_run_overload_15(self, client: Cloudflare) -> None:
+        response = client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    def test_streaming_response_run_overload_15(self, client: Cloudflare) -> None:
+        with client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_run_overload_15(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncAI:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_run_overload_1(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            text="x",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_raw_response_run_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            text="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = await response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_run_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            text="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = await response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_run_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                text="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                text="x",
+            )
+
+    @parametrize
+    async def test_method_run_overload_2(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_method_run_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+            guidance=0,
+            height=256,
+            image=[0],
+            image_b64="image_b64",
+            mask=[0],
+            negative_prompt="negative_prompt",
+            num_steps=20,
+            seed=0,
+            strength=0,
+            width=256,
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_raw_response_run_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = await response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_run_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = await response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_run_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                prompt="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                prompt="x",
+            )
+
+    @parametrize
+    async def test_method_run_overload_3(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_method_run_with_all_params_overload_3(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+            lang="lang",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_raw_response_run_overload_3(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = await response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_run_overload_3(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = await response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_run_overload_3(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                prompt="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                prompt="x",
+            )
+
+    @parametrize
+    async def test_method_run_overload_4(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            text="x",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_raw_response_run_overload_4(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            text="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = await response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_run_overload_4(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            text="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = await response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_run_overload_4(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                text="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                text="x",
+            )
+
+    @parametrize
+    async def test_method_run_overload_5(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            audio=[0],
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_method_run_with_all_params_overload_5(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            audio=[0],
+            source_lang="source_lang",
+            target_lang="target_lang",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_raw_response_run_overload_5(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            audio=[0],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = await response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_run_overload_5(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            audio=[0],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = await response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_run_overload_5(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                audio=[0],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                audio=[0],
+            )
+
+    @parametrize
+    async def test_method_run_overload_6(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image=[0],
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_raw_response_run_overload_6(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image=[0],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = await response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_run_overload_6(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image=[0],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = await response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_run_overload_6(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                image=[0],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                image=[0],
+            )
+
+    @parametrize
+    async def test_method_run_overload_7(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_method_run_with_all_params_overload_7(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image=[0],
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_raw_response_run_overload_7(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = await response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_run_overload_7(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = await response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_run_overload_7(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_run_overload_8(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_method_run_with_all_params_overload_8(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+            frequency_penalty=-2,
+            lora="lora",
+            max_tokens=0,
+            presence_penalty=-2,
+            raw=True,
+            repetition_penalty=0,
+            response_format={
+                "json_schema": {},
+                "type": "json_object",
+            },
+            seed=1,
+            stream=True,
+            temperature=0,
+            top_k=1,
+            top_p=0.001,
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_raw_response_run_overload_8(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = await response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_run_overload_8(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            prompt="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = await response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_run_overload_8(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                prompt="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                prompt="x",
+            )
+
+    @parametrize
+    async def test_method_run_overload_9(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "role",
+                }
+            ],
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_method_run_with_all_params_overload_9(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "role",
+                }
+            ],
+            frequency_penalty=-2,
+            functions=[
+                {
+                    "code": "code",
+                    "name": "name",
+                }
+            ],
+            max_tokens=0,
+            presence_penalty=-2,
+            raw=True,
+            repetition_penalty=0,
+            response_format={
+                "json_schema": {},
+                "type": "json_object",
+            },
+            seed=1,
+            stream=True,
+            temperature=0,
+            tools=[
+                {
+                    "description": "description",
+                    "name": "name",
+                    "parameters": {
+                        "properties": {
+                            "foo": {
+                                "description": "description",
+                                "type": "type",
+                            }
+                        },
+                        "type": "type",
+                        "required": ["string"],
+                    },
+                }
+            ],
+            top_k=1,
+            top_p=0.001,
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_raw_response_run_overload_9(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "role",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = await response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_run_overload_9(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "role",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = await response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_run_overload_9(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                messages=[
+                    {
+                        "content": "content",
+                        "role": "role",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                messages=[
+                    {
+                        "content": "content",
+                        "role": "role",
+                    }
+                ],
+            )
+
+    @parametrize
+    async def test_method_run_overload_10(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            target_lang="target_lang",
+            text="x",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_method_run_with_all_params_overload_10(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            target_lang="target_lang",
+            text="x",
+            source_lang="source_lang",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_raw_response_run_overload_10(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            target_lang="target_lang",
+            text="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = await response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_run_overload_10(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            target_lang="target_lang",
+            text="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = await response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_run_overload_10(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                target_lang="target_lang",
+                text="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                target_lang="target_lang",
+                text="x",
+            )
+
+    @parametrize
+    async def test_method_run_overload_11(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            input_text="x",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_method_run_with_all_params_overload_11(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            input_text="x",
+            max_length=0,
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_raw_response_run_overload_11(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            input_text="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = await response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_run_overload_11(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            input_text="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = await response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_run_overload_11(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                input_text="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                input_text="x",
+            )
+
+    @parametrize
+    async def test_method_run_overload_12(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image=[0],
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_method_run_with_all_params_overload_12(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image=[0],
+            frequency_penalty=0,
+            max_tokens=0,
+            presence_penalty=0,
+            prompt="prompt",
+            raw=True,
+            repetition_penalty=0,
+            seed=0,
+            temperature=0,
+            top_k=0,
+            top_p=0,
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_raw_response_run_overload_12(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image=[0],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = await response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_run_overload_12(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image=[0],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = await response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_run_overload_12(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                image=[0],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                image=[0],
+            )
+
+    @parametrize
+    async def test_method_run_overload_13(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image="image",
+            prompt="x",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_method_run_with_all_params_overload_13(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image="image",
+            prompt="x",
+            frequency_penalty=0,
+            ignore_eos=True,
+            max_tokens=0,
+            presence_penalty=0,
+            repetition_penalty=0,
+            seed=0,
+            temperature=0,
+            top_k=0,
+            top_p=0,
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_raw_response_run_overload_13(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image="image",
+            prompt="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = await response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_run_overload_13(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image="image",
+            prompt="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = await response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_run_overload_13(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                image="image",
+                prompt="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                image="image",
+                prompt="x",
+            )
+
+    @parametrize
+    async def test_method_run_overload_14(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image="image",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "role",
+                }
+            ],
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_method_run_with_all_params_overload_14(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image="image",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "role",
+                }
+            ],
+            frequency_penalty=0,
+            ignore_eos=True,
+            max_tokens=0,
+            presence_penalty=0,
+            repetition_penalty=0,
+            seed=0,
+            temperature=0,
+            top_k=0,
+            top_p=0,
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_raw_response_run_overload_14(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image="image",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "role",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = await response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_run_overload_14(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image="image",
+            messages=[
+                {
+                    "content": "content",
+                    "role": "role",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = await response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_run_overload_14(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+                image="image",
+                messages=[
+                    {
+                        "content": "content",
+                        "role": "role",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                image="image",
+                messages=[
+                    {
+                        "content": "content",
+                        "role": "role",
+                    }
+                ],
+            )
+
+    @parametrize
+    async def test_method_run_overload_15(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_method_run_with_all_params_overload_15(self, async_client: AsyncCloudflare) -> None:
+        ai = await async_client.ai.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            image="x",
+            text=["x"],
+        )
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_raw_response_run_overload_15(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.ai.with_raw_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        ai = await response.parse()
+        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_run_overload_15(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.ai.with_streaming_response.run(
+            model_name="model_name",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            ai = await response.parse()
+            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_run_overload_15(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="model_name",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
+            await async_client.ai.with_raw_response.run(
+                model_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/test_ai_gateway.py b/tests/api_resources/test_ai_gateway.py
index 8ab7ec39b18..d0b981f22c6 100644
--- a/tests/api_resources/test_ai_gateway.py
+++ b/tests/api_resources/test_ai_gateway.py
@@ -38,6 +38,27 @@ def test_method_create(self, client: Cloudflare) -> None:
         )
         assert_matches_type(AIGatewayCreateResponse, ai_gateway, path=["response"])
 
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        ai_gateway = client.ai_gateway.create(
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            id="my-gateway",
+            cache_invalidate_on_update=True,
+            cache_ttl=0,
+            collect_logs=True,
+            rate_limiting_interval=0,
+            rate_limiting_limit=0,
+            rate_limiting_technique="fixed",
+            authentication=True,
+            is_default=True,
+            log_management=10000,
+            log_management_strategy="STOP_INSERTING",
+            logpush=True,
+            logpush_public_key="xxxxxxxxxxxxxxxx",
+            zdr=True,
+        )
+        assert_matches_type(AIGatewayCreateResponse, ai_gateway, path=["response"])
+
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.ai_gateway.with_raw_response.create(
@@ -104,6 +125,44 @@ def test_method_update(self, client: Cloudflare) -> None:
         )
         assert_matches_type(AIGatewayUpdateResponse, ai_gateway, path=["response"])
 
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        ai_gateway = client.ai_gateway.update(
+            id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            cache_invalidate_on_update=True,
+            cache_ttl=0,
+            collect_logs=True,
+            rate_limiting_interval=0,
+            rate_limiting_limit=0,
+            rate_limiting_technique="fixed",
+            authentication=True,
+            dlp={
+                "action": "BLOCK",
+                "enabled": True,
+                "profiles": ["string"],
+            },
+            is_default=True,
+            log_management=10000,
+            log_management_strategy="STOP_INSERTING",
+            logpush=True,
+            logpush_public_key="xxxxxxxxxxxxxxxx",
+            otel=[
+                {
+                    "authorization": "authorization",
+                    "headers": {"foo": "string"},
+                    "url": "url",
+                }
+            ],
+            store_id="store_id",
+            stripe={
+                "authorization": "authorization",
+                "usage_events": [{"payload": "payload"}],
+            },
+            zdr=True,
+        )
+        assert_matches_type(AIGatewayUpdateResponse, ai_gateway, path=["response"])
+
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.ai_gateway.with_raw_response.update(
@@ -179,10 +238,9 @@ def test_method_list(self, client: Cloudflare) -> None:
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         ai_gateway = client.ai_gateway.list(
             account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
-            id="my-gateway",
-            order_by="order_by",
             page=1,
-            per_page=5,
+            per_page=1,
+            search="search",
         )
         assert_matches_type(SyncV4PagePaginationArray[AIGatewayListResponse], ai_gateway, path=["response"])
 
@@ -220,7 +278,7 @@ def test_path_params_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         ai_gateway = client.ai_gateway.delete(
-            id="id",
+            id="my-gateway",
             account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
         )
         assert_matches_type(AIGatewayDeleteResponse, ai_gateway, path=["response"])
@@ -228,7 +286,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.ai_gateway.with_raw_response.delete(
-            id="id",
+            id="my-gateway",
             account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
         )
 
@@ -240,7 +298,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.ai_gateway.with_streaming_response.delete(
-            id="id",
+            id="my-gateway",
             account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
         ) as response:
             assert not response.is_closed
@@ -255,7 +313,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.ai_gateway.with_raw_response.delete(
-                id="id",
+                id="my-gateway",
                 account_id="",
             )
 
@@ -315,7 +373,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncAIGateway:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -331,6 +391,27 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(AIGatewayCreateResponse, ai_gateway, path=["response"])
 
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        ai_gateway = await async_client.ai_gateway.create(
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            id="my-gateway",
+            cache_invalidate_on_update=True,
+            cache_ttl=0,
+            collect_logs=True,
+            rate_limiting_interval=0,
+            rate_limiting_limit=0,
+            rate_limiting_technique="fixed",
+            authentication=True,
+            is_default=True,
+            log_management=10000,
+            log_management_strategy="STOP_INSERTING",
+            logpush=True,
+            logpush_public_key="xxxxxxxxxxxxxxxx",
+            zdr=True,
+        )
+        assert_matches_type(AIGatewayCreateResponse, ai_gateway, path=["response"])
+
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.ai_gateway.with_raw_response.create(
@@ -397,6 +478,44 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(AIGatewayUpdateResponse, ai_gateway, path=["response"])
 
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        ai_gateway = await async_client.ai_gateway.update(
+            id="my-gateway",
+            account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
+            cache_invalidate_on_update=True,
+            cache_ttl=0,
+            collect_logs=True,
+            rate_limiting_interval=0,
+            rate_limiting_limit=0,
+            rate_limiting_technique="fixed",
+            authentication=True,
+            dlp={
+                "action": "BLOCK",
+                "enabled": True,
+                "profiles": ["string"],
+            },
+            is_default=True,
+            log_management=10000,
+            log_management_strategy="STOP_INSERTING",
+            logpush=True,
+            logpush_public_key="xxxxxxxxxxxxxxxx",
+            otel=[
+                {
+                    "authorization": "authorization",
+                    "headers": {"foo": "string"},
+                    "url": "url",
+                }
+            ],
+            store_id="store_id",
+            stripe={
+                "authorization": "authorization",
+                "usage_events": [{"payload": "payload"}],
+            },
+            zdr=True,
+        )
+        assert_matches_type(AIGatewayUpdateResponse, ai_gateway, path=["response"])
+
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.ai_gateway.with_raw_response.update(
@@ -472,10 +591,9 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         ai_gateway = await async_client.ai_gateway.list(
             account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
-            id="my-gateway",
-            order_by="order_by",
             page=1,
-            per_page=5,
+            per_page=1,
+            search="search",
         )
         assert_matches_type(AsyncV4PagePaginationArray[AIGatewayListResponse], ai_gateway, path=["response"])
 
@@ -513,7 +631,7 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         ai_gateway = await async_client.ai_gateway.delete(
-            id="id",
+            id="my-gateway",
             account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
         )
         assert_matches_type(AIGatewayDeleteResponse, ai_gateway, path=["response"])
@@ -521,7 +639,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.ai_gateway.with_raw_response.delete(
-            id="id",
+            id="my-gateway",
             account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
         )
 
@@ -533,7 +651,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.ai_gateway.with_streaming_response.delete(
-            id="id",
+            id="my-gateway",
             account_id="3ebbcb006d4d46d7bb6a8c7f14676cb0",
         ) as response:
             assert not response.is_closed
@@ -548,7 +666,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.ai_gateway.with_raw_response.delete(
-                id="id",
+                id="my-gateway",
                 account_id="",
             )
 
diff --git a/tests/api_resources/test_audit_logs.py b/tests/api_resources/test_audit_logs.py
index 3fec9ccbe53..b992b177c3f 100644
--- a/tests/api_resources/test_audit_logs.py
+++ b/tests/api_resources/test_audit_logs.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare._utils import parse_datetime
+from cloudflare._utils import parse_date
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.shared import AuditLog
 
@@ -33,16 +33,16 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
             id="f174be97-19b1-40d6-954d-70cd5fbd52db",
             action={"type": "add"},
             actor={
-                "ip": "17.168.228.63",
                 "email": "alice@example.com",
+                "ip": "17.168.228.63",
             },
-            before=parse_datetime("2019-04-30T01:12:20Z"),
+            before=parse_date("2019-04-30"),
             direction="desc",
             export=True,
             hide_user_logs=True,
             page=50,
             per_page=25,
-            since=parse_datetime("2019-04-30T01:12:20Z"),
+            since=parse_date("2019-04-30"),
             zone={"name": "example.com"},
         )
         assert_matches_type(SyncV4PagePaginationArray[AuditLog], audit_log, path=["response"])
@@ -80,7 +80,9 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncAuditLogs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
@@ -96,16 +98,16 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
             id="f174be97-19b1-40d6-954d-70cd5fbd52db",
             action={"type": "add"},
             actor={
-                "ip": "17.168.228.63",
                 "email": "alice@example.com",
+                "ip": "17.168.228.63",
             },
-            before=parse_datetime("2019-04-30T01:12:20Z"),
+            before=parse_date("2019-04-30"),
             direction="desc",
             export=True,
             hide_user_logs=True,
             page=50,
             per_page=25,
-            since=parse_datetime("2019-04-30T01:12:20Z"),
+            since=parse_date("2019-04-30"),
             zone={"name": "example.com"},
         )
         assert_matches_type(AsyncV4PagePaginationArray[AuditLog], audit_log, path=["response"])
diff --git a/tests/api_resources/test_bot_management.py b/tests/api_resources/test_bot_management.py
index 5b9d258bd81..bffba58aeef 100644
--- a/tests/api_resources/test_bot_management.py
+++ b/tests/api_resources/test_bot_management.py
@@ -31,8 +31,12 @@ def test_method_update_overload_1(self, client: Cloudflare) -> None:
     def test_method_update_with_all_params_overload_1(self, client: Cloudflare) -> None:
         bot_management = client.bot_management.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ai_bots_protection="block",
+            cf_robots_variant="policy_only",
+            crawler_protection="enabled",
             enable_js=True,
             fight_mode=True,
+            is_robots_txt_managed=False,
         )
         assert_matches_type(Optional[BotManagementUpdateResponse], bot_management, path=["response"])
 
@@ -78,7 +82,11 @@ def test_method_update_overload_2(self, client: Cloudflare) -> None:
     def test_method_update_with_all_params_overload_2(self, client: Cloudflare) -> None:
         bot_management = client.bot_management.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ai_bots_protection="block",
+            cf_robots_variant="policy_only",
+            crawler_protection="enabled",
             enable_js=True,
+            is_robots_txt_managed=False,
             optimize_wordpress=True,
             sbfm_definitely_automated="allow",
             sbfm_static_resource_protection=True,
@@ -128,7 +136,11 @@ def test_method_update_overload_3(self, client: Cloudflare) -> None:
     def test_method_update_with_all_params_overload_3(self, client: Cloudflare) -> None:
         bot_management = client.bot_management.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ai_bots_protection="block",
+            cf_robots_variant="policy_only",
+            crawler_protection="enabled",
             enable_js=True,
+            is_robots_txt_managed=False,
             optimize_wordpress=True,
             sbfm_definitely_automated="allow",
             sbfm_likely_automated="allow",
@@ -179,8 +191,13 @@ def test_method_update_overload_4(self, client: Cloudflare) -> None:
     def test_method_update_with_all_params_overload_4(self, client: Cloudflare) -> None:
         bot_management = client.bot_management.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ai_bots_protection="block",
             auto_update_model=True,
+            bm_cookie_enabled=True,
+            cf_robots_variant="policy_only",
+            crawler_protection="enabled",
             enable_js=True,
+            is_robots_txt_managed=False,
             suppress_session_score=False,
         )
         assert_matches_type(Optional[BotManagementUpdateResponse], bot_management, path=["response"])
@@ -256,7 +273,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncBotManagement:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update_overload_1(self, async_client: AsyncCloudflare) -> None:
@@ -269,8 +288,12 @@ async def test_method_update_overload_1(self, async_client: AsyncCloudflare) ->
     async def test_method_update_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
         bot_management = await async_client.bot_management.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ai_bots_protection="block",
+            cf_robots_variant="policy_only",
+            crawler_protection="enabled",
             enable_js=True,
             fight_mode=True,
+            is_robots_txt_managed=False,
         )
         assert_matches_type(Optional[BotManagementUpdateResponse], bot_management, path=["response"])
 
@@ -316,7 +339,11 @@ async def test_method_update_overload_2(self, async_client: AsyncCloudflare) ->
     async def test_method_update_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
         bot_management = await async_client.bot_management.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ai_bots_protection="block",
+            cf_robots_variant="policy_only",
+            crawler_protection="enabled",
             enable_js=True,
+            is_robots_txt_managed=False,
             optimize_wordpress=True,
             sbfm_definitely_automated="allow",
             sbfm_static_resource_protection=True,
@@ -366,7 +393,11 @@ async def test_method_update_overload_3(self, async_client: AsyncCloudflare) ->
     async def test_method_update_with_all_params_overload_3(self, async_client: AsyncCloudflare) -> None:
         bot_management = await async_client.bot_management.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ai_bots_protection="block",
+            cf_robots_variant="policy_only",
+            crawler_protection="enabled",
             enable_js=True,
+            is_robots_txt_managed=False,
             optimize_wordpress=True,
             sbfm_definitely_automated="allow",
             sbfm_likely_automated="allow",
@@ -417,8 +448,13 @@ async def test_method_update_overload_4(self, async_client: AsyncCloudflare) ->
     async def test_method_update_with_all_params_overload_4(self, async_client: AsyncCloudflare) -> None:
         bot_management = await async_client.bot_management.update(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ai_bots_protection="block",
             auto_update_model=True,
+            bm_cookie_enabled=True,
+            cf_robots_variant="policy_only",
+            crawler_protection="enabled",
             enable_js=True,
+            is_robots_txt_managed=False,
             suppress_session_score=False,
         )
         assert_matches_type(Optional[BotManagementUpdateResponse], bot_management, path=["response"])
diff --git a/tests/api_resources/test_brand_protection.py b/tests/api_resources/test_brand_protection.py
index 0b9e116d432..373bff75a30 100644
--- a/tests/api_resources/test_brand_protection.py
+++ b/tests/api_resources/test_brand_protection.py
@@ -3,16 +3,14 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.brand_protection import (
-    Info,
-    Submit,
-)
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.brand_protection import BrandProtectionSubmitResponse, BrandProtectionURLInfoResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -20,45 +18,41 @@
 class TestBrandProtection:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_submit(self, client: Cloudflare) -> None:
         brand_protection = client.brand_protection.submit(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="x",
         )
-        assert_matches_type(Optional[Submit], brand_protection, path=["response"])
-
-    @parametrize
-    def test_method_submit_with_all_params(self, client: Cloudflare) -> None:
-        brand_protection = client.brand_protection.submit(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            url="https://www.cloudflare.com",
-        )
-        assert_matches_type(Optional[Submit], brand_protection, path=["response"])
+        assert_matches_type(BrandProtectionSubmitResponse, brand_protection, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_submit(self, client: Cloudflare) -> None:
         response = client.brand_protection.with_raw_response.submit(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="x",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         brand_protection = response.parse()
-        assert_matches_type(Optional[Submit], brand_protection, path=["response"])
+        assert_matches_type(BrandProtectionSubmitResponse, brand_protection, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_submit(self, client: Cloudflare) -> None:
         with client.brand_protection.with_streaming_response.submit(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="x",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             brand_protection = response.parse()
-            assert_matches_type(Optional[Submit], brand_protection, path=["response"])
+            assert_matches_type(BrandProtectionSubmitResponse, brand_protection, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_submit(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -66,46 +60,41 @@ def test_path_params_submit(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_url_info(self, client: Cloudflare) -> None:
         brand_protection = client.brand_protection.url_info(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[Info], brand_protection, path=["response"])
-
-    @parametrize
-    def test_method_url_info_with_all_params(self, client: Cloudflare) -> None:
-        brand_protection = client.brand_protection.url_info(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            url="url",
-            url_id_param={"url_id": 0},
+            account_id="x",
         )
-        assert_matches_type(Optional[Info], brand_protection, path=["response"])
+        assert_matches_type(SyncSinglePage[BrandProtectionURLInfoResponse], brand_protection, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_url_info(self, client: Cloudflare) -> None:
         response = client.brand_protection.with_raw_response.url_info(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="x",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         brand_protection = response.parse()
-        assert_matches_type(Optional[Info], brand_protection, path=["response"])
+        assert_matches_type(SyncSinglePage[BrandProtectionURLInfoResponse], brand_protection, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_url_info(self, client: Cloudflare) -> None:
         with client.brand_protection.with_streaming_response.url_info(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="x",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             brand_protection = response.parse()
-            assert_matches_type(Optional[Info], brand_protection, path=["response"])
+            assert_matches_type(SyncSinglePage[BrandProtectionURLInfoResponse], brand_protection, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_url_info(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -115,47 +104,45 @@ def test_path_params_url_info(self, client: Cloudflare) -> None:
 
 
 class TestAsyncBrandProtection:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_submit(self, async_client: AsyncCloudflare) -> None:
         brand_protection = await async_client.brand_protection.submit(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="x",
         )
-        assert_matches_type(Optional[Submit], brand_protection, path=["response"])
-
-    @parametrize
-    async def test_method_submit_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        brand_protection = await async_client.brand_protection.submit(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            url="https://www.cloudflare.com",
-        )
-        assert_matches_type(Optional[Submit], brand_protection, path=["response"])
+        assert_matches_type(BrandProtectionSubmitResponse, brand_protection, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_submit(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.brand_protection.with_raw_response.submit(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="x",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         brand_protection = await response.parse()
-        assert_matches_type(Optional[Submit], brand_protection, path=["response"])
+        assert_matches_type(BrandProtectionSubmitResponse, brand_protection, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_submit(self, async_client: AsyncCloudflare) -> None:
         async with async_client.brand_protection.with_streaming_response.submit(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="x",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             brand_protection = await response.parse()
-            assert_matches_type(Optional[Submit], brand_protection, path=["response"])
+            assert_matches_type(BrandProtectionSubmitResponse, brand_protection, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_submit(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -163,46 +150,41 @@ async def test_path_params_submit(self, async_client: AsyncCloudflare) -> None:
                 account_id="",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_url_info(self, async_client: AsyncCloudflare) -> None:
         brand_protection = await async_client.brand_protection.url_info(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[Info], brand_protection, path=["response"])
-
-    @parametrize
-    async def test_method_url_info_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        brand_protection = await async_client.brand_protection.url_info(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            url="url",
-            url_id_param={"url_id": 0},
+            account_id="x",
         )
-        assert_matches_type(Optional[Info], brand_protection, path=["response"])
+        assert_matches_type(AsyncSinglePage[BrandProtectionURLInfoResponse], brand_protection, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_url_info(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.brand_protection.with_raw_response.url_info(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="x",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         brand_protection = await response.parse()
-        assert_matches_type(Optional[Info], brand_protection, path=["response"])
+        assert_matches_type(AsyncSinglePage[BrandProtectionURLInfoResponse], brand_protection, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_url_info(self, async_client: AsyncCloudflare) -> None:
         async with async_client.brand_protection.with_streaming_response.url_info(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="x",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             brand_protection = await response.parse()
-            assert_matches_type(Optional[Info], brand_protection, path=["response"])
+            assert_matches_type(AsyncSinglePage[BrandProtectionURLInfoResponse], brand_protection, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_url_info(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
diff --git a/tests/api_resources/test_cache.py b/tests/api_resources/test_cache.py
index 7af5c5be461..30ba1b0bf1e 100644
--- a/tests/api_resources/test_cache.py
+++ b/tests/api_resources/test_cache.py
@@ -20,14 +20,14 @@ class TestCache:
     @parametrize
     def test_method_purge_overload_1(self, client: Cloudflare) -> None:
         cache = client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
 
     @parametrize
     def test_method_purge_with_all_params_overload_1(self, client: Cloudflare) -> None:
         cache = client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             tags=["a-cache-tag", "another-cache-tag"],
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
@@ -35,7 +35,7 @@ def test_method_purge_with_all_params_overload_1(self, client: Cloudflare) -> No
     @parametrize
     def test_raw_response_purge_overload_1(self, client: Cloudflare) -> None:
         response = client.cache.with_raw_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -46,7 +46,7 @@ def test_raw_response_purge_overload_1(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_purge_overload_1(self, client: Cloudflare) -> None:
         with client.cache.with_streaming_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -66,14 +66,14 @@ def test_path_params_purge_overload_1(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_purge_overload_2(self, client: Cloudflare) -> None:
         cache = client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
 
     @parametrize
     def test_method_purge_with_all_params_overload_2(self, client: Cloudflare) -> None:
         cache = client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             hosts=["www.example.com", "images.example.com"],
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
@@ -81,7 +81,7 @@ def test_method_purge_with_all_params_overload_2(self, client: Cloudflare) -> No
     @parametrize
     def test_raw_response_purge_overload_2(self, client: Cloudflare) -> None:
         response = client.cache.with_raw_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -92,7 +92,7 @@ def test_raw_response_purge_overload_2(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_purge_overload_2(self, client: Cloudflare) -> None:
         with client.cache.with_streaming_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -112,14 +112,14 @@ def test_path_params_purge_overload_2(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_purge_overload_3(self, client: Cloudflare) -> None:
         cache = client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
 
     @parametrize
     def test_method_purge_with_all_params_overload_3(self, client: Cloudflare) -> None:
         cache = client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             prefixes=["www.example.com/foo", "images.example.com/bar/baz"],
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
@@ -127,7 +127,7 @@ def test_method_purge_with_all_params_overload_3(self, client: Cloudflare) -> No
     @parametrize
     def test_raw_response_purge_overload_3(self, client: Cloudflare) -> None:
         response = client.cache.with_raw_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -138,7 +138,7 @@ def test_raw_response_purge_overload_3(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_purge_overload_3(self, client: Cloudflare) -> None:
         with client.cache.with_streaming_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -158,14 +158,14 @@ def test_path_params_purge_overload_3(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_purge_overload_4(self, client: Cloudflare) -> None:
         cache = client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
 
     @parametrize
     def test_method_purge_with_all_params_overload_4(self, client: Cloudflare) -> None:
         cache = client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             purge_everything=True,
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
@@ -173,7 +173,7 @@ def test_method_purge_with_all_params_overload_4(self, client: Cloudflare) -> No
     @parametrize
     def test_raw_response_purge_overload_4(self, client: Cloudflare) -> None:
         response = client.cache.with_raw_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -184,7 +184,7 @@ def test_raw_response_purge_overload_4(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_purge_overload_4(self, client: Cloudflare) -> None:
         with client.cache.with_streaming_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -204,14 +204,14 @@ def test_path_params_purge_overload_4(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_purge_overload_5(self, client: Cloudflare) -> None:
         cache = client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
 
     @parametrize
     def test_method_purge_with_all_params_overload_5(self, client: Cloudflare) -> None:
         cache = client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             files=["http://www.example.com/css/styles.css", "http://www.example.com/js/index.js"],
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
@@ -219,7 +219,7 @@ def test_method_purge_with_all_params_overload_5(self, client: Cloudflare) -> No
     @parametrize
     def test_raw_response_purge_overload_5(self, client: Cloudflare) -> None:
         response = client.cache.with_raw_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -230,7 +230,7 @@ def test_raw_response_purge_overload_5(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_purge_overload_5(self, client: Cloudflare) -> None:
         with client.cache.with_streaming_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -250,14 +250,14 @@ def test_path_params_purge_overload_5(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_purge_overload_6(self, client: Cloudflare) -> None:
         cache = client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
 
     @parametrize
     def test_method_purge_with_all_params_overload_6(self, client: Cloudflare) -> None:
         cache = client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             files=[
                 {
                     "headers": {
@@ -282,7 +282,7 @@ def test_method_purge_with_all_params_overload_6(self, client: Cloudflare) -> No
     @parametrize
     def test_raw_response_purge_overload_6(self, client: Cloudflare) -> None:
         response = client.cache.with_raw_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -293,7 +293,7 @@ def test_raw_response_purge_overload_6(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_purge_overload_6(self, client: Cloudflare) -> None:
         with client.cache.with_streaming_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -312,19 +312,21 @@ def test_path_params_purge_overload_6(self, client: Cloudflare) -> None:
 
 
 class TestAsyncCache:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_purge_overload_1(self, async_client: AsyncCloudflare) -> None:
         cache = await async_client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
 
     @parametrize
     async def test_method_purge_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
         cache = await async_client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             tags=["a-cache-tag", "another-cache-tag"],
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
@@ -332,7 +334,7 @@ async def test_method_purge_with_all_params_overload_1(self, async_client: Async
     @parametrize
     async def test_raw_response_purge_overload_1(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cache.with_raw_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -343,7 +345,7 @@ async def test_raw_response_purge_overload_1(self, async_client: AsyncCloudflare
     @parametrize
     async def test_streaming_response_purge_overload_1(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cache.with_streaming_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -363,14 +365,14 @@ async def test_path_params_purge_overload_1(self, async_client: AsyncCloudflare)
     @parametrize
     async def test_method_purge_overload_2(self, async_client: AsyncCloudflare) -> None:
         cache = await async_client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
 
     @parametrize
     async def test_method_purge_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
         cache = await async_client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             hosts=["www.example.com", "images.example.com"],
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
@@ -378,7 +380,7 @@ async def test_method_purge_with_all_params_overload_2(self, async_client: Async
     @parametrize
     async def test_raw_response_purge_overload_2(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cache.with_raw_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -389,7 +391,7 @@ async def test_raw_response_purge_overload_2(self, async_client: AsyncCloudflare
     @parametrize
     async def test_streaming_response_purge_overload_2(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cache.with_streaming_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -409,14 +411,14 @@ async def test_path_params_purge_overload_2(self, async_client: AsyncCloudflare)
     @parametrize
     async def test_method_purge_overload_3(self, async_client: AsyncCloudflare) -> None:
         cache = await async_client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
 
     @parametrize
     async def test_method_purge_with_all_params_overload_3(self, async_client: AsyncCloudflare) -> None:
         cache = await async_client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             prefixes=["www.example.com/foo", "images.example.com/bar/baz"],
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
@@ -424,7 +426,7 @@ async def test_method_purge_with_all_params_overload_3(self, async_client: Async
     @parametrize
     async def test_raw_response_purge_overload_3(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cache.with_raw_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -435,7 +437,7 @@ async def test_raw_response_purge_overload_3(self, async_client: AsyncCloudflare
     @parametrize
     async def test_streaming_response_purge_overload_3(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cache.with_streaming_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -455,14 +457,14 @@ async def test_path_params_purge_overload_3(self, async_client: AsyncCloudflare)
     @parametrize
     async def test_method_purge_overload_4(self, async_client: AsyncCloudflare) -> None:
         cache = await async_client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
 
     @parametrize
     async def test_method_purge_with_all_params_overload_4(self, async_client: AsyncCloudflare) -> None:
         cache = await async_client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             purge_everything=True,
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
@@ -470,7 +472,7 @@ async def test_method_purge_with_all_params_overload_4(self, async_client: Async
     @parametrize
     async def test_raw_response_purge_overload_4(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cache.with_raw_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -481,7 +483,7 @@ async def test_raw_response_purge_overload_4(self, async_client: AsyncCloudflare
     @parametrize
     async def test_streaming_response_purge_overload_4(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cache.with_streaming_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -501,14 +503,14 @@ async def test_path_params_purge_overload_4(self, async_client: AsyncCloudflare)
     @parametrize
     async def test_method_purge_overload_5(self, async_client: AsyncCloudflare) -> None:
         cache = await async_client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
 
     @parametrize
     async def test_method_purge_with_all_params_overload_5(self, async_client: AsyncCloudflare) -> None:
         cache = await async_client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             files=["http://www.example.com/css/styles.css", "http://www.example.com/js/index.js"],
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
@@ -516,7 +518,7 @@ async def test_method_purge_with_all_params_overload_5(self, async_client: Async
     @parametrize
     async def test_raw_response_purge_overload_5(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cache.with_raw_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -527,7 +529,7 @@ async def test_raw_response_purge_overload_5(self, async_client: AsyncCloudflare
     @parametrize
     async def test_streaming_response_purge_overload_5(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cache.with_streaming_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -547,14 +549,14 @@ async def test_path_params_purge_overload_5(self, async_client: AsyncCloudflare)
     @parametrize
     async def test_method_purge_overload_6(self, async_client: AsyncCloudflare) -> None:
         cache = await async_client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[CachePurgeResponse], cache, path=["response"])
 
     @parametrize
     async def test_method_purge_with_all_params_overload_6(self, async_client: AsyncCloudflare) -> None:
         cache = await async_client.cache.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             files=[
                 {
                     "headers": {
@@ -579,7 +581,7 @@ async def test_method_purge_with_all_params_overload_6(self, async_client: Async
     @parametrize
     async def test_raw_response_purge_overload_6(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.cache.with_raw_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -590,7 +592,7 @@ async def test_raw_response_purge_overload_6(self, async_client: AsyncCloudflare
     @parametrize
     async def test_streaming_response_purge_overload_6(self, async_client: AsyncCloudflare) -> None:
         async with async_client.cache.with_streaming_response.purge(
-            zone_id="zone_id",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
diff --git a/tests/api_resources/test_calls.py b/tests/api_resources/test_calls.py
deleted file mode 100644
index 29330b4e86e..00000000000
--- a/tests/api_resources/test_calls.py
+++ /dev/null
@@ -1,501 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.calls import (
-    CallsApp,
-    CallListResponse,
-    CallsAppWithSecret,
-)
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestCalls:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_create(self, client: Cloudflare) -> None:
-        call = client.calls.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[CallsAppWithSecret], call, path=["response"])
-
-    @parametrize
-    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
-        call = client.calls.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="production-realtime-app",
-        )
-        assert_matches_type(Optional[CallsAppWithSecret], call, path=["response"])
-
-    @parametrize
-    def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.calls.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        call = response.parse()
-        assert_matches_type(Optional[CallsAppWithSecret], call, path=["response"])
-
-    @parametrize
-    def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.calls.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            call = response.parse()
-            assert_matches_type(Optional[CallsAppWithSecret], call, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.calls.with_raw_response.create(
-                account_id="",
-            )
-
-    @parametrize
-    def test_method_update(self, client: Cloudflare) -> None:
-        call = client.calls.update(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-    @parametrize
-    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        call = client.calls.update(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="production-realtime-app",
-        )
-        assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-    @parametrize
-    def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.calls.with_raw_response.update(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        call = response.parse()
-        assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-    @parametrize
-    def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.calls.with_streaming_response.update(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            call = response.parse()
-            assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.calls.with_raw_response.update(
-                app_id="2a95132c15732412d22c1476fa83f27a",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
-            client.calls.with_raw_response.update(
-                app_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        call = client.calls.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SyncSinglePage[CallListResponse], call, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.calls.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        call = response.parse()
-        assert_matches_type(SyncSinglePage[CallListResponse], call, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.calls.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            call = response.parse()
-            assert_matches_type(SyncSinglePage[CallListResponse], call, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.calls.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    def test_method_delete(self, client: Cloudflare) -> None:
-        call = client.calls.delete(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-    @parametrize
-    def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.calls.with_raw_response.delete(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        call = response.parse()
-        assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-    @parametrize
-    def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.calls.with_streaming_response.delete(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            call = response.parse()
-            assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.calls.with_raw_response.delete(
-                app_id="2a95132c15732412d22c1476fa83f27a",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
-            client.calls.with_raw_response.delete(
-                app_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        call = client.calls.get(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.calls.with_raw_response.get(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        call = response.parse()
-        assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.calls.with_streaming_response.get(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            call = response.parse()
-            assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.calls.with_raw_response.get(
-                app_id="2a95132c15732412d22c1476fa83f27a",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
-            client.calls.with_raw_response.get(
-                app_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-
-class TestAsyncCalls:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        call = await async_client.calls.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[CallsAppWithSecret], call, path=["response"])
-
-    @parametrize
-    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        call = await async_client.calls.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="production-realtime-app",
-        )
-        assert_matches_type(Optional[CallsAppWithSecret], call, path=["response"])
-
-    @parametrize
-    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.calls.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        call = await response.parse()
-        assert_matches_type(Optional[CallsAppWithSecret], call, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.calls.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            call = await response.parse()
-            assert_matches_type(Optional[CallsAppWithSecret], call, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.calls.with_raw_response.create(
-                account_id="",
-            )
-
-    @parametrize
-    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        call = await async_client.calls.update(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-    @parametrize
-    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        call = await async_client.calls.update(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="production-realtime-app",
-        )
-        assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-    @parametrize
-    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.calls.with_raw_response.update(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        call = await response.parse()
-        assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.calls.with_streaming_response.update(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            call = await response.parse()
-            assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.calls.with_raw_response.update(
-                app_id="2a95132c15732412d22c1476fa83f27a",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
-            await async_client.calls.with_raw_response.update(
-                app_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        call = await async_client.calls.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(AsyncSinglePage[CallListResponse], call, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.calls.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        call = await response.parse()
-        assert_matches_type(AsyncSinglePage[CallListResponse], call, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.calls.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            call = await response.parse()
-            assert_matches_type(AsyncSinglePage[CallListResponse], call, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.calls.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        call = await async_client.calls.delete(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-    @parametrize
-    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.calls.with_raw_response.delete(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        call = await response.parse()
-        assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.calls.with_streaming_response.delete(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            call = await response.parse()
-            assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.calls.with_raw_response.delete(
-                app_id="2a95132c15732412d22c1476fa83f27a",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
-            await async_client.calls.with_raw_response.delete(
-                app_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        call = await async_client.calls.get(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.calls.with_raw_response.get(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        call = await response.parse()
-        assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.calls.with_streaming_response.get(
-            app_id="2a95132c15732412d22c1476fa83f27a",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            call = await response.parse()
-            assert_matches_type(Optional[CallsApp], call, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.calls.with_raw_response.get(
-                app_id="2a95132c15732412d22c1476fa83f27a",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
-            await async_client.calls.with_raw_response.get(
-                app_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
diff --git a/tests/api_resources/test_client_certificates.py b/tests/api_resources/test_client_certificates.py
index b76f1f75951..60092807cba 100644
--- a/tests/api_resources/test_client_certificates.py
+++ b/tests/api_resources/test_client_certificates.py
@@ -24,7 +24,7 @@ class TestClientCertificates:
     def test_method_create(self, client: Cloudflare) -> None:
         client_certificate = client.client_certificates.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            csr="-----BEGIN CERTIFICATE REQUEST-----\nMIICY....\n-----END CERTIFICATE REQUEST-----\n",
+            csr="-----BEGIN CERTIFICATE REQUEST-----\\nMIICY....\\n-----END CERTIFICATE REQUEST-----\\n",
             validity_days=3650,
         )
         assert_matches_type(Optional[ClientCertificate], client_certificate, path=["response"])
@@ -33,7 +33,7 @@ def test_method_create(self, client: Cloudflare) -> None:
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.client_certificates.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            csr="-----BEGIN CERTIFICATE REQUEST-----\nMIICY....\n-----END CERTIFICATE REQUEST-----\n",
+            csr="-----BEGIN CERTIFICATE REQUEST-----\\nMIICY....\\n-----END CERTIFICATE REQUEST-----\\n",
             validity_days=3650,
         )
 
@@ -46,7 +46,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.client_certificates.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            csr="-----BEGIN CERTIFICATE REQUEST-----\nMIICY....\n-----END CERTIFICATE REQUEST-----\n",
+            csr="-----BEGIN CERTIFICATE REQUEST-----\\nMIICY....\\n-----END CERTIFICATE REQUEST-----\\n",
             validity_days=3650,
         ) as response:
             assert not response.is_closed
@@ -62,7 +62,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.client_certificates.with_raw_response.create(
                 zone_id="",
-                csr="-----BEGIN CERTIFICATE REQUEST-----\nMIICY....\n-----END CERTIFICATE REQUEST-----\n",
+                csr="-----BEGIN CERTIFICATE REQUEST-----\\nMIICY....\\n-----END CERTIFICATE REQUEST-----\\n",
                 validity_days=3650,
             )
 
@@ -172,6 +172,15 @@ def test_method_edit(self, client: Cloudflare) -> None:
         )
         assert_matches_type(Optional[ClientCertificate], client_certificate, path=["response"])
 
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        client_certificate = client.client_certificates.edit(
+            client_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            reactivate=True,
+        )
+        assert_matches_type(Optional[ClientCertificate], client_certificate, path=["response"])
+
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
         response = client.client_certificates.with_raw_response.edit(
@@ -262,13 +271,15 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncClientCertificates:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         client_certificate = await async_client.client_certificates.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            csr="-----BEGIN CERTIFICATE REQUEST-----\nMIICY....\n-----END CERTIFICATE REQUEST-----\n",
+            csr="-----BEGIN CERTIFICATE REQUEST-----\\nMIICY....\\n-----END CERTIFICATE REQUEST-----\\n",
             validity_days=3650,
         )
         assert_matches_type(Optional[ClientCertificate], client_certificate, path=["response"])
@@ -277,7 +288,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.client_certificates.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            csr="-----BEGIN CERTIFICATE REQUEST-----\nMIICY....\n-----END CERTIFICATE REQUEST-----\n",
+            csr="-----BEGIN CERTIFICATE REQUEST-----\\nMIICY....\\n-----END CERTIFICATE REQUEST-----\\n",
             validity_days=3650,
         )
 
@@ -290,7 +301,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.client_certificates.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            csr="-----BEGIN CERTIFICATE REQUEST-----\nMIICY....\n-----END CERTIFICATE REQUEST-----\n",
+            csr="-----BEGIN CERTIFICATE REQUEST-----\\nMIICY....\\n-----END CERTIFICATE REQUEST-----\\n",
             validity_days=3650,
         ) as response:
             assert not response.is_closed
@@ -306,7 +317,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.client_certificates.with_raw_response.create(
                 zone_id="",
-                csr="-----BEGIN CERTIFICATE REQUEST-----\nMIICY....\n-----END CERTIFICATE REQUEST-----\n",
+                csr="-----BEGIN CERTIFICATE REQUEST-----\\nMIICY....\\n-----END CERTIFICATE REQUEST-----\\n",
                 validity_days=3650,
             )
 
@@ -416,6 +427,15 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(Optional[ClientCertificate], client_certificate, path=["response"])
 
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        client_certificate = await async_client.client_certificates.edit(
+            client_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            reactivate=True,
+        )
+        assert_matches_type(Optional[ClientCertificate], client_certificate, path=["response"])
+
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.client_certificates.with_raw_response.edit(
diff --git a/tests/api_resources/test_content_scanning.py b/tests/api_resources/test_content_scanning.py
new file mode 100644
index 00000000000..24940b08b56
--- /dev/null
+++ b/tests/api_resources/test_content_scanning.py
@@ -0,0 +1,424 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.content_scanning import (
+    ContentScanningGetResponse,
+    ContentScanningCreateResponse,
+    ContentScanningUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestContentScanning:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        content_scanning = client.content_scanning.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            value="enabled",
+        )
+        assert_matches_type(ContentScanningCreateResponse, content_scanning, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.content_scanning.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            value="enabled",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        content_scanning = response.parse()
+        assert_matches_type(ContentScanningCreateResponse, content_scanning, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.content_scanning.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            value="enabled",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            content_scanning = response.parse()
+            assert_matches_type(ContentScanningCreateResponse, content_scanning, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.content_scanning.with_raw_response.create(
+                zone_id="",
+                value="enabled",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        content_scanning = client.content_scanning.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            value="enabled",
+        )
+        assert_matches_type(ContentScanningUpdateResponse, content_scanning, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.content_scanning.with_raw_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            value="enabled",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        content_scanning = response.parse()
+        assert_matches_type(ContentScanningUpdateResponse, content_scanning, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.content_scanning.with_streaming_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            value="enabled",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            content_scanning = response.parse()
+            assert_matches_type(ContentScanningUpdateResponse, content_scanning, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.content_scanning.with_raw_response.update(
+                zone_id="",
+                value="enabled",
+            )
+
+    @parametrize
+    def test_method_disable(self, client: Cloudflare) -> None:
+        content_scanning = client.content_scanning.disable(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(object, content_scanning, path=["response"])
+
+    @parametrize
+    def test_raw_response_disable(self, client: Cloudflare) -> None:
+        response = client.content_scanning.with_raw_response.disable(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        content_scanning = response.parse()
+        assert_matches_type(object, content_scanning, path=["response"])
+
+    @parametrize
+    def test_streaming_response_disable(self, client: Cloudflare) -> None:
+        with client.content_scanning.with_streaming_response.disable(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            content_scanning = response.parse()
+            assert_matches_type(object, content_scanning, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_disable(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.content_scanning.with_raw_response.disable(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_enable(self, client: Cloudflare) -> None:
+        content_scanning = client.content_scanning.enable(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(object, content_scanning, path=["response"])
+
+    @parametrize
+    def test_raw_response_enable(self, client: Cloudflare) -> None:
+        response = client.content_scanning.with_raw_response.enable(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        content_scanning = response.parse()
+        assert_matches_type(object, content_scanning, path=["response"])
+
+    @parametrize
+    def test_streaming_response_enable(self, client: Cloudflare) -> None:
+        with client.content_scanning.with_streaming_response.enable(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            content_scanning = response.parse()
+            assert_matches_type(object, content_scanning, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_enable(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.content_scanning.with_raw_response.enable(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        content_scanning = client.content_scanning.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ContentScanningGetResponse, content_scanning, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.content_scanning.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        content_scanning = response.parse()
+        assert_matches_type(ContentScanningGetResponse, content_scanning, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.content_scanning.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            content_scanning = response.parse()
+            assert_matches_type(ContentScanningGetResponse, content_scanning, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.content_scanning.with_raw_response.get(
+                zone_id="",
+            )
+
+
+class TestAsyncContentScanning:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        content_scanning = await async_client.content_scanning.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            value="enabled",
+        )
+        assert_matches_type(ContentScanningCreateResponse, content_scanning, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.content_scanning.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            value="enabled",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        content_scanning = await response.parse()
+        assert_matches_type(ContentScanningCreateResponse, content_scanning, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.content_scanning.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            value="enabled",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            content_scanning = await response.parse()
+            assert_matches_type(ContentScanningCreateResponse, content_scanning, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.content_scanning.with_raw_response.create(
+                zone_id="",
+                value="enabled",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        content_scanning = await async_client.content_scanning.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            value="enabled",
+        )
+        assert_matches_type(ContentScanningUpdateResponse, content_scanning, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.content_scanning.with_raw_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            value="enabled",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        content_scanning = await response.parse()
+        assert_matches_type(ContentScanningUpdateResponse, content_scanning, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.content_scanning.with_streaming_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            value="enabled",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            content_scanning = await response.parse()
+            assert_matches_type(ContentScanningUpdateResponse, content_scanning, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.content_scanning.with_raw_response.update(
+                zone_id="",
+                value="enabled",
+            )
+
+    @parametrize
+    async def test_method_disable(self, async_client: AsyncCloudflare) -> None:
+        content_scanning = await async_client.content_scanning.disable(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(object, content_scanning, path=["response"])
+
+    @parametrize
+    async def test_raw_response_disable(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.content_scanning.with_raw_response.disable(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        content_scanning = await response.parse()
+        assert_matches_type(object, content_scanning, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_disable(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.content_scanning.with_streaming_response.disable(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            content_scanning = await response.parse()
+            assert_matches_type(object, content_scanning, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_disable(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.content_scanning.with_raw_response.disable(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_enable(self, async_client: AsyncCloudflare) -> None:
+        content_scanning = await async_client.content_scanning.enable(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(object, content_scanning, path=["response"])
+
+    @parametrize
+    async def test_raw_response_enable(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.content_scanning.with_raw_response.enable(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        content_scanning = await response.parse()
+        assert_matches_type(object, content_scanning, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_enable(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.content_scanning.with_streaming_response.enable(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            content_scanning = await response.parse()
+            assert_matches_type(object, content_scanning, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_enable(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.content_scanning.with_raw_response.enable(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        content_scanning = await async_client.content_scanning.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ContentScanningGetResponse, content_scanning, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.content_scanning.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        content_scanning = await response.parse()
+        assert_matches_type(ContentScanningGetResponse, content_scanning, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.content_scanning.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            content_scanning = await response.parse()
+            assert_matches_type(ContentScanningGetResponse, content_scanning, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.content_scanning.with_raw_response.get(
+                zone_id="",
+            )
diff --git a/tests/api_resources/test_custom_certificates.py b/tests/api_resources/test_custom_certificates.py
index e0e754e6cf8..5632863289f 100644
--- a/tests/api_resources/test_custom_certificates.py
+++ b/tests/api_resources/test_custom_certificates.py
@@ -12,9 +12,6 @@
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.custom_certificates import (
     CustomCertificate,
-    CustomCertificateGetResponse,
-    CustomCertificateEditResponse,
-    CustomCertificateCreateResponse,
     CustomCertificateDeleteResponse,
 )
 
@@ -31,7 +28,7 @@ def test_method_create(self, client: Cloudflare) -> None:
             certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
             private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
         )
-        assert_matches_type(Optional[CustomCertificateCreateResponse], custom_certificate, path=["response"])
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
@@ -44,7 +41,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             policy="(country: US) or (region: EU)",
             type="sni_custom",
         )
-        assert_matches_type(Optional[CustomCertificateCreateResponse], custom_certificate, path=["response"])
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
@@ -57,7 +54,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom_certificate = response.parse()
-        assert_matches_type(Optional[CustomCertificateCreateResponse], custom_certificate, path=["response"])
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
@@ -70,7 +67,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             custom_certificate = response.parse()
-            assert_matches_type(Optional[CustomCertificateCreateResponse], custom_certificate, path=["response"])
+            assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -180,65 +177,135 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @pytest.mark.skip(reason="Test missing required parameters: certificate and private_key (Issue #4)")
     @parametrize
-    def test_method_edit(self, client: Cloudflare) -> None:
+    def test_method_edit_overload_1(self, client: Cloudflare) -> None:
         custom_certificate = client.custom_certificates.edit(
             custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[CustomCertificateEditResponse], custom_certificate, path=["response"])
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
     @parametrize
-    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+    def test_method_edit_with_all_params_overload_1(self, client: Cloudflare) -> None:
         custom_certificate = client.custom_certificates.edit(
             custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             bundle_method="ubiquitous",
+        )
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
+
+    @pytest.mark.skip(reason="Test missing required parameters: certificate and private_key (Issue #4)")
+    @parametrize
+    def test_raw_response_edit_overload_1(self, client: Cloudflare) -> None:
+        response = client.custom_certificates.with_raw_response.edit(
+            custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom_certificate = response.parse()
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
+
+    @pytest.mark.skip(reason="Test missing required parameters: certificate and private_key (Issue #4)")
+    @parametrize
+    def test_streaming_response_edit_overload_1(self, client: Cloudflare) -> None:
+        with client.custom_certificates.with_streaming_response.edit(
+            custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom_certificate = response.parse()
+            assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.custom_certificates.with_raw_response.edit(
+                custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `custom_certificate_id` but received ''"):
+            client.custom_certificates.with_raw_response.edit(
+                custom_certificate_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_edit_overload_2(self, client: Cloudflare) -> None:
+        custom_certificate = client.custom_certificates.edit(
+            custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+        )
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        custom_certificate = client.custom_certificates.edit(
+            custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+            bundle_method="ubiquitous",
             geo_restrictions={"label": "us"},
             policy="(country: US) or (region: EU)",
-            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
         )
-        assert_matches_type(Optional[CustomCertificateEditResponse], custom_certificate, path=["response"])
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
     @parametrize
-    def test_raw_response_edit(self, client: Cloudflare) -> None:
+    def test_raw_response_edit_overload_2(self, client: Cloudflare) -> None:
         response = client.custom_certificates.with_raw_response.edit(
             custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom_certificate = response.parse()
-        assert_matches_type(Optional[CustomCertificateEditResponse], custom_certificate, path=["response"])
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
     @parametrize
-    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+    def test_streaming_response_edit_overload_2(self, client: Cloudflare) -> None:
         with client.custom_certificates.with_streaming_response.edit(
             custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             custom_certificate = response.parse()
-            assert_matches_type(Optional[CustomCertificateEditResponse], custom_certificate, path=["response"])
+            assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    def test_path_params_edit(self, client: Cloudflare) -> None:
+    def test_path_params_edit_overload_2(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.custom_certificates.with_raw_response.edit(
                 custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
+                certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+                private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `custom_certificate_id` but received ''"):
             client.custom_certificates.with_raw_response.edit(
                 custom_certificate_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+                private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
             )
 
     @parametrize
@@ -247,7 +314,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[CustomCertificateGetResponse], custom_certificate, path=["response"])
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -259,7 +326,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom_certificate = response.parse()
-        assert_matches_type(Optional[CustomCertificateGetResponse], custom_certificate, path=["response"])
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -271,7 +338,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             custom_certificate = response.parse()
-            assert_matches_type(Optional[CustomCertificateGetResponse], custom_certificate, path=["response"])
+            assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -291,7 +358,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncCustomCertificates:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -300,7 +369,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
             certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
             private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
         )
-        assert_matches_type(Optional[CustomCertificateCreateResponse], custom_certificate, path=["response"])
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -313,7 +382,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             policy="(country: US) or (region: EU)",
             type="sni_custom",
         )
-        assert_matches_type(Optional[CustomCertificateCreateResponse], custom_certificate, path=["response"])
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
@@ -326,7 +395,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom_certificate = await response.parse()
-        assert_matches_type(Optional[CustomCertificateCreateResponse], custom_certificate, path=["response"])
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
@@ -339,7 +408,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             custom_certificate = await response.parse()
-            assert_matches_type(Optional[CustomCertificateCreateResponse], custom_certificate, path=["response"])
+            assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -449,65 +518,135 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @pytest.mark.skip(reason="Test missing required parameters: certificate and private_key (Issue #4)")
     @parametrize
-    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_edit_overload_1(self, async_client: AsyncCloudflare) -> None:
         custom_certificate = await async_client.custom_certificates.edit(
             custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[CustomCertificateEditResponse], custom_certificate, path=["response"])
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
     @parametrize
-    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_edit_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
         custom_certificate = await async_client.custom_certificates.edit(
             custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             bundle_method="ubiquitous",
+        )
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
+
+    @pytest.mark.skip(reason="Test missing required parameters: certificate and private_key (Issue #4)")
+    @parametrize
+    async def test_raw_response_edit_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.custom_certificates.with_raw_response.edit(
+            custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom_certificate = await response.parse()
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
+
+    @pytest.mark.skip(reason="Test missing required parameters: certificate and private_key (Issue #4)")
+    @parametrize
+    async def test_streaming_response_edit_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.custom_certificates.with_streaming_response.edit(
+            custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom_certificate = await response.parse()
+            assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.custom_certificates.with_raw_response.edit(
+                custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `custom_certificate_id` but received ''"):
+            await async_client.custom_certificates.with_raw_response.edit(
+                custom_certificate_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_edit_overload_2(self, async_client: AsyncCloudflare) -> None:
+        custom_certificate = await async_client.custom_certificates.edit(
+            custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+        )
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        custom_certificate = await async_client.custom_certificates.edit(
+            custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+            bundle_method="ubiquitous",
             geo_restrictions={"label": "us"},
             policy="(country: US) or (region: EU)",
-            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
         )
-        assert_matches_type(Optional[CustomCertificateEditResponse], custom_certificate, path=["response"])
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
     @parametrize
-    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_edit_overload_2(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.custom_certificates.with_raw_response.edit(
             custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom_certificate = await response.parse()
-        assert_matches_type(Optional[CustomCertificateEditResponse], custom_certificate, path=["response"])
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
     @parametrize
-    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_edit_overload_2(self, async_client: AsyncCloudflare) -> None:
         async with async_client.custom_certificates.with_streaming_response.edit(
             custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             custom_certificate = await response.parse()
-            assert_matches_type(Optional[CustomCertificateEditResponse], custom_certificate, path=["response"])
+            assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_edit_overload_2(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.custom_certificates.with_raw_response.edit(
                 custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
                 zone_id="",
+                certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+                private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `custom_certificate_id` but received ''"):
             await async_client.custom_certificates.with_raw_response.edit(
                 custom_certificate_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+                private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
             )
 
     @parametrize
@@ -516,7 +655,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             custom_certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[CustomCertificateGetResponse], custom_certificate, path=["response"])
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -528,7 +667,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom_certificate = await response.parse()
-        assert_matches_type(Optional[CustomCertificateGetResponse], custom_certificate, path=["response"])
+        assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -540,7 +679,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             custom_certificate = await response.parse()
-            assert_matches_type(Optional[CustomCertificateGetResponse], custom_certificate, path=["response"])
+            assert_matches_type(Optional[CustomCertificate], custom_certificate, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/test_custom_hostnames.py b/tests/api_resources/test_custom_hostnames.py
index b749c8eacae..9d96b2f0dd6 100644
--- a/tests/api_resources/test_custom_hostnames.py
+++ b/tests/api_resources/test_custom_hostnames.py
@@ -29,7 +29,6 @@ def test_method_create(self, client: Cloudflare) -> None:
         custom_hostname = client.custom_hostnames.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             hostname="app.example.com",
-            ssl={},
         )
         assert_matches_type(Optional[CustomHostnameCreateResponse], custom_hostname, path=["response"])
 
@@ -38,10 +37,18 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         custom_hostname = client.custom_hostnames.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             hostname="app.example.com",
+            custom_metadata={"foo": "string"},
             ssl={
                 "bundle_method": "ubiquitous",
                 "certificate_authority": "google",
-                "custom_certificate": "-----BEGIN CERTIFICATE-----\nMIIFJDCCBAygAwIBAgIQD0ifmj/Yi5NP/2gdUySbfzANBgkqhkiG9w0BAQsFADBN\nMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E...SzSHfXp5lnu/3V08I72q1QNzOCgY1XeL4GKVcj4or6cT6tX6oJH7ePPmfrBfqI/O\nOeH8gMJ+FuwtXYEPa4hBf38M5eU5xWG7\n-----END CERTIFICATE-----\n",
+                "cloudflare_branding": False,
+                "custom_cert_bundle": [
+                    {
+                        "custom_certificate": "-----BEGIN CERTIFICATE-----\nMIIDdjCCAl6gAwIBAgIJAPnMg0Fs+/B0MA0GCSqGSIb3DQEBCwUAMFsx...\n-----END CERTIFICATE-----\n",
+                        "custom_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/SCB5...\n-----END PRIVATE KEY-----\n",
+                    }
+                ],
+                "custom_certificate": "-----BEGIN CERTIFICATE-----\\nMIIFJDCCBAygAwIBAgIQD0ifmj/Yi5NP/2gdUySbfzANBgkqhkiG9w0BAQsFADBN\\nMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E...SzSHfXp5lnu/3V08I72q1QNzOCgY1XeL4GKVcj4or6cT6tX6oJH7ePPmfrBfqI/O\\nOeH8gMJ+FuwtXYEPa4hBf38M5eU5xWG7\\n-----END CERTIFICATE-----\\n",
                 "custom_key": "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
                 "method": "http",
                 "settings": {
@@ -54,7 +61,6 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                 "type": "dv",
                 "wildcard": False,
             },
-            custom_metadata={"key": "value"},
         )
         assert_matches_type(Optional[CustomHostnameCreateResponse], custom_hostname, path=["response"])
 
@@ -63,7 +69,6 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.custom_hostnames.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             hostname="app.example.com",
-            ssl={},
         )
 
         assert response.is_closed is True
@@ -76,7 +81,6 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.custom_hostnames.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             hostname="app.example.com",
-            ssl={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -92,7 +96,6 @@ def test_path_params_create(self, client: Cloudflare) -> None:
             client.custom_hostnames.with_raw_response.create(
                 zone_id="",
                 hostname="app.example.com",
-                ssl={},
             )
 
     @parametrize
@@ -210,13 +213,20 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
         custom_hostname = client.custom_hostnames.edit(
             custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            custom_metadata={"key": "value"},
+            custom_metadata={"foo": "string"},
             custom_origin_server="origin2.example.com",
             custom_origin_sni="sni.example.com",
             ssl={
                 "bundle_method": "ubiquitous",
                 "certificate_authority": "google",
-                "custom_certificate": "-----BEGIN CERTIFICATE-----\nMIIFJDCCBAygAwIBAgIQD0ifmj/Yi5NP/2gdUySbfzANBgkqhkiG9w0BAQsFADBN\nMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E...SzSHfXp5lnu/3V08I72q1QNzOCgY1XeL4GKVcj4or6cT6tX6oJH7ePPmfrBfqI/O\nOeH8gMJ+FuwtXYEPa4hBf38M5eU5xWG7\n-----END CERTIFICATE-----\n",
+                "cloudflare_branding": False,
+                "custom_cert_bundle": [
+                    {
+                        "custom_certificate": "-----BEGIN CERTIFICATE-----\nMIIDdjCCAl6gAwIBAgIJAPnMg0Fs+/B0MA0GCSqGSIb3DQEBCwUAMFsx...\n-----END CERTIFICATE-----\n",
+                        "custom_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/SCB5...\n-----END PRIVATE KEY-----\n",
+                    }
+                ],
+                "custom_certificate": "-----BEGIN CERTIFICATE-----\\nMIIFJDCCBAygAwIBAgIQD0ifmj/Yi5NP/2gdUySbfzANBgkqhkiG9w0BAQsFADBN\\nMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E...SzSHfXp5lnu/3V08I72q1QNzOCgY1XeL4GKVcj4or6cT6tX6oJH7ePPmfrBfqI/O\\nOeH8gMJ+FuwtXYEPa4hBf38M5eU5xWG7\\n-----END CERTIFICATE-----\\n",
                 "custom_key": "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
                 "method": "http",
                 "settings": {
@@ -322,14 +332,15 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncCustomHostnames:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         custom_hostname = await async_client.custom_hostnames.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             hostname="app.example.com",
-            ssl={},
         )
         assert_matches_type(Optional[CustomHostnameCreateResponse], custom_hostname, path=["response"])
 
@@ -338,10 +349,18 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
         custom_hostname = await async_client.custom_hostnames.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             hostname="app.example.com",
+            custom_metadata={"foo": "string"},
             ssl={
                 "bundle_method": "ubiquitous",
                 "certificate_authority": "google",
-                "custom_certificate": "-----BEGIN CERTIFICATE-----\nMIIFJDCCBAygAwIBAgIQD0ifmj/Yi5NP/2gdUySbfzANBgkqhkiG9w0BAQsFADBN\nMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E...SzSHfXp5lnu/3V08I72q1QNzOCgY1XeL4GKVcj4or6cT6tX6oJH7ePPmfrBfqI/O\nOeH8gMJ+FuwtXYEPa4hBf38M5eU5xWG7\n-----END CERTIFICATE-----\n",
+                "cloudflare_branding": False,
+                "custom_cert_bundle": [
+                    {
+                        "custom_certificate": "-----BEGIN CERTIFICATE-----\nMIIDdjCCAl6gAwIBAgIJAPnMg0Fs+/B0MA0GCSqGSIb3DQEBCwUAMFsx...\n-----END CERTIFICATE-----\n",
+                        "custom_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/SCB5...\n-----END PRIVATE KEY-----\n",
+                    }
+                ],
+                "custom_certificate": "-----BEGIN CERTIFICATE-----\\nMIIFJDCCBAygAwIBAgIQD0ifmj/Yi5NP/2gdUySbfzANBgkqhkiG9w0BAQsFADBN\\nMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E...SzSHfXp5lnu/3V08I72q1QNzOCgY1XeL4GKVcj4or6cT6tX6oJH7ePPmfrBfqI/O\\nOeH8gMJ+FuwtXYEPa4hBf38M5eU5xWG7\\n-----END CERTIFICATE-----\\n",
                 "custom_key": "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
                 "method": "http",
                 "settings": {
@@ -354,7 +373,6 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                 "type": "dv",
                 "wildcard": False,
             },
-            custom_metadata={"key": "value"},
         )
         assert_matches_type(Optional[CustomHostnameCreateResponse], custom_hostname, path=["response"])
 
@@ -363,7 +381,6 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.custom_hostnames.with_raw_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             hostname="app.example.com",
-            ssl={},
         )
 
         assert response.is_closed is True
@@ -376,7 +393,6 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
         async with async_client.custom_hostnames.with_streaming_response.create(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             hostname="app.example.com",
-            ssl={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -392,7 +408,6 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
             await async_client.custom_hostnames.with_raw_response.create(
                 zone_id="",
                 hostname="app.example.com",
-                ssl={},
             )
 
     @parametrize
@@ -510,13 +525,20 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
         custom_hostname = await async_client.custom_hostnames.edit(
             custom_hostname_id="023e105f4ecef8ad9ca31a8372d0c353",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            custom_metadata={"key": "value"},
+            custom_metadata={"foo": "string"},
             custom_origin_server="origin2.example.com",
             custom_origin_sni="sni.example.com",
             ssl={
                 "bundle_method": "ubiquitous",
                 "certificate_authority": "google",
-                "custom_certificate": "-----BEGIN CERTIFICATE-----\nMIIFJDCCBAygAwIBAgIQD0ifmj/Yi5NP/2gdUySbfzANBgkqhkiG9w0BAQsFADBN\nMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E...SzSHfXp5lnu/3V08I72q1QNzOCgY1XeL4GKVcj4or6cT6tX6oJH7ePPmfrBfqI/O\nOeH8gMJ+FuwtXYEPa4hBf38M5eU5xWG7\n-----END CERTIFICATE-----\n",
+                "cloudflare_branding": False,
+                "custom_cert_bundle": [
+                    {
+                        "custom_certificate": "-----BEGIN CERTIFICATE-----\nMIIDdjCCAl6gAwIBAgIJAPnMg0Fs+/B0MA0GCSqGSIb3DQEBCwUAMFsx...\n-----END CERTIFICATE-----\n",
+                        "custom_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/SCB5...\n-----END PRIVATE KEY-----\n",
+                    }
+                ],
+                "custom_certificate": "-----BEGIN CERTIFICATE-----\\nMIIFJDCCBAygAwIBAgIQD0ifmj/Yi5NP/2gdUySbfzANBgkqhkiG9w0BAQsFADBN\\nMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E...SzSHfXp5lnu/3V08I72q1QNzOCgY1XeL4GKVcj4or6cT6tX6oJH7ePPmfrBfqI/O\\nOeH8gMJ+FuwtXYEPa4hBf38M5eU5xWG7\\n-----END CERTIFICATE-----\\n",
                 "custom_key": "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
                 "method": "http",
                 "settings": {
diff --git a/tests/api_resources/test_custom_nameservers.py b/tests/api_resources/test_custom_nameservers.py
index e64edbc4327..6a9a06f4d4d 100644
--- a/tests/api_resources/test_custom_nameservers.py
+++ b/tests/api_resources/test_custom_nameservers.py
@@ -9,11 +9,10 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.custom_nameservers import (
     CustomNameserver,
-    CustomNameserverGetResponse,
     CustomNameserverDeleteResponse,
-    CustomNameserverAvailabiltyResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -79,7 +78,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             custom_ns_id="ns1.example.com",
             account_id="372e67954025e0ba6aaa6d586b9e0b59",
         )
-        assert_matches_type(Optional[CustomNameserverDeleteResponse], custom_nameserver, path=["response"])
+        assert_matches_type(SyncSinglePage[CustomNameserverDeleteResponse], custom_nameserver, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -91,7 +90,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom_nameserver = response.parse()
-        assert_matches_type(Optional[CustomNameserverDeleteResponse], custom_nameserver, path=["response"])
+        assert_matches_type(SyncSinglePage[CustomNameserverDeleteResponse], custom_nameserver, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -103,7 +102,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             custom_nameserver = response.parse()
-            assert_matches_type(Optional[CustomNameserverDeleteResponse], custom_nameserver, path=["response"])
+            assert_matches_type(SyncSinglePage[CustomNameserverDeleteResponse], custom_nameserver, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -121,50 +120,12 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="372e67954025e0ba6aaa6d586b9e0b59",
             )
 
-    @parametrize
-    def test_method_availabilty(self, client: Cloudflare) -> None:
-        custom_nameserver = client.custom_nameservers.availabilty(
-            account_id="372e67954025e0ba6aaa6d586b9e0b59",
-        )
-        assert_matches_type(Optional[CustomNameserverAvailabiltyResponse], custom_nameserver, path=["response"])
-
-    @parametrize
-    def test_raw_response_availabilty(self, client: Cloudflare) -> None:
-        response = client.custom_nameservers.with_raw_response.availabilty(
-            account_id="372e67954025e0ba6aaa6d586b9e0b59",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        custom_nameserver = response.parse()
-        assert_matches_type(Optional[CustomNameserverAvailabiltyResponse], custom_nameserver, path=["response"])
-
-    @parametrize
-    def test_streaming_response_availabilty(self, client: Cloudflare) -> None:
-        with client.custom_nameservers.with_streaming_response.availabilty(
-            account_id="372e67954025e0ba6aaa6d586b9e0b59",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            custom_nameserver = response.parse()
-            assert_matches_type(Optional[CustomNameserverAvailabiltyResponse], custom_nameserver, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_availabilty(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.custom_nameservers.with_raw_response.availabilty(
-                account_id="",
-            )
-
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         custom_nameserver = client.custom_nameservers.get(
             account_id="372e67954025e0ba6aaa6d586b9e0b59",
         )
-        assert_matches_type(Optional[CustomNameserverGetResponse], custom_nameserver, path=["response"])
+        assert_matches_type(SyncSinglePage[CustomNameserver], custom_nameserver, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -175,7 +136,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom_nameserver = response.parse()
-        assert_matches_type(Optional[CustomNameserverGetResponse], custom_nameserver, path=["response"])
+        assert_matches_type(SyncSinglePage[CustomNameserver], custom_nameserver, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -186,7 +147,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             custom_nameserver = response.parse()
-            assert_matches_type(Optional[CustomNameserverGetResponse], custom_nameserver, path=["response"])
+            assert_matches_type(SyncSinglePage[CustomNameserver], custom_nameserver, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -199,7 +160,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncCustomNameservers:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -258,7 +221,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             custom_ns_id="ns1.example.com",
             account_id="372e67954025e0ba6aaa6d586b9e0b59",
         )
-        assert_matches_type(Optional[CustomNameserverDeleteResponse], custom_nameserver, path=["response"])
+        assert_matches_type(AsyncSinglePage[CustomNameserverDeleteResponse], custom_nameserver, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -270,7 +233,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom_nameserver = await response.parse()
-        assert_matches_type(Optional[CustomNameserverDeleteResponse], custom_nameserver, path=["response"])
+        assert_matches_type(AsyncSinglePage[CustomNameserverDeleteResponse], custom_nameserver, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -282,7 +245,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             custom_nameserver = await response.parse()
-            assert_matches_type(Optional[CustomNameserverDeleteResponse], custom_nameserver, path=["response"])
+            assert_matches_type(AsyncSinglePage[CustomNameserverDeleteResponse], custom_nameserver, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -300,50 +263,12 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="372e67954025e0ba6aaa6d586b9e0b59",
             )
 
-    @parametrize
-    async def test_method_availabilty(self, async_client: AsyncCloudflare) -> None:
-        custom_nameserver = await async_client.custom_nameservers.availabilty(
-            account_id="372e67954025e0ba6aaa6d586b9e0b59",
-        )
-        assert_matches_type(Optional[CustomNameserverAvailabiltyResponse], custom_nameserver, path=["response"])
-
-    @parametrize
-    async def test_raw_response_availabilty(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.custom_nameservers.with_raw_response.availabilty(
-            account_id="372e67954025e0ba6aaa6d586b9e0b59",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        custom_nameserver = await response.parse()
-        assert_matches_type(Optional[CustomNameserverAvailabiltyResponse], custom_nameserver, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_availabilty(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.custom_nameservers.with_streaming_response.availabilty(
-            account_id="372e67954025e0ba6aaa6d586b9e0b59",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            custom_nameserver = await response.parse()
-            assert_matches_type(Optional[CustomNameserverAvailabiltyResponse], custom_nameserver, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_availabilty(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.custom_nameservers.with_raw_response.availabilty(
-                account_id="",
-            )
-
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         custom_nameserver = await async_client.custom_nameservers.get(
             account_id="372e67954025e0ba6aaa6d586b9e0b59",
         )
-        assert_matches_type(Optional[CustomNameserverGetResponse], custom_nameserver, path=["response"])
+        assert_matches_type(AsyncSinglePage[CustomNameserver], custom_nameserver, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -354,7 +279,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom_nameserver = await response.parse()
-        assert_matches_type(Optional[CustomNameserverGetResponse], custom_nameserver, path=["response"])
+        assert_matches_type(AsyncSinglePage[CustomNameserver], custom_nameserver, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -365,7 +290,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             custom_nameserver = await response.parse()
-            assert_matches_type(Optional[CustomNameserverGetResponse], custom_nameserver, path=["response"])
+            assert_matches_type(AsyncSinglePage[CustomNameserver], custom_nameserver, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/test_custom_pages.py b/tests/api_resources/test_custom_pages.py
new file mode 100644
index 00000000000..352e903dd66
--- /dev/null
+++ b/tests/api_resources/test_custom_pages.py
@@ -0,0 +1,407 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.custom_pages import (
+    CustomPageGetResponse,
+    CustomPageListResponse,
+    CustomPageUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCustomPages:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        custom_page = client.custom_pages.update(
+            identifier="ratelimit_block",
+            state="default",
+            url="http://www.example.com",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[CustomPageUpdateResponse], custom_page, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        custom_page = client.custom_pages.update(
+            identifier="ratelimit_block",
+            state="default",
+            url="http://www.example.com",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[CustomPageUpdateResponse], custom_page, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.custom_pages.with_raw_response.update(
+            identifier="ratelimit_block",
+            state="default",
+            url="http://www.example.com",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom_page = response.parse()
+        assert_matches_type(Optional[CustomPageUpdateResponse], custom_page, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.custom_pages.with_streaming_response.update(
+            identifier="ratelimit_block",
+            state="default",
+            url="http://www.example.com",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom_page = response.parse()
+            assert_matches_type(Optional[CustomPageUpdateResponse], custom_page, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.custom_pages.with_raw_response.update(
+                identifier="ratelimit_block",
+                state="default",
+                url="http://www.example.com",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.custom_pages.with_raw_response.update(
+                identifier="ratelimit_block",
+                state="default",
+                url="http://www.example.com",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        custom_page = client.custom_pages.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncSinglePage[CustomPageListResponse], custom_page, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        custom_page = client.custom_pages.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncSinglePage[CustomPageListResponse], custom_page, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.custom_pages.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom_page = response.parse()
+        assert_matches_type(SyncSinglePage[CustomPageListResponse], custom_page, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.custom_pages.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom_page = response.parse()
+            assert_matches_type(SyncSinglePage[CustomPageListResponse], custom_page, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.custom_pages.with_raw_response.list(
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.custom_pages.with_raw_response.list(
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        custom_page = client.custom_pages.get(
+            identifier="ratelimit_block",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[CustomPageGetResponse], custom_page, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        custom_page = client.custom_pages.get(
+            identifier="ratelimit_block",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[CustomPageGetResponse], custom_page, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.custom_pages.with_raw_response.get(
+            identifier="ratelimit_block",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom_page = response.parse()
+        assert_matches_type(Optional[CustomPageGetResponse], custom_page, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.custom_pages.with_streaming_response.get(
+            identifier="ratelimit_block",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom_page = response.parse()
+            assert_matches_type(Optional[CustomPageGetResponse], custom_page, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.custom_pages.with_raw_response.get(
+                identifier="ratelimit_block",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.custom_pages.with_raw_response.get(
+                identifier="ratelimit_block",
+                account_id="account_id",
+            )
+
+
+class TestAsyncCustomPages:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        custom_page = await async_client.custom_pages.update(
+            identifier="ratelimit_block",
+            state="default",
+            url="http://www.example.com",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[CustomPageUpdateResponse], custom_page, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        custom_page = await async_client.custom_pages.update(
+            identifier="ratelimit_block",
+            state="default",
+            url="http://www.example.com",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[CustomPageUpdateResponse], custom_page, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.custom_pages.with_raw_response.update(
+            identifier="ratelimit_block",
+            state="default",
+            url="http://www.example.com",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom_page = await response.parse()
+        assert_matches_type(Optional[CustomPageUpdateResponse], custom_page, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.custom_pages.with_streaming_response.update(
+            identifier="ratelimit_block",
+            state="default",
+            url="http://www.example.com",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom_page = await response.parse()
+            assert_matches_type(Optional[CustomPageUpdateResponse], custom_page, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.custom_pages.with_raw_response.update(
+                identifier="ratelimit_block",
+                state="default",
+                url="http://www.example.com",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.custom_pages.with_raw_response.update(
+                identifier="ratelimit_block",
+                state="default",
+                url="http://www.example.com",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        custom_page = await async_client.custom_pages.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncSinglePage[CustomPageListResponse], custom_page, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        custom_page = await async_client.custom_pages.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncSinglePage[CustomPageListResponse], custom_page, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.custom_pages.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom_page = await response.parse()
+        assert_matches_type(AsyncSinglePage[CustomPageListResponse], custom_page, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.custom_pages.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom_page = await response.parse()
+            assert_matches_type(AsyncSinglePage[CustomPageListResponse], custom_page, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.custom_pages.with_raw_response.list(
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.custom_pages.with_raw_response.list(
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        custom_page = await async_client.custom_pages.get(
+            identifier="ratelimit_block",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[CustomPageGetResponse], custom_page, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        custom_page = await async_client.custom_pages.get(
+            identifier="ratelimit_block",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[CustomPageGetResponse], custom_page, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.custom_pages.with_raw_response.get(
+            identifier="ratelimit_block",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom_page = await response.parse()
+        assert_matches_type(Optional[CustomPageGetResponse], custom_page, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.custom_pages.with_streaming_response.get(
+            identifier="ratelimit_block",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom_page = await response.parse()
+            assert_matches_type(Optional[CustomPageGetResponse], custom_page, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism failures")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.custom_pages.with_raw_response.get(
+                identifier="ratelimit_block",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.custom_pages.with_raw_response.get(
+                identifier="ratelimit_block",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/test_dcv_delegation.py b/tests/api_resources/test_dcv_delegation.py
index 0f04ca1a893..1660709969b 100644
--- a/tests/api_resources/test_dcv_delegation.py
+++ b/tests/api_resources/test_dcv_delegation.py
@@ -57,7 +57,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncDCVDelegation:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/test_dns_firewall.py b/tests/api_resources/test_dns_firewall.py
new file mode 100644
index 00000000000..a1843a42bbe
--- /dev/null
+++ b/tests/api_resources/test_dns_firewall.py
@@ -0,0 +1,607 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.dns_firewall import (
+    DNSFirewallGetResponse,
+    DNSFirewallEditResponse,
+    DNSFirewallListResponse,
+    DNSFirewallCreateResponse,
+    DNSFirewallDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestDNSFirewall:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        dns_firewall = client.dns_firewall.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Awesome DNS Firewall cluster",
+            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
+        )
+        assert_matches_type(Optional[DNSFirewallCreateResponse], dns_firewall, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        dns_firewall = client.dns_firewall.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Awesome DNS Firewall cluster",
+            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
+            attack_mitigation={
+                "enabled": True,
+                "only_when_upstream_unhealthy": False,
+            },
+            deprecate_any_requests=True,
+            ecs_fallback=False,
+            maximum_cache_ttl=900,
+            minimum_cache_ttl=60,
+            negative_cache_ttl=900,
+            ratelimit=600,
+            retries=2,
+        )
+        assert_matches_type(Optional[DNSFirewallCreateResponse], dns_firewall, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.dns_firewall.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Awesome DNS Firewall cluster",
+            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns_firewall = response.parse()
+        assert_matches_type(Optional[DNSFirewallCreateResponse], dns_firewall, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.dns_firewall.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Awesome DNS Firewall cluster",
+            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns_firewall = response.parse()
+            assert_matches_type(Optional[DNSFirewallCreateResponse], dns_firewall, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.dns_firewall.with_raw_response.create(
+                account_id="",
+                name="My Awesome DNS Firewall cluster",
+                upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        dns_firewall = client.dns_firewall.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[DNSFirewallListResponse], dns_firewall, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        dns_firewall = client.dns_firewall.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[DNSFirewallListResponse], dns_firewall, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.dns_firewall.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns_firewall = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[DNSFirewallListResponse], dns_firewall, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.dns_firewall.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns_firewall = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[DNSFirewallListResponse], dns_firewall, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.dns_firewall.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        dns_firewall = client.dns_firewall.delete(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[DNSFirewallDeleteResponse], dns_firewall, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.dns_firewall.with_raw_response.delete(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns_firewall = response.parse()
+        assert_matches_type(Optional[DNSFirewallDeleteResponse], dns_firewall, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.dns_firewall.with_streaming_response.delete(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns_firewall = response.parse()
+            assert_matches_type(Optional[DNSFirewallDeleteResponse], dns_firewall, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.dns_firewall.with_raw_response.delete(
+                dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
+            client.dns_firewall.with_raw_response.delete(
+                dns_firewall_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        dns_firewall = client.dns_firewall.edit(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[DNSFirewallEditResponse], dns_firewall, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        dns_firewall = client.dns_firewall.edit(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            attack_mitigation={
+                "enabled": True,
+                "only_when_upstream_unhealthy": False,
+            },
+            deprecate_any_requests=True,
+            ecs_fallback=False,
+            maximum_cache_ttl=900,
+            minimum_cache_ttl=60,
+            name="My Awesome DNS Firewall cluster",
+            negative_cache_ttl=900,
+            ratelimit=600,
+            retries=2,
+            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
+        )
+        assert_matches_type(Optional[DNSFirewallEditResponse], dns_firewall, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.dns_firewall.with_raw_response.edit(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns_firewall = response.parse()
+        assert_matches_type(Optional[DNSFirewallEditResponse], dns_firewall, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.dns_firewall.with_streaming_response.edit(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns_firewall = response.parse()
+            assert_matches_type(Optional[DNSFirewallEditResponse], dns_firewall, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.dns_firewall.with_raw_response.edit(
+                dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
+            client.dns_firewall.with_raw_response.edit(
+                dns_firewall_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        dns_firewall = client.dns_firewall.get(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[DNSFirewallGetResponse], dns_firewall, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.dns_firewall.with_raw_response.get(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns_firewall = response.parse()
+        assert_matches_type(Optional[DNSFirewallGetResponse], dns_firewall, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.dns_firewall.with_streaming_response.get(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns_firewall = response.parse()
+            assert_matches_type(Optional[DNSFirewallGetResponse], dns_firewall, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.dns_firewall.with_raw_response.get(
+                dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
+            client.dns_firewall.with_raw_response.get(
+                dns_firewall_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncDNSFirewall:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        dns_firewall = await async_client.dns_firewall.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Awesome DNS Firewall cluster",
+            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
+        )
+        assert_matches_type(Optional[DNSFirewallCreateResponse], dns_firewall, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        dns_firewall = await async_client.dns_firewall.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Awesome DNS Firewall cluster",
+            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
+            attack_mitigation={
+                "enabled": True,
+                "only_when_upstream_unhealthy": False,
+            },
+            deprecate_any_requests=True,
+            ecs_fallback=False,
+            maximum_cache_ttl=900,
+            minimum_cache_ttl=60,
+            negative_cache_ttl=900,
+            ratelimit=600,
+            retries=2,
+        )
+        assert_matches_type(Optional[DNSFirewallCreateResponse], dns_firewall, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns_firewall.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Awesome DNS Firewall cluster",
+            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns_firewall = await response.parse()
+        assert_matches_type(Optional[DNSFirewallCreateResponse], dns_firewall, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns_firewall.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Awesome DNS Firewall cluster",
+            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns_firewall = await response.parse()
+            assert_matches_type(Optional[DNSFirewallCreateResponse], dns_firewall, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.dns_firewall.with_raw_response.create(
+                account_id="",
+                name="My Awesome DNS Firewall cluster",
+                upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        dns_firewall = await async_client.dns_firewall.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[DNSFirewallListResponse], dns_firewall, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        dns_firewall = await async_client.dns_firewall.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[DNSFirewallListResponse], dns_firewall, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns_firewall.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns_firewall = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[DNSFirewallListResponse], dns_firewall, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns_firewall.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns_firewall = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[DNSFirewallListResponse], dns_firewall, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.dns_firewall.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        dns_firewall = await async_client.dns_firewall.delete(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[DNSFirewallDeleteResponse], dns_firewall, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns_firewall.with_raw_response.delete(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns_firewall = await response.parse()
+        assert_matches_type(Optional[DNSFirewallDeleteResponse], dns_firewall, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns_firewall.with_streaming_response.delete(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns_firewall = await response.parse()
+            assert_matches_type(Optional[DNSFirewallDeleteResponse], dns_firewall, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.dns_firewall.with_raw_response.delete(
+                dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
+            await async_client.dns_firewall.with_raw_response.delete(
+                dns_firewall_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        dns_firewall = await async_client.dns_firewall.edit(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[DNSFirewallEditResponse], dns_firewall, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        dns_firewall = await async_client.dns_firewall.edit(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            attack_mitigation={
+                "enabled": True,
+                "only_when_upstream_unhealthy": False,
+            },
+            deprecate_any_requests=True,
+            ecs_fallback=False,
+            maximum_cache_ttl=900,
+            minimum_cache_ttl=60,
+            name="My Awesome DNS Firewall cluster",
+            negative_cache_ttl=900,
+            ratelimit=600,
+            retries=2,
+            upstream_ips=["192.0.2.1", "198.51.100.1", "2001:DB8:100::CF"],
+        )
+        assert_matches_type(Optional[DNSFirewallEditResponse], dns_firewall, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns_firewall.with_raw_response.edit(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns_firewall = await response.parse()
+        assert_matches_type(Optional[DNSFirewallEditResponse], dns_firewall, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns_firewall.with_streaming_response.edit(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns_firewall = await response.parse()
+            assert_matches_type(Optional[DNSFirewallEditResponse], dns_firewall, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.dns_firewall.with_raw_response.edit(
+                dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
+            await async_client.dns_firewall.with_raw_response.edit(
+                dns_firewall_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        dns_firewall = await async_client.dns_firewall.get(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[DNSFirewallGetResponse], dns_firewall, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.dns_firewall.with_raw_response.get(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        dns_firewall = await response.parse()
+        assert_matches_type(Optional[DNSFirewallGetResponse], dns_firewall, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.dns_firewall.with_streaming_response.get(
+            dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            dns_firewall = await response.parse()
+            assert_matches_type(Optional[DNSFirewallGetResponse], dns_firewall, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.dns_firewall.with_raw_response.get(
+                dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"):
+            await async_client.dns_firewall.with_raw_response.get(
+                dns_firewall_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/test_email_routing.py b/tests/api_resources/test_email_routing.py
index 3aafbd93e2d..9ee958eb5ce 100644
--- a/tests/api_resources/test_email_routing.py
+++ b/tests/api_resources/test_email_routing.py
@@ -11,6 +11,8 @@
 from tests.utils import assert_matches_type
 from cloudflare.types.email_routing import Settings
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -19,18 +21,21 @@ class TestEmailRouting:
 
     @parametrize
     def test_method_disable(self, client: Cloudflare) -> None:
-        email_routing = client.email_routing.disable(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            email_routing = client.email_routing.disable(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            )
+
         assert_matches_type(Optional[Settings], email_routing, path=["response"])
 
     @parametrize
     def test_raw_response_disable(self, client: Cloudflare) -> None:
-        response = client.email_routing.with_raw_response.disable(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.email_routing.with_raw_response.disable(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -39,40 +44,45 @@ def test_raw_response_disable(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_disable(self, client: Cloudflare) -> None:
-        with client.email_routing.with_streaming_response.disable(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.email_routing.with_streaming_response.disable(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            email_routing = response.parse()
-            assert_matches_type(Optional[Settings], email_routing, path=["response"])
+                email_routing = response.parse()
+                assert_matches_type(Optional[Settings], email_routing, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_disable(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            client.email_routing.with_raw_response.disable(
-                zone_identifier="",
-                body={},
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.email_routing.with_raw_response.disable(
+                    zone_id="",
+                    body={},
+                )
 
     @parametrize
     def test_method_enable(self, client: Cloudflare) -> None:
-        email_routing = client.email_routing.enable(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            email_routing = client.email_routing.enable(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            )
+
         assert_matches_type(Optional[Settings], email_routing, path=["response"])
 
     @parametrize
     def test_raw_response_enable(self, client: Cloudflare) -> None:
-        response = client.email_routing.with_raw_response.enable(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.email_routing.with_raw_response.enable(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -81,37 +91,39 @@ def test_raw_response_enable(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_enable(self, client: Cloudflare) -> None:
-        with client.email_routing.with_streaming_response.enable(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.email_routing.with_streaming_response.enable(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            email_routing = response.parse()
-            assert_matches_type(Optional[Settings], email_routing, path=["response"])
+                email_routing = response.parse()
+                assert_matches_type(Optional[Settings], email_routing, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_enable(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            client.email_routing.with_raw_response.enable(
-                zone_identifier="",
-                body={},
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.email_routing.with_raw_response.enable(
+                    zone_id="",
+                    body={},
+                )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         email_routing = client.email_routing.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Settings], email_routing, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.email_routing.with_raw_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -122,7 +134,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.email_routing.with_streaming_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -134,29 +146,34 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.email_routing.with_raw_response.get(
-                "",
+                zone_id="",
             )
 
 
 class TestAsyncEmailRouting:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_disable(self, async_client: AsyncCloudflare) -> None:
-        email_routing = await async_client.email_routing.disable(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            email_routing = await async_client.email_routing.disable(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            )
+
         assert_matches_type(Optional[Settings], email_routing, path=["response"])
 
     @parametrize
     async def test_raw_response_disable(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.email_routing.with_raw_response.disable(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.email_routing.with_raw_response.disable(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -165,40 +182,45 @@ async def test_raw_response_disable(self, async_client: AsyncCloudflare) -> None
 
     @parametrize
     async def test_streaming_response_disable(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.email_routing.with_streaming_response.disable(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.email_routing.with_streaming_response.disable(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            email_routing = await response.parse()
-            assert_matches_type(Optional[Settings], email_routing, path=["response"])
+                email_routing = await response.parse()
+                assert_matches_type(Optional[Settings], email_routing, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_disable(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            await async_client.email_routing.with_raw_response.disable(
-                zone_identifier="",
-                body={},
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.email_routing.with_raw_response.disable(
+                    zone_id="",
+                    body={},
+                )
 
     @parametrize
     async def test_method_enable(self, async_client: AsyncCloudflare) -> None:
-        email_routing = await async_client.email_routing.enable(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            email_routing = await async_client.email_routing.enable(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            )
+
         assert_matches_type(Optional[Settings], email_routing, path=["response"])
 
     @parametrize
     async def test_raw_response_enable(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.email_routing.with_raw_response.enable(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.email_routing.with_raw_response.enable(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -207,37 +229,39 @@ async def test_raw_response_enable(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_enable(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.email_routing.with_streaming_response.enable(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            body={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.email_routing.with_streaming_response.enable(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body={},
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            email_routing = await response.parse()
-            assert_matches_type(Optional[Settings], email_routing, path=["response"])
+                email_routing = await response.parse()
+                assert_matches_type(Optional[Settings], email_routing, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_enable(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            await async_client.email_routing.with_raw_response.enable(
-                zone_identifier="",
-                body={},
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.email_routing.with_raw_response.enable(
+                    zone_id="",
+                    body={},
+                )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         email_routing = await async_client.email_routing.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[Settings], email_routing, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.email_routing.with_raw_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -248,7 +272,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.email_routing.with_streaming_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -260,7 +284,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.email_routing.with_raw_response.get(
-                "",
+                zone_id="",
             )
diff --git a/tests/api_resources/test_filters.py b/tests/api_resources/test_filters.py
index c088a4f8f9a..d866cb86d20 100644
--- a/tests/api_resources/test_filters.py
+++ b/tests/api_resources/test_filters.py
@@ -9,10 +9,11 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.filters import (
     FirewallFilter,
-    FilterCreateResponse,
+    FilterDeleteResponse,
+    FilterBulkDeleteResponse,
 )
 
 # pyright: reportDeprecated=false
@@ -28,39 +29,39 @@ class TestFilters:
     def test_method_create(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             filter = client.filters.create(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[{}],
             )
 
-        assert_matches_type(Optional[FilterCreateResponse], filter, path=["response"])
+        assert_matches_type(SyncSinglePage[FirewallFilter], filter, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = client.filters.with_raw_response.create(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[{}],
             )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         filter = response.parse()
-        assert_matches_type(Optional[FilterCreateResponse], filter, path=["response"])
+        assert_matches_type(SyncSinglePage[FirewallFilter], filter, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             with client.filters.with_streaming_response.create(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[{}],
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
                 filter = response.parse()
-                assert_matches_type(Optional[FilterCreateResponse], filter, path=["response"])
+                assert_matches_type(SyncSinglePage[FirewallFilter], filter, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -68,10 +69,10 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 client.filters.with_raw_response.create(
-                    zone_identifier="",
-                    body={},
+                    zone_id="",
+                    body=[{}],
                 )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -79,9 +80,23 @@ def test_path_params_create(self, client: Cloudflare) -> None:
     def test_method_update(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             filter = client.filters.update(
-                id="372e67954025e0ba6aaa6d586b9e0b61",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(FirewallFilter, filter, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            filter = client.filters.update(
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                description="Restrict access from these browsers on this address range.",
+                expression='(http.request.uri.path ~ ".*wp-login.php" or http.request.uri.path ~ ".*xmlrpc.php") and ip.addr ne 172.16.22.155',
+                paused=False,
+                ref="FIL-100",
             )
 
         assert_matches_type(FirewallFilter, filter, path=["response"])
@@ -91,9 +106,8 @@ def test_method_update(self, client: Cloudflare) -> None:
     def test_raw_response_update(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = client.filters.with_raw_response.update(
-                id="372e67954025e0ba6aaa6d586b9e0b61",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
@@ -106,9 +120,8 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             with client.filters.with_streaming_response.update(
-                id="372e67954025e0ba6aaa6d586b9e0b61",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -122,25 +135,23 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 client.filters.with_raw_response.update(
-                    id="372e67954025e0ba6aaa6d586b9e0b61",
-                    zone_identifier="",
-                    body={},
+                    filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                    zone_id="",
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `filter_id` but received ''"):
                 client.filters.with_raw_response.update(
-                    id="",
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                    body={},
+                    filter_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 )
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             filter = client.filters.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert_matches_type(SyncV4PagePaginationArray[FirewallFilter], filter, path=["response"])
@@ -149,7 +160,7 @@ def test_method_list(self, client: Cloudflare) -> None:
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             filter = client.filters.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 id="372e67954025e0ba6aaa6d586b9e0b61",
                 description="browsers",
                 expression="php",
@@ -165,7 +176,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
     def test_raw_response_list(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = client.filters.with_raw_response.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
@@ -177,7 +188,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             with client.filters.with_streaming_response.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -190,70 +201,168 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 client.filters.with_raw_response.list(
-                    zone_identifier="",
+                    zone_id="",
                 )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             filter = client.filters.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b61",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
-        assert_matches_type(FirewallFilter, filter, path=["response"])
+        assert_matches_type(FilterDeleteResponse, filter, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = client.filters.with_raw_response.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b61",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         filter = response.parse()
-        assert_matches_type(FirewallFilter, filter, path=["response"])
+        assert_matches_type(FilterDeleteResponse, filter, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             with client.filters.with_streaming_response.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b61",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
                 filter = response.parse()
-                assert_matches_type(FirewallFilter, filter, path=["response"])
+                assert_matches_type(FilterDeleteResponse, filter, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 client.filters.with_raw_response.delete(
-                    id="372e67954025e0ba6aaa6d586b9e0b61",
-                    zone_identifier="",
+                    filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                    zone_id="",
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `filter_id` but received ''"):
                 client.filters.with_raw_response.delete(
-                    id="",
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                    filter_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
+
+    @parametrize
+    def test_method_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            filter = client.filters.bulk_delete(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                id=["372e67954025e0ba6aaa6d586b9e0b61"],
+            )
+
+        assert_matches_type(Optional[FilterBulkDeleteResponse], filter, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.filters.with_raw_response.bulk_delete(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                id=["372e67954025e0ba6aaa6d586b9e0b61"],
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        filter = response.parse()
+        assert_matches_type(Optional[FilterBulkDeleteResponse], filter, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.filters.with_streaming_response.bulk_delete(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                id=["372e67954025e0ba6aaa6d586b9e0b61"],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                filter = response.parse()
+                assert_matches_type(Optional[FilterBulkDeleteResponse], filter, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.filters.with_raw_response.bulk_delete(
+                    zone_id="",
+                    id=["372e67954025e0ba6aaa6d586b9e0b61"],
+                )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_bulk_update(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            filter = client.filters.bulk_update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[{}],
+            )
+
+        assert_matches_type(SyncSinglePage[FirewallFilter], filter, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_bulk_update(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.filters.with_raw_response.bulk_update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[{}],
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        filter = response.parse()
+        assert_matches_type(SyncSinglePage[FirewallFilter], filter, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_bulk_update(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.filters.with_streaming_response.bulk_update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[{}],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                filter = response.parse()
+                assert_matches_type(SyncSinglePage[FirewallFilter], filter, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_bulk_update(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.filters.with_raw_response.bulk_update(
+                    zone_id="",
+                    body=[{}],
                 )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             filter = client.filters.get(
-                id="372e67954025e0ba6aaa6d586b9e0b61",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert_matches_type(FirewallFilter, filter, path=["response"])
@@ -262,8 +371,8 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_raw_response_get(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = client.filters.with_raw_response.get(
-                id="372e67954025e0ba6aaa6d586b9e0b61",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
@@ -275,8 +384,8 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             with client.filters.with_streaming_response.get(
-                id="372e67954025e0ba6aaa6d586b9e0b61",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -289,60 +398,62 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 client.filters.with_raw_response.get(
-                    id="372e67954025e0ba6aaa6d586b9e0b61",
-                    zone_identifier="",
+                    filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                    zone_id="",
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `filter_id` but received ''"):
                 client.filters.with_raw_response.get(
-                    id="",
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                    filter_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 )
 
 
 class TestAsyncFilters:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             filter = await async_client.filters.create(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[{}],
             )
 
-        assert_matches_type(Optional[FilterCreateResponse], filter, path=["response"])
+        assert_matches_type(AsyncSinglePage[FirewallFilter], filter, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = await async_client.filters.with_raw_response.create(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[{}],
             )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         filter = await response.parse()
-        assert_matches_type(Optional[FilterCreateResponse], filter, path=["response"])
+        assert_matches_type(AsyncSinglePage[FirewallFilter], filter, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             async with async_client.filters.with_streaming_response.create(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[{}],
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
                 filter = await response.parse()
-                assert_matches_type(Optional[FilterCreateResponse], filter, path=["response"])
+                assert_matches_type(AsyncSinglePage[FirewallFilter], filter, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -350,10 +461,10 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 await async_client.filters.with_raw_response.create(
-                    zone_identifier="",
-                    body={},
+                    zone_id="",
+                    body=[{}],
                 )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -361,9 +472,23 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             filter = await async_client.filters.update(
-                id="372e67954025e0ba6aaa6d586b9e0b61",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(FirewallFilter, filter, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            filter = await async_client.filters.update(
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                description="Restrict access from these browsers on this address range.",
+                expression='(http.request.uri.path ~ ".*wp-login.php" or http.request.uri.path ~ ".*xmlrpc.php") and ip.addr ne 172.16.22.155',
+                paused=False,
+                ref="FIL-100",
             )
 
         assert_matches_type(FirewallFilter, filter, path=["response"])
@@ -373,9 +498,8 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = await async_client.filters.with_raw_response.update(
-                id="372e67954025e0ba6aaa6d586b9e0b61",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
@@ -388,9 +512,8 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             async with async_client.filters.with_streaming_response.update(
-                id="372e67954025e0ba6aaa6d586b9e0b61",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -404,25 +527,23 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 await async_client.filters.with_raw_response.update(
-                    id="372e67954025e0ba6aaa6d586b9e0b61",
-                    zone_identifier="",
-                    body={},
+                    filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                    zone_id="",
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `filter_id` but received ''"):
                 await async_client.filters.with_raw_response.update(
-                    id="",
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                    body={},
+                    filter_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             filter = await async_client.filters.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert_matches_type(AsyncV4PagePaginationArray[FirewallFilter], filter, path=["response"])
@@ -431,7 +552,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             filter = await async_client.filters.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 id="372e67954025e0ba6aaa6d586b9e0b61",
                 description="browsers",
                 expression="php",
@@ -447,7 +568,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = await async_client.filters.with_raw_response.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
@@ -459,7 +580,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             async with async_client.filters.with_streaming_response.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -472,70 +593,168 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 await async_client.filters.with_raw_response.list(
-                    zone_identifier="",
+                    zone_id="",
                 )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             filter = await async_client.filters.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b61",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
-        assert_matches_type(FirewallFilter, filter, path=["response"])
+        assert_matches_type(FilterDeleteResponse, filter, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = await async_client.filters.with_raw_response.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b61",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         filter = await response.parse()
-        assert_matches_type(FirewallFilter, filter, path=["response"])
+        assert_matches_type(FilterDeleteResponse, filter, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             async with async_client.filters.with_streaming_response.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b61",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
                 filter = await response.parse()
-                assert_matches_type(FirewallFilter, filter, path=["response"])
+                assert_matches_type(FilterDeleteResponse, filter, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 await async_client.filters.with_raw_response.delete(
-                    id="372e67954025e0ba6aaa6d586b9e0b61",
-                    zone_identifier="",
+                    filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                    zone_id="",
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `filter_id` but received ''"):
                 await async_client.filters.with_raw_response.delete(
-                    id="",
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                    filter_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
+
+    @parametrize
+    async def test_method_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            filter = await async_client.filters.bulk_delete(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                id=["372e67954025e0ba6aaa6d586b9e0b61"],
+            )
+
+        assert_matches_type(Optional[FilterBulkDeleteResponse], filter, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.filters.with_raw_response.bulk_delete(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                id=["372e67954025e0ba6aaa6d586b9e0b61"],
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        filter = await response.parse()
+        assert_matches_type(Optional[FilterBulkDeleteResponse], filter, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.filters.with_streaming_response.bulk_delete(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                id=["372e67954025e0ba6aaa6d586b9e0b61"],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                filter = await response.parse()
+                assert_matches_type(Optional[FilterBulkDeleteResponse], filter, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.filters.with_raw_response.bulk_delete(
+                    zone_id="",
+                    id=["372e67954025e0ba6aaa6d586b9e0b61"],
+                )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            filter = await async_client.filters.bulk_update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[{}],
+            )
+
+        assert_matches_type(AsyncSinglePage[FirewallFilter], filter, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.filters.with_raw_response.bulk_update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[{}],
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        filter = await response.parse()
+        assert_matches_type(AsyncSinglePage[FirewallFilter], filter, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.filters.with_streaming_response.bulk_update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                body=[{}],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                filter = await response.parse()
+                assert_matches_type(AsyncSinglePage[FirewallFilter], filter, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.filters.with_raw_response.bulk_update(
+                    zone_id="",
+                    body=[{}],
                 )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             filter = await async_client.filters.get(
-                id="372e67954025e0ba6aaa6d586b9e0b61",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert_matches_type(FirewallFilter, filter, path=["response"])
@@ -544,8 +763,8 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = await async_client.filters.with_raw_response.get(
-                id="372e67954025e0ba6aaa6d586b9e0b61",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
@@ -557,8 +776,8 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             async with async_client.filters.with_streaming_response.get(
-                id="372e67954025e0ba6aaa6d586b9e0b61",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -571,14 +790,14 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 await async_client.filters.with_raw_response.get(
-                    id="372e67954025e0ba6aaa6d586b9e0b61",
-                    zone_identifier="",
+                    filter_id="372e67954025e0ba6aaa6d586b9e0b61",
+                    zone_id="",
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `filter_id` but received ''"):
                 await async_client.filters.with_raw_response.get(
-                    id="",
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                    filter_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 )
diff --git a/tests/api_resources/test_fraud.py b/tests/api_resources/test_fraud.py
new file mode 100644
index 00000000000..91984bef14c
--- /dev/null
+++ b/tests/api_resources/test_fraud.py
@@ -0,0 +1,194 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.fraud import FraudSettings
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestFraud:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        fraud = client.fraud.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[FraudSettings], fraud, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        fraud = client.fraud.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            user_profiles="disabled",
+            username_expressions=["string"],
+        )
+        assert_matches_type(Optional[FraudSettings], fraud, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.fraud.with_raw_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        fraud = response.parse()
+        assert_matches_type(Optional[FraudSettings], fraud, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.fraud.with_streaming_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            fraud = response.parse()
+            assert_matches_type(Optional[FraudSettings], fraud, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.fraud.with_raw_response.update(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        fraud = client.fraud.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[FraudSettings], fraud, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.fraud.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        fraud = response.parse()
+        assert_matches_type(Optional[FraudSettings], fraud, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.fraud.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            fraud = response.parse()
+            assert_matches_type(Optional[FraudSettings], fraud, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.fraud.with_raw_response.get(
+                zone_id="",
+            )
+
+
+class TestAsyncFraud:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        fraud = await async_client.fraud.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[FraudSettings], fraud, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        fraud = await async_client.fraud.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            user_profiles="disabled",
+            username_expressions=["string"],
+        )
+        assert_matches_type(Optional[FraudSettings], fraud, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.fraud.with_raw_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        fraud = await response.parse()
+        assert_matches_type(Optional[FraudSettings], fraud, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.fraud.with_streaming_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            fraud = await response.parse()
+            assert_matches_type(Optional[FraudSettings], fraud, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.fraud.with_raw_response.update(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        fraud = await async_client.fraud.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[FraudSettings], fraud, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.fraud.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        fraud = await response.parse()
+        assert_matches_type(Optional[FraudSettings], fraud, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.fraud.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            fraud = await response.parse()
+            assert_matches_type(Optional[FraudSettings], fraud, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.fraud.with_raw_response.get(
+                zone_id="",
+            )
diff --git a/tests/api_resources/test_healthchecks.py b/tests/api_resources/test_healthchecks.py
index 59a3c637620..e8ceb8eda69 100644
--- a/tests/api_resources/test_healthchecks.py
+++ b/tests/api_resources/test_healthchecks.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.healthchecks import (
     Healthcheck,
     HealthcheckDeleteResponse,
@@ -201,16 +201,16 @@ def test_method_list(self, client: Cloudflare) -> None:
         healthcheck = client.healthchecks.list(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncSinglePage[Healthcheck], healthcheck, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Healthcheck], healthcheck, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         healthcheck = client.healthchecks.list(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            page={},
-            per_page={},
+            page=1,
+            per_page=5,
         )
-        assert_matches_type(SyncSinglePage[Healthcheck], healthcheck, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Healthcheck], healthcheck, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -221,7 +221,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         healthcheck = response.parse()
-        assert_matches_type(SyncSinglePage[Healthcheck], healthcheck, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Healthcheck], healthcheck, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -232,7 +232,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             healthcheck = response.parse()
-            assert_matches_type(SyncSinglePage[Healthcheck], healthcheck, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[Healthcheck], healthcheck, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -435,7 +435,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncHealthchecks:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -617,16 +619,16 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         healthcheck = await async_client.healthchecks.list(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncSinglePage[Healthcheck], healthcheck, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Healthcheck], healthcheck, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         healthcheck = await async_client.healthchecks.list(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            page={},
-            per_page={},
+            page=1,
+            per_page=5,
         )
-        assert_matches_type(AsyncSinglePage[Healthcheck], healthcheck, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Healthcheck], healthcheck, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -637,7 +639,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         healthcheck = await response.parse()
-        assert_matches_type(AsyncSinglePage[Healthcheck], healthcheck, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Healthcheck], healthcheck, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -648,7 +650,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             healthcheck = await response.parse()
-            assert_matches_type(AsyncSinglePage[Healthcheck], healthcheck, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[Healthcheck], healthcheck, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/test_ips.py b/tests/api_resources/test_ips.py
index e013f501f77..449885157ba 100644
--- a/tests/api_resources/test_ips.py
+++ b/tests/api_resources/test_ips.py
@@ -51,7 +51,9 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncIPs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/test_keyless_certificates.py b/tests/api_resources/test_keyless_certificates.py
index 0dae2518fe2..ea17c20d1b1 100644
--- a/tests/api_resources/test_keyless_certificates.py
+++ b/tests/api_resources/test_keyless_certificates.py
@@ -293,7 +293,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncKeylessCertificates:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/test_leaked_credential_checks.py b/tests/api_resources/test_leaked_credential_checks.py
new file mode 100644
index 00000000000..6f82f5dbb3d
--- /dev/null
+++ b/tests/api_resources/test_leaked_credential_checks.py
@@ -0,0 +1,195 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.leaked_credential_checks import (
+    LeakedCredentialCheckGetResponse,
+    LeakedCredentialCheckCreateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestLeakedCredentialChecks:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        leaked_credential_check = client.leaked_credential_checks.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LeakedCredentialCheckCreateResponse, leaked_credential_check, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        leaked_credential_check = client.leaked_credential_checks.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        )
+        assert_matches_type(LeakedCredentialCheckCreateResponse, leaked_credential_check, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.leaked_credential_checks.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        leaked_credential_check = response.parse()
+        assert_matches_type(LeakedCredentialCheckCreateResponse, leaked_credential_check, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.leaked_credential_checks.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            leaked_credential_check = response.parse()
+            assert_matches_type(LeakedCredentialCheckCreateResponse, leaked_credential_check, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.leaked_credential_checks.with_raw_response.create(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        leaked_credential_check = client.leaked_credential_checks.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LeakedCredentialCheckGetResponse, leaked_credential_check, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.leaked_credential_checks.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        leaked_credential_check = response.parse()
+        assert_matches_type(LeakedCredentialCheckGetResponse, leaked_credential_check, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.leaked_credential_checks.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            leaked_credential_check = response.parse()
+            assert_matches_type(LeakedCredentialCheckGetResponse, leaked_credential_check, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.leaked_credential_checks.with_raw_response.get(
+                zone_id="",
+            )
+
+
+class TestAsyncLeakedCredentialChecks:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        leaked_credential_check = await async_client.leaked_credential_checks.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LeakedCredentialCheckCreateResponse, leaked_credential_check, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        leaked_credential_check = await async_client.leaked_credential_checks.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        )
+        assert_matches_type(LeakedCredentialCheckCreateResponse, leaked_credential_check, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.leaked_credential_checks.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        leaked_credential_check = await response.parse()
+        assert_matches_type(LeakedCredentialCheckCreateResponse, leaked_credential_check, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.leaked_credential_checks.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            leaked_credential_check = await response.parse()
+            assert_matches_type(LeakedCredentialCheckCreateResponse, leaked_credential_check, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.leaked_credential_checks.with_raw_response.create(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        leaked_credential_check = await async_client.leaked_credential_checks.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(LeakedCredentialCheckGetResponse, leaked_credential_check, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.leaked_credential_checks.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        leaked_credential_check = await response.parse()
+        assert_matches_type(LeakedCredentialCheckGetResponse, leaked_credential_check, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.leaked_credential_checks.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            leaked_credential_check = await response.parse()
+            assert_matches_type(LeakedCredentialCheckGetResponse, leaked_credential_check, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.leaked_credential_checks.with_raw_response.get(
+                zone_id="",
+            )
diff --git a/tests/api_resources/test_load_balancers.py b/tests/api_resources/test_load_balancers.py
index 915976705c6..12774db01b0 100644
--- a/tests/api_resources/test_load_balancers.py
+++ b/tests/api_resources/test_load_balancers.py
@@ -30,7 +30,7 @@ def test_method_create(self, client: Cloudflare) -> None:
                 "9290f38c5d07c2e2f4df57b1f61d4196",
                 "00920f38ce07c2e2f4df50b1f61d4194",
             ],
-            fallback_pool={},
+            fallback_pool="fallback_pool",
             name="www.example.com",
         )
         assert_matches_type(LoadBalancer, load_balancer, path=["response"])
@@ -44,7 +44,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                 "9290f38c5d07c2e2f4df57b1f61d4196",
                 "00920f38ce07c2e2f4df50b1f61d4194",
             ],
-            fallback_pool={},
+            fallback_pool="fallback_pool",
             name="www.example.com",
             adaptive_routing={"failover_across_pools": True},
             country_pools={
@@ -56,6 +56,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                 "mode": "resolver_ip",
                 "prefer_ecs": "always",
             },
+            networks=["string"],
             pop_pools={
                 "LAX": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
                 "LHR": ["abd90f38ced07c2e2f4df50b1f61d4194", "f9138c5d07c2e2f4df57b1f61d4196"],
@@ -95,7 +96,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                             "9290f38c5d07c2e2f4df57b1f61d4196",
                             "00920f38ce07c2e2f4df50b1f61d4194",
                         ],
-                        "fallback_pool": {},
+                        "fallback_pool": "fallback_pool",
                         "location_strategy": {
                             "mode": "resolver_ip",
                             "prefer_ecs": "always",
@@ -131,123 +132,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                     },
                     "priority": 0,
                     "terminates": True,
-                },
-                {
-                    "condition": 'http.request.uri.path contains "/testing"',
-                    "disabled": True,
-                    "fixed_response": {
-                        "content_type": "application/json",
-                        "location": "www.example.com",
-                        "message_body": "Testing Hello",
-                        "status_code": 0,
-                    },
-                    "name": "route the path /testing to testing datacenter.",
-                    "overrides": {
-                        "adaptive_routing": {"failover_across_pools": True},
-                        "country_pools": {
-                            "GB": ["abd90f38ced07c2e2f4df50b1f61d4194"],
-                            "US": ["de90f38ced07c2e2f4df50b1f61d4194", "00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "default_pools": [
-                            "17b5962d775c646f3f9725cbc7a53df4",
-                            "9290f38c5d07c2e2f4df57b1f61d4196",
-                            "00920f38ce07c2e2f4df50b1f61d4194",
-                        ],
-                        "fallback_pool": {},
-                        "location_strategy": {
-                            "mode": "resolver_ip",
-                            "prefer_ecs": "always",
-                        },
-                        "pop_pools": {
-                            "LAX": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                            "LHR": ["abd90f38ced07c2e2f4df50b1f61d4194", "f9138c5d07c2e2f4df57b1f61d4196"],
-                            "SJC": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "random_steering": {
-                            "default_weight": 0.2,
-                            "pool_weights": {
-                                "9290f38c5d07c2e2f4df57b1f61d4196": 0.5,
-                                "de90f38ced07c2e2f4df50b1f61d4194": 0.3,
-                            },
-                        },
-                        "region_pools": {
-                            "ENAM": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                            "WNAM": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                        },
-                        "session_affinity": "cookie",
-                        "session_affinity_attributes": {
-                            "drain_duration": 100,
-                            "headers": ["x"],
-                            "require_all_headers": True,
-                            "samesite": "Auto",
-                            "secure": "Auto",
-                            "zero_downtime_failover": "sticky",
-                        },
-                        "session_affinity_ttl": 1800,
-                        "steering_policy": "dynamic_latency",
-                        "ttl": 30,
-                    },
-                    "priority": 0,
-                    "terminates": True,
-                },
-                {
-                    "condition": 'http.request.uri.path contains "/testing"',
-                    "disabled": True,
-                    "fixed_response": {
-                        "content_type": "application/json",
-                        "location": "www.example.com",
-                        "message_body": "Testing Hello",
-                        "status_code": 0,
-                    },
-                    "name": "route the path /testing to testing datacenter.",
-                    "overrides": {
-                        "adaptive_routing": {"failover_across_pools": True},
-                        "country_pools": {
-                            "GB": ["abd90f38ced07c2e2f4df50b1f61d4194"],
-                            "US": ["de90f38ced07c2e2f4df50b1f61d4194", "00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "default_pools": [
-                            "17b5962d775c646f3f9725cbc7a53df4",
-                            "9290f38c5d07c2e2f4df57b1f61d4196",
-                            "00920f38ce07c2e2f4df50b1f61d4194",
-                        ],
-                        "fallback_pool": {},
-                        "location_strategy": {
-                            "mode": "resolver_ip",
-                            "prefer_ecs": "always",
-                        },
-                        "pop_pools": {
-                            "LAX": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                            "LHR": ["abd90f38ced07c2e2f4df50b1f61d4194", "f9138c5d07c2e2f4df57b1f61d4196"],
-                            "SJC": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "random_steering": {
-                            "default_weight": 0.2,
-                            "pool_weights": {
-                                "9290f38c5d07c2e2f4df57b1f61d4196": 0.5,
-                                "de90f38ced07c2e2f4df50b1f61d4194": 0.3,
-                            },
-                        },
-                        "region_pools": {
-                            "ENAM": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                            "WNAM": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                        },
-                        "session_affinity": "cookie",
-                        "session_affinity_attributes": {
-                            "drain_duration": 100,
-                            "headers": ["x"],
-                            "require_all_headers": True,
-                            "samesite": "Auto",
-                            "secure": "Auto",
-                            "zero_downtime_failover": "sticky",
-                        },
-                        "session_affinity_ttl": 1800,
-                        "steering_policy": "dynamic_latency",
-                        "ttl": 30,
-                    },
-                    "priority": 0,
-                    "terminates": True,
-                },
+                }
             ],
             session_affinity="cookie",
             session_affinity_attributes={
@@ -273,7 +158,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
                 "9290f38c5d07c2e2f4df57b1f61d4196",
                 "00920f38ce07c2e2f4df50b1f61d4194",
             ],
-            fallback_pool={},
+            fallback_pool="fallback_pool",
             name="www.example.com",
         )
 
@@ -291,7 +176,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
                 "9290f38c5d07c2e2f4df57b1f61d4196",
                 "00920f38ce07c2e2f4df50b1f61d4194",
             ],
-            fallback_pool={},
+            fallback_pool="fallback_pool",
             name="www.example.com",
         ) as response:
             assert not response.is_closed
@@ -312,7 +197,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
                     "9290f38c5d07c2e2f4df57b1f61d4196",
                     "00920f38ce07c2e2f4df50b1f61d4194",
                 ],
-                fallback_pool={},
+                fallback_pool="fallback_pool",
                 name="www.example.com",
             )
 
@@ -326,7 +211,7 @@ def test_method_update(self, client: Cloudflare) -> None:
                 "9290f38c5d07c2e2f4df57b1f61d4196",
                 "00920f38ce07c2e2f4df50b1f61d4194",
             ],
-            fallback_pool={},
+            fallback_pool="fallback_pool",
             name="www.example.com",
         )
         assert_matches_type(LoadBalancer, load_balancer, path=["response"])
@@ -341,7 +226,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                 "9290f38c5d07c2e2f4df57b1f61d4196",
                 "00920f38ce07c2e2f4df50b1f61d4194",
             ],
-            fallback_pool={},
+            fallback_pool="fallback_pool",
             name="www.example.com",
             adaptive_routing={"failover_across_pools": True},
             country_pools={
@@ -354,6 +239,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                 "mode": "resolver_ip",
                 "prefer_ecs": "always",
             },
+            networks=["string"],
             pop_pools={
                 "LAX": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
                 "LHR": ["abd90f38ced07c2e2f4df50b1f61d4194", "f9138c5d07c2e2f4df57b1f61d4196"],
@@ -393,65 +279,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                             "9290f38c5d07c2e2f4df57b1f61d4196",
                             "00920f38ce07c2e2f4df50b1f61d4194",
                         ],
-                        "fallback_pool": {},
-                        "location_strategy": {
-                            "mode": "resolver_ip",
-                            "prefer_ecs": "always",
-                        },
-                        "pop_pools": {
-                            "LAX": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                            "LHR": ["abd90f38ced07c2e2f4df50b1f61d4194", "f9138c5d07c2e2f4df57b1f61d4196"],
-                            "SJC": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "random_steering": {
-                            "default_weight": 0.2,
-                            "pool_weights": {
-                                "9290f38c5d07c2e2f4df57b1f61d4196": 0.5,
-                                "de90f38ced07c2e2f4df50b1f61d4194": 0.3,
-                            },
-                        },
-                        "region_pools": {
-                            "ENAM": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                            "WNAM": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                        },
-                        "session_affinity": "cookie",
-                        "session_affinity_attributes": {
-                            "drain_duration": 100,
-                            "headers": ["x"],
-                            "require_all_headers": True,
-                            "samesite": "Auto",
-                            "secure": "Auto",
-                            "zero_downtime_failover": "sticky",
-                        },
-                        "session_affinity_ttl": 1800,
-                        "steering_policy": "dynamic_latency",
-                        "ttl": 30,
-                    },
-                    "priority": 0,
-                    "terminates": True,
-                },
-                {
-                    "condition": 'http.request.uri.path contains "/testing"',
-                    "disabled": True,
-                    "fixed_response": {
-                        "content_type": "application/json",
-                        "location": "www.example.com",
-                        "message_body": "Testing Hello",
-                        "status_code": 0,
-                    },
-                    "name": "route the path /testing to testing datacenter.",
-                    "overrides": {
-                        "adaptive_routing": {"failover_across_pools": True},
-                        "country_pools": {
-                            "GB": ["abd90f38ced07c2e2f4df50b1f61d4194"],
-                            "US": ["de90f38ced07c2e2f4df50b1f61d4194", "00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "default_pools": [
-                            "17b5962d775c646f3f9725cbc7a53df4",
-                            "9290f38c5d07c2e2f4df57b1f61d4196",
-                            "00920f38ce07c2e2f4df50b1f61d4194",
-                        ],
-                        "fallback_pool": {},
+                        "fallback_pool": "fallback_pool",
                         "location_strategy": {
                             "mode": "resolver_ip",
                             "prefer_ecs": "always",
@@ -487,65 +315,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                     },
                     "priority": 0,
                     "terminates": True,
-                },
-                {
-                    "condition": 'http.request.uri.path contains "/testing"',
-                    "disabled": True,
-                    "fixed_response": {
-                        "content_type": "application/json",
-                        "location": "www.example.com",
-                        "message_body": "Testing Hello",
-                        "status_code": 0,
-                    },
-                    "name": "route the path /testing to testing datacenter.",
-                    "overrides": {
-                        "adaptive_routing": {"failover_across_pools": True},
-                        "country_pools": {
-                            "GB": ["abd90f38ced07c2e2f4df50b1f61d4194"],
-                            "US": ["de90f38ced07c2e2f4df50b1f61d4194", "00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "default_pools": [
-                            "17b5962d775c646f3f9725cbc7a53df4",
-                            "9290f38c5d07c2e2f4df57b1f61d4196",
-                            "00920f38ce07c2e2f4df50b1f61d4194",
-                        ],
-                        "fallback_pool": {},
-                        "location_strategy": {
-                            "mode": "resolver_ip",
-                            "prefer_ecs": "always",
-                        },
-                        "pop_pools": {
-                            "LAX": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                            "LHR": ["abd90f38ced07c2e2f4df50b1f61d4194", "f9138c5d07c2e2f4df57b1f61d4196"],
-                            "SJC": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "random_steering": {
-                            "default_weight": 0.2,
-                            "pool_weights": {
-                                "9290f38c5d07c2e2f4df57b1f61d4196": 0.5,
-                                "de90f38ced07c2e2f4df50b1f61d4194": 0.3,
-                            },
-                        },
-                        "region_pools": {
-                            "ENAM": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                            "WNAM": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                        },
-                        "session_affinity": "cookie",
-                        "session_affinity_attributes": {
-                            "drain_duration": 100,
-                            "headers": ["x"],
-                            "require_all_headers": True,
-                            "samesite": "Auto",
-                            "secure": "Auto",
-                            "zero_downtime_failover": "sticky",
-                        },
-                        "session_affinity_ttl": 1800,
-                        "steering_policy": "dynamic_latency",
-                        "ttl": 30,
-                    },
-                    "priority": 0,
-                    "terminates": True,
-                },
+                }
             ],
             session_affinity="cookie",
             session_affinity_attributes={
@@ -572,7 +342,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
                 "9290f38c5d07c2e2f4df57b1f61d4196",
                 "00920f38ce07c2e2f4df50b1f61d4194",
             ],
-            fallback_pool={},
+            fallback_pool="fallback_pool",
             name="www.example.com",
         )
 
@@ -591,7 +361,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
                 "9290f38c5d07c2e2f4df57b1f61d4196",
                 "00920f38ce07c2e2f4df50b1f61d4194",
             ],
-            fallback_pool={},
+            fallback_pool="fallback_pool",
             name="www.example.com",
         ) as response:
             assert not response.is_closed
@@ -613,7 +383,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                     "9290f38c5d07c2e2f4df57b1f61d4196",
                     "00920f38ce07c2e2f4df50b1f61d4194",
                 ],
-                fallback_pool={},
+                fallback_pool="fallback_pool",
                 name="www.example.com",
             )
 
@@ -626,7 +396,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                     "9290f38c5d07c2e2f4df57b1f61d4196",
                     "00920f38ce07c2e2f4df50b1f61d4194",
                 ],
-                fallback_pool={},
+                fallback_pool="fallback_pool",
                 name="www.example.com",
             )
 
@@ -741,7 +511,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
             ],
             description="Load Balancer for www.example.com",
             enabled=True,
-            fallback_pool={},
+            fallback_pool="fallback_pool",
             location_strategy={
                 "mode": "resolver_ip",
                 "prefer_ecs": "always",
@@ -786,65 +556,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
                             "9290f38c5d07c2e2f4df57b1f61d4196",
                             "00920f38ce07c2e2f4df50b1f61d4194",
                         ],
-                        "fallback_pool": {},
-                        "location_strategy": {
-                            "mode": "resolver_ip",
-                            "prefer_ecs": "always",
-                        },
-                        "pop_pools": {
-                            "LAX": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                            "LHR": ["abd90f38ced07c2e2f4df50b1f61d4194", "f9138c5d07c2e2f4df57b1f61d4196"],
-                            "SJC": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "random_steering": {
-                            "default_weight": 0.2,
-                            "pool_weights": {
-                                "9290f38c5d07c2e2f4df57b1f61d4196": 0.5,
-                                "de90f38ced07c2e2f4df50b1f61d4194": 0.3,
-                            },
-                        },
-                        "region_pools": {
-                            "ENAM": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                            "WNAM": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                        },
-                        "session_affinity": "cookie",
-                        "session_affinity_attributes": {
-                            "drain_duration": 100,
-                            "headers": ["x"],
-                            "require_all_headers": True,
-                            "samesite": "Auto",
-                            "secure": "Auto",
-                            "zero_downtime_failover": "sticky",
-                        },
-                        "session_affinity_ttl": 1800,
-                        "steering_policy": "dynamic_latency",
-                        "ttl": 30,
-                    },
-                    "priority": 0,
-                    "terminates": True,
-                },
-                {
-                    "condition": 'http.request.uri.path contains "/testing"',
-                    "disabled": True,
-                    "fixed_response": {
-                        "content_type": "application/json",
-                        "location": "www.example.com",
-                        "message_body": "Testing Hello",
-                        "status_code": 0,
-                    },
-                    "name": "route the path /testing to testing datacenter.",
-                    "overrides": {
-                        "adaptive_routing": {"failover_across_pools": True},
-                        "country_pools": {
-                            "GB": ["abd90f38ced07c2e2f4df50b1f61d4194"],
-                            "US": ["de90f38ced07c2e2f4df50b1f61d4194", "00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "default_pools": [
-                            "17b5962d775c646f3f9725cbc7a53df4",
-                            "9290f38c5d07c2e2f4df57b1f61d4196",
-                            "00920f38ce07c2e2f4df50b1f61d4194",
-                        ],
-                        "fallback_pool": {},
+                        "fallback_pool": "fallback_pool",
                         "location_strategy": {
                             "mode": "resolver_ip",
                             "prefer_ecs": "always",
@@ -880,65 +592,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
                     },
                     "priority": 0,
                     "terminates": True,
-                },
-                {
-                    "condition": 'http.request.uri.path contains "/testing"',
-                    "disabled": True,
-                    "fixed_response": {
-                        "content_type": "application/json",
-                        "location": "www.example.com",
-                        "message_body": "Testing Hello",
-                        "status_code": 0,
-                    },
-                    "name": "route the path /testing to testing datacenter.",
-                    "overrides": {
-                        "adaptive_routing": {"failover_across_pools": True},
-                        "country_pools": {
-                            "GB": ["abd90f38ced07c2e2f4df50b1f61d4194"],
-                            "US": ["de90f38ced07c2e2f4df50b1f61d4194", "00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "default_pools": [
-                            "17b5962d775c646f3f9725cbc7a53df4",
-                            "9290f38c5d07c2e2f4df57b1f61d4196",
-                            "00920f38ce07c2e2f4df50b1f61d4194",
-                        ],
-                        "fallback_pool": {},
-                        "location_strategy": {
-                            "mode": "resolver_ip",
-                            "prefer_ecs": "always",
-                        },
-                        "pop_pools": {
-                            "LAX": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                            "LHR": ["abd90f38ced07c2e2f4df50b1f61d4194", "f9138c5d07c2e2f4df57b1f61d4196"],
-                            "SJC": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "random_steering": {
-                            "default_weight": 0.2,
-                            "pool_weights": {
-                                "9290f38c5d07c2e2f4df57b1f61d4196": 0.5,
-                                "de90f38ced07c2e2f4df50b1f61d4194": 0.3,
-                            },
-                        },
-                        "region_pools": {
-                            "ENAM": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                            "WNAM": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                        },
-                        "session_affinity": "cookie",
-                        "session_affinity_attributes": {
-                            "drain_duration": 100,
-                            "headers": ["x"],
-                            "require_all_headers": True,
-                            "samesite": "Auto",
-                            "secure": "Auto",
-                            "zero_downtime_failover": "sticky",
-                        },
-                        "session_affinity_ttl": 1800,
-                        "steering_policy": "dynamic_latency",
-                        "ttl": 30,
-                    },
-                    "priority": 0,
-                    "terminates": True,
-                },
+                }
             ],
             session_affinity="cookie",
             session_affinity_attributes={
@@ -1045,7 +699,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncLoadBalancers:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -1056,7 +712,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
                 "9290f38c5d07c2e2f4df57b1f61d4196",
                 "00920f38ce07c2e2f4df50b1f61d4194",
             ],
-            fallback_pool={},
+            fallback_pool="fallback_pool",
             name="www.example.com",
         )
         assert_matches_type(LoadBalancer, load_balancer, path=["response"])
@@ -1070,152 +726,37 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                 "9290f38c5d07c2e2f4df57b1f61d4196",
                 "00920f38ce07c2e2f4df50b1f61d4194",
             ],
-            fallback_pool={},
+            fallback_pool="fallback_pool",
             name="www.example.com",
             adaptive_routing={"failover_across_pools": True},
             country_pools={
-                "GB": ["abd90f38ced07c2e2f4df50b1f61d4194"],
-                "US": ["de90f38ced07c2e2f4df50b1f61d4194", "00920f38ce07c2e2f4df50b1f61d4194"],
-            },
-            description="Load Balancer for www.example.com",
-            location_strategy={
-                "mode": "resolver_ip",
-                "prefer_ecs": "always",
-            },
-            pop_pools={
-                "LAX": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                "LHR": ["abd90f38ced07c2e2f4df50b1f61d4194", "f9138c5d07c2e2f4df57b1f61d4196"],
-                "SJC": ["00920f38ce07c2e2f4df50b1f61d4194"],
-            },
-            proxied=True,
-            random_steering={
-                "default_weight": 0.2,
-                "pool_weights": {
-                    "9290f38c5d07c2e2f4df57b1f61d4196": 0.5,
-                    "de90f38ced07c2e2f4df50b1f61d4194": 0.3,
-                },
-            },
-            region_pools={
-                "ENAM": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                "WNAM": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-            },
-            rules=[
-                {
-                    "condition": 'http.request.uri.path contains "/testing"',
-                    "disabled": True,
-                    "fixed_response": {
-                        "content_type": "application/json",
-                        "location": "www.example.com",
-                        "message_body": "Testing Hello",
-                        "status_code": 0,
-                    },
-                    "name": "route the path /testing to testing datacenter.",
-                    "overrides": {
-                        "adaptive_routing": {"failover_across_pools": True},
-                        "country_pools": {
-                            "GB": ["abd90f38ced07c2e2f4df50b1f61d4194"],
-                            "US": ["de90f38ced07c2e2f4df50b1f61d4194", "00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "default_pools": [
-                            "17b5962d775c646f3f9725cbc7a53df4",
-                            "9290f38c5d07c2e2f4df57b1f61d4196",
-                            "00920f38ce07c2e2f4df50b1f61d4194",
-                        ],
-                        "fallback_pool": {},
-                        "location_strategy": {
-                            "mode": "resolver_ip",
-                            "prefer_ecs": "always",
-                        },
-                        "pop_pools": {
-                            "LAX": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                            "LHR": ["abd90f38ced07c2e2f4df50b1f61d4194", "f9138c5d07c2e2f4df57b1f61d4196"],
-                            "SJC": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "random_steering": {
-                            "default_weight": 0.2,
-                            "pool_weights": {
-                                "9290f38c5d07c2e2f4df57b1f61d4196": 0.5,
-                                "de90f38ced07c2e2f4df50b1f61d4194": 0.3,
-                            },
-                        },
-                        "region_pools": {
-                            "ENAM": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                            "WNAM": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                        },
-                        "session_affinity": "cookie",
-                        "session_affinity_attributes": {
-                            "drain_duration": 100,
-                            "headers": ["x"],
-                            "require_all_headers": True,
-                            "samesite": "Auto",
-                            "secure": "Auto",
-                            "zero_downtime_failover": "sticky",
-                        },
-                        "session_affinity_ttl": 1800,
-                        "steering_policy": "dynamic_latency",
-                        "ttl": 30,
-                    },
-                    "priority": 0,
-                    "terminates": True,
-                },
-                {
-                    "condition": 'http.request.uri.path contains "/testing"',
-                    "disabled": True,
-                    "fixed_response": {
-                        "content_type": "application/json",
-                        "location": "www.example.com",
-                        "message_body": "Testing Hello",
-                        "status_code": 0,
-                    },
-                    "name": "route the path /testing to testing datacenter.",
-                    "overrides": {
-                        "adaptive_routing": {"failover_across_pools": True},
-                        "country_pools": {
-                            "GB": ["abd90f38ced07c2e2f4df50b1f61d4194"],
-                            "US": ["de90f38ced07c2e2f4df50b1f61d4194", "00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "default_pools": [
-                            "17b5962d775c646f3f9725cbc7a53df4",
-                            "9290f38c5d07c2e2f4df57b1f61d4196",
-                            "00920f38ce07c2e2f4df50b1f61d4194",
-                        ],
-                        "fallback_pool": {},
-                        "location_strategy": {
-                            "mode": "resolver_ip",
-                            "prefer_ecs": "always",
-                        },
-                        "pop_pools": {
-                            "LAX": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                            "LHR": ["abd90f38ced07c2e2f4df50b1f61d4194", "f9138c5d07c2e2f4df57b1f61d4196"],
-                            "SJC": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "random_steering": {
-                            "default_weight": 0.2,
-                            "pool_weights": {
-                                "9290f38c5d07c2e2f4df57b1f61d4196": 0.5,
-                                "de90f38ced07c2e2f4df50b1f61d4194": 0.3,
-                            },
-                        },
-                        "region_pools": {
-                            "ENAM": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                            "WNAM": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                        },
-                        "session_affinity": "cookie",
-                        "session_affinity_attributes": {
-                            "drain_duration": 100,
-                            "headers": ["x"],
-                            "require_all_headers": True,
-                            "samesite": "Auto",
-                            "secure": "Auto",
-                            "zero_downtime_failover": "sticky",
-                        },
-                        "session_affinity_ttl": 1800,
-                        "steering_policy": "dynamic_latency",
-                        "ttl": 30,
-                    },
-                    "priority": 0,
-                    "terminates": True,
+                "GB": ["abd90f38ced07c2e2f4df50b1f61d4194"],
+                "US": ["de90f38ced07c2e2f4df50b1f61d4194", "00920f38ce07c2e2f4df50b1f61d4194"],
+            },
+            description="Load Balancer for www.example.com",
+            location_strategy={
+                "mode": "resolver_ip",
+                "prefer_ecs": "always",
+            },
+            networks=["string"],
+            pop_pools={
+                "LAX": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
+                "LHR": ["abd90f38ced07c2e2f4df50b1f61d4194", "f9138c5d07c2e2f4df57b1f61d4196"],
+                "SJC": ["00920f38ce07c2e2f4df50b1f61d4194"],
+            },
+            proxied=True,
+            random_steering={
+                "default_weight": 0.2,
+                "pool_weights": {
+                    "9290f38c5d07c2e2f4df57b1f61d4196": 0.5,
+                    "de90f38ced07c2e2f4df50b1f61d4194": 0.3,
                 },
+            },
+            region_pools={
+                "ENAM": ["00920f38ce07c2e2f4df50b1f61d4194"],
+                "WNAM": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
+            },
+            rules=[
                 {
                     "condition": 'http.request.uri.path contains "/testing"',
                     "disabled": True,
@@ -1237,7 +778,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                             "9290f38c5d07c2e2f4df57b1f61d4196",
                             "00920f38ce07c2e2f4df50b1f61d4194",
                         ],
-                        "fallback_pool": {},
+                        "fallback_pool": "fallback_pool",
                         "location_strategy": {
                             "mode": "resolver_ip",
                             "prefer_ecs": "always",
@@ -1273,7 +814,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                     },
                     "priority": 0,
                     "terminates": True,
-                },
+                }
             ],
             session_affinity="cookie",
             session_affinity_attributes={
@@ -1299,7 +840,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
                 "9290f38c5d07c2e2f4df57b1f61d4196",
                 "00920f38ce07c2e2f4df50b1f61d4194",
             ],
-            fallback_pool={},
+            fallback_pool="fallback_pool",
             name="www.example.com",
         )
 
@@ -1317,7 +858,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
                 "9290f38c5d07c2e2f4df57b1f61d4196",
                 "00920f38ce07c2e2f4df50b1f61d4194",
             ],
-            fallback_pool={},
+            fallback_pool="fallback_pool",
             name="www.example.com",
         ) as response:
             assert not response.is_closed
@@ -1338,7 +879,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
                     "9290f38c5d07c2e2f4df57b1f61d4196",
                     "00920f38ce07c2e2f4df50b1f61d4194",
                 ],
-                fallback_pool={},
+                fallback_pool="fallback_pool",
                 name="www.example.com",
             )
 
@@ -1352,7 +893,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
                 "9290f38c5d07c2e2f4df57b1f61d4196",
                 "00920f38ce07c2e2f4df50b1f61d4194",
             ],
-            fallback_pool={},
+            fallback_pool="fallback_pool",
             name="www.example.com",
         )
         assert_matches_type(LoadBalancer, load_balancer, path=["response"])
@@ -1367,7 +908,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                 "9290f38c5d07c2e2f4df57b1f61d4196",
                 "00920f38ce07c2e2f4df50b1f61d4194",
             ],
-            fallback_pool={},
+            fallback_pool="fallback_pool",
             name="www.example.com",
             adaptive_routing={"failover_across_pools": True},
             country_pools={
@@ -1380,6 +921,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                 "mode": "resolver_ip",
                 "prefer_ecs": "always",
             },
+            networks=["string"],
             pop_pools={
                 "LAX": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
                 "LHR": ["abd90f38ced07c2e2f4df50b1f61d4194", "f9138c5d07c2e2f4df57b1f61d4196"],
@@ -1419,123 +961,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                             "9290f38c5d07c2e2f4df57b1f61d4196",
                             "00920f38ce07c2e2f4df50b1f61d4194",
                         ],
-                        "fallback_pool": {},
-                        "location_strategy": {
-                            "mode": "resolver_ip",
-                            "prefer_ecs": "always",
-                        },
-                        "pop_pools": {
-                            "LAX": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                            "LHR": ["abd90f38ced07c2e2f4df50b1f61d4194", "f9138c5d07c2e2f4df57b1f61d4196"],
-                            "SJC": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "random_steering": {
-                            "default_weight": 0.2,
-                            "pool_weights": {
-                                "9290f38c5d07c2e2f4df57b1f61d4196": 0.5,
-                                "de90f38ced07c2e2f4df50b1f61d4194": 0.3,
-                            },
-                        },
-                        "region_pools": {
-                            "ENAM": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                            "WNAM": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                        },
-                        "session_affinity": "cookie",
-                        "session_affinity_attributes": {
-                            "drain_duration": 100,
-                            "headers": ["x"],
-                            "require_all_headers": True,
-                            "samesite": "Auto",
-                            "secure": "Auto",
-                            "zero_downtime_failover": "sticky",
-                        },
-                        "session_affinity_ttl": 1800,
-                        "steering_policy": "dynamic_latency",
-                        "ttl": 30,
-                    },
-                    "priority": 0,
-                    "terminates": True,
-                },
-                {
-                    "condition": 'http.request.uri.path contains "/testing"',
-                    "disabled": True,
-                    "fixed_response": {
-                        "content_type": "application/json",
-                        "location": "www.example.com",
-                        "message_body": "Testing Hello",
-                        "status_code": 0,
-                    },
-                    "name": "route the path /testing to testing datacenter.",
-                    "overrides": {
-                        "adaptive_routing": {"failover_across_pools": True},
-                        "country_pools": {
-                            "GB": ["abd90f38ced07c2e2f4df50b1f61d4194"],
-                            "US": ["de90f38ced07c2e2f4df50b1f61d4194", "00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "default_pools": [
-                            "17b5962d775c646f3f9725cbc7a53df4",
-                            "9290f38c5d07c2e2f4df57b1f61d4196",
-                            "00920f38ce07c2e2f4df50b1f61d4194",
-                        ],
-                        "fallback_pool": {},
-                        "location_strategy": {
-                            "mode": "resolver_ip",
-                            "prefer_ecs": "always",
-                        },
-                        "pop_pools": {
-                            "LAX": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                            "LHR": ["abd90f38ced07c2e2f4df50b1f61d4194", "f9138c5d07c2e2f4df57b1f61d4196"],
-                            "SJC": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "random_steering": {
-                            "default_weight": 0.2,
-                            "pool_weights": {
-                                "9290f38c5d07c2e2f4df57b1f61d4196": 0.5,
-                                "de90f38ced07c2e2f4df50b1f61d4194": 0.3,
-                            },
-                        },
-                        "region_pools": {
-                            "ENAM": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                            "WNAM": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                        },
-                        "session_affinity": "cookie",
-                        "session_affinity_attributes": {
-                            "drain_duration": 100,
-                            "headers": ["x"],
-                            "require_all_headers": True,
-                            "samesite": "Auto",
-                            "secure": "Auto",
-                            "zero_downtime_failover": "sticky",
-                        },
-                        "session_affinity_ttl": 1800,
-                        "steering_policy": "dynamic_latency",
-                        "ttl": 30,
-                    },
-                    "priority": 0,
-                    "terminates": True,
-                },
-                {
-                    "condition": 'http.request.uri.path contains "/testing"',
-                    "disabled": True,
-                    "fixed_response": {
-                        "content_type": "application/json",
-                        "location": "www.example.com",
-                        "message_body": "Testing Hello",
-                        "status_code": 0,
-                    },
-                    "name": "route the path /testing to testing datacenter.",
-                    "overrides": {
-                        "adaptive_routing": {"failover_across_pools": True},
-                        "country_pools": {
-                            "GB": ["abd90f38ced07c2e2f4df50b1f61d4194"],
-                            "US": ["de90f38ced07c2e2f4df50b1f61d4194", "00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "default_pools": [
-                            "17b5962d775c646f3f9725cbc7a53df4",
-                            "9290f38c5d07c2e2f4df57b1f61d4196",
-                            "00920f38ce07c2e2f4df50b1f61d4194",
-                        ],
-                        "fallback_pool": {},
+                        "fallback_pool": "fallback_pool",
                         "location_strategy": {
                             "mode": "resolver_ip",
                             "prefer_ecs": "always",
@@ -1571,7 +997,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                     },
                     "priority": 0,
                     "terminates": True,
-                },
+                }
             ],
             session_affinity="cookie",
             session_affinity_attributes={
@@ -1598,7 +1024,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
                 "9290f38c5d07c2e2f4df57b1f61d4196",
                 "00920f38ce07c2e2f4df50b1f61d4194",
             ],
-            fallback_pool={},
+            fallback_pool="fallback_pool",
             name="www.example.com",
         )
 
@@ -1617,7 +1043,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
                 "9290f38c5d07c2e2f4df57b1f61d4196",
                 "00920f38ce07c2e2f4df50b1f61d4194",
             ],
-            fallback_pool={},
+            fallback_pool="fallback_pool",
             name="www.example.com",
         ) as response:
             assert not response.is_closed
@@ -1639,7 +1065,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                     "9290f38c5d07c2e2f4df57b1f61d4196",
                     "00920f38ce07c2e2f4df50b1f61d4194",
                 ],
-                fallback_pool={},
+                fallback_pool="fallback_pool",
                 name="www.example.com",
             )
 
@@ -1652,7 +1078,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                     "9290f38c5d07c2e2f4df57b1f61d4196",
                     "00920f38ce07c2e2f4df50b1f61d4194",
                 ],
-                fallback_pool={},
+                fallback_pool="fallback_pool",
                 name="www.example.com",
             )
 
@@ -1767,7 +1193,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
             ],
             description="Load Balancer for www.example.com",
             enabled=True,
-            fallback_pool={},
+            fallback_pool="fallback_pool",
             location_strategy={
                 "mode": "resolver_ip",
                 "prefer_ecs": "always",
@@ -1812,123 +1238,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
                             "9290f38c5d07c2e2f4df57b1f61d4196",
                             "00920f38ce07c2e2f4df50b1f61d4194",
                         ],
-                        "fallback_pool": {},
-                        "location_strategy": {
-                            "mode": "resolver_ip",
-                            "prefer_ecs": "always",
-                        },
-                        "pop_pools": {
-                            "LAX": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                            "LHR": ["abd90f38ced07c2e2f4df50b1f61d4194", "f9138c5d07c2e2f4df57b1f61d4196"],
-                            "SJC": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "random_steering": {
-                            "default_weight": 0.2,
-                            "pool_weights": {
-                                "9290f38c5d07c2e2f4df57b1f61d4196": 0.5,
-                                "de90f38ced07c2e2f4df50b1f61d4194": 0.3,
-                            },
-                        },
-                        "region_pools": {
-                            "ENAM": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                            "WNAM": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                        },
-                        "session_affinity": "cookie",
-                        "session_affinity_attributes": {
-                            "drain_duration": 100,
-                            "headers": ["x"],
-                            "require_all_headers": True,
-                            "samesite": "Auto",
-                            "secure": "Auto",
-                            "zero_downtime_failover": "sticky",
-                        },
-                        "session_affinity_ttl": 1800,
-                        "steering_policy": "dynamic_latency",
-                        "ttl": 30,
-                    },
-                    "priority": 0,
-                    "terminates": True,
-                },
-                {
-                    "condition": 'http.request.uri.path contains "/testing"',
-                    "disabled": True,
-                    "fixed_response": {
-                        "content_type": "application/json",
-                        "location": "www.example.com",
-                        "message_body": "Testing Hello",
-                        "status_code": 0,
-                    },
-                    "name": "route the path /testing to testing datacenter.",
-                    "overrides": {
-                        "adaptive_routing": {"failover_across_pools": True},
-                        "country_pools": {
-                            "GB": ["abd90f38ced07c2e2f4df50b1f61d4194"],
-                            "US": ["de90f38ced07c2e2f4df50b1f61d4194", "00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "default_pools": [
-                            "17b5962d775c646f3f9725cbc7a53df4",
-                            "9290f38c5d07c2e2f4df57b1f61d4196",
-                            "00920f38ce07c2e2f4df50b1f61d4194",
-                        ],
-                        "fallback_pool": {},
-                        "location_strategy": {
-                            "mode": "resolver_ip",
-                            "prefer_ecs": "always",
-                        },
-                        "pop_pools": {
-                            "LAX": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                            "LHR": ["abd90f38ced07c2e2f4df50b1f61d4194", "f9138c5d07c2e2f4df57b1f61d4196"],
-                            "SJC": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "random_steering": {
-                            "default_weight": 0.2,
-                            "pool_weights": {
-                                "9290f38c5d07c2e2f4df57b1f61d4196": 0.5,
-                                "de90f38ced07c2e2f4df50b1f61d4194": 0.3,
-                            },
-                        },
-                        "region_pools": {
-                            "ENAM": ["00920f38ce07c2e2f4df50b1f61d4194"],
-                            "WNAM": ["de90f38ced07c2e2f4df50b1f61d4194", "9290f38c5d07c2e2f4df57b1f61d4196"],
-                        },
-                        "session_affinity": "cookie",
-                        "session_affinity_attributes": {
-                            "drain_duration": 100,
-                            "headers": ["x"],
-                            "require_all_headers": True,
-                            "samesite": "Auto",
-                            "secure": "Auto",
-                            "zero_downtime_failover": "sticky",
-                        },
-                        "session_affinity_ttl": 1800,
-                        "steering_policy": "dynamic_latency",
-                        "ttl": 30,
-                    },
-                    "priority": 0,
-                    "terminates": True,
-                },
-                {
-                    "condition": 'http.request.uri.path contains "/testing"',
-                    "disabled": True,
-                    "fixed_response": {
-                        "content_type": "application/json",
-                        "location": "www.example.com",
-                        "message_body": "Testing Hello",
-                        "status_code": 0,
-                    },
-                    "name": "route the path /testing to testing datacenter.",
-                    "overrides": {
-                        "adaptive_routing": {"failover_across_pools": True},
-                        "country_pools": {
-                            "GB": ["abd90f38ced07c2e2f4df50b1f61d4194"],
-                            "US": ["de90f38ced07c2e2f4df50b1f61d4194", "00920f38ce07c2e2f4df50b1f61d4194"],
-                        },
-                        "default_pools": [
-                            "17b5962d775c646f3f9725cbc7a53df4",
-                            "9290f38c5d07c2e2f4df57b1f61d4196",
-                            "00920f38ce07c2e2f4df50b1f61d4194",
-                        ],
-                        "fallback_pool": {},
+                        "fallback_pool": "fallback_pool",
                         "location_strategy": {
                             "mode": "resolver_ip",
                             "prefer_ecs": "always",
@@ -1964,7 +1274,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
                     },
                     "priority": 0,
                     "terminates": True,
-                },
+                }
             ],
             session_affinity="cookie",
             session_affinity_attributes={
diff --git a/tests/api_resources/test_managed_headers.py b/tests/api_resources/test_managed_headers.py
deleted file mode 100644
index 0d994140e6c..00000000000
--- a/tests/api_resources/test_managed_headers.py
+++ /dev/null
@@ -1,193 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.managed_headers import (
-    ManagedHeaderEditResponse,
-    ManagedHeaderListResponse,
-)
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestManagedHeaders:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        managed_header = client.managed_headers.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(ManagedHeaderListResponse, managed_header, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.managed_headers.with_raw_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        managed_header = response.parse()
-        assert_matches_type(ManagedHeaderListResponse, managed_header, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.managed_headers.with_streaming_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            managed_header = response.parse()
-            assert_matches_type(ManagedHeaderListResponse, managed_header, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.managed_headers.with_raw_response.list(
-                zone_id="",
-            )
-
-    @parametrize
-    def test_method_edit(self, client: Cloudflare) -> None:
-        managed_header = client.managed_headers.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            managed_request_headers=[{}, {}, {}],
-            managed_response_headers=[{}, {}, {}],
-        )
-        assert_matches_type(ManagedHeaderEditResponse, managed_header, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit(self, client: Cloudflare) -> None:
-        response = client.managed_headers.with_raw_response.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            managed_request_headers=[{}, {}, {}],
-            managed_response_headers=[{}, {}, {}],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        managed_header = response.parse()
-        assert_matches_type(ManagedHeaderEditResponse, managed_header, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit(self, client: Cloudflare) -> None:
-        with client.managed_headers.with_streaming_response.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            managed_request_headers=[{}, {}, {}],
-            managed_response_headers=[{}, {}, {}],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            managed_header = response.parse()
-            assert_matches_type(ManagedHeaderEditResponse, managed_header, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.managed_headers.with_raw_response.edit(
-                zone_id="",
-                managed_request_headers=[{}, {}, {}],
-                managed_response_headers=[{}, {}, {}],
-            )
-
-
-class TestAsyncManagedHeaders:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        managed_header = await async_client.managed_headers.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(ManagedHeaderListResponse, managed_header, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.managed_headers.with_raw_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        managed_header = await response.parse()
-        assert_matches_type(ManagedHeaderListResponse, managed_header, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.managed_headers.with_streaming_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            managed_header = await response.parse()
-            assert_matches_type(ManagedHeaderListResponse, managed_header, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.managed_headers.with_raw_response.list(
-                zone_id="",
-            )
-
-    @parametrize
-    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
-        managed_header = await async_client.managed_headers.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            managed_request_headers=[{}, {}, {}],
-            managed_response_headers=[{}, {}, {}],
-        )
-        assert_matches_type(ManagedHeaderEditResponse, managed_header, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.managed_headers.with_raw_response.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            managed_request_headers=[{}, {}, {}],
-            managed_response_headers=[{}, {}, {}],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        managed_header = await response.parse()
-        assert_matches_type(ManagedHeaderEditResponse, managed_header, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.managed_headers.with_streaming_response.edit(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            managed_request_headers=[{}, {}, {}],
-            managed_response_headers=[{}, {}, {}],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            managed_header = await response.parse()
-            assert_matches_type(ManagedHeaderEditResponse, managed_header, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.managed_headers.with_raw_response.edit(
-                zone_id="",
-                managed_request_headers=[{}, {}, {}],
-                managed_response_headers=[{}, {}, {}],
-            )
diff --git a/tests/api_resources/test_managed_transforms.py b/tests/api_resources/test_managed_transforms.py
new file mode 100644
index 00000000000..d2e91bfbb4f
--- /dev/null
+++ b/tests/api_resources/test_managed_transforms.py
@@ -0,0 +1,375 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.managed_transforms import (
+    ManagedTransformEditResponse,
+    ManagedTransformListResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestManagedTransforms:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        managed_transform = client.managed_transforms.list(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        )
+        assert_matches_type(ManagedTransformListResponse, managed_transform, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.managed_transforms.with_raw_response.list(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        managed_transform = response.parse()
+        assert_matches_type(ManagedTransformListResponse, managed_transform, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.managed_transforms.with_streaming_response.list(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            managed_transform = response.parse()
+            assert_matches_type(ManagedTransformListResponse, managed_transform, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.managed_transforms.with_raw_response.list(
+                zone_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        managed_transform = client.managed_transforms.delete(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        )
+        assert managed_transform is None
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.managed_transforms.with_raw_response.delete(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        managed_transform = response.parse()
+        assert managed_transform is None
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.managed_transforms.with_streaming_response.delete(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            managed_transform = response.parse()
+            assert managed_transform is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.managed_transforms.with_raw_response.delete(
+                zone_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        managed_transform = client.managed_transforms.edit(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            managed_request_headers=[
+                {
+                    "id": "add_bot_protection_headers",
+                    "enabled": True,
+                }
+            ],
+            managed_response_headers=[
+                {
+                    "id": "add_security_headers",
+                    "enabled": True,
+                }
+            ],
+        )
+        assert_matches_type(ManagedTransformEditResponse, managed_transform, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.managed_transforms.with_raw_response.edit(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            managed_request_headers=[
+                {
+                    "id": "add_bot_protection_headers",
+                    "enabled": True,
+                }
+            ],
+            managed_response_headers=[
+                {
+                    "id": "add_security_headers",
+                    "enabled": True,
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        managed_transform = response.parse()
+        assert_matches_type(ManagedTransformEditResponse, managed_transform, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.managed_transforms.with_streaming_response.edit(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            managed_request_headers=[
+                {
+                    "id": "add_bot_protection_headers",
+                    "enabled": True,
+                }
+            ],
+            managed_response_headers=[
+                {
+                    "id": "add_security_headers",
+                    "enabled": True,
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            managed_transform = response.parse()
+            assert_matches_type(ManagedTransformEditResponse, managed_transform, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.managed_transforms.with_raw_response.edit(
+                zone_id="",
+                managed_request_headers=[
+                    {
+                        "id": "add_bot_protection_headers",
+                        "enabled": True,
+                    }
+                ],
+                managed_response_headers=[
+                    {
+                        "id": "add_security_headers",
+                        "enabled": True,
+                    }
+                ],
+            )
+
+
+class TestAsyncManagedTransforms:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        managed_transform = await async_client.managed_transforms.list(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        )
+        assert_matches_type(ManagedTransformListResponse, managed_transform, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.managed_transforms.with_raw_response.list(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        managed_transform = await response.parse()
+        assert_matches_type(ManagedTransformListResponse, managed_transform, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.managed_transforms.with_streaming_response.list(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            managed_transform = await response.parse()
+            assert_matches_type(ManagedTransformListResponse, managed_transform, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.managed_transforms.with_raw_response.list(
+                zone_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        managed_transform = await async_client.managed_transforms.delete(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        )
+        assert managed_transform is None
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.managed_transforms.with_raw_response.delete(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        managed_transform = await response.parse()
+        assert managed_transform is None
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.managed_transforms.with_streaming_response.delete(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            managed_transform = await response.parse()
+            assert managed_transform is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.managed_transforms.with_raw_response.delete(
+                zone_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        managed_transform = await async_client.managed_transforms.edit(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            managed_request_headers=[
+                {
+                    "id": "add_bot_protection_headers",
+                    "enabled": True,
+                }
+            ],
+            managed_response_headers=[
+                {
+                    "id": "add_security_headers",
+                    "enabled": True,
+                }
+            ],
+        )
+        assert_matches_type(ManagedTransformEditResponse, managed_transform, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.managed_transforms.with_raw_response.edit(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            managed_request_headers=[
+                {
+                    "id": "add_bot_protection_headers",
+                    "enabled": True,
+                }
+            ],
+            managed_response_headers=[
+                {
+                    "id": "add_security_headers",
+                    "enabled": True,
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        managed_transform = await response.parse()
+        assert_matches_type(ManagedTransformEditResponse, managed_transform, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.managed_transforms.with_streaming_response.edit(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            managed_request_headers=[
+                {
+                    "id": "add_bot_protection_headers",
+                    "enabled": True,
+                }
+            ],
+            managed_response_headers=[
+                {
+                    "id": "add_security_headers",
+                    "enabled": True,
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            managed_transform = await response.parse()
+            assert_matches_type(ManagedTransformEditResponse, managed_transform, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.managed_transforms.with_raw_response.edit(
+                zone_id="",
+                managed_request_headers=[
+                    {
+                        "id": "add_bot_protection_headers",
+                        "enabled": True,
+                    }
+                ],
+                managed_response_headers=[
+                    {
+                        "id": "add_security_headers",
+                        "enabled": True,
+                    }
+                ],
+            )
diff --git a/tests/api_resources/test_memberships.py b/tests/api_resources/test_memberships.py
index 7d30c588011..19fe2ee97a7 100644
--- a/tests/api_resources/test_memberships.py
+++ b/tests/api_resources/test_memberships.py
@@ -181,7 +181,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncMemberships:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/test_mtls_certificates.py b/tests/api_resources/test_mtls_certificates.py
index 666b1c3c621..e5ad0553d13 100644
--- a/tests/api_resources/test_mtls_certificates.py
+++ b/tests/api_resources/test_mtls_certificates.py
@@ -214,7 +214,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncMTLSCertificates:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/test_organizations.py b/tests/api_resources/test_organizations.py
new file mode 100644
index 00000000000..87bb8010726
--- /dev/null
+++ b/tests/api_resources/test_organizations.py
@@ -0,0 +1,478 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.organizations import (
+    Organization,
+    OrganizationDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestOrganizations:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        organization = client.organizations.create(
+            name="name",
+        )
+        assert_matches_type(Organization, organization, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        organization = client.organizations.create(
+            name="name",
+            parent={"id": "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8"},
+            profile={
+                "business_address": "business_address",
+                "business_email": "business_email",
+                "business_name": "business_name",
+                "business_phone": "business_phone",
+                "external_metadata": "external_metadata",
+            },
+        )
+        assert_matches_type(Organization, organization, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.organizations.with_raw_response.create(
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        organization = response.parse()
+        assert_matches_type(Organization, organization, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.organizations.with_streaming_response.create(
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            organization = response.parse()
+            assert_matches_type(Organization, organization, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        organization = client.organizations.update(
+            organization_id="a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+            name="name",
+        )
+        assert_matches_type(Organization, organization, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        organization = client.organizations.update(
+            organization_id="a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+            name="name",
+            parent={"id": "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8"},
+            profile={
+                "business_address": "business_address",
+                "business_email": "business_email",
+                "business_name": "business_name",
+                "business_phone": "business_phone",
+                "external_metadata": "external_metadata",
+            },
+        )
+        assert_matches_type(Organization, organization, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.organizations.with_raw_response.update(
+            organization_id="a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        organization = response.parse()
+        assert_matches_type(Organization, organization, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.organizations.with_streaming_response.update(
+            organization_id="a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            organization = response.parse()
+            assert_matches_type(Organization, organization, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `organization_id` but received ''"):
+            client.organizations.with_raw_response.update(
+                organization_id="",
+                name="name",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        organization = client.organizations.list()
+        assert_matches_type(SyncSinglePage[Organization], organization, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        organization = client.organizations.list(
+            id=["a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8"],
+            containing={
+                "account": "account",
+                "organization": "organization",
+                "user": "user",
+            },
+            name={
+                "contains": "contains",
+                "ends_with": "endsWith",
+                "starts_with": "startsWith",
+            },
+            page_size=0,
+            page_token="page_token",
+            parent={"id": "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8"},
+        )
+        assert_matches_type(SyncSinglePage[Organization], organization, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.organizations.with_raw_response.list()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        organization = response.parse()
+        assert_matches_type(SyncSinglePage[Organization], organization, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.organizations.with_streaming_response.list() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            organization = response.parse()
+            assert_matches_type(SyncSinglePage[Organization], organization, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        organization = client.organizations.delete(
+            "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+        )
+        assert_matches_type(OrganizationDeleteResponse, organization, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.organizations.with_raw_response.delete(
+            "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        organization = response.parse()
+        assert_matches_type(OrganizationDeleteResponse, organization, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.organizations.with_streaming_response.delete(
+            "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            organization = response.parse()
+            assert_matches_type(OrganizationDeleteResponse, organization, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `organization_id` but received ''"):
+            client.organizations.with_raw_response.delete(
+                "",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        organization = client.organizations.get(
+            "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+        )
+        assert_matches_type(Organization, organization, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.organizations.with_raw_response.get(
+            "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        organization = response.parse()
+        assert_matches_type(Organization, organization, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.organizations.with_streaming_response.get(
+            "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            organization = response.parse()
+            assert_matches_type(Organization, organization, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `organization_id` but received ''"):
+            client.organizations.with_raw_response.get(
+                "",
+            )
+
+
+class TestAsyncOrganizations:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        organization = await async_client.organizations.create(
+            name="name",
+        )
+        assert_matches_type(Organization, organization, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        organization = await async_client.organizations.create(
+            name="name",
+            parent={"id": "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8"},
+            profile={
+                "business_address": "business_address",
+                "business_email": "business_email",
+                "business_name": "business_name",
+                "business_phone": "business_phone",
+                "external_metadata": "external_metadata",
+            },
+        )
+        assert_matches_type(Organization, organization, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.organizations.with_raw_response.create(
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        organization = await response.parse()
+        assert_matches_type(Organization, organization, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.organizations.with_streaming_response.create(
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            organization = await response.parse()
+            assert_matches_type(Organization, organization, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        organization = await async_client.organizations.update(
+            organization_id="a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+            name="name",
+        )
+        assert_matches_type(Organization, organization, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        organization = await async_client.organizations.update(
+            organization_id="a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+            name="name",
+            parent={"id": "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8"},
+            profile={
+                "business_address": "business_address",
+                "business_email": "business_email",
+                "business_name": "business_name",
+                "business_phone": "business_phone",
+                "external_metadata": "external_metadata",
+            },
+        )
+        assert_matches_type(Organization, organization, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.organizations.with_raw_response.update(
+            organization_id="a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        organization = await response.parse()
+        assert_matches_type(Organization, organization, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.organizations.with_streaming_response.update(
+            organization_id="a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            organization = await response.parse()
+            assert_matches_type(Organization, organization, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `organization_id` but received ''"):
+            await async_client.organizations.with_raw_response.update(
+                organization_id="",
+                name="name",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        organization = await async_client.organizations.list()
+        assert_matches_type(AsyncSinglePage[Organization], organization, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        organization = await async_client.organizations.list(
+            id=["a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8"],
+            containing={
+                "account": "account",
+                "organization": "organization",
+                "user": "user",
+            },
+            name={
+                "contains": "contains",
+                "ends_with": "endsWith",
+                "starts_with": "startsWith",
+            },
+            page_size=0,
+            page_token="page_token",
+            parent={"id": "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8"},
+        )
+        assert_matches_type(AsyncSinglePage[Organization], organization, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.organizations.with_raw_response.list()
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        organization = await response.parse()
+        assert_matches_type(AsyncSinglePage[Organization], organization, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.organizations.with_streaming_response.list() as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            organization = await response.parse()
+            assert_matches_type(AsyncSinglePage[Organization], organization, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        organization = await async_client.organizations.delete(
+            "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+        )
+        assert_matches_type(OrganizationDeleteResponse, organization, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.organizations.with_raw_response.delete(
+            "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        organization = await response.parse()
+        assert_matches_type(OrganizationDeleteResponse, organization, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.organizations.with_streaming_response.delete(
+            "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            organization = await response.parse()
+            assert_matches_type(OrganizationDeleteResponse, organization, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `organization_id` but received ''"):
+            await async_client.organizations.with_raw_response.delete(
+                "",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        organization = await async_client.organizations.get(
+            "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+        )
+        assert_matches_type(Organization, organization, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.organizations.with_raw_response.get(
+            "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        organization = await response.parse()
+        assert_matches_type(Organization, organization, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.organizations.with_streaming_response.get(
+            "a7b9c3d2e8f4g1h5i6j0k9l2m3n7o4p8",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            organization = await response.parse()
+            assert_matches_type(Organization, organization, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `organization_id` but received ''"):
+            await async_client.organizations.with_raw_response.get(
+                "",
+            )
diff --git a/tests/api_resources/test_origin_ca_certificates.py b/tests/api_resources/test_origin_ca_certificates.py
index bd05350fd58..c882116fa32 100644
--- a/tests/api_resources/test_origin_ca_certificates.py
+++ b/tests/api_resources/test_origin_ca_certificates.py
@@ -9,11 +9,9 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.origin_ca_certificates import (
     OriginCACertificate,
-    OriginCACertificateGetResponse,
-    OriginCACertificateCreateResponse,
     OriginCACertificateDeleteResponse,
 )
 
@@ -23,11 +21,17 @@
 class TestOriginCACertificates:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
-        origin_ca_certificate = client.origin_ca_certificates.create()
-        assert_matches_type(Optional[OriginCACertificateCreateResponse], origin_ca_certificate, path=["response"])
+        origin_ca_certificate = client.origin_ca_certificates.create(
+            csr="-----BEGIN CERTIFICATE REQUEST-----\nMIICxzCCAa8CAQAwSDELMAkGA1UEBhMCVVMxFjAUBgNVBAgTDVNhbiBGcmFuY2lz\nY28xCzAJBgNVBAcTAkNBMRQwEgYDVQQDEwtleGFtcGxlLm5ldDCCASIwDQYJKoZI\nhvcNAQEBBQADggEPADCCAQoCggEBALxejtu4b+jPdFeFi6OUsye8TYJQBm3WfCvL\nHu5EvijMO/4Z2TImwASbwUF7Ir8OLgH+mGlQZeqyNvGoSOMEaZVXcYfpR1hlVak8\n4GGVr+04IGfOCqaBokaBFIwzclGZbzKmLGwIQioNxGfqFm6RGYGA3be2Je2iseBc\nN8GV1wYmvYE0RR+yWweJCTJ157exyRzu7sVxaEW9F87zBQLyOnwXc64rflXslRqi\ng7F7w5IaQYOl8yvmk/jEPCAha7fkiUfEpj4N12+oPRiMvleJF98chxjD4MH39c5I\nuOslULhrWunfh7GB1jwWNA9y44H0snrf+xvoy2TcHmxvma9Eln8CAwEAAaA6MDgG\nCSqGSIb3DQEJDjErMCkwJwYDVR0RBCAwHoILZXhhbXBsZS5uZXSCD3d3dy5leGFt\ncGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAcBaX6dOnI8ncARrI9ZSF2AJX+8mx\npTHY2+Y2C0VvrVDGMtbBRH8R9yMbqWtlxeeNGf//LeMkSKSFa4kbpdx226lfui8/\nauRDBTJGx2R1ccUxmLZXx4my0W5iIMxunu+kez+BDlu7bTT2io0uXMRHue4i6quH\nyc5ibxvbJMjR7dqbcanVE10/34oprzXQsJ/VmSuZNXtjbtSKDlmcpw6To/eeAJ+J\nhXykcUihvHyG4A1m2R6qpANBjnA0pHexfwM/SgfzvpbvUg0T1ubmer8BgTwCKIWs\ndcWYTthM51JIqRBfNqy4QcBnX+GY05yltEEswQI55wdiS3CjTTA67sdbcQ==\n-----END CERTIFICATE REQUEST-----",
+            hostnames=["example.com", "*.example.com"],
+            request_type="origin-rsa",
+        )
+        assert_matches_type(Optional[OriginCACertificate], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         origin_ca_certificate = client.origin_ca_certificates.create(
@@ -36,60 +40,87 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             request_type="origin-rsa",
             requested_validity=5475,
         )
-        assert_matches_type(Optional[OriginCACertificateCreateResponse], origin_ca_certificate, path=["response"])
+        assert_matches_type(Optional[OriginCACertificate], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.origin_ca_certificates.with_raw_response.create()
+        response = client.origin_ca_certificates.with_raw_response.create(
+            csr="-----BEGIN CERTIFICATE REQUEST-----\nMIICxzCCAa8CAQAwSDELMAkGA1UEBhMCVVMxFjAUBgNVBAgTDVNhbiBGcmFuY2lz\nY28xCzAJBgNVBAcTAkNBMRQwEgYDVQQDEwtleGFtcGxlLm5ldDCCASIwDQYJKoZI\nhvcNAQEBBQADggEPADCCAQoCggEBALxejtu4b+jPdFeFi6OUsye8TYJQBm3WfCvL\nHu5EvijMO/4Z2TImwASbwUF7Ir8OLgH+mGlQZeqyNvGoSOMEaZVXcYfpR1hlVak8\n4GGVr+04IGfOCqaBokaBFIwzclGZbzKmLGwIQioNxGfqFm6RGYGA3be2Je2iseBc\nN8GV1wYmvYE0RR+yWweJCTJ157exyRzu7sVxaEW9F87zBQLyOnwXc64rflXslRqi\ng7F7w5IaQYOl8yvmk/jEPCAha7fkiUfEpj4N12+oPRiMvleJF98chxjD4MH39c5I\nuOslULhrWunfh7GB1jwWNA9y44H0snrf+xvoy2TcHmxvma9Eln8CAwEAAaA6MDgG\nCSqGSIb3DQEJDjErMCkwJwYDVR0RBCAwHoILZXhhbXBsZS5uZXSCD3d3dy5leGFt\ncGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAcBaX6dOnI8ncARrI9ZSF2AJX+8mx\npTHY2+Y2C0VvrVDGMtbBRH8R9yMbqWtlxeeNGf//LeMkSKSFa4kbpdx226lfui8/\nauRDBTJGx2R1ccUxmLZXx4my0W5iIMxunu+kez+BDlu7bTT2io0uXMRHue4i6quH\nyc5ibxvbJMjR7dqbcanVE10/34oprzXQsJ/VmSuZNXtjbtSKDlmcpw6To/eeAJ+J\nhXykcUihvHyG4A1m2R6qpANBjnA0pHexfwM/SgfzvpbvUg0T1ubmer8BgTwCKIWs\ndcWYTthM51JIqRBfNqy4QcBnX+GY05yltEEswQI55wdiS3CjTTA67sdbcQ==\n-----END CERTIFICATE REQUEST-----",
+            hostnames=["example.com", "*.example.com"],
+            request_type="origin-rsa",
+        )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         origin_ca_certificate = response.parse()
-        assert_matches_type(Optional[OriginCACertificateCreateResponse], origin_ca_certificate, path=["response"])
+        assert_matches_type(Optional[OriginCACertificate], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.origin_ca_certificates.with_streaming_response.create() as response:
+        with client.origin_ca_certificates.with_streaming_response.create(
+            csr="-----BEGIN CERTIFICATE REQUEST-----\nMIICxzCCAa8CAQAwSDELMAkGA1UEBhMCVVMxFjAUBgNVBAgTDVNhbiBGcmFuY2lz\nY28xCzAJBgNVBAcTAkNBMRQwEgYDVQQDEwtleGFtcGxlLm5ldDCCASIwDQYJKoZI\nhvcNAQEBBQADggEPADCCAQoCggEBALxejtu4b+jPdFeFi6OUsye8TYJQBm3WfCvL\nHu5EvijMO/4Z2TImwASbwUF7Ir8OLgH+mGlQZeqyNvGoSOMEaZVXcYfpR1hlVak8\n4GGVr+04IGfOCqaBokaBFIwzclGZbzKmLGwIQioNxGfqFm6RGYGA3be2Je2iseBc\nN8GV1wYmvYE0RR+yWweJCTJ157exyRzu7sVxaEW9F87zBQLyOnwXc64rflXslRqi\ng7F7w5IaQYOl8yvmk/jEPCAha7fkiUfEpj4N12+oPRiMvleJF98chxjD4MH39c5I\nuOslULhrWunfh7GB1jwWNA9y44H0snrf+xvoy2TcHmxvma9Eln8CAwEAAaA6MDgG\nCSqGSIb3DQEJDjErMCkwJwYDVR0RBCAwHoILZXhhbXBsZS5uZXSCD3d3dy5leGFt\ncGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAcBaX6dOnI8ncARrI9ZSF2AJX+8mx\npTHY2+Y2C0VvrVDGMtbBRH8R9yMbqWtlxeeNGf//LeMkSKSFa4kbpdx226lfui8/\nauRDBTJGx2R1ccUxmLZXx4my0W5iIMxunu+kez+BDlu7bTT2io0uXMRHue4i6quH\nyc5ibxvbJMjR7dqbcanVE10/34oprzXQsJ/VmSuZNXtjbtSKDlmcpw6To/eeAJ+J\nhXykcUihvHyG4A1m2R6qpANBjnA0pHexfwM/SgfzvpbvUg0T1ubmer8BgTwCKIWs\ndcWYTthM51JIqRBfNqy4QcBnX+GY05yltEEswQI55wdiS3CjTTA67sdbcQ==\n-----END CERTIFICATE REQUEST-----",
+            hostnames=["example.com", "*.example.com"],
+            request_type="origin-rsa",
+        ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             origin_ca_certificate = response.parse()
-            assert_matches_type(Optional[OriginCACertificateCreateResponse], origin_ca_certificate, path=["response"])
+            assert_matches_type(Optional[OriginCACertificate], origin_ca_certificate, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
-        origin_ca_certificate = client.origin_ca_certificates.list()
-        assert_matches_type(SyncSinglePage[OriginCACertificate], origin_ca_certificate, path=["response"])
+        origin_ca_certificate = client.origin_ca_certificates.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[OriginCACertificate], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         origin_ca_certificate = client.origin_ca_certificates.list(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            limit=10,
+            offset=10,
+            page=1,
+            per_page=5,
         )
-        assert_matches_type(SyncSinglePage[OriginCACertificate], origin_ca_certificate, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[OriginCACertificate], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.origin_ca_certificates.with_raw_response.list()
+        response = client.origin_ca_certificates.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         origin_ca_certificate = response.parse()
-        assert_matches_type(SyncSinglePage[OriginCACertificate], origin_ca_certificate, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[OriginCACertificate], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.origin_ca_certificates.with_streaming_response.list() as response:
+        with client.origin_ca_certificates.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             origin_ca_certificate = response.parse()
-            assert_matches_type(SyncSinglePage[OriginCACertificate], origin_ca_certificate, path=["response"])
+            assert_matches_type(
+                SyncV4PagePaginationArray[OriginCACertificate], origin_ca_certificate, path=["response"]
+            )
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         origin_ca_certificate = client.origin_ca_certificates.delete(
@@ -97,6 +128,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
         )
         assert_matches_type(Optional[OriginCACertificateDeleteResponse], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.origin_ca_certificates.with_raw_response.delete(
@@ -108,6 +140,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         origin_ca_certificate = response.parse()
         assert_matches_type(Optional[OriginCACertificateDeleteResponse], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.origin_ca_certificates.with_streaming_response.delete(
@@ -121,6 +154,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
@@ -128,13 +162,15 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 "",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         origin_ca_certificate = client.origin_ca_certificates.get(
             "023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[OriginCACertificateGetResponse], origin_ca_certificate, path=["response"])
+        assert_matches_type(Optional[OriginCACertificate], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.origin_ca_certificates.with_raw_response.get(
@@ -144,8 +180,9 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         origin_ca_certificate = response.parse()
-        assert_matches_type(Optional[OriginCACertificateGetResponse], origin_ca_certificate, path=["response"])
+        assert_matches_type(Optional[OriginCACertificate], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.origin_ca_certificates.with_streaming_response.get(
@@ -155,10 +192,11 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             origin_ca_certificate = response.parse()
-            assert_matches_type(Optional[OriginCACertificateGetResponse], origin_ca_certificate, path=["response"])
+            assert_matches_type(Optional[OriginCACertificate], origin_ca_certificate, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
@@ -168,13 +206,21 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncOriginCACertificates:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        origin_ca_certificate = await async_client.origin_ca_certificates.create()
-        assert_matches_type(Optional[OriginCACertificateCreateResponse], origin_ca_certificate, path=["response"])
+        origin_ca_certificate = await async_client.origin_ca_certificates.create(
+            csr="-----BEGIN CERTIFICATE REQUEST-----\nMIICxzCCAa8CAQAwSDELMAkGA1UEBhMCVVMxFjAUBgNVBAgTDVNhbiBGcmFuY2lz\nY28xCzAJBgNVBAcTAkNBMRQwEgYDVQQDEwtleGFtcGxlLm5ldDCCASIwDQYJKoZI\nhvcNAQEBBQADggEPADCCAQoCggEBALxejtu4b+jPdFeFi6OUsye8TYJQBm3WfCvL\nHu5EvijMO/4Z2TImwASbwUF7Ir8OLgH+mGlQZeqyNvGoSOMEaZVXcYfpR1hlVak8\n4GGVr+04IGfOCqaBokaBFIwzclGZbzKmLGwIQioNxGfqFm6RGYGA3be2Je2iseBc\nN8GV1wYmvYE0RR+yWweJCTJ157exyRzu7sVxaEW9F87zBQLyOnwXc64rflXslRqi\ng7F7w5IaQYOl8yvmk/jEPCAha7fkiUfEpj4N12+oPRiMvleJF98chxjD4MH39c5I\nuOslULhrWunfh7GB1jwWNA9y44H0snrf+xvoy2TcHmxvma9Eln8CAwEAAaA6MDgG\nCSqGSIb3DQEJDjErMCkwJwYDVR0RBCAwHoILZXhhbXBsZS5uZXSCD3d3dy5leGFt\ncGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAcBaX6dOnI8ncARrI9ZSF2AJX+8mx\npTHY2+Y2C0VvrVDGMtbBRH8R9yMbqWtlxeeNGf//LeMkSKSFa4kbpdx226lfui8/\nauRDBTJGx2R1ccUxmLZXx4my0W5iIMxunu+kez+BDlu7bTT2io0uXMRHue4i6quH\nyc5ibxvbJMjR7dqbcanVE10/34oprzXQsJ/VmSuZNXtjbtSKDlmcpw6To/eeAJ+J\nhXykcUihvHyG4A1m2R6qpANBjnA0pHexfwM/SgfzvpbvUg0T1ubmer8BgTwCKIWs\ndcWYTthM51JIqRBfNqy4QcBnX+GY05yltEEswQI55wdiS3CjTTA67sdbcQ==\n-----END CERTIFICATE REQUEST-----",
+            hostnames=["example.com", "*.example.com"],
+            request_type="origin-rsa",
+        )
+        assert_matches_type(Optional[OriginCACertificate], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         origin_ca_certificate = await async_client.origin_ca_certificates.create(
@@ -183,60 +229,87 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             request_type="origin-rsa",
             requested_validity=5475,
         )
-        assert_matches_type(Optional[OriginCACertificateCreateResponse], origin_ca_certificate, path=["response"])
+        assert_matches_type(Optional[OriginCACertificate], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.origin_ca_certificates.with_raw_response.create()
+        response = await async_client.origin_ca_certificates.with_raw_response.create(
+            csr="-----BEGIN CERTIFICATE REQUEST-----\nMIICxzCCAa8CAQAwSDELMAkGA1UEBhMCVVMxFjAUBgNVBAgTDVNhbiBGcmFuY2lz\nY28xCzAJBgNVBAcTAkNBMRQwEgYDVQQDEwtleGFtcGxlLm5ldDCCASIwDQYJKoZI\nhvcNAQEBBQADggEPADCCAQoCggEBALxejtu4b+jPdFeFi6OUsye8TYJQBm3WfCvL\nHu5EvijMO/4Z2TImwASbwUF7Ir8OLgH+mGlQZeqyNvGoSOMEaZVXcYfpR1hlVak8\n4GGVr+04IGfOCqaBokaBFIwzclGZbzKmLGwIQioNxGfqFm6RGYGA3be2Je2iseBc\nN8GV1wYmvYE0RR+yWweJCTJ157exyRzu7sVxaEW9F87zBQLyOnwXc64rflXslRqi\ng7F7w5IaQYOl8yvmk/jEPCAha7fkiUfEpj4N12+oPRiMvleJF98chxjD4MH39c5I\nuOslULhrWunfh7GB1jwWNA9y44H0snrf+xvoy2TcHmxvma9Eln8CAwEAAaA6MDgG\nCSqGSIb3DQEJDjErMCkwJwYDVR0RBCAwHoILZXhhbXBsZS5uZXSCD3d3dy5leGFt\ncGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAcBaX6dOnI8ncARrI9ZSF2AJX+8mx\npTHY2+Y2C0VvrVDGMtbBRH8R9yMbqWtlxeeNGf//LeMkSKSFa4kbpdx226lfui8/\nauRDBTJGx2R1ccUxmLZXx4my0W5iIMxunu+kez+BDlu7bTT2io0uXMRHue4i6quH\nyc5ibxvbJMjR7dqbcanVE10/34oprzXQsJ/VmSuZNXtjbtSKDlmcpw6To/eeAJ+J\nhXykcUihvHyG4A1m2R6qpANBjnA0pHexfwM/SgfzvpbvUg0T1ubmer8BgTwCKIWs\ndcWYTthM51JIqRBfNqy4QcBnX+GY05yltEEswQI55wdiS3CjTTA67sdbcQ==\n-----END CERTIFICATE REQUEST-----",
+            hostnames=["example.com", "*.example.com"],
+            request_type="origin-rsa",
+        )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         origin_ca_certificate = await response.parse()
-        assert_matches_type(Optional[OriginCACertificateCreateResponse], origin_ca_certificate, path=["response"])
+        assert_matches_type(Optional[OriginCACertificate], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.origin_ca_certificates.with_streaming_response.create() as response:
+        async with async_client.origin_ca_certificates.with_streaming_response.create(
+            csr="-----BEGIN CERTIFICATE REQUEST-----\nMIICxzCCAa8CAQAwSDELMAkGA1UEBhMCVVMxFjAUBgNVBAgTDVNhbiBGcmFuY2lz\nY28xCzAJBgNVBAcTAkNBMRQwEgYDVQQDEwtleGFtcGxlLm5ldDCCASIwDQYJKoZI\nhvcNAQEBBQADggEPADCCAQoCggEBALxejtu4b+jPdFeFi6OUsye8TYJQBm3WfCvL\nHu5EvijMO/4Z2TImwASbwUF7Ir8OLgH+mGlQZeqyNvGoSOMEaZVXcYfpR1hlVak8\n4GGVr+04IGfOCqaBokaBFIwzclGZbzKmLGwIQioNxGfqFm6RGYGA3be2Je2iseBc\nN8GV1wYmvYE0RR+yWweJCTJ157exyRzu7sVxaEW9F87zBQLyOnwXc64rflXslRqi\ng7F7w5IaQYOl8yvmk/jEPCAha7fkiUfEpj4N12+oPRiMvleJF98chxjD4MH39c5I\nuOslULhrWunfh7GB1jwWNA9y44H0snrf+xvoy2TcHmxvma9Eln8CAwEAAaA6MDgG\nCSqGSIb3DQEJDjErMCkwJwYDVR0RBCAwHoILZXhhbXBsZS5uZXSCD3d3dy5leGFt\ncGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAcBaX6dOnI8ncARrI9ZSF2AJX+8mx\npTHY2+Y2C0VvrVDGMtbBRH8R9yMbqWtlxeeNGf//LeMkSKSFa4kbpdx226lfui8/\nauRDBTJGx2R1ccUxmLZXx4my0W5iIMxunu+kez+BDlu7bTT2io0uXMRHue4i6quH\nyc5ibxvbJMjR7dqbcanVE10/34oprzXQsJ/VmSuZNXtjbtSKDlmcpw6To/eeAJ+J\nhXykcUihvHyG4A1m2R6qpANBjnA0pHexfwM/SgfzvpbvUg0T1ubmer8BgTwCKIWs\ndcWYTthM51JIqRBfNqy4QcBnX+GY05yltEEswQI55wdiS3CjTTA67sdbcQ==\n-----END CERTIFICATE REQUEST-----",
+            hostnames=["example.com", "*.example.com"],
+            request_type="origin-rsa",
+        ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             origin_ca_certificate = await response.parse()
-            assert_matches_type(Optional[OriginCACertificateCreateResponse], origin_ca_certificate, path=["response"])
+            assert_matches_type(Optional[OriginCACertificate], origin_ca_certificate, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        origin_ca_certificate = await async_client.origin_ca_certificates.list()
-        assert_matches_type(AsyncSinglePage[OriginCACertificate], origin_ca_certificate, path=["response"])
+        origin_ca_certificate = await async_client.origin_ca_certificates.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[OriginCACertificate], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         origin_ca_certificate = await async_client.origin_ca_certificates.list(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            limit=10,
+            offset=10,
+            page=1,
+            per_page=5,
         )
-        assert_matches_type(AsyncSinglePage[OriginCACertificate], origin_ca_certificate, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[OriginCACertificate], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.origin_ca_certificates.with_raw_response.list()
+        response = await async_client.origin_ca_certificates.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         origin_ca_certificate = await response.parse()
-        assert_matches_type(AsyncSinglePage[OriginCACertificate], origin_ca_certificate, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[OriginCACertificate], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.origin_ca_certificates.with_streaming_response.list() as response:
+        async with async_client.origin_ca_certificates.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             origin_ca_certificate = await response.parse()
-            assert_matches_type(AsyncSinglePage[OriginCACertificate], origin_ca_certificate, path=["response"])
+            assert_matches_type(
+                AsyncV4PagePaginationArray[OriginCACertificate], origin_ca_certificate, path=["response"]
+            )
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         origin_ca_certificate = await async_client.origin_ca_certificates.delete(
@@ -244,6 +317,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(Optional[OriginCACertificateDeleteResponse], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.origin_ca_certificates.with_raw_response.delete(
@@ -255,6 +329,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         origin_ca_certificate = await response.parse()
         assert_matches_type(Optional[OriginCACertificateDeleteResponse], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.origin_ca_certificates.with_streaming_response.delete(
@@ -268,6 +343,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
@@ -275,13 +351,15 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 "",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         origin_ca_certificate = await async_client.origin_ca_certificates.get(
             "023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[OriginCACertificateGetResponse], origin_ca_certificate, path=["response"])
+        assert_matches_type(Optional[OriginCACertificate], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.origin_ca_certificates.with_raw_response.get(
@@ -291,8 +369,9 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         origin_ca_certificate = await response.parse()
-        assert_matches_type(Optional[OriginCACertificateGetResponse], origin_ca_certificate, path=["response"])
+        assert_matches_type(Optional[OriginCACertificate], origin_ca_certificate, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.origin_ca_certificates.with_streaming_response.get(
@@ -302,10 +381,11 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             origin_ca_certificate = await response.parse()
-            assert_matches_type(Optional[OriginCACertificateGetResponse], origin_ca_certificate, path=["response"])
+            assert_matches_type(Optional[OriginCACertificate], origin_ca_certificate, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate auth errors on test suite")
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
diff --git a/tests/api_resources/test_origin_post_quantum_encryption.py b/tests/api_resources/test_origin_post_quantum_encryption.py
index 7b671649427..9160b032a64 100644
--- a/tests/api_resources/test_origin_post_quantum_encryption.py
+++ b/tests/api_resources/test_origin_post_quantum_encryption.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
@@ -28,7 +28,7 @@ def test_method_update(self, client: Cloudflare) -> None:
             value="preferred",
         )
         assert_matches_type(
-            OriginPostQuantumEncryptionUpdateResponse, origin_post_quantum_encryption, path=["response"]
+            Optional[OriginPostQuantumEncryptionUpdateResponse], origin_post_quantum_encryption, path=["response"]
         )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -43,7 +43,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         origin_post_quantum_encryption = response.parse()
         assert_matches_type(
-            OriginPostQuantumEncryptionUpdateResponse, origin_post_quantum_encryption, path=["response"]
+            Optional[OriginPostQuantumEncryptionUpdateResponse], origin_post_quantum_encryption, path=["response"]
         )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -58,7 +58,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
 
             origin_post_quantum_encryption = response.parse()
             assert_matches_type(
-                OriginPostQuantumEncryptionUpdateResponse, origin_post_quantum_encryption, path=["response"]
+                Optional[OriginPostQuantumEncryptionUpdateResponse], origin_post_quantum_encryption, path=["response"]
             )
 
         assert cast(Any, response.is_closed) is True
@@ -78,7 +78,9 @@ def test_method_get(self, client: Cloudflare) -> None:
         origin_post_quantum_encryption = client.origin_post_quantum_encryption.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(OriginPostQuantumEncryptionGetResponse, origin_post_quantum_encryption, path=["response"])
+        assert_matches_type(
+            Optional[OriginPostQuantumEncryptionGetResponse], origin_post_quantum_encryption, path=["response"]
+        )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -90,7 +92,9 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         origin_post_quantum_encryption = response.parse()
-        assert_matches_type(OriginPostQuantumEncryptionGetResponse, origin_post_quantum_encryption, path=["response"])
+        assert_matches_type(
+            Optional[OriginPostQuantumEncryptionGetResponse], origin_post_quantum_encryption, path=["response"]
+        )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -103,7 +107,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
             origin_post_quantum_encryption = response.parse()
             assert_matches_type(
-                OriginPostQuantumEncryptionGetResponse, origin_post_quantum_encryption, path=["response"]
+                Optional[OriginPostQuantumEncryptionGetResponse], origin_post_quantum_encryption, path=["response"]
             )
 
         assert cast(Any, response.is_closed) is True
@@ -118,7 +122,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncOriginPostQuantumEncryption:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -128,7 +134,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
             value="preferred",
         )
         assert_matches_type(
-            OriginPostQuantumEncryptionUpdateResponse, origin_post_quantum_encryption, path=["response"]
+            Optional[OriginPostQuantumEncryptionUpdateResponse], origin_post_quantum_encryption, path=["response"]
         )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -143,7 +149,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         origin_post_quantum_encryption = await response.parse()
         assert_matches_type(
-            OriginPostQuantumEncryptionUpdateResponse, origin_post_quantum_encryption, path=["response"]
+            Optional[OriginPostQuantumEncryptionUpdateResponse], origin_post_quantum_encryption, path=["response"]
         )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -158,7 +164,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
 
             origin_post_quantum_encryption = await response.parse()
             assert_matches_type(
-                OriginPostQuantumEncryptionUpdateResponse, origin_post_quantum_encryption, path=["response"]
+                Optional[OriginPostQuantumEncryptionUpdateResponse], origin_post_quantum_encryption, path=["response"]
             )
 
         assert cast(Any, response.is_closed) is True
@@ -178,7 +184,9 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         origin_post_quantum_encryption = await async_client.origin_post_quantum_encryption.get(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(OriginPostQuantumEncryptionGetResponse, origin_post_quantum_encryption, path=["response"])
+        assert_matches_type(
+            Optional[OriginPostQuantumEncryptionGetResponse], origin_post_quantum_encryption, path=["response"]
+        )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -190,7 +198,9 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         origin_post_quantum_encryption = await response.parse()
-        assert_matches_type(OriginPostQuantumEncryptionGetResponse, origin_post_quantum_encryption, path=["response"])
+        assert_matches_type(
+            Optional[OriginPostQuantumEncryptionGetResponse], origin_post_quantum_encryption, path=["response"]
+        )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -203,7 +213,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
             origin_post_quantum_encryption = await response.parse()
             assert_matches_type(
-                OriginPostQuantumEncryptionGetResponse, origin_post_quantum_encryption, path=["response"]
+                Optional[OriginPostQuantumEncryptionGetResponse], origin_post_quantum_encryption, path=["response"]
             )
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/test_origin_tls_client_auth.py b/tests/api_resources/test_origin_tls_client_auth.py
index 53fa7d4c873..ede46d517ed 100644
--- a/tests/api_resources/test_origin_tls_client_auth.py
+++ b/tests/api_resources/test_origin_tls_client_auth.py
@@ -11,12 +11,14 @@
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.origin_tls_client_auth import (
-    ZoneAuthenticatedOriginPull,
     OriginTLSClientAuthGetResponse,
+    OriginTLSClientAuthListResponse,
     OriginTLSClientAuthCreateResponse,
     OriginTLSClientAuthDeleteResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -25,20 +27,23 @@ class TestOriginTLSClientAuth:
 
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
-        origin_tls_client_auth = client.origin_tls_client_auth.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
-            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
-        )
+        with pytest.warns(DeprecationWarning):
+            origin_tls_client_auth = client.origin_tls_client_auth.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+                private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+            )
+
         assert_matches_type(Optional[OriginTLSClientAuthCreateResponse], origin_tls_client_auth, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.origin_tls_client_auth.with_raw_response.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
-            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.origin_tls_client_auth.with_raw_response.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+                private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -47,80 +52,94 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.origin_tls_client_auth.with_streaming_response.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
-            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.origin_tls_client_auth.with_streaming_response.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+                private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            origin_tls_client_auth = response.parse()
-            assert_matches_type(Optional[OriginTLSClientAuthCreateResponse], origin_tls_client_auth, path=["response"])
+                origin_tls_client_auth = response.parse()
+                assert_matches_type(
+                    Optional[OriginTLSClientAuthCreateResponse], origin_tls_client_auth, path=["response"]
+                )
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.origin_tls_client_auth.with_raw_response.create(
-                zone_id="",
-                certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
-                private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.origin_tls_client_auth.with_raw_response.create(
+                    zone_id="",
+                    certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+                    private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+                )
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
-        origin_tls_client_auth = client.origin_tls_client_auth.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SyncSinglePage[ZoneAuthenticatedOriginPull], origin_tls_client_auth, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            origin_tls_client_auth = client.origin_tls_client_auth.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(SyncSinglePage[OriginTLSClientAuthListResponse], origin_tls_client_auth, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.origin_tls_client_auth.with_raw_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.origin_tls_client_auth.with_raw_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         origin_tls_client_auth = response.parse()
-        assert_matches_type(SyncSinglePage[ZoneAuthenticatedOriginPull], origin_tls_client_auth, path=["response"])
+        assert_matches_type(SyncSinglePage[OriginTLSClientAuthListResponse], origin_tls_client_auth, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.origin_tls_client_auth.with_streaming_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.origin_tls_client_auth.with_streaming_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            origin_tls_client_auth = response.parse()
-            assert_matches_type(SyncSinglePage[ZoneAuthenticatedOriginPull], origin_tls_client_auth, path=["response"])
+                origin_tls_client_auth = response.parse()
+                assert_matches_type(
+                    SyncSinglePage[OriginTLSClientAuthListResponse], origin_tls_client_auth, path=["response"]
+                )
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.origin_tls_client_auth.with_raw_response.list(
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.origin_tls_client_auth.with_raw_response.list(
+                    zone_id="",
+                )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
-        origin_tls_client_auth = client.origin_tls_client_auth.delete(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            origin_tls_client_auth = client.origin_tls_client_auth.delete(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(Optional[OriginTLSClientAuthDeleteResponse], origin_tls_client_auth, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.origin_tls_client_auth.with_raw_response.delete(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.origin_tls_client_auth.with_raw_response.delete(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -129,46 +148,53 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.origin_tls_client_auth.with_streaming_response.delete(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.origin_tls_client_auth.with_streaming_response.delete(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            origin_tls_client_auth = response.parse()
-            assert_matches_type(Optional[OriginTLSClientAuthDeleteResponse], origin_tls_client_auth, path=["response"])
+                origin_tls_client_auth = response.parse()
+                assert_matches_type(
+                    Optional[OriginTLSClientAuthDeleteResponse], origin_tls_client_auth, path=["response"]
+                )
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.origin_tls_client_auth.with_raw_response.delete(
-                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.origin_tls_client_auth.with_raw_response.delete(
+                    certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    zone_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
-            client.origin_tls_client_auth.with_raw_response.delete(
-                certificate_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+                client.origin_tls_client_auth.with_raw_response.delete(
+                    certificate_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        origin_tls_client_auth = client.origin_tls_client_auth.get(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            origin_tls_client_auth = client.origin_tls_client_auth.get(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(Optional[OriginTLSClientAuthGetResponse], origin_tls_client_auth, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.origin_tls_client_auth.with_raw_response.get(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.origin_tls_client_auth.with_raw_response.get(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -177,52 +203,59 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.origin_tls_client_auth.with_streaming_response.get(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.origin_tls_client_auth.with_streaming_response.get(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            origin_tls_client_auth = response.parse()
-            assert_matches_type(Optional[OriginTLSClientAuthGetResponse], origin_tls_client_auth, path=["response"])
+                origin_tls_client_auth = response.parse()
+                assert_matches_type(Optional[OriginTLSClientAuthGetResponse], origin_tls_client_auth, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.origin_tls_client_auth.with_raw_response.get(
-                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.origin_tls_client_auth.with_raw_response.get(
+                    certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    zone_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
-            client.origin_tls_client_auth.with_raw_response.get(
-                certificate_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+                client.origin_tls_client_auth.with_raw_response.get(
+                    certificate_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
 
 class TestAsyncOriginTLSClientAuth:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        origin_tls_client_auth = await async_client.origin_tls_client_auth.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
-            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
-        )
+        with pytest.warns(DeprecationWarning):
+            origin_tls_client_auth = await async_client.origin_tls_client_auth.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+                private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+            )
+
         assert_matches_type(Optional[OriginTLSClientAuthCreateResponse], origin_tls_client_auth, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.origin_tls_client_auth.with_raw_response.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
-            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.origin_tls_client_auth.with_raw_response.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+                private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -231,80 +264,94 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.origin_tls_client_auth.with_streaming_response.create(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
-            private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.origin_tls_client_auth.with_streaming_response.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+                private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            origin_tls_client_auth = await response.parse()
-            assert_matches_type(Optional[OriginTLSClientAuthCreateResponse], origin_tls_client_auth, path=["response"])
+                origin_tls_client_auth = await response.parse()
+                assert_matches_type(
+                    Optional[OriginTLSClientAuthCreateResponse], origin_tls_client_auth, path=["response"]
+                )
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.origin_tls_client_auth.with_raw_response.create(
-                zone_id="",
-                certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
-                private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.origin_tls_client_auth.with_raw_response.create(
+                    zone_id="",
+                    certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n",
+                    private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n",
+                )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        origin_tls_client_auth = await async_client.origin_tls_client_auth.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(AsyncSinglePage[ZoneAuthenticatedOriginPull], origin_tls_client_auth, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            origin_tls_client_auth = await async_client.origin_tls_client_auth.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(AsyncSinglePage[OriginTLSClientAuthListResponse], origin_tls_client_auth, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.origin_tls_client_auth.with_raw_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.origin_tls_client_auth.with_raw_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         origin_tls_client_auth = await response.parse()
-        assert_matches_type(AsyncSinglePage[ZoneAuthenticatedOriginPull], origin_tls_client_auth, path=["response"])
+        assert_matches_type(AsyncSinglePage[OriginTLSClientAuthListResponse], origin_tls_client_auth, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.origin_tls_client_auth.with_streaming_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.origin_tls_client_auth.with_streaming_response.list(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            origin_tls_client_auth = await response.parse()
-            assert_matches_type(AsyncSinglePage[ZoneAuthenticatedOriginPull], origin_tls_client_auth, path=["response"])
+                origin_tls_client_auth = await response.parse()
+                assert_matches_type(
+                    AsyncSinglePage[OriginTLSClientAuthListResponse], origin_tls_client_auth, path=["response"]
+                )
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.origin_tls_client_auth.with_raw_response.list(
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.origin_tls_client_auth.with_raw_response.list(
+                    zone_id="",
+                )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        origin_tls_client_auth = await async_client.origin_tls_client_auth.delete(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            origin_tls_client_auth = await async_client.origin_tls_client_auth.delete(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(Optional[OriginTLSClientAuthDeleteResponse], origin_tls_client_auth, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.origin_tls_client_auth.with_raw_response.delete(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.origin_tls_client_auth.with_raw_response.delete(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -313,46 +360,53 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.origin_tls_client_auth.with_streaming_response.delete(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.origin_tls_client_auth.with_streaming_response.delete(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            origin_tls_client_auth = await response.parse()
-            assert_matches_type(Optional[OriginTLSClientAuthDeleteResponse], origin_tls_client_auth, path=["response"])
+                origin_tls_client_auth = await response.parse()
+                assert_matches_type(
+                    Optional[OriginTLSClientAuthDeleteResponse], origin_tls_client_auth, path=["response"]
+                )
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.origin_tls_client_auth.with_raw_response.delete(
-                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.origin_tls_client_auth.with_raw_response.delete(
+                    certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    zone_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
-            await async_client.origin_tls_client_auth.with_raw_response.delete(
-                certificate_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+                await async_client.origin_tls_client_auth.with_raw_response.delete(
+                    certificate_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        origin_tls_client_auth = await async_client.origin_tls_client_auth.get(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            origin_tls_client_auth = await async_client.origin_tls_client_auth.get(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(Optional[OriginTLSClientAuthGetResponse], origin_tls_client_auth, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.origin_tls_client_auth.with_raw_response.get(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.origin_tls_client_auth.with_raw_response.get(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -361,28 +415,30 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.origin_tls_client_auth.with_streaming_response.get(
-            certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.origin_tls_client_auth.with_streaming_response.get(
+                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            origin_tls_client_auth = await response.parse()
-            assert_matches_type(Optional[OriginTLSClientAuthGetResponse], origin_tls_client_auth, path=["response"])
+                origin_tls_client_auth = await response.parse()
+                assert_matches_type(Optional[OriginTLSClientAuthGetResponse], origin_tls_client_auth, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.origin_tls_client_auth.with_raw_response.get(
-                certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
-            await async_client.origin_tls_client_auth.with_raw_response.get(
-                certificate_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.origin_tls_client_auth.with_raw_response.get(
+                    certificate_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    zone_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+                await async_client.origin_tls_client_auth.with_raw_response.get(
+                    certificate_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                )
diff --git a/tests/api_resources/test_page_rules.py b/tests/api_resources/test_page_rules.py
new file mode 100644
index 00000000000..15ec5d6dad1
--- /dev/null
+++ b/tests/api_resources/test_page_rules.py
@@ -0,0 +1,934 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.page_rules import (
+    PageRule,
+    PageRuleListResponse,
+    PageRuleDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestPageRules:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        page_rule = client.page_rules.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"id": "browser_check"}],
+            targets=[
+                {
+                    "constraint": {
+                        "operator": "matches",
+                        "value": "*example.com/images/*",
+                    },
+                    "target": "url",
+                }
+            ],
+        )
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        page_rule = client.page_rules.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[
+                {
+                    "id": "browser_check",
+                    "value": "on",
+                }
+            ],
+            targets=[
+                {
+                    "constraint": {
+                        "operator": "matches",
+                        "value": "*example.com/images/*",
+                    },
+                    "target": "url",
+                }
+            ],
+            priority=0,
+            status="active",
+        )
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.page_rules.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"id": "browser_check"}],
+            targets=[
+                {
+                    "constraint": {
+                        "operator": "matches",
+                        "value": "*example.com/images/*",
+                    },
+                    "target": "url",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        page_rule = response.parse()
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.page_rules.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"id": "browser_check"}],
+            targets=[
+                {
+                    "constraint": {
+                        "operator": "matches",
+                        "value": "*example.com/images/*",
+                    },
+                    "target": "url",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            page_rule = response.parse()
+            assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.page_rules.with_raw_response.create(
+                zone_id="",
+                actions=[{"id": "browser_check"}],
+                targets=[
+                    {
+                        "constraint": {
+                            "operator": "matches",
+                            "value": "*example.com/images/*",
+                        },
+                        "target": "url",
+                    }
+                ],
+            )
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        page_rule = client.page_rules.update(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"id": "browser_check"}],
+            targets=[
+                {
+                    "constraint": {
+                        "operator": "matches",
+                        "value": "*example.com/images/*",
+                    },
+                    "target": "url",
+                }
+            ],
+        )
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        page_rule = client.page_rules.update(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[
+                {
+                    "id": "browser_check",
+                    "value": "on",
+                }
+            ],
+            targets=[
+                {
+                    "constraint": {
+                        "operator": "matches",
+                        "value": "*example.com/images/*",
+                    },
+                    "target": "url",
+                }
+            ],
+            priority=0,
+            status="active",
+        )
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.page_rules.with_raw_response.update(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"id": "browser_check"}],
+            targets=[
+                {
+                    "constraint": {
+                        "operator": "matches",
+                        "value": "*example.com/images/*",
+                    },
+                    "target": "url",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        page_rule = response.parse()
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.page_rules.with_streaming_response.update(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"id": "browser_check"}],
+            targets=[
+                {
+                    "constraint": {
+                        "operator": "matches",
+                        "value": "*example.com/images/*",
+                    },
+                    "target": "url",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            page_rule = response.parse()
+            assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.page_rules.with_raw_response.update(
+                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+                actions=[{"id": "browser_check"}],
+                targets=[
+                    {
+                        "constraint": {
+                            "operator": "matches",
+                            "value": "*example.com/images/*",
+                        },
+                        "target": "url",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `pagerule_id` but received ''"):
+            client.page_rules.with_raw_response.update(
+                pagerule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                actions=[{"id": "browser_check"}],
+                targets=[
+                    {
+                        "constraint": {
+                            "operator": "matches",
+                            "value": "*example.com/images/*",
+                        },
+                        "target": "url",
+                    }
+                ],
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        page_rule = client.page_rules.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[PageRuleListResponse], page_rule, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        page_rule = client.page_rules.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="desc",
+            match="any",
+            order="status",
+            status="active",
+        )
+        assert_matches_type(Optional[PageRuleListResponse], page_rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.page_rules.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        page_rule = response.parse()
+        assert_matches_type(Optional[PageRuleListResponse], page_rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.page_rules.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            page_rule = response.parse()
+            assert_matches_type(Optional[PageRuleListResponse], page_rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.page_rules.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        page_rule = client.page_rules.delete(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[PageRuleDeleteResponse], page_rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.page_rules.with_raw_response.delete(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        page_rule = response.parse()
+        assert_matches_type(Optional[PageRuleDeleteResponse], page_rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.page_rules.with_streaming_response.delete(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            page_rule = response.parse()
+            assert_matches_type(Optional[PageRuleDeleteResponse], page_rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.page_rules.with_raw_response.delete(
+                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `pagerule_id` but received ''"):
+            client.page_rules.with_raw_response.delete(
+                pagerule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        page_rule = client.page_rules.edit(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        page_rule = client.page_rules.edit(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[
+                {
+                    "id": "browser_check",
+                    "value": "on",
+                }
+            ],
+            priority=0,
+            status="active",
+            targets=[
+                {
+                    "constraint": {
+                        "operator": "matches",
+                        "value": "*example.com/images/*",
+                    },
+                    "target": "url",
+                }
+            ],
+        )
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.page_rules.with_raw_response.edit(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        page_rule = response.parse()
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.page_rules.with_streaming_response.edit(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            page_rule = response.parse()
+            assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.page_rules.with_raw_response.edit(
+                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `pagerule_id` but received ''"):
+            client.page_rules.with_raw_response.edit(
+                pagerule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        page_rule = client.page_rules.get(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.page_rules.with_raw_response.get(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        page_rule = response.parse()
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.page_rules.with_streaming_response.get(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            page_rule = response.parse()
+            assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.page_rules.with_raw_response.get(
+                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `pagerule_id` but received ''"):
+            client.page_rules.with_raw_response.get(
+                pagerule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncPageRules:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        page_rule = await async_client.page_rules.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"id": "browser_check"}],
+            targets=[
+                {
+                    "constraint": {
+                        "operator": "matches",
+                        "value": "*example.com/images/*",
+                    },
+                    "target": "url",
+                }
+            ],
+        )
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        page_rule = await async_client.page_rules.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[
+                {
+                    "id": "browser_check",
+                    "value": "on",
+                }
+            ],
+            targets=[
+                {
+                    "constraint": {
+                        "operator": "matches",
+                        "value": "*example.com/images/*",
+                    },
+                    "target": "url",
+                }
+            ],
+            priority=0,
+            status="active",
+        )
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.page_rules.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"id": "browser_check"}],
+            targets=[
+                {
+                    "constraint": {
+                        "operator": "matches",
+                        "value": "*example.com/images/*",
+                    },
+                    "target": "url",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        page_rule = await response.parse()
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.page_rules.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"id": "browser_check"}],
+            targets=[
+                {
+                    "constraint": {
+                        "operator": "matches",
+                        "value": "*example.com/images/*",
+                    },
+                    "target": "url",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            page_rule = await response.parse()
+            assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.page_rules.with_raw_response.create(
+                zone_id="",
+                actions=[{"id": "browser_check"}],
+                targets=[
+                    {
+                        "constraint": {
+                            "operator": "matches",
+                            "value": "*example.com/images/*",
+                        },
+                        "target": "url",
+                    }
+                ],
+            )
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        page_rule = await async_client.page_rules.update(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"id": "browser_check"}],
+            targets=[
+                {
+                    "constraint": {
+                        "operator": "matches",
+                        "value": "*example.com/images/*",
+                    },
+                    "target": "url",
+                }
+            ],
+        )
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        page_rule = await async_client.page_rules.update(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[
+                {
+                    "id": "browser_check",
+                    "value": "on",
+                }
+            ],
+            targets=[
+                {
+                    "constraint": {
+                        "operator": "matches",
+                        "value": "*example.com/images/*",
+                    },
+                    "target": "url",
+                }
+            ],
+            priority=0,
+            status="active",
+        )
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.page_rules.with_raw_response.update(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"id": "browser_check"}],
+            targets=[
+                {
+                    "constraint": {
+                        "operator": "matches",
+                        "value": "*example.com/images/*",
+                    },
+                    "target": "url",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        page_rule = await response.parse()
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.page_rules.with_streaming_response.update(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[{"id": "browser_check"}],
+            targets=[
+                {
+                    "constraint": {
+                        "operator": "matches",
+                        "value": "*example.com/images/*",
+                    },
+                    "target": "url",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            page_rule = await response.parse()
+            assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="generated params are incorrect")
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.page_rules.with_raw_response.update(
+                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+                actions=[{"id": "browser_check"}],
+                targets=[
+                    {
+                        "constraint": {
+                            "operator": "matches",
+                            "value": "*example.com/images/*",
+                        },
+                        "target": "url",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `pagerule_id` but received ''"):
+            await async_client.page_rules.with_raw_response.update(
+                pagerule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                actions=[{"id": "browser_check"}],
+                targets=[
+                    {
+                        "constraint": {
+                            "operator": "matches",
+                            "value": "*example.com/images/*",
+                        },
+                        "target": "url",
+                    }
+                ],
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        page_rule = await async_client.page_rules.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[PageRuleListResponse], page_rule, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        page_rule = await async_client.page_rules.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="desc",
+            match="any",
+            order="status",
+            status="active",
+        )
+        assert_matches_type(Optional[PageRuleListResponse], page_rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.page_rules.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        page_rule = await response.parse()
+        assert_matches_type(Optional[PageRuleListResponse], page_rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.page_rules.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            page_rule = await response.parse()
+            assert_matches_type(Optional[PageRuleListResponse], page_rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.page_rules.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        page_rule = await async_client.page_rules.delete(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[PageRuleDeleteResponse], page_rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.page_rules.with_raw_response.delete(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        page_rule = await response.parse()
+        assert_matches_type(Optional[PageRuleDeleteResponse], page_rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.page_rules.with_streaming_response.delete(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            page_rule = await response.parse()
+            assert_matches_type(Optional[PageRuleDeleteResponse], page_rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.page_rules.with_raw_response.delete(
+                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `pagerule_id` but received ''"):
+            await async_client.page_rules.with_raw_response.delete(
+                pagerule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        page_rule = await async_client.page_rules.edit(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        page_rule = await async_client.page_rules.edit(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            actions=[
+                {
+                    "id": "browser_check",
+                    "value": "on",
+                }
+            ],
+            priority=0,
+            status="active",
+            targets=[
+                {
+                    "constraint": {
+                        "operator": "matches",
+                        "value": "*example.com/images/*",
+                    },
+                    "target": "url",
+                }
+            ],
+        )
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.page_rules.with_raw_response.edit(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        page_rule = await response.parse()
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.page_rules.with_streaming_response.edit(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            page_rule = await response.parse()
+            assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.page_rules.with_raw_response.edit(
+                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `pagerule_id` but received ''"):
+            await async_client.page_rules.with_raw_response.edit(
+                pagerule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        page_rule = await async_client.page_rules.get(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.page_rules.with_raw_response.get(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        page_rule = await response.parse()
+        assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.page_rules.with_streaming_response.get(
+            pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            page_rule = await response.parse()
+            assert_matches_type(Optional[PageRule], page_rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.page_rules.with_raw_response.get(
+                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `pagerule_id` but received ''"):
+            await async_client.page_rules.with_raw_response.get(
+                pagerule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/test_page_shield.py b/tests/api_resources/test_page_shield.py
index 2511ba986b2..a1c807dc965 100644
--- a/tests/api_resources/test_page_shield.py
+++ b/tests/api_resources/test_page_shield.py
@@ -105,7 +105,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncPageShield:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/test_pagerules.py b/tests/api_resources/test_pagerules.py
deleted file mode 100644
index 602cbd4d6f6..00000000000
--- a/tests/api_resources/test_pagerules.py
+++ /dev/null
@@ -1,1095 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.pagerules import (
-    PageruleGetResponse,
-    PageruleEditResponse,
-    PageruleListResponse,
-    PageruleCreateResponse,
-    PageruleDeleteResponse,
-    PageruleUpdateResponse,
-)
-
-# pyright: reportDeprecated=false
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestPagerules:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_create(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = client.pagerules.create(
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[{}, {}, {}],
-                targets=[
-                    {
-                        "constraint": {
-                            "operator": "matches",
-                            "value": "*example.com/images/*",
-                        },
-                        "target": "url",
-                    }
-                ],
-            )
-
-        assert_matches_type(PageruleCreateResponse, pagerule, path=["response"])
-
-    @parametrize
-    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = client.pagerules.create(
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[
-                    {
-                        "name": "forward_url",
-                        "value": {
-                            "type": "temporary",
-                            "url": "http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3",
-                        },
-                    },
-                    {
-                        "name": "forward_url",
-                        "value": {
-                            "type": "temporary",
-                            "url": "http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3",
-                        },
-                    },
-                    {
-                        "name": "forward_url",
-                        "value": {
-                            "type": "temporary",
-                            "url": "http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3",
-                        },
-                    },
-                ],
-                targets=[
-                    {
-                        "constraint": {
-                            "operator": "matches",
-                            "value": "*example.com/images/*",
-                        },
-                        "target": "url",
-                    }
-                ],
-                priority=0,
-                status="active",
-            )
-
-        assert_matches_type(PageruleCreateResponse, pagerule, path=["response"])
-
-    @parametrize
-    def test_raw_response_create(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            response = client.pagerules.with_raw_response.create(
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[{}, {}, {}],
-                targets=[
-                    {
-                        "constraint": {
-                            "operator": "matches",
-                            "value": "*example.com/images/*",
-                        },
-                        "target": "url",
-                    }
-                ],
-            )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pagerule = response.parse()
-        assert_matches_type(PageruleCreateResponse, pagerule, path=["response"])
-
-    @parametrize
-    def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            with client.pagerules.with_streaming_response.create(
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[{}, {}, {}],
-                targets=[
-                    {
-                        "constraint": {
-                            "operator": "matches",
-                            "value": "*example.com/images/*",
-                        },
-                        "target": "url",
-                    }
-                ],
-            ) as response:
-                assert not response.is_closed
-                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-                pagerule = response.parse()
-                assert_matches_type(PageruleCreateResponse, pagerule, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-                client.pagerules.with_raw_response.create(
-                    zone_id="",
-                    actions=[{}, {}, {}],
-                    targets=[
-                        {
-                            "constraint": {
-                                "operator": "matches",
-                                "value": "*example.com/images/*",
-                            },
-                            "target": "url",
-                        }
-                    ],
-                )
-
-    @parametrize
-    def test_method_update(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = client.pagerules.update(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[{}, {}, {}],
-                targets=[
-                    {
-                        "constraint": {
-                            "operator": "matches",
-                            "value": "*example.com/images/*",
-                        },
-                        "target": "url",
-                    }
-                ],
-            )
-
-        assert_matches_type(PageruleUpdateResponse, pagerule, path=["response"])
-
-    @parametrize
-    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = client.pagerules.update(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[
-                    {
-                        "name": "forward_url",
-                        "value": {
-                            "type": "temporary",
-                            "url": "http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3",
-                        },
-                    },
-                    {
-                        "name": "forward_url",
-                        "value": {
-                            "type": "temporary",
-                            "url": "http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3",
-                        },
-                    },
-                    {
-                        "name": "forward_url",
-                        "value": {
-                            "type": "temporary",
-                            "url": "http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3",
-                        },
-                    },
-                ],
-                targets=[
-                    {
-                        "constraint": {
-                            "operator": "matches",
-                            "value": "*example.com/images/*",
-                        },
-                        "target": "url",
-                    }
-                ],
-                priority=0,
-                status="active",
-            )
-
-        assert_matches_type(PageruleUpdateResponse, pagerule, path=["response"])
-
-    @parametrize
-    def test_raw_response_update(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            response = client.pagerules.with_raw_response.update(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[{}, {}, {}],
-                targets=[
-                    {
-                        "constraint": {
-                            "operator": "matches",
-                            "value": "*example.com/images/*",
-                        },
-                        "target": "url",
-                    }
-                ],
-            )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pagerule = response.parse()
-        assert_matches_type(PageruleUpdateResponse, pagerule, path=["response"])
-
-    @parametrize
-    def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            with client.pagerules.with_streaming_response.update(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[{}, {}, {}],
-                targets=[
-                    {
-                        "constraint": {
-                            "operator": "matches",
-                            "value": "*example.com/images/*",
-                        },
-                        "target": "url",
-                    }
-                ],
-            ) as response:
-                assert not response.is_closed
-                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-                pagerule = response.parse()
-                assert_matches_type(PageruleUpdateResponse, pagerule, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-                client.pagerules.with_raw_response.update(
-                    pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                    zone_id="",
-                    actions=[{}, {}, {}],
-                    targets=[
-                        {
-                            "constraint": {
-                                "operator": "matches",
-                                "value": "*example.com/images/*",
-                            },
-                            "target": "url",
-                        }
-                    ],
-                )
-
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `pagerule_id` but received ''"):
-                client.pagerules.with_raw_response.update(
-                    pagerule_id="",
-                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                    actions=[{}, {}, {}],
-                    targets=[
-                        {
-                            "constraint": {
-                                "operator": "matches",
-                                "value": "*example.com/images/*",
-                            },
-                            "target": "url",
-                        }
-                    ],
-                )
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = client.pagerules.list(
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        assert_matches_type(PageruleListResponse, pagerule, path=["response"])
-
-    @parametrize
-    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = client.pagerules.list(
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                direction="desc",
-                match="any",
-                order="status",
-                status="active",
-            )
-
-        assert_matches_type(PageruleListResponse, pagerule, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            response = client.pagerules.with_raw_response.list(
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pagerule = response.parse()
-        assert_matches_type(PageruleListResponse, pagerule, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            with client.pagerules.with_streaming_response.list(
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            ) as response:
-                assert not response.is_closed
-                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-                pagerule = response.parse()
-                assert_matches_type(PageruleListResponse, pagerule, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-                client.pagerules.with_raw_response.list(
-                    zone_id="",
-                )
-
-    @parametrize
-    def test_method_delete(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = client.pagerules.delete(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        assert_matches_type(Optional[PageruleDeleteResponse], pagerule, path=["response"])
-
-    @parametrize
-    def test_raw_response_delete(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            response = client.pagerules.with_raw_response.delete(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pagerule = response.parse()
-        assert_matches_type(Optional[PageruleDeleteResponse], pagerule, path=["response"])
-
-    @parametrize
-    def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            with client.pagerules.with_streaming_response.delete(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            ) as response:
-                assert not response.is_closed
-                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-                pagerule = response.parse()
-                assert_matches_type(Optional[PageruleDeleteResponse], pagerule, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-                client.pagerules.with_raw_response.delete(
-                    pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                    zone_id="",
-                )
-
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `pagerule_id` but received ''"):
-                client.pagerules.with_raw_response.delete(
-                    pagerule_id="",
-                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                )
-
-    @parametrize
-    def test_method_edit(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = client.pagerules.edit(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        assert_matches_type(PageruleEditResponse, pagerule, path=["response"])
-
-    @parametrize
-    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = client.pagerules.edit(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[
-                    {
-                        "name": "forward_url",
-                        "value": {
-                            "type": "temporary",
-                            "url": "http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3",
-                        },
-                    },
-                    {
-                        "name": "forward_url",
-                        "value": {
-                            "type": "temporary",
-                            "url": "http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3",
-                        },
-                    },
-                    {
-                        "name": "forward_url",
-                        "value": {
-                            "type": "temporary",
-                            "url": "http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3",
-                        },
-                    },
-                ],
-                priority=0,
-                status="active",
-                targets=[
-                    {
-                        "constraint": {
-                            "operator": "matches",
-                            "value": "*example.com/images/*",
-                        },
-                        "target": "url",
-                    }
-                ],
-            )
-
-        assert_matches_type(PageruleEditResponse, pagerule, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            response = client.pagerules.with_raw_response.edit(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pagerule = response.parse()
-        assert_matches_type(PageruleEditResponse, pagerule, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            with client.pagerules.with_streaming_response.edit(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            ) as response:
-                assert not response.is_closed
-                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-                pagerule = response.parse()
-                assert_matches_type(PageruleEditResponse, pagerule, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-                client.pagerules.with_raw_response.edit(
-                    pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                    zone_id="",
-                )
-
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `pagerule_id` but received ''"):
-                client.pagerules.with_raw_response.edit(
-                    pagerule_id="",
-                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = client.pagerules.get(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        assert_matches_type(PageruleGetResponse, pagerule, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            response = client.pagerules.with_raw_response.get(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pagerule = response.parse()
-        assert_matches_type(PageruleGetResponse, pagerule, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            with client.pagerules.with_streaming_response.get(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            ) as response:
-                assert not response.is_closed
-                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-                pagerule = response.parse()
-                assert_matches_type(PageruleGetResponse, pagerule, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-                client.pagerules.with_raw_response.get(
-                    pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                    zone_id="",
-                )
-
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `pagerule_id` but received ''"):
-                client.pagerules.with_raw_response.get(
-                    pagerule_id="",
-                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                )
-
-
-class TestAsyncPagerules:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = await async_client.pagerules.create(
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[{}, {}, {}],
-                targets=[
-                    {
-                        "constraint": {
-                            "operator": "matches",
-                            "value": "*example.com/images/*",
-                        },
-                        "target": "url",
-                    }
-                ],
-            )
-
-        assert_matches_type(PageruleCreateResponse, pagerule, path=["response"])
-
-    @parametrize
-    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = await async_client.pagerules.create(
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[
-                    {
-                        "name": "forward_url",
-                        "value": {
-                            "type": "temporary",
-                            "url": "http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3",
-                        },
-                    },
-                    {
-                        "name": "forward_url",
-                        "value": {
-                            "type": "temporary",
-                            "url": "http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3",
-                        },
-                    },
-                    {
-                        "name": "forward_url",
-                        "value": {
-                            "type": "temporary",
-                            "url": "http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3",
-                        },
-                    },
-                ],
-                targets=[
-                    {
-                        "constraint": {
-                            "operator": "matches",
-                            "value": "*example.com/images/*",
-                        },
-                        "target": "url",
-                    }
-                ],
-                priority=0,
-                status="active",
-            )
-
-        assert_matches_type(PageruleCreateResponse, pagerule, path=["response"])
-
-    @parametrize
-    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            response = await async_client.pagerules.with_raw_response.create(
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[{}, {}, {}],
-                targets=[
-                    {
-                        "constraint": {
-                            "operator": "matches",
-                            "value": "*example.com/images/*",
-                        },
-                        "target": "url",
-                    }
-                ],
-            )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pagerule = await response.parse()
-        assert_matches_type(PageruleCreateResponse, pagerule, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            async with async_client.pagerules.with_streaming_response.create(
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[{}, {}, {}],
-                targets=[
-                    {
-                        "constraint": {
-                            "operator": "matches",
-                            "value": "*example.com/images/*",
-                        },
-                        "target": "url",
-                    }
-                ],
-            ) as response:
-                assert not response.is_closed
-                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-                pagerule = await response.parse()
-                assert_matches_type(PageruleCreateResponse, pagerule, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-                await async_client.pagerules.with_raw_response.create(
-                    zone_id="",
-                    actions=[{}, {}, {}],
-                    targets=[
-                        {
-                            "constraint": {
-                                "operator": "matches",
-                                "value": "*example.com/images/*",
-                            },
-                            "target": "url",
-                        }
-                    ],
-                )
-
-    @parametrize
-    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = await async_client.pagerules.update(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[{}, {}, {}],
-                targets=[
-                    {
-                        "constraint": {
-                            "operator": "matches",
-                            "value": "*example.com/images/*",
-                        },
-                        "target": "url",
-                    }
-                ],
-            )
-
-        assert_matches_type(PageruleUpdateResponse, pagerule, path=["response"])
-
-    @parametrize
-    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = await async_client.pagerules.update(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[
-                    {
-                        "name": "forward_url",
-                        "value": {
-                            "type": "temporary",
-                            "url": "http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3",
-                        },
-                    },
-                    {
-                        "name": "forward_url",
-                        "value": {
-                            "type": "temporary",
-                            "url": "http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3",
-                        },
-                    },
-                    {
-                        "name": "forward_url",
-                        "value": {
-                            "type": "temporary",
-                            "url": "http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3",
-                        },
-                    },
-                ],
-                targets=[
-                    {
-                        "constraint": {
-                            "operator": "matches",
-                            "value": "*example.com/images/*",
-                        },
-                        "target": "url",
-                    }
-                ],
-                priority=0,
-                status="active",
-            )
-
-        assert_matches_type(PageruleUpdateResponse, pagerule, path=["response"])
-
-    @parametrize
-    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            response = await async_client.pagerules.with_raw_response.update(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[{}, {}, {}],
-                targets=[
-                    {
-                        "constraint": {
-                            "operator": "matches",
-                            "value": "*example.com/images/*",
-                        },
-                        "target": "url",
-                    }
-                ],
-            )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pagerule = await response.parse()
-        assert_matches_type(PageruleUpdateResponse, pagerule, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            async with async_client.pagerules.with_streaming_response.update(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[{}, {}, {}],
-                targets=[
-                    {
-                        "constraint": {
-                            "operator": "matches",
-                            "value": "*example.com/images/*",
-                        },
-                        "target": "url",
-                    }
-                ],
-            ) as response:
-                assert not response.is_closed
-                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-                pagerule = await response.parse()
-                assert_matches_type(PageruleUpdateResponse, pagerule, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-                await async_client.pagerules.with_raw_response.update(
-                    pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                    zone_id="",
-                    actions=[{}, {}, {}],
-                    targets=[
-                        {
-                            "constraint": {
-                                "operator": "matches",
-                                "value": "*example.com/images/*",
-                            },
-                            "target": "url",
-                        }
-                    ],
-                )
-
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `pagerule_id` but received ''"):
-                await async_client.pagerules.with_raw_response.update(
-                    pagerule_id="",
-                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                    actions=[{}, {}, {}],
-                    targets=[
-                        {
-                            "constraint": {
-                                "operator": "matches",
-                                "value": "*example.com/images/*",
-                            },
-                            "target": "url",
-                        }
-                    ],
-                )
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = await async_client.pagerules.list(
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        assert_matches_type(PageruleListResponse, pagerule, path=["response"])
-
-    @parametrize
-    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = await async_client.pagerules.list(
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                direction="desc",
-                match="any",
-                order="status",
-                status="active",
-            )
-
-        assert_matches_type(PageruleListResponse, pagerule, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            response = await async_client.pagerules.with_raw_response.list(
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pagerule = await response.parse()
-        assert_matches_type(PageruleListResponse, pagerule, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            async with async_client.pagerules.with_streaming_response.list(
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            ) as response:
-                assert not response.is_closed
-                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-                pagerule = await response.parse()
-                assert_matches_type(PageruleListResponse, pagerule, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-                await async_client.pagerules.with_raw_response.list(
-                    zone_id="",
-                )
-
-    @parametrize
-    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = await async_client.pagerules.delete(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        assert_matches_type(Optional[PageruleDeleteResponse], pagerule, path=["response"])
-
-    @parametrize
-    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            response = await async_client.pagerules.with_raw_response.delete(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pagerule = await response.parse()
-        assert_matches_type(Optional[PageruleDeleteResponse], pagerule, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            async with async_client.pagerules.with_streaming_response.delete(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            ) as response:
-                assert not response.is_closed
-                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-                pagerule = await response.parse()
-                assert_matches_type(Optional[PageruleDeleteResponse], pagerule, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-                await async_client.pagerules.with_raw_response.delete(
-                    pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                    zone_id="",
-                )
-
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `pagerule_id` but received ''"):
-                await async_client.pagerules.with_raw_response.delete(
-                    pagerule_id="",
-                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                )
-
-    @parametrize
-    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = await async_client.pagerules.edit(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        assert_matches_type(PageruleEditResponse, pagerule, path=["response"])
-
-    @parametrize
-    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = await async_client.pagerules.edit(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                actions=[
-                    {
-                        "name": "forward_url",
-                        "value": {
-                            "type": "temporary",
-                            "url": "http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3",
-                        },
-                    },
-                    {
-                        "name": "forward_url",
-                        "value": {
-                            "type": "temporary",
-                            "url": "http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3",
-                        },
-                    },
-                    {
-                        "name": "forward_url",
-                        "value": {
-                            "type": "temporary",
-                            "url": "http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3",
-                        },
-                    },
-                ],
-                priority=0,
-                status="active",
-                targets=[
-                    {
-                        "constraint": {
-                            "operator": "matches",
-                            "value": "*example.com/images/*",
-                        },
-                        "target": "url",
-                    }
-                ],
-            )
-
-        assert_matches_type(PageruleEditResponse, pagerule, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            response = await async_client.pagerules.with_raw_response.edit(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pagerule = await response.parse()
-        assert_matches_type(PageruleEditResponse, pagerule, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            async with async_client.pagerules.with_streaming_response.edit(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            ) as response:
-                assert not response.is_closed
-                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-                pagerule = await response.parse()
-                assert_matches_type(PageruleEditResponse, pagerule, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-                await async_client.pagerules.with_raw_response.edit(
-                    pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                    zone_id="",
-                )
-
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `pagerule_id` but received ''"):
-                await async_client.pagerules.with_raw_response.edit(
-                    pagerule_id="",
-                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            pagerule = await async_client.pagerules.get(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        assert_matches_type(PageruleGetResponse, pagerule, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            response = await async_client.pagerules.with_raw_response.get(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pagerule = await response.parse()
-        assert_matches_type(PageruleGetResponse, pagerule, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            async with async_client.pagerules.with_streaming_response.get(
-                pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            ) as response:
-                assert not response.is_closed
-                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-                pagerule = await response.parse()
-                assert_matches_type(PageruleGetResponse, pagerule, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-                await async_client.pagerules.with_raw_response.get(
-                    pagerule_id="023e105f4ecef8ad9ca31a8372d0c353",
-                    zone_id="",
-                )
-
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `pagerule_id` but received ''"):
-                await async_client.pagerules.with_raw_response.get(
-                    pagerule_id="",
-                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                )
diff --git a/tests/api_resources/test_pcaps.py b/tests/api_resources/test_pcaps.py
deleted file mode 100644
index 43798f1c52d..00000000000
--- a/tests/api_resources/test_pcaps.py
+++ /dev/null
@@ -1,497 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.pcaps import PCAPGetResponse, PCAPListResponse, PCAPCreateResponse
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestPCAPs:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_create_overload_1(self, client: Cloudflare) -> None:
-        pcap = client.pcaps.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            packet_limit=10000,
-            system="magic-transit",
-            time_limit=300,
-            type="simple",
-        )
-        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
-
-    @parametrize
-    def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> None:
-        pcap = client.pcaps.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            packet_limit=10000,
-            system="magic-transit",
-            time_limit=300,
-            type="simple",
-            filter_v1={
-                "destination_address": "1.2.3.4",
-                "destination_port": 80,
-                "protocol": 6,
-                "source_address": "1.2.3.4",
-                "source_port": 123,
-            },
-        )
-        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
-
-    @parametrize
-    def test_raw_response_create_overload_1(self, client: Cloudflare) -> None:
-        response = client.pcaps.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            packet_limit=10000,
-            system="magic-transit",
-            time_limit=300,
-            type="simple",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pcap = response.parse()
-        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
-
-    @parametrize
-    def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
-        with client.pcaps.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            packet_limit=10000,
-            system="magic-transit",
-            time_limit=300,
-            type="simple",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            pcap = response.parse()
-            assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.pcaps.with_raw_response.create(
-                account_id="",
-                packet_limit=10000,
-                system="magic-transit",
-                time_limit=300,
-                type="simple",
-            )
-
-    @parametrize
-    def test_method_create_overload_2(self, client: Cloudflare) -> None:
-        pcap = client.pcaps.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            colo_name="ord02",
-            destination_conf="s3://pcaps-bucket?region=us-east-1",
-            system="magic-transit",
-            time_limit=300,
-            type="simple",
-        )
-        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
-
-    @parametrize
-    def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> None:
-        pcap = client.pcaps.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            colo_name="ord02",
-            destination_conf="s3://pcaps-bucket?region=us-east-1",
-            system="magic-transit",
-            time_limit=300,
-            type="simple",
-            byte_limit=500000,
-            filter_v1={
-                "destination_address": "1.2.3.4",
-                "destination_port": 80,
-                "protocol": 6,
-                "source_address": "1.2.3.4",
-                "source_port": 123,
-            },
-            packet_limit=10000,
-        )
-        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
-
-    @parametrize
-    def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
-        response = client.pcaps.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            colo_name="ord02",
-            destination_conf="s3://pcaps-bucket?region=us-east-1",
-            system="magic-transit",
-            time_limit=300,
-            type="simple",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pcap = response.parse()
-        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
-
-    @parametrize
-    def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
-        with client.pcaps.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            colo_name="ord02",
-            destination_conf="s3://pcaps-bucket?region=us-east-1",
-            system="magic-transit",
-            time_limit=300,
-            type="simple",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            pcap = response.parse()
-            assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.pcaps.with_raw_response.create(
-                account_id="",
-                colo_name="ord02",
-                destination_conf="s3://pcaps-bucket?region=us-east-1",
-                system="magic-transit",
-                time_limit=300,
-                type="simple",
-            )
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        pcap = client.pcaps.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SyncSinglePage[PCAPListResponse], pcap, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.pcaps.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pcap = response.parse()
-        assert_matches_type(SyncSinglePage[PCAPListResponse], pcap, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.pcaps.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            pcap = response.parse()
-            assert_matches_type(SyncSinglePage[PCAPListResponse], pcap, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.pcaps.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        pcap = client.pcaps.get(
-            pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(PCAPGetResponse, pcap, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.pcaps.with_raw_response.get(
-            pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pcap = response.parse()
-        assert_matches_type(PCAPGetResponse, pcap, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.pcaps.with_streaming_response.get(
-            pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            pcap = response.parse()
-            assert_matches_type(PCAPGetResponse, pcap, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.pcaps.with_raw_response.get(
-                pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `pcap_id` but received ''"):
-            client.pcaps.with_raw_response.get(
-                pcap_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-
-class TestAsyncPCAPs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
-        pcap = await async_client.pcaps.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            packet_limit=10000,
-            system="magic-transit",
-            time_limit=300,
-            type="simple",
-        )
-        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
-
-    @parametrize
-    async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
-        pcap = await async_client.pcaps.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            packet_limit=10000,
-            system="magic-transit",
-            time_limit=300,
-            type="simple",
-            filter_v1={
-                "destination_address": "1.2.3.4",
-                "destination_port": 80,
-                "protocol": 6,
-                "source_address": "1.2.3.4",
-                "source_port": 123,
-            },
-        )
-        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
-
-    @parametrize
-    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.pcaps.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            packet_limit=10000,
-            system="magic-transit",
-            time_limit=300,
-            type="simple",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pcap = await response.parse()
-        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.pcaps.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            packet_limit=10000,
-            system="magic-transit",
-            time_limit=300,
-            type="simple",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            pcap = await response.parse()
-            assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.pcaps.with_raw_response.create(
-                account_id="",
-                packet_limit=10000,
-                system="magic-transit",
-                time_limit=300,
-                type="simple",
-            )
-
-    @parametrize
-    async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
-        pcap = await async_client.pcaps.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            colo_name="ord02",
-            destination_conf="s3://pcaps-bucket?region=us-east-1",
-            system="magic-transit",
-            time_limit=300,
-            type="simple",
-        )
-        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
-
-    @parametrize
-    async def test_method_create_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
-        pcap = await async_client.pcaps.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            colo_name="ord02",
-            destination_conf="s3://pcaps-bucket?region=us-east-1",
-            system="magic-transit",
-            time_limit=300,
-            type="simple",
-            byte_limit=500000,
-            filter_v1={
-                "destination_address": "1.2.3.4",
-                "destination_port": 80,
-                "protocol": 6,
-                "source_address": "1.2.3.4",
-                "source_port": 123,
-            },
-            packet_limit=10000,
-        )
-        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
-
-    @parametrize
-    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.pcaps.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            colo_name="ord02",
-            destination_conf="s3://pcaps-bucket?region=us-east-1",
-            system="magic-transit",
-            time_limit=300,
-            type="simple",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pcap = await response.parse()
-        assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.pcaps.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            colo_name="ord02",
-            destination_conf="s3://pcaps-bucket?region=us-east-1",
-            system="magic-transit",
-            time_limit=300,
-            type="simple",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            pcap = await response.parse()
-            assert_matches_type(PCAPCreateResponse, pcap, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.pcaps.with_raw_response.create(
-                account_id="",
-                colo_name="ord02",
-                destination_conf="s3://pcaps-bucket?region=us-east-1",
-                system="magic-transit",
-                time_limit=300,
-                type="simple",
-            )
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        pcap = await async_client.pcaps.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(AsyncSinglePage[PCAPListResponse], pcap, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.pcaps.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pcap = await response.parse()
-        assert_matches_type(AsyncSinglePage[PCAPListResponse], pcap, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.pcaps.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            pcap = await response.parse()
-            assert_matches_type(AsyncSinglePage[PCAPListResponse], pcap, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.pcaps.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        pcap = await async_client.pcaps.get(
-            pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(PCAPGetResponse, pcap, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.pcaps.with_raw_response.get(
-            pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        pcap = await response.parse()
-        assert_matches_type(PCAPGetResponse, pcap, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.pcaps.with_streaming_response.get(
-            pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            pcap = await response.parse()
-            assert_matches_type(PCAPGetResponse, pcap, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.pcaps.with_raw_response.get(
-                pcap_id="023e105f4ecef8ad9ca31a8372d0c353",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `pcap_id` but received ''"):
-            await async_client.pcaps.with_raw_response.get(
-                pcap_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
diff --git a/tests/api_resources/test_pipelines.py b/tests/api_resources/test_pipelines.py
new file mode 100644
index 00000000000..dba93e02632
--- /dev/null
+++ b/tests/api_resources/test_pipelines.py
@@ -0,0 +1,1384 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.pipelines import (
+    PipelineGetResponse,
+    PipelineListResponse,
+    PipelineGetV1Response,
+    PipelineCreateResponse,
+    PipelineListV1Response,
+    PipelineUpdateResponse,
+    PipelineCreateV1Response,
+    PipelineValidateSqlResponse,
+)
+
+# pyright: reportDeprecated=false
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestPipelines:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            pipeline = client.pipelines.create(
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                destination={
+                    "batch": {},
+                    "compression": {},
+                    "credentials": {
+                        "access_key_id": "<access key id>",
+                        "endpoint": "https://123f8a8258064ed892a347f173372359.r2.cloudflarestorage.com",
+                        "secret_access_key": "<secret key>",
+                    },
+                    "format": "json",
+                    "path": {"bucket": "bucket"},
+                    "type": "r2",
+                },
+                name="sample_pipeline",
+                source=[
+                    {
+                        "format": "json",
+                        "type": "type",
+                    }
+                ],
+            )
+
+        assert_matches_type(PipelineCreateResponse, pipeline, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.pipelines.with_raw_response.create(
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                destination={
+                    "batch": {},
+                    "compression": {},
+                    "credentials": {
+                        "access_key_id": "<access key id>",
+                        "endpoint": "https://123f8a8258064ed892a347f173372359.r2.cloudflarestorage.com",
+                        "secret_access_key": "<secret key>",
+                    },
+                    "format": "json",
+                    "path": {"bucket": "bucket"},
+                    "type": "r2",
+                },
+                name="sample_pipeline",
+                source=[
+                    {
+                        "format": "json",
+                        "type": "type",
+                    }
+                ],
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = response.parse()
+        assert_matches_type(PipelineCreateResponse, pipeline, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.pipelines.with_streaming_response.create(
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                destination={
+                    "batch": {},
+                    "compression": {},
+                    "credentials": {
+                        "access_key_id": "<access key id>",
+                        "endpoint": "https://123f8a8258064ed892a347f173372359.r2.cloudflarestorage.com",
+                        "secret_access_key": "<secret key>",
+                    },
+                    "format": "json",
+                    "path": {"bucket": "bucket"},
+                    "type": "r2",
+                },
+                name="sample_pipeline",
+                source=[
+                    {
+                        "format": "json",
+                        "type": "type",
+                    }
+                ],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                pipeline = response.parse()
+                assert_matches_type(PipelineCreateResponse, pipeline, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.pipelines.with_raw_response.create(
+                    account_id="",
+                    destination={
+                        "batch": {},
+                        "compression": {},
+                        "credentials": {
+                            "access_key_id": "<access key id>",
+                            "endpoint": "https://123f8a8258064ed892a347f173372359.r2.cloudflarestorage.com",
+                            "secret_access_key": "<secret key>",
+                        },
+                        "format": "json",
+                        "path": {"bucket": "bucket"},
+                        "type": "r2",
+                    },
+                    name="sample_pipeline",
+                    source=[
+                        {
+                            "format": "json",
+                            "type": "type",
+                        }
+                    ],
+                )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            pipeline = client.pipelines.update(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                destination={
+                    "batch": {},
+                    "compression": {},
+                    "format": "json",
+                    "path": {"bucket": "bucket"},
+                    "type": "r2",
+                },
+                name="sample_pipeline",
+                source=[
+                    {
+                        "format": "json",
+                        "type": "type",
+                    }
+                ],
+            )
+
+        assert_matches_type(PipelineUpdateResponse, pipeline, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            pipeline = client.pipelines.update(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                destination={
+                    "batch": {
+                        "max_bytes": 1000,
+                        "max_duration_s": 0.25,
+                        "max_rows": 100,
+                    },
+                    "compression": {"type": "gzip"},
+                    "format": "json",
+                    "path": {
+                        "bucket": "bucket",
+                        "filename": "${slug}${extension}",
+                        "filepath": "${date}/${hour}",
+                        "prefix": "base",
+                    },
+                    "type": "r2",
+                    "credentials": {
+                        "access_key_id": "<access key id>",
+                        "endpoint": "https://123f8a8258064ed892a347f173372359.r2.cloudflarestorage.com",
+                        "secret_access_key": "<secret key>",
+                    },
+                },
+                name="sample_pipeline",
+                source=[
+                    {
+                        "format": "json",
+                        "type": "type",
+                        "authentication": True,
+                        "cors": {"origins": ["*"]},
+                    }
+                ],
+            )
+
+        assert_matches_type(PipelineUpdateResponse, pipeline, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.pipelines.with_raw_response.update(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                destination={
+                    "batch": {},
+                    "compression": {},
+                    "format": "json",
+                    "path": {"bucket": "bucket"},
+                    "type": "r2",
+                },
+                name="sample_pipeline",
+                source=[
+                    {
+                        "format": "json",
+                        "type": "type",
+                    }
+                ],
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = response.parse()
+        assert_matches_type(PipelineUpdateResponse, pipeline, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.pipelines.with_streaming_response.update(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                destination={
+                    "batch": {},
+                    "compression": {},
+                    "format": "json",
+                    "path": {"bucket": "bucket"},
+                    "type": "r2",
+                },
+                name="sample_pipeline",
+                source=[
+                    {
+                        "format": "json",
+                        "type": "type",
+                    }
+                ],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                pipeline = response.parse()
+                assert_matches_type(PipelineUpdateResponse, pipeline, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.pipelines.with_raw_response.update(
+                    pipeline_name="sample_pipeline",
+                    account_id="",
+                    destination={
+                        "batch": {},
+                        "compression": {},
+                        "format": "json",
+                        "path": {"bucket": "bucket"},
+                        "type": "r2",
+                    },
+                    name="sample_pipeline",
+                    source=[
+                        {
+                            "format": "json",
+                            "type": "type",
+                        }
+                    ],
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `pipeline_name` but received ''"):
+                client.pipelines.with_raw_response.update(
+                    pipeline_name="",
+                    account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                    destination={
+                        "batch": {},
+                        "compression": {},
+                        "format": "json",
+                        "path": {"bucket": "bucket"},
+                        "type": "r2",
+                    },
+                    name="sample_pipeline",
+                    source=[
+                        {
+                            "format": "json",
+                            "type": "type",
+                        }
+                    ],
+                )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            pipeline = client.pipelines.list(
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(PipelineListResponse, pipeline, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            pipeline = client.pipelines.list(
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                page="page",
+                per_page="per_page",
+                search="search",
+            )
+
+        assert_matches_type(PipelineListResponse, pipeline, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.pipelines.with_raw_response.list(
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = response.parse()
+        assert_matches_type(PipelineListResponse, pipeline, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.pipelines.with_streaming_response.list(
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                pipeline = response.parse()
+                assert_matches_type(PipelineListResponse, pipeline, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.pipelines.with_raw_response.list(
+                    account_id="",
+                )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            pipeline = client.pipelines.delete(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert pipeline is None
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.pipelines.with_raw_response.delete(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = response.parse()
+        assert pipeline is None
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.pipelines.with_streaming_response.delete(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                pipeline = response.parse()
+                assert pipeline is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.pipelines.with_raw_response.delete(
+                    pipeline_name="sample_pipeline",
+                    account_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `pipeline_name` but received ''"):
+                client.pipelines.with_raw_response.delete(
+                    pipeline_name="",
+                    account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                )
+
+    @parametrize
+    def test_method_create_v1(self, client: Cloudflare) -> None:
+        pipeline = client.pipelines.create_v1(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_pipeline",
+            sql="insert into sink select * from source;",
+        )
+        assert_matches_type(PipelineCreateV1Response, pipeline, path=["response"])
+
+    @parametrize
+    def test_raw_response_create_v1(self, client: Cloudflare) -> None:
+        response = client.pipelines.with_raw_response.create_v1(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_pipeline",
+            sql="insert into sink select * from source;",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = response.parse()
+        assert_matches_type(PipelineCreateV1Response, pipeline, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create_v1(self, client: Cloudflare) -> None:
+        with client.pipelines.with_streaming_response.create_v1(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_pipeline",
+            sql="insert into sink select * from source;",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pipeline = response.parse()
+            assert_matches_type(PipelineCreateV1Response, pipeline, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create_v1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.pipelines.with_raw_response.create_v1(
+                account_id="",
+                name="my_pipeline",
+                sql="insert into sink select * from source;",
+            )
+
+    @parametrize
+    def test_method_delete_v1(self, client: Cloudflare) -> None:
+        pipeline = client.pipelines.delete_v1(
+            pipeline_id="043e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert pipeline is None
+
+    @parametrize
+    def test_raw_response_delete_v1(self, client: Cloudflare) -> None:
+        response = client.pipelines.with_raw_response.delete_v1(
+            pipeline_id="043e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = response.parse()
+        assert pipeline is None
+
+    @parametrize
+    def test_streaming_response_delete_v1(self, client: Cloudflare) -> None:
+        with client.pipelines.with_streaming_response.delete_v1(
+            pipeline_id="043e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pipeline = response.parse()
+            assert pipeline is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete_v1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.pipelines.with_raw_response.delete_v1(
+                pipeline_id="043e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `pipeline_id` but received ''"):
+            client.pipelines.with_raw_response.delete_v1(
+                pipeline_id="",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            pipeline = client.pipelines.get(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(PipelineGetResponse, pipeline, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.pipelines.with_raw_response.get(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = response.parse()
+        assert_matches_type(PipelineGetResponse, pipeline, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.pipelines.with_streaming_response.get(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                pipeline = response.parse()
+                assert_matches_type(PipelineGetResponse, pipeline, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.pipelines.with_raw_response.get(
+                    pipeline_name="sample_pipeline",
+                    account_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `pipeline_name` but received ''"):
+                client.pipelines.with_raw_response.get(
+                    pipeline_name="",
+                    account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                )
+
+    @parametrize
+    def test_method_get_v1(self, client: Cloudflare) -> None:
+        pipeline = client.pipelines.get_v1(
+            pipeline_id="043e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(PipelineGetV1Response, pipeline, path=["response"])
+
+    @parametrize
+    def test_raw_response_get_v1(self, client: Cloudflare) -> None:
+        response = client.pipelines.with_raw_response.get_v1(
+            pipeline_id="043e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = response.parse()
+        assert_matches_type(PipelineGetV1Response, pipeline, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get_v1(self, client: Cloudflare) -> None:
+        with client.pipelines.with_streaming_response.get_v1(
+            pipeline_id="043e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pipeline = response.parse()
+            assert_matches_type(PipelineGetV1Response, pipeline, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get_v1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.pipelines.with_raw_response.get_v1(
+                pipeline_id="043e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `pipeline_id` but received ''"):
+            client.pipelines.with_raw_response.get_v1(
+                pipeline_id="",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_list_v1(self, client: Cloudflare) -> None:
+        pipeline = client.pipelines.list_v1(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[PipelineListV1Response], pipeline, path=["response"])
+
+    @parametrize
+    def test_method_list_v1_with_all_params(self, client: Cloudflare) -> None:
+        pipeline = client.pipelines.list_v1(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=0,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[PipelineListV1Response], pipeline, path=["response"])
+
+    @parametrize
+    def test_raw_response_list_v1(self, client: Cloudflare) -> None:
+        response = client.pipelines.with_raw_response.list_v1(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[PipelineListV1Response], pipeline, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list_v1(self, client: Cloudflare) -> None:
+        with client.pipelines.with_streaming_response.list_v1(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pipeline = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[PipelineListV1Response], pipeline, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list_v1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.pipelines.with_raw_response.list_v1(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_validate_sql(self, client: Cloudflare) -> None:
+        pipeline = client.pipelines.validate_sql(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            sql="insert into sink select * from source;",
+        )
+        assert_matches_type(PipelineValidateSqlResponse, pipeline, path=["response"])
+
+    @parametrize
+    def test_raw_response_validate_sql(self, client: Cloudflare) -> None:
+        response = client.pipelines.with_raw_response.validate_sql(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            sql="insert into sink select * from source;",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = response.parse()
+        assert_matches_type(PipelineValidateSqlResponse, pipeline, path=["response"])
+
+    @parametrize
+    def test_streaming_response_validate_sql(self, client: Cloudflare) -> None:
+        with client.pipelines.with_streaming_response.validate_sql(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            sql="insert into sink select * from source;",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pipeline = response.parse()
+            assert_matches_type(PipelineValidateSqlResponse, pipeline, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_validate_sql(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.pipelines.with_raw_response.validate_sql(
+                account_id="",
+                sql="insert into sink select * from source;",
+            )
+
+
+class TestAsyncPipelines:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            pipeline = await async_client.pipelines.create(
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                destination={
+                    "batch": {},
+                    "compression": {},
+                    "credentials": {
+                        "access_key_id": "<access key id>",
+                        "endpoint": "https://123f8a8258064ed892a347f173372359.r2.cloudflarestorage.com",
+                        "secret_access_key": "<secret key>",
+                    },
+                    "format": "json",
+                    "path": {"bucket": "bucket"},
+                    "type": "r2",
+                },
+                name="sample_pipeline",
+                source=[
+                    {
+                        "format": "json",
+                        "type": "type",
+                    }
+                ],
+            )
+
+        assert_matches_type(PipelineCreateResponse, pipeline, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.pipelines.with_raw_response.create(
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                destination={
+                    "batch": {},
+                    "compression": {},
+                    "credentials": {
+                        "access_key_id": "<access key id>",
+                        "endpoint": "https://123f8a8258064ed892a347f173372359.r2.cloudflarestorage.com",
+                        "secret_access_key": "<secret key>",
+                    },
+                    "format": "json",
+                    "path": {"bucket": "bucket"},
+                    "type": "r2",
+                },
+                name="sample_pipeline",
+                source=[
+                    {
+                        "format": "json",
+                        "type": "type",
+                    }
+                ],
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = await response.parse()
+        assert_matches_type(PipelineCreateResponse, pipeline, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.pipelines.with_streaming_response.create(
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                destination={
+                    "batch": {},
+                    "compression": {},
+                    "credentials": {
+                        "access_key_id": "<access key id>",
+                        "endpoint": "https://123f8a8258064ed892a347f173372359.r2.cloudflarestorage.com",
+                        "secret_access_key": "<secret key>",
+                    },
+                    "format": "json",
+                    "path": {"bucket": "bucket"},
+                    "type": "r2",
+                },
+                name="sample_pipeline",
+                source=[
+                    {
+                        "format": "json",
+                        "type": "type",
+                    }
+                ],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                pipeline = await response.parse()
+                assert_matches_type(PipelineCreateResponse, pipeline, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.pipelines.with_raw_response.create(
+                    account_id="",
+                    destination={
+                        "batch": {},
+                        "compression": {},
+                        "credentials": {
+                            "access_key_id": "<access key id>",
+                            "endpoint": "https://123f8a8258064ed892a347f173372359.r2.cloudflarestorage.com",
+                            "secret_access_key": "<secret key>",
+                        },
+                        "format": "json",
+                        "path": {"bucket": "bucket"},
+                        "type": "r2",
+                    },
+                    name="sample_pipeline",
+                    source=[
+                        {
+                            "format": "json",
+                            "type": "type",
+                        }
+                    ],
+                )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            pipeline = await async_client.pipelines.update(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                destination={
+                    "batch": {},
+                    "compression": {},
+                    "format": "json",
+                    "path": {"bucket": "bucket"},
+                    "type": "r2",
+                },
+                name="sample_pipeline",
+                source=[
+                    {
+                        "format": "json",
+                        "type": "type",
+                    }
+                ],
+            )
+
+        assert_matches_type(PipelineUpdateResponse, pipeline, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            pipeline = await async_client.pipelines.update(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                destination={
+                    "batch": {
+                        "max_bytes": 1000,
+                        "max_duration_s": 0.25,
+                        "max_rows": 100,
+                    },
+                    "compression": {"type": "gzip"},
+                    "format": "json",
+                    "path": {
+                        "bucket": "bucket",
+                        "filename": "${slug}${extension}",
+                        "filepath": "${date}/${hour}",
+                        "prefix": "base",
+                    },
+                    "type": "r2",
+                    "credentials": {
+                        "access_key_id": "<access key id>",
+                        "endpoint": "https://123f8a8258064ed892a347f173372359.r2.cloudflarestorage.com",
+                        "secret_access_key": "<secret key>",
+                    },
+                },
+                name="sample_pipeline",
+                source=[
+                    {
+                        "format": "json",
+                        "type": "type",
+                        "authentication": True,
+                        "cors": {"origins": ["*"]},
+                    }
+                ],
+            )
+
+        assert_matches_type(PipelineUpdateResponse, pipeline, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.pipelines.with_raw_response.update(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                destination={
+                    "batch": {},
+                    "compression": {},
+                    "format": "json",
+                    "path": {"bucket": "bucket"},
+                    "type": "r2",
+                },
+                name="sample_pipeline",
+                source=[
+                    {
+                        "format": "json",
+                        "type": "type",
+                    }
+                ],
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = await response.parse()
+        assert_matches_type(PipelineUpdateResponse, pipeline, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.pipelines.with_streaming_response.update(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                destination={
+                    "batch": {},
+                    "compression": {},
+                    "format": "json",
+                    "path": {"bucket": "bucket"},
+                    "type": "r2",
+                },
+                name="sample_pipeline",
+                source=[
+                    {
+                        "format": "json",
+                        "type": "type",
+                    }
+                ],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                pipeline = await response.parse()
+                assert_matches_type(PipelineUpdateResponse, pipeline, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.pipelines.with_raw_response.update(
+                    pipeline_name="sample_pipeline",
+                    account_id="",
+                    destination={
+                        "batch": {},
+                        "compression": {},
+                        "format": "json",
+                        "path": {"bucket": "bucket"},
+                        "type": "r2",
+                    },
+                    name="sample_pipeline",
+                    source=[
+                        {
+                            "format": "json",
+                            "type": "type",
+                        }
+                    ],
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `pipeline_name` but received ''"):
+                await async_client.pipelines.with_raw_response.update(
+                    pipeline_name="",
+                    account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                    destination={
+                        "batch": {},
+                        "compression": {},
+                        "format": "json",
+                        "path": {"bucket": "bucket"},
+                        "type": "r2",
+                    },
+                    name="sample_pipeline",
+                    source=[
+                        {
+                            "format": "json",
+                            "type": "type",
+                        }
+                    ],
+                )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            pipeline = await async_client.pipelines.list(
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(PipelineListResponse, pipeline, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            pipeline = await async_client.pipelines.list(
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                page="page",
+                per_page="per_page",
+                search="search",
+            )
+
+        assert_matches_type(PipelineListResponse, pipeline, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.pipelines.with_raw_response.list(
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = await response.parse()
+        assert_matches_type(PipelineListResponse, pipeline, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.pipelines.with_streaming_response.list(
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                pipeline = await response.parse()
+                assert_matches_type(PipelineListResponse, pipeline, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.pipelines.with_raw_response.list(
+                    account_id="",
+                )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            pipeline = await async_client.pipelines.delete(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert pipeline is None
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.pipelines.with_raw_response.delete(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = await response.parse()
+        assert pipeline is None
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.pipelines.with_streaming_response.delete(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                pipeline = await response.parse()
+                assert pipeline is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.pipelines.with_raw_response.delete(
+                    pipeline_name="sample_pipeline",
+                    account_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `pipeline_name` but received ''"):
+                await async_client.pipelines.with_raw_response.delete(
+                    pipeline_name="",
+                    account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                )
+
+    @parametrize
+    async def test_method_create_v1(self, async_client: AsyncCloudflare) -> None:
+        pipeline = await async_client.pipelines.create_v1(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_pipeline",
+            sql="insert into sink select * from source;",
+        )
+        assert_matches_type(PipelineCreateV1Response, pipeline, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create_v1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.pipelines.with_raw_response.create_v1(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_pipeline",
+            sql="insert into sink select * from source;",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = await response.parse()
+        assert_matches_type(PipelineCreateV1Response, pipeline, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create_v1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.pipelines.with_streaming_response.create_v1(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            name="my_pipeline",
+            sql="insert into sink select * from source;",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pipeline = await response.parse()
+            assert_matches_type(PipelineCreateV1Response, pipeline, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create_v1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.pipelines.with_raw_response.create_v1(
+                account_id="",
+                name="my_pipeline",
+                sql="insert into sink select * from source;",
+            )
+
+    @parametrize
+    async def test_method_delete_v1(self, async_client: AsyncCloudflare) -> None:
+        pipeline = await async_client.pipelines.delete_v1(
+            pipeline_id="043e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert pipeline is None
+
+    @parametrize
+    async def test_raw_response_delete_v1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.pipelines.with_raw_response.delete_v1(
+            pipeline_id="043e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = await response.parse()
+        assert pipeline is None
+
+    @parametrize
+    async def test_streaming_response_delete_v1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.pipelines.with_streaming_response.delete_v1(
+            pipeline_id="043e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pipeline = await response.parse()
+            assert pipeline is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete_v1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.pipelines.with_raw_response.delete_v1(
+                pipeline_id="043e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `pipeline_id` but received ''"):
+            await async_client.pipelines.with_raw_response.delete_v1(
+                pipeline_id="",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            pipeline = await async_client.pipelines.get(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(PipelineGetResponse, pipeline, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.pipelines.with_raw_response.get(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = await response.parse()
+        assert_matches_type(PipelineGetResponse, pipeline, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.pipelines.with_streaming_response.get(
+                pipeline_name="sample_pipeline",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                pipeline = await response.parse()
+                assert_matches_type(PipelineGetResponse, pipeline, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.pipelines.with_raw_response.get(
+                    pipeline_name="sample_pipeline",
+                    account_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `pipeline_name` but received ''"):
+                await async_client.pipelines.with_raw_response.get(
+                    pipeline_name="",
+                    account_id="0123105f4ecef8ad9ca31a8372d0c353",
+                )
+
+    @parametrize
+    async def test_method_get_v1(self, async_client: AsyncCloudflare) -> None:
+        pipeline = await async_client.pipelines.get_v1(
+            pipeline_id="043e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(PipelineGetV1Response, pipeline, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get_v1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.pipelines.with_raw_response.get_v1(
+            pipeline_id="043e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = await response.parse()
+        assert_matches_type(PipelineGetV1Response, pipeline, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get_v1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.pipelines.with_streaming_response.get_v1(
+            pipeline_id="043e105f4ecef8ad9ca31a8372d0c353",
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pipeline = await response.parse()
+            assert_matches_type(PipelineGetV1Response, pipeline, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get_v1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.pipelines.with_raw_response.get_v1(
+                pipeline_id="043e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `pipeline_id` but received ''"):
+            await async_client.pipelines.with_raw_response.get_v1(
+                pipeline_id="",
+                account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_list_v1(self, async_client: AsyncCloudflare) -> None:
+        pipeline = await async_client.pipelines.list_v1(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[PipelineListV1Response], pipeline, path=["response"])
+
+    @parametrize
+    async def test_method_list_v1_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        pipeline = await async_client.pipelines.list_v1(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=0,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[PipelineListV1Response], pipeline, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list_v1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.pipelines.with_raw_response.list_v1(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[PipelineListV1Response], pipeline, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list_v1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.pipelines.with_streaming_response.list_v1(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pipeline = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[PipelineListV1Response], pipeline, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list_v1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.pipelines.with_raw_response.list_v1(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_validate_sql(self, async_client: AsyncCloudflare) -> None:
+        pipeline = await async_client.pipelines.validate_sql(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            sql="insert into sink select * from source;",
+        )
+        assert_matches_type(PipelineValidateSqlResponse, pipeline, path=["response"])
+
+    @parametrize
+    async def test_raw_response_validate_sql(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.pipelines.with_raw_response.validate_sql(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            sql="insert into sink select * from source;",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        pipeline = await response.parse()
+        assert_matches_type(PipelineValidateSqlResponse, pipeline, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_validate_sql(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.pipelines.with_streaming_response.validate_sql(
+            account_id="0123105f4ecef8ad9ca31a8372d0c353",
+            sql="insert into sink select * from source;",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            pipeline = await response.parse()
+            assert_matches_type(PipelineValidateSqlResponse, pipeline, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_validate_sql(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.pipelines.with_raw_response.validate_sql(
+                account_id="",
+                sql="insert into sink select * from source;",
+            )
diff --git a/tests/api_resources/test_plans.py b/tests/api_resources/test_plans.py
deleted file mode 100644
index 8a3ef3ee191..00000000000
--- a/tests/api_resources/test_plans.py
+++ /dev/null
@@ -1,195 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-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")
-
-
-class TestPlans:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        plan = client.plans.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SyncSinglePage[AvailableRatePlan], plan, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.plans.with_raw_response.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        plan = response.parse()
-        assert_matches_type(SyncSinglePage[AvailableRatePlan], plan, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.plans.with_streaming_response.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            plan = response.parse()
-            assert_matches_type(SyncSinglePage[AvailableRatePlan], plan, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            client.plans.with_raw_response.list(
-                "",
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        plan = client.plans.get(
-            plan_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(AvailableRatePlan, plan, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.plans.with_raw_response.get(
-            plan_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        plan = response.parse()
-        assert_matches_type(AvailableRatePlan, plan, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.plans.with_streaming_response.get(
-            plan_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            plan = response.parse()
-            assert_matches_type(AvailableRatePlan, plan, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            client.plans.with_raw_response.get(
-                plan_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `plan_identifier` but received ''"):
-            client.plans.with_raw_response.get(
-                plan_identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-
-class TestAsyncPlans:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        plan = await async_client.plans.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(AsyncSinglePage[AvailableRatePlan], plan, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.plans.with_raw_response.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        plan = await response.parse()
-        assert_matches_type(AsyncSinglePage[AvailableRatePlan], plan, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.plans.with_streaming_response.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            plan = await response.parse()
-            assert_matches_type(AsyncSinglePage[AvailableRatePlan], plan, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            await async_client.plans.with_raw_response.list(
-                "",
-            )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        plan = await async_client.plans.get(
-            plan_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(AvailableRatePlan, plan, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.plans.with_raw_response.get(
-            plan_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        plan = await response.parse()
-        assert_matches_type(AvailableRatePlan, plan, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.plans.with_streaming_response.get(
-            plan_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            plan = await response.parse()
-            assert_matches_type(AvailableRatePlan, plan, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            await async_client.plans.with_raw_response.get(
-                plan_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `plan_identifier` but received ''"):
-            await async_client.plans.with_raw_response.get(
-                plan_identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            )
diff --git a/tests/api_resources/test_queues.py b/tests/api_resources/test_queues.py
index 87752b02448..e337e5aae5c 100644
--- a/tests/api_resources/test_queues.py
+++ b/tests/api_resources/test_queues.py
@@ -12,8 +12,6 @@
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.queues import (
     Queue,
-    QueueCreated,
-    QueueUpdated,
     QueueDeleteResponse,
 )
 
@@ -27,33 +25,33 @@ class TestQueues:
     def test_method_create(self, client: Cloudflare) -> None:
         queue = client.queues.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={"queue_name": "example-queue"},
+            queue_name="example-queue",
         )
-        assert_matches_type(Optional[QueueCreated], queue, path=["response"])
+        assert_matches_type(Optional[Queue], queue, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.queues.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={"queue_name": "example-queue"},
+            queue_name="example-queue",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         queue = response.parse()
-        assert_matches_type(Optional[QueueCreated], queue, path=["response"])
+        assert_matches_type(Optional[Queue], queue, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.queues.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={"queue_name": "example-queue"},
+            queue_name="example-queue",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             queue = response.parse()
-            assert_matches_type(Optional[QueueCreated], queue, path=["response"])
+            assert_matches_type(Optional[Queue], queue, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -62,7 +60,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.queues.with_raw_response.create(
                 account_id="",
-                body={"queue_name": "example-queue"},
+                queue_name="example-queue",
             )
 
     @parametrize
@@ -70,35 +68,46 @@ def test_method_update(self, client: Cloudflare) -> None:
         queue = client.queues.update(
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={"queue_name": "renamed-example-queue"},
         )
-        assert_matches_type(Optional[QueueUpdated], queue, path=["response"])
+        assert_matches_type(Optional[Queue], queue, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        queue = client.queues.update(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_name="example-queue",
+            settings={
+                "delivery_delay": 5,
+                "delivery_paused": True,
+                "message_retention_period": 345600,
+            },
+        )
+        assert_matches_type(Optional[Queue], queue, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.queues.with_raw_response.update(
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={"queue_name": "renamed-example-queue"},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         queue = response.parse()
-        assert_matches_type(Optional[QueueUpdated], queue, path=["response"])
+        assert_matches_type(Optional[Queue], queue, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.queues.with_streaming_response.update(
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={"queue_name": "renamed-example-queue"},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             queue = response.parse()
-            assert_matches_type(Optional[QueueUpdated], queue, path=["response"])
+            assert_matches_type(Optional[Queue], queue, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -108,14 +117,12 @@ def test_path_params_update(self, client: Cloudflare) -> None:
             client.queues.with_raw_response.update(
                 queue_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
-                body={"queue_name": "renamed-example-queue"},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
             client.queues.with_raw_response.update(
                 queue_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={"queue_name": "renamed-example-queue"},
             )
 
     @parametrize
@@ -162,7 +169,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[QueueDeleteResponse], queue, path=["response"])
+        assert_matches_type(QueueDeleteResponse, queue, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -174,7 +181,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         queue = response.parse()
-        assert_matches_type(Optional[QueueDeleteResponse], queue, path=["response"])
+        assert_matches_type(QueueDeleteResponse, queue, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -186,7 +193,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             queue = response.parse()
-            assert_matches_type(Optional[QueueDeleteResponse], queue, path=["response"])
+            assert_matches_type(QueueDeleteResponse, queue, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -204,6 +211,68 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        queue = client.queues.edit(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[Queue], queue, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        queue = client.queues.edit(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_name="example-queue",
+            settings={
+                "delivery_delay": 5,
+                "delivery_paused": True,
+                "message_retention_period": 345600,
+            },
+        )
+        assert_matches_type(Optional[Queue], queue, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.queues.with_raw_response.edit(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        queue = response.parse()
+        assert_matches_type(Optional[Queue], queue, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.queues.with_streaming_response.edit(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            queue = response.parse()
+            assert_matches_type(Optional[Queue], queue, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.queues.with_raw_response.edit(
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            client.queues.with_raw_response.edit(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         queue = client.queues.get(
@@ -254,39 +323,41 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncQueues:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         queue = await async_client.queues.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={"queue_name": "example-queue"},
+            queue_name="example-queue",
         )
-        assert_matches_type(Optional[QueueCreated], queue, path=["response"])
+        assert_matches_type(Optional[Queue], queue, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.queues.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={"queue_name": "example-queue"},
+            queue_name="example-queue",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         queue = await response.parse()
-        assert_matches_type(Optional[QueueCreated], queue, path=["response"])
+        assert_matches_type(Optional[Queue], queue, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.queues.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={"queue_name": "example-queue"},
+            queue_name="example-queue",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             queue = await response.parse()
-            assert_matches_type(Optional[QueueCreated], queue, path=["response"])
+            assert_matches_type(Optional[Queue], queue, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -295,7 +366,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.queues.with_raw_response.create(
                 account_id="",
-                body={"queue_name": "example-queue"},
+                queue_name="example-queue",
             )
 
     @parametrize
@@ -303,35 +374,46 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         queue = await async_client.queues.update(
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={"queue_name": "renamed-example-queue"},
         )
-        assert_matches_type(Optional[QueueUpdated], queue, path=["response"])
+        assert_matches_type(Optional[Queue], queue, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        queue = await async_client.queues.update(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_name="example-queue",
+            settings={
+                "delivery_delay": 5,
+                "delivery_paused": True,
+                "message_retention_period": 345600,
+            },
+        )
+        assert_matches_type(Optional[Queue], queue, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.queues.with_raw_response.update(
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={"queue_name": "renamed-example-queue"},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         queue = await response.parse()
-        assert_matches_type(Optional[QueueUpdated], queue, path=["response"])
+        assert_matches_type(Optional[Queue], queue, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.queues.with_streaming_response.update(
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body={"queue_name": "renamed-example-queue"},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             queue = await response.parse()
-            assert_matches_type(Optional[QueueUpdated], queue, path=["response"])
+            assert_matches_type(Optional[Queue], queue, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -341,14 +423,12 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
             await async_client.queues.with_raw_response.update(
                 queue_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
-                body={"queue_name": "renamed-example-queue"},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
             await async_client.queues.with_raw_response.update(
                 queue_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body={"queue_name": "renamed-example-queue"},
             )
 
     @parametrize
@@ -395,7 +475,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             queue_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[QueueDeleteResponse], queue, path=["response"])
+        assert_matches_type(QueueDeleteResponse, queue, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -407,7 +487,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         queue = await response.parse()
-        assert_matches_type(Optional[QueueDeleteResponse], queue, path=["response"])
+        assert_matches_type(QueueDeleteResponse, queue, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -419,7 +499,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             queue = await response.parse()
-            assert_matches_type(Optional[QueueDeleteResponse], queue, path=["response"])
+            assert_matches_type(QueueDeleteResponse, queue, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -437,6 +517,68 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        queue = await async_client.queues.edit(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[Queue], queue, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        queue = await async_client.queues.edit(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            queue_name="example-queue",
+            settings={
+                "delivery_delay": 5,
+                "delivery_paused": True,
+                "message_retention_period": 345600,
+            },
+        )
+        assert_matches_type(Optional[Queue], queue, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.queues.with_raw_response.edit(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        queue = await response.parse()
+        assert_matches_type(Optional[Queue], queue, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.queues.with_streaming_response.edit(
+            queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            queue = await response.parse()
+            assert_matches_type(Optional[Queue], queue, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.queues.with_raw_response.edit(
+                queue_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `queue_id` but received ''"):
+            await async_client.queues.with_raw_response.edit(
+                queue_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         queue = await async_client.queues.get(
diff --git a/tests/api_resources/test_r2_data_catalog.py b/tests/api_resources/test_r2_data_catalog.py
new file mode 100644
index 00000000000..a47a6f35990
--- /dev/null
+++ b/tests/api_resources/test_r2_data_catalog.py
@@ -0,0 +1,392 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.r2_data_catalog import (
+    R2DataCatalogGetResponse,
+    R2DataCatalogListResponse,
+    R2DataCatalogEnableResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestR2DataCatalog:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        r2_data_catalog = client.r2_data_catalog.list(
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+        assert_matches_type(Optional[R2DataCatalogListResponse], r2_data_catalog, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.r2_data_catalog.with_raw_response.list(
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        r2_data_catalog = response.parse()
+        assert_matches_type(Optional[R2DataCatalogListResponse], r2_data_catalog, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.r2_data_catalog.with_streaming_response.list(
+            account_id="0123456789abcdef0123456789abcdef",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            r2_data_catalog = response.parse()
+            assert_matches_type(Optional[R2DataCatalogListResponse], r2_data_catalog, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2_data_catalog.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_disable(self, client: Cloudflare) -> None:
+        r2_data_catalog = client.r2_data_catalog.disable(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+        assert r2_data_catalog is None
+
+    @parametrize
+    def test_raw_response_disable(self, client: Cloudflare) -> None:
+        response = client.r2_data_catalog.with_raw_response.disable(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        r2_data_catalog = response.parse()
+        assert r2_data_catalog is None
+
+    @parametrize
+    def test_streaming_response_disable(self, client: Cloudflare) -> None:
+        with client.r2_data_catalog.with_streaming_response.disable(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            r2_data_catalog = response.parse()
+            assert r2_data_catalog is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_disable(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2_data_catalog.with_raw_response.disable(
+                bucket_name="my-data-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2_data_catalog.with_raw_response.disable(
+                bucket_name="",
+                account_id="0123456789abcdef0123456789abcdef",
+            )
+
+    @parametrize
+    def test_method_enable(self, client: Cloudflare) -> None:
+        r2_data_catalog = client.r2_data_catalog.enable(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+        assert_matches_type(Optional[R2DataCatalogEnableResponse], r2_data_catalog, path=["response"])
+
+    @parametrize
+    def test_raw_response_enable(self, client: Cloudflare) -> None:
+        response = client.r2_data_catalog.with_raw_response.enable(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        r2_data_catalog = response.parse()
+        assert_matches_type(Optional[R2DataCatalogEnableResponse], r2_data_catalog, path=["response"])
+
+    @parametrize
+    def test_streaming_response_enable(self, client: Cloudflare) -> None:
+        with client.r2_data_catalog.with_streaming_response.enable(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            r2_data_catalog = response.parse()
+            assert_matches_type(Optional[R2DataCatalogEnableResponse], r2_data_catalog, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_enable(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2_data_catalog.with_raw_response.enable(
+                bucket_name="my-data-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2_data_catalog.with_raw_response.enable(
+                bucket_name="",
+                account_id="0123456789abcdef0123456789abcdef",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        r2_data_catalog = client.r2_data_catalog.get(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+        assert_matches_type(Optional[R2DataCatalogGetResponse], r2_data_catalog, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.r2_data_catalog.with_raw_response.get(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        r2_data_catalog = response.parse()
+        assert_matches_type(Optional[R2DataCatalogGetResponse], r2_data_catalog, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.r2_data_catalog.with_streaming_response.get(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            r2_data_catalog = response.parse()
+            assert_matches_type(Optional[R2DataCatalogGetResponse], r2_data_catalog, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.r2_data_catalog.with_raw_response.get(
+                bucket_name="my-data-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            client.r2_data_catalog.with_raw_response.get(
+                bucket_name="",
+                account_id="0123456789abcdef0123456789abcdef",
+            )
+
+
+class TestAsyncR2DataCatalog:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        r2_data_catalog = await async_client.r2_data_catalog.list(
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+        assert_matches_type(Optional[R2DataCatalogListResponse], r2_data_catalog, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2_data_catalog.with_raw_response.list(
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        r2_data_catalog = await response.parse()
+        assert_matches_type(Optional[R2DataCatalogListResponse], r2_data_catalog, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2_data_catalog.with_streaming_response.list(
+            account_id="0123456789abcdef0123456789abcdef",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            r2_data_catalog = await response.parse()
+            assert_matches_type(Optional[R2DataCatalogListResponse], r2_data_catalog, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2_data_catalog.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_disable(self, async_client: AsyncCloudflare) -> None:
+        r2_data_catalog = await async_client.r2_data_catalog.disable(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+        assert r2_data_catalog is None
+
+    @parametrize
+    async def test_raw_response_disable(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2_data_catalog.with_raw_response.disable(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        r2_data_catalog = await response.parse()
+        assert r2_data_catalog is None
+
+    @parametrize
+    async def test_streaming_response_disable(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2_data_catalog.with_streaming_response.disable(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            r2_data_catalog = await response.parse()
+            assert r2_data_catalog is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_disable(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2_data_catalog.with_raw_response.disable(
+                bucket_name="my-data-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2_data_catalog.with_raw_response.disable(
+                bucket_name="",
+                account_id="0123456789abcdef0123456789abcdef",
+            )
+
+    @parametrize
+    async def test_method_enable(self, async_client: AsyncCloudflare) -> None:
+        r2_data_catalog = await async_client.r2_data_catalog.enable(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+        assert_matches_type(Optional[R2DataCatalogEnableResponse], r2_data_catalog, path=["response"])
+
+    @parametrize
+    async def test_raw_response_enable(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2_data_catalog.with_raw_response.enable(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        r2_data_catalog = await response.parse()
+        assert_matches_type(Optional[R2DataCatalogEnableResponse], r2_data_catalog, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_enable(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2_data_catalog.with_streaming_response.enable(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            r2_data_catalog = await response.parse()
+            assert_matches_type(Optional[R2DataCatalogEnableResponse], r2_data_catalog, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_enable(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2_data_catalog.with_raw_response.enable(
+                bucket_name="my-data-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2_data_catalog.with_raw_response.enable(
+                bucket_name="",
+                account_id="0123456789abcdef0123456789abcdef",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        r2_data_catalog = await async_client.r2_data_catalog.get(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+        assert_matches_type(Optional[R2DataCatalogGetResponse], r2_data_catalog, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.r2_data_catalog.with_raw_response.get(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        r2_data_catalog = await response.parse()
+        assert_matches_type(Optional[R2DataCatalogGetResponse], r2_data_catalog, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.r2_data_catalog.with_streaming_response.get(
+            bucket_name="my-data-bucket",
+            account_id="0123456789abcdef0123456789abcdef",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            r2_data_catalog = await response.parse()
+            assert_matches_type(Optional[R2DataCatalogGetResponse], r2_data_catalog, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.r2_data_catalog.with_raw_response.get(
+                bucket_name="my-data-bucket",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bucket_name` but received ''"):
+            await async_client.r2_data_catalog.with_raw_response.get(
+                bucket_name="",
+                account_id="0123456789abcdef0123456789abcdef",
+            )
diff --git a/tests/api_resources/test_rate_limits.py b/tests/api_resources/test_rate_limits.py
index 0fd1a584ca0..85a6de47b2f 100644
--- a/tests/api_resources/test_rate_limits.py
+++ b/tests/api_resources/test_rate_limits.py
@@ -12,9 +12,6 @@
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.rate_limits import (
     RateLimit,
-    RateLimitGetResponse,
-    RateLimitEditResponse,
-    RateLimitCreateResponse,
     RateLimitDeleteResponse,
 )
 
@@ -31,39 +28,83 @@ class TestRateLimits:
     def test_method_create(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rate_limit = client.rate_limits.create(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                match={},
+                period=900,
+                threshold=60,
             )
 
-        assert_matches_type(RateLimitCreateResponse, rate_limit, path=["response"])
+        assert_matches_type(RateLimit, rate_limit, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            rate_limit = client.rate_limits.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={
+                    "mode": "challenge",
+                    "response": {
+                        "body": "<error>This request has been rate-limited.</error>",
+                        "content_type": "text/xml",
+                    },
+                    "timeout": 86400,
+                },
+                match={
+                    "headers": [
+                        {
+                            "name": "Cf-Cache-Status",
+                            "op": "ne",
+                            "value": "HIT",
+                        }
+                    ],
+                    "request": {
+                        "methods": ["GET", "POST"],
+                        "schemes": ["HTTP", "HTTPS"],
+                        "url": "*.example.org/path*",
+                    },
+                    "response": {"origin_traffic": True},
+                },
+                period=900,
+                threshold=60,
+            )
+
+        assert_matches_type(RateLimit, rate_limit, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = client.rate_limits.with_raw_response.create(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                match={},
+                period=900,
+                threshold=60,
             )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rate_limit = response.parse()
-        assert_matches_type(RateLimitCreateResponse, rate_limit, path=["response"])
+        assert_matches_type(RateLimit, rate_limit, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             with client.rate_limits.with_streaming_response.create(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                match={},
+                period=900,
+                threshold=60,
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
                 rate_limit = response.parse()
-                assert_matches_type(RateLimitCreateResponse, rate_limit, path=["response"])
+                assert_matches_type(RateLimit, rate_limit, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -71,17 +112,20 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 client.rate_limits.with_raw_response.create(
-                    zone_identifier="",
-                    body={},
+                    zone_id="",
+                    action={},
+                    match={},
+                    period=900,
+                    threshold=60,
                 )
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rate_limit = client.rate_limits.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert_matches_type(SyncV4PagePaginationArray[RateLimit], rate_limit, path=["response"])
@@ -90,7 +134,7 @@ def test_method_list(self, client: Cloudflare) -> None:
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rate_limit = client.rate_limits.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 page=1,
                 per_page=1,
             )
@@ -101,7 +145,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
     def test_raw_response_list(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = client.rate_limits.with_raw_response.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
@@ -113,7 +157,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             with client.rate_limits.with_streaming_response.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -126,17 +170,17 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 client.rate_limits.with_raw_response.list(
-                    zone_identifier="",
+                    zone_id="",
                 )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rate_limit = client.rate_limits.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert_matches_type(RateLimitDeleteResponse, rate_limit, path=["response"])
@@ -145,8 +189,8 @@ def test_method_delete(self, client: Cloudflare) -> None:
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = client.rate_limits.with_raw_response.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
@@ -158,8 +202,8 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             with client.rate_limits.with_streaming_response.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -172,16 +216,16 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 client.rate_limits.with_raw_response.delete(
-                    id="372e67954025e0ba6aaa6d586b9e0b59",
-                    zone_identifier="",
+                    rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                    zone_id="",
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `rate_limit_id` but received ''"):
                 client.rate_limits.with_raw_response.delete(
-                    id="",
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                    rate_limit_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -189,42 +233,87 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
     def test_method_edit(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rate_limit = client.rate_limits.edit(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                match={},
+                period=900,
+                threshold=60,
+            )
+
+        assert_matches_type(RateLimit, rate_limit, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            rate_limit = client.rate_limits.edit(
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={
+                    "mode": "challenge",
+                    "response": {
+                        "body": "<error>This request has been rate-limited.</error>",
+                        "content_type": "text/xml",
+                    },
+                    "timeout": 86400,
+                },
+                match={
+                    "headers": [
+                        {
+                            "name": "Cf-Cache-Status",
+                            "op": "ne",
+                            "value": "HIT",
+                        }
+                    ],
+                    "request": {
+                        "methods": ["GET", "POST"],
+                        "schemes": ["HTTP", "HTTPS"],
+                        "url": "*.example.org/path*",
+                    },
+                    "response": {"origin_traffic": True},
+                },
+                period=900,
+                threshold=60,
             )
 
-        assert_matches_type(RateLimitEditResponse, rate_limit, path=["response"])
+        assert_matches_type(RateLimit, rate_limit, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = client.rate_limits.with_raw_response.edit(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                match={},
+                period=900,
+                threshold=60,
             )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rate_limit = response.parse()
-        assert_matches_type(RateLimitEditResponse, rate_limit, path=["response"])
+        assert_matches_type(RateLimit, rate_limit, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             with client.rate_limits.with_streaming_response.edit(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                match={},
+                period=900,
+                threshold=60,
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
                 rate_limit = response.parse()
-                assert_matches_type(RateLimitEditResponse, rate_limit, path=["response"])
+                assert_matches_type(RateLimit, rate_limit, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -232,115 +321,167 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_edit(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 client.rate_limits.with_raw_response.edit(
-                    id="372e67954025e0ba6aaa6d586b9e0b59",
-                    zone_identifier="",
-                    body={},
+                    rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                    zone_id="",
+                    action={},
+                    match={},
+                    period=900,
+                    threshold=60,
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `rate_limit_id` but received ''"):
                 client.rate_limits.with_raw_response.edit(
-                    id="",
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                    body={},
+                    rate_limit_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    action={},
+                    match={},
+                    period=900,
+                    threshold=60,
                 )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rate_limit = client.rate_limits.get(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
-        assert_matches_type(RateLimitGetResponse, rate_limit, path=["response"])
+        assert_matches_type(RateLimit, rate_limit, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = client.rate_limits.with_raw_response.get(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rate_limit = response.parse()
-        assert_matches_type(RateLimitGetResponse, rate_limit, path=["response"])
+        assert_matches_type(RateLimit, rate_limit, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             with client.rate_limits.with_streaming_response.get(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
                 rate_limit = response.parse()
-                assert_matches_type(RateLimitGetResponse, rate_limit, path=["response"])
+                assert_matches_type(RateLimit, rate_limit, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 client.rate_limits.with_raw_response.get(
-                    id="372e67954025e0ba6aaa6d586b9e0b59",
-                    zone_identifier="",
+                    rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                    zone_id="",
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `rate_limit_id` but received ''"):
                 client.rate_limits.with_raw_response.get(
-                    id="",
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                    rate_limit_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 )
 
 
 class TestAsyncRateLimits:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rate_limit = await async_client.rate_limits.create(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                match={},
+                period=900,
+                threshold=60,
             )
 
-        assert_matches_type(RateLimitCreateResponse, rate_limit, path=["response"])
+        assert_matches_type(RateLimit, rate_limit, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            rate_limit = await async_client.rate_limits.create(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={
+                    "mode": "challenge",
+                    "response": {
+                        "body": "<error>This request has been rate-limited.</error>",
+                        "content_type": "text/xml",
+                    },
+                    "timeout": 86400,
+                },
+                match={
+                    "headers": [
+                        {
+                            "name": "Cf-Cache-Status",
+                            "op": "ne",
+                            "value": "HIT",
+                        }
+                    ],
+                    "request": {
+                        "methods": ["GET", "POST"],
+                        "schemes": ["HTTP", "HTTPS"],
+                        "url": "*.example.org/path*",
+                    },
+                    "response": {"origin_traffic": True},
+                },
+                period=900,
+                threshold=60,
+            )
+
+        assert_matches_type(RateLimit, rate_limit, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = await async_client.rate_limits.with_raw_response.create(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                match={},
+                period=900,
+                threshold=60,
             )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rate_limit = await response.parse()
-        assert_matches_type(RateLimitCreateResponse, rate_limit, path=["response"])
+        assert_matches_type(RateLimit, rate_limit, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             async with async_client.rate_limits.with_streaming_response.create(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                match={},
+                period=900,
+                threshold=60,
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
                 rate_limit = await response.parse()
-                assert_matches_type(RateLimitCreateResponse, rate_limit, path=["response"])
+                assert_matches_type(RateLimit, rate_limit, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -348,17 +489,20 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 await async_client.rate_limits.with_raw_response.create(
-                    zone_identifier="",
-                    body={},
+                    zone_id="",
+                    action={},
+                    match={},
+                    period=900,
+                    threshold=60,
                 )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rate_limit = await async_client.rate_limits.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert_matches_type(AsyncV4PagePaginationArray[RateLimit], rate_limit, path=["response"])
@@ -367,7 +511,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rate_limit = await async_client.rate_limits.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 page=1,
                 per_page=1,
             )
@@ -378,7 +522,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = await async_client.rate_limits.with_raw_response.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
@@ -390,7 +534,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             async with async_client.rate_limits.with_streaming_response.list(
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -403,17 +547,17 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 await async_client.rate_limits.with_raw_response.list(
-                    zone_identifier="",
+                    zone_id="",
                 )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rate_limit = await async_client.rate_limits.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert_matches_type(RateLimitDeleteResponse, rate_limit, path=["response"])
@@ -422,8 +566,8 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = await async_client.rate_limits.with_raw_response.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
@@ -435,8 +579,8 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             async with async_client.rate_limits.with_streaming_response.delete(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -449,16 +593,16 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 await async_client.rate_limits.with_raw_response.delete(
-                    id="372e67954025e0ba6aaa6d586b9e0b59",
-                    zone_identifier="",
+                    rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                    zone_id="",
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `rate_limit_id` but received ''"):
                 await async_client.rate_limits.with_raw_response.delete(
-                    id="",
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                    rate_limit_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
@@ -466,42 +610,87 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rate_limit = await async_client.rate_limits.edit(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                match={},
+                period=900,
+                threshold=60,
+            )
+
+        assert_matches_type(RateLimit, rate_limit, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            rate_limit = await async_client.rate_limits.edit(
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={
+                    "mode": "challenge",
+                    "response": {
+                        "body": "<error>This request has been rate-limited.</error>",
+                        "content_type": "text/xml",
+                    },
+                    "timeout": 86400,
+                },
+                match={
+                    "headers": [
+                        {
+                            "name": "Cf-Cache-Status",
+                            "op": "ne",
+                            "value": "HIT",
+                        }
+                    ],
+                    "request": {
+                        "methods": ["GET", "POST"],
+                        "schemes": ["HTTP", "HTTPS"],
+                        "url": "*.example.org/path*",
+                    },
+                    "response": {"origin_traffic": True},
+                },
+                period=900,
+                threshold=60,
             )
 
-        assert_matches_type(RateLimitEditResponse, rate_limit, path=["response"])
+        assert_matches_type(RateLimit, rate_limit, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = await async_client.rate_limits.with_raw_response.edit(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                match={},
+                period=900,
+                threshold=60,
             )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rate_limit = await response.parse()
-        assert_matches_type(RateLimitEditResponse, rate_limit, path=["response"])
+        assert_matches_type(RateLimit, rate_limit, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             async with async_client.rate_limits.with_streaming_response.edit(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                body={},
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                action={},
+                match={},
+                period=900,
+                threshold=60,
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
                 rate_limit = await response.parse()
-                assert_matches_type(RateLimitEditResponse, rate_limit, path=["response"])
+                assert_matches_type(RateLimit, rate_limit, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -509,69 +698,75 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
     @parametrize
     async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 await async_client.rate_limits.with_raw_response.edit(
-                    id="372e67954025e0ba6aaa6d586b9e0b59",
-                    zone_identifier="",
-                    body={},
+                    rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                    zone_id="",
+                    action={},
+                    match={},
+                    period=900,
+                    threshold=60,
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `rate_limit_id` but received ''"):
                 await async_client.rate_limits.with_raw_response.edit(
-                    id="",
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                    body={},
+                    rate_limit_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                    action={},
+                    match={},
+                    period=900,
+                    threshold=60,
                 )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             rate_limit = await async_client.rate_limits.get(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
-        assert_matches_type(RateLimitGetResponse, rate_limit, path=["response"])
+        assert_matches_type(RateLimit, rate_limit, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             response = await async_client.rate_limits.with_raw_response.get(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rate_limit = await response.parse()
-        assert_matches_type(RateLimitGetResponse, rate_limit, path=["response"])
+        assert_matches_type(RateLimit, rate_limit, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
             async with async_client.rate_limits.with_streaming_response.get(
-                id="372e67954025e0ba6aaa6d586b9e0b59",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             ) as response:
                 assert not response.is_closed
                 assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
                 rate_limit = await response.parse()
-                assert_matches_type(RateLimitGetResponse, rate_limit, path=["response"])
+                assert_matches_type(RateLimit, rate_limit, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.warns(DeprecationWarning):
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
                 await async_client.rate_limits.with_raw_response.get(
-                    id="372e67954025e0ba6aaa6d586b9e0b59",
-                    zone_identifier="",
+                    rate_limit_id="372e67954025e0ba6aaa6d586b9e0b59",
+                    zone_id="",
                 )
 
-            with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `rate_limit_id` but received ''"):
                 await async_client.rate_limits.with_raw_response.get(
-                    id="",
-                    zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                    rate_limit_id="",
+                    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 )
diff --git a/tests/api_resources/test_rate_plans.py b/tests/api_resources/test_rate_plans.py
deleted file mode 100644
index 8a555f178d7..00000000000
--- a/tests/api_resources/test_rate_plans.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.rate_plans import RatePlanGetResponse
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestRatePlans:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        rate_plan = client.rate_plans.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[RatePlanGetResponse], rate_plan, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.rate_plans.with_raw_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        rate_plan = response.parse()
-        assert_matches_type(Optional[RatePlanGetResponse], rate_plan, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.rate_plans.with_streaming_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            rate_plan = response.parse()
-            assert_matches_type(Optional[RatePlanGetResponse], rate_plan, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            client.rate_plans.with_raw_response.get(
-                "",
-            )
-
-
-class TestAsyncRatePlans:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        rate_plan = await async_client.rate_plans.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[RatePlanGetResponse], rate_plan, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.rate_plans.with_raw_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        rate_plan = await response.parse()
-        assert_matches_type(Optional[RatePlanGetResponse], rate_plan, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.rate_plans.with_streaming_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            rate_plan = await response.parse()
-            assert_matches_type(Optional[RatePlanGetResponse], rate_plan, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
-            await async_client.rate_plans.with_raw_response.get(
-                "",
-            )
diff --git a/tests/api_resources/test_resource_sharing.py b/tests/api_resources/test_resource_sharing.py
new file mode 100644
index 00000000000..879e6040c9b
--- /dev/null
+++ b/tests/api_resources/test_resource_sharing.py
@@ -0,0 +1,625 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.resource_sharing import (
+    ResourceSharingGetResponse,
+    ResourceSharingListResponse,
+    ResourceSharingCreateResponse,
+    ResourceSharingDeleteResponse,
+    ResourceSharingUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestResourceSharing:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        resource_sharing = client.resource_sharing.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Shared WAF Managed Rule",
+            recipients=[{}],
+            resources=[
+                {
+                    "meta": {},
+                    "resource_account_id": "023e105f4ecef8ad9ca31a8372d0c353",
+                    "resource_id": "023e105f4ecef8ad9ca31a8372d0c353",
+                    "resource_type": "custom-ruleset",
+                }
+            ],
+        )
+        assert_matches_type(Optional[ResourceSharingCreateResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.resource_sharing.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Shared WAF Managed Rule",
+            recipients=[{}],
+            resources=[
+                {
+                    "meta": {},
+                    "resource_account_id": "023e105f4ecef8ad9ca31a8372d0c353",
+                    "resource_id": "023e105f4ecef8ad9ca31a8372d0c353",
+                    "resource_type": "custom-ruleset",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource_sharing = response.parse()
+        assert_matches_type(Optional[ResourceSharingCreateResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.resource_sharing.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Shared WAF Managed Rule",
+            recipients=[{}],
+            resources=[
+                {
+                    "meta": {},
+                    "resource_account_id": "023e105f4ecef8ad9ca31a8372d0c353",
+                    "resource_id": "023e105f4ecef8ad9ca31a8372d0c353",
+                    "resource_type": "custom-ruleset",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource_sharing = response.parse()
+            assert_matches_type(Optional[ResourceSharingCreateResponse], resource_sharing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.resource_sharing.with_raw_response.create(
+                account_id="",
+                name="My Shared WAF Managed Rule",
+                recipients=[{}],
+                resources=[
+                    {
+                        "meta": {},
+                        "resource_account_id": "023e105f4ecef8ad9ca31a8372d0c353",
+                        "resource_id": "023e105f4ecef8ad9ca31a8372d0c353",
+                        "resource_type": "custom-ruleset",
+                    }
+                ],
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        resource_sharing = client.resource_sharing.update(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Shared WAF Managed Rule",
+        )
+        assert_matches_type(Optional[ResourceSharingUpdateResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.resource_sharing.with_raw_response.update(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Shared WAF Managed Rule",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource_sharing = response.parse()
+        assert_matches_type(Optional[ResourceSharingUpdateResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.resource_sharing.with_streaming_response.update(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Shared WAF Managed Rule",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource_sharing = response.parse()
+            assert_matches_type(Optional[ResourceSharingUpdateResponse], resource_sharing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.resource_sharing.with_raw_response.update(
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+                name="My Shared WAF Managed Rule",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            client.resource_sharing.with_raw_response.update(
+                share_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="My Shared WAF Managed Rule",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        resource_sharing = client.resource_sharing.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ResourceSharingListResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        resource_sharing = client.resource_sharing.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="asc",
+            include_recipient_counts=True,
+            include_resources=True,
+            kind="sent",
+            order="name",
+            page=2,
+            per_page=20,
+            resource_types=["custom-ruleset"],
+            status="active",
+            target_type="account",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ResourceSharingListResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.resource_sharing.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource_sharing = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[ResourceSharingListResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.resource_sharing.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource_sharing = response.parse()
+            assert_matches_type(
+                SyncV4PagePaginationArray[ResourceSharingListResponse], resource_sharing, path=["response"]
+            )
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.resource_sharing.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        resource_sharing = client.resource_sharing.delete(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ResourceSharingDeleteResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.resource_sharing.with_raw_response.delete(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource_sharing = response.parse()
+        assert_matches_type(Optional[ResourceSharingDeleteResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.resource_sharing.with_streaming_response.delete(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource_sharing = response.parse()
+            assert_matches_type(Optional[ResourceSharingDeleteResponse], resource_sharing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.resource_sharing.with_raw_response.delete(
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            client.resource_sharing.with_raw_response.delete(
+                share_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        resource_sharing = client.resource_sharing.get(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ResourceSharingGetResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        resource_sharing = client.resource_sharing.get(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            include_recipient_counts=True,
+            include_resources=True,
+        )
+        assert_matches_type(Optional[ResourceSharingGetResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.resource_sharing.with_raw_response.get(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource_sharing = response.parse()
+        assert_matches_type(Optional[ResourceSharingGetResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.resource_sharing.with_streaming_response.get(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource_sharing = response.parse()
+            assert_matches_type(Optional[ResourceSharingGetResponse], resource_sharing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.resource_sharing.with_raw_response.get(
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            client.resource_sharing.with_raw_response.get(
+                share_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncResourceSharing:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        resource_sharing = await async_client.resource_sharing.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Shared WAF Managed Rule",
+            recipients=[{}],
+            resources=[
+                {
+                    "meta": {},
+                    "resource_account_id": "023e105f4ecef8ad9ca31a8372d0c353",
+                    "resource_id": "023e105f4ecef8ad9ca31a8372d0c353",
+                    "resource_type": "custom-ruleset",
+                }
+            ],
+        )
+        assert_matches_type(Optional[ResourceSharingCreateResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.resource_sharing.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Shared WAF Managed Rule",
+            recipients=[{}],
+            resources=[
+                {
+                    "meta": {},
+                    "resource_account_id": "023e105f4ecef8ad9ca31a8372d0c353",
+                    "resource_id": "023e105f4ecef8ad9ca31a8372d0c353",
+                    "resource_type": "custom-ruleset",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource_sharing = await response.parse()
+        assert_matches_type(Optional[ResourceSharingCreateResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.resource_sharing.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Shared WAF Managed Rule",
+            recipients=[{}],
+            resources=[
+                {
+                    "meta": {},
+                    "resource_account_id": "023e105f4ecef8ad9ca31a8372d0c353",
+                    "resource_id": "023e105f4ecef8ad9ca31a8372d0c353",
+                    "resource_type": "custom-ruleset",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource_sharing = await response.parse()
+            assert_matches_type(Optional[ResourceSharingCreateResponse], resource_sharing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.resource_sharing.with_raw_response.create(
+                account_id="",
+                name="My Shared WAF Managed Rule",
+                recipients=[{}],
+                resources=[
+                    {
+                        "meta": {},
+                        "resource_account_id": "023e105f4ecef8ad9ca31a8372d0c353",
+                        "resource_id": "023e105f4ecef8ad9ca31a8372d0c353",
+                        "resource_type": "custom-ruleset",
+                    }
+                ],
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        resource_sharing = await async_client.resource_sharing.update(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Shared WAF Managed Rule",
+        )
+        assert_matches_type(Optional[ResourceSharingUpdateResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.resource_sharing.with_raw_response.update(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Shared WAF Managed Rule",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource_sharing = await response.parse()
+        assert_matches_type(Optional[ResourceSharingUpdateResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.resource_sharing.with_streaming_response.update(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="My Shared WAF Managed Rule",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource_sharing = await response.parse()
+            assert_matches_type(Optional[ResourceSharingUpdateResponse], resource_sharing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.resource_sharing.with_raw_response.update(
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+                name="My Shared WAF Managed Rule",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            await async_client.resource_sharing.with_raw_response.update(
+                share_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="My Shared WAF Managed Rule",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        resource_sharing = await async_client.resource_sharing.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(
+            AsyncV4PagePaginationArray[ResourceSharingListResponse], resource_sharing, path=["response"]
+        )
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        resource_sharing = await async_client.resource_sharing.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            direction="asc",
+            include_recipient_counts=True,
+            include_resources=True,
+            kind="sent",
+            order="name",
+            page=2,
+            per_page=20,
+            resource_types=["custom-ruleset"],
+            status="active",
+            target_type="account",
+        )
+        assert_matches_type(
+            AsyncV4PagePaginationArray[ResourceSharingListResponse], resource_sharing, path=["response"]
+        )
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.resource_sharing.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource_sharing = await response.parse()
+        assert_matches_type(
+            AsyncV4PagePaginationArray[ResourceSharingListResponse], resource_sharing, path=["response"]
+        )
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.resource_sharing.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource_sharing = await response.parse()
+            assert_matches_type(
+                AsyncV4PagePaginationArray[ResourceSharingListResponse], resource_sharing, path=["response"]
+            )
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.resource_sharing.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        resource_sharing = await async_client.resource_sharing.delete(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ResourceSharingDeleteResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.resource_sharing.with_raw_response.delete(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource_sharing = await response.parse()
+        assert_matches_type(Optional[ResourceSharingDeleteResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.resource_sharing.with_streaming_response.delete(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource_sharing = await response.parse()
+            assert_matches_type(Optional[ResourceSharingDeleteResponse], resource_sharing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.resource_sharing.with_raw_response.delete(
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            await async_client.resource_sharing.with_raw_response.delete(
+                share_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        resource_sharing = await async_client.resource_sharing.get(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ResourceSharingGetResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        resource_sharing = await async_client.resource_sharing.get(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            include_recipient_counts=True,
+            include_resources=True,
+        )
+        assert_matches_type(Optional[ResourceSharingGetResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.resource_sharing.with_raw_response.get(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        resource_sharing = await response.parse()
+        assert_matches_type(Optional[ResourceSharingGetResponse], resource_sharing, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.resource_sharing.with_streaming_response.get(
+            share_id="3fd85f74b32742f1bff64a85009dda07",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            resource_sharing = await response.parse()
+            assert_matches_type(Optional[ResourceSharingGetResponse], resource_sharing, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.resource_sharing.with_raw_response.get(
+                share_id="3fd85f74b32742f1bff64a85009dda07",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `share_id` but received ''"):
+            await async_client.resource_sharing.with_raw_response.get(
+                share_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/test_rulesets.py b/tests/api_resources/test_rulesets.py
index d8877f10ca1..7f47311d949 100644
--- a/tests/api_resources/test_rulesets.py
+++ b/tests/api_resources/test_rulesets.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.pagination import SyncCursorPagination, AsyncCursorPagination
 from cloudflare.types.rulesets import (
     RulesetGetResponse,
     RulesetListResponse,
@@ -30,7 +30,6 @@ def test_method_create(self, client: Cloudflare) -> None:
             kind="root",
             name="My ruleset",
             phase="http_request_firewall_custom",
-            rules=[{}, {}, {}],
             account_id="account_id",
         )
         assert_matches_type(RulesetCreateResponse, ruleset, path=["response"])
@@ -42,24 +41,11 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             kind="root",
             name="My ruleset",
             phase="http_request_firewall_custom",
+            account_id="account_id",
+            description="A description for my ruleset.",
             rules=[
                 {
-                    "action": "block",
-                    "action_parameters": {
-                        "response": {
-                            "content": '{\n  "success": false,\n  "error": "you have been blocked"\n}',
-                            "content_type": "application/json",
-                            "status_code": 400,
-                        }
-                    },
-                    "description": "Block when the IP address is not 1.1.1.1",
-                    "enabled": True,
-                    "expression": "ip.src ne 1.1.1.1",
                     "id": "3a03d665bac047339bb530ecb439a90d",
-                    "logging": {"enabled": True},
-                    "ref": "my_ref",
-                },
-                {
                     "action": "block",
                     "action_parameters": {
                         "response": {
@@ -68,32 +54,27 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                             "status_code": 400,
                         }
                     },
-                    "description": "Block when the IP address is not 1.1.1.1",
+                    "description": "Block the request.",
                     "enabled": True,
-                    "expression": "ip.src ne 1.1.1.1",
-                    "id": "3a03d665bac047339bb530ecb439a90d",
-                    "logging": {"enabled": True},
-                    "ref": "my_ref",
-                },
-                {
-                    "action": "block",
-                    "action_parameters": {
-                        "response": {
-                            "content": '{\n  "success": false,\n  "error": "you have been blocked"\n}',
-                            "content_type": "application/json",
-                            "status_code": 400,
-                        }
+                    "exposed_credential_check": {
+                        "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                        "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
                     },
-                    "description": "Block when the IP address is not 1.1.1.1",
-                    "enabled": True,
-                    "expression": "ip.src ne 1.1.1.1",
-                    "id": "3a03d665bac047339bb530ecb439a90d",
+                    "expression": "ip.src eq 1.1.1.1",
                     "logging": {"enabled": True},
+                    "ratelimit": {
+                        "characteristics": ["cf.colo.id"],
+                        "period": 60,
+                        "counting_expression": 'http.request.body.raw eq "abcd"',
+                        "mitigation_timeout": 600,
+                        "requests_per_period": 1000,
+                        "requests_to_origin": True,
+                        "score_per_period": 400,
+                        "score_response_header_name": "my-score",
+                    },
                     "ref": "my_ref",
-                },
+                }
             ],
-            account_id="account_id",
-            description="My ruleset to execute managed rulesets",
         )
         assert_matches_type(RulesetCreateResponse, ruleset, path=["response"])
 
@@ -104,7 +85,6 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
             kind="root",
             name="My ruleset",
             phase="http_request_firewall_custom",
-            rules=[{}, {}, {}],
             account_id="account_id",
         )
 
@@ -120,7 +100,6 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             kind="root",
             name="My ruleset",
             phase="http_request_firewall_custom",
-            rules=[{}, {}, {}],
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -134,21 +113,19 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.with_raw_response.create(
                 kind="root",
                 name="My ruleset",
                 phase="http_request_firewall_custom",
-                rules=[{}, {}, {}],
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.with_raw_response.create(
                 kind="root",
                 name="My ruleset",
                 phase="http_request_firewall_custom",
-                rules=[{}, {}, {}],
                 account_id="account_id",
             )
 
@@ -157,7 +134,6 @@ def test_path_params_create(self, client: Cloudflare) -> None:
     def test_method_update(self, client: Cloudflare) -> None:
         ruleset = client.rulesets.update(
             ruleset_id="2f2feab2026849078ba485f918791bdc",
-            rules=[{}, {}, {}],
             account_id="account_id",
         )
         assert_matches_type(RulesetUpdateResponse, ruleset, path=["response"])
@@ -167,24 +143,14 @@ def test_method_update(self, client: Cloudflare) -> None:
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         ruleset = client.rulesets.update(
             ruleset_id="2f2feab2026849078ba485f918791bdc",
+            account_id="account_id",
+            description="A description for my ruleset.",
+            kind="root",
+            name="My ruleset",
+            phase="http_request_firewall_custom",
             rules=[
                 {
-                    "action": "block",
-                    "action_parameters": {
-                        "response": {
-                            "content": '{\n  "success": false,\n  "error": "you have been blocked"\n}',
-                            "content_type": "application/json",
-                            "status_code": 400,
-                        }
-                    },
-                    "description": "Block when the IP address is not 1.1.1.1",
-                    "enabled": True,
-                    "expression": "ip.src ne 1.1.1.1",
                     "id": "3a03d665bac047339bb530ecb439a90d",
-                    "logging": {"enabled": True},
-                    "ref": "my_ref",
-                },
-                {
                     "action": "block",
                     "action_parameters": {
                         "response": {
@@ -193,35 +159,27 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                             "status_code": 400,
                         }
                     },
-                    "description": "Block when the IP address is not 1.1.1.1",
+                    "description": "Block the request.",
                     "enabled": True,
-                    "expression": "ip.src ne 1.1.1.1",
-                    "id": "3a03d665bac047339bb530ecb439a90d",
-                    "logging": {"enabled": True},
-                    "ref": "my_ref",
-                },
-                {
-                    "action": "block",
-                    "action_parameters": {
-                        "response": {
-                            "content": '{\n  "success": false,\n  "error": "you have been blocked"\n}',
-                            "content_type": "application/json",
-                            "status_code": 400,
-                        }
+                    "exposed_credential_check": {
+                        "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                        "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
                     },
-                    "description": "Block when the IP address is not 1.1.1.1",
-                    "enabled": True,
-                    "expression": "ip.src ne 1.1.1.1",
-                    "id": "3a03d665bac047339bb530ecb439a90d",
+                    "expression": "ip.src eq 1.1.1.1",
                     "logging": {"enabled": True},
+                    "ratelimit": {
+                        "characteristics": ["cf.colo.id"],
+                        "period": 60,
+                        "counting_expression": 'http.request.body.raw eq "abcd"',
+                        "mitigation_timeout": 600,
+                        "requests_per_period": 1000,
+                        "requests_to_origin": True,
+                        "score_per_period": 400,
+                        "score_response_header_name": "my-score",
+                    },
                     "ref": "my_ref",
-                },
+                }
             ],
-            account_id="account_id",
-            description="My ruleset to execute managed rulesets",
-            kind="root",
-            name="My ruleset",
-            phase="http_request_firewall_custom",
         )
         assert_matches_type(RulesetUpdateResponse, ruleset, path=["response"])
 
@@ -230,7 +188,6 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.rulesets.with_raw_response.update(
             ruleset_id="2f2feab2026849078ba485f918791bdc",
-            rules=[{}, {}, {}],
             account_id="account_id",
         )
 
@@ -244,7 +201,6 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.rulesets.with_streaming_response.update(
             ruleset_id="2f2feab2026849078ba485f918791bdc",
-            rules=[{}, {}, {}],
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -261,21 +217,18 @@ def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `ruleset_id` but received ''"):
             client.rulesets.with_raw_response.update(
                 ruleset_id="",
-                rules=[{}, {}, {}],
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.with_raw_response.update(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
-                rules=[{}, {}, {}],
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.with_raw_response.update(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
-                rules=[{}, {}, {}],
                 account_id="account_id",
             )
 
@@ -285,15 +238,17 @@ def test_method_list(self, client: Cloudflare) -> None:
         ruleset = client.rulesets.list(
             account_id="account_id",
         )
-        assert_matches_type(SyncSinglePage[RulesetListResponse], ruleset, path=["response"])
+        assert_matches_type(SyncCursorPagination[RulesetListResponse], ruleset, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         ruleset = client.rulesets.list(
             account_id="account_id",
+            cursor="dGhpc2lzYW5leGFtcGxlCg",
+            per_page=3,
         )
-        assert_matches_type(SyncSinglePage[RulesetListResponse], ruleset, path=["response"])
+        assert_matches_type(SyncCursorPagination[RulesetListResponse], ruleset, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -305,7 +260,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         ruleset = response.parse()
-        assert_matches_type(SyncSinglePage[RulesetListResponse], ruleset, path=["response"])
+        assert_matches_type(SyncCursorPagination[RulesetListResponse], ruleset, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -317,19 +272,19 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             ruleset = response.parse()
-            assert_matches_type(SyncSinglePage[RulesetListResponse], ruleset, path=["response"])
+            assert_matches_type(SyncCursorPagination[RulesetListResponse], ruleset, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.with_raw_response.list(
                 account_id="account_id",
             )
@@ -389,13 +344,13 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.with_raw_response.delete(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.with_raw_response.delete(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -456,13 +411,13 @@ def test_path_params_get(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.with_raw_response.get(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.rulesets.with_raw_response.get(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -470,7 +425,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncRulesets:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -479,7 +436,6 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
             kind="root",
             name="My ruleset",
             phase="http_request_firewall_custom",
-            rules=[{}, {}, {}],
             account_id="account_id",
         )
         assert_matches_type(RulesetCreateResponse, ruleset, path=["response"])
@@ -491,24 +447,11 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             kind="root",
             name="My ruleset",
             phase="http_request_firewall_custom",
+            account_id="account_id",
+            description="A description for my ruleset.",
             rules=[
                 {
-                    "action": "block",
-                    "action_parameters": {
-                        "response": {
-                            "content": '{\n  "success": false,\n  "error": "you have been blocked"\n}',
-                            "content_type": "application/json",
-                            "status_code": 400,
-                        }
-                    },
-                    "description": "Block when the IP address is not 1.1.1.1",
-                    "enabled": True,
-                    "expression": "ip.src ne 1.1.1.1",
                     "id": "3a03d665bac047339bb530ecb439a90d",
-                    "logging": {"enabled": True},
-                    "ref": "my_ref",
-                },
-                {
                     "action": "block",
                     "action_parameters": {
                         "response": {
@@ -517,32 +460,27 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                             "status_code": 400,
                         }
                     },
-                    "description": "Block when the IP address is not 1.1.1.1",
+                    "description": "Block the request.",
                     "enabled": True,
-                    "expression": "ip.src ne 1.1.1.1",
-                    "id": "3a03d665bac047339bb530ecb439a90d",
-                    "logging": {"enabled": True},
-                    "ref": "my_ref",
-                },
-                {
-                    "action": "block",
-                    "action_parameters": {
-                        "response": {
-                            "content": '{\n  "success": false,\n  "error": "you have been blocked"\n}',
-                            "content_type": "application/json",
-                            "status_code": 400,
-                        }
+                    "exposed_credential_check": {
+                        "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                        "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
                     },
-                    "description": "Block when the IP address is not 1.1.1.1",
-                    "enabled": True,
-                    "expression": "ip.src ne 1.1.1.1",
-                    "id": "3a03d665bac047339bb530ecb439a90d",
+                    "expression": "ip.src eq 1.1.1.1",
                     "logging": {"enabled": True},
+                    "ratelimit": {
+                        "characteristics": ["cf.colo.id"],
+                        "period": 60,
+                        "counting_expression": 'http.request.body.raw eq "abcd"',
+                        "mitigation_timeout": 600,
+                        "requests_per_period": 1000,
+                        "requests_to_origin": True,
+                        "score_per_period": 400,
+                        "score_response_header_name": "my-score",
+                    },
                     "ref": "my_ref",
-                },
+                }
             ],
-            account_id="account_id",
-            description="My ruleset to execute managed rulesets",
         )
         assert_matches_type(RulesetCreateResponse, ruleset, path=["response"])
 
@@ -553,7 +491,6 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
             kind="root",
             name="My ruleset",
             phase="http_request_firewall_custom",
-            rules=[{}, {}, {}],
             account_id="account_id",
         )
 
@@ -569,7 +506,6 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             kind="root",
             name="My ruleset",
             phase="http_request_firewall_custom",
-            rules=[{}, {}, {}],
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -583,21 +519,19 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.with_raw_response.create(
                 kind="root",
                 name="My ruleset",
                 phase="http_request_firewall_custom",
-                rules=[{}, {}, {}],
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.with_raw_response.create(
                 kind="root",
                 name="My ruleset",
                 phase="http_request_firewall_custom",
-                rules=[{}, {}, {}],
                 account_id="account_id",
             )
 
@@ -606,7 +540,6 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         ruleset = await async_client.rulesets.update(
             ruleset_id="2f2feab2026849078ba485f918791bdc",
-            rules=[{}, {}, {}],
             account_id="account_id",
         )
         assert_matches_type(RulesetUpdateResponse, ruleset, path=["response"])
@@ -616,24 +549,14 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         ruleset = await async_client.rulesets.update(
             ruleset_id="2f2feab2026849078ba485f918791bdc",
+            account_id="account_id",
+            description="A description for my ruleset.",
+            kind="root",
+            name="My ruleset",
+            phase="http_request_firewall_custom",
             rules=[
                 {
-                    "action": "block",
-                    "action_parameters": {
-                        "response": {
-                            "content": '{\n  "success": false,\n  "error": "you have been blocked"\n}',
-                            "content_type": "application/json",
-                            "status_code": 400,
-                        }
-                    },
-                    "description": "Block when the IP address is not 1.1.1.1",
-                    "enabled": True,
-                    "expression": "ip.src ne 1.1.1.1",
                     "id": "3a03d665bac047339bb530ecb439a90d",
-                    "logging": {"enabled": True},
-                    "ref": "my_ref",
-                },
-                {
                     "action": "block",
                     "action_parameters": {
                         "response": {
@@ -642,35 +565,27 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                             "status_code": 400,
                         }
                     },
-                    "description": "Block when the IP address is not 1.1.1.1",
+                    "description": "Block the request.",
                     "enabled": True,
-                    "expression": "ip.src ne 1.1.1.1",
-                    "id": "3a03d665bac047339bb530ecb439a90d",
-                    "logging": {"enabled": True},
-                    "ref": "my_ref",
-                },
-                {
-                    "action": "block",
-                    "action_parameters": {
-                        "response": {
-                            "content": '{\n  "success": false,\n  "error": "you have been blocked"\n}',
-                            "content_type": "application/json",
-                            "status_code": 400,
-                        }
+                    "exposed_credential_check": {
+                        "password_expression": 'url_decode(http.request.body.form[\\"password\\"][0])',
+                        "username_expression": 'url_decode(http.request.body.form[\\"username\\"][0])',
                     },
-                    "description": "Block when the IP address is not 1.1.1.1",
-                    "enabled": True,
-                    "expression": "ip.src ne 1.1.1.1",
-                    "id": "3a03d665bac047339bb530ecb439a90d",
+                    "expression": "ip.src eq 1.1.1.1",
                     "logging": {"enabled": True},
+                    "ratelimit": {
+                        "characteristics": ["cf.colo.id"],
+                        "period": 60,
+                        "counting_expression": 'http.request.body.raw eq "abcd"',
+                        "mitigation_timeout": 600,
+                        "requests_per_period": 1000,
+                        "requests_to_origin": True,
+                        "score_per_period": 400,
+                        "score_response_header_name": "my-score",
+                    },
                     "ref": "my_ref",
-                },
+                }
             ],
-            account_id="account_id",
-            description="My ruleset to execute managed rulesets",
-            kind="root",
-            name="My ruleset",
-            phase="http_request_firewall_custom",
         )
         assert_matches_type(RulesetUpdateResponse, ruleset, path=["response"])
 
@@ -679,7 +594,6 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.rulesets.with_raw_response.update(
             ruleset_id="2f2feab2026849078ba485f918791bdc",
-            rules=[{}, {}, {}],
             account_id="account_id",
         )
 
@@ -693,7 +607,6 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.rulesets.with_streaming_response.update(
             ruleset_id="2f2feab2026849078ba485f918791bdc",
-            rules=[{}, {}, {}],
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -710,21 +623,18 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `ruleset_id` but received ''"):
             await async_client.rulesets.with_raw_response.update(
                 ruleset_id="",
-                rules=[{}, {}, {}],
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.with_raw_response.update(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
-                rules=[{}, {}, {}],
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.with_raw_response.update(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
-                rules=[{}, {}, {}],
                 account_id="account_id",
             )
 
@@ -734,15 +644,17 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         ruleset = await async_client.rulesets.list(
             account_id="account_id",
         )
-        assert_matches_type(AsyncSinglePage[RulesetListResponse], ruleset, path=["response"])
+        assert_matches_type(AsyncCursorPagination[RulesetListResponse], ruleset, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         ruleset = await async_client.rulesets.list(
             account_id="account_id",
+            cursor="dGhpc2lzYW5leGFtcGxlCg",
+            per_page=3,
         )
-        assert_matches_type(AsyncSinglePage[RulesetListResponse], ruleset, path=["response"])
+        assert_matches_type(AsyncCursorPagination[RulesetListResponse], ruleset, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -754,7 +666,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         ruleset = await response.parse()
-        assert_matches_type(AsyncSinglePage[RulesetListResponse], ruleset, path=["response"])
+        assert_matches_type(AsyncCursorPagination[RulesetListResponse], ruleset, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -766,19 +678,19 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             ruleset = await response.parse()
-            assert_matches_type(AsyncSinglePage[RulesetListResponse], ruleset, path=["response"])
+            assert_matches_type(AsyncCursorPagination[RulesetListResponse], ruleset, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.with_raw_response.list(
                 account_id="account_id",
             )
@@ -838,13 +750,13 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.with_raw_response.delete(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.with_raw_response.delete(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
@@ -905,13 +817,13 @@ async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.with_raw_response.get(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.rulesets.with_raw_response.get(
                 ruleset_id="2f2feab2026849078ba485f918791bdc",
                 account_id="account_id",
diff --git a/tests/api_resources/test_security_txt.py b/tests/api_resources/test_security_txt.py
new file mode 100644
index 00000000000..0da5f1a9f06
--- /dev/null
+++ b/tests/api_resources/test_security_txt.py
@@ -0,0 +1,297 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.types.security_txt import (
+    SecurityTXTGetResponse,
+    SecurityTXTDeleteResponse,
+    SecurityTXTUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSecurityTXT:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        security_txt = client.security_txt.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SecurityTXTUpdateResponse, security_txt, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        security_txt = client.security_txt.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            acknowledgments=["https://example.com/hall-of-fame.html"],
+            canonical=["https://www.example.com/.well-known/security.txt"],
+            contact=["mailto:security@example.com", "tel:+1-201-555-0123", "https://example.com/security-contact.html"],
+            enabled=True,
+            encryption=[
+                "https://example.com/pgp-key.txt",
+                "dns:5d2d37ab76d47d36._openpgpkey.example.com?type=OPENPGPKEY",
+                "openpgp4fpr:5f2de5521c63a801ab59ccb603d49de44b29100f",
+            ],
+            expires=parse_datetime("2019-12-27T18:11:19.117Z"),
+            hiring=["https://example.com/jobs.html"],
+            policy=["https://example.com/disclosure-policy.html"],
+            preferred_languages="en, es, fr",
+        )
+        assert_matches_type(SecurityTXTUpdateResponse, security_txt, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.security_txt.with_raw_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        security_txt = response.parse()
+        assert_matches_type(SecurityTXTUpdateResponse, security_txt, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.security_txt.with_streaming_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            security_txt = response.parse()
+            assert_matches_type(SecurityTXTUpdateResponse, security_txt, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.security_txt.with_raw_response.update(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        security_txt = client.security_txt.delete(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SecurityTXTDeleteResponse, security_txt, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.security_txt.with_raw_response.delete(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        security_txt = response.parse()
+        assert_matches_type(SecurityTXTDeleteResponse, security_txt, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.security_txt.with_streaming_response.delete(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            security_txt = response.parse()
+            assert_matches_type(SecurityTXTDeleteResponse, security_txt, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.security_txt.with_raw_response.delete(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        security_txt = client.security_txt.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SecurityTXTGetResponse], security_txt, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.security_txt.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        security_txt = response.parse()
+        assert_matches_type(Optional[SecurityTXTGetResponse], security_txt, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.security_txt.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            security_txt = response.parse()
+            assert_matches_type(Optional[SecurityTXTGetResponse], security_txt, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.security_txt.with_raw_response.get(
+                zone_id="",
+            )
+
+
+class TestAsyncSecurityTXT:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        security_txt = await async_client.security_txt.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SecurityTXTUpdateResponse, security_txt, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        security_txt = await async_client.security_txt.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            acknowledgments=["https://example.com/hall-of-fame.html"],
+            canonical=["https://www.example.com/.well-known/security.txt"],
+            contact=["mailto:security@example.com", "tel:+1-201-555-0123", "https://example.com/security-contact.html"],
+            enabled=True,
+            encryption=[
+                "https://example.com/pgp-key.txt",
+                "dns:5d2d37ab76d47d36._openpgpkey.example.com?type=OPENPGPKEY",
+                "openpgp4fpr:5f2de5521c63a801ab59ccb603d49de44b29100f",
+            ],
+            expires=parse_datetime("2019-12-27T18:11:19.117Z"),
+            hiring=["https://example.com/jobs.html"],
+            policy=["https://example.com/disclosure-policy.html"],
+            preferred_languages="en, es, fr",
+        )
+        assert_matches_type(SecurityTXTUpdateResponse, security_txt, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.security_txt.with_raw_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        security_txt = await response.parse()
+        assert_matches_type(SecurityTXTUpdateResponse, security_txt, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.security_txt.with_streaming_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            security_txt = await response.parse()
+            assert_matches_type(SecurityTXTUpdateResponse, security_txt, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.security_txt.with_raw_response.update(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        security_txt = await async_client.security_txt.delete(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SecurityTXTDeleteResponse, security_txt, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.security_txt.with_raw_response.delete(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        security_txt = await response.parse()
+        assert_matches_type(SecurityTXTDeleteResponse, security_txt, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.security_txt.with_streaming_response.delete(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            security_txt = await response.parse()
+            assert_matches_type(SecurityTXTDeleteResponse, security_txt, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.security_txt.with_raw_response.delete(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        security_txt = await async_client.security_txt.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[SecurityTXTGetResponse], security_txt, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.security_txt.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        security_txt = await response.parse()
+        assert_matches_type(Optional[SecurityTXTGetResponse], security_txt, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.security_txt.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            security_txt = await response.parse()
+            assert_matches_type(Optional[SecurityTXTGetResponse], security_txt, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.security_txt.with_raw_response.get(
+                zone_id="",
+            )
diff --git a/tests/api_resources/test_snippets.py b/tests/api_resources/test_snippets.py
index 25af699eda9..5f6fb492862 100644
--- a/tests/api_resources/test_snippets.py
+++ b/tests/api_resources/test_snippets.py
@@ -3,14 +3,18 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.snippets import Snippet, SnippetDeleteResponse
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.snippets import (
+    SnippetGetResponse,
+    SnippetListResponse,
+    SnippetUpdateResponse,
+)
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -22,47 +26,39 @@ class TestSnippets:
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         snippet = client.snippets.update(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[Snippet], snippet, path=["response"])
-
-    @pytest.mark.skip(reason="throwing HTTP 415")
-    @parametrize
-    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        snippet = client.snippets.update(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            files="export { async function fetch(request, env) {return new Response('some_response') } }",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
             metadata={"main_module": "main.js"},
         )
-        assert_matches_type(Optional[Snippet], snippet, path=["response"])
+        assert_matches_type(SnippetUpdateResponse, snippet, path=["response"])
 
     @pytest.mark.skip(reason="throwing HTTP 415")
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.snippets.with_raw_response.update(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            metadata={"main_module": "main.js"},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         snippet = response.parse()
-        assert_matches_type(Optional[Snippet], snippet, path=["response"])
+        assert_matches_type(SnippetUpdateResponse, snippet, path=["response"])
 
     @pytest.mark.skip(reason="throwing HTTP 415")
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.snippets.with_streaming_response.update(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            metadata={"main_module": "main.js"},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             snippet = response.parse()
-            assert_matches_type(Optional[Snippet], snippet, path=["response"])
+            assert_matches_type(SnippetUpdateResponse, snippet, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -71,44 +67,55 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.snippets.with_raw_response.update(
-                snippet_name="snippet_name_01",
+                snippet_name="my_snippet",
                 zone_id="",
+                metadata={"main_module": "main.js"},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `snippet_name` but received ''"):
             client.snippets.with_raw_response.update(
                 snippet_name="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="9f1839b6152d298aca64c4e906b6d074",
+                metadata={"main_module": "main.js"},
             )
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         snippet = client.snippets.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[SnippetListResponse], snippet, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        snippet = client.snippets.list(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            page=1,
+            per_page=25,
         )
-        assert_matches_type(SyncSinglePage[Snippet], snippet, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[SnippetListResponse], snippet, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.snippets.with_raw_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         snippet = response.parse()
-        assert_matches_type(SyncSinglePage[Snippet], snippet, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[SnippetListResponse], snippet, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.snippets.with_streaming_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             snippet = response.parse()
-            assert_matches_type(SyncSinglePage[Snippet], snippet, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[SnippetListResponse], snippet, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -119,37 +126,40 @@ def test_path_params_list(self, client: Cloudflare) -> None:
                 zone_id="",
             )
 
+    @pytest.mark.skip(reason="API returns None instead of str for delete operation (Issue #3)")
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         snippet = client.snippets.delete(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
-        assert_matches_type(SnippetDeleteResponse, snippet, path=["response"])
+        assert_matches_type(str, snippet, path=["response"])
 
+    @pytest.mark.skip(reason="API returns None instead of str for delete operation (Issue #3)")
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.snippets.with_raw_response.delete(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         snippet = response.parse()
-        assert_matches_type(SnippetDeleteResponse, snippet, path=["response"])
+        assert_matches_type(str, snippet, path=["response"])
 
+    @pytest.mark.skip(reason="API returns None instead of str for delete operation (Issue #3)")
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.snippets.with_streaming_response.delete(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             snippet = response.parse()
-            assert_matches_type(SnippetDeleteResponse, snippet, path=["response"])
+            assert_matches_type(str, snippet, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -157,47 +167,47 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.snippets.with_raw_response.delete(
-                snippet_name="snippet_name_01",
+                snippet_name="my_snippet",
                 zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `snippet_name` but received ''"):
             client.snippets.with_raw_response.delete(
                 snippet_name="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="9f1839b6152d298aca64c4e906b6d074",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         snippet = client.snippets.get(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
-        assert_matches_type(Optional[Snippet], snippet, path=["response"])
+        assert_matches_type(SnippetGetResponse, snippet, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.snippets.with_raw_response.get(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         snippet = response.parse()
-        assert_matches_type(Optional[Snippet], snippet, path=["response"])
+        assert_matches_type(SnippetGetResponse, snippet, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.snippets.with_streaming_response.get(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             snippet = response.parse()
-            assert_matches_type(Optional[Snippet], snippet, path=["response"])
+            assert_matches_type(SnippetGetResponse, snippet, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -205,65 +215,59 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.snippets.with_raw_response.get(
-                snippet_name="snippet_name_01",
+                snippet_name="my_snippet",
                 zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `snippet_name` but received ''"):
             client.snippets.with_raw_response.get(
                 snippet_name="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="9f1839b6152d298aca64c4e906b6d074",
             )
 
 
 class TestAsyncSnippets:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="throwing HTTP 415")
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         snippet = await async_client.snippets.update(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[Snippet], snippet, path=["response"])
-
-    @pytest.mark.skip(reason="throwing HTTP 415")
-    @parametrize
-    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        snippet = await async_client.snippets.update(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            files="export { async function fetch(request, env) {return new Response('some_response') } }",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
             metadata={"main_module": "main.js"},
         )
-        assert_matches_type(Optional[Snippet], snippet, path=["response"])
+        assert_matches_type(SnippetUpdateResponse, snippet, path=["response"])
 
     @pytest.mark.skip(reason="throwing HTTP 415")
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.snippets.with_raw_response.update(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            metadata={"main_module": "main.js"},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         snippet = await response.parse()
-        assert_matches_type(Optional[Snippet], snippet, path=["response"])
+        assert_matches_type(SnippetUpdateResponse, snippet, path=["response"])
 
     @pytest.mark.skip(reason="throwing HTTP 415")
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.snippets.with_streaming_response.update(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            metadata={"main_module": "main.js"},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             snippet = await response.parse()
-            assert_matches_type(Optional[Snippet], snippet, path=["response"])
+            assert_matches_type(SnippetUpdateResponse, snippet, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -272,44 +276,55 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.snippets.with_raw_response.update(
-                snippet_name="snippet_name_01",
+                snippet_name="my_snippet",
                 zone_id="",
+                metadata={"main_module": "main.js"},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `snippet_name` but received ''"):
             await async_client.snippets.with_raw_response.update(
                 snippet_name="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="9f1839b6152d298aca64c4e906b6d074",
+                metadata={"main_module": "main.js"},
             )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         snippet = await async_client.snippets.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[SnippetListResponse], snippet, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        snippet = await async_client.snippets.list(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            page=1,
+            per_page=25,
         )
-        assert_matches_type(AsyncSinglePage[Snippet], snippet, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[SnippetListResponse], snippet, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.snippets.with_raw_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         snippet = await response.parse()
-        assert_matches_type(AsyncSinglePage[Snippet], snippet, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[SnippetListResponse], snippet, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.snippets.with_streaming_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             snippet = await response.parse()
-            assert_matches_type(AsyncSinglePage[Snippet], snippet, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[SnippetListResponse], snippet, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -320,37 +335,40 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
                 zone_id="",
             )
 
+    @pytest.mark.skip(reason="API returns None instead of str for delete operation (Issue #3)")
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         snippet = await async_client.snippets.delete(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
-        assert_matches_type(SnippetDeleteResponse, snippet, path=["response"])
+        assert_matches_type(str, snippet, path=["response"])
 
+    @pytest.mark.skip(reason="API returns None instead of str for delete operation (Issue #3)")
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.snippets.with_raw_response.delete(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         snippet = await response.parse()
-        assert_matches_type(SnippetDeleteResponse, snippet, path=["response"])
+        assert_matches_type(str, snippet, path=["response"])
 
+    @pytest.mark.skip(reason="API returns None instead of str for delete operation (Issue #3)")
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.snippets.with_streaming_response.delete(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             snippet = await response.parse()
-            assert_matches_type(SnippetDeleteResponse, snippet, path=["response"])
+            assert_matches_type(str, snippet, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -358,47 +376,47 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.snippets.with_raw_response.delete(
-                snippet_name="snippet_name_01",
+                snippet_name="my_snippet",
                 zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `snippet_name` but received ''"):
             await async_client.snippets.with_raw_response.delete(
                 snippet_name="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="9f1839b6152d298aca64c4e906b6d074",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         snippet = await async_client.snippets.get(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
-        assert_matches_type(Optional[Snippet], snippet, path=["response"])
+        assert_matches_type(SnippetGetResponse, snippet, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.snippets.with_raw_response.get(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         snippet = await response.parse()
-        assert_matches_type(Optional[Snippet], snippet, path=["response"])
+        assert_matches_type(SnippetGetResponse, snippet, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.snippets.with_streaming_response.get(
-            snippet_name="snippet_name_01",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            snippet_name="my_snippet",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             snippet = await response.parse()
-            assert_matches_type(Optional[Snippet], snippet, path=["response"])
+            assert_matches_type(SnippetGetResponse, snippet, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -406,12 +424,12 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.snippets.with_raw_response.get(
-                snippet_name="snippet_name_01",
+                snippet_name="my_snippet",
                 zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `snippet_name` but received ''"):
             await async_client.snippets.with_raw_response.get(
                 snippet_name="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="9f1839b6152d298aca64c4e906b6d074",
             )
diff --git a/tests/api_resources/test_stream.py b/tests/api_resources/test_stream.py
index 56ed1c0d953..8dc6ca2f8c8 100644
--- a/tests/api_resources/test_stream.py
+++ b/tests/api_resources/test_stream.py
@@ -38,6 +38,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             body={},
             tus_resumable="1.0.0",
             upload_length=0,
+            direct_user=True,
             upload_creator="creator-id_abcde12345",
             upload_metadata="name aGVsbG8gd29ybGQ=, requiresignedurls, allowedorigins ZXhhbXBsZS5jb20sdGVzdC5jb20=",
         )
@@ -105,6 +106,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
             start=parse_datetime("2014-01-02T02:20:00Z"),
             status="inprogress",
             type="live",
+            video_name="puppy.mp4",
         )
         assert_matches_type(SyncSinglePage[Video], stream, path=["response"])
 
@@ -187,6 +189,70 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        stream = client.stream.edit(
+            identifier="ea95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[Video], stream, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        stream = client.stream.edit(
+            identifier="ea95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            allowed_origins=["example.com"],
+            creator="creator-id_abcde12345",
+            max_duration_seconds=1,
+            meta={"name": "video12345.mp4"},
+            require_signed_urls=True,
+            scheduled_deletion=parse_datetime("2014-01-02T02:20:00Z"),
+            thumbnail_timestamp_pct=0.529241,
+            upload_expiry=parse_datetime("2014-01-02T02:20:00Z"),
+        )
+        assert_matches_type(Optional[Video], stream, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.stream.with_raw_response.edit(
+            identifier="ea95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        stream = response.parse()
+        assert_matches_type(Optional[Video], stream, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.stream.with_streaming_response.edit(
+            identifier="ea95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            stream = response.parse()
+            assert_matches_type(Optional[Video], stream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.stream.with_raw_response.edit(
+                identifier="ea95132c15732412d22c1476fa83f27a",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
+            client.stream.with_raw_response.edit(
+                identifier="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         stream = client.stream.get(
@@ -237,7 +303,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncStream:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -258,6 +326,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             body={},
             tus_resumable="1.0.0",
             upload_length=0,
+            direct_user=True,
             upload_creator="creator-id_abcde12345",
             upload_metadata="name aGVsbG8gd29ybGQ=, requiresignedurls, allowedorigins ZXhhbXBsZS5jb20sdGVzdC5jb20=",
         )
@@ -325,6 +394,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
             start=parse_datetime("2014-01-02T02:20:00Z"),
             status="inprogress",
             type="live",
+            video_name="puppy.mp4",
         )
         assert_matches_type(AsyncSinglePage[Video], stream, path=["response"])
 
@@ -407,6 +477,70 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        stream = await async_client.stream.edit(
+            identifier="ea95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[Video], stream, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        stream = await async_client.stream.edit(
+            identifier="ea95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            allowed_origins=["example.com"],
+            creator="creator-id_abcde12345",
+            max_duration_seconds=1,
+            meta={"name": "video12345.mp4"},
+            require_signed_urls=True,
+            scheduled_deletion=parse_datetime("2014-01-02T02:20:00Z"),
+            thumbnail_timestamp_pct=0.529241,
+            upload_expiry=parse_datetime("2014-01-02T02:20:00Z"),
+        )
+        assert_matches_type(Optional[Video], stream, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.stream.with_raw_response.edit(
+            identifier="ea95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        stream = await response.parse()
+        assert_matches_type(Optional[Video], stream, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.stream.with_streaming_response.edit(
+            identifier="ea95132c15732412d22c1476fa83f27a",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            stream = await response.parse()
+            assert_matches_type(Optional[Video], stream, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.stream.with_raw_response.edit(
+                identifier="ea95132c15732412d22c1476fa83f27a",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
+            await async_client.stream.with_raw_response.edit(
+                identifier="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         stream = await async_client.stream.get(
diff --git a/tests/api_resources/test_subscriptions.py b/tests/api_resources/test_subscriptions.py
deleted file mode 100644
index e756ce625ff..00000000000
--- a/tests/api_resources/test_subscriptions.py
+++ /dev/null
@@ -1,615 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.user import Subscription
-from cloudflare.types.subscriptions import (
-    SubscriptionGetResponse,
-    SubscriptionCreateResponse,
-    SubscriptionDeleteResponse,
-    SubscriptionUpdateResponse,
-)
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestSubscriptions:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_create(self, client: Cloudflare) -> None:
-        subscription = client.subscriptions.create(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
-        )
-        assert_matches_type(SubscriptionCreateResponse, subscription, path=["response"])
-
-    @parametrize
-    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
-        subscription = client.subscriptions.create(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            app={"install_id": "install_id"},
-            component_values=[
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-            ],
-            frequency="monthly",
-            rate_plan={
-                "currency": "USD",
-                "externally_managed": False,
-                "id": "free",
-                "is_contract": False,
-                "public_name": "Business Plan",
-                "scope": "zone",
-                "sets": ["string", "string", "string"],
-            },
-            zone={},
-        )
-        assert_matches_type(SubscriptionCreateResponse, subscription, path=["response"])
-
-    @parametrize
-    def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.subscriptions.with_raw_response.create(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        subscription = response.parse()
-        assert_matches_type(SubscriptionCreateResponse, subscription, path=["response"])
-
-    @parametrize
-    def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.subscriptions.with_streaming_response.create(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            subscription = response.parse()
-            assert_matches_type(SubscriptionCreateResponse, subscription, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
-            client.subscriptions.with_raw_response.create(
-                identifier="",
-            )
-
-    @parametrize
-    def test_method_update(self, client: Cloudflare) -> None:
-        subscription = client.subscriptions.update(
-            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SubscriptionUpdateResponse, subscription, path=["response"])
-
-    @parametrize
-    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        subscription = client.subscriptions.update(
-            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            app={"install_id": "install_id"},
-            component_values=[
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-            ],
-            frequency="monthly",
-            rate_plan={
-                "currency": "USD",
-                "externally_managed": False,
-                "id": "free",
-                "is_contract": False,
-                "public_name": "Business Plan",
-                "scope": "zone",
-                "sets": ["string", "string", "string"],
-            },
-            zone={},
-        )
-        assert_matches_type(SubscriptionUpdateResponse, subscription, path=["response"])
-
-    @parametrize
-    def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.subscriptions.with_raw_response.update(
-            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        subscription = response.parse()
-        assert_matches_type(SubscriptionUpdateResponse, subscription, path=["response"])
-
-    @parametrize
-    def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.subscriptions.with_streaming_response.update(
-            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            subscription = response.parse()
-            assert_matches_type(SubscriptionUpdateResponse, subscription, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
-            client.subscriptions.with_raw_response.update(
-                subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
-                account_identifier="",
-            )
-
-        with pytest.raises(
-            ValueError, match=r"Expected a non-empty value for `subscription_identifier` but received ''"
-        ):
-            client.subscriptions.with_raw_response.update(
-                subscription_identifier="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        subscription = client.subscriptions.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SyncSinglePage[Subscription], subscription, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.subscriptions.with_raw_response.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        subscription = response.parse()
-        assert_matches_type(SyncSinglePage[Subscription], subscription, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.subscriptions.with_streaming_response.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            subscription = response.parse()
-            assert_matches_type(SyncSinglePage[Subscription], subscription, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
-            client.subscriptions.with_raw_response.list(
-                "",
-            )
-
-    @parametrize
-    def test_method_delete(self, client: Cloudflare) -> None:
-        subscription = client.subscriptions.delete(
-            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SubscriptionDeleteResponse, subscription, path=["response"])
-
-    @parametrize
-    def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.subscriptions.with_raw_response.delete(
-            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        subscription = response.parse()
-        assert_matches_type(SubscriptionDeleteResponse, subscription, path=["response"])
-
-    @parametrize
-    def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.subscriptions.with_streaming_response.delete(
-            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            subscription = response.parse()
-            assert_matches_type(SubscriptionDeleteResponse, subscription, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
-            client.subscriptions.with_raw_response.delete(
-                subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
-                account_identifier="",
-            )
-
-        with pytest.raises(
-            ValueError, match=r"Expected a non-empty value for `subscription_identifier` but received ''"
-        ):
-            client.subscriptions.with_raw_response.delete(
-                subscription_identifier="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        subscription = client.subscriptions.get(
-            "506e3185e9c882d175a2d0cb0093d9f2",
-        )
-        assert_matches_type(SubscriptionGetResponse, subscription, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.subscriptions.with_raw_response.get(
-            "506e3185e9c882d175a2d0cb0093d9f2",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        subscription = response.parse()
-        assert_matches_type(SubscriptionGetResponse, subscription, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.subscriptions.with_streaming_response.get(
-            "506e3185e9c882d175a2d0cb0093d9f2",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            subscription = response.parse()
-            assert_matches_type(SubscriptionGetResponse, subscription, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
-            client.subscriptions.with_raw_response.get(
-                "",
-            )
-
-
-class TestAsyncSubscriptions:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        subscription = await async_client.subscriptions.create(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
-        )
-        assert_matches_type(SubscriptionCreateResponse, subscription, path=["response"])
-
-    @parametrize
-    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        subscription = await async_client.subscriptions.create(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            app={"install_id": "install_id"},
-            component_values=[
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-            ],
-            frequency="monthly",
-            rate_plan={
-                "currency": "USD",
-                "externally_managed": False,
-                "id": "free",
-                "is_contract": False,
-                "public_name": "Business Plan",
-                "scope": "zone",
-                "sets": ["string", "string", "string"],
-            },
-            zone={},
-        )
-        assert_matches_type(SubscriptionCreateResponse, subscription, path=["response"])
-
-    @parametrize
-    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.subscriptions.with_raw_response.create(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        subscription = await response.parse()
-        assert_matches_type(SubscriptionCreateResponse, subscription, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.subscriptions.with_streaming_response.create(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            subscription = await response.parse()
-            assert_matches_type(SubscriptionCreateResponse, subscription, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
-            await async_client.subscriptions.with_raw_response.create(
-                identifier="",
-            )
-
-    @parametrize
-    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        subscription = await async_client.subscriptions.update(
-            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SubscriptionUpdateResponse, subscription, path=["response"])
-
-    @parametrize
-    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        subscription = await async_client.subscriptions.update(
-            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            app={"install_id": "install_id"},
-            component_values=[
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-            ],
-            frequency="monthly",
-            rate_plan={
-                "currency": "USD",
-                "externally_managed": False,
-                "id": "free",
-                "is_contract": False,
-                "public_name": "Business Plan",
-                "scope": "zone",
-                "sets": ["string", "string", "string"],
-            },
-            zone={},
-        )
-        assert_matches_type(SubscriptionUpdateResponse, subscription, path=["response"])
-
-    @parametrize
-    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.subscriptions.with_raw_response.update(
-            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        subscription = await response.parse()
-        assert_matches_type(SubscriptionUpdateResponse, subscription, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.subscriptions.with_streaming_response.update(
-            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            subscription = await response.parse()
-            assert_matches_type(SubscriptionUpdateResponse, subscription, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
-            await async_client.subscriptions.with_raw_response.update(
-                subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
-                account_identifier="",
-            )
-
-        with pytest.raises(
-            ValueError, match=r"Expected a non-empty value for `subscription_identifier` but received ''"
-        ):
-            await async_client.subscriptions.with_raw_response.update(
-                subscription_identifier="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        subscription = await async_client.subscriptions.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(AsyncSinglePage[Subscription], subscription, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.subscriptions.with_raw_response.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        subscription = await response.parse()
-        assert_matches_type(AsyncSinglePage[Subscription], subscription, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.subscriptions.with_streaming_response.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            subscription = await response.parse()
-            assert_matches_type(AsyncSinglePage[Subscription], subscription, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
-            await async_client.subscriptions.with_raw_response.list(
-                "",
-            )
-
-    @parametrize
-    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        subscription = await async_client.subscriptions.delete(
-            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SubscriptionDeleteResponse, subscription, path=["response"])
-
-    @parametrize
-    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.subscriptions.with_raw_response.delete(
-            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        subscription = await response.parse()
-        assert_matches_type(SubscriptionDeleteResponse, subscription, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.subscriptions.with_streaming_response.delete(
-            subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            subscription = await response.parse()
-            assert_matches_type(SubscriptionDeleteResponse, subscription, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
-            await async_client.subscriptions.with_raw_response.delete(
-                subscription_identifier="506e3185e9c882d175a2d0cb0093d9f2",
-                account_identifier="",
-            )
-
-        with pytest.raises(
-            ValueError, match=r"Expected a non-empty value for `subscription_identifier` but received ''"
-        ):
-            await async_client.subscriptions.with_raw_response.delete(
-                subscription_identifier="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        subscription = await async_client.subscriptions.get(
-            "506e3185e9c882d175a2d0cb0093d9f2",
-        )
-        assert_matches_type(SubscriptionGetResponse, subscription, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.subscriptions.with_raw_response.get(
-            "506e3185e9c882d175a2d0cb0093d9f2",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        subscription = await response.parse()
-        assert_matches_type(SubscriptionGetResponse, subscription, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.subscriptions.with_streaming_response.get(
-            "506e3185e9c882d175a2d0cb0093d9f2",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            subscription = await response.parse()
-            assert_matches_type(SubscriptionGetResponse, subscription, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
-            await async_client.subscriptions.with_raw_response.get(
-                "",
-            )
diff --git a/tests/api_resources/test_url_normalization.py b/tests/api_resources/test_url_normalization.py
index bd0ad470a31..7dfd2d41316 100644
--- a/tests/api_resources/test_url_normalization.py
+++ b/tests/api_resources/test_url_normalization.py
@@ -20,26 +20,23 @@
 class TestURLNormalization:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         url_normalization = client.url_normalization.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(URLNormalizationUpdateResponse, url_normalization, path=["response"])
-
-    @parametrize
-    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        url_normalization = client.url_normalization.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
             scope="incoming",
             type="cloudflare",
         )
         assert_matches_type(URLNormalizationUpdateResponse, url_normalization, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.url_normalization.with_raw_response.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            scope="incoming",
+            type="cloudflare",
         )
 
         assert response.is_closed is True
@@ -47,10 +44,13 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         url_normalization = response.parse()
         assert_matches_type(URLNormalizationUpdateResponse, url_normalization, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.url_normalization.with_streaming_response.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            scope="incoming",
+            type="cloudflare",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -60,24 +60,71 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.url_normalization.with_raw_response.update(
                 zone_id="",
+                scope="incoming",
+                type="cloudflare",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        url_normalization = client.url_normalization.delete(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        )
+        assert url_normalization is None
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.url_normalization.with_raw_response.delete(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        url_normalization = response.parse()
+        assert url_normalization is None
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.url_normalization.with_streaming_response.delete(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            url_normalization = response.parse()
+            assert url_normalization is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.url_normalization.with_raw_response.delete(
+                zone_id="",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         url_normalization = client.url_normalization.get(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
         assert_matches_type(URLNormalizationGetResponse, url_normalization, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.url_normalization.with_raw_response.get(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
 
         assert response.is_closed is True
@@ -85,10 +132,11 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         url_normalization = response.parse()
         assert_matches_type(URLNormalizationGetResponse, url_normalization, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.url_normalization.with_streaming_response.get(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -98,6 +146,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
@@ -107,28 +156,27 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncURLNormalization:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         url_normalization = await async_client.url_normalization.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(URLNormalizationUpdateResponse, url_normalization, path=["response"])
-
-    @parametrize
-    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        url_normalization = await async_client.url_normalization.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
             scope="incoming",
             type="cloudflare",
         )
         assert_matches_type(URLNormalizationUpdateResponse, url_normalization, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.url_normalization.with_raw_response.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            scope="incoming",
+            type="cloudflare",
         )
 
         assert response.is_closed is True
@@ -136,10 +184,13 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         url_normalization = await response.parse()
         assert_matches_type(URLNormalizationUpdateResponse, url_normalization, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.url_normalization.with_streaming_response.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+            scope="incoming",
+            type="cloudflare",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -149,24 +200,71 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.url_normalization.with_raw_response.update(
                 zone_id="",
+                scope="incoming",
+                type="cloudflare",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        url_normalization = await async_client.url_normalization.delete(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        )
+        assert url_normalization is None
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.url_normalization.with_raw_response.delete(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        url_normalization = await response.parse()
+        assert url_normalization is None
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.url_normalization.with_streaming_response.delete(
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            url_normalization = await response.parse()
+            assert url_normalization is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.url_normalization.with_raw_response.delete(
+                zone_id="",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         url_normalization = await async_client.url_normalization.get(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
         assert_matches_type(URLNormalizationGetResponse, url_normalization, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.url_normalization.with_raw_response.get(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         )
 
         assert response.is_closed is True
@@ -174,10 +272,11 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         url_normalization = await response.parse()
         assert_matches_type(URLNormalizationGetResponse, url_normalization, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.url_normalization.with_streaming_response.get(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="9f1839b6152d298aca64c4e906b6d074",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -187,6 +286,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate unauthorized HTTP response")
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
diff --git a/tests/api_resources/test_url_scanner.py b/tests/api_resources/test_url_scanner.py
deleted file mode 100644
index 452d2b50df3..00000000000
--- a/tests/api_resources/test_url_scanner.py
+++ /dev/null
@@ -1,149 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare._utils import parse_datetime
-from cloudflare.types.url_scanner import URLScannerScanResponse
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestURLScanner:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_scan(self, client: Cloudflare) -> None:
-        url_scanner = client.url_scanner.scan(
-            account_id="accountId",
-        )
-        assert_matches_type(URLScannerScanResponse, url_scanner, path=["response"])
-
-    @parametrize
-    def test_method_scan_with_all_params(self, client: Cloudflare) -> None:
-        url_scanner = client.url_scanner.scan(
-            account_id="accountId",
-            account_scans=True,
-            asn="13335",
-            date_end=parse_datetime("2019-12-27T18:11:19.117Z"),
-            date_start=parse_datetime("2019-12-27T18:11:19.117Z"),
-            hash="hash",
-            hostname="example.com",
-            ip="1.1.1.1",
-            is_malicious=True,
-            limit=100,
-            next_cursor="next_cursor",
-            page_asn="page_asn",
-            page_hostname="page_hostname",
-            page_ip="page_ip",
-            page_path="page_path",
-            page_url="page_url",
-            path="/samples/subresource-integrity/",
-            scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            url="https://example.com/?hello",
-        )
-        assert_matches_type(URLScannerScanResponse, url_scanner, path=["response"])
-
-    @parametrize
-    def test_raw_response_scan(self, client: Cloudflare) -> None:
-        response = client.url_scanner.with_raw_response.scan(
-            account_id="accountId",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        url_scanner = response.parse()
-        assert_matches_type(URLScannerScanResponse, url_scanner, path=["response"])
-
-    @parametrize
-    def test_streaming_response_scan(self, client: Cloudflare) -> None:
-        with client.url_scanner.with_streaming_response.scan(
-            account_id="accountId",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            url_scanner = response.parse()
-            assert_matches_type(URLScannerScanResponse, url_scanner, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_scan(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.url_scanner.with_raw_response.scan(
-                account_id="",
-            )
-
-
-class TestAsyncURLScanner:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_scan(self, async_client: AsyncCloudflare) -> None:
-        url_scanner = await async_client.url_scanner.scan(
-            account_id="accountId",
-        )
-        assert_matches_type(URLScannerScanResponse, url_scanner, path=["response"])
-
-    @parametrize
-    async def test_method_scan_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        url_scanner = await async_client.url_scanner.scan(
-            account_id="accountId",
-            account_scans=True,
-            asn="13335",
-            date_end=parse_datetime("2019-12-27T18:11:19.117Z"),
-            date_start=parse_datetime("2019-12-27T18:11:19.117Z"),
-            hash="hash",
-            hostname="example.com",
-            ip="1.1.1.1",
-            is_malicious=True,
-            limit=100,
-            next_cursor="next_cursor",
-            page_asn="page_asn",
-            page_hostname="page_hostname",
-            page_ip="page_ip",
-            page_path="page_path",
-            page_url="page_url",
-            path="/samples/subresource-integrity/",
-            scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            url="https://example.com/?hello",
-        )
-        assert_matches_type(URLScannerScanResponse, url_scanner, path=["response"])
-
-    @parametrize
-    async def test_raw_response_scan(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.url_scanner.with_raw_response.scan(
-            account_id="accountId",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        url_scanner = await response.parse()
-        assert_matches_type(URLScannerScanResponse, url_scanner, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_scan(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.url_scanner.with_streaming_response.scan(
-            account_id="accountId",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            url_scanner = await response.parse()
-            assert_matches_type(URLScannerScanResponse, url_scanner, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_scan(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.url_scanner.with_raw_response.scan(
-                account_id="",
-            )
diff --git a/tests/api_resources/test_user.py b/tests/api_resources/test_user.py
index 1ffbb87e386..b6ccd151f8b 100644
--- a/tests/api_resources/test_user.py
+++ b/tests/api_resources/test_user.py
@@ -3,12 +3,13 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
+from cloudflare.types.user import UserGetResponse, UserEditResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -19,7 +20,7 @@ class TestUser:
     @parametrize
     def test_method_edit(self, client: Cloudflare) -> None:
         user = client.user.edit()
-        assert_matches_type(object, user, path=["response"])
+        assert_matches_type(Optional[UserEditResponse], user, path=["response"])
 
     @parametrize
     def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
@@ -30,7 +31,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
             telephone="+1 123-123-1234",
             zipcode="12345",
         )
-        assert_matches_type(object, user, path=["response"])
+        assert_matches_type(Optional[UserEditResponse], user, path=["response"])
 
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
@@ -39,7 +40,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         user = response.parse()
-        assert_matches_type(object, user, path=["response"])
+        assert_matches_type(Optional[UserEditResponse], user, path=["response"])
 
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
@@ -48,14 +49,14 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             user = response.parse()
-            assert_matches_type(object, user, path=["response"])
+            assert_matches_type(Optional[UserEditResponse], user, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         user = client.user.get()
-        assert_matches_type(object, user, path=["response"])
+        assert_matches_type(Optional[UserGetResponse], user, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -64,7 +65,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         user = response.parse()
-        assert_matches_type(object, user, path=["response"])
+        assert_matches_type(Optional[UserGetResponse], user, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -73,18 +74,20 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             user = response.parse()
-            assert_matches_type(object, user, path=["response"])
+            assert_matches_type(Optional[UserGetResponse], user, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncUser:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
         user = await async_client.user.edit()
-        assert_matches_type(object, user, path=["response"])
+        assert_matches_type(Optional[UserEditResponse], user, path=["response"])
 
     @parametrize
     async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -95,7 +98,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
             telephone="+1 123-123-1234",
             zipcode="12345",
         )
-        assert_matches_type(object, user, path=["response"])
+        assert_matches_type(Optional[UserEditResponse], user, path=["response"])
 
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -104,7 +107,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         user = await response.parse()
-        assert_matches_type(object, user, path=["response"])
+        assert_matches_type(Optional[UserEditResponse], user, path=["response"])
 
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -113,14 +116,14 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             user = await response.parse()
-            assert_matches_type(object, user, path=["response"])
+            assert_matches_type(Optional[UserEditResponse], user, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         user = await async_client.user.get()
-        assert_matches_type(object, user, path=["response"])
+        assert_matches_type(Optional[UserGetResponse], user, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -129,7 +132,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         user = await response.parse()
-        assert_matches_type(object, user, path=["response"])
+        assert_matches_type(Optional[UserGetResponse], user, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -138,6 +141,6 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             user = await response.parse()
-            assert_matches_type(object, user, path=["response"])
+            assert_matches_type(Optional[UserGetResponse], user, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/test_waiting_rooms.py b/tests/api_resources/test_waiting_rooms.py
index 14af34401f7..ed4243ca17b 100644
--- a/tests/api_resources/test_waiting_rooms.py
+++ b/tests/api_resources/test_waiting_rooms.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.waiting_rooms import (
     WaitingRoom,
     WaitingRoomDeleteResponse,
@@ -44,15 +44,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                 {
                     "host": "shop2.example.com",
                     "path": "/shop2/checkout",
-                },
-                {
-                    "host": "shop2.example.com",
-                    "path": "/shop2/checkout",
-                },
-                {
-                    "host": "shop2.example.com",
-                    "path": "/shop2/checkout",
-                },
+                }
             ],
             cookie_attributes={
                 "samesite": "auto",
@@ -63,6 +55,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             default_template_language="es-ES",
             description="Production - DO NOT MODIFY",
             disable_session_renewal=False,
+            enabled_origin_commands=["revoke"],
             json_response_enabled=False,
             path="/shop/checkout",
             queue_all=True,
@@ -70,6 +63,8 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             queueing_status_code=202,
             session_duration=1,
             suspended=True,
+            turnstile_action="log",
+            turnstile_mode="off",
         )
         assert_matches_type(WaitingRoom, waiting_room, path=["response"])
 
@@ -141,15 +136,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                 {
                     "host": "shop2.example.com",
                     "path": "/shop2/checkout",
-                },
-                {
-                    "host": "shop2.example.com",
-                    "path": "/shop2/checkout",
-                },
-                {
-                    "host": "shop2.example.com",
-                    "path": "/shop2/checkout",
-                },
+                }
             ],
             cookie_attributes={
                 "samesite": "auto",
@@ -160,6 +147,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             default_template_language="es-ES",
             description="Production - DO NOT MODIFY",
             disable_session_renewal=False,
+            enabled_origin_commands=["revoke"],
             json_response_enabled=False,
             path="/shop/checkout",
             queue_all=True,
@@ -167,6 +155,8 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             queueing_status_code=202,
             session_duration=1,
             suspended=True,
+            turnstile_action="log",
+            turnstile_mode="off",
         )
         assert_matches_type(WaitingRoom, waiting_room, path=["response"])
 
@@ -226,51 +216,71 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 total_active_users=200,
             )
 
+    @pytest.mark.skip(
+        reason="TODO: investigate path combination CI failures - https://github.com/cloudflare/cloudflare-python/actions/runs/13889017239/job/38857790771?pr=2359#step:5:3197"
+    )
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         waiting_room = client.waiting_rooms.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         )
-        assert_matches_type(SyncSinglePage[WaitingRoom], waiting_room, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[WaitingRoom], waiting_room, path=["response"])
 
+    @pytest.mark.skip(
+        reason="TODO: investigate path combination CI failures - https://github.com/cloudflare/cloudflare-python/actions/runs/13889017239/job/38857790771?pr=2359#step:5:3197"
+    )
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         waiting_room = client.waiting_rooms.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            page={},
-            per_page={},
+            account_id="account_id",
+            page=1,
+            per_page=5,
         )
-        assert_matches_type(SyncSinglePage[WaitingRoom], waiting_room, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[WaitingRoom], waiting_room, path=["response"])
 
+    @pytest.mark.skip(
+        reason="TODO: investigate path combination CI failures - https://github.com/cloudflare/cloudflare-python/actions/runs/13889017239/job/38857790771?pr=2359#step:5:3197"
+    )
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.waiting_rooms.with_raw_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         waiting_room = response.parse()
-        assert_matches_type(SyncSinglePage[WaitingRoom], waiting_room, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[WaitingRoom], waiting_room, path=["response"])
 
+    @pytest.mark.skip(
+        reason="TODO: investigate path combination CI failures - https://github.com/cloudflare/cloudflare-python/actions/runs/13889017239/job/38857790771?pr=2359#step:5:3197"
+    )
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.waiting_rooms.with_streaming_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             waiting_room = response.parse()
-            assert_matches_type(SyncSinglePage[WaitingRoom], waiting_room, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[WaitingRoom], waiting_room, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(
+        reason="TODO: investigate path combination CI failures - https://github.com/cloudflare/cloudflare-python/actions/runs/13889017239/job/38857790771?pr=2359#step:5:3197"
+    )
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.waiting_rooms.with_raw_response.list(
-                zone_id="",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.waiting_rooms.with_raw_response.list(
+                account_id="account_id",
             )
 
     @parametrize
@@ -346,15 +356,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
                 {
                     "host": "shop2.example.com",
                     "path": "/shop2/checkout",
-                },
-                {
-                    "host": "shop2.example.com",
-                    "path": "/shop2/checkout",
-                },
-                {
-                    "host": "shop2.example.com",
-                    "path": "/shop2/checkout",
-                },
+                }
             ],
             cookie_attributes={
                 "samesite": "auto",
@@ -365,6 +367,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
             default_template_language="es-ES",
             description="Production - DO NOT MODIFY",
             disable_session_renewal=False,
+            enabled_origin_commands=["revoke"],
             json_response_enabled=False,
             path="/shop/checkout",
             queue_all=True,
@@ -372,6 +375,8 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
             queueing_status_code=202,
             session_duration=1,
             suspended=True,
+            turnstile_action="log",
+            turnstile_mode="off",
         )
         assert_matches_type(WaitingRoom, waiting_room, path=["response"])
 
@@ -481,7 +486,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncWaitingRooms:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -506,15 +513,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                 {
                     "host": "shop2.example.com",
                     "path": "/shop2/checkout",
-                },
-                {
-                    "host": "shop2.example.com",
-                    "path": "/shop2/checkout",
-                },
-                {
-                    "host": "shop2.example.com",
-                    "path": "/shop2/checkout",
-                },
+                }
             ],
             cookie_attributes={
                 "samesite": "auto",
@@ -525,6 +524,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             default_template_language="es-ES",
             description="Production - DO NOT MODIFY",
             disable_session_renewal=False,
+            enabled_origin_commands=["revoke"],
             json_response_enabled=False,
             path="/shop/checkout",
             queue_all=True,
@@ -532,6 +532,8 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             queueing_status_code=202,
             session_duration=1,
             suspended=True,
+            turnstile_action="log",
+            turnstile_mode="off",
         )
         assert_matches_type(WaitingRoom, waiting_room, path=["response"])
 
@@ -603,15 +605,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                 {
                     "host": "shop2.example.com",
                     "path": "/shop2/checkout",
-                },
-                {
-                    "host": "shop2.example.com",
-                    "path": "/shop2/checkout",
-                },
-                {
-                    "host": "shop2.example.com",
-                    "path": "/shop2/checkout",
-                },
+                }
             ],
             cookie_attributes={
                 "samesite": "auto",
@@ -622,6 +616,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             default_template_language="es-ES",
             description="Production - DO NOT MODIFY",
             disable_session_renewal=False,
+            enabled_origin_commands=["revoke"],
             json_response_enabled=False,
             path="/shop/checkout",
             queue_all=True,
@@ -629,6 +624,8 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             queueing_status_code=202,
             session_duration=1,
             suspended=True,
+            turnstile_action="log",
+            turnstile_mode="off",
         )
         assert_matches_type(WaitingRoom, waiting_room, path=["response"])
 
@@ -688,51 +685,71 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 total_active_users=200,
             )
 
+    @pytest.mark.skip(
+        reason="TODO: investigate path combination CI failures - https://github.com/cloudflare/cloudflare-python/actions/runs/13889017239/job/38857790771?pr=2359#step:5:3197"
+    )
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         waiting_room = await async_client.waiting_rooms.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         )
-        assert_matches_type(AsyncSinglePage[WaitingRoom], waiting_room, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[WaitingRoom], waiting_room, path=["response"])
 
+    @pytest.mark.skip(
+        reason="TODO: investigate path combination CI failures - https://github.com/cloudflare/cloudflare-python/actions/runs/13889017239/job/38857790771?pr=2359#step:5:3197"
+    )
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         waiting_room = await async_client.waiting_rooms.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            page={},
-            per_page={},
+            account_id="account_id",
+            page=1,
+            per_page=5,
         )
-        assert_matches_type(AsyncSinglePage[WaitingRoom], waiting_room, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[WaitingRoom], waiting_room, path=["response"])
 
+    @pytest.mark.skip(
+        reason="TODO: investigate path combination CI failures - https://github.com/cloudflare/cloudflare-python/actions/runs/13889017239/job/38857790771?pr=2359#step:5:3197"
+    )
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.waiting_rooms.with_raw_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         waiting_room = await response.parse()
-        assert_matches_type(AsyncSinglePage[WaitingRoom], waiting_room, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[WaitingRoom], waiting_room, path=["response"])
 
+    @pytest.mark.skip(
+        reason="TODO: investigate path combination CI failures - https://github.com/cloudflare/cloudflare-python/actions/runs/13889017239/job/38857790771?pr=2359#step:5:3197"
+    )
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.waiting_rooms.with_streaming_response.list(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             waiting_room = await response.parse()
-            assert_matches_type(AsyncSinglePage[WaitingRoom], waiting_room, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[WaitingRoom], waiting_room, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(
+        reason="TODO: investigate path combination CI failures - https://github.com/cloudflare/cloudflare-python/actions/runs/13889017239/job/38857790771?pr=2359#step:5:3197"
+    )
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.waiting_rooms.with_raw_response.list(
-                zone_id="",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.waiting_rooms.with_raw_response.list(
+                account_id="account_id",
             )
 
     @parametrize
@@ -808,15 +825,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
                 {
                     "host": "shop2.example.com",
                     "path": "/shop2/checkout",
-                },
-                {
-                    "host": "shop2.example.com",
-                    "path": "/shop2/checkout",
-                },
-                {
-                    "host": "shop2.example.com",
-                    "path": "/shop2/checkout",
-                },
+                }
             ],
             cookie_attributes={
                 "samesite": "auto",
@@ -827,6 +836,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
             default_template_language="es-ES",
             description="Production - DO NOT MODIFY",
             disable_session_renewal=False,
+            enabled_origin_commands=["revoke"],
             json_response_enabled=False,
             path="/shop/checkout",
             queue_all=True,
@@ -834,6 +844,8 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
             queueing_status_code=202,
             session_duration=1,
             suspended=True,
+            turnstile_action="log",
+            turnstile_mode="off",
         )
         assert_matches_type(WaitingRoom, waiting_room, path=["response"])
 
diff --git a/tests/api_resources/test_warp_connector.py b/tests/api_resources/test_warp_connector.py
deleted file mode 100644
index 77d3b889c82..00000000000
--- a/tests/api_resources/test_warp_connector.py
+++ /dev/null
@@ -1,633 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare._utils import parse_datetime
-from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
-from cloudflare.types.warp_connector import (
-    WARPConnectorGetResponse,
-    WARPConnectorEditResponse,
-    WARPConnectorListResponse,
-    WARPConnectorTokenResponse,
-    WARPConnectorCreateResponse,
-    WARPConnectorDeleteResponse,
-)
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestWARPConnector:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_create(self, client: Cloudflare) -> None:
-        warp_connector = client.warp_connector.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            name="blog",
-        )
-        assert_matches_type(WARPConnectorCreateResponse, warp_connector, path=["response"])
-
-    @parametrize
-    def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.warp_connector.with_raw_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            name="blog",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        warp_connector = response.parse()
-        assert_matches_type(WARPConnectorCreateResponse, warp_connector, path=["response"])
-
-    @parametrize
-    def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.warp_connector.with_streaming_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            name="blog",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            warp_connector = response.parse()
-            assert_matches_type(WARPConnectorCreateResponse, warp_connector, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.warp_connector.with_raw_response.create(
-                account_id="",
-                name="blog",
-            )
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        warp_connector = client.warp_connector.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(SyncV4PagePaginationArray[WARPConnectorListResponse], warp_connector, path=["response"])
-
-    @parametrize
-    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
-        warp_connector = client.warp_connector.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-            exclude_prefix="vpc1-",
-            existed_at=parse_datetime("2019-10-12T07:20:50.52Z"),
-            include_prefix="vpc1-",
-            is_deleted=True,
-            name="blog",
-            page=1,
-            per_page=1,
-            status="healthy",
-            uuid="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            was_active_at=parse_datetime("2009-11-10T23:00:00Z"),
-            was_inactive_at=parse_datetime("2009-11-10T23:00:00Z"),
-        )
-        assert_matches_type(SyncV4PagePaginationArray[WARPConnectorListResponse], warp_connector, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.warp_connector.with_raw_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        warp_connector = response.parse()
-        assert_matches_type(SyncV4PagePaginationArray[WARPConnectorListResponse], warp_connector, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.warp_connector.with_streaming_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            warp_connector = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[WARPConnectorListResponse], warp_connector, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.warp_connector.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    def test_method_delete(self, client: Cloudflare) -> None:
-        warp_connector = client.warp_connector.delete(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(WARPConnectorDeleteResponse, warp_connector, path=["response"])
-
-    @parametrize
-    def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.warp_connector.with_raw_response.delete(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        warp_connector = response.parse()
-        assert_matches_type(WARPConnectorDeleteResponse, warp_connector, path=["response"])
-
-    @parametrize
-    def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.warp_connector.with_streaming_response.delete(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            warp_connector = response.parse()
-            assert_matches_type(WARPConnectorDeleteResponse, warp_connector, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.warp_connector.with_raw_response.delete(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            client.warp_connector.with_raw_response.delete(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-    @parametrize
-    def test_method_edit(self, client: Cloudflare) -> None:
-        warp_connector = client.warp_connector.edit(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(WARPConnectorEditResponse, warp_connector, path=["response"])
-
-    @parametrize
-    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
-        warp_connector = client.warp_connector.edit(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            name="blog",
-            tunnel_secret="AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
-        )
-        assert_matches_type(WARPConnectorEditResponse, warp_connector, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit(self, client: Cloudflare) -> None:
-        response = client.warp_connector.with_raw_response.edit(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        warp_connector = response.parse()
-        assert_matches_type(WARPConnectorEditResponse, warp_connector, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit(self, client: Cloudflare) -> None:
-        with client.warp_connector.with_streaming_response.edit(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            warp_connector = response.parse()
-            assert_matches_type(WARPConnectorEditResponse, warp_connector, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.warp_connector.with_raw_response.edit(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            client.warp_connector.with_raw_response.edit(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        warp_connector = client.warp_connector.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(WARPConnectorGetResponse, warp_connector, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.warp_connector.with_raw_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        warp_connector = response.parse()
-        assert_matches_type(WARPConnectorGetResponse, warp_connector, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.warp_connector.with_streaming_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            warp_connector = response.parse()
-            assert_matches_type(WARPConnectorGetResponse, warp_connector, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.warp_connector.with_raw_response.get(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            client.warp_connector.with_raw_response.get(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-    @parametrize
-    def test_method_token(self, client: Cloudflare) -> None:
-        warp_connector = client.warp_connector.token(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(WARPConnectorTokenResponse, warp_connector, path=["response"])
-
-    @parametrize
-    def test_raw_response_token(self, client: Cloudflare) -> None:
-        response = client.warp_connector.with_raw_response.token(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        warp_connector = response.parse()
-        assert_matches_type(WARPConnectorTokenResponse, warp_connector, path=["response"])
-
-    @parametrize
-    def test_streaming_response_token(self, client: Cloudflare) -> None:
-        with client.warp_connector.with_streaming_response.token(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            warp_connector = response.parse()
-            assert_matches_type(WARPConnectorTokenResponse, warp_connector, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_token(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.warp_connector.with_raw_response.token(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            client.warp_connector.with_raw_response.token(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-
-class TestAsyncWARPConnector:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        warp_connector = await async_client.warp_connector.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            name="blog",
-        )
-        assert_matches_type(WARPConnectorCreateResponse, warp_connector, path=["response"])
-
-    @parametrize
-    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.warp_connector.with_raw_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            name="blog",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        warp_connector = await response.parse()
-        assert_matches_type(WARPConnectorCreateResponse, warp_connector, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.warp_connector.with_streaming_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            name="blog",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            warp_connector = await response.parse()
-            assert_matches_type(WARPConnectorCreateResponse, warp_connector, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.warp_connector.with_raw_response.create(
-                account_id="",
-                name="blog",
-            )
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        warp_connector = await async_client.warp_connector.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(AsyncV4PagePaginationArray[WARPConnectorListResponse], warp_connector, path=["response"])
-
-    @parametrize
-    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        warp_connector = await async_client.warp_connector.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-            exclude_prefix="vpc1-",
-            existed_at=parse_datetime("2019-10-12T07:20:50.52Z"),
-            include_prefix="vpc1-",
-            is_deleted=True,
-            name="blog",
-            page=1,
-            per_page=1,
-            status="healthy",
-            uuid="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            was_active_at=parse_datetime("2009-11-10T23:00:00Z"),
-            was_inactive_at=parse_datetime("2009-11-10T23:00:00Z"),
-        )
-        assert_matches_type(AsyncV4PagePaginationArray[WARPConnectorListResponse], warp_connector, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.warp_connector.with_raw_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        warp_connector = await response.parse()
-        assert_matches_type(AsyncV4PagePaginationArray[WARPConnectorListResponse], warp_connector, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.warp_connector.with_streaming_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            warp_connector = await response.parse()
-            assert_matches_type(
-                AsyncV4PagePaginationArray[WARPConnectorListResponse], warp_connector, path=["response"]
-            )
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.warp_connector.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        warp_connector = await async_client.warp_connector.delete(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(WARPConnectorDeleteResponse, warp_connector, path=["response"])
-
-    @parametrize
-    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.warp_connector.with_raw_response.delete(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        warp_connector = await response.parse()
-        assert_matches_type(WARPConnectorDeleteResponse, warp_connector, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.warp_connector.with_streaming_response.delete(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            warp_connector = await response.parse()
-            assert_matches_type(WARPConnectorDeleteResponse, warp_connector, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.warp_connector.with_raw_response.delete(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            await async_client.warp_connector.with_raw_response.delete(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-    @parametrize
-    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
-        warp_connector = await async_client.warp_connector.edit(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(WARPConnectorEditResponse, warp_connector, path=["response"])
-
-    @parametrize
-    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        warp_connector = await async_client.warp_connector.edit(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            name="blog",
-            tunnel_secret="AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
-        )
-        assert_matches_type(WARPConnectorEditResponse, warp_connector, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.warp_connector.with_raw_response.edit(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        warp_connector = await response.parse()
-        assert_matches_type(WARPConnectorEditResponse, warp_connector, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.warp_connector.with_streaming_response.edit(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            warp_connector = await response.parse()
-            assert_matches_type(WARPConnectorEditResponse, warp_connector, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.warp_connector.with_raw_response.edit(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            await async_client.warp_connector.with_raw_response.edit(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        warp_connector = await async_client.warp_connector.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(WARPConnectorGetResponse, warp_connector, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.warp_connector.with_raw_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        warp_connector = await response.parse()
-        assert_matches_type(WARPConnectorGetResponse, warp_connector, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.warp_connector.with_streaming_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            warp_connector = await response.parse()
-            assert_matches_type(WARPConnectorGetResponse, warp_connector, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.warp_connector.with_raw_response.get(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            await async_client.warp_connector.with_raw_response.get(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-    @parametrize
-    async def test_method_token(self, async_client: AsyncCloudflare) -> None:
-        warp_connector = await async_client.warp_connector.token(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(WARPConnectorTokenResponse, warp_connector, path=["response"])
-
-    @parametrize
-    async def test_raw_response_token(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.warp_connector.with_raw_response.token(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        warp_connector = await response.parse()
-        assert_matches_type(WARPConnectorTokenResponse, warp_connector, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_token(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.warp_connector.with_streaming_response.token(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            warp_connector = await response.parse()
-            assert_matches_type(WARPConnectorTokenResponse, warp_connector, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_token(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.warp_connector.with_raw_response.token(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            await async_client.warp_connector.with_raw_response.token(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
diff --git a/tests/api_resources/test_workflows.py b/tests/api_resources/test_workflows.py
new file mode 100644
index 00000000000..bcc84aa9081
--- /dev/null
+++ b/tests/api_resources/test_workflows.py
@@ -0,0 +1,434 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.workflows import (
+    WorkflowGetResponse,
+    WorkflowListResponse,
+    WorkflowDeleteResponse,
+    WorkflowUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestWorkflows:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        workflow = client.workflows.update(
+            workflow_name="x",
+            account_id="account_id",
+            class_name="x",
+            script_name="x",
+        )
+        assert_matches_type(WorkflowUpdateResponse, workflow, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.workflows.with_raw_response.update(
+            workflow_name="x",
+            account_id="account_id",
+            class_name="x",
+            script_name="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        workflow = response.parse()
+        assert_matches_type(WorkflowUpdateResponse, workflow, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.workflows.with_streaming_response.update(
+            workflow_name="x",
+            account_id="account_id",
+            class_name="x",
+            script_name="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            workflow = response.parse()
+            assert_matches_type(WorkflowUpdateResponse, workflow, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workflows.with_raw_response.update(
+                workflow_name="x",
+                account_id="",
+                class_name="x",
+                script_name="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            client.workflows.with_raw_response.update(
+                workflow_name="",
+                account_id="account_id",
+                class_name="x",
+                script_name="x",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        workflow = client.workflows.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[WorkflowListResponse], workflow, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        workflow = client.workflows.list(
+            account_id="account_id",
+            page=1,
+            per_page=1,
+            search="x",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[WorkflowListResponse], workflow, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.workflows.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        workflow = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[WorkflowListResponse], workflow, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.workflows.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            workflow = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[WorkflowListResponse], workflow, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workflows.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        workflow = client.workflows.delete(
+            workflow_name="x",
+            account_id="account_id",
+        )
+        assert_matches_type(WorkflowDeleteResponse, workflow, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.workflows.with_raw_response.delete(
+            workflow_name="x",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        workflow = response.parse()
+        assert_matches_type(WorkflowDeleteResponse, workflow, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.workflows.with_streaming_response.delete(
+            workflow_name="x",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            workflow = response.parse()
+            assert_matches_type(WorkflowDeleteResponse, workflow, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workflows.with_raw_response.delete(
+                workflow_name="x",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            client.workflows.with_raw_response.delete(
+                workflow_name="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        workflow = client.workflows.get(
+            workflow_name="x",
+            account_id="account_id",
+        )
+        assert_matches_type(WorkflowGetResponse, workflow, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.workflows.with_raw_response.get(
+            workflow_name="x",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        workflow = response.parse()
+        assert_matches_type(WorkflowGetResponse, workflow, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.workflows.with_streaming_response.get(
+            workflow_name="x",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            workflow = response.parse()
+            assert_matches_type(WorkflowGetResponse, workflow, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workflows.with_raw_response.get(
+                workflow_name="x",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            client.workflows.with_raw_response.get(
+                workflow_name="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncWorkflows:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        workflow = await async_client.workflows.update(
+            workflow_name="x",
+            account_id="account_id",
+            class_name="x",
+            script_name="x",
+        )
+        assert_matches_type(WorkflowUpdateResponse, workflow, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workflows.with_raw_response.update(
+            workflow_name="x",
+            account_id="account_id",
+            class_name="x",
+            script_name="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        workflow = await response.parse()
+        assert_matches_type(WorkflowUpdateResponse, workflow, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workflows.with_streaming_response.update(
+            workflow_name="x",
+            account_id="account_id",
+            class_name="x",
+            script_name="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            workflow = await response.parse()
+            assert_matches_type(WorkflowUpdateResponse, workflow, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workflows.with_raw_response.update(
+                workflow_name="x",
+                account_id="",
+                class_name="x",
+                script_name="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            await async_client.workflows.with_raw_response.update(
+                workflow_name="",
+                account_id="account_id",
+                class_name="x",
+                script_name="x",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        workflow = await async_client.workflows.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[WorkflowListResponse], workflow, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        workflow = await async_client.workflows.list(
+            account_id="account_id",
+            page=1,
+            per_page=1,
+            search="x",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[WorkflowListResponse], workflow, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workflows.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        workflow = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[WorkflowListResponse], workflow, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workflows.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            workflow = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[WorkflowListResponse], workflow, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workflows.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        workflow = await async_client.workflows.delete(
+            workflow_name="x",
+            account_id="account_id",
+        )
+        assert_matches_type(WorkflowDeleteResponse, workflow, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workflows.with_raw_response.delete(
+            workflow_name="x",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        workflow = await response.parse()
+        assert_matches_type(WorkflowDeleteResponse, workflow, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workflows.with_streaming_response.delete(
+            workflow_name="x",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            workflow = await response.parse()
+            assert_matches_type(WorkflowDeleteResponse, workflow, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workflows.with_raw_response.delete(
+                workflow_name="x",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            await async_client.workflows.with_raw_response.delete(
+                workflow_name="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        workflow = await async_client.workflows.get(
+            workflow_name="x",
+            account_id="account_id",
+        )
+        assert_matches_type(WorkflowGetResponse, workflow, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workflows.with_raw_response.get(
+            workflow_name="x",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        workflow = await response.parse()
+        assert_matches_type(WorkflowGetResponse, workflow, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workflows.with_streaming_response.get(
+            workflow_name="x",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            workflow = await response.parse()
+            assert_matches_type(WorkflowGetResponse, workflow, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workflows.with_raw_response.get(
+                workflow_name="x",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            await async_client.workflows.with_raw_response.get(
+                workflow_name="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/test_zaraz.py b/tests/api_resources/test_zaraz.py
new file mode 100644
index 00000000000..00bdec56c63
--- /dev/null
+++ b/tests/api_resources/test_zaraz.py
@@ -0,0 +1,108 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zaraz import Workflow
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestZaraz:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        zaraz = client.zaraz.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            workflow="realtime",
+        )
+        assert_matches_type(Workflow, zaraz, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zaraz.with_raw_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            workflow="realtime",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        zaraz = response.parse()
+        assert_matches_type(Workflow, zaraz, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zaraz.with_streaming_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            workflow="realtime",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            zaraz = response.parse()
+            assert_matches_type(Workflow, zaraz, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.zaraz.with_raw_response.update(
+                zone_id="",
+                workflow="realtime",
+            )
+
+
+class TestAsyncZaraz:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        zaraz = await async_client.zaraz.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            workflow="realtime",
+        )
+        assert_matches_type(Workflow, zaraz, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zaraz.with_raw_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            workflow="realtime",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        zaraz = await response.parse()
+        assert_matches_type(Workflow, zaraz, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zaraz.with_streaming_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            workflow="realtime",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            zaraz = await response.parse()
+            assert_matches_type(Workflow, zaraz, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.zaraz.with_raw_response.update(
+                zone_id="",
+                workflow="realtime",
+            )
diff --git a/tests/api_resources/test_zones.py b/tests/api_resources/test_zones.py
index c66ce174c90..0ee90986d59 100644
--- a/tests/api_resources/test_zones.py
+++ b/tests/api_resources/test_zones.py
@@ -159,7 +159,7 @@ def test_method_edit(self, client: Cloudflare) -> None:
     def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
         zone = client.zones.edit(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            plan={"id": "023e105f4ecef8ad9ca31a8372d0c353"},
+            paused=True,
             type="full",
             vanity_name_servers=["ns1.example.com", "ns2.example.com"],
         )
@@ -236,7 +236,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncZones:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -376,7 +378,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
     async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
         zone = await async_client.zones.edit(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            plan={"id": "023e105f4ecef8ad9ca31a8372d0c353"},
+            paused=True,
             type="full",
             vanity_name_servers=["ns1.example.com", "ns2.example.com"],
         )
diff --git a/tests/api_resources/token_validation/__init__.py b/tests/api_resources/token_validation/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/token_validation/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/token_validation/configuration/__init__.py b/tests/api_resources/token_validation/configuration/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/token_validation/configuration/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/token_validation/configuration/test_credentials.py b/tests/api_resources/token_validation/configuration/test_credentials.py
new file mode 100644
index 00000000000..dba1050dd35
--- /dev/null
+++ b/tests/api_resources/token_validation/configuration/test_credentials.py
@@ -0,0 +1,220 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.token_validation.configuration import CredentialUpdateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCredentials:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        credential = client.token_validation.configuration.credentials.update(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            keys=[
+                {
+                    "alg": "ES256",
+                    "crv": "P-256",
+                    "kid": "38013f13-c266-4eec-a72a-92ec92779f21",
+                    "kty": "EC",
+                    "x": "KN53JRwN3wCjm2o39bvZUX2VdrsHzS8pxOAGjm8m7EQ",
+                    "y": "lnkkzIxaveggz-HFhcMWW15nxvOj0Z_uQsXbpK0GFcY",
+                }
+            ],
+        )
+        assert_matches_type(CredentialUpdateResponse, credential, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.token_validation.configuration.credentials.with_raw_response.update(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            keys=[
+                {
+                    "alg": "ES256",
+                    "crv": "P-256",
+                    "kid": "38013f13-c266-4eec-a72a-92ec92779f21",
+                    "kty": "EC",
+                    "x": "KN53JRwN3wCjm2o39bvZUX2VdrsHzS8pxOAGjm8m7EQ",
+                    "y": "lnkkzIxaveggz-HFhcMWW15nxvOj0Z_uQsXbpK0GFcY",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        credential = response.parse()
+        assert_matches_type(CredentialUpdateResponse, credential, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.token_validation.configuration.credentials.with_streaming_response.update(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            keys=[
+                {
+                    "alg": "ES256",
+                    "crv": "P-256",
+                    "kid": "38013f13-c266-4eec-a72a-92ec92779f21",
+                    "kty": "EC",
+                    "x": "KN53JRwN3wCjm2o39bvZUX2VdrsHzS8pxOAGjm8m7EQ",
+                    "y": "lnkkzIxaveggz-HFhcMWW15nxvOj0Z_uQsXbpK0GFcY",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            credential = response.parse()
+            assert_matches_type(CredentialUpdateResponse, credential, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.token_validation.configuration.credentials.with_raw_response.update(
+                config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+                zone_id="",
+                keys=[
+                    {
+                        "alg": "ES256",
+                        "crv": "P-256",
+                        "kid": "38013f13-c266-4eec-a72a-92ec92779f21",
+                        "kty": "EC",
+                        "x": "KN53JRwN3wCjm2o39bvZUX2VdrsHzS8pxOAGjm8m7EQ",
+                        "y": "lnkkzIxaveggz-HFhcMWW15nxvOj0Z_uQsXbpK0GFcY",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `config_id` but received ''"):
+            client.token_validation.configuration.credentials.with_raw_response.update(
+                config_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                keys=[
+                    {
+                        "alg": "ES256",
+                        "crv": "P-256",
+                        "kid": "38013f13-c266-4eec-a72a-92ec92779f21",
+                        "kty": "EC",
+                        "x": "KN53JRwN3wCjm2o39bvZUX2VdrsHzS8pxOAGjm8m7EQ",
+                        "y": "lnkkzIxaveggz-HFhcMWW15nxvOj0Z_uQsXbpK0GFcY",
+                    }
+                ],
+            )
+
+
+class TestAsyncCredentials:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        credential = await async_client.token_validation.configuration.credentials.update(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            keys=[
+                {
+                    "alg": "ES256",
+                    "crv": "P-256",
+                    "kid": "38013f13-c266-4eec-a72a-92ec92779f21",
+                    "kty": "EC",
+                    "x": "KN53JRwN3wCjm2o39bvZUX2VdrsHzS8pxOAGjm8m7EQ",
+                    "y": "lnkkzIxaveggz-HFhcMWW15nxvOj0Z_uQsXbpK0GFcY",
+                }
+            ],
+        )
+        assert_matches_type(CredentialUpdateResponse, credential, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.token_validation.configuration.credentials.with_raw_response.update(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            keys=[
+                {
+                    "alg": "ES256",
+                    "crv": "P-256",
+                    "kid": "38013f13-c266-4eec-a72a-92ec92779f21",
+                    "kty": "EC",
+                    "x": "KN53JRwN3wCjm2o39bvZUX2VdrsHzS8pxOAGjm8m7EQ",
+                    "y": "lnkkzIxaveggz-HFhcMWW15nxvOj0Z_uQsXbpK0GFcY",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        credential = await response.parse()
+        assert_matches_type(CredentialUpdateResponse, credential, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.token_validation.configuration.credentials.with_streaming_response.update(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            keys=[
+                {
+                    "alg": "ES256",
+                    "crv": "P-256",
+                    "kid": "38013f13-c266-4eec-a72a-92ec92779f21",
+                    "kty": "EC",
+                    "x": "KN53JRwN3wCjm2o39bvZUX2VdrsHzS8pxOAGjm8m7EQ",
+                    "y": "lnkkzIxaveggz-HFhcMWW15nxvOj0Z_uQsXbpK0GFcY",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            credential = await response.parse()
+            assert_matches_type(CredentialUpdateResponse, credential, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.token_validation.configuration.credentials.with_raw_response.update(
+                config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+                zone_id="",
+                keys=[
+                    {
+                        "alg": "ES256",
+                        "crv": "P-256",
+                        "kid": "38013f13-c266-4eec-a72a-92ec92779f21",
+                        "kty": "EC",
+                        "x": "KN53JRwN3wCjm2o39bvZUX2VdrsHzS8pxOAGjm8m7EQ",
+                        "y": "lnkkzIxaveggz-HFhcMWW15nxvOj0Z_uQsXbpK0GFcY",
+                    }
+                ],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `config_id` but received ''"):
+            await async_client.token_validation.configuration.credentials.with_raw_response.update(
+                config_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                keys=[
+                    {
+                        "alg": "ES256",
+                        "crv": "P-256",
+                        "kid": "38013f13-c266-4eec-a72a-92ec92779f21",
+                        "kty": "EC",
+                        "x": "KN53JRwN3wCjm2o39bvZUX2VdrsHzS8pxOAGjm8m7EQ",
+                        "y": "lnkkzIxaveggz-HFhcMWW15nxvOj0Z_uQsXbpK0GFcY",
+                    }
+                ],
+            )
diff --git a/tests/api_resources/token_validation/test_configuration.py b/tests/api_resources/token_validation/test_configuration.py
new file mode 100644
index 00000000000..da51f98b730
--- /dev/null
+++ b/tests/api_resources/token_validation/test_configuration.py
@@ -0,0 +1,637 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.token_validation import (
+    TokenConfig,
+    ConfigurationEditResponse,
+    ConfigurationDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestConfiguration:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        configuration = client.token_validation.configuration.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            credentials={
+                "keys": [
+                    {
+                        "alg": "ES256",
+                        "crv": "P-256",
+                        "kid": "38013f13-c266-4eec-a72a-92ec92779f21",
+                        "kty": "EC",
+                        "x": "KN53JRwN3wCjm2o39bvZUX2VdrsHzS8pxOAGjm8m7EQ",
+                        "y": "lnkkzIxaveggz-HFhcMWW15nxvOj0Z_uQsXbpK0GFcY",
+                    }
+                ]
+            },
+            description="Long description for Token Validation Configuration",
+            title="Example Token Validation Configuration",
+            token_sources=['http.request.headers["x-auth"][0]', 'http.request.cookies["Authorization"][0]'],
+            token_type="JWT",
+        )
+        assert_matches_type(TokenConfig, configuration, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.token_validation.configuration.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            credentials={
+                "keys": [
+                    {
+                        "alg": "ES256",
+                        "crv": "P-256",
+                        "kid": "38013f13-c266-4eec-a72a-92ec92779f21",
+                        "kty": "EC",
+                        "x": "KN53JRwN3wCjm2o39bvZUX2VdrsHzS8pxOAGjm8m7EQ",
+                        "y": "lnkkzIxaveggz-HFhcMWW15nxvOj0Z_uQsXbpK0GFcY",
+                    }
+                ]
+            },
+            description="Long description for Token Validation Configuration",
+            title="Example Token Validation Configuration",
+            token_sources=['http.request.headers["x-auth"][0]', 'http.request.cookies["Authorization"][0]'],
+            token_type="JWT",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        configuration = response.parse()
+        assert_matches_type(TokenConfig, configuration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.token_validation.configuration.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            credentials={
+                "keys": [
+                    {
+                        "alg": "ES256",
+                        "crv": "P-256",
+                        "kid": "38013f13-c266-4eec-a72a-92ec92779f21",
+                        "kty": "EC",
+                        "x": "KN53JRwN3wCjm2o39bvZUX2VdrsHzS8pxOAGjm8m7EQ",
+                        "y": "lnkkzIxaveggz-HFhcMWW15nxvOj0Z_uQsXbpK0GFcY",
+                    }
+                ]
+            },
+            description="Long description for Token Validation Configuration",
+            title="Example Token Validation Configuration",
+            token_sources=['http.request.headers["x-auth"][0]', 'http.request.cookies["Authorization"][0]'],
+            token_type="JWT",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            configuration = response.parse()
+            assert_matches_type(TokenConfig, configuration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.token_validation.configuration.with_raw_response.create(
+                zone_id="",
+                credentials={
+                    "keys": [
+                        {
+                            "alg": "ES256",
+                            "crv": "P-256",
+                            "kid": "38013f13-c266-4eec-a72a-92ec92779f21",
+                            "kty": "EC",
+                            "x": "KN53JRwN3wCjm2o39bvZUX2VdrsHzS8pxOAGjm8m7EQ",
+                            "y": "lnkkzIxaveggz-HFhcMWW15nxvOj0Z_uQsXbpK0GFcY",
+                        }
+                    ]
+                },
+                description="Long description for Token Validation Configuration",
+                title="Example Token Validation Configuration",
+                token_sources=['http.request.headers["x-auth"][0]', 'http.request.cookies["Authorization"][0]'],
+                token_type="JWT",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        configuration = client.token_validation.configuration.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[TokenConfig], configuration, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        configuration = client.token_validation.configuration.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=5,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[TokenConfig], configuration, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.token_validation.configuration.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        configuration = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[TokenConfig], configuration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.token_validation.configuration.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            configuration = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[TokenConfig], configuration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.token_validation.configuration.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        configuration = client.token_validation.configuration.delete(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ConfigurationDeleteResponse, configuration, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.token_validation.configuration.with_raw_response.delete(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        configuration = response.parse()
+        assert_matches_type(ConfigurationDeleteResponse, configuration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.token_validation.configuration.with_streaming_response.delete(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            configuration = response.parse()
+            assert_matches_type(ConfigurationDeleteResponse, configuration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.token_validation.configuration.with_raw_response.delete(
+                config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `config_id` but received ''"):
+            client.token_validation.configuration.with_raw_response.delete(
+                config_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        configuration = client.token_validation.configuration.edit(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ConfigurationEditResponse, configuration, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        configuration = client.token_validation.configuration.edit(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            description="Long description for Token Validation Configuration",
+            title="Example Token Validation Configuration",
+            token_sources=['http.request.headers["x-auth"][0]', 'http.request.cookies["Authorization"][0]'],
+        )
+        assert_matches_type(ConfigurationEditResponse, configuration, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.token_validation.configuration.with_raw_response.edit(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        configuration = response.parse()
+        assert_matches_type(ConfigurationEditResponse, configuration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.token_validation.configuration.with_streaming_response.edit(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            configuration = response.parse()
+            assert_matches_type(ConfigurationEditResponse, configuration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.token_validation.configuration.with_raw_response.edit(
+                config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `config_id` but received ''"):
+            client.token_validation.configuration.with_raw_response.edit(
+                config_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        configuration = client.token_validation.configuration.get(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(TokenConfig, configuration, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.token_validation.configuration.with_raw_response.get(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        configuration = response.parse()
+        assert_matches_type(TokenConfig, configuration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.token_validation.configuration.with_streaming_response.get(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            configuration = response.parse()
+            assert_matches_type(TokenConfig, configuration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.token_validation.configuration.with_raw_response.get(
+                config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `config_id` but received ''"):
+            client.token_validation.configuration.with_raw_response.get(
+                config_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncConfiguration:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        configuration = await async_client.token_validation.configuration.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            credentials={
+                "keys": [
+                    {
+                        "alg": "ES256",
+                        "crv": "P-256",
+                        "kid": "38013f13-c266-4eec-a72a-92ec92779f21",
+                        "kty": "EC",
+                        "x": "KN53JRwN3wCjm2o39bvZUX2VdrsHzS8pxOAGjm8m7EQ",
+                        "y": "lnkkzIxaveggz-HFhcMWW15nxvOj0Z_uQsXbpK0GFcY",
+                    }
+                ]
+            },
+            description="Long description for Token Validation Configuration",
+            title="Example Token Validation Configuration",
+            token_sources=['http.request.headers["x-auth"][0]', 'http.request.cookies["Authorization"][0]'],
+            token_type="JWT",
+        )
+        assert_matches_type(TokenConfig, configuration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.token_validation.configuration.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            credentials={
+                "keys": [
+                    {
+                        "alg": "ES256",
+                        "crv": "P-256",
+                        "kid": "38013f13-c266-4eec-a72a-92ec92779f21",
+                        "kty": "EC",
+                        "x": "KN53JRwN3wCjm2o39bvZUX2VdrsHzS8pxOAGjm8m7EQ",
+                        "y": "lnkkzIxaveggz-HFhcMWW15nxvOj0Z_uQsXbpK0GFcY",
+                    }
+                ]
+            },
+            description="Long description for Token Validation Configuration",
+            title="Example Token Validation Configuration",
+            token_sources=['http.request.headers["x-auth"][0]', 'http.request.cookies["Authorization"][0]'],
+            token_type="JWT",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        configuration = await response.parse()
+        assert_matches_type(TokenConfig, configuration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.token_validation.configuration.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            credentials={
+                "keys": [
+                    {
+                        "alg": "ES256",
+                        "crv": "P-256",
+                        "kid": "38013f13-c266-4eec-a72a-92ec92779f21",
+                        "kty": "EC",
+                        "x": "KN53JRwN3wCjm2o39bvZUX2VdrsHzS8pxOAGjm8m7EQ",
+                        "y": "lnkkzIxaveggz-HFhcMWW15nxvOj0Z_uQsXbpK0GFcY",
+                    }
+                ]
+            },
+            description="Long description for Token Validation Configuration",
+            title="Example Token Validation Configuration",
+            token_sources=['http.request.headers["x-auth"][0]', 'http.request.cookies["Authorization"][0]'],
+            token_type="JWT",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            configuration = await response.parse()
+            assert_matches_type(TokenConfig, configuration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.token_validation.configuration.with_raw_response.create(
+                zone_id="",
+                credentials={
+                    "keys": [
+                        {
+                            "alg": "ES256",
+                            "crv": "P-256",
+                            "kid": "38013f13-c266-4eec-a72a-92ec92779f21",
+                            "kty": "EC",
+                            "x": "KN53JRwN3wCjm2o39bvZUX2VdrsHzS8pxOAGjm8m7EQ",
+                            "y": "lnkkzIxaveggz-HFhcMWW15nxvOj0Z_uQsXbpK0GFcY",
+                        }
+                    ]
+                },
+                description="Long description for Token Validation Configuration",
+                title="Example Token Validation Configuration",
+                token_sources=['http.request.headers["x-auth"][0]', 'http.request.cookies["Authorization"][0]'],
+                token_type="JWT",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        configuration = await async_client.token_validation.configuration.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[TokenConfig], configuration, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        configuration = await async_client.token_validation.configuration.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=5,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[TokenConfig], configuration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.token_validation.configuration.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        configuration = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[TokenConfig], configuration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.token_validation.configuration.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            configuration = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[TokenConfig], configuration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.token_validation.configuration.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        configuration = await async_client.token_validation.configuration.delete(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ConfigurationDeleteResponse, configuration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.token_validation.configuration.with_raw_response.delete(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        configuration = await response.parse()
+        assert_matches_type(ConfigurationDeleteResponse, configuration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.token_validation.configuration.with_streaming_response.delete(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            configuration = await response.parse()
+            assert_matches_type(ConfigurationDeleteResponse, configuration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.token_validation.configuration.with_raw_response.delete(
+                config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `config_id` but received ''"):
+            await async_client.token_validation.configuration.with_raw_response.delete(
+                config_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        configuration = await async_client.token_validation.configuration.edit(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ConfigurationEditResponse, configuration, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        configuration = await async_client.token_validation.configuration.edit(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            description="Long description for Token Validation Configuration",
+            title="Example Token Validation Configuration",
+            token_sources=['http.request.headers["x-auth"][0]', 'http.request.cookies["Authorization"][0]'],
+        )
+        assert_matches_type(ConfigurationEditResponse, configuration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.token_validation.configuration.with_raw_response.edit(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        configuration = await response.parse()
+        assert_matches_type(ConfigurationEditResponse, configuration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.token_validation.configuration.with_streaming_response.edit(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            configuration = await response.parse()
+            assert_matches_type(ConfigurationEditResponse, configuration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.token_validation.configuration.with_raw_response.edit(
+                config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `config_id` but received ''"):
+            await async_client.token_validation.configuration.with_raw_response.edit(
+                config_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        configuration = await async_client.token_validation.configuration.get(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(TokenConfig, configuration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.token_validation.configuration.with_raw_response.get(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        configuration = await response.parse()
+        assert_matches_type(TokenConfig, configuration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.token_validation.configuration.with_streaming_response.get(
+            config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            configuration = await response.parse()
+            assert_matches_type(TokenConfig, configuration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.token_validation.configuration.with_raw_response.get(
+                config_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `config_id` but received ''"):
+            await async_client.token_validation.configuration.with_raw_response.get(
+                config_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/token_validation/test_rules.py b/tests/api_resources/token_validation/test_rules.py
new file mode 100644
index 00000000000..a92a5512ad6
--- /dev/null
+++ b/tests/api_resources/token_validation/test_rules.py
@@ -0,0 +1,863 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.token_validation import (
+    TokenValidationRule,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestRules:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        rule = client.token_validation.rules.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="log",
+            description="Long description for Token Validation Rule",
+            enabled=True,
+            expression='is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+            selector={},
+            title="Example Token Validation Rule",
+        )
+        assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        rule = client.token_validation.rules.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="log",
+            description="Long description for Token Validation Rule",
+            enabled=True,
+            expression='is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+            selector={
+                "exclude": [
+                    {"operation_ids": ["f9c5615e-fe15-48ce-bec6-cfc1946f1bec", "56828eae-035a-4396-ba07-51c66d680a04"]}
+                ],
+                "include": [{"host": ["v1.example.com", "v2.example.com"]}],
+            },
+            title="Example Token Validation Rule",
+        )
+        assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.token_validation.rules.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="log",
+            description="Long description for Token Validation Rule",
+            enabled=True,
+            expression='is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+            selector={},
+            title="Example Token Validation Rule",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.token_validation.rules.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="log",
+            description="Long description for Token Validation Rule",
+            enabled=True,
+            expression='is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+            selector={},
+            title="Example Token Validation Rule",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = response.parse()
+            assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.token_validation.rules.with_raw_response.create(
+                zone_id="",
+                action="log",
+                description="Long description for Token Validation Rule",
+                enabled=True,
+                expression='is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+                selector={},
+                title="Example Token Validation Rule",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        rule = client.token_validation.rules.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[TokenValidationRule], rule, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        rule = client.token_validation.rules.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            action="log",
+            enabled=True,
+            host="www.example.com",
+            hostname="www.example.com",
+            page=1,
+            per_page=5,
+            rule_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            token_configuration=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+        )
+        assert_matches_type(SyncV4PagePaginationArray[TokenValidationRule], rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.token_validation.rules.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[TokenValidationRule], rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.token_validation.rules.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[TokenValidationRule], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.token_validation.rules.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        rule = client.token_validation.rules.delete(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(object, rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.token_validation.rules.with_raw_response.delete(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(object, rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.token_validation.rules.with_streaming_response.delete(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = response.parse()
+            assert_matches_type(object, rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.token_validation.rules.with_raw_response.delete(
+                rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+            client.token_validation.rules.with_raw_response.delete(
+                rule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_bulk_create(self, client: Cloudflare) -> None:
+        rule = client.token_validation.rules.bulk_create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "action": "log",
+                    "description": "Long description for Token Validation Rule",
+                    "enabled": True,
+                    "expression": 'is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+                    "selector": {},
+                    "title": "Example Token Validation Rule",
+                }
+            ],
+        )
+        assert_matches_type(SyncSinglePage[TokenValidationRule], rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_create(self, client: Cloudflare) -> None:
+        response = client.token_validation.rules.with_raw_response.bulk_create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "action": "log",
+                    "description": "Long description for Token Validation Rule",
+                    "enabled": True,
+                    "expression": 'is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+                    "selector": {},
+                    "title": "Example Token Validation Rule",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(SyncSinglePage[TokenValidationRule], rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_create(self, client: Cloudflare) -> None:
+        with client.token_validation.rules.with_streaming_response.bulk_create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "action": "log",
+                    "description": "Long description for Token Validation Rule",
+                    "enabled": True,
+                    "expression": 'is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+                    "selector": {},
+                    "title": "Example Token Validation Rule",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = response.parse()
+            assert_matches_type(SyncSinglePage[TokenValidationRule], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.token_validation.rules.with_raw_response.bulk_create(
+                zone_id="",
+                body=[
+                    {
+                        "action": "log",
+                        "description": "Long description for Token Validation Rule",
+                        "enabled": True,
+                        "expression": 'is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+                        "selector": {},
+                        "title": "Example Token Validation Rule",
+                    }
+                ],
+            )
+
+    @parametrize
+    def test_method_bulk_edit(self, client: Cloudflare) -> None:
+        rule = client.token_validation.rules.bulk_edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"id": "0d9bf70c-92e1-4bb3-9411-34a3bcc59003"}],
+        )
+        assert_matches_type(SyncSinglePage[TokenValidationRule], rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_edit(self, client: Cloudflare) -> None:
+        response = client.token_validation.rules.with_raw_response.bulk_edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"id": "0d9bf70c-92e1-4bb3-9411-34a3bcc59003"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(SyncSinglePage[TokenValidationRule], rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_edit(self, client: Cloudflare) -> None:
+        with client.token_validation.rules.with_streaming_response.bulk_edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"id": "0d9bf70c-92e1-4bb3-9411-34a3bcc59003"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = response.parse()
+            assert_matches_type(SyncSinglePage[TokenValidationRule], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.token_validation.rules.with_raw_response.bulk_edit(
+                zone_id="",
+                body=[{"id": "0d9bf70c-92e1-4bb3-9411-34a3bcc59003"}],
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        rule = client.token_validation.rules.edit(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        rule = client.token_validation.rules.edit(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="log",
+            description="Long description for Token Validation Rule",
+            enabled=True,
+            expression='is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+            position={"index": 2},
+            selector={
+                "exclude": [
+                    {"operation_ids": ["f9c5615e-fe15-48ce-bec6-cfc1946f1bec", "56828eae-035a-4396-ba07-51c66d680a04"]}
+                ],
+                "include": [{"host": ["v1.example.com", "v2.example.com"]}],
+            },
+            title="Example Token Validation Rule",
+        )
+        assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.token_validation.rules.with_raw_response.edit(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.token_validation.rules.with_streaming_response.edit(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = response.parse()
+            assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.token_validation.rules.with_raw_response.edit(
+                rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+            client.token_validation.rules.with_raw_response.edit(
+                rule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        rule = client.token_validation.rules.get(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.token_validation.rules.with_raw_response.get(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.token_validation.rules.with_streaming_response.get(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = response.parse()
+            assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.token_validation.rules.with_raw_response.get(
+                rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+            client.token_validation.rules.with_raw_response.get(
+                rule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncRules:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.token_validation.rules.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="log",
+            description="Long description for Token Validation Rule",
+            enabled=True,
+            expression='is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+            selector={},
+            title="Example Token Validation Rule",
+        )
+        assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.token_validation.rules.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="log",
+            description="Long description for Token Validation Rule",
+            enabled=True,
+            expression='is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+            selector={
+                "exclude": [
+                    {"operation_ids": ["f9c5615e-fe15-48ce-bec6-cfc1946f1bec", "56828eae-035a-4396-ba07-51c66d680a04"]}
+                ],
+                "include": [{"host": ["v1.example.com", "v2.example.com"]}],
+            },
+            title="Example Token Validation Rule",
+        )
+        assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.token_validation.rules.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="log",
+            description="Long description for Token Validation Rule",
+            enabled=True,
+            expression='is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+            selector={},
+            title="Example Token Validation Rule",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.token_validation.rules.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="log",
+            description="Long description for Token Validation Rule",
+            enabled=True,
+            expression='is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+            selector={},
+            title="Example Token Validation Rule",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = await response.parse()
+            assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.token_validation.rules.with_raw_response.create(
+                zone_id="",
+                action="log",
+                description="Long description for Token Validation Rule",
+                enabled=True,
+                expression='is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+                selector={},
+                title="Example Token Validation Rule",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.token_validation.rules.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[TokenValidationRule], rule, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.token_validation.rules.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            action="log",
+            enabled=True,
+            host="www.example.com",
+            hostname="www.example.com",
+            page=1,
+            per_page=5,
+            rule_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            token_configuration=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[TokenValidationRule], rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.token_validation.rules.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[TokenValidationRule], rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.token_validation.rules.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[TokenValidationRule], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.token_validation.rules.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.token_validation.rules.delete(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(object, rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.token_validation.rules.with_raw_response.delete(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(object, rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.token_validation.rules.with_streaming_response.delete(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = await response.parse()
+            assert_matches_type(object, rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.token_validation.rules.with_raw_response.delete(
+                rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+            await async_client.token_validation.rules.with_raw_response.delete(
+                rule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.token_validation.rules.bulk_create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "action": "log",
+                    "description": "Long description for Token Validation Rule",
+                    "enabled": True,
+                    "expression": 'is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+                    "selector": {},
+                    "title": "Example Token Validation Rule",
+                }
+            ],
+        )
+        assert_matches_type(AsyncSinglePage[TokenValidationRule], rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.token_validation.rules.with_raw_response.bulk_create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "action": "log",
+                    "description": "Long description for Token Validation Rule",
+                    "enabled": True,
+                    "expression": 'is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+                    "selector": {},
+                    "title": "Example Token Validation Rule",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(AsyncSinglePage[TokenValidationRule], rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.token_validation.rules.with_streaming_response.bulk_create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "action": "log",
+                    "description": "Long description for Token Validation Rule",
+                    "enabled": True,
+                    "expression": 'is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+                    "selector": {},
+                    "title": "Example Token Validation Rule",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = await response.parse()
+            assert_matches_type(AsyncSinglePage[TokenValidationRule], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.token_validation.rules.with_raw_response.bulk_create(
+                zone_id="",
+                body=[
+                    {
+                        "action": "log",
+                        "description": "Long description for Token Validation Rule",
+                        "enabled": True,
+                        "expression": 'is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+                        "selector": {},
+                        "title": "Example Token Validation Rule",
+                    }
+                ],
+            )
+
+    @parametrize
+    async def test_method_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.token_validation.rules.bulk_edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"id": "0d9bf70c-92e1-4bb3-9411-34a3bcc59003"}],
+        )
+        assert_matches_type(AsyncSinglePage[TokenValidationRule], rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.token_validation.rules.with_raw_response.bulk_edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"id": "0d9bf70c-92e1-4bb3-9411-34a3bcc59003"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(AsyncSinglePage[TokenValidationRule], rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.token_validation.rules.with_streaming_response.bulk_edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[{"id": "0d9bf70c-92e1-4bb3-9411-34a3bcc59003"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = await response.parse()
+            assert_matches_type(AsyncSinglePage[TokenValidationRule], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.token_validation.rules.with_raw_response.bulk_edit(
+                zone_id="",
+                body=[{"id": "0d9bf70c-92e1-4bb3-9411-34a3bcc59003"}],
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.token_validation.rules.edit(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.token_validation.rules.edit(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            action="log",
+            description="Long description for Token Validation Rule",
+            enabled=True,
+            expression='is_jwt_valid("52973293-cb04-4a97-8f55-e7d2ad1107dd") or is_jwt_valid("46eab8d1-6376-45e3-968f-2c649d77d423")',
+            position={"index": 2},
+            selector={
+                "exclude": [
+                    {"operation_ids": ["f9c5615e-fe15-48ce-bec6-cfc1946f1bec", "56828eae-035a-4396-ba07-51c66d680a04"]}
+                ],
+                "include": [{"host": ["v1.example.com", "v2.example.com"]}],
+            },
+            title="Example Token Validation Rule",
+        )
+        assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.token_validation.rules.with_raw_response.edit(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.token_validation.rules.with_streaming_response.edit(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = await response.parse()
+            assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.token_validation.rules.with_raw_response.edit(
+                rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+            await async_client.token_validation.rules.with_raw_response.edit(
+                rule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.token_validation.rules.get(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.token_validation.rules.with_raw_response.get(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.token_validation.rules.with_streaming_response.get(
+            rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = await response.parse()
+            assert_matches_type(TokenValidationRule, rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.token_validation.rules.with_raw_response.get(
+                rule_id="4a7ee8d3-dd63-4ceb-9d5f-c27831854ce7",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+            await async_client.token_validation.rules.with_raw_response.get(
+                rule_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/turnstile/__init__.py b/tests/api_resources/turnstile/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/turnstile/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/challenges/test_widgets.py b/tests/api_resources/turnstile/test_widgets.py
similarity index 84%
rename from tests/api_resources/challenges/test_widgets.py
rename to tests/api_resources/turnstile/test_widgets.py
index 5aee8ea8221..0479d69315f 100644
--- a/tests/api_resources/challenges/test_widgets.py
+++ b/tests/api_resources/turnstile/test_widgets.py
@@ -10,7 +10,7 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
-from cloudflare.types.challenges import (
+from cloudflare.types.turnstile import (
     Widget,
     WidgetListResponse,
 )
@@ -23,7 +23,7 @@ class TestWidgets:
 
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
-        widget = client.challenges.widgets.create(
+        widget = client.turnstile.widgets.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
             mode="invisible",
@@ -33,17 +33,19 @@ def test_method_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
-        widget = client.challenges.widgets.create(
+        widget = client.turnstile.widgets.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
             mode="invisible",
             name="blog.cloudflare.com login form",
             direction="asc",
+            filter="name:my-widget",
             order="id",
             page=1,
             per_page=5,
             bot_fight_mode=False,
             clearance_level="interactive",
+            ephemeral_id=False,
             offlabel=False,
             region="world",
         )
@@ -51,7 +53,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.challenges.widgets.with_raw_response.create(
+        response = client.turnstile.widgets.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
             mode="invisible",
@@ -65,7 +67,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.challenges.widgets.with_streaming_response.create(
+        with client.turnstile.widgets.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
             mode="invisible",
@@ -82,7 +84,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.challenges.widgets.with_raw_response.create(
+            client.turnstile.widgets.with_raw_response.create(
                 account_id="",
                 domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
                 mode="invisible",
@@ -91,7 +93,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
-        widget = client.challenges.widgets.update(
+        widget = client.turnstile.widgets.update(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
@@ -102,7 +104,7 @@ def test_method_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        widget = client.challenges.widgets.update(
+        widget = client.turnstile.widgets.update(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
@@ -110,13 +112,15 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             name="blog.cloudflare.com login form",
             bot_fight_mode=False,
             clearance_level="interactive",
+            ephemeral_id=False,
             offlabel=False,
+            region="world",
         )
         assert_matches_type(Optional[Widget], widget, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.challenges.widgets.with_raw_response.update(
+        response = client.turnstile.widgets.with_raw_response.update(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
@@ -131,7 +135,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.challenges.widgets.with_streaming_response.update(
+        with client.turnstile.widgets.with_streaming_response.update(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
@@ -149,7 +153,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.challenges.widgets.with_raw_response.update(
+            client.turnstile.widgets.with_raw_response.update(
                 sitekey="0x4AAF00AAAABn0R22HWm-YUc",
                 account_id="",
                 domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
@@ -158,7 +162,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `sitekey` but received ''"):
-            client.challenges.widgets.with_raw_response.update(
+            client.turnstile.widgets.with_raw_response.update(
                 sitekey="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
@@ -168,16 +172,17 @@ def test_path_params_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
-        widget = client.challenges.widgets.list(
+        widget = client.turnstile.widgets.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(SyncV4PagePaginationArray[WidgetListResponse], widget, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
-        widget = client.challenges.widgets.list(
+        widget = client.turnstile.widgets.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             direction="asc",
+            filter="name:my-widget",
             order="id",
             page=1,
             per_page=5,
@@ -186,7 +191,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.challenges.widgets.with_raw_response.list(
+        response = client.turnstile.widgets.with_raw_response.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -197,7 +202,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.challenges.widgets.with_streaming_response.list(
+        with client.turnstile.widgets.with_streaming_response.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -211,13 +216,13 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.challenges.widgets.with_raw_response.list(
+            client.turnstile.widgets.with_raw_response.list(
                 account_id="",
             )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
-        widget = client.challenges.widgets.delete(
+        widget = client.turnstile.widgets.delete(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -225,7 +230,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.challenges.widgets.with_raw_response.delete(
+        response = client.turnstile.widgets.with_raw_response.delete(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -237,7 +242,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.challenges.widgets.with_streaming_response.delete(
+        with client.turnstile.widgets.with_streaming_response.delete(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
@@ -252,20 +257,20 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.challenges.widgets.with_raw_response.delete(
+            client.turnstile.widgets.with_raw_response.delete(
                 sitekey="0x4AAF00AAAABn0R22HWm-YUc",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `sitekey` but received ''"):
-            client.challenges.widgets.with_raw_response.delete(
+            client.turnstile.widgets.with_raw_response.delete(
                 sitekey="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        widget = client.challenges.widgets.get(
+        widget = client.turnstile.widgets.get(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -273,7 +278,7 @@ def test_method_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.challenges.widgets.with_raw_response.get(
+        response = client.turnstile.widgets.with_raw_response.get(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -285,7 +290,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.challenges.widgets.with_streaming_response.get(
+        with client.turnstile.widgets.with_streaming_response.get(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
@@ -300,20 +305,20 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.challenges.widgets.with_raw_response.get(
+            client.turnstile.widgets.with_raw_response.get(
                 sitekey="0x4AAF00AAAABn0R22HWm-YUc",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `sitekey` but received ''"):
-            client.challenges.widgets.with_raw_response.get(
+            client.turnstile.widgets.with_raw_response.get(
                 sitekey="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_rotate_secret(self, client: Cloudflare) -> None:
-        widget = client.challenges.widgets.rotate_secret(
+        widget = client.turnstile.widgets.rotate_secret(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -321,7 +326,7 @@ def test_method_rotate_secret(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_method_rotate_secret_with_all_params(self, client: Cloudflare) -> None:
-        widget = client.challenges.widgets.rotate_secret(
+        widget = client.turnstile.widgets.rotate_secret(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             invalidate_immediately=True,
@@ -330,7 +335,7 @@ def test_method_rotate_secret_with_all_params(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_rotate_secret(self, client: Cloudflare) -> None:
-        response = client.challenges.widgets.with_raw_response.rotate_secret(
+        response = client.turnstile.widgets.with_raw_response.rotate_secret(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -342,7 +347,7 @@ def test_raw_response_rotate_secret(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_rotate_secret(self, client: Cloudflare) -> None:
-        with client.challenges.widgets.with_streaming_response.rotate_secret(
+        with client.turnstile.widgets.with_streaming_response.rotate_secret(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
@@ -357,24 +362,26 @@ def test_streaming_response_rotate_secret(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_rotate_secret(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.challenges.widgets.with_raw_response.rotate_secret(
+            client.turnstile.widgets.with_raw_response.rotate_secret(
                 sitekey="0x4AAF00AAAABn0R22HWm-YUc",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `sitekey` but received ''"):
-            client.challenges.widgets.with_raw_response.rotate_secret(
+            client.turnstile.widgets.with_raw_response.rotate_secret(
                 sitekey="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
 
 class TestAsyncWidgets:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        widget = await async_client.challenges.widgets.create(
+        widget = await async_client.turnstile.widgets.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
             mode="invisible",
@@ -384,17 +391,19 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        widget = await async_client.challenges.widgets.create(
+        widget = await async_client.turnstile.widgets.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
             mode="invisible",
             name="blog.cloudflare.com login form",
             direction="asc",
+            filter="name:my-widget",
             order="id",
             page=1,
             per_page=5,
             bot_fight_mode=False,
             clearance_level="interactive",
+            ephemeral_id=False,
             offlabel=False,
             region="world",
         )
@@ -402,7 +411,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.challenges.widgets.with_raw_response.create(
+        response = await async_client.turnstile.widgets.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
             mode="invisible",
@@ -416,7 +425,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.challenges.widgets.with_streaming_response.create(
+        async with async_client.turnstile.widgets.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
             mode="invisible",
@@ -433,7 +442,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.challenges.widgets.with_raw_response.create(
+            await async_client.turnstile.widgets.with_raw_response.create(
                 account_id="",
                 domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
                 mode="invisible",
@@ -442,7 +451,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        widget = await async_client.challenges.widgets.update(
+        widget = await async_client.turnstile.widgets.update(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
@@ -453,7 +462,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        widget = await async_client.challenges.widgets.update(
+        widget = await async_client.turnstile.widgets.update(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
@@ -461,13 +470,15 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             name="blog.cloudflare.com login form",
             bot_fight_mode=False,
             clearance_level="interactive",
+            ephemeral_id=False,
             offlabel=False,
+            region="world",
         )
         assert_matches_type(Optional[Widget], widget, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.challenges.widgets.with_raw_response.update(
+        response = await async_client.turnstile.widgets.with_raw_response.update(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
@@ -482,7 +493,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.challenges.widgets.with_streaming_response.update(
+        async with async_client.turnstile.widgets.with_streaming_response.update(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
@@ -500,7 +511,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.challenges.widgets.with_raw_response.update(
+            await async_client.turnstile.widgets.with_raw_response.update(
                 sitekey="0x4AAF00AAAABn0R22HWm-YUc",
                 account_id="",
                 domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
@@ -509,7 +520,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `sitekey` but received ''"):
-            await async_client.challenges.widgets.with_raw_response.update(
+            await async_client.turnstile.widgets.with_raw_response.update(
                 sitekey="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 domains=["203.0.113.1", "cloudflare.com", "blog.example.com"],
@@ -519,16 +530,17 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        widget = await async_client.challenges.widgets.list(
+        widget = await async_client.turnstile.widgets.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(AsyncV4PagePaginationArray[WidgetListResponse], widget, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        widget = await async_client.challenges.widgets.list(
+        widget = await async_client.turnstile.widgets.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             direction="asc",
+            filter="name:my-widget",
             order="id",
             page=1,
             per_page=5,
@@ -537,7 +549,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.challenges.widgets.with_raw_response.list(
+        response = await async_client.turnstile.widgets.with_raw_response.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -548,7 +560,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.challenges.widgets.with_streaming_response.list(
+        async with async_client.turnstile.widgets.with_streaming_response.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -562,13 +574,13 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.challenges.widgets.with_raw_response.list(
+            await async_client.turnstile.widgets.with_raw_response.list(
                 account_id="",
             )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        widget = await async_client.challenges.widgets.delete(
+        widget = await async_client.turnstile.widgets.delete(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -576,7 +588,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.challenges.widgets.with_raw_response.delete(
+        response = await async_client.turnstile.widgets.with_raw_response.delete(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -588,7 +600,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.challenges.widgets.with_streaming_response.delete(
+        async with async_client.turnstile.widgets.with_streaming_response.delete(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
@@ -603,20 +615,20 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.challenges.widgets.with_raw_response.delete(
+            await async_client.turnstile.widgets.with_raw_response.delete(
                 sitekey="0x4AAF00AAAABn0R22HWm-YUc",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `sitekey` but received ''"):
-            await async_client.challenges.widgets.with_raw_response.delete(
+            await async_client.turnstile.widgets.with_raw_response.delete(
                 sitekey="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        widget = await async_client.challenges.widgets.get(
+        widget = await async_client.turnstile.widgets.get(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -624,7 +636,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.challenges.widgets.with_raw_response.get(
+        response = await async_client.turnstile.widgets.with_raw_response.get(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -636,7 +648,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.challenges.widgets.with_streaming_response.get(
+        async with async_client.turnstile.widgets.with_streaming_response.get(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
@@ -651,20 +663,20 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.challenges.widgets.with_raw_response.get(
+            await async_client.turnstile.widgets.with_raw_response.get(
                 sitekey="0x4AAF00AAAABn0R22HWm-YUc",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `sitekey` but received ''"):
-            await async_client.challenges.widgets.with_raw_response.get(
+            await async_client.turnstile.widgets.with_raw_response.get(
                 sitekey="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_rotate_secret(self, async_client: AsyncCloudflare) -> None:
-        widget = await async_client.challenges.widgets.rotate_secret(
+        widget = await async_client.turnstile.widgets.rotate_secret(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -672,7 +684,7 @@ async def test_method_rotate_secret(self, async_client: AsyncCloudflare) -> None
 
     @parametrize
     async def test_method_rotate_secret_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        widget = await async_client.challenges.widgets.rotate_secret(
+        widget = await async_client.turnstile.widgets.rotate_secret(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             invalidate_immediately=True,
@@ -681,7 +693,7 @@ async def test_method_rotate_secret_with_all_params(self, async_client: AsyncClo
 
     @parametrize
     async def test_raw_response_rotate_secret(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.challenges.widgets.with_raw_response.rotate_secret(
+        response = await async_client.turnstile.widgets.with_raw_response.rotate_secret(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
@@ -693,7 +705,7 @@ async def test_raw_response_rotate_secret(self, async_client: AsyncCloudflare) -
 
     @parametrize
     async def test_streaming_response_rotate_secret(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.challenges.widgets.with_streaming_response.rotate_secret(
+        async with async_client.turnstile.widgets.with_streaming_response.rotate_secret(
             sitekey="0x4AAF00AAAABn0R22HWm-YUc",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
@@ -708,13 +720,13 @@ async def test_streaming_response_rotate_secret(self, async_client: AsyncCloudfl
     @parametrize
     async def test_path_params_rotate_secret(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.challenges.widgets.with_raw_response.rotate_secret(
+            await async_client.turnstile.widgets.with_raw_response.rotate_secret(
                 sitekey="0x4AAF00AAAABn0R22HWm-YUc",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `sitekey` but received ''"):
-            await async_client.challenges.widgets.with_raw_response.rotate_secret(
+            await async_client.turnstile.widgets.with_raw_response.rotate_secret(
                 sitekey="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/url_scanner/test_responses.py b/tests/api_resources/url_scanner/test_responses.py
new file mode 100644
index 00000000000..f059cb256eb
--- /dev/null
+++ b/tests/api_resources/url_scanner/test_responses.py
@@ -0,0 +1,119 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestResponses:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        response = client.url_scanner.responses.get(
+            response_id="response_id",
+            account_id="account_id",
+        )
+        assert_matches_type(str, response, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        http_response = client.url_scanner.responses.with_raw_response.get(
+            response_id="response_id",
+            account_id="account_id",
+        )
+
+        assert http_response.is_closed is True
+        assert http_response.http_request.headers.get("X-Stainless-Lang") == "python"
+        response = http_response.parse()
+        assert_matches_type(str, response, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.url_scanner.responses.with_streaming_response.get(
+            response_id="response_id",
+            account_id="account_id",
+        ) as http_response:
+            assert not http_response.is_closed
+            assert http_response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            response = http_response.parse()
+            assert_matches_type(str, response, path=["response"])
+
+        assert cast(Any, http_response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.url_scanner.responses.with_raw_response.get(
+                response_id="response_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `response_id` but received ''"):
+            client.url_scanner.responses.with_raw_response.get(
+                response_id="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncResponses:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.url_scanner.responses.get(
+            response_id="response_id",
+            account_id="account_id",
+        )
+        assert_matches_type(str, response, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        http_response = await async_client.url_scanner.responses.with_raw_response.get(
+            response_id="response_id",
+            account_id="account_id",
+        )
+
+        assert http_response.is_closed is True
+        assert http_response.http_request.headers.get("X-Stainless-Lang") == "python"
+        response = await http_response.parse()
+        assert_matches_type(str, response, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.url_scanner.responses.with_streaming_response.get(
+            response_id="response_id",
+            account_id="account_id",
+        ) as http_response:
+            assert not http_response.is_closed
+            assert http_response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            response = await http_response.parse()
+            assert_matches_type(str, response, path=["response"])
+
+        assert cast(Any, http_response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.url_scanner.responses.with_raw_response.get(
+                response_id="response_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `response_id` but received ''"):
+            await async_client.url_scanner.responses.with_raw_response.get(
+                response_id="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/url_scanner/test_scans.py b/tests/api_resources/url_scanner/test_scans.py
index 371efa725c5..bcb27351ece 100644
--- a/tests/api_resources/url_scanner/test_scans.py
+++ b/tests/api_resources/url_scanner/test_scans.py
@@ -19,8 +19,10 @@
 )
 from cloudflare.types.url_scanner import (
     ScanGetResponse,
-    ScanHarResponse,
+    ScanHARResponse,
+    ScanListResponse,
     ScanCreateResponse,
+    ScanBulkCreateResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -32,7 +34,7 @@ class TestScans:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         scan = client.url_scanner.scans.create(
-            account_id="accountId",
+            account_id="account_id",
             url="https://www.example.com",
         )
         assert_matches_type(ScanCreateResponse, scan, path=["response"])
@@ -40,10 +42,13 @@ def test_method_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         scan = client.url_scanner.scans.create(
-            account_id="accountId",
+            account_id="account_id",
             url="https://www.example.com",
+            country="AF",
+            customagent="customagent",
             custom_headers={"foo": "string"},
-            screenshots_resolutions=["desktop", "mobile", "tablet"],
+            referer="referer",
+            screenshots_resolutions=["desktop"],
             visibility="Public",
         )
         assert_matches_type(ScanCreateResponse, scan, path=["response"])
@@ -51,7 +56,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.url_scanner.scans.with_raw_response.create(
-            account_id="accountId",
+            account_id="account_id",
             url="https://www.example.com",
         )
 
@@ -63,7 +68,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.url_scanner.scans.with_streaming_response.create(
-            account_id="accountId",
+            account_id="account_id",
             url="https://www.example.com",
         ) as response:
             assert not response.is_closed
@@ -83,27 +88,170 @@ def test_path_params_create(self, client: Cloudflare) -> None:
             )
 
     @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        scan = client.url_scanner.scans.get(
+    def test_method_list(self, client: Cloudflare) -> None:
+        scan = client.url_scanner.scans.list(
+            account_id="account_id",
+        )
+        assert_matches_type(ScanListResponse, scan, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        scan = client.url_scanner.scans.list(
+            account_id="account_id",
+            q="q",
+            size=100,
+        )
+        assert_matches_type(ScanListResponse, scan, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.url_scanner.scans.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        scan = response.parse()
+        assert_matches_type(ScanListResponse, scan, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.url_scanner.scans.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            scan = response.parse()
+            assert_matches_type(ScanListResponse, scan, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.url_scanner.scans.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_bulk_create(self, client: Cloudflare) -> None:
+        scan = client.url_scanner.scans.bulk_create(
+            account_id="account_id",
+        )
+        assert_matches_type(ScanBulkCreateResponse, scan, path=["response"])
+
+    @parametrize
+    def test_method_bulk_create_with_all_params(self, client: Cloudflare) -> None:
+        scan = client.url_scanner.scans.bulk_create(
+            account_id="account_id",
+            body=[
+                {
+                    "url": "https://www.example.com",
+                    "customagent": "customagent",
+                    "custom_headers": {"foo": "string"},
+                    "referer": "referer",
+                    "screenshots_resolutions": ["desktop"],
+                    "visibility": "Public",
+                }
+            ],
+        )
+        assert_matches_type(ScanBulkCreateResponse, scan, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_create(self, client: Cloudflare) -> None:
+        response = client.url_scanner.scans.with_raw_response.bulk_create(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        scan = response.parse()
+        assert_matches_type(ScanBulkCreateResponse, scan, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_create(self, client: Cloudflare) -> None:
+        with client.url_scanner.scans.with_streaming_response.bulk_create(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            scan = response.parse()
+            assert_matches_type(ScanBulkCreateResponse, scan, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.url_scanner.scans.with_raw_response.bulk_create(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_dom(self, client: Cloudflare) -> None:
+        scan = client.url_scanner.scans.dom(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
         )
-        assert_matches_type(ScanGetResponse, scan, path=["response"])
+        assert_matches_type(str, scan, path=["response"])
+
+    @parametrize
+    def test_raw_response_dom(self, client: Cloudflare) -> None:
+        response = client.url_scanner.scans.with_raw_response.dom(
+            scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        scan = response.parse()
+        assert_matches_type(str, scan, path=["response"])
 
     @parametrize
-    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+    def test_streaming_response_dom(self, client: Cloudflare) -> None:
+        with client.url_scanner.scans.with_streaming_response.dom(
+            scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            scan = response.parse()
+            assert_matches_type(str, scan, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_dom(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.url_scanner.scans.with_raw_response.dom(
+                scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `scan_id` but received ''"):
+            client.url_scanner.scans.with_raw_response.dom(
+                scan_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
         scan = client.url_scanner.scans.get(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
-            full=True,
+            account_id="account_id",
         )
         assert_matches_type(ScanGetResponse, scan, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.url_scanner.scans.with_raw_response.get(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
@@ -111,11 +259,12 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         scan = response.parse()
         assert_matches_type(ScanGetResponse, scan, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.url_scanner.scans.with_streaming_response.get(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -125,6 +274,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -136,40 +286,40 @@ def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `scan_id` but received ''"):
             client.url_scanner.scans.with_raw_response.get(
                 scan_id="",
-                account_id="accountId",
+                account_id="account_id",
             )
 
     @parametrize
     def test_method_har(self, client: Cloudflare) -> None:
         scan = client.url_scanner.scans.har(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
         )
-        assert_matches_type(ScanHarResponse, scan, path=["response"])
+        assert_matches_type(ScanHARResponse, scan, path=["response"])
 
     @parametrize
     def test_raw_response_har(self, client: Cloudflare) -> None:
         response = client.url_scanner.scans.with_raw_response.har(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         scan = response.parse()
-        assert_matches_type(ScanHarResponse, scan, path=["response"])
+        assert_matches_type(ScanHARResponse, scan, path=["response"])
 
     @parametrize
     def test_streaming_response_har(self, client: Cloudflare) -> None:
         with client.url_scanner.scans.with_streaming_response.har(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             scan = response.parse()
-            assert_matches_type(ScanHarResponse, scan, path=["response"])
+            assert_matches_type(ScanHARResponse, scan, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -184,18 +334,18 @@ def test_path_params_har(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `scan_id` but received ''"):
             client.url_scanner.scans.with_raw_response.har(
                 scan_id="",
-                account_id="accountId",
+                account_id="account_id",
             )
 
     @parametrize
     @pytest.mark.respx(base_url=base_url)
     def test_method_screenshot(self, client: Cloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/accounts/accountId/urlscanner/scan/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e/screenshot").mock(
+        respx_mock.get("/accounts/account_id/urlscanner/v2/screenshots/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e.png").mock(
             return_value=httpx.Response(200, json={"foo": "bar"})
         )
         scan = client.url_scanner.scans.screenshot(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
         )
         assert scan.is_closed
         assert scan.json() == {"foo": "bar"}
@@ -205,12 +355,12 @@ def test_method_screenshot(self, client: Cloudflare, respx_mock: MockRouter) ->
     @parametrize
     @pytest.mark.respx(base_url=base_url)
     def test_method_screenshot_with_all_params(self, client: Cloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/accounts/accountId/urlscanner/scan/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e/screenshot").mock(
+        respx_mock.get("/accounts/account_id/urlscanner/v2/screenshots/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e.png").mock(
             return_value=httpx.Response(200, json={"foo": "bar"})
         )
         scan = client.url_scanner.scans.screenshot(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
             resolution="desktop",
         )
         assert scan.is_closed
@@ -221,13 +371,13 @@ def test_method_screenshot_with_all_params(self, client: Cloudflare, respx_mock:
     @parametrize
     @pytest.mark.respx(base_url=base_url)
     def test_raw_response_screenshot(self, client: Cloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/accounts/accountId/urlscanner/scan/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e/screenshot").mock(
+        respx_mock.get("/accounts/account_id/urlscanner/v2/screenshots/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e.png").mock(
             return_value=httpx.Response(200, json={"foo": "bar"})
         )
 
         scan = client.url_scanner.scans.with_raw_response.screenshot(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
         )
 
         assert scan.is_closed is True
@@ -238,12 +388,12 @@ def test_raw_response_screenshot(self, client: Cloudflare, respx_mock: MockRoute
     @parametrize
     @pytest.mark.respx(base_url=base_url)
     def test_streaming_response_screenshot(self, client: Cloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/accounts/accountId/urlscanner/scan/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e/screenshot").mock(
+        respx_mock.get("/accounts/account_id/urlscanner/v2/screenshots/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e.png").mock(
             return_value=httpx.Response(200, json={"foo": "bar"})
         )
         with client.url_scanner.scans.with_streaming_response.screenshot(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
         ) as scan:
             assert not scan.is_closed
             assert scan.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -266,17 +416,19 @@ def test_path_params_screenshot(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `scan_id` but received ''"):
             client.url_scanner.scans.with_raw_response.screenshot(
                 scan_id="",
-                account_id="accountId",
+                account_id="account_id",
             )
 
 
 class TestAsyncScans:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         scan = await async_client.url_scanner.scans.create(
-            account_id="accountId",
+            account_id="account_id",
             url="https://www.example.com",
         )
         assert_matches_type(ScanCreateResponse, scan, path=["response"])
@@ -284,10 +436,13 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         scan = await async_client.url_scanner.scans.create(
-            account_id="accountId",
+            account_id="account_id",
             url="https://www.example.com",
+            country="AF",
+            customagent="customagent",
             custom_headers={"foo": "string"},
-            screenshots_resolutions=["desktop", "mobile", "tablet"],
+            referer="referer",
+            screenshots_resolutions=["desktop"],
             visibility="Public",
         )
         assert_matches_type(ScanCreateResponse, scan, path=["response"])
@@ -295,7 +450,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.url_scanner.scans.with_raw_response.create(
-            account_id="accountId",
+            account_id="account_id",
             url="https://www.example.com",
         )
 
@@ -307,7 +462,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.url_scanner.scans.with_streaming_response.create(
-            account_id="accountId",
+            account_id="account_id",
             url="https://www.example.com",
         ) as response:
             assert not response.is_closed
@@ -327,27 +482,170 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
             )
 
     @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        scan = await async_client.url_scanner.scans.get(
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        scan = await async_client.url_scanner.scans.list(
+            account_id="account_id",
+        )
+        assert_matches_type(ScanListResponse, scan, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        scan = await async_client.url_scanner.scans.list(
+            account_id="account_id",
+            q="q",
+            size=100,
+        )
+        assert_matches_type(ScanListResponse, scan, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.url_scanner.scans.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        scan = await response.parse()
+        assert_matches_type(ScanListResponse, scan, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.url_scanner.scans.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            scan = await response.parse()
+            assert_matches_type(ScanListResponse, scan, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.url_scanner.scans.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        scan = await async_client.url_scanner.scans.bulk_create(
+            account_id="account_id",
+        )
+        assert_matches_type(ScanBulkCreateResponse, scan, path=["response"])
+
+    @parametrize
+    async def test_method_bulk_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        scan = await async_client.url_scanner.scans.bulk_create(
+            account_id="account_id",
+            body=[
+                {
+                    "url": "https://www.example.com",
+                    "customagent": "customagent",
+                    "custom_headers": {"foo": "string"},
+                    "referer": "referer",
+                    "screenshots_resolutions": ["desktop"],
+                    "visibility": "Public",
+                }
+            ],
+        )
+        assert_matches_type(ScanBulkCreateResponse, scan, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.url_scanner.scans.with_raw_response.bulk_create(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        scan = await response.parse()
+        assert_matches_type(ScanBulkCreateResponse, scan, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.url_scanner.scans.with_streaming_response.bulk_create(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            scan = await response.parse()
+            assert_matches_type(ScanBulkCreateResponse, scan, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.url_scanner.scans.with_raw_response.bulk_create(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_dom(self, async_client: AsyncCloudflare) -> None:
+        scan = await async_client.url_scanner.scans.dom(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
         )
-        assert_matches_type(ScanGetResponse, scan, path=["response"])
+        assert_matches_type(str, scan, path=["response"])
+
+    @parametrize
+    async def test_raw_response_dom(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.url_scanner.scans.with_raw_response.dom(
+            scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        scan = await response.parse()
+        assert_matches_type(str, scan, path=["response"])
 
     @parametrize
-    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_dom(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.url_scanner.scans.with_streaming_response.dom(
+            scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            scan = await response.parse()
+            assert_matches_type(str, scan, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_dom(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.url_scanner.scans.with_raw_response.dom(
+                scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `scan_id` but received ''"):
+            await async_client.url_scanner.scans.with_raw_response.dom(
+                scan_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         scan = await async_client.url_scanner.scans.get(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
-            full=True,
+            account_id="account_id",
         )
         assert_matches_type(ScanGetResponse, scan, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.url_scanner.scans.with_raw_response.get(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
@@ -355,11 +653,12 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         scan = await response.parse()
         assert_matches_type(ScanGetResponse, scan, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.url_scanner.scans.with_streaming_response.get(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -369,6 +668,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
@@ -380,40 +680,40 @@ async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `scan_id` but received ''"):
             await async_client.url_scanner.scans.with_raw_response.get(
                 scan_id="",
-                account_id="accountId",
+                account_id="account_id",
             )
 
     @parametrize
     async def test_method_har(self, async_client: AsyncCloudflare) -> None:
         scan = await async_client.url_scanner.scans.har(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
         )
-        assert_matches_type(ScanHarResponse, scan, path=["response"])
+        assert_matches_type(ScanHARResponse, scan, path=["response"])
 
     @parametrize
     async def test_raw_response_har(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.url_scanner.scans.with_raw_response.har(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         scan = await response.parse()
-        assert_matches_type(ScanHarResponse, scan, path=["response"])
+        assert_matches_type(ScanHARResponse, scan, path=["response"])
 
     @parametrize
     async def test_streaming_response_har(self, async_client: AsyncCloudflare) -> None:
         async with async_client.url_scanner.scans.with_streaming_response.har(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             scan = await response.parse()
-            assert_matches_type(ScanHarResponse, scan, path=["response"])
+            assert_matches_type(ScanHARResponse, scan, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -428,18 +728,18 @@ async def test_path_params_har(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `scan_id` but received ''"):
             await async_client.url_scanner.scans.with_raw_response.har(
                 scan_id="",
-                account_id="accountId",
+                account_id="account_id",
             )
 
     @parametrize
     @pytest.mark.respx(base_url=base_url)
     async def test_method_screenshot(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/accounts/accountId/urlscanner/scan/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e/screenshot").mock(
+        respx_mock.get("/accounts/account_id/urlscanner/v2/screenshots/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e.png").mock(
             return_value=httpx.Response(200, json={"foo": "bar"})
         )
         scan = await async_client.url_scanner.scans.screenshot(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
         )
         assert scan.is_closed
         assert await scan.json() == {"foo": "bar"}
@@ -451,12 +751,12 @@ async def test_method_screenshot(self, async_client: AsyncCloudflare, respx_mock
     async def test_method_screenshot_with_all_params(
         self, async_client: AsyncCloudflare, respx_mock: MockRouter
     ) -> None:
-        respx_mock.get("/accounts/accountId/urlscanner/scan/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e/screenshot").mock(
+        respx_mock.get("/accounts/account_id/urlscanner/v2/screenshots/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e.png").mock(
             return_value=httpx.Response(200, json={"foo": "bar"})
         )
         scan = await async_client.url_scanner.scans.screenshot(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
             resolution="desktop",
         )
         assert scan.is_closed
@@ -467,13 +767,13 @@ async def test_method_screenshot_with_all_params(
     @parametrize
     @pytest.mark.respx(base_url=base_url)
     async def test_raw_response_screenshot(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/accounts/accountId/urlscanner/scan/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e/screenshot").mock(
+        respx_mock.get("/accounts/account_id/urlscanner/v2/screenshots/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e.png").mock(
             return_value=httpx.Response(200, json={"foo": "bar"})
         )
 
         scan = await async_client.url_scanner.scans.with_raw_response.screenshot(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
         )
 
         assert scan.is_closed is True
@@ -484,12 +784,12 @@ async def test_raw_response_screenshot(self, async_client: AsyncCloudflare, resp
     @parametrize
     @pytest.mark.respx(base_url=base_url)
     async def test_streaming_response_screenshot(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/accounts/accountId/urlscanner/scan/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e/screenshot").mock(
+        respx_mock.get("/accounts/account_id/urlscanner/v2/screenshots/182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e.png").mock(
             return_value=httpx.Response(200, json={"foo": "bar"})
         )
         async with async_client.url_scanner.scans.with_streaming_response.screenshot(
             scan_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            account_id="accountId",
+            account_id="account_id",
         ) as scan:
             assert not scan.is_closed
             assert scan.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -512,5 +812,5 @@ async def test_path_params_screenshot(self, async_client: AsyncCloudflare) -> No
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `scan_id` but received ''"):
             await async_client.url_scanner.scans.with_raw_response.screenshot(
                 scan_id="",
-                account_id="accountId",
+                account_id="account_id",
             )
diff --git a/tests/api_resources/user/billing/test_history.py b/tests/api_resources/user/billing/test_history.py
index 97cbf8ea7e2..b5a06e26a57 100644
--- a/tests/api_resources/user/billing/test_history.py
+++ b/tests/api_resources/user/billing/test_history.py
@@ -13,6 +13,8 @@
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.user.billing import BillingHistory
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -21,25 +23,29 @@ class TestHistory:
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
-        history = client.user.billing.history.list()
+        with pytest.warns(DeprecationWarning):
+            history = client.user.billing.history.list()
+
         assert_matches_type(SyncV4PagePaginationArray[BillingHistory], history, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
-        history = client.user.billing.history.list(
-            action="subscription",
-            occured_at=parse_datetime("2014-03-01T12:21:59.3456Z"),
-            occurred_at=parse_datetime("2014-03-01T12:21:59.3456Z"),
-            order="occured_at",
-            page=1,
-            per_page=5,
-            type="charge",
-        )
+        with pytest.warns(DeprecationWarning):
+            history = client.user.billing.history.list(
+                action="subscription",
+                occurred_at=parse_datetime("2014-03-01T12:21:59.3456Z"),
+                order="occurred_at",
+                page=1,
+                per_page=5,
+                type="charge",
+            )
+
         assert_matches_type(SyncV4PagePaginationArray[BillingHistory], history, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.user.billing.history.with_raw_response.list()
+        with pytest.warns(DeprecationWarning):
+            response = client.user.billing.history.with_raw_response.list()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -48,40 +54,47 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.user.billing.history.with_streaming_response.list() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.user.billing.history.with_streaming_response.list() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            history = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[BillingHistory], history, path=["response"])
+                history = response.parse()
+                assert_matches_type(SyncV4PagePaginationArray[BillingHistory], history, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncHistory:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        history = await async_client.user.billing.history.list()
+        with pytest.warns(DeprecationWarning):
+            history = await async_client.user.billing.history.list()
+
         assert_matches_type(AsyncV4PagePaginationArray[BillingHistory], history, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        history = await async_client.user.billing.history.list(
-            action="subscription",
-            occured_at=parse_datetime("2014-03-01T12:21:59.3456Z"),
-            occurred_at=parse_datetime("2014-03-01T12:21:59.3456Z"),
-            order="occured_at",
-            page=1,
-            per_page=5,
-            type="charge",
-        )
+        with pytest.warns(DeprecationWarning):
+            history = await async_client.user.billing.history.list(
+                action="subscription",
+                occurred_at=parse_datetime("2014-03-01T12:21:59.3456Z"),
+                order="occurred_at",
+                page=1,
+                per_page=5,
+                type="charge",
+            )
+
         assert_matches_type(AsyncV4PagePaginationArray[BillingHistory], history, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.user.billing.history.with_raw_response.list()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.user.billing.history.with_raw_response.list()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -90,11 +103,12 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.user.billing.history.with_streaming_response.list() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.user.billing.history.with_streaming_response.list() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            history = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[BillingHistory], history, path=["response"])
+                history = await response.parse()
+                assert_matches_type(AsyncV4PagePaginationArray[BillingHistory], history, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/user/billing/test_profile.py b/tests/api_resources/user/billing/test_profile.py
index 1436c46dd18..4a974aed1f0 100644
--- a/tests/api_resources/user/billing/test_profile.py
+++ b/tests/api_resources/user/billing/test_profile.py
@@ -11,6 +11,8 @@
 from tests.utils import assert_matches_type
 from cloudflare.types.user.billing import ProfileGetResponse
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -19,12 +21,15 @@ class TestProfile:
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        profile = client.user.billing.profile.get()
+        with pytest.warns(DeprecationWarning):
+            profile = client.user.billing.profile.get()
+
         assert_matches_type(ProfileGetResponse, profile, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.user.billing.profile.with_raw_response.get()
+        with pytest.warns(DeprecationWarning):
+            response = client.user.billing.profile.with_raw_response.get()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -33,27 +38,33 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.user.billing.profile.with_streaming_response.get() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.user.billing.profile.with_streaming_response.get() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            profile = response.parse()
-            assert_matches_type(ProfileGetResponse, profile, path=["response"])
+                profile = response.parse()
+                assert_matches_type(ProfileGetResponse, profile, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncProfile:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        profile = await async_client.user.billing.profile.get()
+        with pytest.warns(DeprecationWarning):
+            profile = await async_client.user.billing.profile.get()
+
         assert_matches_type(ProfileGetResponse, profile, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.user.billing.profile.with_raw_response.get()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.user.billing.profile.with_raw_response.get()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -62,11 +73,12 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.user.billing.profile.with_streaming_response.get() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.user.billing.profile.with_streaming_response.get() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            profile = await response.parse()
-            assert_matches_type(ProfileGetResponse, profile, path=["response"])
+                profile = await response.parse()
+                assert_matches_type(ProfileGetResponse, profile, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/user/test_audit_logs.py b/tests/api_resources/user/test_audit_logs.py
index 0caf6dab72c..f678b7539a2 100644
--- a/tests/api_resources/user/test_audit_logs.py
+++ b/tests/api_resources/user/test_audit_logs.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare._utils import parse_datetime
+from cloudflare._utils import parse_date
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.shared import AuditLog
 
@@ -30,16 +30,16 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
             id="f174be97-19b1-40d6-954d-70cd5fbd52db",
             action={"type": "add"},
             actor={
-                "ip": "17.168.228.63",
                 "email": "alice@example.com",
+                "ip": "17.168.228.63",
             },
-            before=parse_datetime("2019-04-30T01:12:20Z"),
+            before=parse_date("2019-04-30"),
             direction="desc",
             export=True,
             hide_user_logs=True,
             page=50,
             per_page=25,
-            since=parse_datetime("2019-04-30T01:12:20Z"),
+            since=parse_date("2019-04-30"),
             zone={"name": "example.com"},
         )
         assert_matches_type(SyncV4PagePaginationArray[AuditLog], audit_log, path=["response"])
@@ -66,7 +66,9 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncAuditLogs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
@@ -79,16 +81,16 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
             id="f174be97-19b1-40d6-954d-70cd5fbd52db",
             action={"type": "add"},
             actor={
-                "ip": "17.168.228.63",
                 "email": "alice@example.com",
+                "ip": "17.168.228.63",
             },
-            before=parse_datetime("2019-04-30T01:12:20Z"),
+            before=parse_date("2019-04-30"),
             direction="desc",
             export=True,
             hide_user_logs=True,
             page=50,
             per_page=25,
-            since=parse_datetime("2019-04-30T01:12:20Z"),
+            since=parse_date("2019-04-30"),
             zone={"name": "example.com"},
         )
         assert_matches_type(AsyncV4PagePaginationArray[AuditLog], audit_log, path=["response"])
diff --git a/tests/api_resources/user/test_invites.py b/tests/api_resources/user/test_invites.py
index 9e47db517e9..e2c1217a92d 100644
--- a/tests/api_resources/user/test_invites.py
+++ b/tests/api_resources/user/test_invites.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
@@ -49,7 +49,7 @@ def test_method_edit(self, client: Cloudflare) -> None:
             invite_id="4f5f0c14a2a41d5063dd301b2f829f04",
             status="accepted",
         )
-        assert_matches_type(object, invite, path=["response"])
+        assert_matches_type(Optional[Invite], invite, path=["response"])
 
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
@@ -61,7 +61,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         invite = response.parse()
-        assert_matches_type(object, invite, path=["response"])
+        assert_matches_type(Optional[Invite], invite, path=["response"])
 
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
@@ -73,7 +73,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             invite = response.parse()
-            assert_matches_type(object, invite, path=["response"])
+            assert_matches_type(Optional[Invite], invite, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -90,7 +90,7 @@ def test_method_get(self, client: Cloudflare) -> None:
         invite = client.user.invites.get(
             "4f5f0c14a2a41d5063dd301b2f829f04",
         )
-        assert_matches_type(object, invite, path=["response"])
+        assert_matches_type(Optional[Invite], invite, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -101,7 +101,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         invite = response.parse()
-        assert_matches_type(object, invite, path=["response"])
+        assert_matches_type(Optional[Invite], invite, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -112,7 +112,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             invite = response.parse()
-            assert_matches_type(object, invite, path=["response"])
+            assert_matches_type(Optional[Invite], invite, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -125,7 +125,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncInvites:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
@@ -158,7 +160,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
             invite_id="4f5f0c14a2a41d5063dd301b2f829f04",
             status="accepted",
         )
-        assert_matches_type(object, invite, path=["response"])
+        assert_matches_type(Optional[Invite], invite, path=["response"])
 
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -170,7 +172,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         invite = await response.parse()
-        assert_matches_type(object, invite, path=["response"])
+        assert_matches_type(Optional[Invite], invite, path=["response"])
 
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -182,7 +184,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             invite = await response.parse()
-            assert_matches_type(object, invite, path=["response"])
+            assert_matches_type(Optional[Invite], invite, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -199,7 +201,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         invite = await async_client.user.invites.get(
             "4f5f0c14a2a41d5063dd301b2f829f04",
         )
-        assert_matches_type(object, invite, path=["response"])
+        assert_matches_type(Optional[Invite], invite, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -210,7 +212,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         invite = await response.parse()
-        assert_matches_type(object, invite, path=["response"])
+        assert_matches_type(Optional[Invite], invite, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -221,7 +223,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             invite = await response.parse()
-            assert_matches_type(object, invite, path=["response"])
+            assert_matches_type(Optional[Invite], invite, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/user/test_organizations.py b/tests/api_resources/user/test_organizations.py
index c129ec550be..da23d43f15d 100644
--- a/tests/api_resources/user/test_organizations.py
+++ b/tests/api_resources/user/test_organizations.py
@@ -12,6 +12,8 @@
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.user import Organization, OrganizationDeleteResponse
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -20,25 +22,30 @@ class TestOrganizations:
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
-        organization = client.user.organizations.list()
+        with pytest.warns(DeprecationWarning):
+            organization = client.user.organizations.list()
+
         assert_matches_type(SyncV4PagePaginationArray[Organization], organization, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
-        organization = client.user.organizations.list(
-            direction="desc",
-            match="any",
-            name="Cloudflare, Inc.",
-            order="status",
-            page=1,
-            per_page=5,
-            status="member",
-        )
+        with pytest.warns(DeprecationWarning):
+            organization = client.user.organizations.list(
+                direction="desc",
+                match="any",
+                name="Cloudflare, Inc.",
+                order="status",
+                page=1,
+                per_page=5,
+                status="member",
+            )
+
         assert_matches_type(SyncV4PagePaginationArray[Organization], organization, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.user.organizations.with_raw_response.list()
+        with pytest.warns(DeprecationWarning):
+            response = client.user.organizations.with_raw_response.list()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -47,27 +54,31 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.user.organizations.with_streaming_response.list() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.user.organizations.with_streaming_response.list() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            organization = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[Organization], organization, path=["response"])
+                organization = response.parse()
+                assert_matches_type(SyncV4PagePaginationArray[Organization], organization, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
-        organization = client.user.organizations.delete(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            organization = client.user.organizations.delete(
+                "023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(OrganizationDeleteResponse, organization, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.user.organizations.with_raw_response.delete(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.user.organizations.with_raw_response.delete(
+                "023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -76,36 +87,41 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.user.organizations.with_streaming_response.delete(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.user.organizations.with_streaming_response.delete(
+                "023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            organization = response.parse()
-            assert_matches_type(OrganizationDeleteResponse, organization, path=["response"])
+                organization = response.parse()
+                assert_matches_type(OrganizationDeleteResponse, organization, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `organization_id` but received ''"):
-            client.user.organizations.with_raw_response.delete(
-                "",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `organization_id` but received ''"):
+                client.user.organizations.with_raw_response.delete(
+                    "",
+                )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        organization = client.user.organizations.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            organization = client.user.organizations.get(
+                "023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(object, organization, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.user.organizations.with_raw_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.user.organizations.with_raw_response.get(
+                "023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -114,49 +130,58 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.user.organizations.with_streaming_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.user.organizations.with_streaming_response.get(
+                "023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            organization = response.parse()
-            assert_matches_type(object, organization, path=["response"])
+                organization = response.parse()
+                assert_matches_type(object, organization, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `organization_id` but received ''"):
-            client.user.organizations.with_raw_response.get(
-                "",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `organization_id` but received ''"):
+                client.user.organizations.with_raw_response.get(
+                    "",
+                )
 
 
 class TestAsyncOrganizations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        organization = await async_client.user.organizations.list()
+        with pytest.warns(DeprecationWarning):
+            organization = await async_client.user.organizations.list()
+
         assert_matches_type(AsyncV4PagePaginationArray[Organization], organization, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        organization = await async_client.user.organizations.list(
-            direction="desc",
-            match="any",
-            name="Cloudflare, Inc.",
-            order="status",
-            page=1,
-            per_page=5,
-            status="member",
-        )
+        with pytest.warns(DeprecationWarning):
+            organization = await async_client.user.organizations.list(
+                direction="desc",
+                match="any",
+                name="Cloudflare, Inc.",
+                order="status",
+                page=1,
+                per_page=5,
+                status="member",
+            )
+
         assert_matches_type(AsyncV4PagePaginationArray[Organization], organization, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.user.organizations.with_raw_response.list()
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.user.organizations.with_raw_response.list()
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -165,27 +190,31 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.user.organizations.with_streaming_response.list() as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.user.organizations.with_streaming_response.list() as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            organization = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[Organization], organization, path=["response"])
+                organization = await response.parse()
+                assert_matches_type(AsyncV4PagePaginationArray[Organization], organization, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        organization = await async_client.user.organizations.delete(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            organization = await async_client.user.organizations.delete(
+                "023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(OrganizationDeleteResponse, organization, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.user.organizations.with_raw_response.delete(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.user.organizations.with_raw_response.delete(
+                "023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -194,36 +223,41 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.user.organizations.with_streaming_response.delete(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.user.organizations.with_streaming_response.delete(
+                "023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            organization = await response.parse()
-            assert_matches_type(OrganizationDeleteResponse, organization, path=["response"])
+                organization = await response.parse()
+                assert_matches_type(OrganizationDeleteResponse, organization, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `organization_id` but received ''"):
-            await async_client.user.organizations.with_raw_response.delete(
-                "",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `organization_id` but received ''"):
+                await async_client.user.organizations.with_raw_response.delete(
+                    "",
+                )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        organization = await async_client.user.organizations.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            organization = await async_client.user.organizations.get(
+                "023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
         assert_matches_type(object, organization, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.user.organizations.with_raw_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.user.organizations.with_raw_response.get(
+                "023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -232,20 +266,22 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.user.organizations.with_streaming_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.user.organizations.with_streaming_response.get(
+                "023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            organization = await response.parse()
-            assert_matches_type(object, organization, path=["response"])
+                organization = await response.parse()
+                assert_matches_type(object, organization, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `organization_id` but received ''"):
-            await async_client.user.organizations.with_raw_response.get(
-                "",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `organization_id` but received ''"):
+                await async_client.user.organizations.with_raw_response.get(
+                    "",
+                )
diff --git a/tests/api_resources/user/test_subscriptions.py b/tests/api_resources/user/test_subscriptions.py
index c109797de83..ab0298d51a7 100644
--- a/tests/api_resources/user/test_subscriptions.py
+++ b/tests/api_resources/user/test_subscriptions.py
@@ -3,18 +3,15 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.user import (
-    SubscriptionGetResponse,
-    SubscriptionEditResponse,
-    SubscriptionDeleteResponse,
-    SubscriptionUpdateResponse,
-)
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.user import SubscriptionDeleteResponse, SubscriptionUpdateResponse
+from cloudflare.types.shared import Subscription
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -33,38 +30,16 @@ def test_method_update(self, client: Cloudflare) -> None:
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         subscription = client.user.subscriptions.update(
             identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            app={"install_id": "install_id"},
-            component_values=[
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-            ],
             frequency="monthly",
             rate_plan={
+                "id": "free",
                 "currency": "USD",
                 "externally_managed": False,
-                "id": "free",
                 "is_contract": False,
                 "public_name": "Business Plan",
                 "scope": "zone",
-                "sets": ["string", "string", "string"],
+                "sets": ["string"],
             },
-            zone={},
         )
         assert_matches_type(SubscriptionUpdateResponse, subscription, path=["response"])
 
@@ -137,87 +112,10 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 "",
             )
 
-    @parametrize
-    def test_method_edit(self, client: Cloudflare) -> None:
-        subscription = client.user.subscriptions.edit(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
-        )
-        assert_matches_type(SubscriptionEditResponse, subscription, path=["response"])
-
-    @parametrize
-    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
-        subscription = client.user.subscriptions.edit(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            app={"install_id": "install_id"},
-            component_values=[
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-            ],
-            frequency="monthly",
-            rate_plan={
-                "currency": "USD",
-                "externally_managed": False,
-                "id": "free",
-                "is_contract": False,
-                "public_name": "Business Plan",
-                "scope": "zone",
-                "sets": ["string", "string", "string"],
-            },
-            zone={},
-        )
-        assert_matches_type(SubscriptionEditResponse, subscription, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit(self, client: Cloudflare) -> None:
-        response = client.user.subscriptions.with_raw_response.edit(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        subscription = response.parse()
-        assert_matches_type(SubscriptionEditResponse, subscription, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit(self, client: Cloudflare) -> None:
-        with client.user.subscriptions.with_streaming_response.edit(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            subscription = response.parse()
-            assert_matches_type(SubscriptionEditResponse, subscription, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
-            client.user.subscriptions.with_raw_response.edit(
-                identifier="",
-            )
-
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         subscription = client.user.subscriptions.get()
-        assert_matches_type(Optional[SubscriptionGetResponse], subscription, path=["response"])
+        assert_matches_type(SyncSinglePage[Subscription], subscription, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -226,7 +124,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         subscription = response.parse()
-        assert_matches_type(Optional[SubscriptionGetResponse], subscription, path=["response"])
+        assert_matches_type(SyncSinglePage[Subscription], subscription, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -235,13 +133,15 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             subscription = response.parse()
-            assert_matches_type(Optional[SubscriptionGetResponse], subscription, path=["response"])
+            assert_matches_type(SyncSinglePage[Subscription], subscription, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncSubscriptions:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
@@ -254,38 +154,16 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         subscription = await async_client.user.subscriptions.update(
             identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            app={"install_id": "install_id"},
-            component_values=[
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-            ],
             frequency="monthly",
             rate_plan={
+                "id": "free",
                 "currency": "USD",
                 "externally_managed": False,
-                "id": "free",
                 "is_contract": False,
                 "public_name": "Business Plan",
                 "scope": "zone",
-                "sets": ["string", "string", "string"],
+                "sets": ["string"],
             },
-            zone={},
         )
         assert_matches_type(SubscriptionUpdateResponse, subscription, path=["response"])
 
@@ -358,87 +236,10 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 "",
             )
 
-    @parametrize
-    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
-        subscription = await async_client.user.subscriptions.edit(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
-        )
-        assert_matches_type(SubscriptionEditResponse, subscription, path=["response"])
-
-    @parametrize
-    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        subscription = await async_client.user.subscriptions.edit(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            app={"install_id": "install_id"},
-            component_values=[
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-            ],
-            frequency="monthly",
-            rate_plan={
-                "currency": "USD",
-                "externally_managed": False,
-                "id": "free",
-                "is_contract": False,
-                "public_name": "Business Plan",
-                "scope": "zone",
-                "sets": ["string", "string", "string"],
-            },
-            zone={},
-        )
-        assert_matches_type(SubscriptionEditResponse, subscription, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.user.subscriptions.with_raw_response.edit(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        subscription = await response.parse()
-        assert_matches_type(SubscriptionEditResponse, subscription, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.user.subscriptions.with_streaming_response.edit(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            subscription = await response.parse()
-            assert_matches_type(SubscriptionEditResponse, subscription, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
-            await async_client.user.subscriptions.with_raw_response.edit(
-                identifier="",
-            )
-
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         subscription = await async_client.user.subscriptions.get()
-        assert_matches_type(Optional[SubscriptionGetResponse], subscription, path=["response"])
+        assert_matches_type(AsyncSinglePage[Subscription], subscription, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -447,7 +248,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         subscription = await response.parse()
-        assert_matches_type(Optional[SubscriptionGetResponse], subscription, path=["response"])
+        assert_matches_type(AsyncSinglePage[Subscription], subscription, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -456,6 +257,6 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             subscription = await response.parse()
-            assert_matches_type(Optional[SubscriptionGetResponse], subscription, path=["response"])
+            assert_matches_type(AsyncSinglePage[Subscription], subscription, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/user/test_tokens.py b/tests/api_resources/user/test_tokens.py
index cf66f8daf04..bcba28f9023 100644
--- a/tests/api_resources/user/test_tokens.py
+++ b/tests/api_resources/user/test_tokens.py
@@ -16,6 +16,7 @@
     TokenDeleteResponse,
     TokenVerifyResponse,
 )
+from cloudflare.types.shared import Token
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -31,28 +32,12 @@ def test_method_create(self, client: Cloudflare) -> None:
             policies=[
                 {
                     "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
             ],
         )
         assert_matches_type(Optional[TokenCreateResponse], token, path=["response"])
@@ -67,65 +52,22 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                     "effect": "allow",
                     "permission_groups": [
                         {
+                            "id": "c8fed203ed3043cba015a93ad1616f1f",
                             "meta": {
-                                "label": "load_balancer_admin",
-                                "scopes": "com.cloudflare.api.account",
-                            }
-                        },
-                        {
-                            "meta": {
-                                "label": "fbm_user",
-                                "scopes": "com.cloudflare.api.account",
-                            }
-                        },
-                    ],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [
-                        {
-                            "meta": {
-                                "label": "load_balancer_admin",
-                                "scopes": "com.cloudflare.api.account",
-                            }
-                        },
-                        {
-                            "meta": {
-                                "label": "fbm_user",
-                                "scopes": "com.cloudflare.api.account",
-                            }
-                        },
-                    ],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [
-                        {
-                            "meta": {
-                                "label": "load_balancer_admin",
-                                "scopes": "com.cloudflare.api.account",
-                            }
+                                "key": "key",
+                                "value": "value",
+                            },
                         },
                         {
+                            "id": "82e64a83756745bbbb1c9c2701bf816b",
                             "meta": {
-                                "label": "fbm_user",
-                                "scopes": "com.cloudflare.api.account",
-                            }
+                                "key": "key",
+                                "value": "value",
+                            },
                         },
                     ],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
+                    "resources": {"foo": "string"},
+                }
             ],
             condition={
                 "request_ip": {
@@ -146,28 +88,12 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
             policies=[
                 {
                     "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
             ],
         )
 
@@ -184,28 +110,12 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             policies=[
                 {
                     "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
             ],
         ) as response:
             assert not response.is_closed
@@ -220,110 +130,49 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         token = client.user.tokens.update(
-            token_id={},
+            token_id="ed17574386854bf78a67040be0a770b0",
             name="readonly token",
             policies=[
                 {
                     "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
             ],
-            status="active",
         )
-        assert_matches_type(object, token, path=["response"])
+        assert_matches_type(Optional[Token], token, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         token = client.user.tokens.update(
-            token_id={},
+            token_id="ed17574386854bf78a67040be0a770b0",
             name="readonly token",
             policies=[
                 {
                     "effect": "allow",
                     "permission_groups": [
                         {
+                            "id": "c8fed203ed3043cba015a93ad1616f1f",
                             "meta": {
-                                "label": "load_balancer_admin",
-                                "scopes": "com.cloudflare.api.account",
-                            }
+                                "key": "key",
+                                "value": "value",
+                            },
                         },
                         {
+                            "id": "82e64a83756745bbbb1c9c2701bf816b",
                             "meta": {
-                                "label": "fbm_user",
-                                "scopes": "com.cloudflare.api.account",
-                            }
+                                "key": "key",
+                                "value": "value",
+                            },
                         },
                     ],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [
-                        {
-                            "meta": {
-                                "label": "load_balancer_admin",
-                                "scopes": "com.cloudflare.api.account",
-                            }
-                        },
-                        {
-                            "meta": {
-                                "label": "fbm_user",
-                                "scopes": "com.cloudflare.api.account",
-                            }
-                        },
-                    ],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [
-                        {
-                            "meta": {
-                                "label": "load_balancer_admin",
-                                "scopes": "com.cloudflare.api.account",
-                            }
-                        },
-                        {
-                            "meta": {
-                                "label": "fbm_user",
-                                "scopes": "com.cloudflare.api.account",
-                            }
-                        },
-                    ],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
+                    "resources": {"foo": "string"},
+                }
             ],
-            status="active",
             condition={
                 "request_ip": {
                     "in": ["123.123.123.0/24", "2606:4700::/32"],
@@ -332,96 +181,84 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             },
             expires_on=parse_datetime("2020-01-01T00:00:00Z"),
             not_before=parse_datetime("2018-07-01T05:20:00Z"),
+            status="active",
         )
-        assert_matches_type(object, token, path=["response"])
+        assert_matches_type(Optional[Token], token, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.user.tokens.with_raw_response.update(
-            token_id={},
+            token_id="ed17574386854bf78a67040be0a770b0",
             name="readonly token",
             policies=[
                 {
                     "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
             ],
-            status="active",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         token = response.parse()
-        assert_matches_type(object, token, path=["response"])
+        assert_matches_type(Optional[Token], token, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.user.tokens.with_streaming_response.update(
-            token_id={},
+            token_id="ed17574386854bf78a67040be0a770b0",
             name="readonly token",
             policies=[
                 {
                     "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
             ],
-            status="active",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             token = response.parse()
-            assert_matches_type(object, token, path=["response"])
+            assert_matches_type(Optional[Token], token, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `token_id` but received ''"):
+            client.user.tokens.with_raw_response.update(
+                token_id="",
+                name="readonly token",
+                policies=[
+                    {
+                        "effect": "allow",
+                        "permission_groups": [
+                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                        ],
+                        "resources": {"foo": "string"},
+                    }
+                ],
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         token = client.user.tokens.list()
-        assert_matches_type(SyncV4PagePaginationArray[object], token, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Token], token, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         token = client.user.tokens.list(
@@ -429,8 +266,9 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
             page=1,
             per_page=5,
         )
-        assert_matches_type(SyncV4PagePaginationArray[object], token, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Token], token, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.user.tokens.with_raw_response.list()
@@ -438,8 +276,9 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         token = response.parse()
-        assert_matches_type(SyncV4PagePaginationArray[object], token, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Token], token, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.user.tokens.with_streaming_response.list() as response:
@@ -447,21 +286,23 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             token = response.parse()
-            assert_matches_type(SyncV4PagePaginationArray[object], token, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[Token], token, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         token = client.user.tokens.delete(
-            {},
+            "ed17574386854bf78a67040be0a770b0",
         )
         assert_matches_type(Optional[TokenDeleteResponse], token, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.user.tokens.with_raw_response.delete(
-            {},
+            "ed17574386854bf78a67040be0a770b0",
         )
 
         assert response.is_closed is True
@@ -469,10 +310,11 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         token = response.parse()
         assert_matches_type(Optional[TokenDeleteResponse], token, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.user.tokens.with_streaming_response.delete(
-            {},
+            "ed17574386854bf78a67040be0a770b0",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -482,42 +324,63 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `token_id` but received ''"):
+            client.user.tokens.with_raw_response.delete(
+                "",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         token = client.user.tokens.get(
-            {},
+            "ed17574386854bf78a67040be0a770b0",
         )
-        assert_matches_type(object, token, path=["response"])
+        assert_matches_type(Optional[Token], token, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.user.tokens.with_raw_response.get(
-            {},
+            "ed17574386854bf78a67040be0a770b0",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         token = response.parse()
-        assert_matches_type(object, token, path=["response"])
+        assert_matches_type(Optional[Token], token, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.user.tokens.with_streaming_response.get(
-            {},
+            "ed17574386854bf78a67040be0a770b0",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             token = response.parse()
-            assert_matches_type(object, token, path=["response"])
+            assert_matches_type(Optional[Token], token, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `token_id` but received ''"):
+            client.user.tokens.with_raw_response.get(
+                "",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_verify(self, client: Cloudflare) -> None:
         token = client.user.tokens.verify()
         assert_matches_type(Optional[TokenVerifyResponse], token, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_verify(self, client: Cloudflare) -> None:
         response = client.user.tokens.with_raw_response.verify()
@@ -527,6 +390,7 @@ def test_raw_response_verify(self, client: Cloudflare) -> None:
         token = response.parse()
         assert_matches_type(Optional[TokenVerifyResponse], token, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_verify(self, client: Cloudflare) -> None:
         with client.user.tokens.with_streaming_response.verify() as response:
@@ -540,7 +404,9 @@ def test_streaming_response_verify(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTokens:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -550,28 +416,12 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
             policies=[
                 {
                     "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
             ],
         )
         assert_matches_type(Optional[TokenCreateResponse], token, path=["response"])
@@ -586,65 +436,22 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                     "effect": "allow",
                     "permission_groups": [
                         {
+                            "id": "c8fed203ed3043cba015a93ad1616f1f",
                             "meta": {
-                                "label": "load_balancer_admin",
-                                "scopes": "com.cloudflare.api.account",
-                            }
-                        },
-                        {
-                            "meta": {
-                                "label": "fbm_user",
-                                "scopes": "com.cloudflare.api.account",
-                            }
-                        },
-                    ],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [
-                        {
-                            "meta": {
-                                "label": "load_balancer_admin",
-                                "scopes": "com.cloudflare.api.account",
-                            }
-                        },
-                        {
-                            "meta": {
-                                "label": "fbm_user",
-                                "scopes": "com.cloudflare.api.account",
-                            }
-                        },
-                    ],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [
-                        {
-                            "meta": {
-                                "label": "load_balancer_admin",
-                                "scopes": "com.cloudflare.api.account",
-                            }
+                                "key": "key",
+                                "value": "value",
+                            },
                         },
                         {
+                            "id": "82e64a83756745bbbb1c9c2701bf816b",
                             "meta": {
-                                "label": "fbm_user",
-                                "scopes": "com.cloudflare.api.account",
-                            }
+                                "key": "key",
+                                "value": "value",
+                            },
                         },
                     ],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
+                    "resources": {"foo": "string"},
+                }
             ],
             condition={
                 "request_ip": {
@@ -665,28 +472,12 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
             policies=[
                 {
                     "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
             ],
         )
 
@@ -703,28 +494,12 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             policies=[
                 {
                     "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
             ],
         ) as response:
             assert not response.is_closed
@@ -739,110 +514,49 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         token = await async_client.user.tokens.update(
-            token_id={},
+            token_id="ed17574386854bf78a67040be0a770b0",
             name="readonly token",
             policies=[
                 {
                     "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
             ],
-            status="active",
         )
-        assert_matches_type(object, token, path=["response"])
+        assert_matches_type(Optional[Token], token, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         token = await async_client.user.tokens.update(
-            token_id={},
+            token_id="ed17574386854bf78a67040be0a770b0",
             name="readonly token",
             policies=[
                 {
                     "effect": "allow",
                     "permission_groups": [
                         {
+                            "id": "c8fed203ed3043cba015a93ad1616f1f",
                             "meta": {
-                                "label": "load_balancer_admin",
-                                "scopes": "com.cloudflare.api.account",
-                            }
+                                "key": "key",
+                                "value": "value",
+                            },
                         },
                         {
+                            "id": "82e64a83756745bbbb1c9c2701bf816b",
                             "meta": {
-                                "label": "fbm_user",
-                                "scopes": "com.cloudflare.api.account",
-                            }
+                                "key": "key",
+                                "value": "value",
+                            },
                         },
                     ],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [
-                        {
-                            "meta": {
-                                "label": "load_balancer_admin",
-                                "scopes": "com.cloudflare.api.account",
-                            }
-                        },
-                        {
-                            "meta": {
-                                "label": "fbm_user",
-                                "scopes": "com.cloudflare.api.account",
-                            }
-                        },
-                    ],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [
-                        {
-                            "meta": {
-                                "label": "load_balancer_admin",
-                                "scopes": "com.cloudflare.api.account",
-                            }
-                        },
-                        {
-                            "meta": {
-                                "label": "fbm_user",
-                                "scopes": "com.cloudflare.api.account",
-                            }
-                        },
-                    ],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
+                    "resources": {"foo": "string"},
+                }
             ],
-            status="active",
             condition={
                 "request_ip": {
                     "in": ["123.123.123.0/24", "2606:4700::/32"],
@@ -851,96 +565,84 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             },
             expires_on=parse_datetime("2020-01-01T00:00:00Z"),
             not_before=parse_datetime("2018-07-01T05:20:00Z"),
+            status="active",
         )
-        assert_matches_type(object, token, path=["response"])
+        assert_matches_type(Optional[Token], token, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.user.tokens.with_raw_response.update(
-            token_id={},
+            token_id="ed17574386854bf78a67040be0a770b0",
             name="readonly token",
             policies=[
                 {
                     "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
             ],
-            status="active",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         token = await response.parse()
-        assert_matches_type(object, token, path=["response"])
+        assert_matches_type(Optional[Token], token, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.user.tokens.with_streaming_response.update(
-            token_id={},
+            token_id="ed17574386854bf78a67040be0a770b0",
             name="readonly token",
             policies=[
                 {
                     "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
-                {
-                    "effect": "allow",
-                    "permission_groups": [{}, {}],
-                    "resources": {
-                        "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
-                        "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*",
-                    },
-                },
+                    "permission_groups": [
+                        {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                        {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                    ],
+                    "resources": {"foo": "string"},
+                }
             ],
-            status="active",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             token = await response.parse()
-            assert_matches_type(object, token, path=["response"])
+            assert_matches_type(Optional[Token], token, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `token_id` but received ''"):
+            await async_client.user.tokens.with_raw_response.update(
+                token_id="",
+                name="readonly token",
+                policies=[
+                    {
+                        "effect": "allow",
+                        "permission_groups": [
+                            {"id": "c8fed203ed3043cba015a93ad1616f1f"},
+                            {"id": "82e64a83756745bbbb1c9c2701bf816b"},
+                        ],
+                        "resources": {"foo": "string"},
+                    }
+                ],
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         token = await async_client.user.tokens.list()
-        assert_matches_type(AsyncV4PagePaginationArray[object], token, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Token], token, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         token = await async_client.user.tokens.list(
@@ -948,8 +650,9 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
             page=1,
             per_page=5,
         )
-        assert_matches_type(AsyncV4PagePaginationArray[object], token, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Token], token, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.user.tokens.with_raw_response.list()
@@ -957,8 +660,9 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         token = await response.parse()
-        assert_matches_type(AsyncV4PagePaginationArray[object], token, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Token], token, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.user.tokens.with_streaming_response.list() as response:
@@ -966,21 +670,23 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             token = await response.parse()
-            assert_matches_type(AsyncV4PagePaginationArray[object], token, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[Token], token, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         token = await async_client.user.tokens.delete(
-            {},
+            "ed17574386854bf78a67040be0a770b0",
         )
         assert_matches_type(Optional[TokenDeleteResponse], token, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.user.tokens.with_raw_response.delete(
-            {},
+            "ed17574386854bf78a67040be0a770b0",
         )
 
         assert response.is_closed is True
@@ -988,10 +694,11 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         token = await response.parse()
         assert_matches_type(Optional[TokenDeleteResponse], token, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.user.tokens.with_streaming_response.delete(
-            {},
+            "ed17574386854bf78a67040be0a770b0",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -1001,42 +708,63 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `token_id` but received ''"):
+            await async_client.user.tokens.with_raw_response.delete(
+                "",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         token = await async_client.user.tokens.get(
-            {},
+            "ed17574386854bf78a67040be0a770b0",
         )
-        assert_matches_type(object, token, path=["response"])
+        assert_matches_type(Optional[Token], token, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.user.tokens.with_raw_response.get(
-            {},
+            "ed17574386854bf78a67040be0a770b0",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         token = await response.parse()
-        assert_matches_type(object, token, path=["response"])
+        assert_matches_type(Optional[Token], token, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.user.tokens.with_streaming_response.get(
-            {},
+            "ed17574386854bf78a67040be0a770b0",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             token = await response.parse()
-            assert_matches_type(object, token, path=["response"])
+            assert_matches_type(Optional[Token], token, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `token_id` but received ''"):
+            await async_client.user.tokens.with_raw_response.get(
+                "",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_verify(self, async_client: AsyncCloudflare) -> None:
         token = await async_client.user.tokens.verify()
         assert_matches_type(Optional[TokenVerifyResponse], token, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_verify(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.user.tokens.with_raw_response.verify()
@@ -1046,6 +774,7 @@ async def test_raw_response_verify(self, async_client: AsyncCloudflare) -> None:
         token = await response.parse()
         assert_matches_type(Optional[TokenVerifyResponse], token, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_verify(self, async_client: AsyncCloudflare) -> None:
         async with async_client.user.tokens.with_streaming_response.verify() as response:
diff --git a/tests/api_resources/user/tokens/test_permission_groups.py b/tests/api_resources/user/tokens/test_permission_groups.py
index f92a3cb1818..3e813ab1b1e 100644
--- a/tests/api_resources/user/tokens/test_permission_groups.py
+++ b/tests/api_resources/user/tokens/test_permission_groups.py
@@ -10,6 +10,7 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.user.tokens import PermissionGroupListResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -17,11 +18,22 @@
 class TestPermissionGroups:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         permission_group = client.user.tokens.permission_groups.list()
-        assert_matches_type(SyncSinglePage[object], permission_group, path=["response"])
+        assert_matches_type(SyncSinglePage[PermissionGroupListResponse], permission_group, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        permission_group = client.user.tokens.permission_groups.list(
+            name="Account%20Settings%20Write",
+            scope="com.cloudflare.api.account.zone",
+        )
+        assert_matches_type(SyncSinglePage[PermissionGroupListResponse], permission_group, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.user.tokens.permission_groups.with_raw_response.list()
@@ -29,8 +41,9 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         permission_group = response.parse()
-        assert_matches_type(SyncSinglePage[object], permission_group, path=["response"])
+        assert_matches_type(SyncSinglePage[PermissionGroupListResponse], permission_group, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.user.tokens.permission_groups.with_streaming_response.list() as response:
@@ -38,19 +51,32 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             permission_group = response.parse()
-            assert_matches_type(SyncSinglePage[object], permission_group, path=["response"])
+            assert_matches_type(SyncSinglePage[PermissionGroupListResponse], permission_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
 
 class TestAsyncPermissionGroups:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         permission_group = await async_client.user.tokens.permission_groups.list()
-        assert_matches_type(AsyncSinglePage[object], permission_group, path=["response"])
+        assert_matches_type(AsyncSinglePage[PermissionGroupListResponse], permission_group, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        permission_group = await async_client.user.tokens.permission_groups.list(
+            name="Account%20Settings%20Write",
+            scope="com.cloudflare.api.account.zone",
+        )
+        assert_matches_type(AsyncSinglePage[PermissionGroupListResponse], permission_group, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.user.tokens.permission_groups.with_raw_response.list()
@@ -58,8 +84,9 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         permission_group = await response.parse()
-        assert_matches_type(AsyncSinglePage[object], permission_group, path=["response"])
+        assert_matches_type(AsyncSinglePage[PermissionGroupListResponse], permission_group, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.user.tokens.permission_groups.with_streaming_response.list() as response:
@@ -67,6 +94,6 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             permission_group = await response.parse()
-            assert_matches_type(AsyncSinglePage[object], permission_group, path=["response"])
+            assert_matches_type(AsyncSinglePage[PermissionGroupListResponse], permission_group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
diff --git a/tests/api_resources/user/tokens/test_value.py b/tests/api_resources/user/tokens/test_value.py
index 9eba90baaa8..459bf43aabf 100644
--- a/tests/api_resources/user/tokens/test_value.py
+++ b/tests/api_resources/user/tokens/test_value.py
@@ -16,18 +16,20 @@
 class TestValue:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         value = client.user.tokens.value.update(
-            token_id={},
+            token_id="ed17574386854bf78a67040be0a770b0",
             body={},
         )
         assert_matches_type(str, value, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.user.tokens.value.with_raw_response.update(
-            token_id={},
+            token_id="ed17574386854bf78a67040be0a770b0",
             body={},
         )
 
@@ -36,10 +38,11 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         value = response.parse()
         assert_matches_type(str, value, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.user.tokens.value.with_streaming_response.update(
-            token_id={},
+            token_id="ed17574386854bf78a67040be0a770b0",
             body={},
         ) as response:
             assert not response.is_closed
@@ -50,22 +53,35 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `token_id` but received ''"):
+            client.user.tokens.value.with_raw_response.update(
+                token_id="",
+                body={},
+            )
+
 
 class TestAsyncValue:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         value = await async_client.user.tokens.value.update(
-            token_id={},
+            token_id="ed17574386854bf78a67040be0a770b0",
             body={},
         )
         assert_matches_type(str, value, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.user.tokens.value.with_raw_response.update(
-            token_id={},
+            token_id="ed17574386854bf78a67040be0a770b0",
             body={},
         )
 
@@ -74,10 +90,11 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         value = await response.parse()
         assert_matches_type(str, value, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.user.tokens.value.with_streaming_response.update(
-            token_id={},
+            token_id="ed17574386854bf78a67040be0a770b0",
             body={},
         ) as response:
             assert not response.is_closed
@@ -87,3 +104,12 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
             assert_matches_type(str, value, path=["response"])
 
         assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `token_id` but received ''"):
+            await async_client.user.tokens.value.with_raw_response.update(
+                token_id="",
+                body={},
+            )
diff --git a/tests/api_resources/vectorize/indexes/__init__.py b/tests/api_resources/vectorize/indexes/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/vectorize/indexes/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/vectorize/indexes/test_metadata_index.py b/tests/api_resources/vectorize/indexes/test_metadata_index.py
new file mode 100644
index 00000000000..2dbf39b034d
--- /dev/null
+++ b/tests/api_resources/vectorize/indexes/test_metadata_index.py
@@ -0,0 +1,346 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.vectorize.indexes import (
+    MetadataIndexListResponse,
+    MetadataIndexCreateResponse,
+    MetadataIndexDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestMetadataIndex:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        metadata_index = client.vectorize.indexes.metadata_index.create(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            index_type="string",
+            property_name="random_metadata_property",
+        )
+        assert_matches_type(Optional[MetadataIndexCreateResponse], metadata_index, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.vectorize.indexes.metadata_index.with_raw_response.create(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            index_type="string",
+            property_name="random_metadata_property",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        metadata_index = response.parse()
+        assert_matches_type(Optional[MetadataIndexCreateResponse], metadata_index, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.vectorize.indexes.metadata_index.with_streaming_response.create(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            index_type="string",
+            property_name="random_metadata_property",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            metadata_index = response.parse()
+            assert_matches_type(Optional[MetadataIndexCreateResponse], metadata_index, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.vectorize.indexes.metadata_index.with_raw_response.create(
+                index_name="example-index",
+                account_id="",
+                index_type="string",
+                property_name="random_metadata_property",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `index_name` but received ''"):
+            client.vectorize.indexes.metadata_index.with_raw_response.create(
+                index_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                index_type="string",
+                property_name="random_metadata_property",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        metadata_index = client.vectorize.indexes.metadata_index.list(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[MetadataIndexListResponse], metadata_index, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.vectorize.indexes.metadata_index.with_raw_response.list(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        metadata_index = response.parse()
+        assert_matches_type(Optional[MetadataIndexListResponse], metadata_index, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.vectorize.indexes.metadata_index.with_streaming_response.list(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            metadata_index = response.parse()
+            assert_matches_type(Optional[MetadataIndexListResponse], metadata_index, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.vectorize.indexes.metadata_index.with_raw_response.list(
+                index_name="example-index",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `index_name` but received ''"):
+            client.vectorize.indexes.metadata_index.with_raw_response.list(
+                index_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        metadata_index = client.vectorize.indexes.metadata_index.delete(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            property_name="random_metadata_property",
+        )
+        assert_matches_type(Optional[MetadataIndexDeleteResponse], metadata_index, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.vectorize.indexes.metadata_index.with_raw_response.delete(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            property_name="random_metadata_property",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        metadata_index = response.parse()
+        assert_matches_type(Optional[MetadataIndexDeleteResponse], metadata_index, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.vectorize.indexes.metadata_index.with_streaming_response.delete(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            property_name="random_metadata_property",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            metadata_index = response.parse()
+            assert_matches_type(Optional[MetadataIndexDeleteResponse], metadata_index, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.vectorize.indexes.metadata_index.with_raw_response.delete(
+                index_name="example-index",
+                account_id="",
+                property_name="random_metadata_property",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `index_name` but received ''"):
+            client.vectorize.indexes.metadata_index.with_raw_response.delete(
+                index_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                property_name="random_metadata_property",
+            )
+
+
+class TestAsyncMetadataIndex:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        metadata_index = await async_client.vectorize.indexes.metadata_index.create(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            index_type="string",
+            property_name="random_metadata_property",
+        )
+        assert_matches_type(Optional[MetadataIndexCreateResponse], metadata_index, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.vectorize.indexes.metadata_index.with_raw_response.create(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            index_type="string",
+            property_name="random_metadata_property",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        metadata_index = await response.parse()
+        assert_matches_type(Optional[MetadataIndexCreateResponse], metadata_index, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.vectorize.indexes.metadata_index.with_streaming_response.create(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            index_type="string",
+            property_name="random_metadata_property",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            metadata_index = await response.parse()
+            assert_matches_type(Optional[MetadataIndexCreateResponse], metadata_index, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.vectorize.indexes.metadata_index.with_raw_response.create(
+                index_name="example-index",
+                account_id="",
+                index_type="string",
+                property_name="random_metadata_property",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `index_name` but received ''"):
+            await async_client.vectorize.indexes.metadata_index.with_raw_response.create(
+                index_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                index_type="string",
+                property_name="random_metadata_property",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        metadata_index = await async_client.vectorize.indexes.metadata_index.list(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[MetadataIndexListResponse], metadata_index, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.vectorize.indexes.metadata_index.with_raw_response.list(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        metadata_index = await response.parse()
+        assert_matches_type(Optional[MetadataIndexListResponse], metadata_index, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.vectorize.indexes.metadata_index.with_streaming_response.list(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            metadata_index = await response.parse()
+            assert_matches_type(Optional[MetadataIndexListResponse], metadata_index, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.vectorize.indexes.metadata_index.with_raw_response.list(
+                index_name="example-index",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `index_name` but received ''"):
+            await async_client.vectorize.indexes.metadata_index.with_raw_response.list(
+                index_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        metadata_index = await async_client.vectorize.indexes.metadata_index.delete(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            property_name="random_metadata_property",
+        )
+        assert_matches_type(Optional[MetadataIndexDeleteResponse], metadata_index, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.vectorize.indexes.metadata_index.with_raw_response.delete(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            property_name="random_metadata_property",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        metadata_index = await response.parse()
+        assert_matches_type(Optional[MetadataIndexDeleteResponse], metadata_index, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.vectorize.indexes.metadata_index.with_streaming_response.delete(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            property_name="random_metadata_property",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            metadata_index = await response.parse()
+            assert_matches_type(Optional[MetadataIndexDeleteResponse], metadata_index, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.vectorize.indexes.metadata_index.with_raw_response.delete(
+                index_name="example-index",
+                account_id="",
+                property_name="random_metadata_property",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `index_name` but received ''"):
+            await async_client.vectorize.indexes.metadata_index.with_raw_response.delete(
+                index_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                property_name="random_metadata_property",
+            )
diff --git a/tests/api_resources/vectorize/test_indexes.py b/tests/api_resources/vectorize/test_indexes.py
index c24b21b2d96..4429a86da2c 100644
--- a/tests/api_resources/vectorize/test_indexes.py
+++ b/tests/api_resources/vectorize/test_indexes.py
@@ -11,12 +11,14 @@
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.vectorize import (
-    IndexQuery,
     CreateIndex,
-    IndexInsert,
-    IndexUpsert,
+    IndexInfoResponse,
+    IndexQueryResponse,
     IndexDeleteResponse,
-    IndexDeleteVectorsByID,
+    IndexInsertResponse,
+    IndexUpsertResponse,
+    IndexDeleteByIDsResponse,
+    IndexListVectorsResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -96,59 +98,6 @@ def test_path_params_create(self, client: Cloudflare) -> None:
                 name="example-index",
             )
 
-    @parametrize
-    def test_method_update(self, client: Cloudflare) -> None:
-        index = client.vectorize.indexes.update(
-            index_name="example-index",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            description="This is my example index.",
-        )
-        assert_matches_type(Optional[CreateIndex], index, path=["response"])
-
-    @parametrize
-    def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.vectorize.indexes.with_raw_response.update(
-            index_name="example-index",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            description="This is my example index.",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        index = response.parse()
-        assert_matches_type(Optional[CreateIndex], index, path=["response"])
-
-    @parametrize
-    def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.vectorize.indexes.with_streaming_response.update(
-            index_name="example-index",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            description="This is my example index.",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            index = response.parse()
-            assert_matches_type(Optional[CreateIndex], index, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.vectorize.indexes.with_raw_response.update(
-                index_name="example-index",
-                account_id="",
-                description="This is my example index.",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `index_name` but received ''"):
-            client.vectorize.indexes.with_raw_response.update(
-                index_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                description="This is my example index.",
-            )
-
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         index = client.vectorize.indexes.list(
@@ -193,7 +142,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             index_name="example-index",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(IndexDeleteResponse, index, path=["response"])
+        assert_matches_type(Optional[IndexDeleteResponse], index, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -205,7 +154,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         index = response.parse()
-        assert_matches_type(IndexDeleteResponse, index, path=["response"])
+        assert_matches_type(Optional[IndexDeleteResponse], index, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -217,7 +166,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             index = response.parse()
-            assert_matches_type(IndexDeleteResponse, index, path=["response"])
+            assert_matches_type(Optional[IndexDeleteResponse], index, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -241,7 +190,7 @@ def test_method_delete_by_ids(self, client: Cloudflare) -> None:
             index_name="example-index",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[IndexDeleteVectorsByID], index, path=["response"])
+        assert_matches_type(Optional[IndexDeleteByIDsResponse], index, path=["response"])
 
     @parametrize
     def test_method_delete_by_ids_with_all_params(self, client: Cloudflare) -> None:
@@ -250,7 +199,7 @@ def test_method_delete_by_ids_with_all_params(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             ids=["5121db81354a40c6aedc3fe1ace51c59", "f90eb49c2107486abdfd78c67e853430"],
         )
-        assert_matches_type(Optional[IndexDeleteVectorsByID], index, path=["response"])
+        assert_matches_type(Optional[IndexDeleteByIDsResponse], index, path=["response"])
 
     @parametrize
     def test_raw_response_delete_by_ids(self, client: Cloudflare) -> None:
@@ -262,7 +211,7 @@ def test_raw_response_delete_by_ids(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         index = response.parse()
-        assert_matches_type(Optional[IndexDeleteVectorsByID], index, path=["response"])
+        assert_matches_type(Optional[IndexDeleteByIDsResponse], index, path=["response"])
 
     @parametrize
     def test_streaming_response_delete_by_ids(self, client: Cloudflare) -> None:
@@ -274,7 +223,7 @@ def test_streaming_response_delete_by_ids(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             index = response.parse()
-            assert_matches_type(Optional[IndexDeleteVectorsByID], index, path=["response"])
+            assert_matches_type(Optional[IndexDeleteByIDsResponse], index, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -397,6 +346,54 @@ def test_path_params_get_by_ids(self, client: Cloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @parametrize
+    def test_method_info(self, client: Cloudflare) -> None:
+        index = client.vectorize.indexes.info(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[IndexInfoResponse], index, path=["response"])
+
+    @parametrize
+    def test_raw_response_info(self, client: Cloudflare) -> None:
+        response = client.vectorize.indexes.with_raw_response.info(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        index = response.parse()
+        assert_matches_type(Optional[IndexInfoResponse], index, path=["response"])
+
+    @parametrize
+    def test_streaming_response_info(self, client: Cloudflare) -> None:
+        with client.vectorize.indexes.with_streaming_response.info(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            index = response.parse()
+            assert_matches_type(Optional[IndexInfoResponse], index, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_info(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.vectorize.indexes.with_raw_response.info(
+                index_name="example-index",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `index_name` but received ''"):
+            client.vectorize.indexes.with_raw_response.info(
+                index_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_insert(self, client: Cloudflare) -> None:
@@ -405,7 +402,18 @@ def test_method_insert(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             body=b"raw file contents",
         )
-        assert_matches_type(Optional[IndexInsert], index, path=["response"])
+        assert_matches_type(Optional[IndexInsertResponse], index, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_insert_with_all_params(self, client: Cloudflare) -> None:
+        index = client.vectorize.indexes.insert(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=b"raw file contents",
+            unparsable_behavior="error",
+        )
+        assert_matches_type(Optional[IndexInsertResponse], index, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -419,7 +427,7 @@ def test_raw_response_insert(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         index = response.parse()
-        assert_matches_type(Optional[IndexInsert], index, path=["response"])
+        assert_matches_type(Optional[IndexInsertResponse], index, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -433,7 +441,7 @@ def test_streaming_response_insert(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             index = response.parse()
-            assert_matches_type(Optional[IndexInsert], index, path=["response"])
+            assert_matches_type(Optional[IndexInsertResponse], index, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -454,6 +462,64 @@ def test_path_params_insert(self, client: Cloudflare) -> None:
                 body=b"raw file contents",
             )
 
+    @parametrize
+    def test_method_list_vectors(self, client: Cloudflare) -> None:
+        index = client.vectorize.indexes.list_vectors(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[IndexListVectorsResponse], index, path=["response"])
+
+    @parametrize
+    def test_method_list_vectors_with_all_params(self, client: Cloudflare) -> None:
+        index = client.vectorize.indexes.list_vectors(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            count=50,
+            cursor="suUTaDY5PFUiRweVccnzyt9n75suNPbXHPshvCzue5mHjtj7Letjvzlza9eGj099",
+        )
+        assert_matches_type(Optional[IndexListVectorsResponse], index, path=["response"])
+
+    @parametrize
+    def test_raw_response_list_vectors(self, client: Cloudflare) -> None:
+        response = client.vectorize.indexes.with_raw_response.list_vectors(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        index = response.parse()
+        assert_matches_type(Optional[IndexListVectorsResponse], index, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list_vectors(self, client: Cloudflare) -> None:
+        with client.vectorize.indexes.with_streaming_response.list_vectors(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            index = response.parse()
+            assert_matches_type(Optional[IndexListVectorsResponse], index, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list_vectors(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.vectorize.indexes.with_raw_response.list_vectors(
+                index_name="example-index",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `index_name` but received ''"):
+            client.vectorize.indexes.with_raw_response.list_vectors(
+                index_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
     @parametrize
     def test_method_query(self, client: Cloudflare) -> None:
         index = client.vectorize.indexes.query(
@@ -461,7 +527,7 @@ def test_method_query(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             vector=[0.5, 0.5, 0.5],
         )
-        assert_matches_type(Optional[IndexQuery], index, path=["response"])
+        assert_matches_type(Optional[IndexQueryResponse], index, path=["response"])
 
     @parametrize
     def test_method_query_with_all_params(self, client: Cloudflare) -> None:
@@ -473,11 +539,11 @@ def test_method_query_with_all_params(self, client: Cloudflare) -> None:
                 "has_viewed": {"$ne": True},
                 "streaming_platform": "netflix",
             },
-            return_metadata=True,
+            return_metadata="none",
             return_values=True,
             top_k=5,
         )
-        assert_matches_type(Optional[IndexQuery], index, path=["response"])
+        assert_matches_type(Optional[IndexQueryResponse], index, path=["response"])
 
     @parametrize
     def test_raw_response_query(self, client: Cloudflare) -> None:
@@ -490,7 +556,7 @@ def test_raw_response_query(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         index = response.parse()
-        assert_matches_type(Optional[IndexQuery], index, path=["response"])
+        assert_matches_type(Optional[IndexQueryResponse], index, path=["response"])
 
     @parametrize
     def test_streaming_response_query(self, client: Cloudflare) -> None:
@@ -503,7 +569,7 @@ def test_streaming_response_query(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             index = response.parse()
-            assert_matches_type(Optional[IndexQuery], index, path=["response"])
+            assert_matches_type(Optional[IndexQueryResponse], index, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -531,7 +597,18 @@ def test_method_upsert(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             body=b"raw file contents",
         )
-        assert_matches_type(Optional[IndexUpsert], index, path=["response"])
+        assert_matches_type(Optional[IndexUpsertResponse], index, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_upsert_with_all_params(self, client: Cloudflare) -> None:
+        index = client.vectorize.indexes.upsert(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=b"raw file contents",
+            unparsable_behavior="error",
+        )
+        assert_matches_type(Optional[IndexUpsertResponse], index, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -545,7 +622,7 @@ def test_raw_response_upsert(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         index = response.parse()
-        assert_matches_type(Optional[IndexUpsert], index, path=["response"])
+        assert_matches_type(Optional[IndexUpsertResponse], index, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -559,7 +636,7 @@ def test_streaming_response_upsert(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             index = response.parse()
-            assert_matches_type(Optional[IndexUpsert], index, path=["response"])
+            assert_matches_type(Optional[IndexUpsertResponse], index, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -582,7 +659,9 @@ def test_path_params_upsert(self, client: Cloudflare) -> None:
 
 
 class TestAsyncIndexes:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -655,59 +734,6 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
                 name="example-index",
             )
 
-    @parametrize
-    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        index = await async_client.vectorize.indexes.update(
-            index_name="example-index",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            description="This is my example index.",
-        )
-        assert_matches_type(Optional[CreateIndex], index, path=["response"])
-
-    @parametrize
-    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.vectorize.indexes.with_raw_response.update(
-            index_name="example-index",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            description="This is my example index.",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        index = await response.parse()
-        assert_matches_type(Optional[CreateIndex], index, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.vectorize.indexes.with_streaming_response.update(
-            index_name="example-index",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            description="This is my example index.",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            index = await response.parse()
-            assert_matches_type(Optional[CreateIndex], index, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.vectorize.indexes.with_raw_response.update(
-                index_name="example-index",
-                account_id="",
-                description="This is my example index.",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `index_name` but received ''"):
-            await async_client.vectorize.indexes.with_raw_response.update(
-                index_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                description="This is my example index.",
-            )
-
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         index = await async_client.vectorize.indexes.list(
@@ -752,7 +778,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             index_name="example-index",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(IndexDeleteResponse, index, path=["response"])
+        assert_matches_type(Optional[IndexDeleteResponse], index, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -764,7 +790,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         index = await response.parse()
-        assert_matches_type(IndexDeleteResponse, index, path=["response"])
+        assert_matches_type(Optional[IndexDeleteResponse], index, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -776,7 +802,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             index = await response.parse()
-            assert_matches_type(IndexDeleteResponse, index, path=["response"])
+            assert_matches_type(Optional[IndexDeleteResponse], index, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -800,7 +826,7 @@ async def test_method_delete_by_ids(self, async_client: AsyncCloudflare) -> None
             index_name="example-index",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[IndexDeleteVectorsByID], index, path=["response"])
+        assert_matches_type(Optional[IndexDeleteByIDsResponse], index, path=["response"])
 
     @parametrize
     async def test_method_delete_by_ids_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -809,7 +835,7 @@ async def test_method_delete_by_ids_with_all_params(self, async_client: AsyncClo
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             ids=["5121db81354a40c6aedc3fe1ace51c59", "f90eb49c2107486abdfd78c67e853430"],
         )
-        assert_matches_type(Optional[IndexDeleteVectorsByID], index, path=["response"])
+        assert_matches_type(Optional[IndexDeleteByIDsResponse], index, path=["response"])
 
     @parametrize
     async def test_raw_response_delete_by_ids(self, async_client: AsyncCloudflare) -> None:
@@ -821,7 +847,7 @@ async def test_raw_response_delete_by_ids(self, async_client: AsyncCloudflare) -
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         index = await response.parse()
-        assert_matches_type(Optional[IndexDeleteVectorsByID], index, path=["response"])
+        assert_matches_type(Optional[IndexDeleteByIDsResponse], index, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete_by_ids(self, async_client: AsyncCloudflare) -> None:
@@ -833,7 +859,7 @@ async def test_streaming_response_delete_by_ids(self, async_client: AsyncCloudfl
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             index = await response.parse()
-            assert_matches_type(Optional[IndexDeleteVectorsByID], index, path=["response"])
+            assert_matches_type(Optional[IndexDeleteByIDsResponse], index, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -956,6 +982,54 @@ async def test_path_params_get_by_ids(self, async_client: AsyncCloudflare) -> No
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @parametrize
+    async def test_method_info(self, async_client: AsyncCloudflare) -> None:
+        index = await async_client.vectorize.indexes.info(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[IndexInfoResponse], index, path=["response"])
+
+    @parametrize
+    async def test_raw_response_info(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.vectorize.indexes.with_raw_response.info(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        index = await response.parse()
+        assert_matches_type(Optional[IndexInfoResponse], index, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_info(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.vectorize.indexes.with_streaming_response.info(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            index = await response.parse()
+            assert_matches_type(Optional[IndexInfoResponse], index, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_info(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.vectorize.indexes.with_raw_response.info(
+                index_name="example-index",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `index_name` but received ''"):
+            await async_client.vectorize.indexes.with_raw_response.info(
+                index_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_insert(self, async_client: AsyncCloudflare) -> None:
@@ -964,7 +1038,18 @@ async def test_method_insert(self, async_client: AsyncCloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             body=b"raw file contents",
         )
-        assert_matches_type(Optional[IndexInsert], index, path=["response"])
+        assert_matches_type(Optional[IndexInsertResponse], index, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_insert_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        index = await async_client.vectorize.indexes.insert(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=b"raw file contents",
+            unparsable_behavior="error",
+        )
+        assert_matches_type(Optional[IndexInsertResponse], index, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -978,7 +1063,7 @@ async def test_raw_response_insert(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         index = await response.parse()
-        assert_matches_type(Optional[IndexInsert], index, path=["response"])
+        assert_matches_type(Optional[IndexInsertResponse], index, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -992,7 +1077,7 @@ async def test_streaming_response_insert(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             index = await response.parse()
-            assert_matches_type(Optional[IndexInsert], index, path=["response"])
+            assert_matches_type(Optional[IndexInsertResponse], index, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1013,6 +1098,64 @@ async def test_path_params_insert(self, async_client: AsyncCloudflare) -> None:
                 body=b"raw file contents",
             )
 
+    @parametrize
+    async def test_method_list_vectors(self, async_client: AsyncCloudflare) -> None:
+        index = await async_client.vectorize.indexes.list_vectors(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[IndexListVectorsResponse], index, path=["response"])
+
+    @parametrize
+    async def test_method_list_vectors_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        index = await async_client.vectorize.indexes.list_vectors(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            count=50,
+            cursor="suUTaDY5PFUiRweVccnzyt9n75suNPbXHPshvCzue5mHjtj7Letjvzlza9eGj099",
+        )
+        assert_matches_type(Optional[IndexListVectorsResponse], index, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list_vectors(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.vectorize.indexes.with_raw_response.list_vectors(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        index = await response.parse()
+        assert_matches_type(Optional[IndexListVectorsResponse], index, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list_vectors(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.vectorize.indexes.with_streaming_response.list_vectors(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            index = await response.parse()
+            assert_matches_type(Optional[IndexListVectorsResponse], index, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list_vectors(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.vectorize.indexes.with_raw_response.list_vectors(
+                index_name="example-index",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `index_name` but received ''"):
+            await async_client.vectorize.indexes.with_raw_response.list_vectors(
+                index_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
     @parametrize
     async def test_method_query(self, async_client: AsyncCloudflare) -> None:
         index = await async_client.vectorize.indexes.query(
@@ -1020,7 +1163,7 @@ async def test_method_query(self, async_client: AsyncCloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             vector=[0.5, 0.5, 0.5],
         )
-        assert_matches_type(Optional[IndexQuery], index, path=["response"])
+        assert_matches_type(Optional[IndexQueryResponse], index, path=["response"])
 
     @parametrize
     async def test_method_query_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -1032,11 +1175,11 @@ async def test_method_query_with_all_params(self, async_client: AsyncCloudflare)
                 "has_viewed": {"$ne": True},
                 "streaming_platform": "netflix",
             },
-            return_metadata=True,
+            return_metadata="none",
             return_values=True,
             top_k=5,
         )
-        assert_matches_type(Optional[IndexQuery], index, path=["response"])
+        assert_matches_type(Optional[IndexQueryResponse], index, path=["response"])
 
     @parametrize
     async def test_raw_response_query(self, async_client: AsyncCloudflare) -> None:
@@ -1049,7 +1192,7 @@ async def test_raw_response_query(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         index = await response.parse()
-        assert_matches_type(Optional[IndexQuery], index, path=["response"])
+        assert_matches_type(Optional[IndexQueryResponse], index, path=["response"])
 
     @parametrize
     async def test_streaming_response_query(self, async_client: AsyncCloudflare) -> None:
@@ -1062,7 +1205,7 @@ async def test_streaming_response_query(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             index = await response.parse()
-            assert_matches_type(Optional[IndexQuery], index, path=["response"])
+            assert_matches_type(Optional[IndexQueryResponse], index, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -1090,7 +1233,18 @@ async def test_method_upsert(self, async_client: AsyncCloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             body=b"raw file contents",
         )
-        assert_matches_type(Optional[IndexUpsert], index, path=["response"])
+        assert_matches_type(Optional[IndexUpsertResponse], index, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_upsert_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        index = await async_client.vectorize.indexes.upsert(
+            index_name="example-index",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=b"raw file contents",
+            unparsable_behavior="error",
+        )
+        assert_matches_type(Optional[IndexUpsertResponse], index, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1104,7 +1258,7 @@ async def test_raw_response_upsert(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         index = await response.parse()
-        assert_matches_type(Optional[IndexUpsert], index, path=["response"])
+        assert_matches_type(Optional[IndexUpsertResponse], index, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -1118,7 +1272,7 @@ async def test_streaming_response_upsert(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             index = await response.parse()
-            assert_matches_type(Optional[IndexUpsert], index, path=["response"])
+            assert_matches_type(Optional[IndexUpsertResponse], index, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/waiting_rooms/events/test_details.py b/tests/api_resources/waiting_rooms/events/test_details.py
index c164f78f6b8..efd4a6b83a1 100644
--- a/tests/api_resources/waiting_rooms/events/test_details.py
+++ b/tests/api_resources/waiting_rooms/events/test_details.py
@@ -79,7 +79,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncDetails:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/waiting_rooms/test_events.py b/tests/api_resources/waiting_rooms/test_events.py
index b416ff77d57..b7615210e18 100644
--- a/tests/api_resources/waiting_rooms/test_events.py
+++ b/tests/api_resources/waiting_rooms/test_events.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.waiting_rooms import (
     Event,
     EventDeleteResponse,
@@ -50,6 +50,8 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             shuffle_at_event_start=True,
             suspended=True,
             total_active_users=200,
+            turnstile_action="log",
+            turnstile_mode="off",
         )
         assert_matches_type(Event, event, path=["response"])
 
@@ -136,6 +138,8 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             shuffle_at_event_start=True,
             suspended=True,
             total_active_users=200,
+            turnstile_action="log",
+            turnstile_mode="off",
         )
         assert_matches_type(Event, event, path=["response"])
 
@@ -211,17 +215,17 @@ def test_method_list(self, client: Cloudflare) -> None:
             waiting_room_id="699d98642c564d2e855e9661899b7252",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncSinglePage[Event], event, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Event], event, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         event = client.waiting_rooms.events.list(
             waiting_room_id="699d98642c564d2e855e9661899b7252",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            page={},
-            per_page={},
+            page=1,
+            per_page=5,
         )
-        assert_matches_type(SyncSinglePage[Event], event, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Event], event, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -233,7 +237,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         event = response.parse()
-        assert_matches_type(SyncSinglePage[Event], event, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Event], event, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -245,7 +249,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             event = response.parse()
-            assert_matches_type(SyncSinglePage[Event], event, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[Event], event, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -354,6 +358,8 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
             shuffle_at_event_start=True,
             suspended=True,
             total_active_users=200,
+            turnstile_action="log",
+            turnstile_mode="off",
         )
         assert_matches_type(Event, event, path=["response"])
 
@@ -485,7 +491,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncEvents:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -516,6 +524,8 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             shuffle_at_event_start=True,
             suspended=True,
             total_active_users=200,
+            turnstile_action="log",
+            turnstile_mode="off",
         )
         assert_matches_type(Event, event, path=["response"])
 
@@ -602,6 +612,8 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             shuffle_at_event_start=True,
             suspended=True,
             total_active_users=200,
+            turnstile_action="log",
+            turnstile_mode="off",
         )
         assert_matches_type(Event, event, path=["response"])
 
@@ -677,17 +689,17 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
             waiting_room_id="699d98642c564d2e855e9661899b7252",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncSinglePage[Event], event, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Event], event, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         event = await async_client.waiting_rooms.events.list(
             waiting_room_id="699d98642c564d2e855e9661899b7252",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            page={},
-            per_page={},
+            page=1,
+            per_page=5,
         )
-        assert_matches_type(AsyncSinglePage[Event], event, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Event], event, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -699,7 +711,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         event = await response.parse()
-        assert_matches_type(AsyncSinglePage[Event], event, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Event], event, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -711,7 +723,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             event = await response.parse()
-            assert_matches_type(AsyncSinglePage[Event], event, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[Event], event, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -820,6 +832,8 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
             shuffle_at_event_start=True,
             suspended=True,
             total_active_users=200,
+            turnstile_action="log",
+            turnstile_mode="off",
         )
         assert_matches_type(Event, event, path=["response"])
 
diff --git a/tests/api_resources/waiting_rooms/test_page.py b/tests/api_resources/waiting_rooms/test_page.py
index 881d9a3a906..e7f87c79d0d 100644
--- a/tests/api_resources/waiting_rooms/test_page.py
+++ b/tests/api_resources/waiting_rooms/test_page.py
@@ -61,7 +61,9 @@ def test_path_params_preview(self, client: Cloudflare) -> None:
 
 
 class TestAsyncPage:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_preview(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/waiting_rooms/test_rules.py b/tests/api_resources/waiting_rooms/test_rules.py
index cb79bc2716b..7861f9bfe4a 100644
--- a/tests/api_resources/waiting_rooms/test_rules.py
+++ b/tests/api_resources/waiting_rooms/test_rules.py
@@ -3,20 +3,14 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.waiting_rooms import (
-    WaitingRoomRule,
-    RuleEditResponse,
-    RuleCreateResponse,
-    RuleDeleteResponse,
-    RuleUpdateResponse,
-)
+from cloudflare.types.waiting_rooms import WaitingRoomRule
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -29,50 +23,58 @@ def test_method_create(self, client: Cloudflare) -> None:
         rule = client.waiting_rooms.rules.create(
             waiting_room_id="699d98642c564d2e855e9661899b7252",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            action="bypass_waiting_room",
-            expression="ip.src in {10.20.30.40}",
+            rules={
+                "action": "bypass_waiting_room",
+                "expression": "ip.src in {10.20.30.40}",
+            },
         )
-        assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+        assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         rule = client.waiting_rooms.rules.create(
             waiting_room_id="699d98642c564d2e855e9661899b7252",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            action="bypass_waiting_room",
-            expression="ip.src in {10.20.30.40}",
-            description="allow all traffic from 10.20.30.40",
-            enabled=True,
+            rules={
+                "action": "bypass_waiting_room",
+                "expression": "ip.src in {10.20.30.40}",
+                "description": "allow all traffic from 10.20.30.40",
+                "enabled": True,
+            },
         )
-        assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+        assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.waiting_rooms.rules.with_raw_response.create(
             waiting_room_id="699d98642c564d2e855e9661899b7252",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            action="bypass_waiting_room",
-            expression="ip.src in {10.20.30.40}",
+            rules={
+                "action": "bypass_waiting_room",
+                "expression": "ip.src in {10.20.30.40}",
+            },
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rule = response.parse()
-        assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+        assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.waiting_rooms.rules.with_streaming_response.create(
             waiting_room_id="699d98642c564d2e855e9661899b7252",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            action="bypass_waiting_room",
-            expression="ip.src in {10.20.30.40}",
+            rules={
+                "action": "bypass_waiting_room",
+                "expression": "ip.src in {10.20.30.40}",
+            },
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             rule = response.parse()
-            assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+            assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -82,16 +84,20 @@ def test_path_params_create(self, client: Cloudflare) -> None:
             client.waiting_rooms.rules.with_raw_response.create(
                 waiting_room_id="699d98642c564d2e855e9661899b7252",
                 zone_id="",
-                action="bypass_waiting_room",
-                expression="ip.src in {10.20.30.40}",
+                rules={
+                    "action": "bypass_waiting_room",
+                    "expression": "ip.src in {10.20.30.40}",
+                },
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `waiting_room_id` but received ''"):
             client.waiting_rooms.rules.with_raw_response.create(
                 waiting_room_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                action="bypass_waiting_room",
-                expression="ip.src in {10.20.30.40}",
+                rules={
+                    "action": "bypass_waiting_room",
+                    "expression": "ip.src in {10.20.30.40}",
+                },
             )
 
     @parametrize
@@ -99,74 +105,50 @@ def test_method_update(self, client: Cloudflare) -> None:
         rule = client.waiting_rooms.rules.update(
             waiting_room_id="699d98642c564d2e855e9661899b7252",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[
+            rules=[
                 {
                     "action": "bypass_waiting_room",
                     "expression": "ip.src in {10.20.30.40}",
-                },
-                {
-                    "action": "bypass_waiting_room",
-                    "expression": "ip.src in {10.20.30.40}",
-                },
-                {
-                    "action": "bypass_waiting_room",
-                    "expression": "ip.src in {10.20.30.40}",
-                },
+                }
             ],
         )
-        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+        assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.waiting_rooms.rules.with_raw_response.update(
             waiting_room_id="699d98642c564d2e855e9661899b7252",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[
-                {
-                    "action": "bypass_waiting_room",
-                    "expression": "ip.src in {10.20.30.40}",
-                },
+            rules=[
                 {
                     "action": "bypass_waiting_room",
                     "expression": "ip.src in {10.20.30.40}",
-                },
-                {
-                    "action": "bypass_waiting_room",
-                    "expression": "ip.src in {10.20.30.40}",
-                },
+                }
             ],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rule = response.parse()
-        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+        assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.waiting_rooms.rules.with_streaming_response.update(
             waiting_room_id="699d98642c564d2e855e9661899b7252",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[
-                {
-                    "action": "bypass_waiting_room",
-                    "expression": "ip.src in {10.20.30.40}",
-                },
+            rules=[
                 {
                     "action": "bypass_waiting_room",
                     "expression": "ip.src in {10.20.30.40}",
-                },
-                {
-                    "action": "bypass_waiting_room",
-                    "expression": "ip.src in {10.20.30.40}",
-                },
+                }
             ],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             rule = response.parse()
-            assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+            assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -176,19 +158,11 @@ def test_path_params_update(self, client: Cloudflare) -> None:
             client.waiting_rooms.rules.with_raw_response.update(
                 waiting_room_id="699d98642c564d2e855e9661899b7252",
                 zone_id="",
-                body=[
-                    {
-                        "action": "bypass_waiting_room",
-                        "expression": "ip.src in {10.20.30.40}",
-                    },
+                rules=[
                     {
                         "action": "bypass_waiting_room",
                         "expression": "ip.src in {10.20.30.40}",
-                    },
-                    {
-                        "action": "bypass_waiting_room",
-                        "expression": "ip.src in {10.20.30.40}",
-                    },
+                    }
                 ],
             )
 
@@ -196,70 +170,14 @@ def test_path_params_update(self, client: Cloudflare) -> None:
             client.waiting_rooms.rules.with_raw_response.update(
                 waiting_room_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body=[
-                    {
-                        "action": "bypass_waiting_room",
-                        "expression": "ip.src in {10.20.30.40}",
-                    },
+                rules=[
                     {
                         "action": "bypass_waiting_room",
                         "expression": "ip.src in {10.20.30.40}",
-                    },
-                    {
-                        "action": "bypass_waiting_room",
-                        "expression": "ip.src in {10.20.30.40}",
-                    },
+                    }
                 ],
             )
 
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        rule = client.waiting_rooms.rules.list(
-            waiting_room_id="699d98642c564d2e855e9661899b7252",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.waiting_rooms.rules.with_raw_response.list(
-            waiting_room_id="699d98642c564d2e855e9661899b7252",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        rule = response.parse()
-        assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.waiting_rooms.rules.with_streaming_response.list(
-            waiting_room_id="699d98642c564d2e855e9661899b7252",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            rule = response.parse()
-            assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.waiting_rooms.rules.with_raw_response.list(
-                waiting_room_id="699d98642c564d2e855e9661899b7252",
-                zone_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `waiting_room_id` but received ''"):
-            client.waiting_rooms.rules.with_raw_response.list(
-                waiting_room_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         rule = client.waiting_rooms.rules.delete(
@@ -267,7 +185,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             waiting_room_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(Optional[RuleDeleteResponse], rule, path=["response"])
+        assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -280,7 +198,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rule = response.parse()
-        assert_matches_type(Optional[RuleDeleteResponse], rule, path=["response"])
+        assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -293,7 +211,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             rule = response.parse()
-            assert_matches_type(Optional[RuleDeleteResponse], rule, path=["response"])
+            assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -329,7 +247,7 @@ def test_method_edit(self, client: Cloudflare) -> None:
             action="bypass_waiting_room",
             expression="ip.src in {10.20.30.40}",
         )
-        assert_matches_type(Optional[RuleEditResponse], rule, path=["response"])
+        assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
@@ -343,7 +261,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
             enabled=True,
             position={"index": 0},
         )
-        assert_matches_type(Optional[RuleEditResponse], rule, path=["response"])
+        assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
@@ -358,7 +276,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rule = response.parse()
-        assert_matches_type(Optional[RuleEditResponse], rule, path=["response"])
+        assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
@@ -373,7 +291,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             rule = response.parse()
-            assert_matches_type(Optional[RuleEditResponse], rule, path=["response"])
+            assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -406,59 +324,117 @@ def test_path_params_edit(self, client: Cloudflare) -> None:
                 expression="ip.src in {10.20.30.40}",
             )
 
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        rule = client.waiting_rooms.rules.get(
+            waiting_room_id="699d98642c564d2e855e9661899b7252",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.waiting_rooms.rules.with_raw_response.get(
+            waiting_room_id="699d98642c564d2e855e9661899b7252",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.waiting_rooms.rules.with_streaming_response.get(
+            waiting_room_id="699d98642c564d2e855e9661899b7252",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = response.parse()
+            assert_matches_type(SyncSinglePage[WaitingRoomRule], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.waiting_rooms.rules.with_raw_response.get(
+                waiting_room_id="699d98642c564d2e855e9661899b7252",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `waiting_room_id` but received ''"):
+            client.waiting_rooms.rules.with_raw_response.get(
+                waiting_room_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
 
 class TestAsyncRules:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         rule = await async_client.waiting_rooms.rules.create(
             waiting_room_id="699d98642c564d2e855e9661899b7252",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            action="bypass_waiting_room",
-            expression="ip.src in {10.20.30.40}",
+            rules={
+                "action": "bypass_waiting_room",
+                "expression": "ip.src in {10.20.30.40}",
+            },
         )
-        assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         rule = await async_client.waiting_rooms.rules.create(
             waiting_room_id="699d98642c564d2e855e9661899b7252",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            action="bypass_waiting_room",
-            expression="ip.src in {10.20.30.40}",
-            description="allow all traffic from 10.20.30.40",
-            enabled=True,
+            rules={
+                "action": "bypass_waiting_room",
+                "expression": "ip.src in {10.20.30.40}",
+                "description": "allow all traffic from 10.20.30.40",
+                "enabled": True,
+            },
         )
-        assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.waiting_rooms.rules.with_raw_response.create(
             waiting_room_id="699d98642c564d2e855e9661899b7252",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            action="bypass_waiting_room",
-            expression="ip.src in {10.20.30.40}",
+            rules={
+                "action": "bypass_waiting_room",
+                "expression": "ip.src in {10.20.30.40}",
+            },
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rule = await response.parse()
-        assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.waiting_rooms.rules.with_streaming_response.create(
             waiting_room_id="699d98642c564d2e855e9661899b7252",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            action="bypass_waiting_room",
-            expression="ip.src in {10.20.30.40}",
+            rules={
+                "action": "bypass_waiting_room",
+                "expression": "ip.src in {10.20.30.40}",
+            },
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             rule = await response.parse()
-            assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+            assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -468,16 +444,20 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
             await async_client.waiting_rooms.rules.with_raw_response.create(
                 waiting_room_id="699d98642c564d2e855e9661899b7252",
                 zone_id="",
-                action="bypass_waiting_room",
-                expression="ip.src in {10.20.30.40}",
+                rules={
+                    "action": "bypass_waiting_room",
+                    "expression": "ip.src in {10.20.30.40}",
+                },
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `waiting_room_id` but received ''"):
             await async_client.waiting_rooms.rules.with_raw_response.create(
                 waiting_room_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                action="bypass_waiting_room",
-                expression="ip.src in {10.20.30.40}",
+                rules={
+                    "action": "bypass_waiting_room",
+                    "expression": "ip.src in {10.20.30.40}",
+                },
             )
 
     @parametrize
@@ -485,74 +465,50 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         rule = await async_client.waiting_rooms.rules.update(
             waiting_room_id="699d98642c564d2e855e9661899b7252",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[
+            rules=[
                 {
                     "action": "bypass_waiting_room",
                     "expression": "ip.src in {10.20.30.40}",
-                },
-                {
-                    "action": "bypass_waiting_room",
-                    "expression": "ip.src in {10.20.30.40}",
-                },
-                {
-                    "action": "bypass_waiting_room",
-                    "expression": "ip.src in {10.20.30.40}",
-                },
+                }
             ],
         )
-        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.waiting_rooms.rules.with_raw_response.update(
             waiting_room_id="699d98642c564d2e855e9661899b7252",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[
-                {
-                    "action": "bypass_waiting_room",
-                    "expression": "ip.src in {10.20.30.40}",
-                },
+            rules=[
                 {
                     "action": "bypass_waiting_room",
                     "expression": "ip.src in {10.20.30.40}",
-                },
-                {
-                    "action": "bypass_waiting_room",
-                    "expression": "ip.src in {10.20.30.40}",
-                },
+                }
             ],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rule = await response.parse()
-        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.waiting_rooms.rules.with_streaming_response.update(
             waiting_room_id="699d98642c564d2e855e9661899b7252",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body=[
-                {
-                    "action": "bypass_waiting_room",
-                    "expression": "ip.src in {10.20.30.40}",
-                },
+            rules=[
                 {
                     "action": "bypass_waiting_room",
                     "expression": "ip.src in {10.20.30.40}",
-                },
-                {
-                    "action": "bypass_waiting_room",
-                    "expression": "ip.src in {10.20.30.40}",
-                },
+                }
             ],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             rule = await response.parse()
-            assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+            assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -562,19 +518,11 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
             await async_client.waiting_rooms.rules.with_raw_response.update(
                 waiting_room_id="699d98642c564d2e855e9661899b7252",
                 zone_id="",
-                body=[
-                    {
-                        "action": "bypass_waiting_room",
-                        "expression": "ip.src in {10.20.30.40}",
-                    },
+                rules=[
                     {
                         "action": "bypass_waiting_room",
                         "expression": "ip.src in {10.20.30.40}",
-                    },
-                    {
-                        "action": "bypass_waiting_room",
-                        "expression": "ip.src in {10.20.30.40}",
-                    },
+                    }
                 ],
             )
 
@@ -582,70 +530,14 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
             await async_client.waiting_rooms.rules.with_raw_response.update(
                 waiting_room_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body=[
-                    {
-                        "action": "bypass_waiting_room",
-                        "expression": "ip.src in {10.20.30.40}",
-                    },
+                rules=[
                     {
                         "action": "bypass_waiting_room",
                         "expression": "ip.src in {10.20.30.40}",
-                    },
-                    {
-                        "action": "bypass_waiting_room",
-                        "expression": "ip.src in {10.20.30.40}",
-                    },
+                    }
                 ],
             )
 
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        rule = await async_client.waiting_rooms.rules.list(
-            waiting_room_id="699d98642c564d2e855e9661899b7252",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.waiting_rooms.rules.with_raw_response.list(
-            waiting_room_id="699d98642c564d2e855e9661899b7252",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        rule = await response.parse()
-        assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.waiting_rooms.rules.with_streaming_response.list(
-            waiting_room_id="699d98642c564d2e855e9661899b7252",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            rule = await response.parse()
-            assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.waiting_rooms.rules.with_raw_response.list(
-                waiting_room_id="699d98642c564d2e855e9661899b7252",
-                zone_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `waiting_room_id` but received ''"):
-            await async_client.waiting_rooms.rules.with_raw_response.list(
-                waiting_room_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         rule = await async_client.waiting_rooms.rules.delete(
@@ -653,7 +545,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             waiting_room_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(Optional[RuleDeleteResponse], rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -666,7 +558,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rule = await response.parse()
-        assert_matches_type(Optional[RuleDeleteResponse], rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -679,7 +571,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             rule = await response.parse()
-            assert_matches_type(Optional[RuleDeleteResponse], rule, path=["response"])
+            assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -715,7 +607,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
             action="bypass_waiting_room",
             expression="ip.src in {10.20.30.40}",
         )
-        assert_matches_type(Optional[RuleEditResponse], rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -729,7 +621,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
             enabled=True,
             position={"index": 0},
         )
-        assert_matches_type(Optional[RuleEditResponse], rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -744,7 +636,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rule = await response.parse()
-        assert_matches_type(Optional[RuleEditResponse], rule, path=["response"])
+        assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -759,7 +651,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             rule = await response.parse()
-            assert_matches_type(Optional[RuleEditResponse], rule, path=["response"])
+            assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -791,3 +683,51 @@ async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
                 action="bypass_waiting_room",
                 expression="ip.src in {10.20.30.40}",
             )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.waiting_rooms.rules.get(
+            waiting_room_id="699d98642c564d2e855e9661899b7252",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.waiting_rooms.rules.with_raw_response.get(
+            waiting_room_id="699d98642c564d2e855e9661899b7252",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.waiting_rooms.rules.with_streaming_response.get(
+            waiting_room_id="699d98642c564d2e855e9661899b7252",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = await response.parse()
+            assert_matches_type(AsyncSinglePage[WaitingRoomRule], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.waiting_rooms.rules.with_raw_response.get(
+                waiting_room_id="699d98642c564d2e855e9661899b7252",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `waiting_room_id` but received ''"):
+            await async_client.waiting_rooms.rules.with_raw_response.get(
+                waiting_room_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/waiting_rooms/test_settings.py b/tests/api_resources/waiting_rooms/test_settings.py
index 823c9e02011..787b1c36e75 100644
--- a/tests/api_resources/waiting_rooms/test_settings.py
+++ b/tests/api_resources/waiting_rooms/test_settings.py
@@ -153,7 +153,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSettings:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/waiting_rooms/test_statuses.py b/tests/api_resources/waiting_rooms/test_statuses.py
index 5ca8f12dbec..3c06812d4e3 100644
--- a/tests/api_resources/waiting_rooms/test_statuses.py
+++ b/tests/api_resources/waiting_rooms/test_statuses.py
@@ -67,7 +67,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncStatuses:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/web3/hostnames/ipfs_universal_paths/content_lists/test_entries.py b/tests/api_resources/web3/hostnames/ipfs_universal_paths/content_lists/test_entries.py
index af0aba72b11..6c2e96fbf7f 100644
--- a/tests/api_resources/web3/hostnames/ipfs_universal_paths/content_lists/test_entries.py
+++ b/tests/api_resources/web3/hostnames/ipfs_universal_paths/content_lists/test_entries.py
@@ -27,7 +27,7 @@ class TestEntries:
     def test_method_create(self, client: Cloudflare) -> None:
         entry = client.web3.hostnames.ipfs_universal_paths.content_lists.entries.create(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
             type="cid",
         )
@@ -37,7 +37,7 @@ def test_method_create(self, client: Cloudflare) -> None:
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         entry = client.web3.hostnames.ipfs_universal_paths.content_lists.entries.create(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
             type="cid",
             description="this is my content list entry",
@@ -48,7 +48,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.create(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
             type="cid",
         )
@@ -62,7 +62,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_streaming_response.create(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
             type="cid",
         ) as response:
@@ -76,10 +76,10 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.create(
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
                 content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
                 type="cid",
             )
@@ -87,7 +87,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.create(
                 identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
                 type="cid",
             )
@@ -96,7 +96,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
     def test_method_update(self, client: Cloudflare) -> None:
         entry = client.web3.hostnames.ipfs_universal_paths.content_lists.entries.update(
             content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
             content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
             type="cid",
@@ -107,7 +107,7 @@ def test_method_update(self, client: Cloudflare) -> None:
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         entry = client.web3.hostnames.ipfs_universal_paths.content_lists.entries.update(
             content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
             content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
             type="cid",
@@ -119,7 +119,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.update(
             content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
             content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
             type="cid",
@@ -134,7 +134,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_streaming_response.update(
             content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
             content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
             type="cid",
@@ -149,10 +149,10 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.update(
                 content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
                 content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
                 type="cid",
@@ -161,7 +161,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.update(
                 content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 identifier="",
                 content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
                 type="cid",
@@ -172,7 +172,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
         ):
             client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.update(
                 content_list_entry_identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
                 content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
                 type="cid",
@@ -182,7 +182,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
     def test_method_list(self, client: Cloudflare) -> None:
         entry = client.web3.hostnames.ipfs_universal_paths.content_lists.entries.list(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[EntryListResponse], entry, path=["response"])
 
@@ -190,7 +190,7 @@ def test_method_list(self, client: Cloudflare) -> None:
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.list(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -202,7 +202,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_streaming_response.list(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -214,23 +214,23 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.list(
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.list(
                 identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         entry = client.web3.hostnames.ipfs_universal_paths.content_lists.entries.delete(
             content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[EntryDeleteResponse], entry, path=["response"])
@@ -239,7 +239,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.delete(
             content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -252,7 +252,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_streaming_response.delete(
             content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -265,17 +265,17 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.delete(
                 content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.delete(
                 content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 identifier="",
             )
 
@@ -284,7 +284,7 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
         ):
             client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.delete(
                 content_list_entry_identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
@@ -292,7 +292,7 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
     def test_method_get(self, client: Cloudflare) -> None:
         entry = client.web3.hostnames.ipfs_universal_paths.content_lists.entries.get(
             content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(EntryGetResponse, entry, path=["response"])
@@ -301,7 +301,7 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.get(
             content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -314,7 +314,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_streaming_response.get(
             content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -327,17 +327,17 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.get(
                 content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.get(
                 content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 identifier="",
             )
 
@@ -346,19 +346,21 @@ def test_path_params_get(self, client: Cloudflare) -> None:
         ):
             client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.get(
                 content_list_entry_identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
 
 class TestAsyncEntries:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         entry = await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.create(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
             type="cid",
         )
@@ -368,7 +370,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         entry = await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.create(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
             type="cid",
             description="this is my content list entry",
@@ -380,7 +382,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = (
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.create(
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
                 type="cid",
             )
@@ -393,11 +395,13 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_streaming_response.create(
-            identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
-            type="cid",
+        async with (
+            async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_streaming_response.create(
+                identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
+                type="cid",
+            )
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -409,10 +413,10 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.create(
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
                 content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
                 type="cid",
             )
@@ -420,7 +424,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.create(
                 identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
                 type="cid",
             )
@@ -429,7 +433,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         entry = await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.update(
             content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
             content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
             type="cid",
@@ -440,7 +444,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         entry = await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.update(
             content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
             content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
             type="cid",
@@ -453,7 +457,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = (
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.update(
                 content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
                 content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
                 type="cid",
@@ -467,12 +471,14 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_streaming_response.update(
-            content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
-            type="cid",
+        async with (
+            async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_streaming_response.update(
+                content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
+                type="cid",
+            )
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -484,10 +490,10 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.update(
                 content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
                 content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
                 type="cid",
@@ -496,7 +502,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.update(
                 content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 identifier="",
                 content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
                 type="cid",
@@ -507,7 +513,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         ):
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.update(
                 content_list_entry_identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
                 content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB",
                 type="cid",
@@ -517,7 +523,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         entry = await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.list(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[EntryListResponse], entry, path=["response"])
 
@@ -525,7 +531,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.list(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -537,7 +543,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_streaming_response.list(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -549,23 +555,23 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.list(
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.list(
                 identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         entry = await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.delete(
             content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[EntryDeleteResponse], entry, path=["response"])
@@ -575,7 +581,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = (
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.delete(
                 content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
             )
         )
@@ -587,10 +593,12 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_streaming_response.delete(
-            content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            identifier="023e105f4ecef8ad9ca31a8372d0c353",
+        async with (
+            async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_streaming_response.delete(
+                content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            )
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -602,17 +610,17 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.delete(
                 content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.delete(
                 content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 identifier="",
             )
 
@@ -621,7 +629,7 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         ):
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.delete(
                 content_list_entry_identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
@@ -629,7 +637,7 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         entry = await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.get(
             content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(EntryGetResponse, entry, path=["response"])
@@ -638,7 +646,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.get(
             content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
@@ -651,7 +659,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_streaming_response.get(
             content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
@@ -664,17 +672,17 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.get(
                 content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.get(
                 content_list_entry_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 identifier="",
             )
 
@@ -683,6 +691,6 @@ async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         ):
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.entries.with_raw_response.get(
                 content_list_entry_identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/web3/hostnames/ipfs_universal_paths/test_content_lists.py b/tests/api_resources/web3/hostnames/ipfs_universal_paths/test_content_lists.py
index 1721a0e5ffe..e83927a314f 100644
--- a/tests/api_resources/web3/hostnames/ipfs_universal_paths/test_content_lists.py
+++ b/tests/api_resources/web3/hostnames/ipfs_universal_paths/test_content_lists.py
@@ -21,9 +21,9 @@ class TestContentLists:
     def test_method_update(self, client: Cloudflare) -> None:
         content_list = client.web3.hostnames.ipfs_universal_paths.content_lists.update(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             action="block",
-            entries=[{}, {}, {}],
+            entries=[{}],
         )
         assert_matches_type(ContentList, content_list, path=["response"])
 
@@ -31,9 +31,9 @@ def test_method_update(self, client: Cloudflare) -> None:
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.web3.hostnames.ipfs_universal_paths.content_lists.with_raw_response.update(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             action="block",
-            entries=[{}, {}, {}],
+            entries=[{}],
         )
 
         assert response.is_closed is True
@@ -45,9 +45,9 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.web3.hostnames.ipfs_universal_paths.content_lists.with_streaming_response.update(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             action="block",
-            entries=[{}, {}, {}],
+            entries=[{}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -59,27 +59,27 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.web3.hostnames.ipfs_universal_paths.content_lists.with_raw_response.update(
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
                 action="block",
-                entries=[{}, {}, {}],
+                entries=[{}],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             client.web3.hostnames.ipfs_universal_paths.content_lists.with_raw_response.update(
                 identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 action="block",
-                entries=[{}, {}, {}],
+                entries=[{}],
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         content_list = client.web3.hostnames.ipfs_universal_paths.content_lists.get(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(ContentList, content_list, path=["response"])
 
@@ -87,7 +87,7 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.web3.hostnames.ipfs_universal_paths.content_lists.with_raw_response.get(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -99,7 +99,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.web3.hostnames.ipfs_universal_paths.content_lists.with_streaming_response.get(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -111,29 +111,31 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.web3.hostnames.ipfs_universal_paths.content_lists.with_raw_response.get(
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             client.web3.hostnames.ipfs_universal_paths.content_lists.with_raw_response.get(
                 identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
 
 class TestAsyncContentLists:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         content_list = await async_client.web3.hostnames.ipfs_universal_paths.content_lists.update(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             action="block",
-            entries=[{}, {}, {}],
+            entries=[{}],
         )
         assert_matches_type(ContentList, content_list, path=["response"])
 
@@ -141,9 +143,9 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.web3.hostnames.ipfs_universal_paths.content_lists.with_raw_response.update(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             action="block",
-            entries=[{}, {}, {}],
+            entries=[{}],
         )
 
         assert response.is_closed is True
@@ -155,9 +157,9 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.web3.hostnames.ipfs_universal_paths.content_lists.with_streaming_response.update(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             action="block",
-            entries=[{}, {}, {}],
+            entries=[{}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -169,27 +171,27 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.with_raw_response.update(
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
                 action="block",
-                entries=[{}, {}, {}],
+                entries=[{}],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.with_raw_response.update(
                 identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
                 action="block",
-                entries=[{}, {}, {}],
+                entries=[{}],
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         content_list = await async_client.web3.hostnames.ipfs_universal_paths.content_lists.get(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(ContentList, content_list, path=["response"])
 
@@ -197,7 +199,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.web3.hostnames.ipfs_universal_paths.content_lists.with_raw_response.get(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -209,7 +211,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.web3.hostnames.ipfs_universal_paths.content_lists.with_streaming_response.get(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -221,14 +223,14 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.with_raw_response.get(
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             await async_client.web3.hostnames.ipfs_universal_paths.content_lists.with_raw_response.get(
                 identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/web3/test_hostnames.py b/tests/api_resources/web3/test_hostnames.py
index 563cd35edd3..a53bf0c2b0d 100644
--- a/tests/api_resources/web3/test_hostnames.py
+++ b/tests/api_resources/web3/test_hostnames.py
@@ -21,7 +21,8 @@ class TestHostnames:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         hostname = client.web3.hostnames.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="gateway.example.com",
             target="ipfs",
         )
         assert_matches_type(Hostname, hostname, path=["response"])
@@ -29,7 +30,8 @@ def test_method_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         hostname = client.web3.hostnames.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="gateway.example.com",
             target="ipfs",
             description="This is my IPFS gateway.",
             dnslink="/ipns/onboarding.ipfs.cloudflare.com",
@@ -39,7 +41,8 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.web3.hostnames.with_raw_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="gateway.example.com",
             target="ipfs",
         )
 
@@ -51,7 +54,8 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.web3.hostnames.with_streaming_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="gateway.example.com",
             target="ipfs",
         ) as response:
             assert not response.is_closed
@@ -64,23 +68,24 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.web3.hostnames.with_raw_response.create(
-                zone_identifier="",
+                zone_id="",
+                name="gateway.example.com",
                 target="ipfs",
             )
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         hostname = client.web3.hostnames.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(SyncSinglePage[Hostname], hostname, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.web3.hostnames.with_raw_response.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -91,7 +96,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.web3.hostnames.with_streaming_response.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -103,16 +108,16 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.web3.hostnames.with_raw_response.list(
-                "",
+                zone_id="",
             )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         hostname = client.web3.hostnames.delete(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[HostnameDeleteResponse], hostname, path=["response"])
 
@@ -120,7 +125,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.web3.hostnames.with_raw_response.delete(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -132,7 +137,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.web3.hostnames.with_streaming_response.delete(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -144,23 +149,23 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.web3.hostnames.with_raw_response.delete(
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             client.web3.hostnames.with_raw_response.delete(
                 identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_edit(self, client: Cloudflare) -> None:
         hostname = client.web3.hostnames.edit(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Hostname, hostname, path=["response"])
 
@@ -168,7 +173,7 @@ def test_method_edit(self, client: Cloudflare) -> None:
     def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
         hostname = client.web3.hostnames.edit(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             description="This is my IPFS gateway.",
             dnslink="/ipns/onboarding.ipfs.cloudflare.com",
         )
@@ -178,7 +183,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
     def test_raw_response_edit(self, client: Cloudflare) -> None:
         response = client.web3.hostnames.with_raw_response.edit(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -190,7 +195,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
         with client.web3.hostnames.with_streaming_response.edit(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -202,23 +207,23 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_edit(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.web3.hostnames.with_raw_response.edit(
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             client.web3.hostnames.with_raw_response.edit(
                 identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         hostname = client.web3.hostnames.get(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Hostname, hostname, path=["response"])
 
@@ -226,7 +231,7 @@ def test_method_get(self, client: Cloudflare) -> None:
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.web3.hostnames.with_raw_response.get(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -238,7 +243,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.web3.hostnames.with_streaming_response.get(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -250,26 +255,29 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.web3.hostnames.with_raw_response.get(
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             client.web3.hostnames.with_raw_response.get(
                 identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
 
 class TestAsyncHostnames:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         hostname = await async_client.web3.hostnames.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="gateway.example.com",
             target="ipfs",
         )
         assert_matches_type(Hostname, hostname, path=["response"])
@@ -277,7 +285,8 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         hostname = await async_client.web3.hostnames.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="gateway.example.com",
             target="ipfs",
             description="This is my IPFS gateway.",
             dnslink="/ipns/onboarding.ipfs.cloudflare.com",
@@ -287,7 +296,8 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.web3.hostnames.with_raw_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="gateway.example.com",
             target="ipfs",
         )
 
@@ -299,7 +309,8 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.web3.hostnames.with_streaming_response.create(
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="gateway.example.com",
             target="ipfs",
         ) as response:
             assert not response.is_closed
@@ -312,23 +323,24 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.web3.hostnames.with_raw_response.create(
-                zone_identifier="",
+                zone_id="",
+                name="gateway.example.com",
                 target="ipfs",
             )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         hostname = await async_client.web3.hostnames.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(AsyncSinglePage[Hostname], hostname, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.web3.hostnames.with_raw_response.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -339,7 +351,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.web3.hostnames.with_streaming_response.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -351,16 +363,16 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.web3.hostnames.with_raw_response.list(
-                "",
+                zone_id="",
             )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         hostname = await async_client.web3.hostnames.delete(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Optional[HostnameDeleteResponse], hostname, path=["response"])
 
@@ -368,7 +380,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.web3.hostnames.with_raw_response.delete(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -380,7 +392,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.web3.hostnames.with_streaming_response.delete(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -392,23 +404,23 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.web3.hostnames.with_raw_response.delete(
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             await async_client.web3.hostnames.with_raw_response.delete(
                 identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
         hostname = await async_client.web3.hostnames.edit(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Hostname, hostname, path=["response"])
 
@@ -416,7 +428,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
     async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
         hostname = await async_client.web3.hostnames.edit(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             description="This is my IPFS gateway.",
             dnslink="/ipns/onboarding.ipfs.cloudflare.com",
         )
@@ -426,7 +438,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.web3.hostnames.with_raw_response.edit(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -438,7 +450,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
         async with async_client.web3.hostnames.with_streaming_response.edit(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -450,23 +462,23 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
 
     @parametrize
     async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.web3.hostnames.with_raw_response.edit(
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             await async_client.web3.hostnames.with_raw_response.edit(
                 identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         hostname = await async_client.web3.hostnames.get(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(Hostname, hostname, path=["response"])
 
@@ -474,7 +486,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.web3.hostnames.with_raw_response.get(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -486,7 +498,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.web3.hostnames.with_streaming_response.get(
             identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -498,14 +510,14 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.web3.hostnames.with_raw_response.get(
                 identifier="023e105f4ecef8ad9ca31a8372d0c353",
-                zone_identifier="",
+                zone_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
             await async_client.web3.hostnames.with_raw_response.get(
                 identifier="",
-                zone_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
diff --git a/tests/api_resources/workers/assets/__init__.py b/tests/api_resources/workers/assets/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/workers/assets/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/workers/assets/test_upload.py b/tests/api_resources/workers/assets/test_upload.py
new file mode 100644
index 00000000000..1e058d78ce4
--- /dev/null
+++ b/tests/api_resources/workers/assets/test_upload.py
@@ -0,0 +1,116 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.workers.assets import UploadCreateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestUpload:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        upload = client.workers.assets.upload.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            base64=True,
+            body={"foo": "string"},
+        )
+        assert_matches_type(Optional[UploadCreateResponse], upload, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.workers.assets.upload.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            base64=True,
+            body={"foo": "string"},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        upload = response.parse()
+        assert_matches_type(Optional[UploadCreateResponse], upload, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.workers.assets.upload.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            base64=True,
+            body={"foo": "string"},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            upload = response.parse()
+            assert_matches_type(Optional[UploadCreateResponse], upload, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.assets.upload.with_raw_response.create(
+                account_id="",
+                base64=True,
+                body={"foo": "string"},
+            )
+
+
+class TestAsyncUpload:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        upload = await async_client.workers.assets.upload.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            base64=True,
+            body={"foo": "string"},
+        )
+        assert_matches_type(Optional[UploadCreateResponse], upload, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.assets.upload.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            base64=True,
+            body={"foo": "string"},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        upload = await response.parse()
+        assert_matches_type(Optional[UploadCreateResponse], upload, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.assets.upload.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            base64=True,
+            body={"foo": "string"},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            upload = await response.parse()
+            assert_matches_type(Optional[UploadCreateResponse], upload, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.assets.upload.with_raw_response.create(
+                account_id="",
+                base64=True,
+                body={"foo": "string"},
+            )
diff --git a/tests/api_resources/workers/beta/__init__.py b/tests/api_resources/workers/beta/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/workers/beta/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/workers/beta/test_workers.py b/tests/api_resources/workers/beta/test_workers.py
new file mode 100644
index 00000000000..e6b2b864e3a
--- /dev/null
+++ b/tests/api_resources/workers/beta/test_workers.py
@@ -0,0 +1,820 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.workers.beta import (
+    Worker,
+    WorkerDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestWorkers:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="Missing required fields in API contract: tags, subdomain, observability, logpush, tail_consumers (Issue #1)")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        worker = client.workers.beta.workers.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-worker",
+        )
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        worker = client.workers.beta.workers.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-worker",
+            logpush=True,
+            observability={
+                "enabled": True,
+                "head_sampling_rate": 1,
+                "logs": {
+                    "enabled": True,
+                    "head_sampling_rate": 1,
+                    "invocation_logs": True,
+                },
+            },
+            subdomain={
+                "enabled": True,
+                "previews_enabled": True,
+            },
+            tags=["my-team", "my-public-api"],
+            tail_consumers=[{"name": "my-tail-consumer"}],
+        )
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @pytest.mark.skip(reason="Missing required fields in API contract: tags, subdomain, observability, logpush, tail_consumers (Issue #1)")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.workers.beta.workers.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-worker",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        worker = response.parse()
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @pytest.mark.skip(reason="Missing required fields in API contract: tags, subdomain, observability, logpush, tail_consumers (Issue #1)")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.workers.beta.workers.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-worker",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            worker = response.parse()
+            assert_matches_type(Worker, worker, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.beta.workers.with_raw_response.create(
+                account_id="",
+                name="my-worker",
+            )
+
+    @pytest.mark.skip(reason="Missing required fields in API contract: tags, subdomain, observability, logpush, tail_consumers (Issue #1)")
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        worker = client.workers.beta.workers.update(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-worker",
+        )
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        worker = client.workers.beta.workers.update(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-worker",
+            logpush=True,
+            observability={
+                "enabled": True,
+                "head_sampling_rate": 1,
+                "logs": {
+                    "enabled": True,
+                    "head_sampling_rate": 1,
+                    "invocation_logs": True,
+                },
+            },
+            subdomain={
+                "enabled": True,
+                "previews_enabled": True,
+            },
+            tags=["my-team", "my-public-api"],
+            tail_consumers=[{"name": "my-tail-consumer"}],
+        )
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @pytest.mark.skip(reason="Missing required fields in API contract: tags, subdomain, observability, logpush, tail_consumers (Issue #1)")
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.workers.beta.workers.with_raw_response.update(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-worker",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        worker = response.parse()
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @pytest.mark.skip(reason="Missing required fields in API contract: tags, subdomain, observability, logpush, tail_consumers (Issue #1)")
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.workers.beta.workers.with_streaming_response.update(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-worker",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            worker = response.parse()
+            assert_matches_type(Worker, worker, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.beta.workers.with_raw_response.update(
+                worker_id="worker_id",
+                account_id="",
+                name="my-worker",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `worker_id` but received ''"):
+            client.workers.beta.workers.with_raw_response.update(
+                worker_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="my-worker",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        worker = client.workers.beta.workers.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[Worker], worker, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        worker = client.workers.beta.workers.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[Worker], worker, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.workers.beta.workers.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        worker = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[Worker], worker, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.workers.beta.workers.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            worker = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[Worker], worker, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.beta.workers.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        worker = client.workers.beta.workers.delete(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(WorkerDeleteResponse, worker, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.workers.beta.workers.with_raw_response.delete(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        worker = response.parse()
+        assert_matches_type(WorkerDeleteResponse, worker, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.workers.beta.workers.with_streaming_response.delete(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            worker = response.parse()
+            assert_matches_type(WorkerDeleteResponse, worker, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.beta.workers.with_raw_response.delete(
+                worker_id="worker_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `worker_id` but received ''"):
+            client.workers.beta.workers.with_raw_response.delete(
+                worker_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        worker = client.workers.beta.workers.edit(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            logpush=True,
+            name="my-worker",
+            observability={},
+            subdomain={},
+            tags=["my-team", "my-public-api"],
+            tail_consumers=[{"name": "my-tail-consumer"}],
+        )
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        worker = client.workers.beta.workers.edit(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            logpush=True,
+            name="my-worker",
+            observability={
+                "enabled": True,
+                "head_sampling_rate": 1,
+                "logs": {
+                    "enabled": True,
+                    "head_sampling_rate": 1,
+                    "invocation_logs": True,
+                },
+            },
+            subdomain={
+                "enabled": True,
+                "previews_enabled": True,
+            },
+            tags=["my-team", "my-public-api"],
+            tail_consumers=[{"name": "my-tail-consumer"}],
+        )
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.workers.beta.workers.with_raw_response.edit(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            logpush=True,
+            name="my-worker",
+            observability={},
+            subdomain={},
+            tags=["my-team", "my-public-api"],
+            tail_consumers=[{"name": "my-tail-consumer"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        worker = response.parse()
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.workers.beta.workers.with_streaming_response.edit(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            logpush=True,
+            name="my-worker",
+            observability={},
+            subdomain={},
+            tags=["my-team", "my-public-api"],
+            tail_consumers=[{"name": "my-tail-consumer"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            worker = response.parse()
+            assert_matches_type(Worker, worker, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.beta.workers.with_raw_response.edit(
+                worker_id="worker_id",
+                account_id="",
+                logpush=True,
+                name="my-worker",
+                observability={},
+                subdomain={},
+                tags=["my-team", "my-public-api"],
+                tail_consumers=[{"name": "my-tail-consumer"}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `worker_id` but received ''"):
+            client.workers.beta.workers.with_raw_response.edit(
+                worker_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                logpush=True,
+                name="my-worker",
+                observability={},
+                subdomain={},
+                tags=["my-team", "my-public-api"],
+                tail_consumers=[{"name": "my-tail-consumer"}],
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        worker = client.workers.beta.workers.get(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.workers.beta.workers.with_raw_response.get(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        worker = response.parse()
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.workers.beta.workers.with_streaming_response.get(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            worker = response.parse()
+            assert_matches_type(Worker, worker, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.beta.workers.with_raw_response.get(
+                worker_id="worker_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `worker_id` but received ''"):
+            client.workers.beta.workers.with_raw_response.get(
+                worker_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncWorkers:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="Missing required fields in API contract: tags, subdomain, observability, logpush, tail_consumers (Issue #1)")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        worker = await async_client.workers.beta.workers.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-worker",
+        )
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        worker = await async_client.workers.beta.workers.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-worker",
+            logpush=True,
+            observability={
+                "enabled": True,
+                "head_sampling_rate": 1,
+                "logs": {
+                    "enabled": True,
+                    "head_sampling_rate": 1,
+                    "invocation_logs": True,
+                },
+            },
+            subdomain={
+                "enabled": True,
+                "previews_enabled": True,
+            },
+            tags=["my-team", "my-public-api"],
+            tail_consumers=[{"name": "my-tail-consumer"}],
+        )
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @pytest.mark.skip(reason="Missing required fields in API contract: tags, subdomain, observability, logpush, tail_consumers (Issue #1)")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.beta.workers.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-worker",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        worker = await response.parse()
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @pytest.mark.skip(reason="Missing required fields in API contract: tags, subdomain, observability, logpush, tail_consumers (Issue #1)")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.beta.workers.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-worker",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            worker = await response.parse()
+            assert_matches_type(Worker, worker, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.beta.workers.with_raw_response.create(
+                account_id="",
+                name="my-worker",
+            )
+
+    @pytest.mark.skip(reason="Missing required fields in API contract: tags, subdomain, observability, logpush, tail_consumers (Issue #1)")
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        worker = await async_client.workers.beta.workers.update(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-worker",
+        )
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        worker = await async_client.workers.beta.workers.update(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-worker",
+            logpush=True,
+            observability={
+                "enabled": True,
+                "head_sampling_rate": 1,
+                "logs": {
+                    "enabled": True,
+                    "head_sampling_rate": 1,
+                    "invocation_logs": True,
+                },
+            },
+            subdomain={
+                "enabled": True,
+                "previews_enabled": True,
+            },
+            tags=["my-team", "my-public-api"],
+            tail_consumers=[{"name": "my-tail-consumer"}],
+        )
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @pytest.mark.skip(reason="Missing required fields in API contract: tags, subdomain, observability, logpush, tail_consumers (Issue #1)")
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.beta.workers.with_raw_response.update(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-worker",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        worker = await response.parse()
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @pytest.mark.skip(reason="Missing required fields in API contract: tags, subdomain, observability, logpush, tail_consumers (Issue #1)")
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.beta.workers.with_streaming_response.update(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="my-worker",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            worker = await response.parse()
+            assert_matches_type(Worker, worker, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.beta.workers.with_raw_response.update(
+                worker_id="worker_id",
+                account_id="",
+                name="my-worker",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `worker_id` but received ''"):
+            await async_client.workers.beta.workers.with_raw_response.update(
+                worker_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="my-worker",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        worker = await async_client.workers.beta.workers.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[Worker], worker, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        worker = await async_client.workers.beta.workers.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[Worker], worker, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.beta.workers.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        worker = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[Worker], worker, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.beta.workers.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            worker = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[Worker], worker, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.beta.workers.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        worker = await async_client.workers.beta.workers.delete(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(WorkerDeleteResponse, worker, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.beta.workers.with_raw_response.delete(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        worker = await response.parse()
+        assert_matches_type(WorkerDeleteResponse, worker, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.beta.workers.with_streaming_response.delete(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            worker = await response.parse()
+            assert_matches_type(WorkerDeleteResponse, worker, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.beta.workers.with_raw_response.delete(
+                worker_id="worker_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `worker_id` but received ''"):
+            await async_client.workers.beta.workers.with_raw_response.delete(
+                worker_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        worker = await async_client.workers.beta.workers.edit(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            logpush=True,
+            name="my-worker",
+            observability={},
+            subdomain={},
+            tags=["my-team", "my-public-api"],
+            tail_consumers=[{"name": "my-tail-consumer"}],
+        )
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        worker = await async_client.workers.beta.workers.edit(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            logpush=True,
+            name="my-worker",
+            observability={
+                "enabled": True,
+                "head_sampling_rate": 1,
+                "logs": {
+                    "enabled": True,
+                    "head_sampling_rate": 1,
+                    "invocation_logs": True,
+                },
+            },
+            subdomain={
+                "enabled": True,
+                "previews_enabled": True,
+            },
+            tags=["my-team", "my-public-api"],
+            tail_consumers=[{"name": "my-tail-consumer"}],
+        )
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.beta.workers.with_raw_response.edit(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            logpush=True,
+            name="my-worker",
+            observability={},
+            subdomain={},
+            tags=["my-team", "my-public-api"],
+            tail_consumers=[{"name": "my-tail-consumer"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        worker = await response.parse()
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.beta.workers.with_streaming_response.edit(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            logpush=True,
+            name="my-worker",
+            observability={},
+            subdomain={},
+            tags=["my-team", "my-public-api"],
+            tail_consumers=[{"name": "my-tail-consumer"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            worker = await response.parse()
+            assert_matches_type(Worker, worker, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.beta.workers.with_raw_response.edit(
+                worker_id="worker_id",
+                account_id="",
+                logpush=True,
+                name="my-worker",
+                observability={},
+                subdomain={},
+                tags=["my-team", "my-public-api"],
+                tail_consumers=[{"name": "my-tail-consumer"}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `worker_id` but received ''"):
+            await async_client.workers.beta.workers.with_raw_response.edit(
+                worker_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                logpush=True,
+                name="my-worker",
+                observability={},
+                subdomain={},
+                tags=["my-team", "my-public-api"],
+                tail_consumers=[{"name": "my-tail-consumer"}],
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        worker = await async_client.workers.beta.workers.get(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.beta.workers.with_raw_response.get(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        worker = await response.parse()
+        assert_matches_type(Worker, worker, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.beta.workers.with_streaming_response.get(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            worker = await response.parse()
+            assert_matches_type(Worker, worker, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.beta.workers.with_raw_response.get(
+                worker_id="worker_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `worker_id` but received ''"):
+            await async_client.workers.beta.workers.with_raw_response.get(
+                worker_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/workers/beta/workers/__init__.py b/tests/api_resources/workers/beta/workers/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/workers/beta/workers/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/workers/beta/workers/test_versions.py b/tests/api_resources/workers/beta/workers/test_versions.py
new file mode 100644
index 00000000000..fd2c772fa99
--- /dev/null
+++ b/tests/api_resources/workers/beta/workers/test_versions.py
@@ -0,0 +1,622 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.workers.beta.workers import (
+    Version,
+    VersionDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestVersions:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        version = client.workers.beta.workers.versions.create(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Version, version, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        version = client.workers.beta.workers.versions.create(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            deploy=True,
+            annotations={
+                "workers_message": "Fixed bug.",
+                "workers_tag": "v1.0.1",
+            },
+            assets={
+                "config": {
+                    "html_handling": "auto-trailing-slash",
+                    "not_found_handling": "404-page",
+                    "run_worker_first": ["string"],
+                },
+                "jwt": "jwt",
+            },
+            bindings=[
+                {
+                    "name": "MY_ENV_VAR",
+                    "text": "my_data",
+                    "type": "plain_text",
+                }
+            ],
+            compatibility_date="2021-01-01",
+            compatibility_flags=["nodejs_compat"],
+            limits={"cpu_ms": 50},
+            main_module="index.js",
+            migrations={
+                "deleted_classes": ["string"],
+                "new_classes": ["string"],
+                "new_sqlite_classes": ["string"],
+                "new_tag": "v2",
+                "old_tag": "v1",
+                "renamed_classes": [
+                    {
+                        "from": "from",
+                        "to": "to",
+                    }
+                ],
+                "transferred_classes": [
+                    {
+                        "from": "from",
+                        "from_script": "from_script",
+                        "to": "to",
+                    }
+                ],
+            },
+            modules=[
+                {
+                    "content_base64": "ZXhwb3J0IGRlZmF1bHQgewogIGFzeW5jIGZldGNoKHJlcXVlc3QsIGVudiwgY3R4KSB7CiAgICByZXR1cm4gbmV3IFJlc3BvbnNlKCdIZWxsbyBXb3JsZCEnKQogIH0KfQ==",
+                    "content_type": "application/javascript+module",
+                    "name": "index.js",
+                }
+            ],
+            placement={"mode": "smart"},
+            usage_model="standard",
+        )
+        assert_matches_type(Version, version, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.workers.beta.workers.versions.with_raw_response.create(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        version = response.parse()
+        assert_matches_type(Version, version, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.workers.beta.workers.versions.with_streaming_response.create(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            version = response.parse()
+            assert_matches_type(Version, version, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.beta.workers.versions.with_raw_response.create(
+                worker_id="worker_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `worker_id` but received ''"):
+            client.workers.beta.workers.versions.with_raw_response.create(
+                worker_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        version = client.workers.beta.workers.versions.list(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[Version], version, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        version = client.workers.beta.workers.versions.list(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[Version], version, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.workers.beta.workers.versions.with_raw_response.list(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        version = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[Version], version, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.workers.beta.workers.versions.with_streaming_response.list(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            version = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[Version], version, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.beta.workers.versions.with_raw_response.list(
+                worker_id="worker_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `worker_id` but received ''"):
+            client.workers.beta.workers.versions.with_raw_response.list(
+                worker_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        version = client.workers.beta.workers.versions.delete(
+            version_id="version_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            worker_id="worker_id",
+        )
+        assert_matches_type(VersionDeleteResponse, version, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.workers.beta.workers.versions.with_raw_response.delete(
+            version_id="version_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            worker_id="worker_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        version = response.parse()
+        assert_matches_type(VersionDeleteResponse, version, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.workers.beta.workers.versions.with_streaming_response.delete(
+            version_id="version_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            worker_id="worker_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            version = response.parse()
+            assert_matches_type(VersionDeleteResponse, version, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.beta.workers.versions.with_raw_response.delete(
+                version_id="version_id",
+                account_id="",
+                worker_id="worker_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `worker_id` but received ''"):
+            client.workers.beta.workers.versions.with_raw_response.delete(
+                version_id="version_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                worker_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `version_id` but received ''"):
+            client.workers.beta.workers.versions.with_raw_response.delete(
+                version_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                worker_id="worker_id",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        version = client.workers.beta.workers.versions.get(
+            version_id="version_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            worker_id="worker_id",
+        )
+        assert_matches_type(Version, version, path=["response"])
+
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        version = client.workers.beta.workers.versions.get(
+            version_id="version_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            worker_id="worker_id",
+            include="modules",
+        )
+        assert_matches_type(Version, version, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.workers.beta.workers.versions.with_raw_response.get(
+            version_id="version_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            worker_id="worker_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        version = response.parse()
+        assert_matches_type(Version, version, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.workers.beta.workers.versions.with_streaming_response.get(
+            version_id="version_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            worker_id="worker_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            version = response.parse()
+            assert_matches_type(Version, version, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.beta.workers.versions.with_raw_response.get(
+                version_id="version_id",
+                account_id="",
+                worker_id="worker_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `worker_id` but received ''"):
+            client.workers.beta.workers.versions.with_raw_response.get(
+                version_id="version_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                worker_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `version_id` but received ''"):
+            client.workers.beta.workers.versions.with_raw_response.get(
+                version_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                worker_id="worker_id",
+            )
+
+
+class TestAsyncVersions:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        version = await async_client.workers.beta.workers.versions.create(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Version, version, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        version = await async_client.workers.beta.workers.versions.create(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            deploy=True,
+            annotations={
+                "workers_message": "Fixed bug.",
+                "workers_tag": "v1.0.1",
+            },
+            assets={
+                "config": {
+                    "html_handling": "auto-trailing-slash",
+                    "not_found_handling": "404-page",
+                    "run_worker_first": ["string"],
+                },
+                "jwt": "jwt",
+            },
+            bindings=[
+                {
+                    "name": "MY_ENV_VAR",
+                    "text": "my_data",
+                    "type": "plain_text",
+                }
+            ],
+            compatibility_date="2021-01-01",
+            compatibility_flags=["nodejs_compat"],
+            limits={"cpu_ms": 50},
+            main_module="index.js",
+            migrations={
+                "deleted_classes": ["string"],
+                "new_classes": ["string"],
+                "new_sqlite_classes": ["string"],
+                "new_tag": "v2",
+                "old_tag": "v1",
+                "renamed_classes": [
+                    {
+                        "from": "from",
+                        "to": "to",
+                    }
+                ],
+                "transferred_classes": [
+                    {
+                        "from": "from",
+                        "from_script": "from_script",
+                        "to": "to",
+                    }
+                ],
+            },
+            modules=[
+                {
+                    "content_base64": "ZXhwb3J0IGRlZmF1bHQgewogIGFzeW5jIGZldGNoKHJlcXVlc3QsIGVudiwgY3R4KSB7CiAgICByZXR1cm4gbmV3IFJlc3BvbnNlKCdIZWxsbyBXb3JsZCEnKQogIH0KfQ==",
+                    "content_type": "application/javascript+module",
+                    "name": "index.js",
+                }
+            ],
+            placement={"mode": "smart"},
+            usage_model="standard",
+        )
+        assert_matches_type(Version, version, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.beta.workers.versions.with_raw_response.create(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        version = await response.parse()
+        assert_matches_type(Version, version, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.beta.workers.versions.with_streaming_response.create(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            version = await response.parse()
+            assert_matches_type(Version, version, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.beta.workers.versions.with_raw_response.create(
+                worker_id="worker_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `worker_id` but received ''"):
+            await async_client.workers.beta.workers.versions.with_raw_response.create(
+                worker_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        version = await async_client.workers.beta.workers.versions.list(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[Version], version, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        version = await async_client.workers.beta.workers.versions.list(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[Version], version, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.beta.workers.versions.with_raw_response.list(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        version = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[Version], version, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.beta.workers.versions.with_streaming_response.list(
+            worker_id="worker_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            version = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[Version], version, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.beta.workers.versions.with_raw_response.list(
+                worker_id="worker_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `worker_id` but received ''"):
+            await async_client.workers.beta.workers.versions.with_raw_response.list(
+                worker_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        version = await async_client.workers.beta.workers.versions.delete(
+            version_id="version_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            worker_id="worker_id",
+        )
+        assert_matches_type(VersionDeleteResponse, version, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.beta.workers.versions.with_raw_response.delete(
+            version_id="version_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            worker_id="worker_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        version = await response.parse()
+        assert_matches_type(VersionDeleteResponse, version, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.beta.workers.versions.with_streaming_response.delete(
+            version_id="version_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            worker_id="worker_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            version = await response.parse()
+            assert_matches_type(VersionDeleteResponse, version, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.beta.workers.versions.with_raw_response.delete(
+                version_id="version_id",
+                account_id="",
+                worker_id="worker_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `worker_id` but received ''"):
+            await async_client.workers.beta.workers.versions.with_raw_response.delete(
+                version_id="version_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                worker_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `version_id` but received ''"):
+            await async_client.workers.beta.workers.versions.with_raw_response.delete(
+                version_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                worker_id="worker_id",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        version = await async_client.workers.beta.workers.versions.get(
+            version_id="version_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            worker_id="worker_id",
+        )
+        assert_matches_type(Version, version, path=["response"])
+
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        version = await async_client.workers.beta.workers.versions.get(
+            version_id="version_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            worker_id="worker_id",
+            include="modules",
+        )
+        assert_matches_type(Version, version, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.beta.workers.versions.with_raw_response.get(
+            version_id="version_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            worker_id="worker_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        version = await response.parse()
+        assert_matches_type(Version, version, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.beta.workers.versions.with_streaming_response.get(
+            version_id="version_id",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            worker_id="worker_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            version = await response.parse()
+            assert_matches_type(Version, version, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.beta.workers.versions.with_raw_response.get(
+                version_id="version_id",
+                account_id="",
+                worker_id="worker_id",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `worker_id` but received ''"):
+            await async_client.workers.beta.workers.versions.with_raw_response.get(
+                version_id="version_id",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                worker_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `version_id` but received ''"):
+            await async_client.workers.beta.workers.versions.with_raw_response.get(
+                version_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                worker_id="worker_id",
+            )
diff --git a/tests/api_resources/workers/observability/__init__.py b/tests/api_resources/workers/observability/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/workers/observability/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/workers/observability/test_telemetry.py b/tests/api_resources/workers/observability/test_telemetry.py
new file mode 100644
index 00000000000..ca10671a97e
--- /dev/null
+++ b/tests/api_resources/workers/observability/test_telemetry.py
@@ -0,0 +1,599 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.workers.observability import (
+    TelemetryKeysResponse,
+    TelemetryQueryResponse,
+    TelemetryValuesResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestTelemetry:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_keys(self, client: Cloudflare) -> None:
+        telemetry = client.workers.observability.telemetry.keys(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncSinglePage[TelemetryKeysResponse], telemetry, path=["response"])
+
+    @parametrize
+    def test_method_keys_with_all_params(self, client: Cloudflare) -> None:
+        telemetry = client.workers.observability.telemetry.keys(
+            account_id="account_id",
+            datasets=["string"],
+            filters=[
+                {
+                    "key": "key",
+                    "operation": "includes",
+                    "type": "string",
+                    "value": "string",
+                }
+            ],
+            from_=0,
+            key_needle={
+                "value": "string",
+                "is_regex": True,
+                "match_case": True,
+            },
+            limit=0,
+            needle={
+                "value": "string",
+                "is_regex": True,
+                "match_case": True,
+            },
+            to=0,
+        )
+        assert_matches_type(SyncSinglePage[TelemetryKeysResponse], telemetry, path=["response"])
+
+    @parametrize
+    def test_raw_response_keys(self, client: Cloudflare) -> None:
+        response = client.workers.observability.telemetry.with_raw_response.keys(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        telemetry = response.parse()
+        assert_matches_type(SyncSinglePage[TelemetryKeysResponse], telemetry, path=["response"])
+
+    @parametrize
+    def test_streaming_response_keys(self, client: Cloudflare) -> None:
+        with client.workers.observability.telemetry.with_streaming_response.keys(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            telemetry = response.parse()
+            assert_matches_type(SyncSinglePage[TelemetryKeysResponse], telemetry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_keys(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.observability.telemetry.with_raw_response.keys(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_query(self, client: Cloudflare) -> None:
+        telemetry = client.workers.observability.telemetry.query(
+            account_id="account_id",
+            query_id="queryId",
+            timeframe={
+                "from": 0,
+                "to": 0,
+            },
+        )
+        assert_matches_type(TelemetryQueryResponse, telemetry, path=["response"])
+
+    @parametrize
+    def test_method_query_with_all_params(self, client: Cloudflare) -> None:
+        telemetry = client.workers.observability.telemetry.query(
+            account_id="account_id",
+            query_id="queryId",
+            timeframe={
+                "from": 0,
+                "to": 0,
+            },
+            chart=True,
+            compare=True,
+            dry=True,
+            granularity=0,
+            ignore_series=True,
+            limit=2000,
+            offset="offset",
+            offset_by=0,
+            offset_direction="offsetDirection",
+            parameters={
+                "calculations": [
+                    {
+                        "operator": "uniq",
+                        "alias": "alias",
+                        "key": "key",
+                        "key_type": "string",
+                    }
+                ],
+                "datasets": ["string"],
+                "filter_combination": "and",
+                "filters": [
+                    {
+                        "key": "key",
+                        "operation": "includes",
+                        "type": "string",
+                        "value": "string",
+                    }
+                ],
+                "group_bys": [
+                    {
+                        "type": "string",
+                        "value": "value",
+                    }
+                ],
+                "havings": [
+                    {
+                        "key": "key",
+                        "operation": "eq",
+                        "value": 0,
+                    }
+                ],
+                "limit": 0,
+                "needle": {
+                    "value": "string",
+                    "is_regex": True,
+                    "match_case": True,
+                },
+                "order_by": {
+                    "value": "value",
+                    "order": "asc",
+                },
+            },
+            pattern_type="message",
+            view="traces",
+        )
+        assert_matches_type(TelemetryQueryResponse, telemetry, path=["response"])
+
+    @parametrize
+    def test_raw_response_query(self, client: Cloudflare) -> None:
+        response = client.workers.observability.telemetry.with_raw_response.query(
+            account_id="account_id",
+            query_id="queryId",
+            timeframe={
+                "from": 0,
+                "to": 0,
+            },
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        telemetry = response.parse()
+        assert_matches_type(TelemetryQueryResponse, telemetry, path=["response"])
+
+    @parametrize
+    def test_streaming_response_query(self, client: Cloudflare) -> None:
+        with client.workers.observability.telemetry.with_streaming_response.query(
+            account_id="account_id",
+            query_id="queryId",
+            timeframe={
+                "from": 0,
+                "to": 0,
+            },
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            telemetry = response.parse()
+            assert_matches_type(TelemetryQueryResponse, telemetry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_query(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.observability.telemetry.with_raw_response.query(
+                account_id="",
+                query_id="queryId",
+                timeframe={
+                    "from": 0,
+                    "to": 0,
+                },
+            )
+
+    @parametrize
+    def test_method_values(self, client: Cloudflare) -> None:
+        telemetry = client.workers.observability.telemetry.values(
+            account_id="account_id",
+            datasets=["string"],
+            key="key",
+            timeframe={
+                "from": 0,
+                "to": 0,
+            },
+            type="string",
+        )
+        assert_matches_type(SyncSinglePage[TelemetryValuesResponse], telemetry, path=["response"])
+
+    @parametrize
+    def test_method_values_with_all_params(self, client: Cloudflare) -> None:
+        telemetry = client.workers.observability.telemetry.values(
+            account_id="account_id",
+            datasets=["string"],
+            key="key",
+            timeframe={
+                "from": 0,
+                "to": 0,
+            },
+            type="string",
+            filters=[
+                {
+                    "key": "key",
+                    "operation": "includes",
+                    "type": "string",
+                    "value": "string",
+                }
+            ],
+            limit=0,
+            needle={
+                "value": "string",
+                "is_regex": True,
+                "match_case": True,
+            },
+        )
+        assert_matches_type(SyncSinglePage[TelemetryValuesResponse], telemetry, path=["response"])
+
+    @parametrize
+    def test_raw_response_values(self, client: Cloudflare) -> None:
+        response = client.workers.observability.telemetry.with_raw_response.values(
+            account_id="account_id",
+            datasets=["string"],
+            key="key",
+            timeframe={
+                "from": 0,
+                "to": 0,
+            },
+            type="string",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        telemetry = response.parse()
+        assert_matches_type(SyncSinglePage[TelemetryValuesResponse], telemetry, path=["response"])
+
+    @parametrize
+    def test_streaming_response_values(self, client: Cloudflare) -> None:
+        with client.workers.observability.telemetry.with_streaming_response.values(
+            account_id="account_id",
+            datasets=["string"],
+            key="key",
+            timeframe={
+                "from": 0,
+                "to": 0,
+            },
+            type="string",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            telemetry = response.parse()
+            assert_matches_type(SyncSinglePage[TelemetryValuesResponse], telemetry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_values(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.observability.telemetry.with_raw_response.values(
+                account_id="",
+                datasets=["string"],
+                key="key",
+                timeframe={
+                    "from": 0,
+                    "to": 0,
+                },
+                type="string",
+            )
+
+
+class TestAsyncTelemetry:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_keys(self, async_client: AsyncCloudflare) -> None:
+        telemetry = await async_client.workers.observability.telemetry.keys(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncSinglePage[TelemetryKeysResponse], telemetry, path=["response"])
+
+    @parametrize
+    async def test_method_keys_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        telemetry = await async_client.workers.observability.telemetry.keys(
+            account_id="account_id",
+            datasets=["string"],
+            filters=[
+                {
+                    "key": "key",
+                    "operation": "includes",
+                    "type": "string",
+                    "value": "string",
+                }
+            ],
+            from_=0,
+            key_needle={
+                "value": "string",
+                "is_regex": True,
+                "match_case": True,
+            },
+            limit=0,
+            needle={
+                "value": "string",
+                "is_regex": True,
+                "match_case": True,
+            },
+            to=0,
+        )
+        assert_matches_type(AsyncSinglePage[TelemetryKeysResponse], telemetry, path=["response"])
+
+    @parametrize
+    async def test_raw_response_keys(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.observability.telemetry.with_raw_response.keys(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        telemetry = await response.parse()
+        assert_matches_type(AsyncSinglePage[TelemetryKeysResponse], telemetry, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_keys(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.observability.telemetry.with_streaming_response.keys(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            telemetry = await response.parse()
+            assert_matches_type(AsyncSinglePage[TelemetryKeysResponse], telemetry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_keys(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.observability.telemetry.with_raw_response.keys(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_query(self, async_client: AsyncCloudflare) -> None:
+        telemetry = await async_client.workers.observability.telemetry.query(
+            account_id="account_id",
+            query_id="queryId",
+            timeframe={
+                "from": 0,
+                "to": 0,
+            },
+        )
+        assert_matches_type(TelemetryQueryResponse, telemetry, path=["response"])
+
+    @parametrize
+    async def test_method_query_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        telemetry = await async_client.workers.observability.telemetry.query(
+            account_id="account_id",
+            query_id="queryId",
+            timeframe={
+                "from": 0,
+                "to": 0,
+            },
+            chart=True,
+            compare=True,
+            dry=True,
+            granularity=0,
+            ignore_series=True,
+            limit=2000,
+            offset="offset",
+            offset_by=0,
+            offset_direction="offsetDirection",
+            parameters={
+                "calculations": [
+                    {
+                        "operator": "uniq",
+                        "alias": "alias",
+                        "key": "key",
+                        "key_type": "string",
+                    }
+                ],
+                "datasets": ["string"],
+                "filter_combination": "and",
+                "filters": [
+                    {
+                        "key": "key",
+                        "operation": "includes",
+                        "type": "string",
+                        "value": "string",
+                    }
+                ],
+                "group_bys": [
+                    {
+                        "type": "string",
+                        "value": "value",
+                    }
+                ],
+                "havings": [
+                    {
+                        "key": "key",
+                        "operation": "eq",
+                        "value": 0,
+                    }
+                ],
+                "limit": 0,
+                "needle": {
+                    "value": "string",
+                    "is_regex": True,
+                    "match_case": True,
+                },
+                "order_by": {
+                    "value": "value",
+                    "order": "asc",
+                },
+            },
+            pattern_type="message",
+            view="traces",
+        )
+        assert_matches_type(TelemetryQueryResponse, telemetry, path=["response"])
+
+    @parametrize
+    async def test_raw_response_query(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.observability.telemetry.with_raw_response.query(
+            account_id="account_id",
+            query_id="queryId",
+            timeframe={
+                "from": 0,
+                "to": 0,
+            },
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        telemetry = await response.parse()
+        assert_matches_type(TelemetryQueryResponse, telemetry, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_query(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.observability.telemetry.with_streaming_response.query(
+            account_id="account_id",
+            query_id="queryId",
+            timeframe={
+                "from": 0,
+                "to": 0,
+            },
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            telemetry = await response.parse()
+            assert_matches_type(TelemetryQueryResponse, telemetry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_query(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.observability.telemetry.with_raw_response.query(
+                account_id="",
+                query_id="queryId",
+                timeframe={
+                    "from": 0,
+                    "to": 0,
+                },
+            )
+
+    @parametrize
+    async def test_method_values(self, async_client: AsyncCloudflare) -> None:
+        telemetry = await async_client.workers.observability.telemetry.values(
+            account_id="account_id",
+            datasets=["string"],
+            key="key",
+            timeframe={
+                "from": 0,
+                "to": 0,
+            },
+            type="string",
+        )
+        assert_matches_type(AsyncSinglePage[TelemetryValuesResponse], telemetry, path=["response"])
+
+    @parametrize
+    async def test_method_values_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        telemetry = await async_client.workers.observability.telemetry.values(
+            account_id="account_id",
+            datasets=["string"],
+            key="key",
+            timeframe={
+                "from": 0,
+                "to": 0,
+            },
+            type="string",
+            filters=[
+                {
+                    "key": "key",
+                    "operation": "includes",
+                    "type": "string",
+                    "value": "string",
+                }
+            ],
+            limit=0,
+            needle={
+                "value": "string",
+                "is_regex": True,
+                "match_case": True,
+            },
+        )
+        assert_matches_type(AsyncSinglePage[TelemetryValuesResponse], telemetry, path=["response"])
+
+    @parametrize
+    async def test_raw_response_values(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.observability.telemetry.with_raw_response.values(
+            account_id="account_id",
+            datasets=["string"],
+            key="key",
+            timeframe={
+                "from": 0,
+                "to": 0,
+            },
+            type="string",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        telemetry = await response.parse()
+        assert_matches_type(AsyncSinglePage[TelemetryValuesResponse], telemetry, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_values(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.observability.telemetry.with_streaming_response.values(
+            account_id="account_id",
+            datasets=["string"],
+            key="key",
+            timeframe={
+                "from": 0,
+                "to": 0,
+            },
+            type="string",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            telemetry = await response.parse()
+            assert_matches_type(AsyncSinglePage[TelemetryValuesResponse], telemetry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_values(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.observability.telemetry.with_raw_response.values(
+                account_id="",
+                datasets=["string"],
+                key="key",
+                timeframe={
+                    "from": 0,
+                    "to": 0,
+                },
+                type="string",
+            )
diff --git a/tests/api_resources/workers/scripts/assets/__init__.py b/tests/api_resources/workers/scripts/assets/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/workers/scripts/assets/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/workers/scripts/assets/test_upload.py b/tests/api_resources/workers/scripts/assets/test_upload.py
new file mode 100644
index 00000000000..049f3460f79
--- /dev/null
+++ b/tests/api_resources/workers/scripts/assets/test_upload.py
@@ -0,0 +1,180 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.workers.scripts.assets import UploadCreateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestUpload:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        upload = client.workers.scripts.assets.upload.create(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            manifest={
+                "foo": {
+                    "hash": "hash",
+                    "size": 0,
+                }
+            },
+        )
+        assert_matches_type(Optional[UploadCreateResponse], upload, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.workers.scripts.assets.upload.with_raw_response.create(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            manifest={
+                "foo": {
+                    "hash": "hash",
+                    "size": 0,
+                }
+            },
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        upload = response.parse()
+        assert_matches_type(Optional[UploadCreateResponse], upload, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.workers.scripts.assets.upload.with_streaming_response.create(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            manifest={
+                "foo": {
+                    "hash": "hash",
+                    "size": 0,
+                }
+            },
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            upload = response.parse()
+            assert_matches_type(Optional[UploadCreateResponse], upload, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.scripts.assets.upload.with_raw_response.create(
+                script_name="this-is_my_script-01",
+                account_id="",
+                manifest={
+                    "foo": {
+                        "hash": "hash",
+                        "size": 0,
+                    }
+                },
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            client.workers.scripts.assets.upload.with_raw_response.create(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                manifest={
+                    "foo": {
+                        "hash": "hash",
+                        "size": 0,
+                    }
+                },
+            )
+
+
+class TestAsyncUpload:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        upload = await async_client.workers.scripts.assets.upload.create(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            manifest={
+                "foo": {
+                    "hash": "hash",
+                    "size": 0,
+                }
+            },
+        )
+        assert_matches_type(Optional[UploadCreateResponse], upload, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.scripts.assets.upload.with_raw_response.create(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            manifest={
+                "foo": {
+                    "hash": "hash",
+                    "size": 0,
+                }
+            },
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        upload = await response.parse()
+        assert_matches_type(Optional[UploadCreateResponse], upload, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.scripts.assets.upload.with_streaming_response.create(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            manifest={
+                "foo": {
+                    "hash": "hash",
+                    "size": 0,
+                }
+            },
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            upload = await response.parse()
+            assert_matches_type(Optional[UploadCreateResponse], upload, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.scripts.assets.upload.with_raw_response.create(
+                script_name="this-is_my_script-01",
+                account_id="",
+                manifest={
+                    "foo": {
+                        "hash": "hash",
+                        "size": 0,
+                    }
+                },
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            await async_client.workers.scripts.assets.upload.with_raw_response.create(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                manifest={
+                    "foo": {
+                        "hash": "hash",
+                        "size": 0,
+                    }
+                },
+            )
diff --git a/tests/api_resources/workers/scripts/test_content.py b/tests/api_resources/workers/scripts/test_content.py
index 1863b3a060b..0b849e9c51a 100644
--- a/tests/api_resources/workers/scripts/test_content.py
+++ b/tests/api_resources/workers/scripts/test_content.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import httpx
 import pytest
@@ -31,8 +31,9 @@ def test_method_update(self, client: Cloudflare) -> None:
         content = client.workers.scripts.content.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={},
         )
-        assert_matches_type(Optional[Script], content, path=["response"])
+        assert_matches_type(Script, content, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -40,15 +41,15 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         content = client.workers.scripts.content.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            any_part_name=[b"raw file contents", b"raw file contents", b"raw file contents"],
             metadata={
                 "body_part": "worker.js",
                 "main_module": "worker.js",
             },
+            files=[b"raw file contents"],
             cf_worker_body_part="CF-WORKER-BODY-PART",
             cf_worker_main_module_part="CF-WORKER-MAIN-MODULE-PART",
         )
-        assert_matches_type(Optional[Script], content, path=["response"])
+        assert_matches_type(Script, content, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -56,12 +57,13 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.workers.scripts.content.with_raw_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         content = response.parse()
-        assert_matches_type(Optional[Script], content, path=["response"])
+        assert_matches_type(Script, content, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -69,12 +71,13 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.workers.scripts.content.with_streaming_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             content = response.parse()
-            assert_matches_type(Optional[Script], content, path=["response"])
+            assert_matches_type(Script, content, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -85,12 +88,14 @@ def test_path_params_update(self, client: Cloudflare) -> None:
             client.workers.scripts.content.with_raw_response.update(
                 script_name="this-is_my_script-01",
                 account_id="",
+                metadata={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
             client.workers.scripts.content.with_raw_response.update(
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                metadata={},
             )
 
     @parametrize
@@ -161,7 +166,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncContent:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -169,8 +176,9 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         content = await async_client.workers.scripts.content.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={},
         )
-        assert_matches_type(Optional[Script], content, path=["response"])
+        assert_matches_type(Script, content, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -178,15 +186,15 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
         content = await async_client.workers.scripts.content.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            any_part_name=[b"raw file contents", b"raw file contents", b"raw file contents"],
             metadata={
                 "body_part": "worker.js",
                 "main_module": "worker.js",
             },
+            files=[b"raw file contents"],
             cf_worker_body_part="CF-WORKER-BODY-PART",
             cf_worker_main_module_part="CF-WORKER-MAIN-MODULE-PART",
         )
-        assert_matches_type(Optional[Script], content, path=["response"])
+        assert_matches_type(Script, content, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -194,12 +202,13 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.workers.scripts.content.with_raw_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         content = await response.parse()
-        assert_matches_type(Optional[Script], content, path=["response"])
+        assert_matches_type(Script, content, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -207,12 +216,13 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
         async with async_client.workers.scripts.content.with_streaming_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             content = await response.parse()
-            assert_matches_type(Optional[Script], content, path=["response"])
+            assert_matches_type(Script, content, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -223,12 +233,14 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
             await async_client.workers.scripts.content.with_raw_response.update(
                 script_name="this-is_my_script-01",
                 account_id="",
+                metadata={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
             await async_client.workers.scripts.content.with_raw_response.update(
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                metadata={},
             )
 
     @parametrize
diff --git a/tests/api_resources/workers/scripts/test_deployments.py b/tests/api_resources/workers/scripts/test_deployments.py
index b5b08437d83..464a1a9fad6 100644
--- a/tests/api_resources/workers/scripts/test_deployments.py
+++ b/tests/api_resources/workers/scripts/test_deployments.py
@@ -3,15 +3,16 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.types.workers.scripts import (
-    DeploymentGetResponse,
-    DeploymentCreateResponse,
+    Deployment,
+    DeploymentListResponse,
+    DeploymentDeleteResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -25,42 +26,70 @@ def test_method_create(self, client: Cloudflare) -> None:
         deployment = client.workers.scripts.deployments.create(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            strategy="percentage",
+            versions=[
+                {
+                    "percentage": 100,
+                    "version_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                }
+            ],
         )
-        assert_matches_type(Optional[DeploymentCreateResponse], deployment, path=["response"])
+        assert_matches_type(Deployment, deployment, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         deployment = client.workers.scripts.deployments.create(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            strategy="percentage",
+            versions=[
+                {
+                    "percentage": 100,
+                    "version_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                }
+            ],
+            force=True,
             annotations={"workers_message": "Deploy bug fix."},
-            strategy="strategy",
         )
-        assert_matches_type(Optional[DeploymentCreateResponse], deployment, path=["response"])
+        assert_matches_type(Deployment, deployment, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.workers.scripts.deployments.with_raw_response.create(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            strategy="percentage",
+            versions=[
+                {
+                    "percentage": 100,
+                    "version_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                }
+            ],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         deployment = response.parse()
-        assert_matches_type(Optional[DeploymentCreateResponse], deployment, path=["response"])
+        assert_matches_type(Deployment, deployment, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.workers.scripts.deployments.with_streaming_response.create(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            strategy="percentage",
+            versions=[
+                {
+                    "percentage": 100,
+                    "version_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                }
+            ],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             deployment = response.parse()
-            assert_matches_type(Optional[DeploymentCreateResponse], deployment, path=["response"])
+            assert_matches_type(Deployment, deployment, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -70,45 +99,170 @@ def test_path_params_create(self, client: Cloudflare) -> None:
             client.workers.scripts.deployments.with_raw_response.create(
                 script_name="this-is_my_script-01",
                 account_id="",
+                strategy="percentage",
+                versions=[
+                    {
+                        "percentage": 100,
+                        "version_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                    }
+                ],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
             client.workers.scripts.deployments.with_raw_response.create(
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                strategy="percentage",
+                versions=[
+                    {
+                        "percentage": 100,
+                        "version_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                    }
+                ],
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        deployment = client.workers.scripts.deployments.list(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(DeploymentListResponse, deployment, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.workers.scripts.deployments.with_raw_response.list(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        deployment = response.parse()
+        assert_matches_type(DeploymentListResponse, deployment, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.workers.scripts.deployments.with_streaming_response.list(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            deployment = response.parse()
+            assert_matches_type(DeploymentListResponse, deployment, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.scripts.deployments.with_raw_response.list(
+                script_name="this-is_my_script-01",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            client.workers.scripts.deployments.with_raw_response.list(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        deployment = client.workers.scripts.deployments.delete(
+            deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+        )
+        assert_matches_type(DeploymentDeleteResponse, deployment, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.workers.scripts.deployments.with_raw_response.delete(
+            deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        deployment = response.parse()
+        assert_matches_type(DeploymentDeleteResponse, deployment, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.workers.scripts.deployments.with_streaming_response.delete(
+            deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            deployment = response.parse()
+            assert_matches_type(DeploymentDeleteResponse, deployment, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.scripts.deployments.with_raw_response.delete(
+                deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                script_name="this-is_my_script-01",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            client.workers.scripts.deployments.with_raw_response.delete(
+                deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                script_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `deployment_id` but received ''"):
+            client.workers.scripts.deployments.with_raw_response.delete(
+                deployment_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                script_name="this-is_my_script-01",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         deployment = client.workers.scripts.deployments.get(
-            script_name="this-is_my_script-01",
+            deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
         )
-        assert_matches_type(Optional[DeploymentGetResponse], deployment, path=["response"])
+        assert_matches_type(Deployment, deployment, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.workers.scripts.deployments.with_raw_response.get(
-            script_name="this-is_my_script-01",
+            deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         deployment = response.parse()
-        assert_matches_type(Optional[DeploymentGetResponse], deployment, path=["response"])
+        assert_matches_type(Deployment, deployment, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.workers.scripts.deployments.with_streaming_response.get(
-            script_name="this-is_my_script-01",
+            deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             deployment = response.parse()
-            assert_matches_type(Optional[DeploymentGetResponse], deployment, path=["response"])
+            assert_matches_type(Deployment, deployment, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -116,61 +270,100 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.workers.scripts.deployments.with_raw_response.get(
-                script_name="this-is_my_script-01",
+                deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
                 account_id="",
+                script_name="this-is_my_script-01",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
             client.workers.scripts.deployments.with_raw_response.get(
+                deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 script_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `deployment_id` but received ''"):
+            client.workers.scripts.deployments.with_raw_response.get(
+                deployment_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                script_name="this-is_my_script-01",
             )
 
 
 class TestAsyncDeployments:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         deployment = await async_client.workers.scripts.deployments.create(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            strategy="percentage",
+            versions=[
+                {
+                    "percentage": 100,
+                    "version_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                }
+            ],
         )
-        assert_matches_type(Optional[DeploymentCreateResponse], deployment, path=["response"])
+        assert_matches_type(Deployment, deployment, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         deployment = await async_client.workers.scripts.deployments.create(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            strategy="percentage",
+            versions=[
+                {
+                    "percentage": 100,
+                    "version_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                }
+            ],
+            force=True,
             annotations={"workers_message": "Deploy bug fix."},
-            strategy="strategy",
         )
-        assert_matches_type(Optional[DeploymentCreateResponse], deployment, path=["response"])
+        assert_matches_type(Deployment, deployment, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.workers.scripts.deployments.with_raw_response.create(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            strategy="percentage",
+            versions=[
+                {
+                    "percentage": 100,
+                    "version_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                }
+            ],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         deployment = await response.parse()
-        assert_matches_type(Optional[DeploymentCreateResponse], deployment, path=["response"])
+        assert_matches_type(Deployment, deployment, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.workers.scripts.deployments.with_streaming_response.create(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            strategy="percentage",
+            versions=[
+                {
+                    "percentage": 100,
+                    "version_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                }
+            ],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             deployment = await response.parse()
-            assert_matches_type(Optional[DeploymentCreateResponse], deployment, path=["response"])
+            assert_matches_type(Deployment, deployment, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -180,45 +373,170 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
             await async_client.workers.scripts.deployments.with_raw_response.create(
                 script_name="this-is_my_script-01",
                 account_id="",
+                strategy="percentage",
+                versions=[
+                    {
+                        "percentage": 100,
+                        "version_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                    }
+                ],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
             await async_client.workers.scripts.deployments.with_raw_response.create(
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                strategy="percentage",
+                versions=[
+                    {
+                        "percentage": 100,
+                        "version_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                    }
+                ],
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        deployment = await async_client.workers.scripts.deployments.list(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(DeploymentListResponse, deployment, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.scripts.deployments.with_raw_response.list(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        deployment = await response.parse()
+        assert_matches_type(DeploymentListResponse, deployment, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.scripts.deployments.with_streaming_response.list(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            deployment = await response.parse()
+            assert_matches_type(DeploymentListResponse, deployment, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.scripts.deployments.with_raw_response.list(
+                script_name="this-is_my_script-01",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            await async_client.workers.scripts.deployments.with_raw_response.list(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        deployment = await async_client.workers.scripts.deployments.delete(
+            deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+        )
+        assert_matches_type(DeploymentDeleteResponse, deployment, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.scripts.deployments.with_raw_response.delete(
+            deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        deployment = await response.parse()
+        assert_matches_type(DeploymentDeleteResponse, deployment, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.scripts.deployments.with_streaming_response.delete(
+            deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            deployment = await response.parse()
+            assert_matches_type(DeploymentDeleteResponse, deployment, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.scripts.deployments.with_raw_response.delete(
+                deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                script_name="this-is_my_script-01",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            await async_client.workers.scripts.deployments.with_raw_response.delete(
+                deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                script_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `deployment_id` but received ''"):
+            await async_client.workers.scripts.deployments.with_raw_response.delete(
+                deployment_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                script_name="this-is_my_script-01",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         deployment = await async_client.workers.scripts.deployments.get(
-            script_name="this-is_my_script-01",
+            deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
         )
-        assert_matches_type(Optional[DeploymentGetResponse], deployment, path=["response"])
+        assert_matches_type(Deployment, deployment, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.workers.scripts.deployments.with_raw_response.get(
-            script_name="this-is_my_script-01",
+            deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         deployment = await response.parse()
-        assert_matches_type(Optional[DeploymentGetResponse], deployment, path=["response"])
+        assert_matches_type(Deployment, deployment, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.workers.scripts.deployments.with_streaming_response.get(
-            script_name="this-is_my_script-01",
+            deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             deployment = await response.parse()
-            assert_matches_type(Optional[DeploymentGetResponse], deployment, path=["response"])
+            assert_matches_type(Deployment, deployment, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -226,12 +544,21 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.workers.scripts.deployments.with_raw_response.get(
-                script_name="this-is_my_script-01",
+                deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
                 account_id="",
+                script_name="this-is_my_script-01",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
             await async_client.workers.scripts.deployments.with_raw_response.get(
+                deployment_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 script_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `deployment_id` but received ''"):
+            await async_client.workers.scripts.deployments.with_raw_response.get(
+                deployment_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                script_name="this-is_my_script-01",
             )
diff --git a/tests/api_resources/workers/scripts/test_schedules.py b/tests/api_resources/workers/scripts/test_schedules.py
index 084b83eef92..49788ae1352 100644
--- a/tests/api_resources/workers/scripts/test_schedules.py
+++ b/tests/api_resources/workers/scripts/test_schedules.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -22,35 +22,35 @@ def test_method_update(self, client: Cloudflare) -> None:
         schedule = client.workers.scripts.schedules.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="[{'cron': '*/30 * * * *'}]",
+            body=[{"cron": "*/30 * * * *"}],
         )
-        assert_matches_type(Optional[ScheduleUpdateResponse], schedule, path=["response"])
+        assert_matches_type(ScheduleUpdateResponse, schedule, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.workers.scripts.schedules.with_raw_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="[{'cron': '*/30 * * * *'}]",
+            body=[{"cron": "*/30 * * * *"}],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         schedule = response.parse()
-        assert_matches_type(Optional[ScheduleUpdateResponse], schedule, path=["response"])
+        assert_matches_type(ScheduleUpdateResponse, schedule, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.workers.scripts.schedules.with_streaming_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="[{'cron': '*/30 * * * *'}]",
+            body=[{"cron": "*/30 * * * *"}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             schedule = response.parse()
-            assert_matches_type(Optional[ScheduleUpdateResponse], schedule, path=["response"])
+            assert_matches_type(ScheduleUpdateResponse, schedule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -60,14 +60,14 @@ def test_path_params_update(self, client: Cloudflare) -> None:
             client.workers.scripts.schedules.with_raw_response.update(
                 script_name="this-is_my_script-01",
                 account_id="",
-                body="[{'cron': '*/30 * * * *'}]",
+                body=[{"cron": "*/30 * * * *"}],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
             client.workers.scripts.schedules.with_raw_response.update(
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body="[{'cron': '*/30 * * * *'}]",
+                body=[{"cron": "*/30 * * * *"}],
             )
 
     @parametrize
@@ -76,7 +76,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ScheduleGetResponse], schedule, path=["response"])
+        assert_matches_type(ScheduleGetResponse, schedule, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -88,7 +88,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         schedule = response.parse()
-        assert_matches_type(Optional[ScheduleGetResponse], schedule, path=["response"])
+        assert_matches_type(ScheduleGetResponse, schedule, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -100,7 +100,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             schedule = response.parse()
-            assert_matches_type(Optional[ScheduleGetResponse], schedule, path=["response"])
+            assert_matches_type(ScheduleGetResponse, schedule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -120,42 +120,44 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSchedules:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         schedule = await async_client.workers.scripts.schedules.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="[{'cron': '*/30 * * * *'}]",
+            body=[{"cron": "*/30 * * * *"}],
         )
-        assert_matches_type(Optional[ScheduleUpdateResponse], schedule, path=["response"])
+        assert_matches_type(ScheduleUpdateResponse, schedule, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.workers.scripts.schedules.with_raw_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="[{'cron': '*/30 * * * *'}]",
+            body=[{"cron": "*/30 * * * *"}],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         schedule = await response.parse()
-        assert_matches_type(Optional[ScheduleUpdateResponse], schedule, path=["response"])
+        assert_matches_type(ScheduleUpdateResponse, schedule, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.workers.scripts.schedules.with_streaming_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="[{'cron': '*/30 * * * *'}]",
+            body=[{"cron": "*/30 * * * *"}],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             schedule = await response.parse()
-            assert_matches_type(Optional[ScheduleUpdateResponse], schedule, path=["response"])
+            assert_matches_type(ScheduleUpdateResponse, schedule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -165,14 +167,14 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
             await async_client.workers.scripts.schedules.with_raw_response.update(
                 script_name="this-is_my_script-01",
                 account_id="",
-                body="[{'cron': '*/30 * * * *'}]",
+                body=[{"cron": "*/30 * * * *"}],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
             await async_client.workers.scripts.schedules.with_raw_response.update(
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                body="[{'cron': '*/30 * * * *'}]",
+                body=[{"cron": "*/30 * * * *"}],
             )
 
     @parametrize
@@ -181,7 +183,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ScheduleGetResponse], schedule, path=["response"])
+        assert_matches_type(ScheduleGetResponse, schedule, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -193,7 +195,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         schedule = await response.parse()
-        assert_matches_type(Optional[ScheduleGetResponse], schedule, path=["response"])
+        assert_matches_type(ScheduleGetResponse, schedule, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -205,7 +207,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             schedule = await response.parse()
-            assert_matches_type(Optional[ScheduleGetResponse], schedule, path=["response"])
+            assert_matches_type(ScheduleGetResponse, schedule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/workers/scripts/test_script_and_version_settings.py b/tests/api_resources/workers/scripts/test_script_and_version_settings.py
new file mode 100644
index 00000000000..82a6d0cd8dd
--- /dev/null
+++ b/tests/api_resources/workers/scripts/test_script_and_version_settings.py
@@ -0,0 +1,353 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.workers.scripts import (
+    ScriptAndVersionSettingGetResponse,
+    ScriptAndVersionSettingEditResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestScriptAndVersionSettings:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="422 Unprocessable Entity: needs schema update which is merged but not published")
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        script_and_version_setting = client.workers.scripts.script_and_version_settings.edit(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ScriptAndVersionSettingEditResponse, script_and_version_setting, path=["response"])
+
+    @pytest.mark.skip(reason="422 Unprocessable Entity: needs schema update which is merged but not published")
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        script_and_version_setting = client.workers.scripts.script_and_version_settings.edit(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            settings={
+                "bindings": [
+                    {
+                        "name": "MY_ENV_VAR",
+                        "text": "my_data",
+                        "type": "plain_text",
+                    }
+                ],
+                "compatibility_date": "2021-01-01",
+                "compatibility_flags": ["nodejs_compat"],
+                "limits": {"cpu_ms": 50},
+                "logpush": False,
+                "migrations": {
+                    "deleted_classes": ["string"],
+                    "new_classes": ["string"],
+                    "new_sqlite_classes": ["string"],
+                    "new_tag": "v2",
+                    "old_tag": "v1",
+                    "renamed_classes": [
+                        {
+                            "from": "from",
+                            "to": "to",
+                        }
+                    ],
+                    "transferred_classes": [
+                        {
+                            "from": "from",
+                            "from_script": "from_script",
+                            "to": "to",
+                        }
+                    ],
+                },
+                "observability": {
+                    "enabled": True,
+                    "head_sampling_rate": 0.1,
+                    "logs": {
+                        "enabled": True,
+                        "invocation_logs": True,
+                        "destinations": ["cloudflare"],
+                        "head_sampling_rate": 0.1,
+                        "persist": True,
+                    },
+                },
+                "placement": {"mode": "smart"},
+                "tags": ["my-team", "my-public-api"],
+                "tail_consumers": [
+                    {
+                        "service": "my-log-consumer",
+                        "environment": "production",
+                        "namespace": "my-namespace",
+                    }
+                ],
+                "usage_model": "standard",
+            },
+        )
+        assert_matches_type(ScriptAndVersionSettingEditResponse, script_and_version_setting, path=["response"])
+
+    @pytest.mark.skip(reason="422 Unprocessable Entity: needs schema update which is merged but not published")
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.workers.scripts.script_and_version_settings.with_raw_response.edit(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        script_and_version_setting = response.parse()
+        assert_matches_type(ScriptAndVersionSettingEditResponse, script_and_version_setting, path=["response"])
+
+    @pytest.mark.skip(reason="422 Unprocessable Entity: needs schema update which is merged but not published")
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.workers.scripts.script_and_version_settings.with_streaming_response.edit(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            script_and_version_setting = response.parse()
+            assert_matches_type(ScriptAndVersionSettingEditResponse, script_and_version_setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="422 Unprocessable Entity: needs schema update which is merged but not published")
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.scripts.script_and_version_settings.with_raw_response.edit(
+                script_name="this-is_my_script-01",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            client.workers.scripts.script_and_version_settings.with_raw_response.edit(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        script_and_version_setting = client.workers.scripts.script_and_version_settings.get(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ScriptAndVersionSettingGetResponse, script_and_version_setting, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.workers.scripts.script_and_version_settings.with_raw_response.get(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        script_and_version_setting = response.parse()
+        assert_matches_type(ScriptAndVersionSettingGetResponse, script_and_version_setting, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.workers.scripts.script_and_version_settings.with_streaming_response.get(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            script_and_version_setting = response.parse()
+            assert_matches_type(ScriptAndVersionSettingGetResponse, script_and_version_setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.scripts.script_and_version_settings.with_raw_response.get(
+                script_name="this-is_my_script-01",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            client.workers.scripts.script_and_version_settings.with_raw_response.get(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncScriptAndVersionSettings:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="422 Unprocessable Entity: needs schema update which is merged but not published")
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        script_and_version_setting = await async_client.workers.scripts.script_and_version_settings.edit(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ScriptAndVersionSettingEditResponse, script_and_version_setting, path=["response"])
+
+    @pytest.mark.skip(reason="422 Unprocessable Entity: needs schema update which is merged but not published")
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        script_and_version_setting = await async_client.workers.scripts.script_and_version_settings.edit(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            settings={
+                "bindings": [
+                    {
+                        "name": "MY_ENV_VAR",
+                        "text": "my_data",
+                        "type": "plain_text",
+                    }
+                ],
+                "compatibility_date": "2021-01-01",
+                "compatibility_flags": ["nodejs_compat"],
+                "limits": {"cpu_ms": 50},
+                "logpush": False,
+                "migrations": {
+                    "deleted_classes": ["string"],
+                    "new_classes": ["string"],
+                    "new_sqlite_classes": ["string"],
+                    "new_tag": "v2",
+                    "old_tag": "v1",
+                    "renamed_classes": [
+                        {
+                            "from": "from",
+                            "to": "to",
+                        }
+                    ],
+                    "transferred_classes": [
+                        {
+                            "from": "from",
+                            "from_script": "from_script",
+                            "to": "to",
+                        }
+                    ],
+                },
+                "observability": {
+                    "enabled": True,
+                    "head_sampling_rate": 0.1,
+                    "logs": {
+                        "enabled": True,
+                        "invocation_logs": True,
+                        "destinations": ["cloudflare"],
+                        "head_sampling_rate": 0.1,
+                        "persist": True,
+                    },
+                },
+                "placement": {"mode": "smart"},
+                "tags": ["my-team", "my-public-api"],
+                "tail_consumers": [
+                    {
+                        "service": "my-log-consumer",
+                        "environment": "production",
+                        "namespace": "my-namespace",
+                    }
+                ],
+                "usage_model": "standard",
+            },
+        )
+        assert_matches_type(ScriptAndVersionSettingEditResponse, script_and_version_setting, path=["response"])
+
+    @pytest.mark.skip(reason="422 Unprocessable Entity: needs schema update which is merged but not published")
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.scripts.script_and_version_settings.with_raw_response.edit(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        script_and_version_setting = await response.parse()
+        assert_matches_type(ScriptAndVersionSettingEditResponse, script_and_version_setting, path=["response"])
+
+    @pytest.mark.skip(reason="422 Unprocessable Entity: needs schema update which is merged but not published")
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.scripts.script_and_version_settings.with_streaming_response.edit(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            script_and_version_setting = await response.parse()
+            assert_matches_type(ScriptAndVersionSettingEditResponse, script_and_version_setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="422 Unprocessable Entity: needs schema update which is merged but not published")
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.scripts.script_and_version_settings.with_raw_response.edit(
+                script_name="this-is_my_script-01",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            await async_client.workers.scripts.script_and_version_settings.with_raw_response.edit(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        script_and_version_setting = await async_client.workers.scripts.script_and_version_settings.get(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ScriptAndVersionSettingGetResponse, script_and_version_setting, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.scripts.script_and_version_settings.with_raw_response.get(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        script_and_version_setting = await response.parse()
+        assert_matches_type(ScriptAndVersionSettingGetResponse, script_and_version_setting, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.scripts.script_and_version_settings.with_streaming_response.get(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            script_and_version_setting = await response.parse()
+            assert_matches_type(ScriptAndVersionSettingGetResponse, script_and_version_setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.scripts.script_and_version_settings.with_raw_response.get(
+                script_name="this-is_my_script-01",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            await async_client.workers.scripts.script_and_version_settings.with_raw_response.get(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/workers/scripts/test_secrets.py b/tests/api_resources/workers/scripts/test_secrets.py
new file mode 100644
index 00000000000..f221cd838f3
--- /dev/null
+++ b/tests/api_resources/workers/scripts/test_secrets.py
@@ -0,0 +1,707 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.workers.scripts import (
+    SecretGetResponse,
+    SecretListResponse,
+    SecretUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSecrets:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update_overload_1(self, client: Cloudflare) -> None:
+        secret = client.workers.scripts.secrets.update(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="myBinding",
+            text="My secret.",
+            type="secret_text",
+        )
+        assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+
+    @parametrize
+    def test_raw_response_update_overload_1(self, client: Cloudflare) -> None:
+        response = client.workers.scripts.secrets.with_raw_response.update(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="myBinding",
+            text="My secret.",
+            type="secret_text",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = response.parse()
+        assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update_overload_1(self, client: Cloudflare) -> None:
+        with client.workers.scripts.secrets.with_streaming_response.update(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="myBinding",
+            text="My secret.",
+            type="secret_text",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = response.parse()
+            assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.scripts.secrets.with_raw_response.update(
+                script_name="this-is_my_script-01",
+                account_id="",
+                name="myBinding",
+                text="My secret.",
+                type="secret_text",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            client.workers.scripts.secrets.with_raw_response.update(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="myBinding",
+                text="My secret.",
+                type="secret_text",
+            )
+
+    @parametrize
+    def test_method_update_overload_2(self, client: Cloudflare) -> None:
+        secret = client.workers.scripts.secrets.update(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            algorithm={},
+            format="raw",
+            name="myBinding",
+            type="secret_key",
+            usages=["encrypt", "decrypt"],
+        )
+        assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        secret = client.workers.scripts.secrets.update(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            algorithm={},
+            format="raw",
+            name="myBinding",
+            type="secret_key",
+            usages=["encrypt", "decrypt"],
+            key_base64="key_base64",
+            key_jwk={},
+        )
+        assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+
+    @parametrize
+    def test_raw_response_update_overload_2(self, client: Cloudflare) -> None:
+        response = client.workers.scripts.secrets.with_raw_response.update(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            algorithm={},
+            format="raw",
+            name="myBinding",
+            type="secret_key",
+            usages=["encrypt", "decrypt"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = response.parse()
+        assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update_overload_2(self, client: Cloudflare) -> None:
+        with client.workers.scripts.secrets.with_streaming_response.update(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            algorithm={},
+            format="raw",
+            name="myBinding",
+            type="secret_key",
+            usages=["encrypt", "decrypt"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = response.parse()
+            assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.scripts.secrets.with_raw_response.update(
+                script_name="this-is_my_script-01",
+                account_id="",
+                algorithm={},
+                format="raw",
+                name="myBinding",
+                type="secret_key",
+                usages=["encrypt", "decrypt"],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            client.workers.scripts.secrets.with_raw_response.update(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                algorithm={},
+                format="raw",
+                name="myBinding",
+                type="secret_key",
+                usages=["encrypt", "decrypt"],
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        secret = client.workers.scripts.secrets.list(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[SecretListResponse], secret, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.workers.scripts.secrets.with_raw_response.list(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = response.parse()
+        assert_matches_type(SyncSinglePage[SecretListResponse], secret, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.workers.scripts.secrets.with_streaming_response.list(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = response.parse()
+            assert_matches_type(SyncSinglePage[SecretListResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.scripts.secrets.with_raw_response.list(
+                script_name="this-is_my_script-01",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            client.workers.scripts.secrets.with_raw_response.list(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        secret = client.workers.scripts.secrets.delete(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+        )
+        assert_matches_type(object, secret, path=["response"])
+
+    @parametrize
+    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
+        secret = client.workers.scripts.secrets.delete(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+            url_encoded=True,
+        )
+        assert_matches_type(object, secret, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.workers.scripts.secrets.with_raw_response.delete(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = response.parse()
+        assert_matches_type(object, secret, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.workers.scripts.secrets.with_streaming_response.delete(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = response.parse()
+            assert_matches_type(object, secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.scripts.secrets.with_raw_response.delete(
+                secret_name="mySecret",
+                account_id="",
+                script_name="this-is_my_script-01",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            client.workers.scripts.secrets.with_raw_response.delete(
+                secret_name="mySecret",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                script_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `secret_name` but received ''"):
+            client.workers.scripts.secrets.with_raw_response.delete(
+                secret_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                script_name="this-is_my_script-01",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        secret = client.workers.scripts.secrets.get(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+        )
+        assert_matches_type(Optional[SecretGetResponse], secret, path=["response"])
+
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        secret = client.workers.scripts.secrets.get(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+            url_encoded=True,
+        )
+        assert_matches_type(Optional[SecretGetResponse], secret, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.workers.scripts.secrets.with_raw_response.get(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = response.parse()
+        assert_matches_type(Optional[SecretGetResponse], secret, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.workers.scripts.secrets.with_streaming_response.get(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = response.parse()
+            assert_matches_type(Optional[SecretGetResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.scripts.secrets.with_raw_response.get(
+                secret_name="mySecret",
+                account_id="",
+                script_name="this-is_my_script-01",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            client.workers.scripts.secrets.with_raw_response.get(
+                secret_name="mySecret",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                script_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `secret_name` but received ''"):
+            client.workers.scripts.secrets.with_raw_response.get(
+                secret_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                script_name="this-is_my_script-01",
+            )
+
+
+class TestAsyncSecrets:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.workers.scripts.secrets.update(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="myBinding",
+            text="My secret.",
+            type="secret_text",
+        )
+        assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.scripts.secrets.with_raw_response.update(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="myBinding",
+            text="My secret.",
+            type="secret_text",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = await response.parse()
+        assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.scripts.secrets.with_streaming_response.update(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            name="myBinding",
+            text="My secret.",
+            type="secret_text",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = await response.parse()
+            assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.scripts.secrets.with_raw_response.update(
+                script_name="this-is_my_script-01",
+                account_id="",
+                name="myBinding",
+                text="My secret.",
+                type="secret_text",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            await async_client.workers.scripts.secrets.with_raw_response.update(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                name="myBinding",
+                text="My secret.",
+                type="secret_text",
+            )
+
+    @parametrize
+    async def test_method_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.workers.scripts.secrets.update(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            algorithm={},
+            format="raw",
+            name="myBinding",
+            type="secret_key",
+            usages=["encrypt", "decrypt"],
+        )
+        assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.workers.scripts.secrets.update(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            algorithm={},
+            format="raw",
+            name="myBinding",
+            type="secret_key",
+            usages=["encrypt", "decrypt"],
+            key_base64="key_base64",
+            key_jwk={},
+        )
+        assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.scripts.secrets.with_raw_response.update(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            algorithm={},
+            format="raw",
+            name="myBinding",
+            type="secret_key",
+            usages=["encrypt", "decrypt"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = await response.parse()
+        assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.scripts.secrets.with_streaming_response.update(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            algorithm={},
+            format="raw",
+            name="myBinding",
+            type="secret_key",
+            usages=["encrypt", "decrypt"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = await response.parse()
+            assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.scripts.secrets.with_raw_response.update(
+                script_name="this-is_my_script-01",
+                account_id="",
+                algorithm={},
+                format="raw",
+                name="myBinding",
+                type="secret_key",
+                usages=["encrypt", "decrypt"],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            await async_client.workers.scripts.secrets.with_raw_response.update(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                algorithm={},
+                format="raw",
+                name="myBinding",
+                type="secret_key",
+                usages=["encrypt", "decrypt"],
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.workers.scripts.secrets.list(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[SecretListResponse], secret, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.scripts.secrets.with_raw_response.list(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = await response.parse()
+        assert_matches_type(AsyncSinglePage[SecretListResponse], secret, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.scripts.secrets.with_streaming_response.list(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = await response.parse()
+            assert_matches_type(AsyncSinglePage[SecretListResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.scripts.secrets.with_raw_response.list(
+                script_name="this-is_my_script-01",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            await async_client.workers.scripts.secrets.with_raw_response.list(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.workers.scripts.secrets.delete(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+        )
+        assert_matches_type(object, secret, path=["response"])
+
+    @parametrize
+    async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.workers.scripts.secrets.delete(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+            url_encoded=True,
+        )
+        assert_matches_type(object, secret, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.scripts.secrets.with_raw_response.delete(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = await response.parse()
+        assert_matches_type(object, secret, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.scripts.secrets.with_streaming_response.delete(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = await response.parse()
+            assert_matches_type(object, secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.scripts.secrets.with_raw_response.delete(
+                secret_name="mySecret",
+                account_id="",
+                script_name="this-is_my_script-01",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            await async_client.workers.scripts.secrets.with_raw_response.delete(
+                secret_name="mySecret",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                script_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `secret_name` but received ''"):
+            await async_client.workers.scripts.secrets.with_raw_response.delete(
+                secret_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                script_name="this-is_my_script-01",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.workers.scripts.secrets.get(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+        )
+        assert_matches_type(Optional[SecretGetResponse], secret, path=["response"])
+
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.workers.scripts.secrets.get(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+            url_encoded=True,
+        )
+        assert_matches_type(Optional[SecretGetResponse], secret, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.scripts.secrets.with_raw_response.get(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = await response.parse()
+        assert_matches_type(Optional[SecretGetResponse], secret, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.scripts.secrets.with_streaming_response.get(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            script_name="this-is_my_script-01",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = await response.parse()
+            assert_matches_type(Optional[SecretGetResponse], secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.scripts.secrets.with_raw_response.get(
+                secret_name="mySecret",
+                account_id="",
+                script_name="this-is_my_script-01",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            await async_client.workers.scripts.secrets.with_raw_response.get(
+                secret_name="mySecret",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                script_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `secret_name` but received ''"):
+            await async_client.workers.scripts.secrets.with_raw_response.get(
+                secret_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                script_name="this-is_my_script-01",
+            )
diff --git a/tests/api_resources/workers/scripts/test_settings.py b/tests/api_resources/workers/scripts/test_settings.py
index cb3a6f85760..97b324158ff 100644
--- a/tests/api_resources/workers/scripts/test_settings.py
+++ b/tests/api_resources/workers/scripts/test_settings.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -23,7 +23,7 @@ def test_method_edit(self, client: Cloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ScriptSetting], setting, path=["response"])
+        assert_matches_type(ScriptSetting, setting, path=["response"])
 
     @parametrize
     def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
@@ -31,25 +31,27 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             logpush=False,
-            tail_consumers=[
-                {
-                    "environment": "production",
-                    "namespace": "my-namespace",
-                    "service": "my-log-consumer",
+            observability={
+                "enabled": True,
+                "head_sampling_rate": 0.1,
+                "logs": {
+                    "enabled": True,
+                    "invocation_logs": True,
+                    "destinations": ["cloudflare"],
+                    "head_sampling_rate": 0.1,
+                    "persist": True,
                 },
+            },
+            tags=["my-team", "my-public-api"],
+            tail_consumers=[
                 {
-                    "environment": "production",
-                    "namespace": "my-namespace",
                     "service": "my-log-consumer",
-                },
-                {
                     "environment": "production",
                     "namespace": "my-namespace",
-                    "service": "my-log-consumer",
-                },
+                }
             ],
         )
-        assert_matches_type(Optional[ScriptSetting], setting, path=["response"])
+        assert_matches_type(ScriptSetting, setting, path=["response"])
 
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
@@ -61,7 +63,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         setting = response.parse()
-        assert_matches_type(Optional[ScriptSetting], setting, path=["response"])
+        assert_matches_type(ScriptSetting, setting, path=["response"])
 
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
@@ -73,7 +75,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             setting = response.parse()
-            assert_matches_type(Optional[ScriptSetting], setting, path=["response"])
+            assert_matches_type(ScriptSetting, setting, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -97,7 +99,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ScriptSetting], setting, path=["response"])
+        assert_matches_type(ScriptSetting, setting, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -109,7 +111,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         setting = response.parse()
-        assert_matches_type(Optional[ScriptSetting], setting, path=["response"])
+        assert_matches_type(ScriptSetting, setting, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -121,7 +123,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             setting = response.parse()
-            assert_matches_type(Optional[ScriptSetting], setting, path=["response"])
+            assert_matches_type(ScriptSetting, setting, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -141,7 +143,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSettings:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
@@ -149,7 +153,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ScriptSetting], setting, path=["response"])
+        assert_matches_type(ScriptSetting, setting, path=["response"])
 
     @parametrize
     async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -157,25 +161,27 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             logpush=False,
-            tail_consumers=[
-                {
-                    "environment": "production",
-                    "namespace": "my-namespace",
-                    "service": "my-log-consumer",
+            observability={
+                "enabled": True,
+                "head_sampling_rate": 0.1,
+                "logs": {
+                    "enabled": True,
+                    "invocation_logs": True,
+                    "destinations": ["cloudflare"],
+                    "head_sampling_rate": 0.1,
+                    "persist": True,
                 },
+            },
+            tags=["my-team", "my-public-api"],
+            tail_consumers=[
                 {
-                    "environment": "production",
-                    "namespace": "my-namespace",
                     "service": "my-log-consumer",
-                },
-                {
                     "environment": "production",
                     "namespace": "my-namespace",
-                    "service": "my-log-consumer",
-                },
+                }
             ],
         )
-        assert_matches_type(Optional[ScriptSetting], setting, path=["response"])
+        assert_matches_type(ScriptSetting, setting, path=["response"])
 
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -187,7 +193,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         setting = await response.parse()
-        assert_matches_type(Optional[ScriptSetting], setting, path=["response"])
+        assert_matches_type(ScriptSetting, setting, path=["response"])
 
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -199,7 +205,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             setting = await response.parse()
-            assert_matches_type(Optional[ScriptSetting], setting, path=["response"])
+            assert_matches_type(ScriptSetting, setting, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -223,7 +229,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ScriptSetting], setting, path=["response"])
+        assert_matches_type(ScriptSetting, setting, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -235,7 +241,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         setting = await response.parse()
-        assert_matches_type(Optional[ScriptSetting], setting, path=["response"])
+        assert_matches_type(ScriptSetting, setting, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -247,7 +253,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             setting = await response.parse()
-            assert_matches_type(Optional[ScriptSetting], setting, path=["response"])
+            assert_matches_type(ScriptSetting, setting, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/workers/scripts/test_subdomain.py b/tests/api_resources/workers/scripts/test_subdomain.py
new file mode 100644
index 00000000000..591d6eb81fa
--- /dev/null
+++ b/tests/api_resources/workers/scripts/test_subdomain.py
@@ -0,0 +1,346 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.workers.scripts import (
+    SubdomainGetResponse,
+    SubdomainCreateResponse,
+    SubdomainDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSubdomain:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        subdomain = client.workers.scripts.subdomain.create(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        )
+        assert_matches_type(SubdomainCreateResponse, subdomain, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        subdomain = client.workers.scripts.subdomain.create(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+            previews_enabled=False,
+        )
+        assert_matches_type(SubdomainCreateResponse, subdomain, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.workers.scripts.subdomain.with_raw_response.create(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subdomain = response.parse()
+        assert_matches_type(SubdomainCreateResponse, subdomain, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.workers.scripts.subdomain.with_streaming_response.create(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subdomain = response.parse()
+            assert_matches_type(SubdomainCreateResponse, subdomain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.scripts.subdomain.with_raw_response.create(
+                script_name="this-is_my_script-01",
+                account_id="",
+                enabled=True,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            client.workers.scripts.subdomain.with_raw_response.create(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                enabled=True,
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        subdomain = client.workers.scripts.subdomain.delete(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SubdomainDeleteResponse, subdomain, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.workers.scripts.subdomain.with_raw_response.delete(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subdomain = response.parse()
+        assert_matches_type(SubdomainDeleteResponse, subdomain, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.workers.scripts.subdomain.with_streaming_response.delete(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subdomain = response.parse()
+            assert_matches_type(SubdomainDeleteResponse, subdomain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.scripts.subdomain.with_raw_response.delete(
+                script_name="this-is_my_script-01",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            client.workers.scripts.subdomain.with_raw_response.delete(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        subdomain = client.workers.scripts.subdomain.get(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SubdomainGetResponse, subdomain, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.workers.scripts.subdomain.with_raw_response.get(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subdomain = response.parse()
+        assert_matches_type(SubdomainGetResponse, subdomain, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.workers.scripts.subdomain.with_streaming_response.get(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subdomain = response.parse()
+            assert_matches_type(SubdomainGetResponse, subdomain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.scripts.subdomain.with_raw_response.get(
+                script_name="this-is_my_script-01",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            client.workers.scripts.subdomain.with_raw_response.get(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncSubdomain:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        subdomain = await async_client.workers.scripts.subdomain.create(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        )
+        assert_matches_type(SubdomainCreateResponse, subdomain, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        subdomain = await async_client.workers.scripts.subdomain.create(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+            previews_enabled=False,
+        )
+        assert_matches_type(SubdomainCreateResponse, subdomain, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.scripts.subdomain.with_raw_response.create(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subdomain = await response.parse()
+        assert_matches_type(SubdomainCreateResponse, subdomain, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.scripts.subdomain.with_streaming_response.create(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            enabled=True,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subdomain = await response.parse()
+            assert_matches_type(SubdomainCreateResponse, subdomain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.scripts.subdomain.with_raw_response.create(
+                script_name="this-is_my_script-01",
+                account_id="",
+                enabled=True,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            await async_client.workers.scripts.subdomain.with_raw_response.create(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                enabled=True,
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        subdomain = await async_client.workers.scripts.subdomain.delete(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SubdomainDeleteResponse, subdomain, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.scripts.subdomain.with_raw_response.delete(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subdomain = await response.parse()
+        assert_matches_type(SubdomainDeleteResponse, subdomain, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.scripts.subdomain.with_streaming_response.delete(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subdomain = await response.parse()
+            assert_matches_type(SubdomainDeleteResponse, subdomain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.scripts.subdomain.with_raw_response.delete(
+                script_name="this-is_my_script-01",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            await async_client.workers.scripts.subdomain.with_raw_response.delete(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        subdomain = await async_client.workers.scripts.subdomain.get(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SubdomainGetResponse, subdomain, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.scripts.subdomain.with_raw_response.get(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subdomain = await response.parse()
+        assert_matches_type(SubdomainGetResponse, subdomain, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.scripts.subdomain.with_streaming_response.get(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subdomain = await response.parse()
+            assert_matches_type(SubdomainGetResponse, subdomain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.scripts.subdomain.with_raw_response.get(
+                script_name="this-is_my_script-01",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            await async_client.workers.scripts.subdomain.with_raw_response.get(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/workers/scripts/test_tail.py b/tests/api_resources/workers/scripts/test_tail.py
index 34740c57e6d..4041a0a60d6 100644
--- a/tests/api_resources/workers/scripts/test_tail.py
+++ b/tests/api_resources/workers/scripts/test_tail.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -24,7 +24,7 @@ def test_method_create(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             body={},
         )
-        assert_matches_type(Optional[TailCreateResponse], tail, path=["response"])
+        assert_matches_type(TailCreateResponse, tail, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
@@ -37,7 +37,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         tail = response.parse()
-        assert_matches_type(Optional[TailCreateResponse], tail, path=["response"])
+        assert_matches_type(TailCreateResponse, tail, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
@@ -50,7 +50,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             tail = response.parse()
-            assert_matches_type(Optional[TailCreateResponse], tail, path=["response"])
+            assert_matches_type(TailCreateResponse, tail, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -73,7 +73,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         tail = client.workers.scripts.tail.delete(
-            id="03dc9f77817b488fb26c5861ec18f791",
+            id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             script_name="this-is_my_script-01",
         )
@@ -82,7 +82,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.workers.scripts.tail.with_raw_response.delete(
-            id="03dc9f77817b488fb26c5861ec18f791",
+            id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             script_name="this-is_my_script-01",
         )
@@ -95,7 +95,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.workers.scripts.tail.with_streaming_response.delete(
-            id="03dc9f77817b488fb26c5861ec18f791",
+            id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             script_name="this-is_my_script-01",
         ) as response:
@@ -111,14 +111,14 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.workers.scripts.tail.with_raw_response.delete(
-                id="03dc9f77817b488fb26c5861ec18f791",
+                id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
                 script_name="this-is_my_script-01",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
             client.workers.scripts.tail.with_raw_response.delete(
-                id="03dc9f77817b488fb26c5861ec18f791",
+                id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 script_name="",
             )
@@ -136,7 +136,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[TailGetResponse], tail, path=["response"])
+        assert_matches_type(TailGetResponse, tail, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -148,7 +148,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         tail = response.parse()
-        assert_matches_type(Optional[TailGetResponse], tail, path=["response"])
+        assert_matches_type(TailGetResponse, tail, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -160,7 +160,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             tail = response.parse()
-            assert_matches_type(Optional[TailGetResponse], tail, path=["response"])
+            assert_matches_type(TailGetResponse, tail, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -180,7 +180,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTail:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -189,7 +191,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             body={},
         )
-        assert_matches_type(Optional[TailCreateResponse], tail, path=["response"])
+        assert_matches_type(TailCreateResponse, tail, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
@@ -202,7 +204,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         tail = await response.parse()
-        assert_matches_type(Optional[TailCreateResponse], tail, path=["response"])
+        assert_matches_type(TailCreateResponse, tail, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
@@ -215,7 +217,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             tail = await response.parse()
-            assert_matches_type(Optional[TailCreateResponse], tail, path=["response"])
+            assert_matches_type(TailCreateResponse, tail, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -238,7 +240,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         tail = await async_client.workers.scripts.tail.delete(
-            id="03dc9f77817b488fb26c5861ec18f791",
+            id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             script_name="this-is_my_script-01",
         )
@@ -247,7 +249,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.workers.scripts.tail.with_raw_response.delete(
-            id="03dc9f77817b488fb26c5861ec18f791",
+            id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             script_name="this-is_my_script-01",
         )
@@ -260,7 +262,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.workers.scripts.tail.with_streaming_response.delete(
-            id="03dc9f77817b488fb26c5861ec18f791",
+            id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             script_name="this-is_my_script-01",
         ) as response:
@@ -276,14 +278,14 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.workers.scripts.tail.with_raw_response.delete(
-                id="03dc9f77817b488fb26c5861ec18f791",
+                id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
                 script_name="this-is_my_script-01",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
             await async_client.workers.scripts.tail.with_raw_response.delete(
-                id="03dc9f77817b488fb26c5861ec18f791",
+                id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 script_name="",
             )
@@ -301,7 +303,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[TailGetResponse], tail, path=["response"])
+        assert_matches_type(TailGetResponse, tail, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -313,7 +315,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         tail = await response.parse()
-        assert_matches_type(Optional[TailGetResponse], tail, path=["response"])
+        assert_matches_type(TailGetResponse, tail, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -325,7 +327,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             tail = await response.parse()
-            assert_matches_type(Optional[TailGetResponse], tail, path=["response"])
+            assert_matches_type(TailGetResponse, tail, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/workers/scripts/test_versions.py b/tests/api_resources/workers/scripts/test_versions.py
index 4a0d47fbdc4..fc58f6530c4 100644
--- a/tests/api_resources/workers/scripts/test_versions.py
+++ b/tests/api_resources/workers/scripts/test_versions.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -28,8 +28,9 @@ def test_method_create(self, client: Cloudflare) -> None:
         version = client.workers.scripts.versions.create(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={"main_module": "worker.js"},
         )
-        assert_matches_type(Optional[VersionCreateResponse], version, path=["response"])
+        assert_matches_type(VersionCreateResponse, version, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -37,9 +38,10 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         version = client.workers.scripts.versions.create(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            any_part_name=[b"raw file contents", b"raw file contents", b"raw file contents"],
             metadata={
+                "main_module": "worker.js",
                 "annotations": {
+                    "workers_alias": "staging",
                     "workers_message": "Fixed worker code.",
                     "workers_tag": "workers/tag",
                 },
@@ -50,14 +52,14 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                         "type": "plain_text",
                     }
                 ],
-                "compatibility_date": "2023-07-25",
-                "compatibility_flags": ["string", "string", "string"],
-                "keep_bindings": ["string", "string", "string"],
-                "main_module": "worker.js",
+                "compatibility_date": "2021-01-01",
+                "compatibility_flags": ["nodejs_compat"],
+                "keep_bindings": ["string"],
                 "usage_model": "standard",
             },
+            files=[b"raw file contents"],
         )
-        assert_matches_type(Optional[VersionCreateResponse], version, path=["response"])
+        assert_matches_type(VersionCreateResponse, version, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -65,12 +67,13 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.workers.scripts.versions.with_raw_response.create(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={"main_module": "worker.js"},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         version = response.parse()
-        assert_matches_type(Optional[VersionCreateResponse], version, path=["response"])
+        assert_matches_type(VersionCreateResponse, version, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -78,12 +81,13 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.workers.scripts.versions.with_streaming_response.create(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={"main_module": "worker.js"},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             version = response.parse()
-            assert_matches_type(Optional[VersionCreateResponse], version, path=["response"])
+            assert_matches_type(VersionCreateResponse, version, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -94,12 +98,14 @@ def test_path_params_create(self, client: Cloudflare) -> None:
             client.workers.scripts.versions.with_raw_response.create(
                 script_name="this-is_my_script-01",
                 account_id="",
+                metadata={"main_module": "worker.js"},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
             client.workers.scripts.versions.with_raw_response.create(
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                metadata={"main_module": "worker.js"},
             )
 
     @parametrize
@@ -168,7 +174,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             script_name="this-is_my_script-01",
         )
-        assert_matches_type(Optional[VersionGetResponse], version, path=["response"])
+        assert_matches_type(VersionGetResponse, version, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -181,7 +187,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         version = response.parse()
-        assert_matches_type(Optional[VersionGetResponse], version, path=["response"])
+        assert_matches_type(VersionGetResponse, version, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -194,7 +200,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             version = response.parse()
-            assert_matches_type(Optional[VersionGetResponse], version, path=["response"])
+            assert_matches_type(VersionGetResponse, version, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -223,7 +229,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncVersions:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -231,8 +239,9 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         version = await async_client.workers.scripts.versions.create(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={"main_module": "worker.js"},
         )
-        assert_matches_type(Optional[VersionCreateResponse], version, path=["response"])
+        assert_matches_type(VersionCreateResponse, version, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -240,9 +249,10 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
         version = await async_client.workers.scripts.versions.create(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            any_part_name=[b"raw file contents", b"raw file contents", b"raw file contents"],
             metadata={
+                "main_module": "worker.js",
                 "annotations": {
+                    "workers_alias": "staging",
                     "workers_message": "Fixed worker code.",
                     "workers_tag": "workers/tag",
                 },
@@ -253,14 +263,14 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                         "type": "plain_text",
                     }
                 ],
-                "compatibility_date": "2023-07-25",
-                "compatibility_flags": ["string", "string", "string"],
-                "keep_bindings": ["string", "string", "string"],
-                "main_module": "worker.js",
+                "compatibility_date": "2021-01-01",
+                "compatibility_flags": ["nodejs_compat"],
+                "keep_bindings": ["string"],
                 "usage_model": "standard",
             },
+            files=[b"raw file contents"],
         )
-        assert_matches_type(Optional[VersionCreateResponse], version, path=["response"])
+        assert_matches_type(VersionCreateResponse, version, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -268,12 +278,13 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.workers.scripts.versions.with_raw_response.create(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={"main_module": "worker.js"},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         version = await response.parse()
-        assert_matches_type(Optional[VersionCreateResponse], version, path=["response"])
+        assert_matches_type(VersionCreateResponse, version, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -281,12 +292,13 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
         async with async_client.workers.scripts.versions.with_streaming_response.create(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={"main_module": "worker.js"},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             version = await response.parse()
-            assert_matches_type(Optional[VersionCreateResponse], version, path=["response"])
+            assert_matches_type(VersionCreateResponse, version, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -297,12 +309,14 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
             await async_client.workers.scripts.versions.with_raw_response.create(
                 script_name="this-is_my_script-01",
                 account_id="",
+                metadata={"main_module": "worker.js"},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
             await async_client.workers.scripts.versions.with_raw_response.create(
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                metadata={"main_module": "worker.js"},
             )
 
     @parametrize
@@ -371,7 +385,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             script_name="this-is_my_script-01",
         )
-        assert_matches_type(Optional[VersionGetResponse], version, path=["response"])
+        assert_matches_type(VersionGetResponse, version, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -384,7 +398,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         version = await response.parse()
-        assert_matches_type(Optional[VersionGetResponse], version, path=["response"])
+        assert_matches_type(VersionGetResponse, version, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -397,7 +411,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             version = await response.parse()
-            assert_matches_type(Optional[VersionGetResponse], version, path=["response"])
+            assert_matches_type(VersionGetResponse, version, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/workers/test_account_settings.py b/tests/api_resources/workers/test_account_settings.py
index c08e890ea55..c158d4a0729 100644
--- a/tests/api_resources/workers/test_account_settings.py
+++ b/tests/api_resources/workers/test_account_settings.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -24,33 +24,39 @@ class TestAccountSettings:
     def test_method_update(self, client: Cloudflare) -> None:
         account_setting = client.workers.account_settings.update(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="{'default_usage_model': 'unbound'}",
         )
-        assert_matches_type(Optional[AccountSettingUpdateResponse], account_setting, path=["response"])
+        assert_matches_type(AccountSettingUpdateResponse, account_setting, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        account_setting = client.workers.account_settings.update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            default_usage_model="default_usage_model",
+            green_compute=True,
+        )
+        assert_matches_type(AccountSettingUpdateResponse, account_setting, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.workers.account_settings.with_raw_response.update(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="{'default_usage_model': 'unbound'}",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         account_setting = response.parse()
-        assert_matches_type(Optional[AccountSettingUpdateResponse], account_setting, path=["response"])
+        assert_matches_type(AccountSettingUpdateResponse, account_setting, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.workers.account_settings.with_streaming_response.update(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="{'default_usage_model': 'unbound'}",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             account_setting = response.parse()
-            assert_matches_type(Optional[AccountSettingUpdateResponse], account_setting, path=["response"])
+            assert_matches_type(AccountSettingUpdateResponse, account_setting, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -59,7 +65,6 @@ def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.workers.account_settings.with_raw_response.update(
                 account_id="",
-                body="{'default_usage_model': 'unbound'}",
             )
 
     @parametrize
@@ -67,7 +72,7 @@ def test_method_get(self, client: Cloudflare) -> None:
         account_setting = client.workers.account_settings.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[AccountSettingGetResponse], account_setting, path=["response"])
+        assert_matches_type(AccountSettingGetResponse, account_setting, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -78,7 +83,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         account_setting = response.parse()
-        assert_matches_type(Optional[AccountSettingGetResponse], account_setting, path=["response"])
+        assert_matches_type(AccountSettingGetResponse, account_setting, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -89,7 +94,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             account_setting = response.parse()
-            assert_matches_type(Optional[AccountSettingGetResponse], account_setting, path=["response"])
+            assert_matches_type(AccountSettingGetResponse, account_setting, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -102,39 +107,47 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncAccountSettings:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         account_setting = await async_client.workers.account_settings.update(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="{'default_usage_model': 'unbound'}",
         )
-        assert_matches_type(Optional[AccountSettingUpdateResponse], account_setting, path=["response"])
+        assert_matches_type(AccountSettingUpdateResponse, account_setting, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        account_setting = await async_client.workers.account_settings.update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            default_usage_model="default_usage_model",
+            green_compute=True,
+        )
+        assert_matches_type(AccountSettingUpdateResponse, account_setting, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.workers.account_settings.with_raw_response.update(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="{'default_usage_model': 'unbound'}",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         account_setting = await response.parse()
-        assert_matches_type(Optional[AccountSettingUpdateResponse], account_setting, path=["response"])
+        assert_matches_type(AccountSettingUpdateResponse, account_setting, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.workers.account_settings.with_streaming_response.update(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="{'default_usage_model': 'unbound'}",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             account_setting = await response.parse()
-            assert_matches_type(Optional[AccountSettingUpdateResponse], account_setting, path=["response"])
+            assert_matches_type(AccountSettingUpdateResponse, account_setting, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -143,7 +156,6 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.workers.account_settings.with_raw_response.update(
                 account_id="",
-                body="{'default_usage_model': 'unbound'}",
             )
 
     @parametrize
@@ -151,7 +163,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         account_setting = await async_client.workers.account_settings.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[AccountSettingGetResponse], account_setting, path=["response"])
+        assert_matches_type(AccountSettingGetResponse, account_setting, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -162,7 +174,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         account_setting = await response.parse()
-        assert_matches_type(Optional[AccountSettingGetResponse], account_setting, path=["response"])
+        assert_matches_type(AccountSettingGetResponse, account_setting, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -173,7 +185,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             account_setting = await response.parse()
-            assert_matches_type(Optional[AccountSettingGetResponse], account_setting, path=["response"])
+            assert_matches_type(AccountSettingGetResponse, account_setting, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/workers/test_ai.py b/tests/api_resources/workers/test_ai.py
deleted file mode 100644
index e67bf0eee20..00000000000
--- a/tests/api_resources/workers/test_ai.py
+++ /dev/null
@@ -1,1682 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.workers import AIRunResponse
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestAI:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_run_overload_1(self, client: Cloudflare) -> None:
-        ai = client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            text="x",
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_raw_response_run_overload_1(self, client: Cloudflare) -> None:
-        response = client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            text="x",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_streaming_response_run_overload_1(self, client: Cloudflare) -> None:
-        with client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            text="x",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_run_overload_1(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                text="x",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                text="x",
-            )
-
-    @parametrize
-    def test_method_run_overload_2(self, client: Cloudflare) -> None:
-        ai = client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prompt="x",
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_method_run_with_all_params_overload_2(self, client: Cloudflare) -> None:
-        ai = client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prompt="x",
-            guidance=0,
-            height=0,
-            image=[0, 0, 0],
-            image_b64="image_b64",
-            lora_weights=[0, 0, 0],
-            loras=["string", "string", "string"],
-            mask=[0, 0, 0],
-            negative_prompt="negative_prompt",
-            num_steps=0,
-            seed=0,
-            strength=0,
-            width=0,
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_raw_response_run_overload_2(self, client: Cloudflare) -> None:
-        response = client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prompt="x",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_streaming_response_run_overload_2(self, client: Cloudflare) -> None:
-        with client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prompt="x",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_run_overload_2(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                prompt="x",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prompt="x",
-            )
-
-    @parametrize
-    def test_method_run_overload_3(self, client: Cloudflare) -> None:
-        ai = client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            text="x",
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_raw_response_run_overload_3(self, client: Cloudflare) -> None:
-        response = client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            text="x",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_streaming_response_run_overload_3(self, client: Cloudflare) -> None:
-        with client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            text="x",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_run_overload_3(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                text="x",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                text="x",
-            )
-
-    @parametrize
-    def test_method_run_overload_4(self, client: Cloudflare) -> None:
-        ai = client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            audio=[0, 0, 0],
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_raw_response_run_overload_4(self, client: Cloudflare) -> None:
-        response = client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            audio=[0, 0, 0],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_streaming_response_run_overload_4(self, client: Cloudflare) -> None:
-        with client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            audio=[0, 0, 0],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_run_overload_4(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                audio=[0, 0, 0],
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                audio=[0, 0, 0],
-            )
-
-    @parametrize
-    def test_method_run_overload_5(self, client: Cloudflare) -> None:
-        ai = client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            image=[0, 0, 0],
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_raw_response_run_overload_5(self, client: Cloudflare) -> None:
-        response = client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            image=[0, 0, 0],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_streaming_response_run_overload_5(self, client: Cloudflare) -> None:
-        with client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            image=[0, 0, 0],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_run_overload_5(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                image=[0, 0, 0],
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                image=[0, 0, 0],
-            )
-
-    @parametrize
-    def test_method_run_overload_6(self, client: Cloudflare) -> None:
-        ai = client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_method_run_with_all_params_overload_6(self, client: Cloudflare) -> None:
-        ai = client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            image=[0, 0, 0],
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_raw_response_run_overload_6(self, client: Cloudflare) -> None:
-        response = client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_streaming_response_run_overload_6(self, client: Cloudflare) -> None:
-        with client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_run_overload_6(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_run_overload_7(self, client: Cloudflare) -> None:
-        ai = client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prompt="x",
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_method_run_with_all_params_overload_7(self, client: Cloudflare) -> None:
-        ai = client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prompt="x",
-            frequency_penalty=0,
-            lora="lora",
-            max_tokens=0,
-            presence_penalty=0,
-            raw=True,
-            repetition_penalty=0,
-            seed=1,
-            stream=True,
-            temperature=0,
-            top_k=1,
-            top_p=0,
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_raw_response_run_overload_7(self, client: Cloudflare) -> None:
-        response = client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prompt="x",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_streaming_response_run_overload_7(self, client: Cloudflare) -> None:
-        with client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prompt="x",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_run_overload_7(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                prompt="x",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prompt="x",
-            )
-
-    @parametrize
-    def test_method_run_overload_8(self, client: Cloudflare) -> None:
-        ai = client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            messages=[
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-            ],
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_method_run_with_all_params_overload_8(self, client: Cloudflare) -> None:
-        ai = client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            messages=[
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-            ],
-            frequency_penalty=0,
-            max_tokens=0,
-            presence_penalty=0,
-            repetition_penalty=0,
-            seed=1,
-            stream=True,
-            temperature=0,
-            tools=[
-                {
-                    "function": {
-                        "description": "description",
-                        "name": "name",
-                        "parameters": {
-                            "properties": {
-                                "foo": {
-                                    "description": "description",
-                                    "type": "type",
-                                }
-                            },
-                            "required": ["string", "string", "string"],
-                            "type": "type",
-                        },
-                    },
-                    "type": "type",
-                },
-                {
-                    "function": {
-                        "description": "description",
-                        "name": "name",
-                        "parameters": {
-                            "properties": {
-                                "foo": {
-                                    "description": "description",
-                                    "type": "type",
-                                }
-                            },
-                            "required": ["string", "string", "string"],
-                            "type": "type",
-                        },
-                    },
-                    "type": "type",
-                },
-                {
-                    "function": {
-                        "description": "description",
-                        "name": "name",
-                        "parameters": {
-                            "properties": {
-                                "foo": {
-                                    "description": "description",
-                                    "type": "type",
-                                }
-                            },
-                            "required": ["string", "string", "string"],
-                            "type": "type",
-                        },
-                    },
-                    "type": "type",
-                },
-            ],
-            top_k=1,
-            top_p=0,
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_raw_response_run_overload_8(self, client: Cloudflare) -> None:
-        response = client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            messages=[
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-            ],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_streaming_response_run_overload_8(self, client: Cloudflare) -> None:
-        with client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            messages=[
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-            ],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_run_overload_8(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                messages=[
-                    {
-                        "content": "content",
-                        "role": "role",
-                    },
-                    {
-                        "content": "content",
-                        "role": "role",
-                    },
-                    {
-                        "content": "content",
-                        "role": "role",
-                    },
-                ],
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                messages=[
-                    {
-                        "content": "content",
-                        "role": "role",
-                    },
-                    {
-                        "content": "content",
-                        "role": "role",
-                    },
-                    {
-                        "content": "content",
-                        "role": "role",
-                    },
-                ],
-            )
-
-    @parametrize
-    def test_method_run_overload_9(self, client: Cloudflare) -> None:
-        ai = client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            target_lang="target_lang",
-            text="x",
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_method_run_with_all_params_overload_9(self, client: Cloudflare) -> None:
-        ai = client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            target_lang="target_lang",
-            text="x",
-            source_lang="source_lang",
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_raw_response_run_overload_9(self, client: Cloudflare) -> None:
-        response = client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            target_lang="target_lang",
-            text="x",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_streaming_response_run_overload_9(self, client: Cloudflare) -> None:
-        with client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            target_lang="target_lang",
-            text="x",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_run_overload_9(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                target_lang="target_lang",
-                text="x",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                target_lang="target_lang",
-                text="x",
-            )
-
-    @parametrize
-    def test_method_run_overload_10(self, client: Cloudflare) -> None:
-        ai = client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            input_text="x",
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_method_run_with_all_params_overload_10(self, client: Cloudflare) -> None:
-        ai = client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            input_text="x",
-            max_length=0,
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_raw_response_run_overload_10(self, client: Cloudflare) -> None:
-        response = client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            input_text="x",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_streaming_response_run_overload_10(self, client: Cloudflare) -> None:
-        with client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            input_text="x",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_run_overload_10(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                input_text="x",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                input_text="x",
-            )
-
-    @parametrize
-    def test_method_run_overload_11(self, client: Cloudflare) -> None:
-        ai = client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            image=[0, 0, 0],
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_method_run_with_all_params_overload_11(self, client: Cloudflare) -> None:
-        ai = client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            image=[0, 0, 0],
-            max_tokens=0,
-            messages=[
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-            ],
-            prompt="prompt",
-            raw=True,
-            temperature=0,
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_raw_response_run_overload_11(self, client: Cloudflare) -> None:
-        response = client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            image=[0, 0, 0],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    def test_streaming_response_run_overload_11(self, client: Cloudflare) -> None:
-        with client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            image=[0, 0, 0],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_run_overload_11(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                image=[0, 0, 0],
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                image=[0, 0, 0],
-            )
-
-
-class TestAsyncAI:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_run_overload_1(self, async_client: AsyncCloudflare) -> None:
-        ai = await async_client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            text="x",
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_raw_response_run_overload_1(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            text="x",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = await response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_run_overload_1(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            text="x",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = await response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_run_overload_1(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                text="x",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                text="x",
-            )
-
-    @parametrize
-    async def test_method_run_overload_2(self, async_client: AsyncCloudflare) -> None:
-        ai = await async_client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prompt="x",
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_method_run_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
-        ai = await async_client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prompt="x",
-            guidance=0,
-            height=0,
-            image=[0, 0, 0],
-            image_b64="image_b64",
-            lora_weights=[0, 0, 0],
-            loras=["string", "string", "string"],
-            mask=[0, 0, 0],
-            negative_prompt="negative_prompt",
-            num_steps=0,
-            seed=0,
-            strength=0,
-            width=0,
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_raw_response_run_overload_2(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prompt="x",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = await response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_run_overload_2(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prompt="x",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = await response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_run_overload_2(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                prompt="x",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prompt="x",
-            )
-
-    @parametrize
-    async def test_method_run_overload_3(self, async_client: AsyncCloudflare) -> None:
-        ai = await async_client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            text="x",
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_raw_response_run_overload_3(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            text="x",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = await response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_run_overload_3(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            text="x",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = await response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_run_overload_3(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                text="x",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                text="x",
-            )
-
-    @parametrize
-    async def test_method_run_overload_4(self, async_client: AsyncCloudflare) -> None:
-        ai = await async_client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            audio=[0, 0, 0],
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_raw_response_run_overload_4(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            audio=[0, 0, 0],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = await response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_run_overload_4(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            audio=[0, 0, 0],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = await response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_run_overload_4(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                audio=[0, 0, 0],
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                audio=[0, 0, 0],
-            )
-
-    @parametrize
-    async def test_method_run_overload_5(self, async_client: AsyncCloudflare) -> None:
-        ai = await async_client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            image=[0, 0, 0],
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_raw_response_run_overload_5(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            image=[0, 0, 0],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = await response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_run_overload_5(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            image=[0, 0, 0],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = await response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_run_overload_5(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                image=[0, 0, 0],
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                image=[0, 0, 0],
-            )
-
-    @parametrize
-    async def test_method_run_overload_6(self, async_client: AsyncCloudflare) -> None:
-        ai = await async_client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_method_run_with_all_params_overload_6(self, async_client: AsyncCloudflare) -> None:
-        ai = await async_client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            image=[0, 0, 0],
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_raw_response_run_overload_6(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = await response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_run_overload_6(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = await response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_run_overload_6(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_run_overload_7(self, async_client: AsyncCloudflare) -> None:
-        ai = await async_client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prompt="x",
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_method_run_with_all_params_overload_7(self, async_client: AsyncCloudflare) -> None:
-        ai = await async_client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prompt="x",
-            frequency_penalty=0,
-            lora="lora",
-            max_tokens=0,
-            presence_penalty=0,
-            raw=True,
-            repetition_penalty=0,
-            seed=1,
-            stream=True,
-            temperature=0,
-            top_k=1,
-            top_p=0,
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_raw_response_run_overload_7(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prompt="x",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = await response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_run_overload_7(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            prompt="x",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = await response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_run_overload_7(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                prompt="x",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                prompt="x",
-            )
-
-    @parametrize
-    async def test_method_run_overload_8(self, async_client: AsyncCloudflare) -> None:
-        ai = await async_client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            messages=[
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-            ],
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_method_run_with_all_params_overload_8(self, async_client: AsyncCloudflare) -> None:
-        ai = await async_client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            messages=[
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-            ],
-            frequency_penalty=0,
-            max_tokens=0,
-            presence_penalty=0,
-            repetition_penalty=0,
-            seed=1,
-            stream=True,
-            temperature=0,
-            tools=[
-                {
-                    "function": {
-                        "description": "description",
-                        "name": "name",
-                        "parameters": {
-                            "properties": {
-                                "foo": {
-                                    "description": "description",
-                                    "type": "type",
-                                }
-                            },
-                            "required": ["string", "string", "string"],
-                            "type": "type",
-                        },
-                    },
-                    "type": "type",
-                },
-                {
-                    "function": {
-                        "description": "description",
-                        "name": "name",
-                        "parameters": {
-                            "properties": {
-                                "foo": {
-                                    "description": "description",
-                                    "type": "type",
-                                }
-                            },
-                            "required": ["string", "string", "string"],
-                            "type": "type",
-                        },
-                    },
-                    "type": "type",
-                },
-                {
-                    "function": {
-                        "description": "description",
-                        "name": "name",
-                        "parameters": {
-                            "properties": {
-                                "foo": {
-                                    "description": "description",
-                                    "type": "type",
-                                }
-                            },
-                            "required": ["string", "string", "string"],
-                            "type": "type",
-                        },
-                    },
-                    "type": "type",
-                },
-            ],
-            top_k=1,
-            top_p=0,
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_raw_response_run_overload_8(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            messages=[
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-            ],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = await response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_run_overload_8(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            messages=[
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-            ],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = await response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_run_overload_8(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                messages=[
-                    {
-                        "content": "content",
-                        "role": "role",
-                    },
-                    {
-                        "content": "content",
-                        "role": "role",
-                    },
-                    {
-                        "content": "content",
-                        "role": "role",
-                    },
-                ],
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                messages=[
-                    {
-                        "content": "content",
-                        "role": "role",
-                    },
-                    {
-                        "content": "content",
-                        "role": "role",
-                    },
-                    {
-                        "content": "content",
-                        "role": "role",
-                    },
-                ],
-            )
-
-    @parametrize
-    async def test_method_run_overload_9(self, async_client: AsyncCloudflare) -> None:
-        ai = await async_client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            target_lang="target_lang",
-            text="x",
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_method_run_with_all_params_overload_9(self, async_client: AsyncCloudflare) -> None:
-        ai = await async_client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            target_lang="target_lang",
-            text="x",
-            source_lang="source_lang",
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_raw_response_run_overload_9(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            target_lang="target_lang",
-            text="x",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = await response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_run_overload_9(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            target_lang="target_lang",
-            text="x",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = await response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_run_overload_9(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                target_lang="target_lang",
-                text="x",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                target_lang="target_lang",
-                text="x",
-            )
-
-    @parametrize
-    async def test_method_run_overload_10(self, async_client: AsyncCloudflare) -> None:
-        ai = await async_client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            input_text="x",
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_method_run_with_all_params_overload_10(self, async_client: AsyncCloudflare) -> None:
-        ai = await async_client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            input_text="x",
-            max_length=0,
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_raw_response_run_overload_10(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            input_text="x",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = await response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_run_overload_10(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            input_text="x",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = await response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_run_overload_10(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                input_text="x",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                input_text="x",
-            )
-
-    @parametrize
-    async def test_method_run_overload_11(self, async_client: AsyncCloudflare) -> None:
-        ai = await async_client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            image=[0, 0, 0],
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_method_run_with_all_params_overload_11(self, async_client: AsyncCloudflare) -> None:
-        ai = await async_client.workers.ai.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            image=[0, 0, 0],
-            max_tokens=0,
-            messages=[
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-                {
-                    "content": "content",
-                    "role": "role",
-                },
-            ],
-            prompt="prompt",
-            raw=True,
-            temperature=0,
-        )
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_raw_response_run_overload_11(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.workers.ai.with_raw_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            image=[0, 0, 0],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        ai = await response.parse()
-        assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_run_overload_11(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.workers.ai.with_streaming_response.run(
-            model_name="model_name",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            image=[0, 0, 0],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            ai = await response.parse()
-            assert_matches_type(Optional[AIRunResponse], ai, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_run_overload_11(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="model_name",
-                account_id="",
-                image=[0, 0, 0],
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `model_name` but received ''"):
-            await async_client.workers.ai.with_raw_response.run(
-                model_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                image=[0, 0, 0],
-            )
diff --git a/tests/api_resources/workers/test_domains.py b/tests/api_resources/workers/test_domains.py
index 1bbc559f8f8..a12d778acae 100644
--- a/tests/api_resources/workers/test_domains.py
+++ b/tests/api_resources/workers/test_domains.py
@@ -22,18 +22,27 @@ class TestDomains:
     def test_method_update(self, client: Cloudflare) -> None:
         domain = client.workers.domains.update(
             account_id="9a7806061c88ada191ed06f989cc3dac",
-            environment="production",
             hostname="foo.example.com",
             service="foo",
             zone_id="593c9c94de529bbbfaac7c53ced0447d",
         )
         assert_matches_type(Optional[Domain], domain, path=["response"])
 
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        domain = client.workers.domains.update(
+            account_id="9a7806061c88ada191ed06f989cc3dac",
+            hostname="foo.example.com",
+            service="foo",
+            zone_id="593c9c94de529bbbfaac7c53ced0447d",
+            environment="production",
+        )
+        assert_matches_type(Optional[Domain], domain, path=["response"])
+
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.workers.domains.with_raw_response.update(
             account_id="9a7806061c88ada191ed06f989cc3dac",
-            environment="production",
             hostname="foo.example.com",
             service="foo",
             zone_id="593c9c94de529bbbfaac7c53ced0447d",
@@ -48,7 +57,6 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.workers.domains.with_streaming_response.update(
             account_id="9a7806061c88ada191ed06f989cc3dac",
-            environment="production",
             hostname="foo.example.com",
             service="foo",
             zone_id="593c9c94de529bbbfaac7c53ced0447d",
@@ -66,7 +74,6 @@ def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.workers.domains.with_raw_response.update(
                 account_id="",
-                environment="production",
                 hostname="foo.example.com",
                 service="foo",
                 zone_id="593c9c94de529bbbfaac7c53ced0447d",
@@ -220,24 +227,35 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncDomains:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         domain = await async_client.workers.domains.update(
             account_id="9a7806061c88ada191ed06f989cc3dac",
-            environment="production",
             hostname="foo.example.com",
             service="foo",
             zone_id="593c9c94de529bbbfaac7c53ced0447d",
         )
         assert_matches_type(Optional[Domain], domain, path=["response"])
 
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        domain = await async_client.workers.domains.update(
+            account_id="9a7806061c88ada191ed06f989cc3dac",
+            hostname="foo.example.com",
+            service="foo",
+            zone_id="593c9c94de529bbbfaac7c53ced0447d",
+            environment="production",
+        )
+        assert_matches_type(Optional[Domain], domain, path=["response"])
+
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.workers.domains.with_raw_response.update(
             account_id="9a7806061c88ada191ed06f989cc3dac",
-            environment="production",
             hostname="foo.example.com",
             service="foo",
             zone_id="593c9c94de529bbbfaac7c53ced0447d",
@@ -252,7 +270,6 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.workers.domains.with_streaming_response.update(
             account_id="9a7806061c88ada191ed06f989cc3dac",
-            environment="production",
             hostname="foo.example.com",
             service="foo",
             zone_id="593c9c94de529bbbfaac7c53ced0447d",
@@ -270,7 +287,6 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.workers.domains.with_raw_response.update(
                 account_id="",
-                environment="production",
                 hostname="foo.example.com",
                 service="foo",
                 zone_id="593c9c94de529bbbfaac7c53ced0447d",
diff --git a/tests/api_resources/workers/test_routes.py b/tests/api_resources/workers/test_routes.py
new file mode 100644
index 00000000000..594e8309ae9
--- /dev/null
+++ b/tests/api_resources/workers/test_routes.py
@@ -0,0 +1,527 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.workers import (
+    RouteGetResponse,
+    RouteListResponse,
+    RouteCreateResponse,
+    RouteDeleteResponse,
+    RouteUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestRoutes:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        route = client.workers.routes.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            pattern="example.com/*",
+        )
+        assert_matches_type(RouteCreateResponse, route, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        route = client.workers.routes.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            pattern="example.com/*",
+            script="my-workers-script",
+        )
+        assert_matches_type(RouteCreateResponse, route, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.workers.routes.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            pattern="example.com/*",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        route = response.parse()
+        assert_matches_type(RouteCreateResponse, route, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.workers.routes.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            pattern="example.com/*",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            route = response.parse()
+            assert_matches_type(RouteCreateResponse, route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.workers.routes.with_raw_response.create(
+                zone_id="",
+                pattern="example.com/*",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        route = client.workers.routes.update(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            pattern="example.com/*",
+        )
+        assert_matches_type(RouteUpdateResponse, route, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        route = client.workers.routes.update(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            pattern="example.com/*",
+            script="my-workers-script",
+        )
+        assert_matches_type(RouteUpdateResponse, route, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.workers.routes.with_raw_response.update(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            pattern="example.com/*",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        route = response.parse()
+        assert_matches_type(RouteUpdateResponse, route, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.workers.routes.with_streaming_response.update(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            pattern="example.com/*",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            route = response.parse()
+            assert_matches_type(RouteUpdateResponse, route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.workers.routes.with_raw_response.update(
+                route_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+                pattern="example.com/*",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `route_id` but received ''"):
+            client.workers.routes.with_raw_response.update(
+                route_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                pattern="example.com/*",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        route = client.workers.routes.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[RouteListResponse], route, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.workers.routes.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        route = response.parse()
+        assert_matches_type(SyncSinglePage[RouteListResponse], route, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.workers.routes.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            route = response.parse()
+            assert_matches_type(SyncSinglePage[RouteListResponse], route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.workers.routes.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        route = client.workers.routes.delete(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(RouteDeleteResponse, route, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.workers.routes.with_raw_response.delete(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        route = response.parse()
+        assert_matches_type(RouteDeleteResponse, route, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.workers.routes.with_streaming_response.delete(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            route = response.parse()
+            assert_matches_type(RouteDeleteResponse, route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.workers.routes.with_raw_response.delete(
+                route_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `route_id` but received ''"):
+            client.workers.routes.with_raw_response.delete(
+                route_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        route = client.workers.routes.get(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(RouteGetResponse, route, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.workers.routes.with_raw_response.get(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        route = response.parse()
+        assert_matches_type(RouteGetResponse, route, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.workers.routes.with_streaming_response.get(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            route = response.parse()
+            assert_matches_type(RouteGetResponse, route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.workers.routes.with_raw_response.get(
+                route_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `route_id` but received ''"):
+            client.workers.routes.with_raw_response.get(
+                route_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncRoutes:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        route = await async_client.workers.routes.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            pattern="example.com/*",
+        )
+        assert_matches_type(RouteCreateResponse, route, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        route = await async_client.workers.routes.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            pattern="example.com/*",
+            script="my-workers-script",
+        )
+        assert_matches_type(RouteCreateResponse, route, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.routes.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            pattern="example.com/*",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        route = await response.parse()
+        assert_matches_type(RouteCreateResponse, route, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.routes.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            pattern="example.com/*",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            route = await response.parse()
+            assert_matches_type(RouteCreateResponse, route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.workers.routes.with_raw_response.create(
+                zone_id="",
+                pattern="example.com/*",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        route = await async_client.workers.routes.update(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            pattern="example.com/*",
+        )
+        assert_matches_type(RouteUpdateResponse, route, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        route = await async_client.workers.routes.update(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            pattern="example.com/*",
+            script="my-workers-script",
+        )
+        assert_matches_type(RouteUpdateResponse, route, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.routes.with_raw_response.update(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            pattern="example.com/*",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        route = await response.parse()
+        assert_matches_type(RouteUpdateResponse, route, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.routes.with_streaming_response.update(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            pattern="example.com/*",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            route = await response.parse()
+            assert_matches_type(RouteUpdateResponse, route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.workers.routes.with_raw_response.update(
+                route_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+                pattern="example.com/*",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `route_id` but received ''"):
+            await async_client.workers.routes.with_raw_response.update(
+                route_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                pattern="example.com/*",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        route = await async_client.workers.routes.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[RouteListResponse], route, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.routes.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        route = await response.parse()
+        assert_matches_type(AsyncSinglePage[RouteListResponse], route, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.routes.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            route = await response.parse()
+            assert_matches_type(AsyncSinglePage[RouteListResponse], route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.workers.routes.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        route = await async_client.workers.routes.delete(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(RouteDeleteResponse, route, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.routes.with_raw_response.delete(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        route = await response.parse()
+        assert_matches_type(RouteDeleteResponse, route, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.routes.with_streaming_response.delete(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            route = await response.parse()
+            assert_matches_type(RouteDeleteResponse, route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.workers.routes.with_raw_response.delete(
+                route_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `route_id` but received ''"):
+            await async_client.workers.routes.with_raw_response.delete(
+                route_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        route = await async_client.workers.routes.get(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(RouteGetResponse, route, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.routes.with_raw_response.get(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        route = await response.parse()
+        assert_matches_type(RouteGetResponse, route, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.routes.with_streaming_response.get(
+            route_id="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            route = await response.parse()
+            assert_matches_type(RouteGetResponse, route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.workers.routes.with_raw_response.get(
+                route_id="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `route_id` but received ''"):
+            await async_client.workers.routes.with_raw_response.get(
+                route_id="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/workers/test_script_upload.py b/tests/api_resources/workers/test_script_upload.py
new file mode 100644
index 00000000000..57a624a0733
--- /dev/null
+++ b/tests/api_resources/workers/test_script_upload.py
@@ -0,0 +1,537 @@
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.workers import ScriptUpdateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestScriptUpload:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: Prism multipart/form-data validation incompatible with SDK encoding")
+    @parametrize
+    def test_basic_script_upload(self, client: Cloudflare) -> None:
+        script_content = """
+        export default {
+            async fetch(request, env, ctx) {
+                return new Response(env.MESSAGE, { status: 200 });
+            }
+        };
+        """
+
+        script = client.workers.scripts.update(
+            "my-hello-world-script",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={
+                "main_module": "my-hello-world-script.mjs",
+                "bindings": [
+                    {
+                        "type": "plain_text",
+                        "name": "MESSAGE",
+                        "text": "Hello World!",
+                    }
+                ],
+            },
+            files={  # pyright: ignore[reportArgumentType]
+                "my-hello-world-script.mjs": (
+                    "my-hello-world-script.mjs",
+                    bytes(script_content, "utf-8"),
+                    "application/javascript+module",
+                )
+            },
+        )
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: Prism multipart/form-data validation incompatible with SDK encoding")
+    @parametrize
+    def test_script_upload_with_multiple_files(self, client: Cloudflare) -> None:
+        main_script = """
+        import { helper } from './helper.js';
+        export default {
+            async fetch(request, env, ctx) {
+                return new Response(helper(), { status: 200 });
+            }
+        };
+        """
+
+        helper_script = """
+        export function helper() {
+            return 'Hello from helper!';
+        }
+        """
+
+        script = client.workers.scripts.update(
+            "multi-file-script",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={
+                "main_module": "index.mjs",
+            },
+            files={  # pyright: ignore[reportArgumentType]
+                "index.mjs": (
+                    "index.mjs",
+                    bytes(main_script, "utf-8"),
+                    "application/javascript+module",
+                ),
+                "helper.js": (
+                    "helper.js",
+                    bytes(helper_script, "utf-8"),
+                    "application/javascript+module",
+                ),
+            },
+        )
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: Prism multipart/form-data validation incompatible with SDK encoding")
+    @parametrize
+    def test_script_upload_with_bindings(self, client: Cloudflare) -> None:
+        script_content = """
+        export default {
+            async fetch(request, env, ctx) {
+                const value = await env.MY_KV.get('key');
+                return new Response(value || env.MESSAGE, { status: 200 });
+            }
+        };
+        """
+
+        script = client.workers.scripts.update(
+            "script-with-bindings",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={
+                "main_module": "worker.mjs",
+                "bindings": [
+                    {
+                        "type": "plain_text",
+                        "name": "MESSAGE",
+                        "text": "Default message",
+                    },
+                    {
+                        "type": "kv_namespace",
+                        "name": "MY_KV",
+                        "namespace_id": "abc123",
+                    },
+                ],
+            },
+            files={  # pyright: ignore[reportArgumentType]
+                "worker.mjs": (
+                    "worker.mjs",
+                    bytes(script_content, "utf-8"),
+                    "application/javascript+module",
+                )
+            },
+        )
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: Prism multipart/form-data validation incompatible with SDK encoding")
+    @parametrize
+    def test_script_upload_with_compatibility_flags(self, client: Cloudflare) -> None:
+        script_content = """
+        export default {
+            async fetch(request, env, ctx) {
+                return new Response('Node.js compatibility enabled', { status: 200 });
+            }
+        };
+        """
+
+        script = client.workers.scripts.update(
+            "nodejs-compat-script",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={
+                "main_module": "worker.mjs",
+                "compatibility_date": "2024-01-01",
+                "compatibility_flags": ["nodejs_compat"],
+            },
+            files={  # pyright: ignore[reportArgumentType]
+                "worker.mjs": (
+                    "worker.mjs",
+                    bytes(script_content, "utf-8"),
+                    "application/javascript+module",
+                )
+            },
+        )
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: Prism multipart/form-data validation incompatible with SDK encoding")
+    @parametrize
+    def test_script_upload_with_source_map(self, client: Cloudflare) -> None:
+        script_content = """
+        export default {
+            async fetch(request, env, ctx) {
+                return new Response('Hello', { status: 200 });
+            }
+        };
+        """
+
+        source_map = '{"version":3,"sources":["worker.js"],"names":[],"mappings":"AAAA"}'
+
+        script = client.workers.scripts.update(
+            "script-with-sourcemap",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={
+                "main_module": "worker.mjs",
+            },
+            files={  # pyright: ignore[reportArgumentType]
+                "worker.mjs": (
+                    "worker.mjs",
+                    bytes(script_content, "utf-8"),
+                    "application/javascript+module",
+                ),
+                "worker.mjs.map": (
+                    "worker.mjs.map",
+                    bytes(source_map, "utf-8"),
+                    "application/source-map",
+                ),
+            },
+        )
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: Prism multipart/form-data validation incompatible with SDK encoding")
+    @parametrize
+    def test_script_upload_raw_response(self, client: Cloudflare) -> None:
+        script_content = """
+        export default {
+            async fetch(request, env, ctx) {
+                return new Response('Hello', { status: 200 });
+            }
+        };
+        """
+
+        response = client.workers.scripts.with_raw_response.update(
+            "test-script",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={
+                "main_module": "worker.mjs",
+            },
+            files={  # pyright: ignore[reportArgumentType]
+                "worker.mjs": (
+                    "worker.mjs",
+                    bytes(script_content, "utf-8"),
+                    "application/javascript+module",
+                )
+            },
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        script = response.parse()
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: Prism multipart/form-data validation incompatible with SDK encoding")
+    @parametrize
+    def test_script_upload_streaming_response(self, client: Cloudflare) -> None:
+        script_content = """
+        export default {
+            async fetch(request, env, ctx) {
+                return new Response('Hello', { status: 200 });
+            }
+        };
+        """
+
+        with client.workers.scripts.with_streaming_response.update(
+            "test-script",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={
+                "main_module": "worker.mjs",
+            },
+            files={  # pyright: ignore[reportArgumentType]
+                "worker.mjs": (
+                    "worker.mjs",
+                    bytes(script_content, "utf-8"),
+                    "application/javascript+module",
+                )
+            },
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            script = response.parse()
+            assert_matches_type(ScriptUpdateResponse, script, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_script_upload_missing_account_id(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.scripts.with_raw_response.update(
+                "test-script",
+                account_id="",
+                metadata={},
+            )
+
+    @parametrize
+    def test_script_upload_missing_script_name(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            client.workers.scripts.with_raw_response.update(
+                "",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                metadata={},
+            )
+
+
+class TestAsyncScriptUpload:
+    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: Prism multipart/form-data validation incompatible with SDK encoding")
+    @parametrize
+    async def test_basic_script_upload(self, async_client: AsyncCloudflare) -> None:
+        script_content = """
+        export default {
+            async fetch(request, env, ctx) {
+                return new Response(env.MESSAGE, { status: 200 });
+            }
+        };
+        """
+
+        script = await async_client.workers.scripts.update(
+            "my-hello-world-script",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={
+                "main_module": "my-hello-world-script.mjs",
+                "bindings": [
+                    {
+                        "type": "plain_text",
+                        "name": "MESSAGE",
+                        "text": "Hello World!",
+                    }
+                ],
+            },
+            files={  # pyright: ignore[reportArgumentType]
+                "my-hello-world-script.mjs": (
+                    "my-hello-world-script.mjs",
+                    bytes(script_content, "utf-8"),
+                    "application/javascript+module",
+                )
+            },
+        )
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: Prism multipart/form-data validation incompatible with SDK encoding")
+    @parametrize
+    async def test_script_upload_with_multiple_files(self, async_client: AsyncCloudflare) -> None:
+        main_script = """
+        import { helper } from './helper.js';
+        export default {
+            async fetch(request, env, ctx) {
+                return new Response(helper(), { status: 200 });
+            }
+        };
+        """
+
+        helper_script = """
+        export function helper() {
+            return 'Hello from helper!';
+        }
+        """
+
+        script = await async_client.workers.scripts.update(
+            "multi-file-script",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={
+                "main_module": "index.mjs",
+            },
+            files={  # pyright: ignore[reportArgumentType]
+                "index.mjs": (
+                    "index.mjs",
+                    bytes(main_script, "utf-8"),
+                    "application/javascript+module",
+                ),
+                "helper.js": (
+                    "helper.js",
+                    bytes(helper_script, "utf-8"),
+                    "application/javascript+module",
+                ),
+            },
+        )
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: Prism multipart/form-data validation incompatible with SDK encoding")
+    @parametrize
+    async def test_script_upload_with_bindings(self, async_client: AsyncCloudflare) -> None:
+        script_content = """
+        export default {
+            async fetch(request, env, ctx) {
+                const value = await env.MY_KV.get('key');
+                return new Response(value || env.MESSAGE, { status: 200 });
+            }
+        };
+        """
+
+        script = await async_client.workers.scripts.update(
+            "script-with-bindings",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={
+                "main_module": "worker.mjs",
+                "bindings": [
+                    {
+                        "type": "plain_text",
+                        "name": "MESSAGE",
+                        "text": "Default message",
+                    },
+                    {
+                        "type": "kv_namespace",
+                        "name": "MY_KV",
+                        "namespace_id": "abc123",
+                    },
+                ],
+            },
+            files={  # pyright: ignore[reportArgumentType]
+                "worker.mjs": (
+                    "worker.mjs",
+                    bytes(script_content, "utf-8"),
+                    "application/javascript+module",
+                )
+            },
+        )
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: Prism multipart/form-data validation incompatible with SDK encoding")
+    @parametrize
+    async def test_script_upload_with_compatibility_flags(self, async_client: AsyncCloudflare) -> None:
+        script_content = """
+        export default {
+            async fetch(request, env, ctx) {
+                return new Response('Node.js compatibility enabled', { status: 200 });
+            }
+        };
+        """
+
+        script = await async_client.workers.scripts.update(
+            "nodejs-compat-script",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={
+                "main_module": "worker.mjs",
+                "compatibility_date": "2024-01-01",
+                "compatibility_flags": ["nodejs_compat"],
+            },
+            files={  # pyright: ignore[reportArgumentType]
+                "worker.mjs": (
+                    "worker.mjs",
+                    bytes(script_content, "utf-8"),
+                    "application/javascript+module",
+                )
+            },
+        )
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: Prism multipart/form-data validation incompatible with SDK encoding")
+    @parametrize
+    async def test_script_upload_with_source_map(self, async_client: AsyncCloudflare) -> None:
+        script_content = """
+        export default {
+            async fetch(request, env, ctx) {
+                return new Response('Hello', { status: 200 });
+            }
+        };
+        """
+
+        source_map = '{"version":3,"sources":["worker.js"],"names":[],"mappings":"AAAA"}'
+
+        script = await async_client.workers.scripts.update(
+            "script-with-sourcemap",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={
+                "main_module": "worker.mjs",
+            },
+            files={  # pyright: ignore[reportArgumentType]
+                "worker.mjs": (
+                    "worker.mjs",
+                    bytes(script_content, "utf-8"),
+                    "application/javascript+module",
+                ),
+                "worker.mjs.map": (
+                    "worker.mjs.map",
+                    bytes(source_map, "utf-8"),
+                    "application/source-map",
+                ),
+            },
+        )
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: Prism multipart/form-data validation incompatible with SDK encoding")
+    @parametrize
+    async def test_script_upload_raw_response(self, async_client: AsyncCloudflare) -> None:
+        script_content = """
+        export default {
+            async fetch(request, env, ctx) {
+                return new Response('Hello', { status: 200 });
+            }
+        };
+        """
+
+        response = await async_client.workers.scripts.with_raw_response.update(
+            "test-script",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={
+                "main_module": "worker.mjs",
+            },
+            files={  # pyright: ignore[reportArgumentType]
+                "worker.mjs": (
+                    "worker.mjs",
+                    bytes(script_content, "utf-8"),
+                    "application/javascript+module",
+                )
+            },
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        script = await response.parse()
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: Prism multipart/form-data validation incompatible with SDK encoding")
+    @parametrize
+    async def test_script_upload_streaming_response(self, async_client: AsyncCloudflare) -> None:
+        script_content = """
+        export default {
+            async fetch(request, env, ctx) {
+                return new Response('Hello', { status: 200 });
+            }
+        };
+        """
+
+        async with async_client.workers.scripts.with_streaming_response.update(
+            "test-script",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={
+                "main_module": "worker.mjs",
+            },
+            files={  # pyright: ignore[reportArgumentType]
+                "worker.mjs": (
+                    "worker.mjs",
+                    bytes(script_content, "utf-8"),
+                    "application/javascript+module",
+                )
+            },
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            script = await response.parse()
+            assert_matches_type(ScriptUpdateResponse, script, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_script_upload_missing_account_id(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.scripts.with_raw_response.update(
+                "test-script",
+                account_id="",
+                metadata={},
+            )
+
+    @parametrize
+    async def test_script_upload_missing_script_name(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            await async_client.workers.scripts.with_raw_response.update(
+                "",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                metadata={},
+            )
+
diff --git a/tests/api_resources/workers/test_scripts.py b/tests/api_resources/workers/test_scripts.py
index 219b9844363..167c82bc966 100644
--- a/tests/api_resources/workers/test_scripts.py
+++ b/tests/api_resources/workers/test_scripts.py
@@ -3,22 +3,18 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
-import httpx
 import pytest
-from respx import MockRouter
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare._response import (
-    BinaryAPIResponse,
-    AsyncBinaryAPIResponse,
-    StreamedBinaryAPIResponse,
-    AsyncStreamedBinaryAPIResponse,
-)
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.workers import Script
+from cloudflare.types.workers import (
+    ScriptListResponse,
+    ScriptSearchResponse,
+    ScriptUpdateResponse,
+)
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -28,22 +24,32 @@ class TestScripts:
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_overload_1(self, client: Cloudflare) -> None:
+    def test_method_update(self, client: Cloudflare) -> None:
         script = client.workers.scripts.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={},
         )
-        assert_matches_type(Optional[Script], script, path=["response"])
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_with_all_params_overload_1(self, client: Cloudflare) -> None:
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         script = client.workers.scripts.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            rollback_to="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            any_part_name=[b"raw file contents", b"raw file contents", b"raw file contents"],
             metadata={
+                "assets": {
+                    "config": {
+                        "_headers": "/dashboard/*\nX-Frame-Options: DENY\n\n/static/*\nAccess-Control-Allow-Origin: *",
+                        "_redirects": "/foo /bar 301\n/news/* /blog/:splat",
+                        "html_handling": "auto-trailing-slash",
+                        "not_found_handling": "404-page",
+                        "run_worker_first": ["string"],
+                        "serve_directly": True,
+                    },
+                    "jwt": "jwt",
+                },
                 "bindings": [
                     {
                         "name": "MY_ENV_VAR",
@@ -52,186 +58,124 @@ def test_method_update_with_all_params_overload_1(self, client: Cloudflare) -> N
                     }
                 ],
                 "body_part": "worker.js",
-                "compatibility_date": "2023-07-25",
-                "compatibility_flags": ["string", "string", "string"],
-                "keep_bindings": ["string", "string", "string"],
+                "compatibility_date": "2021-01-01",
+                "compatibility_flags": ["nodejs_compat"],
+                "keep_assets": False,
+                "keep_bindings": ["string"],
+                "limits": {"cpu_ms": 50},
                 "logpush": False,
                 "main_module": "worker.js",
                 "migrations": {
+                    "deleted_classes": ["string"],
+                    "new_classes": ["string"],
+                    "new_sqlite_classes": ["string"],
                     "new_tag": "v2",
                     "old_tag": "v1",
-                    "deleted_classes": ["string", "string", "string"],
-                    "new_classes": ["string", "string", "string"],
                     "renamed_classes": [
                         {
                             "from": "from",
                             "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "to": "to",
-                        },
+                        }
                     ],
                     "transferred_classes": [
                         {
                             "from": "from",
                             "from_script": "from_script",
                             "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "from_script": "from_script",
-                            "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "from_script": "from_script",
-                            "to": "to",
-                        },
+                        }
                     ],
                 },
+                "observability": {
+                    "enabled": True,
+                    "head_sampling_rate": 0.1,
+                    "logs": {
+                        "enabled": True,
+                        "invocation_logs": True,
+                        "destinations": ["cloudflare"],
+                        "head_sampling_rate": 0.1,
+                        "persist": True,
+                    },
+                },
                 "placement": {"mode": "smart"},
-                "tags": ["string", "string", "string"],
+                "tags": ["string"],
                 "tail_consumers": [
                     {
-                        "environment": "production",
-                        "namespace": "my-namespace",
-                        "service": "my-log-consumer",
-                    },
-                    {
-                        "environment": "production",
-                        "namespace": "my-namespace",
                         "service": "my-log-consumer",
-                    },
-                    {
                         "environment": "production",
                         "namespace": "my-namespace",
-                        "service": "my-log-consumer",
-                    },
+                    }
                 ],
-                "usage_model": "bundled",
-                "version_tags": {},
+                "usage_model": "standard",
             },
+            files=[b"raw file contents"],
         )
-        assert_matches_type(Optional[Script], script, path=["response"])
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_raw_response_update_overload_1(self, client: Cloudflare) -> None:
+    def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.workers.scripts.with_raw_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         script = response.parse()
-        assert_matches_type(Optional[Script], script, path=["response"])
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_streaming_response_update_overload_1(self, client: Cloudflare) -> None:
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.workers.scripts.with_streaming_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             script = response.parse()
-            assert_matches_type(Optional[Script], script, path=["response"])
+            assert_matches_type(ScriptUpdateResponse, script, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_path_params_update_overload_1(self, client: Cloudflare) -> None:
+    def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.workers.scripts.with_raw_response.update(
                 script_name="this-is_my_script-01",
                 account_id="",
+                metadata={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
             client.workers.scripts.with_raw_response.update(
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                metadata={},
             )
 
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_method_update_overload_2(self, client: Cloudflare) -> None:
-        script = client.workers.scripts.update(
-            script_name="this-is_my_script-01",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[Script], script, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @pytest.mark.skip(reason="Mock returns invalid enum values ('string' instead of 'smart'/'targeted') (Issue #5)")
     @parametrize
-    def test_method_update_with_all_params_overload_2(self, client: Cloudflare) -> None:
-        script = client.workers.scripts.update(
-            script_name="this-is_my_script-01",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            rollback_to="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            message="message",
-        )
-        assert_matches_type(Optional[Script], script, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_raw_response_update_overload_2(self, client: Cloudflare) -> None:
-        response = client.workers.scripts.with_raw_response.update(
-            script_name="this-is_my_script-01",
+    def test_method_list(self, client: Cloudflare) -> None:
+        script = client.workers.scripts.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
+        assert_matches_type(SyncSinglePage[ScriptListResponse], script, path=["response"])
 
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        script = response.parse()
-        assert_matches_type(Optional[Script], script, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @pytest.mark.skip(reason="Mock returns invalid enum values ('string' instead of 'smart'/'targeted') (Issue #5)")
     @parametrize
-    def test_streaming_response_update_overload_2(self, client: Cloudflare) -> None:
-        with client.workers.scripts.with_streaming_response.update(
-            script_name="this-is_my_script-01",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            script = response.parse()
-            assert_matches_type(Optional[Script], script, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.workers.scripts.with_raw_response.update(
-                script_name="this-is_my_script-01",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
-            client.workers.scripts.with_raw_response.update(
-                script_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         script = client.workers.scripts.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            tags="production:yes,staging:no",
         )
-        assert_matches_type(SyncSinglePage[Script], script, path=["response"])
+        assert_matches_type(SyncSinglePage[ScriptListResponse], script, path=["response"])
 
+    @pytest.mark.skip(reason="Mock returns invalid enum values ('string' instead of 'smart'/'targeted') (Issue #5)")
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.workers.scripts.with_raw_response.list(
@@ -241,8 +185,9 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         script = response.parse()
-        assert_matches_type(SyncSinglePage[Script], script, path=["response"])
+        assert_matches_type(SyncSinglePage[ScriptListResponse], script, path=["response"])
 
+    @pytest.mark.skip(reason="Mock returns invalid enum values ('string' instead of 'smart'/'targeted') (Issue #5)")
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.workers.scripts.with_streaming_response.list(
@@ -252,7 +197,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             script = response.parse()
-            assert_matches_type(SyncSinglePage[Script], script, path=["response"])
+            assert_matches_type(SyncSinglePage[ScriptListResponse], script, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -269,7 +214,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert script is None
+        assert_matches_type(object, script, path=["response"])
 
     @parametrize
     def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
@@ -278,7 +223,7 @@ def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             force=True,
         )
-        assert script is None
+        assert_matches_type(object, script, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -290,7 +235,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         script = response.parse()
-        assert script is None
+        assert_matches_type(object, script, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -302,7 +247,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             script = response.parse()
-            assert script is None
+            assert_matches_type(object, script, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -321,58 +266,40 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
             )
 
     @parametrize
-    @pytest.mark.respx(base_url=base_url)
-    def test_method_get(self, client: Cloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/accounts/023e105f4ecef8ad9ca31a8372d0c353/workers/scripts/this-is_my_script-01").mock(
-            return_value=httpx.Response(200, json={"foo": "bar"})
-        )
+    def test_method_get(self, client: Cloudflare) -> None:
         script = client.workers.scripts.get(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert script.is_closed
-        assert script.json() == {"foo": "bar"}
-        assert cast(Any, script.is_closed) is True
-        assert isinstance(script, BinaryAPIResponse)
+        assert_matches_type(str, script, path=["response"])
 
     @parametrize
-    @pytest.mark.respx(base_url=base_url)
-    def test_raw_response_get(self, client: Cloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/accounts/023e105f4ecef8ad9ca31a8372d0c353/workers/scripts/this-is_my_script-01").mock(
-            return_value=httpx.Response(200, json={"foo": "bar"})
-        )
-
-        script = client.workers.scripts.with_raw_response.get(
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.workers.scripts.with_raw_response.get(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
-        assert script.is_closed is True
-        assert script.http_request.headers.get("X-Stainless-Lang") == "python"
-        assert script.json() == {"foo": "bar"}
-        assert isinstance(script, BinaryAPIResponse)
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        script = response.parse()
+        assert_matches_type(str, script, path=["response"])
 
     @parametrize
-    @pytest.mark.respx(base_url=base_url)
-    def test_streaming_response_get(self, client: Cloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/accounts/023e105f4ecef8ad9ca31a8372d0c353/workers/scripts/this-is_my_script-01").mock(
-            return_value=httpx.Response(200, json={"foo": "bar"})
-        )
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.workers.scripts.with_streaming_response.get(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as script:
-            assert not script.is_closed
-            assert script.http_request.headers.get("X-Stainless-Lang") == "python"
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            assert script.json() == {"foo": "bar"}
-            assert cast(Any, script.is_closed) is True
-            assert isinstance(script, StreamedBinaryAPIResponse)
+            script = response.parse()
+            assert_matches_type(str, script, path=["response"])
 
-        assert cast(Any, script.is_closed) is True
+        assert cast(Any, response.is_closed) is True
 
     @parametrize
-    @pytest.mark.respx(base_url=base_url)
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.workers.scripts.with_raw_response.get(
@@ -386,28 +313,90 @@ def test_path_params_get(self, client: Cloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
 
+    @parametrize
+    def test_method_search(self, client: Cloudflare) -> None:
+        script = client.workers.scripts.search(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ScriptSearchResponse, script, path=["response"])
+
+    @parametrize
+    def test_method_search_with_all_params(self, client: Cloudflare) -> None:
+        script = client.workers.scripts.search(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="bdf3567828824b74aadd550004cf4913",
+            name="my-worker",
+            order_by="created_on",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(ScriptSearchResponse, script, path=["response"])
+
+    @parametrize
+    def test_raw_response_search(self, client: Cloudflare) -> None:
+        response = client.workers.scripts.with_raw_response.search(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        script = response.parse()
+        assert_matches_type(ScriptSearchResponse, script, path=["response"])
+
+    @parametrize
+    def test_streaming_response_search(self, client: Cloudflare) -> None:
+        with client.workers.scripts.with_streaming_response.search(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            script = response.parse()
+            assert_matches_type(ScriptSearchResponse, script, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_search(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.scripts.with_raw_response.search(
+                account_id="",
+            )
+
 
 class TestAsyncScripts:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         script = await async_client.workers.scripts.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={},
         )
-        assert_matches_type(Optional[Script], script, path=["response"])
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_update_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         script = await async_client.workers.scripts.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            rollback_to="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            any_part_name=[b"raw file contents", b"raw file contents", b"raw file contents"],
             metadata={
+                "assets": {
+                    "config": {
+                        "_headers": "/dashboard/*\nX-Frame-Options: DENY\n\n/static/*\nAccess-Control-Allow-Origin: *",
+                        "_redirects": "/foo /bar 301\n/news/* /blog/:splat",
+                        "html_handling": "auto-trailing-slash",
+                        "not_found_handling": "404-page",
+                        "run_worker_first": ["string"],
+                        "serve_directly": True,
+                    },
+                    "jwt": "jwt",
+                },
                 "bindings": [
                     {
                         "name": "MY_ENV_VAR",
@@ -416,186 +405,124 @@ async def test_method_update_with_all_params_overload_1(self, async_client: Asyn
                     }
                 ],
                 "body_part": "worker.js",
-                "compatibility_date": "2023-07-25",
-                "compatibility_flags": ["string", "string", "string"],
-                "keep_bindings": ["string", "string", "string"],
+                "compatibility_date": "2021-01-01",
+                "compatibility_flags": ["nodejs_compat"],
+                "keep_assets": False,
+                "keep_bindings": ["string"],
+                "limits": {"cpu_ms": 50},
                 "logpush": False,
                 "main_module": "worker.js",
                 "migrations": {
+                    "deleted_classes": ["string"],
+                    "new_classes": ["string"],
+                    "new_sqlite_classes": ["string"],
                     "new_tag": "v2",
                     "old_tag": "v1",
-                    "deleted_classes": ["string", "string", "string"],
-                    "new_classes": ["string", "string", "string"],
                     "renamed_classes": [
                         {
                             "from": "from",
                             "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "to": "to",
-                        },
+                        }
                     ],
                     "transferred_classes": [
                         {
                             "from": "from",
                             "from_script": "from_script",
                             "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "from_script": "from_script",
-                            "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "from_script": "from_script",
-                            "to": "to",
-                        },
+                        }
                     ],
                 },
+                "observability": {
+                    "enabled": True,
+                    "head_sampling_rate": 0.1,
+                    "logs": {
+                        "enabled": True,
+                        "invocation_logs": True,
+                        "destinations": ["cloudflare"],
+                        "head_sampling_rate": 0.1,
+                        "persist": True,
+                    },
+                },
                 "placement": {"mode": "smart"},
-                "tags": ["string", "string", "string"],
+                "tags": ["string"],
                 "tail_consumers": [
                     {
-                        "environment": "production",
-                        "namespace": "my-namespace",
-                        "service": "my-log-consumer",
-                    },
-                    {
-                        "environment": "production",
-                        "namespace": "my-namespace",
                         "service": "my-log-consumer",
-                    },
-                    {
                         "environment": "production",
                         "namespace": "my-namespace",
-                        "service": "my-log-consumer",
-                    },
+                    }
                 ],
-                "usage_model": "bundled",
-                "version_tags": {},
+                "usage_model": "standard",
             },
+            files=[b"raw file contents"],
         )
-        assert_matches_type(Optional[Script], script, path=["response"])
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.workers.scripts.with_raw_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         script = await response.parse()
-        assert_matches_type(Optional[Script], script, path=["response"])
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.workers.scripts.with_streaming_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            metadata={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             script = await response.parse()
-            assert_matches_type(Optional[Script], script, path=["response"])
+            assert_matches_type(ScriptUpdateResponse, script, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.workers.scripts.with_raw_response.update(
                 script_name="this-is_my_script-01",
                 account_id="",
+                metadata={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
             await async_client.workers.scripts.with_raw_response.update(
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                metadata={},
             )
 
-    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @pytest.mark.skip(reason="Mock returns invalid enum values ('string' instead of 'smart'/'targeted') (Issue #5)")
     @parametrize
-    async def test_method_update_overload_2(self, async_client: AsyncCloudflare) -> None:
-        script = await async_client.workers.scripts.update(
-            script_name="this-is_my_script-01",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[Script], script, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_method_update_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
-        script = await async_client.workers.scripts.update(
-            script_name="this-is_my_script-01",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            rollback_to="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            message="message",
-        )
-        assert_matches_type(Optional[Script], script, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_raw_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.workers.scripts.with_raw_response.update(
-            script_name="this-is_my_script-01",
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        script = await async_client.workers.scripts.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
+        assert_matches_type(AsyncSinglePage[ScriptListResponse], script, path=["response"])
 
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        script = await response.parse()
-        assert_matches_type(Optional[Script], script, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @pytest.mark.skip(reason="Mock returns invalid enum values ('string' instead of 'smart'/'targeted') (Issue #5)")
     @parametrize
-    async def test_streaming_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.workers.scripts.with_streaming_response.update(
-            script_name="this-is_my_script-01",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            script = await response.parse()
-            assert_matches_type(Optional[Script], script, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.workers.scripts.with_raw_response.update(
-                script_name="this-is_my_script-01",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
-            await async_client.workers.scripts.with_raw_response.update(
-                script_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         script = await async_client.workers.scripts.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            tags="production:yes,staging:no",
         )
-        assert_matches_type(AsyncSinglePage[Script], script, path=["response"])
+        assert_matches_type(AsyncSinglePage[ScriptListResponse], script, path=["response"])
 
+    @pytest.mark.skip(reason="Mock returns invalid enum values ('string' instead of 'smart'/'targeted') (Issue #5)")
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.workers.scripts.with_raw_response.list(
@@ -605,8 +532,9 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         script = await response.parse()
-        assert_matches_type(AsyncSinglePage[Script], script, path=["response"])
+        assert_matches_type(AsyncSinglePage[ScriptListResponse], script, path=["response"])
 
+    @pytest.mark.skip(reason="Mock returns invalid enum values ('string' instead of 'smart'/'targeted') (Issue #5)")
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.workers.scripts.with_streaming_response.list(
@@ -616,7 +544,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             script = await response.parse()
-            assert_matches_type(AsyncSinglePage[Script], script, path=["response"])
+            assert_matches_type(AsyncSinglePage[ScriptListResponse], script, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -633,7 +561,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert script is None
+        assert_matches_type(object, script, path=["response"])
 
     @parametrize
     async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -642,7 +570,7 @@ async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             force=True,
         )
-        assert script is None
+        assert_matches_type(object, script, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -654,7 +582,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         script = await response.parse()
-        assert script is None
+        assert_matches_type(object, script, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -666,7 +594,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             script = await response.parse()
-            assert script is None
+            assert_matches_type(object, script, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -685,58 +613,40 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
             )
 
     @parametrize
-    @pytest.mark.respx(base_url=base_url)
-    async def test_method_get(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/accounts/023e105f4ecef8ad9ca31a8372d0c353/workers/scripts/this-is_my_script-01").mock(
-            return_value=httpx.Response(200, json={"foo": "bar"})
-        )
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         script = await async_client.workers.scripts.get(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert script.is_closed
-        assert await script.json() == {"foo": "bar"}
-        assert cast(Any, script.is_closed) is True
-        assert isinstance(script, AsyncBinaryAPIResponse)
+        assert_matches_type(str, script, path=["response"])
 
     @parametrize
-    @pytest.mark.respx(base_url=base_url)
-    async def test_raw_response_get(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/accounts/023e105f4ecef8ad9ca31a8372d0c353/workers/scripts/this-is_my_script-01").mock(
-            return_value=httpx.Response(200, json={"foo": "bar"})
-        )
-
-        script = await async_client.workers.scripts.with_raw_response.get(
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.scripts.with_raw_response.get(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
-        assert script.is_closed is True
-        assert script.http_request.headers.get("X-Stainless-Lang") == "python"
-        assert await script.json() == {"foo": "bar"}
-        assert isinstance(script, AsyncBinaryAPIResponse)
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        script = await response.parse()
+        assert_matches_type(str, script, path=["response"])
 
     @parametrize
-    @pytest.mark.respx(base_url=base_url)
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
-        respx_mock.get("/accounts/023e105f4ecef8ad9ca31a8372d0c353/workers/scripts/this-is_my_script-01").mock(
-            return_value=httpx.Response(200, json={"foo": "bar"})
-        )
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.workers.scripts.with_streaming_response.get(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as script:
-            assert not script.is_closed
-            assert script.http_request.headers.get("X-Stainless-Lang") == "python"
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            assert await script.json() == {"foo": "bar"}
-            assert cast(Any, script.is_closed) is True
-            assert isinstance(script, AsyncStreamedBinaryAPIResponse)
+            script = await response.parse()
+            assert_matches_type(str, script, path=["response"])
 
-        assert cast(Any, script.is_closed) is True
+        assert cast(Any, response.is_closed) is True
 
     @parametrize
-    @pytest.mark.respx(base_url=base_url)
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.workers.scripts.with_raw_response.get(
@@ -749,3 +659,53 @@ async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
             )
+
+    @parametrize
+    async def test_method_search(self, async_client: AsyncCloudflare) -> None:
+        script = await async_client.workers.scripts.search(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ScriptSearchResponse, script, path=["response"])
+
+    @parametrize
+    async def test_method_search_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        script = await async_client.workers.scripts.search(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            id="bdf3567828824b74aadd550004cf4913",
+            name="my-worker",
+            order_by="created_on",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(ScriptSearchResponse, script, path=["response"])
+
+    @parametrize
+    async def test_raw_response_search(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.scripts.with_raw_response.search(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        script = await response.parse()
+        assert_matches_type(ScriptSearchResponse, script, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_search(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.scripts.with_streaming_response.search(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            script = await response.parse()
+            assert_matches_type(ScriptSearchResponse, script, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_search(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.scripts.with_raw_response.search(
+                account_id="",
+            )
diff --git a/tests/api_resources/workers/test_subdomains.py b/tests/api_resources/workers/test_subdomains.py
index 7d4b05f92d4..17bc470306c 100644
--- a/tests/api_resources/workers/test_subdomains.py
+++ b/tests/api_resources/workers/test_subdomains.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -21,33 +21,33 @@ class TestSubdomains:
     def test_method_update(self, client: Cloudflare) -> None:
         subdomain = client.workers.subdomains.update(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="{'subdomain': 'example-subdomain'}",
+            subdomain="my-subdomain",
         )
-        assert_matches_type(Optional[SubdomainUpdateResponse], subdomain, path=["response"])
+        assert_matches_type(SubdomainUpdateResponse, subdomain, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.workers.subdomains.with_raw_response.update(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="{'subdomain': 'example-subdomain'}",
+            subdomain="my-subdomain",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         subdomain = response.parse()
-        assert_matches_type(Optional[SubdomainUpdateResponse], subdomain, path=["response"])
+        assert_matches_type(SubdomainUpdateResponse, subdomain, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.workers.subdomains.with_streaming_response.update(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="{'subdomain': 'example-subdomain'}",
+            subdomain="my-subdomain",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             subdomain = response.parse()
-            assert_matches_type(Optional[SubdomainUpdateResponse], subdomain, path=["response"])
+            assert_matches_type(SubdomainUpdateResponse, subdomain, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -56,7 +56,45 @@ def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.workers.subdomains.with_raw_response.update(
                 account_id="",
-                body="{'subdomain': 'example-subdomain'}",
+                subdomain="my-subdomain",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        subdomain = client.workers.subdomains.delete(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert subdomain is None
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.workers.subdomains.with_raw_response.delete(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subdomain = response.parse()
+        assert subdomain is None
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.workers.subdomains.with_streaming_response.delete(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subdomain = response.parse()
+            assert subdomain is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers.subdomains.with_raw_response.delete(
+                account_id="",
             )
 
     @parametrize
@@ -64,7 +102,7 @@ def test_method_get(self, client: Cloudflare) -> None:
         subdomain = client.workers.subdomains.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[SubdomainGetResponse], subdomain, path=["response"])
+        assert_matches_type(SubdomainGetResponse, subdomain, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -75,7 +113,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         subdomain = response.parse()
-        assert_matches_type(Optional[SubdomainGetResponse], subdomain, path=["response"])
+        assert_matches_type(SubdomainGetResponse, subdomain, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -86,7 +124,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             subdomain = response.parse()
-            assert_matches_type(Optional[SubdomainGetResponse], subdomain, path=["response"])
+            assert_matches_type(SubdomainGetResponse, subdomain, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -99,39 +137,41 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSubdomains:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         subdomain = await async_client.workers.subdomains.update(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="{'subdomain': 'example-subdomain'}",
+            subdomain="my-subdomain",
         )
-        assert_matches_type(Optional[SubdomainUpdateResponse], subdomain, path=["response"])
+        assert_matches_type(SubdomainUpdateResponse, subdomain, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.workers.subdomains.with_raw_response.update(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="{'subdomain': 'example-subdomain'}",
+            subdomain="my-subdomain",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         subdomain = await response.parse()
-        assert_matches_type(Optional[SubdomainUpdateResponse], subdomain, path=["response"])
+        assert_matches_type(SubdomainUpdateResponse, subdomain, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.workers.subdomains.with_streaming_response.update(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            body="{'subdomain': 'example-subdomain'}",
+            subdomain="my-subdomain",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             subdomain = await response.parse()
-            assert_matches_type(Optional[SubdomainUpdateResponse], subdomain, path=["response"])
+            assert_matches_type(SubdomainUpdateResponse, subdomain, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -140,7 +180,45 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.workers.subdomains.with_raw_response.update(
                 account_id="",
-                body="{'subdomain': 'example-subdomain'}",
+                subdomain="my-subdomain",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        subdomain = await async_client.workers.subdomains.delete(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert subdomain is None
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers.subdomains.with_raw_response.delete(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subdomain = await response.parse()
+        assert subdomain is None
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers.subdomains.with_streaming_response.delete(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subdomain = await response.parse()
+            assert subdomain is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers.subdomains.with_raw_response.delete(
+                account_id="",
             )
 
     @parametrize
@@ -148,7 +226,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         subdomain = await async_client.workers.subdomains.get(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[SubdomainGetResponse], subdomain, path=["response"])
+        assert_matches_type(SubdomainGetResponse, subdomain, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -159,7 +237,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         subdomain = await response.parse()
-        assert_matches_type(Optional[SubdomainGetResponse], subdomain, path=["response"])
+        assert_matches_type(SubdomainGetResponse, subdomain, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -170,7 +248,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             subdomain = await response.parse()
-            assert_matches_type(Optional[SubdomainGetResponse], subdomain, path=["response"])
+            assert_matches_type(SubdomainGetResponse, subdomain, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_asset_upload.py b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_asset_upload.py
new file mode 100644
index 00000000000..1b4b109eb1d
--- /dev/null
+++ b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_asset_upload.py
@@ -0,0 +1,222 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts import (
+    AssetUploadCreateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestAssetUpload:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        asset_upload = client.workers_for_platforms.dispatch.namespaces.scripts.asset_upload.create(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            manifest={
+                "foo": {
+                    "hash": "hash",
+                    "size": 0,
+                }
+            },
+        )
+        assert_matches_type(Optional[AssetUploadCreateResponse], asset_upload, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.workers_for_platforms.dispatch.namespaces.scripts.asset_upload.with_raw_response.create(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            manifest={
+                "foo": {
+                    "hash": "hash",
+                    "size": 0,
+                }
+            },
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asset_upload = response.parse()
+        assert_matches_type(Optional[AssetUploadCreateResponse], asset_upload, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.workers_for_platforms.dispatch.namespaces.scripts.asset_upload.with_streaming_response.create(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            manifest={
+                "foo": {
+                    "hash": "hash",
+                    "size": 0,
+                }
+            },
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asset_upload = response.parse()
+            assert_matches_type(Optional[AssetUploadCreateResponse], asset_upload, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers_for_platforms.dispatch.namespaces.scripts.asset_upload.with_raw_response.create(
+                script_name="this-is_my_script-01",
+                account_id="",
+                dispatch_namespace="my-dispatch-namespace",
+                manifest={
+                    "foo": {
+                        "hash": "hash",
+                        "size": 0,
+                    }
+                },
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dispatch_namespace` but received ''"):
+            client.workers_for_platforms.dispatch.namespaces.scripts.asset_upload.with_raw_response.create(
+                script_name="this-is_my_script-01",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="",
+                manifest={
+                    "foo": {
+                        "hash": "hash",
+                        "size": 0,
+                    }
+                },
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            client.workers_for_platforms.dispatch.namespaces.scripts.asset_upload.with_raw_response.create(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                manifest={
+                    "foo": {
+                        "hash": "hash",
+                        "size": 0,
+                    }
+                },
+            )
+
+
+class TestAsyncAssetUpload:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        asset_upload = await async_client.workers_for_platforms.dispatch.namespaces.scripts.asset_upload.create(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            manifest={
+                "foo": {
+                    "hash": "hash",
+                    "size": 0,
+                }
+            },
+        )
+        assert_matches_type(Optional[AssetUploadCreateResponse], asset_upload, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = (
+            await async_client.workers_for_platforms.dispatch.namespaces.scripts.asset_upload.with_raw_response.create(
+                script_name="this-is_my_script-01",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                manifest={
+                    "foo": {
+                        "hash": "hash",
+                        "size": 0,
+                    }
+                },
+            )
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        asset_upload = await response.parse()
+        assert_matches_type(Optional[AssetUploadCreateResponse], asset_upload, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with (
+            async_client.workers_for_platforms.dispatch.namespaces.scripts.asset_upload.with_streaming_response.create(
+                script_name="this-is_my_script-01",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                manifest={
+                    "foo": {
+                        "hash": "hash",
+                        "size": 0,
+                    }
+                },
+            )
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            asset_upload = await response.parse()
+            assert_matches_type(Optional[AssetUploadCreateResponse], asset_upload, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers_for_platforms.dispatch.namespaces.scripts.asset_upload.with_raw_response.create(
+                script_name="this-is_my_script-01",
+                account_id="",
+                dispatch_namespace="my-dispatch-namespace",
+                manifest={
+                    "foo": {
+                        "hash": "hash",
+                        "size": 0,
+                    }
+                },
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dispatch_namespace` but received ''"):
+            await async_client.workers_for_platforms.dispatch.namespaces.scripts.asset_upload.with_raw_response.create(
+                script_name="this-is_my_script-01",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="",
+                manifest={
+                    "foo": {
+                        "hash": "hash",
+                        "size": 0,
+                    }
+                },
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            await async_client.workers_for_platforms.dispatch.namespaces.scripts.asset_upload.with_raw_response.create(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                manifest={
+                    "foo": {
+                        "hash": "hash",
+                        "size": 0,
+                    }
+                },
+            )
diff --git a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_bindings.py b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_bindings.py
index 90c53166d4d..8bac33bc665 100644
--- a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_bindings.py
+++ b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_bindings.py
@@ -3,12 +3,13 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts import BindingGetResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -24,7 +25,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
         )
-        assert_matches_type(Optional[BindingGetResponse], binding, path=["response"])
+        assert_matches_type(SyncSinglePage[BindingGetResponse], binding, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -37,7 +38,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         binding = response.parse()
-        assert_matches_type(Optional[BindingGetResponse], binding, path=["response"])
+        assert_matches_type(SyncSinglePage[BindingGetResponse], binding, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -50,7 +51,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             binding = response.parse()
-            assert_matches_type(Optional[BindingGetResponse], binding, path=["response"])
+            assert_matches_type(SyncSinglePage[BindingGetResponse], binding, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -79,7 +80,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncBindings:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -88,7 +91,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
         )
-        assert_matches_type(Optional[BindingGetResponse], binding, path=["response"])
+        assert_matches_type(AsyncSinglePage[BindingGetResponse], binding, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -101,7 +104,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         binding = await response.parse()
-        assert_matches_type(Optional[BindingGetResponse], binding, path=["response"])
+        assert_matches_type(AsyncSinglePage[BindingGetResponse], binding, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -114,7 +117,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             binding = await response.parse()
-            assert_matches_type(Optional[BindingGetResponse], binding, path=["response"])
+            assert_matches_type(AsyncSinglePage[BindingGetResponse], binding, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_content.py b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_content.py
index f120ae9e897..276ca71f189 100644
--- a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_content.py
+++ b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_content.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import httpx
 import pytest
@@ -32,8 +32,9 @@ def test_method_update(self, client: Cloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
+            metadata={},
         )
-        assert_matches_type(Optional[Script], content, path=["response"])
+        assert_matches_type(Script, content, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -42,15 +43,15 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
-            any_part_name=[b"raw file contents", b"raw file contents", b"raw file contents"],
             metadata={
                 "body_part": "worker.js",
                 "main_module": "worker.js",
             },
+            files=[b"raw file contents"],
             cf_worker_body_part="CF-WORKER-BODY-PART",
             cf_worker_main_module_part="CF-WORKER-MAIN-MODULE-PART",
         )
-        assert_matches_type(Optional[Script], content, path=["response"])
+        assert_matches_type(Script, content, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -59,12 +60,13 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
+            metadata={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         content = response.parse()
-        assert_matches_type(Optional[Script], content, path=["response"])
+        assert_matches_type(Script, content, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -73,12 +75,13 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
+            metadata={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             content = response.parse()
-            assert_matches_type(Optional[Script], content, path=["response"])
+            assert_matches_type(Script, content, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -90,6 +93,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 script_name="this-is_my_script-01",
                 account_id="",
                 dispatch_namespace="my-dispatch-namespace",
+                metadata={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dispatch_namespace` but received ''"):
@@ -97,6 +101,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 script_name="this-is_my_script-01",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="",
+                metadata={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
@@ -104,6 +109,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="my-dispatch-namespace",
+                metadata={},
             )
 
     @parametrize
@@ -186,7 +192,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncContent:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -195,8 +203,9 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
+            metadata={},
         )
-        assert_matches_type(Optional[Script], content, path=["response"])
+        assert_matches_type(Script, content, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -205,15 +214,15 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
-            any_part_name=[b"raw file contents", b"raw file contents", b"raw file contents"],
             metadata={
                 "body_part": "worker.js",
                 "main_module": "worker.js",
             },
+            files=[b"raw file contents"],
             cf_worker_body_part="CF-WORKER-BODY-PART",
             cf_worker_main_module_part="CF-WORKER-MAIN-MODULE-PART",
         )
-        assert_matches_type(Optional[Script], content, path=["response"])
+        assert_matches_type(Script, content, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -223,27 +232,31 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
                 script_name="this-is_my_script-01",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="my-dispatch-namespace",
+                metadata={},
             )
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         content = await response.parse()
-        assert_matches_type(Optional[Script], content, path=["response"])
+        assert_matches_type(Script, content, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.workers_for_platforms.dispatch.namespaces.scripts.content.with_streaming_response.update(
-            script_name="this-is_my_script-01",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dispatch_namespace="my-dispatch-namespace",
+        async with (
+            async_client.workers_for_platforms.dispatch.namespaces.scripts.content.with_streaming_response.update(
+                script_name="this-is_my_script-01",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                metadata={},
+            )
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             content = await response.parse()
-            assert_matches_type(Optional[Script], content, path=["response"])
+            assert_matches_type(Script, content, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -255,6 +268,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 script_name="this-is_my_script-01",
                 account_id="",
                 dispatch_namespace="my-dispatch-namespace",
+                metadata={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dispatch_namespace` but received ''"):
@@ -262,6 +276,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 script_name="this-is_my_script-01",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="",
+                metadata={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
@@ -269,6 +284,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="my-dispatch-namespace",
+                metadata={},
             )
 
     @parametrize
diff --git a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_secrets.py b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_secrets.py
index a8d4a57e938..4de3418d629 100644
--- a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_secrets.py
+++ b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_secrets.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -11,6 +11,7 @@
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts import (
+    SecretGetResponse,
     SecretListResponse,
     SecretUpdateResponse,
 )
@@ -22,61 +23,163 @@ class TestSecrets:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
     @parametrize
-    def test_method_update(self, client: Cloudflare) -> None:
+    def test_method_update_overload_1(self, client: Cloudflare) -> None:
         secret = client.workers_for_platforms.dispatch.namespaces.scripts.secrets.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
+            name="myBinding",
+            text="My secret.",
+            type="secret_text",
         )
-        assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+        assert_matches_type(SecretUpdateResponse, secret, path=["response"])
 
     @parametrize
-    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        secret = client.workers_for_platforms.dispatch.namespaces.scripts.secrets.update(
+    def test_raw_response_update_overload_1(self, client: Cloudflare) -> None:
+        response = client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.update(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            name="myBinding",
+            text="My secret.",
+            type="secret_text",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = response.parse()
+        assert_matches_type(SecretUpdateResponse, secret, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update_overload_1(self, client: Cloudflare) -> None:
+        with client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_streaming_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
-            name="MY_SECRET",
-            text="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9",
+            name="myBinding",
+            text="My secret.",
             type="secret_text",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = response.parse()
+            assert_matches_type(SecretUpdateResponse, secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.update(
+                script_name="this-is_my_script-01",
+                account_id="",
+                dispatch_namespace="my-dispatch-namespace",
+                name="myBinding",
+                text="My secret.",
+                type="secret_text",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dispatch_namespace` but received ''"):
+            client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.update(
+                script_name="this-is_my_script-01",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="",
+                name="myBinding",
+                text="My secret.",
+                type="secret_text",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.update(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                name="myBinding",
+                text="My secret.",
+                type="secret_text",
+            )
+
+    @parametrize
+    def test_method_update_overload_2(self, client: Cloudflare) -> None:
+        secret = client.workers_for_platforms.dispatch.namespaces.scripts.secrets.update(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            algorithm={},
+            format="raw",
+            name="myBinding",
+            type="secret_key",
+            usages=["encrypt", "decrypt"],
+        )
+        assert_matches_type(SecretUpdateResponse, secret, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        secret = client.workers_for_platforms.dispatch.namespaces.scripts.secrets.update(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            algorithm={},
+            format="raw",
+            name="myBinding",
+            type="secret_key",
+            usages=["encrypt", "decrypt"],
+            key_base64="key_base64",
+            key_jwk={},
         )
-        assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+        assert_matches_type(SecretUpdateResponse, secret, path=["response"])
 
     @parametrize
-    def test_raw_response_update(self, client: Cloudflare) -> None:
+    def test_raw_response_update_overload_2(self, client: Cloudflare) -> None:
         response = client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
+            algorithm={},
+            format="raw",
+            name="myBinding",
+            type="secret_key",
+            usages=["encrypt", "decrypt"],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         secret = response.parse()
-        assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+        assert_matches_type(SecretUpdateResponse, secret, path=["response"])
 
     @parametrize
-    def test_streaming_response_update(self, client: Cloudflare) -> None:
+    def test_streaming_response_update_overload_2(self, client: Cloudflare) -> None:
         with client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_streaming_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
+            algorithm={},
+            format="raw",
+            name="myBinding",
+            type="secret_key",
+            usages=["encrypt", "decrypt"],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             secret = response.parse()
-            assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+            assert_matches_type(SecretUpdateResponse, secret, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    def test_path_params_update(self, client: Cloudflare) -> None:
+    def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.update(
                 script_name="this-is_my_script-01",
                 account_id="",
                 dispatch_namespace="my-dispatch-namespace",
+                algorithm={},
+                format="raw",
+                name="myBinding",
+                type="secret_key",
+                usages=["encrypt", "decrypt"],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dispatch_namespace` but received ''"):
@@ -84,6 +187,11 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 script_name="this-is_my_script-01",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="",
+                algorithm={},
+                format="raw",
+                name="myBinding",
+                type="secret_key",
+                usages=["encrypt", "decrypt"],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
@@ -91,6 +199,11 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="my-dispatch-namespace",
+                algorithm={},
+                format="raw",
+                name="myBinding",
+                type="secret_key",
+                usages=["encrypt", "decrypt"],
             )
 
     @parametrize
@@ -153,68 +266,348 @@ def test_path_params_list(self, client: Cloudflare) -> None:
                 dispatch_namespace="my-dispatch-namespace",
             )
 
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        secret = client.workers_for_platforms.dispatch.namespaces.scripts.secrets.delete(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            script_name="this-is_my_script-01",
+        )
+        assert_matches_type(object, secret, path=["response"])
 
-class TestAsyncSecrets:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    @parametrize
+    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
+        secret = client.workers_for_platforms.dispatch.namespaces.scripts.secrets.delete(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            script_name="this-is_my_script-01",
+            url_encoded=True,
+        )
+        assert_matches_type(object, secret, path=["response"])
 
     @parametrize
-    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        secret = await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.update(
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.delete(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            script_name="this-is_my_script-01",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = response.parse()
+        assert_matches_type(object, secret, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_streaming_response.delete(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            script_name="this-is_my_script-01",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = response.parse()
+            assert_matches_type(object, secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.delete(
+                secret_name="mySecret",
+                account_id="",
+                dispatch_namespace="my-dispatch-namespace",
+                script_name="this-is_my_script-01",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dispatch_namespace` but received ''"):
+            client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.delete(
+                secret_name="mySecret",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="",
+                script_name="this-is_my_script-01",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.delete(
+                secret_name="mySecret",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                script_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `secret_name` but received ''"):
+            client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.delete(
+                secret_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                script_name="this-is_my_script-01",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        secret = client.workers_for_platforms.dispatch.namespaces.scripts.secrets.get(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            script_name="this-is_my_script-01",
+        )
+        assert_matches_type(SecretGetResponse, secret, path=["response"])
+
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        secret = client.workers_for_platforms.dispatch.namespaces.scripts.secrets.get(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
             script_name="this-is_my_script-01",
+            url_encoded=True,
+        )
+        assert_matches_type(SecretGetResponse, secret, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.get(
+            secret_name="mySecret",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
+            script_name="this-is_my_script-01",
         )
-        assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = response.parse()
+        assert_matches_type(SecretGetResponse, secret, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_streaming_response.get(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            script_name="this-is_my_script-01",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = response.parse()
+            assert_matches_type(SecretGetResponse, secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.get(
+                secret_name="mySecret",
+                account_id="",
+                dispatch_namespace="my-dispatch-namespace",
+                script_name="this-is_my_script-01",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dispatch_namespace` but received ''"):
+            client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.get(
+                secret_name="mySecret",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="",
+                script_name="this-is_my_script-01",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.get(
+                secret_name="mySecret",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                script_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `secret_name` but received ''"):
+            client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.get(
+                secret_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                script_name="this-is_my_script-01",
+            )
+
+
+class TestAsyncSecrets:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
-    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_overload_1(self, async_client: AsyncCloudflare) -> None:
         secret = await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
-            name="MY_SECRET",
-            text="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9",
+            name="myBinding",
+            text="My secret.",
             type="secret_text",
         )
-        assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+        assert_matches_type(SecretUpdateResponse, secret, path=["response"])
 
     @parametrize
-    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
         response = (
             await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.update(
                 script_name="this-is_my_script-01",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="my-dispatch-namespace",
+                name="myBinding",
+                text="My secret.",
+                type="secret_text",
             )
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         secret = await response.parse()
-        assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+        assert_matches_type(SecretUpdateResponse, secret, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with (
+            async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_streaming_response.update(
+                script_name="this-is_my_script-01",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                name="myBinding",
+                text="My secret.",
+                type="secret_text",
+            )
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = await response.parse()
+            assert_matches_type(SecretUpdateResponse, secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.update(
+                script_name="this-is_my_script-01",
+                account_id="",
+                dispatch_namespace="my-dispatch-namespace",
+                name="myBinding",
+                text="My secret.",
+                type="secret_text",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dispatch_namespace` but received ''"):
+            await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.update(
+                script_name="this-is_my_script-01",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="",
+                name="myBinding",
+                text="My secret.",
+                type="secret_text",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.update(
+                script_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                name="myBinding",
+                text="My secret.",
+                type="secret_text",
+            )
+
+    @parametrize
+    async def test_method_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.update(
+            script_name="this-is_my_script-01",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            algorithm={},
+            format="raw",
+            name="myBinding",
+            type="secret_key",
+            usages=["encrypt", "decrypt"],
+        )
+        assert_matches_type(SecretUpdateResponse, secret, path=["response"])
 
     @parametrize
-    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_streaming_response.update(
+    async def test_method_update_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
+            algorithm={},
+            format="raw",
+            name="myBinding",
+            type="secret_key",
+            usages=["encrypt", "decrypt"],
+            key_base64="key_base64",
+            key_jwk={},
+        )
+        assert_matches_type(SecretUpdateResponse, secret, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = (
+            await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.update(
+                script_name="this-is_my_script-01",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                algorithm={},
+                format="raw",
+                name="myBinding",
+                type="secret_key",
+                usages=["encrypt", "decrypt"],
+            )
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = await response.parse()
+        assert_matches_type(SecretUpdateResponse, secret, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with (
+            async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_streaming_response.update(
+                script_name="this-is_my_script-01",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                algorithm={},
+                format="raw",
+                name="myBinding",
+                type="secret_key",
+                usages=["encrypt", "decrypt"],
+            )
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             secret = await response.parse()
-            assert_matches_type(Optional[SecretUpdateResponse], secret, path=["response"])
+            assert_matches_type(SecretUpdateResponse, secret, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.update(
                 script_name="this-is_my_script-01",
                 account_id="",
                 dispatch_namespace="my-dispatch-namespace",
+                algorithm={},
+                format="raw",
+                name="myBinding",
+                type="secret_key",
+                usages=["encrypt", "decrypt"],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dispatch_namespace` but received ''"):
@@ -222,6 +615,11 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 script_name="this-is_my_script-01",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="",
+                algorithm={},
+                format="raw",
+                name="myBinding",
+                type="secret_key",
+                usages=["encrypt", "decrypt"],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
@@ -229,6 +627,11 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="my-dispatch-namespace",
+                algorithm={},
+                format="raw",
+                name="myBinding",
+                type="secret_key",
+                usages=["encrypt", "decrypt"],
             )
 
     @parametrize
@@ -290,3 +693,177 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="my-dispatch-namespace",
             )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.delete(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            script_name="this-is_my_script-01",
+        )
+        assert_matches_type(object, secret, path=["response"])
+
+    @parametrize
+    async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.delete(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            script_name="this-is_my_script-01",
+            url_encoded=True,
+        )
+        assert_matches_type(object, secret, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = (
+            await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.delete(
+                secret_name="mySecret",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                script_name="this-is_my_script-01",
+            )
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = await response.parse()
+        assert_matches_type(object, secret, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with (
+            async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_streaming_response.delete(
+                secret_name="mySecret",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                script_name="this-is_my_script-01",
+            )
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = await response.parse()
+            assert_matches_type(object, secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.delete(
+                secret_name="mySecret",
+                account_id="",
+                dispatch_namespace="my-dispatch-namespace",
+                script_name="this-is_my_script-01",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dispatch_namespace` but received ''"):
+            await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.delete(
+                secret_name="mySecret",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="",
+                script_name="this-is_my_script-01",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.delete(
+                secret_name="mySecret",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                script_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `secret_name` but received ''"):
+            await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.delete(
+                secret_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                script_name="this-is_my_script-01",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.get(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            script_name="this-is_my_script-01",
+        )
+        assert_matches_type(SecretGetResponse, secret, path=["response"])
+
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        secret = await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.get(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            script_name="this-is_my_script-01",
+            url_encoded=True,
+        )
+        assert_matches_type(SecretGetResponse, secret, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.get(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            script_name="this-is_my_script-01",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        secret = await response.parse()
+        assert_matches_type(SecretGetResponse, secret, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_streaming_response.get(
+            secret_name="mySecret",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            dispatch_namespace="my-dispatch-namespace",
+            script_name="this-is_my_script-01",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            secret = await response.parse()
+            assert_matches_type(SecretGetResponse, secret, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.get(
+                secret_name="mySecret",
+                account_id="",
+                dispatch_namespace="my-dispatch-namespace",
+                script_name="this-is_my_script-01",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dispatch_namespace` but received ''"):
+            await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.get(
+                secret_name="mySecret",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="",
+                script_name="this-is_my_script-01",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
+            await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.get(
+                secret_name="mySecret",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                script_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `secret_name` but received ''"):
+            await async_client.workers_for_platforms.dispatch.namespaces.scripts.secrets.with_raw_response.get(
+                secret_name="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                dispatch_namespace="my-dispatch-namespace",
+                script_name="this-is_my_script-01",
+            )
diff --git a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_settings.py b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_settings.py
index 29d130ed83b..5b2d4d08745 100644
--- a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_settings.py
+++ b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_settings.py
@@ -38,72 +38,58 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
             settings={
-                "bindings": [{"type": "kv_namespace"}, {"type": "kv_namespace"}, {"type": "kv_namespace"}],
-                "compatibility_date": "2022-04-05",
-                "compatibility_flags": [
-                    "formdata_parser_supports_files",
-                    "formdata_parser_supports_files",
-                    "formdata_parser_supports_files",
+                "bindings": [
+                    {
+                        "name": "MY_ENV_VAR",
+                        "text": "my_data",
+                        "type": "plain_text",
+                    }
                 ],
+                "compatibility_date": "2021-01-01",
+                "compatibility_flags": ["nodejs_compat"],
                 "limits": {"cpu_ms": 50},
                 "logpush": False,
                 "migrations": {
+                    "deleted_classes": ["string"],
+                    "new_classes": ["string"],
+                    "new_sqlite_classes": ["string"],
                     "new_tag": "v2",
                     "old_tag": "v1",
-                    "deleted_classes": ["string", "string", "string"],
-                    "new_classes": ["string", "string", "string"],
                     "renamed_classes": [
                         {
                             "from": "from",
                             "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "to": "to",
-                        },
+                        }
                     ],
                     "transferred_classes": [
                         {
                             "from": "from",
                             "from_script": "from_script",
                             "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "from_script": "from_script",
-                            "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "from_script": "from_script",
-                            "to": "to",
-                        },
+                        }
                     ],
                 },
+                "observability": {
+                    "enabled": True,
+                    "head_sampling_rate": 0.1,
+                    "logs": {
+                        "enabled": True,
+                        "invocation_logs": True,
+                        "destinations": ["cloudflare"],
+                        "head_sampling_rate": 0.1,
+                        "persist": True,
+                    },
+                },
                 "placement": {"mode": "smart"},
-                "tags": ["my-tag", "my-tag", "my-tag"],
+                "tags": ["my-team", "my-public-api"],
                 "tail_consumers": [
                     {
-                        "environment": "production",
-                        "namespace": "my-namespace",
-                        "service": "my-log-consumer",
-                    },
-                    {
-                        "environment": "production",
-                        "namespace": "my-namespace",
                         "service": "my-log-consumer",
-                    },
-                    {
                         "environment": "production",
                         "namespace": "my-namespace",
-                        "service": "my-log-consumer",
-                    },
+                    }
                 ],
-                "usage_model": "unbound",
+                "usage_model": "standard",
             },
         )
         assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
@@ -224,7 +210,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncSettings:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -244,72 +232,58 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
             settings={
-                "bindings": [{"type": "kv_namespace"}, {"type": "kv_namespace"}, {"type": "kv_namespace"}],
-                "compatibility_date": "2022-04-05",
-                "compatibility_flags": [
-                    "formdata_parser_supports_files",
-                    "formdata_parser_supports_files",
-                    "formdata_parser_supports_files",
+                "bindings": [
+                    {
+                        "name": "MY_ENV_VAR",
+                        "text": "my_data",
+                        "type": "plain_text",
+                    }
                 ],
+                "compatibility_date": "2021-01-01",
+                "compatibility_flags": ["nodejs_compat"],
                 "limits": {"cpu_ms": 50},
                 "logpush": False,
                 "migrations": {
+                    "deleted_classes": ["string"],
+                    "new_classes": ["string"],
+                    "new_sqlite_classes": ["string"],
                     "new_tag": "v2",
                     "old_tag": "v1",
-                    "deleted_classes": ["string", "string", "string"],
-                    "new_classes": ["string", "string", "string"],
                     "renamed_classes": [
                         {
                             "from": "from",
                             "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "to": "to",
-                        },
+                        }
                     ],
                     "transferred_classes": [
                         {
                             "from": "from",
                             "from_script": "from_script",
                             "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "from_script": "from_script",
-                            "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "from_script": "from_script",
-                            "to": "to",
-                        },
+                        }
                     ],
                 },
+                "observability": {
+                    "enabled": True,
+                    "head_sampling_rate": 0.1,
+                    "logs": {
+                        "enabled": True,
+                        "invocation_logs": True,
+                        "destinations": ["cloudflare"],
+                        "head_sampling_rate": 0.1,
+                        "persist": True,
+                    },
+                },
                 "placement": {"mode": "smart"},
-                "tags": ["my-tag", "my-tag", "my-tag"],
+                "tags": ["my-team", "my-public-api"],
                 "tail_consumers": [
                     {
-                        "environment": "production",
-                        "namespace": "my-namespace",
-                        "service": "my-log-consumer",
-                    },
-                    {
-                        "environment": "production",
-                        "namespace": "my-namespace",
                         "service": "my-log-consumer",
-                    },
-                    {
                         "environment": "production",
                         "namespace": "my-namespace",
-                        "service": "my-log-consumer",
-                    },
+                    }
                 ],
-                "usage_model": "unbound",
+                "usage_model": "standard",
             },
         )
         assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
diff --git a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_tags.py b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_tags.py
index 382d4d2b376..c5832ab128f 100644
--- a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_tags.py
+++ b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_tags.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -27,9 +27,9 @@ def test_method_update(self, client: Cloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
-            body=["my-tag", "my-tag", "my-tag"],
+            body=["my-team", "my-public-api"],
         )
-        assert_matches_type(Optional[TagUpdateResponse], tag, path=["response"])
+        assert_matches_type(SyncSinglePage[TagUpdateResponse], tag, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
@@ -37,13 +37,13 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
-            body=["my-tag", "my-tag", "my-tag"],
+            body=["my-team", "my-public-api"],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         tag = response.parse()
-        assert_matches_type(Optional[TagUpdateResponse], tag, path=["response"])
+        assert_matches_type(SyncSinglePage[TagUpdateResponse], tag, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
@@ -51,13 +51,13 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
-            body=["my-tag", "my-tag", "my-tag"],
+            body=["my-team", "my-public-api"],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             tag = response.parse()
-            assert_matches_type(Optional[TagUpdateResponse], tag, path=["response"])
+            assert_matches_type(SyncSinglePage[TagUpdateResponse], tag, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -68,7 +68,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 script_name="this-is_my_script-01",
                 account_id="",
                 dispatch_namespace="my-dispatch-namespace",
-                body=["my-tag", "my-tag", "my-tag"],
+                body=["my-team", "my-public-api"],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dispatch_namespace` but received ''"):
@@ -76,7 +76,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 script_name="this-is_my_script-01",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="",
-                body=["my-tag", "my-tag", "my-tag"],
+                body=["my-team", "my-public-api"],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
@@ -84,7 +84,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="my-dispatch-namespace",
-                body=["my-tag", "my-tag", "my-tag"],
+                body=["my-team", "my-public-api"],
             )
 
     @parametrize
@@ -223,7 +223,9 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTags:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
@@ -231,9 +233,9 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
-            body=["my-tag", "my-tag", "my-tag"],
+            body=["my-team", "my-public-api"],
         )
-        assert_matches_type(Optional[TagUpdateResponse], tag, path=["response"])
+        assert_matches_type(AsyncSinglePage[TagUpdateResponse], tag, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
@@ -241,13 +243,13 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
-            body=["my-tag", "my-tag", "my-tag"],
+            body=["my-team", "my-public-api"],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         tag = await response.parse()
-        assert_matches_type(Optional[TagUpdateResponse], tag, path=["response"])
+        assert_matches_type(AsyncSinglePage[TagUpdateResponse], tag, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
@@ -255,13 +257,13 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
-            body=["my-tag", "my-tag", "my-tag"],
+            body=["my-team", "my-public-api"],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             tag = await response.parse()
-            assert_matches_type(Optional[TagUpdateResponse], tag, path=["response"])
+            assert_matches_type(AsyncSinglePage[TagUpdateResponse], tag, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -272,7 +274,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 script_name="this-is_my_script-01",
                 account_id="",
                 dispatch_namespace="my-dispatch-namespace",
-                body=["my-tag", "my-tag", "my-tag"],
+                body=["my-team", "my-public-api"],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dispatch_namespace` but received ''"):
@@ -280,7 +282,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 script_name="this-is_my_script-01",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="",
-                body=["my-tag", "my-tag", "my-tag"],
+                body=["my-team", "my-public-api"],
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
@@ -288,7 +290,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="my-dispatch-namespace",
-                body=["my-tag", "my-tag", "my-tag"],
+                body=["my-team", "my-public-api"],
             )
 
     @parametrize
diff --git a/tests/api_resources/workers_for_platforms/dispatch/namespaces/test_scripts.py b/tests/api_resources/workers_for_platforms/dispatch/namespaces/test_scripts.py
index febd78c036e..a2c8aea6fa7 100644
--- a/tests/api_resources/workers_for_platforms/dispatch/namespaces/test_scripts.py
+++ b/tests/api_resources/workers_for_platforms/dispatch/namespaces/test_scripts.py
@@ -3,15 +3,15 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.workers import Script as WorkersScript
 from cloudflare.types.workers_for_platforms.dispatch.namespaces import (
-    Script as NamespacesScript,
+    Script,
+    ScriptUpdateResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -22,23 +22,34 @@ class TestScripts:
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_overload_1(self, client: Cloudflare) -> None:
+    def test_method_update(self, client: Cloudflare) -> None:
         script = client.workers_for_platforms.dispatch.namespaces.scripts.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
+            metadata={},
         )
-        assert_matches_type(Optional[WorkersScript], script, path=["response"])
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_with_all_params_overload_1(self, client: Cloudflare) -> None:
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         script = client.workers_for_platforms.dispatch.namespaces.scripts.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
-            any_part_name=[b"raw file contents", b"raw file contents", b"raw file contents"],
             metadata={
+                "assets": {
+                    "config": {
+                        "_headers": "/dashboard/*\nX-Frame-Options: DENY\n\n/static/*\nAccess-Control-Allow-Origin: *",
+                        "_redirects": "/foo /bar 301\n/news/* /blog/:splat",
+                        "html_handling": "auto-trailing-slash",
+                        "not_found_handling": "404-page",
+                        "run_worker_first": ["string"],
+                        "serve_directly": True,
+                    },
+                    "jwt": "jwt",
+                },
                 "bindings": [
                     {
                         "name": "MY_ENV_VAR",
@@ -47,186 +58,100 @@ def test_method_update_with_all_params_overload_1(self, client: Cloudflare) -> N
                     }
                 ],
                 "body_part": "worker.js",
-                "compatibility_date": "2023-07-25",
-                "compatibility_flags": ["string", "string", "string"],
-                "keep_bindings": ["string", "string", "string"],
+                "compatibility_date": "2021-01-01",
+                "compatibility_flags": ["nodejs_compat"],
+                "keep_assets": False,
+                "keep_bindings": ["string"],
+                "limits": {"cpu_ms": 50},
                 "logpush": False,
                 "main_module": "worker.js",
                 "migrations": {
+                    "deleted_classes": ["string"],
+                    "new_classes": ["string"],
+                    "new_sqlite_classes": ["string"],
                     "new_tag": "v2",
                     "old_tag": "v1",
-                    "deleted_classes": ["string", "string", "string"],
-                    "new_classes": ["string", "string", "string"],
                     "renamed_classes": [
                         {
                             "from": "from",
                             "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "to": "to",
-                        },
+                        }
                     ],
                     "transferred_classes": [
                         {
                             "from": "from",
                             "from_script": "from_script",
                             "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "from_script": "from_script",
-                            "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "from_script": "from_script",
-                            "to": "to",
-                        },
+                        }
                     ],
                 },
+                "observability": {
+                    "enabled": True,
+                    "head_sampling_rate": 0.1,
+                    "logs": {
+                        "enabled": True,
+                        "invocation_logs": True,
+                        "destinations": ["cloudflare"],
+                        "head_sampling_rate": 0.1,
+                        "persist": True,
+                    },
+                },
                 "placement": {"mode": "smart"},
-                "tags": ["string", "string", "string"],
+                "tags": ["string"],
                 "tail_consumers": [
                     {
-                        "environment": "production",
-                        "namespace": "my-namespace",
-                        "service": "my-log-consumer",
-                    },
-                    {
-                        "environment": "production",
-                        "namespace": "my-namespace",
                         "service": "my-log-consumer",
-                    },
-                    {
                         "environment": "production",
                         "namespace": "my-namespace",
-                        "service": "my-log-consumer",
-                    },
+                    }
                 ],
-                "usage_model": "bundled",
-                "version_tags": {},
+                "usage_model": "standard",
             },
+            files=[b"raw file contents"],
         )
-        assert_matches_type(Optional[WorkersScript], script, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_raw_response_update_overload_1(self, client: Cloudflare) -> None:
-        response = client.workers_for_platforms.dispatch.namespaces.scripts.with_raw_response.update(
-            script_name="this-is_my_script-01",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dispatch_namespace="my-dispatch-namespace",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        script = response.parse()
-        assert_matches_type(Optional[WorkersScript], script, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_streaming_response_update_overload_1(self, client: Cloudflare) -> None:
-        with client.workers_for_platforms.dispatch.namespaces.scripts.with_streaming_response.update(
-            script_name="this-is_my_script-01",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dispatch_namespace="my-dispatch-namespace",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            script = response.parse()
-            assert_matches_type(Optional[WorkersScript], script, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_path_params_update_overload_1(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.workers_for_platforms.dispatch.namespaces.scripts.with_raw_response.update(
-                script_name="this-is_my_script-01",
-                account_id="",
-                dispatch_namespace="my-dispatch-namespace",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dispatch_namespace` but received ''"):
-            client.workers_for_platforms.dispatch.namespaces.scripts.with_raw_response.update(
-                script_name="this-is_my_script-01",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                dispatch_namespace="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
-            client.workers_for_platforms.dispatch.namespaces.scripts.with_raw_response.update(
-                script_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                dispatch_namespace="my-dispatch-namespace",
-            )
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_method_update_overload_2(self, client: Cloudflare) -> None:
-        script = client.workers_for_platforms.dispatch.namespaces.scripts.update(
-            script_name="this-is_my_script-01",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dispatch_namespace="my-dispatch-namespace",
-        )
-        assert_matches_type(Optional[WorkersScript], script, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_method_update_with_all_params_overload_2(self, client: Cloudflare) -> None:
-        script = client.workers_for_platforms.dispatch.namespaces.scripts.update(
-            script_name="this-is_my_script-01",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dispatch_namespace="my-dispatch-namespace",
-            message="message",
-        )
-        assert_matches_type(Optional[WorkersScript], script, path=["response"])
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_raw_response_update_overload_2(self, client: Cloudflare) -> None:
+    def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.workers_for_platforms.dispatch.namespaces.scripts.with_raw_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
+            metadata={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         script = response.parse()
-        assert_matches_type(Optional[WorkersScript], script, path=["response"])
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_streaming_response_update_overload_2(self, client: Cloudflare) -> None:
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.workers_for_platforms.dispatch.namespaces.scripts.with_streaming_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
+            metadata={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             script = response.parse()
-            assert_matches_type(Optional[WorkersScript], script, path=["response"])
+            assert_matches_type(ScriptUpdateResponse, script, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
+    def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.workers_for_platforms.dispatch.namespaces.scripts.with_raw_response.update(
                 script_name="this-is_my_script-01",
                 account_id="",
                 dispatch_namespace="my-dispatch-namespace",
+                metadata={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dispatch_namespace` but received ''"):
@@ -234,6 +159,7 @@ def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
                 script_name="this-is_my_script-01",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="",
+                metadata={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
@@ -241,6 +167,7 @@ def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="my-dispatch-namespace",
+                metadata={},
             )
 
     @parametrize
@@ -250,7 +177,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
         )
-        assert script is None
+        assert_matches_type(object, script, path=["response"])
 
     @parametrize
     def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
@@ -260,7 +187,7 @@ def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
             dispatch_namespace="my-dispatch-namespace",
             force=True,
         )
-        assert script is None
+        assert_matches_type(object, script, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -273,7 +200,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         script = response.parse()
-        assert script is None
+        assert_matches_type(object, script, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -286,7 +213,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             script = response.parse()
-            assert script is None
+            assert_matches_type(object, script, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -320,7 +247,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
         )
-        assert_matches_type(Optional[NamespacesScript], script, path=["response"])
+        assert_matches_type(Script, script, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -333,7 +260,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         script = response.parse()
-        assert_matches_type(Optional[NamespacesScript], script, path=["response"])
+        assert_matches_type(Script, script, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -346,7 +273,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             script = response.parse()
-            assert_matches_type(Optional[NamespacesScript], script, path=["response"])
+            assert_matches_type(Script, script, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -375,27 +302,40 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncScripts:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         script = await async_client.workers_for_platforms.dispatch.namespaces.scripts.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
+            metadata={},
         )
-        assert_matches_type(Optional[WorkersScript], script, path=["response"])
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_update_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         script = await async_client.workers_for_platforms.dispatch.namespaces.scripts.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
-            any_part_name=[b"raw file contents", b"raw file contents", b"raw file contents"],
             metadata={
+                "assets": {
+                    "config": {
+                        "_headers": "/dashboard/*\nX-Frame-Options: DENY\n\n/static/*\nAccess-Control-Allow-Origin: *",
+                        "_redirects": "/foo /bar 301\n/news/* /blog/:splat",
+                        "html_handling": "auto-trailing-slash",
+                        "not_found_handling": "404-page",
+                        "run_worker_first": ["string"],
+                        "serve_directly": True,
+                    },
+                    "jwt": "jwt",
+                },
                 "bindings": [
                     {
                         "name": "MY_ENV_VAR",
@@ -404,186 +344,100 @@ async def test_method_update_with_all_params_overload_1(self, async_client: Asyn
                     }
                 ],
                 "body_part": "worker.js",
-                "compatibility_date": "2023-07-25",
-                "compatibility_flags": ["string", "string", "string"],
-                "keep_bindings": ["string", "string", "string"],
+                "compatibility_date": "2021-01-01",
+                "compatibility_flags": ["nodejs_compat"],
+                "keep_assets": False,
+                "keep_bindings": ["string"],
+                "limits": {"cpu_ms": 50},
                 "logpush": False,
                 "main_module": "worker.js",
                 "migrations": {
+                    "deleted_classes": ["string"],
+                    "new_classes": ["string"],
+                    "new_sqlite_classes": ["string"],
                     "new_tag": "v2",
                     "old_tag": "v1",
-                    "deleted_classes": ["string", "string", "string"],
-                    "new_classes": ["string", "string", "string"],
                     "renamed_classes": [
                         {
                             "from": "from",
                             "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "to": "to",
-                        },
+                        }
                     ],
                     "transferred_classes": [
                         {
                             "from": "from",
                             "from_script": "from_script",
                             "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "from_script": "from_script",
-                            "to": "to",
-                        },
-                        {
-                            "from": "from",
-                            "from_script": "from_script",
-                            "to": "to",
-                        },
+                        }
                     ],
                 },
+                "observability": {
+                    "enabled": True,
+                    "head_sampling_rate": 0.1,
+                    "logs": {
+                        "enabled": True,
+                        "invocation_logs": True,
+                        "destinations": ["cloudflare"],
+                        "head_sampling_rate": 0.1,
+                        "persist": True,
+                    },
+                },
                 "placement": {"mode": "smart"},
-                "tags": ["string", "string", "string"],
+                "tags": ["string"],
                 "tail_consumers": [
                     {
-                        "environment": "production",
-                        "namespace": "my-namespace",
-                        "service": "my-log-consumer",
-                    },
-                    {
-                        "environment": "production",
-                        "namespace": "my-namespace",
                         "service": "my-log-consumer",
-                    },
-                    {
                         "environment": "production",
                         "namespace": "my-namespace",
-                        "service": "my-log-consumer",
-                    },
+                    }
                 ],
-                "usage_model": "bundled",
-                "version_tags": {},
+                "usage_model": "standard",
             },
+            files=[b"raw file contents"],
         )
-        assert_matches_type(Optional[WorkersScript], script, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_raw_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.workers_for_platforms.dispatch.namespaces.scripts.with_raw_response.update(
-            script_name="this-is_my_script-01",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dispatch_namespace="my-dispatch-namespace",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        script = await response.parse()
-        assert_matches_type(Optional[WorkersScript], script, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_streaming_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.workers_for_platforms.dispatch.namespaces.scripts.with_streaming_response.update(
-            script_name="this-is_my_script-01",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dispatch_namespace="my-dispatch-namespace",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            script = await response.parse()
-            assert_matches_type(Optional[WorkersScript], script, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_path_params_update_overload_1(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.workers_for_platforms.dispatch.namespaces.scripts.with_raw_response.update(
-                script_name="this-is_my_script-01",
-                account_id="",
-                dispatch_namespace="my-dispatch-namespace",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dispatch_namespace` but received ''"):
-            await async_client.workers_for_platforms.dispatch.namespaces.scripts.with_raw_response.update(
-                script_name="this-is_my_script-01",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                dispatch_namespace="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
-            await async_client.workers_for_platforms.dispatch.namespaces.scripts.with_raw_response.update(
-                script_name="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
-                dispatch_namespace="my-dispatch-namespace",
-            )
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_method_update_overload_2(self, async_client: AsyncCloudflare) -> None:
-        script = await async_client.workers_for_platforms.dispatch.namespaces.scripts.update(
-            script_name="this-is_my_script-01",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dispatch_namespace="my-dispatch-namespace",
-        )
-        assert_matches_type(Optional[WorkersScript], script, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_method_update_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
-        script = await async_client.workers_for_platforms.dispatch.namespaces.scripts.update(
-            script_name="this-is_my_script-01",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            dispatch_namespace="my-dispatch-namespace",
-            message="message",
-        )
-        assert_matches_type(Optional[WorkersScript], script, path=["response"])
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.workers_for_platforms.dispatch.namespaces.scripts.with_raw_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
+            metadata={},
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         script = await response.parse()
-        assert_matches_type(Optional[WorkersScript], script, path=["response"])
+        assert_matches_type(ScriptUpdateResponse, script, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.workers_for_platforms.dispatch.namespaces.scripts.with_streaming_response.update(
             script_name="this-is_my_script-01",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
+            metadata={},
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             script = await response.parse()
-            assert_matches_type(Optional[WorkersScript], script, path=["response"])
+            assert_matches_type(ScriptUpdateResponse, script, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.workers_for_platforms.dispatch.namespaces.scripts.with_raw_response.update(
                 script_name="this-is_my_script-01",
                 account_id="",
                 dispatch_namespace="my-dispatch-namespace",
+                metadata={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dispatch_namespace` but received ''"):
@@ -591,6 +445,7 @@ async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare
                 script_name="this-is_my_script-01",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="",
+                metadata={},
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `script_name` but received ''"):
@@ -598,6 +453,7 @@ async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare
                 script_name="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 dispatch_namespace="my-dispatch-namespace",
+                metadata={},
             )
 
     @parametrize
@@ -607,7 +463,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
         )
-        assert script is None
+        assert_matches_type(object, script, path=["response"])
 
     @parametrize
     async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -617,7 +473,7 @@ async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare
             dispatch_namespace="my-dispatch-namespace",
             force=True,
         )
-        assert script is None
+        assert_matches_type(object, script, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -630,7 +486,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         script = await response.parse()
-        assert script is None
+        assert_matches_type(object, script, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -643,7 +499,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             script = await response.parse()
-            assert script is None
+            assert_matches_type(object, script, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -677,7 +533,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             dispatch_namespace="my-dispatch-namespace",
         )
-        assert_matches_type(Optional[NamespacesScript], script, path=["response"])
+        assert_matches_type(Script, script, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -690,7 +546,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         script = await response.parse()
-        assert_matches_type(Optional[NamespacesScript], script, path=["response"])
+        assert_matches_type(Script, script, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -703,7 +559,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             script = await response.parse()
-            assert_matches_type(Optional[NamespacesScript], script, path=["response"])
+            assert_matches_type(Script, script, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/workers_for_platforms/dispatch/test_namespaces.py b/tests/api_resources/workers_for_platforms/dispatch/test_namespaces.py
index df9749cb2e5..a885e5f370a 100644
--- a/tests/api_resources/workers_for_platforms/dispatch/test_namespaces.py
+++ b/tests/api_resources/workers_for_platforms/dispatch/test_namespaces.py
@@ -204,7 +204,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncNamespaces:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/workflows/__init__.py b/tests/api_resources/workflows/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/workflows/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/workflows/instances/__init__.py b/tests/api_resources/workflows/instances/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/workflows/instances/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/workflows/instances/test_events.py b/tests/api_resources/workflows/instances/test_events.py
new file mode 100644
index 00000000000..fa638445ffc
--- /dev/null
+++ b/tests/api_resources/workflows/instances/test_events.py
@@ -0,0 +1,193 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestEvents:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        event = client.workflows.instances.events.create(
+            event_type="x",
+            account_id="account_id",
+            workflow_name="x",
+            instance_id="x",
+        )
+        assert_matches_type(object, event, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        event = client.workflows.instances.events.create(
+            event_type="x",
+            account_id="account_id",
+            workflow_name="x",
+            instance_id="x",
+            body={},
+        )
+        assert_matches_type(object, event, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.workflows.instances.events.with_raw_response.create(
+            event_type="x",
+            account_id="account_id",
+            workflow_name="x",
+            instance_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        event = response.parse()
+        assert_matches_type(object, event, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.workflows.instances.events.with_streaming_response.create(
+            event_type="x",
+            account_id="account_id",
+            workflow_name="x",
+            instance_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            event = response.parse()
+            assert_matches_type(object, event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workflows.instances.events.with_raw_response.create(
+                event_type="x",
+                account_id="",
+                workflow_name="x",
+                instance_id="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            client.workflows.instances.events.with_raw_response.create(
+                event_type="x",
+                account_id="account_id",
+                workflow_name="",
+                instance_id="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `instance_id` but received ''"):
+            client.workflows.instances.events.with_raw_response.create(
+                event_type="x",
+                account_id="account_id",
+                workflow_name="x",
+                instance_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_type` but received ''"):
+            client.workflows.instances.events.with_raw_response.create(
+                event_type="",
+                account_id="account_id",
+                workflow_name="x",
+                instance_id="x",
+            )
+
+
+class TestAsyncEvents:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        event = await async_client.workflows.instances.events.create(
+            event_type="x",
+            account_id="account_id",
+            workflow_name="x",
+            instance_id="x",
+        )
+        assert_matches_type(object, event, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        event = await async_client.workflows.instances.events.create(
+            event_type="x",
+            account_id="account_id",
+            workflow_name="x",
+            instance_id="x",
+            body={},
+        )
+        assert_matches_type(object, event, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workflows.instances.events.with_raw_response.create(
+            event_type="x",
+            account_id="account_id",
+            workflow_name="x",
+            instance_id="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        event = await response.parse()
+        assert_matches_type(object, event, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workflows.instances.events.with_streaming_response.create(
+            event_type="x",
+            account_id="account_id",
+            workflow_name="x",
+            instance_id="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            event = await response.parse()
+            assert_matches_type(object, event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workflows.instances.events.with_raw_response.create(
+                event_type="x",
+                account_id="",
+                workflow_name="x",
+                instance_id="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            await async_client.workflows.instances.events.with_raw_response.create(
+                event_type="x",
+                account_id="account_id",
+                workflow_name="",
+                instance_id="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `instance_id` but received ''"):
+            await async_client.workflows.instances.events.with_raw_response.create(
+                event_type="x",
+                account_id="account_id",
+                workflow_name="x",
+                instance_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `event_type` but received ''"):
+            await async_client.workflows.instances.events.with_raw_response.create(
+                event_type="",
+                account_id="account_id",
+                workflow_name="x",
+                instance_id="x",
+            )
diff --git a/tests/api_resources/workflows/instances/test_status.py b/tests/api_resources/workflows/instances/test_status.py
new file mode 100644
index 00000000000..5b7e8ff5db9
--- /dev/null
+++ b/tests/api_resources/workflows/instances/test_status.py
@@ -0,0 +1,156 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.workflows.instances import StatusEditResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestStatus:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        status = client.workflows.instances.status.edit(
+            instance_id="x",
+            account_id="account_id",
+            workflow_name="x",
+            status="resume",
+        )
+        assert_matches_type(StatusEditResponse, status, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.workflows.instances.status.with_raw_response.edit(
+            instance_id="x",
+            account_id="account_id",
+            workflow_name="x",
+            status="resume",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        status = response.parse()
+        assert_matches_type(StatusEditResponse, status, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.workflows.instances.status.with_streaming_response.edit(
+            instance_id="x",
+            account_id="account_id",
+            workflow_name="x",
+            status="resume",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            status = response.parse()
+            assert_matches_type(StatusEditResponse, status, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workflows.instances.status.with_raw_response.edit(
+                instance_id="x",
+                account_id="",
+                workflow_name="x",
+                status="resume",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            client.workflows.instances.status.with_raw_response.edit(
+                instance_id="x",
+                account_id="account_id",
+                workflow_name="",
+                status="resume",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `instance_id` but received ''"):
+            client.workflows.instances.status.with_raw_response.edit(
+                instance_id="",
+                account_id="account_id",
+                workflow_name="x",
+                status="resume",
+            )
+
+
+class TestAsyncStatus:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        status = await async_client.workflows.instances.status.edit(
+            instance_id="x",
+            account_id="account_id",
+            workflow_name="x",
+            status="resume",
+        )
+        assert_matches_type(StatusEditResponse, status, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workflows.instances.status.with_raw_response.edit(
+            instance_id="x",
+            account_id="account_id",
+            workflow_name="x",
+            status="resume",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        status = await response.parse()
+        assert_matches_type(StatusEditResponse, status, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workflows.instances.status.with_streaming_response.edit(
+            instance_id="x",
+            account_id="account_id",
+            workflow_name="x",
+            status="resume",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            status = await response.parse()
+            assert_matches_type(StatusEditResponse, status, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workflows.instances.status.with_raw_response.edit(
+                instance_id="x",
+                account_id="",
+                workflow_name="x",
+                status="resume",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            await async_client.workflows.instances.status.with_raw_response.edit(
+                instance_id="x",
+                account_id="account_id",
+                workflow_name="",
+                status="resume",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `instance_id` but received ''"):
+            await async_client.workflows.instances.status.with_raw_response.edit(
+                instance_id="",
+                account_id="account_id",
+                workflow_name="x",
+                status="resume",
+            )
diff --git a/tests/api_resources/workflows/test_instances.py b/tests/api_resources/workflows/test_instances.py
new file mode 100644
index 00000000000..f5af61e88cb
--- /dev/null
+++ b/tests/api_resources/workflows/test_instances.py
@@ -0,0 +1,533 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.workflows import (
+    InstanceGetResponse,
+    InstanceBulkResponse,
+    InstanceListResponse,
+    InstanceCreateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestInstances:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        instance = client.workflows.instances.create(
+            workflow_name="x",
+            account_id="account_id",
+        )
+        assert_matches_type(InstanceCreateResponse, instance, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        instance = client.workflows.instances.create(
+            workflow_name="x",
+            account_id="account_id",
+            instance_id="instance_id",
+            instance_retention={
+                "error_retention": 0,
+                "success_retention": 0,
+            },
+            params={},
+        )
+        assert_matches_type(InstanceCreateResponse, instance, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.workflows.instances.with_raw_response.create(
+            workflow_name="x",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = response.parse()
+        assert_matches_type(InstanceCreateResponse, instance, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.workflows.instances.with_streaming_response.create(
+            workflow_name="x",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = response.parse()
+            assert_matches_type(InstanceCreateResponse, instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workflows.instances.with_raw_response.create(
+                workflow_name="x",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            client.workflows.instances.with_raw_response.create(
+                workflow_name="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        instance = client.workflows.instances.list(
+            workflow_name="x",
+            account_id="account_id",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[InstanceListResponse], instance, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        instance = client.workflows.instances.list(
+            workflow_name="x",
+            account_id="account_id",
+            cursor="cursor",
+            date_end=parse_datetime("2019-12-27T18:11:19.117Z"),
+            date_start=parse_datetime("2019-12-27T18:11:19.117Z"),
+            direction="asc",
+            page=1,
+            per_page=1,
+            status="queued",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[InstanceListResponse], instance, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.workflows.instances.with_raw_response.list(
+            workflow_name="x",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[InstanceListResponse], instance, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.workflows.instances.with_streaming_response.list(
+            workflow_name="x",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[InstanceListResponse], instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workflows.instances.with_raw_response.list(
+                workflow_name="x",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            client.workflows.instances.with_raw_response.list(
+                workflow_name="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_bulk(self, client: Cloudflare) -> None:
+        instance = client.workflows.instances.bulk(
+            workflow_name="x",
+            account_id="account_id",
+        )
+        assert_matches_type(SyncSinglePage[InstanceBulkResponse], instance, path=["response"])
+
+    @parametrize
+    def test_method_bulk_with_all_params(self, client: Cloudflare) -> None:
+        instance = client.workflows.instances.bulk(
+            workflow_name="x",
+            account_id="account_id",
+            body=[
+                {
+                    "instance_id": "instance_id",
+                    "instance_retention": {
+                        "error_retention": 0,
+                        "success_retention": 0,
+                    },
+                    "params": {},
+                }
+            ],
+        )
+        assert_matches_type(SyncSinglePage[InstanceBulkResponse], instance, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk(self, client: Cloudflare) -> None:
+        response = client.workflows.instances.with_raw_response.bulk(
+            workflow_name="x",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = response.parse()
+        assert_matches_type(SyncSinglePage[InstanceBulkResponse], instance, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk(self, client: Cloudflare) -> None:
+        with client.workflows.instances.with_streaming_response.bulk(
+            workflow_name="x",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = response.parse()
+            assert_matches_type(SyncSinglePage[InstanceBulkResponse], instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workflows.instances.with_raw_response.bulk(
+                workflow_name="x",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            client.workflows.instances.with_raw_response.bulk(
+                workflow_name="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        instance = client.workflows.instances.get(
+            instance_id="x",
+            account_id="account_id",
+            workflow_name="x",
+        )
+        assert_matches_type(InstanceGetResponse, instance, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.workflows.instances.with_raw_response.get(
+            instance_id="x",
+            account_id="account_id",
+            workflow_name="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = response.parse()
+        assert_matches_type(InstanceGetResponse, instance, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.workflows.instances.with_streaming_response.get(
+            instance_id="x",
+            account_id="account_id",
+            workflow_name="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = response.parse()
+            assert_matches_type(InstanceGetResponse, instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workflows.instances.with_raw_response.get(
+                instance_id="x",
+                account_id="",
+                workflow_name="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            client.workflows.instances.with_raw_response.get(
+                instance_id="x",
+                account_id="account_id",
+                workflow_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `instance_id` but received ''"):
+            client.workflows.instances.with_raw_response.get(
+                instance_id="",
+                account_id="account_id",
+                workflow_name="x",
+            )
+
+
+class TestAsyncInstances:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.workflows.instances.create(
+            workflow_name="x",
+            account_id="account_id",
+        )
+        assert_matches_type(InstanceCreateResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.workflows.instances.create(
+            workflow_name="x",
+            account_id="account_id",
+            instance_id="instance_id",
+            instance_retention={
+                "error_retention": 0,
+                "success_retention": 0,
+            },
+            params={},
+        )
+        assert_matches_type(InstanceCreateResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workflows.instances.with_raw_response.create(
+            workflow_name="x",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = await response.parse()
+        assert_matches_type(InstanceCreateResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workflows.instances.with_streaming_response.create(
+            workflow_name="x",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = await response.parse()
+            assert_matches_type(InstanceCreateResponse, instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workflows.instances.with_raw_response.create(
+                workflow_name="x",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            await async_client.workflows.instances.with_raw_response.create(
+                workflow_name="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.workflows.instances.list(
+            workflow_name="x",
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[InstanceListResponse], instance, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.workflows.instances.list(
+            workflow_name="x",
+            account_id="account_id",
+            cursor="cursor",
+            date_end=parse_datetime("2019-12-27T18:11:19.117Z"),
+            date_start=parse_datetime("2019-12-27T18:11:19.117Z"),
+            direction="asc",
+            page=1,
+            per_page=1,
+            status="queued",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[InstanceListResponse], instance, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workflows.instances.with_raw_response.list(
+            workflow_name="x",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[InstanceListResponse], instance, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workflows.instances.with_streaming_response.list(
+            workflow_name="x",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[InstanceListResponse], instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workflows.instances.with_raw_response.list(
+                workflow_name="x",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            await async_client.workflows.instances.with_raw_response.list(
+                workflow_name="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_bulk(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.workflows.instances.bulk(
+            workflow_name="x",
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncSinglePage[InstanceBulkResponse], instance, path=["response"])
+
+    @parametrize
+    async def test_method_bulk_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.workflows.instances.bulk(
+            workflow_name="x",
+            account_id="account_id",
+            body=[
+                {
+                    "instance_id": "instance_id",
+                    "instance_retention": {
+                        "error_retention": 0,
+                        "success_retention": 0,
+                    },
+                    "params": {},
+                }
+            ],
+        )
+        assert_matches_type(AsyncSinglePage[InstanceBulkResponse], instance, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workflows.instances.with_raw_response.bulk(
+            workflow_name="x",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = await response.parse()
+        assert_matches_type(AsyncSinglePage[InstanceBulkResponse], instance, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workflows.instances.with_streaming_response.bulk(
+            workflow_name="x",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = await response.parse()
+            assert_matches_type(AsyncSinglePage[InstanceBulkResponse], instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workflows.instances.with_raw_response.bulk(
+                workflow_name="x",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            await async_client.workflows.instances.with_raw_response.bulk(
+                workflow_name="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        instance = await async_client.workflows.instances.get(
+            instance_id="x",
+            account_id="account_id",
+            workflow_name="x",
+        )
+        assert_matches_type(InstanceGetResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workflows.instances.with_raw_response.get(
+            instance_id="x",
+            account_id="account_id",
+            workflow_name="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        instance = await response.parse()
+        assert_matches_type(InstanceGetResponse, instance, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workflows.instances.with_streaming_response.get(
+            instance_id="x",
+            account_id="account_id",
+            workflow_name="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            instance = await response.parse()
+            assert_matches_type(InstanceGetResponse, instance, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workflows.instances.with_raw_response.get(
+                instance_id="x",
+                account_id="",
+                workflow_name="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            await async_client.workflows.instances.with_raw_response.get(
+                instance_id="x",
+                account_id="account_id",
+                workflow_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `instance_id` but received ''"):
+            await async_client.workflows.instances.with_raw_response.get(
+                instance_id="",
+                account_id="account_id",
+                workflow_name="x",
+            )
diff --git a/tests/api_resources/workflows/test_versions.py b/tests/api_resources/workflows/test_versions.py
new file mode 100644
index 00000000000..ecdc89ad65b
--- /dev/null
+++ b/tests/api_resources/workflows/test_versions.py
@@ -0,0 +1,261 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.workflows import VersionGetResponse, VersionListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestVersions:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        version = client.workflows.versions.list(
+            workflow_name="x",
+            account_id="account_id",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[VersionListResponse], version, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        version = client.workflows.versions.list(
+            workflow_name="x",
+            account_id="account_id",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[VersionListResponse], version, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.workflows.versions.with_raw_response.list(
+            workflow_name="x",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        version = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[VersionListResponse], version, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.workflows.versions.with_streaming_response.list(
+            workflow_name="x",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            version = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[VersionListResponse], version, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workflows.versions.with_raw_response.list(
+                workflow_name="x",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            client.workflows.versions.with_raw_response.list(
+                workflow_name="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        version = client.workflows.versions.get(
+            version_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            workflow_name="x",
+        )
+        assert_matches_type(VersionGetResponse, version, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.workflows.versions.with_raw_response.get(
+            version_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            workflow_name="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        version = response.parse()
+        assert_matches_type(VersionGetResponse, version, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.workflows.versions.with_streaming_response.get(
+            version_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            workflow_name="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            version = response.parse()
+            assert_matches_type(VersionGetResponse, version, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.workflows.versions.with_raw_response.get(
+                version_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                workflow_name="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            client.workflows.versions.with_raw_response.get(
+                version_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="account_id",
+                workflow_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `version_id` but received ''"):
+            client.workflows.versions.with_raw_response.get(
+                version_id="",
+                account_id="account_id",
+                workflow_name="x",
+            )
+
+
+class TestAsyncVersions:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        version = await async_client.workflows.versions.list(
+            workflow_name="x",
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[VersionListResponse], version, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        version = await async_client.workflows.versions.list(
+            workflow_name="x",
+            account_id="account_id",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[VersionListResponse], version, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workflows.versions.with_raw_response.list(
+            workflow_name="x",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        version = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[VersionListResponse], version, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workflows.versions.with_streaming_response.list(
+            workflow_name="x",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            version = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[VersionListResponse], version, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workflows.versions.with_raw_response.list(
+                workflow_name="x",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            await async_client.workflows.versions.with_raw_response.list(
+                workflow_name="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        version = await async_client.workflows.versions.get(
+            version_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            workflow_name="x",
+        )
+        assert_matches_type(VersionGetResponse, version, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.workflows.versions.with_raw_response.get(
+            version_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            workflow_name="x",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        version = await response.parse()
+        assert_matches_type(VersionGetResponse, version, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.workflows.versions.with_streaming_response.get(
+            version_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            workflow_name="x",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            version = await response.parse()
+            assert_matches_type(VersionGetResponse, version, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.workflows.versions.with_raw_response.get(
+                version_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                workflow_name="x",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `workflow_name` but received ''"):
+            await async_client.workflows.versions.with_raw_response.get(
+                version_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="account_id",
+                workflow_name="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `version_id` but received ''"):
+            await async_client.workflows.versions.with_raw_response.get(
+                version_id="",
+                account_id="account_id",
+                workflow_name="x",
+            )
diff --git a/tests/api_resources/zaraz/__init__.py b/tests/api_resources/zaraz/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zaraz/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zaraz/history/__init__.py b/tests/api_resources/zaraz/history/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zaraz/history/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zaraz/history/test_configs.py b/tests/api_resources/zaraz/history/test_configs.py
new file mode 100644
index 00000000000..bf2943babcd
--- /dev/null
+++ b/tests/api_resources/zaraz/history/test_configs.py
@@ -0,0 +1,108 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zaraz.history import ConfigGetResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestConfigs:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        config = client.zaraz.history.configs.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ids=[0],
+        )
+        assert_matches_type(ConfigGetResponse, config, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zaraz.history.configs.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ids=[0],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        config = response.parse()
+        assert_matches_type(ConfigGetResponse, config, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zaraz.history.configs.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ids=[0],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            config = response.parse()
+            assert_matches_type(ConfigGetResponse, config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.zaraz.history.configs.with_raw_response.get(
+                zone_id="",
+                ids=[0],
+            )
+
+
+class TestAsyncConfigs:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        config = await async_client.zaraz.history.configs.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ids=[0],
+        )
+        assert_matches_type(ConfigGetResponse, config, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zaraz.history.configs.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ids=[0],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        config = await response.parse()
+        assert_matches_type(ConfigGetResponse, config, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zaraz.history.configs.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ids=[0],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            config = await response.parse()
+            assert_matches_type(ConfigGetResponse, config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.zaraz.history.configs.with_raw_response.get(
+                zone_id="",
+                ids=[0],
+            )
diff --git a/tests/api_resources/zaraz/test_config.py b/tests/api_resources/zaraz/test_config.py
new file mode 100644
index 00000000000..73473ea9fa5
--- /dev/null
+++ b/tests/api_resources/zaraz/test_config.py
@@ -0,0 +1,784 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zaraz import Configuration
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestConfig:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        config = client.zaraz.config.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            data_layer=True,
+            debug_key="debugKey",
+            settings={"auto_inject_script": True},
+            tools={
+                "foo": {
+                    "blocking_triggers": ["string"],
+                    "component": "component",
+                    "default_fields": {"foo": "string"},
+                    "enabled": True,
+                    "name": "name",
+                    "permissions": ["string"],
+                    "settings": {"foo": "string"},
+                    "type": "component",
+                }
+            },
+            triggers={
+                "foo": {
+                    "exclude_rules": [
+                        {
+                            "id": "id",
+                            "match": "match",
+                            "op": "CONTAINS",
+                            "value": "value",
+                        }
+                    ],
+                    "load_rules": [
+                        {
+                            "id": "id",
+                            "match": "match",
+                            "op": "CONTAINS",
+                            "value": "value",
+                        }
+                    ],
+                    "name": "name",
+                }
+            },
+            variables={
+                "foo": {
+                    "name": "name",
+                    "type": "string",
+                    "value": "value",
+                }
+            },
+            zaraz_version=0,
+        )
+        assert_matches_type(Configuration, config, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        config = client.zaraz.config.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            data_layer=True,
+            debug_key="debugKey",
+            settings={
+                "auto_inject_script": True,
+                "context_enricher": {
+                    "escaped_worker_name": "escapedWorkerName",
+                    "worker_tag": "workerTag",
+                },
+                "cookie_domain": "cookieDomain",
+                "ecommerce": True,
+                "events_api_path": "eventsApiPath",
+                "hide_external_referer": True,
+                "hide_ip_address": True,
+                "hide_query_params": True,
+                "hide_user_agent": True,
+                "init_path": "initPath",
+                "inject_iframes": True,
+                "mc_root_path": "mcRootPath",
+                "script_path": "scriptPath",
+                "track_path": "trackPath",
+            },
+            tools={
+                "foo": {
+                    "blocking_triggers": ["string"],
+                    "component": "component",
+                    "default_fields": {"foo": "string"},
+                    "enabled": True,
+                    "name": "name",
+                    "permissions": ["string"],
+                    "settings": {"foo": "string"},
+                    "type": "component",
+                    "actions": {
+                        "foo": {
+                            "action_type": "actionType",
+                            "blocking_triggers": ["string"],
+                            "data": {},
+                            "firing_triggers": ["string"],
+                        }
+                    },
+                    "default_purpose": "defaultPurpose",
+                    "neo_events": [
+                        {
+                            "action_type": "actionType",
+                            "blocking_triggers": ["string"],
+                            "data": {},
+                            "firing_triggers": ["string"],
+                        }
+                    ],
+                    "vendor_name": "vendorName",
+                    "vendor_policy_url": "vendorPolicyUrl",
+                }
+            },
+            triggers={
+                "foo": {
+                    "exclude_rules": [
+                        {
+                            "id": "id",
+                            "match": "match",
+                            "op": "CONTAINS",
+                            "value": "value",
+                        }
+                    ],
+                    "load_rules": [
+                        {
+                            "id": "id",
+                            "match": "match",
+                            "op": "CONTAINS",
+                            "value": "value",
+                        }
+                    ],
+                    "name": "name",
+                    "description": "description",
+                    "system": "pageload",
+                }
+            },
+            variables={
+                "foo": {
+                    "name": "name",
+                    "type": "string",
+                    "value": "value",
+                }
+            },
+            zaraz_version=0,
+            analytics={
+                "default_purpose": "defaultPurpose",
+                "enabled": True,
+                "session_exp_time": 60,
+            },
+            consent={
+                "enabled": True,
+                "button_text_translations": {
+                    "accept_all": {"foo": "string"},
+                    "confirm_my_choices": {"foo": "string"},
+                    "reject_all": {"foo": "string"},
+                },
+                "company_email": "companyEmail",
+                "company_name": "companyName",
+                "company_street_address": "companyStreetAddress",
+                "consent_modal_intro_html": "consentModalIntroHTML",
+                "consent_modal_intro_html_with_translations": {"foo": "string"},
+                "cookie_name": "cookieName",
+                "custom_css": "customCSS",
+                "custom_intro_disclaimer_dismissed": True,
+                "default_language": "defaultLanguage",
+                "hide_modal": True,
+                "purposes": {
+                    "foo": {
+                        "description": "description",
+                        "name": "name",
+                    }
+                },
+                "purposes_with_translations": {
+                    "foo": {
+                        "description": {"foo": "string"},
+                        "name": {"foo": "string"},
+                        "order": 0,
+                    }
+                },
+                "tcf_compliant": True,
+            },
+            history_change=True,
+        )
+        assert_matches_type(Configuration, config, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zaraz.config.with_raw_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            data_layer=True,
+            debug_key="debugKey",
+            settings={"auto_inject_script": True},
+            tools={
+                "foo": {
+                    "blocking_triggers": ["string"],
+                    "component": "component",
+                    "default_fields": {"foo": "string"},
+                    "enabled": True,
+                    "name": "name",
+                    "permissions": ["string"],
+                    "settings": {"foo": "string"},
+                    "type": "component",
+                }
+            },
+            triggers={
+                "foo": {
+                    "exclude_rules": [
+                        {
+                            "id": "id",
+                            "match": "match",
+                            "op": "CONTAINS",
+                            "value": "value",
+                        }
+                    ],
+                    "load_rules": [
+                        {
+                            "id": "id",
+                            "match": "match",
+                            "op": "CONTAINS",
+                            "value": "value",
+                        }
+                    ],
+                    "name": "name",
+                }
+            },
+            variables={
+                "foo": {
+                    "name": "name",
+                    "type": "string",
+                    "value": "value",
+                }
+            },
+            zaraz_version=0,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        config = response.parse()
+        assert_matches_type(Configuration, config, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zaraz.config.with_streaming_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            data_layer=True,
+            debug_key="debugKey",
+            settings={"auto_inject_script": True},
+            tools={
+                "foo": {
+                    "blocking_triggers": ["string"],
+                    "component": "component",
+                    "default_fields": {"foo": "string"},
+                    "enabled": True,
+                    "name": "name",
+                    "permissions": ["string"],
+                    "settings": {"foo": "string"},
+                    "type": "component",
+                }
+            },
+            triggers={
+                "foo": {
+                    "exclude_rules": [
+                        {
+                            "id": "id",
+                            "match": "match",
+                            "op": "CONTAINS",
+                            "value": "value",
+                        }
+                    ],
+                    "load_rules": [
+                        {
+                            "id": "id",
+                            "match": "match",
+                            "op": "CONTAINS",
+                            "value": "value",
+                        }
+                    ],
+                    "name": "name",
+                }
+            },
+            variables={
+                "foo": {
+                    "name": "name",
+                    "type": "string",
+                    "value": "value",
+                }
+            },
+            zaraz_version=0,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            config = response.parse()
+            assert_matches_type(Configuration, config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.zaraz.config.with_raw_response.update(
+                zone_id="",
+                data_layer=True,
+                debug_key="debugKey",
+                settings={"auto_inject_script": True},
+                tools={
+                    "foo": {
+                        "blocking_triggers": ["string"],
+                        "component": "component",
+                        "default_fields": {"foo": "string"},
+                        "enabled": True,
+                        "name": "name",
+                        "permissions": ["string"],
+                        "settings": {"foo": "string"},
+                        "type": "component",
+                    }
+                },
+                triggers={
+                    "foo": {
+                        "exclude_rules": [
+                            {
+                                "id": "id",
+                                "match": "match",
+                                "op": "CONTAINS",
+                                "value": "value",
+                            }
+                        ],
+                        "load_rules": [
+                            {
+                                "id": "id",
+                                "match": "match",
+                                "op": "CONTAINS",
+                                "value": "value",
+                            }
+                        ],
+                        "name": "name",
+                    }
+                },
+                variables={
+                    "foo": {
+                        "name": "name",
+                        "type": "string",
+                        "value": "value",
+                    }
+                },
+                zaraz_version=0,
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        config = client.zaraz.config.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Configuration, config, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zaraz.config.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        config = response.parse()
+        assert_matches_type(Configuration, config, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zaraz.config.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            config = response.parse()
+            assert_matches_type(Configuration, config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.zaraz.config.with_raw_response.get(
+                zone_id="",
+            )
+
+
+class TestAsyncConfig:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        config = await async_client.zaraz.config.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            data_layer=True,
+            debug_key="debugKey",
+            settings={"auto_inject_script": True},
+            tools={
+                "foo": {
+                    "blocking_triggers": ["string"],
+                    "component": "component",
+                    "default_fields": {"foo": "string"},
+                    "enabled": True,
+                    "name": "name",
+                    "permissions": ["string"],
+                    "settings": {"foo": "string"},
+                    "type": "component",
+                }
+            },
+            triggers={
+                "foo": {
+                    "exclude_rules": [
+                        {
+                            "id": "id",
+                            "match": "match",
+                            "op": "CONTAINS",
+                            "value": "value",
+                        }
+                    ],
+                    "load_rules": [
+                        {
+                            "id": "id",
+                            "match": "match",
+                            "op": "CONTAINS",
+                            "value": "value",
+                        }
+                    ],
+                    "name": "name",
+                }
+            },
+            variables={
+                "foo": {
+                    "name": "name",
+                    "type": "string",
+                    "value": "value",
+                }
+            },
+            zaraz_version=0,
+        )
+        assert_matches_type(Configuration, config, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        config = await async_client.zaraz.config.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            data_layer=True,
+            debug_key="debugKey",
+            settings={
+                "auto_inject_script": True,
+                "context_enricher": {
+                    "escaped_worker_name": "escapedWorkerName",
+                    "worker_tag": "workerTag",
+                },
+                "cookie_domain": "cookieDomain",
+                "ecommerce": True,
+                "events_api_path": "eventsApiPath",
+                "hide_external_referer": True,
+                "hide_ip_address": True,
+                "hide_query_params": True,
+                "hide_user_agent": True,
+                "init_path": "initPath",
+                "inject_iframes": True,
+                "mc_root_path": "mcRootPath",
+                "script_path": "scriptPath",
+                "track_path": "trackPath",
+            },
+            tools={
+                "foo": {
+                    "blocking_triggers": ["string"],
+                    "component": "component",
+                    "default_fields": {"foo": "string"},
+                    "enabled": True,
+                    "name": "name",
+                    "permissions": ["string"],
+                    "settings": {"foo": "string"},
+                    "type": "component",
+                    "actions": {
+                        "foo": {
+                            "action_type": "actionType",
+                            "blocking_triggers": ["string"],
+                            "data": {},
+                            "firing_triggers": ["string"],
+                        }
+                    },
+                    "default_purpose": "defaultPurpose",
+                    "neo_events": [
+                        {
+                            "action_type": "actionType",
+                            "blocking_triggers": ["string"],
+                            "data": {},
+                            "firing_triggers": ["string"],
+                        }
+                    ],
+                    "vendor_name": "vendorName",
+                    "vendor_policy_url": "vendorPolicyUrl",
+                }
+            },
+            triggers={
+                "foo": {
+                    "exclude_rules": [
+                        {
+                            "id": "id",
+                            "match": "match",
+                            "op": "CONTAINS",
+                            "value": "value",
+                        }
+                    ],
+                    "load_rules": [
+                        {
+                            "id": "id",
+                            "match": "match",
+                            "op": "CONTAINS",
+                            "value": "value",
+                        }
+                    ],
+                    "name": "name",
+                    "description": "description",
+                    "system": "pageload",
+                }
+            },
+            variables={
+                "foo": {
+                    "name": "name",
+                    "type": "string",
+                    "value": "value",
+                }
+            },
+            zaraz_version=0,
+            analytics={
+                "default_purpose": "defaultPurpose",
+                "enabled": True,
+                "session_exp_time": 60,
+            },
+            consent={
+                "enabled": True,
+                "button_text_translations": {
+                    "accept_all": {"foo": "string"},
+                    "confirm_my_choices": {"foo": "string"},
+                    "reject_all": {"foo": "string"},
+                },
+                "company_email": "companyEmail",
+                "company_name": "companyName",
+                "company_street_address": "companyStreetAddress",
+                "consent_modal_intro_html": "consentModalIntroHTML",
+                "consent_modal_intro_html_with_translations": {"foo": "string"},
+                "cookie_name": "cookieName",
+                "custom_css": "customCSS",
+                "custom_intro_disclaimer_dismissed": True,
+                "default_language": "defaultLanguage",
+                "hide_modal": True,
+                "purposes": {
+                    "foo": {
+                        "description": "description",
+                        "name": "name",
+                    }
+                },
+                "purposes_with_translations": {
+                    "foo": {
+                        "description": {"foo": "string"},
+                        "name": {"foo": "string"},
+                        "order": 0,
+                    }
+                },
+                "tcf_compliant": True,
+            },
+            history_change=True,
+        )
+        assert_matches_type(Configuration, config, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zaraz.config.with_raw_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            data_layer=True,
+            debug_key="debugKey",
+            settings={"auto_inject_script": True},
+            tools={
+                "foo": {
+                    "blocking_triggers": ["string"],
+                    "component": "component",
+                    "default_fields": {"foo": "string"},
+                    "enabled": True,
+                    "name": "name",
+                    "permissions": ["string"],
+                    "settings": {"foo": "string"},
+                    "type": "component",
+                }
+            },
+            triggers={
+                "foo": {
+                    "exclude_rules": [
+                        {
+                            "id": "id",
+                            "match": "match",
+                            "op": "CONTAINS",
+                            "value": "value",
+                        }
+                    ],
+                    "load_rules": [
+                        {
+                            "id": "id",
+                            "match": "match",
+                            "op": "CONTAINS",
+                            "value": "value",
+                        }
+                    ],
+                    "name": "name",
+                }
+            },
+            variables={
+                "foo": {
+                    "name": "name",
+                    "type": "string",
+                    "value": "value",
+                }
+            },
+            zaraz_version=0,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        config = await response.parse()
+        assert_matches_type(Configuration, config, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zaraz.config.with_streaming_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            data_layer=True,
+            debug_key="debugKey",
+            settings={"auto_inject_script": True},
+            tools={
+                "foo": {
+                    "blocking_triggers": ["string"],
+                    "component": "component",
+                    "default_fields": {"foo": "string"},
+                    "enabled": True,
+                    "name": "name",
+                    "permissions": ["string"],
+                    "settings": {"foo": "string"},
+                    "type": "component",
+                }
+            },
+            triggers={
+                "foo": {
+                    "exclude_rules": [
+                        {
+                            "id": "id",
+                            "match": "match",
+                            "op": "CONTAINS",
+                            "value": "value",
+                        }
+                    ],
+                    "load_rules": [
+                        {
+                            "id": "id",
+                            "match": "match",
+                            "op": "CONTAINS",
+                            "value": "value",
+                        }
+                    ],
+                    "name": "name",
+                }
+            },
+            variables={
+                "foo": {
+                    "name": "name",
+                    "type": "string",
+                    "value": "value",
+                }
+            },
+            zaraz_version=0,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            config = await response.parse()
+            assert_matches_type(Configuration, config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.zaraz.config.with_raw_response.update(
+                zone_id="",
+                data_layer=True,
+                debug_key="debugKey",
+                settings={"auto_inject_script": True},
+                tools={
+                    "foo": {
+                        "blocking_triggers": ["string"],
+                        "component": "component",
+                        "default_fields": {"foo": "string"},
+                        "enabled": True,
+                        "name": "name",
+                        "permissions": ["string"],
+                        "settings": {"foo": "string"},
+                        "type": "component",
+                    }
+                },
+                triggers={
+                    "foo": {
+                        "exclude_rules": [
+                            {
+                                "id": "id",
+                                "match": "match",
+                                "op": "CONTAINS",
+                                "value": "value",
+                            }
+                        ],
+                        "load_rules": [
+                            {
+                                "id": "id",
+                                "match": "match",
+                                "op": "CONTAINS",
+                                "value": "value",
+                            }
+                        ],
+                        "name": "name",
+                    }
+                },
+                variables={
+                    "foo": {
+                        "name": "name",
+                        "type": "string",
+                        "value": "value",
+                    }
+                },
+                zaraz_version=0,
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        config = await async_client.zaraz.config.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Configuration, config, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zaraz.config.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        config = await response.parse()
+        assert_matches_type(Configuration, config, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zaraz.config.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            config = await response.parse()
+            assert_matches_type(Configuration, config, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.zaraz.config.with_raw_response.get(
+                zone_id="",
+            )
diff --git a/tests/api_resources/zaraz/test_default.py b/tests/api_resources/zaraz/test_default.py
new file mode 100644
index 00000000000..0ecaa604f69
--- /dev/null
+++ b/tests/api_resources/zaraz/test_default.py
@@ -0,0 +1,100 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zaraz import Configuration
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestDefault:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        default = client.zaraz.default.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Configuration, default, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zaraz.default.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        default = response.parse()
+        assert_matches_type(Configuration, default, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zaraz.default.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            default = response.parse()
+            assert_matches_type(Configuration, default, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.zaraz.default.with_raw_response.get(
+                zone_id="",
+            )
+
+
+class TestAsyncDefault:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        default = await async_client.zaraz.default.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Configuration, default, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zaraz.default.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        default = await response.parse()
+        assert_matches_type(Configuration, default, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zaraz.default.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            default = await response.parse()
+            assert_matches_type(Configuration, default, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.zaraz.default.with_raw_response.get(
+                zone_id="",
+            )
diff --git a/tests/api_resources/zaraz/test_export.py b/tests/api_resources/zaraz/test_export.py
new file mode 100644
index 00000000000..9f0ca72f17a
--- /dev/null
+++ b/tests/api_resources/zaraz/test_export.py
@@ -0,0 +1,100 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zaraz import Configuration
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestExport:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        export = client.zaraz.export.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Configuration, export, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zaraz.export.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        export = response.parse()
+        assert_matches_type(Configuration, export, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zaraz.export.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            export = response.parse()
+            assert_matches_type(Configuration, export, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.zaraz.export.with_raw_response.get(
+                zone_id="",
+            )
+
+
+class TestAsyncExport:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        export = await async_client.zaraz.export.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Configuration, export, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zaraz.export.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        export = await response.parse()
+        assert_matches_type(Configuration, export, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zaraz.export.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            export = await response.parse()
+            assert_matches_type(Configuration, export, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.zaraz.export.with_raw_response.get(
+                zone_id="",
+            )
diff --git a/tests/api_resources/zaraz/test_history.py b/tests/api_resources/zaraz/test_history.py
new file mode 100644
index 00000000000..e67d1fa7fa3
--- /dev/null
+++ b/tests/api_resources/zaraz/test_history.py
@@ -0,0 +1,207 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zaraz import Configuration, HistoryListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestHistory:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        history = client.zaraz.history.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=12345,
+        )
+        assert_matches_type(Configuration, history, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zaraz.history.with_raw_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=12345,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        history = response.parse()
+        assert_matches_type(Configuration, history, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zaraz.history.with_streaming_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=12345,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            history = response.parse()
+            assert_matches_type(Configuration, history, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.zaraz.history.with_raw_response.update(
+                zone_id="",
+                body=12345,
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        history = client.zaraz.history.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[HistoryListResponse], history, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        history = client.zaraz.history.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            limit=1,
+            offset=0,
+            sort_field="id",
+            sort_order="DESC",
+        )
+        assert_matches_type(SyncSinglePage[HistoryListResponse], history, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zaraz.history.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        history = response.parse()
+        assert_matches_type(SyncSinglePage[HistoryListResponse], history, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zaraz.history.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            history = response.parse()
+            assert_matches_type(SyncSinglePage[HistoryListResponse], history, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.zaraz.history.with_raw_response.list(
+                zone_id="",
+            )
+
+
+class TestAsyncHistory:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        history = await async_client.zaraz.history.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=12345,
+        )
+        assert_matches_type(Configuration, history, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zaraz.history.with_raw_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=12345,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        history = await response.parse()
+        assert_matches_type(Configuration, history, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zaraz.history.with_streaming_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=12345,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            history = await response.parse()
+            assert_matches_type(Configuration, history, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.zaraz.history.with_raw_response.update(
+                zone_id="",
+                body=12345,
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        history = await async_client.zaraz.history.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[HistoryListResponse], history, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        history = await async_client.zaraz.history.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            limit=1,
+            offset=0,
+            sort_field="id",
+            sort_order="DESC",
+        )
+        assert_matches_type(AsyncSinglePage[HistoryListResponse], history, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zaraz.history.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        history = await response.parse()
+        assert_matches_type(AsyncSinglePage[HistoryListResponse], history, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zaraz.history.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            history = await response.parse()
+            assert_matches_type(AsyncSinglePage[HistoryListResponse], history, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.zaraz.history.with_raw_response.list(
+                zone_id="",
+            )
diff --git a/tests/api_resources/zaraz/test_publish.py b/tests/api_resources/zaraz/test_publish.py
new file mode 100644
index 00000000000..893341b58bc
--- /dev/null
+++ b/tests/api_resources/zaraz/test_publish.py
@@ -0,0 +1,115 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestPublish:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        publish = client.zaraz.publish.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(str, publish, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        publish = client.zaraz.publish.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body="Config with enabled ecommerce tracking",
+        )
+        assert_matches_type(str, publish, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zaraz.publish.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        publish = response.parse()
+        assert_matches_type(str, publish, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zaraz.publish.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            publish = response.parse()
+            assert_matches_type(str, publish, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.zaraz.publish.with_raw_response.create(
+                zone_id="",
+            )
+
+
+class TestAsyncPublish:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        publish = await async_client.zaraz.publish.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(str, publish, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        publish = await async_client.zaraz.publish.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body="Config with enabled ecommerce tracking",
+        )
+        assert_matches_type(str, publish, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zaraz.publish.with_raw_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        publish = await response.parse()
+        assert_matches_type(str, publish, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zaraz.publish.with_streaming_response.create(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            publish = await response.parse()
+            assert_matches_type(str, publish, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.zaraz.publish.with_raw_response.create(
+                zone_id="",
+            )
diff --git a/tests/api_resources/zaraz/test_workflow.py b/tests/api_resources/zaraz/test_workflow.py
new file mode 100644
index 00000000000..10aed6902f3
--- /dev/null
+++ b/tests/api_resources/zaraz/test_workflow.py
@@ -0,0 +1,100 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zaraz import Workflow
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestWorkflow:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        workflow = client.zaraz.workflow.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Workflow, workflow, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zaraz.workflow.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        workflow = response.parse()
+        assert_matches_type(Workflow, workflow, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zaraz.workflow.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            workflow = response.parse()
+            assert_matches_type(Workflow, workflow, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.zaraz.workflow.with_raw_response.get(
+                zone_id="",
+            )
+
+
+class TestAsyncWorkflow:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        workflow = await async_client.zaraz.workflow.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Workflow, workflow, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zaraz.workflow.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        workflow = await response.parse()
+        assert_matches_type(Workflow, workflow, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zaraz.workflow.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            workflow = await response.parse()
+            assert_matches_type(Workflow, workflow, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.zaraz.workflow.with_raw_response.get(
+                zone_id="",
+            )
diff --git a/tests/api_resources/zero_trust/access/ai_controls/__init__.py b/tests/api_resources/zero_trust/access/ai_controls/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/access/ai_controls/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/access/ai_controls/mcp/__init__.py b/tests/api_resources/zero_trust/access/ai_controls/mcp/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/access/ai_controls/mcp/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/access/ai_controls/mcp/test_portals.py b/tests/api_resources/zero_trust/access/ai_controls/mcp/test_portals.py
new file mode 100644
index 00000000000..9fbdfec04b6
--- /dev/null
+++ b/tests/api_resources/zero_trust/access/ai_controls/mcp/test_portals.py
@@ -0,0 +1,647 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.zero_trust.access.ai_controls.mcp import (
+    PortalListResponse,
+    PortalReadResponse,
+    PortalCreateResponse,
+    PortalDeleteResponse,
+    PortalUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestPortals:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        portal = client.zero_trust.access.ai_controls.mcp.portals.create(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            id="my-mcp-portal",
+            hostname="exmaple.com",
+            name="My MCP Portal",
+        )
+        assert_matches_type(PortalCreateResponse, portal, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        portal = client.zero_trust.access.ai_controls.mcp.portals.create(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            id="my-mcp-portal",
+            hostname="exmaple.com",
+            name="My MCP Portal",
+            description="This is my custom MCP Portal",
+            secure_web_gateway=False,
+            servers=[
+                {
+                    "server_id": "my-mcp-server",
+                    "default_disabled": True,
+                    "on_behalf": True,
+                    "updated_prompts": [
+                        {
+                            "name": "name",
+                            "description": "description",
+                            "enabled": True,
+                        }
+                    ],
+                    "updated_tools": [
+                        {
+                            "name": "name",
+                            "description": "description",
+                            "enabled": True,
+                        }
+                    ],
+                }
+            ],
+        )
+        assert_matches_type(PortalCreateResponse, portal, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.create(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            id="my-mcp-portal",
+            hostname="exmaple.com",
+            name="My MCP Portal",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        portal = response.parse()
+        assert_matches_type(PortalCreateResponse, portal, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.ai_controls.mcp.portals.with_streaming_response.create(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            id="my-mcp-portal",
+            hostname="exmaple.com",
+            name="My MCP Portal",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            portal = response.parse()
+            assert_matches_type(PortalCreateResponse, portal, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.create(
+                account_id="",
+                id="my-mcp-portal",
+                hostname="exmaple.com",
+                name="My MCP Portal",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        portal = client.zero_trust.access.ai_controls.mcp.portals.update(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+        assert_matches_type(PortalUpdateResponse, portal, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        portal = client.zero_trust.access.ai_controls.mcp.portals.update(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            description="This is my custom MCP Portal",
+            hostname="exmaple.com",
+            name="My MCP Portal",
+            secure_web_gateway=False,
+            servers=[
+                {
+                    "server_id": "my-mcp-server",
+                    "default_disabled": True,
+                    "on_behalf": True,
+                    "updated_prompts": [
+                        {
+                            "name": "name",
+                            "description": "description",
+                            "enabled": True,
+                        }
+                    ],
+                    "updated_tools": [
+                        {
+                            "name": "name",
+                            "description": "description",
+                            "enabled": True,
+                        }
+                    ],
+                }
+            ],
+        )
+        assert_matches_type(PortalUpdateResponse, portal, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.update(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        portal = response.parse()
+        assert_matches_type(PortalUpdateResponse, portal, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.ai_controls.mcp.portals.with_streaming_response.update(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            portal = response.parse()
+            assert_matches_type(PortalUpdateResponse, portal, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.update(
+                id="my-mcp-portal",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.update(
+                id="",
+                account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        portal = client.zero_trust.access.ai_controls.mcp.portals.list(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[PortalListResponse], portal, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        portal = client.zero_trust.access.ai_controls.mcp.portals.list(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            page=1,
+            per_page=1,
+            search="search",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[PortalListResponse], portal, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.list(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        portal = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[PortalListResponse], portal, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.ai_controls.mcp.portals.with_streaming_response.list(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            portal = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[PortalListResponse], portal, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        portal = client.zero_trust.access.ai_controls.mcp.portals.delete(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+        assert_matches_type(PortalDeleteResponse, portal, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.delete(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        portal = response.parse()
+        assert_matches_type(PortalDeleteResponse, portal, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.ai_controls.mcp.portals.with_streaming_response.delete(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            portal = response.parse()
+            assert_matches_type(PortalDeleteResponse, portal, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.delete(
+                id="my-mcp-portal",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.delete(
+                id="",
+                account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            )
+
+    @parametrize
+    def test_method_read(self, client: Cloudflare) -> None:
+        portal = client.zero_trust.access.ai_controls.mcp.portals.read(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+        assert_matches_type(PortalReadResponse, portal, path=["response"])
+
+    @parametrize
+    def test_raw_response_read(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.read(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        portal = response.parse()
+        assert_matches_type(PortalReadResponse, portal, path=["response"])
+
+    @parametrize
+    def test_streaming_response_read(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.ai_controls.mcp.portals.with_streaming_response.read(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            portal = response.parse()
+            assert_matches_type(PortalReadResponse, portal, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_read(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.read(
+                id="my-mcp-portal",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.read(
+                id="",
+                account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            )
+
+
+class TestAsyncPortals:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        portal = await async_client.zero_trust.access.ai_controls.mcp.portals.create(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            id="my-mcp-portal",
+            hostname="exmaple.com",
+            name="My MCP Portal",
+        )
+        assert_matches_type(PortalCreateResponse, portal, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        portal = await async_client.zero_trust.access.ai_controls.mcp.portals.create(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            id="my-mcp-portal",
+            hostname="exmaple.com",
+            name="My MCP Portal",
+            description="This is my custom MCP Portal",
+            secure_web_gateway=False,
+            servers=[
+                {
+                    "server_id": "my-mcp-server",
+                    "default_disabled": True,
+                    "on_behalf": True,
+                    "updated_prompts": [
+                        {
+                            "name": "name",
+                            "description": "description",
+                            "enabled": True,
+                        }
+                    ],
+                    "updated_tools": [
+                        {
+                            "name": "name",
+                            "description": "description",
+                            "enabled": True,
+                        }
+                    ],
+                }
+            ],
+        )
+        assert_matches_type(PortalCreateResponse, portal, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.create(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            id="my-mcp-portal",
+            hostname="exmaple.com",
+            name="My MCP Portal",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        portal = await response.parse()
+        assert_matches_type(PortalCreateResponse, portal, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.ai_controls.mcp.portals.with_streaming_response.create(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            id="my-mcp-portal",
+            hostname="exmaple.com",
+            name="My MCP Portal",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            portal = await response.parse()
+            assert_matches_type(PortalCreateResponse, portal, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.create(
+                account_id="",
+                id="my-mcp-portal",
+                hostname="exmaple.com",
+                name="My MCP Portal",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        portal = await async_client.zero_trust.access.ai_controls.mcp.portals.update(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+        assert_matches_type(PortalUpdateResponse, portal, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        portal = await async_client.zero_trust.access.ai_controls.mcp.portals.update(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            description="This is my custom MCP Portal",
+            hostname="exmaple.com",
+            name="My MCP Portal",
+            secure_web_gateway=False,
+            servers=[
+                {
+                    "server_id": "my-mcp-server",
+                    "default_disabled": True,
+                    "on_behalf": True,
+                    "updated_prompts": [
+                        {
+                            "name": "name",
+                            "description": "description",
+                            "enabled": True,
+                        }
+                    ],
+                    "updated_tools": [
+                        {
+                            "name": "name",
+                            "description": "description",
+                            "enabled": True,
+                        }
+                    ],
+                }
+            ],
+        )
+        assert_matches_type(PortalUpdateResponse, portal, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.update(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        portal = await response.parse()
+        assert_matches_type(PortalUpdateResponse, portal, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.ai_controls.mcp.portals.with_streaming_response.update(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            portal = await response.parse()
+            assert_matches_type(PortalUpdateResponse, portal, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.update(
+                id="my-mcp-portal",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.update(
+                id="",
+                account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        portal = await async_client.zero_trust.access.ai_controls.mcp.portals.list(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[PortalListResponse], portal, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        portal = await async_client.zero_trust.access.ai_controls.mcp.portals.list(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            page=1,
+            per_page=1,
+            search="search",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[PortalListResponse], portal, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.list(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        portal = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[PortalListResponse], portal, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.ai_controls.mcp.portals.with_streaming_response.list(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            portal = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[PortalListResponse], portal, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        portal = await async_client.zero_trust.access.ai_controls.mcp.portals.delete(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+        assert_matches_type(PortalDeleteResponse, portal, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.delete(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        portal = await response.parse()
+        assert_matches_type(PortalDeleteResponse, portal, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.ai_controls.mcp.portals.with_streaming_response.delete(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            portal = await response.parse()
+            assert_matches_type(PortalDeleteResponse, portal, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.delete(
+                id="my-mcp-portal",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.delete(
+                id="",
+                account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            )
+
+    @parametrize
+    async def test_method_read(self, async_client: AsyncCloudflare) -> None:
+        portal = await async_client.zero_trust.access.ai_controls.mcp.portals.read(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+        assert_matches_type(PortalReadResponse, portal, path=["response"])
+
+    @parametrize
+    async def test_raw_response_read(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.read(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        portal = await response.parse()
+        assert_matches_type(PortalReadResponse, portal, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_read(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.ai_controls.mcp.portals.with_streaming_response.read(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            portal = await response.parse()
+            assert_matches_type(PortalReadResponse, portal, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_read(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.read(
+                id="my-mcp-portal",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.zero_trust.access.ai_controls.mcp.portals.with_raw_response.read(
+                id="",
+                account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            )
diff --git a/tests/api_resources/zero_trust/access/ai_controls/mcp/test_servers.py b/tests/api_resources/zero_trust/access/ai_controls/mcp/test_servers.py
new file mode 100644
index 00000000000..0d453e91464
--- /dev/null
+++ b/tests/api_resources/zero_trust/access/ai_controls/mcp/test_servers.py
@@ -0,0 +1,667 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.zero_trust.access.ai_controls.mcp import (
+    ServerListResponse,
+    ServerReadResponse,
+    ServerCreateResponse,
+    ServerDeleteResponse,
+    ServerUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestServers:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        server = client.zero_trust.access.ai_controls.mcp.servers.create(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            id="my-mcp-server",
+            auth_type="unauthenticated",
+            hostname="https://exmaple.com/mcp",
+            name="My MCP Server",
+        )
+        assert_matches_type(ServerCreateResponse, server, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        server = client.zero_trust.access.ai_controls.mcp.servers.create(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            id="my-mcp-server",
+            auth_type="unauthenticated",
+            hostname="https://exmaple.com/mcp",
+            name="My MCP Server",
+            auth_credentials="auth_credentials",
+            description="This is one remote mcp server",
+        )
+        assert_matches_type(ServerCreateResponse, server, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.create(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            id="my-mcp-server",
+            auth_type="unauthenticated",
+            hostname="https://exmaple.com/mcp",
+            name="My MCP Server",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        server = response.parse()
+        assert_matches_type(ServerCreateResponse, server, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.ai_controls.mcp.servers.with_streaming_response.create(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            id="my-mcp-server",
+            auth_type="unauthenticated",
+            hostname="https://exmaple.com/mcp",
+            name="My MCP Server",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            server = response.parse()
+            assert_matches_type(ServerCreateResponse, server, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.create(
+                account_id="",
+                id="my-mcp-server",
+                auth_type="unauthenticated",
+                hostname="https://exmaple.com/mcp",
+                name="My MCP Server",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        server = client.zero_trust.access.ai_controls.mcp.servers.update(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+        assert_matches_type(ServerUpdateResponse, server, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        server = client.zero_trust.access.ai_controls.mcp.servers.update(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            auth_credentials="auth_credentials",
+            description="This is one remote mcp server",
+            name="My MCP Server",
+        )
+        assert_matches_type(ServerUpdateResponse, server, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.update(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        server = response.parse()
+        assert_matches_type(ServerUpdateResponse, server, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.ai_controls.mcp.servers.with_streaming_response.update(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            server = response.parse()
+            assert_matches_type(ServerUpdateResponse, server, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.update(
+                id="my-mcp-server",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.update(
+                id="",
+                account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        server = client.zero_trust.access.ai_controls.mcp.servers.list(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ServerListResponse], server, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        server = client.zero_trust.access.ai_controls.mcp.servers.list(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            page=1,
+            per_page=1,
+            search="search",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ServerListResponse], server, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.list(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        server = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[ServerListResponse], server, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.ai_controls.mcp.servers.with_streaming_response.list(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            server = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[ServerListResponse], server, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        server = client.zero_trust.access.ai_controls.mcp.servers.delete(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+        assert_matches_type(ServerDeleteResponse, server, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.delete(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        server = response.parse()
+        assert_matches_type(ServerDeleteResponse, server, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.ai_controls.mcp.servers.with_streaming_response.delete(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            server = response.parse()
+            assert_matches_type(ServerDeleteResponse, server, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.delete(
+                id="my-mcp-server",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.delete(
+                id="",
+                account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            )
+
+    @parametrize
+    def test_method_read(self, client: Cloudflare) -> None:
+        server = client.zero_trust.access.ai_controls.mcp.servers.read(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+        assert_matches_type(ServerReadResponse, server, path=["response"])
+
+    @parametrize
+    def test_raw_response_read(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.read(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        server = response.parse()
+        assert_matches_type(ServerReadResponse, server, path=["response"])
+
+    @parametrize
+    def test_streaming_response_read(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.ai_controls.mcp.servers.with_streaming_response.read(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            server = response.parse()
+            assert_matches_type(ServerReadResponse, server, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_read(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.read(
+                id="my-mcp-server",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.read(
+                id="",
+                account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            )
+
+    @parametrize
+    def test_method_sync(self, client: Cloudflare) -> None:
+        server = client.zero_trust.access.ai_controls.mcp.servers.sync(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+        assert_matches_type(object, server, path=["response"])
+
+    @parametrize
+    def test_raw_response_sync(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.sync(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        server = response.parse()
+        assert_matches_type(object, server, path=["response"])
+
+    @parametrize
+    def test_streaming_response_sync(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.ai_controls.mcp.servers.with_streaming_response.sync(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            server = response.parse()
+            assert_matches_type(object, server, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_sync(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.sync(
+                id="my-mcp-portal",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.sync(
+                id="",
+                account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            )
+
+
+class TestAsyncServers:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        server = await async_client.zero_trust.access.ai_controls.mcp.servers.create(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            id="my-mcp-server",
+            auth_type="unauthenticated",
+            hostname="https://exmaple.com/mcp",
+            name="My MCP Server",
+        )
+        assert_matches_type(ServerCreateResponse, server, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        server = await async_client.zero_trust.access.ai_controls.mcp.servers.create(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            id="my-mcp-server",
+            auth_type="unauthenticated",
+            hostname="https://exmaple.com/mcp",
+            name="My MCP Server",
+            auth_credentials="auth_credentials",
+            description="This is one remote mcp server",
+        )
+        assert_matches_type(ServerCreateResponse, server, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.create(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            id="my-mcp-server",
+            auth_type="unauthenticated",
+            hostname="https://exmaple.com/mcp",
+            name="My MCP Server",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        server = await response.parse()
+        assert_matches_type(ServerCreateResponse, server, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.ai_controls.mcp.servers.with_streaming_response.create(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            id="my-mcp-server",
+            auth_type="unauthenticated",
+            hostname="https://exmaple.com/mcp",
+            name="My MCP Server",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            server = await response.parse()
+            assert_matches_type(ServerCreateResponse, server, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.create(
+                account_id="",
+                id="my-mcp-server",
+                auth_type="unauthenticated",
+                hostname="https://exmaple.com/mcp",
+                name="My MCP Server",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        server = await async_client.zero_trust.access.ai_controls.mcp.servers.update(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+        assert_matches_type(ServerUpdateResponse, server, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        server = await async_client.zero_trust.access.ai_controls.mcp.servers.update(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            auth_credentials="auth_credentials",
+            description="This is one remote mcp server",
+            name="My MCP Server",
+        )
+        assert_matches_type(ServerUpdateResponse, server, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.update(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        server = await response.parse()
+        assert_matches_type(ServerUpdateResponse, server, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.ai_controls.mcp.servers.with_streaming_response.update(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            server = await response.parse()
+            assert_matches_type(ServerUpdateResponse, server, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.update(
+                id="my-mcp-server",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.update(
+                id="",
+                account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        server = await async_client.zero_trust.access.ai_controls.mcp.servers.list(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[ServerListResponse], server, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        server = await async_client.zero_trust.access.ai_controls.mcp.servers.list(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            page=1,
+            per_page=1,
+            search="search",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[ServerListResponse], server, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.list(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        server = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[ServerListResponse], server, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.ai_controls.mcp.servers.with_streaming_response.list(
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            server = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[ServerListResponse], server, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        server = await async_client.zero_trust.access.ai_controls.mcp.servers.delete(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+        assert_matches_type(ServerDeleteResponse, server, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.delete(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        server = await response.parse()
+        assert_matches_type(ServerDeleteResponse, server, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.ai_controls.mcp.servers.with_streaming_response.delete(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            server = await response.parse()
+            assert_matches_type(ServerDeleteResponse, server, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.delete(
+                id="my-mcp-server",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.delete(
+                id="",
+                account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            )
+
+    @parametrize
+    async def test_method_read(self, async_client: AsyncCloudflare) -> None:
+        server = await async_client.zero_trust.access.ai_controls.mcp.servers.read(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+        assert_matches_type(ServerReadResponse, server, path=["response"])
+
+    @parametrize
+    async def test_raw_response_read(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.read(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        server = await response.parse()
+        assert_matches_type(ServerReadResponse, server, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_read(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.ai_controls.mcp.servers.with_streaming_response.read(
+            id="my-mcp-server",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            server = await response.parse()
+            assert_matches_type(ServerReadResponse, server, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_read(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.read(
+                id="my-mcp-server",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.read(
+                id="",
+                account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            )
+
+    @parametrize
+    async def test_method_sync(self, async_client: AsyncCloudflare) -> None:
+        server = await async_client.zero_trust.access.ai_controls.mcp.servers.sync(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+        assert_matches_type(object, server, path=["response"])
+
+    @parametrize
+    async def test_raw_response_sync(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.sync(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        server = await response.parse()
+        assert_matches_type(object, server, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_sync(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.ai_controls.mcp.servers.with_streaming_response.sync(
+            id="my-mcp-portal",
+            account_id="a86a8f5c339544d7bdc89926de14fb8c",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            server = await response.parse()
+            assert_matches_type(object, server, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_sync(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.sync(
+                id="my-mcp-portal",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `id` but received ''"):
+            await async_client.zero_trust.access.ai_controls.mcp.servers.with_raw_response.sync(
+                id="",
+                account_id="a86a8f5c339544d7bdc89926de14fb8c",
+            )
diff --git a/tests/api_resources/zero_trust/access/applications/policy_tests/__init__.py b/tests/api_resources/zero_trust/access/applications/policy_tests/__init__.py
new file mode 100755
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/access/applications/policy_tests/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/access/applications/policy_tests/test_users.py b/tests/api_resources/zero_trust/access/applications/policy_tests/test_users.py
new file mode 100755
index 00000000000..4043950764e
--- /dev/null
+++ b/tests/api_resources/zero_trust/access/applications/policy_tests/test_users.py
@@ -0,0 +1,143 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.zero_trust.access.applications.policy_tests import UserListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestUsers:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        user = client.zero_trust.access.applications.policy_tests.users.list(
+            policy_test_id="f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[UserListResponse], user, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        user = client.zero_trust.access.applications.policy_tests.users.list(
+            policy_test_id="f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=0,
+            status="success",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[UserListResponse], user, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.applications.policy_tests.users.with_raw_response.list(
+            policy_test_id="f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        user = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[UserListResponse], user, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.applications.policy_tests.users.with_streaming_response.list(
+            policy_test_id="f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            user = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[UserListResponse], user, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.applications.policy_tests.users.with_raw_response.list(
+                policy_test_id="f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_test_id` but received ''"):
+            client.zero_trust.access.applications.policy_tests.users.with_raw_response.list(
+                policy_test_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncUsers:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        user = await async_client.zero_trust.access.applications.policy_tests.users.list(
+            policy_test_id="f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[UserListResponse], user, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        user = await async_client.zero_trust.access.applications.policy_tests.users.list(
+            policy_test_id="f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=0,
+            status="success",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[UserListResponse], user, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.applications.policy_tests.users.with_raw_response.list(
+            policy_test_id="f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        user = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[UserListResponse], user, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.applications.policy_tests.users.with_streaming_response.list(
+            policy_test_id="f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            user = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[UserListResponse], user, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.applications.policy_tests.users.with_raw_response.list(
+                policy_test_id="f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_test_id` but received ''"):
+            await async_client.zero_trust.access.applications.policy_tests.users.with_raw_response.list(
+                policy_test_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/zero_trust/access/applications/test_cas.py b/tests/api_resources/zero_trust/access/applications/test_cas.py
index 4c7af3be6a5..31673a6a495 100644
--- a/tests/api_resources/zero_trust/access/applications/test_cas.py
+++ b/tests/api_resources/zero_trust/access/applications/test_cas.py
@@ -9,8 +9,8 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.zero_trust.access.applications import CA, CAGetResponse, CACreateResponse, CADeleteResponse
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.zero_trust.access.applications import CA, CADeleteResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -25,7 +25,7 @@ def test_method_create(self, client: Cloudflare) -> None:
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="account_id",
         )
-        assert_matches_type(Optional[CACreateResponse], ca, path=["response"])
+        assert_matches_type(Optional[CA], ca, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -34,7 +34,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="account_id",
         )
-        assert_matches_type(Optional[CACreateResponse], ca, path=["response"])
+        assert_matches_type(Optional[CA], ca, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -47,7 +47,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         ca = response.parse()
-        assert_matches_type(Optional[CACreateResponse], ca, path=["response"])
+        assert_matches_type(Optional[CA], ca, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -60,7 +60,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             ca = response.parse()
-            assert_matches_type(Optional[CACreateResponse], ca, path=["response"])
+            assert_matches_type(Optional[CA], ca, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -73,13 +73,13 @@ def test_path_params_create(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.cas.with_raw_response.create(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.cas.with_raw_response.create(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -91,15 +91,17 @@ def test_method_list(self, client: Cloudflare) -> None:
         ca = client.zero_trust.access.applications.cas.list(
             account_id="account_id",
         )
-        assert_matches_type(SyncSinglePage[CA], ca, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[CA], ca, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         ca = client.zero_trust.access.applications.cas.list(
             account_id="account_id",
+            page=0,
+            per_page=0,
         )
-        assert_matches_type(SyncSinglePage[CA], ca, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[CA], ca, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -111,7 +113,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         ca = response.parse()
-        assert_matches_type(SyncSinglePage[CA], ca, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[CA], ca, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -123,19 +125,19 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             ca = response.parse()
-            assert_matches_type(SyncSinglePage[CA], ca, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[CA], ca, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.cas.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.cas.with_raw_response.list(
                 account_id="account_id",
             )
@@ -195,13 +197,13 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.cas.with_raw_response.delete(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.cas.with_raw_response.delete(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -214,7 +216,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="account_id",
         )
-        assert_matches_type(Optional[CAGetResponse], ca, path=["response"])
+        assert_matches_type(Optional[CA], ca, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -223,7 +225,7 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None:
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="account_id",
         )
-        assert_matches_type(Optional[CAGetResponse], ca, path=["response"])
+        assert_matches_type(Optional[CA], ca, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -236,7 +238,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         ca = response.parse()
-        assert_matches_type(Optional[CAGetResponse], ca, path=["response"])
+        assert_matches_type(Optional[CA], ca, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -249,7 +251,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             ca = response.parse()
-            assert_matches_type(Optional[CAGetResponse], ca, path=["response"])
+            assert_matches_type(Optional[CA], ca, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -262,13 +264,13 @@ def test_path_params_get(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.cas.with_raw_response.get(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.cas.with_raw_response.get(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -276,7 +278,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncCAs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -285,7 +289,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="account_id",
         )
-        assert_matches_type(Optional[CACreateResponse], ca, path=["response"])
+        assert_matches_type(Optional[CA], ca, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -294,7 +298,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="account_id",
         )
-        assert_matches_type(Optional[CACreateResponse], ca, path=["response"])
+        assert_matches_type(Optional[CA], ca, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -307,7 +311,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         ca = await response.parse()
-        assert_matches_type(Optional[CACreateResponse], ca, path=["response"])
+        assert_matches_type(Optional[CA], ca, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -320,7 +324,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             ca = await response.parse()
-            assert_matches_type(Optional[CACreateResponse], ca, path=["response"])
+            assert_matches_type(Optional[CA], ca, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -333,13 +337,13 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.cas.with_raw_response.create(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.cas.with_raw_response.create(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -351,15 +355,17 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         ca = await async_client.zero_trust.access.applications.cas.list(
             account_id="account_id",
         )
-        assert_matches_type(AsyncSinglePage[CA], ca, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[CA], ca, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         ca = await async_client.zero_trust.access.applications.cas.list(
             account_id="account_id",
+            page=0,
+            per_page=0,
         )
-        assert_matches_type(AsyncSinglePage[CA], ca, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[CA], ca, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -371,7 +377,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         ca = await response.parse()
-        assert_matches_type(AsyncSinglePage[CA], ca, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[CA], ca, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -383,19 +389,19 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             ca = await response.parse()
-            assert_matches_type(AsyncSinglePage[CA], ca, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[CA], ca, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.cas.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.cas.with_raw_response.list(
                 account_id="account_id",
             )
@@ -455,13 +461,13 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.cas.with_raw_response.delete(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.cas.with_raw_response.delete(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -474,7 +480,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="account_id",
         )
-        assert_matches_type(Optional[CAGetResponse], ca, path=["response"])
+        assert_matches_type(Optional[CA], ca, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -483,7 +489,7 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="account_id",
         )
-        assert_matches_type(Optional[CAGetResponse], ca, path=["response"])
+        assert_matches_type(Optional[CA], ca, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -496,7 +502,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         ca = await response.parse()
-        assert_matches_type(Optional[CAGetResponse], ca, path=["response"])
+        assert_matches_type(Optional[CA], ca, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -509,7 +515,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             ca = await response.parse()
-            assert_matches_type(Optional[CAGetResponse], ca, path=["response"])
+            assert_matches_type(Optional[CA], ca, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -522,13 +528,13 @@ async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.cas.with_raw_response.get(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.cas.with_raw_response.get(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
diff --git a/tests/api_resources/zero_trust/access/applications/test_policies.py b/tests/api_resources/zero_trust/access/applications/test_policies.py
index 2e0b22b4680..c855bb52247 100644
--- a/tests/api_resources/zero_trust/access/applications/test_policies.py
+++ b/tests/api_resources/zero_trust/access/applications/test_policies.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.zero_trust.access.applications import (
     PolicyGetResponse,
     PolicyListResponse,
@@ -29,13 +29,6 @@ class TestPolicies:
     def test_method_create(self, client: Cloudflare) -> None:
         policy = client.zero_trust.access.applications.policies.create(
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
-            name="Allow devs",
             account_id="account_id",
         )
         assert_matches_type(Optional[PolicyCreateResponse], policy, path=["response"])
@@ -45,13 +38,6 @@ def test_method_create(self, client: Cloudflare) -> None:
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         policy = client.zero_trust.access.applications.policies.create(
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
-            name="Allow devs",
             account_id="account_id",
             approval_groups=[
                 {
@@ -66,20 +52,10 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                 },
             ],
             approval_required=True,
-            exclude=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
             isolation_required=False,
             precedence=0,
             purpose_justification_prompt="Please enter a justification for entering this protected domain.",
             purpose_justification_required=True,
-            require=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
             session_duration="24h",
         )
         assert_matches_type(Optional[PolicyCreateResponse], policy, path=["response"])
@@ -89,13 +65,6 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.applications.policies.with_raw_response.create(
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
-            name="Allow devs",
             account_id="account_id",
         )
 
@@ -109,13 +78,6 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.zero_trust.access.applications.policies.with_streaming_response.create(
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
-            name="Allow devs",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -132,39 +94,18 @@ def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
             client.zero_trust.access.applications.policies.with_raw_response.create(
                 app_id="",
-                decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
-                name="Allow devs",
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.policies.with_raw_response.create(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
-                name="Allow devs",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.policies.with_raw_response.create(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
-                name="Allow devs",
                 account_id="account_id",
             )
 
@@ -174,13 +115,6 @@ def test_method_update(self, client: Cloudflare) -> None:
         policy = client.zero_trust.access.applications.policies.update(
             policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
-            name="Allow devs",
             account_id="account_id",
         )
         assert_matches_type(Optional[PolicyUpdateResponse], policy, path=["response"])
@@ -191,13 +125,6 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         policy = client.zero_trust.access.applications.policies.update(
             policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
-            name="Allow devs",
             account_id="account_id",
             approval_groups=[
                 {
@@ -212,20 +139,10 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                 },
             ],
             approval_required=True,
-            exclude=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
             isolation_required=False,
             precedence=0,
             purpose_justification_prompt="Please enter a justification for entering this protected domain.",
             purpose_justification_required=True,
-            require=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
             session_duration="24h",
         )
         assert_matches_type(Optional[PolicyUpdateResponse], policy, path=["response"])
@@ -236,13 +153,6 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.applications.policies.with_raw_response.update(
             policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
-            name="Allow devs",
             account_id="account_id",
         )
 
@@ -257,13 +167,6 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.zero_trust.access.applications.policies.with_streaming_response.update(
             policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
-            name="Allow devs",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -281,13 +184,6 @@ def test_path_params_update(self, client: Cloudflare) -> None:
             client.zero_trust.access.applications.policies.with_raw_response.update(
                 policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 app_id="",
-                decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
-                name="Allow devs",
                 account_id="account_id",
             )
 
@@ -295,41 +191,20 @@ def test_path_params_update(self, client: Cloudflare) -> None:
             client.zero_trust.access.applications.policies.with_raw_response.update(
                 policy_id="",
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
-                name="Allow devs",
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.policies.with_raw_response.update(
                 policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
-                name="Allow devs",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.policies.with_raw_response.update(
                 policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
-                name="Allow devs",
                 account_id="account_id",
             )
 
@@ -340,7 +215,7 @@ def test_method_list(self, client: Cloudflare) -> None:
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="account_id",
         )
-        assert_matches_type(SyncSinglePage[PolicyListResponse], policy, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[PolicyListResponse], policy, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -348,8 +223,10 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         policy = client.zero_trust.access.applications.policies.list(
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="account_id",
+            page=0,
+            per_page=0,
         )
-        assert_matches_type(SyncSinglePage[PolicyListResponse], policy, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[PolicyListResponse], policy, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -362,7 +239,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         policy = response.parse()
-        assert_matches_type(SyncSinglePage[PolicyListResponse], policy, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[PolicyListResponse], policy, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -375,7 +252,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             policy = response.parse()
-            assert_matches_type(SyncSinglePage[PolicyListResponse], policy, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[PolicyListResponse], policy, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -388,13 +265,13 @@ def test_path_params_list(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.policies.with_raw_response.list(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.policies.with_raw_response.list(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -467,14 +344,14 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.policies.with_raw_response.delete(
                 policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.policies.with_raw_response.delete(
                 policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
@@ -548,14 +425,14 @@ def test_path_params_get(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.policies.with_raw_response.get(
                 policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.policies.with_raw_response.get(
                 policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
@@ -564,20 +441,15 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncPolicies:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         policy = await async_client.zero_trust.access.applications.policies.create(
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
-            name="Allow devs",
             account_id="account_id",
         )
         assert_matches_type(Optional[PolicyCreateResponse], policy, path=["response"])
@@ -587,13 +459,6 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         policy = await async_client.zero_trust.access.applications.policies.create(
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
-            name="Allow devs",
             account_id="account_id",
             approval_groups=[
                 {
@@ -608,20 +473,10 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                 },
             ],
             approval_required=True,
-            exclude=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
             isolation_required=False,
             precedence=0,
             purpose_justification_prompt="Please enter a justification for entering this protected domain.",
             purpose_justification_required=True,
-            require=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
             session_duration="24h",
         )
         assert_matches_type(Optional[PolicyCreateResponse], policy, path=["response"])
@@ -631,13 +486,6 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.applications.policies.with_raw_response.create(
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
-            name="Allow devs",
             account_id="account_id",
         )
 
@@ -651,13 +499,6 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.applications.policies.with_streaming_response.create(
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
-            name="Allow devs",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -674,39 +515,18 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
             await async_client.zero_trust.access.applications.policies.with_raw_response.create(
                 app_id="",
-                decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
-                name="Allow devs",
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.policies.with_raw_response.create(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
-                name="Allow devs",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.policies.with_raw_response.create(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
-                name="Allow devs",
                 account_id="account_id",
             )
 
@@ -716,13 +536,6 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         policy = await async_client.zero_trust.access.applications.policies.update(
             policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
-            name="Allow devs",
             account_id="account_id",
         )
         assert_matches_type(Optional[PolicyUpdateResponse], policy, path=["response"])
@@ -733,13 +546,6 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
         policy = await async_client.zero_trust.access.applications.policies.update(
             policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
-            name="Allow devs",
             account_id="account_id",
             approval_groups=[
                 {
@@ -754,20 +560,10 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                 },
             ],
             approval_required=True,
-            exclude=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
             isolation_required=False,
             precedence=0,
             purpose_justification_prompt="Please enter a justification for entering this protected domain.",
             purpose_justification_required=True,
-            require=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
             session_duration="24h",
         )
         assert_matches_type(Optional[PolicyUpdateResponse], policy, path=["response"])
@@ -778,13 +574,6 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.applications.policies.with_raw_response.update(
             policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
-            name="Allow devs",
             account_id="account_id",
         )
 
@@ -799,13 +588,6 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
         async with async_client.zero_trust.access.applications.policies.with_streaming_response.update(
             policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
-            name="Allow devs",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -823,13 +605,6 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
             await async_client.zero_trust.access.applications.policies.with_raw_response.update(
                 policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 app_id="",
-                decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
-                name="Allow devs",
                 account_id="account_id",
             )
 
@@ -837,41 +612,20 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
             await async_client.zero_trust.access.applications.policies.with_raw_response.update(
                 policy_id="",
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
-                name="Allow devs",
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.policies.with_raw_response.update(
                 policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
-                name="Allow devs",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.policies.with_raw_response.update(
                 policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
-                name="Allow devs",
                 account_id="account_id",
             )
 
@@ -882,7 +636,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="account_id",
         )
-        assert_matches_type(AsyncSinglePage[PolicyListResponse], policy, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[PolicyListResponse], policy, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -890,8 +644,10 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
         policy = await async_client.zero_trust.access.applications.policies.list(
             app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="account_id",
+            page=0,
+            per_page=0,
         )
-        assert_matches_type(AsyncSinglePage[PolicyListResponse], policy, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[PolicyListResponse], policy, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -904,7 +660,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         policy = await response.parse()
-        assert_matches_type(AsyncSinglePage[PolicyListResponse], policy, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[PolicyListResponse], policy, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -917,7 +673,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             policy = await response.parse()
-            assert_matches_type(AsyncSinglePage[PolicyListResponse], policy, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[PolicyListResponse], policy, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -930,13 +686,13 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.policies.with_raw_response.list(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.policies.with_raw_response.list(
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -1009,14 +765,14 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.policies.with_raw_response.delete(
                 policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.policies.with_raw_response.delete(
                 policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
@@ -1090,14 +846,14 @@ async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.policies.with_raw_response.get(
                 policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.policies.with_raw_response.get(
                 policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 app_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
diff --git a/tests/api_resources/zero_trust/access/applications/test_policy_tests.py b/tests/api_resources/zero_trust/access/applications/test_policy_tests.py
new file mode 100755
index 00000000000..d4517ef3e31
--- /dev/null
+++ b/tests/api_resources/zero_trust/access/applications/test_policy_tests.py
@@ -0,0 +1,265 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zero_trust.access.applications import (
+    PolicyTestGetResponse,
+    PolicyTestCreateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestPolicyTests:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        policy_test = client.zero_trust.access.applications.policy_tests.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[PolicyTestCreateResponse], policy_test, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        policy_test = client.zero_trust.access.applications.policy_tests.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            policies=[
+                {
+                    "decision": "allow",
+                    "include": [{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
+                    "name": "Allow devs",
+                    "approval_groups": [
+                        {
+                            "approvals_needed": 1,
+                            "email_addresses": ["test1@cloudflare.com", "test2@cloudflare.com"],
+                            "email_list_uuid": "email_list_uuid",
+                        },
+                        {
+                            "approvals_needed": 3,
+                            "email_addresses": ["test@cloudflare.com", "test2@cloudflare.com"],
+                            "email_list_uuid": "597147a1-976b-4ef2-9af0-81d5d007fc34",
+                        },
+                    ],
+                    "approval_required": True,
+                    "exclude": [{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
+                    "isolation_required": False,
+                    "purpose_justification_prompt": "Please enter a justification for entering this protected domain.",
+                    "purpose_justification_required": True,
+                    "require": [{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
+                    "session_duration": "24h",
+                }
+            ],
+        )
+        assert_matches_type(Optional[PolicyTestCreateResponse], policy_test, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.applications.policy_tests.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        policy_test = response.parse()
+        assert_matches_type(Optional[PolicyTestCreateResponse], policy_test, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.applications.policy_tests.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            policy_test = response.parse()
+            assert_matches_type(Optional[PolicyTestCreateResponse], policy_test, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.applications.policy_tests.with_raw_response.create(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        policy_test = client.zero_trust.access.applications.policy_tests.get(
+            policy_test_id="f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[PolicyTestGetResponse], policy_test, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.applications.policy_tests.with_raw_response.get(
+            policy_test_id="f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        policy_test = response.parse()
+        assert_matches_type(Optional[PolicyTestGetResponse], policy_test, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.applications.policy_tests.with_streaming_response.get(
+            policy_test_id="f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            policy_test = response.parse()
+            assert_matches_type(Optional[PolicyTestGetResponse], policy_test, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.applications.policy_tests.with_raw_response.get(
+                policy_test_id="f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_test_id` but received ''"):
+            client.zero_trust.access.applications.policy_tests.with_raw_response.get(
+                policy_test_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncPolicyTests:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        policy_test = await async_client.zero_trust.access.applications.policy_tests.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[PolicyTestCreateResponse], policy_test, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        policy_test = await async_client.zero_trust.access.applications.policy_tests.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            policies=[
+                {
+                    "decision": "allow",
+                    "include": [{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
+                    "name": "Allow devs",
+                    "approval_groups": [
+                        {
+                            "approvals_needed": 1,
+                            "email_addresses": ["test1@cloudflare.com", "test2@cloudflare.com"],
+                            "email_list_uuid": "email_list_uuid",
+                        },
+                        {
+                            "approvals_needed": 3,
+                            "email_addresses": ["test@cloudflare.com", "test2@cloudflare.com"],
+                            "email_list_uuid": "597147a1-976b-4ef2-9af0-81d5d007fc34",
+                        },
+                    ],
+                    "approval_required": True,
+                    "exclude": [{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
+                    "isolation_required": False,
+                    "purpose_justification_prompt": "Please enter a justification for entering this protected domain.",
+                    "purpose_justification_required": True,
+                    "require": [{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
+                    "session_duration": "24h",
+                }
+            ],
+        )
+        assert_matches_type(Optional[PolicyTestCreateResponse], policy_test, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.applications.policy_tests.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        policy_test = await response.parse()
+        assert_matches_type(Optional[PolicyTestCreateResponse], policy_test, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.applications.policy_tests.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            policy_test = await response.parse()
+            assert_matches_type(Optional[PolicyTestCreateResponse], policy_test, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.applications.policy_tests.with_raw_response.create(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        policy_test = await async_client.zero_trust.access.applications.policy_tests.get(
+            policy_test_id="f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[PolicyTestGetResponse], policy_test, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.applications.policy_tests.with_raw_response.get(
+            policy_test_id="f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        policy_test = await response.parse()
+        assert_matches_type(Optional[PolicyTestGetResponse], policy_test, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.applications.policy_tests.with_streaming_response.get(
+            policy_test_id="f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            policy_test = await response.parse()
+            assert_matches_type(Optional[PolicyTestGetResponse], policy_test, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.applications.policy_tests.with_raw_response.get(
+                policy_test_id="f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_test_id` but received ''"):
+            await async_client.zero_trust.access.applications.policy_tests.with_raw_response.get(
+                policy_test_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/zero_trust/access/applications/test_settings.py b/tests/api_resources/zero_trust/access/applications/test_settings.py
new file mode 100644
index 00000000000..a1bc19b917e
--- /dev/null
+++ b/tests/api_resources/zero_trust/access/applications/test_settings.py
@@ -0,0 +1,303 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zero_trust.access.applications import (
+    SettingEditResponse,
+    SettingUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSettings:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        setting = client.zero_trust.access.applications.settings.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[SettingUpdateResponse], setting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        setting = client.zero_trust.access.applications.settings.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+            allow_iframe=True,
+            skip_interstitial=True,
+        )
+        assert_matches_type(Optional[SettingUpdateResponse], setting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.applications.settings.with_raw_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = response.parse()
+        assert_matches_type(Optional[SettingUpdateResponse], setting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.applications.settings.with_streaming_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = response.parse()
+            assert_matches_type(Optional[SettingUpdateResponse], setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.zero_trust.access.applications.settings.with_raw_response.update(
+                app_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.settings.with_raw_response.update(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.settings.with_raw_response.update(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        setting = client.zero_trust.access.applications.settings.edit(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        setting = client.zero_trust.access.applications.settings.edit(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+            allow_iframe=True,
+            skip_interstitial=True,
+        )
+        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.applications.settings.with_raw_response.edit(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = response.parse()
+        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.applications.settings.with_streaming_response.edit(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = response.parse()
+            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.zero_trust.access.applications.settings.with_raw_response.edit(
+                app_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.settings.with_raw_response.edit(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.settings.with_raw_response.edit(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
+            )
+
+
+class TestAsyncSettings:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.zero_trust.access.applications.settings.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[SettingUpdateResponse], setting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.zero_trust.access.applications.settings.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+            allow_iframe=True,
+            skip_interstitial=True,
+        )
+        assert_matches_type(Optional[SettingUpdateResponse], setting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.applications.settings.with_raw_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = await response.parse()
+        assert_matches_type(Optional[SettingUpdateResponse], setting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.applications.settings.with_streaming_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = await response.parse()
+            assert_matches_type(Optional[SettingUpdateResponse], setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.zero_trust.access.applications.settings.with_raw_response.update(
+                app_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.zero_trust.access.applications.settings.with_raw_response.update(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.zero_trust.access.applications.settings.with_raw_response.update(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.zero_trust.access.applications.settings.edit(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.zero_trust.access.applications.settings.edit(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+            allow_iframe=True,
+            skip_interstitial=True,
+        )
+        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.applications.settings.with_raw_response.edit(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = await response.parse()
+        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.applications.settings.with_streaming_response.edit(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = await response.parse()
+            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.zero_trust.access.applications.settings.with_raw_response.edit(
+                app_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.zero_trust.access.applications.settings.with_raw_response.edit(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.zero_trust.access.applications.settings.with_raw_response.edit(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/zero_trust/access/applications/test_user_policy_checks.py b/tests/api_resources/zero_trust/access/applications/test_user_policy_checks.py
index af0dc1ed1f8..668f6fc35b0 100644
--- a/tests/api_resources/zero_trust/access/applications/test_user_policy_checks.py
+++ b/tests/api_resources/zero_trust/access/applications/test_user_policy_checks.py
@@ -66,13 +66,19 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.zero_trust.access.applications.user_policy_checks.with_raw_response.list(
+                app_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.user_policy_checks.with_raw_response.list(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.user_policy_checks.with_raw_response.list(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="account_id",
@@ -80,7 +86,9 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncUserPolicyChecks:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -131,13 +139,19 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.zero_trust.access.applications.user_policy_checks.with_raw_response.list(
+                app_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.user_policy_checks.with_raw_response.list(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.user_policy_checks.with_raw_response.list(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="account_id",
diff --git a/tests/api_resources/zero_trust/access/certificates/test_settings.py b/tests/api_resources/zero_trust/access/certificates/test_settings.py
index b7b66bf60f7..65b683707ca 100644
--- a/tests/api_resources/zero_trust/access/certificates/test_settings.py
+++ b/tests/api_resources/zero_trust/access/certificates/test_settings.py
@@ -3,16 +3,14 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.zero_trust.access.certificates import (
-    SettingGetResponse,
-    SettingUpdateResponse,
-)
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.access.certificates import CertificateSettings
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -29,21 +27,11 @@ def test_method_update(self, client: Cloudflare) -> None:
                     "china_network": False,
                     "client_certificate_forwarding": True,
                     "hostname": "admin.example.com",
-                },
-                {
-                    "china_network": False,
-                    "client_certificate_forwarding": True,
-                    "hostname": "admin.example.com",
-                },
-                {
-                    "china_network": False,
-                    "client_certificate_forwarding": True,
-                    "hostname": "admin.example.com",
-                },
+                }
             ],
             account_id="account_id",
         )
-        assert_matches_type(Optional[SettingUpdateResponse], setting, path=["response"])
+        assert_matches_type(SyncSinglePage[CertificateSettings], setting, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -54,21 +42,11 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                     "china_network": False,
                     "client_certificate_forwarding": True,
                     "hostname": "admin.example.com",
-                },
-                {
-                    "china_network": False,
-                    "client_certificate_forwarding": True,
-                    "hostname": "admin.example.com",
-                },
-                {
-                    "china_network": False,
-                    "client_certificate_forwarding": True,
-                    "hostname": "admin.example.com",
-                },
+                }
             ],
             account_id="account_id",
         )
-        assert_matches_type(Optional[SettingUpdateResponse], setting, path=["response"])
+        assert_matches_type(SyncSinglePage[CertificateSettings], setting, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -79,17 +57,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
                     "china_network": False,
                     "client_certificate_forwarding": True,
                     "hostname": "admin.example.com",
-                },
-                {
-                    "china_network": False,
-                    "client_certificate_forwarding": True,
-                    "hostname": "admin.example.com",
-                },
-                {
-                    "china_network": False,
-                    "client_certificate_forwarding": True,
-                    "hostname": "admin.example.com",
-                },
+                }
             ],
             account_id="account_id",
         )
@@ -97,7 +65,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         setting = response.parse()
-        assert_matches_type(Optional[SettingUpdateResponse], setting, path=["response"])
+        assert_matches_type(SyncSinglePage[CertificateSettings], setting, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -108,17 +76,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
                     "china_network": False,
                     "client_certificate_forwarding": True,
                     "hostname": "admin.example.com",
-                },
-                {
-                    "china_network": False,
-                    "client_certificate_forwarding": True,
-                    "hostname": "admin.example.com",
-                },
-                {
-                    "china_network": False,
-                    "client_certificate_forwarding": True,
-                    "hostname": "admin.example.com",
-                },
+                }
             ],
             account_id="account_id",
         ) as response:
@@ -126,53 +84,33 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             setting = response.parse()
-            assert_matches_type(Optional[SettingUpdateResponse], setting, path=["response"])
+            assert_matches_type(SyncSinglePage[CertificateSettings], setting, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.certificates.settings.with_raw_response.update(
                 settings=[
                     {
                         "china_network": False,
                         "client_certificate_forwarding": True,
                         "hostname": "admin.example.com",
-                    },
-                    {
-                        "china_network": False,
-                        "client_certificate_forwarding": True,
-                        "hostname": "admin.example.com",
-                    },
-                    {
-                        "china_network": False,
-                        "client_certificate_forwarding": True,
-                        "hostname": "admin.example.com",
-                    },
+                    }
                 ],
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.certificates.settings.with_raw_response.update(
                 settings=[
                     {
                         "china_network": False,
                         "client_certificate_forwarding": True,
                         "hostname": "admin.example.com",
-                    },
-                    {
-                        "china_network": False,
-                        "client_certificate_forwarding": True,
-                        "hostname": "admin.example.com",
-                    },
-                    {
-                        "china_network": False,
-                        "client_certificate_forwarding": True,
-                        "hostname": "admin.example.com",
-                    },
+                    }
                 ],
                 account_id="account_id",
             )
@@ -183,7 +121,7 @@ def test_method_get(self, client: Cloudflare) -> None:
         setting = client.zero_trust.access.certificates.settings.get(
             account_id="account_id",
         )
-        assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
+        assert_matches_type(SyncSinglePage[CertificateSettings], setting, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -191,7 +129,7 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         setting = client.zero_trust.access.certificates.settings.get(
             account_id="account_id",
         )
-        assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
+        assert_matches_type(SyncSinglePage[CertificateSettings], setting, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -203,7 +141,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         setting = response.parse()
-        assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
+        assert_matches_type(SyncSinglePage[CertificateSettings], setting, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -215,26 +153,28 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             setting = response.parse()
-            assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
+            assert_matches_type(SyncSinglePage[CertificateSettings], setting, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.certificates.settings.with_raw_response.get(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.certificates.settings.with_raw_response.get(
                 account_id="account_id",
             )
 
 
 class TestAsyncSettings:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -245,21 +185,11 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
                     "china_network": False,
                     "client_certificate_forwarding": True,
                     "hostname": "admin.example.com",
-                },
-                {
-                    "china_network": False,
-                    "client_certificate_forwarding": True,
-                    "hostname": "admin.example.com",
-                },
-                {
-                    "china_network": False,
-                    "client_certificate_forwarding": True,
-                    "hostname": "admin.example.com",
-                },
+                }
             ],
             account_id="account_id",
         )
-        assert_matches_type(Optional[SettingUpdateResponse], setting, path=["response"])
+        assert_matches_type(AsyncSinglePage[CertificateSettings], setting, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -270,21 +200,11 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                     "china_network": False,
                     "client_certificate_forwarding": True,
                     "hostname": "admin.example.com",
-                },
-                {
-                    "china_network": False,
-                    "client_certificate_forwarding": True,
-                    "hostname": "admin.example.com",
-                },
-                {
-                    "china_network": False,
-                    "client_certificate_forwarding": True,
-                    "hostname": "admin.example.com",
-                },
+                }
             ],
             account_id="account_id",
         )
-        assert_matches_type(Optional[SettingUpdateResponse], setting, path=["response"])
+        assert_matches_type(AsyncSinglePage[CertificateSettings], setting, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -295,17 +215,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
                     "china_network": False,
                     "client_certificate_forwarding": True,
                     "hostname": "admin.example.com",
-                },
-                {
-                    "china_network": False,
-                    "client_certificate_forwarding": True,
-                    "hostname": "admin.example.com",
-                },
-                {
-                    "china_network": False,
-                    "client_certificate_forwarding": True,
-                    "hostname": "admin.example.com",
-                },
+                }
             ],
             account_id="account_id",
         )
@@ -313,7 +223,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         setting = await response.parse()
-        assert_matches_type(Optional[SettingUpdateResponse], setting, path=["response"])
+        assert_matches_type(AsyncSinglePage[CertificateSettings], setting, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -324,17 +234,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
                     "china_network": False,
                     "client_certificate_forwarding": True,
                     "hostname": "admin.example.com",
-                },
-                {
-                    "china_network": False,
-                    "client_certificate_forwarding": True,
-                    "hostname": "admin.example.com",
-                },
-                {
-                    "china_network": False,
-                    "client_certificate_forwarding": True,
-                    "hostname": "admin.example.com",
-                },
+                }
             ],
             account_id="account_id",
         ) as response:
@@ -342,53 +242,33 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             setting = await response.parse()
-            assert_matches_type(Optional[SettingUpdateResponse], setting, path=["response"])
+            assert_matches_type(AsyncSinglePage[CertificateSettings], setting, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.certificates.settings.with_raw_response.update(
                 settings=[
                     {
                         "china_network": False,
                         "client_certificate_forwarding": True,
                         "hostname": "admin.example.com",
-                    },
-                    {
-                        "china_network": False,
-                        "client_certificate_forwarding": True,
-                        "hostname": "admin.example.com",
-                    },
-                    {
-                        "china_network": False,
-                        "client_certificate_forwarding": True,
-                        "hostname": "admin.example.com",
-                    },
+                    }
                 ],
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.certificates.settings.with_raw_response.update(
                 settings=[
                     {
                         "china_network": False,
                         "client_certificate_forwarding": True,
                         "hostname": "admin.example.com",
-                    },
-                    {
-                        "china_network": False,
-                        "client_certificate_forwarding": True,
-                        "hostname": "admin.example.com",
-                    },
-                    {
-                        "china_network": False,
-                        "client_certificate_forwarding": True,
-                        "hostname": "admin.example.com",
-                    },
+                    }
                 ],
                 account_id="account_id",
             )
@@ -399,7 +279,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         setting = await async_client.zero_trust.access.certificates.settings.get(
             account_id="account_id",
         )
-        assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
+        assert_matches_type(AsyncSinglePage[CertificateSettings], setting, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -407,7 +287,7 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -
         setting = await async_client.zero_trust.access.certificates.settings.get(
             account_id="account_id",
         )
-        assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
+        assert_matches_type(AsyncSinglePage[CertificateSettings], setting, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -419,7 +299,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         setting = await response.parse()
-        assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
+        assert_matches_type(AsyncSinglePage[CertificateSettings], setting, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -431,19 +311,19 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             setting = await response.parse()
-            assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
+            assert_matches_type(AsyncSinglePage[CertificateSettings], setting, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.certificates.settings.with_raw_response.get(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.certificates.settings.with_raw_response.get(
                 account_id="account_id",
             )
diff --git a/tests/api_resources/zero_trust/access/infrastructure/__init__.py b/tests/api_resources/zero_trust/access/infrastructure/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/access/infrastructure/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/access/infrastructure/test_targets.py b/tests/api_resources/zero_trust/access/infrastructure/test_targets.py
new file mode 100644
index 00000000000..74205d6a65b
--- /dev/null
+++ b/tests/api_resources/zero_trust/access/infrastructure/test_targets.py
@@ -0,0 +1,932 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage, SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.zero_trust.access.infrastructure import (
+    TargetGetResponse,
+    TargetListResponse,
+    TargetCreateResponse,
+    TargetUpdateResponse,
+    TargetBulkUpdateResponse,
+)
+
+# pyright: reportDeprecated=false
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestTargets:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        target = client.zero_trust.access.infrastructure.targets.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostname="infra-access-target",
+            ip={},
+        )
+        assert_matches_type(Optional[TargetCreateResponse], target, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        target = client.zero_trust.access.infrastructure.targets.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostname="infra-access-target",
+            ip={
+                "ipv4": {
+                    "ip_addr": "187.26.29.249",
+                    "virtual_network_id": "c77b744e-acc8-428f-9257-6878c046ed55",
+                },
+                "ipv6": {
+                    "ip_addr": "64c0:64e8:f0b4:8dbf:7104:72b0:ec8f:f5e0",
+                    "virtual_network_id": "c77b744e-acc8-428f-9257-6878c046ed55",
+                },
+            },
+        )
+        assert_matches_type(Optional[TargetCreateResponse], target, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.infrastructure.targets.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostname="infra-access-target",
+            ip={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        target = response.parse()
+        assert_matches_type(Optional[TargetCreateResponse], target, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.infrastructure.targets.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostname="infra-access-target",
+            ip={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            target = response.parse()
+            assert_matches_type(Optional[TargetCreateResponse], target, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.infrastructure.targets.with_raw_response.create(
+                account_id="",
+                hostname="infra-access-target",
+                ip={},
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        target = client.zero_trust.access.infrastructure.targets.update(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostname="infra-access-target",
+            ip={},
+        )
+        assert_matches_type(Optional[TargetUpdateResponse], target, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        target = client.zero_trust.access.infrastructure.targets.update(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostname="infra-access-target",
+            ip={
+                "ipv4": {
+                    "ip_addr": "187.26.29.249",
+                    "virtual_network_id": "c77b744e-acc8-428f-9257-6878c046ed55",
+                },
+                "ipv6": {
+                    "ip_addr": "64c0:64e8:f0b4:8dbf:7104:72b0:ec8f:f5e0",
+                    "virtual_network_id": "c77b744e-acc8-428f-9257-6878c046ed55",
+                },
+            },
+        )
+        assert_matches_type(Optional[TargetUpdateResponse], target, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.infrastructure.targets.with_raw_response.update(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostname="infra-access-target",
+            ip={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        target = response.parse()
+        assert_matches_type(Optional[TargetUpdateResponse], target, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.infrastructure.targets.with_streaming_response.update(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostname="infra-access-target",
+            ip={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            target = response.parse()
+            assert_matches_type(Optional[TargetUpdateResponse], target, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.infrastructure.targets.with_raw_response.update(
+                target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                hostname="infra-access-target",
+                ip={},
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `target_id` but received ''"):
+            client.zero_trust.access.infrastructure.targets.with_raw_response.update(
+                target_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                hostname="infra-access-target",
+                ip={},
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        target = client.zero_trust.access.infrastructure.targets.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[TargetListResponse], target, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        target = client.zero_trust.access.infrastructure.targets.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            created_after=parse_datetime("2019-12-27T18:11:19.117Z"),
+            created_before=parse_datetime("2019-12-27T18:11:19.117Z"),
+            direction="asc",
+            hostname="hostname",
+            hostname_contains="hostname_contains",
+            ip_like="ip_like",
+            ip_v4="ip_v4",
+            ip_v6="ip_v6",
+            ips=["string"],
+            ipv4_end="ipv4_end",
+            ipv4_start="ipv4_start",
+            ipv6_end="ipv6_end",
+            ipv6_start="ipv6_start",
+            modified_after=parse_datetime("2019-12-27T18:11:19.117Z"),
+            modified_before=parse_datetime("2019-12-27T18:11:19.117Z"),
+            order="hostname",
+            page=1,
+            per_page=1,
+            target_ids=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            virtual_network_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[TargetListResponse], target, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.infrastructure.targets.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        target = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[TargetListResponse], target, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.infrastructure.targets.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            target = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[TargetListResponse], target, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.infrastructure.targets.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        target = client.zero_trust.access.infrastructure.targets.delete(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert target is None
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.infrastructure.targets.with_raw_response.delete(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        target = response.parse()
+        assert target is None
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.infrastructure.targets.with_streaming_response.delete(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            target = response.parse()
+            assert target is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.infrastructure.targets.with_raw_response.delete(
+                target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `target_id` but received ''"):
+            client.zero_trust.access.infrastructure.targets.with_raw_response.delete(
+                target_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            target = client.zero_trust.access.infrastructure.targets.bulk_delete(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert target is None
+
+    @parametrize
+    def test_raw_response_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.zero_trust.access.infrastructure.targets.with_raw_response.bulk_delete(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        target = response.parse()
+        assert target is None
+
+    @parametrize
+    def test_streaming_response_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.zero_trust.access.infrastructure.targets.with_streaming_response.bulk_delete(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                target = response.parse()
+                assert target is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.zero_trust.access.infrastructure.targets.with_raw_response.bulk_delete(
+                    account_id="",
+                )
+
+    @parametrize
+    def test_method_bulk_delete_v2(self, client: Cloudflare) -> None:
+        target = client.zero_trust.access.infrastructure.targets.bulk_delete_v2(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            target_ids=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+        )
+        assert target is None
+
+    @parametrize
+    def test_raw_response_bulk_delete_v2(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.infrastructure.targets.with_raw_response.bulk_delete_v2(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            target_ids=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        target = response.parse()
+        assert target is None
+
+    @parametrize
+    def test_streaming_response_bulk_delete_v2(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.infrastructure.targets.with_streaming_response.bulk_delete_v2(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            target_ids=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            target = response.parse()
+            assert target is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_delete_v2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.infrastructure.targets.with_raw_response.bulk_delete_v2(
+                account_id="",
+                target_ids=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            )
+
+    @parametrize
+    def test_method_bulk_update(self, client: Cloudflare) -> None:
+        target = client.zero_trust.access.infrastructure.targets.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "hostname": "infra-access-target",
+                    "ip": {},
+                }
+            ],
+        )
+        assert_matches_type(SyncSinglePage[TargetBulkUpdateResponse], target, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_update(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.infrastructure.targets.with_raw_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "hostname": "infra-access-target",
+                    "ip": {},
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        target = response.parse()
+        assert_matches_type(SyncSinglePage[TargetBulkUpdateResponse], target, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_update(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.infrastructure.targets.with_streaming_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "hostname": "infra-access-target",
+                    "ip": {},
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            target = response.parse()
+            assert_matches_type(SyncSinglePage[TargetBulkUpdateResponse], target, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.infrastructure.targets.with_raw_response.bulk_update(
+                account_id="",
+                body=[
+                    {
+                        "hostname": "infra-access-target",
+                        "ip": {},
+                    }
+                ],
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        target = client.zero_trust.access.infrastructure.targets.get(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[TargetGetResponse], target, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.infrastructure.targets.with_raw_response.get(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        target = response.parse()
+        assert_matches_type(Optional[TargetGetResponse], target, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.infrastructure.targets.with_streaming_response.get(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            target = response.parse()
+            assert_matches_type(Optional[TargetGetResponse], target, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.infrastructure.targets.with_raw_response.get(
+                target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `target_id` but received ''"):
+            client.zero_trust.access.infrastructure.targets.with_raw_response.get(
+                target_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncTargets:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        target = await async_client.zero_trust.access.infrastructure.targets.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostname="infra-access-target",
+            ip={},
+        )
+        assert_matches_type(Optional[TargetCreateResponse], target, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        target = await async_client.zero_trust.access.infrastructure.targets.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostname="infra-access-target",
+            ip={
+                "ipv4": {
+                    "ip_addr": "187.26.29.249",
+                    "virtual_network_id": "c77b744e-acc8-428f-9257-6878c046ed55",
+                },
+                "ipv6": {
+                    "ip_addr": "64c0:64e8:f0b4:8dbf:7104:72b0:ec8f:f5e0",
+                    "virtual_network_id": "c77b744e-acc8-428f-9257-6878c046ed55",
+                },
+            },
+        )
+        assert_matches_type(Optional[TargetCreateResponse], target, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.infrastructure.targets.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostname="infra-access-target",
+            ip={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        target = await response.parse()
+        assert_matches_type(Optional[TargetCreateResponse], target, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.infrastructure.targets.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostname="infra-access-target",
+            ip={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            target = await response.parse()
+            assert_matches_type(Optional[TargetCreateResponse], target, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.infrastructure.targets.with_raw_response.create(
+                account_id="",
+                hostname="infra-access-target",
+                ip={},
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        target = await async_client.zero_trust.access.infrastructure.targets.update(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostname="infra-access-target",
+            ip={},
+        )
+        assert_matches_type(Optional[TargetUpdateResponse], target, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        target = await async_client.zero_trust.access.infrastructure.targets.update(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostname="infra-access-target",
+            ip={
+                "ipv4": {
+                    "ip_addr": "187.26.29.249",
+                    "virtual_network_id": "c77b744e-acc8-428f-9257-6878c046ed55",
+                },
+                "ipv6": {
+                    "ip_addr": "64c0:64e8:f0b4:8dbf:7104:72b0:ec8f:f5e0",
+                    "virtual_network_id": "c77b744e-acc8-428f-9257-6878c046ed55",
+                },
+            },
+        )
+        assert_matches_type(Optional[TargetUpdateResponse], target, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.infrastructure.targets.with_raw_response.update(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostname="infra-access-target",
+            ip={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        target = await response.parse()
+        assert_matches_type(Optional[TargetUpdateResponse], target, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.infrastructure.targets.with_streaming_response.update(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hostname="infra-access-target",
+            ip={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            target = await response.parse()
+            assert_matches_type(Optional[TargetUpdateResponse], target, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.infrastructure.targets.with_raw_response.update(
+                target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                hostname="infra-access-target",
+                ip={},
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `target_id` but received ''"):
+            await async_client.zero_trust.access.infrastructure.targets.with_raw_response.update(
+                target_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                hostname="infra-access-target",
+                ip={},
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        target = await async_client.zero_trust.access.infrastructure.targets.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[TargetListResponse], target, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        target = await async_client.zero_trust.access.infrastructure.targets.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            created_after=parse_datetime("2019-12-27T18:11:19.117Z"),
+            created_before=parse_datetime("2019-12-27T18:11:19.117Z"),
+            direction="asc",
+            hostname="hostname",
+            hostname_contains="hostname_contains",
+            ip_like="ip_like",
+            ip_v4="ip_v4",
+            ip_v6="ip_v6",
+            ips=["string"],
+            ipv4_end="ipv4_end",
+            ipv4_start="ipv4_start",
+            ipv6_end="ipv6_end",
+            ipv6_start="ipv6_start",
+            modified_after=parse_datetime("2019-12-27T18:11:19.117Z"),
+            modified_before=parse_datetime("2019-12-27T18:11:19.117Z"),
+            order="hostname",
+            page=1,
+            per_page=1,
+            target_ids=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            virtual_network_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[TargetListResponse], target, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.infrastructure.targets.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        target = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[TargetListResponse], target, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.infrastructure.targets.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            target = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[TargetListResponse], target, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.infrastructure.targets.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        target = await async_client.zero_trust.access.infrastructure.targets.delete(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert target is None
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.infrastructure.targets.with_raw_response.delete(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        target = await response.parse()
+        assert target is None
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.infrastructure.targets.with_streaming_response.delete(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            target = await response.parse()
+            assert target is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.infrastructure.targets.with_raw_response.delete(
+                target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `target_id` but received ''"):
+            await async_client.zero_trust.access.infrastructure.targets.with_raw_response.delete(
+                target_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            target = await async_client.zero_trust.access.infrastructure.targets.bulk_delete(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert target is None
+
+    @parametrize
+    async def test_raw_response_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.zero_trust.access.infrastructure.targets.with_raw_response.bulk_delete(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        target = await response.parse()
+        assert target is None
+
+    @parametrize
+    async def test_streaming_response_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.zero_trust.access.infrastructure.targets.with_streaming_response.bulk_delete(
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                target = await response.parse()
+                assert target is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.zero_trust.access.infrastructure.targets.with_raw_response.bulk_delete(
+                    account_id="",
+                )
+
+    @parametrize
+    async def test_method_bulk_delete_v2(self, async_client: AsyncCloudflare) -> None:
+        target = await async_client.zero_trust.access.infrastructure.targets.bulk_delete_v2(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            target_ids=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+        )
+        assert target is None
+
+    @parametrize
+    async def test_raw_response_bulk_delete_v2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.infrastructure.targets.with_raw_response.bulk_delete_v2(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            target_ids=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        target = await response.parse()
+        assert target is None
+
+    @parametrize
+    async def test_streaming_response_bulk_delete_v2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.infrastructure.targets.with_streaming_response.bulk_delete_v2(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            target_ids=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            target = await response.parse()
+            assert target is None
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_delete_v2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.infrastructure.targets.with_raw_response.bulk_delete_v2(
+                account_id="",
+                target_ids=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            )
+
+    @parametrize
+    async def test_method_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        target = await async_client.zero_trust.access.infrastructure.targets.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "hostname": "infra-access-target",
+                    "ip": {},
+                }
+            ],
+        )
+        assert_matches_type(AsyncSinglePage[TargetBulkUpdateResponse], target, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.infrastructure.targets.with_raw_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "hostname": "infra-access-target",
+                    "ip": {},
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        target = await response.parse()
+        assert_matches_type(AsyncSinglePage[TargetBulkUpdateResponse], target, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.infrastructure.targets.with_streaming_response.bulk_update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            body=[
+                {
+                    "hostname": "infra-access-target",
+                    "ip": {},
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            target = await response.parse()
+            assert_matches_type(AsyncSinglePage[TargetBulkUpdateResponse], target, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.infrastructure.targets.with_raw_response.bulk_update(
+                account_id="",
+                body=[
+                    {
+                        "hostname": "infra-access-target",
+                        "ip": {},
+                    }
+                ],
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        target = await async_client.zero_trust.access.infrastructure.targets.get(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[TargetGetResponse], target, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.infrastructure.targets.with_raw_response.get(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        target = await response.parse()
+        assert_matches_type(Optional[TargetGetResponse], target, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.infrastructure.targets.with_streaming_response.get(
+            target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            target = await response.parse()
+            assert_matches_type(Optional[TargetGetResponse], target, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.infrastructure.targets.with_raw_response.get(
+                target_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `target_id` but received ''"):
+            await async_client.zero_trust.access.infrastructure.targets.with_raw_response.get(
+                target_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/zero_trust/access/logs/scim/__init__.py b/tests/api_resources/zero_trust/access/logs/scim/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/access/logs/scim/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/access/logs/scim/test_updates.py b/tests/api_resources/zero_trust/access/logs/scim/test_updates.py
new file mode 100644
index 00000000000..8c4f2fd02e5
--- /dev/null
+++ b/tests/api_resources/zero_trust/access/logs/scim/test_updates.py
@@ -0,0 +1,152 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.zero_trust.access.logs.scim import UpdateListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestUpdates:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        update = client.zero_trust.access.logs.scim.updates.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            idp_id=["df7e2w5f-02b7-4d9d-af26-8d1988fca630", "0194ae2c-efcf-7cfb-8884-055f1a161fa5"],
+        )
+        assert_matches_type(SyncV4PagePaginationArray[UpdateListResponse], update, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        update = client.zero_trust.access.logs.scim.updates.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            idp_id=["df7e2w5f-02b7-4d9d-af26-8d1988fca630", "0194ae2c-efcf-7cfb-8884-055f1a161fa5"],
+            cf_resource_id="bd97ef8d-7986-43e3-9ee0-c25dda33e4b0",
+            direction="desc",
+            idp_resource_id="idp_resource_id",
+            limit=10,
+            page=0,
+            per_page=0,
+            request_method=["DELETE", "PATCH"],
+            resource_group_name="ALL_EMPLOYEES",
+            resource_type=["USER", "GROUP"],
+            resource_user_email="john.smith@example.com",
+            since=parse_datetime("2025-01-01T00:00:00Z"),
+            status=["FAILURE", "SUCCESS"],
+            until=parse_datetime("2025-01-02T00:00:00Z"),
+        )
+        assert_matches_type(SyncV4PagePaginationArray[UpdateListResponse], update, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.logs.scim.updates.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            idp_id=["df7e2w5f-02b7-4d9d-af26-8d1988fca630", "0194ae2c-efcf-7cfb-8884-055f1a161fa5"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        update = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[UpdateListResponse], update, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.logs.scim.updates.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            idp_id=["df7e2w5f-02b7-4d9d-af26-8d1988fca630", "0194ae2c-efcf-7cfb-8884-055f1a161fa5"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            update = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[UpdateListResponse], update, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.logs.scim.updates.with_raw_response.list(
+                account_id="",
+                idp_id=["df7e2w5f-02b7-4d9d-af26-8d1988fca630", "0194ae2c-efcf-7cfb-8884-055f1a161fa5"],
+            )
+
+
+class TestAsyncUpdates:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        update = await async_client.zero_trust.access.logs.scim.updates.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            idp_id=["df7e2w5f-02b7-4d9d-af26-8d1988fca630", "0194ae2c-efcf-7cfb-8884-055f1a161fa5"],
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[UpdateListResponse], update, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        update = await async_client.zero_trust.access.logs.scim.updates.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            idp_id=["df7e2w5f-02b7-4d9d-af26-8d1988fca630", "0194ae2c-efcf-7cfb-8884-055f1a161fa5"],
+            cf_resource_id="bd97ef8d-7986-43e3-9ee0-c25dda33e4b0",
+            direction="desc",
+            idp_resource_id="idp_resource_id",
+            limit=10,
+            page=0,
+            per_page=0,
+            request_method=["DELETE", "PATCH"],
+            resource_group_name="ALL_EMPLOYEES",
+            resource_type=["USER", "GROUP"],
+            resource_user_email="john.smith@example.com",
+            since=parse_datetime("2025-01-01T00:00:00Z"),
+            status=["FAILURE", "SUCCESS"],
+            until=parse_datetime("2025-01-02T00:00:00Z"),
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[UpdateListResponse], update, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.logs.scim.updates.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            idp_id=["df7e2w5f-02b7-4d9d-af26-8d1988fca630", "0194ae2c-efcf-7cfb-8884-055f1a161fa5"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        update = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[UpdateListResponse], update, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.logs.scim.updates.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            idp_id=["df7e2w5f-02b7-4d9d-af26-8d1988fca630", "0194ae2c-efcf-7cfb-8884-055f1a161fa5"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            update = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[UpdateListResponse], update, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.logs.scim.updates.with_raw_response.list(
+                account_id="",
+                idp_id=["df7e2w5f-02b7-4d9d-af26-8d1988fca630", "0194ae2c-efcf-7cfb-8884-055f1a161fa5"],
+            )
diff --git a/tests/api_resources/zero_trust/access/logs/test_access_requests.py b/tests/api_resources/zero_trust/access/logs/test_access_requests.py
index 3eafad4f1a6..989fafdcc2e 100644
--- a/tests/api_resources/zero_trust/access/logs/test_access_requests.py
+++ b/tests/api_resources/zero_trust/access/logs/test_access_requests.py
@@ -30,9 +30,14 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         access_request = client.zero_trust.access.logs.access_requests.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             direction="desc",
+            email="user@example.com",
+            email_exact=True,
             limit=0,
+            page=0,
+            per_page=0,
             since=parse_datetime("2020-07-01T05:20:00Z"),
             until=parse_datetime("2020-10-01T05:20:00Z"),
+            user_id="f757c5c3-c1b2-50f7-9126-150a099b6f7e",
         )
         assert_matches_type(Optional[AccessRequestListResponse], access_request, path=["response"])
 
@@ -69,7 +74,9 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncAccessRequests:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
@@ -83,9 +90,14 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
         access_request = await async_client.zero_trust.access.logs.access_requests.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             direction="desc",
+            email="user@example.com",
+            email_exact=True,
             limit=0,
+            page=0,
+            per_page=0,
             since=parse_datetime("2020-07-01T05:20:00Z"),
             until=parse_datetime("2020-10-01T05:20:00Z"),
+            user_id="f757c5c3-c1b2-50f7-9126-150a099b6f7e",
         )
         assert_matches_type(Optional[AccessRequestListResponse], access_request, path=["response"])
 
diff --git a/tests/api_resources/zero_trust/access/test_applications.py b/tests/api_resources/zero_trust/access/test_applications.py
index 1bac74bcb05..fc4136feece 100644
--- a/tests/api_resources/zero_trust/access/test_applications.py
+++ b/tests/api_resources/zero_trust/access/test_applications.py
@@ -9,8 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare._utils import parse_datetime
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.zero_trust.access import (
     ApplicationGetResponse,
     ApplicationListResponse,
@@ -43,11 +42,8 @@ def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> N
             type="self_hosted",
             account_id="account_id",
             allow_authenticate_via_warp=True,
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allow_iframe=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             app_launcher_visible=True,
             auto_redirect_to_identity=True,
             cors_headers={
@@ -55,7 +51,7 @@ def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> N
                 "allow_all_methods": True,
                 "allow_all_origins": True,
                 "allow_credentials": True,
-                "allowed_headers": ["string", "string", "string"],
+                "allowed_headers": ["string"],
                 "allowed_methods": ["GET"],
                 "allowed_origins": ["https://example.com"],
                 "max_age": -1,
@@ -63,10 +59,44 @@ def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> N
             custom_deny_message="custom_deny_message",
             custom_deny_url="custom_deny_url",
             custom_non_identity_deny_url="custom_non_identity_deny_url",
-            custom_pages=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            destinations=[
+                {
+                    "type": "public",
+                    "uri": "test.example.com/admin",
+                },
+                {
+                    "type": "public",
+                    "uri": "test.anotherexample.com/staff",
+                },
+                {
+                    "cidr": "10.5.0.0/24",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80-90",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "10.5.0.3/32",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "cidr",
+                    "hostname": "private-sni.example.com",
+                    "l4_protocol": "tcp",
+                    "port_range": "port_range",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "mcp_server_id": "mcp-server-1",
+                    "type": "via_mcp_server_portal",
+                },
             ],
             enable_binding_cookie=True,
             http_only_cookie_attribute=True,
@@ -78,18 +108,13 @@ def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> N
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
+            read_service_tokens_from_header="Authorization",
             same_site_cookie_attribute="strict",
             scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
                 "authentication": {
                     "password": "password",
                     "scheme": "httpbasic",
@@ -97,31 +122,9 @@ def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> N
                 },
                 "deactivate_on_delete": True,
                 "enabled": True,
-                "idp_uid": "idp_uid",
                 "mappings": [
                     {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
                         "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
                         "enabled": True,
                         "filter": 'title pr or userType eq "Intern"',
                         "operations": {
@@ -129,17 +132,17 @@ def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> N
                             "delete": True,
                             "update": True,
                         },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "strictness": "strict",
                         "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
+                    }
                 ],
-                "remote_uri": "remote_uri",
             },
             self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
             service_auth_401_redirect=True,
             session_duration="24h",
             skip_interstitial=True,
-            tags=["engineers", "engineers", "engineers"],
+            tags=["engineers"],
+            use_clientless_isolation_app_launcher_url=False,
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
@@ -176,14 +179,14 @@ def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.create(
                 domain="test.example.com/admin",
                 type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.create(
                 domain="test.example.com/admin",
                 type="self_hosted",
@@ -203,51 +206,38 @@ def test_method_create_overload_2(self, client: Cloudflare) -> None:
     def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.create(
             account_id="account_id",
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             app_launcher_visible=True,
             auto_redirect_to_identity=True,
-            custom_pages=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
             logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
             name="Admin Site",
             policies=[
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
             saas_app={
                 "auth_type": "saml",
                 "consumer_service_url": "https://example.com",
-                "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-                "custom_attributes": {
-                    "friendly_name": "Last Name",
-                    "name": "family_name",
-                    "name_format": "urn:oasis:names:tc:SAML:2.0:attrname-format:basic",
-                    "required": True,
-                    "source": {
-                        "name": "last_name",
-                        "name_by_idp": {
-                            "exampleIdPID1": "AttributeName1",
-                            "exampleIdPID2": "AttributeName2",
+                "custom_attributes": [
+                    {
+                        "friendly_name": "Last Name",
+                        "name": "family_name",
+                        "name_format": "urn:oasis:names:tc:SAML:2.0:attrname-format:basic",
+                        "required": True,
+                        "source": {
+                            "name": "last_name",
+                            "name_by_idp": [
+                                {
+                                    "idp_id": "exampleIdPID1",
+                                    "source_name": "AttributeName1",
+                                }
+                            ],
                         },
-                    },
-                },
+                    }
+                ],
                 "default_relay_state": "https://example.com",
                 "idp_entity_id": "https://example.cloudflareaccess.com",
                 "name_id_format": "id",
@@ -256,9 +246,10 @@ def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> N
                 "saml_attribute_transform_jsonata": "$ ~>| groups | {'group_name': name} |",
                 "sp_entity_id": "example unique name",
                 "sso_endpoint": "https://example.cloudflareaccess.com/cdn-cgi/access/sso/saml/b3f58a2b414e0b51d45c8c2af26fccca0e27c63763c426fa52f98dcf0b3b3bfd",
-                "updated_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
             },
             scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
                 "authentication": {
                     "password": "password",
                     "scheme": "httpbasic",
@@ -266,31 +257,9 @@ def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> N
                 },
                 "deactivate_on_delete": True,
                 "enabled": True,
-                "idp_uid": "idp_uid",
                 "mappings": [
                     {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
                         "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
                         "enabled": True,
                         "filter": 'title pr or userType eq "Intern"',
                         "operations": {
@@ -298,13 +267,12 @@ def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> N
                             "delete": True,
                             "update": True,
                         },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "strictness": "strict",
                         "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
+                    }
                 ],
-                "remote_uri": "remote_uri",
             },
-            tags=["engineers", "engineers", "engineers"],
+            tags=["engineers"],
             type="saas",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
@@ -338,12 +306,12 @@ def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.create(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.create(
                 account_id="account_id",
             )
@@ -353,7 +321,7 @@ def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
     def test_method_create_overload_3(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.create(
             domain="test.example.com/admin",
-            type="ssh",
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
@@ -363,14 +331,11 @@ def test_method_create_overload_3(self, client: Cloudflare) -> None:
     def test_method_create_with_all_params_overload_3(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.create(
             domain="test.example.com/admin",
-            type="ssh",
+            type="self_hosted",
             account_id="account_id",
             allow_authenticate_via_warp=True,
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allow_iframe=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             app_launcher_visible=True,
             auto_redirect_to_identity=True,
             cors_headers={
@@ -378,7 +343,7 @@ def test_method_create_with_all_params_overload_3(self, client: Cloudflare) -> N
                 "allow_all_methods": True,
                 "allow_all_origins": True,
                 "allow_credentials": True,
-                "allowed_headers": ["string", "string", "string"],
+                "allowed_headers": ["string"],
                 "allowed_methods": ["GET"],
                 "allowed_origins": ["https://example.com"],
                 "max_age": -1,
@@ -386,10 +351,44 @@ def test_method_create_with_all_params_overload_3(self, client: Cloudflare) -> N
             custom_deny_message="custom_deny_message",
             custom_deny_url="custom_deny_url",
             custom_non_identity_deny_url="custom_non_identity_deny_url",
-            custom_pages=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            destinations=[
+                {
+                    "type": "public",
+                    "uri": "test.example.com/admin",
+                },
+                {
+                    "type": "public",
+                    "uri": "test.anotherexample.com/staff",
+                },
+                {
+                    "cidr": "10.5.0.0/24",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80-90",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "10.5.0.3/32",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "cidr",
+                    "hostname": "private-sni.example.com",
+                    "l4_protocol": "tcp",
+                    "port_range": "port_range",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "mcp_server_id": "mcp-server-1",
+                    "type": "via_mcp_server_portal",
+                },
             ],
             enable_binding_cookie=True,
             http_only_cookie_attribute=True,
@@ -401,18 +400,13 @@ def test_method_create_with_all_params_overload_3(self, client: Cloudflare) -> N
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
+            read_service_tokens_from_header="Authorization",
             same_site_cookie_attribute="strict",
             scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
                 "authentication": {
                     "password": "password",
                     "scheme": "httpbasic",
@@ -420,31 +414,9 @@ def test_method_create_with_all_params_overload_3(self, client: Cloudflare) -> N
                 },
                 "deactivate_on_delete": True,
                 "enabled": True,
-                "idp_uid": "idp_uid",
                 "mappings": [
                     {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
                         "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
                         "enabled": True,
                         "filter": 'title pr or userType eq "Intern"',
                         "operations": {
@@ -452,17 +424,17 @@ def test_method_create_with_all_params_overload_3(self, client: Cloudflare) -> N
                             "delete": True,
                             "update": True,
                         },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "strictness": "strict",
                         "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
+                    }
                 ],
-                "remote_uri": "remote_uri",
             },
             self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
             service_auth_401_redirect=True,
             session_duration="24h",
             skip_interstitial=True,
-            tags=["engineers", "engineers", "engineers"],
+            tags=["engineers"],
+            use_clientless_isolation_app_launcher_url=False,
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
@@ -471,7 +443,7 @@ def test_method_create_with_all_params_overload_3(self, client: Cloudflare) -> N
     def test_raw_response_create_overload_3(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.applications.with_raw_response.create(
             domain="test.example.com/admin",
-            type="ssh",
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -485,7 +457,7 @@ def test_raw_response_create_overload_3(self, client: Cloudflare) -> None:
     def test_streaming_response_create_overload_3(self, client: Cloudflare) -> None:
         with client.zero_trust.access.applications.with_streaming_response.create(
             domain="test.example.com/admin",
-            type="ssh",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -499,17 +471,17 @@ def test_streaming_response_create_overload_3(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_3(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.create(
                 domain="test.example.com/admin",
-                type="ssh",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.create(
                 domain="test.example.com/admin",
-                type="ssh",
+                type="self_hosted",
                 account_id="account_id",
             )
 
@@ -518,7 +490,7 @@ def test_path_params_create_overload_3(self, client: Cloudflare) -> None:
     def test_method_create_overload_4(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.create(
             domain="test.example.com/admin",
-            type="vnc",
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
@@ -528,14 +500,11 @@ def test_method_create_overload_4(self, client: Cloudflare) -> None:
     def test_method_create_with_all_params_overload_4(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.create(
             domain="test.example.com/admin",
-            type="vnc",
+            type="self_hosted",
             account_id="account_id",
             allow_authenticate_via_warp=True,
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allow_iframe=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             app_launcher_visible=True,
             auto_redirect_to_identity=True,
             cors_headers={
@@ -543,7 +512,7 @@ def test_method_create_with_all_params_overload_4(self, client: Cloudflare) -> N
                 "allow_all_methods": True,
                 "allow_all_origins": True,
                 "allow_credentials": True,
-                "allowed_headers": ["string", "string", "string"],
+                "allowed_headers": ["string"],
                 "allowed_methods": ["GET"],
                 "allowed_origins": ["https://example.com"],
                 "max_age": -1,
@@ -551,10 +520,44 @@ def test_method_create_with_all_params_overload_4(self, client: Cloudflare) -> N
             custom_deny_message="custom_deny_message",
             custom_deny_url="custom_deny_url",
             custom_non_identity_deny_url="custom_non_identity_deny_url",
-            custom_pages=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            destinations=[
+                {
+                    "type": "public",
+                    "uri": "test.example.com/admin",
+                },
+                {
+                    "type": "public",
+                    "uri": "test.anotherexample.com/staff",
+                },
+                {
+                    "cidr": "10.5.0.0/24",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80-90",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "10.5.0.3/32",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "cidr",
+                    "hostname": "private-sni.example.com",
+                    "l4_protocol": "tcp",
+                    "port_range": "port_range",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "mcp_server_id": "mcp-server-1",
+                    "type": "via_mcp_server_portal",
+                },
             ],
             enable_binding_cookie=True,
             http_only_cookie_attribute=True,
@@ -566,18 +569,13 @@ def test_method_create_with_all_params_overload_4(self, client: Cloudflare) -> N
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
+            read_service_tokens_from_header="Authorization",
             same_site_cookie_attribute="strict",
             scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
                 "authentication": {
                     "password": "password",
                     "scheme": "httpbasic",
@@ -585,31 +583,9 @@ def test_method_create_with_all_params_overload_4(self, client: Cloudflare) -> N
                 },
                 "deactivate_on_delete": True,
                 "enabled": True,
-                "idp_uid": "idp_uid",
                 "mappings": [
                     {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
                         "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
                         "enabled": True,
                         "filter": 'title pr or userType eq "Intern"',
                         "operations": {
@@ -617,17 +593,17 @@ def test_method_create_with_all_params_overload_4(self, client: Cloudflare) -> N
                             "delete": True,
                             "update": True,
                         },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "strictness": "strict",
                         "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
+                    }
                 ],
-                "remote_uri": "remote_uri",
             },
             self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
             service_auth_401_redirect=True,
             session_duration="24h",
             skip_interstitial=True,
-            tags=["engineers", "engineers", "engineers"],
+            tags=["engineers"],
+            use_clientless_isolation_app_launcher_url=False,
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
@@ -636,7 +612,7 @@ def test_method_create_with_all_params_overload_4(self, client: Cloudflare) -> N
     def test_raw_response_create_overload_4(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.applications.with_raw_response.create(
             domain="test.example.com/admin",
-            type="vnc",
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -650,7 +626,7 @@ def test_raw_response_create_overload_4(self, client: Cloudflare) -> None:
     def test_streaming_response_create_overload_4(self, client: Cloudflare) -> None:
         with client.zero_trust.access.applications.with_streaming_response.create(
             domain="test.example.com/admin",
-            type="vnc",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -664,17 +640,17 @@ def test_streaming_response_create_overload_4(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_4(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.create(
                 domain="test.example.com/admin",
-                type="vnc",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.create(
                 domain="test.example.com/admin",
-                type="vnc",
+                type="self_hosted",
                 account_id="account_id",
             )
 
@@ -682,7 +658,7 @@ def test_path_params_create_overload_4(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_create_overload_5(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.create(
-            type="app_launcher",
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
@@ -691,75 +667,37 @@ def test_method_create_overload_5(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_create_with_all_params_overload_5(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.create(
-            type="app_launcher",
+            type="self_hosted",
             account_id="account_id",
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
+            app_launcher_logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
             auto_redirect_to_identity=True,
-            policies=[
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+            bg_color="#ff0000",
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            footer_links=[
                 {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                    "name": "Cloudflare's Privacy Policy",
+                    "url": "https://www.cloudflare.com/privacypolicy/",
+                }
+            ],
+            header_bg_color="#ff0000",
+            landing_page_design={
+                "button_color": "#ff0000",
+                "button_text_color": "#ff0000",
+                "image_url": "https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
+                "message": "Log in below to reach your applications behind Access.",
+                "title": "Welcome back!",
+            },
+            policies=[
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
+                }
             ],
-            scim_config={
-                "authentication": {
-                    "password": "password",
-                    "scheme": "httpbasic",
-                    "user": "user",
-                },
-                "deactivate_on_delete": True,
-                "enabled": True,
-                "idp_uid": "idp_uid",
-                "mappings": [
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                ],
-                "remote_uri": "remote_uri",
-            },
             session_duration="24h",
+            skip_app_launcher_login_page=True,
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
@@ -767,7 +705,7 @@ def test_method_create_with_all_params_overload_5(self, client: Cloudflare) -> N
     @parametrize
     def test_raw_response_create_overload_5(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.applications.with_raw_response.create(
-            type="app_launcher",
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -780,7 +718,7 @@ def test_raw_response_create_overload_5(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create_overload_5(self, client: Cloudflare) -> None:
         with client.zero_trust.access.applications.with_streaming_response.create(
-            type="app_launcher",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -794,15 +732,15 @@ def test_streaming_response_create_overload_5(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_5(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.create(
-                type="app_launcher",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.create(
-                type="app_launcher",
+                type="self_hosted",
                 account_id="account_id",
             )
 
@@ -810,7 +748,7 @@ def test_path_params_create_overload_5(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_create_overload_6(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.create(
-            type="warp",
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
@@ -819,74 +757,19 @@ def test_method_create_overload_6(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_create_with_all_params_overload_6(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.create(
-            type="warp",
+            type="self_hosted",
             account_id="account_id",
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             auto_redirect_to_identity=True,
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
             policies=[
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
-            scim_config={
-                "authentication": {
-                    "password": "password",
-                    "scheme": "httpbasic",
-                    "user": "user",
-                },
-                "deactivate_on_delete": True,
-                "enabled": True,
-                "idp_uid": "idp_uid",
-                "mappings": [
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                ],
-                "remote_uri": "remote_uri",
-            },
             session_duration="24h",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
@@ -895,7 +778,7 @@ def test_method_create_with_all_params_overload_6(self, client: Cloudflare) -> N
     @parametrize
     def test_raw_response_create_overload_6(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.applications.with_raw_response.create(
-            type="warp",
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -908,7 +791,7 @@ def test_raw_response_create_overload_6(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create_overload_6(self, client: Cloudflare) -> None:
         with client.zero_trust.access.applications.with_streaming_response.create(
-            type="warp",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -922,15 +805,15 @@ def test_streaming_response_create_overload_6(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_6(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.create(
-                type="warp",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.create(
-                type="warp",
+                type="self_hosted",
                 account_id="account_id",
             )
 
@@ -938,7 +821,7 @@ def test_path_params_create_overload_6(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_create_overload_7(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.create(
-            type="biso",
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
@@ -947,74 +830,19 @@ def test_method_create_overload_7(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_create_with_all_params_overload_7(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.create(
-            type="biso",
+            type="self_hosted",
             account_id="account_id",
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             auto_redirect_to_identity=True,
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
             policies=[
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
-            scim_config={
-                "authentication": {
-                    "password": "password",
-                    "scheme": "httpbasic",
-                    "user": "user",
-                },
-                "deactivate_on_delete": True,
-                "enabled": True,
-                "idp_uid": "idp_uid",
-                "mappings": [
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                ],
-                "remote_uri": "remote_uri",
-            },
             session_duration="24h",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
@@ -1023,7 +851,7 @@ def test_method_create_with_all_params_overload_7(self, client: Cloudflare) -> N
     @parametrize
     def test_raw_response_create_overload_7(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.applications.with_raw_response.create(
-            type="biso",
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -1036,7 +864,7 @@ def test_raw_response_create_overload_7(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create_overload_7(self, client: Cloudflare) -> None:
         with client.zero_trust.access.applications.with_streaming_response.create(
-            type="biso",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -1050,15 +878,15 @@ def test_streaming_response_create_overload_7(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_7(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.create(
-                type="biso",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.create(
-                type="biso",
+                type="self_hosted",
                 account_id="account_id",
             )
 
@@ -1066,6 +894,7 @@ def test_path_params_create_overload_7(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_create_overload_8(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.create(
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
@@ -1074,59 +903,22 @@ def test_method_create_overload_8(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_create_with_all_params_overload_8(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.create(
+            type="self_hosted",
             account_id="account_id",
-            app_launcher_visible=True,
-            domain="https://mybookmark.com",
-            logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
-            name="Admin Site",
-            scim_config={
-                "authentication": {
-                    "password": "password",
-                    "scheme": "httpbasic",
-                    "user": "user",
-                },
-                "deactivate_on_delete": True,
-                "enabled": True,
-                "idp_uid": "idp_uid",
-                "mappings": [
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                ],
-                "remote_uri": "remote_uri",
-            },
-            tags=["engineers", "engineers", "engineers"],
-            type="bookmark",
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
+            auto_redirect_to_identity=True,
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            domain="abcd123456.proxy.cloudflare-gateway.com",
+            name="Gateway Proxy",
+            policies=[
+                {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    "precedence": 0,
+                }
+            ],
+            session_duration="24h",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
@@ -1134,6 +926,7 @@ def test_method_create_with_all_params_overload_8(self, client: Cloudflare) -> N
     @parametrize
     def test_raw_response_create_overload_8(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.applications.with_raw_response.create(
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -1146,6 +939,7 @@ def test_raw_response_create_overload_8(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create_overload_8(self, client: Cloudflare) -> None:
         with client.zero_trust.access.applications.with_streaming_response.create(
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -1159,376 +953,238 @@ def test_streaming_response_create_overload_8(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_8(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.create(
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.create(
+                type="self_hosted",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_overload_1(self, client: Cloudflare) -> None:
-        application = client.zero_trust.access.applications.update(
-            app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            domain="test.example.com/admin",
-            type="self_hosted",
+    def test_method_create_overload_9(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.create(
             account_id="account_id",
         )
-        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_with_all_params_overload_1(self, client: Cloudflare) -> None:
-        application = client.zero_trust.access.applications.update(
-            app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            domain="test.example.com/admin",
-            type="self_hosted",
+    def test_method_create_with_all_params_overload_9(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.create(
             account_id="account_id",
-            allow_authenticate_via_warp=True,
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
             app_launcher_visible=True,
-            auto_redirect_to_identity=True,
-            cors_headers={
-                "allow_all_headers": True,
-                "allow_all_methods": True,
-                "allow_all_origins": True,
-                "allow_credentials": True,
-                "allowed_headers": ["string", "string", "string"],
-                "allowed_methods": ["GET"],
-                "allowed_origins": ["https://example.com"],
-                "max_age": -1,
-            },
-            custom_deny_message="custom_deny_message",
-            custom_deny_url="custom_deny_url",
-            custom_non_identity_deny_url="custom_non_identity_deny_url",
-            custom_pages=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
-            enable_binding_cookie=True,
-            http_only_cookie_attribute=True,
+            domain="https://mybookmark.com",
             logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
             name="Admin Site",
-            options_preflight_bypass=True,
-            path_cookie_attribute=True,
             policies=[
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
-            same_site_cookie_attribute="strict",
-            scim_config={
-                "authentication": {
-                    "password": "password",
-                    "scheme": "httpbasic",
-                    "user": "user",
-                },
-                "deactivate_on_delete": True,
-                "enabled": True,
-                "idp_uid": "idp_uid",
-                "mappings": [
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                ],
-                "remote_uri": "remote_uri",
-            },
-            self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
-            service_auth_401_redirect=True,
-            session_duration="24h",
-            skip_interstitial=True,
-            tags=["engineers", "engineers", "engineers"],
+            tags=["engineers"],
+            type="bookmark",
         )
-        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_raw_response_update_overload_1(self, client: Cloudflare) -> None:
-        response = client.zero_trust.access.applications.with_raw_response.update(
-            app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            domain="test.example.com/admin",
-            type="self_hosted",
+    def test_raw_response_create_overload_9(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.applications.with_raw_response.create(
             account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         application = response.parse()
-        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_streaming_response_update_overload_1(self, client: Cloudflare) -> None:
-        with client.zero_trust.access.applications.with_streaming_response.update(
-            app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            domain="test.example.com/admin",
-            type="self_hosted",
+    def test_streaming_response_create_overload_9(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.applications.with_streaming_response.create(
             account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             application = response.parse()
-            assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+            assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_path_params_update_overload_1(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.access.applications.with_raw_response.update(
-                app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                domain="test.example.com/admin",
-                type="self_hosted",
+    def test_path_params_create_overload_9(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.create(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zero_trust.access.applications.with_raw_response.update(
-                app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                domain="test.example.com/admin",
-                type="self_hosted",
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.create(
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_overload_2(self, client: Cloudflare) -> None:
-        application = client.zero_trust.access.applications.update(
-            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+    def test_method_create_overload_10(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.create(
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "SSH",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="infrastructure",
             account_id="account_id",
         )
-        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_with_all_params_overload_2(self, client: Cloudflare) -> None:
-        application = client.zero_trust.access.applications.update(
-            app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            account_id="account_id",
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
-            app_launcher_visible=True,
-            auto_redirect_to_identity=True,
-            custom_pages=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
+    def test_method_create_with_all_params_overload_10(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.create(
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "SSH",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
             ],
-            logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
+            type="infrastructure",
+            account_id="account_id",
             name="Admin Site",
             policies=[
                 {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-            ],
-            saas_app={
-                "auth_type": "saml",
-                "consumer_service_url": "https://example.com",
-                "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-                "custom_attributes": {
-                    "friendly_name": "Last Name",
-                    "name": "family_name",
-                    "name_format": "urn:oasis:names:tc:SAML:2.0:attrname-format:basic",
-                    "required": True,
-                    "source": {
-                        "name": "last_name",
-                        "name_by_idp": {
-                            "exampleIdPID1": "AttributeName1",
-                            "exampleIdPID2": "AttributeName2",
-                        },
-                    },
-                },
-                "default_relay_state": "https://example.com",
-                "idp_entity_id": "https://example.cloudflareaccess.com",
-                "name_id_format": "id",
-                "name_id_transform_jsonata": "$substringBefore(email, '@') & '+sandbox@' & $substringAfter(email, '@')",
-                "public_key": "example unique name",
-                "saml_attribute_transform_jsonata": "$ ~>| groups | {'group_name': name} |",
-                "sp_entity_id": "example unique name",
-                "sso_endpoint": "https://example.cloudflareaccess.com/cdn-cgi/access/sso/saml/b3f58a2b414e0b51d45c8c2af26fccca0e27c63763c426fa52f98dcf0b3b3bfd",
-                "updated_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-            },
-            scim_config={
-                "authentication": {
-                    "password": "password",
-                    "scheme": "httpbasic",
-                    "user": "user",
-                },
-                "deactivate_on_delete": True,
-                "enabled": True,
-                "idp_uid": "idp_uid",
-                "mappings": [
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
+                    "decision": "allow",
+                    "include": [{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
+                    "name": "Allow devs",
+                    "connection_rules": {
+                        "ssh": {
+                            "usernames": ["root", "ubuntu"],
+                            "allow_email_alias": True,
+                        }
                     },
-                ],
-                "remote_uri": "remote_uri",
-            },
-            tags=["engineers", "engineers", "engineers"],
-            type="saas",
+                    "exclude": [{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
+                    "require": [{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
+                }
+            ],
         )
-        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_raw_response_update_overload_2(self, client: Cloudflare) -> None:
-        response = client.zero_trust.access.applications.with_raw_response.update(
-            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+    def test_raw_response_create_overload_10(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.applications.with_raw_response.create(
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "SSH",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="infrastructure",
             account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         application = response.parse()
-        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_streaming_response_update_overload_2(self, client: Cloudflare) -> None:
-        with client.zero_trust.access.applications.with_streaming_response.update(
-            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+    def test_streaming_response_create_overload_10(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.applications.with_streaming_response.create(
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "SSH",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="infrastructure",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             application = response.parse()
-            assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+            assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.access.applications.with_raw_response.update(
-                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+    def test_path_params_create_overload_10(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.create(
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "SSH",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="infrastructure",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zero_trust.access.applications.with_raw_response.update(
-                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.create(
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "SSH",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="infrastructure",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_overload_3(self, client: Cloudflare) -> None:
-        application = client.zero_trust.access.applications.update(
-            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+    def test_method_create_overload_11(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.create(
             domain="test.example.com/admin",
-            type="ssh",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "RDP",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="self_hosted",
             account_id="account_id",
         )
-        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_with_all_params_overload_3(self, client: Cloudflare) -> None:
-        application = client.zero_trust.access.applications.update(
-            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+    def test_method_create_with_all_params_overload_11(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.create(
             domain="test.example.com/admin",
-            type="ssh",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "RDP",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="self_hosted",
             account_id="account_id",
             allow_authenticate_via_warp=True,
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allow_iframe=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             app_launcher_visible=True,
             auto_redirect_to_identity=True,
             cors_headers={
@@ -1536,7 +1192,7 @@ def test_method_update_with_all_params_overload_3(self, client: Cloudflare) -> N
                 "allow_all_methods": True,
                 "allow_all_origins": True,
                 "allow_credentials": True,
-                "allowed_headers": ["string", "string", "string"],
+                "allowed_headers": ["string"],
                 "allowed_methods": ["GET"],
                 "allowed_origins": ["https://example.com"],
                 "max_age": -1,
@@ -1544,10 +1200,44 @@ def test_method_update_with_all_params_overload_3(self, client: Cloudflare) -> N
             custom_deny_message="custom_deny_message",
             custom_deny_url="custom_deny_url",
             custom_non_identity_deny_url="custom_non_identity_deny_url",
-            custom_pages=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            destinations=[
+                {
+                    "type": "public",
+                    "uri": "test.example.com/admin",
+                },
+                {
+                    "type": "public",
+                    "uri": "test.anotherexample.com/staff",
+                },
+                {
+                    "cidr": "10.5.0.0/24",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80-90",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "10.5.0.3/32",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "cidr",
+                    "hostname": "private-sni.example.com",
+                    "l4_protocol": "tcp",
+                    "port_range": "port_range",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "mcp_server_id": "mcp-server-1",
+                    "type": "via_mcp_server_portal",
+                },
             ],
             enable_binding_cookie=True,
             http_only_cookie_attribute=True,
@@ -1559,18 +1249,13 @@ def test_method_update_with_all_params_overload_3(self, client: Cloudflare) -> N
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
+            read_service_tokens_from_header="Authorization",
             same_site_cookie_attribute="strict",
             scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
                 "authentication": {
                     "password": "password",
                     "scheme": "httpbasic",
@@ -1578,20 +1263,9 @@ def test_method_update_with_all_params_overload_3(self, client: Cloudflare) -> N
                 },
                 "deactivate_on_delete": True,
                 "enabled": True,
-                "idp_uid": "idp_uid",
                 "mappings": [
                     {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
                         "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
                         "enabled": True,
                         "filter": 'title pr or userType eq "Intern"',
                         "operations": {
@@ -1599,107 +1273,117 @@ def test_method_update_with_all_params_overload_3(self, client: Cloudflare) -> N
                             "delete": True,
                             "update": True,
                         },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "strictness": "strict",
                         "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
+                    }
                 ],
-                "remote_uri": "remote_uri",
             },
             self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
             service_auth_401_redirect=True,
             session_duration="24h",
             skip_interstitial=True,
-            tags=["engineers", "engineers", "engineers"],
+            tags=["engineers"],
+            use_clientless_isolation_app_launcher_url=False,
         )
-        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_raw_response_update_overload_3(self, client: Cloudflare) -> None:
-        response = client.zero_trust.access.applications.with_raw_response.update(
-            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+    def test_raw_response_create_overload_11(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.applications.with_raw_response.create(
             domain="test.example.com/admin",
-            type="ssh",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "RDP",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="self_hosted",
             account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         application = response.parse()
-        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_streaming_response_update_overload_3(self, client: Cloudflare) -> None:
-        with client.zero_trust.access.applications.with_streaming_response.update(
-            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+    def test_streaming_response_create_overload_11(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.applications.with_streaming_response.create(
             domain="test.example.com/admin",
-            type="ssh",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "RDP",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             application = response.parse()
-            assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+            assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_path_params_update_overload_3(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.access.applications.with_raw_response.update(
-                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+    def test_path_params_create_overload_11(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.create(
                 domain="test.example.com/admin",
-                type="ssh",
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "RDP",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zero_trust.access.applications.with_raw_response.update(
-                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.create(
                 domain="test.example.com/admin",
-                type="ssh",
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "RDP",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="self_hosted",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_overload_4(self, client: Cloudflare) -> None:
+    def test_method_update_overload_1(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
             domain="test.example.com/admin",
-            type="vnc",
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_with_all_params_overload_4(self, client: Cloudflare) -> None:
+    def test_method_update_with_all_params_overload_1(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
             domain="test.example.com/admin",
-            type="vnc",
+            type="self_hosted",
             account_id="account_id",
             allow_authenticate_via_warp=True,
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allow_iframe=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             app_launcher_visible=True,
             auto_redirect_to_identity=True,
             cors_headers={
@@ -1707,7 +1391,7 @@ def test_method_update_with_all_params_overload_4(self, client: Cloudflare) -> N
                 "allow_all_methods": True,
                 "allow_all_origins": True,
                 "allow_credentials": True,
-                "allowed_headers": ["string", "string", "string"],
+                "allowed_headers": ["string"],
                 "allowed_methods": ["GET"],
                 "allowed_origins": ["https://example.com"],
                 "max_age": -1,
@@ -1715,10 +1399,44 @@ def test_method_update_with_all_params_overload_4(self, client: Cloudflare) -> N
             custom_deny_message="custom_deny_message",
             custom_deny_url="custom_deny_url",
             custom_non_identity_deny_url="custom_non_identity_deny_url",
-            custom_pages=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            destinations=[
+                {
+                    "type": "public",
+                    "uri": "test.example.com/admin",
+                },
+                {
+                    "type": "public",
+                    "uri": "test.anotherexample.com/staff",
+                },
+                {
+                    "cidr": "10.5.0.0/24",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80-90",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "10.5.0.3/32",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "cidr",
+                    "hostname": "private-sni.example.com",
+                    "l4_protocol": "tcp",
+                    "port_range": "port_range",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "mcp_server_id": "mcp-server-1",
+                    "type": "via_mcp_server_portal",
+                },
             ],
             enable_binding_cookie=True,
             http_only_cookie_attribute=True,
@@ -1730,18 +1448,13 @@ def test_method_update_with_all_params_overload_4(self, client: Cloudflare) -> N
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
+            read_service_tokens_from_header="Authorization",
             same_site_cookie_attribute="strict",
             scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
                 "authentication": {
                     "password": "password",
                     "scheme": "httpbasic",
@@ -1749,31 +1462,9 @@ def test_method_update_with_all_params_overload_4(self, client: Cloudflare) -> N
                 },
                 "deactivate_on_delete": True,
                 "enabled": True,
-                "idp_uid": "idp_uid",
                 "mappings": [
                     {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
                         "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
                         "enabled": True,
                         "filter": 'title pr or userType eq "Intern"',
                         "operations": {
@@ -1781,27 +1472,27 @@ def test_method_update_with_all_params_overload_4(self, client: Cloudflare) -> N
                             "delete": True,
                             "update": True,
                         },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "strictness": "strict",
                         "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
+                    }
                 ],
-                "remote_uri": "remote_uri",
             },
             self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
             service_auth_401_redirect=True,
             session_duration="24h",
             skip_interstitial=True,
-            tags=["engineers", "engineers", "engineers"],
+            tags=["engineers"],
+            use_clientless_isolation_app_launcher_url=False,
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_raw_response_update_overload_4(self, client: Cloudflare) -> None:
+    def test_raw_response_update_overload_1(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.applications.with_raw_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
             domain="test.example.com/admin",
-            type="vnc",
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -1812,11 +1503,11 @@ def test_raw_response_update_overload_4(self, client: Cloudflare) -> None:
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_streaming_response_update_overload_4(self, client: Cloudflare) -> None:
+    def test_streaming_response_update_overload_1(self, client: Cloudflare) -> None:
         with client.zero_trust.access.applications.with_streaming_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
             domain="test.example.com/admin",
-            type="vnc",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -1829,61 +1520,90 @@ def test_streaming_response_update_overload_4(self, client: Cloudflare) -> None:
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_path_params_update_overload_4(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    def test_path_params_update_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                domain="test.example.com/admin",
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 domain="test.example.com/admin",
-                type="vnc",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 domain="test.example.com/admin",
-                type="vnc",
+                type="self_hosted",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_overload_5(self, client: Cloudflare) -> None:
+    def test_method_update_overload_2(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="app_launcher",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_with_all_params_overload_5(self, client: Cloudflare) -> None:
+    def test_method_update_with_all_params_overload_2(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="app_launcher",
             account_id="account_id",
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
+            app_launcher_visible=True,
             auto_redirect_to_identity=True,
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
+            name="Admin Site",
             policies=[
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
+            saas_app={
+                "auth_type": "saml",
+                "consumer_service_url": "https://example.com",
+                "custom_attributes": [
+                    {
+                        "friendly_name": "Last Name",
+                        "name": "family_name",
+                        "name_format": "urn:oasis:names:tc:SAML:2.0:attrname-format:basic",
+                        "required": True,
+                        "source": {
+                            "name": "last_name",
+                            "name_by_idp": [
+                                {
+                                    "idp_id": "exampleIdPID1",
+                                    "source_name": "AttributeName1",
+                                }
+                            ],
+                        },
+                    }
+                ],
+                "default_relay_state": "https://example.com",
+                "idp_entity_id": "https://example.cloudflareaccess.com",
+                "name_id_format": "id",
+                "name_id_transform_jsonata": "$substringBefore(email, '@') & '+sandbox@' & $substringAfter(email, '@')",
+                "public_key": "example unique name",
+                "saml_attribute_transform_jsonata": "$ ~>| groups | {'group_name': name} |",
+                "sp_entity_id": "example unique name",
+                "sso_endpoint": "https://example.cloudflareaccess.com/cdn-cgi/access/sso/saml/b3f58a2b414e0b51d45c8c2af26fccca0e27c63763c426fa52f98dcf0b3b3bfd",
+            },
             scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
                 "authentication": {
                     "password": "password",
                     "scheme": "httpbasic",
@@ -1891,31 +1611,9 @@ def test_method_update_with_all_params_overload_5(self, client: Cloudflare) -> N
                 },
                 "deactivate_on_delete": True,
                 "enabled": True,
-                "idp_uid": "idp_uid",
                 "mappings": [
                     {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
                         "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
                         "enabled": True,
                         "filter": 'title pr or userType eq "Intern"',
                         "operations": {
@@ -1923,22 +1621,21 @@ def test_method_update_with_all_params_overload_5(self, client: Cloudflare) -> N
                             "delete": True,
                             "update": True,
                         },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "strictness": "strict",
                         "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
+                    }
                 ],
-                "remote_uri": "remote_uri",
             },
-            session_duration="24h",
+            tags=["engineers"],
+            type="saas",
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_raw_response_update_overload_5(self, client: Cloudflare) -> None:
+    def test_raw_response_update_overload_2(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.applications.with_raw_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="app_launcher",
             account_id="account_id",
         )
 
@@ -1949,10 +1646,9 @@ def test_raw_response_update_overload_5(self, client: Cloudflare) -> None:
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_streaming_response_update_overload_5(self, client: Cloudflare) -> None:
+    def test_streaming_response_update_overload_2(self, client: Cloudflare) -> None:
         with client.zero_trust.access.applications.with_streaming_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="app_launcher",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -1965,59 +1661,118 @@ def test_streaming_response_update_overload_5(self, client: Cloudflare) -> None:
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_path_params_update_overload_5(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                type="app_launcher",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                type="app_launcher",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_overload_6(self, client: Cloudflare) -> None:
+    def test_method_update_overload_3(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="warp",
+            domain="test.example.com/admin",
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_with_all_params_overload_6(self, client: Cloudflare) -> None:
+    def test_method_update_with_all_params_overload_3(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="warp",
+            domain="test.example.com/admin",
+            type="self_hosted",
             account_id="account_id",
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allow_authenticate_via_warp=True,
+            allow_iframe=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
+            app_launcher_visible=True,
             auto_redirect_to_identity=True,
-            policies=[
+            cors_headers={
+                "allow_all_headers": True,
+                "allow_all_methods": True,
+                "allow_all_origins": True,
+                "allow_credentials": True,
+                "allowed_headers": ["string"],
+                "allowed_methods": ["GET"],
+                "allowed_origins": ["https://example.com"],
+                "max_age": -1,
+            },
+            custom_deny_message="custom_deny_message",
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            destinations=[
                 {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
+                    "type": "public",
+                    "uri": "test.example.com/admin",
                 },
                 {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
+                    "type": "public",
+                    "uri": "test.anotherexample.com/staff",
+                },
+                {
+                    "cidr": "10.5.0.0/24",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80-90",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "10.5.0.3/32",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "cidr",
+                    "hostname": "private-sni.example.com",
+                    "l4_protocol": "tcp",
+                    "port_range": "port_range",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "mcp_server_id": "mcp-server-1",
+                    "type": "via_mcp_server_portal",
                 },
+            ],
+            enable_binding_cookie=True,
+            http_only_cookie_attribute=True,
+            logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
+            name="Admin Site",
+            options_preflight_bypass=True,
+            path_cookie_attribute=True,
+            policies=[
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
+                }
             ],
+            read_service_tokens_from_header="Authorization",
+            same_site_cookie_attribute="strict",
             scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
                 "authentication": {
                     "password": "password",
                     "scheme": "httpbasic",
@@ -2025,31 +1780,9 @@ def test_method_update_with_all_params_overload_6(self, client: Cloudflare) -> N
                 },
                 "deactivate_on_delete": True,
                 "enabled": True,
-                "idp_uid": "idp_uid",
                 "mappings": [
                     {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
                         "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
                         "enabled": True,
                         "filter": 'title pr or userType eq "Intern"',
                         "operations": {
@@ -2057,22 +1790,27 @@ def test_method_update_with_all_params_overload_6(self, client: Cloudflare) -> N
                             "delete": True,
                             "update": True,
                         },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "strictness": "strict",
                         "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
+                    }
                 ],
-                "remote_uri": "remote_uri",
             },
+            self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
+            service_auth_401_redirect=True,
             session_duration="24h",
+            skip_interstitial=True,
+            tags=["engineers"],
+            use_clientless_isolation_app_launcher_url=False,
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_raw_response_update_overload_6(self, client: Cloudflare) -> None:
+    def test_raw_response_update_overload_3(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.applications.with_raw_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="warp",
+            domain="test.example.com/admin",
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -2083,10 +1821,11 @@ def test_raw_response_update_overload_6(self, client: Cloudflare) -> None:
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_streaming_response_update_overload_6(self, client: Cloudflare) -> None:
+    def test_streaming_response_update_overload_3(self, client: Cloudflare) -> None:
         with client.zero_trust.access.applications.with_streaming_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="warp",
+            domain="test.example.com/admin",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -2099,59 +1838,124 @@ def test_streaming_response_update_overload_6(self, client: Cloudflare) -> None:
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_path_params_update_overload_6(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    def test_path_params_update_overload_3(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                domain="test.example.com/admin",
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                type="warp",
+                domain="test.example.com/admin",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                type="warp",
+                domain="test.example.com/admin",
+                type="self_hosted",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_overload_7(self, client: Cloudflare) -> None:
+    def test_method_update_overload_4(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="biso",
+            domain="test.example.com/admin",
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_with_all_params_overload_7(self, client: Cloudflare) -> None:
+    def test_method_update_with_all_params_overload_4(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="biso",
+            domain="test.example.com/admin",
+            type="self_hosted",
             account_id="account_id",
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allow_authenticate_via_warp=True,
+            allow_iframe=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
+            app_launcher_visible=True,
             auto_redirect_to_identity=True,
-            policies=[
+            cors_headers={
+                "allow_all_headers": True,
+                "allow_all_methods": True,
+                "allow_all_origins": True,
+                "allow_credentials": True,
+                "allowed_headers": ["string"],
+                "allowed_methods": ["GET"],
+                "allowed_origins": ["https://example.com"],
+                "max_age": -1,
+            },
+            custom_deny_message="custom_deny_message",
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            destinations=[
                 {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
+                    "type": "public",
+                    "uri": "test.example.com/admin",
                 },
                 {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
+                    "type": "public",
+                    "uri": "test.anotherexample.com/staff",
+                },
+                {
+                    "cidr": "10.5.0.0/24",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80-90",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "10.5.0.3/32",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "cidr",
+                    "hostname": "private-sni.example.com",
+                    "l4_protocol": "tcp",
+                    "port_range": "port_range",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "mcp_server_id": "mcp-server-1",
+                    "type": "via_mcp_server_portal",
                 },
+            ],
+            enable_binding_cookie=True,
+            http_only_cookie_attribute=True,
+            logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
+            name="Admin Site",
+            options_preflight_bypass=True,
+            path_cookie_attribute=True,
+            policies=[
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
+                }
             ],
+            read_service_tokens_from_header="Authorization",
+            same_site_cookie_attribute="strict",
             scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
                 "authentication": {
                     "password": "password",
                     "scheme": "httpbasic",
@@ -2159,31 +1963,9 @@ def test_method_update_with_all_params_overload_7(self, client: Cloudflare) -> N
                 },
                 "deactivate_on_delete": True,
                 "enabled": True,
-                "idp_uid": "idp_uid",
                 "mappings": [
                     {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
                         "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
                         "enabled": True,
                         "filter": 'title pr or userType eq "Intern"',
                         "operations": {
@@ -2191,22 +1973,27 @@ def test_method_update_with_all_params_overload_7(self, client: Cloudflare) -> N
                             "delete": True,
                             "update": True,
                         },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "strictness": "strict",
                         "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
+                    }
                 ],
-                "remote_uri": "remote_uri",
             },
+            self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
+            service_auth_401_redirect=True,
             session_duration="24h",
+            skip_interstitial=True,
+            tags=["engineers"],
+            use_clientless_isolation_app_launcher_url=False,
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_raw_response_update_overload_7(self, client: Cloudflare) -> None:
+    def test_raw_response_update_overload_4(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.applications.with_raw_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="biso",
+            domain="test.example.com/admin",
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -2217,10 +2004,11 @@ def test_raw_response_update_overload_7(self, client: Cloudflare) -> None:
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_streaming_response_update_overload_7(self, client: Cloudflare) -> None:
+    def test_streaming_response_update_overload_4(self, client: Cloudflare) -> None:
         with client.zero_trust.access.applications.with_streaming_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="biso",
+            domain="test.example.com/admin",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -2233,96 +2021,86 @@ def test_streaming_response_update_overload_7(self, client: Cloudflare) -> None:
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_path_params_update_overload_7(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    def test_path_params_update_overload_4(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                domain="test.example.com/admin",
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                type="biso",
+                domain="test.example.com/admin",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                type="biso",
+                domain="test.example.com/admin",
+                type="self_hosted",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_overload_8(self, client: Cloudflare) -> None:
+    def test_method_update_overload_5(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_update_with_all_params_overload_8(self, client: Cloudflare) -> None:
+    def test_method_update_with_all_params_overload_5(self, client: Cloudflare) -> None:
         application = client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
             account_id="account_id",
-            app_launcher_visible=True,
-            domain="https://mybookmark.com",
-            logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
-            name="Admin Site",
-            scim_config={
-                "authentication": {
-                    "password": "password",
-                    "scheme": "httpbasic",
-                    "user": "user",
-                },
-                "deactivate_on_delete": True,
-                "enabled": True,
-                "idp_uid": "idp_uid",
-                "mappings": [
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                ],
-                "remote_uri": "remote_uri",
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
+            app_launcher_logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
+            auto_redirect_to_identity=True,
+            bg_color="#ff0000",
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            footer_links=[
+                {
+                    "name": "Cloudflare's Privacy Policy",
+                    "url": "https://www.cloudflare.com/privacypolicy/",
+                }
+            ],
+            header_bg_color="#ff0000",
+            landing_page_design={
+                "button_color": "#ff0000",
+                "button_text_color": "#ff0000",
+                "image_url": "https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
+                "message": "Log in below to reach your applications behind Access.",
+                "title": "Welcome back!",
             },
-            tags=["engineers", "engineers", "engineers"],
-            type="bookmark",
+            policies=[
+                {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    "precedence": 0,
+                }
+            ],
+            session_duration="24h",
+            skip_app_launcher_login_page=True,
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_raw_response_update_overload_8(self, client: Cloudflare) -> None:
+    def test_raw_response_update_overload_5(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.applications.with_raw_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -2333,9 +2111,10 @@ def test_raw_response_update_overload_8(self, client: Cloudflare) -> None:
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_streaming_response_update_overload_8(self, client: Cloudflare) -> None:
+    def test_streaming_response_update_overload_5(self, client: Cloudflare) -> None:
         with client.zero_trust.access.applications.with_streaming_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -2348,218 +2127,322 @@ def test_streaming_response_update_overload_8(self, client: Cloudflare) -> None:
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_path_params_update_overload_8(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    def test_path_params_update_overload_5(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                type="self_hosted",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        application = client.zero_trust.access.applications.list(
+    def test_method_update_overload_6(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
             account_id="account_id",
         )
-        assert_matches_type(SyncSinglePage[ApplicationListResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
-        application = client.zero_trust.access.applications.list(
+    def test_method_update_with_all_params_overload_6(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
             account_id="account_id",
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
+            auto_redirect_to_identity=True,
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            policies=[
+                {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    "precedence": 0,
+                }
+            ],
+            session_duration="24h",
         )
-        assert_matches_type(SyncSinglePage[ApplicationListResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.zero_trust.access.applications.with_raw_response.list(
+    def test_raw_response_update_overload_6(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.applications.with_raw_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
             account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         application = response.parse()
-        assert_matches_type(SyncSinglePage[ApplicationListResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.zero_trust.access.applications.with_streaming_response.list(
+    def test_streaming_response_update_overload_6(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.applications.with_streaming_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             application = response.parse()
-            assert_matches_type(SyncSinglePage[ApplicationListResponse], application, path=["response"])
+            assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.access.applications.with_raw_response.list(
+    def test_path_params_update_overload_6(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.update(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zero_trust.access.applications.with_raw_response.list(
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.update(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                type="self_hosted",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_delete(self, client: Cloudflare) -> None:
-        application = client.zero_trust.access.applications.delete(
+    def test_method_update_overload_7(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
             account_id="account_id",
         )
-        assert_matches_type(Optional[ApplicationDeleteResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
-        application = client.zero_trust.access.applications.delete(
+    def test_method_update_with_all_params_overload_7(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
             account_id="account_id",
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
+            auto_redirect_to_identity=True,
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            policies=[
+                {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    "precedence": 0,
+                }
+            ],
+            session_duration="24h",
         )
-        assert_matches_type(Optional[ApplicationDeleteResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.zero_trust.access.applications.with_raw_response.delete(
+    def test_raw_response_update_overload_7(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.applications.with_raw_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
             account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         application = response.parse()
-        assert_matches_type(Optional[ApplicationDeleteResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.zero_trust.access.applications.with_streaming_response.delete(
+    def test_streaming_response_update_overload_7(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.applications.with_streaming_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             application = response.parse()
-            assert_matches_type(Optional[ApplicationDeleteResponse], application, path=["response"])
+            assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.access.applications.with_raw_response.delete(
+    def test_path_params_update_overload_7(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zero_trust.access.applications.with_raw_response.delete(
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                type="self_hosted",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        application = client.zero_trust.access.applications.get(
+    def test_method_update_overload_8(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
             account_id="account_id",
         )
-        assert_matches_type(Optional[ApplicationGetResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
-        application = client.zero_trust.access.applications.get(
+    def test_method_update_with_all_params_overload_8(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
             account_id="account_id",
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
+            auto_redirect_to_identity=True,
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            domain="abcd123456.proxy.cloudflare-gateway.com",
+            name="Gateway Proxy",
+            policies=[
+                {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    "precedence": 0,
+                }
+            ],
+            session_duration="24h",
         )
-        assert_matches_type(Optional[ApplicationGetResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.zero_trust.access.applications.with_raw_response.get(
+    def test_raw_response_update_overload_8(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.applications.with_raw_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
             account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         application = response.parse()
-        assert_matches_type(Optional[ApplicationGetResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.zero_trust.access.applications.with_streaming_response.get(
+    def test_streaming_response_update_overload_8(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.applications.with_streaming_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             application = response.parse()
-            assert_matches_type(Optional[ApplicationGetResponse], application, path=["response"])
+            assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.access.applications.with_raw_response.get(
+    def test_path_params_update_overload_8(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zero_trust.access.applications.with_raw_response.get(
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                type="self_hosted",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_revoke_tokens(self, client: Cloudflare) -> None:
-        application = client.zero_trust.access.applications.revoke_tokens(
+    def test_method_update_overload_9(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         )
-        assert_matches_type(object, application, path=["response"])
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_method_revoke_tokens_with_all_params(self, client: Cloudflare) -> None:
-        application = client.zero_trust.access.applications.revoke_tokens(
+    def test_method_update_with_all_params_overload_9(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
+            app_launcher_visible=True,
+            domain="https://mybookmark.com",
+            logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
+            name="Admin Site",
+            policies=[
+                {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    "precedence": 0,
+                }
+            ],
+            tags=["engineers"],
+            type="bookmark",
         )
-        assert_matches_type(object, application, path=["response"])
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_raw_response_revoke_tokens(self, client: Cloudflare) -> None:
-        response = client.zero_trust.access.applications.with_raw_response.revoke_tokens(
+    def test_raw_response_update_overload_9(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.applications.with_raw_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         )
@@ -2567,12 +2450,12 @@ def test_raw_response_revoke_tokens(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         application = response.parse()
-        assert_matches_type(object, application, path=["response"])
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_streaming_response_revoke_tokens(self, client: Cloudflare) -> None:
-        with client.zero_trust.access.applications.with_streaming_response.revoke_tokens(
+    def test_streaming_response_update_overload_9(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.applications.with_streaming_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
         ) as response:
@@ -2580,52 +2463,206 @@ def test_streaming_response_revoke_tokens(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             application = response.parse()
-            assert_matches_type(object, application, path=["response"])
+            assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    def test_path_params_revoke_tokens(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.access.applications.with_raw_response.revoke_tokens(
+    def test_path_params_update_overload_9(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zero_trust.access.applications.with_raw_response.revoke_tokens(
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="account_id",
             )
 
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_overload_10(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "SSH",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="infrastructure",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
-class TestAsyncApplications:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params_overload_10(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "SSH",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="infrastructure",
+            account_id="account_id",
+            name="Admin Site",
+            policies=[
+                {
+                    "decision": "allow",
+                    "include": [{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
+                    "name": "Allow devs",
+                    "connection_rules": {
+                        "ssh": {
+                            "usernames": ["root", "ubuntu"],
+                            "allow_email_alias": True,
+                        }
+                    },
+                    "exclude": [{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
+                    "require": [{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
+                }
+            ],
+        )
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
-        application = await async_client.zero_trust.access.applications.create(
+    def test_raw_response_update_overload_10(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.applications.with_raw_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "SSH",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="infrastructure",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        application = response.parse()
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_update_overload_10(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.applications.with_streaming_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "SSH",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="infrastructure",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            application = response.parse()
+            assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_update_overload_10(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "SSH",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="infrastructure",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.update(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "SSH",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="infrastructure",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.update(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "SSH",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="infrastructure",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_overload_11(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
             domain="test.example.com/admin",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "RDP",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
             type="self_hosted",
             account_id="account_id",
         )
-        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
-        application = await async_client.zero_trust.access.applications.create(
+    def test_method_update_with_all_params_overload_11(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
             domain="test.example.com/admin",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "RDP",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
             type="self_hosted",
             account_id="account_id",
             allow_authenticate_via_warp=True,
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allow_iframe=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             app_launcher_visible=True,
             auto_redirect_to_identity=True,
             cors_headers={
@@ -2633,7 +2670,7 @@ async def test_method_create_with_all_params_overload_1(self, async_client: Asyn
                 "allow_all_methods": True,
                 "allow_all_origins": True,
                 "allow_credentials": True,
-                "allowed_headers": ["string", "string", "string"],
+                "allowed_headers": ["string"],
                 "allowed_methods": ["GET"],
                 "allowed_origins": ["https://example.com"],
                 "max_age": -1,
@@ -2641,10 +2678,44 @@ async def test_method_create_with_all_params_overload_1(self, async_client: Asyn
             custom_deny_message="custom_deny_message",
             custom_deny_url="custom_deny_url",
             custom_non_identity_deny_url="custom_non_identity_deny_url",
-            custom_pages=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            destinations=[
+                {
+                    "type": "public",
+                    "uri": "test.example.com/admin",
+                },
+                {
+                    "type": "public",
+                    "uri": "test.anotherexample.com/staff",
+                },
+                {
+                    "cidr": "10.5.0.0/24",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80-90",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "10.5.0.3/32",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "cidr",
+                    "hostname": "private-sni.example.com",
+                    "l4_protocol": "tcp",
+                    "port_range": "port_range",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "mcp_server_id": "mcp-server-1",
+                    "type": "via_mcp_server_portal",
+                },
             ],
             enable_binding_cookie=True,
             http_only_cookie_attribute=True,
@@ -2656,18 +2727,13 @@ async def test_method_create_with_all_params_overload_1(self, async_client: Asyn
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
+            read_service_tokens_from_header="Authorization",
             same_site_cookie_attribute="strict",
             scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
                 "authentication": {
                     "password": "password",
                     "scheme": "httpbasic",
@@ -2675,9 +2741,9 @@ async def test_method_create_with_all_params_overload_1(self, async_client: Asyn
                 },
                 "deactivate_on_delete": True,
                 "enabled": True,
-                "idp_uid": "idp_uid",
                 "mappings": [
                     {
+                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
                         "enabled": True,
                         "filter": 'title pr or userType eq "Intern"',
                         "operations": {
@@ -2685,21 +2751,777 @@ async def test_method_create_with_all_params_overload_1(self, async_client: Asyn
                             "delete": True,
                             "update": True,
                         },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "strictness": "strict",
                         "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
+                    }
+                ],
+            },
+            self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
+            service_auth_401_redirect=True,
+            session_duration="24h",
+            skip_interstitial=True,
+            tags=["engineers"],
+            use_clientless_isolation_app_launcher_url=False,
+        )
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_update_overload_11(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.applications.with_raw_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            domain="test.example.com/admin",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "RDP",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="self_hosted",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        application = response.parse()
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_update_overload_11(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.applications.with_streaming_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            domain="test.example.com/admin",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "RDP",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="self_hosted",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            application = response.parse()
+            assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_update_overload_11(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                domain="test.example.com/admin",
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "RDP",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.update(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                domain="test.example.com/admin",
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "RDP",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="self_hosted",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.update(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                domain="test.example.com/admin",
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "RDP",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ApplicationListResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.list(
+            account_id="account_id",
+            aud="aud",
+            domain="domain",
+            exact=True,
+            name="name",
+            page=0,
+            per_page=0,
+            search="search",
+            target_attributes="target_attributes",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ApplicationListResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.applications.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        application = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[ApplicationListResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.applications.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            application = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[ApplicationListResponse], application, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.list(
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.list(
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.delete(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ApplicationDeleteResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.delete(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ApplicationDeleteResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.applications.with_raw_response.delete(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        application = response.parse()
+        assert_matches_type(Optional[ApplicationDeleteResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.applications.with_streaming_response.delete(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            application = response.parse()
+            assert_matches_type(Optional[ApplicationDeleteResponse], application, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.zero_trust.access.applications.with_raw_response.delete(
+                app_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.delete(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.delete(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.get(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ApplicationGetResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.get(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ApplicationGetResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.applications.with_raw_response.get(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        application = response.parse()
+        assert_matches_type(Optional[ApplicationGetResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.applications.with_streaming_response.get(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            application = response.parse()
+            assert_matches_type(Optional[ApplicationGetResponse], application, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.zero_trust.access.applications.with_raw_response.get(
+                app_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.get(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.get(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_revoke_tokens(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.revoke_tokens(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+        assert_matches_type(object, application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_revoke_tokens_with_all_params(self, client: Cloudflare) -> None:
+        application = client.zero_trust.access.applications.revoke_tokens(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+        assert_matches_type(object, application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_revoke_tokens(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.applications.with_raw_response.revoke_tokens(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        application = response.parse()
+        assert_matches_type(object, application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_revoke_tokens(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.applications.with_streaming_response.revoke_tokens(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            application = response.parse()
+            assert_matches_type(object, application, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_revoke_tokens(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            client.zero_trust.access.applications.with_raw_response.revoke_tokens(
+                app_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.revoke_tokens(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            client.zero_trust.access.applications.with_raw_response.revoke_tokens(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
+            )
+
+
+class TestAsyncApplications:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        application = await async_client.zero_trust.access.applications.create(
+            domain="test.example.com/admin",
+            type="self_hosted",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        application = await async_client.zero_trust.access.applications.create(
+            domain="test.example.com/admin",
+            type="self_hosted",
+            account_id="account_id",
+            allow_authenticate_via_warp=True,
+            allow_iframe=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
+            app_launcher_visible=True,
+            auto_redirect_to_identity=True,
+            cors_headers={
+                "allow_all_headers": True,
+                "allow_all_methods": True,
+                "allow_all_origins": True,
+                "allow_credentials": True,
+                "allowed_headers": ["string"],
+                "allowed_methods": ["GET"],
+                "allowed_origins": ["https://example.com"],
+                "max_age": -1,
+            },
+            custom_deny_message="custom_deny_message",
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            destinations=[
+                {
+                    "type": "public",
+                    "uri": "test.example.com/admin",
+                },
+                {
+                    "type": "public",
+                    "uri": "test.anotherexample.com/staff",
+                },
+                {
+                    "cidr": "10.5.0.0/24",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80-90",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "10.5.0.3/32",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "cidr",
+                    "hostname": "private-sni.example.com",
+                    "l4_protocol": "tcp",
+                    "port_range": "port_range",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "mcp_server_id": "mcp-server-1",
+                    "type": "via_mcp_server_portal",
+                },
+            ],
+            enable_binding_cookie=True,
+            http_only_cookie_attribute=True,
+            logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
+            name="Admin Site",
+            options_preflight_bypass=True,
+            path_cookie_attribute=True,
+            policies=[
+                {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    "precedence": 0,
+                }
+            ],
+            read_service_tokens_from_header="Authorization",
+            same_site_cookie_attribute="strict",
+            scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
+                "authentication": {
+                    "password": "password",
+                    "scheme": "httpbasic",
+                    "user": "user",
+                },
+                "deactivate_on_delete": True,
+                "enabled": True,
+                "mappings": [
+                    {
+                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "enabled": True,
+                        "filter": 'title pr or userType eq "Intern"',
+                        "operations": {
+                            "create": True,
+                            "delete": True,
+                            "update": True,
+                        },
+                        "strictness": "strict",
+                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
+                    }
+                ],
+            },
+            self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
+            service_auth_401_redirect=True,
+            session_duration="24h",
+            skip_interstitial=True,
+            tags=["engineers"],
+            use_clientless_isolation_app_launcher_url=False,
+        )
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.applications.with_raw_response.create(
+            domain="test.example.com/admin",
+            type="self_hosted",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        application = await response.parse()
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.applications.with_streaming_response.create(
+            domain="test.example.com/admin",
+            type="self_hosted",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            application = await response.parse()
+            assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.zero_trust.access.applications.with_raw_response.create(
+                domain="test.example.com/admin",
+                type="self_hosted",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.zero_trust.access.applications.with_raw_response.create(
+                domain="test.example.com/admin",
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        application = await async_client.zero_trust.access.applications.create(
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        application = await async_client.zero_trust.access.applications.create(
+            account_id="account_id",
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
+            app_launcher_visible=True,
+            auto_redirect_to_identity=True,
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
+            name="Admin Site",
+            policies=[
+                {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    "precedence": 0,
+                }
+            ],
+            saas_app={
+                "auth_type": "saml",
+                "consumer_service_url": "https://example.com",
+                "custom_attributes": [
+                    {
+                        "friendly_name": "Last Name",
+                        "name": "family_name",
+                        "name_format": "urn:oasis:names:tc:SAML:2.0:attrname-format:basic",
+                        "required": True,
+                        "source": {
+                            "name": "last_name",
+                            "name_by_idp": [
+                                {
+                                    "idp_id": "exampleIdPID1",
+                                    "source_name": "AttributeName1",
+                                }
+                            ],
+                        },
+                    }
+                ],
+                "default_relay_state": "https://example.com",
+                "idp_entity_id": "https://example.cloudflareaccess.com",
+                "name_id_format": "id",
+                "name_id_transform_jsonata": "$substringBefore(email, '@') & '+sandbox@' & $substringAfter(email, '@')",
+                "public_key": "example unique name",
+                "saml_attribute_transform_jsonata": "$ ~>| groups | {'group_name': name} |",
+                "sp_entity_id": "example unique name",
+                "sso_endpoint": "https://example.cloudflareaccess.com/cdn-cgi/access/sso/saml/b3f58a2b414e0b51d45c8c2af26fccca0e27c63763c426fa52f98dcf0b3b3bfd",
+            },
+            scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
+                "authentication": {
+                    "password": "password",
+                    "scheme": "httpbasic",
+                    "user": "user",
+                },
+                "deactivate_on_delete": True,
+                "enabled": True,
+                "mappings": [
+                    {
+                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "enabled": True,
+                        "filter": 'title pr or userType eq "Intern"',
+                        "operations": {
                             "create": True,
                             "delete": True,
                             "update": True,
                         },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "strictness": "strict",
                         "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
+                    }
+                ],
+            },
+            tags=["engineers"],
+            type="saas",
+        )
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.applications.with_raw_response.create(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        application = await response.parse()
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.applications.with_streaming_response.create(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            application = await response.parse()
+            assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.zero_trust.access.applications.with_raw_response.create(
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.zero_trust.access.applications.with_raw_response.create(
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_overload_3(self, async_client: AsyncCloudflare) -> None:
+        application = await async_client.zero_trust.access.applications.create(
+            domain="test.example.com/admin",
+            type="self_hosted",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_with_all_params_overload_3(self, async_client: AsyncCloudflare) -> None:
+        application = await async_client.zero_trust.access.applications.create(
+            domain="test.example.com/admin",
+            type="self_hosted",
+            account_id="account_id",
+            allow_authenticate_via_warp=True,
+            allow_iframe=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
+            app_launcher_visible=True,
+            auto_redirect_to_identity=True,
+            cors_headers={
+                "allow_all_headers": True,
+                "allow_all_methods": True,
+                "allow_all_origins": True,
+                "allow_credentials": True,
+                "allowed_headers": ["string"],
+                "allowed_methods": ["GET"],
+                "allowed_origins": ["https://example.com"],
+                "max_age": -1,
+            },
+            custom_deny_message="custom_deny_message",
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            destinations=[
+                {
+                    "type": "public",
+                    "uri": "test.example.com/admin",
+                },
+                {
+                    "type": "public",
+                    "uri": "test.anotherexample.com/staff",
+                },
+                {
+                    "cidr": "10.5.0.0/24",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80-90",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "10.5.0.3/32",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "cidr",
+                    "hostname": "private-sni.example.com",
+                    "l4_protocol": "tcp",
+                    "port_range": "port_range",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "mcp_server_id": "mcp-server-1",
+                    "type": "via_mcp_server_portal",
+                },
+            ],
+            enable_binding_cookie=True,
+            http_only_cookie_attribute=True,
+            logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
+            name="Admin Site",
+            options_preflight_bypass=True,
+            path_cookie_attribute=True,
+            policies=[
+                {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    "precedence": 0,
+                }
+            ],
+            read_service_tokens_from_header="Authorization",
+            same_site_cookie_attribute="strict",
+            scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
+                "authentication": {
+                    "password": "password",
+                    "scheme": "httpbasic",
+                    "user": "user",
+                },
+                "deactivate_on_delete": True,
+                "enabled": True,
+                "mappings": [
                     {
+                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
                         "enabled": True,
                         "filter": 'title pr or userType eq "Intern"',
                         "operations": {
@@ -2707,23 +3529,23 @@ async def test_method_create_with_all_params_overload_1(self, async_client: Asyn
                             "delete": True,
                             "update": True,
                         },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "strictness": "strict",
                         "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
+                    }
                 ],
-                "remote_uri": "remote_uri",
             },
             self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
             service_auth_401_redirect=True,
             session_duration="24h",
             skip_interstitial=True,
-            tags=["engineers", "engineers", "engineers"],
+            tags=["engineers"],
+            use_clientless_isolation_app_launcher_url=False,
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_create_overload_3(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.applications.with_raw_response.create(
             domain="test.example.com/admin",
             type="self_hosted",
@@ -2737,7 +3559,7 @@ async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflar
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_create_overload_3(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.applications.with_streaming_response.create(
             domain="test.example.com/admin",
             type="self_hosted",
@@ -2753,15 +3575,15 @@ async def test_streaming_response_create_overload_1(self, async_client: AsyncClo
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    async def test_path_params_create_overload_3(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.create(
                 domain="test.example.com/admin",
                 type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.create(
                 domain="test.example.com/admin",
                 type="self_hosted",
@@ -2770,73 +3592,95 @@ async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_overload_4(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.create(
+            domain="test.example.com/admin",
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_create_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_with_all_params_overload_4(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.create(
+            domain="test.example.com/admin",
+            type="self_hosted",
             account_id="account_id",
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allow_authenticate_via_warp=True,
+            allow_iframe=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             app_launcher_visible=True,
             auto_redirect_to_identity=True,
-            custom_pages=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
-            logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
-            name="Admin Site",
-            policies=[
+            cors_headers={
+                "allow_all_headers": True,
+                "allow_all_methods": True,
+                "allow_all_origins": True,
+                "allow_credentials": True,
+                "allowed_headers": ["string"],
+                "allowed_methods": ["GET"],
+                "allowed_origins": ["https://example.com"],
+                "max_age": -1,
+            },
+            custom_deny_message="custom_deny_message",
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            destinations=[
                 {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
+                    "type": "public",
+                    "uri": "test.example.com/admin",
                 },
                 {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
+                    "type": "public",
+                    "uri": "test.anotherexample.com/staff",
+                },
+                {
+                    "cidr": "10.5.0.0/24",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80-90",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "10.5.0.3/32",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "cidr",
+                    "hostname": "private-sni.example.com",
+                    "l4_protocol": "tcp",
+                    "port_range": "port_range",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
                 },
+                {
+                    "mcp_server_id": "mcp-server-1",
+                    "type": "via_mcp_server_portal",
+                },
+            ],
+            enable_binding_cookie=True,
+            http_only_cookie_attribute=True,
+            logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
+            name="Admin Site",
+            options_preflight_bypass=True,
+            path_cookie_attribute=True,
+            policies=[
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
+                }
             ],
-            saas_app={
-                "auth_type": "saml",
-                "consumer_service_url": "https://example.com",
-                "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-                "custom_attributes": {
-                    "friendly_name": "Last Name",
-                    "name": "family_name",
-                    "name_format": "urn:oasis:names:tc:SAML:2.0:attrname-format:basic",
-                    "required": True,
-                    "source": {
-                        "name": "last_name",
-                        "name_by_idp": {
-                            "exampleIdPID1": "AttributeName1",
-                            "exampleIdPID2": "AttributeName2",
-                        },
-                    },
-                },
-                "default_relay_state": "https://example.com",
-                "idp_entity_id": "https://example.cloudflareaccess.com",
-                "name_id_format": "id",
-                "name_id_transform_jsonata": "$substringBefore(email, '@') & '+sandbox@' & $substringAfter(email, '@')",
-                "public_key": "example unique name",
-                "saml_attribute_transform_jsonata": "$ ~>| groups | {'group_name': name} |",
-                "sp_entity_id": "example unique name",
-                "sso_endpoint": "https://example.cloudflareaccess.com/cdn-cgi/access/sso/saml/b3f58a2b414e0b51d45c8c2af26fccca0e27c63763c426fa52f98dcf0b3b3bfd",
-                "updated_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-            },
+            read_service_tokens_from_header="Authorization",
+            same_site_cookie_attribute="strict",
             scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
                 "authentication": {
                     "password": "password",
                     "scheme": "httpbasic",
@@ -2844,31 +3688,9 @@ async def test_method_create_with_all_params_overload_2(self, async_client: Asyn
                 },
                 "deactivate_on_delete": True,
                 "enabled": True,
-                "idp_uid": "idp_uid",
                 "mappings": [
                     {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
                         "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
                         "enabled": True,
                         "filter": 'title pr or userType eq "Intern"',
                         "operations": {
@@ -2876,21 +3698,119 @@ async def test_method_create_with_all_params_overload_2(self, async_client: Asyn
                             "delete": True,
                             "update": True,
                         },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "strictness": "strict",
                         "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
+                    }
                 ],
-                "remote_uri": "remote_uri",
             },
-            tags=["engineers", "engineers", "engineers"],
-            type="saas",
+            self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
+            service_auth_401_redirect=True,
+            session_duration="24h",
+            skip_interstitial=True,
+            tags=["engineers"],
+            use_clientless_isolation_app_launcher_url=False,
+        )
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_create_overload_4(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.applications.with_raw_response.create(
+            domain="test.example.com/admin",
+            type="self_hosted",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        application = await response.parse()
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_create_overload_4(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.applications.with_streaming_response.create(
+            domain="test.example.com/admin",
+            type="self_hosted",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            application = await response.parse()
+            assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_create_overload_4(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.zero_trust.access.applications.with_raw_response.create(
+                domain="test.example.com/admin",
+                type="self_hosted",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.zero_trust.access.applications.with_raw_response.create(
+                domain="test.example.com/admin",
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_overload_5(self, async_client: AsyncCloudflare) -> None:
+        application = await async_client.zero_trust.access.applications.create(
+            type="self_hosted",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_with_all_params_overload_5(self, async_client: AsyncCloudflare) -> None:
+        application = await async_client.zero_trust.access.applications.create(
+            type="self_hosted",
+            account_id="account_id",
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
+            app_launcher_logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
+            auto_redirect_to_identity=True,
+            bg_color="#ff0000",
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            footer_links=[
+                {
+                    "name": "Cloudflare's Privacy Policy",
+                    "url": "https://www.cloudflare.com/privacypolicy/",
+                }
+            ],
+            header_bg_color="#ff0000",
+            landing_page_design={
+                "button_color": "#ff0000",
+                "button_text_color": "#ff0000",
+                "image_url": "https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
+                "message": "Log in below to reach your applications behind Access.",
+                "title": "Welcome back!",
+            },
+            policies=[
+                {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    "precedence": 0,
+                }
+            ],
+            session_duration="24h",
+            skip_app_launcher_login_page=True,
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_create_overload_5(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.applications.with_raw_response.create(
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -2901,8 +3821,9 @@ async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflar
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_create_overload_5(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.applications.with_streaming_response.create(
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -2915,141 +3836,54 @@ async def test_streaming_response_create_overload_2(self, async_client: AsyncClo
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    async def test_path_params_create_overload_5(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.create(
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.create(
+                type="self_hosted",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_create_overload_3(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_overload_6(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.create(
-            domain="test.example.com/admin",
-            type="ssh",
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_create_with_all_params_overload_3(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_with_all_params_overload_6(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.create(
-            domain="test.example.com/admin",
-            type="ssh",
+            type="self_hosted",
             account_id="account_id",
-            allow_authenticate_via_warp=True,
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
-            app_launcher_visible=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             auto_redirect_to_identity=True,
-            cors_headers={
-                "allow_all_headers": True,
-                "allow_all_methods": True,
-                "allow_all_origins": True,
-                "allow_credentials": True,
-                "allowed_headers": ["string", "string", "string"],
-                "allowed_methods": ["GET"],
-                "allowed_origins": ["https://example.com"],
-                "max_age": -1,
-            },
-            custom_deny_message="custom_deny_message",
             custom_deny_url="custom_deny_url",
             custom_non_identity_deny_url="custom_non_identity_deny_url",
-            custom_pages=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
-            enable_binding_cookie=True,
-            http_only_cookie_attribute=True,
-            logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
-            name="Admin Site",
-            options_preflight_bypass=True,
-            path_cookie_attribute=True,
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
             policies=[
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
-            same_site_cookie_attribute="strict",
-            scim_config={
-                "authentication": {
-                    "password": "password",
-                    "scheme": "httpbasic",
-                    "user": "user",
-                },
-                "deactivate_on_delete": True,
-                "enabled": True,
-                "idp_uid": "idp_uid",
-                "mappings": [
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                ],
-                "remote_uri": "remote_uri",
-            },
-            self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
-            service_auth_401_redirect=True,
             session_duration="24h",
-            skip_interstitial=True,
-            tags=["engineers", "engineers", "engineers"],
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_create_overload_3(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_create_overload_6(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.applications.with_raw_response.create(
-            domain="test.example.com/admin",
-            type="ssh",
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -3060,10 +3894,9 @@ async def test_raw_response_create_overload_3(self, async_client: AsyncCloudflar
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_create_overload_3(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_create_overload_6(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.applications.with_streaming_response.create(
-            domain="test.example.com/admin",
-            type="ssh",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -3076,145 +3909,54 @@ async def test_streaming_response_create_overload_3(self, async_client: AsyncClo
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_create_overload_3(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    async def test_path_params_create_overload_6(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.create(
-                domain="test.example.com/admin",
-                type="ssh",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.create(
-                domain="test.example.com/admin",
-                type="ssh",
+                type="self_hosted",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_create_overload_4(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_overload_7(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.create(
-            domain="test.example.com/admin",
-            type="vnc",
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_create_with_all_params_overload_4(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_with_all_params_overload_7(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.create(
-            domain="test.example.com/admin",
-            type="vnc",
+            type="self_hosted",
             account_id="account_id",
-            allow_authenticate_via_warp=True,
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
-            app_launcher_visible=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             auto_redirect_to_identity=True,
-            cors_headers={
-                "allow_all_headers": True,
-                "allow_all_methods": True,
-                "allow_all_origins": True,
-                "allow_credentials": True,
-                "allowed_headers": ["string", "string", "string"],
-                "allowed_methods": ["GET"],
-                "allowed_origins": ["https://example.com"],
-                "max_age": -1,
-            },
-            custom_deny_message="custom_deny_message",
             custom_deny_url="custom_deny_url",
             custom_non_identity_deny_url="custom_non_identity_deny_url",
-            custom_pages=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
-            enable_binding_cookie=True,
-            http_only_cookie_attribute=True,
-            logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
-            name="Admin Site",
-            options_preflight_bypass=True,
-            path_cookie_attribute=True,
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
             policies=[
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
-            same_site_cookie_attribute="strict",
-            scim_config={
-                "authentication": {
-                    "password": "password",
-                    "scheme": "httpbasic",
-                    "user": "user",
-                },
-                "deactivate_on_delete": True,
-                "enabled": True,
-                "idp_uid": "idp_uid",
-                "mappings": [
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                ],
-                "remote_uri": "remote_uri",
-            },
-            self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
-            service_auth_401_redirect=True,
             session_duration="24h",
-            skip_interstitial=True,
-            tags=["engineers", "engineers", "engineers"],
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_create_overload_4(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_create_overload_7(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.applications.with_raw_response.create(
-            domain="test.example.com/admin",
-            type="vnc",
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -3225,10 +3967,9 @@ async def test_raw_response_create_overload_4(self, async_client: AsyncCloudflar
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_create_overload_4(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_create_overload_7(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.applications.with_streaming_response.create(
-            domain="test.example.com/admin",
-            type="vnc",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -3241,111 +3982,56 @@ async def test_streaming_response_create_overload_4(self, async_client: AsyncClo
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_create_overload_4(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    async def test_path_params_create_overload_7(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.create(
-                domain="test.example.com/admin",
-                type="vnc",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.create(
-                domain="test.example.com/admin",
-                type="vnc",
+                type="self_hosted",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_create_overload_5(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_overload_8(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.create(
-            type="app_launcher",
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_create_with_all_params_overload_5(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_with_all_params_overload_8(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.create(
-            type="app_launcher",
+            type="self_hosted",
             account_id="account_id",
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             auto_redirect_to_identity=True,
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            domain="abcd123456.proxy.cloudflare-gateway.com",
+            name="Gateway Proxy",
             policies=[
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
-            scim_config={
-                "authentication": {
-                    "password": "password",
-                    "scheme": "httpbasic",
-                    "user": "user",
-                },
-                "deactivate_on_delete": True,
-                "enabled": True,
-                "idp_uid": "idp_uid",
-                "mappings": [
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                ],
-                "remote_uri": "remote_uri",
-            },
             session_duration="24h",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_create_overload_5(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_create_overload_8(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.applications.with_raw_response.create(
-            type="app_launcher",
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -3356,9 +4042,9 @@ async def test_raw_response_create_overload_5(self, async_client: AsyncCloudflar
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_create_overload_5(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_create_overload_8(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.applications.with_streaming_response.create(
-            type="app_launcher",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -3371,109 +4057,51 @@ async def test_streaming_response_create_overload_5(self, async_client: AsyncClo
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_create_overload_5(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    async def test_path_params_create_overload_8(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.create(
-                type="app_launcher",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.create(
-                type="app_launcher",
+                type="self_hosted",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_create_overload_6(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_overload_9(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.create(
-            type="warp",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_create_with_all_params_overload_6(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_with_all_params_overload_9(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.create(
-            type="warp",
             account_id="account_id",
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
-            auto_redirect_to_identity=True,
+            app_launcher_visible=True,
+            domain="https://mybookmark.com",
+            logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
+            name="Admin Site",
             policies=[
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
-            scim_config={
-                "authentication": {
-                    "password": "password",
-                    "scheme": "httpbasic",
-                    "user": "user",
-                },
-                "deactivate_on_delete": True,
-                "enabled": True,
-                "idp_uid": "idp_uid",
-                "mappings": [
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                ],
-                "remote_uri": "remote_uri",
-            },
-            session_duration="24h",
+            tags=["engineers"],
+            type="bookmark",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_create_overload_6(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_create_overload_9(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.applications.with_raw_response.create(
-            type="warp",
             account_id="account_id",
         )
 
@@ -3484,9 +4112,8 @@ async def test_raw_response_create_overload_6(self, async_client: AsyncCloudflar
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_create_overload_6(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_create_overload_9(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.applications.with_streaming_response.create(
-            type="warp",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -3499,109 +4126,77 @@ async def test_streaming_response_create_overload_6(self, async_client: AsyncClo
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_create_overload_6(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    async def test_path_params_create_overload_9(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.create(
-                type="warp",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.create(
-                type="warp",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_create_overload_7(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_overload_10(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.create(
-            type="biso",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "SSH",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="infrastructure",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_create_with_all_params_overload_7(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_with_all_params_overload_10(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.create(
-            type="biso",
-            account_id="account_id",
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "SSH",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
             ],
-            auto_redirect_to_identity=True,
+            type="infrastructure",
+            account_id="account_id",
+            name="Admin Site",
             policies=[
                 {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-            ],
-            scim_config={
-                "authentication": {
-                    "password": "password",
-                    "scheme": "httpbasic",
-                    "user": "user",
-                },
-                "deactivate_on_delete": True,
-                "enabled": True,
-                "idp_uid": "idp_uid",
-                "mappings": [
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
+                    "decision": "allow",
+                    "include": [{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
+                    "name": "Allow devs",
+                    "connection_rules": {
+                        "ssh": {
+                            "usernames": ["root", "ubuntu"],
+                            "allow_email_alias": True,
+                        }
                     },
-                ],
-                "remote_uri": "remote_uri",
-            },
-            session_duration="24h",
+                    "exclude": [{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
+                    "require": [{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
+                }
+            ],
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_create_overload_7(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_create_overload_10(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.applications.with_raw_response.create(
-            type="biso",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "SSH",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="infrastructure",
             account_id="account_id",
         )
 
@@ -3612,9 +4207,16 @@ async def test_raw_response_create_overload_7(self, async_client: AsyncCloudflar
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_create_overload_7(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_create_overload_10(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.applications.with_streaming_response.create(
-            type="biso",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "SSH",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="infrastructure",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -3627,37 +4229,138 @@ async def test_streaming_response_create_overload_7(self, async_client: AsyncClo
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_create_overload_7(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    async def test_path_params_create_overload_10(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.create(
-                type="biso",
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "SSH",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="infrastructure",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.create(
-                type="biso",
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "SSH",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="infrastructure",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_create_overload_8(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_overload_11(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.create(
+            domain="test.example.com/admin",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "RDP",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_create_with_all_params_overload_8(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_with_all_params_overload_11(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.create(
+            domain="test.example.com/admin",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "RDP",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="self_hosted",
             account_id="account_id",
+            allow_authenticate_via_warp=True,
+            allow_iframe=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             app_launcher_visible=True,
-            domain="https://mybookmark.com",
+            auto_redirect_to_identity=True,
+            cors_headers={
+                "allow_all_headers": True,
+                "allow_all_methods": True,
+                "allow_all_origins": True,
+                "allow_credentials": True,
+                "allowed_headers": ["string"],
+                "allowed_methods": ["GET"],
+                "allowed_origins": ["https://example.com"],
+                "max_age": -1,
+            },
+            custom_deny_message="custom_deny_message",
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            destinations=[
+                {
+                    "type": "public",
+                    "uri": "test.example.com/admin",
+                },
+                {
+                    "type": "public",
+                    "uri": "test.anotherexample.com/staff",
+                },
+                {
+                    "cidr": "10.5.0.0/24",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80-90",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "10.5.0.3/32",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "cidr",
+                    "hostname": "private-sni.example.com",
+                    "l4_protocol": "tcp",
+                    "port_range": "port_range",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "mcp_server_id": "mcp-server-1",
+                    "type": "via_mcp_server_portal",
+                },
+            ],
+            enable_binding_cookie=True,
+            http_only_cookie_attribute=True,
             logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
             name="Admin Site",
+            options_preflight_bypass=True,
+            path_cookie_attribute=True,
+            policies=[
+                {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    "precedence": 0,
+                }
+            ],
+            read_service_tokens_from_header="Authorization",
+            same_site_cookie_attribute="strict",
             scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
                 "authentication": {
                     "password": "password",
                     "scheme": "httpbasic",
@@ -3665,31 +4368,9 @@ async def test_method_create_with_all_params_overload_8(self, async_client: Asyn
                 },
                 "deactivate_on_delete": True,
                 "enabled": True,
-                "idp_uid": "idp_uid",
                 "mappings": [
                     {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
                         "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
                         "enabled": True,
                         "filter": 'title pr or userType eq "Intern"',
                         "operations": {
@@ -3697,21 +4378,33 @@ async def test_method_create_with_all_params_overload_8(self, async_client: Asyn
                             "delete": True,
                             "update": True,
                         },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "strictness": "strict",
                         "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
+                    }
                 ],
-                "remote_uri": "remote_uri",
             },
-            tags=["engineers", "engineers", "engineers"],
-            type="bookmark",
+            self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
+            service_auth_401_redirect=True,
+            session_duration="24h",
+            skip_interstitial=True,
+            tags=["engineers"],
+            use_clientless_isolation_app_launcher_url=False,
         )
         assert_matches_type(Optional[ApplicationCreateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_create_overload_8(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_create_overload_11(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.applications.with_raw_response.create(
+            domain="test.example.com/admin",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "RDP",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -3722,8 +4415,17 @@ async def test_raw_response_create_overload_8(self, async_client: AsyncCloudflar
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_create_overload_8(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_create_overload_11(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.applications.with_streaming_response.create(
+            domain="test.example.com/admin",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "RDP",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -3736,14 +4438,32 @@ async def test_streaming_response_create_overload_8(self, async_client: AsyncClo
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_create_overload_8(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    async def test_path_params_create_overload_11(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.create(
+                domain="test.example.com/admin",
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "RDP",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.create(
+                domain="test.example.com/admin",
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "RDP",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="self_hosted",
                 account_id="account_id",
             )
 
@@ -3767,11 +4487,8 @@ async def test_method_update_with_all_params_overload_1(self, async_client: Asyn
             type="self_hosted",
             account_id="account_id",
             allow_authenticate_via_warp=True,
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allow_iframe=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             app_launcher_visible=True,
             auto_redirect_to_identity=True,
             cors_headers={
@@ -3779,7 +4496,7 @@ async def test_method_update_with_all_params_overload_1(self, async_client: Asyn
                 "allow_all_methods": True,
                 "allow_all_origins": True,
                 "allow_credentials": True,
-                "allowed_headers": ["string", "string", "string"],
+                "allowed_headers": ["string"],
                 "allowed_methods": ["GET"],
                 "allowed_origins": ["https://example.com"],
                 "max_age": -1,
@@ -3787,10 +4504,44 @@ async def test_method_update_with_all_params_overload_1(self, async_client: Asyn
             custom_deny_message="custom_deny_message",
             custom_deny_url="custom_deny_url",
             custom_non_identity_deny_url="custom_non_identity_deny_url",
-            custom_pages=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            destinations=[
+                {
+                    "type": "public",
+                    "uri": "test.example.com/admin",
+                },
+                {
+                    "type": "public",
+                    "uri": "test.anotherexample.com/staff",
+                },
+                {
+                    "cidr": "10.5.0.0/24",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80-90",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "10.5.0.3/32",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "cidr",
+                    "hostname": "private-sni.example.com",
+                    "l4_protocol": "tcp",
+                    "port_range": "port_range",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "mcp_server_id": "mcp-server-1",
+                    "type": "via_mcp_server_portal",
+                },
             ],
             enable_binding_cookie=True,
             http_only_cookie_attribute=True,
@@ -3802,18 +4553,13 @@ async def test_method_update_with_all_params_overload_1(self, async_client: Asyn
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
+            read_service_tokens_from_header="Authorization",
             same_site_cookie_attribute="strict",
             scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
                 "authentication": {
                     "password": "password",
                     "scheme": "httpbasic",
@@ -3821,31 +4567,9 @@ async def test_method_update_with_all_params_overload_1(self, async_client: Asyn
                 },
                 "deactivate_on_delete": True,
                 "enabled": True,
-                "idp_uid": "idp_uid",
                 "mappings": [
                     {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
                         "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
                         "enabled": True,
                         "filter": 'title pr or userType eq "Intern"',
                         "operations": {
@@ -3853,17 +4577,17 @@ async def test_method_update_with_all_params_overload_1(self, async_client: Asyn
                             "delete": True,
                             "update": True,
                         },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "strictness": "strict",
                         "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
+                    }
                 ],
-                "remote_uri": "remote_uri",
             },
             self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
             service_auth_401_redirect=True,
             session_duration="24h",
             skip_interstitial=True,
-            tags=["engineers", "engineers", "engineers"],
+            tags=["engineers"],
+            use_clientless_isolation_app_launcher_url=False,
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
@@ -3902,7 +4626,15 @@ async def test_streaming_response_update_overload_1(self, async_client: AsyncClo
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_update_overload_1(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                domain="test.example.com/admin",
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 domain="test.example.com/admin",
@@ -3910,7 +4642,7 @@ async def test_path_params_update_overload_1(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 domain="test.example.com/admin",
@@ -3933,62 +4665,219 @@ async def test_method_update_with_all_params_overload_2(self, async_client: Asyn
         application = await async_client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
             account_id="account_id",
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             app_launcher_visible=True,
             auto_redirect_to_identity=True,
-            custom_pages=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
             logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
             name="Admin Site",
             policies=[
                 {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    "precedence": 0,
+                }
+            ],
+            saas_app={
+                "auth_type": "saml",
+                "consumer_service_url": "https://example.com",
+                "custom_attributes": [
+                    {
+                        "friendly_name": "Last Name",
+                        "name": "family_name",
+                        "name_format": "urn:oasis:names:tc:SAML:2.0:attrname-format:basic",
+                        "required": True,
+                        "source": {
+                            "name": "last_name",
+                            "name_by_idp": [
+                                {
+                                    "idp_id": "exampleIdPID1",
+                                    "source_name": "AttributeName1",
+                                }
+                            ],
+                        },
+                    }
+                ],
+                "default_relay_state": "https://example.com",
+                "idp_entity_id": "https://example.cloudflareaccess.com",
+                "name_id_format": "id",
+                "name_id_transform_jsonata": "$substringBefore(email, '@') & '+sandbox@' & $substringAfter(email, '@')",
+                "public_key": "example unique name",
+                "saml_attribute_transform_jsonata": "$ ~>| groups | {'group_name': name} |",
+                "sp_entity_id": "example unique name",
+                "sso_endpoint": "https://example.cloudflareaccess.com/cdn-cgi/access/sso/saml/b3f58a2b414e0b51d45c8c2af26fccca0e27c63763c426fa52f98dcf0b3b3bfd",
+            },
+            scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
+                "authentication": {
+                    "password": "password",
+                    "scheme": "httpbasic",
+                    "user": "user",
+                },
+                "deactivate_on_delete": True,
+                "enabled": True,
+                "mappings": [
+                    {
+                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "enabled": True,
+                        "filter": 'title pr or userType eq "Intern"',
+                        "operations": {
+                            "create": True,
+                            "delete": True,
+                            "update": True,
+                        },
+                        "strictness": "strict",
+                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
+                    }
+                ],
+            },
+            tags=["engineers"],
+            type="saas",
+        )
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.applications.with_raw_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        application = await response.parse()
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.applications.with_streaming_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            application = await response.parse()
+            assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.zero_trust.access.applications.with_raw_response.update(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.zero_trust.access.applications.with_raw_response.update(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_overload_3(self, async_client: AsyncCloudflare) -> None:
+        application = await async_client.zero_trust.access.applications.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            domain="test.example.com/admin",
+            type="self_hosted",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params_overload_3(self, async_client: AsyncCloudflare) -> None:
+        application = await async_client.zero_trust.access.applications.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            domain="test.example.com/admin",
+            type="self_hosted",
+            account_id="account_id",
+            allow_authenticate_via_warp=True,
+            allow_iframe=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
+            app_launcher_visible=True,
+            auto_redirect_to_identity=True,
+            cors_headers={
+                "allow_all_headers": True,
+                "allow_all_methods": True,
+                "allow_all_origins": True,
+                "allow_credentials": True,
+                "allowed_headers": ["string"],
+                "allowed_methods": ["GET"],
+                "allowed_origins": ["https://example.com"],
+                "max_age": -1,
+            },
+            custom_deny_message="custom_deny_message",
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            destinations=[
+                {
+                    "type": "public",
+                    "uri": "test.example.com/admin",
+                },
+                {
+                    "type": "public",
+                    "uri": "test.anotherexample.com/staff",
+                },
+                {
+                    "cidr": "10.5.0.0/24",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80-90",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "10.5.0.3/32",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "cidr",
+                    "hostname": "private-sni.example.com",
+                    "l4_protocol": "tcp",
+                    "port_range": "port_range",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
                 },
                 {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
+                    "mcp_server_id": "mcp-server-1",
+                    "type": "via_mcp_server_portal",
                 },
+            ],
+            enable_binding_cookie=True,
+            http_only_cookie_attribute=True,
+            logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
+            name="Admin Site",
+            options_preflight_bypass=True,
+            path_cookie_attribute=True,
+            policies=[
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
+                }
             ],
-            saas_app={
-                "auth_type": "saml",
-                "consumer_service_url": "https://example.com",
-                "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-                "custom_attributes": {
-                    "friendly_name": "Last Name",
-                    "name": "family_name",
-                    "name_format": "urn:oasis:names:tc:SAML:2.0:attrname-format:basic",
-                    "required": True,
-                    "source": {
-                        "name": "last_name",
-                        "name_by_idp": {
-                            "exampleIdPID1": "AttributeName1",
-                            "exampleIdPID2": "AttributeName2",
-                        },
-                    },
-                },
-                "default_relay_state": "https://example.com",
-                "idp_entity_id": "https://example.cloudflareaccess.com",
-                "name_id_format": "id",
-                "name_id_transform_jsonata": "$substringBefore(email, '@') & '+sandbox@' & $substringAfter(email, '@')",
-                "public_key": "example unique name",
-                "saml_attribute_transform_jsonata": "$ ~>| groups | {'group_name': name} |",
-                "sp_entity_id": "example unique name",
-                "sso_endpoint": "https://example.cloudflareaccess.com/cdn-cgi/access/sso/saml/b3f58a2b414e0b51d45c8c2af26fccca0e27c63763c426fa52f98dcf0b3b3bfd",
-                "updated_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-            },
+            read_service_tokens_from_header="Authorization",
+            same_site_cookie_attribute="strict",
             scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
                 "authentication": {
                     "password": "password",
                     "scheme": "httpbasic",
@@ -3996,31 +4885,9 @@ async def test_method_update_with_all_params_overload_2(self, async_client: Asyn
                 },
                 "deactivate_on_delete": True,
                 "enabled": True,
-                "idp_uid": "idp_uid",
                 "mappings": [
                     {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
                         "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
                         "enabled": True,
                         "filter": 'title pr or userType eq "Intern"',
                         "operations": {
@@ -4028,22 +4895,27 @@ async def test_method_update_with_all_params_overload_2(self, async_client: Asyn
                             "delete": True,
                             "update": True,
                         },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "strictness": "strict",
                         "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
+                    }
                 ],
-                "remote_uri": "remote_uri",
             },
-            tags=["engineers", "engineers", "engineers"],
-            type="saas",
+            self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
+            service_auth_401_redirect=True,
+            session_duration="24h",
+            skip_interstitial=True,
+            tags=["engineers"],
+            use_clientless_isolation_app_launcher_url=False,
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_update_overload_3(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.applications.with_raw_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            domain="test.example.com/admin",
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -4054,9 +4926,11 @@ async def test_raw_response_update_overload_2(self, async_client: AsyncCloudflar
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_update_overload_3(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.applications.with_streaming_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            domain="test.example.com/admin",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -4069,44 +4943,53 @@ async def test_streaming_response_update_overload_2(self, async_client: AsyncClo
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    async def test_path_params_update_overload_3(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                domain="test.example.com/admin",
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                domain="test.example.com/admin",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                domain="test.example.com/admin",
+                type="self_hosted",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_update_overload_3(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_overload_4(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
             domain="test.example.com/admin",
-            type="ssh",
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_update_with_all_params_overload_3(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_with_all_params_overload_4(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
             domain="test.example.com/admin",
-            type="ssh",
+            type="self_hosted",
             account_id="account_id",
             allow_authenticate_via_warp=True,
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allow_iframe=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             app_launcher_visible=True,
             auto_redirect_to_identity=True,
             cors_headers={
@@ -4114,7 +4997,7 @@ async def test_method_update_with_all_params_overload_3(self, async_client: Asyn
                 "allow_all_methods": True,
                 "allow_all_origins": True,
                 "allow_credentials": True,
-                "allowed_headers": ["string", "string", "string"],
+                "allowed_headers": ["string"],
                 "allowed_methods": ["GET"],
                 "allowed_origins": ["https://example.com"],
                 "max_age": -1,
@@ -4122,10 +5005,44 @@ async def test_method_update_with_all_params_overload_3(self, async_client: Asyn
             custom_deny_message="custom_deny_message",
             custom_deny_url="custom_deny_url",
             custom_non_identity_deny_url="custom_non_identity_deny_url",
-            custom_pages=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            destinations=[
+                {
+                    "type": "public",
+                    "uri": "test.example.com/admin",
+                },
+                {
+                    "type": "public",
+                    "uri": "test.anotherexample.com/staff",
+                },
+                {
+                    "cidr": "10.5.0.0/24",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80-90",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "10.5.0.3/32",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "cidr",
+                    "hostname": "private-sni.example.com",
+                    "l4_protocol": "tcp",
+                    "port_range": "port_range",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "mcp_server_id": "mcp-server-1",
+                    "type": "via_mcp_server_portal",
+                },
             ],
             enable_binding_cookie=True,
             http_only_cookie_attribute=True,
@@ -4137,18 +5054,13 @@ async def test_method_update_with_all_params_overload_3(self, async_client: Asyn
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
+            read_service_tokens_from_header="Authorization",
             same_site_cookie_attribute="strict",
             scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
                 "authentication": {
                     "password": "password",
                     "scheme": "httpbasic",
@@ -4156,31 +5068,9 @@ async def test_method_update_with_all_params_overload_3(self, async_client: Asyn
                 },
                 "deactivate_on_delete": True,
                 "enabled": True,
-                "idp_uid": "idp_uid",
                 "mappings": [
                     {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
                         "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
                         "enabled": True,
                         "filter": 'title pr or userType eq "Intern"',
                         "operations": {
@@ -4188,27 +5078,27 @@ async def test_method_update_with_all_params_overload_3(self, async_client: Asyn
                             "delete": True,
                             "update": True,
                         },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "strictness": "strict",
                         "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
+                    }
                 ],
-                "remote_uri": "remote_uri",
             },
             self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
             service_auth_401_redirect=True,
             session_duration="24h",
             skip_interstitial=True,
-            tags=["engineers", "engineers", "engineers"],
+            tags=["engineers"],
+            use_clientless_isolation_app_launcher_url=False,
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_update_overload_3(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_update_overload_4(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.applications.with_raw_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
             domain="test.example.com/admin",
-            type="ssh",
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -4219,11 +5109,11 @@ async def test_raw_response_update_overload_3(self, async_client: AsyncCloudflar
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_update_overload_3(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_update_overload_4(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.applications.with_streaming_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
             domain="test.example.com/admin",
-            type="ssh",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -4236,150 +5126,172 @@ async def test_streaming_response_update_overload_3(self, async_client: AsyncClo
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_update_overload_3(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    async def test_path_params_update_overload_4(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                domain="test.example.com/admin",
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 domain="test.example.com/admin",
-                type="ssh",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 domain="test.example.com/admin",
-                type="ssh",
+                type="self_hosted",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_update_overload_4(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_overload_5(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            domain="test.example.com/admin",
-            type="vnc",
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_update_with_all_params_overload_4(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_with_all_params_overload_5(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            domain="test.example.com/admin",
-            type="vnc",
+            type="self_hosted",
             account_id="account_id",
-            allow_authenticate_via_warp=True,
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
-            app_launcher_visible=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
+            app_launcher_logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
             auto_redirect_to_identity=True,
-            cors_headers={
-                "allow_all_headers": True,
-                "allow_all_methods": True,
-                "allow_all_origins": True,
-                "allow_credentials": True,
-                "allowed_headers": ["string", "string", "string"],
-                "allowed_methods": ["GET"],
-                "allowed_origins": ["https://example.com"],
-                "max_age": -1,
-            },
-            custom_deny_message="custom_deny_message",
+            bg_color="#ff0000",
             custom_deny_url="custom_deny_url",
             custom_non_identity_deny_url="custom_non_identity_deny_url",
-            custom_pages=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            footer_links=[
+                {
+                    "name": "Cloudflare's Privacy Policy",
+                    "url": "https://www.cloudflare.com/privacypolicy/",
+                }
             ],
-            enable_binding_cookie=True,
-            http_only_cookie_attribute=True,
-            logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
-            name="Admin Site",
-            options_preflight_bypass=True,
-            path_cookie_attribute=True,
+            header_bg_color="#ff0000",
+            landing_page_design={
+                "button_color": "#ff0000",
+                "button_text_color": "#ff0000",
+                "image_url": "https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
+                "message": "Log in below to reach your applications behind Access.",
+                "title": "Welcome back!",
+            },
+            policies=[
+                {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    "precedence": 0,
+                }
+            ],
+            session_duration="24h",
+            skip_app_launcher_login_page=True,
+        )
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_update_overload_5(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.applications.with_raw_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        application = await response.parse()
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_update_overload_5(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.applications.with_streaming_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            application = await response.parse()
+            assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update_overload_5(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.zero_trust.access.applications.with_raw_response.update(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                type="self_hosted",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.zero_trust.access.applications.with_raw_response.update(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_overload_6(self, async_client: AsyncCloudflare) -> None:
+        application = await async_client.zero_trust.access.applications.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params_overload_6(self, async_client: AsyncCloudflare) -> None:
+        application = await async_client.zero_trust.access.applications.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
+            account_id="account_id",
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
+            auto_redirect_to_identity=True,
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
             policies=[
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
-            same_site_cookie_attribute="strict",
-            scim_config={
-                "authentication": {
-                    "password": "password",
-                    "scheme": "httpbasic",
-                    "user": "user",
-                },
-                "deactivate_on_delete": True,
-                "enabled": True,
-                "idp_uid": "idp_uid",
-                "mappings": [
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                ],
-                "remote_uri": "remote_uri",
-            },
-            self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
-            service_auth_401_redirect=True,
             session_duration="24h",
-            skip_interstitial=True,
-            tags=["engineers", "engineers", "engineers"],
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_update_overload_4(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_update_overload_6(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.applications.with_raw_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            domain="test.example.com/admin",
-            type="vnc",
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -4390,11 +5302,10 @@ async def test_raw_response_update_overload_4(self, async_client: AsyncCloudflar
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_update_overload_4(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_update_overload_6(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.applications.with_streaming_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            domain="test.example.com/admin",
-            type="vnc",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -4407,116 +5318,66 @@ async def test_streaming_response_update_overload_4(self, async_client: AsyncClo
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_update_overload_4(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    async def test_path_params_update_overload_6(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                domain="test.example.com/admin",
-                type="vnc",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                domain="test.example.com/admin",
-                type="vnc",
+                type="self_hosted",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_update_overload_5(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_overload_7(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="app_launcher",
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_update_with_all_params_overload_5(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_with_all_params_overload_7(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="app_launcher",
+            type="self_hosted",
             account_id="account_id",
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             auto_redirect_to_identity=True,
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
             policies=[
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
-            scim_config={
-                "authentication": {
-                    "password": "password",
-                    "scheme": "httpbasic",
-                    "user": "user",
-                },
-                "deactivate_on_delete": True,
-                "enabled": True,
-                "idp_uid": "idp_uid",
-                "mappings": [
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                ],
-                "remote_uri": "remote_uri",
-            },
             session_duration="24h",
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_update_overload_5(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_update_overload_7(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.applications.with_raw_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="app_launcher",
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -4527,10 +5388,10 @@ async def test_raw_response_update_overload_5(self, async_client: AsyncCloudflar
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_update_overload_5(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_update_overload_7(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.applications.with_streaming_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="app_launcher",
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -4543,114 +5404,151 @@ async def test_streaming_response_update_overload_5(self, async_client: AsyncClo
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_update_overload_5(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    async def test_path_params_update_overload_7(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                type="app_launcher",
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                type="app_launcher",
+                type="self_hosted",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_update_overload_6(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_overload_8(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="warp",
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_update_with_all_params_overload_6(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_with_all_params_overload_8(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="warp",
+            type="self_hosted",
             account_id="account_id",
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-            ],
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             auto_redirect_to_identity=True,
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            domain="abcd123456.proxy.cloudflare-gateway.com",
+            name="Gateway Proxy",
             policies=[
                 {
                     "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
+                }
             ],
-            scim_config={
-                "authentication": {
-                    "password": "password",
-                    "scheme": "httpbasic",
-                    "user": "user",
-                },
-                "deactivate_on_delete": True,
-                "enabled": True,
-                "idp_uid": "idp_uid",
-                "mappings": [
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                ],
-                "remote_uri": "remote_uri",
-            },
             session_duration="24h",
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_update_overload_6(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_update_overload_8(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.applications.with_raw_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        application = await response.parse()
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_update_overload_8(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.applications.with_streaming_response.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            type="self_hosted",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            application = await response.parse()
+            assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update_overload_8(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.zero_trust.access.applications.with_raw_response.update(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                type="self_hosted",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
+            await async_client.zero_trust.access.applications.with_raw_response.update(
+                app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_overload_9(self, async_client: AsyncCloudflare) -> None:
+        application = await async_client.zero_trust.access.applications.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params_overload_9(self, async_client: AsyncCloudflare) -> None:
+        application = await async_client.zero_trust.access.applications.update(
+            app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+            app_launcher_visible=True,
+            domain="https://mybookmark.com",
+            logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
+            name="Admin Site",
+            policies=[
+                {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    "precedence": 0,
+                }
+            ],
+            tags=["engineers"],
+            type="bookmark",
+        )
+        assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_update_overload_9(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.applications.with_raw_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="warp",
             account_id="account_id",
         )
 
@@ -4661,10 +5559,9 @@ async def test_raw_response_update_overload_6(self, async_client: AsyncCloudflar
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_update_overload_6(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_update_overload_9(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.applications.with_streaming_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="warp",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -4677,114 +5574,88 @@ async def test_streaming_response_update_overload_6(self, async_client: AsyncClo
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_update_overload_6(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    async def test_path_params_update_overload_9(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                type="warp",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                type="warp",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_update_overload_7(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_overload_10(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="biso",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "SSH",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="infrastructure",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_update_with_all_params_overload_7(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_with_all_params_overload_10(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="biso",
-            account_id="account_id",
-            allowed_idps=[
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
-                "699d98642c564d2e855e9661899b7252",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "SSH",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
             ],
-            auto_redirect_to_identity=True,
+            type="infrastructure",
+            account_id="account_id",
+            name="Admin Site",
             policies=[
                 {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-                {
-                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "precedence": 0,
-                },
-            ],
-            scim_config={
-                "authentication": {
-                    "password": "password",
-                    "scheme": "httpbasic",
-                    "user": "user",
-                },
-                "deactivate_on_delete": True,
-                "enabled": True,
-                "idp_uid": "idp_uid",
-                "mappings": [
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
+                    "decision": "allow",
+                    "include": [{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
+                    "name": "Allow devs",
+                    "connection_rules": {
+                        "ssh": {
+                            "usernames": ["root", "ubuntu"],
+                            "allow_email_alias": True,
+                        }
                     },
-                ],
-                "remote_uri": "remote_uri",
-            },
-            session_duration="24h",
+                    "exclude": [{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
+                    "require": [{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
+                }
+            ],
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_update_overload_7(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_update_overload_10(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.applications.with_raw_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="biso",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "SSH",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="infrastructure",
             account_id="account_id",
         )
 
@@ -4795,10 +5666,17 @@ async def test_raw_response_update_overload_7(self, async_client: AsyncCloudflar
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_update_overload_7(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_update_overload_10(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.applications.with_streaming_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
-            type="biso",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "SSH",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="infrastructure",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -4811,41 +5689,156 @@ async def test_streaming_response_update_overload_7(self, async_client: AsyncClo
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_update_overload_7(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    async def test_path_params_update_overload_10(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "SSH",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="infrastructure",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                type="biso",
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "SSH",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="infrastructure",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
-                type="biso",
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "SSH",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="infrastructure",
                 account_id="account_id",
             )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_update_overload_8(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_overload_11(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            domain="test.example.com/admin",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "RDP",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="self_hosted",
             account_id="account_id",
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_method_update_with_all_params_overload_8(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_update_with_all_params_overload_11(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            domain="test.example.com/admin",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "RDP",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="self_hosted",
             account_id="account_id",
+            allow_authenticate_via_warp=True,
+            allow_iframe=True,
+            allowed_idps=["699d98642c564d2e855e9661899b7252"],
             app_launcher_visible=True,
-            domain="https://mybookmark.com",
+            auto_redirect_to_identity=True,
+            cors_headers={
+                "allow_all_headers": True,
+                "allow_all_methods": True,
+                "allow_all_origins": True,
+                "allow_credentials": True,
+                "allowed_headers": ["string"],
+                "allowed_methods": ["GET"],
+                "allowed_origins": ["https://example.com"],
+                "max_age": -1,
+            },
+            custom_deny_message="custom_deny_message",
+            custom_deny_url="custom_deny_url",
+            custom_non_identity_deny_url="custom_non_identity_deny_url",
+            custom_pages=["699d98642c564d2e855e9661899b7252"],
+            destinations=[
+                {
+                    "type": "public",
+                    "uri": "test.example.com/admin",
+                },
+                {
+                    "type": "public",
+                    "uri": "test.anotherexample.com/staff",
+                },
+                {
+                    "cidr": "10.5.0.0/24",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80-90",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "10.5.0.3/32",
+                    "hostname": "hostname",
+                    "l4_protocol": "tcp",
+                    "port_range": "80",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "cidr": "cidr",
+                    "hostname": "private-sni.example.com",
+                    "l4_protocol": "tcp",
+                    "port_range": "port_range",
+                    "type": "private",
+                    "vnet_id": "vnet_id",
+                },
+                {
+                    "mcp_server_id": "mcp-server-1",
+                    "type": "via_mcp_server_portal",
+                },
+            ],
+            enable_binding_cookie=True,
+            http_only_cookie_attribute=True,
             logo_url="https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg",
             name="Admin Site",
+            options_preflight_bypass=True,
+            path_cookie_attribute=True,
+            policies=[
+                {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    "precedence": 0,
+                }
+            ],
+            read_service_tokens_from_header="Authorization",
+            same_site_cookie_attribute="strict",
             scim_config={
+                "idp_uid": "idp_uid",
+                "remote_uri": "remote_uri",
                 "authentication": {
                     "password": "password",
                     "scheme": "httpbasic",
@@ -4853,31 +5846,9 @@ async def test_method_update_with_all_params_overload_8(self, async_client: Asyn
                 },
                 "deactivate_on_delete": True,
                 "enabled": True,
-                "idp_uid": "idp_uid",
                 "mappings": [
                     {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
-                        "enabled": True,
-                        "filter": 'title pr or userType eq "Intern"',
-                        "operations": {
-                            "create": True,
-                            "delete": True,
-                            "update": True,
-                        },
                         "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
-                        "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
-                    {
                         "enabled": True,
                         "filter": 'title pr or userType eq "Intern"',
                         "operations": {
@@ -4885,22 +5856,34 @@ async def test_method_update_with_all_params_overload_8(self, async_client: Asyn
                             "delete": True,
                             "update": True,
                         },
-                        "schema": "urn:ietf:params:scim:schemas:core:2.0:User",
+                        "strictness": "strict",
                         "transform_jsonata": "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-                    },
+                    }
                 ],
-                "remote_uri": "remote_uri",
             },
-            tags=["engineers", "engineers", "engineers"],
-            type="bookmark",
+            self_hosted_domains=["test.example.com/admin", "test.anotherexample.com/staff"],
+            service_auth_401_redirect=True,
+            session_duration="24h",
+            skip_interstitial=True,
+            tags=["engineers"],
+            use_clientless_isolation_app_launcher_url=False,
         )
         assert_matches_type(Optional[ApplicationUpdateResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_raw_response_update_overload_8(self, async_client: AsyncCloudflare) -> None:
+    async def test_raw_response_update_overload_11(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.applications.with_raw_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            domain="test.example.com/admin",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "RDP",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="self_hosted",
             account_id="account_id",
         )
 
@@ -4911,9 +5894,18 @@ async def test_raw_response_update_overload_8(self, async_client: AsyncCloudflar
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_streaming_response_update_overload_8(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_update_overload_11(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.applications.with_streaming_response.update(
             app_id="023e105f4ecef8ad9ca31a8372d0c353",
+            domain="test.example.com/admin",
+            target_criteria=[
+                {
+                    "port": 22,
+                    "protocol": "RDP",
+                    "target_attributes": {"hostname": ["test-server", "production-server"]},
+                }
+            ],
+            type="self_hosted",
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -4926,16 +5918,49 @@ async def test_streaming_response_update_overload_8(self, async_client: AsyncClo
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
-    async def test_path_params_update_overload_8(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+    async def test_path_params_update_overload_11(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.zero_trust.access.applications.with_raw_response.update(
+                app_id="",
+                domain="test.example.com/admin",
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "RDP",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="self_hosted",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                domain="test.example.com/admin",
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "RDP",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="self_hosted",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.update(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
+                domain="test.example.com/admin",
+                target_criteria=[
+                    {
+                        "port": 22,
+                        "protocol": "RDP",
+                        "target_attributes": {"hostname": ["test-server", "production-server"]},
+                    }
+                ],
+                type="self_hosted",
                 account_id="account_id",
             )
 
@@ -4945,15 +5970,23 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.list(
             account_id="account_id",
         )
-        assert_matches_type(AsyncSinglePage[ApplicationListResponse], application, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[ApplicationListResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         application = await async_client.zero_trust.access.applications.list(
             account_id="account_id",
+            aud="aud",
+            domain="domain",
+            exact=True,
+            name="name",
+            page=0,
+            per_page=0,
+            search="search",
+            target_attributes="target_attributes",
         )
-        assert_matches_type(AsyncSinglePage[ApplicationListResponse], application, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[ApplicationListResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4965,7 +5998,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         application = await response.parse()
-        assert_matches_type(AsyncSinglePage[ApplicationListResponse], application, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[ApplicationListResponse], application, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -4977,19 +6010,19 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             application = await response.parse()
-            assert_matches_type(AsyncSinglePage[ApplicationListResponse], application, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[ApplicationListResponse], application, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.list(
                 account_id="account_id",
             )
@@ -5043,13 +6076,19 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.zero_trust.access.applications.with_raw_response.delete(
+                app_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.delete(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.delete(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="account_id",
@@ -5104,13 +6143,19 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.zero_trust.access.applications.with_raw_response.get(
+                app_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.get(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.get(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="account_id",
@@ -5165,13 +6210,19 @@ async def test_streaming_response_revoke_tokens(self, async_client: AsyncCloudfl
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_revoke_tokens(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `app_id` but received ''"):
+            await async_client.zero_trust.access.applications.with_raw_response.revoke_tokens(
+                app_id="",
+                account_id="account_id",
+            )
+
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.revoke_tokens(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.applications.with_raw_response.revoke_tokens(
                 app_id="023e105f4ecef8ad9ca31a8372d0c353",
                 account_id="account_id",
diff --git a/tests/api_resources/zero_trust/access/test_bookmarks.py b/tests/api_resources/zero_trust/access/test_bookmarks.py
index 2e04d6c5af3..b824fd1024a 100644
--- a/tests/api_resources/zero_trust/access/test_bookmarks.py
+++ b/tests/api_resources/zero_trust/access/test_bookmarks.py
@@ -15,6 +15,8 @@
     BookmarkDeleteResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -23,20 +25,23 @@ class TestBookmarks:
 
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
-        bookmark = client.zero_trust.access.bookmarks.create(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            bookmark = client.zero_trust.access.bookmarks.create(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+                body={},
+            )
+
         assert_matches_type(Optional[Bookmark], bookmark, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.zero_trust.access.bookmarks.with_raw_response.create(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.zero_trust.access.bookmarks.with_raw_response.create(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+                body={},
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -45,51 +50,56 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.zero_trust.access.bookmarks.with_streaming_response.create(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            body={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.zero_trust.access.bookmarks.with_streaming_response.create(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+                body={},
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            bookmark = response.parse()
-            assert_matches_type(Optional[Bookmark], bookmark, path=["response"])
+                bookmark = response.parse()
+                assert_matches_type(Optional[Bookmark], bookmark, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.access.bookmarks.with_raw_response.create(
-                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-                body={},
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.zero_trust.access.bookmarks.with_raw_response.create(
+                    bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    account_id="",
+                    body={},
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `bookmark_id` but received ''"):
+                client.zero_trust.access.bookmarks.with_raw_response.create(
+                    bookmark_id="",
+                    account_id="699d98642c564d2e855e9661899b7252",
+                    body={},
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bookmark_id` but received ''"):
-            client.zero_trust.access.bookmarks.with_raw_response.create(
-                bookmark_id="",
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            bookmark = client.zero_trust.access.bookmarks.update(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="699d98642c564d2e855e9661899b7252",
                 body={},
             )
 
-    @parametrize
-    def test_method_update(self, client: Cloudflare) -> None:
-        bookmark = client.zero_trust.access.bookmarks.update(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            body={},
-        )
         assert_matches_type(Optional[Bookmark], bookmark, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.zero_trust.access.bookmarks.with_raw_response.update(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.zero_trust.access.bookmarks.with_raw_response.update(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+                body={},
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -98,47 +108,52 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.zero_trust.access.bookmarks.with_streaming_response.update(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            body={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.zero_trust.access.bookmarks.with_streaming_response.update(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+                body={},
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            bookmark = response.parse()
-            assert_matches_type(Optional[Bookmark], bookmark, path=["response"])
+                bookmark = response.parse()
+                assert_matches_type(Optional[Bookmark], bookmark, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.access.bookmarks.with_raw_response.update(
-                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-                body={},
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.zero_trust.access.bookmarks.with_raw_response.update(
+                    bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    account_id="",
+                    body={},
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `bookmark_id` but received ''"):
+                client.zero_trust.access.bookmarks.with_raw_response.update(
+                    bookmark_id="",
+                    account_id="699d98642c564d2e855e9661899b7252",
+                    body={},
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bookmark_id` but received ''"):
-            client.zero_trust.access.bookmarks.with_raw_response.update(
-                bookmark_id="",
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            bookmark = client.zero_trust.access.bookmarks.list(
                 account_id="699d98642c564d2e855e9661899b7252",
-                body={},
             )
 
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        bookmark = client.zero_trust.access.bookmarks.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
         assert_matches_type(SyncSinglePage[Bookmark], bookmark, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.zero_trust.access.bookmarks.with_raw_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.zero_trust.access.bookmarks.with_raw_response.list(
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -147,38 +162,43 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.zero_trust.access.bookmarks.with_streaming_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.zero_trust.access.bookmarks.with_streaming_response.list(
+                account_id="699d98642c564d2e855e9661899b7252",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            bookmark = response.parse()
-            assert_matches_type(SyncSinglePage[Bookmark], bookmark, path=["response"])
+                bookmark = response.parse()
+                assert_matches_type(SyncSinglePage[Bookmark], bookmark, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.access.bookmarks.with_raw_response.list(
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.zero_trust.access.bookmarks.with_raw_response.list(
+                    account_id="",
+                )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
-        bookmark = client.zero_trust.access.bookmarks.delete(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            bookmark = client.zero_trust.access.bookmarks.delete(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
         assert_matches_type(Optional[BookmarkDeleteResponse], bookmark, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.zero_trust.access.bookmarks.with_raw_response.delete(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.zero_trust.access.bookmarks.with_raw_response.delete(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -187,46 +207,51 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.zero_trust.access.bookmarks.with_streaming_response.delete(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.zero_trust.access.bookmarks.with_streaming_response.delete(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            bookmark = response.parse()
-            assert_matches_type(Optional[BookmarkDeleteResponse], bookmark, path=["response"])
+                bookmark = response.parse()
+                assert_matches_type(Optional[BookmarkDeleteResponse], bookmark, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.access.bookmarks.with_raw_response.delete(
-                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.zero_trust.access.bookmarks.with_raw_response.delete(
+                    bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    account_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bookmark_id` but received ''"):
-            client.zero_trust.access.bookmarks.with_raw_response.delete(
-                bookmark_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `bookmark_id` but received ''"):
+                client.zero_trust.access.bookmarks.with_raw_response.delete(
+                    bookmark_id="",
+                    account_id="699d98642c564d2e855e9661899b7252",
+                )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        bookmark = client.zero_trust.access.bookmarks.get(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            bookmark = client.zero_trust.access.bookmarks.get(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
         assert_matches_type(Optional[Bookmark], bookmark, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.zero_trust.access.bookmarks.with_raw_response.get(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.zero_trust.access.bookmarks.with_raw_response.get(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -235,52 +260,59 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.zero_trust.access.bookmarks.with_streaming_response.get(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.zero_trust.access.bookmarks.with_streaming_response.get(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            bookmark = response.parse()
-            assert_matches_type(Optional[Bookmark], bookmark, path=["response"])
+                bookmark = response.parse()
+                assert_matches_type(Optional[Bookmark], bookmark, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.access.bookmarks.with_raw_response.get(
-                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.zero_trust.access.bookmarks.with_raw_response.get(
+                    bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    account_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bookmark_id` but received ''"):
-            client.zero_trust.access.bookmarks.with_raw_response.get(
-                bookmark_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `bookmark_id` but received ''"):
+                client.zero_trust.access.bookmarks.with_raw_response.get(
+                    bookmark_id="",
+                    account_id="699d98642c564d2e855e9661899b7252",
+                )
 
 
 class TestAsyncBookmarks:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        bookmark = await async_client.zero_trust.access.bookmarks.create(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            bookmark = await async_client.zero_trust.access.bookmarks.create(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+                body={},
+            )
+
         assert_matches_type(Optional[Bookmark], bookmark, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.access.bookmarks.with_raw_response.create(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.zero_trust.access.bookmarks.with_raw_response.create(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+                body={},
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -289,51 +321,56 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.access.bookmarks.with_streaming_response.create(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            body={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.zero_trust.access.bookmarks.with_streaming_response.create(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+                body={},
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            bookmark = await response.parse()
-            assert_matches_type(Optional[Bookmark], bookmark, path=["response"])
+                bookmark = await response.parse()
+                assert_matches_type(Optional[Bookmark], bookmark, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.access.bookmarks.with_raw_response.create(
-                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-                body={},
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.zero_trust.access.bookmarks.with_raw_response.create(
+                    bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    account_id="",
+                    body={},
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `bookmark_id` but received ''"):
+                await async_client.zero_trust.access.bookmarks.with_raw_response.create(
+                    bookmark_id="",
+                    account_id="699d98642c564d2e855e9661899b7252",
+                    body={},
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bookmark_id` but received ''"):
-            await async_client.zero_trust.access.bookmarks.with_raw_response.create(
-                bookmark_id="",
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            bookmark = await async_client.zero_trust.access.bookmarks.update(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="699d98642c564d2e855e9661899b7252",
                 body={},
             )
 
-    @parametrize
-    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        bookmark = await async_client.zero_trust.access.bookmarks.update(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            body={},
-        )
         assert_matches_type(Optional[Bookmark], bookmark, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.access.bookmarks.with_raw_response.update(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            body={},
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.zero_trust.access.bookmarks.with_raw_response.update(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+                body={},
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -342,47 +379,52 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.access.bookmarks.with_streaming_response.update(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            body={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.zero_trust.access.bookmarks.with_streaming_response.update(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+                body={},
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            bookmark = await response.parse()
-            assert_matches_type(Optional[Bookmark], bookmark, path=["response"])
+                bookmark = await response.parse()
+                assert_matches_type(Optional[Bookmark], bookmark, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.access.bookmarks.with_raw_response.update(
-                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-                body={},
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.zero_trust.access.bookmarks.with_raw_response.update(
+                    bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    account_id="",
+                    body={},
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `bookmark_id` but received ''"):
+                await async_client.zero_trust.access.bookmarks.with_raw_response.update(
+                    bookmark_id="",
+                    account_id="699d98642c564d2e855e9661899b7252",
+                    body={},
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bookmark_id` but received ''"):
-            await async_client.zero_trust.access.bookmarks.with_raw_response.update(
-                bookmark_id="",
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            bookmark = await async_client.zero_trust.access.bookmarks.list(
                 account_id="699d98642c564d2e855e9661899b7252",
-                body={},
             )
 
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        bookmark = await async_client.zero_trust.access.bookmarks.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
         assert_matches_type(AsyncSinglePage[Bookmark], bookmark, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.access.bookmarks.with_raw_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.zero_trust.access.bookmarks.with_raw_response.list(
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -391,38 +433,43 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.access.bookmarks.with_streaming_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.zero_trust.access.bookmarks.with_streaming_response.list(
+                account_id="699d98642c564d2e855e9661899b7252",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            bookmark = await response.parse()
-            assert_matches_type(AsyncSinglePage[Bookmark], bookmark, path=["response"])
+                bookmark = await response.parse()
+                assert_matches_type(AsyncSinglePage[Bookmark], bookmark, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.access.bookmarks.with_raw_response.list(
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.zero_trust.access.bookmarks.with_raw_response.list(
+                    account_id="",
+                )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        bookmark = await async_client.zero_trust.access.bookmarks.delete(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            bookmark = await async_client.zero_trust.access.bookmarks.delete(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
         assert_matches_type(Optional[BookmarkDeleteResponse], bookmark, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.access.bookmarks.with_raw_response.delete(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.zero_trust.access.bookmarks.with_raw_response.delete(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -431,46 +478,51 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.access.bookmarks.with_streaming_response.delete(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.zero_trust.access.bookmarks.with_streaming_response.delete(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            bookmark = await response.parse()
-            assert_matches_type(Optional[BookmarkDeleteResponse], bookmark, path=["response"])
+                bookmark = await response.parse()
+                assert_matches_type(Optional[BookmarkDeleteResponse], bookmark, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.access.bookmarks.with_raw_response.delete(
-                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.zero_trust.access.bookmarks.with_raw_response.delete(
+                    bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    account_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bookmark_id` but received ''"):
-            await async_client.zero_trust.access.bookmarks.with_raw_response.delete(
-                bookmark_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `bookmark_id` but received ''"):
+                await async_client.zero_trust.access.bookmarks.with_raw_response.delete(
+                    bookmark_id="",
+                    account_id="699d98642c564d2e855e9661899b7252",
+                )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        bookmark = await async_client.zero_trust.access.bookmarks.get(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            bookmark = await async_client.zero_trust.access.bookmarks.get(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
         assert_matches_type(Optional[Bookmark], bookmark, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.access.bookmarks.with_raw_response.get(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.zero_trust.access.bookmarks.with_raw_response.get(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -479,28 +531,30 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.access.bookmarks.with_streaming_response.get(
-            bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.zero_trust.access.bookmarks.with_streaming_response.get(
+                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            bookmark = await response.parse()
-            assert_matches_type(Optional[Bookmark], bookmark, path=["response"])
+                bookmark = await response.parse()
+                assert_matches_type(Optional[Bookmark], bookmark, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.access.bookmarks.with_raw_response.get(
-                bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `bookmark_id` but received ''"):
-            await async_client.zero_trust.access.bookmarks.with_raw_response.get(
-                bookmark_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.zero_trust.access.bookmarks.with_raw_response.get(
+                    bookmark_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    account_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `bookmark_id` but received ''"):
+                await async_client.zero_trust.access.bookmarks.with_raw_response.get(
+                    bookmark_id="",
+                    account_id="699d98642c564d2e855e9661899b7252",
+                )
diff --git a/tests/api_resources/zero_trust/access/test_certificates.py b/tests/api_resources/zero_trust/access/test_certificates.py
index a6a37770c61..a4dd3324ba0 100644
--- a/tests/api_resources/zero_trust/access/test_certificates.py
+++ b/tests/api_resources/zero_trust/access/test_certificates.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.zero_trust.access import (
     Certificate,
     CertificateDeleteResponse,
@@ -38,7 +38,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             certificate="-----BEGIN CERTIFICATE-----\nMIIGAjCCA+qgAwIBAgIJAI7kymlF7CWT...N4RI7KKB7nikiuUf8vhULKy5IX10\nDrUtmu/B\n-----END CERTIFICATE-----",
             name="Allow devs",
             account_id="account_id",
-            associated_hostnames=["admin.example.com", "admin.example.com", "admin.example.com"],
+            associated_hostnames=["admin.example.com"],
         )
         assert_matches_type(Optional[Certificate], certificate, path=["response"])
 
@@ -75,14 +75,14 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.certificates.with_raw_response.create(
                 certificate="-----BEGIN CERTIFICATE-----\nMIIGAjCCA+qgAwIBAgIJAI7kymlF7CWT...N4RI7KKB7nikiuUf8vhULKy5IX10\nDrUtmu/B\n-----END CERTIFICATE-----",
                 name="Allow devs",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.certificates.with_raw_response.create(
                 certificate="-----BEGIN CERTIFICATE-----\nMIIGAjCCA+qgAwIBAgIJAI7kymlF7CWT...N4RI7KKB7nikiuUf8vhULKy5IX10\nDrUtmu/B\n-----END CERTIFICATE-----",
                 name="Allow devs",
@@ -94,7 +94,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
     def test_method_update(self, client: Cloudflare) -> None:
         certificate = client.zero_trust.access.certificates.update(
             certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            associated_hostnames=["admin.example.com", "admin.example.com", "admin.example.com"],
+            associated_hostnames=["admin.example.com"],
             account_id="account_id",
         )
         assert_matches_type(Optional[Certificate], certificate, path=["response"])
@@ -104,7 +104,7 @@ def test_method_update(self, client: Cloudflare) -> None:
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         certificate = client.zero_trust.access.certificates.update(
             certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            associated_hostnames=["admin.example.com", "admin.example.com", "admin.example.com"],
+            associated_hostnames=["admin.example.com"],
             account_id="account_id",
             name="Allow devs",
         )
@@ -115,7 +115,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.certificates.with_raw_response.update(
             certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            associated_hostnames=["admin.example.com", "admin.example.com", "admin.example.com"],
+            associated_hostnames=["admin.example.com"],
             account_id="account_id",
         )
 
@@ -129,7 +129,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.zero_trust.access.certificates.with_streaming_response.update(
             certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            associated_hostnames=["admin.example.com", "admin.example.com", "admin.example.com"],
+            associated_hostnames=["admin.example.com"],
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -146,21 +146,21 @@ def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
             client.zero_trust.access.certificates.with_raw_response.update(
                 certificate_id="",
-                associated_hostnames=["admin.example.com", "admin.example.com", "admin.example.com"],
+                associated_hostnames=["admin.example.com"],
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.certificates.with_raw_response.update(
                 certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                associated_hostnames=["admin.example.com", "admin.example.com", "admin.example.com"],
+                associated_hostnames=["admin.example.com"],
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.certificates.with_raw_response.update(
                 certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                associated_hostnames=["admin.example.com", "admin.example.com", "admin.example.com"],
+                associated_hostnames=["admin.example.com"],
                 account_id="account_id",
             )
 
@@ -170,15 +170,17 @@ def test_method_list(self, client: Cloudflare) -> None:
         certificate = client.zero_trust.access.certificates.list(
             account_id="account_id",
         )
-        assert_matches_type(SyncSinglePage[Certificate], certificate, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Certificate], certificate, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         certificate = client.zero_trust.access.certificates.list(
             account_id="account_id",
+            page=0,
+            per_page=0,
         )
-        assert_matches_type(SyncSinglePage[Certificate], certificate, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Certificate], certificate, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -190,7 +192,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         certificate = response.parse()
-        assert_matches_type(SyncSinglePage[Certificate], certificate, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Certificate], certificate, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -202,19 +204,19 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             certificate = response.parse()
-            assert_matches_type(SyncSinglePage[Certificate], certificate, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[Certificate], certificate, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.certificates.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.certificates.with_raw_response.list(
                 account_id="account_id",
             )
@@ -274,13 +276,13 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.certificates.with_raw_response.delete(
                 certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.certificates.with_raw_response.delete(
                 certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -341,13 +343,13 @@ def test_path_params_get(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.certificates.with_raw_response.get(
                 certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.certificates.with_raw_response.get(
                 certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -355,7 +357,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncCertificates:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -374,7 +378,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             certificate="-----BEGIN CERTIFICATE-----\nMIIGAjCCA+qgAwIBAgIJAI7kymlF7CWT...N4RI7KKB7nikiuUf8vhULKy5IX10\nDrUtmu/B\n-----END CERTIFICATE-----",
             name="Allow devs",
             account_id="account_id",
-            associated_hostnames=["admin.example.com", "admin.example.com", "admin.example.com"],
+            associated_hostnames=["admin.example.com"],
         )
         assert_matches_type(Optional[Certificate], certificate, path=["response"])
 
@@ -411,14 +415,14 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.certificates.with_raw_response.create(
                 certificate="-----BEGIN CERTIFICATE-----\nMIIGAjCCA+qgAwIBAgIJAI7kymlF7CWT...N4RI7KKB7nikiuUf8vhULKy5IX10\nDrUtmu/B\n-----END CERTIFICATE-----",
                 name="Allow devs",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.certificates.with_raw_response.create(
                 certificate="-----BEGIN CERTIFICATE-----\nMIIGAjCCA+qgAwIBAgIJAI7kymlF7CWT...N4RI7KKB7nikiuUf8vhULKy5IX10\nDrUtmu/B\n-----END CERTIFICATE-----",
                 name="Allow devs",
@@ -430,7 +434,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         certificate = await async_client.zero_trust.access.certificates.update(
             certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            associated_hostnames=["admin.example.com", "admin.example.com", "admin.example.com"],
+            associated_hostnames=["admin.example.com"],
             account_id="account_id",
         )
         assert_matches_type(Optional[Certificate], certificate, path=["response"])
@@ -440,7 +444,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         certificate = await async_client.zero_trust.access.certificates.update(
             certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            associated_hostnames=["admin.example.com", "admin.example.com", "admin.example.com"],
+            associated_hostnames=["admin.example.com"],
             account_id="account_id",
             name="Allow devs",
         )
@@ -451,7 +455,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.certificates.with_raw_response.update(
             certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            associated_hostnames=["admin.example.com", "admin.example.com", "admin.example.com"],
+            associated_hostnames=["admin.example.com"],
             account_id="account_id",
         )
 
@@ -465,7 +469,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.certificates.with_streaming_response.update(
             certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            associated_hostnames=["admin.example.com", "admin.example.com", "admin.example.com"],
+            associated_hostnames=["admin.example.com"],
             account_id="account_id",
         ) as response:
             assert not response.is_closed
@@ -482,21 +486,21 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
             await async_client.zero_trust.access.certificates.with_raw_response.update(
                 certificate_id="",
-                associated_hostnames=["admin.example.com", "admin.example.com", "admin.example.com"],
+                associated_hostnames=["admin.example.com"],
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.certificates.with_raw_response.update(
                 certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                associated_hostnames=["admin.example.com", "admin.example.com", "admin.example.com"],
+                associated_hostnames=["admin.example.com"],
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.certificates.with_raw_response.update(
                 certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                associated_hostnames=["admin.example.com", "admin.example.com", "admin.example.com"],
+                associated_hostnames=["admin.example.com"],
                 account_id="account_id",
             )
 
@@ -506,15 +510,17 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         certificate = await async_client.zero_trust.access.certificates.list(
             account_id="account_id",
         )
-        assert_matches_type(AsyncSinglePage[Certificate], certificate, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Certificate], certificate, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         certificate = await async_client.zero_trust.access.certificates.list(
             account_id="account_id",
+            page=0,
+            per_page=0,
         )
-        assert_matches_type(AsyncSinglePage[Certificate], certificate, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Certificate], certificate, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -526,7 +532,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         certificate = await response.parse()
-        assert_matches_type(AsyncSinglePage[Certificate], certificate, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Certificate], certificate, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -538,19 +544,19 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             certificate = await response.parse()
-            assert_matches_type(AsyncSinglePage[Certificate], certificate, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[Certificate], certificate, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.certificates.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.certificates.with_raw_response.list(
                 account_id="account_id",
             )
@@ -610,13 +616,13 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.certificates.with_raw_response.delete(
                 certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.certificates.with_raw_response.delete(
                 certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -677,13 +683,13 @@ async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.certificates.with_raw_response.get(
                 certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.certificates.with_raw_response.get(
                 certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
diff --git a/tests/api_resources/zero_trust/access/test_custom_pages.py b/tests/api_resources/zero_trust/access/test_custom_pages.py
index 552c71677be..132229ac287 100644
--- a/tests/api_resources/zero_trust/access/test_custom_pages.py
+++ b/tests/api_resources/zero_trust/access/test_custom_pages.py
@@ -9,8 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare._utils import parse_datetime
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.zero_trust.access import (
     CustomPage,
     CustomPageWithoutHTML,
@@ -33,20 +32,6 @@ def test_method_create(self, client: Cloudflare) -> None:
         )
         assert_matches_type(Optional[CustomPageWithoutHTML], custom_page, path=["response"])
 
-    @parametrize
-    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
-        custom_page = client.zero_trust.access.custom_pages.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            custom_html="<html><body><h1>Access Denied</h1></body></html>",
-            name="name",
-            type="identity_denied",
-            app_count=0,
-            created_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
-            uid="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            updated_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
-        )
-        assert_matches_type(Optional[CustomPageWithoutHTML], custom_page, path=["response"])
-
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.custom_pages.with_raw_response.create(
@@ -98,21 +83,6 @@ def test_method_update(self, client: Cloudflare) -> None:
         )
         assert_matches_type(Optional[CustomPageWithoutHTML], custom_page, path=["response"])
 
-    @parametrize
-    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        custom_page = client.zero_trust.access.custom_pages.update(
-            custom_page_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            custom_html="<html><body><h1>Access Denied</h1></body></html>",
-            name="name",
-            type="identity_denied",
-            app_count=0,
-            created_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
-            uid="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            updated_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
-        )
-        assert_matches_type(Optional[CustomPageWithoutHTML], custom_page, path=["response"])
-
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.custom_pages.with_raw_response.update(
@@ -170,7 +140,16 @@ def test_method_list(self, client: Cloudflare) -> None:
         custom_page = client.zero_trust.access.custom_pages.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncSinglePage[CustomPageWithoutHTML], custom_page, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[CustomPageWithoutHTML], custom_page, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        custom_page = client.zero_trust.access.custom_pages.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=0,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[CustomPageWithoutHTML], custom_page, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -181,7 +160,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom_page = response.parse()
-        assert_matches_type(SyncSinglePage[CustomPageWithoutHTML], custom_page, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[CustomPageWithoutHTML], custom_page, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -192,7 +171,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             custom_page = response.parse()
-            assert_matches_type(SyncSinglePage[CustomPageWithoutHTML], custom_page, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[CustomPageWithoutHTML], custom_page, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -301,7 +280,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncCustomPages:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -313,20 +294,6 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(Optional[CustomPageWithoutHTML], custom_page, path=["response"])
 
-    @parametrize
-    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        custom_page = await async_client.zero_trust.access.custom_pages.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            custom_html="<html><body><h1>Access Denied</h1></body></html>",
-            name="name",
-            type="identity_denied",
-            app_count=0,
-            created_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
-            uid="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            updated_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
-        )
-        assert_matches_type(Optional[CustomPageWithoutHTML], custom_page, path=["response"])
-
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.custom_pages.with_raw_response.create(
@@ -378,21 +345,6 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(Optional[CustomPageWithoutHTML], custom_page, path=["response"])
 
-    @parametrize
-    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        custom_page = await async_client.zero_trust.access.custom_pages.update(
-            custom_page_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            custom_html="<html><body><h1>Access Denied</h1></body></html>",
-            name="name",
-            type="identity_denied",
-            app_count=0,
-            created_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
-            uid="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            updated_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
-        )
-        assert_matches_type(Optional[CustomPageWithoutHTML], custom_page, path=["response"])
-
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.custom_pages.with_raw_response.update(
@@ -450,7 +402,16 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         custom_page = await async_client.zero_trust.access.custom_pages.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncSinglePage[CustomPageWithoutHTML], custom_page, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[CustomPageWithoutHTML], custom_page, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        custom_page = await async_client.zero_trust.access.custom_pages.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=0,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[CustomPageWithoutHTML], custom_page, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -461,7 +422,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom_page = await response.parse()
-        assert_matches_type(AsyncSinglePage[CustomPageWithoutHTML], custom_page, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[CustomPageWithoutHTML], custom_page, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -472,7 +433,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             custom_page = await response.parse()
-            assert_matches_type(AsyncSinglePage[CustomPageWithoutHTML], custom_page, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[CustomPageWithoutHTML], custom_page, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/zero_trust/access/test_gateway_ca.py b/tests/api_resources/zero_trust/access/test_gateway_ca.py
new file mode 100644
index 00000000000..80604ae6620
--- /dev/null
+++ b/tests/api_resources/zero_trust/access/test_gateway_ca.py
@@ -0,0 +1,273 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.access import GatewayCAListResponse, GatewayCACreateResponse, GatewayCADeleteResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestGatewayCA:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        gateway_ca = client.zero_trust.access.gateway_ca.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[GatewayCACreateResponse], gateway_ca, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.gateway_ca.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        gateway_ca = response.parse()
+        assert_matches_type(Optional[GatewayCACreateResponse], gateway_ca, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.gateway_ca.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            gateway_ca = response.parse()
+            assert_matches_type(Optional[GatewayCACreateResponse], gateway_ca, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.gateway_ca.with_raw_response.create(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        gateway_ca = client.zero_trust.access.gateway_ca.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[GatewayCAListResponse], gateway_ca, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.gateway_ca.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        gateway_ca = response.parse()
+        assert_matches_type(SyncSinglePage[GatewayCAListResponse], gateway_ca, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.gateway_ca.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            gateway_ca = response.parse()
+            assert_matches_type(SyncSinglePage[GatewayCAListResponse], gateway_ca, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.gateway_ca.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        gateway_ca = client.zero_trust.access.gateway_ca.delete(
+            certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[GatewayCADeleteResponse], gateway_ca, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.access.gateway_ca.with_raw_response.delete(
+            certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        gateway_ca = response.parse()
+        assert_matches_type(Optional[GatewayCADeleteResponse], gateway_ca, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.access.gateway_ca.with_streaming_response.delete(
+            certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            gateway_ca = response.parse()
+            assert_matches_type(Optional[GatewayCADeleteResponse], gateway_ca, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.access.gateway_ca.with_raw_response.delete(
+                certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+            client.zero_trust.access.gateway_ca.with_raw_response.delete(
+                certificate_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncGatewayCA:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        gateway_ca = await async_client.zero_trust.access.gateway_ca.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[GatewayCACreateResponse], gateway_ca, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.gateway_ca.with_raw_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        gateway_ca = await response.parse()
+        assert_matches_type(Optional[GatewayCACreateResponse], gateway_ca, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.gateway_ca.with_streaming_response.create(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            gateway_ca = await response.parse()
+            assert_matches_type(Optional[GatewayCACreateResponse], gateway_ca, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.gateway_ca.with_raw_response.create(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        gateway_ca = await async_client.zero_trust.access.gateway_ca.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[GatewayCAListResponse], gateway_ca, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.gateway_ca.with_raw_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        gateway_ca = await response.parse()
+        assert_matches_type(AsyncSinglePage[GatewayCAListResponse], gateway_ca, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.gateway_ca.with_streaming_response.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            gateway_ca = await response.parse()
+            assert_matches_type(AsyncSinglePage[GatewayCAListResponse], gateway_ca, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.gateway_ca.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        gateway_ca = await async_client.zero_trust.access.gateway_ca.delete(
+            certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[GatewayCADeleteResponse], gateway_ca, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.access.gateway_ca.with_raw_response.delete(
+            certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        gateway_ca = await response.parse()
+        assert_matches_type(Optional[GatewayCADeleteResponse], gateway_ca, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.access.gateway_ca.with_streaming_response.delete(
+            certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            gateway_ca = await response.parse()
+            assert_matches_type(Optional[GatewayCADeleteResponse], gateway_ca, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.access.gateway_ca.with_raw_response.delete(
+                certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+            await async_client.zero_trust.access.gateway_ca.with_raw_response.delete(
+                certificate_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/zero_trust/access/test_groups.py b/tests/api_resources/zero_trust/access/test_groups.py
index f8f2d26c57f..66b87db4b78 100644
--- a/tests/api_resources/zero_trust/access/test_groups.py
+++ b/tests/api_resources/zero_trust/access/test_groups.py
@@ -9,10 +9,13 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.zero_trust.access import (
-    ZeroTrustGroup,
+    GroupGetResponse,
+    GroupListResponse,
+    GroupCreateResponse,
     GroupDeleteResponse,
+    GroupUpdateResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -25,50 +28,30 @@ class TestGroups:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         group = client.zero_trust.access.groups.create(
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             account_id="account_id",
         )
-        assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(Optional[GroupCreateResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         group = client.zero_trust.access.groups.create(
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             account_id="account_id",
-            exclude=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            exclude=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             is_default=True,
-            require=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            require=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
         )
-        assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(Optional[GroupCreateResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.groups.with_raw_response.create(
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             account_id="account_id",
         )
@@ -76,17 +59,13 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         group = response.parse()
-        assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(Optional[GroupCreateResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.zero_trust.access.groups.with_streaming_response.create(
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             account_id="account_id",
         ) as response:
@@ -94,31 +73,23 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             group = response.parse()
-            assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+            assert_matches_type(Optional[GroupCreateResponse], group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.groups.with_raw_response.create(
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
+                include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
                 name="Allow devs",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.groups.with_raw_response.create(
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
+                include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
                 name="Allow devs",
                 account_id="account_id",
             )
@@ -128,52 +99,32 @@ def test_path_params_create(self, client: Cloudflare) -> None:
     def test_method_update(self, client: Cloudflare) -> None:
         group = client.zero_trust.access.groups.update(
             group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             account_id="account_id",
         )
-        assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(Optional[GroupUpdateResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         group = client.zero_trust.access.groups.update(
             group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             account_id="account_id",
-            exclude=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            exclude=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             is_default=True,
-            require=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            require=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
         )
-        assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(Optional[GroupUpdateResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.groups.with_raw_response.update(
             group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             account_id="account_id",
         )
@@ -181,18 +132,14 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         group = response.parse()
-        assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(Optional[GroupUpdateResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.zero_trust.access.groups.with_streaming_response.update(
             group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             account_id="account_id",
         ) as response:
@@ -200,7 +147,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             group = response.parse()
-            assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+            assert_matches_type(Optional[GroupUpdateResponse], group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -210,35 +157,23 @@ def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `group_id` but received ''"):
             client.zero_trust.access.groups.with_raw_response.update(
                 group_id="",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
+                include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
                 name="Allow devs",
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.groups.with_raw_response.update(
                 group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
+                include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
                 name="Allow devs",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.groups.with_raw_response.update(
                 group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
+                include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
                 name="Allow devs",
                 account_id="account_id",
             )
@@ -249,15 +184,19 @@ def test_method_list(self, client: Cloudflare) -> None:
         group = client.zero_trust.access.groups.list(
             account_id="account_id",
         )
-        assert_matches_type(SyncSinglePage[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[GroupListResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         group = client.zero_trust.access.groups.list(
             account_id="account_id",
+            name="name",
+            page=0,
+            per_page=0,
+            search="search",
         )
-        assert_matches_type(SyncSinglePage[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[GroupListResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -269,7 +208,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         group = response.parse()
-        assert_matches_type(SyncSinglePage[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[GroupListResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -281,19 +220,19 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             group = response.parse()
-            assert_matches_type(SyncSinglePage[ZeroTrustGroup], group, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[GroupListResponse], group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.groups.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.groups.with_raw_response.list(
                 account_id="account_id",
             )
@@ -353,13 +292,13 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.groups.with_raw_response.delete(
                 group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.groups.with_raw_response.delete(
                 group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -372,7 +311,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="account_id",
         )
-        assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(Optional[GroupGetResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -381,7 +320,7 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None:
             group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="account_id",
         )
-        assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(Optional[GroupGetResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -394,7 +333,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         group = response.parse()
-        assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(Optional[GroupGetResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -407,7 +346,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             group = response.parse()
-            assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+            assert_matches_type(Optional[GroupGetResponse], group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -420,13 +359,13 @@ def test_path_params_get(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.groups.with_raw_response.get(
                 group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.groups.with_raw_response.get(
                 group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -434,56 +373,38 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncGroups:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         group = await async_client.zero_trust.access.groups.create(
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             account_id="account_id",
         )
-        assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(Optional[GroupCreateResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         group = await async_client.zero_trust.access.groups.create(
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             account_id="account_id",
-            exclude=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            exclude=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             is_default=True,
-            require=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            require=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
         )
-        assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(Optional[GroupCreateResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.groups.with_raw_response.create(
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             account_id="account_id",
         )
@@ -491,17 +412,13 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         group = await response.parse()
-        assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(Optional[GroupCreateResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.groups.with_streaming_response.create(
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             account_id="account_id",
         ) as response:
@@ -509,31 +426,23 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             group = await response.parse()
-            assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+            assert_matches_type(Optional[GroupCreateResponse], group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.groups.with_raw_response.create(
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
+                include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
                 name="Allow devs",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.groups.with_raw_response.create(
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
+                include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
                 name="Allow devs",
                 account_id="account_id",
             )
@@ -543,52 +452,32 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         group = await async_client.zero_trust.access.groups.update(
             group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             account_id="account_id",
         )
-        assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(Optional[GroupUpdateResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         group = await async_client.zero_trust.access.groups.update(
             group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             account_id="account_id",
-            exclude=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            exclude=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             is_default=True,
-            require=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            require=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
         )
-        assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(Optional[GroupUpdateResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.groups.with_raw_response.update(
             group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             account_id="account_id",
         )
@@ -596,18 +485,14 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         group = await response.parse()
-        assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(Optional[GroupUpdateResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.groups.with_streaming_response.update(
             group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             account_id="account_id",
         ) as response:
@@ -615,7 +500,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             group = await response.parse()
-            assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+            assert_matches_type(Optional[GroupUpdateResponse], group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -625,35 +510,23 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `group_id` but received ''"):
             await async_client.zero_trust.access.groups.with_raw_response.update(
                 group_id="",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
+                include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
                 name="Allow devs",
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.groups.with_raw_response.update(
                 group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
+                include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
                 name="Allow devs",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.groups.with_raw_response.update(
                 group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
+                include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
                 name="Allow devs",
                 account_id="account_id",
             )
@@ -664,15 +537,19 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         group = await async_client.zero_trust.access.groups.list(
             account_id="account_id",
         )
-        assert_matches_type(AsyncSinglePage[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[GroupListResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         group = await async_client.zero_trust.access.groups.list(
             account_id="account_id",
+            name="name",
+            page=0,
+            per_page=0,
+            search="search",
         )
-        assert_matches_type(AsyncSinglePage[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[GroupListResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -684,7 +561,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         group = await response.parse()
-        assert_matches_type(AsyncSinglePage[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[GroupListResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -696,19 +573,19 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             group = await response.parse()
-            assert_matches_type(AsyncSinglePage[ZeroTrustGroup], group, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[GroupListResponse], group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.groups.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.groups.with_raw_response.list(
                 account_id="account_id",
             )
@@ -768,13 +645,13 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.groups.with_raw_response.delete(
                 group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.groups.with_raw_response.delete(
                 group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -787,7 +664,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="account_id",
         )
-        assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(Optional[GroupGetResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -796,7 +673,7 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -
             group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="account_id",
         )
-        assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(Optional[GroupGetResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -809,7 +686,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         group = await response.parse()
-        assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+        assert_matches_type(Optional[GroupGetResponse], group, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -822,7 +699,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             group = await response.parse()
-            assert_matches_type(Optional[ZeroTrustGroup], group, path=["response"])
+            assert_matches_type(Optional[GroupGetResponse], group, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -835,13 +712,13 @@ async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.groups.with_raw_response.get(
                 group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.groups.with_raw_response.get(
                 group_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
diff --git a/tests/api_resources/zero_trust/access/test_keys.py b/tests/api_resources/zero_trust/access/test_keys.py
index f0b87f16c0f..b2a7ea7fb3b 100644
--- a/tests/api_resources/zero_trust/access/test_keys.py
+++ b/tests/api_resources/zero_trust/access/test_keys.py
@@ -137,7 +137,9 @@ def test_path_params_rotate(self, client: Cloudflare) -> None:
 
 
 class TestAsyncKeys:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/zero_trust/access/test_policies.py b/tests/api_resources/zero_trust/access/test_policies.py
index 168b7507017..d03deaa1b48 100644
--- a/tests/api_resources/zero_trust/access/test_policies.py
+++ b/tests/api_resources/zero_trust/access/test_policies.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.zero_trust.access import (
     PolicyGetResponse,
     PolicyListResponse,
@@ -29,11 +29,7 @@ def test_method_create(self, client: Cloudflare) -> None:
         policy = client.zero_trust.access.policies.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
         )
         assert_matches_type(Optional[PolicyCreateResponse], policy, path=["response"])
@@ -43,11 +39,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         policy = client.zero_trust.access.policies.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             approval_groups=[
                 {
@@ -62,19 +54,11 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                 },
             ],
             approval_required=True,
-            exclude=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            exclude=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             isolation_required=False,
             purpose_justification_prompt="Please enter a justification for entering this protected domain.",
             purpose_justification_required=True,
-            require=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            require=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             session_duration="24h",
         )
         assert_matches_type(Optional[PolicyCreateResponse], policy, path=["response"])
@@ -84,11 +68,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.policies.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
         )
 
@@ -102,11 +82,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.zero_trust.access.policies.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
         ) as response:
             assert not response.is_closed
@@ -123,11 +99,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
             client.zero_trust.access.policies.with_raw_response.create(
                 account_id="",
                 decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
+                include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
                 name="Allow devs",
             )
 
@@ -137,11 +109,7 @@ def test_method_update(self, client: Cloudflare) -> None:
             policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
         )
         assert_matches_type(Optional[PolicyUpdateResponse], policy, path=["response"])
@@ -152,11 +120,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             approval_groups=[
                 {
@@ -171,19 +135,11 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                 },
             ],
             approval_required=True,
-            exclude=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            exclude=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             isolation_required=False,
             purpose_justification_prompt="Please enter a justification for entering this protected domain.",
             purpose_justification_required=True,
-            require=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            require=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             session_duration="24h",
         )
         assert_matches_type(Optional[PolicyUpdateResponse], policy, path=["response"])
@@ -194,11 +150,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
             policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
         )
 
@@ -213,11 +165,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
             policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
         ) as response:
             assert not response.is_closed
@@ -235,11 +183,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
                 decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
+                include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
                 name="Allow devs",
             )
 
@@ -248,11 +192,7 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 policy_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
+                include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
                 name="Allow devs",
             )
 
@@ -261,7 +201,16 @@ def test_method_list(self, client: Cloudflare) -> None:
         policy = client.zero_trust.access.policies.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncSinglePage[PolicyListResponse], policy, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[PolicyListResponse], policy, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        policy = client.zero_trust.access.policies.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=0,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[PolicyListResponse], policy, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -272,7 +221,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         policy = response.parse()
-        assert_matches_type(SyncSinglePage[PolicyListResponse], policy, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[PolicyListResponse], policy, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -283,7 +232,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             policy = response.parse()
-            assert_matches_type(SyncSinglePage[PolicyListResponse], policy, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[PolicyListResponse], policy, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -392,18 +341,16 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncPolicies:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         policy = await async_client.zero_trust.access.policies.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
         )
         assert_matches_type(Optional[PolicyCreateResponse], policy, path=["response"])
@@ -413,11 +360,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
         policy = await async_client.zero_trust.access.policies.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             approval_groups=[
                 {
@@ -432,19 +375,11 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                 },
             ],
             approval_required=True,
-            exclude=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            exclude=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             isolation_required=False,
             purpose_justification_prompt="Please enter a justification for entering this protected domain.",
             purpose_justification_required=True,
-            require=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            require=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             session_duration="24h",
         )
         assert_matches_type(Optional[PolicyCreateResponse], policy, path=["response"])
@@ -454,11 +389,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.policies.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
         )
 
@@ -472,11 +403,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
         async with async_client.zero_trust.access.policies.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
         ) as response:
             assert not response.is_closed
@@ -493,11 +420,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
             await async_client.zero_trust.access.policies.with_raw_response.create(
                 account_id="",
                 decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
+                include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
                 name="Allow devs",
             )
 
@@ -507,11 +430,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
             policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
         )
         assert_matches_type(Optional[PolicyUpdateResponse], policy, path=["response"])
@@ -522,11 +441,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
             approval_groups=[
                 {
@@ -541,19 +456,11 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                 },
             ],
             approval_required=True,
-            exclude=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            exclude=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             isolation_required=False,
             purpose_justification_prompt="Please enter a justification for entering this protected domain.",
             purpose_justification_required=True,
-            require=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            require=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             session_duration="24h",
         )
         assert_matches_type(Optional[PolicyUpdateResponse], policy, path=["response"])
@@ -564,11 +471,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
             policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
         )
 
@@ -583,11 +486,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
             policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             decision="allow",
-            include=[
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-                {"email": {"email": "test@example.com"}},
-            ],
+            include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
             name="Allow devs",
         ) as response:
             assert not response.is_closed
@@ -605,11 +504,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
                 decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
+                include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
                 name="Allow devs",
             )
 
@@ -618,11 +513,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 policy_id="",
                 account_id="023e105f4ecef8ad9ca31a8372d0c353",
                 decision="allow",
-                include=[
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                    {"email": {"email": "test@example.com"}},
-                ],
+                include=[{"group": {"id": "aa0a4aab-672b-4bdb-bc33-a59f1130a11f"}}],
                 name="Allow devs",
             )
 
@@ -631,7 +522,16 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         policy = await async_client.zero_trust.access.policies.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncSinglePage[PolicyListResponse], policy, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[PolicyListResponse], policy, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        policy = await async_client.zero_trust.access.policies.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=0,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[PolicyListResponse], policy, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -642,7 +542,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         policy = await response.parse()
-        assert_matches_type(AsyncSinglePage[PolicyListResponse], policy, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[PolicyListResponse], policy, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -653,7 +553,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             policy = await response.parse()
-            assert_matches_type(AsyncSinglePage[PolicyListResponse], policy, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[PolicyListResponse], policy, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/zero_trust/access/test_service_tokens.py b/tests/api_resources/zero_trust/access/test_service_tokens.py
index 4d3c6fb8b78..4045d72f1fc 100644
--- a/tests/api_resources/zero_trust/access/test_service_tokens.py
+++ b/tests/api_resources/zero_trust/access/test_service_tokens.py
@@ -9,7 +9,8 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare._utils import parse_datetime
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.zero_trust.access import (
     ServiceToken,
     ServiceTokenCreateResponse,
@@ -37,7 +38,9 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         service_token = client.zero_trust.access.service_tokens.create(
             name="CI/CD token",
             account_id="account_id",
+            client_secret_version=0,
             duration="60m",
+            previous_client_secret_expires_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
         )
         assert_matches_type(Optional[ServiceTokenCreateResponse], service_token, path=["response"])
 
@@ -72,13 +75,13 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.service_tokens.with_raw_response.create(
                 name="CI/CD token",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.service_tokens.with_raw_response.create(
                 name="CI/CD token",
                 account_id="account_id",
@@ -99,8 +102,10 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         service_token = client.zero_trust.access.service_tokens.update(
             service_token_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="account_id",
+            client_secret_version=0,
             duration="60m",
             name="CI/CD token",
+            previous_client_secret_expires_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
         )
         assert_matches_type(Optional[ServiceToken], service_token, path=["response"])
 
@@ -141,13 +146,13 @@ def test_path_params_update(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.service_tokens.with_raw_response.update(
                 service_token_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.service_tokens.with_raw_response.update(
                 service_token_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -159,15 +164,19 @@ def test_method_list(self, client: Cloudflare) -> None:
         service_token = client.zero_trust.access.service_tokens.list(
             account_id="account_id",
         )
-        assert_matches_type(SyncSinglePage[ServiceToken], service_token, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[ServiceToken], service_token, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         service_token = client.zero_trust.access.service_tokens.list(
             account_id="account_id",
+            name="name",
+            page=0,
+            per_page=0,
+            search="search",
         )
-        assert_matches_type(SyncSinglePage[ServiceToken], service_token, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[ServiceToken], service_token, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -179,7 +188,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         service_token = response.parse()
-        assert_matches_type(SyncSinglePage[ServiceToken], service_token, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[ServiceToken], service_token, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -191,19 +200,19 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             service_token = response.parse()
-            assert_matches_type(SyncSinglePage[ServiceToken], service_token, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[ServiceToken], service_token, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.service_tokens.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.service_tokens.with_raw_response.list(
                 account_id="account_id",
             )
@@ -263,13 +272,13 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.service_tokens.with_raw_response.delete(
                 service_token_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.service_tokens.with_raw_response.delete(
                 service_token_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -330,13 +339,13 @@ def test_path_params_get(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.service_tokens.with_raw_response.get(
                 service_token_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.access.service_tokens.with_raw_response.get(
                 service_token_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -398,6 +407,15 @@ def test_method_rotate(self, client: Cloudflare) -> None:
         )
         assert_matches_type(Optional[ServiceTokenRotateResponse], service_token, path=["response"])
 
+    @parametrize
+    def test_method_rotate_with_all_params(self, client: Cloudflare) -> None:
+        service_token = client.zero_trust.access.service_tokens.rotate(
+            service_token_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            previous_client_secret_expires_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
+        )
+        assert_matches_type(Optional[ServiceTokenRotateResponse], service_token, path=["response"])
+
     @parametrize
     def test_raw_response_rotate(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.service_tokens.with_raw_response.rotate(
@@ -440,7 +458,9 @@ def test_path_params_rotate(self, client: Cloudflare) -> None:
 
 
 class TestAsyncServiceTokens:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -457,7 +477,9 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
         service_token = await async_client.zero_trust.access.service_tokens.create(
             name="CI/CD token",
             account_id="account_id",
+            client_secret_version=0,
             duration="60m",
+            previous_client_secret_expires_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
         )
         assert_matches_type(Optional[ServiceTokenCreateResponse], service_token, path=["response"])
 
@@ -492,13 +514,13 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.service_tokens.with_raw_response.create(
                 name="CI/CD token",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.service_tokens.with_raw_response.create(
                 name="CI/CD token",
                 account_id="account_id",
@@ -519,8 +541,10 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
         service_token = await async_client.zero_trust.access.service_tokens.update(
             service_token_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="account_id",
+            client_secret_version=0,
             duration="60m",
             name="CI/CD token",
+            previous_client_secret_expires_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
         )
         assert_matches_type(Optional[ServiceToken], service_token, path=["response"])
 
@@ -561,13 +585,13 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.service_tokens.with_raw_response.update(
                 service_token_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.service_tokens.with_raw_response.update(
                 service_token_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -579,15 +603,19 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         service_token = await async_client.zero_trust.access.service_tokens.list(
             account_id="account_id",
         )
-        assert_matches_type(AsyncSinglePage[ServiceToken], service_token, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[ServiceToken], service_token, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         service_token = await async_client.zero_trust.access.service_tokens.list(
             account_id="account_id",
+            name="name",
+            page=0,
+            per_page=0,
+            search="search",
         )
-        assert_matches_type(AsyncSinglePage[ServiceToken], service_token, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[ServiceToken], service_token, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -599,7 +627,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         service_token = await response.parse()
-        assert_matches_type(AsyncSinglePage[ServiceToken], service_token, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[ServiceToken], service_token, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -611,19 +639,19 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             service_token = await response.parse()
-            assert_matches_type(AsyncSinglePage[ServiceToken], service_token, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[ServiceToken], service_token, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.service_tokens.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.service_tokens.with_raw_response.list(
                 account_id="account_id",
             )
@@ -683,13 +711,13 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.service_tokens.with_raw_response.delete(
                 service_token_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.service_tokens.with_raw_response.delete(
                 service_token_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -750,13 +778,13 @@ async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.service_tokens.with_raw_response.get(
                 service_token_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.access.service_tokens.with_raw_response.get(
                 service_token_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -818,6 +846,15 @@ async def test_method_rotate(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(Optional[ServiceTokenRotateResponse], service_token, path=["response"])
 
+    @parametrize
+    async def test_method_rotate_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        service_token = await async_client.zero_trust.access.service_tokens.rotate(
+            service_token_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            previous_client_secret_expires_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
+        )
+        assert_matches_type(Optional[ServiceTokenRotateResponse], service_token, path=["response"])
+
     @parametrize
     async def test_raw_response_rotate(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.service_tokens.with_raw_response.rotate(
diff --git a/tests/api_resources/zero_trust/access/test_tags.py b/tests/api_resources/zero_trust/access/test_tags.py
index 95c8a925393..ffc498482d3 100644
--- a/tests/api_resources/zero_trust/access/test_tags.py
+++ b/tests/api_resources/zero_trust/access/test_tags.py
@@ -9,9 +9,11 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare._utils import parse_datetime
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.zero_trust.access import Tag, TagDeleteResponse
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.zero_trust.access import (
+    Tag,
+    TagDeleteResponse,
+)
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -23,7 +25,6 @@ class TestTags:
     def test_method_create(self, client: Cloudflare) -> None:
         tag = client.zero_trust.access.tags.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="engineers",
         )
         assert_matches_type(Optional[Tag], tag, path=["response"])
 
@@ -32,8 +33,6 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         tag = client.zero_trust.access.tags.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="engineers",
-            created_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
-            updated_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
         )
         assert_matches_type(Optional[Tag], tag, path=["response"])
 
@@ -41,7 +40,6 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.tags.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="engineers",
         )
 
         assert response.is_closed is True
@@ -53,7 +51,6 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.zero_trust.access.tags.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="engineers",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -68,7 +65,6 @@ def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.access.tags.with_raw_response.create(
                 account_id="",
-                name="engineers",
             )
 
     @parametrize
@@ -80,17 +76,6 @@ def test_method_update(self, client: Cloudflare) -> None:
         )
         assert_matches_type(Optional[Tag], tag, path=["response"])
 
-    @parametrize
-    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        tag = client.zero_trust.access.tags.update(
-            tag_name="engineers",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="engineers",
-            created_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
-            updated_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
-        )
-        assert_matches_type(Optional[Tag], tag, path=["response"])
-
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.zero_trust.access.tags.with_raw_response.update(
@@ -140,7 +125,16 @@ def test_method_list(self, client: Cloudflare) -> None:
         tag = client.zero_trust.access.tags.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncSinglePage[Tag], tag, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Tag], tag, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        tag = client.zero_trust.access.tags.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=0,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[Tag], tag, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -151,7 +145,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         tag = response.parse()
-        assert_matches_type(SyncSinglePage[Tag], tag, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[Tag], tag, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -162,7 +156,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             tag = response.parse()
-            assert_matches_type(SyncSinglePage[Tag], tag, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[Tag], tag, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -271,13 +265,14 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTags:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         tag = await async_client.zero_trust.access.tags.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="engineers",
         )
         assert_matches_type(Optional[Tag], tag, path=["response"])
 
@@ -286,8 +281,6 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
         tag = await async_client.zero_trust.access.tags.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
             name="engineers",
-            created_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
-            updated_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
         )
         assert_matches_type(Optional[Tag], tag, path=["response"])
 
@@ -295,7 +288,6 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.tags.with_raw_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="engineers",
         )
 
         assert response.is_closed is True
@@ -307,7 +299,6 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.access.tags.with_streaming_response.create(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="engineers",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -322,7 +313,6 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.access.tags.with_raw_response.create(
                 account_id="",
-                name="engineers",
             )
 
     @parametrize
@@ -334,17 +324,6 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         )
         assert_matches_type(Optional[Tag], tag, path=["response"])
 
-    @parametrize
-    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        tag = await async_client.zero_trust.access.tags.update(
-            tag_name="engineers",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            name="engineers",
-            created_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
-            updated_at=parse_datetime("2014-01-01T05:20:00.12345Z"),
-        )
-        assert_matches_type(Optional[Tag], tag, path=["response"])
-
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.access.tags.with_raw_response.update(
@@ -394,7 +373,16 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         tag = await async_client.zero_trust.access.tags.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncSinglePage[Tag], tag, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Tag], tag, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        tag = await async_client.zero_trust.access.tags.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            page=0,
+            per_page=0,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[Tag], tag, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -405,7 +393,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         tag = await response.parse()
-        assert_matches_type(AsyncSinglePage[Tag], tag, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[Tag], tag, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -416,7 +404,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             tag = await response.parse()
-            assert_matches_type(AsyncSinglePage[Tag], tag, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[Tag], tag, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/zero_trust/access/test_users.py b/tests/api_resources/zero_trust/access/test_users.py
index eb05e5be04b..f71989026d0 100644
--- a/tests/api_resources/zero_trust/access/test_users.py
+++ b/tests/api_resources/zero_trust/access/test_users.py
@@ -9,8 +9,8 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.zero_trust.access import AccessUser
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.zero_trust.access import UserListResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -23,7 +23,19 @@ def test_method_list(self, client: Cloudflare) -> None:
         user = client.zero_trust.access.users.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(SyncSinglePage[AccessUser], user, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[UserListResponse], user, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        user = client.zero_trust.access.users.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            email="email",
+            name="name",
+            page=0,
+            per_page=0,
+            search="search",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[UserListResponse], user, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -34,7 +46,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         user = response.parse()
-        assert_matches_type(SyncSinglePage[AccessUser], user, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[UserListResponse], user, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -45,7 +57,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             user = response.parse()
-            assert_matches_type(SyncSinglePage[AccessUser], user, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[UserListResponse], user, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -58,14 +70,28 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncUsers:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         user = await async_client.zero_trust.access.users.list(
             account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(AsyncSinglePage[AccessUser], user, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[UserListResponse], user, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        user = await async_client.zero_trust.access.users.list(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            email="email",
+            name="name",
+            page=0,
+            per_page=0,
+            search="search",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[UserListResponse], user, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -76,7 +102,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         user = await response.parse()
-        assert_matches_type(AsyncSinglePage[AccessUser], user, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[UserListResponse], user, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -87,7 +113,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             user = await response.parse()
-            assert_matches_type(AsyncSinglePage[AccessUser], user, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[UserListResponse], user, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/zero_trust/access/users/test_active_sessions.py b/tests/api_resources/zero_trust/access/users/test_active_sessions.py
index e0f1db9ea66..d9c41b65972 100644
--- a/tests/api_resources/zero_trust/access/users/test_active_sessions.py
+++ b/tests/api_resources/zero_trust/access/users/test_active_sessions.py
@@ -128,7 +128,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncActiveSessions:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/zero_trust/access/users/test_failed_logins.py b/tests/api_resources/zero_trust/access/users/test_failed_logins.py
index 697dbe9181f..293eddfd0e4 100644
--- a/tests/api_resources/zero_trust/access/users/test_failed_logins.py
+++ b/tests/api_resources/zero_trust/access/users/test_failed_logins.py
@@ -68,7 +68,9 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncFailedLogins:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/zero_trust/access/users/test_last_seen_identity.py b/tests/api_resources/zero_trust/access/users/test_last_seen_identity.py
index 9b7d2644d33..5505fe5588a 100644
--- a/tests/api_resources/zero_trust/access/users/test_last_seen_identity.py
+++ b/tests/api_resources/zero_trust/access/users/test_last_seen_identity.py
@@ -67,7 +67,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncLastSeenIdentity:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/zero_trust/devices/policies/custom/__init__.py b/tests/api_resources/zero_trust/devices/policies/custom/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/devices/policies/custom/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/devices/policies/custom/test_excludes.py b/tests/api_resources/zero_trust/devices/policies/custom/test_excludes.py
new file mode 100644
index 00000000000..54c1b30db1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/devices/policies/custom/test_excludes.py
@@ -0,0 +1,227 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.devices import SplitTunnelExclude
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestExcludes:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        exclude = client.zero_trust.devices.policies.custom.excludes.update(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        )
+        assert_matches_type(SyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.custom.excludes.with_raw_response.update(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        exclude = response.parse()
+        assert_matches_type(SyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.custom.excludes.with_streaming_response.update(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            exclude = response.parse()
+            assert_matches_type(SyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.custom.excludes.with_raw_response.update(
+                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                body=[{"address": "192.0.2.0/24"}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
+            client.zero_trust.devices.policies.custom.excludes.with_raw_response.update(
+                policy_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+                body=[{"address": "192.0.2.0/24"}],
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        exclude = client.zero_trust.devices.policies.custom.excludes.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(SyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.custom.excludes.with_raw_response.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        exclude = response.parse()
+        assert_matches_type(SyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.custom.excludes.with_streaming_response.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            exclude = response.parse()
+            assert_matches_type(SyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.custom.excludes.with_raw_response.get(
+                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
+            client.zero_trust.devices.policies.custom.excludes.with_raw_response.get(
+                policy_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+
+class TestAsyncExcludes:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        exclude = await async_client.zero_trust.devices.policies.custom.excludes.update(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        )
+        assert_matches_type(AsyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.custom.excludes.with_raw_response.update(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        exclude = await response.parse()
+        assert_matches_type(AsyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.custom.excludes.with_streaming_response.update(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            exclude = await response.parse()
+            assert_matches_type(AsyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.excludes.with_raw_response.update(
+                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                body=[{"address": "192.0.2.0/24"}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.excludes.with_raw_response.update(
+                policy_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+                body=[{"address": "192.0.2.0/24"}],
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        exclude = await async_client.zero_trust.devices.policies.custom.excludes.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(AsyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.custom.excludes.with_raw_response.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        exclude = await response.parse()
+        assert_matches_type(AsyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.custom.excludes.with_streaming_response.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            exclude = await response.parse()
+            assert_matches_type(AsyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.excludes.with_raw_response.get(
+                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.excludes.with_raw_response.get(
+                policy_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
diff --git a/tests/api_resources/zero_trust/devices/policies/custom/test_fallback_domains.py b/tests/api_resources/zero_trust/devices/policies/custom/test_fallback_domains.py
new file mode 100644
index 00000000000..c5a9ef3e156
--- /dev/null
+++ b/tests/api_resources/zero_trust/devices/policies/custom/test_fallback_domains.py
@@ -0,0 +1,227 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.devices import FallbackDomain
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestFallbackDomains:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        fallback_domain = client.zero_trust.devices.policies.custom.fallback_domains.update(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            domains=[{"suffix": "example.com"}],
+        )
+        assert_matches_type(SyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.custom.fallback_domains.with_raw_response.update(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            domains=[{"suffix": "example.com"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        fallback_domain = response.parse()
+        assert_matches_type(SyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.custom.fallback_domains.with_streaming_response.update(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            domains=[{"suffix": "example.com"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            fallback_domain = response.parse()
+            assert_matches_type(SyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.custom.fallback_domains.with_raw_response.update(
+                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                domains=[{"suffix": "example.com"}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
+            client.zero_trust.devices.policies.custom.fallback_domains.with_raw_response.update(
+                policy_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+                domains=[{"suffix": "example.com"}],
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        fallback_domain = client.zero_trust.devices.policies.custom.fallback_domains.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(SyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.custom.fallback_domains.with_raw_response.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        fallback_domain = response.parse()
+        assert_matches_type(SyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.custom.fallback_domains.with_streaming_response.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            fallback_domain = response.parse()
+            assert_matches_type(SyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.custom.fallback_domains.with_raw_response.get(
+                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
+            client.zero_trust.devices.policies.custom.fallback_domains.with_raw_response.get(
+                policy_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+
+class TestAsyncFallbackDomains:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        fallback_domain = await async_client.zero_trust.devices.policies.custom.fallback_domains.update(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            domains=[{"suffix": "example.com"}],
+        )
+        assert_matches_type(AsyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.custom.fallback_domains.with_raw_response.update(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            domains=[{"suffix": "example.com"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        fallback_domain = await response.parse()
+        assert_matches_type(AsyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.custom.fallback_domains.with_streaming_response.update(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            domains=[{"suffix": "example.com"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            fallback_domain = await response.parse()
+            assert_matches_type(AsyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.fallback_domains.with_raw_response.update(
+                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                domains=[{"suffix": "example.com"}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.fallback_domains.with_raw_response.update(
+                policy_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+                domains=[{"suffix": "example.com"}],
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        fallback_domain = await async_client.zero_trust.devices.policies.custom.fallback_domains.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(AsyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.custom.fallback_domains.with_raw_response.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        fallback_domain = await response.parse()
+        assert_matches_type(AsyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.custom.fallback_domains.with_streaming_response.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            fallback_domain = await response.parse()
+            assert_matches_type(AsyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.fallback_domains.with_raw_response.get(
+                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.fallback_domains.with_raw_response.get(
+                policy_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
diff --git a/tests/api_resources/zero_trust/devices/policies/custom/test_includes.py b/tests/api_resources/zero_trust/devices/policies/custom/test_includes.py
new file mode 100644
index 00000000000..51596f1cd73
--- /dev/null
+++ b/tests/api_resources/zero_trust/devices/policies/custom/test_includes.py
@@ -0,0 +1,227 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.devices import SplitTunnelInclude
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestIncludes:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        include = client.zero_trust.devices.policies.custom.includes.update(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        )
+        assert_matches_type(SyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.custom.includes.with_raw_response.update(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        include = response.parse()
+        assert_matches_type(SyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.custom.includes.with_streaming_response.update(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            include = response.parse()
+            assert_matches_type(SyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.custom.includes.with_raw_response.update(
+                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                body=[{"address": "192.0.2.0/24"}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
+            client.zero_trust.devices.policies.custom.includes.with_raw_response.update(
+                policy_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+                body=[{"address": "192.0.2.0/24"}],
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        include = client.zero_trust.devices.policies.custom.includes.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(SyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.custom.includes.with_raw_response.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        include = response.parse()
+        assert_matches_type(SyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.custom.includes.with_streaming_response.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            include = response.parse()
+            assert_matches_type(SyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.custom.includes.with_raw_response.get(
+                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
+            client.zero_trust.devices.policies.custom.includes.with_raw_response.get(
+                policy_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+
+class TestAsyncIncludes:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        include = await async_client.zero_trust.devices.policies.custom.includes.update(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        )
+        assert_matches_type(AsyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.custom.includes.with_raw_response.update(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        include = await response.parse()
+        assert_matches_type(AsyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.custom.includes.with_streaming_response.update(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            include = await response.parse()
+            assert_matches_type(AsyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.includes.with_raw_response.update(
+                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                body=[{"address": "192.0.2.0/24"}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.includes.with_raw_response.update(
+                policy_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+                body=[{"address": "192.0.2.0/24"}],
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        include = await async_client.zero_trust.devices.policies.custom.includes.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(AsyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.custom.includes.with_raw_response.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        include = await response.parse()
+        assert_matches_type(AsyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.custom.includes.with_streaming_response.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            include = await response.parse()
+            assert_matches_type(AsyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.includes.with_raw_response.get(
+                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.includes.with_raw_response.get(
+                policy_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
diff --git a/tests/api_resources/zero_trust/devices/policies/default/__init__.py b/tests/api_resources/zero_trust/devices/policies/default/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/devices/policies/default/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/devices/policies/default/test_certificates.py b/tests/api_resources/zero_trust/devices/policies/default/test_certificates.py
new file mode 100644
index 00000000000..62ddac10409
--- /dev/null
+++ b/tests/api_resources/zero_trust/devices/policies/default/test_certificates.py
@@ -0,0 +1,184 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zero_trust.devices import DevicePolicyCertificates
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCertificates:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        certificate = client.zero_trust.devices.policies.default.certificates.edit(
+            zone_id="699d98642c564d2e855e9661899b7252",
+            enabled=True,
+        )
+        assert_matches_type(Optional[DevicePolicyCertificates], certificate, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.default.certificates.with_raw_response.edit(
+            zone_id="699d98642c564d2e855e9661899b7252",
+            enabled=True,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        certificate = response.parse()
+        assert_matches_type(Optional[DevicePolicyCertificates], certificate, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.default.certificates.with_streaming_response.edit(
+            zone_id="699d98642c564d2e855e9661899b7252",
+            enabled=True,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            certificate = response.parse()
+            assert_matches_type(Optional[DevicePolicyCertificates], certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.zero_trust.devices.policies.default.certificates.with_raw_response.edit(
+                zone_id="",
+                enabled=True,
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        certificate = client.zero_trust.devices.policies.default.certificates.get(
+            zone_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[DevicePolicyCertificates], certificate, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.default.certificates.with_raw_response.get(
+            zone_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        certificate = response.parse()
+        assert_matches_type(Optional[DevicePolicyCertificates], certificate, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.default.certificates.with_streaming_response.get(
+            zone_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            certificate = response.parse()
+            assert_matches_type(Optional[DevicePolicyCertificates], certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.zero_trust.devices.policies.default.certificates.with_raw_response.get(
+                zone_id="",
+            )
+
+
+class TestAsyncCertificates:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        certificate = await async_client.zero_trust.devices.policies.default.certificates.edit(
+            zone_id="699d98642c564d2e855e9661899b7252",
+            enabled=True,
+        )
+        assert_matches_type(Optional[DevicePolicyCertificates], certificate, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.default.certificates.with_raw_response.edit(
+            zone_id="699d98642c564d2e855e9661899b7252",
+            enabled=True,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        certificate = await response.parse()
+        assert_matches_type(Optional[DevicePolicyCertificates], certificate, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.default.certificates.with_streaming_response.edit(
+            zone_id="699d98642c564d2e855e9661899b7252",
+            enabled=True,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            certificate = await response.parse()
+            assert_matches_type(Optional[DevicePolicyCertificates], certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.zero_trust.devices.policies.default.certificates.with_raw_response.edit(
+                zone_id="",
+                enabled=True,
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        certificate = await async_client.zero_trust.devices.policies.default.certificates.get(
+            zone_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[DevicePolicyCertificates], certificate, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.default.certificates.with_raw_response.get(
+            zone_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        certificate = await response.parse()
+        assert_matches_type(Optional[DevicePolicyCertificates], certificate, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.default.certificates.with_streaming_response.get(
+            zone_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            certificate = await response.parse()
+            assert_matches_type(Optional[DevicePolicyCertificates], certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.zero_trust.devices.policies.default.certificates.with_raw_response.get(
+                zone_id="",
+            )
diff --git a/tests/api_resources/zero_trust/devices/policies/default/test_excludes.py b/tests/api_resources/zero_trust/devices/policies/default/test_excludes.py
new file mode 100644
index 00000000000..51781aace5e
--- /dev/null
+++ b/tests/api_resources/zero_trust/devices/policies/default/test_excludes.py
@@ -0,0 +1,185 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.devices import SplitTunnelExclude
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestExcludes:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        exclude = client.zero_trust.devices.policies.default.excludes.update(
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        )
+        assert_matches_type(SyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.default.excludes.with_raw_response.update(
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        exclude = response.parse()
+        assert_matches_type(SyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.default.excludes.with_streaming_response.update(
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            exclude = response.parse()
+            assert_matches_type(SyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.default.excludes.with_raw_response.update(
+                account_id="",
+                body=[{"address": "192.0.2.0/24"}],
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        exclude = client.zero_trust.devices.policies.default.excludes.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(SyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.default.excludes.with_raw_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        exclude = response.parse()
+        assert_matches_type(SyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.default.excludes.with_streaming_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            exclude = response.parse()
+            assert_matches_type(SyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.default.excludes.with_raw_response.get(
+                account_id="",
+            )
+
+
+class TestAsyncExcludes:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        exclude = await async_client.zero_trust.devices.policies.default.excludes.update(
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        )
+        assert_matches_type(AsyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.default.excludes.with_raw_response.update(
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        exclude = await response.parse()
+        assert_matches_type(AsyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.default.excludes.with_streaming_response.update(
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            exclude = await response.parse()
+            assert_matches_type(AsyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.default.excludes.with_raw_response.update(
+                account_id="",
+                body=[{"address": "192.0.2.0/24"}],
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        exclude = await async_client.zero_trust.devices.policies.default.excludes.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(AsyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.default.excludes.with_raw_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        exclude = await response.parse()
+        assert_matches_type(AsyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.default.excludes.with_streaming_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            exclude = await response.parse()
+            assert_matches_type(AsyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.default.excludes.with_raw_response.get(
+                account_id="",
+            )
diff --git a/tests/api_resources/zero_trust/devices/policies/default/test_fallback_domains.py b/tests/api_resources/zero_trust/devices/policies/default/test_fallback_domains.py
new file mode 100644
index 00000000000..7d81d4d2265
--- /dev/null
+++ b/tests/api_resources/zero_trust/devices/policies/default/test_fallback_domains.py
@@ -0,0 +1,185 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.devices import FallbackDomain
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestFallbackDomains:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        fallback_domain = client.zero_trust.devices.policies.default.fallback_domains.update(
+            account_id="699d98642c564d2e855e9661899b7252",
+            domains=[{"suffix": "example.com"}],
+        )
+        assert_matches_type(SyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.default.fallback_domains.with_raw_response.update(
+            account_id="699d98642c564d2e855e9661899b7252",
+            domains=[{"suffix": "example.com"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        fallback_domain = response.parse()
+        assert_matches_type(SyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.default.fallback_domains.with_streaming_response.update(
+            account_id="699d98642c564d2e855e9661899b7252",
+            domains=[{"suffix": "example.com"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            fallback_domain = response.parse()
+            assert_matches_type(SyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.default.fallback_domains.with_raw_response.update(
+                account_id="",
+                domains=[{"suffix": "example.com"}],
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        fallback_domain = client.zero_trust.devices.policies.default.fallback_domains.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(SyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.default.fallback_domains.with_raw_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        fallback_domain = response.parse()
+        assert_matches_type(SyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.default.fallback_domains.with_streaming_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            fallback_domain = response.parse()
+            assert_matches_type(SyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.default.fallback_domains.with_raw_response.get(
+                account_id="",
+            )
+
+
+class TestAsyncFallbackDomains:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        fallback_domain = await async_client.zero_trust.devices.policies.default.fallback_domains.update(
+            account_id="699d98642c564d2e855e9661899b7252",
+            domains=[{"suffix": "example.com"}],
+        )
+        assert_matches_type(AsyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.default.fallback_domains.with_raw_response.update(
+            account_id="699d98642c564d2e855e9661899b7252",
+            domains=[{"suffix": "example.com"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        fallback_domain = await response.parse()
+        assert_matches_type(AsyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.default.fallback_domains.with_streaming_response.update(
+            account_id="699d98642c564d2e855e9661899b7252",
+            domains=[{"suffix": "example.com"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            fallback_domain = await response.parse()
+            assert_matches_type(AsyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.default.fallback_domains.with_raw_response.update(
+                account_id="",
+                domains=[{"suffix": "example.com"}],
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        fallback_domain = await async_client.zero_trust.devices.policies.default.fallback_domains.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(AsyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.default.fallback_domains.with_raw_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        fallback_domain = await response.parse()
+        assert_matches_type(AsyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.default.fallback_domains.with_streaming_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            fallback_domain = await response.parse()
+            assert_matches_type(AsyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.default.fallback_domains.with_raw_response.get(
+                account_id="",
+            )
diff --git a/tests/api_resources/zero_trust/devices/policies/default/test_includes.py b/tests/api_resources/zero_trust/devices/policies/default/test_includes.py
new file mode 100644
index 00000000000..89c4aebae8d
--- /dev/null
+++ b/tests/api_resources/zero_trust/devices/policies/default/test_includes.py
@@ -0,0 +1,185 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.devices import SplitTunnelInclude
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestIncludes:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        include = client.zero_trust.devices.policies.default.includes.update(
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        )
+        assert_matches_type(SyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.default.includes.with_raw_response.update(
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        include = response.parse()
+        assert_matches_type(SyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.default.includes.with_streaming_response.update(
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            include = response.parse()
+            assert_matches_type(SyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.default.includes.with_raw_response.update(
+                account_id="",
+                body=[{"address": "192.0.2.0/24"}],
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        include = client.zero_trust.devices.policies.default.includes.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(SyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.default.includes.with_raw_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        include = response.parse()
+        assert_matches_type(SyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.default.includes.with_streaming_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            include = response.parse()
+            assert_matches_type(SyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.default.includes.with_raw_response.get(
+                account_id="",
+            )
+
+
+class TestAsyncIncludes:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        include = await async_client.zero_trust.devices.policies.default.includes.update(
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        )
+        assert_matches_type(AsyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.default.includes.with_raw_response.update(
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        include = await response.parse()
+        assert_matches_type(AsyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.default.includes.with_streaming_response.update(
+            account_id="699d98642c564d2e855e9661899b7252",
+            body=[{"address": "192.0.2.0/24"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            include = await response.parse()
+            assert_matches_type(AsyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.default.includes.with_raw_response.update(
+                account_id="",
+                body=[{"address": "192.0.2.0/24"}],
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        include = await async_client.zero_trust.devices.policies.default.includes.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(AsyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.default.includes.with_raw_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        include = await response.parse()
+        assert_matches_type(AsyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.default.includes.with_streaming_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            include = await response.parse()
+            assert_matches_type(AsyncSinglePage[SplitTunnelInclude], include, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.default.includes.with_raw_response.get(
+                account_id="",
+            )
diff --git a/tests/api_resources/zero_trust/devices/policies/test_custom.py b/tests/api_resources/zero_trust/devices/policies/test_custom.py
new file mode 100644
index 00000000000..324311c25b8
--- /dev/null
+++ b/tests/api_resources/zero_trust/devices/policies/test_custom.py
@@ -0,0 +1,687 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.devices import SettingsPolicy
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCustom:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        custom = client.zero_trust.devices.policies.custom.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            match='identity.email == "test@cloudflare.com"',
+            name="Allow Developers",
+            precedence=100,
+        )
+        assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        custom = client.zero_trust.devices.policies.custom.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            match='identity.email == "test@cloudflare.com"',
+            name="Allow Developers",
+            precedence=100,
+            allow_mode_switch=True,
+            allow_updates=True,
+            allowed_to_leave=True,
+            auto_connect=0,
+            captive_portal=180,
+            description="Policy for test teams.",
+            disable_auto_fallback=True,
+            enabled=True,
+            exclude=[
+                {
+                    "address": "192.0.2.0/24",
+                    "description": "Exclude testing domains from the tunnel",
+                }
+            ],
+            exclude_office_ips=True,
+            include=[
+                {
+                    "address": "192.0.2.0/24",
+                    "description": "Include testing domains in the tunnel",
+                }
+            ],
+            lan_allow_minutes=30,
+            lan_allow_subnet_size=24,
+            register_interface_ip_with_dns=True,
+            sccm_vpn_boundary_support=False,
+            service_mode_v2={
+                "mode": "proxy",
+                "port": 3000,
+            },
+            support_url="https://1.1.1.1/help",
+            switch_locked=True,
+            tunnel_protocol="wireguard",
+        )
+        assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.custom.with_raw_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            match='identity.email == "test@cloudflare.com"',
+            name="Allow Developers",
+            precedence=100,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = response.parse()
+        assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.custom.with_streaming_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            match='identity.email == "test@cloudflare.com"',
+            name="Allow Developers",
+            precedence=100,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = response.parse()
+            assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.custom.with_raw_response.create(
+                account_id="",
+                match='identity.email == "test@cloudflare.com"',
+                name="Allow Developers",
+                precedence=100,
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        custom = client.zero_trust.devices.policies.custom.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(SyncSinglePage[SettingsPolicy], custom, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.custom.with_raw_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = response.parse()
+        assert_matches_type(SyncSinglePage[SettingsPolicy], custom, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.custom.with_streaming_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = response.parse()
+            assert_matches_type(SyncSinglePage[SettingsPolicy], custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.custom.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        custom = client.zero_trust.devices.policies.custom.delete(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(SyncSinglePage[SettingsPolicy], custom, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.custom.with_raw_response.delete(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = response.parse()
+        assert_matches_type(SyncSinglePage[SettingsPolicy], custom, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.custom.with_streaming_response.delete(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = response.parse()
+            assert_matches_type(SyncSinglePage[SettingsPolicy], custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.custom.with_raw_response.delete(
+                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
+            client.zero_trust.devices.policies.custom.with_raw_response.delete(
+                policy_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        custom = client.zero_trust.devices.policies.custom.edit(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        custom = client.zero_trust.devices.policies.custom.edit(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            allow_mode_switch=True,
+            allow_updates=True,
+            allowed_to_leave=True,
+            auto_connect=0,
+            captive_portal=180,
+            description="Policy for test teams.",
+            disable_auto_fallback=True,
+            enabled=True,
+            exclude=[
+                {
+                    "address": "192.0.2.0/24",
+                    "description": "Exclude testing domains from the tunnel",
+                }
+            ],
+            exclude_office_ips=True,
+            include=[
+                {
+                    "address": "192.0.2.0/24",
+                    "description": "Include testing domains in the tunnel",
+                }
+            ],
+            lan_allow_minutes=30,
+            lan_allow_subnet_size=24,
+            match='identity.email == "test@cloudflare.com"',
+            name="Allow Developers",
+            precedence=100,
+            register_interface_ip_with_dns=True,
+            sccm_vpn_boundary_support=False,
+            service_mode_v2={
+                "mode": "proxy",
+                "port": 3000,
+            },
+            support_url="https://1.1.1.1/help",
+            switch_locked=True,
+            tunnel_protocol="wireguard",
+        )
+        assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.custom.with_raw_response.edit(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = response.parse()
+        assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.custom.with_streaming_response.edit(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = response.parse()
+            assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.custom.with_raw_response.edit(
+                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
+            client.zero_trust.devices.policies.custom.with_raw_response.edit(
+                policy_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        custom = client.zero_trust.devices.policies.custom.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.custom.with_raw_response.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = response.parse()
+        assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.custom.with_streaming_response.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = response.parse()
+            assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.custom.with_raw_response.get(
+                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
+            client.zero_trust.devices.policies.custom.with_raw_response.get(
+                policy_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+
+class TestAsyncCustom:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.zero_trust.devices.policies.custom.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            match='identity.email == "test@cloudflare.com"',
+            name="Allow Developers",
+            precedence=100,
+        )
+        assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.zero_trust.devices.policies.custom.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            match='identity.email == "test@cloudflare.com"',
+            name="Allow Developers",
+            precedence=100,
+            allow_mode_switch=True,
+            allow_updates=True,
+            allowed_to_leave=True,
+            auto_connect=0,
+            captive_portal=180,
+            description="Policy for test teams.",
+            disable_auto_fallback=True,
+            enabled=True,
+            exclude=[
+                {
+                    "address": "192.0.2.0/24",
+                    "description": "Exclude testing domains from the tunnel",
+                }
+            ],
+            exclude_office_ips=True,
+            include=[
+                {
+                    "address": "192.0.2.0/24",
+                    "description": "Include testing domains in the tunnel",
+                }
+            ],
+            lan_allow_minutes=30,
+            lan_allow_subnet_size=24,
+            register_interface_ip_with_dns=True,
+            sccm_vpn_boundary_support=False,
+            service_mode_v2={
+                "mode": "proxy",
+                "port": 3000,
+            },
+            support_url="https://1.1.1.1/help",
+            switch_locked=True,
+            tunnel_protocol="wireguard",
+        )
+        assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.custom.with_raw_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            match='identity.email == "test@cloudflare.com"',
+            name="Allow Developers",
+            precedence=100,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = await response.parse()
+        assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.custom.with_streaming_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            match='identity.email == "test@cloudflare.com"',
+            name="Allow Developers",
+            precedence=100,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = await response.parse()
+            assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.with_raw_response.create(
+                account_id="",
+                match='identity.email == "test@cloudflare.com"',
+                name="Allow Developers",
+                precedence=100,
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.zero_trust.devices.policies.custom.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(AsyncSinglePage[SettingsPolicy], custom, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.custom.with_raw_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = await response.parse()
+        assert_matches_type(AsyncSinglePage[SettingsPolicy], custom, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.custom.with_streaming_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = await response.parse()
+            assert_matches_type(AsyncSinglePage[SettingsPolicy], custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.zero_trust.devices.policies.custom.delete(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(AsyncSinglePage[SettingsPolicy], custom, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.custom.with_raw_response.delete(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = await response.parse()
+        assert_matches_type(AsyncSinglePage[SettingsPolicy], custom, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.custom.with_streaming_response.delete(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = await response.parse()
+            assert_matches_type(AsyncSinglePage[SettingsPolicy], custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.with_raw_response.delete(
+                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.with_raw_response.delete(
+                policy_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.zero_trust.devices.policies.custom.edit(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.zero_trust.devices.policies.custom.edit(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            allow_mode_switch=True,
+            allow_updates=True,
+            allowed_to_leave=True,
+            auto_connect=0,
+            captive_portal=180,
+            description="Policy for test teams.",
+            disable_auto_fallback=True,
+            enabled=True,
+            exclude=[
+                {
+                    "address": "192.0.2.0/24",
+                    "description": "Exclude testing domains from the tunnel",
+                }
+            ],
+            exclude_office_ips=True,
+            include=[
+                {
+                    "address": "192.0.2.0/24",
+                    "description": "Include testing domains in the tunnel",
+                }
+            ],
+            lan_allow_minutes=30,
+            lan_allow_subnet_size=24,
+            match='identity.email == "test@cloudflare.com"',
+            name="Allow Developers",
+            precedence=100,
+            register_interface_ip_with_dns=True,
+            sccm_vpn_boundary_support=False,
+            service_mode_v2={
+                "mode": "proxy",
+                "port": 3000,
+            },
+            support_url="https://1.1.1.1/help",
+            switch_locked=True,
+            tunnel_protocol="wireguard",
+        )
+        assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.custom.with_raw_response.edit(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = await response.parse()
+        assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.custom.with_streaming_response.edit(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = await response.parse()
+            assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.with_raw_response.edit(
+                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.with_raw_response.edit(
+                policy_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.zero_trust.devices.policies.custom.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.custom.with_raw_response.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = await response.parse()
+        assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.custom.with_streaming_response.get(
+            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = await response.parse()
+            assert_matches_type(Optional[SettingsPolicy], custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.with_raw_response.get(
+                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
+            await async_client.zero_trust.devices.policies.custom.with_raw_response.get(
+                policy_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
diff --git a/tests/api_resources/zero_trust/devices/policies/test_default.py b/tests/api_resources/zero_trust/devices/policies/test_default.py
new file mode 100644
index 00000000000..4e6dce31427
--- /dev/null
+++ b/tests/api_resources/zero_trust/devices/policies/test_default.py
@@ -0,0 +1,250 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zero_trust.devices.policies import DefaultGetResponse, DefaultEditResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestDefault:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        default = client.zero_trust.devices.policies.default.edit(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[DefaultEditResponse], default, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        default = client.zero_trust.devices.policies.default.edit(
+            account_id="699d98642c564d2e855e9661899b7252",
+            allow_mode_switch=True,
+            allow_updates=True,
+            allowed_to_leave=True,
+            auto_connect=0,
+            captive_portal=180,
+            disable_auto_fallback=True,
+            exclude=[
+                {
+                    "address": "192.0.2.0/24",
+                    "description": "Exclude testing domains from the tunnel",
+                }
+            ],
+            exclude_office_ips=True,
+            include=[
+                {
+                    "address": "192.0.2.0/24",
+                    "description": "Include testing domains in the tunnel",
+                }
+            ],
+            lan_allow_minutes=30,
+            lan_allow_subnet_size=24,
+            register_interface_ip_with_dns=True,
+            sccm_vpn_boundary_support=False,
+            service_mode_v2={
+                "mode": "proxy",
+                "port": 3000,
+            },
+            support_url="https://1.1.1.1/help",
+            switch_locked=True,
+            tunnel_protocol="wireguard",
+        )
+        assert_matches_type(Optional[DefaultEditResponse], default, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.default.with_raw_response.edit(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        default = response.parse()
+        assert_matches_type(Optional[DefaultEditResponse], default, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.default.with_streaming_response.edit(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            default = response.parse()
+            assert_matches_type(Optional[DefaultEditResponse], default, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.default.with_raw_response.edit(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        default = client.zero_trust.devices.policies.default.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[DefaultGetResponse], default, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.policies.default.with_raw_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        default = response.parse()
+        assert_matches_type(Optional[DefaultGetResponse], default, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.policies.default.with_streaming_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            default = response.parse()
+            assert_matches_type(Optional[DefaultGetResponse], default, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.policies.default.with_raw_response.get(
+                account_id="",
+            )
+
+
+class TestAsyncDefault:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        default = await async_client.zero_trust.devices.policies.default.edit(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[DefaultEditResponse], default, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        default = await async_client.zero_trust.devices.policies.default.edit(
+            account_id="699d98642c564d2e855e9661899b7252",
+            allow_mode_switch=True,
+            allow_updates=True,
+            allowed_to_leave=True,
+            auto_connect=0,
+            captive_portal=180,
+            disable_auto_fallback=True,
+            exclude=[
+                {
+                    "address": "192.0.2.0/24",
+                    "description": "Exclude testing domains from the tunnel",
+                }
+            ],
+            exclude_office_ips=True,
+            include=[
+                {
+                    "address": "192.0.2.0/24",
+                    "description": "Include testing domains in the tunnel",
+                }
+            ],
+            lan_allow_minutes=30,
+            lan_allow_subnet_size=24,
+            register_interface_ip_with_dns=True,
+            sccm_vpn_boundary_support=False,
+            service_mode_v2={
+                "mode": "proxy",
+                "port": 3000,
+            },
+            support_url="https://1.1.1.1/help",
+            switch_locked=True,
+            tunnel_protocol="wireguard",
+        )
+        assert_matches_type(Optional[DefaultEditResponse], default, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.default.with_raw_response.edit(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        default = await response.parse()
+        assert_matches_type(Optional[DefaultEditResponse], default, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.default.with_streaming_response.edit(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            default = await response.parse()
+            assert_matches_type(Optional[DefaultEditResponse], default, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.default.with_raw_response.edit(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        default = await async_client.zero_trust.devices.policies.default.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[DefaultGetResponse], default, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.policies.default.with_raw_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        default = await response.parse()
+        assert_matches_type(Optional[DefaultGetResponse], default, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.policies.default.with_streaming_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            default = await response.parse()
+            assert_matches_type(Optional[DefaultGetResponse], default, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.policies.default.with_raw_response.get(
+                account_id="",
+            )
diff --git a/tests/api_resources/zero_trust/devices/policies/test_default_policy.py b/tests/api_resources/zero_trust/devices/policies/test_default_policy.py
deleted file mode 100644
index 51bc7a1bf6c..00000000000
--- a/tests/api_resources/zero_trust/devices/policies/test_default_policy.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.zero_trust.devices.policies import DefaultPolicyGetResponse
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestDefaultPolicy:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        default_policy = client.zero_trust.devices.policies.default_policy.get(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(Optional[DefaultPolicyGetResponse], default_policy, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.policies.default_policy.with_raw_response.get(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        default_policy = response.parse()
-        assert_matches_type(Optional[DefaultPolicyGetResponse], default_policy, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.policies.default_policy.with_streaming_response.get(
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            default_policy = response.parse()
-            assert_matches_type(Optional[DefaultPolicyGetResponse], default_policy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.policies.default_policy.with_raw_response.get(
-                account_id="",
-            )
-
-
-class TestAsyncDefaultPolicy:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        default_policy = await async_client.zero_trust.devices.policies.default_policy.get(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(Optional[DefaultPolicyGetResponse], default_policy, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.policies.default_policy.with_raw_response.get(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        default_policy = await response.parse()
-        assert_matches_type(Optional[DefaultPolicyGetResponse], default_policy, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.policies.default_policy.with_streaming_response.get(
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            default_policy = await response.parse()
-            assert_matches_type(Optional[DefaultPolicyGetResponse], default_policy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.policies.default_policy.with_raw_response.get(
-                account_id="",
-            )
diff --git a/tests/api_resources/zero_trust/devices/policies/test_excludes.py b/tests/api_resources/zero_trust/devices/policies/test_excludes.py
deleted file mode 100644
index 053960e74cf..00000000000
--- a/tests/api_resources/zero_trust/devices/policies/test_excludes.py
+++ /dev/null
@@ -1,387 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.zero_trust.devices.policies import (
-    ExcludeGetResponse,
-    SplitTunnelExclude,
-    ExcludeUpdateResponse,
-)
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestExcludes:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_update(self, client: Cloudflare) -> None:
-        exclude = client.zero_trust.devices.policies.excludes.update(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Exclude testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Exclude testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Exclude testing domains from the tunnel",
-                },
-            ],
-        )
-        assert_matches_type(Optional[ExcludeUpdateResponse], exclude, path=["response"])
-
-    @parametrize
-    def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.policies.excludes.with_raw_response.update(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Exclude testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Exclude testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Exclude testing domains from the tunnel",
-                },
-            ],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        exclude = response.parse()
-        assert_matches_type(Optional[ExcludeUpdateResponse], exclude, path=["response"])
-
-    @parametrize
-    def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.policies.excludes.with_streaming_response.update(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Exclude testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Exclude testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Exclude testing domains from the tunnel",
-                },
-            ],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            exclude = response.parse()
-            assert_matches_type(Optional[ExcludeUpdateResponse], exclude, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.policies.excludes.with_raw_response.update(
-                account_id="",
-                body=[
-                    {
-                        "address": "192.0.2.0/24",
-                        "description": "Exclude testing domains from the tunnel",
-                    },
-                    {
-                        "address": "192.0.2.0/24",
-                        "description": "Exclude testing domains from the tunnel",
-                    },
-                    {
-                        "address": "192.0.2.0/24",
-                        "description": "Exclude testing domains from the tunnel",
-                    },
-                ],
-            )
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        exclude = client.zero_trust.devices.policies.excludes.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(SyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.policies.excludes.with_raw_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        exclude = response.parse()
-        assert_matches_type(SyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.policies.excludes.with_streaming_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            exclude = response.parse()
-            assert_matches_type(SyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.policies.excludes.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        exclude = client.zero_trust.devices.policies.excludes.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(Optional[ExcludeGetResponse], exclude, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.policies.excludes.with_raw_response.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        exclude = response.parse()
-        assert_matches_type(Optional[ExcludeGetResponse], exclude, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.policies.excludes.with_streaming_response.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            exclude = response.parse()
-            assert_matches_type(Optional[ExcludeGetResponse], exclude, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.policies.excludes.with_raw_response.get(
-                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
-            client.zero_trust.devices.policies.excludes.with_raw_response.get(
-                policy_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-
-class TestAsyncExcludes:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        exclude = await async_client.zero_trust.devices.policies.excludes.update(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Exclude testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Exclude testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Exclude testing domains from the tunnel",
-                },
-            ],
-        )
-        assert_matches_type(Optional[ExcludeUpdateResponse], exclude, path=["response"])
-
-    @parametrize
-    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.policies.excludes.with_raw_response.update(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Exclude testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Exclude testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Exclude testing domains from the tunnel",
-                },
-            ],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        exclude = await response.parse()
-        assert_matches_type(Optional[ExcludeUpdateResponse], exclude, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.policies.excludes.with_streaming_response.update(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Exclude testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Exclude testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Exclude testing domains from the tunnel",
-                },
-            ],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            exclude = await response.parse()
-            assert_matches_type(Optional[ExcludeUpdateResponse], exclude, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.policies.excludes.with_raw_response.update(
-                account_id="",
-                body=[
-                    {
-                        "address": "192.0.2.0/24",
-                        "description": "Exclude testing domains from the tunnel",
-                    },
-                    {
-                        "address": "192.0.2.0/24",
-                        "description": "Exclude testing domains from the tunnel",
-                    },
-                    {
-                        "address": "192.0.2.0/24",
-                        "description": "Exclude testing domains from the tunnel",
-                    },
-                ],
-            )
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        exclude = await async_client.zero_trust.devices.policies.excludes.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(AsyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.policies.excludes.with_raw_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        exclude = await response.parse()
-        assert_matches_type(AsyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.policies.excludes.with_streaming_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            exclude = await response.parse()
-            assert_matches_type(AsyncSinglePage[SplitTunnelExclude], exclude, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.policies.excludes.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        exclude = await async_client.zero_trust.devices.policies.excludes.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(Optional[ExcludeGetResponse], exclude, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.policies.excludes.with_raw_response.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        exclude = await response.parse()
-        assert_matches_type(Optional[ExcludeGetResponse], exclude, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.policies.excludes.with_streaming_response.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            exclude = await response.parse()
-            assert_matches_type(Optional[ExcludeGetResponse], exclude, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.policies.excludes.with_raw_response.get(
-                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
-            await async_client.zero_trust.devices.policies.excludes.with_raw_response.get(
-                policy_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
diff --git a/tests/api_resources/zero_trust/devices/policies/test_fallback_domains.py b/tests/api_resources/zero_trust/devices/policies/test_fallback_domains.py
deleted file mode 100644
index 71cf3cd9f87..00000000000
--- a/tests/api_resources/zero_trust/devices/policies/test_fallback_domains.py
+++ /dev/null
@@ -1,305 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.zero_trust.devices.policies import (
-    FallbackDomain,
-    FallbackDomainGetResponse,
-    FallbackDomainUpdateResponse,
-)
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestFallbackDomains:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_update(self, client: Cloudflare) -> None:
-        fallback_domain = client.zero_trust.devices.policies.fallback_domains.update(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[{"suffix": "example.com"}, {"suffix": "example.com"}, {"suffix": "example.com"}],
-        )
-        assert_matches_type(Optional[FallbackDomainUpdateResponse], fallback_domain, path=["response"])
-
-    @parametrize
-    def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.policies.fallback_domains.with_raw_response.update(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[{"suffix": "example.com"}, {"suffix": "example.com"}, {"suffix": "example.com"}],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        fallback_domain = response.parse()
-        assert_matches_type(Optional[FallbackDomainUpdateResponse], fallback_domain, path=["response"])
-
-    @parametrize
-    def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.policies.fallback_domains.with_streaming_response.update(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[{"suffix": "example.com"}, {"suffix": "example.com"}, {"suffix": "example.com"}],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            fallback_domain = response.parse()
-            assert_matches_type(Optional[FallbackDomainUpdateResponse], fallback_domain, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.policies.fallback_domains.with_raw_response.update(
-                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-                body=[{"suffix": "example.com"}, {"suffix": "example.com"}, {"suffix": "example.com"}],
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
-            client.zero_trust.devices.policies.fallback_domains.with_raw_response.update(
-                policy_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-                body=[{"suffix": "example.com"}, {"suffix": "example.com"}, {"suffix": "example.com"}],
-            )
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        fallback_domain = client.zero_trust.devices.policies.fallback_domains.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(SyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.policies.fallback_domains.with_raw_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        fallback_domain = response.parse()
-        assert_matches_type(SyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.policies.fallback_domains.with_streaming_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            fallback_domain = response.parse()
-            assert_matches_type(SyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.policies.fallback_domains.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        fallback_domain = client.zero_trust.devices.policies.fallback_domains.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(Optional[FallbackDomainGetResponse], fallback_domain, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.policies.fallback_domains.with_raw_response.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        fallback_domain = response.parse()
-        assert_matches_type(Optional[FallbackDomainGetResponse], fallback_domain, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.policies.fallback_domains.with_streaming_response.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            fallback_domain = response.parse()
-            assert_matches_type(Optional[FallbackDomainGetResponse], fallback_domain, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.policies.fallback_domains.with_raw_response.get(
-                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
-            client.zero_trust.devices.policies.fallback_domains.with_raw_response.get(
-                policy_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-
-class TestAsyncFallbackDomains:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        fallback_domain = await async_client.zero_trust.devices.policies.fallback_domains.update(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[{"suffix": "example.com"}, {"suffix": "example.com"}, {"suffix": "example.com"}],
-        )
-        assert_matches_type(Optional[FallbackDomainUpdateResponse], fallback_domain, path=["response"])
-
-    @parametrize
-    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.policies.fallback_domains.with_raw_response.update(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[{"suffix": "example.com"}, {"suffix": "example.com"}, {"suffix": "example.com"}],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        fallback_domain = await response.parse()
-        assert_matches_type(Optional[FallbackDomainUpdateResponse], fallback_domain, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.policies.fallback_domains.with_streaming_response.update(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[{"suffix": "example.com"}, {"suffix": "example.com"}, {"suffix": "example.com"}],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            fallback_domain = await response.parse()
-            assert_matches_type(Optional[FallbackDomainUpdateResponse], fallback_domain, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.policies.fallback_domains.with_raw_response.update(
-                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-                body=[{"suffix": "example.com"}, {"suffix": "example.com"}, {"suffix": "example.com"}],
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
-            await async_client.zero_trust.devices.policies.fallback_domains.with_raw_response.update(
-                policy_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-                body=[{"suffix": "example.com"}, {"suffix": "example.com"}, {"suffix": "example.com"}],
-            )
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        fallback_domain = await async_client.zero_trust.devices.policies.fallback_domains.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(AsyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.policies.fallback_domains.with_raw_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        fallback_domain = await response.parse()
-        assert_matches_type(AsyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.policies.fallback_domains.with_streaming_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            fallback_domain = await response.parse()
-            assert_matches_type(AsyncSinglePage[FallbackDomain], fallback_domain, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.policies.fallback_domains.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        fallback_domain = await async_client.zero_trust.devices.policies.fallback_domains.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(Optional[FallbackDomainGetResponse], fallback_domain, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.policies.fallback_domains.with_raw_response.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        fallback_domain = await response.parse()
-        assert_matches_type(Optional[FallbackDomainGetResponse], fallback_domain, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.policies.fallback_domains.with_streaming_response.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            fallback_domain = await response.parse()
-            assert_matches_type(Optional[FallbackDomainGetResponse], fallback_domain, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.policies.fallback_domains.with_raw_response.get(
-                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
-            await async_client.zero_trust.devices.policies.fallback_domains.with_raw_response.get(
-                policy_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
diff --git a/tests/api_resources/zero_trust/devices/policies/test_includes.py b/tests/api_resources/zero_trust/devices/policies/test_includes.py
deleted file mode 100644
index e858168766f..00000000000
--- a/tests/api_resources/zero_trust/devices/policies/test_includes.py
+++ /dev/null
@@ -1,387 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.zero_trust.devices.policies import (
-    IncludeGetResponse,
-    SplitTunnelInclude,
-    IncludeUpdateResponse,
-)
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestIncludes:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_update(self, client: Cloudflare) -> None:
-        include = client.zero_trust.devices.policies.includes.update(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Include testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Include testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Include testing domains from the tunnel",
-                },
-            ],
-        )
-        assert_matches_type(Optional[IncludeUpdateResponse], include, path=["response"])
-
-    @parametrize
-    def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.policies.includes.with_raw_response.update(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Include testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Include testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Include testing domains from the tunnel",
-                },
-            ],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        include = response.parse()
-        assert_matches_type(Optional[IncludeUpdateResponse], include, path=["response"])
-
-    @parametrize
-    def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.policies.includes.with_streaming_response.update(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Include testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Include testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Include testing domains from the tunnel",
-                },
-            ],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            include = response.parse()
-            assert_matches_type(Optional[IncludeUpdateResponse], include, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.policies.includes.with_raw_response.update(
-                account_id="",
-                body=[
-                    {
-                        "address": "192.0.2.0/24",
-                        "description": "Include testing domains from the tunnel",
-                    },
-                    {
-                        "address": "192.0.2.0/24",
-                        "description": "Include testing domains from the tunnel",
-                    },
-                    {
-                        "address": "192.0.2.0/24",
-                        "description": "Include testing domains from the tunnel",
-                    },
-                ],
-            )
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        include = client.zero_trust.devices.policies.includes.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(SyncSinglePage[SplitTunnelInclude], include, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.policies.includes.with_raw_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        include = response.parse()
-        assert_matches_type(SyncSinglePage[SplitTunnelInclude], include, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.policies.includes.with_streaming_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            include = response.parse()
-            assert_matches_type(SyncSinglePage[SplitTunnelInclude], include, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.policies.includes.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        include = client.zero_trust.devices.policies.includes.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(Optional[IncludeGetResponse], include, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.policies.includes.with_raw_response.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        include = response.parse()
-        assert_matches_type(Optional[IncludeGetResponse], include, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.policies.includes.with_streaming_response.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            include = response.parse()
-            assert_matches_type(Optional[IncludeGetResponse], include, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.policies.includes.with_raw_response.get(
-                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
-            client.zero_trust.devices.policies.includes.with_raw_response.get(
-                policy_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-
-class TestAsyncIncludes:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        include = await async_client.zero_trust.devices.policies.includes.update(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Include testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Include testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Include testing domains from the tunnel",
-                },
-            ],
-        )
-        assert_matches_type(Optional[IncludeUpdateResponse], include, path=["response"])
-
-    @parametrize
-    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.policies.includes.with_raw_response.update(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Include testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Include testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Include testing domains from the tunnel",
-                },
-            ],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        include = await response.parse()
-        assert_matches_type(Optional[IncludeUpdateResponse], include, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.policies.includes.with_streaming_response.update(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Include testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Include testing domains from the tunnel",
-                },
-                {
-                    "address": "192.0.2.0/24",
-                    "description": "Include testing domains from the tunnel",
-                },
-            ],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            include = await response.parse()
-            assert_matches_type(Optional[IncludeUpdateResponse], include, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.policies.includes.with_raw_response.update(
-                account_id="",
-                body=[
-                    {
-                        "address": "192.0.2.0/24",
-                        "description": "Include testing domains from the tunnel",
-                    },
-                    {
-                        "address": "192.0.2.0/24",
-                        "description": "Include testing domains from the tunnel",
-                    },
-                    {
-                        "address": "192.0.2.0/24",
-                        "description": "Include testing domains from the tunnel",
-                    },
-                ],
-            )
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        include = await async_client.zero_trust.devices.policies.includes.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(AsyncSinglePage[SplitTunnelInclude], include, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.policies.includes.with_raw_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        include = await response.parse()
-        assert_matches_type(AsyncSinglePage[SplitTunnelInclude], include, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.policies.includes.with_streaming_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            include = await response.parse()
-            assert_matches_type(AsyncSinglePage[SplitTunnelInclude], include, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.policies.includes.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        include = await async_client.zero_trust.devices.policies.includes.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(Optional[IncludeGetResponse], include, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.policies.includes.with_raw_response.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        include = await response.parse()
-        assert_matches_type(Optional[IncludeGetResponse], include, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.policies.includes.with_streaming_response.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            include = await response.parse()
-            assert_matches_type(Optional[IncludeGetResponse], include, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.policies.includes.with_raw_response.get(
-                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
-            await async_client.zero_trust.devices.policies.includes.with_raw_response.get(
-                policy_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
diff --git a/tests/api_resources/zero_trust/devices/posture/test_integrations.py b/tests/api_resources/zero_trust/devices/posture/test_integrations.py
index 6ad1c0fabd0..a55756c5b48 100644
--- a/tests/api_resources/zero_trust/devices/posture/test_integrations.py
+++ b/tests/api_resources/zero_trust/devices/posture/test_integrations.py
@@ -27,7 +27,7 @@ def test_method_create(self, client: Cloudflare) -> None:
             account_id="699d98642c564d2e855e9661899b7252",
             config={
                 "api_url": "https://as123.awmdm.com/API",
-                "auth_url": "https://na.uemauth.vmwservices.com/connect/token",
+                "auth_url": "https://na.uemauth.workspaceone.com/connect/token",
                 "client_id": "example client id",
                 "client_secret": "example client secret",
             },
@@ -43,7 +43,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             account_id="699d98642c564d2e855e9661899b7252",
             config={
                 "api_url": "https://as123.awmdm.com/API",
-                "auth_url": "https://na.uemauth.vmwservices.com/connect/token",
+                "auth_url": "https://na.uemauth.workspaceone.com/connect/token",
                 "client_id": "example client id",
                 "client_secret": "example client secret",
             },
@@ -59,7 +59,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
             account_id="699d98642c564d2e855e9661899b7252",
             config={
                 "api_url": "https://as123.awmdm.com/API",
-                "auth_url": "https://na.uemauth.vmwservices.com/connect/token",
+                "auth_url": "https://na.uemauth.workspaceone.com/connect/token",
                 "client_id": "example client id",
                 "client_secret": "example client secret",
             },
@@ -79,7 +79,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             account_id="699d98642c564d2e855e9661899b7252",
             config={
                 "api_url": "https://as123.awmdm.com/API",
-                "auth_url": "https://na.uemauth.vmwservices.com/connect/token",
+                "auth_url": "https://na.uemauth.workspaceone.com/connect/token",
                 "client_id": "example client id",
                 "client_secret": "example client secret",
             },
@@ -102,7 +102,7 @@ def test_path_params_create(self, client: Cloudflare) -> None:
                 account_id="",
                 config={
                     "api_url": "https://as123.awmdm.com/API",
-                    "auth_url": "https://na.uemauth.vmwservices.com/connect/token",
+                    "auth_url": "https://na.uemauth.workspaceone.com/connect/token",
                     "client_id": "example client id",
                     "client_secret": "example client secret",
                 },
@@ -155,7 +155,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             integration_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(IntegrationDeleteResponse, integration, path=["response"])
+        assert_matches_type(Optional[IntegrationDeleteResponse], integration, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -167,7 +167,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         integration = response.parse()
-        assert_matches_type(IntegrationDeleteResponse, integration, path=["response"])
+        assert_matches_type(Optional[IntegrationDeleteResponse], integration, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -179,7 +179,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             integration = response.parse()
-            assert_matches_type(IntegrationDeleteResponse, integration, path=["response"])
+            assert_matches_type(Optional[IntegrationDeleteResponse], integration, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -212,7 +212,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
             account_id="699d98642c564d2e855e9661899b7252",
             config={
                 "api_url": "https://as123.awmdm.com/API",
-                "auth_url": "https://na.uemauth.vmwservices.com/connect/token",
+                "auth_url": "https://na.uemauth.workspaceone.com/connect/token",
                 "client_id": "example client id",
                 "client_secret": "example client secret",
             },
@@ -312,7 +312,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncIntegrations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -320,7 +322,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
             account_id="699d98642c564d2e855e9661899b7252",
             config={
                 "api_url": "https://as123.awmdm.com/API",
-                "auth_url": "https://na.uemauth.vmwservices.com/connect/token",
+                "auth_url": "https://na.uemauth.workspaceone.com/connect/token",
                 "client_id": "example client id",
                 "client_secret": "example client secret",
             },
@@ -336,7 +338,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             account_id="699d98642c564d2e855e9661899b7252",
             config={
                 "api_url": "https://as123.awmdm.com/API",
-                "auth_url": "https://na.uemauth.vmwservices.com/connect/token",
+                "auth_url": "https://na.uemauth.workspaceone.com/connect/token",
                 "client_id": "example client id",
                 "client_secret": "example client secret",
             },
@@ -352,7 +354,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
             account_id="699d98642c564d2e855e9661899b7252",
             config={
                 "api_url": "https://as123.awmdm.com/API",
-                "auth_url": "https://na.uemauth.vmwservices.com/connect/token",
+                "auth_url": "https://na.uemauth.workspaceone.com/connect/token",
                 "client_id": "example client id",
                 "client_secret": "example client secret",
             },
@@ -372,7 +374,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             account_id="699d98642c564d2e855e9661899b7252",
             config={
                 "api_url": "https://as123.awmdm.com/API",
-                "auth_url": "https://na.uemauth.vmwservices.com/connect/token",
+                "auth_url": "https://na.uemauth.workspaceone.com/connect/token",
                 "client_id": "example client id",
                 "client_secret": "example client secret",
             },
@@ -395,7 +397,7 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
                 account_id="",
                 config={
                     "api_url": "https://as123.awmdm.com/API",
-                    "auth_url": "https://na.uemauth.vmwservices.com/connect/token",
+                    "auth_url": "https://na.uemauth.workspaceone.com/connect/token",
                     "client_id": "example client id",
                     "client_secret": "example client secret",
                 },
@@ -448,7 +450,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             integration_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(IntegrationDeleteResponse, integration, path=["response"])
+        assert_matches_type(Optional[IntegrationDeleteResponse], integration, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -460,7 +462,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         integration = await response.parse()
-        assert_matches_type(IntegrationDeleteResponse, integration, path=["response"])
+        assert_matches_type(Optional[IntegrationDeleteResponse], integration, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -472,7 +474,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             integration = await response.parse()
-            assert_matches_type(IntegrationDeleteResponse, integration, path=["response"])
+            assert_matches_type(Optional[IntegrationDeleteResponse], integration, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -505,7 +507,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
             account_id="699d98642c564d2e855e9661899b7252",
             config={
                 "api_url": "https://as123.awmdm.com/API",
-                "auth_url": "https://na.uemauth.vmwservices.com/connect/token",
+                "auth_url": "https://na.uemauth.workspaceone.com/connect/token",
                 "client_id": "example client id",
                 "client_secret": "example client secret",
             },
diff --git a/tests/api_resources/zero_trust/devices/resilience/__init__.py b/tests/api_resources/zero_trust/devices/resilience/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/devices/resilience/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/devices/resilience/test_global_warp_override.py b/tests/api_resources/zero_trust/devices/resilience/test_global_warp_override.py
new file mode 100644
index 00000000000..f5d2c2974e5
--- /dev/null
+++ b/tests/api_resources/zero_trust/devices/resilience/test_global_warp_override.py
@@ -0,0 +1,205 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zero_trust.devices.resilience import (
+    GlobalWARPOverrideGetResponse,
+    GlobalWARPOverrideCreateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestGlobalWARPOverride:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        global_warp_override = client.zero_trust.devices.resilience.global_warp_override.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            disconnect=False,
+        )
+        assert_matches_type(Optional[GlobalWARPOverrideCreateResponse], global_warp_override, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        global_warp_override = client.zero_trust.devices.resilience.global_warp_override.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            disconnect=False,
+            justification="Turning off WARP for testing purposes.",
+        )
+        assert_matches_type(Optional[GlobalWARPOverrideCreateResponse], global_warp_override, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.resilience.global_warp_override.with_raw_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            disconnect=False,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        global_warp_override = response.parse()
+        assert_matches_type(Optional[GlobalWARPOverrideCreateResponse], global_warp_override, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.resilience.global_warp_override.with_streaming_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            disconnect=False,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            global_warp_override = response.parse()
+            assert_matches_type(Optional[GlobalWARPOverrideCreateResponse], global_warp_override, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.resilience.global_warp_override.with_raw_response.create(
+                account_id="",
+                disconnect=False,
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        global_warp_override = client.zero_trust.devices.resilience.global_warp_override.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[GlobalWARPOverrideGetResponse], global_warp_override, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.resilience.global_warp_override.with_raw_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        global_warp_override = response.parse()
+        assert_matches_type(Optional[GlobalWARPOverrideGetResponse], global_warp_override, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.resilience.global_warp_override.with_streaming_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            global_warp_override = response.parse()
+            assert_matches_type(Optional[GlobalWARPOverrideGetResponse], global_warp_override, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.resilience.global_warp_override.with_raw_response.get(
+                account_id="",
+            )
+
+
+class TestAsyncGlobalWARPOverride:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        global_warp_override = await async_client.zero_trust.devices.resilience.global_warp_override.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            disconnect=False,
+        )
+        assert_matches_type(Optional[GlobalWARPOverrideCreateResponse], global_warp_override, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        global_warp_override = await async_client.zero_trust.devices.resilience.global_warp_override.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            disconnect=False,
+            justification="Turning off WARP for testing purposes.",
+        )
+        assert_matches_type(Optional[GlobalWARPOverrideCreateResponse], global_warp_override, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.resilience.global_warp_override.with_raw_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            disconnect=False,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        global_warp_override = await response.parse()
+        assert_matches_type(Optional[GlobalWARPOverrideCreateResponse], global_warp_override, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.resilience.global_warp_override.with_streaming_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            disconnect=False,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            global_warp_override = await response.parse()
+            assert_matches_type(Optional[GlobalWARPOverrideCreateResponse], global_warp_override, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.resilience.global_warp_override.with_raw_response.create(
+                account_id="",
+                disconnect=False,
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        global_warp_override = await async_client.zero_trust.devices.resilience.global_warp_override.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[GlobalWARPOverrideGetResponse], global_warp_override, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.resilience.global_warp_override.with_raw_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        global_warp_override = await response.parse()
+        assert_matches_type(Optional[GlobalWARPOverrideGetResponse], global_warp_override, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.resilience.global_warp_override.with_streaming_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            global_warp_override = await response.parse()
+            assert_matches_type(Optional[GlobalWARPOverrideGetResponse], global_warp_override, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.resilience.global_warp_override.with_raw_response.get(
+                account_id="",
+            )
diff --git a/tests/api_resources/zero_trust/devices/test_devices_.py b/tests/api_resources/zero_trust/devices/test_devices_.py
new file mode 100644
index 00000000000..4d3ddb57128
--- /dev/null
+++ b/tests/api_resources/zero_trust/devices/test_devices_.py
@@ -0,0 +1,482 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncCursorPagination, AsyncCursorPagination
+from cloudflare.types.zero_trust.devices import (
+    DeviceGetResponse,
+    DeviceListResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestDevices:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        device = client.zero_trust.devices.devices.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncCursorPagination[DeviceListResponse], device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        device = client.zero_trust.devices.devices.list(
+            account_id="account_id",
+            id=["string"],
+            active_registrations="include",
+            cursor="cursor",
+            include="include",
+            last_seen_user={"email": "email"},
+            per_page=0,
+            search="search",
+            seen_after="seen_after",
+            seen_before="seen_before",
+            sort_by="name",
+            sort_order="asc",
+        )
+        assert_matches_type(SyncCursorPagination[DeviceListResponse], device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.devices.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        device = response.parse()
+        assert_matches_type(SyncCursorPagination[DeviceListResponse], device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.devices.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            device = response.parse()
+            assert_matches_type(SyncCursorPagination[DeviceListResponse], device, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.devices.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        device = client.zero_trust.devices.devices.delete(
+            device_id="device_id",
+            account_id="account_id",
+        )
+        assert_matches_type(object, device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.devices.with_raw_response.delete(
+            device_id="device_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        device = response.parse()
+        assert_matches_type(object, device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.devices.with_streaming_response.delete(
+            device_id="device_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            device = response.parse()
+            assert_matches_type(object, device, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.devices.with_raw_response.delete(
+                device_id="device_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `device_id` but received ''"):
+            client.zero_trust.devices.devices.with_raw_response.delete(
+                device_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        device = client.zero_trust.devices.devices.get(
+            device_id="device_id",
+            account_id="account_id",
+        )
+        assert_matches_type(DeviceGetResponse, device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        device = client.zero_trust.devices.devices.get(
+            device_id="device_id",
+            account_id="account_id",
+            include="include",
+        )
+        assert_matches_type(DeviceGetResponse, device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.devices.with_raw_response.get(
+            device_id="device_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        device = response.parse()
+        assert_matches_type(DeviceGetResponse, device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.devices.with_streaming_response.get(
+            device_id="device_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            device = response.parse()
+            assert_matches_type(DeviceGetResponse, device, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.devices.with_raw_response.get(
+                device_id="device_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `device_id` but received ''"):
+            client.zero_trust.devices.devices.with_raw_response.get(
+                device_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_revoke(self, client: Cloudflare) -> None:
+        device = client.zero_trust.devices.devices.revoke(
+            device_id="device_id",
+            account_id="account_id",
+        )
+        assert_matches_type(object, device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_raw_response_revoke(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.devices.with_raw_response.revoke(
+            device_id="device_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        device = response.parse()
+        assert_matches_type(object, device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_streaming_response_revoke(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.devices.with_streaming_response.revoke(
+            device_id="device_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            device = response.parse()
+            assert_matches_type(object, device, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_path_params_revoke(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.devices.with_raw_response.revoke(
+                device_id="device_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `device_id` but received ''"):
+            client.zero_trust.devices.devices.with_raw_response.revoke(
+                device_id="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncDevices:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        device = await async_client.zero_trust.devices.devices.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncCursorPagination[DeviceListResponse], device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        device = await async_client.zero_trust.devices.devices.list(
+            account_id="account_id",
+            id=["string"],
+            active_registrations="include",
+            cursor="cursor",
+            include="include",
+            last_seen_user={"email": "email"},
+            per_page=0,
+            search="search",
+            seen_after="seen_after",
+            seen_before="seen_before",
+            sort_by="name",
+            sort_order="asc",
+        )
+        assert_matches_type(AsyncCursorPagination[DeviceListResponse], device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.devices.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        device = await response.parse()
+        assert_matches_type(AsyncCursorPagination[DeviceListResponse], device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.devices.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            device = await response.parse()
+            assert_matches_type(AsyncCursorPagination[DeviceListResponse], device, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.devices.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        device = await async_client.zero_trust.devices.devices.delete(
+            device_id="device_id",
+            account_id="account_id",
+        )
+        assert_matches_type(object, device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.devices.with_raw_response.delete(
+            device_id="device_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        device = await response.parse()
+        assert_matches_type(object, device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.devices.with_streaming_response.delete(
+            device_id="device_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            device = await response.parse()
+            assert_matches_type(object, device, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.devices.with_raw_response.delete(
+                device_id="device_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `device_id` but received ''"):
+            await async_client.zero_trust.devices.devices.with_raw_response.delete(
+                device_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        device = await async_client.zero_trust.devices.devices.get(
+            device_id="device_id",
+            account_id="account_id",
+        )
+        assert_matches_type(DeviceGetResponse, device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        device = await async_client.zero_trust.devices.devices.get(
+            device_id="device_id",
+            account_id="account_id",
+            include="include",
+        )
+        assert_matches_type(DeviceGetResponse, device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.devices.with_raw_response.get(
+            device_id="device_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        device = await response.parse()
+        assert_matches_type(DeviceGetResponse, device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.devices.with_streaming_response.get(
+            device_id="device_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            device = await response.parse()
+            assert_matches_type(DeviceGetResponse, device, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.devices.with_raw_response.get(
+                device_id="device_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `device_id` but received ''"):
+            await async_client.zero_trust.devices.devices.with_raw_response.get(
+                device_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_revoke(self, async_client: AsyncCloudflare) -> None:
+        device = await async_client.zero_trust.devices.devices.revoke(
+            device_id="device_id",
+            account_id="account_id",
+        )
+        assert_matches_type(object, device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_raw_response_revoke(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.devices.with_raw_response.revoke(
+            device_id="device_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        device = await response.parse()
+        assert_matches_type(object, device, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_streaming_response_revoke(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.devices.with_streaming_response.revoke(
+            device_id="device_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            device = await response.parse()
+            assert_matches_type(object, device, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_path_params_revoke(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.devices.with_raw_response.revoke(
+                device_id="device_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `device_id` but received ''"):
+            await async_client.zero_trust.devices.devices.with_raw_response.revoke(
+                device_id="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/zero_trust/devices/test_dex_tests.py b/tests/api_resources/zero_trust/devices/test_dex_tests.py
index 8fca61704e4..e6b7bad3063 100644
--- a/tests/api_resources/zero_trust/devices/test_dex_tests.py
+++ b/tests/api_resources/zero_trust/devices/test_dex_tests.py
@@ -9,10 +9,13 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.zero_trust.devices import (
-    SchemaHTTP,
+    DEXTestGetResponse,
+    DEXTestListResponse,
+    DEXTestCreateResponse,
     DEXTestDeleteResponse,
+    DEXTestUpdateResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -24,18 +27,21 @@ class TestDEXTests:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         dex_test = client.zero_trust.devices.dex_tests.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            data={},
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            data={
+                "host": "https://dash.cloudflare.com",
+                "kind": "http",
+            },
             enabled=True,
             interval="30m",
             name="HTTP dash health check",
         )
-        assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(Optional[DEXTestCreateResponse], dex_test, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         dex_test = client.zero_trust.devices.dex_tests.create(
-            account_id="699d98642c564d2e855e9661899b7252",
+            account_id="01a7362d577a6c3019a474fd6f485823",
             data={
                 "host": "https://dash.cloudflare.com",
                 "kind": "http",
@@ -47,30 +53,23 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             description="Checks the dash endpoint every 30 minutes",
             target_policies=[
                 {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "default": True,
-                    "id": "id",
-                    "name": "name",
-                },
-                {
-                    "default": True,
-                    "id": "id",
                     "name": "name",
-                },
-                {
-                    "default": True,
-                    "id": "id",
-                    "name": "name",
-                },
+                }
             ],
             targeted=True,
         )
-        assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(Optional[DEXTestCreateResponse], dex_test, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.zero_trust.devices.dex_tests.with_raw_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            data={},
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            data={
+                "host": "https://dash.cloudflare.com",
+                "kind": "http",
+            },
             enabled=True,
             interval="30m",
             name="HTTP dash health check",
@@ -79,13 +78,16 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dex_test = response.parse()
-        assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(Optional[DEXTestCreateResponse], dex_test, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.zero_trust.devices.dex_tests.with_streaming_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            data={},
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            data={
+                "host": "https://dash.cloudflare.com",
+                "kind": "http",
+            },
             enabled=True,
             interval="30m",
             name="HTTP dash health check",
@@ -94,7 +96,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dex_test = response.parse()
-            assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+            assert_matches_type(Optional[DEXTestCreateResponse], dex_test, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -103,7 +105,10 @@ def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.devices.dex_tests.with_raw_response.create(
                 account_id="",
-                data={},
+                data={
+                    "host": "https://dash.cloudflare.com",
+                    "kind": "http",
+                },
                 enabled=True,
                 interval="30m",
                 name="HTTP dash health check",
@@ -113,19 +118,22 @@ def test_path_params_create(self, client: Cloudflare) -> None:
     def test_method_update(self, client: Cloudflare) -> None:
         dex_test = client.zero_trust.devices.dex_tests.update(
             dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            data={},
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            data={
+                "host": "https://dash.cloudflare.com",
+                "kind": "http",
+            },
             enabled=True,
             interval="30m",
             name="HTTP dash health check",
         )
-        assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(Optional[DEXTestUpdateResponse], dex_test, path=["response"])
 
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         dex_test = client.zero_trust.devices.dex_tests.update(
             dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
+            account_id="01a7362d577a6c3019a474fd6f485823",
             data={
                 "host": "https://dash.cloudflare.com",
                 "kind": "http",
@@ -137,31 +145,24 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             description="Checks the dash endpoint every 30 minutes",
             target_policies=[
                 {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "default": True,
-                    "id": "id",
                     "name": "name",
-                },
-                {
-                    "default": True,
-                    "id": "id",
-                    "name": "name",
-                },
-                {
-                    "default": True,
-                    "id": "id",
-                    "name": "name",
-                },
+                }
             ],
             targeted=True,
         )
-        assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(Optional[DEXTestUpdateResponse], dex_test, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.zero_trust.devices.dex_tests.with_raw_response.update(
             dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            data={},
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            data={
+                "host": "https://dash.cloudflare.com",
+                "kind": "http",
+            },
             enabled=True,
             interval="30m",
             name="HTTP dash health check",
@@ -170,14 +171,17 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dex_test = response.parse()
-        assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(Optional[DEXTestUpdateResponse], dex_test, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.zero_trust.devices.dex_tests.with_streaming_response.update(
             dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            data={},
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            data={
+                "host": "https://dash.cloudflare.com",
+                "kind": "http",
+            },
             enabled=True,
             interval="30m",
             name="HTTP dash health check",
@@ -186,7 +190,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dex_test = response.parse()
-            assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+            assert_matches_type(Optional[DEXTestUpdateResponse], dex_test, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -196,7 +200,10 @@ def test_path_params_update(self, client: Cloudflare) -> None:
             client.zero_trust.devices.dex_tests.with_raw_response.update(
                 dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
-                data={},
+                data={
+                    "host": "https://dash.cloudflare.com",
+                    "kind": "http",
+                },
                 enabled=True,
                 interval="30m",
                 name="HTTP dash health check",
@@ -205,8 +212,11 @@ def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dex_test_id` but received ''"):
             client.zero_trust.devices.dex_tests.with_raw_response.update(
                 dex_test_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-                data={},
+                account_id="01a7362d577a6c3019a474fd6f485823",
+                data={
+                    "host": "https://dash.cloudflare.com",
+                    "kind": "http",
+                },
                 enabled=True,
                 interval="30m",
                 name="HTTP dash health check",
@@ -215,31 +225,42 @@ def test_path_params_update(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         dex_test = client.zero_trust.devices.dex_tests.list(
-            account_id="699d98642c564d2e855e9661899b7252",
+            account_id="01a7362d577a6c3019a474fd6f485823",
         )
-        assert_matches_type(SyncSinglePage[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[DEXTestListResponse], dex_test, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        dex_test = client.zero_trust.devices.dex_tests.list(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            kind="http",
+            page=1,
+            per_page=1,
+            test_name="testName",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[DEXTestListResponse], dex_test, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.zero_trust.devices.dex_tests.with_raw_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
+            account_id="01a7362d577a6c3019a474fd6f485823",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dex_test = response.parse()
-        assert_matches_type(SyncSinglePage[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(SyncV4PagePaginationArray[DEXTestListResponse], dex_test, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.zero_trust.devices.dex_tests.with_streaming_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
+            account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dex_test = response.parse()
-            assert_matches_type(SyncSinglePage[SchemaHTTP], dex_test, path=["response"])
+            assert_matches_type(SyncV4PagePaginationArray[DEXTestListResponse], dex_test, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -254,7 +275,7 @@ def test_path_params_list(self, client: Cloudflare) -> None:
     def test_method_delete(self, client: Cloudflare) -> None:
         dex_test = client.zero_trust.devices.dex_tests.delete(
             dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
+            account_id="01a7362d577a6c3019a474fd6f485823",
         )
         assert_matches_type(Optional[DEXTestDeleteResponse], dex_test, path=["response"])
 
@@ -262,7 +283,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.zero_trust.devices.dex_tests.with_raw_response.delete(
             dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
+            account_id="01a7362d577a6c3019a474fd6f485823",
         )
 
         assert response.is_closed is True
@@ -274,7 +295,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.zero_trust.devices.dex_tests.with_streaming_response.delete(
             dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
+            account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -295,40 +316,40 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dex_test_id` but received ''"):
             client.zero_trust.devices.dex_tests.with_raw_response.delete(
                 dex_test_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
+                account_id="01a7362d577a6c3019a474fd6f485823",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         dex_test = client.zero_trust.devices.dex_tests.get(
-            dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
+            dex_test_id="372e67954025e0ba6aaa6d586b9e0b59",
+            account_id="01a7362d577a6c3019a474fd6f485823",
         )
-        assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(Optional[DEXTestGetResponse], dex_test, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.zero_trust.devices.dex_tests.with_raw_response.get(
-            dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
+            dex_test_id="372e67954025e0ba6aaa6d586b9e0b59",
+            account_id="01a7362d577a6c3019a474fd6f485823",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dex_test = response.parse()
-        assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(Optional[DEXTestGetResponse], dex_test, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.zero_trust.devices.dex_tests.with_streaming_response.get(
-            dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
+            dex_test_id="372e67954025e0ba6aaa6d586b9e0b59",
+            account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dex_test = response.parse()
-            assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+            assert_matches_type(Optional[DEXTestGetResponse], dex_test, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -336,35 +357,40 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.devices.dex_tests.with_raw_response.get(
-                dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                dex_test_id="372e67954025e0ba6aaa6d586b9e0b59",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dex_test_id` but received ''"):
             client.zero_trust.devices.dex_tests.with_raw_response.get(
                 dex_test_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
+                account_id="01a7362d577a6c3019a474fd6f485823",
             )
 
 
 class TestAsyncDEXTests:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         dex_test = await async_client.zero_trust.devices.dex_tests.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            data={},
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            data={
+                "host": "https://dash.cloudflare.com",
+                "kind": "http",
+            },
             enabled=True,
             interval="30m",
             name="HTTP dash health check",
         )
-        assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(Optional[DEXTestCreateResponse], dex_test, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         dex_test = await async_client.zero_trust.devices.dex_tests.create(
-            account_id="699d98642c564d2e855e9661899b7252",
+            account_id="01a7362d577a6c3019a474fd6f485823",
             data={
                 "host": "https://dash.cloudflare.com",
                 "kind": "http",
@@ -376,30 +402,23 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             description="Checks the dash endpoint every 30 minutes",
             target_policies=[
                 {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "default": True,
-                    "id": "id",
-                    "name": "name",
-                },
-                {
-                    "default": True,
-                    "id": "id",
                     "name": "name",
-                },
-                {
-                    "default": True,
-                    "id": "id",
-                    "name": "name",
-                },
+                }
             ],
             targeted=True,
         )
-        assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(Optional[DEXTestCreateResponse], dex_test, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.devices.dex_tests.with_raw_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            data={},
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            data={
+                "host": "https://dash.cloudflare.com",
+                "kind": "http",
+            },
             enabled=True,
             interval="30m",
             name="HTTP dash health check",
@@ -408,13 +427,16 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dex_test = await response.parse()
-        assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(Optional[DEXTestCreateResponse], dex_test, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.devices.dex_tests.with_streaming_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            data={},
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            data={
+                "host": "https://dash.cloudflare.com",
+                "kind": "http",
+            },
             enabled=True,
             interval="30m",
             name="HTTP dash health check",
@@ -423,7 +445,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dex_test = await response.parse()
-            assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+            assert_matches_type(Optional[DEXTestCreateResponse], dex_test, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -432,7 +454,10 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.devices.dex_tests.with_raw_response.create(
                 account_id="",
-                data={},
+                data={
+                    "host": "https://dash.cloudflare.com",
+                    "kind": "http",
+                },
                 enabled=True,
                 interval="30m",
                 name="HTTP dash health check",
@@ -442,19 +467,22 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         dex_test = await async_client.zero_trust.devices.dex_tests.update(
             dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            data={},
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            data={
+                "host": "https://dash.cloudflare.com",
+                "kind": "http",
+            },
             enabled=True,
             interval="30m",
             name="HTTP dash health check",
         )
-        assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(Optional[DEXTestUpdateResponse], dex_test, path=["response"])
 
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         dex_test = await async_client.zero_trust.devices.dex_tests.update(
             dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
+            account_id="01a7362d577a6c3019a474fd6f485823",
             data={
                 "host": "https://dash.cloudflare.com",
                 "kind": "http",
@@ -466,31 +494,24 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             description="Checks the dash endpoint every 30 minutes",
             target_policies=[
                 {
+                    "id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                     "default": True,
-                    "id": "id",
                     "name": "name",
-                },
-                {
-                    "default": True,
-                    "id": "id",
-                    "name": "name",
-                },
-                {
-                    "default": True,
-                    "id": "id",
-                    "name": "name",
-                },
+                }
             ],
             targeted=True,
         )
-        assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(Optional[DEXTestUpdateResponse], dex_test, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.devices.dex_tests.with_raw_response.update(
             dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            data={},
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            data={
+                "host": "https://dash.cloudflare.com",
+                "kind": "http",
+            },
             enabled=True,
             interval="30m",
             name="HTTP dash health check",
@@ -499,14 +520,17 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dex_test = await response.parse()
-        assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(Optional[DEXTestUpdateResponse], dex_test, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.devices.dex_tests.with_streaming_response.update(
             dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            data={},
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            data={
+                "host": "https://dash.cloudflare.com",
+                "kind": "http",
+            },
             enabled=True,
             interval="30m",
             name="HTTP dash health check",
@@ -515,7 +539,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dex_test = await response.parse()
-            assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+            assert_matches_type(Optional[DEXTestUpdateResponse], dex_test, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -525,7 +549,10 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
             await async_client.zero_trust.devices.dex_tests.with_raw_response.update(
                 dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
-                data={},
+                data={
+                    "host": "https://dash.cloudflare.com",
+                    "kind": "http",
+                },
                 enabled=True,
                 interval="30m",
                 name="HTTP dash health check",
@@ -534,8 +561,11 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dex_test_id` but received ''"):
             await async_client.zero_trust.devices.dex_tests.with_raw_response.update(
                 dex_test_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-                data={},
+                account_id="01a7362d577a6c3019a474fd6f485823",
+                data={
+                    "host": "https://dash.cloudflare.com",
+                    "kind": "http",
+                },
                 enabled=True,
                 interval="30m",
                 name="HTTP dash health check",
@@ -544,31 +574,42 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         dex_test = await async_client.zero_trust.devices.dex_tests.list(
-            account_id="699d98642c564d2e855e9661899b7252",
+            account_id="01a7362d577a6c3019a474fd6f485823",
         )
-        assert_matches_type(AsyncSinglePage[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[DEXTestListResponse], dex_test, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        dex_test = await async_client.zero_trust.devices.dex_tests.list(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            kind="http",
+            page=1,
+            per_page=1,
+            test_name="testName",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[DEXTestListResponse], dex_test, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.devices.dex_tests.with_raw_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
+            account_id="01a7362d577a6c3019a474fd6f485823",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dex_test = await response.parse()
-        assert_matches_type(AsyncSinglePage[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(AsyncV4PagePaginationArray[DEXTestListResponse], dex_test, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.devices.dex_tests.with_streaming_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
+            account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dex_test = await response.parse()
-            assert_matches_type(AsyncSinglePage[SchemaHTTP], dex_test, path=["response"])
+            assert_matches_type(AsyncV4PagePaginationArray[DEXTestListResponse], dex_test, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -583,7 +624,7 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         dex_test = await async_client.zero_trust.devices.dex_tests.delete(
             dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
+            account_id="01a7362d577a6c3019a474fd6f485823",
         )
         assert_matches_type(Optional[DEXTestDeleteResponse], dex_test, path=["response"])
 
@@ -591,7 +632,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.devices.dex_tests.with_raw_response.delete(
             dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
+            account_id="01a7362d577a6c3019a474fd6f485823",
         )
 
         assert response.is_closed is True
@@ -603,7 +644,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.devices.dex_tests.with_streaming_response.delete(
             dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
+            account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -624,40 +665,40 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dex_test_id` but received ''"):
             await async_client.zero_trust.devices.dex_tests.with_raw_response.delete(
                 dex_test_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
+                account_id="01a7362d577a6c3019a474fd6f485823",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         dex_test = await async_client.zero_trust.devices.dex_tests.get(
-            dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
+            dex_test_id="372e67954025e0ba6aaa6d586b9e0b59",
+            account_id="01a7362d577a6c3019a474fd6f485823",
         )
-        assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(Optional[DEXTestGetResponse], dex_test, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.devices.dex_tests.with_raw_response.get(
-            dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
+            dex_test_id="372e67954025e0ba6aaa6d586b9e0b59",
+            account_id="01a7362d577a6c3019a474fd6f485823",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dex_test = await response.parse()
-        assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+        assert_matches_type(Optional[DEXTestGetResponse], dex_test, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.devices.dex_tests.with_streaming_response.get(
-            dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
+            dex_test_id="372e67954025e0ba6aaa6d586b9e0b59",
+            account_id="01a7362d577a6c3019a474fd6f485823",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dex_test = await response.parse()
-            assert_matches_type(Optional[SchemaHTTP], dex_test, path=["response"])
+            assert_matches_type(Optional[DEXTestGetResponse], dex_test, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -665,12 +706,12 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.devices.dex_tests.with_raw_response.get(
-                dex_test_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                dex_test_id="372e67954025e0ba6aaa6d586b9e0b59",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dex_test_id` but received ''"):
             await async_client.zero_trust.devices.dex_tests.with_raw_response.get(
                 dex_test_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
+                account_id="01a7362d577a6c3019a474fd6f485823",
             )
diff --git a/tests/api_resources/zero_trust/devices/test_fleet_status.py b/tests/api_resources/zero_trust/devices/test_fleet_status.py
new file mode 100644
index 00000000000..fa6ed7dbd72
--- /dev/null
+++ b/tests/api_resources/zero_trust/devices/test_fleet_status.py
@@ -0,0 +1,152 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zero_trust.devices import FleetStatusGetResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestFleetStatus:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        fleet_status = client.zero_trust.devices.fleet_status.get(
+            device_id="cb49c27f-7f97-49c5-b6f3-f7c01ead0fd7",
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            since_minutes=10,
+        )
+        assert_matches_type(FleetStatusGetResponse, fleet_status, path=["response"])
+
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        fleet_status = client.zero_trust.devices.fleet_status.get(
+            device_id="cb49c27f-7f97-49c5-b6f3-f7c01ead0fd7",
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            since_minutes=10,
+            colo="SJC",
+            time_now="2023-10-11T00:00:00Z",
+        )
+        assert_matches_type(FleetStatusGetResponse, fleet_status, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.fleet_status.with_raw_response.get(
+            device_id="cb49c27f-7f97-49c5-b6f3-f7c01ead0fd7",
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            since_minutes=10,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        fleet_status = response.parse()
+        assert_matches_type(FleetStatusGetResponse, fleet_status, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.fleet_status.with_streaming_response.get(
+            device_id="cb49c27f-7f97-49c5-b6f3-f7c01ead0fd7",
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            since_minutes=10,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            fleet_status = response.parse()
+            assert_matches_type(FleetStatusGetResponse, fleet_status, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.fleet_status.with_raw_response.get(
+                device_id="cb49c27f-7f97-49c5-b6f3-f7c01ead0fd7",
+                account_id="",
+                since_minutes=10,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `device_id` but received ''"):
+            client.zero_trust.devices.fleet_status.with_raw_response.get(
+                device_id="",
+                account_id="01a7362d577a6c3019a474fd6f485823",
+                since_minutes=10,
+            )
+
+
+class TestAsyncFleetStatus:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        fleet_status = await async_client.zero_trust.devices.fleet_status.get(
+            device_id="cb49c27f-7f97-49c5-b6f3-f7c01ead0fd7",
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            since_minutes=10,
+        )
+        assert_matches_type(FleetStatusGetResponse, fleet_status, path=["response"])
+
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        fleet_status = await async_client.zero_trust.devices.fleet_status.get(
+            device_id="cb49c27f-7f97-49c5-b6f3-f7c01ead0fd7",
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            since_minutes=10,
+            colo="SJC",
+            time_now="2023-10-11T00:00:00Z",
+        )
+        assert_matches_type(FleetStatusGetResponse, fleet_status, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.fleet_status.with_raw_response.get(
+            device_id="cb49c27f-7f97-49c5-b6f3-f7c01ead0fd7",
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            since_minutes=10,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        fleet_status = await response.parse()
+        assert_matches_type(FleetStatusGetResponse, fleet_status, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.fleet_status.with_streaming_response.get(
+            device_id="cb49c27f-7f97-49c5-b6f3-f7c01ead0fd7",
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            since_minutes=10,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            fleet_status = await response.parse()
+            assert_matches_type(FleetStatusGetResponse, fleet_status, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.fleet_status.with_raw_response.get(
+                device_id="cb49c27f-7f97-49c5-b6f3-f7c01ead0fd7",
+                account_id="",
+                since_minutes=10,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `device_id` but received ''"):
+            await async_client.zero_trust.devices.fleet_status.with_raw_response.get(
+                device_id="",
+                account_id="01a7362d577a6c3019a474fd6f485823",
+                since_minutes=10,
+            )
diff --git a/tests/api_resources/zero_trust/devices/test_networks.py b/tests/api_resources/zero_trust/devices/test_networks.py
index 3d6c9bacbe1..09e1164f0be 100644
--- a/tests/api_resources/zero_trust/devices/test_networks.py
+++ b/tests/api_resources/zero_trust/devices/test_networks.py
@@ -10,10 +10,7 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.zero_trust.devices import (
-    DeviceNetwork,
-    NetworkDeleteResponse,
-)
+from cloudflare.types.zero_trust.devices import DeviceNetwork
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -36,8 +33,8 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         network = client.zero_trust.devices.networks.create(
             account_id="699d98642c564d2e855e9661899b7252",
             config={
-                "sha256": "b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c",
                 "tls_sockaddr": "foo.bar:1234",
+                "sha256": "b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c",
             },
             name="managed-network-1",
             type="tls",
@@ -98,8 +95,8 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             network_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="699d98642c564d2e855e9661899b7252",
             config={
-                "sha256": "b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c",
                 "tls_sockaddr": "foo.bar:1234",
+                "sha256": "b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c",
             },
             name="managed-network-1",
             type="tls",
@@ -190,7 +187,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             network_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(Optional[NetworkDeleteResponse], network, path=["response"])
+        assert_matches_type(SyncSinglePage[DeviceNetwork], network, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -202,7 +199,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         network = response.parse()
-        assert_matches_type(Optional[NetworkDeleteResponse], network, path=["response"])
+        assert_matches_type(SyncSinglePage[DeviceNetwork], network, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -214,7 +211,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             network = response.parse()
-            assert_matches_type(Optional[NetworkDeleteResponse], network, path=["response"])
+            assert_matches_type(SyncSinglePage[DeviceNetwork], network, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -282,7 +279,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncNetworks:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -299,8 +298,8 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
         network = await async_client.zero_trust.devices.networks.create(
             account_id="699d98642c564d2e855e9661899b7252",
             config={
-                "sha256": "b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c",
                 "tls_sockaddr": "foo.bar:1234",
+                "sha256": "b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c",
             },
             name="managed-network-1",
             type="tls",
@@ -361,8 +360,8 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             network_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="699d98642c564d2e855e9661899b7252",
             config={
-                "sha256": "b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c",
                 "tls_sockaddr": "foo.bar:1234",
+                "sha256": "b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c",
             },
             name="managed-network-1",
             type="tls",
@@ -453,7 +452,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             network_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(Optional[NetworkDeleteResponse], network, path=["response"])
+        assert_matches_type(AsyncSinglePage[DeviceNetwork], network, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -465,7 +464,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         network = await response.parse()
-        assert_matches_type(Optional[NetworkDeleteResponse], network, path=["response"])
+        assert_matches_type(AsyncSinglePage[DeviceNetwork], network, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -477,7 +476,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             network = await response.parse()
-            assert_matches_type(Optional[NetworkDeleteResponse], network, path=["response"])
+            assert_matches_type(AsyncSinglePage[DeviceNetwork], network, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/zero_trust/devices/test_override_codes.py b/tests/api_resources/zero_trust/devices/test_override_codes.py
index 263f3c9c113..64cedbbaac8 100644
--- a/tests/api_resources/zero_trust/devices/test_override_codes.py
+++ b/tests/api_resources/zero_trust/devices/test_override_codes.py
@@ -3,13 +3,16 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.zero_trust.devices import OverrideCodeListResponse
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.devices import OverrideCodeGetResponse
+
+# pyright: reportDeprecated=false
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -17,102 +20,226 @@
 class TestOverrideCodes:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
-        override_code = client.zero_trust.devices.override_codes.list(
-            device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(Optional[OverrideCodeListResponse], override_code, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            override_code = client.zero_trust.devices.override_codes.list(
+                device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+        assert_matches_type(SyncSinglePage[object], override_code, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.override_codes.with_raw_response.list(
-            device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.zero_trust.devices.override_codes.with_raw_response.list(
+                device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         override_code = response.parse()
-        assert_matches_type(Optional[OverrideCodeListResponse], override_code, path=["response"])
+        assert_matches_type(SyncSinglePage[object], override_code, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.override_codes.with_streaming_response.list(
-            device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
+        with pytest.warns(DeprecationWarning):
+            with client.zero_trust.devices.override_codes.with_streaming_response.list(
+                device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                override_code = response.parse()
+                assert_matches_type(SyncSinglePage[object], override_code, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.zero_trust.devices.override_codes.with_raw_response.list(
+                    device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    account_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `device_id` but received ''"):
+                client.zero_trust.devices.override_codes.with_raw_response.list(
+                    device_id="",
+                    account_id="699d98642c564d2e855e9661899b7252",
+                )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        override_code = client.zero_trust.devices.override_codes.get(
+            registration_id="registration_id",
+            account_id="account_id",
+        )
+        assert_matches_type(OverrideCodeGetResponse, override_code, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.override_codes.with_raw_response.get(
+            registration_id="registration_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        override_code = response.parse()
+        assert_matches_type(OverrideCodeGetResponse, override_code, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.override_codes.with_streaming_response.get(
+            registration_id="registration_id",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             override_code = response.parse()
-            assert_matches_type(Optional[OverrideCodeListResponse], override_code, path=["response"])
+            assert_matches_type(OverrideCodeGetResponse, override_code, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
     @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
+    def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.override_codes.with_raw_response.list(
-                device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            client.zero_trust.devices.override_codes.with_raw_response.get(
+                registration_id="registration_id",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `device_id` but received ''"):
-            client.zero_trust.devices.override_codes.with_raw_response.list(
-                device_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `registration_id` but received ''"):
+            client.zero_trust.devices.override_codes.with_raw_response.get(
+                registration_id="",
+                account_id="account_id",
             )
 
 
 class TestAsyncOverrideCodes:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        override_code = await async_client.zero_trust.devices.override_codes.list(
-            device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(Optional[OverrideCodeListResponse], override_code, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            override_code = await async_client.zero_trust.devices.override_codes.list(
+                device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
 
+        assert_matches_type(AsyncSinglePage[object], override_code, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.override_codes.with_raw_response.list(
-            device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.zero_trust.devices.override_codes.with_raw_response.list(
+                device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         override_code = await response.parse()
-        assert_matches_type(Optional[OverrideCodeListResponse], override_code, path=["response"])
+        assert_matches_type(AsyncSinglePage[object], override_code, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.override_codes.with_streaming_response.list(
-            device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
+        with pytest.warns(DeprecationWarning):
+            async with async_client.zero_trust.devices.override_codes.with_streaming_response.list(
+                device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                override_code = await response.parse()
+                assert_matches_type(AsyncSinglePage[object], override_code, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.zero_trust.devices.override_codes.with_raw_response.list(
+                    device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    account_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `device_id` but received ''"):
+                await async_client.zero_trust.devices.override_codes.with_raw_response.list(
+                    device_id="",
+                    account_id="699d98642c564d2e855e9661899b7252",
+                )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        override_code = await async_client.zero_trust.devices.override_codes.get(
+            registration_id="registration_id",
+            account_id="account_id",
+        )
+        assert_matches_type(OverrideCodeGetResponse, override_code, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.override_codes.with_raw_response.get(
+            registration_id="registration_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        override_code = await response.parse()
+        assert_matches_type(OverrideCodeGetResponse, override_code, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.override_codes.with_streaming_response.get(
+            registration_id="registration_id",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             override_code = await response.parse()
-            assert_matches_type(Optional[OverrideCodeListResponse], override_code, path=["response"])
+            assert_matches_type(OverrideCodeGetResponse, override_code, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
     @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.override_codes.with_raw_response.list(
-                device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            await async_client.zero_trust.devices.override_codes.with_raw_response.get(
+                registration_id="registration_id",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `device_id` but received ''"):
-            await async_client.zero_trust.devices.override_codes.with_raw_response.list(
-                device_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `registration_id` but received ''"):
+            await async_client.zero_trust.devices.override_codes.with_raw_response.get(
+                registration_id="",
+                account_id="account_id",
             )
diff --git a/tests/api_resources/zero_trust/devices/test_policies.py b/tests/api_resources/zero_trust/devices/test_policies.py
deleted file mode 100644
index 2e93c0f2870..00000000000
--- a/tests/api_resources/zero_trust/devices/test_policies.py
+++ /dev/null
@@ -1,624 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.zero_trust.devices import (
-    SettingsPolicy,
-    PolicyDeleteResponse,
-)
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestPolicies:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_method_create(self, client: Cloudflare) -> None:
-        policy = client.zero_trust.devices.policies.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            match='user.identity == "test@cloudflare.com"',
-            name="Allow Developers",
-            precedence=100,
-        )
-        assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
-        policy = client.zero_trust.devices.policies.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            match='user.identity == "test@cloudflare.com"',
-            name="Allow Developers",
-            precedence=100,
-            allow_mode_switch=True,
-            allow_updates=True,
-            allowed_to_leave=True,
-            auto_connect=0,
-            captive_portal=180,
-            description="Policy for test teams.",
-            disable_auto_fallback=True,
-            enabled=True,
-            exclude_office_ips=True,
-            lan_allow_minutes=30,
-            lan_allow_subnet_size=24,
-            service_mode_v2={
-                "mode": "proxy",
-                "port": 3000,
-            },
-            support_url="https://1.1.1.1/help",
-            switch_locked=True,
-        )
-        assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.policies.with_raw_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            match='user.identity == "test@cloudflare.com"',
-            name="Allow Developers",
-            precedence=100,
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        policy = response.parse()
-        assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.policies.with_streaming_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            match='user.identity == "test@cloudflare.com"',
-            name="Allow Developers",
-            precedence=100,
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            policy = response.parse()
-            assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.policies.with_raw_response.create(
-                account_id="",
-                match='user.identity == "test@cloudflare.com"',
-                name="Allow Developers",
-                precedence=100,
-            )
-
-    @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        policy = client.zero_trust.devices.policies.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(SyncSinglePage[SettingsPolicy], policy, path=["response"])
-
-    @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.policies.with_raw_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        policy = response.parse()
-        assert_matches_type(SyncSinglePage[SettingsPolicy], policy, path=["response"])
-
-    @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.policies.with_streaming_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            policy = response.parse()
-            assert_matches_type(SyncSinglePage[SettingsPolicy], policy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.policies.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    def test_method_delete(self, client: Cloudflare) -> None:
-        policy = client.zero_trust.devices.policies.delete(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(Optional[PolicyDeleteResponse], policy, path=["response"])
-
-    @parametrize
-    def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.policies.with_raw_response.delete(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        policy = response.parse()
-        assert_matches_type(Optional[PolicyDeleteResponse], policy, path=["response"])
-
-    @parametrize
-    def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.policies.with_streaming_response.delete(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            policy = response.parse()
-            assert_matches_type(Optional[PolicyDeleteResponse], policy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.policies.with_raw_response.delete(
-                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
-            client.zero_trust.devices.policies.with_raw_response.delete(
-                policy_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_method_edit(self, client: Cloudflare) -> None:
-        policy = client.zero_trust.devices.policies.edit(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
-        policy = client.zero_trust.devices.policies.edit(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            allow_mode_switch=True,
-            allow_updates=True,
-            allowed_to_leave=True,
-            auto_connect=0,
-            captive_portal=180,
-            description="Policy for test teams.",
-            disable_auto_fallback=True,
-            enabled=True,
-            exclude_office_ips=True,
-            match='user.identity == "test@cloudflare.com"',
-            name="Allow Developers",
-            precedence=100,
-            service_mode_v2={
-                "mode": "proxy",
-                "port": 3000,
-            },
-            support_url="https://1.1.1.1/help",
-            switch_locked=True,
-        )
-        assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_raw_response_edit(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.policies.with_raw_response.edit(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        policy = response.parse()
-        assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_streaming_response_edit(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.policies.with_streaming_response.edit(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            policy = response.parse()
-            assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_path_params_edit(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.policies.with_raw_response.edit(
-                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
-            client.zero_trust.devices.policies.with_raw_response.edit(
-                policy_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        policy = client.zero_trust.devices.policies.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.policies.with_raw_response.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        policy = response.parse()
-        assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.policies.with_streaming_response.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            policy = response.parse()
-            assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.policies.with_raw_response.get(
-                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
-            client.zero_trust.devices.policies.with_raw_response.get(
-                policy_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-
-class TestAsyncPolicies:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        policy = await async_client.zero_trust.devices.policies.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            match='user.identity == "test@cloudflare.com"',
-            name="Allow Developers",
-            precedence=100,
-        )
-        assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        policy = await async_client.zero_trust.devices.policies.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            match='user.identity == "test@cloudflare.com"',
-            name="Allow Developers",
-            precedence=100,
-            allow_mode_switch=True,
-            allow_updates=True,
-            allowed_to_leave=True,
-            auto_connect=0,
-            captive_portal=180,
-            description="Policy for test teams.",
-            disable_auto_fallback=True,
-            enabled=True,
-            exclude_office_ips=True,
-            lan_allow_minutes=30,
-            lan_allow_subnet_size=24,
-            service_mode_v2={
-                "mode": "proxy",
-                "port": 3000,
-            },
-            support_url="https://1.1.1.1/help",
-            switch_locked=True,
-        )
-        assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.policies.with_raw_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            match='user.identity == "test@cloudflare.com"',
-            name="Allow Developers",
-            precedence=100,
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        policy = await response.parse()
-        assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.policies.with_streaming_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            match='user.identity == "test@cloudflare.com"',
-            name="Allow Developers",
-            precedence=100,
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            policy = await response.parse()
-            assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.policies.with_raw_response.create(
-                account_id="",
-                match='user.identity == "test@cloudflare.com"',
-                name="Allow Developers",
-                precedence=100,
-            )
-
-    @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        policy = await async_client.zero_trust.devices.policies.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(AsyncSinglePage[SettingsPolicy], policy, path=["response"])
-
-    @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.policies.with_raw_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        policy = await response.parse()
-        assert_matches_type(AsyncSinglePage[SettingsPolicy], policy, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.policies.with_streaming_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            policy = await response.parse()
-            assert_matches_type(AsyncSinglePage[SettingsPolicy], policy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.policies.with_raw_response.list(
-                account_id="",
-            )
-
-    @parametrize
-    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        policy = await async_client.zero_trust.devices.policies.delete(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(Optional[PolicyDeleteResponse], policy, path=["response"])
-
-    @parametrize
-    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.policies.with_raw_response.delete(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        policy = await response.parse()
-        assert_matches_type(Optional[PolicyDeleteResponse], policy, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.policies.with_streaming_response.delete(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            policy = await response.parse()
-            assert_matches_type(Optional[PolicyDeleteResponse], policy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.policies.with_raw_response.delete(
-                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
-            await async_client.zero_trust.devices.policies.with_raw_response.delete(
-                policy_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
-        policy = await async_client.zero_trust.devices.policies.edit(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        policy = await async_client.zero_trust.devices.policies.edit(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            allow_mode_switch=True,
-            allow_updates=True,
-            allowed_to_leave=True,
-            auto_connect=0,
-            captive_portal=180,
-            description="Policy for test teams.",
-            disable_auto_fallback=True,
-            enabled=True,
-            exclude_office_ips=True,
-            match='user.identity == "test@cloudflare.com"',
-            name="Allow Developers",
-            precedence=100,
-            service_mode_v2={
-                "mode": "proxy",
-                "port": 3000,
-            },
-            support_url="https://1.1.1.1/help",
-            switch_locked=True,
-        )
-        assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.policies.with_raw_response.edit(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        policy = await response.parse()
-        assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.policies.with_streaming_response.edit(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            policy = await response.parse()
-            assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.policies.with_raw_response.edit(
-                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
-            await async_client.zero_trust.devices.policies.with_raw_response.edit(
-                policy_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        policy = await async_client.zero_trust.devices.policies.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.policies.with_raw_response.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        policy = await response.parse()
-        assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.policies.with_streaming_response.get(
-            policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            policy = await response.parse()
-            assert_matches_type(Optional[SettingsPolicy], policy, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @pytest.mark.skip(reason="TODO: investigate broken test")
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.policies.with_raw_response.get(
-                policy_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `policy_id` but received ''"):
-            await async_client.zero_trust.devices.policies.with_raw_response.get(
-                policy_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
diff --git a/tests/api_resources/zero_trust/devices/test_posture.py b/tests/api_resources/zero_trust/devices/test_posture.py
index 7470b1a4cba..36505a237d1 100644
--- a/tests/api_resources/zero_trust/devices/test_posture.py
+++ b/tests/api_resources/zero_trust/devices/test_posture.py
@@ -39,13 +39,13 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             description="The rule for admin serial numbers",
             expiration="1h",
             input={
-                "exists": True,
                 "operating_system": "linux",
                 "path": "/bin/cat",
+                "exists": True,
                 "sha256": "https://api.us-2.crowdstrike.com",
                 "thumbprint": "0aabab210bdb998e9cf45da2c9ce352977ab531c681b74cf1e487be1bbe9fe6e",
             },
-            match=[{"platform": "windows"}, {"platform": "windows"}, {"platform": "windows"}],
+            match=[{"platform": "windows"}],
             schedule="1h",
         )
         assert_matches_type(Optional[DevicePostureRule], posture, path=["response"])
@@ -107,13 +107,13 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             description="The rule for admin serial numbers",
             expiration="1h",
             input={
-                "exists": True,
                 "operating_system": "linux",
                 "path": "/bin/cat",
+                "exists": True,
                 "sha256": "https://api.us-2.crowdstrike.com",
                 "thumbprint": "0aabab210bdb998e9cf45da2c9ce352977ab531c681b74cf1e487be1bbe9fe6e",
             },
-            match=[{"platform": "windows"}, {"platform": "windows"}, {"platform": "windows"}],
+            match=[{"platform": "windows"}],
             schedule="1h",
         )
         assert_matches_type(Optional[DevicePostureRule], posture, path=["response"])
@@ -302,7 +302,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncPosture:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -322,13 +324,13 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             description="The rule for admin serial numbers",
             expiration="1h",
             input={
-                "exists": True,
                 "operating_system": "linux",
                 "path": "/bin/cat",
+                "exists": True,
                 "sha256": "https://api.us-2.crowdstrike.com",
                 "thumbprint": "0aabab210bdb998e9cf45da2c9ce352977ab531c681b74cf1e487be1bbe9fe6e",
             },
-            match=[{"platform": "windows"}, {"platform": "windows"}, {"platform": "windows"}],
+            match=[{"platform": "windows"}],
             schedule="1h",
         )
         assert_matches_type(Optional[DevicePostureRule], posture, path=["response"])
@@ -390,13 +392,13 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             description="The rule for admin serial numbers",
             expiration="1h",
             input={
-                "exists": True,
                 "operating_system": "linux",
                 "path": "/bin/cat",
+                "exists": True,
                 "sha256": "https://api.us-2.crowdstrike.com",
                 "thumbprint": "0aabab210bdb998e9cf45da2c9ce352977ab531c681b74cf1e487be1bbe9fe6e",
             },
-            match=[{"platform": "windows"}, {"platform": "windows"}, {"platform": "windows"}],
+            match=[{"platform": "windows"}],
             schedule="1h",
         )
         assert_matches_type(Optional[DevicePostureRule], posture, path=["response"])
diff --git a/tests/api_resources/zero_trust/devices/test_registrations.py b/tests/api_resources/zero_trust/devices/test_registrations.py
new file mode 100644
index 00000000000..bcaa136a2dd
--- /dev/null
+++ b/tests/api_resources/zero_trust/devices/test_registrations.py
@@ -0,0 +1,656 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncCursorPagination, AsyncCursorPagination
+from cloudflare.types.zero_trust.devices import (
+    RegistrationGetResponse,
+    RegistrationListResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestRegistrations:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        registration = client.zero_trust.devices.registrations.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncCursorPagination[RegistrationListResponse], registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        registration = client.zero_trust.devices.registrations.list(
+            account_id="account_id",
+            id=["string"],
+            cursor="cursor",
+            device={"id": "id"},
+            include="include",
+            per_page=0,
+            search="search",
+            seen_after="seen_after",
+            seen_before="seen_before",
+            sort_by="id",
+            sort_order="asc",
+            status="active",
+            user={"id": ["string"]},
+        )
+        assert_matches_type(SyncCursorPagination[RegistrationListResponse], registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.registrations.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        registration = response.parse()
+        assert_matches_type(SyncCursorPagination[RegistrationListResponse], registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.registrations.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            registration = response.parse()
+            assert_matches_type(SyncCursorPagination[RegistrationListResponse], registration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.registrations.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        registration = client.zero_trust.devices.registrations.delete(
+            registration_id="registration_id",
+            account_id="account_id",
+        )
+        assert_matches_type(object, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.registrations.with_raw_response.delete(
+            registration_id="registration_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        registration = response.parse()
+        assert_matches_type(object, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.registrations.with_streaming_response.delete(
+            registration_id="registration_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            registration = response.parse()
+            assert_matches_type(object, registration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.registrations.with_raw_response.delete(
+                registration_id="registration_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `registration_id` but received ''"):
+            client.zero_trust.devices.registrations.with_raw_response.delete(
+                registration_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_bulk_delete(self, client: Cloudflare) -> None:
+        registration = client.zero_trust.devices.registrations.bulk_delete(
+            account_id="account_id",
+            id=["string"],
+        )
+        assert_matches_type(object, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_raw_response_bulk_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.registrations.with_raw_response.bulk_delete(
+            account_id="account_id",
+            id=["string"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        registration = response.parse()
+        assert_matches_type(object, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_streaming_response_bulk_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.registrations.with_streaming_response.bulk_delete(
+            account_id="account_id",
+            id=["string"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            registration = response.parse()
+            assert_matches_type(object, registration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_path_params_bulk_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.registrations.with_raw_response.bulk_delete(
+                account_id="",
+                id=["string"],
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        registration = client.zero_trust.devices.registrations.get(
+            registration_id="registration_id",
+            account_id="account_id",
+        )
+        assert_matches_type(RegistrationGetResponse, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        registration = client.zero_trust.devices.registrations.get(
+            registration_id="registration_id",
+            account_id="account_id",
+            include="include",
+        )
+        assert_matches_type(RegistrationGetResponse, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.registrations.with_raw_response.get(
+            registration_id="registration_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        registration = response.parse()
+        assert_matches_type(RegistrationGetResponse, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.registrations.with_streaming_response.get(
+            registration_id="registration_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            registration = response.parse()
+            assert_matches_type(RegistrationGetResponse, registration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.registrations.with_raw_response.get(
+                registration_id="registration_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `registration_id` but received ''"):
+            client.zero_trust.devices.registrations.with_raw_response.get(
+                registration_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_revoke(self, client: Cloudflare) -> None:
+        registration = client.zero_trust.devices.registrations.revoke(
+            account_id="account_id",
+            id=["string"],
+        )
+        assert_matches_type(object, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_raw_response_revoke(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.registrations.with_raw_response.revoke(
+            account_id="account_id",
+            id=["string"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        registration = response.parse()
+        assert_matches_type(object, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_streaming_response_revoke(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.registrations.with_streaming_response.revoke(
+            account_id="account_id",
+            id=["string"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            registration = response.parse()
+            assert_matches_type(object, registration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_path_params_revoke(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.registrations.with_raw_response.revoke(
+                account_id="",
+                id=["string"],
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_method_unrevoke(self, client: Cloudflare) -> None:
+        registration = client.zero_trust.devices.registrations.unrevoke(
+            account_id="account_id",
+            id=["string"],
+        )
+        assert_matches_type(object, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_raw_response_unrevoke(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.registrations.with_raw_response.unrevoke(
+            account_id="account_id",
+            id=["string"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        registration = response.parse()
+        assert_matches_type(object, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_streaming_response_unrevoke(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.registrations.with_streaming_response.unrevoke(
+            account_id="account_id",
+            id=["string"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            registration = response.parse()
+            assert_matches_type(object, registration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    def test_path_params_unrevoke(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.registrations.with_raw_response.unrevoke(
+                account_id="",
+                id=["string"],
+            )
+
+
+class TestAsyncRegistrations:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        registration = await async_client.zero_trust.devices.registrations.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncCursorPagination[RegistrationListResponse], registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        registration = await async_client.zero_trust.devices.registrations.list(
+            account_id="account_id",
+            id=["string"],
+            cursor="cursor",
+            device={"id": "id"},
+            include="include",
+            per_page=0,
+            search="search",
+            seen_after="seen_after",
+            seen_before="seen_before",
+            sort_by="id",
+            sort_order="asc",
+            status="active",
+            user={"id": ["string"]},
+        )
+        assert_matches_type(AsyncCursorPagination[RegistrationListResponse], registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.registrations.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        registration = await response.parse()
+        assert_matches_type(AsyncCursorPagination[RegistrationListResponse], registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.registrations.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            registration = await response.parse()
+            assert_matches_type(AsyncCursorPagination[RegistrationListResponse], registration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.registrations.with_raw_response.list(
+                account_id="",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        registration = await async_client.zero_trust.devices.registrations.delete(
+            registration_id="registration_id",
+            account_id="account_id",
+        )
+        assert_matches_type(object, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.registrations.with_raw_response.delete(
+            registration_id="registration_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        registration = await response.parse()
+        assert_matches_type(object, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.registrations.with_streaming_response.delete(
+            registration_id="registration_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            registration = await response.parse()
+            assert_matches_type(object, registration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.registrations.with_raw_response.delete(
+                registration_id="registration_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `registration_id` but received ''"):
+            await async_client.zero_trust.devices.registrations.with_raw_response.delete(
+                registration_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        registration = await async_client.zero_trust.devices.registrations.bulk_delete(
+            account_id="account_id",
+            id=["string"],
+        )
+        assert_matches_type(object, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_raw_response_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.registrations.with_raw_response.bulk_delete(
+            account_id="account_id",
+            id=["string"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        registration = await response.parse()
+        assert_matches_type(object, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_streaming_response_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.registrations.with_streaming_response.bulk_delete(
+            account_id="account_id",
+            id=["string"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            registration = await response.parse()
+            assert_matches_type(object, registration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_path_params_bulk_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.registrations.with_raw_response.bulk_delete(
+                account_id="",
+                id=["string"],
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        registration = await async_client.zero_trust.devices.registrations.get(
+            registration_id="registration_id",
+            account_id="account_id",
+        )
+        assert_matches_type(RegistrationGetResponse, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        registration = await async_client.zero_trust.devices.registrations.get(
+            registration_id="registration_id",
+            account_id="account_id",
+            include="include",
+        )
+        assert_matches_type(RegistrationGetResponse, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.registrations.with_raw_response.get(
+            registration_id="registration_id",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        registration = await response.parse()
+        assert_matches_type(RegistrationGetResponse, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.registrations.with_streaming_response.get(
+            registration_id="registration_id",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            registration = await response.parse()
+            assert_matches_type(RegistrationGetResponse, registration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.registrations.with_raw_response.get(
+                registration_id="registration_id",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `registration_id` but received ''"):
+            await async_client.zero_trust.devices.registrations.with_raw_response.get(
+                registration_id="",
+                account_id="account_id",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_revoke(self, async_client: AsyncCloudflare) -> None:
+        registration = await async_client.zero_trust.devices.registrations.revoke(
+            account_id="account_id",
+            id=["string"],
+        )
+        assert_matches_type(object, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_raw_response_revoke(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.registrations.with_raw_response.revoke(
+            account_id="account_id",
+            id=["string"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        registration = await response.parse()
+        assert_matches_type(object, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_streaming_response_revoke(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.registrations.with_streaming_response.revoke(
+            account_id="account_id",
+            id=["string"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            registration = await response.parse()
+            assert_matches_type(object, registration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_path_params_revoke(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.registrations.with_raw_response.revoke(
+                account_id="",
+                id=["string"],
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_method_unrevoke(self, async_client: AsyncCloudflare) -> None:
+        registration = await async_client.zero_trust.devices.registrations.unrevoke(
+            account_id="account_id",
+            id=["string"],
+        )
+        assert_matches_type(object, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_raw_response_unrevoke(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.registrations.with_raw_response.unrevoke(
+            account_id="account_id",
+            id=["string"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        registration = await response.parse()
+        assert_matches_type(object, registration, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_streaming_response_unrevoke(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.registrations.with_streaming_response.unrevoke(
+            account_id="account_id",
+            id=["string"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            registration = await response.parse()
+            assert_matches_type(object, registration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate prism error for invalid security scheme used")
+    @parametrize
+    async def test_path_params_unrevoke(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.registrations.with_raw_response.unrevoke(
+                account_id="",
+                id=["string"],
+            )
diff --git a/tests/api_resources/zero_trust/devices/test_revoke.py b/tests/api_resources/zero_trust/devices/test_revoke.py
index 27aa2002b99..285d2cebc88 100644
--- a/tests/api_resources/zero_trust/devices/test_revoke.py
+++ b/tests/api_resources/zero_trust/devices/test_revoke.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
@@ -11,6 +11,8 @@
 from tests.utils import assert_matches_type
 from cloudflare.types.zero_trust.devices import RevokeCreateResponse
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -19,120 +21,100 @@ class TestRevoke:
 
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
-        revoke = client.zero_trust.devices.revoke.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            ],
-        )
-        assert_matches_type(RevokeCreateResponse, revoke, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            revoke = client.zero_trust.devices.revoke.create(
+                account_id="699d98642c564d2e855e9661899b7252",
+                body=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+            )
+
+        assert_matches_type(Optional[RevokeCreateResponse], revoke, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.revoke.with_raw_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            ],
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.zero_trust.devices.revoke.with_raw_response.create(
+                account_id="699d98642c564d2e855e9661899b7252",
+                body=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         revoke = response.parse()
-        assert_matches_type(RevokeCreateResponse, revoke, path=["response"])
+        assert_matches_type(Optional[RevokeCreateResponse], revoke, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.revoke.with_streaming_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            ],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            revoke = response.parse()
-            assert_matches_type(RevokeCreateResponse, revoke, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            with client.zero_trust.devices.revoke.with_streaming_response.create(
+                account_id="699d98642c564d2e855e9661899b7252",
+                body=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                revoke = response.parse()
+                assert_matches_type(Optional[RevokeCreateResponse], revoke, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.revoke.with_raw_response.create(
-                account_id="",
-                body=[
-                    "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                ],
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.zero_trust.devices.revoke.with_raw_response.create(
+                    account_id="",
+                    body=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+                )
 
 
 class TestAsyncRevoke:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        revoke = await async_client.zero_trust.devices.revoke.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            ],
-        )
-        assert_matches_type(RevokeCreateResponse, revoke, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            revoke = await async_client.zero_trust.devices.revoke.create(
+                account_id="699d98642c564d2e855e9661899b7252",
+                body=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+            )
+
+        assert_matches_type(Optional[RevokeCreateResponse], revoke, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.revoke.with_raw_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            ],
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.zero_trust.devices.revoke.with_raw_response.create(
+                account_id="699d98642c564d2e855e9661899b7252",
+                body=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         revoke = await response.parse()
-        assert_matches_type(RevokeCreateResponse, revoke, path=["response"])
+        assert_matches_type(Optional[RevokeCreateResponse], revoke, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.revoke.with_streaming_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            ],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            revoke = await response.parse()
-            assert_matches_type(RevokeCreateResponse, revoke, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            async with async_client.zero_trust.devices.revoke.with_streaming_response.create(
+                account_id="699d98642c564d2e855e9661899b7252",
+                body=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                revoke = await response.parse()
+                assert_matches_type(Optional[RevokeCreateResponse], revoke, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.revoke.with_raw_response.create(
-                account_id="",
-                body=[
-                    "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                ],
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.zero_trust.devices.revoke.with_raw_response.create(
+                    account_id="",
+                    body=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+                )
diff --git a/tests/api_resources/zero_trust/devices/test_settings.py b/tests/api_resources/zero_trust/devices/test_settings.py
index 398d23683a3..cb3d738de29 100644
--- a/tests/api_resources/zero_trust/devices/test_settings.py
+++ b/tests/api_resources/zero_trust/devices/test_settings.py
@@ -28,6 +28,11 @@ def test_method_update(self, client: Cloudflare) -> None:
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         setting = client.zero_trust.devices.settings.update(
             account_id="699d98642c564d2e855e9661899b7252",
+            disable_for_time=0,
+            external_emergency_signal_enabled=True,
+            external_emergency_signal_fingerprint="abcd1234567890abcd1234567890abcd1234567890abcd1234567890abcd1234",
+            external_emergency_signal_interval="5m",
+            external_emergency_signal_url="https://192.0.2.1/signal",
             gateway_proxy_enabled=True,
             gateway_udp_proxy_enabled=True,
             root_certificate_installation_enabled=True,
@@ -67,15 +72,15 @@ def test_path_params_update(self, client: Cloudflare) -> None:
             )
 
     @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        setting = client.zero_trust.devices.settings.list(
+    def test_method_delete(self, client: Cloudflare) -> None:
+        setting = client.zero_trust.devices.settings.delete(
             account_id="699d98642c564d2e855e9661899b7252",
         )
         assert_matches_type(Optional[DeviceSettings], setting, path=["response"])
 
     @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.settings.with_raw_response.list(
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.settings.with_raw_response.delete(
             account_id="699d98642c564d2e855e9661899b7252",
         )
 
@@ -85,8 +90,8 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert_matches_type(Optional[DeviceSettings], setting, path=["response"])
 
     @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.settings.with_streaming_response.list(
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.settings.with_streaming_response.delete(
             account_id="699d98642c564d2e855e9661899b7252",
         ) as response:
             assert not response.is_closed
@@ -98,15 +103,109 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
+    def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.settings.with_raw_response.list(
+            client.zero_trust.devices.settings.with_raw_response.delete(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        setting = client.zero_trust.devices.settings.edit(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[DeviceSettings], setting, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        setting = client.zero_trust.devices.settings.edit(
+            account_id="699d98642c564d2e855e9661899b7252",
+            disable_for_time=0,
+            external_emergency_signal_enabled=True,
+            external_emergency_signal_fingerprint="abcd1234567890abcd1234567890abcd1234567890abcd1234567890abcd1234",
+            external_emergency_signal_interval="5m",
+            external_emergency_signal_url="https://192.0.2.1/signal",
+            gateway_proxy_enabled=True,
+            gateway_udp_proxy_enabled=True,
+            root_certificate_installation_enabled=True,
+            use_zt_virtual_ip=True,
+        )
+        assert_matches_type(Optional[DeviceSettings], setting, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.settings.with_raw_response.edit(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = response.parse()
+        assert_matches_type(Optional[DeviceSettings], setting, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.settings.with_streaming_response.edit(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = response.parse()
+            assert_matches_type(Optional[DeviceSettings], setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.settings.with_raw_response.edit(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        setting = client.zero_trust.devices.settings.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[DeviceSettings], setting, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.devices.settings.with_raw_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = response.parse()
+        assert_matches_type(Optional[DeviceSettings], setting, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.devices.settings.with_streaming_response.get(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = response.parse()
+            assert_matches_type(Optional[DeviceSettings], setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.devices.settings.with_raw_response.get(
                 account_id="",
             )
 
 
 class TestAsyncSettings:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
@@ -119,6 +218,11 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         setting = await async_client.zero_trust.devices.settings.update(
             account_id="699d98642c564d2e855e9661899b7252",
+            disable_for_time=0,
+            external_emergency_signal_enabled=True,
+            external_emergency_signal_fingerprint="abcd1234567890abcd1234567890abcd1234567890abcd1234567890abcd1234",
+            external_emergency_signal_interval="5m",
+            external_emergency_signal_url="https://192.0.2.1/signal",
             gateway_proxy_enabled=True,
             gateway_udp_proxy_enabled=True,
             root_certificate_installation_enabled=True,
@@ -158,15 +262,107 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
             )
 
     @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zero_trust.devices.settings.list(
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.zero_trust.devices.settings.delete(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[DeviceSettings], setting, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.settings.with_raw_response.delete(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = await response.parse()
+        assert_matches_type(Optional[DeviceSettings], setting, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.settings.with_streaming_response.delete(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = await response.parse()
+            assert_matches_type(Optional[DeviceSettings], setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.settings.with_raw_response.delete(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.zero_trust.devices.settings.edit(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[DeviceSettings], setting, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.zero_trust.devices.settings.edit(
+            account_id="699d98642c564d2e855e9661899b7252",
+            disable_for_time=0,
+            external_emergency_signal_enabled=True,
+            external_emergency_signal_fingerprint="abcd1234567890abcd1234567890abcd1234567890abcd1234567890abcd1234",
+            external_emergency_signal_interval="5m",
+            external_emergency_signal_url="https://192.0.2.1/signal",
+            gateway_proxy_enabled=True,
+            gateway_udp_proxy_enabled=True,
+            root_certificate_installation_enabled=True,
+            use_zt_virtual_ip=True,
+        )
+        assert_matches_type(Optional[DeviceSettings], setting, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.settings.with_raw_response.edit(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        setting = await response.parse()
+        assert_matches_type(Optional[DeviceSettings], setting, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.settings.with_streaming_response.edit(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            setting = await response.parse()
+            assert_matches_type(Optional[DeviceSettings], setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.devices.settings.with_raw_response.edit(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.zero_trust.devices.settings.get(
             account_id="699d98642c564d2e855e9661899b7252",
         )
         assert_matches_type(Optional[DeviceSettings], setting, path=["response"])
 
     @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.settings.with_raw_response.list(
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.devices.settings.with_raw_response.get(
             account_id="699d98642c564d2e855e9661899b7252",
         )
 
@@ -176,8 +372,8 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert_matches_type(Optional[DeviceSettings], setting, path=["response"])
 
     @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.settings.with_streaming_response.list(
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.devices.settings.with_streaming_response.get(
             account_id="699d98642c564d2e855e9661899b7252",
         ) as response:
             assert not response.is_closed
@@ -189,8 +385,8 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.settings.with_raw_response.list(
+            await async_client.zero_trust.devices.settings.with_raw_response.get(
                 account_id="",
             )
diff --git a/tests/api_resources/zero_trust/devices/test_unrevoke.py b/tests/api_resources/zero_trust/devices/test_unrevoke.py
index f3b7f43a733..c48cd42d16c 100644
--- a/tests/api_resources/zero_trust/devices/test_unrevoke.py
+++ b/tests/api_resources/zero_trust/devices/test_unrevoke.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
@@ -11,6 +11,8 @@
 from tests.utils import assert_matches_type
 from cloudflare.types.zero_trust.devices import UnrevokeCreateResponse
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -19,120 +21,100 @@ class TestUnrevoke:
 
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
-        unrevoke = client.zero_trust.devices.unrevoke.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            ],
-        )
-        assert_matches_type(UnrevokeCreateResponse, unrevoke, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            unrevoke = client.zero_trust.devices.unrevoke.create(
+                account_id="699d98642c564d2e855e9661899b7252",
+                body=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+            )
+
+        assert_matches_type(Optional[UnrevokeCreateResponse], unrevoke, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.unrevoke.with_raw_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            ],
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.zero_trust.devices.unrevoke.with_raw_response.create(
+                account_id="699d98642c564d2e855e9661899b7252",
+                body=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         unrevoke = response.parse()
-        assert_matches_type(UnrevokeCreateResponse, unrevoke, path=["response"])
+        assert_matches_type(Optional[UnrevokeCreateResponse], unrevoke, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.unrevoke.with_streaming_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            ],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            unrevoke = response.parse()
-            assert_matches_type(UnrevokeCreateResponse, unrevoke, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            with client.zero_trust.devices.unrevoke.with_streaming_response.create(
+                account_id="699d98642c564d2e855e9661899b7252",
+                body=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                unrevoke = response.parse()
+                assert_matches_type(Optional[UnrevokeCreateResponse], unrevoke, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.unrevoke.with_raw_response.create(
-                account_id="",
-                body=[
-                    "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                ],
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.zero_trust.devices.unrevoke.with_raw_response.create(
+                    account_id="",
+                    body=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+                )
 
 
 class TestAsyncUnrevoke:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        unrevoke = await async_client.zero_trust.devices.unrevoke.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            ],
-        )
-        assert_matches_type(UnrevokeCreateResponse, unrevoke, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            unrevoke = await async_client.zero_trust.devices.unrevoke.create(
+                account_id="699d98642c564d2e855e9661899b7252",
+                body=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+            )
+
+        assert_matches_type(Optional[UnrevokeCreateResponse], unrevoke, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.unrevoke.with_raw_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            ],
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.zero_trust.devices.unrevoke.with_raw_response.create(
+                account_id="699d98642c564d2e855e9661899b7252",
+                body=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         unrevoke = await response.parse()
-        assert_matches_type(UnrevokeCreateResponse, unrevoke, path=["response"])
+        assert_matches_type(Optional[UnrevokeCreateResponse], unrevoke, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.unrevoke.with_streaming_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            body=[
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            ],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            unrevoke = await response.parse()
-            assert_matches_type(UnrevokeCreateResponse, unrevoke, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            async with async_client.zero_trust.devices.unrevoke.with_streaming_response.create(
+                account_id="699d98642c564d2e855e9661899b7252",
+                body=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                unrevoke = await response.parse()
+                assert_matches_type(Optional[UnrevokeCreateResponse], unrevoke, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.unrevoke.with_raw_response.create(
-                account_id="",
-                body=[
-                    "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                ],
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.zero_trust.devices.unrevoke.with_raw_response.create(
+                    account_id="",
+                    body=["f174e90a-fafe-4643-bbbc-4a0ed4fc8415"],
+                )
diff --git a/tests/api_resources/zero_trust/dex/commands/__init__.py b/tests/api_resources/zero_trust/dex/commands/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/dex/commands/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/dex/commands/test_devices.py b/tests/api_resources/zero_trust/dex/commands/test_devices.py
new file mode 100644
index 00000000000..d364b9938d9
--- /dev/null
+++ b/tests/api_resources/zero_trust/dex/commands/test_devices.py
@@ -0,0 +1,137 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePagination, AsyncV4PagePagination
+from cloudflare.types.zero_trust.dex.commands import DeviceListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestDevices:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        device = client.zero_trust.dex.commands.devices.list(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(SyncV4PagePagination[Optional[DeviceListResponse]], device, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        device = client.zero_trust.dex.commands.devices.list(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            page=1,
+            per_page=1,
+            search="search",
+        )
+        assert_matches_type(SyncV4PagePagination[Optional[DeviceListResponse]], device, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dex.commands.devices.with_raw_response.list(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            page=1,
+            per_page=1,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        device = response.parse()
+        assert_matches_type(SyncV4PagePagination[Optional[DeviceListResponse]], device, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.dex.commands.devices.with_streaming_response.list(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            page=1,
+            per_page=1,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            device = response.parse()
+            assert_matches_type(SyncV4PagePagination[Optional[DeviceListResponse]], device, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dex.commands.devices.with_raw_response.list(
+                account_id="",
+                page=1,
+                per_page=1,
+            )
+
+
+class TestAsyncDevices:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        device = await async_client.zero_trust.dex.commands.devices.list(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            page=1,
+            per_page=1,
+        )
+        assert_matches_type(AsyncV4PagePagination[Optional[DeviceListResponse]], device, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        device = await async_client.zero_trust.dex.commands.devices.list(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            page=1,
+            per_page=1,
+            search="search",
+        )
+        assert_matches_type(AsyncV4PagePagination[Optional[DeviceListResponse]], device, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dex.commands.devices.with_raw_response.list(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            page=1,
+            per_page=1,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        device = await response.parse()
+        assert_matches_type(AsyncV4PagePagination[Optional[DeviceListResponse]], device, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dex.commands.devices.with_streaming_response.list(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            page=1,
+            per_page=1,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            device = await response.parse()
+            assert_matches_type(AsyncV4PagePagination[Optional[DeviceListResponse]], device, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dex.commands.devices.with_raw_response.list(
+                account_id="",
+                page=1,
+                per_page=1,
+            )
diff --git a/tests/api_resources/zero_trust/dex/commands/test_downloads.py b/tests/api_resources/zero_trust/dex/commands/test_downloads.py
new file mode 100644
index 00000000000..d91195e566a
--- /dev/null
+++ b/tests/api_resources/zero_trust/dex/commands/test_downloads.py
@@ -0,0 +1,186 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import httpx
+import pytest
+from respx import MockRouter
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from cloudflare._response import (
+    BinaryAPIResponse,
+    AsyncBinaryAPIResponse,
+    StreamedBinaryAPIResponse,
+    AsyncStreamedBinaryAPIResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestDownloads:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_method_get(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get(
+            "/accounts/01a7362d577a6c3019a474fd6f485823/dex/commands/5758fefe-ae7e-4538-a39b-1fef6abcb909/downloads/filename"
+        ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
+        download = client.zero_trust.dex.commands.downloads.get(
+            filename="filename",
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            command_id="5758fefe-ae7e-4538-a39b-1fef6abcb909",
+        )
+        assert download.is_closed
+        assert download.json() == {"foo": "bar"}
+        assert cast(Any, download.is_closed) is True
+        assert isinstance(download, BinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_raw_response_get(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get(
+            "/accounts/01a7362d577a6c3019a474fd6f485823/dex/commands/5758fefe-ae7e-4538-a39b-1fef6abcb909/downloads/filename"
+        ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
+
+        download = client.zero_trust.dex.commands.downloads.with_raw_response.get(
+            filename="filename",
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            command_id="5758fefe-ae7e-4538-a39b-1fef6abcb909",
+        )
+
+        assert download.is_closed is True
+        assert download.http_request.headers.get("X-Stainless-Lang") == "python"
+        assert download.json() == {"foo": "bar"}
+        assert isinstance(download, BinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_streaming_response_get(self, client: Cloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get(
+            "/accounts/01a7362d577a6c3019a474fd6f485823/dex/commands/5758fefe-ae7e-4538-a39b-1fef6abcb909/downloads/filename"
+        ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
+        with client.zero_trust.dex.commands.downloads.with_streaming_response.get(
+            filename="filename",
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            command_id="5758fefe-ae7e-4538-a39b-1fef6abcb909",
+        ) as download:
+            assert not download.is_closed
+            assert download.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            assert download.json() == {"foo": "bar"}
+            assert cast(Any, download.is_closed) is True
+            assert isinstance(download, StreamedBinaryAPIResponse)
+
+        assert cast(Any, download.is_closed) is True
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dex.commands.downloads.with_raw_response.get(
+                filename="filename",
+                account_id="",
+                command_id="5758fefe-ae7e-4538-a39b-1fef6abcb909",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `command_id` but received ''"):
+            client.zero_trust.dex.commands.downloads.with_raw_response.get(
+                filename="filename",
+                account_id="01a7362d577a6c3019a474fd6f485823",
+                command_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `filename` but received ''"):
+            client.zero_trust.dex.commands.downloads.with_raw_response.get(
+                filename="",
+                account_id="01a7362d577a6c3019a474fd6f485823",
+                command_id="5758fefe-ae7e-4538-a39b-1fef6abcb909",
+            )
+
+
+class TestAsyncDownloads:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_method_get(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get(
+            "/accounts/01a7362d577a6c3019a474fd6f485823/dex/commands/5758fefe-ae7e-4538-a39b-1fef6abcb909/downloads/filename"
+        ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
+        download = await async_client.zero_trust.dex.commands.downloads.get(
+            filename="filename",
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            command_id="5758fefe-ae7e-4538-a39b-1fef6abcb909",
+        )
+        assert download.is_closed
+        assert await download.json() == {"foo": "bar"}
+        assert cast(Any, download.is_closed) is True
+        assert isinstance(download, AsyncBinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_raw_response_get(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get(
+            "/accounts/01a7362d577a6c3019a474fd6f485823/dex/commands/5758fefe-ae7e-4538-a39b-1fef6abcb909/downloads/filename"
+        ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
+
+        download = await async_client.zero_trust.dex.commands.downloads.with_raw_response.get(
+            filename="filename",
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            command_id="5758fefe-ae7e-4538-a39b-1fef6abcb909",
+        )
+
+        assert download.is_closed is True
+        assert download.http_request.headers.get("X-Stainless-Lang") == "python"
+        assert await download.json() == {"foo": "bar"}
+        assert isinstance(download, AsyncBinaryAPIResponse)
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare, respx_mock: MockRouter) -> None:
+        respx_mock.get(
+            "/accounts/01a7362d577a6c3019a474fd6f485823/dex/commands/5758fefe-ae7e-4538-a39b-1fef6abcb909/downloads/filename"
+        ).mock(return_value=httpx.Response(200, json={"foo": "bar"}))
+        async with async_client.zero_trust.dex.commands.downloads.with_streaming_response.get(
+            filename="filename",
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            command_id="5758fefe-ae7e-4538-a39b-1fef6abcb909",
+        ) as download:
+            assert not download.is_closed
+            assert download.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            assert await download.json() == {"foo": "bar"}
+            assert cast(Any, download.is_closed) is True
+            assert isinstance(download, AsyncStreamedBinaryAPIResponse)
+
+        assert cast(Any, download.is_closed) is True
+
+    @parametrize
+    @pytest.mark.respx(base_url=base_url)
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dex.commands.downloads.with_raw_response.get(
+                filename="filename",
+                account_id="",
+                command_id="5758fefe-ae7e-4538-a39b-1fef6abcb909",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `command_id` but received ''"):
+            await async_client.zero_trust.dex.commands.downloads.with_raw_response.get(
+                filename="filename",
+                account_id="01a7362d577a6c3019a474fd6f485823",
+                command_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `filename` but received ''"):
+            await async_client.zero_trust.dex.commands.downloads.with_raw_response.get(
+                filename="",
+                account_id="01a7362d577a6c3019a474fd6f485823",
+                command_id="5758fefe-ae7e-4538-a39b-1fef6abcb909",
+            )
diff --git a/tests/api_resources/zero_trust/dex/commands/test_quota.py b/tests/api_resources/zero_trust/dex/commands/test_quota.py
new file mode 100644
index 00000000000..c3114be6849
--- /dev/null
+++ b/tests/api_resources/zero_trust/dex/commands/test_quota.py
@@ -0,0 +1,100 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zero_trust.dex.commands import QuotaGetResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestQuota:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        quota = client.zero_trust.dex.commands.quota.get(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+        )
+        assert_matches_type(Optional[QuotaGetResponse], quota, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dex.commands.quota.with_raw_response.get(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        quota = response.parse()
+        assert_matches_type(Optional[QuotaGetResponse], quota, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.dex.commands.quota.with_streaming_response.get(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            quota = response.parse()
+            assert_matches_type(Optional[QuotaGetResponse], quota, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dex.commands.quota.with_raw_response.get(
+                account_id="",
+            )
+
+
+class TestAsyncQuota:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        quota = await async_client.zero_trust.dex.commands.quota.get(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+        )
+        assert_matches_type(Optional[QuotaGetResponse], quota, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dex.commands.quota.with_raw_response.get(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        quota = await response.parse()
+        assert_matches_type(Optional[QuotaGetResponse], quota, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dex.commands.quota.with_streaming_response.get(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            quota = await response.parse()
+            assert_matches_type(Optional[QuotaGetResponse], quota, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dex.commands.quota.with_raw_response.get(
+                account_id="",
+            )
diff --git a/tests/api_resources/zero_trust/dex/fleet_status/test_devices.py b/tests/api_resources/zero_trust/dex/fleet_status/test_devices.py
index 53def98e79c..c77565e0f06 100644
--- a/tests/api_resources/zero_trust/dex/fleet_status/test_devices.py
+++ b/tests/api_resources/zero_trust/dex/fleet_status/test_devices.py
@@ -26,7 +26,6 @@ def test_method_list(self, client: Cloudflare) -> None:
             from_="2023-10-11T00:00:00Z",
             page=1,
             per_page=10,
-            source="last_seen",
             to="2023-10-11T00:00:00Z",
         )
         assert_matches_type(SyncV4PagePaginationArray[DeviceListResponse], device, path=["response"])
@@ -39,13 +38,13 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
             from_="2023-10-11T00:00:00Z",
             page=1,
             per_page=10,
-            source="last_seen",
             to="2023-10-11T00:00:00Z",
             colo="SJC",
             device_id="cb49c27f-7f97-49c5-b6f3-f7c01ead0fd7",
             mode="proxy",
             platform="windows",
             sort_by="colo",
+            source="last_seen",
             status="connected",
             version="1.0.0",
         )
@@ -59,7 +58,6 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
             from_="2023-10-11T00:00:00Z",
             page=1,
             per_page=10,
-            source="last_seen",
             to="2023-10-11T00:00:00Z",
         )
 
@@ -76,7 +74,6 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             from_="2023-10-11T00:00:00Z",
             page=1,
             per_page=10,
-            source="last_seen",
             to="2023-10-11T00:00:00Z",
         ) as response:
             assert not response.is_closed
@@ -96,13 +93,14 @@ def test_path_params_list(self, client: Cloudflare) -> None:
                 from_="2023-10-11T00:00:00Z",
                 page=1,
                 per_page=10,
-                source="last_seen",
                 to="2023-10-11T00:00:00Z",
             )
 
 
 class TestAsyncDevices:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -112,7 +110,6 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
             from_="2023-10-11T00:00:00Z",
             page=1,
             per_page=10,
-            source="last_seen",
             to="2023-10-11T00:00:00Z",
         )
         assert_matches_type(AsyncV4PagePaginationArray[DeviceListResponse], device, path=["response"])
@@ -125,13 +122,13 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
             from_="2023-10-11T00:00:00Z",
             page=1,
             per_page=10,
-            source="last_seen",
             to="2023-10-11T00:00:00Z",
             colo="SJC",
             device_id="cb49c27f-7f97-49c5-b6f3-f7c01ead0fd7",
             mode="proxy",
             platform="windows",
             sort_by="colo",
+            source="last_seen",
             status="connected",
             version="1.0.0",
         )
@@ -145,7 +142,6 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
             from_="2023-10-11T00:00:00Z",
             page=1,
             per_page=10,
-            source="last_seen",
             to="2023-10-11T00:00:00Z",
         )
 
@@ -162,7 +158,6 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             from_="2023-10-11T00:00:00Z",
             page=1,
             per_page=10,
-            source="last_seen",
             to="2023-10-11T00:00:00Z",
         ) as response:
             assert not response.is_closed
@@ -182,6 +177,5 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
                 from_="2023-10-11T00:00:00Z",
                 page=1,
                 per_page=10,
-                source="last_seen",
                 to="2023-10-11T00:00:00Z",
             )
diff --git a/tests/api_resources/zero_trust/dex/http_tests/test_percentiles.py b/tests/api_resources/zero_trust/dex/http_tests/test_percentiles.py
index c2f629b06be..6a6125e8a30 100644
--- a/tests/api_resources/zero_trust/dex/http_tests/test_percentiles.py
+++ b/tests/api_resources/zero_trust/dex/http_tests/test_percentiles.py
@@ -35,7 +35,7 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None:
             from_="2023-09-20T17:00:00Z",
             to="2023-09-20T17:00:00Z",
             colo="colo",
-            device_id=["string", "string", "string"],
+            device_id=["string"],
         )
         assert_matches_type(Optional[HTTPDetailsPercentiles], percentile, path=["response"])
 
@@ -89,7 +89,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncPercentiles:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -109,7 +111,7 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -
             from_="2023-09-20T17:00:00Z",
             to="2023-09-20T17:00:00Z",
             colo="colo",
-            device_id=["string", "string", "string"],
+            device_id=["string"],
         )
         assert_matches_type(Optional[HTTPDetailsPercentiles], percentile, path=["response"])
 
diff --git a/tests/api_resources/zero_trust/dex/test_colos.py b/tests/api_resources/zero_trust/dex/test_colos.py
index 8e4d0db4399..73fb5a8e240 100644
--- a/tests/api_resources/zero_trust/dex/test_colos.py
+++ b/tests/api_resources/zero_trust/dex/test_colos.py
@@ -10,6 +10,7 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.dex import ColoListResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -24,7 +25,7 @@ def test_method_list(self, client: Cloudflare) -> None:
             from_="2023-08-20T20:45:00Z",
             to="2023-08-24T20:45:00Z",
         )
-        assert_matches_type(SyncSinglePage[object], colo, path=["response"])
+        assert_matches_type(SyncSinglePage[ColoListResponse], colo, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
@@ -34,7 +35,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
             to="2023-08-24T20:45:00Z",
             sort_by="fleet-status-usage",
         )
-        assert_matches_type(SyncSinglePage[object], colo, path=["response"])
+        assert_matches_type(SyncSinglePage[ColoListResponse], colo, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -47,7 +48,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         colo = response.parse()
-        assert_matches_type(SyncSinglePage[object], colo, path=["response"])
+        assert_matches_type(SyncSinglePage[ColoListResponse], colo, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -60,7 +61,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             colo = response.parse()
-            assert_matches_type(SyncSinglePage[object], colo, path=["response"])
+            assert_matches_type(SyncSinglePage[ColoListResponse], colo, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -75,7 +76,9 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncColos:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
@@ -84,7 +87,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
             from_="2023-08-20T20:45:00Z",
             to="2023-08-24T20:45:00Z",
         )
-        assert_matches_type(AsyncSinglePage[object], colo, path=["response"])
+        assert_matches_type(AsyncSinglePage[ColoListResponse], colo, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -94,7 +97,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
             to="2023-08-24T20:45:00Z",
             sort_by="fleet-status-usage",
         )
-        assert_matches_type(AsyncSinglePage[object], colo, path=["response"])
+        assert_matches_type(AsyncSinglePage[ColoListResponse], colo, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -107,7 +110,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         colo = await response.parse()
-        assert_matches_type(AsyncSinglePage[object], colo, path=["response"])
+        assert_matches_type(AsyncSinglePage[ColoListResponse], colo, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -120,7 +123,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             colo = await response.parse()
-            assert_matches_type(AsyncSinglePage[object], colo, path=["response"])
+            assert_matches_type(AsyncSinglePage[ColoListResponse], colo, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/zero_trust/dex/test_commands.py b/tests/api_resources/zero_trust/dex/test_commands.py
new file mode 100644
index 00000000000..0397c5dd48d
--- /dev/null
+++ b/tests/api_resources/zero_trust/dex/test_commands.py
@@ -0,0 +1,283 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.pagination import SyncV4PagePagination, AsyncV4PagePagination
+from cloudflare.types.zero_trust.dex import (
+    CommandListResponse,
+    CommandCreateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCommands:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        command = client.zero_trust.dex.commands.create(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            commands=[
+                {
+                    "command_type": "pcap",
+                    "device_id": "device_id",
+                    "user_email": "user_email",
+                }
+            ],
+        )
+        assert_matches_type(Optional[CommandCreateResponse], command, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dex.commands.with_raw_response.create(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            commands=[
+                {
+                    "command_type": "pcap",
+                    "device_id": "device_id",
+                    "user_email": "user_email",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        command = response.parse()
+        assert_matches_type(Optional[CommandCreateResponse], command, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.dex.commands.with_streaming_response.create(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            commands=[
+                {
+                    "command_type": "pcap",
+                    "device_id": "device_id",
+                    "user_email": "user_email",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            command = response.parse()
+            assert_matches_type(Optional[CommandCreateResponse], command, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dex.commands.with_raw_response.create(
+                account_id="",
+                commands=[
+                    {
+                        "command_type": "pcap",
+                        "device_id": "device_id",
+                        "user_email": "user_email",
+                    }
+                ],
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        command = client.zero_trust.dex.commands.list(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            page=1,
+            per_page=50,
+        )
+        assert_matches_type(SyncV4PagePagination[Optional[CommandListResponse]], command, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        command = client.zero_trust.dex.commands.list(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            page=1,
+            per_page=50,
+            command_type="command_type",
+            device_id="device_id",
+            from_=parse_datetime("2023-08-20T20:45:00Z"),
+            status="PENDING_EXEC",
+            to=parse_datetime("2023-08-24T20:45:00Z"),
+            user_email="user_email",
+        )
+        assert_matches_type(SyncV4PagePagination[Optional[CommandListResponse]], command, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dex.commands.with_raw_response.list(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            page=1,
+            per_page=50,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        command = response.parse()
+        assert_matches_type(SyncV4PagePagination[Optional[CommandListResponse]], command, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.dex.commands.with_streaming_response.list(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            page=1,
+            per_page=50,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            command = response.parse()
+            assert_matches_type(SyncV4PagePagination[Optional[CommandListResponse]], command, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dex.commands.with_raw_response.list(
+                account_id="",
+                page=1,
+                per_page=50,
+            )
+
+
+class TestAsyncCommands:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        command = await async_client.zero_trust.dex.commands.create(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            commands=[
+                {
+                    "command_type": "pcap",
+                    "device_id": "device_id",
+                    "user_email": "user_email",
+                }
+            ],
+        )
+        assert_matches_type(Optional[CommandCreateResponse], command, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dex.commands.with_raw_response.create(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            commands=[
+                {
+                    "command_type": "pcap",
+                    "device_id": "device_id",
+                    "user_email": "user_email",
+                }
+            ],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        command = await response.parse()
+        assert_matches_type(Optional[CommandCreateResponse], command, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dex.commands.with_streaming_response.create(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            commands=[
+                {
+                    "command_type": "pcap",
+                    "device_id": "device_id",
+                    "user_email": "user_email",
+                }
+            ],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            command = await response.parse()
+            assert_matches_type(Optional[CommandCreateResponse], command, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dex.commands.with_raw_response.create(
+                account_id="",
+                commands=[
+                    {
+                        "command_type": "pcap",
+                        "device_id": "device_id",
+                        "user_email": "user_email",
+                    }
+                ],
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        command = await async_client.zero_trust.dex.commands.list(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            page=1,
+            per_page=50,
+        )
+        assert_matches_type(AsyncV4PagePagination[Optional[CommandListResponse]], command, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        command = await async_client.zero_trust.dex.commands.list(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            page=1,
+            per_page=50,
+            command_type="command_type",
+            device_id="device_id",
+            from_=parse_datetime("2023-08-20T20:45:00Z"),
+            status="PENDING_EXEC",
+            to=parse_datetime("2023-08-24T20:45:00Z"),
+            user_email="user_email",
+        )
+        assert_matches_type(AsyncV4PagePagination[Optional[CommandListResponse]], command, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dex.commands.with_raw_response.list(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            page=1,
+            per_page=50,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        command = await response.parse()
+        assert_matches_type(AsyncV4PagePagination[Optional[CommandListResponse]], command, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dex.commands.with_streaming_response.list(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            page=1,
+            per_page=50,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            command = await response.parse()
+            assert_matches_type(AsyncV4PagePagination[Optional[CommandListResponse]], command, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dex.commands.with_raw_response.list(
+                account_id="",
+                page=1,
+                per_page=50,
+            )
diff --git a/tests/api_resources/zero_trust/dex/test_fleet_status.py b/tests/api_resources/zero_trust/dex/test_fleet_status.py
index db1676eacde..490d37cd105 100644
--- a/tests/api_resources/zero_trust/dex/test_fleet_status.py
+++ b/tests/api_resources/zero_trust/dex/test_fleet_status.py
@@ -11,6 +11,7 @@
 from tests.utils import assert_matches_type
 from cloudflare.types.zero_trust.dex import (
     FleetStatusLiveResponse,
+    FleetStatusOverTimeResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -68,7 +69,7 @@ def test_method_over_time(self, client: Cloudflare) -> None:
             from_="2023-10-11T00:00:00Z",
             to="2023-10-11T00:00:00Z",
         )
-        assert fleet_status is None
+        assert_matches_type(Optional[FleetStatusOverTimeResponse], fleet_status, path=["response"])
 
     @parametrize
     def test_method_over_time_with_all_params(self, client: Cloudflare) -> None:
@@ -79,7 +80,7 @@ def test_method_over_time_with_all_params(self, client: Cloudflare) -> None:
             colo="SJC",
             device_id="cb49c27f-7f97-49c5-b6f3-f7c01ead0fd7",
         )
-        assert fleet_status is None
+        assert_matches_type(Optional[FleetStatusOverTimeResponse], fleet_status, path=["response"])
 
     @parametrize
     def test_raw_response_over_time(self, client: Cloudflare) -> None:
@@ -92,7 +93,7 @@ def test_raw_response_over_time(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         fleet_status = response.parse()
-        assert fleet_status is None
+        assert_matches_type(Optional[FleetStatusOverTimeResponse], fleet_status, path=["response"])
 
     @parametrize
     def test_streaming_response_over_time(self, client: Cloudflare) -> None:
@@ -105,7 +106,7 @@ def test_streaming_response_over_time(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             fleet_status = response.parse()
-            assert fleet_status is None
+            assert_matches_type(Optional[FleetStatusOverTimeResponse], fleet_status, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -120,7 +121,9 @@ def test_path_params_over_time(self, client: Cloudflare) -> None:
 
 
 class TestAsyncFleetStatus:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_live(self, async_client: AsyncCloudflare) -> None:
@@ -171,7 +174,7 @@ async def test_method_over_time(self, async_client: AsyncCloudflare) -> None:
             from_="2023-10-11T00:00:00Z",
             to="2023-10-11T00:00:00Z",
         )
-        assert fleet_status is None
+        assert_matches_type(Optional[FleetStatusOverTimeResponse], fleet_status, path=["response"])
 
     @parametrize
     async def test_method_over_time_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -182,7 +185,7 @@ async def test_method_over_time_with_all_params(self, async_client: AsyncCloudfl
             colo="SJC",
             device_id="cb49c27f-7f97-49c5-b6f3-f7c01ead0fd7",
         )
-        assert fleet_status is None
+        assert_matches_type(Optional[FleetStatusOverTimeResponse], fleet_status, path=["response"])
 
     @parametrize
     async def test_raw_response_over_time(self, async_client: AsyncCloudflare) -> None:
@@ -195,7 +198,7 @@ async def test_raw_response_over_time(self, async_client: AsyncCloudflare) -> No
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         fleet_status = await response.parse()
-        assert fleet_status is None
+        assert_matches_type(Optional[FleetStatusOverTimeResponse], fleet_status, path=["response"])
 
     @parametrize
     async def test_streaming_response_over_time(self, async_client: AsyncCloudflare) -> None:
@@ -208,7 +211,7 @@ async def test_streaming_response_over_time(self, async_client: AsyncCloudflare)
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             fleet_status = await response.parse()
-            assert fleet_status is None
+            assert_matches_type(Optional[FleetStatusOverTimeResponse], fleet_status, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/zero_trust/dex/test_http_tests.py b/tests/api_resources/zero_trust/dex/test_http_tests.py
index 22013108b00..47ab64b6035 100644
--- a/tests/api_resources/zero_trust/dex/test_http_tests.py
+++ b/tests/api_resources/zero_trust/dex/test_http_tests.py
@@ -37,7 +37,7 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None:
             interval="minute",
             to="1689606812000",
             colo="colo",
-            device_id=["string", "string", "string"],
+            device_id=["string"],
         )
         assert_matches_type(Optional[HTTPDetails], http_test, path=["response"])
 
@@ -95,7 +95,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncHTTPTests:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -117,7 +119,7 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -
             interval="minute",
             to="1689606812000",
             colo="colo",
-            device_id=["string", "string", "string"],
+            device_id=["string"],
         )
         assert_matches_type(Optional[HTTPDetails], http_test, path=["response"])
 
diff --git a/tests/api_resources/zero_trust/dex/test_tests.py b/tests/api_resources/zero_trust/dex/test_tests.py
index 70da26054c3..0dc76258364 100644
--- a/tests/api_resources/zero_trust/dex/test_tests.py
+++ b/tests/api_resources/zero_trust/dex/test_tests.py
@@ -3,14 +3,14 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncV4PagePagination, AsyncV4PagePagination
-from cloudflare.types.zero_trust.dex import TestListResponse
+from cloudflare.types.zero_trust.dex.tests import Tests
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -23,19 +23,20 @@ def test_method_list(self, client: Cloudflare) -> None:
         test = client.zero_trust.dex.tests.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
-        assert_matches_type(SyncV4PagePagination[TestListResponse], test, path=["response"])
+        assert_matches_type(SyncV4PagePagination[Optional[Tests]], test, path=["response"])
 
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         test = client.zero_trust.dex.tests.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
             colo="colo",
-            device_id=["string", "string", "string"],
+            device_id=["string"],
+            kind="http",
             page=1,
             per_page=1,
             test_name="testName",
         )
-        assert_matches_type(SyncV4PagePagination[TestListResponse], test, path=["response"])
+        assert_matches_type(SyncV4PagePagination[Optional[Tests]], test, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -46,7 +47,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         test = response.parse()
-        assert_matches_type(SyncV4PagePagination[TestListResponse], test, path=["response"])
+        assert_matches_type(SyncV4PagePagination[Optional[Tests]], test, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -57,7 +58,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             test = response.parse()
-            assert_matches_type(SyncV4PagePagination[TestListResponse], test, path=["response"])
+            assert_matches_type(SyncV4PagePagination[Optional[Tests]], test, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -70,26 +71,29 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTests:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         test = await async_client.zero_trust.dex.tests.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
         )
-        assert_matches_type(AsyncV4PagePagination[TestListResponse], test, path=["response"])
+        assert_matches_type(AsyncV4PagePagination[Optional[Tests]], test, path=["response"])
 
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         test = await async_client.zero_trust.dex.tests.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
             colo="colo",
-            device_id=["string", "string", "string"],
+            device_id=["string"],
+            kind="http",
             page=1,
             per_page=1,
             test_name="testName",
         )
-        assert_matches_type(AsyncV4PagePagination[TestListResponse], test, path=["response"])
+        assert_matches_type(AsyncV4PagePagination[Optional[Tests]], test, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -100,7 +104,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         test = await response.parse()
-        assert_matches_type(AsyncV4PagePagination[TestListResponse], test, path=["response"])
+        assert_matches_type(AsyncV4PagePagination[Optional[Tests]], test, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -111,7 +115,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             test = await response.parse()
-            assert_matches_type(AsyncV4PagePagination[TestListResponse], test, path=["response"])
+            assert_matches_type(AsyncV4PagePagination[Optional[Tests]], test, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/zero_trust/dex/test_traceroute_tests.py b/tests/api_resources/zero_trust/dex/test_traceroute_tests.py
index a324201b35f..65eafd20ede 100644
--- a/tests/api_resources/zero_trust/dex/test_traceroute_tests.py
+++ b/tests/api_resources/zero_trust/dex/test_traceroute_tests.py
@@ -41,7 +41,7 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None:
             interval="minute",
             to="1689606812000",
             colo="colo",
-            device_id=["string", "string", "string"],
+            device_id=["string"],
         )
         assert_matches_type(Optional[Traceroute], traceroute_test, path=["response"])
 
@@ -183,7 +183,7 @@ def test_method_percentiles_with_all_params(self, client: Cloudflare) -> None:
             from_="2023-09-20T17:00:00Z",
             to="2023-09-20T17:00:00Z",
             colo="colo",
-            device_id=["string", "string", "string"],
+            device_id=["string"],
         )
         assert_matches_type(Optional[TracerouteTestPercentilesResponse], traceroute_test, path=["response"])
 
@@ -237,7 +237,9 @@ def test_path_params_percentiles(self, client: Cloudflare) -> None:
 
 
 class TestAsyncTracerouteTests:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -259,7 +261,7 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -
             interval="minute",
             to="1689606812000",
             colo="colo",
-            device_id=["string", "string", "string"],
+            device_id=["string"],
         )
         assert_matches_type(Optional[Traceroute], traceroute_test, path=["response"])
 
@@ -401,7 +403,7 @@ async def test_method_percentiles_with_all_params(self, async_client: AsyncCloud
             from_="2023-09-20T17:00:00Z",
             to="2023-09-20T17:00:00Z",
             colo="colo",
-            device_id=["string", "string", "string"],
+            device_id=["string"],
         )
         assert_matches_type(Optional[TracerouteTestPercentilesResponse], traceroute_test, path=["response"])
 
diff --git a/tests/api_resources/zero_trust/dex/test_warp_change_events.py b/tests/api_resources/zero_trust/dex/test_warp_change_events.py
new file mode 100644
index 00000000000..fa9309617f8
--- /dev/null
+++ b/tests/api_resources/zero_trust/dex/test_warp_change_events.py
@@ -0,0 +1,164 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zero_trust.dex import WARPChangeEventGetResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestWARPChangeEvents:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        warp_change_event = client.zero_trust.dex.warp_change_events.get(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            from_="2023-09-20T17:00:00Z",
+            page=1,
+            per_page=1,
+            to="2023-09-20T17:00:00Z",
+        )
+        assert_matches_type(Optional[WARPChangeEventGetResponse], warp_change_event, path=["response"])
+
+    @parametrize
+    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
+        warp_change_event = client.zero_trust.dex.warp_change_events.get(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            from_="2023-09-20T17:00:00Z",
+            page=1,
+            per_page=1,
+            to="2023-09-20T17:00:00Z",
+            account_name="Myorg",
+            config_name="MASQUE",
+            sort_order="ASC",
+            toggle="on",
+            type="config",
+        )
+        assert_matches_type(Optional[WARPChangeEventGetResponse], warp_change_event, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dex.warp_change_events.with_raw_response.get(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            from_="2023-09-20T17:00:00Z",
+            page=1,
+            per_page=1,
+            to="2023-09-20T17:00:00Z",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        warp_change_event = response.parse()
+        assert_matches_type(Optional[WARPChangeEventGetResponse], warp_change_event, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.dex.warp_change_events.with_streaming_response.get(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            from_="2023-09-20T17:00:00Z",
+            page=1,
+            per_page=1,
+            to="2023-09-20T17:00:00Z",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            warp_change_event = response.parse()
+            assert_matches_type(Optional[WARPChangeEventGetResponse], warp_change_event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dex.warp_change_events.with_raw_response.get(
+                account_id="",
+                from_="2023-09-20T17:00:00Z",
+                page=1,
+                per_page=1,
+                to="2023-09-20T17:00:00Z",
+            )
+
+
+class TestAsyncWARPChangeEvents:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        warp_change_event = await async_client.zero_trust.dex.warp_change_events.get(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            from_="2023-09-20T17:00:00Z",
+            page=1,
+            per_page=1,
+            to="2023-09-20T17:00:00Z",
+        )
+        assert_matches_type(Optional[WARPChangeEventGetResponse], warp_change_event, path=["response"])
+
+    @parametrize
+    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        warp_change_event = await async_client.zero_trust.dex.warp_change_events.get(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            from_="2023-09-20T17:00:00Z",
+            page=1,
+            per_page=1,
+            to="2023-09-20T17:00:00Z",
+            account_name="Myorg",
+            config_name="MASQUE",
+            sort_order="ASC",
+            toggle="on",
+            type="config",
+        )
+        assert_matches_type(Optional[WARPChangeEventGetResponse], warp_change_event, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dex.warp_change_events.with_raw_response.get(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            from_="2023-09-20T17:00:00Z",
+            page=1,
+            per_page=1,
+            to="2023-09-20T17:00:00Z",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        warp_change_event = await response.parse()
+        assert_matches_type(Optional[WARPChangeEventGetResponse], warp_change_event, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dex.warp_change_events.with_streaming_response.get(
+            account_id="01a7362d577a6c3019a474fd6f485823",
+            from_="2023-09-20T17:00:00Z",
+            page=1,
+            per_page=1,
+            to="2023-09-20T17:00:00Z",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            warp_change_event = await response.parse()
+            assert_matches_type(Optional[WARPChangeEventGetResponse], warp_change_event, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dex.warp_change_events.with_raw_response.get(
+                account_id="",
+                from_="2023-09-20T17:00:00Z",
+                page=1,
+                per_page=1,
+                to="2023-09-20T17:00:00Z",
+            )
diff --git a/tests/api_resources/zero_trust/dex/tests/test_unique_devices.py b/tests/api_resources/zero_trust/dex/tests/test_unique_devices.py
index 73c1aa94ebf..6a91c7b68c4 100644
--- a/tests/api_resources/zero_trust/dex/tests/test_unique_devices.py
+++ b/tests/api_resources/zero_trust/dex/tests/test_unique_devices.py
@@ -28,7 +28,7 @@ def test_method_list(self, client: Cloudflare) -> None:
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         unique_device = client.zero_trust.dex.tests.unique_devices.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
-            device_id=["string", "string", "string"],
+            device_id=["string"],
             test_name="testName",
         )
         assert_matches_type(Optional[UniqueDevices], unique_device, path=["response"])
@@ -66,7 +66,9 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncUniqueDevices:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
@@ -79,7 +81,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         unique_device = await async_client.zero_trust.dex.tests.unique_devices.list(
             account_id="01a7362d577a6c3019a474fd6f485823",
-            device_id=["string", "string", "string"],
+            device_id=["string"],
             test_name="testName",
         )
         assert_matches_type(Optional[UniqueDevices], unique_device, path=["response"])
diff --git a/tests/api_resources/zero_trust/dex/traceroute_test_results/test_network_path.py b/tests/api_resources/zero_trust/dex/traceroute_test_results/test_network_path.py
index cde7d16b706..ca7f869da0b 100644
--- a/tests/api_resources/zero_trust/dex/traceroute_test_results/test_network_path.py
+++ b/tests/api_resources/zero_trust/dex/traceroute_test_results/test_network_path.py
@@ -67,7 +67,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncNetworkPath:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/zero_trust/dlp/datasets/test_upload.py b/tests/api_resources/zero_trust/dlp/datasets/test_upload.py
index 4521acb1e12..2fb28f81f23 100644
--- a/tests/api_resources/zero_trust/dlp/datasets/test_upload.py
+++ b/tests/api_resources/zero_trust/dlp/datasets/test_upload.py
@@ -9,8 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.zero_trust.dlp import Dataset
-from cloudflare.types.zero_trust.dlp.datasets import NewVersion
+from cloudflare.types.zero_trust.dlp.datasets import UploadEditResponse, UploadCreateResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -24,7 +23,7 @@ def test_method_create(self, client: Cloudflare) -> None:
             dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
             account_id="account_id",
         )
-        assert_matches_type(Optional[NewVersion], upload, path=["response"])
+        assert_matches_type(Optional[UploadCreateResponse], upload, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
@@ -36,7 +35,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         upload = response.parse()
-        assert_matches_type(Optional[NewVersion], upload, path=["response"])
+        assert_matches_type(Optional[UploadCreateResponse], upload, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
@@ -48,7 +47,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             upload = response.parse()
-            assert_matches_type(Optional[NewVersion], upload, path=["response"])
+            assert_matches_type(Optional[UploadCreateResponse], upload, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -71,41 +70,41 @@ def test_path_params_create(self, client: Cloudflare) -> None:
     def test_method_edit(self, client: Cloudflare) -> None:
         upload = client.zero_trust.dlp.datasets.upload.edit(
             version=0,
+            dataset=b"raw file contents",
             account_id="account_id",
             dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            body="body",
         )
-        assert_matches_type(Optional[Dataset], upload, path=["response"])
+        assert_matches_type(Optional[UploadEditResponse], upload, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
         response = client.zero_trust.dlp.datasets.upload.with_raw_response.edit(
             version=0,
+            dataset=b"raw file contents",
             account_id="account_id",
             dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            body="body",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         upload = response.parse()
-        assert_matches_type(Optional[Dataset], upload, path=["response"])
+        assert_matches_type(Optional[UploadEditResponse], upload, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
         with client.zero_trust.dlp.datasets.upload.with_streaming_response.edit(
             version=0,
+            dataset=b"raw file contents",
             account_id="account_id",
             dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            body="body",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             upload = response.parse()
-            assert_matches_type(Optional[Dataset], upload, path=["response"])
+            assert_matches_type(Optional[UploadEditResponse], upload, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -115,22 +114,24 @@ def test_path_params_edit(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.dlp.datasets.upload.with_raw_response.edit(
                 version=0,
+                dataset=b"raw file contents",
                 account_id="",
                 dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-                body="body",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dataset_id` but received ''"):
             client.zero_trust.dlp.datasets.upload.with_raw_response.edit(
                 version=0,
+                dataset=b"raw file contents",
                 account_id="account_id",
                 dataset_id="",
-                body="body",
             )
 
 
 class TestAsyncUpload:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -138,7 +139,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
             dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
             account_id="account_id",
         )
-        assert_matches_type(Optional[NewVersion], upload, path=["response"])
+        assert_matches_type(Optional[UploadCreateResponse], upload, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
@@ -150,7 +151,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         upload = await response.parse()
-        assert_matches_type(Optional[NewVersion], upload, path=["response"])
+        assert_matches_type(Optional[UploadCreateResponse], upload, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
@@ -162,7 +163,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             upload = await response.parse()
-            assert_matches_type(Optional[NewVersion], upload, path=["response"])
+            assert_matches_type(Optional[UploadCreateResponse], upload, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -185,41 +186,41 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
         upload = await async_client.zero_trust.dlp.datasets.upload.edit(
             version=0,
+            dataset=b"raw file contents",
             account_id="account_id",
             dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            body="body",
         )
-        assert_matches_type(Optional[Dataset], upload, path=["response"])
+        assert_matches_type(Optional[UploadEditResponse], upload, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.dlp.datasets.upload.with_raw_response.edit(
             version=0,
+            dataset=b"raw file contents",
             account_id="account_id",
             dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            body="body",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         upload = await response.parse()
-        assert_matches_type(Optional[Dataset], upload, path=["response"])
+        assert_matches_type(Optional[UploadEditResponse], upload, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.dlp.datasets.upload.with_streaming_response.edit(
             version=0,
+            dataset=b"raw file contents",
             account_id="account_id",
             dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-            body="body",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             upload = await response.parse()
-            assert_matches_type(Optional[Dataset], upload, path=["response"])
+            assert_matches_type(Optional[UploadEditResponse], upload, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -229,15 +230,15 @@ async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.dlp.datasets.upload.with_raw_response.edit(
                 version=0,
+                dataset=b"raw file contents",
                 account_id="",
                 dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
-                body="body",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `dataset_id` but received ''"):
             await async_client.zero_trust.dlp.datasets.upload.with_raw_response.edit(
                 version=0,
+                dataset=b"raw file contents",
                 account_id="account_id",
                 dataset_id="",
-                body="body",
             )
diff --git a/tests/api_resources/zero_trust/dlp/datasets/test_versions.py b/tests/api_resources/zero_trust/dlp/datasets/test_versions.py
new file mode 100755
index 00000000000..6fa1f18a4ea
--- /dev/null
+++ b/tests/api_resources/zero_trust/dlp/datasets/test_versions.py
@@ -0,0 +1,149 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.dlp.datasets import VersionCreateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestVersions:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        version = client.zero_trust.dlp.datasets.versions.create(
+            version=0,
+            account_id="account_id",
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            body=[{"entry_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"}],
+        )
+        assert_matches_type(SyncSinglePage[VersionCreateResponse], version, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.datasets.versions.with_raw_response.create(
+            version=0,
+            account_id="account_id",
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            body=[{"entry_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        version = response.parse()
+        assert_matches_type(SyncSinglePage[VersionCreateResponse], version, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.datasets.versions.with_streaming_response.create(
+            version=0,
+            account_id="account_id",
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            body=[{"entry_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            version = response.parse()
+            assert_matches_type(SyncSinglePage[VersionCreateResponse], version, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.datasets.versions.with_raw_response.create(
+                version=0,
+                account_id="",
+                dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                body=[{"entry_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dataset_id` but received ''"):
+            client.zero_trust.dlp.datasets.versions.with_raw_response.create(
+                version=0,
+                account_id="account_id",
+                dataset_id="",
+                body=[{"entry_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"}],
+            )
+
+
+class TestAsyncVersions:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        version = await async_client.zero_trust.dlp.datasets.versions.create(
+            version=0,
+            account_id="account_id",
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            body=[{"entry_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"}],
+        )
+        assert_matches_type(AsyncSinglePage[VersionCreateResponse], version, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.datasets.versions.with_raw_response.create(
+            version=0,
+            account_id="account_id",
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            body=[{"entry_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"}],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        version = await response.parse()
+        assert_matches_type(AsyncSinglePage[VersionCreateResponse], version, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.datasets.versions.with_streaming_response.create(
+            version=0,
+            account_id="account_id",
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            body=[{"entry_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"}],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            version = await response.parse()
+            assert_matches_type(AsyncSinglePage[VersionCreateResponse], version, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.datasets.versions.with_raw_response.create(
+                version=0,
+                account_id="",
+                dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                body=[{"entry_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"}],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dataset_id` but received ''"):
+            await async_client.zero_trust.dlp.datasets.versions.with_raw_response.create(
+                version=0,
+                account_id="account_id",
+                dataset_id="",
+                body=[{"entry_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"}],
+            )
diff --git a/tests/api_resources/zero_trust/dlp/datasets/versions/__init__.py b/tests/api_resources/zero_trust/dlp/datasets/versions/__init__.py
new file mode 100755
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/dlp/datasets/versions/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/dlp/datasets/versions/test_entries.py b/tests/api_resources/zero_trust/dlp/datasets/versions/test_entries.py
new file mode 100755
index 00000000000..844eea1e03f
--- /dev/null
+++ b/tests/api_resources/zero_trust/dlp/datasets/versions/test_entries.py
@@ -0,0 +1,176 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zero_trust.dlp.datasets.versions import EntryCreateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestEntries:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        entry = client.zero_trust.dlp.datasets.versions.entries.create(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            dataset_version_entry=b"raw file contents",
+            account_id="account_id",
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            version=0,
+        )
+        assert_matches_type(Optional[EntryCreateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.datasets.versions.entries.with_raw_response.create(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            dataset_version_entry=b"raw file contents",
+            account_id="account_id",
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            version=0,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        entry = response.parse()
+        assert_matches_type(Optional[EntryCreateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.datasets.versions.entries.with_streaming_response.create(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            dataset_version_entry=b"raw file contents",
+            account_id="account_id",
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            version=0,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            entry = response.parse()
+            assert_matches_type(Optional[EntryCreateResponse], entry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.datasets.versions.entries.with_raw_response.create(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                dataset_version_entry=b"raw file contents",
+                account_id="",
+                dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                version=0,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dataset_id` but received ''"):
+            client.zero_trust.dlp.datasets.versions.entries.with_raw_response.create(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                dataset_version_entry=b"raw file contents",
+                account_id="account_id",
+                dataset_id="",
+                version=0,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            client.zero_trust.dlp.datasets.versions.entries.with_raw_response.create(
+                entry_id="",
+                dataset_version_entry=b"raw file contents",
+                account_id="account_id",
+                dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                version=0,
+            )
+
+
+class TestAsyncEntries:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        entry = await async_client.zero_trust.dlp.datasets.versions.entries.create(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            dataset_version_entry=b"raw file contents",
+            account_id="account_id",
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            version=0,
+        )
+        assert_matches_type(Optional[EntryCreateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.datasets.versions.entries.with_raw_response.create(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            dataset_version_entry=b"raw file contents",
+            account_id="account_id",
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            version=0,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        entry = await response.parse()
+        assert_matches_type(Optional[EntryCreateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.datasets.versions.entries.with_streaming_response.create(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            dataset_version_entry=b"raw file contents",
+            account_id="account_id",
+            dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            version=0,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            entry = await response.parse()
+            assert_matches_type(Optional[EntryCreateResponse], entry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.datasets.versions.entries.with_raw_response.create(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                dataset_version_entry=b"raw file contents",
+                account_id="",
+                dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                version=0,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `dataset_id` but received ''"):
+            await async_client.zero_trust.dlp.datasets.versions.entries.with_raw_response.create(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                dataset_version_entry=b"raw file contents",
+                account_id="account_id",
+                dataset_id="",
+                version=0,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            await async_client.zero_trust.dlp.datasets.versions.entries.with_raw_response.create(
+                entry_id="",
+                dataset_version_entry=b"raw file contents",
+                account_id="account_id",
+                dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                version=0,
+            )
diff --git a/tests/api_resources/zero_trust/dlp/email/__init__.py b/tests/api_resources/zero_trust/dlp/email/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/dlp/email/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/dlp/email/test_account_mapping.py b/tests/api_resources/zero_trust/dlp/email/test_account_mapping.py
new file mode 100644
index 00000000000..a257b620e2a
--- /dev/null
+++ b/tests/api_resources/zero_trust/dlp/email/test_account_mapping.py
@@ -0,0 +1,227 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zero_trust.dlp.email import (
+    AccountMappingGetResponse,
+    AccountMappingCreateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestAccountMapping:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        account_mapping = client.zero_trust.dlp.email.account_mapping.create(
+            account_id="account_id",
+            auth_requirements={
+                "allowed_microsoft_organizations": ["string"],
+                "type": "Org",
+            },
+        )
+        assert_matches_type(Optional[AccountMappingCreateResponse], account_mapping, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.email.account_mapping.with_raw_response.create(
+            account_id="account_id",
+            auth_requirements={
+                "allowed_microsoft_organizations": ["string"],
+                "type": "Org",
+            },
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        account_mapping = response.parse()
+        assert_matches_type(Optional[AccountMappingCreateResponse], account_mapping, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.email.account_mapping.with_streaming_response.create(
+            account_id="account_id",
+            auth_requirements={
+                "allowed_microsoft_organizations": ["string"],
+                "type": "Org",
+            },
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            account_mapping = response.parse()
+            assert_matches_type(Optional[AccountMappingCreateResponse], account_mapping, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.email.account_mapping.with_raw_response.create(
+                account_id="",
+                auth_requirements={
+                    "allowed_microsoft_organizations": ["string"],
+                    "type": "Org",
+                },
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        account_mapping = client.zero_trust.dlp.email.account_mapping.get(
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[AccountMappingGetResponse], account_mapping, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.email.account_mapping.with_raw_response.get(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        account_mapping = response.parse()
+        assert_matches_type(Optional[AccountMappingGetResponse], account_mapping, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.email.account_mapping.with_streaming_response.get(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            account_mapping = response.parse()
+            assert_matches_type(Optional[AccountMappingGetResponse], account_mapping, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.email.account_mapping.with_raw_response.get(
+                account_id="",
+            )
+
+
+class TestAsyncAccountMapping:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        account_mapping = await async_client.zero_trust.dlp.email.account_mapping.create(
+            account_id="account_id",
+            auth_requirements={
+                "allowed_microsoft_organizations": ["string"],
+                "type": "Org",
+            },
+        )
+        assert_matches_type(Optional[AccountMappingCreateResponse], account_mapping, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.email.account_mapping.with_raw_response.create(
+            account_id="account_id",
+            auth_requirements={
+                "allowed_microsoft_organizations": ["string"],
+                "type": "Org",
+            },
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        account_mapping = await response.parse()
+        assert_matches_type(Optional[AccountMappingCreateResponse], account_mapping, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.email.account_mapping.with_streaming_response.create(
+            account_id="account_id",
+            auth_requirements={
+                "allowed_microsoft_organizations": ["string"],
+                "type": "Org",
+            },
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            account_mapping = await response.parse()
+            assert_matches_type(Optional[AccountMappingCreateResponse], account_mapping, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.email.account_mapping.with_raw_response.create(
+                account_id="",
+                auth_requirements={
+                    "allowed_microsoft_organizations": ["string"],
+                    "type": "Org",
+                },
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        account_mapping = await async_client.zero_trust.dlp.email.account_mapping.get(
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[AccountMappingGetResponse], account_mapping, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.email.account_mapping.with_raw_response.get(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        account_mapping = await response.parse()
+        assert_matches_type(Optional[AccountMappingGetResponse], account_mapping, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.email.account_mapping.with_streaming_response.get(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            account_mapping = await response.parse()
+            assert_matches_type(Optional[AccountMappingGetResponse], account_mapping, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.email.account_mapping.with_raw_response.get(
+                account_id="",
+            )
diff --git a/tests/api_resources/zero_trust/dlp/email/test_rules.py b/tests/api_resources/zero_trust/dlp/email/test_rules.py
new file mode 100644
index 00000000000..199e40dfe70
--- /dev/null
+++ b/tests/api_resources/zero_trust/dlp/email/test_rules.py
@@ -0,0 +1,822 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.dlp.email import (
+    RuleGetResponse,
+    RuleListResponse,
+    RuleCreateResponse,
+    RuleDeleteResponse,
+    RuleUpdateResponse,
+    RuleBulkEditResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestRules:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        rule = client.zero_trust.dlp.email.rules.create(
+            account_id="account_id",
+            action={"action": "Block"},
+            conditions=[
+                {
+                    "operator": "InList",
+                    "selector": "Recipients",
+                    "value": ["string"],
+                }
+            ],
+            enabled=True,
+            name="name",
+        )
+        assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        rule = client.zero_trust.dlp.email.rules.create(
+            account_id="account_id",
+            action={
+                "action": "Block",
+                "message": "message",
+            },
+            conditions=[
+                {
+                    "operator": "InList",
+                    "selector": "Recipients",
+                    "value": ["string"],
+                }
+            ],
+            enabled=True,
+            name="name",
+            description="description",
+        )
+        assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.email.rules.with_raw_response.create(
+            account_id="account_id",
+            action={"action": "Block"},
+            conditions=[
+                {
+                    "operator": "InList",
+                    "selector": "Recipients",
+                    "value": ["string"],
+                }
+            ],
+            enabled=True,
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.email.rules.with_streaming_response.create(
+            account_id="account_id",
+            action={"action": "Block"},
+            conditions=[
+                {
+                    "operator": "InList",
+                    "selector": "Recipients",
+                    "value": ["string"],
+                }
+            ],
+            enabled=True,
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = response.parse()
+            assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.email.rules.with_raw_response.create(
+                account_id="",
+                action={"action": "Block"},
+                conditions=[
+                    {
+                        "operator": "InList",
+                        "selector": "Recipients",
+                        "value": ["string"],
+                    }
+                ],
+                enabled=True,
+                name="name",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        rule = client.zero_trust.dlp.email.rules.update(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            action={"action": "Block"},
+            conditions=[
+                {
+                    "operator": "InList",
+                    "selector": "Recipients",
+                    "value": ["string"],
+                }
+            ],
+            enabled=True,
+            name="name",
+        )
+        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        rule = client.zero_trust.dlp.email.rules.update(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            action={
+                "action": "Block",
+                "message": "message",
+            },
+            conditions=[
+                {
+                    "operator": "InList",
+                    "selector": "Recipients",
+                    "value": ["string"],
+                }
+            ],
+            enabled=True,
+            name="name",
+            description="description",
+        )
+        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.email.rules.with_raw_response.update(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            action={"action": "Block"},
+            conditions=[
+                {
+                    "operator": "InList",
+                    "selector": "Recipients",
+                    "value": ["string"],
+                }
+            ],
+            enabled=True,
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.email.rules.with_streaming_response.update(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            action={"action": "Block"},
+            conditions=[
+                {
+                    "operator": "InList",
+                    "selector": "Recipients",
+                    "value": ["string"],
+                }
+            ],
+            enabled=True,
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = response.parse()
+            assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.email.rules.with_raw_response.update(
+                rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                action={"action": "Block"},
+                conditions=[
+                    {
+                        "operator": "InList",
+                        "selector": "Recipients",
+                        "value": ["string"],
+                    }
+                ],
+                enabled=True,
+                name="name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+            client.zero_trust.dlp.email.rules.with_raw_response.update(
+                rule_id="",
+                account_id="account_id",
+                action={"action": "Block"},
+                conditions=[
+                    {
+                        "operator": "InList",
+                        "selector": "Recipients",
+                        "value": ["string"],
+                    }
+                ],
+                enabled=True,
+                name="name",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        rule = client.zero_trust.dlp.email.rules.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncSinglePage[RuleListResponse], rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.email.rules.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(SyncSinglePage[RuleListResponse], rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.email.rules.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = response.parse()
+            assert_matches_type(SyncSinglePage[RuleListResponse], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.email.rules.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        rule = client.zero_trust.dlp.email.rules.delete(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[RuleDeleteResponse], rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.email.rules.with_raw_response.delete(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(Optional[RuleDeleteResponse], rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.email.rules.with_streaming_response.delete(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = response.parse()
+            assert_matches_type(Optional[RuleDeleteResponse], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.email.rules.with_raw_response.delete(
+                rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+            client.zero_trust.dlp.email.rules.with_raw_response.delete(
+                rule_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_bulk_edit(self, client: Cloudflare) -> None:
+        rule = client.zero_trust.dlp.email.rules.bulk_edit(
+            account_id="account_id",
+            new_priorities={"foo": 0},
+        )
+        assert_matches_type(Optional[RuleBulkEditResponse], rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_bulk_edit(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.email.rules.with_raw_response.bulk_edit(
+            account_id="account_id",
+            new_priorities={"foo": 0},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(Optional[RuleBulkEditResponse], rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_bulk_edit(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.email.rules.with_streaming_response.bulk_edit(
+            account_id="account_id",
+            new_priorities={"foo": 0},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = response.parse()
+            assert_matches_type(Optional[RuleBulkEditResponse], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_bulk_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.email.rules.with_raw_response.bulk_edit(
+                account_id="",
+                new_priorities={"foo": 0},
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        rule = client.zero_trust.dlp.email.rules.get(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[RuleGetResponse], rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.email.rules.with_raw_response.get(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(Optional[RuleGetResponse], rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.email.rules.with_streaming_response.get(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = response.parse()
+            assert_matches_type(Optional[RuleGetResponse], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.email.rules.with_raw_response.get(
+                rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+            client.zero_trust.dlp.email.rules.with_raw_response.get(
+                rule_id="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncRules:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.zero_trust.dlp.email.rules.create(
+            account_id="account_id",
+            action={"action": "Block"},
+            conditions=[
+                {
+                    "operator": "InList",
+                    "selector": "Recipients",
+                    "value": ["string"],
+                }
+            ],
+            enabled=True,
+            name="name",
+        )
+        assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.zero_trust.dlp.email.rules.create(
+            account_id="account_id",
+            action={
+                "action": "Block",
+                "message": "message",
+            },
+            conditions=[
+                {
+                    "operator": "InList",
+                    "selector": "Recipients",
+                    "value": ["string"],
+                }
+            ],
+            enabled=True,
+            name="name",
+            description="description",
+        )
+        assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.email.rules.with_raw_response.create(
+            account_id="account_id",
+            action={"action": "Block"},
+            conditions=[
+                {
+                    "operator": "InList",
+                    "selector": "Recipients",
+                    "value": ["string"],
+                }
+            ],
+            enabled=True,
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.email.rules.with_streaming_response.create(
+            account_id="account_id",
+            action={"action": "Block"},
+            conditions=[
+                {
+                    "operator": "InList",
+                    "selector": "Recipients",
+                    "value": ["string"],
+                }
+            ],
+            enabled=True,
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = await response.parse()
+            assert_matches_type(Optional[RuleCreateResponse], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.email.rules.with_raw_response.create(
+                account_id="",
+                action={"action": "Block"},
+                conditions=[
+                    {
+                        "operator": "InList",
+                        "selector": "Recipients",
+                        "value": ["string"],
+                    }
+                ],
+                enabled=True,
+                name="name",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.zero_trust.dlp.email.rules.update(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            action={"action": "Block"},
+            conditions=[
+                {
+                    "operator": "InList",
+                    "selector": "Recipients",
+                    "value": ["string"],
+                }
+            ],
+            enabled=True,
+            name="name",
+        )
+        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.zero_trust.dlp.email.rules.update(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            action={
+                "action": "Block",
+                "message": "message",
+            },
+            conditions=[
+                {
+                    "operator": "InList",
+                    "selector": "Recipients",
+                    "value": ["string"],
+                }
+            ],
+            enabled=True,
+            name="name",
+            description="description",
+        )
+        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.email.rules.with_raw_response.update(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            action={"action": "Block"},
+            conditions=[
+                {
+                    "operator": "InList",
+                    "selector": "Recipients",
+                    "value": ["string"],
+                }
+            ],
+            enabled=True,
+            name="name",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.email.rules.with_streaming_response.update(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            action={"action": "Block"},
+            conditions=[
+                {
+                    "operator": "InList",
+                    "selector": "Recipients",
+                    "value": ["string"],
+                }
+            ],
+            enabled=True,
+            name="name",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = await response.parse()
+            assert_matches_type(Optional[RuleUpdateResponse], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.email.rules.with_raw_response.update(
+                rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                action={"action": "Block"},
+                conditions=[
+                    {
+                        "operator": "InList",
+                        "selector": "Recipients",
+                        "value": ["string"],
+                    }
+                ],
+                enabled=True,
+                name="name",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+            await async_client.zero_trust.dlp.email.rules.with_raw_response.update(
+                rule_id="",
+                account_id="account_id",
+                action={"action": "Block"},
+                conditions=[
+                    {
+                        "operator": "InList",
+                        "selector": "Recipients",
+                        "value": ["string"],
+                    }
+                ],
+                enabled=True,
+                name="name",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.zero_trust.dlp.email.rules.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncSinglePage[RuleListResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.email.rules.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(AsyncSinglePage[RuleListResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.email.rules.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = await response.parse()
+            assert_matches_type(AsyncSinglePage[RuleListResponse], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.email.rules.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.zero_trust.dlp.email.rules.delete(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[RuleDeleteResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.email.rules.with_raw_response.delete(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(Optional[RuleDeleteResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.email.rules.with_streaming_response.delete(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = await response.parse()
+            assert_matches_type(Optional[RuleDeleteResponse], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.email.rules.with_raw_response.delete(
+                rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+            await async_client.zero_trust.dlp.email.rules.with_raw_response.delete(
+                rule_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.zero_trust.dlp.email.rules.bulk_edit(
+            account_id="account_id",
+            new_priorities={"foo": 0},
+        )
+        assert_matches_type(Optional[RuleBulkEditResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.email.rules.with_raw_response.bulk_edit(
+            account_id="account_id",
+            new_priorities={"foo": 0},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(Optional[RuleBulkEditResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.email.rules.with_streaming_response.bulk_edit(
+            account_id="account_id",
+            new_priorities={"foo": 0},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = await response.parse()
+            assert_matches_type(Optional[RuleBulkEditResponse], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_bulk_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.email.rules.with_raw_response.bulk_edit(
+                account_id="",
+                new_priorities={"foo": 0},
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.zero_trust.dlp.email.rules.get(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[RuleGetResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.email.rules.with_raw_response.get(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(Optional[RuleGetResponse], rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.email.rules.with_streaming_response.get(
+            rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = await response.parse()
+            assert_matches_type(Optional[RuleGetResponse], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.email.rules.with_raw_response.get(
+                rule_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+            await async_client.zero_trust.dlp.email.rules.with_raw_response.get(
+                rule_id="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/zero_trust/dlp/entries/__init__.py b/tests/api_resources/zero_trust/dlp/entries/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/dlp/entries/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/dlp/entries/test_custom.py b/tests/api_resources/zero_trust/dlp/entries/test_custom.py
new file mode 100644
index 00000000000..29cf1357284
--- /dev/null
+++ b/tests/api_resources/zero_trust/dlp/entries/test_custom.py
@@ -0,0 +1,590 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.dlp.entries import (
+    CustomGetResponse,
+    CustomListResponse,
+    CustomCreateResponse,
+    CustomUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCustom:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        custom = client.zero_trust.dlp.entries.custom.create(
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={"regex": "regex"},
+        )
+        assert_matches_type(Optional[CustomCreateResponse], custom, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        custom = client.zero_trust.dlp.entries.custom.create(
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={
+                "regex": "regex",
+                "validation": "luhn",
+            },
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(Optional[CustomCreateResponse], custom, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.custom.with_raw_response.create(
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={"regex": "regex"},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = response.parse()
+        assert_matches_type(Optional[CustomCreateResponse], custom, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.custom.with_streaming_response.create(
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={"regex": "regex"},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = response.parse()
+            assert_matches_type(Optional[CustomCreateResponse], custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.custom.with_raw_response.create(
+                account_id="",
+                enabled=True,
+                name="name",
+                pattern={"regex": "regex"},
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate 422 error in prism test")
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        custom = client.zero_trust.dlp.entries.custom.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={"regex": "regex"},
+        )
+        assert_matches_type(Optional[CustomUpdateResponse], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate 422 error in prism test")
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        custom = client.zero_trust.dlp.entries.custom.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={
+                "regex": "regex",
+                "validation": "luhn",
+            },
+        )
+        assert_matches_type(Optional[CustomUpdateResponse], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate 422 error in prism test")
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.custom.with_raw_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={"regex": "regex"},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = response.parse()
+        assert_matches_type(Optional[CustomUpdateResponse], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate 422 error in prism test")
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.custom.with_streaming_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={"regex": "regex"},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = response.parse()
+            assert_matches_type(Optional[CustomUpdateResponse], custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate 422 error in prism test")
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.custom.with_raw_response.update(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                enabled=True,
+                name="name",
+                pattern={"regex": "regex"},
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            client.zero_trust.dlp.entries.custom.with_raw_response.update(
+                entry_id="",
+                account_id="account_id",
+                enabled=True,
+                name="name",
+                pattern={"regex": "regex"},
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        custom = client.zero_trust.dlp.entries.custom.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncSinglePage[CustomListResponse], custom, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.custom.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = response.parse()
+        assert_matches_type(SyncSinglePage[CustomListResponse], custom, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.custom.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = response.parse()
+            assert_matches_type(SyncSinglePage[CustomListResponse], custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.custom.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        custom = client.zero_trust.dlp.entries.custom.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(object, custom, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.custom.with_raw_response.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = response.parse()
+        assert_matches_type(object, custom, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.custom.with_streaming_response.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = response.parse()
+            assert_matches_type(object, custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.custom.with_raw_response.delete(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            client.zero_trust.dlp.entries.custom.with_raw_response.delete(
+                entry_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        custom = client.zero_trust.dlp.entries.custom.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[CustomGetResponse], custom, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.custom.with_raw_response.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = response.parse()
+        assert_matches_type(Optional[CustomGetResponse], custom, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.custom.with_streaming_response.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = response.parse()
+            assert_matches_type(Optional[CustomGetResponse], custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.custom.with_raw_response.get(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            client.zero_trust.dlp.entries.custom.with_raw_response.get(
+                entry_id="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncCustom:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.zero_trust.dlp.entries.custom.create(
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={"regex": "regex"},
+        )
+        assert_matches_type(Optional[CustomCreateResponse], custom, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.zero_trust.dlp.entries.custom.create(
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={
+                "regex": "regex",
+                "validation": "luhn",
+            },
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(Optional[CustomCreateResponse], custom, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.custom.with_raw_response.create(
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={"regex": "regex"},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = await response.parse()
+        assert_matches_type(Optional[CustomCreateResponse], custom, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.custom.with_streaming_response.create(
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={"regex": "regex"},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = await response.parse()
+            assert_matches_type(Optional[CustomCreateResponse], custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.custom.with_raw_response.create(
+                account_id="",
+                enabled=True,
+                name="name",
+                pattern={"regex": "regex"},
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate 422 error in prism test")
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.zero_trust.dlp.entries.custom.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={"regex": "regex"},
+        )
+        assert_matches_type(Optional[CustomUpdateResponse], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate 422 error in prism test")
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.zero_trust.dlp.entries.custom.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={
+                "regex": "regex",
+                "validation": "luhn",
+            },
+        )
+        assert_matches_type(Optional[CustomUpdateResponse], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate 422 error in prism test")
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.custom.with_raw_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={"regex": "regex"},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = await response.parse()
+        assert_matches_type(Optional[CustomUpdateResponse], custom, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate 422 error in prism test")
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.custom.with_streaming_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={"regex": "regex"},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = await response.parse()
+            assert_matches_type(Optional[CustomUpdateResponse], custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate 422 error in prism test")
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.custom.with_raw_response.update(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                enabled=True,
+                name="name",
+                pattern={"regex": "regex"},
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.custom.with_raw_response.update(
+                entry_id="",
+                account_id="account_id",
+                enabled=True,
+                name="name",
+                pattern={"regex": "regex"},
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.zero_trust.dlp.entries.custom.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncSinglePage[CustomListResponse], custom, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.custom.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = await response.parse()
+        assert_matches_type(AsyncSinglePage[CustomListResponse], custom, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.custom.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = await response.parse()
+            assert_matches_type(AsyncSinglePage[CustomListResponse], custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.custom.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.zero_trust.dlp.entries.custom.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(object, custom, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.custom.with_raw_response.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = await response.parse()
+        assert_matches_type(object, custom, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.custom.with_streaming_response.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = await response.parse()
+            assert_matches_type(object, custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.custom.with_raw_response.delete(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.custom.with_raw_response.delete(
+                entry_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.zero_trust.dlp.entries.custom.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[CustomGetResponse], custom, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.custom.with_raw_response.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom = await response.parse()
+        assert_matches_type(Optional[CustomGetResponse], custom, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.custom.with_streaming_response.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            custom = await response.parse()
+            assert_matches_type(Optional[CustomGetResponse], custom, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.custom.with_raw_response.get(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.custom.with_raw_response.get(
+                entry_id="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/zero_trust/dlp/entries/test_integration.py b/tests/api_resources/zero_trust/dlp/entries/test_integration.py
new file mode 100644
index 00000000000..d4965c1255e
--- /dev/null
+++ b/tests/api_resources/zero_trust/dlp/entries/test_integration.py
@@ -0,0 +1,516 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.dlp.entries import (
+    IntegrationGetResponse,
+    IntegrationListResponse,
+    IntegrationCreateResponse,
+    IntegrationUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestIntegration:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        integration = client.zero_trust.dlp.entries.integration.create(
+            account_id="account_id",
+            enabled=True,
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(Optional[IntegrationCreateResponse], integration, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        integration = client.zero_trust.dlp.entries.integration.create(
+            account_id="account_id",
+            enabled=True,
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(Optional[IntegrationCreateResponse], integration, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.integration.with_raw_response.create(
+            account_id="account_id",
+            enabled=True,
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        integration = response.parse()
+        assert_matches_type(Optional[IntegrationCreateResponse], integration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.integration.with_streaming_response.create(
+            account_id="account_id",
+            enabled=True,
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            integration = response.parse()
+            assert_matches_type(Optional[IntegrationCreateResponse], integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.integration.with_raw_response.create(
+                account_id="",
+                enabled=True,
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        integration = client.zero_trust.dlp.entries.integration.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+        )
+        assert_matches_type(Optional[IntegrationUpdateResponse], integration, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.integration.with_raw_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        integration = response.parse()
+        assert_matches_type(Optional[IntegrationUpdateResponse], integration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.integration.with_streaming_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            integration = response.parse()
+            assert_matches_type(Optional[IntegrationUpdateResponse], integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.integration.with_raw_response.update(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                enabled=True,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            client.zero_trust.dlp.entries.integration.with_raw_response.update(
+                entry_id="",
+                account_id="account_id",
+                enabled=True,
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        integration = client.zero_trust.dlp.entries.integration.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncSinglePage[IntegrationListResponse], integration, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.integration.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        integration = response.parse()
+        assert_matches_type(SyncSinglePage[IntegrationListResponse], integration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.integration.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            integration = response.parse()
+            assert_matches_type(SyncSinglePage[IntegrationListResponse], integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.integration.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        integration = client.zero_trust.dlp.entries.integration.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(object, integration, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.integration.with_raw_response.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        integration = response.parse()
+        assert_matches_type(object, integration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.integration.with_streaming_response.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            integration = response.parse()
+            assert_matches_type(object, integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.integration.with_raw_response.delete(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            client.zero_trust.dlp.entries.integration.with_raw_response.delete(
+                entry_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        integration = client.zero_trust.dlp.entries.integration.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[IntegrationGetResponse], integration, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.integration.with_raw_response.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        integration = response.parse()
+        assert_matches_type(Optional[IntegrationGetResponse], integration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.integration.with_streaming_response.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            integration = response.parse()
+            assert_matches_type(Optional[IntegrationGetResponse], integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.integration.with_raw_response.get(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            client.zero_trust.dlp.entries.integration.with_raw_response.get(
+                entry_id="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncIntegration:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        integration = await async_client.zero_trust.dlp.entries.integration.create(
+            account_id="account_id",
+            enabled=True,
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(Optional[IntegrationCreateResponse], integration, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        integration = await async_client.zero_trust.dlp.entries.integration.create(
+            account_id="account_id",
+            enabled=True,
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(Optional[IntegrationCreateResponse], integration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.integration.with_raw_response.create(
+            account_id="account_id",
+            enabled=True,
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        integration = await response.parse()
+        assert_matches_type(Optional[IntegrationCreateResponse], integration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.integration.with_streaming_response.create(
+            account_id="account_id",
+            enabled=True,
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            integration = await response.parse()
+            assert_matches_type(Optional[IntegrationCreateResponse], integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.integration.with_raw_response.create(
+                account_id="",
+                enabled=True,
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        integration = await async_client.zero_trust.dlp.entries.integration.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+        )
+        assert_matches_type(Optional[IntegrationUpdateResponse], integration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.integration.with_raw_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        integration = await response.parse()
+        assert_matches_type(Optional[IntegrationUpdateResponse], integration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.integration.with_streaming_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            integration = await response.parse()
+            assert_matches_type(Optional[IntegrationUpdateResponse], integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.integration.with_raw_response.update(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                enabled=True,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.integration.with_raw_response.update(
+                entry_id="",
+                account_id="account_id",
+                enabled=True,
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        integration = await async_client.zero_trust.dlp.entries.integration.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncSinglePage[IntegrationListResponse], integration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.integration.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        integration = await response.parse()
+        assert_matches_type(AsyncSinglePage[IntegrationListResponse], integration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.integration.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            integration = await response.parse()
+            assert_matches_type(AsyncSinglePage[IntegrationListResponse], integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.integration.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        integration = await async_client.zero_trust.dlp.entries.integration.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(object, integration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.integration.with_raw_response.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        integration = await response.parse()
+        assert_matches_type(object, integration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.integration.with_streaming_response.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            integration = await response.parse()
+            assert_matches_type(object, integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.integration.with_raw_response.delete(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.integration.with_raw_response.delete(
+                entry_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        integration = await async_client.zero_trust.dlp.entries.integration.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[IntegrationGetResponse], integration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.integration.with_raw_response.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        integration = await response.parse()
+        assert_matches_type(Optional[IntegrationGetResponse], integration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.integration.with_streaming_response.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            integration = await response.parse()
+            assert_matches_type(Optional[IntegrationGetResponse], integration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.integration.with_raw_response.get(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.integration.with_raw_response.get(
+                entry_id="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/zero_trust/dlp/entries/test_predefined.py b/tests/api_resources/zero_trust/dlp/entries/test_predefined.py
new file mode 100644
index 00000000000..f4655805e63
--- /dev/null
+++ b/tests/api_resources/zero_trust/dlp/entries/test_predefined.py
@@ -0,0 +1,516 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.dlp.entries import (
+    PredefinedGetResponse,
+    PredefinedListResponse,
+    PredefinedCreateResponse,
+    PredefinedUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestPredefined:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        predefined = client.zero_trust.dlp.entries.predefined.create(
+            account_id="account_id",
+            enabled=True,
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(Optional[PredefinedCreateResponse], predefined, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        predefined = client.zero_trust.dlp.entries.predefined.create(
+            account_id="account_id",
+            enabled=True,
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(Optional[PredefinedCreateResponse], predefined, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.predefined.with_raw_response.create(
+            account_id="account_id",
+            enabled=True,
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        predefined = response.parse()
+        assert_matches_type(Optional[PredefinedCreateResponse], predefined, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.predefined.with_streaming_response.create(
+            account_id="account_id",
+            enabled=True,
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            predefined = response.parse()
+            assert_matches_type(Optional[PredefinedCreateResponse], predefined, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.predefined.with_raw_response.create(
+                account_id="",
+                enabled=True,
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        predefined = client.zero_trust.dlp.entries.predefined.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+        )
+        assert_matches_type(Optional[PredefinedUpdateResponse], predefined, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.predefined.with_raw_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        predefined = response.parse()
+        assert_matches_type(Optional[PredefinedUpdateResponse], predefined, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.predefined.with_streaming_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            predefined = response.parse()
+            assert_matches_type(Optional[PredefinedUpdateResponse], predefined, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.predefined.with_raw_response.update(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                enabled=True,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            client.zero_trust.dlp.entries.predefined.with_raw_response.update(
+                entry_id="",
+                account_id="account_id",
+                enabled=True,
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        predefined = client.zero_trust.dlp.entries.predefined.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncSinglePage[PredefinedListResponse], predefined, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.predefined.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        predefined = response.parse()
+        assert_matches_type(SyncSinglePage[PredefinedListResponse], predefined, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.predefined.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            predefined = response.parse()
+            assert_matches_type(SyncSinglePage[PredefinedListResponse], predefined, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.predefined.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        predefined = client.zero_trust.dlp.entries.predefined.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(object, predefined, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.predefined.with_raw_response.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        predefined = response.parse()
+        assert_matches_type(object, predefined, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.predefined.with_streaming_response.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            predefined = response.parse()
+            assert_matches_type(object, predefined, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.predefined.with_raw_response.delete(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            client.zero_trust.dlp.entries.predefined.with_raw_response.delete(
+                entry_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        predefined = client.zero_trust.dlp.entries.predefined.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[PredefinedGetResponse], predefined, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.predefined.with_raw_response.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        predefined = response.parse()
+        assert_matches_type(Optional[PredefinedGetResponse], predefined, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.predefined.with_streaming_response.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            predefined = response.parse()
+            assert_matches_type(Optional[PredefinedGetResponse], predefined, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.predefined.with_raw_response.get(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            client.zero_trust.dlp.entries.predefined.with_raw_response.get(
+                entry_id="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncPredefined:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        predefined = await async_client.zero_trust.dlp.entries.predefined.create(
+            account_id="account_id",
+            enabled=True,
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(Optional[PredefinedCreateResponse], predefined, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        predefined = await async_client.zero_trust.dlp.entries.predefined.create(
+            account_id="account_id",
+            enabled=True,
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(Optional[PredefinedCreateResponse], predefined, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.predefined.with_raw_response.create(
+            account_id="account_id",
+            enabled=True,
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        predefined = await response.parse()
+        assert_matches_type(Optional[PredefinedCreateResponse], predefined, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.predefined.with_streaming_response.create(
+            account_id="account_id",
+            enabled=True,
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            predefined = await response.parse()
+            assert_matches_type(Optional[PredefinedCreateResponse], predefined, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.predefined.with_raw_response.create(
+                account_id="",
+                enabled=True,
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        predefined = await async_client.zero_trust.dlp.entries.predefined.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+        )
+        assert_matches_type(Optional[PredefinedUpdateResponse], predefined, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.predefined.with_raw_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        predefined = await response.parse()
+        assert_matches_type(Optional[PredefinedUpdateResponse], predefined, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.predefined.with_streaming_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            enabled=True,
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            predefined = await response.parse()
+            assert_matches_type(Optional[PredefinedUpdateResponse], predefined, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.predefined.with_raw_response.update(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                enabled=True,
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.predefined.with_raw_response.update(
+                entry_id="",
+                account_id="account_id",
+                enabled=True,
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        predefined = await async_client.zero_trust.dlp.entries.predefined.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncSinglePage[PredefinedListResponse], predefined, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.predefined.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        predefined = await response.parse()
+        assert_matches_type(AsyncSinglePage[PredefinedListResponse], predefined, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.predefined.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            predefined = await response.parse()
+            assert_matches_type(AsyncSinglePage[PredefinedListResponse], predefined, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.predefined.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        predefined = await async_client.zero_trust.dlp.entries.predefined.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(object, predefined, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.predefined.with_raw_response.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        predefined = await response.parse()
+        assert_matches_type(object, predefined, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.predefined.with_streaming_response.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            predefined = await response.parse()
+            assert_matches_type(object, predefined, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.predefined.with_raw_response.delete(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.predefined.with_raw_response.delete(
+                entry_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        predefined = await async_client.zero_trust.dlp.entries.predefined.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[PredefinedGetResponse], predefined, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.predefined.with_raw_response.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        predefined = await response.parse()
+        assert_matches_type(Optional[PredefinedGetResponse], predefined, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.predefined.with_streaming_response.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            predefined = await response.parse()
+            assert_matches_type(Optional[PredefinedGetResponse], predefined, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.predefined.with_raw_response.get(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.predefined.with_raw_response.get(
+                entry_id="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/zero_trust/dlp/profiles/test_custom.py b/tests/api_resources/zero_trust/dlp/profiles/test_custom.py
index 9ecae87e3a0..7ec4a09e699 100644
--- a/tests/api_resources/zero_trust/dlp/profiles/test_custom.py
+++ b/tests/api_resources/zero_trust/dlp/profiles/test_custom.py
@@ -10,9 +10,9 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.types.zero_trust.dlp.profiles import (
-    CustomProfile,
+    CustomGetResponse,
     CustomCreateResponse,
-    CustomDeleteResponse,
+    CustomUpdateResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -24,16 +24,49 @@ class TestCustom:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         custom = client.zero_trust.dlp.profiles.custom.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            profiles=[{}, {}, {}],
+            account_id="account_id",
+            name="name",
+        )
+        assert_matches_type(Optional[CustomCreateResponse], custom, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        custom = client.zero_trust.dlp.profiles.custom.create(
+            account_id="account_id",
+            name="name",
+            ai_context_enabled=True,
+            allowed_match_count=5,
+            confidence_threshold="confidence_threshold",
+            context_awareness={
+                "enabled": True,
+                "skip": {"files": True},
+            },
+            description="description",
+            entries=[
+                {
+                    "enabled": True,
+                    "name": "name",
+                    "pattern": {
+                        "regex": "regex",
+                        "validation": "luhn",
+                    },
+                }
+            ],
+            ocr_enabled=True,
+            shared_entries=[
+                {
+                    "enabled": True,
+                    "entry_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                }
+            ],
         )
         assert_matches_type(Optional[CustomCreateResponse], custom, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.zero_trust.dlp.profiles.custom.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            profiles=[{}, {}, {}],
+            account_id="account_id",
+            name="name",
         )
 
         assert response.is_closed is True
@@ -44,8 +77,8 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.zero_trust.dlp.profiles.custom.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            profiles=[{}, {}, {}],
+            account_id="account_id",
+            name="name",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -60,86 +93,78 @@ def test_path_params_create(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.dlp.profiles.custom.with_raw_response.create(
                 account_id="",
-                profiles=[{}, {}, {}],
+                name="name",
             )
 
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         custom = client.zero_trust.dlp.profiles.custom.update(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            name="name",
         )
-        assert_matches_type(CustomProfile, custom, path=["response"])
+        assert_matches_type(Optional[CustomUpdateResponse], custom, path=["response"])
 
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         custom = client.zero_trust.dlp.profiles.custom.update(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            allowed_match_count=5,
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            name="name",
+            ai_context_enabled=True,
+            allowed_match_count=0,
+            confidence_threshold="confidence_threshold",
             context_awareness={
                 "enabled": True,
                 "skip": {"files": True},
             },
-            description="A standard CVV card number",
+            description="description",
             entries=[
                 {
                     "enabled": True,
-                    "name": "Credit card (Visa)",
-                    "pattern": {
-                        "regex": "^4[0-9]{6,14}$",
-                        "validation": "luhn",
-                    },
-                    "profile_id": {},
-                },
-                {
-                    "enabled": True,
-                    "name": "Credit card (Visa)",
+                    "entry_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                    "name": "name",
                     "pattern": {
-                        "regex": "^4[0-9]{6,14}$",
+                        "regex": "regex",
                         "validation": "luhn",
                     },
-                    "profile_id": {},
-                },
+                }
+            ],
+            ocr_enabled=True,
+            shared_entries=[
                 {
                     "enabled": True,
-                    "name": "Credit card (Visa)",
-                    "pattern": {
-                        "regex": "^4[0-9]{6,14}$",
-                        "validation": "luhn",
-                    },
-                    "profile_id": {},
-                },
+                    "entry_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                }
             ],
-            name="Generic CVV Card Number",
-            ocr_enabled=True,
-            shared_entries=[{"enabled": True}, {"enabled": True}, {"enabled": True}],
         )
-        assert_matches_type(CustomProfile, custom, path=["response"])
+        assert_matches_type(Optional[CustomUpdateResponse], custom, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.zero_trust.dlp.profiles.custom.with_raw_response.update(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            name="name",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom = response.parse()
-        assert_matches_type(CustomProfile, custom, path=["response"])
+        assert_matches_type(Optional[CustomUpdateResponse], custom, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.zero_trust.dlp.profiles.custom.with_streaming_response.update(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            name="name",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             custom = response.parse()
-            assert_matches_type(CustomProfile, custom, path=["response"])
+            assert_matches_type(Optional[CustomUpdateResponse], custom, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -147,47 +172,49 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.dlp.profiles.custom.with_raw_response.update(
-                profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
+                profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
                 account_id="",
+                name="name",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `profile_id` but received ''"):
             client.zero_trust.dlp.profiles.custom.with_raw_response.update(
                 profile_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
+                name="name",
             )
 
     @parametrize
     def test_method_delete(self, client: Cloudflare) -> None:
         custom = client.zero_trust.dlp.profiles.custom.delete(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
-        assert_matches_type(CustomDeleteResponse, custom, path=["response"])
+        assert_matches_type(object, custom, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
         response = client.zero_trust.dlp.profiles.custom.with_raw_response.delete(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom = response.parse()
-        assert_matches_type(CustomDeleteResponse, custom, path=["response"])
+        assert_matches_type(object, custom, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
         with client.zero_trust.dlp.profiles.custom.with_streaming_response.delete(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             custom = response.parse()
-            assert_matches_type(CustomDeleteResponse, custom, path=["response"])
+            assert_matches_type(object, custom, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -195,47 +222,47 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
     def test_path_params_delete(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.dlp.profiles.custom.with_raw_response.delete(
-                profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
+                profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `profile_id` but received ''"):
             client.zero_trust.dlp.profiles.custom.with_raw_response.delete(
                 profile_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         custom = client.zero_trust.dlp.profiles.custom.get(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
-        assert_matches_type(CustomProfile, custom, path=["response"])
+        assert_matches_type(Optional[CustomGetResponse], custom, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.zero_trust.dlp.profiles.custom.with_raw_response.get(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom = response.parse()
-        assert_matches_type(CustomProfile, custom, path=["response"])
+        assert_matches_type(Optional[CustomGetResponse], custom, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.zero_trust.dlp.profiles.custom.with_streaming_response.get(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             custom = response.parse()
-            assert_matches_type(CustomProfile, custom, path=["response"])
+            assert_matches_type(Optional[CustomGetResponse], custom, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -243,33 +270,68 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.dlp.profiles.custom.with_raw_response.get(
-                profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
+                profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `profile_id` but received ''"):
             client.zero_trust.dlp.profiles.custom.with_raw_response.get(
                 profile_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
             )
 
 
 class TestAsyncCustom:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         custom = await async_client.zero_trust.dlp.profiles.custom.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            profiles=[{}, {}, {}],
+            account_id="account_id",
+            name="name",
+        )
+        assert_matches_type(Optional[CustomCreateResponse], custom, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        custom = await async_client.zero_trust.dlp.profiles.custom.create(
+            account_id="account_id",
+            name="name",
+            ai_context_enabled=True,
+            allowed_match_count=5,
+            confidence_threshold="confidence_threshold",
+            context_awareness={
+                "enabled": True,
+                "skip": {"files": True},
+            },
+            description="description",
+            entries=[
+                {
+                    "enabled": True,
+                    "name": "name",
+                    "pattern": {
+                        "regex": "regex",
+                        "validation": "luhn",
+                    },
+                }
+            ],
+            ocr_enabled=True,
+            shared_entries=[
+                {
+                    "enabled": True,
+                    "entry_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                }
+            ],
         )
         assert_matches_type(Optional[CustomCreateResponse], custom, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.dlp.profiles.custom.with_raw_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            profiles=[{}, {}, {}],
+            account_id="account_id",
+            name="name",
         )
 
         assert response.is_closed is True
@@ -280,8 +342,8 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.dlp.profiles.custom.with_streaming_response.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            profiles=[{}, {}, {}],
+            account_id="account_id",
+            name="name",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -296,86 +358,78 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.dlp.profiles.custom.with_raw_response.create(
                 account_id="",
-                profiles=[{}, {}, {}],
+                name="name",
             )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         custom = await async_client.zero_trust.dlp.profiles.custom.update(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            name="name",
         )
-        assert_matches_type(CustomProfile, custom, path=["response"])
+        assert_matches_type(Optional[CustomUpdateResponse], custom, path=["response"])
 
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         custom = await async_client.zero_trust.dlp.profiles.custom.update(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            allowed_match_count=5,
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            name="name",
+            ai_context_enabled=True,
+            allowed_match_count=0,
+            confidence_threshold="confidence_threshold",
             context_awareness={
                 "enabled": True,
                 "skip": {"files": True},
             },
-            description="A standard CVV card number",
+            description="description",
             entries=[
                 {
                     "enabled": True,
-                    "name": "Credit card (Visa)",
-                    "pattern": {
-                        "regex": "^4[0-9]{6,14}$",
-                        "validation": "luhn",
-                    },
-                    "profile_id": {},
-                },
-                {
-                    "enabled": True,
-                    "name": "Credit card (Visa)",
+                    "entry_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                    "name": "name",
                     "pattern": {
-                        "regex": "^4[0-9]{6,14}$",
+                        "regex": "regex",
                         "validation": "luhn",
                     },
-                    "profile_id": {},
-                },
+                }
+            ],
+            ocr_enabled=True,
+            shared_entries=[
                 {
                     "enabled": True,
-                    "name": "Credit card (Visa)",
-                    "pattern": {
-                        "regex": "^4[0-9]{6,14}$",
-                        "validation": "luhn",
-                    },
-                    "profile_id": {},
-                },
+                    "entry_id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                }
             ],
-            name="Generic CVV Card Number",
-            ocr_enabled=True,
-            shared_entries=[{"enabled": True}, {"enabled": True}, {"enabled": True}],
         )
-        assert_matches_type(CustomProfile, custom, path=["response"])
+        assert_matches_type(Optional[CustomUpdateResponse], custom, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.dlp.profiles.custom.with_raw_response.update(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            name="name",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom = await response.parse()
-        assert_matches_type(CustomProfile, custom, path=["response"])
+        assert_matches_type(Optional[CustomUpdateResponse], custom, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.dlp.profiles.custom.with_streaming_response.update(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            name="name",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             custom = await response.parse()
-            assert_matches_type(CustomProfile, custom, path=["response"])
+            assert_matches_type(Optional[CustomUpdateResponse], custom, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -383,47 +437,49 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.dlp.profiles.custom.with_raw_response.update(
-                profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
+                profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
                 account_id="",
+                name="name",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `profile_id` but received ''"):
             await async_client.zero_trust.dlp.profiles.custom.with_raw_response.update(
                 profile_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
+                name="name",
             )
 
     @parametrize
     async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         custom = await async_client.zero_trust.dlp.profiles.custom.delete(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
-        assert_matches_type(CustomDeleteResponse, custom, path=["response"])
+        assert_matches_type(object, custom, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.dlp.profiles.custom.with_raw_response.delete(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom = await response.parse()
-        assert_matches_type(CustomDeleteResponse, custom, path=["response"])
+        assert_matches_type(object, custom, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.dlp.profiles.custom.with_streaming_response.delete(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             custom = await response.parse()
-            assert_matches_type(CustomDeleteResponse, custom, path=["response"])
+            assert_matches_type(object, custom, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -431,47 +487,47 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.dlp.profiles.custom.with_raw_response.delete(
-                profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
+                profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `profile_id` but received ''"):
             await async_client.zero_trust.dlp.profiles.custom.with_raw_response.delete(
                 profile_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         custom = await async_client.zero_trust.dlp.profiles.custom.get(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
-        assert_matches_type(CustomProfile, custom, path=["response"])
+        assert_matches_type(Optional[CustomGetResponse], custom, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.dlp.profiles.custom.with_raw_response.get(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom = await response.parse()
-        assert_matches_type(CustomProfile, custom, path=["response"])
+        assert_matches_type(Optional[CustomGetResponse], custom, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.dlp.profiles.custom.with_streaming_response.get(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             custom = await response.parse()
-            assert_matches_type(CustomProfile, custom, path=["response"])
+            assert_matches_type(Optional[CustomGetResponse], custom, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -479,12 +535,12 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.dlp.profiles.custom.with_raw_response.get(
-                profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
+                profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `profile_id` but received ''"):
             await async_client.zero_trust.dlp.profiles.custom.with_raw_response.get(
                 profile_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
             )
diff --git a/tests/api_resources/zero_trust/dlp/profiles/test_predefined.py b/tests/api_resources/zero_trust/dlp/profiles/test_predefined.py
index 922235bf6ec..eedab1cb0a2 100644
--- a/tests/api_resources/zero_trust/dlp/profiles/test_predefined.py
+++ b/tests/api_resources/zero_trust/dlp/profiles/test_predefined.py
@@ -3,13 +3,16 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.zero_trust.dlp.profiles import PredefinedProfile
+from cloudflare.types.zero_trust.dlp.profiles import (
+    PredefinedGetResponse,
+    PredefinedUpdateResponse,
+)
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -20,49 +23,53 @@ class TestPredefined:
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         predefined = client.zero_trust.dlp.profiles.predefined.update(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
-        assert_matches_type(PredefinedProfile, predefined, path=["response"])
+        assert_matches_type(Optional[PredefinedUpdateResponse], predefined, path=["response"])
 
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         predefined = client.zero_trust.dlp.profiles.predefined.update(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            ai_context_enabled=True,
             allowed_match_count=5,
-            context_awareness={
-                "enabled": True,
-                "skip": {"files": True},
-            },
-            entries=[{"enabled": True}, {"enabled": True}, {"enabled": True}],
+            confidence_threshold="confidence_threshold",
+            enabled_entries=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            entries=[
+                {
+                    "id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                    "enabled": True,
+                }
+            ],
             ocr_enabled=True,
         )
-        assert_matches_type(PredefinedProfile, predefined, path=["response"])
+        assert_matches_type(Optional[PredefinedUpdateResponse], predefined, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.zero_trust.dlp.profiles.predefined.with_raw_response.update(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         predefined = response.parse()
-        assert_matches_type(PredefinedProfile, predefined, path=["response"])
+        assert_matches_type(Optional[PredefinedUpdateResponse], predefined, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.zero_trust.dlp.profiles.predefined.with_streaming_response.update(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             predefined = response.parse()
-            assert_matches_type(PredefinedProfile, predefined, path=["response"])
+            assert_matches_type(Optional[PredefinedUpdateResponse], predefined, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -70,47 +77,95 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.dlp.profiles.predefined.with_raw_response.update(
-                profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
+                profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `profile_id` but received ''"):
             client.zero_trust.dlp.profiles.predefined.with_raw_response.update(
                 profile_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        predefined = client.zero_trust.dlp.profiles.predefined.delete(
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(object, predefined, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.profiles.predefined.with_raw_response.delete(
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        predefined = response.parse()
+        assert_matches_type(object, predefined, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.profiles.predefined.with_streaming_response.delete(
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            predefined = response.parse()
+            assert_matches_type(object, predefined, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.profiles.predefined.with_raw_response.delete(
+                profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `profile_id` but received ''"):
+            client.zero_trust.dlp.profiles.predefined.with_raw_response.delete(
+                profile_id="",
+                account_id="account_id",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         predefined = client.zero_trust.dlp.profiles.predefined.get(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
-        assert_matches_type(PredefinedProfile, predefined, path=["response"])
+        assert_matches_type(Optional[PredefinedGetResponse], predefined, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.zero_trust.dlp.profiles.predefined.with_raw_response.get(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         predefined = response.parse()
-        assert_matches_type(PredefinedProfile, predefined, path=["response"])
+        assert_matches_type(Optional[PredefinedGetResponse], predefined, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.zero_trust.dlp.profiles.predefined.with_streaming_response.get(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             predefined = response.parse()
-            assert_matches_type(PredefinedProfile, predefined, path=["response"])
+            assert_matches_type(Optional[PredefinedGetResponse], predefined, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -118,66 +173,72 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.dlp.profiles.predefined.with_raw_response.get(
-                profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
+                profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `profile_id` but received ''"):
             client.zero_trust.dlp.profiles.predefined.with_raw_response.get(
                 profile_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
             )
 
 
 class TestAsyncPredefined:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         predefined = await async_client.zero_trust.dlp.profiles.predefined.update(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
-        assert_matches_type(PredefinedProfile, predefined, path=["response"])
+        assert_matches_type(Optional[PredefinedUpdateResponse], predefined, path=["response"])
 
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         predefined = await async_client.zero_trust.dlp.profiles.predefined.update(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            ai_context_enabled=True,
             allowed_match_count=5,
-            context_awareness={
-                "enabled": True,
-                "skip": {"files": True},
-            },
-            entries=[{"enabled": True}, {"enabled": True}, {"enabled": True}],
+            confidence_threshold="confidence_threshold",
+            enabled_entries=["182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"],
+            entries=[
+                {
+                    "id": "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                    "enabled": True,
+                }
+            ],
             ocr_enabled=True,
         )
-        assert_matches_type(PredefinedProfile, predefined, path=["response"])
+        assert_matches_type(Optional[PredefinedUpdateResponse], predefined, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.dlp.profiles.predefined.with_raw_response.update(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         predefined = await response.parse()
-        assert_matches_type(PredefinedProfile, predefined, path=["response"])
+        assert_matches_type(Optional[PredefinedUpdateResponse], predefined, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.dlp.profiles.predefined.with_streaming_response.update(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             predefined = await response.parse()
-            assert_matches_type(PredefinedProfile, predefined, path=["response"])
+            assert_matches_type(Optional[PredefinedUpdateResponse], predefined, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -185,47 +246,95 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.dlp.profiles.predefined.with_raw_response.update(
-                profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
+                profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `profile_id` but received ''"):
             await async_client.zero_trust.dlp.profiles.predefined.with_raw_response.update(
                 profile_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        predefined = await async_client.zero_trust.dlp.profiles.predefined.delete(
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(object, predefined, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.profiles.predefined.with_raw_response.delete(
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        predefined = await response.parse()
+        assert_matches_type(object, predefined, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.profiles.predefined.with_streaming_response.delete(
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            predefined = await response.parse()
+            assert_matches_type(object, predefined, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.profiles.predefined.with_raw_response.delete(
+                profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `profile_id` but received ''"):
+            await async_client.zero_trust.dlp.profiles.predefined.with_raw_response.delete(
+                profile_id="",
+                account_id="account_id",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         predefined = await async_client.zero_trust.dlp.profiles.predefined.get(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
-        assert_matches_type(PredefinedProfile, predefined, path=["response"])
+        assert_matches_type(Optional[PredefinedGetResponse], predefined, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.dlp.profiles.predefined.with_raw_response.get(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         predefined = await response.parse()
-        assert_matches_type(PredefinedProfile, predefined, path=["response"])
+        assert_matches_type(Optional[PredefinedGetResponse], predefined, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.dlp.profiles.predefined.with_streaming_response.get(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             predefined = await response.parse()
-            assert_matches_type(PredefinedProfile, predefined, path=["response"])
+            assert_matches_type(Optional[PredefinedGetResponse], predefined, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -233,12 +342,12 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.dlp.profiles.predefined.with_raw_response.get(
-                profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
+                profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `profile_id` but received ''"):
             await async_client.zero_trust.dlp.profiles.predefined.with_raw_response.get(
                 profile_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
             )
diff --git a/tests/api_resources/zero_trust/dlp/test_datasets.py b/tests/api_resources/zero_trust/dlp/test_datasets.py
index a2f374f281f..dd38cd45612 100644
--- a/tests/api_resources/zero_trust/dlp/test_datasets.py
+++ b/tests/api_resources/zero_trust/dlp/test_datasets.py
@@ -10,7 +10,12 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.zero_trust.dlp import Dataset, DatasetCreation
+from cloudflare.types.zero_trust.dlp import (
+    Dataset,
+    DatasetGetResponse,
+    DatasetCreateResponse,
+    DatasetUpdateResponse,
+)
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -24,17 +29,19 @@ def test_method_create(self, client: Cloudflare) -> None:
             account_id="account_id",
             name="name",
         )
-        assert_matches_type(Optional[DatasetCreation], dataset, path=["response"])
+        assert_matches_type(Optional[DatasetCreateResponse], dataset, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         dataset = client.zero_trust.dlp.datasets.create(
             account_id="account_id",
             name="name",
+            case_sensitive=True,
             description="description",
+            encoding_version=0,
             secret=True,
         )
-        assert_matches_type(Optional[DatasetCreation], dataset, path=["response"])
+        assert_matches_type(Optional[DatasetCreateResponse], dataset, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
@@ -46,7 +53,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dataset = response.parse()
-        assert_matches_type(Optional[DatasetCreation], dataset, path=["response"])
+        assert_matches_type(Optional[DatasetCreateResponse], dataset, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
@@ -58,7 +65,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dataset = response.parse()
-            assert_matches_type(Optional[DatasetCreation], dataset, path=["response"])
+            assert_matches_type(Optional[DatasetCreateResponse], dataset, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -76,17 +83,18 @@ def test_method_update(self, client: Cloudflare) -> None:
             dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
             account_id="account_id",
         )
-        assert_matches_type(Optional[Dataset], dataset, path=["response"])
+        assert_matches_type(Optional[DatasetUpdateResponse], dataset, path=["response"])
 
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
         dataset = client.zero_trust.dlp.datasets.update(
             dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
             account_id="account_id",
+            case_sensitive=True,
             description="description",
             name="name",
         )
-        assert_matches_type(Optional[Dataset], dataset, path=["response"])
+        assert_matches_type(Optional[DatasetUpdateResponse], dataset, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
@@ -98,7 +106,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dataset = response.parse()
-        assert_matches_type(Optional[Dataset], dataset, path=["response"])
+        assert_matches_type(Optional[DatasetUpdateResponse], dataset, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
@@ -110,7 +118,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dataset = response.parse()
-            assert_matches_type(Optional[Dataset], dataset, path=["response"])
+            assert_matches_type(Optional[DatasetUpdateResponse], dataset, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -220,7 +228,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
             account_id="account_id",
         )
-        assert_matches_type(Optional[Dataset], dataset, path=["response"])
+        assert_matches_type(Optional[DatasetGetResponse], dataset, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -232,7 +240,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dataset = response.parse()
-        assert_matches_type(Optional[Dataset], dataset, path=["response"])
+        assert_matches_type(Optional[DatasetGetResponse], dataset, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -244,7 +252,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dataset = response.parse()
-            assert_matches_type(Optional[Dataset], dataset, path=["response"])
+            assert_matches_type(Optional[DatasetGetResponse], dataset, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -264,7 +272,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncDatasets:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -272,17 +282,19 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
             account_id="account_id",
             name="name",
         )
-        assert_matches_type(Optional[DatasetCreation], dataset, path=["response"])
+        assert_matches_type(Optional[DatasetCreateResponse], dataset, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         dataset = await async_client.zero_trust.dlp.datasets.create(
             account_id="account_id",
             name="name",
+            case_sensitive=True,
             description="description",
+            encoding_version=0,
             secret=True,
         )
-        assert_matches_type(Optional[DatasetCreation], dataset, path=["response"])
+        assert_matches_type(Optional[DatasetCreateResponse], dataset, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
@@ -294,7 +306,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dataset = await response.parse()
-        assert_matches_type(Optional[DatasetCreation], dataset, path=["response"])
+        assert_matches_type(Optional[DatasetCreateResponse], dataset, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
@@ -306,7 +318,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dataset = await response.parse()
-            assert_matches_type(Optional[DatasetCreation], dataset, path=["response"])
+            assert_matches_type(Optional[DatasetCreateResponse], dataset, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -324,17 +336,18 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None:
             dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
             account_id="account_id",
         )
-        assert_matches_type(Optional[Dataset], dataset, path=["response"])
+        assert_matches_type(Optional[DatasetUpdateResponse], dataset, path=["response"])
 
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
         dataset = await async_client.zero_trust.dlp.datasets.update(
             dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
             account_id="account_id",
+            case_sensitive=True,
             description="description",
             name="name",
         )
-        assert_matches_type(Optional[Dataset], dataset, path=["response"])
+        assert_matches_type(Optional[DatasetUpdateResponse], dataset, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
@@ -346,7 +359,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dataset = await response.parse()
-        assert_matches_type(Optional[Dataset], dataset, path=["response"])
+        assert_matches_type(Optional[DatasetUpdateResponse], dataset, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
@@ -358,7 +371,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dataset = await response.parse()
-            assert_matches_type(Optional[Dataset], dataset, path=["response"])
+            assert_matches_type(Optional[DatasetUpdateResponse], dataset, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -468,7 +481,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             dataset_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
             account_id="account_id",
         )
-        assert_matches_type(Optional[Dataset], dataset, path=["response"])
+        assert_matches_type(Optional[DatasetGetResponse], dataset, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -480,7 +493,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         dataset = await response.parse()
-        assert_matches_type(Optional[Dataset], dataset, path=["response"])
+        assert_matches_type(Optional[DatasetGetResponse], dataset, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -492,7 +505,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             dataset = await response.parse()
-            assert_matches_type(Optional[Dataset], dataset, path=["response"])
+            assert_matches_type(Optional[DatasetGetResponse], dataset, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/zero_trust/dlp/test_entries.py b/tests/api_resources/zero_trust/dlp/test_entries.py
new file mode 100644
index 00000000000..0f64b4372c7
--- /dev/null
+++ b/tests/api_resources/zero_trust/dlp/test_entries.py
@@ -0,0 +1,864 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.dlp import (
+    EntryGetResponse,
+    EntryListResponse,
+    EntryCreateResponse,
+    EntryUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestEntries:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        entry = client.zero_trust.dlp.entries.create(
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={"regex": "regex"},
+        )
+        assert_matches_type(Optional[EntryCreateResponse], entry, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        entry = client.zero_trust.dlp.entries.create(
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={
+                "regex": "regex",
+                "validation": "luhn",
+            },
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(Optional[EntryCreateResponse], entry, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.with_raw_response.create(
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={"regex": "regex"},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        entry = response.parse()
+        assert_matches_type(Optional[EntryCreateResponse], entry, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.with_streaming_response.create(
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={"regex": "regex"},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            entry = response.parse()
+            assert_matches_type(Optional[EntryCreateResponse], entry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.with_raw_response.create(
+                account_id="",
+                enabled=True,
+                name="name",
+                pattern={"regex": "regex"},
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_overload_1(self, client: Cloudflare) -> None:
+        entry = client.zero_trust.dlp.entries.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            name="name",
+            pattern={"regex": "regex"},
+            type="custom",
+        )
+        assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        entry = client.zero_trust.dlp.entries.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            name="name",
+            pattern={
+                "regex": "regex",
+                "validation": "luhn",
+            },
+            type="custom",
+            enabled=True,
+        )
+        assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_update_overload_1(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.with_raw_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            name="name",
+            pattern={"regex": "regex"},
+            type="custom",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        entry = response.parse()
+        assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_update_overload_1(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.with_streaming_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            name="name",
+            pattern={"regex": "regex"},
+            type="custom",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            entry = response.parse()
+            assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_update_overload_1(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.with_raw_response.update(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                name="name",
+                pattern={"regex": "regex"},
+                type="custom",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            client.zero_trust.dlp.entries.with_raw_response.update(
+                entry_id="",
+                account_id="account_id",
+                name="name",
+                pattern={"regex": "regex"},
+                type="custom",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_overload_2(self, client: Cloudflare) -> None:
+        entry = client.zero_trust.dlp.entries.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            type="predefined",
+        )
+        assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params_overload_2(self, client: Cloudflare) -> None:
+        entry = client.zero_trust.dlp.entries.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            type="predefined",
+            enabled=True,
+        )
+        assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_update_overload_2(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.with_raw_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            type="predefined",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        entry = response.parse()
+        assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_update_overload_2(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.with_streaming_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            type="predefined",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            entry = response.parse()
+            assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.with_raw_response.update(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                type="predefined",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            client.zero_trust.dlp.entries.with_raw_response.update(
+                entry_id="",
+                account_id="account_id",
+                type="predefined",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_overload_3(self, client: Cloudflare) -> None:
+        entry = client.zero_trust.dlp.entries.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            type="integration",
+        )
+        assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_method_update_with_all_params_overload_3(self, client: Cloudflare) -> None:
+        entry = client.zero_trust.dlp.entries.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            type="integration",
+            enabled=True,
+        )
+        assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_raw_response_update_overload_3(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.with_raw_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            type="integration",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        entry = response.parse()
+        assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_streaming_response_update_overload_3(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.with_streaming_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            type="integration",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            entry = response.parse()
+            assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    def test_path_params_update_overload_3(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.with_raw_response.update(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                type="integration",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            client.zero_trust.dlp.entries.with_raw_response.update(
+                entry_id="",
+                account_id="account_id",
+                type="integration",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        entry = client.zero_trust.dlp.entries.list(
+            account_id="account_id",
+        )
+        assert_matches_type(SyncSinglePage[EntryListResponse], entry, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        entry = response.parse()
+        assert_matches_type(SyncSinglePage[EntryListResponse], entry, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            entry = response.parse()
+            assert_matches_type(SyncSinglePage[EntryListResponse], entry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        entry = client.zero_trust.dlp.entries.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(object, entry, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.with_raw_response.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        entry = response.parse()
+        assert_matches_type(object, entry, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.with_streaming_response.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            entry = response.parse()
+            assert_matches_type(object, entry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.with_raw_response.delete(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            client.zero_trust.dlp.entries.with_raw_response.delete(
+                entry_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        entry = client.zero_trust.dlp.entries.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[EntryGetResponse], entry, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.entries.with_raw_response.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        entry = response.parse()
+        assert_matches_type(Optional[EntryGetResponse], entry, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.entries.with_streaming_response.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            entry = response.parse()
+            assert_matches_type(Optional[EntryGetResponse], entry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.entries.with_raw_response.get(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            client.zero_trust.dlp.entries.with_raw_response.get(
+                entry_id="",
+                account_id="account_id",
+            )
+
+
+class TestAsyncEntries:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        entry = await async_client.zero_trust.dlp.entries.create(
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={"regex": "regex"},
+        )
+        assert_matches_type(Optional[EntryCreateResponse], entry, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        entry = await async_client.zero_trust.dlp.entries.create(
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={
+                "regex": "regex",
+                "validation": "luhn",
+            },
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+        )
+        assert_matches_type(Optional[EntryCreateResponse], entry, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.with_raw_response.create(
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={"regex": "regex"},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        entry = await response.parse()
+        assert_matches_type(Optional[EntryCreateResponse], entry, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.with_streaming_response.create(
+            account_id="account_id",
+            enabled=True,
+            name="name",
+            pattern={"regex": "regex"},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            entry = await response.parse()
+            assert_matches_type(Optional[EntryCreateResponse], entry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.with_raw_response.create(
+                account_id="",
+                enabled=True,
+                name="name",
+                pattern={"regex": "regex"},
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        entry = await async_client.zero_trust.dlp.entries.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            name="name",
+            pattern={"regex": "regex"},
+            type="custom",
+        )
+        assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        entry = await async_client.zero_trust.dlp.entries.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            name="name",
+            pattern={
+                "regex": "regex",
+                "validation": "luhn",
+            },
+            type="custom",
+            enabled=True,
+        )
+        assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.with_raw_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            name="name",
+            pattern={"regex": "regex"},
+            type="custom",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        entry = await response.parse()
+        assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.with_streaming_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            name="name",
+            pattern={"regex": "regex"},
+            type="custom",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            entry = await response.parse()
+            assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update_overload_1(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.with_raw_response.update(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                name="name",
+                pattern={"regex": "regex"},
+                type="custom",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.with_raw_response.update(
+                entry_id="",
+                account_id="account_id",
+                name="name",
+                pattern={"regex": "regex"},
+                type="custom",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        entry = await async_client.zero_trust.dlp.entries.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            type="predefined",
+        )
+        assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        entry = await async_client.zero_trust.dlp.entries.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            type="predefined",
+            enabled=True,
+        )
+        assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.with_raw_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            type="predefined",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        entry = await response.parse()
+        assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.with_streaming_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            type="predefined",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            entry = await response.parse()
+            assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.with_raw_response.update(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                type="predefined",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.with_raw_response.update(
+                entry_id="",
+                account_id="account_id",
+                type="predefined",
+            )
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_overload_3(self, async_client: AsyncCloudflare) -> None:
+        entry = await async_client.zero_trust.dlp.entries.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            type="integration",
+        )
+        assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_method_update_with_all_params_overload_3(self, async_client: AsyncCloudflare) -> None:
+        entry = await async_client.zero_trust.dlp.entries.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            type="integration",
+            enabled=True,
+        )
+        assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_raw_response_update_overload_3(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.with_raw_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            type="integration",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        entry = await response.parse()
+        assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_streaming_response_update_overload_3(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.with_streaming_response.update(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+            type="integration",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            entry = await response.parse()
+            assert_matches_type(Optional[EntryUpdateResponse], entry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: investigate broken test")
+    @parametrize
+    async def test_path_params_update_overload_3(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.with_raw_response.update(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+                type="integration",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.with_raw_response.update(
+                entry_id="",
+                account_id="account_id",
+                type="integration",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        entry = await async_client.zero_trust.dlp.entries.list(
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncSinglePage[EntryListResponse], entry, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        entry = await response.parse()
+        assert_matches_type(AsyncSinglePage[EntryListResponse], entry, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            entry = await response.parse()
+            assert_matches_type(AsyncSinglePage[EntryListResponse], entry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        entry = await async_client.zero_trust.dlp.entries.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(object, entry, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.with_raw_response.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        entry = await response.parse()
+        assert_matches_type(object, entry, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.with_streaming_response.delete(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            entry = await response.parse()
+            assert_matches_type(object, entry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.with_raw_response.delete(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.with_raw_response.delete(
+                entry_id="",
+                account_id="account_id",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        entry = await async_client.zero_trust.dlp.entries.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[EntryGetResponse], entry, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.entries.with_raw_response.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        entry = await response.parse()
+        assert_matches_type(Optional[EntryGetResponse], entry, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.entries.with_streaming_response.get(
+            entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            entry = await response.parse()
+            assert_matches_type(Optional[EntryGetResponse], entry, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.with_raw_response.get(
+                entry_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `entry_id` but received ''"):
+            await async_client.zero_trust.dlp.entries.with_raw_response.get(
+                entry_id="",
+                account_id="account_id",
+            )
diff --git a/tests/api_resources/zero_trust/dlp/test_limits.py b/tests/api_resources/zero_trust/dlp/test_limits.py
new file mode 100755
index 00000000000..1b728920c2c
--- /dev/null
+++ b/tests/api_resources/zero_trust/dlp/test_limits.py
@@ -0,0 +1,100 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zero_trust.dlp import LimitListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestLimits:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        limit = client.zero_trust.dlp.limits.list(
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[LimitListResponse], limit, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.dlp.limits.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        limit = response.parse()
+        assert_matches_type(Optional[LimitListResponse], limit, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.dlp.limits.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            limit = response.parse()
+            assert_matches_type(Optional[LimitListResponse], limit, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.dlp.limits.with_raw_response.list(
+                account_id="",
+            )
+
+
+class TestAsyncLimits:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        limit = await async_client.zero_trust.dlp.limits.list(
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[LimitListResponse], limit, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.dlp.limits.with_raw_response.list(
+            account_id="account_id",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        limit = await response.parse()
+        assert_matches_type(Optional[LimitListResponse], limit, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.dlp.limits.with_streaming_response.list(
+            account_id="account_id",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            limit = await response.parse()
+            assert_matches_type(Optional[LimitListResponse], limit, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.dlp.limits.with_raw_response.list(
+                account_id="",
+            )
diff --git a/tests/api_resources/zero_trust/dlp/test_patterns.py b/tests/api_resources/zero_trust/dlp/test_patterns.py
index 1455ec80499..92f8176ec56 100644
--- a/tests/api_resources/zero_trust/dlp/test_patterns.py
+++ b/tests/api_resources/zero_trust/dlp/test_patterns.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.logpush import OwnershipValidation
+from cloudflare.types.zero_trust.dlp import PatternValidateResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -20,34 +20,43 @@ class TestPatterns:
     @parametrize
     def test_method_validate(self, client: Cloudflare) -> None:
         pattern = client.zero_trust.dlp.patterns.validate(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            regex="^4[0-9]{6,}$",
+            account_id="account_id",
+            regex="regex",
         )
-        assert_matches_type(Optional[OwnershipValidation], pattern, path=["response"])
+        assert_matches_type(Optional[PatternValidateResponse], pattern, path=["response"])
+
+    @parametrize
+    def test_method_validate_with_all_params(self, client: Cloudflare) -> None:
+        pattern = client.zero_trust.dlp.patterns.validate(
+            account_id="account_id",
+            regex="regex",
+            max_match_bytes=0,
+        )
+        assert_matches_type(Optional[PatternValidateResponse], pattern, path=["response"])
 
     @parametrize
     def test_raw_response_validate(self, client: Cloudflare) -> None:
         response = client.zero_trust.dlp.patterns.with_raw_response.validate(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            regex="^4[0-9]{6,}$",
+            account_id="account_id",
+            regex="regex",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         pattern = response.parse()
-        assert_matches_type(Optional[OwnershipValidation], pattern, path=["response"])
+        assert_matches_type(Optional[PatternValidateResponse], pattern, path=["response"])
 
     @parametrize
     def test_streaming_response_validate(self, client: Cloudflare) -> None:
         with client.zero_trust.dlp.patterns.with_streaming_response.validate(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            regex="^4[0-9]{6,}$",
+            account_id="account_id",
+            regex="regex",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             pattern = response.parse()
-            assert_matches_type(Optional[OwnershipValidation], pattern, path=["response"])
+            assert_matches_type(Optional[PatternValidateResponse], pattern, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -56,44 +65,55 @@ def test_path_params_validate(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.dlp.patterns.with_raw_response.validate(
                 account_id="",
-                regex="^4[0-9]{6,}$",
+                regex="regex",
             )
 
 
 class TestAsyncPatterns:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_validate(self, async_client: AsyncCloudflare) -> None:
         pattern = await async_client.zero_trust.dlp.patterns.validate(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            regex="^4[0-9]{6,}$",
+            account_id="account_id",
+            regex="regex",
+        )
+        assert_matches_type(Optional[PatternValidateResponse], pattern, path=["response"])
+
+    @parametrize
+    async def test_method_validate_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        pattern = await async_client.zero_trust.dlp.patterns.validate(
+            account_id="account_id",
+            regex="regex",
+            max_match_bytes=0,
         )
-        assert_matches_type(Optional[OwnershipValidation], pattern, path=["response"])
+        assert_matches_type(Optional[PatternValidateResponse], pattern, path=["response"])
 
     @parametrize
     async def test_raw_response_validate(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.dlp.patterns.with_raw_response.validate(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            regex="^4[0-9]{6,}$",
+            account_id="account_id",
+            regex="regex",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         pattern = await response.parse()
-        assert_matches_type(Optional[OwnershipValidation], pattern, path=["response"])
+        assert_matches_type(Optional[PatternValidateResponse], pattern, path=["response"])
 
     @parametrize
     async def test_streaming_response_validate(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.dlp.patterns.with_streaming_response.validate(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            regex="^4[0-9]{6,}$",
+            account_id="account_id",
+            regex="regex",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             pattern = await response.parse()
-            assert_matches_type(Optional[OwnershipValidation], pattern, path=["response"])
+            assert_matches_type(Optional[PatternValidateResponse], pattern, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -102,5 +122,5 @@ async def test_path_params_validate(self, async_client: AsyncCloudflare) -> None
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.dlp.patterns.with_raw_response.validate(
                 account_id="",
-                regex="^4[0-9]{6,}$",
+                regex="regex",
             )
diff --git a/tests/api_resources/zero_trust/dlp/test_payload_logs.py b/tests/api_resources/zero_trust/dlp/test_payload_logs.py
index cdc88d7f84d..b868687bae1 100644
--- a/tests/api_resources/zero_trust/dlp/test_payload_logs.py
+++ b/tests/api_resources/zero_trust/dlp/test_payload_logs.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
@@ -20,34 +20,39 @@ class TestPayloadLogs:
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         payload_log = client.zero_trust.dlp.payload_logs.update(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            public_key="EmpOvSXw8BfbrGCi0fhGiD/3yXk2SiV1Nzg2lru3oj0=",
+            account_id="account_id",
         )
-        assert_matches_type(PayloadLogUpdateResponse, payload_log, path=["response"])
+        assert_matches_type(Optional[PayloadLogUpdateResponse], payload_log, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        payload_log = client.zero_trust.dlp.payload_logs.update(
+            account_id="account_id",
+            public_key="public_key",
+        )
+        assert_matches_type(Optional[PayloadLogUpdateResponse], payload_log, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.zero_trust.dlp.payload_logs.with_raw_response.update(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            public_key="EmpOvSXw8BfbrGCi0fhGiD/3yXk2SiV1Nzg2lru3oj0=",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         payload_log = response.parse()
-        assert_matches_type(PayloadLogUpdateResponse, payload_log, path=["response"])
+        assert_matches_type(Optional[PayloadLogUpdateResponse], payload_log, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.zero_trust.dlp.payload_logs.with_streaming_response.update(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            public_key="EmpOvSXw8BfbrGCi0fhGiD/3yXk2SiV1Nzg2lru3oj0=",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             payload_log = response.parse()
-            assert_matches_type(PayloadLogUpdateResponse, payload_log, path=["response"])
+            assert_matches_type(Optional[PayloadLogUpdateResponse], payload_log, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -56,37 +61,36 @@ def test_path_params_update(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.dlp.payload_logs.with_raw_response.update(
                 account_id="",
-                public_key="EmpOvSXw8BfbrGCi0fhGiD/3yXk2SiV1Nzg2lru3oj0=",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         payload_log = client.zero_trust.dlp.payload_logs.get(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         )
-        assert_matches_type(PayloadLogGetResponse, payload_log, path=["response"])
+        assert_matches_type(Optional[PayloadLogGetResponse], payload_log, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.zero_trust.dlp.payload_logs.with_raw_response.get(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         payload_log = response.parse()
-        assert_matches_type(PayloadLogGetResponse, payload_log, path=["response"])
+        assert_matches_type(Optional[PayloadLogGetResponse], payload_log, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.zero_trust.dlp.payload_logs.with_streaming_response.get(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             payload_log = response.parse()
-            assert_matches_type(PayloadLogGetResponse, payload_log, path=["response"])
+            assert_matches_type(Optional[PayloadLogGetResponse], payload_log, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -99,39 +103,46 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncPayloadLogs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         payload_log = await async_client.zero_trust.dlp.payload_logs.update(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            public_key="EmpOvSXw8BfbrGCi0fhGiD/3yXk2SiV1Nzg2lru3oj0=",
+            account_id="account_id",
+        )
+        assert_matches_type(Optional[PayloadLogUpdateResponse], payload_log, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        payload_log = await async_client.zero_trust.dlp.payload_logs.update(
+            account_id="account_id",
+            public_key="public_key",
         )
-        assert_matches_type(PayloadLogUpdateResponse, payload_log, path=["response"])
+        assert_matches_type(Optional[PayloadLogUpdateResponse], payload_log, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.dlp.payload_logs.with_raw_response.update(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            public_key="EmpOvSXw8BfbrGCi0fhGiD/3yXk2SiV1Nzg2lru3oj0=",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         payload_log = await response.parse()
-        assert_matches_type(PayloadLogUpdateResponse, payload_log, path=["response"])
+        assert_matches_type(Optional[PayloadLogUpdateResponse], payload_log, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.dlp.payload_logs.with_streaming_response.update(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
-            public_key="EmpOvSXw8BfbrGCi0fhGiD/3yXk2SiV1Nzg2lru3oj0=",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             payload_log = await response.parse()
-            assert_matches_type(PayloadLogUpdateResponse, payload_log, path=["response"])
+            assert_matches_type(Optional[PayloadLogUpdateResponse], payload_log, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -140,37 +151,36 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.dlp.payload_logs.with_raw_response.update(
                 account_id="",
-                public_key="EmpOvSXw8BfbrGCi0fhGiD/3yXk2SiV1Nzg2lru3oj0=",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         payload_log = await async_client.zero_trust.dlp.payload_logs.get(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         )
-        assert_matches_type(PayloadLogGetResponse, payload_log, path=["response"])
+        assert_matches_type(Optional[PayloadLogGetResponse], payload_log, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.dlp.payload_logs.with_raw_response.get(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         payload_log = await response.parse()
-        assert_matches_type(PayloadLogGetResponse, payload_log, path=["response"])
+        assert_matches_type(Optional[PayloadLogGetResponse], payload_log, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.dlp.payload_logs.with_streaming_response.get(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             payload_log = await response.parse()
-            assert_matches_type(PayloadLogGetResponse, payload_log, path=["response"])
+            assert_matches_type(Optional[PayloadLogGetResponse], payload_log, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/zero_trust/dlp/test_profiles.py b/tests/api_resources/zero_trust/dlp/test_profiles.py
index 6747a23a14c..b18ba097e90 100644
--- a/tests/api_resources/zero_trust/dlp/test_profiles.py
+++ b/tests/api_resources/zero_trust/dlp/test_profiles.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
@@ -21,14 +21,22 @@ class TestProfiles:
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         profile = client.zero_trust.dlp.profiles.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+        assert_matches_type(SyncSinglePage[Profile], profile, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        profile = client.zero_trust.dlp.profiles.list(
+            account_id="account_id",
+            all=True,
         )
         assert_matches_type(SyncSinglePage[Profile], profile, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
         response = client.zero_trust.dlp.profiles.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
@@ -39,7 +47,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
         with client.zero_trust.dlp.profiles.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -59,34 +67,34 @@ def test_path_params_list(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         profile = client.zero_trust.dlp.profiles.get(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
-        assert_matches_type(ProfileGetResponse, profile, path=["response"])
+        assert_matches_type(Optional[ProfileGetResponse], profile, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.zero_trust.dlp.profiles.with_raw_response.get(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         profile = response.parse()
-        assert_matches_type(ProfileGetResponse, profile, path=["response"])
+        assert_matches_type(Optional[ProfileGetResponse], profile, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.zero_trust.dlp.profiles.with_streaming_response.get(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             profile = response.parse()
-            assert_matches_type(ProfileGetResponse, profile, path=["response"])
+            assert_matches_type(Optional[ProfileGetResponse], profile, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -94,31 +102,41 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.dlp.profiles.with_raw_response.get(
-                profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
+                profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `profile_id` but received ''"):
             client.zero_trust.dlp.profiles.with_raw_response.get(
                 profile_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
             )
 
 
 class TestAsyncProfiles:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         profile = await async_client.zero_trust.dlp.profiles.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+        )
+        assert_matches_type(AsyncSinglePage[Profile], profile, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        profile = await async_client.zero_trust.dlp.profiles.list(
+            account_id="account_id",
+            all=True,
         )
         assert_matches_type(AsyncSinglePage[Profile], profile, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.dlp.profiles.with_raw_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
@@ -129,7 +147,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.dlp.profiles.with_streaming_response.list(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -149,34 +167,34 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         profile = await async_client.zero_trust.dlp.profiles.get(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
-        assert_matches_type(ProfileGetResponse, profile, path=["response"])
+        assert_matches_type(Optional[ProfileGetResponse], profile, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.dlp.profiles.with_raw_response.get(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         profile = await response.parse()
-        assert_matches_type(ProfileGetResponse, profile, path=["response"])
+        assert_matches_type(Optional[ProfileGetResponse], profile, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.dlp.profiles.with_streaming_response.get(
-            profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             profile = await response.parse()
-            assert_matches_type(ProfileGetResponse, profile, path=["response"])
+            assert_matches_type(Optional[ProfileGetResponse], profile, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -184,12 +202,12 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.dlp.profiles.with_raw_response.get(
-                profile_id="384e129d-25bd-403c-8019-bc19eb7a8a5f",
+                profile_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
                 account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `profile_id` but received ''"):
             await async_client.zero_trust.dlp.profiles.with_raw_response.get(
                 profile_id="",
-                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
             )
diff --git a/tests/api_resources/zero_trust/gateway/configurations/__init__.py b/tests/api_resources/zero_trust/gateway/configurations/__init__.py
new file mode 100755
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/gateway/configurations/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/gateway/configurations/test_custom_certificate.py b/tests/api_resources/zero_trust/gateway/configurations/test_custom_certificate.py
new file mode 100644
index 00000000000..37b130fd4c0
--- /dev/null
+++ b/tests/api_resources/zero_trust/gateway/configurations/test_custom_certificate.py
@@ -0,0 +1,112 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zero_trust.gateway import CustomCertificateSettings
+
+# pyright: reportDeprecated=false
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCustomCertificate:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            custom_certificate = client.zero_trust.gateway.configurations.custom_certificate.get(
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+        assert_matches_type(Optional[CustomCertificateSettings], custom_certificate, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = client.zero_trust.gateway.configurations.custom_certificate.with_raw_response.get(
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom_certificate = response.parse()
+        assert_matches_type(Optional[CustomCertificateSettings], custom_certificate, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with client.zero_trust.gateway.configurations.custom_certificate.with_streaming_response.get(
+                account_id="699d98642c564d2e855e9661899b7252",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                custom_certificate = response.parse()
+                assert_matches_type(Optional[CustomCertificateSettings], custom_certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.zero_trust.gateway.configurations.custom_certificate.with_raw_response.get(
+                    account_id="",
+                )
+
+
+class TestAsyncCustomCertificate:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            custom_certificate = await async_client.zero_trust.gateway.configurations.custom_certificate.get(
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+        assert_matches_type(Optional[CustomCertificateSettings], custom_certificate, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.zero_trust.gateway.configurations.custom_certificate.with_raw_response.get(
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        custom_certificate = await response.parse()
+        assert_matches_type(Optional[CustomCertificateSettings], custom_certificate, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            async with async_client.zero_trust.gateway.configurations.custom_certificate.with_streaming_response.get(
+                account_id="699d98642c564d2e855e9661899b7252",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                custom_certificate = await response.parse()
+                assert_matches_type(Optional[CustomCertificateSettings], custom_certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.zero_trust.gateway.configurations.custom_certificate.with_raw_response.get(
+                    account_id="",
+                )
diff --git a/tests/api_resources/zero_trust/gateway/lists/test_items.py b/tests/api_resources/zero_trust/gateway/lists/test_items.py
index 9fcc52d42a2..5b17241871f 100644
--- a/tests/api_resources/zero_trust/gateway/lists/test_items.py
+++ b/tests/api_resources/zero_trust/gateway/lists/test_items.py
@@ -68,7 +68,9 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncItems:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/zero_trust/gateway/test_app_types.py b/tests/api_resources/zero_trust/gateway/test_app_types.py
index 166d36defcd..f39d2bdec9c 100644
--- a/tests/api_resources/zero_trust/gateway/test_app_types.py
+++ b/tests/api_resources/zero_trust/gateway/test_app_types.py
@@ -58,7 +58,9 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncAppTypes:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/zero_trust/gateway/test_audit_ssh_settings.py b/tests/api_resources/zero_trust/gateway/test_audit_ssh_settings.py
index a25bf37430d..453b20dae93 100644
--- a/tests/api_resources/zero_trust/gateway/test_audit_ssh_settings.py
+++ b/tests/api_resources/zero_trust/gateway/test_audit_ssh_settings.py
@@ -25,15 +25,6 @@ def test_method_update(self, client: Cloudflare) -> None:
         )
         assert_matches_type(Optional[GatewaySettings], audit_ssh_setting, path=["response"])
 
-    @parametrize
-    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        audit_ssh_setting = client.zero_trust.gateway.audit_ssh_settings.update(
-            account_id="699d98642c564d2e855e9661899b7252",
-            public_key="1pyl6I1tL7xfJuFYVzXlUW8uXXlpxegHXBzGCBKaSFA=",
-            seed_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-        )
-        assert_matches_type(Optional[GatewaySettings], audit_ssh_setting, path=["response"])
-
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.zero_trust.gateway.audit_ssh_settings.with_raw_response.update(
@@ -106,24 +97,55 @@ def test_path_params_get(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-
-class TestAsyncAuditSSHSettings:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    @parametrize
+    def test_method_rotate_seed(self, client: Cloudflare) -> None:
+        audit_ssh_setting = client.zero_trust.gateway.audit_ssh_settings.rotate_seed(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[GatewaySettings], audit_ssh_setting, path=["response"])
 
     @parametrize
-    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        audit_ssh_setting = await async_client.zero_trust.gateway.audit_ssh_settings.update(
+    def test_raw_response_rotate_seed(self, client: Cloudflare) -> None:
+        response = client.zero_trust.gateway.audit_ssh_settings.with_raw_response.rotate_seed(
             account_id="699d98642c564d2e855e9661899b7252",
-            public_key="1pyl6I1tL7xfJuFYVzXlUW8uXXlpxegHXBzGCBKaSFA=",
         )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        audit_ssh_setting = response.parse()
         assert_matches_type(Optional[GatewaySettings], audit_ssh_setting, path=["response"])
 
     @parametrize
-    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+    def test_streaming_response_rotate_seed(self, client: Cloudflare) -> None:
+        with client.zero_trust.gateway.audit_ssh_settings.with_streaming_response.rotate_seed(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            audit_ssh_setting = response.parse()
+            assert_matches_type(Optional[GatewaySettings], audit_ssh_setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_rotate_seed(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.gateway.audit_ssh_settings.with_raw_response.rotate_seed(
+                account_id="",
+            )
+
+
+class TestAsyncAuditSSHSettings:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         audit_ssh_setting = await async_client.zero_trust.gateway.audit_ssh_settings.update(
             account_id="699d98642c564d2e855e9661899b7252",
             public_key="1pyl6I1tL7xfJuFYVzXlUW8uXXlpxegHXBzGCBKaSFA=",
-            seed_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
         )
         assert_matches_type(Optional[GatewaySettings], audit_ssh_setting, path=["response"])
 
@@ -198,3 +220,41 @@ async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
             await async_client.zero_trust.gateway.audit_ssh_settings.with_raw_response.get(
                 account_id="",
             )
+
+    @parametrize
+    async def test_method_rotate_seed(self, async_client: AsyncCloudflare) -> None:
+        audit_ssh_setting = await async_client.zero_trust.gateway.audit_ssh_settings.rotate_seed(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[GatewaySettings], audit_ssh_setting, path=["response"])
+
+    @parametrize
+    async def test_raw_response_rotate_seed(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.gateway.audit_ssh_settings.with_raw_response.rotate_seed(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        audit_ssh_setting = await response.parse()
+        assert_matches_type(Optional[GatewaySettings], audit_ssh_setting, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_rotate_seed(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.gateway.audit_ssh_settings.with_streaming_response.rotate_seed(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            audit_ssh_setting = await response.parse()
+            assert_matches_type(Optional[GatewaySettings], audit_ssh_setting, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_rotate_seed(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.gateway.audit_ssh_settings.with_raw_response.rotate_seed(
+                account_id="",
+            )
diff --git a/tests/api_resources/zero_trust/gateway/test_categories.py b/tests/api_resources/zero_trust/gateway/test_categories.py
index 42d6ae3b4db..f03cd27897c 100644
--- a/tests/api_resources/zero_trust/gateway/test_categories.py
+++ b/tests/api_resources/zero_trust/gateway/test_categories.py
@@ -58,7 +58,9 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncCategories:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/zero_trust/gateway/test_certificates.py b/tests/api_resources/zero_trust/gateway/test_certificates.py
index 9d608b63c19..86e44845741 100644
--- a/tests/api_resources/zero_trust/gateway/test_certificates.py
+++ b/tests/api_resources/zero_trust/gateway/test_certificates.py
@@ -15,6 +15,8 @@
     CertificateListResponse,
     CertificateCreateResponse,
     CertificateDeleteResponse,
+    CertificateActivateResponse,
+    CertificateDeactivateResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -155,6 +157,112 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="699d98642c564d2e855e9661899b7252",
             )
 
+    @parametrize
+    def test_method_activate(self, client: Cloudflare) -> None:
+        certificate = client.zero_trust.gateway.certificates.activate(
+            certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body={},
+        )
+        assert_matches_type(Optional[CertificateActivateResponse], certificate, path=["response"])
+
+    @parametrize
+    def test_raw_response_activate(self, client: Cloudflare) -> None:
+        response = client.zero_trust.gateway.certificates.with_raw_response.activate(
+            certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        certificate = response.parse()
+        assert_matches_type(Optional[CertificateActivateResponse], certificate, path=["response"])
+
+    @parametrize
+    def test_streaming_response_activate(self, client: Cloudflare) -> None:
+        with client.zero_trust.gateway.certificates.with_streaming_response.activate(
+            certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            certificate = response.parse()
+            assert_matches_type(Optional[CertificateActivateResponse], certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_activate(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.gateway.certificates.with_raw_response.activate(
+                certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                body={},
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+            client.zero_trust.gateway.certificates.with_raw_response.activate(
+                certificate_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+                body={},
+            )
+
+    @parametrize
+    def test_method_deactivate(self, client: Cloudflare) -> None:
+        certificate = client.zero_trust.gateway.certificates.deactivate(
+            certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body={},
+        )
+        assert_matches_type(Optional[CertificateDeactivateResponse], certificate, path=["response"])
+
+    @parametrize
+    def test_raw_response_deactivate(self, client: Cloudflare) -> None:
+        response = client.zero_trust.gateway.certificates.with_raw_response.deactivate(
+            certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        certificate = response.parse()
+        assert_matches_type(Optional[CertificateDeactivateResponse], certificate, path=["response"])
+
+    @parametrize
+    def test_streaming_response_deactivate(self, client: Cloudflare) -> None:
+        with client.zero_trust.gateway.certificates.with_streaming_response.deactivate(
+            certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            certificate = response.parse()
+            assert_matches_type(Optional[CertificateDeactivateResponse], certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_deactivate(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.gateway.certificates.with_raw_response.deactivate(
+                certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                body={},
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+            client.zero_trust.gateway.certificates.with_raw_response.deactivate(
+                certificate_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+                body={},
+            )
+
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         certificate = client.zero_trust.gateway.certificates.get(
@@ -205,7 +313,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncCertificates:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -339,6 +449,112 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="699d98642c564d2e855e9661899b7252",
             )
 
+    @parametrize
+    async def test_method_activate(self, async_client: AsyncCloudflare) -> None:
+        certificate = await async_client.zero_trust.gateway.certificates.activate(
+            certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body={},
+        )
+        assert_matches_type(Optional[CertificateActivateResponse], certificate, path=["response"])
+
+    @parametrize
+    async def test_raw_response_activate(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.gateway.certificates.with_raw_response.activate(
+            certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        certificate = await response.parse()
+        assert_matches_type(Optional[CertificateActivateResponse], certificate, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_activate(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.gateway.certificates.with_streaming_response.activate(
+            certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            certificate = await response.parse()
+            assert_matches_type(Optional[CertificateActivateResponse], certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_activate(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.gateway.certificates.with_raw_response.activate(
+                certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                body={},
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+            await async_client.zero_trust.gateway.certificates.with_raw_response.activate(
+                certificate_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+                body={},
+            )
+
+    @parametrize
+    async def test_method_deactivate(self, async_client: AsyncCloudflare) -> None:
+        certificate = await async_client.zero_trust.gateway.certificates.deactivate(
+            certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body={},
+        )
+        assert_matches_type(Optional[CertificateDeactivateResponse], certificate, path=["response"])
+
+    @parametrize
+    async def test_raw_response_deactivate(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.gateway.certificates.with_raw_response.deactivate(
+            certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body={},
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        certificate = await response.parse()
+        assert_matches_type(Optional[CertificateDeactivateResponse], certificate, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_deactivate(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.gateway.certificates.with_streaming_response.deactivate(
+            certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            body={},
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            certificate = await response.parse()
+            assert_matches_type(Optional[CertificateDeactivateResponse], certificate, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_deactivate(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.gateway.certificates.with_raw_response.deactivate(
+                certificate_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                body={},
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `certificate_id` but received ''"):
+            await async_client.zero_trust.gateway.certificates.with_raw_response.deactivate(
+                certificate_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+                body={},
+            )
+
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         certificate = await async_client.zero_trust.gateway.certificates.get(
diff --git a/tests/api_resources/zero_trust/gateway/test_configurations.py b/tests/api_resources/zero_trust/gateway/test_configurations.py
index 797541e090e..14e027c3095 100644
--- a/tests/api_resources/zero_trust/gateway/test_configurations.py
+++ b/tests/api_resources/zero_trust/gateway/test_configurations.py
@@ -40,6 +40,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                     "fail_closed": False,
                     "notification_settings": {
                         "enabled": True,
+                        "include_context": True,
                         "msg": "msg",
                         "support_url": "support_url",
                     },
@@ -49,11 +50,14 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                     "enabled": True,
                     "footer_text": "--footer--",
                     "header_text": "--header--",
+                    "include_context": True,
                     "logo_path": "https://logos.com/a.png",
                     "mailto_address": "admin@example.com",
                     "mailto_subject": "Blocked User Inquiry",
+                    "mode": "",
                     "name": "Cloudflare",
                     "suppress_footer": False,
+                    "target_uri": "https://example.com",
                 },
                 "body_scanning": {"inspection_mode": "deep"},
                 "browser_isolation": {
@@ -67,7 +71,13 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                 },
                 "extended_email_matching": {"enabled": True},
                 "fips": {"tls": True},
+                "host_selector": {"enabled": False},
+                "inspection": {"mode": "static"},
                 "protocol_detection": {"enabled": True},
+                "sandbox": {
+                    "enabled": True,
+                    "fallback_action": "allow",
+                },
                 "tls_decrypt": {"enabled": True},
             },
         )
@@ -123,6 +133,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
                     "fail_closed": False,
                     "notification_settings": {
                         "enabled": True,
+                        "include_context": True,
                         "msg": "msg",
                         "support_url": "support_url",
                     },
@@ -132,11 +143,14 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
                     "enabled": True,
                     "footer_text": "--footer--",
                     "header_text": "--header--",
+                    "include_context": True,
                     "logo_path": "https://logos.com/a.png",
                     "mailto_address": "admin@example.com",
                     "mailto_subject": "Blocked User Inquiry",
+                    "mode": "",
                     "name": "Cloudflare",
                     "suppress_footer": False,
+                    "target_uri": "https://example.com",
                 },
                 "body_scanning": {"inspection_mode": "deep"},
                 "browser_isolation": {
@@ -150,7 +164,13 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
                 },
                 "extended_email_matching": {"enabled": True},
                 "fips": {"tls": True},
+                "host_selector": {"enabled": False},
+                "inspection": {"mode": "static"},
                 "protocol_detection": {"enabled": True},
+                "sandbox": {
+                    "enabled": True,
+                    "fallback_action": "allow",
+                },
                 "tls_decrypt": {"enabled": True},
             },
         )
@@ -227,7 +247,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncConfigurations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
@@ -248,6 +270,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                     "fail_closed": False,
                     "notification_settings": {
                         "enabled": True,
+                        "include_context": True,
                         "msg": "msg",
                         "support_url": "support_url",
                     },
@@ -257,11 +280,14 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                     "enabled": True,
                     "footer_text": "--footer--",
                     "header_text": "--header--",
+                    "include_context": True,
                     "logo_path": "https://logos.com/a.png",
                     "mailto_address": "admin@example.com",
                     "mailto_subject": "Blocked User Inquiry",
+                    "mode": "",
                     "name": "Cloudflare",
                     "suppress_footer": False,
+                    "target_uri": "https://example.com",
                 },
                 "body_scanning": {"inspection_mode": "deep"},
                 "browser_isolation": {
@@ -275,7 +301,13 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                 },
                 "extended_email_matching": {"enabled": True},
                 "fips": {"tls": True},
+                "host_selector": {"enabled": False},
+                "inspection": {"mode": "static"},
                 "protocol_detection": {"enabled": True},
+                "sandbox": {
+                    "enabled": True,
+                    "fallback_action": "allow",
+                },
                 "tls_decrypt": {"enabled": True},
             },
         )
@@ -331,6 +363,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
                     "fail_closed": False,
                     "notification_settings": {
                         "enabled": True,
+                        "include_context": True,
                         "msg": "msg",
                         "support_url": "support_url",
                     },
@@ -340,11 +373,14 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
                     "enabled": True,
                     "footer_text": "--footer--",
                     "header_text": "--header--",
+                    "include_context": True,
                     "logo_path": "https://logos.com/a.png",
                     "mailto_address": "admin@example.com",
                     "mailto_subject": "Blocked User Inquiry",
+                    "mode": "",
                     "name": "Cloudflare",
                     "suppress_footer": False,
+                    "target_uri": "https://example.com",
                 },
                 "body_scanning": {"inspection_mode": "deep"},
                 "browser_isolation": {
@@ -358,7 +394,13 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
                 },
                 "extended_email_matching": {"enabled": True},
                 "fips": {"tls": True},
+                "host_selector": {"enabled": False},
+                "inspection": {"mode": "static"},
                 "protocol_detection": {"enabled": True},
+                "sandbox": {
+                    "enabled": True,
+                    "fallback_action": "allow",
+                },
                 "tls_decrypt": {"enabled": True},
             },
         )
diff --git a/tests/api_resources/zero_trust/gateway/test_lists.py b/tests/api_resources/zero_trust/gateway/test_lists.py
index e549fedeff9..b9e375ba154 100644
--- a/tests/api_resources/zero_trust/gateway/test_lists.py
+++ b/tests/api_resources/zero_trust/gateway/test_lists.py
@@ -9,12 +9,10 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare._utils import parse_datetime
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.zero_trust.gateway import (
     GatewayList,
     ListCreateResponse,
-    ListDeleteResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -41,20 +39,9 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             description="The serial numbers for administrators",
             items=[
                 {
-                    "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
                     "description": "Austin office IP",
                     "value": "8GE8721REF",
-                },
-                {
-                    "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-                    "description": "Austin office IP",
-                    "value": "8GE8721REF",
-                },
-                {
-                    "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-                    "description": "Austin office IP",
-                    "value": "8GE8721REF",
-                },
+                }
             ],
         )
         assert_matches_type(Optional[ListCreateResponse], list_, path=["response"])
@@ -112,6 +99,12 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             account_id="699d98642c564d2e855e9661899b7252",
             name="Admin Serial Numbers",
             description="The serial numbers for administrators",
+            items=[
+                {
+                    "description": "Austin office IP",
+                    "value": "8GE8721REF",
+                }
+            ],
         )
         assert_matches_type(Optional[GatewayList], list_, path=["response"])
 
@@ -211,7 +204,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             list_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(Optional[ListDeleteResponse], list_, path=["response"])
+        assert_matches_type(object, list_, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -223,7 +216,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         list_ = response.parse()
-        assert_matches_type(Optional[ListDeleteResponse], list_, path=["response"])
+        assert_matches_type(object, list_, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -235,7 +228,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             list_ = response.parse()
-            assert_matches_type(Optional[ListDeleteResponse], list_, path=["response"])
+            assert_matches_type(object, list_, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -268,22 +261,11 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
             account_id="699d98642c564d2e855e9661899b7252",
             append=[
                 {
-                    "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-                    "description": "Austin office IP",
-                    "value": "8GE8721REF",
-                },
-                {
-                    "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-                    "description": "Austin office IP",
-                    "value": "8GE8721REF",
-                },
-                {
-                    "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
                     "description": "Austin office IP",
                     "value": "8GE8721REF",
-                },
+                }
             ],
-            remove=["8GE8721REF", "8GE8721REF", "8GE8721REF"],
+            remove=["8GE8721REF"],
         )
         assert_matches_type(Optional[GatewayList], list_, path=["response"])
 
@@ -377,7 +359,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncLists:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -397,20 +381,9 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             description="The serial numbers for administrators",
             items=[
                 {
-                    "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
                     "description": "Austin office IP",
                     "value": "8GE8721REF",
-                },
-                {
-                    "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-                    "description": "Austin office IP",
-                    "value": "8GE8721REF",
-                },
-                {
-                    "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-                    "description": "Austin office IP",
-                    "value": "8GE8721REF",
-                },
+                }
             ],
         )
         assert_matches_type(Optional[ListCreateResponse], list_, path=["response"])
@@ -468,6 +441,12 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             account_id="699d98642c564d2e855e9661899b7252",
             name="Admin Serial Numbers",
             description="The serial numbers for administrators",
+            items=[
+                {
+                    "description": "Austin office IP",
+                    "value": "8GE8721REF",
+                }
+            ],
         )
         assert_matches_type(Optional[GatewayList], list_, path=["response"])
 
@@ -567,7 +546,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             list_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(Optional[ListDeleteResponse], list_, path=["response"])
+        assert_matches_type(object, list_, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -579,7 +558,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         list_ = await response.parse()
-        assert_matches_type(Optional[ListDeleteResponse], list_, path=["response"])
+        assert_matches_type(object, list_, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -591,7 +570,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             list_ = await response.parse()
-            assert_matches_type(Optional[ListDeleteResponse], list_, path=["response"])
+            assert_matches_type(object, list_, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -624,22 +603,11 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
             account_id="699d98642c564d2e855e9661899b7252",
             append=[
                 {
-                    "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-                    "description": "Austin office IP",
-                    "value": "8GE8721REF",
-                },
-                {
-                    "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
-                    "description": "Austin office IP",
-                    "value": "8GE8721REF",
-                },
-                {
-                    "created_at": parse_datetime("2014-01-01T05:20:00.12345Z"),
                     "description": "Austin office IP",
                     "value": "8GE8721REF",
-                },
+                }
             ],
-            remove=["8GE8721REF", "8GE8721REF", "8GE8721REF"],
+            remove=["8GE8721REF"],
         )
         assert_matches_type(Optional[GatewayList], list_, path=["response"])
 
diff --git a/tests/api_resources/zero_trust/gateway/test_locations.py b/tests/api_resources/zero_trust/gateway/test_locations.py
index 7855e8d9089..b53c7d4be82 100644
--- a/tests/api_resources/zero_trust/gateway/test_locations.py
+++ b/tests/api_resources/zero_trust/gateway/test_locations.py
@@ -10,10 +10,7 @@
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.zero_trust.gateway import (
-    Location,
-    LocationDeleteResponse,
-)
+from cloudflare.types.zero_trust.gateway import Location
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -37,7 +34,23 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             client_default=False,
             dns_destination_ips_id="0e4a32c6-6fb8-4858-9296-98f51631e8e6",
             ecs_support=False,
-            networks=[{"network": "192.0.2.1/32"}, {"network": "192.0.2.1/32"}, {"network": "192.0.2.1/32"}],
+            endpoints={
+                "doh": {
+                    "enabled": True,
+                    "networks": [{"network": "2001:85a3::/64"}],
+                    "require_token": True,
+                },
+                "dot": {
+                    "enabled": True,
+                    "networks": [{"network": "2001:85a3::/64"}],
+                },
+                "ipv4": {"enabled": True},
+                "ipv6": {
+                    "enabled": True,
+                    "networks": [{"network": "2001:85a3::/64"}],
+                },
+            },
+            networks=[{"network": "192.0.2.1/32"}],
         )
         assert_matches_type(Optional[Location], location, path=["response"])
 
@@ -93,7 +106,23 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             client_default=False,
             dns_destination_ips_id="0e4a32c6-6fb8-4858-9296-98f51631e8e6",
             ecs_support=False,
-            networks=[{"network": "192.0.2.1/32"}, {"network": "192.0.2.1/32"}, {"network": "192.0.2.1/32"}],
+            endpoints={
+                "doh": {
+                    "enabled": True,
+                    "networks": [{"network": "2001:85a3::/64"}],
+                    "require_token": True,
+                },
+                "dot": {
+                    "enabled": True,
+                    "networks": [{"network": "2001:85a3::/64"}],
+                },
+                "ipv4": {"enabled": True},
+                "ipv6": {
+                    "enabled": True,
+                    "networks": [{"network": "2001:85a3::/64"}],
+                },
+            },
+            networks=[{"network": "192.0.2.1/32"}],
         )
         assert_matches_type(Optional[Location], location, path=["response"])
 
@@ -185,7 +214,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             location_id="ed35569b41ce4d1facfe683550f54086",
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(Optional[LocationDeleteResponse], location, path=["response"])
+        assert_matches_type(object, location, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -197,7 +226,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         location = response.parse()
-        assert_matches_type(Optional[LocationDeleteResponse], location, path=["response"])
+        assert_matches_type(object, location, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -209,7 +238,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             location = response.parse()
-            assert_matches_type(Optional[LocationDeleteResponse], location, path=["response"])
+            assert_matches_type(object, location, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -277,7 +306,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncLocations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -295,7 +326,23 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             client_default=False,
             dns_destination_ips_id="0e4a32c6-6fb8-4858-9296-98f51631e8e6",
             ecs_support=False,
-            networks=[{"network": "192.0.2.1/32"}, {"network": "192.0.2.1/32"}, {"network": "192.0.2.1/32"}],
+            endpoints={
+                "doh": {
+                    "enabled": True,
+                    "networks": [{"network": "2001:85a3::/64"}],
+                    "require_token": True,
+                },
+                "dot": {
+                    "enabled": True,
+                    "networks": [{"network": "2001:85a3::/64"}],
+                },
+                "ipv4": {"enabled": True},
+                "ipv6": {
+                    "enabled": True,
+                    "networks": [{"network": "2001:85a3::/64"}],
+                },
+            },
+            networks=[{"network": "192.0.2.1/32"}],
         )
         assert_matches_type(Optional[Location], location, path=["response"])
 
@@ -351,7 +398,23 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             client_default=False,
             dns_destination_ips_id="0e4a32c6-6fb8-4858-9296-98f51631e8e6",
             ecs_support=False,
-            networks=[{"network": "192.0.2.1/32"}, {"network": "192.0.2.1/32"}, {"network": "192.0.2.1/32"}],
+            endpoints={
+                "doh": {
+                    "enabled": True,
+                    "networks": [{"network": "2001:85a3::/64"}],
+                    "require_token": True,
+                },
+                "dot": {
+                    "enabled": True,
+                    "networks": [{"network": "2001:85a3::/64"}],
+                },
+                "ipv4": {"enabled": True},
+                "ipv6": {
+                    "enabled": True,
+                    "networks": [{"network": "2001:85a3::/64"}],
+                },
+            },
+            networks=[{"network": "192.0.2.1/32"}],
         )
         assert_matches_type(Optional[Location], location, path=["response"])
 
@@ -443,7 +506,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             location_id="ed35569b41ce4d1facfe683550f54086",
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(Optional[LocationDeleteResponse], location, path=["response"])
+        assert_matches_type(object, location, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -455,7 +518,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         location = await response.parse()
-        assert_matches_type(Optional[LocationDeleteResponse], location, path=["response"])
+        assert_matches_type(object, location, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -467,7 +530,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             location = await response.parse()
-            assert_matches_type(Optional[LocationDeleteResponse], location, path=["response"])
+            assert_matches_type(object, location, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/zero_trust/gateway/test_logging.py b/tests/api_resources/zero_trust/gateway/test_logging.py
index a157696ec07..b2965923156 100644
--- a/tests/api_resources/zero_trust/gateway/test_logging.py
+++ b/tests/api_resources/zero_trust/gateway/test_logging.py
@@ -30,9 +30,18 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             account_id="699d98642c564d2e855e9661899b7252",
             redact_pii=True,
             settings_by_rule_type={
-                "dns": {},
-                "http": {},
-                "l4": {},
+                "dns": {
+                    "log_all": False,
+                    "log_blocks": True,
+                },
+                "http": {
+                    "log_all": False,
+                    "log_blocks": True,
+                },
+                "l4": {
+                    "log_all": False,
+                    "log_blocks": True,
+                },
             },
         )
         assert_matches_type(Optional[LoggingSetting], logging, path=["response"])
@@ -108,7 +117,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncLogging:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
@@ -123,9 +134,18 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             account_id="699d98642c564d2e855e9661899b7252",
             redact_pii=True,
             settings_by_rule_type={
-                "dns": {},
-                "http": {},
-                "l4": {},
+                "dns": {
+                    "log_all": False,
+                    "log_blocks": True,
+                },
+                "http": {
+                    "log_all": False,
+                    "log_blocks": True,
+                },
+                "l4": {
+                    "log_all": False,
+                    "log_blocks": True,
+                },
             },
         )
         assert_matches_type(Optional[LoggingSetting], logging, path=["response"])
diff --git a/tests/api_resources/zero_trust/gateway/test_proxy_endpoints.py b/tests/api_resources/zero_trust/gateway/test_proxy_endpoints.py
index 07750823931..fe6b9425f84 100644
--- a/tests/api_resources/zero_trust/gateway/test_proxy_endpoints.py
+++ b/tests/api_resources/zero_trust/gateway/test_proxy_endpoints.py
@@ -9,11 +9,8 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.zero_trust.gateway import (
-    ProxyEndpoint,
-    ProxyEndpointGetResponse,
-    ProxyEndpointDeleteResponse,
-)
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.gateway import ProxyEndpoint
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -21,20 +18,30 @@
 class TestProxyEndpoints:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
+    @pytest.mark.skip(reason="TODO: 422 Unprocessable Entity error")
     @parametrize
-    def test_method_create(self, client: Cloudflare) -> None:
+    def test_method_create_overload_1(self, client: Cloudflare) -> None:
         proxy_endpoint = client.zero_trust.gateway.proxy_endpoints.create(
             account_id="699d98642c564d2e855e9661899b7252",
-            ips=["192.0.2.1/32", "192.0.2.1/32", "192.0.2.1/32"],
             name="Devops team",
         )
         assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: 422 Unprocessable Entity error")
     @parametrize
-    def test_raw_response_create(self, client: Cloudflare) -> None:
+    def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> None:
+        proxy_endpoint = client.zero_trust.gateway.proxy_endpoints.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="Devops team",
+            kind="ip",
+        )
+        assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: 422 Unprocessable Entity error")
+    @parametrize
+    def test_raw_response_create_overload_1(self, client: Cloudflare) -> None:
         response = client.zero_trust.gateway.proxy_endpoints.with_raw_response.create(
             account_id="699d98642c564d2e855e9661899b7252",
-            ips=["192.0.2.1/32", "192.0.2.1/32", "192.0.2.1/32"],
             name="Devops team",
         )
 
@@ -43,11 +50,11 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         proxy_endpoint = response.parse()
         assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: 422 Unprocessable Entity error")
     @parametrize
-    def test_streaming_response_create(self, client: Cloudflare) -> None:
+    def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
         with client.zero_trust.gateway.proxy_endpoints.with_streaming_response.create(
             account_id="699d98642c564d2e855e9661899b7252",
-            ips=["192.0.2.1/32", "192.0.2.1/32", "192.0.2.1/32"],
             name="Devops team",
         ) as response:
             assert not response.is_closed
@@ -58,12 +65,62 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: 422 Unprocessable Entity error")
     @parametrize
-    def test_path_params_create(self, client: Cloudflare) -> None:
+    def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.gateway.proxy_endpoints.with_raw_response.create(
                 account_id="",
-                ips=["192.0.2.1/32", "192.0.2.1/32", "192.0.2.1/32"],
+                name="Devops team",
+            )
+
+    @pytest.mark.skip(reason="TODO: 422 Unprocessable Entity error")
+    @parametrize
+    def test_method_create_overload_2(self, client: Cloudflare) -> None:
+        proxy_endpoint = client.zero_trust.gateway.proxy_endpoints.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            kind="identity",
+            name="Devops team",
+        )
+        assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: 422 Unprocessable Entity error")
+    @parametrize
+    def test_raw_response_create_overload_2(self, client: Cloudflare) -> None:
+        response = client.zero_trust.gateway.proxy_endpoints.with_raw_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            kind="identity",
+            name="Devops team",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        proxy_endpoint = response.parse()
+        assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: 422 Unprocessable Entity error")
+    @parametrize
+    def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
+        with client.zero_trust.gateway.proxy_endpoints.with_streaming_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            kind="identity",
+            name="Devops team",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            proxy_endpoint = response.parse()
+            assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: 422 Unprocessable Entity error")
+    @parametrize
+    def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.gateway.proxy_endpoints.with_raw_response.create(
+                account_id="",
+                kind="identity",
                 name="Devops team",
             )
 
@@ -72,7 +129,7 @@ def test_method_list(self, client: Cloudflare) -> None:
         proxy_endpoint = client.zero_trust.gateway.proxy_endpoints.list(
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
+        assert_matches_type(SyncSinglePage[ProxyEndpoint], proxy_endpoint, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
@@ -83,7 +140,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         proxy_endpoint = response.parse()
-        assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
+        assert_matches_type(SyncSinglePage[ProxyEndpoint], proxy_endpoint, path=["response"])
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
@@ -94,7 +151,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             proxy_endpoint = response.parse()
-            assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
+            assert_matches_type(SyncSinglePage[ProxyEndpoint], proxy_endpoint, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -111,7 +168,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             proxy_endpoint_id="ed35569b41ce4d1facfe683550f54086",
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(Optional[ProxyEndpointDeleteResponse], proxy_endpoint, path=["response"])
+        assert_matches_type(object, proxy_endpoint, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -123,7 +180,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         proxy_endpoint = response.parse()
-        assert_matches_type(Optional[ProxyEndpointDeleteResponse], proxy_endpoint, path=["response"])
+        assert_matches_type(object, proxy_endpoint, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -135,7 +192,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             proxy_endpoint = response.parse()
-            assert_matches_type(Optional[ProxyEndpointDeleteResponse], proxy_endpoint, path=["response"])
+            assert_matches_type(object, proxy_endpoint, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -166,7 +223,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
         proxy_endpoint = client.zero_trust.gateway.proxy_endpoints.edit(
             proxy_endpoint_id="ed35569b41ce4d1facfe683550f54086",
             account_id="699d98642c564d2e855e9661899b7252",
-            ips=["192.0.2.1/32", "192.0.2.1/32", "192.0.2.1/32"],
+            ips=["192.0.2.1/32"],
             name="Devops team",
         )
         assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
@@ -217,7 +274,7 @@ def test_method_get(self, client: Cloudflare) -> None:
             proxy_endpoint_id="ed35569b41ce4d1facfe683550f54086",
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(Optional[ProxyEndpointGetResponse], proxy_endpoint, path=["response"])
+        assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
@@ -229,7 +286,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         proxy_endpoint = response.parse()
-        assert_matches_type(Optional[ProxyEndpointGetResponse], proxy_endpoint, path=["response"])
+        assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
@@ -241,7 +298,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             proxy_endpoint = response.parse()
-            assert_matches_type(Optional[ProxyEndpointGetResponse], proxy_endpoint, path=["response"])
+            assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -261,22 +318,34 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncProxyEndpoints:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
+    @pytest.mark.skip(reason="TODO: 422 Unprocessable Entity error")
     @parametrize
-    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_overload_1(self, async_client: AsyncCloudflare) -> None:
         proxy_endpoint = await async_client.zero_trust.gateway.proxy_endpoints.create(
             account_id="699d98642c564d2e855e9661899b7252",
-            ips=["192.0.2.1/32", "192.0.2.1/32", "192.0.2.1/32"],
             name="Devops team",
         )
         assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: 422 Unprocessable Entity error")
     @parametrize
-    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+    async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        proxy_endpoint = await async_client.zero_trust.gateway.proxy_endpoints.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="Devops team",
+            kind="ip",
+        )
+        assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: 422 Unprocessable Entity error")
+    @parametrize
+    async def test_raw_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.gateway.proxy_endpoints.with_raw_response.create(
             account_id="699d98642c564d2e855e9661899b7252",
-            ips=["192.0.2.1/32", "192.0.2.1/32", "192.0.2.1/32"],
             name="Devops team",
         )
 
@@ -285,11 +354,11 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         proxy_endpoint = await response.parse()
         assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
 
+    @pytest.mark.skip(reason="TODO: 422 Unprocessable Entity error")
     @parametrize
-    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+    async def test_streaming_response_create_overload_1(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.gateway.proxy_endpoints.with_streaming_response.create(
             account_id="699d98642c564d2e855e9661899b7252",
-            ips=["192.0.2.1/32", "192.0.2.1/32", "192.0.2.1/32"],
             name="Devops team",
         ) as response:
             assert not response.is_closed
@@ -300,12 +369,62 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
 
         assert cast(Any, response.is_closed) is True
 
+    @pytest.mark.skip(reason="TODO: 422 Unprocessable Entity error")
     @parametrize
-    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.gateway.proxy_endpoints.with_raw_response.create(
                 account_id="",
-                ips=["192.0.2.1/32", "192.0.2.1/32", "192.0.2.1/32"],
+                name="Devops team",
+            )
+
+    @pytest.mark.skip(reason="TODO: 422 Unprocessable Entity error")
+    @parametrize
+    async def test_method_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        proxy_endpoint = await async_client.zero_trust.gateway.proxy_endpoints.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            kind="identity",
+            name="Devops team",
+        )
+        assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: 422 Unprocessable Entity error")
+    @parametrize
+    async def test_raw_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.gateway.proxy_endpoints.with_raw_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            kind="identity",
+            name="Devops team",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        proxy_endpoint = await response.parse()
+        assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
+
+    @pytest.mark.skip(reason="TODO: 422 Unprocessable Entity error")
+    @parametrize
+    async def test_streaming_response_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.gateway.proxy_endpoints.with_streaming_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            kind="identity",
+            name="Devops team",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            proxy_endpoint = await response.parse()
+            assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @pytest.mark.skip(reason="TODO: 422 Unprocessable Entity error")
+    @parametrize
+    async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.gateway.proxy_endpoints.with_raw_response.create(
+                account_id="",
+                kind="identity",
                 name="Devops team",
             )
 
@@ -314,7 +433,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         proxy_endpoint = await async_client.zero_trust.gateway.proxy_endpoints.list(
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
+        assert_matches_type(AsyncSinglePage[ProxyEndpoint], proxy_endpoint, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -325,7 +444,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         proxy_endpoint = await response.parse()
-        assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
+        assert_matches_type(AsyncSinglePage[ProxyEndpoint], proxy_endpoint, path=["response"])
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
@@ -336,7 +455,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             proxy_endpoint = await response.parse()
-            assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
+            assert_matches_type(AsyncSinglePage[ProxyEndpoint], proxy_endpoint, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -353,7 +472,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             proxy_endpoint_id="ed35569b41ce4d1facfe683550f54086",
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(Optional[ProxyEndpointDeleteResponse], proxy_endpoint, path=["response"])
+        assert_matches_type(object, proxy_endpoint, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -365,7 +484,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         proxy_endpoint = await response.parse()
-        assert_matches_type(Optional[ProxyEndpointDeleteResponse], proxy_endpoint, path=["response"])
+        assert_matches_type(object, proxy_endpoint, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -377,7 +496,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             proxy_endpoint = await response.parse()
-            assert_matches_type(Optional[ProxyEndpointDeleteResponse], proxy_endpoint, path=["response"])
+            assert_matches_type(object, proxy_endpoint, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -408,7 +527,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
         proxy_endpoint = await async_client.zero_trust.gateway.proxy_endpoints.edit(
             proxy_endpoint_id="ed35569b41ce4d1facfe683550f54086",
             account_id="699d98642c564d2e855e9661899b7252",
-            ips=["192.0.2.1/32", "192.0.2.1/32", "192.0.2.1/32"],
+            ips=["192.0.2.1/32"],
             name="Devops team",
         )
         assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
@@ -459,7 +578,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
             proxy_endpoint_id="ed35569b41ce4d1facfe683550f54086",
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(Optional[ProxyEndpointGetResponse], proxy_endpoint, path=["response"])
+        assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -471,7 +590,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         proxy_endpoint = await response.parse()
-        assert_matches_type(Optional[ProxyEndpointGetResponse], proxy_endpoint, path=["response"])
+        assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
@@ -483,7 +602,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             proxy_endpoint = await response.parse()
-            assert_matches_type(Optional[ProxyEndpointGetResponse], proxy_endpoint, path=["response"])
+            assert_matches_type(Optional[ProxyEndpoint], proxy_endpoint, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/zero_trust/gateway/test_rules.py b/tests/api_resources/zero_trust/gateway/test_rules.py
index c0aa119c722..e425820ab37 100644
--- a/tests/api_resources/zero_trust/gateway/test_rules.py
+++ b/tests/api_resources/zero_trust/gateway/test_rules.py
@@ -9,10 +9,10 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.zero_trust.gateway import (
     GatewayRule,
-    RuleDeleteResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -39,6 +39,10 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             description="Block bad websites based on their host name.",
             device_posture='any(device_posture.checks.passed[*] in {"1308749e-fcfb-4ebc-b051-fe022b632644"})',
             enabled=True,
+            expiration={
+                "expires_at": parse_datetime("2014-01-01T05:20:20Z"),
+                "duration": 10,
+            },
             filters=["http"],
             identity='any(identity.groups.name[*] in {"finance"})',
             precedence=0,
@@ -50,11 +54,22 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                 "allow_child_bypass": False,
                 "audit_ssh": {"command_logging": False},
                 "biso_admin_controls": {
-                    "dcp": False,
-                    "dd": False,
-                    "dk": False,
+                    "copy": "remote_only",
+                    "dcp": True,
+                    "dd": True,
+                    "dk": True,
+                    "download": "enabled",
                     "dp": False,
-                    "du": False,
+                    "du": True,
+                    "keyboard": "enabled",
+                    "paste": "enabled",
+                    "printing": "enabled",
+                    "upload": "enabled",
+                    "version": "v1",
+                },
+                "block_page": {
+                    "target_uri": "https://example.com",
+                    "include_context": True,
                 },
                 "block_page_enabled": True,
                 "block_reason": "This website is a security risk",
@@ -70,19 +85,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                             "port": 5053,
                             "route_through_private_network": True,
                             "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
-                        {
-                            "ip": "2.2.2.2",
-                            "port": 5053,
-                            "route_through_private_network": True,
-                            "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
-                        {
-                            "ip": "2.2.2.2",
-                            "port": 5053,
-                            "route_through_private_network": True,
-                            "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
+                        }
                     ],
                     "ipv6": [
                         {
@@ -90,19 +93,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                             "port": 5053,
                             "route_through_private_network": True,
                             "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
-                        {
-                            "ip": "2001:DB8::",
-                            "port": 5053,
-                            "route_through_private_network": True,
-                            "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
-                        {
-                            "ip": "2001:DB8::",
-                            "port": 5053,
-                            "route_through_private_network": True,
-                            "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
+                        }
                     ],
                 },
                 "egress": {
@@ -110,6 +101,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                     "ipv4_fallback": "192.0.2.3",
                     "ipv6": "2001:DB8::/64",
                 },
+                "forensic_copy": {"enabled": True},
                 "ignore_cname_category_matches": True,
                 "insecure_disable_dnssec_validation": False,
                 "ip_categories": True,
@@ -120,12 +112,23 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
                 },
                 "notification_settings": {
                     "enabled": True,
+                    "include_context": True,
                     "msg": "msg",
                     "support_url": "support_url",
                 },
                 "override_host": "example.com",
                 "override_ips": ["1.1.1.1", "2.2.2.2"],
                 "payload_log": {"enabled": True},
+                "quarantine": {"file_types": ["exe"]},
+                "redirect": {
+                    "target_uri": "https://example.com",
+                    "include_context": True,
+                    "preserve_path_and_query": True,
+                },
+                "resolve_dns_internally": {
+                    "fallback": "none",
+                    "view_id": "view_id",
+                },
                 "resolve_dns_through_cloudflare": True,
                 "untrusted_cert": {"action": "error"},
             },
@@ -200,6 +203,10 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             description="Block bad websites based on their host name.",
             device_posture='any(device_posture.checks.passed[*] in {"1308749e-fcfb-4ebc-b051-fe022b632644"})',
             enabled=True,
+            expiration={
+                "expires_at": parse_datetime("2014-01-01T05:20:20Z"),
+                "duration": 10,
+            },
             filters=["http"],
             identity='any(identity.groups.name[*] in {"finance"})',
             precedence=0,
@@ -211,11 +218,22 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                 "allow_child_bypass": False,
                 "audit_ssh": {"command_logging": False},
                 "biso_admin_controls": {
-                    "dcp": False,
-                    "dd": False,
-                    "dk": False,
+                    "copy": "remote_only",
+                    "dcp": True,
+                    "dd": True,
+                    "dk": True,
+                    "download": "enabled",
                     "dp": False,
-                    "du": False,
+                    "du": True,
+                    "keyboard": "enabled",
+                    "paste": "enabled",
+                    "printing": "enabled",
+                    "upload": "enabled",
+                    "version": "v1",
+                },
+                "block_page": {
+                    "target_uri": "https://example.com",
+                    "include_context": True,
                 },
                 "block_page_enabled": True,
                 "block_reason": "This website is a security risk",
@@ -231,19 +249,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                             "port": 5053,
                             "route_through_private_network": True,
                             "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
-                        {
-                            "ip": "2.2.2.2",
-                            "port": 5053,
-                            "route_through_private_network": True,
-                            "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
-                        {
-                            "ip": "2.2.2.2",
-                            "port": 5053,
-                            "route_through_private_network": True,
-                            "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
+                        }
                     ],
                     "ipv6": [
                         {
@@ -251,19 +257,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                             "port": 5053,
                             "route_through_private_network": True,
                             "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
-                        {
-                            "ip": "2001:DB8::",
-                            "port": 5053,
-                            "route_through_private_network": True,
-                            "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
-                        {
-                            "ip": "2001:DB8::",
-                            "port": 5053,
-                            "route_through_private_network": True,
-                            "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
+                        }
                     ],
                 },
                 "egress": {
@@ -271,6 +265,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                     "ipv4_fallback": "192.0.2.3",
                     "ipv6": "2001:DB8::/64",
                 },
+                "forensic_copy": {"enabled": True},
                 "ignore_cname_category_matches": True,
                 "insecure_disable_dnssec_validation": False,
                 "ip_categories": True,
@@ -281,12 +276,23 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                 },
                 "notification_settings": {
                     "enabled": True,
+                    "include_context": True,
                     "msg": "msg",
                     "support_url": "support_url",
                 },
                 "override_host": "example.com",
                 "override_ips": ["1.1.1.1", "2.2.2.2"],
                 "payload_log": {"enabled": True},
+                "quarantine": {"file_types": ["exe"]},
+                "redirect": {
+                    "target_uri": "https://example.com",
+                    "include_context": True,
+                    "preserve_path_and_query": True,
+                },
+                "resolve_dns_internally": {
+                    "fallback": "none",
+                    "view_id": "view_id",
+                },
                 "resolve_dns_through_cloudflare": True,
                 "untrusted_cert": {"action": "error"},
             },
@@ -396,7 +402,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             rule_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(Optional[RuleDeleteResponse], rule, path=["response"])
+        assert_matches_type(object, rule, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -408,7 +414,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rule = response.parse()
-        assert_matches_type(Optional[RuleDeleteResponse], rule, path=["response"])
+        assert_matches_type(object, rule, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -420,7 +426,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             rule = response.parse()
-            assert_matches_type(Optional[RuleDeleteResponse], rule, path=["response"])
+            assert_matches_type(object, rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -486,9 +492,97 @@ def test_path_params_get(self, client: Cloudflare) -> None:
                 account_id="699d98642c564d2e855e9661899b7252",
             )
 
+    @parametrize
+    def test_method_list_tenant(self, client: Cloudflare) -> None:
+        rule = client.zero_trust.gateway.rules.list_tenant(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(SyncSinglePage[GatewayRule], rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_list_tenant(self, client: Cloudflare) -> None:
+        response = client.zero_trust.gateway.rules.with_raw_response.list_tenant(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(SyncSinglePage[GatewayRule], rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list_tenant(self, client: Cloudflare) -> None:
+        with client.zero_trust.gateway.rules.with_streaming_response.list_tenant(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = response.parse()
+            assert_matches_type(SyncSinglePage[GatewayRule], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list_tenant(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.gateway.rules.with_raw_response.list_tenant(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_reset_expiration(self, client: Cloudflare) -> None:
+        rule = client.zero_trust.gateway.rules.reset_expiration(
+            rule_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[GatewayRule], rule, path=["response"])
+
+    @parametrize
+    def test_raw_response_reset_expiration(self, client: Cloudflare) -> None:
+        response = client.zero_trust.gateway.rules.with_raw_response.reset_expiration(
+            rule_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = response.parse()
+        assert_matches_type(Optional[GatewayRule], rule, path=["response"])
+
+    @parametrize
+    def test_streaming_response_reset_expiration(self, client: Cloudflare) -> None:
+        with client.zero_trust.gateway.rules.with_streaming_response.reset_expiration(
+            rule_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = response.parse()
+            assert_matches_type(Optional[GatewayRule], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_reset_expiration(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.gateway.rules.with_raw_response.reset_expiration(
+                rule_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+            client.zero_trust.gateway.rules.with_raw_response.reset_expiration(
+                rule_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
 
 class TestAsyncRules:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -508,6 +602,10 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             description="Block bad websites based on their host name.",
             device_posture='any(device_posture.checks.passed[*] in {"1308749e-fcfb-4ebc-b051-fe022b632644"})',
             enabled=True,
+            expiration={
+                "expires_at": parse_datetime("2014-01-01T05:20:20Z"),
+                "duration": 10,
+            },
             filters=["http"],
             identity='any(identity.groups.name[*] in {"finance"})',
             precedence=0,
@@ -519,11 +617,22 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                 "allow_child_bypass": False,
                 "audit_ssh": {"command_logging": False},
                 "biso_admin_controls": {
-                    "dcp": False,
-                    "dd": False,
-                    "dk": False,
+                    "copy": "remote_only",
+                    "dcp": True,
+                    "dd": True,
+                    "dk": True,
+                    "download": "enabled",
                     "dp": False,
-                    "du": False,
+                    "du": True,
+                    "keyboard": "enabled",
+                    "paste": "enabled",
+                    "printing": "enabled",
+                    "upload": "enabled",
+                    "version": "v1",
+                },
+                "block_page": {
+                    "target_uri": "https://example.com",
+                    "include_context": True,
                 },
                 "block_page_enabled": True,
                 "block_reason": "This website is a security risk",
@@ -539,19 +648,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                             "port": 5053,
                             "route_through_private_network": True,
                             "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
-                        {
-                            "ip": "2.2.2.2",
-                            "port": 5053,
-                            "route_through_private_network": True,
-                            "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
-                        {
-                            "ip": "2.2.2.2",
-                            "port": 5053,
-                            "route_through_private_network": True,
-                            "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
+                        }
                     ],
                     "ipv6": [
                         {
@@ -559,19 +656,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                             "port": 5053,
                             "route_through_private_network": True,
                             "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
-                        {
-                            "ip": "2001:DB8::",
-                            "port": 5053,
-                            "route_through_private_network": True,
-                            "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
-                        {
-                            "ip": "2001:DB8::",
-                            "port": 5053,
-                            "route_through_private_network": True,
-                            "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
+                        }
                     ],
                 },
                 "egress": {
@@ -579,6 +664,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                     "ipv4_fallback": "192.0.2.3",
                     "ipv6": "2001:DB8::/64",
                 },
+                "forensic_copy": {"enabled": True},
                 "ignore_cname_category_matches": True,
                 "insecure_disable_dnssec_validation": False,
                 "ip_categories": True,
@@ -589,12 +675,23 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
                 },
                 "notification_settings": {
                     "enabled": True,
+                    "include_context": True,
                     "msg": "msg",
                     "support_url": "support_url",
                 },
                 "override_host": "example.com",
                 "override_ips": ["1.1.1.1", "2.2.2.2"],
                 "payload_log": {"enabled": True},
+                "quarantine": {"file_types": ["exe"]},
+                "redirect": {
+                    "target_uri": "https://example.com",
+                    "include_context": True,
+                    "preserve_path_and_query": True,
+                },
+                "resolve_dns_internally": {
+                    "fallback": "none",
+                    "view_id": "view_id",
+                },
                 "resolve_dns_through_cloudflare": True,
                 "untrusted_cert": {"action": "error"},
             },
@@ -669,6 +766,10 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             description="Block bad websites based on their host name.",
             device_posture='any(device_posture.checks.passed[*] in {"1308749e-fcfb-4ebc-b051-fe022b632644"})',
             enabled=True,
+            expiration={
+                "expires_at": parse_datetime("2014-01-01T05:20:20Z"),
+                "duration": 10,
+            },
             filters=["http"],
             identity='any(identity.groups.name[*] in {"finance"})',
             precedence=0,
@@ -680,11 +781,22 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                 "allow_child_bypass": False,
                 "audit_ssh": {"command_logging": False},
                 "biso_admin_controls": {
-                    "dcp": False,
-                    "dd": False,
-                    "dk": False,
+                    "copy": "remote_only",
+                    "dcp": True,
+                    "dd": True,
+                    "dk": True,
+                    "download": "enabled",
                     "dp": False,
-                    "du": False,
+                    "du": True,
+                    "keyboard": "enabled",
+                    "paste": "enabled",
+                    "printing": "enabled",
+                    "upload": "enabled",
+                    "version": "v1",
+                },
+                "block_page": {
+                    "target_uri": "https://example.com",
+                    "include_context": True,
                 },
                 "block_page_enabled": True,
                 "block_reason": "This website is a security risk",
@@ -700,19 +812,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                             "port": 5053,
                             "route_through_private_network": True,
                             "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
-                        {
-                            "ip": "2.2.2.2",
-                            "port": 5053,
-                            "route_through_private_network": True,
-                            "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
-                        {
-                            "ip": "2.2.2.2",
-                            "port": 5053,
-                            "route_through_private_network": True,
-                            "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
+                        }
                     ],
                     "ipv6": [
                         {
@@ -720,19 +820,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                             "port": 5053,
                             "route_through_private_network": True,
                             "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
-                        {
-                            "ip": "2001:DB8::",
-                            "port": 5053,
-                            "route_through_private_network": True,
-                            "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
-                        {
-                            "ip": "2001:DB8::",
-                            "port": 5053,
-                            "route_through_private_network": True,
-                            "vnet_id": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                        },
+                        }
                     ],
                 },
                 "egress": {
@@ -740,6 +828,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                     "ipv4_fallback": "192.0.2.3",
                     "ipv6": "2001:DB8::/64",
                 },
+                "forensic_copy": {"enabled": True},
                 "ignore_cname_category_matches": True,
                 "insecure_disable_dnssec_validation": False,
                 "ip_categories": True,
@@ -750,12 +839,23 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                 },
                 "notification_settings": {
                     "enabled": True,
+                    "include_context": True,
                     "msg": "msg",
                     "support_url": "support_url",
                 },
                 "override_host": "example.com",
                 "override_ips": ["1.1.1.1", "2.2.2.2"],
                 "payload_log": {"enabled": True},
+                "quarantine": {"file_types": ["exe"]},
+                "redirect": {
+                    "target_uri": "https://example.com",
+                    "include_context": True,
+                    "preserve_path_and_query": True,
+                },
+                "resolve_dns_internally": {
+                    "fallback": "none",
+                    "view_id": "view_id",
+                },
                 "resolve_dns_through_cloudflare": True,
                 "untrusted_cert": {"action": "error"},
             },
@@ -865,7 +965,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             rule_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(Optional[RuleDeleteResponse], rule, path=["response"])
+        assert_matches_type(object, rule, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -877,7 +977,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         rule = await response.parse()
-        assert_matches_type(Optional[RuleDeleteResponse], rule, path=["response"])
+        assert_matches_type(object, rule, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -889,7 +989,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             rule = await response.parse()
-            assert_matches_type(Optional[RuleDeleteResponse], rule, path=["response"])
+            assert_matches_type(object, rule, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -954,3 +1054,89 @@ async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
                 rule_id="",
                 account_id="699d98642c564d2e855e9661899b7252",
             )
+
+    @parametrize
+    async def test_method_list_tenant(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.zero_trust.gateway.rules.list_tenant(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(AsyncSinglePage[GatewayRule], rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list_tenant(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.gateway.rules.with_raw_response.list_tenant(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(AsyncSinglePage[GatewayRule], rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list_tenant(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.gateway.rules.with_streaming_response.list_tenant(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = await response.parse()
+            assert_matches_type(AsyncSinglePage[GatewayRule], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list_tenant(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.gateway.rules.with_raw_response.list_tenant(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_reset_expiration(self, async_client: AsyncCloudflare) -> None:
+        rule = await async_client.zero_trust.gateway.rules.reset_expiration(
+            rule_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Optional[GatewayRule], rule, path=["response"])
+
+    @parametrize
+    async def test_raw_response_reset_expiration(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.gateway.rules.with_raw_response.reset_expiration(
+            rule_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rule = await response.parse()
+        assert_matches_type(Optional[GatewayRule], rule, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_reset_expiration(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.gateway.rules.with_streaming_response.reset_expiration(
+            rule_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rule = await response.parse()
+            assert_matches_type(Optional[GatewayRule], rule, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_reset_expiration(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.gateway.rules.with_raw_response.reset_expiration(
+                rule_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `rule_id` but received ''"):
+            await async_client.zero_trust.gateway.rules.with_raw_response.reset_expiration(
+                rule_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
diff --git a/tests/api_resources/zero_trust/identity_providers/__init__.py b/tests/api_resources/zero_trust/identity_providers/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/identity_providers/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/identity_providers/scim/__init__.py b/tests/api_resources/zero_trust/identity_providers/scim/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/identity_providers/scim/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/identity_providers/scim/test_groups.py b/tests/api_resources/zero_trust/identity_providers/scim/test_groups.py
new file mode 100644
index 00000000000..c19dce42b04
--- /dev/null
+++ b/tests/api_resources/zero_trust/identity_providers/scim/test_groups.py
@@ -0,0 +1,147 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.zero_trust.access import ZeroTrustGroup
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestGroups:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        group = client.zero_trust.identity_providers.scim.groups.list(
+            identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ZeroTrustGroup], group, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        group = client.zero_trust.identity_providers.scim.groups.list(
+            identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            cf_resource_id="a2abeb50-59c9-4c01-8c5c-963d3bf5700f",
+            idp_resource_id="all_employees",
+            name="ALL_EMPLOYEES",
+            page=0,
+            per_page=0,
+        )
+        assert_matches_type(SyncV4PagePaginationArray[ZeroTrustGroup], group, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.identity_providers.scim.groups.with_raw_response.list(
+            identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        group = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[ZeroTrustGroup], group, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.identity_providers.scim.groups.with_streaming_response.list(
+            identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            group = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[ZeroTrustGroup], group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.identity_providers.scim.groups.with_raw_response.list(
+                identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `identity_provider_id` but received ''"):
+            client.zero_trust.identity_providers.scim.groups.with_raw_response.list(
+                identity_provider_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncGroups:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        group = await async_client.zero_trust.identity_providers.scim.groups.list(
+            identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[ZeroTrustGroup], group, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        group = await async_client.zero_trust.identity_providers.scim.groups.list(
+            identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            cf_resource_id="a2abeb50-59c9-4c01-8c5c-963d3bf5700f",
+            idp_resource_id="all_employees",
+            name="ALL_EMPLOYEES",
+            page=0,
+            per_page=0,
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[ZeroTrustGroup], group, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.identity_providers.scim.groups.with_raw_response.list(
+            identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        group = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[ZeroTrustGroup], group, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.identity_providers.scim.groups.with_streaming_response.list(
+            identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            group = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[ZeroTrustGroup], group, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.identity_providers.scim.groups.with_raw_response.list(
+                identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `identity_provider_id` but received ''"):
+            await async_client.zero_trust.identity_providers.scim.groups.with_raw_response.list(
+                identity_provider_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/zero_trust/identity_providers/scim/test_users.py b/tests/api_resources/zero_trust/identity_providers/scim/test_users.py
new file mode 100644
index 00000000000..8d1eebe0ccf
--- /dev/null
+++ b/tests/api_resources/zero_trust/identity_providers/scim/test_users.py
@@ -0,0 +1,151 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.zero_trust.access import AccessUser
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestUsers:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        user = client.zero_trust.identity_providers.scim.users.list(
+            identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[AccessUser], user, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        user = client.zero_trust.identity_providers.scim.users.list(
+            identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            cf_resource_id="bd97ef8d-7986-43e3-9ee0-c25dda33e4b0",
+            email="john.smith@example.com",
+            idp_resource_id="john_smith_01",
+            name="John Smith",
+            page=0,
+            per_page=0,
+            username="John Smith",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[AccessUser], user, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.identity_providers.scim.users.with_raw_response.list(
+            identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        user = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[AccessUser], user, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.identity_providers.scim.users.with_streaming_response.list(
+            identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            user = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[AccessUser], user, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.identity_providers.scim.users.with_raw_response.list(
+                identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `identity_provider_id` but received ''"):
+            client.zero_trust.identity_providers.scim.users.with_raw_response.list(
+                identity_provider_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncUsers:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        user = await async_client.zero_trust.identity_providers.scim.users.list(
+            identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[AccessUser], user, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        user = await async_client.zero_trust.identity_providers.scim.users.list(
+            identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            cf_resource_id="bd97ef8d-7986-43e3-9ee0-c25dda33e4b0",
+            email="john.smith@example.com",
+            idp_resource_id="john_smith_01",
+            name="John Smith",
+            page=0,
+            per_page=0,
+            username="John Smith",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[AccessUser], user, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.identity_providers.scim.users.with_raw_response.list(
+            identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        user = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[AccessUser], user, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.identity_providers.scim.users.with_streaming_response.list(
+            identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            user = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[AccessUser], user, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.identity_providers.scim.users.with_raw_response.list(
+                identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `identity_provider_id` but received ''"):
+            await async_client.zero_trust.identity_providers.scim.users.with_raw_response.list(
+                identity_provider_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/zero_trust/networks/routes/test_ips.py b/tests/api_resources/zero_trust/networks/routes/test_ips.py
index 2f78627ef93..57b3495217c 100644
--- a/tests/api_resources/zero_trust/networks/routes/test_ips.py
+++ b/tests/api_resources/zero_trust/networks/routes/test_ips.py
@@ -30,6 +30,7 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None:
         ip = client.zero_trust.networks.routes.ips.get(
             ip="10.1.0.137",
             account_id="699d98642c564d2e855e9661899b7252",
+            default_virtual_network_fallback=True,
             virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
         )
         assert_matches_type(Teamnet, ip, path=["response"])
@@ -76,7 +77,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncIPs:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
@@ -91,6 +94,7 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -
         ip = await async_client.zero_trust.networks.routes.ips.get(
             ip="10.1.0.137",
             account_id="699d98642c564d2e855e9661899b7252",
+            default_virtual_network_fallback=True,
             virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
         )
         assert_matches_type(Teamnet, ip, path=["response"])
diff --git a/tests/api_resources/zero_trust/networks/routes/test_networks.py b/tests/api_resources/zero_trust/networks/routes/test_networks.py
index 5f9fb16ca2d..465079d2ace 100644
--- a/tests/api_resources/zero_trust/networks/routes/test_networks.py
+++ b/tests/api_resources/zero_trust/networks/routes/test_networks.py
@@ -11,6 +11,8 @@
 from tests.utils import assert_matches_type
 from cloudflare.types.zero_trust.networks import Route
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -19,31 +21,36 @@ class TestNetworks:
 
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
-        network = client.zero_trust.networks.routes.networks.create(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-        )
+        with pytest.warns(DeprecationWarning):
+            network = client.zero_trust.networks.routes.networks.create(
+                ip_network_encoded="172.16.0.0%2F16",
+                account_id="699d98642c564d2e855e9661899b7252",
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            )
+
         assert_matches_type(Route, network, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
-        network = client.zero_trust.networks.routes.networks.create(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            comment="Example comment for this route.",
-            virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-        )
+        with pytest.warns(DeprecationWarning):
+            network = client.zero_trust.networks.routes.networks.create(
+                ip_network_encoded="172.16.0.0%2F16",
+                account_id="699d98642c564d2e855e9661899b7252",
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                comment="Example comment for this route.",
+                virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            )
+
         assert_matches_type(Route, network, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.zero_trust.networks.routes.networks.with_raw_response.create(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.zero_trust.networks.routes.networks.with_raw_response.create(
+                ip_network_encoded="172.16.0.0%2F16",
+                account_id="699d98642c564d2e855e9661899b7252",
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -52,60 +59,69 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.zero_trust.networks.routes.networks.with_streaming_response.create(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.zero_trust.networks.routes.networks.with_streaming_response.create(
+                ip_network_encoded="172.16.0.0%2F16",
+                account_id="699d98642c564d2e855e9661899b7252",
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            network = response.parse()
-            assert_matches_type(Route, network, path=["response"])
+                network = response.parse()
+                assert_matches_type(Route, network, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.networks.routes.networks.with_raw_response.create(
-                ip_network_encoded="172.16.0.0%2F16",
-                account_id="",
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.zero_trust.networks.routes.networks.with_raw_response.create(
+                    ip_network_encoded="172.16.0.0%2F16",
+                    account_id="",
+                    tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                )
+
+            with pytest.raises(
+                ValueError, match=r"Expected a non-empty value for `ip_network_encoded` but received ''"
+            ):
+                client.zero_trust.networks.routes.networks.with_raw_response.create(
+                    ip_network_encoded="",
+                    account_id="699d98642c564d2e855e9661899b7252",
+                    tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ip_network_encoded` but received ''"):
-            client.zero_trust.networks.routes.networks.with_raw_response.create(
-                ip_network_encoded="",
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            network = client.zero_trust.networks.routes.networks.delete(
+                ip_network_encoded="172.16.0.0%2F16",
                 account_id="699d98642c564d2e855e9661899b7252",
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
             )
 
-    @parametrize
-    def test_method_delete(self, client: Cloudflare) -> None:
-        network = client.zero_trust.networks.routes.networks.delete(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
         assert_matches_type(Route, network, path=["response"])
 
     @parametrize
     def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
-        network = client.zero_trust.networks.routes.networks.delete(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-            tun_type="cfd_tunnel",
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-        )
+        with pytest.warns(DeprecationWarning):
+            network = client.zero_trust.networks.routes.networks.delete(
+                ip_network_encoded="172.16.0.0%2F16",
+                account_id="699d98642c564d2e855e9661899b7252",
+                tun_type="cfd_tunnel",
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            )
+
         assert_matches_type(Route, network, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.zero_trust.networks.routes.networks.with_raw_response.delete(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.zero_trust.networks.routes.networks.with_raw_response.delete(
+                ip_network_encoded="172.16.0.0%2F16",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -114,46 +130,53 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.zero_trust.networks.routes.networks.with_streaming_response.delete(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.zero_trust.networks.routes.networks.with_streaming_response.delete(
+                ip_network_encoded="172.16.0.0%2F16",
+                account_id="699d98642c564d2e855e9661899b7252",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            network = response.parse()
-            assert_matches_type(Route, network, path=["response"])
+                network = response.parse()
+                assert_matches_type(Route, network, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.networks.routes.networks.with_raw_response.delete(
-                ip_network_encoded="172.16.0.0%2F16",
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.zero_trust.networks.routes.networks.with_raw_response.delete(
+                    ip_network_encoded="172.16.0.0%2F16",
+                    account_id="",
+                )
+
+            with pytest.raises(
+                ValueError, match=r"Expected a non-empty value for `ip_network_encoded` but received ''"
+            ):
+                client.zero_trust.networks.routes.networks.with_raw_response.delete(
+                    ip_network_encoded="",
+                    account_id="699d98642c564d2e855e9661899b7252",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ip_network_encoded` but received ''"):
-            client.zero_trust.networks.routes.networks.with_raw_response.delete(
-                ip_network_encoded="",
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            network = client.zero_trust.networks.routes.networks.edit(
+                ip_network_encoded="172.16.0.0%2F16",
                 account_id="699d98642c564d2e855e9661899b7252",
             )
 
-    @parametrize
-    def test_method_edit(self, client: Cloudflare) -> None:
-        network = client.zero_trust.networks.routes.networks.edit(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
         assert_matches_type(Route, network, path=["response"])
 
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
-        response = client.zero_trust.networks.routes.networks.with_raw_response.edit(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.zero_trust.networks.routes.networks.with_raw_response.edit(
+                ip_network_encoded="172.16.0.0%2F16",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -162,63 +185,74 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
-        with client.zero_trust.networks.routes.networks.with_streaming_response.edit(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.zero_trust.networks.routes.networks.with_streaming_response.edit(
+                ip_network_encoded="172.16.0.0%2F16",
+                account_id="699d98642c564d2e855e9661899b7252",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            network = response.parse()
-            assert_matches_type(Route, network, path=["response"])
+                network = response.parse()
+                assert_matches_type(Route, network, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_edit(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.networks.routes.networks.with_raw_response.edit(
-                ip_network_encoded="172.16.0.0%2F16",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ip_network_encoded` but received ''"):
-            client.zero_trust.networks.routes.networks.with_raw_response.edit(
-                ip_network_encoded="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.zero_trust.networks.routes.networks.with_raw_response.edit(
+                    ip_network_encoded="172.16.0.0%2F16",
+                    account_id="",
+                )
+
+            with pytest.raises(
+                ValueError, match=r"Expected a non-empty value for `ip_network_encoded` but received ''"
+            ):
+                client.zero_trust.networks.routes.networks.with_raw_response.edit(
+                    ip_network_encoded="",
+                    account_id="699d98642c564d2e855e9661899b7252",
+                )
 
 
 class TestAsyncNetworks:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        network = await async_client.zero_trust.networks.routes.networks.create(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-        )
+        with pytest.warns(DeprecationWarning):
+            network = await async_client.zero_trust.networks.routes.networks.create(
+                ip_network_encoded="172.16.0.0%2F16",
+                account_id="699d98642c564d2e855e9661899b7252",
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            )
+
         assert_matches_type(Route, network, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        network = await async_client.zero_trust.networks.routes.networks.create(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            comment="Example comment for this route.",
-            virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-        )
+        with pytest.warns(DeprecationWarning):
+            network = await async_client.zero_trust.networks.routes.networks.create(
+                ip_network_encoded="172.16.0.0%2F16",
+                account_id="699d98642c564d2e855e9661899b7252",
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                comment="Example comment for this route.",
+                virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            )
+
         assert_matches_type(Route, network, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.networks.routes.networks.with_raw_response.create(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.zero_trust.networks.routes.networks.with_raw_response.create(
+                ip_network_encoded="172.16.0.0%2F16",
+                account_id="699d98642c564d2e855e9661899b7252",
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -227,60 +261,69 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.networks.routes.networks.with_streaming_response.create(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.zero_trust.networks.routes.networks.with_streaming_response.create(
+                ip_network_encoded="172.16.0.0%2F16",
+                account_id="699d98642c564d2e855e9661899b7252",
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            network = await response.parse()
-            assert_matches_type(Route, network, path=["response"])
+                network = await response.parse()
+                assert_matches_type(Route, network, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.networks.routes.networks.with_raw_response.create(
-                ip_network_encoded="172.16.0.0%2F16",
-                account_id="",
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.zero_trust.networks.routes.networks.with_raw_response.create(
+                    ip_network_encoded="172.16.0.0%2F16",
+                    account_id="",
+                    tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                )
+
+            with pytest.raises(
+                ValueError, match=r"Expected a non-empty value for `ip_network_encoded` but received ''"
+            ):
+                await async_client.zero_trust.networks.routes.networks.with_raw_response.create(
+                    ip_network_encoded="",
+                    account_id="699d98642c564d2e855e9661899b7252",
+                    tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ip_network_encoded` but received ''"):
-            await async_client.zero_trust.networks.routes.networks.with_raw_response.create(
-                ip_network_encoded="",
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            network = await async_client.zero_trust.networks.routes.networks.delete(
+                ip_network_encoded="172.16.0.0%2F16",
                 account_id="699d98642c564d2e855e9661899b7252",
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
             )
 
-    @parametrize
-    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        network = await async_client.zero_trust.networks.routes.networks.delete(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
         assert_matches_type(Route, network, path=["response"])
 
     @parametrize
     async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        network = await async_client.zero_trust.networks.routes.networks.delete(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-            tun_type="cfd_tunnel",
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-        )
+        with pytest.warns(DeprecationWarning):
+            network = await async_client.zero_trust.networks.routes.networks.delete(
+                ip_network_encoded="172.16.0.0%2F16",
+                account_id="699d98642c564d2e855e9661899b7252",
+                tun_type="cfd_tunnel",
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            )
+
         assert_matches_type(Route, network, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.networks.routes.networks.with_raw_response.delete(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.zero_trust.networks.routes.networks.with_raw_response.delete(
+                ip_network_encoded="172.16.0.0%2F16",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -289,46 +332,53 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.networks.routes.networks.with_streaming_response.delete(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.zero_trust.networks.routes.networks.with_streaming_response.delete(
+                ip_network_encoded="172.16.0.0%2F16",
+                account_id="699d98642c564d2e855e9661899b7252",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            network = await response.parse()
-            assert_matches_type(Route, network, path=["response"])
+                network = await response.parse()
+                assert_matches_type(Route, network, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.networks.routes.networks.with_raw_response.delete(
-                ip_network_encoded="172.16.0.0%2F16",
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.zero_trust.networks.routes.networks.with_raw_response.delete(
+                    ip_network_encoded="172.16.0.0%2F16",
+                    account_id="",
+                )
+
+            with pytest.raises(
+                ValueError, match=r"Expected a non-empty value for `ip_network_encoded` but received ''"
+            ):
+                await async_client.zero_trust.networks.routes.networks.with_raw_response.delete(
+                    ip_network_encoded="",
+                    account_id="699d98642c564d2e855e9661899b7252",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ip_network_encoded` but received ''"):
-            await async_client.zero_trust.networks.routes.networks.with_raw_response.delete(
-                ip_network_encoded="",
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.warns(DeprecationWarning):
+            network = await async_client.zero_trust.networks.routes.networks.edit(
+                ip_network_encoded="172.16.0.0%2F16",
                 account_id="699d98642c564d2e855e9661899b7252",
             )
 
-    @parametrize
-    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
-        network = await async_client.zero_trust.networks.routes.networks.edit(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
         assert_matches_type(Route, network, path=["response"])
 
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.networks.routes.networks.with_raw_response.edit(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.zero_trust.networks.routes.networks.with_raw_response.edit(
+                ip_network_encoded="172.16.0.0%2F16",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -337,28 +387,32 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.networks.routes.networks.with_streaming_response.edit(
-            ip_network_encoded="172.16.0.0%2F16",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.zero_trust.networks.routes.networks.with_streaming_response.edit(
+                ip_network_encoded="172.16.0.0%2F16",
+                account_id="699d98642c564d2e855e9661899b7252",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            network = await response.parse()
-            assert_matches_type(Route, network, path=["response"])
+                network = await response.parse()
+                assert_matches_type(Route, network, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.networks.routes.networks.with_raw_response.edit(
-                ip_network_encoded="172.16.0.0%2F16",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `ip_network_encoded` but received ''"):
-            await async_client.zero_trust.networks.routes.networks.with_raw_response.edit(
-                ip_network_encoded="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.zero_trust.networks.routes.networks.with_raw_response.edit(
+                    ip_network_encoded="172.16.0.0%2F16",
+                    account_id="",
+                )
+
+            with pytest.raises(
+                ValueError, match=r"Expected a non-empty value for `ip_network_encoded` but received ''"
+            ):
+                await async_client.zero_trust.networks.routes.networks.with_raw_response.edit(
+                    ip_network_encoded="",
+                    account_id="699d98642c564d2e855e9661899b7252",
+                )
diff --git a/tests/api_resources/zero_trust/networks/subnets/__init__.py b/tests/api_resources/zero_trust/networks/subnets/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/networks/subnets/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/networks/subnets/test_cloudflare_source.py b/tests/api_resources/zero_trust/networks/subnets/test_cloudflare_source.py
new file mode 100644
index 00000000000..27a5af44aad
--- /dev/null
+++ b/tests/api_resources/zero_trust/networks/subnets/test_cloudflare_source.py
@@ -0,0 +1,130 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zero_trust.networks.subnets import CloudflareSourceUpdateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCloudflareSource:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        cloudflare_source = client.zero_trust.networks.subnets.cloudflare_source.update(
+            address_family="v4",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(CloudflareSourceUpdateResponse, cloudflare_source, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        cloudflare_source = client.zero_trust.networks.subnets.cloudflare_source.update(
+            address_family="v4",
+            account_id="699d98642c564d2e855e9661899b7252",
+            comment="example comment",
+            name="IPv4 Cloudflare Source IPs",
+            network="100.64.0.0/12",
+        )
+        assert_matches_type(CloudflareSourceUpdateResponse, cloudflare_source, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zero_trust.networks.subnets.cloudflare_source.with_raw_response.update(
+            address_family="v4",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloudflare_source = response.parse()
+        assert_matches_type(CloudflareSourceUpdateResponse, cloudflare_source, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zero_trust.networks.subnets.cloudflare_source.with_streaming_response.update(
+            address_family="v4",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloudflare_source = response.parse()
+            assert_matches_type(CloudflareSourceUpdateResponse, cloudflare_source, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.networks.subnets.cloudflare_source.with_raw_response.update(
+                address_family="v4",
+                account_id="",
+            )
+
+
+class TestAsyncCloudflareSource:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        cloudflare_source = await async_client.zero_trust.networks.subnets.cloudflare_source.update(
+            address_family="v4",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(CloudflareSourceUpdateResponse, cloudflare_source, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cloudflare_source = await async_client.zero_trust.networks.subnets.cloudflare_source.update(
+            address_family="v4",
+            account_id="699d98642c564d2e855e9661899b7252",
+            comment="example comment",
+            name="IPv4 Cloudflare Source IPs",
+            network="100.64.0.0/12",
+        )
+        assert_matches_type(CloudflareSourceUpdateResponse, cloudflare_source, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.networks.subnets.cloudflare_source.with_raw_response.update(
+            address_family="v4",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloudflare_source = await response.parse()
+        assert_matches_type(CloudflareSourceUpdateResponse, cloudflare_source, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.networks.subnets.cloudflare_source.with_streaming_response.update(
+            address_family="v4",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloudflare_source = await response.parse()
+            assert_matches_type(CloudflareSourceUpdateResponse, cloudflare_source, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.networks.subnets.cloudflare_source.with_raw_response.update(
+                address_family="v4",
+                account_id="",
+            )
diff --git a/tests/api_resources/zero_trust/networks/test_hostname_routes.py b/tests/api_resources/zero_trust/networks/test_hostname_routes.py
new file mode 100644
index 00000000000..054702f83fe
--- /dev/null
+++ b/tests/api_resources/zero_trust/networks/test_hostname_routes.py
@@ -0,0 +1,539 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.zero_trust.networks import (
+    HostnameRoute,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestHostnameRoutes:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        hostname_route = client.zero_trust.networks.hostname_routes.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        hostname_route = client.zero_trust.networks.hostname_routes.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            comment="example comment",
+            hostname="office-1.local",
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+        )
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.networks.hostname_routes.with_raw_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hostname_route = response.parse()
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.networks.hostname_routes.with_streaming_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hostname_route = response.parse()
+            assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.networks.hostname_routes.with_raw_response.create(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        hostname_route = client.zero_trust.networks.hostname_routes.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[HostnameRoute], hostname_route, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        hostname_route = client.zero_trust.networks.hostname_routes.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+            id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            comment="example%20comment",
+            existed_at="2019-10-12T07%3A20%3A50.52Z",
+            hostname="office-1.local",
+            is_deleted=True,
+            page=1,
+            per_page=1,
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[HostnameRoute], hostname_route, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.networks.hostname_routes.with_raw_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hostname_route = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[HostnameRoute], hostname_route, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.networks.hostname_routes.with_streaming_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hostname_route = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[HostnameRoute], hostname_route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.networks.hostname_routes.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        hostname_route = client.zero_trust.networks.hostname_routes.delete(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.networks.hostname_routes.with_raw_response.delete(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hostname_route = response.parse()
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.networks.hostname_routes.with_streaming_response.delete(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hostname_route = response.parse()
+            assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.networks.hostname_routes.with_raw_response.delete(
+                hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `hostname_route_id` but received ''"):
+            client.zero_trust.networks.hostname_routes.with_raw_response.delete(
+                hostname_route_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        hostname_route = client.zero_trust.networks.hostname_routes.edit(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        hostname_route = client.zero_trust.networks.hostname_routes.edit(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            comment="example comment",
+            hostname="office-1.local",
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+        )
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.zero_trust.networks.hostname_routes.with_raw_response.edit(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hostname_route = response.parse()
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.zero_trust.networks.hostname_routes.with_streaming_response.edit(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hostname_route = response.parse()
+            assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.networks.hostname_routes.with_raw_response.edit(
+                hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `hostname_route_id` but received ''"):
+            client.zero_trust.networks.hostname_routes.with_raw_response.edit(
+                hostname_route_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        hostname_route = client.zero_trust.networks.hostname_routes.get(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.networks.hostname_routes.with_raw_response.get(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hostname_route = response.parse()
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.networks.hostname_routes.with_streaming_response.get(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hostname_route = response.parse()
+            assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.networks.hostname_routes.with_raw_response.get(
+                hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `hostname_route_id` but received ''"):
+            client.zero_trust.networks.hostname_routes.with_raw_response.get(
+                hostname_route_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+
+class TestAsyncHostnameRoutes:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        hostname_route = await async_client.zero_trust.networks.hostname_routes.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        hostname_route = await async_client.zero_trust.networks.hostname_routes.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            comment="example comment",
+            hostname="office-1.local",
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+        )
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.networks.hostname_routes.with_raw_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hostname_route = await response.parse()
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.networks.hostname_routes.with_streaming_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hostname_route = await response.parse()
+            assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.networks.hostname_routes.with_raw_response.create(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        hostname_route = await async_client.zero_trust.networks.hostname_routes.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[HostnameRoute], hostname_route, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        hostname_route = await async_client.zero_trust.networks.hostname_routes.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+            id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            comment="example%20comment",
+            existed_at="2019-10-12T07%3A20%3A50.52Z",
+            hostname="office-1.local",
+            is_deleted=True,
+            page=1,
+            per_page=1,
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[HostnameRoute], hostname_route, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.networks.hostname_routes.with_raw_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hostname_route = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[HostnameRoute], hostname_route, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.networks.hostname_routes.with_streaming_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hostname_route = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[HostnameRoute], hostname_route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.networks.hostname_routes.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        hostname_route = await async_client.zero_trust.networks.hostname_routes.delete(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.networks.hostname_routes.with_raw_response.delete(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hostname_route = await response.parse()
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.networks.hostname_routes.with_streaming_response.delete(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hostname_route = await response.parse()
+            assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.networks.hostname_routes.with_raw_response.delete(
+                hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `hostname_route_id` but received ''"):
+            await async_client.zero_trust.networks.hostname_routes.with_raw_response.delete(
+                hostname_route_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        hostname_route = await async_client.zero_trust.networks.hostname_routes.edit(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        hostname_route = await async_client.zero_trust.networks.hostname_routes.edit(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            comment="example comment",
+            hostname="office-1.local",
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+        )
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.networks.hostname_routes.with_raw_response.edit(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hostname_route = await response.parse()
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.networks.hostname_routes.with_streaming_response.edit(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hostname_route = await response.parse()
+            assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.networks.hostname_routes.with_raw_response.edit(
+                hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `hostname_route_id` but received ''"):
+            await async_client.zero_trust.networks.hostname_routes.with_raw_response.edit(
+                hostname_route_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        hostname_route = await async_client.zero_trust.networks.hostname_routes.get(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.networks.hostname_routes.with_raw_response.get(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hostname_route = await response.parse()
+        assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.networks.hostname_routes.with_streaming_response.get(
+            hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hostname_route = await response.parse()
+            assert_matches_type(HostnameRoute, hostname_route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.networks.hostname_routes.with_raw_response.get(
+                hostname_route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `hostname_route_id` but received ''"):
+            await async_client.zero_trust.networks.hostname_routes.with_raw_response.get(
+                hostname_route_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
diff --git a/tests/api_resources/zero_trust/networks/test_routes.py b/tests/api_resources/zero_trust/networks/test_routes.py
index c1bc1d16c66..8c2f63e0532 100644
--- a/tests/api_resources/zero_trust/networks/test_routes.py
+++ b/tests/api_resources/zero_trust/networks/test_routes.py
@@ -9,7 +9,6 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare._utils import parse_datetime
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.zero_trust.networks import (
     Route,
@@ -91,14 +90,14 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         route = client.zero_trust.networks.routes.list(
             account_id="699d98642c564d2e855e9661899b7252",
             comment="Example comment for this route.",
-            existed_at=parse_datetime("2019-10-12T07:20:50.52Z"),
+            existed_at="2019-10-12T07%3A20%3A50.52Z",
             is_deleted=True,
             network_subset="172.16.0.0/16",
             network_superset="172.16.0.0/16",
             page=1,
             per_page=1,
             route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            tun_types="cfd_tunnel,warp_connector",
+            tun_types=["cfd_tunnel"],
             tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
             virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
         )
@@ -243,9 +242,59 @@ def test_path_params_edit(self, client: Cloudflare) -> None:
                 account_id="699d98642c564d2e855e9661899b7252",
             )
 
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        route = client.zero_trust.networks.routes.get(
+            route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Route, route, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.networks.routes.with_raw_response.get(
+            route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        route = response.parse()
+        assert_matches_type(Route, route, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.networks.routes.with_streaming_response.get(
+            route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            route = response.parse()
+            assert_matches_type(Route, route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.networks.routes.with_raw_response.get(
+                route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `route_id` but received ''"):
+            client.zero_trust.networks.routes.with_raw_response.get(
+                route_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
 
 class TestAsyncRoutes:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -316,14 +365,14 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
         route = await async_client.zero_trust.networks.routes.list(
             account_id="699d98642c564d2e855e9661899b7252",
             comment="Example comment for this route.",
-            existed_at=parse_datetime("2019-10-12T07:20:50.52Z"),
+            existed_at="2019-10-12T07%3A20%3A50.52Z",
             is_deleted=True,
             network_subset="172.16.0.0/16",
             network_superset="172.16.0.0/16",
             page=1,
             per_page=1,
             route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            tun_types="cfd_tunnel,warp_connector",
+            tun_types=["cfd_tunnel"],
             tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
             virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
         )
@@ -467,3 +516,51 @@ async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
                 route_id="",
                 account_id="699d98642c564d2e855e9661899b7252",
             )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        route = await async_client.zero_trust.networks.routes.get(
+            route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(Route, route, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.networks.routes.with_raw_response.get(
+            route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        route = await response.parse()
+        assert_matches_type(Route, route, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.networks.routes.with_streaming_response.get(
+            route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            route = await response.parse()
+            assert_matches_type(Route, route, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.networks.routes.with_raw_response.get(
+                route_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `route_id` but received ''"):
+            await async_client.zero_trust.networks.routes.with_raw_response.get(
+                route_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
diff --git a/tests/api_resources/zero_trust/networks/test_subnets.py b/tests/api_resources/zero_trust/networks/test_subnets.py
new file mode 100644
index 00000000000..e8d64025ff2
--- /dev/null
+++ b/tests/api_resources/zero_trust/networks/test_subnets.py
@@ -0,0 +1,137 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.zero_trust.networks import SubnetListResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestSubnets:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        subnet = client.zero_trust.networks.subnets.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[SubnetListResponse], subnet, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        subnet = client.zero_trust.networks.subnets.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+            address_family="v4",
+            comment="example%20comment",
+            existed_at="2019-10-12T07%3A20%3A50.52Z",
+            is_default_network=True,
+            is_deleted=True,
+            name="IPv4%20Cloudflare%20Source%20IPs",
+            network="172.16.0.0%2F16",
+            page=1,
+            per_page=1,
+            sort_order="asc",
+            subnet_types="cloudflare_source",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[SubnetListResponse], subnet, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.networks.subnets.with_raw_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subnet = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[SubnetListResponse], subnet, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.networks.subnets.with_streaming_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subnet = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[SubnetListResponse], subnet, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.networks.subnets.with_raw_response.list(
+                account_id="",
+            )
+
+
+class TestAsyncSubnets:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        subnet = await async_client.zero_trust.networks.subnets.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[SubnetListResponse], subnet, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        subnet = await async_client.zero_trust.networks.subnets.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+            address_family="v4",
+            comment="example%20comment",
+            existed_at="2019-10-12T07%3A20%3A50.52Z",
+            is_default_network=True,
+            is_deleted=True,
+            name="IPv4%20Cloudflare%20Source%20IPs",
+            network="172.16.0.0%2F16",
+            page=1,
+            per_page=1,
+            sort_order="asc",
+            subnet_types="cloudflare_source",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[SubnetListResponse], subnet, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.networks.subnets.with_raw_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        subnet = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[SubnetListResponse], subnet, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.networks.subnets.with_streaming_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            subnet = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[SubnetListResponse], subnet, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.networks.subnets.with_raw_response.list(
+                account_id="",
+            )
diff --git a/tests/api_resources/zero_trust/networks/test_virtual_networks.py b/tests/api_resources/zero_trust/networks/test_virtual_networks.py
index 14297d4757a..06e5394ca1d 100644
--- a/tests/api_resources/zero_trust/networks/test_virtual_networks.py
+++ b/tests/api_resources/zero_trust/networks/test_virtual_networks.py
@@ -12,9 +12,6 @@
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.zero_trust.networks import (
     VirtualNetwork,
-    VirtualNetworkEditResponse,
-    VirtualNetworkCreateResponse,
-    VirtualNetworkDeleteResponse,
 )
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -29,7 +26,7 @@ def test_method_create(self, client: Cloudflare) -> None:
             account_id="699d98642c564d2e855e9661899b7252",
             name="us-east-1-vpc",
         )
-        assert_matches_type(VirtualNetworkCreateResponse, virtual_network, path=["response"])
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
@@ -38,8 +35,9 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             name="us-east-1-vpc",
             comment="Staging VPC for data science",
             is_default=True,
+            is_default_network=False,
         )
-        assert_matches_type(VirtualNetworkCreateResponse, virtual_network, path=["response"])
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
@@ -51,7 +49,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         virtual_network = response.parse()
-        assert_matches_type(VirtualNetworkCreateResponse, virtual_network, path=["response"])
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
@@ -63,7 +61,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             virtual_network = response.parse()
-            assert_matches_type(VirtualNetworkCreateResponse, virtual_network, path=["response"])
+            assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -88,6 +86,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
             account_id="699d98642c564d2e855e9661899b7252",
             id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
             is_default=True,
+            is_default_network=True,
             is_deleted=True,
             name="us-east-1-vpc",
         )
@@ -130,7 +129,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
             virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(VirtualNetworkDeleteResponse, virtual_network, path=["response"])
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -142,7 +141,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         virtual_network = response.parse()
-        assert_matches_type(VirtualNetworkDeleteResponse, virtual_network, path=["response"])
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -154,7 +153,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             virtual_network = response.parse()
-            assert_matches_type(VirtualNetworkDeleteResponse, virtual_network, path=["response"])
+            assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -178,7 +177,7 @@ def test_method_edit(self, client: Cloudflare) -> None:
             virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(VirtualNetworkEditResponse, virtual_network, path=["response"])
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
     @parametrize
     def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
@@ -186,10 +185,10 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
             virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
             account_id="699d98642c564d2e855e9661899b7252",
             comment="Staging VPC for data science",
-            is_default_network=True,
+            is_default_network=False,
             name="us-east-1-vpc",
         )
-        assert_matches_type(VirtualNetworkEditResponse, virtual_network, path=["response"])
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
     @parametrize
     def test_raw_response_edit(self, client: Cloudflare) -> None:
@@ -201,7 +200,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         virtual_network = response.parse()
-        assert_matches_type(VirtualNetworkEditResponse, virtual_network, path=["response"])
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
     @parametrize
     def test_streaming_response_edit(self, client: Cloudflare) -> None:
@@ -213,7 +212,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             virtual_network = response.parse()
-            assert_matches_type(VirtualNetworkEditResponse, virtual_network, path=["response"])
+            assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -231,9 +230,59 @@ def test_path_params_edit(self, client: Cloudflare) -> None:
                 account_id="699d98642c564d2e855e9661899b7252",
             )
 
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        virtual_network = client.zero_trust.networks.virtual_networks.get(
+            virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.networks.virtual_networks.with_raw_response.get(
+            virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        virtual_network = response.parse()
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.networks.virtual_networks.with_streaming_response.get(
+            virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            virtual_network = response.parse()
+            assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.networks.virtual_networks.with_raw_response.get(
+                virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `virtual_network_id` but received ''"):
+            client.zero_trust.networks.virtual_networks.with_raw_response.get(
+                virtual_network_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
 
 class TestAsyncVirtualNetworks:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -241,7 +290,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
             account_id="699d98642c564d2e855e9661899b7252",
             name="us-east-1-vpc",
         )
-        assert_matches_type(VirtualNetworkCreateResponse, virtual_network, path=["response"])
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -250,8 +299,9 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             name="us-east-1-vpc",
             comment="Staging VPC for data science",
             is_default=True,
+            is_default_network=False,
         )
-        assert_matches_type(VirtualNetworkCreateResponse, virtual_network, path=["response"])
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
@@ -263,7 +313,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         virtual_network = await response.parse()
-        assert_matches_type(VirtualNetworkCreateResponse, virtual_network, path=["response"])
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
@@ -275,7 +325,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             virtual_network = await response.parse()
-            assert_matches_type(VirtualNetworkCreateResponse, virtual_network, path=["response"])
+            assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -300,6 +350,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
             account_id="699d98642c564d2e855e9661899b7252",
             id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
             is_default=True,
+            is_default_network=True,
             is_deleted=True,
             name="us-east-1-vpc",
         )
@@ -342,7 +393,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
             virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(VirtualNetworkDeleteResponse, virtual_network, path=["response"])
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -354,7 +405,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         virtual_network = await response.parse()
-        assert_matches_type(VirtualNetworkDeleteResponse, virtual_network, path=["response"])
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -366,7 +417,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             virtual_network = await response.parse()
-            assert_matches_type(VirtualNetworkDeleteResponse, virtual_network, path=["response"])
+            assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -390,7 +441,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
             virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
             account_id="699d98642c564d2e855e9661899b7252",
         )
-        assert_matches_type(VirtualNetworkEditResponse, virtual_network, path=["response"])
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
     @parametrize
     async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -398,10 +449,10 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare)
             virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
             account_id="699d98642c564d2e855e9661899b7252",
             comment="Staging VPC for data science",
-            is_default_network=True,
+            is_default_network=False,
             name="us-east-1-vpc",
         )
-        assert_matches_type(VirtualNetworkEditResponse, virtual_network, path=["response"])
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
     @parametrize
     async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -413,7 +464,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         virtual_network = await response.parse()
-        assert_matches_type(VirtualNetworkEditResponse, virtual_network, path=["response"])
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
     @parametrize
     async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
@@ -425,7 +476,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             virtual_network = await response.parse()
-            assert_matches_type(VirtualNetworkEditResponse, virtual_network, path=["response"])
+            assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -442,3 +493,51 @@ async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
                 virtual_network_id="",
                 account_id="699d98642c564d2e855e9661899b7252",
             )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        virtual_network = await async_client.zero_trust.networks.virtual_networks.get(
+            virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.networks.virtual_networks.with_raw_response.get(
+            virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        virtual_network = await response.parse()
+        assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.networks.virtual_networks.with_streaming_response.get(
+            virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            virtual_network = await response.parse()
+            assert_matches_type(VirtualNetwork, virtual_network, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.networks.virtual_networks.with_raw_response.get(
+                virtual_network_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `virtual_network_id` but received ''"):
+            await async_client.zero_trust.networks.virtual_networks.with_raw_response.get(
+                virtual_network_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
diff --git a/tests/api_resources/zero_trust/organizations/__init__.py b/tests/api_resources/zero_trust/organizations/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/organizations/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/organizations/test_doh.py b/tests/api_resources/zero_trust/organizations/test_doh.py
new file mode 100644
index 00000000000..49e33e57776
--- /dev/null
+++ b/tests/api_resources/zero_trust/organizations/test_doh.py
@@ -0,0 +1,194 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zero_trust.organizations import DOHGetResponse, DOHUpdateResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestDOH:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        doh = client.zero_trust.organizations.doh.update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[DOHUpdateResponse], doh, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        doh = client.zero_trust.organizations.doh.update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            doh_jwt_duration="800h",
+            service_token_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        )
+        assert_matches_type(Optional[DOHUpdateResponse], doh, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zero_trust.organizations.doh.with_raw_response.update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        doh = response.parse()
+        assert_matches_type(Optional[DOHUpdateResponse], doh, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zero_trust.organizations.doh.with_streaming_response.update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            doh = response.parse()
+            assert_matches_type(Optional[DOHUpdateResponse], doh, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.organizations.doh.with_raw_response.update(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        doh = client.zero_trust.organizations.doh.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[DOHGetResponse], doh, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.organizations.doh.with_raw_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        doh = response.parse()
+        assert_matches_type(Optional[DOHGetResponse], doh, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.organizations.doh.with_streaming_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            doh = response.parse()
+            assert_matches_type(Optional[DOHGetResponse], doh, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.organizations.doh.with_raw_response.get(
+                account_id="",
+            )
+
+
+class TestAsyncDOH:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        doh = await async_client.zero_trust.organizations.doh.update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[DOHUpdateResponse], doh, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        doh = await async_client.zero_trust.organizations.doh.update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            doh_jwt_duration="800h",
+            service_token_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+        )
+        assert_matches_type(Optional[DOHUpdateResponse], doh, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.organizations.doh.with_raw_response.update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        doh = await response.parse()
+        assert_matches_type(Optional[DOHUpdateResponse], doh, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.organizations.doh.with_streaming_response.update(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            doh = await response.parse()
+            assert_matches_type(Optional[DOHUpdateResponse], doh, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.organizations.doh.with_raw_response.update(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        doh = await async_client.zero_trust.organizations.doh.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[DOHGetResponse], doh, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.organizations.doh.with_raw_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        doh = await response.parse()
+        assert_matches_type(Optional[DOHGetResponse], doh, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.organizations.doh.with_streaming_response.get(
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            doh = await response.parse()
+            assert_matches_type(Optional[DOHGetResponse], doh, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.organizations.doh.with_raw_response.get(
+                account_id="",
+            )
diff --git a/tests/api_resources/zero_trust/risk_scoring/integrations/test_references.py b/tests/api_resources/zero_trust/risk_scoring/integrations/test_references.py
index 3e0087721b2..84ee250e1d7 100644
--- a/tests/api_resources/zero_trust/risk_scoring/integrations/test_references.py
+++ b/tests/api_resources/zero_trust/risk_scoring/integrations/test_references.py
@@ -67,7 +67,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncReferences:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/zero_trust/risk_scoring/test_behaviours.py b/tests/api_resources/zero_trust/risk_scoring/test_behaviours.py
index fdc54e04cdd..3c6ca23a906 100644
--- a/tests/api_resources/zero_trust/risk_scoring/test_behaviours.py
+++ b/tests/api_resources/zero_trust/risk_scoring/test_behaviours.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
@@ -23,14 +23,7 @@ class TestBehaviours:
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
         behaviour = client.zero_trust.risk_scoring.behaviours.update(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(BehaviourUpdateResponse, behaviour, path=["response"])
-
-    @parametrize
-    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        behaviour = client.zero_trust.risk_scoring.behaviours.update(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
             behaviors={
                 "foo": {
                     "enabled": True,
@@ -38,92 +31,105 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                 }
             },
         )
-        assert_matches_type(BehaviourUpdateResponse, behaviour, path=["response"])
+        assert_matches_type(Optional[BehaviourUpdateResponse], behaviour, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
         response = client.zero_trust.risk_scoring.behaviours.with_raw_response.update(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+            behaviors={
+                "foo": {
+                    "enabled": True,
+                    "risk_level": "low",
+                }
+            },
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         behaviour = response.parse()
-        assert_matches_type(BehaviourUpdateResponse, behaviour, path=["response"])
+        assert_matches_type(Optional[BehaviourUpdateResponse], behaviour, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
         with client.zero_trust.risk_scoring.behaviours.with_streaming_response.update(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+            behaviors={
+                "foo": {
+                    "enabled": True,
+                    "risk_level": "low",
+                }
+            },
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             behaviour = response.parse()
-            assert_matches_type(BehaviourUpdateResponse, behaviour, path=["response"])
+            assert_matches_type(Optional[BehaviourUpdateResponse], behaviour, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.risk_scoring.behaviours.with_raw_response.update(
-                account_identifier="",
+                account_id="",
+                behaviors={
+                    "foo": {
+                        "enabled": True,
+                        "risk_level": "low",
+                    }
+                },
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         behaviour = client.zero_trust.risk_scoring.behaviours.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         )
-        assert_matches_type(BehaviourGetResponse, behaviour, path=["response"])
+        assert_matches_type(Optional[BehaviourGetResponse], behaviour, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.zero_trust.risk_scoring.behaviours.with_raw_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         behaviour = response.parse()
-        assert_matches_type(BehaviourGetResponse, behaviour, path=["response"])
+        assert_matches_type(Optional[BehaviourGetResponse], behaviour, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.zero_trust.risk_scoring.behaviours.with_streaming_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             behaviour = response.parse()
-            assert_matches_type(BehaviourGetResponse, behaviour, path=["response"])
+            assert_matches_type(Optional[BehaviourGetResponse], behaviour, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.risk_scoring.behaviours.with_raw_response.get(
-                "",
+                account_id="",
             )
 
 
 class TestAsyncBehaviours:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
         behaviour = await async_client.zero_trust.risk_scoring.behaviours.update(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(BehaviourUpdateResponse, behaviour, path=["response"])
-
-    @parametrize
-    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        behaviour = await async_client.zero_trust.risk_scoring.behaviours.update(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
             behaviors={
                 "foo": {
                     "enabled": True,
@@ -131,73 +137,91 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                 }
             },
         )
-        assert_matches_type(BehaviourUpdateResponse, behaviour, path=["response"])
+        assert_matches_type(Optional[BehaviourUpdateResponse], behaviour, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.risk_scoring.behaviours.with_raw_response.update(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+            behaviors={
+                "foo": {
+                    "enabled": True,
+                    "risk_level": "low",
+                }
+            },
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         behaviour = await response.parse()
-        assert_matches_type(BehaviourUpdateResponse, behaviour, path=["response"])
+        assert_matches_type(Optional[BehaviourUpdateResponse], behaviour, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.risk_scoring.behaviours.with_streaming_response.update(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
+            behaviors={
+                "foo": {
+                    "enabled": True,
+                    "risk_level": "low",
+                }
+            },
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             behaviour = await response.parse()
-            assert_matches_type(BehaviourUpdateResponse, behaviour, path=["response"])
+            assert_matches_type(Optional[BehaviourUpdateResponse], behaviour, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.risk_scoring.behaviours.with_raw_response.update(
-                account_identifier="",
+                account_id="",
+                behaviors={
+                    "foo": {
+                        "enabled": True,
+                        "risk_level": "low",
+                    }
+                },
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         behaviour = await async_client.zero_trust.risk_scoring.behaviours.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         )
-        assert_matches_type(BehaviourGetResponse, behaviour, path=["response"])
+        assert_matches_type(Optional[BehaviourGetResponse], behaviour, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.risk_scoring.behaviours.with_raw_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         behaviour = await response.parse()
-        assert_matches_type(BehaviourGetResponse, behaviour, path=["response"])
+        assert_matches_type(Optional[BehaviourGetResponse], behaviour, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.risk_scoring.behaviours.with_streaming_response.get(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             behaviour = await response.parse()
-            assert_matches_type(BehaviourGetResponse, behaviour, path=["response"])
+            assert_matches_type(Optional[BehaviourGetResponse], behaviour, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.risk_scoring.behaviours.with_raw_response.get(
-                "",
+                account_id="",
             )
diff --git a/tests/api_resources/zero_trust/risk_scoring/test_integrations.py b/tests/api_resources/zero_trust/risk_scoring/test_integrations.py
index 5ec6ae4e5ba..0584e0e27df 100644
--- a/tests/api_resources/zero_trust/risk_scoring/test_integrations.py
+++ b/tests/api_resources/zero_trust/risk_scoring/test_integrations.py
@@ -288,7 +288,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncIntegrations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/zero_trust/risk_scoring/test_summary.py b/tests/api_resources/zero_trust/risk_scoring/test_summary.py
index 3ac6e4d59a1..b4ca1529021 100644
--- a/tests/api_resources/zero_trust/risk_scoring/test_summary.py
+++ b/tests/api_resources/zero_trust/risk_scoring/test_summary.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
@@ -20,101 +20,81 @@ class TestSummary:
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         summary = client.zero_trust.risk_scoring.summary.get(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         )
-        assert_matches_type(SummaryGetResponse, summary, path=["response"])
-
-    @parametrize
-    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
-        summary = client.zero_trust.risk_scoring.summary.get(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            direction="desc",
-            order_by="timestamp",
-            page=0,
-            per_page=0,
-        )
-        assert_matches_type(SummaryGetResponse, summary, path=["response"])
+        assert_matches_type(Optional[SummaryGetResponse], summary, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.zero_trust.risk_scoring.summary.with_raw_response.get(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         summary = response.parse()
-        assert_matches_type(SummaryGetResponse, summary, path=["response"])
+        assert_matches_type(Optional[SummaryGetResponse], summary, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.zero_trust.risk_scoring.summary.with_streaming_response.get(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             summary = response.parse()
-            assert_matches_type(SummaryGetResponse, summary, path=["response"])
+            assert_matches_type(Optional[SummaryGetResponse], summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.risk_scoring.summary.with_raw_response.get(
-                account_identifier="",
+                account_id="",
             )
 
 
 class TestAsyncSummary:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         summary = await async_client.zero_trust.risk_scoring.summary.get(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(SummaryGetResponse, summary, path=["response"])
-
-    @parametrize
-    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        summary = await async_client.zero_trust.risk_scoring.summary.get(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            direction="desc",
-            order_by="timestamp",
-            page=0,
-            per_page=0,
+            account_id="account_id",
         )
-        assert_matches_type(SummaryGetResponse, summary, path=["response"])
+        assert_matches_type(Optional[SummaryGetResponse], summary, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.risk_scoring.summary.with_raw_response.get(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         summary = await response.parse()
-        assert_matches_type(SummaryGetResponse, summary, path=["response"])
+        assert_matches_type(Optional[SummaryGetResponse], summary, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.risk_scoring.summary.with_streaming_response.get(
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             summary = await response.parse()
-            assert_matches_type(SummaryGetResponse, summary, path=["response"])
+            assert_matches_type(Optional[SummaryGetResponse], summary, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.risk_scoring.summary.with_raw_response.get(
-                account_identifier="",
+                account_id="",
             )
diff --git a/tests/api_resources/zero_trust/test_connectivity_settings.py b/tests/api_resources/zero_trust/test_connectivity_settings.py
index 310f4319091..15836a2f91c 100644
--- a/tests/api_resources/zero_trust/test_connectivity_settings.py
+++ b/tests/api_resources/zero_trust/test_connectivity_settings.py
@@ -107,7 +107,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncConnectivitySettings:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/zero_trust/test_devices.py b/tests/api_resources/zero_trust/test_devices.py
index f814c7c80bc..fa02515657c 100644
--- a/tests/api_resources/zero_trust/test_devices.py
+++ b/tests/api_resources/zero_trust/test_devices.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
@@ -12,6 +12,8 @@
 from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.zero_trust import Device, DeviceGetResponse
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -20,16 +22,19 @@ class TestDevices:
 
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
-        device = client.zero_trust.devices.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            device = client.zero_trust.devices.list(
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
         assert_matches_type(SyncSinglePage[Device], device, path=["response"])
 
     @parametrize
     def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.with_raw_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.zero_trust.devices.with_raw_response.list(
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -38,88 +43,100 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.with_streaming_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.zero_trust.devices.with_streaming_response.list(
+                account_id="699d98642c564d2e855e9661899b7252",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            device = response.parse()
-            assert_matches_type(SyncSinglePage[Device], device, path=["response"])
+                device = response.parse()
+                assert_matches_type(SyncSinglePage[Device], device, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.with_raw_response.list(
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.zero_trust.devices.with_raw_response.list(
+                    account_id="",
+                )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        device = client.zero_trust.devices.get(
-            device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(DeviceGetResponse, device, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            device = client.zero_trust.devices.get(
+                device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+        assert_matches_type(Optional[DeviceGetResponse], device, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.zero_trust.devices.with_raw_response.get(
-            device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.zero_trust.devices.with_raw_response.get(
+                device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         device = response.parse()
-        assert_matches_type(DeviceGetResponse, device, path=["response"])
+        assert_matches_type(Optional[DeviceGetResponse], device, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.zero_trust.devices.with_streaming_response.get(
-            device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.zero_trust.devices.with_streaming_response.get(
+                device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            device = response.parse()
-            assert_matches_type(DeviceGetResponse, device, path=["response"])
+                device = response.parse()
+                assert_matches_type(Optional[DeviceGetResponse], device, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.devices.with_raw_response.get(
-                device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                client.zero_trust.devices.with_raw_response.get(
+                    device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    account_id="",
+                )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `device_id` but received ''"):
-            client.zero_trust.devices.with_raw_response.get(
-                device_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `device_id` but received ''"):
+                client.zero_trust.devices.with_raw_response.get(
+                    device_id="",
+                    account_id="699d98642c564d2e855e9661899b7252",
+                )
 
 
 class TestAsyncDevices:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        device = await async_client.zero_trust.devices.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            device = await async_client.zero_trust.devices.list(
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
         assert_matches_type(AsyncSinglePage[Device], device, path=["response"])
 
     @parametrize
     async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.with_raw_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.zero_trust.devices.with_raw_response.list(
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -128,68 +145,75 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.with_streaming_response.list(
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.zero_trust.devices.with_streaming_response.list(
+                account_id="699d98642c564d2e855e9661899b7252",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            device = await response.parse()
-            assert_matches_type(AsyncSinglePage[Device], device, path=["response"])
+                device = await response.parse()
+                assert_matches_type(AsyncSinglePage[Device], device, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.with_raw_response.list(
-                account_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.zero_trust.devices.with_raw_response.list(
+                    account_id="",
+                )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        device = await async_client.zero_trust.devices.get(
-            device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(DeviceGetResponse, device, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            device = await async_client.zero_trust.devices.get(
+                device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+        assert_matches_type(Optional[DeviceGetResponse], device, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.devices.with_raw_response.get(
-            device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.zero_trust.devices.with_raw_response.get(
+                device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         device = await response.parse()
-        assert_matches_type(DeviceGetResponse, device, path=["response"])
+        assert_matches_type(Optional[DeviceGetResponse], device, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.devices.with_streaming_response.get(
-            device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.zero_trust.devices.with_streaming_response.get(
+                device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                account_id="699d98642c564d2e855e9661899b7252",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            device = await response.parse()
-            assert_matches_type(DeviceGetResponse, device, path=["response"])
+                device = await response.parse()
+                assert_matches_type(Optional[DeviceGetResponse], device, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.devices.with_raw_response.get(
-                device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `device_id` but received ''"):
-            await async_client.zero_trust.devices.with_raw_response.get(
-                device_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+                await async_client.zero_trust.devices.with_raw_response.get(
+                    device_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
+                    account_id="",
+                )
+
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `device_id` but received ''"):
+                await async_client.zero_trust.devices.with_raw_response.get(
+                    device_id="",
+                    account_id="699d98642c564d2e855e9661899b7252",
+                )
diff --git a/tests/api_resources/zero_trust/test_gateway.py b/tests/api_resources/zero_trust/test_gateway.py
index 4f68a4f6c2c..c796464f9e9 100644
--- a/tests/api_resources/zero_trust/test_gateway.py
+++ b/tests/api_resources/zero_trust/test_gateway.py
@@ -95,7 +95,9 @@ def test_path_params_list(self, client: Cloudflare) -> None:
 
 
 class TestAsyncGateway:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/zero_trust/test_identity_providers.py b/tests/api_resources/zero_trust/test_identity_providers.py
index c31274cd210..fc3bc699a93 100644
--- a/tests/api_resources/zero_trust/test_identity_providers.py
+++ b/tests/api_resources/zero_trust/test_identity_providers.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from cloudflare.types.zero_trust import (
     IdentityProvider,
     IdentityProviderListResponse,
@@ -38,24 +38,22 @@ def test_method_create_overload_1(self, client: Cloudflare) -> None:
     def test_method_create_with_all_params_overload_1(self, client: Cloudflare) -> None:
         identity_provider = client.zero_trust.identity_providers.create(
             config={
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
-                "email_claim_name": "custom_claim_name",
                 "conditional_access_enabled": True,
                 "directory_id": "<your azure directory uuid>",
+                "email_claim_name": "custom_claim_name",
                 "prompt": "login",
                 "support_groups": True,
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -96,7 +94,7 @@ def test_streaming_response_create_overload_1(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -104,7 +102,7 @@ def test_path_params_create_overload_1(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -128,22 +126,20 @@ def test_method_create_overload_2(self, client: Cloudflare) -> None:
     def test_method_create_with_all_params_overload_2(self, client: Cloudflare) -> None:
         identity_provider = client.zero_trust.identity_providers.create(
             config={
+                "centrify_account": "https://abc123.my.centrify.com/",
+                "centrify_app_id": "exampleapp",
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
-                "centrify_account": "https://abc123.my.centrify.com/",
-                "centrify_app_id": "exampleapp",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -184,7 +180,7 @@ def test_streaming_response_create_overload_2(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -192,7 +188,7 @@ def test_path_params_create_overload_2(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -222,12 +218,10 @@ def test_method_create_with_all_params_overload_3(self, client: Cloudflare) -> N
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -268,7 +262,7 @@ def test_streaming_response_create_overload_3(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_3(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -276,7 +270,7 @@ def test_path_params_create_overload_3(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -306,12 +300,10 @@ def test_method_create_with_all_params_overload_4(self, client: Cloudflare) -> N
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -352,7 +344,7 @@ def test_streaming_response_create_overload_4(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_4(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -360,7 +352,7 @@ def test_path_params_create_overload_4(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -384,20 +376,18 @@ def test_method_create_overload_5(self, client: Cloudflare) -> None:
     def test_method_create_with_all_params_overload_5(self, client: Cloudflare) -> None:
         identity_provider = client.zero_trust.identity_providers.create(
             config={
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -438,7 +428,7 @@ def test_streaming_response_create_overload_5(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_5(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -446,7 +436,7 @@ def test_path_params_create_overload_5(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -470,21 +460,19 @@ def test_method_create_overload_6(self, client: Cloudflare) -> None:
     def test_method_create_with_all_params_overload_6(self, client: Cloudflare) -> None:
         identity_provider = client.zero_trust.identity_providers.create(
             config={
+                "apps_domain": "mycompany.com",
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
-                "apps_domain": "mycompany.com",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -525,7 +513,7 @@ def test_streaming_response_create_overload_6(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_6(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -533,7 +521,7 @@ def test_path_params_create_overload_6(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -563,12 +551,10 @@ def test_method_create_with_all_params_overload_7(self, client: Cloudflare) -> N
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -609,7 +595,7 @@ def test_streaming_response_create_overload_7(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_7(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -617,7 +603,7 @@ def test_path_params_create_overload_7(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -641,24 +627,23 @@ def test_method_create_overload_8(self, client: Cloudflare) -> None:
     def test_method_create_with_all_params_overload_8(self, client: Cloudflare) -> None:
         identity_provider = client.zero_trust.identity_providers.create(
             config={
+                "auth_url": "https://accounts.google.com/o/oauth2/auth",
+                "certs_url": "https://www.googleapis.com/oauth2/v3/certs",
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
-                "auth_url": "https://accounts.google.com/o/oauth2/auth",
-                "certs_url": "https://www.googleapis.com/oauth2/v3/certs",
+                "pkce_enabled": True,
                 "scopes": ["openid", "email", "profile"],
                 "token_url": "https://accounts.google.com/o/oauth2/token",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -699,7 +684,7 @@ def test_streaming_response_create_overload_8(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_8(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -707,7 +692,7 @@ def test_path_params_create_overload_8(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -731,22 +716,20 @@ def test_method_create_overload_9(self, client: Cloudflare) -> None:
     def test_method_create_with_all_params_overload_9(self, client: Cloudflare) -> None:
         identity_provider = client.zero_trust.identity_providers.create(
             config={
+                "authorization_server_id": "aus9o8wzkhckw9TLa0h7z",
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
-                "authorization_server_id": "aus9o8wzkhckw9TLa0h7z",
                 "okta_account": "https://dev-abc123.oktapreview.com",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -787,7 +770,7 @@ def test_streaming_response_create_overload_9(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_9(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -795,7 +778,7 @@ def test_path_params_create_overload_9(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -819,21 +802,19 @@ def test_method_create_overload_10(self, client: Cloudflare) -> None:
     def test_method_create_with_all_params_overload_10(self, client: Cloudflare) -> None:
         identity_provider = client.zero_trust.identity_providers.create(
             config={
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
                 "onelogin_account": "https://mycompany.onelogin.com",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -874,7 +855,7 @@ def test_streaming_response_create_overload_10(self, client: Cloudflare) -> None
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_10(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -882,7 +863,7 @@ def test_path_params_create_overload_10(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -906,21 +887,19 @@ def test_method_create_overload_11(self, client: Cloudflare) -> None:
     def test_method_create_with_all_params_overload_11(self, client: Cloudflare) -> None:
         identity_provider = client.zero_trust.identity_providers.create(
             config={
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
                 "ping_env_id": "342b5660-0c32-4936-a5a4-ce21fae57b0a",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -961,7 +940,7 @@ def test_streaming_response_create_overload_11(self, client: Cloudflare) -> None
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_11(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -969,7 +948,7 @@ def test_path_params_create_overload_11(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -999,17 +978,9 @@ def test_method_create_with_all_params_overload_12(self, client: Cloudflare) ->
                     {
                         "attribute_name": "attribute_name",
                         "header_name": "header_name",
-                    },
-                    {
-                        "attribute_name": "attribute_name",
-                        "header_name": "header_name",
-                    },
-                    {
-                        "attribute_name": "attribute_name",
-                        "header_name": "header_name",
-                    },
+                    }
                 ],
-                "idp_public_certs": ["string", "string", "string"],
+                "idp_public_certs": ["string"],
                 "issuer_url": "https://whoami.com",
                 "sign_request": True,
                 "sso_target_url": "https://edgeaccess.org/idp/saml/login",
@@ -1017,12 +988,10 @@ def test_method_create_with_all_params_overload_12(self, client: Cloudflare) ->
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -1063,7 +1032,7 @@ def test_streaming_response_create_overload_12(self, client: Cloudflare) -> None
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_12(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -1071,7 +1040,7 @@ def test_path_params_create_overload_12(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -1101,12 +1070,10 @@ def test_method_create_with_all_params_overload_13(self, client: Cloudflare) ->
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -1147,7 +1114,7 @@ def test_streaming_response_create_overload_13(self, client: Cloudflare) -> None
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_13(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -1155,7 +1122,7 @@ def test_path_params_create_overload_13(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -1182,12 +1149,10 @@ def test_method_create_with_all_params_overload_14(self, client: Cloudflare) ->
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -1228,7 +1193,7 @@ def test_streaming_response_create_overload_14(self, client: Cloudflare) -> None
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create_overload_14(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -1236,7 +1201,7 @@ def test_path_params_create_overload_14(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -1262,24 +1227,22 @@ def test_method_update_with_all_params_overload_1(self, client: Cloudflare) -> N
         identity_provider = client.zero_trust.identity_providers.update(
             identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             config={
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
-                "email_claim_name": "custom_claim_name",
                 "conditional_access_enabled": True,
                 "directory_id": "<your azure directory uuid>",
+                "email_claim_name": "custom_claim_name",
                 "prompt": "login",
                 "support_groups": True,
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -1331,7 +1294,7 @@ def test_path_params_update_overload_1(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -1340,7 +1303,7 @@ def test_path_params_update_overload_1(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -1367,22 +1330,20 @@ def test_method_update_with_all_params_overload_2(self, client: Cloudflare) -> N
         identity_provider = client.zero_trust.identity_providers.update(
             identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             config={
+                "centrify_account": "https://abc123.my.centrify.com/",
+                "centrify_app_id": "exampleapp",
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
-                "centrify_account": "https://abc123.my.centrify.com/",
-                "centrify_app_id": "exampleapp",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -1434,7 +1395,7 @@ def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -1443,7 +1404,7 @@ def test_path_params_update_overload_2(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -1476,12 +1437,10 @@ def test_method_update_with_all_params_overload_3(self, client: Cloudflare) -> N
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -1533,7 +1492,7 @@ def test_path_params_update_overload_3(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -1542,7 +1501,7 @@ def test_path_params_update_overload_3(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -1575,12 +1534,10 @@ def test_method_update_with_all_params_overload_4(self, client: Cloudflare) -> N
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -1632,7 +1589,7 @@ def test_path_params_update_overload_4(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -1641,7 +1598,7 @@ def test_path_params_update_overload_4(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -1668,20 +1625,18 @@ def test_method_update_with_all_params_overload_5(self, client: Cloudflare) -> N
         identity_provider = client.zero_trust.identity_providers.update(
             identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             config={
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -1733,7 +1688,7 @@ def test_path_params_update_overload_5(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -1742,7 +1697,7 @@ def test_path_params_update_overload_5(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -1769,21 +1724,19 @@ def test_method_update_with_all_params_overload_6(self, client: Cloudflare) -> N
         identity_provider = client.zero_trust.identity_providers.update(
             identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             config={
+                "apps_domain": "mycompany.com",
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
-                "apps_domain": "mycompany.com",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -1835,7 +1788,7 @@ def test_path_params_update_overload_6(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -1844,7 +1797,7 @@ def test_path_params_update_overload_6(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -1877,12 +1830,10 @@ def test_method_update_with_all_params_overload_7(self, client: Cloudflare) -> N
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -1934,7 +1885,7 @@ def test_path_params_update_overload_7(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -1943,7 +1894,7 @@ def test_path_params_update_overload_7(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -1970,24 +1921,23 @@ def test_method_update_with_all_params_overload_8(self, client: Cloudflare) -> N
         identity_provider = client.zero_trust.identity_providers.update(
             identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             config={
+                "auth_url": "https://accounts.google.com/o/oauth2/auth",
+                "certs_url": "https://www.googleapis.com/oauth2/v3/certs",
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
-                "auth_url": "https://accounts.google.com/o/oauth2/auth",
-                "certs_url": "https://www.googleapis.com/oauth2/v3/certs",
+                "pkce_enabled": True,
                 "scopes": ["openid", "email", "profile"],
                 "token_url": "https://accounts.google.com/o/oauth2/token",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -2039,7 +1989,7 @@ def test_path_params_update_overload_8(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -2048,7 +1998,7 @@ def test_path_params_update_overload_8(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -2075,22 +2025,20 @@ def test_method_update_with_all_params_overload_9(self, client: Cloudflare) -> N
         identity_provider = client.zero_trust.identity_providers.update(
             identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             config={
+                "authorization_server_id": "aus9o8wzkhckw9TLa0h7z",
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
-                "authorization_server_id": "aus9o8wzkhckw9TLa0h7z",
                 "okta_account": "https://dev-abc123.oktapreview.com",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -2142,7 +2090,7 @@ def test_path_params_update_overload_9(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -2151,7 +2099,7 @@ def test_path_params_update_overload_9(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -2178,21 +2126,19 @@ def test_method_update_with_all_params_overload_10(self, client: Cloudflare) ->
         identity_provider = client.zero_trust.identity_providers.update(
             identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             config={
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
                 "onelogin_account": "https://mycompany.onelogin.com",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -2244,7 +2190,7 @@ def test_path_params_update_overload_10(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -2253,7 +2199,7 @@ def test_path_params_update_overload_10(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -2280,21 +2226,19 @@ def test_method_update_with_all_params_overload_11(self, client: Cloudflare) ->
         identity_provider = client.zero_trust.identity_providers.update(
             identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             config={
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
                 "ping_env_id": "342b5660-0c32-4936-a5a4-ce21fae57b0a",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -2346,7 +2290,7 @@ def test_path_params_update_overload_11(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -2355,7 +2299,7 @@ def test_path_params_update_overload_11(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -2388,17 +2332,9 @@ def test_method_update_with_all_params_overload_12(self, client: Cloudflare) ->
                     {
                         "attribute_name": "attribute_name",
                         "header_name": "header_name",
-                    },
-                    {
-                        "attribute_name": "attribute_name",
-                        "header_name": "header_name",
-                    },
-                    {
-                        "attribute_name": "attribute_name",
-                        "header_name": "header_name",
-                    },
+                    }
                 ],
-                "idp_public_certs": ["string", "string", "string"],
+                "idp_public_certs": ["string"],
                 "issuer_url": "https://whoami.com",
                 "sign_request": True,
                 "sso_target_url": "https://edgeaccess.org/idp/saml/login",
@@ -2406,12 +2342,10 @@ def test_method_update_with_all_params_overload_12(self, client: Cloudflare) ->
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -2463,7 +2397,7 @@ def test_path_params_update_overload_12(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -2472,7 +2406,7 @@ def test_path_params_update_overload_12(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -2505,12 +2439,10 @@ def test_method_update_with_all_params_overload_13(self, client: Cloudflare) ->
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -2562,7 +2494,7 @@ def test_path_params_update_overload_13(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -2571,7 +2503,7 @@ def test_path_params_update_overload_13(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -2601,12 +2533,10 @@ def test_method_update_with_all_params_overload_14(self, client: Cloudflare) ->
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -2658,7 +2588,7 @@ def test_path_params_update_overload_14(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -2667,7 +2597,7 @@ def test_path_params_update_overload_14(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -2682,15 +2612,22 @@ def test_method_list(self, client: Cloudflare) -> None:
         identity_provider = client.zero_trust.identity_providers.list(
             account_id="account_id",
         )
-        assert_matches_type(SyncSinglePage[IdentityProviderListResponse], identity_provider, path=["response"])
+        assert_matches_type(
+            SyncV4PagePaginationArray[IdentityProviderListResponse], identity_provider, path=["response"]
+        )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         identity_provider = client.zero_trust.identity_providers.list(
             account_id="account_id",
+            page=0,
+            per_page=0,
+            scim_enabled="scim_enabled",
+        )
+        assert_matches_type(
+            SyncV4PagePaginationArray[IdentityProviderListResponse], identity_provider, path=["response"]
         )
-        assert_matches_type(SyncSinglePage[IdentityProviderListResponse], identity_provider, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2702,7 +2639,9 @@ def test_raw_response_list(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         identity_provider = response.parse()
-        assert_matches_type(SyncSinglePage[IdentityProviderListResponse], identity_provider, path=["response"])
+        assert_matches_type(
+            SyncV4PagePaginationArray[IdentityProviderListResponse], identity_provider, path=["response"]
+        )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2714,19 +2653,21 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             identity_provider = response.parse()
-            assert_matches_type(SyncSinglePage[IdentityProviderListResponse], identity_provider, path=["response"])
+            assert_matches_type(
+                SyncV4PagePaginationArray[IdentityProviderListResponse], identity_provider, path=["response"]
+            )
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.list(
                 account_id="account_id",
             )
@@ -2786,13 +2727,13 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.delete(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.delete(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -2853,13 +2794,13 @@ def test_path_params_get(self, client: Cloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.get(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.identity_providers.with_raw_response.get(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -2867,7 +2808,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncIdentityProviders:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -2885,24 +2828,22 @@ async def test_method_create_overload_1(self, async_client: AsyncCloudflare) ->
     async def test_method_create_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
         identity_provider = await async_client.zero_trust.identity_providers.create(
             config={
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
-                "email_claim_name": "custom_claim_name",
                 "conditional_access_enabled": True,
                 "directory_id": "<your azure directory uuid>",
+                "email_claim_name": "custom_claim_name",
                 "prompt": "login",
                 "support_groups": True,
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -2943,7 +2884,7 @@ async def test_streaming_response_create_overload_1(self, async_client: AsyncClo
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -2951,7 +2892,7 @@ async def test_path_params_create_overload_1(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -2975,22 +2916,20 @@ async def test_method_create_overload_2(self, async_client: AsyncCloudflare) ->
     async def test_method_create_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
         identity_provider = await async_client.zero_trust.identity_providers.create(
             config={
+                "centrify_account": "https://abc123.my.centrify.com/",
+                "centrify_app_id": "exampleapp",
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
-                "centrify_account": "https://abc123.my.centrify.com/",
-                "centrify_app_id": "exampleapp",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -3031,7 +2970,7 @@ async def test_streaming_response_create_overload_2(self, async_client: AsyncClo
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3039,7 +2978,7 @@ async def test_path_params_create_overload_2(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3069,12 +3008,10 @@ async def test_method_create_with_all_params_overload_3(self, async_client: Asyn
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -3115,7 +3052,7 @@ async def test_streaming_response_create_overload_3(self, async_client: AsyncClo
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create_overload_3(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3123,7 +3060,7 @@ async def test_path_params_create_overload_3(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3153,12 +3090,10 @@ async def test_method_create_with_all_params_overload_4(self, async_client: Asyn
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -3199,7 +3134,7 @@ async def test_streaming_response_create_overload_4(self, async_client: AsyncClo
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create_overload_4(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3207,7 +3142,7 @@ async def test_path_params_create_overload_4(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3231,20 +3166,18 @@ async def test_method_create_overload_5(self, async_client: AsyncCloudflare) ->
     async def test_method_create_with_all_params_overload_5(self, async_client: AsyncCloudflare) -> None:
         identity_provider = await async_client.zero_trust.identity_providers.create(
             config={
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -3285,7 +3218,7 @@ async def test_streaming_response_create_overload_5(self, async_client: AsyncClo
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create_overload_5(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3293,7 +3226,7 @@ async def test_path_params_create_overload_5(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3317,21 +3250,19 @@ async def test_method_create_overload_6(self, async_client: AsyncCloudflare) ->
     async def test_method_create_with_all_params_overload_6(self, async_client: AsyncCloudflare) -> None:
         identity_provider = await async_client.zero_trust.identity_providers.create(
             config={
+                "apps_domain": "mycompany.com",
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
-                "apps_domain": "mycompany.com",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -3372,7 +3303,7 @@ async def test_streaming_response_create_overload_6(self, async_client: AsyncClo
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create_overload_6(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3380,7 +3311,7 @@ async def test_path_params_create_overload_6(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3410,12 +3341,10 @@ async def test_method_create_with_all_params_overload_7(self, async_client: Asyn
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -3456,7 +3385,7 @@ async def test_streaming_response_create_overload_7(self, async_client: AsyncClo
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create_overload_7(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3464,7 +3393,7 @@ async def test_path_params_create_overload_7(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3488,24 +3417,23 @@ async def test_method_create_overload_8(self, async_client: AsyncCloudflare) ->
     async def test_method_create_with_all_params_overload_8(self, async_client: AsyncCloudflare) -> None:
         identity_provider = await async_client.zero_trust.identity_providers.create(
             config={
+                "auth_url": "https://accounts.google.com/o/oauth2/auth",
+                "certs_url": "https://www.googleapis.com/oauth2/v3/certs",
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
-                "auth_url": "https://accounts.google.com/o/oauth2/auth",
-                "certs_url": "https://www.googleapis.com/oauth2/v3/certs",
+                "pkce_enabled": True,
                 "scopes": ["openid", "email", "profile"],
                 "token_url": "https://accounts.google.com/o/oauth2/token",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -3546,7 +3474,7 @@ async def test_streaming_response_create_overload_8(self, async_client: AsyncClo
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create_overload_8(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3554,7 +3482,7 @@ async def test_path_params_create_overload_8(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3578,22 +3506,20 @@ async def test_method_create_overload_9(self, async_client: AsyncCloudflare) ->
     async def test_method_create_with_all_params_overload_9(self, async_client: AsyncCloudflare) -> None:
         identity_provider = await async_client.zero_trust.identity_providers.create(
             config={
+                "authorization_server_id": "aus9o8wzkhckw9TLa0h7z",
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
-                "authorization_server_id": "aus9o8wzkhckw9TLa0h7z",
                 "okta_account": "https://dev-abc123.oktapreview.com",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -3634,7 +3560,7 @@ async def test_streaming_response_create_overload_9(self, async_client: AsyncClo
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create_overload_9(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3642,7 +3568,7 @@ async def test_path_params_create_overload_9(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3666,21 +3592,19 @@ async def test_method_create_overload_10(self, async_client: AsyncCloudflare) ->
     async def test_method_create_with_all_params_overload_10(self, async_client: AsyncCloudflare) -> None:
         identity_provider = await async_client.zero_trust.identity_providers.create(
             config={
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
                 "onelogin_account": "https://mycompany.onelogin.com",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -3721,7 +3645,7 @@ async def test_streaming_response_create_overload_10(self, async_client: AsyncCl
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create_overload_10(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3729,7 +3653,7 @@ async def test_path_params_create_overload_10(self, async_client: AsyncCloudflar
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3753,21 +3677,19 @@ async def test_method_create_overload_11(self, async_client: AsyncCloudflare) ->
     async def test_method_create_with_all_params_overload_11(self, async_client: AsyncCloudflare) -> None:
         identity_provider = await async_client.zero_trust.identity_providers.create(
             config={
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
                 "ping_env_id": "342b5660-0c32-4936-a5a4-ce21fae57b0a",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -3808,7 +3730,7 @@ async def test_streaming_response_create_overload_11(self, async_client: AsyncCl
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create_overload_11(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3816,7 +3738,7 @@ async def test_path_params_create_overload_11(self, async_client: AsyncCloudflar
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3846,17 +3768,9 @@ async def test_method_create_with_all_params_overload_12(self, async_client: Asy
                     {
                         "attribute_name": "attribute_name",
                         "header_name": "header_name",
-                    },
-                    {
-                        "attribute_name": "attribute_name",
-                        "header_name": "header_name",
-                    },
-                    {
-                        "attribute_name": "attribute_name",
-                        "header_name": "header_name",
-                    },
+                    }
                 ],
-                "idp_public_certs": ["string", "string", "string"],
+                "idp_public_certs": ["string"],
                 "issuer_url": "https://whoami.com",
                 "sign_request": True,
                 "sso_target_url": "https://edgeaccess.org/idp/saml/login",
@@ -3864,12 +3778,10 @@ async def test_method_create_with_all_params_overload_12(self, async_client: Asy
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -3910,7 +3822,7 @@ async def test_streaming_response_create_overload_12(self, async_client: AsyncCl
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create_overload_12(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3918,7 +3830,7 @@ async def test_path_params_create_overload_12(self, async_client: AsyncCloudflar
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -3948,12 +3860,10 @@ async def test_method_create_with_all_params_overload_13(self, async_client: Asy
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -3994,7 +3904,7 @@ async def test_streaming_response_create_overload_13(self, async_client: AsyncCl
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create_overload_13(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -4002,7 +3912,7 @@ async def test_path_params_create_overload_13(self, async_client: AsyncCloudflar
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -4029,12 +3939,10 @@ async def test_method_create_with_all_params_overload_14(self, async_client: Asy
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -4075,7 +3983,7 @@ async def test_streaming_response_create_overload_14(self, async_client: AsyncCl
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create_overload_14(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -4083,7 +3991,7 @@ async def test_path_params_create_overload_14(self, async_client: AsyncCloudflar
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.create(
                 config={},
                 name="Widget Corps IDP",
@@ -4109,24 +4017,22 @@ async def test_method_update_with_all_params_overload_1(self, async_client: Asyn
         identity_provider = await async_client.zero_trust.identity_providers.update(
             identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             config={
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
-                "email_claim_name": "custom_claim_name",
                 "conditional_access_enabled": True,
                 "directory_id": "<your azure directory uuid>",
+                "email_claim_name": "custom_claim_name",
                 "prompt": "login",
                 "support_groups": True,
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -4178,7 +4084,7 @@ async def test_path_params_update_overload_1(self, async_client: AsyncCloudflare
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -4187,7 +4093,7 @@ async def test_path_params_update_overload_1(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -4214,22 +4120,20 @@ async def test_method_update_with_all_params_overload_2(self, async_client: Asyn
         identity_provider = await async_client.zero_trust.identity_providers.update(
             identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             config={
+                "centrify_account": "https://abc123.my.centrify.com/",
+                "centrify_app_id": "exampleapp",
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
-                "centrify_account": "https://abc123.my.centrify.com/",
-                "centrify_app_id": "exampleapp",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -4281,7 +4185,7 @@ async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -4290,7 +4194,7 @@ async def test_path_params_update_overload_2(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -4323,12 +4227,10 @@ async def test_method_update_with_all_params_overload_3(self, async_client: Asyn
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -4380,7 +4282,7 @@ async def test_path_params_update_overload_3(self, async_client: AsyncCloudflare
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -4389,7 +4291,7 @@ async def test_path_params_update_overload_3(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -4422,12 +4324,10 @@ async def test_method_update_with_all_params_overload_4(self, async_client: Asyn
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -4479,7 +4379,7 @@ async def test_path_params_update_overload_4(self, async_client: AsyncCloudflare
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -4488,7 +4388,7 @@ async def test_path_params_update_overload_4(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -4515,20 +4415,18 @@ async def test_method_update_with_all_params_overload_5(self, async_client: Asyn
         identity_provider = await async_client.zero_trust.identity_providers.update(
             identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             config={
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -4580,7 +4478,7 @@ async def test_path_params_update_overload_5(self, async_client: AsyncCloudflare
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -4589,7 +4487,7 @@ async def test_path_params_update_overload_5(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -4616,21 +4514,19 @@ async def test_method_update_with_all_params_overload_6(self, async_client: Asyn
         identity_provider = await async_client.zero_trust.identity_providers.update(
             identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             config={
+                "apps_domain": "mycompany.com",
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
-                "apps_domain": "mycompany.com",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -4682,7 +4578,7 @@ async def test_path_params_update_overload_6(self, async_client: AsyncCloudflare
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -4691,7 +4587,7 @@ async def test_path_params_update_overload_6(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -4724,12 +4620,10 @@ async def test_method_update_with_all_params_overload_7(self, async_client: Asyn
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -4781,7 +4675,7 @@ async def test_path_params_update_overload_7(self, async_client: AsyncCloudflare
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -4790,7 +4684,7 @@ async def test_path_params_update_overload_7(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -4817,24 +4711,23 @@ async def test_method_update_with_all_params_overload_8(self, async_client: Asyn
         identity_provider = await async_client.zero_trust.identity_providers.update(
             identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             config={
+                "auth_url": "https://accounts.google.com/o/oauth2/auth",
+                "certs_url": "https://www.googleapis.com/oauth2/v3/certs",
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
-                "auth_url": "https://accounts.google.com/o/oauth2/auth",
-                "certs_url": "https://www.googleapis.com/oauth2/v3/certs",
+                "pkce_enabled": True,
                 "scopes": ["openid", "email", "profile"],
                 "token_url": "https://accounts.google.com/o/oauth2/token",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -4886,7 +4779,7 @@ async def test_path_params_update_overload_8(self, async_client: AsyncCloudflare
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -4895,7 +4788,7 @@ async def test_path_params_update_overload_8(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -4922,22 +4815,20 @@ async def test_method_update_with_all_params_overload_9(self, async_client: Asyn
         identity_provider = await async_client.zero_trust.identity_providers.update(
             identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             config={
+                "authorization_server_id": "aus9o8wzkhckw9TLa0h7z",
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
-                "authorization_server_id": "aus9o8wzkhckw9TLa0h7z",
                 "okta_account": "https://dev-abc123.oktapreview.com",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -4989,7 +4880,7 @@ async def test_path_params_update_overload_9(self, async_client: AsyncCloudflare
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -4998,7 +4889,7 @@ async def test_path_params_update_overload_9(self, async_client: AsyncCloudflare
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -5025,21 +4916,19 @@ async def test_method_update_with_all_params_overload_10(self, async_client: Asy
         identity_provider = await async_client.zero_trust.identity_providers.update(
             identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             config={
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
                 "onelogin_account": "https://mycompany.onelogin.com",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -5091,7 +4980,7 @@ async def test_path_params_update_overload_10(self, async_client: AsyncCloudflar
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -5100,7 +4989,7 @@ async def test_path_params_update_overload_10(self, async_client: AsyncCloudflar
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -5127,21 +5016,19 @@ async def test_method_update_with_all_params_overload_11(self, async_client: Asy
         identity_provider = await async_client.zero_trust.identity_providers.update(
             identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             config={
+                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "client_id": "<your client id>",
                 "client_secret": "<your client secret>",
-                "claims": ["email_verified", "preferred_username", "custom_claim_name"],
                 "email_claim_name": "custom_claim_name",
                 "ping_env_id": "342b5660-0c32-4936-a5a4-ce21fae57b0a",
             },
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -5193,7 +5080,7 @@ async def test_path_params_update_overload_11(self, async_client: AsyncCloudflar
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -5202,7 +5089,7 @@ async def test_path_params_update_overload_11(self, async_client: AsyncCloudflar
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -5235,17 +5122,9 @@ async def test_method_update_with_all_params_overload_12(self, async_client: Asy
                     {
                         "attribute_name": "attribute_name",
                         "header_name": "header_name",
-                    },
-                    {
-                        "attribute_name": "attribute_name",
-                        "header_name": "header_name",
-                    },
-                    {
-                        "attribute_name": "attribute_name",
-                        "header_name": "header_name",
-                    },
+                    }
                 ],
-                "idp_public_certs": ["string", "string", "string"],
+                "idp_public_certs": ["string"],
                 "issuer_url": "https://whoami.com",
                 "sign_request": True,
                 "sso_target_url": "https://edgeaccess.org/idp/saml/login",
@@ -5253,12 +5132,10 @@ async def test_method_update_with_all_params_overload_12(self, async_client: Asy
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -5310,7 +5187,7 @@ async def test_path_params_update_overload_12(self, async_client: AsyncCloudflar
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -5319,7 +5196,7 @@ async def test_path_params_update_overload_12(self, async_client: AsyncCloudflar
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -5352,12 +5229,10 @@ async def test_method_update_with_all_params_overload_13(self, async_client: Asy
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -5409,7 +5284,7 @@ async def test_path_params_update_overload_13(self, async_client: AsyncCloudflar
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -5418,7 +5293,7 @@ async def test_path_params_update_overload_13(self, async_client: AsyncCloudflar
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -5448,12 +5323,10 @@ async def test_method_update_with_all_params_overload_14(self, async_client: Asy
             name="Widget Corps IDP",
             type="onetimepin",
             account_id="account_id",
-            id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
             scim_config={
                 "enabled": True,
-                "group_member_deprovision": True,
+                "identity_update_behavior": "automatic",
                 "seat_deprovision": True,
-                "secret": "secret",
                 "user_deprovision": True,
             },
         )
@@ -5505,7 +5378,7 @@ async def test_path_params_update_overload_14(self, async_client: AsyncCloudflar
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -5514,7 +5387,7 @@ async def test_path_params_update_overload_14(self, async_client: AsyncCloudflar
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.update(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 config={},
@@ -5529,15 +5402,22 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None:
         identity_provider = await async_client.zero_trust.identity_providers.list(
             account_id="account_id",
         )
-        assert_matches_type(AsyncSinglePage[IdentityProviderListResponse], identity_provider, path=["response"])
+        assert_matches_type(
+            AsyncV4PagePaginationArray[IdentityProviderListResponse], identity_provider, path=["response"]
+        )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
         identity_provider = await async_client.zero_trust.identity_providers.list(
             account_id="account_id",
+            page=0,
+            per_page=0,
+            scim_enabled="scim_enabled",
+        )
+        assert_matches_type(
+            AsyncV4PagePaginationArray[IdentityProviderListResponse], identity_provider, path=["response"]
         )
-        assert_matches_type(AsyncSinglePage[IdentityProviderListResponse], identity_provider, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -5549,7 +5429,9 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         identity_provider = await response.parse()
-        assert_matches_type(AsyncSinglePage[IdentityProviderListResponse], identity_provider, path=["response"])
+        assert_matches_type(
+            AsyncV4PagePaginationArray[IdentityProviderListResponse], identity_provider, path=["response"]
+        )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -5561,19 +5443,21 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             identity_provider = await response.parse()
-            assert_matches_type(AsyncSinglePage[IdentityProviderListResponse], identity_provider, path=["response"])
+            assert_matches_type(
+                AsyncV4PagePaginationArray[IdentityProviderListResponse], identity_provider, path=["response"]
+            )
 
         assert cast(Any, response.is_closed) is True
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.list(
                 account_id="account_id",
             )
@@ -5633,13 +5517,13 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.delete(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.delete(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
@@ -5700,13 +5584,13 @@ async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
                 account_id="account_id",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.get(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.identity_providers.with_raw_response.get(
                 identity_provider_id="f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
                 account_id="account_id",
diff --git a/tests/api_resources/zero_trust/test_organizations.py b/tests/api_resources/zero_trust/test_organizations.py
index 949d07f5e7e..655886e4e5c 100644
--- a/tests/api_resources/zero_trust/test_organizations.py
+++ b/tests/api_resources/zero_trust/test_organizations.py
@@ -39,6 +39,8 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             account_id="account_id",
             allow_authenticate_via_warp=True,
             auto_redirect_to_identity=True,
+            deny_unmatched_requests=True,
+            deny_unmatched_requests_exempted_zone_names=["example.com"],
             is_ui_read_only=True,
             login_design={
                 "background_color": "#c5ed1b",
@@ -49,7 +51,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None:
             },
             session_duration="24h",
             ui_read_only_toggle_reason="Temporarily turn off the UI read only lock to make a change via the UI",
-            user_seat_expiration_inactive_time="720h",
+            user_seat_expiration_inactive_time="730h",
             warp_auth_session_duration="24h",
         )
         assert_matches_type(Optional[Organization], organization, path=["response"])
@@ -87,14 +89,14 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.organizations.with_raw_response.create(
                 auth_domain="test.cloudflareaccess.com",
                 name="Widget Corps Internal Applications",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.organizations.with_raw_response.create(
                 auth_domain="test.cloudflareaccess.com",
                 name="Widget Corps Internal Applications",
@@ -121,6 +123,8 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
                 "forbidden": "699d98642c564d2e855e9661899b7252",
                 "identity_denied": "699d98642c564d2e855e9661899b7252",
             },
+            deny_unmatched_requests=True,
+            deny_unmatched_requests_exempted_zone_names=["example.com"],
             is_ui_read_only=True,
             login_design={
                 "background_color": "#c5ed1b",
@@ -132,7 +136,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None:
             name="Widget Corps Internal Applications",
             session_duration="24h",
             ui_read_only_toggle_reason="Temporarily turn off the UI read only lock to make a change via the UI",
-            user_seat_expiration_inactive_time="720h",
+            user_seat_expiration_inactive_time="730h",
             warp_auth_session_duration="24h",
         )
         assert_matches_type(Optional[Organization], organization, path=["response"])
@@ -166,12 +170,12 @@ def test_streaming_response_update(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.organizations.with_raw_response.update(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.organizations.with_raw_response.update(
                 account_id="account_id",
             )
@@ -221,12 +225,12 @@ def test_streaming_response_list(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.organizations.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.organizations.with_raw_response.list(
                 account_id="account_id",
             )
@@ -246,6 +250,10 @@ def test_method_revoke_users_with_all_params(self, client: Cloudflare) -> None:
         organization = client.zero_trust.organizations.revoke_users(
             email="test@example.com",
             account_id="account_id",
+            query_devices=True,
+            body_devices=True,
+            user_uid="699d98642c564d2e855e9661899b7252",
+            warp_session_reauth=True,
         )
         assert_matches_type(Optional[OrganizationRevokeUsersResponse], organization, path=["response"])
 
@@ -280,13 +288,13 @@ def test_streaming_response_revoke_users(self, client: Cloudflare) -> None:
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     def test_path_params_revoke_users(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.organizations.with_raw_response.revoke_users(
                 email="test@example.com",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             client.zero_trust.organizations.with_raw_response.revoke_users(
                 email="test@example.com",
                 account_id="account_id",
@@ -294,7 +302,9 @@ def test_path_params_revoke_users(self, client: Cloudflare) -> None:
 
 
 class TestAsyncOrganizations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -315,6 +325,8 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             account_id="account_id",
             allow_authenticate_via_warp=True,
             auto_redirect_to_identity=True,
+            deny_unmatched_requests=True,
+            deny_unmatched_requests_exempted_zone_names=["example.com"],
             is_ui_read_only=True,
             login_design={
                 "background_color": "#c5ed1b",
@@ -325,7 +337,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare
             },
             session_duration="24h",
             ui_read_only_toggle_reason="Temporarily turn off the UI read only lock to make a change via the UI",
-            user_seat_expiration_inactive_time="720h",
+            user_seat_expiration_inactive_time="730h",
             warp_auth_session_duration="24h",
         )
         assert_matches_type(Optional[Organization], organization, path=["response"])
@@ -363,14 +375,14 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.organizations.with_raw_response.create(
                 auth_domain="test.cloudflareaccess.com",
                 name="Widget Corps Internal Applications",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.organizations.with_raw_response.create(
                 auth_domain="test.cloudflareaccess.com",
                 name="Widget Corps Internal Applications",
@@ -397,6 +409,8 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
                 "forbidden": "699d98642c564d2e855e9661899b7252",
                 "identity_denied": "699d98642c564d2e855e9661899b7252",
             },
+            deny_unmatched_requests=True,
+            deny_unmatched_requests_exempted_zone_names=["example.com"],
             is_ui_read_only=True,
             login_design={
                 "background_color": "#c5ed1b",
@@ -408,7 +422,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare
             name="Widget Corps Internal Applications",
             session_duration="24h",
             ui_read_only_toggle_reason="Temporarily turn off the UI read only lock to make a change via the UI",
-            user_seat_expiration_inactive_time="720h",
+            user_seat_expiration_inactive_time="730h",
             warp_auth_session_duration="24h",
         )
         assert_matches_type(Optional[Organization], organization, path=["response"])
@@ -442,12 +456,12 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) ->
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.organizations.with_raw_response.update(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.organizations.with_raw_response.update(
                 account_id="account_id",
             )
@@ -497,12 +511,12 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.organizations.with_raw_response.list(
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.organizations.with_raw_response.list(
                 account_id="account_id",
             )
@@ -522,6 +536,10 @@ async def test_method_revoke_users_with_all_params(self, async_client: AsyncClou
         organization = await async_client.zero_trust.organizations.revoke_users(
             email="test@example.com",
             account_id="account_id",
+            query_devices=True,
+            body_devices=True,
+            user_uid="699d98642c564d2e855e9661899b7252",
+            warp_session_reauth=True,
         )
         assert_matches_type(Optional[OrganizationRevokeUsersResponse], organization, path=["response"])
 
@@ -556,13 +574,13 @@ async def test_streaming_response_revoke_users(self, async_client: AsyncCloudfla
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
     async def test_path_params_revoke_users(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.organizations.with_raw_response.revoke_users(
                 email="test@example.com",
                 account_id="",
             )
 
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+        with pytest.raises(ValueError, match=r"You must provide either account_id or zone_id"):
             await async_client.zero_trust.organizations.with_raw_response.revoke_users(
                 email="test@example.com",
                 account_id="account_id",
diff --git a/tests/api_resources/zero_trust/test_risk_scoring.py b/tests/api_resources/zero_trust/test_risk_scoring.py
index bb96f170413..9a8252864e0 100644
--- a/tests/api_resources/zero_trust/test_risk_scoring.py
+++ b/tests/api_resources/zero_trust/test_risk_scoring.py
@@ -3,13 +3,13 @@
 from __future__ import annotations
 
 import os
-from typing import Any, cast
+from typing import Any, Optional, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.zero_trust import RiskScoringGetResponse, RiskScoringResetResponse
+from cloudflare.types.zero_trust import RiskScoringGetResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -20,219 +20,197 @@ class TestRiskScoring:
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         risk_scoring = client.zero_trust.risk_scoring.get(
-            user_id="f2108713-1206-4e84-8b80-0e71a6a1c67b",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            user_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
-        assert_matches_type(RiskScoringGetResponse, risk_scoring, path=["response"])
-
-    @parametrize
-    def test_method_get_with_all_params(self, client: Cloudflare) -> None:
-        risk_scoring = client.zero_trust.risk_scoring.get(
-            user_id="f2108713-1206-4e84-8b80-0e71a6a1c67b",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            direction="desc",
-            order_by="timestamp",
-            page=0,
-            per_page=0,
-        )
-        assert_matches_type(RiskScoringGetResponse, risk_scoring, path=["response"])
+        assert_matches_type(Optional[RiskScoringGetResponse], risk_scoring, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.zero_trust.risk_scoring.with_raw_response.get(
-            user_id="f2108713-1206-4e84-8b80-0e71a6a1c67b",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            user_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         risk_scoring = response.parse()
-        assert_matches_type(RiskScoringGetResponse, risk_scoring, path=["response"])
+        assert_matches_type(Optional[RiskScoringGetResponse], risk_scoring, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.zero_trust.risk_scoring.with_streaming_response.get(
-            user_id="f2108713-1206-4e84-8b80-0e71a6a1c67b",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            user_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             risk_scoring = response.parse()
-            assert_matches_type(RiskScoringGetResponse, risk_scoring, path=["response"])
+            assert_matches_type(Optional[RiskScoringGetResponse], risk_scoring, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.risk_scoring.with_raw_response.get(
-                user_id="f2108713-1206-4e84-8b80-0e71a6a1c67b",
-                account_identifier="",
+                user_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `user_id` but received ''"):
             client.zero_trust.risk_scoring.with_raw_response.get(
                 user_id="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
             )
 
     @parametrize
     def test_method_reset(self, client: Cloudflare) -> None:
         risk_scoring = client.zero_trust.risk_scoring.reset(
-            user_id="f2108713-1206-4e84-8b80-0e71a6a1c67b",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            user_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
-        assert_matches_type(RiskScoringResetResponse, risk_scoring, path=["response"])
+        assert_matches_type(object, risk_scoring, path=["response"])
 
     @parametrize
     def test_raw_response_reset(self, client: Cloudflare) -> None:
         response = client.zero_trust.risk_scoring.with_raw_response.reset(
-            user_id="f2108713-1206-4e84-8b80-0e71a6a1c67b",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            user_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         risk_scoring = response.parse()
-        assert_matches_type(RiskScoringResetResponse, risk_scoring, path=["response"])
+        assert_matches_type(object, risk_scoring, path=["response"])
 
     @parametrize
     def test_streaming_response_reset(self, client: Cloudflare) -> None:
         with client.zero_trust.risk_scoring.with_streaming_response.reset(
-            user_id="f2108713-1206-4e84-8b80-0e71a6a1c67b",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            user_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             risk_scoring = response.parse()
-            assert_matches_type(RiskScoringResetResponse, risk_scoring, path=["response"])
+            assert_matches_type(object, risk_scoring, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_reset(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             client.zero_trust.risk_scoring.with_raw_response.reset(
-                user_id="f2108713-1206-4e84-8b80-0e71a6a1c67b",
-                account_identifier="",
+                user_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `user_id` but received ''"):
             client.zero_trust.risk_scoring.with_raw_response.reset(
                 user_id="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
             )
 
 
 class TestAsyncRiskScoring:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         risk_scoring = await async_client.zero_trust.risk_scoring.get(
-            user_id="f2108713-1206-4e84-8b80-0e71a6a1c67b",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(RiskScoringGetResponse, risk_scoring, path=["response"])
-
-    @parametrize
-    async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        risk_scoring = await async_client.zero_trust.risk_scoring.get(
-            user_id="f2108713-1206-4e84-8b80-0e71a6a1c67b",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
-            direction="desc",
-            order_by="timestamp",
-            page=0,
-            per_page=0,
+            user_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
-        assert_matches_type(RiskScoringGetResponse, risk_scoring, path=["response"])
+        assert_matches_type(Optional[RiskScoringGetResponse], risk_scoring, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.risk_scoring.with_raw_response.get(
-            user_id="f2108713-1206-4e84-8b80-0e71a6a1c67b",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            user_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         risk_scoring = await response.parse()
-        assert_matches_type(RiskScoringGetResponse, risk_scoring, path=["response"])
+        assert_matches_type(Optional[RiskScoringGetResponse], risk_scoring, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.risk_scoring.with_streaming_response.get(
-            user_id="f2108713-1206-4e84-8b80-0e71a6a1c67b",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            user_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             risk_scoring = await response.parse()
-            assert_matches_type(RiskScoringGetResponse, risk_scoring, path=["response"])
+            assert_matches_type(Optional[RiskScoringGetResponse], risk_scoring, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.risk_scoring.with_raw_response.get(
-                user_id="f2108713-1206-4e84-8b80-0e71a6a1c67b",
-                account_identifier="",
+                user_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `user_id` but received ''"):
             await async_client.zero_trust.risk_scoring.with_raw_response.get(
                 user_id="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
             )
 
     @parametrize
     async def test_method_reset(self, async_client: AsyncCloudflare) -> None:
         risk_scoring = await async_client.zero_trust.risk_scoring.reset(
-            user_id="f2108713-1206-4e84-8b80-0e71a6a1c67b",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            user_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
-        assert_matches_type(RiskScoringResetResponse, risk_scoring, path=["response"])
+        assert_matches_type(object, risk_scoring, path=["response"])
 
     @parametrize
     async def test_raw_response_reset(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zero_trust.risk_scoring.with_raw_response.reset(
-            user_id="f2108713-1206-4e84-8b80-0e71a6a1c67b",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            user_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         risk_scoring = await response.parse()
-        assert_matches_type(RiskScoringResetResponse, risk_scoring, path=["response"])
+        assert_matches_type(object, risk_scoring, path=["response"])
 
     @parametrize
     async def test_streaming_response_reset(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zero_trust.risk_scoring.with_streaming_response.reset(
-            user_id="f2108713-1206-4e84-8b80-0e71a6a1c67b",
-            account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            user_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+            account_id="account_id",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             risk_scoring = await response.parse()
-            assert_matches_type(RiskScoringResetResponse, risk_scoring, path=["response"])
+            assert_matches_type(object, risk_scoring, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_reset(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
             await async_client.zero_trust.risk_scoring.with_raw_response.reset(
-                user_id="f2108713-1206-4e84-8b80-0e71a6a1c67b",
-                account_identifier="",
+                user_id="182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e",
+                account_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `user_id` but received ''"):
             await async_client.zero_trust.risk_scoring.with_raw_response.reset(
                 user_id="",
-                account_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                account_id="account_id",
             )
diff --git a/tests/api_resources/zero_trust/test_seats.py b/tests/api_resources/zero_trust/test_seats.py
index 639cbee067f..afd583e5546 100644
--- a/tests/api_resources/zero_trust/test_seats.py
+++ b/tests/api_resources/zero_trust/test_seats.py
@@ -3,13 +3,14 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.zero_trust import SeatEditResponse
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust import Seat
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -27,20 +28,10 @@ def test_method_edit(self, client: Cloudflare) -> None:
                     "access_seat": False,
                     "gateway_seat": False,
                     "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                },
-                {
-                    "access_seat": False,
-                    "gateway_seat": False,
-                    "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                },
-                {
-                    "access_seat": False,
-                    "gateway_seat": False,
-                    "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                },
+                }
             ],
         )
-        assert_matches_type(Optional[SeatEditResponse], seat, path=["response"])
+        assert_matches_type(SyncSinglePage[Seat], seat, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -52,24 +43,14 @@ def test_raw_response_edit(self, client: Cloudflare) -> None:
                     "access_seat": False,
                     "gateway_seat": False,
                     "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                },
-                {
-                    "access_seat": False,
-                    "gateway_seat": False,
-                    "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                },
-                {
-                    "access_seat": False,
-                    "gateway_seat": False,
-                    "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                },
+                }
             ],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         seat = response.parse()
-        assert_matches_type(Optional[SeatEditResponse], seat, path=["response"])
+        assert_matches_type(SyncSinglePage[Seat], seat, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -81,24 +62,14 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None:
                     "access_seat": False,
                     "gateway_seat": False,
                     "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                },
-                {
-                    "access_seat": False,
-                    "gateway_seat": False,
-                    "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                },
-                {
-                    "access_seat": False,
-                    "gateway_seat": False,
-                    "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                },
+                }
             ],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             seat = response.parse()
-            assert_matches_type(Optional[SeatEditResponse], seat, path=["response"])
+            assert_matches_type(SyncSinglePage[Seat], seat, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -113,23 +84,15 @@ def test_path_params_edit(self, client: Cloudflare) -> None:
                         "access_seat": False,
                         "gateway_seat": False,
                         "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    },
-                    {
-                        "access_seat": False,
-                        "gateway_seat": False,
-                        "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    },
-                    {
-                        "access_seat": False,
-                        "gateway_seat": False,
-                        "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    },
+                    }
                 ],
             )
 
 
 class TestAsyncSeats:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -141,20 +104,10 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
                     "access_seat": False,
                     "gateway_seat": False,
                     "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                },
-                {
-                    "access_seat": False,
-                    "gateway_seat": False,
-                    "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                },
-                {
-                    "access_seat": False,
-                    "gateway_seat": False,
-                    "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                },
+                }
             ],
         )
-        assert_matches_type(Optional[SeatEditResponse], seat, path=["response"])
+        assert_matches_type(AsyncSinglePage[Seat], seat, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -166,24 +119,14 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
                     "access_seat": False,
                     "gateway_seat": False,
                     "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                },
-                {
-                    "access_seat": False,
-                    "gateway_seat": False,
-                    "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                },
-                {
-                    "access_seat": False,
-                    "gateway_seat": False,
-                    "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                },
+                }
             ],
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         seat = await response.parse()
-        assert_matches_type(Optional[SeatEditResponse], seat, path=["response"])
+        assert_matches_type(AsyncSinglePage[Seat], seat, path=["response"])
 
     @pytest.mark.skip(reason="TODO: investigate broken test")
     @parametrize
@@ -195,24 +138,14 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N
                     "access_seat": False,
                     "gateway_seat": False,
                     "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                },
-                {
-                    "access_seat": False,
-                    "gateway_seat": False,
-                    "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                },
-                {
-                    "access_seat": False,
-                    "gateway_seat": False,
-                    "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                },
+                }
             ],
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             seat = await response.parse()
-            assert_matches_type(Optional[SeatEditResponse], seat, path=["response"])
+            assert_matches_type(AsyncSinglePage[Seat], seat, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -227,16 +160,6 @@ async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
                         "access_seat": False,
                         "gateway_seat": False,
                         "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    },
-                    {
-                        "access_seat": False,
-                        "gateway_seat": False,
-                        "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    },
-                    {
-                        "access_seat": False,
-                        "gateway_seat": False,
-                        "seat_uid": "f174e90a-fafe-4643-bbbc-4a0ed4fc8415",
-                    },
+                    }
                 ],
             )
diff --git a/tests/api_resources/zero_trust/test_tunnels.py b/tests/api_resources/zero_trust/test_tunnels.py
index 80415ba60bf..eedc25523bc 100644
--- a/tests/api_resources/zero_trust/test_tunnels.py
+++ b/tests/api_resources/zero_trust/test_tunnels.py
@@ -11,13 +11,7 @@
 from tests.utils import assert_matches_type
 from cloudflare._utils import parse_datetime
 from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
-from cloudflare.types.zero_trust import (
-    TunnelGetResponse,
-    TunnelEditResponse,
-    TunnelListResponse,
-    TunnelCreateResponse,
-    TunnelDeleteResponse,
-)
+from cloudflare.types.zero_trust import TunnelListResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -25,52 +19,6 @@
 class TestTunnels:
     parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
 
-    @parametrize
-    def test_method_create(self, client: Cloudflare) -> None:
-        tunnel = client.zero_trust.tunnels.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            name="blog",
-            tunnel_secret="AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
-        )
-        assert_matches_type(TunnelCreateResponse, tunnel, path=["response"])
-
-    @parametrize
-    def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.zero_trust.tunnels.with_raw_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            name="blog",
-            tunnel_secret="AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        tunnel = response.parse()
-        assert_matches_type(TunnelCreateResponse, tunnel, path=["response"])
-
-    @parametrize
-    def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.zero_trust.tunnels.with_streaming_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            name="blog",
-            tunnel_secret="AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            tunnel = response.parse()
-            assert_matches_type(TunnelCreateResponse, tunnel, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.tunnels.with_raw_response.create(
-                account_id="",
-                name="blog",
-                tunnel_secret="AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
-            )
-
     @parametrize
     def test_method_list(self, client: Cloudflare) -> None:
         tunnel = client.zero_trust.tunnels.list(
@@ -83,14 +31,14 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None:
         tunnel = client.zero_trust.tunnels.list(
             account_id="699d98642c564d2e855e9661899b7252",
             exclude_prefix="vpc1-",
-            existed_at=parse_datetime("2019-10-12T07:20:50.52Z"),
+            existed_at="2019-10-12T07%3A20%3A50.52Z",
             include_prefix="vpc1-",
             is_deleted=True,
             name="blog",
             page=1,
             per_page=1,
             status="healthy",
-            tun_types="cfd_tunnel,warp_connector",
+            tun_types=["cfd_tunnel"],
             uuid="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
             was_active_at=parse_datetime("2009-11-10T23:00:00Z"),
             was_inactive_at=parse_datetime("2009-11-10T23:00:00Z"),
@@ -128,209 +76,11 @@ def test_path_params_list(self, client: Cloudflare) -> None:
                 account_id="",
             )
 
-    @parametrize
-    def test_method_delete(self, client: Cloudflare) -> None:
-        tunnel = client.zero_trust.tunnels.delete(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(TunnelDeleteResponse, tunnel, path=["response"])
-
-    @parametrize
-    def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.zero_trust.tunnels.with_raw_response.delete(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        tunnel = response.parse()
-        assert_matches_type(TunnelDeleteResponse, tunnel, path=["response"])
-
-    @parametrize
-    def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.zero_trust.tunnels.with_streaming_response.delete(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            tunnel = response.parse()
-            assert_matches_type(TunnelDeleteResponse, tunnel, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.tunnels.with_raw_response.delete(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            client.zero_trust.tunnels.with_raw_response.delete(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-    @parametrize
-    def test_method_edit(self, client: Cloudflare) -> None:
-        tunnel = client.zero_trust.tunnels.edit(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(TunnelEditResponse, tunnel, path=["response"])
-
-    @parametrize
-    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
-        tunnel = client.zero_trust.tunnels.edit(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            name="blog",
-            tunnel_secret="AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
-        )
-        assert_matches_type(TunnelEditResponse, tunnel, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit(self, client: Cloudflare) -> None:
-        response = client.zero_trust.tunnels.with_raw_response.edit(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        tunnel = response.parse()
-        assert_matches_type(TunnelEditResponse, tunnel, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit(self, client: Cloudflare) -> None:
-        with client.zero_trust.tunnels.with_streaming_response.edit(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            tunnel = response.parse()
-            assert_matches_type(TunnelEditResponse, tunnel, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.tunnels.with_raw_response.edit(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            client.zero_trust.tunnels.with_raw_response.edit(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        tunnel = client.zero_trust.tunnels.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(TunnelGetResponse, tunnel, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.zero_trust.tunnels.with_raw_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        tunnel = response.parse()
-        assert_matches_type(TunnelGetResponse, tunnel, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.zero_trust.tunnels.with_streaming_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            tunnel = response.parse()
-            assert_matches_type(TunnelGetResponse, tunnel, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.tunnels.with_raw_response.get(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            client.zero_trust.tunnels.with_raw_response.get(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
 
 class TestAsyncTunnels:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        tunnel = await async_client.zero_trust.tunnels.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            name="blog",
-            tunnel_secret="AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
-        )
-        assert_matches_type(TunnelCreateResponse, tunnel, path=["response"])
-
-    @parametrize
-    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.tunnels.with_raw_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            name="blog",
-            tunnel_secret="AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        tunnel = await response.parse()
-        assert_matches_type(TunnelCreateResponse, tunnel, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.tunnels.with_streaming_response.create(
-            account_id="699d98642c564d2e855e9661899b7252",
-            name="blog",
-            tunnel_secret="AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            tunnel = await response.parse()
-            assert_matches_type(TunnelCreateResponse, tunnel, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.tunnels.with_raw_response.create(
-                account_id="",
-                name="blog",
-                tunnel_secret="AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
-            )
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_list(self, async_client: AsyncCloudflare) -> None:
@@ -344,14 +94,14 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare)
         tunnel = await async_client.zero_trust.tunnels.list(
             account_id="699d98642c564d2e855e9661899b7252",
             exclude_prefix="vpc1-",
-            existed_at=parse_datetime("2019-10-12T07:20:50.52Z"),
+            existed_at="2019-10-12T07%3A20%3A50.52Z",
             include_prefix="vpc1-",
             is_deleted=True,
             name="blog",
             page=1,
             per_page=1,
             status="healthy",
-            tun_types="cfd_tunnel,warp_connector",
+            tun_types=["cfd_tunnel"],
             uuid="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
             was_active_at=parse_datetime("2009-11-10T23:00:00Z"),
             was_inactive_at=parse_datetime("2009-11-10T23:00:00Z"),
@@ -388,157 +138,3 @@ async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
             await async_client.zero_trust.tunnels.with_raw_response.list(
                 account_id="",
             )
-
-    @parametrize
-    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        tunnel = await async_client.zero_trust.tunnels.delete(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(TunnelDeleteResponse, tunnel, path=["response"])
-
-    @parametrize
-    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.tunnels.with_raw_response.delete(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        tunnel = await response.parse()
-        assert_matches_type(TunnelDeleteResponse, tunnel, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.tunnels.with_streaming_response.delete(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            tunnel = await response.parse()
-            assert_matches_type(TunnelDeleteResponse, tunnel, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.tunnels.with_raw_response.delete(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            await async_client.zero_trust.tunnels.with_raw_response.delete(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-    @parametrize
-    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
-        tunnel = await async_client.zero_trust.tunnels.edit(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(TunnelEditResponse, tunnel, path=["response"])
-
-    @parametrize
-    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        tunnel = await async_client.zero_trust.tunnels.edit(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            name="blog",
-            tunnel_secret="AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
-        )
-        assert_matches_type(TunnelEditResponse, tunnel, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.tunnels.with_raw_response.edit(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        tunnel = await response.parse()
-        assert_matches_type(TunnelEditResponse, tunnel, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.tunnels.with_streaming_response.edit(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            tunnel = await response.parse()
-            assert_matches_type(TunnelEditResponse, tunnel, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.tunnels.with_raw_response.edit(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            await async_client.zero_trust.tunnels.with_raw_response.edit(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        tunnel = await async_client.zero_trust.tunnels.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(TunnelGetResponse, tunnel, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.tunnels.with_raw_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        tunnel = await response.parse()
-        assert_matches_type(TunnelGetResponse, tunnel, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.tunnels.with_streaming_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            tunnel = await response.parse()
-            assert_matches_type(TunnelGetResponse, tunnel, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.tunnels.with_raw_response.get(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            await async_client.zero_trust.tunnels.with_raw_response.get(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
diff --git a/tests/api_resources/zero_trust/tunnels/cloudflared/__init__.py b/tests/api_resources/zero_trust/tunnels/cloudflared/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/tunnels/cloudflared/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/tunnels/cloudflared/test_configurations.py b/tests/api_resources/zero_trust/tunnels/cloudflared/test_configurations.py
new file mode 100644
index 00000000000..cb7f7009d23
--- /dev/null
+++ b/tests/api_resources/zero_trust/tunnels/cloudflared/test_configurations.py
@@ -0,0 +1,337 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.types.zero_trust.tunnels.cloudflared import (
+    ConfigurationGetResponse,
+    ConfigurationUpdateResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestConfigurations:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_update(self, client: Cloudflare) -> None:
+        configuration = client.zero_trust.tunnels.cloudflared.configurations.update(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ConfigurationUpdateResponse], configuration, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        configuration = client.zero_trust.tunnels.cloudflared.configurations.update(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            config={
+                "ingress": [
+                    {
+                        "hostname": "tunnel.example.com",
+                        "service": "https://localhost:8001",
+                        "origin_request": {
+                            "access": {
+                                "aud_tag": ["string"],
+                                "team_name": "zero-trust-organization-name",
+                                "required": False,
+                            },
+                            "ca_pool": "caPool",
+                            "connect_timeout": 10,
+                            "disable_chunked_encoding": True,
+                            "http2_origin": True,
+                            "http_host_header": "httpHostHeader",
+                            "keep_alive_connections": 100,
+                            "keep_alive_timeout": 90,
+                            "match_sn_ito_host": False,
+                            "no_happy_eyeballs": False,
+                            "no_tls_verify": False,
+                            "origin_server_name": "originServerName",
+                            "proxy_type": "proxyType",
+                            "tcp_keep_alive": 30,
+                            "tls_timeout": 10,
+                        },
+                        "path": "subpath",
+                    }
+                ],
+                "origin_request": {
+                    "access": {
+                        "aud_tag": ["string"],
+                        "team_name": "zero-trust-organization-name",
+                        "required": False,
+                    },
+                    "ca_pool": "caPool",
+                    "connect_timeout": 10,
+                    "disable_chunked_encoding": True,
+                    "http2_origin": True,
+                    "http_host_header": "httpHostHeader",
+                    "keep_alive_connections": 100,
+                    "keep_alive_timeout": 90,
+                    "match_sn_ito_host": False,
+                    "no_happy_eyeballs": False,
+                    "no_tls_verify": False,
+                    "origin_server_name": "originServerName",
+                    "proxy_type": "proxyType",
+                    "tcp_keep_alive": 30,
+                    "tls_timeout": 10,
+                },
+            },
+        )
+        assert_matches_type(Optional[ConfigurationUpdateResponse], configuration, path=["response"])
+
+    @parametrize
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zero_trust.tunnels.cloudflared.configurations.with_raw_response.update(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        configuration = response.parse()
+        assert_matches_type(Optional[ConfigurationUpdateResponse], configuration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zero_trust.tunnels.cloudflared.configurations.with_streaming_response.update(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            configuration = response.parse()
+            assert_matches_type(Optional[ConfigurationUpdateResponse], configuration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.configurations.with_raw_response.update(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.configurations.with_raw_response.update(
+                tunnel_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        configuration = client.zero_trust.tunnels.cloudflared.configurations.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ConfigurationGetResponse], configuration, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.tunnels.cloudflared.configurations.with_raw_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        configuration = response.parse()
+        assert_matches_type(Optional[ConfigurationGetResponse], configuration, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.tunnels.cloudflared.configurations.with_streaming_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            configuration = response.parse()
+            assert_matches_type(Optional[ConfigurationGetResponse], configuration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.configurations.with_raw_response.get(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.configurations.with_raw_response.get(
+                tunnel_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncConfigurations:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        configuration = await async_client.zero_trust.tunnels.cloudflared.configurations.update(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ConfigurationUpdateResponse], configuration, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        configuration = await async_client.zero_trust.tunnels.cloudflared.configurations.update(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            config={
+                "ingress": [
+                    {
+                        "hostname": "tunnel.example.com",
+                        "service": "https://localhost:8001",
+                        "origin_request": {
+                            "access": {
+                                "aud_tag": ["string"],
+                                "team_name": "zero-trust-organization-name",
+                                "required": False,
+                            },
+                            "ca_pool": "caPool",
+                            "connect_timeout": 10,
+                            "disable_chunked_encoding": True,
+                            "http2_origin": True,
+                            "http_host_header": "httpHostHeader",
+                            "keep_alive_connections": 100,
+                            "keep_alive_timeout": 90,
+                            "match_sn_ito_host": False,
+                            "no_happy_eyeballs": False,
+                            "no_tls_verify": False,
+                            "origin_server_name": "originServerName",
+                            "proxy_type": "proxyType",
+                            "tcp_keep_alive": 30,
+                            "tls_timeout": 10,
+                        },
+                        "path": "subpath",
+                    }
+                ],
+                "origin_request": {
+                    "access": {
+                        "aud_tag": ["string"],
+                        "team_name": "zero-trust-organization-name",
+                        "required": False,
+                    },
+                    "ca_pool": "caPool",
+                    "connect_timeout": 10,
+                    "disable_chunked_encoding": True,
+                    "http2_origin": True,
+                    "http_host_header": "httpHostHeader",
+                    "keep_alive_connections": 100,
+                    "keep_alive_timeout": 90,
+                    "match_sn_ito_host": False,
+                    "no_happy_eyeballs": False,
+                    "no_tls_verify": False,
+                    "origin_server_name": "originServerName",
+                    "proxy_type": "proxyType",
+                    "tcp_keep_alive": 30,
+                    "tls_timeout": 10,
+                },
+            },
+        )
+        assert_matches_type(Optional[ConfigurationUpdateResponse], configuration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.tunnels.cloudflared.configurations.with_raw_response.update(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        configuration = await response.parse()
+        assert_matches_type(Optional[ConfigurationUpdateResponse], configuration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.tunnels.cloudflared.configurations.with_streaming_response.update(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            configuration = await response.parse()
+            assert_matches_type(Optional[ConfigurationUpdateResponse], configuration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.configurations.with_raw_response.update(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.configurations.with_raw_response.update(
+                tunnel_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        configuration = await async_client.zero_trust.tunnels.cloudflared.configurations.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(Optional[ConfigurationGetResponse], configuration, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.tunnels.cloudflared.configurations.with_raw_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        configuration = await response.parse()
+        assert_matches_type(Optional[ConfigurationGetResponse], configuration, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.tunnels.cloudflared.configurations.with_streaming_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            configuration = await response.parse()
+            assert_matches_type(Optional[ConfigurationGetResponse], configuration, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.configurations.with_raw_response.get(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.configurations.with_raw_response.get(
+                tunnel_id="",
+                account_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/zero_trust/tunnels/cloudflared/test_connections.py b/tests/api_resources/zero_trust/tunnels/cloudflared/test_connections.py
new file mode 100644
index 00000000000..76559a92398
--- /dev/null
+++ b/tests/api_resources/zero_trust/tunnels/cloudflared/test_connections.py
@@ -0,0 +1,235 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zero_trust.tunnels.cloudflared import Client
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestConnections:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        connection = client.zero_trust.tunnels.cloudflared.connections.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(object, connection, path=["response"])
+
+    @parametrize
+    def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
+        connection = client.zero_trust.tunnels.cloudflared.connections.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            client_id="1bedc50d-42b3-473c-b108-ff3d10c0d925",
+        )
+        assert_matches_type(object, connection, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.tunnels.cloudflared.connections.with_raw_response.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        connection = response.parse()
+        assert_matches_type(object, connection, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.tunnels.cloudflared.connections.with_streaming_response.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            connection = response.parse()
+            assert_matches_type(object, connection, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.connections.with_raw_response.delete(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.connections.with_raw_response.delete(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        connection = client.zero_trust.tunnels.cloudflared.connections.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(SyncSinglePage[Client], connection, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.tunnels.cloudflared.connections.with_raw_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        connection = response.parse()
+        assert_matches_type(SyncSinglePage[Client], connection, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.tunnels.cloudflared.connections.with_streaming_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            connection = response.parse()
+            assert_matches_type(SyncSinglePage[Client], connection, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.connections.with_raw_response.get(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.connections.with_raw_response.get(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+
+class TestAsyncConnections:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        connection = await async_client.zero_trust.tunnels.cloudflared.connections.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(object, connection, path=["response"])
+
+    @parametrize
+    async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        connection = await async_client.zero_trust.tunnels.cloudflared.connections.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            client_id="1bedc50d-42b3-473c-b108-ff3d10c0d925",
+        )
+        assert_matches_type(object, connection, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.tunnels.cloudflared.connections.with_raw_response.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        connection = await response.parse()
+        assert_matches_type(object, connection, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.tunnels.cloudflared.connections.with_streaming_response.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            connection = await response.parse()
+            assert_matches_type(object, connection, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.connections.with_raw_response.delete(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.connections.with_raw_response.delete(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        connection = await async_client.zero_trust.tunnels.cloudflared.connections.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(AsyncSinglePage[Client], connection, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.tunnels.cloudflared.connections.with_raw_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        connection = await response.parse()
+        assert_matches_type(AsyncSinglePage[Client], connection, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.tunnels.cloudflared.connections.with_streaming_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            connection = await response.parse()
+            assert_matches_type(AsyncSinglePage[Client], connection, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.connections.with_raw_response.get(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.connections.with_raw_response.get(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
diff --git a/tests/api_resources/zero_trust/tunnels/test_connectors.py b/tests/api_resources/zero_trust/tunnels/cloudflared/test_connectors.py
similarity index 82%
rename from tests/api_resources/zero_trust/tunnels/test_connectors.py
rename to tests/api_resources/zero_trust/tunnels/cloudflared/test_connectors.py
index 639188dd181..2b3d6203843 100644
--- a/tests/api_resources/zero_trust/tunnels/test_connectors.py
+++ b/tests/api_resources/zero_trust/tunnels/cloudflared/test_connectors.py
@@ -9,7 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.zero_trust.tunnels import Client
+from cloudflare.types.zero_trust.tunnels.cloudflared import Client
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -19,7 +19,7 @@ class TestConnectors:
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        connector = client.zero_trust.tunnels.connectors.get(
+        connector = client.zero_trust.tunnels.cloudflared.connectors.get(
             connector_id="1bedc50d-42b3-473c-b108-ff3d10c0d925",
             account_id="699d98642c564d2e855e9661899b7252",
             tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
@@ -28,7 +28,7 @@ def test_method_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.zero_trust.tunnels.connectors.with_raw_response.get(
+        response = client.zero_trust.tunnels.cloudflared.connectors.with_raw_response.get(
             connector_id="1bedc50d-42b3-473c-b108-ff3d10c0d925",
             account_id="699d98642c564d2e855e9661899b7252",
             tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
@@ -41,7 +41,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.zero_trust.tunnels.connectors.with_streaming_response.get(
+        with client.zero_trust.tunnels.cloudflared.connectors.with_streaming_response.get(
             connector_id="1bedc50d-42b3-473c-b108-ff3d10c0d925",
             account_id="699d98642c564d2e855e9661899b7252",
             tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
@@ -57,21 +57,21 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.tunnels.connectors.with_raw_response.get(
+            client.zero_trust.tunnels.cloudflared.connectors.with_raw_response.get(
                 connector_id="1bedc50d-42b3-473c-b108-ff3d10c0d925",
                 account_id="",
                 tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            client.zero_trust.tunnels.connectors.with_raw_response.get(
+            client.zero_trust.tunnels.cloudflared.connectors.with_raw_response.get(
                 connector_id="1bedc50d-42b3-473c-b108-ff3d10c0d925",
                 account_id="699d98642c564d2e855e9661899b7252",
                 tunnel_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `connector_id` but received ''"):
-            client.zero_trust.tunnels.connectors.with_raw_response.get(
+            client.zero_trust.tunnels.cloudflared.connectors.with_raw_response.get(
                 connector_id="",
                 account_id="699d98642c564d2e855e9661899b7252",
                 tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
@@ -79,11 +79,13 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncConnectors:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        connector = await async_client.zero_trust.tunnels.connectors.get(
+        connector = await async_client.zero_trust.tunnels.cloudflared.connectors.get(
             connector_id="1bedc50d-42b3-473c-b108-ff3d10c0d925",
             account_id="699d98642c564d2e855e9661899b7252",
             tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
@@ -92,7 +94,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.tunnels.connectors.with_raw_response.get(
+        response = await async_client.zero_trust.tunnels.cloudflared.connectors.with_raw_response.get(
             connector_id="1bedc50d-42b3-473c-b108-ff3d10c0d925",
             account_id="699d98642c564d2e855e9661899b7252",
             tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
@@ -105,7 +107,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.tunnels.connectors.with_streaming_response.get(
+        async with async_client.zero_trust.tunnels.cloudflared.connectors.with_streaming_response.get(
             connector_id="1bedc50d-42b3-473c-b108-ff3d10c0d925",
             account_id="699d98642c564d2e855e9661899b7252",
             tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
@@ -121,21 +123,21 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.tunnels.connectors.with_raw_response.get(
+            await async_client.zero_trust.tunnels.cloudflared.connectors.with_raw_response.get(
                 connector_id="1bedc50d-42b3-473c-b108-ff3d10c0d925",
                 account_id="",
                 tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            await async_client.zero_trust.tunnels.connectors.with_raw_response.get(
+            await async_client.zero_trust.tunnels.cloudflared.connectors.with_raw_response.get(
                 connector_id="1bedc50d-42b3-473c-b108-ff3d10c0d925",
                 account_id="699d98642c564d2e855e9661899b7252",
                 tunnel_id="",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `connector_id` but received ''"):
-            await async_client.zero_trust.tunnels.connectors.with_raw_response.get(
+            await async_client.zero_trust.tunnels.cloudflared.connectors.with_raw_response.get(
                 connector_id="",
                 account_id="699d98642c564d2e855e9661899b7252",
                 tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
diff --git a/tests/api_resources/zero_trust/tunnels/cloudflared/test_management.py b/tests/api_resources/zero_trust/tunnels/cloudflared/test_management.py
new file mode 100644
index 00000000000..60cc2e6707e
--- /dev/null
+++ b/tests/api_resources/zero_trust/tunnels/cloudflared/test_management.py
@@ -0,0 +1,129 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestManagement:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        management = client.zero_trust.tunnels.cloudflared.management.create(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            resources=["logs"],
+        )
+        assert_matches_type(str, management, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.tunnels.cloudflared.management.with_raw_response.create(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            resources=["logs"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        management = response.parse()
+        assert_matches_type(str, management, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.tunnels.cloudflared.management.with_streaming_response.create(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            resources=["logs"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            management = response.parse()
+            assert_matches_type(str, management, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.management.with_raw_response.create(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                resources=["logs"],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.management.with_raw_response.create(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+                resources=["logs"],
+            )
+
+
+class TestAsyncManagement:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        management = await async_client.zero_trust.tunnels.cloudflared.management.create(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            resources=["logs"],
+        )
+        assert_matches_type(str, management, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.tunnels.cloudflared.management.with_raw_response.create(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            resources=["logs"],
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        management = await response.parse()
+        assert_matches_type(str, management, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.tunnels.cloudflared.management.with_streaming_response.create(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            resources=["logs"],
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            management = await response.parse()
+            assert_matches_type(str, management, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.management.with_raw_response.create(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+                resources=["logs"],
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.management.with_raw_response.create(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+                resources=["logs"],
+            )
diff --git a/tests/api_resources/zero_trust/tunnels/cloudflared/test_token.py b/tests/api_resources/zero_trust/tunnels/cloudflared/test_token.py
new file mode 100644
index 00000000000..afc44019f79
--- /dev/null
+++ b/tests/api_resources/zero_trust/tunnels/cloudflared/test_token.py
@@ -0,0 +1,119 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestToken:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        token = client.zero_trust.tunnels.cloudflared.token.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(str, token, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.tunnels.cloudflared.token.with_raw_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = response.parse()
+        assert_matches_type(str, token, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.tunnels.cloudflared.token.with_streaming_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = response.parse()
+            assert_matches_type(str, token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.token.with_raw_response.get(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.token.with_raw_response.get(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+
+class TestAsyncToken:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        token = await async_client.zero_trust.tunnels.cloudflared.token.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(str, token, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.tunnels.cloudflared.token.with_raw_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = await response.parse()
+        assert_matches_type(str, token, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.tunnels.cloudflared.token.with_streaming_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = await response.parse()
+            assert_matches_type(str, token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.token.with_raw_response.get(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.token.with_raw_response.get(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
diff --git a/tests/api_resources/zero_trust/tunnels/test_cloudflared.py b/tests/api_resources/zero_trust/tunnels/test_cloudflared.py
new file mode 100644
index 00000000000..060d1467e21
--- /dev/null
+++ b/tests/api_resources/zero_trust/tunnels/test_cloudflared.py
@@ -0,0 +1,550 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.shared import CloudflareTunnel
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestCloudflared:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        cloudflared = client.zero_trust.tunnels.cloudflared.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="blog",
+        )
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    def test_method_create_with_all_params(self, client: Cloudflare) -> None:
+        cloudflared = client.zero_trust.tunnels.cloudflared.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="blog",
+            config_src="cloudflare",
+            tunnel_secret="AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
+        )
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.tunnels.cloudflared.with_raw_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="blog",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloudflared = response.parse()
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.tunnels.cloudflared.with_streaming_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="blog",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloudflared = response.parse()
+            assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.with_raw_response.create(
+                account_id="",
+                name="blog",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        cloudflared = client.zero_trust.tunnels.cloudflared.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[CloudflareTunnel], cloudflared, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        cloudflared = client.zero_trust.tunnels.cloudflared.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+            exclude_prefix="vpc1-",
+            existed_at="2019-10-12T07%3A20%3A50.52Z",
+            include_prefix="vpc1-",
+            is_deleted=True,
+            name="blog",
+            page=1,
+            per_page=1,
+            status="healthy",
+            uuid="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            was_active_at=parse_datetime("2009-11-10T23:00:00Z"),
+            was_inactive_at=parse_datetime("2009-11-10T23:00:00Z"),
+        )
+        assert_matches_type(SyncV4PagePaginationArray[CloudflareTunnel], cloudflared, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.tunnels.cloudflared.with_raw_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloudflared = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[CloudflareTunnel], cloudflared, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.tunnels.cloudflared.with_streaming_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloudflared = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[CloudflareTunnel], cloudflared, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        cloudflared = client.zero_trust.tunnels.cloudflared.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.tunnels.cloudflared.with_raw_response.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloudflared = response.parse()
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.tunnels.cloudflared.with_streaming_response.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloudflared = response.parse()
+            assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.with_raw_response.delete(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.with_raw_response.delete(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        cloudflared = client.zero_trust.tunnels.cloudflared.edit(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        cloudflared = client.zero_trust.tunnels.cloudflared.edit(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="blog",
+            tunnel_secret="AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
+        )
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.zero_trust.tunnels.cloudflared.with_raw_response.edit(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloudflared = response.parse()
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.zero_trust.tunnels.cloudflared.with_streaming_response.edit(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloudflared = response.parse()
+            assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.with_raw_response.edit(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.with_raw_response.edit(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        cloudflared = client.zero_trust.tunnels.cloudflared.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.tunnels.cloudflared.with_raw_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloudflared = response.parse()
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.tunnels.cloudflared.with_streaming_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloudflared = response.parse()
+            assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.with_raw_response.get(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            client.zero_trust.tunnels.cloudflared.with_raw_response.get(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+
+class TestAsyncCloudflared:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        cloudflared = await async_client.zero_trust.tunnels.cloudflared.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="blog",
+        )
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cloudflared = await async_client.zero_trust.tunnels.cloudflared.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="blog",
+            config_src="cloudflare",
+            tunnel_secret="AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
+        )
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.tunnels.cloudflared.with_raw_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="blog",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloudflared = await response.parse()
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.tunnels.cloudflared.with_streaming_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="blog",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloudflared = await response.parse()
+            assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.with_raw_response.create(
+                account_id="",
+                name="blog",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        cloudflared = await async_client.zero_trust.tunnels.cloudflared.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[CloudflareTunnel], cloudflared, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cloudflared = await async_client.zero_trust.tunnels.cloudflared.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+            exclude_prefix="vpc1-",
+            existed_at="2019-10-12T07%3A20%3A50.52Z",
+            include_prefix="vpc1-",
+            is_deleted=True,
+            name="blog",
+            page=1,
+            per_page=1,
+            status="healthy",
+            uuid="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            was_active_at=parse_datetime("2009-11-10T23:00:00Z"),
+            was_inactive_at=parse_datetime("2009-11-10T23:00:00Z"),
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[CloudflareTunnel], cloudflared, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.tunnels.cloudflared.with_raw_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloudflared = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[CloudflareTunnel], cloudflared, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.tunnels.cloudflared.with_streaming_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloudflared = await response.parse()
+            assert_matches_type(AsyncV4PagePaginationArray[CloudflareTunnel], cloudflared, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        cloudflared = await async_client.zero_trust.tunnels.cloudflared.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.tunnels.cloudflared.with_raw_response.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloudflared = await response.parse()
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.tunnels.cloudflared.with_streaming_response.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloudflared = await response.parse()
+            assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.with_raw_response.delete(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.with_raw_response.delete(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        cloudflared = await async_client.zero_trust.tunnels.cloudflared.edit(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        cloudflared = await async_client.zero_trust.tunnels.cloudflared.edit(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="blog",
+            tunnel_secret="AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
+        )
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.tunnels.cloudflared.with_raw_response.edit(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloudflared = await response.parse()
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.tunnels.cloudflared.with_streaming_response.edit(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloudflared = await response.parse()
+            assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.with_raw_response.edit(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.with_raw_response.edit(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        cloudflared = await async_client.zero_trust.tunnels.cloudflared.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.tunnels.cloudflared.with_raw_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        cloudflared = await response.parse()
+        assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.tunnels.cloudflared.with_streaming_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            cloudflared = await response.parse()
+            assert_matches_type(CloudflareTunnel, cloudflared, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.with_raw_response.get(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            await async_client.zero_trust.tunnels.cloudflared.with_raw_response.get(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
diff --git a/tests/api_resources/zero_trust/tunnels/test_configurations.py b/tests/api_resources/zero_trust/tunnels/test_configurations.py
deleted file mode 100644
index 91d499a1045..00000000000
--- a/tests/api_resources/zero_trust/tunnels/test_configurations.py
+++ /dev/null
@@ -1,433 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.zero_trust.tunnels import (
-    ConfigurationGetResponse,
-    ConfigurationUpdateResponse,
-)
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestConfigurations:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_update(self, client: Cloudflare) -> None:
-        configuration = client.zero_trust.tunnels.configurations.update(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(ConfigurationUpdateResponse, configuration, path=["response"])
-
-    @parametrize
-    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        configuration = client.zero_trust.tunnels.configurations.update(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            config={
-                "ingress": [
-                    {
-                        "hostname": "tunnel.example.com",
-                        "origin_request": {
-                            "access": {
-                                "aud_tag": ["string", "string", "string"],
-                                "required": True,
-                                "team_name": "teamName",
-                            },
-                            "ca_pool": "caPool",
-                            "connect_timeout": 0,
-                            "disable_chunked_encoding": True,
-                            "http2_origin": True,
-                            "http_host_header": "httpHostHeader",
-                            "keep_alive_connections": 0,
-                            "keep_alive_timeout": 0,
-                            "no_happy_eyeballs": True,
-                            "no_tls_verify": True,
-                            "origin_server_name": "originServerName",
-                            "proxy_type": "proxyType",
-                            "tcp_keep_alive": 0,
-                            "tls_timeout": 0,
-                        },
-                        "path": "subpath",
-                        "service": "https://localhost:8001",
-                    },
-                    {
-                        "hostname": "tunnel.example.com",
-                        "origin_request": {
-                            "access": {
-                                "aud_tag": ["string", "string", "string"],
-                                "required": True,
-                                "team_name": "teamName",
-                            },
-                            "ca_pool": "caPool",
-                            "connect_timeout": 0,
-                            "disable_chunked_encoding": True,
-                            "http2_origin": True,
-                            "http_host_header": "httpHostHeader",
-                            "keep_alive_connections": 0,
-                            "keep_alive_timeout": 0,
-                            "no_happy_eyeballs": True,
-                            "no_tls_verify": True,
-                            "origin_server_name": "originServerName",
-                            "proxy_type": "proxyType",
-                            "tcp_keep_alive": 0,
-                            "tls_timeout": 0,
-                        },
-                        "path": "subpath",
-                        "service": "https://localhost:8001",
-                    },
-                    {
-                        "hostname": "tunnel.example.com",
-                        "origin_request": {
-                            "access": {
-                                "aud_tag": ["string", "string", "string"],
-                                "required": True,
-                                "team_name": "teamName",
-                            },
-                            "ca_pool": "caPool",
-                            "connect_timeout": 0,
-                            "disable_chunked_encoding": True,
-                            "http2_origin": True,
-                            "http_host_header": "httpHostHeader",
-                            "keep_alive_connections": 0,
-                            "keep_alive_timeout": 0,
-                            "no_happy_eyeballs": True,
-                            "no_tls_verify": True,
-                            "origin_server_name": "originServerName",
-                            "proxy_type": "proxyType",
-                            "tcp_keep_alive": 0,
-                            "tls_timeout": 0,
-                        },
-                        "path": "subpath",
-                        "service": "https://localhost:8001",
-                    },
-                ],
-                "origin_request": {
-                    "access": {
-                        "aud_tag": ["string", "string", "string"],
-                        "required": True,
-                        "team_name": "teamName",
-                    },
-                    "ca_pool": "caPool",
-                    "connect_timeout": 0,
-                    "disable_chunked_encoding": True,
-                    "http2_origin": True,
-                    "http_host_header": "httpHostHeader",
-                    "keep_alive_connections": 0,
-                    "keep_alive_timeout": 0,
-                    "no_happy_eyeballs": True,
-                    "no_tls_verify": True,
-                    "origin_server_name": "originServerName",
-                    "proxy_type": "proxyType",
-                    "tcp_keep_alive": 0,
-                    "tls_timeout": 0,
-                },
-                "warp_routing": {"enabled": True},
-            },
-        )
-        assert_matches_type(ConfigurationUpdateResponse, configuration, path=["response"])
-
-    @parametrize
-    def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.zero_trust.tunnels.configurations.with_raw_response.update(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        configuration = response.parse()
-        assert_matches_type(ConfigurationUpdateResponse, configuration, path=["response"])
-
-    @parametrize
-    def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.zero_trust.tunnels.configurations.with_streaming_response.update(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            configuration = response.parse()
-            assert_matches_type(ConfigurationUpdateResponse, configuration, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.tunnels.configurations.with_raw_response.update(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            client.zero_trust.tunnels.configurations.with_raw_response.update(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        configuration = client.zero_trust.tunnels.configurations.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(ConfigurationGetResponse, configuration, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.zero_trust.tunnels.configurations.with_raw_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        configuration = response.parse()
-        assert_matches_type(ConfigurationGetResponse, configuration, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.zero_trust.tunnels.configurations.with_streaming_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            configuration = response.parse()
-            assert_matches_type(ConfigurationGetResponse, configuration, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.tunnels.configurations.with_raw_response.get(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            client.zero_trust.tunnels.configurations.with_raw_response.get(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-
-class TestAsyncConfigurations:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        configuration = await async_client.zero_trust.tunnels.configurations.update(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(ConfigurationUpdateResponse, configuration, path=["response"])
-
-    @parametrize
-    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        configuration = await async_client.zero_trust.tunnels.configurations.update(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            config={
-                "ingress": [
-                    {
-                        "hostname": "tunnel.example.com",
-                        "origin_request": {
-                            "access": {
-                                "aud_tag": ["string", "string", "string"],
-                                "required": True,
-                                "team_name": "teamName",
-                            },
-                            "ca_pool": "caPool",
-                            "connect_timeout": 0,
-                            "disable_chunked_encoding": True,
-                            "http2_origin": True,
-                            "http_host_header": "httpHostHeader",
-                            "keep_alive_connections": 0,
-                            "keep_alive_timeout": 0,
-                            "no_happy_eyeballs": True,
-                            "no_tls_verify": True,
-                            "origin_server_name": "originServerName",
-                            "proxy_type": "proxyType",
-                            "tcp_keep_alive": 0,
-                            "tls_timeout": 0,
-                        },
-                        "path": "subpath",
-                        "service": "https://localhost:8001",
-                    },
-                    {
-                        "hostname": "tunnel.example.com",
-                        "origin_request": {
-                            "access": {
-                                "aud_tag": ["string", "string", "string"],
-                                "required": True,
-                                "team_name": "teamName",
-                            },
-                            "ca_pool": "caPool",
-                            "connect_timeout": 0,
-                            "disable_chunked_encoding": True,
-                            "http2_origin": True,
-                            "http_host_header": "httpHostHeader",
-                            "keep_alive_connections": 0,
-                            "keep_alive_timeout": 0,
-                            "no_happy_eyeballs": True,
-                            "no_tls_verify": True,
-                            "origin_server_name": "originServerName",
-                            "proxy_type": "proxyType",
-                            "tcp_keep_alive": 0,
-                            "tls_timeout": 0,
-                        },
-                        "path": "subpath",
-                        "service": "https://localhost:8001",
-                    },
-                    {
-                        "hostname": "tunnel.example.com",
-                        "origin_request": {
-                            "access": {
-                                "aud_tag": ["string", "string", "string"],
-                                "required": True,
-                                "team_name": "teamName",
-                            },
-                            "ca_pool": "caPool",
-                            "connect_timeout": 0,
-                            "disable_chunked_encoding": True,
-                            "http2_origin": True,
-                            "http_host_header": "httpHostHeader",
-                            "keep_alive_connections": 0,
-                            "keep_alive_timeout": 0,
-                            "no_happy_eyeballs": True,
-                            "no_tls_verify": True,
-                            "origin_server_name": "originServerName",
-                            "proxy_type": "proxyType",
-                            "tcp_keep_alive": 0,
-                            "tls_timeout": 0,
-                        },
-                        "path": "subpath",
-                        "service": "https://localhost:8001",
-                    },
-                ],
-                "origin_request": {
-                    "access": {
-                        "aud_tag": ["string", "string", "string"],
-                        "required": True,
-                        "team_name": "teamName",
-                    },
-                    "ca_pool": "caPool",
-                    "connect_timeout": 0,
-                    "disable_chunked_encoding": True,
-                    "http2_origin": True,
-                    "http_host_header": "httpHostHeader",
-                    "keep_alive_connections": 0,
-                    "keep_alive_timeout": 0,
-                    "no_happy_eyeballs": True,
-                    "no_tls_verify": True,
-                    "origin_server_name": "originServerName",
-                    "proxy_type": "proxyType",
-                    "tcp_keep_alive": 0,
-                    "tls_timeout": 0,
-                },
-                "warp_routing": {"enabled": True},
-            },
-        )
-        assert_matches_type(ConfigurationUpdateResponse, configuration, path=["response"])
-
-    @parametrize
-    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.tunnels.configurations.with_raw_response.update(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        configuration = await response.parse()
-        assert_matches_type(ConfigurationUpdateResponse, configuration, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.tunnels.configurations.with_streaming_response.update(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            configuration = await response.parse()
-            assert_matches_type(ConfigurationUpdateResponse, configuration, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.tunnels.configurations.with_raw_response.update(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            await async_client.zero_trust.tunnels.configurations.with_raw_response.update(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        configuration = await async_client.zero_trust.tunnels.configurations.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(ConfigurationGetResponse, configuration, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.tunnels.configurations.with_raw_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        configuration = await response.parse()
-        assert_matches_type(ConfigurationGetResponse, configuration, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.tunnels.configurations.with_streaming_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            configuration = await response.parse()
-            assert_matches_type(ConfigurationGetResponse, configuration, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.tunnels.configurations.with_raw_response.get(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            await async_client.zero_trust.tunnels.configurations.with_raw_response.get(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
diff --git a/tests/api_resources/zero_trust/tunnels/test_connections.py b/tests/api_resources/zero_trust/tunnels/test_connections.py
deleted file mode 100644
index a840ee0c72a..00000000000
--- a/tests/api_resources/zero_trust/tunnels/test_connections.py
+++ /dev/null
@@ -1,214 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, Optional, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.zero_trust.tunnels import ConnectionGetResponse, ConnectionDeleteResponse
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestConnections:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_delete(self, client: Cloudflare) -> None:
-        connection = client.zero_trust.tunnels.connections.delete(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(ConnectionDeleteResponse, connection, path=["response"])
-
-    @parametrize
-    def test_raw_response_delete(self, client: Cloudflare) -> None:
-        response = client.zero_trust.tunnels.connections.with_raw_response.delete(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        connection = response.parse()
-        assert_matches_type(ConnectionDeleteResponse, connection, path=["response"])
-
-    @parametrize
-    def test_streaming_response_delete(self, client: Cloudflare) -> None:
-        with client.zero_trust.tunnels.connections.with_streaming_response.delete(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            connection = response.parse()
-            assert_matches_type(ConnectionDeleteResponse, connection, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_delete(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.tunnels.connections.with_raw_response.delete(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            client.zero_trust.tunnels.connections.with_raw_response.delete(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        connection = client.zero_trust.tunnels.connections.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(Optional[ConnectionGetResponse], connection, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.zero_trust.tunnels.connections.with_raw_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        connection = response.parse()
-        assert_matches_type(Optional[ConnectionGetResponse], connection, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.zero_trust.tunnels.connections.with_streaming_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            connection = response.parse()
-            assert_matches_type(Optional[ConnectionGetResponse], connection, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.tunnels.connections.with_raw_response.get(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            client.zero_trust.tunnels.connections.with_raw_response.get(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-
-class TestAsyncConnections:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
-        connection = await async_client.zero_trust.tunnels.connections.delete(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(ConnectionDeleteResponse, connection, path=["response"])
-
-    @parametrize
-    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.tunnels.connections.with_raw_response.delete(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        connection = await response.parse()
-        assert_matches_type(ConnectionDeleteResponse, connection, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.tunnels.connections.with_streaming_response.delete(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            connection = await response.parse()
-            assert_matches_type(ConnectionDeleteResponse, connection, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.tunnels.connections.with_raw_response.delete(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            await async_client.zero_trust.tunnels.connections.with_raw_response.delete(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        connection = await async_client.zero_trust.tunnels.connections.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(Optional[ConnectionGetResponse], connection, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.tunnels.connections.with_raw_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        connection = await response.parse()
-        assert_matches_type(Optional[ConnectionGetResponse], connection, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.tunnels.connections.with_streaming_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            connection = await response.parse()
-            assert_matches_type(Optional[ConnectionGetResponse], connection, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.tunnels.connections.with_raw_response.get(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            await async_client.zero_trust.tunnels.connections.with_raw_response.get(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
diff --git a/tests/api_resources/zero_trust/tunnels/test_management.py b/tests/api_resources/zero_trust/tunnels/test_management.py
deleted file mode 100644
index 9bb75d7bc69..00000000000
--- a/tests/api_resources/zero_trust/tunnels/test_management.py
+++ /dev/null
@@ -1,128 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.zero_trust.tunnels import ManagementCreateResponse
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestManagement:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_create(self, client: Cloudflare) -> None:
-        management = client.zero_trust.tunnels.management.create(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            resources=["logs"],
-        )
-        assert_matches_type(ManagementCreateResponse, management, path=["response"])
-
-    @parametrize
-    def test_raw_response_create(self, client: Cloudflare) -> None:
-        response = client.zero_trust.tunnels.management.with_raw_response.create(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            resources=["logs"],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        management = response.parse()
-        assert_matches_type(ManagementCreateResponse, management, path=["response"])
-
-    @parametrize
-    def test_streaming_response_create(self, client: Cloudflare) -> None:
-        with client.zero_trust.tunnels.management.with_streaming_response.create(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            resources=["logs"],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            management = response.parse()
-            assert_matches_type(ManagementCreateResponse, management, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.tunnels.management.with_raw_response.create(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-                resources=["logs"],
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            client.zero_trust.tunnels.management.with_raw_response.create(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-                resources=["logs"],
-            )
-
-
-class TestAsyncManagement:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
-        management = await async_client.zero_trust.tunnels.management.create(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            resources=["logs"],
-        )
-        assert_matches_type(ManagementCreateResponse, management, path=["response"])
-
-    @parametrize
-    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.tunnels.management.with_raw_response.create(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            resources=["logs"],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        management = await response.parse()
-        assert_matches_type(ManagementCreateResponse, management, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.tunnels.management.with_streaming_response.create(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-            resources=["logs"],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            management = await response.parse()
-            assert_matches_type(ManagementCreateResponse, management, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.tunnels.management.with_raw_response.create(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-                resources=["logs"],
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            await async_client.zero_trust.tunnels.management.with_raw_response.create(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-                resources=["logs"],
-            )
diff --git a/tests/api_resources/zero_trust/tunnels/test_token.py b/tests/api_resources/zero_trust/tunnels/test_token.py
deleted file mode 100644
index ee47c8bf24e..00000000000
--- a/tests/api_resources/zero_trust/tunnels/test_token.py
+++ /dev/null
@@ -1,118 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-import os
-from typing import Any, cast
-
-import pytest
-
-from cloudflare import Cloudflare, AsyncCloudflare
-from tests.utils import assert_matches_type
-from cloudflare.types.zero_trust.tunnels import TokenGetResponse
-
-base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
-
-
-class TestToken:
-    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        token = client.zero_trust.tunnels.token.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(TokenGetResponse, token, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.zero_trust.tunnels.token.with_raw_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        token = response.parse()
-        assert_matches_type(TokenGetResponse, token, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.zero_trust.tunnels.token.with_streaming_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            token = response.parse()
-            assert_matches_type(TokenGetResponse, token, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            client.zero_trust.tunnels.token.with_raw_response.get(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            client.zero_trust.tunnels.token.with_raw_response.get(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
-
-
-class TestAsyncToken:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        token = await async_client.zero_trust.tunnels.token.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-        assert_matches_type(TokenGetResponse, token, path=["response"])
-
-    @parametrize
-    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zero_trust.tunnels.token.with_raw_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        token = await response.parse()
-        assert_matches_type(TokenGetResponse, token, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zero_trust.tunnels.token.with_streaming_response.get(
-            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-            account_id="699d98642c564d2e855e9661899b7252",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            token = await response.parse()
-            assert_matches_type(TokenGetResponse, token, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
-            await async_client.zero_trust.tunnels.token.with_raw_response.get(
-                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
-                account_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
-            await async_client.zero_trust.tunnels.token.with_raw_response.get(
-                tunnel_id="",
-                account_id="699d98642c564d2e855e9661899b7252",
-            )
diff --git a/tests/api_resources/zero_trust/tunnels/test_warp_connector.py b/tests/api_resources/zero_trust/tunnels/test_warp_connector.py
new file mode 100644
index 00000000000..dee06560f20
--- /dev/null
+++ b/tests/api_resources/zero_trust/tunnels/test_warp_connector.py
@@ -0,0 +1,538 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare._utils import parse_datetime
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.zero_trust.tunnels import (
+    WARPConnectorGetResponse,
+    WARPConnectorEditResponse,
+    WARPConnectorListResponse,
+    WARPConnectorCreateResponse,
+    WARPConnectorDeleteResponse,
+)
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestWARPConnector:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_create(self, client: Cloudflare) -> None:
+        warp_connector = client.zero_trust.tunnels.warp_connector.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="blog",
+        )
+        assert_matches_type(WARPConnectorCreateResponse, warp_connector, path=["response"])
+
+    @parametrize
+    def test_raw_response_create(self, client: Cloudflare) -> None:
+        response = client.zero_trust.tunnels.warp_connector.with_raw_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="blog",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        warp_connector = response.parse()
+        assert_matches_type(WARPConnectorCreateResponse, warp_connector, path=["response"])
+
+    @parametrize
+    def test_streaming_response_create(self, client: Cloudflare) -> None:
+        with client.zero_trust.tunnels.warp_connector.with_streaming_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="blog",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            warp_connector = response.parse()
+            assert_matches_type(WARPConnectorCreateResponse, warp_connector, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_create(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.tunnels.warp_connector.with_raw_response.create(
+                account_id="",
+                name="blog",
+            )
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        warp_connector = client.zero_trust.tunnels.warp_connector.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(SyncV4PagePaginationArray[WARPConnectorListResponse], warp_connector, path=["response"])
+
+    @parametrize
+    def test_method_list_with_all_params(self, client: Cloudflare) -> None:
+        warp_connector = client.zero_trust.tunnels.warp_connector.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+            exclude_prefix="vpc1-",
+            existed_at="2019-10-12T07%3A20%3A50.52Z",
+            include_prefix="vpc1-",
+            is_deleted=True,
+            name="blog",
+            page=1,
+            per_page=1,
+            status="healthy",
+            uuid="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            was_active_at=parse_datetime("2009-11-10T23:00:00Z"),
+            was_inactive_at=parse_datetime("2009-11-10T23:00:00Z"),
+        )
+        assert_matches_type(SyncV4PagePaginationArray[WARPConnectorListResponse], warp_connector, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zero_trust.tunnels.warp_connector.with_raw_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        warp_connector = response.parse()
+        assert_matches_type(SyncV4PagePaginationArray[WARPConnectorListResponse], warp_connector, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zero_trust.tunnels.warp_connector.with_streaming_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            warp_connector = response.parse()
+            assert_matches_type(SyncV4PagePaginationArray[WARPConnectorListResponse], warp_connector, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.tunnels.warp_connector.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    def test_method_delete(self, client: Cloudflare) -> None:
+        warp_connector = client.zero_trust.tunnels.warp_connector.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(WARPConnectorDeleteResponse, warp_connector, path=["response"])
+
+    @parametrize
+    def test_raw_response_delete(self, client: Cloudflare) -> None:
+        response = client.zero_trust.tunnels.warp_connector.with_raw_response.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        warp_connector = response.parse()
+        assert_matches_type(WARPConnectorDeleteResponse, warp_connector, path=["response"])
+
+    @parametrize
+    def test_streaming_response_delete(self, client: Cloudflare) -> None:
+        with client.zero_trust.tunnels.warp_connector.with_streaming_response.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            warp_connector = response.parse()
+            assert_matches_type(WARPConnectorDeleteResponse, warp_connector, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_delete(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.tunnels.warp_connector.with_raw_response.delete(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            client.zero_trust.tunnels.warp_connector.with_raw_response.delete(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        warp_connector = client.zero_trust.tunnels.warp_connector.edit(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(WARPConnectorEditResponse, warp_connector, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        warp_connector = client.zero_trust.tunnels.warp_connector.edit(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="blog",
+            tunnel_secret="AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
+        )
+        assert_matches_type(WARPConnectorEditResponse, warp_connector, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.zero_trust.tunnels.warp_connector.with_raw_response.edit(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        warp_connector = response.parse()
+        assert_matches_type(WARPConnectorEditResponse, warp_connector, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.zero_trust.tunnels.warp_connector.with_streaming_response.edit(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            warp_connector = response.parse()
+            assert_matches_type(WARPConnectorEditResponse, warp_connector, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.tunnels.warp_connector.with_raw_response.edit(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            client.zero_trust.tunnels.warp_connector.with_raw_response.edit(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        warp_connector = client.zero_trust.tunnels.warp_connector.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(WARPConnectorGetResponse, warp_connector, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.tunnels.warp_connector.with_raw_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        warp_connector = response.parse()
+        assert_matches_type(WARPConnectorGetResponse, warp_connector, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.tunnels.warp_connector.with_streaming_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            warp_connector = response.parse()
+            assert_matches_type(WARPConnectorGetResponse, warp_connector, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.tunnels.warp_connector.with_raw_response.get(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            client.zero_trust.tunnels.warp_connector.with_raw_response.get(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+
+class TestAsyncWARPConnector:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_create(self, async_client: AsyncCloudflare) -> None:
+        warp_connector = await async_client.zero_trust.tunnels.warp_connector.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="blog",
+        )
+        assert_matches_type(WARPConnectorCreateResponse, warp_connector, path=["response"])
+
+    @parametrize
+    async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.tunnels.warp_connector.with_raw_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="blog",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        warp_connector = await response.parse()
+        assert_matches_type(WARPConnectorCreateResponse, warp_connector, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.tunnels.warp_connector.with_streaming_response.create(
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="blog",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            warp_connector = await response.parse()
+            assert_matches_type(WARPConnectorCreateResponse, warp_connector, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.tunnels.warp_connector.with_raw_response.create(
+                account_id="",
+                name="blog",
+            )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        warp_connector = await async_client.zero_trust.tunnels.warp_connector.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[WARPConnectorListResponse], warp_connector, path=["response"])
+
+    @parametrize
+    async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        warp_connector = await async_client.zero_trust.tunnels.warp_connector.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+            exclude_prefix="vpc1-",
+            existed_at="2019-10-12T07%3A20%3A50.52Z",
+            include_prefix="vpc1-",
+            is_deleted=True,
+            name="blog",
+            page=1,
+            per_page=1,
+            status="healthy",
+            uuid="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            was_active_at=parse_datetime("2009-11-10T23:00:00Z"),
+            was_inactive_at=parse_datetime("2009-11-10T23:00:00Z"),
+        )
+        assert_matches_type(AsyncV4PagePaginationArray[WARPConnectorListResponse], warp_connector, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.tunnels.warp_connector.with_raw_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        warp_connector = await response.parse()
+        assert_matches_type(AsyncV4PagePaginationArray[WARPConnectorListResponse], warp_connector, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.tunnels.warp_connector.with_streaming_response.list(
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            warp_connector = await response.parse()
+            assert_matches_type(
+                AsyncV4PagePaginationArray[WARPConnectorListResponse], warp_connector, path=["response"]
+            )
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.tunnels.warp_connector.with_raw_response.list(
+                account_id="",
+            )
+
+    @parametrize
+    async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
+        warp_connector = await async_client.zero_trust.tunnels.warp_connector.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(WARPConnectorDeleteResponse, warp_connector, path=["response"])
+
+    @parametrize
+    async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.tunnels.warp_connector.with_raw_response.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        warp_connector = await response.parse()
+        assert_matches_type(WARPConnectorDeleteResponse, warp_connector, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.tunnels.warp_connector.with_streaming_response.delete(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            warp_connector = await response.parse()
+            assert_matches_type(WARPConnectorDeleteResponse, warp_connector, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.tunnels.warp_connector.with_raw_response.delete(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            await async_client.zero_trust.tunnels.warp_connector.with_raw_response.delete(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        warp_connector = await async_client.zero_trust.tunnels.warp_connector.edit(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(WARPConnectorEditResponse, warp_connector, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        warp_connector = await async_client.zero_trust.tunnels.warp_connector.edit(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+            name="blog",
+            tunnel_secret="AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
+        )
+        assert_matches_type(WARPConnectorEditResponse, warp_connector, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.tunnels.warp_connector.with_raw_response.edit(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        warp_connector = await response.parse()
+        assert_matches_type(WARPConnectorEditResponse, warp_connector, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.tunnels.warp_connector.with_streaming_response.edit(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            warp_connector = await response.parse()
+            assert_matches_type(WARPConnectorEditResponse, warp_connector, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.tunnels.warp_connector.with_raw_response.edit(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            await async_client.zero_trust.tunnels.warp_connector.with_raw_response.edit(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        warp_connector = await async_client.zero_trust.tunnels.warp_connector.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(WARPConnectorGetResponse, warp_connector, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.tunnels.warp_connector.with_raw_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        warp_connector = await response.parse()
+        assert_matches_type(WARPConnectorGetResponse, warp_connector, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.tunnels.warp_connector.with_streaming_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            warp_connector = await response.parse()
+            assert_matches_type(WARPConnectorGetResponse, warp_connector, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.tunnels.warp_connector.with_raw_response.get(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            await async_client.zero_trust.tunnels.warp_connector.with_raw_response.get(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
diff --git a/tests/api_resources/zero_trust/tunnels/warp_connector/__init__.py b/tests/api_resources/zero_trust/tunnels/warp_connector/__init__.py
new file mode 100644
index 00000000000..fd8019a9a1a
--- /dev/null
+++ b/tests/api_resources/zero_trust/tunnels/warp_connector/__init__.py
@@ -0,0 +1 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
diff --git a/tests/api_resources/zero_trust/tunnels/warp_connector/test_token.py b/tests/api_resources/zero_trust/tunnels/warp_connector/test_token.py
new file mode 100644
index 00000000000..2a2d98cc44d
--- /dev/null
+++ b/tests/api_resources/zero_trust/tunnels/warp_connector/test_token.py
@@ -0,0 +1,119 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestToken:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        token = client.zero_trust.tunnels.warp_connector.token.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(str, token, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zero_trust.tunnels.warp_connector.token.with_raw_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = response.parse()
+        assert_matches_type(str, token, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zero_trust.tunnels.warp_connector.token.with_streaming_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = response.parse()
+            assert_matches_type(str, token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            client.zero_trust.tunnels.warp_connector.token.with_raw_response.get(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            client.zero_trust.tunnels.warp_connector.token.with_raw_response.get(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
+
+
+class TestAsyncToken:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        token = await async_client.zero_trust.tunnels.warp_connector.token.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+        assert_matches_type(str, token, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zero_trust.tunnels.warp_connector.token.with_raw_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        token = await response.parse()
+        assert_matches_type(str, token, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zero_trust.tunnels.warp_connector.token.with_streaming_response.get(
+            tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+            account_id="699d98642c564d2e855e9661899b7252",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            token = await response.parse()
+            assert_matches_type(str, token, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"):
+            await async_client.zero_trust.tunnels.warp_connector.token.with_raw_response.get(
+                tunnel_id="f70ff985-a4ef-4643-bbbc-4a0ed4fc8415",
+                account_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `tunnel_id` but received ''"):
+            await async_client.zero_trust.tunnels.warp_connector.token.with_raw_response.get(
+                tunnel_id="",
+                account_id="699d98642c564d2e855e9661899b7252",
+            )
diff --git a/tests/api_resources/zones/test_activation_check.py b/tests/api_resources/zones/test_activation_check.py
index a78a1d1567b..267737f406d 100644
--- a/tests/api_resources/zones/test_activation_check.py
+++ b/tests/api_resources/zones/test_activation_check.py
@@ -57,7 +57,9 @@ def test_path_params_trigger(self, client: Cloudflare) -> None:
 
 
 class TestAsyncActivationCheck:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_trigger(self, async_client: AsyncCloudflare) -> None:
diff --git a/tests/api_resources/zones/test_custom_nameservers.py b/tests/api_resources/zones/test_custom_nameservers.py
index 8e213481da5..48ba893c07a 100644
--- a/tests/api_resources/zones/test_custom_nameservers.py
+++ b/tests/api_resources/zones/test_custom_nameservers.py
@@ -3,17 +3,20 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
 from cloudflare.types.zones import (
     CustomNameserverGetResponse,
     CustomNameserverUpdateResponse,
 )
 
+# pyright: reportDeprecated=false
+
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
 
@@ -22,174 +25,204 @@ class TestCustomNameservers:
 
     @parametrize
     def test_method_update(self, client: Cloudflare) -> None:
-        custom_nameserver = client.zones.custom_nameservers.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[CustomNameserverUpdateResponse], custom_nameserver, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            custom_nameserver = client.zones.custom_nameservers.update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(SyncSinglePage[CustomNameserverUpdateResponse], custom_nameserver, path=["response"])
 
     @parametrize
     def test_method_update_with_all_params(self, client: Cloudflare) -> None:
-        custom_nameserver = client.zones.custom_nameservers.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            enabled=True,
-            ns_set=1,
-        )
-        assert_matches_type(Optional[CustomNameserverUpdateResponse], custom_nameserver, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            custom_nameserver = client.zones.custom_nameservers.update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                enabled=True,
+                ns_set=1,
+            )
+
+        assert_matches_type(SyncSinglePage[CustomNameserverUpdateResponse], custom_nameserver, path=["response"])
 
     @parametrize
     def test_raw_response_update(self, client: Cloudflare) -> None:
-        response = client.zones.custom_nameservers.with_raw_response.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.zones.custom_nameservers.with_raw_response.update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom_nameserver = response.parse()
-        assert_matches_type(Optional[CustomNameserverUpdateResponse], custom_nameserver, path=["response"])
+        assert_matches_type(SyncSinglePage[CustomNameserverUpdateResponse], custom_nameserver, path=["response"])
 
     @parametrize
     def test_streaming_response_update(self, client: Cloudflare) -> None:
-        with client.zones.custom_nameservers.with_streaming_response.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            custom_nameserver = response.parse()
-            assert_matches_type(Optional[CustomNameserverUpdateResponse], custom_nameserver, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            with client.zones.custom_nameservers.with_streaming_response.update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                custom_nameserver = response.parse()
+                assert_matches_type(
+                    SyncSinglePage[CustomNameserverUpdateResponse], custom_nameserver, path=["response"]
+                )
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_update(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.custom_nameservers.with_raw_response.update(
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.zones.custom_nameservers.with_raw_response.update(
+                    zone_id="",
+                )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
-        custom_nameserver = client.zones.custom_nameservers.get(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[CustomNameserverGetResponse], custom_nameserver, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            custom_nameserver = client.zones.custom_nameservers.get(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(CustomNameserverGetResponse, custom_nameserver, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.zones.custom_nameservers.with_raw_response.get(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = client.zones.custom_nameservers.with_raw_response.get(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom_nameserver = response.parse()
-        assert_matches_type(Optional[CustomNameserverGetResponse], custom_nameserver, path=["response"])
+        assert_matches_type(CustomNameserverGetResponse, custom_nameserver, path=["response"])
 
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.zones.custom_nameservers.with_streaming_response.get(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            with client.zones.custom_nameservers.with_streaming_response.get(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            custom_nameserver = response.parse()
-            assert_matches_type(Optional[CustomNameserverGetResponse], custom_nameserver, path=["response"])
+                custom_nameserver = response.parse()
+                assert_matches_type(CustomNameserverGetResponse, custom_nameserver, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.custom_nameservers.with_raw_response.get(
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                client.zones.custom_nameservers.with_raw_response.get(
+                    zone_id="",
+                )
 
 
 class TestAsyncCustomNameservers:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_update(self, async_client: AsyncCloudflare) -> None:
-        custom_nameserver = await async_client.zones.custom_nameservers.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[CustomNameserverUpdateResponse], custom_nameserver, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            custom_nameserver = await async_client.zones.custom_nameservers.update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(AsyncSinglePage[CustomNameserverUpdateResponse], custom_nameserver, path=["response"])
 
     @parametrize
     async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
-        custom_nameserver = await async_client.zones.custom_nameservers.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            enabled=True,
-            ns_set=1,
-        )
-        assert_matches_type(Optional[CustomNameserverUpdateResponse], custom_nameserver, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            custom_nameserver = await async_client.zones.custom_nameservers.update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+                enabled=True,
+                ns_set=1,
+            )
+
+        assert_matches_type(AsyncSinglePage[CustomNameserverUpdateResponse], custom_nameserver, path=["response"])
 
     @parametrize
     async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.custom_nameservers.with_raw_response.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.zones.custom_nameservers.with_raw_response.update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom_nameserver = await response.parse()
-        assert_matches_type(Optional[CustomNameserverUpdateResponse], custom_nameserver, path=["response"])
+        assert_matches_type(AsyncSinglePage[CustomNameserverUpdateResponse], custom_nameserver, path=["response"])
 
     @parametrize
     async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.custom_nameservers.with_streaming_response.update(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            custom_nameserver = await response.parse()
-            assert_matches_type(Optional[CustomNameserverUpdateResponse], custom_nameserver, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            async with async_client.zones.custom_nameservers.with_streaming_response.update(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+                custom_nameserver = await response.parse()
+                assert_matches_type(
+                    AsyncSinglePage[CustomNameserverUpdateResponse], custom_nameserver, path=["response"]
+                )
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.custom_nameservers.with_raw_response.update(
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.zones.custom_nameservers.with_raw_response.update(
+                    zone_id="",
+                )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
-        custom_nameserver = await async_client.zones.custom_nameservers.get(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[CustomNameserverGetResponse], custom_nameserver, path=["response"])
+        with pytest.warns(DeprecationWarning):
+            custom_nameserver = await async_client.zones.custom_nameservers.get(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+        assert_matches_type(CustomNameserverGetResponse, custom_nameserver, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.custom_nameservers.with_raw_response.get(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
+        with pytest.warns(DeprecationWarning):
+            response = await async_client.zones.custom_nameservers.with_raw_response.get(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         custom_nameserver = await response.parse()
-        assert_matches_type(Optional[CustomNameserverGetResponse], custom_nameserver, path=["response"])
+        assert_matches_type(CustomNameserverGetResponse, custom_nameserver, path=["response"])
 
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.custom_nameservers.with_streaming_response.get(
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        with pytest.warns(DeprecationWarning):
+            async with async_client.zones.custom_nameservers.with_streaming_response.get(
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            ) as response:
+                assert not response.is_closed
+                assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            custom_nameserver = await response.parse()
-            assert_matches_type(Optional[CustomNameserverGetResponse], custom_nameserver, path=["response"])
+                custom_nameserver = await response.parse()
+                assert_matches_type(CustomNameserverGetResponse, custom_nameserver, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.custom_nameservers.with_raw_response.get(
-                zone_id="",
-            )
+        with pytest.warns(DeprecationWarning):
+            with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+                await async_client.zones.custom_nameservers.with_raw_response.get(
+                    zone_id="",
+                )
diff --git a/tests/api_resources/zones/test_holds.py b/tests/api_resources/zones/test_holds.py
index c49066aee53..70446eb4e59 100644
--- a/tests/api_resources/zones/test_holds.py
+++ b/tests/api_resources/zones/test_holds.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -68,7 +68,7 @@ def test_method_delete(self, client: Cloudflare) -> None:
         hold = client.zones.holds.delete(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ZoneHold], hold, path=["response"])
+        assert_matches_type(ZoneHold, hold, path=["response"])
 
     @parametrize
     def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
@@ -76,7 +76,7 @@ def test_method_delete_with_all_params(self, client: Cloudflare) -> None:
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             hold_after="hold_after",
         )
-        assert_matches_type(Optional[ZoneHold], hold, path=["response"])
+        assert_matches_type(ZoneHold, hold, path=["response"])
 
     @parametrize
     def test_raw_response_delete(self, client: Cloudflare) -> None:
@@ -87,7 +87,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         hold = response.parse()
-        assert_matches_type(Optional[ZoneHold], hold, path=["response"])
+        assert_matches_type(ZoneHold, hold, path=["response"])
 
     @parametrize
     def test_streaming_response_delete(self, client: Cloudflare) -> None:
@@ -98,7 +98,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             hold = response.parse()
-            assert_matches_type(Optional[ZoneHold], hold, path=["response"])
+            assert_matches_type(ZoneHold, hold, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -109,6 +109,53 @@ def test_path_params_delete(self, client: Cloudflare) -> None:
                 zone_id="",
             )
 
+    @parametrize
+    def test_method_edit(self, client: Cloudflare) -> None:
+        hold = client.zones.holds.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ZoneHold, hold, path=["response"])
+
+    @parametrize
+    def test_method_edit_with_all_params(self, client: Cloudflare) -> None:
+        hold = client.zones.holds.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hold_after="2023-01-31T15:56:36+00:00",
+            include_subdomains=True,
+        )
+        assert_matches_type(ZoneHold, hold, path=["response"])
+
+    @parametrize
+    def test_raw_response_edit(self, client: Cloudflare) -> None:
+        response = client.zones.holds.with_raw_response.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hold = response.parse()
+        assert_matches_type(ZoneHold, hold, path=["response"])
+
+    @parametrize
+    def test_streaming_response_edit(self, client: Cloudflare) -> None:
+        with client.zones.holds.with_streaming_response.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hold = response.parse()
+            assert_matches_type(ZoneHold, hold, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_edit(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.zones.holds.with_raw_response.edit(
+                zone_id="",
+            )
+
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         hold = client.zones.holds.get(
@@ -149,7 +196,9 @@ def test_path_params_get(self, client: Cloudflare) -> None:
 
 
 class TestAsyncHolds:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
@@ -202,7 +251,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None:
         hold = await async_client.zones.holds.delete(
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
-        assert_matches_type(Optional[ZoneHold], hold, path=["response"])
+        assert_matches_type(ZoneHold, hold, path=["response"])
 
     @parametrize
     async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare) -> None:
@@ -210,7 +259,7 @@ async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             hold_after="hold_after",
         )
-        assert_matches_type(Optional[ZoneHold], hold, path=["response"])
+        assert_matches_type(ZoneHold, hold, path=["response"])
 
     @parametrize
     async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -221,7 +270,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         hold = await response.parse()
-        assert_matches_type(Optional[ZoneHold], hold, path=["response"])
+        assert_matches_type(ZoneHold, hold, path=["response"])
 
     @parametrize
     async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None:
@@ -232,7 +281,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) ->
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             hold = await response.parse()
-            assert_matches_type(Optional[ZoneHold], hold, path=["response"])
+            assert_matches_type(ZoneHold, hold, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -243,6 +292,53 @@ async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None:
                 zone_id="",
             )
 
+    @parametrize
+    async def test_method_edit(self, async_client: AsyncCloudflare) -> None:
+        hold = await async_client.zones.holds.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(ZoneHold, hold, path=["response"])
+
+    @parametrize
+    async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        hold = await async_client.zones.holds.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            hold_after="2023-01-31T15:56:36+00:00",
+            include_subdomains=True,
+        )
+        assert_matches_type(ZoneHold, hold, path=["response"])
+
+    @parametrize
+    async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zones.holds.with_raw_response.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        hold = await response.parse()
+        assert_matches_type(ZoneHold, hold, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zones.holds.with_streaming_response.edit(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            hold = await response.parse()
+            assert_matches_type(ZoneHold, hold, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.zones.holds.with_raw_response.edit(
+                zone_id="",
+            )
+
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         hold = await async_client.zones.holds.get(
diff --git a/tests/api_resources/zones/test_plans.py b/tests/api_resources/zones/test_plans.py
new file mode 100644
index 00000000000..216f4430f91
--- /dev/null
+++ b/tests/api_resources/zones/test_plans.py
@@ -0,0 +1,197 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zones import AvailableRatePlan
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestPlans:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_list(self, client: Cloudflare) -> None:
+        plan = client.zones.plans.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[AvailableRatePlan], plan, path=["response"])
+
+    @parametrize
+    def test_raw_response_list(self, client: Cloudflare) -> None:
+        response = client.zones.plans.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        plan = response.parse()
+        assert_matches_type(SyncSinglePage[AvailableRatePlan], plan, path=["response"])
+
+    @parametrize
+    def test_streaming_response_list(self, client: Cloudflare) -> None:
+        with client.zones.plans.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            plan = response.parse()
+            assert_matches_type(SyncSinglePage[AvailableRatePlan], plan, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_list(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.zones.plans.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        plan = client.zones.plans.get(
+            plan_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AvailableRatePlan, plan, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zones.plans.with_raw_response.get(
+            plan_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        plan = response.parse()
+        assert_matches_type(AvailableRatePlan, plan, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zones.plans.with_streaming_response.get(
+            plan_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            plan = response.parse()
+            assert_matches_type(AvailableRatePlan, plan, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.zones.plans.with_raw_response.get(
+                plan_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `plan_identifier` but received ''"):
+            client.zones.plans.with_raw_response.get(
+                plan_identifier="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
+
+
+class TestAsyncPlans:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
+        plan = await async_client.zones.plans.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[AvailableRatePlan], plan, path=["response"])
+
+    @parametrize
+    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zones.plans.with_raw_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        plan = await response.parse()
+        assert_matches_type(AsyncSinglePage[AvailableRatePlan], plan, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zones.plans.with_streaming_response.list(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            plan = await response.parse()
+            assert_matches_type(AsyncSinglePage[AvailableRatePlan], plan, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.zones.plans.with_raw_response.list(
+                zone_id="",
+            )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        plan = await async_client.zones.plans.get(
+            plan_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AvailableRatePlan, plan, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zones.plans.with_raw_response.get(
+            plan_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        plan = await response.parse()
+        assert_matches_type(AvailableRatePlan, plan, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zones.plans.with_streaming_response.get(
+            plan_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            plan = await response.parse()
+            assert_matches_type(AvailableRatePlan, plan, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.zones.plans.with_raw_response.get(
+                plan_identifier="023e105f4ecef8ad9ca31a8372d0c353",
+                zone_id="",
+            )
+
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `plan_identifier` but received ''"):
+            await async_client.zones.plans.with_raw_response.get(
+                plan_identifier="",
+                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            )
diff --git a/tests/api_resources/zones/test_rate_plans.py b/tests/api_resources/zones/test_rate_plans.py
new file mode 100644
index 00000000000..d80b1b53cf1
--- /dev/null
+++ b/tests/api_resources/zones/test_rate_plans.py
@@ -0,0 +1,101 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+import os
+from typing import Any, cast
+
+import pytest
+
+from cloudflare import Cloudflare, AsyncCloudflare
+from tests.utils import assert_matches_type
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.zones import RatePlanGetResponse
+
+base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
+
+
+class TestRatePlans:
+    parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"])
+
+    @parametrize
+    def test_method_get(self, client: Cloudflare) -> None:
+        rate_plan = client.zones.rate_plans.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SyncSinglePage[RatePlanGetResponse], rate_plan, path=["response"])
+
+    @parametrize
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zones.rate_plans.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rate_plan = response.parse()
+        assert_matches_type(SyncSinglePage[RatePlanGetResponse], rate_plan, path=["response"])
+
+    @parametrize
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zones.rate_plans.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rate_plan = response.parse()
+            assert_matches_type(SyncSinglePage[RatePlanGetResponse], rate_plan, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    def test_path_params_get(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.zones.rate_plans.with_raw_response.get(
+                zone_id="",
+            )
+
+
+class TestAsyncRatePlans:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
+
+    @parametrize
+    async def test_method_get(self, async_client: AsyncCloudflare) -> None:
+        rate_plan = await async_client.zones.rate_plans.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(AsyncSinglePage[RatePlanGetResponse], rate_plan, path=["response"])
+
+    @parametrize
+    async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zones.rate_plans.with_raw_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+
+        assert response.is_closed is True
+        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+        rate_plan = await response.parse()
+        assert_matches_type(AsyncSinglePage[RatePlanGetResponse], rate_plan, path=["response"])
+
+    @parametrize
+    async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zones.rate_plans.with_streaming_response.get(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        ) as response:
+            assert not response.is_closed
+            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
+
+            rate_plan = await response.parse()
+            assert_matches_type(AsyncSinglePage[RatePlanGetResponse], rate_plan, path=["response"])
+
+        assert cast(Any, response.is_closed) is True
+
+    @parametrize
+    async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.zones.rate_plans.with_raw_response.get(
+                zone_id="",
+            )
diff --git a/tests/api_resources/zones/test_settings.py b/tests/api_resources/zones/test_settings.py
index 6a113081a1c..63985d634a6 100644
--- a/tests/api_resources/zones/test_settings.py
+++ b/tests/api_resources/zones/test_settings.py
@@ -9,10 +9,7 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.types.zones import (
-    SettingGetResponse,
-    SettingEditResponse,
-)
+from cloudflare.types.zones import SettingGetResponse, SettingEditResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -25,76 +22,23 @@ def test_method_edit_overload_1(self, client: Cloudflare) -> None:
         setting = client.zones.settings.edit(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="0rtt",
-            value="on",
         )
         assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
 
     @parametrize
-    def test_raw_response_edit_overload_1(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="0rtt",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_1(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="0rtt",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_1(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="0rtt",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="0rtt",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_2(self, client: Cloudflare) -> None:
+    def test_method_edit_with_all_params_overload_1(self, client: Cloudflare) -> None:
         setting = client.zones.settings.edit(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="advanced_ddos",
-            value="on",
+            enabled=True,
         )
         assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
 
     @parametrize
-    def test_raw_response_edit_overload_2(self, client: Cloudflare) -> None:
+    def test_raw_response_edit_overload_1(self, client: Cloudflare) -> None:
         response = client.zones.settings.with_raw_response.edit(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="advanced_ddos",
-            value="on",
         )
 
         assert response.is_closed is True
@@ -103,12 +47,10 @@ def test_raw_response_edit_overload_2(self, client: Cloudflare) -> None:
         assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
 
     @parametrize
-    def test_streaming_response_edit_overload_2(self, client: Cloudflare) -> None:
+    def test_streaming_response_edit_overload_1(self, client: Cloudflare) -> None:
         with client.zones.settings.with_streaming_response.edit(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="advanced_ddos",
-            value="on",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -119,98 +61,44 @@ def test_streaming_response_edit_overload_2(self, client: Cloudflare) -> None:
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    def test_path_params_edit_overload_2(self, client: Cloudflare) -> None:
+    def test_path_params_edit_overload_1(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.zones.settings.with_raw_response.edit(
                 setting_id="always_online",
                 zone_id="",
-                id="advanced_ddos",
-                value="on",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
             client.zones.settings.with_raw_response.edit(
                 setting_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="advanced_ddos",
-                value="on",
             )
 
     @parametrize
-    def test_method_edit_overload_3(self, client: Cloudflare) -> None:
+    def test_method_edit_overload_2(self, client: Cloudflare) -> None:
         setting = client.zones.settings.edit(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="always_online",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_3(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="always_online",
-            value="on",
         )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
         assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
 
     @parametrize
-    def test_streaming_response_edit_overload_3(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="always_online",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_3(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="always_online",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="always_online",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_4(self, client: Cloudflare) -> None:
+    def test_method_edit_with_all_params_overload_2(self, client: Cloudflare) -> None:
         setting = client.zones.settings.edit(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="always_use_https",
-            value="on",
+            value={
+                "enabled": True,
+                "pool_id": "pool-id",
+            },
         )
         assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
 
     @parametrize
-    def test_raw_response_edit_overload_4(self, client: Cloudflare) -> None:
+    def test_raw_response_edit_overload_2(self, client: Cloudflare) -> None:
         response = client.zones.settings.with_raw_response.edit(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="always_use_https",
-            value="on",
         )
 
         assert response.is_closed is True
@@ -219,12 +107,10 @@ def test_raw_response_edit_overload_4(self, client: Cloudflare) -> None:
         assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
 
     @parametrize
-    def test_streaming_response_edit_overload_4(self, client: Cloudflare) -> None:
+    def test_streaming_response_edit_overload_2(self, client: Cloudflare) -> None:
         with client.zones.settings.with_streaming_response.edit(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="always_use_https",
-            value="on",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -235,6403 +121,188 @@ def test_streaming_response_edit_overload_4(self, client: Cloudflare) -> None:
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    def test_path_params_edit_overload_4(self, client: Cloudflare) -> None:
+    def test_path_params_edit_overload_2(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.zones.settings.with_raw_response.edit(
                 setting_id="always_online",
                 zone_id="",
-                id="always_use_https",
-                value="on",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
             client.zones.settings.with_raw_response.edit(
                 setting_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="always_use_https",
-                value="on",
             )
 
     @parametrize
-    def test_method_edit_overload_5(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
+    def test_method_get(self, client: Cloudflare) -> None:
+        setting = client.zones.settings.get(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="automatic_https_rewrites",
-            value="on",
         )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
+        assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
 
     @parametrize
-    def test_raw_response_edit_overload_5(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
+    def test_raw_response_get(self, client: Cloudflare) -> None:
+        response = client.zones.settings.with_raw_response.get(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="automatic_https_rewrites",
-            value="on",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
+        assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
 
     @parametrize
-    def test_streaming_response_edit_overload_5(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
+    def test_streaming_response_get(self, client: Cloudflare) -> None:
+        with client.zones.settings.with_streaming_response.get(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="automatic_https_rewrites",
-            value="on",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
+            assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    def test_path_params_edit_overload_5(self, client: Cloudflare) -> None:
+    def test_path_params_get(self, client: Cloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
+            client.zones.settings.with_raw_response.get(
                 setting_id="always_online",
                 zone_id="",
-                id="automatic_https_rewrites",
-                value="on",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
+            client.zones.settings.with_raw_response.get(
                 setting_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="automatic_https_rewrites",
-                value="on",
             )
 
-    @parametrize
-    def test_method_edit_overload_6(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="brotli",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
+
+class TestAsyncSettings:
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
-    def test_raw_response_edit_overload_6(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
+    async def test_method_edit_overload_1(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.zones.settings.edit(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="brotli",
-            value="on",
         )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
         assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
 
     @parametrize
-    def test_streaming_response_edit_overload_6(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="brotli",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_6(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="brotli",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="brotli",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_7(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
+    async def test_method_edit_with_all_params_overload_1(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.zones.settings.edit(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="browser_cache_ttl",
-            value=0,
+            enabled=True,
         )
         assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
 
     @parametrize
-    def test_raw_response_edit_overload_7(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
+    async def test_raw_response_edit_overload_1(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zones.settings.with_raw_response.edit(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="browser_cache_ttl",
-            value=0,
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
+        setting = await response.parse()
         assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
 
     @parametrize
-    def test_streaming_response_edit_overload_7(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
+    async def test_streaming_response_edit_overload_1(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zones.settings.with_streaming_response.edit(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="browser_cache_ttl",
-            value=0,
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            setting = response.parse()
+            setting = await response.parse()
             assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    def test_path_params_edit_overload_7(self, client: Cloudflare) -> None:
+    async def test_path_params_edit_overload_1(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
+            await async_client.zones.settings.with_raw_response.edit(
                 setting_id="always_online",
                 zone_id="",
-                id="browser_cache_ttl",
-                value=0,
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
+            await async_client.zones.settings.with_raw_response.edit(
                 setting_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="browser_cache_ttl",
-                value=0,
             )
 
     @parametrize
-    def test_method_edit_overload_8(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="browser_check",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_8(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
+    async def test_method_edit_overload_2(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.zones.settings.edit(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="browser_check",
-            value="on",
         )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
         assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
 
     @parametrize
-    def test_streaming_response_edit_overload_8(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="browser_check",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_8(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="browser_check",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="browser_check",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_9(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
+    async def test_method_edit_with_all_params_overload_2(self, async_client: AsyncCloudflare) -> None:
+        setting = await async_client.zones.settings.edit(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="cache_level",
-            value="aggressive",
+            value={
+                "enabled": True,
+                "pool_id": "pool-id",
+            },
         )
         assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
 
     @parametrize
-    def test_raw_response_edit_overload_9(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
+    async def test_raw_response_edit_overload_2(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zones.settings.with_raw_response.edit(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="cache_level",
-            value="aggressive",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
+        setting = await response.parse()
         assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
 
     @parametrize
-    def test_streaming_response_edit_overload_9(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
+    async def test_streaming_response_edit_overload_2(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zones.settings.with_streaming_response.edit(
             setting_id="always_online",
             zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="cache_level",
-            value="aggressive",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
-            setting = response.parse()
+            setting = await response.parse()
             assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    def test_path_params_edit_overload_9(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="cache_level",
-                value="aggressive",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="cache_level",
-                value="aggressive",
-            )
-
-    @parametrize
-    def test_method_edit_overload_10(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="challenge_ttl",
-            value=300,
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_10(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="challenge_ttl",
-            value=300,
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_10(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="challenge_ttl",
-            value=300,
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_10(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="challenge_ttl",
-                value=300,
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="challenge_ttl",
-                value=300,
-            )
-
-    @parametrize
-    def test_method_edit_overload_11(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ciphers",
-            value=["ECDHE-RSA-AES128-GCM-SHA256", "AES128-SHA"],
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_11(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ciphers",
-            value=["ECDHE-RSA-AES128-GCM-SHA256", "AES128-SHA"],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_11(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ciphers",
-            value=["ECDHE-RSA-AES128-GCM-SHA256", "AES128-SHA"],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_11(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="ciphers",
-                value=["ECDHE-RSA-AES128-GCM-SHA256", "AES128-SHA"],
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="ciphers",
-                value=["ECDHE-RSA-AES128-GCM-SHA256", "AES128-SHA"],
-            )
-
-    @parametrize
-    def test_method_edit_overload_12(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="cname_flattening",
-            value="flatten_at_root",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_12(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="cname_flattening",
-            value="flatten_at_root",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_12(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="cname_flattening",
-            value="flatten_at_root",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_12(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="cname_flattening",
-                value="flatten_at_root",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="cname_flattening",
-                value="flatten_at_root",
-            )
-
-    @parametrize
-    def test_method_edit_overload_13(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="development_mode",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_13(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="development_mode",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_13(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="development_mode",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_13(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="development_mode",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="development_mode",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_14(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="early_hints",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_14(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="early_hints",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_14(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="early_hints",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_14(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="early_hints",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="early_hints",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_15(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="edge_cache_ttl",
-            value=30,
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_15(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="edge_cache_ttl",
-            value=30,
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_15(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="edge_cache_ttl",
-            value=30,
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_15(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="edge_cache_ttl",
-                value=30,
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="edge_cache_ttl",
-                value=30,
-            )
-
-    @parametrize
-    def test_method_edit_overload_16(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="email_obfuscation",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_16(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="email_obfuscation",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_16(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="email_obfuscation",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_16(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="email_obfuscation",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="email_obfuscation",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_17(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="h2_prioritization",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_17(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="h2_prioritization",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_17(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="h2_prioritization",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_17(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="h2_prioritization",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="h2_prioritization",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_18(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="hotlink_protection",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_18(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="hotlink_protection",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_18(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="hotlink_protection",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_18(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="hotlink_protection",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="hotlink_protection",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_19(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="http2",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_19(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="http2",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_19(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="http2",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_19(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="http2",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="http2",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_20(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="http3",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_20(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="http3",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_20(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="http3",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_20(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="http3",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="http3",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_21(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="image_resizing",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_21(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="image_resizing",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_21(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="image_resizing",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_21(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="image_resizing",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="image_resizing",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_22(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ip_geolocation",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_22(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ip_geolocation",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_22(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ip_geolocation",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_22(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="ip_geolocation",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="ip_geolocation",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_23(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ipv6",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_23(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ipv6",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_23(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ipv6",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_23(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="ipv6",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="ipv6",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_24(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="max_upload",
-            value=100,
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_24(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="max_upload",
-            value=100,
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_24(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="max_upload",
-            value=100,
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_24(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="max_upload",
-                value=100,
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="max_upload",
-                value=100,
-            )
-
-    @parametrize
-    def test_method_edit_overload_25(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="min_tls_version",
-            value="1.0",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_25(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="min_tls_version",
-            value="1.0",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_25(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="min_tls_version",
-            value="1.0",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_25(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="min_tls_version",
-                value="1.0",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="min_tls_version",
-                value="1.0",
-            )
-
-    @parametrize
-    def test_method_edit_overload_26(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="minify",
-            value={},
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_method_edit_with_all_params_overload_26(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="minify",
-            value={
-                "css": "on",
-                "html": "on",
-                "js": "on",
-            },
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_26(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="minify",
-            value={},
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_26(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="minify",
-            value={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_26(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="minify",
-                value={},
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="minify",
-                value={},
-            )
-
-    @parametrize
-    def test_method_edit_overload_27(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="mirage",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_27(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="mirage",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_27(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="mirage",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_27(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="mirage",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="mirage",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_28(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="mobile_redirect",
-            value={},
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_method_edit_with_all_params_overload_28(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="mobile_redirect",
-            value={
-                "mobile_subdomain": "m",
-                "status": "on",
-                "strip_uri": False,
-            },
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_28(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="mobile_redirect",
-            value={},
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_28(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="mobile_redirect",
-            value={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_28(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="mobile_redirect",
-                value={},
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="mobile_redirect",
-                value={},
-            )
-
-    @parametrize
-    def test_method_edit_overload_29(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="nel",
-            value={},
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_method_edit_with_all_params_overload_29(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="nel",
-            value={"enabled": False},
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_29(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="nel",
-            value={},
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_29(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="nel",
-            value={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_29(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="nel",
-                value={},
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="nel",
-                value={},
-            )
-
-    @parametrize
-    def test_method_edit_overload_30(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="opportunistic_encryption",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_30(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="opportunistic_encryption",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_30(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="opportunistic_encryption",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_30(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="opportunistic_encryption",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="opportunistic_encryption",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_31(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="opportunistic_onion",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_31(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="opportunistic_onion",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_31(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="opportunistic_onion",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_31(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="opportunistic_onion",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="opportunistic_onion",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_32(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="orange_to_orange",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_32(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="orange_to_orange",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_32(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="orange_to_orange",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_32(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="orange_to_orange",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="orange_to_orange",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_33(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="origin_error_page_pass_thru",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_33(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="origin_error_page_pass_thru",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_33(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="origin_error_page_pass_thru",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_33(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="origin_error_page_pass_thru",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="origin_error_page_pass_thru",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_34(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="polish",
-            value="off",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_34(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="polish",
-            value="off",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_34(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="polish",
-            value="off",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_34(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="polish",
-                value="off",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="polish",
-                value="off",
-            )
-
-    @parametrize
-    def test_method_edit_overload_35(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="prefetch_preload",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_35(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="prefetch_preload",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_35(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="prefetch_preload",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_35(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="prefetch_preload",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="prefetch_preload",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_36(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="proxy_read_timeout",
-            value=0,
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_36(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="proxy_read_timeout",
-            value=0,
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_36(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="proxy_read_timeout",
-            value=0,
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_36(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="proxy_read_timeout",
-                value=0,
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="proxy_read_timeout",
-                value=0,
-            )
-
-    @parametrize
-    def test_method_edit_overload_37(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="pseudo_ipv4",
-            value="off",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_37(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="pseudo_ipv4",
-            value="off",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_37(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="pseudo_ipv4",
-            value="off",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_37(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="pseudo_ipv4",
-                value="off",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="pseudo_ipv4",
-                value="off",
-            )
-
-    @parametrize
-    def test_method_edit_overload_38(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="replace_insecure_js",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_38(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="replace_insecure_js",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_38(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="replace_insecure_js",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_38(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="replace_insecure_js",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="replace_insecure_js",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_39(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="response_buffering",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_39(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="response_buffering",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_39(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="response_buffering",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_39(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="response_buffering",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="response_buffering",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_40(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="rocket_loader",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_40(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="rocket_loader",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_40(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="rocket_loader",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_40(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="rocket_loader",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="rocket_loader",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_41(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="automatic_platform_optimization",
-            value={
-                "cache_by_device_type": False,
-                "cf": True,
-                "enabled": True,
-                "hostnames": ["www.example.com", "example.com", "shop.example.com"],
-                "wordpress": True,
-                "wp_plugin": True,
-            },
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_41(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="automatic_platform_optimization",
-            value={
-                "cache_by_device_type": False,
-                "cf": True,
-                "enabled": True,
-                "hostnames": ["www.example.com", "example.com", "shop.example.com"],
-                "wordpress": True,
-                "wp_plugin": True,
-            },
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_41(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="automatic_platform_optimization",
-            value={
-                "cache_by_device_type": False,
-                "cf": True,
-                "enabled": True,
-                "hostnames": ["www.example.com", "example.com", "shop.example.com"],
-                "wordpress": True,
-                "wp_plugin": True,
-            },
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_41(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="automatic_platform_optimization",
-                value={
-                    "cache_by_device_type": False,
-                    "cf": True,
-                    "enabled": True,
-                    "hostnames": ["www.example.com", "example.com", "shop.example.com"],
-                    "wordpress": True,
-                    "wp_plugin": True,
-                },
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="automatic_platform_optimization",
-                value={
-                    "cache_by_device_type": False,
-                    "cf": True,
-                    "enabled": True,
-                    "hostnames": ["www.example.com", "example.com", "shop.example.com"],
-                    "wordpress": True,
-                    "wp_plugin": True,
-                },
-            )
-
-    @parametrize
-    def test_method_edit_overload_42(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="security_header",
-            value={},
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_method_edit_with_all_params_overload_42(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="security_header",
-            value={
-                "strict_transport_security": {
-                    "enabled": True,
-                    "include_subdomains": True,
-                    "max_age": 86400,
-                    "nosniff": True,
-                    "preload": True,
-                }
-            },
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_42(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="security_header",
-            value={},
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_42(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="security_header",
-            value={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_42(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="security_header",
-                value={},
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="security_header",
-                value={},
-            )
-
-    @parametrize
-    def test_method_edit_overload_43(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="security_level",
-            value="off",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_43(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="security_level",
-            value="off",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_43(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="security_level",
-            value="off",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_43(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="security_level",
-                value="off",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="security_level",
-                value="off",
-            )
-
-    @parametrize
-    def test_method_edit_overload_44(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="server_side_exclude",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_44(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="server_side_exclude",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_44(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="server_side_exclude",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_44(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="server_side_exclude",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="server_side_exclude",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_45(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="sha1_support",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_45(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="sha1_support",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_45(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="sha1_support",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_45(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="sha1_support",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="sha1_support",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_46(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="sort_query_string_for_cache",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_46(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="sort_query_string_for_cache",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_46(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="sort_query_string_for_cache",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_46(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="sort_query_string_for_cache",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="sort_query_string_for_cache",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_47(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ssl",
-            value="off",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_47(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ssl",
-            value="off",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_47(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ssl",
-            value="off",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_47(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="ssl",
-                value="off",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="ssl",
-                value="off",
-            )
-
-    @parametrize
-    def test_method_edit_overload_48(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_method_edit_with_all_params_overload_48(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ssl_recommender",
-            enabled=True,
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_48(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_48(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_48(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    def test_method_edit_overload_49(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="tls_1_2_only",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_49(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="tls_1_2_only",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_49(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="tls_1_2_only",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_49(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="tls_1_2_only",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="tls_1_2_only",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_50(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="tls_1_3",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_50(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="tls_1_3",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_50(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="tls_1_3",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_50(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="tls_1_3",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="tls_1_3",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_51(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="tls_client_auth",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_51(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="tls_client_auth",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_51(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="tls_client_auth",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_51(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="tls_client_auth",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="tls_client_auth",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_52(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="true_client_ip_header",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_52(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="true_client_ip_header",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_52(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="true_client_ip_header",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_52(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="true_client_ip_header",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="true_client_ip_header",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_53(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="waf",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_53(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="waf",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_53(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="waf",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_53(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="waf",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="waf",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_54(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="webp",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_54(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="webp",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_54(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="webp",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_54(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="webp",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="webp",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_edit_overload_55(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="websockets",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_edit_overload_55(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="websockets",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_edit_overload_55(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="websockets",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_edit_overload_55(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="websockets",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="websockets",
-                value="on",
-            )
-
-    @parametrize
-    def test_method_get(self, client: Cloudflare) -> None:
-        setting = client.zones.settings.get(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
-
-    @parametrize
-    def test_raw_response_get(self, client: Cloudflare) -> None:
-        response = client.zones.settings.with_raw_response.get(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = response.parse()
-        assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
-
-    @parametrize
-    def test_streaming_response_get(self, client: Cloudflare) -> None:
-        with client.zones.settings.with_streaming_response.get(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = response.parse()
-            assert_matches_type(Optional[SettingGetResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            client.zones.settings.with_raw_response.get(
-                setting_id="always_online",
-                zone_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            client.zones.settings.with_raw_response.get(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-
-class TestAsyncSettings:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
-
-    @parametrize
-    async def test_method_edit_overload_1(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="0rtt",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_1(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="0rtt",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_1(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="0rtt",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_1(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="0rtt",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="0rtt",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_2(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="advanced_ddos",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_2(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="advanced_ddos",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_2(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="advanced_ddos",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_2(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="advanced_ddos",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="advanced_ddos",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_3(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="always_online",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_3(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="always_online",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_3(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="always_online",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_3(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="always_online",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="always_online",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_4(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="always_use_https",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_4(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="always_use_https",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_4(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="always_use_https",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_4(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="always_use_https",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="always_use_https",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_5(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="automatic_https_rewrites",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_5(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="automatic_https_rewrites",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_5(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="automatic_https_rewrites",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_5(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="automatic_https_rewrites",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="automatic_https_rewrites",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_6(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="brotli",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_6(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="brotli",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_6(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="brotli",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_6(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="brotli",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="brotli",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_7(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="browser_cache_ttl",
-            value=0,
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_7(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="browser_cache_ttl",
-            value=0,
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_7(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="browser_cache_ttl",
-            value=0,
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_7(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="browser_cache_ttl",
-                value=0,
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="browser_cache_ttl",
-                value=0,
-            )
-
-    @parametrize
-    async def test_method_edit_overload_8(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="browser_check",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_8(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="browser_check",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_8(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="browser_check",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_8(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="browser_check",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="browser_check",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_9(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="cache_level",
-            value="aggressive",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_9(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="cache_level",
-            value="aggressive",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_9(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="cache_level",
-            value="aggressive",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_9(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="cache_level",
-                value="aggressive",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="cache_level",
-                value="aggressive",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_10(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="challenge_ttl",
-            value=300,
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_10(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="challenge_ttl",
-            value=300,
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_10(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="challenge_ttl",
-            value=300,
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_10(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="challenge_ttl",
-                value=300,
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="challenge_ttl",
-                value=300,
-            )
-
-    @parametrize
-    async def test_method_edit_overload_11(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ciphers",
-            value=["ECDHE-RSA-AES128-GCM-SHA256", "AES128-SHA"],
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_11(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ciphers",
-            value=["ECDHE-RSA-AES128-GCM-SHA256", "AES128-SHA"],
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_11(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ciphers",
-            value=["ECDHE-RSA-AES128-GCM-SHA256", "AES128-SHA"],
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_11(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="ciphers",
-                value=["ECDHE-RSA-AES128-GCM-SHA256", "AES128-SHA"],
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="ciphers",
-                value=["ECDHE-RSA-AES128-GCM-SHA256", "AES128-SHA"],
-            )
-
-    @parametrize
-    async def test_method_edit_overload_12(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="cname_flattening",
-            value="flatten_at_root",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_12(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="cname_flattening",
-            value="flatten_at_root",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_12(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="cname_flattening",
-            value="flatten_at_root",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_12(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="cname_flattening",
-                value="flatten_at_root",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="cname_flattening",
-                value="flatten_at_root",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_13(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="development_mode",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_13(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="development_mode",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_13(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="development_mode",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_13(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="development_mode",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="development_mode",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_14(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="early_hints",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_14(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="early_hints",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_14(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="early_hints",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_14(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="early_hints",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="early_hints",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_15(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="edge_cache_ttl",
-            value=30,
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_15(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="edge_cache_ttl",
-            value=30,
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_15(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="edge_cache_ttl",
-            value=30,
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_15(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="edge_cache_ttl",
-                value=30,
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="edge_cache_ttl",
-                value=30,
-            )
-
-    @parametrize
-    async def test_method_edit_overload_16(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="email_obfuscation",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_16(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="email_obfuscation",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_16(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="email_obfuscation",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_16(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="email_obfuscation",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="email_obfuscation",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_17(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="h2_prioritization",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_17(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="h2_prioritization",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_17(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="h2_prioritization",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_17(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="h2_prioritization",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="h2_prioritization",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_18(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="hotlink_protection",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_18(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="hotlink_protection",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_18(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="hotlink_protection",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_18(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="hotlink_protection",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="hotlink_protection",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_19(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="http2",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_19(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="http2",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_19(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="http2",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_19(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="http2",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="http2",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_20(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="http3",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_20(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="http3",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_20(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="http3",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_20(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="http3",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="http3",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_21(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="image_resizing",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_21(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="image_resizing",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_21(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="image_resizing",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_21(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="image_resizing",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="image_resizing",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_22(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ip_geolocation",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_22(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ip_geolocation",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_22(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ip_geolocation",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_22(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="ip_geolocation",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="ip_geolocation",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_23(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ipv6",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_23(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ipv6",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_23(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ipv6",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_23(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="ipv6",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="ipv6",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_24(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="max_upload",
-            value=100,
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_24(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="max_upload",
-            value=100,
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_24(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="max_upload",
-            value=100,
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_24(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="max_upload",
-                value=100,
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="max_upload",
-                value=100,
-            )
-
-    @parametrize
-    async def test_method_edit_overload_25(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="min_tls_version",
-            value="1.0",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_25(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="min_tls_version",
-            value="1.0",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_25(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="min_tls_version",
-            value="1.0",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_25(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="min_tls_version",
-                value="1.0",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="min_tls_version",
-                value="1.0",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_26(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="minify",
-            value={},
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_method_edit_with_all_params_overload_26(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="minify",
-            value={
-                "css": "on",
-                "html": "on",
-                "js": "on",
-            },
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_26(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="minify",
-            value={},
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_26(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="minify",
-            value={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_26(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="minify",
-                value={},
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="minify",
-                value={},
-            )
-
-    @parametrize
-    async def test_method_edit_overload_27(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="mirage",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_27(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="mirage",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_27(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="mirage",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_27(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="mirage",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="mirage",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_28(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="mobile_redirect",
-            value={},
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_method_edit_with_all_params_overload_28(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="mobile_redirect",
-            value={
-                "mobile_subdomain": "m",
-                "status": "on",
-                "strip_uri": False,
-            },
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_28(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="mobile_redirect",
-            value={},
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_28(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="mobile_redirect",
-            value={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_28(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="mobile_redirect",
-                value={},
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="mobile_redirect",
-                value={},
-            )
-
-    @parametrize
-    async def test_method_edit_overload_29(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="nel",
-            value={},
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_method_edit_with_all_params_overload_29(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="nel",
-            value={"enabled": False},
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_29(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="nel",
-            value={},
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_29(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="nel",
-            value={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_29(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="nel",
-                value={},
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="nel",
-                value={},
-            )
-
-    @parametrize
-    async def test_method_edit_overload_30(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="opportunistic_encryption",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_30(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="opportunistic_encryption",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_30(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="opportunistic_encryption",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_30(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="opportunistic_encryption",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="opportunistic_encryption",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_31(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="opportunistic_onion",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_31(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="opportunistic_onion",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_31(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="opportunistic_onion",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_31(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="opportunistic_onion",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="opportunistic_onion",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_32(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="orange_to_orange",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_32(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="orange_to_orange",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_32(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="orange_to_orange",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_32(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="orange_to_orange",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="orange_to_orange",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_33(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="origin_error_page_pass_thru",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_33(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="origin_error_page_pass_thru",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_33(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="origin_error_page_pass_thru",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_33(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="origin_error_page_pass_thru",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="origin_error_page_pass_thru",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_34(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="polish",
-            value="off",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_34(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="polish",
-            value="off",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_34(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="polish",
-            value="off",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_34(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="polish",
-                value="off",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="polish",
-                value="off",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_35(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="prefetch_preload",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_35(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="prefetch_preload",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_35(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="prefetch_preload",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_35(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="prefetch_preload",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="prefetch_preload",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_36(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="proxy_read_timeout",
-            value=0,
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_36(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="proxy_read_timeout",
-            value=0,
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_36(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="proxy_read_timeout",
-            value=0,
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_36(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="proxy_read_timeout",
-                value=0,
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="proxy_read_timeout",
-                value=0,
-            )
-
-    @parametrize
-    async def test_method_edit_overload_37(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="pseudo_ipv4",
-            value="off",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_37(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="pseudo_ipv4",
-            value="off",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_37(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="pseudo_ipv4",
-            value="off",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_37(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="pseudo_ipv4",
-                value="off",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="pseudo_ipv4",
-                value="off",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_38(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="replace_insecure_js",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_38(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="replace_insecure_js",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_38(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="replace_insecure_js",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_38(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="replace_insecure_js",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="replace_insecure_js",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_39(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="response_buffering",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_39(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="response_buffering",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_39(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="response_buffering",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_39(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="response_buffering",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="response_buffering",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_40(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="rocket_loader",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_40(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="rocket_loader",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_40(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="rocket_loader",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_40(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="rocket_loader",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="rocket_loader",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_41(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="automatic_platform_optimization",
-            value={
-                "cache_by_device_type": False,
-                "cf": True,
-                "enabled": True,
-                "hostnames": ["www.example.com", "example.com", "shop.example.com"],
-                "wordpress": True,
-                "wp_plugin": True,
-            },
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_41(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="automatic_platform_optimization",
-            value={
-                "cache_by_device_type": False,
-                "cf": True,
-                "enabled": True,
-                "hostnames": ["www.example.com", "example.com", "shop.example.com"],
-                "wordpress": True,
-                "wp_plugin": True,
-            },
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_41(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="automatic_platform_optimization",
-            value={
-                "cache_by_device_type": False,
-                "cf": True,
-                "enabled": True,
-                "hostnames": ["www.example.com", "example.com", "shop.example.com"],
-                "wordpress": True,
-                "wp_plugin": True,
-            },
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_41(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="automatic_platform_optimization",
-                value={
-                    "cache_by_device_type": False,
-                    "cf": True,
-                    "enabled": True,
-                    "hostnames": ["www.example.com", "example.com", "shop.example.com"],
-                    "wordpress": True,
-                    "wp_plugin": True,
-                },
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="automatic_platform_optimization",
-                value={
-                    "cache_by_device_type": False,
-                    "cf": True,
-                    "enabled": True,
-                    "hostnames": ["www.example.com", "example.com", "shop.example.com"],
-                    "wordpress": True,
-                    "wp_plugin": True,
-                },
-            )
-
-    @parametrize
-    async def test_method_edit_overload_42(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="security_header",
-            value={},
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_method_edit_with_all_params_overload_42(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="security_header",
-            value={
-                "strict_transport_security": {
-                    "enabled": True,
-                    "include_subdomains": True,
-                    "max_age": 86400,
-                    "nosniff": True,
-                    "preload": True,
-                }
-            },
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_42(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="security_header",
-            value={},
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_42(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="security_header",
-            value={},
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_42(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="security_header",
-                value={},
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="security_header",
-                value={},
-            )
-
-    @parametrize
-    async def test_method_edit_overload_43(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="security_level",
-            value="off",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_43(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="security_level",
-            value="off",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_43(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="security_level",
-            value="off",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_43(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="security_level",
-                value="off",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="security_level",
-                value="off",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_44(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="server_side_exclude",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_44(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="server_side_exclude",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_44(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="server_side_exclude",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_44(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="server_side_exclude",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="server_side_exclude",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_45(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="sha1_support",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_45(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="sha1_support",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_45(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="sha1_support",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_45(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="sha1_support",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="sha1_support",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_46(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="sort_query_string_for_cache",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_46(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="sort_query_string_for_cache",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_46(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="sort_query_string_for_cache",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_46(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="sort_query_string_for_cache",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="sort_query_string_for_cache",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_47(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ssl",
-            value="off",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_47(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ssl",
-            value="off",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_47(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ssl",
-            value="off",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_47(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="ssl",
-                value="off",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="ssl",
-                value="off",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_48(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_method_edit_with_all_params_overload_48(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="ssl_recommender",
-            enabled=True,
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_48(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_48(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_48(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_49(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="tls_1_2_only",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_49(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="tls_1_2_only",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_49(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="tls_1_2_only",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_49(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="tls_1_2_only",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="tls_1_2_only",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_50(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="tls_1_3",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_50(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="tls_1_3",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_50(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="tls_1_3",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_50(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="tls_1_3",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="tls_1_3",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_51(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="tls_client_auth",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_51(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="tls_client_auth",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_51(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="tls_client_auth",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_51(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="tls_client_auth",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="tls_client_auth",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_52(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="true_client_ip_header",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_52(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="true_client_ip_header",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_52(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="true_client_ip_header",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_52(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="true_client_ip_header",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="true_client_ip_header",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_53(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="waf",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_53(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="waf",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_53(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="waf",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_53(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="waf",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="waf",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_54(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="webp",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_54(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="webp",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_54(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="webp",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_54(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="always_online",
-                zone_id="",
-                id="webp",
-                value="on",
-            )
-
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
-            await async_client.zones.settings.with_raw_response.edit(
-                setting_id="",
-                zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="webp",
-                value="on",
-            )
-
-    @parametrize
-    async def test_method_edit_overload_55(self, async_client: AsyncCloudflare) -> None:
-        setting = await async_client.zones.settings.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="websockets",
-            value="on",
-        )
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_raw_response_edit_overload_55(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.settings.with_raw_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="websockets",
-            value="on",
-        )
-
-        assert response.is_closed is True
-        assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-        setting = await response.parse()
-        assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-    @parametrize
-    async def test_streaming_response_edit_overload_55(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.settings.with_streaming_response.edit(
-            setting_id="always_online",
-            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-            id="websockets",
-            value="on",
-        ) as response:
-            assert not response.is_closed
-            assert response.http_request.headers.get("X-Stainless-Lang") == "python"
-
-            setting = await response.parse()
-            assert_matches_type(Optional[SettingEditResponse], setting, path=["response"])
-
-        assert cast(Any, response.is_closed) is True
-
-    @parametrize
-    async def test_path_params_edit_overload_55(self, async_client: AsyncCloudflare) -> None:
+    async def test_path_params_edit_overload_2(self, async_client: AsyncCloudflare) -> None:
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.zones.settings.with_raw_response.edit(
                 setting_id="always_online",
                 zone_id="",
-                id="websockets",
-                value="on",
             )
 
         with pytest.raises(ValueError, match=r"Expected a non-empty value for `setting_id` but received ''"):
             await async_client.zones.settings.with_raw_response.edit(
                 setting_id="",
                 zone_id="023e105f4ecef8ad9ca31a8372d0c353",
-                id="websockets",
-                value="on",
             )
 
     @parametrize
diff --git a/tests/api_resources/zones/test_subscriptions.py b/tests/api_resources/zones/test_subscriptions.py
index 6a6f83dc72e..af598cf01bb 100644
--- a/tests/api_resources/zones/test_subscriptions.py
+++ b/tests/api_resources/zones/test_subscriptions.py
@@ -9,9 +9,11 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare
 from tests.utils import assert_matches_type
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.user import Subscription
-from cloudflare.types.zones import SubscriptionGetResponse, SubscriptionCreateResponse
+from cloudflare.types.zones import (
+    SubscriptionGetResponse,
+    SubscriptionCreateResponse,
+    SubscriptionUpdateResponse,
+)
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
@@ -22,53 +24,31 @@ class TestSubscriptions:
     @parametrize
     def test_method_create(self, client: Cloudflare) -> None:
         subscription = client.zones.subscriptions.create(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(SubscriptionCreateResponse, subscription, path=["response"])
 
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         subscription = client.zones.subscriptions.create(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            app={"install_id": "install_id"},
-            component_values=[
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-            ],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             frequency="monthly",
             rate_plan={
+                "id": "free",
                 "currency": "USD",
                 "externally_managed": False,
-                "id": "free",
                 "is_contract": False,
                 "public_name": "Business Plan",
                 "scope": "zone",
-                "sets": ["string", "string", "string"],
+                "sets": ["string"],
             },
-            zone={},
         )
         assert_matches_type(SubscriptionCreateResponse, subscription, path=["response"])
 
     @parametrize
     def test_raw_response_create(self, client: Cloudflare) -> None:
         response = client.zones.subscriptions.with_raw_response.create(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -79,7 +59,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_create(self, client: Cloudflare) -> None:
         with client.zones.subscriptions.with_streaming_response.create(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -91,60 +71,77 @@ def test_streaming_response_create(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_create(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.zones.subscriptions.with_raw_response.create(
-                identifier="",
+                zone_id="",
             )
 
     @parametrize
-    def test_method_list(self, client: Cloudflare) -> None:
-        subscription = client.zones.subscriptions.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+    def test_method_update(self, client: Cloudflare) -> None:
+        subscription = client.zones.subscriptions.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SubscriptionUpdateResponse, subscription, path=["response"])
+
+    @parametrize
+    def test_method_update_with_all_params(self, client: Cloudflare) -> None:
+        subscription = client.zones.subscriptions.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            frequency="monthly",
+            rate_plan={
+                "id": "free",
+                "currency": "USD",
+                "externally_managed": False,
+                "is_contract": False,
+                "public_name": "Business Plan",
+                "scope": "zone",
+                "sets": ["string"],
+            },
         )
-        assert_matches_type(SyncSinglePage[Subscription], subscription, path=["response"])
+        assert_matches_type(SubscriptionUpdateResponse, subscription, path=["response"])
 
     @parametrize
-    def test_raw_response_list(self, client: Cloudflare) -> None:
-        response = client.zones.subscriptions.with_raw_response.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+    def test_raw_response_update(self, client: Cloudflare) -> None:
+        response = client.zones.subscriptions.with_raw_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         subscription = response.parse()
-        assert_matches_type(SyncSinglePage[Subscription], subscription, path=["response"])
+        assert_matches_type(SubscriptionUpdateResponse, subscription, path=["response"])
 
     @parametrize
-    def test_streaming_response_list(self, client: Cloudflare) -> None:
-        with client.zones.subscriptions.with_streaming_response.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+    def test_streaming_response_update(self, client: Cloudflare) -> None:
+        with client.zones.subscriptions.with_streaming_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             subscription = response.parse()
-            assert_matches_type(SyncSinglePage[Subscription], subscription, path=["response"])
+            assert_matches_type(SubscriptionUpdateResponse, subscription, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    def test_path_params_list(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
-            client.zones.subscriptions.with_raw_response.list(
-                "",
+    def test_path_params_update(self, client: Cloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            client.zones.subscriptions.with_raw_response.update(
+                zone_id="",
             )
 
     @parametrize
     def test_method_get(self, client: Cloudflare) -> None:
         subscription = client.zones.subscriptions.get(
-            "506e3185e9c882d175a2d0cb0093d9f2",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(SubscriptionGetResponse, subscription, path=["response"])
 
     @parametrize
     def test_raw_response_get(self, client: Cloudflare) -> None:
         response = client.zones.subscriptions.with_raw_response.get(
-            "506e3185e9c882d175a2d0cb0093d9f2",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -155,7 +152,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None:
     @parametrize
     def test_streaming_response_get(self, client: Cloudflare) -> None:
         with client.zones.subscriptions.with_streaming_response.get(
-            "506e3185e9c882d175a2d0cb0093d9f2",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -167,65 +164,45 @@ def test_streaming_response_get(self, client: Cloudflare) -> None:
 
     @parametrize
     def test_path_params_get(self, client: Cloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             client.zones.subscriptions.with_raw_response.get(
-                "",
+                zone_id="",
             )
 
 
 class TestAsyncSubscriptions:
-    parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
+    parametrize = pytest.mark.parametrize(
+        "async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
+    )
 
     @parametrize
     async def test_method_create(self, async_client: AsyncCloudflare) -> None:
         subscription = await async_client.zones.subscriptions.create(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(SubscriptionCreateResponse, subscription, path=["response"])
 
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         subscription = await async_client.zones.subscriptions.create(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
-            app={"install_id": "install_id"},
-            component_values=[
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-                {
-                    "default": 5,
-                    "name": "page_rules",
-                    "price": 5,
-                    "value": 20,
-                },
-            ],
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
             frequency="monthly",
             rate_plan={
+                "id": "free",
                 "currency": "USD",
                 "externally_managed": False,
-                "id": "free",
                 "is_contract": False,
                 "public_name": "Business Plan",
                 "scope": "zone",
-                "sets": ["string", "string", "string"],
+                "sets": ["string"],
             },
-            zone={},
         )
         assert_matches_type(SubscriptionCreateResponse, subscription, path=["response"])
 
     @parametrize
     async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zones.subscriptions.with_raw_response.create(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -236,7 +213,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zones.subscriptions.with_streaming_response.create(
-            identifier="506e3185e9c882d175a2d0cb0093d9f2",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -248,60 +225,77 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) ->
 
     @parametrize
     async def test_path_params_create(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.zones.subscriptions.with_raw_response.create(
-                identifier="",
+                zone_id="",
             )
 
     @parametrize
-    async def test_method_list(self, async_client: AsyncCloudflare) -> None:
-        subscription = await async_client.zones.subscriptions.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+    async def test_method_update(self, async_client: AsyncCloudflare) -> None:
+        subscription = await async_client.zones.subscriptions.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+        )
+        assert_matches_type(SubscriptionUpdateResponse, subscription, path=["response"])
+
+    @parametrize
+    async def test_method_update_with_all_params(self, async_client: AsyncCloudflare) -> None:
+        subscription = await async_client.zones.subscriptions.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+            frequency="monthly",
+            rate_plan={
+                "id": "free",
+                "currency": "USD",
+                "externally_managed": False,
+                "is_contract": False,
+                "public_name": "Business Plan",
+                "scope": "zone",
+                "sets": ["string"],
+            },
         )
-        assert_matches_type(AsyncSinglePage[Subscription], subscription, path=["response"])
+        assert_matches_type(SubscriptionUpdateResponse, subscription, path=["response"])
 
     @parametrize
-    async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None:
-        response = await async_client.zones.subscriptions.with_raw_response.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+    async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None:
+        response = await async_client.zones.subscriptions.with_raw_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         subscription = await response.parse()
-        assert_matches_type(AsyncSinglePage[Subscription], subscription, path=["response"])
+        assert_matches_type(SubscriptionUpdateResponse, subscription, path=["response"])
 
     @parametrize
-    async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None:
-        async with async_client.zones.subscriptions.with_streaming_response.list(
-            "023e105f4ecef8ad9ca31a8372d0c353",
+    async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> None:
+        async with async_client.zones.subscriptions.with_streaming_response.update(
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             subscription = await response.parse()
-            assert_matches_type(AsyncSinglePage[Subscription], subscription, path=["response"])
+            assert_matches_type(SubscriptionUpdateResponse, subscription, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
     @parametrize
-    async def test_path_params_list(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_identifier` but received ''"):
-            await async_client.zones.subscriptions.with_raw_response.list(
-                "",
+    async def test_path_params_update(self, async_client: AsyncCloudflare) -> None:
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
+            await async_client.zones.subscriptions.with_raw_response.update(
+                zone_id="",
             )
 
     @parametrize
     async def test_method_get(self, async_client: AsyncCloudflare) -> None:
         subscription = await async_client.zones.subscriptions.get(
-            "506e3185e9c882d175a2d0cb0093d9f2",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(SubscriptionGetResponse, subscription, path=["response"])
 
     @parametrize
     async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
         response = await async_client.zones.subscriptions.with_raw_response.get(
-            "506e3185e9c882d175a2d0cb0093d9f2",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
 
         assert response.is_closed is True
@@ -312,7 +306,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None:
         async with async_client.zones.subscriptions.with_streaming_response.get(
-            "506e3185e9c882d175a2d0cb0093d9f2",
+            zone_id="023e105f4ecef8ad9ca31a8372d0c353",
         ) as response:
             assert not response.is_closed
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
@@ -324,7 +318,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No
 
     @parametrize
     async def test_path_params_get(self, async_client: AsyncCloudflare) -> None:
-        with pytest.raises(ValueError, match=r"Expected a non-empty value for `identifier` but received ''"):
+        with pytest.raises(ValueError, match=r"Expected a non-empty value for `zone_id` but received ''"):
             await async_client.zones.subscriptions.with_raw_response.get(
-                "",
+                zone_id="",
             )
diff --git a/tests/conftest.py b/tests/conftest.py
index dd27712ac18..4e9cf86222e 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,27 +1,46 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
 from __future__ import annotations
 
 import os
-import asyncio
 import logging
 from typing import TYPE_CHECKING, Iterator, AsyncIterator
 
+import httpx
 import pytest
+from pytest_asyncio import is_async_test
 
-from cloudflare import Cloudflare, AsyncCloudflare
+from cloudflare import Cloudflare, AsyncCloudflare, DefaultAioHttpClient
+from cloudflare._utils import is_dict
 
 if TYPE_CHECKING:
-    from _pytest.fixtures import FixtureRequest
+    from _pytest.fixtures import FixtureRequest  # pyright: ignore[reportPrivateImportUsage]
 
 pytest.register_assert_rewrite("tests.utils")
 
 logging.getLogger("cloudflare").setLevel(logging.DEBUG)
 
 
-@pytest.fixture(scope="session")
-def event_loop() -> Iterator[asyncio.AbstractEventLoop]:
-    loop = asyncio.new_event_loop()
-    yield loop
-    loop.close()
+# automatically add `pytest.mark.asyncio()` to all of our async tests
+# so we don't have to add that boilerplate everywhere
+def pytest_collection_modifyitems(items: list[pytest.Function]) -> None:
+    pytest_asyncio_tests = (item for item in items if is_async_test(item))
+    session_scope_marker = pytest.mark.asyncio(loop_scope="session")
+    for async_test in pytest_asyncio_tests:
+        async_test.add_marker(session_scope_marker, append=False)
+
+    # We skip tests that use both the aiohttp client and respx_mock as respx_mock
+    # doesn't support custom transports.
+    for item in items:
+        if "async_client" not in item.fixturenames or "respx_mock" not in item.fixturenames:
+            continue
+
+        if not hasattr(item, "callspec"):
+            continue
+
+        async_client_param = item.callspec.params.get("async_client")
+        if is_dict(async_client_param) and async_client_param.get("http_client") == "aiohttp":
+            item.add_marker(pytest.mark.skip(reason="aiohttp client is not compatible with respx_mock"))
 
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
@@ -44,11 +63,29 @@ def client(request: FixtureRequest) -> Iterator[Cloudflare]:
 
 @pytest.fixture(scope="session")
 async def async_client(request: FixtureRequest) -> AsyncIterator[AsyncCloudflare]:
-    strict = getattr(request, "param", True)
-    if not isinstance(strict, bool):
-        raise TypeError(f"Unexpected fixture parameter type {type(strict)}, expected {bool}")
+    param = getattr(request, "param", True)
+
+    # defaults
+    strict = True
+    http_client: None | httpx.AsyncClient = None
+
+    if isinstance(param, bool):
+        strict = param
+    elif is_dict(param):
+        strict = param.get("strict", True)
+        assert isinstance(strict, bool)
+
+        http_client_type = param.get("http_client", "httpx")
+        if http_client_type == "aiohttp":
+            http_client = DefaultAioHttpClient()
+    else:
+        raise TypeError(f"Unexpected fixture parameter type {type(param)}, expected bool or dict")
 
     async with AsyncCloudflare(
-        base_url=base_url, api_key=api_key, api_email=api_email, _strict_response_validation=strict
+        base_url=base_url,
+        api_key=api_key,
+        api_email=api_email,
+        _strict_response_validation=strict,
+        http_client=http_client,
     ) as client:
         yield client
diff --git a/tests/test_client.py b/tests/test_client.py
index ebfafa47bf1..09b5e8b4e7c 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -4,12 +4,15 @@
 
 import gc
 import os
+import sys
 import json
 import asyncio
 import inspect
+import dataclasses
 import tracemalloc
-from typing import Any, Union, cast
+from typing import Any, Union, TypeVar, Callable, Iterable, Iterator, Optional, Coroutine, cast
 from unittest import mock
+from typing_extensions import Literal, AsyncIterator, override
 
 import httpx
 import pytest
@@ -18,18 +21,23 @@
 
 from cloudflare import Cloudflare, AsyncCloudflare, APIResponseValidationError
 from cloudflare._types import Omit
+from cloudflare._utils import asyncify
 from cloudflare._models import BaseModel, FinalRequestOptions
-from cloudflare._constants import RAW_RESPONSE_HEADER
 from cloudflare._exceptions import APIStatusError, APITimeoutError, APIResponseValidationError
 from cloudflare._base_client import (
     DEFAULT_TIMEOUT,
     HTTPX_DEFAULT_TIMEOUT,
     BaseClient,
+    OtherPlatform,
+    DefaultHttpxClient,
+    DefaultAsyncHttpxClient,
+    get_platform,
     make_request_options,
 )
 
 from .utils import update_env
 
+T = TypeVar("T")
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 api_key = "144c9defac04969c7bfad8efaa8ea194"
 api_email = "user@example.com"
@@ -45,6 +53,57 @@ def _low_retry_timeout(*_args: Any, **_kwargs: Any) -> float:
     return 0.1
 
 
+def mirror_request_content(request: httpx.Request) -> httpx.Response:
+    return httpx.Response(200, content=request.content)
+
+
+# note: we can't use the httpx.MockTransport class as it consumes the request
+#       body itself, which means we can't test that the body is read lazily
+class MockTransport(httpx.BaseTransport, httpx.AsyncBaseTransport):
+    def __init__(
+        self,
+        handler: Callable[[httpx.Request], httpx.Response]
+        | Callable[[httpx.Request], Coroutine[Any, Any, httpx.Response]],
+    ) -> None:
+        self.handler = handler
+
+    @override
+    def handle_request(
+        self,
+        request: httpx.Request,
+    ) -> httpx.Response:
+        assert not inspect.iscoroutinefunction(self.handler), "handler must not be a coroutine function"
+        assert inspect.isfunction(self.handler), "handler must be a function"
+        return self.handler(request)
+
+    @override
+    async def handle_async_request(
+        self,
+        request: httpx.Request,
+    ) -> httpx.Response:
+        assert inspect.iscoroutinefunction(self.handler), "handler must be a coroutine function"
+        return await self.handler(request)
+
+
+@dataclasses.dataclass
+class Counter:
+    value: int = 0
+
+
+def _make_sync_iterator(iterable: Iterable[T], counter: Optional[Counter] = None) -> Iterator[T]:
+    for item in iterable:
+        if counter:
+            counter.value += 1
+        yield item
+
+
+async def _make_async_iterator(iterable: Iterable[T], counter: Optional[Counter] = None) -> AsyncIterator[T]:
+    for item in iterable:
+        if counter:
+            counter.value += 1
+        yield item
+
+
 def _get_open_connections(client: Cloudflare | AsyncCloudflare) -> int:
     transport = client._client._transport
     assert isinstance(transport, httpx.HTTPTransport) or isinstance(transport, httpx.AsyncHTTPTransport)
@@ -54,55 +113,53 @@ def _get_open_connections(client: Cloudflare | AsyncCloudflare) -> int:
 
 
 class TestCloudflare:
-    client = Cloudflare(base_url=base_url, api_key=api_key, api_email=api_email, _strict_response_validation=True)
-
     @pytest.mark.respx(base_url=base_url)
-    def test_raw_response(self, respx_mock: MockRouter) -> None:
+    def test_raw_response(self, respx_mock: MockRouter, client: Cloudflare) -> None:
         respx_mock.post("/foo").mock(return_value=httpx.Response(200, json={"foo": "bar"}))
 
-        response = self.client.post("/foo", cast_to=httpx.Response)
+        response = client.post("/foo", cast_to=httpx.Response)
         assert response.status_code == 200
         assert isinstance(response, httpx.Response)
         assert response.json() == {"foo": "bar"}
 
     @pytest.mark.respx(base_url=base_url)
-    def test_raw_response_for_binary(self, respx_mock: MockRouter) -> None:
+    def test_raw_response_for_binary(self, respx_mock: MockRouter, client: Cloudflare) -> None:
         respx_mock.post("/foo").mock(
             return_value=httpx.Response(200, headers={"Content-Type": "application/binary"}, content='{"foo": "bar"}')
         )
 
-        response = self.client.post("/foo", cast_to=httpx.Response)
+        response = client.post("/foo", cast_to=httpx.Response)
         assert response.status_code == 200
         assert isinstance(response, httpx.Response)
         assert response.json() == {"foo": "bar"}
 
-    def test_copy(self) -> None:
-        copied = self.client.copy()
-        assert id(copied) != id(self.client)
+    def test_copy(self, client: Cloudflare) -> None:
+        copied = client.copy()
+        assert id(copied) != id(client)
 
-        copied = self.client.copy(api_key="another 144c9defac04969c7bfad8efaa8ea194")
+        copied = client.copy(api_key="another 144c9defac04969c7bfad8efaa8ea194")
         assert copied.api_key == "another 144c9defac04969c7bfad8efaa8ea194"
-        assert self.client.api_key == "144c9defac04969c7bfad8efaa8ea194"
+        assert client.api_key == "144c9defac04969c7bfad8efaa8ea194"
 
-        copied = self.client.copy(api_email="another user@example.com")
+        copied = client.copy(api_email="another user@example.com")
         assert copied.api_email == "another user@example.com"
-        assert self.client.api_email == "user@example.com"
+        assert client.api_email == "user@example.com"
 
-    def test_copy_default_options(self) -> None:
+    def test_copy_default_options(self, client: Cloudflare) -> None:
         # options that have a default are overridden correctly
-        copied = self.client.copy(max_retries=7)
+        copied = client.copy(max_retries=7)
         assert copied.max_retries == 7
-        assert self.client.max_retries == 2
+        assert client.max_retries == 2
 
         copied2 = copied.copy(max_retries=6)
         assert copied2.max_retries == 6
         assert copied.max_retries == 7
 
         # timeout
-        assert isinstance(self.client.timeout, httpx.Timeout)
-        copied = self.client.copy(timeout=None)
+        assert isinstance(client.timeout, httpx.Timeout)
+        copied = client.copy(timeout=None)
         assert copied.timeout is None
-        assert isinstance(self.client.timeout, httpx.Timeout)
+        assert isinstance(client.timeout, httpx.Timeout)
 
     def test_copy_default_headers(self) -> None:
         client = Cloudflare(
@@ -141,6 +198,7 @@ def test_copy_default_headers(self) -> None:
             match="`default_headers` and `set_default_headers` arguments are mutually exclusive",
         ):
             client.copy(set_default_headers={}, default_headers={"X-Foo": "Bar"})
+        client.close()
 
     def test_copy_default_query(self) -> None:
         client = Cloudflare(
@@ -182,13 +240,15 @@ def test_copy_default_query(self) -> None:
         ):
             client.copy(set_default_query={}, default_query={"foo": "Bar"})
 
-    def test_copy_signature(self) -> None:
+        client.close()
+
+    def test_copy_signature(self, client: Cloudflare) -> None:
         # ensure the same parameters that can be passed to the client are defined in the `.copy()` method
         init_signature = inspect.signature(
             # mypy doesn't like that we access the `__init__` property.
-            self.client.__init__,  # type: ignore[misc]
+            client.__init__,  # type: ignore[misc]
         )
-        copy_signature = inspect.signature(self.client.copy)
+        copy_signature = inspect.signature(client.copy)
         exclude_params = {"transport", "proxies", "_strict_response_validation"}
 
         for name in init_signature.parameters.keys():
@@ -198,12 +258,13 @@ def test_copy_signature(self) -> None:
             copy_param = copy_signature.parameters.get(name)
             assert copy_param is not None, f"copy() signature is missing the {name} param"
 
-    def test_copy_build_request(self) -> None:
+    @pytest.mark.skipif(sys.version_info >= (3, 10), reason="fails because of a memory leak that started from 3.12")
+    def test_copy_build_request(self, client: Cloudflare) -> None:
         options = FinalRequestOptions(method="get", url="/foo")
 
         def build_request(options: FinalRequestOptions) -> None:
-            client = self.client.copy()
-            client._build_request(options)
+            client_copy = client.copy()
+            client_copy._build_request(options)
 
         # ensure that the machinery is warmed up before tracing starts.
         build_request(options)
@@ -260,14 +321,12 @@ def add_leak(leaks: list[tracemalloc.StatisticDiff], diff: tracemalloc.Statistic
                     print(frame)
             raise AssertionError()
 
-    def test_request_timeout(self) -> None:
-        request = self.client._build_request(FinalRequestOptions(method="get", url="/foo"))
+    def test_request_timeout(self, client: Cloudflare) -> None:
+        request = client._build_request(FinalRequestOptions(method="get", url="/foo"))
         timeout = httpx.Timeout(**request.extensions["timeout"])  # type: ignore
         assert timeout == DEFAULT_TIMEOUT
 
-        request = self.client._build_request(
-            FinalRequestOptions(method="get", url="/foo", timeout=httpx.Timeout(100.0))
-        )
+        request = client._build_request(FinalRequestOptions(method="get", url="/foo", timeout=httpx.Timeout(100.0)))
         timeout = httpx.Timeout(**request.extensions["timeout"])  # type: ignore
         assert timeout == httpx.Timeout(100.0)
 
@@ -284,6 +343,8 @@ def test_client_timeout_option(self) -> None:
         timeout = httpx.Timeout(**request.extensions["timeout"])  # type: ignore
         assert timeout == httpx.Timeout(0)
 
+        client.close()
+
     def test_http_client_timeout_option(self) -> None:
         # custom timeout given to the httpx client should be used
         with httpx.Client(timeout=None) as http_client:
@@ -299,6 +360,8 @@ def test_http_client_timeout_option(self) -> None:
             timeout = httpx.Timeout(**request.extensions["timeout"])  # type: ignore
             assert timeout == httpx.Timeout(None)
 
+            client.close()
+
         # no timeout given to the httpx client should not use the httpx default
         with httpx.Client() as http_client:
             client = Cloudflare(
@@ -313,6 +376,8 @@ def test_http_client_timeout_option(self) -> None:
             timeout = httpx.Timeout(**request.extensions["timeout"])  # type: ignore
             assert timeout == DEFAULT_TIMEOUT
 
+            client.close()
+
         # explicitly passing the default timeout currently results in it being ignored
         with httpx.Client(timeout=HTTPX_DEFAULT_TIMEOUT) as http_client:
             client = Cloudflare(
@@ -327,6 +392,8 @@ def test_http_client_timeout_option(self) -> None:
             timeout = httpx.Timeout(**request.extensions["timeout"])  # type: ignore
             assert timeout == DEFAULT_TIMEOUT  # our default
 
+            client.close()
+
     async def test_invalid_http_client(self) -> None:
         with pytest.raises(TypeError, match="Invalid `http_client` arg"):
             async with httpx.AsyncClient() as http_client:
@@ -339,18 +406,18 @@ async def test_invalid_http_client(self) -> None:
                 )
 
     def test_default_headers_option(self) -> None:
-        client = Cloudflare(
+        test_client = Cloudflare(
             base_url=base_url,
             api_key=api_key,
             api_email=api_email,
             _strict_response_validation=True,
             default_headers={"X-Foo": "bar"},
         )
-        request = client._build_request(FinalRequestOptions(method="get", url="/foo"))
+        request = test_client._build_request(FinalRequestOptions(method="get", url="/foo"))
         assert request.headers.get("x-foo") == "bar"
         assert request.headers.get("x-stainless-lang") == "python"
 
-        client2 = Cloudflare(
+        test_client2 = Cloudflare(
             base_url=base_url,
             api_key=api_key,
             api_email=api_email,
@@ -360,10 +427,13 @@ def test_default_headers_option(self) -> None:
                 "X-Stainless-Lang": "my-overriding-header",
             },
         )
-        request = client2._build_request(FinalRequestOptions(method="get", url="/foo"))
+        request = test_client2._build_request(FinalRequestOptions(method="get", url="/foo"))
         assert request.headers.get("x-foo") == "stainless"
         assert request.headers.get("x-stainless-lang") == "my-overriding-header"
 
+        test_client.close()
+        test_client2.close()
+
     def test_validate_headers(self) -> None:
         client = Cloudflare(base_url=base_url, api_key=api_key, api_email=api_email, _strict_response_validation=True)
         request = client._build_request(FinalRequestOptions(method="get", url="/foo"))
@@ -371,7 +441,13 @@ def test_validate_headers(self) -> None:
         request = client._build_request(FinalRequestOptions(method="get", url="/foo"))
         assert request.headers.get("X-Auth-Key") == api_key
 
-        client2 = Cloudflare(base_url=base_url, api_key=None, api_email=None, _strict_response_validation=True)
+        with update_env(
+            **{
+                "CLOUDFLARE_EMAIL": Omit(),
+                "CLOUDFLARE_API_KEY": Omit(),
+            }
+        ):
+            client2 = Cloudflare(base_url=base_url, api_key=None, api_email=None, _strict_response_validation=True)
 
         with pytest.raises(
             TypeError,
@@ -402,14 +478,16 @@ def test_default_query_option(self) -> None:
             FinalRequestOptions(
                 method="get",
                 url="/foo",
-                params={"foo": "baz", "query_param": "overriden"},
+                params={"foo": "baz", "query_param": "overridden"},
             )
         )
         url = httpx.URL(request.url)
-        assert dict(url.params) == {"foo": "baz", "query_param": "overriden"}
+        assert dict(url.params) == {"foo": "baz", "query_param": "overridden"}
+
+        client.close()
 
-    def test_request_extra_json(self) -> None:
-        request = self.client._build_request(
+    def test_request_extra_json(self, client: Cloudflare) -> None:
+        request = client._build_request(
             FinalRequestOptions(
                 method="post",
                 url="/foo",
@@ -420,7 +498,7 @@ def test_request_extra_json(self) -> None:
         data = json.loads(request.content.decode("utf-8"))
         assert data == {"foo": "bar", "baz": False}
 
-        request = self.client._build_request(
+        request = client._build_request(
             FinalRequestOptions(
                 method="post",
                 url="/foo",
@@ -431,7 +509,7 @@ def test_request_extra_json(self) -> None:
         assert data == {"baz": False}
 
         # `extra_json` takes priority over `json_data` when keys clash
-        request = self.client._build_request(
+        request = client._build_request(
             FinalRequestOptions(
                 method="post",
                 url="/foo",
@@ -442,8 +520,8 @@ def test_request_extra_json(self) -> None:
         data = json.loads(request.content.decode("utf-8"))
         assert data == {"foo": "bar", "baz": None}
 
-    def test_request_extra_headers(self) -> None:
-        request = self.client._build_request(
+    def test_request_extra_headers(self, client: Cloudflare) -> None:
+        request = client._build_request(
             FinalRequestOptions(
                 method="post",
                 url="/foo",
@@ -453,7 +531,7 @@ def test_request_extra_headers(self) -> None:
         assert request.headers.get("X-Foo") == "Foo"
 
         # `extra_headers` takes priority over `default_headers` when keys clash
-        request = self.client.with_options(default_headers={"X-Bar": "true"})._build_request(
+        request = client.with_options(default_headers={"X-Bar": "true"})._build_request(
             FinalRequestOptions(
                 method="post",
                 url="/foo",
@@ -464,8 +542,8 @@ def test_request_extra_headers(self) -> None:
         )
         assert request.headers.get("X-Bar") == "false"
 
-    def test_request_extra_query(self) -> None:
-        request = self.client._build_request(
+    def test_request_extra_query(self, client: Cloudflare) -> None:
+        request = client._build_request(
             FinalRequestOptions(
                 method="post",
                 url="/foo",
@@ -478,7 +556,7 @@ def test_request_extra_query(self) -> None:
         assert params == {"my_query_param": "Foo"}
 
         # if both `query` and `extra_query` are given, they are merged
-        request = self.client._build_request(
+        request = client._build_request(
             FinalRequestOptions(
                 method="post",
                 url="/foo",
@@ -492,7 +570,7 @@ def test_request_extra_query(self) -> None:
         assert params == {"bar": "1", "foo": "2"}
 
         # `extra_query` takes priority over `query` when keys clash
-        request = self.client._build_request(
+        request = client._build_request(
             FinalRequestOptions(
                 method="post",
                 url="/foo",
@@ -508,7 +586,7 @@ def test_request_extra_query(self) -> None:
     def test_multipart_repeating_array(self, client: Cloudflare) -> None:
         request = client._build_request(
             FinalRequestOptions.construct(
-                method="get",
+                method="post",
                 url="/foo",
                 headers={"Content-Type": "multipart/form-data; boundary=6b7ba517decee4a450543ea6ae821c82"},
                 json_data={"array": ["foo", "bar"]},
@@ -534,8 +612,163 @@ def test_multipart_repeating_array(self, client: Cloudflare) -> None:
             b"",
         ]
 
+    def test_multipart_json_syntax_no_files(self, client: Cloudflare) -> None:
+        request = client._build_request(
+            FinalRequestOptions.construct(
+                method="post",
+                url="/foo",
+                headers={"Content-Type": "multipart/form-data; boundary=6b7ba517decee4a450543ea6ae821c82"},
+                json_data={"name": "test", "nested": {"key": "value", 'bool': True, 'none': None, 'int': 8}},
+                multipart_syntax="json",
+            )
+        )
+
+        assert request.read().split(b"\r\n") == [
+            b"--6b7ba517decee4a450543ea6ae821c82",
+            b'Content-Disposition: form-data; name="name"',
+            b"Content-Type: text/plain",
+            b"",
+            b"test",
+            b"--6b7ba517decee4a450543ea6ae821c82",
+            b'Content-Disposition: form-data; name="nested"',
+            b"Content-Type: application/json",
+            b"",
+            b'{"key": "value", "bool": true, "none": null, "int": 8}',
+            b"--6b7ba517decee4a450543ea6ae821c82--",
+            b"",
+        ]
+
+    def test_multipart_json_syntax_with_mapping_files(self, client: Cloudflare) -> None:
+        request = client._build_request(
+            FinalRequestOptions.construct(
+                method="post",
+                url="/foo",
+                headers={"Content-Type": "multipart/form-data; boundary=6b7ba517decee4a450543ea6ae821c82"},
+                json_data=({"name": "test", "nested": {"key": "value"}}),
+                files={"file1": ("file1.txt", b"content1")},
+                multipart_syntax="json",
+            )
+        )
+
+        assert request.read().split(b"\r\n") == [
+            b"--6b7ba517decee4a450543ea6ae821c82",
+            b'Content-Disposition: form-data; name="file1"; filename="file1.txt"',
+            b"Content-Type: text/plain",
+            b"",
+            b"content1",
+            b"--6b7ba517decee4a450543ea6ae821c82",
+            b'Content-Disposition: form-data; name="name"',
+            b"Content-Type: text/plain",
+            b"",
+            b"test",
+            b"--6b7ba517decee4a450543ea6ae821c82",
+            b'Content-Disposition: form-data; name="nested"',
+            b"Content-Type: application/json",
+            b"",
+            b'{"key": "value"}',
+            b"--6b7ba517decee4a450543ea6ae821c82--",
+            b"",
+        ]
+
+    def test_multipart_json_syntax_with_sequence_files(self, client: Cloudflare) -> None:
+        request = client._build_request(
+            FinalRequestOptions.construct(
+                method="post",
+                url="/foo",
+                headers={"Content-Type": "multipart/form-data; boundary=6b7ba517decee4a450543ea6ae821c82"},
+                json_data={"name": "test", "nested": {"key": "value"}},
+                files=[("file1", ("file1.txt", b"content1"))],
+                multipart_syntax="json",
+            )
+        )
+
+        assert request.read().split(b"\r\n") == [
+            b"--6b7ba517decee4a450543ea6ae821c82",
+            b'Content-Disposition: form-data; name="file1"; filename="file1.txt"',
+            b"Content-Type: text/plain",
+            b"",
+            b"content1",
+            b"--6b7ba517decee4a450543ea6ae821c82",
+            b'Content-Disposition: form-data; name="name"',
+            b"Content-Type: text/plain",
+            b"",
+            b"test",
+            b"--6b7ba517decee4a450543ea6ae821c82",
+            b'Content-Disposition: form-data; name="nested"',
+            b"Content-Type: application/json",
+            b"",
+            b'{"key": "value"}',
+            b"--6b7ba517decee4a450543ea6ae821c82--",
+            b"",
+        ]
+
     @pytest.mark.respx(base_url=base_url)
-    def test_basic_union_response(self, respx_mock: MockRouter) -> None:
+    def test_binary_content_upload(self, respx_mock: MockRouter, client: Cloudflare) -> None:
+        respx_mock.post("/upload").mock(side_effect=mirror_request_content)
+
+        file_content = b"Hello, this is a test file."
+
+        response = client.post(
+            "/upload",
+            content=file_content,
+            cast_to=httpx.Response,
+            options={"headers": {"Content-Type": "application/octet-stream"}},
+        )
+
+        assert response.status_code == 200
+        assert response.request.headers["Content-Type"] == "application/octet-stream"
+        assert response.content == file_content
+
+    def test_binary_content_upload_with_iterator(self) -> None:
+        file_content = b"Hello, this is a test file."
+        counter = Counter()
+        iterator = _make_sync_iterator([file_content], counter=counter)
+
+        def mock_handler(request: httpx.Request) -> httpx.Response:
+            assert counter.value == 0, "the request body should not have been read"
+            return httpx.Response(200, content=request.read())
+
+        with Cloudflare(
+            base_url=base_url,
+            api_key=api_key,
+            api_email=api_email,
+            _strict_response_validation=True,
+            http_client=httpx.Client(transport=MockTransport(handler=mock_handler)),
+        ) as client:
+            response = client.post(
+                "/upload",
+                content=iterator,
+                cast_to=httpx.Response,
+                options={"headers": {"Content-Type": "application/octet-stream"}},
+            )
+
+            assert response.status_code == 200
+            assert response.request.headers["Content-Type"] == "application/octet-stream"
+            assert response.content == file_content
+            assert counter.value == 1
+
+    @pytest.mark.respx(base_url=base_url)
+    def test_binary_content_upload_with_body_is_deprecated(self, respx_mock: MockRouter, client: Cloudflare) -> None:
+        respx_mock.post("/upload").mock(side_effect=mirror_request_content)
+
+        file_content = b"Hello, this is a test file."
+
+        with pytest.deprecated_call(
+            match="Passing raw bytes as `body` is deprecated and will be removed in a future version. Please pass raw bytes via the `content` parameter instead."
+        ):
+            response = client.post(
+                "/upload",
+                body=file_content,
+                cast_to=httpx.Response,
+                options={"headers": {"Content-Type": "application/octet-stream"}},
+            )
+
+        assert response.status_code == 200
+        assert response.request.headers["Content-Type"] == "application/octet-stream"
+        assert response.content == file_content
+
+    @pytest.mark.respx(base_url=base_url)
+    def test_basic_union_response(self, respx_mock: MockRouter, client: Cloudflare) -> None:
         class Model1(BaseModel):
             name: str
 
@@ -544,12 +777,12 @@ class Model2(BaseModel):
 
         respx_mock.get("/foo").mock(return_value=httpx.Response(200, json={"foo": "bar"}))
 
-        response = self.client.get("/foo", cast_to=cast(Any, Union[Model1, Model2]))
+        response = client.get("/foo", cast_to=cast(Any, Union[Model1, Model2]))
         assert isinstance(response, Model2)
         assert response.foo == "bar"
 
     @pytest.mark.respx(base_url=base_url)
-    def test_union_response_different_types(self, respx_mock: MockRouter) -> None:
+    def test_union_response_different_types(self, respx_mock: MockRouter, client: Cloudflare) -> None:
         """Union of objects with the same field name using a different type"""
 
         class Model1(BaseModel):
@@ -560,18 +793,18 @@ class Model2(BaseModel):
 
         respx_mock.get("/foo").mock(return_value=httpx.Response(200, json={"foo": "bar"}))
 
-        response = self.client.get("/foo", cast_to=cast(Any, Union[Model1, Model2]))
+        response = client.get("/foo", cast_to=cast(Any, Union[Model1, Model2]))
         assert isinstance(response, Model2)
         assert response.foo == "bar"
 
         respx_mock.get("/foo").mock(return_value=httpx.Response(200, json={"foo": 1}))
 
-        response = self.client.get("/foo", cast_to=cast(Any, Union[Model1, Model2]))
+        response = client.get("/foo", cast_to=cast(Any, Union[Model1, Model2]))
         assert isinstance(response, Model1)
         assert response.foo == 1
 
     @pytest.mark.respx(base_url=base_url)
-    def test_non_application_json_content_type_for_json_data(self, respx_mock: MockRouter) -> None:
+    def test_non_application_json_content_type_for_json_data(self, respx_mock: MockRouter, client: Cloudflare) -> None:
         """
         Response that sets Content-Type to something other than application/json but returns json data
         """
@@ -587,7 +820,7 @@ class Model(BaseModel):
             )
         )
 
-        response = self.client.get("/foo", cast_to=Model)
+        response = client.get("/foo", cast_to=Model)
         assert isinstance(response, Model)
         assert response.foo == 2
 
@@ -604,6 +837,8 @@ def test_base_url_setter(self) -> None:
 
         assert client.base_url == "https://example.com/from_setter/"
 
+        client.close()
+
     def test_base_url_env(self) -> None:
         with update_env(CLOUDFLARE_BASE_URL="http://localhost:5000/from/env"):
             client = Cloudflare(api_key=api_key, api_email=api_email, _strict_response_validation=True)
@@ -637,6 +872,7 @@ def test_base_url_trailing_slash(self, client: Cloudflare) -> None:
             ),
         )
         assert request.url == "http://localhost:5000/custom/path/foo"
+        client.close()
 
     @pytest.mark.parametrize(
         "client",
@@ -666,6 +902,7 @@ def test_base_url_no_trailing_slash(self, client: Cloudflare) -> None:
             ),
         )
         assert request.url == "http://localhost:5000/custom/path/foo"
+        client.close()
 
     @pytest.mark.parametrize(
         "client",
@@ -695,35 +932,40 @@ def test_absolute_request_url(self, client: Cloudflare) -> None:
             ),
         )
         assert request.url == "https://myapi.com/foo"
+        client.close()
 
     def test_copied_client_does_not_close_http(self) -> None:
-        client = Cloudflare(base_url=base_url, api_key=api_key, api_email=api_email, _strict_response_validation=True)
-        assert not client.is_closed()
+        test_client = Cloudflare(
+            base_url=base_url, api_key=api_key, api_email=api_email, _strict_response_validation=True
+        )
+        assert not test_client.is_closed()
 
-        copied = client.copy()
-        assert copied is not client
+        copied = test_client.copy()
+        assert copied is not test_client
 
         del copied
 
-        assert not client.is_closed()
+        assert not test_client.is_closed()
 
     def test_client_context_manager(self) -> None:
-        client = Cloudflare(base_url=base_url, api_key=api_key, api_email=api_email, _strict_response_validation=True)
-        with client as c2:
-            assert c2 is client
+        test_client = Cloudflare(
+            base_url=base_url, api_key=api_key, api_email=api_email, _strict_response_validation=True
+        )
+        with test_client as c2:
+            assert c2 is test_client
             assert not c2.is_closed()
-            assert not client.is_closed()
-        assert client.is_closed()
+            assert not test_client.is_closed()
+        assert test_client.is_closed()
 
     @pytest.mark.respx(base_url=base_url)
-    def test_client_response_validation_error(self, respx_mock: MockRouter) -> None:
+    def test_client_response_validation_error(self, respx_mock: MockRouter, client: Cloudflare) -> None:
         class Model(BaseModel):
             foo: str
 
         respx_mock.get("/foo").mock(return_value=httpx.Response(200, json={"foo": {"invalid": True}}))
 
         with pytest.raises(APIResponseValidationError) as exc:
-            self.client.get("/foo", cast_to=Model)
+            client.get("/foo", cast_to=Model)
 
         assert isinstance(exc.value.__cause__, ValidationError)
 
@@ -751,11 +993,16 @@ class Model(BaseModel):
         with pytest.raises(APIResponseValidationError):
             strict_client.get("/foo", cast_to=Model)
 
-        client = Cloudflare(base_url=base_url, api_key=api_key, api_email=api_email, _strict_response_validation=False)
+        non_strict_client = Cloudflare(
+            base_url=base_url, api_key=api_key, api_email=api_email, _strict_response_validation=False
+        )
 
-        response = client.get("/foo", cast_to=Model)
+        response = non_strict_client.get("/foo", cast_to=Model)
         assert isinstance(response, str)  # type: ignore[unreachable]
 
+        strict_client.close()
+        non_strict_client.close()
+
     @pytest.mark.parametrize(
         "remaining_retries,retry_after,timeout",
         [
@@ -774,12 +1021,13 @@ class Model(BaseModel):
             [3, "", 0.5],
             [2, "", 0.5 * 2.0],
             [1, "", 0.5 * 4.0],
+            [-1100, "", 8],  # test large number potentially overflowing
         ],
     )
     @mock.patch("time.time", mock.MagicMock(return_value=1696004797))
-    def test_parse_retry_after_header(self, remaining_retries: int, retry_after: str, timeout: float) -> None:
-        client = Cloudflare(base_url=base_url, api_key=api_key, api_email=api_email, _strict_response_validation=True)
-
+    def test_parse_retry_after_header(
+        self, remaining_retries: int, retry_after: str, timeout: float, client: Cloudflare
+    ) -> None:
         headers = httpx.Headers({"retry-after": retry_after})
         options = FinalRequestOptions(method="get", url="/foo", max_retries=3)
         calculated = client._calculate_retry_timeout(remaining_retries, options, headers)
@@ -787,93 +1035,202 @@ def test_parse_retry_after_header(self, remaining_retries: int, retry_after: str
 
     @mock.patch("cloudflare._base_client.BaseClient._calculate_retry_timeout", _low_retry_timeout)
     @pytest.mark.respx(base_url=base_url)
-    def test_retrying_timeout_errors_doesnt_leak(self, respx_mock: MockRouter) -> None:
+    def test_retrying_timeout_errors_doesnt_leak(self, respx_mock: MockRouter, client: Cloudflare) -> None:
         respx_mock.post("/zones").mock(side_effect=httpx.TimeoutException("Test timeout error"))
 
         with pytest.raises(APITimeoutError):
-            self.client.post(
-                "/zones",
-                body=cast(
-                    object, dict(account={"id": "023e105f4ecef8ad9ca31a8372d0c353"}, name="example.com", type="full")
-                ),
-                cast_to=httpx.Response,
-                options={"headers": {RAW_RESPONSE_HEADER: "stream"}},
-            )
+            client.zones.with_streaming_response.create(account={}, name="example.com").__enter__()
 
-        assert _get_open_connections(self.client) == 0
+        assert _get_open_connections(client) == 0
 
     @mock.patch("cloudflare._base_client.BaseClient._calculate_retry_timeout", _low_retry_timeout)
     @pytest.mark.respx(base_url=base_url)
-    def test_retrying_status_errors_doesnt_leak(self, respx_mock: MockRouter) -> None:
+    def test_retrying_status_errors_doesnt_leak(self, respx_mock: MockRouter, client: Cloudflare) -> None:
         respx_mock.post("/zones").mock(return_value=httpx.Response(500))
 
         with pytest.raises(APIStatusError):
-            self.client.post(
-                "/zones",
-                body=cast(
-                    object, dict(account={"id": "023e105f4ecef8ad9ca31a8372d0c353"}, name="example.com", type="full")
-                ),
-                cast_to=httpx.Response,
-                options={"headers": {RAW_RESPONSE_HEADER: "stream"}},
-            )
+            client.zones.with_streaming_response.create(account={}, name="example.com").__enter__()
+        assert _get_open_connections(client) == 0
 
-        assert _get_open_connections(self.client) == 0
+    @pytest.mark.parametrize("failures_before_success", [0, 2, 4])
+    @mock.patch("cloudflare._base_client.BaseClient._calculate_retry_timeout", _low_retry_timeout)
+    @pytest.mark.respx(base_url=base_url)
+    @pytest.mark.parametrize("failure_mode", ["status", "exception"])
+    def test_retries_taken(
+        self,
+        client: Cloudflare,
+        failures_before_success: int,
+        failure_mode: Literal["status", "exception"],
+        respx_mock: MockRouter,
+    ) -> None:
+        client = client.with_options(max_retries=4)
+
+        nb_retries = 0
+
+        def retry_handler(_request: httpx.Request) -> httpx.Response:
+            nonlocal nb_retries
+            if nb_retries < failures_before_success:
+                nb_retries += 1
+                if failure_mode == "exception":
+                    raise RuntimeError("oops")
+                return httpx.Response(500)
+            return httpx.Response(200)
+
+        respx_mock.post("/zones").mock(side_effect=retry_handler)
+
+        response = client.zones.with_raw_response.create(account={}, name="example.com")
+
+        assert response.retries_taken == failures_before_success
+        assert int(response.http_request.headers.get("x-stainless-retry-count")) == failures_before_success
+
+    @pytest.mark.parametrize("failures_before_success", [0, 2, 4])
+    @mock.patch("cloudflare._base_client.BaseClient._calculate_retry_timeout", _low_retry_timeout)
+    @pytest.mark.respx(base_url=base_url)
+    def test_omit_retry_count_header(
+        self, client: Cloudflare, failures_before_success: int, respx_mock: MockRouter
+    ) -> None:
+        client = client.with_options(max_retries=4)
 
+        nb_retries = 0
 
-class TestAsyncCloudflare:
-    client = AsyncCloudflare(base_url=base_url, api_key=api_key, api_email=api_email, _strict_response_validation=True)
+        def retry_handler(_request: httpx.Request) -> httpx.Response:
+            nonlocal nb_retries
+            if nb_retries < failures_before_success:
+                nb_retries += 1
+                return httpx.Response(500)
+            return httpx.Response(200)
+
+        respx_mock.post("/zones").mock(side_effect=retry_handler)
+
+        response = client.zones.with_raw_response.create(
+            account={}, name="example.com", extra_headers={"x-stainless-retry-count": Omit()}
+        )
+
+        assert len(response.http_request.headers.get_list("x-stainless-retry-count")) == 0
+
+    @pytest.mark.parametrize("failures_before_success", [0, 2, 4])
+    @mock.patch("cloudflare._base_client.BaseClient._calculate_retry_timeout", _low_retry_timeout)
+    @pytest.mark.respx(base_url=base_url)
+    def test_overwrite_retry_count_header(
+        self, client: Cloudflare, failures_before_success: int, respx_mock: MockRouter
+    ) -> None:
+        client = client.with_options(max_retries=4)
+
+        nb_retries = 0
+
+        def retry_handler(_request: httpx.Request) -> httpx.Response:
+            nonlocal nb_retries
+            if nb_retries < failures_before_success:
+                nb_retries += 1
+                return httpx.Response(500)
+            return httpx.Response(200)
+
+        respx_mock.post("/zones").mock(side_effect=retry_handler)
+
+        response = client.zones.with_raw_response.create(
+            account={}, name="example.com", extra_headers={"x-stainless-retry-count": "42"}
+        )
+
+        assert response.http_request.headers.get("x-stainless-retry-count") == "42"
 
+    def test_proxy_environment_variables(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        # Test that the proxy environment variables are set correctly
+        monkeypatch.setenv("HTTPS_PROXY", "https://example.org")
+
+        client = DefaultHttpxClient()
+
+        mounts = tuple(client._mounts.items())
+        assert len(mounts) == 1
+        assert mounts[0][0].pattern == "https://"
+
+    @pytest.mark.filterwarnings("ignore:.*deprecated.*:DeprecationWarning")
+    def test_default_client_creation(self) -> None:
+        # Ensure that the client can be initialized without any exceptions
+        DefaultHttpxClient(
+            verify=True,
+            cert=None,
+            trust_env=True,
+            http1=True,
+            http2=False,
+            limits=httpx.Limits(max_connections=100, max_keepalive_connections=20),
+        )
+
+    @pytest.mark.respx(base_url=base_url)
+    def test_follow_redirects(self, respx_mock: MockRouter, client: Cloudflare) -> None:
+        # Test that the default follow_redirects=True allows following redirects
+        respx_mock.post("/redirect").mock(
+            return_value=httpx.Response(302, headers={"Location": f"{base_url}/redirected"})
+        )
+        respx_mock.get("/redirected").mock(return_value=httpx.Response(200, json={"status": "ok"}))
+
+        response = client.post("/redirect", body={"key": "value"}, cast_to=httpx.Response)
+        assert response.status_code == 200
+        assert response.json() == {"status": "ok"}
+
+    @pytest.mark.respx(base_url=base_url)
+    def test_follow_redirects_disabled(self, respx_mock: MockRouter, client: Cloudflare) -> None:
+        # Test that follow_redirects=False prevents following redirects
+        respx_mock.post("/redirect").mock(
+            return_value=httpx.Response(302, headers={"Location": f"{base_url}/redirected"})
+        )
+
+        with pytest.raises(APIStatusError) as exc_info:
+            client.post("/redirect", body={"key": "value"}, options={"follow_redirects": False}, cast_to=httpx.Response)
+
+        assert exc_info.value.response.status_code == 302
+        assert exc_info.value.response.headers["Location"] == f"{base_url}/redirected"
+
+
+class TestAsyncCloudflare:
     @pytest.mark.respx(base_url=base_url)
-    @pytest.mark.asyncio
-    async def test_raw_response(self, respx_mock: MockRouter) -> None:
+    async def test_raw_response(self, respx_mock: MockRouter, async_client: AsyncCloudflare) -> None:
         respx_mock.post("/foo").mock(return_value=httpx.Response(200, json={"foo": "bar"}))
 
-        response = await self.client.post("/foo", cast_to=httpx.Response)
+        response = await async_client.post("/foo", cast_to=httpx.Response)
         assert response.status_code == 200
         assert isinstance(response, httpx.Response)
         assert response.json() == {"foo": "bar"}
 
     @pytest.mark.respx(base_url=base_url)
-    @pytest.mark.asyncio
-    async def test_raw_response_for_binary(self, respx_mock: MockRouter) -> None:
+    async def test_raw_response_for_binary(self, respx_mock: MockRouter, async_client: AsyncCloudflare) -> None:
         respx_mock.post("/foo").mock(
             return_value=httpx.Response(200, headers={"Content-Type": "application/binary"}, content='{"foo": "bar"}')
         )
 
-        response = await self.client.post("/foo", cast_to=httpx.Response)
+        response = await async_client.post("/foo", cast_to=httpx.Response)
         assert response.status_code == 200
         assert isinstance(response, httpx.Response)
         assert response.json() == {"foo": "bar"}
 
-    def test_copy(self) -> None:
-        copied = self.client.copy()
-        assert id(copied) != id(self.client)
+    def test_copy(self, async_client: AsyncCloudflare) -> None:
+        copied = async_client.copy()
+        assert id(copied) != id(async_client)
 
-        copied = self.client.copy(api_key="another 144c9defac04969c7bfad8efaa8ea194")
+        copied = async_client.copy(api_key="another 144c9defac04969c7bfad8efaa8ea194")
         assert copied.api_key == "another 144c9defac04969c7bfad8efaa8ea194"
-        assert self.client.api_key == "144c9defac04969c7bfad8efaa8ea194"
+        assert async_client.api_key == "144c9defac04969c7bfad8efaa8ea194"
 
-        copied = self.client.copy(api_email="another user@example.com")
+        copied = async_client.copy(api_email="another user@example.com")
         assert copied.api_email == "another user@example.com"
-        assert self.client.api_email == "user@example.com"
+        assert async_client.api_email == "user@example.com"
 
-    def test_copy_default_options(self) -> None:
+    def test_copy_default_options(self, async_client: AsyncCloudflare) -> None:
         # options that have a default are overridden correctly
-        copied = self.client.copy(max_retries=7)
+        copied = async_client.copy(max_retries=7)
         assert copied.max_retries == 7
-        assert self.client.max_retries == 2
+        assert async_client.max_retries == 2
 
         copied2 = copied.copy(max_retries=6)
         assert copied2.max_retries == 6
         assert copied.max_retries == 7
 
         # timeout
-        assert isinstance(self.client.timeout, httpx.Timeout)
-        copied = self.client.copy(timeout=None)
+        assert isinstance(async_client.timeout, httpx.Timeout)
+        copied = async_client.copy(timeout=None)
         assert copied.timeout is None
-        assert isinstance(self.client.timeout, httpx.Timeout)
+        assert isinstance(async_client.timeout, httpx.Timeout)
 
-    def test_copy_default_headers(self) -> None:
+    async def test_copy_default_headers(self) -> None:
         client = AsyncCloudflare(
             base_url=base_url,
             api_key=api_key,
@@ -910,8 +1267,9 @@ def test_copy_default_headers(self) -> None:
             match="`default_headers` and `set_default_headers` arguments are mutually exclusive",
         ):
             client.copy(set_default_headers={}, default_headers={"X-Foo": "Bar"})
+        await client.close()
 
-    def test_copy_default_query(self) -> None:
+    async def test_copy_default_query(self) -> None:
         client = AsyncCloudflare(
             base_url=base_url,
             api_key=api_key,
@@ -951,13 +1309,15 @@ def test_copy_default_query(self) -> None:
         ):
             client.copy(set_default_query={}, default_query={"foo": "Bar"})
 
-    def test_copy_signature(self) -> None:
+        await client.close()
+
+    def test_copy_signature(self, async_client: AsyncCloudflare) -> None:
         # ensure the same parameters that can be passed to the client are defined in the `.copy()` method
         init_signature = inspect.signature(
             # mypy doesn't like that we access the `__init__` property.
-            self.client.__init__,  # type: ignore[misc]
+            async_client.__init__,  # type: ignore[misc]
         )
-        copy_signature = inspect.signature(self.client.copy)
+        copy_signature = inspect.signature(async_client.copy)
         exclude_params = {"transport", "proxies", "_strict_response_validation"}
 
         for name in init_signature.parameters.keys():
@@ -967,12 +1327,13 @@ def test_copy_signature(self) -> None:
             copy_param = copy_signature.parameters.get(name)
             assert copy_param is not None, f"copy() signature is missing the {name} param"
 
-    def test_copy_build_request(self) -> None:
+    @pytest.mark.skipif(sys.version_info >= (3, 10), reason="fails because of a memory leak that started from 3.12")
+    def test_copy_build_request(self, async_client: AsyncCloudflare) -> None:
         options = FinalRequestOptions(method="get", url="/foo")
 
         def build_request(options: FinalRequestOptions) -> None:
-            client = self.client.copy()
-            client._build_request(options)
+            client_copy = async_client.copy()
+            client_copy._build_request(options)
 
         # ensure that the machinery is warmed up before tracing starts.
         build_request(options)
@@ -1029,12 +1390,12 @@ def add_leak(leaks: list[tracemalloc.StatisticDiff], diff: tracemalloc.Statistic
                     print(frame)
             raise AssertionError()
 
-    async def test_request_timeout(self) -> None:
-        request = self.client._build_request(FinalRequestOptions(method="get", url="/foo"))
+    async def test_request_timeout(self, async_client: AsyncCloudflare) -> None:
+        request = async_client._build_request(FinalRequestOptions(method="get", url="/foo"))
         timeout = httpx.Timeout(**request.extensions["timeout"])  # type: ignore
         assert timeout == DEFAULT_TIMEOUT
 
-        request = self.client._build_request(
+        request = async_client._build_request(
             FinalRequestOptions(method="get", url="/foo", timeout=httpx.Timeout(100.0))
         )
         timeout = httpx.Timeout(**request.extensions["timeout"])  # type: ignore
@@ -1053,6 +1414,8 @@ async def test_client_timeout_option(self) -> None:
         timeout = httpx.Timeout(**request.extensions["timeout"])  # type: ignore
         assert timeout == httpx.Timeout(0)
 
+        await client.close()
+
     async def test_http_client_timeout_option(self) -> None:
         # custom timeout given to the httpx client should be used
         async with httpx.AsyncClient(timeout=None) as http_client:
@@ -1068,6 +1431,8 @@ async def test_http_client_timeout_option(self) -> None:
             timeout = httpx.Timeout(**request.extensions["timeout"])  # type: ignore
             assert timeout == httpx.Timeout(None)
 
+            await client.close()
+
         # no timeout given to the httpx client should not use the httpx default
         async with httpx.AsyncClient() as http_client:
             client = AsyncCloudflare(
@@ -1082,6 +1447,8 @@ async def test_http_client_timeout_option(self) -> None:
             timeout = httpx.Timeout(**request.extensions["timeout"])  # type: ignore
             assert timeout == DEFAULT_TIMEOUT
 
+            await client.close()
+
         # explicitly passing the default timeout currently results in it being ignored
         async with httpx.AsyncClient(timeout=HTTPX_DEFAULT_TIMEOUT) as http_client:
             client = AsyncCloudflare(
@@ -1096,6 +1463,8 @@ async def test_http_client_timeout_option(self) -> None:
             timeout = httpx.Timeout(**request.extensions["timeout"])  # type: ignore
             assert timeout == DEFAULT_TIMEOUT  # our default
 
+            await client.close()
+
     def test_invalid_http_client(self) -> None:
         with pytest.raises(TypeError, match="Invalid `http_client` arg"):
             with httpx.Client() as http_client:
@@ -1107,19 +1476,19 @@ def test_invalid_http_client(self) -> None:
                     http_client=cast(Any, http_client),
                 )
 
-    def test_default_headers_option(self) -> None:
-        client = AsyncCloudflare(
+    async def test_default_headers_option(self) -> None:
+        test_client = AsyncCloudflare(
             base_url=base_url,
             api_key=api_key,
             api_email=api_email,
             _strict_response_validation=True,
             default_headers={"X-Foo": "bar"},
         )
-        request = client._build_request(FinalRequestOptions(method="get", url="/foo"))
+        request = test_client._build_request(FinalRequestOptions(method="get", url="/foo"))
         assert request.headers.get("x-foo") == "bar"
         assert request.headers.get("x-stainless-lang") == "python"
 
-        client2 = AsyncCloudflare(
+        test_client2 = AsyncCloudflare(
             base_url=base_url,
             api_key=api_key,
             api_email=api_email,
@@ -1129,10 +1498,13 @@ def test_default_headers_option(self) -> None:
                 "X-Stainless-Lang": "my-overriding-header",
             },
         )
-        request = client2._build_request(FinalRequestOptions(method="get", url="/foo"))
+        request = test_client2._build_request(FinalRequestOptions(method="get", url="/foo"))
         assert request.headers.get("x-foo") == "stainless"
         assert request.headers.get("x-stainless-lang") == "my-overriding-header"
 
+        await test_client.close()
+        await test_client2.close()
+
     def test_validate_headers(self) -> None:
         client = AsyncCloudflare(
             base_url=base_url, api_key=api_key, api_email=api_email, _strict_response_validation=True
@@ -1142,7 +1514,13 @@ def test_validate_headers(self) -> None:
         request = client._build_request(FinalRequestOptions(method="get", url="/foo"))
         assert request.headers.get("X-Auth-Key") == api_key
 
-        client2 = AsyncCloudflare(base_url=base_url, api_key=None, api_email=None, _strict_response_validation=True)
+        with update_env(
+            **{
+                "CLOUDFLARE_EMAIL": Omit(),
+                "CLOUDFLARE_API_KEY": Omit(),
+            }
+        ):
+            client2 = AsyncCloudflare(base_url=base_url, api_key=None, api_email=None, _strict_response_validation=True)
 
         with pytest.raises(
             TypeError,
@@ -1157,7 +1535,7 @@ def test_validate_headers(self) -> None:
         request2 = client2._build_request(FinalRequestOptions(method="get", url="/foo", headers={"X-Auth-Key": Omit()}))
         assert request2.headers.get("X-Auth-Key") is None
 
-    def test_default_query_option(self) -> None:
+    async def test_default_query_option(self) -> None:
         client = AsyncCloudflare(
             base_url=base_url,
             api_key=api_key,
@@ -1173,14 +1551,16 @@ def test_default_query_option(self) -> None:
             FinalRequestOptions(
                 method="get",
                 url="/foo",
-                params={"foo": "baz", "query_param": "overriden"},
+                params={"foo": "baz", "query_param": "overridden"},
             )
         )
         url = httpx.URL(request.url)
-        assert dict(url.params) == {"foo": "baz", "query_param": "overriden"}
+        assert dict(url.params) == {"foo": "baz", "query_param": "overridden"}
+
+        await client.close()
 
-    def test_request_extra_json(self) -> None:
-        request = self.client._build_request(
+    def test_request_extra_json(self, client: Cloudflare) -> None:
+        request = client._build_request(
             FinalRequestOptions(
                 method="post",
                 url="/foo",
@@ -1191,7 +1571,7 @@ def test_request_extra_json(self) -> None:
         data = json.loads(request.content.decode("utf-8"))
         assert data == {"foo": "bar", "baz": False}
 
-        request = self.client._build_request(
+        request = client._build_request(
             FinalRequestOptions(
                 method="post",
                 url="/foo",
@@ -1202,7 +1582,7 @@ def test_request_extra_json(self) -> None:
         assert data == {"baz": False}
 
         # `extra_json` takes priority over `json_data` when keys clash
-        request = self.client._build_request(
+        request = client._build_request(
             FinalRequestOptions(
                 method="post",
                 url="/foo",
@@ -1213,8 +1593,8 @@ def test_request_extra_json(self) -> None:
         data = json.loads(request.content.decode("utf-8"))
         assert data == {"foo": "bar", "baz": None}
 
-    def test_request_extra_headers(self) -> None:
-        request = self.client._build_request(
+    def test_request_extra_headers(self, client: Cloudflare) -> None:
+        request = client._build_request(
             FinalRequestOptions(
                 method="post",
                 url="/foo",
@@ -1224,7 +1604,7 @@ def test_request_extra_headers(self) -> None:
         assert request.headers.get("X-Foo") == "Foo"
 
         # `extra_headers` takes priority over `default_headers` when keys clash
-        request = self.client.with_options(default_headers={"X-Bar": "true"})._build_request(
+        request = client.with_options(default_headers={"X-Bar": "true"})._build_request(
             FinalRequestOptions(
                 method="post",
                 url="/foo",
@@ -1235,8 +1615,8 @@ def test_request_extra_headers(self) -> None:
         )
         assert request.headers.get("X-Bar") == "false"
 
-    def test_request_extra_query(self) -> None:
-        request = self.client._build_request(
+    def test_request_extra_query(self, client: Cloudflare) -> None:
+        request = client._build_request(
             FinalRequestOptions(
                 method="post",
                 url="/foo",
@@ -1249,7 +1629,7 @@ def test_request_extra_query(self) -> None:
         assert params == {"my_query_param": "Foo"}
 
         # if both `query` and `extra_query` are given, they are merged
-        request = self.client._build_request(
+        request = client._build_request(
             FinalRequestOptions(
                 method="post",
                 url="/foo",
@@ -1263,7 +1643,7 @@ def test_request_extra_query(self) -> None:
         assert params == {"bar": "1", "foo": "2"}
 
         # `extra_query` takes priority over `query` when keys clash
-        request = self.client._build_request(
+        request = client._build_request(
             FinalRequestOptions(
                 method="post",
                 url="/foo",
@@ -1279,7 +1659,7 @@ def test_request_extra_query(self) -> None:
     def test_multipart_repeating_array(self, async_client: AsyncCloudflare) -> None:
         request = async_client._build_request(
             FinalRequestOptions.construct(
-                method="get",
+                method="post",
                 url="/foo",
                 headers={"Content-Type": "multipart/form-data; boundary=6b7ba517decee4a450543ea6ae821c82"},
                 json_data={"array": ["foo", "bar"]},
@@ -1306,7 +1686,74 @@ def test_multipart_repeating_array(self, async_client: AsyncCloudflare) -> None:
         ]
 
     @pytest.mark.respx(base_url=base_url)
-    async def test_basic_union_response(self, respx_mock: MockRouter) -> None:
+    async def test_binary_content_upload(self, respx_mock: MockRouter, async_client: AsyncCloudflare) -> None:
+        respx_mock.post("/upload").mock(side_effect=mirror_request_content)
+
+        file_content = b"Hello, this is a test file."
+
+        response = await async_client.post(
+            "/upload",
+            content=file_content,
+            cast_to=httpx.Response,
+            options={"headers": {"Content-Type": "application/octet-stream"}},
+        )
+
+        assert response.status_code == 200
+        assert response.request.headers["Content-Type"] == "application/octet-stream"
+        assert response.content == file_content
+
+    async def test_binary_content_upload_with_asynciterator(self) -> None:
+        file_content = b"Hello, this is a test file."
+        counter = Counter()
+        iterator = _make_async_iterator([file_content], counter=counter)
+
+        async def mock_handler(request: httpx.Request) -> httpx.Response:
+            assert counter.value == 0, "the request body should not have been read"
+            return httpx.Response(200, content=await request.aread())
+
+        async with AsyncCloudflare(
+            base_url=base_url,
+            api_key=api_key,
+            api_email=api_email,
+            _strict_response_validation=True,
+            http_client=httpx.AsyncClient(transport=MockTransport(handler=mock_handler)),
+        ) as client:
+            response = await client.post(
+                "/upload",
+                content=iterator,
+                cast_to=httpx.Response,
+                options={"headers": {"Content-Type": "application/octet-stream"}},
+            )
+
+            assert response.status_code == 200
+            assert response.request.headers["Content-Type"] == "application/octet-stream"
+            assert response.content == file_content
+            assert counter.value == 1
+
+    @pytest.mark.respx(base_url=base_url)
+    async def test_binary_content_upload_with_body_is_deprecated(
+        self, respx_mock: MockRouter, async_client: AsyncCloudflare
+    ) -> None:
+        respx_mock.post("/upload").mock(side_effect=mirror_request_content)
+
+        file_content = b"Hello, this is a test file."
+
+        with pytest.deprecated_call(
+            match="Passing raw bytes as `body` is deprecated and will be removed in a future version. Please pass raw bytes via the `content` parameter instead."
+        ):
+            response = await async_client.post(
+                "/upload",
+                body=file_content,
+                cast_to=httpx.Response,
+                options={"headers": {"Content-Type": "application/octet-stream"}},
+            )
+
+        assert response.status_code == 200
+        assert response.request.headers["Content-Type"] == "application/octet-stream"
+        assert response.content == file_content
+
+    @pytest.mark.respx(base_url=base_url)
+    async def test_basic_union_response(self, respx_mock: MockRouter, async_client: AsyncCloudflare) -> None:
         class Model1(BaseModel):
             name: str
 
@@ -1315,12 +1762,12 @@ class Model2(BaseModel):
 
         respx_mock.get("/foo").mock(return_value=httpx.Response(200, json={"foo": "bar"}))
 
-        response = await self.client.get("/foo", cast_to=cast(Any, Union[Model1, Model2]))
+        response = await async_client.get("/foo", cast_to=cast(Any, Union[Model1, Model2]))
         assert isinstance(response, Model2)
         assert response.foo == "bar"
 
     @pytest.mark.respx(base_url=base_url)
-    async def test_union_response_different_types(self, respx_mock: MockRouter) -> None:
+    async def test_union_response_different_types(self, respx_mock: MockRouter, async_client: AsyncCloudflare) -> None:
         """Union of objects with the same field name using a different type"""
 
         class Model1(BaseModel):
@@ -1331,18 +1778,20 @@ class Model2(BaseModel):
 
         respx_mock.get("/foo").mock(return_value=httpx.Response(200, json={"foo": "bar"}))
 
-        response = await self.client.get("/foo", cast_to=cast(Any, Union[Model1, Model2]))
+        response = await async_client.get("/foo", cast_to=cast(Any, Union[Model1, Model2]))
         assert isinstance(response, Model2)
         assert response.foo == "bar"
 
         respx_mock.get("/foo").mock(return_value=httpx.Response(200, json={"foo": 1}))
 
-        response = await self.client.get("/foo", cast_to=cast(Any, Union[Model1, Model2]))
+        response = await async_client.get("/foo", cast_to=cast(Any, Union[Model1, Model2]))
         assert isinstance(response, Model1)
         assert response.foo == 1
 
     @pytest.mark.respx(base_url=base_url)
-    async def test_non_application_json_content_type_for_json_data(self, respx_mock: MockRouter) -> None:
+    async def test_non_application_json_content_type_for_json_data(
+        self, respx_mock: MockRouter, async_client: AsyncCloudflare
+    ) -> None:
         """
         Response that sets Content-Type to something other than application/json but returns json data
         """
@@ -1358,11 +1807,11 @@ class Model(BaseModel):
             )
         )
 
-        response = await self.client.get("/foo", cast_to=Model)
+        response = await async_client.get("/foo", cast_to=Model)
         assert isinstance(response, Model)
         assert response.foo == 2
 
-    def test_base_url_setter(self) -> None:
+    async def test_base_url_setter(self) -> None:
         client = AsyncCloudflare(
             base_url="https://example.com/from_init",
             api_key=api_key,
@@ -1375,7 +1824,9 @@ def test_base_url_setter(self) -> None:
 
         assert client.base_url == "https://example.com/from_setter/"
 
-    def test_base_url_env(self) -> None:
+        await client.close()
+
+    async def test_base_url_env(self) -> None:
         with update_env(CLOUDFLARE_BASE_URL="http://localhost:5000/from/env"):
             client = AsyncCloudflare(api_key=api_key, api_email=api_email, _strict_response_validation=True)
             assert client.base_url == "http://localhost:5000/from/env/"
@@ -1399,7 +1850,7 @@ def test_base_url_env(self) -> None:
         ],
         ids=["standard", "custom http client"],
     )
-    def test_base_url_trailing_slash(self, client: AsyncCloudflare) -> None:
+    async def test_base_url_trailing_slash(self, client: AsyncCloudflare) -> None:
         request = client._build_request(
             FinalRequestOptions(
                 method="post",
@@ -1408,6 +1859,7 @@ def test_base_url_trailing_slash(self, client: AsyncCloudflare) -> None:
             ),
         )
         assert request.url == "http://localhost:5000/custom/path/foo"
+        await client.close()
 
     @pytest.mark.parametrize(
         "client",
@@ -1428,7 +1880,7 @@ def test_base_url_trailing_slash(self, client: AsyncCloudflare) -> None:
         ],
         ids=["standard", "custom http client"],
     )
-    def test_base_url_no_trailing_slash(self, client: AsyncCloudflare) -> None:
+    async def test_base_url_no_trailing_slash(self, client: AsyncCloudflare) -> None:
         request = client._build_request(
             FinalRequestOptions(
                 method="post",
@@ -1437,6 +1889,7 @@ def test_base_url_no_trailing_slash(self, client: AsyncCloudflare) -> None:
             ),
         )
         assert request.url == "http://localhost:5000/custom/path/foo"
+        await client.close()
 
     @pytest.mark.parametrize(
         "client",
@@ -1457,7 +1910,7 @@ def test_base_url_no_trailing_slash(self, client: AsyncCloudflare) -> None:
         ],
         ids=["standard", "custom http client"],
     )
-    def test_absolute_request_url(self, client: AsyncCloudflare) -> None:
+    async def test_absolute_request_url(self, client: AsyncCloudflare) -> None:
         request = client._build_request(
             FinalRequestOptions(
                 method="post",
@@ -1466,41 +1919,43 @@ def test_absolute_request_url(self, client: AsyncCloudflare) -> None:
             ),
         )
         assert request.url == "https://myapi.com/foo"
+        await client.close()
 
     async def test_copied_client_does_not_close_http(self) -> None:
-        client = AsyncCloudflare(
+        test_client = AsyncCloudflare(
             base_url=base_url, api_key=api_key, api_email=api_email, _strict_response_validation=True
         )
-        assert not client.is_closed()
+        assert not test_client.is_closed()
 
-        copied = client.copy()
-        assert copied is not client
+        copied = test_client.copy()
+        assert copied is not test_client
 
         del copied
 
         await asyncio.sleep(0.2)
-        assert not client.is_closed()
+        assert not test_client.is_closed()
 
     async def test_client_context_manager(self) -> None:
-        client = AsyncCloudflare(
+        test_client = AsyncCloudflare(
             base_url=base_url, api_key=api_key, api_email=api_email, _strict_response_validation=True
         )
-        async with client as c2:
-            assert c2 is client
+        async with test_client as c2:
+            assert c2 is test_client
             assert not c2.is_closed()
-            assert not client.is_closed()
-        assert client.is_closed()
+            assert not test_client.is_closed()
+        assert test_client.is_closed()
 
     @pytest.mark.respx(base_url=base_url)
-    @pytest.mark.asyncio
-    async def test_client_response_validation_error(self, respx_mock: MockRouter) -> None:
+    async def test_client_response_validation_error(
+        self, respx_mock: MockRouter, async_client: AsyncCloudflare
+    ) -> None:
         class Model(BaseModel):
             foo: str
 
         respx_mock.get("/foo").mock(return_value=httpx.Response(200, json={"foo": {"invalid": True}}))
 
         with pytest.raises(APIResponseValidationError) as exc:
-            await self.client.get("/foo", cast_to=Model)
+            await async_client.get("/foo", cast_to=Model)
 
         assert isinstance(exc.value.__cause__, ValidationError)
 
@@ -1515,7 +1970,6 @@ async def test_client_max_retries_validation(self) -> None:
             )
 
     @pytest.mark.respx(base_url=base_url)
-    @pytest.mark.asyncio
     async def test_received_text_for_expected_json(self, respx_mock: MockRouter) -> None:
         class Model(BaseModel):
             name: str
@@ -1529,13 +1983,16 @@ class Model(BaseModel):
         with pytest.raises(APIResponseValidationError):
             await strict_client.get("/foo", cast_to=Model)
 
-        client = AsyncCloudflare(
+        non_strict_client = AsyncCloudflare(
             base_url=base_url, api_key=api_key, api_email=api_email, _strict_response_validation=False
         )
 
-        response = await client.get("/foo", cast_to=Model)
+        response = await non_strict_client.get("/foo", cast_to=Model)
         assert isinstance(response, str)  # type: ignore[unreachable]
 
+        await strict_client.close()
+        await non_strict_client.close()
+
     @pytest.mark.parametrize(
         "remaining_retries,retry_after,timeout",
         [
@@ -1554,50 +2011,171 @@ class Model(BaseModel):
             [3, "", 0.5],
             [2, "", 0.5 * 2.0],
             [1, "", 0.5 * 4.0],
+            [-1100, "", 8],  # test large number potentially overflowing
         ],
     )
     @mock.patch("time.time", mock.MagicMock(return_value=1696004797))
-    @pytest.mark.asyncio
-    async def test_parse_retry_after_header(self, remaining_retries: int, retry_after: str, timeout: float) -> None:
-        client = AsyncCloudflare(
-            base_url=base_url, api_key=api_key, api_email=api_email, _strict_response_validation=True
-        )
-
+    async def test_parse_retry_after_header(
+        self, remaining_retries: int, retry_after: str, timeout: float, async_client: AsyncCloudflare
+    ) -> None:
         headers = httpx.Headers({"retry-after": retry_after})
         options = FinalRequestOptions(method="get", url="/foo", max_retries=3)
-        calculated = client._calculate_retry_timeout(remaining_retries, options, headers)
+        calculated = async_client._calculate_retry_timeout(remaining_retries, options, headers)
         assert calculated == pytest.approx(timeout, 0.5 * 0.875)  # pyright: ignore[reportUnknownMemberType]
 
     @mock.patch("cloudflare._base_client.BaseClient._calculate_retry_timeout", _low_retry_timeout)
     @pytest.mark.respx(base_url=base_url)
-    async def test_retrying_timeout_errors_doesnt_leak(self, respx_mock: MockRouter) -> None:
+    async def test_retrying_timeout_errors_doesnt_leak(
+        self, respx_mock: MockRouter, async_client: AsyncCloudflare
+    ) -> None:
         respx_mock.post("/zones").mock(side_effect=httpx.TimeoutException("Test timeout error"))
 
         with pytest.raises(APITimeoutError):
-            await self.client.post(
-                "/zones",
-                body=cast(
-                    object, dict(account={"id": "023e105f4ecef8ad9ca31a8372d0c353"}, name="example.com", type="full")
-                ),
-                cast_to=httpx.Response,
-                options={"headers": {RAW_RESPONSE_HEADER: "stream"}},
-            )
+            await async_client.zones.with_streaming_response.create(account={}, name="example.com").__aenter__()
 
-        assert _get_open_connections(self.client) == 0
+        assert _get_open_connections(async_client) == 0
 
     @mock.patch("cloudflare._base_client.BaseClient._calculate_retry_timeout", _low_retry_timeout)
     @pytest.mark.respx(base_url=base_url)
-    async def test_retrying_status_errors_doesnt_leak(self, respx_mock: MockRouter) -> None:
+    async def test_retrying_status_errors_doesnt_leak(
+        self, respx_mock: MockRouter, async_client: AsyncCloudflare
+    ) -> None:
         respx_mock.post("/zones").mock(return_value=httpx.Response(500))
 
         with pytest.raises(APIStatusError):
-            await self.client.post(
-                "/zones",
-                body=cast(
-                    object, dict(account={"id": "023e105f4ecef8ad9ca31a8372d0c353"}, name="example.com", type="full")
-                ),
-                cast_to=httpx.Response,
-                options={"headers": {RAW_RESPONSE_HEADER: "stream"}},
+            await async_client.zones.with_streaming_response.create(account={}, name="example.com").__aenter__()
+        assert _get_open_connections(async_client) == 0
+
+    @pytest.mark.parametrize("failures_before_success", [0, 2, 4])
+    @mock.patch("cloudflare._base_client.BaseClient._calculate_retry_timeout", _low_retry_timeout)
+    @pytest.mark.respx(base_url=base_url)
+    @pytest.mark.parametrize("failure_mode", ["status", "exception"])
+    async def test_retries_taken(
+        self,
+        async_client: AsyncCloudflare,
+        failures_before_success: int,
+        failure_mode: Literal["status", "exception"],
+        respx_mock: MockRouter,
+    ) -> None:
+        client = async_client.with_options(max_retries=4)
+
+        nb_retries = 0
+
+        def retry_handler(_request: httpx.Request) -> httpx.Response:
+            nonlocal nb_retries
+            if nb_retries < failures_before_success:
+                nb_retries += 1
+                if failure_mode == "exception":
+                    raise RuntimeError("oops")
+                return httpx.Response(500)
+            return httpx.Response(200)
+
+        respx_mock.post("/zones").mock(side_effect=retry_handler)
+
+        response = await client.zones.with_raw_response.create(account={}, name="example.com")
+
+        assert response.retries_taken == failures_before_success
+        assert int(response.http_request.headers.get("x-stainless-retry-count")) == failures_before_success
+
+    @pytest.mark.parametrize("failures_before_success", [0, 2, 4])
+    @mock.patch("cloudflare._base_client.BaseClient._calculate_retry_timeout", _low_retry_timeout)
+    @pytest.mark.respx(base_url=base_url)
+    async def test_omit_retry_count_header(
+        self, async_client: AsyncCloudflare, failures_before_success: int, respx_mock: MockRouter
+    ) -> None:
+        client = async_client.with_options(max_retries=4)
+
+        nb_retries = 0
+
+        def retry_handler(_request: httpx.Request) -> httpx.Response:
+            nonlocal nb_retries
+            if nb_retries < failures_before_success:
+                nb_retries += 1
+                return httpx.Response(500)
+            return httpx.Response(200)
+
+        respx_mock.post("/zones").mock(side_effect=retry_handler)
+
+        response = await client.zones.with_raw_response.create(
+            account={}, name="example.com", extra_headers={"x-stainless-retry-count": Omit()}
+        )
+
+        assert len(response.http_request.headers.get_list("x-stainless-retry-count")) == 0
+
+    @pytest.mark.parametrize("failures_before_success", [0, 2, 4])
+    @mock.patch("cloudflare._base_client.BaseClient._calculate_retry_timeout", _low_retry_timeout)
+    @pytest.mark.respx(base_url=base_url)
+    async def test_overwrite_retry_count_header(
+        self, async_client: AsyncCloudflare, failures_before_success: int, respx_mock: MockRouter
+    ) -> None:
+        client = async_client.with_options(max_retries=4)
+
+        nb_retries = 0
+
+        def retry_handler(_request: httpx.Request) -> httpx.Response:
+            nonlocal nb_retries
+            if nb_retries < failures_before_success:
+                nb_retries += 1
+                return httpx.Response(500)
+            return httpx.Response(200)
+
+        respx_mock.post("/zones").mock(side_effect=retry_handler)
+
+        response = await client.zones.with_raw_response.create(
+            account={}, name="example.com", extra_headers={"x-stainless-retry-count": "42"}
+        )
+
+        assert response.http_request.headers.get("x-stainless-retry-count") == "42"
+
+    async def test_get_platform(self) -> None:
+        platform = await asyncify(get_platform)()
+        assert isinstance(platform, (str, OtherPlatform))
+
+    async def test_proxy_environment_variables(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        # Test that the proxy environment variables are set correctly
+        monkeypatch.setenv("HTTPS_PROXY", "https://example.org")
+
+        client = DefaultAsyncHttpxClient()
+
+        mounts = tuple(client._mounts.items())
+        assert len(mounts) == 1
+        assert mounts[0][0].pattern == "https://"
+
+    @pytest.mark.filterwarnings("ignore:.*deprecated.*:DeprecationWarning")
+    async def test_default_client_creation(self) -> None:
+        # Ensure that the client can be initialized without any exceptions
+        DefaultAsyncHttpxClient(
+            verify=True,
+            cert=None,
+            trust_env=True,
+            http1=True,
+            http2=False,
+            limits=httpx.Limits(max_connections=100, max_keepalive_connections=20),
+        )
+
+    @pytest.mark.respx(base_url=base_url)
+    async def test_follow_redirects(self, respx_mock: MockRouter, async_client: AsyncCloudflare) -> None:
+        # Test that the default follow_redirects=True allows following redirects
+        respx_mock.post("/redirect").mock(
+            return_value=httpx.Response(302, headers={"Location": f"{base_url}/redirected"})
+        )
+        respx_mock.get("/redirected").mock(return_value=httpx.Response(200, json={"status": "ok"}))
+
+        response = await async_client.post("/redirect", body={"key": "value"}, cast_to=httpx.Response)
+        assert response.status_code == 200
+        assert response.json() == {"status": "ok"}
+
+    @pytest.mark.respx(base_url=base_url)
+    async def test_follow_redirects_disabled(self, respx_mock: MockRouter, async_client: AsyncCloudflare) -> None:
+        # Test that follow_redirects=False prevents following redirects
+        respx_mock.post("/redirect").mock(
+            return_value=httpx.Response(302, headers={"Location": f"{base_url}/redirected"})
+        )
+
+        with pytest.raises(APIStatusError) as exc_info:
+            await async_client.post(
+                "/redirect", body={"key": "value"}, options={"follow_redirects": False}, cast_to=httpx.Response
             )
 
-        assert _get_open_connections(self.client) == 0
+        assert exc_info.value.response.status_code == 302
+        assert exc_info.value.response.headers["Location"] == f"{base_url}/redirected"
diff --git a/tests/test_deepcopy.py b/tests/test_deepcopy.py
index b25c67ee084..a5e28af566c 100644
--- a/tests/test_deepcopy.py
+++ b/tests/test_deepcopy.py
@@ -41,8 +41,7 @@ def test_nested_list() -> None:
     assert_different_identities(obj1[1], obj2[1])
 
 
-class MyObject:
-    ...
+class MyObject: ...
 
 
 def test_ignores_other_types() -> None:
diff --git a/tests/test_models.py b/tests/test_models.py
index 799673b5caa..db5b9e41b44 100644
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -1,15 +1,15 @@
 import json
-from typing import Any, Dict, List, Union, Optional, cast
+from typing import TYPE_CHECKING, Any, Dict, List, Union, Optional, cast
 from datetime import datetime, timezone
-from typing_extensions import Literal, Annotated
+from typing_extensions import Literal, Annotated, TypeAliasType
 
 import pytest
 import pydantic
 from pydantic import Field
 
 from cloudflare._utils import PropertyInfo
-from cloudflare._compat import PYDANTIC_V2, parse_obj, model_dump, model_json
-from cloudflare._models import BaseModel, construct_type
+from cloudflare._compat import PYDANTIC_V1, parse_obj, model_dump, model_json
+from cloudflare._models import DISCRIMINATOR_CACHE, BaseModel, construct_type
 
 
 class BasicModel(BaseModel):
@@ -245,7 +245,7 @@ class Model(BaseModel):
     assert m.foo is True
 
     m = Model.construct(foo="CARD_HOLDER")
-    assert m.foo is "CARD_HOLDER"
+    assert m.foo == "CARD_HOLDER"
 
     m = Model.construct(foo={"bar": False})
     assert isinstance(m.foo, Submodel1)
@@ -294,12 +294,12 @@ class Model(BaseModel):
     assert cast(bool, m.foo) is True
 
     m = Model.construct(foo={"name": 3})
-    if PYDANTIC_V2:
-        assert isinstance(m.foo, Submodel1)
-        assert m.foo.name == 3  # type: ignore
-    else:
+    if PYDANTIC_V1:
         assert isinstance(m.foo, Submodel2)
         assert m.foo.name == "3"
+    else:
+        assert isinstance(m.foo, Submodel1)
+        assert m.foo.name == 3  # type: ignore
 
 
 def test_list_of_unions() -> None:
@@ -426,10 +426,10 @@ class Model(BaseModel):
 
     expected = datetime(2019, 12, 27, 18, 11, 19, 117000, tzinfo=timezone.utc)
 
-    if PYDANTIC_V2:
-        expected_json = '{"created_at":"2019-12-27T18:11:19.117000Z"}'
-    else:
+    if PYDANTIC_V1:
         expected_json = '{"created_at": "2019-12-27T18:11:19.117000+00:00"}'
+    else:
+        expected_json = '{"created_at":"2019-12-27T18:11:19.117000Z"}'
 
     model = Model.construct(created_at="2019-12-27T18:11:19.117Z")
     assert model.created_at == expected
@@ -492,12 +492,15 @@ class Model(BaseModel):
         resource_id: Optional[str] = None
 
     m = Model.construct()
+    assert m.resource_id is None
     assert "resource_id" not in m.model_fields_set
 
     m = Model.construct(resource_id=None)
+    assert m.resource_id is None
     assert "resource_id" in m.model_fields_set
 
     m = Model.construct(resource_id="foo")
+    assert m.resource_id == "foo"
     assert "resource_id" in m.model_fields_set
 
 
@@ -520,19 +523,15 @@ class Model(BaseModel):
     assert m3.to_dict(exclude_none=True) == {}
     assert m3.to_dict(exclude_defaults=True) == {}
 
-    if PYDANTIC_V2:
+    class Model2(BaseModel):
+        created_at: datetime
 
-        class Model2(BaseModel):
-            created_at: datetime
-
-        time_str = "2024-03-21T11:39:01.275859"
-        m4 = Model2.construct(created_at=time_str)
-        assert m4.to_dict(mode="python") == {"created_at": datetime.fromisoformat(time_str)}
-        assert m4.to_dict(mode="json") == {"created_at": time_str}
-    else:
-        with pytest.raises(ValueError, match="mode is only supported in Pydantic v2"):
-            m.to_dict(mode="json")
+    time_str = "2024-03-21T11:39:01.275859"
+    m4 = Model2.construct(created_at=time_str)
+    assert m4.to_dict(mode="python") == {"created_at": datetime.fromisoformat(time_str)}
+    assert m4.to_dict(mode="json") == {"created_at": time_str}
 
+    if PYDANTIC_V1:
         with pytest.raises(ValueError, match="warnings is only supported in Pydantic v2"):
             m.to_dict(warnings=False)
 
@@ -557,10 +556,7 @@ class Model(BaseModel):
     assert m3.model_dump() == {"foo": None}
     assert m3.model_dump(exclude_none=True) == {}
 
-    if not PYDANTIC_V2:
-        with pytest.raises(ValueError, match="mode is only supported in Pydantic v2"):
-            m.model_dump(mode="json")
-
+    if PYDANTIC_V1:
         with pytest.raises(ValueError, match="round_trip is only supported in Pydantic v2"):
             m.model_dump(round_trip=True)
 
@@ -568,6 +564,14 @@ class Model(BaseModel):
             m.model_dump(warnings=False)
 
 
+def test_compat_method_no_error_for_warnings() -> None:
+    class Model(BaseModel):
+        foo: Optional[str]
+
+    m = Model(foo="hello")
+    assert isinstance(model_dump(m, warnings=False), dict)
+
+
 def test_to_json() -> None:
     class Model(BaseModel):
         foo: Optional[str] = Field(alias="FOO", default=None)
@@ -576,10 +580,10 @@ class Model(BaseModel):
     assert json.loads(m.to_json()) == {"FOO": "hello"}
     assert json.loads(m.to_json(use_api_names=False)) == {"foo": "hello"}
 
-    if PYDANTIC_V2:
-        assert m.to_json(indent=None) == '{"FOO":"hello"}'
-    else:
+    if PYDANTIC_V1:
         assert m.to_json(indent=None) == '{"FOO": "hello"}'
+    else:
+        assert m.to_json(indent=None) == '{"FOO":"hello"}'
 
     m2 = Model()
     assert json.loads(m2.to_json()) == {}
@@ -591,7 +595,7 @@ class Model(BaseModel):
     assert json.loads(m3.to_json()) == {"FOO": None}
     assert json.loads(m3.to_json(exclude_none=True)) == {}
 
-    if not PYDANTIC_V2:
+    if PYDANTIC_V1:
         with pytest.raises(ValueError, match="warnings is only supported in Pydantic v2"):
             m.to_json(warnings=False)
 
@@ -618,7 +622,7 @@ class Model(BaseModel):
     assert json.loads(m3.model_dump_json()) == {"foo": None}
     assert json.loads(m3.model_dump_json(exclude_none=True)) == {}
 
-    if not PYDANTIC_V2:
+    if PYDANTIC_V1:
         with pytest.raises(ValueError, match="round_trip is only supported in Pydantic v2"):
             m.model_dump_json(round_trip=True)
 
@@ -675,12 +679,12 @@ class B(BaseModel):
     )
     assert isinstance(m, A)
     assert m.type == "a"
-    if PYDANTIC_V2:
-        assert m.data == 100  # type: ignore[comparison-overlap]
-    else:
+    if PYDANTIC_V1:
         # pydantic v1 automatically converts inputs to strings
         # if the expected type is a str
         assert m.data == "100"
+    else:
+        assert m.data == 100  # type: ignore[comparison-overlap]
 
 
 def test_discriminated_unions_unknown_variant() -> None:
@@ -764,12 +768,12 @@ class B(BaseModel):
     )
     assert isinstance(m, A)
     assert m.foo_type == "a"
-    if PYDANTIC_V2:
-        assert m.data == 100  # type: ignore[comparison-overlap]
-    else:
+    if PYDANTIC_V1:
         # pydantic v1 automatically converts inputs to strings
         # if the expected type is a str
         assert m.data == "100"
+    else:
+        assert m.data == 100  # type: ignore[comparison-overlap]
 
 
 def test_discriminated_unions_overlapping_discriminators_invalid_data() -> None:
@@ -805,7 +809,7 @@ class B(BaseModel):
 
     UnionType = cast(Any, Union[A, B])
 
-    assert not hasattr(UnionType, "__discriminator__")
+    assert not DISCRIMINATOR_CACHE.get(UnionType)
 
     m = construct_type(
         value={"type": "b", "data": "foo"}, type_=cast(Any, Annotated[UnionType, PropertyInfo(discriminator="type")])
@@ -814,7 +818,7 @@ class B(BaseModel):
     assert m.type == "b"
     assert m.data == "foo"  # type: ignore[comparison-overlap]
 
-    discriminator = UnionType.__discriminator__
+    discriminator = DISCRIMINATOR_CACHE.get(UnionType)
     assert discriminator is not None
 
     m = construct_type(
@@ -826,4 +830,134 @@ class B(BaseModel):
 
     # if the discriminator details object stays the same between invocations then
     # we hit the cache
-    assert UnionType.__discriminator__ is discriminator
+    assert DISCRIMINATOR_CACHE.get(UnionType) is discriminator
+
+
+@pytest.mark.skipif(PYDANTIC_V1, reason="TypeAliasType is not supported in Pydantic v1")
+def test_type_alias_type() -> None:
+    Alias = TypeAliasType("Alias", str)  # pyright: ignore
+
+    class Model(BaseModel):
+        alias: Alias
+        union: Union[int, Alias]
+
+    m = construct_type(value={"alias": "foo", "union": "bar"}, type_=Model)
+    assert isinstance(m, Model)
+    assert isinstance(m.alias, str)
+    assert m.alias == "foo"
+    assert isinstance(m.union, str)
+    assert m.union == "bar"
+
+
+@pytest.mark.skipif(PYDANTIC_V1, reason="TypeAliasType is not supported in Pydantic v1")
+def test_field_named_cls() -> None:
+    class Model(BaseModel):
+        cls: str
+
+    m = construct_type(value={"cls": "foo"}, type_=Model)
+    assert isinstance(m, Model)
+    assert isinstance(m.cls, str)
+
+
+def test_discriminated_union_case() -> None:
+    class A(BaseModel):
+        type: Literal["a"]
+
+        data: bool
+
+    class B(BaseModel):
+        type: Literal["b"]
+
+        data: List[Union[A, object]]
+
+    class ModelA(BaseModel):
+        type: Literal["modelA"]
+
+        data: int
+
+    class ModelB(BaseModel):
+        type: Literal["modelB"]
+
+        required: str
+
+        data: Union[A, B]
+
+    # when constructing ModelA | ModelB, value data doesn't match ModelB exactly - missing `required`
+    m = construct_type(
+        value={"type": "modelB", "data": {"type": "a", "data": True}},
+        type_=cast(Any, Annotated[Union[ModelA, ModelB], PropertyInfo(discriminator="type")]),
+    )
+
+    assert isinstance(m, ModelB)
+
+
+def test_nested_discriminated_union() -> None:
+    class InnerType1(BaseModel):
+        type: Literal["type_1"]
+
+    class InnerModel(BaseModel):
+        inner_value: str
+
+    class InnerType2(BaseModel):
+        type: Literal["type_2"]
+        some_inner_model: InnerModel
+
+    class Type1(BaseModel):
+        base_type: Literal["base_type_1"]
+        value: Annotated[
+            Union[
+                InnerType1,
+                InnerType2,
+            ],
+            PropertyInfo(discriminator="type"),
+        ]
+
+    class Type2(BaseModel):
+        base_type: Literal["base_type_2"]
+
+    T = Annotated[
+        Union[
+            Type1,
+            Type2,
+        ],
+        PropertyInfo(discriminator="base_type"),
+    ]
+
+    model = construct_type(
+        type_=T,
+        value={
+            "base_type": "base_type_1",
+            "value": {
+                "type": "type_2",
+            },
+        },
+    )
+    assert isinstance(model, Type1)
+    assert isinstance(model.value, InnerType2)
+
+
+@pytest.mark.skipif(PYDANTIC_V1, reason="this is only supported in pydantic v2 for now")
+def test_extra_properties() -> None:
+    class Item(BaseModel):
+        prop: int
+
+    class Model(BaseModel):
+        __pydantic_extra__: Dict[str, Item] = Field(init=False)  # pyright: ignore[reportIncompatibleVariableOverride]
+
+        other: str
+
+        if TYPE_CHECKING:
+
+            def __getattr__(self, attr: str) -> Item: ...
+
+    model = construct_type(
+        type_=Model,
+        value={
+            "a": {"prop": 1},
+            "other": "foo",
+        },
+    )
+    assert isinstance(model, Model)
+    assert model.a.prop == 1
+    assert isinstance(model.a, Item)
+    assert model.other == "foo"
diff --git a/tests/test_response.py b/tests/test_response.py
index 2040b1218b1..ab7d62b1da3 100644
--- a/tests/test_response.py
+++ b/tests/test_response.py
@@ -1,5 +1,5 @@
 import json
-from typing import List, cast
+from typing import Any, List, Union, cast
 from typing_extensions import Annotated
 
 import httpx
@@ -19,16 +19,13 @@
 from cloudflare._base_client import FinalRequestOptions
 
 
-class ConcreteBaseAPIResponse(APIResponse[bytes]):
-    ...
+class ConcreteBaseAPIResponse(APIResponse[bytes]): ...
 
 
-class ConcreteAPIResponse(APIResponse[List[str]]):
-    ...
+class ConcreteAPIResponse(APIResponse[List[str]]): ...
 
 
-class ConcreteAsyncAPIResponse(APIResponse[httpx.Response]):
-    ...
+class ConcreteAsyncAPIResponse(APIResponse[httpx.Response]): ...
 
 
 def test_extract_response_type_direct_classes() -> None:
@@ -56,8 +53,7 @@ def test_extract_response_type_binary_response() -> None:
     assert extract_response_type(AsyncBinaryAPIResponse) == bytes
 
 
-class PydanticModel(pydantic.BaseModel):
-    ...
+class PydanticModel(pydantic.BaseModel): ...
 
 
 def test_response_parse_mismatched_basemodel(client: Cloudflare) -> None:
@@ -192,3 +188,90 @@ async def test_async_response_parse_annotated_type(async_client: AsyncCloudflare
     )
     assert obj.foo == "hello!"
     assert obj.bar == 2
+
+
+@pytest.mark.parametrize(
+    "content, expected",
+    [
+        ("false", False),
+        ("true", True),
+        ("False", False),
+        ("True", True),
+        ("TrUe", True),
+        ("FalSe", False),
+    ],
+)
+def test_response_parse_bool(client: Cloudflare, content: str, expected: bool) -> None:
+    response = APIResponse(
+        raw=httpx.Response(200, content=content),
+        client=client,
+        stream=False,
+        stream_cls=None,
+        cast_to=str,
+        options=FinalRequestOptions.construct(method="get", url="/foo"),
+    )
+
+    result = response.parse(to=bool)
+    assert result is expected
+
+
+@pytest.mark.parametrize(
+    "content, expected",
+    [
+        ("false", False),
+        ("true", True),
+        ("False", False),
+        ("True", True),
+        ("TrUe", True),
+        ("FalSe", False),
+    ],
+)
+async def test_async_response_parse_bool(client: AsyncCloudflare, content: str, expected: bool) -> None:
+    response = AsyncAPIResponse(
+        raw=httpx.Response(200, content=content),
+        client=client,
+        stream=False,
+        stream_cls=None,
+        cast_to=str,
+        options=FinalRequestOptions.construct(method="get", url="/foo"),
+    )
+
+    result = await response.parse(to=bool)
+    assert result is expected
+
+
+class OtherModel(BaseModel):
+    a: str
+
+
+@pytest.mark.parametrize("client", [False], indirect=True)  # loose validation
+def test_response_parse_expect_model_union_non_json_content(client: Cloudflare) -> None:
+    response = APIResponse(
+        raw=httpx.Response(200, content=b"foo", headers={"Content-Type": "application/text"}),
+        client=client,
+        stream=False,
+        stream_cls=None,
+        cast_to=str,
+        options=FinalRequestOptions.construct(method="get", url="/foo"),
+    )
+
+    obj = response.parse(to=cast(Any, Union[CustomModel, OtherModel]))
+    assert isinstance(obj, str)
+    assert obj == "foo"
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("async_client", [False], indirect=True)  # loose validation
+async def test_async_response_parse_expect_model_union_non_json_content(async_client: AsyncCloudflare) -> None:
+    response = AsyncAPIResponse(
+        raw=httpx.Response(200, content=b"foo", headers={"Content-Type": "application/text"}),
+        client=async_client,
+        stream=False,
+        stream_cls=None,
+        cast_to=str,
+        options=FinalRequestOptions.construct(method="get", url="/foo"),
+    )
+
+    obj = await response.parse(to=cast(Any, Union[CustomModel, OtherModel]))
+    assert isinstance(obj, str)
+    assert obj == "foo"
diff --git a/tests/test_transform.py b/tests/test_transform.py
index bc21b7cdb00..066c97d274d 100644
--- a/tests/test_transform.py
+++ b/tests/test_transform.py
@@ -2,20 +2,20 @@
 
 import io
 import pathlib
-from typing import Any, List, Union, TypeVar, Iterable, Optional, cast
+from typing import Any, Dict, List, Union, TypeVar, Iterable, Optional, cast
 from datetime import date, datetime
 from typing_extensions import Required, Annotated, TypedDict
 
 import pytest
 
-from cloudflare._types import Base64FileInput
+from cloudflare._types import Base64FileInput, omit, not_given
 from cloudflare._utils import (
     PropertyInfo,
     transform as _transform,
     parse_datetime,
     async_transform as _async_transform,
 )
-from cloudflare._compat import PYDANTIC_V2
+from cloudflare._compat import PYDANTIC_V1
 from cloudflare._models import BaseModel
 
 _T = TypeVar("_T")
@@ -177,17 +177,32 @@ class DateDict(TypedDict, total=False):
     foo: Annotated[date, PropertyInfo(format="iso8601")]
 
 
+class DatetimeModel(BaseModel):
+    foo: datetime
+
+
+class DateModel(BaseModel):
+    foo: Optional[date]
+
+
 @parametrize
 @pytest.mark.asyncio
 async def test_iso8601_format(use_async: bool) -> None:
     dt = datetime.fromisoformat("2023-02-23T14:16:36.337692+00:00")
+    tz = "+00:00" if PYDANTIC_V1 else "Z"
     assert await transform({"foo": dt}, DatetimeDict, use_async) == {"foo": "2023-02-23T14:16:36.337692+00:00"}  # type: ignore[comparison-overlap]
+    assert await transform(DatetimeModel(foo=dt), Any, use_async) == {"foo": "2023-02-23T14:16:36.337692" + tz}  # type: ignore[comparison-overlap]
 
     dt = dt.replace(tzinfo=None)
     assert await transform({"foo": dt}, DatetimeDict, use_async) == {"foo": "2023-02-23T14:16:36.337692"}  # type: ignore[comparison-overlap]
+    assert await transform(DatetimeModel(foo=dt), Any, use_async) == {"foo": "2023-02-23T14:16:36.337692"}  # type: ignore[comparison-overlap]
 
     assert await transform({"foo": None}, DateDict, use_async) == {"foo": None}  # type: ignore[comparison-overlap]
+    assert await transform(DateModel(foo=None), Any, use_async) == {"foo": None}  # type: ignore
     assert await transform({"foo": date.fromisoformat("2023-02-23")}, DateDict, use_async) == {"foo": "2023-02-23"}  # type: ignore[comparison-overlap]
+    assert await transform(DateModel(foo=date.fromisoformat("2023-02-23")), DateDict, use_async) == {
+        "foo": "2023-02-23"
+    }  # type: ignore[comparison-overlap]
 
 
 @parametrize
@@ -282,11 +297,11 @@ async def test_pydantic_unknown_field(use_async: bool) -> None:
 @pytest.mark.asyncio
 async def test_pydantic_mismatched_types(use_async: bool) -> None:
     model = MyModel.construct(foo=True)
-    if PYDANTIC_V2:
+    if PYDANTIC_V1:
+        params = await transform(model, Any, use_async)
+    else:
         with pytest.warns(UserWarning):
             params = await transform(model, Any, use_async)
-    else:
-        params = await transform(model, Any, use_async)
     assert cast(Any, params) == {"foo": True}
 
 
@@ -294,11 +309,11 @@ async def test_pydantic_mismatched_types(use_async: bool) -> None:
 @pytest.mark.asyncio
 async def test_pydantic_mismatched_object_type(use_async: bool) -> None:
     model = MyModel.construct(foo=MyModel.construct(hello="world"))
-    if PYDANTIC_V2:
+    if PYDANTIC_V1:
+        params = await transform(model, Any, use_async)
+    else:
         with pytest.warns(UserWarning):
             params = await transform(model, Any, use_async)
-    else:
-        params = await transform(model, Any, use_async)
     assert cast(Any, params) == {"foo": {"hello": "world"}}
 
 
@@ -373,6 +388,15 @@ def my_iter() -> Iterable[Baz8]:
     }
 
 
+@parametrize
+@pytest.mark.asyncio
+async def test_dictionary_items(use_async: bool) -> None:
+    class DictItems(TypedDict):
+        foo_baz: Annotated[str, PropertyInfo(alias="fooBaz")]
+
+    assert await transform({"foo": {"foo_baz": "bar"}}, Dict[str, DictItems], use_async) == {"foo": {"fooBaz": "bar"}}
+
+
 class TypedDictIterableUnionStr(TypedDict):
     foo: Annotated[Union[str, Iterable[Baz8]], PropertyInfo(alias="FOO")]
 
@@ -408,3 +432,29 @@ async def test_base64_file_input(use_async: bool) -> None:
     assert await transform({"foo": io.BytesIO(b"Hello, world!")}, TypedDictBase64Input, use_async) == {
         "foo": "SGVsbG8sIHdvcmxkIQ=="
     }  # type: ignore[comparison-overlap]
+
+
+@parametrize
+@pytest.mark.asyncio
+async def test_transform_skipping(use_async: bool) -> None:
+    # lists of ints are left as-is
+    data = [1, 2, 3]
+    assert await transform(data, List[int], use_async) is data
+
+    # iterables of ints are converted to a list
+    data = iter([1, 2, 3])
+    assert await transform(data, Iterable[int], use_async) == [1, 2, 3]
+
+
+@parametrize
+@pytest.mark.asyncio
+async def test_strips_notgiven(use_async: bool) -> None:
+    assert await transform({"foo_bar": "bar"}, Foo1, use_async) == {"fooBar": "bar"}
+    assert await transform({"foo_bar": not_given}, Foo1, use_async) == {}
+
+
+@parametrize
+@pytest.mark.asyncio
+async def test_strips_omit(use_async: bool) -> None:
+    assert await transform({"foo_bar": "bar"}, Foo1, use_async) == {"fooBar": "bar"}
+    assert await transform({"foo_bar": omit}, Foo1, use_async) == {}
diff --git a/tests/test_utils/test_datetime_parse.py b/tests/test_utils/test_datetime_parse.py
new file mode 100644
index 00000000000..d817818e00b
--- /dev/null
+++ b/tests/test_utils/test_datetime_parse.py
@@ -0,0 +1,110 @@
+"""
+Copied from https://github.com/pydantic/pydantic/blob/v1.10.22/tests/test_datetime_parse.py
+with modifications so it works without pydantic v1 imports.
+"""
+
+from typing import Type, Union
+from datetime import date, datetime, timezone, timedelta
+
+import pytest
+
+from cloudflare._utils import parse_date, parse_datetime
+
+
+def create_tz(minutes: int) -> timezone:
+    return timezone(timedelta(minutes=minutes))
+
+
+@pytest.mark.parametrize(
+    "value,result",
+    [
+        # Valid inputs
+        ("1494012444.883309", date(2017, 5, 5)),
+        (b"1494012444.883309", date(2017, 5, 5)),
+        (1_494_012_444.883_309, date(2017, 5, 5)),
+        ("1494012444", date(2017, 5, 5)),
+        (1_494_012_444, date(2017, 5, 5)),
+        (0, date(1970, 1, 1)),
+        ("2012-04-23", date(2012, 4, 23)),
+        (b"2012-04-23", date(2012, 4, 23)),
+        ("2012-4-9", date(2012, 4, 9)),
+        (date(2012, 4, 9), date(2012, 4, 9)),
+        (datetime(2012, 4, 9, 12, 15), date(2012, 4, 9)),
+        # Invalid inputs
+        ("x20120423", ValueError),
+        ("2012-04-56", ValueError),
+        (19_999_999_999, date(2603, 10, 11)),  # just before watershed
+        (20_000_000_001, date(1970, 8, 20)),  # just after watershed
+        (1_549_316_052, date(2019, 2, 4)),  # nowish in s
+        (1_549_316_052_104, date(2019, 2, 4)),  # nowish in ms
+        (1_549_316_052_104_324, date(2019, 2, 4)),  # nowish in μs
+        (1_549_316_052_104_324_096, date(2019, 2, 4)),  # nowish in ns
+        ("infinity", date(9999, 12, 31)),
+        ("inf", date(9999, 12, 31)),
+        (float("inf"), date(9999, 12, 31)),
+        ("infinity ", date(9999, 12, 31)),
+        (int("1" + "0" * 100), date(9999, 12, 31)),
+        (1e1000, date(9999, 12, 31)),
+        ("-infinity", date(1, 1, 1)),
+        ("-inf", date(1, 1, 1)),
+        ("nan", ValueError),
+    ],
+)
+def test_date_parsing(value: Union[str, bytes, int, float], result: Union[date, Type[Exception]]) -> None:
+    if type(result) == type and issubclass(result, Exception):  # pyright: ignore[reportUnnecessaryIsInstance]
+        with pytest.raises(result):
+            parse_date(value)
+    else:
+        assert parse_date(value) == result
+
+
+@pytest.mark.parametrize(
+    "value,result",
+    [
+        # Valid inputs
+        # values in seconds
+        ("1494012444.883309", datetime(2017, 5, 5, 19, 27, 24, 883_309, tzinfo=timezone.utc)),
+        (1_494_012_444.883_309, datetime(2017, 5, 5, 19, 27, 24, 883_309, tzinfo=timezone.utc)),
+        ("1494012444", datetime(2017, 5, 5, 19, 27, 24, tzinfo=timezone.utc)),
+        (b"1494012444", datetime(2017, 5, 5, 19, 27, 24, tzinfo=timezone.utc)),
+        (1_494_012_444, datetime(2017, 5, 5, 19, 27, 24, tzinfo=timezone.utc)),
+        # values in ms
+        ("1494012444000.883309", datetime(2017, 5, 5, 19, 27, 24, 883, tzinfo=timezone.utc)),
+        ("-1494012444000.883309", datetime(1922, 8, 29, 4, 32, 35, 999117, tzinfo=timezone.utc)),
+        (1_494_012_444_000, datetime(2017, 5, 5, 19, 27, 24, tzinfo=timezone.utc)),
+        ("2012-04-23T09:15:00", datetime(2012, 4, 23, 9, 15)),
+        ("2012-4-9 4:8:16", datetime(2012, 4, 9, 4, 8, 16)),
+        ("2012-04-23T09:15:00Z", datetime(2012, 4, 23, 9, 15, 0, 0, timezone.utc)),
+        ("2012-4-9 4:8:16-0320", datetime(2012, 4, 9, 4, 8, 16, 0, create_tz(-200))),
+        ("2012-04-23T10:20:30.400+02:30", datetime(2012, 4, 23, 10, 20, 30, 400_000, create_tz(150))),
+        ("2012-04-23T10:20:30.400+02", datetime(2012, 4, 23, 10, 20, 30, 400_000, create_tz(120))),
+        ("2012-04-23T10:20:30.400-02", datetime(2012, 4, 23, 10, 20, 30, 400_000, create_tz(-120))),
+        (b"2012-04-23T10:20:30.400-02", datetime(2012, 4, 23, 10, 20, 30, 400_000, create_tz(-120))),
+        (datetime(2017, 5, 5), datetime(2017, 5, 5)),
+        (0, datetime(1970, 1, 1, 0, 0, 0, tzinfo=timezone.utc)),
+        # Invalid inputs
+        ("x20120423091500", ValueError),
+        ("2012-04-56T09:15:90", ValueError),
+        ("2012-04-23T11:05:00-25:00", ValueError),
+        (19_999_999_999, datetime(2603, 10, 11, 11, 33, 19, tzinfo=timezone.utc)),  # just before watershed
+        (20_000_000_001, datetime(1970, 8, 20, 11, 33, 20, 1000, tzinfo=timezone.utc)),  # just after watershed
+        (1_549_316_052, datetime(2019, 2, 4, 21, 34, 12, 0, tzinfo=timezone.utc)),  # nowish in s
+        (1_549_316_052_104, datetime(2019, 2, 4, 21, 34, 12, 104_000, tzinfo=timezone.utc)),  # nowish in ms
+        (1_549_316_052_104_324, datetime(2019, 2, 4, 21, 34, 12, 104_324, tzinfo=timezone.utc)),  # nowish in μs
+        (1_549_316_052_104_324_096, datetime(2019, 2, 4, 21, 34, 12, 104_324, tzinfo=timezone.utc)),  # nowish in ns
+        ("infinity", datetime(9999, 12, 31, 23, 59, 59, 999999)),
+        ("inf", datetime(9999, 12, 31, 23, 59, 59, 999999)),
+        ("inf ", datetime(9999, 12, 31, 23, 59, 59, 999999)),
+        (1e50, datetime(9999, 12, 31, 23, 59, 59, 999999)),
+        (float("inf"), datetime(9999, 12, 31, 23, 59, 59, 999999)),
+        ("-infinity", datetime(1, 1, 1, 0, 0)),
+        ("-inf", datetime(1, 1, 1, 0, 0)),
+        ("nan", ValueError),
+    ],
+)
+def test_datetime_parsing(value: Union[str, bytes, int, float], result: Union[datetime, Type[Exception]]) -> None:
+    if type(result) == type and issubclass(result, Exception):  # pyright: ignore[reportUnnecessaryIsInstance]
+        with pytest.raises(result):
+            parse_datetime(value)
+    else:
+        assert parse_datetime(value) == result
diff --git a/tests/test_utils/test_proxy.py b/tests/test_utils/test_proxy.py
index 6172cb4bcc6..b20863c9656 100644
--- a/tests/test_utils/test_proxy.py
+++ b/tests/test_utils/test_proxy.py
@@ -21,3 +21,14 @@ def test_recursive_proxy() -> None:
     assert dir(proxy) == []
     assert type(proxy).__name__ == "RecursiveLazyProxy"
     assert type(operator.attrgetter("name.foo.bar.baz")(proxy)).__name__ == "RecursiveLazyProxy"
+
+
+def test_isinstance_does_not_error() -> None:
+    class AlwaysErrorProxy(LazyProxy[Any]):
+        @override
+        def __load__(self) -> Any:
+            raise RuntimeError("Mocking missing dependency")
+
+    proxy = AlwaysErrorProxy()
+    assert not isinstance(proxy, dict)
+    assert isinstance(proxy, LazyProxy)
diff --git a/tests/test_utils/test_typing.py b/tests/test_utils/test_typing.py
index c60e301f0ef..6d6d2078fbb 100644
--- a/tests/test_utils/test_typing.py
+++ b/tests/test_utils/test_typing.py
@@ -9,24 +9,19 @@
 _T3 = TypeVar("_T3")
 
 
-class BaseGeneric(Generic[_T]):
-    ...
+class BaseGeneric(Generic[_T]): ...
 
 
-class SubclassGeneric(BaseGeneric[_T]):
-    ...
+class SubclassGeneric(BaseGeneric[_T]): ...
 
 
-class BaseGenericMultipleTypeArgs(Generic[_T, _T2, _T3]):
-    ...
+class BaseGenericMultipleTypeArgs(Generic[_T, _T2, _T3]): ...
 
 
-class SubclassGenericMultipleTypeArgs(BaseGenericMultipleTypeArgs[_T, _T2, _T3]):
-    ...
+class SubclassGenericMultipleTypeArgs(BaseGenericMultipleTypeArgs[_T, _T2, _T3]): ...
 
 
-class SubclassDifferentOrderGenericMultipleTypeArgs(BaseGenericMultipleTypeArgs[_T2, _T, _T3]):
-    ...
+class SubclassDifferentOrderGenericMultipleTypeArgs(BaseGenericMultipleTypeArgs[_T2, _T, _T3]): ...
 
 
 def test_extract_type_var() -> None:
diff --git a/tests/utils.py b/tests/utils.py
index f726a828ad7..cf9cd43f9e3 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -4,20 +4,22 @@
 import inspect
 import traceback
 import contextlib
-from typing import Any, TypeVar, Iterator, cast
+from typing import Any, TypeVar, Iterator, Sequence, cast
 from datetime import date, datetime
 from typing_extensions import Literal, get_args, get_origin, assert_type
 
-from cloudflare._types import NoneType
+from cloudflare._types import Omit, NoneType
 from cloudflare._utils import (
     is_dict,
     is_list,
     is_list_type,
     is_union_type,
     extract_type_arg,
+    is_sequence_type,
     is_annotated_type,
+    is_type_alias_type,
 )
-from cloudflare._compat import PYDANTIC_V2, field_outer_type, get_model_fields
+from cloudflare._compat import PYDANTIC_V1, field_outer_type, get_model_fields
 from cloudflare._models import BaseModel
 
 BaseModelT = TypeVar("BaseModelT", bound=BaseModel)
@@ -26,12 +28,12 @@
 def assert_matches_model(model: type[BaseModelT], value: BaseModelT, *, path: list[str]) -> bool:
     for name, field in get_model_fields(model).items():
         field_value = getattr(value, name)
-        if PYDANTIC_V2:
-            allow_none = False
-        else:
+        if PYDANTIC_V1:
             # in v1 nullability was structured differently
             # https://docs.pydantic.dev/2.0/migration/#required-optional-and-nullable-fields
             allow_none = getattr(field, "allow_none", False)
+        else:
+            allow_none = False
 
         assert_matches_type(
             field_outer_type(field),
@@ -51,6 +53,9 @@ def assert_matches_type(
     path: list[str],
     allow_none: bool = False,
 ) -> None:
+    if is_type_alias_type(type_):
+        type_ = type_.__value__
+
     # unwrap `Annotated[T, ...]` -> `T`
     if is_annotated_type(type_):
         type_ = extract_type_arg(type_, 0)
@@ -67,6 +72,13 @@ def assert_matches_type(
     if is_list_type(type_):
         return _assert_list_type(type_, value)
 
+    if is_sequence_type(type_):
+        assert isinstance(value, Sequence)
+        inner_type = get_args(type_)[0]
+        for entry in value:  # type: ignore
+            assert_type(inner_type, entry)  # type: ignore
+        return
+
     if origin == str:
         assert isinstance(value, str)
     elif origin == int:
@@ -139,11 +151,15 @@ def _assert_list_type(type_: type[object], value: object) -> None:
 
 
 @contextlib.contextmanager
-def update_env(**new_env: str) -> Iterator[None]:
+def update_env(**new_env: str | Omit) -> Iterator[None]:
     old = os.environ.copy()
 
     try:
-        os.environ.update(new_env)
+        for name, value in new_env.items():
+            if isinstance(value, Omit):
+                os.environ.pop(name, None)
+            else:
+                os.environ[name] = value
 
         yield None
     finally: